From 47ba7facad42a1c50bea75cb48ab89d9377f940c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=81Z=C3=81R=20Imre=20AI=20Agent?=
 <imre.agent@illusion.hu>
Date: Thu, 16 Jul 2026 09:40:46 +0200
Subject: [PATCH] core: add Joomla 3.8.11 official package (deployed-form
 source)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Official Joomla_3.8.11-Stable-Full_Package (downloads.joomla.org), installer dir
removed. This is the clean deployed core; it byte-matches the live core for the
legit files and provides clean versions of the 3 files the attacker trojanized
(auth/joomla.php credential-stealer, session/storage.php, event/event.php).

Signed-off-by: LÁZÁR Imre <imre@illusion.hu>
Assisted-by: claude-code@claude-opus-4-8
---
 core/LICENSE.txt                              |   339 +
 core/README.txt                               |    72 +
 core/administrator/cache/index.html           |     1 +
 .../components/com_admin/admin.php            |    17 +
 .../components/com_admin/admin.xml            |    26 +
 .../components/com_admin/controller.php       |    19 +
 .../com_admin/controllers/profile.php         |    79 +
 .../com_admin/helpers/html/directory.php      |    56 +
 .../com_admin/helpers/html/phpsetting.php     |    77 +
 .../com_admin/helpers/html/system.php         |    30 +
 .../com_admin/models/forms/profile.xml        |   164 +
 .../components/com_admin/models/help.php      |   209 +
 .../components/com_admin/models/profile.php   |   162 +
 .../components/com_admin/models/sysinfo.php   |   744 +
 .../com_admin/postinstall/eaccelerator.php    |    81 +
 .../com_admin/postinstall/htaccess.php        |    27 +
 .../com_admin/postinstall/joomla40checks.php  |    56 +
 .../postinstall/languageaccess340.php         |    44 +
 .../com_admin/postinstall/statscollection.php |    24 +
 .../postinstall/updatedefaultsettings.php     |    27 +
 .../components/com_admin/script.php           |  2543 +++
 .../others/mysql/utf8mb4-conversion-01.sql    |    34 +
 .../others/mysql/utf8mb4-conversion-02.sql    |   242 +
 .../sql/updates/mysql/2.5.0-2011-12-06.sql    |     9 +
 .../sql/updates/mysql/2.5.0-2011-12-16.sql    |     7 +
 .../sql/updates/mysql/2.5.0-2011-12-19.sql    |    20 +
 .../sql/updates/mysql/2.5.0-2011-12-20.sql    |     7 +
 .../sql/updates/mysql/2.5.0-2011-12-21-1.sql  |    11 +
 .../sql/updates/mysql/2.5.0-2011-12-21-2.sql  |   244 +
 .../sql/updates/mysql/2.5.0-2011-12-22.sql    |   123 +
 .../sql/updates/mysql/2.5.0-2011-12-23.sql    |    47 +
 .../sql/updates/mysql/2.5.0-2011-12-24.sql    |     8 +
 .../sql/updates/mysql/2.5.0-2012-01-10.sql    |     1 +
 .../sql/updates/mysql/2.5.0-2012-01-14.sql    |     2 +
 .../sql/updates/mysql/2.5.1-2012-01-26.sql    |     8 +
 .../sql/updates/mysql/2.5.2-2012-03-05.sql    |     1 +
 .../sql/updates/mysql/2.5.3-2012-03-13.sql    |     1 +
 .../sql/updates/mysql/2.5.4-2012-03-18.sql    |     5 +
 .../sql/updates/mysql/2.5.4-2012-03-19.sql    |     7 +
 .../com_admin/sql/updates/mysql/2.5.5.sql     |     3 +
 .../com_admin/sql/updates/mysql/2.5.6.sql     |     1 +
 .../com_admin/sql/updates/mysql/2.5.7.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.0.0.sql     |   147 +
 .../com_admin/sql/updates/mysql/3.0.1.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.0.2.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.0.3.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.1.0.sql     |   165 +
 .../com_admin/sql/updates/mysql/3.1.1.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.1.2.sql     |    16 +
 .../com_admin/sql/updates/mysql/3.1.3.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.1.4.sql     |     2 +
 .../com_admin/sql/updates/mysql/3.1.5.sql     |     1 +
 .../com_admin/sql/updates/mysql/3.2.0.sql     |    93 +
 .../com_admin/sql/updates/mysql/3.2.1.sql     |     1 +
 .../sql/updates/mysql/3.2.2-2013-12-22.sql    |     2 +
 .../sql/updates/mysql/3.2.2-2013-12-28.sql    |     1 +
 .../sql/updates/mysql/3.2.2-2014-01-08.sql    |     2 +
 .../sql/updates/mysql/3.2.2-2014-01-15.sql    |     2 +
 .../sql/updates/mysql/3.2.2-2014-01-18.sql    |     2 +
 .../sql/updates/mysql/3.2.2-2014-01-23.sql    |     2 +
 .../sql/updates/mysql/3.2.3-2014-02-20.sql    |     1 +
 .../sql/updates/mysql/3.3.0-2014-02-16.sql    |     1 +
 .../sql/updates/mysql/3.3.0-2014-04-02.sql    |     3 +
 .../sql/updates/mysql/3.3.4-2014-08-03.sql    |     1 +
 .../sql/updates/mysql/3.3.6-2014-09-30.sql    |     5 +
 .../sql/updates/mysql/3.4.0-2014-08-24.sql    |     3 +
 .../sql/updates/mysql/3.4.0-2014-09-01.sql    |     8 +
 .../sql/updates/mysql/3.4.0-2014-09-16.sql    |     6 +
 .../sql/updates/mysql/3.4.0-2014-10-20.sql    |     1 +
 .../sql/updates/mysql/3.4.0-2014-12-03.sql    |     1 +
 .../sql/updates/mysql/3.4.0-2015-01-21.sql    |     2 +
 .../sql/updates/mysql/3.4.0-2015-02-26.sql    |     2 +
 .../sql/updates/mysql/3.5.0-2015-07-01.sql    |     2 +
 .../sql/updates/mysql/3.5.0-2015-10-13.sql    |     2 +
 .../sql/updates/mysql/3.5.0-2015-10-26.sql    |     2 +
 .../sql/updates/mysql/3.5.0-2015-10-30.sql    |     1 +
 .../sql/updates/mysql/3.5.0-2015-11-04.sql    |     4 +
 .../sql/updates/mysql/3.5.0-2015-11-05.sql    |     6 +
 .../sql/updates/mysql/3.5.0-2016-02-26.sql    |    14 +
 .../sql/updates/mysql/3.5.0-2016-03-01.sql    |    12 +
 .../sql/updates/mysql/3.5.1-2016-03-25.sql    |     5 +
 .../sql/updates/mysql/3.5.1-2016-03-29.sql    |     7 +
 .../sql/updates/mysql/3.6.0-2016-04-01.sql    |     8 +
 .../sql/updates/mysql/3.6.0-2016-04-06.sql    |     1 +
 .../sql/updates/mysql/3.6.0-2016-04-08.sql    |    14 +
 .../sql/updates/mysql/3.6.0-2016-04-09.sql    |     5 +
 .../sql/updates/mysql/3.6.0-2016-05-06.sql    |     5 +
 .../sql/updates/mysql/3.6.0-2016-06-01.sql    |     1 +
 .../sql/updates/mysql/3.6.0-2016-06-05.sql    |     5 +
 .../sql/updates/mysql/3.6.3-2016-08-15.sql    |     5 +
 .../sql/updates/mysql/3.6.3-2016-08-16.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2016-08-06.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2016-08-22.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2016-08-29.sql    |    93 +
 .../sql/updates/mysql/3.7.0-2016-09-29.sql    |     3 +
 .../sql/updates/mysql/3.7.0-2016-10-01.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2016-10-02.sql    |     1 +
 .../sql/updates/mysql/3.7.0-2016-11-04.sql    |     1 +
 .../sql/updates/mysql/3.7.0-2016-11-19.sql    |     3 +
 .../sql/updates/mysql/3.7.0-2016-11-21.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2016-11-24.sql    |     6 +
 .../sql/updates/mysql/3.7.0-2016-11-27.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2017-01-08.sql    |    18 +
 .../sql/updates/mysql/3.7.0-2017-01-09.sql    |     8 +
 .../sql/updates/mysql/3.7.0-2017-01-15.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2017-01-17.sql    |    58 +
 .../sql/updates/mysql/3.7.0-2017-01-31.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2017-02-02.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2017-02-15.sql    |     2 +
 .../sql/updates/mysql/3.7.0-2017-02-17.sql    |     8 +
 .../sql/updates/mysql/3.7.0-2017-03-03.sql    |     5 +
 .../sql/updates/mysql/3.7.0-2017-03-09.sql    |    17 +
 .../sql/updates/mysql/3.7.0-2017-03-19.sql    |     1 +
 .../sql/updates/mysql/3.7.0-2017-04-10.sql    |     3 +
 .../sql/updates/mysql/3.7.0-2017-04-19.sql    |     3 +
 .../sql/updates/mysql/3.7.3-2017-06-03.sql    |     1 +
 .../sql/updates/mysql/3.7.4-2017-07-05.sql    |     1 +
 .../sql/updates/mysql/3.8.0-2017-07-28.sql    |     1 +
 .../sql/updates/mysql/3.8.0-2017-07-31.sql    |     5 +
 .../sql/updates/mysql/3.8.2-2017-10-14.sql    |     5 +
 .../sql/updates/mysql/3.8.4-2018-01-16.sql    |     2 +
 .../sql/updates/mysql/3.8.6-2018-02-14.sql    |     6 +
 .../sql/updates/mysql/3.8.8-2018-05-18.sql    |     3 +
 .../sql/updates/mysql/3.8.9-2018-06-19.sql    |     2 +
 .../sql/updates/postgresql/3.0.0.sql          |     1 +
 .../sql/updates/postgresql/3.0.1.sql          |     1 +
 .../sql/updates/postgresql/3.0.2.sql          |     1 +
 .../sql/updates/postgresql/3.0.3.sql          |     1 +
 .../sql/updates/postgresql/3.1.0.sql          |   196 +
 .../sql/updates/postgresql/3.1.1.sql          |     1 +
 .../sql/updates/postgresql/3.1.2.sql          |    16 +
 .../sql/updates/postgresql/3.1.3.sql          |     1 +
 .../sql/updates/postgresql/3.1.4.sql          |     2 +
 .../sql/updates/postgresql/3.1.5.sql          |     1 +
 .../sql/updates/postgresql/3.2.0.sql          |   121 +
 .../sql/updates/postgresql/3.2.1.sql          |     1 +
 .../updates/postgresql/3.2.2-2013-12-22.sql   |     2 +
 .../updates/postgresql/3.2.2-2013-12-28.sql   |     1 +
 .../updates/postgresql/3.2.2-2014-01-08.sql   |     2 +
 .../updates/postgresql/3.2.2-2014-01-15.sql   |     2 +
 .../updates/postgresql/3.2.2-2014-01-18.sql   |     2 +
 .../updates/postgresql/3.2.2-2014-01-23.sql   |     2 +
 .../updates/postgresql/3.2.3-2014-02-20.sql   |     1 +
 .../updates/postgresql/3.3.0-2013-12-21.sql   |     1 +
 .../updates/postgresql/3.3.0-2014-02-16.sql   |     2 +
 .../updates/postgresql/3.3.0-2014-04-02.sql   |     3 +
 .../updates/postgresql/3.3.4-2014-08-03.sql   |     1 +
 .../updates/postgresql/3.3.6-2014-09-30.sql   |     5 +
 .../updates/postgresql/3.4.0-2014-08-24.sql   |     2 +
 .../updates/postgresql/3.4.0-2014-09-01.sql   |     8 +
 .../updates/postgresql/3.4.0-2014-09-16.sql   |     6 +
 .../updates/postgresql/3.4.0-2014-10-20.sql   |     1 +
 .../updates/postgresql/3.4.0-2014-12-03.sql   |     1 +
 .../updates/postgresql/3.4.0-2015-01-21.sql   |     2 +
 .../updates/postgresql/3.4.0-2015-02-26.sql   |     2 +
 .../updates/postgresql/3.4.4-2015-07-11.sql   |     1 +
 .../updates/postgresql/3.5.0-2015-10-13.sql   |     2 +
 .../updates/postgresql/3.5.0-2015-10-26.sql   |     2 +
 .../updates/postgresql/3.5.0-2015-10-30.sql   |     1 +
 .../updates/postgresql/3.5.0-2015-11-04.sql   |     4 +
 .../updates/postgresql/3.5.0-2015-11-05.sql   |     5 +
 .../updates/postgresql/3.5.0-2016-03-01.sql   |     5 +
 .../updates/postgresql/3.6.0-2016-04-01.sql   |     8 +
 .../updates/postgresql/3.6.0-2016-04-08.sql   |    12 +
 .../updates/postgresql/3.6.0-2016-04-09.sql   |     5 +
 .../updates/postgresql/3.6.0-2016-05-06.sql   |     6 +
 .../updates/postgresql/3.6.0-2016-06-01.sql   |     1 +
 .../updates/postgresql/3.6.0-2016-06-05.sql   |     5 +
 .../updates/postgresql/3.6.3-2016-08-15.sql   |     5 +
 .../updates/postgresql/3.6.3-2016-08-16.sql   |     2 +
 .../updates/postgresql/3.6.3-2016-10-04.sql   |     3 +
 .../updates/postgresql/3.7.0-2016-08-06.sql   |     2 +
 .../updates/postgresql/3.7.0-2016-08-22.sql   |     2 +
 .../updates/postgresql/3.7.0-2016-08-29.sql   |   105 +
 .../updates/postgresql/3.7.0-2016-09-29.sql   |     3 +
 .../updates/postgresql/3.7.0-2016-10-01.sql   |     2 +
 .../updates/postgresql/3.7.0-2016-10-02.sql   |     1 +
 .../updates/postgresql/3.7.0-2016-11-04.sql   |     1 +
 .../updates/postgresql/3.7.0-2016-11-19.sql   |     3 +
 .../updates/postgresql/3.7.0-2016-11-21.sql   |     2 +
 .../updates/postgresql/3.7.0-2016-11-24.sql   |     6 +
 .../updates/postgresql/3.7.0-2017-01-08.sql   |     9 +
 .../updates/postgresql/3.7.0-2017-01-09.sql   |     6 +
 .../updates/postgresql/3.7.0-2017-01-15.sql   |     2 +
 .../updates/postgresql/3.7.0-2017-01-17.sql   |    58 +
 .../updates/postgresql/3.7.0-2017-01-31.sql   |     2 +
 .../updates/postgresql/3.7.0-2017-02-02.sql   |     2 +
 .../updates/postgresql/3.7.0-2017-02-15.sql   |     2 +
 .../updates/postgresql/3.7.0-2017-02-17.sql   |     8 +
 .../updates/postgresql/3.7.0-2017-03-03.sql   |     5 +
 .../updates/postgresql/3.7.0-2017-03-09.sql   |    19 +
 .../updates/postgresql/3.7.0-2017-04-10.sql   |     3 +
 .../updates/postgresql/3.7.0-2017-04-19.sql   |     2 +
 .../updates/postgresql/3.7.4-2017-07-05.sql   |     1 +
 .../updates/postgresql/3.8.0-2017-07-28.sql   |     1 +
 .../updates/postgresql/3.8.0-2017-07-31.sql   |     5 +
 .../updates/postgresql/3.8.2-2017-10-14.sql   |     5 +
 .../updates/postgresql/3.8.4-2018-01-16.sql   |     2 +
 .../updates/postgresql/3.8.6-2018-02-14.sql   |     6 +
 .../updates/postgresql/3.8.8-2018-05-18.sql   |     3 +
 .../updates/postgresql/3.8.9-2018-06-19.sql   |     2 +
 .../sql/updates/sqlazure/2.5.2-2012-03-05.sql |     1 +
 .../sql/updates/sqlazure/2.5.3-2012-03-13.sql |     1 +
 .../sql/updates/sqlazure/2.5.4-2012-03-18.sql |     9 +
 .../sql/updates/sqlazure/2.5.4-2012-03-19.sql |     7 +
 .../com_admin/sql/updates/sqlazure/2.5.5.sql  |     3 +
 .../com_admin/sql/updates/sqlazure/2.5.6.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/2.5.7.sql  |     8 +
 .../com_admin/sql/updates/sqlazure/3.0.0.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/3.0.1.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/3.0.2.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/3.0.3.sql  |     6 +
 .../com_admin/sql/updates/sqlazure/3.1.0.sql  |   326 +
 .../com_admin/sql/updates/sqlazure/3.1.1.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/3.1.2.sql  |    16 +
 .../com_admin/sql/updates/sqlazure/3.1.3.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/3.1.4.sql  |     6 +
 .../com_admin/sql/updates/sqlazure/3.1.5.sql  |     1 +
 .../com_admin/sql/updates/sqlazure/3.2.0.sql  |   184 +
 .../com_admin/sql/updates/sqlazure/3.2.1.sql  |     1 +
 .../sql/updates/sqlazure/3.2.2-2013-12-22.sql |     2 +
 .../sql/updates/sqlazure/3.2.2-2013-12-28.sql |     1 +
 .../sql/updates/sqlazure/3.2.2-2014-01-08.sql |     6 +
 .../sql/updates/sqlazure/3.2.2-2014-01-15.sql |     2 +
 .../sql/updates/sqlazure/3.2.2-2014-01-18.sql |     2 +
 .../sql/updates/sqlazure/3.2.2-2014-01-23.sql |     6 +
 .../sql/updates/sqlazure/3.2.3-2014-02-20.sql |     1 +
 .../sql/updates/sqlazure/3.3.0-2014-02-16.sql |     1 +
 .../sql/updates/sqlazure/3.3.0-2014-04-02.sql |     6 +
 .../sql/updates/sqlazure/3.3.4-2014-08-03.sql |     1 +
 .../sql/updates/sqlazure/3.3.6-2014-09-30.sql |     5 +
 .../sql/updates/sqlazure/3.4.0-2014-08-24.sql |     2 +
 .../sql/updates/sqlazure/3.4.0-2014-09-01.sql |    12 +
 .../sql/updates/sqlazure/3.4.0-2014-09-16.sql |     6 +
 .../sql/updates/sqlazure/3.4.0-2014-10-20.sql |     1 +
 .../sql/updates/sqlazure/3.4.0-2014-12-03.sql |     1 +
 .../sql/updates/sqlazure/3.4.0-2015-01-21.sql |     2 +
 .../sql/updates/sqlazure/3.4.0-2015-02-26.sql |     2 +
 .../sql/updates/sqlazure/3.4.4-2015-07-11.sql |     8 +
 .../sql/updates/sqlazure/3.5.0-2015-10-13.sql |     6 +
 .../sql/updates/sqlazure/3.5.0-2015-10-26.sql |     3 +
 .../sql/updates/sqlazure/3.5.0-2015-10-30.sql |     1 +
 .../sql/updates/sqlazure/3.5.0-2015-11-04.sql |     8 +
 .../sql/updates/sqlazure/3.5.0-2015-11-05.sql |     9 +
 .../sql/updates/sqlazure/3.5.0-2016-03-01.sql |    15 +
 .../sql/updates/sqlazure/3.6.0-2016-04-01.sql |     8 +
 .../sql/updates/sqlazure/3.6.0-2016-04-06.sql |     1 +
 .../sql/updates/sqlazure/3.6.0-2016-04-08.sql |    16 +
 .../sql/updates/sqlazure/3.6.0-2016-04-09.sql |     5 +
 .../sql/updates/sqlazure/3.6.0-2016-05-06.sql |    12 +
 .../sql/updates/sqlazure/3.6.0-2016-06-01.sql |     1 +
 .../sql/updates/sqlazure/3.6.0-2016-06-05.sql |     5 +
 .../sql/updates/sqlazure/3.6.3-2016-08-15.sql |     5 +
 .../sql/updates/sqlazure/3.6.3-2016-08-16.sql |     2 +
 .../sql/updates/sqlazure/3.7.0-2016-08-06.sql |     6 +
 .../sql/updates/sqlazure/3.7.0-2016-08-22.sql |     6 +
 .../sql/updates/sqlazure/3.7.0-2016-08-29.sql |   144 +
 .../sql/updates/sqlazure/3.7.0-2016-09-29.sql |     3 +
 .../sql/updates/sqlazure/3.7.0-2016-10-01.sql |     6 +
 .../sql/updates/sqlazure/3.7.0-2016-10-02.sql |     1 +
 .../sql/updates/sqlazure/3.7.0-2016-11-04.sql |    13 +
 .../sql/updates/sqlazure/3.7.0-2016-11-19.sql |     3 +
 .../sql/updates/sqlazure/3.7.0-2016-11-24.sql |     5 +
 .../sql/updates/sqlazure/3.7.0-2017-01-08.sql |    32 +
 .../sql/updates/sqlazure/3.7.0-2017-01-09.sql |     8 +
 .../sql/updates/sqlazure/3.7.0-2017-01-15.sql |     6 +
 .../sql/updates/sqlazure/3.7.0-2017-01-17.sql |    95 +
 .../sql/updates/sqlazure/3.7.0-2017-01-31.sql |     6 +
 .../sql/updates/sqlazure/3.7.0-2017-02-02.sql |     6 +
 .../sql/updates/sqlazure/3.7.0-2017-02-15.sql |     2 +
 .../sql/updates/sqlazure/3.7.0-2017-02-16.sql |   329 +
 .../sql/updates/sqlazure/3.7.0-2017-02-17.sql |    21 +
 .../sql/updates/sqlazure/3.7.0-2017-03-03.sql |    31 +
 .../sql/updates/sqlazure/3.7.0-2017-03-09.sql |    19 +
 .../sql/updates/sqlazure/3.7.0-2017-04-10.sql |     3 +
 .../sql/updates/sqlazure/3.7.0-2017-04-19.sql |     3 +
 .../sql/updates/sqlazure/3.7.4-2017-07-05.sql |     1 +
 .../sql/updates/sqlazure/3.8.0-2017-07-28.sql |     1 +
 .../sql/updates/sqlazure/3.8.0-2017-07-31.sql |     4 +
 .../sql/updates/sqlazure/3.8.2-2017-10-14.sql |     8 +
 .../sql/updates/sqlazure/3.8.4-2018-01-16.sql |     2 +
 .../sql/updates/sqlazure/3.8.6-2018-02-14.sql |     6 +
 .../sql/updates/sqlazure/3.8.8-2018-05-18.sql |     2 +
 .../sql/updates/sqlazure/3.8.9-2018-06-19.sql |     3 +
 .../com_admin/views/help/tmpl/default.php     |    40 +
 .../com_admin/views/help/tmpl/default.xml     |     8 +
 .../com_admin/views/help/tmpl/langforum.php   |    23 +
 .../com_admin/views/help/view.html.php        |   100 +
 .../com_admin/views/profile/tmpl/edit.php     |    77 +
 .../com_admin/views/profile/view.html.php     |    90 +
 .../com_admin/views/sysinfo/tmpl/default.php  |    48 +
 .../com_admin/views/sysinfo/tmpl/default.xml  |     8 +
 .../views/sysinfo/tmpl/default_config.php     |    43 +
 .../views/sysinfo/tmpl/default_directory.php  |    43 +
 .../views/sysinfo/tmpl/default_phpinfo.php    |    15 +
 .../sysinfo/tmpl/default_phpsettings.php      |   170 +
 .../views/sysinfo/tmpl/default_system.php     |   121 +
 .../com_admin/views/sysinfo/view.html.php     |   124 +
 .../com_admin/views/sysinfo/view.json.php     |    67 +
 .../com_admin/views/sysinfo/view.text.php     |   176 +
 .../components/com_ajax/ajax.php              |    12 +
 .../components/com_ajax/ajax.xml              |    29 +
 .../components/com_associations/access.xml    |     8 +
 .../com_associations/associations.php         |    41 +
 .../com_associations/associations.xml         |    30 +
 .../components/com_associations/config.xml    |    17 +
 .../com_associations/controller.php           |    27 +
 .../controllers/association.php               |    86 +
 .../controllers/associations.php              |   130 +
 .../com_associations/helpers/associations.php |   664 +
 .../joomla/searchtools/default/bar.php        |    32 +
 .../com_associations/models/association.php   |    36 +
 .../com_associations/models/associations.php  |   532 +
 .../models/fields/itemlanguage.php            |   104 +
 .../models/fields/itemtype.php                |    62 +
 .../models/fields/modalassociation.php        |   105 +
 .../models/forms/association.xml              |    21 +
 .../models/forms/filter_associations.xml      |   117 +
 .../views/association/tmpl/edit.php           |    72 +
 .../views/association/view.html.php           |   223 +
 .../views/associations/tmpl/default.php       |   182 +
 .../views/associations/tmpl/default.xml       |     8 +
 .../views/associations/tmpl/modal.php         |   176 +
 .../views/associations/view.html.php          |   235 +
 .../components/com_banners/access.xml         |    72 +
 .../components/com_banners/banners.php        |    21 +
 .../components/com_banners/banners.xml        |    87 +
 .../components/com_banners/config.xml         |   105 +
 .../components/com_banners/controller.php     |    61 +
 .../com_banners/controllers/banner.php        |   110 +
 .../com_banners/controllers/banners.php       |   109 +
 .../com_banners/controllers/client.php        |    26 +
 .../com_banners/controllers/clients.php       |    42 +
 .../com_banners/controllers/tracks.php        |    88 +
 .../com_banners/controllers/tracks.raw.php    |   119 +
 .../com_banners/helpers/banners.php           |   299 +
 .../com_banners/helpers/html/banner.php       |   116 +
 .../components/com_banners/models/banner.php  |   573 +
 .../components/com_banners/models/banners.php |   282 +
 .../components/com_banners/models/client.php  |   152 +
 .../components/com_banners/models/clients.php |   309 +
 .../com_banners/models/download.php           |    84 +
 .../models/fields/bannerclient.php            |    42 +
 .../com_banners/models/fields/clicks.php      |    42 +
 .../com_banners/models/fields/impmade.php     |    42 +
 .../com_banners/models/fields/imptotal.php    |    49 +
 .../com_banners/models/forms/banner.xml       |   380 +
 .../com_banners/models/forms/client.xml       |   151 +
 .../com_banners/models/forms/download.xml     |    32 +
 .../models/forms/filter_banners.xml           |   112 +
 .../models/forms/filter_clients.xml           |    71 +
 .../models/forms/filter_tracks.xml            |   114 +
 .../components/com_banners/models/tracks.php  |   542 +
 .../com_banners/sql/install.mysql.utf8.sql    |    85 +
 .../com_banners/sql/uninstall.mysql.utf8.sql  |     6 +
 .../components/com_banners/tables/banner.php  |   329 +
 .../components/com_banners/tables/client.php  |   126 +
 .../com_banners/views/banner/tmpl/edit.php    |   100 +
 .../com_banners/views/banner/view.html.php    |   123 +
 .../views/banners/tmpl/default.php            |   195 +
 .../views/banners/tmpl/default_batch_body.php |    37 +
 .../banners/tmpl/default_batch_footer.php     |    17 +
 .../com_banners/views/banners/view.html.php   |   187 +
 .../com_banners/views/client/tmpl/edit.php    |    61 +
 .../com_banners/views/client/view.html.php    |   130 +
 .../views/clients/tmpl/default.php            |   165 +
 .../com_banners/views/clients/view.html.php   |   137 +
 .../views/download/tmpl/default.php           |    37 +
 .../com_banners/views/download/view.html.php  |    45 +
 .../com_banners/views/tracks/tmpl/default.php |   110 +
 .../com_banners/views/tracks/view.html.php    |   134 +
 .../com_banners/views/tracks/view.raw.php     |    49 +
 .../components/com_cache/access.xml           |     7 +
 .../components/com_cache/cache.php            |    19 +
 .../components/com_cache/cache.xml            |    26 +
 .../components/com_cache/config.xml           |    17 +
 .../components/com_cache/controller.php       |   165 +
 .../components/com_cache/helpers/cache.php    |    64 +
 .../components/com_cache/models/cache.php     |   308 +
 .../com_cache/models/forms/filter_cache.xml   |    49 +
 .../com_cache/views/cache/tmpl/default.php    |    81 +
 .../com_cache/views/cache/tmpl/default.xml    |     8 +
 .../com_cache/views/cache/view.html.php       |    92 +
 .../com_cache/views/purge/tmpl/default.php    |    22 +
 .../com_cache/views/purge/tmpl/default.xml    |     8 +
 .../com_cache/views/purge/view.html.php       |    57 +
 .../components/com_categories/categories.php  |    28 +
 .../components/com_categories/categories.xml  |    27 +
 .../components/com_categories/controller.php  |   100 +
 .../com_categories/controllers/categories.php |   170 +
 .../com_categories/controllers/category.php   |   190 +
 .../com_categories/helpers/association.php    |    63 +
 .../com_categories/helpers/categories.php     |   188 +
 .../helpers/html/categoriesadministrator.php  |    88 +
 .../com_categories/models/categories.php      |   404 +
 .../com_categories/models/category.php        |  1332 ++
 .../models/fields/categoryedit.php            |   421 +
 .../models/fields/categoryparent.php          |   192 +
 .../models/fields/modal/category.php          |   280 +
 .../com_categories/models/forms/category.xml  |   300 +
 .../models/forms/filter_categories.xml        |   109 +
 .../com_categories/tables/category.php        |    33 +
 .../views/categories/tmpl/default.php         |   287 +
 .../views/categories/tmpl/default.xml         |    21 +
 .../categories/tmpl/default_batch_body.php    |    69 +
 .../categories/tmpl/default_batch_footer.php  |    17 +
 .../views/categories/tmpl/modal.php           |   147 +
 .../views/categories/view.html.php            |   286 +
 .../views/category/tmpl/edit.php              |   106 +
 .../views/category/tmpl/edit.xml              |    26 +
 .../views/category/tmpl/edit_associations.php |    12 +
 .../views/category/tmpl/edit_metadata.php     |    12 +
 .../views/category/tmpl/modal.php             |    33 +
 .../category/tmpl/modal_associations.php      |    12 +
 .../views/category/tmpl/modal_extrafields.php |    10 +
 .../views/category/tmpl/modal_metadata.php    |    12 +
 .../views/category/tmpl/modal_options.php     |    48 +
 .../views/category/view.html.php              |   245 +
 .../components/com_checkin/checkin.php        |    19 +
 .../components/com_checkin/checkin.xml        |    25 +
 .../components/com_checkin/config.xml         |    27 +
 .../components/com_checkin/controller.php     |    92 +
 .../components/com_checkin/models/checkin.php |   254 +
 .../models/forms/filter_checkin.xml           |    38 +
 .../views/checkin/tmpl/default.php            |    68 +
 .../views/checkin/tmpl/default.xml            |     8 +
 .../com_checkin/views/checkin/view.html.php   |   105 +
 .../components/com_config/access.xml          |     6 +
 .../components/com_config/config.php          |    31 +
 .../components/com_config/config.xml          |    27 +
 .../components/com_config/controller.php      |    67 +
 .../controller/application/cancel.php         |    41 +
 .../controller/application/display.php        |    27 +
 .../controller/application/removeroot.php     |    68 +
 .../controller/application/save.php           |   125 +
 .../controller/application/sendtestmail.php   |    52 +
 .../controller/application/store.php          |    44 +
 .../controller/component/cancel.php           |    36 +
 .../controller/component/display.php          |    27 +
 .../com_config/controller/component/save.php  |   144 +
 .../com_config/controllers/application.php    |   118 +
 .../com_config/controllers/component.php      |    90 +
 .../components/com_config/helper/config.php   |   127 +
 .../com_config/model/application.php          |   890 +
 .../components/com_config/model/component.php |   217 +
 .../model/field/configcomponents.php          |    82 +
 .../com_config/model/field/filters.php        |   160 +
 .../com_config/model/form/application.xml     |  1315 ++
 .../com_config/models/application.php         |    25 +
 .../com_config/models/component.php           |    25 +
 .../com_config/view/application/html.php      |    99 +
 .../com_config/view/application/json.php      |    68 +
 .../view/application/tmpl/default.php         |   127 +
 .../view/application/tmpl/default.xml         |     8 +
 .../view/application/tmpl/default_cache.php   |    14 +
 .../view/application/tmpl/default_cookie.php  |    14 +
 .../application/tmpl/default_database.php     |    14 +
 .../view/application/tmpl/default_debug.php   |    14 +
 .../view/application/tmpl/default_filters.php |    15 +
 .../view/application/tmpl/default_ftp.php     |    14 +
 .../application/tmpl/default_ftplogin.php     |    30 +
 .../view/application/tmpl/default_locale.php  |    14 +
 .../view/application/tmpl/default_mail.php    |    37 +
 .../application/tmpl/default_metadata.php     |    14 +
 .../application/tmpl/default_navigation.php   |    26 +
 .../application/tmpl/default_permissions.php  |    17 +
 .../view/application/tmpl/default_proxy.php   |    14 +
 .../view/application/tmpl/default_seo.php     |    14 +
 .../view/application/tmpl/default_server.php  |    14 +
 .../view/application/tmpl/default_session.php |    14 +
 .../view/application/tmpl/default_site.php    |    14 +
 .../view/application/tmpl/default_system.php  |    14 +
 .../com_config/view/component/html.php        |   103 +
 .../view/component/tmpl/default.php           |   120 +
 .../view/component/tmpl/default.xml           |    19 +
 .../component/tmpl/default_navigation.php     |    31 +
 .../components/com_contact/access.xml         |    35 +
 .../components/com_contact/config.xml         |  1104 ++
 .../components/com_contact/contact.php        |    20 +
 .../components/com_contact/contact.xml        |    67 +
 .../components/com_contact/controller.php     |    58 +
 .../com_contact/controllers/contact.php       |   110 +
 .../com_contact/controllers/contacts.php      |   110 +
 .../com_contact/helpers/associations.php      |   194 +
 .../com_contact/helpers/contact.php           |   236 +
 .../com_contact/helpers/html/contact.php      |   129 +
 .../components/com_contact/models/contact.php |   663 +
 .../com_contact/models/contacts.php           |   353 +
 .../models/fields/modal/contact.php           |   275 +
 .../com_contact/models/forms/contact.xml      |  1005 ++
 .../com_contact/models/forms/fields/mail.xml  |    12 +
 .../models/forms/filter_contacts.xml          |   136 +
 .../com_contact/sql/install.mysql.utf8.sql    |    58 +
 .../com_contact/sql/uninstall.mysql.utf8.sql  |     2 +
 .../components/com_contact/tables/contact.php |   240 +
 .../com_contact/views/contact/tmpl/edit.php   |   124 +
 .../views/contact/tmpl/edit_associations.php  |    12 +
 .../views/contact/tmpl/edit_metadata.php      |    12 +
 .../views/contact/tmpl/edit_params.php        |    28 +
 .../com_contact/views/contact/tmpl/modal.php  |    33 +
 .../views/contact/tmpl/modal_associations.php |    12 +
 .../views/contact/tmpl/modal_metadata.php     |    12 +
 .../views/contact/tmpl/modal_params.php       |    28 +
 .../com_contact/views/contact/view.html.php   |   148 +
 .../views/contacts/tmpl/default.php           |   201 +
 .../views/contacts/tmpl/default_batch.php     |    62 +
 .../contacts/tmpl/default_batch_body.php      |    45 +
 .../contacts/tmpl/default_batch_footer.php    |    17 +
 .../com_contact/views/contacts/tmpl/modal.php |   156 +
 .../com_contact/views/contacts/view.html.php  |   210 +
 .../components/com_content/access.xml         |    40 +
 .../components/com_content/config.xml         |  1149 ++
 .../components/com_content/content.php        |    22 +
 .../components/com_content/content.xml        |    42 +
 .../components/com_content/controller.php     |    56 +
 .../com_content/controllers/article.php       |   137 +
 .../com_content/controllers/articles.php      |   125 +
 .../com_content/controllers/featured.php      |    96 +
 .../com_content/helpers/associations.php      |   190 +
 .../com_content/helpers/content.php           |   272 +
 .../helpers/html/contentadministrator.php     |   129 +
 .../components/com_content/models/article.php |   996 ++
 .../com_content/models/articles.php           |   441 +
 .../components/com_content/models/feature.php |    50 +
 .../com_content/models/featured.php           |   283 +
 .../models/fields/modal/article.php           |   272 +
 .../com_content/models/fields/voteradio.php   |    58 +
 .../com_content/models/forms/article.xml      |  1060 ++
 .../models/forms/filter_articles.xml          |   150 +
 .../models/forms/filter_featured.xml          |   142 +
 .../com_content/tables/featured.php           |    30 +
 .../com_content/views/article/tmpl/edit.php   |   143 +
 .../com_content/views/article/tmpl/edit.xml   |    17 +
 .../views/article/tmpl/edit_associations.php  |    12 +
 .../views/article/tmpl/edit_metadata.php      |    12 +
 .../com_content/views/article/tmpl/modal.php  |    33 +
 .../views/article/tmpl/modal_associations.php |    12 +
 .../views/article/tmpl/modal_metadata.php     |    12 +
 .../views/article/tmpl/pagebreak.php          |    40 +
 .../com_content/views/article/view.html.php   |   159 +
 .../views/articles/tmpl/default.php           |   281 +
 .../views/articles/tmpl/default.xml           |     8 +
 .../articles/tmpl/default_batch_body.php      |    40 +
 .../articles/tmpl/default_batch_footer.php    |    17 +
 .../com_content/views/articles/tmpl/modal.php |   169 +
 .../com_content/views/articles/view.html.php  |   228 +
 .../views/featured/tmpl/default.php           |   249 +
 .../views/featured/tmpl/default.xml           |     8 +
 .../com_content/views/featured/view.html.php  |   185 +
 .../com_contenthistory/contenthistory.php     |    20 +
 .../com_contenthistory/contenthistory.xml     |    32 +
 .../com_contenthistory/controller.php         |    19 +
 .../controllers/history.php                   |   128 +
 .../controllers/preview.php                   |    34 +
 .../helpers/contenthistory.php                |   384 +
 .../helpers/html/textdiff.php                 |    65 +
 .../com_contenthistory/models/compare.php     |   151 +
 .../com_contenthistory/models/history.php     |   424 +
 .../com_contenthistory/models/preview.php     |   137 +
 .../views/compare/tmpl/compare.php            |    97 +
 .../views/compare/view.html.php               |    45 +
 .../views/history/tmpl/modal.php              |   191 +
 .../views/history/view.html.php               |    48 +
 .../views/preview/tmpl/preview.php            |    46 +
 .../views/preview/view.html.php               |    54 +
 .../components/com_cpanel/controller.php      |    19 +
 .../components/com_cpanel/cpanel.php          |    16 +
 .../components/com_cpanel/cpanel.xml          |    24 +
 .../com_cpanel/views/cpanel/tmpl/default.php  |    76 +
 .../com_cpanel/views/cpanel/tmpl/default.xml  |     8 +
 .../com_cpanel/views/cpanel/view.html.php     |    67 +
 .../components/com_fields/controller.php      |    59 +
 .../com_fields/controllers/field.php          |   180 +
 .../com_fields/controllers/fields.php         |    42 +
 .../com_fields/controllers/group.php          |   160 +
 .../com_fields/controllers/groups.php         |    42 +
 .../components/com_fields/fields.php          |    30 +
 .../components/com_fields/fields.xml          |    37 +
 .../components/com_fields/helpers/fields.php  |   800 +
 .../com_fields/libraries/fieldslistplugin.php |    79 +
 .../com_fields/libraries/fieldsplugin.php     |   279 +
 .../components/com_fields/models/field.php    |  1138 ++
 .../components/com_fields/models/fields.php   |   389 +
 .../models/fields/fieldcontexts.php           |    71 +
 .../com_fields/models/fields/fieldgroups.php  |    67 +
 .../com_fields/models/fields/section.php      |    68 +
 .../com_fields/models/fields/type.php         |    86 +
 .../com_fields/models/forms/field.xml         |   305 +
 .../com_fields/models/forms/filter_fields.xml |   100 +
 .../com_fields/models/forms/filter_groups.xml |    74 +
 .../com_fields/models/forms/group.xml         |   169 +
 .../components/com_fields/models/group.php    |   374 +
 .../components/com_fields/models/groups.php   |   244 +
 .../components/com_fields/tables/field.php    |   263 +
 .../components/com_fields/tables/group.php    |   175 +
 .../com_fields/views/field/tmpl/edit.php      |   107 +
 .../com_fields/views/field/view.html.php      |   144 +
 .../com_fields/views/fields/tmpl/default.php  |   198 +
 .../views/fields/tmpl/default_batch_body.php  |    69 +
 .../fields/tmpl/default_batch_footer.php      |    17 +
 .../com_fields/views/fields/tmpl/modal.php    |   117 +
 .../com_fields/views/fields/view.html.php     |   211 +
 .../com_fields/views/group/tmpl/edit.php      |    82 +
 .../com_fields/views/group/view.html.php      |   168 +
 .../com_fields/views/groups/tmpl/default.php  |   177 +
 .../views/groups/tmpl/default_batch_body.php  |    27 +
 .../groups/tmpl/default_batch_footer.php      |    17 +
 .../com_fields/views/groups/view.html.php     |   213 +
 .../components/com_finder/access.xml          |    12 +
 .../components/com_finder/config.xml          |   352 +
 .../components/com_finder/controller.php      |    58 +
 .../com_finder/controllers/filter.php         |   240 +
 .../com_finder/controllers/filters.php        |    34 +
 .../com_finder/controllers/index.php          |    69 +
 .../com_finder/controllers/indexer.json.php   |   416 +
 .../com_finder/controllers/maps.php           |    34 +
 .../components/com_finder/finder.php          |    19 +
 .../components/com_finder/finder.xml          |    60 +
 .../components/com_finder/helpers/finder.php  |   111 +
 .../com_finder/helpers/html/finder.php        |   130 +
 .../com_finder/helpers/indexer/adapter.php    |   927 ++
 .../helpers/indexer/driver/mysql.php          |   562 +
 .../helpers/indexer/driver/postgresql.php     |   516 +
 .../helpers/indexer/driver/sqlsrv.php         |   531 +
 .../com_finder/helpers/indexer/helper.php     |   526 +
 .../com_finder/helpers/indexer/indexer.php    |   566 +
 .../com_finder/helpers/indexer/parser.php     |   124 +
 .../helpers/indexer/parser/html.php           |   147 +
 .../com_finder/helpers/indexer/parser/rtf.php |    42 +
 .../com_finder/helpers/indexer/parser/txt.php |    34 +
 .../com_finder/helpers/indexer/query.php      |  1366 ++
 .../com_finder/helpers/indexer/result.php     |   428 +
 .../com_finder/helpers/indexer/stemmer.php    |    83 +
 .../com_finder/helpers/indexer/stemmer/fr.php |   265 +
 .../helpers/indexer/stemmer/porter_en.php     |   446 +
 .../helpers/indexer/stemmer/snowball.php      |   133 +
 .../com_finder/helpers/indexer/taxonomy.php   |   382 +
 .../com_finder/helpers/indexer/token.php      |   147 +
 .../com_finder/helpers/language.php           |   144 +
 .../com_finder/models/fields/branches.php     |    40 +
 .../com_finder/models/fields/contentmap.php   |   122 +
 .../com_finder/models/fields/contenttypes.php |    84 +
 .../com_finder/models/fields/directories.php  |    93 +
 .../com_finder/models/fields/searchfilter.php |    52 +
 .../components/com_finder/models/filter.php   |   173 +
 .../components/com_finder/models/filters.php  |   134 +
 .../com_finder/models/forms/filter.xml        |   173 +
 .../models/forms/filter_filters.xml           |    54 +
 .../com_finder/models/forms/filter_index.xml  |    72 +
 .../com_finder/models/forms/filter_maps.xml   |    67 +
 .../components/com_finder/models/index.php    |   455 +
 .../components/com_finder/models/indexer.php  |    19 +
 .../components/com_finder/models/maps.php     |   408 +
 .../com_finder/models/statistics.php          |    78 +
 .../com_finder/sql/install.mysql.sql          |   496 +
 .../com_finder/sql/install.postgresql.sql     |  1025 ++
 .../com_finder/sql/uninstall.mysql.sql        |    25 +
 .../com_finder/sql/uninstall.postgresql.sql   |    25 +
 .../components/com_finder/tables/filter.php   |   254 +
 .../components/com_finder/tables/link.php     |    30 +
 .../components/com_finder/tables/map.php      |   102 +
 .../com_finder/views/filter/tmpl/edit.php     |   103 +
 .../com_finder/views/filter/view.html.php     |   159 +
 .../com_finder/views/filters/tmpl/default.php |   140 +
 .../com_finder/views/filters/view.html.php    |   145 +
 .../com_finder/views/index/tmpl/default.php   |   138 +
 .../com_finder/views/index/view.html.php      |   170 +
 .../com_finder/views/indexer/tmpl/default.php |    30 +
 .../com_finder/views/indexer/view.html.php    |    20 +
 .../com_finder/views/maps/tmpl/default.php    |   158 +
 .../com_finder/views/maps/view.html.php       |   148 +
 .../views/statistics/tmpl/default.php         |    56 +
 .../com_finder/views/statistics/view.html.php |    50 +
 .../components/com_installer/access.xml       |    10 +
 .../components/com_installer/config.xml       |    65 +
 .../components/com_installer/controller.php   |    64 +
 .../com_installer/controllers/database.php    |    42 +
 .../com_installer/controllers/discover.php    |    59 +
 .../com_installer/controllers/install.php     |    96 +
 .../com_installer/controllers/manage.php      |   130 +
 .../com_installer/controllers/update.php      |   200 +
 .../com_installer/controllers/updatesites.php |   125 +
 .../com_installer/helpers/html/manage.php     |    67 +
 .../helpers/html/updatesites.php              |    57 +
 .../com_installer/helpers/installer.php       |   187 +
 .../components/com_installer/installer.php    |    20 +
 .../components/com_installer/installer.xml    |    28 +
 .../com_installer/models/database.php         |   327 +
 .../com_installer/models/discover.php         |   258 +
 .../com_installer/models/extension.php        |   224 +
 .../models/fields/extensionstatus.php         |    44 +
 .../com_installer/models/fields/folder.php    |    44 +
 .../com_installer/models/fields/location.php  |    44 +
 .../com_installer/models/fields/type.php      |    44 +
 .../models/forms/filter_discover.xml          |    71 +
 .../models/forms/filter_languages.xml         |    38 +
 .../models/forms/filter_manage.xml            |    85 +
 .../models/forms/filter_update.xml            |    64 +
 .../models/forms/filter_updatesites.xml       |    81 +
 .../com_installer/models/install.php          |   415 +
 .../com_installer/models/languages.php        |   253 +
 .../com_installer/models/manage.php           |   350 +
 .../com_installer/models/update.php           |   602 +
 .../com_installer/models/updatesites.php      |   472 +
 .../com_installer/models/warnings.php         |   169 +
 .../views/database/tmpl/default.php           |    77 +
 .../views/database/tmpl/default.xml           |     8 +
 .../views/database/view.html.php              |    92 +
 .../views/default/tmpl/default_ftp.php        |    42 +
 .../views/default/tmpl/default_message.php    |    30 +
 .../com_installer/views/default/view.php      |    86 +
 .../views/discover/tmpl/default.php           |   127 +
 .../views/discover/tmpl/default.xml           |     8 +
 .../views/discover/tmpl/default_item.php      |    35 +
 .../views/discover/view.html.php              |    97 +
 .../views/install/tmpl/default.php            |   163 +
 .../views/install/tmpl/default.xml            |     8 +
 .../com_installer/views/install/view.html.php |    61 +
 .../views/languages/tmpl/default.php          |   108 +
 .../views/languages/tmpl/default.xml          |     8 +
 .../views/languages/view.html.php             |    80 +
 .../views/manage/tmpl/default.php             |   144 +
 .../views/manage/tmpl/default.xml             |     8 +
 .../com_installer/views/manage/view.html.php  |    92 +
 .../views/update/tmpl/default.php             |   138 +
 .../views/update/tmpl/default.xml             |     8 +
 .../com_installer/views/update/view.html.php  |    92 +
 .../views/updatesites/tmpl/default.php        |   121 +
 .../views/updatesites/tmpl/default.xml        |     8 +
 .../views/updatesites/view.html.php           |    98 +
 .../views/warnings/tmpl/default.php           |    41 +
 .../views/warnings/tmpl/default.xml           |     8 +
 .../views/warnings/view.html.php              |    58 +
 .../components/com_joomlaupdate/access.xml    |    10 +
 .../components/com_joomlaupdate/config.xml    |    54 +
 .../com_joomlaupdate/controller.php           |    74 +
 .../com_joomlaupdate/controllers/update.php   |   473 +
 .../com_joomlaupdate/helpers/joomlaupdate.php |    46 +
 .../com_joomlaupdate/helpers/select.php       |    39 +
 .../com_joomlaupdate/joomlaupdate.php         |    19 +
 .../com_joomlaupdate/joomlaupdate.xml         |    36 +
 .../com_joomlaupdate/models/default.php       |  1026 ++
 .../components/com_joomlaupdate/restore.php   |  8439 ++++++++++
 .../com_joomlaupdate/restore_finalisation.php |   190 +
 .../views/default/tmpl/complete.php           |    24 +
 .../views/default/tmpl/default.php            |    83 +
 .../views/default/tmpl/default.xml            |     8 +
 .../views/default/tmpl/default_nodownload.php |    21 +
 .../views/default/tmpl/default_reinstall.php  |   116 +
 .../views/default/tmpl/default_update.php     |   125 +
 .../default/tmpl/default_updatemefirst.php    |    21 +
 .../views/default/tmpl/default_upload.php     |   170 +
 .../views/default/view.html.php               |   220 +
 .../views/update/tmpl/default.php             |    63 +
 .../views/update/tmpl/finaliseconfirm.php     |    95 +
 .../views/update/view.html.php                |    39 +
 .../views/upload/tmpl/captive.php             |    94 +
 .../views/upload/view.html.php                |    46 +
 .../components/com_languages/access.xml       |    11 +
 .../components/com_languages/config.xml       |    29 +
 .../components/com_languages/controller.php   |    56 +
 .../com_languages/controllers/installed.php   |    95 +
 .../com_languages/controllers/language.php    |    33 +
 .../com_languages/controllers/languages.php   |    67 +
 .../com_languages/controllers/override.php    |   206 +
 .../com_languages/controllers/overrides.php   |    78 +
 .../controllers/strings.json.php              |    42 +
 .../com_languages/helpers/html/languages.php  |    87 +
 .../com_languages/helpers/jsonresponse.php    |   134 +
 .../com_languages/helpers/languages.php       |   136 +
 .../com_languages/helpers/multilangstatus.php |   321 +
 .../components/com_languages/languages.php    |    20 +
 .../components/com_languages/languages.xml    |    29 +
 .../models/forms/filter_installed.xml         |    61 +
 .../models/forms/filter_languages.xml         |    68 +
 .../com_languages/models/forms/language.xml   |   128 +
 .../com_languages/models/forms/override.xml   |    90 +
 .../com_languages/models/installed.php        |   487 +
 .../com_languages/models/language.php         |   267 +
 .../com_languages/models/languages.php        |   220 +
 .../com_languages/models/override.php         |   215 +
 .../com_languages/models/overrides.php        |   301 +
 .../com_languages/models/strings.php          |   167 +
 .../views/installed/tmpl/default.php          |   132 +
 .../views/installed/tmpl/default.xml          |     8 +
 .../views/installed/view.html.php             |   130 +
 .../views/language/tmpl/edit.php              |    86 +
 .../views/language/view.html.php              |    92 +
 .../views/languages/tmpl/default.php          |   166 +
 .../views/languages/tmpl/default.xml          |     8 +
 .../views/languages/view.html.php             |   136 +
 .../views/multilangstatus/tmpl/default.php    |   251 +
 .../views/multilangstatus/view.html.php       |    42 +
 .../views/override/tmpl/edit.php              |   155 +
 .../views/override/view.html.php              |   122 +
 .../views/overrides/tmpl/default.php          |   123 +
 .../views/overrides/tmpl/default.xml          |     8 +
 .../views/overrides/view.html.php             |   124 +
 .../components/com_login/controller.php       |   128 +
 .../components/com_login/login.php            |    23 +
 .../components/com_login/login.xml            |    25 +
 .../components/com_login/models/login.php     |   183 +
 .../com_login/views/login/tmpl/default.php    |    32 +
 .../com_login/views/login/view.html.php       |    41 +
 .../components/com_media/access.xml           |    10 +
 .../components/com_media/config.xml           |   131 +
 .../components/com_media/controller.php       |    97 +
 .../com_media/controllers/file.json.php       |   261 +
 .../components/com_media/controllers/file.php |   332 +
 .../com_media/controllers/folder.php          |   232 +
 .../components/com_media/helpers/media.php    |   200 +
 .../com_media/layouts/toolbar/deletemedia.php |    32 +
 .../com_media/layouts/toolbar/newfolder.php   |    16 +
 .../com_media/layouts/toolbar/uploadmedia.php |    16 +
 .../components/com_media/media.php            |    46 +
 .../components/com_media/media.xml            |    37 +
 .../components/com_media/models/list.php      |   248 +
 .../components/com_media/models/manager.php   |   178 +
 .../com_media/views/images/tmpl/default.php   |   195 +
 .../com_media/views/images/view.html.php      |    46 +
 .../views/imageslist/tmpl/default.php         |    66 +
 .../views/imageslist/tmpl/default_folder.php  |    23 +
 .../views/imageslist/tmpl/default_image.php   |    30 +
 .../com_media/views/imageslist/view.html.php  |    86 +
 .../com_media/views/media/tmpl/default.php    |   149 +
 .../com_media/views/media/tmpl/default.xml    |     8 +
 .../views/media/tmpl/default_folders.php      |    30 +
 .../views/media/tmpl/default_navigation.php   |    20 +
 .../com_media/views/media/view.html.php       |   141 +
 .../views/medialist/tmpl/default.php          |    10 +
 .../views/medialist/tmpl/details.php          |   133 +
 .../views/medialist/tmpl/details_doc.php      |    42 +
 .../views/medialist/tmpl/details_docs.php     |    54 +
 .../views/medialist/tmpl/details_folder.php   |    35 +
 .../views/medialist/tmpl/details_folders.php  |    42 +
 .../views/medialist/tmpl/details_img.php      |    42 +
 .../views/medialist/tmpl/details_imgs.php     |    59 +
 .../views/medialist/tmpl/details_up.php       |    32 +
 .../views/medialist/tmpl/details_video.php    |    54 +
 .../views/medialist/tmpl/details_videos.php   |    67 +
 .../com_media/views/medialist/tmpl/thumbs.php |   117 +
 .../views/medialist/tmpl/thumbs_docs.php      |    40 +
 .../views/medialist/tmpl/thumbs_folders.php   |    35 +
 .../views/medialist/tmpl/thumbs_imgs.php      |    44 +
 .../views/medialist/tmpl/thumbs_up.php        |    27 +
 .../views/medialist/tmpl/thumbs_videos.php    |    47 +
 .../com_media/views/medialist/view.html.php   |    63 +
 .../components/com_menus/access.xml           |    19 +
 .../components/com_menus/config.xml           |    65 +
 .../components/com_menus/controller.php       |    77 +
 .../components/com_menus/controllers/item.php |   613 +
 .../com_menus/controllers/items.php           |   315 +
 .../components/com_menus/controllers/menu.php |   212 +
 .../com_menus/controllers/menus.php           |   227 +
 .../com_menus/helpers/associations.php        |   165 +
 .../com_menus/helpers/html/menus.php          |   258 +
 .../components/com_menus/helpers/menus.php    |   572 +
 .../layouts/joomla/menu/edit_modules.php      |    70 +
 .../layouts/joomla/searchtools/default.php    |    83 +
 .../joomla/searchtools/default/bar.php        |    46 +
 .../components/com_menus/menus.php            |    19 +
 .../components/com_menus/menus.xml            |    28 +
 .../models/fields/componentscategory.php      |    76 +
 .../models/fields/menuitembytype.php          |   278 +
 .../com_menus/models/fields/menuordering.php  |   119 +
 .../com_menus/models/fields/menuparent.php    |   106 +
 .../com_menus/models/fields/menupreset.php    |    51 +
 .../com_menus/models/fields/menutype.php      |   120 +
 .../com_menus/models/fields/modal/menu.php    |   404 +
 .../com_menus/models/forms/filter_items.xml   |   127 +
 .../models/forms/filter_itemsadmin.xml        |    92 +
 .../com_menus/models/forms/filter_menus.xml   |    47 +
 .../com_menus/models/forms/item.xml           |   240 +
 .../com_menus/models/forms/item_alias.xml     |    82 +
 .../com_menus/models/forms/item_component.xml |   148 +
 .../com_menus/models/forms/item_heading.xml   |    63 +
 .../com_menus/models/forms/item_separator.xml |    57 +
 .../com_menus/models/forms/item_url.xml       |    85 +
 .../com_menus/models/forms/itemadmin.xml      |   196 +
 .../models/forms/itemadmin_alias.xml          |    81 +
 .../models/forms/itemadmin_component.xml      |    63 +
 .../models/forms/itemadmin_container.xml      |    82 +
 .../models/forms/itemadmin_heading.xml        |    75 +
 .../models/forms/itemadmin_separator.xml      |    33 +
 .../com_menus/models/forms/itemadmin_url.xml  |    82 +
 .../com_menus/models/forms/menu.xml           |    78 +
 .../components/com_menus/models/item.php      |  1771 ++
 .../components/com_menus/models/items.php     |   553 +
 .../components/com_menus/models/menu.php      |   362 +
 .../components/com_menus/models/menus.php     |   245 +
 .../components/com_menus/models/menutypes.php |   621 +
 .../components/com_menus/presets/joomla.xml   |   582 +
 .../components/com_menus/presets/menu.xsd     |    68 +
 .../components/com_menus/presets/modern.xml   |   612 +
 .../components/com_menus/tables/menu.php      |    46 +
 .../com_menus/views/item/tmpl/edit.php        |   238 +
 .../com_menus/views/item/tmpl/edit.xml        |    21 +
 .../views/item/tmpl/edit_associations.php     |    12 +
 .../views/item/tmpl/edit_container.php        |   148 +
 .../views/item/tmpl/edit_modules.php          |   181 +
 .../views/item/tmpl/edit_options.php          |    44 +
 .../com_menus/views/item/tmpl/modal.php       |    33 +
 .../views/item/tmpl/modal_associations.php    |    12 +
 .../views/item/tmpl/modal_options.php         |    44 +
 .../com_menus/views/item/view.html.php        |   172 +
 .../com_menus/views/items/tmpl/default.php    |   281 +
 .../com_menus/views/items/tmpl/default.xml    |    21 +
 .../views/items/tmpl/default_batch_body.php   |    90 +
 .../views/items/tmpl/default_batch_footer.php |    21 +
 .../com_menus/views/items/tmpl/modal.php      |   182 +
 .../com_menus/views/items/view.html.php       |   383 +
 .../com_menus/views/menu/tmpl/edit.php        |    64 +
 .../com_menus/views/menu/tmpl/edit.xml        |     8 +
 .../com_menus/views/menu/view.html.php        |   119 +
 .../com_menus/views/menu/view.xml.php         |   170 +
 .../com_menus/views/menus/tmpl/default.php    |   256 +
 .../com_menus/views/menus/tmpl/default.xml    |     8 +
 .../com_menus/views/menus/view.html.php       |   119 +
 .../views/menutypes/tmpl/default.php          |    56 +
 .../com_menus/views/menutypes/view.html.php   |   147 +
 .../components/com_messages/access.xml        |    10 +
 .../components/com_messages/config.xml        |    19 +
 .../components/com_messages/controller.php    |    52 +
 .../com_messages/controllers/config.php       |    88 +
 .../com_messages/controllers/message.php      |    57 +
 .../com_messages/controllers/messages.php     |    34 +
 .../com_messages/helpers/html/messages.php    |    97 +
 .../com_messages/helpers/messages.php         |    87 +
 .../components/com_messages/messages.php      |    20 +
 .../components/com_messages/messages.xml      |    31 +
 .../components/com_messages/models/config.php |   171 +
 .../models/fields/messagestates.php           |    43 +
 .../models/fields/usermessages.php            |    90 +
 .../com_messages/models/forms/config.xml      |    37 +
 .../models/forms/filter_messages.xml          |    51 +
 .../com_messages/models/forms/message.xml     |    31 +
 .../com_messages/models/message.php           |   412 +
 .../com_messages/models/messages.php          |   148 +
 .../com_messages/tables/message.php           |   147 +
 .../views/config/tmpl/default.php             |    43 +
 .../com_messages/views/config/view.html.php   |    51 +
 .../views/message/tmpl/default.php            |    53 +
 .../com_messages/views/message/tmpl/edit.php  |    57 +
 .../com_messages/views/message/view.html.php  |    81 +
 .../views/messages/tmpl/default.php           |   110 +
 .../com_messages/views/messages/view.html.php |   121 +
 .../components/com_modules/access.xml         |    18 +
 .../components/com_modules/config.xml         |    54 +
 .../components/com_modules/controller.php     |   123 +
 .../com_modules/controllers/module.php        |   310 +
 .../com_modules/controllers/modules.php       |    70 +
 .../com_modules/helpers/html/modules.php      |   245 +
 .../com_modules/helpers/modules.php           |   359 +
 .../components/com_modules/helpers/xml.php    |    62 +
 .../layouts/toolbar/cancelselect.php          |    16 +
 .../com_modules/layouts/toolbar/newmodule.php |    17 +
 .../models/fields/modulesmodule.php           |    45 +
 .../models/fields/modulesposition.php         |    45 +
 .../com_modules/models/forms/advanced.xml     |    48 +
 .../models/forms/filter_modules.xml           |   120 +
 .../models/forms/filter_modulesadmin.xml      |   109 +
 .../com_modules/models/forms/module.xml       |   172 +
 .../com_modules/models/forms/moduleadmin.xml  |   166 +
 .../components/com_modules/models/module.php  |  1120 ++
 .../components/com_modules/models/modules.php |   426 +
 .../com_modules/models/positions.php          |   244 +
 .../components/com_modules/models/select.php  |   157 +
 .../components/com_modules/modules.php        |    24 +
 .../components/com_modules/modules.xml        |    27 +
 .../com_modules/views/module/tmpl/edit.php    |   296 +
 .../views/module/tmpl/edit_assignment.php     |   172 +
 .../views/module/tmpl/edit_options.php        |    38 +
 .../views/module/tmpl/edit_positions.php      |    34 +
 .../com_modules/views/module/tmpl/modal.php   |    21 +
 .../com_modules/views/module/view.html.php    |   121 +
 .../com_modules/views/module/view.json.php    |    58 +
 .../views/modules/tmpl/default.php            |   232 +
 .../views/modules/tmpl/default.xml            |     8 +
 .../views/modules/tmpl/default_batch_body.php |    72 +
 .../modules/tmpl/default_batch_footer.php     |    17 +
 .../com_modules/views/modules/tmpl/modal.php  |   136 +
 .../com_modules/views/modules/view.html.php   |   232 +
 .../views/positions/tmpl/modal.php            |   106 +
 .../com_modules/views/positions/view.html.php |    48 +
 .../views/preview/tmpl/default.php            |    34 +
 .../com_modules/views/preview/view.html.php   |    36 +
 .../com_modules/views/select/tmpl/default.php |    42 +
 .../com_modules/views/select/view.html.php    |    77 +
 .../components/com_newsfeeds/access.xml       |    20 +
 .../components/com_newsfeeds/config.xml       |   476 +
 .../components/com_newsfeeds/controller.php   |    50 +
 .../com_newsfeeds/controllers/newsfeed.php    |   126 +
 .../com_newsfeeds/controllers/newsfeeds.php   |    49 +
 .../com_newsfeeds/helpers/associations.php    |   193 +
 .../com_newsfeeds/helpers/html/newsfeed.php   |    89 +
 .../com_newsfeeds/helpers/newsfeeds.php       |   168 +
 .../models/fields/modal/newsfeed.php          |   276 +
 .../com_newsfeeds/models/fields/newsfeeds.php |    63 +
 .../models/forms/filter_newsfeeds.xml         |   135 +
 .../com_newsfeeds/models/forms/newsfeed.xml   |   493 +
 .../com_newsfeeds/models/newsfeed.php         |   588 +
 .../com_newsfeeds/models/newsfeeds.php        |   297 +
 .../components/com_newsfeeds/newsfeeds.php    |    20 +
 .../components/com_newsfeeds/newsfeeds.xml    |    64 +
 .../com_newsfeeds/sql/install.mysql.utf8.sql  |    44 +
 .../sql/uninstall.mysql.utf8.sql              |     2 +
 .../com_newsfeeds/tables/newsfeed.php         |   166 +
 .../views/newsfeed/tmpl/edit.php              |   111 +
 .../views/newsfeed/tmpl/edit_associations.php |    12 +
 .../views/newsfeed/tmpl/edit_display.php      |    13 +
 .../views/newsfeed/tmpl/edit_metadata.php     |    12 +
 .../views/newsfeed/tmpl/edit_params.php       |    26 +
 .../views/newsfeed/tmpl/modal.php             |    33 +
 .../newsfeed/tmpl/modal_associations.php      |    12 +
 .../views/newsfeed/tmpl/modal_display.php     |    13 +
 .../views/newsfeed/tmpl/modal_metadata.php    |    12 +
 .../views/newsfeed/tmpl/modal_params.php      |    26 +
 .../views/newsfeed/view.html.php              |   137 +
 .../views/newsfeeds/tmpl/default.php          |   200 +
 .../newsfeeds/tmpl/default_batch_body.php     |    40 +
 .../newsfeeds/tmpl/default_batch_footer.php   |    17 +
 .../views/newsfeeds/tmpl/modal.php            |   131 +
 .../views/newsfeeds/view.html.php             |   192 +
 .../components/com_plugins/access.xml         |     9 +
 .../components/com_plugins/config.xml         |    18 +
 .../components/com_plugins/controller.php     |    53 +
 .../com_plugins/controllers/plugin.php        |    19 +
 .../com_plugins/controllers/plugins.php       |    34 +
 .../com_plugins/helpers/plugins.php           |   135 +
 .../models/fields/pluginordering.php          |    66 +
 .../com_plugins/models/fields/plugintype.php  |    44 +
 .../models/forms/filter_plugins.xml           |    75 +
 .../com_plugins/models/forms/plugin.xml       |    71 +
 .../components/com_plugins/models/plugin.php  |   370 +
 .../components/com_plugins/models/plugins.php |   297 +
 .../components/com_plugins/plugins.php        |    20 +
 .../components/com_plugins/plugins.xml        |    27 +
 .../com_plugins/views/plugin/tmpl/edit.php    |   160 +
 .../views/plugin/tmpl/edit_options.php        |    51 +
 .../com_plugins/views/plugin/tmpl/modal.php   |    29 +
 .../com_plugins/views/plugin/view.html.php    |    91 +
 .../views/plugins/tmpl/default.php            |   148 +
 .../views/plugins/tmpl/default.xml            |     8 +
 .../com_plugins/views/plugins/view.html.php   |   104 +
 .../components/com_postinstall/access.xml     |     7 +
 .../components/com_postinstall/config.xml     |    18 +
 .../com_postinstall/controllers/message.php   |   120 +
 .../components/com_postinstall/fof.xml        |    18 +
 .../com_postinstall/models/messages.php       |   487 +
 .../com_postinstall/postinstall.php           |    13 +
 .../com_postinstall/postinstall.xml           |    28 +
 .../components/com_postinstall/toolbar.php    |    31 +
 .../views/messages/tmpl/default.php           |    80 +
 .../views/messages/tmpl/default.xml           |     8 +
 .../views/messages/view.html.php              |    68 +
 .../components/com_redirect/access.xml        |    12 +
 .../components/com_redirect/config.xml        |    53 +
 .../components/com_redirect/controller.php    |    59 +
 .../com_redirect/controllers/link.php         |    20 +
 .../com_redirect/controllers/links.php        |   190 +
 .../com_redirect/helpers/html/redirect.php    |    62 +
 .../com_redirect/helpers/redirect.php         |   132 +
 .../com_redirect/layouts/toolbar/batch.php    |    20 +
 .../com_redirect/models/fields/redirect.php   |   123 +
 .../models/forms/filter_links.xml             |    67 +
 .../com_redirect/models/forms/link.xml        |   108 +
 .../components/com_redirect/models/link.php   |   265 +
 .../components/com_redirect/models/links.php  |   244 +
 .../components/com_redirect/redirect.php      |    19 +
 .../components/com_redirect/redirect.xml      |    30 +
 .../components/com_redirect/tables/link.php   |   130 +
 .../com_redirect/views/link/tmpl/edit.php     |    51 +
 .../com_redirect/views/link/view.html.php     |    94 +
 .../com_redirect/views/links/tmpl/default.php |   172 +
 .../com_redirect/views/links/tmpl/default.xml |     8 +
 .../views/links/tmpl/default_addform.php      |    40 +
 .../views/links/tmpl/default_batch_body.php   |    24 +
 .../views/links/tmpl/default_batch_footer.php |    17 +
 .../com_redirect/views/links/view.html.php    |   190 +
 .../components/com_search/access.xml          |     9 +
 .../components/com_search/config.xml          |    91 +
 .../components/com_search/controller.php      |    44 +
 .../com_search/controllers/searches.php       |    58 +
 .../components/com_search/helpers/search.php  |   327 +
 .../components/com_search/helpers/site.php    |    44 +
 .../models/forms/filter_searches.xml          |    33 +
 .../components/com_search/models/searches.php |   191 +
 .../components/com_search/search.php          |    19 +
 .../components/com_search/search.xml          |    38 +
 .../views/searches/tmpl/default.php           |    88 +
 .../views/searches/tmpl/default.xml           |     8 +
 .../com_search/views/searches/view.html.php   |   104 +
 .../components/com_tags/access.xml            |    12 +
 .../components/com_tags/config.xml            |   429 +
 .../components/com_tags/controller.php        |    50 +
 .../components/com_tags/controllers/tag.php   |    72 +
 .../components/com_tags/controllers/tags.php  |    65 +
 .../components/com_tags/helpers/tags.php      |    63 +
 .../com_tags/models/forms/filter_tags.xml     |    94 +
 .../components/com_tags/models/forms/tag.xml  |   366 +
 .../components/com_tags/models/tag.php        |   444 +
 .../components/com_tags/models/tags.php       |   385 +
 .../components/com_tags/tables/tag.php        |   277 +
 .../components/com_tags/tags.php              |    20 +
 .../components/com_tags/tags.xml              |    42 +
 .../com_tags/views/tag/tmpl/edit.php          |    67 +
 .../com_tags/views/tag/tmpl/edit_metadata.php |    33 +
 .../com_tags/views/tag/tmpl/edit_options.php  |    63 +
 .../com_tags/views/tag/view.html.php          |   130 +
 .../com_tags/views/tags/tmpl/default.php      |   287 +
 .../com_tags/views/tags/tmpl/default.xml      |     8 +
 .../views/tags/tmpl/default_batch_body.php    |    26 +
 .../views/tags/tmpl/default_batch_footer.php  |    17 +
 .../com_tags/views/tags/view.html.php         |   165 +
 .../components/com_templates/access.xml       |    12 +
 .../components/com_templates/config.xml       |    88 +
 .../components/com_templates/controller.php   |    75 +
 .../com_templates/controllers/style.php       |   160 +
 .../com_templates/controllers/styles.php      |   142 +
 .../com_templates/controllers/template.php    |   749 +
 .../com_templates/helpers/html/templates.php  |    98 +
 .../com_templates/helpers/template.php        |   178 +
 .../com_templates/helpers/templates.php       |   200 +
 .../models/fields/templatelocation.php        |    44 +
 .../models/fields/templatename.php            |    49 +
 .../models/forms/filter_styles.xml            |    70 +
 .../models/forms/filter_templates.xml         |    46 +
 .../com_templates/models/forms/source.xml     |    28 +
 .../com_templates/models/forms/style.xml      |    51 +
 .../models/forms/style_administrator.xml      |    16 +
 .../com_templates/models/forms/style_site.xml |    15 +
 .../components/com_templates/models/style.php |   729 +
 .../com_templates/models/styles.php           |   199 +
 .../com_templates/models/template.php         |  1451 ++
 .../com_templates/models/templates.php        |   163 +
 .../components/com_templates/tables/style.php |   140 +
 .../components/com_templates/templates.php    |    22 +
 .../components/com_templates/templates.xml    |    29 +
 .../com_templates/views/style/tmpl/edit.php   |   105 +
 .../views/style/tmpl/edit_assignment.php      |    46 +
 .../views/style/tmpl/edit_options.php         |    40 +
 .../com_templates/views/style/view.html.php   |   127 +
 .../com_templates/views/style/view.json.php   |    72 +
 .../views/styles/tmpl/default.php             |   150 +
 .../views/styles/tmpl/default.xml             |     8 +
 .../com_templates/views/styles/view.html.php  |   111 +
 .../views/template/tmpl/default.php           |   504 +
 .../template/tmpl/default_description.php     |    20 +
 .../views/template/tmpl/default_folders.php   |    25 +
 .../template/tmpl/default_modal_copy_body.php |    27 +
 .../tmpl/default_modal_copy_footer.php        |    13 +
 .../tmpl/default_modal_delete_body.php        |    16 +
 .../tmpl/default_modal_delete_footer.php      |    22 +
 .../template/tmpl/default_modal_file_body.php |    70 +
 .../tmpl/default_modal_file_footer.php        |    12 +
 .../tmpl/default_modal_folder_body.php        |    34 +
 .../tmpl/default_modal_folder_footer.php      |    21 +
 .../tmpl/default_modal_rename_body.php        |    31 +
 .../tmpl/default_modal_rename_footer.php      |    13 +
 .../tmpl/default_modal_resize_body.php        |    35 +
 .../tmpl/default_modal_resize_footer.php      |    13 +
 .../views/template/tmpl/default_tree.php      |    64 +
 .../views/template/tmpl/readonly.php          |    27 +
 .../views/template/view.html.php              |   299 +
 .../views/templates/tmpl/default.php          |   113 +
 .../views/templates/tmpl/default.xml          |     8 +
 .../views/templates/view.html.php             |   109 +
 .../components/com_users/access.xml           |    34 +
 .../components/com_users/config.xml           |   325 +
 .../components/com_users/controller.php       |   109 +
 .../com_users/controllers/group.php           |    68 +
 .../com_users/controllers/groups.php          |   140 +
 .../com_users/controllers/level.php           |   130 +
 .../com_users/controllers/levels.php          |    40 +
 .../components/com_users/controllers/mail.php |    65 +
 .../components/com_users/controllers/note.php |    50 +
 .../com_users/controllers/notes.php           |    42 +
 .../com_users/controllers/profile.json.php    |    21 +
 .../components/com_users/controllers/user.php |    88 +
 .../com_users/controllers/users.php           |   142 +
 .../components/com_users/helpers/debug.php    |   154 +
 .../com_users/helpers/html/users.php          |   240 +
 .../components/com_users/helpers/users.php    |   362 +
 .../com_users/models/debuggroup.php           |   264 +
 .../components/com_users/models/debuguser.php |   246 +
 .../com_users/models/fields/groupparent.php   |    67 +
 .../com_users/models/fields/levels.php        |    41 +
 .../com_users/models/forms/fields/user.xml    |    12 +
 .../models/forms/filter_debuggroup.xml        |    69 +
 .../models/forms/filter_debuguser.xml         |    64 +
 .../com_users/models/forms/filter_groups.xml  |    39 +
 .../com_users/models/forms/filter_levels.xml  |    39 +
 .../com_users/models/forms/filter_notes.xml   |    75 +
 .../com_users/models/forms/filter_users.xml   |    94 +
 .../com_users/models/forms/group.xml          |    46 +
 .../com_users/models/forms/level.xml          |    35 +
 .../com_users/models/forms/mail.xml           |    70 +
 .../com_users/models/forms/note.xml           |   152 +
 .../com_users/models/forms/user.xml           |   224 +
 .../components/com_users/models/group.php     |   330 +
 .../components/com_users/models/groups.php    |   247 +
 .../components/com_users/models/level.php     |   289 +
 .../components/com_users/models/levels.php    |   229 +
 .../components/com_users/models/mail.php      |   216 +
 .../components/com_users/models/note.php      |   146 +
 .../components/com_users/models/notes.php     |   220 +
 .../components/com_users/models/user.php      |  1396 ++
 .../components/com_users/models/users.php     |   523 +
 .../components/com_users/tables/note.php      |   159 +
 .../components/com_users/users.php            |    22 +
 .../components/com_users/users.xml            |    40 +
 .../views/debuggroup/tmpl/default.php         |   115 +
 .../com_users/views/debuggroup/view.html.php  |   106 +
 .../views/debuguser/tmpl/default.php          |   115 +
 .../com_users/views/debuguser/view.html.php   |   106 +
 .../com_users/views/group/tmpl/edit.php       |    54 +
 .../com_users/views/group/tmpl/edit.xml       |     8 +
 .../com_users/views/group/view.html.php       |   105 +
 .../com_users/views/groups/tmpl/default.php   |   144 +
 .../com_users/views/groups/tmpl/default.xml   |     8 +
 .../com_users/views/groups/view.html.php      |   124 +
 .../com_users/views/level/tmpl/edit.php       |    47 +
 .../com_users/views/level/tmpl/edit.xml       |     8 +
 .../com_users/views/level/view.html.php       |   105 +
 .../com_users/views/levels/tmpl/default.php   |   140 +
 .../com_users/views/levels/tmpl/default.xml   |     8 +
 .../com_users/views/levels/view.html.php      |   125 +
 .../com_users/views/mail/tmpl/default.php     |    75 +
 .../com_users/views/mail/tmpl/default.xml     |     8 +
 .../com_users/views/mail/view.html.php        |    65 +
 .../com_users/views/note/tmpl/edit.php        |    90 +
 .../com_users/views/note/tmpl/edit.xml        |     8 +
 .../com_users/views/note/view.html.php        |   128 +
 .../com_users/views/notes/tmpl/default.php    |   129 +
 .../com_users/views/notes/tmpl/default.xml    |     8 +
 .../com_users/views/notes/tmpl/modal.php      |    54 +
 .../com_users/views/notes/view.html.php       |   168 +
 .../com_users/views/user/tmpl/edit.php        |   133 +
 .../com_users/views/user/tmpl/edit.xml        |     8 +
 .../com_users/views/user/tmpl/edit_groups.php |    15 +
 .../com_users/views/user/view.html.php        |   114 +
 .../com_users/views/users/tmpl/default.php    |   188 +
 .../com_users/views/users/tmpl/default.xml    |     8 +
 .../views/users/tmpl/default_batch_body.php   |    50 +
 .../views/users/tmpl/default_batch_footer.php |    17 +
 .../com_users/views/users/tmpl/modal.php      |   128 +
 .../com_users/views/users/view.html.php       |   194 +
 core/administrator/help/en-GB/toc.json        |     1 +
 core/administrator/help/helpsites.xml         |     7 +
 core/administrator/includes/defines.php       |    25 +
 core/administrator/includes/framework.php     |   101 +
 core/administrator/includes/helper.php        |    50 +
 core/administrator/includes/subtoolbar.php    |   213 +
 core/administrator/includes/toolbar.php       |   655 +
 core/administrator/index.php                  |    51 +
 .../language/en-GB/en-GB.com_admin.ini        |   196 +
 .../language/en-GB/en-GB.com_admin.sys.ini    |    12 +
 .../language/en-GB/en-GB.com_ajax.ini         |    13 +
 .../language/en-GB/en-GB.com_ajax.sys.ini     |     8 +
 .../language/en-GB/en-GB.com_associations.ini |    52 +
 .../en-GB/en-GB.com_associations.sys.ini      |     7 +
 .../language/en-GB/en-GB.com_banners.ini      |   246 +
 .../language/en-GB/en-GB.com_banners.sys.ini  |    17 +
 .../language/en-GB/en-GB.com_cache.ini        |    41 +
 .../language/en-GB/en-GB.com_cache.sys.ini    |    11 +
 .../language/en-GB/en-GB.com_categories.ini   |    87 +
 .../en-GB/en-GB.com_categories.sys.ini        |    13 +
 .../language/en-GB/en-GB.com_checkin.ini      |    23 +
 .../language/en-GB/en-GB.com_checkin.sys.ini  |    10 +
 .../language/en-GB/en-GB.com_config.ini       |   265 +
 .../language/en-GB/en-GB.com_config.sys.ini   |    14 +
 .../language/en-GB/en-GB.com_contact.ini      |   315 +
 .../language/en-GB/en-GB.com_contact.sys.ini  |    27 +
 .../language/en-GB/en-GB.com_content.ini      |   209 +
 .../language/en-GB/en-GB.com_content.sys.ini  |    45 +
 .../en-GB/en-GB.com_contenthistory.ini        |    47 +
 .../en-GB/en-GB.com_contenthistory.sys.ini    |     7 +
 .../language/en-GB/en-GB.com_cpanel.ini       |    39 +
 .../language/en-GB/en-GB.com_cpanel.sys.ini   |    10 +
 .../language/en-GB/en-GB.com_fields.ini       |   105 +
 .../language/en-GB/en-GB.com_fields.sys.ini   |     7 +
 .../language/en-GB/en-GB.com_finder.ini       |   242 +
 .../language/en-GB/en-GB.com_finder.sys.ini   |     9 +
 .../language/en-GB/en-GB.com_installer.ini    |   276 +
 .../en-GB/en-GB.com_installer.sys.ini         |    23 +
 .../language/en-GB/en-GB.com_joomlaupdate.ini |    81 +
 .../en-GB/en-GB.com_joomlaupdate.sys.ini      |    10 +
 .../language/en-GB/en-GB.com_languages.ini    |   154 +
 .../en-GB/en-GB.com_languages.sys.ini         |    13 +
 .../language/en-GB/en-GB.com_login.ini        |    10 +
 .../language/en-GB/en-GB.com_login.sys.ini    |     7 +
 .../language/en-GB/en-GB.com_mailto.sys.ini   |     8 +
 .../language/en-GB/en-GB.com_media.ini        |   104 +
 .../language/en-GB/en-GB.com_media.sys.ini    |     9 +
 .../language/en-GB/en-GB.com_menus.ini        |   241 +
 .../language/en-GB/en-GB.com_menus.sys.ini    |    17 +
 .../language/en-GB/en-GB.com_messages.ini     |    77 +
 .../language/en-GB/en-GB.com_messages.sys.ini |     9 +
 .../language/en-GB/en-GB.com_modules.ini      |   204 +
 .../language/en-GB/en-GB.com_modules.sys.ini  |    14 +
 .../language/en-GB/en-GB.com_newsfeeds.ini    |   140 +
 .../en-GB/en-GB.com_newsfeeds.sys.ini         |    24 +
 .../language/en-GB/en-GB.com_plugins.ini      |    46 +
 .../language/en-GB/en-GB.com_plugins.sys.ini  |     9 +
 .../language/en-GB/en-GB.com_postinstall.ini  |    18 +
 .../en-GB/en-GB.com_postinstall.sys.ini       |     9 +
 .../language/en-GB/en-GB.com_redirect.ini     |   100 +
 .../language/en-GB/en-GB.com_redirect.sys.ini |     7 +
 .../language/en-GB/en-GB.com_search.ini       |    47 +
 .../language/en-GB/en-GB.com_search.sys.ini   |    10 +
 .../language/en-GB/en-GB.com_tags.ini         |   189 +
 .../language/en-GB/en-GB.com_tags.sys.ini     |    36 +
 .../language/en-GB/en-GB.com_templates.ini    |   246 +
 .../en-GB/en-GB.com_templates.sys.ini         |    11 +
 .../language/en-GB/en-GB.com_users.ini        |   382 +
 .../language/en-GB/en-GB.com_users.sys.ini    |    50 +
 .../language/en-GB/en-GB.com_weblinks.ini     |   127 +
 .../language/en-GB/en-GB.com_weblinks.sys.ini |    25 +
 .../language/en-GB/en-GB.com_wrapper.ini      |    22 +
 .../language/en-GB/en-GB.com_wrapper.sys.ini  |    10 +
 core/administrator/language/en-GB/en-GB.ini   |  1064 ++
 .../language/en-GB/en-GB.lib_joomla.ini       |   747 +
 .../language/en-GB/en-GB.localise.php         |    90 +
 .../language/en-GB/en-GB.mod_custom.ini       |     9 +
 .../language/en-GB/en-GB.mod_custom.sys.ini   |     9 +
 .../language/en-GB/en-GB.mod_feed.ini         |    26 +
 .../language/en-GB/en-GB.mod_feed.sys.ini     |     9 +
 .../language/en-GB/en-GB.mod_latest.ini       |    61 +
 .../language/en-GB/en-GB.mod_latest.sys.ini   |    10 +
 .../language/en-GB/en-GB.mod_logged.ini       |    20 +
 .../language/en-GB/en-GB.mod_logged.sys.ini   |    10 +
 .../language/en-GB/en-GB.mod_login.ini        |    13 +
 .../language/en-GB/en-GB.mod_login.sys.ini    |     9 +
 .../language/en-GB/en-GB.mod_menu.ini         |   109 +
 .../language/en-GB/en-GB.mod_menu.sys.ini     |     9 +
 .../en-GB/en-GB.mod_multilangstatus.ini       |     7 +
 .../en-GB/en-GB.mod_multilangstatus.sys.ini   |     8 +
 .../language/en-GB/en-GB.mod_popular.ini      |    37 +
 .../language/en-GB/en-GB.mod_popular.sys.ini  |     9 +
 .../language/en-GB/en-GB.mod_quickicon.ini    |    33 +
 .../en-GB/en-GB.mod_quickicon.sys.ini         |     9 +
 .../language/en-GB/en-GB.mod_sampledata.ini   |    10 +
 .../en-GB/en-GB.mod_sampledata.sys.ini        |     7 +
 .../language/en-GB/en-GB.mod_stats_admin.ini  |    25 +
 .../en-GB/en-GB.mod_stats_admin.sys.ini       |     9 +
 .../language/en-GB/en-GB.mod_status.ini       |    34 +
 .../language/en-GB/en-GB.mod_status.sys.ini   |     9 +
 .../language/en-GB/en-GB.mod_submenu.ini      |     8 +
 .../language/en-GB/en-GB.mod_submenu.sys.ini  |     9 +
 .../language/en-GB/en-GB.mod_title.ini        |     7 +
 .../language/en-GB/en-GB.mod_title.sys.ini    |     9 +
 .../language/en-GB/en-GB.mod_toolbar.ini      |     7 +
 .../language/en-GB/en-GB.mod_toolbar.sys.ini  |     9 +
 .../language/en-GB/en-GB.mod_version.ini      |    13 +
 .../language/en-GB/en-GB.mod_version.sys.ini  |     8 +
 .../en-GB/en-GB.plg_authentication_cookie.ini |    13 +
 .../en-GB.plg_authentication_cookie.sys.ini   |     7 +
 .../en-GB/en-GB.plg_authentication_gmail.ini  |    22 +
 .../en-GB.plg_authentication_gmail.sys.ini    |     7 +
 .../en-GB/en-GB.plg_authentication_joomla.ini |     8 +
 .../en-GB.plg_authentication_joomla.sys.ini   |     7 +
 .../en-GB/en-GB.plg_authentication_ldap.ini   |    37 +
 .../en-GB.plg_authentication_ldap.sys.ini     |     7 +
 .../en-GB/en-GB.plg_captcha_recaptcha.ini     |    65 +
 .../en-GB/en-GB.plg_captcha_recaptcha.sys.ini |     7 +
 .../en-GB/en-GB.plg_content_contact.ini       |     7 +
 .../en-GB/en-GB.plg_content_contact.sys.ini   |     7 +
 .../en-GB/en-GB.plg_content_emailcloak.ini    |    11 +
 .../en-GB.plg_content_emailcloak.sys.ini      |     7 +
 .../en-GB/en-GB.plg_content_fields.ini        |     7 +
 .../en-GB/en-GB.plg_content_fields.sys.ini    |     7 +
 .../en-GB/en-GB.plg_content_finder.ini        |    17 +
 .../en-GB/en-GB.plg_content_finder.sys.ini    |     7 +
 .../en-GB/en-GB.plg_content_joomla.ini        |    11 +
 .../en-GB/en-GB.plg_content_joomla.sys.ini    |     7 +
 .../en-GB/en-GB.plg_content_loadmodule.ini    |    14 +
 .../en-GB.plg_content_loadmodule.sys.ini      |     7 +
 .../en-GB/en-GB.plg_content_pagebreak.ini     |    27 +
 .../en-GB/en-GB.plg_content_pagebreak.sys.ini |     8 +
 .../en-GB.plg_content_pagenavigation.ini      |    19 +
 .../en-GB.plg_content_pagenavigation.sys.ini  |     9 +
 .../language/en-GB/en-GB.plg_content_vote.ini |    17 +
 .../en-GB/en-GB.plg_content_vote.sys.ini      |     7 +
 .../en-GB/en-GB.plg_editors-xtd_article.ini   |     8 +
 .../en-GB.plg_editors-xtd_article.sys.ini     |     9 +
 .../en-GB/en-GB.plg_editors-xtd_contact.ini   |     8 +
 .../en-GB.plg_editors-xtd_contact.sys.ini     |     7 +
 .../en-GB/en-GB.plg_editors-xtd_fields.ini    |     8 +
 .../en-GB.plg_editors-xtd_fields.sys.ini      |     7 +
 .../en-GB/en-GB.plg_editors-xtd_image.ini     |     9 +
 .../en-GB/en-GB.plg_editors-xtd_image.sys.ini |     8 +
 .../en-GB/en-GB.plg_editors-xtd_menu.ini      |     8 +
 .../en-GB/en-GB.plg_editors-xtd_menu.sys.ini  |     7 +
 .../en-GB/en-GB.plg_editors-xtd_module.ini    |     8 +
 .../en-GB.plg_editors-xtd_module.sys.ini      |     7 +
 .../en-GB/en-GB.plg_editors-xtd_pagebreak.ini |     8 +
 .../en-GB.plg_editors-xtd_pagebreak.sys.ini   |     7 +
 .../en-GB/en-GB.plg_editors-xtd_readmore.ini  |     9 +
 .../en-GB.plg_editors-xtd_readmore.sys.ini    |     7 +
 .../en-GB/en-GB.plg_editors_codemirror.ini    |    70 +
 .../en-GB.plg_editors_codemirror.sys.ini      |     7 +
 .../language/en-GB/en-GB.plg_editors_none.ini |     7 +
 .../en-GB/en-GB.plg_editors_none.sys.ini      |     7 +
 .../en-GB/en-GB.plg_editors_tinymce.ini       |   160 +
 .../en-GB/en-GB.plg_editors_tinymce.sys.ini   |     7 +
 .../en-GB/en-GB.plg_extension_joomla.ini      |     8 +
 .../en-GB/en-GB.plg_extension_joomla.sys.ini  |     7 +
 .../en-GB/en-GB.plg_fields_calendar.ini       |    12 +
 .../en-GB/en-GB.plg_fields_calendar.sys.ini   |     7 +
 .../en-GB/en-GB.plg_fields_checkboxes.ini     |    12 +
 .../en-GB/en-GB.plg_fields_checkboxes.sys.ini |     7 +
 .../language/en-GB/en-GB.plg_fields_color.ini |     8 +
 .../en-GB/en-GB.plg_fields_color.sys.ini      |     7 +
 .../en-GB/en-GB.plg_fields_editor.ini         |    17 +
 .../en-GB/en-GB.plg_fields_editor.sys.ini     |     7 +
 .../language/en-GB/en-GB.plg_fields_image.ini |     8 +
 .../en-GB/en-GB.plg_fields_image.sys.ini      |     7 +
 .../en-GB/en-GB.plg_fields_imagelist.ini      |    14 +
 .../en-GB/en-GB.plg_fields_imagelist.sys.ini  |     7 +
 .../en-GB/en-GB.plg_fields_integer.ini        |    16 +
 .../en-GB/en-GB.plg_fields_integer.sys.ini    |     7 +
 .../language/en-GB/en-GB.plg_fields_list.ini  |    14 +
 .../en-GB/en-GB.plg_fields_list.sys.ini       |     7 +
 .../language/en-GB/en-GB.plg_fields_media.ini |    16 +
 .../en-GB/en-GB.plg_fields_media.sys.ini      |     7 +
 .../language/en-GB/en-GB.plg_fields_radio.ini |    12 +
 .../en-GB/en-GB.plg_fields_radio.sys.ini      |     7 +
 .../language/en-GB/en-GB.plg_fields_sql.ini   |    15 +
 .../en-GB/en-GB.plg_fields_sql.sys.ini        |     7 +
 .../language/en-GB/en-GB.plg_fields_text.ini  |    12 +
 .../en-GB/en-GB.plg_fields_text.sys.ini       |     7 +
 .../en-GB/en-GB.plg_fields_textarea.ini       |    16 +
 .../en-GB/en-GB.plg_fields_textarea.sys.ini   |     7 +
 .../language/en-GB/en-GB.plg_fields_url.ini   |    12 +
 .../en-GB/en-GB.plg_fields_url.sys.ini        |     7 +
 .../language/en-GB/en-GB.plg_fields_user.ini  |    10 +
 .../en-GB/en-GB.plg_fields_user.sys.ini       |     7 +
 .../en-GB/en-GB.plg_fields_usergrouplist.ini  |    12 +
 .../en-GB.plg_fields_usergrouplist.sys.ini    |     7 +
 .../en-GB/en-GB.plg_finder_categories.ini     |     7 +
 .../en-GB/en-GB.plg_finder_categories.sys.ini |     9 +
 .../en-GB/en-GB.plg_finder_contacts.ini       |    16 +
 .../en-GB/en-GB.plg_finder_contacts.sys.ini   |     9 +
 .../en-GB/en-GB.plg_finder_content.ini        |    15 +
 .../en-GB/en-GB.plg_finder_content.sys.ini    |     9 +
 .../en-GB/en-GB.plg_finder_newsfeeds.ini      |    11 +
 .../en-GB/en-GB.plg_finder_newsfeeds.sys.ini  |     9 +
 .../language/en-GB/en-GB.plg_finder_tags.ini  |    10 +
 .../en-GB/en-GB.plg_finder_tags.sys.ini       |     9 +
 .../en-GB/en-GB.plg_finder_weblinks.ini       |    10 +
 .../en-GB/en-GB.plg_finder_weblinks.sys.ini   |     9 +
 .../en-GB.plg_installer_folderinstaller.ini   |     9 +
 ...n-GB.plg_installer_folderinstaller.sys.ini |     7 +
 .../en-GB.plg_installer_packageinstaller.ini  |    13 +
 ...-GB.plg_installer_packageinstaller.sys.ini |     7 +
 .../en-GB.plg_installer_urlinstaller.ini      |    10 +
 .../en-GB.plg_installer_urlinstaller.sys.ini  |     7 +
 .../en-GB.plg_installer_webinstaller.ini      |    12 +
 .../en-GB.plg_installer_webinstaller.sys.ini  |     7 +
 .../en-GB.plg_quickicon_extensionupdate.ini   |    15 +
 ...n-GB.plg_quickicon_extensionupdate.sys.ini |     7 +
 .../en-GB.plg_quickicon_joomlaupdate.ini      |    15 +
 .../en-GB.plg_quickicon_joomlaupdate.sys.ini  |     7 +
 .../en-GB.plg_quickicon_phpversioncheck.ini   |    11 +
 ...n-GB.plg_quickicon_phpversioncheck.sys.ini |     7 +
 .../en-GB/en-GB.plg_sampledata_blog.ini       |    64 +
 .../en-GB/en-GB.plg_sampledata_blog.sys.ini   |     7 +
 .../en-GB/en-GB.plg_search_categories.ini     |    11 +
 .../en-GB/en-GB.plg_search_categories.sys.ini |     7 +
 .../en-GB/en-GB.plg_search_contacts.ini       |    10 +
 .../en-GB/en-GB.plg_search_contacts.sys.ini   |     7 +
 .../en-GB/en-GB.plg_search_content.ini        |    13 +
 .../en-GB/en-GB.plg_search_content.sys.ini    |     7 +
 .../en-GB/en-GB.plg_search_newsfeeds.ini      |    10 +
 .../en-GB/en-GB.plg_search_newsfeeds.sys.ini  |     8 +
 .../language/en-GB/en-GB.plg_search_tags.ini  |    13 +
 .../en-GB/en-GB.plg_search_tags.sys.ini       |     7 +
 .../en-GB/en-GB.plg_search_weblinks.ini       |    10 +
 .../en-GB/en-GB.plg_search_weblinks.sys.ini   |     7 +
 .../language/en-GB/en-GB.plg_system_cache.ini |    15 +
 .../en-GB/en-GB.plg_system_cache.sys.ini      |     8 +
 .../language/en-GB/en-GB.plg_system_debug.ini |   106 +
 .../en-GB/en-GB.plg_system_debug.sys.ini      |     7 +
 .../en-GB/en-GB.plg_system_fields.ini         |     7 +
 .../en-GB/en-GB.plg_system_fields.sys.ini     |     7 +
 .../en-GB/en-GB.plg_system_highlight.ini      |     7 +
 .../en-GB/en-GB.plg_system_highlight.sys.ini  |     8 +
 .../en-GB/en-GB.plg_system_languagecode.ini   |    10 +
 .../en-GB.plg_system_languagecode.sys.ini     |     8 +
 .../en-GB/en-GB.plg_system_languagefilter.ini |    28 +
 .../en-GB.plg_system_languagefilter.sys.ini   |     7 +
 .../language/en-GB/en-GB.plg_system_log.ini   |     9 +
 .../en-GB/en-GB.plg_system_log.sys.ini        |     7 +
 .../en-GB/en-GB.plg_system_logout.ini         |     9 +
 .../en-GB/en-GB.plg_system_logout.sys.ini     |     7 +
 .../language/en-GB/en-GB.plg_system_p3p.ini   |     9 +
 .../en-GB/en-GB.plg_system_p3p.sys.ini        |     7 +
 .../en-GB/en-GB.plg_system_redirect.ini       |    18 +
 .../en-GB/en-GB.plg_system_redirect.sys.ini   |     7 +
 .../en-GB/en-GB.plg_system_remember.ini       |     7 +
 .../en-GB/en-GB.plg_system_remember.sys.ini   |     7 +
 .../language/en-GB/en-GB.plg_system_sef.ini   |     9 +
 .../en-GB/en-GB.plg_system_sef.sys.ini        |     7 +
 .../en-GB/en-GB.plg_system_sessiongc.ini      |    15 +
 .../en-GB/en-GB.plg_system_sessiongc.sys.ini  |     7 +
 .../language/en-GB/en-GB.plg_system_stats.ini |    33 +
 .../en-GB/en-GB.plg_system_stats.sys.ini      |     7 +
 .../en-GB.plg_system_updatenotification.ini   |    25 +
 ...n-GB.plg_system_updatenotification.sys.ini |     7 +
 .../en-GB/en-GB.plg_twofactorauth_totp.ini    |    36 +
 .../en-GB.plg_twofactorauth_totp.sys.ini      |     7 +
 .../en-GB/en-GB.plg_twofactorauth_yubikey.ini |    22 +
 .../en-GB.plg_twofactorauth_yubikey.sys.ini   |     7 +
 .../en-GB/en-GB.plg_user_contactcreator.ini   |    14 +
 .../en-GB.plg_user_contactcreator.sys.ini     |     7 +
 .../language/en-GB/en-GB.plg_user_joomla.ini  |    20 +
 .../en-GB/en-GB.plg_user_joomla.sys.ini       |     7 +
 .../language/en-GB/en-GB.plg_user_profile.ini |    46 +
 .../en-GB/en-GB.plg_user_profile.sys.ini      |     7 +
 .../language/en-GB/en-GB.tpl_hathor.ini       |    33 +
 .../language/en-GB/en-GB.tpl_hathor.sys.ini   |    19 +
 .../language/en-GB/en-GB.tpl_isis.ini         |    43 +
 .../language/en-GB/en-GB.tpl_isis.sys.ini     |    20 +
 core/administrator/language/en-GB/en-GB.xml   |    23 +
 core/administrator/language/en-GB/install.xml |    18 +
 .../language/overrides/index.html             |     1 +
 core/administrator/logs/index.html            |     1 +
 core/administrator/manifests/files/joomla.xml |    52 +
 .../administrator/manifests/libraries/fof.xml |    49 +
 .../manifests/libraries/idna_convert.xml      |    18 +
 .../manifests/libraries/joomla.xml            |    24 +
 .../manifests/libraries/phpass.xml            |    17 +
 .../manifests/libraries/phputf8.xml           |    18 +
 .../manifests/packages/index.html             |     1 +
 .../manifests/packages/pkg_en-GB.xml          |    26 +
 .../modules/mod_custom/mod_custom.php         |    21 +
 .../modules/mod_custom/mod_custom.xml         |    80 +
 .../modules/mod_custom/tmpl/default.php       |    12 +
 .../administrator/modules/mod_feed/helper.php |    52 +
 .../modules/mod_feed/mod_feed.php             |    31 +
 .../modules/mod_feed/mod_feed.xml             |   159 +
 .../modules/mod_feed/tmpl/default.php         |   115 +
 .../modules/mod_latest/helper.php             |   143 +
 .../modules/mod_latest/mod_latest.php         |    22 +
 .../modules/mod_latest/mod_latest.xml         |   101 +
 .../modules/mod_latest/tmpl/default.php       |    51 +
 .../modules/mod_logged/helper.php             |    78 +
 .../modules/mod_logged/mod_logged.php         |    22 +
 .../modules/mod_logged/mod_logged.xml         |    76 +
 .../modules/mod_logged/tmpl/default.php       |    50 +
 .../modules/mod_login/helper.php              |   100 +
 .../modules/mod_login/mod_login.php           |    19 +
 .../modules/mod_login/mod_login.xml           |    56 +
 .../modules/mod_login/tmpl/default.php        |   102 +
 .../administrator/modules/mod_menu/helper.php |    60 +
 core/administrator/modules/mod_menu/menu.php  |   477 +
 .../modules/mod_menu/mod_menu.php             |    29 +
 .../modules/mod_menu/mod_menu.xml             |   118 +
 .../modules/mod_menu/tmpl/default.php         |    35 +
 .../modules/mod_menu/tmpl/default_submenu.php |   138 +
 .../en-GB/en-GB.mod_multilangstatus.ini       |     7 +
 .../en-GB/en-GB.mod_multilangstatus.sys.ini   |     7 +
 .../mod_multilangstatus.php                   |    12 +
 .../mod_multilangstatus.xml                   |    50 +
 .../mod_multilangstatus/tmpl/default.php      |    48 +
 .../modules/mod_popular/helper.php            |   131 +
 .../modules/mod_popular/mod_popular.php       |    24 +
 .../modules/mod_popular/mod_popular.xml       |    91 +
 .../modules/mod_popular/tmpl/default.php      |    50 +
 .../modules/mod_quickicon/helper.php          |   220 +
 .../modules/mod_quickicon/mod_quickicon.php   |    16 +
 .../modules/mod_quickicon/mod_quickicon.xml   |    72 +
 .../modules/mod_quickicon/tmpl/default.php    |    18 +
 .../modules/mod_sampledata/helper.php         |    34 +
 .../modules/mod_sampledata/mod_sampledata.php |    16 +
 .../modules/mod_sampledata/mod_sampledata.xml |    37 +
 .../modules/mod_sampledata/tmpl/default.php   |    57 +
 .../modules/mod_stats_admin/helper.php        |   181 +
 .../language/en-GB.mod_stats_admin.ini        |    24 +
 .../language/en-GB.mod_stats_admin.sys.ini    |     9 +
 .../mod_stats_admin/mod_stats_admin.php       |    20 +
 .../mod_stats_admin/mod_stats_admin.xml       |   121 +
 .../modules/mod_stats_admin/tmpl/default.php  |    16 +
 .../modules/mod_status/mod_status.php         |    89 +
 .../modules/mod_status/mod_status.xml         |   108 +
 .../modules/mod_status/tmpl/default.php       |   114 +
 .../modules/mod_submenu/mod_submenu.php       |    24 +
 .../modules/mod_submenu/mod_submenu.xml       |    41 +
 .../modules/mod_submenu/tmpl/default.php      |    57 +
 .../modules/mod_title/mod_title.php           |    18 +
 .../modules/mod_title/mod_title.xml           |    41 +
 .../modules/mod_title/tmpl/default.php        |    14 +
 .../modules/mod_toolbar/mod_toolbar.php       |    14 +
 .../modules/mod_toolbar/mod_toolbar.xml       |    41 +
 .../modules/mod_toolbar/tmpl/default.php      |    13 +
 .../modules/mod_version/helper.php            |    44 +
 .../language/en-GB/en-GB.mod_version.ini      |    13 +
 .../language/en-GB/en-GB.mod_version.sys.ini  |     8 +
 .../modules/mod_version/mod_version.php       |    16 +
 .../modules/mod_version/mod_version.xml       |    68 +
 .../modules/mod_version/tmpl/default.php      |    14 +
 .../templates/hathor/LICENSE.txt              |   340 +
 .../templates/hathor/component.php            |    98 +
 .../administrator/templates/hathor/cpanel.php |   158 +
 .../templates/hathor/css/boldtext.css         |    18 +
 .../templates/hathor/css/colour_blue.css      |  1802 +++
 .../templates/hathor/css/colour_blue_rtl.css  |   374 +
 .../templates/hathor/css/colour_brown.css     |  1802 +++
 .../templates/hathor/css/colour_brown_rtl.css |   316 +
 .../hathor/css/colour_highcontrast.css        |  2155 +++
 .../hathor/css/colour_highcontrast_rtl.css    |   422 +
 .../templates/hathor/css/colour_standard.css  |  1802 +++
 .../hathor/css/colour_standard_rtl.css        |   370 +
 .../templates/hathor/css/error.css            |    74 +
 .../templates/hathor/css/ie7.css              |   121 +
 .../templates/hathor/css/ie8.css              |    21 +
 .../templates/hathor/css/template.css         |  3949 +++++
 .../templates/hathor/css/template_rtl.css     |  1325 ++
 .../templates/hathor/css/theme.css            |   297 +
 core/administrator/templates/hathor/error.php |    75 +
 .../templates/hathor/favicon.ico              |   Bin 0 -> 2019 bytes
 .../hathor/html/com_admin/help/default.php    |    49 +
 .../hathor/html/com_admin/profile/edit.php    |    71 +
 .../hathor/html/com_admin/sysinfo/default.php |    62 +
 .../html/com_admin/sysinfo/default_config.php |    43 +
 .../com_admin/sysinfo/default_directory.php   |    43 +
 .../com_admin/sysinfo/default_navigation.php  |    41 +
 .../com_admin/sysinfo/default_phpsettings.php |   162 +
 .../html/com_admin/sysinfo/default_system.php |   106 +
 .../com_associations/associations/default.php |   178 +
 .../hathor/html/com_banners/banner/edit.php   |   134 +
 .../html/com_banners/banners/default.php      |   235 +
 .../hathor/html/com_banners/client/edit.php   |   101 +
 .../html/com_banners/clients/default.php      |   143 +
 .../html/com_banners/download/default.php     |    44 +
 .../html/com_banners/tracks/default.php       |   149 +
 .../hathor/html/com_cache/cache/default.php   |    91 +
 .../hathor/html/com_cache/purge/default.php   |    45 +
 .../com_categories/categories/default.php     |   259 +
 .../html/com_categories/category/edit.php     |   175 +
 .../com_categories/category/edit_options.php  |    67 +
 .../html/com_checkin/checkin/default.php      |    65 +
 .../html/com_config/application/default.php   |    84 +
 .../com_config/application/default_cache.php  |    26 +
 .../com_config/application/default_cookie.php |    26 +
 .../application/default_database.php          |    24 +
 .../com_config/application/default_debug.php  |    24 +
 .../application/default_filters.php           |    22 +
 .../com_config/application/default_ftp.php    |    24 +
 .../application/default_ftplogin.php          |    31 +
 .../com_config/application/default_locale.php |    24 +
 .../com_config/application/default_mail.php   |    34 +
 .../application/default_metadata.php          |    24 +
 .../application/default_navigation.php        |    22 +
 .../application/default_permissions.php       |    21 +
 .../com_config/application/default_seo.php    |    24 +
 .../com_config/application/default_server.php |    24 +
 .../application/default_session.php           |    24 +
 .../com_config/application/default_site.php   |    24 +
 .../com_config/application/default_system.php |    24 +
 .../html/com_config/component/default.php     |    62 +
 .../hathor/html/com_contact/contact/edit.php  |   212 +
 .../html/com_contact/contact/edit_params.php  |    28 +
 .../html/com_contact/contacts/default.php     |   239 +
 .../html/com_contact/contacts/modal.php       |   134 +
 .../hathor/html/com_content/article/edit.php  |   277 +
 .../html/com_content/articles/default.php     |   254 +
 .../html/com_content/articles/modal.php       |   134 +
 .../html/com_content/featured/default.php     |   209 +
 .../html/com_contenthistory/history/modal.php |   188 +
 .../hathor/html/com_cpanel/cpanel/default.php |    43 +
 .../hathor/html/com_fields/field/edit.php     |   144 +
 .../hathor/html/com_fields/fields/default.php |   173 +
 .../hathor/html/com_fields/group/edit.php     |   126 +
 .../hathor/html/com_fields/groups/default.php |   152 +
 .../html/com_finder/filters/default.php       |   166 +
 .../hathor/html/com_finder/index/default.php  |   174 +
 .../hathor/html/com_finder/maps/default.php   |   141 +
 .../html/com_installer/database/default.php   |    79 +
 .../com_installer/default/default_ftp.php     |    29 +
 .../html/com_installer/discover/default.php   |    91 +
 .../html/com_installer/install/default.php    |    15 +
 .../com_installer/install/default_form.php    |   160 +
 .../html/com_installer/languages/default.php  |   113 +
 .../languages/default_filter.php              |    21 +
 .../html/com_installer/manage/default.php     |   137 +
 .../com_installer/manage/default_filter.php   |    60 +
 .../html/com_installer/update/default.php     |    91 +
 .../html/com_installer/warnings/default.php   |    49 +
 .../html/com_joomlaupdate/default/default.php |    79 +
 .../html/com_languages/installed/default.php  |   123 +
 .../com_languages/installed/default_ftp.php   |    29 +
 .../html/com_languages/languages/default.php  |   180 +
 .../html/com_languages/overrides/default.php  |   109 +
 .../hathor/html/com_menus/item/edit.php       |   184 +
 .../html/com_menus/item/edit_options.php      |    70 +
 .../hathor/html/com_menus/items/default.php   |   258 +
 .../hathor/html/com_menus/menu/edit.php       |    72 +
 .../hathor/html/com_menus/menus/default.php   |   206 +
 .../html/com_menus/menutypes/default.php      |    53 +
 .../hathor/html/com_messages/message/edit.php |    47 +
 .../html/com_messages/messages/default.php    |   110 +
 .../hathor/html/com_modules/module/edit.php   |   141 +
 .../com_modules/module/edit_assignment.php    |   128 +
 .../html/com_modules/module/edit_options.php  |    37 +
 .../html/com_modules/modules/default.php      |   252 +
 .../html/com_modules/positions/modal.php      |   111 +
 .../html/com_newsfeeds/newsfeed/edit.php      |   144 +
 .../com_newsfeeds/newsfeed/edit_params.php    |    28 +
 .../html/com_newsfeeds/newsfeeds/default.php  |   234 +
 .../html/com_newsfeeds/newsfeeds/modal.php    |   127 +
 .../hathor/html/com_plugins/plugin/edit.php   |    90 +
 .../html/com_plugins/plugin/edit_options.php  |    37 +
 .../html/com_plugins/plugins/default.php      |   173 +
 .../html/com_postinstall/messages/default.php |    85 +
 .../html/com_redirect/links/default.php       |   169 +
 .../html/com_search/searches/default.php      |    78 +
 .../hathor/html/com_tags/tag/edit.php         |   124 +
 .../html/com_tags/tag/edit_metadata.php       |    38 +
 .../hathor/html/com_tags/tag/edit_options.php |    62 +
 .../hathor/html/com_tags/tags/default.php     |   165 +
 .../hathor/html/com_templates/style/edit.php  |    87 +
 .../com_templates/style/edit_assignment.php   |    48 +
 .../html/com_templates/style/edit_options.php |    33 +
 .../html/com_templates/styles/default.php     |   162 +
 .../html/com_templates/template/default.php   |   508 +
 .../template/default_description.php          |    20 +
 .../template/default_folders.php              |    25 +
 .../com_templates/template/default_tree.php   |    64 +
 .../html/com_templates/templates/default.php  |   136 +
 .../html/com_users/debuggroup/default.php     |   152 +
 .../html/com_users/debuguser/default.php      |   152 +
 .../hathor/html/com_users/groups/default.php  |   139 +
 .../hathor/html/com_users/levels/default.php  |   123 +
 .../hathor/html/com_users/note/edit.php       |    67 +
 .../hathor/html/com_users/notes/default.php   |   152 +
 .../hathor/html/com_users/user/edit.php       |   139 +
 .../hathor/html/com_users/users/default.php   |   234 +
 .../hathor/html/com_users/users/modal.php     |    87 +
 .../hathor/html/com_weblinks/weblink/edit.php |   139 +
 .../html/com_weblinks/weblink/edit_params.php |    28 +
 .../html/com_weblinks/weblinks/default.php    |   204 +
 .../layouts/com_media/toolbar/deletemedia.php |    16 +
 .../layouts/com_media/toolbar/newfolder.php   |    16 +
 .../layouts/com_media/toolbar/uploadmedia.php |    16 +
 .../com_messages/toolbar/mysettings.php       |    16 +
 .../com_modules/toolbar/cancelselect.php      |    16 +
 .../layouts/com_modules/toolbar/newmodule.php |    17 +
 .../html/layouts/joomla/edit/details.php      |   104 +
 .../html/layouts/joomla/edit/fieldset.php     |    67 +
 .../html/layouts/joomla/edit/global.php       |    68 +
 .../html/layouts/joomla/edit/metadata.php     |    48 +
 .../html/layouts/joomla/edit/params.php       |    97 +
 .../html/layouts/joomla/quickicons/icon.php   |    26 +
 .../html/layouts/joomla/sidebars/submenu.php  |    37 +
 .../html/layouts/joomla/toolbar/base.php      |    15 +
 .../html/layouts/joomla/toolbar/batch.php     |    18 +
 .../html/layouts/joomla/toolbar/confirm.php   |    21 +
 .../layouts/joomla/toolbar/containerclose.php |    15 +
 .../layouts/joomla/toolbar/containeropen.php  |    14 +
 .../html/layouts/joomla/toolbar/help.php      |    20 +
 .../html/layouts/joomla/toolbar/iconclass.php |    12 +
 .../html/layouts/joomla/toolbar/link.php      |    21 +
 .../html/layouts/joomla/toolbar/modal.php     |    22 +
 .../html/layouts/joomla/toolbar/popup.php     |    21 +
 .../html/layouts/joomla/toolbar/separator.php |    16 +
 .../html/layouts/joomla/toolbar/slider.php    |    22 +
 .../html/layouts/joomla/toolbar/standard.php  |    22 +
 .../html/layouts/joomla/toolbar/title.php     |    30 +
 .../html/layouts/joomla/toolbar/versions.php  |    19 +
 .../plugins/user/profile/fields/dob.php       |    18 +
 .../hathor/html/mod_login/default.php         |    55 +
 .../hathor/html/mod_quickicon/default.php     |    18 +
 .../templates/hathor/html/modules.php         |    48 +
 .../templates/hathor/html/pagination.php      |   153 +
 .../templates/hathor/images/admin/blank.png   |   Bin 0 -> 81 bytes
 .../hathor/images/admin/checked_out.png       |   Bin 0 -> 390 bytes
 .../hathor/images/admin/collapseall.png       |   Bin 0 -> 153 bytes
 .../hathor/images/admin/disabled.png          |   Bin 0 -> 263 bytes
 .../hathor/images/admin/downarrow-1.png       |   Bin 0 -> 177 bytes
 .../hathor/images/admin/downarrow.png         |   Bin 0 -> 177 bytes
 .../hathor/images/admin/downarrow0.png        |   Bin 0 -> 151 bytes
 .../hathor/images/admin/expandall.png         |   Bin 0 -> 179 bytes
 .../hathor/images/admin/featured.png          |   Bin 0 -> 468 bytes
 .../hathor/images/admin/filesave.png          |   Bin 0 -> 1043 bytes
 .../hathor/images/admin/filter_16.png         |   Bin 0 -> 247 bytes
 .../hathor/images/admin/icon-16-allow.png     |   Bin 0 -> 345 bytes
 .../images/admin/icon-16-allowinactive.png    |   Bin 0 -> 343 bytes
 .../hathor/images/admin/icon-16-deny.png      |   Bin 0 -> 354 bytes
 .../images/admin/icon-16-denyinactive.png     |   Bin 0 -> 353 bytes
 .../hathor/images/admin/icon-16-links.png     |   Bin 0 -> 548 bytes
 .../images/admin/icon-16-notice-note.png      |   Bin 0 -> 489 bytes
 .../hathor/images/admin/icon-16-protected.png |   Bin 0 -> 397 bytes
 .../hathor/images/admin/menu_divider.png      |   Bin 0 -> 75 bytes
 .../hathor/images/admin/note_add_16.png       |   Bin 0 -> 431 bytes
 .../hathor/images/admin/publish_g.png         |   Bin 0 -> 410 bytes
 .../hathor/images/admin/publish_r.png         |   Bin 0 -> 527 bytes
 .../hathor/images/admin/publish_x.png         |   Bin 0 -> 423 bytes
 .../hathor/images/admin/publish_y.png         |   Bin 0 -> 361 bytes
 .../hathor/images/admin/sort_asc.png          |   Bin 0 -> 106 bytes
 .../hathor/images/admin/sort_desc.png         |   Bin 0 -> 107 bytes
 .../templates/hathor/images/admin/tick.png    |   Bin 0 -> 460 bytes
 .../templates/hathor/images/admin/trash.png   |   Bin 0 -> 386 bytes
 .../hathor/images/admin/uparrow-1.png         |   Bin 0 -> 183 bytes
 .../templates/hathor/images/admin/uparrow.png |   Bin 0 -> 176 bytes
 .../hathor/images/admin/uparrow0.png          |   Bin 0 -> 150 bytes
 .../templates/hathor/images/arrow.png         |   Bin 0 -> 101 bytes
 .../templates/hathor/images/bg-menu.gif       |   Bin 0 -> 37 bytes
 .../templates/hathor/images/calendar.png      |   Bin 0 -> 592 bytes
 .../hathor/images/header/icon-48-alert.png    |   Bin 0 -> 2318 bytes
 .../hathor/images/header/icon-48-apply.png    |   Bin 0 -> 1382 bytes
 .../hathor/images/header/icon-48-archive.png  |   Bin 0 -> 1772 bytes
 .../images/header/icon-48-article-add.png     |   Bin 0 -> 2319 bytes
 .../images/header/icon-48-article-edit.png    |   Bin 0 -> 2460 bytes
 .../hathor/images/header/icon-48-article.png  |   Bin 0 -> 2051 bytes
 .../hathor/images/header/icon-48-assoc.png    |   Bin 0 -> 3506 bytes
 .../header/icon-48-banner-categories.png      |   Bin 0 -> 1961 bytes
 .../images/header/icon-48-banner-client.png   |   Bin 0 -> 2920 bytes
 .../images/header/icon-48-banner-tracks.png   |   Bin 0 -> 2896 bytes
 .../hathor/images/header/icon-48-banner.png   |   Bin 0 -> 2978 bytes
 .../hathor/images/header/icon-48-calendar.png |   Bin 0 -> 2071 bytes
 .../images/header/icon-48-category-add.png    |   Bin 0 -> 1102 bytes
 .../hathor/images/header/icon-48-category.png |   Bin 0 -> 662 bytes
 .../hathor/images/header/icon-48-checkin.png  |   Bin 0 -> 1491 bytes
 .../hathor/images/header/icon-48-clear.png    |   Bin 0 -> 1614 bytes
 .../images/header/icon-48-component.png       |   Bin 0 -> 1797 bytes
 .../hathor/images/header/icon-48-config.png   |   Bin 0 -> 2319 bytes
 .../header/icon-48-contacts-categories.png    |   Bin 0 -> 1827 bytes
 .../hathor/images/header/icon-48-contacts.png |   Bin 0 -> 2513 bytes
 .../hathor/images/header/icon-48-content.png  |   Bin 0 -> 1736 bytes
 .../hathor/images/header/icon-48-cpanel.png   |   Bin 0 -> 1431 bytes
 .../hathor/images/header/icon-48-default.png  |   Bin 0 -> 385 bytes
 .../hathor/images/header/icon-48-deny.png     |   Bin 0 -> 1895 bytes
 .../hathor/images/header/icon-48-download.png |   Bin 0 -> 2009 bytes
 .../hathor/images/header/icon-48-edit.png     |   Bin 0 -> 1857 bytes
 .../images/header/icon-48-extension.png       |   Bin 0 -> 1455 bytes
 .../hathor/images/header/icon-48-featured.png |   Bin 0 -> 2508 bytes
 .../images/header/icon-48-frontpage.png       |   Bin 0 -> 1571 bytes
 .../hathor/images/header/icon-48-generic.png  |   Bin 0 -> 1074 bytes
 .../images/header/icon-48-groups-add.png      |   Bin 0 -> 3420 bytes
 .../hathor/images/header/icon-48-groups.png   |   Bin 0 -> 3204 bytes
 .../images/header/icon-48-help-forum.png      |   Bin 0 -> 2982 bytes
 .../images/header/icon-48-help-this.png       |   Bin 0 -> 4103 bytes
 .../images/header/icon-48-help_header.png     |   Bin 0 -> 2930 bytes
 .../hathor/images/header/icon-48-inbox.png    |   Bin 0 -> 2516 bytes
 .../hathor/images/header/icon-48-info.png     |   Bin 0 -> 2209 bytes
 .../hathor/images/header/icon-48-install.png  |   Bin 0 -> 1470 bytes
 .../header/icon-48-jupdate-updatefound.png    |   Bin 0 -> 1617 bytes
 .../header/icon-48-jupdate-uptodate.png       |   Bin 0 -> 1648 bytes
 .../hathor/images/header/icon-48-language.png |   Bin 0 -> 2956 bytes
 .../images/header/icon-48-levels-add.png      |   Bin 0 -> 837 bytes
 .../hathor/images/header/icon-48-levels.png   |   Bin 0 -> 508 bytes
 .../images/header/icon-48-links-cat.png       |   Bin 0 -> 2131 bytes
 .../hathor/images/header/icon-48-links.png    |   Bin 0 -> 2593 bytes
 .../hathor/images/header/icon-48-massmail.png |   Bin 0 -> 2572 bytes
 .../hathor/images/header/icon-48-media.png    |   Bin 0 -> 2085 bytes
 .../hathor/images/header/icon-48-menu-add.png |   Bin 0 -> 1586 bytes
 .../hathor/images/header/icon-48-menu.png     |   Bin 0 -> 1280 bytes
 .../hathor/images/header/icon-48-menumgr.png  |   Bin 0 -> 1180 bytes
 .../hathor/images/header/icon-48-module.png   |   Bin 0 -> 1024 bytes
 .../hathor/images/header/icon-48-move.png     |   Bin 0 -> 880 bytes
 .../header/icon-48-new-privatemessage.png     |   Bin 0 -> 2898 bytes
 .../images/header/icon-48-newcategory.png     |   Bin 0 -> 1003 bytes
 .../images/header/icon-48-newsfeeds-cat.png   |   Bin 0 -> 1509 bytes
 .../images/header/icon-48-newsfeeds.png       |   Bin 0 -> 1285 bytes
 .../hathor/images/header/icon-48-notice.png   |   Bin 0 -> 1959 bytes
 .../hathor/images/header/icon-48-plugin.png   |   Bin 0 -> 2212 bytes
 .../hathor/images/header/icon-48-preview.png  |   Bin 0 -> 1037 bytes
 .../hathor/images/header/icon-48-print.png    |   Bin 0 -> 2703 bytes
 .../hathor/images/header/icon-48-purge.png    |   Bin 0 -> 1471 bytes
 .../hathor/images/header/icon-48-puzzle.png   |   Bin 0 -> 933 bytes
 .../header/icon-48-read-privatemessage.png    |   Bin 0 -> 3398 bytes
 .../hathor/images/header/icon-48-readmess.png |   Bin 0 -> 2477 bytes
 .../hathor/images/header/icon-48-redirect.png |   Bin 0 -> 1158 bytes
 .../hathor/images/header/icon-48-revert.png   |   Bin 0 -> 1276 bytes
 .../hathor/images/header/icon-48-search.png   |   Bin 0 -> 2213 bytes
 .../hathor/images/header/icon-48-section.png  |   Bin 0 -> 1549 bytes
 .../hathor/images/header/icon-48-send.png     |   Bin 0 -> 2723 bytes
 .../hathor/images/header/icon-48-static.png   |   Bin 0 -> 1736 bytes
 .../hathor/images/header/icon-48-stats.png    |   Bin 0 -> 763 bytes
 .../hathor/images/header/icon-48-tags.png     |   Bin 0 -> 1622 bytes
 .../hathor/images/header/icon-48-themes.png   |   Bin 0 -> 859 bytes
 .../hathor/images/header/icon-48-trash.png    |   Bin 0 -> 1971 bytes
 .../images/header/icon-48-unarchive.png       |   Bin 0 -> 3023 bytes
 .../hathor/images/header/icon-48-upload.png   |   Bin 0 -> 2177 bytes
 .../hathor/images/header/icon-48-user-add.png |   Bin 0 -> 1487 bytes
 .../images/header/icon-48-user-edit.png       |   Bin 0 -> 1487 bytes
 .../images/header/icon-48-user-profile.png    |   Bin 0 -> 2209 bytes
 .../hathor/images/header/icon-48-user.png     |   Bin 0 -> 2270 bytes
 .../images/header/icon-48-writemess.png       |   Bin 0 -> 2085 bytes
 .../hathor/images/header/icon-messaging.png   |   Bin 0 -> 3024 bytes
 .../templates/hathor/images/j_arrow.png       |   Bin 0 -> 179 bytes
 .../templates/hathor/images/j_arrow_down.png  |   Bin 0 -> 151 bytes
 .../templates/hathor/images/j_arrow_left.png  |   Bin 0 -> 197 bytes
 .../templates/hathor/images/j_arrow_right.png |   Bin 0 -> 187 bytes
 .../templates/hathor/images/j_login_lock.png  |   Bin 0 -> 3508 bytes
 .../templates/hathor/images/j_logo.png        |   Bin 0 -> 2278 bytes
 .../templates/hathor/images/logo.png          |   Bin 0 -> 3126 bytes
 .../hathor/images/menu/icon-16-alert.png      |   Bin 0 -> 568 bytes
 .../hathor/images/menu/icon-16-apply.png      |   Bin 0 -> 416 bytes
 .../hathor/images/menu/icon-16-archive.png    |   Bin 0 -> 525 bytes
 .../hathor/images/menu/icon-16-article.png    |   Bin 0 -> 517 bytes
 .../hathor/images/menu/icon-16-assoc.png      |   Bin 0 -> 942 bytes
 .../hathor/images/menu/icon-16-back-user.png  |   Bin 0 -> 658 bytes
 .../images/menu/icon-16-banner-categories.png |   Bin 0 -> 571 bytes
 .../images/menu/icon-16-banner-client.png     |   Bin 0 -> 342 bytes
 .../images/menu/icon-16-banner-tracks.png     |   Bin 0 -> 513 bytes
 .../hathor/images/menu/icon-16-banner.png     |   Bin 0 -> 610 bytes
 .../hathor/images/menu/icon-16-calendar.png   |   Bin 0 -> 548 bytes
 .../hathor/images/menu/icon-16-category.png   |   Bin 0 -> 209 bytes
 .../hathor/images/menu/icon-16-checkin.png    |   Bin 0 -> 460 bytes
 .../hathor/images/menu/icon-16-clear.png      |   Bin 0 -> 504 bytes
 .../hathor/images/menu/icon-16-component.png  |   Bin 0 -> 486 bytes
 .../hathor/images/menu/icon-16-config.png     |   Bin 0 -> 642 bytes
 .../menu/icon-16-contacts-categories.png      |   Bin 0 -> 419 bytes
 .../hathor/images/menu/icon-16-contacts.png   |   Bin 0 -> 773 bytes
 .../hathor/images/menu/icon-16-content.png    |   Bin 0 -> 392 bytes
 .../hathor/images/menu/icon-16-cpanel.png     |   Bin 0 -> 412 bytes
 .../hathor/images/menu/icon-16-default.png    |   Bin 0 -> 348 bytes
 .../hathor/images/menu/icon-16-delete.png     |   Bin 0 -> 470 bytes
 .../hathor/images/menu/icon-16-deny.png       |   Bin 0 -> 454 bytes
 .../hathor/images/menu/icon-16-download.png   |   Bin 0 -> 556 bytes
 .../hathor/images/menu/icon-16-edit.png       |   Bin 0 -> 531 bytes
 .../hathor/images/menu/icon-16-featured.png   |   Bin 0 -> 553 bytes
 .../hathor/images/menu/icon-16-frontpage.png  |   Bin 0 -> 585 bytes
 .../hathor/images/menu/icon-16-generic.png    |   Bin 0 -> 385 bytes
 .../hathor/images/menu/icon-16-groups.png     |   Bin 0 -> 796 bytes
 .../images/menu/icon-16-help-community.png    |   Bin 0 -> 684 bytes
 .../hathor/images/menu/icon-16-help-dev.png   |   Bin 0 -> 488 bytes
 .../hathor/images/menu/icon-16-help-docs.png  |   Bin 0 -> 486 bytes
 .../hathor/images/menu/icon-16-help-forum.png |   Bin 0 -> 452 bytes
 .../hathor/images/menu/icon-16-help-jed.png   |   Bin 0 -> 449 bytes
 .../hathor/images/menu/icon-16-help-jrd.png   |   Bin 0 -> 505 bytes
 .../images/menu/icon-16-help-security.png     |   Bin 0 -> 626 bytes
 .../hathor/images/menu/icon-16-help-shop.png  |   Bin 0 -> 506 bytes
 .../hathor/images/menu/icon-16-help-this.png  |   Bin 0 -> 726 bytes
 .../hathor/images/menu/icon-16-help-trans.png |   Bin 0 -> 612 bytes
 .../hathor/images/menu/icon-16-help.png       |   Bin 0 -> 658 bytes
 .../hathor/images/menu/icon-16-inbox.png      |   Bin 0 -> 698 bytes
 .../hathor/images/menu/icon-16-info.png       |   Bin 0 -> 540 bytes
 .../hathor/images/menu/icon-16-install.png    |   Bin 0 -> 446 bytes
 .../hathor/images/menu/icon-16-language.png   |   Bin 0 -> 668 bytes
 .../hathor/images/menu/icon-16-levels.png     |   Bin 0 -> 247 bytes
 .../hathor/images/menu/icon-16-links-cat.png  |   Bin 0 -> 505 bytes
 .../hathor/images/menu/icon-16-links.png      |   Bin 0 -> 548 bytes
 .../hathor/images/menu/icon-16-logout.png     |   Bin 0 -> 480 bytes
 .../images/menu/icon-16-maintenance.png       |   Bin 0 -> 269 bytes
 .../hathor/images/menu/icon-16-massmail.png   |   Bin 0 -> 692 bytes
 .../hathor/images/menu/icon-16-media.png      |   Bin 0 -> 586 bytes
 .../hathor/images/menu/icon-16-menu.png       |   Bin 0 -> 396 bytes
 .../hathor/images/menu/icon-16-menumgr.png    |   Bin 0 -> 493 bytes
 .../hathor/images/menu/icon-16-messages.png   |   Bin 0 -> 580 bytes
 .../hathor/images/menu/icon-16-messaging.png  |   Bin 0 -> 755 bytes
 .../hathor/images/menu/icon-16-module.png     |   Bin 0 -> 314 bytes
 .../hathor/images/menu/icon-16-move.png       |   Bin 0 -> 297 bytes
 .../menu/icon-16-new-privatemessage.png       |   Bin 0 -> 599 bytes
 .../hathor/images/menu/icon-16-new.png        |   Bin 0 -> 366 bytes
 .../hathor/images/menu/icon-16-newarticle.png |   Bin 0 -> 563 bytes
 .../images/menu/icon-16-newcategory.png       |   Bin 0 -> 343 bytes
 .../hathor/images/menu/icon-16-newgroup.png   |   Bin 0 -> 772 bytes
 .../hathor/images/menu/icon-16-newlevel.png   |   Bin 0 -> 417 bytes
 .../images/menu/icon-16-newsfeeds-cat.png     |   Bin 0 -> 439 bytes
 .../hathor/images/menu/icon-16-newsfeeds.png  |   Bin 0 -> 386 bytes
 .../hathor/images/menu/icon-16-newuser.png    |   Bin 0 -> 746 bytes
 .../hathor/images/menu/icon-16-nopreview.png  |   Bin 0 -> 286 bytes
 .../hathor/images/menu/icon-16-notdefault.png |   Bin 0 -> 605 bytes
 .../hathor/images/menu/icon-16-notice.png     |   Bin 0 -> 490 bytes
 .../hathor/images/menu/icon-16-plugin.png     |   Bin 0 -> 566 bytes
 .../hathor/images/menu/icon-16-preview.png    |   Bin 0 -> 305 bytes
 .../hathor/images/menu/icon-16-print.png      |   Bin 0 -> 461 bytes
 .../hathor/images/menu/icon-16-purge.png      |   Bin 0 -> 460 bytes
 .../hathor/images/menu/icon-16-puzzle.png     |   Bin 0 -> 401 bytes
 .../menu/icon-16-read-privatemessage.png      |   Bin 0 -> 732 bytes
 .../hathor/images/menu/icon-16-readmess.png   |   Bin 0 -> 652 bytes
 .../hathor/images/menu/icon-16-redirect.png   |   Bin 0 -> 390 bytes
 .../hathor/images/menu/icon-16-revert.png     |   Bin 0 -> 368 bytes
 .../hathor/images/menu/icon-16-search.png     |   Bin 0 -> 441 bytes
 .../hathor/images/menu/icon-16-send.png       |   Bin 0 -> 554 bytes
 .../hathor/images/menu/icon-16-stats.png      |   Bin 0 -> 270 bytes
 .../hathor/images/menu/icon-16-tags.png       |   Bin 0 -> 509 bytes
 .../hathor/images/menu/icon-16-themes.png     |   Bin 0 -> 348 bytes
 .../hathor/images/menu/icon-16-trash.png      |   Bin 0 -> 509 bytes
 .../hathor/images/menu/icon-16-unarticle.png  |   Bin 0 -> 656 bytes
 .../hathor/images/menu/icon-16-upload.png     |   Bin 0 -> 633 bytes
 .../hathor/images/menu/icon-16-user-dd.png    |   Bin 0 -> 523 bytes
 .../hathor/images/menu/icon-16-user-note.png  |   Bin 0 -> 301 bytes
 .../hathor/images/menu/icon-16-user.png       |   Bin 0 -> 658 bytes
 .../hathor/images/menu/icon-16-viewsite.png   |   Bin 0 -> 288 bytes
 .../hathor/images/menu/icon-16-writemess.png  |   Bin 0 -> 626 bytes
 .../templates/hathor/images/mini_icon.png     |   Bin 0 -> 536 bytes
 .../templates/hathor/images/notice-alert.png  |   Bin 0 -> 862 bytes
 .../templates/hathor/images/notice-info.png   |   Bin 0 -> 1110 bytes
 .../templates/hathor/images/notice-note.png   |   Bin 0 -> 771 bytes
 .../templates/hathor/images/required.png      |   Bin 0 -> 122 bytes
 .../hathor/images/selector-arrow-hc.png       |   Bin 0 -> 128 bytes
 .../hathor/images/selector-arrow-rtl.png      |   Bin 0 -> 133 bytes
 .../hathor/images/selector-arrow-std.png      |   Bin 0 -> 130 bytes
 .../hathor/images/selector-arrow.png          |   Bin 0 -> 197 bytes
 .../hathor/images/system/calendar.png         |   Bin 0 -> 592 bytes
 .../hathor/images/system/selector-arrow.png   |   Bin 0 -> 197 bytes
 .../hathor/images/toolbar/icon-32-adduser.png |   Bin 0 -> 1537 bytes
 .../hathor/images/toolbar/icon-32-alert.png   |   Bin 0 -> 2065 bytes
 .../hathor/images/toolbar/icon-32-apply.png   |   Bin 0 -> 1278 bytes
 .../hathor/images/toolbar/icon-32-archive.png |   Bin 0 -> 1208 bytes
 .../images/toolbar/icon-32-article-add.png    |   Bin 0 -> 2099 bytes
 .../hathor/images/toolbar/icon-32-article.png |   Bin 0 -> 1715 bytes
 .../hathor/images/toolbar/icon-32-back.png    |   Bin 0 -> 1281 bytes
 .../toolbar/icon-32-banner-categories.png     |   Bin 0 -> 2160 bytes
 .../images/toolbar/icon-32-banner-client.png  |   Bin 0 -> 2591 bytes
 .../images/toolbar/icon-32-banner-tracks.png  |   Bin 0 -> 2747 bytes
 .../hathor/images/toolbar/icon-32-banner.png  |   Bin 0 -> 2683 bytes
 .../hathor/images/toolbar/icon-32-batch.png   |   Bin 0 -> 1945 bytes
 .../images/toolbar/icon-32-calendar.png       |   Bin 0 -> 2051 bytes
 .../hathor/images/toolbar/icon-32-cancel.png  |   Bin 0 -> 2228 bytes
 .../hathor/images/toolbar/icon-32-checkin.png |   Bin 0 -> 1654 bytes
 .../hathor/images/toolbar/icon-32-cog.png     |   Bin 0 -> 2600 bytes
 .../images/toolbar/icon-32-component.png      |   Bin 0 -> 1672 bytes
 .../hathor/images/toolbar/icon-32-config.png  |   Bin 0 -> 1770 bytes
 .../toolbar/icon-32-contacts-categories.png   |   Bin 0 -> 1427 bytes
 .../images/toolbar/icon-32-contacts.png       |   Bin 0 -> 2522 bytes
 .../hathor/images/toolbar/icon-32-copy.png    |   Bin 0 -> 418 bytes
 .../hathor/images/toolbar/icon-32-css.png     |   Bin 0 -> 1580 bytes
 .../hathor/images/toolbar/icon-32-default.png |   Bin 0 -> 1072 bytes
 .../images/toolbar/icon-32-delete-style.png   |   Bin 0 -> 2302 bytes
 .../hathor/images/toolbar/icon-32-delete.png  |   Bin 0 -> 2091 bytes
 .../hathor/images/toolbar/icon-32-deny.png    |   Bin 0 -> 1677 bytes
 .../images/toolbar/icon-32-download.png       |   Bin 0 -> 1655 bytes
 .../hathor/images/toolbar/icon-32-edit.png    |   Bin 0 -> 1680 bytes
 .../hathor/images/toolbar/icon-32-error.png   |   Bin 0 -> 1285 bytes
 .../hathor/images/toolbar/icon-32-export.png  |   Bin 0 -> 1104 bytes
 .../images/toolbar/icon-32-extension.png      |   Bin 0 -> 2126 bytes
 .../images/toolbar/icon-32-featured.png       |   Bin 0 -> 2205 bytes
 .../hathor/images/toolbar/icon-32-forward.png |   Bin 0 -> 1277 bytes
 .../hathor/images/toolbar/icon-32-help.png    |   Bin 0 -> 2707 bytes
 .../hathor/images/toolbar/icon-32-html.png    |   Bin 0 -> 1479 bytes
 .../hathor/images/toolbar/icon-32-inbox.png   |   Bin 0 -> 2461 bytes
 .../hathor/images/toolbar/icon-32-info.png    |   Bin 0 -> 1843 bytes
 .../hathor/images/toolbar/icon-32-links.png   |   Bin 0 -> 2532 bytes
 .../hathor/images/toolbar/icon-32-lock.png    |   Bin 0 -> 626 bytes
 .../hathor/images/toolbar/icon-32-menu.png    |   Bin 0 -> 1090 bytes
 .../images/toolbar/icon-32-messaging.png      |   Bin 0 -> 2175 bytes
 .../images/toolbar/icon-32-messanging.png     |   Bin 0 -> 2175 bytes
 .../hathor/images/toolbar/icon-32-module.png  |   Bin 0 -> 2853 bytes
 .../hathor/images/toolbar/icon-32-move.png    |   Bin 0 -> 917 bytes
 .../toolbar/icon-32-new-privatemessage.png    |   Bin 0 -> 2350 bytes
 .../images/toolbar/icon-32-new-style.png      |   Bin 0 -> 2487 bytes
 .../hathor/images/toolbar/icon-32-new.png     |   Bin 0 -> 1794 bytes
 .../hathor/images/toolbar/icon-32-notice.png  |   Bin 0 -> 1885 bytes
 .../hathor/images/toolbar/icon-32-preview.png |   Bin 0 -> 1080 bytes
 .../hathor/images/toolbar/icon-32-print.png   |   Bin 0 -> 2650 bytes
 .../hathor/images/toolbar/icon-32-publish.png |   Bin 0 -> 1858 bytes
 .../hathor/images/toolbar/icon-32-purge.png   |   Bin 0 -> 1330 bytes
 .../toolbar/icon-32-read-privatemessage.png   |   Bin 0 -> 3054 bytes
 .../hathor/images/toolbar/icon-32-refresh.png |   Bin 0 -> 2026 bytes
 .../hathor/images/toolbar/icon-32-remove.png  |   Bin 0 -> 1278 bytes
 .../hathor/images/toolbar/icon-32-revert.png  |   Bin 0 -> 1388 bytes
 .../images/toolbar/icon-32-save-copy.png      |   Bin 0 -> 1601 bytes
 .../images/toolbar/icon-32-save-new.png       |   Bin 0 -> 1729 bytes
 .../hathor/images/toolbar/icon-32-save.png    |   Bin 0 -> 1225 bytes
 .../hathor/images/toolbar/icon-32-search.png  |   Bin 0 -> 2241 bytes
 .../hathor/images/toolbar/icon-32-send.png    |   Bin 0 -> 2041 bytes
 .../hathor/images/toolbar/icon-32-stats.png   |   Bin 0 -> 1127 bytes
 .../hathor/images/toolbar/icon-32-trash.png   |   Bin 0 -> 1762 bytes
 .../images/toolbar/icon-32-unarchive.png      |   Bin 0 -> 2398 bytes
 .../hathor/images/toolbar/icon-32-unblock.png |   Bin 0 -> 2156 bytes
 .../images/toolbar/icon-32-unpublish.png      |   Bin 0 -> 1563 bytes
 .../hathor/images/toolbar/icon-32-upload.png  |   Bin 0 -> 2004 bytes
 .../images/toolbar/icon-32-user-add.png       |   Bin 0 -> 1499 bytes
 .../hathor/images/toolbar/icon-32-xml.png     |   Bin 0 -> 771 bytes
 core/administrator/templates/hathor/index.php |   179 +
 .../templates/hathor/js/template.js           |   124 +
 .../language/en-GB/en-GB.tpl_hathor.ini       |    29 +
 .../language/en-GB/en-GB.tpl_hathor.sys.ini   |    19 +
 .../templates/hathor/less/buttons.less        |    82 +
 .../hathor/less/colour_baseline.less          |  1779 ++
 .../templates/hathor/less/colour_blue.less    |    38 +
 .../templates/hathor/less/colour_brown.less   |    42 +
 .../hathor/less/colour_standard.less          |    38 +
 .../templates/hathor/less/forms.less          |   196 +
 .../hathor/less/hathor_variables.less         |   140 +
 .../templates/hathor/less/icomoon.less        |    11 +
 .../templates/hathor/less/modals.less         |   108 +
 .../templates/hathor/less/template.less       |  3565 ++++
 .../templates/hathor/less/variables.less      |   216 +
 core/administrator/templates/hathor/login.php |   140 +
 .../hathor/postinstall/hathormessage.php      |   134 +
 .../templates/hathor/templateDetails.xml      |    99 +
 .../templates/hathor/template_preview.png     |   Bin 0 -> 23218 bytes
 .../templates/hathor/template_thumbnail.png   |   Bin 0 -> 3828 bytes
 .../templates/isis/component.php              |    59 +
 core/administrator/templates/isis/cpanel.php  |    12 +
 .../templates/isis/css/template-rtl.css       | 10057 ++++++++++++
 .../templates/isis/css/template.css           |  9105 +++++++++++
 core/administrator/templates/isis/error.php   |   296 +
 core/administrator/templates/isis/favicon.ico |   Bin 0 -> 2019 bytes
 .../com_media/imageslist/default_folder.php   |    23 +
 .../com_media/imageslist/default_image.php    |    32 +
 .../com_media/medialist/thumbs_folders.php    |    35 +
 .../html/com_media/medialist/thumbs_imgs.php  |    46 +
 .../templates/isis/html/editor_content.css    |    50 +
 .../html/layouts/joomla/form/field/media.php  |   140 +
 .../html/layouts/joomla/form/field/user.php   |   127 +
 .../html/layouts/joomla/pagination/link.php   |   113 +
 .../html/layouts/joomla/pagination/links.php  |    57 +
 .../html/layouts/joomla/system/message.php    |    30 +
 .../html/layouts/joomla/toolbar/versions.php  |    43 +
 .../isis/html/mod_version/default.php         |    15 +
 .../templates/isis/html/modules.php           |    69 +
 .../templates/isis/html/pagination.php        |   220 +
 .../templates/isis/images/admin/blank.png     |   Bin 0 -> 81 bytes
 .../isis/images/admin/checked_out.png         |   Bin 0 -> 390 bytes
 .../isis/images/admin/collapseall.png         |   Bin 0 -> 178 bytes
 .../templates/isis/images/admin/disabled.png  |   Bin 0 -> 183 bytes
 .../isis/images/admin/downarrow-1.png         |   Bin 0 -> 177 bytes
 .../templates/isis/images/admin/downarrow.png |   Bin 0 -> 457 bytes
 .../isis/images/admin/downarrow0.png          |   Bin 0 -> 457 bytes
 .../templates/isis/images/admin/expandall.png |   Bin 0 -> 195 bytes
 .../templates/isis/images/admin/featured.png  |   Bin 0 -> 172 bytes
 .../templates/isis/images/admin/filesave.png  |   Bin 0 -> 1043 bytes
 .../templates/isis/images/admin/filter_16.png |   Bin 0 -> 247 bytes
 .../isis/images/admin/icon-16-add.png         |   Bin 0 -> 626 bytes
 .../isis/images/admin/icon-16-allow.png       |   Bin 0 -> 345 bytes
 .../images/admin/icon-16-allowinactive.png    |   Bin 0 -> 343 bytes
 .../isis/images/admin/icon-16-deny.png        |   Bin 0 -> 361 bytes
 .../images/admin/icon-16-denyinactive.png     |   Bin 0 -> 353 bytes
 .../isis/images/admin/icon-16-links.png       |   Bin 0 -> 548 bytes
 .../isis/images/admin/icon-16-notice-note.png |   Bin 0 -> 489 bytes
 .../isis/images/admin/icon-16-protected.png   |   Bin 0 -> 397 bytes
 .../isis/images/admin/menu_divider.png        |   Bin 0 -> 75 bytes
 .../isis/images/admin/note_add_16.png         |   Bin 0 -> 415 bytes
 .../templates/isis/images/admin/publish_g.png |   Bin 0 -> 410 bytes
 .../templates/isis/images/admin/publish_r.png |   Bin 0 -> 527 bytes
 .../templates/isis/images/admin/publish_x.png |   Bin 0 -> 423 bytes
 .../templates/isis/images/admin/publish_y.png |   Bin 0 -> 375 bytes
 .../templates/isis/images/admin/sort_asc.png  |   Bin 0 -> 106 bytes
 .../templates/isis/images/admin/sort_desc.png |   Bin 0 -> 107 bytes
 .../templates/isis/images/admin/tick.png      |   Bin 0 -> 194 bytes
 .../templates/isis/images/admin/trash.png     |   Bin 0 -> 509 bytes
 .../templates/isis/images/admin/uparrow-1.png |   Bin 0 -> 183 bytes
 .../templates/isis/images/admin/uparrow.png   |   Bin 0 -> 459 bytes
 .../templates/isis/images/admin/uparrow0.png  |   Bin 0 -> 459 bytes
 .../templates/isis/images/emailButton.png     |   Bin 0 -> 559 bytes
 .../templates/isis/images/joomla.png          |   Bin 0 -> 14980 bytes
 .../isis/images/login-joomla-inverse.png      |   Bin 0 -> 526 bytes
 .../templates/isis/images/login-joomla.png    |   Bin 0 -> 510 bytes
 .../templates/isis/images/logo-inverse.png    |   Bin 0 -> 3840 bytes
 .../templates/isis/images/logo.png            |   Bin 0 -> 4644 bytes
 .../templates/isis/images/pdf_button.png      |   Bin 0 -> 508 bytes
 .../templates/isis/images/printButton.png     |   Bin 0 -> 637 bytes
 .../templates/isis/images/system/sort_asc.png |   Bin 0 -> 128 bytes
 .../isis/images/system/sort_desc.png          |   Bin 0 -> 135 bytes
 .../isis/img/glyphicons-halflings-white.png   |   Bin 0 -> 8743 bytes
 .../isis/img/glyphicons-halflings.png         |   Bin 0 -> 12600 bytes
 core/administrator/templates/isis/index.php   |   338 +
 .../templates/isis/js/application.js          |     7 +
 .../templates/isis/js/classes.js              |    45 +
 .../templates/isis/js/template.js             |   419 +
 .../isis/language/en-GB/en-GB.tpl_isis.ini    |    43 +
 .../language/en-GB/en-GB.tpl_isis.sys.ini     |    20 +
 .../isis/less/blocks/_chzn-override.less      |   201 +
 .../templates/isis/less/blocks/_custom.less   |   294 +
 .../templates/isis/less/blocks/_editors.less  |     7 +
 .../templates/isis/less/blocks/_forms.less    |   352 +
 .../templates/isis/less/blocks/_global.less   |    98 +
 .../templates/isis/less/blocks/_header.less   |    68 +
 .../templates/isis/less/blocks/_login.less    |    87 +
 .../templates/isis/less/blocks/_media.less    |   263 +
 .../templates/isis/less/blocks/_modals.less   |    52 +
 .../templates/isis/less/blocks/_navbar.less   |   272 +
 .../isis/less/blocks/_quickicons.less         |    27 +
 .../templates/isis/less/blocks/_sidebar.less  |   150 +
 .../templates/isis/less/blocks/_status.less   |    46 +
 .../templates/isis/less/blocks/_tables.less   |    74 +
 .../templates/isis/less/blocks/_toolbar.less  |   165 +
 .../isis/less/blocks/_treeselect.less         |    85 +
 .../isis/less/blocks/_utility-classes.less    |    13 +
 .../isis/less/bootstrap/button-groups.less    |   239 +
 .../isis/less/bootstrap/buttons.less          |   285 +
 .../templates/isis/less/bootstrap/mixins.less |   708 +
 .../less/bootstrap/responsive-1200px-min.less |   201 +
 .../bootstrap/responsive-768px-979px.less     |   192 +
 .../templates/isis/less/bootstrap/wells.less  |    29 +
 .../templates/isis/less/icomoon.less          |    39 +
 .../isis/less/pages/_com_cpanel.less          |    24 +
 .../isis/less/pages/_com_postinstall.less     |    21 +
 .../isis/less/pages/_com_templates.less       |    35 +
 .../templates/isis/less/template-rtl.less     |   436 +
 .../templates/isis/less/template.less         |    93 +
 .../templates/isis/less/variables.less        |   340 +
 core/administrator/templates/isis/login.php   |   139 +
 .../templates/isis/templateDetails.xml        |   172 +
 .../templates/isis/template_preview.png       |   Bin 0 -> 28475 bytes
 .../templates/isis/template_thumbnail.png     |   Bin 0 -> 7936 bytes
 .../templates/system/component.php            |    29 +
 .../templates/system/css/error.css            |    53 +
 .../templates/system/css/system.css           |     7 +
 core/administrator/templates/system/error.php |    66 +
 .../templates/system/html/modules.php         |   101 +
 .../templates/system/images/calendar.png      |   Bin 0 -> 592 bytes
 core/administrator/templates/system/index.php |    12 +
 core/bin/index.html                           |     1 +
 core/bin/keychain.php                         |   415 +
 core/cache/index.html                         |     1 +
 core/cli/deletefiles.php                      |    79 +
 core/cli/finder_indexer.php                   |   376 +
 core/cli/garbagecron.php                      |    55 +
 core/cli/index.html                           |     1 +
 core/cli/sessionGc.php                        |    56 +
 core/cli/sessionMetadataGc.php                |    59 +
 core/cli/update_cron.php                      |    71 +
 core/components/com_ajax/ajax.php             |   270 +
 core/components/com_banners/banners.php       |    14 +
 core/components/com_banners/controller.php    |    38 +
 .../components/com_banners/helpers/banner.php |    46 +
 .../com_banners/helpers/category.php          |    33 +
 core/components/com_banners/models/banner.php |   212 +
 .../components/com_banners/models/banners.php |   322 +
 core/components/com_banners/router.php        |   143 +
 core/components/com_config/config.php         |    27 +
 .../com_config/controller/cancel.php          |    39 +
 .../com_config/controller/canceladmin.php     |    83 +
 .../com_config/controller/cmsbase.php         |    48 +
 .../com_config/controller/config/display.php  |    98 +
 .../com_config/controller/config/save.php     |   113 +
 .../com_config/controller/display.php         |   109 +
 .../com_config/controller/helper.php          |   120 +
 .../com_config/controller/modules/cancel.php  |    66 +
 .../com_config/controller/modules/display.php |   127 +
 .../com_config/controller/modules/save.php    |   125 +
 .../controller/templates/display.php          |   102 +
 .../com_config/controller/templates/save.php  |    88 +
 core/components/com_config/model/cms.php      |   287 +
 core/components/com_config/model/config.php   |    41 +
 core/components/com_config/model/form.php     |   326 +
 .../com_config/model/form/config.xml          |   131 +
 .../com_config/model/form/modules.xml         |   149 +
 .../model/form/modules_advanced.xml           |    48 +
 .../com_config/model/form/templates.xml       |    48 +
 core/components/com_config/model/modules.php  |   266 +
 .../components/com_config/model/templates.php |   126 +
 core/components/com_config/view/cms/html.php  |   221 +
 core/components/com_config/view/cms/json.php  |    36 +
 .../com_config/view/config/html.php           |    37 +
 .../com_config/view/config/tmpl/default.php   |    61 +
 .../com_config/view/config/tmpl/default.xml   |    20 +
 .../view/config/tmpl/default_metadata.php     |    24 +
 .../view/config/tmpl/default_seo.php          |    24 +
 .../view/config/tmpl/default_site.php         |    24 +
 .../com_config/view/modules/html.php          |    40 +
 .../com_config/view/modules/tmpl/default.php  |   201 +
 .../view/modules/tmpl/default_options.php     |    55 +
 .../view/modules/tmpl/default_positions.php   |    26 +
 .../com_config/view/templates/html.php        |    37 +
 .../view/templates/tmpl/default.php           |    60 +
 .../view/templates/tmpl/default.xml           |    20 +
 .../view/templates/tmpl/default_options.php   |    47 +
 core/components/com_contact/contact.php       |    30 +
 core/components/com_contact/controller.php    |    72 +
 .../com_contact/controllers/contact.php       |   242 +
 .../com_contact/helpers/association.php       |    64 +
 .../com_contact/helpers/category.php          |    33 +
 .../com_contact/helpers/legacyrouter.php      |   271 +
 core/components/com_contact/helpers/route.php |    89 +
 .../com_contact/layouts/field/render.php      |    44 +
 .../com_contact/layouts/fields/render.php     |    78 +
 .../layouts/joomla/form/renderfield.php       |    57 +
 .../com_contact/models/categories.php         |   142 +
 .../com_contact/models/category.php           |   445 +
 .../components/com_contact/models/contact.php |   634 +
 .../com_contact/models/featured.php           |   252 +
 .../com_contact/models/forms/contact.xml      |    80 +
 .../models/forms/filter_contacts.xml          |   136 +
 .../com_contact/models/forms/form.xml         |   772 +
 .../com_contact/models/rules/contactemail.php |    60 +
 .../models/rules/contactemailmessage.php      |    53 +
 .../models/rules/contactemailsubject.php      |    53 +
 core/components/com_contact/router.php        |   251 +
 .../views/categories/tmpl/default.php         |    42 +
 .../views/categories/tmpl/default.xml         |   816 +
 .../views/categories/tmpl/default_items.php   |    63 +
 .../views/categories/view.html.php            |    32 +
 .../views/category/tmpl/default.php           |    13 +
 .../views/category/tmpl/default.xml           |   794 +
 .../views/category/tmpl/default_children.php  |    55 +
 .../views/category/tmpl/default_items.php     |   138 +
 .../com_contact/views/category/view.feed.php  |    41 +
 .../com_contact/views/category/view.html.php  |   116 +
 .../views/contact/tmpl/default.php            |   274 +
 .../views/contact/tmpl/default.xml            |   502 +
 .../views/contact/tmpl/default_address.php    |   130 +
 .../views/contact/tmpl/default_articles.php   |    25 +
 .../views/contact/tmpl/default_form.php       |    45 +
 .../views/contact/tmpl/default_links.php      |    55 +
 .../views/contact/tmpl/default_profile.php    |    44 +
 .../tmpl/default_user_custom_fields.php       |    64 +
 .../com_contact/views/contact/view.html.php   |   496 +
 .../com_contact/views/contact/view.vcf.php    |   113 +
 .../views/featured/tmpl/default.php           |    38 +
 .../views/featured/tmpl/default.xml           |   579 +
 .../views/featured/tmpl/default_items.php     |   166 +
 .../com_contact/views/featured/view.html.php  |   194 +
 core/components/com_content/content.php       |    44 +
 core/components/com_content/controller.php    |   117 +
 .../com_content/controllers/article.php       |   438 +
 .../com_content/helpers/association.php       |   147 +
 .../com_content/helpers/category.php          |    33 +
 core/components/com_content/helpers/icon.php  |   208 +
 .../com_content/helpers/legacyrouter.php      |   476 +
 core/components/com_content/helpers/query.php |   319 +
 core/components/com_content/helpers/route.php |   109 +
 .../components/com_content/models/archive.php |   219 +
 .../components/com_content/models/article.php |   360 +
 .../com_content/models/articles.php           |   712 +
 .../com_content/models/categories.php         |   146 +
 .../com_content/models/category.php           |   495 +
 .../com_content/models/featured.php           |   170 +
 core/components/com_content/models/form.php   |   217 +
 .../com_content/models/forms/article.xml      |   428 +
 .../models/forms/filter_articles.xml          |   138 +
 core/components/com_content/router.php        |   271 +
 .../views/archive/tmpl/default.php            |    46 +
 .../views/archive/tmpl/default.xml            |   299 +
 .../views/archive/tmpl/default_items.php      |   219 +
 .../com_content/views/archive/view.html.php   |   204 +
 .../views/article/tmpl/default.php            |   173 +
 .../views/article/tmpl/default.xml            |   325 +
 .../views/article/tmpl/default_links.php      |    79 +
 .../com_content/views/article/view.html.php   |   341 +
 .../views/categories/tmpl/default.php         |    42 +
 .../views/categories/tmpl/default.xml         |   770 +
 .../views/categories/tmpl/default_items.php   |    69 +
 .../views/categories/view.html.php            |    32 +
 .../com_content/views/category/tmpl/blog.php  |   137 +
 .../com_content/views/category/tmpl/blog.xml  |   710 +
 .../views/category/tmpl/blog_children.php     |    86 +
 .../views/category/tmpl/blog_item.php         |    86 +
 .../views/category/tmpl/blog_links.php        |    20 +
 .../views/category/tmpl/default.php           |    23 +
 .../views/category/tmpl/default.xml           |   693 +
 .../views/category/tmpl/default_articles.php  |   275 +
 .../views/category/tmpl/default_children.php  |    88 +
 .../com_content/views/category/view.feed.php  |    66 +
 .../com_content/views/category/view.html.php  |   304 +
 .../views/featured/tmpl/default.php           |    96 +
 .../views/featured/tmpl/default.xml           |   514 +
 .../views/featured/tmpl/default_item.php      |   106 +
 .../views/featured/tmpl/default_links.php     |    19 +
 .../com_content/views/featured/view.feed.php  |   118 +
 .../com_content/views/featured/view.html.php  |   229 +
 .../com_content/views/form/tmpl/edit.php      |   169 +
 .../com_content/views/form/tmpl/edit.xml      |    72 +
 .../com_content/views/form/view.html.php      |   182 +
 .../com_contenthistory/contenthistory.php     |    18 +
 core/components/com_fields/controller.php     |    43 +
 core/components/com_fields/fields.php         |    30 +
 .../com_fields/layouts/field/render.php       |    30 +
 .../com_fields/layouts/fields/render.php      |    64 +
 .../com_fields/models/forms/filter_fields.xml |   101 +
 core/components/com_finder/controller.php     |    57 +
 .../controllers/suggestions.json.php          |    93 +
 core/components/com_finder/finder.php         |    16 +
 .../com_finder/helpers/html/filter.php        |   490 +
 .../com_finder/helpers/html/query.php         |   166 +
 core/components/com_finder/helpers/route.php  |   159 +
 core/components/com_finder/models/search.php  |  1231 ++
 .../com_finder/models/suggestions.php         |   146 +
 core/components/com_finder/router.php         |   162 +
 .../com_finder/views/search/tmpl/default.php  |    39 +
 .../com_finder/views/search/tmpl/default.xml  |   217 +
 .../views/search/tmpl/default_form.php        |   109 +
 .../views/search/tmpl/default_result.php      |    77 +
 .../views/search/tmpl/default_results.php     |    69 +
 .../com_finder/views/search/view.feed.php     |   105 +
 .../com_finder/views/search/view.html.php     |   308 +
 .../views/search/view.opensearch.php          |    53 +
 core/components/com_mailto/controller.php     |   169 +
 core/components/com_mailto/helpers/mailto.php |   103 +
 core/components/com_mailto/mailto.php         |    16 +
 core/components/com_mailto/mailto.xml         |    29 +
 .../com_mailto/models/forms/mailto.xml        |    51 +
 core/components/com_mailto/models/mailto.php  |   104 +
 .../com_mailto/views/mailto/tmpl/default.php  |    52 +
 .../com_mailto/views/mailto/view.html.php     |    35 +
 .../com_mailto/views/sent/tmpl/default.php    |    22 +
 .../com_mailto/views/sent/view.html.php       |    19 +
 core/components/com_media/media.php           |    18 +
 core/components/com_menus/controller.php      |    41 +
 core/components/com_menus/menus.php           |    32 +
 .../com_menus/models/forms/filter_items.xml   |    95 +
 core/components/com_modules/controller.php    |    41 +
 .../models/forms/filter_modules.xml           |    80 +
 core/components/com_modules/modules.php       |    37 +
 core/components/com_newsfeeds/controller.php  |    49 +
 .../com_newsfeeds/helpers/association.php     |    63 +
 .../com_newsfeeds/helpers/category.php        |    31 +
 .../com_newsfeeds/helpers/legacyrouter.php    |   268 +
 .../com_newsfeeds/helpers/route.php           |    82 +
 .../com_newsfeeds/models/categories.php       |   142 +
 .../com_newsfeeds/models/category.php         |   378 +
 .../com_newsfeeds/models/newsfeed.php         |   194 +
 core/components/com_newsfeeds/newsfeeds.php   |    17 +
 core/components/com_newsfeeds/router.php      |   247 +
 .../views/categories/tmpl/default.php         |    41 +
 .../views/categories/tmpl/default.xml         |   350 +
 .../views/categories/tmpl/default_items.php   |    61 +
 .../views/categories/view.html.php            |    32 +
 .../views/category/tmpl/default.php           |    54 +
 .../views/category/tmpl/default.xml           |   290 +
 .../views/category/tmpl/default_children.php  |    57 +
 .../views/category/tmpl/default_items.php     |    95 +
 .../views/category/view.html.php              |    94 +
 .../views/newsfeed/tmpl/default.php           |   121 +
 .../views/newsfeed/tmpl/default.xml           |   107 +
 .../views/newsfeed/view.html.php              |   332 +
 core/components/com_search/controller.php     |   109 +
 core/components/com_search/models/search.php  |   247 +
 core/components/com_search/router.php         |   107 +
 core/components/com_search/search.php         |    14 +
 .../com_search/views/search/tmpl/default.php  |    31 +
 .../com_search/views/search/tmpl/default.xml  |   103 +
 .../views/search/tmpl/default_error.php       |    17 +
 .../views/search/tmpl/default_form.php        |    80 +
 .../views/search/tmpl/default_results.php     |    48 +
 .../com_search/views/search/view.html.php     |   311 +
 .../views/search/view.opensearch.php          |    52 +
 core/components/com_tags/controller.php       |    54 +
 core/components/com_tags/controllers/tags.php |    55 +
 core/components/com_tags/helpers/route.php    |   225 +
 core/components/com_tags/models/tag.php       |   347 +
 core/components/com_tags/models/tags.php      |   193 +
 core/components/com_tags/router.php           |   220 +
 core/components/com_tags/tags.php             |    16 +
 .../com_tags/views/tag/tmpl/default.php       |    61 +
 .../com_tags/views/tag/tmpl/default.xml       |   275 +
 .../com_tags/views/tag/tmpl/default_items.php |   105 +
 .../com_tags/views/tag/tmpl/list.php          |    52 +
 .../com_tags/views/tag/tmpl/list.xml          |   312 +
 .../com_tags/views/tag/tmpl/list_items.php    |   123 +
 .../com_tags/views/tag/view.feed.php          |    82 +
 .../com_tags/views/tag/view.html.php          |   356 +
 .../com_tags/views/tags/tmpl/default.php      |    36 +
 .../com_tags/views/tags/tmpl/default.xml      |   232 +
 .../views/tags/tmpl/default_items.php         |   145 +
 .../com_tags/views/tags/view.feed.php         |    80 +
 .../com_tags/views/tags/view.html.php         |   291 +
 core/components/com_users/controller.php      |   136 +
 .../com_users/controllers/profile.json.php    |    21 +
 .../com_users/controllers/profile.php         |   260 +
 .../controllers/profile_base_json.php         |    53 +
 .../com_users/controllers/registration.php    |   205 +
 .../com_users/controllers/remind.php          |    59 +
 .../com_users/controllers/reset.php           |   190 +
 .../components/com_users/controllers/user.php |   371 +
 .../com_users/helpers/html/users.php          |   251 +
 .../com_users/helpers/legacyrouter.php        |   309 +
 core/components/com_users/helpers/route.php   |   199 +
 .../com_users/models/forms/frontend.xml       |    38 +
 .../com_users/models/forms/frontend_admin.xml |    39 +
 .../com_users/models/forms/login.xml          |    42 +
 .../com_users/models/forms/profile.xml        |    92 +
 .../com_users/models/forms/registration.xml   |    99 +
 .../com_users/models/forms/remind.xml         |    23 +
 .../com_users/models/forms/reset_complete.xml |    31 +
 .../com_users/models/forms/reset_confirm.xml  |    24 +
 .../com_users/models/forms/reset_request.xml  |    23 +
 .../com_users/models/forms/sitelang.xml       |    16 +
 core/components/com_users/models/login.php    |   112 +
 core/components/com_users/models/profile.php  |   445 +
 .../com_users/models/registration.php         |   710 +
 core/components/com_users/models/remind.php   |   198 +
 core/components/com_users/models/reset.php    |   523 +
 .../models/rules/loginuniquefield.php         |    56 +
 .../models/rules/logoutuniquefield.php        |    56 +
 core/components/com_users/router.php          |    89 +
 core/components/com_users/users.php           |    16 +
 .../com_users/views/login/tmpl/default.php    |    23 +
 .../com_users/views/login/tmpl/default.xml    |   166 +
 .../views/login/tmpl/default_login.php        |   106 +
 .../views/login/tmpl/default_logout.php       |    49 +
 .../com_users/views/login/tmpl/logout.xml     |    39 +
 .../com_users/views/login/view.html.php       |   131 +
 .../com_users/views/profile/tmpl/default.php  |    34 +
 .../com_users/views/profile/tmpl/default.xml  |    11 +
 .../views/profile/tmpl/default_core.php       |    49 +
 .../views/profile/tmpl/default_custom.php     |    70 +
 .../views/profile/tmpl/default_params.php     |    40 +
 .../com_users/views/profile/tmpl/edit.php     |   152 +
 .../com_users/views/profile/tmpl/edit.xml     |    11 +
 .../com_users/views/profile/view.html.php     |   171 +
 .../views/registration/tmpl/complete.php      |    19 +
 .../views/registration/tmpl/default.php       |    68 +
 .../views/registration/tmpl/default.xml       |    11 +
 .../views/registration/view.html.php          |   128 +
 .../com_users/views/remind/tmpl/default.php   |    51 +
 .../com_users/views/remind/tmpl/default.xml   |    11 +
 .../com_users/views/remind/view.html.php      |   123 +
 .../com_users/views/reset/tmpl/complete.php   |    49 +
 .../com_users/views/reset/tmpl/confirm.php    |    49 +
 .../com_users/views/reset/tmpl/default.php    |    51 +
 .../com_users/views/reset/tmpl/default.xml    |    11 +
 .../com_users/views/reset/view.html.php       |   133 +
 core/components/com_wrapper/controller.php    |    39 +
 core/components/com_wrapper/router.php        |    89 +
 .../views/wrapper/tmpl/default.php            |    43 +
 .../views/wrapper/tmpl/default.xml            |   104 +
 .../com_wrapper/views/wrapper/view.html.php   |   117 +
 core/components/com_wrapper/wrapper.php       |    14 +
 core/components/com_wrapper/wrapper.xml       |    33 +
 core/components/index.html                    |     1 +
 core/htaccess.txt                             |    80 +
 core/images/banners/osmbanner1.png            |   Bin 0 -> 3447 bytes
 core/images/banners/osmbanner2.png            |   Bin 0 -> 3483 bytes
 core/images/banners/shop-ad-books.jpg         |   Bin 0 -> 10920 bytes
 core/images/banners/shop-ad.jpg               |   Bin 0 -> 10119 bytes
 core/images/banners/white.png                 |   Bin 0 -> 3558 bytes
 core/images/headers/blue-flower.jpg           |   Bin 0 -> 37020 bytes
 core/images/headers/maple.jpg                 |   Bin 0 -> 33870 bytes
 core/images/headers/raindrops.jpg             |   Bin 0 -> 23682 bytes
 core/images/headers/walden-pond.jpg           |   Bin 0 -> 22716 bytes
 core/images/headers/windows.jpg               |   Bin 0 -> 34690 bytes
 core/images/index.html                        |     1 +
 core/images/joomla_black.png                  |   Bin 0 -> 4979 bytes
 core/images/powered_by.png                    |   Bin 0 -> 3197 bytes
 core/images/sampledata/fruitshop/apple.jpg    |   Bin 0 -> 15637 bytes
 .../images/sampledata/fruitshop/bananas_2.jpg |   Bin 0 -> 17127 bytes
 core/images/sampledata/fruitshop/fruits.gif   |   Bin 0 -> 2057 bytes
 core/images/sampledata/fruitshop/tamarind.jpg |   Bin 0 -> 31463 bytes
 .../parks/animals/180px_koala_ag1.jpg         |   Bin 0 -> 4047 bytes
 .../parks/animals/180px_wobbegong.jpg         |   Bin 0 -> 4576 bytes
 .../200px_phyllopteryx_taeniolatus1.jpg       |   Bin 0 -> 5067 bytes
 .../220px_spottedquoll_2005_seanmcclean.jpg   |   Bin 0 -> 4380 bytes
 .../789px_spottedquoll_2005_seanmcclean.jpg   |   Bin 0 -> 10301 bytes
 .../parks/animals/800px_koala_ag1.jpg         |   Bin 0 -> 11163 bytes
 .../800px_phyllopteryx_taeniolatus1.jpg       |   Bin 0 -> 12388 bytes
 .../parks/animals/800px_wobbegong.jpg         |   Bin 0 -> 17040 bytes
 .../images/sampledata/parks/banner_cradle.jpg |   Bin 0 -> 28065 bytes
 .../120px_pinnacles_western_australia.jpg     |   Bin 0 -> 1315 bytes
 .../120px_rainforest_bluemountainsnsw.jpg     |   Bin 0 -> 4506 bytes
 .../parks/landscape/180px_ormiston_pound.jpg  |   Bin 0 -> 988 bytes
 ...x_cradle_mountain_seen_from_barn_bluff.jpg |   Bin 0 -> 4826 bytes
 .../727px_rainforest_bluemountainsnsw.jpg     |   Bin 0 -> 10813 bytes
 ...x_cradle_mountain_seen_from_barn_bluff.jpg |   Bin 0 -> 10654 bytes
 .../parks/landscape/800px_ormiston_pound.jpg  |   Bin 0 -> 9029 bytes
 .../800px_pinnacles_western_australia.jpg     |   Bin 0 -> 15411 bytes
 core/images/sampledata/parks/parks.gif        |   Bin 0 -> 2069 bytes
 core/includes/defines.php                     |    24 +
 core/includes/framework.php                   |   101 +
 core/includes/index.html                      |     1 +
 core/index.php                                |    49 +
 core/language/en-GB/en-GB.com_ajax.ini        |    13 +
 core/language/en-GB/en-GB.com_config.ini      |    36 +
 core/language/en-GB/en-GB.com_contact.ini     |    65 +
 core/language/en-GB/en-GB.com_content.ini     |    97 +
 core/language/en-GB/en-GB.com_finder.ini      |    41 +
 core/language/en-GB/en-GB.com_mailto.ini      |    22 +
 core/language/en-GB/en-GB.com_media.ini       |    77 +
 core/language/en-GB/en-GB.com_messages.ini    |    10 +
 core/language/en-GB/en-GB.com_newsfeeds.ini   |    20 +
 core/language/en-GB/en-GB.com_search.ini      |    28 +
 core/language/en-GB/en-GB.com_tags.ini        |    14 +
 core/language/en-GB/en-GB.com_users.ini       |   165 +
 core/language/en-GB/en-GB.com_weblinks.ini    |    39 +
 core/language/en-GB/en-GB.com_wrapper.ini     |     7 +
 .../language/en-GB/en-GB.files_joomla.sys.ini |    10 +
 core/language/en-GB/en-GB.finder_cli.ini      |    21 +
 core/language/en-GB/en-GB.ini                 |   414 +
 core/language/en-GB/en-GB.lib_fof.ini         |     8 +
 core/language/en-GB/en-GB.lib_fof.sys.ini     |     6 +
 .../en-GB/en-GB.lib_idna_convert.sys.ini      |     8 +
 core/language/en-GB/en-GB.lib_joomla.ini      |   747 +
 core/language/en-GB/en-GB.lib_joomla.sys.ini  |     8 +
 core/language/en-GB/en-GB.lib_phpass.sys.ini  |     7 +
 core/language/en-GB/en-GB.lib_phputf8.sys.ini |     8 +
 .../en-GB/en-GB.lib_simplepie.sys.ini         |     7 +
 core/language/en-GB/en-GB.localise.php        |    90 +
 .../en-GB/en-GB.mod_articles_archive.ini      |    11 +
 .../en-GB/en-GB.mod_articles_archive.sys.ini  |     9 +
 .../en-GB/en-GB.mod_articles_categories.ini   |    21 +
 .../en-GB.mod_articles_categories.sys.ini     |     9 +
 .../en-GB/en-GB.mod_articles_category.ini     |   101 +
 .../en-GB/en-GB.mod_articles_category.sys.ini |     9 +
 .../en-GB/en-GB.mod_articles_latest.ini       |    25 +
 .../en-GB/en-GB.mod_articles_latest.sys.ini   |     9 +
 .../en-GB/en-GB.mod_articles_news.ini         |    38 +
 .../en-GB/en-GB.mod_articles_news.sys.ini     |     9 +
 .../en-GB/en-GB.mod_articles_popular.ini      |    28 +
 .../en-GB/en-GB.mod_articles_popular.sys.ini  |     9 +
 core/language/en-GB/en-GB.mod_banners.ini     |    28 +
 core/language/en-GB/en-GB.mod_banners.sys.ini |     9 +
 core/language/en-GB/en-GB.mod_breadcrumbs.ini |    19 +
 .../en-GB/en-GB.mod_breadcrumbs.sys.ini       |     9 +
 core/language/en-GB/en-GB.mod_custom.ini      |    11 +
 core/language/en-GB/en-GB.mod_custom.sys.ini  |     9 +
 core/language/en-GB/en-GB.mod_feed.ini        |    26 +
 core/language/en-GB/en-GB.mod_feed.sys.ini    |     9 +
 core/language/en-GB/en-GB.mod_finder.ini      |    45 +
 core/language/en-GB/en-GB.mod_finder.sys.ini  |     8 +
 core/language/en-GB/en-GB.mod_footer.ini      |    10 +
 core/language/en-GB/en-GB.mod_footer.sys.ini  |    10 +
 core/language/en-GB/en-GB.mod_languages.ini   |    31 +
 .../en-GB/en-GB.mod_languages.sys.ini         |     9 +
 core/language/en-GB/en-GB.mod_login.ini       |    35 +
 core/language/en-GB/en-GB.mod_login.sys.ini   |     9 +
 core/language/en-GB/en-GB.mod_menu.ini        |    23 +
 core/language/en-GB/en-GB.mod_menu.sys.ini    |     9 +
 .../language/en-GB/en-GB.mod_random_image.ini |    18 +
 .../en-GB/en-GB.mod_random_image.sys.ini      |     9 +
 .../en-GB/en-GB.mod_related_items.ini         |    11 +
 .../en-GB/en-GB.mod_related_items.sys.ini     |     8 +
 core/language/en-GB/en-GB.mod_search.ini      |    35 +
 core/language/en-GB/en-GB.mod_search.sys.ini  |     9 +
 core/language/en-GB/en-GB.mod_stats.ini       |    25 +
 core/language/en-GB/en-GB.mod_stats.sys.ini   |     9 +
 core/language/en-GB/en-GB.mod_syndicate.ini   |    16 +
 .../en-GB/en-GB.mod_syndicate.sys.ini         |     9 +
 .../language/en-GB/en-GB.mod_tags_popular.ini |    36 +
 .../en-GB/en-GB.mod_tags_popular.sys.ini      |     9 +
 .../language/en-GB/en-GB.mod_tags_similar.ini |    21 +
 .../en-GB/en-GB.mod_tags_similar.sys.ini      |     9 +
 .../language/en-GB/en-GB.mod_users_latest.ini |    15 +
 .../en-GB/en-GB.mod_users_latest.sys.ini      |     9 +
 core/language/en-GB/en-GB.mod_weblinks.ini    |    41 +
 .../language/en-GB/en-GB.mod_weblinks.sys.ini |     9 +
 core/language/en-GB/en-GB.mod_whosonline.ini  |    29 +
 .../en-GB/en-GB.mod_whosonline.sys.ini        |     9 +
 core/language/en-GB/en-GB.mod_wrapper.ini     |    25 +
 core/language/en-GB/en-GB.mod_wrapper.sys.ini |    10 +
 core/language/en-GB/en-GB.tpl_beez3.ini       |    60 +
 core/language/en-GB/en-GB.tpl_beez3.sys.ini   |    23 +
 core/language/en-GB/en-GB.tpl_protostar.ini   |    22 +
 .../en-GB/en-GB.tpl_protostar.sys.ini         |    25 +
 core/language/en-GB/en-GB.xml                 |    23 +
 core/language/en-GB/install.xml               |    18 +
 core/language/index.html                      |     1 +
 core/language/overrides/index.html            |     1 +
 core/layouts/index.html                       |     1 +
 core/layouts/joomla/content/associations.php  |    22 +
 .../content/blog_style_default_item_title.php |    48 +
 .../content/blog_style_default_links.php      |    18 +
 .../joomla/content/categories_default.php     |    33 +
 .../content/categories_default_items.php      |    25 +
 .../joomla/content/category_default.php       |    93 +
 core/layouts/joomla/content/full_image.php    |    21 +
 core/layouts/joomla/content/icons.php         |    51 +
 core/layouts/joomla/content/icons/create.php  |    27 +
 core/layouts/joomla/content/icons/edit.php    |    45 +
 .../joomla/content/icons/edit_lock.php        |    26 +
 core/layouts/joomla/content/icons/email.php   |    25 +
 .../joomla/content/icons/print_popup.php      |    26 +
 .../joomla/content/icons/print_screen.php     |    26 +
 core/layouts/joomla/content/info_block.php    |    64 +
 .../content/info_block/associations.php       |    27 +
 .../joomla/content/info_block/author.php      |    21 +
 .../joomla/content/info_block/block.php       |    13 +
 .../joomla/content/info_block/category.php    |    21 +
 .../joomla/content/info_block/create_date.php |    18 +
 .../joomla/content/info_block/hits.php        |    17 +
 .../joomla/content/info_block/modify_date.php |    18 +
 .../content/info_block/parent_category.php    |    21 +
 .../content/info_block/publish_date.php       |    17 +
 core/layouts/joomla/content/intro_image.php   |    30 +
 core/layouts/joomla/content/language.php      |    29 +
 .../joomla/content/options_default.php        |    36 +
 core/layouts/joomla/content/readmore.php      |    44 +
 core/layouts/joomla/content/tags.php          |    33 +
 core/layouts/joomla/content/text_filters.php  |    24 +
 core/layouts/joomla/edit/associations.php     |    26 +
 core/layouts/joomla/edit/details.php          |    58 +
 core/layouts/joomla/edit/fieldset.php         |    63 +
 .../joomla/edit/frontediting_modules.php      |    70 +
 core/layouts/joomla/edit/global.php           |    68 +
 core/layouts/joomla/edit/item_title.php       |    24 +
 core/layouts/joomla/edit/metadata.php         |    39 +
 core/layouts/joomla/edit/params.php           |   127 +
 core/layouts/joomla/edit/publishingdata.php   |    45 +
 core/layouts/joomla/edit/title_alias.php      |    22 +
 core/layouts/joomla/editors/buttons.php       |    21 +
 .../layouts/joomla/editors/buttons/button.php |    32 +
 core/layouts/joomla/error/backtrace.php       |    68 +
 core/layouts/joomla/error/index.html          |     1 +
 core/layouts/joomla/form/field/calendar.php   |   135 +
 core/layouts/joomla/form/field/checkboxes.php |    89 +
 .../joomla/form/field/color/advanced.php      |    80 +
 .../joomla/form/field/color/simple.php        |    68 +
 core/layouts/joomla/form/field/combo.php      |    77 +
 .../joomla/form/field/contenthistory.php      |    26 +
 core/layouts/joomla/form/field/email.php      |    75 +
 core/layouts/joomla/form/field/file.php       |    65 +
 core/layouts/joomla/form/field/hidden.php     |    54 +
 core/layouts/joomla/form/field/media.php      |   180 +
 core/layouts/joomla/form/field/meter.php      |    80 +
 .../layouts/joomla/form/field/moduleorder.php |    65 +
 core/layouts/joomla/form/field/number.php     |    84 +
 core/layouts/joomla/form/field/password.php   |    87 +
 core/layouts/joomla/form/field/radio.php      |    91 +
 core/layouts/joomla/form/field/range.php      |    71 +
 .../joomla/form/field/subform/default.php     |    37 +
 .../form/field/subform/repeatable-table.php   |   108 +
 .../repeatable-table/section-byfieldsets.php  |    41 +
 .../subform/repeatable-table/section.php      |    39 +
 .../joomla/form/field/subform/repeatable.php  |    63 +
 .../repeatable/section-byfieldsets.php        |    45 +
 .../form/field/subform/repeatable/section.php |    38 +
 core/layouts/joomla/form/field/tel.php        |    72 +
 core/layouts/joomla/form/field/text.php       |    92 +
 core/layouts/joomla/form/field/textarea.php   |    76 +
 core/layouts/joomla/form/field/url.php        |    73 +
 core/layouts/joomla/form/field/user.php       |   111 +
 core/layouts/joomla/form/renderfield.php      |    36 +
 core/layouts/joomla/form/renderlabel.php      |    60 +
 core/layouts/joomla/html/batch/access.php     |    29 +
 .../joomla/html/batch/adminlanguage.php       |    44 +
 core/layouts/joomla/html/batch/item.php       |    37 +
 core/layouts/joomla/html/batch/language.php   |    44 +
 core/layouts/joomla/html/batch/tag.php        |    26 +
 core/layouts/joomla/html/batch/user.php       |    36 +
 .../joomla/html/formbehavior/ajaxchosen.php   |    57 +
 .../joomla/html/formbehavior/chosen.php       |    44 +
 core/layouts/joomla/html/sortablelist.php     |    64 +
 core/layouts/joomla/html/tag.php              |   117 +
 core/layouts/joomla/html/treeprefix.php       |    26 +
 core/layouts/joomla/links/groupclose.php      |    12 +
 core/layouts/joomla/links/groupopen.php       |    13 +
 core/layouts/joomla/links/groupsclose.php     |    12 +
 core/layouts/joomla/links/groupseparator.php  |    12 +
 core/layouts/joomla/links/groupsopen.php      |    12 +
 core/layouts/joomla/links/link.php            |    23 +
 core/layouts/joomla/modal/body.php            |    46 +
 core/layouts/joomla/modal/footer.php          |    37 +
 core/layouts/joomla/modal/header.php          |    42 +
 core/layouts/joomla/modal/iframe.php          |    66 +
 core/layouts/joomla/modal/main.php            |   172 +
 core/layouts/joomla/pagination/link.php       |    89 +
 core/layouts/joomla/pagination/links.php      |    86 +
 core/layouts/joomla/pagination/list.php       |    22 +
 core/layouts/joomla/quickicons/icon.php       |    25 +
 core/layouts/joomla/searchtools/default.php   |   105 +
 .../joomla/searchtools/default/bar.php        |    62 +
 .../joomla/searchtools/default/filters.php    |    31 +
 .../joomla/searchtools/default/list.php       |    25 +
 .../joomla/searchtools/default/noitems.php    |    16 +
 .../joomla/searchtools/default/selector.php   |    16 +
 core/layouts/joomla/searchtools/grid/sort.php |    23 +
 core/layouts/joomla/sidebars/submenu.php      |    79 +
 core/layouts/joomla/sidebars/toggle.php       |    22 +
 core/layouts/joomla/system/message.php        |    35 +
 core/layouts/joomla/tinymce/buttons.php       |    13 +
 .../layouts/joomla/tinymce/buttons/button.php |    13 +
 core/layouts/joomla/tinymce/textarea.php      |    25 +
 core/layouts/joomla/tinymce/togglebutton.php  |    24 +
 core/layouts/joomla/toolbar/base.php          |    14 +
 core/layouts/joomla/toolbar/batch.php         |    21 +
 core/layouts/joomla/toolbar/confirm.php       |    22 +
 .../layouts/joomla/toolbar/containerclose.php |    12 +
 core/layouts/joomla/toolbar/containeropen.php |    12 +
 core/layouts/joomla/toolbar/help.php          |    21 +
 core/layouts/joomla/toolbar/iconclass.php     |    12 +
 core/layouts/joomla/toolbar/link.php          |    20 +
 core/layouts/joomla/toolbar/modal.php         |    32 +
 core/layouts/joomla/toolbar/popup.php         |    22 +
 core/layouts/joomla/toolbar/separator.php     |    10 +
 core/layouts/joomla/toolbar/slider.php        |    23 +
 core/layouts/joomla/toolbar/standard.php      |    23 +
 core/layouts/joomla/toolbar/title.php         |    17 +
 core/layouts/joomla/toolbar/versions.php      |    19 +
 .../libraries/cms/html/bootstrap/addtab.php   |    17 +
 .../cms/html/bootstrap/addtabscript.php       |    19 +
 .../libraries/cms/html/bootstrap/endtab.php   |    14 +
 .../cms/html/bootstrap/endtabset.php          |    14 +
 .../cms/html/bootstrap/starttabset.php        |    17 +
 .../cms/html/bootstrap/starttabsetscript.php  |    21 +
 .../editors/tinymce/field/tinymcebuilder.php  |   211 +
 .../field/tinymcebuilder/setoptions.php       |    26 +
 .../plugins/user/profile/fields/dob.php       |    21 +
 core/libraries/classmap.php                   |   424 +
 core/libraries/cms.php                        |    93 +
 core/libraries/cms/class/loader.php           |    62 +
 core/libraries/cms/html/access.php            |   280 +
 core/libraries/cms/html/actionsdropdown.php   |   232 +
 core/libraries/cms/html/adminlanguage.php     |    65 +
 core/libraries/cms/html/batch.php             |   108 +
 core/libraries/cms/html/behavior.php          |  1016 ++
 core/libraries/cms/html/bootstrap.php         |   931 ++
 core/libraries/cms/html/category.php          |   202 +
 core/libraries/cms/html/content.php           |    45 +
 core/libraries/cms/html/contentlanguage.php   |    68 +
 core/libraries/cms/html/date.php              |    88 +
 core/libraries/cms/html/debug.php             |    69 +
 core/libraries/cms/html/dropdown.php          |   367 +
 core/libraries/cms/html/email.php             |   130 +
 core/libraries/cms/html/form.php              |    82 +
 core/libraries/cms/html/formbehavior.php      |   151 +
 core/libraries/cms/html/grid.php              |   364 +
 core/libraries/cms/html/icons.php             |    81 +
 core/libraries/cms/html/jgrid.php             |   406 +
 core/libraries/cms/html/jquery.php            |   149 +
 .../html/language/en-GB/en-GB.jhtmldate.ini   |    18 +
 core/libraries/cms/html/links.php             |   129 +
 core/libraries/cms/html/list.php              |   270 +
 core/libraries/cms/html/menu.php              |   397 +
 core/libraries/cms/html/number.php            |   112 +
 core/libraries/cms/html/rules.php             |   232 +
 core/libraries/cms/html/searchtools.php       |   167 +
 core/libraries/cms/html/select.php            |   820 +
 core/libraries/cms/html/sidebar.php           |   149 +
 core/libraries/cms/html/sliders.php           |   123 +
 core/libraries/cms/html/sortablelist.php      |   107 +
 core/libraries/cms/html/string.php            |   301 +
 core/libraries/cms/html/tabs.php              |   111 +
 core/libraries/cms/html/tag.php               |   180 +
 core/libraries/cms/html/tel.php               |    75 +
 core/libraries/cms/html/user.php              |    77 +
 core/libraries/cms/less/formatter/joomla.php  |    31 +
 core/libraries/cms/less/less.php              |    60 +
 core/libraries/fof/LICENSE.txt                |   345 +
 core/libraries/fof/autoloader/component.php   |   780 +
 core/libraries/fof/autoloader/fof.php         |   116 +
 .../fof/config/domain/dispatcher.php          |    74 +
 .../libraries/fof/config/domain/interface.php |    41 +
 core/libraries/fof/config/domain/tables.php   |   262 +
 core/libraries/fof/config/domain/views.php    |   302 +
 core/libraries/fof/config/provider.php        |   212 +
 core/libraries/fof/controller/controller.php  |  3413 ++++
 core/libraries/fof/database/database.php      |   199 +
 core/libraries/fof/database/driver.php        |  2255 +++
 core/libraries/fof/database/driver/joomla.php |   778 +
 core/libraries/fof/database/driver/mysql.php  |   577 +
 core/libraries/fof/database/driver/mysqli.php |  1019 ++
 core/libraries/fof/database/driver/oracle.php |   712 +
 core/libraries/fof/database/driver/pdo.php    |  1106 ++
 .../fof/database/driver/pdomysql.php          |   559 +
 .../fof/database/driver/postgresql.php        |  1529 ++
 .../fof/database/driver/sqlazure.php          |    30 +
 core/libraries/fof/database/driver/sqlite.php |   484 +
 core/libraries/fof/database/driver/sqlsrv.php |  1171 ++
 core/libraries/fof/database/factory.php       |   127 +
 core/libraries/fof/database/installer.php     |  1020 ++
 core/libraries/fof/database/interface.php     |    37 +
 core/libraries/fof/database/iterator.php      |   251 +
 .../libraries/fof/database/iterator/azure.php |    20 +
 .../libraries/fof/database/iterator/mysql.php |    51 +
 .../fof/database/iterator/mysqli.php          |    51 +
 .../fof/database/iterator/oracle.php          |    20 +
 core/libraries/fof/database/iterator/pdo.php  |    68 +
 .../fof/database/iterator/pdomysql.php        |    20 +
 .../fof/database/iterator/postgresql.php      |    51 +
 .../fof/database/iterator/sqlite.php          |    20 +
 .../fof/database/iterator/sqlsrv.php          |    51 +
 core/libraries/fof/database/query.php         |  1732 ++
 core/libraries/fof/database/query/element.php |   132 +
 .../fof/database/query/limitable.php          |    72 +
 core/libraries/fof/database/query/mysql.php   |    23 +
 core/libraries/fof/database/query/mysqli.php  |   143 +
 core/libraries/fof/database/query/oracle.php  |   205 +
 core/libraries/fof/database/query/pdo.php     |    22 +
 .../libraries/fof/database/query/pdomysql.php |    24 +
 .../fof/database/query/postgresql.php         |   661 +
 .../fof/database/query/preparable.php         |    62 +
 .../libraries/fof/database/query/sqlazure.php |    33 +
 core/libraries/fof/database/query/sqlite.php  |   279 +
 core/libraries/fof/database/query/sqlsrv.php  |   380 +
 core/libraries/fof/dispatcher/dispatcher.php  |   718 +
 .../fof/download/adapter/abstract.php         |   113 +
 .../libraries/fof/download/adapter/cacert.pem |  5104 ++++++
 core/libraries/fof/download/adapter/curl.php  |   226 +
 core/libraries/fof/download/adapter/fopen.php |   123 +
 core/libraries/fof/download/download.php      |   495 +
 core/libraries/fof/download/interface.php     |    79 +
 core/libraries/fof/encrypt/aes.php            |   285 +
 core/libraries/fof/encrypt/aes/abstract.php   |    88 +
 core/libraries/fof/encrypt/aes/interface.php  |    83 +
 core/libraries/fof/encrypt/aes/mcrypt.php     |   157 +
 core/libraries/fof/encrypt/aes/openssl.php    |   172 +
 core/libraries/fof/encrypt/base32.php         |   222 +
 core/libraries/fof/encrypt/randval.php        |   196 +
 .../fof/encrypt/randvalinterface.php          |    22 +
 core/libraries/fof/encrypt/totp.php           |   181 +
 core/libraries/fof/form/field.php             |    38 +
 core/libraries/fof/form/field/accesslevel.php |   156 +
 core/libraries/fof/form/field/actions.php     |   250 +
 core/libraries/fof/form/field/button.php      |   137 +
 .../libraries/fof/form/field/cachehandler.php |   102 +
 core/libraries/fof/form/field/calendar.php    |   211 +
 core/libraries/fof/form/field/captcha.php     |    93 +
 core/libraries/fof/form/field/checkbox.php    |   129 +
 core/libraries/fof/form/field/checkboxes.php  |   128 +
 core/libraries/fof/form/field/components.php  |   237 +
 core/libraries/fof/form/field/editor.php      |    97 +
 core/libraries/fof/form/field/email.php       |   173 +
 .../fof/form/field/groupedbutton.php          |   134 +
 core/libraries/fof/form/field/groupedlist.php |   185 +
 core/libraries/fof/form/field/hidden.php      |    93 +
 core/libraries/fof/form/field/image.php       |    20 +
 core/libraries/fof/form/field/imagelist.php   |   153 +
 core/libraries/fof/form/field/integer.php     |   101 +
 core/libraries/fof/form/field/language.php    |   122 +
 core/libraries/fof/form/field/list.php        |   382 +
 core/libraries/fof/form/field/media.php       |   150 +
 core/libraries/fof/form/field/model.php       |   290 +
 core/libraries/fof/form/field/ordering.php    |   218 +
 core/libraries/fof/form/field/password.php    |   101 +
 core/libraries/fof/form/field/plugins.php     |   101 +
 core/libraries/fof/form/field/published.php   |   216 +
 core/libraries/fof/form/field/radio.php       |   101 +
 core/libraries/fof/form/field/relation.php    |   194 +
 core/libraries/fof/form/field/rules.php       |   630 +
 core/libraries/fof/form/field/selectrow.php   |   124 +
 .../fof/form/field/sessionhandler.php         |   101 +
 core/libraries/fof/form/field/spacer.php      |    93 +
 core/libraries/fof/form/field/sql.php         |   101 +
 core/libraries/fof/form/field/tag.php         |   238 +
 core/libraries/fof/form/field/tel.php         |   165 +
 core/libraries/fof/form/field/text.php        |   246 +
 core/libraries/fof/form/field/textarea.php    |    97 +
 core/libraries/fof/form/field/timezone.php    |   110 +
 core/libraries/fof/form/field/title.php       |    67 +
 core/libraries/fof/form/field/url.php         |   165 +
 core/libraries/fof/form/field/user.php        |   349 +
 core/libraries/fof/form/field/usergroup.php   |   143 +
 core/libraries/fof/form/form.php              |   659 +
 core/libraries/fof/form/header.php            |   579 +
 .../libraries/fof/form/header/accesslevel.php |    43 +
 core/libraries/fof/form/header/field.php      |    44 +
 core/libraries/fof/form/header/fielddate.php  |   127 +
 .../fof/form/header/fieldfilterable.php       |    75 +
 .../fof/form/header/fieldsearchable.php       |    85 +
 .../fof/form/header/fieldselectable.php       |   109 +
 core/libraries/fof/form/header/fieldsql.php   |    62 +
 core/libraries/fof/form/header/filterdate.php |    28 +
 .../fof/form/header/filterfilterable.php      |    28 +
 .../fof/form/header/filtersearchable.php      |    28 +
 .../fof/form/header/filterselectable.php      |    28 +
 core/libraries/fof/form/header/filtersql.php  |    28 +
 core/libraries/fof/form/header/language.php   |    43 +
 core/libraries/fof/form/header/model.php      |   105 +
 core/libraries/fof/form/header/ordering.php   |    73 +
 core/libraries/fof/form/header/published.php  |    67 +
 core/libraries/fof/form/header/rowselect.php  |    30 +
 core/libraries/fof/form/helper.php            |   232 +
 core/libraries/fof/hal/document.php           |   229 +
 core/libraries/fof/hal/link.php               |   137 +
 core/libraries/fof/hal/links.php              |   124 +
 core/libraries/fof/hal/render/interface.php   |    26 +
 core/libraries/fof/hal/render/json.php        |   177 +
 core/libraries/fof/include.php                |    28 +
 core/libraries/fof/inflector/inflector.php    |   461 +
 core/libraries/fof/input/input.php            |   319 +
 core/libraries/fof/input/jinput/cli.php       |   200 +
 core/libraries/fof/input/jinput/cookie.php    |    89 +
 core/libraries/fof/input/jinput/files.php     |   136 +
 core/libraries/fof/input/jinput/input.php     |   383 +
 core/libraries/fof/input/jinput/json.php      |    72 +
 .../joomla/filesystem/filesystem.php          |   180 +
 .../fof/integration/joomla/platform.php       |   968 ++
 core/libraries/fof/layout/file.php            |    69 +
 core/libraries/fof/layout/helper.php          |    39 +
 core/libraries/fof/less/formatter/classic.php |   189 +
 .../fof/less/formatter/compressed.php         |    50 +
 core/libraries/fof/less/formatter/joomla.php  |    36 +
 core/libraries/fof/less/formatter/lessjs.php  |    34 +
 core/libraries/fof/less/less.php              |  3450 ++++
 core/libraries/fof/less/parser/parser.php     |  2235 +++
 core/libraries/fof/model/behavior.php         |   213 +
 core/libraries/fof/model/behavior/access.php  |    81 +
 .../fof/model/behavior/emptynonzero.php       |    32 +
 core/libraries/fof/model/behavior/enabled.php |    84 +
 core/libraries/fof/model/behavior/filters.php |   104 +
 .../libraries/fof/model/behavior/language.php |   168 +
 core/libraries/fof/model/behavior/private.php |    94 +
 .../fof/model/dispatcher/behavior.php         |    19 +
 core/libraries/fof/model/field.php            |   353 +
 core/libraries/fof/model/field/boolean.php    |    30 +
 core/libraries/fof/model/field/date.php       |   212 +
 core/libraries/fof/model/field/number.php     |   198 +
 core/libraries/fof/model/field/text.php       |   145 +
 core/libraries/fof/model/model.php            |  3256 ++++
 .../fof/platform/filesystem/filesystem.php    |   134 +
 .../fof/platform/filesystem/interface.php     |   134 +
 core/libraries/fof/platform/interface.php     |   490 +
 core/libraries/fof/platform/platform.php      |   744 +
 core/libraries/fof/query/abstract.php         |    42 +
 core/libraries/fof/render/abstract.php        |   282 +
 core/libraries/fof/render/joomla.php          |   787 +
 core/libraries/fof/render/joomla3.php         |   214 +
 core/libraries/fof/render/strapper.php        |  1388 ++
 core/libraries/fof/string/utils.php           |    91 +
 core/libraries/fof/table/behavior.php         |   251 +
 core/libraries/fof/table/behavior/assets.php  |   240 +
 .../fof/table/behavior/contenthistory.php     |    60 +
 core/libraries/fof/table/behavior/tags.php    |   108 +
 .../fof/table/dispatcher/behavior.php         |    21 +
 core/libraries/fof/table/nested.php           |  2211 +++
 core/libraries/fof/table/relations.php        |  1028 ++
 core/libraries/fof/table/table.php            |  3852 +++++
 core/libraries/fof/template/utils.php         |   518 +
 core/libraries/fof/toolbar/toolbar.php        |  1090 ++
 core/libraries/fof/utils/array/array.php      |   585 +
 core/libraries/fof/utils/cache/cleaner.php    |    85 +
 core/libraries/fof/utils/config/helper.php    |    89 +
 .../fof/utils/filescheck/filescheck.php       |   272 +
 core/libraries/fof/utils/ini/parser.php       |   199 +
 .../fof/utils/installscript/installscript.php |  2399 +++
 core/libraries/fof/utils/ip/ip.php            |   523 +
 core/libraries/fof/utils/object/object.php    |   202 +
 .../fof/utils/observable/dispatcher.php       |   277 +
 core/libraries/fof/utils/observable/event.php |    70 +
 core/libraries/fof/utils/phpfunc/phpfunc.php  |    39 +
 core/libraries/fof/utils/timer/timer.php      |    87 +
 .../libraries/fof/utils/update/collection.php |   371 +
 core/libraries/fof/utils/update/extension.php |   128 +
 core/libraries/fof/utils/update/joomla.php    |   625 +
 core/libraries/fof/utils/update/update.php    |  1213 ++
 core/libraries/fof/version.txt                |     2 +
 core/libraries/fof/view/csv.php               |   234 +
 core/libraries/fof/view/form.php              |   136 +
 core/libraries/fof/view/html.php              |   176 +
 core/libraries/fof/view/json.php              |   360 +
 core/libraries/fof/view/raw.php               |   356 +
 core/libraries/fof/view/view.php              |  1175 ++
 core/libraries/idna_convert/LICENCE           |   502 +
 core/libraries/idna_convert/ReadMe.txt        |   198 +
 .../idna_convert/idna_convert.class.php       |  1605 ++
 .../idna_convert/transcode_wrapper.php        |   137 +
 core/libraries/idna_convert/uctc.php          |   300 +
 core/libraries/import.legacy.php              |    95 +
 core/libraries/import.php                     |    67 +
 core/libraries/index.html                     |     1 +
 .../joomla/application/web/router.php         |   152 +
 .../joomla/application/web/router/base.php    |   176 +
 .../joomla/application/web/router/rest.php    |   141 +
 core/libraries/joomla/archive/archive.php     |    80 +
 core/libraries/joomla/archive/bzip2.php       |   166 +
 core/libraries/joomla/archive/extractable.php |    41 +
 core/libraries/joomla/archive/gzip.php        |   226 +
 core/libraries/joomla/archive/tar.php         |   250 +
 .../joomla/archive/wrapper/archive.php        |    55 +
 core/libraries/joomla/archive/zip.php         |   650 +
 core/libraries/joomla/base/adapter.php        |   214 +
 .../libraries/joomla/base/adapterinstance.php |    67 +
 core/libraries/joomla/controller/base.php     |   137 +
 .../joomla/controller/controller.php          |    51 +
 core/libraries/joomla/database/database.php   |   172 +
 core/libraries/joomla/database/driver.php     |  2300 +++
 .../joomla/database/driver/mysql.php          |   557 +
 .../joomla/database/driver/mysqli.php         |   999 ++
 .../joomla/database/driver/oracle.php         |   730 +
 core/libraries/joomla/database/driver/pdo.php |  1063 ++
 .../joomla/database/driver/pdomysql.php       |   574 +
 .../joomla/database/driver/postgresql.php     |  1561 ++
 .../joomla/database/driver/sqlazure.php       |    27 +
 .../joomla/database/driver/sqlite.php         |   553 +
 .../joomla/database/driver/sqlsrv.php         |  1116 ++
 .../joomla/database/exception/connecting.php  |    19 +
 .../joomla/database/exception/executing.php   |    55 +
 .../joomla/database/exception/unsupported.php |    19 +
 core/libraries/joomla/database/exporter.php   |   230 +
 .../joomla/database/exporter/mysql.php        |    44 +
 .../joomla/database/exporter/mysqli.php       |   111 +
 .../joomla/database/exporter/pdomysql.php     |   113 +
 .../joomla/database/exporter/postgresql.php   |   127 +
 core/libraries/joomla/database/factory.php    |   190 +
 core/libraries/joomla/database/importer.php   |   242 +
 .../joomla/database/importer/mysql.php        |    44 +
 .../joomla/database/importer/mysqli.php       |   450 +
 .../joomla/database/importer/pdomysql.php     |   437 +
 .../joomla/database/importer/postgresql.php   |   545 +
 core/libraries/joomla/database/interface.php  |    27 +
 core/libraries/joomla/database/iterator.php   |   203 +
 .../joomla/database/iterator/mysql.php        |    57 +
 .../joomla/database/iterator/mysqli.php       |    55 +
 .../joomla/database/iterator/oracle.php       |    19 +
 .../joomla/database/iterator/pdo.php          |    72 +
 .../joomla/database/iterator/pdomysql.php     |    22 +
 .../joomla/database/iterator/postgresql.php   |    55 +
 .../joomla/database/iterator/sqlazure.php     |    19 +
 .../joomla/database/iterator/sqlite.php       |    19 +
 .../joomla/database/iterator/sqlsrv.php       |    55 +
 core/libraries/joomla/database/query.php      |  1879 +++
 .../joomla/database/query/element.php         |   145 +
 .../joomla/database/query/limitable.php       |    54 +
 .../libraries/joomla/database/query/mysql.php |    20 +
 .../joomla/database/query/mysqli.php          |   233 +
 .../joomla/database/query/oracle.php          |   202 +
 core/libraries/joomla/database/query/pdo.php  |    47 +
 .../joomla/database/query/pdomysql.php        |    21 +
 .../joomla/database/query/postgresql.php      |   776 +
 .../joomla/database/query/preparable.php      |    51 +
 .../joomla/database/query/sqlazure.php        |    30 +
 .../joomla/database/query/sqlite.php          |   399 +
 .../joomla/database/query/sqlsrv.php          |  1048 ++
 core/libraries/joomla/event/dispatcher.php    |   278 +
 core/libraries/joomla/event/event.php         |    73 +
 core/libraries/joomla/facebook/album.php      |   197 +
 core/libraries/joomla/facebook/checkin.php    |   131 +
 core/libraries/joomla/facebook/comment.php    |   131 +
 core/libraries/joomla/facebook/event.php      |   520 +
 core/libraries/joomla/facebook/facebook.php   |   188 +
 core/libraries/joomla/facebook/group.php      |   250 +
 core/libraries/joomla/facebook/link.php       |   131 +
 core/libraries/joomla/facebook/note.php       |   131 +
 core/libraries/joomla/facebook/oauth.php      |    76 +
 core/libraries/joomla/facebook/object.php     |   304 +
 core/libraries/joomla/facebook/photo.php      |   245 +
 core/libraries/joomla/facebook/post.php       |   144 +
 core/libraries/joomla/facebook/status.php     |   130 +
 core/libraries/joomla/facebook/user.php       |   987 ++
 core/libraries/joomla/facebook/video.php      |   145 +
 core/libraries/joomla/filesystem/file.php     |   660 +
 core/libraries/joomla/filesystem/folder.php   |   722 +
 core/libraries/joomla/filesystem/helper.php   |   374 +
 .../en-GB.lib_joomla_filesystem_patcher.ini   |    13 +
 core/libraries/joomla/filesystem/patcher.php  |   532 +
 core/libraries/joomla/filesystem/path.php     |   341 +
 core/libraries/joomla/filesystem/stream.php   |  1422 ++
 .../joomla/filesystem/streams/string.php      |   292 +
 .../filesystem/support/stringcontroller.php   |    71 +
 .../joomla/filesystem/wrapper/file.php        |   201 +
 .../joomla/filesystem/wrapper/folder.php      |   184 +
 .../joomla/filesystem/wrapper/path.php        |   133 +
 .../joomla/form/fields/accesslevel.php        |    59 +
 .../libraries/joomla/form/fields/aliastag.php |    72 +
 .../joomla/form/fields/cachehandler.php       |    52 +
 .../libraries/joomla/form/fields/calendar.php |   316 +
 .../libraries/joomla/form/fields/checkbox.php |   152 +
 .../joomla/form/fields/checkboxes.php         |   168 +
 core/libraries/joomla/form/fields/color.php   |   304 +
 core/libraries/joomla/form/fields/combo.php   |    75 +
 .../joomla/form/fields/components.php         |    74 +
 .../joomla/form/fields/databaseconnection.php |    85 +
 core/libraries/joomla/form/fields/email.php   |    70 +
 core/libraries/joomla/form/fields/file.php    |   148 +
 .../libraries/joomla/form/fields/filelist.php |   243 +
 .../joomla/form/fields/folderlist.php         |   236 +
 .../joomla/form/fields/groupedlist.php        |   208 +
 core/libraries/joomla/form/fields/hidden.php  |    61 +
 .../joomla/form/fields/imagelist.php          |    45 +
 core/libraries/joomla/form/fields/integer.php |    84 +
 .../libraries/joomla/form/fields/language.php |    95 +
 core/libraries/joomla/form/fields/list.php    |   262 +
 core/libraries/joomla/form/fields/meter.php   |   198 +
 core/libraries/joomla/form/fields/note.php    |    74 +
 core/libraries/joomla/form/fields/number.php  |   206 +
 .../libraries/joomla/form/fields/password.php |   177 +
 core/libraries/joomla/form/fields/plugins.php |   183 +
 .../joomla/form/fields/predefinedlist.php     |    93 +
 core/libraries/joomla/form/fields/radio.php   |    74 +
 core/libraries/joomla/form/fields/range.php   |    71 +
 .../joomla/form/fields/repeatable.php         |   153 +
 core/libraries/joomla/form/fields/rules.php   |   458 +
 .../joomla/form/fields/sessionhandler.php     |    52 +
 core/libraries/joomla/form/fields/spacer.php  |   123 +
 core/libraries/joomla/form/fields/sql.php     |   320 +
 core/libraries/joomla/form/fields/subform.php |   359 +
 core/libraries/joomla/form/fields/tel.php     |    74 +
 core/libraries/joomla/form/fields/text.php    |   283 +
 .../libraries/joomla/form/fields/textarea.php |   174 +
 .../libraries/joomla/form/fields/timezone.php |   170 +
 core/libraries/joomla/form/fields/url.php     |    78 +
 .../joomla/form/fields/usergroup.php          |    86 +
 core/libraries/joomla/github/account.php      |   253 +
 core/libraries/joomla/github/commits.php      |   376 +
 core/libraries/joomla/github/forks.php        |    97 +
 core/libraries/joomla/github/github.php       |   167 +
 core/libraries/joomla/github/hooks.php        |   250 +
 core/libraries/joomla/github/http.php         |    59 +
 core/libraries/joomla/github/meta.php         |    58 +
 core/libraries/joomla/github/milestones.php   |   239 +
 core/libraries/joomla/github/object.php       |   130 +
 core/libraries/joomla/github/package.php      |    58 +
 .../joomla/github/package/activity.php        |    27 +
 .../joomla/github/package/activity/events.php |   214 +
 .../github/package/activity/notifications.php |   271 +
 .../github/package/activity/starring.php      |   146 +
 .../github/package/activity/watching.php      |   214 +
 .../joomla/github/package/authorization.php   |   334 +
 core/libraries/joomla/github/package/data.php |    55 +
 .../joomla/github/package/data/blobs.php      |    70 +
 .../joomla/github/package/data/commits.php    |    73 +
 .../joomla/github/package/data/refs.php       |   191 +
 .../joomla/github/package/data/tags.php       |    88 +
 .../joomla/github/package/data/trees.php      |   116 +
 .../libraries/joomla/github/package/gists.php |   548 +
 .../joomla/github/package/gists/comments.php  |   182 +
 .../joomla/github/package/gitignore.php       |    81 +
 .../joomla/github/package/issues.php          |   511 +
 .../github/package/issues/assignees.php       |    83 +
 .../joomla/github/package/issues/comments.php |   208 +
 .../joomla/github/package/issues/events.php   |    89 +
 .../joomla/github/package/issues/labels.php   |   301 +
 .../github/package/issues/milestones.php      |   236 +
 .../joomla/github/package/markdown.php        |    73 +
 core/libraries/joomla/github/package/orgs.php |   111 +
 .../joomla/github/package/orgs/members.php    |   235 +
 .../joomla/github/package/orgs/teams.php      |   392 +
 .../libraries/joomla/github/package/pulls.php |   512 +
 .../joomla/github/package/pulls/comments.php  |   196 +
 .../joomla/github/package/repositories.php    |   430 +
 .../package/repositories/collaborators.php    |   124 +
 .../github/package/repositories/comments.php  |   178 +
 .../github/package/repositories/commits.php   |   121 +
 .../github/package/repositories/contents.php  |   201 +
 .../github/package/repositories/downloads.php |   201 +
 .../github/package/repositories/forks.php     |    95 +
 .../github/package/repositories/hooks.php     |   238 +
 .../github/package/repositories/keys.php      |   142 +
 .../github/package/repositories/merging.php   |    90 +
 .../package/repositories/statistics.php       |   175 +
 .../github/package/repositories/statuses.php  |   107 +
 .../joomla/github/package/search.php          |   131 +
 .../libraries/joomla/github/package/users.php |   181 +
 .../joomla/github/package/users/emails.php    |    91 +
 .../joomla/github/package/users/followers.php |   144 +
 .../joomla/github/package/users/keys.php      |   154 +
 core/libraries/joomla/github/refs.php         |   174 +
 core/libraries/joomla/github/statuses.php     |   106 +
 core/libraries/joomla/google/auth.php         |    88 +
 core/libraries/joomla/google/auth/oauth2.php  |   132 +
 core/libraries/joomla/google/data.php         |   188 +
 core/libraries/joomla/google/data/adsense.php |   420 +
 .../libraries/joomla/google/data/calendar.php |   625 +
 core/libraries/joomla/google/data/picasa.php  |   151 +
 .../joomla/google/data/picasa/album.php       |   492 +
 .../joomla/google/data/picasa/photo.php       |   376 +
 core/libraries/joomla/google/data/plus.php    |    99 +
 .../joomla/google/data/plus/activities.php    |   198 +
 .../joomla/google/data/plus/comments.php      |   136 +
 .../joomla/google/data/plus/people.php        |   175 +
 core/libraries/joomla/google/embed.php        |   132 +
 .../joomla/google/embed/analytics.php         |   331 +
 core/libraries/joomla/google/embed/maps.php   |   821 +
 core/libraries/joomla/google/google.php       |   165 +
 core/libraries/joomla/grid/grid.php           |   480 +
 core/libraries/joomla/keychain/keychain.php   |   201 +
 .../joomla/linkedin/communications.php        |   222 +
 core/libraries/joomla/linkedin/companies.php  |   480 +
 core/libraries/joomla/linkedin/groups.php     |  1096 ++
 core/libraries/joomla/linkedin/jobs.php       |   376 +
 core/libraries/joomla/linkedin/linkedin.php   |   151 +
 core/libraries/joomla/linkedin/oauth.php      |   143 +
 core/libraries/joomla/linkedin/object.php     |   106 +
 core/libraries/joomla/linkedin/people.php     |   387 +
 core/libraries/joomla/linkedin/stream.php     |   625 +
 .../libraries/joomla/mediawiki/categories.php |   362 +
 core/libraries/joomla/mediawiki/http.php      |   108 +
 core/libraries/joomla/mediawiki/images.php    |   248 +
 core/libraries/joomla/mediawiki/links.php     |   327 +
 core/libraries/joomla/mediawiki/mediawiki.php |   164 +
 core/libraries/joomla/mediawiki/object.php    |   129 +
 core/libraries/joomla/mediawiki/pages.php     |   626 +
 core/libraries/joomla/mediawiki/search.php    |   135 +
 core/libraries/joomla/mediawiki/sites.php     |   313 +
 core/libraries/joomla/mediawiki/users.php     |   440 +
 core/libraries/joomla/model/base.php          |    79 +
 core/libraries/joomla/model/database.php      |    82 +
 core/libraries/joomla/model/model.php         |    40 +
 core/libraries/joomla/oauth1/client.php       |   607 +
 core/libraries/joomla/oauth2/client.php       |   388 +
 .../libraries/joomla/observable/interface.php |    50 +
 core/libraries/joomla/observer/interface.php  |    59 +
 core/libraries/joomla/observer/mapper.php     |    83 +
 core/libraries/joomla/observer/updater.php    |   167 +
 .../joomla/observer/updater/interface.php     |    62 +
 .../joomla/observer/wrapper/mapper.php        |    52 +
 .../joomla/openstreetmap/changesets.php       |   317 +
 .../joomla/openstreetmap/elements.php         |   550 +
 core/libraries/joomla/openstreetmap/gps.php   |   141 +
 core/libraries/joomla/openstreetmap/info.php  |    93 +
 core/libraries/joomla/openstreetmap/oauth.php |    89 +
 .../libraries/joomla/openstreetmap/object.php |   132 +
 .../joomla/openstreetmap/openstreetmap.php    |   164 +
 core/libraries/joomla/openstreetmap/user.php  |   156 +
 core/libraries/joomla/platform.php            |    94 +
 core/libraries/joomla/route/wrapper/route.php |    38 +
 .../joomla/session/handler/interface.php      |   116 +
 .../joomla/session/handler/joomla.php         |   172 +
 .../joomla/session/handler/native.php         |   268 +
 core/libraries/joomla/session/storage.php     |   223 +
 core/libraries/joomla/session/storage/apc.php |   100 +
 .../joomla/session/storage/database.php       |   163 +
 .../joomla/session/storage/memcache.php       |    86 +
 .../joomla/session/storage/memcached.php      |    86 +
 .../libraries/joomla/session/storage/none.php |    32 +
 .../joomla/session/storage/redis.php          |   105 +
 .../joomla/session/storage/wincache.php       |    64 +
 .../joomla/session/storage/xcache.php         |   109 +
 core/libraries/joomla/string/string.php       |    66 +
 .../joomla/string/wrapper/normalise.php       |   127 +
 .../joomla/string/wrapper/punycode.php        |   113 +
 core/libraries/joomla/twitter/block.php       |   161 +
 .../joomla/twitter/directmessages.php         |   219 +
 core/libraries/joomla/twitter/favorites.php   |   133 +
 core/libraries/joomla/twitter/friends.php     |   460 +
 core/libraries/joomla/twitter/help.php        |    58 +
 core/libraries/joomla/twitter/lists.php       |   982 ++
 core/libraries/joomla/twitter/oauth.php       |   133 +
 core/libraries/joomla/twitter/object.php      |   228 +
 core/libraries/joomla/twitter/places.php      |   290 +
 core/libraries/joomla/twitter/profile.php     |   347 +
 core/libraries/joomla/twitter/search.php      |   199 +
 core/libraries/joomla/twitter/statuses.php    |   657 +
 core/libraries/joomla/twitter/trends.php      |   105 +
 core/libraries/joomla/twitter/twitter.php     |   188 +
 core/libraries/joomla/twitter/users.php       |   376 +
 .../joomla/utilities/arrayhelper.php          |   435 +
 core/libraries/joomla/view/base.php           |    54 +
 core/libraries/joomla/view/html.php           |   199 +
 core/libraries/joomla/view/view.php           |    39 +
 .../legacy/application/application.php        |  1202 ++
 core/libraries/legacy/base/node.php           |   166 +
 core/libraries/legacy/base/observable.php     |   195 +
 core/libraries/legacy/base/observer.php       |    57 +
 core/libraries/legacy/base/tree.php           |   104 +
 core/libraries/legacy/database/exception.php  |    22 +
 core/libraries/legacy/database/mysql.php      |    23 +
 core/libraries/legacy/database/mysqli.php     |    23 +
 core/libraries/legacy/database/sqlazure.php   |    23 +
 core/libraries/legacy/database/sqlsrv.php     |    23 +
 .../legacy/dispatcher/dispatcher.php          |    30 +
 core/libraries/legacy/error/error.php         |   836 +
 core/libraries/legacy/exception/exception.php |   412 +
 core/libraries/legacy/form/field/category.php |   107 +
 .../legacy/form/field/componentlayout.php     |   247 +
 .../legacy/form/field/modulelayout.php        |   199 +
 core/libraries/legacy/log/logexception.php    |    22 +
 core/libraries/legacy/request/request.php     |   546 +
 core/libraries/legacy/response/response.php   |   297 +
 .../legacy/simplecrypt/simplecrypt.php        |    83 +
 core/libraries/legacy/simplepie/factory.php   |    63 +
 core/libraries/legacy/table/session.php       |   205 +
 .../libraries/legacy/utilities/xmlelement.php |   104 +
 core/libraries/loader.php                     |   846 +
 core/libraries/php-encryption/Crypto.php      |   676 +
 core/libraries/phpass/PasswordHash.php        |   227 +
 core/libraries/phputf8/LICENSE                |   504 +
 core/libraries/phputf8/README                 |    82 +
 core/libraries/phputf8/mbstring/core.php      |    15 +
 core/libraries/phputf8/native/core.php        |    15 +
 core/libraries/phputf8/ord.php                |    15 +
 core/libraries/phputf8/str_ireplace.php       |    15 +
 core/libraries/phputf8/str_pad.php            |    15 +
 core/libraries/phputf8/str_split.php          |    15 +
 core/libraries/phputf8/strcasecmp.php         |    15 +
 core/libraries/phputf8/strcspn.php            |    15 +
 core/libraries/phputf8/stristr.php            |    15 +
 core/libraries/phputf8/strrev.php             |    15 +
 core/libraries/phputf8/strspn.php             |    15 +
 core/libraries/phputf8/substr_replace.php     |    15 +
 core/libraries/phputf8/trim.php               |    15 +
 core/libraries/phputf8/ucfirst.php            |    15 +
 core/libraries/phputf8/ucwords.php            |    15 +
 core/libraries/phputf8/utf8.php               |    15 +
 core/libraries/phputf8/utils/ascii.php        |    15 +
 core/libraries/phputf8/utils/bad.php          |    15 +
 core/libraries/phputf8/utils/patterns.php     |    15 +
 core/libraries/phputf8/utils/position.php     |    15 +
 core/libraries/phputf8/utils/specials.php     |    15 +
 core/libraries/phputf8/utils/unicode.php      |    15 +
 core/libraries/phputf8/utils/validation.php   |    15 +
 core/libraries/src/Access/Access.php          |  1236 ++
 .../src/Access/Exception/NotAllowed.php       |    20 +
 core/libraries/src/Access/Rule.php            |   174 +
 core/libraries/src/Access/Rules.php           |   221 +
 core/libraries/src/Access/Wrapper/Access.php  |   191 +
 .../Application/AdministratorApplication.php  |   480 +
 .../src/Application/ApplicationHelper.php     |   286 +
 .../src/Application/BaseApplication.php       |   167 +
 .../src/Application/CMSApplication.php        |  1135 ++
 .../src/Application/CliApplication.php        |   286 +
 .../src/Application/DaemonApplication.php     |   906 ++
 .../src/Application/SiteApplication.php       |   869 +
 .../src/Application/WebApplication.php        |  1312 ++
 .../AssociationExtensionHelper.php            |   293 +
 .../AssociationExtensionInterface.php         |    28 +
 .../src/Authentication/Authentication.php     |   340 +
 .../Authentication/AuthenticationResponse.php |   129 +
 core/libraries/src/Cache/Cache.php            |   843 +
 core/libraries/src/Cache/CacheController.php  |   220 +
 core/libraries/src/Cache/CacheStorage.php     |   406 +
 .../Cache/Controller/CallbackController.php   |   229 +
 .../src/Cache/Controller/OutputController.php |   221 +
 .../src/Cache/Controller/PageController.php   |   228 +
 .../src/Cache/Controller/ViewController.php   |   141 +
 .../Exception/CacheConnectingException.php    |    20 +
 .../Exception/CacheExceptionInterface.php     |    20 +
 .../Exception/UnsupportedCacheException.php   |    20 +
 .../src/Cache/Storage/ApcStorage.php          |   307 +
 .../src/Cache/Storage/ApcuStorage.php         |   326 +
 .../src/Cache/Storage/CacheStorageHelper.php  |    70 +
 .../src/Cache/Storage/CacheliteStorage.php    |   351 +
 .../src/Cache/Storage/FileStorage.php         |   793 +
 .../src/Cache/Storage/MemcacheStorage.php     |   464 +
 .../src/Cache/Storage/MemcachedStorage.php    |   487 +
 .../src/Cache/Storage/RedisStorage.php        |   376 +
 .../src/Cache/Storage/WincacheStorage.php     |   199 +
 .../src/Cache/Storage/XcacheStorage.php       |   238 +
 core/libraries/src/Captcha/Captcha.php        |   363 +
 core/libraries/src/Categories/Categories.php  |   391 +
 .../libraries/src/Categories/CategoryNode.php |   643 +
 core/libraries/src/Client/ClientHelper.php    |   241 +
 core/libraries/src/Client/ClientWrapper.php   |    86 +
 core/libraries/src/Client/FtpClient.php       |  1943 +++
 .../src/Component/ComponentHelper.php         |   502 +
 .../src/Component/ComponentRecord.php         |   144 +
 .../Exception/MissingComponentException.php   |    35 +
 .../src/Component/Router/RouterBase.php       |    78 +
 .../src/Component/Router/RouterInterface.php  |    60 +
 .../src/Component/Router/RouterLegacy.php     |   110 +
 .../src/Component/Router/RouterView.php       |   295 +
 .../Router/RouterViewConfiguration.php        |   237 +
 .../src/Component/Router/Rules/MenuRules.php  |   296 +
 .../Component/Router/Rules/NomenuRules.php    |   138 +
 .../Component/Router/Rules/RulesInterface.php |    61 +
 .../Component/Router/Rules/StandardRules.php  |   318 +
 .../src/Crypt/Cipher/BlowfishCipher.php       |    40 +
 .../src/Crypt/Cipher/CryptoCipher.php         |   129 +
 .../src/Crypt/Cipher/McryptCipher.php         |   186 +
 .../src/Crypt/Cipher/Rijndael256Cipher.php    |    40 +
 .../src/Crypt/Cipher/SimpleCipher.php         |   264 +
 .../src/Crypt/Cipher/SodiumCipher.php         |   138 +
 .../src/Crypt/Cipher/TripleDesCipher.php      |    40 +
 core/libraries/src/Crypt/CipherInterface.php  |    54 +
 core/libraries/src/Crypt/Crypt.php            |   264 +
 core/libraries/src/Crypt/CryptPassword.php    |    76 +
 core/libraries/src/Crypt/Key.php              |    77 +
 .../Crypt/Password/SimpleCryptPassword.php    |   204 +
 core/libraries/src/Crypt/README.md            |    70 +
 core/libraries/src/Date/Date.php              |   469 +
 core/libraries/src/Document/Document.php      |  1282 ++
 .../src/Document/DocumentRenderer.php         |    93 +
 core/libraries/src/Document/ErrorDocument.php |   235 +
 .../src/Document/Feed/FeedEnclosure.php       |    49 +
 .../libraries/src/Document/Feed/FeedImage.php |    79 +
 core/libraries/src/Document/Feed/FeedItem.php |   155 +
 core/libraries/src/Document/FeedDocument.php  |   246 +
 core/libraries/src/Document/HtmlDocument.php  |   788 +
 core/libraries/src/Document/ImageDocument.php |    74 +
 core/libraries/src/Document/JsonDocument.php  |   111 +
 .../Document/Opensearch/OpensearchImage.php   |    59 +
 .../src/Document/Opensearch/OpensearchUrl.php |    49 +
 .../src/Document/OpensearchDocument.php       |   231 +
 core/libraries/src/Document/RawDocument.php   |    54 +
 .../Document/Renderer/Feed/AtomRenderer.php   |   212 +
 .../Document/Renderer/Feed/RssRenderer.php    |   271 +
 .../Renderer/Html/ComponentRenderer.php       |    37 +
 .../Document/Renderer/Html/HeadRenderer.php   |   378 +
 .../Renderer/Html/MessageRenderer.php         |    92 +
 .../Document/Renderer/Html/ModuleRenderer.php |   100 +
 .../Renderer/Html/ModulesRenderer.php         |    62 +
 core/libraries/src/Document/XmlDocument.php   |    92 +
 core/libraries/src/Editor/Editor.php          |   563 +
 core/libraries/src/Environment/Browser.php    |   702 +
 .../src/Exception/ExceptionHandler.php        |   171 +
 .../src/Extension/ExtensionHelper.php         |   278 +
 core/libraries/src/Factory.php                |   840 +
 core/libraries/src/Feed/Feed.php              |   380 +
 core/libraries/src/Feed/FeedEntry.php         |   281 +
 core/libraries/src/Feed/FeedFactory.php       |   153 +
 core/libraries/src/Feed/FeedLink.php          |    97 +
 core/libraries/src/Feed/FeedParser.php        |   286 +
 core/libraries/src/Feed/FeedPerson.php        |    69 +
 core/libraries/src/Feed/Parser/AtomParser.php |   259 +
 .../Feed/Parser/NamespaceParserInterface.php  |    46 +
 .../src/Feed/Parser/Rss/ItunesRssParser.php   |    54 +
 .../src/Feed/Parser/Rss/MediaRssParser.php    |    54 +
 core/libraries/src/Feed/Parser/RssParser.php  |   435 +
 core/libraries/src/Filter/InputFilter.php     |  1271 ++
 core/libraries/src/Filter/OutputFilter.php    |   119 +
 .../Filter/Wrapper/OutputFilterWrapper.php    |   168 +
 core/libraries/src/Form/Field/AuthorField.php |    79 +
 .../libraries/src/Form/Field/CaptchaField.php |   153 +
 .../src/Form/Field/ChromestyleField.php       |   251 +
 .../src/Form/Field/ContenthistoryField.php    |    83 +
 .../src/Form/Field/ContentlanguageField.php   |    44 +
 .../src/Form/Field/ContenttypeField.php       |   111 +
 core/libraries/src/Form/Field/EditorField.php |   338 +
 .../src/Form/Field/FrontendlanguageField.php  |    79 +
 .../src/Form/Field/HeadertagField.php         |    55 +
 .../src/Form/Field/HelpsiteField.php          |    75 +
 .../Form/Field/LastvisitdaterangeField.php    |    56 +
 .../src/Form/Field/LimitboxField.php          |   111 +
 core/libraries/src/Form/Field/MediaField.php  |   273 +
 core/libraries/src/Form/Field/MenuField.php   |   125 +
 .../src/Form/Field/MenuitemField.php          |   265 +
 .../src/Form/Field/ModuleorderField.php       |   141 +
 .../src/Form/Field/ModulepositionField.php    |   168 +
 .../src/Form/Field/ModuletagField.php         |    55 +
 .../src/Form/Field/OrderingField.php          |   194 +
 .../src/Form/Field/PluginstatusField.php      |    42 +
 .../src/Form/Field/RedirectStatusField.php    |    44 +
 .../Form/Field/RegistrationdaterangeField.php |    65 +
 core/libraries/src/Form/Field/StatusField.php |    45 +
 core/libraries/src/Form/Field/TagField.php    |   270 +
 .../src/Form/Field/TemplatestyleField.php     |   192 +
 core/libraries/src/Form/Field/UserField.php   |   182 +
 .../src/Form/Field/UseractiveField.php        |    60 +
 .../src/Form/Field/UsergrouplistField.php     |   107 +
 .../src/Form/Field/UserstateField.php         |    42 +
 core/libraries/src/Form/Form.php              |  2415 +++
 core/libraries/src/Form/FormField.php         |  1079 ++
 core/libraries/src/Form/FormHelper.php        |   500 +
 core/libraries/src/Form/FormRule.php          |    82 +
 core/libraries/src/Form/FormWrapper.php       |   134 +
 core/libraries/src/Form/Rule/BooleanRule.php  |    37 +
 core/libraries/src/Form/Rule/CalendarRule.php |    64 +
 core/libraries/src/Form/Rule/CaptchaRule.php  |    79 +
 core/libraries/src/Form/Rule/ColorRule.php    |    67 +
 core/libraries/src/Form/Rule/EmailRule.php    |   128 +
 core/libraries/src/Form/Rule/EqualsRule.php   |    73 +
 .../libraries/src/Form/Rule/NotequalsRule.php |    66 +
 core/libraries/src/Form/Rule/NumberRule.php   |    74 +
 core/libraries/src/Form/Rule/OptionsRule.php  |    92 +
 core/libraries/src/Form/Rule/PasswordRule.php |   179 +
 core/libraries/src/Form/Rule/RulesRule.php    |   117 +
 core/libraries/src/Form/Rule/TelRule.php      |   111 +
 core/libraries/src/Form/Rule/UrlRule.php      |   132 +
 core/libraries/src/Form/Rule/UsernameRule.php |    65 +
 core/libraries/src/HTML/HTMLHelper.php        |  1177 ++
 core/libraries/src/Help/Help.php              |   207 +
 .../src/Helper/AuthenticationHelper.php       |    55 +
 core/libraries/src/Helper/CMSHelper.php       |   142 +
 core/libraries/src/Helper/ContentHelper.php   |   231 +
 .../src/Helper/ContentHistoryHelper.php       |   167 +
 core/libraries/src/Helper/LibraryHelper.php   |   193 +
 core/libraries/src/Helper/MediaHelper.php     |   412 +
 core/libraries/src/Helper/ModuleHelper.php    |   647 +
 core/libraries/src/Helper/RouteHelper.php     |   309 +
 core/libraries/src/Helper/SearchHelper.php    |    73 +
 core/libraries/src/Helper/TagsHelper.php      |  1093 ++
 .../libraries/src/Helper/UserGroupsHelper.php |   340 +
 core/libraries/src/Http/Http.php              |   349 +
 core/libraries/src/Http/HttpFactory.php       |   134 +
 core/libraries/src/Http/Response.php          |    37 +
 .../src/Http/Transport/CurlTransport.php      |   372 +
 .../src/Http/Transport/SocketTransport.php    |   335 +
 .../src/Http/Transport/StreamTransport.php    |   285 +
 core/libraries/src/Http/Transport/cacert.pem  |  4312 +++++
 .../libraries/src/Http/TransportInterface.php |    56 +
 .../src/Http/Wrapper/FactoryWrapper.php       |    72 +
 core/libraries/src/Image/Image.php            |    89 +
 core/libraries/src/Image/ImageFilter.php      |    40 +
 core/libraries/src/Input/Cli.php              |   210 +
 core/libraries/src/Input/Cookie.php           |   105 +
 core/libraries/src/Input/Files.php            |   145 +
 core/libraries/src/Input/Input.php            |   225 +
 core/libraries/src/Input/Json.php             |    79 +
 .../Installer/Adapter/ComponentAdapter.php    |  1380 ++
 .../src/Installer/Adapter/FileAdapter.php     |   652 +
 .../src/Installer/Adapter/LanguageAdapter.php |   851 +
 .../src/Installer/Adapter/LibraryAdapter.php  |   526 +
 .../src/Installer/Adapter/ModuleAdapter.php   |   789 +
 .../src/Installer/Adapter/PackageAdapter.php  |   769 +
 .../src/Installer/Adapter/PluginAdapter.php   |   740 +
 .../src/Installer/Adapter/TemplateAdapter.php |   639 +
 core/libraries/src/Installer/Installer.php    |  2441 +++
 .../src/Installer/InstallerAdapter.php        |  1099 ++
 .../src/Installer/InstallerExtension.php      |   146 +
 .../src/Installer/InstallerHelper.php         |   336 +
 .../src/Installer/InstallerScript.php         |   358 +
 core/libraries/src/Installer/Manifest.php     |   140 +
 .../Installer/Manifest/LibraryManifest.php    |   109 +
 .../Installer/Manifest/PackageManifest.php    |   109 +
 core/libraries/src/Language/Associations.php  |   173 +
 core/libraries/src/Language/Language.php      |  1382 ++
 .../libraries/src/Language/LanguageHelper.php |   612 +
 .../src/Language/LanguageStemmer.php          |    78 +
 core/libraries/src/Language/Multilanguage.php |   112 +
 .../src/Language/Stemmer/Porteren.php         |   452 +
 core/libraries/src/Language/Text.php          |   426 +
 core/libraries/src/Language/Transliterate.php |   268 +
 .../src/Language/Wrapper/JTextWrapper.php     |   126 +
 .../Wrapper/LanguageHelperWrapper.php         |    71 +
 .../Language/Wrapper/TransliterateWrapper.php |    39 +
 core/libraries/src/Layout/BaseLayout.php      |   301 +
 core/libraries/src/Layout/FileLayout.php      |   667 +
 core/libraries/src/Layout/LayoutHelper.php    |    75 +
 core/libraries/src/Layout/LayoutInterface.php |    42 +
 .../libraries/src/Log/DelegatingPsrLogger.php |   112 +
 core/libraries/src/Log/Log.php                |   369 +
 core/libraries/src/Log/LogEntry.php           |   121 +
 core/libraries/src/Log/Logger.php             |    72 +
 .../src/Log/Logger/CallbackLogger.php         |    71 +
 .../src/Log/Logger/DatabaseLogger.php         |   167 +
 core/libraries/src/Log/Logger/EchoLogger.php  |    63 +
 .../src/Log/Logger/FormattedtextLogger.php    |   246 +
 .../src/Log/Logger/MessagequeueLogger.php     |    61 +
 .../libraries/src/Log/Logger/SyslogLogger.php |   137 +
 core/libraries/src/Log/Logger/W3cLogger.php   |    51 +
 .../src/MVC/Controller/AdminController.php    |   401 +
 .../src/MVC/Controller/BaseController.php     |  1115 ++
 .../src/MVC/Controller/FormController.php     |   924 ++
 core/libraries/src/MVC/Model/AdminModel.php   |  1534 ++
 .../src/MVC/Model/BaseDatabaseModel.php       |   601 +
 core/libraries/src/MVC/Model/FormModel.php    |   389 +
 core/libraries/src/MVC/Model/ItemModel.php    |    54 +
 core/libraries/src/MVC/Model/ListModel.php    |   762 +
 .../libraries/src/MVC/View/CategoriesView.php |   156 +
 .../src/MVC/View/CategoryFeedView.php         |   150 +
 core/libraries/src/MVC/View/CategoryView.php  |   325 +
 core/libraries/src/MVC/View/HtmlView.php      |   875 +
 core/libraries/src/Mail/Mail.php              |   786 +
 core/libraries/src/Mail/MailHelper.php        |   193 +
 core/libraries/src/Mail/MailWrapper.php       |   112 +
 .../Mail/language/phpmailer.lang-en_gb.php    |    30 +
 core/libraries/src/Menu/AbstractMenu.php      |   367 +
 core/libraries/src/Menu/AdministratorMenu.php |    20 +
 core/libraries/src/Menu/MenuHelper.php        |   388 +
 core/libraries/src/Menu/MenuItem.php          |   352 +
 core/libraries/src/Menu/Node.php              |   272 +
 core/libraries/src/Menu/Node/Component.php    |   117 +
 core/libraries/src/Menu/Node/Container.php    |    21 +
 core/libraries/src/Menu/Node/Heading.php      |    91 +
 core/libraries/src/Menu/Node/Separator.php    |    65 +
 core/libraries/src/Menu/Node/Url.php          |   105 +
 core/libraries/src/Menu/SiteMenu.php          |   221 +
 core/libraries/src/Menu/Tree.php              |   219 +
 core/libraries/src/Microdata/Microdata.php    |   899 ++
 core/libraries/src/Microdata/types.json       |     1 +
 core/libraries/src/Object/CMSObject.php       |   244 +
 core/libraries/src/Pagination/Pagination.php  |   893 ++
 .../src/Pagination/PaginationObject.php       |    69 +
 core/libraries/src/Pathway/Pathway.php        |   243 +
 core/libraries/src/Pathway/SitePathway.php    |    92 +
 core/libraries/src/Plugin/CMSPlugin.php       |   149 +
 core/libraries/src/Plugin/PluginHelper.php    |   368 +
 core/libraries/src/Profiler/Profiler.php      |   215 +
 core/libraries/src/Response/JsonResponse.php  |   121 +
 .../src/Router/AdministratorRouter.php        |    56 +
 .../Exception/RouteNotFoundException.php      |    38 +
 core/libraries/src/Router/Route.php           |   106 +
 core/libraries/src/Router/Router.php          |   782 +
 core/libraries/src/Router/SiteRouter.php      |   823 +
 core/libraries/src/Schema/ChangeItem.php      |   256 +
 .../src/Schema/ChangeItem/MysqlChangeItem.php |   392 +
 .../ChangeItem/PostgresqlChangeItem.php       |   265 +
 .../Schema/ChangeItem/SqlsrvChangeItem.php    |   156 +
 core/libraries/src/Schema/ChangeSet.php       |   311 +
 .../Exception/UnsupportedStorageException.php |    20 +
 .../libraries/src/Session/MetadataManager.php |   160 +
 core/libraries/src/Session/Session.php        |  1020 ++
 core/libraries/src/String/PunycodeHelper.php  |   266 +
 core/libraries/src/Table/Asset.php            |   206 +
 core/libraries/src/Table/Category.php         |   251 +
 core/libraries/src/Table/Content.php          |   357 +
 core/libraries/src/Table/ContentHistory.php   |   220 +
 core/libraries/src/Table/ContentType.php      |   149 +
 core/libraries/src/Table/CoreContent.php      |   415 +
 core/libraries/src/Table/Extension.php        |   204 +
 core/libraries/src/Table/Language.php         |   143 +
 core/libraries/src/Table/Menu.php             |   296 +
 core/libraries/src/Table/MenuType.php         |   288 +
 core/libraries/src/Table/Module.php           |   191 +
 core/libraries/src/Table/Nested.php           |  1794 +++
 .../src/Table/Observer/AbstractObserver.php   |   126 +
 .../src/Table/Observer/ContentHistory.php     |   138 +
 core/libraries/src/Table/Observer/Tags.php    |   199 +
 core/libraries/src/Table/Table.php            |  1722 ++
 core/libraries/src/Table/TableInterface.php   |   116 +
 core/libraries/src/Table/Ucm.php              |    31 +
 core/libraries/src/Table/Update.php           |   116 +
 core/libraries/src/Table/UpdateSite.php       |    55 +
 core/libraries/src/Table/User.php             |   492 +
 core/libraries/src/Table/Usergroup.php        |   248 +
 core/libraries/src/Table/ViewLevel.php        |    91 +
 .../src/Toolbar/Button/ConfirmButton.php      |   106 +
 .../src/Toolbar/Button/CustomButton.php       |    60 +
 .../src/Toolbar/Button/HelpButton.php         |    90 +
 .../src/Toolbar/Button/LinkButton.php         |    83 +
 .../src/Toolbar/Button/PopupButton.php        |   135 +
 .../src/Toolbar/Button/SeparatorButton.php    |    67 +
 .../src/Toolbar/Button/SliderButton.php       |   103 +
 .../src/Toolbar/Button/StandardButton.php     |   108 +
 core/libraries/src/Toolbar/Toolbar.php        |   337 +
 core/libraries/src/Toolbar/ToolbarButton.php  |   124 +
 core/libraries/src/UCM/UCM.php                |    20 +
 core/libraries/src/UCM/UCMBase.php            |   144 +
 core/libraries/src/UCM/UCMContent.php         |   238 +
 core/libraries/src/UCM/UCMType.php            |   252 +
 .../src/Updater/Adapter/CollectionAdapter.php |   264 +
 .../src/Updater/Adapter/ExtensionAdapter.php  |   394 +
 core/libraries/src/Updater/DownloadSource.php |    91 +
 core/libraries/src/Updater/Update.php         |   557 +
 core/libraries/src/Updater/UpdateAdapter.php  |   295 +
 core/libraries/src/Updater/Updater.php        |   440 +
 core/libraries/src/Uri/Uri.php                |   341 +
 core/libraries/src/User/User.php              |   960 ++
 core/libraries/src/User/UserHelper.php        |   844 +
 core/libraries/src/User/UserWrapper.php       |   291 +
 .../src/Utility/BufferStreamHandler.php       |   256 +
 core/libraries/src/Utility/Utility.php        |    81 +
 core/libraries/src/Version.php                |   377 +
 core/libraries/vendor/.htaccess               |     9 +
 core/libraries/vendor/autoload.php            |     7 +
 .../libraries/vendor/composer/ClassLoader.php |   445 +
 core/libraries/vendor/composer/LICENSE        |    21 +
 .../vendor/composer/autoload_classmap.php     |   184 +
 .../vendor/composer/autoload_files.php        |    31 +
 .../vendor/composer/autoload_namespaces.php   |    11 +
 .../vendor/composer/autoload_psr4.php         |    34 +
 .../vendor/composer/autoload_real.php         |    70 +
 .../vendor/composer/autoload_static.php       |   379 +
 core/libraries/vendor/composer/installed.json |  1615 ++
 .../ircmaxell/password-compat/LICENSE.md      |     7 +
 .../password-compat/lib/password.php          |   314 +
 .../vendor/joomla/application/LICENSE         |   340 +
 .../application/src/AbstractApplication.php   |   211 +
 .../src/AbstractCliApplication.php            |   132 +
 .../src/AbstractDaemonApplication.php         |   926 ++
 .../src/AbstractWebApplication.php            |   991 ++
 .../joomla/application/src/Cli/CliInput.php   |    31 +
 .../joomla/application/src/Cli/CliOutput.php  |    87 +
 .../application/src/Cli/ColorProcessor.php    |    21 +
 .../joomla/application/src/Cli/ColorStyle.php |   263 +
 .../Cli/Output/Processor/ColorProcessor.php   |   194 +
 .../Output/Processor/ProcessorInterface.php   |    29 +
 .../application/src/Cli/Output/Stdout.php     |    38 +
 .../joomla/application/src/Cli/Output/Xml.php |    37 +
 .../joomla/application/src/Web/WebClient.php  |   627 +
 core/libraries/vendor/joomla/archive/LICENSE  |   340 +
 .../vendor/joomla/archive/src/Archive.php     |   233 +
 .../vendor/joomla/archive/src/Bzip2.php       |   152 +
 .../archive/src/ExtractableInterface.php      |    39 +
 .../vendor/joomla/archive/src/Gzip.php        |   215 +
 .../vendor/joomla/archive/src/Tar.php         |   253 +
 .../vendor/joomla/archive/src/Zip.php         |   634 +
 core/libraries/vendor/joomla/compat/LICENSE   |   340 +
 .../compat/src/CallbackFilterIterator.php     |    78 +
 .../joomla/compat/src/JsonSerializable.php    |    26 +
 core/libraries/vendor/joomla/data/LICENSE     |   340 +
 .../vendor/joomla/data/src/DataObject.php     |   331 +
 .../vendor/joomla/data/src/DataSet.php        |   634 +
 .../joomla/data/src/DumpableInterface.php     |    31 +
 core/libraries/vendor/joomla/di/LICENSE       |   340 +
 .../vendor/joomla/di/src/Container.php        |   595 +
 .../joomla/di/src/ContainerAwareInterface.php |    39 +
 .../joomla/di/src/ContainerAwareTrait.php     |    61 +
 .../DependencyResolutionException.php         |    20 +
 .../di/src/Exception/KeyNotFoundException.php |    20 +
 .../src/Exception/ProtectedKeyException.php   |    20 +
 .../di/src/ServiceProviderInterface.php       |    28 +
 core/libraries/vendor/joomla/event/LICENSE    |   340 +
 .../vendor/joomla/event/src/AbstractEvent.php |   199 +
 .../joomla/event/src/DelegatingDispatcher.php |    52 +
 .../vendor/joomla/event/src/Dispatcher.php    |   506 +
 .../event/src/DispatcherAwareInterface.php    |    28 +
 .../joomla/event/src/DispatcherAwareTrait.php |    59 +
 .../joomla/event/src/DispatcherInterface.php  |    28 +
 .../vendor/joomla/event/src/Event.php         |   142 +
 .../joomla/event/src/EventImmutable.php       |   103 +
 .../joomla/event/src/EventInterface.php       |    36 +
 .../event/src/ListenersPriorityQueue.php      |   206 +
 .../vendor/joomla/event/src/Priority.php      |    26 +
 .../vendor/joomla/filesystem/LICENSE          |   340 +
 .../en-GB.lib_joomla_filesystem_patcher.ini   |    13 +
 .../vendor/joomla/filesystem/src/Buffer.php   |   196 +
 .../filesystem/src/Clients/FtpClient.php      |  1796 +++
 .../src/Exception/FilesystemException.php     |    18 +
 .../vendor/joomla/filesystem/src/File.php     |   260 +
 .../vendor/joomla/filesystem/src/Folder.php   |   563 +
 .../vendor/joomla/filesystem/src/Helper.php   |   299 +
 .../vendor/joomla/filesystem/src/Patcher.php  |   544 +
 .../vendor/joomla/filesystem/src/Path.php     |   307 +
 .../vendor/joomla/filesystem/src/Stream.php   |  1441 ++
 .../joomla/filesystem/src/Stream/String.php   |    22 +
 .../filesystem/src/Stream/StringWrapper.php   |   287 +
 .../src/Support/StringController.php          |    70 +
 core/libraries/vendor/joomla/filter/LICENSE   |   340 +
 .../vendor/joomla/filter/src/InputFilter.php  |  1053 ++
 .../vendor/joomla/filter/src/OutputFilter.php |   214 +
 core/libraries/vendor/joomla/image/LICENSE    |   340 +
 .../image/src/Filter/Backgroundfill.php       |   140 +
 .../joomla/image/src/Filter/Brightness.php    |    43 +
 .../joomla/image/src/Filter/Contrast.php      |    43 +
 .../joomla/image/src/Filter/Edgedetect.php    |    35 +
 .../vendor/joomla/image/src/Filter/Emboss.php |    35 +
 .../joomla/image/src/Filter/Grayscale.php     |    35 +
 .../vendor/joomla/image/src/Filter/Negate.php |    35 +
 .../joomla/image/src/Filter/Sketchy.php       |    35 +
 .../vendor/joomla/image/src/Filter/Smooth.php |    43 +
 .../vendor/joomla/image/src/Image.php         |  1243 ++
 .../vendor/joomla/image/src/ImageFilter.php   |   112 +
 core/libraries/vendor/joomla/input/LICENSE    |   340 +
 .../libraries/vendor/joomla/input/src/Cli.php |   217 +
 .../vendor/joomla/input/src/Cookie.php        |    90 +
 .../vendor/joomla/input/src/Files.php         |   127 +
 .../vendor/joomla/input/src/Input.php         |   439 +
 .../vendor/joomla/input/src/Json.php          |    86 +
 core/libraries/vendor/joomla/ldap/LICENSE     |   340 +
 .../vendor/joomla/ldap/src/LdapClient.php     |   807 +
 core/libraries/vendor/joomla/registry/LICENSE |   340 +
 .../registry/src/AbstractRegistryFormat.php   |    43 +
 .../vendor/joomla/registry/src/Factory.php    |    74 +
 .../vendor/joomla/registry/src/Format/Ini.php |   365 +
 .../joomla/registry/src/Format/Json.php       |    83 +
 .../vendor/joomla/registry/src/Format/Php.php |   122 +
 .../vendor/joomla/registry/src/Format/Xml.php |   164 +
 .../joomla/registry/src/Format/Yaml.php       |    84 +
 .../joomla/registry/src/FormatInterface.php   |    41 +
 .../vendor/joomla/registry/src/Registry.php   |   895 ++
 .../joomla/session/Joomla/Session/LICENSE     |   340 +
 .../joomla/session/Joomla/Session/Session.php |  1075 ++
 .../joomla/session/Joomla/Session/Storage.php |   204 +
 .../session/Joomla/Session/Storage/Apc.php    |   106 +
 .../Joomla/Session/Storage/Database.php       |   186 +
 .../Joomla/Session/Storage/Memcache.php       |    84 +
 .../Joomla/Session/Storage/Memcached.php      |    89 +
 .../session/Joomla/Session/Storage/None.php   |    33 +
 .../Joomla/Session/Storage/Wincache.php       |    65 +
 .../session/Joomla/Session/Storage/Xcache.php |   115 +
 core/libraries/vendor/joomla/string/LICENSE   |   340 +
 .../vendor/joomla/string/src/Inflector.php    |   482 +
 .../vendor/joomla/string/src/Normalise.php    |   162 +
 .../vendor/joomla/string/src/String.php       |    21 +
 .../vendor/joomla/string/src/StringHelper.php |   840 +
 .../vendor/joomla/string/src/phputf8/LICENSE  |   504 +
 .../vendor/joomla/string/src/phputf8/README   |    82 +
 .../string/src/phputf8/mbstring/core.php      |   132 +
 .../joomla/string/src/phputf8/native/core.php |   430 +
 .../vendor/joomla/string/src/phputf8/ord.php  |    90 +
 .../string/src/phputf8/str_ireplace.php       |    77 +
 .../joomla/string/src/phputf8/str_pad.php     |    54 +
 .../joomla/string/src/phputf8/str_split.php   |    32 +
 .../joomla/string/src/phputf8/strcasecmp.php  |    23 +
 .../joomla/string/src/phputf8/strcspn.php     |    38 +
 .../joomla/string/src/phputf8/stristr.php     |    35 +
 .../joomla/string/src/phputf8/strrev.php      |    19 +
 .../joomla/string/src/phputf8/strspn.php      |    38 +
 .../string/src/phputf8/substr_replace.php     |    22 +
 .../vendor/joomla/string/src/phputf8/trim.php |    63 +
 .../joomla/string/src/phputf8/ucfirst.php     |    31 +
 .../joomla/string/src/phputf8/ucwords.php     |    40 +
 .../vendor/joomla/string/src/phputf8/utf8.php |    74 +
 .../joomla/string/src/phputf8/utils/ascii.php |   214 +
 .../joomla/string/src/phputf8/utils/bad.php   |   406 +
 .../string/src/phputf8/utils/patterns.php     |    64 +
 .../string/src/phputf8/utils/position.php     |   168 +
 .../string/src/phputf8/utils/specials.php     |   126 +
 .../string/src/phputf8/utils/unicode.php      |   265 +
 .../string/src/phputf8/utils/validation.php   |   181 +
 core/libraries/vendor/joomla/uri/LICENSE      |   340 +
 .../vendor/joomla/uri/src/AbstractUri.php     |   402 +
 core/libraries/vendor/joomla/uri/src/Uri.php  |   193 +
 .../vendor/joomla/uri/src/UriHelper.php       |    56 +
 .../vendor/joomla/uri/src/UriImmutable.php    |    61 +
 .../vendor/joomla/uri/src/UriInterface.php    |   151 +
 .../libraries/vendor/joomla/utilities/LICENSE |   340 +
 .../joomla/utilities/src/ArrayHelper.php      |   747 +
 core/libraries/vendor/leafo/lessphp/LICENSE   |   660 +
 .../vendor/leafo/lessphp/lessc.inc.php        |  3768 +++++
 core/libraries/vendor/leafo/lessphp/lessify   |    23 +
 .../vendor/leafo/lessphp/lessify.inc.php      |   447 +
 core/libraries/vendor/leafo/lessphp/plessc    |   250 +
 .../vendor/paragonie/random_compat/LICENSE    |    22 +
 .../random_compat/lib/byte_safe_strings.php   |   181 +
 .../random_compat/lib/cast_to_int.php         |    74 +
 .../random_compat/lib/error_polyfill.php      |    49 +
 .../paragonie/random_compat/lib/random.php    |   247 +
 .../lib/random_bytes_com_dotnet.php           |    88 +
 .../lib/random_bytes_dev_urandom.php          |   150 +
 .../lib/random_bytes_libsodium.php            |    88 +
 .../lib/random_bytes_libsodium_legacy.php     |    92 +
 .../random_compat/lib/random_bytes_mcrypt.php |    77 +
 .../lib/random_bytes_openssl.php              |    86 +
 .../random_compat/lib/random_int.php          |   190 +
 .../vendor/paragonie/sodium_compat/LICENSE    |    21 +
 .../paragonie/sodium_compat/autoload-fast.php |     4 +
 .../sodium_compat/autoload-pedantic.php       |     6 +
 .../paragonie/sodium_compat/autoload.php      |    49 +
 .../paragonie/sodium_compat/lib/constants.php |    50 +
 .../sodium_compat/lib/namespaced.php          |    46 +
 .../sodium_compat/lib/php72compat.php         |  1052 ++
 .../sodium_compat/lib/sodium_compat.php       |   835 +
 .../sodium_compat/namespaced/Compat.php       |     7 +
 .../sodium_compat/namespaced/Core/BLAKE2b.php |     7 +
 .../namespaced/Core/ChaCha20.php              |     7 +
 .../namespaced/Core/ChaCha20/Ctx.php          |     7 +
 .../namespaced/Core/ChaCha20/IetfCtx.php      |     7 +
 .../namespaced/Core/Curve25519.php            |     7 +
 .../namespaced/Core/Curve25519/Fe.php         |     7 +
 .../namespaced/Core/Curve25519/Ge/Cached.php  |     7 +
 .../namespaced/Core/Curve25519/Ge/P1p1.php    |     7 +
 .../namespaced/Core/Curve25519/Ge/P2.php      |     7 +
 .../namespaced/Core/Curve25519/Ge/P3.php      |     7 +
 .../namespaced/Core/Curve25519/Ge/Precomp.php |     7 +
 .../namespaced/Core/Curve25519/H.php          |     7 +
 .../sodium_compat/namespaced/Core/Ed25519.php |     7 +
 .../namespaced/Core/HChaCha20.php             |     7 +
 .../namespaced/Core/HSalsa20.php              |     7 +
 .../namespaced/Core/Poly1305.php              |     7 +
 .../namespaced/Core/Poly1305/State.php        |     7 +
 .../sodium_compat/namespaced/Core/Salsa20.php |     7 +
 .../sodium_compat/namespaced/Core/SipHash.php |     7 +
 .../sodium_compat/namespaced/Core/Util.php    |     7 +
 .../sodium_compat/namespaced/Core/X25519.php  |     7 +
 .../namespaced/Core/XChaCha20.php             |     7 +
 .../namespaced/Core/Xsalsa20.php              |     7 +
 .../sodium_compat/namespaced/Crypto.php       |     7 +
 .../sodium_compat/namespaced/File.php         |     7 +
 .../paragonie/sodium_compat/src/Compat.php    |  2706 ++++
 .../sodium_compat/src/Core/BLAKE2b.php        |   746 +
 .../sodium_compat/src/Core/ChaCha20.php       |   395 +
 .../sodium_compat/src/Core/ChaCha20/Ctx.php   |   120 +
 .../src/Core/ChaCha20/IetfCtx.php             |    38 +
 .../sodium_compat/src/Core/Curve25519.php     |  2978 ++++
 .../sodium_compat/src/Core/Curve25519/Fe.php  |   130 +
 .../src/Core/Curve25519/Ge/Cached.php         |    65 +
 .../src/Core/Curve25519/Ge/P1p1.php           |    64 +
 .../src/Core/Curve25519/Ge/P2.php             |    54 +
 .../src/Core/Curve25519/Ge/P3.php             |    65 +
 .../src/Core/Curve25519/Ge/Precomp.php        |    54 +
 .../sodium_compat/src/Core/Curve25519/H.php   |  1467 ++
 .../sodium_compat/src/Core/Ed25519.php        |   479 +
 .../sodium_compat/src/Core/HChaCha20.php      |   108 +
 .../sodium_compat/src/Core/HSalsa20.php       |    96 +
 .../sodium_compat/src/Core/Poly1305.php       |    63 +
 .../sodium_compat/src/Core/Poly1305/State.php |   419 +
 .../sodium_compat/src/Core/Salsa20.php        |   273 +
 .../sodium_compat/src/Core/SipHash.php        |   305 +
 .../paragonie/sodium_compat/src/Core/Util.php |   921 ++
 .../sodium_compat/src/Core/X25519.php         |   327 +
 .../sodium_compat/src/Core/XChaCha20.php      |    64 +
 .../sodium_compat/src/Core/Xsalsa20.php       |    57 +
 .../sodium_compat/src/Core32/BLAKE2b.php      |   675 +
 .../sodium_compat/src/Core32/ChaCha20.php     |   400 +
 .../sodium_compat/src/Core32/ChaCha20/Ctx.php |   126 +
 .../src/Core32/ChaCha20/IetfCtx.php           |    39 +
 .../sodium_compat/src/Core32/Curve25519.php   |  3543 ++++
 .../src/Core32/Curve25519/Fe.php              |   221 +
 .../src/Core32/Curve25519/Ge/Cached.php       |    65 +
 .../src/Core32/Curve25519/Ge/P1p1.php         |    67 +
 .../src/Core32/Curve25519/Ge/P2.php           |    54 +
 .../src/Core32/Curve25519/Ge/P3.php           |    65 +
 .../src/Core32/Curve25519/Ge/Precomp.php      |    56 +
 .../sodium_compat/src/Core32/Curve25519/H.php |  1467 ++
 .../src/Core32/Curve25519/README.md           |     3 +
 .../sodium_compat/src/Core32/Ed25519.php      |   480 +
 .../sodium_compat/src/Core32/HChaCha20.php    |   127 +
 .../sodium_compat/src/Core32/HSalsa20.php     |   141 +
 .../sodium_compat/src/Core32/Int32.php        |   650 +
 .../sodium_compat/src/Core32/Int64.php        |   743 +
 .../sodium_compat/src/Core32/Poly1305.php     |    63 +
 .../src/Core32/Poly1305/State.php             |   451 +
 .../sodium_compat/src/Core32/Salsa20.php      |   306 +
 .../sodium_compat/src/Core32/SipHash.php      |   239 +
 .../sodium_compat/src/Core32/Util.php         |    13 +
 .../sodium_compat/src/Core32/X25519.php       |   348 +
 .../sodium_compat/src/Core32/XChaCha20.php    |    64 +
 .../sodium_compat/src/Core32/XSalsa20.php     |    57 +
 .../paragonie/sodium_compat/src/Crypto.php    |  1245 ++
 .../paragonie/sodium_compat/src/Crypto32.php  |  1244 ++
 .../paragonie/sodium_compat/src/File.php      |  1515 ++
 .../sodium_compat/src/SodiumException.php     |    11 +
 .../vendor/phpmailer/phpmailer/LICENSE        |   504 +
 .../phpmailer/phpmailer/PHPMailerAutoload.php |    49 +
 .../vendor/phpmailer/phpmailer/VERSION        |     1 +
 .../phpmailer/phpmailer/class.phpmailer.php   |  4044 +++++
 .../phpmailer/class.phpmaileroauth.php        |   197 +
 .../phpmailer/class.phpmaileroauthgoogle.php  |    77 +
 .../vendor/phpmailer/phpmailer/class.pop3.php |   407 +
 .../vendor/phpmailer/phpmailer/class.smtp.php |  1276 ++
 .../vendor/phpmailer/phpmailer/composer.lock  |  3593 +++++
 .../phpmailer/extras/EasyPeasyICS.php         |   148 +
 .../phpmailer/phpmailer/extras/htmlfilter.php |  1159 ++
 .../phpmailer/extras/ntlm_sasl_client.php     |   185 +
 core/libraries/vendor/psr/container/LICENSE   |    21 +
 .../src/ContainerExceptionInterface.php       |    13 +
 .../psr/container/src/ContainerInterface.php  |    37 +
 .../src/NotFoundExceptionInterface.php        |    13 +
 core/libraries/vendor/psr/log/LICENSE         |    19 +
 .../vendor/psr/log/Psr/Log/AbstractLogger.php |   128 +
 .../log/Psr/Log/InvalidArgumentException.php  |     7 +
 .../vendor/psr/log/Psr/Log/LogLevel.php       |    18 +
 .../psr/log/Psr/Log/LoggerAwareInterface.php  |    18 +
 .../psr/log/Psr/Log/LoggerAwareTrait.php      |    26 +
 .../psr/log/Psr/Log/LoggerInterface.php       |   123 +
 .../vendor/psr/log/Psr/Log/LoggerTrait.php    |   140 +
 .../vendor/psr/log/Psr/Log/NullLogger.php     |    28 +
 .../vendor/simplepie/simplepie/LICENSE.txt    |    26 +
 .../vendor/simplepie/simplepie/autoloader.php |    86 +
 .../vendor/simplepie/simplepie/db.sql         |    38 +
 .../vendor/simplepie/simplepie/idn/LICENCE    |   502 +
 .../simplepie/idn/idna_convert.class.php      |   969 ++
 .../vendor/simplepie/simplepie/idn/npdata.ser |     1 +
 .../simplepie/simplepie/library/SimplePie.php |  3058 ++++
 .../simplepie/library/SimplePie/Author.php    |   157 +
 .../simplepie/library/SimplePie/Cache.php     |   133 +
 .../library/SimplePie/Cache/Base.php          |   114 +
 .../simplepie/library/SimplePie/Cache/DB.php  |   137 +
 .../library/SimplePie/Cache/File.php          |   173 +
 .../library/SimplePie/Cache/Memcache.php      |   183 +
 .../library/SimplePie/Cache/MySQL.php         |   438 +
 .../simplepie/library/SimplePie/Caption.php   |   210 +
 .../simplepie/library/SimplePie/Category.php  |   157 +
 .../SimplePie/Content/Type/Sniffer.php        |   332 +
 .../simplepie/library/SimplePie/Copyright.php |   130 +
 .../simplepie/library/SimplePie/Core.php      |    57 +
 .../simplepie/library/SimplePie/Credit.php    |   156 +
 .../SimplePie/Decode/HTML/Entities.php        |   617 +
 .../simplepie/library/SimplePie/Enclosure.php |  1380 ++
 .../simplepie/library/SimplePie/Exception.php |    52 +
 .../simplepie/library/SimplePie/File.php      |   292 +
 .../library/SimplePie/HTTP/Parser.php         |   500 +
 .../simplepie/library/SimplePie/IRI.php       |  1238 ++
 .../simplepie/library/SimplePie/Item.php      |  2964 ++++
 .../simplepie/library/SimplePie/Locator.php   |   372 +
 .../simplepie/library/SimplePie/Misc.php      |  2247 +++
 .../simplepie/library/SimplePie/Net/IPv6.php  |   276 +
 .../library/SimplePie/Parse/Date.php          |   983 ++
 .../simplepie/library/SimplePie/Parser.php    |   407 +
 .../simplepie/library/SimplePie/Rating.php    |   129 +
 .../simplepie/library/SimplePie/Registry.php  |   225 +
 .../library/SimplePie/Restriction.php         |   155 +
 .../simplepie/library/SimplePie/Sanitize.php  |   549 +
 .../simplepie/library/SimplePie/Source.php    |   611 +
 .../SimplePie/XML/Declaration/Parser.php      |   362 +
 .../simplepie/library/SimplePie/gzdecode.php  |   371 +
 .../vendor/symfony/polyfill-ctype/Ctype.php   |   227 +
 .../vendor/symfony/polyfill-ctype/LICENSE     |    19 +
 .../symfony/polyfill-ctype/bootstrap.php      |    26 +
 .../vendor/symfony/polyfill-php55/LICENSE     |    19 +
 .../vendor/symfony/polyfill-php55/Php55.php   |    63 +
 .../polyfill-php55/Php55ArrayColumn.php       |    64 +
 .../symfony/polyfill-php55/bootstrap.php      |    27 +
 .../vendor/symfony/polyfill-php56/LICENSE     |    19 +
 .../vendor/symfony/polyfill-php56/Php56.php   |   138 +
 .../symfony/polyfill-php56/bootstrap.php      |    38 +
 .../vendor/symfony/polyfill-php73/LICENSE     |    19 +
 .../symfony/polyfill-php73/bootstrap.php      |    16 +
 .../vendor/symfony/polyfill-util/Binary.php   |    18 +
 .../polyfill-util/BinaryNoFuncOverload.php    |    65 +
 .../polyfill-util/BinaryOnFuncOverload.php    |    67 +
 .../vendor/symfony/polyfill-util/LICENSE      |    19 +
 core/libraries/vendor/symfony/yaml/Dumper.php |    77 +
 .../libraries/vendor/symfony/yaml/Escaper.php |   101 +
 .../symfony/yaml/Exception/DumpException.php  |    21 +
 .../yaml/Exception/ExceptionInterface.php     |    21 +
 .../symfony/yaml/Exception/ParseException.php |   144 +
 .../yaml/Exception/RuntimeException.php       |    21 +
 core/libraries/vendor/symfony/yaml/Inline.php |   609 +
 core/libraries/vendor/symfony/yaml/LICENSE    |    19 +
 core/libraries/vendor/symfony/yaml/Parser.php |   852 +
 .../vendor/symfony/yaml/Unescaper.php         |   156 +
 core/libraries/vendor/symfony/yaml/Yaml.php   |   100 +
 core/libraries/vendor/web.config              |     8 +
 core/media/cms/css/debug.css                  |   208 +
 .../media/com_associations/css/sidebyside.css |    75 +
 .../js/sidebyside-uncompressed.js             |   319 +
 core/media/com_associations/js/sidebyside.js  |     1 +
 .../com_contact/js/admin-contacts-modal.js    |    62 +
 .../js/admin-contacts-modal.min.js            |     1 +
 .../com_content/js/admin-article-pagebreak.js |    37 +
 .../js/admin-article-pagebreak.min.js         |     1 +
 .../com_content/js/admin-article-readmore.js  |    32 +
 .../js/admin-article-readmore.min.js          |     1 +
 .../com_content/js/admin-articles-modal.js    |    61 +
 .../js/admin-articles-modal.min.js            |     1 +
 .../css/jquery.pretty-text-diff.css           |    10 +
 .../com_contenthistory/js/diff_match_patch.js |    49 +
 .../js/jquery.pretty-text-diff.js             |    87 +
 .../js/jquery.pretty-text-diff.min.js         |     5 +
 .../media/com_fields/js/admin-fields-modal.js |    30 +
 .../com_fields/js/admin-fields-modal.min.js   |     1 +
 core/media/com_finder/css/dates.css           |    26 +
 core/media/com_finder/css/finder.css          |   137 +
 core/media/com_finder/css/indexer.css         |    17 +
 core/media/com_finder/js/autocompleter.js     |   506 +
 core/media/com_finder/js/indexer.js           |   104 +
 core/media/com_joomlaupdate/js/default.js     |    13 +
 core/media/com_joomlaupdate/js/default.min.js |     1 +
 core/media/com_joomlaupdate/js/encryption.js  |   457 +
 .../com_joomlaupdate/js/encryption.min.js     |     1 +
 core/media/com_joomlaupdate/js/json2.js       |     8 +
 core/media/com_joomlaupdate/js/json2.min.js   |     1 +
 core/media/com_joomlaupdate/js/update.js      |   393 +
 core/media/com_joomlaupdate/js/update.min.js  |     1 +
 core/media/com_menus/js/admin-items-modal.js  |    63 +
 .../com_menus/js/admin-items-modal.min.js     |     1 +
 .../com_modules/js/admin-modules-modal.js     |    49 +
 .../com_modules/js/admin-modules-modal.min.js |     1 +
 core/media/com_wrapper/js/iframe-height.js    |    14 +
 .../media/com_wrapper/js/iframe-height.min.js |     1 +
 core/media/contacts/images/con_address.png    |   Bin 0 -> 448 bytes
 core/media/contacts/images/con_fax.png        |   Bin 0 -> 408 bytes
 core/media/contacts/images/con_info.png       |   Bin 0 -> 464 bytes
 core/media/contacts/images/con_mobile.png     |   Bin 0 -> 544 bytes
 core/media/contacts/images/con_tel.png        |   Bin 0 -> 510 bytes
 core/media/contacts/images/emailButton.png    |   Bin 0 -> 256 bytes
 core/media/editors/codemirror/LICENSE         |    21 +
 .../codemirror/addon/comment/comment.js       |   209 +
 .../codemirror/addon/comment/comment.min.js   |     1 +
 .../addon/comment/continuecomment.js          |    78 +
 .../addon/comment/continuecomment.min.js      |     1 +
 .../codemirror/addon/dialog/dialog.css        |    32 +
 .../editors/codemirror/addon/dialog/dialog.js |   161 +
 .../codemirror/addon/dialog/dialog.min.css    |     1 +
 .../codemirror/addon/dialog/dialog.min.js     |     1 +
 .../codemirror/addon/display/autorefresh.js   |    47 +
 .../addon/display/autorefresh.min.js          |     1 +
 .../codemirror/addon/display/fullscreen.css   |     6 +
 .../codemirror/addon/display/fullscreen.js    |    41 +
 .../addon/display/fullscreen.min.css          |     1 +
 .../addon/display/fullscreen.min.js           |     1 +
 .../editors/codemirror/addon/display/panel.js |   123 +
 .../codemirror/addon/display/panel.min.js     |     1 +
 .../codemirror/addon/display/placeholder.js   |    63 +
 .../addon/display/placeholder.min.js          |     1 +
 .../codemirror/addon/display/rulers.js        |    51 +
 .../codemirror/addon/display/rulers.min.js    |     1 +
 .../codemirror/addon/edit/closebrackets.js    |   194 +
 .../addon/edit/closebrackets.min.js           |     1 +
 .../editors/codemirror/addon/edit/closetag.js |   175 +
 .../codemirror/addon/edit/closetag.min.js     |     1 +
 .../codemirror/addon/edit/continuelist.js     |    89 +
 .../codemirror/addon/edit/continuelist.min.js |     1 +
 .../codemirror/addon/edit/matchbrackets.js    |   145 +
 .../addon/edit/matchbrackets.min.js           |     1 +
 .../codemirror/addon/edit/matchtags.js        |    66 +
 .../codemirror/addon/edit/matchtags.min.js    |     1 +
 .../codemirror/addon/edit/trailingspace.js    |    27 +
 .../addon/edit/trailingspace.min.js           |     1 +
 .../codemirror/addon/fold/brace-fold.js       |   105 +
 .../codemirror/addon/fold/brace-fold.min.js   |     1 +
 .../codemirror/addon/fold/comment-fold.js     |    59 +
 .../codemirror/addon/fold/comment-fold.min.js |     1 +
 .../editors/codemirror/addon/fold/foldcode.js |   152 +
 .../codemirror/addon/fold/foldcode.min.js     |     1 +
 .../codemirror/addon/fold/foldgutter.css      |    20 +
 .../codemirror/addon/fold/foldgutter.js       |   146 +
 .../codemirror/addon/fold/foldgutter.min.css  |     1 +
 .../codemirror/addon/fold/foldgutter.min.js   |     1 +
 .../codemirror/addon/fold/indent-fold.js      |    48 +
 .../codemirror/addon/fold/indent-fold.min.js  |     1 +
 .../codemirror/addon/fold/markdown-fold.js    |    49 +
 .../addon/fold/markdown-fold.min.js           |     1 +
 .../editors/codemirror/addon/fold/xml-fold.js |   184 +
 .../codemirror/addon/fold/xml-fold.min.js     |     1 +
 .../codemirror/addon/hint/anyword-hint.js     |    41 +
 .../codemirror/addon/hint/anyword-hint.min.js |     1 +
 .../editors/codemirror/addon/hint/css-hint.js |    60 +
 .../codemirror/addon/hint/css-hint.min.js     |     1 +
 .../codemirror/addon/hint/html-hint.js        |   348 +
 .../codemirror/addon/hint/html-hint.min.js    |     1 +
 .../codemirror/addon/hint/javascript-hint.js  |   157 +
 .../addon/hint/javascript-hint.min.js         |     1 +
 .../codemirror/addon/hint/show-hint.css       |    36 +
 .../codemirror/addon/hint/show-hint.js        |   433 +
 .../codemirror/addon/hint/show-hint.min.css   |     1 +
 .../codemirror/addon/hint/show-hint.min.js    |     1 +
 .../editors/codemirror/addon/hint/sql-hint.js |   299 +
 .../codemirror/addon/hint/sql-hint.min.js     |     1 +
 .../editors/codemirror/addon/hint/xml-hint.js |   110 +
 .../codemirror/addon/hint/xml-hint.min.js     |     1 +
 .../addon/lint/coffeescript-lint.js           |    47 +
 .../addon/lint/coffeescript-lint.min.js       |     1 +
 .../editors/codemirror/addon/lint/css-lint.js |    40 +
 .../codemirror/addon/lint/css-lint.min.js     |     1 +
 .../codemirror/addon/lint/html-lint.js        |    53 +
 .../codemirror/addon/lint/html-lint.min.js    |     1 +
 .../codemirror/addon/lint/javascript-lint.js  |    63 +
 .../addon/lint/javascript-lint.min.js         |     1 +
 .../codemirror/addon/lint/json-lint.js        |    40 +
 .../codemirror/addon/lint/json-lint.min.js    |     1 +
 .../editors/codemirror/addon/lint/lint.css    |    73 +
 .../editors/codemirror/addon/lint/lint.js     |   252 +
 .../codemirror/addon/lint/lint.min.css        |     1 +
 .../editors/codemirror/addon/lint/lint.min.js |     1 +
 .../codemirror/addon/lint/yaml-lint.js        |    41 +
 .../codemirror/addon/lint/yaml-lint.min.js    |     1 +
 .../editors/codemirror/addon/merge/merge.css  |   119 +
 .../editors/codemirror/addon/merge/merge.js   |  1002 ++
 .../codemirror/addon/merge/merge.min.css      |     1 +
 .../codemirror/addon/merge/merge.min.js       |     1 +
 .../editors/codemirror/addon/mode/loadmode.js |    64 +
 .../codemirror/addon/mode/loadmode.min.js     |     1 +
 .../codemirror/addon/mode/multiplex.js        |   131 +
 .../codemirror/addon/mode/multiplex.min.js    |     1 +
 .../codemirror/addon/mode/multiplex_test.js   |    33 +
 .../addon/mode/multiplex_test.min.js          |     1 +
 .../editors/codemirror/addon/mode/overlay.js  |    90 +
 .../codemirror/addon/mode/overlay.min.js      |     1 +
 .../editors/codemirror/addon/mode/simple.js   |   216 +
 .../codemirror/addon/mode/simple.min.js       |     1 +
 .../codemirror/addon/runmode/colorize.js      |    40 +
 .../codemirror/addon/runmode/colorize.min.js  |     1 +
 .../addon/runmode/runmode-standalone.js       |   158 +
 .../addon/runmode/runmode-standalone.min.js   |     1 +
 .../codemirror/addon/runmode/runmode.js       |    72 +
 .../codemirror/addon/runmode/runmode.min.js   |     1 +
 .../codemirror/addon/runmode/runmode.node.js  |   197 +
 .../addon/scroll/annotatescrollbar.js         |   122 +
 .../addon/scroll/annotatescrollbar.min.js     |     1 +
 .../codemirror/addon/scroll/scrollpastend.js  |    48 +
 .../addon/scroll/scrollpastend.min.js         |     1 +
 .../addon/scroll/simplescrollbars.css         |    66 +
 .../addon/scroll/simplescrollbars.js          |   152 +
 .../addon/scroll/simplescrollbars.min.css     |     1 +
 .../addon/scroll/simplescrollbars.min.js      |     1 +
 .../codemirror/addon/search/jump-to-line.js   |    49 +
 .../addon/search/jump-to-line.min.js          |     1 +
 .../addon/search/match-highlighter.js         |   165 +
 .../addon/search/match-highlighter.min.js     |     1 +
 .../addon/search/matchesonscrollbar.css       |     8 +
 .../addon/search/matchesonscrollbar.js        |    97 +
 .../addon/search/matchesonscrollbar.min.css   |     1 +
 .../addon/search/matchesonscrollbar.min.js    |     1 +
 .../editors/codemirror/addon/search/search.js |   252 +
 .../codemirror/addon/search/search.min.js     |     1 +
 .../codemirror/addon/search/searchcursor.js   |   293 +
 .../addon/search/searchcursor.min.js          |     1 +
 .../codemirror/addon/selection/active-line.js |    72 +
 .../addon/selection/active-line.min.js        |     1 +
 .../addon/selection/mark-selection.js         |   119 +
 .../addon/selection/mark-selection.min.js     |     1 +
 .../addon/selection/selection-pointer.js      |    98 +
 .../addon/selection/selection-pointer.min.js  |     1 +
 .../editors/codemirror/addon/tern/tern.css    |    87 +
 .../editors/codemirror/addon/tern/tern.js     |   718 +
 .../codemirror/addon/tern/tern.min.css        |     1 +
 .../editors/codemirror/addon/tern/tern.min.js |     1 +
 .../editors/codemirror/addon/tern/worker.js   |    44 +
 .../codemirror/addon/tern/worker.min.js       |     1 +
 .../editors/codemirror/addon/wrap/hardwrap.js |   144 +
 .../codemirror/addon/wrap/hardwrap.min.js     |     1 +
 core/media/editors/codemirror/keymap/emacs.js |   417 +
 .../editors/codemirror/keymap/emacs.min.js    |     1 +
 .../editors/codemirror/keymap/sublime.js      |   691 +
 .../editors/codemirror/keymap/sublime.min.js  |     1 +
 core/media/editors/codemirror/keymap/vim.js   |  5412 +++++++
 .../editors/codemirror/keymap/vim.min.js      |     3 +
 core/media/editors/codemirror/lib/addons.css  |   103 +
 core/media/editors/codemirror/lib/addons.js   |  2662 +++
 .../editors/codemirror/lib/addons.min.css     |     1 +
 .../editors/codemirror/lib/addons.min.js      |     2 +
 .../editors/codemirror/lib/codemirror.css     |   346 +
 .../editors/codemirror/lib/codemirror.js      |  9697 +++++++++++
 .../editors/codemirror/lib/codemirror.min.css |     1 +
 .../editors/codemirror/lib/codemirror.min.js  |     6 +
 core/media/editors/codemirror/mode/apl/apl.js |   174 +
 .../editors/codemirror/mode/apl/apl.min.js    |     1 +
 .../codemirror/mode/asciiarmor/asciiarmor.js  |    74 +
 .../mode/asciiarmor/asciiarmor.min.js         |     1 +
 .../editors/codemirror/mode/asn.1/asn.1.js    |   204 +
 .../editors/codemirror/mode/asn.1/asn.min.js  |     1 +
 .../codemirror/mode/asterisk/asterisk.js      |   196 +
 .../codemirror/mode/asterisk/asterisk.min.js  |     1 +
 .../codemirror/mode/brainfuck/brainfuck.js    |    85 +
 .../mode/brainfuck/brainfuck.min.js           |     1 +
 .../editors/codemirror/mode/clike/clike.js    |   823 +
 .../codemirror/mode/clike/clike.min.js        |     1 +
 .../codemirror/mode/clojure/clojure.js        |   306 +
 .../codemirror/mode/clojure/clojure.min.js    |     1 +
 .../editors/codemirror/mode/cmake/cmake.js    |    97 +
 .../codemirror/mode/cmake/cmake.min.js        |     1 +
 .../editors/codemirror/mode/cobol/cobol.js    |   255 +
 .../codemirror/mode/cobol/cobol.min.js        |     1 +
 .../mode/coffeescript/coffeescript.js         |   359 +
 .../mode/coffeescript/coffeescript.min.js     |     1 +
 .../codemirror/mode/commonlisp/commonlisp.js  |   124 +
 .../mode/commonlisp/commonlisp.min.js         |     1 +
 .../codemirror/mode/crystal/crystal.js        |   433 +
 .../codemirror/mode/crystal/crystal.min.js    |     1 +
 core/media/editors/codemirror/mode/css/css.js |   832 +
 .../editors/codemirror/mode/css/css.min.js    |     1 +
 .../editors/codemirror/mode/cypher/cypher.js  |   150 +
 .../codemirror/mode/cypher/cypher.min.js      |     1 +
 core/media/editors/codemirror/mode/d/d.js     |   218 +
 core/media/editors/codemirror/mode/d/d.min.js |     1 +
 .../editors/codemirror/mode/dart/dart.js      |   157 +
 .../editors/codemirror/mode/dart/dart.min.js  |     1 +
 .../editors/codemirror/mode/diff/diff.js      |    47 +
 .../editors/codemirror/mode/diff/diff.min.js  |     1 +
 .../editors/codemirror/mode/django/django.js  |   356 +
 .../codemirror/mode/django/django.min.js      |     1 +
 .../codemirror/mode/dockerfile/dockerfile.js  |   211 +
 .../mode/dockerfile/dockerfile.min.js         |     1 +
 core/media/editors/codemirror/mode/dtd/dtd.js |   142 +
 .../editors/codemirror/mode/dtd/dtd.min.js    |     1 +
 .../editors/codemirror/mode/dylan/dylan.js    |   352 +
 .../codemirror/mode/dylan/dylan.min.js        |     1 +
 .../editors/codemirror/mode/ebnf/ebnf.js      |   195 +
 .../editors/codemirror/mode/ebnf/ebnf.min.js  |     1 +
 core/media/editors/codemirror/mode/ecl/ecl.js |   206 +
 .../editors/codemirror/mode/ecl/ecl.min.js    |     1 +
 .../editors/codemirror/mode/eiffel/eiffel.js  |   160 +
 .../codemirror/mode/eiffel/eiffel.min.js      |     1 +
 core/media/editors/codemirror/mode/elm/elm.js |   205 +
 .../editors/codemirror/mode/elm/elm.min.js    |     1 +
 .../editors/codemirror/mode/erlang/erlang.js  |   619 +
 .../codemirror/mode/erlang/erlang.min.js      |     1 +
 .../editors/codemirror/mode/factor/factor.js  |    85 +
 .../codemirror/mode/factor/factor.min.js      |     1 +
 core/media/editors/codemirror/mode/fcl/fcl.js |   173 +
 .../editors/codemirror/mode/fcl/fcl.min.js    |     1 +
 .../editors/codemirror/mode/forth/forth.js    |   180 +
 .../codemirror/mode/forth/forth.min.js        |     1 +
 .../codemirror/mode/fortran/fortran.js        |   188 +
 .../codemirror/mode/fortran/fortran.min.js    |     1 +
 core/media/editors/codemirror/mode/gas/gas.js |   345 +
 .../editors/codemirror/mode/gas/gas.min.js    |     1 +
 core/media/editors/codemirror/mode/gfm/gfm.js |   129 +
 .../editors/codemirror/mode/gfm/gfm.min.js    |     1 +
 .../codemirror/mode/gherkin/gherkin.js        |   178 +
 .../codemirror/mode/gherkin/gherkin.min.js    |     1 +
 core/media/editors/codemirror/mode/go/go.js   |   187 +
 .../editors/codemirror/mode/go/go.min.js      |     1 +
 .../editors/codemirror/mode/groovy/groovy.js  |   230 +
 .../codemirror/mode/groovy/groovy.min.js      |     1 +
 .../editors/codemirror/mode/haml/haml.js      |   161 +
 .../editors/codemirror/mode/haml/haml.min.js  |     1 +
 .../codemirror/mode/handlebars/handlebars.js  |    62 +
 .../mode/handlebars/handlebars.min.js         |     1 +
 .../mode/haskell-literate/haskell-literate.js |    43 +
 .../haskell-literate/haskell-literate.min.js  |     1 +
 .../codemirror/mode/haskell/haskell.js        |   268 +
 .../codemirror/mode/haskell/haskell.min.js    |     1 +
 .../editors/codemirror/mode/haxe/haxe.js      |   515 +
 .../editors/codemirror/mode/haxe/haxe.min.js  |     1 +
 .../mode/htmlembedded/htmlembedded.js         |    37 +
 .../mode/htmlembedded/htmlembedded.min.js     |     1 +
 .../codemirror/mode/htmlmixed/htmlmixed.js    |   152 +
 .../mode/htmlmixed/htmlmixed.min.js           |     1 +
 .../editors/codemirror/mode/http/http.js      |   113 +
 .../editors/codemirror/mode/http/http.min.js  |     1 +
 core/media/editors/codemirror/mode/idl/idl.js |   290 +
 .../editors/codemirror/mode/idl/idl.min.js    |     1 +
 .../codemirror/mode/javascript/javascript.js  |   896 ++
 .../mode/javascript/javascript.min.js         |     1 +
 .../editors/codemirror/mode/jinja2/jinja2.js  |   142 +
 .../codemirror/mode/jinja2/jinja2.min.js      |     1 +
 core/media/editors/codemirror/mode/jsx/jsx.js |   148 +
 .../editors/codemirror/mode/jsx/jsx.min.js    |     1 +
 .../editors/codemirror/mode/julia/julia.js    |   418 +
 .../codemirror/mode/julia/julia.min.js        |     1 +
 .../codemirror/mode/livescript/livescript.js  |   280 +
 .../mode/livescript/livescript.min.js         |     1 +
 core/media/editors/codemirror/mode/lua/lua.js |   159 +
 .../editors/codemirror/mode/lua/lua.min.js    |     1 +
 .../codemirror/mode/markdown/markdown.js      |   872 +
 .../codemirror/mode/markdown/markdown.min.js  |     1 +
 .../mode/mathematica/mathematica.js           |   176 +
 .../mode/mathematica/mathematica.min.js       |     1 +
 .../editors/codemirror/mode/mbox/mbox.js      |   129 +
 .../editors/codemirror/mode/mbox/mbox.min.js  |     1 +
 core/media/editors/codemirror/mode/meta.js    |   217 +
 .../media/editors/codemirror/mode/meta.min.js |     1 +
 .../editors/codemirror/mode/mirc/mirc.js      |   193 +
 .../editors/codemirror/mode/mirc/mirc.min.js  |     1 +
 .../editors/codemirror/mode/mllike/mllike.js  |   356 +
 .../codemirror/mode/mllike/mllike.min.js      |     1 +
 .../codemirror/mode/modelica/modelica.js      |   245 +
 .../codemirror/mode/modelica/modelica.min.js  |     1 +
 .../editors/codemirror/mode/mscgen/mscgen.js  |   175 +
 .../codemirror/mode/mscgen/mscgen.min.js      |     1 +
 .../editors/codemirror/mode/mumps/mumps.js    |   148 +
 .../codemirror/mode/mumps/mumps.min.js        |     1 +
 .../editors/codemirror/mode/nginx/nginx.js    |   178 +
 .../codemirror/mode/nginx/nginx.min.js        |     1 +
 .../editors/codemirror/mode/nsis/nsis.js      |    95 +
 .../editors/codemirror/mode/nsis/nsis.min.js  |     1 +
 .../codemirror/mode/ntriples/ntriples.js      |   195 +
 .../codemirror/mode/ntriples/ntriples.min.js  |     1 +
 .../editors/codemirror/mode/octave/octave.js  |   139 +
 .../codemirror/mode/octave/octave.min.js      |     1 +
 core/media/editors/codemirror/mode/oz/oz.js   |   252 +
 .../editors/codemirror/mode/oz/oz.min.js      |     1 +
 .../editors/codemirror/mode/pascal/pascal.js  |   109 +
 .../codemirror/mode/pascal/pascal.min.js      |     1 +
 .../editors/codemirror/mode/pegjs/pegjs.js    |   114 +
 .../codemirror/mode/pegjs/pegjs.min.js        |     1 +
 .../editors/codemirror/mode/perl/perl.js      |   837 +
 .../editors/codemirror/mode/perl/perl.min.js  |     1 +
 core/media/editors/codemirror/mode/php/php.js |   234 +
 .../editors/codemirror/mode/php/php.min.js    |     1 +
 core/media/editors/codemirror/mode/pig/pig.js |   178 +
 .../editors/codemirror/mode/pig/pig.min.js    |     1 +
 .../codemirror/mode/powershell/powershell.js  |   398 +
 .../mode/powershell/powershell.min.js         |     1 +
 .../codemirror/mode/properties/properties.js  |    78 +
 .../mode/properties/properties.min.js         |     1 +
 .../codemirror/mode/protobuf/protobuf.js      |    69 +
 .../codemirror/mode/protobuf/protobuf.min.js  |     1 +
 core/media/editors/codemirror/mode/pug/pug.js |   591 +
 .../editors/codemirror/mode/pug/pug.min.js    |     1 +
 .../editors/codemirror/mode/puppet/puppet.js  |   220 +
 .../codemirror/mode/puppet/puppet.min.js      |     1 +
 .../editors/codemirror/mode/python/python.js  |   409 +
 .../codemirror/mode/python/python.min.js      |     1 +
 core/media/editors/codemirror/mode/q/q.js     |   139 +
 core/media/editors/codemirror/mode/q/q.min.js |     1 +
 core/media/editors/codemirror/mode/r/r.js     |   183 +
 core/media/editors/codemirror/mode/r/r.min.js |     1 +
 .../codemirror/mode/rpm/changes/index.html    |    66 +
 core/media/editors/codemirror/mode/rpm/rpm.js |   109 +
 .../editors/codemirror/mode/rpm/rpm.min.js    |     1 +
 core/media/editors/codemirror/mode/rst/rst.js |   557 +
 .../editors/codemirror/mode/rst/rst.min.js    |     1 +
 .../editors/codemirror/mode/ruby/ruby.js      |   296 +
 .../editors/codemirror/mode/ruby/ruby.min.js  |     1 +
 .../editors/codemirror/mode/rust/rust.js      |    72 +
 .../editors/codemirror/mode/rust/rust.min.js  |     1 +
 core/media/editors/codemirror/mode/sas/sas.js |   303 +
 .../editors/codemirror/mode/sas/sas.min.js    |     1 +
 .../editors/codemirror/mode/sass/sass.js      |   454 +
 .../editors/codemirror/mode/sass/sass.min.js  |     1 +
 .../editors/codemirror/mode/scheme/scheme.js  |   249 +
 .../codemirror/mode/scheme/scheme.min.js      |     1 +
 .../editors/codemirror/mode/shell/shell.js    |   151 +
 .../codemirror/mode/shell/shell.min.js        |     1 +
 .../editors/codemirror/mode/sieve/sieve.js    |   193 +
 .../codemirror/mode/sieve/sieve.min.js        |     1 +
 .../editors/codemirror/mode/slim/slim.js      |   575 +
 .../editors/codemirror/mode/slim/slim.min.js  |     1 +
 .../codemirror/mode/smalltalk/smalltalk.js    |   168 +
 .../mode/smalltalk/smalltalk.min.js           |     1 +
 .../editors/codemirror/mode/smarty/smarty.js  |   225 +
 .../codemirror/mode/smarty/smarty.min.js      |     1 +
 .../editors/codemirror/mode/solr/solr.js      |   104 +
 .../editors/codemirror/mode/solr/solr.min.js  |     1 +
 core/media/editors/codemirror/mode/soy/soy.js |   355 +
 .../editors/codemirror/mode/soy/soy.min.js    |     1 +
 .../editors/codemirror/mode/sparql/sparql.js  |   180 +
 .../codemirror/mode/sparql/sparql.min.js      |     1 +
 .../mode/spreadsheet/spreadsheet.js           |   112 +
 .../mode/spreadsheet/spreadsheet.min.js       |     1 +
 core/media/editors/codemirror/mode/sql/sql.js |   500 +
 .../editors/codemirror/mode/sql/sql.min.js    |     2 +
 .../editors/codemirror/mode/stex/stex.js      |   263 +
 .../editors/codemirror/mode/stex/stex.min.js  |     1 +
 .../editors/codemirror/mode/stylus/stylus.js  |   771 +
 .../codemirror/mode/stylus/stylus.min.js      |     1 +
 .../editors/codemirror/mode/swift/swift.js    |   219 +
 .../codemirror/mode/swift/swift.min.js        |     1 +
 core/media/editors/codemirror/mode/tcl/tcl.js |   139 +
 .../editors/codemirror/mode/tcl/tcl.min.js    |     1 +
 .../codemirror/mode/textile/textile.js        |   469 +
 .../codemirror/mode/textile/textile.min.js    |     1 +
 .../codemirror/mode/tiddlywiki/tiddlywiki.css |    14 +
 .../codemirror/mode/tiddlywiki/tiddlywiki.js  |   308 +
 .../mode/tiddlywiki/tiddlywiki.min.css        |     1 +
 .../mode/tiddlywiki/tiddlywiki.min.js         |     1 +
 .../editors/codemirror/mode/tiki/tiki.css     |    26 +
 .../editors/codemirror/mode/tiki/tiki.js      |   312 +
 .../editors/codemirror/mode/tiki/tiki.min.css |     1 +
 .../editors/codemirror/mode/tiki/tiki.min.js  |     1 +
 .../editors/codemirror/mode/toml/toml.js      |    88 +
 .../editors/codemirror/mode/toml/toml.min.js  |     1 +
 .../codemirror/mode/tornado/tornado.js        |    68 +
 .../codemirror/mode/tornado/tornado.min.js    |     1 +
 .../editors/codemirror/mode/troff/troff.js    |    84 +
 .../codemirror/mode/troff/troff.min.js        |     1 +
 .../codemirror/mode/ttcn-cfg/ttcn-cfg.js      |   214 +
 .../codemirror/mode/ttcn-cfg/ttcn-cfg.min.js  |     1 +
 .../editors/codemirror/mode/ttcn/ttcn.js      |   283 +
 .../editors/codemirror/mode/ttcn/ttcn.min.js  |     1 +
 .../editors/codemirror/mode/turtle/turtle.js  |   162 +
 .../codemirror/mode/turtle/turtle.min.js      |     1 +
 .../editors/codemirror/mode/twig/twig.js      |   141 +
 .../editors/codemirror/mode/twig/twig.min.js  |     1 +
 core/media/editors/codemirror/mode/vb/vb.js   |   275 +
 .../editors/codemirror/mode/vb/vb.min.js      |     1 +
 .../codemirror/mode/vbscript/vbscript.js      |   350 +
 .../codemirror/mode/vbscript/vbscript.min.js  |     1 +
 .../codemirror/mode/velocity/velocity.js      |   201 +
 .../codemirror/mode/velocity/velocity.min.js  |     1 +
 .../codemirror/mode/verilog/verilog.js        |   675 +
 .../codemirror/mode/verilog/verilog.min.js    |     1 +
 .../editors/codemirror/mode/vhdl/vhdl.js      |   189 +
 .../editors/codemirror/mode/vhdl/vhdl.min.js  |     1 +
 core/media/editors/codemirror/mode/vue/vue.js |    77 +
 .../editors/codemirror/mode/vue/vue.min.js    |     1 +
 .../editors/codemirror/mode/webidl/webidl.js  |   195 +
 .../codemirror/mode/webidl/webidl.min.js      |     1 +
 core/media/editors/codemirror/mode/xml/xml.js |   401 +
 .../editors/codemirror/mode/xml/xml.min.js    |     1 +
 .../editors/codemirror/mode/xquery/xquery.js  |   448 +
 .../codemirror/mode/xquery/xquery.min.js      |     1 +
 .../editors/codemirror/mode/yacas/yacas.js    |   204 +
 .../codemirror/mode/yacas/yacas.min.js        |     1 +
 .../mode/yaml-frontmatter/yaml-frontmatter.js |    68 +
 .../yaml-frontmatter/yaml-frontmatter.min.js  |     1 +
 .../editors/codemirror/mode/yaml/yaml.js      |   119 +
 .../editors/codemirror/mode/yaml/yaml.min.js  |     1 +
 core/media/editors/codemirror/mode/z80/z80.js |   116 +
 .../editors/codemirror/mode/z80/z80.min.js    |     1 +
 .../editors/codemirror/theme/3024-day.css     |    41 +
 .../editors/codemirror/theme/3024-night.css   |    39 +
 .../media/editors/codemirror/theme/abcdef.css |    32 +
 .../codemirror/theme/ambiance-mobile.css      |     5 +
 .../editors/codemirror/theme/ambiance.css     |    74 +
 .../editors/codemirror/theme/base16-dark.css  |    38 +
 .../editors/codemirror/theme/base16-light.css |    38 +
 .../media/editors/codemirror/theme/bespin.css |    34 +
 .../editors/codemirror/theme/blackboard.css   |    32 +
 .../media/editors/codemirror/theme/cobalt.css |    25 +
 .../editors/codemirror/theme/colorforth.css   |    33 +
 .../editors/codemirror/theme/darcula.css      |    34 +
 .../editors/codemirror/theme/dracula.css      |    40 +
 .../editors/codemirror/theme/duotone-dark.css |    35 +
 .../codemirror/theme/duotone-light.css        |    36 +
 .../editors/codemirror/theme/eclipse.css      |    23 +
 .../editors/codemirror/theme/elegant.css      |    13 +
 .../editors/codemirror/theme/erlang-dark.css  |    34 +
 .../editors/codemirror/theme/gruvbox-dark.css |    34 +
 .../editors/codemirror/theme/hopscotch.css    |    34 +
 .../editors/codemirror/theme/icecoder.css     |    43 +
 core/media/editors/codemirror/theme/idea.css  |    31 +
 .../editors/codemirror/theme/isotope.css      |    34 +
 .../editors/codemirror/theme/lesser-dark.css  |    47 +
 .../editors/codemirror/theme/liquibyte.css    |    95 +
 .../editors/codemirror/theme/lucario.css      |    37 +
 .../editors/codemirror/theme/material.css     |    53 +
 core/media/editors/codemirror/theme/mbo.css   |    37 +
 .../editors/codemirror/theme/mdn-like.css     |    46 +
 .../editors/codemirror/theme/midnight.css     |    43 +
 .../editors/codemirror/theme/monokai.css      |    41 +
 core/media/editors/codemirror/theme/neat.css  |    12 +
 core/media/editors/codemirror/theme/neo.css   |    43 +
 core/media/editors/codemirror/theme/night.css |    27 +
 .../editors/codemirror/theme/oceanic-next.css |    44 +
 .../editors/codemirror/theme/panda-syntax.css |    85 +
 .../editors/codemirror/theme/paraiso-dark.css |    38 +
 .../codemirror/theme/paraiso-light.css        |    38 +
 .../codemirror/theme/pastel-on-dark.css       |    52 +
 .../editors/codemirror/theme/railscasts.css   |    34 +
 .../editors/codemirror/theme/rubyblue.css     |    25 +
 core/media/editors/codemirror/theme/seti.css  |    44 +
 .../editors/codemirror/theme/shadowfox.css    |    52 +
 .../editors/codemirror/theme/solarized.css    |   168 +
 core/media/editors/codemirror/theme/ssms.css  |    16 +
 .../editors/codemirror/theme/the-matrix.css   |    30 +
 .../theme/tomorrow-night-bright.css           |    35 +
 .../theme/tomorrow-night-eighties.css         |    38 +
 core/media/editors/codemirror/theme/ttcn.css  |    64 +
 .../editors/codemirror/theme/twilight.css     |    32 +
 .../editors/codemirror/theme/vibrant-ink.css  |    34 +
 .../editors/codemirror/theme/xq-dark.css      |    53 +
 .../editors/codemirror/theme/xq-light.css     |    43 +
 core/media/editors/codemirror/theme/yeti.css  |    44 +
 .../editors/codemirror/theme/zenburn.css      |    37 +
 core/media/editors/none/js/none.js            |    49 +
 core/media/editors/none/js/none.min.js        |     1 +
 core/media/editors/tinymce/changelog.txt      |   625 +
 .../tinymce/js/plugins/dragdrop/plugin.js     |   131 +
 .../tinymce/js/plugins/dragdrop/plugin.min.js |     1 +
 core/media/editors/tinymce/js/tiny-close.js   |    35 +
 .../editors/tinymce/js/tiny-close.min.js      |     1 +
 .../editors/tinymce/js/tinymce-builder.js     |   316 +
 core/media/editors/tinymce/js/tinymce.js      |   116 +
 core/media/editors/tinymce/js/tinymce.min.js  |     1 +
 core/media/editors/tinymce/langs/af.js        |   230 +
 core/media/editors/tinymce/langs/ar.js        |   231 +
 core/media/editors/tinymce/langs/be.js        |   197 +
 core/media/editors/tinymce/langs/bg.js        |   179 +
 core/media/editors/tinymce/langs/bs.js        |   231 +
 core/media/editors/tinymce/langs/ca.js        |   219 +
 core/media/editors/tinymce/langs/cs.js        |   196 +
 core/media/editors/tinymce/langs/cy.js        |   230 +
 core/media/editors/tinymce/langs/da.js        |   230 +
 core/media/editors/tinymce/langs/de.js        |   230 +
 core/media/editors/tinymce/langs/el.js        |   179 +
 core/media/editors/tinymce/langs/es.js        |   179 +
 core/media/editors/tinymce/langs/et.js        |   179 +
 core/media/editors/tinymce/langs/eu.js        |   219 +
 core/media/editors/tinymce/langs/fa.js        |   180 +
 core/media/editors/tinymce/langs/fi.js        |   197 +
 core/media/editors/tinymce/langs/fo.js        |   179 +
 core/media/editors/tinymce/langs/fr.js        |   230 +
 core/media/editors/tinymce/langs/ga.js        |   230 +
 core/media/editors/tinymce/langs/gl.js        |   179 +
 core/media/editors/tinymce/langs/he.js        |   180 +
 core/media/editors/tinymce/langs/hr.js        |   230 +
 core/media/editors/tinymce/langs/hu.js        |   230 +
 core/media/editors/tinymce/langs/id.js        |   219 +
 core/media/editors/tinymce/langs/it.js        |   232 +
 core/media/editors/tinymce/langs/ja.js        |   230 +
 core/media/editors/tinymce/langs/ka.js        |   230 +
 core/media/editors/tinymce/langs/km.js        |   219 +
 core/media/editors/tinymce/langs/ko.js        |   179 +
 core/media/editors/tinymce/langs/lb.js        |   179 +
 core/media/editors/tinymce/langs/lt.js        |   230 +
 core/media/editors/tinymce/langs/lv.js        |   197 +
 core/media/editors/tinymce/langs/mk.js        |   233 +
 core/media/editors/tinymce/langs/ms.js        |   176 +
 core/media/editors/tinymce/langs/nb.js        |   230 +
 core/media/editors/tinymce/langs/nl.js        |   230 +
 core/media/editors/tinymce/langs/pl.js        |   219 +
 core/media/editors/tinymce/langs/pt-BR.js     |   230 +
 core/media/editors/tinymce/langs/pt-PT.js     |   230 +
 core/media/editors/tinymce/langs/readme.md    |     3 +
 core/media/editors/tinymce/langs/ro.js        |   179 +
 core/media/editors/tinymce/langs/ru.js        |   230 +
 core/media/editors/tinymce/langs/si-LK.js     |   179 +
 core/media/editors/tinymce/langs/sk.js        |   230 +
 core/media/editors/tinymce/langs/sl.js        |   230 +
 core/media/editors/tinymce/langs/sr.js        |   179 +
 core/media/editors/tinymce/langs/sv.js        |   230 +
 core/media/editors/tinymce/langs/sw.js        |   230 +
 core/media/editors/tinymce/langs/sy.js        |   179 +
 core/media/editors/tinymce/langs/ta.js        |   230 +
 core/media/editors/tinymce/langs/th.js        |   230 +
 core/media/editors/tinymce/langs/tr.js        |   179 +
 core/media/editors/tinymce/langs/ug.js        |   179 +
 core/media/editors/tinymce/langs/uk.js        |   230 +
 core/media/editors/tinymce/langs/vi.js        |   179 +
 core/media/editors/tinymce/langs/zh-CN.js     |   230 +
 core/media/editors/tinymce/langs/zh-TW.js     |   179 +
 core/media/editors/tinymce/license.txt        |   504 +
 .../tinymce/plugins/advlist/plugin.min.js     |     1 +
 .../tinymce/plugins/anchor/plugin.min.js      |     1 +
 .../tinymce/plugins/autolink/plugin.min.js    |     1 +
 .../tinymce/plugins/autoresize/plugin.min.js  |     1 +
 .../tinymce/plugins/autosave/plugin.min.js    |     1 +
 .../tinymce/plugins/bbcode/plugin.min.js      |     1 +
 .../tinymce/plugins/charmap/plugin.min.js     |     1 +
 .../tinymce/plugins/code/plugin.min.js        |     1 +
 .../tinymce/plugins/codesample/css/prism.css  |   138 +
 .../tinymce/plugins/codesample/plugin.min.js  |     1 +
 .../tinymce/plugins/colorpicker/plugin.min.js |     1 +
 .../tinymce/plugins/contextmenu/plugin.min.js |     1 +
 .../plugins/directionality/plugin.min.js      |     1 +
 .../plugins/emoticons/img/smiley-cool.gif     |   Bin 0 -> 354 bytes
 .../plugins/emoticons/img/smiley-cry.gif      |   Bin 0 -> 329 bytes
 .../emoticons/img/smiley-embarassed.gif       |   Bin 0 -> 331 bytes
 .../emoticons/img/smiley-foot-in-mouth.gif    |   Bin 0 -> 342 bytes
 .../plugins/emoticons/img/smiley-frown.gif    |   Bin 0 -> 340 bytes
 .../plugins/emoticons/img/smiley-innocent.gif |   Bin 0 -> 336 bytes
 .../plugins/emoticons/img/smiley-kiss.gif     |   Bin 0 -> 338 bytes
 .../plugins/emoticons/img/smiley-laughing.gif |   Bin 0 -> 343 bytes
 .../emoticons/img/smiley-money-mouth.gif      |   Bin 0 -> 321 bytes
 .../plugins/emoticons/img/smiley-sealed.gif   |   Bin 0 -> 323 bytes
 .../plugins/emoticons/img/smiley-smile.gif    |   Bin 0 -> 344 bytes
 .../emoticons/img/smiley-surprised.gif        |   Bin 0 -> 338 bytes
 .../emoticons/img/smiley-tongue-out.gif       |   Bin 0 -> 328 bytes
 .../emoticons/img/smiley-undecided.gif        |   Bin 0 -> 337 bytes
 .../plugins/emoticons/img/smiley-wink.gif     |   Bin 0 -> 350 bytes
 .../plugins/emoticons/img/smiley-yell.gif     |   Bin 0 -> 336 bytes
 .../tinymce/plugins/emoticons/plugin.min.js   |     1 +
 .../tinymce/plugins/example/dialog.html       |     8 +
 .../tinymce/plugins/example/plugin.min.js     |     1 +
 .../plugins/example_dependency/plugin.min.js  |     1 +
 .../tinymce/plugins/fullpage/plugin.min.js    |     1 +
 .../tinymce/plugins/fullscreen/plugin.min.js  |     1 +
 .../editors/tinymce/plugins/hr/plugin.min.js  |     1 +
 .../tinymce/plugins/image/plugin.min.js       |     1 +
 .../tinymce/plugins/imagetools/plugin.min.js  |     1 +
 .../tinymce/plugins/importcss/plugin.min.js   |     1 +
 .../plugins/insertdatetime/plugin.min.js      |     1 +
 .../tinymce/plugins/layer/plugin.min.js       |     1 +
 .../plugins/legacyoutput/plugin.min.js        |     1 +
 .../tinymce/plugins/link/plugin.min.js        |     1 +
 .../tinymce/plugins/lists/plugin.min.js       |     1 +
 .../tinymce/plugins/media/plugin.min.js       |     1 +
 .../tinymce/plugins/nonbreaking/plugin.min.js |     1 +
 .../tinymce/plugins/noneditable/plugin.min.js |     1 +
 .../tinymce/plugins/pagebreak/plugin.min.js   |     1 +
 .../tinymce/plugins/paste/plugin.min.js       |     1 +
 .../tinymce/plugins/preview/plugin.min.js     |     1 +
 .../tinymce/plugins/print/plugin.min.js       |     1 +
 .../tinymce/plugins/save/plugin.min.js        |     1 +
 .../plugins/searchreplace/plugin.min.js       |     1 +
 .../plugins/spellchecker/plugin.min.js        |     1 +
 .../tinymce/plugins/tabfocus/plugin.min.js    |     1 +
 .../tinymce/plugins/table/plugin.min.js       |     2 +
 .../tinymce/plugins/template/plugin.min.js    |     1 +
 .../tinymce/plugins/textcolor/plugin.min.js   |     1 +
 .../tinymce/plugins/textpattern/plugin.min.js |     1 +
 .../editors/tinymce/plugins/toc/plugin.min.js |     1 +
 .../plugins/visualblocks/css/visualblocks.css |   135 +
 .../plugins/visualblocks/plugin.min.js        |     1 +
 .../tinymce/plugins/visualchars/plugin.min.js |     1 +
 .../tinymce/plugins/wordcount/plugin.min.js   |     1 +
 .../skins/lightgray/content.inline.min.css    |     1 +
 .../tinymce/skins/lightgray/content.min.css   |     1 +
 .../skins/lightgray/fonts/tinymce-small.eot   |   Bin 0 -> 9492 bytes
 .../skins/lightgray/fonts/tinymce-small.svg   |    63 +
 .../skins/lightgray/fonts/tinymce-small.ttf   |   Bin 0 -> 9304 bytes
 .../skins/lightgray/fonts/tinymce-small.woff  |   Bin 0 -> 9380 bytes
 .../tinymce/skins/lightgray/fonts/tinymce.eot |   Bin 0 -> 17572 bytes
 .../tinymce/skins/lightgray/fonts/tinymce.svg |   131 +
 .../tinymce/skins/lightgray/fonts/tinymce.ttf |   Bin 0 -> 17408 bytes
 .../skins/lightgray/fonts/tinymce.woff        |   Bin 0 -> 17484 bytes
 .../tinymce/skins/lightgray/img/anchor.gif    |   Bin 0 -> 53 bytes
 .../tinymce/skins/lightgray/img/loader.gif    |   Bin 0 -> 2608 bytes
 .../tinymce/skins/lightgray/img/object.gif    |   Bin 0 -> 152 bytes
 .../tinymce/skins/lightgray/img/trans.gif     |   Bin 0 -> 43 bytes
 .../tinymce/skins/lightgray/skin.ie7.min.css  |     1 +
 .../tinymce/skins/lightgray/skin.min.css      |     1 +
 .../editors/tinymce/templates/layout1.html    |    15 +
 .../editors/tinymce/templates/snippet1.html   |     1 +
 .../tinymce/themes/modern/theme.min.js        |     1 +
 core/media/editors/tinymce/tinymce.min.js     |    14 +
 core/media/index.html                         |     1 +
 core/media/jui/css/bootstrap-extended.css     |   498 +
 core/media/jui/css/bootstrap-responsive.css   |  1090 ++
 .../jui/css/bootstrap-responsive.min.css      |     9 +
 core/media/jui/css/bootstrap-rtl.css          |   619 +
 .../jui/css/bootstrap-tooltip-extended.css    |    37 +
 core/media/jui/css/bootstrap.css              |  6192 +++++++
 core/media/jui/css/bootstrap.min.css          |     9 +
 core/media/jui/css/chosen-sprite.png          |   Bin 0 -> 538 bytes
 core/media/jui/css/chosen-sprite@2x.png       |   Bin 0 -> 738 bytes
 core/media/jui/css/chosen.css                 |   433 +
 core/media/jui/css/icomoon.css                |   742 +
 core/media/jui/css/jquery.minicolors.css      |   335 +
 core/media/jui/css/jquery.searchtools.css     |    93 +
 core/media/jui/css/jquery.simplecolors.css    |    80 +
 core/media/jui/css/sortablelist.css           |    78 +
 .../media/jui/fonts/IcoMoon.dev.commented.svg |   283 +
 core/media/jui/fonts/IcoMoon.dev.svg          |   223 +
 core/media/jui/fonts/IcoMoon.eot              |   Bin 0 -> 25208 bytes
 core/media/jui/fonts/IcoMoon.svg              |   223 +
 core/media/jui/fonts/IcoMoon.ttf              |   Bin 0 -> 25044 bytes
 core/media/jui/fonts/IcoMoon.woff             |   Bin 0 -> 25424 bytes
 core/media/jui/fonts/icomoon-license.txt      |     2 +
 core/media/jui/images/ajax-loader.gif         |   Bin 0 -> 9933 bytes
 core/media/jui/img/ajax-loader.gif            |   Bin 0 -> 9933 bytes
 core/media/jui/img/alpha.png                  |   Bin 0 -> 438 bytes
 core/media/jui/img/bg-overlay.png             |   Bin 0 -> 137 bytes
 .../jui/img/glyphicons-halflings-white.png    |   Bin 0 -> 8743 bytes
 core/media/jui/img/glyphicons-halflings.png   |   Bin 0 -> 12600 bytes
 core/media/jui/img/hue.png                    |   Bin 0 -> 173 bytes
 core/media/jui/img/joomla.png                 |   Bin 0 -> 4762 bytes
 core/media/jui/img/jquery.minicolors.png      |   Bin 0 -> 68255 bytes
 core/media/jui/img/saturation.png             |   Bin 0 -> 4028 bytes
 core/media/jui/js/ajax-chosen.js              |   130 +
 core/media/jui/js/ajax-chosen.min.js          |    17 +
 .../jui/js/bootstrap-tooltip-extended.js      |   170 +
 .../jui/js/bootstrap-tooltip-extended.min.js  |     6 +
 core/media/jui/js/bootstrap.js                |  2338 +++
 core/media/jui/js/bootstrap.min.js            |     8 +
 core/media/jui/js/chosen.jquery.js            |  1349 ++
 core/media/jui/js/chosen.jquery.min.js        |     2 +
 core/media/jui/js/cms-uncompressed.js         |   213 +
 core/media/jui/js/cms.js                      |     1 +
 core/media/jui/js/fielduser.js                |   144 +
 core/media/jui/js/fielduser.min.js            |     1 +
 core/media/jui/js/html5-uncompressed.js       |   326 +
 core/media/jui/js/html5.js                    |     4 +
 core/media/jui/js/icomoon-lte-ie7.js          |   317 +
 core/media/jui/js/jquery-migrate.js           |   752 +
 core/media/jui/js/jquery-migrate.min.js       |     2 +
 core/media/jui/js/jquery-noconflict.js        |     1 +
 core/media/jui/js/jquery.autocomplete.js      |   998 ++
 core/media/jui/js/jquery.autocomplete.min.js  |     8 +
 core/media/jui/js/jquery.js                   | 11008 +++++++++++++
 core/media/jui/js/jquery.min.js               |     5 +
 core/media/jui/js/jquery.minicolors.js        |  1135 ++
 core/media/jui/js/jquery.minicolors.min.js    |    11 +
 core/media/jui/js/jquery.searchtools.js       |   410 +
 core/media/jui/js/jquery.searchtools.min.js   |     1 +
 core/media/jui/js/jquery.simplecolors.js      |   193 +
 core/media/jui/js/jquery.simplecolors.min.js  |     6 +
 core/media/jui/js/jquery.ui.core.js           |  1531 ++
 core/media/jui/js/jquery.ui.core.min.js       |     5 +
 core/media/jui/js/jquery.ui.sortable.js       |  1098 ++
 core/media/jui/js/jquery.ui.sortable.min.js   |    17 +
 core/media/jui/js/sortablelist.js             |   283 +
 core/media/jui/js/treeselectmenu.jquery.js    |   121 +
 .../media/jui/js/treeselectmenu.jquery.min.js |     5 +
 core/media/jui/less/accordion.less            |    34 +
 core/media/jui/less/alerts.less               |    80 +
 core/media/jui/less/bootstrap-extended.less   |   555 +
 core/media/jui/less/bootstrap-rtl.less        |   634 +
 core/media/jui/less/bootstrap.less            |    71 +
 core/media/jui/less/breadcrumbs.less          |    24 +
 core/media/jui/less/button-groups.less        |   229 +
 core/media/jui/less/buttons.less              |   228 +
 core/media/jui/less/carousel.less             |   158 +
 core/media/jui/less/close.less                |    47 +
 core/media/jui/less/code.less                 |    61 +
 core/media/jui/less/component-animations.less |    22 +
 core/media/jui/less/dropdowns.less            |   261 +
 core/media/jui/less/forms.less                |   728 +
 core/media/jui/less/grid.less                 |    21 +
 core/media/jui/less/hero-unit.less            |    25 +
 core/media/jui/less/icomoon.less              |   754 +
 core/media/jui/less/labels-badges.less        |    84 +
 core/media/jui/less/layouts.less              |    16 +
 core/media/jui/less/media.less                |    55 +
 core/media/jui/less/mixins.less               |   707 +
 core/media/jui/less/modals.joomla.less        |    65 +
 core/media/jui/less/modals.less               |    82 +
 core/media/jui/less/navbar.less               |   502 +
 core/media/jui/less/navs.less                 |   409 +
 core/media/jui/less/pager.less                |    43 +
 core/media/jui/less/pagination.less           |   123 +
 core/media/jui/less/popovers.less             |   133 +
 core/media/jui/less/progress-bars.less        |   122 +
 core/media/jui/less/reset.less                |   217 +
 .../media/jui/less/responsive-1200px-min.less |    28 +
 .../jui/less/responsive-767px-max.joomla.less |    43 +
 core/media/jui/less/responsive-767px-max.less |   202 +
 .../jui/less/responsive-768px-979px.less      |    19 +
 core/media/jui/less/responsive-navbar.less    |   189 +
 core/media/jui/less/responsive-utilities.less |    59 +
 core/media/jui/less/responsive.less           |    48 +
 core/media/jui/less/scaffolding.less          |    53 +
 core/media/jui/less/sprites.less              |   197 +
 core/media/jui/less/tables.less               |   255 +
 core/media/jui/less/thumbnails.less           |    53 +
 core/media/jui/less/tooltip.less              |    70 +
 core/media/jui/less/type.less                 |   247 +
 core/media/jui/less/utilities.less            |    30 +
 core/media/jui/less/variables.less            |   300 +
 core/media/jui/less/wells.less                |    29 +
 core/media/mailto/images/close-x.png          |   Bin 0 -> 114 bytes
 core/media/media/css/background.png           |   Bin 0 -> 166 bytes
 core/media/media/css/bigplay.fw.png           |   Bin 0 -> 79426 bytes
 core/media/media/css/bigplay.png              |   Bin 0 -> 3001 bytes
 core/media/media/css/bigplay.svg              |    14 +
 core/media/media/css/controls-ted.png         |   Bin 0 -> 1559 bytes
 core/media/media/css/controls-wmp-bg.png      |   Bin 0 -> 1960 bytes
 core/media/media/css/controls-wmp.png         |   Bin 0 -> 5511 bytes
 core/media/media/css/controls.fw.png          |   Bin 0 -> 80753 bytes
 core/media/media/css/controls.png             |   Bin 0 -> 1892 bytes
 core/media/media/css/controls.svg             |     1 +
 core/media/media/css/jumpforward.png          |   Bin 0 -> 1563 bytes
 core/media/media/css/loading.gif              |   Bin 0 -> 6224 bytes
 core/media/media/css/mediaelementplayer.css   |  1008 ++
 .../media/css/mediaelementplayer.min.css      |     1 +
 core/media/media/css/medialist-details.css    |    37 +
 .../media/media/css/medialist-details_rtl.css |    23 +
 core/media/media/css/medialist-thumbs.css     |    99 +
 core/media/media/css/medialist-thumbs_rtl.css |    10 +
 core/media/media/css/mediamanager.css         |   180 +
 core/media/media/css/mediamanager_rtl.css     |    82 +
 core/media/media/css/mejs-skins.css           |   289 +
 core/media/media/css/popup-imagelist.css      |   223 +
 core/media/media/css/popup-imagelist_rtl.css  |     8 +
 core/media/media/css/popup-imagemanager.css   |   199 +
 .../media/css/popup-imagemanager_rtl.css      |   125 +
 core/media/media/css/skipback.png             |   Bin 0 -> 4245 bytes
 core/media/media/images/bar.gif               |   Bin 0 -> 163 bytes
 core/media/media/images/con_info.png          |   Bin 0 -> 616 bytes
 core/media/media/images/delete.png            |   Bin 0 -> 626 bytes
 core/media/media/images/dots.gif              |   Bin 0 -> 151 bytes
 core/media/media/images/failed.png            |   Bin 0 -> 1296 bytes
 core/media/media/images/folder.gif            |   Bin 0 -> 1293 bytes
 core/media/media/images/folder.png            |   Bin 0 -> 1779 bytes
 core/media/media/images/folder_sm.png         |   Bin 0 -> 491 bytes
 core/media/media/images/folderup_16.png       |   Bin 0 -> 487 bytes
 core/media/media/images/folderup_32.png       |   Bin 0 -> 1670 bytes
 core/media/media/images/mime-icon-16/avi.png  |   Bin 0 -> 500 bytes
 core/media/media/images/mime-icon-16/doc.png  |   Bin 0 -> 384 bytes
 core/media/media/images/mime-icon-16/mov.png  |   Bin 0 -> 507 bytes
 core/media/media/images/mime-icon-16/mp3.png  |   Bin 0 -> 649 bytes
 core/media/media/images/mime-icon-16/mp4.png  |   Bin 0 -> 500 bytes
 core/media/media/images/mime-icon-16/odc.png  |   Bin 0 -> 513 bytes
 core/media/media/images/mime-icon-16/odd.png  |   Bin 0 -> 538 bytes
 core/media/media/images/mime-icon-16/odt.png  |   Bin 0 -> 411 bytes
 core/media/media/images/mime-icon-16/ogg.png  |   Bin 0 -> 648 bytes
 core/media/media/images/mime-icon-16/pdf.png  |   Bin 0 -> 451 bytes
 core/media/media/images/mime-icon-16/ppt.png  |   Bin 0 -> 436 bytes
 core/media/media/images/mime-icon-16/rar.png  |   Bin 0 -> 494 bytes
 core/media/media/images/mime-icon-16/rtf.png  |   Bin 0 -> 374 bytes
 core/media/media/images/mime-icon-16/svg.png  |   Bin 0 -> 464 bytes
 core/media/media/images/mime-icon-16/sxd.png  |   Bin 0 -> 532 bytes
 core/media/media/images/mime-icon-16/tar.png  |   Bin 0 -> 500 bytes
 core/media/media/images/mime-icon-16/tgz.png  |   Bin 0 -> 501 bytes
 core/media/media/images/mime-icon-16/wma.png  |   Bin 0 -> 398 bytes
 core/media/media/images/mime-icon-16/wmv.png  |   Bin 0 -> 512 bytes
 core/media/media/images/mime-icon-16/xls.png  |   Bin 0 -> 472 bytes
 core/media/media/images/mime-icon-16/zip.png  |   Bin 0 -> 506 bytes
 core/media/media/images/mime-icon-32/avi.png  |   Bin 0 -> 1217 bytes
 core/media/media/images/mime-icon-32/doc.png  |   Bin 0 -> 863 bytes
 core/media/media/images/mime-icon-32/mov.png  |   Bin 0 -> 1192 bytes
 core/media/media/images/mime-icon-32/mp3.png  |   Bin 0 -> 1611 bytes
 core/media/media/images/mime-icon-32/mp4.png  |   Bin 0 -> 1217 bytes
 core/media/media/images/mime-icon-32/odc.png  |   Bin 0 -> 1112 bytes
 core/media/media/images/mime-icon-32/odd.png  |   Bin 0 -> 1252 bytes
 core/media/media/images/mime-icon-32/odt.png  |   Bin 0 -> 995 bytes
 core/media/media/images/mime-icon-32/ogg.png  |   Bin 0 -> 1608 bytes
 core/media/media/images/mime-icon-32/pdf.png  |   Bin 0 -> 957 bytes
 core/media/media/images/mime-icon-32/ppt.png  |   Bin 0 -> 988 bytes
 core/media/media/images/mime-icon-32/rar.png  |   Bin 0 -> 1059 bytes
 core/media/media/images/mime-icon-32/rtf.png  |   Bin 0 -> 877 bytes
 core/media/media/images/mime-icon-32/svg.png  |   Bin 0 -> 926 bytes
 core/media/media/images/mime-icon-32/sxd.png  |   Bin 0 -> 1263 bytes
 core/media/media/images/mime-icon-32/tar.png  |   Bin 0 -> 1053 bytes
 core/media/media/images/mime-icon-32/tgz.png  |   Bin 0 -> 1056 bytes
 core/media/media/images/mime-icon-32/wma.png  |   Bin 0 -> 746 bytes
 core/media/media/images/mime-icon-32/wmv.png  |   Bin 0 -> 1200 bytes
 core/media/media/images/mime-icon-32/xls.png  |   Bin 0 -> 1093 bytes
 core/media/media/images/mime-icon-32/zip.png  |   Bin 0 -> 1063 bytes
 core/media/media/images/progress.gif          |   Bin 0 -> 1109 bytes
 core/media/media/images/remove.png            |   Bin 0 -> 428 bytes
 core/media/media/images/success.png           |   Bin 0 -> 1775 bytes
 core/media/media/images/upload.png            |   Bin 0 -> 681 bytes
 core/media/media/images/uploading.png         |   Bin 0 -> 1126 bytes
 core/media/media/js/flashmediaelement-cdn.swf |   Bin 0 -> 130167 bytes
 core/media/media/js/flashmediaelement.swf     |   Bin 0 -> 130149 bytes
 .../media/media/js/mediaelement-and-player.js |  5988 +++++++
 .../media/js/mediaelement-and-player.min.js   |    28 +
 core/media/media/js/mediafield-mootools.js    |    63 +
 .../media/media/js/mediafield-mootools.min.js |     1 +
 core/media/media/js/mediafield.js             |   267 +
 core/media/media/js/mediafield.min.js         |     1 +
 core/media/media/js/mediamanager.js           |   191 +
 core/media/media/js/mediamanager.min.js       |     1 +
 core/media/media/js/popup-imagemanager.js     |   335 +
 core/media/media/js/popup-imagemanager.min.js |     1 +
 .../media/js/silverlightmediaelement.xap      |   Bin 0 -> 12459 bytes
 core/media/mod_languages/css/template.css     |    25 +
 core/media/mod_languages/images/af.gif        |   Bin 0 -> 532 bytes
 core/media/mod_languages/images/af_za.gif     |   Bin 0 -> 532 bytes
 core/media/mod_languages/images/al.gif        |   Bin 0 -> 1164 bytes
 core/media/mod_languages/images/ar.gif        |   Bin 0 -> 1001 bytes
 core/media/mod_languages/images/ar_aa.gif     |   Bin 0 -> 1001 bytes
 core/media/mod_languages/images/at.gif        |   Bin 0 -> 83 bytes
 core/media/mod_languages/images/az.gif        |   Bin 0 -> 168 bytes
 core/media/mod_languages/images/az_az.gif     |   Bin 0 -> 168 bytes
 core/media/mod_languages/images/be.gif        |   Bin 0 -> 592 bytes
 core/media/mod_languages/images/be_by.gif     |   Bin 0 -> 592 bytes
 core/media/mod_languages/images/belg.gif      |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/bg.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/bg_bg.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/bn.gif        |   Bin 0 -> 89 bytes
 core/media/mod_languages/images/bn_bd.gif     |   Bin 0 -> 89 bytes
 core/media/mod_languages/images/br.gif        |   Bin 0 -> 94 bytes
 core/media/mod_languages/images/br_fr.gif     |   Bin 0 -> 94 bytes
 core/media/mod_languages/images/bs.gif        |   Bin 0 -> 312 bytes
 core/media/mod_languages/images/bs_ba.gif     |   Bin 0 -> 312 bytes
 core/media/mod_languages/images/ca.gif        |   Bin 0 -> 66 bytes
 core/media/mod_languages/images/ca_es.gif     |   Bin 0 -> 66 bytes
 core/media/mod_languages/images/cbk_iq.gif    |   Bin 0 -> 285 bytes
 core/media/mod_languages/images/ch.gif        |   Bin 0 -> 373 bytes
 core/media/mod_languages/images/cs.gif        |   Bin 0 -> 177 bytes
 core/media/mod_languages/images/cs_cz.gif     |   Bin 0 -> 177 bytes
 core/media/mod_languages/images/cy.gif        |   Bin 0 -> 999 bytes
 core/media/mod_languages/images/cy_gb.gif     |   Bin 0 -> 999 bytes
 core/media/mod_languages/images/cz.gif        |   Bin 0 -> 177 bytes
 core/media/mod_languages/images/cz_cz.gif     |   Bin 0 -> 177 bytes
 core/media/mod_languages/images/da.gif        |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/da_dk.gif     |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/de.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/de_at.gif     |   Bin 0 -> 97 bytes
 core/media/mod_languages/images/de_ch.gif     |   Bin 0 -> 377 bytes
 core/media/mod_languages/images/de_de.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/de_li.gif     |   Bin 0 -> 1297 bytes
 core/media/mod_languages/images/de_lu.gif     |   Bin 0 -> 1141 bytes
 core/media/mod_languages/images/dk.gif        |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/dz_bt.gif     |   Bin 0 -> 925 bytes
 core/media/mod_languages/images/el.gif        |   Bin 0 -> 56 bytes
 core/media/mod_languages/images/el_gr.gif     |   Bin 0 -> 56 bytes
 core/media/mod_languages/images/en.gif        |   Bin 0 -> 1027 bytes
 core/media/mod_languages/images/en_au.gif     |   Bin 0 -> 1282 bytes
 core/media/mod_languages/images/en_ca.gif     |   Bin 0 -> 341 bytes
 core/media/mod_languages/images/en_gb.gif     |   Bin 0 -> 1027 bytes
 core/media/mod_languages/images/en_nz.gif     |   Bin 0 -> 539 bytes
 core/media/mod_languages/images/en_us.gif     |   Bin 0 -> 90 bytes
 core/media/mod_languages/images/eo.gif        |   Bin 0 -> 177 bytes
 core/media/mod_languages/images/eo_xx.gif     |   Bin 0 -> 177 bytes
 core/media/mod_languages/images/es.gif        |   Bin 0 -> 169 bytes
 core/media/mod_languages/images/es_co.gif     |   Bin 0 -> 851 bytes
 core/media/mod_languages/images/es_es.gif     |   Bin 0 -> 169 bytes
 core/media/mod_languages/images/et.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/et_ee.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/eu_es.gif     |   Bin 0 -> 1290 bytes
 core/media/mod_languages/images/fa.gif        |   Bin 0 -> 318 bytes
 core/media/mod_languages/images/fa_ir.gif     |   Bin 0 -> 318 bytes
 core/media/mod_languages/images/fi.gif        |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/fi_fi.gif     |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/fr.gif        |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/fr_ca.gif     |   Bin 0 -> 145 bytes
 core/media/mod_languages/images/fr_fr.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/ga_ie.gif     |   Bin 0 -> 1380 bytes
 core/media/mod_languages/images/gd.gif        |   Bin 0 -> 179 bytes
 core/media/mod_languages/images/gd_gb.gif     |   Bin 0 -> 179 bytes
 core/media/mod_languages/images/gl.gif        |   Bin 0 -> 1411 bytes
 core/media/mod_languages/images/gl_es.gif     |   Bin 0 -> 1411 bytes
 core/media/mod_languages/images/he.gif        |   Bin 0 -> 68 bytes
 core/media/mod_languages/images/he_il.gif     |   Bin 0 -> 68 bytes
 core/media/mod_languages/images/hi.gif        |   Bin 0 -> 115 bytes
 core/media/mod_languages/images/hi_in.gif     |   Bin 0 -> 115 bytes
 core/media/mod_languages/images/hk.gif        |   Bin 0 -> 332 bytes
 core/media/mod_languages/images/hk_hk.gif     |   Bin 0 -> 332 bytes
 core/media/mod_languages/images/hr.gif        |   Bin 0 -> 294 bytes
 core/media/mod_languages/images/hr_hr.gif     |   Bin 0 -> 294 bytes
 core/media/mod_languages/images/hu.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/hu_hu.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/hy.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/hy_am.gif     |   Bin 0 -> 62 bytes
 .../mod_languages/images/icon-16-language.png |   Bin 0 -> 668 bytes
 core/media/mod_languages/images/id.gif        |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/id_id.gif     |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/is.gif        |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/is_is.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/it.gif        |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/it_it.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/ja.gif        |   Bin 0 -> 89 bytes
 core/media/mod_languages/images/ja_jp.gif     |   Bin 0 -> 89 bytes
 core/media/mod_languages/images/ka.gif        |   Bin 0 -> 67 bytes
 core/media/mod_languages/images/ka_ge.gif     |   Bin 0 -> 67 bytes
 core/media/mod_languages/images/km.gif        |   Bin 0 -> 127 bytes
 core/media/mod_languages/images/km_kh.gif     |   Bin 0 -> 127 bytes
 core/media/mod_languages/images/ko.gif        |   Bin 0 -> 522 bytes
 core/media/mod_languages/images/ko_kr.gif     |   Bin 0 -> 522 bytes
 core/media/mod_languages/images/ku.gif        |   Bin 0 -> 285 bytes
 core/media/mod_languages/images/lo.gif        |   Bin 0 -> 1037 bytes
 core/media/mod_languages/images/lo_la.gif     |   Bin 0 -> 1037 bytes
 core/media/mod_languages/images/lt.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/lt_lt.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/lv.gif        |   Bin 0 -> 50 bytes
 core/media/mod_languages/images/lv_lv.gif     |   Bin 0 -> 50 bytes
 core/media/mod_languages/images/mk.gif        |   Bin 0 -> 402 bytes
 core/media/mod_languages/images/mk_mk.gif     |   Bin 0 -> 402 bytes
 core/media/mod_languages/images/mn.gif        |   Bin 0 -> 182 bytes
 core/media/mod_languages/images/mn_mn.gif     |   Bin 0 -> 182 bytes
 core/media/mod_languages/images/ms_my.gif     |   Bin 0 -> 1266 bytes
 core/media/mod_languages/images/nb_no.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/nl.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/nl_be.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/nl_nl.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/nn_no.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/no.gif        |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/pl.gif        |   Bin 0 -> 52 bytes
 core/media/mod_languages/images/pl_pl.gif     |   Bin 0 -> 52 bytes
 core/media/mod_languages/images/prs_af.gif    |   Bin 0 -> 198 bytes
 core/media/mod_languages/images/ps.gif        |   Bin 0 -> 198 bytes
 core/media/mod_languages/images/ps_af.gif     |   Bin 0 -> 198 bytes
 core/media/mod_languages/images/pt.gif        |   Bin 0 -> 286 bytes
 core/media/mod_languages/images/pt_br.gif     |   Bin 0 -> 192 bytes
 core/media/mod_languages/images/pt_pt.gif     |   Bin 0 -> 286 bytes
 core/media/mod_languages/images/ro.gif        |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/ro_ro.gif     |   Bin 0 -> 74 bytes
 core/media/mod_languages/images/ru.gif        |   Bin 0 -> 94 bytes
 core/media/mod_languages/images/ru_ru.gif     |   Bin 0 -> 94 bytes
 core/media/mod_languages/images/si.gif        |   Bin 0 -> 197 bytes
 core/media/mod_languages/images/si_lk.gif     |   Bin 0 -> 197 bytes
 core/media/mod_languages/images/sk.gif        |   Bin 0 -> 295 bytes
 core/media/mod_languages/images/sk_sk.gif     |   Bin 0 -> 295 bytes
 core/media/mod_languages/images/sl.gif        |   Bin 0 -> 170 bytes
 core/media/mod_languages/images/sl_si.gif     |   Bin 0 -> 170 bytes
 core/media/mod_languages/images/sq_al.gif     |   Bin 0 -> 1164 bytes
 core/media/mod_languages/images/sr.gif        |   Bin 0 -> 289 bytes
 core/media/mod_languages/images/sr_rs.gif     |   Bin 0 -> 289 bytes
 core/media/mod_languages/images/sr_yu.gif     |   Bin 0 -> 289 bytes
 core/media/mod_languages/images/srp_me.gif    |   Bin 0 -> 304 bytes
 core/media/mod_languages/images/sv.gif        |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/sv_se.gif     |   Bin 0 -> 60 bytes
 core/media/mod_languages/images/sw.gif        |   Bin 0 -> 1269 bytes
 core/media/mod_languages/images/sw_ke.gif     |   Bin 0 -> 1269 bytes
 core/media/mod_languages/images/sy.gif        |   Bin 0 -> 1058 bytes
 core/media/mod_languages/images/sy_iq.gif     |   Bin 0 -> 1058 bytes
 core/media/mod_languages/images/ta.gif        |   Bin 0 -> 584 bytes
 core/media/mod_languages/images/ta_in.gif     |   Bin 0 -> 584 bytes
 core/media/mod_languages/images/th.gif        |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/th_th.gif     |   Bin 0 -> 62 bytes
 core/media/mod_languages/images/tk_tm.gif     |   Bin 0 -> 1608 bytes
 core/media/mod_languages/images/tr.gif        |   Bin 0 -> 280 bytes
 core/media/mod_languages/images/tr_tr.gif     |   Bin 0 -> 280 bytes
 core/media/mod_languages/images/tw.gif        |   Bin 0 -> 1026 bytes
 core/media/mod_languages/images/ug_cn.gif     |   Bin 0 -> 544 bytes
 core/media/mod_languages/images/uk.gif        |   Bin 0 -> 52 bytes
 core/media/mod_languages/images/uk_ua.gif     |   Bin 0 -> 52 bytes
 core/media/mod_languages/images/ur.gif        |   Bin 0 -> 308 bytes
 core/media/mod_languages/images/ur_pk.gif     |   Bin 0 -> 308 bytes
 core/media/mod_languages/images/us.gif        |   Bin 0 -> 89 bytes
 core/media/mod_languages/images/uz.gif        |   Bin 0 -> 321 bytes
 core/media/mod_languages/images/uz_uz.gif     |   Bin 0 -> 321 bytes
 core/media/mod_languages/images/vi.gif        |   Bin 0 -> 286 bytes
 core/media/mod_languages/images/vi_vn.gif     |   Bin 0 -> 286 bytes
 core/media/mod_languages/images/zh.gif        |   Bin 0 -> 161 bytes
 core/media/mod_languages/images/zh_cn.gif     |   Bin 0 -> 161 bytes
 core/media/mod_languages/images/zh_tw.gif     |   Bin 0 -> 1026 bytes
 .../mod_sampledata/js/sampledata-process.js   |    96 +
 core/media/overrider/css/overrider.css        |    52 +
 core/media/overrider/js/overrider.js          |   236 +
 core/media/overrider/js/overrider.min.js      |     1 +
 .../plg_captcha_recaptcha/js/recaptcha.js     |    20 +
 .../plg_captcha_recaptcha/js/recaptcha.min.js |     1 +
 .../js/extensionupdatecheck.js                |    46 +
 .../js/jupdatecheck.js                        |    53 +
 core/media/plg_system_highlight/highlight.css |     5 +
 core/media/plg_system_stats/js/stats.js       |    93 +
 core/media/system/css/adminlist.css           |   272 +
 core/media/system/css/calendar-jos.css        |   183 +
 core/media/system/css/fields/calendar-rtl.css |   157 +
 core/media/system/css/fields/calendar.css     |   156 +
 core/media/system/css/frontediting.css        |    33 +
 core/media/system/css/jquery.Jcrop.min.css    |     6 +
 core/media/system/css/modal.css               |   166 +
 core/media/system/css/mootree.css             |    28 +
 core/media/system/css/mootree_rtl.css         |     8 +
 core/media/system/css/system.css              |    69 +
 core/media/system/images/arrow.png            |   Bin 0 -> 107 bytes
 core/media/system/images/arrow_rtl.png        |   Bin 0 -> 91 bytes
 core/media/system/images/blank.png            |   Bin 0 -> 91 bytes
 core/media/system/images/calendar.png         |   Bin 0 -> 592 bytes
 core/media/system/images/checked_out.png      |   Bin 0 -> 390 bytes
 core/media/system/images/edit.png             |   Bin 0 -> 424 bytes
 core/media/system/images/edit_unpublished.png |   Bin 0 -> 538 bytes
 core/media/system/images/emailButton.png      |   Bin 0 -> 256 bytes
 core/media/system/images/icon-16-logout.png   |   Bin 0 -> 419 bytes
 core/media/system/images/icon_error.gif       |   Bin 0 -> 313 bytes
 core/media/system/images/indent.png           |   Bin 0 -> 89 bytes
 core/media/system/images/indent1.png          |   Bin 0 -> 95 bytes
 core/media/system/images/indent2.png          |   Bin 0 -> 95 bytes
 core/media/system/images/indent3.png          |   Bin 0 -> 97 bytes
 core/media/system/images/indent4.png          |   Bin 0 -> 91 bytes
 core/media/system/images/indent5.png          |   Bin 0 -> 91 bytes
 core/media/system/images/livemarks-rtl.png    |   Bin 0 -> 643 bytes
 core/media/system/images/livemarks.png        |   Bin 0 -> 642 bytes
 core/media/system/images/modal/bg_e.png       |   Bin 0 -> 92 bytes
 core/media/system/images/modal/bg_n.png       |   Bin 0 -> 97 bytes
 core/media/system/images/modal/bg_ne.png      |   Bin 0 -> 340 bytes
 core/media/system/images/modal/bg_nw.png      |   Bin 0 -> 327 bytes
 core/media/system/images/modal/bg_s.png       |   Bin 0 -> 96 bytes
 core/media/system/images/modal/bg_se.png      |   Bin 0 -> 336 bytes
 core/media/system/images/modal/bg_sw.png      |   Bin 0 -> 302 bytes
 core/media/system/images/modal/bg_w.png       |   Bin 0 -> 87 bytes
 core/media/system/images/modal/closebox.png   |   Bin 0 -> 1050 bytes
 core/media/system/images/modal/spinner.gif    |   Bin 0 -> 1569 bytes
 core/media/system/images/mooRainbow/blank.gif |   Bin 0 -> 37 bytes
 .../system/images/mooRainbow/moor_arrows.gif  |   Bin 0 -> 92 bytes
 .../images/mooRainbow/moor_boverlay.png       |   Bin 0 -> 579 bytes
 .../system/images/mooRainbow/moor_cursor.gif  |   Bin 0 -> 80 bytes
 .../system/images/mooRainbow/moor_slider.png  |   Bin 0 -> 161 bytes
 .../images/mooRainbow/moor_woverlay.png       |   Bin 0 -> 511 bytes
 core/media/system/images/mootree.gif          |   Bin 0 -> 1492 bytes
 core/media/system/images/mootree_loader.gif   |   Bin 0 -> 544 bytes
 core/media/system/images/new.png              |   Bin 0 -> 278 bytes
 core/media/system/images/no_indent.png        |   Bin 0 -> 81 bytes
 core/media/system/images/notice-alert.png     |   Bin 0 -> 862 bytes
 core/media/system/images/notice-download.png  |   Bin 0 -> 966 bytes
 core/media/system/images/notice-info.png      |   Bin 0 -> 1106 bytes
 core/media/system/images/notice-note.png      |   Bin 0 -> 771 bytes
 core/media/system/images/pdf_button.png       |   Bin 0 -> 386 bytes
 core/media/system/images/printButton.png      |   Bin 0 -> 228 bytes
 core/media/system/images/rating_star.png      |   Bin 0 -> 276 bytes
 .../media/system/images/rating_star_blank.png |   Bin 0 -> 162 bytes
 core/media/system/images/sort0.png            |   Bin 0 -> 151 bytes
 core/media/system/images/sort1.png            |   Bin 0 -> 160 bytes
 core/media/system/images/sort_asc.png         |   Bin 0 -> 109 bytes
 core/media/system/images/sort_desc.png        |   Bin 0 -> 104 bytes
 core/media/system/images/sort_none.png        |   Bin 0 -> 103 bytes
 core/media/system/images/tooltip.png          |   Bin 0 -> 464 bytes
 core/media/system/images/weblink.png          |   Bin 0 -> 786 bytes
 .../js/associations-edit-uncompressed.js      |    97 +
 core/media/system/js/associations-edit.js     |     1 +
 .../system/js/calendar-setup-uncompressed.js  |   201 +
 core/media/system/js/calendar-setup.js        |     1 +
 core/media/system/js/calendar-uncompressed.js |  1798 +++
 core/media/system/js/calendar.js              |     1 +
 core/media/system/js/caption-uncompressed.js  |    49 +
 core/media/system/js/caption.js               |     4 +
 core/media/system/js/color-field-adv-init.js  |    23 +
 .../system/js/color-field-adv-init.min.js     |     1 +
 core/media/system/js/color-field-init.js      |     7 +
 core/media/system/js/color-field-init.min.js  |     1 +
 core/media/system/js/combobox-uncompressed.js |   289 +
 core/media/system/js/combobox.js              |     1 +
 core/media/system/js/core-uncompressed.js     |   955 ++
 core/media/system/js/core.js                  |     1 +
 .../system/js/fields/calendar-locales/af.js   |    19 +
 .../system/js/fields/calendar-locales/ar.js   |    19 +
 .../system/js/fields/calendar-locales/bg.js   |    19 +
 .../system/js/fields/calendar-locales/bn.js   |    19 +
 .../system/js/fields/calendar-locales/bs.js   |    19 +
 .../system/js/fields/calendar-locales/ca.js   |    19 +
 .../system/js/fields/calendar-locales/cs.js   |    19 +
 .../system/js/fields/calendar-locales/cy.js   |    19 +
 .../system/js/fields/calendar-locales/da.js   |    19 +
 .../date/gregorian/date-helper.js             |   383 +
 .../date/gregorian/date-helper.min.js         |     1 +
 .../date/jalali/date-helper.js                |   623 +
 .../date/jalali/date-helper.min.js            |     1 +
 .../system/js/fields/calendar-locales/de.js   |    19 +
 .../system/js/fields/calendar-locales/el.js   |    19 +
 .../system/js/fields/calendar-locales/en.js   |    19 +
 .../system/js/fields/calendar-locales/es.js   |    19 +
 .../system/js/fields/calendar-locales/eu.js   |    19 +
 .../js/fields/calendar-locales/fa-ir.js       |    20 +
 .../system/js/fields/calendar-locales/fi.js   |    19 +
 .../system/js/fields/calendar-locales/fr.js   |    19 +
 .../system/js/fields/calendar-locales/ga.js   |    19 +
 .../system/js/fields/calendar-locales/hr.js   |    19 +
 .../system/js/fields/calendar-locales/hu.js   |    19 +
 .../system/js/fields/calendar-locales/it.js   |    19 +
 .../system/js/fields/calendar-locales/ja.js   |    19 +
 .../system/js/fields/calendar-locales/ka.js   |    19 +
 .../system/js/fields/calendar-locales/ko.js   |    19 +
 .../system/js/fields/calendar-locales/lt.js   |    19 +
 .../system/js/fields/calendar-locales/mk.js   |    19 +
 .../system/js/fields/calendar-locales/nb.js   |    19 +
 .../system/js/fields/calendar-locales/nl.js   |    19 +
 .../system/js/fields/calendar-locales/pl.js   |    19 +
 .../js/fields/calendar-locales/prs-af.js      |    20 +
 .../system/js/fields/calendar-locales/pt.js   |    19 +
 .../system/js/fields/calendar-locales/ru.js   |    19 +
 .../system/js/fields/calendar-locales/sk.js   |    19 +
 .../system/js/fields/calendar-locales/sl.js   |    19 +
 .../js/fields/calendar-locales/sr-rs.js       |    19 +
 .../js/fields/calendar-locales/sr-yu.js       |    19 +
 .../system/js/fields/calendar-locales/sv.js   |    19 +
 .../system/js/fields/calendar-locales/sw.js   |    19 +
 .../system/js/fields/calendar-locales/ta.js   |    19 +
 .../system/js/fields/calendar-locales/th.js   |    19 +
 .../system/js/fields/calendar-locales/uk.js   |    19 +
 .../js/fields/calendar-locales/zh-CN.js       |    19 +
 .../js/fields/calendar-locales/zh-TW.js       |    19 +
 core/media/system/js/fields/calendar.js       |  1247 ++
 core/media/system/js/fields/calendar.min.js   |     1 +
 .../system/js/frontediting-uncompressed.js    |   200 +
 core/media/system/js/frontediting.js          |     1 +
 core/media/system/js/helpsite.js              |    32 +
 .../system/js/highlighter-uncompressed.js     |   111 +
 core/media/system/js/highlighter.js           |     4 +
 .../system/js/html5fallback-uncompressed.js   |   541 +
 core/media/system/js/html5fallback.js         |     1 +
 core/media/system/js/jquery.Jcrop.js          |  2859 ++++
 core/media/system/js/jquery.Jcrop.min.js      |     6 +
 .../media/system/js/keepalive-uncompressed.js |    47 +
 core/media/system/js/keepalive.js             |     1 +
 .../system/js/modal-fields-uncompressed.js    |   191 +
 core/media/system/js/modal-fields.js          |     1 +
 core/media/system/js/modal-uncompressed.js    |   477 +
 core/media/system/js/modal.js                 |     7 +
 core/media/system/js/moduleorder.js           |    69 +
 .../system/js/mootools-core-uncompressed.js   |  5976 +++++++
 core/media/system/js/mootools-core.js         |   180 +
 .../system/js/mootools-more-uncompressed.js   | 13373 ++++++++++++++++
 core/media/system/js/mootools-more.js         |   820 +
 core/media/system/js/mootree-uncompressed.js  |   686 +
 core/media/system/js/mootree.js               |    12 +
 .../system/js/multiselect-uncompressed.js     |    43 +
 core/media/system/js/multiselect.js           |     4 +
 core/media/system/js/passwordstrength.js      |    99 +
 .../system/js/permissions-uncompressed.js     |   133 +
 core/media/system/js/permissions.js           |     1 +
 .../js/polyfill.classlist-uncompressed.js     |   378 +
 core/media/system/js/polyfill.classlist.js    |     1 +
 .../system/js/polyfill.event-uncompressed.js  |   474 +
 core/media/system/js/polyfill.event.js        |     1 +
 .../system/js/polyfill.filter-uncompressed.js |    45 +
 core/media/system/js/polyfill.filter.js       |     1 +
 .../system/js/polyfill.map-uncompressed.js    |    42 +
 core/media/system/js/polyfill.map.js          |     1 +
 .../system/js/polyfill.xpath-uncompressed.js  |    85 +
 core/media/system/js/polyfill.xpath.js        |    85 +
 .../system/js/progressbar-uncompressed.js     |   109 +
 core/media/system/js/progressbar.js           |     4 +
 core/media/system/js/punycode-uncompressed.js |   533 +
 core/media/system/js/punycode.js              |     2 +
 .../system/js/repeatable-uncompressed.js      |   537 +
 core/media/system/js/repeatable.js            |     1 +
 .../system/js/sendtestmail-uncompressed.js    |    55 +
 core/media/system/js/sendtestmail.js          |     1 +
 .../js/subform-repeatable-uncompressed.js     |   292 +
 core/media/system/js/subform-repeatable.js    |     1 +
 core/media/system/js/switcher-uncompressed.js |    93 +
 core/media/system/js/switcher.js              |     1 +
 .../system/js/tabs-state-uncompressed.js      |   243 +
 core/media/system/js/tabs-state.js            |     1 +
 core/media/system/js/tabs.js                  |    89 +
 core/media/system/js/validate-uncompressed.js |   240 +
 core/media/system/js/validate.js              |     1 +
 core/modules/index.html                       |     1 +
 core/modules/mod_articles_archive/helper.php  |    88 +
 .../mod_articles_archive.php                  |    19 +
 .../mod_articles_archive.xml                  |    82 +
 .../mod_articles_archive/tmpl/default.php     |    22 +
 .../mod_articles_categories/helper.php        |    50 +
 .../mod_articles_categories.php               |    36 +
 .../mod_articles_categories.xml               |   178 +
 .../mod_articles_categories/tmpl/default.php  |    14 +
 .../tmpl/default_items.php                    |    42 +
 core/modules/mod_articles_category/helper.php |   506 +
 .../mod_articles_category.php                 |    91 +
 .../mod_articles_category.xml                 |   564 +
 .../mod_articles_category/tmpl/default.php    |   141 +
 core/modules/mod_articles_latest/helper.php   |   138 +
 .../mod_articles_latest.php                   |    18 +
 .../mod_articles_latest.xml                   |   131 +
 .../mod_articles_latest/tmpl/default.php      |    22 +
 core/modules/mod_articles_news/helper.php     |   151 +
 .../mod_articles_news/mod_articles_news.php   |    18 +
 .../mod_articles_news/mod_articles_news.xml   |   253 +
 core/modules/mod_articles_news/tmpl/_item.php |    39 +
 .../mod_articles_news/tmpl/default.php        |    16 +
 .../mod_articles_news/tmpl/horizontal.php     |    23 +
 .../mod_articles_news/tmpl/vertical.php       |    23 +
 core/modules/mod_articles_popular/helper.php  |    98 +
 .../mod_articles_popular.php                  |    18 +
 .../mod_articles_popular.xml                  |   171 +
 .../mod_articles_popular/tmpl/default.php     |    22 +
 core/modules/mod_banners/helper.php           |    53 +
 core/modules/mod_banners/mod_banners.php      |    23 +
 core/modules/mod_banners/mod_banners.xml      |   154 +
 core/modules/mod_banners/tmpl/default.php     |   114 +
 core/modules/mod_breadcrumbs/helper.php       |   102 +
 .../mod_breadcrumbs/mod_breadcrumbs.php       |    23 +
 .../mod_breadcrumbs/mod_breadcrumbs.xml       |   127 +
 core/modules/mod_breadcrumbs/tmpl/default.php |    73 +
 core/modules/mod_custom/mod_custom.php        |    20 +
 core/modules/mod_custom/mod_custom.xml        |    95 +
 core/modules/mod_custom/tmpl/default.php      |    16 +
 core/modules/mod_feed/helper.php              |    52 +
 core/modules/mod_feed/mod_feed.php            |    31 +
 core/modules/mod_feed/mod_feed.xml            |   159 +
 core/modules/mod_feed/tmpl/default.php        |   122 +
 core/modules/mod_finder/helper.php            |    86 +
 core/modules/mod_finder/mod_finder.php        |    56 +
 core/modules/mod_finder/mod_finder.xml        |   177 +
 core/modules/mod_finder/tmpl/default.php      |   168 +
 core/modules/mod_footer/mod_footer.php        |    39 +
 core/modules/mod_footer/mod_footer.xml        |    70 +
 core/modules/mod_footer/tmpl/default.php      |    13 +
 core/modules/mod_languages/helper.php         |   147 +
 core/modules/mod_languages/mod_languages.php  |    20 +
 core/modules/mod_languages/mod_languages.xml  |   207 +
 core/modules/mod_languages/tmpl/default.php   |    86 +
 core/modules/mod_login/helper.php             |    75 +
 core/modules/mod_login/mod_login.php          |    29 +
 core/modules/mod_login/mod_login.xml          |   169 +
 core/modules/mod_login/tmpl/default.php       |   124 +
 .../modules/mod_login/tmpl/default_logout.php |    39 +
 core/modules/mod_menu/helper.php              |   225 +
 core/modules/mod_menu/mod_menu.php            |    28 +
 core/modules/mod_menu/mod_menu.xml            |   172 +
 core/modules/mod_menu/tmpl/default.php        |   101 +
 .../mod_menu/tmpl/default_component.php       |    60 +
 .../modules/mod_menu/tmpl/default_heading.php |    36 +
 .../mod_menu/tmpl/default_separator.php       |    36 +
 core/modules/mod_menu/tmpl/default_url.php    |    66 +
 core/modules/mod_random_image/helper.php      |   147 +
 .../mod_random_image/mod_random_image.php     |    29 +
 .../mod_random_image/mod_random_image.xml     |    94 +
 .../modules/mod_random_image/tmpl/default.php |    20 +
 core/modules/mod_related_items/helper.php     |   191 +
 .../mod_related_items/mod_related_items.php   |    32 +
 .../mod_related_items/mod_related_items.xml   |    86 +
 .../mod_related_items/tmpl/default.php        |    20 +
 core/modules/mod_search/helper.php            |    32 +
 core/modules/mod_search/mod_search.php        |    51 +
 core/modules/mod_search/mod_search.xml        |   175 +
 core/modules/mod_search/tmpl/default.php      |    68 +
 core/modules/mod_stats/helper.php             |   168 +
 core/modules/mod_stats/mod_stats.php          |    20 +
 core/modules/mod_stats/mod_stats.xml          |   120 +
 core/modules/mod_stats/tmpl/default.php       |    17 +
 core/modules/mod_syndicate/helper.php         |    44 +
 core/modules/mod_syndicate/mod_syndicate.php  |    27 +
 core/modules/mod_syndicate/mod_syndicate.xml  |    86 +
 core/modules/mod_syndicate/tmpl/default.php   |    24 +
 core/modules/mod_tags_popular/helper.php      |   143 +
 .../mod_tags_popular/mod_tags_popular.php     |    32 +
 .../mod_tags_popular/mod_tags_popular.xml     |   173 +
 core/modules/mod_tags_popular/tmpl/cloud.php  |    54 +
 .../modules/mod_tags_popular/tmpl/default.php |    30 +
 core/modules/mod_tags_similar/helper.php      |   172 +
 .../mod_tags_similar/mod_tags_similar.php     |    31 +
 .../mod_tags_similar/mod_tags_similar.xml     |   100 +
 .../modules/mod_tags_similar/tmpl/default.php |    35 +
 core/modules/mod_users_latest/helper.php      |    65 +
 .../mod_users_latest/mod_users_latest.php     |    19 +
 .../mod_users_latest/mod_users_latest.xml     |    94 +
 .../modules/mod_users_latest/tmpl/default.php |    20 +
 core/modules/mod_whosonline/helper.php        |   126 +
 .../modules/mod_whosonline/mod_whosonline.php |    29 +
 .../modules/mod_whosonline/mod_whosonline.xml |    89 +
 core/modules/mod_whosonline/tmpl/default.php  |    30 +
 core/modules/mod_wrapper/helper.php           |    69 +
 core/modules/mod_wrapper/mod_wrapper.php      |    28 +
 core/modules/mod_wrapper/mod_wrapper.xml      |   158 +
 core/modules/mod_wrapper/tmpl/default.php     |    25 +
 core/plugins/authentication/cookie/cookie.php |   405 +
 core/plugins/authentication/cookie/cookie.xml |    50 +
 core/plugins/authentication/gmail/gmail.php   |   239 +
 core/plugins/authentication/gmail/gmail.xml   |    80 +
 core/plugins/authentication/joomla/joomla.php |   221 +
 core/plugins/authentication/joomla/joomla.xml |    19 +
 core/plugins/authentication/ldap/ldap.php     |   204 +
 core/plugins/authentication/ldap/ldap.xml     |   163 +
 .../captcha/recaptcha/postinstall/actions.php |    57 +
 core/plugins/captcha/recaptcha/recaptcha.php  |   332 +
 core/plugins/captcha/recaptcha/recaptcha.xml  |   103 +
 .../captcha/recaptcha/recaptchalib.php        |   162 +
 core/plugins/content/contact/contact.php      |   112 +
 core/plugins/content/contact/contact.xml      |    23 +
 .../plugins/content/emailcloak/emailcloak.php |   502 +
 .../plugins/content/emailcloak/emailcloak.xml |    36 +
 core/plugins/content/fields/fields.php        |   168 +
 core/plugins/content/fields/fields.xml        |    21 +
 core/plugins/content/finder/finder.php        |   126 +
 core/plugins/content/finder/finder.xml        |    24 +
 core/plugins/content/joomla/joomla.php        |   302 +
 core/plugins/content/joomla/joomla.xml        |    51 +
 .../plugins/content/loadmodule/loadmodule.php |   190 +
 .../plugins/content/loadmodule/loadmodule.xml |    38 +
 core/plugins/content/pagebreak/pagebreak.php  |   381 +
 core/plugins/content/pagebreak/pagebreak.xml  |    98 +
 .../content/pagenavigation/pagenavigation.php |   263 +
 .../content/pagenavigation/pagenavigation.xml |    63 +
 .../content/pagenavigation/tmpl/default.php   |    31 +
 core/plugins/content/vote/tmpl/rating.php     |    53 +
 core/plugins/content/vote/tmpl/vote.php       |    45 +
 core/plugins/content/vote/vote.php            |   144 +
 core/plugins/content/vote/vote.xml            |    36 +
 core/plugins/editors-xtd/article/article.php  |    69 +
 core/plugins/editors-xtd/article/article.xml  |    19 +
 core/plugins/editors-xtd/contact/contact.php  |    59 +
 core/plugins/editors-xtd/contact/contact.xml  |    19 +
 core/plugins/editors-xtd/fields/fields.php    |    71 +
 core/plugins/editors-xtd/fields/fields.xml    |    19 +
 core/plugins/editors-xtd/image/image.php      |    75 +
 core/plugins/editors-xtd/image/image.xml      |    19 +
 core/plugins/editors-xtd/menu/menu.php        |    60 +
 core/plugins/editors-xtd/menu/menu.xml        |    19 +
 core/plugins/editors-xtd/module/module.php    |    62 +
 core/plugins/editors-xtd/module/module.xml    |    19 +
 .../editors-xtd/pagebreak/pagebreak.php       |    69 +
 .../editors-xtd/pagebreak/pagebreak.xml       |    19 +
 .../plugins/editors-xtd/readmore/readmore.php |    59 +
 .../plugins/editors-xtd/readmore/readmore.xml |    19 +
 .../plugins/editors/codemirror/codemirror.php |   392 +
 .../plugins/editors/codemirror/codemirror.xml |   362 +
 core/plugins/editors/codemirror/fonts.json    |   107 +
 core/plugins/editors/codemirror/fonts.php     |    52 +
 .../layouts/editors/codemirror/element.php    |    38 +
 .../layouts/editors/codemirror/init.php       |   102 +
 .../layouts/editors/codemirror/styles.php     |    69 +
 core/plugins/editors/none/none.php            |   155 +
 core/plugins/editors/none/none.xml            |    19 +
 core/plugins/editors/tinymce/field/skins.php  |    70 +
 .../editors/tinymce/field/tinymcebuilder.php  |   180 +
 .../editors/tinymce/field/uploaddirs.php      |    90 +
 .../editors/tinymce/form/setoptions.xml       |   301 +
 core/plugins/editors/tinymce/tinymce.php      |  2051 +++
 core/plugins/editors/tinymce/tinymce.xml      |    64 +
 core/plugins/extension/joomla/joomla.php      |   264 +
 core/plugins/extension/joomla/joomla.xml      |    19 +
 core/plugins/fields/calendar/calendar.php     |    50 +
 core/plugins/fields/calendar/calendar.xml     |    21 +
 .../fields/calendar/params/calendar.xml       |    19 +
 .../plugins/fields/calendar/tmpl/calendar.php |    26 +
 core/plugins/fields/checkboxes/checkboxes.php |    21 +
 core/plugins/fields/checkboxes/checkboxes.xml |    52 +
 .../fields/checkboxes/params/checkboxes.xml   |    32 +
 .../fields/checkboxes/tmpl/checkboxes.php     |    30 +
 core/plugins/fields/color/color.php           |    45 +
 core/plugins/fields/color/color.xml           |    20 +
 core/plugins/fields/color/tmpl/color.php      |    24 +
 core/plugins/fields/editor/editor.php         |    46 +
 core/plugins/fields/editor/editor.xml         |    81 +
 core/plugins/fields/editor/params/editor.xml  |    58 +
 core/plugins/fields/editor/tmpl/editor.php    |    18 +
 core/plugins/fields/imagelist/imagelist.php   |    46 +
 core/plugins/fields/imagelist/imagelist.xml   |    61 +
 .../fields/imagelist/params/imagelist.xml     |    40 +
 .../fields/imagelist/tmpl/imagelist.php       |    51 +
 core/plugins/fields/integer/integer.php       |    21 +
 core/plugins/fields/integer/integer.xml       |    69 +
 .../plugins/fields/integer/params/integer.xml |    45 +
 core/plugins/fields/integer/tmpl/integer.php  |    28 +
 core/plugins/fields/list/list.php             |    21 +
 core/plugins/fields/list/list.xml             |    63 +
 core/plugins/fields/list/params/list.xml      |    44 +
 core/plugins/fields/list/tmpl/list.php        |    31 +
 core/plugins/fields/media/media.php           |    45 +
 core/plugins/fields/media/media.xml           |    57 +
 core/plugins/fields/media/params/media.xml    |    36 +
 core/plugins/fields/media/tmpl/media.php      |    39 +
 core/plugins/fields/radio/params/radio.xml    |    46 +
 core/plugins/fields/radio/radio.php           |    21 +
 core/plugins/fields/radio/radio.xml           |    52 +
 core/plugins/fields/radio/tmpl/radio.php      |    31 +
 core/plugins/fields/sql/params/sql.xml        |    28 +
 core/plugins/fields/sql/sql.php               |    87 +
 core/plugins/fields/sql/sql.xml               |    49 +
 core/plugins/fields/sql/tmpl/sql.php          |    58 +
 core/plugins/fields/text/params/text.xml      |    33 +
 core/plugins/fields/text/text.php             |    21 +
 core/plugins/fields/text/text.xml             |    53 +
 core/plugins/fields/text/tmpl/text.php        |    24 +
 .../fields/textarea/params/textarea.xml       |    51 +
 core/plugins/fields/textarea/textarea.php     |    21 +
 core/plugins/fields/textarea/textarea.xml     |    73 +
 .../plugins/fields/textarea/tmpl/textarea.php |    18 +
 core/plugins/fields/url/params/url.xml        |    33 +
 core/plugins/fields/url/tmpl/url.php          |    29 +
 core/plugins/fields/url/url.php               |    50 +
 core/plugins/fields/url/url.xml               |    54 +
 core/plugins/fields/user/params/user.xml      |    18 +
 core/plugins/fields/user/tmpl/user.php        |    41 +
 core/plugins/fields/user/user.php             |    43 +
 core/plugins/fields/user/user.xml             |    20 +
 .../usergrouplist/params/usergrouplist.xml    |    18 +
 .../usergrouplist/tmpl/usergrouplist.php      |    32 +
 .../fields/usergrouplist/usergrouplist.php    |    21 +
 .../fields/usergrouplist/usergrouplist.xml    |    39 +
 core/plugins/finder/categories/categories.php |   401 +
 core/plugins/finder/categories/categories.xml |    19 +
 core/plugins/finder/contacts/contacts.php     |   449 +
 core/plugins/finder/contacts/contacts.xml     |    19 +
 core/plugins/finder/content/content.php       |   379 +
 core/plugins/finder/content/content.xml       |    19 +
 core/plugins/finder/newsfeeds/newsfeeds.php   |   365 +
 core/plugins/finder/newsfeeds/newsfeeds.xml   |    19 +
 core/plugins/finder/tags/tags.php             |   361 +
 core/plugins/finder/tags/tags.xml             |    19 +
 core/plugins/index.html                       |     1 +
 .../folderinstaller/folderinstaller.php       |    46 +
 .../folderinstaller/folderinstaller.xml       |    21 +
 .../folderinstaller/tmpl/default.php          |    46 +
 .../packageinstaller/packageinstaller.php     |    47 +
 .../packageinstaller/packageinstaller.xml     |    21 +
 .../packageinstaller/tmpl/default.php         |   222 +
 .../installer/urlinstaller/tmpl/default.php   |    42 +
 .../installer/urlinstaller/urlinstaller.php   |    46 +
 .../installer/urlinstaller/urlinstaller.xml   |    21 +
 .../extensionupdate/extensionupdate.php       |    74 +
 .../extensionupdate/extensionupdate.xml       |    32 +
 .../quickicon/joomlaupdate/joomlaupdate.php   |    83 +
 .../quickicon/joomlaupdate/joomlaupdate.xml   |    32 +
 .../phpversioncheck/phpversioncheck.php       |   239 +
 .../phpversioncheck/phpversioncheck.xml       |    19 +
 core/plugins/sampledata/blog/blog.php         |  1068 ++
 core/plugins/sampledata/blog/blog.xml         |    23 +
 core/plugins/search/categories/categories.php |   198 +
 core/plugins/search/categories/categories.xml |    62 +
 core/plugins/search/contacts/contacts.php     |   190 +
 core/plugins/search/contacts/contacts.xml     |    60 +
 core/plugins/search/content/content.php       |   454 +
 core/plugins/search/content/content.xml       |    61 +
 core/plugins/search/newsfeeds/newsfeeds.php   |   202 +
 core/plugins/search/newsfeeds/newsfeeds.xml   |    60 +
 core/plugins/search/tags/tags.php             |   218 +
 core/plugins/search/tags/tags.xml             |    47 +
 core/plugins/system/cache/cache.php           |   238 +
 core/plugins/system/cache/cache.xml           |    59 +
 core/plugins/system/debug/debug.php           |  2066 +++
 core/plugins/system/debug/debug.xml           |   285 +
 core/plugins/system/fields/fields.php         |   574 +
 core/plugins/system/fields/fields.xml         |    19 +
 core/plugins/system/highlight/highlight.php   |    85 +
 core/plugins/system/highlight/highlight.xml   |    19 +
 .../en-GB/en-GB.plg_system_languagecode.ini   |    10 +
 .../en-GB.plg_system_languagecode.sys.ini     |     8 +
 .../system/languagecode/languagecode.php      |   157 +
 .../system/languagecode/languagecode.xml      |    29 +
 .../system/languagefilter/languagefilter.php  |   884 +
 .../system/languagefilter/languagefilter.xml  |   125 +
 core/plugins/system/log/log.php               |    70 +
 core/plugins/system/log/log.xml               |    37 +
 core/plugins/system/logout/logout.php         |   121 +
 core/plugins/system/logout/logout.xml         |    19 +
 core/plugins/system/p3p/p3p.php               |    43 +
 core/plugins/system/p3p/p3p.xml               |    33 +
 .../plugins/system/redirect/form/excludes.xml |    19 +
 core/plugins/system/redirect/redirect.php     |   349 +
 core/plugins/system/redirect/redirect.xml     |    58 +
 core/plugins/system/remember/remember.php     |   148 +
 core/plugins/system/remember/remember.xml     |    19 +
 core/plugins/system/sef/sef.php               |   260 +
 core/plugins/system/sef/sef.xml               |    34 +
 core/plugins/system/sessiongc/sessiongc.php   |    78 +
 core/plugins/system/sessiongc/sessiongc.xml   |    74 +
 core/plugins/system/stats/field/base.php      |    36 +
 core/plugins/system/stats/field/data.php      |    57 +
 core/plugins/system/stats/field/uniqueid.php  |    36 +
 .../system/stats/layouts/field/data.php       |    48 +
 .../system/stats/layouts/field/uniqueid.php   |    46 +
 core/plugins/system/stats/layouts/message.php |    38 +
 core/plugins/system/stats/layouts/stats.php   |    27 +
 core/plugins/system/stats/stats.php           |   564 +
 core/plugins/system/stats/stats.xml           |    68 +
 .../postinstall/updatecachetime.php           |    55 +
 .../updatenotification/updatenotification.php |   420 +
 .../updatenotification/updatenotification.xml |    51 +
 .../totp/postinstall/actions.php              |    63 +
 core/plugins/twofactorauth/totp/tmpl/form.php |   103 +
 core/plugins/twofactorauth/totp/totp.php      |   304 +
 core/plugins/twofactorauth/totp/totp.xml      |    40 +
 .../twofactorauth/yubikey/tmpl/form.php       |    45 +
 .../plugins/twofactorauth/yubikey/yubikey.php |   371 +
 .../plugins/twofactorauth/yubikey/yubikey.xml |    39 +
 .../user/contactcreator/contactcreator.php    |   171 +
 .../user/contactcreator/contactcreator.xml    |    54 +
 core/plugins/user/joomla/joomla.php           |   396 +
 core/plugins/user/joomla/joomla.xml           |    60 +
 core/plugins/user/profile/field/dob.php       |    63 +
 core/plugins/user/profile/field/tos.php       |   129 +
 core/plugins/user/profile/profile.php         |   513 +
 core/plugins/user/profile/profile.xml         |   356 +
 .../plugins/user/profile/profiles/profile.xml |   131 +
 core/robots.txt.dist                          |    32 +
 core/templates/beez3/component.php            |    55 +
 core/templates/beez3/css/general.css          |   605 +
 core/templates/beez3/css/ie7only.css          |    40 +
 core/templates/beez3/css/ieonly.css           |   191 +
 core/templates/beez3/css/layout.css           |  1105 ++
 core/templates/beez3/css/nature.css           |   468 +
 core/templates/beez3/css/nature_rtl.css       |    11 +
 core/templates/beez3/css/personal.css         |   460 +
 core/templates/beez3/css/personal_rtl.css     |     4 +
 core/templates/beez3/css/position.css         |   495 +
 core/templates/beez3/css/print.css            |   464 +
 core/templates/beez3/css/red.css              |   384 +
 core/templates/beez3/css/template.css         |    31 +
 core/templates/beez3/css/template_rtl.css     |   553 +
 core/templates/beez3/css/turq.css             |   401 +
 core/templates/beez3/css/turq.less            |   426 +
 core/templates/beez3/error.php                |   194 +
 core/templates/beez3/favicon.ico              |   Bin 0 -> 2019 bytes
 .../html/com_contact/categories/default.php   |    40 +
 .../com_contact/categories/default_items.php  |    57 +
 .../html/com_contact/category/default.php     |    44 +
 .../com_contact/category/default_children.php |    55 +
 .../com_contact/category/default_items.php    |   183 +
 .../html/com_contact/contact/default.php      |   182 +
 .../com_contact/contact/default_address.php   |   119 +
 .../com_contact/contact/default_articles.php  |    26 +
 .../html/com_contact/contact/default_form.php |    79 +
 .../com_contact/contact/default_links.php     |    45 +
 .../com_contact/contact/default_profile.php   |    40 +
 .../contact/default_user_custom_fields.php    |    57 +
 .../html/com_contact/contact/encyclopedia.php |    80 +
 .../html/com_content/archive/default.php      |    51 +
 .../com_content/archive/default_items.php     |   111 +
 .../html/com_content/article/default.php      |   225 +
 .../com_content/article/default_links.php     |    79 +
 .../html/com_content/categories/default.php   |    40 +
 .../com_content/categories/default_items.php  |    57 +
 .../beez3/html/com_content/category/blog.php  |   119 +
 .../com_content/category/blog_children.php    |    73 +
 .../html/com_content/category/blog_item.php   |   168 +
 .../html/com_content/category/blog_links.php  |    29 +
 .../html/com_content/category/default.php     |    88 +
 .../com_content/category/default_articles.php |   238 +
 .../com_content/category/default_children.php |    74 +
 .../html/com_content/featured/default.php     |    89 +
 .../com_content/featured/default_item.php     |   178 +
 .../com_content/featured/default_links.php    |    24 +
 .../beez3/html/com_content/form/edit.php      |   338 +
 .../html/com_newsfeeds/categories/default.php |    38 +
 .../categories/default_items.php              |    55 +
 .../html/com_newsfeeds/category/default.php   |    46 +
 .../category/default_children.php             |    57 +
 .../com_newsfeeds/category/default_items.php  |   102 +
 .../html/com_weblinks/categories/default.php  |    40 +
 .../com_weblinks/categories/default_items.php |    56 +
 .../html/com_weblinks/category/default.php    |    44 +
 .../category/default_children.php             |    57 +
 .../com_weblinks/category/default_items.php   |   186 +
 .../beez3/html/com_weblinks/form/edit.php     |   121 +
 .../html/layouts/joomla/system/message.php    |    32 +
 .../beez3/html/mod_breadcrumbs/default.php    |    62 +
 .../beez3/html/mod_languages/default.php      |    49 +
 .../beez3/html/mod_login/default.php          |    78 +
 .../beez3/html/mod_login/default_logout.php   |    38 +
 core/templates/beez3/html/modules.php         |   117 +
 core/templates/beez3/images/all_bg.gif        |   Bin 0 -> 143 bytes
 core/templates/beez3/images/arrow.png         |   Bin 0 -> 112 bytes
 core/templates/beez3/images/arrow2_grey.png   |   Bin 0 -> 112 bytes
 .../beez3/images/arrow_white_grey.png         |   Bin 0 -> 135 bytes
 core/templates/beez3/images/blog_more.gif     |   Bin 0 -> 230 bytes
 .../beez3/images/blog_more_hover.gif          |   Bin 0 -> 230 bytes
 core/templates/beez3/images/close.png         |   Bin 0 -> 659 bytes
 core/templates/beez3/images/content_bg.gif    |   Bin 0 -> 157 bytes
 core/templates/beez3/images/footer_bg.gif     |   Bin 0 -> 2231 bytes
 core/templates/beez3/images/footer_bg.png     |   Bin 0 -> 360 bytes
 core/templates/beez3/images/header-bg.gif     |   Bin 0 -> 128 bytes
 core/templates/beez3/images/minus.png         |   Bin 0 -> 122 bytes
 core/templates/beez3/images/nature/arrow1.gif |   Bin 0 -> 1700 bytes
 .../beez3/images/nature/arrow1_rtl.gif        |   Bin 0 -> 1710 bytes
 core/templates/beez3/images/nature/arrow2.gif |   Bin 0 -> 100 bytes
 .../beez3/images/nature/arrow2_grey.png       |   Bin 0 -> 112 bytes
 .../beez3/images/nature/arrow2_rtl.gif        |   Bin 0 -> 101 bytes
 .../beez3/images/nature/arrow_nav.gif         |   Bin 0 -> 79 bytes
 .../beez3/images/nature/arrow_small.png       |   Bin 0 -> 96 bytes
 .../beez3/images/nature/arrow_small_rtl.png   |   Bin 0 -> 117 bytes
 .../beez3/images/nature/blog_more.gif         |   Bin 0 -> 349 bytes
 core/templates/beez3/images/nature/box.png    |   Bin 0 -> 94 bytes
 core/templates/beez3/images/nature/box1.png   |   Bin 0 -> 95 bytes
 .../templates/beez3/images/nature/grey_bg.png |   Bin 0 -> 110 bytes
 .../beez3/images/nature/headingback.png       |   Bin 0 -> 87 bytes
 core/templates/beez3/images/nature/karo.gif   |   Bin 0 -> 45 bytes
 core/templates/beez3/images/nature/level4.png |   Bin 0 -> 90 bytes
 .../beez3/images/nature/nav_level1_a.gif      |   Bin 0 -> 160 bytes
 .../beez3/images/nature/nav_level_1.gif       |   Bin 0 -> 223 bytes
 core/templates/beez3/images/nature/pfeil.gif  |   Bin 0 -> 158 bytes
 .../beez3/images/nature/readmore_arrow.png    |   Bin 0 -> 308 bytes
 .../beez3/images/nature/searchbutton.png      |   Bin 0 -> 192 bytes
 core/templates/beez3/images/nature/tabs.gif   |   Bin 0 -> 1630 bytes
 core/templates/beez3/images/nav_level_1.gif   |   Bin 0 -> 223 bytes
 core/templates/beez3/images/news.gif          |   Bin 0 -> 149 bytes
 .../beez3/images/personal/arrow2_grey.jpg     |   Bin 0 -> 347 bytes
 .../beez3/images/personal/arrow2_grey.png     |   Bin 0 -> 112 bytes
 core/templates/beez3/images/personal/bg2.png  |   Bin 0 -> 2603 bytes
 .../beez3/images/personal/button.png          |   Bin 0 -> 3007 bytes
 core/templates/beez3/images/personal/dot.png  |   Bin 0 -> 136 bytes
 core/templates/beez3/images/personal/ecke.gif |   Bin 0 -> 825 bytes
 .../beez3/images/personal/footer.jpg          |   Bin 0 -> 531 bytes
 .../beez3/images/personal/grey_bg.png         |   Bin 0 -> 86 bytes
 .../beez3/images/personal/navi_active.png     |   Bin 0 -> 88 bytes
 .../beez3/images/personal/personal2.png       |   Bin 0 -> 19575 bytes
 .../beez3/images/personal/readmore_arrow.png  |   Bin 0 -> 308 bytes
 .../images/personal/readmore_arrow_hover.png  |   Bin 0 -> 256 bytes
 .../beez3/images/personal/tabs_back.png       |   Bin 0 -> 4727 bytes
 core/templates/beez3/images/plus.png          |   Bin 0 -> 125 bytes
 core/templates/beez3/images/req.png           |   Bin 0 -> 381 bytes
 core/templates/beez3/images/slider_minus.png  |   Bin 0 -> 2594 bytes
 .../beez3/images/slider_minus_rtl.png         |   Bin 0 -> 2616 bytes
 core/templates/beez3/images/slider_plus.png   |   Bin 0 -> 2599 bytes
 .../beez3/images/slider_plus_rtl.png          |   Bin 0 -> 2623 bytes
 core/templates/beez3/images/system/arrow.png  |   Bin 0 -> 99 bytes
 .../beez3/images/system/arrow_rtl.png         |   Bin 0 -> 112 bytes
 .../beez3/images/system/calendar.png          |   Bin 0 -> 592 bytes
 .../beez3/images/system/j_button2_blank.png   |   Bin 0 -> 169 bytes
 .../beez3/images/system/j_button2_image.png   |   Bin 0 -> 642 bytes
 .../beez3/images/system/j_button2_left.png    |   Bin 0 -> 175 bytes
 .../images/system/j_button2_pagebreak.png     |   Bin 0 -> 440 bytes
 .../images/system/j_button2_readmore.png      |   Bin 0 -> 514 bytes
 .../beez3/images/system/notice-alert.png      |   Bin 0 -> 1225 bytes
 .../beez3/images/system/notice-alert_rtl.png  |   Bin 0 -> 1218 bytes
 .../beez3/images/system/notice-info.png       |   Bin 0 -> 1027 bytes
 .../beez3/images/system/notice-info_rtl.png   |   Bin 0 -> 1026 bytes
 .../beez3/images/system/notice-note.png       |   Bin 0 -> 1315 bytes
 .../beez3/images/system/notice-note_rtl.png   |   Bin 0 -> 1310 bytes
 .../beez3/images/system/selector-arrow.png    |   Bin 0 -> 197 bytes
 core/templates/beez3/images/table_footer.gif  |   Bin 0 -> 106 bytes
 core/templates/beez3/images/trans.gif         |   Bin 0 -> 37 bytes
 core/templates/beez3/index.php                |   216 +
 core/templates/beez3/javascript/hide.js       |   335 +
 .../beez3/javascript/md_stylechanger.js       |    82 +
 core/templates/beez3/javascript/respond.js    |   327 +
 .../templates/beez3/javascript/respond.src.js |   329 +
 core/templates/beez3/javascript/template.js   |    47 +
 core/templates/beez3/jsstrings.php            |    36 +
 .../beez3/language/en-GB/en-GB.tpl_beez3.ini  |    60 +
 .../language/en-GB/en-GB.tpl_beez3.sys.ini    |    24 +
 core/templates/beez3/templateDetails.xml      |   160 +
 core/templates/beez3/template_preview.png     |   Bin 0 -> 118531 bytes
 core/templates/beez3/template_thumbnail.png   |   Bin 0 -> 21957 bytes
 core/templates/index.html                     |     1 +
 core/templates/protostar/component.php        |    41 +
 core/templates/protostar/css/offline.css      |    58 +
 core/templates/protostar/css/template.css     |  7762 +++++++++
 core/templates/protostar/error.php            |   212 +
 core/templates/protostar/favicon.ico          |   Bin 0 -> 2019 bytes
 .../com_media/imageslist/default_folder.php   |    23 +
 .../com_media/imageslist/default_image.php    |    32 +
 .../joomla/form/field/contenthistory.php      |    63 +
 .../html/layouts/joomla/form/field/media.php  |   139 +
 .../html/layouts/joomla/form/field/user.php   |   104 +
 .../html/layouts/joomla/system/message.php    |    36 +
 core/templates/protostar/html/modules.php     |    57 +
 core/templates/protostar/html/pagination.php  |   238 +
 core/templates/protostar/images/logo.png      |   Bin 0 -> 9075 bytes
 .../protostar/images/system/rating_star.png   |   Bin 0 -> 201 bytes
 .../images/system/rating_star_blank.png       |   Bin 0 -> 186 bytes
 .../protostar/images/system/sort_asc.png      |   Bin 0 -> 128 bytes
 .../protostar/images/system/sort_desc.png     |   Bin 0 -> 135 bytes
 .../img/glyphicons-halflings-white.png        |   Bin 0 -> 8743 bytes
 .../protostar/img/glyphicons-halflings.png    |   Bin 0 -> 12600 bytes
 core/templates/protostar/index.php            |   222 +
 core/templates/protostar/js/application.js    |     7 +
 core/templates/protostar/js/classes.js        |    45 +
 core/templates/protostar/js/template.js       |    74 +
 .../language/en-GB/en-GB.tpl_protostar.ini    |    24 +
 .../en-GB/en-GB.tpl_protostar.sys.ini         |    25 +
 core/templates/protostar/less/icomoon.less    |    11 +
 core/templates/protostar/less/template.less   |   743 +
 .../protostar/less/template_rtl.less          |    30 +
 core/templates/protostar/less/variables.less  |   307 +
 core/templates/protostar/offline.php          |   144 +
 core/templates/protostar/templateDetails.xml  |   136 +
 core/templates/protostar/template_preview.png |   Bin 0 -> 125180 bytes
 .../protostar/template_thumbnail.png          |   Bin 0 -> 8271 bytes
 core/templates/system/component.php           |    32 +
 core/templates/system/css/editor.css          |    59 +
 core/templates/system/css/error.css           |    80 +
 core/templates/system/css/error_rtl.css       |    21 +
 core/templates/system/css/general.css         |   164 +
 core/templates/system/css/offline.css         |   140 +
 core/templates/system/css/offline_rtl.css     |    27 +
 core/templates/system/css/system.css          |    50 +
 core/templates/system/css/toolbar.css         |    30 +
 core/templates/system/error.php               |    92 +
 core/templates/system/html/modules.php        |   153 +
 core/templates/system/images/calendar.png     |   Bin 0 -> 592 bytes
 .../system/images/j_button2_blank.png         |   Bin 0 -> 169 bytes
 .../system/images/j_button2_image.png         |   Bin 0 -> 642 bytes
 .../system/images/j_button2_left.png          |   Bin 0 -> 175 bytes
 .../system/images/j_button2_pagebreak.png     |   Bin 0 -> 440 bytes
 .../system/images/j_button2_readmore.png      |   Bin 0 -> 514 bytes
 .../system/images/j_button2_right.png         |   Bin 0 -> 184 bytes
 .../system/images/selector-arrow.png          |   Bin 0 -> 197 bytes
 core/templates/system/index.php               |    12 +
 core/templates/system/offline.php             |    88 +
 core/tmp/index.html                           |     1 +
 core/web.config.txt                           |    31 +
 5792 files changed, 884285 insertions(+)
 create mode 100644 core/LICENSE.txt
 create mode 100644 core/README.txt
 create mode 100644 core/administrator/cache/index.html
 create mode 100644 core/administrator/components/com_admin/admin.php
 create mode 100644 core/administrator/components/com_admin/admin.xml
 create mode 100644 core/administrator/components/com_admin/controller.php
 create mode 100644 core/administrator/components/com_admin/controllers/profile.php
 create mode 100644 core/administrator/components/com_admin/helpers/html/directory.php
 create mode 100644 core/administrator/components/com_admin/helpers/html/phpsetting.php
 create mode 100644 core/administrator/components/com_admin/helpers/html/system.php
 create mode 100644 core/administrator/components/com_admin/models/forms/profile.xml
 create mode 100644 core/administrator/components/com_admin/models/help.php
 create mode 100644 core/administrator/components/com_admin/models/profile.php
 create mode 100644 core/administrator/components/com_admin/models/sysinfo.php
 create mode 100644 core/administrator/components/com_admin/postinstall/eaccelerator.php
 create mode 100644 core/administrator/components/com_admin/postinstall/htaccess.php
 create mode 100644 core/administrator/components/com_admin/postinstall/joomla40checks.php
 create mode 100644 core/administrator/components/com_admin/postinstall/languageaccess340.php
 create mode 100644 core/administrator/components/com_admin/postinstall/statscollection.php
 create mode 100644 core/administrator/components/com_admin/postinstall/updatedefaultsettings.php
 create mode 100644 core/administrator/components/com_admin/script.php
 create mode 100644 core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-23.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-10.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.2-2012-03-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.3-2012-03-13.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.5.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.6.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.0.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.0.2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.0.3.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.1.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.1.2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.1.3.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.1.4.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.1.5.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.2.3-2014-02-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-02-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-04-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.3.4-2014-08-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-08-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-10-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-02-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-13.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-05-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-09-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-17.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-31.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-10.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.3-2017-06-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.7.4-2017-07-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.4-2018-01-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.6-2018-02-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.8-2018-05-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/mysql/3.8.9-2018-06-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.0.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.0.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.0.2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.0.3.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.1.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.1.2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.1.3.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.1.4.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.1.5.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.2.3-2014-02-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2013-12-21.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-02-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-04-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.3.4-2014-08-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-08-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-10-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-02-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.4.4-2015-07-11.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-13.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-05-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-10-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-09-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-17.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-31.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-10.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.7.4-2017-07-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.4-2018-01-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.6-2018-02-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.8-2018-05-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/postgresql/3.8.9-2018-06-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.2-2012-03-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.3-2012-03-13.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.5.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.6.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.0.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.0.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.0.2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.0.3.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.1.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.1.2.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.1.3.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.2.3-2014-02-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-02-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-04-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.3.4-2014-08-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-08-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-10-20.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-02-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.4.4-2015-07-11.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-13.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-05-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-06.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-22.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-09-29.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-01.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-04.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-24.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-08.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-17.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-31.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-02.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-15.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-03.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-09.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-10.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-19.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.7.4-2017-07-05.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.4-2018-01-16.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.6-2018-02-14.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.8-2018-05-18.sql
 create mode 100644 core/administrator/components/com_admin/sql/updates/sqlazure/3.8.9-2018-06-19.sql
 create mode 100644 core/administrator/components/com_admin/views/help/tmpl/default.php
 create mode 100755 core/administrator/components/com_admin/views/help/tmpl/default.xml
 create mode 100644 core/administrator/components/com_admin/views/help/tmpl/langforum.php
 create mode 100644 core/administrator/components/com_admin/views/help/view.html.php
 create mode 100644 core/administrator/components/com_admin/views/profile/tmpl/edit.php
 create mode 100644 core/administrator/components/com_admin/views/profile/view.html.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/tmpl/default.php
 create mode 100755 core/administrator/components/com_admin/views/sysinfo/tmpl/default.xml
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/view.html.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/view.json.php
 create mode 100644 core/administrator/components/com_admin/views/sysinfo/view.text.php
 create mode 100644 core/administrator/components/com_ajax/ajax.php
 create mode 100644 core/administrator/components/com_ajax/ajax.xml
 create mode 100644 core/administrator/components/com_associations/access.xml
 create mode 100644 core/administrator/components/com_associations/associations.php
 create mode 100644 core/administrator/components/com_associations/associations.xml
 create mode 100644 core/administrator/components/com_associations/config.xml
 create mode 100644 core/administrator/components/com_associations/controller.php
 create mode 100644 core/administrator/components/com_associations/controllers/association.php
 create mode 100644 core/administrator/components/com_associations/controllers/associations.php
 create mode 100644 core/administrator/components/com_associations/helpers/associations.php
 create mode 100644 core/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
 create mode 100644 core/administrator/components/com_associations/models/association.php
 create mode 100644 core/administrator/components/com_associations/models/associations.php
 create mode 100644 core/administrator/components/com_associations/models/fields/itemlanguage.php
 create mode 100644 core/administrator/components/com_associations/models/fields/itemtype.php
 create mode 100644 core/administrator/components/com_associations/models/fields/modalassociation.php
 create mode 100644 core/administrator/components/com_associations/models/forms/association.xml
 create mode 100644 core/administrator/components/com_associations/models/forms/filter_associations.xml
 create mode 100644 core/administrator/components/com_associations/views/association/tmpl/edit.php
 create mode 100644 core/administrator/components/com_associations/views/association/view.html.php
 create mode 100644 core/administrator/components/com_associations/views/associations/tmpl/default.php
 create mode 100644 core/administrator/components/com_associations/views/associations/tmpl/default.xml
 create mode 100644 core/administrator/components/com_associations/views/associations/tmpl/modal.php
 create mode 100644 core/administrator/components/com_associations/views/associations/view.html.php
 create mode 100644 core/administrator/components/com_banners/access.xml
 create mode 100644 core/administrator/components/com_banners/banners.php
 create mode 100644 core/administrator/components/com_banners/banners.xml
 create mode 100644 core/administrator/components/com_banners/config.xml
 create mode 100644 core/administrator/components/com_banners/controller.php
 create mode 100644 core/administrator/components/com_banners/controllers/banner.php
 create mode 100644 core/administrator/components/com_banners/controllers/banners.php
 create mode 100644 core/administrator/components/com_banners/controllers/client.php
 create mode 100644 core/administrator/components/com_banners/controllers/clients.php
 create mode 100644 core/administrator/components/com_banners/controllers/tracks.php
 create mode 100644 core/administrator/components/com_banners/controllers/tracks.raw.php
 create mode 100644 core/administrator/components/com_banners/helpers/banners.php
 create mode 100644 core/administrator/components/com_banners/helpers/html/banner.php
 create mode 100644 core/administrator/components/com_banners/models/banner.php
 create mode 100644 core/administrator/components/com_banners/models/banners.php
 create mode 100644 core/administrator/components/com_banners/models/client.php
 create mode 100644 core/administrator/components/com_banners/models/clients.php
 create mode 100644 core/administrator/components/com_banners/models/download.php
 create mode 100644 core/administrator/components/com_banners/models/fields/bannerclient.php
 create mode 100644 core/administrator/components/com_banners/models/fields/clicks.php
 create mode 100644 core/administrator/components/com_banners/models/fields/impmade.php
 create mode 100644 core/administrator/components/com_banners/models/fields/imptotal.php
 create mode 100644 core/administrator/components/com_banners/models/forms/banner.xml
 create mode 100644 core/administrator/components/com_banners/models/forms/client.xml
 create mode 100644 core/administrator/components/com_banners/models/forms/download.xml
 create mode 100644 core/administrator/components/com_banners/models/forms/filter_banners.xml
 create mode 100644 core/administrator/components/com_banners/models/forms/filter_clients.xml
 create mode 100644 core/administrator/components/com_banners/models/forms/filter_tracks.xml
 create mode 100644 core/administrator/components/com_banners/models/tracks.php
 create mode 100644 core/administrator/components/com_banners/sql/install.mysql.utf8.sql
 create mode 100644 core/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql
 create mode 100644 core/administrator/components/com_banners/tables/banner.php
 create mode 100644 core/administrator/components/com_banners/tables/client.php
 create mode 100644 core/administrator/components/com_banners/views/banner/tmpl/edit.php
 create mode 100644 core/administrator/components/com_banners/views/banner/view.html.php
 create mode 100644 core/administrator/components/com_banners/views/banners/tmpl/default.php
 create mode 100644 core/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_banners/views/banners/view.html.php
 create mode 100644 core/administrator/components/com_banners/views/client/tmpl/edit.php
 create mode 100644 core/administrator/components/com_banners/views/client/view.html.php
 create mode 100644 core/administrator/components/com_banners/views/clients/tmpl/default.php
 create mode 100644 core/administrator/components/com_banners/views/clients/view.html.php
 create mode 100644 core/administrator/components/com_banners/views/download/tmpl/default.php
 create mode 100644 core/administrator/components/com_banners/views/download/view.html.php
 create mode 100644 core/administrator/components/com_banners/views/tracks/tmpl/default.php
 create mode 100644 core/administrator/components/com_banners/views/tracks/view.html.php
 create mode 100644 core/administrator/components/com_banners/views/tracks/view.raw.php
 create mode 100644 core/administrator/components/com_cache/access.xml
 create mode 100644 core/administrator/components/com_cache/cache.php
 create mode 100644 core/administrator/components/com_cache/cache.xml
 create mode 100644 core/administrator/components/com_cache/config.xml
 create mode 100644 core/administrator/components/com_cache/controller.php
 create mode 100644 core/administrator/components/com_cache/helpers/cache.php
 create mode 100644 core/administrator/components/com_cache/models/cache.php
 create mode 100644 core/administrator/components/com_cache/models/forms/filter_cache.xml
 create mode 100644 core/administrator/components/com_cache/views/cache/tmpl/default.php
 create mode 100755 core/administrator/components/com_cache/views/cache/tmpl/default.xml
 create mode 100644 core/administrator/components/com_cache/views/cache/view.html.php
 create mode 100644 core/administrator/components/com_cache/views/purge/tmpl/default.php
 create mode 100755 core/administrator/components/com_cache/views/purge/tmpl/default.xml
 create mode 100644 core/administrator/components/com_cache/views/purge/view.html.php
 create mode 100644 core/administrator/components/com_categories/categories.php
 create mode 100644 core/administrator/components/com_categories/categories.xml
 create mode 100644 core/administrator/components/com_categories/controller.php
 create mode 100644 core/administrator/components/com_categories/controllers/categories.php
 create mode 100644 core/administrator/components/com_categories/controllers/category.php
 create mode 100644 core/administrator/components/com_categories/helpers/association.php
 create mode 100644 core/administrator/components/com_categories/helpers/categories.php
 create mode 100644 core/administrator/components/com_categories/helpers/html/categoriesadministrator.php
 create mode 100644 core/administrator/components/com_categories/models/categories.php
 create mode 100644 core/administrator/components/com_categories/models/category.php
 create mode 100644 core/administrator/components/com_categories/models/fields/categoryedit.php
 create mode 100644 core/administrator/components/com_categories/models/fields/categoryparent.php
 create mode 100644 core/administrator/components/com_categories/models/fields/modal/category.php
 create mode 100644 core/administrator/components/com_categories/models/forms/category.xml
 create mode 100644 core/administrator/components/com_categories/models/forms/filter_categories.xml
 create mode 100644 core/administrator/components/com_categories/tables/category.php
 create mode 100644 core/administrator/components/com_categories/views/categories/tmpl/default.php
 create mode 100755 core/administrator/components/com_categories/views/categories/tmpl/default.xml
 create mode 100644 core/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_categories/views/categories/tmpl/modal.php
 create mode 100644 core/administrator/components/com_categories/views/categories/view.html.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/edit.php
 create mode 100755 core/administrator/components/com_categories/views/category/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/edit_associations.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/edit_metadata.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/modal.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/modal_associations.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/modal_metadata.php
 create mode 100644 core/administrator/components/com_categories/views/category/tmpl/modal_options.php
 create mode 100644 core/administrator/components/com_categories/views/category/view.html.php
 create mode 100644 core/administrator/components/com_checkin/checkin.php
 create mode 100644 core/administrator/components/com_checkin/checkin.xml
 create mode 100644 core/administrator/components/com_checkin/config.xml
 create mode 100644 core/administrator/components/com_checkin/controller.php
 create mode 100644 core/administrator/components/com_checkin/models/checkin.php
 create mode 100644 core/administrator/components/com_checkin/models/forms/filter_checkin.xml
 create mode 100644 core/administrator/components/com_checkin/views/checkin/tmpl/default.php
 create mode 100755 core/administrator/components/com_checkin/views/checkin/tmpl/default.xml
 create mode 100644 core/administrator/components/com_checkin/views/checkin/view.html.php
 create mode 100644 core/administrator/components/com_config/access.xml
 create mode 100644 core/administrator/components/com_config/config.php
 create mode 100644 core/administrator/components/com_config/config.xml
 create mode 100644 core/administrator/components/com_config/controller.php
 create mode 100644 core/administrator/components/com_config/controller/application/cancel.php
 create mode 100644 core/administrator/components/com_config/controller/application/display.php
 create mode 100644 core/administrator/components/com_config/controller/application/removeroot.php
 create mode 100644 core/administrator/components/com_config/controller/application/save.php
 create mode 100644 core/administrator/components/com_config/controller/application/sendtestmail.php
 create mode 100644 core/administrator/components/com_config/controller/application/store.php
 create mode 100644 core/administrator/components/com_config/controller/component/cancel.php
 create mode 100644 core/administrator/components/com_config/controller/component/display.php
 create mode 100644 core/administrator/components/com_config/controller/component/save.php
 create mode 100644 core/administrator/components/com_config/controllers/application.php
 create mode 100644 core/administrator/components/com_config/controllers/component.php
 create mode 100644 core/administrator/components/com_config/helper/config.php
 create mode 100644 core/administrator/components/com_config/model/application.php
 create mode 100644 core/administrator/components/com_config/model/component.php
 create mode 100644 core/administrator/components/com_config/model/field/configcomponents.php
 create mode 100644 core/administrator/components/com_config/model/field/filters.php
 create mode 100644 core/administrator/components/com_config/model/form/application.xml
 create mode 100644 core/administrator/components/com_config/models/application.php
 create mode 100644 core/administrator/components/com_config/models/component.php
 create mode 100644 core/administrator/components/com_config/view/application/html.php
 create mode 100644 core/administrator/components/com_config/view/application/json.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default.php
 create mode 100755 core/administrator/components/com_config/view/application/tmpl/default.xml
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_cache.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_cookie.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_database.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_debug.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_filters.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_ftp.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_ftplogin.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_locale.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_mail.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_metadata.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_navigation.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_permissions.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_proxy.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_seo.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_server.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_session.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_site.php
 create mode 100644 core/administrator/components/com_config/view/application/tmpl/default_system.php
 create mode 100644 core/administrator/components/com_config/view/component/html.php
 create mode 100644 core/administrator/components/com_config/view/component/tmpl/default.php
 create mode 100755 core/administrator/components/com_config/view/component/tmpl/default.xml
 create mode 100644 core/administrator/components/com_config/view/component/tmpl/default_navigation.php
 create mode 100644 core/administrator/components/com_contact/access.xml
 create mode 100644 core/administrator/components/com_contact/config.xml
 create mode 100644 core/administrator/components/com_contact/contact.php
 create mode 100644 core/administrator/components/com_contact/contact.xml
 create mode 100644 core/administrator/components/com_contact/controller.php
 create mode 100644 core/administrator/components/com_contact/controllers/contact.php
 create mode 100644 core/administrator/components/com_contact/controllers/contacts.php
 create mode 100644 core/administrator/components/com_contact/helpers/associations.php
 create mode 100644 core/administrator/components/com_contact/helpers/contact.php
 create mode 100644 core/administrator/components/com_contact/helpers/html/contact.php
 create mode 100644 core/administrator/components/com_contact/models/contact.php
 create mode 100644 core/administrator/components/com_contact/models/contacts.php
 create mode 100644 core/administrator/components/com_contact/models/fields/modal/contact.php
 create mode 100644 core/administrator/components/com_contact/models/forms/contact.xml
 create mode 100644 core/administrator/components/com_contact/models/forms/fields/mail.xml
 create mode 100644 core/administrator/components/com_contact/models/forms/filter_contacts.xml
 create mode 100644 core/administrator/components/com_contact/sql/install.mysql.utf8.sql
 create mode 100644 core/administrator/components/com_contact/sql/uninstall.mysql.utf8.sql
 create mode 100644 core/administrator/components/com_contact/tables/contact.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/edit.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/edit_params.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/modal.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/modal_associations.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php
 create mode 100644 core/administrator/components/com_contact/views/contact/tmpl/modal_params.php
 create mode 100644 core/administrator/components/com_contact/views/contact/view.html.php
 create mode 100644 core/administrator/components/com_contact/views/contacts/tmpl/default.php
 create mode 100644 core/administrator/components/com_contact/views/contacts/tmpl/default_batch.php
 create mode 100644 core/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_contact/views/contacts/tmpl/modal.php
 create mode 100644 core/administrator/components/com_contact/views/contacts/view.html.php
 create mode 100644 core/administrator/components/com_content/access.xml
 create mode 100644 core/administrator/components/com_content/config.xml
 create mode 100644 core/administrator/components/com_content/content.php
 create mode 100644 core/administrator/components/com_content/content.xml
 create mode 100644 core/administrator/components/com_content/controller.php
 create mode 100644 core/administrator/components/com_content/controllers/article.php
 create mode 100644 core/administrator/components/com_content/controllers/articles.php
 create mode 100644 core/administrator/components/com_content/controllers/featured.php
 create mode 100644 core/administrator/components/com_content/helpers/associations.php
 create mode 100644 core/administrator/components/com_content/helpers/content.php
 create mode 100644 core/administrator/components/com_content/helpers/html/contentadministrator.php
 create mode 100644 core/administrator/components/com_content/models/article.php
 create mode 100644 core/administrator/components/com_content/models/articles.php
 create mode 100644 core/administrator/components/com_content/models/feature.php
 create mode 100644 core/administrator/components/com_content/models/featured.php
 create mode 100644 core/administrator/components/com_content/models/fields/modal/article.php
 create mode 100644 core/administrator/components/com_content/models/fields/voteradio.php
 create mode 100644 core/administrator/components/com_content/models/forms/article.xml
 create mode 100644 core/administrator/components/com_content/models/forms/filter_articles.xml
 create mode 100644 core/administrator/components/com_content/models/forms/filter_featured.xml
 create mode 100644 core/administrator/components/com_content/tables/featured.php
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/edit.php
 create mode 100755 core/administrator/components/com_content/views/article/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/edit_associations.php
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/edit_metadata.php
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/modal.php
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/modal_associations.php
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/modal_metadata.php
 create mode 100644 core/administrator/components/com_content/views/article/tmpl/pagebreak.php
 create mode 100644 core/administrator/components/com_content/views/article/view.html.php
 create mode 100644 core/administrator/components/com_content/views/articles/tmpl/default.php
 create mode 100755 core/administrator/components/com_content/views/articles/tmpl/default.xml
 create mode 100644 core/administrator/components/com_content/views/articles/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_content/views/articles/tmpl/modal.php
 create mode 100644 core/administrator/components/com_content/views/articles/view.html.php
 create mode 100644 core/administrator/components/com_content/views/featured/tmpl/default.php
 create mode 100755 core/administrator/components/com_content/views/featured/tmpl/default.xml
 create mode 100644 core/administrator/components/com_content/views/featured/view.html.php
 create mode 100644 core/administrator/components/com_contenthistory/contenthistory.php
 create mode 100644 core/administrator/components/com_contenthistory/contenthistory.xml
 create mode 100644 core/administrator/components/com_contenthistory/controller.php
 create mode 100644 core/administrator/components/com_contenthistory/controllers/history.php
 create mode 100644 core/administrator/components/com_contenthistory/controllers/preview.php
 create mode 100644 core/administrator/components/com_contenthistory/helpers/contenthistory.php
 create mode 100644 core/administrator/components/com_contenthistory/helpers/html/textdiff.php
 create mode 100644 core/administrator/components/com_contenthistory/models/compare.php
 create mode 100644 core/administrator/components/com_contenthistory/models/history.php
 create mode 100644 core/administrator/components/com_contenthistory/models/preview.php
 create mode 100644 core/administrator/components/com_contenthistory/views/compare/tmpl/compare.php
 create mode 100644 core/administrator/components/com_contenthistory/views/compare/view.html.php
 create mode 100644 core/administrator/components/com_contenthistory/views/history/tmpl/modal.php
 create mode 100644 core/administrator/components/com_contenthistory/views/history/view.html.php
 create mode 100644 core/administrator/components/com_contenthistory/views/preview/tmpl/preview.php
 create mode 100644 core/administrator/components/com_contenthistory/views/preview/view.html.php
 create mode 100644 core/administrator/components/com_cpanel/controller.php
 create mode 100644 core/administrator/components/com_cpanel/cpanel.php
 create mode 100644 core/administrator/components/com_cpanel/cpanel.xml
 create mode 100644 core/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
 create mode 100755 core/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml
 create mode 100644 core/administrator/components/com_cpanel/views/cpanel/view.html.php
 create mode 100644 core/administrator/components/com_fields/controller.php
 create mode 100644 core/administrator/components/com_fields/controllers/field.php
 create mode 100644 core/administrator/components/com_fields/controllers/fields.php
 create mode 100644 core/administrator/components/com_fields/controllers/group.php
 create mode 100644 core/administrator/components/com_fields/controllers/groups.php
 create mode 100644 core/administrator/components/com_fields/fields.php
 create mode 100644 core/administrator/components/com_fields/fields.xml
 create mode 100644 core/administrator/components/com_fields/helpers/fields.php
 create mode 100644 core/administrator/components/com_fields/libraries/fieldslistplugin.php
 create mode 100644 core/administrator/components/com_fields/libraries/fieldsplugin.php
 create mode 100644 core/administrator/components/com_fields/models/field.php
 create mode 100644 core/administrator/components/com_fields/models/fields.php
 create mode 100644 core/administrator/components/com_fields/models/fields/fieldcontexts.php
 create mode 100644 core/administrator/components/com_fields/models/fields/fieldgroups.php
 create mode 100644 core/administrator/components/com_fields/models/fields/section.php
 create mode 100644 core/administrator/components/com_fields/models/fields/type.php
 create mode 100644 core/administrator/components/com_fields/models/forms/field.xml
 create mode 100644 core/administrator/components/com_fields/models/forms/filter_fields.xml
 create mode 100644 core/administrator/components/com_fields/models/forms/filter_groups.xml
 create mode 100644 core/administrator/components/com_fields/models/forms/group.xml
 create mode 100644 core/administrator/components/com_fields/models/group.php
 create mode 100644 core/administrator/components/com_fields/models/groups.php
 create mode 100644 core/administrator/components/com_fields/tables/field.php
 create mode 100644 core/administrator/components/com_fields/tables/group.php
 create mode 100644 core/administrator/components/com_fields/views/field/tmpl/edit.php
 create mode 100644 core/administrator/components/com_fields/views/field/view.html.php
 create mode 100644 core/administrator/components/com_fields/views/fields/tmpl/default.php
 create mode 100644 core/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_fields/views/fields/tmpl/modal.php
 create mode 100644 core/administrator/components/com_fields/views/fields/view.html.php
 create mode 100644 core/administrator/components/com_fields/views/group/tmpl/edit.php
 create mode 100644 core/administrator/components/com_fields/views/group/view.html.php
 create mode 100644 core/administrator/components/com_fields/views/groups/tmpl/default.php
 create mode 100644 core/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_fields/views/groups/view.html.php
 create mode 100644 core/administrator/components/com_finder/access.xml
 create mode 100644 core/administrator/components/com_finder/config.xml
 create mode 100644 core/administrator/components/com_finder/controller.php
 create mode 100644 core/administrator/components/com_finder/controllers/filter.php
 create mode 100644 core/administrator/components/com_finder/controllers/filters.php
 create mode 100644 core/administrator/components/com_finder/controllers/index.php
 create mode 100644 core/administrator/components/com_finder/controllers/indexer.json.php
 create mode 100644 core/administrator/components/com_finder/controllers/maps.php
 create mode 100644 core/administrator/components/com_finder/finder.php
 create mode 100644 core/administrator/components/com_finder/finder.xml
 create mode 100644 core/administrator/components/com_finder/helpers/finder.php
 create mode 100644 core/administrator/components/com_finder/helpers/html/finder.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/adapter.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/driver/mysql.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/helper.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/indexer.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/parser.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/parser/html.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/parser/rtf.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/parser/txt.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/query.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/result.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/stemmer.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/taxonomy.php
 create mode 100644 core/administrator/components/com_finder/helpers/indexer/token.php
 create mode 100644 core/administrator/components/com_finder/helpers/language.php
 create mode 100644 core/administrator/components/com_finder/models/fields/branches.php
 create mode 100644 core/administrator/components/com_finder/models/fields/contentmap.php
 create mode 100644 core/administrator/components/com_finder/models/fields/contenttypes.php
 create mode 100644 core/administrator/components/com_finder/models/fields/directories.php
 create mode 100644 core/administrator/components/com_finder/models/fields/searchfilter.php
 create mode 100644 core/administrator/components/com_finder/models/filter.php
 create mode 100644 core/administrator/components/com_finder/models/filters.php
 create mode 100644 core/administrator/components/com_finder/models/forms/filter.xml
 create mode 100644 core/administrator/components/com_finder/models/forms/filter_filters.xml
 create mode 100644 core/administrator/components/com_finder/models/forms/filter_index.xml
 create mode 100644 core/administrator/components/com_finder/models/forms/filter_maps.xml
 create mode 100644 core/administrator/components/com_finder/models/index.php
 create mode 100644 core/administrator/components/com_finder/models/indexer.php
 create mode 100644 core/administrator/components/com_finder/models/maps.php
 create mode 100644 core/administrator/components/com_finder/models/statistics.php
 create mode 100644 core/administrator/components/com_finder/sql/install.mysql.sql
 create mode 100644 core/administrator/components/com_finder/sql/install.postgresql.sql
 create mode 100644 core/administrator/components/com_finder/sql/uninstall.mysql.sql
 create mode 100644 core/administrator/components/com_finder/sql/uninstall.postgresql.sql
 create mode 100644 core/administrator/components/com_finder/tables/filter.php
 create mode 100644 core/administrator/components/com_finder/tables/link.php
 create mode 100644 core/administrator/components/com_finder/tables/map.php
 create mode 100644 core/administrator/components/com_finder/views/filter/tmpl/edit.php
 create mode 100644 core/administrator/components/com_finder/views/filter/view.html.php
 create mode 100644 core/administrator/components/com_finder/views/filters/tmpl/default.php
 create mode 100644 core/administrator/components/com_finder/views/filters/view.html.php
 create mode 100644 core/administrator/components/com_finder/views/index/tmpl/default.php
 create mode 100644 core/administrator/components/com_finder/views/index/view.html.php
 create mode 100644 core/administrator/components/com_finder/views/indexer/tmpl/default.php
 create mode 100644 core/administrator/components/com_finder/views/indexer/view.html.php
 create mode 100644 core/administrator/components/com_finder/views/maps/tmpl/default.php
 create mode 100644 core/administrator/components/com_finder/views/maps/view.html.php
 create mode 100644 core/administrator/components/com_finder/views/statistics/tmpl/default.php
 create mode 100644 core/administrator/components/com_finder/views/statistics/view.html.php
 create mode 100644 core/administrator/components/com_installer/access.xml
 create mode 100644 core/administrator/components/com_installer/config.xml
 create mode 100644 core/administrator/components/com_installer/controller.php
 create mode 100644 core/administrator/components/com_installer/controllers/database.php
 create mode 100644 core/administrator/components/com_installer/controllers/discover.php
 create mode 100644 core/administrator/components/com_installer/controllers/install.php
 create mode 100644 core/administrator/components/com_installer/controllers/manage.php
 create mode 100644 core/administrator/components/com_installer/controllers/update.php
 create mode 100644 core/administrator/components/com_installer/controllers/updatesites.php
 create mode 100644 core/administrator/components/com_installer/helpers/html/manage.php
 create mode 100644 core/administrator/components/com_installer/helpers/html/updatesites.php
 create mode 100644 core/administrator/components/com_installer/helpers/installer.php
 create mode 100644 core/administrator/components/com_installer/installer.php
 create mode 100644 core/administrator/components/com_installer/installer.xml
 create mode 100644 core/administrator/components/com_installer/models/database.php
 create mode 100644 core/administrator/components/com_installer/models/discover.php
 create mode 100644 core/administrator/components/com_installer/models/extension.php
 create mode 100644 core/administrator/components/com_installer/models/fields/extensionstatus.php
 create mode 100644 core/administrator/components/com_installer/models/fields/folder.php
 create mode 100644 core/administrator/components/com_installer/models/fields/location.php
 create mode 100644 core/administrator/components/com_installer/models/fields/type.php
 create mode 100644 core/administrator/components/com_installer/models/forms/filter_discover.xml
 create mode 100644 core/administrator/components/com_installer/models/forms/filter_languages.xml
 create mode 100644 core/administrator/components/com_installer/models/forms/filter_manage.xml
 create mode 100644 core/administrator/components/com_installer/models/forms/filter_update.xml
 create mode 100644 core/administrator/components/com_installer/models/forms/filter_updatesites.xml
 create mode 100644 core/administrator/components/com_installer/models/install.php
 create mode 100644 core/administrator/components/com_installer/models/languages.php
 create mode 100644 core/administrator/components/com_installer/models/manage.php
 create mode 100644 core/administrator/components/com_installer/models/update.php
 create mode 100644 core/administrator/components/com_installer/models/updatesites.php
 create mode 100644 core/administrator/components/com_installer/models/warnings.php
 create mode 100644 core/administrator/components/com_installer/views/database/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/database/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/database/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/default/tmpl/default_ftp.php
 create mode 100644 core/administrator/components/com_installer/views/default/tmpl/default_message.php
 create mode 100644 core/administrator/components/com_installer/views/default/view.php
 create mode 100644 core/administrator/components/com_installer/views/discover/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/discover/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/discover/tmpl/default_item.php
 create mode 100644 core/administrator/components/com_installer/views/discover/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/install/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/install/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/install/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/languages/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/languages/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/languages/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/manage/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/manage/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/manage/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/update/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/update/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/update/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/updatesites/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/updatesites/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/updatesites/view.html.php
 create mode 100644 core/administrator/components/com_installer/views/warnings/tmpl/default.php
 create mode 100755 core/administrator/components/com_installer/views/warnings/tmpl/default.xml
 create mode 100644 core/administrator/components/com_installer/views/warnings/view.html.php
 create mode 100644 core/administrator/components/com_joomlaupdate/access.xml
 create mode 100644 core/administrator/components/com_joomlaupdate/config.xml
 create mode 100644 core/administrator/components/com_joomlaupdate/controller.php
 create mode 100644 core/administrator/components/com_joomlaupdate/controllers/update.php
 create mode 100644 core/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
 create mode 100644 core/administrator/components/com_joomlaupdate/helpers/select.php
 create mode 100644 core/administrator/components/com_joomlaupdate/joomlaupdate.php
 create mode 100644 core/administrator/components/com_joomlaupdate/joomlaupdate.xml
 create mode 100644 core/administrator/components/com_joomlaupdate/models/default.php
 create mode 100644 core/administrator/components/com_joomlaupdate/restore.php
 create mode 100644 core/administrator/components/com_joomlaupdate/restore_finalisation.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
 create mode 100755 core/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/default/view.html.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/update/view.html.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php
 create mode 100644 core/administrator/components/com_joomlaupdate/views/upload/view.html.php
 create mode 100644 core/administrator/components/com_languages/access.xml
 create mode 100644 core/administrator/components/com_languages/config.xml
 create mode 100644 core/administrator/components/com_languages/controller.php
 create mode 100644 core/administrator/components/com_languages/controllers/installed.php
 create mode 100644 core/administrator/components/com_languages/controllers/language.php
 create mode 100644 core/administrator/components/com_languages/controllers/languages.php
 create mode 100644 core/administrator/components/com_languages/controllers/override.php
 create mode 100644 core/administrator/components/com_languages/controllers/overrides.php
 create mode 100644 core/administrator/components/com_languages/controllers/strings.json.php
 create mode 100644 core/administrator/components/com_languages/helpers/html/languages.php
 create mode 100644 core/administrator/components/com_languages/helpers/jsonresponse.php
 create mode 100644 core/administrator/components/com_languages/helpers/languages.php
 create mode 100644 core/administrator/components/com_languages/helpers/multilangstatus.php
 create mode 100644 core/administrator/components/com_languages/languages.php
 create mode 100644 core/administrator/components/com_languages/languages.xml
 create mode 100644 core/administrator/components/com_languages/models/forms/filter_installed.xml
 create mode 100644 core/administrator/components/com_languages/models/forms/filter_languages.xml
 create mode 100644 core/administrator/components/com_languages/models/forms/language.xml
 create mode 100644 core/administrator/components/com_languages/models/forms/override.xml
 create mode 100644 core/administrator/components/com_languages/models/installed.php
 create mode 100644 core/administrator/components/com_languages/models/language.php
 create mode 100644 core/administrator/components/com_languages/models/languages.php
 create mode 100644 core/administrator/components/com_languages/models/override.php
 create mode 100644 core/administrator/components/com_languages/models/overrides.php
 create mode 100644 core/administrator/components/com_languages/models/strings.php
 create mode 100644 core/administrator/components/com_languages/views/installed/tmpl/default.php
 create mode 100755 core/administrator/components/com_languages/views/installed/tmpl/default.xml
 create mode 100644 core/administrator/components/com_languages/views/installed/view.html.php
 create mode 100644 core/administrator/components/com_languages/views/language/tmpl/edit.php
 create mode 100644 core/administrator/components/com_languages/views/language/view.html.php
 create mode 100644 core/administrator/components/com_languages/views/languages/tmpl/default.php
 create mode 100755 core/administrator/components/com_languages/views/languages/tmpl/default.xml
 create mode 100644 core/administrator/components/com_languages/views/languages/view.html.php
 create mode 100644 core/administrator/components/com_languages/views/multilangstatus/tmpl/default.php
 create mode 100644 core/administrator/components/com_languages/views/multilangstatus/view.html.php
 create mode 100644 core/administrator/components/com_languages/views/override/tmpl/edit.php
 create mode 100644 core/administrator/components/com_languages/views/override/view.html.php
 create mode 100644 core/administrator/components/com_languages/views/overrides/tmpl/default.php
 create mode 100755 core/administrator/components/com_languages/views/overrides/tmpl/default.xml
 create mode 100644 core/administrator/components/com_languages/views/overrides/view.html.php
 create mode 100644 core/administrator/components/com_login/controller.php
 create mode 100644 core/administrator/components/com_login/login.php
 create mode 100644 core/administrator/components/com_login/login.xml
 create mode 100644 core/administrator/components/com_login/models/login.php
 create mode 100644 core/administrator/components/com_login/views/login/tmpl/default.php
 create mode 100644 core/administrator/components/com_login/views/login/view.html.php
 create mode 100644 core/administrator/components/com_media/access.xml
 create mode 100644 core/administrator/components/com_media/config.xml
 create mode 100644 core/administrator/components/com_media/controller.php
 create mode 100644 core/administrator/components/com_media/controllers/file.json.php
 create mode 100644 core/administrator/components/com_media/controllers/file.php
 create mode 100644 core/administrator/components/com_media/controllers/folder.php
 create mode 100644 core/administrator/components/com_media/helpers/media.php
 create mode 100644 core/administrator/components/com_media/layouts/toolbar/deletemedia.php
 create mode 100644 core/administrator/components/com_media/layouts/toolbar/newfolder.php
 create mode 100644 core/administrator/components/com_media/layouts/toolbar/uploadmedia.php
 create mode 100644 core/administrator/components/com_media/media.php
 create mode 100644 core/administrator/components/com_media/media.xml
 create mode 100644 core/administrator/components/com_media/models/list.php
 create mode 100644 core/administrator/components/com_media/models/manager.php
 create mode 100644 core/administrator/components/com_media/views/images/tmpl/default.php
 create mode 100644 core/administrator/components/com_media/views/images/view.html.php
 create mode 100644 core/administrator/components/com_media/views/imageslist/tmpl/default.php
 create mode 100644 core/administrator/components/com_media/views/imageslist/tmpl/default_folder.php
 create mode 100644 core/administrator/components/com_media/views/imageslist/tmpl/default_image.php
 create mode 100644 core/administrator/components/com_media/views/imageslist/view.html.php
 create mode 100644 core/administrator/components/com_media/views/media/tmpl/default.php
 create mode 100755 core/administrator/components/com_media/views/media/tmpl/default.xml
 create mode 100644 core/administrator/components/com_media/views/media/tmpl/default_folders.php
 create mode 100644 core/administrator/components/com_media/views/media/tmpl/default_navigation.php
 create mode 100644 core/administrator/components/com_media/views/media/view.html.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/default.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_doc.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_docs.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_folder.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_folders.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_img.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_imgs.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_up.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_video.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/details_videos.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/thumbs.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
 create mode 100644 core/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php
 create mode 100644 core/administrator/components/com_media/views/medialist/view.html.php
 create mode 100644 core/administrator/components/com_menus/access.xml
 create mode 100644 core/administrator/components/com_menus/config.xml
 create mode 100644 core/administrator/components/com_menus/controller.php
 create mode 100644 core/administrator/components/com_menus/controllers/item.php
 create mode 100644 core/administrator/components/com_menus/controllers/items.php
 create mode 100644 core/administrator/components/com_menus/controllers/menu.php
 create mode 100644 core/administrator/components/com_menus/controllers/menus.php
 create mode 100644 core/administrator/components/com_menus/helpers/associations.php
 create mode 100644 core/administrator/components/com_menus/helpers/html/menus.php
 create mode 100644 core/administrator/components/com_menus/helpers/menus.php
 create mode 100644 core/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
 create mode 100644 core/administrator/components/com_menus/layouts/joomla/searchtools/default.php
 create mode 100644 core/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
 create mode 100644 core/administrator/components/com_menus/menus.php
 create mode 100644 core/administrator/components/com_menus/menus.xml
 create mode 100644 core/administrator/components/com_menus/models/fields/componentscategory.php
 create mode 100644 core/administrator/components/com_menus/models/fields/menuitembytype.php
 create mode 100644 core/administrator/components/com_menus/models/fields/menuordering.php
 create mode 100644 core/administrator/components/com_menus/models/fields/menuparent.php
 create mode 100644 core/administrator/components/com_menus/models/fields/menupreset.php
 create mode 100644 core/administrator/components/com_menus/models/fields/menutype.php
 create mode 100644 core/administrator/components/com_menus/models/fields/modal/menu.php
 create mode 100644 core/administrator/components/com_menus/models/forms/filter_items.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/filter_itemsadmin.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/filter_menus.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/item.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/item_alias.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/item_component.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/item_heading.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/item_separator.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/item_url.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin_alias.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin_component.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin_container.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin_heading.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin_separator.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/itemadmin_url.xml
 create mode 100644 core/administrator/components/com_menus/models/forms/menu.xml
 create mode 100644 core/administrator/components/com_menus/models/item.php
 create mode 100644 core/administrator/components/com_menus/models/items.php
 create mode 100644 core/administrator/components/com_menus/models/menu.php
 create mode 100644 core/administrator/components/com_menus/models/menus.php
 create mode 100644 core/administrator/components/com_menus/models/menutypes.php
 create mode 100644 core/administrator/components/com_menus/presets/joomla.xml
 create mode 100644 core/administrator/components/com_menus/presets/menu.xsd
 create mode 100644 core/administrator/components/com_menus/presets/modern.xml
 create mode 100644 core/administrator/components/com_menus/tables/menu.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/edit.php
 create mode 100755 core/administrator/components/com_menus/views/item/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/edit_associations.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/edit_container.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/edit_modules.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/edit_options.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/modal.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/modal_associations.php
 create mode 100644 core/administrator/components/com_menus/views/item/tmpl/modal_options.php
 create mode 100644 core/administrator/components/com_menus/views/item/view.html.php
 create mode 100644 core/administrator/components/com_menus/views/items/tmpl/default.php
 create mode 100755 core/administrator/components/com_menus/views/items/tmpl/default.xml
 create mode 100644 core/administrator/components/com_menus/views/items/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_menus/views/items/tmpl/modal.php
 create mode 100644 core/administrator/components/com_menus/views/items/view.html.php
 create mode 100644 core/administrator/components/com_menus/views/menu/tmpl/edit.php
 create mode 100755 core/administrator/components/com_menus/views/menu/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_menus/views/menu/view.html.php
 create mode 100644 core/administrator/components/com_menus/views/menu/view.xml.php
 create mode 100644 core/administrator/components/com_menus/views/menus/tmpl/default.php
 create mode 100755 core/administrator/components/com_menus/views/menus/tmpl/default.xml
 create mode 100644 core/administrator/components/com_menus/views/menus/view.html.php
 create mode 100644 core/administrator/components/com_menus/views/menutypes/tmpl/default.php
 create mode 100644 core/administrator/components/com_menus/views/menutypes/view.html.php
 create mode 100644 core/administrator/components/com_messages/access.xml
 create mode 100644 core/administrator/components/com_messages/config.xml
 create mode 100644 core/administrator/components/com_messages/controller.php
 create mode 100644 core/administrator/components/com_messages/controllers/config.php
 create mode 100644 core/administrator/components/com_messages/controllers/message.php
 create mode 100644 core/administrator/components/com_messages/controllers/messages.php
 create mode 100644 core/administrator/components/com_messages/helpers/html/messages.php
 create mode 100644 core/administrator/components/com_messages/helpers/messages.php
 create mode 100644 core/administrator/components/com_messages/messages.php
 create mode 100644 core/administrator/components/com_messages/messages.xml
 create mode 100644 core/administrator/components/com_messages/models/config.php
 create mode 100644 core/administrator/components/com_messages/models/fields/messagestates.php
 create mode 100644 core/administrator/components/com_messages/models/fields/usermessages.php
 create mode 100644 core/administrator/components/com_messages/models/forms/config.xml
 create mode 100644 core/administrator/components/com_messages/models/forms/filter_messages.xml
 create mode 100644 core/administrator/components/com_messages/models/forms/message.xml
 create mode 100644 core/administrator/components/com_messages/models/message.php
 create mode 100644 core/administrator/components/com_messages/models/messages.php
 create mode 100644 core/administrator/components/com_messages/tables/message.php
 create mode 100644 core/administrator/components/com_messages/views/config/tmpl/default.php
 create mode 100644 core/administrator/components/com_messages/views/config/view.html.php
 create mode 100644 core/administrator/components/com_messages/views/message/tmpl/default.php
 create mode 100644 core/administrator/components/com_messages/views/message/tmpl/edit.php
 create mode 100644 core/administrator/components/com_messages/views/message/view.html.php
 create mode 100644 core/administrator/components/com_messages/views/messages/tmpl/default.php
 create mode 100644 core/administrator/components/com_messages/views/messages/view.html.php
 create mode 100644 core/administrator/components/com_modules/access.xml
 create mode 100644 core/administrator/components/com_modules/config.xml
 create mode 100644 core/administrator/components/com_modules/controller.php
 create mode 100644 core/administrator/components/com_modules/controllers/module.php
 create mode 100644 core/administrator/components/com_modules/controllers/modules.php
 create mode 100644 core/administrator/components/com_modules/helpers/html/modules.php
 create mode 100644 core/administrator/components/com_modules/helpers/modules.php
 create mode 100644 core/administrator/components/com_modules/helpers/xml.php
 create mode 100644 core/administrator/components/com_modules/layouts/toolbar/cancelselect.php
 create mode 100644 core/administrator/components/com_modules/layouts/toolbar/newmodule.php
 create mode 100644 core/administrator/components/com_modules/models/fields/modulesmodule.php
 create mode 100644 core/administrator/components/com_modules/models/fields/modulesposition.php
 create mode 100644 core/administrator/components/com_modules/models/forms/advanced.xml
 create mode 100644 core/administrator/components/com_modules/models/forms/filter_modules.xml
 create mode 100644 core/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
 create mode 100644 core/administrator/components/com_modules/models/forms/module.xml
 create mode 100644 core/administrator/components/com_modules/models/forms/moduleadmin.xml
 create mode 100644 core/administrator/components/com_modules/models/module.php
 create mode 100644 core/administrator/components/com_modules/models/modules.php
 create mode 100644 core/administrator/components/com_modules/models/positions.php
 create mode 100644 core/administrator/components/com_modules/models/select.php
 create mode 100644 core/administrator/components/com_modules/modules.php
 create mode 100644 core/administrator/components/com_modules/modules.xml
 create mode 100644 core/administrator/components/com_modules/views/module/tmpl/edit.php
 create mode 100644 core/administrator/components/com_modules/views/module/tmpl/edit_assignment.php
 create mode 100644 core/administrator/components/com_modules/views/module/tmpl/edit_options.php
 create mode 100644 core/administrator/components/com_modules/views/module/tmpl/edit_positions.php
 create mode 100644 core/administrator/components/com_modules/views/module/tmpl/modal.php
 create mode 100644 core/administrator/components/com_modules/views/module/view.html.php
 create mode 100644 core/administrator/components/com_modules/views/module/view.json.php
 create mode 100644 core/administrator/components/com_modules/views/modules/tmpl/default.php
 create mode 100755 core/administrator/components/com_modules/views/modules/tmpl/default.xml
 create mode 100644 core/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_modules/views/modules/tmpl/modal.php
 create mode 100644 core/administrator/components/com_modules/views/modules/view.html.php
 create mode 100644 core/administrator/components/com_modules/views/positions/tmpl/modal.php
 create mode 100644 core/administrator/components/com_modules/views/positions/view.html.php
 create mode 100644 core/administrator/components/com_modules/views/preview/tmpl/default.php
 create mode 100644 core/administrator/components/com_modules/views/preview/view.html.php
 create mode 100644 core/administrator/components/com_modules/views/select/tmpl/default.php
 create mode 100644 core/administrator/components/com_modules/views/select/view.html.php
 create mode 100644 core/administrator/components/com_newsfeeds/access.xml
 create mode 100644 core/administrator/components/com_newsfeeds/config.xml
 create mode 100644 core/administrator/components/com_newsfeeds/controller.php
 create mode 100644 core/administrator/components/com_newsfeeds/controllers/newsfeed.php
 create mode 100644 core/administrator/components/com_newsfeeds/controllers/newsfeeds.php
 create mode 100644 core/administrator/components/com_newsfeeds/helpers/associations.php
 create mode 100644 core/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
 create mode 100644 core/administrator/components/com_newsfeeds/helpers/newsfeeds.php
 create mode 100644 core/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
 create mode 100644 core/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
 create mode 100644 core/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml
 create mode 100644 core/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
 create mode 100644 core/administrator/components/com_newsfeeds/models/newsfeed.php
 create mode 100644 core/administrator/components/com_newsfeeds/models/newsfeeds.php
 create mode 100644 core/administrator/components/com_newsfeeds/newsfeeds.php
 create mode 100644 core/administrator/components/com_newsfeeds/newsfeeds.xml
 create mode 100644 core/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql
 create mode 100644 core/administrator/components/com_newsfeeds/sql/uninstall.mysql.utf8.sql
 create mode 100644 core/administrator/components/com_newsfeeds/tables/newsfeed.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
 create mode 100644 core/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
 create mode 100644 core/administrator/components/com_plugins/access.xml
 create mode 100644 core/administrator/components/com_plugins/config.xml
 create mode 100644 core/administrator/components/com_plugins/controller.php
 create mode 100644 core/administrator/components/com_plugins/controllers/plugin.php
 create mode 100644 core/administrator/components/com_plugins/controllers/plugins.php
 create mode 100644 core/administrator/components/com_plugins/helpers/plugins.php
 create mode 100644 core/administrator/components/com_plugins/models/fields/pluginordering.php
 create mode 100644 core/administrator/components/com_plugins/models/fields/plugintype.php
 create mode 100644 core/administrator/components/com_plugins/models/forms/filter_plugins.xml
 create mode 100644 core/administrator/components/com_plugins/models/forms/plugin.xml
 create mode 100644 core/administrator/components/com_plugins/models/plugin.php
 create mode 100644 core/administrator/components/com_plugins/models/plugins.php
 create mode 100644 core/administrator/components/com_plugins/plugins.php
 create mode 100644 core/administrator/components/com_plugins/plugins.xml
 create mode 100644 core/administrator/components/com_plugins/views/plugin/tmpl/edit.php
 create mode 100644 core/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
 create mode 100644 core/administrator/components/com_plugins/views/plugin/tmpl/modal.php
 create mode 100644 core/administrator/components/com_plugins/views/plugin/view.html.php
 create mode 100644 core/administrator/components/com_plugins/views/plugins/tmpl/default.php
 create mode 100755 core/administrator/components/com_plugins/views/plugins/tmpl/default.xml
 create mode 100644 core/administrator/components/com_plugins/views/plugins/view.html.php
 create mode 100644 core/administrator/components/com_postinstall/access.xml
 create mode 100644 core/administrator/components/com_postinstall/config.xml
 create mode 100644 core/administrator/components/com_postinstall/controllers/message.php
 create mode 100644 core/administrator/components/com_postinstall/fof.xml
 create mode 100644 core/administrator/components/com_postinstall/models/messages.php
 create mode 100644 core/administrator/components/com_postinstall/postinstall.php
 create mode 100644 core/administrator/components/com_postinstall/postinstall.xml
 create mode 100644 core/administrator/components/com_postinstall/toolbar.php
 create mode 100644 core/administrator/components/com_postinstall/views/messages/tmpl/default.php
 create mode 100755 core/administrator/components/com_postinstall/views/messages/tmpl/default.xml
 create mode 100644 core/administrator/components/com_postinstall/views/messages/view.html.php
 create mode 100644 core/administrator/components/com_redirect/access.xml
 create mode 100644 core/administrator/components/com_redirect/config.xml
 create mode 100644 core/administrator/components/com_redirect/controller.php
 create mode 100644 core/administrator/components/com_redirect/controllers/link.php
 create mode 100644 core/administrator/components/com_redirect/controllers/links.php
 create mode 100644 core/administrator/components/com_redirect/helpers/html/redirect.php
 create mode 100644 core/administrator/components/com_redirect/helpers/redirect.php
 create mode 100644 core/administrator/components/com_redirect/layouts/toolbar/batch.php
 create mode 100644 core/administrator/components/com_redirect/models/fields/redirect.php
 create mode 100644 core/administrator/components/com_redirect/models/forms/filter_links.xml
 create mode 100644 core/administrator/components/com_redirect/models/forms/link.xml
 create mode 100644 core/administrator/components/com_redirect/models/link.php
 create mode 100644 core/administrator/components/com_redirect/models/links.php
 create mode 100644 core/administrator/components/com_redirect/redirect.php
 create mode 100644 core/administrator/components/com_redirect/redirect.xml
 create mode 100644 core/administrator/components/com_redirect/tables/link.php
 create mode 100644 core/administrator/components/com_redirect/views/link/tmpl/edit.php
 create mode 100644 core/administrator/components/com_redirect/views/link/view.html.php
 create mode 100644 core/administrator/components/com_redirect/views/links/tmpl/default.php
 create mode 100644 core/administrator/components/com_redirect/views/links/tmpl/default.xml
 create mode 100644 core/administrator/components/com_redirect/views/links/tmpl/default_addform.php
 create mode 100644 core/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_redirect/views/links/view.html.php
 create mode 100644 core/administrator/components/com_search/access.xml
 create mode 100644 core/administrator/components/com_search/config.xml
 create mode 100644 core/administrator/components/com_search/controller.php
 create mode 100644 core/administrator/components/com_search/controllers/searches.php
 create mode 100644 core/administrator/components/com_search/helpers/search.php
 create mode 100644 core/administrator/components/com_search/helpers/site.php
 create mode 100644 core/administrator/components/com_search/models/forms/filter_searches.xml
 create mode 100644 core/administrator/components/com_search/models/searches.php
 create mode 100644 core/administrator/components/com_search/search.php
 create mode 100644 core/administrator/components/com_search/search.xml
 create mode 100644 core/administrator/components/com_search/views/searches/tmpl/default.php
 create mode 100644 core/administrator/components/com_search/views/searches/tmpl/default.xml
 create mode 100644 core/administrator/components/com_search/views/searches/view.html.php
 create mode 100644 core/administrator/components/com_tags/access.xml
 create mode 100644 core/administrator/components/com_tags/config.xml
 create mode 100644 core/administrator/components/com_tags/controller.php
 create mode 100644 core/administrator/components/com_tags/controllers/tag.php
 create mode 100644 core/administrator/components/com_tags/controllers/tags.php
 create mode 100644 core/administrator/components/com_tags/helpers/tags.php
 create mode 100644 core/administrator/components/com_tags/models/forms/filter_tags.xml
 create mode 100644 core/administrator/components/com_tags/models/forms/tag.xml
 create mode 100644 core/administrator/components/com_tags/models/tag.php
 create mode 100644 core/administrator/components/com_tags/models/tags.php
 create mode 100644 core/administrator/components/com_tags/tables/tag.php
 create mode 100644 core/administrator/components/com_tags/tags.php
 create mode 100644 core/administrator/components/com_tags/tags.xml
 create mode 100644 core/administrator/components/com_tags/views/tag/tmpl/edit.php
 create mode 100644 core/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
 create mode 100644 core/administrator/components/com_tags/views/tag/tmpl/edit_options.php
 create mode 100644 core/administrator/components/com_tags/views/tag/view.html.php
 create mode 100644 core/administrator/components/com_tags/views/tags/tmpl/default.php
 create mode 100644 core/administrator/components/com_tags/views/tags/tmpl/default.xml
 create mode 100644 core/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_tags/views/tags/view.html.php
 create mode 100644 core/administrator/components/com_templates/access.xml
 create mode 100644 core/administrator/components/com_templates/config.xml
 create mode 100644 core/administrator/components/com_templates/controller.php
 create mode 100644 core/administrator/components/com_templates/controllers/style.php
 create mode 100644 core/administrator/components/com_templates/controllers/styles.php
 create mode 100644 core/administrator/components/com_templates/controllers/template.php
 create mode 100644 core/administrator/components/com_templates/helpers/html/templates.php
 create mode 100644 core/administrator/components/com_templates/helpers/template.php
 create mode 100644 core/administrator/components/com_templates/helpers/templates.php
 create mode 100644 core/administrator/components/com_templates/models/fields/templatelocation.php
 create mode 100644 core/administrator/components/com_templates/models/fields/templatename.php
 create mode 100644 core/administrator/components/com_templates/models/forms/filter_styles.xml
 create mode 100644 core/administrator/components/com_templates/models/forms/filter_templates.xml
 create mode 100644 core/administrator/components/com_templates/models/forms/source.xml
 create mode 100644 core/administrator/components/com_templates/models/forms/style.xml
 create mode 100644 core/administrator/components/com_templates/models/forms/style_administrator.xml
 create mode 100644 core/administrator/components/com_templates/models/forms/style_site.xml
 create mode 100644 core/administrator/components/com_templates/models/style.php
 create mode 100644 core/administrator/components/com_templates/models/styles.php
 create mode 100644 core/administrator/components/com_templates/models/template.php
 create mode 100644 core/administrator/components/com_templates/models/templates.php
 create mode 100644 core/administrator/components/com_templates/tables/style.php
 create mode 100644 core/administrator/components/com_templates/templates.php
 create mode 100644 core/administrator/components/com_templates/templates.xml
 create mode 100644 core/administrator/components/com_templates/views/style/tmpl/edit.php
 create mode 100644 core/administrator/components/com_templates/views/style/tmpl/edit_assignment.php
 create mode 100644 core/administrator/components/com_templates/views/style/tmpl/edit_options.php
 create mode 100644 core/administrator/components/com_templates/views/style/view.html.php
 create mode 100644 core/administrator/components/com_templates/views/style/view.json.php
 create mode 100644 core/administrator/components/com_templates/views/styles/tmpl/default.php
 create mode 100755 core/administrator/components/com_templates/views/styles/tmpl/default.xml
 create mode 100644 core/administrator/components/com_templates/views/styles/view.html.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_description.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_folders.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/default_tree.php
 create mode 100644 core/administrator/components/com_templates/views/template/tmpl/readonly.php
 create mode 100644 core/administrator/components/com_templates/views/template/view.html.php
 create mode 100644 core/administrator/components/com_templates/views/templates/tmpl/default.php
 create mode 100755 core/administrator/components/com_templates/views/templates/tmpl/default.xml
 create mode 100644 core/administrator/components/com_templates/views/templates/view.html.php
 create mode 100644 core/administrator/components/com_users/access.xml
 create mode 100644 core/administrator/components/com_users/config.xml
 create mode 100644 core/administrator/components/com_users/controller.php
 create mode 100644 core/administrator/components/com_users/controllers/group.php
 create mode 100644 core/administrator/components/com_users/controllers/groups.php
 create mode 100644 core/administrator/components/com_users/controllers/level.php
 create mode 100644 core/administrator/components/com_users/controllers/levels.php
 create mode 100644 core/administrator/components/com_users/controllers/mail.php
 create mode 100644 core/administrator/components/com_users/controllers/note.php
 create mode 100644 core/administrator/components/com_users/controllers/notes.php
 create mode 100644 core/administrator/components/com_users/controllers/profile.json.php
 create mode 100644 core/administrator/components/com_users/controllers/user.php
 create mode 100644 core/administrator/components/com_users/controllers/users.php
 create mode 100644 core/administrator/components/com_users/helpers/debug.php
 create mode 100644 core/administrator/components/com_users/helpers/html/users.php
 create mode 100644 core/administrator/components/com_users/helpers/users.php
 create mode 100644 core/administrator/components/com_users/models/debuggroup.php
 create mode 100644 core/administrator/components/com_users/models/debuguser.php
 create mode 100644 core/administrator/components/com_users/models/fields/groupparent.php
 create mode 100644 core/administrator/components/com_users/models/fields/levels.php
 create mode 100644 core/administrator/components/com_users/models/forms/fields/user.xml
 create mode 100644 core/administrator/components/com_users/models/forms/filter_debuggroup.xml
 create mode 100644 core/administrator/components/com_users/models/forms/filter_debuguser.xml
 create mode 100644 core/administrator/components/com_users/models/forms/filter_groups.xml
 create mode 100644 core/administrator/components/com_users/models/forms/filter_levels.xml
 create mode 100644 core/administrator/components/com_users/models/forms/filter_notes.xml
 create mode 100644 core/administrator/components/com_users/models/forms/filter_users.xml
 create mode 100644 core/administrator/components/com_users/models/forms/group.xml
 create mode 100644 core/administrator/components/com_users/models/forms/level.xml
 create mode 100644 core/administrator/components/com_users/models/forms/mail.xml
 create mode 100644 core/administrator/components/com_users/models/forms/note.xml
 create mode 100644 core/administrator/components/com_users/models/forms/user.xml
 create mode 100644 core/administrator/components/com_users/models/group.php
 create mode 100644 core/administrator/components/com_users/models/groups.php
 create mode 100644 core/administrator/components/com_users/models/level.php
 create mode 100644 core/administrator/components/com_users/models/levels.php
 create mode 100644 core/administrator/components/com_users/models/mail.php
 create mode 100644 core/administrator/components/com_users/models/note.php
 create mode 100644 core/administrator/components/com_users/models/notes.php
 create mode 100644 core/administrator/components/com_users/models/user.php
 create mode 100644 core/administrator/components/com_users/models/users.php
 create mode 100644 core/administrator/components/com_users/tables/note.php
 create mode 100644 core/administrator/components/com_users/users.php
 create mode 100644 core/administrator/components/com_users/users.xml
 create mode 100644 core/administrator/components/com_users/views/debuggroup/tmpl/default.php
 create mode 100644 core/administrator/components/com_users/views/debuggroup/view.html.php
 create mode 100644 core/administrator/components/com_users/views/debuguser/tmpl/default.php
 create mode 100644 core/administrator/components/com_users/views/debuguser/view.html.php
 create mode 100644 core/administrator/components/com_users/views/group/tmpl/edit.php
 create mode 100755 core/administrator/components/com_users/views/group/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_users/views/group/view.html.php
 create mode 100644 core/administrator/components/com_users/views/groups/tmpl/default.php
 create mode 100755 core/administrator/components/com_users/views/groups/tmpl/default.xml
 create mode 100644 core/administrator/components/com_users/views/groups/view.html.php
 create mode 100644 core/administrator/components/com_users/views/level/tmpl/edit.php
 create mode 100755 core/administrator/components/com_users/views/level/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_users/views/level/view.html.php
 create mode 100644 core/administrator/components/com_users/views/levels/tmpl/default.php
 create mode 100755 core/administrator/components/com_users/views/levels/tmpl/default.xml
 create mode 100644 core/administrator/components/com_users/views/levels/view.html.php
 create mode 100644 core/administrator/components/com_users/views/mail/tmpl/default.php
 create mode 100755 core/administrator/components/com_users/views/mail/tmpl/default.xml
 create mode 100644 core/administrator/components/com_users/views/mail/view.html.php
 create mode 100644 core/administrator/components/com_users/views/note/tmpl/edit.php
 create mode 100755 core/administrator/components/com_users/views/note/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_users/views/note/view.html.php
 create mode 100644 core/administrator/components/com_users/views/notes/tmpl/default.php
 create mode 100755 core/administrator/components/com_users/views/notes/tmpl/default.xml
 create mode 100644 core/administrator/components/com_users/views/notes/tmpl/modal.php
 create mode 100644 core/administrator/components/com_users/views/notes/view.html.php
 create mode 100644 core/administrator/components/com_users/views/user/tmpl/edit.php
 create mode 100755 core/administrator/components/com_users/views/user/tmpl/edit.xml
 create mode 100644 core/administrator/components/com_users/views/user/tmpl/edit_groups.php
 create mode 100644 core/administrator/components/com_users/views/user/view.html.php
 create mode 100644 core/administrator/components/com_users/views/users/tmpl/default.php
 create mode 100755 core/administrator/components/com_users/views/users/tmpl/default.xml
 create mode 100644 core/administrator/components/com_users/views/users/tmpl/default_batch_body.php
 create mode 100644 core/administrator/components/com_users/views/users/tmpl/default_batch_footer.php
 create mode 100644 core/administrator/components/com_users/views/users/tmpl/modal.php
 create mode 100644 core/administrator/components/com_users/views/users/view.html.php
 create mode 100644 core/administrator/help/en-GB/toc.json
 create mode 100644 core/administrator/help/helpsites.xml
 create mode 100644 core/administrator/includes/defines.php
 create mode 100644 core/administrator/includes/framework.php
 create mode 100644 core/administrator/includes/helper.php
 create mode 100644 core/administrator/includes/subtoolbar.php
 create mode 100644 core/administrator/includes/toolbar.php
 create mode 100644 core/administrator/index.php
 create mode 100644 core/administrator/language/en-GB/en-GB.com_admin.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_admin.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_ajax.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_ajax.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_associations.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_associations.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_banners.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_banners.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_cache.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_cache.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_categories.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_categories.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_checkin.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_checkin.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_config.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_config.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_contact.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_contact.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_content.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_content.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_contenthistory.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_cpanel.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_fields.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_fields.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_finder.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_finder.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_installer.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_installer.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_languages.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_languages.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_login.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_login.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_mailto.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_media.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_media.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_menus.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_menus.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_messages.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_messages.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_modules.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_modules.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_newsfeeds.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_plugins.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_plugins.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_postinstall.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_redirect.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_redirect.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_search.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_search.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_tags.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_tags.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_templates.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_templates.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_users.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_users.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_weblinks.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_wrapper.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.lib_joomla.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.localise.php
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_custom.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_custom.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_feed.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_feed.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_latest.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_latest.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_logged.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_logged.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_login.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_login.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_menu.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_menu.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_popular.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_popular.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_quickicon.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_sampledata.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_stats_admin.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_status.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_status.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_submenu.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_title.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_title.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_toolbar.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_version.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.mod_version.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_contact.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_fields.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_finder.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_joomla.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_vote.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors_none.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_calendar.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_color.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_editor.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_image.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_integer.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_list.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_media.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_radio.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_sql.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_text.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_url.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_user.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_categories.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_content.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_tags.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_categories.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_contacts.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_content.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_tags.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_cache.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_debug.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_fields.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_highlight.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_log.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_logout.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_p3p.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_redirect.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_remember.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_sef.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_stats.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_user_joomla.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_user_profile.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.tpl_hathor.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.tpl_isis.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
 create mode 100644 core/administrator/language/en-GB/en-GB.xml
 create mode 100644 core/administrator/language/en-GB/install.xml
 create mode 100644 core/administrator/language/overrides/index.html
 create mode 100644 core/administrator/logs/index.html
 create mode 100644 core/administrator/manifests/files/joomla.xml
 create mode 100644 core/administrator/manifests/libraries/fof.xml
 create mode 100644 core/administrator/manifests/libraries/idna_convert.xml
 create mode 100644 core/administrator/manifests/libraries/joomla.xml
 create mode 100644 core/administrator/manifests/libraries/phpass.xml
 create mode 100644 core/administrator/manifests/libraries/phputf8.xml
 create mode 100644 core/administrator/manifests/packages/index.html
 create mode 100644 core/administrator/manifests/packages/pkg_en-GB.xml
 create mode 100644 core/administrator/modules/mod_custom/mod_custom.php
 create mode 100644 core/administrator/modules/mod_custom/mod_custom.xml
 create mode 100644 core/administrator/modules/mod_custom/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_feed/helper.php
 create mode 100644 core/administrator/modules/mod_feed/mod_feed.php
 create mode 100644 core/administrator/modules/mod_feed/mod_feed.xml
 create mode 100644 core/administrator/modules/mod_feed/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_latest/helper.php
 create mode 100644 core/administrator/modules/mod_latest/mod_latest.php
 create mode 100644 core/administrator/modules/mod_latest/mod_latest.xml
 create mode 100644 core/administrator/modules/mod_latest/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_logged/helper.php
 create mode 100644 core/administrator/modules/mod_logged/mod_logged.php
 create mode 100644 core/administrator/modules/mod_logged/mod_logged.xml
 create mode 100644 core/administrator/modules/mod_logged/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_login/helper.php
 create mode 100644 core/administrator/modules/mod_login/mod_login.php
 create mode 100644 core/administrator/modules/mod_login/mod_login.xml
 create mode 100644 core/administrator/modules/mod_login/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_menu/helper.php
 create mode 100644 core/administrator/modules/mod_menu/menu.php
 create mode 100644 core/administrator/modules/mod_menu/mod_menu.php
 create mode 100644 core/administrator/modules/mod_menu/mod_menu.xml
 create mode 100644 core/administrator/modules/mod_menu/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_menu/tmpl/default_submenu.php
 create mode 100644 core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
 create mode 100644 core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
 create mode 100644 core/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
 create mode 100644 core/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
 create mode 100644 core/administrator/modules/mod_multilangstatus/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_popular/helper.php
 create mode 100644 core/administrator/modules/mod_popular/mod_popular.php
 create mode 100644 core/administrator/modules/mod_popular/mod_popular.xml
 create mode 100644 core/administrator/modules/mod_popular/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_quickicon/helper.php
 create mode 100644 core/administrator/modules/mod_quickicon/mod_quickicon.php
 create mode 100644 core/administrator/modules/mod_quickicon/mod_quickicon.xml
 create mode 100644 core/administrator/modules/mod_quickicon/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_sampledata/helper.php
 create mode 100644 core/administrator/modules/mod_sampledata/mod_sampledata.php
 create mode 100644 core/administrator/modules/mod_sampledata/mod_sampledata.xml
 create mode 100644 core/administrator/modules/mod_sampledata/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_stats_admin/helper.php
 create mode 100644 core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
 create mode 100644 core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
 create mode 100644 core/administrator/modules/mod_stats_admin/mod_stats_admin.php
 create mode 100644 core/administrator/modules/mod_stats_admin/mod_stats_admin.xml
 create mode 100644 core/administrator/modules/mod_stats_admin/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_status/mod_status.php
 create mode 100644 core/administrator/modules/mod_status/mod_status.xml
 create mode 100644 core/administrator/modules/mod_status/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_submenu/mod_submenu.php
 create mode 100644 core/administrator/modules/mod_submenu/mod_submenu.xml
 create mode 100644 core/administrator/modules/mod_submenu/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_title/mod_title.php
 create mode 100644 core/administrator/modules/mod_title/mod_title.xml
 create mode 100644 core/administrator/modules/mod_title/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_toolbar/mod_toolbar.php
 create mode 100644 core/administrator/modules/mod_toolbar/mod_toolbar.xml
 create mode 100644 core/administrator/modules/mod_toolbar/tmpl/default.php
 create mode 100644 core/administrator/modules/mod_version/helper.php
 create mode 100644 core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini
 create mode 100644 core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini
 create mode 100644 core/administrator/modules/mod_version/mod_version.php
 create mode 100644 core/administrator/modules/mod_version/mod_version.xml
 create mode 100644 core/administrator/modules/mod_version/tmpl/default.php
 create mode 100644 core/administrator/templates/hathor/LICENSE.txt
 create mode 100644 core/administrator/templates/hathor/component.php
 create mode 100644 core/administrator/templates/hathor/cpanel.php
 create mode 100644 core/administrator/templates/hathor/css/boldtext.css
 create mode 100644 core/administrator/templates/hathor/css/colour_blue.css
 create mode 100644 core/administrator/templates/hathor/css/colour_blue_rtl.css
 create mode 100644 core/administrator/templates/hathor/css/colour_brown.css
 create mode 100644 core/administrator/templates/hathor/css/colour_brown_rtl.css
 create mode 100644 core/administrator/templates/hathor/css/colour_highcontrast.css
 create mode 100644 core/administrator/templates/hathor/css/colour_highcontrast_rtl.css
 create mode 100644 core/administrator/templates/hathor/css/colour_standard.css
 create mode 100644 core/administrator/templates/hathor/css/colour_standard_rtl.css
 create mode 100644 core/administrator/templates/hathor/css/error.css
 create mode 100644 core/administrator/templates/hathor/css/ie7.css
 create mode 100644 core/administrator/templates/hathor/css/ie8.css
 create mode 100644 core/administrator/templates/hathor/css/template.css
 create mode 100644 core/administrator/templates/hathor/css/template_rtl.css
 create mode 100644 core/administrator/templates/hathor/css/theme.css
 create mode 100644 core/administrator/templates/hathor/error.php
 create mode 100644 core/administrator/templates/hathor/favicon.ico
 create mode 100644 core/administrator/templates/hathor/html/com_admin/help/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/profile/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/sysinfo/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php
 create mode 100644 core/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php
 create mode 100644 core/administrator/templates/hathor/html/com_associations/associations/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_banners/banner/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_banners/banners/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_banners/client/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_banners/clients/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_banners/download/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_banners/tracks/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_cache/cache/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_cache/purge/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_categories/categories/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_categories/category/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_categories/category/edit_options.php
 create mode 100644 core/administrator/templates/hathor/html/com_checkin/checkin/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_cache.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_cookie.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_database.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_debug.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_filters.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_ftp.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_ftplogin.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_locale.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_mail.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_metadata.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_navigation.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_permissions.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_seo.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_server.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_session.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_site.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/application/default_system.php
 create mode 100644 core/administrator/templates/hathor/html/com_config/component/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_contact/contact/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_contact/contact/edit_params.php
 create mode 100644 core/administrator/templates/hathor/html/com_contact/contacts/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_contact/contacts/modal.php
 create mode 100644 core/administrator/templates/hathor/html/com_content/article/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_content/articles/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_content/articles/modal.php
 create mode 100644 core/administrator/templates/hathor/html/com_content/featured/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_contenthistory/history/modal.php
 create mode 100644 core/administrator/templates/hathor/html/com_cpanel/cpanel/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_fields/field/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_fields/fields/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_fields/group/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_fields/groups/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_finder/filters/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_finder/index/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_finder/maps/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/database/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/default/default_ftp.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/discover/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/install/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/install/default_form.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/languages/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/languages/default_filter.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/manage/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/manage/default_filter.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/update/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_installer/warnings/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_joomlaupdate/default/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_languages/installed/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
 create mode 100644 core/administrator/templates/hathor/html/com_languages/languages/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_languages/overrides/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_menus/item/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_menus/item/edit_options.php
 create mode 100644 core/administrator/templates/hathor/html/com_menus/items/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_menus/menu/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_menus/menus/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_menus/menutypes/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_messages/message/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_messages/messages/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_modules/module/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_modules/module/edit_assignment.php
 create mode 100644 core/administrator/templates/hathor/html/com_modules/module/edit_options.php
 create mode 100644 core/administrator/templates/hathor/html/com_modules/modules/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_modules/positions/modal.php
 create mode 100644 core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php
 create mode 100644 core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
 create mode 100644 core/administrator/templates/hathor/html/com_plugins/plugin/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
 create mode 100644 core/administrator/templates/hathor/html/com_plugins/plugins/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_postinstall/messages/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_redirect/links/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_search/searches/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_tags/tag/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php
 create mode 100644 core/administrator/templates/hathor/html/com_tags/tag/edit_options.php
 create mode 100644 core/administrator/templates/hathor/html/com_tags/tags/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/style/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/style/edit_assignment.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/style/edit_options.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/styles/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/template/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/template/default_description.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/template/default_folders.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/template/default_tree.php
 create mode 100644 core/administrator/templates/hathor/html/com_templates/templates/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/debuggroup/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/debuguser/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/groups/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/levels/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/note/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/notes/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/user/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/users/default.php
 create mode 100644 core/administrator/templates/hathor/html/com_users/users/modal.php
 create mode 100644 core/administrator/templates/hathor/html/com_weblinks/weblink/edit.php
 create mode 100644 core/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
 create mode 100644 core/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/edit/details.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/edit/fieldset.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/edit/global.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/edit/params.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php
 create mode 100644 core/administrator/templates/hathor/html/layouts/plugins/user/profile/fields/dob.php
 create mode 100644 core/administrator/templates/hathor/html/mod_login/default.php
 create mode 100644 core/administrator/templates/hathor/html/mod_quickicon/default.php
 create mode 100644 core/administrator/templates/hathor/html/modules.php
 create mode 100644 core/administrator/templates/hathor/html/pagination.php
 create mode 100644 core/administrator/templates/hathor/images/admin/blank.png
 create mode 100644 core/administrator/templates/hathor/images/admin/checked_out.png
 create mode 100644 core/administrator/templates/hathor/images/admin/collapseall.png
 create mode 100644 core/administrator/templates/hathor/images/admin/disabled.png
 create mode 100644 core/administrator/templates/hathor/images/admin/downarrow-1.png
 create mode 100644 core/administrator/templates/hathor/images/admin/downarrow.png
 create mode 100644 core/administrator/templates/hathor/images/admin/downarrow0.png
 create mode 100644 core/administrator/templates/hathor/images/admin/expandall.png
 create mode 100644 core/administrator/templates/hathor/images/admin/featured.png
 create mode 100644 core/administrator/templates/hathor/images/admin/filesave.png
 create mode 100644 core/administrator/templates/hathor/images/admin/filter_16.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-allow.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-allowinactive.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-deny.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-denyinactive.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-links.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-notice-note.png
 create mode 100644 core/administrator/templates/hathor/images/admin/icon-16-protected.png
 create mode 100644 core/administrator/templates/hathor/images/admin/menu_divider.png
 create mode 100644 core/administrator/templates/hathor/images/admin/note_add_16.png
 create mode 100644 core/administrator/templates/hathor/images/admin/publish_g.png
 create mode 100644 core/administrator/templates/hathor/images/admin/publish_r.png
 create mode 100644 core/administrator/templates/hathor/images/admin/publish_x.png
 create mode 100644 core/administrator/templates/hathor/images/admin/publish_y.png
 create mode 100644 core/administrator/templates/hathor/images/admin/sort_asc.png
 create mode 100644 core/administrator/templates/hathor/images/admin/sort_desc.png
 create mode 100644 core/administrator/templates/hathor/images/admin/tick.png
 create mode 100644 core/administrator/templates/hathor/images/admin/trash.png
 create mode 100644 core/administrator/templates/hathor/images/admin/uparrow-1.png
 create mode 100644 core/administrator/templates/hathor/images/admin/uparrow.png
 create mode 100644 core/administrator/templates/hathor/images/admin/uparrow0.png
 create mode 100644 core/administrator/templates/hathor/images/arrow.png
 create mode 100644 core/administrator/templates/hathor/images/bg-menu.gif
 create mode 100644 core/administrator/templates/hathor/images/calendar.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-alert.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-apply.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-archive.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-article-add.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-article-edit.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-article.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-assoc.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-banner-categories.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-banner-client.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-banner-tracks.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-banner.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-calendar.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-category-add.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-category.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-checkin.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-clear.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-component.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-config.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-contacts-categories.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-contacts.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-content.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-cpanel.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-default.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-deny.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-download.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-edit.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-extension.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-featured.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-frontpage.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-generic.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-groups-add.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-groups.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-help-forum.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-help-this.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-help_header.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-inbox.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-info.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-install.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-jupdate-updatefound.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-jupdate-uptodate.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-language.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-levels-add.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-levels.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-links-cat.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-links.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-massmail.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-media.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-menu-add.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-menu.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-menumgr.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-module.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-move.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-newcategory.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-newsfeeds-cat.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-newsfeeds.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-notice.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-plugin.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-preview.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-print.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-purge.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-puzzle.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-readmess.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-redirect.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-revert.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-search.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-section.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-send.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-static.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-stats.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-tags.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-themes.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-trash.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-unarchive.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-upload.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-user-add.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-user-edit.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-user-profile.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-user.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-48-writemess.png
 create mode 100644 core/administrator/templates/hathor/images/header/icon-messaging.png
 create mode 100644 core/administrator/templates/hathor/images/j_arrow.png
 create mode 100644 core/administrator/templates/hathor/images/j_arrow_down.png
 create mode 100644 core/administrator/templates/hathor/images/j_arrow_left.png
 create mode 100644 core/administrator/templates/hathor/images/j_arrow_right.png
 create mode 100644 core/administrator/templates/hathor/images/j_login_lock.png
 create mode 100644 core/administrator/templates/hathor/images/j_logo.png
 create mode 100644 core/administrator/templates/hathor/images/logo.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-alert.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-apply.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-archive.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-article.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-assoc.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-back-user.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-banner-categories.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-banner-client.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-banner.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-calendar.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-category.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-checkin.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-clear.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-component.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-config.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-contacts.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-content.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-cpanel.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-default.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-delete.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-deny.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-download.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-edit.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-featured.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-frontpage.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-generic.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-groups.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-community.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-dev.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-docs.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-forum.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-jed.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-jrd.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-security.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-shop.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-this.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help-trans.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-help.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-inbox.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-info.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-install.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-language.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-levels.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-links-cat.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-links.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-logout.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-maintenance.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-massmail.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-media.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-menu.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-menumgr.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-messages.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-messaging.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-module.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-move.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-new.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newarticle.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newcategory.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newgroup.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newlevel.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-newuser.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-nopreview.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-notdefault.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-notice.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-plugin.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-preview.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-print.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-purge.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-puzzle.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-readmess.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-redirect.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-revert.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-search.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-send.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-stats.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-tags.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-themes.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-trash.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-unarticle.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-upload.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-user-dd.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-user-note.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-user.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-viewsite.png
 create mode 100644 core/administrator/templates/hathor/images/menu/icon-16-writemess.png
 create mode 100644 core/administrator/templates/hathor/images/mini_icon.png
 create mode 100644 core/administrator/templates/hathor/images/notice-alert.png
 create mode 100644 core/administrator/templates/hathor/images/notice-info.png
 create mode 100644 core/administrator/templates/hathor/images/notice-note.png
 create mode 100644 core/administrator/templates/hathor/images/required.png
 create mode 100644 core/administrator/templates/hathor/images/selector-arrow-hc.png
 create mode 100644 core/administrator/templates/hathor/images/selector-arrow-rtl.png
 create mode 100644 core/administrator/templates/hathor/images/selector-arrow-std.png
 create mode 100644 core/administrator/templates/hathor/images/selector-arrow.png
 create mode 100644 core/administrator/templates/hathor/images/system/calendar.png
 create mode 100644 core/administrator/templates/hathor/images/system/selector-arrow.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-adduser.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-alert.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-apply.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-archive.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-article-add.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-article.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-back.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-banner-categories.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-banner-tracks.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-banner.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-batch.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-calendar.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-cancel.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-checkin.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-cog.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-component.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-config.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-contacts-categories.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-contacts.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-copy.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-css.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-default.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-delete.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-deny.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-download.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-edit.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-error.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-export.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-extension.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-featured.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-forward.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-help.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-html.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-inbox.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-info.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-links.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-lock.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-menu.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-messaging.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-messanging.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-module.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-move.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-new-privatemessage.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-new-style.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-new.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-notice.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-preview.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-print.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-publish.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-purge.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-refresh.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-remove.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-revert.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-save-copy.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-save-new.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-save.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-search.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-send.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-stats.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-trash.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-unblock.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-unpublish.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-upload.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-user-add.png
 create mode 100644 core/administrator/templates/hathor/images/toolbar/icon-32-xml.png
 create mode 100644 core/administrator/templates/hathor/index.php
 create mode 100644 core/administrator/templates/hathor/js/template.js
 create mode 100644 core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini
 create mode 100644 core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini
 create mode 100644 core/administrator/templates/hathor/less/buttons.less
 create mode 100644 core/administrator/templates/hathor/less/colour_baseline.less
 create mode 100644 core/administrator/templates/hathor/less/colour_blue.less
 create mode 100644 core/administrator/templates/hathor/less/colour_brown.less
 create mode 100644 core/administrator/templates/hathor/less/colour_standard.less
 create mode 100644 core/administrator/templates/hathor/less/forms.less
 create mode 100644 core/administrator/templates/hathor/less/hathor_variables.less
 create mode 100644 core/administrator/templates/hathor/less/icomoon.less
 create mode 100644 core/administrator/templates/hathor/less/modals.less
 create mode 100644 core/administrator/templates/hathor/less/template.less
 create mode 100644 core/administrator/templates/hathor/less/variables.less
 create mode 100644 core/administrator/templates/hathor/login.php
 create mode 100644 core/administrator/templates/hathor/postinstall/hathormessage.php
 create mode 100644 core/administrator/templates/hathor/templateDetails.xml
 create mode 100644 core/administrator/templates/hathor/template_preview.png
 create mode 100644 core/administrator/templates/hathor/template_thumbnail.png
 create mode 100644 core/administrator/templates/isis/component.php
 create mode 100644 core/administrator/templates/isis/cpanel.php
 create mode 100644 core/administrator/templates/isis/css/template-rtl.css
 create mode 100644 core/administrator/templates/isis/css/template.css
 create mode 100644 core/administrator/templates/isis/error.php
 create mode 100644 core/administrator/templates/isis/favicon.ico
 create mode 100644 core/administrator/templates/isis/html/com_media/imageslist/default_folder.php
 create mode 100644 core/administrator/templates/isis/html/com_media/imageslist/default_image.php
 create mode 100644 core/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php
 create mode 100644 core/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
 create mode 100644 core/administrator/templates/isis/html/editor_content.css
 create mode 100644 core/administrator/templates/isis/html/layouts/joomla/form/field/media.php
 create mode 100644 core/administrator/templates/isis/html/layouts/joomla/form/field/user.php
 create mode 100644 core/administrator/templates/isis/html/layouts/joomla/pagination/link.php
 create mode 100644 core/administrator/templates/isis/html/layouts/joomla/pagination/links.php
 create mode 100644 core/administrator/templates/isis/html/layouts/joomla/system/message.php
 create mode 100644 core/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php
 create mode 100644 core/administrator/templates/isis/html/mod_version/default.php
 create mode 100644 core/administrator/templates/isis/html/modules.php
 create mode 100644 core/administrator/templates/isis/html/pagination.php
 create mode 100644 core/administrator/templates/isis/images/admin/blank.png
 create mode 100644 core/administrator/templates/isis/images/admin/checked_out.png
 create mode 100644 core/administrator/templates/isis/images/admin/collapseall.png
 create mode 100644 core/administrator/templates/isis/images/admin/disabled.png
 create mode 100644 core/administrator/templates/isis/images/admin/downarrow-1.png
 create mode 100644 core/administrator/templates/isis/images/admin/downarrow.png
 create mode 100644 core/administrator/templates/isis/images/admin/downarrow0.png
 create mode 100644 core/administrator/templates/isis/images/admin/expandall.png
 create mode 100644 core/administrator/templates/isis/images/admin/featured.png
 create mode 100644 core/administrator/templates/isis/images/admin/filesave.png
 create mode 100644 core/administrator/templates/isis/images/admin/filter_16.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-add.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-allow.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-allowinactive.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-deny.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-denyinactive.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-links.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-notice-note.png
 create mode 100644 core/administrator/templates/isis/images/admin/icon-16-protected.png
 create mode 100644 core/administrator/templates/isis/images/admin/menu_divider.png
 create mode 100644 core/administrator/templates/isis/images/admin/note_add_16.png
 create mode 100644 core/administrator/templates/isis/images/admin/publish_g.png
 create mode 100644 core/administrator/templates/isis/images/admin/publish_r.png
 create mode 100644 core/administrator/templates/isis/images/admin/publish_x.png
 create mode 100644 core/administrator/templates/isis/images/admin/publish_y.png
 create mode 100644 core/administrator/templates/isis/images/admin/sort_asc.png
 create mode 100644 core/administrator/templates/isis/images/admin/sort_desc.png
 create mode 100644 core/administrator/templates/isis/images/admin/tick.png
 create mode 100644 core/administrator/templates/isis/images/admin/trash.png
 create mode 100644 core/administrator/templates/isis/images/admin/uparrow-1.png
 create mode 100644 core/administrator/templates/isis/images/admin/uparrow.png
 create mode 100644 core/administrator/templates/isis/images/admin/uparrow0.png
 create mode 100644 core/administrator/templates/isis/images/emailButton.png
 create mode 100644 core/administrator/templates/isis/images/joomla.png
 create mode 100644 core/administrator/templates/isis/images/login-joomla-inverse.png
 create mode 100644 core/administrator/templates/isis/images/login-joomla.png
 create mode 100644 core/administrator/templates/isis/images/logo-inverse.png
 create mode 100644 core/administrator/templates/isis/images/logo.png
 create mode 100644 core/administrator/templates/isis/images/pdf_button.png
 create mode 100644 core/administrator/templates/isis/images/printButton.png
 create mode 100644 core/administrator/templates/isis/images/system/sort_asc.png
 create mode 100644 core/administrator/templates/isis/images/system/sort_desc.png
 create mode 100644 core/administrator/templates/isis/img/glyphicons-halflings-white.png
 create mode 100644 core/administrator/templates/isis/img/glyphicons-halflings.png
 create mode 100644 core/administrator/templates/isis/index.php
 create mode 100644 core/administrator/templates/isis/js/application.js
 create mode 100644 core/administrator/templates/isis/js/classes.js
 create mode 100644 core/administrator/templates/isis/js/template.js
 create mode 100644 core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
 create mode 100644 core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
 create mode 100644 core/administrator/templates/isis/less/blocks/_chzn-override.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_custom.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_editors.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_forms.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_global.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_header.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_login.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_media.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_modals.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_navbar.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_quickicons.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_sidebar.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_status.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_tables.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_toolbar.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_treeselect.less
 create mode 100644 core/administrator/templates/isis/less/blocks/_utility-classes.less
 create mode 100644 core/administrator/templates/isis/less/bootstrap/button-groups.less
 create mode 100644 core/administrator/templates/isis/less/bootstrap/buttons.less
 create mode 100644 core/administrator/templates/isis/less/bootstrap/mixins.less
 create mode 100644 core/administrator/templates/isis/less/bootstrap/responsive-1200px-min.less
 create mode 100644 core/administrator/templates/isis/less/bootstrap/responsive-768px-979px.less
 create mode 100644 core/administrator/templates/isis/less/bootstrap/wells.less
 create mode 100644 core/administrator/templates/isis/less/icomoon.less
 create mode 100644 core/administrator/templates/isis/less/pages/_com_cpanel.less
 create mode 100644 core/administrator/templates/isis/less/pages/_com_postinstall.less
 create mode 100644 core/administrator/templates/isis/less/pages/_com_templates.less
 create mode 100644 core/administrator/templates/isis/less/template-rtl.less
 create mode 100644 core/administrator/templates/isis/less/template.less
 create mode 100644 core/administrator/templates/isis/less/variables.less
 create mode 100644 core/administrator/templates/isis/login.php
 create mode 100644 core/administrator/templates/isis/templateDetails.xml
 create mode 100644 core/administrator/templates/isis/template_preview.png
 create mode 100644 core/administrator/templates/isis/template_thumbnail.png
 create mode 100644 core/administrator/templates/system/component.php
 create mode 100644 core/administrator/templates/system/css/error.css
 create mode 100644 core/administrator/templates/system/css/system.css
 create mode 100644 core/administrator/templates/system/error.php
 create mode 100644 core/administrator/templates/system/html/modules.php
 create mode 100644 core/administrator/templates/system/images/calendar.png
 create mode 100644 core/administrator/templates/system/index.php
 create mode 100644 core/bin/index.html
 create mode 100644 core/bin/keychain.php
 create mode 100644 core/cache/index.html
 create mode 100644 core/cli/deletefiles.php
 create mode 100644 core/cli/finder_indexer.php
 create mode 100644 core/cli/garbagecron.php
 create mode 100644 core/cli/index.html
 create mode 100644 core/cli/sessionGc.php
 create mode 100644 core/cli/sessionMetadataGc.php
 create mode 100644 core/cli/update_cron.php
 create mode 100644 core/components/com_ajax/ajax.php
 create mode 100644 core/components/com_banners/banners.php
 create mode 100644 core/components/com_banners/controller.php
 create mode 100644 core/components/com_banners/helpers/banner.php
 create mode 100644 core/components/com_banners/helpers/category.php
 create mode 100644 core/components/com_banners/models/banner.php
 create mode 100644 core/components/com_banners/models/banners.php
 create mode 100644 core/components/com_banners/router.php
 create mode 100644 core/components/com_config/config.php
 create mode 100644 core/components/com_config/controller/cancel.php
 create mode 100644 core/components/com_config/controller/canceladmin.php
 create mode 100644 core/components/com_config/controller/cmsbase.php
 create mode 100644 core/components/com_config/controller/config/display.php
 create mode 100644 core/components/com_config/controller/config/save.php
 create mode 100644 core/components/com_config/controller/display.php
 create mode 100644 core/components/com_config/controller/helper.php
 create mode 100644 core/components/com_config/controller/modules/cancel.php
 create mode 100644 core/components/com_config/controller/modules/display.php
 create mode 100644 core/components/com_config/controller/modules/save.php
 create mode 100644 core/components/com_config/controller/templates/display.php
 create mode 100644 core/components/com_config/controller/templates/save.php
 create mode 100644 core/components/com_config/model/cms.php
 create mode 100644 core/components/com_config/model/config.php
 create mode 100644 core/components/com_config/model/form.php
 create mode 100644 core/components/com_config/model/form/config.xml
 create mode 100644 core/components/com_config/model/form/modules.xml
 create mode 100644 core/components/com_config/model/form/modules_advanced.xml
 create mode 100644 core/components/com_config/model/form/templates.xml
 create mode 100644 core/components/com_config/model/modules.php
 create mode 100644 core/components/com_config/model/templates.php
 create mode 100644 core/components/com_config/view/cms/html.php
 create mode 100644 core/components/com_config/view/cms/json.php
 create mode 100644 core/components/com_config/view/config/html.php
 create mode 100644 core/components/com_config/view/config/tmpl/default.php
 create mode 100644 core/components/com_config/view/config/tmpl/default.xml
 create mode 100644 core/components/com_config/view/config/tmpl/default_metadata.php
 create mode 100644 core/components/com_config/view/config/tmpl/default_seo.php
 create mode 100644 core/components/com_config/view/config/tmpl/default_site.php
 create mode 100644 core/components/com_config/view/modules/html.php
 create mode 100644 core/components/com_config/view/modules/tmpl/default.php
 create mode 100644 core/components/com_config/view/modules/tmpl/default_options.php
 create mode 100644 core/components/com_config/view/modules/tmpl/default_positions.php
 create mode 100644 core/components/com_config/view/templates/html.php
 create mode 100644 core/components/com_config/view/templates/tmpl/default.php
 create mode 100644 core/components/com_config/view/templates/tmpl/default.xml
 create mode 100644 core/components/com_config/view/templates/tmpl/default_options.php
 create mode 100644 core/components/com_contact/contact.php
 create mode 100644 core/components/com_contact/controller.php
 create mode 100644 core/components/com_contact/controllers/contact.php
 create mode 100644 core/components/com_contact/helpers/association.php
 create mode 100644 core/components/com_contact/helpers/category.php
 create mode 100644 core/components/com_contact/helpers/legacyrouter.php
 create mode 100644 core/components/com_contact/helpers/route.php
 create mode 100644 core/components/com_contact/layouts/field/render.php
 create mode 100644 core/components/com_contact/layouts/fields/render.php
 create mode 100644 core/components/com_contact/layouts/joomla/form/renderfield.php
 create mode 100644 core/components/com_contact/models/categories.php
 create mode 100644 core/components/com_contact/models/category.php
 create mode 100644 core/components/com_contact/models/contact.php
 create mode 100644 core/components/com_contact/models/featured.php
 create mode 100644 core/components/com_contact/models/forms/contact.xml
 create mode 100644 core/components/com_contact/models/forms/filter_contacts.xml
 create mode 100644 core/components/com_contact/models/forms/form.xml
 create mode 100644 core/components/com_contact/models/rules/contactemail.php
 create mode 100644 core/components/com_contact/models/rules/contactemailmessage.php
 create mode 100644 core/components/com_contact/models/rules/contactemailsubject.php
 create mode 100644 core/components/com_contact/router.php
 create mode 100644 core/components/com_contact/views/categories/tmpl/default.php
 create mode 100644 core/components/com_contact/views/categories/tmpl/default.xml
 create mode 100644 core/components/com_contact/views/categories/tmpl/default_items.php
 create mode 100644 core/components/com_contact/views/categories/view.html.php
 create mode 100644 core/components/com_contact/views/category/tmpl/default.php
 create mode 100644 core/components/com_contact/views/category/tmpl/default.xml
 create mode 100644 core/components/com_contact/views/category/tmpl/default_children.php
 create mode 100644 core/components/com_contact/views/category/tmpl/default_items.php
 create mode 100644 core/components/com_contact/views/category/view.feed.php
 create mode 100644 core/components/com_contact/views/category/view.html.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default.xml
 create mode 100644 core/components/com_contact/views/contact/tmpl/default_address.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default_articles.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default_form.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default_links.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default_profile.php
 create mode 100644 core/components/com_contact/views/contact/tmpl/default_user_custom_fields.php
 create mode 100644 core/components/com_contact/views/contact/view.html.php
 create mode 100644 core/components/com_contact/views/contact/view.vcf.php
 create mode 100644 core/components/com_contact/views/featured/tmpl/default.php
 create mode 100644 core/components/com_contact/views/featured/tmpl/default.xml
 create mode 100644 core/components/com_contact/views/featured/tmpl/default_items.php
 create mode 100644 core/components/com_contact/views/featured/view.html.php
 create mode 100644 core/components/com_content/content.php
 create mode 100644 core/components/com_content/controller.php
 create mode 100644 core/components/com_content/controllers/article.php
 create mode 100644 core/components/com_content/helpers/association.php
 create mode 100644 core/components/com_content/helpers/category.php
 create mode 100644 core/components/com_content/helpers/icon.php
 create mode 100644 core/components/com_content/helpers/legacyrouter.php
 create mode 100644 core/components/com_content/helpers/query.php
 create mode 100644 core/components/com_content/helpers/route.php
 create mode 100644 core/components/com_content/models/archive.php
 create mode 100644 core/components/com_content/models/article.php
 create mode 100644 core/components/com_content/models/articles.php
 create mode 100644 core/components/com_content/models/categories.php
 create mode 100644 core/components/com_content/models/category.php
 create mode 100644 core/components/com_content/models/featured.php
 create mode 100644 core/components/com_content/models/form.php
 create mode 100644 core/components/com_content/models/forms/article.xml
 create mode 100644 core/components/com_content/models/forms/filter_articles.xml
 create mode 100644 core/components/com_content/router.php
 create mode 100644 core/components/com_content/views/archive/tmpl/default.php
 create mode 100644 core/components/com_content/views/archive/tmpl/default.xml
 create mode 100644 core/components/com_content/views/archive/tmpl/default_items.php
 create mode 100644 core/components/com_content/views/archive/view.html.php
 create mode 100644 core/components/com_content/views/article/tmpl/default.php
 create mode 100644 core/components/com_content/views/article/tmpl/default.xml
 create mode 100644 core/components/com_content/views/article/tmpl/default_links.php
 create mode 100644 core/components/com_content/views/article/view.html.php
 create mode 100644 core/components/com_content/views/categories/tmpl/default.php
 create mode 100644 core/components/com_content/views/categories/tmpl/default.xml
 create mode 100644 core/components/com_content/views/categories/tmpl/default_items.php
 create mode 100644 core/components/com_content/views/categories/view.html.php
 create mode 100644 core/components/com_content/views/category/tmpl/blog.php
 create mode 100644 core/components/com_content/views/category/tmpl/blog.xml
 create mode 100644 core/components/com_content/views/category/tmpl/blog_children.php
 create mode 100644 core/components/com_content/views/category/tmpl/blog_item.php
 create mode 100644 core/components/com_content/views/category/tmpl/blog_links.php
 create mode 100644 core/components/com_content/views/category/tmpl/default.php
 create mode 100644 core/components/com_content/views/category/tmpl/default.xml
 create mode 100644 core/components/com_content/views/category/tmpl/default_articles.php
 create mode 100644 core/components/com_content/views/category/tmpl/default_children.php
 create mode 100644 core/components/com_content/views/category/view.feed.php
 create mode 100644 core/components/com_content/views/category/view.html.php
 create mode 100644 core/components/com_content/views/featured/tmpl/default.php
 create mode 100644 core/components/com_content/views/featured/tmpl/default.xml
 create mode 100644 core/components/com_content/views/featured/tmpl/default_item.php
 create mode 100644 core/components/com_content/views/featured/tmpl/default_links.php
 create mode 100644 core/components/com_content/views/featured/view.feed.php
 create mode 100644 core/components/com_content/views/featured/view.html.php
 create mode 100644 core/components/com_content/views/form/tmpl/edit.php
 create mode 100644 core/components/com_content/views/form/tmpl/edit.xml
 create mode 100644 core/components/com_content/views/form/view.html.php
 create mode 100644 core/components/com_contenthistory/contenthistory.php
 create mode 100644 core/components/com_fields/controller.php
 create mode 100644 core/components/com_fields/fields.php
 create mode 100644 core/components/com_fields/layouts/field/render.php
 create mode 100644 core/components/com_fields/layouts/fields/render.php
 create mode 100644 core/components/com_fields/models/forms/filter_fields.xml
 create mode 100644 core/components/com_finder/controller.php
 create mode 100644 core/components/com_finder/controllers/suggestions.json.php
 create mode 100644 core/components/com_finder/finder.php
 create mode 100644 core/components/com_finder/helpers/html/filter.php
 create mode 100644 core/components/com_finder/helpers/html/query.php
 create mode 100644 core/components/com_finder/helpers/route.php
 create mode 100644 core/components/com_finder/models/search.php
 create mode 100644 core/components/com_finder/models/suggestions.php
 create mode 100644 core/components/com_finder/router.php
 create mode 100644 core/components/com_finder/views/search/tmpl/default.php
 create mode 100644 core/components/com_finder/views/search/tmpl/default.xml
 create mode 100644 core/components/com_finder/views/search/tmpl/default_form.php
 create mode 100644 core/components/com_finder/views/search/tmpl/default_result.php
 create mode 100644 core/components/com_finder/views/search/tmpl/default_results.php
 create mode 100644 core/components/com_finder/views/search/view.feed.php
 create mode 100644 core/components/com_finder/views/search/view.html.php
 create mode 100644 core/components/com_finder/views/search/view.opensearch.php
 create mode 100644 core/components/com_mailto/controller.php
 create mode 100644 core/components/com_mailto/helpers/mailto.php
 create mode 100644 core/components/com_mailto/mailto.php
 create mode 100644 core/components/com_mailto/mailto.xml
 create mode 100644 core/components/com_mailto/models/forms/mailto.xml
 create mode 100644 core/components/com_mailto/models/mailto.php
 create mode 100644 core/components/com_mailto/views/mailto/tmpl/default.php
 create mode 100644 core/components/com_mailto/views/mailto/view.html.php
 create mode 100644 core/components/com_mailto/views/sent/tmpl/default.php
 create mode 100644 core/components/com_mailto/views/sent/view.html.php
 create mode 100644 core/components/com_media/media.php
 create mode 100644 core/components/com_menus/controller.php
 create mode 100644 core/components/com_menus/menus.php
 create mode 100644 core/components/com_menus/models/forms/filter_items.xml
 create mode 100644 core/components/com_modules/controller.php
 create mode 100644 core/components/com_modules/models/forms/filter_modules.xml
 create mode 100644 core/components/com_modules/modules.php
 create mode 100644 core/components/com_newsfeeds/controller.php
 create mode 100644 core/components/com_newsfeeds/helpers/association.php
 create mode 100644 core/components/com_newsfeeds/helpers/category.php
 create mode 100644 core/components/com_newsfeeds/helpers/legacyrouter.php
 create mode 100644 core/components/com_newsfeeds/helpers/route.php
 create mode 100644 core/components/com_newsfeeds/models/categories.php
 create mode 100644 core/components/com_newsfeeds/models/category.php
 create mode 100644 core/components/com_newsfeeds/models/newsfeed.php
 create mode 100644 core/components/com_newsfeeds/newsfeeds.php
 create mode 100644 core/components/com_newsfeeds/router.php
 create mode 100644 core/components/com_newsfeeds/views/categories/tmpl/default.php
 create mode 100644 core/components/com_newsfeeds/views/categories/tmpl/default.xml
 create mode 100644 core/components/com_newsfeeds/views/categories/tmpl/default_items.php
 create mode 100644 core/components/com_newsfeeds/views/categories/view.html.php
 create mode 100644 core/components/com_newsfeeds/views/category/tmpl/default.php
 create mode 100644 core/components/com_newsfeeds/views/category/tmpl/default.xml
 create mode 100644 core/components/com_newsfeeds/views/category/tmpl/default_children.php
 create mode 100644 core/components/com_newsfeeds/views/category/tmpl/default_items.php
 create mode 100644 core/components/com_newsfeeds/views/category/view.html.php
 create mode 100644 core/components/com_newsfeeds/views/newsfeed/tmpl/default.php
 create mode 100644 core/components/com_newsfeeds/views/newsfeed/tmpl/default.xml
 create mode 100644 core/components/com_newsfeeds/views/newsfeed/view.html.php
 create mode 100644 core/components/com_search/controller.php
 create mode 100644 core/components/com_search/models/search.php
 create mode 100644 core/components/com_search/router.php
 create mode 100644 core/components/com_search/search.php
 create mode 100644 core/components/com_search/views/search/tmpl/default.php
 create mode 100644 core/components/com_search/views/search/tmpl/default.xml
 create mode 100644 core/components/com_search/views/search/tmpl/default_error.php
 create mode 100644 core/components/com_search/views/search/tmpl/default_form.php
 create mode 100644 core/components/com_search/views/search/tmpl/default_results.php
 create mode 100644 core/components/com_search/views/search/view.html.php
 create mode 100644 core/components/com_search/views/search/view.opensearch.php
 create mode 100644 core/components/com_tags/controller.php
 create mode 100644 core/components/com_tags/controllers/tags.php
 create mode 100644 core/components/com_tags/helpers/route.php
 create mode 100644 core/components/com_tags/models/tag.php
 create mode 100644 core/components/com_tags/models/tags.php
 create mode 100644 core/components/com_tags/router.php
 create mode 100644 core/components/com_tags/tags.php
 create mode 100644 core/components/com_tags/views/tag/tmpl/default.php
 create mode 100644 core/components/com_tags/views/tag/tmpl/default.xml
 create mode 100644 core/components/com_tags/views/tag/tmpl/default_items.php
 create mode 100644 core/components/com_tags/views/tag/tmpl/list.php
 create mode 100644 core/components/com_tags/views/tag/tmpl/list.xml
 create mode 100644 core/components/com_tags/views/tag/tmpl/list_items.php
 create mode 100644 core/components/com_tags/views/tag/view.feed.php
 create mode 100644 core/components/com_tags/views/tag/view.html.php
 create mode 100644 core/components/com_tags/views/tags/tmpl/default.php
 create mode 100644 core/components/com_tags/views/tags/tmpl/default.xml
 create mode 100644 core/components/com_tags/views/tags/tmpl/default_items.php
 create mode 100644 core/components/com_tags/views/tags/view.feed.php
 create mode 100644 core/components/com_tags/views/tags/view.html.php
 create mode 100644 core/components/com_users/controller.php
 create mode 100644 core/components/com_users/controllers/profile.json.php
 create mode 100644 core/components/com_users/controllers/profile.php
 create mode 100644 core/components/com_users/controllers/profile_base_json.php
 create mode 100644 core/components/com_users/controllers/registration.php
 create mode 100644 core/components/com_users/controllers/remind.php
 create mode 100644 core/components/com_users/controllers/reset.php
 create mode 100644 core/components/com_users/controllers/user.php
 create mode 100644 core/components/com_users/helpers/html/users.php
 create mode 100644 core/components/com_users/helpers/legacyrouter.php
 create mode 100644 core/components/com_users/helpers/route.php
 create mode 100644 core/components/com_users/models/forms/frontend.xml
 create mode 100644 core/components/com_users/models/forms/frontend_admin.xml
 create mode 100644 core/components/com_users/models/forms/login.xml
 create mode 100644 core/components/com_users/models/forms/profile.xml
 create mode 100644 core/components/com_users/models/forms/registration.xml
 create mode 100644 core/components/com_users/models/forms/remind.xml
 create mode 100644 core/components/com_users/models/forms/reset_complete.xml
 create mode 100644 core/components/com_users/models/forms/reset_confirm.xml
 create mode 100644 core/components/com_users/models/forms/reset_request.xml
 create mode 100644 core/components/com_users/models/forms/sitelang.xml
 create mode 100644 core/components/com_users/models/login.php
 create mode 100644 core/components/com_users/models/profile.php
 create mode 100644 core/components/com_users/models/registration.php
 create mode 100644 core/components/com_users/models/remind.php
 create mode 100644 core/components/com_users/models/reset.php
 create mode 100644 core/components/com_users/models/rules/loginuniquefield.php
 create mode 100644 core/components/com_users/models/rules/logoutuniquefield.php
 create mode 100644 core/components/com_users/router.php
 create mode 100644 core/components/com_users/users.php
 create mode 100644 core/components/com_users/views/login/tmpl/default.php
 create mode 100644 core/components/com_users/views/login/tmpl/default.xml
 create mode 100644 core/components/com_users/views/login/tmpl/default_login.php
 create mode 100644 core/components/com_users/views/login/tmpl/default_logout.php
 create mode 100644 core/components/com_users/views/login/tmpl/logout.xml
 create mode 100644 core/components/com_users/views/login/view.html.php
 create mode 100644 core/components/com_users/views/profile/tmpl/default.php
 create mode 100644 core/components/com_users/views/profile/tmpl/default.xml
 create mode 100644 core/components/com_users/views/profile/tmpl/default_core.php
 create mode 100644 core/components/com_users/views/profile/tmpl/default_custom.php
 create mode 100644 core/components/com_users/views/profile/tmpl/default_params.php
 create mode 100644 core/components/com_users/views/profile/tmpl/edit.php
 create mode 100644 core/components/com_users/views/profile/tmpl/edit.xml
 create mode 100644 core/components/com_users/views/profile/view.html.php
 create mode 100644 core/components/com_users/views/registration/tmpl/complete.php
 create mode 100644 core/components/com_users/views/registration/tmpl/default.php
 create mode 100644 core/components/com_users/views/registration/tmpl/default.xml
 create mode 100644 core/components/com_users/views/registration/view.html.php
 create mode 100644 core/components/com_users/views/remind/tmpl/default.php
 create mode 100644 core/components/com_users/views/remind/tmpl/default.xml
 create mode 100644 core/components/com_users/views/remind/view.html.php
 create mode 100644 core/components/com_users/views/reset/tmpl/complete.php
 create mode 100644 core/components/com_users/views/reset/tmpl/confirm.php
 create mode 100644 core/components/com_users/views/reset/tmpl/default.php
 create mode 100644 core/components/com_users/views/reset/tmpl/default.xml
 create mode 100644 core/components/com_users/views/reset/view.html.php
 create mode 100644 core/components/com_wrapper/controller.php
 create mode 100644 core/components/com_wrapper/router.php
 create mode 100644 core/components/com_wrapper/views/wrapper/tmpl/default.php
 create mode 100644 core/components/com_wrapper/views/wrapper/tmpl/default.xml
 create mode 100644 core/components/com_wrapper/views/wrapper/view.html.php
 create mode 100644 core/components/com_wrapper/wrapper.php
 create mode 100644 core/components/com_wrapper/wrapper.xml
 create mode 100644 core/components/index.html
 create mode 100644 core/htaccess.txt
 create mode 100644 core/images/banners/osmbanner1.png
 create mode 100644 core/images/banners/osmbanner2.png
 create mode 100644 core/images/banners/shop-ad-books.jpg
 create mode 100644 core/images/banners/shop-ad.jpg
 create mode 100644 core/images/banners/white.png
 create mode 100644 core/images/headers/blue-flower.jpg
 create mode 100644 core/images/headers/maple.jpg
 create mode 100644 core/images/headers/raindrops.jpg
 create mode 100644 core/images/headers/walden-pond.jpg
 create mode 100644 core/images/headers/windows.jpg
 create mode 100644 core/images/index.html
 create mode 100644 core/images/joomla_black.png
 create mode 100644 core/images/powered_by.png
 create mode 100644 core/images/sampledata/fruitshop/apple.jpg
 create mode 100644 core/images/sampledata/fruitshop/bananas_2.jpg
 create mode 100644 core/images/sampledata/fruitshop/fruits.gif
 create mode 100644 core/images/sampledata/fruitshop/tamarind.jpg
 create mode 100644 core/images/sampledata/parks/animals/180px_koala_ag1.jpg
 create mode 100644 core/images/sampledata/parks/animals/180px_wobbegong.jpg
 create mode 100644 core/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg
 create mode 100644 core/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg
 create mode 100644 core/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg
 create mode 100644 core/images/sampledata/parks/animals/800px_koala_ag1.jpg
 create mode 100644 core/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg
 create mode 100644 core/images/sampledata/parks/animals/800px_wobbegong.jpg
 create mode 100644 core/images/sampledata/parks/banner_cradle.jpg
 create mode 100644 core/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg
 create mode 100644 core/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg
 create mode 100644 core/images/sampledata/parks/landscape/180px_ormiston_pound.jpg
 create mode 100644 core/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg
 create mode 100644 core/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg
 create mode 100644 core/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg
 create mode 100644 core/images/sampledata/parks/landscape/800px_ormiston_pound.jpg
 create mode 100644 core/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg
 create mode 100644 core/images/sampledata/parks/parks.gif
 create mode 100644 core/includes/defines.php
 create mode 100644 core/includes/framework.php
 create mode 100644 core/includes/index.html
 create mode 100644 core/index.php
 create mode 100644 core/language/en-GB/en-GB.com_ajax.ini
 create mode 100644 core/language/en-GB/en-GB.com_config.ini
 create mode 100644 core/language/en-GB/en-GB.com_contact.ini
 create mode 100644 core/language/en-GB/en-GB.com_content.ini
 create mode 100644 core/language/en-GB/en-GB.com_finder.ini
 create mode 100644 core/language/en-GB/en-GB.com_mailto.ini
 create mode 100644 core/language/en-GB/en-GB.com_media.ini
 create mode 100644 core/language/en-GB/en-GB.com_messages.ini
 create mode 100644 core/language/en-GB/en-GB.com_newsfeeds.ini
 create mode 100644 core/language/en-GB/en-GB.com_search.ini
 create mode 100644 core/language/en-GB/en-GB.com_tags.ini
 create mode 100644 core/language/en-GB/en-GB.com_users.ini
 create mode 100644 core/language/en-GB/en-GB.com_weblinks.ini
 create mode 100644 core/language/en-GB/en-GB.com_wrapper.ini
 create mode 100644 core/language/en-GB/en-GB.files_joomla.sys.ini
 create mode 100644 core/language/en-GB/en-GB.finder_cli.ini
 create mode 100644 core/language/en-GB/en-GB.ini
 create mode 100644 core/language/en-GB/en-GB.lib_fof.ini
 create mode 100644 core/language/en-GB/en-GB.lib_fof.sys.ini
 create mode 100644 core/language/en-GB/en-GB.lib_idna_convert.sys.ini
 create mode 100644 core/language/en-GB/en-GB.lib_joomla.ini
 create mode 100644 core/language/en-GB/en-GB.lib_joomla.sys.ini
 create mode 100644 core/language/en-GB/en-GB.lib_phpass.sys.ini
 create mode 100644 core/language/en-GB/en-GB.lib_phputf8.sys.ini
 create mode 100644 core/language/en-GB/en-GB.lib_simplepie.sys.ini
 create mode 100644 core/language/en-GB/en-GB.localise.php
 create mode 100644 core/language/en-GB/en-GB.mod_articles_archive.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_archive.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_categories.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_categories.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_category.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_category.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_latest.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_latest.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_news.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_news.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_popular.ini
 create mode 100644 core/language/en-GB/en-GB.mod_articles_popular.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_banners.ini
 create mode 100644 core/language/en-GB/en-GB.mod_banners.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_breadcrumbs.ini
 create mode 100644 core/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_custom.ini
 create mode 100644 core/language/en-GB/en-GB.mod_custom.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_feed.ini
 create mode 100644 core/language/en-GB/en-GB.mod_feed.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_finder.ini
 create mode 100644 core/language/en-GB/en-GB.mod_finder.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_footer.ini
 create mode 100644 core/language/en-GB/en-GB.mod_footer.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_languages.ini
 create mode 100644 core/language/en-GB/en-GB.mod_languages.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_login.ini
 create mode 100644 core/language/en-GB/en-GB.mod_login.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_menu.ini
 create mode 100644 core/language/en-GB/en-GB.mod_menu.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_random_image.ini
 create mode 100644 core/language/en-GB/en-GB.mod_random_image.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_related_items.ini
 create mode 100644 core/language/en-GB/en-GB.mod_related_items.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_search.ini
 create mode 100644 core/language/en-GB/en-GB.mod_search.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_stats.ini
 create mode 100644 core/language/en-GB/en-GB.mod_stats.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_syndicate.ini
 create mode 100644 core/language/en-GB/en-GB.mod_syndicate.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_tags_popular.ini
 create mode 100644 core/language/en-GB/en-GB.mod_tags_popular.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_tags_similar.ini
 create mode 100644 core/language/en-GB/en-GB.mod_tags_similar.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_users_latest.ini
 create mode 100644 core/language/en-GB/en-GB.mod_users_latest.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_weblinks.ini
 create mode 100644 core/language/en-GB/en-GB.mod_weblinks.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_whosonline.ini
 create mode 100644 core/language/en-GB/en-GB.mod_whosonline.sys.ini
 create mode 100644 core/language/en-GB/en-GB.mod_wrapper.ini
 create mode 100644 core/language/en-GB/en-GB.mod_wrapper.sys.ini
 create mode 100644 core/language/en-GB/en-GB.tpl_beez3.ini
 create mode 100644 core/language/en-GB/en-GB.tpl_beez3.sys.ini
 create mode 100644 core/language/en-GB/en-GB.tpl_protostar.ini
 create mode 100644 core/language/en-GB/en-GB.tpl_protostar.sys.ini
 create mode 100644 core/language/en-GB/en-GB.xml
 create mode 100644 core/language/en-GB/install.xml
 create mode 100644 core/language/index.html
 create mode 100644 core/language/overrides/index.html
 create mode 100644 core/layouts/index.html
 create mode 100644 core/layouts/joomla/content/associations.php
 create mode 100644 core/layouts/joomla/content/blog_style_default_item_title.php
 create mode 100644 core/layouts/joomla/content/blog_style_default_links.php
 create mode 100644 core/layouts/joomla/content/categories_default.php
 create mode 100644 core/layouts/joomla/content/categories_default_items.php
 create mode 100644 core/layouts/joomla/content/category_default.php
 create mode 100644 core/layouts/joomla/content/full_image.php
 create mode 100644 core/layouts/joomla/content/icons.php
 create mode 100644 core/layouts/joomla/content/icons/create.php
 create mode 100644 core/layouts/joomla/content/icons/edit.php
 create mode 100644 core/layouts/joomla/content/icons/edit_lock.php
 create mode 100644 core/layouts/joomla/content/icons/email.php
 create mode 100644 core/layouts/joomla/content/icons/print_popup.php
 create mode 100644 core/layouts/joomla/content/icons/print_screen.php
 create mode 100644 core/layouts/joomla/content/info_block.php
 create mode 100644 core/layouts/joomla/content/info_block/associations.php
 create mode 100644 core/layouts/joomla/content/info_block/author.php
 create mode 100644 core/layouts/joomla/content/info_block/block.php
 create mode 100644 core/layouts/joomla/content/info_block/category.php
 create mode 100644 core/layouts/joomla/content/info_block/create_date.php
 create mode 100644 core/layouts/joomla/content/info_block/hits.php
 create mode 100644 core/layouts/joomla/content/info_block/modify_date.php
 create mode 100644 core/layouts/joomla/content/info_block/parent_category.php
 create mode 100644 core/layouts/joomla/content/info_block/publish_date.php
 create mode 100644 core/layouts/joomla/content/intro_image.php
 create mode 100644 core/layouts/joomla/content/language.php
 create mode 100644 core/layouts/joomla/content/options_default.php
 create mode 100644 core/layouts/joomla/content/readmore.php
 create mode 100644 core/layouts/joomla/content/tags.php
 create mode 100644 core/layouts/joomla/content/text_filters.php
 create mode 100644 core/layouts/joomla/edit/associations.php
 create mode 100644 core/layouts/joomla/edit/details.php
 create mode 100644 core/layouts/joomla/edit/fieldset.php
 create mode 100644 core/layouts/joomla/edit/frontediting_modules.php
 create mode 100644 core/layouts/joomla/edit/global.php
 create mode 100644 core/layouts/joomla/edit/item_title.php
 create mode 100644 core/layouts/joomla/edit/metadata.php
 create mode 100644 core/layouts/joomla/edit/params.php
 create mode 100644 core/layouts/joomla/edit/publishingdata.php
 create mode 100644 core/layouts/joomla/edit/title_alias.php
 create mode 100644 core/layouts/joomla/editors/buttons.php
 create mode 100644 core/layouts/joomla/editors/buttons/button.php
 create mode 100644 core/layouts/joomla/error/backtrace.php
 create mode 100644 core/layouts/joomla/error/index.html
 create mode 100644 core/layouts/joomla/form/field/calendar.php
 create mode 100644 core/layouts/joomla/form/field/checkboxes.php
 create mode 100644 core/layouts/joomla/form/field/color/advanced.php
 create mode 100644 core/layouts/joomla/form/field/color/simple.php
 create mode 100644 core/layouts/joomla/form/field/combo.php
 create mode 100644 core/layouts/joomla/form/field/contenthistory.php
 create mode 100644 core/layouts/joomla/form/field/email.php
 create mode 100644 core/layouts/joomla/form/field/file.php
 create mode 100644 core/layouts/joomla/form/field/hidden.php
 create mode 100644 core/layouts/joomla/form/field/media.php
 create mode 100644 core/layouts/joomla/form/field/meter.php
 create mode 100644 core/layouts/joomla/form/field/moduleorder.php
 create mode 100644 core/layouts/joomla/form/field/number.php
 create mode 100644 core/layouts/joomla/form/field/password.php
 create mode 100644 core/layouts/joomla/form/field/radio.php
 create mode 100644 core/layouts/joomla/form/field/range.php
 create mode 100644 core/layouts/joomla/form/field/subform/default.php
 create mode 100644 core/layouts/joomla/form/field/subform/repeatable-table.php
 create mode 100644 core/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
 create mode 100644 core/layouts/joomla/form/field/subform/repeatable-table/section.php
 create mode 100644 core/layouts/joomla/form/field/subform/repeatable.php
 create mode 100644 core/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
 create mode 100644 core/layouts/joomla/form/field/subform/repeatable/section.php
 create mode 100644 core/layouts/joomla/form/field/tel.php
 create mode 100644 core/layouts/joomla/form/field/text.php
 create mode 100644 core/layouts/joomla/form/field/textarea.php
 create mode 100644 core/layouts/joomla/form/field/url.php
 create mode 100644 core/layouts/joomla/form/field/user.php
 create mode 100644 core/layouts/joomla/form/renderfield.php
 create mode 100644 core/layouts/joomla/form/renderlabel.php
 create mode 100644 core/layouts/joomla/html/batch/access.php
 create mode 100644 core/layouts/joomla/html/batch/adminlanguage.php
 create mode 100644 core/layouts/joomla/html/batch/item.php
 create mode 100644 core/layouts/joomla/html/batch/language.php
 create mode 100644 core/layouts/joomla/html/batch/tag.php
 create mode 100644 core/layouts/joomla/html/batch/user.php
 create mode 100644 core/layouts/joomla/html/formbehavior/ajaxchosen.php
 create mode 100644 core/layouts/joomla/html/formbehavior/chosen.php
 create mode 100644 core/layouts/joomla/html/sortablelist.php
 create mode 100644 core/layouts/joomla/html/tag.php
 create mode 100644 core/layouts/joomla/html/treeprefix.php
 create mode 100644 core/layouts/joomla/links/groupclose.php
 create mode 100644 core/layouts/joomla/links/groupopen.php
 create mode 100644 core/layouts/joomla/links/groupsclose.php
 create mode 100644 core/layouts/joomla/links/groupseparator.php
 create mode 100644 core/layouts/joomla/links/groupsopen.php
 create mode 100644 core/layouts/joomla/links/link.php
 create mode 100644 core/layouts/joomla/modal/body.php
 create mode 100644 core/layouts/joomla/modal/footer.php
 create mode 100644 core/layouts/joomla/modal/header.php
 create mode 100644 core/layouts/joomla/modal/iframe.php
 create mode 100644 core/layouts/joomla/modal/main.php
 create mode 100644 core/layouts/joomla/pagination/link.php
 create mode 100644 core/layouts/joomla/pagination/links.php
 create mode 100644 core/layouts/joomla/pagination/list.php
 create mode 100644 core/layouts/joomla/quickicons/icon.php
 create mode 100644 core/layouts/joomla/searchtools/default.php
 create mode 100644 core/layouts/joomla/searchtools/default/bar.php
 create mode 100644 core/layouts/joomla/searchtools/default/filters.php
 create mode 100644 core/layouts/joomla/searchtools/default/list.php
 create mode 100644 core/layouts/joomla/searchtools/default/noitems.php
 create mode 100644 core/layouts/joomla/searchtools/default/selector.php
 create mode 100644 core/layouts/joomla/searchtools/grid/sort.php
 create mode 100644 core/layouts/joomla/sidebars/submenu.php
 create mode 100644 core/layouts/joomla/sidebars/toggle.php
 create mode 100644 core/layouts/joomla/system/message.php
 create mode 100644 core/layouts/joomla/tinymce/buttons.php
 create mode 100644 core/layouts/joomla/tinymce/buttons/button.php
 create mode 100644 core/layouts/joomla/tinymce/textarea.php
 create mode 100644 core/layouts/joomla/tinymce/togglebutton.php
 create mode 100644 core/layouts/joomla/toolbar/base.php
 create mode 100644 core/layouts/joomla/toolbar/batch.php
 create mode 100644 core/layouts/joomla/toolbar/confirm.php
 create mode 100644 core/layouts/joomla/toolbar/containerclose.php
 create mode 100644 core/layouts/joomla/toolbar/containeropen.php
 create mode 100644 core/layouts/joomla/toolbar/help.php
 create mode 100644 core/layouts/joomla/toolbar/iconclass.php
 create mode 100644 core/layouts/joomla/toolbar/link.php
 create mode 100644 core/layouts/joomla/toolbar/modal.php
 create mode 100644 core/layouts/joomla/toolbar/popup.php
 create mode 100644 core/layouts/joomla/toolbar/separator.php
 create mode 100644 core/layouts/joomla/toolbar/slider.php
 create mode 100644 core/layouts/joomla/toolbar/standard.php
 create mode 100644 core/layouts/joomla/toolbar/title.php
 create mode 100644 core/layouts/joomla/toolbar/versions.php
 create mode 100644 core/layouts/libraries/cms/html/bootstrap/addtab.php
 create mode 100644 core/layouts/libraries/cms/html/bootstrap/addtabscript.php
 create mode 100644 core/layouts/libraries/cms/html/bootstrap/endtab.php
 create mode 100644 core/layouts/libraries/cms/html/bootstrap/endtabset.php
 create mode 100644 core/layouts/libraries/cms/html/bootstrap/starttabset.php
 create mode 100644 core/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
 create mode 100644 core/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
 create mode 100644 core/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
 create mode 100644 core/layouts/plugins/user/profile/fields/dob.php
 create mode 100644 core/libraries/classmap.php
 create mode 100644 core/libraries/cms.php
 create mode 100644 core/libraries/cms/class/loader.php
 create mode 100644 core/libraries/cms/html/access.php
 create mode 100644 core/libraries/cms/html/actionsdropdown.php
 create mode 100644 core/libraries/cms/html/adminlanguage.php
 create mode 100644 core/libraries/cms/html/batch.php
 create mode 100644 core/libraries/cms/html/behavior.php
 create mode 100644 core/libraries/cms/html/bootstrap.php
 create mode 100644 core/libraries/cms/html/category.php
 create mode 100644 core/libraries/cms/html/content.php
 create mode 100644 core/libraries/cms/html/contentlanguage.php
 create mode 100644 core/libraries/cms/html/date.php
 create mode 100644 core/libraries/cms/html/debug.php
 create mode 100644 core/libraries/cms/html/dropdown.php
 create mode 100644 core/libraries/cms/html/email.php
 create mode 100644 core/libraries/cms/html/form.php
 create mode 100644 core/libraries/cms/html/formbehavior.php
 create mode 100644 core/libraries/cms/html/grid.php
 create mode 100644 core/libraries/cms/html/icons.php
 create mode 100644 core/libraries/cms/html/jgrid.php
 create mode 100644 core/libraries/cms/html/jquery.php
 create mode 100644 core/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini
 create mode 100644 core/libraries/cms/html/links.php
 create mode 100644 core/libraries/cms/html/list.php
 create mode 100644 core/libraries/cms/html/menu.php
 create mode 100644 core/libraries/cms/html/number.php
 create mode 100644 core/libraries/cms/html/rules.php
 create mode 100644 core/libraries/cms/html/searchtools.php
 create mode 100644 core/libraries/cms/html/select.php
 create mode 100644 core/libraries/cms/html/sidebar.php
 create mode 100644 core/libraries/cms/html/sliders.php
 create mode 100644 core/libraries/cms/html/sortablelist.php
 create mode 100644 core/libraries/cms/html/string.php
 create mode 100644 core/libraries/cms/html/tabs.php
 create mode 100644 core/libraries/cms/html/tag.php
 create mode 100644 core/libraries/cms/html/tel.php
 create mode 100644 core/libraries/cms/html/user.php
 create mode 100644 core/libraries/cms/less/formatter/joomla.php
 create mode 100644 core/libraries/cms/less/less.php
 create mode 100644 core/libraries/fof/LICENSE.txt
 create mode 100644 core/libraries/fof/autoloader/component.php
 create mode 100644 core/libraries/fof/autoloader/fof.php
 create mode 100644 core/libraries/fof/config/domain/dispatcher.php
 create mode 100644 core/libraries/fof/config/domain/interface.php
 create mode 100644 core/libraries/fof/config/domain/tables.php
 create mode 100644 core/libraries/fof/config/domain/views.php
 create mode 100644 core/libraries/fof/config/provider.php
 create mode 100644 core/libraries/fof/controller/controller.php
 create mode 100644 core/libraries/fof/database/database.php
 create mode 100644 core/libraries/fof/database/driver.php
 create mode 100644 core/libraries/fof/database/driver/joomla.php
 create mode 100644 core/libraries/fof/database/driver/mysql.php
 create mode 100644 core/libraries/fof/database/driver/mysqli.php
 create mode 100644 core/libraries/fof/database/driver/oracle.php
 create mode 100644 core/libraries/fof/database/driver/pdo.php
 create mode 100644 core/libraries/fof/database/driver/pdomysql.php
 create mode 100644 core/libraries/fof/database/driver/postgresql.php
 create mode 100644 core/libraries/fof/database/driver/sqlazure.php
 create mode 100644 core/libraries/fof/database/driver/sqlite.php
 create mode 100644 core/libraries/fof/database/driver/sqlsrv.php
 create mode 100644 core/libraries/fof/database/factory.php
 create mode 100644 core/libraries/fof/database/installer.php
 create mode 100644 core/libraries/fof/database/interface.php
 create mode 100644 core/libraries/fof/database/iterator.php
 create mode 100644 core/libraries/fof/database/iterator/azure.php
 create mode 100644 core/libraries/fof/database/iterator/mysql.php
 create mode 100644 core/libraries/fof/database/iterator/mysqli.php
 create mode 100644 core/libraries/fof/database/iterator/oracle.php
 create mode 100644 core/libraries/fof/database/iterator/pdo.php
 create mode 100644 core/libraries/fof/database/iterator/pdomysql.php
 create mode 100644 core/libraries/fof/database/iterator/postgresql.php
 create mode 100644 core/libraries/fof/database/iterator/sqlite.php
 create mode 100644 core/libraries/fof/database/iterator/sqlsrv.php
 create mode 100644 core/libraries/fof/database/query.php
 create mode 100644 core/libraries/fof/database/query/element.php
 create mode 100644 core/libraries/fof/database/query/limitable.php
 create mode 100644 core/libraries/fof/database/query/mysql.php
 create mode 100644 core/libraries/fof/database/query/mysqli.php
 create mode 100644 core/libraries/fof/database/query/oracle.php
 create mode 100644 core/libraries/fof/database/query/pdo.php
 create mode 100644 core/libraries/fof/database/query/pdomysql.php
 create mode 100644 core/libraries/fof/database/query/postgresql.php
 create mode 100644 core/libraries/fof/database/query/preparable.php
 create mode 100644 core/libraries/fof/database/query/sqlazure.php
 create mode 100644 core/libraries/fof/database/query/sqlite.php
 create mode 100644 core/libraries/fof/database/query/sqlsrv.php
 create mode 100644 core/libraries/fof/dispatcher/dispatcher.php
 create mode 100644 core/libraries/fof/download/adapter/abstract.php
 create mode 100644 core/libraries/fof/download/adapter/cacert.pem
 create mode 100644 core/libraries/fof/download/adapter/curl.php
 create mode 100644 core/libraries/fof/download/adapter/fopen.php
 create mode 100644 core/libraries/fof/download/download.php
 create mode 100644 core/libraries/fof/download/interface.php
 create mode 100644 core/libraries/fof/encrypt/aes.php
 create mode 100644 core/libraries/fof/encrypt/aes/abstract.php
 create mode 100644 core/libraries/fof/encrypt/aes/interface.php
 create mode 100644 core/libraries/fof/encrypt/aes/mcrypt.php
 create mode 100644 core/libraries/fof/encrypt/aes/openssl.php
 create mode 100644 core/libraries/fof/encrypt/base32.php
 create mode 100644 core/libraries/fof/encrypt/randval.php
 create mode 100644 core/libraries/fof/encrypt/randvalinterface.php
 create mode 100644 core/libraries/fof/encrypt/totp.php
 create mode 100644 core/libraries/fof/form/field.php
 create mode 100644 core/libraries/fof/form/field/accesslevel.php
 create mode 100644 core/libraries/fof/form/field/actions.php
 create mode 100644 core/libraries/fof/form/field/button.php
 create mode 100644 core/libraries/fof/form/field/cachehandler.php
 create mode 100644 core/libraries/fof/form/field/calendar.php
 create mode 100644 core/libraries/fof/form/field/captcha.php
 create mode 100644 core/libraries/fof/form/field/checkbox.php
 create mode 100644 core/libraries/fof/form/field/checkboxes.php
 create mode 100644 core/libraries/fof/form/field/components.php
 create mode 100644 core/libraries/fof/form/field/editor.php
 create mode 100644 core/libraries/fof/form/field/email.php
 create mode 100644 core/libraries/fof/form/field/groupedbutton.php
 create mode 100644 core/libraries/fof/form/field/groupedlist.php
 create mode 100644 core/libraries/fof/form/field/hidden.php
 create mode 100644 core/libraries/fof/form/field/image.php
 create mode 100644 core/libraries/fof/form/field/imagelist.php
 create mode 100644 core/libraries/fof/form/field/integer.php
 create mode 100644 core/libraries/fof/form/field/language.php
 create mode 100644 core/libraries/fof/form/field/list.php
 create mode 100644 core/libraries/fof/form/field/media.php
 create mode 100644 core/libraries/fof/form/field/model.php
 create mode 100644 core/libraries/fof/form/field/ordering.php
 create mode 100644 core/libraries/fof/form/field/password.php
 create mode 100644 core/libraries/fof/form/field/plugins.php
 create mode 100644 core/libraries/fof/form/field/published.php
 create mode 100644 core/libraries/fof/form/field/radio.php
 create mode 100644 core/libraries/fof/form/field/relation.php
 create mode 100644 core/libraries/fof/form/field/rules.php
 create mode 100644 core/libraries/fof/form/field/selectrow.php
 create mode 100644 core/libraries/fof/form/field/sessionhandler.php
 create mode 100644 core/libraries/fof/form/field/spacer.php
 create mode 100644 core/libraries/fof/form/field/sql.php
 create mode 100644 core/libraries/fof/form/field/tag.php
 create mode 100644 core/libraries/fof/form/field/tel.php
 create mode 100644 core/libraries/fof/form/field/text.php
 create mode 100644 core/libraries/fof/form/field/textarea.php
 create mode 100644 core/libraries/fof/form/field/timezone.php
 create mode 100644 core/libraries/fof/form/field/title.php
 create mode 100644 core/libraries/fof/form/field/url.php
 create mode 100644 core/libraries/fof/form/field/user.php
 create mode 100644 core/libraries/fof/form/field/usergroup.php
 create mode 100644 core/libraries/fof/form/form.php
 create mode 100644 core/libraries/fof/form/header.php
 create mode 100644 core/libraries/fof/form/header/accesslevel.php
 create mode 100644 core/libraries/fof/form/header/field.php
 create mode 100644 core/libraries/fof/form/header/fielddate.php
 create mode 100644 core/libraries/fof/form/header/fieldfilterable.php
 create mode 100644 core/libraries/fof/form/header/fieldsearchable.php
 create mode 100644 core/libraries/fof/form/header/fieldselectable.php
 create mode 100644 core/libraries/fof/form/header/fieldsql.php
 create mode 100644 core/libraries/fof/form/header/filterdate.php
 create mode 100644 core/libraries/fof/form/header/filterfilterable.php
 create mode 100644 core/libraries/fof/form/header/filtersearchable.php
 create mode 100644 core/libraries/fof/form/header/filterselectable.php
 create mode 100644 core/libraries/fof/form/header/filtersql.php
 create mode 100644 core/libraries/fof/form/header/language.php
 create mode 100644 core/libraries/fof/form/header/model.php
 create mode 100644 core/libraries/fof/form/header/ordering.php
 create mode 100644 core/libraries/fof/form/header/published.php
 create mode 100644 core/libraries/fof/form/header/rowselect.php
 create mode 100644 core/libraries/fof/form/helper.php
 create mode 100644 core/libraries/fof/hal/document.php
 create mode 100644 core/libraries/fof/hal/link.php
 create mode 100644 core/libraries/fof/hal/links.php
 create mode 100644 core/libraries/fof/hal/render/interface.php
 create mode 100644 core/libraries/fof/hal/render/json.php
 create mode 100644 core/libraries/fof/include.php
 create mode 100644 core/libraries/fof/inflector/inflector.php
 create mode 100644 core/libraries/fof/input/input.php
 create mode 100644 core/libraries/fof/input/jinput/cli.php
 create mode 100644 core/libraries/fof/input/jinput/cookie.php
 create mode 100644 core/libraries/fof/input/jinput/files.php
 create mode 100644 core/libraries/fof/input/jinput/input.php
 create mode 100644 core/libraries/fof/input/jinput/json.php
 create mode 100644 core/libraries/fof/integration/joomla/filesystem/filesystem.php
 create mode 100644 core/libraries/fof/integration/joomla/platform.php
 create mode 100644 core/libraries/fof/layout/file.php
 create mode 100644 core/libraries/fof/layout/helper.php
 create mode 100644 core/libraries/fof/less/formatter/classic.php
 create mode 100644 core/libraries/fof/less/formatter/compressed.php
 create mode 100644 core/libraries/fof/less/formatter/joomla.php
 create mode 100644 core/libraries/fof/less/formatter/lessjs.php
 create mode 100644 core/libraries/fof/less/less.php
 create mode 100644 core/libraries/fof/less/parser/parser.php
 create mode 100644 core/libraries/fof/model/behavior.php
 create mode 100644 core/libraries/fof/model/behavior/access.php
 create mode 100644 core/libraries/fof/model/behavior/emptynonzero.php
 create mode 100644 core/libraries/fof/model/behavior/enabled.php
 create mode 100644 core/libraries/fof/model/behavior/filters.php
 create mode 100644 core/libraries/fof/model/behavior/language.php
 create mode 100644 core/libraries/fof/model/behavior/private.php
 create mode 100644 core/libraries/fof/model/dispatcher/behavior.php
 create mode 100644 core/libraries/fof/model/field.php
 create mode 100644 core/libraries/fof/model/field/boolean.php
 create mode 100644 core/libraries/fof/model/field/date.php
 create mode 100644 core/libraries/fof/model/field/number.php
 create mode 100644 core/libraries/fof/model/field/text.php
 create mode 100644 core/libraries/fof/model/model.php
 create mode 100644 core/libraries/fof/platform/filesystem/filesystem.php
 create mode 100644 core/libraries/fof/platform/filesystem/interface.php
 create mode 100644 core/libraries/fof/platform/interface.php
 create mode 100644 core/libraries/fof/platform/platform.php
 create mode 100644 core/libraries/fof/query/abstract.php
 create mode 100644 core/libraries/fof/render/abstract.php
 create mode 100644 core/libraries/fof/render/joomla.php
 create mode 100644 core/libraries/fof/render/joomla3.php
 create mode 100644 core/libraries/fof/render/strapper.php
 create mode 100644 core/libraries/fof/string/utils.php
 create mode 100644 core/libraries/fof/table/behavior.php
 create mode 100644 core/libraries/fof/table/behavior/assets.php
 create mode 100644 core/libraries/fof/table/behavior/contenthistory.php
 create mode 100644 core/libraries/fof/table/behavior/tags.php
 create mode 100644 core/libraries/fof/table/dispatcher/behavior.php
 create mode 100644 core/libraries/fof/table/nested.php
 create mode 100644 core/libraries/fof/table/relations.php
 create mode 100644 core/libraries/fof/table/table.php
 create mode 100644 core/libraries/fof/template/utils.php
 create mode 100644 core/libraries/fof/toolbar/toolbar.php
 create mode 100644 core/libraries/fof/utils/array/array.php
 create mode 100644 core/libraries/fof/utils/cache/cleaner.php
 create mode 100644 core/libraries/fof/utils/config/helper.php
 create mode 100644 core/libraries/fof/utils/filescheck/filescheck.php
 create mode 100644 core/libraries/fof/utils/ini/parser.php
 create mode 100644 core/libraries/fof/utils/installscript/installscript.php
 create mode 100644 core/libraries/fof/utils/ip/ip.php
 create mode 100644 core/libraries/fof/utils/object/object.php
 create mode 100644 core/libraries/fof/utils/observable/dispatcher.php
 create mode 100644 core/libraries/fof/utils/observable/event.php
 create mode 100644 core/libraries/fof/utils/phpfunc/phpfunc.php
 create mode 100644 core/libraries/fof/utils/timer/timer.php
 create mode 100644 core/libraries/fof/utils/update/collection.php
 create mode 100644 core/libraries/fof/utils/update/extension.php
 create mode 100644 core/libraries/fof/utils/update/joomla.php
 create mode 100644 core/libraries/fof/utils/update/update.php
 create mode 100644 core/libraries/fof/version.txt
 create mode 100644 core/libraries/fof/view/csv.php
 create mode 100644 core/libraries/fof/view/form.php
 create mode 100644 core/libraries/fof/view/html.php
 create mode 100644 core/libraries/fof/view/json.php
 create mode 100644 core/libraries/fof/view/raw.php
 create mode 100644 core/libraries/fof/view/view.php
 create mode 100644 core/libraries/idna_convert/LICENCE
 create mode 100644 core/libraries/idna_convert/ReadMe.txt
 create mode 100644 core/libraries/idna_convert/idna_convert.class.php
 create mode 100644 core/libraries/idna_convert/transcode_wrapper.php
 create mode 100644 core/libraries/idna_convert/uctc.php
 create mode 100644 core/libraries/import.legacy.php
 create mode 100644 core/libraries/import.php
 create mode 100644 core/libraries/index.html
 create mode 100644 core/libraries/joomla/application/web/router.php
 create mode 100644 core/libraries/joomla/application/web/router/base.php
 create mode 100644 core/libraries/joomla/application/web/router/rest.php
 create mode 100644 core/libraries/joomla/archive/archive.php
 create mode 100644 core/libraries/joomla/archive/bzip2.php
 create mode 100644 core/libraries/joomla/archive/extractable.php
 create mode 100644 core/libraries/joomla/archive/gzip.php
 create mode 100644 core/libraries/joomla/archive/tar.php
 create mode 100644 core/libraries/joomla/archive/wrapper/archive.php
 create mode 100644 core/libraries/joomla/archive/zip.php
 create mode 100644 core/libraries/joomla/base/adapter.php
 create mode 100644 core/libraries/joomla/base/adapterinstance.php
 create mode 100644 core/libraries/joomla/controller/base.php
 create mode 100644 core/libraries/joomla/controller/controller.php
 create mode 100644 core/libraries/joomla/database/database.php
 create mode 100644 core/libraries/joomla/database/driver.php
 create mode 100644 core/libraries/joomla/database/driver/mysql.php
 create mode 100644 core/libraries/joomla/database/driver/mysqli.php
 create mode 100644 core/libraries/joomla/database/driver/oracle.php
 create mode 100644 core/libraries/joomla/database/driver/pdo.php
 create mode 100644 core/libraries/joomla/database/driver/pdomysql.php
 create mode 100644 core/libraries/joomla/database/driver/postgresql.php
 create mode 100644 core/libraries/joomla/database/driver/sqlazure.php
 create mode 100644 core/libraries/joomla/database/driver/sqlite.php
 create mode 100644 core/libraries/joomla/database/driver/sqlsrv.php
 create mode 100644 core/libraries/joomla/database/exception/connecting.php
 create mode 100644 core/libraries/joomla/database/exception/executing.php
 create mode 100644 core/libraries/joomla/database/exception/unsupported.php
 create mode 100644 core/libraries/joomla/database/exporter.php
 create mode 100644 core/libraries/joomla/database/exporter/mysql.php
 create mode 100644 core/libraries/joomla/database/exporter/mysqli.php
 create mode 100644 core/libraries/joomla/database/exporter/pdomysql.php
 create mode 100644 core/libraries/joomla/database/exporter/postgresql.php
 create mode 100644 core/libraries/joomla/database/factory.php
 create mode 100644 core/libraries/joomla/database/importer.php
 create mode 100644 core/libraries/joomla/database/importer/mysql.php
 create mode 100644 core/libraries/joomla/database/importer/mysqli.php
 create mode 100644 core/libraries/joomla/database/importer/pdomysql.php
 create mode 100644 core/libraries/joomla/database/importer/postgresql.php
 create mode 100644 core/libraries/joomla/database/interface.php
 create mode 100644 core/libraries/joomla/database/iterator.php
 create mode 100644 core/libraries/joomla/database/iterator/mysql.php
 create mode 100644 core/libraries/joomla/database/iterator/mysqli.php
 create mode 100644 core/libraries/joomla/database/iterator/oracle.php
 create mode 100644 core/libraries/joomla/database/iterator/pdo.php
 create mode 100644 core/libraries/joomla/database/iterator/pdomysql.php
 create mode 100644 core/libraries/joomla/database/iterator/postgresql.php
 create mode 100644 core/libraries/joomla/database/iterator/sqlazure.php
 create mode 100644 core/libraries/joomla/database/iterator/sqlite.php
 create mode 100644 core/libraries/joomla/database/iterator/sqlsrv.php
 create mode 100644 core/libraries/joomla/database/query.php
 create mode 100644 core/libraries/joomla/database/query/element.php
 create mode 100644 core/libraries/joomla/database/query/limitable.php
 create mode 100644 core/libraries/joomla/database/query/mysql.php
 create mode 100644 core/libraries/joomla/database/query/mysqli.php
 create mode 100644 core/libraries/joomla/database/query/oracle.php
 create mode 100644 core/libraries/joomla/database/query/pdo.php
 create mode 100644 core/libraries/joomla/database/query/pdomysql.php
 create mode 100644 core/libraries/joomla/database/query/postgresql.php
 create mode 100644 core/libraries/joomla/database/query/preparable.php
 create mode 100644 core/libraries/joomla/database/query/sqlazure.php
 create mode 100644 core/libraries/joomla/database/query/sqlite.php
 create mode 100644 core/libraries/joomla/database/query/sqlsrv.php
 create mode 100644 core/libraries/joomla/event/dispatcher.php
 create mode 100644 core/libraries/joomla/event/event.php
 create mode 100644 core/libraries/joomla/facebook/album.php
 create mode 100644 core/libraries/joomla/facebook/checkin.php
 create mode 100644 core/libraries/joomla/facebook/comment.php
 create mode 100644 core/libraries/joomla/facebook/event.php
 create mode 100644 core/libraries/joomla/facebook/facebook.php
 create mode 100644 core/libraries/joomla/facebook/group.php
 create mode 100644 core/libraries/joomla/facebook/link.php
 create mode 100644 core/libraries/joomla/facebook/note.php
 create mode 100644 core/libraries/joomla/facebook/oauth.php
 create mode 100644 core/libraries/joomla/facebook/object.php
 create mode 100644 core/libraries/joomla/facebook/photo.php
 create mode 100644 core/libraries/joomla/facebook/post.php
 create mode 100644 core/libraries/joomla/facebook/status.php
 create mode 100644 core/libraries/joomla/facebook/user.php
 create mode 100644 core/libraries/joomla/facebook/video.php
 create mode 100644 core/libraries/joomla/filesystem/file.php
 create mode 100644 core/libraries/joomla/filesystem/folder.php
 create mode 100644 core/libraries/joomla/filesystem/helper.php
 create mode 100644 core/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
 create mode 100644 core/libraries/joomla/filesystem/patcher.php
 create mode 100644 core/libraries/joomla/filesystem/path.php
 create mode 100644 core/libraries/joomla/filesystem/stream.php
 create mode 100644 core/libraries/joomla/filesystem/streams/string.php
 create mode 100644 core/libraries/joomla/filesystem/support/stringcontroller.php
 create mode 100644 core/libraries/joomla/filesystem/wrapper/file.php
 create mode 100644 core/libraries/joomla/filesystem/wrapper/folder.php
 create mode 100644 core/libraries/joomla/filesystem/wrapper/path.php
 create mode 100644 core/libraries/joomla/form/fields/accesslevel.php
 create mode 100644 core/libraries/joomla/form/fields/aliastag.php
 create mode 100644 core/libraries/joomla/form/fields/cachehandler.php
 create mode 100644 core/libraries/joomla/form/fields/calendar.php
 create mode 100644 core/libraries/joomla/form/fields/checkbox.php
 create mode 100644 core/libraries/joomla/form/fields/checkboxes.php
 create mode 100644 core/libraries/joomla/form/fields/color.php
 create mode 100644 core/libraries/joomla/form/fields/combo.php
 create mode 100644 core/libraries/joomla/form/fields/components.php
 create mode 100644 core/libraries/joomla/form/fields/databaseconnection.php
 create mode 100644 core/libraries/joomla/form/fields/email.php
 create mode 100644 core/libraries/joomla/form/fields/file.php
 create mode 100644 core/libraries/joomla/form/fields/filelist.php
 create mode 100644 core/libraries/joomla/form/fields/folderlist.php
 create mode 100644 core/libraries/joomla/form/fields/groupedlist.php
 create mode 100644 core/libraries/joomla/form/fields/hidden.php
 create mode 100644 core/libraries/joomla/form/fields/imagelist.php
 create mode 100644 core/libraries/joomla/form/fields/integer.php
 create mode 100644 core/libraries/joomla/form/fields/language.php
 create mode 100644 core/libraries/joomla/form/fields/list.php
 create mode 100644 core/libraries/joomla/form/fields/meter.php
 create mode 100644 core/libraries/joomla/form/fields/note.php
 create mode 100644 core/libraries/joomla/form/fields/number.php
 create mode 100644 core/libraries/joomla/form/fields/password.php
 create mode 100644 core/libraries/joomla/form/fields/plugins.php
 create mode 100644 core/libraries/joomla/form/fields/predefinedlist.php
 create mode 100644 core/libraries/joomla/form/fields/radio.php
 create mode 100644 core/libraries/joomla/form/fields/range.php
 create mode 100644 core/libraries/joomla/form/fields/repeatable.php
 create mode 100644 core/libraries/joomla/form/fields/rules.php
 create mode 100644 core/libraries/joomla/form/fields/sessionhandler.php
 create mode 100644 core/libraries/joomla/form/fields/spacer.php
 create mode 100644 core/libraries/joomla/form/fields/sql.php
 create mode 100644 core/libraries/joomla/form/fields/subform.php
 create mode 100644 core/libraries/joomla/form/fields/tel.php
 create mode 100644 core/libraries/joomla/form/fields/text.php
 create mode 100644 core/libraries/joomla/form/fields/textarea.php
 create mode 100644 core/libraries/joomla/form/fields/timezone.php
 create mode 100644 core/libraries/joomla/form/fields/url.php
 create mode 100644 core/libraries/joomla/form/fields/usergroup.php
 create mode 100644 core/libraries/joomla/github/account.php
 create mode 100644 core/libraries/joomla/github/commits.php
 create mode 100644 core/libraries/joomla/github/forks.php
 create mode 100644 core/libraries/joomla/github/github.php
 create mode 100644 core/libraries/joomla/github/hooks.php
 create mode 100644 core/libraries/joomla/github/http.php
 create mode 100644 core/libraries/joomla/github/meta.php
 create mode 100644 core/libraries/joomla/github/milestones.php
 create mode 100644 core/libraries/joomla/github/object.php
 create mode 100644 core/libraries/joomla/github/package.php
 create mode 100644 core/libraries/joomla/github/package/activity.php
 create mode 100644 core/libraries/joomla/github/package/activity/events.php
 create mode 100644 core/libraries/joomla/github/package/activity/notifications.php
 create mode 100644 core/libraries/joomla/github/package/activity/starring.php
 create mode 100644 core/libraries/joomla/github/package/activity/watching.php
 create mode 100644 core/libraries/joomla/github/package/authorization.php
 create mode 100644 core/libraries/joomla/github/package/data.php
 create mode 100644 core/libraries/joomla/github/package/data/blobs.php
 create mode 100644 core/libraries/joomla/github/package/data/commits.php
 create mode 100644 core/libraries/joomla/github/package/data/refs.php
 create mode 100644 core/libraries/joomla/github/package/data/tags.php
 create mode 100644 core/libraries/joomla/github/package/data/trees.php
 create mode 100644 core/libraries/joomla/github/package/gists.php
 create mode 100644 core/libraries/joomla/github/package/gists/comments.php
 create mode 100644 core/libraries/joomla/github/package/gitignore.php
 create mode 100644 core/libraries/joomla/github/package/issues.php
 create mode 100644 core/libraries/joomla/github/package/issues/assignees.php
 create mode 100644 core/libraries/joomla/github/package/issues/comments.php
 create mode 100644 core/libraries/joomla/github/package/issues/events.php
 create mode 100644 core/libraries/joomla/github/package/issues/labels.php
 create mode 100644 core/libraries/joomla/github/package/issues/milestones.php
 create mode 100644 core/libraries/joomla/github/package/markdown.php
 create mode 100644 core/libraries/joomla/github/package/orgs.php
 create mode 100644 core/libraries/joomla/github/package/orgs/members.php
 create mode 100644 core/libraries/joomla/github/package/orgs/teams.php
 create mode 100644 core/libraries/joomla/github/package/pulls.php
 create mode 100644 core/libraries/joomla/github/package/pulls/comments.php
 create mode 100644 core/libraries/joomla/github/package/repositories.php
 create mode 100644 core/libraries/joomla/github/package/repositories/collaborators.php
 create mode 100644 core/libraries/joomla/github/package/repositories/comments.php
 create mode 100644 core/libraries/joomla/github/package/repositories/commits.php
 create mode 100644 core/libraries/joomla/github/package/repositories/contents.php
 create mode 100644 core/libraries/joomla/github/package/repositories/downloads.php
 create mode 100644 core/libraries/joomla/github/package/repositories/forks.php
 create mode 100644 core/libraries/joomla/github/package/repositories/hooks.php
 create mode 100644 core/libraries/joomla/github/package/repositories/keys.php
 create mode 100644 core/libraries/joomla/github/package/repositories/merging.php
 create mode 100644 core/libraries/joomla/github/package/repositories/statistics.php
 create mode 100644 core/libraries/joomla/github/package/repositories/statuses.php
 create mode 100644 core/libraries/joomla/github/package/search.php
 create mode 100644 core/libraries/joomla/github/package/users.php
 create mode 100644 core/libraries/joomla/github/package/users/emails.php
 create mode 100644 core/libraries/joomla/github/package/users/followers.php
 create mode 100644 core/libraries/joomla/github/package/users/keys.php
 create mode 100644 core/libraries/joomla/github/refs.php
 create mode 100644 core/libraries/joomla/github/statuses.php
 create mode 100644 core/libraries/joomla/google/auth.php
 create mode 100644 core/libraries/joomla/google/auth/oauth2.php
 create mode 100644 core/libraries/joomla/google/data.php
 create mode 100644 core/libraries/joomla/google/data/adsense.php
 create mode 100644 core/libraries/joomla/google/data/calendar.php
 create mode 100644 core/libraries/joomla/google/data/picasa.php
 create mode 100644 core/libraries/joomla/google/data/picasa/album.php
 create mode 100644 core/libraries/joomla/google/data/picasa/photo.php
 create mode 100644 core/libraries/joomla/google/data/plus.php
 create mode 100644 core/libraries/joomla/google/data/plus/activities.php
 create mode 100644 core/libraries/joomla/google/data/plus/comments.php
 create mode 100644 core/libraries/joomla/google/data/plus/people.php
 create mode 100644 core/libraries/joomla/google/embed.php
 create mode 100644 core/libraries/joomla/google/embed/analytics.php
 create mode 100644 core/libraries/joomla/google/embed/maps.php
 create mode 100644 core/libraries/joomla/google/google.php
 create mode 100644 core/libraries/joomla/grid/grid.php
 create mode 100644 core/libraries/joomla/keychain/keychain.php
 create mode 100644 core/libraries/joomla/linkedin/communications.php
 create mode 100644 core/libraries/joomla/linkedin/companies.php
 create mode 100644 core/libraries/joomla/linkedin/groups.php
 create mode 100644 core/libraries/joomla/linkedin/jobs.php
 create mode 100644 core/libraries/joomla/linkedin/linkedin.php
 create mode 100644 core/libraries/joomla/linkedin/oauth.php
 create mode 100644 core/libraries/joomla/linkedin/object.php
 create mode 100644 core/libraries/joomla/linkedin/people.php
 create mode 100644 core/libraries/joomla/linkedin/stream.php
 create mode 100644 core/libraries/joomla/mediawiki/categories.php
 create mode 100644 core/libraries/joomla/mediawiki/http.php
 create mode 100644 core/libraries/joomla/mediawiki/images.php
 create mode 100644 core/libraries/joomla/mediawiki/links.php
 create mode 100644 core/libraries/joomla/mediawiki/mediawiki.php
 create mode 100644 core/libraries/joomla/mediawiki/object.php
 create mode 100644 core/libraries/joomla/mediawiki/pages.php
 create mode 100644 core/libraries/joomla/mediawiki/search.php
 create mode 100644 core/libraries/joomla/mediawiki/sites.php
 create mode 100644 core/libraries/joomla/mediawiki/users.php
 create mode 100644 core/libraries/joomla/model/base.php
 create mode 100644 core/libraries/joomla/model/database.php
 create mode 100644 core/libraries/joomla/model/model.php
 create mode 100644 core/libraries/joomla/oauth1/client.php
 create mode 100644 core/libraries/joomla/oauth2/client.php
 create mode 100644 core/libraries/joomla/observable/interface.php
 create mode 100644 core/libraries/joomla/observer/interface.php
 create mode 100644 core/libraries/joomla/observer/mapper.php
 create mode 100644 core/libraries/joomla/observer/updater.php
 create mode 100644 core/libraries/joomla/observer/updater/interface.php
 create mode 100644 core/libraries/joomla/observer/wrapper/mapper.php
 create mode 100644 core/libraries/joomla/openstreetmap/changesets.php
 create mode 100644 core/libraries/joomla/openstreetmap/elements.php
 create mode 100644 core/libraries/joomla/openstreetmap/gps.php
 create mode 100644 core/libraries/joomla/openstreetmap/info.php
 create mode 100644 core/libraries/joomla/openstreetmap/oauth.php
 create mode 100644 core/libraries/joomla/openstreetmap/object.php
 create mode 100644 core/libraries/joomla/openstreetmap/openstreetmap.php
 create mode 100644 core/libraries/joomla/openstreetmap/user.php
 create mode 100644 core/libraries/joomla/platform.php
 create mode 100644 core/libraries/joomla/route/wrapper/route.php
 create mode 100644 core/libraries/joomla/session/handler/interface.php
 create mode 100644 core/libraries/joomla/session/handler/joomla.php
 create mode 100644 core/libraries/joomla/session/handler/native.php
 create mode 100644 core/libraries/joomla/session/storage.php
 create mode 100644 core/libraries/joomla/session/storage/apc.php
 create mode 100644 core/libraries/joomla/session/storage/database.php
 create mode 100644 core/libraries/joomla/session/storage/memcache.php
 create mode 100644 core/libraries/joomla/session/storage/memcached.php
 create mode 100644 core/libraries/joomla/session/storage/none.php
 create mode 100644 core/libraries/joomla/session/storage/redis.php
 create mode 100644 core/libraries/joomla/session/storage/wincache.php
 create mode 100644 core/libraries/joomla/session/storage/xcache.php
 create mode 100644 core/libraries/joomla/string/string.php
 create mode 100644 core/libraries/joomla/string/wrapper/normalise.php
 create mode 100644 core/libraries/joomla/string/wrapper/punycode.php
 create mode 100644 core/libraries/joomla/twitter/block.php
 create mode 100644 core/libraries/joomla/twitter/directmessages.php
 create mode 100644 core/libraries/joomla/twitter/favorites.php
 create mode 100644 core/libraries/joomla/twitter/friends.php
 create mode 100644 core/libraries/joomla/twitter/help.php
 create mode 100644 core/libraries/joomla/twitter/lists.php
 create mode 100644 core/libraries/joomla/twitter/oauth.php
 create mode 100644 core/libraries/joomla/twitter/object.php
 create mode 100644 core/libraries/joomla/twitter/places.php
 create mode 100644 core/libraries/joomla/twitter/profile.php
 create mode 100644 core/libraries/joomla/twitter/search.php
 create mode 100644 core/libraries/joomla/twitter/statuses.php
 create mode 100644 core/libraries/joomla/twitter/trends.php
 create mode 100644 core/libraries/joomla/twitter/twitter.php
 create mode 100644 core/libraries/joomla/twitter/users.php
 create mode 100644 core/libraries/joomla/utilities/arrayhelper.php
 create mode 100644 core/libraries/joomla/view/base.php
 create mode 100644 core/libraries/joomla/view/html.php
 create mode 100644 core/libraries/joomla/view/view.php
 create mode 100644 core/libraries/legacy/application/application.php
 create mode 100644 core/libraries/legacy/base/node.php
 create mode 100644 core/libraries/legacy/base/observable.php
 create mode 100644 core/libraries/legacy/base/observer.php
 create mode 100644 core/libraries/legacy/base/tree.php
 create mode 100644 core/libraries/legacy/database/exception.php
 create mode 100644 core/libraries/legacy/database/mysql.php
 create mode 100644 core/libraries/legacy/database/mysqli.php
 create mode 100644 core/libraries/legacy/database/sqlazure.php
 create mode 100644 core/libraries/legacy/database/sqlsrv.php
 create mode 100644 core/libraries/legacy/dispatcher/dispatcher.php
 create mode 100644 core/libraries/legacy/error/error.php
 create mode 100644 core/libraries/legacy/exception/exception.php
 create mode 100644 core/libraries/legacy/form/field/category.php
 create mode 100644 core/libraries/legacy/form/field/componentlayout.php
 create mode 100644 core/libraries/legacy/form/field/modulelayout.php
 create mode 100644 core/libraries/legacy/log/logexception.php
 create mode 100644 core/libraries/legacy/request/request.php
 create mode 100644 core/libraries/legacy/response/response.php
 create mode 100644 core/libraries/legacy/simplecrypt/simplecrypt.php
 create mode 100644 core/libraries/legacy/simplepie/factory.php
 create mode 100644 core/libraries/legacy/table/session.php
 create mode 100644 core/libraries/legacy/utilities/xmlelement.php
 create mode 100644 core/libraries/loader.php
 create mode 100644 core/libraries/php-encryption/Crypto.php
 create mode 100644 core/libraries/phpass/PasswordHash.php
 create mode 100644 core/libraries/phputf8/LICENSE
 create mode 100644 core/libraries/phputf8/README
 create mode 100644 core/libraries/phputf8/mbstring/core.php
 create mode 100644 core/libraries/phputf8/native/core.php
 create mode 100644 core/libraries/phputf8/ord.php
 create mode 100644 core/libraries/phputf8/str_ireplace.php
 create mode 100644 core/libraries/phputf8/str_pad.php
 create mode 100644 core/libraries/phputf8/str_split.php
 create mode 100644 core/libraries/phputf8/strcasecmp.php
 create mode 100644 core/libraries/phputf8/strcspn.php
 create mode 100644 core/libraries/phputf8/stristr.php
 create mode 100644 core/libraries/phputf8/strrev.php
 create mode 100644 core/libraries/phputf8/strspn.php
 create mode 100644 core/libraries/phputf8/substr_replace.php
 create mode 100644 core/libraries/phputf8/trim.php
 create mode 100644 core/libraries/phputf8/ucfirst.php
 create mode 100644 core/libraries/phputf8/ucwords.php
 create mode 100644 core/libraries/phputf8/utf8.php
 create mode 100644 core/libraries/phputf8/utils/ascii.php
 create mode 100644 core/libraries/phputf8/utils/bad.php
 create mode 100644 core/libraries/phputf8/utils/patterns.php
 create mode 100644 core/libraries/phputf8/utils/position.php
 create mode 100644 core/libraries/phputf8/utils/specials.php
 create mode 100644 core/libraries/phputf8/utils/unicode.php
 create mode 100644 core/libraries/phputf8/utils/validation.php
 create mode 100644 core/libraries/src/Access/Access.php
 create mode 100644 core/libraries/src/Access/Exception/NotAllowed.php
 create mode 100644 core/libraries/src/Access/Rule.php
 create mode 100644 core/libraries/src/Access/Rules.php
 create mode 100644 core/libraries/src/Access/Wrapper/Access.php
 create mode 100644 core/libraries/src/Application/AdministratorApplication.php
 create mode 100644 core/libraries/src/Application/ApplicationHelper.php
 create mode 100644 core/libraries/src/Application/BaseApplication.php
 create mode 100644 core/libraries/src/Application/CMSApplication.php
 create mode 100644 core/libraries/src/Application/CliApplication.php
 create mode 100644 core/libraries/src/Application/DaemonApplication.php
 create mode 100644 core/libraries/src/Application/SiteApplication.php
 create mode 100644 core/libraries/src/Application/WebApplication.php
 create mode 100644 core/libraries/src/Association/AssociationExtensionHelper.php
 create mode 100644 core/libraries/src/Association/AssociationExtensionInterface.php
 create mode 100644 core/libraries/src/Authentication/Authentication.php
 create mode 100644 core/libraries/src/Authentication/AuthenticationResponse.php
 create mode 100644 core/libraries/src/Cache/Cache.php
 create mode 100644 core/libraries/src/Cache/CacheController.php
 create mode 100644 core/libraries/src/Cache/CacheStorage.php
 create mode 100644 core/libraries/src/Cache/Controller/CallbackController.php
 create mode 100644 core/libraries/src/Cache/Controller/OutputController.php
 create mode 100644 core/libraries/src/Cache/Controller/PageController.php
 create mode 100644 core/libraries/src/Cache/Controller/ViewController.php
 create mode 100644 core/libraries/src/Cache/Exception/CacheConnectingException.php
 create mode 100644 core/libraries/src/Cache/Exception/CacheExceptionInterface.php
 create mode 100644 core/libraries/src/Cache/Exception/UnsupportedCacheException.php
 create mode 100644 core/libraries/src/Cache/Storage/ApcStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/ApcuStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/CacheStorageHelper.php
 create mode 100644 core/libraries/src/Cache/Storage/CacheliteStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/FileStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/MemcacheStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/MemcachedStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/RedisStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/WincacheStorage.php
 create mode 100644 core/libraries/src/Cache/Storage/XcacheStorage.php
 create mode 100644 core/libraries/src/Captcha/Captcha.php
 create mode 100644 core/libraries/src/Categories/Categories.php
 create mode 100644 core/libraries/src/Categories/CategoryNode.php
 create mode 100644 core/libraries/src/Client/ClientHelper.php
 create mode 100644 core/libraries/src/Client/ClientWrapper.php
 create mode 100644 core/libraries/src/Client/FtpClient.php
 create mode 100644 core/libraries/src/Component/ComponentHelper.php
 create mode 100644 core/libraries/src/Component/ComponentRecord.php
 create mode 100644 core/libraries/src/Component/Exception/MissingComponentException.php
 create mode 100644 core/libraries/src/Component/Router/RouterBase.php
 create mode 100644 core/libraries/src/Component/Router/RouterInterface.php
 create mode 100644 core/libraries/src/Component/Router/RouterLegacy.php
 create mode 100644 core/libraries/src/Component/Router/RouterView.php
 create mode 100644 core/libraries/src/Component/Router/RouterViewConfiguration.php
 create mode 100644 core/libraries/src/Component/Router/Rules/MenuRules.php
 create mode 100644 core/libraries/src/Component/Router/Rules/NomenuRules.php
 create mode 100644 core/libraries/src/Component/Router/Rules/RulesInterface.php
 create mode 100644 core/libraries/src/Component/Router/Rules/StandardRules.php
 create mode 100644 core/libraries/src/Crypt/Cipher/BlowfishCipher.php
 create mode 100644 core/libraries/src/Crypt/Cipher/CryptoCipher.php
 create mode 100644 core/libraries/src/Crypt/Cipher/McryptCipher.php
 create mode 100644 core/libraries/src/Crypt/Cipher/Rijndael256Cipher.php
 create mode 100644 core/libraries/src/Crypt/Cipher/SimpleCipher.php
 create mode 100644 core/libraries/src/Crypt/Cipher/SodiumCipher.php
 create mode 100644 core/libraries/src/Crypt/Cipher/TripleDesCipher.php
 create mode 100644 core/libraries/src/Crypt/CipherInterface.php
 create mode 100644 core/libraries/src/Crypt/Crypt.php
 create mode 100644 core/libraries/src/Crypt/CryptPassword.php
 create mode 100644 core/libraries/src/Crypt/Key.php
 create mode 100644 core/libraries/src/Crypt/Password/SimpleCryptPassword.php
 create mode 100644 core/libraries/src/Crypt/README.md
 create mode 100644 core/libraries/src/Date/Date.php
 create mode 100644 core/libraries/src/Document/Document.php
 create mode 100644 core/libraries/src/Document/DocumentRenderer.php
 create mode 100644 core/libraries/src/Document/ErrorDocument.php
 create mode 100644 core/libraries/src/Document/Feed/FeedEnclosure.php
 create mode 100644 core/libraries/src/Document/Feed/FeedImage.php
 create mode 100644 core/libraries/src/Document/Feed/FeedItem.php
 create mode 100644 core/libraries/src/Document/FeedDocument.php
 create mode 100644 core/libraries/src/Document/HtmlDocument.php
 create mode 100644 core/libraries/src/Document/ImageDocument.php
 create mode 100644 core/libraries/src/Document/JsonDocument.php
 create mode 100644 core/libraries/src/Document/Opensearch/OpensearchImage.php
 create mode 100644 core/libraries/src/Document/Opensearch/OpensearchUrl.php
 create mode 100644 core/libraries/src/Document/OpensearchDocument.php
 create mode 100644 core/libraries/src/Document/RawDocument.php
 create mode 100644 core/libraries/src/Document/Renderer/Feed/AtomRenderer.php
 create mode 100644 core/libraries/src/Document/Renderer/Feed/RssRenderer.php
 create mode 100644 core/libraries/src/Document/Renderer/Html/ComponentRenderer.php
 create mode 100644 core/libraries/src/Document/Renderer/Html/HeadRenderer.php
 create mode 100644 core/libraries/src/Document/Renderer/Html/MessageRenderer.php
 create mode 100644 core/libraries/src/Document/Renderer/Html/ModuleRenderer.php
 create mode 100644 core/libraries/src/Document/Renderer/Html/ModulesRenderer.php
 create mode 100644 core/libraries/src/Document/XmlDocument.php
 create mode 100644 core/libraries/src/Editor/Editor.php
 create mode 100644 core/libraries/src/Environment/Browser.php
 create mode 100644 core/libraries/src/Exception/ExceptionHandler.php
 create mode 100644 core/libraries/src/Extension/ExtensionHelper.php
 create mode 100644 core/libraries/src/Factory.php
 create mode 100644 core/libraries/src/Feed/Feed.php
 create mode 100644 core/libraries/src/Feed/FeedEntry.php
 create mode 100644 core/libraries/src/Feed/FeedFactory.php
 create mode 100644 core/libraries/src/Feed/FeedLink.php
 create mode 100644 core/libraries/src/Feed/FeedParser.php
 create mode 100644 core/libraries/src/Feed/FeedPerson.php
 create mode 100644 core/libraries/src/Feed/Parser/AtomParser.php
 create mode 100644 core/libraries/src/Feed/Parser/NamespaceParserInterface.php
 create mode 100644 core/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
 create mode 100644 core/libraries/src/Feed/Parser/Rss/MediaRssParser.php
 create mode 100644 core/libraries/src/Feed/Parser/RssParser.php
 create mode 100644 core/libraries/src/Filter/InputFilter.php
 create mode 100644 core/libraries/src/Filter/OutputFilter.php
 create mode 100644 core/libraries/src/Filter/Wrapper/OutputFilterWrapper.php
 create mode 100644 core/libraries/src/Form/Field/AuthorField.php
 create mode 100644 core/libraries/src/Form/Field/CaptchaField.php
 create mode 100644 core/libraries/src/Form/Field/ChromestyleField.php
 create mode 100644 core/libraries/src/Form/Field/ContenthistoryField.php
 create mode 100644 core/libraries/src/Form/Field/ContentlanguageField.php
 create mode 100644 core/libraries/src/Form/Field/ContenttypeField.php
 create mode 100644 core/libraries/src/Form/Field/EditorField.php
 create mode 100644 core/libraries/src/Form/Field/FrontendlanguageField.php
 create mode 100644 core/libraries/src/Form/Field/HeadertagField.php
 create mode 100644 core/libraries/src/Form/Field/HelpsiteField.php
 create mode 100644 core/libraries/src/Form/Field/LastvisitdaterangeField.php
 create mode 100644 core/libraries/src/Form/Field/LimitboxField.php
 create mode 100644 core/libraries/src/Form/Field/MediaField.php
 create mode 100644 core/libraries/src/Form/Field/MenuField.php
 create mode 100644 core/libraries/src/Form/Field/MenuitemField.php
 create mode 100644 core/libraries/src/Form/Field/ModuleorderField.php
 create mode 100644 core/libraries/src/Form/Field/ModulepositionField.php
 create mode 100644 core/libraries/src/Form/Field/ModuletagField.php
 create mode 100644 core/libraries/src/Form/Field/OrderingField.php
 create mode 100644 core/libraries/src/Form/Field/PluginstatusField.php
 create mode 100644 core/libraries/src/Form/Field/RedirectStatusField.php
 create mode 100644 core/libraries/src/Form/Field/RegistrationdaterangeField.php
 create mode 100644 core/libraries/src/Form/Field/StatusField.php
 create mode 100644 core/libraries/src/Form/Field/TagField.php
 create mode 100644 core/libraries/src/Form/Field/TemplatestyleField.php
 create mode 100644 core/libraries/src/Form/Field/UserField.php
 create mode 100644 core/libraries/src/Form/Field/UseractiveField.php
 create mode 100644 core/libraries/src/Form/Field/UsergrouplistField.php
 create mode 100644 core/libraries/src/Form/Field/UserstateField.php
 create mode 100644 core/libraries/src/Form/Form.php
 create mode 100644 core/libraries/src/Form/FormField.php
 create mode 100644 core/libraries/src/Form/FormHelper.php
 create mode 100644 core/libraries/src/Form/FormRule.php
 create mode 100644 core/libraries/src/Form/FormWrapper.php
 create mode 100644 core/libraries/src/Form/Rule/BooleanRule.php
 create mode 100644 core/libraries/src/Form/Rule/CalendarRule.php
 create mode 100644 core/libraries/src/Form/Rule/CaptchaRule.php
 create mode 100644 core/libraries/src/Form/Rule/ColorRule.php
 create mode 100644 core/libraries/src/Form/Rule/EmailRule.php
 create mode 100644 core/libraries/src/Form/Rule/EqualsRule.php
 create mode 100644 core/libraries/src/Form/Rule/NotequalsRule.php
 create mode 100644 core/libraries/src/Form/Rule/NumberRule.php
 create mode 100644 core/libraries/src/Form/Rule/OptionsRule.php
 create mode 100644 core/libraries/src/Form/Rule/PasswordRule.php
 create mode 100644 core/libraries/src/Form/Rule/RulesRule.php
 create mode 100644 core/libraries/src/Form/Rule/TelRule.php
 create mode 100644 core/libraries/src/Form/Rule/UrlRule.php
 create mode 100644 core/libraries/src/Form/Rule/UsernameRule.php
 create mode 100644 core/libraries/src/HTML/HTMLHelper.php
 create mode 100644 core/libraries/src/Help/Help.php
 create mode 100644 core/libraries/src/Helper/AuthenticationHelper.php
 create mode 100644 core/libraries/src/Helper/CMSHelper.php
 create mode 100644 core/libraries/src/Helper/ContentHelper.php
 create mode 100644 core/libraries/src/Helper/ContentHistoryHelper.php
 create mode 100644 core/libraries/src/Helper/LibraryHelper.php
 create mode 100644 core/libraries/src/Helper/MediaHelper.php
 create mode 100644 core/libraries/src/Helper/ModuleHelper.php
 create mode 100644 core/libraries/src/Helper/RouteHelper.php
 create mode 100644 core/libraries/src/Helper/SearchHelper.php
 create mode 100644 core/libraries/src/Helper/TagsHelper.php
 create mode 100644 core/libraries/src/Helper/UserGroupsHelper.php
 create mode 100644 core/libraries/src/Http/Http.php
 create mode 100644 core/libraries/src/Http/HttpFactory.php
 create mode 100644 core/libraries/src/Http/Response.php
 create mode 100644 core/libraries/src/Http/Transport/CurlTransport.php
 create mode 100644 core/libraries/src/Http/Transport/SocketTransport.php
 create mode 100644 core/libraries/src/Http/Transport/StreamTransport.php
 create mode 100644 core/libraries/src/Http/Transport/cacert.pem
 create mode 100644 core/libraries/src/Http/TransportInterface.php
 create mode 100644 core/libraries/src/Http/Wrapper/FactoryWrapper.php
 create mode 100644 core/libraries/src/Image/Image.php
 create mode 100644 core/libraries/src/Image/ImageFilter.php
 create mode 100644 core/libraries/src/Input/Cli.php
 create mode 100644 core/libraries/src/Input/Cookie.php
 create mode 100644 core/libraries/src/Input/Files.php
 create mode 100644 core/libraries/src/Input/Input.php
 create mode 100644 core/libraries/src/Input/Json.php
 create mode 100644 core/libraries/src/Installer/Adapter/ComponentAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/FileAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/LanguageAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/LibraryAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/ModuleAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/PackageAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/PluginAdapter.php
 create mode 100644 core/libraries/src/Installer/Adapter/TemplateAdapter.php
 create mode 100644 core/libraries/src/Installer/Installer.php
 create mode 100644 core/libraries/src/Installer/InstallerAdapter.php
 create mode 100644 core/libraries/src/Installer/InstallerExtension.php
 create mode 100644 core/libraries/src/Installer/InstallerHelper.php
 create mode 100644 core/libraries/src/Installer/InstallerScript.php
 create mode 100644 core/libraries/src/Installer/Manifest.php
 create mode 100644 core/libraries/src/Installer/Manifest/LibraryManifest.php
 create mode 100644 core/libraries/src/Installer/Manifest/PackageManifest.php
 create mode 100644 core/libraries/src/Language/Associations.php
 create mode 100644 core/libraries/src/Language/Language.php
 create mode 100644 core/libraries/src/Language/LanguageHelper.php
 create mode 100644 core/libraries/src/Language/LanguageStemmer.php
 create mode 100644 core/libraries/src/Language/Multilanguage.php
 create mode 100644 core/libraries/src/Language/Stemmer/Porteren.php
 create mode 100644 core/libraries/src/Language/Text.php
 create mode 100644 core/libraries/src/Language/Transliterate.php
 create mode 100644 core/libraries/src/Language/Wrapper/JTextWrapper.php
 create mode 100644 core/libraries/src/Language/Wrapper/LanguageHelperWrapper.php
 create mode 100644 core/libraries/src/Language/Wrapper/TransliterateWrapper.php
 create mode 100644 core/libraries/src/Layout/BaseLayout.php
 create mode 100644 core/libraries/src/Layout/FileLayout.php
 create mode 100644 core/libraries/src/Layout/LayoutHelper.php
 create mode 100644 core/libraries/src/Layout/LayoutInterface.php
 create mode 100644 core/libraries/src/Log/DelegatingPsrLogger.php
 create mode 100644 core/libraries/src/Log/Log.php
 create mode 100644 core/libraries/src/Log/LogEntry.php
 create mode 100644 core/libraries/src/Log/Logger.php
 create mode 100644 core/libraries/src/Log/Logger/CallbackLogger.php
 create mode 100644 core/libraries/src/Log/Logger/DatabaseLogger.php
 create mode 100644 core/libraries/src/Log/Logger/EchoLogger.php
 create mode 100644 core/libraries/src/Log/Logger/FormattedtextLogger.php
 create mode 100644 core/libraries/src/Log/Logger/MessagequeueLogger.php
 create mode 100644 core/libraries/src/Log/Logger/SyslogLogger.php
 create mode 100644 core/libraries/src/Log/Logger/W3cLogger.php
 create mode 100644 core/libraries/src/MVC/Controller/AdminController.php
 create mode 100644 core/libraries/src/MVC/Controller/BaseController.php
 create mode 100644 core/libraries/src/MVC/Controller/FormController.php
 create mode 100644 core/libraries/src/MVC/Model/AdminModel.php
 create mode 100644 core/libraries/src/MVC/Model/BaseDatabaseModel.php
 create mode 100644 core/libraries/src/MVC/Model/FormModel.php
 create mode 100644 core/libraries/src/MVC/Model/ItemModel.php
 create mode 100644 core/libraries/src/MVC/Model/ListModel.php
 create mode 100644 core/libraries/src/MVC/View/CategoriesView.php
 create mode 100644 core/libraries/src/MVC/View/CategoryFeedView.php
 create mode 100644 core/libraries/src/MVC/View/CategoryView.php
 create mode 100644 core/libraries/src/MVC/View/HtmlView.php
 create mode 100644 core/libraries/src/Mail/Mail.php
 create mode 100644 core/libraries/src/Mail/MailHelper.php
 create mode 100644 core/libraries/src/Mail/MailWrapper.php
 create mode 100644 core/libraries/src/Mail/language/phpmailer.lang-en_gb.php
 create mode 100644 core/libraries/src/Menu/AbstractMenu.php
 create mode 100644 core/libraries/src/Menu/AdministratorMenu.php
 create mode 100644 core/libraries/src/Menu/MenuHelper.php
 create mode 100644 core/libraries/src/Menu/MenuItem.php
 create mode 100644 core/libraries/src/Menu/Node.php
 create mode 100644 core/libraries/src/Menu/Node/Component.php
 create mode 100644 core/libraries/src/Menu/Node/Container.php
 create mode 100644 core/libraries/src/Menu/Node/Heading.php
 create mode 100644 core/libraries/src/Menu/Node/Separator.php
 create mode 100644 core/libraries/src/Menu/Node/Url.php
 create mode 100644 core/libraries/src/Menu/SiteMenu.php
 create mode 100644 core/libraries/src/Menu/Tree.php
 create mode 100644 core/libraries/src/Microdata/Microdata.php
 create mode 100644 core/libraries/src/Microdata/types.json
 create mode 100644 core/libraries/src/Object/CMSObject.php
 create mode 100644 core/libraries/src/Pagination/Pagination.php
 create mode 100644 core/libraries/src/Pagination/PaginationObject.php
 create mode 100644 core/libraries/src/Pathway/Pathway.php
 create mode 100644 core/libraries/src/Pathway/SitePathway.php
 create mode 100644 core/libraries/src/Plugin/CMSPlugin.php
 create mode 100644 core/libraries/src/Plugin/PluginHelper.php
 create mode 100644 core/libraries/src/Profiler/Profiler.php
 create mode 100644 core/libraries/src/Response/JsonResponse.php
 create mode 100644 core/libraries/src/Router/AdministratorRouter.php
 create mode 100644 core/libraries/src/Router/Exception/RouteNotFoundException.php
 create mode 100644 core/libraries/src/Router/Route.php
 create mode 100644 core/libraries/src/Router/Router.php
 create mode 100644 core/libraries/src/Router/SiteRouter.php
 create mode 100644 core/libraries/src/Schema/ChangeItem.php
 create mode 100644 core/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
 create mode 100644 core/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
 create mode 100644 core/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
 create mode 100644 core/libraries/src/Schema/ChangeSet.php
 create mode 100644 core/libraries/src/Session/Exception/UnsupportedStorageException.php
 create mode 100644 core/libraries/src/Session/MetadataManager.php
 create mode 100644 core/libraries/src/Session/Session.php
 create mode 100644 core/libraries/src/String/PunycodeHelper.php
 create mode 100644 core/libraries/src/Table/Asset.php
 create mode 100644 core/libraries/src/Table/Category.php
 create mode 100644 core/libraries/src/Table/Content.php
 create mode 100644 core/libraries/src/Table/ContentHistory.php
 create mode 100644 core/libraries/src/Table/ContentType.php
 create mode 100644 core/libraries/src/Table/CoreContent.php
 create mode 100644 core/libraries/src/Table/Extension.php
 create mode 100644 core/libraries/src/Table/Language.php
 create mode 100644 core/libraries/src/Table/Menu.php
 create mode 100644 core/libraries/src/Table/MenuType.php
 create mode 100644 core/libraries/src/Table/Module.php
 create mode 100644 core/libraries/src/Table/Nested.php
 create mode 100644 core/libraries/src/Table/Observer/AbstractObserver.php
 create mode 100644 core/libraries/src/Table/Observer/ContentHistory.php
 create mode 100644 core/libraries/src/Table/Observer/Tags.php
 create mode 100644 core/libraries/src/Table/Table.php
 create mode 100644 core/libraries/src/Table/TableInterface.php
 create mode 100644 core/libraries/src/Table/Ucm.php
 create mode 100644 core/libraries/src/Table/Update.php
 create mode 100644 core/libraries/src/Table/UpdateSite.php
 create mode 100644 core/libraries/src/Table/User.php
 create mode 100644 core/libraries/src/Table/Usergroup.php
 create mode 100644 core/libraries/src/Table/ViewLevel.php
 create mode 100644 core/libraries/src/Toolbar/Button/ConfirmButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/CustomButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/HelpButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/LinkButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/PopupButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/SeparatorButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/SliderButton.php
 create mode 100644 core/libraries/src/Toolbar/Button/StandardButton.php
 create mode 100644 core/libraries/src/Toolbar/Toolbar.php
 create mode 100644 core/libraries/src/Toolbar/ToolbarButton.php
 create mode 100644 core/libraries/src/UCM/UCM.php
 create mode 100644 core/libraries/src/UCM/UCMBase.php
 create mode 100644 core/libraries/src/UCM/UCMContent.php
 create mode 100644 core/libraries/src/UCM/UCMType.php
 create mode 100644 core/libraries/src/Updater/Adapter/CollectionAdapter.php
 create mode 100644 core/libraries/src/Updater/Adapter/ExtensionAdapter.php
 create mode 100644 core/libraries/src/Updater/DownloadSource.php
 create mode 100644 core/libraries/src/Updater/Update.php
 create mode 100644 core/libraries/src/Updater/UpdateAdapter.php
 create mode 100644 core/libraries/src/Updater/Updater.php
 create mode 100644 core/libraries/src/Uri/Uri.php
 create mode 100644 core/libraries/src/User/User.php
 create mode 100644 core/libraries/src/User/UserHelper.php
 create mode 100644 core/libraries/src/User/UserWrapper.php
 create mode 100644 core/libraries/src/Utility/BufferStreamHandler.php
 create mode 100644 core/libraries/src/Utility/Utility.php
 create mode 100644 core/libraries/src/Version.php
 create mode 100644 core/libraries/vendor/.htaccess
 create mode 100644 core/libraries/vendor/autoload.php
 create mode 100644 core/libraries/vendor/composer/ClassLoader.php
 create mode 100644 core/libraries/vendor/composer/LICENSE
 create mode 100644 core/libraries/vendor/composer/autoload_classmap.php
 create mode 100644 core/libraries/vendor/composer/autoload_files.php
 create mode 100644 core/libraries/vendor/composer/autoload_namespaces.php
 create mode 100644 core/libraries/vendor/composer/autoload_psr4.php
 create mode 100644 core/libraries/vendor/composer/autoload_real.php
 create mode 100644 core/libraries/vendor/composer/autoload_static.php
 create mode 100644 core/libraries/vendor/composer/installed.json
 create mode 100644 core/libraries/vendor/ircmaxell/password-compat/LICENSE.md
 create mode 100644 core/libraries/vendor/ircmaxell/password-compat/lib/password.php
 create mode 100644 core/libraries/vendor/joomla/application/LICENSE
 create mode 100644 core/libraries/vendor/joomla/application/src/AbstractApplication.php
 create mode 100644 core/libraries/vendor/joomla/application/src/AbstractCliApplication.php
 create mode 100644 core/libraries/vendor/joomla/application/src/AbstractDaemonApplication.php
 create mode 100644 core/libraries/vendor/joomla/application/src/AbstractWebApplication.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/CliInput.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/CliOutput.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/ColorProcessor.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/ColorStyle.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ColorProcessor.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/Output/Stdout.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Cli/Output/Xml.php
 create mode 100644 core/libraries/vendor/joomla/application/src/Web/WebClient.php
 create mode 100644 core/libraries/vendor/joomla/archive/LICENSE
 create mode 100644 core/libraries/vendor/joomla/archive/src/Archive.php
 create mode 100644 core/libraries/vendor/joomla/archive/src/Bzip2.php
 create mode 100644 core/libraries/vendor/joomla/archive/src/ExtractableInterface.php
 create mode 100644 core/libraries/vendor/joomla/archive/src/Gzip.php
 create mode 100644 core/libraries/vendor/joomla/archive/src/Tar.php
 create mode 100644 core/libraries/vendor/joomla/archive/src/Zip.php
 create mode 100644 core/libraries/vendor/joomla/compat/LICENSE
 create mode 100644 core/libraries/vendor/joomla/compat/src/CallbackFilterIterator.php
 create mode 100644 core/libraries/vendor/joomla/compat/src/JsonSerializable.php
 create mode 100644 core/libraries/vendor/joomla/data/LICENSE
 create mode 100644 core/libraries/vendor/joomla/data/src/DataObject.php
 create mode 100644 core/libraries/vendor/joomla/data/src/DataSet.php
 create mode 100644 core/libraries/vendor/joomla/data/src/DumpableInterface.php
 create mode 100644 core/libraries/vendor/joomla/di/LICENSE
 create mode 100644 core/libraries/vendor/joomla/di/src/Container.php
 create mode 100644 core/libraries/vendor/joomla/di/src/ContainerAwareInterface.php
 create mode 100644 core/libraries/vendor/joomla/di/src/ContainerAwareTrait.php
 create mode 100644 core/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php
 create mode 100644 core/libraries/vendor/joomla/di/src/Exception/KeyNotFoundException.php
 create mode 100644 core/libraries/vendor/joomla/di/src/Exception/ProtectedKeyException.php
 create mode 100644 core/libraries/vendor/joomla/di/src/ServiceProviderInterface.php
 create mode 100644 core/libraries/vendor/joomla/event/LICENSE
 create mode 100644 core/libraries/vendor/joomla/event/src/AbstractEvent.php
 create mode 100644 core/libraries/vendor/joomla/event/src/DelegatingDispatcher.php
 create mode 100644 core/libraries/vendor/joomla/event/src/Dispatcher.php
 create mode 100644 core/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php
 create mode 100644 core/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php
 create mode 100644 core/libraries/vendor/joomla/event/src/DispatcherInterface.php
 create mode 100644 core/libraries/vendor/joomla/event/src/Event.php
 create mode 100644 core/libraries/vendor/joomla/event/src/EventImmutable.php
 create mode 100644 core/libraries/vendor/joomla/event/src/EventInterface.php
 create mode 100644 core/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php
 create mode 100644 core/libraries/vendor/joomla/event/src/Priority.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/LICENSE
 create mode 100644 core/libraries/vendor/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Buffer.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Clients/FtpClient.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Exception/FilesystemException.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/File.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Folder.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Helper.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Patcher.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Path.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Stream.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Stream/String.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Stream/StringWrapper.php
 create mode 100644 core/libraries/vendor/joomla/filesystem/src/Support/StringController.php
 create mode 100644 core/libraries/vendor/joomla/filter/LICENSE
 create mode 100644 core/libraries/vendor/joomla/filter/src/InputFilter.php
 create mode 100644 core/libraries/vendor/joomla/filter/src/OutputFilter.php
 create mode 100644 core/libraries/vendor/joomla/image/LICENSE
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Backgroundfill.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Brightness.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Contrast.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Edgedetect.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Emboss.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Grayscale.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Negate.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Sketchy.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Filter/Smooth.php
 create mode 100644 core/libraries/vendor/joomla/image/src/Image.php
 create mode 100644 core/libraries/vendor/joomla/image/src/ImageFilter.php
 create mode 100644 core/libraries/vendor/joomla/input/LICENSE
 create mode 100644 core/libraries/vendor/joomla/input/src/Cli.php
 create mode 100644 core/libraries/vendor/joomla/input/src/Cookie.php
 create mode 100644 core/libraries/vendor/joomla/input/src/Files.php
 create mode 100644 core/libraries/vendor/joomla/input/src/Input.php
 create mode 100644 core/libraries/vendor/joomla/input/src/Json.php
 create mode 100644 core/libraries/vendor/joomla/ldap/LICENSE
 create mode 100644 core/libraries/vendor/joomla/ldap/src/LdapClient.php
 create mode 100644 core/libraries/vendor/joomla/registry/LICENSE
 create mode 100644 core/libraries/vendor/joomla/registry/src/AbstractRegistryFormat.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Factory.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Format/Ini.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Format/Json.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Format/Php.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Format/Xml.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Format/Yaml.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/FormatInterface.php
 create mode 100644 core/libraries/vendor/joomla/registry/src/Registry.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/LICENSE
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Session.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/Apc.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/Database.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcache.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcached.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/None.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/Wincache.php
 create mode 100644 core/libraries/vendor/joomla/session/Joomla/Session/Storage/Xcache.php
 create mode 100644 core/libraries/vendor/joomla/string/LICENSE
 create mode 100644 core/libraries/vendor/joomla/string/src/Inflector.php
 create mode 100644 core/libraries/vendor/joomla/string/src/Normalise.php
 create mode 100644 core/libraries/vendor/joomla/string/src/String.php
 create mode 100644 core/libraries/vendor/joomla/string/src/StringHelper.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/LICENSE
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/README
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/mbstring/core.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/native/core.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/ord.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/str_ireplace.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/str_pad.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/str_split.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/strcasecmp.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/strcspn.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/stristr.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/strrev.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/strspn.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/substr_replace.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/trim.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/ucfirst.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/ucwords.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utf8.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/ascii.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/bad.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/patterns.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/position.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/specials.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/unicode.php
 create mode 100644 core/libraries/vendor/joomla/string/src/phputf8/utils/validation.php
 create mode 100644 core/libraries/vendor/joomla/uri/LICENSE
 create mode 100644 core/libraries/vendor/joomla/uri/src/AbstractUri.php
 create mode 100644 core/libraries/vendor/joomla/uri/src/Uri.php
 create mode 100644 core/libraries/vendor/joomla/uri/src/UriHelper.php
 create mode 100644 core/libraries/vendor/joomla/uri/src/UriImmutable.php
 create mode 100644 core/libraries/vendor/joomla/uri/src/UriInterface.php
 create mode 100644 core/libraries/vendor/joomla/utilities/LICENSE
 create mode 100644 core/libraries/vendor/joomla/utilities/src/ArrayHelper.php
 create mode 100644 core/libraries/vendor/leafo/lessphp/LICENSE
 create mode 100644 core/libraries/vendor/leafo/lessphp/lessc.inc.php
 create mode 100644 core/libraries/vendor/leafo/lessphp/lessify
 create mode 100644 core/libraries/vendor/leafo/lessphp/lessify.inc.php
 create mode 100644 core/libraries/vendor/leafo/lessphp/plessc
 create mode 100644 core/libraries/vendor/paragonie/random_compat/LICENSE
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/byte_safe_strings.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/cast_to_int.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/error_polyfill.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_bytes_openssl.php
 create mode 100644 core/libraries/vendor/paragonie/random_compat/lib/random_int.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/LICENSE
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/autoload-fast.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/autoload.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/lib/constants.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/namespaced/File.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Compat.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/BLAKE2b.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/H.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/README.md
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/HChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/HSalsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Salsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/SipHash.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/Util.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/X25519.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Core32/XSalsa20.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Crypto.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/Crypto32.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/File.php
 create mode 100644 core/libraries/vendor/paragonie/sodium_compat/src/SodiumException.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/LICENSE
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/PHPMailerAutoload.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/VERSION
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauth.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/class.pop3.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/class.smtp.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/composer.lock
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/extras/EasyPeasyICS.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/extras/htmlfilter.php
 create mode 100644 core/libraries/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php
 create mode 100644 core/libraries/vendor/psr/container/LICENSE
 create mode 100644 core/libraries/vendor/psr/container/src/ContainerExceptionInterface.php
 create mode 100644 core/libraries/vendor/psr/container/src/ContainerInterface.php
 create mode 100644 core/libraries/vendor/psr/container/src/NotFoundExceptionInterface.php
 create mode 100644 core/libraries/vendor/psr/log/LICENSE
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/AbstractLogger.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/InvalidArgumentException.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/LogLevel.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php
 create mode 100644 core/libraries/vendor/psr/log/Psr/Log/NullLogger.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/LICENSE.txt
 create mode 100644 core/libraries/vendor/simplepie/simplepie/autoloader.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/db.sql
 create mode 100644 core/libraries/vendor/simplepie/simplepie/idn/LICENCE
 create mode 100644 core/libraries/vendor/simplepie/simplepie/idn/idna_convert.class.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/idn/npdata.ser
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Author.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Caption.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Category.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Copyright.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Core.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Credit.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Exception.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/File.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/IRI.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Item.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Locator.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Misc.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parser.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Rating.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Registry.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Restriction.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/Source.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
 create mode 100644 core/libraries/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-ctype/Ctype.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-ctype/LICENSE
 create mode 100644 core/libraries/vendor/symfony/polyfill-ctype/bootstrap.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-php55/LICENSE
 create mode 100644 core/libraries/vendor/symfony/polyfill-php55/Php55.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-php55/Php55ArrayColumn.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-php55/bootstrap.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-php56/LICENSE
 create mode 100644 core/libraries/vendor/symfony/polyfill-php56/Php56.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-php56/bootstrap.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-php73/LICENSE
 create mode 100644 core/libraries/vendor/symfony/polyfill-php73/bootstrap.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-util/Binary.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
 create mode 100644 core/libraries/vendor/symfony/polyfill-util/LICENSE
 create mode 100644 core/libraries/vendor/symfony/yaml/Dumper.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Escaper.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Exception/DumpException.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Exception/ExceptionInterface.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Exception/ParseException.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Exception/RuntimeException.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Inline.php
 create mode 100644 core/libraries/vendor/symfony/yaml/LICENSE
 create mode 100644 core/libraries/vendor/symfony/yaml/Parser.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Unescaper.php
 create mode 100644 core/libraries/vendor/symfony/yaml/Yaml.php
 create mode 100644 core/libraries/vendor/web.config
 create mode 100644 core/media/cms/css/debug.css
 create mode 100644 core/media/com_associations/css/sidebyside.css
 create mode 100644 core/media/com_associations/js/sidebyside-uncompressed.js
 create mode 100644 core/media/com_associations/js/sidebyside.js
 create mode 100644 core/media/com_contact/js/admin-contacts-modal.js
 create mode 100644 core/media/com_contact/js/admin-contacts-modal.min.js
 create mode 100644 core/media/com_content/js/admin-article-pagebreak.js
 create mode 100644 core/media/com_content/js/admin-article-pagebreak.min.js
 create mode 100644 core/media/com_content/js/admin-article-readmore.js
 create mode 100644 core/media/com_content/js/admin-article-readmore.min.js
 create mode 100644 core/media/com_content/js/admin-articles-modal.js
 create mode 100644 core/media/com_content/js/admin-articles-modal.min.js
 create mode 100644 core/media/com_contenthistory/css/jquery.pretty-text-diff.css
 create mode 100644 core/media/com_contenthistory/js/diff_match_patch.js
 create mode 100644 core/media/com_contenthistory/js/jquery.pretty-text-diff.js
 create mode 100644 core/media/com_contenthistory/js/jquery.pretty-text-diff.min.js
 create mode 100644 core/media/com_fields/js/admin-fields-modal.js
 create mode 100644 core/media/com_fields/js/admin-fields-modal.min.js
 create mode 100644 core/media/com_finder/css/dates.css
 create mode 100644 core/media/com_finder/css/finder.css
 create mode 100644 core/media/com_finder/css/indexer.css
 create mode 100644 core/media/com_finder/js/autocompleter.js
 create mode 100644 core/media/com_finder/js/indexer.js
 create mode 100644 core/media/com_joomlaupdate/js/default.js
 create mode 100644 core/media/com_joomlaupdate/js/default.min.js
 create mode 100644 core/media/com_joomlaupdate/js/encryption.js
 create mode 100644 core/media/com_joomlaupdate/js/encryption.min.js
 create mode 100644 core/media/com_joomlaupdate/js/json2.js
 create mode 100644 core/media/com_joomlaupdate/js/json2.min.js
 create mode 100644 core/media/com_joomlaupdate/js/update.js
 create mode 100644 core/media/com_joomlaupdate/js/update.min.js
 create mode 100644 core/media/com_menus/js/admin-items-modal.js
 create mode 100644 core/media/com_menus/js/admin-items-modal.min.js
 create mode 100644 core/media/com_modules/js/admin-modules-modal.js
 create mode 100644 core/media/com_modules/js/admin-modules-modal.min.js
 create mode 100644 core/media/com_wrapper/js/iframe-height.js
 create mode 100644 core/media/com_wrapper/js/iframe-height.min.js
 create mode 100644 core/media/contacts/images/con_address.png
 create mode 100644 core/media/contacts/images/con_fax.png
 create mode 100644 core/media/contacts/images/con_info.png
 create mode 100644 core/media/contacts/images/con_mobile.png
 create mode 100644 core/media/contacts/images/con_tel.png
 create mode 100644 core/media/contacts/images/emailButton.png
 create mode 100644 core/media/editors/codemirror/LICENSE
 create mode 100644 core/media/editors/codemirror/addon/comment/comment.js
 create mode 100644 core/media/editors/codemirror/addon/comment/comment.min.js
 create mode 100644 core/media/editors/codemirror/addon/comment/continuecomment.js
 create mode 100644 core/media/editors/codemirror/addon/comment/continuecomment.min.js
 create mode 100644 core/media/editors/codemirror/addon/dialog/dialog.css
 create mode 100644 core/media/editors/codemirror/addon/dialog/dialog.js
 create mode 100644 core/media/editors/codemirror/addon/dialog/dialog.min.css
 create mode 100644 core/media/editors/codemirror/addon/dialog/dialog.min.js
 create mode 100644 core/media/editors/codemirror/addon/display/autorefresh.js
 create mode 100644 core/media/editors/codemirror/addon/display/autorefresh.min.js
 create mode 100644 core/media/editors/codemirror/addon/display/fullscreen.css
 create mode 100644 core/media/editors/codemirror/addon/display/fullscreen.js
 create mode 100644 core/media/editors/codemirror/addon/display/fullscreen.min.css
 create mode 100644 core/media/editors/codemirror/addon/display/fullscreen.min.js
 create mode 100644 core/media/editors/codemirror/addon/display/panel.js
 create mode 100644 core/media/editors/codemirror/addon/display/panel.min.js
 create mode 100644 core/media/editors/codemirror/addon/display/placeholder.js
 create mode 100644 core/media/editors/codemirror/addon/display/placeholder.min.js
 create mode 100644 core/media/editors/codemirror/addon/display/rulers.js
 create mode 100644 core/media/editors/codemirror/addon/display/rulers.min.js
 create mode 100644 core/media/editors/codemirror/addon/edit/closebrackets.js
 create mode 100644 core/media/editors/codemirror/addon/edit/closebrackets.min.js
 create mode 100644 core/media/editors/codemirror/addon/edit/closetag.js
 create mode 100644 core/media/editors/codemirror/addon/edit/closetag.min.js
 create mode 100644 core/media/editors/codemirror/addon/edit/continuelist.js
 create mode 100644 core/media/editors/codemirror/addon/edit/continuelist.min.js
 create mode 100644 core/media/editors/codemirror/addon/edit/matchbrackets.js
 create mode 100644 core/media/editors/codemirror/addon/edit/matchbrackets.min.js
 create mode 100644 core/media/editors/codemirror/addon/edit/matchtags.js
 create mode 100644 core/media/editors/codemirror/addon/edit/matchtags.min.js
 create mode 100644 core/media/editors/codemirror/addon/edit/trailingspace.js
 create mode 100644 core/media/editors/codemirror/addon/edit/trailingspace.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/brace-fold.js
 create mode 100644 core/media/editors/codemirror/addon/fold/brace-fold.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/comment-fold.js
 create mode 100644 core/media/editors/codemirror/addon/fold/comment-fold.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/foldcode.js
 create mode 100644 core/media/editors/codemirror/addon/fold/foldcode.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/foldgutter.css
 create mode 100644 core/media/editors/codemirror/addon/fold/foldgutter.js
 create mode 100644 core/media/editors/codemirror/addon/fold/foldgutter.min.css
 create mode 100644 core/media/editors/codemirror/addon/fold/foldgutter.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/indent-fold.js
 create mode 100644 core/media/editors/codemirror/addon/fold/indent-fold.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/markdown-fold.js
 create mode 100644 core/media/editors/codemirror/addon/fold/markdown-fold.min.js
 create mode 100644 core/media/editors/codemirror/addon/fold/xml-fold.js
 create mode 100644 core/media/editors/codemirror/addon/fold/xml-fold.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/anyword-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/anyword-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/css-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/css-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/html-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/html-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/javascript-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/javascript-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/show-hint.css
 create mode 100644 core/media/editors/codemirror/addon/hint/show-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/show-hint.min.css
 create mode 100644 core/media/editors/codemirror/addon/hint/show-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/sql-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/sql-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/hint/xml-hint.js
 create mode 100644 core/media/editors/codemirror/addon/hint/xml-hint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/coffeescript-lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/coffeescript-lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/css-lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/css-lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/html-lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/html-lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/javascript-lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/javascript-lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/json-lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/json-lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/lint.css
 create mode 100644 core/media/editors/codemirror/addon/lint/lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/lint.min.css
 create mode 100644 core/media/editors/codemirror/addon/lint/lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/lint/yaml-lint.js
 create mode 100644 core/media/editors/codemirror/addon/lint/yaml-lint.min.js
 create mode 100644 core/media/editors/codemirror/addon/merge/merge.css
 create mode 100644 core/media/editors/codemirror/addon/merge/merge.js
 create mode 100644 core/media/editors/codemirror/addon/merge/merge.min.css
 create mode 100644 core/media/editors/codemirror/addon/merge/merge.min.js
 create mode 100644 core/media/editors/codemirror/addon/mode/loadmode.js
 create mode 100644 core/media/editors/codemirror/addon/mode/loadmode.min.js
 create mode 100644 core/media/editors/codemirror/addon/mode/multiplex.js
 create mode 100644 core/media/editors/codemirror/addon/mode/multiplex.min.js
 create mode 100644 core/media/editors/codemirror/addon/mode/multiplex_test.js
 create mode 100644 core/media/editors/codemirror/addon/mode/multiplex_test.min.js
 create mode 100644 core/media/editors/codemirror/addon/mode/overlay.js
 create mode 100644 core/media/editors/codemirror/addon/mode/overlay.min.js
 create mode 100644 core/media/editors/codemirror/addon/mode/simple.js
 create mode 100644 core/media/editors/codemirror/addon/mode/simple.min.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/colorize.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/colorize.min.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/runmode-standalone.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/runmode-standalone.min.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/runmode.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/runmode.min.js
 create mode 100644 core/media/editors/codemirror/addon/runmode/runmode.node.js
 create mode 100644 core/media/editors/codemirror/addon/scroll/annotatescrollbar.js
 create mode 100644 core/media/editors/codemirror/addon/scroll/annotatescrollbar.min.js
 create mode 100644 core/media/editors/codemirror/addon/scroll/scrollpastend.js
 create mode 100644 core/media/editors/codemirror/addon/scroll/scrollpastend.min.js
 create mode 100644 core/media/editors/codemirror/addon/scroll/simplescrollbars.css
 create mode 100644 core/media/editors/codemirror/addon/scroll/simplescrollbars.js
 create mode 100644 core/media/editors/codemirror/addon/scroll/simplescrollbars.min.css
 create mode 100644 core/media/editors/codemirror/addon/scroll/simplescrollbars.min.js
 create mode 100644 core/media/editors/codemirror/addon/search/jump-to-line.js
 create mode 100644 core/media/editors/codemirror/addon/search/jump-to-line.min.js
 create mode 100644 core/media/editors/codemirror/addon/search/match-highlighter.js
 create mode 100644 core/media/editors/codemirror/addon/search/match-highlighter.min.js
 create mode 100644 core/media/editors/codemirror/addon/search/matchesonscrollbar.css
 create mode 100644 core/media/editors/codemirror/addon/search/matchesonscrollbar.js
 create mode 100644 core/media/editors/codemirror/addon/search/matchesonscrollbar.min.css
 create mode 100644 core/media/editors/codemirror/addon/search/matchesonscrollbar.min.js
 create mode 100644 core/media/editors/codemirror/addon/search/search.js
 create mode 100644 core/media/editors/codemirror/addon/search/search.min.js
 create mode 100644 core/media/editors/codemirror/addon/search/searchcursor.js
 create mode 100644 core/media/editors/codemirror/addon/search/searchcursor.min.js
 create mode 100644 core/media/editors/codemirror/addon/selection/active-line.js
 create mode 100644 core/media/editors/codemirror/addon/selection/active-line.min.js
 create mode 100644 core/media/editors/codemirror/addon/selection/mark-selection.js
 create mode 100644 core/media/editors/codemirror/addon/selection/mark-selection.min.js
 create mode 100644 core/media/editors/codemirror/addon/selection/selection-pointer.js
 create mode 100644 core/media/editors/codemirror/addon/selection/selection-pointer.min.js
 create mode 100644 core/media/editors/codemirror/addon/tern/tern.css
 create mode 100644 core/media/editors/codemirror/addon/tern/tern.js
 create mode 100644 core/media/editors/codemirror/addon/tern/tern.min.css
 create mode 100644 core/media/editors/codemirror/addon/tern/tern.min.js
 create mode 100644 core/media/editors/codemirror/addon/tern/worker.js
 create mode 100644 core/media/editors/codemirror/addon/tern/worker.min.js
 create mode 100644 core/media/editors/codemirror/addon/wrap/hardwrap.js
 create mode 100644 core/media/editors/codemirror/addon/wrap/hardwrap.min.js
 create mode 100644 core/media/editors/codemirror/keymap/emacs.js
 create mode 100644 core/media/editors/codemirror/keymap/emacs.min.js
 create mode 100644 core/media/editors/codemirror/keymap/sublime.js
 create mode 100644 core/media/editors/codemirror/keymap/sublime.min.js
 create mode 100644 core/media/editors/codemirror/keymap/vim.js
 create mode 100644 core/media/editors/codemirror/keymap/vim.min.js
 create mode 100644 core/media/editors/codemirror/lib/addons.css
 create mode 100644 core/media/editors/codemirror/lib/addons.js
 create mode 100644 core/media/editors/codemirror/lib/addons.min.css
 create mode 100644 core/media/editors/codemirror/lib/addons.min.js
 create mode 100644 core/media/editors/codemirror/lib/codemirror.css
 create mode 100644 core/media/editors/codemirror/lib/codemirror.js
 create mode 100644 core/media/editors/codemirror/lib/codemirror.min.css
 create mode 100644 core/media/editors/codemirror/lib/codemirror.min.js
 create mode 100644 core/media/editors/codemirror/mode/apl/apl.js
 create mode 100644 core/media/editors/codemirror/mode/apl/apl.min.js
 create mode 100644 core/media/editors/codemirror/mode/asciiarmor/asciiarmor.js
 create mode 100644 core/media/editors/codemirror/mode/asciiarmor/asciiarmor.min.js
 create mode 100644 core/media/editors/codemirror/mode/asn.1/asn.1.js
 create mode 100644 core/media/editors/codemirror/mode/asn.1/asn.min.js
 create mode 100644 core/media/editors/codemirror/mode/asterisk/asterisk.js
 create mode 100644 core/media/editors/codemirror/mode/asterisk/asterisk.min.js
 create mode 100644 core/media/editors/codemirror/mode/brainfuck/brainfuck.js
 create mode 100644 core/media/editors/codemirror/mode/brainfuck/brainfuck.min.js
 create mode 100644 core/media/editors/codemirror/mode/clike/clike.js
 create mode 100644 core/media/editors/codemirror/mode/clike/clike.min.js
 create mode 100644 core/media/editors/codemirror/mode/clojure/clojure.js
 create mode 100644 core/media/editors/codemirror/mode/clojure/clojure.min.js
 create mode 100644 core/media/editors/codemirror/mode/cmake/cmake.js
 create mode 100644 core/media/editors/codemirror/mode/cmake/cmake.min.js
 create mode 100644 core/media/editors/codemirror/mode/cobol/cobol.js
 create mode 100644 core/media/editors/codemirror/mode/cobol/cobol.min.js
 create mode 100644 core/media/editors/codemirror/mode/coffeescript/coffeescript.js
 create mode 100644 core/media/editors/codemirror/mode/coffeescript/coffeescript.min.js
 create mode 100644 core/media/editors/codemirror/mode/commonlisp/commonlisp.js
 create mode 100644 core/media/editors/codemirror/mode/commonlisp/commonlisp.min.js
 create mode 100644 core/media/editors/codemirror/mode/crystal/crystal.js
 create mode 100644 core/media/editors/codemirror/mode/crystal/crystal.min.js
 create mode 100644 core/media/editors/codemirror/mode/css/css.js
 create mode 100644 core/media/editors/codemirror/mode/css/css.min.js
 create mode 100644 core/media/editors/codemirror/mode/cypher/cypher.js
 create mode 100644 core/media/editors/codemirror/mode/cypher/cypher.min.js
 create mode 100644 core/media/editors/codemirror/mode/d/d.js
 create mode 100644 core/media/editors/codemirror/mode/d/d.min.js
 create mode 100644 core/media/editors/codemirror/mode/dart/dart.js
 create mode 100644 core/media/editors/codemirror/mode/dart/dart.min.js
 create mode 100644 core/media/editors/codemirror/mode/diff/diff.js
 create mode 100644 core/media/editors/codemirror/mode/diff/diff.min.js
 create mode 100644 core/media/editors/codemirror/mode/django/django.js
 create mode 100644 core/media/editors/codemirror/mode/django/django.min.js
 create mode 100644 core/media/editors/codemirror/mode/dockerfile/dockerfile.js
 create mode 100644 core/media/editors/codemirror/mode/dockerfile/dockerfile.min.js
 create mode 100644 core/media/editors/codemirror/mode/dtd/dtd.js
 create mode 100644 core/media/editors/codemirror/mode/dtd/dtd.min.js
 create mode 100644 core/media/editors/codemirror/mode/dylan/dylan.js
 create mode 100644 core/media/editors/codemirror/mode/dylan/dylan.min.js
 create mode 100644 core/media/editors/codemirror/mode/ebnf/ebnf.js
 create mode 100644 core/media/editors/codemirror/mode/ebnf/ebnf.min.js
 create mode 100644 core/media/editors/codemirror/mode/ecl/ecl.js
 create mode 100644 core/media/editors/codemirror/mode/ecl/ecl.min.js
 create mode 100644 core/media/editors/codemirror/mode/eiffel/eiffel.js
 create mode 100644 core/media/editors/codemirror/mode/eiffel/eiffel.min.js
 create mode 100644 core/media/editors/codemirror/mode/elm/elm.js
 create mode 100644 core/media/editors/codemirror/mode/elm/elm.min.js
 create mode 100644 core/media/editors/codemirror/mode/erlang/erlang.js
 create mode 100644 core/media/editors/codemirror/mode/erlang/erlang.min.js
 create mode 100644 core/media/editors/codemirror/mode/factor/factor.js
 create mode 100644 core/media/editors/codemirror/mode/factor/factor.min.js
 create mode 100644 core/media/editors/codemirror/mode/fcl/fcl.js
 create mode 100644 core/media/editors/codemirror/mode/fcl/fcl.min.js
 create mode 100644 core/media/editors/codemirror/mode/forth/forth.js
 create mode 100644 core/media/editors/codemirror/mode/forth/forth.min.js
 create mode 100644 core/media/editors/codemirror/mode/fortran/fortran.js
 create mode 100644 core/media/editors/codemirror/mode/fortran/fortran.min.js
 create mode 100644 core/media/editors/codemirror/mode/gas/gas.js
 create mode 100644 core/media/editors/codemirror/mode/gas/gas.min.js
 create mode 100644 core/media/editors/codemirror/mode/gfm/gfm.js
 create mode 100644 core/media/editors/codemirror/mode/gfm/gfm.min.js
 create mode 100644 core/media/editors/codemirror/mode/gherkin/gherkin.js
 create mode 100644 core/media/editors/codemirror/mode/gherkin/gherkin.min.js
 create mode 100644 core/media/editors/codemirror/mode/go/go.js
 create mode 100644 core/media/editors/codemirror/mode/go/go.min.js
 create mode 100644 core/media/editors/codemirror/mode/groovy/groovy.js
 create mode 100644 core/media/editors/codemirror/mode/groovy/groovy.min.js
 create mode 100644 core/media/editors/codemirror/mode/haml/haml.js
 create mode 100644 core/media/editors/codemirror/mode/haml/haml.min.js
 create mode 100644 core/media/editors/codemirror/mode/handlebars/handlebars.js
 create mode 100644 core/media/editors/codemirror/mode/handlebars/handlebars.min.js
 create mode 100644 core/media/editors/codemirror/mode/haskell-literate/haskell-literate.js
 create mode 100644 core/media/editors/codemirror/mode/haskell-literate/haskell-literate.min.js
 create mode 100644 core/media/editors/codemirror/mode/haskell/haskell.js
 create mode 100644 core/media/editors/codemirror/mode/haskell/haskell.min.js
 create mode 100644 core/media/editors/codemirror/mode/haxe/haxe.js
 create mode 100644 core/media/editors/codemirror/mode/haxe/haxe.min.js
 create mode 100644 core/media/editors/codemirror/mode/htmlembedded/htmlembedded.js
 create mode 100644 core/media/editors/codemirror/mode/htmlembedded/htmlembedded.min.js
 create mode 100644 core/media/editors/codemirror/mode/htmlmixed/htmlmixed.js
 create mode 100644 core/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js
 create mode 100644 core/media/editors/codemirror/mode/http/http.js
 create mode 100644 core/media/editors/codemirror/mode/http/http.min.js
 create mode 100644 core/media/editors/codemirror/mode/idl/idl.js
 create mode 100644 core/media/editors/codemirror/mode/idl/idl.min.js
 create mode 100644 core/media/editors/codemirror/mode/javascript/javascript.js
 create mode 100644 core/media/editors/codemirror/mode/javascript/javascript.min.js
 create mode 100644 core/media/editors/codemirror/mode/jinja2/jinja2.js
 create mode 100644 core/media/editors/codemirror/mode/jinja2/jinja2.min.js
 create mode 100644 core/media/editors/codemirror/mode/jsx/jsx.js
 create mode 100644 core/media/editors/codemirror/mode/jsx/jsx.min.js
 create mode 100644 core/media/editors/codemirror/mode/julia/julia.js
 create mode 100644 core/media/editors/codemirror/mode/julia/julia.min.js
 create mode 100644 core/media/editors/codemirror/mode/livescript/livescript.js
 create mode 100644 core/media/editors/codemirror/mode/livescript/livescript.min.js
 create mode 100644 core/media/editors/codemirror/mode/lua/lua.js
 create mode 100644 core/media/editors/codemirror/mode/lua/lua.min.js
 create mode 100644 core/media/editors/codemirror/mode/markdown/markdown.js
 create mode 100644 core/media/editors/codemirror/mode/markdown/markdown.min.js
 create mode 100644 core/media/editors/codemirror/mode/mathematica/mathematica.js
 create mode 100644 core/media/editors/codemirror/mode/mathematica/mathematica.min.js
 create mode 100644 core/media/editors/codemirror/mode/mbox/mbox.js
 create mode 100644 core/media/editors/codemirror/mode/mbox/mbox.min.js
 create mode 100644 core/media/editors/codemirror/mode/meta.js
 create mode 100644 core/media/editors/codemirror/mode/meta.min.js
 create mode 100644 core/media/editors/codemirror/mode/mirc/mirc.js
 create mode 100644 core/media/editors/codemirror/mode/mirc/mirc.min.js
 create mode 100644 core/media/editors/codemirror/mode/mllike/mllike.js
 create mode 100644 core/media/editors/codemirror/mode/mllike/mllike.min.js
 create mode 100644 core/media/editors/codemirror/mode/modelica/modelica.js
 create mode 100644 core/media/editors/codemirror/mode/modelica/modelica.min.js
 create mode 100644 core/media/editors/codemirror/mode/mscgen/mscgen.js
 create mode 100644 core/media/editors/codemirror/mode/mscgen/mscgen.min.js
 create mode 100644 core/media/editors/codemirror/mode/mumps/mumps.js
 create mode 100644 core/media/editors/codemirror/mode/mumps/mumps.min.js
 create mode 100644 core/media/editors/codemirror/mode/nginx/nginx.js
 create mode 100644 core/media/editors/codemirror/mode/nginx/nginx.min.js
 create mode 100644 core/media/editors/codemirror/mode/nsis/nsis.js
 create mode 100644 core/media/editors/codemirror/mode/nsis/nsis.min.js
 create mode 100644 core/media/editors/codemirror/mode/ntriples/ntriples.js
 create mode 100644 core/media/editors/codemirror/mode/ntriples/ntriples.min.js
 create mode 100644 core/media/editors/codemirror/mode/octave/octave.js
 create mode 100644 core/media/editors/codemirror/mode/octave/octave.min.js
 create mode 100644 core/media/editors/codemirror/mode/oz/oz.js
 create mode 100644 core/media/editors/codemirror/mode/oz/oz.min.js
 create mode 100644 core/media/editors/codemirror/mode/pascal/pascal.js
 create mode 100644 core/media/editors/codemirror/mode/pascal/pascal.min.js
 create mode 100644 core/media/editors/codemirror/mode/pegjs/pegjs.js
 create mode 100644 core/media/editors/codemirror/mode/pegjs/pegjs.min.js
 create mode 100644 core/media/editors/codemirror/mode/perl/perl.js
 create mode 100644 core/media/editors/codemirror/mode/perl/perl.min.js
 create mode 100644 core/media/editors/codemirror/mode/php/php.js
 create mode 100644 core/media/editors/codemirror/mode/php/php.min.js
 create mode 100644 core/media/editors/codemirror/mode/pig/pig.js
 create mode 100644 core/media/editors/codemirror/mode/pig/pig.min.js
 create mode 100644 core/media/editors/codemirror/mode/powershell/powershell.js
 create mode 100644 core/media/editors/codemirror/mode/powershell/powershell.min.js
 create mode 100644 core/media/editors/codemirror/mode/properties/properties.js
 create mode 100644 core/media/editors/codemirror/mode/properties/properties.min.js
 create mode 100644 core/media/editors/codemirror/mode/protobuf/protobuf.js
 create mode 100644 core/media/editors/codemirror/mode/protobuf/protobuf.min.js
 create mode 100644 core/media/editors/codemirror/mode/pug/pug.js
 create mode 100644 core/media/editors/codemirror/mode/pug/pug.min.js
 create mode 100644 core/media/editors/codemirror/mode/puppet/puppet.js
 create mode 100644 core/media/editors/codemirror/mode/puppet/puppet.min.js
 create mode 100644 core/media/editors/codemirror/mode/python/python.js
 create mode 100644 core/media/editors/codemirror/mode/python/python.min.js
 create mode 100644 core/media/editors/codemirror/mode/q/q.js
 create mode 100644 core/media/editors/codemirror/mode/q/q.min.js
 create mode 100644 core/media/editors/codemirror/mode/r/r.js
 create mode 100644 core/media/editors/codemirror/mode/r/r.min.js
 create mode 100644 core/media/editors/codemirror/mode/rpm/changes/index.html
 create mode 100644 core/media/editors/codemirror/mode/rpm/rpm.js
 create mode 100644 core/media/editors/codemirror/mode/rpm/rpm.min.js
 create mode 100644 core/media/editors/codemirror/mode/rst/rst.js
 create mode 100644 core/media/editors/codemirror/mode/rst/rst.min.js
 create mode 100644 core/media/editors/codemirror/mode/ruby/ruby.js
 create mode 100644 core/media/editors/codemirror/mode/ruby/ruby.min.js
 create mode 100644 core/media/editors/codemirror/mode/rust/rust.js
 create mode 100644 core/media/editors/codemirror/mode/rust/rust.min.js
 create mode 100644 core/media/editors/codemirror/mode/sas/sas.js
 create mode 100644 core/media/editors/codemirror/mode/sas/sas.min.js
 create mode 100644 core/media/editors/codemirror/mode/sass/sass.js
 create mode 100644 core/media/editors/codemirror/mode/sass/sass.min.js
 create mode 100644 core/media/editors/codemirror/mode/scheme/scheme.js
 create mode 100644 core/media/editors/codemirror/mode/scheme/scheme.min.js
 create mode 100644 core/media/editors/codemirror/mode/shell/shell.js
 create mode 100644 core/media/editors/codemirror/mode/shell/shell.min.js
 create mode 100644 core/media/editors/codemirror/mode/sieve/sieve.js
 create mode 100644 core/media/editors/codemirror/mode/sieve/sieve.min.js
 create mode 100644 core/media/editors/codemirror/mode/slim/slim.js
 create mode 100644 core/media/editors/codemirror/mode/slim/slim.min.js
 create mode 100644 core/media/editors/codemirror/mode/smalltalk/smalltalk.js
 create mode 100644 core/media/editors/codemirror/mode/smalltalk/smalltalk.min.js
 create mode 100644 core/media/editors/codemirror/mode/smarty/smarty.js
 create mode 100644 core/media/editors/codemirror/mode/smarty/smarty.min.js
 create mode 100644 core/media/editors/codemirror/mode/solr/solr.js
 create mode 100644 core/media/editors/codemirror/mode/solr/solr.min.js
 create mode 100644 core/media/editors/codemirror/mode/soy/soy.js
 create mode 100644 core/media/editors/codemirror/mode/soy/soy.min.js
 create mode 100644 core/media/editors/codemirror/mode/sparql/sparql.js
 create mode 100644 core/media/editors/codemirror/mode/sparql/sparql.min.js
 create mode 100644 core/media/editors/codemirror/mode/spreadsheet/spreadsheet.js
 create mode 100644 core/media/editors/codemirror/mode/spreadsheet/spreadsheet.min.js
 create mode 100644 core/media/editors/codemirror/mode/sql/sql.js
 create mode 100644 core/media/editors/codemirror/mode/sql/sql.min.js
 create mode 100644 core/media/editors/codemirror/mode/stex/stex.js
 create mode 100644 core/media/editors/codemirror/mode/stex/stex.min.js
 create mode 100644 core/media/editors/codemirror/mode/stylus/stylus.js
 create mode 100644 core/media/editors/codemirror/mode/stylus/stylus.min.js
 create mode 100644 core/media/editors/codemirror/mode/swift/swift.js
 create mode 100644 core/media/editors/codemirror/mode/swift/swift.min.js
 create mode 100644 core/media/editors/codemirror/mode/tcl/tcl.js
 create mode 100644 core/media/editors/codemirror/mode/tcl/tcl.min.js
 create mode 100644 core/media/editors/codemirror/mode/textile/textile.js
 create mode 100644 core/media/editors/codemirror/mode/textile/textile.min.js
 create mode 100644 core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.css
 create mode 100644 core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.js
 create mode 100644 core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.css
 create mode 100644 core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.js
 create mode 100644 core/media/editors/codemirror/mode/tiki/tiki.css
 create mode 100644 core/media/editors/codemirror/mode/tiki/tiki.js
 create mode 100644 core/media/editors/codemirror/mode/tiki/tiki.min.css
 create mode 100644 core/media/editors/codemirror/mode/tiki/tiki.min.js
 create mode 100644 core/media/editors/codemirror/mode/toml/toml.js
 create mode 100644 core/media/editors/codemirror/mode/toml/toml.min.js
 create mode 100644 core/media/editors/codemirror/mode/tornado/tornado.js
 create mode 100644 core/media/editors/codemirror/mode/tornado/tornado.min.js
 create mode 100644 core/media/editors/codemirror/mode/troff/troff.js
 create mode 100644 core/media/editors/codemirror/mode/troff/troff.min.js
 create mode 100644 core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.js
 create mode 100644 core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.min.js
 create mode 100644 core/media/editors/codemirror/mode/ttcn/ttcn.js
 create mode 100644 core/media/editors/codemirror/mode/ttcn/ttcn.min.js
 create mode 100644 core/media/editors/codemirror/mode/turtle/turtle.js
 create mode 100644 core/media/editors/codemirror/mode/turtle/turtle.min.js
 create mode 100644 core/media/editors/codemirror/mode/twig/twig.js
 create mode 100644 core/media/editors/codemirror/mode/twig/twig.min.js
 create mode 100644 core/media/editors/codemirror/mode/vb/vb.js
 create mode 100644 core/media/editors/codemirror/mode/vb/vb.min.js
 create mode 100644 core/media/editors/codemirror/mode/vbscript/vbscript.js
 create mode 100644 core/media/editors/codemirror/mode/vbscript/vbscript.min.js
 create mode 100644 core/media/editors/codemirror/mode/velocity/velocity.js
 create mode 100644 core/media/editors/codemirror/mode/velocity/velocity.min.js
 create mode 100644 core/media/editors/codemirror/mode/verilog/verilog.js
 create mode 100644 core/media/editors/codemirror/mode/verilog/verilog.min.js
 create mode 100644 core/media/editors/codemirror/mode/vhdl/vhdl.js
 create mode 100644 core/media/editors/codemirror/mode/vhdl/vhdl.min.js
 create mode 100644 core/media/editors/codemirror/mode/vue/vue.js
 create mode 100644 core/media/editors/codemirror/mode/vue/vue.min.js
 create mode 100644 core/media/editors/codemirror/mode/webidl/webidl.js
 create mode 100644 core/media/editors/codemirror/mode/webidl/webidl.min.js
 create mode 100644 core/media/editors/codemirror/mode/xml/xml.js
 create mode 100644 core/media/editors/codemirror/mode/xml/xml.min.js
 create mode 100644 core/media/editors/codemirror/mode/xquery/xquery.js
 create mode 100644 core/media/editors/codemirror/mode/xquery/xquery.min.js
 create mode 100644 core/media/editors/codemirror/mode/yacas/yacas.js
 create mode 100644 core/media/editors/codemirror/mode/yacas/yacas.min.js
 create mode 100644 core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
 create mode 100644 core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.min.js
 create mode 100644 core/media/editors/codemirror/mode/yaml/yaml.js
 create mode 100644 core/media/editors/codemirror/mode/yaml/yaml.min.js
 create mode 100644 core/media/editors/codemirror/mode/z80/z80.js
 create mode 100644 core/media/editors/codemirror/mode/z80/z80.min.js
 create mode 100644 core/media/editors/codemirror/theme/3024-day.css
 create mode 100644 core/media/editors/codemirror/theme/3024-night.css
 create mode 100644 core/media/editors/codemirror/theme/abcdef.css
 create mode 100644 core/media/editors/codemirror/theme/ambiance-mobile.css
 create mode 100644 core/media/editors/codemirror/theme/ambiance.css
 create mode 100644 core/media/editors/codemirror/theme/base16-dark.css
 create mode 100644 core/media/editors/codemirror/theme/base16-light.css
 create mode 100644 core/media/editors/codemirror/theme/bespin.css
 create mode 100644 core/media/editors/codemirror/theme/blackboard.css
 create mode 100644 core/media/editors/codemirror/theme/cobalt.css
 create mode 100644 core/media/editors/codemirror/theme/colorforth.css
 create mode 100644 core/media/editors/codemirror/theme/darcula.css
 create mode 100644 core/media/editors/codemirror/theme/dracula.css
 create mode 100644 core/media/editors/codemirror/theme/duotone-dark.css
 create mode 100644 core/media/editors/codemirror/theme/duotone-light.css
 create mode 100644 core/media/editors/codemirror/theme/eclipse.css
 create mode 100644 core/media/editors/codemirror/theme/elegant.css
 create mode 100644 core/media/editors/codemirror/theme/erlang-dark.css
 create mode 100644 core/media/editors/codemirror/theme/gruvbox-dark.css
 create mode 100644 core/media/editors/codemirror/theme/hopscotch.css
 create mode 100644 core/media/editors/codemirror/theme/icecoder.css
 create mode 100644 core/media/editors/codemirror/theme/idea.css
 create mode 100644 core/media/editors/codemirror/theme/isotope.css
 create mode 100644 core/media/editors/codemirror/theme/lesser-dark.css
 create mode 100644 core/media/editors/codemirror/theme/liquibyte.css
 create mode 100644 core/media/editors/codemirror/theme/lucario.css
 create mode 100644 core/media/editors/codemirror/theme/material.css
 create mode 100644 core/media/editors/codemirror/theme/mbo.css
 create mode 100644 core/media/editors/codemirror/theme/mdn-like.css
 create mode 100644 core/media/editors/codemirror/theme/midnight.css
 create mode 100644 core/media/editors/codemirror/theme/monokai.css
 create mode 100644 core/media/editors/codemirror/theme/neat.css
 create mode 100644 core/media/editors/codemirror/theme/neo.css
 create mode 100644 core/media/editors/codemirror/theme/night.css
 create mode 100644 core/media/editors/codemirror/theme/oceanic-next.css
 create mode 100644 core/media/editors/codemirror/theme/panda-syntax.css
 create mode 100644 core/media/editors/codemirror/theme/paraiso-dark.css
 create mode 100644 core/media/editors/codemirror/theme/paraiso-light.css
 create mode 100644 core/media/editors/codemirror/theme/pastel-on-dark.css
 create mode 100644 core/media/editors/codemirror/theme/railscasts.css
 create mode 100644 core/media/editors/codemirror/theme/rubyblue.css
 create mode 100644 core/media/editors/codemirror/theme/seti.css
 create mode 100644 core/media/editors/codemirror/theme/shadowfox.css
 create mode 100644 core/media/editors/codemirror/theme/solarized.css
 create mode 100644 core/media/editors/codemirror/theme/ssms.css
 create mode 100644 core/media/editors/codemirror/theme/the-matrix.css
 create mode 100644 core/media/editors/codemirror/theme/tomorrow-night-bright.css
 create mode 100644 core/media/editors/codemirror/theme/tomorrow-night-eighties.css
 create mode 100644 core/media/editors/codemirror/theme/ttcn.css
 create mode 100644 core/media/editors/codemirror/theme/twilight.css
 create mode 100644 core/media/editors/codemirror/theme/vibrant-ink.css
 create mode 100644 core/media/editors/codemirror/theme/xq-dark.css
 create mode 100644 core/media/editors/codemirror/theme/xq-light.css
 create mode 100644 core/media/editors/codemirror/theme/yeti.css
 create mode 100644 core/media/editors/codemirror/theme/zenburn.css
 create mode 100644 core/media/editors/none/js/none.js
 create mode 100644 core/media/editors/none/js/none.min.js
 create mode 100644 core/media/editors/tinymce/changelog.txt
 create mode 100644 core/media/editors/tinymce/js/plugins/dragdrop/plugin.js
 create mode 100644 core/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
 create mode 100644 core/media/editors/tinymce/js/tiny-close.js
 create mode 100644 core/media/editors/tinymce/js/tiny-close.min.js
 create mode 100644 core/media/editors/tinymce/js/tinymce-builder.js
 create mode 100644 core/media/editors/tinymce/js/tinymce.js
 create mode 100644 core/media/editors/tinymce/js/tinymce.min.js
 create mode 100644 core/media/editors/tinymce/langs/af.js
 create mode 100644 core/media/editors/tinymce/langs/ar.js
 create mode 100644 core/media/editors/tinymce/langs/be.js
 create mode 100644 core/media/editors/tinymce/langs/bg.js
 create mode 100644 core/media/editors/tinymce/langs/bs.js
 create mode 100644 core/media/editors/tinymce/langs/ca.js
 create mode 100644 core/media/editors/tinymce/langs/cs.js
 create mode 100644 core/media/editors/tinymce/langs/cy.js
 create mode 100644 core/media/editors/tinymce/langs/da.js
 create mode 100644 core/media/editors/tinymce/langs/de.js
 create mode 100644 core/media/editors/tinymce/langs/el.js
 create mode 100644 core/media/editors/tinymce/langs/es.js
 create mode 100644 core/media/editors/tinymce/langs/et.js
 create mode 100644 core/media/editors/tinymce/langs/eu.js
 create mode 100644 core/media/editors/tinymce/langs/fa.js
 create mode 100644 core/media/editors/tinymce/langs/fi.js
 create mode 100644 core/media/editors/tinymce/langs/fo.js
 create mode 100644 core/media/editors/tinymce/langs/fr.js
 create mode 100644 core/media/editors/tinymce/langs/ga.js
 create mode 100644 core/media/editors/tinymce/langs/gl.js
 create mode 100644 core/media/editors/tinymce/langs/he.js
 create mode 100644 core/media/editors/tinymce/langs/hr.js
 create mode 100644 core/media/editors/tinymce/langs/hu.js
 create mode 100644 core/media/editors/tinymce/langs/id.js
 create mode 100644 core/media/editors/tinymce/langs/it.js
 create mode 100644 core/media/editors/tinymce/langs/ja.js
 create mode 100644 core/media/editors/tinymce/langs/ka.js
 create mode 100644 core/media/editors/tinymce/langs/km.js
 create mode 100644 core/media/editors/tinymce/langs/ko.js
 create mode 100644 core/media/editors/tinymce/langs/lb.js
 create mode 100644 core/media/editors/tinymce/langs/lt.js
 create mode 100644 core/media/editors/tinymce/langs/lv.js
 create mode 100644 core/media/editors/tinymce/langs/mk.js
 create mode 100644 core/media/editors/tinymce/langs/ms.js
 create mode 100644 core/media/editors/tinymce/langs/nb.js
 create mode 100644 core/media/editors/tinymce/langs/nl.js
 create mode 100644 core/media/editors/tinymce/langs/pl.js
 create mode 100644 core/media/editors/tinymce/langs/pt-BR.js
 create mode 100644 core/media/editors/tinymce/langs/pt-PT.js
 create mode 100644 core/media/editors/tinymce/langs/readme.md
 create mode 100644 core/media/editors/tinymce/langs/ro.js
 create mode 100644 core/media/editors/tinymce/langs/ru.js
 create mode 100644 core/media/editors/tinymce/langs/si-LK.js
 create mode 100644 core/media/editors/tinymce/langs/sk.js
 create mode 100644 core/media/editors/tinymce/langs/sl.js
 create mode 100644 core/media/editors/tinymce/langs/sr.js
 create mode 100644 core/media/editors/tinymce/langs/sv.js
 create mode 100644 core/media/editors/tinymce/langs/sw.js
 create mode 100644 core/media/editors/tinymce/langs/sy.js
 create mode 100644 core/media/editors/tinymce/langs/ta.js
 create mode 100644 core/media/editors/tinymce/langs/th.js
 create mode 100644 core/media/editors/tinymce/langs/tr.js
 create mode 100644 core/media/editors/tinymce/langs/ug.js
 create mode 100644 core/media/editors/tinymce/langs/uk.js
 create mode 100644 core/media/editors/tinymce/langs/vi.js
 create mode 100644 core/media/editors/tinymce/langs/zh-CN.js
 create mode 100644 core/media/editors/tinymce/langs/zh-TW.js
 create mode 100644 core/media/editors/tinymce/license.txt
 create mode 100644 core/media/editors/tinymce/plugins/advlist/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/anchor/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/autolink/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/autoresize/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/autosave/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/bbcode/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/charmap/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/code/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/codesample/css/prism.css
 create mode 100644 core/media/editors/tinymce/plugins/codesample/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/colorpicker/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/contextmenu/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/directionality/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-cool.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-cry.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-embarassed.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-frown.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-innocent.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-kiss.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-laughing.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-sealed.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-smile.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-surprised.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-undecided.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-wink.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/img/smiley-yell.gif
 create mode 100644 core/media/editors/tinymce/plugins/emoticons/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/example/dialog.html
 create mode 100644 core/media/editors/tinymce/plugins/example/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/example_dependency/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/fullpage/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/fullscreen/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/hr/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/image/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/imagetools/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/importcss/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/insertdatetime/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/layer/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/legacyoutput/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/link/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/lists/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/media/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/nonbreaking/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/noneditable/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/pagebreak/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/paste/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/preview/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/print/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/save/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/searchreplace/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/spellchecker/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/tabfocus/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/table/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/template/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/textcolor/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/textpattern/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/toc/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/visualblocks/css/visualblocks.css
 create mode 100644 core/media/editors/tinymce/plugins/visualblocks/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/visualchars/plugin.min.js
 create mode 100644 core/media/editors/tinymce/plugins/wordcount/plugin.min.js
 create mode 100644 core/media/editors/tinymce/skins/lightgray/content.inline.min.css
 create mode 100644 core/media/editors/tinymce/skins/lightgray/content.min.css
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf
 create mode 100644 core/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff
 create mode 100644 core/media/editors/tinymce/skins/lightgray/img/anchor.gif
 create mode 100644 core/media/editors/tinymce/skins/lightgray/img/loader.gif
 create mode 100644 core/media/editors/tinymce/skins/lightgray/img/object.gif
 create mode 100644 core/media/editors/tinymce/skins/lightgray/img/trans.gif
 create mode 100644 core/media/editors/tinymce/skins/lightgray/skin.ie7.min.css
 create mode 100644 core/media/editors/tinymce/skins/lightgray/skin.min.css
 create mode 100644 core/media/editors/tinymce/templates/layout1.html
 create mode 100644 core/media/editors/tinymce/templates/snippet1.html
 create mode 100644 core/media/editors/tinymce/themes/modern/theme.min.js
 create mode 100644 core/media/editors/tinymce/tinymce.min.js
 create mode 100644 core/media/index.html
 create mode 100644 core/media/jui/css/bootstrap-extended.css
 create mode 100644 core/media/jui/css/bootstrap-responsive.css
 create mode 100644 core/media/jui/css/bootstrap-responsive.min.css
 create mode 100644 core/media/jui/css/bootstrap-rtl.css
 create mode 100644 core/media/jui/css/bootstrap-tooltip-extended.css
 create mode 100644 core/media/jui/css/bootstrap.css
 create mode 100644 core/media/jui/css/bootstrap.min.css
 create mode 100644 core/media/jui/css/chosen-sprite.png
 create mode 100644 core/media/jui/css/chosen-sprite@2x.png
 create mode 100644 core/media/jui/css/chosen.css
 create mode 100644 core/media/jui/css/icomoon.css
 create mode 100644 core/media/jui/css/jquery.minicolors.css
 create mode 100644 core/media/jui/css/jquery.searchtools.css
 create mode 100644 core/media/jui/css/jquery.simplecolors.css
 create mode 100644 core/media/jui/css/sortablelist.css
 create mode 100644 core/media/jui/fonts/IcoMoon.dev.commented.svg
 create mode 100644 core/media/jui/fonts/IcoMoon.dev.svg
 create mode 100644 core/media/jui/fonts/IcoMoon.eot
 create mode 100644 core/media/jui/fonts/IcoMoon.svg
 create mode 100644 core/media/jui/fonts/IcoMoon.ttf
 create mode 100644 core/media/jui/fonts/IcoMoon.woff
 create mode 100644 core/media/jui/fonts/icomoon-license.txt
 create mode 100644 core/media/jui/images/ajax-loader.gif
 create mode 100644 core/media/jui/img/ajax-loader.gif
 create mode 100644 core/media/jui/img/alpha.png
 create mode 100644 core/media/jui/img/bg-overlay.png
 create mode 100644 core/media/jui/img/glyphicons-halflings-white.png
 create mode 100644 core/media/jui/img/glyphicons-halflings.png
 create mode 100644 core/media/jui/img/hue.png
 create mode 100644 core/media/jui/img/joomla.png
 create mode 100644 core/media/jui/img/jquery.minicolors.png
 create mode 100644 core/media/jui/img/saturation.png
 create mode 100644 core/media/jui/js/ajax-chosen.js
 create mode 100644 core/media/jui/js/ajax-chosen.min.js
 create mode 100644 core/media/jui/js/bootstrap-tooltip-extended.js
 create mode 100644 core/media/jui/js/bootstrap-tooltip-extended.min.js
 create mode 100644 core/media/jui/js/bootstrap.js
 create mode 100644 core/media/jui/js/bootstrap.min.js
 create mode 100644 core/media/jui/js/chosen.jquery.js
 create mode 100644 core/media/jui/js/chosen.jquery.min.js
 create mode 100644 core/media/jui/js/cms-uncompressed.js
 create mode 100644 core/media/jui/js/cms.js
 create mode 100644 core/media/jui/js/fielduser.js
 create mode 100644 core/media/jui/js/fielduser.min.js
 create mode 100644 core/media/jui/js/html5-uncompressed.js
 create mode 100644 core/media/jui/js/html5.js
 create mode 100644 core/media/jui/js/icomoon-lte-ie7.js
 create mode 100644 core/media/jui/js/jquery-migrate.js
 create mode 100644 core/media/jui/js/jquery-migrate.min.js
 create mode 100644 core/media/jui/js/jquery-noconflict.js
 create mode 100644 core/media/jui/js/jquery.autocomplete.js
 create mode 100644 core/media/jui/js/jquery.autocomplete.min.js
 create mode 100644 core/media/jui/js/jquery.js
 create mode 100644 core/media/jui/js/jquery.min.js
 create mode 100644 core/media/jui/js/jquery.minicolors.js
 create mode 100644 core/media/jui/js/jquery.minicolors.min.js
 create mode 100644 core/media/jui/js/jquery.searchtools.js
 create mode 100644 core/media/jui/js/jquery.searchtools.min.js
 create mode 100644 core/media/jui/js/jquery.simplecolors.js
 create mode 100644 core/media/jui/js/jquery.simplecolors.min.js
 create mode 100644 core/media/jui/js/jquery.ui.core.js
 create mode 100644 core/media/jui/js/jquery.ui.core.min.js
 create mode 100644 core/media/jui/js/jquery.ui.sortable.js
 create mode 100644 core/media/jui/js/jquery.ui.sortable.min.js
 create mode 100644 core/media/jui/js/sortablelist.js
 create mode 100644 core/media/jui/js/treeselectmenu.jquery.js
 create mode 100644 core/media/jui/js/treeselectmenu.jquery.min.js
 create mode 100644 core/media/jui/less/accordion.less
 create mode 100644 core/media/jui/less/alerts.less
 create mode 100644 core/media/jui/less/bootstrap-extended.less
 create mode 100644 core/media/jui/less/bootstrap-rtl.less
 create mode 100644 core/media/jui/less/bootstrap.less
 create mode 100644 core/media/jui/less/breadcrumbs.less
 create mode 100644 core/media/jui/less/button-groups.less
 create mode 100644 core/media/jui/less/buttons.less
 create mode 100644 core/media/jui/less/carousel.less
 create mode 100644 core/media/jui/less/close.less
 create mode 100644 core/media/jui/less/code.less
 create mode 100644 core/media/jui/less/component-animations.less
 create mode 100644 core/media/jui/less/dropdowns.less
 create mode 100644 core/media/jui/less/forms.less
 create mode 100644 core/media/jui/less/grid.less
 create mode 100644 core/media/jui/less/hero-unit.less
 create mode 100644 core/media/jui/less/icomoon.less
 create mode 100644 core/media/jui/less/labels-badges.less
 create mode 100644 core/media/jui/less/layouts.less
 create mode 100644 core/media/jui/less/media.less
 create mode 100644 core/media/jui/less/mixins.less
 create mode 100644 core/media/jui/less/modals.joomla.less
 create mode 100644 core/media/jui/less/modals.less
 create mode 100644 core/media/jui/less/navbar.less
 create mode 100644 core/media/jui/less/navs.less
 create mode 100644 core/media/jui/less/pager.less
 create mode 100644 core/media/jui/less/pagination.less
 create mode 100644 core/media/jui/less/popovers.less
 create mode 100644 core/media/jui/less/progress-bars.less
 create mode 100644 core/media/jui/less/reset.less
 create mode 100644 core/media/jui/less/responsive-1200px-min.less
 create mode 100644 core/media/jui/less/responsive-767px-max.joomla.less
 create mode 100644 core/media/jui/less/responsive-767px-max.less
 create mode 100644 core/media/jui/less/responsive-768px-979px.less
 create mode 100644 core/media/jui/less/responsive-navbar.less
 create mode 100644 core/media/jui/less/responsive-utilities.less
 create mode 100644 core/media/jui/less/responsive.less
 create mode 100644 core/media/jui/less/scaffolding.less
 create mode 100644 core/media/jui/less/sprites.less
 create mode 100644 core/media/jui/less/tables.less
 create mode 100644 core/media/jui/less/thumbnails.less
 create mode 100644 core/media/jui/less/tooltip.less
 create mode 100644 core/media/jui/less/type.less
 create mode 100644 core/media/jui/less/utilities.less
 create mode 100644 core/media/jui/less/variables.less
 create mode 100644 core/media/jui/less/wells.less
 create mode 100644 core/media/mailto/images/close-x.png
 create mode 100644 core/media/media/css/background.png
 create mode 100644 core/media/media/css/bigplay.fw.png
 create mode 100644 core/media/media/css/bigplay.png
 create mode 100644 core/media/media/css/bigplay.svg
 create mode 100644 core/media/media/css/controls-ted.png
 create mode 100644 core/media/media/css/controls-wmp-bg.png
 create mode 100644 core/media/media/css/controls-wmp.png
 create mode 100644 core/media/media/css/controls.fw.png
 create mode 100644 core/media/media/css/controls.png
 create mode 100644 core/media/media/css/controls.svg
 create mode 100644 core/media/media/css/jumpforward.png
 create mode 100644 core/media/media/css/loading.gif
 create mode 100644 core/media/media/css/mediaelementplayer.css
 create mode 100644 core/media/media/css/mediaelementplayer.min.css
 create mode 100644 core/media/media/css/medialist-details.css
 create mode 100644 core/media/media/css/medialist-details_rtl.css
 create mode 100644 core/media/media/css/medialist-thumbs.css
 create mode 100644 core/media/media/css/medialist-thumbs_rtl.css
 create mode 100644 core/media/media/css/mediamanager.css
 create mode 100644 core/media/media/css/mediamanager_rtl.css
 create mode 100644 core/media/media/css/mejs-skins.css
 create mode 100644 core/media/media/css/popup-imagelist.css
 create mode 100644 core/media/media/css/popup-imagelist_rtl.css
 create mode 100644 core/media/media/css/popup-imagemanager.css
 create mode 100644 core/media/media/css/popup-imagemanager_rtl.css
 create mode 100644 core/media/media/css/skipback.png
 create mode 100644 core/media/media/images/bar.gif
 create mode 100644 core/media/media/images/con_info.png
 create mode 100644 core/media/media/images/delete.png
 create mode 100644 core/media/media/images/dots.gif
 create mode 100644 core/media/media/images/failed.png
 create mode 100644 core/media/media/images/folder.gif
 create mode 100644 core/media/media/images/folder.png
 create mode 100644 core/media/media/images/folder_sm.png
 create mode 100644 core/media/media/images/folderup_16.png
 create mode 100644 core/media/media/images/folderup_32.png
 create mode 100644 core/media/media/images/mime-icon-16/avi.png
 create mode 100644 core/media/media/images/mime-icon-16/doc.png
 create mode 100644 core/media/media/images/mime-icon-16/mov.png
 create mode 100644 core/media/media/images/mime-icon-16/mp3.png
 create mode 100644 core/media/media/images/mime-icon-16/mp4.png
 create mode 100644 core/media/media/images/mime-icon-16/odc.png
 create mode 100644 core/media/media/images/mime-icon-16/odd.png
 create mode 100644 core/media/media/images/mime-icon-16/odt.png
 create mode 100644 core/media/media/images/mime-icon-16/ogg.png
 create mode 100644 core/media/media/images/mime-icon-16/pdf.png
 create mode 100644 core/media/media/images/mime-icon-16/ppt.png
 create mode 100644 core/media/media/images/mime-icon-16/rar.png
 create mode 100644 core/media/media/images/mime-icon-16/rtf.png
 create mode 100644 core/media/media/images/mime-icon-16/svg.png
 create mode 100644 core/media/media/images/mime-icon-16/sxd.png
 create mode 100644 core/media/media/images/mime-icon-16/tar.png
 create mode 100644 core/media/media/images/mime-icon-16/tgz.png
 create mode 100644 core/media/media/images/mime-icon-16/wma.png
 create mode 100644 core/media/media/images/mime-icon-16/wmv.png
 create mode 100644 core/media/media/images/mime-icon-16/xls.png
 create mode 100644 core/media/media/images/mime-icon-16/zip.png
 create mode 100644 core/media/media/images/mime-icon-32/avi.png
 create mode 100644 core/media/media/images/mime-icon-32/doc.png
 create mode 100644 core/media/media/images/mime-icon-32/mov.png
 create mode 100644 core/media/media/images/mime-icon-32/mp3.png
 create mode 100644 core/media/media/images/mime-icon-32/mp4.png
 create mode 100644 core/media/media/images/mime-icon-32/odc.png
 create mode 100644 core/media/media/images/mime-icon-32/odd.png
 create mode 100644 core/media/media/images/mime-icon-32/odt.png
 create mode 100644 core/media/media/images/mime-icon-32/ogg.png
 create mode 100644 core/media/media/images/mime-icon-32/pdf.png
 create mode 100644 core/media/media/images/mime-icon-32/ppt.png
 create mode 100644 core/media/media/images/mime-icon-32/rar.png
 create mode 100644 core/media/media/images/mime-icon-32/rtf.png
 create mode 100644 core/media/media/images/mime-icon-32/svg.png
 create mode 100644 core/media/media/images/mime-icon-32/sxd.png
 create mode 100644 core/media/media/images/mime-icon-32/tar.png
 create mode 100644 core/media/media/images/mime-icon-32/tgz.png
 create mode 100644 core/media/media/images/mime-icon-32/wma.png
 create mode 100644 core/media/media/images/mime-icon-32/wmv.png
 create mode 100644 core/media/media/images/mime-icon-32/xls.png
 create mode 100644 core/media/media/images/mime-icon-32/zip.png
 create mode 100644 core/media/media/images/progress.gif
 create mode 100644 core/media/media/images/remove.png
 create mode 100644 core/media/media/images/success.png
 create mode 100644 core/media/media/images/upload.png
 create mode 100644 core/media/media/images/uploading.png
 create mode 100644 core/media/media/js/flashmediaelement-cdn.swf
 create mode 100644 core/media/media/js/flashmediaelement.swf
 create mode 100644 core/media/media/js/mediaelement-and-player.js
 create mode 100644 core/media/media/js/mediaelement-and-player.min.js
 create mode 100644 core/media/media/js/mediafield-mootools.js
 create mode 100644 core/media/media/js/mediafield-mootools.min.js
 create mode 100644 core/media/media/js/mediafield.js
 create mode 100644 core/media/media/js/mediafield.min.js
 create mode 100644 core/media/media/js/mediamanager.js
 create mode 100644 core/media/media/js/mediamanager.min.js
 create mode 100644 core/media/media/js/popup-imagemanager.js
 create mode 100644 core/media/media/js/popup-imagemanager.min.js
 create mode 100644 core/media/media/js/silverlightmediaelement.xap
 create mode 100644 core/media/mod_languages/css/template.css
 create mode 100644 core/media/mod_languages/images/af.gif
 create mode 100644 core/media/mod_languages/images/af_za.gif
 create mode 100644 core/media/mod_languages/images/al.gif
 create mode 100644 core/media/mod_languages/images/ar.gif
 create mode 100644 core/media/mod_languages/images/ar_aa.gif
 create mode 100644 core/media/mod_languages/images/at.gif
 create mode 100644 core/media/mod_languages/images/az.gif
 create mode 100644 core/media/mod_languages/images/az_az.gif
 create mode 100644 core/media/mod_languages/images/be.gif
 create mode 100644 core/media/mod_languages/images/be_by.gif
 create mode 100644 core/media/mod_languages/images/belg.gif
 create mode 100644 core/media/mod_languages/images/bg.gif
 create mode 100644 core/media/mod_languages/images/bg_bg.gif
 create mode 100644 core/media/mod_languages/images/bn.gif
 create mode 100644 core/media/mod_languages/images/bn_bd.gif
 create mode 100644 core/media/mod_languages/images/br.gif
 create mode 100644 core/media/mod_languages/images/br_fr.gif
 create mode 100644 core/media/mod_languages/images/bs.gif
 create mode 100644 core/media/mod_languages/images/bs_ba.gif
 create mode 100644 core/media/mod_languages/images/ca.gif
 create mode 100644 core/media/mod_languages/images/ca_es.gif
 create mode 100644 core/media/mod_languages/images/cbk_iq.gif
 create mode 100644 core/media/mod_languages/images/ch.gif
 create mode 100644 core/media/mod_languages/images/cs.gif
 create mode 100644 core/media/mod_languages/images/cs_cz.gif
 create mode 100644 core/media/mod_languages/images/cy.gif
 create mode 100644 core/media/mod_languages/images/cy_gb.gif
 create mode 100644 core/media/mod_languages/images/cz.gif
 create mode 100644 core/media/mod_languages/images/cz_cz.gif
 create mode 100644 core/media/mod_languages/images/da.gif
 create mode 100644 core/media/mod_languages/images/da_dk.gif
 create mode 100644 core/media/mod_languages/images/de.gif
 create mode 100644 core/media/mod_languages/images/de_at.gif
 create mode 100644 core/media/mod_languages/images/de_ch.gif
 create mode 100644 core/media/mod_languages/images/de_de.gif
 create mode 100644 core/media/mod_languages/images/de_li.gif
 create mode 100644 core/media/mod_languages/images/de_lu.gif
 create mode 100644 core/media/mod_languages/images/dk.gif
 create mode 100644 core/media/mod_languages/images/dz_bt.gif
 create mode 100644 core/media/mod_languages/images/el.gif
 create mode 100644 core/media/mod_languages/images/el_gr.gif
 create mode 100644 core/media/mod_languages/images/en.gif
 create mode 100644 core/media/mod_languages/images/en_au.gif
 create mode 100644 core/media/mod_languages/images/en_ca.gif
 create mode 100644 core/media/mod_languages/images/en_gb.gif
 create mode 100644 core/media/mod_languages/images/en_nz.gif
 create mode 100644 core/media/mod_languages/images/en_us.gif
 create mode 100644 core/media/mod_languages/images/eo.gif
 create mode 100644 core/media/mod_languages/images/eo_xx.gif
 create mode 100644 core/media/mod_languages/images/es.gif
 create mode 100644 core/media/mod_languages/images/es_co.gif
 create mode 100644 core/media/mod_languages/images/es_es.gif
 create mode 100644 core/media/mod_languages/images/et.gif
 create mode 100644 core/media/mod_languages/images/et_ee.gif
 create mode 100644 core/media/mod_languages/images/eu_es.gif
 create mode 100644 core/media/mod_languages/images/fa.gif
 create mode 100644 core/media/mod_languages/images/fa_ir.gif
 create mode 100644 core/media/mod_languages/images/fi.gif
 create mode 100644 core/media/mod_languages/images/fi_fi.gif
 create mode 100644 core/media/mod_languages/images/fr.gif
 create mode 100644 core/media/mod_languages/images/fr_ca.gif
 create mode 100644 core/media/mod_languages/images/fr_fr.gif
 create mode 100644 core/media/mod_languages/images/ga_ie.gif
 create mode 100644 core/media/mod_languages/images/gd.gif
 create mode 100644 core/media/mod_languages/images/gd_gb.gif
 create mode 100644 core/media/mod_languages/images/gl.gif
 create mode 100644 core/media/mod_languages/images/gl_es.gif
 create mode 100644 core/media/mod_languages/images/he.gif
 create mode 100644 core/media/mod_languages/images/he_il.gif
 create mode 100644 core/media/mod_languages/images/hi.gif
 create mode 100644 core/media/mod_languages/images/hi_in.gif
 create mode 100644 core/media/mod_languages/images/hk.gif
 create mode 100644 core/media/mod_languages/images/hk_hk.gif
 create mode 100644 core/media/mod_languages/images/hr.gif
 create mode 100644 core/media/mod_languages/images/hr_hr.gif
 create mode 100644 core/media/mod_languages/images/hu.gif
 create mode 100644 core/media/mod_languages/images/hu_hu.gif
 create mode 100644 core/media/mod_languages/images/hy.gif
 create mode 100644 core/media/mod_languages/images/hy_am.gif
 create mode 100644 core/media/mod_languages/images/icon-16-language.png
 create mode 100644 core/media/mod_languages/images/id.gif
 create mode 100644 core/media/mod_languages/images/id_id.gif
 create mode 100644 core/media/mod_languages/images/is.gif
 create mode 100644 core/media/mod_languages/images/is_is.gif
 create mode 100644 core/media/mod_languages/images/it.gif
 create mode 100644 core/media/mod_languages/images/it_it.gif
 create mode 100644 core/media/mod_languages/images/ja.gif
 create mode 100644 core/media/mod_languages/images/ja_jp.gif
 create mode 100644 core/media/mod_languages/images/ka.gif
 create mode 100644 core/media/mod_languages/images/ka_ge.gif
 create mode 100644 core/media/mod_languages/images/km.gif
 create mode 100644 core/media/mod_languages/images/km_kh.gif
 create mode 100644 core/media/mod_languages/images/ko.gif
 create mode 100644 core/media/mod_languages/images/ko_kr.gif
 create mode 100644 core/media/mod_languages/images/ku.gif
 create mode 100644 core/media/mod_languages/images/lo.gif
 create mode 100644 core/media/mod_languages/images/lo_la.gif
 create mode 100644 core/media/mod_languages/images/lt.gif
 create mode 100644 core/media/mod_languages/images/lt_lt.gif
 create mode 100644 core/media/mod_languages/images/lv.gif
 create mode 100644 core/media/mod_languages/images/lv_lv.gif
 create mode 100644 core/media/mod_languages/images/mk.gif
 create mode 100644 core/media/mod_languages/images/mk_mk.gif
 create mode 100644 core/media/mod_languages/images/mn.gif
 create mode 100644 core/media/mod_languages/images/mn_mn.gif
 create mode 100644 core/media/mod_languages/images/ms_my.gif
 create mode 100644 core/media/mod_languages/images/nb_no.gif
 create mode 100644 core/media/mod_languages/images/nl.gif
 create mode 100644 core/media/mod_languages/images/nl_be.gif
 create mode 100644 core/media/mod_languages/images/nl_nl.gif
 create mode 100644 core/media/mod_languages/images/nn_no.gif
 create mode 100644 core/media/mod_languages/images/no.gif
 create mode 100644 core/media/mod_languages/images/pl.gif
 create mode 100644 core/media/mod_languages/images/pl_pl.gif
 create mode 100644 core/media/mod_languages/images/prs_af.gif
 create mode 100644 core/media/mod_languages/images/ps.gif
 create mode 100644 core/media/mod_languages/images/ps_af.gif
 create mode 100644 core/media/mod_languages/images/pt.gif
 create mode 100644 core/media/mod_languages/images/pt_br.gif
 create mode 100644 core/media/mod_languages/images/pt_pt.gif
 create mode 100644 core/media/mod_languages/images/ro.gif
 create mode 100644 core/media/mod_languages/images/ro_ro.gif
 create mode 100644 core/media/mod_languages/images/ru.gif
 create mode 100644 core/media/mod_languages/images/ru_ru.gif
 create mode 100644 core/media/mod_languages/images/si.gif
 create mode 100644 core/media/mod_languages/images/si_lk.gif
 create mode 100644 core/media/mod_languages/images/sk.gif
 create mode 100644 core/media/mod_languages/images/sk_sk.gif
 create mode 100644 core/media/mod_languages/images/sl.gif
 create mode 100644 core/media/mod_languages/images/sl_si.gif
 create mode 100644 core/media/mod_languages/images/sq_al.gif
 create mode 100644 core/media/mod_languages/images/sr.gif
 create mode 100644 core/media/mod_languages/images/sr_rs.gif
 create mode 100644 core/media/mod_languages/images/sr_yu.gif
 create mode 100644 core/media/mod_languages/images/srp_me.gif
 create mode 100644 core/media/mod_languages/images/sv.gif
 create mode 100644 core/media/mod_languages/images/sv_se.gif
 create mode 100644 core/media/mod_languages/images/sw.gif
 create mode 100644 core/media/mod_languages/images/sw_ke.gif
 create mode 100644 core/media/mod_languages/images/sy.gif
 create mode 100644 core/media/mod_languages/images/sy_iq.gif
 create mode 100644 core/media/mod_languages/images/ta.gif
 create mode 100644 core/media/mod_languages/images/ta_in.gif
 create mode 100644 core/media/mod_languages/images/th.gif
 create mode 100644 core/media/mod_languages/images/th_th.gif
 create mode 100644 core/media/mod_languages/images/tk_tm.gif
 create mode 100644 core/media/mod_languages/images/tr.gif
 create mode 100644 core/media/mod_languages/images/tr_tr.gif
 create mode 100644 core/media/mod_languages/images/tw.gif
 create mode 100644 core/media/mod_languages/images/ug_cn.gif
 create mode 100644 core/media/mod_languages/images/uk.gif
 create mode 100644 core/media/mod_languages/images/uk_ua.gif
 create mode 100644 core/media/mod_languages/images/ur.gif
 create mode 100644 core/media/mod_languages/images/ur_pk.gif
 create mode 100644 core/media/mod_languages/images/us.gif
 create mode 100644 core/media/mod_languages/images/uz.gif
 create mode 100644 core/media/mod_languages/images/uz_uz.gif
 create mode 100644 core/media/mod_languages/images/vi.gif
 create mode 100644 core/media/mod_languages/images/vi_vn.gif
 create mode 100644 core/media/mod_languages/images/zh.gif
 create mode 100644 core/media/mod_languages/images/zh_cn.gif
 create mode 100644 core/media/mod_languages/images/zh_tw.gif
 create mode 100644 core/media/mod_sampledata/js/sampledata-process.js
 create mode 100644 core/media/overrider/css/overrider.css
 create mode 100644 core/media/overrider/js/overrider.js
 create mode 100644 core/media/overrider/js/overrider.min.js
 create mode 100644 core/media/plg_captcha_recaptcha/js/recaptcha.js
 create mode 100644 core/media/plg_captcha_recaptcha/js/recaptcha.min.js
 create mode 100644 core/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js
 create mode 100644 core/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js
 create mode 100644 core/media/plg_system_highlight/highlight.css
 create mode 100644 core/media/plg_system_stats/js/stats.js
 create mode 100644 core/media/system/css/adminlist.css
 create mode 100644 core/media/system/css/calendar-jos.css
 create mode 100644 core/media/system/css/fields/calendar-rtl.css
 create mode 100644 core/media/system/css/fields/calendar.css
 create mode 100644 core/media/system/css/frontediting.css
 create mode 100644 core/media/system/css/jquery.Jcrop.min.css
 create mode 100644 core/media/system/css/modal.css
 create mode 100644 core/media/system/css/mootree.css
 create mode 100644 core/media/system/css/mootree_rtl.css
 create mode 100644 core/media/system/css/system.css
 create mode 100644 core/media/system/images/arrow.png
 create mode 100644 core/media/system/images/arrow_rtl.png
 create mode 100644 core/media/system/images/blank.png
 create mode 100644 core/media/system/images/calendar.png
 create mode 100644 core/media/system/images/checked_out.png
 create mode 100644 core/media/system/images/edit.png
 create mode 100644 core/media/system/images/edit_unpublished.png
 create mode 100644 core/media/system/images/emailButton.png
 create mode 100644 core/media/system/images/icon-16-logout.png
 create mode 100644 core/media/system/images/icon_error.gif
 create mode 100644 core/media/system/images/indent.png
 create mode 100644 core/media/system/images/indent1.png
 create mode 100644 core/media/system/images/indent2.png
 create mode 100644 core/media/system/images/indent3.png
 create mode 100644 core/media/system/images/indent4.png
 create mode 100644 core/media/system/images/indent5.png
 create mode 100644 core/media/system/images/livemarks-rtl.png
 create mode 100644 core/media/system/images/livemarks.png
 create mode 100644 core/media/system/images/modal/bg_e.png
 create mode 100644 core/media/system/images/modal/bg_n.png
 create mode 100644 core/media/system/images/modal/bg_ne.png
 create mode 100644 core/media/system/images/modal/bg_nw.png
 create mode 100644 core/media/system/images/modal/bg_s.png
 create mode 100644 core/media/system/images/modal/bg_se.png
 create mode 100644 core/media/system/images/modal/bg_sw.png
 create mode 100644 core/media/system/images/modal/bg_w.png
 create mode 100644 core/media/system/images/modal/closebox.png
 create mode 100644 core/media/system/images/modal/spinner.gif
 create mode 100644 core/media/system/images/mooRainbow/blank.gif
 create mode 100644 core/media/system/images/mooRainbow/moor_arrows.gif
 create mode 100644 core/media/system/images/mooRainbow/moor_boverlay.png
 create mode 100644 core/media/system/images/mooRainbow/moor_cursor.gif
 create mode 100644 core/media/system/images/mooRainbow/moor_slider.png
 create mode 100644 core/media/system/images/mooRainbow/moor_woverlay.png
 create mode 100644 core/media/system/images/mootree.gif
 create mode 100644 core/media/system/images/mootree_loader.gif
 create mode 100644 core/media/system/images/new.png
 create mode 100644 core/media/system/images/no_indent.png
 create mode 100644 core/media/system/images/notice-alert.png
 create mode 100644 core/media/system/images/notice-download.png
 create mode 100644 core/media/system/images/notice-info.png
 create mode 100644 core/media/system/images/notice-note.png
 create mode 100644 core/media/system/images/pdf_button.png
 create mode 100644 core/media/system/images/printButton.png
 create mode 100644 core/media/system/images/rating_star.png
 create mode 100644 core/media/system/images/rating_star_blank.png
 create mode 100644 core/media/system/images/sort0.png
 create mode 100644 core/media/system/images/sort1.png
 create mode 100644 core/media/system/images/sort_asc.png
 create mode 100644 core/media/system/images/sort_desc.png
 create mode 100644 core/media/system/images/sort_none.png
 create mode 100644 core/media/system/images/tooltip.png
 create mode 100644 core/media/system/images/weblink.png
 create mode 100644 core/media/system/js/associations-edit-uncompressed.js
 create mode 100644 core/media/system/js/associations-edit.js
 create mode 100644 core/media/system/js/calendar-setup-uncompressed.js
 create mode 100644 core/media/system/js/calendar-setup.js
 create mode 100644 core/media/system/js/calendar-uncompressed.js
 create mode 100644 core/media/system/js/calendar.js
 create mode 100644 core/media/system/js/caption-uncompressed.js
 create mode 100644 core/media/system/js/caption.js
 create mode 100644 core/media/system/js/color-field-adv-init.js
 create mode 100644 core/media/system/js/color-field-adv-init.min.js
 create mode 100644 core/media/system/js/color-field-init.js
 create mode 100644 core/media/system/js/color-field-init.min.js
 create mode 100644 core/media/system/js/combobox-uncompressed.js
 create mode 100644 core/media/system/js/combobox.js
 create mode 100644 core/media/system/js/core-uncompressed.js
 create mode 100644 core/media/system/js/core.js
 create mode 100644 core/media/system/js/fields/calendar-locales/af.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ar.js
 create mode 100644 core/media/system/js/fields/calendar-locales/bg.js
 create mode 100644 core/media/system/js/fields/calendar-locales/bn.js
 create mode 100644 core/media/system/js/fields/calendar-locales/bs.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ca.js
 create mode 100644 core/media/system/js/fields/calendar-locales/cs.js
 create mode 100644 core/media/system/js/fields/calendar-locales/cy.js
 create mode 100644 core/media/system/js/fields/calendar-locales/da.js
 create mode 100644 core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.js
 create mode 100644 core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.min.js
 create mode 100644 core/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
 create mode 100644 core/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js
 create mode 100644 core/media/system/js/fields/calendar-locales/de.js
 create mode 100644 core/media/system/js/fields/calendar-locales/el.js
 create mode 100644 core/media/system/js/fields/calendar-locales/en.js
 create mode 100644 core/media/system/js/fields/calendar-locales/es.js
 create mode 100644 core/media/system/js/fields/calendar-locales/eu.js
 create mode 100644 core/media/system/js/fields/calendar-locales/fa-ir.js
 create mode 100644 core/media/system/js/fields/calendar-locales/fi.js
 create mode 100644 core/media/system/js/fields/calendar-locales/fr.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ga.js
 create mode 100644 core/media/system/js/fields/calendar-locales/hr.js
 create mode 100644 core/media/system/js/fields/calendar-locales/hu.js
 create mode 100644 core/media/system/js/fields/calendar-locales/it.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ja.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ka.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ko.js
 create mode 100644 core/media/system/js/fields/calendar-locales/lt.js
 create mode 100644 core/media/system/js/fields/calendar-locales/mk.js
 create mode 100644 core/media/system/js/fields/calendar-locales/nb.js
 create mode 100644 core/media/system/js/fields/calendar-locales/nl.js
 create mode 100644 core/media/system/js/fields/calendar-locales/pl.js
 create mode 100644 core/media/system/js/fields/calendar-locales/prs-af.js
 create mode 100644 core/media/system/js/fields/calendar-locales/pt.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ru.js
 create mode 100644 core/media/system/js/fields/calendar-locales/sk.js
 create mode 100644 core/media/system/js/fields/calendar-locales/sl.js
 create mode 100644 core/media/system/js/fields/calendar-locales/sr-rs.js
 create mode 100644 core/media/system/js/fields/calendar-locales/sr-yu.js
 create mode 100644 core/media/system/js/fields/calendar-locales/sv.js
 create mode 100644 core/media/system/js/fields/calendar-locales/sw.js
 create mode 100644 core/media/system/js/fields/calendar-locales/ta.js
 create mode 100644 core/media/system/js/fields/calendar-locales/th.js
 create mode 100644 core/media/system/js/fields/calendar-locales/uk.js
 create mode 100644 core/media/system/js/fields/calendar-locales/zh-CN.js
 create mode 100644 core/media/system/js/fields/calendar-locales/zh-TW.js
 create mode 100644 core/media/system/js/fields/calendar.js
 create mode 100644 core/media/system/js/fields/calendar.min.js
 create mode 100644 core/media/system/js/frontediting-uncompressed.js
 create mode 100644 core/media/system/js/frontediting.js
 create mode 100644 core/media/system/js/helpsite.js
 create mode 100644 core/media/system/js/highlighter-uncompressed.js
 create mode 100644 core/media/system/js/highlighter.js
 create mode 100644 core/media/system/js/html5fallback-uncompressed.js
 create mode 100644 core/media/system/js/html5fallback.js
 create mode 100644 core/media/system/js/jquery.Jcrop.js
 create mode 100644 core/media/system/js/jquery.Jcrop.min.js
 create mode 100644 core/media/system/js/keepalive-uncompressed.js
 create mode 100644 core/media/system/js/keepalive.js
 create mode 100644 core/media/system/js/modal-fields-uncompressed.js
 create mode 100644 core/media/system/js/modal-fields.js
 create mode 100644 core/media/system/js/modal-uncompressed.js
 create mode 100644 core/media/system/js/modal.js
 create mode 100644 core/media/system/js/moduleorder.js
 create mode 100644 core/media/system/js/mootools-core-uncompressed.js
 create mode 100644 core/media/system/js/mootools-core.js
 create mode 100644 core/media/system/js/mootools-more-uncompressed.js
 create mode 100644 core/media/system/js/mootools-more.js
 create mode 100644 core/media/system/js/mootree-uncompressed.js
 create mode 100644 core/media/system/js/mootree.js
 create mode 100644 core/media/system/js/multiselect-uncompressed.js
 create mode 100644 core/media/system/js/multiselect.js
 create mode 100644 core/media/system/js/passwordstrength.js
 create mode 100644 core/media/system/js/permissions-uncompressed.js
 create mode 100644 core/media/system/js/permissions.js
 create mode 100644 core/media/system/js/polyfill.classlist-uncompressed.js
 create mode 100644 core/media/system/js/polyfill.classlist.js
 create mode 100644 core/media/system/js/polyfill.event-uncompressed.js
 create mode 100644 core/media/system/js/polyfill.event.js
 create mode 100644 core/media/system/js/polyfill.filter-uncompressed.js
 create mode 100644 core/media/system/js/polyfill.filter.js
 create mode 100644 core/media/system/js/polyfill.map-uncompressed.js
 create mode 100644 core/media/system/js/polyfill.map.js
 create mode 100644 core/media/system/js/polyfill.xpath-uncompressed.js
 create mode 100644 core/media/system/js/polyfill.xpath.js
 create mode 100644 core/media/system/js/progressbar-uncompressed.js
 create mode 100644 core/media/system/js/progressbar.js
 create mode 100644 core/media/system/js/punycode-uncompressed.js
 create mode 100644 core/media/system/js/punycode.js
 create mode 100644 core/media/system/js/repeatable-uncompressed.js
 create mode 100644 core/media/system/js/repeatable.js
 create mode 100644 core/media/system/js/sendtestmail-uncompressed.js
 create mode 100644 core/media/system/js/sendtestmail.js
 create mode 100644 core/media/system/js/subform-repeatable-uncompressed.js
 create mode 100644 core/media/system/js/subform-repeatable.js
 create mode 100644 core/media/system/js/switcher-uncompressed.js
 create mode 100644 core/media/system/js/switcher.js
 create mode 100644 core/media/system/js/tabs-state-uncompressed.js
 create mode 100644 core/media/system/js/tabs-state.js
 create mode 100644 core/media/system/js/tabs.js
 create mode 100644 core/media/system/js/validate-uncompressed.js
 create mode 100644 core/media/system/js/validate.js
 create mode 100644 core/modules/index.html
 create mode 100644 core/modules/mod_articles_archive/helper.php
 create mode 100644 core/modules/mod_articles_archive/mod_articles_archive.php
 create mode 100644 core/modules/mod_articles_archive/mod_articles_archive.xml
 create mode 100644 core/modules/mod_articles_archive/tmpl/default.php
 create mode 100644 core/modules/mod_articles_categories/helper.php
 create mode 100644 core/modules/mod_articles_categories/mod_articles_categories.php
 create mode 100644 core/modules/mod_articles_categories/mod_articles_categories.xml
 create mode 100644 core/modules/mod_articles_categories/tmpl/default.php
 create mode 100644 core/modules/mod_articles_categories/tmpl/default_items.php
 create mode 100644 core/modules/mod_articles_category/helper.php
 create mode 100644 core/modules/mod_articles_category/mod_articles_category.php
 create mode 100644 core/modules/mod_articles_category/mod_articles_category.xml
 create mode 100644 core/modules/mod_articles_category/tmpl/default.php
 create mode 100644 core/modules/mod_articles_latest/helper.php
 create mode 100644 core/modules/mod_articles_latest/mod_articles_latest.php
 create mode 100644 core/modules/mod_articles_latest/mod_articles_latest.xml
 create mode 100644 core/modules/mod_articles_latest/tmpl/default.php
 create mode 100644 core/modules/mod_articles_news/helper.php
 create mode 100644 core/modules/mod_articles_news/mod_articles_news.php
 create mode 100644 core/modules/mod_articles_news/mod_articles_news.xml
 create mode 100644 core/modules/mod_articles_news/tmpl/_item.php
 create mode 100644 core/modules/mod_articles_news/tmpl/default.php
 create mode 100644 core/modules/mod_articles_news/tmpl/horizontal.php
 create mode 100644 core/modules/mod_articles_news/tmpl/vertical.php
 create mode 100644 core/modules/mod_articles_popular/helper.php
 create mode 100644 core/modules/mod_articles_popular/mod_articles_popular.php
 create mode 100644 core/modules/mod_articles_popular/mod_articles_popular.xml
 create mode 100644 core/modules/mod_articles_popular/tmpl/default.php
 create mode 100644 core/modules/mod_banners/helper.php
 create mode 100644 core/modules/mod_banners/mod_banners.php
 create mode 100644 core/modules/mod_banners/mod_banners.xml
 create mode 100644 core/modules/mod_banners/tmpl/default.php
 create mode 100644 core/modules/mod_breadcrumbs/helper.php
 create mode 100644 core/modules/mod_breadcrumbs/mod_breadcrumbs.php
 create mode 100644 core/modules/mod_breadcrumbs/mod_breadcrumbs.xml
 create mode 100644 core/modules/mod_breadcrumbs/tmpl/default.php
 create mode 100644 core/modules/mod_custom/mod_custom.php
 create mode 100644 core/modules/mod_custom/mod_custom.xml
 create mode 100644 core/modules/mod_custom/tmpl/default.php
 create mode 100644 core/modules/mod_feed/helper.php
 create mode 100644 core/modules/mod_feed/mod_feed.php
 create mode 100644 core/modules/mod_feed/mod_feed.xml
 create mode 100644 core/modules/mod_feed/tmpl/default.php
 create mode 100644 core/modules/mod_finder/helper.php
 create mode 100644 core/modules/mod_finder/mod_finder.php
 create mode 100644 core/modules/mod_finder/mod_finder.xml
 create mode 100644 core/modules/mod_finder/tmpl/default.php
 create mode 100644 core/modules/mod_footer/mod_footer.php
 create mode 100644 core/modules/mod_footer/mod_footer.xml
 create mode 100644 core/modules/mod_footer/tmpl/default.php
 create mode 100644 core/modules/mod_languages/helper.php
 create mode 100644 core/modules/mod_languages/mod_languages.php
 create mode 100644 core/modules/mod_languages/mod_languages.xml
 create mode 100644 core/modules/mod_languages/tmpl/default.php
 create mode 100644 core/modules/mod_login/helper.php
 create mode 100644 core/modules/mod_login/mod_login.php
 create mode 100644 core/modules/mod_login/mod_login.xml
 create mode 100644 core/modules/mod_login/tmpl/default.php
 create mode 100644 core/modules/mod_login/tmpl/default_logout.php
 create mode 100644 core/modules/mod_menu/helper.php
 create mode 100644 core/modules/mod_menu/mod_menu.php
 create mode 100644 core/modules/mod_menu/mod_menu.xml
 create mode 100644 core/modules/mod_menu/tmpl/default.php
 create mode 100644 core/modules/mod_menu/tmpl/default_component.php
 create mode 100644 core/modules/mod_menu/tmpl/default_heading.php
 create mode 100644 core/modules/mod_menu/tmpl/default_separator.php
 create mode 100644 core/modules/mod_menu/tmpl/default_url.php
 create mode 100644 core/modules/mod_random_image/helper.php
 create mode 100644 core/modules/mod_random_image/mod_random_image.php
 create mode 100644 core/modules/mod_random_image/mod_random_image.xml
 create mode 100644 core/modules/mod_random_image/tmpl/default.php
 create mode 100644 core/modules/mod_related_items/helper.php
 create mode 100644 core/modules/mod_related_items/mod_related_items.php
 create mode 100644 core/modules/mod_related_items/mod_related_items.xml
 create mode 100644 core/modules/mod_related_items/tmpl/default.php
 create mode 100644 core/modules/mod_search/helper.php
 create mode 100644 core/modules/mod_search/mod_search.php
 create mode 100644 core/modules/mod_search/mod_search.xml
 create mode 100644 core/modules/mod_search/tmpl/default.php
 create mode 100644 core/modules/mod_stats/helper.php
 create mode 100644 core/modules/mod_stats/mod_stats.php
 create mode 100644 core/modules/mod_stats/mod_stats.xml
 create mode 100644 core/modules/mod_stats/tmpl/default.php
 create mode 100644 core/modules/mod_syndicate/helper.php
 create mode 100644 core/modules/mod_syndicate/mod_syndicate.php
 create mode 100644 core/modules/mod_syndicate/mod_syndicate.xml
 create mode 100644 core/modules/mod_syndicate/tmpl/default.php
 create mode 100644 core/modules/mod_tags_popular/helper.php
 create mode 100644 core/modules/mod_tags_popular/mod_tags_popular.php
 create mode 100644 core/modules/mod_tags_popular/mod_tags_popular.xml
 create mode 100644 core/modules/mod_tags_popular/tmpl/cloud.php
 create mode 100644 core/modules/mod_tags_popular/tmpl/default.php
 create mode 100644 core/modules/mod_tags_similar/helper.php
 create mode 100644 core/modules/mod_tags_similar/mod_tags_similar.php
 create mode 100644 core/modules/mod_tags_similar/mod_tags_similar.xml
 create mode 100644 core/modules/mod_tags_similar/tmpl/default.php
 create mode 100644 core/modules/mod_users_latest/helper.php
 create mode 100644 core/modules/mod_users_latest/mod_users_latest.php
 create mode 100644 core/modules/mod_users_latest/mod_users_latest.xml
 create mode 100644 core/modules/mod_users_latest/tmpl/default.php
 create mode 100644 core/modules/mod_whosonline/helper.php
 create mode 100644 core/modules/mod_whosonline/mod_whosonline.php
 create mode 100644 core/modules/mod_whosonline/mod_whosonline.xml
 create mode 100644 core/modules/mod_whosonline/tmpl/default.php
 create mode 100644 core/modules/mod_wrapper/helper.php
 create mode 100644 core/modules/mod_wrapper/mod_wrapper.php
 create mode 100644 core/modules/mod_wrapper/mod_wrapper.xml
 create mode 100644 core/modules/mod_wrapper/tmpl/default.php
 create mode 100644 core/plugins/authentication/cookie/cookie.php
 create mode 100644 core/plugins/authentication/cookie/cookie.xml
 create mode 100644 core/plugins/authentication/gmail/gmail.php
 create mode 100644 core/plugins/authentication/gmail/gmail.xml
 create mode 100644 core/plugins/authentication/joomla/joomla.php
 create mode 100644 core/plugins/authentication/joomla/joomla.xml
 create mode 100644 core/plugins/authentication/ldap/ldap.php
 create mode 100644 core/plugins/authentication/ldap/ldap.xml
 create mode 100644 core/plugins/captcha/recaptcha/postinstall/actions.php
 create mode 100644 core/plugins/captcha/recaptcha/recaptcha.php
 create mode 100644 core/plugins/captcha/recaptcha/recaptcha.xml
 create mode 100644 core/plugins/captcha/recaptcha/recaptchalib.php
 create mode 100644 core/plugins/content/contact/contact.php
 create mode 100644 core/plugins/content/contact/contact.xml
 create mode 100644 core/plugins/content/emailcloak/emailcloak.php
 create mode 100644 core/plugins/content/emailcloak/emailcloak.xml
 create mode 100644 core/plugins/content/fields/fields.php
 create mode 100644 core/plugins/content/fields/fields.xml
 create mode 100644 core/plugins/content/finder/finder.php
 create mode 100644 core/plugins/content/finder/finder.xml
 create mode 100644 core/plugins/content/joomla/joomla.php
 create mode 100644 core/plugins/content/joomla/joomla.xml
 create mode 100644 core/plugins/content/loadmodule/loadmodule.php
 create mode 100644 core/plugins/content/loadmodule/loadmodule.xml
 create mode 100644 core/plugins/content/pagebreak/pagebreak.php
 create mode 100644 core/plugins/content/pagebreak/pagebreak.xml
 create mode 100644 core/plugins/content/pagenavigation/pagenavigation.php
 create mode 100644 core/plugins/content/pagenavigation/pagenavigation.xml
 create mode 100644 core/plugins/content/pagenavigation/tmpl/default.php
 create mode 100644 core/plugins/content/vote/tmpl/rating.php
 create mode 100644 core/plugins/content/vote/tmpl/vote.php
 create mode 100644 core/plugins/content/vote/vote.php
 create mode 100644 core/plugins/content/vote/vote.xml
 create mode 100644 core/plugins/editors-xtd/article/article.php
 create mode 100644 core/plugins/editors-xtd/article/article.xml
 create mode 100644 core/plugins/editors-xtd/contact/contact.php
 create mode 100644 core/plugins/editors-xtd/contact/contact.xml
 create mode 100644 core/plugins/editors-xtd/fields/fields.php
 create mode 100644 core/plugins/editors-xtd/fields/fields.xml
 create mode 100644 core/plugins/editors-xtd/image/image.php
 create mode 100644 core/plugins/editors-xtd/image/image.xml
 create mode 100644 core/plugins/editors-xtd/menu/menu.php
 create mode 100644 core/plugins/editors-xtd/menu/menu.xml
 create mode 100644 core/plugins/editors-xtd/module/module.php
 create mode 100644 core/plugins/editors-xtd/module/module.xml
 create mode 100644 core/plugins/editors-xtd/pagebreak/pagebreak.php
 create mode 100644 core/plugins/editors-xtd/pagebreak/pagebreak.xml
 create mode 100644 core/plugins/editors-xtd/readmore/readmore.php
 create mode 100644 core/plugins/editors-xtd/readmore/readmore.xml
 create mode 100644 core/plugins/editors/codemirror/codemirror.php
 create mode 100644 core/plugins/editors/codemirror/codemirror.xml
 create mode 100644 core/plugins/editors/codemirror/fonts.json
 create mode 100644 core/plugins/editors/codemirror/fonts.php
 create mode 100644 core/plugins/editors/codemirror/layouts/editors/codemirror/element.php
 create mode 100644 core/plugins/editors/codemirror/layouts/editors/codemirror/init.php
 create mode 100644 core/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
 create mode 100644 core/plugins/editors/none/none.php
 create mode 100644 core/plugins/editors/none/none.xml
 create mode 100644 core/plugins/editors/tinymce/field/skins.php
 create mode 100644 core/plugins/editors/tinymce/field/tinymcebuilder.php
 create mode 100644 core/plugins/editors/tinymce/field/uploaddirs.php
 create mode 100644 core/plugins/editors/tinymce/form/setoptions.xml
 create mode 100644 core/plugins/editors/tinymce/tinymce.php
 create mode 100644 core/plugins/editors/tinymce/tinymce.xml
 create mode 100644 core/plugins/extension/joomla/joomla.php
 create mode 100644 core/plugins/extension/joomla/joomla.xml
 create mode 100644 core/plugins/fields/calendar/calendar.php
 create mode 100644 core/plugins/fields/calendar/calendar.xml
 create mode 100644 core/plugins/fields/calendar/params/calendar.xml
 create mode 100644 core/plugins/fields/calendar/tmpl/calendar.php
 create mode 100644 core/plugins/fields/checkboxes/checkboxes.php
 create mode 100644 core/plugins/fields/checkboxes/checkboxes.xml
 create mode 100644 core/plugins/fields/checkboxes/params/checkboxes.xml
 create mode 100644 core/plugins/fields/checkboxes/tmpl/checkboxes.php
 create mode 100644 core/plugins/fields/color/color.php
 create mode 100644 core/plugins/fields/color/color.xml
 create mode 100644 core/plugins/fields/color/tmpl/color.php
 create mode 100644 core/plugins/fields/editor/editor.php
 create mode 100644 core/plugins/fields/editor/editor.xml
 create mode 100644 core/plugins/fields/editor/params/editor.xml
 create mode 100644 core/plugins/fields/editor/tmpl/editor.php
 create mode 100644 core/plugins/fields/imagelist/imagelist.php
 create mode 100644 core/plugins/fields/imagelist/imagelist.xml
 create mode 100644 core/plugins/fields/imagelist/params/imagelist.xml
 create mode 100644 core/plugins/fields/imagelist/tmpl/imagelist.php
 create mode 100644 core/plugins/fields/integer/integer.php
 create mode 100644 core/plugins/fields/integer/integer.xml
 create mode 100644 core/plugins/fields/integer/params/integer.xml
 create mode 100644 core/plugins/fields/integer/tmpl/integer.php
 create mode 100644 core/plugins/fields/list/list.php
 create mode 100644 core/plugins/fields/list/list.xml
 create mode 100644 core/plugins/fields/list/params/list.xml
 create mode 100644 core/plugins/fields/list/tmpl/list.php
 create mode 100644 core/plugins/fields/media/media.php
 create mode 100644 core/plugins/fields/media/media.xml
 create mode 100644 core/plugins/fields/media/params/media.xml
 create mode 100644 core/plugins/fields/media/tmpl/media.php
 create mode 100644 core/plugins/fields/radio/params/radio.xml
 create mode 100644 core/plugins/fields/radio/radio.php
 create mode 100644 core/plugins/fields/radio/radio.xml
 create mode 100644 core/plugins/fields/radio/tmpl/radio.php
 create mode 100644 core/plugins/fields/sql/params/sql.xml
 create mode 100644 core/plugins/fields/sql/sql.php
 create mode 100644 core/plugins/fields/sql/sql.xml
 create mode 100644 core/plugins/fields/sql/tmpl/sql.php
 create mode 100644 core/plugins/fields/text/params/text.xml
 create mode 100644 core/plugins/fields/text/text.php
 create mode 100644 core/plugins/fields/text/text.xml
 create mode 100644 core/plugins/fields/text/tmpl/text.php
 create mode 100644 core/plugins/fields/textarea/params/textarea.xml
 create mode 100644 core/plugins/fields/textarea/textarea.php
 create mode 100644 core/plugins/fields/textarea/textarea.xml
 create mode 100644 core/plugins/fields/textarea/tmpl/textarea.php
 create mode 100644 core/plugins/fields/url/params/url.xml
 create mode 100644 core/plugins/fields/url/tmpl/url.php
 create mode 100644 core/plugins/fields/url/url.php
 create mode 100644 core/plugins/fields/url/url.xml
 create mode 100644 core/plugins/fields/user/params/user.xml
 create mode 100644 core/plugins/fields/user/tmpl/user.php
 create mode 100644 core/plugins/fields/user/user.php
 create mode 100644 core/plugins/fields/user/user.xml
 create mode 100644 core/plugins/fields/usergrouplist/params/usergrouplist.xml
 create mode 100644 core/plugins/fields/usergrouplist/tmpl/usergrouplist.php
 create mode 100644 core/plugins/fields/usergrouplist/usergrouplist.php
 create mode 100644 core/plugins/fields/usergrouplist/usergrouplist.xml
 create mode 100644 core/plugins/finder/categories/categories.php
 create mode 100644 core/plugins/finder/categories/categories.xml
 create mode 100644 core/plugins/finder/contacts/contacts.php
 create mode 100644 core/plugins/finder/contacts/contacts.xml
 create mode 100644 core/plugins/finder/content/content.php
 create mode 100644 core/plugins/finder/content/content.xml
 create mode 100644 core/plugins/finder/newsfeeds/newsfeeds.php
 create mode 100644 core/plugins/finder/newsfeeds/newsfeeds.xml
 create mode 100644 core/plugins/finder/tags/tags.php
 create mode 100644 core/plugins/finder/tags/tags.xml
 create mode 100644 core/plugins/index.html
 create mode 100644 core/plugins/installer/folderinstaller/folderinstaller.php
 create mode 100644 core/plugins/installer/folderinstaller/folderinstaller.xml
 create mode 100644 core/plugins/installer/folderinstaller/tmpl/default.php
 create mode 100644 core/plugins/installer/packageinstaller/packageinstaller.php
 create mode 100644 core/plugins/installer/packageinstaller/packageinstaller.xml
 create mode 100644 core/plugins/installer/packageinstaller/tmpl/default.php
 create mode 100644 core/plugins/installer/urlinstaller/tmpl/default.php
 create mode 100644 core/plugins/installer/urlinstaller/urlinstaller.php
 create mode 100644 core/plugins/installer/urlinstaller/urlinstaller.xml
 create mode 100644 core/plugins/quickicon/extensionupdate/extensionupdate.php
 create mode 100644 core/plugins/quickicon/extensionupdate/extensionupdate.xml
 create mode 100644 core/plugins/quickicon/joomlaupdate/joomlaupdate.php
 create mode 100644 core/plugins/quickicon/joomlaupdate/joomlaupdate.xml
 create mode 100644 core/plugins/quickicon/phpversioncheck/phpversioncheck.php
 create mode 100644 core/plugins/quickicon/phpversioncheck/phpversioncheck.xml
 create mode 100644 core/plugins/sampledata/blog/blog.php
 create mode 100644 core/plugins/sampledata/blog/blog.xml
 create mode 100644 core/plugins/search/categories/categories.php
 create mode 100644 core/plugins/search/categories/categories.xml
 create mode 100644 core/plugins/search/contacts/contacts.php
 create mode 100644 core/plugins/search/contacts/contacts.xml
 create mode 100644 core/plugins/search/content/content.php
 create mode 100644 core/plugins/search/content/content.xml
 create mode 100644 core/plugins/search/newsfeeds/newsfeeds.php
 create mode 100644 core/plugins/search/newsfeeds/newsfeeds.xml
 create mode 100644 core/plugins/search/tags/tags.php
 create mode 100644 core/plugins/search/tags/tags.xml
 create mode 100644 core/plugins/system/cache/cache.php
 create mode 100644 core/plugins/system/cache/cache.xml
 create mode 100644 core/plugins/system/debug/debug.php
 create mode 100644 core/plugins/system/debug/debug.xml
 create mode 100644 core/plugins/system/fields/fields.php
 create mode 100644 core/plugins/system/fields/fields.xml
 create mode 100644 core/plugins/system/highlight/highlight.php
 create mode 100644 core/plugins/system/highlight/highlight.xml
 create mode 100644 core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
 create mode 100644 core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
 create mode 100644 core/plugins/system/languagecode/languagecode.php
 create mode 100644 core/plugins/system/languagecode/languagecode.xml
 create mode 100644 core/plugins/system/languagefilter/languagefilter.php
 create mode 100644 core/plugins/system/languagefilter/languagefilter.xml
 create mode 100644 core/plugins/system/log/log.php
 create mode 100644 core/plugins/system/log/log.xml
 create mode 100644 core/plugins/system/logout/logout.php
 create mode 100644 core/plugins/system/logout/logout.xml
 create mode 100644 core/plugins/system/p3p/p3p.php
 create mode 100644 core/plugins/system/p3p/p3p.xml
 create mode 100644 core/plugins/system/redirect/form/excludes.xml
 create mode 100644 core/plugins/system/redirect/redirect.php
 create mode 100644 core/plugins/system/redirect/redirect.xml
 create mode 100644 core/plugins/system/remember/remember.php
 create mode 100644 core/plugins/system/remember/remember.xml
 create mode 100644 core/plugins/system/sef/sef.php
 create mode 100644 core/plugins/system/sef/sef.xml
 create mode 100644 core/plugins/system/sessiongc/sessiongc.php
 create mode 100644 core/plugins/system/sessiongc/sessiongc.xml
 create mode 100644 core/plugins/system/stats/field/base.php
 create mode 100644 core/plugins/system/stats/field/data.php
 create mode 100644 core/plugins/system/stats/field/uniqueid.php
 create mode 100644 core/plugins/system/stats/layouts/field/data.php
 create mode 100644 core/plugins/system/stats/layouts/field/uniqueid.php
 create mode 100644 core/plugins/system/stats/layouts/message.php
 create mode 100644 core/plugins/system/stats/layouts/stats.php
 create mode 100644 core/plugins/system/stats/stats.php
 create mode 100644 core/plugins/system/stats/stats.xml
 create mode 100644 core/plugins/system/updatenotification/postinstall/updatecachetime.php
 create mode 100644 core/plugins/system/updatenotification/updatenotification.php
 create mode 100644 core/plugins/system/updatenotification/updatenotification.xml
 create mode 100644 core/plugins/twofactorauth/totp/postinstall/actions.php
 create mode 100644 core/plugins/twofactorauth/totp/tmpl/form.php
 create mode 100644 core/plugins/twofactorauth/totp/totp.php
 create mode 100644 core/plugins/twofactorauth/totp/totp.xml
 create mode 100644 core/plugins/twofactorauth/yubikey/tmpl/form.php
 create mode 100644 core/plugins/twofactorauth/yubikey/yubikey.php
 create mode 100644 core/plugins/twofactorauth/yubikey/yubikey.xml
 create mode 100644 core/plugins/user/contactcreator/contactcreator.php
 create mode 100644 core/plugins/user/contactcreator/contactcreator.xml
 create mode 100644 core/plugins/user/joomla/joomla.php
 create mode 100644 core/plugins/user/joomla/joomla.xml
 create mode 100644 core/plugins/user/profile/field/dob.php
 create mode 100644 core/plugins/user/profile/field/tos.php
 create mode 100644 core/plugins/user/profile/profile.php
 create mode 100644 core/plugins/user/profile/profile.xml
 create mode 100644 core/plugins/user/profile/profiles/profile.xml
 create mode 100644 core/robots.txt.dist
 create mode 100644 core/templates/beez3/component.php
 create mode 100644 core/templates/beez3/css/general.css
 create mode 100644 core/templates/beez3/css/ie7only.css
 create mode 100644 core/templates/beez3/css/ieonly.css
 create mode 100644 core/templates/beez3/css/layout.css
 create mode 100644 core/templates/beez3/css/nature.css
 create mode 100644 core/templates/beez3/css/nature_rtl.css
 create mode 100644 core/templates/beez3/css/personal.css
 create mode 100644 core/templates/beez3/css/personal_rtl.css
 create mode 100644 core/templates/beez3/css/position.css
 create mode 100644 core/templates/beez3/css/print.css
 create mode 100644 core/templates/beez3/css/red.css
 create mode 100644 core/templates/beez3/css/template.css
 create mode 100644 core/templates/beez3/css/template_rtl.css
 create mode 100644 core/templates/beez3/css/turq.css
 create mode 100644 core/templates/beez3/css/turq.less
 create mode 100644 core/templates/beez3/error.php
 create mode 100644 core/templates/beez3/favicon.ico
 create mode 100644 core/templates/beez3/html/com_contact/categories/default.php
 create mode 100644 core/templates/beez3/html/com_contact/categories/default_items.php
 create mode 100644 core/templates/beez3/html/com_contact/category/default.php
 create mode 100644 core/templates/beez3/html/com_contact/category/default_children.php
 create mode 100644 core/templates/beez3/html/com_contact/category/default_items.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default_address.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default_articles.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default_form.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default_links.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default_profile.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
 create mode 100644 core/templates/beez3/html/com_contact/contact/encyclopedia.php
 create mode 100644 core/templates/beez3/html/com_content/archive/default.php
 create mode 100644 core/templates/beez3/html/com_content/archive/default_items.php
 create mode 100644 core/templates/beez3/html/com_content/article/default.php
 create mode 100644 core/templates/beez3/html/com_content/article/default_links.php
 create mode 100644 core/templates/beez3/html/com_content/categories/default.php
 create mode 100644 core/templates/beez3/html/com_content/categories/default_items.php
 create mode 100644 core/templates/beez3/html/com_content/category/blog.php
 create mode 100644 core/templates/beez3/html/com_content/category/blog_children.php
 create mode 100644 core/templates/beez3/html/com_content/category/blog_item.php
 create mode 100644 core/templates/beez3/html/com_content/category/blog_links.php
 create mode 100644 core/templates/beez3/html/com_content/category/default.php
 create mode 100644 core/templates/beez3/html/com_content/category/default_articles.php
 create mode 100644 core/templates/beez3/html/com_content/category/default_children.php
 create mode 100644 core/templates/beez3/html/com_content/featured/default.php
 create mode 100644 core/templates/beez3/html/com_content/featured/default_item.php
 create mode 100644 core/templates/beez3/html/com_content/featured/default_links.php
 create mode 100644 core/templates/beez3/html/com_content/form/edit.php
 create mode 100644 core/templates/beez3/html/com_newsfeeds/categories/default.php
 create mode 100644 core/templates/beez3/html/com_newsfeeds/categories/default_items.php
 create mode 100644 core/templates/beez3/html/com_newsfeeds/category/default.php
 create mode 100644 core/templates/beez3/html/com_newsfeeds/category/default_children.php
 create mode 100644 core/templates/beez3/html/com_newsfeeds/category/default_items.php
 create mode 100644 core/templates/beez3/html/com_weblinks/categories/default.php
 create mode 100644 core/templates/beez3/html/com_weblinks/categories/default_items.php
 create mode 100644 core/templates/beez3/html/com_weblinks/category/default.php
 create mode 100644 core/templates/beez3/html/com_weblinks/category/default_children.php
 create mode 100644 core/templates/beez3/html/com_weblinks/category/default_items.php
 create mode 100644 core/templates/beez3/html/com_weblinks/form/edit.php
 create mode 100644 core/templates/beez3/html/layouts/joomla/system/message.php
 create mode 100644 core/templates/beez3/html/mod_breadcrumbs/default.php
 create mode 100644 core/templates/beez3/html/mod_languages/default.php
 create mode 100644 core/templates/beez3/html/mod_login/default.php
 create mode 100644 core/templates/beez3/html/mod_login/default_logout.php
 create mode 100644 core/templates/beez3/html/modules.php
 create mode 100644 core/templates/beez3/images/all_bg.gif
 create mode 100644 core/templates/beez3/images/arrow.png
 create mode 100644 core/templates/beez3/images/arrow2_grey.png
 create mode 100644 core/templates/beez3/images/arrow_white_grey.png
 create mode 100644 core/templates/beez3/images/blog_more.gif
 create mode 100644 core/templates/beez3/images/blog_more_hover.gif
 create mode 100644 core/templates/beez3/images/close.png
 create mode 100644 core/templates/beez3/images/content_bg.gif
 create mode 100644 core/templates/beez3/images/footer_bg.gif
 create mode 100644 core/templates/beez3/images/footer_bg.png
 create mode 100644 core/templates/beez3/images/header-bg.gif
 create mode 100644 core/templates/beez3/images/minus.png
 create mode 100644 core/templates/beez3/images/nature/arrow1.gif
 create mode 100644 core/templates/beez3/images/nature/arrow1_rtl.gif
 create mode 100644 core/templates/beez3/images/nature/arrow2.gif
 create mode 100644 core/templates/beez3/images/nature/arrow2_grey.png
 create mode 100644 core/templates/beez3/images/nature/arrow2_rtl.gif
 create mode 100644 core/templates/beez3/images/nature/arrow_nav.gif
 create mode 100644 core/templates/beez3/images/nature/arrow_small.png
 create mode 100644 core/templates/beez3/images/nature/arrow_small_rtl.png
 create mode 100644 core/templates/beez3/images/nature/blog_more.gif
 create mode 100644 core/templates/beez3/images/nature/box.png
 create mode 100644 core/templates/beez3/images/nature/box1.png
 create mode 100644 core/templates/beez3/images/nature/grey_bg.png
 create mode 100644 core/templates/beez3/images/nature/headingback.png
 create mode 100644 core/templates/beez3/images/nature/karo.gif
 create mode 100644 core/templates/beez3/images/nature/level4.png
 create mode 100644 core/templates/beez3/images/nature/nav_level1_a.gif
 create mode 100644 core/templates/beez3/images/nature/nav_level_1.gif
 create mode 100644 core/templates/beez3/images/nature/pfeil.gif
 create mode 100644 core/templates/beez3/images/nature/readmore_arrow.png
 create mode 100644 core/templates/beez3/images/nature/searchbutton.png
 create mode 100644 core/templates/beez3/images/nature/tabs.gif
 create mode 100644 core/templates/beez3/images/nav_level_1.gif
 create mode 100644 core/templates/beez3/images/news.gif
 create mode 100644 core/templates/beez3/images/personal/arrow2_grey.jpg
 create mode 100644 core/templates/beez3/images/personal/arrow2_grey.png
 create mode 100644 core/templates/beez3/images/personal/bg2.png
 create mode 100644 core/templates/beez3/images/personal/button.png
 create mode 100644 core/templates/beez3/images/personal/dot.png
 create mode 100644 core/templates/beez3/images/personal/ecke.gif
 create mode 100644 core/templates/beez3/images/personal/footer.jpg
 create mode 100644 core/templates/beez3/images/personal/grey_bg.png
 create mode 100644 core/templates/beez3/images/personal/navi_active.png
 create mode 100644 core/templates/beez3/images/personal/personal2.png
 create mode 100644 core/templates/beez3/images/personal/readmore_arrow.png
 create mode 100644 core/templates/beez3/images/personal/readmore_arrow_hover.png
 create mode 100644 core/templates/beez3/images/personal/tabs_back.png
 create mode 100644 core/templates/beez3/images/plus.png
 create mode 100644 core/templates/beez3/images/req.png
 create mode 100644 core/templates/beez3/images/slider_minus.png
 create mode 100644 core/templates/beez3/images/slider_minus_rtl.png
 create mode 100644 core/templates/beez3/images/slider_plus.png
 create mode 100644 core/templates/beez3/images/slider_plus_rtl.png
 create mode 100644 core/templates/beez3/images/system/arrow.png
 create mode 100644 core/templates/beez3/images/system/arrow_rtl.png
 create mode 100644 core/templates/beez3/images/system/calendar.png
 create mode 100644 core/templates/beez3/images/system/j_button2_blank.png
 create mode 100644 core/templates/beez3/images/system/j_button2_image.png
 create mode 100644 core/templates/beez3/images/system/j_button2_left.png
 create mode 100644 core/templates/beez3/images/system/j_button2_pagebreak.png
 create mode 100644 core/templates/beez3/images/system/j_button2_readmore.png
 create mode 100644 core/templates/beez3/images/system/notice-alert.png
 create mode 100644 core/templates/beez3/images/system/notice-alert_rtl.png
 create mode 100644 core/templates/beez3/images/system/notice-info.png
 create mode 100644 core/templates/beez3/images/system/notice-info_rtl.png
 create mode 100644 core/templates/beez3/images/system/notice-note.png
 create mode 100644 core/templates/beez3/images/system/notice-note_rtl.png
 create mode 100644 core/templates/beez3/images/system/selector-arrow.png
 create mode 100644 core/templates/beez3/images/table_footer.gif
 create mode 100644 core/templates/beez3/images/trans.gif
 create mode 100644 core/templates/beez3/index.php
 create mode 100644 core/templates/beez3/javascript/hide.js
 create mode 100644 core/templates/beez3/javascript/md_stylechanger.js
 create mode 100644 core/templates/beez3/javascript/respond.js
 create mode 100644 core/templates/beez3/javascript/respond.src.js
 create mode 100644 core/templates/beez3/javascript/template.js
 create mode 100644 core/templates/beez3/jsstrings.php
 create mode 100644 core/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini
 create mode 100644 core/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini
 create mode 100644 core/templates/beez3/templateDetails.xml
 create mode 100644 core/templates/beez3/template_preview.png
 create mode 100644 core/templates/beez3/template_thumbnail.png
 create mode 100644 core/templates/index.html
 create mode 100644 core/templates/protostar/component.php
 create mode 100644 core/templates/protostar/css/offline.css
 create mode 100644 core/templates/protostar/css/template.css
 create mode 100644 core/templates/protostar/error.php
 create mode 100644 core/templates/protostar/favicon.ico
 create mode 100644 core/templates/protostar/html/com_media/imageslist/default_folder.php
 create mode 100644 core/templates/protostar/html/com_media/imageslist/default_image.php
 create mode 100644 core/templates/protostar/html/layouts/joomla/form/field/contenthistory.php
 create mode 100644 core/templates/protostar/html/layouts/joomla/form/field/media.php
 create mode 100644 core/templates/protostar/html/layouts/joomla/form/field/user.php
 create mode 100644 core/templates/protostar/html/layouts/joomla/system/message.php
 create mode 100644 core/templates/protostar/html/modules.php
 create mode 100644 core/templates/protostar/html/pagination.php
 create mode 100644 core/templates/protostar/images/logo.png
 create mode 100644 core/templates/protostar/images/system/rating_star.png
 create mode 100644 core/templates/protostar/images/system/rating_star_blank.png
 create mode 100644 core/templates/protostar/images/system/sort_asc.png
 create mode 100644 core/templates/protostar/images/system/sort_desc.png
 create mode 100644 core/templates/protostar/img/glyphicons-halflings-white.png
 create mode 100644 core/templates/protostar/img/glyphicons-halflings.png
 create mode 100644 core/templates/protostar/index.php
 create mode 100644 core/templates/protostar/js/application.js
 create mode 100644 core/templates/protostar/js/classes.js
 create mode 100644 core/templates/protostar/js/template.js
 create mode 100644 core/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
 create mode 100644 core/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
 create mode 100644 core/templates/protostar/less/icomoon.less
 create mode 100644 core/templates/protostar/less/template.less
 create mode 100644 core/templates/protostar/less/template_rtl.less
 create mode 100644 core/templates/protostar/less/variables.less
 create mode 100644 core/templates/protostar/offline.php
 create mode 100644 core/templates/protostar/templateDetails.xml
 create mode 100644 core/templates/protostar/template_preview.png
 create mode 100644 core/templates/protostar/template_thumbnail.png
 create mode 100644 core/templates/system/component.php
 create mode 100644 core/templates/system/css/editor.css
 create mode 100644 core/templates/system/css/error.css
 create mode 100644 core/templates/system/css/error_rtl.css
 create mode 100644 core/templates/system/css/general.css
 create mode 100644 core/templates/system/css/offline.css
 create mode 100644 core/templates/system/css/offline_rtl.css
 create mode 100644 core/templates/system/css/system.css
 create mode 100644 core/templates/system/css/toolbar.css
 create mode 100644 core/templates/system/error.php
 create mode 100644 core/templates/system/html/modules.php
 create mode 100644 core/templates/system/images/calendar.png
 create mode 100644 core/templates/system/images/j_button2_blank.png
 create mode 100644 core/templates/system/images/j_button2_image.png
 create mode 100644 core/templates/system/images/j_button2_left.png
 create mode 100644 core/templates/system/images/j_button2_pagebreak.png
 create mode 100644 core/templates/system/images/j_button2_readmore.png
 create mode 100644 core/templates/system/images/j_button2_right.png
 create mode 100644 core/templates/system/images/selector-arrow.png
 create mode 100644 core/templates/system/index.php
 create mode 100644 core/templates/system/offline.php
 create mode 100644 core/tmp/index.html
 create mode 100644 core/web.config.txt

diff --git a/core/LICENSE.txt b/core/LICENSE.txt
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/core/LICENSE.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/core/README.txt b/core/README.txt
new file mode 100644
index 00000000..6d93aedc
--- /dev/null
+++ b/core/README.txt
@@ -0,0 +1,72 @@
+1- What is this?
+	* This is a Joomla! installation/upgrade package to version 3.x
+	* Joomla! Official site: https://www.joomla.org
+	* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging
+
+2- What is Joomla?
+	* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
+	* It's a free and Open Source software, distributed under the GNU General Public License version 2 or later.
+	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run.
+	You can find full technical requirements here: https://downloads.joomla.org/technical-requirements.
+
+3- Is Joomla! for you?
+	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Special:MyLanguage/Portal:Learn_More
+	* See Joomla's core features - https://www.joomla.org/core-features.html
+	* Try out our online demo: https://demo.joomla.org
+
+4- How to find a Joomla! translation?
+	* Repository of accredited language packs: https://community.joomla.org/translations.html
+	* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/Special:MyLanguage/J3.x:Setup_a_Multilingual_Site/Installing_New_Language
+	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J3.x:Setup_a_Multilingual_Site
+
+5- Learn Joomla!
+	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J3.x:Getting_Started_with_Joomla!
+	* Before installing, read the beginners guide: https://docs.joomla.org/Special:MyLanguage/Portal:Beginners
+
+6- What are the benefits of Joomla?
+	* The functionality of a Joomla! website can be extended by installing extensions that you can create (or download) to suit your needs.
+	* There are many ready-made extensions that you can download and install.
+	* Check out the Joomla! Extensions Directory (JED): https://extensions.joomla.org
+
+7- Is it easy to change the layout display?
+	* The layout is controlled by templates that you can edit.
+	* There are a lot of ready-made professional templates that you can download.
+	* Check out the template management information: https://docs.joomla.org/Special:MyLanguage/Portal:Template_Management
+
+8- Ready to install Joomla?
+	* Check the minimum requirements here: https://downloads.joomla.org/technical-requirements
+	* How do you install Joomla - https://docs.joomla.org/Special:MyLanguage/J3.x:Installing_Joomla
+	* You could start your Joomla! experience building your site on a local test server.
+	When ready it can be moved to an online hosting account of your choice.
+	See the tutorial: https://docs.joomla.org/Special:MyLanguage/Installing_Joomla_locally
+
+9- Updates are free!
+	* Always use the latest version: https://downloads.joomla.org/latest
+
+10- Where can you get support and help?
+	* The Joomla! Documentation: https://docs.joomla.org/Special:MyLanguage/Main_Page
+	* FAQ Frequently Asked Questions: https://docs.joomla.org/Special:MyLanguage/Category:FAQ
+	* Find the information you need: https://docs.joomla.org/Special:MyLanguage/Start_here
+	* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
+	* Post questions at our forums: https://forum.joomla.org
+	* Joomla! Resources Directory (JRD): https://resources.joomla.org/
+
+11- Do you already have a Joomla! site that's not built with Joomla! 3.x ?
+	* What's new in Joomla! 3.x: https://www.joomla.org/3
+	* What are the main differences from 2.5 to 3? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F
+	* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration
+	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_1.5_to_3.x_Step_by_Step_Migration
+
+12- Do you want to improve Joomla?
+	* Where to request a feature? https://issues.joomla.org
+	* How do you report a bug? https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues
+	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org
+	* Documentation for Developers: https://docs.joomla.org/Special:MyLanguage/Portal:Developers
+	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
+
+Copyright:
+	* Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+	* Special Thanks: https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks
+	* Distributed under the GNU General Public License version 2 or later
+	* See Licenses details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
diff --git a/core/administrator/cache/index.html b/core/administrator/cache/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/administrator/cache/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/administrator/components/com_admin/admin.php b/core/administrator/components/com_admin/admin.php
new file mode 100644
index 00000000..3e0986cd
--- /dev/null
+++ b/core/administrator/components/com_admin/admin.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+// No access check.
+
+$controller = JControllerLegacy::getInstance('Admin');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_admin/admin.xml b/core/administrator/components/com_admin/admin.xml
new file mode 100644
index 00000000..aeeaea25
--- /dev/null
+++ b/core/administrator/components/com_admin/admin.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_admin</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_ADMIN_XML_DESCRIPTION</description>
+	<media />
+	<administration>
+		<files folder="admin">
+			<filename>admin.php</filename>
+			<filename>controller.php</filename>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_admin.ini</language>
+			<language tag="en-GB">language/en-GB.com_admin.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_admin/controller.php b/core/administrator/components/com_admin/controller.php
new file mode 100644
index 00000000..305dbc4f
--- /dev/null
+++ b/core/administrator/components/com_admin/controller.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Admin Controller
+ *
+ * @since  1.6
+ */
+class AdminController extends JControllerLegacy
+{
+}
diff --git a/core/administrator/components/com_admin/controllers/profile.php b/core/administrator/components/com_admin/controllers/profile.php
new file mode 100644
index 00000000..9b213ca2
--- /dev/null
+++ b/core/administrator/components/com_admin/controllers/profile.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User profile controller class.
+ *
+ * @since  1.6
+ */
+class AdminControllerProfile extends JControllerForm
+{
+	/**
+	 * Method to check if you can edit a record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		return isset($data['id']) && $data['id'] == JFactory::getUser()->id;
+	}
+
+	/**
+	 * Overrides parent save method to check the submitted passwords match.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		$this->setRedirect(JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id=' . JFactory::getUser()->id, false));
+
+		$return = parent::save();
+
+		if ($this->getTask() != 'apply')
+		{
+			// Redirect to the main page.
+			$this->setRedirect(JRoute::_('index.php', false));
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = null)
+	{
+		$return = parent::cancel($key);
+
+		// Redirect to the main page.
+		$this->setRedirect(JRoute::_('index.php', false));
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_admin/helpers/html/directory.php b/core/administrator/components/com_admin/helpers/html/directory.php
new file mode 100644
index 00000000..17a97736
--- /dev/null
+++ b/core/administrator/components/com_admin/helpers/html/directory.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Utility class working with directory
+ *
+ * @since  1.6
+ */
+abstract class JHtmlDirectory
+{
+	/**
+	 * Method to generate a (un)writable message for directory
+	 *
+	 * @param   boolean  $writable  is the directory writable?
+	 *
+	 * @return  string	html code
+	 */
+	public static function writable($writable)
+	{
+		if ($writable)
+		{
+			return '<span class="badge badge-success">' . JText::_('COM_ADMIN_WRITABLE') . '</span>';
+		}
+
+		return '<span class="badge badge-important">' . JText::_('COM_ADMIN_UNWRITABLE') . '</span>';
+	}
+
+	/**
+	 * Method to generate a message for a directory
+	 *
+	 * @param   string   $dir      the directory
+	 * @param   boolean  $message  the message
+	 * @param   boolean  $visible  is the $dir visible?
+	 *
+	 * @return  string	html code
+	 */
+	public static function message($dir, $message, $visible = true)
+	{
+		$output = $visible ? $dir : '';
+
+		if (empty($message))
+		{
+			return $output;
+		}
+
+		return $output . ' <strong>' . JText::_($message) . '</strong>';
+	}
+}
diff --git a/core/administrator/components/com_admin/helpers/html/phpsetting.php b/core/administrator/components/com_admin/helpers/html/phpsetting.php
new file mode 100644
index 00000000..d84f3cb9
--- /dev/null
+++ b/core/administrator/components/com_admin/helpers/html/phpsetting.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Utility class working with phpsetting
+ *
+ * @since  1.6
+ */
+abstract class JHtmlPhpSetting
+{
+	/**
+	 * Method to generate a boolean message for a value
+	 *
+	 * @param   boolean  $val  is the value set?
+	 *
+	 * @return  string html code
+	 */
+	public static function boolean($val)
+	{
+		return JText::_($val ? 'JON' : 'JOFF');
+	}
+
+	/**
+	 * Method to generate a boolean message for a value
+	 *
+	 * @param   boolean  $val  is the value set?
+	 *
+	 * @return  string html code
+	 */
+	public static function set($val)
+	{
+		return JText::_($val ? 'JYES' : 'JNO');
+	}
+
+	/**
+	 * Method to generate a string message for a value
+	 *
+	 * @param   string  $val  a php ini value
+	 *
+	 * @return  string html code
+	 */
+	public static function string($val)
+	{
+		return !empty($val) ? $val : JText::_('JNONE');
+	}
+
+	/**
+	 * Method to generate an integer from a value
+	 *
+	 * @param   string  $val  a php ini value
+	 *
+	 * @return  string html code
+	 *
+	 * @deprecated  4.0  Use intval() or casting instead.
+	 */
+	public static function integer($val)
+	{
+		try
+		{
+			JLog::add(sprintf('%s() is deprecated. Use intval() or casting instead.', __METHOD__), JLog::WARNING, 'deprecated');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return (int) $val;
+	}
+}
diff --git a/core/administrator/components/com_admin/helpers/html/system.php b/core/administrator/components/com_admin/helpers/html/system.php
new file mode 100644
index 00000000..cd17d6eb
--- /dev/null
+++ b/core/administrator/components/com_admin/helpers/html/system.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Utility class working with system
+ *
+ * @since  1.6
+ */
+abstract class JHtmlSystem
+{
+	/**
+	 * Method to generate a string message for a value
+	 *
+	 * @param   string  $val  a php ini value
+	 *
+	 * @return  string html code
+	 */
+	public static function server($val)
+	{
+		return !empty($val) ? $val : JText::_('COM_ADMIN_NA');
+	}
+}
diff --git a/core/administrator/components/com_admin/models/forms/profile.xml b/core/administrator/components/com_admin/models/forms/profile.xml
new file mode 100644
index 00000000..35f6fbd8
--- /dev/null
+++ b/core/administrator/components/com_admin/models/forms/profile.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="user_details">
+		<field 
+			name="name" 
+			type="text"
+			label="COM_ADMIN_USER_HEADING_NAME"
+			description="COM_ADMIN_USER_FIELD_NAME_DESC"
+			required="true"
+			size="30"
+		/>
+
+		<field 
+			name="username" 
+			type="text"
+			label="COM_ADMIN_USER_FIELD_USERNAME_LABEL"
+			description="COM_ADMIN_USER_FIELD_USERNAME_DESC"
+			required="true"
+			size="30"
+		/>
+
+		<field 
+			name="password2" 
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			description="COM_ADMIN_USER_FIELD_PASSWORD_DESC"
+			autocomplete="off"
+			class="validate-password"
+			field="password"
+			filter="raw"
+			message="COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE"
+			size="30"
+			validate="equals"
+		/>
+
+		<field 
+			name="password" 
+			type="password"
+			label="COM_ADMIN_USER_FIELD_PASSWORD2_LABEL"
+			description="COM_ADMIN_USER_FIELD_PASSWORD2_DESC"
+			autocomplete="off"
+			class="validate-password"
+			filter="raw"
+			size="30"
+			validate="password"
+		/>
+
+		<field 
+			name="email" 
+			type="email"
+			label="JGLOBAL_EMAIL"
+			description="COM_ADMIN_USER_FIELD_EMAIL_DESC"
+			class="validate-email"
+			required="true"
+			size="30"
+			validate="email"
+		/>
+
+		<field
+			name="registerDate"
+			type="calendar"
+			label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL"
+			description="COM_ADMIN_USER_FIELD_REGISTERDATE_DESC"
+			class="readonly"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="lastvisitDate"
+			type="calendar"
+			label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL"
+			description="COM_ADMIN_USER_FIELD_LASTVISIT_DESC"
+			class="readonly"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			default="0"
+			readonly="true"
+			filter="unset"
+		/>
+
+	</fieldset>
+
+	<fields name="params">
+
+		<!--  Basic user account settings. -->
+		<fieldset name="settings" label="COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL">
+
+			<field 
+				name="admin_style" 
+				type="templatestyle"
+				label="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL"
+				description="COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				filter="uint"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="admin_language" 
+				type="language"
+				label="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL"
+				description="COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="language"
+				type="language"
+				label="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
+				description="COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="editor" 
+				type="plugins" 
+				label="COM_ADMIN_USER_FIELD_EDITOR_LABEL"
+				description="COM_ADMIN_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				useaccess="true"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="helpsite" 
+				type="helpsite"
+				label="COM_ADMIN_USER_FIELD_HELPSITE_LABEL"
+				description="COM_ADMIN_USER_FIELD_HELPSITE_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="timezone" 
+				type="timezone"
+				label="COM_ADMIN_USER_FIELD_TIMEZONE_LABEL"
+				description="COM_ADMIN_USER_FIELD_TIMEZONE_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_admin/models/help.php b/core/administrator/components/com_admin/models/help.php
new file mode 100644
index 00000000..ed29c3ab
--- /dev/null
+++ b/core/administrator/components/com_admin/models/help.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Admin Component Help Model
+ *
+ * @since  1.6
+ */
+class AdminModelHelp extends JModelLegacy
+{
+	/**
+	 * The search string
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $help_search = null;
+
+	/**
+	 * The page to be viewed
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $page = null;
+
+	/**
+	 * The ISO language tag
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $lang_tag = null;
+
+	/**
+	 * Table of contents
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $toc = null;
+
+	/**
+	 * URL for the latest version check
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $latest_version_check = null;
+
+	/**
+	 * Method to get the help search string
+	 *
+	 * @return  string  Help search string
+	 *
+	 * @since   1.6
+	 */
+	public function &getHelpSearch()
+	{
+		if (is_null($this->help_search))
+		{
+			$this->help_search = JFactory::getApplication()->input->getString('helpsearch');
+		}
+
+		return $this->help_search;
+	}
+
+	/**
+	 * Method to get the page
+	 *
+	 * @return  string  The page
+	 *
+	 * @since   1.6
+	 */
+	public function &getPage()
+	{
+		if (is_null($this->page))
+		{
+			$this->page = JHelp::createUrl(JFactory::getApplication()->input->get('page', 'JHELP_START_HERE'));
+		}
+
+		return $this->page;
+	}
+
+	/**
+	 * Method to get the lang tag
+	 *
+	 * @return  string  lang iso tag
+	 *
+	 * @since  1.6
+	 */
+	public function getLangTag()
+	{
+		if (is_null($this->lang_tag))
+		{
+			$this->lang_tag = JFactory::getLanguage()->getTag();
+
+			if (!is_dir(JPATH_BASE . '/help/' . $this->lang_tag))
+			{
+				// Use English as fallback
+				$this->lang_tag = 'en-GB';
+			}
+		}
+
+		return $this->lang_tag;
+	}
+
+	/**
+	 * Method to get the table of contents
+	 *
+	 * @return  array  Table of contents
+	 */
+	public function &getToc()
+	{
+		if (!is_null($this->toc))
+		{
+			return $this->toc;
+		}
+
+		// Get vars
+		$lang_tag    = $this->getLangTag();
+		$help_search = $this->getHelpSearch();
+
+		// New style - Check for a TOC JSON file
+		if (file_exists(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'))
+		{
+			$data = json_decode(file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'));
+
+			// Loop through the data array
+			foreach ($data as $key => $value)
+			{
+				$this->toc[$key] = JText::_('COM_ADMIN_HELP_' . $value);
+			}
+
+			// Sort the Table of Contents
+			asort($this->toc);
+
+			return $this->toc;
+		}
+
+		// Get Help files
+		jimport('joomla.filesystem.folder');
+		$files = JFolder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
+		$this->toc = array();
+
+		foreach ($files as $file)
+		{
+			$buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
+
+			if (!preg_match('#<title>(.*?)</title>#', $buffer, $m))
+			{
+				continue;
+			}
+
+			$title = trim($m[1]);
+
+			if (!$title)
+			{
+				continue;
+			}
+
+			// Translate the page title
+			$title = JText::_($title);
+
+			// Strip the extension
+			$file = preg_replace('#\.xml$|\.html$#', '', $file);
+
+			if ($help_search && StringHelper::strpos(StringHelper::strtolower(strip_tags($buffer)), StringHelper::strtolower($help_search)) === false)
+			{
+				continue;
+			}
+
+			// Add an item in the Table of Contents
+			$this->toc[$file] = $title;
+		}
+
+		// Sort the Table of Contents
+		asort($this->toc);
+
+		return $this->toc;
+	}
+
+	/**
+	 * Method to get the latest version check
+	 *
+	 * @return  string  Latest Version Check URL
+	 */
+	public function &getLatestVersionCheck()
+	{
+		if (!$this->latest_version_check)
+		{
+			$override = 'https://help.joomla.org/proxy/index.php?keyref=Help{major}{minor}:'
+				. 'Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&amp;lang={langcode}';
+			$this->latest_version_check = JHelp::createUrl('JVERSION', false, $override);
+		}
+
+		return $this->latest_version_check;
+	}
+}
diff --git a/core/administrator/components/com_admin/models/profile.php b/core/administrator/components/com_admin/models/profile.php
new file mode 100644
index 00000000..79f84acb
--- /dev/null
+++ b/core/administrator/components/com_admin/models/profile.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php');
+
+/**
+ * User model.
+ *
+ * @since  1.6
+ */
+class AdminModelProfile extends UsersModelUser
+{
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_admin.profile', 'profile', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Check for username compliance and parameter set
+		$isUsernameCompliant = true;
+
+		if ($this->loadFormData()->username)
+		{
+			$username = $this->loadFormData()->username;
+			$isUsernameCompliant = !(preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $username) || strlen(utf8_decode($username)) < 2
+				|| trim($username) != $username);
+		}
+
+		$this->setState('user.username.compliant', $isUsernameCompliant);
+
+		if (!JComponentHelper::getParams('com_users')->get('change_login_name') && $isUsernameCompliant)
+		{
+			$form->setFieldAttribute('username', 'required', 'false');
+			$form->setFieldAttribute('username', 'readonly', 'true');
+			$form->setFieldAttribute('username', 'description', 'COM_ADMIN_USER_FIELD_NOCHANGE_USERNAME_DESC');
+		}
+
+		// When multilanguage is set, a user's default site language should also be a Content Language
+		if (JLanguageMultilang::isEnabled())
+		{
+			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
+		}
+
+		// If the user needs to change their password, mark the password fields as required
+		if (JFactory::getUser()->requireReset)
+		{
+			$form->setFieldAttribute('password', 'required', 'true');
+			$form->setFieldAttribute('password2', 'required', 'true');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_users.edit.user.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		// Load the users plugins.
+		JPluginHelper::importPlugin('user');
+
+		$this->preprocessData('com_admin.profile', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		return parent::getItem(JFactory::getUser()->id);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$user = JFactory::getUser();
+
+		unset($data['id']);
+		unset($data['groups']);
+		unset($data['sendEmail']);
+		unset($data['block']);
+
+		$isUsernameCompliant = $this->getState('user.username.compliant');
+
+		if (!JComponentHelper::getParams('com_users')->get('change_login_name') && $isUsernameCompliant)
+		{
+			unset($data['username']);
+		}
+
+		// Bind the data.
+		if (!$user->bind($data))
+		{
+			$this->setError($user->getError());
+
+			return false;
+		}
+
+		$user->groups = null;
+
+		// Store the data.
+		if (!$user->save())
+		{
+			$this->setError($user->getError());
+
+			return false;
+		}
+
+		$this->setState('user.id', $user->id);
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_admin/models/sysinfo.php b/core/administrator/components/com_admin/models/sysinfo.php
new file mode 100644
index 00000000..b08decc9
--- /dev/null
+++ b/core/administrator/components/com_admin/models/sysinfo.php
@@ -0,0 +1,744 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Model for the display of system information.
+ *
+ * @since  1.6
+ */
+class AdminModelSysInfo extends JModelLegacy
+{
+	/**
+	 * Some PHP settings
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $php_settings = array();
+
+	/**
+	 * Config values
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $config = array();
+
+	/**
+	 * Some system values
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $info = array();
+
+	/**
+	 * PHP info
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $php_info = null;
+
+	/**
+	 * Array containing the phpinfo() data.
+	 *
+	 * @var    array
+	 *
+	 * @since  3.5
+	 */
+	protected $phpInfoArray;
+
+	/**
+	 * Private/critical data that we don't want to share
+	 *
+	 * @var    array
+	 *
+	 * @since  3.5
+	 */
+	protected $privateSettings = array(
+		'phpInfoArray' => array(
+			'CONTEXT_DOCUMENT_ROOT',
+			'Cookie',
+			'DOCUMENT_ROOT',
+			'extension_dir',
+			'error_log',
+			'Host',
+			'HTTP_COOKIE',
+			'HTTP_HOST',
+			'HTTP_ORIGIN',
+			'HTTP_REFERER',
+			'HTTP Request',
+			'include_path',
+			'mysql.default_socket',
+			'MYSQL_SOCKET',
+			'MYSQL_INCLUDE',
+			'MYSQL_LIBS',
+			'mysqli.default_socket',
+			'MYSQLI_SOCKET',
+			'PATH',
+			'Path to sendmail',
+			'pdo_mysql.default_socket',
+			'Referer',
+			'REMOTE_ADDR',
+			'SCRIPT_FILENAME',
+			'sendmail_path',
+			'SERVER_ADDR',
+			'SERVER_ADMIN',
+			'Server Administrator',
+			'SERVER_NAME',
+			'Server Root',
+			'session.name',
+			'session.save_path',
+			'upload_tmp_dir',
+			'User/Group',
+			'open_basedir',
+		),
+		'other' => array(
+			'db',
+			'dbprefix',
+			'fromname',
+			'live_site',
+			'log_path',
+			'mailfrom',
+			'memcache_server_host',
+			'memcached_server_host',
+			'open_basedir',
+			'Origin',
+			'proxy_host',
+			'proxy_user',
+			'proxy_pass',
+			'redis_server_host',
+			'redis_server_auth',
+			'secret',
+			'sendmail',
+			'session.save_path',
+			'session_memcache_server_host',
+			'session_memcached_server_host',
+			'session_redis_server_host',
+			'session_redis_server_auth',
+			'sitename',
+			'smtphost',
+			'tmp_path',
+			'open_basedir',
+		)
+	);
+
+	/**
+	 * System values that can be "safely" shared
+	 *
+	 * @var    array
+	 *
+	 * @since  3.5
+	 */
+	protected $safeData;
+
+	/**
+	 * Information about writable state of directories
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $directories = array();
+
+	/**
+	 * The current editor.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $editor = null;
+
+	/**
+	 * Remove sections of data marked as private in the privateSettings
+	 *
+	 * @param   array   $dataArray  Array with data tha may contain private informati
+	 * @param   string  $dataType   Type of data to search for a specific section in the privateSettings array
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function cleanPrivateData($dataArray, $dataType = 'other')
+	{
+		$dataType = isset($this->privateSettings[$dataType]) ? $dataType : 'other';
+
+		$privateSettings = $this->privateSettings[$dataType];
+
+		if (!$privateSettings)
+		{
+			return $dataArray;
+		}
+
+		foreach ($dataArray as $section => $values)
+		{
+			if (is_array($values))
+			{
+				$dataArray[$section] = $this->cleanPrivateData($values, $dataType);
+			}
+
+			if (in_array($section, $privateSettings, true))
+			{
+				$dataArray[$section] = $this->cleanSectionPrivateData($values);
+			}
+		}
+
+		return $dataArray;
+	}
+
+	/**
+	 * Obfuscate section values
+	 *
+	 * @param   mixed  $sectionValues  Section data
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.5
+	 */
+	protected function cleanSectionPrivateData($sectionValues)
+	{
+		if (!is_array($sectionValues))
+		{
+			if (strstr($sectionValues, JPATH_ROOT))
+			{
+				$sectionValues = 'xxxxxx';
+			}
+
+			return strlen($sectionValues) ? 'xxxxxx' : '';
+		}
+
+		foreach ($sectionValues as $setting => $value)
+		{
+			$sectionValues[$setting] = strlen($value) ? 'xxxxxx' : '';
+		}
+
+		return $sectionValues;
+	}
+
+	/**
+	 * Method to get the PHP settings
+	 *
+	 * @return  array  Some PHP settings
+	 *
+	 * @since   1.6
+	 */
+	public function &getPhpSettings()
+	{
+		if (!empty($this->php_settings))
+		{
+			return $this->php_settings;
+		}
+
+		$this->php_settings = array(
+			'safe_mode'          => ini_get('safe_mode') == '1',
+			'display_errors'     => ini_get('display_errors') == '1',
+			'short_open_tag'     => ini_get('short_open_tag') == '1',
+			'file_uploads'       => ini_get('file_uploads') == '1',
+			'magic_quotes_gpc'   => ini_get('magic_quotes_gpc') == '1',
+			'register_globals'   => ini_get('register_globals') == '1',
+			'output_buffering'   => (int) ini_get('output_buffering') !== 0,
+			'open_basedir'       => ini_get('open_basedir'),
+			'session.save_path'  => ini_get('session.save_path'),
+			'session.auto_start' => ini_get('session.auto_start'),
+			'disable_functions'  => ini_get('disable_functions'),
+			'xml'                => extension_loaded('xml'),
+			'zlib'               => extension_loaded('zlib'),
+			'zip'                => function_exists('zip_open') && function_exists('zip_read'),
+			'mbstring'           => extension_loaded('mbstring'),
+			'iconv'              => function_exists('iconv'),
+			'max_input_vars'     => ini_get('max_input_vars'),
+		);
+
+		return $this->php_settings;
+	}
+
+	/**
+	 * Method to get the config
+	 *
+	 * @return  array  config values
+	 *
+	 * @since   1.6
+	 */
+	public function &getConfig()
+	{
+		if (!empty($this->config))
+		{
+			return $this->config;
+		}
+
+		$registry = new Registry(new JConfig);
+		$this->config = $registry->toArray();
+		$hidden = array('host', 'user', 'password', 'ftp_user', 'ftp_pass', 'smtpuser', 'smtppass',);
+
+		foreach ($hidden as $key)
+		{
+			$this->config[$key] = 'xxxxxx';
+		}
+
+		return $this->config;
+	}
+
+	/**
+	 * Method to get the system information
+	 *
+	 * @return  array  System information values
+	 *
+	 * @since   1.6
+	 */
+	public function &getInfo()
+	{
+		if (!empty($this->info))
+		{
+			return $this->info;
+		}
+
+		$version  = new JVersion;
+		$platform = new JPlatform;
+		$db       = $this->getDbo();
+
+		$this->info = array(
+			'php'                   => php_uname(),
+			'dbserver'		=> $db->getServerType(),
+			'dbversion'             => $db->getVersion(),
+			'dbcollation'           => $db->getCollation(),
+			'dbconnectioncollation' => $db->getConnectionCollation(),
+			'phpversion'            => phpversion(),
+			'server'                => isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : getenv('SERVER_SOFTWARE'),
+			'sapi_name'             => php_sapi_name(),
+			'version'               => $version->getLongVersion(),
+			'platform'              => $platform->getLongVersion(),
+			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
+		);
+
+		return $this->info;
+	}
+
+	/**
+	 * Check if the phpinfo function is enabled
+	 *
+	 * @return  boolean True if enabled
+	 *
+	 * @since   3.4.1
+	 */
+	public function phpinfoEnabled()
+	{
+		return !in_array('phpinfo', explode(',', ini_get('disable_functions')));
+	}
+
+	/**
+	 * Method to get filter data from the model
+	 *
+	 * @param   string  $dataType  Type of data to get safely
+	 * @param   bool    $public    If true no sensitive information will be removed
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getSafeData($dataType, $public = true)
+	{
+		if (isset($this->safeData[$dataType]))
+		{
+			return $this->safeData[$dataType];
+		}
+
+		$methodName = 'get' . ucfirst($dataType);
+
+		if (!method_exists($this, $methodName))
+		{
+			return array();
+		}
+
+		$data = $this->$methodName($public);
+
+		$this->safeData[$dataType] = $this->cleanPrivateData($data, $dataType);
+
+		return $this->safeData[$dataType];
+	}
+
+	/**
+	 * Method to get the PHP info
+	 *
+	 * @return  string  PHP info
+	 *
+	 * @since   1.6
+	 */
+	public function &getPHPInfo()
+	{
+		if (!$this->phpinfoEnabled())
+		{
+			$this->php_info = JText::_('COM_ADMIN_PHPINFO_DISABLED');
+
+			return $this->php_info;
+		}
+
+		if (!is_null($this->php_info))
+		{
+			return $this->php_info;
+		}
+
+		ob_start();
+		date_default_timezone_set('UTC');
+		phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES);
+		$phpInfo = ob_get_contents();
+		ob_end_clean();
+		preg_match_all('#<body[^>]*>(.*)</body>#siU', $phpInfo, $output);
+		$output = preg_replace('#<table[^>]*>#', '<table class="table table-striped adminlist">', $output[1][0]);
+		$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
+		$output = preg_replace('#<hr />#', '', $output);
+		$output = str_replace('<div class="center">', '', $output);
+		$output = preg_replace('#<tr class="h">(.*)<\/tr>#', '<thead><tr class="h">$1</tr></thead><tbody>', $output);
+		$output = str_replace('</table>', '</tbody></table>', $output);
+		$output = str_replace('</div>', '', $output);
+		$this->php_info = $output;
+
+		return $this->php_info;
+	}
+
+	/**
+	 * Get phpinfo() output as array
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getPhpInfoArray()
+	{
+		// Already cached
+		if (null !== $this->phpInfoArray)
+		{
+			return $this->phpInfoArray;
+		}
+
+		$phpInfo = $this->getPhpInfo();
+
+		$this->phpInfoArray = $this->parsePhpInfo($phpInfo);
+
+		return $this->phpInfoArray;
+	}
+
+	/**
+	 * Method to get a list of installed extensions
+	 *
+	 * @return array installed extensions
+	 *
+	 * @since  3.5
+	 */
+	public function getExtensions()
+	{
+		$installed = array();
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn('#__extensions'));
+		$db->setQuery($query);
+
+		try
+		{
+			$extensions = $db->loadObjectList();
+		}
+		catch (Exception $e)
+		{
+			try
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()), JLog::WARNING, 'jerror');
+			}
+			catch (RuntimeException $exception)
+			{
+				JFactory::getApplication()->enqueueMessage(
+					JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()),
+					'warning'
+				);
+			}
+
+			return $installed;
+		}
+
+		if (empty($extensions))
+		{
+			return $installed;
+		}
+
+		foreach ($extensions as $extension)
+		{
+			if (strlen($extension->name) == 0)
+			{
+				continue;
+			}
+
+			$installed[$extension->name] = array(
+				'name'         => $extension->name,
+				'type'         => $extension->type,
+				'state'        => $extension->enabled ? JText::_('JENABLED') : JText::_('JDISABLED'),
+				'author'       => 'unknown',
+				'version'      => 'unknown',
+				'creationDate' => 'unknown',
+				'authorUrl'    => 'unknown',
+			);
+
+			$manifest = new Registry($extension->manifest_cache);
+
+			$extraData = array(
+				'author'       => $manifest->get('author', ''),
+				'version'      => $manifest->get('version', ''),
+				'creationDate' => $manifest->get('creationDate', ''),
+				'authorUrl'    => $manifest->get('authorUrl', '')
+			);
+
+			$installed[$extension->name] = array_merge($installed[$extension->name], $extraData);
+		}
+
+		return $installed;
+	}
+
+	/**
+	 * Method to get the directory states
+	 *
+	 * @param   bool  $public  If true no information is going to be removed
+	 *
+	 * @return  array States of directories
+	 *
+	 * @since   1.6
+	 */
+	public function getDirectory($public = false)
+	{
+		if (!empty($this->directories))
+		{
+			return $this->directories;
+		}
+
+		$this->directories = array();
+
+		$registry = JFactory::getConfig();
+		$cparams  = JComponentHelper::getParams('com_media');
+
+		$this->addDirectory('administrator/components', JPATH_ADMINISTRATOR . '/components');
+		$this->addDirectory('administrator/language', JPATH_ADMINISTRATOR . '/language');
+
+		// List all admin languages
+		$admin_langs = new DirectoryIterator(JPATH_ADMINISTRATOR . '/language');
+
+		foreach ($admin_langs as $folder)
+		{
+			if (!$folder->isDir() || $folder->isDot())
+			{
+				continue;
+			}
+
+			$this->addDirectory(
+				'administrator/language/' . $folder->getFilename(),
+				JPATH_ADMINISTRATOR . '/language/' . $folder->getFilename()
+			);
+		}
+
+		// List all manifests folders
+		$manifests = new DirectoryIterator(JPATH_ADMINISTRATOR . '/manifests');
+
+		foreach ($manifests as $folder)
+		{
+			if (!$folder->isDir() || $folder->isDot())
+			{
+				continue;
+			}
+
+			$this->addDirectory(
+				'administrator/manifests/' . $folder->getFilename(),
+				JPATH_ADMINISTRATOR . '/manifests/' . $folder->getFilename()
+			);
+		}
+
+		$this->addDirectory('administrator/modules', JPATH_ADMINISTRATOR . '/modules');
+		$this->addDirectory('administrator/templates', JPATH_THEMES);
+
+		$this->addDirectory('components', JPATH_SITE . '/components');
+
+		$this->addDirectory($cparams->get('image_path'), JPATH_SITE . '/' . $cparams->get('image_path'));
+
+		// List all images folders
+		$image_folders = new DirectoryIterator(JPATH_SITE . '/' . $cparams->get('image_path'));
+
+		foreach ($image_folders as $folder)
+		{
+			if (!$folder->isDir() || $folder->isDot())
+			{
+				continue;
+			}
+
+			$this->addDirectory(
+				'images/' . $folder->getFilename(),
+				JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $folder->getFilename()
+			);
+		}
+
+		$this->addDirectory('language', JPATH_SITE . '/language');
+
+		// List all site languages
+		$site_langs = new DirectoryIterator(JPATH_SITE . '/language');
+
+		foreach ($site_langs as $folder)
+		{
+			if (!$folder->isDir() || $folder->isDot())
+			{
+				continue;
+			}
+
+			$this->addDirectory('language/' . $folder->getFilename(), JPATH_SITE . '/language/' . $folder->getFilename());
+		}
+
+		$this->addDirectory('libraries', JPATH_LIBRARIES);
+
+		$this->addDirectory('media', JPATH_SITE . '/media');
+		$this->addDirectory('modules', JPATH_SITE . '/modules');
+		$this->addDirectory('plugins', JPATH_PLUGINS);
+
+		$plugin_groups = new DirectoryIterator(JPATH_SITE . '/plugins');
+
+		foreach ($plugin_groups as $folder)
+		{
+			if (!$folder->isDir() || $folder->isDot())
+			{
+				continue;
+			}
+
+			$this->addDirectory('plugins/' . $folder->getFilename(), JPATH_PLUGINS . '/' . $folder->getFilename());
+		}
+
+		$this->addDirectory('templates', JPATH_SITE . '/templates');
+		$this->addDirectory('configuration.php', JPATH_CONFIGURATION . '/configuration.php');
+
+		// Is there a cache path in configuration.php?
+		if ($cache_path = trim($registry->get('cache_path', '')))
+		{
+			// Frontend and backend use same directory for caching.
+			$this->addDirectory($cache_path, $cache_path, 'COM_ADMIN_CACHE_DIRECTORY');
+		}
+		else
+		{
+			$this->addDirectory('cache', JPATH_SITE . '/cache', 'COM_ADMIN_CACHE_DIRECTORY');
+			$this->addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY');
+		}
+
+		if ($public)
+		{
+			$this->addDirectory(
+				'log',
+				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
+				'COM_ADMIN_LOG_DIRECTORY'
+			);
+			$this->addDirectory(
+				'tmp',
+				$registry->get('tmp_path', JPATH_ROOT . '/tmp'),
+				'COM_ADMIN_TEMP_DIRECTORY'
+			);
+		}
+		else
+		{
+			$this->addDirectory(
+				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
+				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
+				'COM_ADMIN_LOG_DIRECTORY'
+			);
+			$this->addDirectory(
+				$registry->get('tmp_path', JPATH_ROOT . '/tmp'),
+				$registry->get('tmp_path', JPATH_ROOT . '/tmp'),
+				'COM_ADMIN_TEMP_DIRECTORY'
+			);
+		}
+
+		return $this->directories;
+	}
+
+	/**
+	 * Method to add a directory
+	 *
+	 * @param   string  $name     Directory Name
+	 * @param   string  $path     Directory path
+	 * @param   string  $message  Message
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	private function addDirectory($name, $path, $message = '')
+	{
+		$this->directories[$name] = array('writable' => is_writable($path), 'message' => $message,);
+	}
+
+	/**
+	 * Method to get the editor
+	 *
+	 * @return  string  The default editor
+	 *
+	 * @note    Has to be removed (it is present in the config...)
+	 * @since   1.6
+	 */
+	public function &getEditor()
+	{
+		if (!is_null($this->editor))
+		{
+			return $this->editor;
+		}
+
+		$this->editor = JFactory::getConfig()->get('editor');
+
+		return $this->editor;
+	}
+
+	/**
+	 * Parse phpinfo output into an array
+	 * Source https://gist.github.com/sbmzhcn/6255314
+	 *
+	 * @param   string  $html  Output of phpinfo()
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function parsePhpInfo($html)
+	{
+		$html = strip_tags($html, '<h2><th><td>');
+		$html = preg_replace('/<th[^>]*>([^<]+)<\/th>/', '<info>\1</info>', $html);
+		$html = preg_replace('/<td[^>]*>([^<]+)<\/td>/', '<info>\1</info>', $html);
+		$t = preg_split('/(<h2[^>]*>[^<]+<\/h2>)/', $html, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$r = array();
+		$count = count($t);
+		$p1 = '<info>([^<]+)<\/info>';
+		$p2 = '/' . $p1 . '\s*' . $p1 . '\s*' . $p1 . '/';
+		$p3 = '/' . $p1 . '\s*' . $p1 . '/';
+
+		for ($i = 1; $i < $count; $i++)
+		{
+			if (preg_match('/<h2[^>]*>([^<]+)<\/h2>/', $t[$i], $matchs))
+			{
+				$name = trim($matchs[1]);
+				$vals = explode("\n", $t[$i + 1]);
+
+				foreach ($vals AS $val)
+				{
+					// 3cols
+					if (preg_match($p2, $val, $matchs))
+					{
+						$r[$name][trim($matchs[1])] = array(trim($matchs[2]), trim($matchs[3]),);
+					}
+					// 2cols
+					elseif (preg_match($p3, $val, $matchs))
+					{
+						$r[$name][trim($matchs[1])] = trim($matchs[2]);
+					}
+				}
+			}
+		}
+
+		return $r;
+	}
+}
diff --git a/core/administrator/components/com_admin/postinstall/eaccelerator.php b/core/administrator/components/com_admin/postinstall/eaccelerator.php
new file mode 100644
index 00000000..50cc782c
--- /dev/null
+++ b/core/administrator/components/com_admin/postinstall/eaccelerator.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for eAccelerator compatibility.
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Checks if the eAccelerator caching method is enabled.
+ *
+ * This check should be done through the 3.x series as the issue impacts migrated sites which will
+ * most often come from the previous LTS release (2.5). Remove for version 4 or when eAccelerator support is added.
+ *
+ * This check returns true when the eAccelerator caching method is user, meaning that the message concerning it should be displayed.
+ *
+ * @return  integer
+ *
+ * @since   3.2
+ */
+function admin_postinstall_eaccelerator_condition()
+{
+	$app = JFactory::getApplication();
+	$cacheHandler = $app->get('cacheHandler', '');
+
+	return (ucfirst($cacheHandler) == 'Eaccelerator');
+}
+
+/**
+ * Disables the unsupported eAccelerator caching method, replacing it with the "file" caching method.
+ *
+ * @return  void
+ *
+ * @since   3.2
+ */
+function admin_postinstall_eaccelerator_action()
+{
+	$prev = ArrayHelper::fromObject(new JConfig);
+	$data = array_merge($prev, array('cacheHandler' => 'file'));
+
+	$config = new Registry($data);
+
+	jimport('joomla.filesystem.path');
+	jimport('joomla.filesystem.file');
+
+	// Set the configuration file path.
+	$file = JPATH_CONFIGURATION . '/configuration.php';
+
+	// Get the new FTP credentials.
+	$ftp = JClientHelper::getCredentials('ftp', true);
+
+	// Attempt to make the file writeable if using FTP.
+	if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0644'))
+	{
+		JError::raiseNotice(500, JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE'));
+	}
+
+	// Attempt to write the configuration file as a PHP class named JConfig.
+	$configuration = $config->toString('PHP', array('class' => 'JConfig', 'closingtag' => false));
+
+	if (!JFile::write($file, $configuration))
+	{
+		JFactory::getApplication()->enqueueMessage(JText::_('COM_CONFIG_ERROR_WRITE_FAILED'), 'error');
+
+		return;
+	}
+
+	// Attempt to make the file unwriteable if using FTP.
+	if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0444'))
+	{
+		JError::raiseNotice(500, JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE'));
+	}
+}
diff --git a/core/administrator/components/com_admin/postinstall/htaccess.php b/core/administrator/components/com_admin/postinstall/htaccess.php
new file mode 100644
index 00000000..7a1ff985
--- /dev/null
+++ b/core/administrator/components/com_admin/postinstall/htaccess.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in the default .htaccess and web.config files.
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Notifies users of a change in the default .htaccess or web.config file
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   3.4
+ */
+function admin_postinstall_htaccess_condition()
+{
+	return true;
+}
diff --git a/core/administrator/components/com_admin/postinstall/joomla40checks.php b/core/administrator/components/com_admin/postinstall/joomla40checks.php
new file mode 100644
index 00000000..df26ad62
--- /dev/null
+++ b/core/administrator/components/com_admin/postinstall/joomla40checks.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for Joomla 4.0 pre checks
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Checks if the installation meets the current requirements for Joomla 4
+ *
+ * @return  boolean  True if any check fails.
+ *
+ * @since   3.7
+ *
+ * @link    https://developer.joomla.org/news/658-joomla4-manifesto.html
+ * @link    https://developer.joomla.org/news/704-looking-forward-with-joomla-4.html
+ */
+function admin_postinstall_joomla40checks_condition()
+{
+	$db            = JFactory::getDbo();
+	$serverType    = $db->getServerType();
+	$serverVersion = $db->getVersion();
+
+	if ($serverType == 'mssql')
+	{
+		// MS SQL support will be dropped
+		return true;
+	}
+
+	if ($serverType == 'postgresql' && version_compare($serverVersion, '9.2', 'lt'))
+	{
+		// PostgreSQL minimum version is 9.2
+		return true;
+	}
+
+	if ($serverType == 'mysql' && version_compare($serverVersion, '5.5.3', 'lt'))
+	{
+		// MySQL minimum version is 5.5.3
+		return true;
+	}
+
+	if ($db->name === 'mysql')
+	{
+		// Using deprecated MySQL driver
+		return true;
+	}
+
+	// PHP minimum version is 7.0
+	return version_compare(PHP_VERSION, '7.0', 'lt');
+}
diff --git a/core/administrator/components/com_admin/postinstall/languageaccess340.php b/core/administrator/components/com_admin/postinstall/languageaccess340.php
new file mode 100644
index 00000000..915379df
--- /dev/null
+++ b/core/administrator/components/com_admin/postinstall/languageaccess340.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for the checks if the installation is
+ * affected by the issue with content languages access in 3.4.0
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Checks if the installation is affected by the issue with content languages access in 3.4.0
+ *
+ * @link    https://github.com/joomla/joomla-cms/pull/6172
+ * @link    https://github.com/joomla/joomla-cms/pull/6194
+ *
+ * @return  boolean
+ *
+ * @since   3.4.1
+ */
+function admin_postinstall_languageaccess340_condition()
+{
+	$db    = JFactory::getDbo();
+	$query = $db->getQuery(true)
+		->select($db->quoteName('access'))
+		->from($db->quoteName('#__languages'))
+		->where($db->quoteName('access') . ' = ' . $db->quote('0'));
+	$db->setQuery($query);
+	$db->execute();
+	$numRows = $db->getNumRows();
+
+	if (isset($numRows) && $numRows != 0)
+	{
+		// We have rows here so we have at minumum one row with access set to 0
+		return true;
+	}
+
+	// All good the query return nothing.
+	return false;
+}
diff --git a/core/administrator/components/com_admin/postinstall/statscollection.php b/core/administrator/components/com_admin/postinstall/statscollection.php
new file mode 100644
index 00000000..1d8fde9d
--- /dev/null
+++ b/core/administrator/components/com_admin/postinstall/statscollection.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for the checking minimum PHP version support
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Alerts the user we are collecting anonymous data as of Joomla 3.5.0.
+ *
+ * @return  boolean
+ *
+ * @since   3.5
+ */
+function admin_postinstall_statscollection_condition()
+{
+	return true;
+}
diff --git a/core/administrator/components/com_admin/postinstall/updatedefaultsettings.php b/core/administrator/components/com_admin/postinstall/updatedefaultsettings.php
new file mode 100644
index 00000000..d111f4d5
--- /dev/null
+++ b/core/administrator/components/com_admin/postinstall/updatedefaultsettings.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for notifying users of a change
+ * in various default settings.
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Notifies users of a change in various default settings
+ *
+ * This check returns true regardless of condition.
+ *
+ * @return  boolean
+ *
+ * @since   3.8.8
+ */
+function admin_postinstall_updatedefaultsettings_condition()
+{
+	return true;
+}
diff --git a/core/administrator/components/com_admin/script.php b/core/administrator/components/com_admin/script.php
new file mode 100644
index 00000000..6cbf668f
--- /dev/null
+++ b/core/administrator/components/com_admin/script.php
@@ -0,0 +1,2543 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Script file of Joomla CMS
+ *
+ * @since  1.6.4
+ */
+class JoomlaInstallerScript
+{
+	/**
+	 * The Joomla Version we are updating from
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $fromVersion = null;
+
+	/**
+	 * Function to act prior to installation process begins
+	 *
+	 * @param   string      $action     Which action is happening (install|uninstall|discover_install|update)
+	 * @param   JInstaller  $installer  The class calling this method
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.7.0
+	 */
+	public function preflight($action, $installer)
+	{
+		if ($action === 'update')
+		{
+			// Get the version we are updating from
+			if (!empty($installer->extension->manifest_cache))
+			{
+				$manifestValues = json_decode($installer->extension->manifest_cache, true);
+
+				if ((array_key_exists('version', $manifestValues)))
+				{
+					$this->fromVersion = $manifestValues['version'];
+
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to update Joomla!
+	 *
+	 * @param   JInstaller  $installer  The class calling this method
+	 *
+	 * @return  void
+	 */
+	public function update($installer)
+	{
+		$options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+		$options['text_file'] = 'joomla_update.php';
+
+		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
+
+		try
+		{
+			JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// This needs to stay for 2.5 update compatibility
+		$this->deleteUnexistingFiles();
+		$this->updateManifestCaches();
+		$this->updateDatabase();
+		$this->clearRadCache();
+		$this->updateAssets($installer);
+		$this->clearStatsCache();
+		$this->convertTablesToUtf8mb4(true);
+		$this->cleanJoomlaCache();
+
+		// VERY IMPORTANT! THIS METHOD SHOULD BE CALLED LAST, SINCE IT COULD
+		// LOGOUT ALL THE USERS
+		$this->flushSessions();
+	}
+
+	/**
+	 * Called after any type of action
+	 *
+	 * @param   string      $action     Which action is happening (install|uninstall|discover_install|update)
+	 * @param   JInstaller  $installer  The class calling this method
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.7.0
+	 */
+	public function postflight($action, $installer)
+	{
+		if ($action === 'update')
+		{
+			if (!empty($this->fromVersion) && version_compare($this->fromVersion, '3.7.0', 'lt'))
+			{
+				/*
+				 * Do a check if the menu item exists, skip if it does. Only needed when we are in pre stable state.
+				 */
+				$db = JFactory::getDbo();
+
+				$query = $db->getQuery(true)
+					->select('id')
+					->from($db->quoteName('#__menu'))
+					->where($db->quoteName('menutype') . ' = ' . $db->quote('main'))
+					->where($db->quoteName('title') . ' = ' . $db->quote('com_associations'))
+					->where($db->quoteName('client_id') . ' = 1')
+					->where($db->quoteName('component_id') . ' = 34');
+
+				$result = $db->setQuery($query)->loadResult();
+
+				if (!empty($result))
+				{
+					return true;
+				}
+
+				/*
+				 * Add a menu item for com_associations, we need to do that here because with a plain sql statement we
+				 * damage the nested set structure for the menu table
+				 */
+				$newMenuItem = JTable::getInstance('Menu');
+
+				$data              = array();
+				$data['menutype']  = 'main';
+				$data['title']     = 'com_associations';
+				$data['alias']     = 'Multilingual Associations';
+				$data['path']      = 'Multilingual Associations';
+				$data['link']      = 'index.php?option=com_associations';
+				$data['type']      = 'component';
+				$data['published'] = 1;
+				$data['parent_id'] = 1;
+
+				// We have used a SQL Statement to add the extension so using 34 is safe (fingers crossed)
+				$data['component_id'] = 34;
+				$data['img']          = 'class:associations';
+				$data['language']     = '*';
+				$data['client_id']    = 1;
+
+				$newMenuItem->setLocation($data['parent_id'], 'last-child');
+
+				if (!$newMenuItem->save($data))
+				{
+					// Install failed, roll back changes
+					$installer->abort(JText::sprintf('JLIB_INSTALLER_ABORT_COMP_INSTALL_ROLLBACK', $newMenuItem->getError()));
+
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to clear our stats plugin cache to ensure we get fresh data on Joomla Update
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	protected function clearStatsCache()
+	{
+		$db = JFactory::getDbo();
+
+		try
+		{
+			// Get the params for the stats plugin
+			$params = $db->setQuery(
+				$db->getQuery(true)
+					->select($db->quoteName('params'))
+					->from($db->quoteName('#__extensions'))
+					->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+					->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('stats'))
+			)->loadResult();
+		}
+		catch (Exception $e)
+		{
+			echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+			return;
+		}
+
+		$params = json_decode($params, true);
+
+		// Reset the last run parameter
+		if (isset($params['lastrun']))
+		{
+			$params['lastrun'] = '';
+		}
+
+		$params = json_encode($params);
+
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__extensions'))
+			->set($db->quoteName('params') . ' = ' . $db->quote($params))
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('stats'));
+
+		try
+		{
+			$db->setQuery($query)->execute();
+		}
+		catch (Exception $e)
+		{
+			echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+			return;
+		}
+	}
+
+	/**
+	 * Method to update Database
+	 *
+	 * @return  void
+	 */
+	protected function updateDatabase()
+	{
+		if (JFactory::getDbo()->getServerType() === 'mysql')
+		{
+			$this->updateDatabaseMysql();
+		}
+
+		$this->uninstallEosPlugin();
+		$this->removeJedUpdateserver();
+	}
+
+	/**
+	 * Method to update MySQL Database
+	 *
+	 * @return  void
+	 */
+	protected function updateDatabaseMysql()
+	{
+		$db = JFactory::getDbo();
+
+		$db->setQuery('SHOW ENGINES');
+
+		try
+		{
+			$results = $db->loadObjectList();
+		}
+		catch (Exception $e)
+		{
+			echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+			return;
+		}
+
+		foreach ($results as $result)
+		{
+			if ($result->Support != 'DEFAULT')
+			{
+				continue;
+			}
+
+			$db->setQuery('ALTER TABLE #__update_sites_extensions ENGINE = ' . $result->Engine);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (Exception $e)
+			{
+				echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+				return;
+			}
+
+			break;
+		}
+	}
+
+	/**
+	 * Uninstall the 2.5 EOS plugin
+	 *
+	 * @return  void
+	 */
+	protected function uninstallEosPlugin()
+	{
+		$db = JFactory::getDbo();
+
+		// Check if the 2.5 EOS plugin is present and uninstall it if so
+		$id = $db->setQuery(
+			$db->getQuery(true)
+				->select('extension_id')
+				->from('#__extensions')
+				->where('name = ' . $db->quote('PLG_EOSNOTIFY'))
+		)->loadResult();
+
+		// Skip update when id doesn’t exists
+		if (!$id)
+		{
+			return;
+		}
+
+		// We need to unprotect the plugin so we can uninstall it
+		$db->setQuery(
+			$db->getQuery(true)
+				->update('#__extensions')
+				->set('protected = 0')
+				->where($db->quoteName('extension_id') . ' = ' . $id)
+		)->execute();
+
+		$installer = new JInstaller;
+		$installer->uninstall('plugin', $id);
+	}
+
+	/**
+	 * Remove the never used JED Updateserver
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function removeJedUpdateserver()
+	{
+		$db = JFactory::getDbo();
+
+		try
+		{
+			// Get the update site ID of the JED Update server
+			$id = $db->setQuery(
+				$db->getQuery(true)
+					->select('update_site_id')
+					->from($db->quoteName('#__update_sites'))
+					->where($db->quoteName('location') . ' = ' . $db->quote('https://update.joomla.org/jed/list.xml'))
+			)->loadResult();
+
+			// Skip delete when id doesn’t exists
+			if (!$id)
+			{
+				return;
+			}
+
+			// Delete from update sites
+			$db->setQuery(
+				$db->getQuery(true)
+					->delete($db->quoteName('#__update_sites'))
+					->where($db->quoteName('update_site_id') . ' = ' . $id)
+			)->execute();
+
+			// Delete from update sites extensions
+			$db->setQuery(
+				$db->getQuery(true)
+					->delete($db->quoteName('#__update_sites_extensions'))
+					->where($db->quoteName('update_site_id') . ' = ' . $id)
+			)->execute();
+		}
+		catch (Exception $e)
+		{
+			echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+			return;
+		}
+	}
+
+	/**
+	 * Update the manifest caches
+	 *
+	 * @return  void
+	 */
+	protected function updateManifestCaches()
+	{
+		$extensions = JExtensionHelper::getCoreExtensions();
+
+		// Attempt to refresh manifest caches
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from('#__extensions');
+
+		foreach ($extensions as $extension)
+		{
+			$query->where(
+				'type=' . $db->quote($extension[0])
+				. ' AND element=' . $db->quote($extension[1])
+				. ' AND folder=' . $db->quote($extension[2])
+				. ' AND client_id=' . $extension[3], 'OR'
+			);
+		}
+
+		$db->setQuery($query);
+
+		try
+		{
+			$extensions = $db->loadObjectList();
+		}
+		catch (Exception $e)
+		{
+			echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+			return;
+		}
+
+		$installer = new JInstaller;
+
+		foreach ($extensions as $extension)
+		{
+			if (!$installer->refreshManifestCache($extension->extension_id))
+			{
+				echo JText::sprintf('FILES_JOOMLA_ERROR_MANIFEST', $extension->type, $extension->element, $extension->name, $extension->client_id) . '<br />';
+			}
+		}
+	}
+
+	/**
+	 * Delete files that should not exist
+	 *
+	 * @return  void
+	 */
+	public function deleteUnexistingFiles()
+	{
+		$files = array(
+			/*
+			 * Joomla 1.5
+			 *
+			 * Because of the way some sites were upgraded forward from 1.5, they may still have some files from the
+			 * core libraries that need to be explicitly checked for and removed because of the migration of the
+			 * core libraries to using PHP namespaces.  For example, the JVersion file is in an autoloaded path in 2.5+
+			 * and due to the autoloader priorities the JVersion class will be used before the namespaced
+			 * Joomla\CMS\Version.  This is a failsafe to ensure those files which MAY conflict with the current API
+			 * are removed.
+			 */
+			'/libraries/joomla/version.php',
+
+			/*
+			 * Joomla 1.6 - 1.7 - 2.5
+			 */
+			'/administrator/components/com_content/models/fields/filters.php',
+			'/administrator/components/com_users/helpers/levels.php',
+			'/administrator/modules/mod_quickicon/tmpl/default_button.php',
+			'/administrator/templates/bluestork/params.ini',
+			'/administrator/templates/hathor/params.ini',
+			'/includes/version.php',
+			'/libraries/joomla/application/applicationexception.php',
+			'/libraries/joomla/client/http.php',
+			'/libraries/joomla/database/databaseexception.php',
+			'/libraries/joomla/database/databasequery.php',
+			'/libraries/joomla/filter/filterinput.php',
+			'/libraries/joomla/filter/filteroutput.php',
+			'/libraries/joomla/form/formfield.php',
+			'/libraries/joomla/form/formrule.php',
+			'/libraries/joomla/log/logentry.php',
+			'/libraries/joomla/utilities/garbagecron.txt',
+			'/libraries/joomlacms/index.html',
+			'/libraries/phpmailer/language/phpmailer.lang-en.php',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif',
+			'/media/system/css/modal_msie.css',
+			'/media/system/images/modal/closebox.gif',
+
+			/*
+			 * Joomla 2.5.0 thru 3.0.0
+			 */
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.0-2011-06-06-2.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.0-2011-06-06.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.0.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.1-2011-09-15-2.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.1-2011-09-15-3.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.1-2011-09-15-4.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.1-2011-09-15.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.1-2011-09-17.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.1-2011-09-20.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.3-2011-10-15.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.3-2011-10-19.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.3-2011-11-10.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.4-2011-11-19.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.4-2011-11-23.sql',
+			'/administrator/components/com_admin/sql/updates/mysql/1.7.4-2011-12-12.sql',
+			'/administrator/components/com_admin/sql/updates/sqlsrv/2.5.2-2012-03-05.sql',
+			'/administrator/components/com_admin/sql/updates/sqlsrv/2.5.3-2012-03-13.sql',
+			'/administrator/components/com_admin/sql/updates/sqlsrv/index.html',
+			'/administrator/components/com_admin/views/sysinfo/tmpl/default_navigation.php',
+			'/administrator/components/com_categories/config.xml',
+			'/administrator/components/com_categories/helpers/categoriesadministrator.php',
+			'/administrator/components/com_contact/elements/contact.php',
+			'/administrator/components/com_contact/elements/index.html',
+			'/administrator/components/com_content/elements/article.php',
+			'/administrator/components/com_content/elements/author.php',
+			'/administrator/components/com_content/elements/index.html',
+			'/administrator/components/com_installer/models/fields/client.php',
+			'/administrator/components/com_installer/models/fields/group.php',
+			'/administrator/components/com_installer/models/fields/index.html',
+			'/administrator/components/com_installer/models/fields/search.php',
+			'/administrator/components/com_installer/models/forms/index.html',
+			'/administrator/components/com_installer/models/forms/manage.xml',
+			'/administrator/components/com_installer/views/install/tmpl/default_form.php',
+			'/administrator/components/com_installer/views/manage/tmpl/default_filter.php',
+			'/administrator/components/com_languages/views/installed/tmpl/default_ftp.php',
+			'/administrator/components/com_languages/views/installed/tmpl/default_navigation.php',
+			'/administrator/components/com_modules/models/fields/index.html',
+			'/administrator/components/com_modules/models/fields/moduleorder.php',
+			'/administrator/components/com_modules/models/fields/moduleposition.php',
+			'/administrator/components/com_newsfeeds/elements/index.html',
+			'/administrator/components/com_newsfeeds/elements/newsfeed.php',
+			'/administrator/components/com_templates/views/prevuuw/index.html',
+			'/administrator/components/com_templates/views/prevuuw/tmpl/default.php',
+			'/administrator/components/com_templates/views/prevuuw/tmpl/index.html',
+			'/administrator/components/com_templates/views/prevuuw/view.html.php',
+			'/administrator/components/com_users/controllers/config.php',
+			'/administrator/includes/menu.php',
+			'/administrator/includes/router.php',
+			'/administrator/language/en-GB/en-GB.plg_system_finder.ini',
+			'/administrator/language/en-GB/en-GB.plg_system_finder.sys.ini',
+			'/administrator/manifests/packages/pkg_joomla.xml',
+			'/administrator/modules/mod_submenu/helper.php',
+			'/administrator/templates/hathor/css/ie6.css',
+			'/administrator/templates/hathor/html/com_languages/installed/default_ftp.php',
+			'/administrator/templates/hathor/html/mod_submenu/index.html',
+			'/administrator/templates/hathor/html/mod_submenu/default.php',
+			'/components/com_media/controller.php',
+			'/components/com_media/helpers/index.html',
+			'/components/com_media/helpers/media.php',
+			'/includes/menu.php',
+			'/includes/pathway.php',
+			'/includes/router.php',
+			'/language/en-GB/en-GB.pkg_joomla.sys.ini',
+			'/libraries/cms/cmsloader.php',
+			'/libraries/cms/controller/index.html',
+			'/libraries/cms/controller/legacy.php',
+			'/libraries/cms/model/index.html',
+			'/libraries/cms/model/legacy.php',
+			'/libraries/cms/schema/changeitemmysql.php',
+			'/libraries/cms/schema/changeitemsqlazure.php',
+			'/libraries/cms/schema/changeitemsqlsrv.php',
+			'/libraries/cms/view/index.html',
+			'/libraries/cms/view/legacy.php',
+			'/libraries/joomla/application/application.php',
+			'/libraries/joomla/application/categories.php',
+			'/libraries/joomla/application/cli/daemon.php',
+			'/libraries/joomla/application/cli/index.html',
+			'/libraries/joomla/application/component/controller.php',
+			'/libraries/joomla/application/component/controlleradmin.php',
+			'/libraries/joomla/application/component/controllerform.php',
+			'/libraries/joomla/application/component/helper.php',
+			'/libraries/joomla/application/component/index.html',
+			'/libraries/joomla/application/component/model.php',
+			'/libraries/joomla/application/component/modeladmin.php',
+			'/libraries/joomla/application/component/modelform.php',
+			'/libraries/joomla/application/component/modelitem.php',
+			'/libraries/joomla/application/component/modellist.php',
+			'/libraries/joomla/application/component/view.php',
+			'/libraries/joomla/application/helper.php',
+			'/libraries/joomla/application/input.php',
+			'/libraries/joomla/application/input/cli.php',
+			'/libraries/joomla/application/input/cookie.php',
+			'/libraries/joomla/application/input/files.php',
+			'/libraries/joomla/application/input/index.html',
+			'/libraries/joomla/application/menu.php',
+			'/libraries/joomla/application/module/helper.php',
+			'/libraries/joomla/application/module/index.html',
+			'/libraries/joomla/application/pathway.php',
+			'/libraries/joomla/application/web/webclient.php',
+			'/libraries/joomla/base/node.php',
+			'/libraries/joomla/base/object.php',
+			'/libraries/joomla/base/observable.php',
+			'/libraries/joomla/base/observer.php',
+			'/libraries/joomla/base/tree.php',
+			'/libraries/joomla/cache/storage/eaccelerator.php',
+			'/libraries/joomla/cache/storage/helpers/helper.php',
+			'/libraries/joomla/cache/storage/helpers/index.html',
+			'/libraries/joomla/database/database/index.html',
+			'/libraries/joomla/database/database/mysql.php',
+			'/libraries/joomla/database/database/mysqlexporter.php',
+			'/libraries/joomla/database/database/mysqli.php',
+			'/libraries/joomla/database/database/mysqliexporter.php',
+			'/libraries/joomla/database/database/mysqliimporter.php',
+			'/libraries/joomla/database/database/mysqlimporter.php',
+			'/libraries/joomla/database/database/mysqliquery.php',
+			'/libraries/joomla/database/database/mysqlquery.php',
+			'/libraries/joomla/database/database/sqlazure.php',
+			'/libraries/joomla/database/database/sqlazurequery.php',
+			'/libraries/joomla/database/database/sqlsrv.php',
+			'/libraries/joomla/database/database/sqlsrvquery.php',
+			'/libraries/joomla/database/exception.php',
+			'/libraries/joomla/database/table.php',
+			'/libraries/joomla/database/table/asset.php',
+			'/libraries/joomla/database/table/category.php',
+			'/libraries/joomla/database/table/content.php',
+			'/libraries/joomla/database/table/extension.php',
+			'/libraries/joomla/database/table/index.html',
+			'/libraries/joomla/database/table/language.php',
+			'/libraries/joomla/database/table/menu.php',
+			'/libraries/joomla/database/table/menutype.php',
+			'/libraries/joomla/database/table/module.php',
+			'/libraries/joomla/database/table/session.php',
+			'/libraries/joomla/database/table/update.php',
+			'/libraries/joomla/database/table/user.php',
+			'/libraries/joomla/database/table/usergroup.php',
+			'/libraries/joomla/database/table/viewlevel.php',
+			'/libraries/joomla/database/tablenested.php',
+			'/libraries/joomla/environment/request.php',
+			'/libraries/joomla/environment/uri.php',
+			'/libraries/joomla/error/error.php',
+			'/libraries/joomla/error/exception.php',
+			'/libraries/joomla/error/index.html',
+			'/libraries/joomla/error/log.php',
+			'/libraries/joomla/error/profiler.php',
+			'/libraries/joomla/filesystem/archive.php',
+			'/libraries/joomla/filesystem/archive/bzip2.php',
+			'/libraries/joomla/filesystem/archive/gzip.php',
+			'/libraries/joomla/filesystem/archive/index.html',
+			'/libraries/joomla/filesystem/archive/tar.php',
+			'/libraries/joomla/filesystem/archive/zip.php',
+			'/libraries/joomla/form/fields/category.php',
+			'/libraries/joomla/form/fields/componentlayout.php',
+			'/libraries/joomla/form/fields/contentlanguage.php',
+			'/libraries/joomla/form/fields/editor.php',
+			'/libraries/joomla/form/fields/editors.php',
+			'/libraries/joomla/form/fields/helpsite.php',
+			'/libraries/joomla/form/fields/media.php',
+			'/libraries/joomla/form/fields/menu.php',
+			'/libraries/joomla/form/fields/menuitem.php',
+			'/libraries/joomla/form/fields/modulelayout.php',
+			'/libraries/joomla/form/fields/templatestyle.php',
+			'/libraries/joomla/form/fields/user.php',
+			'/libraries/joomla/html/editor.php',
+			'/libraries/joomla/html/html/access.php',
+			'/libraries/joomla/html/html/batch.php',
+			'/libraries/joomla/html/html/behavior.php',
+			'/libraries/joomla/html/html/category.php',
+			'/libraries/joomla/html/html/content.php',
+			'/libraries/joomla/html/html/contentlanguage.php',
+			'/libraries/joomla/html/html/date.php',
+			'/libraries/joomla/html/html/email.php',
+			'/libraries/joomla/html/html/form.php',
+			'/libraries/joomla/html/html/grid.php',
+			'/libraries/joomla/html/html/image.php',
+			'/libraries/joomla/html/html/index.html',
+			'/libraries/joomla/html/html/jgrid.php',
+			'/libraries/joomla/html/html/list.php',
+			'/libraries/joomla/html/html/menu.php',
+			'/libraries/joomla/html/html/number.php',
+			'/libraries/joomla/html/html/rules.php',
+			'/libraries/joomla/html/html/select.php',
+			'/libraries/joomla/html/html/sliders.php',
+			'/libraries/joomla/html/html/string.php',
+			'/libraries/joomla/html/html/tabs.php',
+			'/libraries/joomla/html/html/tel.php',
+			'/libraries/joomla/html/html/user.php',
+			'/libraries/joomla/html/pagination.php',
+			'/libraries/joomla/html/pane.php',
+			'/libraries/joomla/html/parameter.php',
+			'/libraries/joomla/html/parameter/element.php',
+			'/libraries/joomla/html/parameter/element/calendar.php',
+			'/libraries/joomla/html/parameter/element/category.php',
+			'/libraries/joomla/html/parameter/element/componentlayouts.php',
+			'/libraries/joomla/html/parameter/element/contentlanguages.php',
+			'/libraries/joomla/html/parameter/element/editors.php',
+			'/libraries/joomla/html/parameter/element/filelist.php',
+			'/libraries/joomla/html/parameter/element/folderlist.php',
+			'/libraries/joomla/html/parameter/element/helpsites.php',
+			'/libraries/joomla/html/parameter/element/hidden.php',
+			'/libraries/joomla/html/parameter/element/imagelist.php',
+			'/libraries/joomla/html/parameter/element/index.html',
+			'/libraries/joomla/html/parameter/element/languages.php',
+			'/libraries/joomla/html/parameter/element/list.php',
+			'/libraries/joomla/html/parameter/element/menu.php',
+			'/libraries/joomla/html/parameter/element/menuitem.php',
+			'/libraries/joomla/html/parameter/element/modulelayouts.php',
+			'/libraries/joomla/html/parameter/element/password.php',
+			'/libraries/joomla/html/parameter/element/radio.php',
+			'/libraries/joomla/html/parameter/element/spacer.php',
+			'/libraries/joomla/html/parameter/element/sql.php',
+			'/libraries/joomla/html/parameter/element/templatestyle.php',
+			'/libraries/joomla/html/parameter/element/text.php',
+			'/libraries/joomla/html/parameter/element/textarea.php',
+			'/libraries/joomla/html/parameter/element/timezones.php',
+			'/libraries/joomla/html/parameter/element/usergroup.php',
+			'/libraries/joomla/html/parameter/index.html',
+			'/libraries/joomla/html/toolbar.php',
+			'/libraries/joomla/html/toolbar/button.php',
+			'/libraries/joomla/html/toolbar/button/confirm.php',
+			'/libraries/joomla/html/toolbar/button/custom.php',
+			'/libraries/joomla/html/toolbar/button/help.php',
+			'/libraries/joomla/html/toolbar/button/index.html',
+			'/libraries/joomla/html/toolbar/button/link.php',
+			'/libraries/joomla/html/toolbar/button/popup.php',
+			'/libraries/joomla/html/toolbar/button/separator.php',
+			'/libraries/joomla/html/toolbar/button/standard.php',
+			'/libraries/joomla/html/toolbar/index.html',
+			'/libraries/joomla/image/filters/brightness.php',
+			'/libraries/joomla/image/filters/contrast.php',
+			'/libraries/joomla/image/filters/edgedetect.php',
+			'/libraries/joomla/image/filters/emboss.php',
+			'/libraries/joomla/image/filters/grayscale.php',
+			'/libraries/joomla/image/filters/index.html',
+			'/libraries/joomla/image/filters/negate.php',
+			'/libraries/joomla/image/filters/sketchy.php',
+			'/libraries/joomla/image/filters/smooth.php',
+			'/libraries/joomla/language/help.php',
+			'/libraries/joomla/language/latin_transliterate.php',
+			'/libraries/joomla/log/logexception.php',
+			'/libraries/joomla/log/loggers/database.php',
+			'/libraries/joomla/log/loggers/echo.php',
+			'/libraries/joomla/log/loggers/formattedtext.php',
+			'/libraries/joomla/log/loggers/index.html',
+			'/libraries/joomla/log/loggers/messagequeue.php',
+			'/libraries/joomla/log/loggers/syslog.php',
+			'/libraries/joomla/log/loggers/w3c.php',
+			'/libraries/joomla/methods.php',
+			'/libraries/joomla/session/storage/eaccelerator.php',
+			'/libraries/joomla/string/stringnormalize.php',
+			'/libraries/joomla/utilities/date.php',
+			'/libraries/joomla/utilities/simplecrypt.php',
+			'/libraries/joomla/utilities/simplexml.php',
+			'/libraries/joomla/utilities/string.php',
+			'/libraries/joomla/utilities/xmlelement.php',
+			'/media/com_finder/images/calendar.png',
+			'/media/com_finder/images/index.html',
+			'/media/com_finder/images/mime/index.html',
+			'/media/com_finder/images/mime/pdf.png',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/tiny_mce_src.js',
+			'/media/plg_quickicon_extensionupdate/extensionupdatecheck.js',
+			'/media/plg_quickicon_joomlaupdate/jupdatecheck.js',
+
+			/*
+			 * Joomla! 3.0.0 thru 3.1.0
+			 */
+			'/administrator/components/com_languages/views/installed/tmpl/default_ftp.php',
+			'/administrator/language/en-GB/en-GB.plg_content_geshi.ini',
+			'/administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini',
+			'/administrator/templates/hathor/html/com_contact/contact/edit_metadata.php',
+			'/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_metadata.php',
+			'/administrator/templates/hathor/html/com_weblinks/weblink/edit_metadata.php',
+			'/administrator/templates/hathor/html/mod_submenu/default.php',
+			'/administrator/templates/hathor/html/mod_submenu/index.html',
+			'/libraries/cms/feed/entry.php',
+			'/libraries/cms/feed/factory.php',
+			'/libraries/cms/feed/feed.php',
+			'/libraries/cms/feed/index.html',
+			'/libraries/cms/feed/link.php',
+			'/libraries/cms/feed/parser.php',
+			'/libraries/cms/feed/parser/atom.php',
+			'/libraries/cms/feed/parser/index.html',
+			'/libraries/cms/feed/parser/namespace.php',
+			'/libraries/cms/feed/parser/rss.php',
+			'/libraries/cms/feed/person.php',
+			'/libraries/joomla/form/rules/boolean.php',
+			'/libraries/joomla/form/rules/color.php',
+			'/libraries/joomla/form/rules/email.php',
+			'/libraries/joomla/form/rules/equals.php',
+			'/libraries/joomla/form/rules/index.html',
+			'/libraries/joomla/form/rules/options.php',
+			'/libraries/joomla/form/rules/rules.php',
+			'/libraries/joomla/form/rules/tel.php',
+			'/libraries/joomla/form/rules/url.php',
+			'/libraries/joomla/form/rules/username.php',
+			'/libraries/joomla/installer/adapters/component.php',
+			'/libraries/joomla/installer/adapters/file.php',
+			'/libraries/joomla/installer/adapters/index.html',
+			'/libraries/joomla/installer/adapters/language.php',
+			'/libraries/joomla/installer/adapters/library.php',
+			'/libraries/joomla/installer/adapters/module.php',
+			'/libraries/joomla/installer/adapters/package.php',
+			'/libraries/joomla/installer/adapters/plugin.php',
+			'/libraries/joomla/installer/adapters/template.php',
+			'/libraries/joomla/installer/extension.php',
+			'/libraries/joomla/installer/helper.php',
+			'/libraries/joomla/installer/index.html',
+			'/libraries/joomla/installer/installer.php',
+			'/libraries/joomla/installer/librarymanifest.php',
+			'/libraries/joomla/installer/packagemanifest.php',
+			'/media/system/css/mooRainbow.css',
+			'/media/system/js/mooRainbow-uncompressed.js',
+			'/media/system/js/mooRainbow.js',
+			'/media/system/js/swf-uncompressed.js',
+			'/media/system/js/swf.js',
+			'/media/system/js/uploader-uncompressed.js',
+			'/media/system/js/uploader.js',
+			'/media/system/swf/index.html',
+			'/media/system/swf/uploader.swf',
+
+			/*
+			 * Joomla! 3.1.0 thru 3.2.0
+			 */
+			'/administrator/components/com_banners/models/fields/ordering.php',
+			'/administrator/components/com_config/helper/component.php',
+			'/administrator/components/com_config/models/fields/filters.php',
+			'/administrator/components/com_config/models/fields/index.html',
+			'/administrator/components/com_config/models/forms/application.xml',
+			'/administrator/components/com_config/models/forms/index.html',
+			'/administrator/components/com_config/views/application/index.html',
+			'/administrator/components/com_config/views/application/tmpl/default.php',
+			'/administrator/components/com_config/views/application/tmpl/default_cache.php',
+			'/administrator/components/com_config/views/application/tmpl/default_cookie.php',
+			'/administrator/components/com_config/views/application/tmpl/default_database.php',
+			'/administrator/components/com_config/views/application/tmpl/default_debug.php',
+			'/administrator/components/com_config/views/application/tmpl/default_filters.php',
+			'/administrator/components/com_config/views/application/tmpl/default_ftp.php',
+			'/administrator/components/com_config/views/application/tmpl/default_ftplogin.php',
+			'/administrator/components/com_config/views/application/tmpl/default_locale.php',
+			'/administrator/components/com_config/views/application/tmpl/default_mail.php',
+			'/administrator/components/com_config/views/application/tmpl/default_metadata.php',
+			'/administrator/components/com_config/views/application/tmpl/default_navigation.php',
+			'/administrator/components/com_config/views/application/tmpl/default_permissions.php',
+			'/administrator/components/com_config/views/application/tmpl/default_seo.php',
+			'/administrator/components/com_config/views/application/tmpl/default_server.php',
+			'/administrator/components/com_config/views/application/tmpl/default_session.php',
+			'/administrator/components/com_config/views/application/tmpl/default_site.php',
+			'/administrator/components/com_config/views/application/tmpl/default_system.php',
+			'/administrator/components/com_config/views/application/tmpl/index.html',
+			'/administrator/components/com_config/views/application/view.html.php',
+			'/administrator/components/com_config/views/close/index.html',
+			'/administrator/components/com_config/views/close/view.html.php',
+			'/administrator/components/com_config/views/component/index.html',
+			'/administrator/components/com_config/views/component/tmpl/default.php',
+			'/administrator/components/com_config/views/component/tmpl/default_navigation.php',
+			'/administrator/components/com_config/views/component/tmpl/index.html',
+			'/administrator/components/com_config/views/component/view.html.php',
+			'/administrator/components/com_config/views/index.html',
+			'/administrator/components/com_contact/models/fields/modal/contacts.php',
+			'/administrator/components/com_contact/models/fields/ordering.php',
+			'/administrator/components/com_newsfeeds/models/fields/modal/newsfeeds.php',
+			'/administrator/components/com_newsfeeds/models/fields/ordering.php',
+			'/administrator/components/com_plugins/models/fields/ordering.php',
+			'/administrator/components/com_templates/controllers/source.php',
+			'/administrator/components/com_templates/models/source.php',
+			'/administrator/components/com_templates/views/source/index.html',
+			'/administrator/components/com_templates/views/source/tmpl/edit.php',
+			'/administrator/components/com_templates/views/source/tmpl/edit_ftp.php',
+			'/administrator/components/com_templates/views/source/tmpl/index.html',
+			'/administrator/components/com_templates/views/source/view.html.php',
+			'/administrator/components/com_weblinks/models/fields/index.html',
+			'/administrator/components/com_weblinks/models/fields/ordering.php',
+			'/administrator/help/en-GB/Components_Banners_Banners.html',
+			'/administrator/help/en-GB/Components_Banners_Banners_Edit.html',
+			'/administrator/help/en-GB/Components_Banners_Categories.html',
+			'/administrator/help/en-GB/Components_Banners_Category_Edit.html',
+			'/administrator/help/en-GB/Components_Banners_Clients.html',
+			'/administrator/help/en-GB/Components_Banners_Clients_Edit.html',
+			'/administrator/help/en-GB/Components_Banners_Tracks.html',
+			'/administrator/help/en-GB/Components_Contact_Categories.html',
+			'/administrator/help/en-GB/Components_Contact_Category_Edit.html',
+			'/administrator/help/en-GB/Components_Contacts_Contacts.html',
+			'/administrator/help/en-GB/Components_Contacts_Contacts_Edit.html',
+			'/administrator/help/en-GB/Components_Content_Categories.html',
+			'/administrator/help/en-GB/Components_Content_Category_Edit.html',
+			'/administrator/help/en-GB/Components_Messaging_Inbox.html',
+			'/administrator/help/en-GB/Components_Messaging_Read.html',
+			'/administrator/help/en-GB/Components_Messaging_Write.html',
+			'/administrator/help/en-GB/Components_Newsfeeds_Categories.html',
+			'/administrator/help/en-GB/Components_Newsfeeds_Category_Edit.html',
+			'/administrator/help/en-GB/Components_Newsfeeds_Feeds.html',
+			'/administrator/help/en-GB/Components_Newsfeeds_Feeds_Edit.html',
+			'/administrator/help/en-GB/Components_Redirect_Manager.html',
+			'/administrator/help/en-GB/Components_Redirect_Manager_Edit.html',
+			'/administrator/help/en-GB/Components_Search.html',
+			'/administrator/help/en-GB/Components_Weblinks_Categories.html',
+			'/administrator/help/en-GB/Components_Weblinks_Category_Edit.html',
+			'/administrator/help/en-GB/Components_Weblinks_Links.html',
+			'/administrator/help/en-GB/Components_Weblinks_Links_Edit.html',
+			'/administrator/help/en-GB/Content_Article_Manager.html',
+			'/administrator/help/en-GB/Content_Article_Manager_Edit.html',
+			'/administrator/help/en-GB/Content_Featured_Articles.html',
+			'/administrator/help/en-GB/Content_Media_Manager.html',
+			'/administrator/help/en-GB/Extensions_Extension_Manager_Discover.html',
+			'/administrator/help/en-GB/Extensions_Extension_Manager_Install.html',
+			'/administrator/help/en-GB/Extensions_Extension_Manager_Manage.html',
+			'/administrator/help/en-GB/Extensions_Extension_Manager_Update.html',
+			'/administrator/help/en-GB/Extensions_Extension_Manager_Warnings.html',
+			'/administrator/help/en-GB/Extensions_Language_Manager_Content.html',
+			'/administrator/help/en-GB/Extensions_Language_Manager_Edit.html',
+			'/administrator/help/en-GB/Extensions_Language_Manager_Installed.html',
+			'/administrator/help/en-GB/Extensions_Module_Manager.html',
+			'/administrator/help/en-GB/Extensions_Module_Manager_Edit.html',
+			'/administrator/help/en-GB/Extensions_Plugin_Manager.html',
+			'/administrator/help/en-GB/Extensions_Plugin_Manager_Edit.html',
+			'/administrator/help/en-GB/Extensions_Template_Manager_Styles.html',
+			'/administrator/help/en-GB/Extensions_Template_Manager_Styles_Edit.html',
+			'/administrator/help/en-GB/Extensions_Template_Manager_Templates.html',
+			'/administrator/help/en-GB/Extensions_Template_Manager_Templates_Edit.html',
+			'/administrator/help/en-GB/Extensions_Template_Manager_Templates_Edit_Source.html',
+			'/administrator/help/en-GB/Glossary.html',
+			'/administrator/help/en-GB/Menus_Menu_Item_Manager.html',
+			'/administrator/help/en-GB/Menus_Menu_Item_Manager_Edit.html',
+			'/administrator/help/en-GB/Menus_Menu_Manager.html',
+			'/administrator/help/en-GB/Menus_Menu_Manager_Edit.html',
+			'/administrator/help/en-GB/Site_Global_Configuration.html',
+			'/administrator/help/en-GB/Site_Maintenance_Clear_Cache.html',
+			'/administrator/help/en-GB/Site_Maintenance_Global_Check-in.html',
+			'/administrator/help/en-GB/Site_Maintenance_Purge_Expired_Cache.html',
+			'/administrator/help/en-GB/Site_System_Information.html',
+			'/administrator/help/en-GB/Start_Here.html',
+			'/administrator/help/en-GB/Users_Access_Levels.html',
+			'/administrator/help/en-GB/Users_Access_Levels_Edit.html',
+			'/administrator/help/en-GB/Users_Debug_Users.html',
+			'/administrator/help/en-GB/Users_Groups.html',
+			'/administrator/help/en-GB/Users_Groups_Edit.html',
+			'/administrator/help/en-GB/Users_Mass_Mail_Users.html',
+			'/administrator/help/en-GB/Users_User_Manager.html',
+			'/administrator/help/en-GB/Users_User_Manager_Edit.html',
+			'/administrator/help/en-GB/css/docbook.css',
+			'/administrator/help/en-GB/css/help.css',
+			'/administrator/includes/application.php',
+			'/includes/application.php',
+			'/libraries/joomla/application/router.php',
+			'/libraries/joomla/environment/response.php',
+			'/libraries/joomla/html/access.php',
+			'/libraries/joomla/html/behavior.php',
+			'/libraries/joomla/html/content.php',
+			'/libraries/joomla/html/date.php',
+			'/libraries/joomla/html/email.php',
+			'/libraries/joomla/html/form.php',
+			'/libraries/joomla/html/grid.php',
+			'/libraries/joomla/html/html.php',
+			'/libraries/joomla/html/index.html',
+			'/libraries/joomla/html/jgrid.php',
+			'/libraries/joomla/html/language/en-GB/en-GB.jhtmldate.ini',
+			'/libraries/joomla/html/language/en-GB/index.html',
+			'/libraries/joomla/html/language/index.html',
+			'/libraries/joomla/html/list.php',
+			'/libraries/joomla/html/number.php',
+			'/libraries/joomla/html/rules.php',
+			'/libraries/joomla/html/select.php',
+			'/libraries/joomla/html/sliders.php',
+			'/libraries/joomla/html/string.php',
+			'/libraries/joomla/html/tabs.php',
+			'/libraries/joomla/html/tel.php',
+			'/libraries/joomla/html/user.php',
+			'/libraries/joomla/pagination/index.html',
+			'/libraries/joomla/pagination/object.php',
+			'/libraries/joomla/pagination/pagination.php',
+			'/libraries/joomla/plugin/helper.php',
+			'/libraries/joomla/plugin/index.html',
+			'/libraries/joomla/plugin/plugin.php',
+			'/libraries/legacy/application/helper.php',
+			'/libraries/legacy/component/helper.php',
+			'/libraries/legacy/component/index.html',
+			'/libraries/legacy/html/contentlanguage.php',
+			'/libraries/legacy/html/index.html',
+			'/libraries/legacy/html/menu.php',
+			'/libraries/legacy/menu/index.html',
+			'/libraries/legacy/menu/menu.php',
+			'/libraries/legacy/module/helper.php',
+			'/libraries/legacy/module/index.html',
+			'/libraries/legacy/pathway/index.html',
+			'/libraries/legacy/pathway/pathway.php',
+			'/media/editors/codemirror/css/csscolors.css',
+			'/media/editors/codemirror/css/jscolors.css',
+			'/media/editors/codemirror/css/phpcolors.css',
+			'/media/editors/codemirror/css/sparqlcolors.css',
+			'/media/editors/codemirror/css/xmlcolors.css',
+			'/media/editors/codemirror/js/basefiles-uncompressed.js',
+			'/media/editors/codemirror/js/basefiles.js',
+			'/media/editors/codemirror/js/codemirror-uncompressed.js',
+			'/media/editors/codemirror/js/editor.js',
+			'/media/editors/codemirror/js/highlight.js',
+			'/media/editors/codemirror/js/mirrorframe.js',
+			'/media/editors/codemirror/js/parsecss.js',
+			'/media/editors/codemirror/js/parsedummy.js',
+			'/media/editors/codemirror/js/parsehtmlmixed.js',
+			'/media/editors/codemirror/js/parsejavascript.js',
+			'/media/editors/codemirror/js/parsephp.js',
+			'/media/editors/codemirror/js/parsephphtmlmixed.js',
+			'/media/editors/codemirror/js/parsesparql.js',
+			'/media/editors/codemirror/js/parsexml.js',
+			'/media/editors/codemirror/js/select.js',
+			'/media/editors/codemirror/js/stringstream.js',
+			'/media/editors/codemirror/js/tokenize.js',
+			'/media/editors/codemirror/js/tokenizejavascript.js',
+			'/media/editors/codemirror/js/tokenizephp.js',
+			'/media/editors/codemirror/js/undo.js',
+			'/media/editors/codemirror/js/util.js',
+			'/media/editors/tinymce/jscripts/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/langs/en.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/license.txt',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/advlist/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autolink/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autoresize/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autosave/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/autosave/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/bbcode/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/contextmenu/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/directionality/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/fullscreen/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/iespell/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/insertdatetime/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/layer/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/lists/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/css/media.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/js/media.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/media.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/nonbreaking/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/noneditable/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/example.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/preview/preview.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/print/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/save/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/css/props.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/js/props.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/props.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/style/readme.txt',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/cell.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/css/row.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/css/table.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/js/row.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/js/table.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/row.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/table/table.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/blank.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/css/template.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/js/template.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/template/template.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualblocks/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/visualchars/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/wordcount/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/about.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/image.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/link.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/langs/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css',
+			'/media/editors/tinymce/jscripts/tiny_mce/tiny_mce.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/tiny_mce_popup.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/utils/editable_selects.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/utils/form_utils.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/utils/index.html',
+			'/media/editors/tinymce/jscripts/tiny_mce/utils/mctabs.js',
+			'/media/editors/tinymce/jscripts/tiny_mce/utils/validate.js',
+			'/media/editors/tinymce/templates/template_list.js',
+			'/media/system/swf/uploader.swf',
+			'/templates/protostar/html/editor_content.css',
+
+			/*
+			 * Joomla! 3.2.0 thru 3.3.0
+			 */
+			'/libraries/fof/platform/joomla.php',
+			'/libraries/fof/readme.txt',
+			'/libraries/joomla/github/gists.php',
+			'/libraries/joomla/github/issues.php',
+			'/libraries/joomla/github/pulls.php',
+			'/libraries/joomla/github/users.php',
+			'/libraries/joomla/registry/format.php',
+			'/libraries/joomla/registry/format/index.html',
+			'/libraries/joomla/registry/format/ini.php',
+			'/libraries/joomla/registry/format/json.php',
+			'/libraries/joomla/registry/format/php.php',
+			'/libraries/joomla/registry/format/xml.php',
+			'/libraries/joomla/registry/index.html',
+			'/libraries/joomla/registry/registry.php',
+			'/media/com_finder/js/finder.js',
+			'/media/com_finder/js/highlighter.js',
+			'/plugins/user/joomla/postinstall/actions.php',
+			'/plugins/user/joomla/postinstall/index.html',
+
+			/*
+			 * Joomla! 3.3.0 thru 3.4.0
+			 */
+			'/administrator/components/com_tags/helpers/html/index.html',
+			'/administrator/components/com_tags/models/fields/index.html',
+			'/administrator/manifests/libraries/phpmailer.xml',
+			'/administrator/templates/hathor/html/com_finder/filter/index.html',
+			'/administrator/templates/hathor/html/com_finder/statistics/index.html',
+			'/administrator/templates/isis/html/message.php',
+			'/components/com_contact/helpers/icon.php',
+			'/language/en-GB/en-GB.lib_phpmailer.sys.ini',
+			'/libraries/compat/jsonserializable.php',
+			'/libraries/compat/password/LICENSE.md',
+			'/libraries/compat/password/lib/password.php',
+			'/libraries/compat/password/lib/version_test.php',
+			'/libraries/framework/Joomla/Application/Cli/CliOutput.php',
+			'/libraries/framework/Joomla/Application/Cli/ColorProcessor.php',
+			'/libraries/framework/Joomla/Application/Cli/ColorStyle.php',
+			'/libraries/framework/Joomla/Application/Cli/Output/Processor/ColorProcessor.php',
+			'/libraries/framework/Joomla/Application/Cli/Output/Processor/ProcessorInterface.php',
+			'/libraries/framework/Joomla/Application/Cli/Output/Stdout.php',
+			'/libraries/framework/Joomla/Application/Cli/Output/Xml.php',
+			'/libraries/framework/Joomla/DI/Container.php',
+			'/libraries/framework/Joomla/DI/ContainerAwareInterface.php',
+			'/libraries/framework/Joomla/DI/Exception/DependencyResolutionException.php',
+			'/libraries/framework/Joomla/DI/ServiceProviderInterface.php',
+			'/libraries/framework/Joomla/Registry/AbstractRegistryFormat.php',
+			'/libraries/framework/Joomla/Registry/Format/Ini.php',
+			'/libraries/framework/Joomla/Registry/Format/Json.php',
+			'/libraries/framework/Joomla/Registry/Format/Php.php',
+			'/libraries/framework/Joomla/Registry/Format/Xml.php',
+			'/libraries/framework/Joomla/Registry/Format/Yaml.php',
+			'/libraries/framework/Joomla/Registry/Registry.php',
+			'/libraries/framework/Symfony/Component/Yaml/Dumper.php',
+			'/libraries/framework/Symfony/Component/Yaml/Escaper.php',
+			'/libraries/framework/Symfony/Component/Yaml/Exception/DumpException.php',
+			'/libraries/framework/Symfony/Component/Yaml/Exception/ExceptionInterface.php',
+			'/libraries/framework/Symfony/Component/Yaml/Exception/ParseException.php',
+			'/libraries/framework/Symfony/Component/Yaml/Exception/RuntimeException.php',
+			'/libraries/framework/Symfony/Component/Yaml/Inline.php',
+			'/libraries/framework/Symfony/Component/Yaml/LICENSE',
+			'/libraries/framework/Symfony/Component/Yaml/Parser.php',
+			'/libraries/framework/Symfony/Component/Yaml/Unescaper.php',
+			'/libraries/framework/Symfony/Component/Yaml/Yaml.php',
+			'/libraries/joomla/string/inflector.php',
+			'/libraries/joomla/string/normalise.php',
+			'/libraries/phpmailer/LICENSE',
+			'/libraries/phpmailer/language/phpmailer.lang-joomla.php',
+			'/libraries/phpmailer/phpmailer.php',
+			'/libraries/phpmailer/pop3.php',
+			'/libraries/phpmailer/smtp.php',
+			'/media/editors/codemirror/css/ambiance.css',
+			'/media/editors/codemirror/css/codemirror.css',
+			'/media/editors/codemirror/css/configuration.css',
+			'/media/editors/codemirror/js/brace-fold.js',
+			'/media/editors/codemirror/js/clike.js',
+			'/media/editors/codemirror/js/closebrackets.js',
+			'/media/editors/codemirror/js/closetag.js',
+			'/media/editors/codemirror/js/codemirror.js',
+			'/media/editors/codemirror/js/css.js',
+			'/media/editors/codemirror/js/foldcode.js',
+			'/media/editors/codemirror/js/foldgutter.js',
+			'/media/editors/codemirror/js/fullscreen.js',
+			'/media/editors/codemirror/js/htmlmixed.js',
+			'/media/editors/codemirror/js/indent-fold.js',
+			'/media/editors/codemirror/js/javascript.js',
+			'/media/editors/codemirror/js/less.js',
+			'/media/editors/codemirror/js/matchbrackets.js',
+			'/media/editors/codemirror/js/matchtags.js',
+			'/media/editors/codemirror/js/php.js',
+			'/media/editors/codemirror/js/xml-fold.js',
+			'/media/editors/codemirror/js/xml.js',
+			'/media/system/js/validate-jquery-uncompressed.js',
+			'/templates/beez3/html/message.php',
+
+			/*
+			 * Joomla! 3.4.0 thru 3.5.0
+			 */
+			'/administrator/components/com_config/controller/application/refreshhelp.php',
+			'/administrator/components/com_media/models/forms/index.html',
+			'/administrator/templates/hathor/html/com_categories/categories/default_batch.php',
+			'/administrator/templates/hathor/html/com_tags/tags/default_batch.php',
+			'/components/com_wrapper/views/wrapper/metadata.xml',
+			'/libraries/classloader.php',
+			'/libraries/ClassLoader.php',
+			'/libraries/composer_autoload.php',
+			'/libraries/fof/LICENSE.txt',
+			'/libraries/joomla/document/error/error.php',
+			'/libraries/joomla/document/feed/feed.php',
+			'/libraries/joomla/document/html/html.php',
+			'/libraries/joomla/document/image/image.php',
+			'/libraries/joomla/document/json/json.php',
+			'/libraries/joomla/document/opensearch/opensearch.php',
+			'/libraries/joomla/document/raw/raw.php',
+			'/libraries/joomla/document/xml/xml.php',
+			'/libraries/vendor/phpmailer/phpmailer/extras/class.html2text.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Dumper.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/DumpException.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ExceptionInterface.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/RuntimeException.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Inline.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/LICENSE',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Unescaper.php',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Yaml.php',
+			'/media/com_banners/banner.js',
+			'/media/com_finder/css/finder-rtl.css',
+			'/media/com_finder/css/selectfilter.css',
+			'/media/com_finder/css/sliderfilter.css',
+			'/media/com_finder/js/sliderfilter.js',
+			'/media/com_joomlaupdate/default.js',
+			'/media/com_joomlaupdate/encryption.js',
+			'/media/com_joomlaupdate/json2.js',
+			'/media/com_joomlaupdate/update.js',
+			'/media/editors/codemirror/lib/addons-uncompressed.js',
+			'/media/editors/codemirror/lib/codemirror-uncompressed.css',
+			'/media/editors/codemirror/lib/codemirror-uncompressed.js',
+			'/media/editors/codemirror/mode/clike/scala.html',
+			'/media/editors/codemirror/mode/css/less.html',
+			'/media/editors/codemirror/mode/css/less_test.js',
+			'/media/editors/codemirror/mode/css/scss.html',
+			'/media/editors/codemirror/mode/css/scss_test.js',
+			'/media/editors/codemirror/mode/css/test.js',
+			'/media/editors/codemirror/mode/gfm/test.js',
+			'/media/editors/codemirror/mode/haml/test.js',
+			'/media/editors/codemirror/mode/javascript/json-ld.html',
+			'/media/editors/codemirror/mode/javascript/test.js',
+			'/media/editors/codemirror/mode/javascript/typescript.html',
+			'/media/editors/codemirror/mode/kotlin/kotlin.js',
+			'/media/editors/codemirror/mode/kotlin/kotlin.min.js',
+			'/media/editors/codemirror/mode/markdown/test.js',
+			'/media/editors/codemirror/mode/php/test.js',
+			'/media/editors/codemirror/mode/ruby/test.js',
+			'/media/editors/codemirror/mode/shell/test.js',
+			'/media/editors/codemirror/mode/slim/test.js',
+			'/media/editors/codemirror/mode/smartymixed/smartymixed.js',
+			'/media/editors/codemirror/mode/stex/test.js',
+			'/media/editors/codemirror/mode/textile/test.js',
+			'/media/editors/codemirror/mode/verilog/test.js',
+			'/media/editors/codemirror/mode/xml/test.js',
+			'/media/editors/codemirror/mode/xquery/test.js',
+			'/media/editors/tinymce/plugins/compat3x/editable_selects.js',
+			'/media/editors/tinymce/plugins/compat3x/form_utils.js',
+			'/media/editors/tinymce/plugins/compat3x/mctabs.js',
+			'/media/editors/tinymce/plugins/compat3x/tiny_mce_popup.js',
+			'/media/editors/tinymce/plugins/compat3x/validate.js',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.eot',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.svg',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.ttf',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon-small.woff',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.eot',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.svg',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.ttf',
+			'/media/editors/tinymce/skins/lightgray/fonts/icomoon.woff',
+			'/media/editors/tinymce/skins/lightgray/fonts/readme.md',
+			'/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg',
+			'/media/editors/tinymce/skins/lightgray/fonts/tinymce.dev.svg',
+			'/media/editors/tinymce/skins/lightgray/img/wline.gif',
+			'/media/jui/img/ajax-loader.gif',
+			'/media/mod_languages/images/km_kr.gif',
+			'/media/mod_languages/images/si_LK.gif',
+			'/plugins/editors/codemirror/styles.css',
+			'/plugins/editors/codemirror/styles.min.css',
+
+			/*
+			 * Joomla! 3.5.0 thru 3.6.0
+			 */
+			'/administrator/components/com_installer/views/languages/tmpl/default_filter.php',
+			'/administrator/components/com_joomlaupdate/helpers/download.php',
+			'/administrator/manifests/libraries/simplepie.xml',
+			'/administrator/templates/isis/js/bootstrap.min.js',
+			'/administrator/templates/isis/js/jquery.js',
+			'/libraries/joomla/application/web/client.php',
+			'/libraries/simplepie/LICENSE.txt',
+			'/libraries/simplepie/README.txt',
+			'/libraries/simplepie/idn/LICENCE',
+			'/libraries/simplepie/idn/ReadMe.txt',
+			'/libraries/simplepie/idn/idna_convert.class.php',
+			'/libraries/simplepie/idn/npdata.ser',
+			'/libraries/simplepie/simplepie.php',
+			'/media/mod_languages/images/si_lk.gif',
+			'/media/system/js/permissions.min.js',
+			'/plugins/editors/tinymce/fields/skins.php',
+			'/plugins/user/profile/fields/dob.php',
+			'/plugins/user/profile/fields/tos.php',
+
+			/*
+			 * Joomla! 3.6.0 thru 3.7.0
+			 */
+			'/administrator/components/com_banners/views/banners/tmpl/default_batch.php',
+			'/administrator/components/com_cache/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_categories/views/categories/tmpl/default_batch.php',
+			'/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php',
+			'/administrator/components/com_categories/views/category/tmpl/edit_options.php',
+			'/administrator/components/com_content/views/articles/tmpl/default_batch.php',
+			'/administrator/components/com_installer/controllers/languages.php',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php',
+			'/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php',
+			'/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php',
+			'/administrator/components/com_media/views/medialist/tmpl/thumbs_video.php',
+			'/administrator/components/com_menus/views/items/tmpl/default_batch.php',
+			'/administrator/components/com_messages/layouts/toolbar/mysettings.php',
+			'/administrator/components/com_modules/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_modules/views/modules/tmpl/default_batch.php',
+			'/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php',
+			'/administrator/components/com_redirect/views/links/tmpl/default_batch.php',
+			'/administrator/components/com_tags/views/tags/tmpl/default_batch.php',
+			'/administrator/components/com_templates/layouts/joomla/searchtools/default.php',
+			'/administrator/components/com_templates/layouts/joomla/searchtools/default/bar.php',
+			'/administrator/components/com_users/models/fields/components.php',
+			'/administrator/components/com_users/views/users/tmpl/default_batch.php',
+			'/administrator/modules/mod_menu/tmpl/default_disabled.php',
+			'/administrator/modules/mod_menu/tmpl/default_enabled.php',
+			'/administrator/templates/hathor/html/mod_menu/default_enabled.php',
+			'/components/com_contact/metadata.xml',
+			'/components/com_contact/views/category/metadata.xml',
+			'/components/com_contact/views/contact/metadata.xml',
+			'/components/com_contact/views/featured/metadata.xml',
+			'/components/com_content/metadata.xml',
+			'/components/com_content/views/archive/metadata.xml',
+			'/components/com_content/views/article/metadata.xml',
+			'/components/com_content/views/categories/metadata.xml',
+			'/components/com_content/views/category/metadata.xml',
+			'/components/com_content/views/featured/metadata.xml',
+			'/components/com_content/views/form/metadata.xml',
+			'/components/com_finder/views/search/metadata.xml',
+			'/components/com_mailto/views/mailto/metadata.xml',
+			'/components/com_mailto/views/sent/metadata.xml',
+			'/components/com_newsfeeds/metadata.xml',
+			'/components/com_newsfeeds/views/category/metadata.xml',
+			'/components/com_newsfeeds/views/newsfeed/metadata.xml',
+			'/components/com_search/views/search/metadata.xml',
+			'/components/com_tags/metadata.xml',
+			'/components/com_tags/views/tag/metadata.xml',
+			'/components/com_users/metadata.xml',
+			'/components/com_users/views/login/metadata.xml',
+			'/components/com_users/views/profile/metadata.xml',
+			'/components/com_users/views/registration/metadata.xml',
+			'/components/com_users/views/remind/metadata.xml',
+			'/components/com_users/views/reset/metadata.xml',
+			'/components/com_wrapper/metadata.xml',
+			'/libraries/joomla/data/data.php',
+			'/libraries/joomla/data/dumpable.php',
+			'/libraries/joomla/data/set.php',
+			'/libraries/joomla/database/iterator/azure.php',
+			'/libraries/joomla/user/authentication.php',
+			'/libraries/platform.php',
+			'/media/editors/codemirror/mode/jade/jade.js',
+			'/media/editors/codemirror/mode/jade/jade.min.js',
+			'/media/editors/none/none.js',
+			'/media/editors/none/none.min.js',
+			'/media/editors/tinymce/plugins/jdragdrop/plugin.js',
+			'/media/editors/tinymce/plugins/jdragdrop/plugin.min.js',
+			'/media/editors/tinymce/plugins/media/moxieplayer.swf',
+			'/media/system/js/tiny-close.js',
+			'/media/system/js/tiny-close.min.js',
+
+			/*
+			 * Joomla! 3.7.0 thru 3.8.0
+			 */
+			'/administrator/components/com_admin/postinstall/phpversion.php',
+			'/administrator/components/com_content/models/fields/votelist.php',
+			'/administrator/modules/mod_menu/preset/disabled.php',
+			'/administrator/modules/mod_menu/preset/enabled.php',
+			'/components/com_content/layouts/field/prepare/modal_article.php',
+			'/components/com_fields/controllers/field.php',
+			'/libraries/cms/application/administrator.php',
+			'/libraries/cms/application/cms.php',
+			'/libraries/cms/application/helper.php',
+			'/libraries/cms/application/site.php',
+			'/libraries/cms/authentication/helper.php',
+			'/libraries/cms/captcha/captcha.php',
+			'/libraries/cms/component/exception/missing.php',
+			'/libraries/cms/component/helper.php',
+			'/libraries/cms/component/record.php',
+			'/libraries/cms/component/router/base.php',
+			'/libraries/cms/component/router/interface.php',
+			'/libraries/cms/component/router/legacy.php',
+			'/libraries/cms/component/router/rules/interface.php',
+			'/libraries/cms/component/router/rules/menu.php',
+			'/libraries/cms/component/router/rules/nomenu.php',
+			'/libraries/cms/component/router/rules/standard.php',
+			'/libraries/cms/component/router/view.php',
+			'/libraries/cms/component/router/viewconfiguration.php',
+			'/libraries/cms/editor/editor.php',
+			'/libraries/cms/error/page.php',
+			'/libraries/cms/form/field/author.php',
+			'/libraries/cms/form/field/captcha.php',
+			'/libraries/cms/form/field/chromestyle.php',
+			'/libraries/cms/form/field/contenthistory.php',
+			'/libraries/cms/form/field/contentlanguage.php',
+			'/libraries/cms/form/field/contenttype.php',
+			'/libraries/cms/form/field/editor.php',
+			'/libraries/cms/form/field/frontend_language.php',
+			'/libraries/cms/form/field/headertag.php',
+			'/libraries/cms/form/field/helpsite.php',
+			'/libraries/cms/form/field/lastvisitdaterange.php',
+			'/libraries/cms/form/field/limitbox.php',
+			'/libraries/cms/form/field/media.php',
+			'/libraries/cms/form/field/menu.php',
+			'/libraries/cms/form/field/menuitem.php',
+			'/libraries/cms/form/field/moduleorder.php',
+			'/libraries/cms/form/field/moduleposition.php',
+			'/libraries/cms/form/field/moduletag.php',
+			'/libraries/cms/form/field/ordering.php',
+			'/libraries/cms/form/field/plugin_status.php',
+			'/libraries/cms/form/field/registrationdaterange.php',
+			'/libraries/cms/form/field/status.php',
+			'/libraries/cms/form/field/tag.php',
+			'/libraries/cms/form/field/templatestyle.php',
+			'/libraries/cms/form/field/user.php',
+			'/libraries/cms/form/field/useractive.php',
+			'/libraries/cms/form/field/usergrouplist.php',
+			'/libraries/cms/form/field/userstate.php',
+			'/libraries/cms/form/rule/captcha.php',
+			'/libraries/cms/form/rule/notequals.php',
+			'/libraries/cms/form/rule/password.php',
+			'/libraries/cms/help/help.php',
+			'/libraries/cms/helper/content.php',
+			'/libraries/cms/helper/contenthistory.php',
+			'/libraries/cms/helper/helper.php',
+			'/libraries/cms/helper/media.php',
+			'/libraries/cms/helper/route.php',
+			'/libraries/cms/helper/tags.php',
+			'/libraries/cms/helper/usergroups.php',
+			'/libraries/cms/html/html.php',
+			'/libraries/cms/installer/adapter.php',
+			'/libraries/cms/installer/adapter/component.php',
+			'/libraries/cms/installer/adapter/file.php',
+			'/libraries/cms/installer/adapter/language.php',
+			'/libraries/cms/installer/adapter/library.php',
+			'/libraries/cms/installer/adapter/module.php',
+			'/libraries/cms/installer/adapter/package.php',
+			'/libraries/cms/installer/adapter/plugin.php',
+			'/libraries/cms/installer/adapter/template.php',
+			'/libraries/cms/installer/extension.php',
+			'/libraries/cms/installer/helper.php',
+			'/libraries/cms/installer/installer.php',
+			'/libraries/cms/installer/manifest.php',
+			'/libraries/cms/installer/manifest/library.php',
+			'/libraries/cms/installer/manifest/package.php',
+			'/libraries/cms/installer/script.php',
+			'/libraries/cms/language/associations.php',
+			'/libraries/cms/language/multilang.php',
+			'/libraries/cms/layout/base.php',
+			'/libraries/cms/layout/file.php',
+			'/libraries/cms/layout/helper.php',
+			'/libraries/cms/layout/layout.php',
+			'/libraries/cms/library/helper.php',
+			'/libraries/cms/menu/administrator.php',
+			'/libraries/cms/menu/item.php',
+			'/libraries/cms/menu/menu.php',
+			'/libraries/cms/menu/site.php',
+			'/libraries/cms/module/helper.php',
+			'/libraries/cms/pagination/object.php',
+			'/libraries/cms/pagination/pagination.php',
+			'/libraries/cms/pathway/pathway.php',
+			'/libraries/cms/pathway/site.php',
+			'/libraries/cms/plugin/helper.php',
+			'/libraries/cms/plugin/plugin.php',
+			'/libraries/cms/response/json.php',
+			'/libraries/cms/router/administrator.php',
+			'/libraries/cms/router/router.php',
+			'/libraries/cms/router/site.php',
+			'/libraries/cms/schema/changeitem.php',
+			'/libraries/cms/schema/changeitem/mysql.php',
+			'/libraries/cms/schema/changeitem/postgresql.php',
+			'/libraries/cms/schema/changeitem/sqlsrv.php',
+			'/libraries/cms/schema/changeset.php',
+			'/libraries/cms/search/helper.php',
+			'/libraries/cms/table/contenthistory.php',
+			'/libraries/cms/table/contenttype.php',
+			'/libraries/cms/table/corecontent.php',
+			'/libraries/cms/table/ucm.php',
+			'/libraries/cms/toolbar/button.php',
+			'/libraries/cms/toolbar/button/confirm.php',
+			'/libraries/cms/toolbar/button/custom.php',
+			'/libraries/cms/toolbar/button/help.php',
+			'/libraries/cms/toolbar/button/link.php',
+			'/libraries/cms/toolbar/button/popup.php',
+			'/libraries/cms/toolbar/button/separator.php',
+			'/libraries/cms/toolbar/button/slider.php',
+			'/libraries/cms/toolbar/button/standard.php',
+			'/libraries/cms/toolbar/toolbar.php',
+			'/libraries/cms/ucm/base.php',
+			'/libraries/cms/ucm/content.php',
+			'/libraries/cms/ucm/type.php',
+			'/libraries/cms/ucm/ucm.php',
+			'/libraries/cms/version/version.php',
+			'/libraries/joomla/access/access.php',
+			'/libraries/joomla/access/exception/notallowed.php',
+			'/libraries/joomla/access/rule.php',
+			'/libraries/joomla/access/rules.php',
+			'/libraries/joomla/access/wrapper/access.php',
+			'/libraries/joomla/application/base.php',
+			'/libraries/joomla/application/cli.php',
+			'/libraries/joomla/application/daemon.php',
+			'/libraries/joomla/application/route.php',
+			'/libraries/joomla/application/web.php',
+			'/libraries/joomla/association/extension/helper.php',
+			'/libraries/joomla/association/extension/interface.php',
+			'/libraries/joomla/authentication/authentication.php',
+			'/libraries/joomla/authentication/response.php',
+			'/libraries/joomla/cache/cache.php',
+			'/libraries/joomla/cache/controller.php',
+			'/libraries/joomla/cache/controller/callback.php',
+			'/libraries/joomla/cache/controller/output.php',
+			'/libraries/joomla/cache/controller/page.php',
+			'/libraries/joomla/cache/controller/view.php',
+			'/libraries/joomla/cache/exception.php',
+			'/libraries/joomla/cache/exception/connecting.php',
+			'/libraries/joomla/cache/exception/unsupported.php',
+			'/libraries/joomla/cache/storage.php',
+			'/libraries/joomla/cache/storage/apc.php',
+			'/libraries/joomla/cache/storage/apcu.php',
+			'/libraries/joomla/cache/storage/cachelite.php',
+			'/libraries/joomla/cache/storage/file.php',
+			'/libraries/joomla/cache/storage/helper.php',
+			'/libraries/joomla/cache/storage/memcache.php',
+			'/libraries/joomla/cache/storage/memcached.php',
+			'/libraries/joomla/cache/storage/redis.php',
+			'/libraries/joomla/cache/storage/wincache.php',
+			'/libraries/joomla/cache/storage/xcache.php',
+			'/libraries/joomla/client/ftp.php',
+			'/libraries/joomla/client/helper.php',
+			'/libraries/joomla/client/ldap.php',
+			'/libraries/joomla/client/wrapper/helper.php',
+			'/libraries/joomla/crypt/README.md',
+			'/libraries/joomla/crypt/cipher.php',
+			'/libraries/joomla/crypt/cipher/3des.php',
+			'/libraries/joomla/crypt/cipher/blowfish.php',
+			'/libraries/joomla/crypt/cipher/crypto.php',
+			'/libraries/joomla/crypt/cipher/mcrypt.php',
+			'/libraries/joomla/crypt/cipher/rijndael256.php',
+			'/libraries/joomla/crypt/cipher/simple.php',
+			'/libraries/joomla/crypt/crypt.php',
+			'/libraries/joomla/crypt/key.php',
+			'/libraries/joomla/crypt/password.php',
+			'/libraries/joomla/crypt/password/simple.php',
+			'/libraries/joomla/date/date.php',
+			'/libraries/joomla/document/document.php',
+			'/libraries/joomla/document/error.php',
+			'/libraries/joomla/document/feed.php',
+			'/libraries/joomla/document/feed/renderer/atom.php',
+			'/libraries/joomla/document/feed/renderer/rss.php',
+			'/libraries/joomla/document/html.php',
+			'/libraries/joomla/document/html/renderer/component.php',
+			'/libraries/joomla/document/html/renderer/head.php',
+			'/libraries/joomla/document/html/renderer/message.php',
+			'/libraries/joomla/document/html/renderer/module.php',
+			'/libraries/joomla/document/html/renderer/modules.php',
+			'/libraries/joomla/document/image.php',
+			'/libraries/joomla/document/json.php',
+			'/libraries/joomla/document/opensearch.php',
+			'/libraries/joomla/document/raw.php',
+			'/libraries/joomla/document/renderer.php',
+			'/libraries/joomla/document/renderer/feed/atom.php',
+			'/libraries/joomla/document/renderer/feed/rss.php',
+			'/libraries/joomla/document/renderer/html/component.php',
+			'/libraries/joomla/document/renderer/html/head.php',
+			'/libraries/joomla/document/renderer/html/message.php',
+			'/libraries/joomla/document/renderer/html/module.php',
+			'/libraries/joomla/document/renderer/html/modules.php',
+			'/libraries/joomla/document/xml.php',
+			'/libraries/joomla/environment/browser.php',
+			'/libraries/joomla/factory.php',
+			'/libraries/joomla/feed/entry.php',
+			'/libraries/joomla/feed/factory.php',
+			'/libraries/joomla/feed/feed.php',
+			'/libraries/joomla/feed/link.php',
+			'/libraries/joomla/feed/parser.php',
+			'/libraries/joomla/feed/parser/atom.php',
+			'/libraries/joomla/feed/parser/namespace.php',
+			'/libraries/joomla/feed/parser/rss.php',
+			'/libraries/joomla/feed/parser/rss/itunes.php',
+			'/libraries/joomla/feed/parser/rss/media.php',
+			'/libraries/joomla/feed/person.php',
+			'/libraries/joomla/filter/input.php',
+			'/libraries/joomla/filter/output.php',
+			'/libraries/joomla/filter/wrapper/output.php',
+			'/libraries/joomla/form/field.php',
+			'/libraries/joomla/form/form.php',
+			'/libraries/joomla/form/helper.php',
+			'/libraries/joomla/form/rule.php',
+			'/libraries/joomla/form/rule/boolean.php',
+			'/libraries/joomla/form/rule/calendar.php',
+			'/libraries/joomla/form/rule/color.php',
+			'/libraries/joomla/form/rule/email.php',
+			'/libraries/joomla/form/rule/equals.php',
+			'/libraries/joomla/form/rule/number.php',
+			'/libraries/joomla/form/rule/options.php',
+			'/libraries/joomla/form/rule/rules.php',
+			'/libraries/joomla/form/rule/tel.php',
+			'/libraries/joomla/form/rule/url.php',
+			'/libraries/joomla/form/rule/username.php',
+			'/libraries/joomla/form/wrapper/helper.php',
+			'/libraries/joomla/http/factory.php',
+			'/libraries/joomla/http/http.php',
+			'/libraries/joomla/http/response.php',
+			'/libraries/joomla/http/transport.php',
+			'/libraries/joomla/http/transport/cacert.pem',
+			'/libraries/joomla/http/transport/curl.php',
+			'/libraries/joomla/http/transport/socket.php',
+			'/libraries/joomla/http/transport/stream.php',
+			'/libraries/joomla/http/wrapper/factory.php',
+			'/libraries/joomla/image/filter.php',
+			'/libraries/joomla/image/filter/backgroundfill.php',
+			'/libraries/joomla/image/filter/brightness.php',
+			'/libraries/joomla/image/filter/contrast.php',
+			'/libraries/joomla/image/filter/edgedetect.php',
+			'/libraries/joomla/image/filter/emboss.php',
+			'/libraries/joomla/image/filter/grayscale.php',
+			'/libraries/joomla/image/filter/negate.php',
+			'/libraries/joomla/image/filter/sketchy.php',
+			'/libraries/joomla/image/filter/smooth.php',
+			'/libraries/joomla/image/image.php',
+			'/libraries/joomla/input/cli.php',
+			'/libraries/joomla/input/cookie.php',
+			'/libraries/joomla/input/files.php',
+			'/libraries/joomla/input/input.php',
+			'/libraries/joomla/input/json.php',
+			'/libraries/joomla/language/helper.php',
+			'/libraries/joomla/language/language.php',
+			'/libraries/joomla/language/stemmer.php',
+			'/libraries/joomla/language/stemmer/porteren.php',
+			'/libraries/joomla/language/text.php',
+			'/libraries/joomla/language/transliterate.php',
+			'/libraries/joomla/language/wrapper/helper.php',
+			'/libraries/joomla/language/wrapper/text.php',
+			'/libraries/joomla/language/wrapper/transliterate.php',
+			'/libraries/joomla/log/entry.php',
+			'/libraries/joomla/log/log.php',
+			'/libraries/joomla/log/logger.php',
+			'/libraries/joomla/log/logger/callback.php',
+			'/libraries/joomla/log/logger/database.php',
+			'/libraries/joomla/log/logger/echo.php',
+			'/libraries/joomla/log/logger/formattedtext.php',
+			'/libraries/joomla/log/logger/messagequeue.php',
+			'/libraries/joomla/log/logger/syslog.php',
+			'/libraries/joomla/log/logger/w3c.php',
+			'/libraries/joomla/mail/helper.php',
+			'/libraries/joomla/mail/language/phpmailer.lang-joomla.php',
+			'/libraries/joomla/mail/mail.php',
+			'/libraries/joomla/mail/wrapper/helper.php',
+			'/libraries/joomla/microdata/microdata.php',
+			'/libraries/joomla/microdata/types.json',
+			'/libraries/joomla/object/object.php',
+			'/libraries/joomla/profiler/profiler.php',
+			'/libraries/joomla/session/exception/unsupported.php',
+			'/libraries/joomla/session/session.php',
+			'/libraries/joomla/string/punycode.php',
+			'/libraries/joomla/table/asset.php',
+			'/libraries/joomla/table/extension.php',
+			'/libraries/joomla/table/interface.php',
+			'/libraries/joomla/table/language.php',
+			'/libraries/joomla/table/nested.php',
+			'/libraries/joomla/table/observer.php',
+			'/libraries/joomla/table/observer/contenthistory.php',
+			'/libraries/joomla/table/observer/tags.php',
+			'/libraries/joomla/table/table.php',
+			'/libraries/joomla/table/update.php',
+			'/libraries/joomla/table/updatesite.php',
+			'/libraries/joomla/table/user.php',
+			'/libraries/joomla/table/usergroup.php',
+			'/libraries/joomla/table/viewlevel.php',
+			'/libraries/joomla/updater/adapters/collection.php',
+			'/libraries/joomla/updater/adapters/extension.php',
+			'/libraries/joomla/updater/update.php',
+			'/libraries/joomla/updater/updateadapter.php',
+			'/libraries/joomla/updater/updater.php',
+			'/libraries/joomla/uri/uri.php',
+			'/libraries/joomla/user/helper.php',
+			'/libraries/joomla/user/user.php',
+			'/libraries/joomla/user/wrapper/helper.php',
+			'/libraries/joomla/utilities/buffer.php',
+			'/libraries/joomla/utilities/utility.php',
+			'/libraries/legacy/access/rule.php',
+			'/libraries/legacy/access/rules.php',
+			'/libraries/legacy/application/cli.php',
+			'/libraries/legacy/application/daemon.php',
+			'/libraries/legacy/categories/categories.php',
+			'/libraries/legacy/controller/admin.php',
+			'/libraries/legacy/controller/form.php',
+			'/libraries/legacy/controller/legacy.php',
+			'/libraries/legacy/model/admin.php',
+			'/libraries/legacy/model/form.php',
+			'/libraries/legacy/model/item.php',
+			'/libraries/legacy/model/legacy.php',
+			'/libraries/legacy/model/list.php',
+			'/libraries/legacy/table/category.php',
+			'/libraries/legacy/table/content.php',
+			'/libraries/legacy/table/menu.php',
+			'/libraries/legacy/table/menu/type.php',
+			'/libraries/legacy/table/module.php',
+			'/libraries/legacy/view/categories.php',
+			'/libraries/legacy/view/category.php',
+			'/libraries/legacy/view/categoryfeed.php',
+			'/libraries/legacy/view/legacy.php',
+			'/libraries/legacy/web/client.php',
+			'/libraries/legacy/web/web.php',
+			'/media/editors/tinymce/langs/uk-UA.js',
+			'/media/system/js/fields/calendar-locales/zh.js',
+
+			/*
+			 * Joomla! 3.8.0 thru 3.9.0
+			 */
+			'/libraries/src/Mail/language/phpmailer.lang-joomla.php',
+
+			/*
+			 * Legacy FOF
+			 */
+			'/libraries/fof/controller.php',
+			'/libraries/fof/dispatcher.php',
+			'/libraries/fof/inflector.php',
+			'/libraries/fof/input.php',
+			'/libraries/fof/model.php',
+			'/libraries/fof/query.abstract.php',
+			'/libraries/fof/query.element.php',
+			'/libraries/fof/query.mysql.php',
+			'/libraries/fof/query.mysqli.php',
+			'/libraries/fof/query.sqlazure.php',
+			'/libraries/fof/query.sqlsrv.php',
+			'/libraries/fof/render.abstract.php',
+			'/libraries/fof/render.joomla.php',
+			'/libraries/fof/render.joomla3.php',
+			'/libraries/fof/render.strapper.php',
+			'/libraries/fof/string.utils.php',
+			'/libraries/fof/table.php',
+			'/libraries/fof/template.utils.php',
+			'/libraries/fof/toolbar.php',
+			'/libraries/fof/view.csv.php',
+			'/libraries/fof/view.html.php',
+			'/libraries/fof/view.json.php',
+			'/libraries/fof/view.php',
+		);
+
+		// TODO There is an issue while deleting folders using the ftp mode
+		$folders = array(
+			'/administrator/components/com_admin/sql/updates/sqlsrv',
+			'/media/com_finder/images/mime',
+			'/media/com_finder/images',
+			'/components/com_media/helpers',
+			// Joomla 3.0
+			'/administrator/components/com_contact/elements',
+			'/administrator/components/com_content/elements',
+			'/administrator/components/com_newsfeeds/elements',
+			'/administrator/components/com_templates/views/prevuuw/tmpl',
+			'/administrator/components/com_templates/views/prevuuw',
+			'/libraries/cms/controller',
+			'/libraries/cms/model',
+			'/libraries/cms/view',
+			'/libraries/joomla/application/cli',
+			'/libraries/joomla/application/component',
+			'/libraries/joomla/application/input',
+			'/libraries/joomla/application/module',
+			'/libraries/joomla/cache/storage/helpers',
+			'/libraries/joomla/database/table',
+			'/libraries/joomla/database/database',
+			'/libraries/joomla/error',
+			'/libraries/joomla/filesystem/archive',
+			'/libraries/joomla/html/html',
+			'/libraries/joomla/html/toolbar',
+			'/libraries/joomla/html/toolbar/button',
+			'/libraries/joomla/html/parameter',
+			'/libraries/joomla/html/parameter/element',
+			'/libraries/joomla/image/filters',
+			'/libraries/joomla/log/loggers',
+			// Joomla! 3.1
+			'/libraries/cms/feed/parser/rss',
+			'/libraries/cms/feed/parser',
+			'/libraries/cms/feed',
+			'/libraries/joomla/form/rules',
+			'/libraries/joomla/html/language/en-GB',
+			'/libraries/joomla/html/language',
+			'/libraries/joomla/html',
+			'/libraries/joomla/installer/adapters',
+			'/libraries/joomla/installer',
+			'/libraries/joomla/pagination',
+			'/libraries/legacy/html',
+			'/libraries/legacy/menu',
+			'/libraries/legacy/pathway',
+			'/media/system/swf/',
+			'/media/editors/tinymce/jscripts',
+			// Joomla! 3.2
+			'/libraries/joomla/plugin',
+			'/libraries/legacy/component',
+			'/libraries/legacy/module',
+			'/administrator/components/com_weblinks/models/fields',
+			'/plugins/user/joomla/postinstall',
+			'/libraries/joomla/registry/format',
+			'/libraries/joomla/registry',
+			// Joomla! 3.3
+			'/plugins/user/profile/fields',
+			'/media/editors/tinymce/plugins/compat3x',
+			// Joomla! 3.4
+			'/administrator/components/com_tags/helpers/html',
+			'/administrator/components/com_tags/models/fields',
+			'/administrator/templates/hathor/html/com_finder/filter',
+			'/administrator/templates/hathor/html/com_finder/statistics',
+			'/libraries/compat/password/lib',
+			'/libraries/compat/password',
+			'/libraries/compat',
+			'/libraries/framework/Joomla/Application/Cli/Output/Processor',
+			'/libraries/framework/Joomla/Application/Cli/Output',
+			'/libraries/framework/Joomla/Application/Cli',
+			'/libraries/framework/Joomla/Application',
+			'/libraries/framework/Joomla/DI/Exception',
+			'/libraries/framework/Joomla/DI',
+			'/libraries/framework/Joomla/Registry/Format',
+			'/libraries/framework/Joomla/Registry',
+			'/libraries/framework/Joomla',
+			'/libraries/framework/Symfony/Component/Yaml/Exception',
+			'/libraries/framework/Symfony/Component/Yaml',
+			'/libraries/framework',
+			'/libraries/phpmailer/language',
+			'/libraries/phpmailer',
+			'/media/editors/codemirror/css',
+			'/media/editors/codemirror/js',
+			'/media/com_banners',
+			// Joomla! 3.4.1
+			'/administrator/components/com_config/views',
+			'/administrator/components/com_config/models/fields',
+			'/administrator/components/com_config/models/forms',
+			// Joomla! 3.4.2
+			'/media/editors/codemirror/mode/smartymixed',
+			// Joomla! 3.5
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception',
+			'/libraries/vendor/symfony/yaml/Symfony/Component/Yaml',
+			'/libraries/vendor/symfony/yaml/Symfony/Component',
+			'/libraries/vendor/symfony/yaml/Symfony',
+			'/libraries/joomla/document/error',
+			'/libraries/joomla/document/image',
+			'/libraries/joomla/document/json',
+			'/libraries/joomla/document/opensearch',
+			'/libraries/joomla/document/raw',
+			'/libraries/joomla/document/xml',
+			'/administrator/components/com_media/models/forms',
+			'/media/editors/codemirror/mode/kotlin',
+			'/media/editors/tinymce/plugins/compat3x',
+			'/plugins/editors/tinymce/fields',
+			'/plugins/user/profile/fields',
+			// Joomla 3.6
+			'/libraries/simplepie/idn',
+			'/libraries/simplepie',
+			// Joomla! 3.6.3
+			'/media/editors/codemirror/mode/jade',
+			// Joomla! 3.7.0
+			'/libraries/joomla/data',
+			'/administrator/components/com_cache/layouts/joomla/searchtools/default',
+			'/administrator/components/com_cache/layouts/joomla/searchtools',
+			'/administrator/components/com_cache/layouts/joomla',
+			'/administrator/components/com_cache/layouts',
+			'/administrator/components/com_languages/layouts/joomla/searchtools/default',
+			'/administrator/components/com_languages/layouts/joomla/searchtools',
+			'/administrator/components/com_languages/layouts/joomla',
+			'/administrator/components/com_languages/layouts',
+			'/administrator/components/com_modules/layouts/joomla/searchtools/default',
+			'/administrator/components/com_modules/layouts/joomla/searchtools',
+			'/administrator/components/com_modules/layouts/joomla',
+			'/administrator/components/com_templates/layouts/joomla/searchtools/default',
+			'/administrator/components/com_templates/layouts/joomla/searchtools',
+			'/administrator/components/com_templates/layouts/joomla',
+			'/administrator/components/com_templates/layouts',
+			'/administrator/templates/hathor/html/mod_menu',
+			'/administrator/components/com_messages/layouts/toolbar',
+			'/administrator/components/com_messages/layouts',
+			// Joomla! 3.7.4
+			'/components/com_fields/controllers',
+			// Joomla! 3.8.0
+			'/administrator/modules/mod_menu/preset',
+			'/libraries/cms/application',
+			'/libraries/cms/authentication',
+			'/libraries/cms/captcha',
+			'/libraries/cms/component/exception',
+			'/libraries/cms/component/router/rules',
+			'/libraries/cms/component/router',
+			'/libraries/cms/component',
+			'/libraries/cms/editor',
+			'/libraries/cms/error',
+			'/libraries/cms/extension',
+			'/libraries/cms/form/field',
+			'/libraries/cms/form/rule',
+			'/libraries/cms/form',
+			'/libraries/cms/help',
+			'/libraries/cms/helper',
+			'/libraries/cms/installer/adapter',
+			'/libraries/cms/installer/manifest',
+			'/libraries/cms/installer',
+			'/libraries/cms/language',
+			'/libraries/cms/layout',
+			'/libraries/cms/library',
+			'/libraries/cms/menu',
+			'/libraries/cms/module',
+			'/libraries/cms/pagination',
+			'/libraries/cms/pathway',
+			'/libraries/cms/plugin',
+			'/libraries/cms/response',
+			'/libraries/cms/router',
+			'/libraries/cms/schema/changeitem',
+			'/libraries/cms/schema',
+			'/libraries/cms/search',
+			'/libraries/cms/table',
+			'/libraries/cms/toolbar/button',
+			'/libraries/cms/toolbar',
+			'/libraries/cms/ucm',
+			'/libraries/cms/version',
+			'/libraries/joomla/access/exception',
+			'/libraries/joomla/access/wrapper',
+			'/libraries/joomla/access',
+			'/libraries/joomla/association/extension',
+			'/libraries/joomla/association',
+			'/libraries/joomla/authentication',
+			'/libraries/joomla/cache/controller',
+			'/libraries/joomla/cache/exception',
+			'/libraries/joomla/cache/storage',
+			'/libraries/joomla/cache',
+			'/libraries/joomla/client/wrapper',
+			'/libraries/joomla/client',
+			'/libraries/joomla/crypt/cipher',
+			'/libraries/joomla/crypt/password',
+			'/libraries/joomla/crypt',
+			'/libraries/joomla/date',
+			'/libraries/joomla/document/feed/renderer',
+			'/libraries/joomla/document/feed',
+			'/libraries/joomla/document/html/renderer',
+			'/libraries/joomla/document/html',
+			'/libraries/joomla/document/renderer/feed',
+			'/libraries/joomla/document/renderer/html',
+			'/libraries/joomla/document/renderer',
+			'/libraries/joomla/document',
+			'/libraries/joomla/environment',
+			'/libraries/joomla/feed/parser/rss',
+			'/libraries/joomla/feed/parser',
+			'/libraries/joomla/feed',
+			'/libraries/joomla/filter/wrapper',
+			'/libraries/joomla/filter',
+			'/libraries/joomla/form/rule',
+			'/libraries/joomla/form/wrapper',
+			'/libraries/joomla/http/transport',
+			'/libraries/joomla/http/wrapper',
+			'/libraries/joomla/http',
+			'/libraries/joomla/image/filter',
+			'/libraries/joomla/image',
+			'/libraries/joomla/input',
+			'/libraries/joomla/language/stemmer',
+			'/libraries/joomla/language/wrapper',
+			'/libraries/joomla/language',
+			'/libraries/joomla/log/logger',
+			'/libraries/joomla/log',
+			'/libraries/joomla/mail/language',
+			'/libraries/joomla/mail/wrapper',
+			'/libraries/joomla/mail',
+			'/libraries/joomla/microdata',
+			'/libraries/joomla/object',
+			'/libraries/joomla/profiler',
+			'/libraries/joomla/session/exception',
+			'/libraries/joomla/table',
+			'/libraries/joomla/updater/adapters',
+			'/libraries/joomla/updater',
+			'/libraries/joomla/uri',
+			'/libraries/joomla/user/wrapper',
+			'/libraries/joomla/user',
+			'/libraries/legacy/access',
+			'/libraries/legacy/categories',
+			'/libraries/legacy/controller',
+			'/libraries/legacy/model',
+			'/libraries/legacy/table/menu',
+			'/libraries/legacy/view',
+			'/libraries/legacy/web',
+			'/media/editors/tinymce/plugins/jdragdrop',
+		);
+
+		jimport('joomla.filesystem.file');
+
+		foreach ($files as $file)
+		{
+			if (JFile::exists(JPATH_ROOT . $file) && !JFile::delete(JPATH_ROOT . $file))
+			{
+				echo JText::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $file) . '<br />';
+			}
+		}
+
+		jimport('joomla.filesystem.folder');
+
+		foreach ($folders as $folder)
+		{
+			if (JFolder::exists(JPATH_ROOT . $folder) && !JFolder::delete(JPATH_ROOT . $folder))
+			{
+				echo JText::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $folder) . '<br />';
+			}
+		}
+
+		/*
+		 * Needed for updates post-3.4
+		 * If com_weblinks doesn't exist then assume we can delete the weblinks package manifest (included in the update packages)
+		 */
+		if (!JFile::exists(JPATH_ROOT . '/administrator/components/com_weblinks/weblinks.php')
+			&& JFile::exists(JPATH_ROOT . '/administrator/manifests/packages/pkg_weblinks.xml'))
+		{
+			JFile::delete(JPATH_ROOT . '/administrator/manifests/packages/pkg_weblinks.xml');
+		}
+	}
+
+	/**
+	 * Clears the RAD layer's table cache.
+	 *
+	 * The cache vastly improves performance but needs to be cleared every time you update the database schema.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function clearRadCache()
+	{
+		jimport('joomla.filesystem.file');
+
+		if (JFile::exists(JPATH_ROOT . '/cache/fof/cache.php'))
+		{
+			JFile::delete(JPATH_ROOT . '/cache/fof/cache.php');
+		}
+	}
+
+	/**
+	 * Method to create assets for newly installed components
+	 *
+	 * @param   JInstaller  $installer  The class calling this method
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public function updateAssets($installer)
+	{
+		// List all components added since 1.6
+		$newComponents = array(
+			'com_finder',
+			'com_joomlaupdate',
+			'com_tags',
+			'com_contenthistory',
+			'com_ajax',
+			'com_postinstall',
+			'com_fields',
+			'com_associations',
+		);
+
+		foreach ($newComponents as $component)
+		{
+			/** @var JTableAsset $asset */
+			$asset = JTable::getInstance('Asset');
+
+			if ($asset->loadByName($component))
+			{
+				continue;
+			}
+
+			$asset->name      = $component;
+			$asset->parent_id = 1;
+			$asset->rules     = '{}';
+			$asset->title     = $component;
+			$asset->setLocation(1, 'last-child');
+
+			if (!$asset->store())
+			{
+				// Install failed, roll back changes
+				$installer->abort(JText::sprintf('JLIB_INSTALLER_ABORT_COMP_INSTALL_ROLLBACK', $asset->stderr(true)));
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * If we migrated the session from the previous system, flush all the active sessions.
+	 * Otherwise users will be logged in, but not able to do anything since they don't have
+	 * a valid session
+	 *
+	 * @return  boolean
+	 */
+	public function flushSessions()
+	{
+		/**
+		 * The session may have not been started yet (e.g. CLI-based Joomla! update scripts). Let's make sure we do
+		 * have a valid session.
+		 */
+		$session = JFactory::getSession();
+
+		/**
+		 * Restarting the Session require a new login for the current user so lets check if we have an active session
+		 * and only restart it if not.
+		 * For B/C reasons we need to use getState as isActive is not available in 2.5
+		 */
+		if ($session->getState() !== 'active')
+		{
+			$session->restart();
+		}
+
+		// If $_SESSION['__default'] is no longer set we do not have a migrated session, therefore we can quit.
+		if (!isset($_SESSION['__default']))
+		{
+			return true;
+		}
+
+		$db = JFactory::getDbo();
+
+		try
+		{
+			switch ($db->getServerType())
+			{
+				// MySQL database, use TRUNCATE (faster, more resilient)
+				case 'mysql':
+					$db->truncateTable('#__session');
+					break;
+
+				// Non-MySQL databases, use a simple DELETE FROM query
+				default:
+					$query = $db->getQuery(true)
+						->delete($db->qn('#__session'));
+					$db->setQuery($query)->execute();
+					break;
+			}
+		}
+		catch (Exception $e)
+		{
+			echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '<br />';
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Converts the site's database tables to support UTF-8 Multibyte.
+	 *
+	 * @param   boolean  $doDbFixMsg  Flag if message to be shown to check db fix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function convertTablesToUtf8mb4($doDbFixMsg = false)
+	{
+		$db = JFactory::getDbo();
+
+		// This is only required for MySQL databases
+		$serverType = $db->getServerType();
+
+		if ($serverType != 'mysql')
+		{
+			return;
+		}
+
+		// Set required conversion status
+		if ($db->hasUTF8mb4Support())
+		{
+			$converted = 2;
+		}
+		else
+		{
+			$converted = 1;
+		}
+
+		// Check conversion status in database
+		$db->setQuery('SELECT ' . $db->quoteName('converted')
+			. ' FROM ' . $db->quoteName('#__utf8_conversion')
+		);
+
+		try
+		{
+			$convertedDB = $db->loadResult();
+		}
+		catch (Exception $e)
+		{
+			// Render the error message from the Exception object
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+			if ($doDbFixMsg)
+			{
+				// Show an error message telling to check database problems
+				JFactory::getApplication()->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED'), 'error');
+			}
+
+			return;
+		}
+
+		// Nothing to do, saved conversion status from DB is equal to required
+		if ($convertedDB == $converted)
+		{
+			return;
+		}
+
+		// Step 1: Drop indexes later to be added again with column lengths limitations at step 2
+		$fileName1 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql';
+
+		if (is_file($fileName1))
+		{
+			$fileContents1 = @file_get_contents($fileName1);
+			$queries1      = $db->splitSql($fileContents1);
+
+			if (!empty($queries1))
+			{
+				foreach ($queries1 as $query1)
+				{
+					try
+					{
+						$db->setQuery($query1)->execute();
+					}
+					catch (Exception $e)
+					{
+						// If the query fails we will go on. It just means the index to be dropped does not exist.
+					}
+				}
+			}
+		}
+
+		// Step 2: Perform the index modifications and conversions
+		$fileName2 = JPATH_ROOT . '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql';
+
+		if (is_file($fileName2))
+		{
+			$fileContents2 = @file_get_contents($fileName2);
+			$queries2      = $db->splitSql($fileContents2);
+
+			if (!empty($queries2))
+			{
+				foreach ($queries2 as $query2)
+				{
+					try
+					{
+						$db->setQuery($db->convertUtf8mb4QueryToUtf8($query2))->execute();
+					}
+					catch (Exception $e)
+					{
+						$converted = 0;
+
+						// Still render the error message from the Exception object
+						JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+					}
+				}
+			}
+		}
+
+		if ($doDbFixMsg && $converted == 0)
+		{
+			// Show an error message telling to check database problems
+			JFactory::getApplication()->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED'), 'error');
+		}
+
+		// Set flag in database if the update is done.
+		$db->setQuery('UPDATE ' . $db->quoteName('#__utf8_conversion')
+			. ' SET ' . $db->quoteName('converted') . ' = ' . $converted . ';')->execute();
+	}
+
+	/**
+	 * This method clean the Joomla Cache using the method `clean` from the com_cache model
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5.1
+	 */
+	private function cleanJoomlaCache()
+	{
+		JModelLegacy::addIncludePath(JPATH_ROOT . '/administrator/components/com_cache/models');
+		$model = JModelLegacy::getInstance('cache', 'CacheModel');
+
+		// Clean frontend cache
+		$model->clean();
+
+		// Clean admin cache
+		$model->setState('client_id', 1);
+		$model->clean();
+	}
+}
diff --git a/core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql b/core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql
new file mode 100644
index 00000000..843ab125
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql
@@ -0,0 +1,34 @@
+--
+-- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL
+--
+-- Drop indexes which will be added again in step 2, utf8mb4-conversion-02.sql.
+--
+-- Do not rename this file or any other of the utf8mb4-conversion-*.sql
+-- files unless you want to change PHP code, too.
+--
+-- This file here will be processed ignoring any exceptions caused by indexes
+-- to be dropped do not exist.
+--
+-- The file for step 2 will the be processed with reporting exceptions.
+--
+
+ALTER TABLE `#__banners` DROP KEY `idx_metakey_prefix`;
+ALTER TABLE `#__banner_clients` DROP KEY `idx_metakey_prefix`;
+ALTER TABLE `#__categories` DROP KEY `idx_path`;
+ALTER TABLE `#__categories` DROP KEY `idx_alias`;
+ALTER TABLE `#__content` DROP KEY `idx_alias`;
+ALTER TABLE `#__content_types` DROP KEY `idx_alias`;
+ALTER TABLE `#__fields` DROP KEY `idx_context`;
+ALTER TABLE `#__fields_groups` DROP KEY `idx_context`;
+ALTER TABLE `#__fields_values` DROP KEY `idx_item_id`;
+ALTER TABLE `#__finder_links` DROP KEY `idx_title`;
+ALTER TABLE `#__menu` DROP KEY `idx_alias`;
+ALTER TABLE `#__menu` DROP KEY `idx_client_id_parent_id_alias_language`;
+ALTER TABLE `#__menu` DROP KEY `idx_path`;
+ALTER TABLE `#__redirect_links` DROP KEY `idx_old_url`;
+ALTER TABLE `#__tags` DROP KEY `idx_path`;
+ALTER TABLE `#__tags` DROP KEY `idx_alias`;
+ALTER TABLE `#__ucm_content` DROP KEY `idx_alias`;
+ALTER TABLE `#__ucm_content` DROP KEY `idx_title`;
+ALTER TABLE `#__ucm_content` DROP KEY `idx_content_type`;
+ALTER TABLE `#__users` DROP KEY `idx_name`;
diff --git a/core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql b/core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
new file mode 100644
index 00000000..4f63f989
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
@@ -0,0 +1,242 @@
+--
+-- Step 2 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL
+--
+-- Enlarge some database columns to avoid data losses, then convert all tables
+-- to utf8mb4 or utf8, then set default character sets and collations for all
+-- tables, then add back indexes previosly dropped with step 1,
+-- utf8mb4-conversion-01.sql, but add them back with limited lenghts of
+-- columns.
+--
+-- Do not rename this file or any other of the utf8mb4-conversion-*.sql
+-- files unless you want to change PHP code, too.
+--
+-- IMPORTANT: When adding an index modification to this file for limiting the
+-- length by which one or more columns go into that index,
+--
+-- 1. remember to add the statement to drop the index to the file for step 1,
+--    utf8mb4-conversion-01.sql, and
+--
+-- 2. check if the index is created created or modified in some old schema
+--    update sql in an "ALTER TABLE" statement and limit the column length
+--    there, too ("CREATE TABLE" is ok, no need to modify those).
+--
+-- This file here will the be processed with reporting exceptions, in opposite
+-- to the file for step 1.
+--
+
+--
+-- Step 2.1: Enlarge columns to avoid data loss on later conversion to utf8mb4
+--
+
+ALTER TABLE `#__banners` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__banners` MODIFY `metakey_prefix` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__categories` MODIFY `path` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__categories` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__content_types` MODIFY `type_alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__finder_links` MODIFY `title` varchar(400) DEFAULT NULL;
+ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__content` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__menu` MODIFY `alias` varchar(400) NOT NULL COMMENT 'The SEF alias of the menu item.';
+ALTER TABLE `#__newsfeeds` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__tags` MODIFY `path` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__tags` MODIFY `alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_type_alias` varchar(400) NOT NULL DEFAULT '' COMMENT 'FK to the content types table';
+ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL;
+ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__users` MODIFY `name` varchar(400) NOT NULL DEFAULT '';
+
+--
+-- Step 2.2: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
+-- except #__finder_xxx tables, those will have utf8mb4_general_ci collation.
+-- Note: The database driver for mysql will change utf8mb4 to utf8 if utf8mb4 is not supported     
+--
+
+ALTER TABLE `#__assets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__associations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__banners` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__banner_clients` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__banner_tracks` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__categories` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__contact_details` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content_frontpage` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content_rating` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__contentitem_tag_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields_categories` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields_groups` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields_values` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__finder_filters` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms0` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms1` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms2` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms3` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms4` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms5` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms6` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms7` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms8` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms9` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsa` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsb` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsc` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsd` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termse` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsf` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_taxonomy` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_taxonomy_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_terms` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_terms_common` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_tokens_aggregate` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__languages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__menu` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__menu_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__messages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__messages_cfg` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__modules` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__modules_menu` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__newsfeeds` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__overrider` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__postinstall_messages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__redirect_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__schemas` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__tags` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__template_styles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__ucm_base` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__ucm_content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__ucm_history` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__updates` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__update_sites` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__update_sites_extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__usergroups` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_keys` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_notes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_profiles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_usergroup_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__utf8_conversion` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__viewlevels` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+--
+-- Step 2.3: Set collation to utf8mb4_bin for formerly utf8_bin collated columns
+-- and for the lang_code column of the languages table
+--
+
+ALTER TABLE `#__banners` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+ALTER TABLE `#__categories` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+ALTER TABLE `#__content` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+ALTER TABLE `#__languages` MODIFY `lang_code` char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
+ALTER TABLE `#__menu` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'The SEF alias of the menu item.';
+ALTER TABLE `#__newsfeeds` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+ALTER TABLE `#__tags` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '';
+
+--
+-- Step 2.4: Set default character set and collation for all tables
+--
+
+ALTER TABLE `#__assets` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__associations` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__banners` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__banner_clients` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__banner_tracks` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__categories` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__contact_details` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content_frontpage` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content_rating` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__content_types` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__contentitem_tag_map` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__core_log_searches` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__extensions` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields_categories` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields_groups` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__fields_values` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__finder_filters` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms0` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms1` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms2` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms3` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms4` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms5` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms6` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms7` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms8` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_terms9` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsa` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsb` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsc` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsd` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termse` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_links_termsf` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_taxonomy` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_taxonomy_map` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_terms` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_terms_common` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_tokens` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_tokens_aggregate` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__finder_types` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+ALTER TABLE `#__languages` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__menu` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__menu_types` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__messages` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__messages_cfg` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__modules` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__modules_menu` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__newsfeeds` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__overrider` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__postinstall_messages` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__redirect_links` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__schemas` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__session` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__tags` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__template_styles` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__ucm_base` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__ucm_content` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__ucm_history` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__updates` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__update_sites` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__update_sites_extensions` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__usergroups` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__users` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_keys` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_notes` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_profiles` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__user_usergroup_map` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__utf8_conversion` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__viewlevels` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+--
+-- Step 2.5: Limit indexes to first 100 so their max allowed lengths would not get exceeded with utf8mb4
+--
+
+ALTER TABLE `#__banners` ADD KEY `idx_metakey_prefix` (`metakey_prefix`(100));
+ALTER TABLE `#__banner_clients` ADD KEY `idx_metakey_prefix` (`metakey_prefix`(100));
+ALTER TABLE `#__categories` ADD KEY `idx_path` (`path`(100));
+ALTER TABLE `#__categories` ADD KEY `idx_alias` (`alias`(100));
+ALTER TABLE `#__content` ADD KEY `idx_alias` (`alias`(191));
+ALTER TABLE `#__content_types` ADD KEY `idx_alias` (`type_alias`(100));
+ALTER TABLE `#__fields` ADD KEY `idx_context` (`context`(191));
+ALTER TABLE `#__fields_groups` ADD KEY `idx_context` (`context`(191));
+ALTER TABLE `#__fields_values` ADD KEY `idx_item_id` (`item_id`(191));
+ALTER TABLE `#__finder_links` ADD KEY `idx_title` (`title`(100));
+ALTER TABLE `#__menu` ADD KEY `idx_alias` (`alias`(100));
+ALTER TABLE `#__menu` ADD UNIQUE `idx_client_id_parent_id_alias_language` (`client_id`,`parent_id`,`alias`(100),`language`);
+ALTER TABLE `#__menu` ADD KEY `idx_path` (`path`(100));
+ALTER TABLE `#__redirect_links` ADD KEY `idx_old_url` (`old_url`(100));
+ALTER TABLE `#__tags` ADD KEY `idx_path` (`path`(100));
+ALTER TABLE `#__tags` ADD KEY `idx_alias` (`alias`(100));
+ALTER TABLE `#__ucm_content` ADD KEY `idx_alias` (`core_alias`(100));
+ALTER TABLE `#__ucm_content` ADD KEY `idx_title` (`core_title`(100));
+ALTER TABLE `#__ucm_content` ADD KEY `idx_content_type` (`core_type_alias`(100));
+ALTER TABLE `#__users` ADD KEY `idx_name` (`name`(100));
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-06.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-06.sql
new file mode 100644
index 00000000..f0998e83
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-06.sql
@@ -0,0 +1,9 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(437, 'plg_quickicon_joomlaupdate', 'plugin', 'joomlaupdate', 'quickicon', 0, 1, 1, 1, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(438, 'plg_quickicon_extensionupdate', 'plugin', 'extensionupdate', 'quickicon', 0, 1, 1, 1, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+ALTER TABLE  `#__update_sites` ADD COLUMN `last_check_timestamp` bigint(20) DEFAULT '0' AFTER `enabled`;
+
+REPLACE INTO `#__update_sites` VALUES
+(1, 'Joomla Core', 'collection', 'https://update.joomla.org/core/list.xml', 1, 0),
+(2, 'Joomla Extension Directory', 'collection', 'https://update.joomla.org/jed/list.xml', 1, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-16.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-16.sql
new file mode 100644
index 00000000..77ed80d3
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-16.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS `#__overrider` (
+  `id` int(10) NOT NULL AUTO_INCREMENT COMMENT 'Primary Key',
+  `constant` varchar(255) NOT NULL,
+  `string` text NOT NULL,
+  `file` varchar(255) NOT NULL,
+  PRIMARY KEY  (`id`)
+) DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-19.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-19.sql
new file mode 100644
index 00000000..94e9c9ae
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-19.sql
@@ -0,0 +1,20 @@
+CREATE TABLE IF NOT EXISTS `#__user_notes` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `catid` int(10) unsigned NOT NULL DEFAULT '0',
+  `subject` varchar(100) NOT NULL DEFAULT '',
+  `body` text NOT NULL,
+  `state` tinyint(3) NOT NULL DEFAULT '0',
+  `checked_out` int(10) unsigned NOT NULL DEFAULT '0',
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_user_id` int(10) unsigned NOT NULL,
+  `modified_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `review_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_up` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_down` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_category_id` (`catid`)
+) DEFAULT CHARSET=utf8;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-20.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-20.sql
new file mode 100644
index 00000000..1de207ee
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-20.sql
@@ -0,0 +1,7 @@
+SELECT @old_params:= CONCAT(SUBSTRING_INDEX(SUBSTRING(params, LOCATE('"filters":', params)), '}}', 1), '}}') as filters
+FROM `#__extensions` 
+WHERE name="com_content";
+
+UPDATE `#__extensions`
+SET params=CONCAT('{',SUBSTRING(params, 2, CHAR_LENGTH(params)-2),IF(params='','',','),@old_params,'}')
+WHERE name="com_config";
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql
new file mode 100644
index 00000000..15294360
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql
@@ -0,0 +1,11 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(27, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_advanced":"1","expand_advanced":"0","show_date_filters":"0","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stemmer":"porter_en"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(439, 'plg_captcha_recaptcha', 'plugin', 'recaptcha', 'captcha', 0, 1, 1, 0, '{}', '{"public_key":"","private_key":"","theme":"clean"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(440, 'plg_system_highlight', 'plugin', 'highlight', 'system', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 7, 0),
+(441, 'plg_content_finder', 'plugin', 'finder', 'content', 0, 0, 1, 0, '{"legacy":false,"name":"plg_content_finder","type":"plugin","creationDate":"December 2011","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.0","description":"PLG_CONTENT_FINDER_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(442, 'plg_finder_categories', 'plugin', 'categories', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 1, 0),
+(443, 'plg_finder_contacts', 'plugin', 'contacts', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 2, 0),
+(444, 'plg_finder_content', 'plugin', 'content', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 3, 0),
+(445, 'plg_finder_newsfeeds', 'plugin', 'newsfeeds', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 4, 0),
+(446, 'plg_finder_weblinks', 'plugin', 'weblinks', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 5, 0),
+(223, 'mod_finder', 'module', 'mod_finder', '', 0, 1, 0, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-2.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-2.sql
new file mode 100644
index 00000000..dd1a0d44
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-2.sql
@@ -0,0 +1,244 @@
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms0` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms1` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms2` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms3` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms4` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms5` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms6` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms7` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms8` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms9` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsa` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsb` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsc` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsd` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termse` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsf` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `parent_id` int(10) unsigned NOT NULL default '0',
+  `title` varchar(255) NOT NULL,
+  `state` tinyint(1) unsigned NOT NULL default '1',
+  `access` tinyint(1) unsigned NOT NULL default '0',
+  `ordering` tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `parent_id` (`parent_id`),
+  KEY `state` (`state`),
+  KEY `ordering` (`ordering`),
+  KEY `access` (`access`),
+  KEY `idx_parent_published` (`parent_id`,`state`,`access`)
+)   DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_taxonomy_map` (
+  `link_id` int(10) unsigned NOT NULL,
+  `node_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY  (`link_id`,`node_id`),
+  KEY `link_id` (`link_id`),
+  KEY `node_id` (`node_id`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_terms` (
+  `term_id` int(10) unsigned NOT NULL auto_increment,
+  `term` varchar(75) NOT NULL,
+  `stem` varchar(75) NOT NULL,
+  `common` tinyint(1) unsigned NOT NULL default '0',
+  `phrase` tinyint(1) unsigned NOT NULL default '0',
+  `weight` float unsigned NOT NULL default '0',
+  `soundex` varchar(75) NOT NULL,
+  `links` int(10) NOT NULL default '0',
+  PRIMARY KEY  (`term_id`),
+  UNIQUE KEY `idx_term` (`term`),
+  KEY `idx_term_phrase` (`term`,`phrase`),
+  KEY `idx_stem_phrase` (`stem`,`phrase`),
+  KEY `idx_soundex_phrase` (`soundex`,`phrase`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_terms_common` (
+  `term` varchar(75) NOT NULL,
+  `language` varchar(3) NOT NULL,
+  KEY `idx_word_lang` (`term`,`language`),
+  KEY `idx_lang` (`language`)
+)  DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_tokens` (
+  `term` varchar(75) NOT NULL,
+  `stem` varchar(75) NOT NULL,
+  `common` tinyint(1) unsigned NOT NULL default '0',
+  `phrase` tinyint(1) unsigned NOT NULL default '0',
+  `weight` float unsigned NOT NULL default '1',
+  `context` tinyint(1) unsigned NOT NULL default '2',
+  KEY `idx_word` (`term`),
+  KEY `idx_context` (`context`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_tokens_aggregate` (
+  `term_id` int(10) unsigned NOT NULL,
+  `map_suffix` char(1) NOT NULL,
+  `term` varchar(75) NOT NULL,
+  `stem` varchar(75) NOT NULL,
+  `common` tinyint(1) unsigned NOT NULL default '0',
+  `phrase` tinyint(1) unsigned NOT NULL default '0',
+  `term_weight` float unsigned NOT NULL,
+  `context` tinyint(1) unsigned NOT NULL default '2',
+  `context_weight` float unsigned NOT NULL,
+  `total_weight` float unsigned NOT NULL,
+  KEY `token` (`term`),
+  KEY `keyword_id` (`term_id`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__finder_types` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `title` varchar(100) NOT NULL,
+  `mime` varchar(100) NOT NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `title` (`title`)
+)   DEFAULT CHARSET=utf8;
+
+
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-22.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-22.sql
new file mode 100644
index 00000000..2f0ffd56
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-22.sql
@@ -0,0 +1,123 @@
+REPLACE INTO `#__finder_taxonomy` (`id`, `parent_id`, `title`, `state`, `access`, `ordering`) VALUES
+(1, 0, 'ROOT', 0, 0, 0);
+
+REPLACE INTO `#__finder_terms_common` (`term`, `language`) VALUES
+('a', 'en'),
+('about', 'en'),
+('after', 'en'),
+('ago', 'en'),
+('all', 'en'),
+('am', 'en'),
+('an', 'en'),
+('and', 'en'),
+('ani', 'en'),
+('any', 'en'),
+('are', 'en'),
+('aren''t', 'en'),
+('as', 'en'),
+('at', 'en'),
+('be', 'en'),
+('but', 'en'),
+('by', 'en'),
+('for', 'en'),
+('from', 'en'),
+('get', 'en'),
+('go', 'en'),
+('how', 'en'),
+('if', 'en'),
+('in', 'en'),
+('into', 'en'),
+('is', 'en'),
+('isn''t', 'en'),
+('it', 'en'),
+('its', 'en'),
+('me', 'en'),
+('more', 'en'),
+('most', 'en'),
+('must', 'en'),
+('my', 'en'),
+('new', 'en'),
+('no', 'en'),
+('none', 'en'),
+('not', 'en'),
+('noth', 'en'),
+('nothing', 'en'),
+('of', 'en'),
+('off', 'en'),
+('often', 'en'),
+('old', 'en'),
+('on', 'en'),
+('onc', 'en'),
+('once', 'en'),
+('onli', 'en'),
+('only', 'en'),
+('or', 'en'),
+('other', 'en'),
+('our', 'en'),
+('ours', 'en'),
+('out', 'en'),
+('over', 'en'),
+('page', 'en'),
+('she', 'en'),
+('should', 'en'),
+('small', 'en'),
+('so', 'en'),
+('some', 'en'),
+('than', 'en'),
+('thank', 'en'),
+('that', 'en'),
+('the', 'en'),
+('their', 'en'),
+('theirs', 'en'),
+('them', 'en'),
+('then', 'en'),
+('there', 'en'),
+('these', 'en'),
+('they', 'en'),
+('this', 'en'),
+('those', 'en'),
+('thus', 'en'),
+('time', 'en'),
+('times', 'en'),
+('to', 'en'),
+('too', 'en'),
+('true', 'en'),
+('under', 'en'),
+('until', 'en'),
+('up', 'en'),
+('upon', 'en'),
+('use', 'en'),
+('user', 'en'),
+('users', 'en'),
+('veri', 'en'),
+('version', 'en'),
+('very', 'en'),
+('via', 'en'),
+('want', 'en'),
+('was', 'en'),
+('way', 'en'),
+('were', 'en'),
+('what', 'en'),
+('when', 'en'),
+('where', 'en'),
+('whi', 'en'),
+('which', 'en'),
+('who', 'en'),
+('whom', 'en'),
+('whose', 'en'),
+('why', 'en'),
+('wide', 'en'),
+('will', 'en'),
+('with', 'en'),
+('within', 'en'),
+('without', 'en'),
+('would', 'en'),
+('yes', 'en'),
+('yet', 'en'),
+('you', 'en'),
+('your', 'en'),
+('yours', 'en');
+
+
+INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `ordering`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
+('menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:finder', 0, '', 41, 42, 0, '*', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-23.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-23.sql
new file mode 100644
index 00000000..5dae6e53
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-23.sql
@@ -0,0 +1,47 @@
+CREATE TABLE IF NOT EXISTS `#__finder_filters` (
+  `filter_id` int(10) unsigned NOT NULL auto_increment,
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `state` tinyint(1) NOT NULL default '1',
+  `created` datetime NOT NULL default '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL,
+  `created_by_alias` varchar(255) NOT NULL,
+  `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL default '0',
+  `checked_out` int(10) unsigned NOT NULL default '0',
+  `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00',
+  `map_count` int(10) unsigned NOT NULL default '0',
+  `data` text NOT NULL,
+  `params` mediumtext,
+  PRIMARY KEY  (`filter_id`)
+) DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `#__finder_links` (
+  `link_id` int(10) unsigned NOT NULL auto_increment,
+  `url` varchar(255) NOT NULL,
+  `route` varchar(255) NOT NULL,
+  `title` varchar(255) default NULL,
+  `description` varchar(255) default NULL,
+  `indexdate` datetime NOT NULL default '0000-00-00 00:00:00',
+  `md5sum` varchar(32) default NULL,
+  `published` tinyint(1) NOT NULL default '1',
+  `state` int(5) default '1',
+  `access` int(5) default '0',
+  `language` varchar(8) NOT NULL,
+  `publish_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `publish_end_date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `start_date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `end_date` datetime NOT NULL default '0000-00-00 00:00:00',
+  `list_price` double unsigned NOT NULL default '0',
+  `sale_price` double unsigned NOT NULL default '0',
+  `type_id` int(11) NOT NULL,
+  `object` mediumblob NOT NULL,
+  PRIMARY KEY  (`link_id`),
+  KEY `idx_type` (`type_id`),
+  KEY `idx_title` (`title`),
+  KEY `idx_md5` (`md5sum`),
+  KEY `idx_url` (`url`(75)),
+  KEY `idx_published_list` (`published`,`state`,`access`,`publish_start_date`,`publish_end_date`,`list_price`),
+  KEY `idx_published_sale` (`published`,`state`,`access`,`publish_start_date`,`publish_end_date`,`sale_price`)
+) DEFAULT CHARSET=utf8;
+
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql
new file mode 100644
index 00000000..bbaaff3f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `#__menu` DROP INDEX `idx_client_id_parent_id_alias`;
+
+--
+-- The following statment had to be modified for utf8mb4 in Joomla! 3.5.1, changing
+-- `alias` to `alias`(100)
+--
+
+ALTER TABLE `#__menu` ADD UNIQUE `idx_client_id_parent_id_alias_language` ( `client_id` , `parent_id` , `alias`(100) , `language` );
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-10.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-10.sql
new file mode 100644
index 00000000..c9122145
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-10.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__updates` ADD COLUMN `infourl` text NOT NULL AFTER `detailsurl`;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-14.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-14.sql
new file mode 100644
index 00000000..4817357c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.0-2012-01-14.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__languages` CHANGE `sitename` `sitename` VARCHAR( 1024 ) NOT NULL DEFAULT '';
+
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql
new file mode 100644
index 00000000..c6fb1d0b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql
@@ -0,0 +1,8 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(314, 'mod_version', 'module', 'mod_version', '', 1, 1, 1, 0, '{"legacy":false,"name":"mod_version","type":"module","creationDate":"January 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","description":"MOD_VERSION_XML_DESCRIPTION","group":""}', '{"format":"short","product":"1","cache":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
+('Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*');
+
+INSERT INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES 
+(LAST_INSERT_ID(), 0);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.2-2012-03-05.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.2-2012-03-05.sql
new file mode 100644
index 00000000..1c06a396
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.2-2012-03-05.sql
@@ -0,0 +1 @@
+# Dummy SQL file to set schema version
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.3-2012-03-13.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.3-2012-03-13.sql
new file mode 100644
index 00000000..1c06a396
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.3-2012-03-13.sql
@@ -0,0 +1 @@
+# Dummy SQL file to set schema version
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql
new file mode 100644
index 00000000..d24ec9d2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql
@@ -0,0 +1,5 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `ordering`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
+('menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 0, 1, 1, 28, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql
new file mode 100644
index 00000000..1f43a493
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `#__languages` ADD COLUMN `access` integer unsigned NOT NULL default 0 AFTER `published`;
+
+ALTER TABLE `#__languages` ADD INDEX `idx_access` (`access`);
+
+UPDATE `#__categories` SET `extension` = 'com_users.notes' WHERE `extension` = 'com_users';
+
+UPDATE `#__extensions` SET `enabled` = '1' WHERE `protected` = '1' AND `type` <> 'plugin';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.5.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.5.sql
new file mode 100644
index 00000000..c73b7088
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.5.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__redirect_links` ADD COLUMN `hits` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `comment`;
+ALTER TABLE `#__users` ADD COLUMN `lastResetTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'Date of last password reset';
+ALTER TABLE `#__users` ADD COLUMN `resetCount` int(11) NOT NULL DEFAULT '0' COMMENT 'Count of password resets since lastResetTime';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.6.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.6.sql
new file mode 100644
index 00000000..ff1afae2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.6.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 2.5.6
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql b/core/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql
new file mode 100644
index 00000000..edb24863
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/2.5.7.sql
@@ -0,0 +1 @@
+INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES('Accredited Joomla! Translations','collection','https://update.joomla.org/language/translationlist.xml',1,0);INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES(LAST_INSERT_ID(),600);UPDATE  `#__assets` SET name=REPLACE( name, 'com_user.notes.category','com_users.category'  );UPDATE  `#__categories` SET extension=REPLACE( extension, 'com_user.notes.category','com_users.category'  );
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql
new file mode 100644
index 00000000..7043e212
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql
@@ -0,0 +1,147 @@
+ALTER TABLE `#__users` DROP INDEX `usertype`;
+ALTER TABLE `#__session` DROP INDEX `whosonline`;
+
+DROP TABLE IF EXISTS `#__update_categories`;
+
+ALTER TABLE `#__contact_details` DROP `imagepos`;
+ALTER TABLE `#__content` DROP COLUMN `title_alias`;
+ALTER TABLE `#__content` DROP COLUMN `sectionid`;
+ALTER TABLE `#__content` DROP COLUMN `mask`;
+ALTER TABLE `#__content` DROP COLUMN `parentid`;
+ALTER TABLE `#__newsfeeds` DROP COLUMN `filename`;
+ALTER TABLE `#__menu` DROP COLUMN `ordering`;
+ALTER TABLE `#__session` DROP COLUMN `usertype`;
+ALTER TABLE `#__users` DROP COLUMN `usertype`;
+ALTER TABLE `#__updates` DROP COLUMN `categoryid`;
+
+UPDATE `#__extensions` SET protected = 0 WHERE
+`name` = 'com_search' OR
+`name` = 'mod_articles_archive' OR
+`name` = 'mod_articles_latest' OR
+`name` = 'mod_banners' OR
+`name` = 'mod_feed' OR
+`name` = 'mod_footer' OR
+`name` = 'mod_users_latest' OR
+`name` = 'mod_articles_category' OR
+`name` = 'mod_articles_categories' OR
+`name` = 'plg_content_pagebreak' OR
+`name` = 'plg_content_pagenavigation' OR
+`name` = 'plg_content_vote' OR
+`name` = 'plg_editors_tinymce' OR
+`name` = 'plg_system_p3p' OR
+`name` = 'plg_user_contactcreator' OR
+`name` = 'plg_user_profile';
+
+DELETE FROM `#__extensions` WHERE `extension_id` = 800;
+
+ALTER TABLE `#__assets` ENGINE=InnoDB;
+ALTER TABLE `#__associations` ENGINE=InnoDB;
+ALTER TABLE `#__banners` ENGINE=InnoDB;
+ALTER TABLE `#__banner_clients` ENGINE=InnoDB;
+ALTER TABLE `#__banner_tracks` ENGINE=InnoDB;
+ALTER TABLE `#__categories` ENGINE=InnoDB;
+ALTER TABLE `#__contact_details` ENGINE=InnoDB;
+ALTER TABLE `#__content` ENGINE=InnoDB;
+ALTER TABLE `#__content_frontpage` ENGINE=InnoDB;
+ALTER TABLE `#__content_rating` ENGINE=InnoDB;
+ALTER TABLE `#__core_log_searches` ENGINE=InnoDB;
+ALTER TABLE `#__extensions` ENGINE=InnoDB;
+ALTER TABLE `#__finder_filters` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms0` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms1` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms2` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms3` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms4` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms5` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms6` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms7` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms8` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_terms9` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_termsa` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_termsb` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_termsc` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_termsd` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_termse` ENGINE=InnoDB;
+ALTER TABLE `#__finder_links_termsf` ENGINE=InnoDB;
+ALTER TABLE `#__finder_taxonomy` ENGINE=InnoDB;
+ALTER TABLE `#__finder_taxonomy_map` ENGINE=InnoDB;
+ALTER TABLE `#__finder_terms` ENGINE=InnoDB;
+ALTER TABLE `#__finder_terms_common` ENGINE=InnoDB;
+ALTER TABLE `#__finder_types` ENGINE=InnoDB;
+ALTER TABLE `#__languages` ENGINE=InnoDB;
+ALTER TABLE `#__menu` ENGINE=InnoDB;
+ALTER TABLE `#__menu_types` ENGINE=InnoDB;
+ALTER TABLE `#__messages` ENGINE=InnoDB;
+ALTER TABLE `#__messages_cfg` ENGINE=InnoDB;
+ALTER TABLE `#__modules` ENGINE=InnoDB;
+ALTER TABLE `#__modules_menu` ENGINE=InnoDB;
+ALTER TABLE `#__newsfeeds` ENGINE=InnoDB;
+ALTER TABLE `#__overrider` ENGINE=InnoDB;
+ALTER TABLE `#__redirect_links` ENGINE=InnoDB;
+ALTER TABLE `#__schemas` ENGINE=InnoDB;
+ALTER TABLE `#__session` ENGINE=InnoDB;
+ALTER TABLE `#__template_styles` ENGINE=InnoDB;
+ALTER TABLE `#__updates` ENGINE=InnoDB;
+ALTER TABLE `#__update_sites` ENGINE=InnoDB;
+ALTER TABLE `#__update_sites_extensions` ENGINE=InnoDB;
+ALTER TABLE `#__users` ENGINE=InnoDB;
+ALTER TABLE `#__usergroups` ENGINE=InnoDB;
+ALTER TABLE `#__user_notes` ENGINE=InnoDB;
+ALTER TABLE `#__user_profiles` ENGINE=InnoDB;
+ALTER TABLE `#__user_usergroup_map` ENGINE=InnoDB;
+ALTER TABLE `#__viewlevels` ENGINE=InnoDB;
+
+ALTER TABLE `#__newsfeeds` ADD COLUMN `description` text NOT NULL;
+ALTER TABLE `#__newsfeeds` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1';
+ALTER TABLE `#__newsfeeds` ADD COLUMN `hits` int(10) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE `#__newsfeeds` ADD COLUMN `images` text NOT NULL;
+ALTER TABLE `#__contact_details` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1';
+ALTER TABLE `#__contact_details` ADD COLUMN `hits` int(10) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE `#__banners` ADD COLUMN `created_by` int(10) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE `#__banners` ADD COLUMN `created_by_alias` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__banners` ADD COLUMN `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `#__banners` ADD COLUMN `modified_by` int(10) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE `#__banners` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1';
+ALTER TABLE `#__categories` ADD COLUMN `version` int(10) unsigned NOT NULL DEFAULT '1';
+UPDATE  `#__assets` SET name=REPLACE( name, 'com_user.notes.category','com_users.category'  );
+UPDATE  `#__categories` SET extension=REPLACE( extension, 'com_user.notes.category','com_users.category'  );
+
+ALTER TABLE `#__finder_terms` ADD COLUMN `language` char(3) NOT NULL DEFAULT '';
+ALTER TABLE `#__finder_tokens` ADD COLUMN `language` char(3) NOT NULL DEFAULT '';
+ALTER TABLE `#__finder_tokens_aggregate` ADD COLUMN `language` char(3) NOT NULL DEFAULT '';
+
+INSERT INTO `#__extensions`
+	(`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`)
+	VALUES
+	('isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+	('protostar', 'template', 'protostar', '', 0, 1, 1, 0, '{"name":"protostar","type":"template","creationDate":"4\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_PROTOSTAR_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+	('beez3', 'template', 'beez3', '', 0, 1, 1, 0, '{"legacy":false,"name":"beez3","type":"template","creationDate":"25 November 2009","author":"Angie Radtke","copyright":"Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.","authorEmail":"a.radtke@derauftritt.de","authorUrl":"http:\\/\\/www.der-auftritt.de","version":"1.6.0","description":"TPL_BEEZ3_XML_DESCRIPTION","group":""}', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `params`) VALUES
+	('protostar', 0, '0', 'protostar - Default', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}'),
+	('isis', 1, '1', 'isis - Default', '{"templateColor":"","logoFile":""}'),
+	('beez3', 0, '0', 'beez3 - Default', '{"wrapperSmall":53,"wrapperLarge":72,"logo":"","sitetitle":"","sitedescription":"","navposition":"center","bootstrap":"","templatecolor":"nature","headerImage":"","backgroundcolor":"#eee"}');
+
+UPDATE `#__template_styles`
+SET home = (CASE WHEN (SELECT count FROM (SELECT count(`id`) AS count
+			FROM `#__template_styles`
+			WHERE home = '1'
+			AND client_id = 1) as c) = 0
+			THEN '1'
+			ELSE '0'
+			END)
+WHERE template = 'isis'
+AND home != '1';
+
+UPDATE `#__template_styles`
+SET home = 0
+WHERE template = 'bluestork';
+
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+UPDATE `#__update_sites`
+SET location = 'https://update.joomla.org/language/translationlist_3.xml'
+WHERE location = 'https://update.joomla.org/language/translationlist.xml'
+AND name = 'Accredited Joomla! Translations';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.0.1.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.0.1.sql
new file mode 100644
index 00000000..c9f8fdaa
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.1
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.0.2.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.0.2.sql
new file mode 100644
index 00000000..df708fc2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.0.2.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.2
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.0.3.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.0.3.sql
new file mode 100644
index 00000000..23fcc72c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.0.3.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__associations` CHANGE `id` `id` INT(11) NOT NULL COMMENT 'A reference to the associated item.';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql
new file mode 100644
index 00000000..b07d05c2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql
@@ -0,0 +1,165 @@
+--
+-- Table structure for table `#__content_types`
+--
+
+CREATE TABLE IF NOT EXISTS `#__content_types` (
+  `type_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `type_title` varchar(255) NOT NULL DEFAULT '',
+  `type_alias` varchar(255) NOT NULL DEFAULT '',
+  `table` varchar(255) NOT NULL DEFAULT '',
+  `rules` text NOT NULL,
+   `field_mappings` text NOT NULL,
+   `router` varchar(255) NOT NULL  DEFAULT '',
+  PRIMARY KEY (`type_id`),
+  KEY `idx_alias` (`type_alias`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10000;
+
+--
+-- Dumping data for table `#__content_types`
+--
+
+INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`, `rules`, `field_mappings`,`router`) VALUES
+(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}], "special": [{"fulltext":"fulltext"}]}','ContentHelperRoute::getArticleRoute'),
+(2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}], "special": [{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}]}','ContactHelperRoute::getContactRoute'),
+(3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}], "special": [{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}]}','NewsfeedsHelperRoute::getNewsfeedRoute'),
+(4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}], "special": [{}]}','UsersHelperRoute::getUserRoute'),
+(5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}','ContentHelperRoute::getCategoryRoute'),
+(6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}','ContactHelperRoute::getCategoryRoute'),
+(7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}','NewsfeedsHelperRoute::getCategoryRoute'),
+(8, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}]}','TagsHelperRoute::getTagRoute');
+
+CREATE TABLE IF NOT EXISTS `#__contentitem_tag_map` (
+  `type_alias` varchar(255) NOT NULL DEFAULT '',
+  `core_content_id` int(10) unsigned NOT NULL COMMENT 'PK from the core content table',
+  `content_item_id` int(11) NOT NULL COMMENT 'PK from the content type table',
+  `tag_id` int(10) unsigned NOT NULL COMMENT 'PK from the tag table',
+  `tag_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Date of most recent save for this tag-item',
+  `type_id` mediumint(8) NOT NULL COMMENT 'PK from the content_type table',
+  UNIQUE KEY `uc_ItemnameTagid` (`type_id`,`content_item_id`,`tag_id`),
+  KEY `idx_tag_type` (`tag_id`,`type_id`),
+  KEY `idx_date_id` (`tag_date`,`tag_id`),
+  KEY `idx_tag` (`tag_id`),
+  KEY `idx_type` (`type_id`),
+  KEY `idx_core_content_id` (`core_content_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Maps items from content tables to tags';
+
+CREATE TABLE IF NOT EXISTS `#__tags` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `lft` int(11) NOT NULL DEFAULT '0',
+  `rgt` int(11) NOT NULL DEFAULT '0',
+  `level` int(10) unsigned NOT NULL DEFAULT '0',
+  `path` varchar(255) NOT NULL DEFAULT '',
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `note` varchar(255) NOT NULL DEFAULT '',
+  `description` mediumtext NOT NULL,
+  `published` tinyint(1) NOT NULL DEFAULT '0',
+  `checked_out` int(11) unsigned NOT NULL DEFAULT '0',
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `access` int(10) unsigned NOT NULL DEFAULT '0',
+  `params` text NOT NULL,
+  `metadesc` varchar(1024) NOT NULL COMMENT 'The meta description for the page.',
+  `metakey` varchar(1024) NOT NULL COMMENT 'The meta keywords for the page.',
+  `metadata` varchar(2048) NOT NULL COMMENT 'JSON encoded metadata properties.',
+  `created_user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `modified_user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `modified_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `images` text NOT NULL,
+  `urls` text NOT NULL,
+  `hits` int(10) unsigned NOT NULL DEFAULT '0',
+  `language` char(7) NOT NULL,
+  `version` int(10) unsigned NOT NULL DEFAULT '1',
+  `publish_up` datetime NOT NULL default '0000-00-00 00:00:00',
+  `publish_down` datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `tag_idx` (`published`,`access`),
+  KEY `idx_access` (`access`),
+  KEY `idx_checkout` (`checked_out`),
+  KEY `idx_path` (`path`),
+  KEY `idx_left_right` (`lft`,`rgt`),
+  KEY `idx_alias` (`alias`),
+  KEY `idx_language` (`language`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `#__tags`
+--
+
+INSERT INTO `#__tags` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`, `alias`, `note`, `description`, `published`, `checked_out`, `checked_out_time`, `access`, `params`, `metadesc`, `metakey`, `metadata`, `created_user_id`, `created_time`,`created_by_alias`, `modified_user_id`, `modified_time`, `images`, `urls`, `hits`, `language`, `version`)
+VALUES (1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{}', '', '', '', '', '2011-01-01 00:00:01','', 0, '0000-00-00 00:00:00', '', '',  0, '*', 1);
+
+--
+-- Table structure for table `#__ucm_base`
+--
+
+CREATE TABLE IF NOT EXISTS `#__ucm_base` (
+  `ucm_id` int(10) unsigned NOT NULL,
+  `ucm_item_id` int(10) NOT NULL,
+  `ucm_type_id` int(11) NOT NULL,
+  `ucm_language_id` int(11) NOT NULL,
+  PRIMARY KEY (`ucm_id`),
+  KEY `idx_ucm_item_id` (`ucm_item_id`),
+  KEY `idx_ucm_type_id` (`ucm_type_id`),
+  KEY `idx_ucm_language_id` (`ucm_language_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `#__ucm_content` (
+  `core_content_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `core_type_alias`  varchar(255) NOT NULL DEFAULT '' COMMENT 'FK to the content types table',
+  `core_title` varchar(255) NOT NULL,
+  `core_alias` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
+  `core_body` mediumtext NOT NULL,
+  `core_state` tinyint(1) NOT NULL DEFAULT '0',
+  `core_checked_out_time`  varchar(255) NOT NULL DEFAULT '',
+  `core_checked_out_user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `core_access` int(10) unsigned NOT NULL DEFAULT '0',
+  `core_params` text NOT NULL,
+  `core_featured` tinyint(4) unsigned NOT NULL DEFAULT '0',
+  `core_metadata` varchar(2048) NOT NULL COMMENT 'JSON encoded metadata properties.',
+  `core_created_user_id` int(10) unsigned  NOT NULL DEFAULT '0',
+  `core_created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `core_created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `core_modified_user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Most recent user that modified',
+  `core_modified_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `core_language` char(7) NOT NULL,
+  `core_publish_up` datetime NOT NULL,
+  `core_publish_down` datetime NOT NULL,
+  `core_content_item_id` int(10) unsigned COMMENT 'ID from the individual type table',
+  `asset_id` int(10) unsigned COMMENT 'FK to the #__assets table.',
+  `core_images` text NOT NULL,
+  `core_urls` text NOT NULL,
+  `core_hits` int(10) unsigned NOT NULL DEFAULT '0',
+  `core_version` int(10) unsigned NOT NULL DEFAULT '1',
+  `core_ordering` int(11) NOT NULL DEFAULT '0',
+  `core_metakey` text NOT NULL,
+  `core_metadesc` text NOT NULL,
+  `core_catid` int(10) unsigned NOT NULL DEFAULT '0',
+  `core_xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
+  `core_type_id` int(10) unsigned,
+  PRIMARY KEY (`core_content_id`),
+  KEY `tag_idx` (`core_state`,`core_access`),
+  KEY `idx_access` (`core_access`),
+  KEY `idx_alias` (`core_alias`),
+  KEY `idx_language` (`core_language`),
+  KEY `idx_title` (`core_title`),
+  KEY `idx_modified_time` (`core_modified_time`),
+  KEY `idx_created_time` (`core_created_time`),
+  KEY `idx_content_type` (`core_type_alias`),
+  KEY `idx_core_modified_user_id` (`core_modified_user_id`),
+  KEY `idx_core_checked_out_user_id` (`core_checked_out_user_id`),
+  KEY `idx_core_created_user_id` (`core_created_user_id`),
+  KEY `idx_core_type_id` (`core_type_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Contains core content data in name spaced fields';
+
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
+('main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 45, 46, 0, '', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.1.1.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.1.1.sql
new file mode 100644
index 00000000..df442faa
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.1.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.1
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.1.2.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.1.2.sql
new file mode 100644
index 00000000..40079fd6
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.1.2.sql
@@ -0,0 +1,16 @@
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Article';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Contact';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Newsfeed';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'User';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Article Category';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Contact Category';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Newsfeeds Category';
+UPDATE `#__content_types` SET `table` = '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE `type_title` = 'Tag';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}, "special": {"fulltext":"fulltext"}}' WHERE `type_title` = 'Article';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special": {"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}' WHERE `type_title` = 'Contact';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special": {"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}' WHERE `type_title` = 'Newsfeed';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special": {}}' WHERE `type_title` = 'User';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE `type_title` = 'Article Category';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE `type_title` = 'Contact Category';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE `type_title` = 'Newsfeeds Category';
+UPDATE `#__content_types` SET `field_mappings` = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}' WHERE `type_title` = 'Tag';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.1.3.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.1.3.sql
new file mode 100644
index 00000000..ebc1102e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.1.3.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.3
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.1.4.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.1.4.sql
new file mode 100644
index 00000000..e4bba830
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.1.4.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.1.5.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.1.5.sql
new file mode 100644
index 00000000..2c9caba7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.1.5.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.5
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
new file mode 100644
index 00000000..59139340
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
@@ -0,0 +1,93 @@
+/* Core 3.2 schema updates */
+
+ALTER TABLE `#__content_types` ADD COLUMN `content_history_options` VARCHAR(5120) NOT NULL COMMENT 'JSON string for com_contenthistory options';
+
+UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administrator\\/components\\/com_content\\/models\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}' WHERE `type_alias` = 'com_content.article';
+UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administrator\\/components\\/com_contact\\/models\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version","xreference"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }' WHERE `type_alias` = 'com_contact.contact';
+UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}' WHERE `type_alias` IN ('com_content.category', 'com_contact.category', 'com_newsfeeds.category');
+UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administrator\\/components\\/com_newsfeeds\\/models\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE `type_alias` = 'com_newsfeeds.newsfeed';
+UPDATE `#__content_types` SET `content_history_options` = '{"formFile":"administrator\\/components\\/com_tags\\/models\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE `type_alias` = 'com_tags.tag';
+
+INSERT INTO `#__content_types` (`type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES
+('Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
+('Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+('Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'),
+('User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/models\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
+('User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}');
+
+UPDATE `#__extensions` SET `params` = '{"template_positions_display":"0","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}' WHERE `extension_id` = 20;
+UPDATE `#__extensions` SET `params` = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE `extension_id` = 410;
+
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
+('main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1);
+
+ALTER TABLE `#__modules` ADD COLUMN `asset_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to the #__assets table.' AFTER `id`;
+
+CREATE TABLE `#__postinstall_messages` (
+  `postinstall_message_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `extension_id` bigint(20) NOT NULL DEFAULT '700' COMMENT 'FK to #__extensions',
+  `title_key` varchar(255) NOT NULL DEFAULT '' COMMENT 'Lang key for the title',
+  `description_key` varchar(255) NOT NULL DEFAULT '' COMMENT 'Lang key for description',
+  `action_key` varchar(255) NOT NULL DEFAULT '',
+  `language_extension` varchar(255) NOT NULL DEFAULT 'com_postinstall' COMMENT 'Extension holding lang keys',
+  `language_client_id` tinyint(3) NOT NULL DEFAULT '1',
+  `type` varchar(10) NOT NULL DEFAULT 'link' COMMENT 'Message type - message, link, action',
+  `action_file` varchar(255) DEFAULT '' COMMENT 'RAD URI to the PHP file containing action method',
+  `action` varchar(255) DEFAULT '' COMMENT 'Action method name or URL',
+  `condition_file` varchar(255) DEFAULT NULL COMMENT 'RAD URI to file holding display condition method',
+  `condition_method` varchar(255) DEFAULT NULL COMMENT 'Display condition method, must return boolean',
+  `version_introduced` varchar(50) NOT NULL DEFAULT '3.2.0' COMMENT 'Version when this message was introduced',
+  `enabled` tinyint(3) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`postinstall_message_id`)
+) DEFAULT CHARSET=utf8;
+
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1),
+(700, 'COM_CPANEL_MSG_EACCELERATOR_TITLE', 'COM_CPANEL_MSG_EACCELERATOR_BODY', 'COM_CPANEL_MSG_EACCELERATOR_BUTTON', 'com_cpanel', 1, 'action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_condition', '3.2.0', 1);
+
+CREATE TABLE IF NOT EXISTS `#__ucm_history` (
+  `version_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `ucm_item_id` int(10) unsigned NOT NULL,
+  `ucm_type_id` int(10) unsigned NOT NULL,
+  `version_note` varchar(255) NOT NULL DEFAULT '' COMMENT 'Optional version name',
+  `save_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `editor_user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `character_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Number of characters in this version.',
+  `sha1_hash` varchar(50) NOT NULL DEFAULT '' COMMENT 'SHA1 hash of the version_data column.',
+  `version_data` mediumtext NOT NULL COMMENT 'json-encoded string of version data',
+  `keep_forever` tinyint(4) NOT NULL DEFAULT '0' COMMENT '0=auto delete; 1=keep',
+  PRIMARY KEY (`version_id`),
+  KEY `idx_ucm_item_id` (`ucm_type_id`,`ucm_item_id`),
+  KEY `idx_save_date` (`save_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `#__users` ADD COLUMN `otpKey` varchar(1000) NOT NULL DEFAULT '' COMMENT 'Two factor authentication encrypted keys';
+ALTER TABLE `#__users` ADD COLUMN `otep` varchar(1000) NOT NULL DEFAULT '' COMMENT 'One time emergency passwords';
+
+CREATE TABLE IF NOT EXISTS `#__user_keys` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` varchar(255) NOT NULL,
+  `token` varchar(255) NOT NULL,
+  `series` varchar(255) NOT NULL,
+  `invalid` tinyint(4) NOT NULL,
+  `time` varchar(200) NOT NULL,
+  `uastring` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `series` (`series`),
+  UNIQUE KEY `series_2` (`series`),
+  UNIQUE KEY `series_3` (`series`),
+  KEY `user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+/* Update bad params for two cpanel modules */
+
+UPDATE `#__modules` SET `params` = REPLACE(`params`, '"bootstrap_size":"1"', '"bootstrap_size":"0"') WHERE `id` IN (3,4);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.1.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.1.sql
new file mode 100644
index 00000000..94857f92
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.1.sql
@@ -0,0 +1 @@
+DELETE FROM `#__postinstall_messages` WHERE `title_key` = 'PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TITLE';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql
new file mode 100644
index 00000000..d372260e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__update_sites` ADD COLUMN `extra_query` VARCHAR(1000) DEFAULT '';
+ALTER TABLE `#__updates` ADD COLUMN `extra_query` VARCHAR(1000) DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql
new file mode 100644
index 00000000..2da6b1f7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql
@@ -0,0 +1 @@
+UPDATE `#__menu` SET `component_id` = (SELECT `extension_id` FROM `#__extensions` WHERE `element` = 'com_joomlaupdate') WHERE `link` = 'index.php?option=com_joomlaupdate';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql
new file mode 100644
index 00000000..c80b1b21
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 1, 0);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql
new file mode 100644
index 00000000..852f9ec3
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql
new file mode 100644
index 00000000..fa4aff3f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql
@@ -0,0 +1,2 @@
+/* Update updates version length */
+ALTER TABLE `#__updates` MODIFY `version` varchar(32) DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql
new file mode 100644
index 00000000..a6563541
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '{"legacy":false,"name":"PHPass","type":"library","creationDate":"2004-2006","author":"Solar Designer","authorEmail":"solar@openwall.com","authorUrl":"http:\/\/www.openwall.com/phpass","version":"0.3","description":"LIB_PHPASS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.2.3-2014-02-20.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.2.3-2014-02-20.sql
new file mode 100644
index 00000000..0bd96df1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.2.3-2014-02-20.sql
@@ -0,0 +1 @@
+UPDATE `#__extensions` ext1, `#__extensions` ext2 SET ext1.`params` =  ext2.`params` WHERE ext1.`name` = 'plg_authentication_cookie' AND ext2.`name` = 'plg_system_remember';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-02-16.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-02-16.sql
new file mode 100644
index 00000000..e2802815
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-02-16.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__users` ADD COLUMN `requireReset` tinyint(4) NOT NULL DEFAULT 0 COMMENT 'Require user to reset password on next login' AFTER `otep`;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-04-02.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-04-02.sql
new file mode 100644
index 00000000..9bbacff9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.3.0-2014-04-02.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 0, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.3.4-2014-08-03.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.3.4-2014-08-03.sql
new file mode 100644
index 00000000..1ab0a8fd
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.3.4-2014-08-03.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__user_profiles` CHANGE `profile_value` `profile_value` TEXT NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql
new file mode 100644
index 00000000..eb704887
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.3.6-2014-09-30.sql
@@ -0,0 +1,5 @@
+INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`) VALUES
+('Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1);
+
+INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES
+((SELECT `update_site_id` FROM `#__update_sites` WHERE `name` = 'Joomla! Update Component Update Site'), (SELECT `extension_id` FROM `#__extensions` WHERE `name` = 'com_joomlaupdate'));
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-08-24.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-08-24.sql
new file mode 100644
index 00000000..d227c424
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-08-24.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'COM_CPANEL_MSG_HTACCESS_TITLE', 'COM_CPANEL_MSG_HTACCESS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccess.php', 'admin_postinstall_htaccess_condition', '3.4.0', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-01.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-01.sql
new file mode 100644
index 00000000..0c95ea5c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-01.sql
@@ -0,0 +1,8 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(801, 'weblinks', 'package', 'pkg_weblinks', '', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__update_sites` (`name`, `type`, `location`, `enabled`) VALUES
+('Weblinks Update Site', 'extension', 'https://raw.githubusercontent.com/joomla-extensions/weblinks/master/manifest.xml', 1);
+
+INSERT INTO `#__update_sites_extensions` (`update_site_id`, `extension_id`) VALUES
+((SELECT `update_site_id` FROM `#__update_sites` WHERE `name` = 'Weblinks Update Site'), 801);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql
new file mode 100644
index 00000000..37620c9c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `#__redirect_links` ADD COLUMN `header` smallint(3) NOT NULL DEFAULT 301;
+--
+-- The following statement has to be disabled because it conflicts with
+-- a later change added with Joomla! 3.5.0 for long URLs in this table
+--
+-- ALTER TABLE `#__redirect_links` MODIFY `new_url` varchar(255);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-10-20.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-10-20.sql
new file mode 100644
index 00000000..958778d5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-10-20.sql
@@ -0,0 +1 @@
+DELETE FROM `#__extensions` WHERE `extension_id` = 100;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql
new file mode 100644
index 00000000..1b272c13
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-12-03.sql
@@ -0,0 +1 @@
+UPDATE `#__extensions` SET `protected` = '0' WHERE `name` = 'plg_editors-xtd_article' AND `type` = "plugin" AND `element` = "article" AND `folder` = "editors-xtd";
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql
new file mode 100644
index 00000000..96adfe3d
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-01-21.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-02-26.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-02-26.sql
new file mode 100644
index 00000000..da3cc8c5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.4.0-2015-02-26.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE', 'COM_CPANEL_MSG_LANGUAGEACCESS340_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/languageaccess340.php', 'admin_postinstall_languageaccess340_condition', '3.4.1', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql
new file mode 100644
index 00000000..e7694783
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__session` MODIFY `session_id` varchar(191) NOT NULL DEFAULT '';
+ALTER TABLE `#__user_keys` MODIFY `series` varchar(191) NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-13.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-13.sql
new file mode 100644
index 00000000..688f1931
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-13.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql
new file mode 100644
index 00000000..dfc9043a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_tag`;
+ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_type`;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql
new file mode 100644
index 00000000..299347e6
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql
@@ -0,0 +1 @@
+UPDATE `#__menu` SET `title` = 'com_contact_contacts' WHERE `client_id` = 1 AND `level` = 2 AND `title` = 'com_contact';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql
new file mode 100644
index 00000000..41eb98fc
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql
@@ -0,0 +1,4 @@
+DELETE FROM `#__menu` WHERE `title` = 'com_messages_read' AND `client_id` = 1;
+
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql
new file mode 100644
index 00000000..4f75f640
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql
@@ -0,0 +1,6 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql
new file mode 100644
index 00000000..0aa843cb
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql
@@ -0,0 +1,14 @@
+--
+-- Create a table for UTF-8 Multibyte (utf8mb4) conversion for MySQL in
+-- order to check if the conversion has been performed and if not show a
+-- message about database problem in the database schema view. 
+--
+-- The value of `converted` can be 0 (not converted yet after update),
+-- 1 (converted to utf8), or 2 (converted to utf8mb4).
+--
+
+CREATE TABLE IF NOT EXISTS `#__utf8_conversion` (
+  `converted` tinyint(4) NOT NULL DEFAULT 0
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__utf8_conversion` (`converted`) VALUES (0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql
new file mode 100644
index 00000000..ff8c6910
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql
@@ -0,0 +1,12 @@
+ALTER TABLE `#__redirect_links` DROP INDEX `idx_link_old`;
+ALTER TABLE `#__redirect_links` MODIFY `old_url` VARCHAR(2048) NOT NULL;
+
+--
+-- The following statement had to be modified for 3.6.0 by removing the
+-- NOT NULL, which was wrong because not consistent with new install.
+-- See also 3.6.0-2016-04-06.sql for updating 3.5.0 or 3.5.1
+--
+ALTER TABLE `#__redirect_links` MODIFY `new_url` VARCHAR(2048);
+
+ALTER TABLE `#__redirect_links` MODIFY `referer` VARCHAR(2048) NOT NULL;
+ALTER TABLE `#__redirect_links` ADD INDEX `idx_old_url` (`old_url`(100));
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql
new file mode 100644
index 00000000..f6c320b8
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql
@@ -0,0 +1,5 @@
+--
+-- Make #__user_keys.user_id fit to #__users.username
+--
+
+ALTER TABLE `#__user_keys` MODIFY `user_id` varchar(150) NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql
new file mode 100644
index 00000000..86ecda89
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql
@@ -0,0 +1,7 @@
+--
+-- Reset UTF-8 Multibyte (utf8mb4) or UTF-8 conversion status
+-- to force a new conversion when updating from version 3.5.0
+--
+
+UPDATE `#__utf8_conversion` SET `converted` = 0
+ WHERE (SELECT COUNT(*) FROM `#__schemas` WHERE `extension_id`=700 AND `version_id` LIKE '3.5.0%') = 1;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-01.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-01.sql
new file mode 100644
index 00000000..0ac34df3
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-01.sql
@@ -0,0 +1,8 @@
+-- Rename update site names
+UPDATE `#__update_sites` SET `name` = 'Joomla! Core' WHERE `name` = 'Joomla Core' AND `type` = 'collection';
+UPDATE `#__update_sites` SET `name` = 'Joomla! Extension Directory' WHERE `name` = 'Joomla Extension Directory' AND `type` = 'collection';
+
+UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/core/list.xml' WHERE `name` = 'Joomla! Core' AND `type` = 'collection';
+UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/jed/list.xml' WHERE `name` = 'Joomla! Extension Directory' AND `type` = 'collection';
+UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/language/translationlist_3.xml' WHERE `name` = 'Accredited Joomla! Translations' AND `type` = 'collection';
+UPDATE `#__update_sites` SET `location` = 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml' WHERE `name` = 'Joomla! Update Component Update Site' AND `type` = 'extension';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-06.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-06.sql
new file mode 100644
index 00000000..e7df517a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-06.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__redirect_links` MODIFY `new_url` VARCHAR(2048);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-08.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-08.sql
new file mode 100644
index 00000000..6714529c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-08.sql
@@ -0,0 +1,14 @@
+-- Insert the missing en-GB package extension.
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`)
+ VALUES (802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+-- Change update site extension id to the new extension.
+UPDATE `#__update_sites_extensions`
+SET `extension_id` = 802
+WHERE `update_site_id` IN (
+			SELECT `update_site_id`
+			FROM `#__update_sites`
+			WHERE `name` = 'Accredited Joomla! Translations'
+			AND `type` = 'collection'
+			)
+AND `extension_id` = 600;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-09.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-09.sql
new file mode 100644
index 00000000..95678415
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-09.sql
@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__menu_types
+--
+
+ALTER TABLE `#__menu_types` ADD COLUMN `asset_id` INT(11) NOT NULL AFTER `id`;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-05-06.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-05-06.sql
new file mode 100644
index 00000000..a53c9b18
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-05-06.sql
@@ -0,0 +1,5 @@
+DELETE FROM `#__extensions` WHERE `type` = 'library' AND `element` = 'simplepie';
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 1, 0),
+(456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 2, 0),
+(457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 3, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql
new file mode 100644
index 00000000..511d7cba
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-01.sql
@@ -0,0 +1 @@
+UPDATE `#__extensions` SET `protected` = 1, `enabled` = 1  WHERE `name` = 'com_ajax';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql
new file mode 100644
index 00000000..4fcc47c4
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-06-05.sql
@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE `#__languages` ADD COLUMN `asset_id` INT(11) NOT NULL AFTER `lang_id`;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql
new file mode 100644
index 00000000..586c542e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql
@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE `#__newsfeeds` MODIFY `link` VARCHAR(2048) NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql
new file mode 100644
index 00000000..06d2c9e9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-16.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-06.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-06.sql
new file mode 100644
index 00000000..1a861d18
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-06.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(458, 'plg_quickicon_phpversioncheck', 'plugin', 'phpversioncheck', 'quickicon', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-22.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-22.sql
new file mode 100644
index 00000000..02ec2ac9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-22.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(459, 'plg_editors-xtd_menu', 'plugin', 'menu', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql
new file mode 100644
index 00000000..25253699
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-08-29.sql
@@ -0,0 +1,93 @@
+CREATE TABLE IF NOT EXISTS `#__fields` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `asset_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `context` varchar(255) NOT NULL DEFAULT '',
+  `group_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `label` varchar(255) NOT NULL DEFAULT '',
+  `default_value` text NOT NULL DEFAULT '',
+  `type` varchar(255) NOT NULL DEFAULT 'text',
+  `note` varchar(255) NOT NULL DEFAULT '',
+  `description` text NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '0',
+  `required` tinyint(1) NOT NULL DEFAULT '0',
+  `checked_out` int(11) NOT NULL DEFAULT '0',
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ordering` int(11) NOT NULL DEFAULT '0',
+  `params` text NOT NULL,
+  `fieldparams` text NOT NULL,
+  `language` char(7) NOT NULL DEFAULT '',
+  `created_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `modified_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `access` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `idx_checkout` (`checked_out`),
+  KEY `idx_state` (`state`),
+  KEY `idx_created_user_id` (`created_user_id`),
+  KEY `idx_access` (`access`),
+  KEY `idx_context` (`context`(191)),
+  KEY `idx_language` (`language`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__fields_categories` (
+  `field_id` int(11) NOT NULL DEFAULT 0,
+  `category_id` int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`field_id`,`category_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__fields_groups` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `asset_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `context` varchar(255) NOT NULL DEFAULT '',
+  `title` varchar(255) NOT NULL DEFAULT '',
+  `note` varchar(255) NOT NULL DEFAULT '',
+  `description` text NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT '0',
+  `checked_out` int(11) NOT NULL DEFAULT '0',
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ordering` int(11) NOT NULL DEFAULT '0',
+  `language` char(7) NOT NULL DEFAULT '',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT '0',
+  `access` int(11) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `idx_checkout` (`checked_out`),
+  KEY `idx_state` (`state`),
+  KEY `idx_created_by` (`created_by`),
+  KEY `idx_access` (`access`),
+  KEY `idx_context` (`context`(191)),
+  KEY `idx_language` (`language`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `#__fields_values` (
+  `field_id` int(10) unsigned NOT NULL,
+  `item_id` varchar(255) NOT NULL COMMENT 'Allow references to items which have strings as ids, eg. none db systems.',
+  `value` text NOT NULL DEFAULT '',
+  KEY `idx_field_id` (`field_id`),
+  KEY `idx_item_id` (`item_id`(191))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(462, 'plg_fields_calendar', 'plugin', 'calendar', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(463, 'plg_fields_checkboxes', 'plugin', 'checkboxes', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(464, 'plg_fields_color', 'plugin', 'color', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(465, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(466, 'plg_fields_imagelist', 'plugin', 'imagelist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(467, 'plg_fields_integer', 'plugin', 'integer', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(468, 'plg_fields_list', 'plugin', 'list', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(469, 'plg_fields_media', 'plugin', 'media', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(470, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(471, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(472, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(473, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(474, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(475, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(476, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-09-29.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-09-29.sql
new file mode 100644
index 00000000..6ee23ef7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-09-29.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE', 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/joomla40checks.php', 'admin_postinstall_joomla40checks_condition', '3.7.0', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-01.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-01.sql
new file mode 100644
index 00000000..0eac30c0
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-01.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(460, 'plg_editors-xtd_contact', 'plugin', 'contact', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-02.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-02.sql
new file mode 100644
index 00000000..73fd38ff
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-10-02.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__session` MODIFY `client_id` tinyint(3) unsigned DEFAULT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-04.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-04.sql
new file mode 100644
index 00000000..0281c972
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-04.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__extensions` CHANGE `enabled` `enabled` TINYINT(3) NOT NULL DEFAULT '0';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql
new file mode 100644
index 00000000..fe202976
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__menu_types` ADD COLUMN `client_id` int(11) NOT NULL DEFAULT 0;
+
+UPDATE `#__menu` SET `published` = 1 WHERE `menutype` = 'main' OR `menutype` = 'menu';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
new file mode 100644
index 00000000..e0668450
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-21.sql
@@ -0,0 +1,2 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE `#__languages` DROP INDEX `idx_image`;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-24.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-24.sql
new file mode 100644
index 00000000..2b2a9101
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-24.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `#__extensions` ADD COLUMN `package_id` int(11) NOT NULL DEFAULT 0 COMMENT 'Parent package ID for extensions installed as a package.' AFTER `extension_id`;
+
+UPDATE `#__extensions` AS `e1`
+INNER JOIN (SELECT `extension_id` FROM `#__extensions` WHERE `type` = 'package' AND `element` = 'pkg_en-GB') AS `e2`
+SET `e1`.`package_id` = `e2`.`extension_id`
+WHERE `e1`.`type`= 'language' AND `e1`.`element` = 'en-GB';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql
new file mode 100644
index 00000000..f6874ee5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-27.sql
@@ -0,0 +1,2 @@
+-- Normalize modules content field with other db systems. Add default value.
+ALTER TABLE `#__modules` MODIFY `content` text NOT NULL DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-08.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-08.sql
new file mode 100644
index 00000000..68360868
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-08.sql
@@ -0,0 +1,18 @@
+-- Normalize ucm_content_table default values.
+ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin  NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_body` mediumtext NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_checked_out_time` varchar(255) NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `#__ucm_content` MODIFY `core_params` text NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_metadata` varchar(2048) NOT NULL DEFAULT '' COMMENT 'JSON encoded metadata properties.';
+ALTER TABLE `#__ucm_content` MODIFY `core_language` char(7) NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `#__ucm_content` MODIFY `core_publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `#__ucm_content` MODIFY `core_content_item_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'ID from the individual type table';
+ALTER TABLE `#__ucm_content` MODIFY `asset_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.';
+ALTER TABLE `#__ucm_content` MODIFY `core_images` text NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_urls` text NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_metakey` text NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_metadesc` text NOT NULL DEFAULT '';
+ALTER TABLE `#__ucm_content` MODIFY `core_xreference` varchar(50) NOT NULL DEFAULT '' COMMENT 'A reference to enable linkages to external data sets.';
+ALTER TABLE `#__ucm_content` MODIFY `core_type_id` int(10) unsigned NOT NULL DEFAULT 0;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-09.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-09.sql
new file mode 100644
index 00000000..162635df
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-09.sql
@@ -0,0 +1,8 @@
+-- Normalize categories table default values.
+ALTER TABLE `#__categories` MODIFY `title` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__categories` MODIFY `description` mediumtext NOT NULL DEFAULT '';
+ALTER TABLE `#__categories` MODIFY `params` text NOT NULL DEFAULT '';
+ALTER TABLE `#__categories` MODIFY `metadesc` varchar(1024) NOT NULL DEFAULT '' COMMENT 'The meta description for the page.';
+ALTER TABLE `#__categories` MODIFY `metakey` varchar(1024) NOT NULL DEFAULT '' COMMENT 'The meta keywords for the page.';
+ALTER TABLE `#__categories` MODIFY `metadata` varchar(2048) NOT NULL DEFAULT '' COMMENT 'JSON encoded metadata properties.';
+ALTER TABLE `#__categories` MODIFY `language` char(7) NOT NULL DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql
new file mode 100644
index 00000000..5b309f02
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-17.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-17.sql
new file mode 100644
index 00000000..fe041e90
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-17.sql
@@ -0,0 +1,58 @@
+-- Sync menutype for admin menu and set client_id correct
+
+-- Note: This file had to be modified with Joomla 3.7.3 because the
+-- original version made site menus disappear if there were menu types
+-- "main" or "menu" defined for the site.
+
+-- Step 1: If there is any user-defined menu and menu type "main" for the site
+-- (client_id = 0), then change the menu type for the menu, any module and the
+-- menu type to something very likely not being used yet and just within the
+-- max. length of 24 characters.
+UPDATE `#__menu`
+   SET `menutype` = 'main_is_reserved_133C585'
+ WHERE `client_id` = 0
+   AND `menutype` = 'main'
+   AND (SELECT COUNT(`id`) FROM `#__menu_types` WHERE `client_id` = 0 AND `menutype` = 'main') > 0;
+
+UPDATE `#__modules`
+   SET `params` = REPLACE(`params`,'"menutype":"main"','"menutype":"main_is_reserved_133C585"')
+ WHERE `client_id` = 0
+   AND (SELECT COUNT(`id`) FROM `#__menu_types` WHERE `client_id` = 0 AND `menutype` = 'main') > 0;
+
+UPDATE `#__menu_types`
+   SET `menutype` = 'main_is_reserved_133C585'
+ WHERE `client_id` = 0 
+   AND `menutype` = 'main';
+
+-- Step 2: What remains now are the main menu items, possibly with wrong
+-- client_id if there was nothing hit by step 1 because there was no record in
+-- the menu types table with client_id = 0.
+UPDATE `#__menu`
+   SET `client_id` = 1
+ WHERE `menutype` = 'main';
+
+-- Step 3: If we have menu items for the admin using menutype = "menu" and
+-- having correct client_id = 1, we can be sure they belong to the admin menu
+-- and so rename the menutype.
+UPDATE `#__menu`
+   SET `menutype` = 'main'
+ WHERE `client_id` = 1 
+   AND `menutype` = 'menu';
+
+-- Step 4: If there is no user-defined menu type "menu" for the site, we can
+-- assume that any menu items for that menu type belong to the admin.
+-- Fix the client_id for those as it was done with the original version of this
+-- schema update script here.
+UPDATE `#__menu`
+   SET `menutype` = 'main',
+       `client_id` = 1
+ WHERE `menutype` = 'menu'
+   AND (SELECT COUNT(`id`) FROM `#__menu_types` WHERE `client_id` = 0 AND `menutype` = 'menu') = 0;
+
+-- Step 5: For the standard admin menu items of menutype "main" there is no record
+-- in the menutype table on a clean Joomla installation. If there is one, it is a
+-- mistake and it should be deleted. This is also the case with menu type "menu"
+-- for the admin, for which we changed the menutype of the menu items in step 3.
+DELETE FROM `#__menu_types`
+ WHERE `client_id` = 1
+   AND `menutype` IN ('main', 'menu');
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-31.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-31.sql
new file mode 100644
index 00000000..225fba49
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-31.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(477, 'plg_content_fields', 'plugin', 'fields', 'content', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-02.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-02.sql
new file mode 100644
index 00000000..67860a91
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-02.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(478, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-15.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-15.sql
new file mode 100644
index 00000000..5026504a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-15.sql
@@ -0,0 +1,2 @@
+-- Normalize redirect_links table default values.
+ALTER TABLE `#__redirect_links` MODIFY `comment` varchar(255) NOT NULL DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql
new file mode 100644
index 00000000..9ff8df98
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-02-17.sql
@@ -0,0 +1,8 @@
+-- Normalize contact_details table default values.
+ALTER TABLE `#__contact_details` MODIFY `name` varchar(255) NOT NULL;
+ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
+ALTER TABLE `#__contact_details` MODIFY `sortname1` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `sortname2` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `sortname3` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `#__contact_details` MODIFY `language` varchar(7) NOT NULL;
+ALTER TABLE `#__contact_details` MODIFY `xreference` varchar(50) NOT NULL DEFAULT '' COMMENT 'A reference to enable linkages to external data sets.';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-03.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-03.sql
new file mode 100644
index 00000000..ada236b5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-03.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `#__languages` MODIFY `asset_id` int(10) unsigned NOT NULL DEFAULT 0;
+ALTER TABLE `#__menu_types` MODIFY `asset_id` int(10) unsigned NOT NULL DEFAULT 0;
+
+ALTER TABLE  `#__content` MODIFY `xreference` varchar(50) NOT NULL DEFAULT '';
+ALTER TABLE  `#__newsfeeds` MODIFY `xreference` varchar(50) NOT NULL DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-09.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-09.sql
new file mode 100644
index 00000000..84100ee8
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-09.sql
@@ -0,0 +1,17 @@
+UPDATE `#__categories` SET `published` = 1 WHERE `alias` = 'root';
+UPDATE `#__categories` AS `c` INNER JOIN (
+	SELECT c2.id, CASE WHEN MIN(p.published) > 0 THEN MAX(p.published) ELSE MIN(p.published) END AS newPublished
+	FROM `#__categories` AS `c2`
+	INNER JOIN `#__categories` AS `p` ON p.lft <= c2.lft AND c2.rgt <= p.rgt
+	GROUP BY c2.id) c2
+ON c.id = c2.id
+SET published = c2.newPublished;
+
+UPDATE `#__menu` SET `published` = 1 WHERE `alias` = 'root';
+UPDATE `#__menu` AS `c` INNER JOIN (
+	SELECT c2.id, CASE WHEN MIN(p.published) > 0 THEN MAX(p.published) ELSE MIN(p.published) END AS newPublished
+	FROM `#__menu` AS `c2`
+	INNER JOIN `#__menu` AS `p` ON p.lft <= c2.lft AND c2.rgt <= p.rgt
+	GROUP BY c2.id) c2
+ON c.id = c2.id
+SET published = c2.newPublished;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-19.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-19.sql
new file mode 100644
index 00000000..f7f3c552
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-03-19.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__finder_links` MODIFY `description` text;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-10.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-10.sql
new file mode 100644
index 00000000..11ec2713
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-10.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'TPL_HATHOR_MESSAGE_POSTINSTALL_TITLE', 'TPL_HATHOR_MESSAGE_POSTINSTALL_BODY', 'TPL_HATHOR_MESSAGE_POSTINSTALL_ACTION', 'tpl_hathor', 1, 'action', 'admin://templates/hathor/postinstall/hathormessage.php', 'hathormessage_postinstall_action', 'admin://templates/hathor/postinstall/hathormessage.php', 'hathormessage_postinstall_condition', '3.7.0', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-19.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-19.sql
new file mode 100644
index 00000000..35327661
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-04-19.sql
@@ -0,0 +1,3 @@
+-- Set integer field default values.
+UPDATE `#__extensions` SET `params` = '{"multiple":"0","first":"1","last":"100","step":"1"}' WHERE `name` = 'plg_fields_integer';
+
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.3-2017-06-03.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.3-2017-06-03.sql
new file mode 100644
index 00000000..eac66fa6
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.3-2017-06-03.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__menu` MODIFY `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'The time the menu item was checked out.';
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.7.4-2017-07-05.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.7.4-2017-07-05.sql
new file mode 100644
index 00000000..0c4bb1b3
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.7.4-2017-07-05.sql
@@ -0,0 +1 @@
+DELETE FROM `#__postinstall_messages` WHERE `title_key` = 'COM_CPANEL_MSG_PHPVERSION_TITLE';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
new file mode 100644
index 00000000..3ea86df6
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-28.sql
@@ -0,0 +1 @@
+ALTER TABLE `#__fields_groups` ADD COLUMN `params` TEXT  NOT NULL  AFTER `ordering`;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql
new file mode 100644
index 00000000..81a631ed
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.0-2017-07-31.sql
@@ -0,0 +1,5 @@
+INSERT INTO `#__extensions`
+(`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`)
+VALUES
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql
new file mode 100644
index 00000000..d379ef20
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.2-2017-10-14.sql
@@ -0,0 +1,5 @@
+--
+-- Add index for alias check #__content
+--
+
+ALTER TABLE `#__content` ADD INDEX `idx_alias` (`alias`(191));
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.4-2018-01-16.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.4-2018-01-16.sql
new file mode 100644
index 00000000..1d204b7f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.4-2018-01-16.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__user_keys` DROP INDEX `series_2`;
+ALTER TABLE `#__user_keys` DROP INDEX `series_3`;
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.6-2018-02-14.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.6-2018-02-14.sql
new file mode 100644
index 00000000..b88087a1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.6-2018-02-14.sql
@@ -0,0 +1,6 @@
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(480, 0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_TITLE', 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_BODY', 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_ACTION', 'plg_captcha_recaptcha', 1, 'action', 'site://plugins/captcha/recaptcha/postinstall/actions.php', 'recaptcha_postinstall_action', 'site://plugins/captcha/recaptcha/postinstall/actions.php', 'recaptcha_postinstall_condition', '3.8.6', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.8-2018-05-18.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.8-2018-05-18.sql
new file mode 100644
index 00000000..981549dd
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.8-2018-05-18.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(700, 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE', 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/updatedefaultsettings.php', 'admin_postinstall_updatedefaultsettings_condition', '3.8.8', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/mysql/3.8.9-2018-06-19.sql b/core/administrator/components/com_admin/sql/updates/mysql/3.8.9-2018-06-19.sql
new file mode 100644
index 00000000..cd46b462
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/mysql/3.8.9-2018-06-19.sql
@@ -0,0 +1,2 @@
+-- Enable Sample Data Module.
+UPDATE `#__extensions` SET `enabled` = '1' WHERE `name` = 'mod_sampledata';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.0.0.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.0.sql
new file mode 100644
index 00000000..9a6e816e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.0.sql
@@ -0,0 +1 @@
+-- Placeholder file for database changes for version 3.0.0
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.0.1.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.1.sql
new file mode 100644
index 00000000..c9f8fdaa
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.1
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.0.2.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.2.sql
new file mode 100644
index 00000000..df708fc2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.2.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.2
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.0.3.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.3.sql
new file mode 100644
index 00000000..a20a8364
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.0.3.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__associations" ALTER COLUMN id TYPE integer;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
new file mode 100644
index 00000000..1893538b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
@@ -0,0 +1,196 @@
+/* Changes to tables where data type conflicts exist with MySQL (mainly dealing with null values */
+ALTER TABLE "#__modules" ALTER COLUMN "content" SET DEFAULT '';
+ALTER TABLE "#__updates" ALTER COLUMN "data" SET DEFAULT '';
+
+/* Tags database schema */
+
+--
+-- Table: #__content_types
+--
+CREATE TABLE "#__content_types" (
+  "type_id" serial NOT NULL,
+  "type_title" character varying(255) NOT NULL DEFAULT '',
+  "type_alias" character varying(255) NOT NULL DEFAULT '',
+  "table" character varying(255) NOT NULL DEFAULT '',
+  "rules" text NOT NULL,
+  "field_mappings" text NOT NULL,
+  "router" character varying(255) NOT NULL DEFAULT '',
+  PRIMARY KEY ("type_id")
+);
+CREATE INDEX "#__content_types_idx_alias" ON "#__content_types" ("type_alias");
+
+--
+-- Dumping data for table #__content_types
+--
+INSERT INTO "#__content_types" ("type_id", "type_title", "type_alias", "table", "rules", "field_mappings", "router") VALUES
+(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}], "special": [{"fulltext":"fulltext"}]}','ContentHelperRoute::getArticleRoute'),
+(2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}], "special": [{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}]}','ContactHelperRoute::getContactRoute'),
+(3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}], "special": [{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}]}','NewsfeedsHelperRoute::getNewsfeedRoute'),
+(4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}], "special": [{}]}','UsersHelperRoute::getUserRoute'),
+(5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}','ContentHelperRoute::getCategoryRoute'),
+(6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}','ContactHelperRoute::getCategoryRoute'),
+(7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}','NewsfeedsHelperRoute::getCategoryRoute'),
+(8, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}]}','TagsHelperRoute::getTagRoute');
+
+SELECT nextval('#__content_types_type_id_seq');
+SELECT setval('#__content_types_type_id_seq', 10000, false);
+
+--
+-- Table: #__contentitem_tag_map
+--
+CREATE TABLE "#__contentitem_tag_map" (
+  "type_alias" character varying(255) NOT NULL DEFAULT '',
+  "core_content_id" integer NOT NULL,
+  "content_item_id" integer NOT NULL,
+  "tag_id" integer NOT NULL,
+  "tag_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+ CONSTRAINT "uc_ItemnameTagid" UNIQUE ("type_alias", "content_item_id", "tag_id")
+);
+
+CREATE INDEX "#__contentitem_tag_map_idx_tag_type" ON "#__contentitem_tag_map" ("tag_id", "type_alias");
+CREATE INDEX "#__contentitem_tag_map_idx_date_id" ON "#__contentitem_tag_map" ("tag_date", "tag_id");
+CREATE INDEX "#__contentitem_tag_map_idx_tag" ON "#__contentitem_tag_map" ("tag_id");
+CREATE INDEX "#__contentitem_tag_map_idx_core_content_id" ON "#__contentitem_tag_map" ("core_content_id");
+
+COMMENT ON COLUMN "#__contentitem_tag_map"."core_content_id" IS 'PK from the core content table';
+COMMENT ON COLUMN "#__contentitem_tag_map"."content_item_id" IS 'PK from the content type table';
+COMMENT ON COLUMN "#__contentitem_tag_map"."tag_id" IS 'PK from the tag table';
+COMMENT ON COLUMN "#__contentitem_tag_map"."tag_date" IS 'Date of most recent save for this tag-item';
+
+-- --------------------------------------------------------
+
+--
+-- Table: #__tags
+--
+CREATE TABLE "#__tags" (
+  "id" serial NOT NULL,
+  "parent_id" bigint DEFAULT 0 NOT NULL,
+  "lft" bigint DEFAULT 0 NOT NULL,
+  "rgt" bigint DEFAULT 0 NOT NULL,
+  "level" integer DEFAULT 0 NOT NULL,
+  "path" character varying(255) DEFAULT '' NOT NULL,
+  "title" character varying(255) NOT NULL,
+  "alias" character varying(255) DEFAULT '' NOT NULL,
+  "note" character varying(255) DEFAULT '' NOT NULL,
+  "description" text DEFAULT '' NOT NULL,
+  "published" smallint DEFAULT 0 NOT NULL,
+  "checked_out" bigint DEFAULT 0 NOT NULL,
+  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "access" bigint DEFAULT 0 NOT NULL,
+  "params" text NOT NULL,
+  "metadesc" character varying(1024) NOT NULL,
+  "metakey" character varying(1024) NOT NULL,
+  "metadata" character varying(2048) NOT NULL,
+  "created_user_id" integer DEFAULT 0 NOT NULL,
+  "created_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "created_by_alias" character varying(255) DEFAULT '' NOT NULL,
+  "modified_user_id" integer DEFAULT 0 NOT NULL,
+  "modified_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "images" text NOT NULL,
+  "urls" text NOT NULL,
+  "hits" integer DEFAULT 0 NOT NULL,
+  "language" character varying(7) DEFAULT '' NOT NULL,
+  "version" bigint DEFAULT 1 NOT NULL,
+  "publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__tags_cat_idx" ON "#__tags" ("published", "access");
+CREATE INDEX "#__tags_idx_access" ON "#__tags" ("access");
+CREATE INDEX "#__tags_idx_checkout" ON "#__tags" ("checked_out");
+CREATE INDEX "#__tags_idx_path" ON "#__tags" ("path");
+CREATE INDEX "#__tags_idx_left_right" ON "#__tags" ("lft", "rgt");
+CREATE INDEX "#__tags_idx_alias" ON "#__tags" ("alias");
+CREATE INDEX "#__tags_idx_language" ON "#__tags" ("language");
+
+--
+-- Dumping data for table #__tags
+--
+
+INSERT INTO "#__tags" ("id", "parent_id", "lft", "rgt", "level", "path", "title", "alias", "note", "description", "published", "checked_out", "checked_out_time", "access", "params", "metadesc", "metakey", "metadata", "created_user_id", "created_time", "created_by_alias", "modified_user_id", "modified_time", "images", "urls", "hits", "language", "version") VALUES
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{}', '', '', '', 42, '1970-01-01 00:00:00', '', 0, '1970-01-01 00:00:00', '', '',  0, '*', 1);
+
+SELECT nextval('#__tags_id_seq');
+SELECT setval('#__tags_id_seq', 2, false);
+
+--
+-- Table: #__ucm_base
+--
+CREATE TABLE "#__ucm_base" (
+  "ucm_id" serial NOT NULL,
+  "ucm_item_id" bigint NOT NULL,
+  "ucm_type_id" bigint NOT NULL,
+  "ucm_language_id" bigint NOT NULL,
+  PRIMARY KEY ("ucm_id")
+);
+CREATE INDEX "#__ucm_base_ucm_item_id" ON "#__ucm_base" ("ucm_item_id");
+CREATE INDEX "#__ucm_base_ucm_type_id" ON "#__ucm_base" ("ucm_type_id");
+CREATE INDEX "#__ucm_base_ucm_language_id" ON "#__ucm_base" ("ucm_language_id");
+
+--
+-- Table: #__ucm_content
+--
+CREATE TABLE "#__ucm_content" (
+  "core_content_id" serial NOT NULL,
+  "core_type_alias" character varying(255) DEFAULT '' NOT NULL,
+  "core_title" character varying(255) NOT NULL,
+  "core_alias" character varying(255) DEFAULT '' NOT NULL,
+  "core_body" text NOT NULL,
+  "core_state" smallint DEFAULT 0 NOT NULL,
+  "core_checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "core_checked_out_user_id" bigint DEFAULT 0 NOT NULL,
+  "core_access" bigint DEFAULT 0 NOT NULL,
+  "core_params" text NOT NULL,
+  "core_featured" smallint DEFAULT 0 NOT NULL,
+  "core_metadata" text NOT NULL,
+  "core_created_user_id" bigint DEFAULT 0 NOT NULL,
+  "core_created_by_alias" character varying(255) DEFAULT '' NOT NULL,
+  "core_created_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "core_modified_user_id" bigint DEFAULT 0 NOT NULL,
+  "core_modified_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "core_language" character varying(7) DEFAULT '' NOT NULL,
+  "core_publish_up" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "core_publish_down" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "core_content_item_id" bigint DEFAULT 0 NOT NULL,
+  "asset_id" bigint DEFAULT 0 NOT NULL,
+  "core_images" text NOT NULL,
+  "core_urls" text NOT NULL,
+  "core_hits" bigint DEFAULT 0 NOT NULL,
+  "core_version" bigint DEFAULT 1 NOT NULL,
+  "core_ordering" bigint DEFAULT 0 NOT NULL,
+  "core_metakey" text NOT NULL,
+  "core_metadesc" text NOT NULL,
+  "core_catid" bigint DEFAULT 0 NOT NULL,
+  "core_xreference" character varying(50) DEFAULT '' NOT NULL,
+  "core_type_id" bigint DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("core_content_id"),
+  CONSTRAINT "#__ucm_content_idx_type_alias_item_id" UNIQUE ("core_type_alias", "core_content_item_id")
+);
+CREATE INDEX "#__ucm_content_tag_idx" ON "#__ucm_content" ("core_state", "core_access");
+CREATE INDEX "#__ucm_content_idx_access" ON "#__ucm_content" ("core_access");
+CREATE INDEX "#__ucm_content_idx_alias" ON "#__ucm_content" ("core_alias");
+CREATE INDEX "#__ucm_content_idx_language" ON "#__ucm_content" ("core_language");
+CREATE INDEX "#__ucm_content_idx_title" ON "#__ucm_content" ("core_title");
+CREATE INDEX "#__ucm_content_idx_modified_time" ON "#__ucm_content" ("core_modified_time");
+CREATE INDEX "#__ucm_content_idx_created_time" ON "#__ucm_content" ("core_created_time");
+CREATE INDEX "#__ucm_content_idx_content_type" ON "#__ucm_content" ("core_type_alias");
+CREATE INDEX "#__ucm_content_idx_core_modified_user_id" ON "#__ucm_content" ("core_modified_user_id");
+CREATE INDEX "#__ucm_content_idx_core_checked_out_user_id" ON "#__ucm_content" ("core_checked_out_user_id");
+CREATE INDEX "#__ucm_content_idx_core_created_user_id" ON "#__ucm_content" ("core_created_user_id");
+CREATE INDEX "#__ucm_content_idx_core_type_id" ON "#__ucm_content" ("core_type_id");
+
+--
+-- Add extensions table records
+--
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+--
+-- Add menu table records
+--
+INSERT INTO "#__menu" ("menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES
+('main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 45, 46, 0, '', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.1.1.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.1.sql
new file mode 100644
index 00000000..df442faa
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.1
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.1.2.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.2.sql
new file mode 100644
index 00000000..3ce0eac3
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.2.sql
@@ -0,0 +1,16 @@
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Article';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Contact';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Newsfeed';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'User';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Article Category';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Contact Category';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Newsfeeds Category';
+UPDATE "#__content_types" SET "table" = '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE "type_title" = 'Tag';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}, "special": {"fulltext":"fulltext"}}' WHERE "type_title" = 'Article';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special": {"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}' WHERE "type_title" = 'Contact';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special": {"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}' WHERE "type_title" = 'Newsfeed';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special": {}}' WHERE "type_title" = 'User';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE "type_title" = 'Article Category';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE "type_title" = 'Contact Category';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE "type_title" = 'Newsfeeds Category';
+UPDATE "#__content_types" SET "field_mappings" = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}' WHERE "type_title" = 'Tag';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.1.3.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.3.sql
new file mode 100644
index 00000000..ebc1102e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.3.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.3
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.1.4.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.4.sql
new file mode 100644
index 00000000..6014cdba
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.4.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.1.5.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.5.sql
new file mode 100644
index 00000000..2c9caba7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.1.5.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.5
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
new file mode 100644
index 00000000..bc22cf36
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
@@ -0,0 +1,121 @@
+/* Core 3.2 schema updates */
+
+ALTER TABLE "#__content_types" ADD COLUMN "content_history_options" varchar(5120) DEFAULT NULL;
+
+UPDATE "#__content_types" SET "content_history_options" = '{"formFile":"administrator\\/components\\/com_content\\/models\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}' WHERE "type_alias" = 'com_content.article';
+UPDATE "#__content_types" SET "content_history_options" = '{"formFile":"administrator\\/components\\/com_contact\\/models\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version","xreference"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }' WHERE "type_alias" = 'com_contact.contact';
+UPDATE "#__content_types" SET "content_history_options" = '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}' WHERE "type_alias" IN ('com_content.category', 'com_contact.category', 'com_newsfeeds.category');
+UPDATE "#__content_types" SET "content_history_options" = '{"formFile":"administrator\\/components\\/com_newsfeeds\\/models\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE "type_alias" = 'com_newsfeeds.newsfeed';
+UPDATE "#__content_types" SET "content_history_options" = '{"formFile":"administrator\\/components\\/com_tags\\/models\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE "type_alias" = 'com_tags.tag';
+
+INSERT INTO "#__content_types" ("type_title", "type_alias", "table", "rules", "field_mappings", "router", "content_history_options") VALUES
+('Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
+('Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+('Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/models\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'),
+('User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/models\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
+('User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/models\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}');
+
+UPDATE "#__extensions" SET "params" = '{"template_positions_display":"0","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}' WHERE "extension_id" = 20;
+UPDATE "#__extensions" SET "params" = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE "extension_id" = 410;
+
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+INSERT INTO "#__menu" ("menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES
+('main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1);
+
+ALTER TABLE "#__modules" ADD COLUMN "asset_id" bigint DEFAULT 0 NOT NULL;
+
+CREATE TABLE "#__postinstall_messages" (
+  "postinstall_message_id" serial NOT NULL,
+  "extension_id" bigint NOT NULL DEFAULT 700,
+  "title_key" varchar(255) NOT NULL DEFAULT '',
+  "description_key" varchar(255) NOT NULL DEFAULT '',
+  "action_key" varchar(255) NOT NULL DEFAULT '',
+  "language_extension" varchar(255) NOT NULL DEFAULT 'com_postinstall',
+  "language_client_id" smallint NOT NULL DEFAULT 1,
+  "type" varchar(10) NOT NULL DEFAULT 'link',
+  "action_file" varchar(255) DEFAULT '',
+  "action" varchar(255) DEFAULT '',
+  "condition_file" varchar(255) DEFAULT NULL,
+  "condition_method" varchar(255) DEFAULT NULL,
+  "version_introduced" varchar(255) NOT NULL DEFAULT '3.2.0',
+  "enabled" smallint NOT NULL DEFAULT 1,
+  PRIMARY KEY ("postinstall_message_id")
+);
+
+COMMENT ON COLUMN "#__postinstall_messages"."extension_id" IS 'FK to jos_extensions';
+COMMENT ON COLUMN "#__postinstall_messages"."title_key" IS 'Lang key for the title';
+COMMENT ON COLUMN "#__postinstall_messages"."description_key" IS 'Lang key for description';
+COMMENT ON COLUMN "#__postinstall_messages"."language_extension" IS 'Extension holding lang keys';
+COMMENT ON COLUMN "#__postinstall_messages"."type" IS 'Message type - message, link, action';
+COMMENT ON COLUMN "#__postinstall_messages"."action_file" IS 'RAD URI to the PHP file containing action method';
+COMMENT ON COLUMN "#__postinstall_messages"."action" IS 'Action method name or URL';
+COMMENT ON COLUMN "#__postinstall_messages"."condition_file" IS 'RAD URI to file holding display condition method';
+COMMENT ON COLUMN "#__postinstall_messages"."condition_method" IS 'Display condition method, must return boolean';
+COMMENT ON COLUMN "#__postinstall_messages"."version_introduced" IS 'Version when this message was introduced';
+
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1),
+(700, 'COM_CPANEL_MSG_EACCELERATOR_TITLE', 'COM_CPANEL_MSG_EACCELERATOR_BODY', 'COM_CPANEL_MSG_EACCELERATOR_BUTTON', 'com_cpanel', 1, 'action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_condition', '3.2.0', 1);
+
+CREATE TABLE "#__ucm_history" (
+  "version_id" serial NOT NULL,
+  "ucm_item_id" integer NOT NULL,
+  "ucm_type_id" integer NOT NULL,
+  "version_note" varchar(255) NOT NULL DEFAULT '',
+  "save_date" timestamp with time zone NOT NULL DEFAULT '1970-01-01 00:00:00',
+  "editor_user_id" integer  NOT NULL DEFAULT 0,
+  "character_count" integer  NOT NULL DEFAULT 0,
+  "sha1_hash" varchar(50) NOT NULL DEFAULT '',
+  "version_data" text NOT NULL,
+  "keep_forever" smallint NOT NULL DEFAULT 0,
+  PRIMARY KEY ("version_id")
+);
+CREATE INDEX "#__ucm_history_idx_ucm_item_id" ON "#__ucm_history" ("ucm_type_id", "ucm_item_id");
+CREATE INDEX "#__ucm_history_idx_save_date" ON "#__ucm_history" ("save_date");
+
+COMMENT ON COLUMN "#__ucm_history"."version_note" IS 'Optional version name';
+COMMENT ON COLUMN "#__ucm_history"."character_count" IS 'Number of characters in this version.';
+COMMENT ON COLUMN "#__ucm_history"."sha1_hash" IS 'SHA1 hash of the version_data column.';
+COMMENT ON COLUMN "#__ucm_history"."version_data" IS 'json-encoded string of version data';
+COMMENT ON COLUMN "#__ucm_history"."keep_forever" IS '0=auto delete; 1=keep';
+
+ALTER TABLE "#__users" ADD COLUMN "otpKey" varchar(1000) DEFAULT '' NOT NULL;
+ALTER TABLE "#__users" ADD COLUMN "otep" varchar(1000) DEFAULT '' NOT NULL;
+
+CREATE TABLE "#__user_keys" (
+  "id" serial NOT NULL,
+  "user_id" varchar(255) NOT NULL,
+  "token" varchar(255) NOT NULL,
+  "series" varchar(255) NOT NULL,
+  "invalid" smallint NOT NULL,
+  "time" varchar(200) NOT NULL,
+  "uastring" varchar(255) NOT NULL,
+  PRIMARY KEY ("id"),
+	CONSTRAINT "#__user_keys_series" UNIQUE ("series"),
+	CONSTRAINT "#__user_keys_series_2" UNIQUE ("series"),
+	CONSTRAINT "#__user_keys_series_3" UNIQUE ("series")
+);
+CREATE INDEX "#__user_keys_idx_user_id" ON "#__user_keys" ("user_id");
+
+/* Queries below sync the schema to MySQL where able without causing errors */
+
+ALTER TABLE "#__contentitem_tag_map" ADD COLUMN "type_id" integer NOT NULL;
+
+CREATE INDEX "#__contentitem_tag_map_idx_tag_type" ON "#__contentitem_tag_map" ("tag_id", "type_id");
+CREATE INDEX "#__contentitem_tag_map_idx_type" ON "#__contentitem_tag_map" ("type_id");
+
+COMMENT ON COLUMN "#__contentitem_tag_map"."type_id" IS 'PK from the content_type table';
+
+ALTER TABLE "#__session" DROP COLUMN "usertype";
+
+ALTER TABLE "#__updates" DROP COLUMN "categoryid";
+
+ALTER TABLE "#__users" DROP COLUMN "usertype";
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql
new file mode 100644
index 00000000..d74876da
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.1.sql
@@ -0,0 +1 @@
+DELETE FROM "#__postinstall_messages" WHERE "title_key" = 'PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TITLE';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql
new file mode 100644
index 00000000..38df3ba7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "#__update_sites" ADD COLUMN "extra_query" varchar(1000) DEFAULT '';
+ALTER TABLE "#__updates" ADD COLUMN "extra_query" varchar(1000) DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql
new file mode 100644
index 00000000..0ea89b8e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql
@@ -0,0 +1 @@
+UPDATE "#__menu" SET "component_id" = (SELECT "extension_id" FROM "#__extensions" WHERE "element" = 'com_joomlaupdate') WHERE "link" = 'index.php?option=com_joomlaupdate';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql
new file mode 100644
index 00000000..bcd3f697
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 1, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql
new file mode 100644
index 00000000..023e4602
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql
new file mode 100644
index 00000000..6b34d648
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql
@@ -0,0 +1,2 @@
+/* Update updates version length */
+ALTER TABLE "#__updates" ALTER COLUMN "version" TYPE character varying(32);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql
new file mode 100644
index 00000000..6b506f25
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '{"legacy":false,"name":"PHPass","type":"library","creationDate":"2004-2006","author":"Solar Designer","authorEmail":"solar@openwall.com","authorUrl":"http:\/\/www.openwall.com/phpass","version":"0.3","description":"LIB_PHPASS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.2.3-2014-02-20.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.3-2014-02-20.sql
new file mode 100644
index 00000000..9f69a3f9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.2.3-2014-02-20.sql
@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "params" = (SELECT "params" FROM "#__extensions" WHERE "name" = 'plg_system_remember') WHERE "name" = 'plg_authentication_cookie';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2013-12-21.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2013-12-21.sql
new file mode 100644
index 00000000..7c9f774d
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2013-12-21.sql
@@ -0,0 +1 @@
+# Placeholder file to set the database schema for 3.3.0
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-02-16.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-02-16.sql
new file mode 100644
index 00000000..01dca6be
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-02-16.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "#__users" ADD COLUMN "requireReset" smallint DEFAULT 0;
+COMMENT ON COLUMN "#__users"."requireReset" IS 'Require user to reset password on next login';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-04-02.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-04-02.sql
new file mode 100644
index 00000000..328dd673
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.0-2014-04-02.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 0, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.3.4-2014-08-03.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.4-2014-08-03.sql
new file mode 100644
index 00000000..f803f5fe
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.4-2014-08-03.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__user_profiles" ALTER COLUMN "profile_value" TYPE text;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql
new file mode 100644
index 00000000..d54a1338
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.3.6-2014-09-30.sql
@@ -0,0 +1,5 @@
+INSERT INTO "#__update_sites" ("name", "type", "location", "enabled") VALUES
+('Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1);
+
+INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES
+((SELECT "update_site_id" FROM "#__update_sites" WHERE "name" = 'Joomla! Update Component Update Site'), (SELECT "extension_id" FROM "#__extensions" WHERE "name" = 'com_joomlaupdate'));
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-08-24.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-08-24.sql
new file mode 100644
index 00000000..77e6bd8a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-08-24.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_CPANEL_MSG_HTACCESS_TITLE', 'COM_CPANEL_MSG_HTACCESS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccess.php', 'admin_postinstall_htaccess_condition', '3.4.0', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-01.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-01.sql
new file mode 100644
index 00000000..e55d2206
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-01.sql
@@ -0,0 +1,8 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(801, 'weblinks', 'package', 'pkg_weblinks', '', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+INSERT INTO "#__update_sites" ("name", "type", "location", "enabled") VALUES
+('Weblinks Update Site', 'extension', 'https://raw.githubusercontent.com/joomla-extensions/weblinks/master/manifest.xml', 1);
+
+INSERT INTO "#__update_sites_extensions" ("update_site_id", "extension_id") VALUES
+((SELECT "update_site_id" FROM "#__update_sites" WHERE "name" = 'Weblinks Update Site'), 801);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql
new file mode 100644
index 00000000..0419468e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql
@@ -0,0 +1,6 @@
+ALTER TABLE "#__redirect_links" ADD COLUMN "header" INTEGER DEFAULT 301 NOT NULL;
+--
+-- The following statement has to be disabled because it conflicts with
+-- a later change added with Joomla! 3.5.0 for long URLs in this table
+--
+-- ALTER TABLE "#__redirect_links" ALTER COLUMN "new_url" DROP NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-10-20.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-10-20.sql
new file mode 100644
index 00000000..3f63a4b1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-10-20.sql
@@ -0,0 +1 @@
+DELETE FROM "#__extensions" WHERE "extension_id" = 100;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql
new file mode 100644
index 00000000..dca06cc1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-12-03.sql
@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "protected" = '0' WHERE "name" = 'plg_editors-xtd_article' AND "type" = 'plugin' AND "element" = 'article' AND "folder" = 'editors-xtd';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql
new file mode 100644
index 00000000..1e855e0c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-01-21.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-02-26.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-02-26.sql
new file mode 100644
index 00000000..5ec99c96
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2015-02-26.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE', 'COM_CPANEL_MSG_LANGUAGEACCESS340_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/languageaccess340.php', 'admin_postinstall_languageaccess340_condition', '3.4.1', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.4.4-2015-07-11.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.4-2015-07-11.sql
new file mode 100644
index 00000000..fd15f849
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.4.4-2015-07-11.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__contentitem_tag_map" DROP CONSTRAINT "#__uc_ItemnameTagid", ADD CONSTRAINT "#__uc_ItemnameTagid" UNIQUE ("type_id", "content_item_id", "tag_id");
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-13.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-13.sql
new file mode 100644
index 00000000..7300198d
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-13.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql
new file mode 100644
index 00000000..05080ce1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql
@@ -0,0 +1,2 @@
+DROP INDEX "#__contentitem_tag_map_idx_tag";
+DROP INDEX "#__contentitem_tag_map_idx_type";
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql
new file mode 100644
index 00000000..ae4b418e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql
@@ -0,0 +1 @@
+UPDATE "#__menu" SET "title" = 'com_contact_contacts' WHERE "client_id" = 1 AND "level" = 2 AND "title" = 'com_contact';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql
new file mode 100644
index 00000000..492e6a06
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql
@@ -0,0 +1,4 @@
+DELETE FROM "#__menu" WHERE "title" = 'com_messages_read' AND "client_id" = 1;
+
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql
new file mode 100644
index 00000000..e099d77e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql
@@ -0,0 +1,5 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql
new file mode 100644
index 00000000..804efa3e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql
@@ -0,0 +1,5 @@
+ALTER TABLE "#__redirect_links" DROP CONSTRAINT "#__redirect_links_idx_link_old";
+ALTER TABLE "#__redirect_links" ALTER COLUMN "old_url" TYPE character varying(2048);
+ALTER TABLE "#__redirect_links" ALTER COLUMN "new_url" TYPE character varying(2048);
+ALTER TABLE "#__redirect_links" ALTER COLUMN "referer" TYPE character varying(2048);
+CREATE INDEX "#__idx_link_old" ON "#__redirect_links" ("old_url");
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-01.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-01.sql
new file mode 100644
index 00000000..50d35bbd
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-01.sql
@@ -0,0 +1,8 @@
+-- Rename update site names
+UPDATE "#__update_sites" SET "name" = 'Joomla! Core' WHERE "name" = 'Joomla Core' AND "type" = 'collection';
+UPDATE "#__update_sites" SET "name" = 'Joomla! Extension Directory' WHERE "name" = 'Joomla Extension Directory' AND "type" = 'collection';
+
+UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/core/list.xml' WHERE "name" = 'Joomla! Core' AND "type" = 'collection';
+UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/jed/list.xml' WHERE "name" = 'Joomla! Extension Directory' AND "type" = 'collection';
+UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/language/translationlist_3.xml' WHERE "name" = 'Accredited Joomla! Translations' AND "type" = 'collection';
+UPDATE "#__update_sites" SET "location" = 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml' WHERE "name" = 'Joomla! Update Component Update Site' AND "type" = 'extension';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-08.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-08.sql
new file mode 100644
index 00000000..a9b1bfea
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-08.sql
@@ -0,0 +1,12 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+UPDATE "#__update_sites_extensions"
+SET "extension_id" = 802
+WHERE "update_site_id" IN (
+			SELECT "update_site_id"
+			FROM "#__update_sites"
+			WHERE "name" = 'Accredited Joomla! Translations'
+			AND "type" = 'collection'
+			)
+AND "extension_id" = 600;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-09.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-09.sql
new file mode 100644
index 00000000..31b785b0
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-09.sql
@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__menu_types
+--
+
+ALTER TABLE "#__menu_types" ADD COLUMN "asset_id" bigint DEFAULT 0 NOT NULL;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-05-06.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-05-06.sql
new file mode 100644
index 00000000..9d58322a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-05-06.sql
@@ -0,0 +1,6 @@
+DELETE FROM "#__extensions" WHERE "type" = 'library' AND "element" = 'simplepie';
+
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 1, 0),
+(456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 2, 0),
+(457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 3, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql
new file mode 100644
index 00000000..a8c3f145
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-01.sql
@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "protected" = 1, "enabled" = 1 WHERE "name" = 'com_ajax';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql
new file mode 100644
index 00000000..3d4aac89
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-06-05.sql
@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE "#__languages" ADD COLUMN "asset_id" bigint DEFAULT 0 NOT NULL;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql
new file mode 100644
index 00000000..6ece41ae
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql
@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE "#__newsfeeds" ALTER COLUMN "link" TYPE character varying(2048);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql
new file mode 100644
index 00000000..2fd8013e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-16.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-10-04.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-10-04.sql
new file mode 100644
index 00000000..5a4262f9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-10-04.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "#__finder_links" ALTER COLUMN "title" TYPE character varying(400);
+ALTER TABLE "#__finder_links" ALTER COLUMN "description" TYPE text;
+ALTER TABLE "#__finder_links" ALTER COLUMN "description" SET NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-06.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-06.sql
new file mode 100644
index 00000000..9d4e4158
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-06.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(458, 'plg_quickicon_phpversioncheck', 'plugin', 'phpversioncheck', 'quickicon', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-22.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-22.sql
new file mode 100644
index 00000000..2f3349e7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-22.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(459, 'plg_editors-xtd_menu', 'plugin', 'menu', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql
new file mode 100644
index 00000000..1676d972
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-08-29.sql
@@ -0,0 +1,105 @@
+--
+-- Table: #__fields
+--
+CREATE TABLE "#__fields" (
+  "id" serial NOT NULL,
+  "asset_id" bigint DEFAULT 0 NOT NULL,
+  "context" varchar(255) DEFAULT '' NOT NULL,
+  "group_id" bigint DEFAULT 0 NOT NULL,
+  "title" varchar(255) DEFAULT '' NOT NULL,
+  "name" varchar(255) DEFAULT '' NOT NULL,
+  "label" varchar(255) DEFAULT '' NOT NULL,
+  "default_value" text DEFAULT '' NOT NULL,
+  "type" varchar(255) DEFAULT 'text' NOT NULL,
+  "note" varchar(255) DEFAULT '' NOT NULL,
+  "description" text DEFAULT '' NOT NULL,
+  "state" smallint DEFAULT 0 NOT NULL,
+  "required" smallint DEFAULT 0 NOT NULL,
+  "checked_out" integer DEFAULT 0 NOT NULL,
+  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "ordering" bigint DEFAULT 0 NOT NULL,
+  "params" text DEFAULT '' NOT NULL,
+  "fieldparams" text DEFAULT '' NOT NULL,
+  "language" varchar(7) DEFAULT '' NOT NULL,
+  "created_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "created_user_id" bigint DEFAULT 0 NOT NULL,
+  "modified_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "modified_by" bigint DEFAULT 0 NOT NULL,
+  "access" bigint DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__fields_idx_checked_out" ON "#__fields" ("checked_out");
+CREATE INDEX "#__fields_idx_state" ON "#__fields" ("state");
+CREATE INDEX "#__fields_idx_created_user_id" ON "#__fields" ("created_user_id");
+CREATE INDEX "#__fields_idx_access" ON "#__fields" ("access");
+CREATE INDEX "#__fields_idx_context" ON "#__fields" ("context");
+CREATE INDEX "#__fields_idx_language" ON "#__fields" ("language");
+
+--
+-- Table: #__fields_categories
+--
+CREATE TABLE "#__fields_categories" (
+  "field_id" bigint DEFAULT 0 NOT NULL,
+  "category_id" bigint DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("field_id", "category_id")
+);
+
+--
+-- Table: #__fields_groups
+--
+CREATE TABLE "#__fields_groups" (
+  "id" serial NOT NULL,
+  "asset_id" bigint DEFAULT 0 NOT NULL,
+  "context" varchar(255) DEFAULT '' NOT NULL,
+  "title" varchar(255) DEFAULT '' NOT NULL,
+  "note" varchar(255) DEFAULT '' NOT NULL,
+  "description" text DEFAULT '' NOT NULL,
+  "state" smallint DEFAULT 0 NOT NULL,
+  "checked_out" integer DEFAULT 0 NOT NULL,
+  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "ordering" bigint DEFAULT 0 NOT NULL,
+  "language" varchar(7) DEFAULT '' NOT NULL,
+  "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "created_by" bigint DEFAULT 0 NOT NULL,
+  "modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "modified_by" bigint DEFAULT 0 NOT NULL,
+  "access" bigint DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__fields_groups_idx_checked_out" ON "#__fields_groups" ("checked_out");
+CREATE INDEX "#__fields_groups_idx_state" ON "#__fields_groups" ("state");
+CREATE INDEX "#__fields_groups_idx_created_by" ON "#__fields_groups" ("created_by");
+CREATE INDEX "#__fields_groups_idx_access" ON "#__fields_groups" ("access");
+CREATE INDEX "#__fields_groups_idx_context" ON "#__fields_groups" ("context");
+CREATE INDEX "#__fields_groups_idx_language" ON "#__fields_groups" ("language");
+
+--
+-- Table: #__fields_values
+--
+CREATE TABLE "#__fields_values" (
+"field_id" bigint DEFAULT 0 NOT NULL,
+"item_id" varchar(255) DEFAULT '' NOT NULL,
+"value" text DEFAULT '' NOT NULL
+);
+CREATE INDEX "#__fields_values_idx_field_id" ON "#__fields_values" ("field_id");
+CREATE INDEX "#__fields_values_idx_item_id" ON "#__fields_values" ("item_id");
+
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(462, 'plg_fields_calendar', 'plugin', 'calendar', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(463, 'plg_fields_checkboxes', 'plugin', 'checkboxes', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(464, 'plg_fields_color', 'plugin', 'color', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(465, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(466, 'plg_fields_imagelist', 'plugin', 'imagelist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(467, 'plg_fields_integer', 'plugin', 'integer', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(468, 'plg_fields_list', 'plugin', 'list', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(469, 'plg_fields_media', 'plugin', 'media', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(470, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(471, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(472, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(473, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(474, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(475, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(476, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-09-29.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-09-29.sql
new file mode 100644
index 00000000..4bfd02b6
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-09-29.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE', 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/joomla40checks.php', 'admin_postinstall_joomla40checks_condition', '3.7.0', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-01.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-01.sql
new file mode 100644
index 00000000..3e560467
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-01.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(460, 'plg_editors-xtd_contact', 'plugin', 'contact', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-02.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-02.sql
new file mode 100644
index 00000000..b50a60ae
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-10-02.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__session" ALTER COLUMN "client_id" DROP NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-04.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-04.sql
new file mode 100644
index 00000000..f423add8
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-04.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__extensions" ALTER COLUMN "enabled" SET DEFAULT 0;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql
new file mode 100644
index 00000000..1711f576
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "#__menu_types" ADD COLUMN "client_id" int DEFAULT 0 NOT NULL;
+
+UPDATE "#__menu" SET "published" = 1 WHERE "menutype" = 'main' OR "menutype" = 'menu';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
new file mode 100644
index 00000000..e68abd21
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-21.sql
@@ -0,0 +1,2 @@
+-- Replace language image UNIQUE index for a normal INDEX.
+ALTER TABLE "#__languages" DROP CONSTRAINT "#__languages_idx_image";
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-24.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-24.sql
new file mode 100644
index 00000000..1670758b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-24.sql
@@ -0,0 +1,6 @@
+ALTER TABLE "#__extensions" ADD COLUMN "package_id" bigint DEFAULT 0 NOT NULL;
+
+UPDATE "#__extensions"
+SET "package_id" = sub.extension_id
+FROM (SELECT "extension_id" FROM "#__extensions" WHERE "type" = 'package' AND "element" = 'pkg_en-GB') AS sub
+WHERE "type"= 'language' AND "element" = 'en-GB';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-08.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-08.sql
new file mode 100644
index 00000000..35cbc78a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-08.sql
@@ -0,0 +1,9 @@
+-- Normalize ucm_content_table default values.
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_title" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_body" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_params" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_metadata" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_images" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_urls" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_metakey" SET DEFAULT '';
+ALTER TABLE "#__ucm_content" ALTER COLUMN "core_metadesc" SET DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-09.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-09.sql
new file mode 100644
index 00000000..8d4895fb
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-09.sql
@@ -0,0 +1,6 @@
+-- Normalize categories table default values.
+ALTER TABLE "#__categories" ALTER COLUMN "title" SET DEFAULT '';
+ALTER TABLE "#__categories" ALTER COLUMN "params" SET DEFAULT '';
+ALTER TABLE "#__categories" ALTER COLUMN "metadesc" SET DEFAULT '';
+ALTER TABLE "#__categories" ALTER COLUMN "metakey" SET DEFAULT '';
+ALTER TABLE "#__categories" ALTER COLUMN "metadata" SET DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql
new file mode 100644
index 00000000..f244b43b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-17.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-17.sql
new file mode 100644
index 00000000..3009938a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-17.sql
@@ -0,0 +1,58 @@
+-- Sync menutype for admin menu and set client_id correct
+
+-- Note: This file had to be modified with Joomla 3.7.3 because the
+-- original version made site menus disappear if there were menu types
+-- "main" or "menu" defined for the site.
+
+-- Step 1: If there is any user-defined menu and menu type "main" for the site
+-- (client_id = 0), then change the menu type for the menu, any module and the
+-- menu type to something very likely not being used yet and just within the
+-- max. length of 24 characters.
+UPDATE "#__menu"
+   SET "menutype" = 'main_is_reserved_133C585'
+ WHERE "client_id" = 0
+   AND "menutype" = 'main'
+   AND (SELECT COUNT("id") FROM "#__menu_types" WHERE "client_id" = 0 AND "menutype" = 'main') > 0;
+
+UPDATE "#__modules"
+   SET "params" = REPLACE("params",'"menutype":"main"','"menutype":"main_is_reserved_133C585"')
+ WHERE "client_id" = 0
+   AND (SELECT COUNT("id") FROM "#__menu_types" WHERE "client_id" = 0 AND "menutype" = 'main') > 0;
+
+UPDATE "#__menu_types"
+   SET "menutype" = 'main_is_reserved_133C585'
+ WHERE "client_id" = 0 
+   AND "menutype" = 'main';
+
+-- Step 2: What remains now are the main menu items, possibly with wrong
+-- client_id if there was nothing hit by step 1 because there was no record in
+-- the menu types table with client_id = 0.
+UPDATE "#__menu"
+   SET "client_id" = 1
+ WHERE "menutype" = 'main';
+
+-- Step 3: If we have menu items for the admin using menutype = "menu" and
+-- having correct client_id = 1, we can be sure they belong to the admin menu
+-- and so rename the menutype.
+UPDATE "#__menu"
+   SET "menutype" = 'main'
+ WHERE "client_id" = 1 
+   AND "menutype" = 'menu';
+
+-- Step 4: If there is no user-defined menu type "menu" for the site, we can
+-- assume that any menu items for that menu type belong to the admin.
+-- Fix the client_id for those as it was done with the original version of this
+-- schema update script here.
+UPDATE "#__menu"
+   SET "menutype" = 'main',
+       "client_id" = 1
+ WHERE "menutype" = 'menu'
+   AND (SELECT COUNT("id") FROM "#__menu_types" WHERE "client_id" = 0 AND "menutype" = 'menu') > 0;
+
+-- Step 5: For the standard admin menu items of menutype "main" there is no record
+-- in the menutype table on a clean Joomla installation. If there is one, it is a
+-- mistake and it should be deleted. This is also the case with menu type "menu"
+-- for the admin, for which we changed the menutype of the menu items in step 3.
+DELETE FROM "#__menu_types"
+ WHERE "client_id" = 1
+   AND "menutype" IN ('main', 'menu');
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-31.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-31.sql
new file mode 100644
index 00000000..692f8e79
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-31.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(477, 'plg_content_fields', 'plugin', 'fields', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-02.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-02.sql
new file mode 100644
index 00000000..4e23ad5a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-02.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(478, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-15.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-15.sql
new file mode 100644
index 00000000..e24971bf
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-15.sql
@@ -0,0 +1,2 @@
+-- Normalize redirect_links table default values.
+ALTER TABLE "#__redirect_links" ALTER COLUMN "comment" SET DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql
new file mode 100644
index 00000000..d3542a81
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-02-17.sql
@@ -0,0 +1,8 @@
+-- Normalize contact_details table default values.
+ALTER TABLE "#__contact_details" ALTER COLUMN "name" DROP DEFAULT;
+ALTER TABLE "#__contact_details" ALTER COLUMN "alias" DROP DEFAULT;
+ALTER TABLE "#__contact_details" ALTER COLUMN "sortname1" SET DEFAULT '';
+ALTER TABLE "#__contact_details" ALTER COLUMN "sortname2" SET DEFAULT '';
+ALTER TABLE "#__contact_details" ALTER COLUMN "sortname3" SET DEFAULT '';
+ALTER TABLE "#__contact_details" ALTER COLUMN "language" DROP DEFAULT;
+ALTER TABLE "#__contact_details" ALTER COLUMN "xreference" SET DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-03.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-03.sql
new file mode 100644
index 00000000..806caf88
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-03.sql
@@ -0,0 +1,5 @@
+ALTER TABLE "#__extensions" ALTER COLUMN "custom_data" DROP DEFAULT;
+ALTER TABLE "#__extensions" ALTER COLUMN "system_data" DROP DEFAULT;
+ALTER TABLE "#__updates" ALTER COLUMN "data" DROP DEFAULT;
+
+ALTER TABLE "#__newsfeeds" ALTER COLUMN "xreference" SET DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-09.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-09.sql
new file mode 100644
index 00000000..08aa07b9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-03-09.sql
@@ -0,0 +1,19 @@
+UPDATE "#__categories" SET published = 1 WHERE alias = 'root';
+UPDATE "#__categories" AS "c"
+SET published = c2.newPublished
+FROM (
+SELECT c2.id, CASE WHEN MIN(p.published) > 0 THEN MAX(p.published) ELSE MIN(p.published) END AS newPublished
+FROM "#__categories" AS "c2"
+INNER JOIN "#__categories" AS "p" ON p.lft <= c2.lft AND c2.rgt <= p.rgt
+GROUP BY c2.id) AS c2
+WHERE c2.id = c.id;
+
+UPDATE "#__menu" SET published = 1 WHERE alias = 'root';
+UPDATE "#__menu" AS "c"
+SET published = c2.newPublished
+FROM (
+SELECT c2.id, CASE WHEN MIN(p.published) > 0 THEN MAX(p.published) ELSE MIN(p.published) END AS newPublished
+FROM "#__menu" AS "c2"
+INNER JOIN "#__menu" AS "p" ON p.lft <= c2.lft AND c2.rgt <= p.rgt
+GROUP BY c2.id) AS c2
+WHERE c2.id = c.id;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-10.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-10.sql
new file mode 100644
index 00000000..c8a2f4d9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-10.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'TPL_HATHOR_MESSAGE_POSTINSTALL_TITLE', 'TPL_HATHOR_MESSAGE_POSTINSTALL_BODY', 'TPL_HATHOR_MESSAGE_POSTINSTALL_ACTION', 'tpl_hathor', 1, 'action', 'admin://templates/hathor/postinstall/hathormessage.php', 'hathormessage_postinstall_action', 'admin://templates/hathor/postinstall/hathormessage.php', 'hathormessage_postinstall_condition', '3.7.0', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-19.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-19.sql
new file mode 100644
index 00000000..a71c3e11
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-04-19.sql
@@ -0,0 +1,2 @@
+-- Set integer field default values.
+UPDATE "#__extensions" SET "params" = '{"multiple":"0","first":"1","last":"100","step":"1"}' WHERE "name" = 'plg_fields_integer';
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.7.4-2017-07-05.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.4-2017-07-05.sql
new file mode 100644
index 00000000..e9f5f2b0
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.7.4-2017-07-05.sql
@@ -0,0 +1 @@
+DELETE FROM "#__postinstall_messages" WHERE "title_key" = 'COM_CPANEL_MSG_PHPVERSION_TITLE';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
new file mode 100644
index 00000000..6b88b64d
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-28.sql
@@ -0,0 +1 @@
+ALTER TABLE "#__fields_groups" ADD COLUMN "params" TEXT NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql
new file mode 100644
index 00000000..e03ec77a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.0-2017-07-31.sql
@@ -0,0 +1,5 @@
+INSERT INTO "#__extensions"
+("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state")
+VALUES
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql
new file mode 100644
index 00000000..f7183db8
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.2-2017-10-14.sql
@@ -0,0 +1,5 @@
+--
+-- Add index for alias check #__content
+--
+
+CREATE INDEX "#__content_idx_alias" ON "#__content" ("alias");
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.4-2018-01-16.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.4-2018-01-16.sql
new file mode 100644
index 00000000..4546bab5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.4-2018-01-16.sql
@@ -0,0 +1,2 @@
+DROP INDEX "#__user_keys_series_2";
+DROP INDEX "#__user_keys_series_3";
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.6-2018-02-14.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.6-2018-02-14.sql
new file mode 100644
index 00000000..bd70f521
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.6-2018-02-14.sql
@@ -0,0 +1,6 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(480, 0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_TITLE', 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_BODY', 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_ACTION', 'plg_captcha_recaptcha', 1, 'action', 'site://plugins/captcha/recaptcha/postinstall/actions.php', 'recaptcha_postinstall_action', 'site://plugins/captcha/recaptcha/postinstall/actions.php', 'recaptcha_postinstall_condition', '3.8.6', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.8-2018-05-18.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.8-2018-05-18.sql
new file mode 100644
index 00000000..975876d2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.8-2018-05-18.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE', 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/updatedefaultsettings.php', 'admin_postinstall_updatedefaultsettings_condition', '3.8.8', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/postgresql/3.8.9-2018-06-19.sql b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.9-2018-06-19.sql
new file mode 100644
index 00000000..666def7a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/postgresql/3.8.9-2018-06-19.sql
@@ -0,0 +1,2 @@
+-- Enable Sample Data Module.
+UPDATE "#__extensions" SET "enabled" = '1' WHERE "name" = 'mod_sampledata';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.2-2012-03-05.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.2-2012-03-05.sql
new file mode 100644
index 00000000..1c06a396
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.2-2012-03-05.sql
@@ -0,0 +1 @@
+# Dummy SQL file to set schema version
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.3-2012-03-13.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.3-2012-03-13.sql
new file mode 100644
index 00000000..1c06a396
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.3-2012-03-13.sql
@@ -0,0 +1 @@
+# Dummy SQL file to set schema version
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql
new file mode 100644
index 00000000..310ec720
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql
@@ -0,0 +1,9 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
+
+INSERT INTO [#__menu] ([menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [ordering], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id])
+SELECT 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 0, 1, 1, 28, 0, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-19.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-19.sql
new file mode 100644
index 00000000..c7035489
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-19.sql
@@ -0,0 +1,7 @@
+ALTER TABLE [#__languages] ADD  [access] INTEGER CONSTRAINT DF_languages_access DEFAULT '' NOT NULL
+
+CREATE UNIQUE INDEX idx_access ON [#__languages] (access);
+
+UPDATE [#__categories] SET [extension] = 'com_users.notes' WHERE [extension] = 'com_users';
+
+UPDATE [#__extensions] SET [enabled] = '1' WHERE [protected] = '1' AND [type] <> 'plugin';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.5.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.5.sql
new file mode 100644
index 00000000..d85ed927
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.5.sql
@@ -0,0 +1,3 @@
+ALTER TABLE [#__redirect_links] ADD [hits] INTEGER CONSTRAINT DF_redirect_links_hits DEFAULT '' NOT NULL;
+ALTER TABLE [#__users] ADD [lastResetTime] [datetime] NOT NULL;
+ALTER TABLE [#__users] ADD [resetCount] [int] NOT NULL;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.6.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.6.sql
new file mode 100644
index 00000000..ff1afae2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.6.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 2.5.6
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql
new file mode 100644
index 00000000..b249c8a8
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/2.5.7.sql
@@ -0,0 +1,8 @@
+INSERT INTO [#__update_sites] ([name], [type], [location], [enabled], [last_check_timestamp])
+SELECT 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist.xml', 1, 0;
+
+INSERT INTO [#__update_sites_extensions] ([update_site_id], [extension_id])
+SELECT SCOPE_IDENTITY(), 600;
+
+UPDATE [#__assets] SET [name] = REPLACE([name], 'com_user.notes.category', 'com_users.category');
+UPDATE [#__categories] SET [extension] = REPLACE([extension], 'com_user.notes.category', 'com_users.category');
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.0.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.0.sql
new file mode 100644
index 00000000..b2aa72ce
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.0.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.0
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.1.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.1.sql
new file mode 100644
index 00000000..d1c14205
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.1
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.2.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.2.sql
new file mode 100644
index 00000000..df708fc2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.2.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.0.2
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.3.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.3.sql
new file mode 100644
index 00000000..4f6e1b35
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.0.3.sql
@@ -0,0 +1,6 @@
+ALTER TABLE [#__associations] DROP CONSTRAINT [PK_#__associations_context];
+ALTER TABLE [#__associations] ALTER COLUMN [id] INT NOT NULL;
+ALTER TABLE [#__associations] ADD CONSTRAINT [PK_#__associations_context] PRIMARY KEY CLUSTERED(
+	[context] ASC,
+	[id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql
new file mode 100644
index 00000000..4ca149ce
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql
@@ -0,0 +1,326 @@
+/* Changes to Smart Search tables for driver compatibility */
+ALTER TABLE [#__finder_tokens_aggregate] ALTER COLUMN [term_id] [bigint] NULL;
+ALTER TABLE [#__finder_tokens_aggregate] ALTER COLUMN [map_suffix] [nchar](1) NULL;
+ALTER TABLE [#__finder_tokens_aggregate] ADD DEFAULT ((0)) FOR [term_id];
+ALTER TABLE [#__finder_tokens_aggregate] ADD DEFAULT ((0)) FOR [total_weight];
+
+/* Changes to tables where data type conflicts exist with MySQL (mainly dealing with null values */
+ALTER TABLE [#__extensions] ADD DEFAULT (N'') FOR [system_data];
+ALTER TABLE [#__modules] ADD DEFAULT (N'') FOR [content];
+ALTER TABLE [#__updates] ADD DEFAULT (N'') FOR [data];
+
+/* Tags database schema */
+
+/****** Object:  Table [#__content_types] ******/
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__content_types] (
+	[type_id] [bigint] IDENTITY(1,1) NOT NULL,
+	[type_title] [nvarchar](255) NOT NULL DEFAULT '',
+	[type_alias] [nvarchar](255) NOT NULL DEFAULT '',
+	[table] [nvarchar](255) NOT NULL DEFAULT '',
+	[rules] [nvarchar](max) NOT NULL,
+	[field_mappings] [nvarchar](max) NOT NULL,
+	[router] [nvarchar](255) NOT NULL DEFAULT '',
+ CONSTRAINT [PK_#__content_types_type_id] PRIMARY KEY CLUSTERED
+(
+	[type_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_alias] ON [#__content_types]
+(
+	[type_alias] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+SET IDENTITY_INSERT [#__content_types] ON;
+
+INSERT INTO [#__content_types] ([type_id], [type_title], [type_alias], [table], [rules], [field_mappings], [router])
+SELECT 1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}], "special": [{"fulltext":"fulltext"}]}', 'ContentHelperRoute::getArticleRoute'
+UNION ALL
+SELECT 2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}], "special": [{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}]}', 'ContactHelperRoute::getContactRoute'
+UNION ALL
+SELECT 3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}], "special": [{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}]}', 'NewsfeedsHelperRoute::getNewsfeedRoute'
+UNION ALL
+SELECT 4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}], "special": [{}]}', 'UsersHelperRoute::getUserRoute'
+UNION ALL
+SELECT 5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}', 'ContentHelperRoute::getCategoryRoute'
+UNION ALL
+SELECT 6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}', 'ContactHelperRoute::getCategoryRoute'
+UNION ALL
+SELECT 7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}]}', 'NewsfeedsHelperRoute::getCategoryRoute'
+UNION ALL
+SELECT 8, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__core_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":[{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}], "special": [{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}]}', 'TagsHelperRoute::getTagRoute';
+
+SET IDENTITY_INSERT [#__content_types] OFF;
+
+/****** Object:  Table [#__contentitem_tag_map] ******/
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__contentitem_tag_map] (
+	[type_alias] [nvarchar](255) NOT NULL DEFAULT '',
+	[core_content_id] [bigint] NOT NULL,
+	[content_item_id] [int] NOT NULL,
+	[tag_id] [bigint] NOT NULL,
+	[tag_date] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+ CONSTRAINT [#__contentitem_tag_map$uc_ItemnameTagid] UNIQUE NONCLUSTERED
+(
+	[type_alias] ASC,
+	[content_item_id] ASC,
+	[tag_id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_tag_name] ON [#__contentitem_tag_map]
+(
+	[tag_id] ASC,
+	[type_alias] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_date_id] ON [#__contentitem_tag_map]
+(
+	[tag_date] ASC,
+	[tag_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_tag] ON [#__contentitem_tag_map]
+(
+	[tag_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_core_content_id] ON [#__contentitem_tag_map]
+(
+	[core_content_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/****** Object:  Table [#__tags] ******/
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__tags] (
+  [id] [int] IDENTITY(1,1) NOT NULL ,
+  [parent_id] [bigint] NOT NULL DEFAULT '0',
+  [lft] [int] NOT NULL DEFAULT '0',
+  [rgt] [int] NOT NULL DEFAULT '0',
+  [level] [bigint] NOT NULL DEFAULT '0',
+  [path] [nvarchar](255) NOT NULL DEFAULT '',
+  [title] [nvarchar](255) NOT NULL,
+  [alias] [nvarchar](255) NOT NULL DEFAULT '',
+  [note] [nvarchar](255) NOT NULL DEFAULT '',
+  [description] [nvarchar](max) NOT NULL,
+  [published] [smallint] NOT NULL DEFAULT '0',
+  [checked_out] [bigint] NOT NULL DEFAULT '0',
+  [checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [access] [int] NOT NULL DEFAULT '0',
+  [params] [nvarchar](max) NOT NULL,
+  [metadesc] [nvarchar](1024) NOT NULL,
+  [metakey] [nvarchar](1024) NOT NULL,
+  [metadata] [nvarchar](2048) NOT NULL,
+  [created_user_id] [bigint] NOT NULL DEFAULT '0',
+  [created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
+  [modified_user_id] [bigint] NOT NULL DEFAULT '0',
+  [modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [images] [nvarchar](max) NOT NULL,
+  [urls] [nvarchar](max) NOT NULL,
+  [hits] [bigint] NOT NULL DEFAULT '0',
+  [language] [nvarchar](7) NOT NULL,
+  [version] [bigint] NOT NULL DEFAULT '1',
+  [publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  CONSTRAINT [PK_#__tags_id] PRIMARY KEY CLUSTERED
+    (
+      [id] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [tag_idx] ON [#__tags]
+(
+  [published] ASC,
+  [access] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__tags]
+(
+  [access] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__tags]
+(
+  [checked_out] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_path] ON [#__tags]
+(
+  [path] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_left_right] ON [#__tags]
+(
+  [lft] ASC,
+  [rgt] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_alias] ON [#__tags]
+(
+  [alias] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__tags]
+(
+  [language] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+SET IDENTITY_INSERT [#__tags] ON;
+
+INSERT INTO [#__tags] ([id], [parent_id], [lft], [rgt], [level], [path], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [modified_user_id], [modified_time], [images], [urls], [hits], [language])
+SELECT 1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{}', '', '', '', 0, '2009-10-18 16:07:09', 0, '1900-01-01 00:00:00', '', '', 0, '*';
+
+SET IDENTITY_INSERT [#__tags] OFF;
+
+/****** Object:  Table [#__ucm_base] ******/
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__ucm_base] (
+  [ucm_id] [bigint] IDENTITY(1,1) NOT NULL,
+  [ucm_item_id] [bigint] NOT NULL,
+  [ucm_type_id] [bigint] NOT NULL,
+  [ucm_language_id] [bigint] NOT NULL,
+  CONSTRAINT [PK_#__ucm_base_ucm_id] PRIMARY KEY CLUSTERED
+    (
+      [ucm_id] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY],
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [ucm_item_id] ON [#__ucm_base]
+(
+  [ucm_item_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [ucm_type_id] ON [#__ucm_base]
+(
+  [ucm_type_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [ucm_language_id] ON [#__ucm_base]
+(
+  [ucm_language_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/****** Object:  Table [#__ucm_content] ******/
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__ucm_content] (
+  [core_content_id] [bigint] IDENTITY(1,1) NOT NULL,
+  [core_type_alias] [nvarchar](255) NOT NULL,
+  [core_title] [nvarchar](255) NOT NULL DEFAULT '',
+  [core_alias] [nvarchar](255) NOT NULL DEFAULT '',
+  [core_body] [nvarchar](max) NOT NULL,
+  [core_state] [smallint] NOT NULL DEFAULT '0',
+  [core_checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [core_checked_out_user_id] [bigint] NOT NULL DEFAULT '0',
+  [core_access] [bigint] NOT NULL DEFAULT '0',
+  [core_params] [nvarchar](max) NOT NULL,
+  [core_featured] [tinyint] NOT NULL DEFAULT '0',
+  [core_metadata] [nvarchar](max) NOT NULL,
+  [core_created_user_id] [bigint] NOT NULL DEFAULT '0',
+  [core_created_by_alias] [nvarchar](255) NOT NULL DEFAULT '',
+  [core_created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [core_modified_user_id] [bigint] NOT NULL DEFAULT '0',
+  [core_modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [core_language] [nvarchar](7) NOT NULL,
+  [core_publish_up] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [core_publish_down] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [core_content_item_id] [bigint] NOT NULL DEFAULT '0',
+  [asset_id] [bigint] NOT NULL DEFAULT '0',
+  [core_images] [nvarchar](max) NOT NULL,
+  [core_urls] [nvarchar](max) NOT NULL,
+  [core_hits] [bigint] NOT NULL DEFAULT '0',
+  [core_version] [bigint] NOT NULL DEFAULT '1',
+  [core_ordering] [int] NOT NULL DEFAULT '0',
+  [core_metakey] [nvarchar](max) NOT NULL,
+  [core_metadesc] [nvarchar](max) NOT NULL,
+  [core_catid] [bigint] NOT NULL DEFAULT '0',
+  [core_xreference] [nvarchar](50) NOT NULL,
+  [core_type_id] [bigint] NOT NULL DEFAULT '0',
+  CONSTRAINT [PK_#__ucm_content_core_content_id] PRIMARY KEY CLUSTERED
+    (
+      [core_content_id] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY],
+  CONSTRAINT [#__ucm_content_core_content_id$idx_type_alias_item_id] UNIQUE NONCLUSTERED
+    (
+      [core_type_alias] ASC,
+      [core_content_item_id] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [tag_idx] ON [#__ucm_content]
+(
+  [core_state] ASC,
+  [core_access] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__ucm_content]
+(
+  [core_access] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_alias] ON [#__ucm_content]
+(
+  [core_alias] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__ucm_content]
+(
+  [core_language] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_title] ON [#__ucm_content]
+(
+  [core_title] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_modified_time] ON [#__ucm_content]
+(
+  [core_modified_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_created_time] ON [#__ucm_content]
+(
+  [core_created_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_content_type] ON [#__ucm_content]
+(
+  [core_type_alias] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_core_modified_user_id] ON [#__ucm_content]
+(
+  [core_modified_user_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_core_checked_out_user_id] ON [#__ucm_content]
+(
+  [core_checked_out_user_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_core_created_user_id] ON [#__ucm_content]
+(
+  [core_created_user_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_core_type_id] ON [#__ucm_content]
+(
+  [core_type_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"name":"com_joomlaupdate","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2018 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
+
+INSERT INTO [#__menu] ([menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id])
+SELECT 'menu', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1900-01-01 00:00:00', 0, 0, 'class:tags', 0, '', 43, 44, 0, '*', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.1.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.1.sql
new file mode 100644
index 00000000..df442faa
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.1
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.2.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.2.sql
new file mode 100644
index 00000000..9e4e64ff
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.2.sql
@@ -0,0 +1,16 @@
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__content","key":"id","type":"Content","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Article';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__contact_details","key":"id","type":"Contact","prefix":"ContactTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Contact';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"Newsfeed","prefix":"NewsfeedsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Newsfeed';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'User';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Article Category';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Contact Category';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Newsfeeds Category';
+UPDATE [#__content_types] SET [table] = '{"special":{"dbtable":"#__tags","key":"tag_id","type":"Tag","prefix":"TagsTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}' WHERE [type_title] = 'Tag';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"asset_id"}, "special": {"fulltext":"fulltext"}}' WHERE [type_title] = 'Article';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special": {"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}' WHERE [type_title] = 'Contact';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"xreference", "asset_id":"null"}, "special": {"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}' WHERE [type_title] = 'Newsfeed';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerdate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special": {}}' WHERE [type_title] = 'User';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE [type_title] = 'Article Category';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE [type_title] = 'Contact Category';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}' WHERE [type_title] = 'Newsfeeds Category';
+UPDATE [#__content_types] SET [field_mappings] = '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "core_xreference":"null", "asset_id":"null"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}' WHERE [type_title] = 'Tag';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.3.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.3.sql
new file mode 100644
index 00000000..ebc1102e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.3.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.3
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql
new file mode 100644
index 00000000..1521a450
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.4.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql
new file mode 100644
index 00000000..2c9caba7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.1.5.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 3.1.5
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql
new file mode 100644
index 00000000..1d7fcff2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.0.sql
@@ -0,0 +1,184 @@
+/* Core 3.2 schema updates */
+
+ALTER TABLE [#__content_types] ADD [content_history_options] [nvarchar] (max) NULL;
+
+UPDATE [#__content_types] SET [content_history_options] = '{"formFile":"administrator\/components\/com_content\/models\/forms\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}' WHERE [type_alias] = 'com_content.article';
+UPDATE [#__content_types] SET [content_history_options] = '{"formFile":"administrator\/components\/com_contact\/models\/forms\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version","xreference"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }' WHERE [type_alias] = 'com_contact.contact';
+UPDATE [#__content_types] SET [content_history_options] = '{"formFile":"administrator\/components\/com_categories\/models\/forms\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}' WHERE [type_alias] IN ('com_content.category', 'com_contact.category', 'com_newsfeeds.category');
+UPDATE [#__content_types] SET [content_history_options] = '{"formFile":"administrator\/components\/com_newsfeeds\/models\/forms\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE [type_alias] = 'com_newsfeeds.newsfeed';
+UPDATE [#__content_types] SET [content_history_options] = '{"formFile":"administrator\/components\/com_tags\/models\/forms\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}' WHERE [type_alias] = 'com_tags.tag';
+
+INSERT INTO [#__content_types] ([type_title], [type_alias], [table], [rules], [field_mappings], [router], [content_history_options])
+SELECT 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"Banner","prefix":"BannersTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "core_xreference":"null", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '', '{"formFile":"administrator\/components\/com_banners\/models\/forms\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'
+UNION ALL
+SELECT 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\/components\/com_categories\/models\/forms\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'
+UNION ALL
+SELECT 'Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"Client","prefix":"BannersTable"}}', '', '', '', '{"formFile":"administrator\/components\/com_banners\/models\/forms\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'
+UNION ALL
+SELECT 'User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"Note","prefix":"UsersTable"}}', '', '', '', '{"formFile":"administrator\/components\/com_users\/models\/forms\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'
+UNION ALL
+SELECT 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"Category","prefix":"JTable","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"JTable","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "core_xreference":"null", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\/components\/com_categories\/models\/forms\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}';
+
+UPDATE [#__extensions] SET [params] = '{"template_positions_display":"0","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}' WHERE [extension_id] = 20;
+UPDATE [#__extensions] SET [params] = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE [extension_id] = 410;
+
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
+
+INSERT INTO [#__menu] ([menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id])
+SELECT 'menu', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1;
+
+ALTER TABLE [#__modules] ADD [asset_id] [bigint] NOT NULL DEFAULT 0;
+
+CREATE TABLE [#__postinstall_messages] (
+  [postinstall_message_id] [bigint] IDENTITY(1,1) NOT NULL,
+  [extension_id] [bigint] NOT NULL DEFAULT 700,
+  [title_key] [nvarchar](255) NOT NULL DEFAULT '',
+  [description_key] [nvarchar](255) NOT NULL DEFAULT '',
+  [action_key] [nvarchar](255) NOT NULL DEFAULT '',
+  [language_extension] [nvarchar](255) NOT NULL DEFAULT 'com_postinstall',
+  [language_client_id] [int] NOT NULL DEFAULT 1,
+  [type] [nvarchar](10) NOT NULL DEFAULT 'link',
+  [action_file] [nvarchar](255) DEFAULT '',
+  [action] [nvarchar](255) DEFAULT '',
+  [condition_file] [nvarchar](255) DEFAULT NULL,
+  [condition_method] [nvarchar](255) DEFAULT NULL,
+  [version_introduced] [nvarchar](50) NOT NULL DEFAULT '3.2.0',
+  [enabled] [int] NOT NULL DEFAULT 1,
+  CONSTRAINT [PK_#__postinstall_message_id] PRIMARY KEY CLUSTERED
+    (
+      [postinstall_message_id] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1
+UNION ALL
+SELECT 700, 'COM_CPANEL_MSG_EACCELERATOR_TITLE', 'COM_CPANEL_MSG_EACCELERATOR_BODY', 'COM_CPANEL_MSG_EACCELERATOR_BUTTON', 'com_cpanel', 1, 'action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_condition', '3.2.0', 1;
+
+CREATE TABLE [#__ucm_history] (
+  [version_id] [bigint] IDENTITY(1,1) NOT NULL,
+  [ucm_item_id] [bigint] NOT NULL,
+  [ucm_type_id] [bigint] NOT NULL,
+  [version_note] [nvarchar](255) NOT NULL DEFAULT '',
+  [save_date] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+  [editor_user_id] [bigint] NOT NULL DEFAULT 0,
+  [character_count] [bigint] NOT NULL DEFAULT 0,
+  [sha1_hash] [nvarchar](50) NOT NULL DEFAULT '',
+  [version_data] [nvarchar](max) NOT NULL,
+  [keep_forever] [smallint] NOT NULL DEFAULT 0,
+  CONSTRAINT [PK_#__ucm_history_version_id] PRIMARY KEY CLUSTERED
+    (
+      [version_id] ASC
+    )WITH (PAD_INDEX= OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_ucm_item_id] ON [#__ucm_history]
+(
+  [ucm_type_id] ASC,
+  [ucm_item_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_save_date] ON [#__ucm_history]
+(
+  [save_date] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+ALTER TABLE [#__users] ADD [otpKey] [nvarchar](1000) NOT NULL DEFAULT '';
+
+ALTER TABLE [#__users] ADD [otep] [nvarchar](1000) NOT NULL DEFAULT '';
+
+CREATE TABLE [#__user_keys] (
+  [id] [bigint] IDENTITY(1,1) NOT NULL,
+  [user_id] [nvarchar](255) NOT NULL,
+  [token] [nvarchar](255) NOT NULL,
+  [series] [nvarchar](255) NOT NULL,
+  [invalid] [smallint] NOT NULL,
+  [time] [nvarchar](200) NOT NULL,
+  [uastring] [nvarchar](255) NOT NULL,
+  CONSTRAINT [PK_#__user_keys_id] PRIMARY KEY CLUSTERED
+    (
+      [id] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY],
+  CONSTRAINT [#__user_keys$series] UNIQUE NONCLUSTERED
+    (
+      [series] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY],
+  CONSTRAINT [#__user_keys$series_2] UNIQUE NONCLUSTERED
+    (
+      [series] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY],
+  CONSTRAINT [#__user_keys$series_3] UNIQUE NONCLUSTERED
+    (
+      [series] ASC
+    )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [user_id] ON [#__user_keys]
+(
+  [user_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/* Queries below sync the schema to MySQL where able without causing errors */
+
+ALTER TABLE [#__contentitem_tag_map] ADD [type_id] [int] NOT NULL;
+
+CREATE NONCLUSTERED INDEX [idx_type] ON [#__contentitem_tag_map]
+(
+  [type_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [alias] [nvarchar](255) NOT NULL;
+
+ALTER TABLE [#__overrider] ALTER COLUMN [constant] [nvarchar](255) NOT NULL;
+ALTER TABLE [#__overrider] ALTER COLUMN [string] [nvarchar](max) NOT NULL;
+ALTER TABLE [#__overrider] ALTER COLUMN [file] [nvarchar](255) NOT NULL;
+
+ALTER TABLE [#__session] DROP COLUMN [usertype];
+
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_metadata] [nvarchar](2048) NOT NULL;
+
+CREATE PROCEDURE "#removeDefault"
+(
+	@table NVARCHAR(100),
+	@column NVARCHAR(100)
+)
+AS
+BEGIN
+	DECLARE @constraintName AS nvarchar(100)
+	DECLARE @constraintQuery AS nvarchar(1000)
+	SELECT @constraintName = name FROM sys.default_constraints
+		WHERE parent_object_id = object_id(@table)
+		AND parent_column_id = columnproperty(object_id(@table), @column, 'ColumnId')
+	SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
+	EXECUTE sp_executesql @constraintQuery
+END;
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_content_item_id';
+EXECUTE "#removeDefault" "#__ucm_content", 'asset_id';
+EXECUTE "#removeDefault" "#__ucm_content", 'core_type_id';
+
+EXECUTE "#removeDefault" "#__updates", 'categoryid';
+ALTER TABLE [#__updates] DROP COLUMN [categoryid];
+
+ALTER TABLE [#__updates] ALTER COLUMN [infourl] [nvarchar](max) NOT NULL;
+
+/* Update bad params for two cpanel modules */
+
+UPDATE [#__modules] SET [params] = REPLACE([params], '"bootstrap_size":"1"', '"bootstrap_size":"0"') WHERE [id] IN (3,4);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql
new file mode 100644
index 00000000..e7e9002f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.1.sql
@@ -0,0 +1 @@
+DELETE FROM [#__postinstall_messages] WHERE [title_key] = 'PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TITLE';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql
new file mode 100644
index 00000000..b629a806
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql
@@ -0,0 +1,2 @@
+ALTER TABLE [#__update_sites] ADD [extra_query] [nvarchar](1000) NULL DEFAULT '';
+ALTER TABLE [#__updates] ADD [extra_query] [nvarchar](1000) NULL DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql
new file mode 100644
index 00000000..ec8916d0
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql
@@ -0,0 +1 @@
+UPDATE [#__menu] SET [component_id] = (SELECT [extension_id] FROM [#__extensions] WHERE [element] = 'com_joomlaupdate') WHERE [link] = 'index.php?option=com_joomlaupdate';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql
new file mode 100644
index 00000000..fbe9b6af
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 1, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql
new file mode 100644
index 00000000..9903a08b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql
new file mode 100644
index 00000000..f190ea7f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql
@@ -0,0 +1,2 @@
+/* Update updates version length */
+ALTER TABLE [#__updates] ALTER COLUMN [version] [nvarchar](32);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql
new file mode 100644
index 00000000..57e62d7b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.3-2014-02-20.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.3-2014-02-20.sql
new file mode 100644
index 00000000..0c4ac188
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.2.3-2014-02-20.sql
@@ -0,0 +1 @@
+UPDATE [#__extensions] SET [params] = (SELECT [params] FROM [#__extensions] WHERE [name] = 'plg_system_remember') WHERE [name] = 'plg_authentication_cookie';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-02-16.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-02-16.sql
new file mode 100644
index 00000000..bc5de3d5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-02-16.sql
@@ -0,0 +1 @@
+ALTER TABLE [#__users] ADD [requireReset] [smallint] NULL DEFAULT 0;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-04-02.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-04-02.sql
new file mode 100644
index 00000000..40d8bda5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.0-2014-04-02.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 0, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.4-2014-08-03.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.4-2014-08-03.sql
new file mode 100644
index 00000000..b807ea75
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.4-2014-08-03.sql
@@ -0,0 +1 @@
+ALTER TABLE [#__user_profiles] ALTER COLUMN [profile_value] [nvarchar](max) NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql
new file mode 100644
index 00000000..1ff46584
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.3.6-2014-09-30.sql
@@ -0,0 +1,5 @@
+INSERT INTO [#__update_sites] ([name], [type], [location], [enabled])
+SELECT 'Joomla! Update Component Update Site', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1;
+
+INSERT INTO [#__update_sites_extensions] ([update_site_id], [extension_id])
+SELECT (SELECT [update_site_id] FROM [#__update_sites] WHERE [name] = 'Joomla! Update Component Update Site'), (SELECT [extension_id] FROM [#__extensions] WHERE [name] = 'com_joomlaupdate');
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-08-24.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-08-24.sql
new file mode 100644
index 00000000..3927cec9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-08-24.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_HTACCESS_TITLE', 'COM_CPANEL_MSG_HTACCESS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccess.php', 'admin_postinstall_htaccess_condition', '3.4.0', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-01.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-01.sql
new file mode 100644
index 00000000..da5e9371
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-01.sql
@@ -0,0 +1,12 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 801, 'weblinks', 'package', 'pkg_weblinks', '', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
+
+INSERT INTO [#__update_sites] ([name], [type], [location], [enabled])
+SELECT 'Weblinks Update Site', 'extension', 'https://raw.githubusercontent.com/joomla-extensions/weblinks/master/manifest.xml', 1;
+
+INSERT INTO [#__update_sites_extensions] ([update_site_id], [extension_id])
+SELECT (SELECT [update_site_id] FROM [#__update_sites] WHERE [name] = 'Weblinks Update Site'), 801;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql
new file mode 100644
index 00000000..0238aa25
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql
@@ -0,0 +1,6 @@
+ALTER TABLE [#__redirect_links] ADD [header] [smallint] NOT NULL DEFAULT 301;
+--
+-- The following statement has to be disabled because it conflicts with
+-- a later change added with Joomla! 3.5.0 for long URLs in this table
+--
+-- ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](255) NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-10-20.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-10-20.sql
new file mode 100644
index 00000000..2cb4da10
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-10-20.sql
@@ -0,0 +1 @@
+DELETE FROM [#__extensions] WHERE [extension_id] = 100;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql
new file mode 100644
index 00000000..1fe05e9e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-12-03.sql
@@ -0,0 +1 @@
+UPDATE [#__extensions] SET [protected] = '0' WHERE [name] = 'plg_editors-xtd_article' AND [type] = 'plugin' AND [element] = 'article' AND [folder] = 'editors-xtd';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql
new file mode 100644
index 00000000..555a71c1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-01-21.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_ROBOTS_TITLE', 'COM_CPANEL_MSG_ROBOTS_BODY', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.3.0', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-02-26.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-02-26.sql
new file mode 100644
index 00000000..3125cd02
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2015-02-26.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE', 'COM_CPANEL_MSG_LANGUAGEACCESS340_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/languageaccess340.php', 'admin_postinstall_languageaccess340_condition', '3.4.1', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.4-2015-07-11.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.4-2015-07-11.sql
new file mode 100644
index 00000000..de9ce373
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.4.4-2015-07-11.sql
@@ -0,0 +1,8 @@
+ALTER TABLE [#__contentitem_tag_map] DROP CONSTRAINT [#__contentitem_tag_map$uc_ItemnameTagid];
+
+ALTER TABLE [#__contentitem_tag_map] ADD CONSTRAINT [#__contentitem_tag_map$uc_ItemnameTagid] UNIQUE NONCLUSTERED
+(
+  [type_id] ASC,
+  [content_item_id] ASC,
+  [tag_id] ASC
+)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-13.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-13.sql
new file mode 100644
index 00000000..b58a8e7a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-13.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql
new file mode 100644
index 00000000..c908def7
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql
@@ -0,0 +1,3 @@
+DROP INDEX [idx_tag_name] ON [#__contentitem_tag_map];
+DROP INDEX [idx_tag] ON [#__contentitem_tag_map];
+DROP INDEX [idx_type] ON [#__contentitem_tag_map];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql
new file mode 100644
index 00000000..48ddf71b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql
@@ -0,0 +1 @@
+UPDATE [#__menu] SET [title] = 'com_contact_contacts' WHERE [client_id] = 1 AND [level] = 2 AND [title] = 'com_contact';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql
new file mode 100644
index 00000000..1de0da4e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql
@@ -0,0 +1,8 @@
+DELETE FROM [#__menu] WHERE [title] = 'com_messages_read' AND [client_id] = 1;
+
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql
new file mode 100644
index 00000000..3ff42e5f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql
@@ -0,0 +1,9 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
+
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql
new file mode 100644
index 00000000..898025ea
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql
@@ -0,0 +1,15 @@
+ALTER TABLE [#__redirect_links] DROP CONSTRAINT [#__redirect_links$idx_link_old];
+ALTER TABLE [#__redirect_links] ALTER COLUMN [old_url] [nvarchar](2048) NOT NULL;
+
+--
+-- The following statement had to be modified for 3.6.0 by removing the
+-- NOT NULL, which was wrong because not consistent with new install.
+-- See also 3.6.0-2016-04-06.sql for updating 3.5.0 or 3.5.1
+--
+ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](2048);
+
+ALTER TABLE [#__redirect_links] ALTER COLUMN [referer] [nvarchar](2048) NOT NULL;
+CREATE NONCLUSTERED INDEX [idx_old_url] ON [#__redirect_links]
+(
+	[old_url] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-01.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-01.sql
new file mode 100644
index 00000000..45dcf467
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-01.sql
@@ -0,0 +1,8 @@
+-- Rename update site names
+UPDATE [#__update_sites] SET [name] = 'Joomla! Core' WHERE [name] = 'Joomla Core' AND [type] = 'collection';
+UPDATE [#__update_sites] SET [name] = 'Joomla! Extension Directory' WHERE [name] = 'Joomla Extension Directory' AND [type] = 'collection';
+
+UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/core/list.xml' WHERE [name] = 'Joomla! Core' AND [type] = 'collection';
+UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/jed/list.xml' WHERE [name] = 'Joomla! Extension Directory' AND [type] = 'collection';
+UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/language/translationlist_3.xml' WHERE [name] = 'Accredited Joomla! Translations' AND [type] = 'collection';
+UPDATE [#__update_sites] SET [location] = 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml' WHERE [name] = 'Joomla! Update Component Update Site' AND [type] = 'extension';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-06.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-06.sql
new file mode 100644
index 00000000..fe7dc8e6
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-06.sql
@@ -0,0 +1 @@
+ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](2048);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-08.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-08.sql
new file mode 100644
index 00000000..c343067a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-08.sql
@@ -0,0 +1,16 @@
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
+
+UPDATE [#__update_sites_extensions]
+SET [extension_id] = 802
+WHERE [update_site_id] IN (
+			SELECT [update_site_id]
+			FROM [#__update_sites]
+			WHERE [name] = 'Accredited Joomla! Translations'
+			AND [type] = 'collection'
+			)
+AND [extension_id] = 600;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-09.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-09.sql
new file mode 100644
index 00000000..33fab71e
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-09.sql
@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__menu_types
+--
+
+ALTER TABLE [#__menu_types] ADD [asset_id] [bigint] NOT NULL DEFAULT 0;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-05-06.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-05-06.sql
new file mode 100644
index 00000000..18665f63
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-05-06.sql
@@ -0,0 +1,12 @@
+DELETE FROM [#__extensions] WHERE [type] = 'library' AND [element] = 'simplepie';
+
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 455, 'plg_installer_packageinstaller', 'plugin', 'packageinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 1, 0
+UNION ALL
+SELECT 456, 'plg_installer_folderinstaller', 'plugin', 'folderinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 2, 0
+UNION ALL
+SELECT 457, 'plg_installer_urlinstaller', 'plugin', 'urlinstaller', 'installer', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 3, 0;
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql
new file mode 100644
index 00000000..3a547b55
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-01.sql
@@ -0,0 +1 @@
+UPDATE [#__extensions] SET [protected] = 1, [enabled] = 1 WHERE [name] = 'com_ajax';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql
new file mode 100644
index 00000000..9355db71
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-06-05.sql
@@ -0,0 +1,5 @@
+--
+-- Add ACL check for to #__languages
+--
+
+ALTER TABLE [#__languages] ADD [asset_id] [bigint] NOT NULL DEFAULT 0;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql
new file mode 100644
index 00000000..515854cd
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql
@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [link] [nvarchar](2048) NOT NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql
new file mode 100644
index 00000000..c54563d9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-16.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY', 'PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION', 'plg_system_updatenotification', 1, 'action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_action', 'site://plugins/system/updatenotification/postinstall/updatecachetime.php', 'updatecachetime_postinstall_condition', '3.6.3', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-06.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-06.sql
new file mode 100644
index 00000000..feec2ca8
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-06.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT #__extensions  ON;
+
+INSERT INTO #__extensions ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 458, 'plg_quickicon_phpversioncheck', 'plugin', 'phpversioncheck', 'quickicon', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT #__extensions  OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-22.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-22.sql
new file mode 100644
index 00000000..6a9744ef
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-22.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions]  ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 459, 'plg_editors-xtd_menu', 'plugin', 'menu', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions]  OFF;
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-29.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-29.sql
new file mode 100644
index 00000000..85626966
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-08-29.sql
@@ -0,0 +1,144 @@
+/****** Object:  Table [#__fields] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields] (
+	[id] [int] IDENTITY(1,1) NOT NULL,
+	[asset_id] [int] NOT NULL DEFAULT 0,
+	[context] [nvarchar](255) NOT NULL DEFAULT '',
+	[group_id] [int] NOT NULL DEFAULT 0,
+	[title] [nvarchar](255) NOT NULL DEFAULT '',
+	[name] [nvarchar](255) NOT NULL DEFAULT '',
+	[label] [nvarchar](255) NOT NULL DEFAULT '',
+	[default_value] [nvarchar](max) NOT NULL DEFAULT '',
+	[type] [nvarchar](255) NOT NULL DEFAULT '',
+	[note] [nvarchar](255) NOT NULL DEFAULT '',
+	[description] [nvarchar](max) NOT NULL DEFAULT '',
+	[state] [smallint] NOT NULL DEFAULT 0,
+	[required] [smallint] NOT NULL DEFAULT 0,
+	[checked_out] [bigint] NOT NULL DEFAULT 0,
+	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[ordering] [int] NOT NULL DEFAULT 0,
+	[params] [nvarchar](max) NOT NULL DEFAULT '',
+	[fieldparams] [nvarchar](max) NOT NULL DEFAULT '',
+	[language] [nvarchar](7) NOT NULL DEFAULT '',
+	[created_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_user_id] [bigint] NOT NULL DEFAULT 0,
+	[modified_time] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_by] [bigint] NOT NULL DEFAULT 0,
+	[access] [int] NOT NULL DEFAULT 1,
+CONSTRAINT [PK_#__fields_id] PRIMARY KEY CLUSTERED(
+	[id] ASC)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
+) ON [PRIMARY]) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__fields](
+	[checked_out] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_state] ON [#__fields](
+	[state] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__fields](
+	[access] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_context] ON [#__fields](
+	[context] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__fields](
+	[language] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/****** Object:  Table [#__fields_categories] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields_categories] (
+	[field_id] [int] NOT NULL DEFAULT 0,
+	[category_id] [int] NOT NULL DEFAULT 0,
+CONSTRAINT [PK_#__fields_categories_id] PRIMARY KEY CLUSTERED(
+	[field_id] ASC,
+	[category_id] ASC)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
+) ON [PRIMARY]) ON [PRIMARY];
+
+/****** Object:  Table [#__fields_groups] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields_groups] (
+	[id] [int] IDENTITY(1,1) NOT NULL,
+	[asset_id] [int] NOT NULL DEFAULT 0,
+	[context] [nvarchar](255) NOT NULL DEFAULT '',
+	[title] [nvarchar](255) NOT NULL DEFAULT '',
+	[note] [nvarchar](255) NOT NULL DEFAULT '',
+	[description] [nvarchar](max) NOT NULL DEFAULT '',
+	[state] [smallint] NOT NULL DEFAULT 0,
+	[checked_out] [bigint] NOT NULL DEFAULT 0,
+	[checked_out_time] [datetime] NOT NULL DEFAULT '1900-01-01 00:00:00',
+	[ordering] [int] NOT NULL DEFAULT 0,
+	[language] [nvarchar](7) NOT NULL DEFAULT '',
+	[created] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[created_by] [bigint] NOT NULL DEFAULT 0,
+	[modified] [datetime] NOT NULL DEFAULT '1900-01-01T00:00:00.000',
+	[modified_by] [bigint] NOT NULL DEFAULT 0,
+	[access] [int] NOT NULL DEFAULT 1,
+CONSTRAINT [PK_#__fields_groups_id] PRIMARY KEY CLUSTERED(
+	[id] ASC)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON
+ ) ON [PRIMARY]) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_checkout] ON [#__fields_groups](
+	[checked_out] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_state] ON [#__fields_groups](
+	[state] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_created_by] ON [#__fields_groups](
+	[created_by] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_access] ON [#__fields_groups](
+	[access] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_context] ON [#__fields_groups](
+	[context] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_language] ON [#__fields_groups](
+	[language] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+/****** Object:  Table [#__fields_values] ******/
+
+SET QUOTED_IDENTIFIER ON;
+
+CREATE TABLE [#__fields_values] (
+	[field_id] [bigint] NOT NULL DEFAULT 1,
+	[item_id] [nvarchar](255) NOT NULL DEFAULT '',
+	[value] [nvarchar](max) NOT NULL DEFAULT '',
+) ON [PRIMARY];
+
+CREATE NONCLUSTERED INDEX [idx_field_id] ON [#__fields_values](
+	[field_id] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE NONCLUSTERED INDEX [idx_item_id] ON [#__fields_values](
+	[item_id] ASC)
+WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+SET IDENTITY_INSERT [#__extensions] ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 461, 'plg_system_fields', 'plugin', 'fields', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+
+
+SET IDENTITY_INSERT [#__extensions] OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-09-29.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-09-29.sql
new file mode 100644
index 00000000..9cede5db
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-09-29.sql
@@ -0,0 +1,3 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE', 'COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/joomla40checks.php', 'admin_postinstall_joomla40checks_condition', '3.7.0', 1;
+
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-01.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-01.sql
new file mode 100644
index 00000000..d975345b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-01.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions]  ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 460, 'plg_editors-xtd_contact', 'plugin', 'contact', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT [#__extensions]  OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-02.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-02.sql
new file mode 100644
index 00000000..13732752
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-10-02.sql
@@ -0,0 +1 @@
+ALTER TABLE [#__session] ALTER COLUMN [client_id] [tinyint] NULL;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-04.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-04.sql
new file mode 100644
index 00000000..8b40b5e1
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-04.sql
@@ -0,0 +1,13 @@
+-- Change default value for enabled column.
+DECLARE @table AS nvarchar(100)
+DECLARE @constraintName AS nvarchar(100)
+DECLARE @constraintQuery AS nvarchar(1000)
+SET QUOTED_IDENTIFIER OFF
+SET @table = "#__extensions"
+SET QUOTED_IDENTIFIER ON
+SELECT @constraintName = name FROM sys.default_constraints
+WHERE parent_object_id = object_id(@table)
+AND parent_column_id = columnproperty(object_id(@table), 'enabled', 'ColumnId')
+SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName
++ ']; ALTER TABLE [' + @table + '] ADD CONSTRAINT [' + @constraintName + '] DEFAULT 0 FOR [enabled]'
+EXECUTE sp_executesql @constraintQuery;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql
new file mode 100644
index 00000000..01bd6575
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql
@@ -0,0 +1,3 @@
+ALTER TABLE [#__menu_types] ADD [client_id] [tinyint] NOT NULL DEFAULT 0;
+
+UPDATE [#__menu] SET [published] = 1 WHERE [menutype] = 'main' OR [menutype] = 'menu';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-24.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-24.sql
new file mode 100644
index 00000000..68d6dc8b
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-24.sql
@@ -0,0 +1,5 @@
+ALTER TABLE [#__extensions] ADD [package_id] [bigint] NOT NULL DEFAULT 0;
+
+UPDATE [#__extensions]
+SET [package_id] = (SELECT [extension_id] FROM [#__extensions] WHERE [type] = 'package' AND [element] = 'pkg_en-GB')
+WHERE [type]= 'language' AND [element] = 'en-GB';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-08.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-08.sql
new file mode 100644
index 00000000..d9b39bc5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-08.sql
@@ -0,0 +1,32 @@
+-- Normalize ucm_content_table default values.
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_type_alias];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_body];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_params];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_metadata];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_language];
+
+ALTER TABLE [#__ucm_content] DROP CONSTRAINT [#__ucm_content_core_content_id$idx_type_alias_item_id];
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_content_item_id] [bigint] NOT NULL;
+ALTER TABLE [#__ucm_content] ADD CONSTRAINT [#__ucm_content_core_content_id$idx_type_alias_item_id] UNIQUE NONCLUSTERED
+(
+	[core_type_alias] ASC,
+	[core_content_item_id] ASC
+) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY];
+ALTER TABLE [#__ucm_content] ADD DEFAULT (0) FOR [core_content_item_id];
+
+ALTER TABLE [#__ucm_content] ALTER COLUMN [asset_id] [bigint] NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT (0) FOR [asset_id];
+
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_images];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_urls];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_metakey];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_metadesc];
+ALTER TABLE [#__ucm_content] ADD DEFAULT ('') FOR [core_xreference];
+
+DROP INDEX [idx_core_type_id] ON [#__ucm_content];
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_type_id] [bigint] NOT NULL;
+CREATE NONCLUSTERED INDEX [idx_core_type_id] ON [#__ucm_content]
+(
+	[core_type_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+ALTER TABLE [#__ucm_content] ADD DEFAULT (0) FOR [core_type_id];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-09.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-09.sql
new file mode 100644
index 00000000..51ce67e0
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-09.sql
@@ -0,0 +1,8 @@
+-- Normalize categories table default values.
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [title];
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [description];
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [params];
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [metadesc];
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [metakey];
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [metadata];
+ALTER TABLE [#__categories] ADD DEFAULT ('') FOR [language];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql
new file mode 100644
index 00000000..802e5800
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-15.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT #__extensions  ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) VALUES
+(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
+
+SET IDENTITY_INSERT #__extensions  OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-17.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-17.sql
new file mode 100644
index 00000000..86ffa383
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-17.sql
@@ -0,0 +1,95 @@
+-- Sync menutype for admin menu and set client_id correct
+-- Note: This change had to be modified with Joomla 3.7.3 because the
+-- original version made site menus disappear if there were menu types
+-- "main" or "menu" defined for the site.
+
+-- Step 1: If there is any user-defined menu and menu type "main" for the site
+-- (client_id = 0), then change the menu type for the menu, any module and the
+-- menu type to something very likely not being used yet and just within the
+-- max. length of 24 characters.
+UPDATE [#__menu]
+   SET [menutype] = 'main_is_reserved_133C585'
+ WHERE [client_id] = 0
+   AND [menutype] = 'main'
+   AND (SELECT COUNT([id]) FROM [#__menu_types] WHERE [client_id] = 0 AND [menutype] = 'main') > 0;
+
+UPDATE [#__modules]
+   SET [params] = REPLACE([params],'"menutype":"main"','"menutype":"main_is_reserved_133C585"')
+ WHERE [client_id] = 0
+   AND (SELECT COUNT([id]) FROM [#__menu_types] WHERE [client_id] = 0 AND [menutype] = 'main') > 0;
+
+UPDATE [#__menu_types]
+   SET [menutype] = 'main_is_reserved_133C585'
+ WHERE [client_id] = 0 
+   AND [menutype] = 'main';
+
+-- Step 2: What remains now are the main menu items, possibly with wrong
+-- client_id if there was nothing hit by step 1 because there was no record in
+-- the menu types table with client_id = 0.
+UPDATE [#__menu]
+   SET [client_id] = 1
+ WHERE [menutype] = 'main';
+
+-- Step 3: If we have menu items for the admin using menutype = "menu" and
+-- having correct client_id = 1, we can be sure they belong to the admin menu
+-- and so rename the menutype.
+UPDATE [#__menu]
+   SET [menutype] = 'main'
+ WHERE [client_id] = 1 
+   AND [menutype] = 'menu';
+
+-- Step 4: If there is no user-defined menu type "menu" for the site, we can
+-- assume that any menu items for that menu type belong to the admin.
+-- Fix the client_id for those as it was done with the original version of this
+-- schema update script here.
+UPDATE [#__menu]
+   SET [menutype] = 'main',
+       [client_id] = 1
+ WHERE [menutype] = 'menu'
+   AND (SELECT COUNT([id]) FROM [#__menu_types] WHERE [client_id] = 0 AND [menutype] = 'menu') > 0;
+
+-- Step 5: For the standard admin menu items of menutype "main" there is no record
+-- in the menutype table on a clean Joomla installation. If there is one, it is a
+-- mistake and it should be deleted. This is also the case with menu type "menu"
+-- for the admin, for which we changed the menutype of the menu items in step 3.
+DELETE FROM [#__menu_types]
+ WHERE [client_id] = 1
+   AND [menutype] IN ('main', 'menu');
+
+-- End sync menutype for admin menu and set client_id correct
+
+SET IDENTITY_INSERT #__extensions  ON;
+
+INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 462, 'plg_fields_calendar', 'plugin', 'calendar', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 463, 'plg_fields_checkboxes', 'plugin', 'checkboxes', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 464, 'plg_fields_color', 'plugin', 'color', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 465, 'plg_fields_editor', 'plugin', 'editor', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 466, 'plg_fields_imagelist', 'plugin', 'imagelist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 467, 'plg_fields_integer', 'plugin', 'integer', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 468, 'plg_fields_list', 'plugin', 'list', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 469, 'plg_fields_media', 'plugin', 'media', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 470, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 471, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 472, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 473, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 474, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 475, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 476, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT #__extensions  OFF;
+
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-31.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-31.sql
new file mode 100644
index 00000000..9360176a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-01-31.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT #__extensions  ON;
+
+INSERT INTO #__extensions ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 477, 'plg_content_fields', 'plugin', 'fields', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT #__extensions  OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-02.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-02.sql
new file mode 100644
index 00000000..3261b8fb
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-02.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT #__extensions  ON;
+
+INSERT INTO #__extensions ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 478, 'plg_editors-xtd_fields', 'plugin', 'fields', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+
+SET IDENTITY_INSERT #__extensions  OFF;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-15.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-15.sql
new file mode 100644
index 00000000..2ea8376c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-15.sql
@@ -0,0 +1,2 @@
+-- Normalize redirect_links table default values.
+ALTER TABLE [#__redirect_links] ADD DEFAULT ('') FOR [comment];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql
new file mode 100644
index 00000000..2f49b726
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-16.sql
@@ -0,0 +1,329 @@
+-- Replace datetime to datetime2(0) type for all columns.
+DROP INDEX [idx_track_date] ON [#__banner_tracks];
+ALTER TABLE [#__banner_tracks] DROP CONSTRAINT [PK_#__banner_tracks_track_date];
+ALTER TABLE [#__banner_tracks] ALTER COLUMN [track_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banner_tracks] ADD CONSTRAINT [PK_#__banner_tracks_track_date_type_id] PRIMARY KEY CLUSTERED
+(
+	[track_date] ASC,
+	[track_type] ASC,
+	[banner_id] ASC
+) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY];
+CREATE NONCLUSTERED INDEX [idx_track_date2] ON [#__banner_tracks]
+(
+	[track_date] ASC
+) WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+CREATE PROCEDURE "#removeDefault"
+(
+	@table NVARCHAR(100),
+	@column NVARCHAR(100)
+)
+AS
+BEGIN
+	DECLARE @constraintName AS nvarchar(100)
+	DECLARE @constraintQuery AS nvarchar(1000)
+	SELECT @constraintName = name FROM sys.default_constraints
+		WHERE parent_object_id = object_id(@table)
+		AND parent_column_id = columnproperty(object_id(@table), @column, 'ColumnId')
+	SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
+	EXECUTE sp_executesql @constraintQuery
+END;
+
+EXECUTE "#removeDefault" "#__banner_clients", 'checked_out_time';
+ALTER TABLE [#__banner_clients] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banner_clients] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__banners", 'checked_out_time';
+ALTER TABLE [#__banners] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__banners", 'publish_up';
+ALTER TABLE [#__banners] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__banners", 'publish_down';
+ALTER TABLE [#__banners] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__banners", 'reset';
+ALTER TABLE [#__banners] ALTER COLUMN [reset] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [reset];
+
+EXECUTE "#removeDefault" "#__banners", 'created';
+ALTER TABLE [#__banners] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__banners", 'modified';
+ALTER TABLE [#__banners] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__banners] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+DROP INDEX [idx_checked_out_time] ON [#__categories];
+EXECUTE "#removeDefault" "#__categories", 'checked_out_time';
+ALTER TABLE [#__categories] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__categories] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+CREATE NONCLUSTERED INDEX [idx_checked_out_time2] ON [#__categories](
+	[checked_out_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__categories", 'created_time';
+ALTER TABLE [#__categories] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__categories] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__categories", 'modified_time';
+ALTER TABLE [#__categories] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__categories] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__contact_details", 'checked_out_time';
+ALTER TABLE [#__contact_details] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__contact_details", 'created';
+ALTER TABLE [#__contact_details] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__contact_details", 'modified';
+ALTER TABLE [#__contact_details] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__contact_details", 'publish_up';
+ALTER TABLE [#__contact_details] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__contact_details", 'publish_down';
+ALTER TABLE [#__contact_details] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contact_details] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__content", 'created';
+ALTER TABLE [#__content] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__content", 'modified';
+ALTER TABLE [#__content] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__content", 'checked_out_time';
+ALTER TABLE [#__content] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__content", 'publish_up';
+ALTER TABLE [#__content] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__content", 'publish_down';
+ALTER TABLE [#__content] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__content] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+DROP INDEX [idx_date_id] ON [#__contentitem_tag_map];
+EXECUTE "#removeDefault" "#__contentitem_tag_map", 'tag_date';
+ALTER TABLE [#__contentitem_tag_map] ALTER COLUMN [tag_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__contentitem_tag_map] ADD DEFAULT '1900-01-01 00:00:00' FOR [tag_date];
+CREATE NONCLUSTERED INDEX [idx_date_id2] ON [#__contentitem_tag_map](
+	[tag_date] ASC,
+	[tag_id] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__extensions", 'checked_out_time';
+ALTER TABLE [#__extensions] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__extensions] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__fields", 'checked_out_time';
+ALTER TABLE [#__fields] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__fields", 'created_time';
+ALTER TABLE [#__fields] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__fields", 'modified_time';
+ALTER TABLE [#__fields] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__fields_groups", 'checked_out_time';
+ALTER TABLE [#__fields_groups] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields_groups] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__fields_groups", 'created';
+ALTER TABLE [#__fields_groups] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields_groups] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__fields_groups", 'modified';
+ALTER TABLE [#__fields_groups] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__fields_groups] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__finder_filters", 'created';
+ALTER TABLE [#__finder_filters] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_filters] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__finder_filters", 'modified';
+ALTER TABLE [#__finder_filters] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_filters] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__finder_filters", 'checked_out_time';
+ALTER TABLE [#__finder_filters] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_filters] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__finder_links", 'indexdate';
+ALTER TABLE [#__finder_links] ALTER COLUMN [indexdate] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [indexdate];
+
+EXECUTE "#removeDefault" "#__finder_links", 'publish_start_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [publish_start_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_start_date];
+
+EXECUTE "#removeDefault" "#__finder_links", 'publish_end_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [publish_end_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_end_date];
+
+EXECUTE "#removeDefault" "#__finder_links", 'start_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [start_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [start_date];
+
+EXECUTE "#removeDefault" "#__finder_links", 'end_date';
+ALTER TABLE [#__finder_links] ALTER COLUMN [end_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__finder_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [end_date];
+
+EXECUTE "#removeDefault" "#__menu", 'checked_out_time';
+ALTER TABLE [#__menu] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__menu] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__messages", 'date_time';
+ALTER TABLE [#__messages] ALTER COLUMN [date_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__messages] ADD DEFAULT '1900-01-01 00:00:00' FOR [date_time];
+
+EXECUTE "#removeDefault" "#__modules", 'checked_out_time';
+ALTER TABLE [#__modules] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__modules] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__modules", 'publish_up';
+ALTER TABLE [#__modules] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__modules] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__modules", 'publish_down';
+ALTER TABLE [#__modules] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__modules] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'checked_out_time';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'created';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [created] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [created];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'modified';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [modified] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'publish_up';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__newsfeeds", 'publish_down';
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__newsfeeds] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__redirect_links", 'created_date';
+ALTER TABLE [#__redirect_links] ALTER COLUMN [created_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__redirect_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_date];
+
+DROP INDEX [idx_link_modifed] ON [#__redirect_links];
+EXECUTE "#removeDefault" "#__redirect_links", 'modified_date';
+ALTER TABLE [#__redirect_links] ALTER COLUMN [modified_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__redirect_links] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_date];
+CREATE NONCLUSTERED INDEX [idx_link_modifed2] ON [#__redirect_links](
+	[modified_date] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__tags", 'checked_out_time';
+ALTER TABLE [#__tags] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__tags", 'created_time';
+ALTER TABLE [#__tags] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__tags", 'modified_time';
+ALTER TABLE [#__tags] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__tags", 'publish_up';
+ALTER TABLE [#__tags] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__tags", 'publish_down';
+ALTER TABLE [#__tags] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__tags] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_checked_out_time';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_checked_out_time];
+
+DROP INDEX [idx_created_time] ON [#__ucm_content];
+EXECUTE "#removeDefault" "#__ucm_content", 'core_created_time';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_created_time];
+CREATE NONCLUSTERED INDEX [idx_created_time2] ON [#__ucm_content](
+	[core_created_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+DROP INDEX [idx_modified_time] ON [#__ucm_content];
+EXECUTE "#removeDefault" "#__ucm_content", 'core_modified_time';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_modified_time];
+CREATE NONCLUSTERED INDEX [idx_modified_time2] ON [#__ucm_content](
+	[core_modified_time] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_publish_up';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_publish_up];
+
+EXECUTE "#removeDefault" "#__ucm_content", 'core_publish_down';
+ALTER TABLE [#__ucm_content] ALTER COLUMN [core_publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_content] ADD DEFAULT '1900-01-01 00:00:00' FOR [core_publish_down];
+
+DROP INDEX [idx_save_date] ON [#__ucm_history];
+EXECUTE "#removeDefault" "#__ucm_history", 'save_date';
+ALTER TABLE [#__ucm_history] ALTER COLUMN [save_date] [datetime2](0) NOT NULL;
+ALTER TABLE [#__ucm_history] ADD DEFAULT '1900-01-01 00:00:00' FOR [save_date];
+CREATE NONCLUSTERED INDEX [idx_save_date2] ON [#__ucm_history](
+	[save_date] ASC
+)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
+
+EXECUTE "#removeDefault" "#__user_notes", 'checked_out_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [checked_out_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [checked_out_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'created_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [created_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [created_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'modified_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [modified_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [modified_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'review_time';
+ALTER TABLE [#__user_notes] ALTER COLUMN [review_time] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [review_time];
+
+EXECUTE "#removeDefault" "#__user_notes", 'publish_up';
+ALTER TABLE [#__user_notes] ALTER COLUMN [publish_up] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_up];
+
+EXECUTE "#removeDefault" "#__user_notes", 'publish_down';
+ALTER TABLE [#__user_notes] ALTER COLUMN [publish_down] [datetime2](0) NOT NULL;
+ALTER TABLE [#__user_notes] ADD DEFAULT '1900-01-01 00:00:00' FOR [publish_down];
+
+EXECUTE "#removeDefault" "#__users", 'registerDate';
+ALTER TABLE [#__users] ALTER COLUMN [registerDate] [datetime2](0) NOT NULL;
+ALTER TABLE [#__users] ADD DEFAULT '1900-01-01 00:00:00' FOR [registerDate];
+
+EXECUTE "#removeDefault" "#__users", 'lastvisitDate';
+ALTER TABLE [#__users] ALTER COLUMN [lastvisitDate] [datetime2](0) NOT NULL;
+ALTER TABLE [#__users] ADD DEFAULT '1900-01-01 00:00:00' FOR [lastvisitDate];
+
+EXECUTE "#removeDefault" "#__users", 'lastResetTime';
+ALTER TABLE [#__users] ALTER COLUMN [lastResetTime] [datetime2](0) NOT NULL;
+ALTER TABLE [#__users] ADD DEFAULT '1900-01-01 00:00:00' FOR [lastResetTime];
+
+DROP PROCEDURE "#removeDefault";
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql
new file mode 100644
index 00000000..aaf6bf4a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-02-17.sql
@@ -0,0 +1,21 @@
+-- Normalize contact_details table default values.
+DECLARE @table AS nvarchar(32)
+DECLARE @constraintName AS nvarchar(100)
+DECLARE @constraintQuery AS nvarchar(1000)
+SET QUOTED_IDENTIFIER OFF
+SET @table = "#__contact_details"
+SET QUOTED_IDENTIFIER ON
+SELECT @constraintName = name FROM sys.default_constraints
+WHERE parent_object_id = object_id(@table)
+AND parent_column_id = columnproperty(object_id(@table), 'name', 'ColumnId')
+SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
+EXECUTE sp_executesql @constraintQuery;
+
+ALTER TABLE [#__contact_details] ADD DEFAULT (0) FOR [published];
+ALTER TABLE [#__contact_details] ADD DEFAULT (0) FOR [checked_out];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [created_by_alias];
+
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname1];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname2];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname3];
+ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [xreference];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-03.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-03.sql
new file mode 100644
index 00000000..94af5bdc
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-03.sql
@@ -0,0 +1,31 @@
+CREATE PROCEDURE "#removeDefault"
+(
+	@table NVARCHAR(100),
+	@column NVARCHAR(100)
+)
+AS
+BEGIN
+	DECLARE @constraintName AS nvarchar(100)
+	DECLARE @constraintQuery AS nvarchar(1000)
+	SELECT @constraintName = name FROM sys.default_constraints
+		WHERE parent_object_id = object_id(@table)
+		AND parent_column_id = columnproperty(object_id(@table), @column, 'ColumnId')
+	SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
+	EXECUTE sp_executesql @constraintQuery
+END;
+
+EXECUTE "#removeDefault" "#__extensions", 'system_data';
+EXECUTE "#removeDefault" "#__updates", 'data';
+
+ALTER TABLE "#__content" ADD DEFAULT ('') FOR "xreference";
+ALTER TABLE "#__newsfeeds" ADD DEFAULT ('') FOR "xreference";
+
+-- Delete wrong unique index
+DROP INDEX "idx_access" ON "#__languages";
+
+-- Add missing unique index
+ALTER TABLE "#__languages" ADD CONSTRAINT "#__languages$idx_langcode" UNIQUE ("lang_code") ON [PRIMARY];
+
+-- Add missing index keys
+CREATE INDEX "idx_access" ON "#__languages" ("access");
+CREATE INDEX "idx_ordering" ON "#__languages" ("ordering");
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-09.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-09.sql
new file mode 100644
index 00000000..feb0fc10
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-03-09.sql
@@ -0,0 +1,19 @@
+UPDATE "#__categories" SET published = 1 WHERE alias = 'root';
+UPDATE "c"
+SET published = c2.newPublished
+FROM "#__categories" AS "c"
+INNER JOIN (
+SELECT c2.id,CASE WHEN MIN(p.published) > 0 THEN MAX(p.published) ELSE MIN(p.published) END AS newPublished
+FROM "#__categories" AS "c2"
+INNER JOIN "#__categories" AS "p" ON p.lft <= c2.lft AND c2.rgt <= p.rgt
+GROUP BY c2.id) AS c2 ON c2.id = c.id;
+
+UPDATE "#__menu" SET published = 1 WHERE alias = 'root';
+UPDATE "c"
+SET published = c2.newPublished
+FROM "#__menu" AS "c"
+INNER JOIN (
+SELECT c2.id,CASE WHEN MIN(p.published) > 0 THEN MAX(p.published) ELSE MIN(p.published) END AS newPublished
+FROM "#__menu" AS "c2"
+INNER JOIN "#__menu" AS "p" ON p.lft <= c2.lft AND c2.rgt <= p.rgt
+GROUP BY c2.id) AS c2 ON c2.id = c.id;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-10.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-10.sql
new file mode 100644
index 00000000..c8a2f4d9
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-10.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'TPL_HATHOR_MESSAGE_POSTINSTALL_TITLE', 'TPL_HATHOR_MESSAGE_POSTINSTALL_BODY', 'TPL_HATHOR_MESSAGE_POSTINSTALL_ACTION', 'tpl_hathor', 1, 'action', 'admin://templates/hathor/postinstall/hathormessage.php', 'hathormessage_postinstall_action', 'admin://templates/hathor/postinstall/hathormessage.php', 'hathormessage_postinstall_condition', '3.7.0', 1);
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-19.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-19.sql
new file mode 100644
index 00000000..042487bc
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2017-04-19.sql
@@ -0,0 +1,3 @@
+-- Set integer field default values.
+UPDATE [#__extensions] SET [params] = '{"multiple":"0","first":"1","last":"100","step":"1"}' WHERE [name] = 'plg_fields_integer';
+
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.4-2017-07-05.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.4-2017-07-05.sql
new file mode 100644
index 00000000..5fa10e2f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.7.4-2017-07-05.sql
@@ -0,0 +1 @@
+DELETE FROM [#__postinstall_messages] WHERE [title_key] = 'COM_CPANEL_MSG_PHPVERSION_TITLE';
\ No newline at end of file
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql
new file mode 100644
index 00000000..b25399e2
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-28.sql
@@ -0,0 +1 @@
+ALTER TABLE [#__fields_groups] ADD [params] [text] NOT NULL DEFAULT '';
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql
new file mode 100644
index 00000000..b9ed858f
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.0-2017-07-31.sql
@@ -0,0 +1,4 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state")
+VALUES
+  (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 0, 1, 0, '', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+  (479, 0, 'plg_sampledata_blog', 'plugin', 'blog', 'sampledata', 0, 0, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql
new file mode 100644
index 00000000..72df8133
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.2-2017-10-14.sql
@@ -0,0 +1,8 @@
+--
+-- Add index for alias check #__content
+--
+
+CREATE NONCLUSTERED INDEX [idx_alias] ON [#__content]
+(
+	[alias] ASC
+)WITH (STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.4-2018-01-16.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.4-2018-01-16.sql
new file mode 100644
index 00000000..15c43cf5
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.4-2018-01-16.sql
@@ -0,0 +1,2 @@
+ALTER TABLE [#__user_keys] DROP CONSTRAINT [#__user_keys$series_2];
+ALTER TABLE [#__user_keys] DROP CONSTRAINT [#__user_keys$series_3];
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.6-2018-02-14.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.6-2018-02-14.sql
new file mode 100644
index 00000000..29ad515a
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.6-2018-02-14.sql
@@ -0,0 +1,6 @@
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(480, 0, 'plg_system_sessiongc', 'plugin', 'sessiongc', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0);
+
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(700, 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_TITLE', 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_BODY', 'PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_ACTION', 'plg_captcha_recaptcha', 1, 'action', 'site://plugins/captcha/recaptcha/postinstall/actions.php', 'recaptcha_postinstall_action', 'site://plugins/captcha/recaptcha/postinstall/actions.php', 'recaptcha_postinstall_condition', '3.8.6', 1);
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.8-2018-05-18.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.8-2018-05-18.sql
new file mode 100644
index 00000000..f4c1998c
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.8-2018-05-18.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE', 'COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/updatedefaultsettings.php', 'admin_postinstall_updatedefaultsettings_condition', '3.8.8', 1;
diff --git a/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.9-2018-06-19.sql b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.9-2018-06-19.sql
new file mode 100644
index 00000000..e1f8d0af
--- /dev/null
+++ b/core/administrator/components/com_admin/sql/updates/sqlazure/3.8.9-2018-06-19.sql
@@ -0,0 +1,3 @@
+-- Enable Sample Data Module.
+UPDATE [#__extensions] SET [enabled] = '1' WHERE [name] = 'mod_sampledata';
+
diff --git a/core/administrator/components/com_admin/views/help/tmpl/default.php b/core/administrator/components/com_admin/views/help/tmpl/default.php
new file mode 100644
index 00000000..f839eac9
--- /dev/null
+++ b/core/administrator/components/com_admin/views/help/tmpl/default.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">
+	<div class="row-fluid">
+		<div id="sidebar" class="span3">
+			<div class="clearfix"></div>
+			<div class="sidebar-nav">
+				<ul class="nav nav-list">
+					<li><?php echo JHtml::_('link', JHelp::createUrl('JHELP_START_HERE'), JText::_('COM_ADMIN_START_HERE'), array('target' => 'helpFrame')); ?></li>
+					<li><?php echo JHtml::_('link', $this->latest_version_check, JText::_('COM_ADMIN_LATEST_VERSION_CHECK'), array('target' => 'helpFrame')); ?></li>
+					<li><?php echo JHtml::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', JText::_('COM_ADMIN_LICENSE'), array('target' => 'helpFrame')); ?></li>
+					<li><?php echo JHtml::_('link', JHelp::createUrl('JHELP_GLOSSARY'), JText::_('COM_ADMIN_GLOSSARY'), array('target' => 'helpFrame')); ?></li>
+					<li class="divider"></li>
+					<li class="nav-header"><?php echo JText::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
+					<?php foreach ($this->toc as $k => $v) : ?>
+						<li>
+							<?php $url = JHelp::createUrl('JHELP_' . strtoupper($k)); ?>
+							<?php echo JHtml::_('link', $url, $v, array('target' => 'helpFrame')); ?>
+						</li>
+					<?php endforeach; ?>
+				</ul>
+			</div>
+		</div>
+		<div class="span9">
+			<iframe name="helpFrame" title="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
+		</div>
+	</div>
+	<input class="textarea" type="hidden" name="option" value="com_admin" />
+</form>
diff --git a/core/administrator/components/com_admin/views/help/tmpl/default.xml b/core/administrator/components/com_admin/views/help/tmpl/default.xml
new file mode 100755
index 00000000..098e8f18
--- /dev/null
+++ b/core/administrator/components/com_admin/views/help/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_ADMIN_HELP_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_ADMIN_HELP_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_admin/views/help/tmpl/langforum.php b/core/administrator/components/com_admin/views/help/tmpl/langforum.php
new file mode 100644
index 00000000..a0900033
--- /dev/null
+++ b/core/administrator/components/com_admin/views/help/tmpl/langforum.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFactory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR, null, false, true);
+
+$forumId   = (int) JText::_('MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE');
+
+if (empty($forumId))
+{
+	$forumId = 511;
+}
+
+$forum_url = 'https://forum.joomla.org/viewforum.php?f=' . $forumId;
+
+JFactory::getApplication()->redirect($forum_url);
diff --git a/core/administrator/components/com_admin/views/help/view.html.php b/core/administrator/components/com_admin/views/help/view.html.php
new file mode 100644
index 00000000..0c1ae713
--- /dev/null
+++ b/core/administrator/components/com_admin/views/help/view.html.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Admin component
+ *
+ * @since  1.6
+ */
+class AdminViewHelp extends JViewLegacy
+{
+	/**
+	 * The search string
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $help_search = null;
+
+	/**
+	 * The page to be viewed
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $page = null;
+
+	/**
+	 * The iso language tag
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $lang_tag = null;
+
+	/**
+	 * Table of contents
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $toc = array();
+
+	/**
+	 * URL for the latest version check
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $latest_version_check = 'https://downloads.joomla.org/latest';
+
+	/**
+	 * URL for the start here link
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $start_here = null;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->help_search          = $this->get('HelpSearch');
+		$this->page                 = $this->get('Page');
+		$this->toc                  = $this->get('Toc');
+		$this->lang_tag             = $this->get('LangTag');
+		$this->latest_version_check = $this->get('LatestVersionCheck');
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Setup the Toolbar
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_ADMIN_HELP'), 'support help_header');
+	}
+}
diff --git a/core/administrator/components/com_admin/views/profile/tmpl/edit.php b/core/administrator/components/com_admin/views/profile/tmpl/edit.php
new file mode 100644
index 00000000..e21f3367
--- /dev/null
+++ b/core/administrator/components/com_admin/views/profile/tmpl/edit.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "profile.cancel" || document.formvalidator.isValid(document.getElementById("profile-form")))
+		{
+			Joomla.submitform(task, document.getElementById("profile-form"));
+		}
+	};
+');
+
+// Load chosen.css
+JHtml::_('formbehavior.chosen', 'select');
+
+// Get the form fieldsets.
+$fieldsets = $this->form->getFieldsets();
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id=' . $this->item->id); ?>" method="post" name="adminForm" id="profile-form" class="form-validate form-horizontal" enctype="multipart/form-data">
+	<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'account')); ?>
+
+	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'account', JText::_('COM_ADMIN_USER_ACCOUNT_DETAILS')); ?>
+	<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls">
+				<?php if ($field->fieldname == 'password2') : ?>
+					<?php // Disables autocomplete ?> <input type="password" style="display:none">
+				<?php endif; ?>
+				<?php echo $field->input; ?>
+			</div>
+		</div>
+	<?php endforeach; ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+	<?php foreach ($fieldsets as $fieldset) : ?>
+		<?php
+		if ($fieldset->name == 'user_details')
+		{
+			continue;
+		}
+		?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', $fieldset->name, JText::_($fieldset->label)); ?>
+		<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
+			<?php if ($field->hidden) : ?>
+				<div class="control-group">
+					<div class="controls"><?php echo $field->input; ?></div>
+				</div>
+			<?php else : ?>
+				<div class="control-group">
+					<div class="control-label"><?php echo $field->label; ?></div>
+					<div class="controls"><?php echo $field->input; ?></div>
+				</div>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php endforeach; ?>
+
+	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_admin/views/profile/view.html.php b/core/administrator/components/com_admin/views/profile/view.html.php
new file mode 100644
index 00000000..3184d7d6
--- /dev/null
+++ b/core/administrator/components/com_admin/views/profile/view.html.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class to allow users edit their own profile.
+ *
+ * @since  1.6
+ */
+class AdminViewProfile extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var    JForm
+	 * @since  1.6
+	 */
+	protected $form;
+
+	/**
+	 * The item being viewed
+	 *
+	 * @var    object
+	 * @since  1.6
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var    object
+	 * @since  1.6
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->form->setValue('password',	null);
+		$this->form->setValue('password2',	null);
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', 1);
+
+		JToolbarHelper::title(JText::_('COM_ADMIN_VIEW_PROFILE_TITLE'), 'user user-profile');
+		JToolbarHelper::apply('profile.apply');
+		JToolbarHelper::save('profile.save');
+		JToolbarHelper::cancel('profile.cancel', 'JTOOLBAR_CLOSE');
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_ADMIN_USER_PROFILE_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default.php b/core/administrator/components/com_admin/views/sysinfo/tmpl/default.php
new file mode 100644
index 00000000..66a2774f
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Add specific helper files for html generation
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_admin&view=sysinfo'); ?>" method="post" name="adminForm" id="adminForm">
+	<div class="row-fluid">
+		<!-- Begin Content -->
+		<div class="span12">
+			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'site')); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'site', JText::_('COM_ADMIN_SYSTEM_INFORMATION')); ?>
+			<?php echo $this->loadTemplate('system'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'phpsettings', JText::_('COM_ADMIN_PHP_SETTINGS')); ?>
+			<?php echo $this->loadTemplate('phpsettings'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'config', JText::_('COM_ADMIN_CONFIGURATION_FILE')); ?>
+			<?php echo $this->loadTemplate('config'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS')); ?>
+			<?php echo $this->loadTemplate('directory'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'phpinfo', JText::_('COM_ADMIN_PHP_INFORMATION')); ?>
+			<?php echo $this->loadTemplate('phpinfo'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		</div>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+		<!-- End Content -->
+	</div>
+</form>
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default.xml b/core/administrator/components/com_admin/views/sysinfo/tmpl/default.xml
new file mode 100755
index 00000000..479fa920
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_ADMIN_SYSINFO_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_ADMIN_SYSINFO_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
new file mode 100644
index 00000000..12c59f96
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_CONFIGURATION_FILE'); ?></legend>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="300">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php foreach ($this->config as $key => $value) : ?>
+				<tr>
+					<td>
+						<?php echo $key; ?>
+					</td>
+					<td>
+						<?php echo htmlspecialchars($value, ENT_QUOTES); ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
new file mode 100644
index 00000000..2e5686af
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS'); ?></legend>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="650">
+					<?php echo JText::_('COM_ADMIN_DIRECTORY'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_STATUS'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php foreach ($this->directory as $dir => $info) : ?>
+				<tr>
+					<td>
+						<?php echo JHtml::_('directory.message', $dir, $info['message']); ?>
+					</td>
+					<td>
+						<?php echo JHtml::_('directory.writable', $info['writable']); ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php
new file mode 100644
index 00000000..76050b4f
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_PHP_INFORMATION'); ?></legend>
+	<?php echo $this->php_info; ?>
+</fieldset>
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php
new file mode 100644
index 00000000..b34fe0e1
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_RELEVANT_PHP_SETTINGS'); ?></legend>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="250">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;
+				</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SAFE_MODE'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['safe_mode']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_OPEN_BASEDIR'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.string', $this->php_settings['open_basedir']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_DISPLAY_ERRORS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['display_errors']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SHORT_OPEN_TAGS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['short_open_tag']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_FILE_UPLOADS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['file_uploads']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_MAGIC_QUOTES'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['magic_quotes_gpc']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_REGISTER_GLOBALS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['register_globals']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_OUTPUT_BUFFERING'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['output_buffering']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SESSION_SAVE_PATH'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.string', $this->php_settings['session.save_path']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SESSION_AUTO_START'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.integer', $this->php_settings['session.auto_start']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_XML_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['xml']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_ZLIB_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['zlib']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_ZIP_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['zip']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_DISABLED_FUNCTIONS'); ?>
+				</td>
+				<td class="break-word">
+					<?php echo JHtml::_('phpsetting.string', $this->php_settings['disable_functions']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_MBSTRING_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['mbstring']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_ICONV_AVAILABLE'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['iconv']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_MAX_INPUT_VARS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.integer', $this->php_settings['max_input_vars']); ?>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
new file mode 100644
index 00000000..3fe026dc
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_SYSTEM_INFORMATION'); ?></legend>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="25%">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_PHP_BUILT_ON'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['php']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_DATABASE_TYPE'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['dbserver']; ?>
+				</td>
+			</tr>			
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_DATABASE_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['dbversion']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_DATABASE_COLLATION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['dbcollation']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_DATABASE_CONNECTION_COLLATION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['dbconnectioncollation']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_PHP_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['phpversion']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_WEB_SERVER'); ?></strong>
+				</td>
+				<td>
+					<?php echo JHtml::_('system.server', $this->info['server']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['sapi_name']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_JOOMLA_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['version']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_PLATFORM_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['platform']; ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_USER_AGENT'); ?></strong>
+				</td>
+				<td>
+					<?php echo htmlspecialchars($this->info['useragent'], ENT_COMPAT, 'UTF-8'); ?>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/components/com_admin/views/sysinfo/view.html.php b/core/administrator/components/com_admin/views/sysinfo/view.html.php
new file mode 100644
index 00000000..6997bddf
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/view.html.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Sysinfo View class for the Admin component
+ *
+ * @since  1.6
+ */
+class AdminViewSysinfo extends JViewLegacy
+{
+	/**
+	 * Some PHP settings
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $php_settings = array();
+
+	/**
+	 * Config values
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $config = array();
+
+	/**
+	 * Some system values
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $info = array();
+
+	/**
+	 * PHP info
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $php_info = null;
+
+	/**
+	 * Information about writable state of directories
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $directory = array();
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		// Access check.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		$this->php_settings = $this->get('PhpSettings');
+		$this->config       = $this->get('config');
+		$this->info         = $this->get('info');
+		$this->php_info     = $this->get('PhpInfo');
+		$this->directory    = $this->get('directory');
+
+		$this->addToolbar();
+		$this->_setSubMenu();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Setup the SubMenu
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @note    Necessary for Hathor compatibility
+	 * @deprecated  4.0 To be removed with Hathor
+	 */
+	protected function _setSubMenu()
+	{
+		try
+		{
+			$contents = $this->loadTemplate('navigation');
+			$document = JFactory::getDocument();
+			$document->setBuffer($contents, 'modules', 'submenu');
+		}
+		catch (Exception $e)
+		{
+		}
+	}
+
+	/**
+	 * Setup the Toolbar
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-2 systeminfo');
+		JToolbarHelper::link(JRoute::_('index.php?option=com_admin&view=sysinfo&format=text'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT', 'download');
+		JToolbarHelper::link(JRoute::_('index.php?option=com_admin&view=sysinfo&format=json'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON', 'download');
+		JToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
+	}
+}
diff --git a/core/administrator/components/com_admin/views/sysinfo/view.json.php b/core/administrator/components/com_admin/views/sysinfo/view.json.php
new file mode 100644
index 00000000..c3f010b1
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/view.json.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Sysinfo View class for the Admin component
+ *
+ * @since  3.5
+ */
+class AdminViewSysinfo extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.5
+	 */
+	public function display($tpl = null)
+	{
+		// Access check.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		header('MIME-Version: 1.0');
+		header('Content-Disposition: attachment; filename="systeminfo-' . date('c') . '.json"');
+		header('Content-Transfer-Encoding: binary');
+
+		$data = $this->getLayoutData();
+
+		echo json_encode($data);
+
+		JFactory::getApplication()->close();
+	}
+
+	/**
+	 * Get the data for the view
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutData()
+	{
+		$model = $this->getModel();
+
+		return array(
+			'info'        => $model->getSafeData('info'),
+			'phpSettings' => $model->getSafeData('phpSettings'),
+			'config'      => $model->getSafeData('config'),
+			'directories' => $model->getSafeData('directory', true),
+			'phpInfo'     => $model->getSafeData('phpInfoArray'),
+			'extensions'  => $model->getSafeData('extensions')
+		);
+	}
+}
diff --git a/core/administrator/components/com_admin/views/sysinfo/view.text.php b/core/administrator/components/com_admin/views/sysinfo/view.text.php
new file mode 100644
index 00000000..dd8c833a
--- /dev/null
+++ b/core/administrator/components/com_admin/views/sysinfo/view.text.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Sysinfo View class for the Admin component
+ *
+ * @since  3.5
+ */
+class AdminViewSysinfo extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.5
+	 */
+	public function display($tpl = null)
+	{
+		// Access check.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		header('Content-Type: text/plain; charset=utf-8');
+		header('Content-Description: File Transfer');
+		header('Content-Disposition: attachment; filename="systeminfo-' . date('c') . '.txt"');
+		header('Cache-Control: must-revalidate');
+
+		$data = $this->getLayoutData();
+
+		$lines = array();
+
+		foreach ($data as $sectionName => $section)
+		{
+			$customRenderingMethod = 'render' . ucfirst($sectionName);
+
+			if (method_exists($this, $customRenderingMethod))
+			{
+				$lines[] = $this->$customRenderingMethod($section['title'], $section['data']);
+			}
+			else
+			{
+				$lines[] = $this->renderSection($section['title'], $section['data']);
+			}
+		}
+
+		echo str_replace(JPATH_ROOT, 'xxxxxx', implode("\n\n", $lines));
+
+		JFactory::getApplication()->close();
+	}
+
+	/**
+	 * Get the data for the view
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutData()
+	{
+		$model = $this->getModel();
+
+		return array(
+			'info' => array(
+				'title' => JText::_('COM_ADMIN_SYSTEM_INFORMATION', true),
+				'data'  => $model->getSafeData('info')
+			),
+			'phpSettings' => array(
+				'title' => JText::_('COM_ADMIN_PHP_SETTINGS', true),
+				'data'  => $model->getSafeData('phpSettings')
+			),
+			'config' => array(
+				'title' => JText::_('COM_ADMIN_CONFIGURATION_FILE', true),
+				'data'  => $model->getSafeData('config')
+			),
+			'directories' => array(
+				'title' => JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS', true),
+				'data'  => $model->getSafeData('directory', true)
+			),
+			'phpInfo' => array(
+				'title' => JText::_('COM_ADMIN_PHP_INFORMATION', true),
+				'data'  => $model->getSafeData('phpInfoArray')
+			),
+			'extensions' => array(
+				'title' => JText::_('COM_ADMIN_EXTENSIONS', true),
+				'data'  => $model->getSafeData('extensions')
+			)
+		);
+	}
+
+	/**
+	 * Render a section
+	 *
+	 * @param   string   $sectionName  Name of the section to render
+	 * @param   array    $sectionData  Data of the section to render
+	 * @param   integer  $level        Depth level for indentation
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	protected function renderSection($sectionName, $sectionData, $level = 0)
+	{
+		$lines = array();
+
+		$margin = ($level > 0) ? str_repeat("\t", $level) : null;
+
+		$lines[] = $margin . '=============';
+		$lines[] = $margin . $sectionName;
+		$lines[] = $margin . '=============';
+		$level++;
+
+		foreach ($sectionData as $name => $value)
+		{
+			if (is_array($value))
+			{
+				if ($name == 'Directive')
+				{
+					continue;
+				}
+
+				$lines[] = '';
+				$lines[] = $this->renderSection($name, $value, $level);
+			}
+			else
+			{
+				if (is_bool($value))
+				{
+					$value = $value ? 'true' : 'false';
+				}
+
+				if (is_int($name) && ($name == 0 || $name == 1))
+				{
+					$name = ($name == 0 ? 'Local Value' : 'Master Value');
+				}
+
+				$lines[] = $margin . $name . ': ' . $value;
+			}
+		}
+
+		return implode("\n", $lines);
+	}
+
+	/**
+	 * Specific rendering for directories
+	 *
+	 * @param   string   $sectionName  Name of the section
+	 * @param   array    $sectionData  Directories information
+	 * @param   integer  $level        Starting level
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	protected function renderDirectories($sectionName, $sectionData, $level = -1)
+	{
+		foreach ($sectionData as $directory => $data)
+		{
+			$sectionData[$directory] = $data['writable'] ? ' writable' : ' NOT writable';
+		}
+
+		return $this->renderSection($sectionName, $sectionData, $level);
+	}
+}
diff --git a/core/administrator/components/com_ajax/ajax.php b/core/administrator/components/com_ajax/ajax.php
new file mode 100644
index 00000000..0bbcfdf5
--- /dev/null
+++ b/core/administrator/components/com_ajax/ajax.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_ajax
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+require_once JPATH_SITE . '/components/com_ajax/ajax.php';
diff --git a/core/administrator/components/com_ajax/ajax.xml b/core/administrator/components/com_ajax/ajax.xml
new file mode 100644
index 00000000..81da9b53
--- /dev/null
+++ b/core/administrator/components/com_ajax/ajax.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.2" method="upgrade">
+	<name>com_ajax</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2013</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.0</version>
+	<description>COM_AJAX_XML_DESCRIPTION</description>
+
+	<files folder="site">
+		<filename>ajax.php</filename>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_ajax.ini</language>
+	</languages>
+
+	<administration>
+		<files folder="admin">
+			<filename>ajax.php</filename>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_ajax.ini</language>
+			<language tag="en-GB">language/en-GB.com_ajax.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_associations/access.xml b/core/administrator/components/com_associations/access.xml
new file mode 100644
index 00000000..e6fd1ec5
--- /dev/null
+++ b/core/administrator/components/com_associations/access.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_associations">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_associations/associations.php b/core/administrator/components/com_associations/associations.php
new file mode 100644
index 00000000..67bbd255
--- /dev/null
+++ b/core/administrator/components/com_associations/associations.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_associations'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+JLoader::register('AssociationsHelper', __DIR__ . '/helpers/associations.php');
+
+// Check if user has permission to access the component item type.
+$itemtype = JFactory::getApplication()->input->get('itemtype', '', 'string');
+
+if ($itemtype !== '')
+{
+	list($extensionName, $typeName) = explode('.', $itemtype);
+
+	if (!AssociationsHelper::hasSupport($extensionName))
+	{
+		throw new Exception(JText::sprintf('COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED', JText::_($extensionName)), 404);
+	}
+
+	if (!JFactory::getUser()->authorise('core.manage', $extensionName))
+	{
+		throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+	}
+}
+
+$controller = JControllerLegacy::getInstance('Associations');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_associations/associations.xml b/core/administrator/components/com_associations/associations.xml
new file mode 100644
index 00000000..751df652
--- /dev/null
+++ b/core/administrator/components/com_associations/associations.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.7" method="upgrade">
+	<name>com_associations</name>
+	<author>Joomla! Project</author>
+	<creationDate>Januar 2017</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>COM_ASSOCIATIONS_XML_DESCRIPTION</description>
+	<administration>
+		<menu img="class:associations">COM_ASSOCIATIONS</menu>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>associations.php</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>layouts</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_associations.ini</language>
+			<language tag="en-GB">language/en-GB.com_associations.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_associations/config.xml b/core/administrator/components/com_associations/config.xml
new file mode 100644
index 00000000..1074b48e
--- /dev/null
+++ b/core/administrator/components/com_associations/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC" >
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_associations"
+			section="component"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_associations/controller.php b/core/administrator/components/com_associations/controller.php
new file mode 100644
index 00000000..f6dd3579
--- /dev/null
+++ b/core/administrator/components/com_associations/controller.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Component Controller
+ *
+ * @since  3.7.0
+ */
+class AssociationsController extends JControllerLegacy
+{
+	/**
+	 * The default view.
+	 *
+	 * @var     string
+	 *
+	 * @since   3.7.0
+	 */
+	protected $default_view = 'associations';
+}
diff --git a/core/administrator/components/com_associations/controllers/association.php b/core/administrator/components/com_associations/controllers/association.php
new file mode 100644
index 00000000..d37d6a77
--- /dev/null
+++ b/core/administrator/components/com_associations/controllers/association.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+/**
+ * Association edit controller class.
+ *
+ * @since  3.7.0
+ */
+class AssociationsControllerAssociation extends JControllerForm
+{
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *                           (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   3.7.0
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'));
+
+		$id = $this->input->get('id', 0, 'int');
+
+		// Check if reference item can be edited.
+		if (!AssociationsHelper::allowEdit($extensionName, $typeName, $id))
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_associations&view=associations', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+
+	/**
+	 * Method for canceling the edit action
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function cancel($key = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'));
+
+		// Only check in, if component item type allows to check out.
+		if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName))
+		{
+			$ids      = array();
+			$targetId = $this->input->get('target-id', '', 'string');
+
+			if ($targetId !== '')
+			{
+				$ids = array_unique(explode(',', $targetId));
+			}
+
+			$ids[] = $this->input->get('id', 0, 'int');
+
+			foreach ($ids as $key => $id)
+			{
+				AssociationsHelper::getItem($extensionName, $typeName, $id)->checkin();
+			}
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_associations&view=associations', false));
+	}
+}
diff --git a/core/administrator/components/com_associations/controllers/associations.php b/core/administrator/components/com_associations/controllers/associations.php
new file mode 100644
index 00000000..6ef44726
--- /dev/null
+++ b/core/administrator/components/com_associations/controllers/associations.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+/**
+ * Associations controller class.
+ *
+ * @since  3.7.0
+ */
+class AssociationsControllerAssociations extends JControllerAdmin
+{
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 *
+	 * @since  3.7.0
+	 */
+	protected $view_list = 'associations';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  JModel|boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function getModel($name = 'Associations', $prefix = 'AssociationsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to purge the associations table.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function purge()
+	{
+		$this->getModel('associations')->purge();
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+	}
+
+	/**
+	 * Method to delete the orphans from the associations table.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function clean()
+	{
+		$this->getModel('associations')->clean();
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+	}
+
+	/**
+	 * Method to check in an item from the association item overview.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.1
+	 */
+	public function checkin()
+	{
+		// Set the redirect so we can just stop processing when we find a condition we can't process
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+
+		// Figure out if the item supports checking and check it in
+		$type = null;
+
+		list($extensionName, $typeName) = explode('.', $this->input->get('itemtype'));
+
+		$extension = AssociationsHelper::getSupportedExtension($extensionName);
+		$types     = $extension->get('types');
+
+		if (!array_key_exists($typeName, $types))
+		{
+			return;
+		}
+
+		if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName) === false)
+		{
+			// How on earth we came to that point, eject internet
+			return;
+		}
+
+		$cid = $this->input->get('cid', array(), 'array');
+
+		if (empty($cid))
+		{
+			// Seems we don't have an id to work with.
+			return;
+		}
+
+		// We know the first element is the one we need because we don't allow multi selection of rows
+		$id = $cid[0];
+
+		if (AssociationsHelper::canCheckinItem($extensionName, $typeName, $id) === true)
+		{
+			$item = AssociationsHelper::getItem($extensionName, $typeName, $id);
+
+			$item->checkIn($id);
+
+			return;
+		}
+
+		$this->setRedirect(
+			JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list),
+			JText::_('COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM')
+		);
+
+		return;
+	}
+}
diff --git a/core/administrator/components/com_associations/helpers/associations.php b/core/administrator/components/com_associations/helpers/associations.php
new file mode 100644
index 00000000..be4e55b7
--- /dev/null
+++ b/core/administrator/components/com_associations/helpers/associations.php
@@ -0,0 +1,664 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\CMS\Language\LanguageHelper;
+
+/**
+ * Associations component helper.
+ *
+ * @since  3.7.0
+ */
+class AssociationsHelper extends JHelperContent
+{
+	/**
+	 * Array of Registry objects of extensions
+	 *
+	 * var      array   $extensionsSupport
+	 *
+	 * @since   3.7.0
+	 */
+	public static $extensionsSupport = null;
+
+	/**
+	 * List of extensions name with support
+	 *
+	 * var      array   $supportedExtensionsList
+	 *
+	 * @since   3.7.0
+	 */
+	public static $supportedExtensionsList = array();
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getAssociationList($extensionName, $typeName, $itemId)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return array();
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		return $helper->getAssociationList($typeName, $itemId);
+
+	}
+
+	/**
+	 * Get the the instance of the extension helper class
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return  HelperClass|null
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getExtensionHelper($extensionName)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return null;
+		}
+
+		$support = self::$extensionsSupport[$extensionName];
+
+		return $support->get('helper');
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getItem($extensionName, $typeName, $itemId)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return array();
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		return $helper->getItem($typeName, $itemId);
+	}
+
+	/**
+	 * Check if extension supports associations
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public static function hasSupport($extensionName)
+	{
+		if (is_null(self::$extensionsSupport))
+		{
+			self::getSupportedExtensions();
+		}
+
+		return in_array($extensionName, self::$supportedExtensionsList);
+	}
+
+	/**
+	 * Get the extension specific helper class name
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	private static function getExtensionHelperClassName($extensionName)
+	{
+		$realName = self::getExtensionRealName($extensionName);
+
+		return ucfirst($realName) . 'AssociationsHelper';
+	}
+
+	/**
+	 * Get the real extension name. This means without com_
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	private static function getExtensionRealName($extensionName)
+	{
+		return strpos($extensionName, 'com_') === false ? $extensionName : substr($extensionName, 4);
+	}
+
+	/**
+	 * Get the associated language edit links Html.
+	 *
+	 * @param   string   $extensionName   Extension Name
+	 * @param   string   $typeName        ItemType
+	 * @param   integer  $itemId          Item id.
+	 * @param   string   $itemLanguage    Item language code.
+	 * @param   boolean  $addLink         True for adding edit links. False for just text.
+	 * @param   boolean  $assocLanguages  True for showing non associated content languages. False only languages with associations.
+	 *
+	 * @return  string   The language HTML
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getAssociationHtmlList($extensionName, $typeName, $itemId, $itemLanguage, $addLink = true, $assocLanguages = true)
+	{
+		// Get the associations list for this item.
+		$items = self::getAssociationList($extensionName, $typeName, $itemId);
+
+		$titleFieldName = self::getTypeFieldName($extensionName, $typeName, 'title');
+
+		// Get all content languages.
+		$languages = LanguageHelper::getContentLanguages(array(0, 1));
+
+		$canEditReference = self::allowEdit($extensionName, $typeName, $itemId);
+		$canCreate        = self::allowAdd($extensionName, $typeName);
+
+		// Create associated items list.
+		foreach ($languages as $langCode => $language)
+		{
+			// Don't do for the reference language.
+			if ($langCode == $itemLanguage)
+			{
+				continue;
+			}
+
+			// Don't show languages with associations, if we don't want to show them.
+			if ($assocLanguages && isset($items[$langCode]))
+			{
+				unset($items[$langCode]);
+				continue;
+			}
+
+			// Don't show languages without associations, if we don't want to show them.
+			if (!$assocLanguages && !isset($items[$langCode]))
+			{
+				continue;
+			}
+
+			// Get html parameters.
+			if (isset($items[$langCode]))
+			{
+				$title       = $items[$langCode][$titleFieldName];
+				$additional  = '';
+
+				if (isset($items[$langCode]['catid']))
+				{
+					$db = JFactory::getDbo();
+
+					// Get the category name
+					$query = $db->getQuery(true)
+						->select($db->quoteName('title'))
+						->from($db->quoteName('#__categories'))
+						->where($db->quoteName('id') . ' = ' . $db->quote($items[$langCode]['catid']));
+
+					$db->setQuery($query);
+					$category_title = $db->loadResult();
+
+					$additional = '<strong>' . JText::sprintf('JCATEGORY_SPRINTF', $category_title) . '</strong> <br />';
+				}
+				elseif (isset($items[$langCode]['menutype']))
+				{
+					$db = JFactory::getDbo();
+
+					// Get the menutype name
+					$query = $db->getQuery(true)
+						->select($db->quoteName('title'))
+						->from($db->quoteName('#__menu_types'))
+						->where($db->quoteName('menutype') . ' = ' . $db->quote($items[$langCode]['menutype']));
+
+					$db->setQuery($query);
+					$menutype_title = $db->loadResult();
+
+					$additional = '<strong>' . JText::sprintf('COM_MENUS_MENU_SPRINTF', $menutype_title) . '</strong><br />';
+				}
+
+				$labelClass  = '';
+				$target      = $langCode . ':' . $items[$langCode]['id'] . ':edit';
+				$allow       = $canEditReference
+								&& self::allowEdit($extensionName, $typeName, $items[$langCode]['id'])
+								&& self::canCheckinItem($extensionName, $typeName, $items[$langCode]['id']);
+
+				$additional .= $addLink && $allow ? JText::_('COM_ASSOCIATIONS_EDIT_ASSOCIATION') : '';
+			}
+			else
+			{
+				$items[$langCode] = array();
+
+				$title      = JText::_('COM_ASSOCIATIONS_NO_ASSOCIATION');
+				$additional = $addLink ? JText::_('COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION') : '';
+				$labelClass = 'label-warning';
+				$target     = $langCode . ':0:add';
+				$allow      = $canCreate;
+			}
+
+			// Generate item Html.
+			$options   = array(
+				'option'   => 'com_associations',
+				'view'     => 'association',
+				'layout'   => 'edit',
+				'itemtype' => $extensionName . '.' . $typeName,
+				'task'     => 'association.edit',
+				'id'       => $itemId,
+				'target'   => $target,
+			);
+
+			$url     = JRoute::_('index.php?' . http_build_query($options));
+			$url     = $allow && $addLink ? $url : '';
+			$text    = strtoupper($language->sef);
+
+			$tooltip = htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '<br /><br />' . $additional;
+			$classes = 'hasPopover label ' . $labelClass . ' label-' . $language->sef;
+
+			$items[$langCode]['link'] = '<a href="' . $url . '" title="' . $language->title . '" class="' . $classes
+						. '" data-content="' . $tooltip . '" data-placement="top">'
+						. $text . '</a>';
+		}
+
+		JHtml::_('bootstrap.popover');
+
+		return JLayoutHelper::render('joomla.content.associations', $items);
+	}
+
+	/**
+	 * Get all extensions with associations support.
+	 *
+	 * @return  array  The extensions.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getSupportedExtensions()
+	{
+		if (!is_null(self::$extensionsSupport))
+		{
+			return self::$extensionsSupport;
+		}
+
+		self::$extensionsSupport = array();
+
+		$extensions = self::getEnabledExtensions();
+
+		foreach ($extensions as $extension)
+		{
+			$support = self::getSupportedExtension($extension->element);
+
+			if ($support->get('associationssupport') === true)
+			{
+				self::$supportedExtensionsList[] = $extension->element;
+			}
+
+			self::$extensionsSupport[$extension->element] = $support;
+		}
+
+		return self::$extensionsSupport;
+	}
+
+	/**
+	 * Get item context based on the item key.
+	 *
+	 * @param   string  $extensionName  The extension identifier.
+	 *
+	 * @return  Joomla\Registry\Registry  The item properties.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getSupportedExtension($extensionName)
+	{
+		$result = new Registry;
+
+		$result->def('component', $extensionName);
+		$result->def('associationssupport', false);
+		$result->def('helper', null);
+
+		// Check if associations helper exists
+		if (!file_exists(JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php'))
+		{
+			return $result;
+		}
+
+		require_once JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php';
+
+		$componentAssociationsHelperClassName = self::getExtensionHelperClassName($extensionName);
+
+		if (!class_exists($componentAssociationsHelperClassName, false))
+		{
+			return $result;
+		}
+
+		// Create an instance of the helper class
+		$helper = new $componentAssociationsHelperClassName;
+		$result->set('helper', $helper);
+
+		if ($helper->hasAssociationsSupport() === false)
+		{
+			return $result;
+		}
+
+		$result->set('associationssupport', true);
+
+		// Get the translated titles.
+		$languagePath = JPATH_ADMINISTRATOR . '/components/' . $extensionName;
+		$lang         = JFactory::getLanguage();
+
+		$lang->load($extensionName . '.sys', JPATH_ADMINISTRATOR);
+		$lang->load($extensionName . '.sys', $languagePath);
+		$lang->load($extensionName, JPATH_ADMINISTRATOR);
+		$lang->load($extensionName, $languagePath);
+
+		$result->def('title', JText::_(strtoupper($extensionName)));
+
+		// Get the supported types
+		$types  = $helper->getItemTypes();
+		$rTypes = array();
+
+		foreach ($types as $typeName)
+		{
+			$details     = $helper->getType($typeName);
+			$context     = 'component';
+			$title       = $helper->getTypeTitle($typeName);
+			$languageKey = $typeName;
+
+			if ($typeName === 'category')
+			{
+				$languageKey = strtoupper($extensionName) . '_CATEGORIES';
+				$context     = 'category';
+			}
+
+			if ($lang->hasKey(strtoupper($extensionName . '_' . $title . 'S')))
+			{
+				$languageKey = strtoupper($extensionName . '_' . $title . 'S');
+			}
+
+			$title = $lang->hasKey($languageKey) ? JText::_($languageKey) : JText::_('COM_ASSOCIATIONS_ITEMS');
+
+			$rType = new Registry;
+
+			$rType->def('name', $typeName);
+			$rType->def('details', $details);
+			$rType->def('title', $title);
+			$rType->def('context', $context);
+
+			$rTypes[$typeName] = $rType;
+		}
+
+		$result->def('types', $rTypes);
+
+		return $result;
+	}
+
+	/**
+	 * Get all installed and enabled extensions
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.7.0
+	 */
+	private static function getEnabledExtensions()
+	{
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+			->where($db->quoteName('enabled') . ' = 1');
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Get all the content languages.
+	 *
+	 * @return  array  Array of objects all content languages by language code.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getContentLanguages()
+	{
+		return LanguageHelper::getContentLanguages(array(0, 1));
+	}
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public static function allowEdit($extensionName, $typeName, $itemId)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		if (method_exists($helper, 'allowEdit'))
+		{
+			return $helper->allowEdit($typeName, $itemId);
+		}
+
+		return JFactory::getUser()->authorise('core.edit', $extensionName);
+	}
+
+	/**
+	 * Check if user is allowed to create items.
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function allowAdd($extensionName, $typeName)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		if (method_exists($helper, 'allowAdd'))
+		{
+			return $helper->allowAdd($typeName);
+		}
+
+		return JFactory::getUser()->authorise('core.create', $extensionName);
+	}
+
+	/**
+	 * Check if an item is checked out
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  boolean  True if item is checked out.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function isCheckoutItem($extensionName, $typeName, $itemId)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		if (!self::typeSupportsCheckout($extensionName, $typeName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		if (method_exists($helper, 'isCheckoutItem'))
+		{
+			return $helper->isCheckoutItem($typeName, $itemId);
+		}
+
+		$item = self::getItem($extensionName, $typeName, $itemId);
+
+		$checkedOutFieldName = $helper->getTypeFieldName($typeName, 'checked_out');
+
+		return $item->{$checkedOutFieldName} != 0;
+	}
+
+	/**
+	 * Check if user can checkin an item.
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function canCheckinItem($extensionName, $typeName, $itemId)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		if (!self::typeSupportsCheckout($extensionName, $typeName))
+		{
+			return true;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		if (method_exists($helper, 'canCheckinItem'))
+		{
+			return $helper->canCheckinItem($typeName, $itemId);
+		}
+
+		$item = self::getItem($extensionName, $typeName, $itemId);
+
+		$checkedOutFieldName = $helper->getTypeFieldName($typeName, 'checked_out');
+
+		$userId = JFactory::getUser()->id;
+
+		return ($item->{$checkedOutFieldName} == $userId || $item->{$checkedOutFieldName} == 0);
+	}
+
+	/**
+	 * Check if the type supports checkout
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function typeSupportsCheckout($extensionName, $typeName)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		$support = $helper->getTypeSupport($typeName);
+
+		return !empty($support['checkout']);
+	}
+
+	/**
+	 * Get a table field name for a type
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   string  $fieldName      The item type
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getTypeFieldName($extensionName, $typeName, $fieldName)
+	{
+		if (!self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		return $helper->getTypeFieldName($typeName, $fieldName);
+	}
+
+	/**
+	 * Gets the language filter system plugin extension id.
+	 *
+	 * @return  integer  The language filter system plugin extension id.
+	 *
+	 * @since   3.7.2
+	 */
+	public static function getLanguagefilterPluginId()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('languagefilter'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php b/core/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
new file mode 100644
index 00000000..db174b29
--- /dev/null
+++ b/core/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+?>
+<?php if ($data['view'] instanceof AssociationsViewAssociations) : ?>
+	<?php $app = JFactory::getApplication(); ?>
+	<?php // We will get the component item type and language filters & remove it from the form filters. ?>
+	<?php if ($app->input->get('forcedItemType', '', 'string') == '') : ?>
+		<?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
+		<div class="js-stools-field-filter js-stools-selector">
+			<?php echo $itemTypeField->input; ?>
+		</div>
+	<?php endif; ?>
+	<?php if ($app->input->get('forcedLanguage', '', 'cmd') == '') : ?>
+		<?php $languageField = $data['view']->filterForm->getField('language'); ?>
+		<div class="js-stools-field-filter js-stools-selector">
+			<?php echo $languageField->input; ?>
+		</div>
+	<?php endif; ?>
+<?php endif; ?>
+<?php // Display the main joomla layout ?>
+<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none')); ?>
diff --git a/core/administrator/components/com_associations/models/association.php b/core/administrator/components/com_associations/models/association.php
new file mode 100644
index 00000000..79b39ef9
--- /dev/null
+++ b/core/administrator/components/com_associations/models/association.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of article records.
+ *
+ * @since  3.7.0
+ */
+class AssociationsModelAssociation extends JModelList
+{
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   3.7.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_associations.association', 'association', array('control' => 'jform', 'load_data' => $loadData));
+
+		return !empty($form) ? $form : false;
+	}
+}
diff --git a/core/administrator/components/com_associations/models/associations.php b/core/administrator/components/com_associations/models/associations.php
new file mode 100644
index 00000000..bee4212e
--- /dev/null
+++ b/core/administrator/components/com_associations/models/associations.php
@@ -0,0 +1,532 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of article records.
+ *
+ * @since  3.7.0
+ */
+class AssociationsModelAssociations extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.7.0
+	 *
+	 * @see     JController
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id',
+				'title',
+				'ordering',
+				'itemtype',
+				'language',
+				'association',
+				'menutype',
+				'menutype_title',
+				'level',
+				'state',
+				'category_id',
+				'category_title',
+				'access',
+				'access_level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function populateState($ordering = 'ordering', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+		$forcedItemType = $app->input->get('forcedItemType', '', 'string');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		// Adjust the context to support forced component item types.
+		if ($forcedItemType)
+		{
+			$this->context .= '.' . $forcedItemType;
+		}
+
+		$this->setState('itemtype', $this->getUserStateFromRequest($this->context . '.itemtype', 'itemtype', '', 'string'));
+		$this->setState('language', $this->getUserStateFromRequest($this->context . '.language', 'language', '', 'string'));
+
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
+		$this->setState('filter.menutype', $this->getUserStateFromRequest($this->context . '.filter.menutype', 'filter_menutype', '', 'string'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('language', $forcedLanguage);
+		}
+
+		// Force a component item type.
+		if (!empty($forcedItemType))
+		{
+			$this->setState('itemtype', $forcedItemType);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('itemtype');
+		$id .= ':' . $this->getState('language');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.category_id');
+		$id .= ':' . $this->getState('filter.menutype');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery|boolean
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getListQuery()
+	{
+		$type         = null;
+
+		list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'));
+
+		$extension = AssociationsHelper::getSupportedExtension($extensionName);
+		$types     = $extension->get('types');
+
+		if (array_key_exists($typeName, $types))
+		{
+			$type = $types[$typeName];
+		}
+
+		if (is_null($type))
+		{
+			return false;
+		}
+
+		// Create a new query object.
+		$user     = JFactory::getUser();
+		$db       = $this->getDbo();
+		$query    = $db->getQuery(true);
+
+		$details = $type->get('details');
+
+		if (!array_key_exists('support', $details))
+		{
+			return false;
+		}
+
+		$support = $details['support'];
+
+		if (!array_key_exists('fields', $details))
+		{
+			return false;
+		}
+
+		$fields = $details['fields'];
+
+		// Main query.
+		$query->select($db->qn($fields['id'], 'id'))
+			->select($db->qn($fields['title'], 'title'))
+			->select($db->qn($fields['alias'], 'alias'));
+
+		if (!array_key_exists('tables', $details))
+		{
+			return false;
+		}
+
+		$tables = $details['tables'];
+
+		foreach ($tables as $key => $table)
+		{
+			$query->from($db->qn($table, $key));
+		}
+
+		if (!array_key_exists('joins', $details))
+		{
+			return false;
+		}
+
+		$joins = $details['joins'];
+
+		foreach ($joins as $join)
+		{
+			$query->join($join['type'], $db->qn($join['condition']));
+		}
+
+		// Join over the language.
+		$query->select($db->qn($fields['language'], 'language'))
+			->select($db->qn('l.title', 'language_title'))
+			->select($db->qn('l.image', 'language_image'))
+			->join('LEFT', $db->qn('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn($fields['language']));
+
+		// Join over the associations.
+		$query->select('COUNT(' . $db->qn('asso2.id') . ') > 1 AS ' . $db->qn('association'))
+			->join(
+				'LEFT',
+				$db->qn('#__associations', 'asso') . ' ON ' . $db->qn('asso.id') . ' = ' . $db->qn($fields['id'])
+				. ' AND ' . $db->qn('asso.context') . ' = ' . $db->quote($extensionName . '.' . 'item')
+			)
+			->join('LEFT', $db->qn('#__associations', 'asso2') . ' ON ' . $db->qn('asso2.key') . ' = ' . $db->qn('asso.key'));
+
+		// Prepare the group by clause.
+		$groupby = array(
+			$fields['id'],
+			$fields['title'],
+			$fields['language'],
+			'l.title',
+			'l.image',
+		);
+
+		// Select author for ACL checks.
+		if (!empty($fields['created_user_id']))
+		{
+			$query->select($db->qn($fields['created_user_id'], 'created_user_id'));
+		}
+
+		// Select checked out data for check in checkins.
+		if (!empty($fields['checked_out']) && !empty($fields['checked_out_time']))
+		{
+			$query->select($db->qn($fields['checked_out'], 'checked_out'))
+				->select($db->qn($fields['checked_out_time'], 'checked_out_time'));
+
+			// Join over the users.
+			$query->select($db->qn('u.name', 'editor'))
+				->join('LEFT', $db->qn('#__users', 'u') . ' ON ' . $db->qn('u.id') . ' = ' . $db->qn($fields['checked_out']));
+
+			$groupby[] = 'u.name';
+		}
+
+		// If component item type supports ordering, select the ordering also.
+		if (!empty($fields['ordering']))
+		{
+			$query->select($db->qn($fields['ordering'], 'ordering'));
+		}
+
+		// If component item type supports state, select the item state also.
+		if (!empty($fields['state']))
+		{
+			$query->select($db->qn($fields['state'], 'state'));
+		}
+
+		// If component item type supports level, select the level also.
+		if (!empty($fields['level']))
+		{
+			$query->select($db->qn($fields['level'], 'level'));
+		}
+
+		// If component item type supports categories, select the category also.
+		if (!empty($fields['catid']))
+		{
+			$query->select($db->qn($fields['catid'], 'catid'));
+
+			// Join over the categories.
+			$query->select($db->qn('c.title', 'category_title'))
+				->join('LEFT', $db->qn('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn($fields['catid']));
+
+			$groupby[] = 'c.title';
+		}
+
+		// If component item type supports menu type, select the menu type also.
+		if (!empty($fields['menutype']))
+		{
+			$query->select($db->qn($fields['menutype'], 'menutype'));
+
+			// Join over the menu types.
+			$query->select($db->qn('mt.title', 'menutype_title'))
+				->select($db->qn('mt.id', 'menutypeid'))
+				->join('LEFT', $db->qn('#__menu_types', 'mt') . ' ON ' . $db->qn('mt.menutype') . ' = ' . $db->qn($fields['menutype']));
+
+			$groupby[] = 'mt.title';
+			$groupby[] = 'mt.id';
+		}
+
+		// If component item type supports access level, select the access level also.
+		if (array_key_exists('acl', $support) && $support['acl'] == true && !empty($fields['access']))
+		{
+			$query->select($db->qn($fields['access'], 'access'));
+
+			// Join over the access levels.
+			$query->select($db->qn('ag.title', 'access_level'))
+				->join('LEFT', $db->qn('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn($fields['access']));
+
+			$groupby[] = 'ag.title';
+
+			// Implement View Level Access.
+			if (!$user->authorise('core.admin', $extensionName))
+			{
+				$query->where($fields['access'] . ' IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')');
+			}
+		}
+
+		// If component item type is menus we need to remove the root item and the administrator menu.
+		if ($extensionName === 'com_menus')
+		{
+			$query->where($db->qn($fields['id']) . ' > 1')
+				->where($db->qn('a.client_id') . ' = 0');
+		}
+
+		// If component item type is category we need to remove all other component categories.
+		if ($typeName === 'category')
+		{
+			$query->where($db->qn('a.extension') . ' = ' . $db->quote($extensionName));
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('language'))
+		{
+			$query->where($db->qn($fields['language']) . ' = ' . $db->quote($language));
+		}
+
+		// Filter by item state.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where($db->qn($fields['state']) . ' = ' . (int) $state);
+		}
+		elseif ($state === '')
+		{
+			$query->where($db->qn($fields['state']) . ' IN (0, 1)');
+		}
+
+		// Filter on the category.
+		$baselevel = 1;
+
+		if ($categoryId = $this->getState('filter.category_id'))
+		{
+			$categoryTable = JTable::getInstance('Category', 'JTable');
+			$categoryTable->load($categoryId);
+			$baselevel = (int) $categoryTable->level;
+
+			$query->where($db->qn('c.lft') . ' >= ' . (int) $categoryTable->lft)
+				->where($db->qn('c.rgt') . ' <= ' . (int) $categoryTable->rgt);
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where($db->qn('a.level') . ' <= ' . ((int) $level + (int) $baselevel - 1));
+		}
+
+		// Filter by menu type.
+		if ($menutype = $this->getState('filter.menutype'))
+		{
+			$query->where($fields['menutype'] . ' = ' . $db->quote($menutype));
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where($fields['access'] . ' = ' . (int) $access);
+		}
+
+		// Filter by search in name.
+		if ($search = $this->getState('filter.search'))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->qn($fields['id']) . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(' . $db->qn($fields['title']) . ' LIKE ' . $search
+					. ' OR ' . $db->qn($fields['alias']) . ' LIKE ' . $search . ')'
+				);
+			}
+		}
+
+		// Add the group by clause
+		$query->group($db->qn($groupby));
+
+		// Add the list ordering clause
+		$listOrdering  = $this->state->get('list.ordering', 'id');
+		$orderDirn     = $this->state->get('list.direction', 'ASC');
+
+		$query->order($db->escape($listOrdering) . ' ' . $db->escape($orderDirn));
+
+		return $query;
+	}
+
+	/**
+	 * Delete associations from #__associations table.
+	 *
+	 * @param   string  $context  The associations context. Empty for all.
+	 * @param   string  $key      The associations key. Empty for all.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 */
+	public function purge($context = '', $key = '')
+	{
+		$app   = JFactory::getApplication();
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)->delete($db->qn('#__associations'));
+
+		// Filter by associations context.
+		if ($context)
+		{
+			$query->where($db->qn('context') . ' = ' . $db->quote($context));
+		}
+
+		// Filter by key.
+		if ($key)
+		{
+			$query->where($db->qn('key') . ' = ' . $db->quote($key));
+		}
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
+
+			return false;
+		}
+
+		$app->enqueueMessage(
+			JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'),
+			'message'
+		);
+
+		return true;
+	}
+
+	/**
+	 * Delete orphans from the #__associations table.
+	 *
+	 * @param   string  $context  The associations context. Empty for all.
+	 * @param   string  $key      The associations key. Empty for all.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.7.0
+	 */
+	public function clean($context = '', $key = '')
+	{
+		$app   = JFactory::getApplication();
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn('key') . ', COUNT(*)')
+			->from($db->qn('#__associations'))
+			->group($db->qn('key'))
+			->having('COUNT(*) = 1');
+
+		// Filter by associations context.
+		if ($context)
+		{
+			$query->where($db->qn('context') . ' = ' . $db->quote($context));
+		}
+
+		// Filter by key.
+		if ($key)
+		{
+			$query->where($db->qn('key') . ' = ' . $db->quote($key));
+		}
+
+		$db->setQuery($query);
+
+		$assocKeys = $db->loadObjectList();
+
+		$count = 0;
+
+		// We have orphans. Let's delete them.
+		foreach ($assocKeys as $value)
+		{
+			$query->clear()
+				->delete($db->qn('#__associations'))
+				->where($db->qn('key') . ' = ' . $db->quote($value->key));
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (JDatabaseExceptionExecuting $e)
+			{
+				$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
+
+				return false;
+			}
+
+			$count += (int) $db->getAffectedRows();
+		}
+
+		$app->enqueueMessage(
+			JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'),
+			'message'
+		);
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_associations/models/fields/itemlanguage.php b/core/administrator/components/com_associations/models/fields/itemlanguage.php
new file mode 100644
index 00000000..1c8ddf46
--- /dev/null
+++ b/core/administrator/components/com_associations/models/fields/itemlanguage.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Language\LanguageHelper;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Field listing item languages
+ *
+ * @since  3.7.0
+ */
+class JFormFieldItemLanguage extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $type = 'ItemLanguage';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$input = JFactory::getApplication()->input;
+
+		list($extensionName, $typeName) = explode('.', $input->get('itemtype', '', 'string'));
+
+		// Get the extension specific helper method
+		$helper = AssociationsHelper::getExtensionHelper($extensionName);
+
+		$languageField = $helper->getTypeFieldName($typeName, 'language');
+		$referenceId   = $input->get('id', 0, 'int');
+		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
+		$referenceLang = $reference[$languageField];
+
+		// Get item associations given ID and item type
+		$associations = AssociationsHelper::getAssociationList($extensionName, $typeName, $referenceId);
+
+		// Check if user can create items in this component item type.
+		$canCreate = AssociationsHelper::allowAdd($extensionName, $typeName);
+
+		// Gets existing languages.
+		$existingLanguages = LanguageHelper::getContentLanguages(array(0, 1));
+
+		$options = array();
+
+		// Each option has the format "<lang>|<id>", example: "en-GB|1"
+		foreach ($existingLanguages as $langCode => $language)
+		{
+			// If language code is equal to reference language we don't need it.
+			if ($language->lang_code == $referenceLang)
+			{
+				continue;
+			}
+
+			$options[$langCode]       = new stdClass;
+			$options[$langCode]->text = $language->title;
+
+			// If association exists in this language.
+			if (isset($associations[$language->lang_code]))
+			{
+				$itemId                    = (int) $associations[$language->lang_code]['id'];
+				$options[$langCode]->value = $language->lang_code . ':' . $itemId . ':edit';
+
+				// Check if user does have permission to edit the associated item.
+				$canEdit = AssociationsHelper::allowEdit($extensionName, $typeName, $itemId);
+
+				// Check if item can be checked out
+				$canCheckout = AssociationsHelper::canCheckinItem($extensionName, $typeName, $itemId);
+
+				// Disable language if user is not allowed to edit the item associated to it.
+				$options[$langCode]->disable = !($canEdit && $canCheckout);
+			}
+			else
+			{
+				// New item, id = 0 and disabled if user is not allowed to create new items.
+				$options[$langCode]->value = $language->lang_code . ':0:add';
+
+				// Disable language if user is not allowed to create items.
+				$options[$langCode]->disable = !$canCreate;
+			}
+		}
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_associations/models/fields/itemtype.php b/core/administrator/components/com_associations/models/fields/itemtype.php
new file mode 100644
index 00000000..f3335c6e
--- /dev/null
+++ b/core/administrator/components/com_associations/models/fields/itemtype.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('JPATH_BASE') or die;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+JFormHelper::loadFieldClass('groupedlist');
+
+/**
+ * A drop down containing all component item types that implement associations.
+ *
+ * @since  3.7.0
+ */
+class JFormFieldItemType extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 *
+	 * @since  3.7.0
+	 */
+	protected $type = 'ItemType';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   3.7.0
+	 *
+	 * @throws  UnexpectedValueException
+	 */
+	protected function getGroups()
+	{
+		$options    = array();
+		$extensions = AssociationsHelper::getSupportedExtensions();
+
+		foreach ($extensions as $extension)
+		{
+			if ($extension->get('associationssupport') === true)
+			{
+				foreach ($extension->get('types') as $type)
+				{
+					$context = $extension->get('component') . '.' . $type->get('name');
+					$options[$extension->get('title')][] = JHtml::_('select.option', $context, $type->get('title'));
+				}
+			}
+		}
+
+		// Sort by alpha order.
+		uksort($options, 'strnatcmp');
+
+		// Add options to parent array.
+		return array_merge(parent::getGroups(), $options);
+	}
+}
diff --git a/core/administrator/components/com_associations/models/fields/modalassociation.php b/core/administrator/components/com_associations/models/fields/modalassociation.php
new file mode 100644
index 00000000..85dae725
--- /dev/null
+++ b/core/administrator/components/com_associations/models/fields/modalassociation.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Supports a modal item picker.
+ *
+ * @since  3.7.0
+ */
+class JFormFieldModalAssociation extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.7.0
+	 */
+	protected $type = 'Modal_Association';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		// The active item id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Build the script.
+		$script = array();
+
+		// Select button script
+		$script[] = 'function jSelectAssociation_' . $this->id . '(id) {';
+		$script[] = '   target = document.getElementById("target-association");';
+		$script[] = '   document.getElementById("target-association").src = target.getAttribute("data-editurl") + '
+						. '"&task=" + target.getAttribute("data-item") + ".edit" + "&id=" + id';
+		$script[] = '	jQuery("#associationSelect' . $this->id . 'Modal").modal("hide");';
+		$script[] = '}';
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+		// Setup variables for display.
+		$html = array();
+
+		$linkAssociations = 'index.php?option=com_associations&amp;view=associations&amp;layout=modal&amp;tmpl=component'
+			. '&amp;forcedItemType=' . JFactory::getApplication()->input->get('itemtype', '', 'string') . '&amp;function=jSelectAssociation_' . $this->id;
+
+		$linkAssociations .= "&amp;forcedLanguage=' + document.getElementById('target-association').getAttribute('data-language') + '";
+
+		$urlSelect = $linkAssociations . '&amp;' . JSession::getFormToken() . '=1';
+
+		// Select custom association button
+		$html[] = '<a'
+			. ' id="select-change"'
+			. ' class="btn' . ($value ? '' : ' hidden') . '"'
+			. ' data-toggle="modal"'
+			. ' data-select="' . JText::_('COM_ASSOCIATIONS_SELECT_TARGET') . '"'
+			. ' data-change="' . JText::_('COM_ASSOCIATIONS_CHANGE_TARGET') . '"'
+			. ' role="button"'
+			. ' href="#associationSelect' . $this->id . 'Modal">'
+			. '<span class="icon-file" aria-hidden="true"></span>'
+			. '<span id="select-change-text"></span>'
+			. '</a>';
+
+		// Clear association button
+		$html[] = '<button'
+			. ' class="btn' . ($value ? '' : ' hidden') . '"'
+			. ' onclick="return Joomla.submitbutton(\'undo-association\');"'
+			. ' id="remove-assoc">'
+			. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+			. '</button>';
+
+		$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . $value . '" />';
+
+		// Select custom association modal
+		$html[] = JHtml::_(
+			'bootstrap.renderModal',
+			'associationSelect' . $this->id . 'Modal',
+			array(
+				'title'       => JText::_('COM_ASSOCIATIONS_SELECT_TARGET'),
+				'backdrop'    => 'static',
+				'url'         => $urlSelect,
+				'height'      => '400px',
+				'width'       => '800px',
+				'bodyHeight'  => '70',
+				'modalWidth'  => '80',
+				'footer'      => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</a>',
+			)
+		);
+
+		return implode("\n", $html);
+	}
+}
diff --git a/core/administrator/components/com_associations/models/forms/association.xml b/core/administrator/components/com_associations/models/forms/association.xml
new file mode 100644
index 00000000..9e8d880e
--- /dev/null
+++ b/core/administrator/components/com_associations/models/forms/association.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="itemlanguage"
+			type="itemlanguage"
+			label="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_LABEL"
+			description="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_DESC"
+			>
+			<option value="">COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE</option>
+		</field>
+
+		<field
+			name="modalassociation"
+			type="modalassociation"
+		/>
+	</fieldset>
+
+	<fields name="params">
+	</fields>
+</form>
diff --git a/core/administrator/components/com_associations/models/forms/filter_associations.xml b/core/administrator/components/com_associations/models/forms/filter_associations.xml
new file mode 100644
index 00000000..9563de44
--- /dev/null
+++ b/core/administrator/components/com_associations/models/forms/filter_associations.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="itemtype"
+		type="itemtype"
+		label="COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL"
+		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
+		filtermode="selector"
+		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
+		>
+		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
+	</field>
+
+	<field
+		name="language"
+		type="contentlanguage"
+		label="JOPTION_FILTER_LANGUAGE"
+		description="JOPTION_FILTER_LANGUAGE_DESC"
+		filtermode="selector"
+		onchange="this.form.submit();"
+		>
+		<option value="">JOPTION_SELECT_LANGUAGE</option>
+	</field>
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_ASSOCIATIONS_FILTER_SEARCH_LABEL"
+			description="COM_ASSOCIATIONS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			label="JOPTION_FILTER_PUBLISHED"
+			description="JOPTION_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			published="0,1,2"
+			extension="dynamic"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="menutype"
+			type="menu"
+			label="COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL"
+			description="COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC"
+			clientid="0"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			default="id ASC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="state ASC">JSTATUS_ASC</option>
+			<option value="state DESC">JSTATUS_DESC</option>
+			<option value="title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			default="25"
+			class="input-mini"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_associations/views/association/tmpl/edit.php b/core/administrator/components/com_associations/views/association/tmpl/edit.php
new file mode 100644
index 00000000..2fe76e58
--- /dev/null
+++ b/core/administrator/components/com_associations/views/association/tmpl/edit.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+JHtml::_('script', 'com_associations/sidebyside.js', false, true);
+JHtml::_('stylesheet', 'com_associations/sidebyside.css', array(), true);
+
+$options = array(
+			'layout'   => $this->app->input->get('layout', '', 'string'),
+			'itemtype' => $this->itemtype,
+			'id'       => $this->referenceId,
+		);
+?>
+<button id="toogle-left-panel" class="btn btn-small"
+		data-show-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE'); ?>"
+		data-hide-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>"><?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>
+</button>
+
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=association&' . http_build_query($options)); ?>" method="post" name="adminForm" id="adminForm" data-associatedview="<?php echo $this->typeName; ?>">
+	<div class="sidebyside">
+		<div class="outer-panel" id="left-panel">
+			<div class="inner-panel">
+				<h3><?php echo JText::_('COM_ASSOCIATIONS_REFERENCE_ITEM'); ?></h3>
+				<iframe id="reference-association" name="reference-association" title="reference-association"
+					src="<?php echo JRoute::_($this->editUri . '&task=' . $this->typeName . '.edit&id=' . (int) $this->referenceId); ?>"
+					height="400" width="400"
+					data-action="edit"
+					data-item="<?php echo $this->typeName; ?>"
+					data-id="<?php echo $this->referenceId; ?>"
+					data-title="<?php echo $this->referenceTitle; ?>"
+					data-language="<?php echo $this->referenceLanguage; ?>"
+					data-editurl="<?php echo JRoute::_($this->editUri); ?>">
+				</iframe>
+			</div>
+		</div>
+		<div class="outer-panel" id="right-panel">
+			<div class="inner-panel">
+				<div class="language-selector">
+					<h3 class="target-text"><?php echo JText::_('COM_ASSOCIATIONS_ASSOCIATED_ITEM'); ?></h3>
+					<?php echo $this->form->getInput('modalassociation'); ?>
+					<?php echo $this->form->getInput('itemlanguage'); ?>
+				</div>
+				<iframe id="target-association" name="target-association" title="target-association"
+					src="<?php echo $this->defaultTargetSrc; ?>"
+					height="400" width="400"
+					data-action="<?php echo $this->targetAction; ?>"
+					data-item="<?php echo $this->typeName; ?>"
+					data-id="<?php echo $this->targetId; ?>"
+					data-title="<?php echo $this->targetTitle; ?>"
+					data-language="<?php echo $this->targetLanguage; ?>"
+					data-editurl="<?php echo JRoute::_($this->editUri); ?>">
+				</iframe>
+			</div>
+		</div>
+
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="target-id" id="target-id" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_associations/views/association/view.html.php b/core/administrator/components/com_associations/views/association/view.html.php
new file mode 100644
index 00000000..f071bec3
--- /dev/null
+++ b/core/administrator/components/com_associations/views/association/view.html.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * View class for a list of articles.
+ *
+ * @since  3.7.0
+ */
+class AssociationsViewAssociation extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var    array
+	 *
+	 * @since  3.7.0
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 *
+	 * @since  3.7.0
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var    object
+	 *
+	 * @since  3.7.0
+	 */
+	protected $state;
+
+	/**
+	 * Selected item type properties.
+	 *
+	 * @var    Registry
+	 *
+	 * @since  3.7.0
+	 */
+	public $itemType = null;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->app  = JFactory::getApplication();
+		$this->form = $this->get('Form');
+		$input      = $this->app->input;
+		$this->referenceId = $input->get('id', 0, 'int');
+
+		list($extensionName, $typeName) = explode('.', $input->get('itemtype', '', 'string'));
+
+		$extension = AssociationsHelper::getSupportedExtension($extensionName);
+		$types     = $extension->get('types');
+
+		if (array_key_exists($typeName, $types))
+		{
+			$this->type          = $types[$typeName];
+			$this->typeSupports  = array();
+			$details             = $this->type->get('details');
+			$this->save2copy     = false;
+
+			if (array_key_exists('support', $details))
+			{
+				$support = $details['support'];
+				$this->typeSupports = $support;
+			}
+
+			if (!empty($this->typeSupports['save2copy']))
+			{
+				$this->save2copy = true;
+			}
+		}
+
+		$this->extensionName = $extensionName;
+		$this->typeName      = $typeName;
+		$this->itemtype      = $extensionName . '.' . $typeName;
+
+		$languageField = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'language');
+		$referenceId   = $input->get('id', 0, 'int');
+		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
+
+		$this->referenceLanguage = $reference[$languageField];
+		$this->referenceTitle    = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+
+		$options = array(
+			'option'    => $typeName === 'category' ? 'com_categories' : $extensionName,
+			'view'      => $typeName,
+			'extension' => $extensionName,
+			'tmpl'      => 'component',
+		);
+
+		// Reference and target edit links.
+		$this->editUri = 'index.php?' . http_build_query($options);
+
+		// Get target language.
+		$this->targetId         = '0';
+		$this->targetLanguage   = '';
+		$this->defaultTargetSrc = '';
+		$this->targetAction     = '';
+		$this->targetTitle      = '';
+
+		if ($target = $input->get('target', '', 'string'))
+		{
+			$matches = preg_split("#[\:]+#", $target);
+			$this->targetAction     = $matches[2];
+			$this->targetId         = $matches[1];
+			$this->targetLanguage   = $matches[0];
+			$this->targetTitle      = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+			$task                   = $typeName . '.' . $this->targetAction;
+			$this->defaultTargetSrc = JRoute::_($this->editUri . '&task=' . $task . '&id=' . (int) $this->targetId);
+			$this->form->setValue('itemlanguage', '', $this->targetLanguage . ':' . $this->targetId . ':' . $this->targetAction);
+		}
+
+		/*
+		* @todo Review later
+		*/
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			// We also need to change the category filter to show show categories with All or the forced language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+
+				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
+				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addToolbar()
+	{
+		// Hide main menu.
+		JFactory::getApplication()->input->set('hidemainmenu', 1);
+
+		$helper = AssociationsHelper::getExtensionHelper($this->extensionName);
+		$title  = $helper->getTypeTitle($this->typeName);
+
+		$languageKey = strtoupper($this->extensionName . '_' . $title . 'S');
+
+		if ($this->typeName === 'category')
+		{
+			$languageKey = strtoupper($this->extensionName) . '_CATEGORIES';
+		}
+
+		JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', JText::_($this->extensionName), JText::_($languageKey)), 'contract assoc');
+
+		$bar = JToolbar::getInstance('toolbar');
+
+		$bar->appendButton(
+			'Custom', '<button onclick="Joomla.submitbutton(\'reference\')" '
+			. 'class="btn btn-small btn-success"><span class="icon-apply icon-white" aria-hidden="true"></span>'
+			. JText::_('COM_ASSOCIATIONS_SAVE_REFERENCE') . '</button>', 'reference'
+		);
+
+		$bar->appendButton(
+			'Custom', '<button onclick="Joomla.submitbutton(\'target\')" '
+			. 'class="btn btn-small btn-success"><span class="icon-apply icon-white" aria-hidden="true"></span>'
+			. JText::_('COM_ASSOCIATIONS_SAVE_TARGET') . '</button>', 'target'
+		);
+
+		if ($this->typeName === 'category' || $this->extensionName === 'com_menus' || $this->save2copy === true)
+		{
+			JToolBarHelper::custom('copy', 'copy.png', '', 'COM_ASSOCIATIONS_COPY_REFERENCE', false);
+		}
+
+		JToolbarHelper::cancel('association.cancel', 'JTOOLBAR_CLOSE');
+		JToolbarHelper::help('JHELP_COMPONENTS_ASSOCIATIONS_EDIT');
+
+		JHtmlSidebar::setAction('index.php?option=com_associations');
+	}
+}
diff --git a/core/administrator/components/com_associations/views/associations/tmpl/default.php b/core/administrator/components/com_associations/views/associations/tmpl/default.php
new file mode 100644
index 00000000..c33f6cf0
--- /dev/null
+++ b/core/administrator/components/com_associations/views/associations/tmpl/default.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder        = $this->escape($this->state->get('list.ordering'));
+$listDirn         = $this->escape($this->state->get('list.direction'));
+$canManageCheckin = JFactory::getUser()->authorise('core.manage', 'com_checkin');
+$colSpan          = 5;
+
+$iconStates = array(
+	-2 => 'icon-trash',
+	0  => 'icon-unpublish',
+	1  => 'icon-publish',
+	2  => 'icon-archive',
+);
+
+JText::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == "associations.purge")
+		{
+			if (confirm(Joomla.JText._("COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			Joomla.submitform(pressbutton);
+		}
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=associations'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+	<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+	<?php else : ?>
+		<table class="table table-striped" id="associationsList">
+			<thead>
+				<tr>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
+					</th>
+					<th width="5%" class="nowrap">
+						<?php echo JText::_('COM_ASSOCIATIONS_HEADING_ASSOCIATION'); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('COM_ASSOCIATIONS_HEADING_NO_ASSOCIATION'); ?>
+					</th>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<?php if (!empty($this->typeFields['access'])) : ?>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$canEdit    = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id);
+				$canCheckin = $canManageCheckin || AssociationsHelper::canCheckinItem($this->extensionName, $this->typeName, $item->id);
+				$isCheckout = AssociationsHelper::isCheckoutItem($this->extensionName, $this->typeName, $item->id);
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<?php if (!empty($this->typeSupports['state'])) : ?>
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+						</td>
+					<?php endif; ?>
+					<td class="nowrap has-context">
+						<span style="display: none"><?php echo JHtml::_('grid.id', $i, $item->id); ?></span>
+						<?php if (isset($item->level)) : ?>
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+						<?php endif; ?>
+						<?php if (!$canCheckin && $isCheckout) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.'); ?>
+						<?php endif; ?>
+						<?php if ($canCheckin && $isCheckout) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
+						<?php endif; ?>
+						<?php if ($canEdit && !$isCheckout) : ?>
+							<a href="<?php echo JRoute::_($this->editUri . '&id=' . (int) $item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+						<?php else : ?>
+							<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+						<?php endif; ?>
+						<?php if (!empty($this->typeFields['alias'])) : ?>
+							<span class="small">
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							</span>
+						<?php endif; ?>
+						<?php if (!empty($this->typeFields['catid'])) : ?>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
+							</div>
+						<?php endif; ?>
+					</td>
+					<td class="small">
+						<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+					</td>
+					<td>
+						<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, !$isCheckout, false); ?>
+					</td>
+					<td>
+						<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, !$isCheckout, true); ?>
+					</td>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
+						<td class="small">
+							<?php echo $this->escape($item->menutype_title); ?>
+						</td>
+					<?php endif; ?>
+					<?php if (!empty($this->typeFields['access'])) : ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+					<?php endif; ?>
+					<td class="hidden-phone">
+						<?php echo $item->id; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+	<?php endif; ?>
+	<input type="hidden" name="task" value=""/>
+	<input type="hidden" name="boxchecked" value="0" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_associations/views/associations/tmpl/default.xml b/core/administrator/components/com_associations/views/associations/tmpl/default.xml
new file mode 100644
index 00000000..d2dc27b1
--- /dev/null
+++ b/core/administrator/components/com_associations/views/associations/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_ASSOCIATIONS">
+		<message>
+			<![CDATA[COM_ASSOCIATIONS_XML_DESCRIPTION]]>
+		</message>
+	</layout>
+</metadata>
\ No newline at end of file
diff --git a/core/administrator/components/com_associations/views/associations/tmpl/modal.php b/core/administrator/components/com_associations/views/associations/tmpl/modal.php
new file mode 100644
index 00000000..6d21097c
--- /dev/null
+++ b/core/administrator/components/com_associations/views/associations/tmpl/modal.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$function         = $app->input->getCmd('function', 'jSelectAssociation');
+$listOrder        = $this->escape($this->state->get('list.ordering'));
+$listDirn         = $this->escape($this->state->get('list.direction'));
+$canManageCheckin = JFactory::getUser()->authorise('core.manage', 'com_checkin');
+$colSpan          = 4;
+
+$iconStates = array(
+	-2 => 'icon-trash',
+	0  => 'icon-unpublish',
+	1  => 'icon-publish',
+	2  => 'icon-archive',
+);
+
+$app->getDocument()->addScriptDeclaration(
+	"jQuery(document).ready(function($) {
+		// Run function on parent window.
+		$('.select-link').on('click', function() {
+			if (self != top)
+			{
+				window.parent." . $function . "(this.getAttribute('data-id'));
+			}
+		});
+	});"
+);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=associations&layout=modal&tmpl=component&function='
+. $function . '&' . JSession::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm">
+
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+	<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+	<?php else : ?>
+		<table class="table table-striped" id="associationsList">
+			<thead>
+				<tr>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
+					</th>
+					<th width="5%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+					</th>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<?php if (!empty($this->typeSupports['acl'])) : ?>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$canEdit    = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id);
+				$canCheckin = $canManageCheckin || AssociationsHelper::canCheckinItem($this->extensionName, $this->typeName, $item->id);
+				$isCheckout = AssociationsHelper::isCheckoutItem($this->extensionName, $this->typeName, $item->id);
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<?php if (!empty($this->typeSupports['state'])) : ?>
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>" aria-hidden="true"></span>
+						</td>
+					<?php endif; ?>
+					<td class="nowrap has-context">
+						<?php if (isset($item->level)) : ?>
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+						<?php endif; ?>
+						<?php if (($canEdit && !$isCheckout) || ($canEdit && $canCheckin && $isCheckout)) : ?>
+							<a class="select-link" href="javascript:void(0);" data-id="<?php echo $item->id; ?>">
+							<?php echo $this->escape($item->title); ?></a>
+						<?php elseif ($canEdit && $isCheckout) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.'); ?>
+							<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>">
+							<?php echo $this->escape($item->title); ?></span>
+						<?php else : ?>
+							<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>">
+							<?php echo $this->escape($item->title); ?></span>
+						<?php endif; ?>
+						<?php if (!empty($this->typeFields['alias'])) : ?>
+							<span class="small">
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							</span>
+						<?php endif; ?>
+						<?php if (!empty($this->typeFields['catid'])) : ?>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
+							</div>
+						<?php endif; ?>
+					</td>
+					<td class="small">
+						<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+					</td>
+					<td>
+						<?php if (true || $item->association) : ?>
+							<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, false, false); ?>
+						<?php endif; ?>
+					</td>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
+						<td class="small">
+							<?php echo $this->escape($item->menutype_title); ?>
+						</td>
+					<?php endif; ?>
+					<?php if (!empty($this->typeSupports['acl'])) : ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+					<?php endif; ?>
+					<td class="hidden-phone">
+						<?php echo $item->id; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+
+	<?php endif; ?>
+
+		<input type="hidden" name="task" value=""/>
+		<input type="hidden" name="forcedItemType" value="<?php echo $app->input->get('forcedItemType', '', 'string'); ?>" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_associations/views/associations/view.html.php b/core/administrator/components/com_associations/views/associations/view.html.php
new file mode 100644
index 00000000..92e5d7b9
--- /dev/null
+++ b/core/administrator/components/com_associations/views/associations/view.html.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of articles.
+ *
+ * @since  3.7.0
+ */
+class AssociationsViewAssociations extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var   array
+	 *
+	 * @since  3.7.0
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 *
+	 * @since  3.7.0
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var    object
+	 *
+	 * @since  3.7.0
+	 */
+	protected $state;
+
+	/**
+	 * Selected item type properties.
+	 *
+	 * @var    Registry
+	 *
+	 * @since  3.7.0
+	 */
+	public $itemType = null;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function display($tpl = null)
+	{
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		if (!JLanguageAssociations::isEnabled())
+		{
+			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . AssociationsHelper::getLanguagefilterPluginId());
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_ASSOCIATIONS_ERROR_NO_ASSOC', $link), 'warning');
+		}
+		elseif ($this->state->get('itemtype') == '' || $this->state->get('language') == '')
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'), 'notice');
+		}
+		else
+		{
+			$type = null;
+
+			list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'));
+
+			$extension = AssociationsHelper::getSupportedExtension($extensionName);
+
+			$types = $extension->get('types');
+
+			if (array_key_exists($typeName, $types))
+			{
+				$type = $types[$typeName];
+			}
+
+			$this->itemType = $type;
+
+			if (is_null($type))
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_ERROR_NO_TYPE'), 'warning');
+			}
+			else
+			{
+				$this->extensionName = $extensionName;
+				$this->typeName      = $typeName;
+				$this->typeSupports  = array();
+				$this->typeFields    = array();
+
+				$details = $type->get('details');
+
+				if (array_key_exists('support', $details))
+				{
+					$support = $details['support'];
+					$this->typeSupports = $support;
+				}
+
+				if (array_key_exists('fields', $details))
+				{
+					$fields = $details['fields'];
+					$this->typeFields = $fields;
+				}
+
+				// Dynamic filter form.
+				// This selectors doesn't have to activate the filter bar.
+				unset($this->activeFilters['itemtype']);
+				unset($this->activeFilters['language']);
+
+				// Remove filters options depending on selected type.
+				if (empty($support['state']))
+				{
+					unset($this->activeFilters['state']);
+					$this->filterForm->removeField('state', 'filter');
+				}
+
+				if (empty($support['category']))
+				{
+					unset($this->activeFilters['category_id']);
+					$this->filterForm->removeField('category_id', 'filter');
+				}
+
+				if ($extensionName !== 'com_menus')
+				{
+					unset($this->activeFilters['menutype']);
+					$this->filterForm->removeField('menutype', 'filter');
+				}
+
+				if (empty($support['level']))
+				{
+					unset($this->activeFilters['level']);
+					$this->filterForm->removeField('level', 'filter');
+				}
+
+				if (empty($support['acl']))
+				{
+					unset($this->activeFilters['access']);
+					$this->filterForm->removeField('access', 'filter');
+				}
+
+				// Add extension attribute to category filter.
+				if (empty($support['catid']))
+				{
+					$this->filterForm->setFieldAttribute('category_id', 'extension', $extensionName, 'filter');
+				}
+
+				$this->items      = $this->get('Items');
+				$this->pagination = $this->get('Pagination');
+
+				$linkParameters = array(
+					'layout'     => 'edit',
+					'itemtype'   => $extensionName . '.' . $typeName,
+					'task'       => 'association.edit',
+				);
+
+				$this->editUri = 'index.php?option=com_associations&view=association&' . http_build_query($linkParameters);
+			}
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		// Will add sidebar if needed $this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addToolbar()
+	{
+		$user = JFactory::getUser();
+
+		if (isset($this->typeName) && isset($this->extensionName))
+		{
+			$helper = AssociationsHelper::getExtensionHelper($this->extensionName);
+			$title  = $helper->getTypeTitle($this->typeName);
+
+			$languageKey = strtoupper($this->extensionName . '_' . $title . 'S');
+
+			if ($this->typeName === 'category')
+			{
+				$languageKey = strtoupper($this->extensionName) . '_CATEGORIES';
+			}
+
+			JToolbarHelper::title(
+				JText::sprintf(
+					'COM_ASSOCIATIONS_TITLE_LIST', JText::_($this->extensionName), JText::_($languageKey)
+				), 'contract assoc'
+			);
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_ASSOCIATIONS_TITLE_LIST_SELECT'), 'contract assoc');
+		}
+
+		if ($user->authorise('core.admin', 'com_associations') || $user->authorise('core.options', 'com_associations'))
+		{
+			if (!isset($this->typeName))
+			{
+				JToolbarHelper::custom('associations.purge', 'purge', 'purge', 'COM_ASSOCIATIONS_PURGE', false, false);
+				JToolbarHelper::custom('associations.clean', 'refresh', 'refresh', 'COM_ASSOCIATIONS_DELETE_ORPHANS', false, false);
+			}
+
+			JToolbarHelper::preferences('com_associations');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_ASSOCIATIONS');
+	}
+}
diff --git a/core/administrator/components/com_banners/access.xml b/core/administrator/components/com_banners/access.xml
new file mode 100644
index 00000000..d81db5fb
--- /dev/null
+++ b/core/administrator/components/com_banners/access.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_banners">
+	<section name="component">
+		<action
+			name="core.admin"
+			description="JACTION_ADMIN_COMPONENT_DESC"
+			title="JACTION_ADMIN"
+		/>
+
+		<action
+			name="core.options"
+			description="JACTION_OPTIONS_COMPONENT_DESC"
+			title="JACTION_OPTIONS"
+		/>
+
+		<action
+			name="core.manage"
+			description="JACTION_MANAGE_COMPONENT_DESC"
+			title="JACTION_MANAGE"
+		/>
+
+		<action
+			name="core.create"
+			description="JACTION_CREATE_COMPONENT_DESC"
+			title="JACTION_CREATE"
+		/>
+
+		<action
+			name="core.delete"
+			description="JACTION_DELETE_COMPONENT_DESC"
+			title="JACTION_DELETE"
+		/>
+
+		<action
+			name="core.edit"
+			description="JACTION_EDIT_COMPONENT_DESC"
+			title="JACTION_EDIT"
+		/>
+
+		<action
+			name="core.edit.state"
+			description="JACTION_EDITSTATE_COMPONENT_DESC"
+			title="JACTION_EDITSTATE"
+		/>
+
+	</section>
+	<section name="category">
+		<action
+			name="core.create"
+			description="COM_CATEGORIES_ACCESS_CREATE_DESC"
+			title="JACTION_CREATE"
+		/>
+
+		<action
+			name="core.delete"
+			description="COM_CATEGORIES_ACCESS_DELETE_DESC"
+			title="JACTION_DELETE"
+		/>
+
+		<action
+			name="core.edit"
+			description="COM_CATEGORIES_ACCESS_EDIT_DESC"
+			title="JACTION_EDIT"
+		/>
+
+		<action
+			name="core.edit.state"
+			description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC"
+			title="JACTION_EDITSTATE"
+		/>
+	</section>
+</access>
diff --git a/core/administrator/components/com_banners/banners.php b/core/administrator/components/com_banners/banners.php
new file mode 100644
index 00000000..df7d18bf
--- /dev/null
+++ b/core/administrator/components/com_banners/banners.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_banners'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+// Execute the task.
+$controller = JControllerLegacy::getInstance('Banners');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_banners/banners.xml b/core/administrator/components/com_banners/banners.xml
new file mode 100644
index 00000000..e2bda0c9
--- /dev/null
+++ b/core/administrator/components/com_banners/banners.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_banners</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_BANNERS_XML_DESCRIPTION</description>
+
+	<install> <!-- Runs on install -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/install.mysql.utf8.sql</file>
+		</sql>
+	</install>
+	<uninstall> <!-- Runs on uninstall -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/uninstall.mysql.utf8.sql</file>
+		</sql>
+	</uninstall>
+
+	<files folder="site">
+		<filename>banners.php</filename>
+		<filename>controller.php</filename>
+		<filename>router.php</filename>
+		<folder>helpers</folder>
+		<folder>models</folder>
+	</files>
+	<administration>
+		<menu img="class:banners">com_banners</menu>
+		<submenu>
+			<!--
+				Note that all & must be escaped to &amp; for the file to be valid
+				XML and be parsed by the installer
+			-->
+			<menu
+				link="option=com_banners"
+				view="banners"
+				img="class:banners"
+				alt="Banners/Banners"
+				>
+				com_banners_banners
+			</menu>
+			<menu
+				link="option=com_categories&amp;extension=com_banners"
+				view="categories"
+				img="class:banners-cat"
+				alt="Banners/Categories"
+				>
+				com_banners_categories
+			</menu>
+			<menu
+				link="option=com_banners&amp;view=clients"
+				view="clients"
+				img="class:banners-clients"
+				alt="Banners/Clients"
+				>
+				com_banners_clients
+			</menu>
+			<menu
+				link="option=com_banners&amp;view=tracks"
+				view="tracks"
+				img="class:banners-tracks"
+				alt="Banners/Tracks"
+				>
+				com_banners_tracks
+			</menu>
+		</submenu>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>banners.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_banners.ini</language>
+			<language tag="en-GB">language/en-GB.com_banners.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_banners/config.xml b/core/administrator/components/com_banners/config.xml
new file mode 100644
index 00000000..6d55b5de
--- /dev/null
+++ b/core/administrator/components/com_banners/config.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="component"
+		label="COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL"
+		description="COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_DESC"
+		>
+
+		<field
+			name="purchase_type"
+			type="list"
+			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
+			description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
+			id="purchase_type"
+			default="1"
+			>
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
+		</field>
+
+		<field
+			name="track_impressions"
+			type="radio"
+			label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
+			description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="track_clicks"
+			type="radio"
+			label="COM_BANNERS_FIELD_TRACKCLICK_LABEL"
+			description="COM_BANNERS_FIELD_TRACKCLICK_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="metakey_prefix"
+			type="text"
+			label="COM_BANNERS_FIELD_METAKEYWORDPREFIX_LABEL"
+			description="COM_BANNERS_FIELD_METAKEYWORDPREFIX_DESC"
+			default=""
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="banners"
+		label="COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_LABEL"
+		description="COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_DESC"
+		>
+
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
+			default="10"
+			showon="save_history:1"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_banners"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_banners/controller.php b/core/administrator/components/com_banners/controller.php
new file mode 100644
index 00000000..1b338989
--- /dev/null
+++ b/core/administrator/components/com_banners/controller.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+/**
+ * Banners master display controller.
+ *
+ * @since  1.6
+ */
+class BannersController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  BannersController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		BannersHelper::updateReset();
+
+		$view   = $this->input->get('view', 'banners');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'banner' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.banner', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_banners&view=banners', false));
+
+			return false;
+		}
+		elseif ($view == 'client' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.client', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_banners&view=clients', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_banners/controllers/banner.php b/core/administrator/components/com_banners/controllers/banner.php
new file mode 100644
index 00000000..eb48772f
--- /dev/null
+++ b/core/administrator/components/com_banners/controllers/banner.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Banner controller class.
+ *
+ * @since  1.6
+ */
+class BannersControllerBanner extends JControllerForm
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_BANNERS_BANNER';
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$filter     = $this->input->getInt('filter_category_id');
+		$categoryId = ArrayHelper::getValue($data, 'catid', $filter, 'int');
+		$allow      = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the URL check it.
+			$allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId);
+		}
+
+		if ($allow !== null)
+		{
+			return $allow;
+		}
+
+		// In the absence of better information, revert to the component permissions.
+		return parent::allowAdd($data);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId   = (int) isset($data[$key]) ? $data[$key] : 0;
+		$categoryId = 0;
+
+		if ($recordId)
+		{
+			$categoryId = (int) $this->getModel()->getItem($recordId)->catid;
+		}
+
+		if ($categoryId)
+		{
+			// The category has been set. Check the category permissions.
+			return JFactory::getUser()->authorise('core.edit', $this->option . '.category.' . $categoryId);
+		}
+
+		// Since there is no asset tracking, revert to the component permissions.
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   string  $model  The model
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Banner', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_banners&view=banners' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+}
diff --git a/core/administrator/components/com_banners/controllers/banners.php b/core/administrator/components/com_banners/controllers/banners.php
new file mode 100644
index 00000000..89f6c986
--- /dev/null
+++ b/core/administrator/components/com_banners/controllers/banners.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Banners list controller class.
+ *
+ * @since  1.6
+ */
+class BannersControllerBanners extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_BANNERS_BANNERS';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('sticky_unpublish', 'sticky_publish');
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Banner', $prefix = 'BannersModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Stick items
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function sticky_publish()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('sticky_publish' => 1, 'sticky_unpublish' => 0);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_BANNERS_NO_BANNERS_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var BannersModelBanner $model */
+			$model = $this->getModel();
+
+			// Change the state of the records.
+			if (!$model->stick($ids, $value))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				if ($value == 1)
+				{
+					$ntext = 'COM_BANNERS_N_BANNERS_STUCK';
+				}
+				else
+				{
+					$ntext = 'COM_BANNERS_N_BANNERS_UNSTUCK';
+				}
+
+				$this->setMessage(JText::plural($ntext, count($ids)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_banners&view=banners');
+	}
+}
diff --git a/core/administrator/components/com_banners/controllers/client.php b/core/administrator/components/com_banners/controllers/client.php
new file mode 100644
index 00000000..290d9d65
--- /dev/null
+++ b/core/administrator/components/com_banners/controllers/client.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Client controller class.
+ *
+ * @since  1.6
+ */
+class BannersControllerClient extends JControllerForm
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_BANNERS_CLIENT';
+}
diff --git a/core/administrator/components/com_banners/controllers/clients.php b/core/administrator/components/com_banners/controllers/clients.php
new file mode 100644
index 00000000..84f0206b
--- /dev/null
+++ b/core/administrator/components/com_banners/controllers/clients.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Clients list controller class.
+ *
+ * @since  1.6
+ */
+class BannersControllerClients extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_BANNERS_CLIENTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Client', $prefix = 'BannersModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_banners/controllers/tracks.php b/core/administrator/components/com_banners/controllers/tracks.php
new file mode 100644
index 00000000..92c6deda
--- /dev/null
+++ b/core/administrator/components/com_banners/controllers/tracks.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tracks list controller class.
+ *
+ * @since  1.6
+ */
+class BannersControllerTracks extends JControllerLegacy
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $context = 'com_banners.tracks';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to remove a record.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function delete()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Get the model.
+		/** @var BannersModelTracks $model */
+		$model = $this->getModel();
+
+		// Load the filter state.
+		$app = JFactory::getApplication();
+
+		$model->setState('filter.type', $app->getUserState($this->context . '.filter.type'));
+		$model->setState('filter.begin', $app->getUserState($this->context . '.filter.begin'));
+		$model->setState('filter.end', $app->getUserState($this->context . '.filter.end'));
+		$model->setState('filter.category_id', $app->getUserState($this->context . '.filter.category_id'));
+		$model->setState('filter.client_id', $app->getUserState($this->context . '.filter.client_id'));
+		$model->setState('list.limit', 0);
+		$model->setState('list.start', 0);
+
+		$count = $model->getTotal();
+
+		// Remove the items.
+		if (!$model->delete())
+		{
+			JError::raiseWarning(500, $model->getError());
+		}
+		elseif ($count > 0)
+		{
+			$this->setMessage(JText::plural('COM_BANNERS_TRACKS_N_ITEMS_DELETED', $count));
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_BANNERS_TRACKS_NO_ITEMS_DELETED'));
+		}
+
+		$this->setRedirect('index.php?option=com_banners&view=tracks');
+	}
+}
diff --git a/core/administrator/components/com_banners/controllers/tracks.raw.php b/core/administrator/components/com_banners/controllers/tracks.raw.php
new file mode 100644
index 00000000..aac04520
--- /dev/null
+++ b/core/administrator/components/com_banners/controllers/tracks.raw.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tracks list controller class.
+ *
+ * @since  1.6
+ */
+class BannersControllerTracks extends JControllerLegacy
+{
+	/**
+	 * The context for persistent state.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $context = 'com_banners.tracks';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  The prefix for the model class name.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = array())
+	{
+		return parent::getModel($name, $prefix, array('ignore_request' => true));
+	}
+
+	/**
+	 * Display method for the raw track data.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  BannersControllerTracks  This object to support chaining.
+	 *
+	 * @since   1.5
+	 * @todo    This should be done as a view, not here!
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		// Get the document object.
+		$vName = 'tracks';
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, 'raw'))
+		{
+			// Get the model for the view.
+			/** @var BannersModelTracks $model */
+			$model = $this->getModel($vName);
+
+			// Load the filter state.
+			$app = JFactory::getApplication();
+
+			$model->setState('filter.type', $app->getUserState($this->context . '.filter.type'));
+			$model->setState('filter.begin', $app->getUserState($this->context . '.filter.begin'));
+			$model->setState('filter.end', $app->getUserState($this->context . '.filter.end'));
+			$model->setState('filter.category_id', $app->getUserState($this->context . '.filter.category_id'));
+			$model->setState('filter.client_id', $app->getUserState($this->context . '.filter.client_id'));
+			$model->setState('list.limit', 0);
+			$model->setState('list.start', 0);
+
+			$form = $this->input->get('jform', array(), 'array');
+
+			$model->setState('basename', $form['basename']);
+			$model->setState('compressed', $form['compressed']);
+
+			// Create one year cookies.
+			$cookieLifeTime = time() + 365 * 86400;
+			$cookieDomain   = $app->get('cookie_domain', '');
+			$cookiePath     = $app->get('cookie_path', '/');
+			$isHttpsForced  = $app->isHttpsForced();
+
+			$app->input->cookie->set(
+				JApplicationHelper::getHash($this->context . '.basename'),
+				$form['basename'],
+				$cookieLifeTime,
+				$cookiePath,
+				$cookieDomain,
+				$isHttpsForced,
+				true
+			);
+
+			$app->input->cookie->set(
+				JApplicationHelper::getHash($this->context . '.compressed'),
+				$form['compressed'],
+				$cookieLifeTime,
+				$cookiePath,
+				$cookieDomain,
+				$isHttpsForced,
+				true
+			);
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+
+			// Push document object into the view.
+			$view->document = JFactory::getDocument();
+
+			$view->display();
+		}
+
+		return $this;
+	}
+}
diff --git a/core/administrator/components/com_banners/helpers/banners.php b/core/administrator/components/com_banners/helpers/banners.php
new file mode 100644
index 00000000..1af52a92
--- /dev/null
+++ b/core/administrator/components/com_banners/helpers/banners.php
@@ -0,0 +1,299 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Banners component helper.
+ *
+ * @since  1.6
+ */
+class BannersHelper extends JHelperContent
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_BANNERS_SUBMENU_BANNERS'),
+			'index.php?option=com_banners&view=banners',
+			$vName == 'banners'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_BANNERS_SUBMENU_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_banners',
+			$vName == 'categories'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_BANNERS_SUBMENU_CLIENTS'),
+			'index.php?option=com_banners&view=clients',
+			$vName == 'clients'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_BANNERS_SUBMENU_TRACKS'),
+			'index.php?option=com_banners&view=tracks',
+			$vName == 'tracks'
+		);
+	}
+
+	/**
+	 * Update / reset the banners
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public static function updateReset()
+	{
+		$db       = JFactory::getDbo();
+		$nullDate = $db->getNullDate();
+		$query    = $db->getQuery(true)
+			->select('*')
+			->from('#__banners')
+			->where($db->quote(JFactory::getDate()) . ' >= ' . $db->quote('reset'))
+			->where($db->quoteName('reset') . ' != ' . $db->quote($nullDate) . ' AND ' . $db->quoteName('reset') . '!= NULL')
+			->where(
+				'(' . $db->quoteName('checked_out') . ' = 0 OR ' . $db->quoteName('checked_out') . ' = '
+				. (int) $db->quote(JFactory::getUser()->id) . ')'
+			);
+		$db->setQuery($query);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return false;
+		}
+
+		JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
+
+		foreach ($rows as $row)
+		{
+			$purchaseType = $row->purchase_type;
+
+			if ($purchaseType < 0 && $row->cid)
+			{
+				/** @var BannersTableClient $client */
+				$client = JTable::getInstance('Client', 'BannersTable');
+				$client->load($row->cid);
+				$purchaseType = $client->purchase_type;
+			}
+
+			if ($purchaseType < 0)
+			{
+				$params = JComponentHelper::getParams('com_banners');
+				$purchaseType = $params->get('purchase_type');
+			}
+
+			switch ($purchaseType)
+			{
+				case 1:
+					$reset = $nullDate;
+					break;
+				case 2:
+					$date = JFactory::getDate('+1 year ' . date('Y-m-d'));
+					$reset = $db->quote($date->toSql());
+					break;
+				case 3:
+					$date = JFactory::getDate('+1 month ' . date('Y-m-d'));
+					$reset = $db->quote($date->toSql());
+					break;
+				case 4:
+					$date = JFactory::getDate('+7 day ' . date('Y-m-d'));
+					$reset = $db->quote($date->toSql());
+					break;
+				case 5:
+					$date = JFactory::getDate('+1 day ' . date('Y-m-d'));
+					$reset = $db->quote($date->toSql());
+					break;
+			}
+
+			// Update the row ordering field.
+			$query->clear()
+				->update($db->quoteName('#__banners'))
+				->set($db->quoteName('reset') . ' = ' . $db->quote($reset))
+				->set($db->quoteName('impmade') . ' = ' . $db->quote(0))
+				->set($db->quoteName('clicks') . ' = ' . $db->quote(0))
+				->where($db->quoteName('id') . ' = ' . $db->quote($row->id));
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $db->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get client list in text/value format for a select field
+	 *
+	 * @return  array
+	 */
+	public static function getClientOptions()
+	{
+		$options = array();
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('id AS value, name AS text')
+			->from('#__banner_clients AS a')
+			->where('a.state = 1')
+			->order('a.name');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		array_unshift($options, JHtml::_('select.option', '0', JText::_('COM_BANNERS_NO_CLIENT')));
+
+		return $options;
+	}
+
+	/**
+	 * Adds Count Items for Category Manager.
+	 *
+	 * @param   stdClass[]  $items  The banner category objects
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.5
+	 */
+	public static function countItems(&$items)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('state, count(*) AS count')
+				->from($db->qn('#__banners'))
+				->where('catid = ' . (int) $item->id)
+				->group('state');
+			$db->setQuery($query);
+			$banners = $db->loadObjectList();
+
+			foreach ($banners as $banner)
+			{
+				if ($banner->state == 1)
+				{
+					$item->count_published = $banner->count;
+				}
+
+				if ($banner->state == 0)
+				{
+					$item->count_unpublished = $banner->count;
+				}
+
+				if ($banner->state == 2)
+				{
+					$item->count_archived = $banner->count;
+				}
+
+				if ($banner->state == -2)
+				{
+					$item->count_trashed = $banner->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Adds Count Items for Tag Manager.
+	 *
+	 * @param   stdClass[]  $items      The banner tag objects
+	 * @param   string      $extension  The name of the active view.
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.6
+	 */
+	public static function countTagItems(&$items, $extension)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('published as state, count(*) AS count')
+				->from($db->qn('#__contentitem_tag_map') . 'AS ct ')
+				->where('ct.tag_id = ' . (int) $item->id)
+				->where('ct.type_alias =' . $db->q($extension))
+				->join('LEFT', $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id')
+				->group('state');
+
+			$db->setQuery($query);
+			$banners = $db->loadObjectList();
+
+			foreach ($banners as $banner)
+			{
+				if ($banner->state == 1)
+				{
+					$item->count_published = $banner->count;
+				}
+
+				if ($banner->state == 0)
+				{
+					$item->count_unpublished = $banner->count;
+				}
+
+				if ($banner->state == 2)
+				{
+					$item->count_archived = $banner->count;
+				}
+
+				if ($banner->state == -2)
+				{
+					$item->count_trashed = $banner->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+}
diff --git a/core/administrator/components/com_banners/helpers/html/banner.php b/core/administrator/components/com_banners/helpers/html/banner.php
new file mode 100644
index 00000000..fdbbebd2
--- /dev/null
+++ b/core/administrator/components/com_banners/helpers/html/banner.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Banner HTML class.
+ *
+ * @since  2.5
+ */
+abstract class JHtmlBanner
+{
+	/**
+	 * Display a batch widget for the client selector.
+	 *
+	 * @return  string  The necessary HTML for the widget.
+	 *
+	 * @since   2.5
+	 */
+	public static function clients()
+	{
+		JHtml::_('bootstrap.tooltip');
+
+		// Create the batch selector to change the client on a selection list.
+		return implode(
+			"\n",
+			array(
+				'<label id="batch-client-lbl" for="batch-client" class="hasTooltip" title="'
+					. JHtml::_('tooltipText', 'COM_BANNERS_BATCH_CLIENT_LABEL', 'COM_BANNERS_BATCH_CLIENT_LABEL_DESC')
+					. '">',
+				JText::_('COM_BANNERS_BATCH_CLIENT_LABEL'),
+				'</label>',
+				'<select name="batch[client_id]" id="batch-client-id">',
+				'<option value="">' . JText::_('COM_BANNERS_BATCH_CLIENT_NOCHANGE') . '</option>',
+				'<option value="0">' . JText::_('COM_BANNERS_NO_CLIENT') . '</option>',
+				JHtml::_('select.options', static::clientlist(), 'value', 'text'),
+				'</select>'
+			)
+		);
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	public static function clientlist()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('id As value, name As text')
+			->from('#__banner_clients AS a')
+			->order('a.name');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Returns a pinned state on a grid
+	 *
+	 * @param   integer  $value     The state value.
+	 * @param   integer  $i         The row index
+	 * @param   boolean  $enabled   An optional setting for access control on the action.
+	 * @param   string   $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string   The Html code
+	 *
+	 * @see     JHtmlJGrid::state
+	 * @since   2.5.5
+	 */
+	public static function pinned($value, $i, $enabled = true, $checkbox = 'cb')
+	{
+		$states = array(
+			1 => array(
+				'sticky_unpublish',
+				'COM_BANNERS_BANNERS_PINNED',
+				'COM_BANNERS_BANNERS_HTML_PIN_BANNER',
+				'COM_BANNERS_BANNERS_PINNED',
+				true,
+				'publish',
+				'publish'
+			),
+			0 => array(
+				'sticky_publish',
+				'COM_BANNERS_BANNERS_UNPINNED',
+				'COM_BANNERS_BANNERS_HTML_UNPIN_BANNER',
+				'COM_BANNERS_BANNERS_UNPINNED',
+				true,
+				'unpublish',
+				'unpublish'
+			),
+		);
+
+		return JHtml::_('jgrid.state', $states, $value, $i, 'banners.', $enabled, true, $checkbox);
+	}
+}
diff --git a/core/administrator/components/com_banners/models/banner.php b/core/administrator/components/com_banners/models/banner.php
new file mode 100644
index 00000000..bf1e6625
--- /dev/null
+++ b/core/administrator/components/com_banners/models/banner.php
@@ -0,0 +1,573 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Banner model.
+ *
+ * @since  1.6
+ */
+class BannersModelBanner extends JModelAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_BANNERS_BANNER';
+
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $typeAlias = 'com_banners.banner';
+
+	/**
+	 * Batch copy/move command. If set to false, the batch copy/move command is not supported
+	 *
+	 * @var  string
+	 */
+	protected $batch_copymove = 'category_id';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var  array
+	 */
+	protected $batch_commands = array(
+		'client_id'   => 'batchClient',
+		'language_id' => 'batchLanguage'
+	);
+
+	/**
+	 * Batch client changes for a group of banners.
+	 *
+	 * @param   string  $value     The new value matching a client.
+	 * @param   array   $pks       An array of row IDs.
+	 * @param   array   $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	protected function batchClient($value, $pks, $contexts)
+	{
+		// Set the variables
+		$user = JFactory::getUser();
+
+		/** @var BannersTableBanner $table */
+		$table = $this->getTable();
+
+		foreach ($pks as $pk)
+		{
+			if (!$user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+
+			$table->reset();
+			$table->load($pk);
+			$table->cid = (int) $value;
+
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch copy items to a new category or current.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   2.5
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		$categoryId = (int) $value;
+
+		/** @var BannersTableBanner $table */
+		$table  = $this->getTable();
+		$newIds = array();
+
+		// Check that the category exists
+		if ($categoryId)
+		{
+			$categoryTable = JTable::getInstance('Category');
+
+			if (!$categoryTable->load($categoryId))
+			{
+				if ($error = $categoryTable->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
+				return false;
+			}
+		}
+
+		if (empty($categoryId))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Check that the user has create permission for the component
+		if (!JFactory::getUser()->authorise('core.create', 'com_banners.category.' . $categoryId))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
+
+			return false;
+		}
+
+		// Parent exists so we let's proceed
+		while (!empty($pks))
+		{
+			// Pop the first ID off the stack
+			$pk = array_shift($pks);
+
+			$table->reset();
+
+			// Check that the row actually exists
+			if (!$table->load($pk))
+			{
+				if ($error = $table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+
+				// Not fatal error
+				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+				continue;
+			}
+
+			// Alter the title & alias
+			$data         = $this->generateNewTitle($categoryId, $table->alias, $table->name);
+			$table->name  = $data['0'];
+			$table->alias = $data['1'];
+
+			// Reset the ID because we are making a copy
+			$table->id = 0;
+
+			// New category ID
+			$table->catid = $categoryId;
+
+			// Unpublish because we are making a copy
+			$table->state = 0;
+
+			// TODO: Deal with ordering?
+			// $table->ordering = 1;
+
+			// Check the row.
+			if (!$table->check())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Store the row.
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return false;
+			}
+
+			if (!empty($record->catid))
+			{
+				return JFactory::getUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
+			}
+
+			return parent::canDelete($record);
+		}
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		// Check against the category.
+		if (!empty($record->catid))
+		{
+			return JFactory::getUser()->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid);
+		}
+
+		// Default to component settings if category not known.
+		return parent::canEditState($record);
+	}
+
+	/**
+	 * Returns a JTable object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate. [optional]
+	 * @param   string  $prefix  A prefix for the table class name. [optional]
+	 * @param   array   $config  Configuration array for model. [optional]
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Banner', $prefix = 'BannersTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form. [optional]
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not. [optional]
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_banners.banner', 'banner', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Determine correct permissions to check.
+		if ($this->getState('banner.id'))
+		{
+			// Existing record. Can only edit in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.edit');
+		}
+		else
+		{
+			// New record. Can only create in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.create');
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('publish_up', 'disabled', 'true');
+			$form->setFieldAttribute('publish_down', 'disabled', 'true');
+			$form->setFieldAttribute('state', 'disabled', 'true');
+			$form->setFieldAttribute('sticky', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('publish_up', 'filter', 'unset');
+			$form->setFieldAttribute('publish_down', 'filter', 'unset');
+			$form->setFieldAttribute('state', 'filter', 'unset');
+			$form->setFieldAttribute('sticky', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$app  = JFactory::getApplication();
+		$data = $app->getUserState('com_banners.edit.banner.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Prime some default values.
+			if ($this->getState('banner.id') == 0)
+			{
+				$filters     = (array) $app->getUserState('com_banners.banners.filter');
+				$filterCatId = isset($filters['category_id']) ? $filters['category_id'] : null;
+
+				$data->set('catid', $app->input->getInt('catid', $filterCatId));
+			}
+		}
+
+		$this->preprocessData('com_banners.banner', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to stick records.
+	 *
+	 * @param   array    $pks    The ids of the items to publish.
+	 * @param   integer  $value  The value of the published state
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function stick(&$pks, $value = 1)
+	{
+		/** @var BannersTableBanner $table */
+		$table = $this->getTable();
+		$pks   = (array) $pks;
+
+		// Access checks.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if (!$this->canEditState($table))
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+				}
+			}
+		}
+
+		// Attempt to change the state of the records.
+		if (!$table->stick($pks, $value, JFactory::getUser()->id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   JTable  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return array(
+			'catid = ' . (int) $table->catid,
+			'state >= 0'
+		);
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		if (empty($table->id))
+		{
+			// Set the values
+			$table->created    = $date->toSql();
+			$table->created_by = $user->id;
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from('#__banners');
+
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			// Set the values
+			$table->modified    = $date->toSql();
+			$table->modified_by = $user->id;
+		}
+
+		// Increment the content version number.
+		$table->version++;
+	}
+
+	/**
+	 * Allows preprocessing of the JForm object.
+	 *
+	 * @param   JForm   $form   The form object
+	 * @param   array   $data   The data to be merged into the form object
+	 * @param   string  $group  The plugin group to be executed
+	 *
+	 * @return  void
+	 *
+	 * @since    3.6.1
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		if ($this->canCreateCategory())
+		{
+			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$input = JFactory::getApplication()->input;
+
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// Cast catid to integer for comparison
+		$catid = (int) $data['catid'];
+
+		// Check if New Category exists
+		if ($catid > 0)
+		{
+			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_banners');
+		}
+
+		// Save New Category
+		if ($catid == 0 && $this->canCreateCategory())
+		{
+			$table              = array();
+			$table['title']     = $data['catid'];
+			$table['parent_id'] = 1;
+			$table['extension'] = 'com_banners';
+			$table['language']  = $data['language'];
+			$table['published'] = 1;
+
+			// Create new category and get catid back
+			$data['catid'] = CategoriesHelper::createCategory($table);
+		}
+
+		// Alter the name for save as copy
+		if ($input->get('task') == 'save2copy')
+		{
+			/** @var BannersTableBanner $origTable */
+			$origTable = clone $this->getTable();
+			$origTable->load($input->getInt('id'));
+
+			if ($data['name'] == $origTable->name)
+			{
+				list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['name']);
+				$data['name']       = $name;
+				$data['alias']      = $alias;
+			}
+			else
+			{
+				if ($data['alias'] == $origTable->alias)
+				{
+					$data['alias'] = '';
+				}
+			}
+
+			$data['state'] = 0;
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Is the user allowed to create an on the fly category?
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.1
+	 */
+	private function canCreateCategory()
+	{
+		return JFactory::getUser()->authorise('core.create', 'com_banners');
+	}
+}
diff --git a/core/administrator/components/com_banners/models/banners.php b/core/administrator/components/com_banners/models/banners.php
new file mode 100644
index 00000000..6cb80bcf
--- /dev/null
+++ b/core/administrator/components/com_banners/models/banners.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of banner records.
+ *
+ * @since  1.6
+ */
+class BannersModelBanners extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'cid', 'a.cid', 'client_name',
+				'name', 'a.name',
+				'alias', 'a.alias',
+				'state', 'a.state',
+				'ordering', 'a.ordering',
+				'language', 'a.language',
+				'catid', 'a.catid', 'category_title',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'created', 'a.created',
+				'impmade', 'a.impmade',
+				'imptotal', 'a.imptotal',
+				'clicks', 'a.clicks',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'sticky', 'a.sticky',
+				'client_id',
+				'category_id',
+				'published',
+				'level', 'c.level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get the maximum ordering value for each category.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function &getCategoryOrders()
+	{
+		if (!isset($this->cache['categoryorders']))
+		{
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select('MAX(ordering) as ' . $db->quoteName('max') . ', catid')
+				->select('catid')
+				->from('#__banners')
+				->group('catid');
+			$db->setQuery($query);
+			$this->cache['categoryorders'] = $db->loadAssocList('catid', 0);
+		}
+
+		return $this->cache['categoryorders'];
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id AS id,'
+				. 'a.name AS name,'
+				. 'a.alias AS alias,'
+				. 'a.checked_out AS checked_out,'
+				. 'a.checked_out_time AS checked_out_time,'
+				. 'a.catid AS catid,'
+				. 'a.clicks AS clicks,'
+				. 'a.metakey AS metakey,'
+				. 'a.sticky AS sticky,'
+				. 'a.impmade AS impmade,'
+				. 'a.imptotal AS imptotal,'
+				. 'a.state AS state,'
+				. 'a.ordering AS ordering,'
+				. 'a.purchase_type AS purchase_type,'
+				. 'a.language,'
+				. 'a.publish_up,'
+				. 'a.publish_down'
+			)
+		);
+		$query->from($db->quoteName('#__banners', 'a'));
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON l.lang_code = a.language');
+
+		// Join over the users for the checked out user.
+		$query->select($db->quoteName('uc.name', 'editor'))
+			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON uc.id = a.checked_out');
+
+		// Join over the categories.
+		$query->select($db->quoteName('c.title', 'category_title'))
+			->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON c.id = a.catid');
+
+		// Join over the clients.
+		$query->select($db->quoteName('cl.name', 'client_name'))
+			->select($db->quoteName('cl.purchase_type', 'client_purchase_type'))
+			->join('LEFT', $db->quoteName('#__banner_clients', 'cl') . ' ON cl.id = a.cid');
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where($db->quoteName('a.state') . ' = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where($db->quoteName('a.state') . ' IN (0, 1)');
+		}
+
+		// Filter by category.
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId);
+		}
+
+		// Filter by client.
+		$clientId = $this->getState('filter.client_id');
+
+		if (is_numeric($clientId))
+		{
+			$query->where($db->quoteName('a.cid') . ' = ' . (int) $clientId);
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(a.name LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where($db->quoteName('a.language') . ' = ' . $db->quote($language));
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where($db->quoteName('c.level') . ' <= ' . (int) $level);
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering', 'a.name');
+		$orderDirn = $this->state->get('list.direction', 'ASC');
+
+		if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
+		{
+			$orderCol = 'c.title ' . $orderDirn . ', a.ordering';
+		}
+
+		if ($orderCol == 'client_name')
+		{
+			$orderCol = 'cl.name';
+		}
+
+		$query->order($db->escape($orderCol . ' ' . $orderDirn));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.category_id');
+		$id .= ':' . $this->getState('filter.client_id');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Banner', $prefix = 'BannersTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.name', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
+		$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', '', 'cmd'));
+		$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_banners'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+}
diff --git a/core/administrator/components/com_banners/models/client.php b/core/administrator/components/com_banners/models/client.php
new file mode 100644
index 00000000..55778483
--- /dev/null
+++ b/core/administrator/components/com_banners/models/client.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Client model.
+ *
+ * @since  1.6
+ */
+class BannersModelClient extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $typeAlias = 'com_banners.client';
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return false;
+			}
+
+			$user = JFactory::getUser();
+
+			if (!empty($record->catid))
+			{
+				return $user->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
+			}
+
+			return $user->authorise('core.delete', 'com_banners');
+		}
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record.
+	 *                   Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		if (!empty($record->catid))
+		{
+			return $user->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid);
+		}
+
+		return $user->authorise('core.edit.state', 'com_banners');
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable	A JTable object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Client', $prefix = 'BannersTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_banners.client', 'client', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_banners.edit.client.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_banners.client', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+	}
+}
diff --git a/core/administrator/components/com_banners/models/clients.php b/core/administrator/components/com_banners/models/clients.php
new file mode 100644
index 00000000..5908ecf8
--- /dev/null
+++ b/core/administrator/components/com_banners/models/clients.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Methods supporting a list of banner records.
+ *
+ * @since  1.6
+ */
+class BannersModelClients extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'contact', 'a.contact',
+				'state', 'a.state',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'purchase_type', 'a.purchase_type'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.name', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'));
+		$this->setState('filter.purchase_type', $this->getUserStateFromRequest($this->context . '.filter.purchase_type', 'filter_purchase_type'));
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_banners'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.purchase_type');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		$defaultPurchase = JComponentHelper::getParams('com_banners')->get('purchase_type', 3);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id AS id,'
+				. 'a.name AS name,'
+				. 'a.contact AS contact,'
+				. 'a.checked_out AS checked_out,'
+				. 'a.checked_out_time AS checked_out_time, '
+				. 'a.state AS state,'
+				. 'a.metakey AS metakey,'
+				. 'a.purchase_type as purchase_type'
+			)
+		);
+
+		$query->from($db->quoteName('#__banner_clients') . ' AS a');
+
+		// Join over the banners for counting
+		$query->select('COUNT(b.id) as nbanners')
+			->join('LEFT', '#__banners AS b ON a.id = b.cid');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Filter by published state
+		$published = $this->getState('filter.state');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state IN (0, 1))');
+		}
+
+		$query->group('a.id, a.name, a.contact, a.checked_out, a.checked_out_time, a.state, a.metakey, a.purchase_type, uc.name');
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('a.name LIKE ' . $search);
+			}
+		}
+
+		// Filter by purchase type
+		$purchaseType = $this->getState('filter.purchase_type');
+
+		if (!empty($purchaseType))
+		{
+			if ($defaultPurchase == $purchaseType)
+			{
+				$query->where('(a.purchase_type = ' . (int) $purchaseType . ' OR a.purchase_type = -1)');
+			}
+			else
+			{
+				$query->where('a.purchase_type = ' . (int) $purchaseType);
+			}
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.name')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Overrides the getItems method to attach additional metrics to the list.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.6
+	 */
+	public function getItems()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId('getItems');
+
+		// Try to load the data from internal storage.
+		if (!empty($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		// Load the list items.
+		$items = parent::getItems();
+
+		// If emtpy or an error, just return.
+		if (empty($items))
+		{
+			return array();
+		}
+
+		// Getting the following metric by joins is WAY TOO SLOW.
+		// Faster to do three queries for very large banner trees.
+
+		// Get the clients in the list.
+		$db = $this->getDbo();
+		$clientIds = ArrayHelper::getColumn($items, 'id');
+
+		// Quote the strings.
+		$clientIds = implode(
+			',',
+			array_map(array($db, 'quote'), $clientIds)
+		);
+
+		// Get the published banners count.
+		$query = $db->getQuery(true)
+			->select('cid, COUNT(cid) AS count_published')
+			->from('#__banners')
+			->where('state = 1')
+			->where('cid IN (' . $clientIds . ')')
+			->group('cid');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$countPublished = $db->loadAssocList('cid', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Get the unpublished banners count.
+		$query->clear('where')
+			->where('state = 0')
+			->where('cid IN (' . $clientIds . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$countUnpublished = $db->loadAssocList('cid', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Get the trashed banners count.
+		$query->clear('where')
+			->where('state = -2')
+			->where('cid IN (' . $clientIds . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$countTrashed = $db->loadAssocList('cid', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Get the archived banners count.
+		$query->clear('where')
+			->where('state = 2')
+			->where('cid IN (' . $clientIds . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$countArchived = $db->loadAssocList('cid', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Inject the values back into the array.
+		foreach ($items as $item)
+		{
+			$item->count_published   = isset($countPublished[$item->id]) ? $countPublished[$item->id] : 0;
+			$item->count_unpublished = isset($countUnpublished[$item->id]) ? $countUnpublished[$item->id] : 0;
+			$item->count_trashed     = isset($countTrashed[$item->id]) ? $countTrashed[$item->id] : 0;
+			$item->count_archived    = isset($countArchived[$item->id]) ? $countArchived[$item->id] : 0;
+		}
+
+		// Add the items to the internal cache.
+		$this->cache[$store] = $items;
+
+		return $this->cache[$store];
+	}
+}
diff --git a/core/administrator/components/com_banners/models/download.php b/core/administrator/components/com_banners/models/download.php
new file mode 100644
index 00000000..ae066753
--- /dev/null
+++ b/core/administrator/components/com_banners/models/download.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Download model.
+ *
+ * @since  1.5
+ */
+class BannersModelDownload extends JModelForm
+{
+	/**
+	 * The model context
+	 *
+	 * @var  string
+	 */
+	protected $_context = 'com_banners.tracks';
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$input = JFactory::getApplication()->input;
+
+		$this->setState('basename', $input->cookie->getString(JApplicationHelper::getHash($this->_context . '.basename'), '__SITE__'));
+		$this->setState('compressed', $input->cookie->getInt(JApplicationHelper::getHash($this->_context . '.compressed'), 1));
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_banners.download', 'download', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		$data = (object) array(
+			'basename'   => $this->getState('basename'),
+			'compressed' => $this->getState('compressed'),
+		);
+
+		$this->preprocessData('com_banners.download', $data);
+
+		return $data;
+	}
+}
diff --git a/core/administrator/components/com_banners/models/fields/bannerclient.php b/core/administrator/components/com_banners/models/fields/bannerclient.php
new file mode 100644
index 00000000..9fa42f3c
--- /dev/null
+++ b/core/administrator/components/com_banners/models/fields/bannerclient.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Bannerclient field.
+ *
+ * @since  1.6
+ */
+class JFormFieldBannerClient extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'BannerClient';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	public function getOptions()
+	{
+		return array_merge(parent::getOptions(), BannersHelper::getClientOptions());
+	}
+}
diff --git a/core/administrator/components/com_banners/models/fields/clicks.php b/core/administrator/components/com_banners/models/fields/clicks.php
new file mode 100644
index 00000000..d7ea386c
--- /dev/null
+++ b/core/administrator/components/com_banners/models/fields/clicks.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Clicks field.
+ *
+ * @since  1.6
+ */
+class JFormFieldClicks extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'Clicks';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$onclick = ' onclick="document.getElementById(\'' . $this->id . '\').value=\'0\';"';
+
+		return '<input class="input-small" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
+			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> <a class="btn" ' . $onclick . '>'
+			. '<span class="icon-refresh" aria-hidden="true"></span> ' . JText::_('COM_BANNERS_RESET_CLICKS') . '</a>';
+	}
+}
diff --git a/core/administrator/components/com_banners/models/fields/impmade.php b/core/administrator/components/com_banners/models/fields/impmade.php
new file mode 100644
index 00000000..6c2f9ea3
--- /dev/null
+++ b/core/administrator/components/com_banners/models/fields/impmade.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Impressions field.
+ *
+ * @since  1.6
+ */
+class JFormFieldImpMade extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'ImpMade';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$onclick = ' onclick="document.getElementById(\'' . $this->id . '\').value=\'0\';"';
+
+		return '<input class="input-small" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
+			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> <a class="btn" ' . $onclick . '>'
+			. '<span class="icon-refresh" aria-hidden="true"></span> ' . JText::_('COM_BANNERS_RESET_IMPMADE') . '</a>';
+	}
+}
diff --git a/core/administrator/components/com_banners/models/fields/imptotal.php b/core/administrator/components/com_banners/models/fields/imptotal.php
new file mode 100644
index 00000000..f0ce87ee
--- /dev/null
+++ b/core/administrator/components/com_banners/models/fields/imptotal.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Total Impressions field.
+ *
+ * @since  1.6
+ */
+class JFormFieldImpTotal extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'ImpTotal';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$class    = ' class="validate-numeric text_area"';
+		$onchange = ' onchange="document.getElementById(\'' . $this->id . '_unlimited\').checked=document.getElementById(\'' . $this->id
+			. '\').value==\'\';"';
+		$onclick  = ' onclick="if (document.getElementById(\'' . $this->id . '_unlimited\').checked) document.getElementById(\'' . $this->id
+			. '\').value=\'\';"';
+		$value    = empty($this->value) ? '' : $this->value;
+		$checked  = empty($this->value) ? ' checked="checked"' : '';
+
+		return '<input type="text" name="' . $this->name . '" id="' . $this->id . '" size="9" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8')
+			. '" ' . $class . $onchange . ' />'
+			. '<fieldset class="checkbox impunlimited"><input id="' . $this->id . '_unlimited" type="checkbox"' . $checked . $onclick . ' />'
+			. '<label for="' . $this->id . '_unlimited" id="jform-imp" type="text">' . JText::_('COM_BANNERS_UNLIMITED') . '</label></fieldset>';
+	}
+}
diff --git a/core/administrator/components/com_banners/models/forms/banner.xml b/core/administrator/components/com_banners/models/forms/banner.xml
new file mode 100644
index 00000000..ed79d804
--- /dev/null
+++ b/core/administrator/components/com_banners/models/forms/banner.xml
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="details" addfieldpath="/administrator/components/com_banners/models/fields">
+
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			readonly="true"
+			class="readonly"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="COM_BANNERS_FIELD_NAME_LABEL"
+			description="COM_BANNERS_FIELD_NAME_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="COM_BANNERS_FIELD_ALIAS_DESC"
+			size="40"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+		/>
+
+		<field
+			name="catid"
+			type="categoryedit"
+			label="JCATEGORY"
+			description="COM_BANNERS_FIELD_CATEGORY_DESC"
+			extension="com_banners"
+			required="true"
+			addfieldpath="/administrator/components/com_categories/models/fields"
+			default=""
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="COM_BANNERS_FIELD_STATE_DESC"
+			class="chzn-color-state"
+			size="1"
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="ordering"
+			type="ordering"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			table="#__banners"
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_BANNERS_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			maxlength="255"
+			class="span12"
+			size="45"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="description"
+			type="editor"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_BANNERS_FIELD_DESCRIPTION_DESC"
+			filter="JComponentHelper::filterText"
+			buttons="true"
+			hide="readmore,pagebreak,module,article,contact,menu"
+		/>
+
+		<field
+			name="type"
+			type="list"
+			label="COM_BANNERS_FIELD_TYPE_LABEL"
+			description="COM_BANNERS_FIELD_TYPE_DESC"
+			default="0"
+			>
+			<option value="0">COM_BANNERS_FIELD_VALUE_IMAGE</option>
+			<option value="1">COM_BANNERS_FIELD_VALUE_CUSTOM</option>
+		</field>
+
+		<field
+			name="custombannercode"
+			type="textarea"
+			label="COM_BANNERS_FIELD_CUSTOMCODE_LABEL"
+			description="COM_BANNERS_FIELD_CUSTOMCODE_DESC"
+			rows="3"
+			cols="30"
+			filter="raw"
+		/>
+
+		<field
+			name="clickurl"
+			type="url"
+			label="COM_BANNERS_FIELD_CLICKURL_LABEL"
+			description="COM_BANNERS_FIELD_CLICKURL_DESC"
+			filter="url"
+		/>
+	</fieldset>
+
+	<fieldset name="publish" label="COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS">
+
+		<field
+			name="created"
+			type="calendar"
+			label="COM_BANNERS_FIELD_CREATED_LABEL"
+			description="COM_BANNERS_FIELD_CREATED_DESC"
+			size="22"
+			translateformat="true"
+			showtime="true"
+			filter="user_utc"
+		/>
+
+		<field
+			name="created_by"
+			type="user"
+			label="COM_BANNERS_FIELD_CREATED_BY_LABEL"
+			description="COM_BANNERS_FIELD_CREATED_BY_DESC"
+		/>
+
+		<field
+			name="created_by_alias"
+			type="text"
+			label="COM_BANNERS_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="COM_BANNERS_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			description="COM_BANNERS_FIELD_MODIFIED_DESC"
+			class="readonly"
+			size="22"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="COM_BANNERS_FIELD_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="version"
+			type="text"
+			label="COM_BANNERS_FIELD_VERSION_LABEL"
+			description="COM_BANNERS_FIELD_VERSION_DESC"
+			class="readonly"
+			size="6"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="COM_BANNERS_FIELD_PUBLISH_UP_LABEL"
+			description="COM_BANNERS_FIELD_PUBLISH_UP_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL"
+			description="COM_BANNERS_FIELD_PUBLISH_DOWN_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+	</fieldset>
+
+	<fieldset name="bannerdetails" label="COM_BANNERS_GROUP_LABEL_BANNER_DETAILS">
+
+		<field
+			name="sticky"
+			type="radio"
+			label="COM_BANNERS_FIELD_STICKY_LABEL"
+			description="COM_BANNERS_FIELD_STICKY_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
+
+	<fieldset name="otherparams">
+		<field
+			name="imptotal"
+			type="imptotal"
+			label="COM_BANNERS_FIELD_IMPTOTAL_LABEL"
+			description="COM_BANNERS_FIELD_IMPTOTAL_DESC"
+			default="0"
+		/>
+
+		<field
+			name="impmade"
+			type="impmade"
+			label="COM_BANNERS_FIELD_IMPMADE_LABEL"
+			description="COM_BANNERS_FIELD_IMPMADE_DESC"
+			default="0"
+		/>
+
+		<field
+			name="clicks"
+			type="clicks"
+			label="COM_BANNERS_FIELD_CLICKS_LABEL"
+			description="COM_BANNERS_FIELD_CLICKS_DESC"
+			default="0"
+		/>
+
+		<field
+			name="cid"
+			type="bannerclient"
+			label="COM_BANNERS_FIELD_CLIENT_LABEL"
+			description="COM_BANNERS_FIELD_CLIENT_DESC"
+		/>
+
+		<field
+			name="purchase_type"
+			type="list"
+			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
+			description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
+			default="0"
+			>
+			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT</option>
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
+		</field>
+
+		<field
+			name="track_impressions"
+			type="list"
+			label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
+			description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC"
+			default="0"
+			>
+			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			name="track_clicks"
+			type="list"
+			label="COM_BANNERS_FIELD_TRACKCLICK_LABEL"
+			description="COM_BANNERS_FIELD_TRACKCLICK_DESC"
+			default="0"
+			>
+			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+	</fieldset>
+
+	<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+		<field
+			name="metakey"
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="COM_BANNERS_FIELD_METAKEYWORDS_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field
+			name="own_prefix"
+			type="radio"
+			label="COM_BANNERS_FIELD_BANNEROWNPREFIX_LABEL"
+			description="COM_BANNERS_FIELD_BANNEROWNPREFIX_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="metakey_prefix"
+			type="text"
+			label="COM_BANNERS_FIELD_METAKEYWORDPREFIX_LABEL"
+			description="COM_BANNERS_FIELD_METAKEYWORDPREFIX_DESC"
+		/>
+	</fieldset>
+
+	<fields name="params" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
+		<fieldset name="image">
+			<field
+				name="imageurl"
+				type="media"
+				label="COM_BANNERS_FIELD_IMAGE_LABEL"
+				description="COM_BANNERS_FIELD_IMAGE_DESC"
+				directory="banners"
+				hide_none="1"
+				size="40"
+			/>
+
+			<field
+				name="width"
+				type="number"
+				label="COM_BANNERS_FIELD_WIDTH_LABEL"
+				description="COM_BANNERS_FIELD_WIDTH_DESC"
+				class="input-mini validate-numeric"
+			/>
+
+			<field
+				name="height"
+				type="number"
+				label="COM_BANNERS_FIELD_HEIGHT_LABEL"
+				description="COM_BANNERS_FIELD_HEIGHT_DESC"
+				class="input-mini validate-numeric"
+			/>
+
+			<field
+				name="alt"
+				type="text"
+				label="COM_BANNERS_FIELD_ALT_LABEL"
+				description="COM_BANNERS_FIELD_ALT_DESC"
+			/>
+		</fieldset>
+	</fields>
+
+	<fieldset name="custom">
+		<field
+			name="bannercode"
+			type="textarea"
+			label="COM_BANNERS_FIELD_CUSTOMCODE_LABEL"
+			description="COM_BANNERS_FIELD_CUSTOMCODE_DESC"
+			rows="3"
+			cols="30"
+			filter="raw"
+		/>
+	</fieldset>
+
+</form>
diff --git a/core/administrator/components/com_banners/models/forms/client.xml b/core/administrator/components/com_banners/models/forms/client.xml
new file mode 100644
index 00000000..a3bb8f70
--- /dev/null
+++ b/core/administrator/components/com_banners/models/forms/client.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="details" addfieldpath="/administrator/components/com_banners/models/fields">
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			readonly="true"
+			class="readonly"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="COM_BANNERS_FIELD_NAME_LABEL"
+			description="COM_BANNERS_FIELD_CLIENT_NAME_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="contact"
+			type="text"
+			label="COM_BANNERS_FIELD_CONTACT_LABEL"
+			description="COM_BANNERS_FIELD_CONTACT_DESC"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="email"
+			type="email"
+			label="COM_BANNERS_FIELD_EMAIL_LABEL"
+			description="COM_BANNERS_FIELD_EMAIL_DESC"
+			size="40"
+			validate="email"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="COM_BANNERS_FIELD_CLIENT_STATE_DESC"
+			class="chzn-color-state"
+			size="1"
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			maxlength="255"
+			size="45"
+			labelclass="control-label"
+		/>
+
+		<field
+			name="purchase_type"
+			type="list"
+			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL"
+			description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
+			default="0"
+			>
+			<option value="-1">JGLOBAL_USE_GLOBAL</option>
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
+		</field>
+
+		<field
+			name="track_impressions"
+			type="list"
+			label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
+			description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC"
+			default="0"
+			class="chzn-color"
+			>
+			<option value="-1">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			name="track_clicks"
+			type="list"
+			label="COM_BANNERS_FIELD_TRACKCLICK_LABEL"
+			description="COM_BANNERS_FIELD_TRACKCLICK_DESC"
+			default="0"
+			class="chzn-color"
+			>
+			<option value="-1">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+		<field
+			name="metakey"
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="COM_BANNERS_FIELD_CLIENT_METAKEYWORDS_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field
+			name="own_prefix"
+			type="radio"
+			label="COM_BANNERS_FIELD_CLIENTOWNPREFIX_LABEL"
+			description="COM_BANNERS_FIELD_CLIENTOWNPREFIX_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="metakey_prefix"
+			type="text"
+			label="COM_BANNERS_FIELD_CLIENT_METAKEYWORDPREFIX_LABEL"
+			description="COM_BANNERS_FIELD_CLIENT_METAKEYWORDPREFIX_DESC"
+		/>
+	</fieldset>
+
+	<fieldset name="extra" label="COM_BANNERS_EXTRA">
+		<field
+			name="extrainfo"
+			type="textarea"
+			label="COM_BANNERS_FIELD_EXTRAINFO_LABEL"
+			description="COM_BANNERS_FIELD_EXTRAINFO_DESC"
+			class="span12"
+			rows="5"
+			cols="80"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_banners/models/forms/download.xml b/core/administrator/components/com_banners/models/forms/download.xml
new file mode 100644
index 00000000..17c0cc6e
--- /dev/null
+++ b/core/administrator/components/com_banners/models/forms/download.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset name="details">
+
+		<field
+			name="compressed"
+			type="radio"
+			label="COM_BANNERS_FIELD_COMPRESSED_LABEL"
+			description="COM_BANNERS_FIELD_COMPRESSED_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="basename"
+			type="text"
+			label="COM_BANNERS_FIELD_BASENAME_LABEL"
+			size="40"
+		/>
+
+		<field
+			name="basename_info"
+			type="note"
+			description="COM_BANNERS_FIELD_BASENAME_DESC"
+			class="alert alert-info"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_banners/models/forms/filter_banners.xml b/core/administrator/components/com_banners/models/forms/filter_banners.xml
new file mode 100644
index 00000000..76268022
--- /dev/null
+++ b/core/administrator/components/com_banners/models/forms/filter_banners.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter" addfieldpath="/administrator/components/com_banners/models/fields">
+		<field
+			name="search"
+			type="text"
+			label="COM_BANNERS_BANNERS_FILTER_SEARCH_LABEL"
+			description="COM_BANNERS_BANNERS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="JOPTION_SELECT_PUBLISHED"
+			description="JOPTION_SELECT_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_banners"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="client_id"
+			type="bannerclient"
+			label="COM_BANNERS_FILTER_CLIENT"
+			description="COM_BANNERS_FILTER_CLIENT_DESC"
+			extension="com_content"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_BANNERS_SELECT_CLIENT</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			default="a.name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_BANNERS_HEADING_NAME_ASC</option>
+			<option value="a.name DESC">COM_BANNERS_HEADING_NAME_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="a.sticky ASC">COM_BANNERS_HEADING_STICKY_ASC</option>
+			<option value="a.sticky DESC">COM_BANNERS_HEADING_STICKY_DESC</option>
+			<option value="client_name ASC">COM_BANNERS_HEADING_CLIENT_ASC</option>
+			<option value="client_name DESC">COM_BANNERS_HEADING_CLIENT_DESC</option>
+			<option value="impmade ASC">COM_BANNERS_HEADING_IMPRESSIONS_ASC</option>
+			<option value="impmade DESC">COM_BANNERS_HEADING_IMPRESSIONS_DESC</option>
+			<option value="clicks ASC">COM_BANNERS_HEADING_CLICKS_ASC</option>
+			<option value="clicks DESC">COM_BANNERS_HEADING_CLICKS_DESC</option>
+			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_BANNERS_LIST_LIMIT"
+			description="COM_BANNERS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_banners/models/forms/filter_clients.xml b/core/administrator/components/com_banners/models/forms/filter_clients.xml
new file mode 100644
index 00000000..1552335b
--- /dev/null
+++ b/core/administrator/components/com_banners/models/forms/filter_clients.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_BANNERS_CLIENTS_FILTER_SEARCH_LABEL"
+			description="COM_BANNERS_CLIENTS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			label="JOPTION_SELECT_PUBLISHED"
+			description="JOPTION_SELECT_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="purchase_type"
+			type="list"
+			label="COM_BANNERS_FILTER_PURCHASETYPE_LABEL"
+			description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
+			default="0"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_BANNERS_SELECT_TYPE</option>
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			default="a.name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">COM_BANNERS_HEADING_CLIENT_ASC</option>
+			<option value="a.name DESC">COM_BANNERS_HEADING_CLIENT_DESC</option>
+			<option value="a.contact ASC">COM_BANNERS_HEADING_CONTACT_ASC</option>
+			<option value="a.contact DESC">COM_BANNERS_HEADING_CONTACT_DESC</option>
+			<option value="a.purchase_type ASC">COM_BANNERS_HEADING_PURCHASETYPE_ASC</option>
+			<option value="a.purchase_type DESC">COM_BANNERS_HEADING_PURCHASETYPE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_BANNERS_LIST_LIMIT"
+			description="COM_BANNERS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_banners/models/forms/filter_tracks.xml b/core/administrator/components/com_banners/models/forms/filter_tracks.xml
new file mode 100644
index 00000000..449c4e57
--- /dev/null
+++ b/core/administrator/components/com_banners/models/forms/filter_tracks.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter" addfieldpath="/administrator/components/com_banners/models/fields">
+		<field
+			name="search"
+			type="text"
+			label="COM_BANNERS_TRACKS_FILTER_SEARCH_LABEL"
+			description="COM_BANNERS_TRACKS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_banners"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="client_id"
+			type="bannerclient"
+			label="COM_BANNERS_FILTER_CLIENT"
+			description="COM_BANNERS_FILTER_CLIENT_DESC"
+			extension="com_content"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_BANNERS_SELECT_CLIENT</option>
+		</field>
+
+		<field
+			name="type"
+			type="list"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_BANNERS_SELECT_TYPE</option>
+			<option value="1">COM_BANNERS_TYPE1</option>
+			<option value="2">COM_BANNERS_TYPE2</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+
+		<field
+			name="begin"
+			type="calendar"
+			label="COM_BANNERS_BEGIN_LABEL"
+			description="COM_BANNERS_BEGIN_DESC"
+			hint="COM_BANNERS_BEGIN_HINT"
+			format="%Y-%m-%d"
+			size="10"
+			filter="user_utc"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="end"
+			type="calendar"
+			label="COM_BANNERS_END_LABEL"
+			description="COM_BANNERS_END_DESC"
+			hint="COM_BANNERS_END_HINT"
+			format="%Y-%m-%d"
+			size="10"
+			filter="user_utc"
+			onchange="this.form.submit();"
+		/>
+    </fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="b.name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="b.name ASC">COM_BANNERS_HEADING_NAME_ASC</option>
+			<option value="b.name DESC">COM_BANNERS_HEADING_NAME_DESC</option>
+			<option value="cl.name ASC">COM_BANNERS_HEADING_CLIENT_ASC</option>
+			<option value="cl.name DESC">COM_BANNERS_HEADING_CLIENT_DESC</option>
+			<option value="a.track_type ASC">COM_BANNERS_HEADING_TYPE_ASC</option>
+			<option value="a.track_type DESC">COM_BANNERS_HEADING_TYPE_DESC</option>
+			<option value="a.count ASC">COM_BANNERS_HEADING_COUNT_ASC</option>
+			<option value="a.count DESC">COM_BANNERS_HEADING_COUNT_DESC</option>
+			<option value="a.track_date ASC">JDATE_ASC</option>
+			<option value="a.track_date DESC">JDATE_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="5"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_banners/models/tracks.php b/core/administrator/components/com_banners/models/tracks.php
new file mode 100644
index 00000000..273f635c
--- /dev/null
+++ b/core/administrator/components/com_banners/models/tracks.php
@@ -0,0 +1,542 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Archive\Archive;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+/**
+ * Methods supporting a list of tracks.
+ *
+ * @since  1.6
+ */
+class BannersModelTracks extends JModelList
+{
+	/**
+	 * The base name
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $basename;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'b.name', 'banner_name',
+				'cl.name', 'client_name', 'client_id',
+				'c.title', 'category_title', 'category_id',
+				'track_type', 'a.track_type', 'type',
+				'count', 'a.count',
+				'track_date', 'a.track_date', 'end', 'begin',
+				'level', 'c.level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'b.name', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
+		$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', '', 'cmd'));
+		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'cmd'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+		$this->setState('filter.begin', $this->getUserStateFromRequest($this->context . '.filter.begin', 'filter_begin', '', 'string'));
+		$this->setState('filter.end', $this->getUserStateFromRequest($this->context . '.filter.end', 'filter_end', '', 'string'));
+
+		// Load the parameters.
+		$this->setState('params', JComponentHelper::getParams('com_banners'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select($db->quoteName(array('a.track_date', 'a.track_type', 'a.count')))
+			->select($db->quoteName('b.name', 'banner_name'))
+			->select($db->quoteName('cl.name', 'client_name'))
+			->select($db->quoteName('c.title', 'category_title'));
+
+		// From tracks table.
+		$query->from($db->quoteName('#__banner_tracks', 'a'));
+
+		// Join with the banners.
+		$query->join('LEFT', $db->quoteName('#__banners', 'b') . ' ON ' . $db->quoteName('b.id') . ' = ' . $db->quoteName('a.banner_id'));
+
+		// Join with the client.
+		$query->join('LEFT', $db->quoteName('#__banner_clients', 'cl') . ' ON ' . $db->quoteName('cl.id') . ' = ' . $db->quoteName('b.cid'));
+
+		// Join with the category.
+		$query->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName('b.catid'));
+
+		// Filter by type.
+		$type = $this->getState('filter.type');
+
+		if (!empty($type))
+		{
+			$query->where($db->quoteName('a.track_type') . ' = ' . (int) $type);
+		}
+
+		// Filter by client.
+		$clientId = $this->getState('filter.client_id');
+
+		if (is_numeric($clientId))
+		{
+			$query->where($db->quoteName('b.cid') . ' = ' . (int) $clientId);
+		}
+
+		// Filter by category.
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$query->where($db->quoteName('b.catid') . ' = ' . (int) $categoryId);
+		}
+
+		// Filter by begin date.
+
+		$begin = $this->getState('filter.begin');
+
+		if (!empty($begin))
+		{
+			$query->where($db->quoteName('a.track_date') . ' >= ' . $db->quote($begin));
+		}
+
+		// Filter by end date.
+		$end = $this->getState('filter.end');
+
+		if (!empty($end))
+		{
+			$query->where($db->quoteName('a.track_date') . ' <= ' . $db->quote($end));
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where($db->quoteName('c.level') . ' <= ' . (int) $level);
+		}
+
+		// Filter by search in banner name or client name.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			$search = $db->quote('%' . strtolower($search) . '%');
+			$query->where('(LOWER(b.name) LIKE ' . $search . ' OR LOWER(cl.name) LIKE ' . $search . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'b.name')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to delete rows.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 */
+	public function delete()
+	{
+		$user       = JFactory::getUser();
+		$categoryId = $this->getState('category_id');
+
+		// Access checks.
+		if ($categoryId)
+		{
+			$allow = $user->authorise('core.delete', 'com_banners.category.' . (int) $categoryId);
+		}
+		else
+		{
+			$allow = $user->authorise('core.delete', 'com_banners');
+		}
+
+		if ($allow)
+		{
+			// Delete tracks from this banner
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__banner_tracks'));
+
+			// Filter by type
+			$type = $this->getState('filter.type');
+
+			if (!empty($type))
+			{
+				$query->where('track_type = ' . (int) $type);
+			}
+
+			// Filter by begin date
+			$begin = $this->getState('filter.begin');
+
+			if (!empty($begin))
+			{
+				$query->where('track_date >= ' . $db->quote($begin));
+			}
+
+			// Filter by end date
+			$end = $this->getState('filter.end');
+
+			if (!empty($end))
+			{
+				$query->where('track_date <= ' . $db->quote($end));
+			}
+
+			$where = '1';
+
+			// Filter by client
+			$clientId = $this->getState('filter.client_id');
+
+			if (!empty($clientId))
+			{
+				$where .= ' AND cid = ' . (int) $clientId;
+			}
+
+			// Filter by category
+			if (!empty($categoryId))
+			{
+				$where .= ' AND catid = ' . (int) $categoryId;
+			}
+
+			$query->where('banner_id IN (SELECT id FROM ' . $db->quoteName('#__banners') . ' WHERE ' . $where . ')');
+
+			$db->setQuery($query);
+			$this->setError((string) $query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+		else
+		{
+			JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get file name
+	 *
+	 * @return  string  The file name
+	 *
+	 * @since   1.6
+	 */
+	public function getBaseName()
+	{
+		if (!isset($this->basename))
+		{
+			$basename   = str_replace('__SITE__', JFactory::getApplication()->get('sitename'), $this->getState('basename'));
+			$categoryId = $this->getState('filter.category_id');
+
+			if (is_numeric($categoryId))
+			{
+				if ($categoryId > 0)
+				{
+					$basename = str_replace('__CATID__', $categoryId, $basename);
+				}
+				else
+				{
+					$basename = str_replace('__CATID__', '', $basename);
+				}
+
+				$categoryName = $this->getCategoryName();
+				$basename = str_replace('__CATNAME__', $categoryName, $basename);
+			}
+			else
+			{
+				$basename = str_replace(array('__CATID__', '__CATNAME__'), '', $basename);
+			}
+
+			$clientId = $this->getState('filter.client_id');
+
+			if (is_numeric($clientId))
+			{
+				if ($clientId > 0)
+				{
+					$basename = str_replace('__CLIENTID__', $clientId, $basename);
+				}
+				else
+				{
+					$basename = str_replace('__CLIENTID__', '', $basename);
+				}
+
+				$clientName = $this->getClientName();
+				$basename = str_replace('__CLIENTNAME__', $clientName, $basename);
+			}
+			else
+			{
+				$basename = str_replace(array('__CLIENTID__', '__CLIENTNAME__'), '', $basename);
+			}
+
+			$type = $this->getState('filter.type');
+
+			if ($type > 0)
+			{
+				$basename = str_replace('__TYPE__', $type, $basename);
+				$typeName = JText::_('COM_BANNERS_TYPE' . $type);
+				$basename = str_replace('__TYPENAME__', $typeName, $basename);
+			}
+			else
+			{
+				$basename = str_replace(array('__TYPE__', '__TYPENAME__'), '', $basename);
+			}
+
+			$begin = $this->getState('filter.begin');
+
+			if (!empty($begin))
+			{
+				$basename = str_replace('__BEGIN__', $begin, $basename);
+			}
+			else
+			{
+				$basename = str_replace('__BEGIN__', '', $basename);
+			}
+
+			$end = $this->getState('filter.end');
+
+			if (!empty($end))
+			{
+				$basename = str_replace('__END__', $end, $basename);
+			}
+			else
+			{
+				$basename = str_replace('__END__', '', $basename);
+			}
+
+			$this->basename = $basename;
+		}
+
+		return $this->basename;
+	}
+
+	/**
+	 * Get the category name.
+	 *
+	 * @return  string  The category name
+	 *
+	 * @since   1.6
+	 */
+	protected function getCategoryName()
+	{
+		$categoryId = $this->getState('filter.category_id');
+
+		if ($categoryId)
+		{
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select('title')
+				->from($db->quoteName('#__categories'))
+				->where($db->quoteName('id') . '=' . $db->quote($categoryId));
+			$db->setQuery($query);
+
+			try
+			{
+				$name = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			return $name;
+		}
+
+		return JText::_('COM_BANNERS_NOCATEGORYNAME');
+	}
+
+	/**
+	 * Get the category name
+	 *
+	 * @return  string  The category name.
+	 *
+	 * @since   1.6
+	 */
+	protected function getClientName()
+	{
+		$clientId = $this->getState('filter.client_id');
+
+		if ($clientId)
+		{
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select('name')
+				->from($db->quoteName('#__banner_clients'))
+				->where($db->quoteName('id') . '=' . $db->quote($clientId));
+			$db->setQuery($query);
+
+			try
+			{
+				$name = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			return $name;
+		}
+
+		return JText::_('COM_BANNERS_NOCLIENTNAME');
+	}
+
+	/**
+	 * Get the file type.
+	 *
+	 * @return  string  The file type
+	 *
+	 * @since   1.6
+	 */
+	public function getFileType()
+	{
+		return $this->getState('compressed') ? 'zip' : 'csv';
+	}
+
+	/**
+	 * Get the mime type.
+	 *
+	 * @return  string  The mime type.
+	 *
+	 * @since   1.6
+	 */
+	public function getMimeType()
+	{
+		return $this->getState('compressed') ? 'application/zip' : 'text/csv';
+	}
+
+	/**
+	 * Get the content
+	 *
+	 * @return  string  The content.
+	 *
+	 * @since   1.6
+	 */
+	public function getContent()
+	{
+		if (!isset($this->content))
+		{
+			$this->content = '"' . str_replace('"', '""', JText::_('COM_BANNERS_HEADING_NAME')) . '","'
+				. str_replace('"', '""', JText::_('COM_BANNERS_HEADING_CLIENT')) . '","'
+				. str_replace('"', '""', JText::_('JCATEGORY')) . '","'
+				. str_replace('"', '""', JText::_('COM_BANNERS_HEADING_TYPE')) . '","'
+				. str_replace('"', '""', JText::_('COM_BANNERS_HEADING_COUNT')) . '","'
+				. str_replace('"', '""', JText::_('JDATE')) . '"' . "\n";
+
+			foreach ($this->getItems() as $item)
+			{
+				$this->content .= '"' . str_replace('"', '""', $item->banner_name) . '","'
+					. str_replace('"', '""', $item->client_name) . '","'
+					. str_replace('"', '""', $item->category_title) . '","'
+					. str_replace('"', '""', ($item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'))) . '","'
+					. str_replace('"', '""', $item->count) . '","'
+					. str_replace('"', '""', $item->track_date) . '"' . "\n";
+			}
+
+			if ($this->getState('compressed'))
+			{
+				$app = JFactory::getApplication('administrator');
+
+				$files = array(
+					'track' => array(
+						'name' => $this->getBasename() . '.csv',
+						'data' => $this->content,
+						'time' => time()
+					)
+				);
+				$ziproot = $app->get('tmp_path') . '/' . uniqid('banners_tracks_') . '.zip';
+
+				// Run the packager
+				jimport('joomla.filesystem.folder');
+				jimport('joomla.filesystem.file');
+				$delete = JFolder::files($app->get('tmp_path') . '/', uniqid('banners_tracks_'), false, true);
+
+				if (!empty($delete))
+				{
+					if (!JFile::delete($delete))
+					{
+						// JFile::delete throws an error
+						$this->setError(JText::_('COM_BANNERS_ERR_ZIP_DELETE_FAILURE'));
+
+						return false;
+					}
+				}
+
+				$archive = new Archive;
+
+				if (!$packager = $archive->getAdapter('zip'))
+				{
+					$this->setError(JText::_('COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE'));
+
+					return false;
+				}
+				elseif (!$packager->create($ziproot, $files))
+				{
+					$this->setError(JText::_('COM_BANNERS_ERR_ZIP_CREATE_FAILURE'));
+
+					return false;
+				}
+
+				$this->content = file_get_contents($ziproot);
+			}
+		}
+
+		return $this->content;
+	}
+}
diff --git a/core/administrator/components/com_banners/sql/install.mysql.utf8.sql b/core/administrator/components/com_banners/sql/install.mysql.utf8.sql
new file mode 100644
index 00000000..b74a76dd
--- /dev/null
+++ b/core/administrator/components/com_banners/sql/install.mysql.utf8.sql
@@ -0,0 +1,85 @@
+--
+-- Table structure for table `#__banners`
+--
+
+CREATE TABLE IF NOT EXISTS `#__banners` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `cid` int(11) NOT NULL DEFAULT 0,
+  `type` int(11) NOT NULL DEFAULT 0,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `imptotal` int(11) NOT NULL DEFAULT 0,
+  `impmade` int(11) NOT NULL DEFAULT 0,
+  `clicks` int(11) NOT NULL DEFAULT 0,
+  `clickurl` varchar(200) NOT NULL DEFAULT '',
+  `state` tinyint(3) NOT NULL DEFAULT 0,
+  `catid` int(10) unsigned NOT NULL DEFAULT 0,
+  `description` text NOT NULL,
+  `custombannercode` varchar(2048) NOT NULL,
+  `sticky` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `ordering` int(11) NOT NULL DEFAULT 0,
+  `metakey` text NOT NULL,
+  `params` text NOT NULL,
+  `own_prefix` tinyint(1) NOT NULL DEFAULT 0,
+  `metakey_prefix` varchar(400) NOT NULL DEFAULT '',
+  `purchase_type` tinyint(4) NOT NULL DEFAULT -1,
+  `track_clicks` tinyint(4) NOT NULL DEFAULT -1,
+  `track_impressions` tinyint(4) NOT NULL DEFAULT -1,
+  `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `reset` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `language` char(7) NOT NULL DEFAULT '',
+  `created_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `version` int(10) unsigned NOT NULL DEFAULT 1,
+  PRIMARY KEY (`id`),
+  KEY `idx_state` (`state`),
+  KEY `idx_own_prefix` (`own_prefix`),
+  KEY `idx_metakey_prefix` (`metakey_prefix`(100)),
+  KEY `idx_banner_catid` (`catid`),
+  KEY `idx_language` (`language`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+--
+-- Table structure for table `#__banner_clients`
+--
+
+CREATE TABLE IF NOT EXISTS `#__banner_clients` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `contact` varchar(255) NOT NULL DEFAULT '',
+  `email` varchar(255) NOT NULL DEFAULT '',
+  `extrainfo` text NOT NULL,
+  `state` tinyint(3) NOT NULL DEFAULT 0,
+  `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `metakey` text NOT NULL,
+  `own_prefix` tinyint(4) NOT NULL DEFAULT 0,
+  `metakey_prefix` varchar(400) NOT NULL DEFAULT '',
+  `purchase_type` tinyint(4) NOT NULL DEFAULT -1,
+  `track_clicks` tinyint(4) NOT NULL DEFAULT -1,
+  `track_impressions` tinyint(4) NOT NULL DEFAULT -1,
+  PRIMARY KEY (`id`),
+  KEY `idx_own_prefix` (`own_prefix`),
+  KEY `idx_metakey_prefix` (`metakey_prefix`(100))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+--
+-- Table structure for table `#__banner_tracks`
+--
+
+CREATE TABLE IF NOT EXISTS `#__banner_tracks` (
+  `track_date` datetime NOT NULL,
+  `track_type` int(10) unsigned NOT NULL,
+  `banner_id` int(10) unsigned NOT NULL,
+  `count` int(10) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`track_date`,`track_type`,`banner_id`),
+  KEY `idx_track_date` (`track_date`),
+  KEY `idx_track_type` (`track_type`),
+  KEY `idx_banner_id` (`banner_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/core/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql b/core/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql
new file mode 100644
index 00000000..19fc08f8
--- /dev/null
+++ b/core/administrator/components/com_banners/sql/uninstall.mysql.utf8.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS `#__banners`;
+
+DROP TABLE IF EXISTS `#__banner_clients`;
+
+DROP TABLE IF EXISTS `#__banner_tracks`;
+
diff --git a/core/administrator/components/com_banners/tables/banner.php b/core/administrator/components/com_banners/tables/banner.php
new file mode 100644
index 00000000..c83b5027
--- /dev/null
+++ b/core/administrator/components/com_banners/tables/banner.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Banner table
+ *
+ * @since  1.5
+ */
+class BannersTableBanner extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__banners', 'id', $db);
+
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_banners.banner'));
+
+		$this->created = JFactory::getDate()->toSql();
+		$this->setColumnAlias('published', 'state');
+	}
+
+	/**
+	 * Increase click count
+	 *
+	 * @return  void
+	 */
+	public function clicks()
+	{
+		$query = 'UPDATE #__banners'
+			. ' SET clicks = (clicks + 1)'
+			. ' WHERE id = ' . (int) $this->id;
+
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean
+	 *
+	 * @see     JTable::check
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		// Set name
+		$this->name = htmlspecialchars_decode($this->name, ENT_QUOTES);
+
+		// Set alias
+		if (trim($this->alias) == '')
+		{
+			$this->alias = $this->name;
+		}
+
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ($this->publish_down > $this->_db->getNullDate() && $this->publish_down < $this->publish_up)
+		{
+			$this->setError(JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
+
+			return false;
+		}
+
+		// Set ordering
+		if ($this->state < 0)
+		{
+			// Set ordering to 0 if state is archived or trashed
+			$this->ordering = 0;
+		}
+		elseif (empty($this->ordering))
+		{
+			// Set ordering to last if ordering was 0
+			$this->ordering = self::getNextOrder($this->_db->quoteName('catid') . '=' . $this->_db->quote($this->catid) . ' AND state>=0');
+		}
+
+		if (empty($this->publish_up))
+		{
+			$this->publish_up = $this->getDbo()->getNullDate();
+		}
+
+		if (empty($this->publish_down))
+		{
+			$this->publish_down = $this->getDbo()->getNullDate();
+		}
+
+		if (empty($this->modified))
+		{
+			$this->modified = $this->getDbo()->getNullDate();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   mixed  $array   An associative array or object to bind to the JTable instance.
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function bind($array, $ignore = array())
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+
+			if ((int) $registry->get('width', 0) < 0)
+			{
+				$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_WIDTH_LABEL')));
+
+				return false;
+			}
+
+			if ((int) $registry->get('height', 0) < 0)
+			{
+				$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_HEIGHT_LABEL')));
+
+				return false;
+			}
+
+			// Converts the width and height to an absolute numeric value:
+			$width  = abs((int) $registry->get('width', 0));
+			$height = abs((int) $registry->get('height', 0));
+
+			// Sets the width and height to an empty string if = 0
+			$registry->set('width', $width ?: '');
+			$registry->set('height', $height ?: '');
+
+			$array['params'] = (string) $registry;
+		}
+
+		if (isset($array['imptotal']))
+		{
+			$array['imptotal'] = abs((int) $array['imptotal']);
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Method to store a row
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 */
+	public function store($updateNulls = false)
+	{
+		$db = $this->getDbo();
+
+		if (empty($this->id))
+		{
+			$purchaseType = $this->purchase_type;
+
+			if ($purchaseType < 0 && $this->cid)
+			{
+				/** @var BannersTableClient $client */
+				$client = JTable::getInstance('Client', 'BannersTable', array('dbo' => $db));
+				$client->load($this->cid);
+				$purchaseType = $client->purchase_type;
+			}
+
+			if ($purchaseType < 0)
+			{
+				$purchaseType = JComponentHelper::getParams('com_banners')->get('purchase_type');
+			}
+
+			switch ($purchaseType)
+			{
+				case 1:
+					$this->reset = $this->_db->getNullDate();
+					break;
+				case 2:
+					$date = JFactory::getDate('+1 year ' . date('Y-m-d'));
+					$this->reset = $date->toSql();
+					break;
+				case 3:
+					$date = JFactory::getDate('+1 month ' . date('Y-m-d'));
+					$this->reset = $date->toSql();
+					break;
+				case 4:
+					$date = JFactory::getDate('+7 day ' . date('Y-m-d'));
+					$this->reset = $date->toSql();
+					break;
+				case 5:
+					$date = JFactory::getDate('+1 day ' . date('Y-m-d'));
+					$this->reset = $date->toSql();
+					break;
+			}
+
+			// Store the row
+			parent::store($updateNulls);
+		}
+		else
+		{
+			// Get the old row
+			/** @var BannersTableBanner $oldrow */
+			$oldrow = JTable::getInstance('Banner', 'BannersTable', array('dbo' => $db));
+
+			if (!$oldrow->load($this->id) && $oldrow->getError())
+			{
+				$this->setError($oldrow->getError());
+			}
+
+			// Verify that the alias is unique
+			/** @var BannersTableBanner $table */
+			$table = JTable::getInstance('Banner', 'BannersTable', array('dbo' => $db));
+
+			if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
+			{
+				$this->setError(JText::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
+
+				return false;
+			}
+
+			// Store the new row
+			parent::store($updateNulls);
+
+			// Need to reorder ?
+			if ($oldrow->state >= 0 && ($this->state < 0 || $oldrow->catid != $this->catid))
+			{
+				// Reorder the oldrow
+				$this->reorder($this->_db->quoteName('catid') . '=' . $this->_db->quote($oldrow->catid) . ' AND state>=0');
+			}
+		}
+
+		return count($this->getErrors()) == 0;
+	}
+
+	/**
+	 * Method to set the sticky state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The sticky state. eg. [0 = unsticked, 1 = sticked]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function stick($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks    = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Get an instance of the table
+		/** @var BannersTableBanner $table */
+		$table = JTable::getInstance('Banner', 'BannersTable');
+
+		// For all keys
+		foreach ($pks as $pk)
+		{
+			// Load the banner
+			if (!$table->load($pk))
+			{
+				$this->setError($table->getError());
+			}
+
+			// Verify checkout
+			if ($table->checked_out == 0 || $table->checked_out == $userId)
+			{
+				// Change the state
+				$table->sticky = $state;
+				$table->checked_out = 0;
+				$table->checked_out_time = $this->_db->getNullDate();
+
+				// Check the row
+				$table->check();
+
+				// Store the row
+				if (!$table->store())
+				{
+					$this->setError($table->getError());
+				}
+			}
+		}
+
+		return count($this->getErrors()) == 0;
+	}
+}
diff --git a/core/administrator/components/com_banners/tables/client.php b/core/administrator/components/com_banners/tables/client.php
new file mode 100644
index 00000000..38540cdf
--- /dev/null
+++ b/core/administrator/components/com_banners/tables/client.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Client table
+ *
+ * @since  1.6
+ */
+class BannersTableClient extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(&$db)
+	{
+		$this->checked_out_time = $db->getNullDate();
+		parent::__construct('#__banner_clients', 'id', $db);
+
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_banners.client'));
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published, 2=archived, -2=trashed]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.0.4
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks    = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k . '=' . implode(' OR ' . $k . '=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = ' . (int) $userId . ')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE ' . $this->_db->quoteName($this->_tbl)
+			. ' SET ' . $this->_db->quoteName('state') . ' = ' . (int) $state
+			. ' WHERE (' . $where . ')'
+			. $checkin
+		);
+
+		try
+		{
+			$this->_db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach ($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_banners/views/banner/tmpl/edit.php b/core/administrator/components/com_banners/views/banner/tmpl/edit.php
new file mode 100644
index 00000000..9d98677a
--- /dev/null
+++ b/core/administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('jquery.framework');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "banner.cancel" || document.formvalidator.isValid(document.getElementById("banner-form")))
+		{
+			Joomla.submitform(task, document.getElementById("banner-form"));
+		}
+	};
+	jQuery(document).ready(function ($){
+		$("#jform_type").on("change", function (a, params) {
+
+			var v = typeof(params) !== "object" ? $("#jform_type").val() : params.selected;
+
+			var img_url = $("#image, #url");
+			var custom  = $("#custom");
+
+			switch (v) {
+				case "0":
+					// Image
+					img_url.show();
+					custom.hide();
+					break;
+				case "1":
+					// Custom
+					img_url.hide();
+					custom.show();
+					break;
+			}
+		}).trigger("change");
+	});
+');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="banner-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_BANNERS_BANNER_DETAILS')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php echo $this->form->renderField('type'); ?>
+				<div id="image">
+					<?php echo $this->form->renderFieldset('image'); ?>
+				</div>
+				<div id="custom">
+					<?php echo $this->form->renderField('custombannercode'); ?>
+				</div>
+				<?php
+				echo $this->form->renderField('clickurl');
+				echo $this->form->renderField('description');
+				?>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'otherparams', JText::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS')); ?>
+		<?php echo $this->form->renderFieldset('otherparams'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo $this->form->renderFieldset('metadata'); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_banners/views/banner/view.html.php b/core/administrator/components/com_banners/views/banner/view.html.php
new file mode 100644
index 00000000..da154a92
--- /dev/null
+++ b/core/administrator/components/com_banners/views/banner/view.html.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+/**
+ * View to edit a banner.
+ *
+ * @since  1.5
+ */
+class BannersViewBanner extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		// Initialiase variables.
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$userId     = $user->id;
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Since we don't track these assets at the item level, use the category id.
+		$canDo = JHelperContent::getActions('com_banners', 'category', $this->item->catid);
+
+		JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'bookmark banners');
+
+		// If not checked out, can save the item.
+		if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0))
+		{
+			JToolbarHelper::apply('banner.apply');
+			JToolbarHelper::save('banner.save');
+
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2new('banner.save2new');
+			}
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('banner.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('banner.cancel');
+		}
+		else
+		{
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			{
+				JToolbarHelper::versions('com_banners.banner', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('banner.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_BANNERS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_banners/views/banners/tmpl/default.php b/core/administrator/components/com_banners/views/banners/tmpl/default.php
new file mode 100644
index 00000000..01d34881
--- /dev/null
+++ b/core/administrator/components/com_banners/views/banners/tmpl/default.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_banners&task=banners.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'articleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<?php
+		// Search tools bar
+		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+		?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="articleList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_STICKY', 'a.sticky', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'client_name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_IMPRESSIONS', 'impmade', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLICKS', 'clicks', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="13">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) :
+						$ordering  = ($listOrder == 'ordering');
+						$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid);
+						$canCreate  = $user->authorise('core.create',     'com_banners.category.' . $item->catid);
+						$canEdit    = $user->authorise('core.edit',       'com_banners.category.' . $item->catid);
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+						$canChange  = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin;
+						?>
+						<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
+							<td class="order nowrap center hidden-phone">
+								<?php
+								$iconClass = '';
+
+								if (!$canChange)
+								{
+									$iconClass = ' inactive';
+								}
+								elseif (!$saveOrder)
+								{
+									$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+								}
+								?>
+								<span class="sortable-handler <?php echo $iconClass ?>">
+									<span class="icon-menu" aria-hidden="true"></span>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5"
+										value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+								<?php endif; ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+									<?php // Create dropdown items and render the dropdown list.
+									if ($canChange)
+									{
+										JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'banners');
+										JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'banners');
+										echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+									}
+									?>
+								</div>
+							</td>
+							<td class="has-context">
+								<div class="pull-left break-word">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_banners&task=banner.edit&id=' . (int) $item->id); ?>">
+											<?php echo $this->escape($item->name); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->name); ?>
+									<?php endif; ?>
+									<span class="small break-word">
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+									</span>
+									<div class="small">
+										<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+									</div>
+								</div>
+							</td>
+							<td class="center hidden-phone">
+								<?php echo JHtml::_('banner.pinned', $item->sticky, $i, $canChange); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->client_name; ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ?: JText::_('COM_BANNERS_UNLIMITED')); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->clicks; ?> -
+								<?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks / $item->impmade : 0); ?>
+							</td>
+							<td class="small nowrap hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', 'com_banners')
+				&& $user->authorise('core.edit', 'com_banners')
+				&& $user->authorise('core.edit.state', 'com_banners')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_BANNERS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php b/core/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php
new file mode 100644
index 00000000..2bbf95a6
--- /dev/null
+++ b/core/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('banner.clients'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_banners'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/core/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php b/core/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..9d985b15
--- /dev/null
+++ b/core/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-client-id').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('banner.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
diff --git a/core/administrator/components/com_banners/views/banners/view.html.php b/core/administrator/components/com_banners/views/banners/view.html.php
new file mode 100644
index 00000000..322dc269
--- /dev/null
+++ b/core/administrator/components/com_banners/views/banners/view.html.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of banners.
+ *
+ * @since  1.6
+ */
+class BannersViewBanners extends JViewLegacy
+{
+	/**
+	 * Category data
+	 *
+	 * @var  array
+	 */
+	protected $categories;
+
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->categories    = $this->get('CategoryOrders');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		BannersHelper::addSubmenu('banners');
+
+		$this->addToolbar();
+
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+		$canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
+		$user  = JFactory::getUser();
+
+		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_BANNERS'), 'bookmark banners');
+
+		if (count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0)
+		{
+			JToolbarHelper::addNew('banner.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('banner.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if ($this->state->get('filter.published') != 2)
+			{
+				JToolbarHelper::publish('banners.publish', 'JTOOLBAR_PUBLISH', true);
+				JToolbarHelper::unpublish('banners.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			}
+
+			if ($this->state->get('filter.published') != -1)
+			{
+				if ($this->state->get('filter.published') != 2)
+				{
+					JToolbarHelper::archiveList('banners.archive');
+				}
+				elseif ($this->state->get('filter.published') == 2)
+				{
+					JToolbarHelper::unarchiveList('banners.publish');
+				}
+			}
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::checkin('banners.checkin');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_banners')
+			&& $user->authorise('core.edit', 'com_banners')
+			&& $user->authorise('core.edit.state', 'com_banners'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			JToolbar::getInstance('toolbar')->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'banners.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('banners.trash');
+		}
+
+		if ($user->authorise('core.admin', 'com_banners') || $user->authorise('core.options', 'com_banners'))
+		{
+			JToolbarHelper::preferences('com_banners');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_BANNERS');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'ordering'    => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'     => JText::_('JSTATUS'),
+			'a.name'      => JText::_('COM_BANNERS_HEADING_NAME'),
+			'a.sticky'    => JText::_('COM_BANNERS_HEADING_STICKY'),
+			'client_name' => JText::_('COM_BANNERS_HEADING_CLIENT'),
+			'impmade'     => JText::_('COM_BANNERS_HEADING_IMPRESSIONS'),
+			'clicks'      => JText::_('COM_BANNERS_HEADING_CLICKS'),
+			'a.language'  => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'        => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_banners/views/client/tmpl/edit.php b/core/administrator/components/com_banners/views/client/tmpl/edit.php
new file mode 100644
index 00000000..0c55c5c2
--- /dev/null
+++ b/core/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "client.cancel" || document.formvalidator.isValid(document.getElementById("client-form")))
+		{
+			Joomla.submitform(task, document.getElementById("client-form"));
+		}
+	};
+');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', empty($this->item->id) ? JText::_('COM_BANNERS_NEW_CLIENT') : JText::_('COM_BANNERS_EDIT_CLIENT')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php
+				echo $this->form->renderField('contact');
+				echo $this->form->renderField('email');
+				echo $this->form->renderField('purchase_type');
+				echo $this->form->renderField('track_impressions');
+				echo $this->form->renderField('track_clicks');
+				echo $this->form->renderFieldset('extra');
+				?>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'metadata', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS')); ?>
+		<?php echo $this->form->renderFieldset('metadata'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_banners/views/client/view.html.php b/core/administrator/components/com_banners/views/client/view.html.php
new file mode 100644
index 00000000..269081b4
--- /dev/null
+++ b/core/administrator/components/com_banners/views/client/view.html.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+/**
+ * View to edit a client.
+ *
+ * @since  1.5
+ */
+class BannersViewClient extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Object containing permissions for the item
+	 *
+	 * @var  JObject
+	 */
+	protected $canDo;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+		$this->canDo = JHelperContent::getActions('com_banners');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->id);
+		$canDo      = $this->canDo;
+
+		JToolbarHelper::title(
+			$isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'),
+			'bookmark banners-clients'
+		);
+
+		// If not checked out, can save the item.
+		if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create')))
+		{
+			JToolbarHelper::apply('client.apply');
+			JToolbarHelper::save('client.save');
+		}
+
+		if (!$checkedOut && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('client.save2new');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('client.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('client.cancel');
+		}
+		else
+		{
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			{
+				JToolbarHelper::versions('com_banners.client', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('client.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_banners/views/clients/tmpl/default.php b/core/administrator/components/com_banners/views/clients/tmpl/default.php
new file mode 100644
index 00000000..210d4de9
--- /dev/null
+++ b/core/administrator/components/com_banners/views/clients/tmpl/default.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$purchaseTypes = array(
+		'1' => 'UNLIMITED',
+		'2' => 'YEARLY',
+		'3' => 'MONTHLY',
+		'4' => 'WEEKLY',
+		'5' => 'DAILY',
+);
+
+$user       = JFactory::getUser();
+$userId     = $user->get('id');
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$params     = isset($this->state->params) ? $this->state->params : new JObject;
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<?php
+		// Search tools bar
+		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+		?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="5%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="20%" class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CONTACT', 'a.contact', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+							<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_BANNERS_COUNT_PUBLISHED_ITEMS'); ?></span></span>
+						</th>
+						<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+							<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_BANNERS_COUNT_UNPUBLISHED_ITEMS'); ?></span></span>
+						</th>
+						<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+							<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_BANNERS_COUNT_ARCHIVED_ITEMS'); ?></span></span>
+						</th>
+						<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+							<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_BANNERS_COUNT_TRASHED_ITEMS'); ?></span></span>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_PURCHASETYPE', 'a.purchase_type', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="11">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) :
+						$canCreate  = $user->authorise('core.create',     'com_banners');
+						$canEdit    = $user->authorise('core.edit',       'com_banners');
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+						$canChange  = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
+						?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange); ?>
+									<?php // Create dropdown items and render the dropdown list.
+
+									if ($canChange)
+									{
+										JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'clients');
+										JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'clients');
+										echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+									}
+									?>
+								</div>
+							</td>
+							<td class="nowrap has-context">
+								<div class="pull-left">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id=' . (int) $item->id); ?>">
+											<?php echo $this->escape($item->name); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->name); ?>
+									<?php endif; ?>
+								</div>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->contact; ?>
+							</td>
+							<td class="center btns hidden-phone hidden-tablet">
+								<a class="badge <?php if ($item->count_published > 0) echo 'badge-success'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=1'); ?>">
+									<?php echo $item->count_published; ?></a>
+							</td>
+							<td class="center btns hidden-phone hidden-tablet">
+								<a class="badge <?php if ($item->count_unpublished > 0) echo 'badge-important'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=0'); ?>">
+									<?php echo $item->count_unpublished; ?></a>
+							</td>
+							<td class="center btns hidden-phone hidden-tablet">
+								<a class="badge <?php if ($item->count_archived > 0) echo 'badge-info'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=2'); ?>">
+									<?php echo $item->count_archived; ?></a>
+							</td>
+							<td class="center btns hidden-phone hidden-tablet">
+								<a class="badge <?php if ($item->count_trashed > 0) echo 'badge-inverse'; ?>" href="<?php echo JRoute::_('index.php?option=com_banners&view=banners&filter[client_id]=' . (int) $item->id . '&filter[published]=-2'); ?>">
+									<?php echo $item->count_trashed; ?></a>
+							</td>
+							<td class="small hidden-phone">
+								<?php if ($item->purchase_type < 0) : ?>
+									<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_' . $purchaseTypes[$params->get('purchase_type')])); ?>
+								<?php else : ?>
+									<?php echo JText::_('COM_BANNERS_FIELD_VALUE_' . $purchaseTypes[$item->purchase_type]); ?>
+								<?php endif; ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_banners/views/clients/view.html.php b/core/administrator/components/com_banners/views/clients/view.html.php
new file mode 100644
index 00000000..5d796e52
--- /dev/null
+++ b/core/administrator/components/com_banners/views/clients/view.html.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+/**
+ * View class for a list of clients.
+ *
+ * @since  1.6
+ */
+class BannersViewClients extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		BannersHelper::addSubmenu('clients');
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_banners');
+
+		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_CLIENTS'), 'bookmark banners-clients');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('client.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('client.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('clients.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('clients.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::archiveList('clients.archive');
+			JToolbarHelper::checkin('clients.checkin');
+		}
+
+		if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'clients.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('clients.trash');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_banners');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_CLIENTS');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.status'    => JText::_('JSTATUS'),
+			'a.name'      => JText::_('COM_BANNERS_HEADING_CLIENT'),
+			'contact'     => JText::_('COM_BANNERS_HEADING_CONTACT'),
+			'client_name' => JText::_('COM_BANNERS_HEADING_CLIENT'),
+			'nbanners'    => JText::_('COM_BANNERS_HEADING_ACTIVE'),
+			'a.id'        => JText::_('JGRID_HEADING_ID')
+		);
+	}
+}
diff --git a/core/administrator/components/com_banners/views/download/tmpl/default.php b/core/administrator/components/com_banners/views/download/tmpl/default.php
new file mode 100644
index 00000000..89f9aefb
--- /dev/null
+++ b/core/administrator/components/com_banners/views/download/tmpl/default.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+?>
+<div class="container-popup">
+	<form
+		class="form-horizontal form-validate"
+		id="download-form"
+		name="adminForm"
+		action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
+		method="post">
+
+		<?php foreach ($this->form->getFieldset() as $field) : ?>
+			<?php echo $this->form->renderField($field->fieldname); ?>
+		<?php endforeach; ?>
+
+		<button class="hidden"
+			id="closeBtn"
+			type="button"
+			onclick="window.parent.jQuery('#modal-download').modal('hide');">
+		</button>
+		<button class="hidden"
+			id="exportBtn"
+			type="button"
+			onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#downloadModal\').modal(\'hide\')', 700);">
+		</button>
+	</form>
+</div>
diff --git a/core/administrator/components/com_banners/views/download/view.html.php b/core/administrator/components/com_banners/views/download/view.html.php
new file mode 100644
index 00000000..4b724969
--- /dev/null
+++ b/core/administrator/components/com_banners/views/download/view.html.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for download a list of tracks.
+ *
+ * @since  1.6
+ */
+class BannersViewDownload extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->form = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_banners/views/tracks/tmpl/default.php b/core/administrator/components/com_banners/views/tracks/tmpl/default.php
new file mode 100644
index 00000000..a41d3276
--- /dev/null
+++ b/core/administrator/components/com_banners/views/tracks/tmpl/default.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_NAME', 'b.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="20%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_CLIENT', 'cl.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_TYPE', 'a.track_type', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_BANNERS_HEADING_COUNT', 'a.count', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.track_date', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td>
+								<?php echo $item->banner_name; ?>
+								<div class="small">
+									<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+								</div>
+							</td>
+							<td>
+								<?php echo $item->client_name; ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'); ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo $item->count; ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC5')); ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<?php // Load the export form ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'downloadModal',
+			array(
+				'title'       => JText::_('COM_BANNERS_TRACKS_DOWNLOAD'),
+				'url'         => JRoute::_('index.php?option=com_banners&amp;view=download&amp;tmpl=component'),
+				'height'      => '370px',
+				'width'       => '300px',
+				'modalWidth'  => '40',
+				'footer'      => '<a class="btn" data-dismiss="modal" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
+						. JText::_('COM_BANNERS_CANCEL') . '</a>'
+						. '<button class="btn btn-success" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
+						. JText::_('COM_BANNERS_TRACKS_EXPORT') . '</button>',
+			)
+		); ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_banners/views/tracks/view.html.php b/core/administrator/components/com_banners/views/tracks/view.html.php
new file mode 100644
index 00000000..768122d6
--- /dev/null
+++ b/core/administrator/components/com_banners/views/tracks/view.html.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+
+/**
+ * View class for a list of tracks.
+ *
+ * @since  1.6
+ */
+class BannersViewTracks extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		BannersHelper::addSubmenu('tracks');
+
+		$this->addToolbar();
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
+
+		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'bookmark banners-tracks');
+
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Instantiate a new JLayoutFile instance and render the export button
+		$layout = new JLayoutFile('joomla.toolbar.modal');
+
+		$dhtml  = $layout->render(
+			array(
+				'selector' => 'downloadModal',
+				'icon'     => 'download',
+				'text'     => JText::_('JTOOLBAR_EXPORT'),
+			)
+		);
+
+		$bar->appendButton('Custom', $dhtml, 'download');
+
+		if ($canDo->get('core.delete'))
+		{
+			$bar->appendButton('Confirm', 'COM_BANNERS_DELETE_MSG', 'delete', 'COM_BANNERS_TRACKS_DELETE', 'tracks.delete', false);
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_banners');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_TRACKS');
+
+		JHtmlSidebar::setAction('index.php?option=com_banners&view=tracks');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'b.name'     => JText::_('COM_BANNERS_HEADING_NAME'),
+			'cl.name'    => JText::_('COM_BANNERS_HEADING_CLIENT'),
+			'track_type' => JText::_('COM_BANNERS_HEADING_TYPE'),
+			'count'      => JText::_('COM_BANNERS_HEADING_COUNT'),
+			'track_date' => JText::_('JDATE')
+		);
+	}
+}
diff --git a/core/administrator/components/com_banners/views/tracks/view.raw.php b/core/administrator/components/com_banners/views/tracks/view.raw.php
new file mode 100644
index 00000000..d4ffe1c6
--- /dev/null
+++ b/core/administrator/components/com_banners/views/tracks/view.raw.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of tracks.
+ *
+ * @since  1.6
+ */
+class BannersViewTracks extends JViewLegacy
+{
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$basename = $this->get('BaseName');
+		$filetype = $this->get('FileType');
+		$mimetype = $this->get('MimeType');
+		$content  = $this->get('Content');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$document = JFactory::getDocument();
+		$document->setMimeEncoding($mimetype);
+		JFactory::getApplication()
+			->setHeader(
+				'Content-disposition',
+				'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"',
+				true
+			);
+		echo $content;
+	}
+}
diff --git a/core/administrator/components/com_cache/access.xml b/core/administrator/components/com_cache/access.xml
new file mode 100644
index 00000000..e40c7101
--- /dev/null
+++ b/core/administrator/components/com_cache/access.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_cache">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_cache/cache.php b/core/administrator/components/com_cache/cache.php
new file mode 100644
index 00000000..92ffc99e
--- /dev/null
+++ b/core/administrator/components/com_cache/cache.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_cache'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Cache');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_cache/cache.xml b/core/administrator/components/com_cache/cache.xml
new file mode 100644
index 00000000..c9ef2a72
--- /dev/null
+++ b/core/administrator/components/com_cache/cache.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_cache</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CACHE_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>cache.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_cache.ini</language>
+			<language tag="en-GB">language/en-GB.com_cache.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_cache/config.xml b/core/administrator/components/com_cache/config.xml
new file mode 100644
index 00000000..692b89a6
--- /dev/null
+++ b/core/administrator/components/com_cache/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_cache"
+			section="component" />
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_cache/controller.php b/core/administrator/components/com_cache/controller.php
new file mode 100644
index 00000000..b00b2c68
--- /dev/null
+++ b/core/administrator/components/com_cache/controller.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cache Controller
+ *
+ * @since  1.6
+ */
+class CacheController extends JControllerLegacy
+{
+	/**
+	 * Display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('CacheHelper', JPATH_ADMINISTRATOR . '/components/com_cache/helpers/cache.php');
+
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', 'cache');
+		$vFormat = $document->getType();
+		$lName   = $this->input->get('layout', 'default', 'string');
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			switch ($vName)
+			{
+				case 'purge':
+					break;
+				case 'cache':
+				default:
+					$model = $this->getModel($vName);
+					$view->setModel($model, true);
+					break;
+			}
+
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load the submenu.
+			CacheHelper::addSubmenu($this->input->get('view', 'cache'));
+
+			$view->display();
+		}
+	}
+
+	/**
+	 * Method to delete a list of cache groups.
+	 *
+	 * @return  void
+	 */
+	public function delete()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$cid = $this->input->post->get('cid', array(), 'array');
+
+		if (empty($cid))
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_NO_ITEMS_SELECTED'), 'warning');
+		}
+		else
+		{
+			$result = $this->getModel('cache')->cleanlist($cid);
+
+			if ($result !== array())
+			{
+				JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR', implode(', ', $result)), 'error');
+			}
+			else
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_DELETED'), 'message');
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_cache');
+	}
+
+	/**
+	 * Method to delete all cache groups.
+	 *
+	 * @return  void
+	 *
+	 * @since  3.6.0
+	 */
+	public function deleteAll()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app        = JFactory::getApplication();
+		$model      = $this->getModel('cache');
+		$allCleared = true;
+		$clients    = array(1, 0);
+
+		foreach ($clients as $client)
+		{
+			$mCache    = $model->getCache($client);
+			$clientStr = JText::_($client ? 'JADMINISTRATOR' : 'JSITE') .' > ';
+
+			foreach ($mCache->getAll() as $cache)
+			{
+				if ($mCache->clean($cache->group) === false)
+				{
+					$app->enqueueMessage(JText::sprintf('COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR', $clientStr . $cache->group), 'error');
+					$allCleared = false;
+				}
+			}
+		}
+
+		if ($allCleared)
+		{
+			$app->enqueueMessage(JText::_('COM_CACHE_MSG_ALL_CACHE_GROUPS_CLEARED'), 'message');
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_CACHE_MSG_SOME_CACHE_GROUPS_CLEARED'), 'warning');
+		}
+
+		$this->setRedirect('index.php?option=com_cache&view=cache');
+	}
+
+	/**
+	 * Purge the cache.
+	 *
+	 * @return  void
+	 */
+	public function purge()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		if (!$this->getModel('cache')->purge())
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_CACHE_EXPIRED_ITEMS_PURGING_ERROR'), 'error');
+		}
+		else
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED'), 'message');
+		}
+
+		$this->setRedirect('index.php?option=com_cache&view=purge');
+	}
+}
diff --git a/core/administrator/components/com_cache/helpers/cache.php b/core/administrator/components/com_cache/helpers/cache.php
new file mode 100644
index 00000000..260f10b3
--- /dev/null
+++ b/core/administrator/components/com_cache/helpers/cache.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cache component helper.
+ *
+ * @since  1.6
+ */
+class CacheHelper
+{
+	/**
+	 * Get a list of filter options for the application clients.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @deprecated  4.0  No replacement.
+	 */
+	public static function getClientOptions()
+	{
+		// Build the filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+
+		return $options;
+	}
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_SUBMENU_CHECKIN'),
+			'index.php?option=com_checkin',
+			$vName == 'com_checkin'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
+			'index.php?option=com_cache',
+			$vName == 'cache'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
+			'index.php?option=com_cache&view=purge',
+			$vName == 'purge'
+		);
+	}
+}
diff --git a/core/administrator/components/com_cache/models/cache.php b/core/administrator/components/com_cache/models/cache.php
new file mode 100644
index 00000000..f9dca0ed
--- /dev/null
+++ b/core/administrator/components/com_cache/models/cache.php
@@ -0,0 +1,308 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Cache Model
+ *
+ * @since  1.6
+ */
+class CacheModelCache extends JModelList
+{
+	/**
+	 * An Array of CacheItems indexed by cache group ID
+	 *
+	 * @var Array
+	 */
+	protected $_data = array();
+
+	/**
+	 * Group total
+	 *
+	 * @var integer
+	 */
+	protected $_total = null;
+
+	/**
+	 * Pagination object
+	 *
+	 * @var object
+	 */
+	protected $_pagination = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.5
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'group',
+				'count',
+				'size',
+				'client_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   Field for ordering.
+	 * @param   string  $direction  Direction of ordering.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'group', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		// Special case for client id.
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$clientId = (!in_array($clientId, array (0, 1))) ? 0 : $clientId;
+		$this->setState('client_id', $clientId);
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   3.5
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id	.= ':' . $this->getState('client_id');
+		$id	.= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to get cache data
+	 *
+	 * @return array
+	 */
+	public function getData()
+	{
+		if (empty($this->_data))
+		{
+			try
+			{
+				$cache = $this->getCache();
+				$data  = $cache->getAll();
+
+				if ($data && count($data) > 0)
+				{
+					// Process filter by search term.
+					if ($search = $this->getState('filter.search'))
+					{
+						foreach ($data as $key => $cacheItem)
+						{
+							if (stripos($cacheItem->group, $search) === false)
+							{
+								unset($data[$key]);
+								continue;
+							}
+						}
+					}
+
+					// Process ordering.
+					$listOrder = $this->getState('list.ordering', 'group');
+					$listDirn  = $this->getState('list.direction', 'ASC');
+
+					$this->_data = ArrayHelper::sortObjects($data, $listOrder, strtolower($listDirn) === 'desc' ? -1 : 1, true, true);
+
+					// Process pagination.
+					$limit = (int) $this->getState('list.limit', 25);
+
+					if ($limit !== 0)
+					{
+						$start = (int) $this->getState('list.start', 0);
+
+						return array_slice($this->_data, $start, $limit);
+					}
+				}
+				else
+				{
+					$this->_data = array();
+				}
+			}
+			catch (JCacheExceptionConnecting $exception)
+			{
+				$this->setError(JText::_('COM_CACHE_ERROR_CACHE_CONNECTION_FAILED'));
+				$this->_data = array();
+			}
+			catch (JCacheExceptionUnsupported $exception)
+			{
+				$this->setError(JText::_('COM_CACHE_ERROR_CACHE_DRIVER_UNSUPPORTED'));
+				$this->_data = array();
+			}
+		}
+
+		return $this->_data;
+	}
+
+	/**
+	 * Method to get cache instance.
+	 *
+	 * @return JCacheController
+	 */
+	public function getCache($clientId = null)
+	{
+		$conf = JFactory::getConfig();
+
+		if (is_null($clientId))
+		{
+			$clientId = $this->getState('client_id');
+		}
+
+		$options = array(
+			'defaultgroup' => '',
+			'storage'      => $conf->get('cache_handler', ''),
+			'caching'      => true,
+			'cachebase'    => (int) $clientId === 1 ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache')
+		);
+
+		return JCache::getInstance('', $options);
+	}
+
+	/**
+	 * Method to get client data.
+	 *
+	 * @return array
+	 *
+	 * @deprecated  4.0  No replacement.
+	 */
+	public function getClient()
+	{
+		return JApplicationHelper::getClientInfo($this->getState('client_id', 0));
+	}
+
+	/**
+	 * Get the number of current Cache Groups.
+	 *
+	 * @return  integer
+	 */
+	public function getTotal()
+	{
+		if (empty($this->_total))
+		{
+			$this->_total = count($this->getData());
+		}
+
+		return $this->_total;
+	}
+
+	/**
+	 * Method to get a pagination object for the cache.
+	 *
+	 * @return  JPagination
+	 */
+	public function getPagination()
+	{
+		if (empty($this->_pagination))
+		{
+			$this->_pagination = new JPagination($this->getTotal(), $this->getState('list.start'), $this->getState('list.limit'));
+		}
+
+		return $this->_pagination;
+	}
+
+	/**
+	 * Clean out a cache group as named by param.
+	 * If no param is passed clean all cache groups.
+	 *
+	 * @param   string  $group  Cache group name.
+	 *
+	 * @return  boolean  True on success, false otherwise
+	 */
+	public function clean($group = '')
+	{
+		try
+		{
+			return $this->getCache()->clean($group);
+		}
+		catch (JCacheExceptionConnecting $exception)
+		{
+			return false;
+		}
+		catch (JCacheExceptionUnsupported $exception)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Purge an array of cache groups.
+	 *
+	 * @param   array  $array  Array of cache group names.
+	 *
+	 * @return  array  Array with errors, if they exist.
+	 */
+	public function cleanlist($array)
+	{
+		$errors = array();
+
+		foreach ($array as $group)
+		{
+			if (!$this->clean($group))
+			{
+				$errors[] = $group;
+			}
+		}
+
+		return $errors;
+	}
+
+	/**
+	 * Purge all cache items.
+	 *
+	 * @return  boolean  True if successful; false otherwise.
+	 */
+	public function purge()
+	{
+		try
+		{
+			return JFactory::getCache('')->gc();
+		}
+		catch (JCacheExceptionConnecting $exception)
+		{
+			return false;
+		}
+		catch (JCacheExceptionUnsupported $exception)
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/administrator/components/com_cache/models/forms/filter_cache.xml b/core/administrator/components/com_cache/models/forms/filter_cache.xml
new file mode 100644
index 00000000..9e83948e
--- /dev/null
+++ b/core/administrator/components/com_cache/models/forms/filter_cache.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="client_id"
+		type="list"
+		onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
+		filtermode="selector"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_CACHE_FILTER_SEARCH_LABEL"
+			description="COM_CACHE_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="JGLOBAL_NO_MATCHING_RESULTS"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="group ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="group ASC">COM_CACHE_HEADING_GROUP_ASC</option>
+			<option value="group DESC">COM_CACHE_HEADING_GROUP_DESC</option>
+			<option value="count ASC">COM_CACHE_HEADING_COUNT_ASC</option>
+			<option value="count DESC">COM_CACHE_HEADING_COUNT_DESC</option>
+			<option value="size ASC">COM_CACHE_HEADING_SIZE_ASC</option>
+			<option value="size DESC">COM_CACHE_HEADING_SIZE_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_cache/views/cache/tmpl/default.php b/core/administrator/components/com_cache/views/cache/tmpl/default.php
new file mode 100644
index 00000000..b299ded8
--- /dev/null
+++ b/core/administrator/components/com_cache/views/cache/tmpl/default.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->total > 0) : ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+					<th class="title nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_CACHE_GROUP', 'group', $listDirn, $listOrder); ?>
+					</th>
+					<th width="5%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_CACHE_NUMBER_OF_FILES', 'count', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_CACHE_SIZE', 'size', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="4">
+					<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php
+				$i = 0;
+				foreach ($this->data as $folder => $item) : ?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td>
+							<input type="checkbox" id="cb<?php echo $i; ?>" name="cid[]" value="<?php echo $this->escape($item->group); ?>" onclick="Joomla.isChecked(this.checked);" />
+						</td>
+						<td>
+							<label for="cb<?php echo $i; ?>">
+								<strong><?php echo $this->escape($item->group); ?></strong>
+							</label>
+						</td>
+						<td>
+							<?php echo $item->count; ?>
+						</td>
+						<td>
+							<?php echo JHtml::_('number.bytes', $item->size); ?>
+						</td>
+					</tr>
+				<?php $i++; endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_cache/views/cache/tmpl/default.xml b/core/administrator/components/com_cache/views/cache/tmpl/default.xml
new file mode 100755
index 00000000..82466a21
--- /dev/null
+++ b/core/administrator/components/com_cache/views/cache/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CACHE_CACHE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CACHE_CACHE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_cache/views/cache/view.html.php b/core/administrator/components/com_cache/views/cache/view.html.php
new file mode 100644
index 00000000..6208442c
--- /dev/null
+++ b/core/administrator/components/com_cache/views/cache/view.html.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Cache component
+ *
+ * @since  1.6
+ */
+class CacheViewCache extends JViewLegacy
+{
+	/**
+	 * @var object client object.
+	 * @deprecated 4.0
+	 */
+	protected $client;
+
+	protected $data;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display a view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->data          = $this->get('Data');
+		$this->pagination    = $this->get('Pagination');
+		$this->total         = $this->get('Total');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+
+		if ($state->get('client_id') == 1)
+		{
+			JToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE_ADMIN_TITLE'), 'lightning clear');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE_SITE_TITLE'), 'lightning clear');
+		}
+
+		JToolbarHelper::custom('delete', 'delete.png', 'delete_f2.png', 'JTOOLBAR_DELETE', true);
+		JToolbarHelper::custom('deleteAll', 'remove.png', 'delete_f2.png', 'JTOOLBAR_DELETE_ALL', false);
+		JToolbarHelper::divider();
+
+		if (JFactory::getUser()->authorise('core.admin', 'com_cache'))
+		{
+			JToolbarHelper::preferences('com_cache');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_SITE_MAINTENANCE_CLEAR_CACHE');
+
+		JHtmlSidebar::setAction('index.php?option=com_cache');
+	}
+}
diff --git a/core/administrator/components/com_cache/views/purge/tmpl/default.php b/core/administrator/components/com_cache/views/purge/tmpl/default.php
new file mode 100644
index 00000000..7391eca4
--- /dev/null
+++ b/core/administrator/components/com_cache/views/purge/tmpl/default.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_cache&view=purge'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<p><?php echo JText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_cache/views/purge/tmpl/default.xml b/core/administrator/components/com_cache/views/purge/tmpl/default.xml
new file mode 100755
index 00000000..98fcff1b
--- /dev/null
+++ b/core/administrator/components/com_cache/views/purge/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CACHE_PURGE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CACHE_PURGE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_cache/views/purge/view.html.php b/core/administrator/components/com_cache/views/purge/view.html.php
new file mode 100644
index 00000000..ed1fbd42
--- /dev/null
+++ b/core/administrator/components/com_cache/views/purge/view.html.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Cache component
+ *
+ * @since  1.6
+ */
+class CacheViewPurge extends JViewLegacy
+{
+	/**
+	 * Display a view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		JFactory::getApplication()->enqueueMessage(JText::_('COM_CACHE_RESOURCE_INTENSIVE_WARNING'), 'warning');
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_CACHE_PURGE_EXPIRED_CACHE'), 'lightning purge');
+		JToolbarHelper::custom('purge', 'delete.png', 'delete_f2.png', 'COM_CACHE_PURGE_EXPIRED', false);
+		JToolbarHelper::divider();
+
+		if (JFactory::getUser()->authorise('core.admin', 'com_cache'))
+		{
+			JToolbarHelper::preferences('com_cache');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE');
+	}
+}
diff --git a/core/administrator/components/com_categories/categories.php b/core/administrator/components/com_categories/categories.php
new file mode 100644
index 00000000..979ee32f
--- /dev/null
+++ b/core/administrator/components/com_categories/categories.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+$input = JFactory::getApplication()->input;
+
+// If you have a URL like this: com_categories&view=categories&extension=com_example.example_cat
+$parts = explode('.', $input->get('extension'));
+$component = $parts[0];
+
+if (!JFactory::getUser()->authorise('core.manage', $component))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+JLoader::register('JHtmlCategoriesAdministrator', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/html/categoriesadministrator.php');
+
+$controller = JControllerLegacy::getInstance('Categories');
+$controller->execute($input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_categories/categories.xml b/core/administrator/components/com_categories/categories.xml
new file mode 100644
index 00000000..56a5cb0d
--- /dev/null
+++ b/core/administrator/components/com_categories/categories.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_categories</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2007</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CATEGORIES_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>categories.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_categories.ini</language>
+			<language tag="en-GB">language/en-GB.com_categories.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_categories/controller.php b/core/administrator/components/com_categories/controller.php
new file mode 100644
index 00000000..baea25b8
--- /dev/null
+++ b/core/administrator/components/com_categories/controller.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Categories view class for the Category package.
+ *
+ * @since  1.6
+ */
+class CategoriesController extends JControllerLegacy
+{
+	/**
+	 * The extension for which the categories apply.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $extension;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Guess the JText message prefix. Defaults to the option.
+		if (empty($this->extension))
+		{
+			$this->extension = $this->input->get('extension', 'com_content');
+		}
+	}
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  CategoriesController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', 'categories');
+		$vFormat = $document->getType();
+		$lName   = $this->input->get('layout', 'default', 'string');
+		$id      = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($vName == 'category' && $lName == 'edit' && !$this->checkEditId('com_categories.edit.category', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_categories&view=categories&extension=' . $this->extension, false));
+
+			return false;
+		}
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			// Get the model for the view.
+			$model = $this->getModel($vName, 'CategoriesModel', array('name' => $vName . '.' . substr($this->extension, 4)));
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load the submenu.
+			JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+			CategoriesHelper::addSubmenu($model->getState('filter.extension'));
+			$view->display();
+		}
+
+		return $this;
+	}
+}
diff --git a/core/administrator/components/com_categories/controllers/categories.php b/core/administrator/components/com_categories/controllers/categories.php
new file mode 100644
index 00000000..08ea4597
--- /dev/null
+++ b/core/administrator/components/com_categories/controllers/categories.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * The Categories List Controller
+ *
+ * @since  1.6
+ */
+class CategoriesControllerCategories extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Category', $prefix = 'CategoriesModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Rebuild the nested set tree.
+	 *
+	 * @return  boolean  False on failure or error, true on success.
+	 *
+	 * @since   1.6
+	 */
+	public function rebuild()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$extension = $this->input->get('extension');
+		$this->setRedirect(JRoute::_('index.php?option=com_categories&view=categories&extension=' . $extension, false));
+
+		/** @var CategoriesModelCategory $model */
+		$model = $this->getModel();
+
+		if ($model->rebuild())
+		{
+			// Rebuild succeeded.
+			$this->setMessage(JText::_('COM_CATEGORIES_REBUILD_SUCCESS'));
+
+			return true;
+		}
+
+		// Rebuild failed.
+		$this->setMessage(JText::_('COM_CATEGORIES_REBUILD_FAILURE'));
+
+		return false;
+	}
+
+	/**
+	 * Save the manual order inputs from the categories list page.
+	 *
+	 * @return      boolean  True on success
+	 *
+	 * @since       1.6
+	 * @see         JControllerAdmin::saveorder()
+	 * @deprecated  4.0
+	 */
+	public function saveorder()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		try
+		{
+			JLog::add(sprintf('%s() is deprecated. Function will be removed in 4.0.', __METHOD__), JLog::WARNING, 'deprecated');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get the arrays from the Request
+		$order = $this->input->post->get('order', null, 'array');
+		$originalOrder = explode(',', $this->input->getString('original_order_values'));
+
+		// Make sure something has changed
+		if (!($order === $originalOrder))
+		{
+			parent::saveorder();
+		}
+		else
+		{
+			// Nothing to reorder
+			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+
+			return true;
+		}
+	}
+
+	/**
+	 * Deletes and returns correctly.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function delete()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Get items to remove from the request.
+		$cid = $this->input->get('cid', array(), 'array');
+		$extension = $this->input->getCmd('extension', null);
+
+		if (!is_array($cid) || count($cid) < 1)
+		{
+			JError::raiseWarning(500, JText::_($this->text_prefix . '_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var CategoriesModelCategory $model */
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Remove the items.
+			if ($model->delete($cid))
+			{
+				$this->setMessage(JText::plural($this->text_prefix . '_N_ITEMS_DELETED', count($cid)));
+			}
+			else
+			{
+				$this->setMessage($model->getError());
+			}
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&extension=' . $extension, false));
+	}
+
+	/**
+	 * Check in of one or more records.
+	 *
+	 * Overrides JControllerAdmin::checkin to redirect to URL with extension.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.6.0
+	 */
+	public function checkin()
+	{
+		// Process parent checkin method.
+		$result = parent::checkin();
+
+		// Override the redirect Uri.
+		$redirectUri = 'index.php?option=' . $this->option . '&view=' . $this->view_list . '&extension=' . $this->input->get('extension', '', 'CMD');
+		$this->setRedirect(JRoute::_($redirectUri, false), $this->message, $this->messageType);
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_categories/controllers/category.php b/core/administrator/components/com_categories/controllers/category.php
new file mode 100644
index 00000000..d63b1110
--- /dev/null
+++ b/core/administrator/components/com_categories/controllers/category.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * The Category Controller
+ *
+ * @since  1.6
+ */
+class CategoriesControllerCategory extends JControllerForm
+{
+	/**
+	 * The extension for which the categories apply.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $extension;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since  1.6
+	 * @see    JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Guess the JText message prefix. Defaults to the option.
+		if (empty($this->extension))
+		{
+			$this->extension = $this->input->get('extension', 'com_content');
+		}
+	}
+
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user = JFactory::getUser();
+
+		return ($user->authorise('core.create', $this->extension) || count($user->getAuthorisedCategories($this->extension, 'core.create')));
+	}
+
+	/**
+	 * Method to check if you can edit a record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'parent_id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user = JFactory::getUser();
+
+		// Check "edit" permission on record asset (explicit or inherited)
+		if ($user->authorise('core.edit', $this->extension . '.category.' . $recordId))
+		{
+			return true;
+		}
+
+		// Check "edit own" permission on record asset (explicit or inherited)
+		if ($user->authorise('core.edit.own', $this->extension . '.category.' . $recordId))
+		{
+			// Need to do a lookup from the model to get the owner
+			$record = $this->getModel()->getItem($recordId);
+
+			if (empty($record))
+			{
+				return false;
+			}
+
+			$ownerId = $record->created_user_id;
+
+			// If the owner matches 'me' then do the test.
+			if ($ownerId == $user->id)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   1.6
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		/** @var CategoriesModelCategory $model */
+		$model = $this->getModel('Category');
+
+		// Preset the redirect
+		$this->setRedirect('index.php?option=com_categories&view=categories&extension=' . $this->extension);
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		$append = parent::getRedirectToItemAppend($recordId);
+		$append .= '&extension=' . $this->extension;
+
+		return $append;
+	}
+
+	/**
+	 * Gets the URL arguments to append to a list redirect.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToListAppend()
+	{
+		$append = parent::getRedirectToListAppend();
+		$append .= '&extension=' . $this->extension;
+
+		return $append;
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		$item = $model->getItem();
+
+		if (isset($item->params) && is_array($item->params))
+		{
+			$registry = new Registry($item->params);
+			$item->params = (string) $registry;
+		}
+
+		if (isset($item->metadata) && is_array($item->metadata))
+		{
+			$registry = new Registry($item->metadata);
+			$item->metadata = (string) $registry;
+		}
+	}
+}
diff --git a/core/administrator/components/com_categories/helpers/association.php b/core/administrator/components/com_categories/helpers/association.php
new file mode 100644
index 00000000..66ac7413
--- /dev/null
+++ b/core/administrator/components/com_categories/helpers/association.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+/**
+ * Category Component Association Helper
+ *
+ * @since  3.0
+ */
+abstract class CategoryHelperAssociation
+{
+	public static $category_association = true;
+
+	/**
+	 * Method to get the associations for a given category
+	 *
+	 * @param   integer  $id         Id of the item
+	 * @param   string   $extension  Name of the component
+	 * @param   string   $layout     Category layout
+	 *
+	 * @return  array    Array of associations for the component categories
+	 *
+	 * @since  3.0
+	 */
+	public static function getCategoryAssociations($id = 0, $extension = 'com_content', $layout = null)
+	{
+		$return = array();
+
+		if ($id)
+		{
+			// Load route helper
+			jimport('helper.route', JPATH_COMPONENT_SITE);
+			$helperClassname = ucfirst(substr($extension, 4)) . 'HelperRoute';
+
+			$associations = CategoriesHelper::getAssociations($id, $extension);
+
+			foreach ($associations as $tag => $item)
+			{
+				if (class_exists($helperClassname) && is_callable(array($helperClassname, 'getCategoryRoute')))
+				{
+					$return[$tag] = $helperClassname::getCategoryRoute($item, $tag, $layout);
+				}
+				else
+				{
+					$viewLayout = $layout ? '&layout=' . $layout : '';
+
+					$return[$tag] = 'index.php?option=' . $extension . '&view=category&id=' . $item . $viewLayout;
+				}
+			}
+		}
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_categories/helpers/categories.php b/core/administrator/components/com_categories/helpers/categories.php
new file mode 100644
index 00000000..6b10a6c8
--- /dev/null
+++ b/core/administrator/components/com_categories/helpers/categories.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Categories helper.
+ *
+ * @since  1.6
+ */
+class CategoriesHelper
+{
+	/**
+	 * Configure the Submenu links.
+	 *
+	 * @param   string  $extension  The extension being used for the categories.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($extension)
+	{
+		// Avoid nonsense situation.
+		if ($extension == 'com_categories')
+		{
+			return;
+		}
+
+		$parts = explode('.', $extension);
+		$component = $parts[0];
+
+		if (count($parts) > 1)
+		{
+			$section = $parts[1];
+		}
+
+		// Try to find the component helper.
+		$eName = str_replace('com_', '', $component);
+		$file = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+
+		if (file_exists($file))
+		{
+			$prefix = ucfirst(str_replace('com_', '', $component));
+			$cName = $prefix . 'Helper';
+
+			JLoader::register($cName, $file);
+
+			if (class_exists($cName))
+			{
+				if (is_callable(array($cName, 'addSubmenu')))
+				{
+					$lang = JFactory::getLanguage();
+
+					// Loading language file from the administrator/language directory then
+					// loading language file from the administrator/components/*extension*/language directory
+					$lang->load($component, JPATH_BASE, null, false, true)
+					|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
+
+					call_user_func(array($cName, 'addSubmenu'), 'categories' . (isset($section) ? '.' . $section : ''));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @param   string   $extension   The extension.
+	 * @param   integer  $categoryId  The category ID.
+	 *
+	 * @return  JObject
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions($extension, $categoryId = 0)
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated, use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions($extension, 'category', $categoryId);
+	}
+
+	/**
+	 * Gets a list of associations for a given item.
+	 *
+	 * @param   integer  $pk         Content item key.
+	 * @param   string   $extension  Optional extension name.
+	 *
+	 * @return  array of associations.
+	 */
+	public static function getAssociations($pk, $extension = 'com_content')
+	{
+		$langAssociations = JLanguageAssociations::getAssociations($extension, '#__categories', 'com_categories.item', $pk, 'id', 'alias', '');
+		$associations     = array();
+		$user             = JFactory::getUser();
+		$groups           = implode(',', $user->getAuthorisedViewLevels());
+
+		foreach ($langAssociations as $langAssociation)
+		{
+			// Include only published categories with user access
+			$arrId    = explode(':', $langAssociation->id);
+			$assocId  = $arrId[0];
+
+			$db    = \JFactory::getDbo();
+
+			$query = $db->getQuery(true)
+				->select($db->qn('published'))
+				->from($db->qn('#__categories'))
+				->where('access IN (' . $groups . ')')
+				->where($db->qn('id') . ' = ' . (int) $assocId);
+
+			$result = (int) $db->setQuery($query)->loadResult();
+
+			if ($result === 1)
+			{
+				$associations[$langAssociation->language] = $langAssociation->id;
+			}
+		}
+
+		return $associations;
+	}
+
+	/**
+	 * Check if Category ID exists otherwise assign to ROOT category.
+	 *
+	 * @param   mixed   $catid      Name or ID of category.
+	 * @param   string  $extension  Extension that triggers this function
+	 *
+	 * @return  integer  $catid  Category ID.
+	 */
+	public static function validateCategoryId($catid, $extension)
+	{
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
+
+		$categoryTable = JTable::getInstance('Category');
+
+		$data = array();
+		$data['id'] = $catid;
+		$data['extension'] = $extension;
+
+		if (!$categoryTable->load($data))
+		{
+			$catid = 0;
+		}
+
+		return (int) $catid;
+	}
+
+	/**
+	 * Create new Category from within item view.
+	 *
+	 * @param   array  $data  Array of data for new category.
+	 *
+	 * @return  integer
+	 */
+	public static function createCategory($data)
+	{
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
+
+		$categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel', array('ignore_request' => true));
+		$categoryModel->save($data);
+
+		$catid = $categoryModel->getState('category.id');
+
+		return $catid;
+	}
+}
diff --git a/core/administrator/components/com_categories/helpers/html/categoriesadministrator.php b/core/administrator/components/com_categories/helpers/html/categoriesadministrator.php
new file mode 100644
index 00000000..0d54843e
--- /dev/null
+++ b/core/administrator/components/com_categories/helpers/html/categoriesadministrator.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+/**
+ * Administrator category HTML
+ *
+ * @since  3.2
+ */
+abstract class JHtmlCategoriesAdministrator
+{
+	/**
+	 * Render the list of associated items
+	 *
+	 * @param   integer  $catid      Category identifier to search its associations
+	 * @param   string   $extension  Category Extension
+	 *
+	 * @return  string   The language HTML
+	 *
+	 * @since   3.2
+	 * @throws  Exception
+	 */
+	public static function association($catid, $extension = 'com_content')
+	{
+		// Defaults
+		$html = '';
+
+		// Get the associations
+		if ($associations = CategoriesHelper::getAssociations($catid, $extension))
+		{
+			$associations = ArrayHelper::toInteger($associations);
+
+			// Get the associated categories
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('c.id, c.title')
+				->select('l.sef as lang_sef')
+				->select('l.lang_code')
+				->from('#__categories as c')
+				->where('c.id IN (' . implode(',', array_values($associations)) . ')')
+				->where('c.id != ' . $catid)
+				->join('LEFT', '#__languages as l ON c.language=l.lang_code')
+				->select('l.image')
+				->select('l.title as language_title');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				throw new Exception($e->getMessage(), 500, $e);
+			}
+
+			if ($items)
+			{
+				foreach ($items as &$item)
+				{
+					$text    = $item->lang_sef ? strtoupper($item->lang_sef) : 'XX';
+					$url     = JRoute::_('index.php?option=com_categories&task=category.edit&id=' . (int) $item->id . '&extension=' . $extension);
+					$classes = 'hasPopover label label-association label-' . $item->lang_sef;
+
+					$item->link = '<a href="' . $url . '" title="' . $item->language_title . '" class="' . $classes
+						. '" data-content="' . htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '" data-placement="top">'
+						. $text . '</a>';
+				}
+			}
+
+			JHtml::_('bootstrap.popover');
+
+			$html = JLayoutHelper::render('joomla.content.associations', $items);
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_categories/models/categories.php b/core/administrator/components/com_categories/models/categories.php
new file mode 100644
index 00000000..f19ba560
--- /dev/null
+++ b/core/administrator/components/com_categories/models/categories.php
@@ -0,0 +1,404 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Categories Component Categories Model
+ *
+ * @since  1.6
+ */
+class CategoriesModelCategories extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'published', 'a.published',
+				'access', 'a.access', 'access_level',
+				'language', 'a.language', 'language_title',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'created_time', 'a.created_time',
+				'created_user_id', 'a.created_user_id',
+				'lft', 'a.lft',
+				'rgt', 'a.rgt',
+				'level', 'a.level',
+				'path', 'a.path',
+				'tag',
+			);
+		}
+
+		if (JLanguageAssociations::isEnabled())
+		{
+			$config['filter_fields'][] = 'association';
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.lft', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		$extension = $app->getUserStateFromRequest($this->context . '.filter.extension', 'extension', 'com_content', 'cmd');
+
+		$this->setState('filter.extension', $extension);
+		$parts = explode('.', $extension);
+
+		// Extract the component name
+		$this->setState('filter.component', $parts[0]);
+
+		// Extract the optional section name
+		$this->setState('filter.section', (count($parts) > 1) ? $parts[1] : null);
+
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.search', 'filter_search', '', 'string'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
+		$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
+		$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'string'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('filter.language', $forcedLanguage);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.extension');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.level');
+		$id .= ':' . $this->getState('filter.tag');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to get a database query to list categories.
+	 *
+	 * @return  JDatabaseQuery object.
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.alias, a.note, a.published, a.access' .
+				', a.checked_out, a.checked_out_time, a.created_user_id' .
+				', a.path, a.parent_id, a.level, a.lft, a.rgt' .
+				', a.language'
+			)
+		);
+		$query->from('#__categories AS a');
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name')
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_user_id');
+
+		// Join over the associations.
+		$assoc = $this->getAssoc();
+
+		if ($assoc)
+		{
+			$query->select('COUNT(asso2.id)>1 as association')
+				->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_categories.item'))
+				->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key')
+				->group('a.id, l.title, uc.name, ag.title, ua.name');
+		}
+
+		// Filter by extension
+		if ($extension = $this->getState('filter.extension'))
+		{
+			$query->where('a.extension = ' . $db->quote($extension));
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where('a.level <= ' . (int) $level);
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.published IN (0, 1))');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ' OR a.note LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where('a.language = ' . $db->quote($language));
+		}
+
+		// Filter by a single tag.
+		$tagId = $this->getState('filter.tag');
+
+		if (is_numeric($tagId))
+		{
+			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId)
+				->join(
+					'LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap')
+					. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
+					. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote($extension . '.category')
+				);
+		}
+
+		// Add the list ordering clause
+		$listOrdering = $this->getState('list.ordering', 'a.lft');
+		$listDirn = $db->escape($this->getState('list.direction', 'ASC'));
+
+		if ($listOrdering == 'a.access')
+		{
+			$query->order('a.access ' . $listDirn . ', a.lft ' . $listDirn);
+		}
+		else
+		{
+			$query->order($db->escape($listOrdering) . ' ' . $listDirn);
+		}
+
+		// Group by on Categories for JOIN with component tables to count items
+		$query->group('a.id,
+				a.title,
+				a.alias,
+				a.note,
+				a.published,
+				a.access,
+				a.checked_out,
+				a.checked_out_time,
+				a.created_user_id,
+				a.path,
+				a.parent_id,
+				a.level,
+				a.lft,
+				a.rgt,
+				a.language,
+				l.title,
+				l.image,
+				uc.name,
+				ag.title,
+				ua.name'
+		);
+
+		return $query;
+	}
+
+	/**
+	 * Method to determine if an association exists
+	 *
+	 * @return  boolean  True if the association exists
+	 *
+	 * @since   3.0
+	 */
+	public function getAssoc()
+	{
+		static $assoc = null;
+
+		if (!is_null($assoc))
+		{
+			return $assoc;
+		}
+
+		$extension = $this->getState('filter.extension');
+
+		$assoc = JLanguageAssociations::isEnabled();
+		$extension = explode('.', $extension);
+		$component = array_shift($extension);
+		$cname = str_replace('com_', '', $component);
+
+		if (!$assoc || !$component || !$cname)
+		{
+			$assoc = false;
+		}
+		else
+		{
+			$hname = $cname . 'HelperAssociation';
+			JLoader::register($hname, JPATH_SITE . '/components/' . $component . '/helpers/association.php');
+
+			$assoc = class_exists($hname) && !empty($hname::$category_association);
+		}
+
+		return $assoc;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   12.2
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+
+		if ($items != false)
+		{
+			$extension = $this->getState('filter.extension');
+
+			$this->countItems($items, $extension);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to load the countItems method from the extensions
+	 *
+	 * @param   stdClass[]  $items      The category items
+	 * @param   string      $extension  The category extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function countItems(&$items, $extension)
+	{
+		$parts = explode('.', $extension, 2);
+		$component = $parts[0];
+		$section = null;
+
+		if (count($parts) > 1)
+		{
+			$section = $parts[1];
+		}
+
+		// Try to find the component helper.
+		$eName = str_replace('com_', '', $component);
+		$file = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+
+		if (file_exists($file))
+		{
+			$prefix = ucfirst($eName);
+			$cName = $prefix . 'Helper';
+
+			JLoader::register($cName, $file);
+
+			if (class_exists($cName) && is_callable(array($cName, 'countItems')))
+			{
+				$cName::countItems($items, $section);
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_categories/models/category.php b/core/administrator/components/com_categories/models/category.php
new file mode 100644
index 00000000..458b01eb
--- /dev/null
+++ b/core/administrator/components/com_categories/models/category.php
@@ -0,0 +1,1332 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Categories Component Category Model
+ *
+ * @since  1.6
+ */
+class CategoriesModelCategory extends JModelAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_CATEGORIES';
+
+	/**
+	 * The type alias for this content type. Used for content version history.
+	 *
+	 * @var      string
+	 * @since    3.2
+	 */
+	public $typeAlias = null;
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var      string
+	 * @since    3.4.4
+	 */
+	protected $associationsContext = 'com_categories.item';
+
+	/**
+	 * Override parent constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JModelLegacy
+	 * @since   3.2
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+		$extension = JFactory::getApplication()->input->get('extension', 'com_content');
+		$this->typeAlias = $extension . '.category';
+
+		// Add a new batch command
+		$this->batch_commands['flip_ordering'] = 'batchFlipordering';
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (empty($record->id) || $record->published != -2)
+		{
+			return false;
+		}
+
+		return JFactory::getUser()->authorise('core.delete', $record->extension . '.category.' . (int) $record->id);
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		// Check for existing category.
+		if (!empty($record->id))
+		{
+			return $user->authorise('core.edit.state', $record->extension . '.category.' . (int) $record->id);
+		}
+
+		// New category, so check against the parent.
+		if (!empty($record->parent_id))
+		{
+			return $user->authorise('core.edit.state', $record->extension . '.category.' . (int) $record->parent_id);
+		}
+
+		// Default to component settings if neither category nor parent known.
+		return $user->authorise('core.edit.state', $record->extension);
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $type    The table name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Category', $prefix = 'CategoriesTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		$parentId = $app->input->getInt('parent_id');
+		$this->setState('category.parent_id', $parentId);
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+		$this->setState($this->getName() . '.id', $pk);
+
+		$extension = $app->input->get('extension', 'com_content');
+		$this->setState('category.extension', $extension);
+		$parts = explode('.', $extension);
+
+		// Extract the component name
+		$this->setState('category.component', $parts[0]);
+
+		// Extract the optional section name
+		$this->setState('category.section', (count($parts) > 1) ? $parts[1] : null);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_categories');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get a category.
+	 *
+	 * @param   integer  $pk  An optional id of the object to get, otherwise the id from the model state is used.
+	 *
+	 * @return  mixed    Category data object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if ($result = parent::getItem($pk))
+		{
+			// Prime required properties.
+			if (empty($result->id))
+			{
+				$result->parent_id = $this->getState('category.parent_id');
+				$result->extension = $this->getState('category.extension');
+			}
+
+			// Convert the metadata field to an array.
+			$registry = new Registry($result->metadata);
+			$result->metadata = $registry->toArray();
+
+			// Convert the created and modified dates to local user time for display in the form.
+			$tz = new DateTimeZone(JFactory::getApplication()->get('offset'));
+
+			if ((int) $result->created_time)
+			{
+				$date = new JDate($result->created_time);
+				$date->setTimezone($tz);
+				$result->created_time = $date->toSql(true);
+			}
+			else
+			{
+				$result->created_time = null;
+			}
+
+			if ((int) $result->modified_time)
+			{
+				$date = new JDate($result->modified_time);
+				$date->setTimezone($tz);
+				$result->modified_time = $date->toSql(true);
+			}
+			else
+			{
+				$result->modified_time = null;
+			}
+
+			if (!empty($result->id))
+			{
+				$result->tags = new JHelperTags;
+				$result->tags->getTagIds($result->id, $result->extension . '.category');
+			}
+		}
+
+		$assoc = $this->getAssoc();
+
+		if ($assoc)
+		{
+			if ($result->id != null)
+			{
+				$result->associations = ArrayHelper::toInteger(CategoriesHelper::getAssociations($result->id, $result->extension));
+			}
+			else
+			{
+				$result->associations = array();
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$extension = $this->getState('category.extension');
+		$jinput = JFactory::getApplication()->input;
+
+		// A workaround to get the extension into the model for save requests.
+		if (empty($extension) && isset($data['extension']))
+		{
+			$extension = $data['extension'];
+			$parts = explode('.', $extension);
+
+			$this->setState('category.extension', $extension);
+			$this->setState('category.component', $parts[0]);
+			$this->setState('category.section', @$parts[1]);
+		}
+
+		// Get the form.
+		$form = $this->loadForm('com_categories.category' . $extension, 'category', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on Edit State access controls.
+		if (empty($data['extension']))
+		{
+			$data['extension'] = $extension;
+		}
+
+		$categoryId = $jinput->get('id');
+		$parts      = explode('.', $extension);
+		$assetKey   = $categoryId ? $extension . '.category.' . $categoryId : $parts[0];
+
+		if (!JFactory::getUser()->authorise('core.edit.state', $assetKey))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * A protected method to get the where clause for the reorder
+	 * This ensures that the row will be moved relative to a row with the same extension
+	 *
+	 * @param   JTableCategory  $table  Current table instance
+	 *
+	 * @return  array           An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return 'extension = ' . $this->_db->quote($table->extension);
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$app = JFactory::getApplication();
+		$data = $app->getUserState('com_categories.edit.' . $this->getName() . '.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Pre-select some filters (Status, Language, Access) in edit form if those have been selected in Category Manager
+			if (!$data->id)
+			{
+				// Check for which extension the Category Manager is used and get selected fields
+				$extension = substr($app->getUserState('com_categories.categories.filter.extension'), 4);
+				$filters = (array) $app->getUserState('com_categories.categories.' . $extension . '.filter');
+
+				$data->set(
+					'published',
+					$app->input->getInt(
+						'published',
+						((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
+					)
+				);
+				$data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+				$data->set(
+					'access',
+					$app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))
+				);
+			}
+		}
+
+		$this->preprocessData('com_categories.category', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import.
+	 *
+	 * @return  mixed
+	 *
+	 * @see     JFormField
+	 * @since   1.6
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		jimport('joomla.filesystem.path');
+
+		$lang = JFactory::getLanguage();
+		$component = $this->getState('category.component');
+		$section = $this->getState('category.section');
+		$extension = JFactory::getApplication()->input->get('extension', null);
+
+		// Get the component form if it exists
+		$name = 'category' . ($section ? ('.' . $section) : '');
+
+		// Looking first in the component models/forms folder
+		$path = JPath::clean(JPATH_ADMINISTRATOR . "/components/$component/models/forms/$name.xml");
+
+		// Old way: looking in the component folder
+		if (!file_exists($path))
+		{
+			$path = JPath::clean(JPATH_ADMINISTRATOR . "/components/$component/$name.xml");
+		}
+
+		if (file_exists($path))
+		{
+			$lang->load($component, JPATH_BASE, null, false, true);
+			$lang->load($component, JPATH_BASE . '/components/' . $component, null, false, true);
+
+			if (!$form->loadFile($path, false))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+		}
+
+		// Try to find the component helper.
+		$eName = str_replace('com_', '', $component);
+		$path = JPath::clean(JPATH_ADMINISTRATOR . "/components/$component/helpers/category.php");
+
+		if (file_exists($path))
+		{
+			$cName = ucfirst($eName) . ucfirst($section) . 'HelperCategory';
+
+			JLoader::register($cName, $path);
+
+			if (class_exists($cName) && is_callable(array($cName, 'onPrepareForm')))
+			{
+				$lang->load($component, JPATH_BASE, null, false, false)
+					|| $lang->load($component, JPATH_BASE . '/components/' . $component, null, false, false)
+					|| $lang->load($component, JPATH_BASE, $lang->getDefault(), false, false)
+					|| $lang->load($component, JPATH_BASE . '/components/' . $component, $lang->getDefault(), false, false);
+				call_user_func_array(array($cName, 'onPrepareForm'), array(&$form));
+
+				// Check for an error.
+				if ($form instanceof Exception)
+				{
+					$this->setError($form->getMessage());
+
+					return false;
+				}
+			}
+		}
+
+		// Set the access control rules field component value.
+		$form->setFieldAttribute('rules', 'component', $component);
+		$form->setFieldAttribute('rules', 'section', $name);
+
+		// Association category items
+		if ($this->getAssoc())
+		{
+			$languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc');
+
+			if (count($languages) > 1)
+			{
+				$addform = new SimpleXMLElement('<form />');
+				$fields = $addform->addChild('fields');
+				$fields->addAttribute('name', 'associations');
+				$fieldset = $fields->addChild('fieldset');
+				$fieldset->addAttribute('name', 'item_associations');
+
+				foreach ($languages as $language)
+				{
+					$field = $fieldset->addChild('field');
+					$field->addAttribute('name', $language->lang_code);
+					$field->addAttribute('type', 'modal_category');
+					$field->addAttribute('language', $language->lang_code);
+					$field->addAttribute('label', $language->title);
+					$field->addAttribute('translate_label', 'false');
+					$field->addAttribute('extension', $extension);
+					$field->addAttribute('select', 'true');
+					$field->addAttribute('new', 'true');
+					$field->addAttribute('edit', 'true');
+					$field->addAttribute('clear', 'true');
+				}
+
+				$form->load($addform, false);
+			}
+		}
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$table      = $this->getTable();
+		$input      = JFactory::getApplication()->input;
+		$pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState($this->getName() . '.id');
+		$isNew      = true;
+		$context    = $this->option . '.' . $this->name;
+
+		if (!empty($data['tags']) && $data['tags'][0] != '')
+		{
+			$table->newTags = $data['tags'];
+		}
+
+		// Include the plugins for the save events.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Load the row if saving an existing category.
+		if ($pk > 0)
+		{
+			$table->load($pk);
+			$isNew = false;
+		}
+
+		// Set the new parent id if parent id not matched OR while New/Save as Copy .
+		if ($table->parent_id != $data['parent_id'] || $data['id'] == 0)
+		{
+			$table->setLocation($data['parent_id'], 'last-child');
+		}
+
+		// Alter the title for save as copy
+		if ($input->get('task') == 'save2copy')
+		{
+			$origTable = clone $this->getTable();
+			$origTable->load($input->getInt('id'));
+
+			if ($data['title'] == $origTable->title)
+			{
+				list($title, $alias) = $this->generateNewTitle($data['parent_id'], $data['alias'], $data['title']);
+				$data['title'] = $title;
+				$data['alias'] = $alias;
+			}
+			else
+			{
+				if ($data['alias'] == $origTable->alias)
+				{
+					$data['alias'] = '';
+				}
+			}
+
+			$data['published'] = 0;
+		}
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Bind the rules.
+		if (isset($data['rules']))
+		{
+			$rules = new JAccessRules($data['rules']);
+			$table->setRules($rules);
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before save event.
+		$result = $dispatcher->trigger($this->event_before_save, array($context, &$table, $isNew, $data));
+
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Store the data.
+		if (!$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$assoc = $this->getAssoc();
+
+		if ($assoc)
+		{
+			// Adding self to the association
+			$associations = isset($data['associations']) ? $data['associations'] : array();
+
+			// Unset any invalid associations
+			$associations = Joomla\Utilities\ArrayHelper::toInteger($associations);
+
+			foreach ($associations as $tag => $id)
+			{
+				if (!$id)
+				{
+					unset($associations[$tag]);
+				}
+			}
+
+			// Detecting all item menus
+			$allLanguage = $table->language == '*';
+
+			if ($allLanguage && !empty($associations))
+			{
+				JError::raiseNotice(403, JText::_('COM_CATEGORIES_ERROR_ALL_LANGUAGE_ASSOCIATED'));
+			}
+
+			// Get associationskey for edited item
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('key'))
+				->from($db->quoteName('#__associations'))
+				->where($db->quoteName('context') . ' = ' . $db->quote($this->associationsContext))
+				->where($db->quoteName('id') . ' = ' . (int) $table->id);
+			$db->setQuery($query);
+			$oldKey = $db->loadResult();
+
+			// Deleting old associations for the associated items
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__associations'))
+				->where($db->quoteName('context') . ' = ' . $db->quote($this->associationsContext));
+
+			if ($associations)
+			{
+				$query->where('(' . $db->quoteName('id') . ' IN (' . implode(',', $associations) . ') OR '
+					. $db->quoteName('key') . ' = ' . $db->quote($oldKey) . ')');
+			}
+			else
+			{
+				$query->where($db->quoteName('key') . ' = ' . $db->quote($oldKey));
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			// Adding self to the association
+			if (!$allLanguage)
+			{
+				$associations[$table->language] = (int) $table->id;
+			}
+
+			if (count($associations) > 1)
+			{
+				// Adding new association for these items
+				$key = md5(json_encode($associations));
+				$query->clear()
+					->insert('#__associations');
+
+				foreach ($associations as $id)
+				{
+					$query->values(((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key));
+				}
+
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger($this->event_after_save, array($context, &$table, $isNew, $data));
+
+		// Rebuild the path for the category:
+		if (!$table->rebuildPath($table->id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Rebuild the paths of the category's children:
+		if (!$table->rebuild($table->id, $table->lft, $table->level, $table->path))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$this->setState($this->getName() . '.id', $table->id);
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    $pks    A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		if (parent::publish($pks, $value))
+		{
+			$dispatcher = JEventDispatcher::getInstance();
+			$extension = JFactory::getApplication()->input->get('extension');
+
+			// Include the content plugins for the change of category state event.
+			JPluginHelper::importPlugin('content');
+
+			// Trigger the onCategoryChangeState event.
+			$dispatcher->trigger('onCategoryChangeState', array($extension, $pks, $value));
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method rebuild the entire nested set tree.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function rebuild()
+	{
+		// Get an instance of the table object.
+		$table = $this->getTable();
+
+		if (!$table->rebuild())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to save the reordered nested set tree.
+	 * First we save the new order values in the lft values of the changed ids.
+	 * Then we invoke the table rebuild to implement the new ordering.
+	 *
+	 * @param   array    $idArray    An array of primary key ids.
+	 * @param   integer  $lft_array  The lft value
+	 *
+	 * @return  boolean  False on failure or error, True otherwise
+	 *
+	 * @since   1.6
+	 */
+	public function saveorder($idArray = null, $lft_array = null)
+	{
+		// Get an instance of the table object.
+		$table = $this->getTable();
+
+		if (!$table->saveorder($idArray, $lft_array))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch tag a list of categories.
+	 *
+	 * @param   integer  $value     The value of the new tag.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean true if successful; false otherwise.
+	 */
+	protected function batchTag($value, $pks, $contexts)
+	{
+		// Set the variables
+		$user = JFactory::getUser();
+		$table = $this->getTable();
+
+		foreach ($pks as $pk)
+		{
+			if ($user->authorise('core.edit', $contexts[$pk]))
+			{
+				$table->reset();
+				$table->load($pk);
+				$tags = array($value);
+
+				/** @var  JTableObserverTags  $tagsObserver */
+				$tagsObserver = $table->getObserverOfClass('JTableObserverTags');
+				$result = $tagsObserver->setNewTags($tags, false);
+
+				if (!$result)
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch flip category ordering.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed    An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   3.6.3
+	 */
+	protected function batchFlipordering($value, $pks, $contexts)
+	{
+		$successful = array();
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		/**
+		 * For each category get the max ordering value
+		 * Re-order with max - ordering
+		 */
+		foreach ($pks as $id)
+		{
+			$query->select('MAX(ordering)')
+				->from('#__content')
+				->where($db->qn('catid') . ' = ' . $db->q($id));
+
+			$db->setQuery($query);
+
+			$max = (int) $db->loadresult();
+			$max++;
+
+			$query->clear();
+
+			$query->update('#__content')
+				->set($db->qn('ordering') . ' = ' . $max . ' - ' . $db->qn('ordering'))
+				->where($db->qn('catid') . ' = ' . $db->q($id));
+
+			$db->setQuery($query);
+
+			if ($db->execute())
+			{
+				$successful[] = $id;
+			}
+		}
+
+		return empty($successful) ? false : $successful;
+	}
+
+	/**
+	 * Batch copy categories to a new category.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed    An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   1.6
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		$type = new JUcmType;
+		$this->type = $type->getTypeByAlias($this->typeAlias);
+
+		// $value comes as {parent_id}.{extension}
+		$parts = explode('.', $value);
+		$parentId = (int) ArrayHelper::getValue($parts, 0, 1);
+
+		$db = $this->getDbo();
+		$extension = JFactory::getApplication()->input->get('extension', '', 'word');
+		$newIds = array();
+
+		// Check that the parent exists
+		if ($parentId)
+		{
+			if (!$this->table->load($parentId))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Non-fatal error
+					$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
+					$parentId = 0;
+				}
+			}
+
+			// Check that user has create permission for parent category
+			if ($parentId == $this->table->getRootId())
+			{
+				$canCreate = $this->user->authorise('core.create', $extension);
+			}
+			else
+			{
+				$canCreate = $this->user->authorise('core.create', $extension . '.category.' . $parentId);
+			}
+
+			if (!$canCreate)
+			{
+				// Error since user cannot create in parent category
+				$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
+
+				return false;
+			}
+		}
+
+		// If the parent is 0, set it to the ID of the root item in the tree
+		if (empty($parentId))
+		{
+			if (!$parentId = $this->table->getRootId())
+			{
+				$this->setError($db->getErrorMsg());
+
+				return false;
+			}
+			// Make sure we can create in root
+			elseif (!$this->user->authorise('core.create', $extension))
+			{
+				$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
+
+				return false;
+			}
+		}
+
+		// We need to log the parent ID
+		$parents = array();
+
+		// Calculate the emergency stop count as a precaution against a runaway loop bug
+		$query = $db->getQuery(true)
+			->select('COUNT(id)')
+			->from($db->quoteName('#__categories'));
+		$db->setQuery($query);
+
+		try
+		{
+			$count = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Parent exists so let's proceed
+		while (!empty($pks) && $count > 0)
+		{
+			// Pop the first id off the stack
+			$pk = array_shift($pks);
+
+			$this->table->reset();
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Copy is a bit tricky, because we also need to copy the children
+			$query->clear()
+				->select('id')
+				->from($db->quoteName('#__categories'))
+				->where('lft > ' . (int) $this->table->lft)
+				->where('rgt < ' . (int) $this->table->rgt);
+			$db->setQuery($query);
+			$childIds = $db->loadColumn();
+
+			// Add child ID's to the array only if they aren't already there.
+			foreach ($childIds as $childId)
+			{
+				if (!in_array($childId, $pks))
+				{
+					$pks[] = $childId;
+				}
+			}
+
+			// Make a copy of the old ID and Parent ID
+			$oldId = $this->table->id;
+			$oldParentId = $this->table->parent_id;
+
+			// Reset the id because we are making a copy.
+			$this->table->id = 0;
+
+			// If we a copying children, the Old ID will turn up in the parents list
+			// otherwise it's a new top level item
+			$this->table->parent_id = isset($parents[$oldParentId]) ? $parents[$oldParentId] : $parentId;
+
+			// Set the new location in the tree for the node.
+			$this->table->setLocation($this->table->parent_id, 'last-child');
+
+			// @TODO: Deal with ordering?
+			// $this->table->ordering = 1;
+			$this->table->level = null;
+			$this->table->asset_id = null;
+			$this->table->lft = null;
+			$this->table->rgt = null;
+
+			// Alter the title & alias
+			list($title, $alias) = $this->generateNewTitle($this->table->parent_id, $this->table->alias, $this->table->title);
+			$this->table->title  = $title;
+			$this->table->alias  = $alias;
+
+			// Unpublish because we are making a copy
+			$this->table->published = 0;
+
+			$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $this->table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+
+			// Now we log the old 'parent' to the new 'parent'
+			$parents[$oldId] = $this->table->id;
+			$count--;
+		}
+
+		// Rebuild the hierarchy.
+		if (!$this->table->rebuild())
+		{
+			$this->setError($this->table->getError());
+
+			return false;
+		}
+
+		// Rebuild the tree path.
+		if (!$this->table->rebuildPath($this->table->id))
+		{
+			$this->setError($this->table->getError());
+
+			return false;
+		}
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch move categories to a new category.
+	 *
+	 * @param   integer  $value     The new category ID.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	protected function batchMove($value, $pks, $contexts)
+	{
+		$parentId = (int) $value;
+		$type = new JUcmType;
+		$this->type = $type->getTypeByAlias($this->typeAlias);
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$extension = JFactory::getApplication()->input->get('extension', '', 'word');
+
+		// Check that the parent exists.
+		if ($parentId)
+		{
+			if (!$this->table->load($parentId))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error.
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Non-fatal error.
+					$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
+					$parentId = 0;
+				}
+			}
+
+			// Check that user has create permission for parent category.
+			if ($parentId == $this->table->getRootId())
+			{
+				$canCreate = $this->user->authorise('core.create', $extension);
+			}
+			else
+			{
+				$canCreate = $this->user->authorise('core.create', $extension . '.category.' . $parentId);
+			}
+
+			if (!$canCreate)
+			{
+				// Error since user cannot create in parent category
+				$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_CREATE'));
+
+				return false;
+			}
+
+			// Check that user has edit permission for every category being moved
+			// Note that the entire batch operation fails if any category lacks edit permission
+			foreach ($pks as $pk)
+			{
+				if (!$this->user->authorise('core.edit', $extension . '.category.' . $pk))
+				{
+					// Error since user cannot edit this category
+					$this->setError(JText::_('COM_CATEGORIES_BATCH_CANNOT_EDIT'));
+
+					return false;
+				}
+			}
+		}
+
+		// We are going to store all the children and just move the category
+		$children = array();
+
+		// Parent exists so let's proceed
+		foreach ($pks as $pk)
+		{
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Set the new location in the tree for the node.
+			$this->table->setLocation($parentId, 'last-child');
+
+			// Check if we are moving to a different parent
+			if ($parentId != $this->table->parent_id)
+			{
+				// Add the child node ids to the children array.
+				$query->clear()
+					->select('id')
+					->from($db->quoteName('#__categories'))
+					->where($db->quoteName('lft') . ' BETWEEN ' . (int) $this->table->lft . ' AND ' . (int) $this->table->rgt);
+				$db->setQuery($query);
+
+				try
+				{
+					$children = array_merge($children, (array) $db->loadColumn());
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+
+			$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Rebuild the tree path.
+			if (!$this->table->rebuildPath())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+		}
+
+		// Process the child rows
+		if (!empty($children))
+		{
+			// Remove any duplicates and sanitize ids.
+			$children = array_unique($children);
+			$children = ArrayHelper::toInteger($children);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Custom clean the cache of com_content and content modules
+	 *
+	 * @param   string   $group      Cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		$extension = JFactory::getApplication()->input->get('extension');
+
+		switch ($extension)
+		{
+			case 'com_content':
+				parent::cleanCache('com_content');
+				parent::cleanCache('mod_articles_archive');
+				parent::cleanCache('mod_articles_categories');
+				parent::cleanCache('mod_articles_category');
+				parent::cleanCache('mod_articles_latest');
+				parent::cleanCache('mod_articles_news');
+				parent::cleanCache('mod_articles_popular');
+				break;
+			default:
+				parent::cleanCache($extension);
+				break;
+		}
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $parent_id  The id of the parent.
+	 * @param   string   $alias      The alias.
+	 * @param   string   $title      The title.
+	 *
+	 * @return  array    Contains the modified title and alias.
+	 *
+	 * @since   1.7
+	 */
+	protected function generateNewTitle($parent_id, $alias, $title)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id)))
+		{
+			$title = StringHelper::increment($title);
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($title, $alias);
+	}
+
+	/**
+	 * Method to determine if a category association is available.
+	 *
+	 * @return  boolean True if a category association is available; false otherwise.
+	 */
+	public function getAssoc()
+	{
+		static $assoc = null;
+
+		if (!is_null($assoc))
+		{
+			return $assoc;
+		}
+
+		$extension = $this->getState('category.extension');
+
+		$assoc = JLanguageAssociations::isEnabled();
+		$extension = explode('.', $extension);
+		$component = array_shift($extension);
+		$cname = str_replace('com_', '', $component);
+
+		if (!$assoc || !$component || !$cname)
+		{
+			$assoc = false;
+		}
+		else
+		{
+			$hname = $cname . 'HelperAssociation';
+			JLoader::register($hname, JPATH_SITE . '/components/' . $component . '/helpers/association.php');
+
+			$assoc = class_exists($hname) && !empty($hname::$category_association);
+		}
+
+		return $assoc;
+	}
+}
diff --git a/core/administrator/components/com_categories/models/fields/categoryedit.php b/core/administrator/components/com_categories/models/fields/categoryedit.php
new file mode 100644
index 00000000..6d6e19e0
--- /dev/null
+++ b/core/administrator/components/com_categories/models/fields/categoryedit.php
@@ -0,0 +1,421 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Category Edit field..
+ *
+ * @since  1.6
+ */
+class JFormFieldCategoryEdit extends JFormFieldList
+{
+	/**
+	 * To allow creation of new categories.
+	 *
+	 * @var    integer
+	 * @since  3.6
+	 */
+	protected $allowAdd;
+
+	/**
+	 * A flexible category list that respects access controls
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'CategoryEdit';
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the <field /> tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->allowAdd = isset($this->element['allowAdd']) ? $this->element['allowAdd'] : '';
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.6
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'allowAdd':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 */
+	public function __set($name, $value)
+	{
+		$value = (string) $value;
+
+		switch ($name)
+		{
+			case 'allowAdd':
+				$value = (string) $value;
+				$this->$name = ($value === 'true' || $value === $name || $value === '1');
+				break;
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to get a list of categories that respects access controls and can be used for
+	 * either category assignment or parent category assignment in edit screens.
+	 * Use the parent element to indicate that the field will be used for assigning parent categories.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+		$published = $this->element['published'] ? explode(',', (string) $this->element['published']) : array(0, 1);
+		$name = (string) $this->element['name'];
+
+		// Let's get the id for the current item, either category or content item.
+		$jinput = JFactory::getApplication()->input;
+
+		// Load the category options for a given extension.
+
+		// For categories the old category is the category id or 0 for new category.
+		if ($this->element['parent'] || $jinput->get('option') == 'com_categories')
+		{
+			$oldCat = $jinput->get('id', 0);
+			$oldParent = $this->form->getValue($name, 0);
+			$extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $jinput->get('extension', 'com_content');
+		}
+		else
+			// For items the old category is the category they are in when opened or 0 if new.
+		{
+			$oldCat = $this->form->getValue($name, 0);
+			$extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $jinput->get('option', 'com_content');
+		}
+
+		// Account for case that a submitted form has a multi-value category id field (e.g. a filtering form), just use the first category
+		$oldCat = is_array($oldCat)
+			? (int) reset($oldCat)
+			: (int) $oldCat;
+
+		$db = JFactory::getDbo();
+		$user = JFactory::getUser();
+
+		$query = $db->getQuery(true)
+			->select('a.id AS value, a.title AS text, a.level, a.published, a.lft, a.language')
+			->from('#__categories AS a');
+
+		// Filter by the extension type
+		if ($this->element['parent'] == true || $jinput->get('option') == 'com_categories')
+		{
+			$query->where('(a.extension = ' . $db->quote($extension) . ' OR a.parent_id = 0)');
+		}
+		else
+		{
+			$query->where('(a.extension = ' . $db->quote($extension) . ')');
+		}
+
+		// Filter language
+		if (!empty($this->element['language']))
+		{
+			if (strpos($this->element['language'], ',') !== false)
+			{
+				$language = implode(',', $db->quote(explode(',', $this->element['language'])));
+			}
+			else
+			{
+				$language = $db->quote($this->element['language']);
+			}
+
+			$query->where($db->quoteName('a.language') . ' IN (' . $language . ')');
+		}
+
+		// Filter on the published state
+		$query->where('a.published IN (' . implode(',', ArrayHelper::toInteger($published)) . ')');
+
+		// Filter categories on User Access Level
+		// Filter by access level on categories.
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		$query->order('a.lft ASC');
+
+		// If parent isn't explicitly stated but we are in com_categories assume we want parents
+		if ($oldCat != 0 && ($this->element['parent'] == true || $jinput->get('option') == 'com_categories'))
+		{
+			// Prevent parenting to children of this item.
+			// To rearrange parents and children move the children up, not the parents down.
+			$query->join('LEFT', $db->quoteName('#__categories') . ' AS p ON p.id = ' . (int) $oldCat)
+				->where('NOT(a.lft >= p.lft AND a.rgt <= p.rgt)');
+
+			$rowQuery = $db->getQuery(true);
+			$rowQuery->select('a.id AS value, a.title AS text, a.level, a.parent_id')
+				->from('#__categories AS a')
+				->where('a.id = ' . (int) $oldCat);
+			$db->setQuery($rowQuery);
+			$row = $db->loadObject();
+		}
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		// Pad the option text with spaces using depth level as a multiplier.
+		for ($i = 0, $n = count($options); $i < $n; $i++)
+		{
+			// Translate ROOT
+			if ($this->element['parent'] == true || $jinput->get('option') == 'com_categories')
+			{
+				if ($options[$i]->level == 0)
+				{
+					$options[$i]->text = JText::_('JGLOBAL_ROOT_PARENT');
+				}
+			}
+
+			if ($options[$i]->published == 1)
+			{
+				$options[$i]->text = str_repeat('- ', !$options[$i]->level ? 0 : $options[$i]->level - 1) . $options[$i]->text;
+			}
+			else
+			{
+				$options[$i]->text = str_repeat('- ', !$options[$i]->level ? 0 : $options[$i]->level - 1) . '[' . $options[$i]->text . ']';
+			}
+
+			// Displays language code if not set to All
+			if ($options[$i]->language !== '*')
+			{
+				$options[$i]->text = $options[$i]->text . ' (' . $options[$i]->language . ')';
+			}
+		}
+
+		// For new items we want a list of categories you are allowed to create in.
+		if ($oldCat == 0)
+		{
+			foreach ($options as $i => $option)
+			{
+				/*
+				 * To take save or create in a category you need to have create rights for that category unless the item is already in that category.
+				 * Unset the option if the user isn't authorised for it. In this field assets are always categories.
+				 */
+				if ($option->level != 0 && !$user->authorise('core.create', $extension . '.category.' . $option->value))
+				{
+					unset($options[$i]);
+				}
+			}
+		}
+		// If you have an existing category id things are more complex.
+		else
+		{
+			/*
+			 * If you are only allowed to edit in this category but not edit.state, you should not get any
+			 * option to change the category parent for a category or the category for a content item,
+			 * but you should be able to save in that category.
+			 */
+			foreach ($options as $i => $option)
+			{
+				$assetKey = $extension . '.category.' . $oldCat;
+
+				if ($option->level != 0 && !isset($oldParent) && $option->value != $oldCat && !$user->authorise('core.edit.state', $assetKey))
+				{
+					unset($options[$i]);
+					continue;
+				}
+
+				if ($option->level != 0	&& isset($oldParent) && $option->value != $oldParent && !$user->authorise('core.edit.state', $assetKey))
+				{
+					unset($options[$i]);
+					continue;
+				}
+
+				/*
+				 * However, if you can edit.state you can also move this to another category for which you have
+				 * create permission and you should also still be able to save in the current category.
+				 */
+				$assetKey = $extension . '.category.' . $option->value;
+
+				if ($option->level != 0 && !isset($oldParent) && $option->value != $oldCat && !$user->authorise('core.create', $assetKey))
+				{
+					unset($options[$i]);
+					continue;
+				}
+
+				if ($option->level != 0	&& isset($oldParent) && $option->value != $oldParent && !$user->authorise('core.create', $assetKey))
+				{
+					unset($options[$i]);
+					continue;
+				}
+			}
+		}
+
+		if (($this->element['parent'] == true || $jinput->get('option') == 'com_categories')
+			&& (isset($row) && !isset($options[0]))
+			&& isset($this->element['show_root']))
+		{
+			if ($row->parent_id == '1')
+			{
+				$parent = new stdClass;
+				$parent->text = JText::_('JGLOBAL_ROOT_PARENT');
+				array_unshift($options, $parent);
+			}
+
+			array_unshift($options, JHtml::_('select.option', '0', JText::_('JGLOBAL_ROOT')));
+		}
+
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getOptions(), $options);
+	}
+
+	/**
+	 * Method to get the field input markup for a generic list.
+	 * Use the multiple attribute to enable multiselect.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.6
+	 */
+	protected function getInput()
+	{
+		$html = array();
+		$class = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$class[] = !empty($this->class) ? $this->class : '';
+
+		if ($this->allowAdd)
+		{
+			$customGroupText = JText::_('JGLOBAL_CUSTOM_CATEGORY');
+
+			$class[] = 'chzn-custom-value';
+			$attr .= ' data-custom_group_text="' . $customGroupText . '" '
+					. 'data-no_results_text="' . JText::_('JGLOBAL_ADD_CUSTOM_CATEGORY') . '" '
+					. 'data-placeholder="' . JText::_('JGLOBAL_TYPE_OR_SELECT_CATEGORY') . '" ';
+		}
+
+		if ($class)
+		{
+			$attr .= 'class="' . implode(' ', $class) . '"';
+		}
+
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= $this->required ? ' required aria-required="true"' : '';
+		$attr .= $this->autofocus ? ' autofocus' : '';
+
+		// To avoid user's confusion, readonly="true" should imply disabled="true".
+		if ((string) $this->readonly == '1'
+			|| (string) $this->readonly == 'true'
+			|| (string) $this->disabled == '1'
+			|| (string) $this->disabled == 'true')
+		{
+			$attr .= ' disabled="disabled"';
+		}
+
+		// Initialize JavaScript field attributes.
+		$attr .= $this->onchange ? ' onchange="' . $this->onchange . '"' : '';
+
+		// Get the field options.
+		$options = (array) $this->getOptions();
+
+		// Create a read-only list (no name) with hidden input(s) to store the value(s).
+		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true')
+		{
+			$html[] = JHtml::_('select.genericlist', $options, '', trim($attr), 'value', 'text', $this->value, $this->id);
+
+			// E.g. form field type tag sends $this->value as array
+			if ($this->multiple && is_array($this->value))
+			{
+				if (!count($this->value))
+				{
+					$this->value[] = '';
+				}
+
+				foreach ($this->value as $value)
+				{
+					$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"/>';
+				}
+			}
+			else
+			{
+				$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
+			}
+		}
+		else
+		{
+			// Create a regular list.
+			if (count($options) === 0)
+			{
+				// All Categories have been deleted, so we need a new category (This will create on save if selected).
+				$options[0]            = new stdClass;
+				$options[0]->value     = 'Uncategorised';
+				$options[0]->text      = 'Uncategorised';
+				$options[0]->level     = '1';
+				$options[0]->published = '1';
+				$options[0]->lft       = '1';
+			}
+
+			$html[] = JHtml::_('select.genericlist', $options, $this->name, trim($attr), 'value', 'text', $this->value, $this->id);
+		}
+
+		return implode($html);
+	}
+}
diff --git a/core/administrator/components/com_categories/models/fields/categoryparent.php b/core/administrator/components/com_categories/models/fields/categoryparent.php
new file mode 100644
index 00000000..3aae6dc2
--- /dev/null
+++ b/core/administrator/components/com_categories/models/fields/categoryparent.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Category Parent field.
+ *
+ * @since       1.6
+ * @deprecated  4.0  Use categoryedit instead.
+ */
+class JFormFieldCategoryParent extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'CategoryParent';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Initialise variables.
+		$options = array();
+		$name = (string) $this->element['name'];
+
+		// Let's get the id for the current item, either category or content item.
+		$jinput = JFactory::getApplication()->input;
+
+		// For categories the old category is the category id 0 for new category.
+		if ($this->element['parent'])
+		{
+			$oldCat = $jinput->get('id', 0);
+		}
+		else
+			// For items the old category is the category they are in when opened or 0 if new.
+		{
+			$oldCat = $this->form->getValue($name);
+		}
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.id AS value, a.title AS text, a.level')
+			->from('#__categories AS a')
+			->join('LEFT', $db->quoteName('#__categories') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
+
+		// Filter by the type
+		if ($extension = $this->form->getValue('extension'))
+		{
+			$query->where('(a.extension = ' . $db->quote($extension) . ' OR a.parent_id = 0)');
+		}
+
+		if ($this->element['parent'])
+		{
+			// Prevent parenting to children of this item.
+			if ($id = $this->form->getValue('id'))
+			{
+				$query->join('LEFT', $db->quoteName('#__categories') . ' AS p ON p.id = ' . (int) $id)
+					->where('NOT(a.lft >= p.lft AND a.rgt <= p.rgt)');
+
+				$rowQuery = $db->getQuery(true);
+				$rowQuery->select('a.id AS value, a.title AS text, a.level, a.parent_id')
+					->from('#__categories AS a')
+					->where('a.id = ' . (int) $id);
+				$db->setQuery($rowQuery);
+				$row = $db->loadObject();
+			}
+		}
+
+		$query->where('a.published IN (0,1)')
+			->group('a.id, a.title, a.level, a.lft, a.rgt, a.extension, a.parent_id')
+			->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		// Pad the option text with spaces using depth level as a multiplier.
+		for ($i = 0, $n = count($options); $i < $n; $i++)
+		{
+			// Translate ROOT
+			if ($options[$i]->level == 0)
+			{
+				$options[$i]->text = JText::_('JGLOBAL_ROOT_PARENT');
+			}
+
+			// Displays language code if not set to All
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('language'))
+				->where($db->quoteName('id') . '=' . (int) $options[$i]->value)
+				->from($db->quoteName('#__categories'));
+
+			$db->setQuery($query);
+			$language = $db->loadResult();
+
+			$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->text;
+
+			if ($language !== '*')
+			{
+				$options[$i]->text = $options[$i]->text . ' (' . $language . ')';
+			}
+		}
+
+		// Get the current user object.
+		$user = JFactory::getUser();
+
+		// For new items we want a list of categories you are allowed to create in.
+		if ($oldCat == 0)
+		{
+			foreach ($options as $i => $option)
+			{
+				/*
+				 * To take save or create in a category you need to have create rights for that category unless the item is already in that category.
+				 * Unset the option if the user isn't authorised for it. In this field assets are always categories.
+				 */
+				if ($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
+				{
+					unset($options[$i]);
+				}
+			}
+		}
+		// If you have an existing category id things are more complex.
+		else
+		{
+			foreach ($options as $i => $option)
+			{
+				/*
+				 * If you are only allowed to edit in this category but not edit.state, you should not get any
+				 * option to change the category parent for a category or the category for a content item,
+				 * but you should be able to save in that category.
+				 */
+				if ($user->authorise('core.edit.state', $extension . '.category.' . $oldCat) != true)
+				{
+					if ($option->value != $oldCat)
+					{
+						echo 'y';
+						unset($options[$i]);
+					}
+				}
+				/*
+				 * However, if you can edit.state you can also move this to another category for which you have
+				 * create permission and you should also still be able to save in the current category.
+				 */
+				elseif (($user->authorise('core.create', $extension . '.category.' . $option->value) != true)
+					&& $option->value != $oldCat
+				)
+				{
+					echo 'x';
+					unset($options[$i]);
+				}
+			}
+		}
+
+		if (isset($row) && !isset($options[0]))
+		{
+			if ($row->parent_id == '1')
+			{
+				$parent = new stdClass;
+				$parent->text = JText::_('JGLOBAL_ROOT_PARENT');
+				array_unshift($options, $parent);
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_categories/models/fields/modal/category.php b/core/administrator/components/com_categories/models/fields/modal/category.php
new file mode 100644
index 00000000..0b779861
--- /dev/null
+++ b/core/administrator/components/com_categories/models/fields/modal/category.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Supports a modal category picker.
+ *
+ * @since  3.1
+ */
+class JFormFieldModal_Category extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   1.6
+	 */
+	protected $type = 'Modal_Category';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		if ($this->element['extension'])
+		{
+			$extension = (string) $this->element['extension'];
+		}
+		else
+		{
+			$extension = (string) JFactory::getApplication()->input->get('extension', 'com_content');
+		}
+
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
+
+		// Load language.
+		JFactory::getLanguage()->load('com_categories', JPATH_ADMINISTRATOR);
+
+		// The active category id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Create the modal id.
+		$modalId = 'Category_' . $this->id;
+
+		// Add the modal field script to the document head.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true));
+
+		// Script to proxy the select modal function to the modal-fields.js file.
+		if ($allowSelect)
+		{
+			static $scriptSelect = null;
+
+			if (is_null($scriptSelect))
+			{
+				$scriptSelect = array();
+			}
+
+			if (!isset($scriptSelect[$this->id]))
+			{
+				JFactory::getDocument()->addScriptDeclaration("
+				function jSelectCategory_" . $this->id . "(id, title, object) {
+					window.processModalSelect('Category', '" . $this->id . "', id, title, '', object);
+				}
+				");
+
+				$scriptSelect[$this->id] = true;
+			}
+		}
+
+		// Setup variables for display.
+		$linkCategories = 'index.php?option=com_categories&amp;view=categories&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1'
+			. '&amp;extension=' . $extension;
+		$linkCategory  = 'index.php?option=com_categories&amp;view=category&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1'
+			. '&amp;extension=' . $extension;
+		$modalTitle    = JText::_('COM_CATEGORIES_CHANGE_CATEGORY');
+
+		if (isset($this->element['language']))
+		{
+			$linkCategories .= '&amp;forcedLanguage=' . $this->element['language'];
+			$linkCategory   .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle     .= ' &#8212; ' . $this->element['label'];
+		}
+
+		$urlSelect = $linkCategories . '&amp;function=jSelectCategory_' . $this->id;
+		$urlEdit   = $linkCategory . '&amp;task=category.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
+		$urlNew    = $linkCategory . '&amp;task=category.add';
+
+		if ($value)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__categories'))
+				->where($db->quoteName('id') . ' = ' . (int) $value);
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		$title = empty($title) ? JText::_('COM_CATEGORIES_SELECT_A_CATEGORY') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The current category display field.
+		$html  = '<span class="input-append">';
+		$html .= '<input class="input-medium" id="' . $this->id . '_name" type="text" value="' . $title . '" disabled="disabled" size="35" />';
+
+		// Select category button.
+		if ($allowSelect)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_select"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalSelect' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '">'
+				. '<span class="icon-file" aria-hidden="true"></span> ' . JText::_('JSELECT')
+				. '</a>';
+		}
+
+		// New category button.
+		if ($allowNew)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_new"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalNew' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CATEGORIES_NEW_CATEGORY') . '">'
+				. '<span class="icon-new" aria-hidden="true"></span> ' . JText::_('JACTION_CREATE')
+				. '</a>';
+		}
+
+		// Edit category button.
+		if ($allowEdit)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_edit"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalEdit' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '">'
+				. '<span class="icon-edit" aria-hidden="true"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
+		}
+
+		// Clear category button.
+		if ($allowClear)
+		{
+			$html .= '<a'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_clear"'
+				. ' href="#"'
+				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
+				. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+				. '</a>';
+		}
+
+		$html .= '</span>';
+
+		// Select category modal.
+		if ($allowSelect)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalSelect' . $modalId,
+				array(
+					'title'       => $modalTitle,
+					'url'         => $urlSelect,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+				)
+			);
+		}
+
+		// New category modal.
+		if ($allowNew)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalNew' . $modalId,
+				array(
+					'title'       => JText::_('COM_CATEGORIES_NEW_CATEGORY'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlNew,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'category\', \'cancel\', \'item-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'category\', \'save\', \'item-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'category\', \'apply\', \'item-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Edit category modal.
+		if ($allowEdit)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalEdit' . $modalId,
+				array(
+					'title'       => JText::_('COM_CATEGORIES_EDIT_CATEGORY'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlEdit,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'category\', \'cancel\', \'item-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'category\', \'save\', \'item-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'category\', \'apply\', \'item-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Note: class='required' for client side validation
+		$class = $this->required ? ' class="required modal-value"' : '';
+
+		$html .= '<input type="hidden" id="' . $this->id . '_id"' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
+			. '" data-text="' . htmlspecialchars(JText::_('COM_CATEGORIES_SELECT_A_CATEGORY', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getLabel()
+	{
+		return str_replace($this->id, $this->id . '_id', parent::getLabel());
+	}
+}
diff --git a/core/administrator/components/com_categories/models/forms/category.xml b/core/administrator/components/com_categories/models/forms/category.xml
new file mode 100644
index 00000000..b249d023
--- /dev/null
+++ b/core/administrator/components/com_categories/models/forms/category.xml
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<field
+		name="id"
+		type="number"
+		label="JGLOBAL_FIELD_ID_LABEL"
+		description="JGLOBAL_FIELD_ID_DESC"
+		default="0"
+		class="readonly"
+		readonly="true"
+	/>
+
+	<field
+		name="hits"
+		type="number"
+		label="JGLOBAL_HITS"
+		description="COM_CATEGORIES_FIELD_HITS_DESC"
+		default="0"
+		class="readonly"
+		readonly="true"
+	/>
+
+	<field
+		name="asset_id"
+		type="hidden"
+		filter="unset"
+		label="JFIELD_ASSET_ID_LABEL"
+		description="JFIELD_ASSET_ID_DESC"
+	/>
+
+	<field
+		name="parent_id"
+		type="categoryedit"
+		label="COM_CATEGORIES_FIELD_PARENT_LABEL"
+		description="COM_CATEGORIES_FIELD_PARENT_DESC"
+	/>
+
+	<field
+		name="lft"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="rgt"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="level"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="path"
+		type="text"
+		label="COM_CATEGORIES_PATH_LABEL"
+		description="COM_CATEGORIES_PATH_DESC"
+		class="readonly"
+		size="40"
+		readonly="true"
+	/>
+
+	<field
+		name="extension"
+		type="hidden"
+	/>
+
+	<field
+		name="title"
+		type="text"
+		label="JGLOBAL_TITLE"
+		description="JFIELD_TITLE_DESC"
+		class="input-xxlarge input-large-text"
+		size="40"
+		required="true"
+	/>
+
+	<field
+		name="alias"
+		type="text"
+		label="JFIELD_ALIAS_LABEL"
+		description="JFIELD_ALIAS_DESC"
+		size="45"
+		hint="JFIELD_ALIAS_PLACEHOLDER"
+	/>
+
+	<field
+		name="version_note"
+		type="text"
+		label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+		description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+		class="span12"
+		size="45"
+		maxlength="255"
+	/>
+
+	<field
+		name="note"
+		type="text"
+		label="COM_CATEGORIES_FIELD_NOTE_LABEL"
+		description="COM_CATEGORIES_FIELD_NOTE_DESC"
+		class="span12"
+		size="40"
+		maxlength="255"
+	/>
+
+	<field
+		name="description"
+		type="editor"
+		label="JGLOBAL_DESCRIPTION"
+		description="COM_CATEGORIES_DESCRIPTION_DESC"
+		filter="JComponentHelper::filterText"
+		buttons="true"
+		hide="readmore,pagebreak"
+	/>
+
+	<field
+		name="published"
+		type="list"
+		label="JSTATUS"
+		description="JFIELD_PUBLISHED_DESC"
+		default="1"
+		class="chzn-color-state"
+		size="1"
+		>
+		<option value="1">JPUBLISHED</option>
+		<option value="0">JUNPUBLISHED</option>
+		<option value="2">JARCHIVED</option>
+		<option value="-2">JTRASHED</option>
+	</field>
+
+	<field
+		name="buttonspacer"
+		type="spacer"
+		label="JGLOBAL_ACTION_PERMISSIONS_LABEL"
+		description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
+	/>
+
+	<field
+		name="checked_out"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="checked_out_time"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="access"
+		type="accesslevel"
+		label="JFIELD_ACCESS_LABEL"
+		description="JFIELD_ACCESS_DESC"
+	/>
+
+	<field
+		name="metadesc"
+		type="textarea"
+		label="JFIELD_META_DESCRIPTION_LABEL"
+		description="JFIELD_META_DESCRIPTION_DESC"
+		rows="3"
+		cols="40"
+	/>
+
+	<field
+		name="metakey"
+		type="textarea"
+		label="JFIELD_META_KEYWORDS_LABEL"
+		description="JFIELD_META_KEYWORDS_DESC"
+		rows="3"
+		cols="40"
+	/>
+
+	<field
+		name="created_user_id"
+		type="user"
+		label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+		desc="JGLOBAL_FIELD_CREATED_BY_DESC"
+	/>
+
+	<field
+		name="created_time"
+		type="text"
+		label="JGLOBAL_CREATED_DATE"
+		class="readonly"
+		filter="unset"
+		readonly="true"
+	/>
+
+	<field
+		name="modified_user_id"
+		type="user"
+		label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+		class="readonly"
+		readonly="true"
+		filter="unset"
+	/>
+
+	<field
+		name="modified_time"
+		type="text"
+		label="JGLOBAL_FIELD_MODIFIED_LABEL"
+		class="readonly"
+		filter="unset"
+		readonly="true"
+	/>
+
+	<field
+		name="language"
+		type="contentlanguage"
+		label="JFIELD_LANGUAGE_LABEL"
+		description="COM_CATEGORIES_FIELD_LANGUAGE_DESC"
+		>
+		<option value="*">JALL</option>
+	</field>
+
+	<field
+		name="tags"
+		type="tag"
+		label="JTAG"
+		description="JTAG_DESC"
+		class="span12"
+		multiple="true"
+	/>
+
+	<field
+		name="rules"
+		type="rules"
+		label="JFIELD_RULES_LABEL"
+		id="rules"
+		translate_label="false"
+		filter="rules"
+		validate="rules"
+		component="com_content"
+		section="category"
+	/>
+
+	<fields name="params" label="COM_CATEGORIES_FIELD_BASIC_LABEL">
+
+		<fieldset name="basic">
+
+			<field
+				name="category_layout"
+				type="componentlayout"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				view="category"
+				useglobal="true"
+			/>
+
+			<field
+				name="image"
+				type="media"
+				label="COM_CATEGORIES_FIELD_IMAGE_LABEL"
+				description="COM_CATEGORIES_FIELD_IMAGE_DESC"
+			/>
+
+			<field 
+				name="image_alt"
+				type="text"
+				label="COM_CATEGORIES_FIELD_IMAGE_ALT_LABEL"
+				description="COM_CATEGORIES_FIELD_IMAGE_ALT_DESC"
+				size="20"
+			/>
+		</fieldset>
+	</fields>
+
+	<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+		<fieldset name="jmetadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+			<field
+				name="author"
+				type="text"
+				label="JAUTHOR"
+				description="JFIELD_METADATA_AUTHOR_DESC"
+				size="30"
+			/>
+
+			<field
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_categories/models/forms/filter_categories.xml b/core/administrator/components/com_categories/models/forms/filter_categories.xml
new file mode 100644
index 00000000..5573d4ab
--- /dev/null
+++ b/core/administrator/components/com_categories/models/forms/filter_categories.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fields name="filter">
+
+		<field
+			name="search"
+			type="text"
+			label="COM_CATEGORIES_FILTER_SEARCH_LABEL"
+			description="COM_CATEGORIES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="COM_CATEGORIES_FILTER_PUBLISHED"
+			description="COM_CATEGORIES_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			mode="nested"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_TAG</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			default="a.lft ASC"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.lft DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
+			<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
+			<option value="language_title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language_title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CATEGORIES_LIST_LIMIT"
+			description="COM_CATEGORIES_LIST_LIMIT_DESC"
+			default="25"
+			class="input-mini"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_categories/tables/category.php b/core/administrator/components/com_categories/tables/category.php
new file mode 100644
index 00000000..014619ea
--- /dev/null
+++ b/core/administrator/components/com_categories/tables/category.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Category table
+ *
+ * @since  1.6
+ */
+class CategoriesTableCategory extends JTableCategory
+{
+	/**
+	 * Method to delete a node and, optionally, its child nodes from the table.
+	 *
+	 * @param   integer  $pk        The primary key of the node to delete.
+	 * @param   boolean  $children  True to delete child nodes, false to move them up a level.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function delete($pk = null, $children = false)
+	{
+		return parent::delete($pk, $children);
+	}
+}
diff --git a/core/administrator/components/com_categories/views/categories/tmpl/default.php b/core/administrator/components/com_categories/views/categories/tmpl/default.php
new file mode 100644
index 00000000..5ad84b77
--- /dev/null
+++ b/core/administrator/components/com_categories/views/categories/tmpl/default.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\Inflector;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$extension = $this->escape($this->state->get('filter.extension'));
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
+$parts     = explode('.', $extension, 2);
+$component = $parts[0];
+$section   = null;
+$columns   = 7;
+
+if (count($parts) > 1)
+{
+	$section = $parts[1];
+
+	$inflector = Inflector::getInstance();
+
+	if (!$inflector->isPlural($section))
+	{
+		$section = $inflector->toPlural($section);
+	}
+}
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_categories&task=categories.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'categoryList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<?php
+		// Search tools bar
+		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+		?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="categoryList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) :
+							$columns++; ?>
+							<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+								<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) :
+							$columns++; ?>
+							<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+								<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) :
+							$columns++; ?>
+							<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+								<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) :
+							$columns++; ?>
+							<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+								<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($this->assoc) :
+							$columns++; ?>
+							<th width="5%" class="nowrap hidden-phone hidden-tablet">
+								<?php echo JHtml::_('searchtools.sort', 'COM_CATEGORY_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+							</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="<?php echo $columns; ?>">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php
+						$canEdit    = $user->authorise('core.edit',       $extension . '.category.' . $item->id);
+						$canCheckin = $user->authorise('core.admin',      'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+						$canEditOwn = $user->authorise('core.edit.own',   $extension . '.category.' . $item->id) && $item->created_user_id == $userId;
+						$canChange  = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;
+
+						// Get the parents of item for sorting
+						if ($item->level > 1)
+						{
+							$parentsStr = '';
+							$_currentParentId = $item->parent_id;
+							$parentsStr = ' ' . $_currentParentId;
+							for ($i2 = 0; $i2 < $item->level; $i2++)
+							{
+								foreach ($this->ordering as $k => $v)
+								{
+									$v = implode('-', $v);
+									$v = '-' . $v . '-';
+									if (strpos($v, '-' . $_currentParentId . '-') !== false)
+									{
+										$parentsStr .= ' ' . $k;
+										$_currentParentId = $k;
+										break;
+									}
+								}
+							}
+						}
+						else
+						{
+							$parentsStr = '';
+						}
+						?>
+						<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->parent_id; ?>" item-id="<?php echo $item->id ?>" parents="<?php echo $parentsStr ?>" level="<?php echo $item->level ?>">
+							<td class="order nowrap center hidden-phone">
+								<?php
+								$iconClass = '';
+								if (!$canChange)
+								{
+									$iconClass = ' inactive';
+								}
+								elseif (!$saveOrder)
+								{
+									$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+								}
+								?>
+								<span class="sortable-handler<?php echo $iconClass ?>">
+									<span class="icon-menu"></span>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->lft; ?>" />
+								<?php endif; ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->published, $i, 'categories.', $canChange); ?>
+									<?php
+									if ($canChange)
+									{
+										// Create dropdown items
+										JHtml::_('actionsdropdown.' . ((int) $item->published === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'categories');
+										JHtml::_('actionsdropdown.' . ((int) $item->published === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'categories');
+
+										// Render dropdown list
+										echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
+									}
+									?>
+								</div>
+							</td>
+							<td>
+								<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit || $canEditOwn) : ?>
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_categories&task=category.edit&id=' . $item->id . '&extension=' . $extension); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+										<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<?php echo $this->escape($item->title); ?>
+								<?php endif; ?>
+								<span class="small" title="<?php echo $this->escape($item->path); ?>">
+									<?php if (empty($item->note)) : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+									<?php else : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+									<?php endif; ?>
+								</span>
+							</td>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+								<td class="center btns hidden-phone hidden-tablet">
+									<a class="badge <?php if ($item->count_published > 0) echo 'badge-success'; ?>" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=1' . '&filter[level]=1'); ?>">
+										<?php echo $item->count_published; ?></a>
+								</td>
+							<?php endif; ?>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+								<td class="center btns hidden-phone hidden-tablet">
+									<a class="badge <?php if ($item->count_unpublished > 0) echo 'badge-important'; ?>" title="<?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=0' . '&filter[level]=1'); ?>">
+										<?php echo $item->count_unpublished; ?></a>
+								</td>
+							<?php endif; ?>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+								<td class="center btns hidden-phone hidden-tablet">
+									<a class="badge <?php if ($item->count_archived > 0) echo 'badge-info'; ?>" title="<?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=2' . '&filter[level]=1'); ?>">
+										<?php echo $item->count_archived; ?></a>
+								</td>
+							<?php endif; ?>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+								<td class="center btns hidden-phone hidden-tablet">
+									<a class="badge <?php if ($item->count_trashed > 0) echo 'badge-inverse'; ?>" title="<?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($section ? '&view=' . $section : '') . '&filter[category_id]=' . (int) $item->id . '&filter[published]=-2' . '&filter[level]=1'); ?>">
+										<?php echo $item->count_trashed; ?></a>
+								</td>
+							<?php endif; ?>
+
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<?php if ($this->assoc) : ?>
+								<td class="hidden-phone hidden-tablet">
+									<?php if ($item->association) : ?>
+										<?php echo JHtml::_('CategoriesAdministrator.association', $item->id, $extension); ?>
+									<?php endif; ?>
+								</td>
+							<?php endif; ?>
+							<td class="small nowrap hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="hidden-phone">
+								<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+									<?php echo (int) $item->id; ?></span>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', $extension)
+				&& $user->authorise('core.edit', $extension)
+				&& $user->authorise('core.edit.state', $extension)) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_CATEGORIES_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="extension" value="<?php echo $extension; ?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_categories/views/categories/tmpl/default.xml b/core/administrator/components/com_categories/views/categories/tmpl/default.xml
new file mode 100755
index 00000000..ae87868d
--- /dev/null
+++ b/core/administrator/components/com_categories/views/categories/tmpl/default.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fieldset name="request">
+		<fields name="request">
+			<field
+				name="extension"
+				type="componentscategory"
+				label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
+				description="COM_CATEGORIES_CHOOSE_COMPONENT_DESC"
+				required="true"
+			>
+				<option value="">COM_MENUS_OPTION_SELECT_COMPONENT</option>
+			</field>
+		</fields>
+	</fieldset>
+</metadata>
diff --git a/core/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/core/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
new file mode 100644
index 00000000..1307d418
--- /dev/null
+++ b/core/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$options = array(
+	JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
+	JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
+);
+$published = $this->state->get('filter.published');
+$extension = $this->escape($this->state->get('filter.extension'));
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="span6">
+				<div class="control-group">
+					<label id="batch-choose-action-lbl" for="batch-category-id" class="control-label">
+						<?php echo JText::_('JLIB_HTML_BATCH_MENU_LABEL'); ?>
+					</label>
+					<div id="batch-choose-action" class="combo controls">
+						<select name="batch[category_id]" id="batch-category-id">
+							<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY') ?></option>
+							<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('filter.published' => $published))); ?>
+						</select>
+					</div>
+				</div>
+				<div id="batch-copy-move" class="control-group radio">
+					<?php echo JText::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
+					<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<div class="span6">
+			<div class="control-group">
+				<label id="flip-ordering-id-lbl" for="flip-ordering-id" class="control-label">
+					<?php echo JText::_('JLIB_HTML_BATCH_FLIPORDERING_LABEL'); ?>
+				</label>
+				<?php echo JHtml::_('select.booleanlist', 'batch[flip_ordering]', array(), 0, 'JYES', 'JNO', 'flip-ordering-id'); ?>
+			</div>
+		</div>
+	</div>
+</div>
+
diff --git a/core/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php b/core/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..2530fc28
--- /dev/null
+++ b/core/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('category.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_categories/views/categories/tmpl/modal.php b/core/administrator/components/com_categories/views/categories/tmpl/modal.php
new file mode 100644
index 00000000..436dff20
--- /dev/null
+++ b/core/administrator/components/com_categories/views/categories/tmpl/modal.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php');
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$extension = $this->escape($this->state->get('filter.extension'));
+$function  = $app->input->getCmd('function', 'jSelectCategory');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+
+		<div class="clearfix"></div>
+
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="categoryList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php
+					$iconStates = array(
+						-2 => 'icon-trash',
+						0  => 'icon-unpublish',
+						1  => 'icon-publish',
+						2  => 'icon-archive',
+					);
+					?>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php if ($item->language && JLanguageMultilang::isEnabled())
+						{
+							$tag = strlen($item->language);
+							if ($tag == 5)
+							{
+								$lang = substr($item->language, 0, 2);
+							}
+							elseif ($tag == 6)
+							{
+								$lang = substr($item->language, 0, 3);
+							}
+							else
+							{
+								$lang = '';
+							}
+						}
+						elseif (!JLanguageMultilang::isEnabled())
+						{
+							$lang = '';
+						}
+						?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center">
+								<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
+							</td>
+							<td>
+								<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+								<a href="javascript:void(0)" onclick="if (window.parent) window.parent.<?php echo $this->escape($function); ?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->title)); ?>', null, '<?php echo $this->escape(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>', '<?php echo $this->escape($lang); ?>', null);">
+									<?php echo $this->escape($item->title); ?></a>
+								<span class="small" title="<?php echo $this->escape($item->path); ?>">
+									<?php if (empty($item->note)) : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+									<?php else : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+									<?php endif; ?>
+								</span>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo (int) $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="extension" value="<?php echo $extension; ?>" />
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_categories/views/categories/view.html.php b/core/administrator/components/com_categories/views/categories/view.html.php
new file mode 100644
index 00000000..44280016
--- /dev/null
+++ b/core/administrator/components/com_categories/views/categories/view.html.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Categories view class for the Category package.
+ *
+ * @since  1.6
+ */
+class CategoriesViewCategories extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Flag if an association exists
+	 *
+	 * @var  boolean
+	 */
+	protected $assoc;
+
+	/**
+	 * Form object for search filters
+	 *
+	 * @var  JForm
+	 */
+	public $filterForm;
+
+	/**
+	 * The active search filters
+	 *
+	 * @var  array
+	 */
+	public $activeFilters;
+
+	/**
+	 * The sidebar markup
+	 *
+	 * @var  string
+	 */
+	protected $string;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->assoc         = $this->get('Assoc');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Preprocess the list of items to find ordering divisions.
+		foreach ($this->items as &$item)
+		{
+			$this->ordering[$item->parent_id][] = $item->id;
+		}
+
+		// Levels filter - Used in Hathor.
+		$this->f_levels = array(
+			JHtml::_('select.option', '1', JText::_('J1')),
+			JHtml::_('select.option', '2', JText::_('J2')),
+			JHtml::_('select.option', '3', JText::_('J3')),
+			JHtml::_('select.option', '4', JText::_('J4')),
+			JHtml::_('select.option', '5', JText::_('J5')),
+			JHtml::_('select.option', '6', JText::_('J6')),
+			JHtml::_('select.option', '7', JText::_('J7')),
+			JHtml::_('select.option', '8', JText::_('J8')),
+			JHtml::_('select.option', '9', JText::_('J9')),
+			JHtml::_('select.option', '10', JText::_('J10')),
+		);
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+			}
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$categoryId = $this->state->get('filter.category_id');
+		$component  = $this->state->get('filter.component');
+		$section    = $this->state->get('filter.section');
+		$canDo      = JHelperContent::getActions($component, 'category', $categoryId);
+		$user       = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Avoid nonsense situation.
+		if ($component == 'com_categories')
+		{
+			return;
+		}
+
+		// Need to load the menu language file as mod_menu hasn't been loaded yet.
+		$lang = JFactory::getLanguage();
+		$lang->load($component, JPATH_BASE, null, false, true)
+		|| $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true);
+
+		// Load the category helper.
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// If a component categories title string is present, let's use it.
+		if ($lang->hasKey($component_title_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORIES_TITLE'))
+		{
+			$title = JText::_($component_title_key);
+		}
+		elseif ($lang->hasKey($component_section_key = strtoupper($component . ($section ? "_$section" : ''))))
+		// Else if the component section string exits, let's use it
+		{
+			$title = JText::sprintf('COM_CATEGORIES_CATEGORIES_TITLE', $this->escape(JText::_($component_section_key)));
+		}
+		else
+		// Else use the base title
+		{
+			$title = JText::_('COM_CATEGORIES_CATEGORIES_BASE_TITLE');
+		}
+
+		// Load specific css component
+		JHtml::_('stylesheet', $component . '/administrator/categories.css', array('version' => 'auto', 'relative' => true));
+
+		// Prepare the toolbar.
+		JToolbarHelper::title($title, 'folder categories ' . substr($component, 4) . ($section ? "-$section" : '') . '-categories');
+
+		if ($canDo->get('core.create') || count($user->getAuthorisedCategories($component, 'core.create')) > 0)
+		{
+			JToolbarHelper::addNew('category.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('category.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('categories.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('categories.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::archiveList('categories.archive');
+		}
+
+		if (JFactory::getUser()->authorise('core.admin'))
+		{
+			JToolbarHelper::checkin('categories.checkin');
+		}
+
+		// Add a batch button
+		if ($canDo->get('core.create')
+			&& $canDo->get('core.edit')
+			&& $canDo->get('core.edit.state'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::custom('categories.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences($component);
+		}
+
+		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete', $component))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'categories.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('categories.trash');
+		}
+
+		// Compute the ref_key if it does exist in the component
+		if (!$lang->hasKey($ref_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORIES_HELP_KEY'))
+		{
+			$ref_key = 'JHELP_COMPONENTS_' . strtoupper(substr($component, 4) . ($section ? "_$section" : '')) . '_CATEGORIES';
+		}
+
+		/*
+		 * Get help for the categories view for the component by
+		 * -remotely searching in a language defined dedicated URL: *component*_HELP_URL
+		 * -locally  searching in a component help file if helpURL param exists in the component and is set to ''
+		 * -remotely searching in a component URL if helpURL param exists in the component and is NOT set to ''
+		 */
+		if ($lang->hasKey($lang_help_url = strtoupper($component) . '_HELP_URL'))
+		{
+			$debug = $lang->setDebug(false);
+			$url = JText::_($lang_help_url);
+			$lang->setDebug($debug);
+		}
+		else
+		{
+			$url = null;
+		}
+
+		JToolbarHelper::help($ref_key, JComponentHelper::getParams($component)->exists('helpURL'), $url);
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.lft'       => JText::_('JGRID_HEADING_ORDERING'),
+			'a.published' => JText::_('JSTATUS'),
+			'a.title'     => JText::_('JGLOBAL_TITLE'),
+			'a.access'    => JText::_('JGRID_HEADING_ACCESS'),
+			'language'    => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'        => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_categories/views/category/tmpl/edit.php b/core/administrator/components/com_categories/views/category/tmpl/edit.php
new file mode 100644
index 00000000..54dbeeb2
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+$assoc = JLanguageAssociations::isEnabled();
+// Are associations implemented for this extension?
+$extensionassoc = array_key_exists('item_associations', $this->form->getFieldsets());
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "category.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
+		{
+			jQuery("#permissions-sliders select").attr("disabled", "disabled");
+			' . $this->form->getField('description')->save() . '
+			Joomla.submitform(task, document.getElementById("item-form"));
+
+			// @deprecated 4.0  The following js is not needed since 3.7.0.
+			if (task !== "category.apply")
+			{
+				window.parent.jQuery("#categoryEdit' . $this->item->id . 'Modal").modal("hide");
+			}
+		}
+	};
+');
+
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('jmetadata', 'item_associations');
+
+// In case of modal
+$isModal = $input->get('layout') == 'modal' ? true : false;
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_categories&extension=' . $input->getCmd('extension', 'com_content') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('JCATEGORY')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php echo $this->form->getLabel('description'); ?>
+				<?php echo $this->form->getInput('description'); ?>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('COM_CATEGORIES_FIELDSET_PUBLISHING')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php if ( ! $isModal && $assoc && $extensionassoc) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+			<?php echo $this->loadTemplate('associations'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php elseif ($isModal && $assoc && $extensionassoc) : ?>
+			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+		<?php endif; ?>
+
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'rules', JText::_('COM_CATEGORIES_FIELDSET_RULES')); ?>
+			<?php echo $this->form->getInput('rules'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+		<?php echo $this->form->getInput('extension'); ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_categories/views/category/tmpl/edit.xml b/core/administrator/components/com_categories/views/category/tmpl/edit.xml
new file mode 100755
index 00000000..f96948e4
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/edit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CATEGORIES_CATEGORY_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_CATEGORIES_CATEGORY_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+	<fieldset name="request">
+		<fields name="request">
+			<field
+				name="extension"
+				type="componentscategory"
+				label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
+				description="COM_CATEGORIES_CHOOSE_COMPONENT_DESC"
+				required="true"
+				>
+				<option value="">COM_MENUS_OPTION_SELECT_COMPONENT</option>
+			</field>
+			<field
+				name="id"
+				type="hidden"
+				default="0"
+			/>
+		</fields>
+	</fieldset>
+</metadata>
diff --git a/core/administrator/components/com_categories/views/category/tmpl/edit_associations.php b/core/administrator/components/com_categories/views/category/tmpl/edit_associations.php
new file mode 100644
index 00000000..f422019e
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/edit_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_categories/views/category/tmpl/edit_metadata.php b/core/administrator/components/com_categories/views/category/tmpl/edit_metadata.php
new file mode 100644
index 00000000..309153ab
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/edit_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_categories/views/category/tmpl/modal.php b/core/administrator/components/com_categories/views/category/tmpl/modal.php
new file mode 100644
index 00000000..2167693b
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/modal.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+
+// @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0.
+$function  = JFactory::getApplication()->input->getCmd('function', 'jEditCategory_' . (int) $this->item->id);
+
+// Function to update input title when changed
+JFactory::getDocument()->addScriptDeclaration('
+	function jEditCategoryModal() {
+		if (window.parent && document.formvalidator.isValid(document.getElementById("item-form"))) {
+			return window.parent.' . $this->escape($function) . '(document.getElementById("jform_title").value);
+		}
+	}
+');
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('category.apply'); jEditCategoryModal();"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('category.save'); jEditCategoryModal();"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('category.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/core/administrator/components/com_categories/views/category/tmpl/modal_associations.php b/core/administrator/components/com_categories/views/category/tmpl/modal_associations.php
new file mode 100644
index 00000000..f422019e
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/modal_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php b/core/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php
new file mode 100644
index 00000000..c3a7e055
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
diff --git a/core/administrator/components/com_categories/views/category/tmpl/modal_metadata.php b/core/administrator/components/com_categories/views/category/tmpl/modal_metadata.php
new file mode 100644
index 00000000..309153ab
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/modal_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_categories/views/category/tmpl/modal_options.php b/core/administrator/components/com_categories/views/category/tmpl/modal_options.php
new file mode 100644
index 00000000..ea0d512f
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/tmpl/modal_options.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JHtml::_('bootstrap.startAccordion', 'categoryOptions', array('active' => 'collapse0'));
+$fieldSets = $this->form->getFieldsets('params');
+$i = 0;
+?>
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<?php
+	$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL';
+	echo JHtml::_('bootstrap.addSlide', 'categoryOptions', JText::_($label), 'collapse' . ($i++));
+	if (isset($fieldSet->description) && trim($fieldSet->description))
+	{
+		echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	}
+	?>
+	<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $field->label; ?>
+			</div>
+			<div class="controls">
+				<?php echo $field->input; ?>
+			</div>
+		</div>
+	<?php endforeach; ?>
+
+	<?php if ($name == 'basic') : ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('note'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('note'); ?>
+			</div>
+		</div>
+	<?php endif; ?>
+	<?php echo JHtml::_('bootstrap.endSlide'); ?>
+<?php endforeach; ?>
+<?php echo JHtml::_('bootstrap.endAccordion'); ?>
diff --git a/core/administrator/components/com_categories/views/category/view.html.php b/core/administrator/components/com_categories/views/category/view.html.php
new file mode 100644
index 00000000..c24b32c1
--- /dev/null
+++ b/core/administrator/components/com_categories/views/category/view.html.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Categories component
+ *
+ * @since  1.6
+ */
+class CategoriesViewCategory extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Flag if an association exists
+	 *
+	 * @var  boolean
+	 */
+	protected $assoc;
+
+	/**
+	 * The actions the user is authorised to perform
+	 *
+	 * @var  JObject
+	 */
+	protected $canDo;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->form = $this->get('Form');
+		$this->item = $this->get('Item');
+		$this->state = $this->get('State');
+		$section = $this->state->get('category.section') ? $this->state->get('category.section') . '.' : '';
+		$this->canDo = JHelperContent::getActions($this->state->get('category.component'), $section . 'category', $this->item->id);
+		$this->assoc = $this->get('Assoc');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Check for tag type
+		$this->checkTags = JHelperTags::getTypes('objectList', array($this->state->get('category.extension') . '.category'), true);
+
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		// If we are forcing a language in modal (used for associations).
+		if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd'))
+		{
+			// Set the language field to the forcedLanguage and disable changing it.
+			$this->form->setValue('language', null, $forcedLanguage);
+			$this->form->setFieldAttribute('language', 'readonly', 'true');
+
+			// Only allow to select categories with All language or with the forced language.
+			$this->form->setFieldAttribute('parent_id', 'language', '*,' . $forcedLanguage);
+
+			// Only allow to select tags with All language or with the forced language.
+			$this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$extension = JFactory::getApplication()->input->get('extension');
+		$user = JFactory::getUser();
+		$userId = $user->id;
+
+		$isNew = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Check to see if the type exists
+		$ucmType = new JUcmType;
+		$this->typeId = $ucmType->getTypeId($extension . '.category');
+
+		// Avoid nonsense situation.
+		if ($extension == 'com_categories')
+		{
+			return;
+		}
+
+		// The extension can be in the form com_foo.section
+		$parts = explode('.', $extension);
+		$component = $parts[0];
+		$section = (count($parts) > 1) ? $parts[1] : null;
+		$componentParams = JComponentHelper::getParams($component);
+
+		// Need to load the menu language file as mod_menu hasn't been loaded yet.
+		$lang = JFactory::getLanguage();
+		$lang->load($component, JPATH_BASE, null, false, true)
+		|| $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true);
+
+		// Load the category helper.
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// Get the results for each action.
+		$canDo = $this->canDo;
+
+		// If a component categories title string is present, let's use it.
+		if ($lang->hasKey($component_title_key = $component . ($section ? "_$section" : '') . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE'))
+		{
+			$title = JText::_($component_title_key);
+		}
+		// Else if the component section string exits, let's use it
+		elseif ($lang->hasKey($component_section_key = $component . ($section ? "_$section" : '')))
+		{
+			$title = JText::sprintf('COM_CATEGORIES_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT')
+					. '_TITLE', $this->escape(JText::_($component_section_key))
+					);
+		}
+		// Else use the base title
+		else
+		{
+			$title = JText::_('COM_CATEGORIES_CATEGORY_BASE_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE');
+		}
+
+		// Load specific css component
+		JHtml::_('stylesheet', $component . '/administrator/categories.css', array('version' => 'auto', 'relative' => true));
+
+		// Prepare the toolbar.
+		JToolbarHelper::title(
+			$title,
+			'folder category-' . ($isNew ? 'add' : 'edit')
+				. ' ' . substr($component, 4) . ($section ? "-$section" : '') . '-category-' . ($isNew ? 'add' : 'edit')
+		);
+
+		// For new records, check the create permission.
+		if ($isNew && (count($user->getAuthorisedCategories($component, 'core.create')) > 0))
+		{
+			JToolbarHelper::apply('category.apply');
+			JToolbarHelper::save('category.save');
+			JToolbarHelper::save2new('category.save2new');
+			JToolbarHelper::cancel('category.cancel');
+		}
+
+		// If not checked out, can save the item.
+		else
+		{
+			// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
+			$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_user_id == $userId);
+
+			// Can't save the record if it's checked out and editable
+			if (!$checkedOut && $itemEditable)
+			{
+				JToolbarHelper::apply('category.apply');
+				JToolbarHelper::save('category.save');
+
+				if ($canDo->get('core.create'))
+				{
+					JToolbarHelper::save2new('category.save2new');
+				}
+			}
+
+			// If an existing item, can save to a copy.
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2copy('category.save2copy');
+			}
+
+			if (JComponentHelper::isEnabled('com_contenthistory') && $componentParams->get('save_history', 0) && $itemEditable)
+			{
+				$typeAlias = $extension . '.category';
+				JToolbarHelper::versions($typeAlias, $this->item->id);
+			}
+
+			JToolbarHelper::cancel('category.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+
+		// Compute the ref_key
+		$ref_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_HELP_KEY';
+
+		// Check if thr computed ref_key does exist in the component
+		if (!$lang->hasKey($ref_key))
+		{
+			$ref_key = 'JHELP_COMPONENTS_'
+						. strtoupper(substr($component, 4) . ($section ? "_$section" : ''))
+						. '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT');
+		}
+
+		/*
+		 * Get help for the category/section view for the component by
+		 * -remotely searching in a language defined dedicated URL: *component*_HELP_URL
+		 * -locally  searching in a component help file if helpURL param exists in the component and is set to ''
+		 * -remotely searching in a component URL if helpURL param exists in the component and is NOT set to ''
+		 */
+		if ($lang->hasKey($lang_help_url = strtoupper($component) . '_HELP_URL'))
+		{
+			$debug = $lang->setDebug(false);
+			$url = JText::_($lang_help_url);
+			$lang->setDebug($debug);
+		}
+		else
+		{
+			$url = null;
+		}
+
+		JToolbarHelper::help($ref_key, $componentParams->exists('helpURL'), $url, $component);
+	}
+}
diff --git a/core/administrator/components/com_checkin/checkin.php b/core/administrator/components/com_checkin/checkin.php
new file mode 100644
index 00000000..0e07b11d
--- /dev/null
+++ b/core/administrator/components/com_checkin/checkin.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_checkin'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Checkin');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_checkin/checkin.xml b/core/administrator/components/com_checkin/checkin.xml
new file mode 100644
index 00000000..338dfbd5
--- /dev/null
+++ b/core/administrator/components/com_checkin/checkin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_checkin</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CHECKIN_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>checkin.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_checkin.ini</language>
+			<language tag="en-GB">language/en-GB.com_checkin.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_checkin/config.xml b/core/administrator/components/com_checkin/config.xml
new file mode 100644
index 00000000..2a2238ff
--- /dev/null
+++ b/core/administrator/components/com_checkin/config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_checkin"
+			section="component">
+			<action
+				name="core.admin"
+				title="JACTION_ADMIN"
+				description="JACTION_ADMIN_COMPONENT_DESC" />
+			<action
+				name="core.manage"
+				title="JACTION_MANAGE"
+				description="JACTION_MANAGE_COMPONENT_DESC" />
+		</field>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_checkin/controller.php b/core/administrator/components/com_checkin/controller.php
new file mode 100644
index 00000000..66ddd9bc
--- /dev/null
+++ b/core/administrator/components/com_checkin/controller.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Checkin Controller
+ *
+ * @since  1.6
+ */
+class CheckinController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  CheckinController  A JControllerLegacy object to support chaining.
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		// Load the submenu.
+		$this->addSubmenu($this->input->getWord('option', 'com_checkin'));
+
+		return parent::display();
+	}
+
+	/**
+	 * Check in a list of items.
+	 *
+	 * @return  void
+	 */
+	public function checkin()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids = $this->input->get('cid', array(), 'array');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var CheckinModelCheckin $model */
+			$model = $this->getModel();
+
+			// Checked in the items.
+			$this->setMessage(JText::plural('COM_CHECKIN_N_ITEMS_CHECKED_IN', $model->checkin($ids)));
+		}
+
+		$this->setRedirect('index.php?option=com_checkin');
+	}
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_SUBMENU_CHECKIN'),
+			'index.php?option=com_checkin',
+			$vName == 'com_checkin'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_SUBMENU_CLEAR_CACHE'),
+			'index.php?option=com_cache',
+			$vName == 'cache'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'),
+			'index.php?option=com_cache&view=purge',
+			$vName == 'purge'
+		);
+	}
+}
diff --git a/core/administrator/components/com_checkin/models/checkin.php b/core/administrator/components/com_checkin/models/checkin.php
new file mode 100644
index 00000000..2affd159
--- /dev/null
+++ b/core/administrator/components/com_checkin/models/checkin.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Checkin Model
+ *
+ * @since  1.6
+ */
+class CheckinModelCheckin extends JModelList
+{
+	/**
+	 * Count of the total items checked out
+	 *
+	 * @var  integer
+	 */
+	protected $total;
+
+	/**
+	 * Unused class variable
+	 *
+	 * @var  object
+	 * @deprecated  4.0
+	 */
+	protected $tables;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.5
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'table',
+				'count',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note: Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'table', $direction = 'asc')
+	{
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Checks in requested tables
+	 *
+	 * @param   array  $ids  An array of table names. Optional.
+	 *
+	 * @return  integer  Checked in item count
+	 *
+	 * @since   1.6
+	 */
+	public function checkin($ids = array())
+	{
+		$db = $this->getDbo();
+		$nullDate = $db->getNullDate();
+
+		if (!is_array($ids))
+		{
+			return 0;
+		}
+
+		// This int will hold the checked item count.
+		$results = 0;
+
+		foreach ($ids as $tn)
+		{
+			// Make sure we get the right tables based on prefix.
+			if (stripos($tn, JFactory::getApplication()->get('dbprefix')) !== 0)
+			{
+				continue;
+			}
+
+			$fields = $db->getTableColumns($tn);
+
+			if (!(isset($fields['checked_out']) && isset($fields['checked_out_time'])))
+			{
+				continue;
+			}
+
+			$query = $db->getQuery(true)
+				->update($db->quoteName($tn))
+				->set('checked_out = 0')
+				->set('checked_out_time = ' . $db->quote($nullDate))
+				->where('checked_out > 0');
+
+			$db->setQuery($query);
+
+			if ($db->execute())
+			{
+				$results = $results + $db->getAffectedRows();
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Get total of tables
+	 *
+	 * @return  integer  Total to check-in tables
+	 *
+	 * @since   1.6
+	 */
+	public function getTotal()
+	{
+		if (!isset($this->total))
+		{
+			$this->getItems();
+		}
+
+		return $this->total;
+	}
+
+	/**
+	 * Get tables
+	 *
+	 * @return  array  Checked in table names as keys and checked in item count as values.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		if (!isset($this->items))
+		{
+			$db     = $this->getDbo();
+			$tables = $db->getTableList();
+
+			// This array will hold table name as key and checked in item count as value.
+			$results = array();
+
+			foreach ($tables as $i => $tn)
+			{
+				// Make sure we get the right tables based on prefix.
+				if (stripos($tn, JFactory::getApplication()->get('dbprefix')) !== 0)
+				{
+					unset($tables[$i]);
+					continue;
+				}
+
+				if ($this->getState('filter.search') && stripos($tn, $this->getState('filter.search')) === false)
+				{
+					unset($tables[$i]);
+					continue;
+				}
+
+				$fields = $db->getTableColumns($tn);
+
+				if (!(isset($fields['checked_out']) && isset($fields['checked_out_time'])))
+				{
+					unset($tables[$i]);
+					continue;
+				}
+			}
+
+			foreach ($tables as $tn)
+			{
+				$query = $db->getQuery(true)
+					->select('COUNT(*)')
+					->from($db->quoteName($tn))
+					->where('checked_out > 0');
+
+				$db->setQuery($query);
+
+				if ($db->execute())
+				{
+					$results[$tn] = $db->loadResult();
+
+					// Show only tables with items to checkin.
+					if ((int) $results[$tn] === 0)
+					{
+						unset($results[$tn]);
+					}
+				}
+				else
+				{
+					continue;
+				}
+			}
+
+			$this->total = count($results);
+
+			// Order items by table
+			if ($this->getState('list.ordering') == 'table')
+			{
+				if (strtolower($this->getState('list.direction')) == 'asc')
+				{
+					ksort($results);
+				}
+				else
+				{
+					krsort($results);
+				}
+			}
+			// Order items by number of items
+			else
+			{
+				if (strtolower($this->getState('list.direction')) == 'asc')
+				{
+					asort($results);
+				}
+				else
+				{
+					arsort($results);
+				}
+			}
+
+			// Pagination
+			$limit = (int) $this->getState('list.limit');
+
+			if ($limit !== 0)
+			{
+				$this->items = array_slice($results, $this->getState('list.start'), $limit);
+			}
+			else
+			{
+				$this->items = $results;
+			}
+		}
+
+		return $this->items;
+	}
+}
diff --git a/core/administrator/components/com_checkin/models/forms/filter_checkin.xml b/core/administrator/components/com_checkin/models/forms/filter_checkin.xml
new file mode 100644
index 00000000..e203f51a
--- /dev/null
+++ b/core/administrator/components/com_checkin/models/forms/filter_checkin.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_CHECKIN_FILTER_SEARCH_LABEL"
+			description="COM_CHECKIN_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_CHECKIN_NO_ITEMS"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="table ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="table ASC">COM_CHECKIN_DATABASE_TABLE_ASC</option>
+			<option value="table DESC">COM_CHECKIN_DATABASE_TABLE_DESC</option>
+			<option value="count ASC">COM_CHECKIN_ITEMS_TO_CHECK_IN_ASC</option>
+			<option value="count DESC">COM_CHECKIN_ITEMS_TO_CHECK_IN_DESC</option>
+		</field> 
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="5"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_checkin/views/checkin/tmpl/default.php b/core/administrator/components/com_checkin/views/checkin/tmpl/default.php
new file mode 100644
index 00000000..374fed70
--- /dev/null
+++ b/core/administrator/components/com_checkin/views/checkin/tmpl/default.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_checkin'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->total > 0) : ?>
+			<table id="global-checkin" class="table table-striped">
+				<thead>
+					<tr>
+						<th width="1%"><?php echo JHtml::_('grid.checkall'); ?></th>
+						<th><?php echo JHtml::_('searchtools.sort', 'COM_CHECKIN_DATABASE_TABLE', 'table', $listDirn, $listOrder); ?></th>
+						<th><?php echo JHtml::_('searchtools.sort', 'COM_CHECKIN_ITEMS_TO_CHECK_IN', 'count', $listDirn, $listOrder); ?></th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="3">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php $i = 0; ?>
+					<?php foreach ($this->items as $table => $count) : ?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center"><?php echo JHtml::_('grid.id', $i, $table); ?></td>
+							<td>
+								<label for="cb<?php echo $i ?>">
+									<?php echo JText::sprintf('COM_CHECKIN_TABLE', $table); ?>
+								</label>
+							</td>
+							<td>
+								<span class="label label-warning"><?php echo $count; ?></span>
+							</td>
+						</tr>
+						<?php $i++; ?>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_checkin/views/checkin/tmpl/default.xml b/core/administrator/components/com_checkin/views/checkin/tmpl/default.xml
new file mode 100755
index 00000000..e0086bef
--- /dev/null
+++ b/core/administrator/components/com_checkin/views/checkin/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CHECKIN_CHECKIN_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CHECKIN_CHECKIN_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_checkin/views/checkin/view.html.php b/core/administrator/components/com_checkin/views/checkin/view.html.php
new file mode 100644
index 00000000..12c16424
--- /dev/null
+++ b/core/administrator/components/com_checkin/views/checkin/view.html.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Checkin component
+ *
+ * @since  1.0
+ */
+class CheckinViewCheckin extends JViewLegacy
+{
+	/**
+	 * Unused class variable
+	 *
+	 * @var  object
+	 * @deprecated  4.0
+	 */
+	protected $tables;
+
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * The sidebar markup
+	 *
+	 * @var  string
+	 */
+	protected $sidebar;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->total         = $this->get('Total');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin');
+
+		JToolbarHelper::custom('checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true);
+
+		if (JFactory::getUser()->authorise('core.admin', 'com_checkin'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::preferences('com_checkin');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN');
+	}
+}
diff --git a/core/administrator/components/com_config/access.xml b/core/administrator/components/com_config/access.xml
new file mode 100644
index 00000000..861fef08
--- /dev/null
+++ b/core/administrator/components/com_config/access.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_config">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_config/config.php b/core/administrator/components/com_config/config.php
new file mode 100644
index 00000000..6b9c7e65
--- /dev/null
+++ b/core/administrator/components/com_config/config.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+// Access checks are done internally because of different requirements for the two controllers.
+
+// Tell the browser not to cache this page.
+JFactory::getApplication()->setHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT', true);
+
+// Load classes
+JLoader::registerPrefix('Config', JPATH_COMPONENT);
+JLoader::registerPrefix('Config', JPATH_ROOT . '/components/com_config');
+
+// Application
+$app = JFactory::getApplication();
+
+$controllerHelper = new ConfigControllerHelper;
+$controller = $controllerHelper->parseController($app);
+
+$controller->prefix = 'Config';
+
+// Perform the Request task
+$controller->execute();
diff --git a/core/administrator/components/com_config/config.xml b/core/administrator/components/com_config/config.xml
new file mode 100644
index 00000000..bccece35
--- /dev/null
+++ b/core/administrator/components/com_config/config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_config</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CONFIG_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.php</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>models</folder>
+			<folder>controller</folder>
+			<folder>model</folder>
+			<folder>view</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_config.ini</language>
+			<language tag="en-GB">language/en-GB.com_config.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_config/controller.php b/core/administrator/components/com_config/controller.php
new file mode 100644
index 00000000..d5f11a6c
--- /dev/null
+++ b/core/administrator/components/com_config/controller.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Config Component Controller
+ *
+ * @since       1.5
+ * @deprecated  4.0
+ */
+class ConfigController extends JControllerLegacy
+{
+	/**
+	 * @var    string  The default view.
+	 * @since  1.6
+	 * @deprecated  4.0
+	 */
+	protected $default_view = 'application';
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  ConfigController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		// Set the default view name and format from the Request.
+		$vName = $this->input->get('view', 'application');
+
+		try
+		{
+			JLog::add(
+				sprintf('%s is deprecated. Use ConfigControllerApplicationDisplay or ConfigControllerComponentDisplay instead.', __CLASS__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		if (ucfirst($vName) == 'Application')
+		{
+			$controller = new ConfigControllerApplicationDisplay;
+		}
+		elseif (ucfirst($vName) == 'Component')
+		{
+			$controller = new ConfigControllerComponentDisplay;
+		}
+
+		return $controller->execute();
+	}
+}
diff --git a/core/administrator/components/com_config/controller/application/cancel.php b/core/administrator/components/com_config/controller/application/cancel.php
new file mode 100644
index 00000000..06ef0a07
--- /dev/null
+++ b/core/administrator/components/com_config/controller/application/cancel.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cancel Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerApplicationCancel extends ConfigControllerCanceladmin
+{
+	/**
+	 * Method to cancel global configuration.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin', 'com_config'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->redirect('index.php');
+		}
+
+		$this->context = 'com_config.config.global';
+
+		$this->redirect = 'index.php?option=com_cpanel';
+
+		parent::execute();
+	}
+}
diff --git a/core/administrator/components/com_config/controller/application/display.php b/core/administrator/components/com_config/controller/application/display.php
new file mode 100644
index 00000000..75ed0ea9
--- /dev/null
+++ b/core/administrator/components/com_config/controller/application/display.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base Display Controller
+ *
+ * @since  3.2
+ * @note   Needed for front end view
+ */
+class ConfigControllerApplicationDisplay extends ConfigControllerDisplay
+{
+	/**
+	 * Prefix for the view and model classes
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $prefix = 'Config';
+}
diff --git a/core/administrator/components/com_config/controller/application/removeroot.php b/core/administrator/components/com_config/controller/application/removeroot.php
new file mode 100644
index 00000000..77df2aad
--- /dev/null
+++ b/core/administrator/components/com_config/controller/application/removeroot.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Remove Root Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerApplicationRemoveroot extends JControllerBase
+{
+	/**
+	 * Application object - Redeclared for proper typehinting
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Method to remove root in global configuration.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken('get'))
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'));
+			$this->app->redirect('index.php');
+		}
+
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->redirect('index.php');
+		}
+
+		// Initialise model.
+		$model = new ConfigModelApplication;
+
+		// Attempt to save the configuration and remove root.
+		try
+		{
+			$model->removeroot();
+		}
+		catch (RuntimeException $e)
+		{
+			// Save failed, go back to the screen and display a notice.
+			$this->app->enqueueMessage(JText::sprintf('JERROR_SAVE_FAILED', $e->getMessage()), 'error');
+			$this->app->redirect(JRoute::_('index.php', false));
+		}
+
+		// Set the redirect based on the task.
+		$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'));
+		$this->app->redirect(JRoute::_('index.php', false));
+	}
+}
diff --git a/core/administrator/components/com_config/controller/application/save.php b/core/administrator/components/com_config/controller/application/save.php
new file mode 100644
index 00000000..2dc06253
--- /dev/null
+++ b/core/administrator/components/com_config/controller/application/save.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Save Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerApplicationSave extends JControllerBase
+{
+	/**
+	 * Application object - Redeclared for proper typehinting
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Method to save global configuration.
+	 *
+	 * @return  mixed  Calls $app->redirect() for all cases except JSON
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken())
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			$this->app->redirect('index.php');
+		}
+
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$this->app->redirect('index.php');
+		}
+
+		// Set FTP credentials, if given.
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		$model = new ConfigModelApplication;
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Complete data array if needed
+		$oldData = $model->getData();
+		$data = array_replace($oldData, $data);
+
+		// Get request type
+		$saveFormat = JFactory::getDocument()->getType();
+
+		// Handle service requests
+		if ($saveFormat == 'json')
+		{
+			return $model->save($data);
+		}
+
+		// Must load after serving service-requests
+		$form = $model->getForm();
+
+		// Validate the posted data.
+		$return = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($return === false)
+		{
+			/*
+			 * The validate method enqueued all messages for us, so we just need to redirect back.
+			 */
+
+			// Save the posted data in the session.
+			$this->app->setUserState('com_config.config.global.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.application', false));
+		}
+
+		// Attempt to save the configuration.
+		$data   = $return;
+		$return = $model->save($data);
+
+		// Check the return value.
+		if ($return === false)
+		{
+			/*
+			 * The save method enqueued all messages for us, so we just need to redirect back.
+			 */
+
+			// Save the validated data in the session.
+			$this->app->setUserState('com_config.config.global.data', $data);
+
+			// Save failed, go back to the screen and display a notice.
+			$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.application', false));
+		}
+
+		// Set the success message.
+		$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'), 'message');
+
+		// Clear the data from the session.
+		$this->app->setUserState('com_config.config.global.data', null);
+
+		// Set the redirect based on the task.
+		switch ($this->options[3])
+		{
+			case 'apply':
+				$this->app->redirect(JRoute::_('index.php?option=com_config', false));
+				break;
+
+			case 'save':
+			default:
+				$this->app->redirect(JRoute::_('index.php', false));
+				break;
+		}
+	}
+}
diff --git a/core/administrator/components/com_config/controller/application/sendtestmail.php b/core/administrator/components/com_config/controller/application/sendtestmail.php
new file mode 100644
index 00000000..4de91c88
--- /dev/null
+++ b/core/administrator/components/com_config/controller/application/sendtestmail.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Send Test Mail Controller from global configuration
+ *
+ * @since  3.5
+ */
+class ConfigControllerApplicationSendtestmail extends JControllerBase
+{
+	/**
+	 * Method to send the test mail.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public function execute()
+	{
+		// Send json mime type.
+		$this->app->mimeType = 'application/json';
+		$this->app->setHeader('Content-Type', $this->app->mimeType . '; charset=' . $this->app->charSet);
+		$this->app->sendHeaders();
+
+		// Check if user token is valid.
+		if (!JSession::checkToken('get'))
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			echo new JResponseJson;
+			$this->app->close();
+		}
+
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			echo new JResponseJson;
+			$this->app->close();
+		}
+
+		$model = new ConfigModelApplication;
+		echo new JResponseJson($model->sendTestMail());
+		$this->app->close();
+	}
+}
diff --git a/core/administrator/components/com_config/controller/application/store.php b/core/administrator/components/com_config/controller/application/store.php
new file mode 100644
index 00000000..dcd8dc91
--- /dev/null
+++ b/core/administrator/components/com_config/controller/application/store.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Controller for global configuration, Store Permissions in Database
+ *
+ * @since  3.5
+ */
+class ConfigControllerApplicationStore extends JControllerBase
+{
+	/**
+	 * Method to GET permission value and give it to the model for storing in the database.
+	 *
+	 * @return  boolean  true on success, false when failed
+	 *
+	 * @since   3.5
+	 */
+	public function execute()
+	{
+		// Send json mime type.
+		$this->app->mimeType = 'application/json';
+		$this->app->setHeader('Content-Type', $this->app->mimeType . '; charset=' . $this->app->charSet);
+		$this->app->sendHeaders();
+
+		// Check if user token is valid.
+		if (!JSession::checkToken('get'))
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			echo new JResponseJson;
+			$this->app->close();
+		}
+
+		$model = new ConfigModelApplication;
+		echo new JResponseJson($model->storePermissions());
+		$this->app->close();
+	}
+}
diff --git a/core/administrator/components/com_config/controller/component/cancel.php b/core/administrator/components/com_config/controller/component/cancel.php
new file mode 100644
index 00000000..8d5919f1
--- /dev/null
+++ b/core/administrator/components/com_config/controller/component/cancel.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cancel Controller for global configuration components
+ *
+ * @since  3.2
+ */
+class ConfigControllerComponentCancel extends ConfigControllerCanceladmin
+{
+	/**
+	 * Method to cancel global configuration component.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		$this->context = 'com_config.config.global';
+
+		$this->component = $this->input->get('component');
+
+		$this->redirect = 'index.php?option=' . $this->component;
+
+		parent::execute();
+	}
+}
diff --git a/core/administrator/components/com_config/controller/component/display.php b/core/administrator/components/com_config/controller/component/display.php
new file mode 100644
index 00000000..456fcb78
--- /dev/null
+++ b/core/administrator/components/com_config/controller/component/display.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base Display Controller
+ *
+ * @since  3.2
+ * @note   Needed for front end view
+ */
+class ConfigControllerComponentDisplay extends ConfigControllerDisplay
+{
+	/**
+	 * Prefix for the view and model classes
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $prefix = 'Config';
+}
diff --git a/core/administrator/components/com_config/controller/component/save.php b/core/administrator/components/com_config/controller/component/save.php
new file mode 100644
index 00000000..b0825aad
--- /dev/null
+++ b/core/administrator/components/com_config/controller/component/save.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Save Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerComponentSave extends JControllerBase
+{
+	/**
+	 * Application object - Redeclared for proper typehinting
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Method to save global configuration.
+	 *
+	 * @return  mixed  Calls $app->redirect()
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken())
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			$this->app->redirect('index.php');
+		}
+
+		// Set FTP credentials, if given.
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		$model  = new ConfigModelComponent;
+		$form   = $model->getForm();
+		$data   = $this->input->get('jform', array(), 'array');
+		$id     = $this->input->getInt('id');
+		$option = $this->input->get('component');
+		$user   = JFactory::getUser();
+
+		// Check if the user is authorised to do this.
+		if (!$user->authorise('core.admin', $option) && !$user->authorise('core.options', $option))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$this->app->redirect('index.php');
+		}
+
+		// Remove the permissions rules data if user isn't allowed to edit them.
+		if (!$user->authorise('core.admin', $option) && isset($data['params']) && isset($data['params']['rules']))
+		{
+			unset($data['params']['rules']);
+		}
+
+		$returnUri = $this->input->post->get('return', null, 'base64');
+
+		$redirect = '';
+
+		if (!empty($returnUri))
+		{
+			$redirect = '&return=' . urlencode($returnUri);
+		}
+
+		// Validate the posted data.
+		$return = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($return === false)
+		{
+			/*
+			 * The validate method enqueued all messages for us, so we just need to redirect back.
+			 */
+
+			// Save the data in the session.
+			$this->app->setUserState('com_config.config.global.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->app->redirect(JRoute::_('index.php?option=com_config&view=component&component=' . $option . $redirect, false));
+		}
+
+		// Attempt to save the configuration.
+		$data = array(
+			'params' => $return,
+			'id'     => $id,
+			'option' => $option
+		);
+
+		try
+		{
+			$model->save($data);
+		}
+		catch (RuntimeException $e)
+		{
+			// Save the data in the session.
+			$this->app->setUserState('com_config.config.global.data', $data);
+
+			// Save failed, go back to the screen and display a notice.
+			$this->app->enqueueMessage(JText::sprintf('JERROR_SAVE_FAILED', $e->getMessage()), 'error');
+			$this->app->redirect(JRoute::_('index.php?option=com_config&view=component&component=' . $option . $redirect, false));
+		}
+
+		// Set the redirect based on the task.
+		switch ($this->options[3])
+		{
+			case 'apply':
+				$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'), 'message');
+				$this->app->redirect(JRoute::_('index.php?option=com_config&view=component&component=' . $option . $redirect, false));
+
+				break;
+
+			case 'save':
+			default:
+				$redirect = 'index.php?option=' . $option;
+
+				if (!empty($returnUri))
+				{
+					$redirect = base64_decode($returnUri);
+				}
+
+				// Don't redirect to an external URL.
+				if (!JUri::isInternal($redirect))
+				{
+					$redirect = JUri::base();
+				}
+
+				$this->app->redirect(JRoute::_($redirect, false));
+
+				break;
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_config/controllers/application.php b/core/administrator/components/com_config/controllers/application.php
new file mode 100644
index 00000000..33e3efae
--- /dev/null
+++ b/core/administrator/components/com_config/controllers/application.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Controller for global configuration
+ *
+ * @since       1.5
+ * @deprecated  4.0
+ */
+class ConfigControllerApplication extends JControllerLegacy
+{
+	/**
+	 * Class Constructor
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Map the apply task to the save method.
+		$this->registerTask('apply', 'save');
+	}
+
+	/**
+	 * Method to save the configuration.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use ConfigControllerApplicationSave instead.
+	 */
+	public function save()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use ConfigControllerApplicationSave instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$controller = new ConfigControllerApplicationSave;
+
+		return $controller->execute();
+	}
+
+	/**
+	 * Cancel operation.
+	 *
+	 * @return  boolean  True if successful; false otherwise.
+	 *
+	 * @deprecated  4.0  Use ConfigControllerApplicationCancel instead.
+	 */
+	public function cancel()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use ConfigControllerApplicationCancel instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$controller = new ConfigControllerApplicationCancel;
+
+		return $controller->execute();
+	}
+
+	/**
+	 * Method to remove the root property from the configuration.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use ConfigControllerApplicationRemoveroot instead.
+	 */
+	public function removeroot()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use ConfigControllerApplicationRemoveroot instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$controller = new ConfigControllerApplicationRemoveroot;
+
+		return $controller->execute();
+	}
+}
diff --git a/core/administrator/components/com_config/controllers/component.php b/core/administrator/components/com_config/controllers/component.php
new file mode 100644
index 00000000..a6800ce0
--- /dev/null
+++ b/core/administrator/components/com_config/controllers/component.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Note: this view is intended only to be opened in a popup
+ *
+ * @since       1.5
+ * @deprecated  4.0
+ */
+class ConfigControllerComponent extends JControllerLegacy
+{
+	/**
+	 * Class Constructor
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Map the apply task to the save method.
+		$this->registerTask('apply', 'save');
+	}
+
+	/**
+	 * Cancel operation
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Use ConfigControllerComponentCancel instead.
+	 */
+	public function cancel()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use ConfigControllerComponentCancel instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$controller = new ConfigControllerComponentCancel;
+
+		$controller->execute();
+	}
+
+	/**
+	 * Save the configuration.
+	 *
+	 * @return  boolean  True if successful; false otherwise.
+	 *
+	 * @deprecated  4.0  Use ConfigControllerComponentSave instead.
+	 */
+	public function save()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use ConfigControllerComponentSave instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$controller = new ConfigControllerComponentSave;
+
+		return $controller->execute();
+	}
+}
diff --git a/core/administrator/components/com_config/helper/config.php b/core/administrator/components/com_config/helper/config.php
new file mode 100644
index 00000000..67bd4352
--- /dev/null
+++ b/core/administrator/components/com_config/helper/config.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Components helper for com_config
+ *
+ * @since  3.0
+ */
+class ConfigHelperConfig extends JHelperContent
+{
+	/**
+	 * Get an array of all enabled components.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 */
+	public static function getAllComponents()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('element')
+			->from('#__extensions')
+			->where('type = ' . $db->quote('component'))
+			->where('enabled = 1');
+		$db->setQuery($query);
+		$result = $db->loadColumn();
+
+		return $result;
+	}
+
+	/**
+	 * Returns true if the component has configuration options.
+	 *
+	 * @param   string  $component  Component name
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.0
+	 */
+	public static function hasComponentConfig($component)
+	{
+		return is_file(JPATH_ADMINISTRATOR . '/components/' . $component . '/config.xml');
+	}
+
+	/**
+	 * Returns an array of all components with configuration options.
+	 * Optionally return only those components for which the current user has 'core.manage' rights.
+	 *
+	 * @param   boolean  $authCheck  True to restrict to components where current user has 'core.manage' rights.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 */
+	public static function getComponentsWithConfig($authCheck = true)
+	{
+		$result = array();
+		$components = self::getAllComponents();
+		$user = JFactory::getUser();
+
+		// Remove com_config from the array as that may have weird side effects
+		$components = array_diff($components, array('com_config'));
+
+		foreach ($components as $component)
+		{
+			if (self::hasComponentConfig($component) && (!$authCheck || $user->authorise('core.manage', $component)))
+			{
+				self::loadLanguageForComponent($component);
+				$result[$component] = JApplicationHelper::stringURLSafe(JText::_($component)) . '_' . $component;
+			}
+		}
+
+		asort($result);
+
+		return array_keys($result);
+	}
+
+	/**
+	 * Load the sys language for the given component.
+	 *
+	 * @param   array  $components  Array of component names.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function loadLanguageForComponents($components)
+	{
+		foreach ($components as $component)
+		{
+			self::loadLanguageForComponent($component);
+		}
+	}
+
+	/**
+	 * Load the sys language for the given component.
+	 *
+	 * @param   string  $component  component name.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public static function loadLanguageForComponent($component)
+	{
+		if (empty($component))
+		{
+			return;
+		}
+
+		$lang = JFactory::getLanguage();
+
+		// Load the core file then
+		// Load extension-local file.
+		$lang->load($component . '.sys', JPATH_BASE, null, false, true)
+		|| $lang->load($component . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true);
+	}
+}
diff --git a/core/administrator/components/com_config/model/application.php b/core/administrator/components/com_config/model/application.php
new file mode 100644
index 00000000..4abbbfae
--- /dev/null
+++ b/core/administrator/components/com_config/model/application.php
@@ -0,0 +1,890 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Model for the global configuration
+ *
+ * @since  3.2
+ */
+class ConfigModelApplication extends ConfigModelForm
+{
+	/**
+	 * Method to get a form object.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since	1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_config.application', 'application', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the configuration data.
+	 *
+	 * This method will load the global configuration data straight from
+	 * JConfig. If configuration data has been saved in the session, that
+	 * data will be merged into the original data, overwriting it.
+	 *
+	 * @return	array  An array containg all global config data.
+	 *
+	 * @since	1.6
+	 */
+	public function getData()
+	{
+		// Get the config data.
+		$config = new JConfig;
+		$data   = ArrayHelper::fromObject($config);
+
+		// Prime the asset_id for the rules.
+		$data['asset_id'] = 1;
+
+		// Get the text filter data
+		$params          = JComponentHelper::getParams('com_config');
+		$data['filters'] = ArrayHelper::fromObject($params->get('filters'));
+
+		// If no filter data found, get from com_content (update of 1.6/1.7 site)
+		if (empty($data['filters']))
+		{
+			$contentParams = JComponentHelper::getParams('com_content');
+			$data['filters'] = ArrayHelper::fromObject($contentParams->get('filters'));
+		}
+
+		// Check for data in the session.
+		$temp = JFactory::getApplication()->getUserState('com_config.config.global.data');
+
+		// Merge in the session data.
+		if (!empty($temp))
+		{
+			$data = array_merge($data, $temp);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the configuration data.
+	 *
+	 * @param   array  $data  An array containing all global config data.
+	 *
+	 * @return	boolean  True on success, false on failure.
+	 *
+	 * @since	1.6
+	 */
+	public function save($data)
+	{
+		$app = JFactory::getApplication();
+
+		// Check that we aren't setting wrong database configuration
+		$options = array(
+			'driver'   => $data['dbtype'],
+			'host'     => $data['host'],
+			'user'     => $data['user'],
+			'password' => JFactory::getConfig()->get('password'),
+			'database' => $data['db'],
+			'prefix'   => $data['dbprefix']
+		);
+
+		try
+		{
+			JDatabaseDriver::getInstance($options)->getVersion();
+		}
+		catch (Exception $e)
+		{
+			$app->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_CONNECT'), 'error');
+
+			return false;
+		}
+
+		// Check if we can set the Force SSL option
+		if ((int) $data['force_ssl'] !== 0 && (int) $data['force_ssl'] !== (int) JFactory::getConfig()->get('force_ssl', '0'))
+		{
+			try
+			{
+				// Make an HTTPS request to check if the site is available in HTTPS.
+				$host    = JUri::getInstance()->getHost();
+				$options = new \Joomla\Registry\Registry;
+				$options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
+
+				// Do not check for valid server certificate here, leave this to the user, moreover disable using a proxy if any is configured.
+				$options->set('transport.curl',
+					array(
+						CURLOPT_SSL_VERIFYPEER => false,
+						CURLOPT_SSL_VERIFYHOST => false,
+						CURLOPT_PROXY => null,
+						CURLOPT_PROXYUSERPWD => null,
+					)
+				);
+				$response = JHttpFactory::getHttp($options)->get('https://' . $host . JUri::root(true) . '/', array('Host' => $host), 10);
+
+				// If available in HTTPS check also the status code.
+				if (!in_array($response->code, array(200, 503, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 401), true))
+				{
+					throw new RuntimeException(JText::_('COM_CONFIG_ERROR_SSL_NOT_AVAILABLE_HTTP_CODE'));
+				}
+			}
+			catch (RuntimeException $e)
+			{
+				$data['force_ssl'] = 0;
+
+				// Also update the user state
+				$app->setUserState('com_config.config.global.data.force_ssl', 0);
+
+				// Inform the user
+				$app->enqueueMessage(JText::sprintf('COM_CONFIG_ERROR_SSL_NOT_AVAILABLE', $e->getMessage()), 'warning');
+			}
+		}
+
+		// Save the rules
+		if (isset($data['rules']))
+		{
+			$rules = new JAccessRules($data['rules']);
+
+			// Check that we aren't removing our Super User permission
+			// Need to get groups from database, since they might have changed
+			$myGroups      = JAccess::getGroupsByUser(JFactory::getUser()->get('id'));
+			$myRules       = $rules->getData();
+			$hasSuperAdmin = $myRules['core.admin']->allow($myGroups);
+
+			if (!$hasSuperAdmin)
+			{
+				$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN'), 'error');
+
+				return false;
+			}
+
+			$asset = JTable::getInstance('asset');
+
+			if ($asset->loadByName('root.1'))
+			{
+				$asset->rules = (string) $rules;
+
+				if (!$asset->check() || !$asset->store())
+				{
+					$app->enqueueMessage($asset->getError(), 'error');
+
+					return;
+				}
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND'), 'error');
+
+				return false;
+			}
+
+			unset($data['rules']);
+		}
+
+		// Save the text filters
+		if (isset($data['filters']))
+		{
+			$registry = new Registry(array('filters' => $data['filters']));
+
+			$extension = JTable::getInstance('extension');
+
+			// Get extension_id
+			$extensionId = $extension->find(array('name' => 'com_config'));
+
+			if ($extension->load((int) $extensionId))
+			{
+				$extension->params = (string) $registry;
+
+				if (!$extension->check() || !$extension->store())
+				{
+					$app->enqueueMessage($extension->getError(), 'error');
+
+					return;
+				}
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_CONFIG_EXTENSION_NOT_FOUND'), 'error');
+
+				return false;
+			}
+
+			unset($data['filters']);
+		}
+
+		// Get the previous configuration.
+		$prev = new JConfig;
+		$prev = ArrayHelper::fromObject($prev);
+
+		// Merge the new data in. We do this to preserve values that were not in the form.
+		$data = array_merge($prev, $data);
+
+		/*
+		 * Perform miscellaneous options based on configuration settings/changes.
+		 */
+
+		// Escape the offline message if present.
+		if (isset($data['offline_message']))
+		{
+			$data['offline_message'] = JFilterOutput::ampReplace($data['offline_message']);
+		}
+
+		// Purge the database session table if we are changing to the database handler.
+		if ($prev['session_handler'] != 'database' && $data['session_handler'] == 'database')
+		{
+			$table = JTable::getInstance('session');
+			$table->purge(-1);
+		}
+
+		// Set the shared session configuration
+		if (isset($data['shared_session']))
+		{
+			$currentShared = isset($prev['shared_session']) ? $prev['shared_session'] : '0';
+
+			// Has the user enabled shared sessions?
+			if ($data['shared_session'] == 1 && $currentShared == 0)
+			{
+				// Generate a random shared session name
+				$data['session_name'] = JUserHelper::genRandomPassword(16);
+			}
+
+			// Has the user disabled shared sessions?
+			if ($data['shared_session'] == 0 && $currentShared == 1)
+			{
+				// Remove the session name value
+				unset($data['session_name']);
+			}
+		}
+
+		if (empty($data['cache_handler']))
+		{
+			$data['caching'] = 0;
+		}
+
+		/*
+		 * Look for a custom cache_path
+		 * First check if a path is given in the submitted data, then check if a path exists in the previous data, otherwise use the default
+		 */
+		if (!empty($data['cache_path']))
+		{
+			$path = $data['cache_path'];
+		}
+		elseif (!empty($prev['cache_path']))
+		{
+			$path = $prev['cache_path'];
+		}
+		else
+		{
+			$path = JPATH_SITE . '/cache';
+		}
+
+		// Give a warning if the cache-folder can not be opened
+		if ($data['caching'] > 0 && $data['cache_handler'] == 'file' && @opendir($path) == false)
+		{
+			$error = true;
+
+			// If a custom path is in use, try using the system default instead of disabling cache
+			if ($path !== JPATH_SITE . '/cache' && @opendir(JPATH_SITE . '/cache') != false)
+			{
+				try
+				{
+					JLog::add(
+						JText::sprintf('COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT', $path, JPATH_SITE . '/cache'),
+						JLog::WARNING,
+						'jerror'
+					);
+				}
+				catch (RuntimeException $logException)
+				{
+					$app->enqueueMessage(
+						JText::sprintf('COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT', $path, JPATH_SITE . '/cache'),
+						'warning'
+					);
+				}
+
+				$path  = JPATH_SITE . '/cache';
+				$error = false;
+
+				$data['cache_path'] = '';
+			}
+
+			if ($error)
+			{
+				try
+				{
+					JLog::add(JText::sprintf('COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE', $path), JLog::WARNING, 'jerror');
+				}
+				catch (RuntimeException $exception)
+				{
+					$app->enqueueMessage(JText::sprintf('COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE', $path), 'warning');
+				}
+
+				$data['caching'] = 0;
+			}
+		}
+
+		// Did the user remove their custom cache path?  Don't save the variable to the config
+		if (empty($data['cache_path']))
+		{
+			unset($data['cache_path']);
+		}
+
+		// Clean the cache if disabled but previously enabled or changing cache handlers; these operations use the `$prev` data already in memory
+		if ((!$data['caching'] && $prev['caching']) || $data['cache_handler'] !== $prev['cache_handler'])
+		{
+			try
+			{
+				JFactory::getCache()->clean();
+			}
+			catch (JCacheExceptionConnecting $exception)
+			{
+				try
+				{
+					JLog::add(JText::_('COM_CONFIG_ERROR_CACHE_CONNECTION_FAILED'), JLog::WARNING, 'jerror');
+				}
+				catch (RuntimeException $logException)
+				{
+					$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_CACHE_CONNECTION_FAILED'), 'warning');
+				}
+			}
+			catch (JCacheExceptionUnsupported $exception)
+			{
+				try
+				{
+					JLog::add(JText::_('COM_CONFIG_ERROR_CACHE_DRIVER_UNSUPPORTED'), JLog::WARNING, 'jerror');
+				}
+				catch (RuntimeException $logException)
+				{
+					$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_CACHE_DRIVER_UNSUPPORTED'), 'warning');
+				}
+			}
+		}
+
+		// Create the new configuration object.
+		$config = new Registry($data);
+
+		// Overwrite the old FTP credentials with the new ones.
+		$temp = JFactory::getConfig();
+		$temp->set('ftp_enable', $data['ftp_enable']);
+		$temp->set('ftp_host', $data['ftp_host']);
+		$temp->set('ftp_port', $data['ftp_port']);
+		$temp->set('ftp_user', $data['ftp_user']);
+		$temp->set('ftp_pass', $data['ftp_pass']);
+		$temp->set('ftp_root', $data['ftp_root']);
+
+		// Clear cache of com_config component.
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+
+		// Write the configuration file.
+		return $this->writeConfigFile($config);
+	}
+
+	/**
+	 * Method to unset the root_user value from configuration data.
+	 *
+	 * This method will load the global configuration data straight from
+	 * JConfig and remove the root_user value for security, then save the configuration.
+	 *
+	 * @return	boolean  True on success, false on failure.
+	 *
+	 * @since	1.6
+	 */
+	public function removeroot()
+	{
+		// Get the previous configuration.
+		$prev = new JConfig;
+		$prev = ArrayHelper::fromObject($prev);
+
+		// Create the new configuration object, and unset the root_user property
+		unset($prev['root_user']);
+		$config = new Registry($prev);
+
+		// Write the configuration file.
+		return $this->writeConfigFile($config);
+	}
+
+	/**
+	 * Method to write the configuration to a file.
+	 *
+	 * @param   Registry  $config  A Registry object containing all global config data.
+	 *
+	 * @return	boolean  True on success, false on failure.
+	 *
+	 * @since	2.5.4
+	 * @throws  RuntimeException
+	 */
+	private function writeConfigFile(Registry $config)
+	{
+		jimport('joomla.filesystem.path');
+		jimport('joomla.filesystem.file');
+
+		// Set the configuration file path.
+		$file = JPATH_CONFIGURATION . '/configuration.php';
+
+		// Get the new FTP credentials.
+		$ftp = JClientHelper::getCredentials('ftp', true);
+
+		$app = JFactory::getApplication();
+
+		// Attempt to make the file writeable if using FTP.
+		if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0644'))
+		{
+			$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE'), 'notice');
+		}
+
+		// Attempt to write the configuration file as a PHP class named JConfig.
+		$configuration = $config->toString('PHP', array('class' => 'JConfig', 'closingtag' => false));
+
+		if (!JFile::write($file, $configuration))
+		{
+			throw new RuntimeException(JText::_('COM_CONFIG_ERROR_WRITE_FAILED'));
+		}
+
+		// Attempt to make the file unwriteable if using FTP.
+		if (!$ftp['enabled'] && JPath::isOwner($file) && !JPath::setPermissions($file, '0444'))
+		{
+			$app->enqueueMessage(JText::_('COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE'), 'notice');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to store the permission values in the asset table.
+	 *
+	 * This method will get an array with permission key value pairs and transform it
+	 * into json and update the asset table in the database.
+	 *
+	 * @param   string  $permission  Need an array with Permissions (component, rule, value and title)
+	 *
+	 * @return  array  A list of result data.
+	 *
+	 * @since   3.5
+	 */
+	public function storePermissions($permission = null)
+	{
+		$app  = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		if (is_null($permission))
+		{
+			// Get data from input.
+			$permission = array(
+				'component' => $app->input->get('comp'),
+				'action'    => $app->input->get('action'),
+				'rule'      => $app->input->get('rule'),
+				'value'     => $app->input->get('value'),
+				'title'     => $app->input->get('title', '', 'RAW')
+			);
+		}
+
+		// We are creating a new item so we don't have an item id so don't allow.
+		if (substr($permission['component'], -6) === '.false')
+		{
+			$app->enqueueMessage(JText::_('JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS'), 'error');
+
+			return false;
+		}
+
+		// Check if the user is authorized to do this.
+		if (!$user->authorise('core.admin', $permission['component']))
+		{
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+
+			return false;
+		}
+
+		$permission['component'] = empty($permission['component']) ? 'root.1' : $permission['component'];
+
+		// Current view is global config?
+		$isGlobalConfig = $permission['component'] === 'root.1';
+
+		// Check if changed group has Super User permissions.
+		$isSuperUserGroupBefore = JAccess::checkGroup($permission['rule'], 'core.admin');
+
+		// Check if current user belongs to changed group.
+		$currentUserBelongsToGroup = in_array((int) $permission['rule'], $user->groups) ? true : false;
+
+		// Get current user groups tree.
+		$currentUserGroupsTree = JAccess::getGroupsByUser($user->id, true);
+
+		// Check if current user belongs to changed group.
+		$currentUserSuperUser = $user->authorise('core.admin');
+
+		// If user is not Super User cannot change the permissions of a group it belongs to.
+		if (!$currentUserSuperUser && $currentUserBelongsToGroup)
+		{
+			$app->enqueueMessage(JText::_('JLIB_USER_ERROR_CANNOT_CHANGE_OWN_GROUPS'), 'error');
+
+			return false;
+		}
+
+		// If user is not Super User cannot change the permissions of a group it belongs to.
+		if (!$currentUserSuperUser && in_array((int) $permission['rule'], $currentUserGroupsTree))
+		{
+			$app->enqueueMessage(JText::_('JLIB_USER_ERROR_CANNOT_CHANGE_OWN_PARENT_GROUPS'), 'error');
+
+			return false;
+		}
+
+		// If user is not Super User cannot change the permissions of a Super User Group.
+		if (!$currentUserSuperUser && $isSuperUserGroupBefore && !$currentUserBelongsToGroup)
+		{
+			$app->enqueueMessage(JText::_('JLIB_USER_ERROR_CANNOT_CHANGE_SUPER_USER'), 'error');
+
+			return false;
+		}
+
+		// If user is not Super User cannot change the Super User permissions in any group it belongs to.
+		if ($isSuperUserGroupBefore && $currentUserBelongsToGroup && $permission['action'] === 'core.admin')
+		{
+			$app->enqueueMessage(JText::_('JLIB_USER_ERROR_CANNOT_DEMOTE_SELF'), 'error');
+
+			return false;
+		}
+
+		try
+		{
+			$asset  = JTable::getInstance('asset');
+			$result = $asset->loadByName($permission['component']);
+
+			if ($result === false)
+			{
+				$data = array($permission['action'] => array($permission['rule'] => $permission['value']));
+
+				$rules        = new JAccessRules($data);
+				$asset->rules = (string) $rules;
+				$asset->name  = (string) $permission['component'];
+				$asset->title = (string) $permission['title'];
+
+				// Get the parent asset id so we have a correct tree.
+				$parentAsset = JTable::getInstance('Asset');
+
+				if (strpos($asset->name, '.') !== false)
+				{
+					$assetParts = explode('.', $asset->name);
+					$parentAsset->loadByName($assetParts[0]);
+					$parentAssetId = $parentAsset->id;
+				}
+				else
+				{
+					$parentAssetId = $parentAsset->getRootId();
+				}
+
+				/**
+				 * @to do: incorrect ACL stored
+				 * When changing a permission of an item that doesn't have a row in the asset table the row a new row is created.
+				 * This works fine for item <-> component <-> global config scenario and component <-> global config scenario.
+				 * But doesn't work properly for item <-> section(s) <-> component <-> global config scenario,
+				 * because a wrong parent asset id (the component) is stored.
+				 * Happens when there is no row in the asset table (ex: deleted or not created on update).
+				 */
+
+				$asset->setLocation($parentAssetId, 'last-child');
+			}
+			else
+			{
+				// Decode the rule settings.
+				$temp = json_decode($asset->rules, true);
+
+				// Check if a new value is to be set.
+				if (isset($permission['value']))
+				{
+					// Check if we already have an action entry.
+					if (!isset($temp[$permission['action']]))
+					{
+						$temp[$permission['action']] = array();
+					}
+
+					// Check if we already have a rule entry.
+					if (!isset($temp[$permission['action']][$permission['rule']]))
+					{
+						$temp[$permission['action']][$permission['rule']] = array();
+					}
+
+					// Set the new permission.
+					$temp[$permission['action']][$permission['rule']] = (int) $permission['value'];
+
+					// Check if we have an inherited setting.
+					if ($permission['value'] === '')
+					{
+						unset($temp[$permission['action']][$permission['rule']]);
+					}
+
+					// Check if we have any rules.
+					if (!$temp[$permission['action']])
+					{
+						unset($temp[$permission['action']]);
+					}
+				}
+				else
+				{
+					// There is no value so remove the action as it's not needed.
+					unset($temp[$permission['action']]);
+				}
+
+				$asset->rules = json_encode($temp, JSON_FORCE_OBJECT);
+			}
+
+			if (!$asset->check() || !$asset->store())
+			{
+				$app->enqueueMessage(JText::_('JLIB_UNKNOWN'), 'error');
+
+				return false;
+			}
+		}
+		catch (Exception $e)
+		{
+			$app->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		// All checks done.
+		$result = array(
+			'text'    => '',
+			'class'   => '',
+			'result'  => true,
+		);
+
+		// Show the current effective calculated permission considering current group, path and cascade.
+
+		try
+		{
+			// Get the asset id by the name of the component.
+			$query = $this->db->getQuery(true)
+				->select($this->db->quoteName('id'))
+				->from($this->db->quoteName('#__assets'))
+				->where($this->db->quoteName('name') . ' = ' . $this->db->quote($permission['component']));
+
+			$this->db->setQuery($query);
+
+			$assetId = (int) $this->db->loadResult();
+
+			// Fetch the parent asset id.
+			$parentAssetId = null;
+
+			/**
+			 * @to do: incorrect info
+			 * When creating a new item (not saving) it uses the calculated permissions from the component (item <-> component <-> global config).
+			 * But if we have a section too (item <-> section(s) <-> component <-> global config) this is not correct.
+			 * Also, currently it uses the component permission, but should use the calculated permissions for achild of the component/section.
+			 */
+
+			// If not in global config we need the parent_id asset to calculate permissions.
+			if (!$isGlobalConfig)
+			{
+				// In this case we need to get the component rules too.
+				$query->clear()
+					->select($this->db->quoteName('parent_id'))
+					->from($this->db->quoteName('#__assets'))
+					->where($this->db->quoteName('id') . ' = ' . $assetId);
+
+				$this->db->setQuery($query);
+
+				$parentAssetId = (int) $this->db->loadResult();
+			}
+
+			// Get the group parent id of the current group.
+			$query->clear()
+				->select($this->db->quoteName('parent_id'))
+				->from($this->db->quoteName('#__usergroups'))
+				->where($this->db->quoteName('id') . ' = ' . (int) $permission['rule']);
+
+			$this->db->setQuery($query);
+
+			$parentGroupId = (int) $this->db->loadResult();
+
+			// Count the number of child groups of the current group.
+			$query->clear()
+				->select('COUNT(' . $this->db->quoteName('id') . ')')
+				->from($this->db->quoteName('#__usergroups'))
+				->where($this->db->quoteName('parent_id') . ' = ' . (int) $permission['rule']);
+
+			$this->db->setQuery($query);
+
+			$totalChildGroups = (int) $this->db->loadResult();
+		}
+		catch (Exception $e)
+		{
+			$app->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		// Clear access statistics.
+		JAccess::clearStatics();
+
+		// After current group permission is changed we need to check again if the group has Super User permissions.
+		$isSuperUserGroupAfter = JAccess::checkGroup($permission['rule'], 'core.admin');
+
+		// Get the rule for just this asset (non-recursive) and get the actual setting for the action for this group.
+		$assetRule = JAccess::getAssetRules($assetId, false, false)->allow($permission['action'], $permission['rule']);
+
+		// Get the group, group parent id, and group global config recursive calculated permission for the chosen action.
+		$inheritedGroupRule = JAccess::checkGroup($permission['rule'], $permission['action'], $assetId);
+
+		if (!empty($parentAssetId))
+		{
+			$inheritedGroupParentAssetRule = JAccess::checkGroup($permission['rule'], $permission['action'], $parentAssetId);
+		}
+		else
+		{
+			$inheritedGroupParentAssetRule = null;
+		}
+
+		$inheritedParentGroupRule = !empty($parentGroupId) ? JAccess::checkGroup($parentGroupId, $permission['action'], $assetId) : null;
+
+		// Current group is a Super User group, so calculated setting is "Allowed (Super User)".
+		if ($isSuperUserGroupAfter)
+		{
+			$result['class'] = 'label label-success';
+			$result['text'] = '<span class="icon-lock icon-white" aria-hidden="true"></span>' . JText::_('JLIB_RULES_ALLOWED_ADMIN');
+		}
+		// Not super user.
+		else
+		{
+			// First get the real recursive calculated setting and add (Inherited) to it.
+
+			// If recursive calculated setting is "Denied" or null. Calculated permission is "Not Allowed (Inherited)".
+			if ($inheritedGroupRule === null || $inheritedGroupRule === false)
+			{
+				$result['class'] = 'label label-important';
+				$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED_INHERITED');
+			}
+			// If recursive calculated setting is "Allowed". Calculated permission is "Allowed (Inherited)".
+			else
+			{
+				$result['class'] = 'label label-success';
+				$result['text']  = JText::_('JLIB_RULES_ALLOWED_INHERITED');
+			}
+
+			// Second part: Overwrite the calculated permissions labels if there is an explicity permission in the current group.
+
+			/**
+			 * @to do: incorect info
+			 * If a component has a permission that doesn't exists in global config (ex: frontend editing in com_modules) by default
+			 * we get "Not Allowed (Inherited)" when we should get "Not Allowed (Default)".
+			 */
+
+			// If there is an explicity permission "Not Allowed". Calculated permission is "Not Allowed".
+			if ($assetRule === false)
+			{
+				$result['class'] = 'label label-important';
+				$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED');
+			}
+			// If there is an explicity permission is "Allowed". Calculated permission is "Allowed".
+			elseif ($assetRule === true)
+			{
+				$result['class'] = 'label label-success';
+				$result['text']  = JText::_('JLIB_RULES_ALLOWED');
+			}
+
+			// Third part: Overwrite the calculated permissions labels for special cases.
+
+			// Global configuration with "Not Set" permission. Calculated permission is "Not Allowed (Default)".
+			if (empty($parentGroupId) && $isGlobalConfig === true && $assetRule === null)
+			{
+				$result['class'] = 'label label-important';
+				$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED_DEFAULT');
+			}
+
+			/**
+			 * Component/Item with explicit "Denied" permission at parent Asset (Category, Component or Global config) configuration.
+			 * Or some parent group has an explicit "Denied".
+			 * Calculated permission is "Not Allowed (Locked)".
+			 */
+			elseif ($inheritedGroupParentAssetRule === false || $inheritedParentGroupRule === false)
+			{
+				$result['class'] = 'label label-important';
+				$result['text']  = '<span class="icon-lock icon-white" aria-hidden="true"></span>' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED');
+			}
+		}
+
+		// If removed or added super user from group, we need to refresh the page to recalculate all settings.
+		if ($isSuperUserGroupBefore != $isSuperUserGroupAfter)
+		{
+			$app->enqueueMessage(JText::_('JLIB_RULES_NOTICE_RECALCULATE_GROUP_PERMISSIONS'), 'notice');
+		}
+
+		// If this group has child groups, we need to refresh the page to recalculate the child settings.
+		if ($totalChildGroups > 0)
+		{
+			$app->enqueueMessage(JText::_('JLIB_RULES_NOTICE_RECALCULATE_GROUP_CHILDS_PERMISSIONS'), 'notice');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to send a test mail which is called via an AJAX request
+	 *
+	 * @return boolean
+	 *
+	 * @since   3.5
+	 * @throws Exception
+	 */
+	public function sendTestMail()
+	{
+		// Set the new values to test with the current settings
+		$app = JFactory::getApplication();
+		$input = $app->input;
+
+		$app->set('smtpauth', $input->get('smtpauth'));
+		$app->set('smtpuser', $input->get('smtpuser', '', 'STRING'));
+		$app->set('smtppass', $input->get('smtppass', '', 'RAW'));
+		$app->set('smtphost', $input->get('smtphost'));
+		$app->set('smtpsecure', $input->get('smtpsecure'));
+		$app->set('smtpport', $input->get('smtpport'));
+		$app->set('mailfrom', $input->get('mailfrom', '', 'STRING'));
+		$app->set('fromname', $input->get('fromname', '', 'STRING'));
+		$app->set('mailer', $input->get('mailer'));
+		$app->set('mailonline', $input->get('mailonline'));
+
+		$mail = JFactory::getMailer();
+
+		// Prepare email and send try to send it
+		$mailSubject = JText::sprintf('COM_CONFIG_SENDMAIL_SUBJECT', $app->get('sitename'));
+		$mailBody    = JText::sprintf('COM_CONFIG_SENDMAIL_BODY', JText::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer)));
+
+		if ($mail->sendMail($app->get('mailfrom'), $app->get('fromname'), $app->get('mailfrom'), $mailSubject, $mailBody) === true)
+		{
+			$methodName = JText::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer));
+
+			// If JMail send the mail using PHP Mail as fallback.
+			if ($mail->Mailer != $app->get('mailer'))
+			{
+				$app->enqueueMessage(JText::sprintf('COM_CONFIG_SENDMAIL_SUCCESS_FALLBACK', $app->get('mailfrom'), $methodName), 'warning');
+			}
+			else
+			{
+				$app->enqueueMessage(JText::sprintf('COM_CONFIG_SENDMAIL_SUCCESS', $app->get('mailfrom'), $methodName), 'message');
+			}
+
+			return true;
+		}
+
+		$app->enqueueMessage(JText::_('COM_CONFIG_SENDMAIL_ERROR'), 'error');
+
+		return false;
+	}
+}
diff --git a/core/administrator/components/com_config/model/component.php b/core/administrator/components/com_config/model/component.php
new file mode 100644
index 00000000..e6db1e48
--- /dev/null
+++ b/core/administrator/components/com_config/model/component.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Model for component configuration
+ *
+ * @since  3.2
+ */
+class ConfigModelComponent extends ConfigModelForm
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return	void
+	 *
+	 * @since	3.2
+	 */
+	protected function populateState()
+	{
+		$input = JFactory::getApplication()->input;
+
+		// Set the component (option) we are dealing with.
+		$component = $input->get('component');
+		$state = $this->loadState();
+		$state->set('component.option', $component);
+
+		// Set an alternative path for the configuration file.
+		if ($path = $input->getString('path'))
+		{
+			$path = JPath::clean(JPATH_SITE . '/' . $path);
+			JPath::check($path);
+			$state->set('component.path', $path);
+		}
+
+		$this->setState($state);
+	}
+
+	/**
+	 * Method to get a form object.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since	3.2
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$state = $this->getState();
+		$option = $state->get('component.option');
+
+		if ($path = $state->get('component.path'))
+		{
+			// Add the search path for the admin component config.xml file.
+			JForm::addFormPath($path);
+		}
+		else
+		{
+			// Add the search path for the admin component config.xml file.
+			JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/' . $option);
+		}
+
+		// Get the form.
+		$form = $this->loadForm(
+			'com_config.component',
+			'config',
+			array('control' => 'jform', 'load_data' => $loadData),
+			false,
+			'/config'
+		);
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$lang = JFactory::getLanguage();
+		$lang->load($option, JPATH_BASE, null, false, true)
+		|| $lang->load($option, JPATH_BASE . "/components/$option", null, false, true);
+
+		return $form;
+	}
+
+	/**
+	 * Get the component information.
+	 *
+	 * @return	object
+	 *
+	 * @since	3.2
+	 */
+	public function getComponent()
+	{
+		$state = $this->getState();
+		$option = $state->get('component.option');
+
+		// Load common and local language files.
+		$lang = JFactory::getLanguage();
+		$lang->load($option, JPATH_BASE, null, false, true)
+		|| $lang->load($option, JPATH_BASE . "/components/$option", null, false, true);
+
+		$result = JComponentHelper::getComponent($option);
+
+		return $result;
+	}
+
+	/**
+	 * Method to save the configuration data.
+	 *
+	 * @param   array  $data  An array containing all global config data.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since	3.2
+	 * @throws  RuntimeException
+	 */
+	public function save($data)
+	{
+		$table      = JTable::getInstance('extension');
+		$dispatcher = JEventDispatcher::getInstance();
+		$context    = $this->option . '.' . $this->name;
+		JPluginHelper::importPlugin('extension');
+
+		// Check super user group.
+		if (isset($data['params']) && !JFactory::getUser()->authorise('core.admin'))
+		{
+			$form = $this->getForm(array(), false);
+
+			foreach ($form->getFieldsets() as $fieldset)
+			{
+				foreach ($form->getFieldset($fieldset->name) as $field)
+				{
+					if ($field->type === 'UserGroupList' && isset($data['params'][$field->fieldname])
+						&& (int) $field->getAttribute('checksuperusergroup', 0) === 1
+						&& JAccess::checkGroup($data['params'][$field->fieldname], 'core.admin'))
+					{
+						throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+					}
+				}
+			}
+		}
+
+		// Save the rules.
+		if (isset($data['params']) && isset($data['params']['rules']))
+		{
+			$rules = new JAccessRules($data['params']['rules']);
+			$asset = JTable::getInstance('asset');
+
+			if (!$asset->loadByName($data['option']))
+			{
+				$root = JTable::getInstance('asset');
+				$root->loadByName('root.1');
+				$asset->name = $data['option'];
+				$asset->title = $data['option'];
+				$asset->setLocation($root->id, 'last-child');
+			}
+
+			$asset->rules = (string) $rules;
+
+			if (!$asset->check() || !$asset->store())
+			{
+				throw new RuntimeException($asset->getError());
+			}
+
+			// We don't need this anymore
+			unset($data['option']);
+			unset($data['params']['rules']);
+		}
+
+		// Load the previous Data
+		if (!$table->load($data['id']))
+		{
+			throw new RuntimeException($table->getError());
+		}
+
+		unset($data['id']);
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			throw new RuntimeException($table->getError());
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			throw new RuntimeException($table->getError());
+		}
+
+		$result = $dispatcher->trigger('onExtensionBeforeSave', array($context, $table, false));
+
+			// Store the data.
+		if (in_array(false, $result, true) || !$table->store())
+		{
+			throw new RuntimeException($table->getError());
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger('onExtensionAfterSave', array($context, $table, false));
+
+		// Clean the component cache.
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_config/model/field/configcomponents.php b/core/administrator/components/com_config/model/field/configcomponents.php
new file mode 100644
index 00000000..550c6652
--- /dev/null
+++ b/core/administrator/components/com_config/model/field/configcomponents.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JFormHelper::loadFieldClass('List');
+
+/**
+ * Text Filters form field.
+ *
+ * @since  3.7.0
+ */
+class JFormFieldConfigComponents extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since	3.7.0
+	 */
+	public $type = 'ConfigComponents';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array  An array of JHtml options.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('name AS text, element AS value')
+			->from('#__extensions')
+			->where('enabled >= 1')
+			->where('type =' . $db->quote('component'));
+
+		$items = $db->setQuery($query)->loadObjectList();
+
+		if ($items)
+		{
+			$lang = JFactory::getLanguage();
+
+			foreach ($items as &$item)
+			{
+				// Load language
+				$extension = $item->value;
+
+				if (JFile::exists(JPATH_ADMINISTRATOR . '/components/' . $extension . '/config.xml'))
+				{
+					$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+					$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load("$extension.sys", $source, null, false, true);
+
+					// Translate component name
+					$item->text = JText::_($item->text);
+				}
+				else
+				{
+					$item = null;
+				}
+			}
+
+			// Sort by component name
+			$items = ArrayHelper::sortObjects(array_filter($items), 'text', 1, true, true);
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $items);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_config/model/field/filters.php b/core/administrator/components/com_config/model/field/filters.php
new file mode 100644
index 00000000..204f59ad
--- /dev/null
+++ b/core/administrator/components/com_config/model/field/filters.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Text Filters form field.
+ *
+ * @since  1.6
+ */
+class JFormFieldFilters extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since	1.6
+	 */
+	public $type = 'Filters';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * TODO: Add access check.
+	 *
+	 * @return	string	The field input markup.
+	 *
+	 * @since	1.6
+	 */
+	protected function getInput()
+	{
+		// Get the available user groups.
+		$groups = $this->getUserGroups();
+
+		// Build the form control.
+		$html = array();
+
+		// Open the table.
+		$html[] = '<table id="filter-config" class="table table-striped">';
+
+		// The table heading.
+		$html[] = '	<thead>';
+		$html[] = '	<tr>';
+		$html[] = '		<th>';
+		$html[] = '			<span class="acl-action">' . JText::_('JGLOBAL_FILTER_GROUPS_LABEL') . '</span>';
+		$html[] = '		</th>';
+		$html[] = '		<th>';
+		$html[] = '			<span class="acl-action">' . JText::_('JGLOBAL_FILTER_TYPE_LABEL') . '</span>';
+		$html[] = '		</th>';
+		$html[] = '		<th>';
+		$html[] = '			<span class="acl-action">' . JText::_('JGLOBAL_FILTER_TAGS_LABEL') . '</span>';
+		$html[] = '		</th>';
+		$html[] = '		<th>';
+		$html[] = '			<span class="acl-action">' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_LABEL') . '</span>';
+		$html[] = '		</th>';
+		$html[] = '	</tr>';
+		$html[] = '	</thead>';
+
+		// The table body.
+		$html[] = '	<tbody>';
+
+		foreach ($groups as $group)
+		{
+			if (!isset($this->value[$group->value]))
+			{
+				$this->value[$group->value] = array('filter_type' => 'BL', 'filter_tags' => '', 'filter_attributes' => '');
+			}
+
+			$group_filter = $this->value[$group->value];
+
+			$group_filter['filter_tags']       = !empty($group_filter['filter_tags']) ? $group_filter['filter_tags'] : '';
+			$group_filter['filter_attributes'] = !empty($group_filter['filter_attributes']) ? $group_filter['filter_attributes'] : '';
+
+			$html[] = '	<tr>';
+			$html[] = '		<td class="acl-groups left">';
+			$html[] = '			' . JLayoutHelper::render('joomla.html.treeprefix', array('level' => $group->level + 1)) . $group->text;
+			$html[] = '		</td>';
+			$html[] = '		<td>';
+			$html[] = '				<select'
+				. ' name="' . $this->name . '[' . $group->value . '][filter_type]"'
+				. ' id="' . $this->id . $group->value . '_filter_type"'
+				. ' class="novalidate"'
+				. '>';
+			$html[] = '					<option value="BL"' . ($group_filter['filter_type'] == 'BL' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST') . '</option>';
+			$html[] = '					<option value="CBL"' . ($group_filter['filter_type'] == 'CBL' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST') . '</option>';
+			$html[] = '					<option value="WL"' . ($group_filter['filter_type'] == 'WL' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_WHITE_LIST') . '</option>';
+			$html[] = '					<option value="NH"' . ($group_filter['filter_type'] == 'NH' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_NO_HTML') . '</option>';
+			$html[] = '					<option value="NONE"' . ($group_filter['filter_type'] == 'NONE' ? ' selected="selected"' : '') . '>'
+				. JText::_('COM_CONFIG_FIELD_FILTERS_NO_FILTER') . '</option>';
+			$html[] = '				</select>';
+			$html[] = '		</td>';
+			$html[] = '		<td>';
+			$html[] = '				<input'
+				. ' name="' . $this->name . '[' . $group->value . '][filter_tags]"'
+				. ' type="text"'
+				. ' id="' . $this->id . $group->value . '_filter_tags" class="novalidate"'
+				. ' value="' . $group_filter['filter_tags'] . '"'
+				. '/>';
+			$html[] = '		</td>';
+			$html[] = '		<td>';
+			$html[] = '				<input'
+				. ' name="' . $this->name . '[' . $group->value . '][filter_attributes]"'
+				. ' type="text"'
+				. ' id="' . $this->id . $group->value . '_filter_attributes" class="novalidate"'
+				. ' value="' . $group_filter['filter_attributes'] . '"'
+				. '/>';
+			$html[] = '		</td>';
+			$html[] = '	</tr>';
+		}
+
+		$html[] = '	</tbody>';
+
+		// Close the table.
+		$html[] = '</table>';
+
+		// Add notes
+		$html[] = '<div class="alert">';
+		$html[] = '<p>' . JText::_('JGLOBAL_FILTER_TYPE_DESC') . '</p>';
+		$html[] = '<p>' . JText::_('JGLOBAL_FILTER_TAGS_DESC') . '</p>';
+		$html[] = '<p>' . JText::_('JGLOBAL_FILTER_ATTRIBUTES_DESC') . '</p>';
+		$html[] = '</div>';
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * A helper to get the list of user groups.
+	 *
+	 * @return	array
+	 *
+	 * @since	1.6
+	 */
+	protected function getUserGroups()
+	{
+		// Get a database object.
+		$db = JFactory::getDbo();
+
+		// Get the user groups from the database.
+		$query = $db->getQuery(true);
+		$query->select('a.id AS value, a.title AS text, COUNT(DISTINCT b.id) AS level');
+		$query->from('#__usergroups AS a');
+		$query->join('LEFT', '#__usergroups AS b on a.lft > b.lft AND a.rgt < b.rgt');
+		$query->group('a.id, a.title, a.lft');
+		$query->order('a.lft ASC');
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_config/model/form/application.xml b/core/administrator/components/com_config/model/form/application.xml
new file mode 100644
index 00000000..1dc1bc51
--- /dev/null
+++ b/core/administrator/components/com_config/model/form/application.xml
@@ -0,0 +1,1315 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset
+		name="cache"
+		label="COM_CONFIG_CACHE_SETTINGS_LABEL">
+
+		<field
+			name="cache_handler"
+			type="cachehandler"
+			label="COM_CONFIG_FIELD_CACHE_HANDLER_LABEL"
+			description="COM_CONFIG_FIELD_CACHE_HANDLER_DESC"
+			default=""
+			filter="word"
+		/>
+
+		<field
+			name="cache_path"
+			type="text"
+			label="COM_CONFIG_FIELD_CACHE_PATH_LABEL"
+			description="COM_CONFIG_FIELD_CACHE_PATH_DESC"
+			showon="cache_handler:file"
+			filter="string"
+			size="50"
+		/>
+
+		<field
+			name="memcache_persist"
+			type="radio"
+			label="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="cache_handler:memcache"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="memcache_compress"
+			type="radio"
+			label="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="cache_handler:memcache"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="memcache_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
+			default="localhost"
+			showon="cache_handler:memcache"
+			filter="string"
+			size="25"
+		/>
+
+		<field
+			name="memcache_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
+			showon="cache_handler:memcache"
+			min="1"
+			max="65535"
+			default="11211"
+			filter="integer"
+			validate="number"
+			size="5"
+		/>
+
+		<field
+			name="memcached_persist"
+			type="radio"
+			label="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="cache_handler:memcached"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="memcached_compress"
+			type="radio"
+			label="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="cache_handler:memcached"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="memcached_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
+			default="localhost"
+			showon="cache_handler:memcached"
+			filter="string"
+			size="25"
+		/>
+
+		<field
+			name="memcached_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
+			showon="cache_handler:memcached"
+			min="1"
+			max="65535"
+			default="11211"
+			filter="integer"
+			validate="number"
+			size="5"
+		/>
+
+		<field
+			name="redis_persist"
+			type="radio"
+			label="COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			showon="cache_handler:redis"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="redis_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_REDIS_HOST_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_HOST_DESC"
+			default="localhost"
+			filter="string"
+			showon="cache_handler:redis"
+			size="25"
+		/>
+
+		<field
+			name="redis_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_REDIS_PORT_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_PORT_DESC"
+			showon="cache_handler:redis"
+			min="1"
+			max="65535"
+			default="6379"
+			filter="integer"
+			validate="number"
+			size="5"
+		/>
+
+		<field
+			name="redis_server_auth"
+			type="password"
+			label="COM_CONFIG_FIELD_REDIS_AUTH_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_AUTH_DESC"
+			filter="raw"
+			showon="cache_handler:redis"
+			autocomplete="off"
+			size="30"
+		/>
+
+		<field
+			name="redis_server_db"
+			type="number"
+			label="COM_CONFIG_FIELD_REDIS_DB_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_DB_DESC"
+			default="0"
+			filter="integer"
+			showon="cache_handler:redis"
+			size="4"
+		/>
+
+		<field
+			name="cachetime"
+			type="number"
+			label="COM_CONFIG_FIELD_CACHE_TIME_LABEL"
+			description="COM_CONFIG_FIELD_CACHE_TIME_DESC"
+			min="1"
+			default="15"
+			filter="integer"
+			validate="number"
+			size="6"
+		/>
+
+		<field
+			name="cache_platformprefix"
+			type="radio"
+			label="COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL"
+			description="COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="caching"
+			type="list"
+			label="COM_CONFIG_FIELD_CACHE_LABEL"
+			description="COM_CONFIG_FIELD_CACHE_DESC"
+			default="2"
+			filter="integer"
+			>
+			<option value="0">COM_CONFIG_FIELD_VALUE_CACHE_OFF</option>
+			<option value="1">COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE</option>
+			<option value="2">COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="memcache"
+		label="COM_CONFIG_MEMCACHE_SETTINGS_LABEL">
+	</fieldset>
+
+	<fieldset
+		name="database"
+		label="CONFIG_DATABASE_SETTINGS_LABEL">
+
+		<field
+			name="dbtype"
+			type="databaseconnection"
+			label="COM_CONFIG_FIELD_DATABASE_TYPE_LABEL"
+			description="COM_CONFIG_FIELD_DATABASE_TYPE_DESC"
+			supported="mysql,mysqli,pdomysql,postgresql,sqlsrv,sqlazure"
+			filter="string"
+		/>
+
+		<field
+			name="host"
+			type="text"
+			label="COM_CONFIG_FIELD_DATABASE_HOST_LABEL"
+			description="COM_CONFIG_FIELD_DATABASE_HOST_DESC"
+			required="true"
+			filter="string"
+			size="30"
+		/>
+
+		<field
+			name="user"
+			type="text"
+			label="COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL"
+			description="COM_CONFIG_FIELD_DATABASE_USERNAME_DESC"
+			required="true"
+			filter="string"
+			size="30"
+		/>
+
+		<field
+			name="db"
+			type="text"
+			label="COM_CONFIG_FIELD_DATABASE_NAME_LABEL"
+			description="COM_CONFIG_FIELD_DATABASE_NAME_DESC"
+			required="true"
+			filter="string"
+			size="30"
+		/>
+
+		<field
+			name="dbprefix"
+			type="text"
+			label="COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL"
+			description="COM_CONFIG_FIELD_DATABASE_PREFIX_DESC"
+			default="jos_"
+			filter="string"
+			size="10"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="debug"
+		label="CONFIG_DEBUG_SETTINGS_LABEL">
+
+		<field
+			name="debug"
+			type="radio"
+			label="COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL"
+			description="COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="debug_lang"
+			type="radio"
+			label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
+			description="COM_CONFIG_FIELD_DEBUG_LANG_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset name="ftp" label="CONFIG_FTP_SETTINGS_LABEL">
+
+		<field
+			name="ftp_enable"
+			type="radio"
+			label="COM_CONFIG_FIELD_FTP_ENABLE_LABEL"
+			description="COM_CONFIG_FIELD_FTP_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="ftp_host"
+			type="text"
+			label="COM_CONFIG_FIELD_FTP_HOST_LABEL"
+			description="COM_CONFIG_FIELD_FTP_HOST_DESC"
+			filter="string"
+			showon="ftp_enable:1"
+			size="14"
+		/>
+
+		<field
+			name="ftp_port"
+			type="number"
+			label="COM_CONFIG_FIELD_FTP_PORT_LABEL"
+			description="COM_CONFIG_FIELD_FTP_PORT_DESC"
+			showon="ftp_enable:1"
+			min="1"
+			max="65535"
+			hint="21"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
+		<field
+			name="ftp_user"
+			type="text"
+			label="COM_CONFIG_FIELD_FTP_USERNAME_LABEL"
+			description="COM_CONFIG_FIELD_FTP_USERNAME_DESC"
+			filter="string"
+			showon="ftp_enable:1"
+			autocomplete="off"
+			size="25"
+		/>
+
+		<field
+			name="ftp_pass"
+			type="password"
+			label="COM_CONFIG_FIELD_FTP_PASSWORD_LABEL"
+			description="COM_CONFIG_FIELD_FTP_PASSWORD_DESC"
+			filter="raw"
+			showon="ftp_enable:1"
+			autocomplete="off"
+			size="25"
+		/>
+
+		<field
+			name="ftp_root"
+			type="text"
+			label="COM_CONFIG_FIELD_FTP_ROOT_LABEL"
+			description="COM_CONFIG_FIELD_FTP_ROOT_DESC"
+			showon="ftp_enable:1"
+			filter="string"
+			size="50"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="proxy"
+		label="CONFIG_PROXY_SETTINGS_LABEL">
+
+		<field
+			name="proxy_enable"
+			type="radio"
+			label="COM_CONFIG_FIELD_PROXY_ENABLE_LABEL"
+			description="COM_CONFIG_FIELD_PROXY_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="proxy_host"
+			type="text"
+			label="COM_CONFIG_FIELD_PROXY_HOST_LABEL"
+			description="COM_CONFIG_FIELD_PROXY_HOST_DESC"
+			filter="string"
+			showon="proxy_enable:1"
+			size="14"
+		/>
+
+		<field
+			name="proxy_port"
+			type="number"
+			label="COM_CONFIG_FIELD_PROXY_PORT_LABEL"
+			description="COM_CONFIG_FIELD_PROXY_PORT_DESC"
+			showon="proxy_enable:1"
+			min="1"
+			max="65535"
+			hint="8080"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
+		<field
+			name="proxy_user"
+			type="text"
+			label="COM_CONFIG_FIELD_PROXY_USERNAME_LABEL"
+			description="COM_CONFIG_FIELD_PROXY_USERNAME_DESC"
+			filter="string"
+			showon="proxy_enable:1"
+			autocomplete="off"
+			size="25"
+		/>
+
+		<field
+			name="proxy_pass"
+			type="password"
+			label="COM_CONFIG_FIELD_PROXY_PASSWORD_LABEL"
+			description="COM_CONFIG_FIELD_PROXY_PASSWORD_DESC"
+			filter="raw"
+			showon="proxy_enable:1"
+			autocomplete="off"
+			size="25"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="locale"
+		label="CONFIG_LOCATION_SETTINGS_LABEL">
+
+		<field
+			name="offset"
+			type="timezone"
+			label="COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL"
+			description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC"
+			default="UTC"
+			>
+			<option value="UTC">JLIB_FORM_VALUE_TIMEZONE_UTC</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="mail"
+		label="CONFIG_MAIL_SETTINGS_LABEL">
+
+		<field
+			name="mailonline"
+			type="radio"
+			label="COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_MAILONLINE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="massmailoff"
+			type="radio"
+			label="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			showon="mailonline:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="mailfrom"
+			type="email"
+			label="COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC"
+			filter="string"
+			size="30"
+			validate="email"
+			showon="mailonline:1"
+		/>
+
+		<field
+			name="fromname"
+			type="text"
+			label="COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC"
+			filter="string"
+			size="30"
+			showon="mailonline:1"
+		/>
+
+		<field
+			name="replyto"
+			type="email"
+			label="COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_DESC"
+			filter="string"
+			size="30"
+			validate="email"
+			showon="mailonline:1"
+		/>
+
+		<field
+			name="replytoname"
+			type="text"
+			label="COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_DESC"
+			filter="string"
+			size="30"
+			showon="mailonline:1"
+		/>
+
+		<field
+			name="mailer"
+			type="list"
+			label="COM_CONFIG_FIELD_MAIL_MAILER_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_MAILER_DESC"
+			default="mail"
+			filter="word"
+			showon="mailonline:1"
+			>
+			<option value="mail">COM_CONFIG_FIELD_VALUE_PHP_MAIL</option>
+			<option value="sendmail">COM_CONFIG_FIELD_VALUE_SENDMAIL</option>
+			<option value="smtp">COM_CONFIG_FIELD_VALUE_SMTP</option>
+		</field>
+
+		<field
+			name="sendmail"
+			type="text"
+			label="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC"
+			default="/usr/sbin/sendmail"
+			showon="mailonline:1[AND]mailer:sendmail"
+			filter="string"
+			size="30"
+		/>
+
+		<field
+			name="smtphost"
+			type="text"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC"
+			default="localhost"
+			showon="mailonline:1[AND]mailer:smtp"
+			filter="string"
+			size="30"
+		/>
+
+		<field
+			name="smtpport"
+			type="number"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC"
+			showon="mailonline:1[AND]mailer:smtp"
+			min="1"
+			max="65535"
+			default="25"
+			hint="25"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
+		<field
+			name="smtpsecure"
+			type="list"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC"
+			default="none"
+			showon="mailonline:1[AND]mailer:smtp"
+			filter="word"
+			>
+			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
+			<option value="ssl">COM_CONFIG_FIELD_VALUE_SSL</option>
+			<option value="tls">COM_CONFIG_FIELD_VALUE_TLS</option>
+		</field>
+
+		<field
+			name="smtpauth"
+			type="radio"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="mailonline:1[AND]mailer:smtp"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="smtpuser"
+			type="text"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
+			filter="string"
+			autocomplete="off"
+			size="30"
+		/>
+
+		<field
+			name="smtppass"
+			type="password"
+			label="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_DESC"
+			showon="mailonline:1[AND]mailer:smtp[AND]smtpauth:1"
+			filter="raw"
+			autocomplete="off"
+			size="30"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="metadata"
+		label="COM_CONFIG_METADATA_SETTINGS">
+
+		<field
+			name="MetaDesc"
+			type="textarea"
+			label="COM_CONFIG_FIELD_METADESC_LABEL"
+			description="COM_CONFIG_FIELD_METADESC_DESC"
+			filter="string"
+			cols="60"
+			rows="3"
+		/>
+
+		<field
+			name="MetaKeys"
+			type="textarea"
+			label="COM_CONFIG_FIELD_METAKEYS_LABEL"
+			description="COM_CONFIG_FIELD_METAKEYS_DESC"
+			filter="string"
+			cols="60"
+			rows="3"
+		/>
+
+		<field
+			name="robots"
+			type="list"
+			label="JFIELD_METADATA_ROBOTS_LABEL"
+			description="JFIELD_METADATA_ROBOTS_DESC"
+			default=""
+			>
+			<option value="">JGLOBAL_INDEX_FOLLOW</option>
+			<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+			<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+			<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+		</field>
+
+		<field
+			name="MetaRights"
+			type="textarea"
+			label="JFIELD_META_RIGHTS_LABEL"
+			description="JFIELD_META_RIGHTS_DESC"
+			filter="string"
+			cols="60"
+			rows="2"
+		/>
+
+		<field
+			name="MetaAuthor"
+			type="radio"
+			label="COM_CONFIG_FIELD_METAAUTHOR_LABEL"
+			description="COM_CONFIG_FIELD_METAAUTHOR_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="MetaVersion"
+			type="radio"
+			label="COM_CONFIG_FIELD_METAVERSION_LABEL"
+			description="COM_CONFIG_FIELD_METAVERSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="seo"
+		label="CONFIG_SEO_SETTINGS_LABEL">
+
+		<field
+			name="sef"
+			type="radio"
+			label="COM_CONFIG_FIELD_SEF_URL_LABEL"
+			description="COM_CONFIG_FIELD_SEF_URL_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="sef_rewrite"
+			type="radio"
+			label="COM_CONFIG_FIELD_SEF_REWRITE_LABEL"
+			description="COM_CONFIG_FIELD_SEF_REWRITE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			showon="sef:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="sef_suffix"
+			type="radio"
+			label="COM_CONFIG_FIELD_SEF_SUFFIX_LABEL"
+			description="COM_CONFIG_FIELD_SEF_SUFFIX_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			showon="sef:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="unicodeslugs"
+			type="radio"
+			label="COM_CONFIG_FIELD_UNICODESLUGS_LABEL"
+			description="COM_CONFIG_FIELD_UNICODESLUGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			showon="sef:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="sitename_pagetitles"
+			type="list"
+			label="COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL"
+			description="COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC"
+			default="0"
+			filter="integer"
+			>
+			<option value="2">COM_CONFIG_FIELD_VALUE_AFTER</option>
+			<option value="1">COM_CONFIG_FIELD_VALUE_BEFORE</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="server"
+		label="CONFIG_SERVER_SETTINGS_LABEL">
+
+		<field
+			name="tmp_path"
+			type="text"
+			label="COM_CONFIG_FIELD_TEMP_PATH_LABEL"
+			description="COM_CONFIG_FIELD_TEMP_PATH_DESC"
+			filter="string"
+			size="50"
+		/>
+
+		<field
+			name="gzip"
+			type="radio"
+			label="COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL"
+			description="COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="error_reporting"
+			type="list"
+			label="COM_CONFIG_FIELD_ERROR_REPORTING_LABEL"
+			description="COM_CONFIG_FIELD_ERROR_REPORTING_DESC"
+			default="default"
+			filter="cmd"
+			>
+			<option value="default">COM_CONFIG_FIELD_VALUE_SYSTEM_DEFAULT</option>
+			<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
+			<option value="simple">COM_CONFIG_FIELD_VALUE_SIMPLE</option>
+			<option value="maximum">COM_CONFIG_FIELD_VALUE_MAXIMUM</option>
+			<option value="development">COM_CONFIG_FIELD_VALUE_DEVELOPMENT</option>
+		</field>
+
+		<field
+			name="force_ssl"
+			type="list"
+			label="COM_CONFIG_FIELD_FORCE_SSL_LABEL"
+			description="COM_CONFIG_FIELD_FORCE_SSL_DESC"
+			default="-1"
+			filter="integer"
+			>
+			<option value="0">COM_CONFIG_FIELD_VALUE_NONE</option>
+			<option value="1">COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY</option>
+			<option value="2">COM_CONFIG_FIELD_VALUE_ENTIRE_SITE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="session"
+		label="CONFIG_SESSION_SETTINGS_LABEL">
+
+		<field
+			name="session_handler"
+			type="sessionhandler"
+			label="COM_CONFIG_FIELD_SESSION_HANDLER_LABEL"
+			description="COM_CONFIG_FIELD_SESSION_HANDLER_DESC"
+			default="none"
+			filter="word"
+		/>
+
+		<field
+			name="session_memcache_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
+			default="localhost"
+			filter="string"
+			showon="session_handler:memcache"
+			size="25"
+		/>
+
+		<field
+			name="session_memcache_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
+			showon="session_handler:memcache"
+			min="1"
+			max="65535"
+			default="11211"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
+		<field
+			name="session_memcached_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_HOST_DESC"
+			default="localhost"
+			filter="string"
+			showon="session_handler:memcached"
+			size="25"
+		/>
+
+		<field
+			name="session_memcached_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL"
+			description="COM_CONFIG_FIELD_MEMCACHE_PORT_DESC"
+			showon="session_handler:memcached"
+			min="1"
+			max="65535"
+			default="11211"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
+		<field
+			name="session_redis_persist"
+			type="radio"
+			label="COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			filter="integer"
+			showon="session_handler:redis"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="session_redis_server_host"
+			type="text"
+			label="COM_CONFIG_FIELD_REDIS_HOST_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_HOST_DESC"
+			default="localhost"
+			filter="string"
+			showon="session_handler:redis"
+			size="25"
+		/>
+
+		<field
+			name="session_redis_server_port"
+			type="number"
+			label="COM_CONFIG_FIELD_REDIS_PORT_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_PORT_DESC"
+			showon="session_handler:redis"
+			min="1"
+			max="65535"
+			default="6379"
+			validate="number"
+			filter="integer"
+			size="5"
+		/>
+
+		<field
+			name="session_redis_server_auth"
+			type="password"
+			label="COM_CONFIG_FIELD_REDIS_AUTH_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_AUTH_DESC"
+			filter="raw"
+			showon="session_handler:redis"
+			autocomplete="off"
+			size="30"
+		/>
+
+		<field
+			name="session_redis_server_db"
+			type="number"
+			label="COM_CONFIG_FIELD_REDIS_DB_LABEL"
+			description="COM_CONFIG_FIELD_REDIS_DB_DESC"
+			default="0"
+			filter="integer"
+			showon="session_handler:redis"
+			size="4"
+		/>
+		<field
+			name="lifetime"
+			type="number"
+			label="COM_CONFIG_FIELD_SESSION_TIME_LABEL"
+			description="COM_CONFIG_FIELD_SESSION_TIME_DESC"
+			min="1"
+			max="16383"
+			default="15"
+			filter="integer"
+			validate="number"
+			size="6"
+		/>
+
+		<field
+			name="shared_session"
+			type="radio"
+			label="COM_CONFIG_FIELD_SHARED_SESSION_LABEL"
+			description="COM_CONFIG_FIELD_SHARED_SESSION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="site"
+		label="CONFIG_SITE_SETTINGS_LABEL">
+
+		<field
+			name="sitename"
+			type="text"
+			label="COM_CONFIG_FIELD_SITE_NAME_LABEL"
+			description="COM_CONFIG_FIELD_SITE_NAME_DESC"
+			required="true"
+			filter="string"
+			size="50"
+		/>
+
+		<field
+			name="offline"
+			type="radio"
+			label="COM_CONFIG_FIELD_SITE_OFFLINE_LABEL"
+			description="COM_CONFIG_FIELD_SITE_OFFLINE_DESC"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="display_offline_message"
+			type="list"
+			label="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL"
+			description="COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_DESC"
+			default="1"
+			filter="integer"
+			showon="offline:1"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM</option>
+			<option value="2">COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE</option>
+		</field>
+
+		<field
+			name="offline_message"
+			type="textarea"
+			label="COM_CONFIG_FIELD_OFFLINE_MESSAGE_LABEL"
+			description="COM_CONFIG_FIELD_OFFLINE_MESSAGE_DESC"
+			filter="safehtml"
+			cols="60"
+			rows="2"
+			showon="offline:1[AND]display_offline_message:1"
+		/>
+
+		<field
+			name="offline_image"
+			type="media"
+			label="COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL"
+			description="COM_CONFIG_FIELD_OFFLINE_IMAGE_DESC"
+			showon="offline:1"
+		/>
+
+		<field
+			name="frontediting"
+			type="list"
+			label="COM_CONFIG_FRONTEDITING_LABEL"
+			description="COM_CONFIG_FRONTEDITING_DESC"
+			default="1"
+			filter="integer"
+			>
+			<option value="2">COM_CONFIG_FRONTEDITING_MENUSANDMODULES</option>
+			<option value="1">COM_CONFIG_FRONTEDITING_MODULES</option>
+			<option value="0">JNONE</option>
+		</field>
+
+		<field
+			name="editor"
+			type="plugins"
+			label="COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC"
+			folder="editors"
+			default="tinymce"
+			filter="cmd"
+		/>
+
+		<field
+			name="captcha"
+			type="plugins"
+			label="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC"
+			folder="captcha"
+			default="0"
+			filter="cmd"
+			>
+			<option value="0">JOPTION_DO_NOT_USE</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC"
+			default="1"
+			filter="integer"
+		/>
+
+		<field
+			name="list_limit"
+			type="list"
+			label="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC"
+			default="20"
+			filter="integer"
+			>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="100">J100</option>
+			<option value="200">J200</option>
+			<option value="500">J500</option>
+		</field>
+
+		<field
+			name="feed_limit"
+			type="list"
+			label="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC"
+			default="10"
+			filter="integer"
+			>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="100">J100</option>
+		</field>
+
+		<field
+			name="feed_email"
+			type="list"
+			label="COM_CONFIG_FIELD_FEED_EMAIL_LABEL"
+			description="COM_CONFIG_FIELD_FEED_EMAIL_DESC"
+			default="none"
+			filter="word"
+			>
+			<option value="author">COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL</option>
+			<option value="site">COM_CONFIG_FIELD_VALUE_SITE_EMAIL</option>
+			<option value="none">COM_CONFIG_FIELD_VALUE_NO_EMAIL</option>
+
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="system"
+		label="CONFIG_SYSTEM_SETTINGS_LABEL">
+
+		<field
+			name="log_path"
+			type="text"
+			label="COM_CONFIG_FIELD_LOG_PATH_LABEL"
+			description="COM_CONFIG_FIELD_LOG_PATH_DESC"
+			required="true"
+			filter="string"
+			size="50"
+		/>
+
+		<field
+			name="helpurl"
+			type="helpsite"
+			label="COM_CONFIG_FIELD_HELP_SERVER_LABEL"
+			description="COM_CONFIG_FIELD_HELP_SERVER_DESC"
+			showDefault="false"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="cookie"
+		label="CONFIG_COOKIE_SETTINGS_LABEL">
+
+		<field
+			name="cookie_domain"
+			type="text"
+			label="COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL"
+			description="COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC"
+			filter="string"
+			size="40"
+		/>
+
+		<field
+			name="cookie_path"
+			type="text"
+			label="COM_CONFIG_FIELD_COOKIE_PATH_LABEL"
+			description="COM_CONFIG_FIELD_COOKIE_PATH_DESC"
+			filter="string"
+			size="40"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="CONFIG_PERMISSION_SETTINGS_LABEL">
+
+		<field
+			name="rules"
+			type="rules"
+			label="FIELD_RULES_LABEL"
+			translate_label="false"
+			validate="rules"
+			filter="rules"
+			>
+			<action
+				name="core.login.site"
+				title="JACTION_LOGIN_SITE"
+				description="COM_CONFIG_ACTION_LOGIN_SITE_DESC"
+			/>
+			<action
+				name="core.login.admin"
+				title="JACTION_LOGIN_ADMIN"
+				description="COM_CONFIG_ACTION_LOGIN_ADMIN_DESC"
+			/>
+			<action
+				name="core.login.offline"
+				title="JACTION_LOGIN_OFFLINE"
+				description="COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC"
+			/>
+			<action
+				name="core.admin"
+				title="JACTION_ADMIN_GLOBAL"
+				description="COM_CONFIG_ACTION_ADMIN_DESC"
+			/>
+			<action
+				name="core.options"
+				title="JACTION_OPTIONS"
+				description="COM_CONFIG_ACTION_OPTIONS_DESC"
+			/>
+			<action
+				name="core.manage"
+				title="JACTION_MANAGE"
+				description="COM_CONFIG_ACTION_MANAGE_DESC"
+			/>
+			<action
+				name="core.create"
+				title="JACTION_CREATE"
+				description="COM_CONFIG_ACTION_CREATE_DESC"
+			/>
+			<action
+				name="core.delete"
+				title="JACTION_DELETE"
+				description="COM_CONFIG_ACTION_DELETE_DESC"
+			/>
+			<action
+				name="core.edit"
+				title="JACTION_EDIT"
+				description="COM_CONFIG_ACTION_EDIT_DESC"
+			/>
+			<action
+				name="core.edit.state"
+				title="JACTION_EDITSTATE"
+				description="COM_CONFIG_ACTION_EDITSTATE_DESC"
+			/>
+			<action
+				name="core.edit.own"
+				title="JACTION_EDITOWN"
+				description="COM_CONFIG_ACTION_EDITOWN_DESC"
+			/>
+			<action
+				name="core.edit.value"
+				title="JACTION_EDITVALUE"
+				description="COM_CONFIG_ACTION_EDITVALUE_DESC"
+			/>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="filters"
+		label="COM_CONFIG_TEXT_FILTERS"
+		description="COM_CONFIG_TEXT_FILTERS_DESC">
+
+		<field
+			name="filters"
+			type="filters"
+			label="COM_CONFIG_TEXT_FILTERS"
+			filter=""
+		/>
+
+	</fieldset>
+
+	<fieldset>
+
+		<field
+			name="asset_id"
+			type="hidden"
+		/>
+
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_config/models/application.php b/core/administrator/components/com_config/models/application.php
new file mode 100644
index 00000000..9263cf9b
--- /dev/null
+++ b/core/administrator/components/com_config/models/application.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+try
+{
+	JLog::add(
+		sprintf('ConfigModelApplication has moved from %1$s to %2$s', __FILE__, dirname(__DIR__) . '/model/application.php'),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+catch (RuntimeException $exception)
+{
+	// Informational log only
+}
+
+include_once JPATH_ADMINISTRATOR . '/components/com_config/model/application.php';
diff --git a/core/administrator/components/com_config/models/component.php b/core/administrator/components/com_config/models/component.php
new file mode 100644
index 00000000..992333dc
--- /dev/null
+++ b/core/administrator/components/com_config/models/component.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+try
+{
+	JLog::add(
+		sprintf('ConfigModelComponent has moved from %1$s to %2$s', __FILE__, dirname(__DIR__) . '/model/component.php'),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+catch (RuntimeException $exception)
+{
+	// Informational log only
+}
+
+include_once JPATH_ADMINISTRATOR . '/components/com_config/model/component.php';
diff --git a/core/administrator/components/com_config/view/application/html.php b/core/administrator/components/com_config/view/application/html.php
new file mode 100644
index 00000000..39957c6d
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/html.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View for the global configuration
+ *
+ * @since  3.2
+ */
+class ConfigViewApplicationHtml extends ConfigViewCmsHtml
+{
+	public $state;
+
+	public $form;
+
+	public $data;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 */
+	public function render()
+	{
+		$form = null;
+		$data = null;
+
+		try
+		{
+			// Load Form and Data
+			$form = $this->model->getForm();
+			$data = $this->model->getData();
+			$user = JFactory::getUser();
+		}
+		catch (Exception $e)
+		{
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		// Bind data
+		if ($form && $data)
+		{
+			$form->bind($data);
+		}
+
+		// Get the params for com_users.
+		$usersParams = JComponentHelper::getParams('com_users');
+
+		// Get the params for com_media.
+		$mediaParams = JComponentHelper::getParams('com_media');
+
+		// Load settings for the FTP layer.
+		$ftp = JClientHelper::setCredentialsFromRequest('ftp');
+
+		$this->form = &$form;
+		$this->data = &$data;
+		$this->ftp = &$ftp;
+		$this->usersParams = &$usersParams;
+		$this->mediaParams = &$mediaParams;
+
+		$this->components = ConfigHelperConfig::getComponentsWithConfig();
+		ConfigHelperConfig::loadLanguageForComponents($this->components);
+
+		$this->userIsSuperAdmin = $user->authorise('core.admin');
+
+		$this->addToolbar();
+
+		return parent::render();
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since	3.2
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'equalizer config');
+		JToolbarHelper::apply('config.save.application.apply');
+		JToolbarHelper::save('config.save.application.save');
+		JToolbarHelper::divider();
+		JToolbarHelper::cancel('config.cancel.application');
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_SITE_GLOBAL_CONFIGURATION');
+	}
+}
diff --git a/core/administrator/components/com_config/view/application/json.php b/core/administrator/components/com_config/view/application/json.php
new file mode 100644
index 00000000..cb814c0b
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/json.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View for the component configuration
+ *
+ * @since  3.2
+ */
+class ConfigViewApplicationJson extends ConfigViewCmsJson
+{
+	public $state;
+
+	public $data;
+
+	/**
+	 * Display the view
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 */
+	public function render()
+	{
+		try
+		{
+			$this->data = $this->model->getData();
+			$user = JFactory::getUser();
+		}
+		catch (Exception $e)
+		{
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		$this->userIsSuperAdmin = $user->authorise('core.admin');
+
+		// Required data
+		$requiredData = array(
+			'sitename'            => null,
+			'offline'             => null,
+			'access'              => null,
+			'list_limit'          => null,
+			'MetaDesc'            => null,
+			'MetaKeys'            => null,
+			'MetaRights'          => null,
+			'sef'                 => null,
+			'sitename_pagetitles' => null,
+			'debug'               => null,
+			'debug_lang'          => null,
+			'error_reporting'     => null,
+			'mailfrom'            => null,
+			'fromname'            => null
+		);
+
+		$this->data = array_intersect_key($this->data, $requiredData);
+
+		return json_encode($this->data);
+	}
+}
diff --git a/core/administrator/components/com_config/view/application/tmpl/default.php b/core/administrator/components/com_config/view/application/tmpl/default.php
new file mode 100644
index 00000000..0d182986
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+// Load tooltips behavior
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+
+// Load JS message titles
+JText::script('ERROR');
+JText::script('WARNING');
+JText::script('NOTICE');
+JText::script('MESSAGE');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task === "config.cancel.application" || document.formvalidator.isValid(document.getElementById("application-form")))
+		{
+			jQuery("#permissions-sliders select").attr("disabled", "disabled");
+			Joomla.submitform(task, document.getElementById("application-form"));
+		}
+	};
+');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
+	<div class="row-fluid">
+		<!-- Begin Sidebar -->
+		<div id="sidebar" class="span2">
+			<div class="sidebar-nav">
+				<?php echo $this->loadTemplate('navigation'); ?>
+				<?php
+				// Display the submenu position modules
+				$this->submenumodules = JModuleHelper::getModules('submenu');
+				foreach ($this->submenumodules as $submenumodule)
+				{
+					$output = JModuleHelper::renderModule($submenumodule);
+					$params = new Registry($submenumodule->params);
+					echo $output;
+				}
+				?>
+			</div>
+		</div>
+		<!-- End Sidebar -->
+		<!-- Begin Content -->
+		<div class="span10">
+			<ul class="nav nav-tabs">
+				<li class="active"><a href="#page-site" data-toggle="tab"><?php echo JText::_('JSITE'); ?></a></li>
+				<li><a href="#page-system" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></a></li>
+				<li><a href="#page-server" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SERVER'); ?></a></li>
+				<li><a href="#page-filters" data-toggle="tab"><?php echo JText::_('COM_CONFIG_TEXT_FILTERS'); ?></a></li>
+				<?php if ($this->ftp) : ?>
+					<li><a href="#page-ftp" data-toggle="tab"><?php echo JText::_('COM_CONFIG_FTP_SETTINGS'); ?></a></li>
+				<?php endif; ?>
+				<li><a href="#page-permissions" data-toggle="tab"><?php echo JText::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
+			</ul>
+			<div id="config-document" class="tab-content">
+				<div id="page-site" class="tab-pane active">
+					<div class="row-fluid">
+						<div class="span6">
+							<?php echo $this->loadTemplate('site'); ?>
+							<?php echo $this->loadTemplate('metadata'); ?>
+						</div>
+						<div class="span6">
+							<?php echo $this->loadTemplate('seo'); ?>
+							<?php echo $this->loadTemplate('cookie'); ?>
+						</div>
+					</div>
+				</div>
+				<div id="page-system" class="tab-pane">
+					<div class="row-fluid">
+						<div class="span12">
+							<?php echo $this->loadTemplate('system'); ?>
+							<?php echo $this->loadTemplate('debug'); ?>
+							<?php echo $this->loadTemplate('cache'); ?>
+							<?php echo $this->loadTemplate('session'); ?>
+						</div>
+					</div>
+				</div>
+				<div id="page-server" class="tab-pane">
+					<div class="row-fluid">
+						<div class="span6">
+							<?php echo $this->loadTemplate('server'); ?>
+							<?php echo $this->loadTemplate('locale'); ?>
+							<?php echo $this->loadTemplate('ftp'); ?>
+							<?php echo $this->loadTemplate('proxy'); ?>
+						</div>
+						<div class="span6">
+							<?php echo $this->loadTemplate('database'); ?>
+							<?php echo $this->loadTemplate('mail'); ?>
+						</div>
+					</div>
+				</div>
+				<div id="page-filters" class="tab-pane">
+					<div class="row-fluid">
+						<?php echo $this->loadTemplate('filters'); ?>
+					</div>
+				</div>
+				<?php if ($this->ftp) : ?>
+					<div id="page-ftp" class="tab-pane">
+						<?php echo $this->loadTemplate('ftplogin'); ?>
+					</div>
+				<?php endif; ?>
+				<div id="page-permissions" class="tab-pane">
+					<div class="row-fluid">
+						<?php echo $this->loadTemplate('permissions'); ?>
+					</div>
+				</div>
+				<input type="hidden" name="task" value="" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+		<!-- End Content -->
+	</div>
+</form>
diff --git a/core/administrator/components/com_config/view/application/tmpl/default.xml b/core/administrator/components/com_config/view/application/tmpl/default.xml
new file mode 100755
index 00000000..2cd0ed32
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CONFIG_CONFIG_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_cache.php b/core/administrator/components/com_config/view/application/tmpl/default_cache.php
new file mode 100644
index 00000000..c3dfffdd
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_cache.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_CACHE_SETTINGS');
+$this->fieldsname = 'cache';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_cookie.php b/core/administrator/components/com_config/view/application/tmpl/default_cookie.php
new file mode 100644
index 00000000..1380984e
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_cookie.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_COOKIE_SETTINGS');
+$this->fieldsname = 'cookie';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_database.php b/core/administrator/components/com_config/view/application/tmpl/default_database.php
new file mode 100644
index 00000000..b667d365
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_database.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_DATABASE_SETTINGS');
+$this->fieldsname = 'database';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_debug.php b/core/administrator/components/com_config/view/application/tmpl/default_debug.php
new file mode 100644
index 00000000..97882fa9
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_debug.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_DEBUG_SETTINGS');
+$this->fieldsname = 'debug';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_filters.php b/core/administrator/components/com_config/view/application/tmpl/default_filters.php
new file mode 100644
index 00000000..fb419a0b
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_filters.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
+$this->fieldsname = 'filters';
+$this->description = JText::_('COM_CONFIG_TEXT_FILTERS_DESC');
+echo JLayoutHelper::render('joomla.content.text_filters', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_ftp.php b/core/administrator/components/com_config/view/application/tmpl/default_ftp.php
new file mode 100644
index 00000000..8f030252
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_ftp.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_FTP_SETTINGS');
+$this->fieldsname = 'ftp';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_ftplogin.php b/core/administrator/components/com_config/view/application/tmpl/default_ftplogin.php
new file mode 100644
index 00000000..fdb4998d
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_ftplogin.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset title="<?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?>" class="form-horizontal">
+	<legend><?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
+	<?php echo JText::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
+	<?php if ($this->ftp instanceof Exception) : ?>
+		<p><?php echo JText::_($this->ftp->message); ?></p>
+	<?php endif; ?>
+	<div class="control-group">
+		<div class="control-label"><label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label></div>
+		<div class="controls">
+			<input type="text" id="username" name="username" class="input_box" size="70" value="" />
+		</div>
+	</div>
+	<div class="control-group">
+		<div class="control-label"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></div>
+		<div class="controls">
+			<input type="password" id="password" name="password" class="input_box" size="70" value="" />
+		</div>
+	</div>
+</fieldset>
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_locale.php b/core/administrator/components/com_config/view/application/tmpl/default_locale.php
new file mode 100644
index 00000000..8b4aa72c
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_locale.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_LOCATION_SETTINGS');
+$this->fieldsname = 'locale';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_mail.php b/core/administrator/components/com_config/view/application/tmpl/default_mail.php
new file mode 100644
index 00000000..e5151c1d
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_mail.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('jquery.token');
+JHtml::_('script', 'system/sendtestmail.js', array('version' => 'auto', 'relative' => true));
+
+// Load JavaScript message titles
+JText::script('ERROR');
+JText::script('WARNING');
+JText::script('NOTICE');
+JText::script('MESSAGE');
+
+// Add strings for JavaScript error translations.
+JText::script('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT');
+JText::script('JLIB_JS_AJAX_ERROR_NO_CONTENT');
+JText::script('JLIB_JS_AJAX_ERROR_OTHER');
+JText::script('JLIB_JS_AJAX_ERROR_PARSE');
+JText::script('JLIB_JS_AJAX_ERROR_TIMEOUT');
+
+// Ajax request data.
+$ajaxUri = JRoute::_('index.php?option=com_config&task=config.sendtestmail.application&format=json');
+
+$this->name = JText::_('COM_CONFIG_MAIL_SETTINGS');
+$this->fieldsname = 'mail';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
+
+echo '<button class="btn btn-small" data-ajaxuri="' . $ajaxUri . '"  type="button" id="sendtestmail">
+		<span>' . JText::_('COM_CONFIG_SENDMAIL_ACTION_BUTTON') . '</span>
+	</button>';
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_metadata.php b/core/administrator/components/com_config/view/application/tmpl/default_metadata.php
new file mode 100644
index 00000000..825383a6
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_metadata.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_METADATA_SETTINGS');
+$this->fieldsname = 'metadata';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_navigation.php b/core/administrator/components/com_config/view/application/tmpl/default_navigation.php
new file mode 100644
index 00000000..27e9272f
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_navigation.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="nav nav-list">
+	<?php if ($this->userIsSuperAdmin) : ?>
+		<li class="nav-header"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></li>
+		<li class="active">
+			<a href="index.php?option=com_config"><?php echo JText::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a>
+		</li>
+		<li class="divider"></li>
+	<?php endif; ?>
+	<li class="nav-header"><?php echo JText::_('COM_CONFIG_COMPONENT_FIELDSET_LABEL'); ?></li>
+	<?php foreach ($this->components as $component) : ?>
+		<li>
+			<a href="index.php?option=com_config&view=component&component=<?php echo $component; ?>"><?php echo JText::_($component); ?></a>
+		</li>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_permissions.php b/core/administrator/components/com_config/view/application/tmpl/default_permissions.php
new file mode 100644
index 00000000..cf5ece8b
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_permissions.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name        = JText::_('COM_CONFIG_PERMISSION_SETTINGS');
+$this->description = '';
+$this->fieldsname  = 'permissions';
+$this->formclass   = 'form-vertical';
+$this->showlabel   = false;
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_proxy.php b/core/administrator/components/com_config/view/application/tmpl/default_proxy.php
new file mode 100644
index 00000000..2fb9c485
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_proxy.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_PROXY_SETTINGS');
+$this->fieldsname = 'proxy';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_seo.php b/core/administrator/components/com_config/view/application/tmpl/default_seo.php
new file mode 100644
index 00000000..c54fd195
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_seo.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_SEO_SETTINGS');
+$this->fieldsname = 'seo';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_server.php b/core/administrator/components/com_config/view/application/tmpl/default_server.php
new file mode 100644
index 00000000..9b233869
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_server.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_SERVER_SETTINGS');
+$this->fieldsname = 'server';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_session.php b/core/administrator/components/com_config/view/application/tmpl/default_session.php
new file mode 100644
index 00000000..4b6ccdaa
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_session.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_SESSION_SETTINGS');
+$this->fieldsname = 'session';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_site.php b/core/administrator/components/com_config/view/application/tmpl/default_site.php
new file mode 100644
index 00000000..27527485
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_site.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_SITE_SETTINGS');
+$this->fieldsname = 'site';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/application/tmpl/default_system.php b/core/administrator/components/com_config/view/application/tmpl/default_system.php
new file mode 100644
index 00000000..de2ad23a
--- /dev/null
+++ b/core/administrator/components/com_config/view/application/tmpl/default_system.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->name = JText::_('COM_CONFIG_SYSTEM_SETTINGS');
+$this->fieldsname = 'system';
+echo JLayoutHelper::render('joomla.content.options_default', $this);
diff --git a/core/administrator/components/com_config/view/component/html.php b/core/administrator/components/com_config/view/component/html.php
new file mode 100644
index 00000000..efc090ff
--- /dev/null
+++ b/core/administrator/components/com_config/view/component/html.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View for the component configuration
+ *
+ * @since  3.2
+ */
+class ConfigViewComponentHtml extends ConfigViewCmsHtml
+{
+	public $state;
+
+	public $form;
+
+	public $component;
+
+	/**
+	 * Display the view
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 *
+	 */
+	public function render()
+	{
+		$form = null;
+		$component = null;
+
+		try
+		{
+			$component = $this->model->getComponent();
+
+			if (!$component->enabled)
+			{
+				return false;
+			}
+
+			$form = $this->model->getForm();
+			$user = JFactory::getUser();
+		}
+		catch (Exception $e)
+		{
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		// Bind the form to the data.
+		if ($form && $component->params)
+		{
+			$form->bind($component->params);
+		}
+
+		$this->fieldsets   = $form ? $form->getFieldsets() : null;
+		$this->formControl = $form ? $form->getFormControl() : null;
+
+		// Don't show permissions fieldset if not authorised.
+		if (!$user->authorise('core.admin', $component->option) && isset($this->fieldsets['permissions']))
+		{
+			unset($this->fieldsets['permissions']);
+		}
+
+		$this->form = &$form;
+		$this->component = &$component;
+
+		$this->components = ConfigHelperConfig::getComponentsWithConfig();
+
+		$this->userIsSuperAdmin = $user->authorise('core.admin');
+		$this->currentComponent = JFactory::getApplication()->input->get('component');
+		$this->return = JFactory::getApplication()->input->get('return', '', 'base64');
+
+		$this->addToolbar();
+
+		return parent::render();
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::title(JText::_($this->component->option . '_configuration'), 'equalizer config');
+		JToolbarHelper::apply('config.save.component.apply');
+		JToolbarHelper::save('config.save.component.save');
+		JToolbarHelper::divider();
+		JToolbarHelper::cancel('config.cancel.component');
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_' . $this->currentComponent . '_OPTIONS');
+	}
+}
diff --git a/core/administrator/components/com_config/view/component/tmpl/default.php b/core/administrator/components/com_config/view/component/tmpl/default.php
new file mode 100644
index 00000000..f52399e9
--- /dev/null
+++ b/core/administrator/components/com_config/view/component/tmpl/default.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$template = $app->getTemplate();
+
+// Load the tooltip behavior.
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', '.chzn-custom-value', null, array('disable_search_threshold' => 0));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Load JS message titles
+JText::script('ERROR');
+JText::script('WARNING');
+JText::script('NOTICE');
+JText::script('MESSAGE');
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+	Joomla.submitbutton = function(task)
+	{
+		if (task === "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form")))
+		{
+			jQuery("#permissions-sliders select").attr("disabled", "disabled");
+			Joomla.submitform(task, document.getElementById("component-form"));
+		}
+	};
+
+	// Select first tab
+	jQuery(document).ready(function() {
+		jQuery("#configTabs a:first").tab("show");
+	});'
+);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate form-horizontal">
+	<div class="row-fluid">
+
+		<!-- Begin Sidebar -->
+		<div class="span2" id="sidebar">
+			<div class="sidebar-nav">
+				<?php echo $this->loadTemplate('navigation'); ?>
+			</div>
+		</div><!-- End Sidebar -->
+
+		<div class="span10" id="config">
+
+			<?php if ($this->fieldsets): ?>
+			<ul class="nav nav-tabs" id="configTabs">
+				<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
+					<?php $dataShowOn = ''; ?>
+					<?php if (!empty($fieldSet->showon)) : ?>
+						<?php JHtml::_('jquery.framework'); ?>
+						<?php JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); ?>
+						<?php $dataShowOn = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($fieldSet->showon, $this->formControl)) . '\''; ?>
+					<?php endif; ?>
+					<?php $label = empty($fieldSet->label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label; ?>
+					<li<?php echo $dataShowOn; ?>><a data-toggle="tab" href="#<?php echo $name; ?>"><?php echo JText::_($label); ?></a></li>
+				<?php endforeach; ?>
+			</ul><!-- /configTabs -->
+
+			<div class="tab-content" id="configContent">
+				<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
+					<div class="tab-pane" id="<?php echo $name; ?>">
+						<?php if (isset($fieldSet->description) && !empty($fieldSet->description)) : ?>
+							<div class="tab-description alert alert-info">
+								<span class="icon-info" aria-hidden="true"></span> <?php echo JText::_($fieldSet->description); ?>
+							</div>
+						<?php endif; ?>
+						<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+							<?php
+								$dataShowOn = '';
+								$groupClass = $field->type === 'Spacer' ? ' field-spacer' : '';
+							?>
+							<?php if ($field->showon) : ?>
+								<?php JHtml::_('jquery.framework'); ?>
+								<?php JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); ?>
+								<?php $dataShowOn = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\''; ?>
+							<?php endif; ?>
+							<?php if ($field->hidden) : ?>
+								<?php echo $field->input; ?>
+							<?php else : ?>
+								<div class="control-group<?php echo $groupClass; ?>"<?php echo $dataShowOn; ?>>
+									<?php if ($name != 'permissions') : ?>
+										<div class="control-label">
+											<?php echo $field->label; ?>
+										</div>
+									<?php endif; ?>
+									<div class="<?php if ($name != 'permissions') : ?>controls<?php endif; ?>">
+										<?php echo $field->input; ?>
+									</div>
+								</div>
+							<?php endif; ?>
+						<?php endforeach; ?>
+					</div>
+				<?php endforeach; ?>
+			</div><!-- /configContent -->
+			<?php else: ?>
+				<div class="alert alert-info"><span class="icon-info" aria-hidden="true"></span> <?php echo JText::_('COM_CONFIG_COMPONENT_NO_CONFIG_FIELDS_MESSAGE'); ?></div>
+			<?php endif; ?>
+
+		</div><!-- /config -->
+
+		<input type="hidden" name="id" value="<?php echo $this->component->id; ?>" />
+		<input type="hidden" name="component" value="<?php echo $this->component->option; ?>" />
+		<input type="hidden" name="return" value="<?php echo $this->return; ?>" />
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_config/view/component/tmpl/default.xml b/core/administrator/components/com_config/view/component/tmpl/default.xml
new file mode 100755
index 00000000..803c832f
--- /dev/null
+++ b/core/administrator/components/com_config/view/component/tmpl/default.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONFIG_COMPONENT_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CONFIG_COMPONENT_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fields name="request">
+		<fieldset name="request" addfieldpath="administrator/components/com_config/model/field">
+			<field
+				name="component"
+				type="configComponents"
+				label="JGLOBAL_CHOOSE_COMPONENT_LABEL"
+				description="JGLOBAL_CHOOSE_COMPONENT_DESC"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/administrator/components/com_config/view/component/tmpl/default_navigation.php b/core/administrator/components/com_config/view/component/tmpl/default_navigation.php
new file mode 100644
index 00000000..c26bbee5
--- /dev/null
+++ b/core/administrator/components/com_config/view/component/tmpl/default_navigation.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="nav nav-list">
+	<?php if ($this->userIsSuperAdmin) : ?>
+		<li class="nav-header"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></li>
+		<li><a href="index.php?option=com_config"><?php echo JText::_('COM_CONFIG_GLOBAL_CONFIGURATION'); ?></a></li>
+		<li class="divider"></li>
+	<?php endif; ?>
+	<li class="nav-header"><?php echo JText::_('COM_CONFIG_COMPONENT_FIELDSET_LABEL'); ?></li>
+	<?php foreach ($this->components as $component) : ?>
+		<?php
+		$active = '';
+		if ($this->currentComponent === $component)
+		{
+			$active = ' class="active"';
+		}
+		?>
+		<li<?php echo $active; ?>>
+			<a href="index.php?option=com_config&view=component&component=<?php echo $component; ?>"><?php echo JText::_($component); ?></a>
+		</li>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/components/com_contact/access.xml b/core/administrator/components/com_contact/access.xml
new file mode 100644
index 00000000..14de10ba
--- /dev/null
+++ b/core/administrator/components/com_contact/access.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_contact">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="JACTION_EDITVALUE_COMPONENT_DESC" />
+	</section>
+	<section name="category">
+		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
+	</section>
+	<section name="fieldgroup">
+		<action name="core.create" title="JACTION_CREATE" description="COM_FIELDS_GROUP_PERMISSION_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_GROUP_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_GROUP_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC" />
+	</section>
+	<section name="field">
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_FIELD_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_FIELD_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC" />
+	</section>
+</access>
\ No newline at end of file
diff --git a/core/administrator/components/com_contact/config.xml b/core/administrator/components/com_contact/config.xml
new file mode 100644
index 00000000..15ee14fa
--- /dev/null
+++ b/core/administrator/components/com_contact/config.xml
@@ -0,0 +1,1104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+
+	<fieldset
+		name="contact"
+		label="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY"
+		description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
+		addfieldpath="/administrator/components/com_fields/models/fields"
+		>
+
+		<field
+			name="contact_layout"
+			type="componentlayout"
+			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_contact"
+			view="contact"
+		/>
+
+		<field
+			name="show_contact_category"
+			type="list"
+			label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
+			description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
+			default="hide"
+			class="chzn-color"
+			>
+			<option value="hide">JHIDE</option>
+			<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
+			<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
+		</field>
+
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			default="10"
+			filter="integer"
+			showon="save_history:1"
+		/>
+
+		<field
+			name="show_contact_list"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
+			description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="presentation_style"
+			type="list"
+			label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
+			description="COM_CONTACT_FIELD_PRESENTATION_DESC"
+			default="sliders"
+			>
+			<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
+			<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
+			<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
+		</field>
+
+		<field
+			name="show_tags"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+			id="show_tags"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_info"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_name"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>	
+
+		<field
+			name="show_position"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"			
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_email"
+			type="radio"
+			label="JGLOBAL_EMAIL"
+			description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="add_mailto_link"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_DESC"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1[AND]show_email:1"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_street_address"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_suburb"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_state"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_postcode"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_country"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_telephone"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_mobile"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_fax"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_webpage"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"			
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_image"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_info:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="image"
+			type="media"
+			label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
+			default=""
+			showon="show_info:1[AND]show_image:1"
+		/>
+
+		<field
+			name="show_misc"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="allow_vcard"
+			type="radio"
+			label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_articles"
+			type="radio"
+			label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
+			description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="articles_display_num"
+			type="list"
+			label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+			description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+			default="10"
+			showon="show_articles:1"
+			>
+			<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="75">J75</option>
+			<option value="100">J100</option>
+			<option value="150">J150</option>
+			<option value="200">J200</option>
+			<option value="250">J250</option>
+			<option value="300">J300</option>
+			<option value="0">JALL</option>
+		</field>
+
+		<field
+			name="show_profile"
+			type="radio"
+			label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
+			description="COM_CONTACT_FIELD_PROFILE_SHOW_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_user_custom_fields"
+			type="fieldgroups"
+			label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
+			description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
+			multiple="true"
+			context="com_users.user"
+			>
+			<option value="-1">JALL</option>
+		</field>
+
+		<field
+			name="show_links"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="linka_name"
+			type="text"
+			label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
+			description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+			size="30"
+			default=""
+			showon="show_links:1"
+		/>
+
+		<field
+			name="linkb_name"
+			type="text"
+			label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
+			description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+			size="30"
+			default=""
+			showon="show_links:1"
+		/>
+
+		<field
+			name="linkc_name"
+			type="text"
+			label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
+			description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+			size="30"
+			default=""
+			showon="show_links:1"
+		/>
+
+		<field
+			name="linkd_name"
+			type="text"
+			label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
+			description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+			size="30"
+			default=""
+			showon="show_links:1"
+		/>
+
+		<field
+			name="linke_name"
+			type="text"
+			label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
+			description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+			size="30"
+			default=""
+			showon="show_links:1"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="Icons"
+		label="COM_CONTACT_ICONS_SETTINGS"
+		description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
+		>
+
+		<field
+			name="contact_icons"
+			type="list"
+			label="COM_CONTACT_FIELD_ICONS_SETTINGS_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_SETTINGS_DESC"
+			default="0"
+			>
+			<option value="0">COM_CONTACT_FIELD_VALUE_ICONS</option>
+			<option value="1">COM_CONTACT_FIELD_VALUE_TEXT</option>
+			<option value="2">COM_CONTACT_FIELD_VALUE_NONE</option>
+		</field>
+
+		<field
+			name="icon_address"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC"
+			hide_none="1"
+			default=""
+			showon="contact_icons:0"
+		/>
+
+		<field
+			name="icon_email"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC"
+			hide_none="1"
+			default=""
+			showon="contact_icons:0"
+		/>
+
+		<field
+			name="icon_telephone"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC"
+			hide_none="1"
+			default=""
+			showon="contact_icons:0"
+		/>
+
+		<field
+			name="icon_mobile"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC"
+			hide_none="1"
+			default=""
+			showon="contact_icons:0"
+		/>
+
+		<field
+			name="icon_fax"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_FAX_DESC"
+			hide_none="1"
+			default=""
+			showon="contact_icons:0"
+		/>
+
+		<field
+			name="icon_misc"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_MISC_DESC"
+			hide_none="1"
+			default=""
+			showon="contact_icons:0"
+		/>
+	</fieldset>
+
+	<fieldset
+		name="Category"
+		label="JCATEGORY"
+		description="COM_CONTACT_FIELD_CONFIG_CATEGORY_DESC"
+		>
+
+		<field
+			name="category_layout"
+			type="componentlayout"
+			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_contact"
+			view="category"
+		/>
+
+		<field
+			name="show_category_title"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_TITLE"
+			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_description"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_description_image"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="maxLevel"
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
+			<option value="-1">JALL</option>
+			<option value="0">JNONE</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field
+			name="show_subcat_desc"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="maxLevel:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_empty_categories"
+			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="maxLevel:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_cat_items"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_cat_tags"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_CAT_TAGS_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_CAT_TAGS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="categories"
+		label="JCATEGORIES"
+		description="COM_CONTACT_FIELD_CONFIG_CATEGORIES_DESC"
+		>
+
+		<field
+			name="show_base_description"
+			type="radio"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="maxLevelcat"
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
+			<option value="-1">JALL</option>
+			<option value="0">JNONE</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field
+			name="show_subcat_desc_cat"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="maxLevelcat:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_empty_categories_cat"
+			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="maxLevelcat:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_cat_items_cat"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="contacts"
+		label="JGLOBAL_LIST_LAYOUT_OPTIONS"
+		description="COM_CONTACT_FIELD_CONFIG_TABLE_OF_CONTACTS_DESC"
+		>
+
+		<field
+			name="filter_field"
+			type="radio"
+			label="JGLOBAL_FILTER_FIELD_LABEL"
+			description="JGLOBAL_FILTER_FIELD_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_pagination_limit"
+			type="radio"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_headings"
+			type="radio"
+			label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			description="JGLOBAL_SHOW_HEADINGS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_image_heading"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_position_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_email_headings"
+			type="radio"
+			label="JGLOBAL_EMAIL"
+			description="COM_CONTACT_FIELD_CONFIG_EMAIL_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_telephone_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_mobile_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_fax_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_suburb_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_state_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_country_headings"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_headings:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_pagination"
+			type="list"
+			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
+			default="2"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="2">JGLOBAL_AUTO</option>
+		</field>
+
+		<field
+			name="show_pagination_results"
+			type="radio"
+			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_pagination:1,2"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="initial_sort"
+			type="list"
+			label="COM_CONTACT_FIELD_INITIAL_SORT_LABEL"
+			description="COM_CONTACT_FIELD_INITIAL_SORT_DESC"
+			default="ordering"
+			validate="options"
+			>
+			<option value="name">COM_CONTACT_FIELD_VALUE_NAME</option>
+			<option value="sortname">COM_CONTACT_FIELD_VALUE_SORT_NAME</option>
+			<option value="ordering">COM_CONTACT_FIELD_VALUE_ORDERING</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="Contact_Form"
+		label="COM_CONTACT_FIELD_CONFIG_CONTACT_FORM"
+		description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"
+		>
+
+		<field
+			name="captcha"
+			type="plugins"
+			label="COM_CONTACT_FIELD_CAPTCHA_LABEL"
+			description="COM_CONTACT_FIELD_CAPTCHA_DESC"
+			folder="captcha"
+			filter="cmd"
+			useglobal="true"
+			>
+			<option value="0">JOPTION_DO_NOT_USE</option>
+		</field>
+
+		<field
+			name="show_email_form"
+			type="radio"
+			label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
+			description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_email_copy"
+			type="radio"
+			label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
+			description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_email_form:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="banned_email"
+			type="textarea"
+			label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
+			default=""
+			rows="3"
+			cols="30"
+			showon="show_email_form:1"
+		/>
+
+		<field
+			name="banned_subject"
+			type="textarea"
+			label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
+			default=""
+			rows="3"
+			cols="30"
+			showon="show_email_form:1"
+		/>
+
+		<field
+			name="banned_text"
+			type="textarea"
+			label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
+			default=""
+			rows="3"
+			cols="30"
+			showon="show_email_form:1"
+		/>
+
+		<field
+			name="validate_session"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_email_form:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="custom_reply"
+			type="radio"
+			label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="show_email_form:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="redirect"
+			type="text"
+			label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+			default=""
+			size="30"
+			showon="show_email_form:1"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="integration"
+		label="JGLOBAL_INTEGRATION_LABEL"
+		description="COM_CONTACT_CONFIG_INTEGRATION_SETTINGS_DESC"
+		>
+
+		<field
+			name="show_feed_link"
+			type="radio"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="sef_advanced"
+			type="radio"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			label="JGLOBAL_SEF_ADVANCED_LABEL"
+			description="JGLOBAL_SEF_ADVANCED_DESC"
+			filter="integer"
+		>
+			<option value="0">JGLOBAL_SEF_ADVANCED_LEGACY</option>
+			<option value="1">JGLOBAL_SEF_ADVANCED_MODERN</option>
+		</field>
+
+		<field
+			name="sef_ids"
+			type="radio"
+			label="JGLOBAL_SEF_NOIDS_LABEL"
+			description="JGLOBAL_SEF_NOIDS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="sef_advanced:1"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			validate="rules"
+			filter="rules"
+			component="com_contact"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_contact/contact.php b/core/administrator/components/com_contact/contact.php
new file mode 100644
index 00000000..af2db364
--- /dev/null
+++ b/core/administrator/components/com_contact/contact.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_contact'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('contact');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_contact/contact.xml b/core/administrator/components/com_contact/contact.xml
new file mode 100644
index 00000000..b285029f
--- /dev/null
+++ b/core/administrator/components/com_contact/contact.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_contact</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CONTACT_XML_DESCRIPTION</description>
+
+	<install> <!-- Runs on install -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/install.mysql.utf8.sql</file>
+		</sql>
+	</install>
+	<uninstall> <!-- Runs on uninstall -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/uninstall.mysql.utf8.sql</file>
+		</sql>
+	</uninstall>
+
+	<files folder="site">
+		<filename>contact.php</filename>
+		<filename>controller.php</filename>
+		<filename>metadata.xml</filename>
+		<filename>router.php</filename>
+		<folder>helpers</folder>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_contact.ini</language>
+	</languages>
+
+	<administration>
+		<menu img="class:contact">COM_CONTACT</menu>
+		<submenu>
+			<!--
+				Note that all & must be escaped to &amp; for the file to be valid
+				XML and be parsed by the installer
+			-->
+			<menu link="option=com_contact" img="class:contact"
+				alt="Contact/Contacts">COM_CONTACT_CONTACTS</menu>
+			<menu link="option=com_categories&amp;extension=com_contact"
+				view="categories" img="class:contact-cat" alt="Contacts/Categories">COM_CONTACT_CATEGORIES</menu>
+		</submenu>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>contact.php</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>elements</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_contact.ini</language>
+			<language tag="en-GB">language/en-GB.com_contact.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_contact/controller.php b/core/administrator/components/com_contact/controller.php
new file mode 100644
index 00000000..51691951
--- /dev/null
+++ b/core/administrator/components/com_contact/controller.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Component Controller
+ *
+ * @since  1.5
+ */
+class ContactController extends JControllerLegacy
+{
+	/**
+	 * The default view.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $default_view = 'contacts';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  ContactController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		JLoader::register('ContactHelper', JPATH_ADMINISTRATOR . '/components/com_contact/helpers/contact.php');
+
+		$view   = $this->input->get('view', 'contacts');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'contact' && $layout == 'edit' && !$this->checkEditId('com_contact.edit.contact', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contacts', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_contact/controllers/contact.php b/core/administrator/components/com_contact/controllers/contact.php
new file mode 100644
index 00000000..2f69d30b
--- /dev/null
+++ b/core/administrator/components/com_contact/controllers/contact.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Controller for a single contact
+ *
+ * @since  1.6
+ */
+class ContactControllerContact extends JControllerForm
+{
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
+		$allow = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the URL check it.
+			$allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId);
+		}
+
+		if ($allow === null)
+		{
+			// In the absense of better information, revert to the component permissions.
+			return parent::allowAdd($data);
+		}
+
+		return $allow;
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+		// Since there is no asset tracking, fallback to the component permissions.
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Get the item.
+		$item = $this->getModel()->getItem($recordId);
+
+		// Since there is no item, return false.
+		if (empty($item))
+		{
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		// Check if can edit own core.edit.own.
+		$canEditOwn = $user->authorise('core.edit.own', $this->option . '.category.' . (int) $item->catid) && $item->created_by == $user->id;
+
+		// Check the category core.edit permissions.
+		return $canEditOwn || $user->authorise('core.edit', $this->option . '.category.' . (int) $item->catid);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		/** @var ContactModelContact $model */
+		$model = $this->getModel('Contact', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contacts' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+}
diff --git a/core/administrator/components/com_contact/controllers/contacts.php b/core/administrator/components/com_contact/controllers/contacts.php
new file mode 100644
index 00000000..b800b51f
--- /dev/null
+++ b/core/administrator/components/com_contact/controllers/contacts.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Contacts list controller class.
+ *
+ * @since  1.6
+ */
+class ContactControllerContacts extends JControllerAdmin
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('unfeatured',	'featured');
+	}
+
+	/**
+	 * Method to toggle the featured setting of a list of contacts.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function featured()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('featured' => 1, 'unfeatured' => 0);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		// Get the model.
+		/** @var ContactModelContact $model */
+		$model  = $this->getModel();
+
+		// Access checks.
+		foreach ($ids as $i => $id)
+		{
+			$item = $model->getItem($id);
+
+			if (!JFactory::getUser()->authorise('core.edit.state', 'com_contact.category.' . (int) $item->catid))
+			{
+				// Prune items that you can't change.
+				unset($ids[$i]);
+				JError::raiseNotice(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+			}
+		}
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_CONTACT_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Publish the items.
+			if (!$model->featured($ids, $value))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+
+			if ($value == 1)
+			{
+				$message = JText::plural('COM_CONTACT_N_ITEMS_FEATURED', count($ids));
+			}
+			else
+			{
+				$message = JText::plural('COM_CONTACT_N_ITEMS_UNFEATURED', count($ids));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_contact&view=contacts', $message);
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  The prefix for the PHP class name.
+	 * @param   array   $config  Array of configuration parameters.
+	 *
+	 * @return  JModelLegacy
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Contact', $prefix = 'ContactModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_contact/helpers/associations.php b/core/administrator/components/com_contact/helpers/associations.php
new file mode 100644
index 00000000..be5ebdbe
--- /dev/null
+++ b/core/administrator/components/com_contact/helpers/associations.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Association\AssociationExtensionHelper;
+
+JTable::addIncludePath(__DIR__ . '/../tables');
+
+/**
+ * Content associations helper.
+ *
+ * @since  3.7.0
+ */
+class ContactAssociationsHelper extends AssociationExtensionHelper
+{
+	/**
+	 * The extension name
+	 *
+	 * @var     array   $extension
+	 *
+	 * @since   3.7.0
+	 */
+	protected $extension = 'com_contact';
+
+	/**
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
+	 *
+	 * @since   3.7.0
+	 */
+	protected $itemTypes = array('contact', 'category');
+
+	/**
+	 * Has the extension association support
+	 *
+	 * @var     boolean   $associationsSupport
+	 *
+	 * @since   3.7.0
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'contact':
+				$table = JTable::getInstance('Contact', 'ContactTable');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('Category');
+				break;
+		}
+
+		if (empty($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since   3.7.0
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+			switch ($typeName)
+			{
+				case 'contact':
+					$fields['title'] = 'a.name';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['category'] = true;
+					$support['save2copy'] = true;
+
+					$tables = array(
+						'a' => '#__contact_details'
+					);
+
+					$title = 'contact';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['level'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}
diff --git a/core/administrator/components/com_contact/helpers/contact.php b/core/administrator/components/com_contact/helpers/contact.php
new file mode 100644
index 00000000..fa33ca7b
--- /dev/null
+++ b/core/administrator/components/com_contact/helpers/contact.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contact component helper.
+ *
+ * @since  1.6
+ */
+class ContactHelper extends JHelperContent
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_CONTACT_SUBMENU_CONTACTS'),
+			'index.php?option=com_contact&view=contacts',
+			$vName == 'contacts'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_CONTACT_SUBMENU_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_contact',
+			$vName == 'categories'
+		);
+
+		if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_contact')->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_contact.contact',
+				$vName == 'fields.fields'
+			);
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_fields&view=groups&context=com_contact.contact',
+				$vName == 'fields.groups'
+			);
+		}
+	}
+
+	/**
+	 * Adds Count Items for Category Manager.
+	 *
+	 * @param   stdClass[]  $items  The contact category objects
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.5
+	 */
+	public static function countItems(&$items)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('published AS state, count(*) AS count')
+				->from($db->qn('#__contact_details'))
+				->where('catid = ' . (int) $item->id)
+				->group('published');
+			$db->setQuery($query);
+			$contacts = $db->loadObjectList();
+
+			foreach ($contacts as $contact)
+			{
+				if ($contact->state == 1)
+				{
+					$item->count_published = $contact->count;
+				}
+
+				if ($contact->state == 0)
+				{
+					$item->count_unpublished = $contact->count;
+				}
+
+				if ($contact->state == 2)
+				{
+					$item->count_archived = $contact->count;
+				}
+
+				if ($contact->state == -2)
+				{
+					$item->count_trashed = $contact->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Adds Count Items for Tag Manager.
+	 *
+	 * @param   stdClass[]  $items      The banner tag objects
+	 * @param   string      $extension  The name of the active view.
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.6
+	 */
+	public static function countTagItems(&$items, $extension)
+	{
+		$db = JFactory::getDbo();
+		$parts     = explode('.', $extension);
+		$section   = null;
+
+		if (count($parts) > 1)
+		{
+			$section = $parts[1];
+		}
+
+		$join = $db->qn('#__contact_details') . ' AS c ON ct.content_item_id=c.id';
+
+		if ($section === 'category')
+		{
+			$join = $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id';
+		}
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('published as state, count(*) AS count')
+				->from($db->qn('#__contentitem_tag_map') . 'AS ct ')
+				->where('ct.tag_id = ' . (int) $item->id)
+				->where('ct.type_alias =' . $db->q($extension))
+				->join('LEFT', $join)
+				->group('published');
+
+			$db->setQuery($query);
+			$contacts = $db->loadObjectList();
+
+			foreach ($contacts as $contact)
+			{
+				if ($contact->state == 1)
+				{
+					$item->count_published = $contact->count;
+				}
+
+				if ($contact->state == 0)
+				{
+					$item->count_unpublished = $contact->count;
+				}
+
+				if ($contact->state == 2)
+				{
+					$item->count_archived = $contact->count;
+				}
+
+				if ($contact->state == -2)
+				{
+					$item->count_trashed = $contact->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Returns a valid section for contacts. If it is not valid then null
+	 * is returned.
+	 *
+	 * @param   string  $section  The section to get the mapping for
+	 * @param   object  $item     optional item object
+	 *
+	 * @return  string|null  The new section
+	 *
+	 * @since   3.7.0
+	 */
+	public static function validateSection($section, $item)
+	{
+		if (JFactory::getApplication()->isClient('site') && $section == 'contact' && $item instanceof JForm)
+		{
+			// The contact form needs to be the mail section
+			$section = 'mail';
+		}
+
+		if (JFactory::getApplication()->isClient('site') && $section == 'category')
+		{
+			// The contact form needs to be the mail section
+			$section = 'contact';
+		}
+
+		if ($section != 'mail' && $section != 'contact')
+		{
+			// We don't know other sections
+			return null;
+		}
+
+		return $section;
+	}
+
+	/**
+	 * Returns valid contexts
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getContexts()
+	{
+		JFactory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
+
+		$contexts = array(
+			'com_contact.contact'    => JText::_('COM_CONTACT_FIELDS_CONTEXT_CONTACT'),
+			'com_contact.mail'       => JText::_('COM_CONTACT_FIELDS_CONTEXT_MAIL'),
+			'com_contact.categories' => JText::_('JCATEGORY')
+		);
+
+		return $contexts;
+	}
+}
diff --git a/core/administrator/components/com_contact/helpers/html/contact.php b/core/administrator/components/com_contact/helpers/html/contact.php
new file mode 100644
index 00000000..4e091597
--- /dev/null
+++ b/core/administrator/components/com_contact/helpers/html/contact.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ContactHelper', JPATH_ADMINISTRATOR . '/components/com_contact/helpers/contact.php');
+
+/**
+ * Contact HTML helper class.
+ *
+ * @since  1.6
+ */
+abstract class JHtmlContact
+{
+	/**
+	 * Get the associated language flags
+	 *
+	 * @param   integer  $contactid  The item id to search associations
+	 *
+	 * @return  string  The language HTML
+	 *
+	 * @throws  Exception
+	 */
+	public static function association($contactid)
+	{
+		// Defaults
+		$html = '';
+
+		// Get the associations
+		if ($associations = JLanguageAssociations::getAssociations('com_contact', '#__contact_details', 'com_contact.item', $contactid))
+		{
+			foreach ($associations as $tag => $associated)
+			{
+				$associations[$tag] = (int) $associated->id;
+			}
+
+			// Get the associated contact items
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('c.id, c.name as title')
+				->select('l.sef as lang_sef, lang_code')
+				->from('#__contact_details as c')
+				->select('cat.title as category_title')
+				->join('LEFT', '#__categories as cat ON cat.id=c.catid')
+				->where('c.id IN (' . implode(',', array_values($associations)) . ')')
+				->where('c.id != ' . $contactid)
+				->join('LEFT', '#__languages as l ON c.language=l.lang_code')
+				->select('l.image')
+				->select('l.title as language_title');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				throw new Exception($e->getMessage(), 500, $e);
+			}
+
+			if ($items)
+			{
+				foreach ($items as &$item)
+				{
+					$text = strtoupper($item->lang_sef);
+					$url = JRoute::_('index.php?option=com_contact&task=contact.edit&id=' . (int) $item->id);
+
+					$tooltip = htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br />' . JText::sprintf('JCATEGORY_SPRINTF', $item->category_title);
+					$classes = 'hasPopover label label-association label-' . $item->lang_sef;
+
+					$item->link = '<a href="' . $url . '" title="' . $item->language_title . '" class="' . $classes
+						. '" data-content="' . $tooltip . '" data-placement="top">'
+						. $text . '</a>';
+				}
+			}
+
+			JHtml::_('bootstrap.popover');
+
+			$html = JLayoutHelper::render('joomla.content.associations', $items);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Show the featured/not-featured icon.
+	 *
+	 * @param   integer  $value      The featured value.
+	 * @param   integer  $i          Id of the item.
+	 * @param   boolean  $canChange  Whether the value can be changed or not.
+	 *
+	 * @return  string	The anchor tag to toggle featured/unfeatured contacts.
+	 *
+	 * @since   1.6
+	 */
+	public static function featured($value = 0, $i, $canChange = true)
+	{
+
+		// Array of image, task, title, action
+		$states = array(
+			0 => array('unfeatured', 'contacts.featured', 'COM_CONTACT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
+			1 => array('featured', 'contacts.unfeatured', 'JFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
+		);
+		$state = ArrayHelper::getValue($states, (int) $value, $states[1]);
+		$icon  = $state[0];
+
+		if ($canChange)
+		{
+			$html = '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="btn btn-micro hasTooltip'
+				. ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3])
+				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+		}
+		else
+		{
+			$html = '<a class="btn btn-micro hasTooltip disabled' . ($value == 1 ? ' active' : '') . '" title="'
+			. JHtml::_('tooltipText', $state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_contact/models/contact.php b/core/administrator/components/com_contact/models/contact.php
new file mode 100644
index 00000000..936591f4
--- /dev/null
+++ b/core/administrator/components/com_contact/models/contact.php
@@ -0,0 +1,663 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ContactHelper', JPATH_ADMINISTRATOR . '/components/com_contact/helpers/contact.php');
+
+/**
+ * Item Model for a Contact.
+ *
+ * @since  1.6
+ */
+class ContactModelContact extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $typeAlias = 'com_contact.contact';
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var    string
+	 * @since  3.4.4
+	 */
+	protected $associationsContext = 'com_contact.item';
+
+	/**
+	 * Batch copy/move command. If set to false, the batch copy/move command is not supported
+	 *
+	 * @var  string
+	 */
+	protected $batch_copymove = 'category_id';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var array
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id'   => 'batchLanguage',
+		'tag'           => 'batchTag',
+		'user_id'       => 'batchUser',
+	);
+
+	/**
+	 * Batch copy items to a new category or current.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		$categoryId = (int) $value;
+
+		$newIds = array();
+
+		if (!parent::checkCategoryId($categoryId))
+		{
+			return false;
+		}
+
+		// Parent exists so we proceed
+		while (!empty($pks))
+		{
+			// Pop the first ID off the stack
+			$pk = array_shift($pks);
+
+			$this->table->reset();
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Alter the title & alias
+			$data = $this->generateNewTitle($categoryId, $this->table->alias, $this->table->name);
+			$this->table->name = $data['0'];
+			$this->table->alias = $data['1'];
+
+			// Reset the ID because we are making a copy
+			$this->table->id = 0;
+
+			// New category ID
+			$this->table->catid = $categoryId;
+
+			// Unpublish because we are making a copy
+			$this->table->published = 0;
+
+			// TODO: Deal with ordering?
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $this->table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch change a linked user.
+	 *
+	 * @param   integer  $value     The new value matching a User ID.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	protected function batchUser($value, $pks, $contexts)
+	{
+		foreach ($pks as $pk)
+		{
+			if ($this->user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->table->reset();
+				$this->table->load($pk);
+				$this->table->user_id = (int) $value;
+
+				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+
+				if (!$this->table->store())
+				{
+					$this->setError($this->table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->published != -2)
+			{
+				return false;
+			}
+
+			return JFactory::getUser()->authorise('core.delete', 'com_contact.category.' . (int) $record->catid);
+		}
+	}
+
+	/**
+	 * Method to test whether a record can have its state edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		// Check against the category.
+		if (!empty($record->catid))
+		{
+			return JFactory::getUser()->authorise('core.edit.state', 'com_contact.category.' . (int) $record->catid);
+		}
+
+		// Default to component settings if category not known.
+		return parent::canEditState($record);
+	}
+
+	/**
+	 * Returns a Table object, always creating it
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Contact', $prefix = 'ContactTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		JForm::addFieldPath(JPATH_ADMINISTRATOR . '/components/com_users/models/fields');
+
+		// Get the form.
+		$form = $this->loadForm('com_contact.contact', 'contact', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('featured', 'disabled', 'true');
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('featured', 'filter', 'unset');
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Convert the metadata field to an array.
+			$registry = new Registry($item->metadata);
+			$item->metadata = $registry->toArray();
+		}
+
+		// Load associated contact items
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$item->associations = array();
+
+			if ($item->id != null)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_contact', '#__contact_details', 'com_contact.item', $item->id);
+
+				foreach ($associations as $tag => $association)
+				{
+					$item->associations[$tag] = $association->id;
+				}
+			}
+		}
+
+		// Load item tags
+		if (!empty($item->id))
+		{
+			$item->tags = new JHelperTags;
+			$item->tags->getTagIds($item->id, 'com_contact.contact');
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		$app = JFactory::getApplication();
+
+		// Check the session for previously entered form data.
+		$data = $app->getUserState('com_contact.edit.contact.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Prime some default values.
+			if ($this->getState('contact.id') == 0)
+			{
+				$data->set('catid', $app->input->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int'));
+			}
+		}
+
+		$this->preprocessData('com_contact.contact', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.0
+	 */
+	public function save($data)
+	{
+		$input = JFactory::getApplication()->input;
+
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// Cast catid to integer for comparison
+		$catid = (int) $data['catid'];
+
+		// Check if New Category exists
+		if ($catid > 0)
+		{
+			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_contact');
+		}
+
+		// Save New Category
+		if ($catid == 0 && $this->canCreateCategory())
+		{
+			$table = array();
+			$table['title'] = $data['catid'];
+			$table['parent_id'] = 1;
+			$table['extension'] = 'com_contact';
+			$table['language'] = $data['language'];
+			$table['published'] = 1;
+
+			// Create new category and get catid back
+			$data['catid'] = CategoriesHelper::createCategory($table);
+		}
+
+		// Alter the name for save as copy
+		if ($input->get('task') == 'save2copy')
+		{
+			$origTable = clone $this->getTable();
+			$origTable->load($input->getInt('id'));
+
+			if ($data['name'] == $origTable->name)
+			{
+				list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['name']);
+				$data['name'] = $name;
+				$data['alias'] = $alias;
+			}
+			else
+			{
+				if ($data['alias'] == $origTable->alias)
+				{
+					$data['alias'] = '';
+				}
+			}
+
+			$data['published'] = 0;
+		}
+
+		$links = array('linka', 'linkb', 'linkc', 'linkd', 'linke');
+
+		foreach ($links as $link)
+		{
+			if ($data['params'][$link])
+			{
+				$data['params'][$link] = JStringPunycode::urlToPunycode($data['params'][$link]);
+			}
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  The JTable object
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		$date = JFactory::getDate()->toSql();
+
+		$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+
+		$table->generateAlias();
+
+		if (empty($table->id))
+		{
+			// Set the values
+			$table->created = $date;
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__contact_details'));
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			// Set the values
+			$table->modified = $date;
+			$table->modified_by = JFactory::getUser()->id;
+		}
+
+		// Increment the content version number.
+		$table->version++;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   JTable  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return array('catid = ' . (int) $table->catid);
+	}
+
+	/**
+	 * Preprocess the form.
+	 *
+	 * @param   JForm   $form   Form object.
+	 * @param   object  $data   Data object.
+	 * @param   string  $group  Group name.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0.3
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		// Determine correct permissions to check.
+		if ($this->getState('contact.id'))
+		{
+			// Existing record. Can only edit in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.edit');
+		}
+		else
+		{
+			// New record. Can only create in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.create');
+		}
+
+		if ($this->canCreateCategory())
+		{
+			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+		}
+
+		// Association contact items
+		if (JLanguageAssociations::isEnabled())
+		{
+			$languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc');
+
+			if (count($languages) > 1)
+			{
+				$addform = new SimpleXMLElement('<form />');
+				$fields = $addform->addChild('fields');
+				$fields->addAttribute('name', 'associations');
+				$fieldset = $fields->addChild('fieldset');
+				$fieldset->addAttribute('name', 'item_associations');
+
+				foreach ($languages as $language)
+				{
+					$field = $fieldset->addChild('field');
+					$field->addAttribute('name', $language->lang_code);
+					$field->addAttribute('type', 'modal_contact');
+					$field->addAttribute('language', $language->lang_code);
+					$field->addAttribute('label', $language->title);
+					$field->addAttribute('translate_label', 'false');
+					$field->addAttribute('select', 'true');
+					$field->addAttribute('new', 'true');
+					$field->addAttribute('edit', 'true');
+					$field->addAttribute('clear', 'true');
+				}
+
+				$form->load($addform, false);
+			}
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to toggle the featured setting of contacts.
+	 *
+	 * @param   array    $pks    The ids of the items to toggle.
+	 * @param   integer  $value  The value to toggle to.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function featured($pks, $value = 0)
+	{
+		// Sanitize the ids.
+		$pks = ArrayHelper::toInteger((array) $pks);
+
+		if (empty($pks))
+		{
+			$this->setError(JText::_('COM_CONTACT_NO_ITEM_SELECTED'));
+
+			return false;
+		}
+
+		$table = $this->getTable();
+
+		try
+		{
+			$db = $this->getDbo();
+
+			$query = $db->getQuery(true);
+			$query->update('#__contact_details');
+			$query->set('featured = ' . (int) $value);
+			$query->where('id IN (' . implode(',', $pks) . ')');
+			$db->setQuery($query);
+
+			$db->execute();
+		}
+		catch (Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		$table->reorder();
+
+		// Clean component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $category_id  The id of the parent.
+	 * @param   string   $alias        The alias.
+	 * @param   string   $name         The title.
+	 *
+	 * @return  array  Contains the modified title and alias.
+	 *
+	 * @since   3.1
+	 */
+	protected function generateNewTitle($category_id, $alias, $name)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'catid' => $category_id)))
+		{
+			if ($name == $table->name)
+			{
+				$name = StringHelper::increment($name);
+			}
+
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($name, $alias);
+	}
+
+	/**
+	 * Is the user allowed to create an on the fly category?
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.1
+	 */
+	private function canCreateCategory()
+	{
+		return JFactory::getUser()->authorise('core.create', 'com_contact');
+	}
+}
diff --git a/core/administrator/components/com_contact/models/contacts.php b/core/administrator/components/com_contact/models/contacts.php
new file mode 100644
index 00000000..287f732c
--- /dev/null
+++ b/core/administrator/components/com_contact/models/contacts.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Methods supporting a list of contact records.
+ *
+ * @since  1.6
+ */
+class ContactModelContacts extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_id', 'category_title',
+				'user_id', 'a.user_id',
+				'published', 'a.published',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language', 'language_title',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'ul.name', 'linked_user',
+				'tag',
+				'level', 'c.level',
+			);
+
+			$assoc = JLanguageAssociations::isEnabled();
+
+			if ($assoc)
+			{
+				$config['filter_fields'][] = 'association';
+			}
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.name', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+		$this->setState('filter.category_id',
+						$this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'string')
+		);
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
+		$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
+		$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', null, 'int'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('filter.language', $forcedLanguage);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.tag');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$db->quoteName(
+				explode(', ', $this->getState(
+					'list.select',
+					'a.id, a.name, a.alias, a.checked_out, a.checked_out_time, a.catid, a.user_id' .
+					', a.published, a.access, a.created, a.created_by, a.ordering, a.featured, a.language' .
+					', a.publish_up, a.publish_down'
+					)
+				)
+			)
+		);
+		$query->from($db->quoteName('#__contact_details', 'a'));
+
+		// Join over the users for the linked user.
+		$query->select(
+				array(
+					$db->quoteName('ul.name', 'linked_user'),
+					$db->quoteName('ul.email')
+				)
+			)
+			->join(
+				'LEFT',
+				$db->quoteName('#__users', 'ul') . ' ON ' . $db->quoteName('ul.id') . ' = ' . $db->quoteName('a.user_id')
+			);
+
+		// Join over the language
+		$query->select($db->quoteName('l.title', 'language_title'))
+			->select($db->quoteName('l.image', 'language_image'))
+			->join(
+				'LEFT',
+				$db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = ' . $db->quoteName('a.language')
+			);
+
+		// Join over the users for the checked out user.
+		$query->select($db->quoteName('uc.name', 'editor'))
+			->join(
+				'LEFT',
+				$db->quoteName('#__users', 'uc') . ' ON ' . $db->quoteName('uc.id') . ' = ' . $db->quoteName('a.checked_out')
+			);
+
+		// Join over the asset groups.
+		$query->select($db->quoteName('ag.title', 'access_level'))
+			->join(
+				'LEFT',
+				$db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->quoteName('ag.id') . ' = ' . $db->quoteName('a.access')
+			);
+
+		// Join over the categories.
+		$query->select($db->quoteName('c.title', 'category_title'))
+			->join(
+				'LEFT',
+				$db->quoteName('#__categories', 'c') . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName('a.catid')
+			);
+
+		// Join over the associations.
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$query->select('COUNT(' . $db->quoteName('asso2.id') . ') > 1 as ' . $db->quoteName('association'))
+				->join(
+					'LEFT',
+					$db->quoteName('#__associations', 'asso') . ' ON ' . $db->quoteName('asso.id') . ' = ' . $db->quoteName('a.id')
+					. ' AND ' . $db->quoteName('asso.context') . ' = ' . $db->quote('com_contact.item')
+				)
+				->join(
+					'LEFT',
+					$db->quoteName('#__associations', 'asso2') . ' ON ' . $db->quoteName('asso2.key') . ' = ' . $db->quoteName('asso.key')
+				)
+				->group(
+					$db->quoteName(
+						array(
+							'a.id',
+							'a.name',
+							'a.alias',
+							'a.checked_out',
+							'a.checked_out_time',
+							'a.catid',
+							'a.user_id',
+							'a.published',
+							'a.access',
+							'a.created',
+							'a.created_by',
+							'a.ordering',
+							'a.featured',
+							'a.language',
+							'a.publish_up',
+							'a.publish_down',
+							'ul.name' ,
+							'ul.email',
+							'l.title' ,
+							'l.image' ,
+							'uc.name' ,
+							'ag.title' ,
+							'c.title',
+							'c.level'
+						)
+					)
+				);
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where($db->quoteName('a.access') . ' = ' . (int) $access);
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where($db->quoteName('a.access') . ' IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where($db->quoteName('a.published') . ' = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(' . $db->quoteName('a.published') . ' = 0 OR ' . $db->quoteName('a.published') . ' = 1)');
+		}
+
+		// Filter by a single or group of categories.
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId);
+		}
+		elseif (is_array($categoryId))
+		{
+			$query->where($db->quoteName('a.catid') . ' IN (' . implode(',', ArrayHelper::toInteger($categoryId)) . ')');
+		}
+
+		// Filter by search in name.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where(
+					'(' . $db->quoteName('a.name') . ' LIKE ' . $search . ' OR ' . $db->quoteName('a.alias') . ' LIKE ' . $search . ')'
+				);
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where($db->quoteName('a.language') . ' = ' . $db->quote($language));
+		}
+
+		// Filter by a single tag.
+		$tagId = $this->getState('filter.tag');
+
+		if (is_numeric($tagId))
+		{
+			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId)
+				->join(
+					'LEFT',
+					$db->quoteName('#__contentitem_tag_map', 'tagmap')
+					. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
+					. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_contact.contact')
+				);
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where('c.level <= ' . (int) $level);
+		}
+
+		// Add the list ordering clause.
+		$orderCol = $this->state->get('list.ordering', 'a.name');
+		$orderDirn = $this->state->get('list.direction', 'asc');
+
+		if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
+		{
+			$orderCol = $db->quoteName('c.title') . ' ' . $orderDirn . ', ' . $db->quoteName('a.ordering');
+		}
+
+		$query->order($db->escape($orderCol . ' ' . $orderDirn));
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_contact/models/fields/modal/contact.php b/core/administrator/components/com_contact/models/fields/modal/contact.php
new file mode 100644
index 00000000..e03511d6
--- /dev/null
+++ b/core/administrator/components/com_contact/models/fields/modal/contact.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Supports a modal contact picker.
+ *
+ * @since  1.6
+ */
+class JFormFieldModal_Contact extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   1.6
+	 */
+	protected $type = 'Modal_Contact';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
+
+		// Load language
+		JFactory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
+
+		// The active contact id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Create the modal id.
+		$modalId = 'Contact_' . $this->id;
+
+		// Add the modal field script to the document head.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true));
+
+		// Script to proxy the select modal function to the modal-fields.js file.
+		if ($allowSelect)
+		{
+			static $scriptSelect = null;
+
+			if (is_null($scriptSelect))
+			{
+				$scriptSelect = array();
+			}
+
+			if (!isset($scriptSelect[$this->id]))
+			{
+				JFactory::getDocument()->addScriptDeclaration("
+				function jSelectContact_" . $this->id . "(id, title, object) {
+					window.processModalSelect('Contact', '" . $this->id . "', id, title, '', object);
+				}
+				");
+
+				$scriptSelect[$this->id] = true;
+			}
+		}
+
+		// Setup variables for display.
+		$linkContacts = 'index.php?option=com_contact&amp;view=contacts&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$linkContact  = 'index.php?option=com_contact&amp;view=contact&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$modalTitle   = JText::_('COM_CONTACT_CHANGE_CONTACT');
+
+		if (isset($this->element['language']))
+		{
+			$linkContacts .= '&amp;forcedLanguage=' . $this->element['language'];
+			$linkContact   .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle     .= ' &#8212; ' . $this->element['label'];
+		}
+
+		$urlSelect = $linkContacts . '&amp;function=jSelectContact_' . $this->id;
+		$urlEdit   = $linkContact . '&amp;task=contact.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
+		$urlNew    = $linkContact . '&amp;task=contact.add';
+
+		if ($value)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('name'))
+				->from($db->quoteName('#__contact_details'))
+				->where($db->quoteName('id') . ' = ' . (int) $value);
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		$title = empty($title) ? JText::_('COM_CONTACT_SELECT_A_CONTACT') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The current contact display field.
+		$html  = '<span class="input-append">';
+		$html .= '<input class="input-medium" id="' . $this->id . '_name" type="text" value="' . $title . '" disabled="disabled" size="35" />';
+
+		// Select contact button
+		if ($allowSelect)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_select"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalSelect' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CONTACT_CHANGE_CONTACT') . '">'
+				. '<span class="icon-file" aria-hidden="true"></span> ' . JText::_('JSELECT')
+				. '</a>';
+		}
+
+		// New contact button
+		if ($allowNew)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_new"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalNew' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CONTACT_NEW_CONTACT') . '">'
+				. '<span class="icon-new" aria-hidden="true"></span> ' . JText::_('JACTION_CREATE')
+				. '</a>';
+		}
+
+		// Edit contact button
+		if ($allowEdit)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_edit"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalEdit' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CONTACT_EDIT_CONTACT') . '">'
+				. '<span class="icon-edit" aria-hidden="true"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
+		}
+
+		// Clear contact button
+		if ($allowClear)
+		{
+			$html .= '<a'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_clear"'
+				. ' href="#"'
+				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
+				. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+				. '</a>';
+		}
+
+		$html .= '</span>';
+
+		// Select contact modal
+		if ($allowSelect)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalSelect' . $modalId,
+				array(
+					'title'       => $modalTitle,
+					'url'         => $urlSelect,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+				)
+			);
+		}
+
+		// New contact modal
+		if ($allowNew)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalNew' . $modalId,
+				array(
+					'title'       => JText::_('COM_CONTACT_NEW_CONTACT'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlNew,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'add\', \'contact\', \'cancel\', \'contact-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'add\', \'contact\', \'save\', \'contact-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'add\', \'contact\', \'apply\', \'contact-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Edit contact modal.
+		if ($allowEdit)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalEdit' . $modalId,
+				array(
+					'title'       => JText::_('COM_CONTACT_EDIT_CONTACT'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlEdit,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id
+							. '\', \'edit\', \'contact\', \'cancel\', \'contact-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'edit\', \'contact\', \'save\', \'contact-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'edit\', \'contact\', \'apply\', \'contact-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Note: class='required' for client side validation.
+		$class = $this->required ? ' class="required modal-value"' : '';
+
+		$html .= '<input type="hidden" id="' . $this->id . '_id"' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
+			. '" data-text="' . htmlspecialchars(JText::_('COM_CONTACT_SELECT_A_CONTACT', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.4
+	 */
+	protected function getLabel()
+	{
+		return str_replace($this->id, $this->id . '_id', parent::getLabel());
+	}
+}
diff --git a/core/administrator/components/com_contact/models/forms/contact.xml b/core/administrator/components/com_contact/models/forms/contact.xml
new file mode 100644
index 00000000..3146bfcc
--- /dev/null
+++ b/core/administrator/components/com_contact/models/forms/contact.xml
@@ -0,0 +1,1005 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset addfieldpath="/administrator/components/com_categories/models/fields">
+
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			class="readonly"
+			size="10"
+			readonly="true"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="COM_CONTACT_FIELD_NAME_LABEL"
+			description="COM_CONTACT_FIELD_NAME_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		 />
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			size="45"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+		/>
+
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			labelclass="control-label"
+			class="span12"
+			size="45"
+			maxlength="255"
+		/>
+
+		<field
+			name="user_id"
+			type="user"
+			label="COM_CONTACT_FIELD_LINKED_USER_LABEL"
+			description="COM_CONTACT_FIELD_LINKED_USER_DESC"
+		/>
+
+		<field
+			name="published"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
+			id="published"
+			class="chzn-color-state"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+
+		</field>
+
+		<field
+			name="catid"
+			type="categoryedit"
+			label="JCATEGORY"
+			description="JFIELD_CATEGORY_DESC"
+			extension="com_contact"
+			required="true"
+			default=""
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+
+		<field
+			name="misc"
+			type="editor"
+			label="COM_CONTACT_FIELD_INFORMATION_MISC_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_MISC_DESC"
+			filter="JComponentHelper::filterText"
+			buttons="true"
+			hide="readmore,pagebreak"
+		/>
+
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="COM_CONTACT_FIELD_CREATED_BY_DESC"
+		/>
+
+		<field
+			name="created_by_alias"
+			type="text"
+			label="COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="COM_CONTACT_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20"
+		/>
+
+		<field
+			name="created"
+			type="calendar"
+			label="COM_CONTACT_FIELD_CREATED_LABEL"
+			description="COM_CONTACT_FIELD_CREATED_DESC"
+			size="22"
+			translateformat="true"
+			showtime="true"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			description="COM_CONTACT_FIELD_MODIFIED_DESC"
+			class="readonly"
+			size="22"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="COM_CONTACT_FIELD_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="ordering"
+			type="ordering"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			content_type="com_contact.contact"
+		/>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="COM_CONTACT_FIELD_PUBLISH_UP_LABEL"
+			description="COM_CONTACT_FIELD_PUBLISH_UP_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="COM_CONTACT_FIELD_PUBLISH_DOWN_LABEL"
+			description="COM_CONTACT_FIELD_PUBLISH_DOWN_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="metakey"
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
+			rows="3"
+			cols="30"
+		 />
+
+		<field
+			name="metadesc"
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_CONTACT_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="featured"
+			type="radio"
+			label="JFEATURED"
+			description="COM_CONTACT_FIELD_FEATURED_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="tags"
+			type="tag"
+			label="JTAG"
+			description="JTAG_DESC"
+			class="span12"
+			multiple="true"
+		/>
+
+		<field
+			name="contact_icons"
+			type="list"
+			label="COM_CONTACT_FIELD_ICONS_SETTINGS"
+			description="COM_CONTACT_FIELD_ICONS_SETTINGS_DESC"
+			default="0"
+			>
+			<option value="0">COM_CONTACT_FIELD_VALUE_NONE</option>
+			<option value="1">COM_CONTACT_FIELD_VALUE_TEXT</option>
+			<option value="2">COM_CONTACT_FIELD_VALUE_ICONS</option>
+		</field>
+
+		<field
+			name="icon_address"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC"
+			hide_none="1"
+		/>
+
+		<field
+			name="icon_email"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC"
+			hide_none="1"
+		/>
+
+		<field
+			name="icon_telephone"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC"
+			hide_none="1"
+		/>
+
+		<field
+			name="icon_mobile"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC"
+			hide_none="1"
+		/>
+
+		<field
+			name="icon_fax"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_FAX_DESC"
+			hide_none="1"
+		/>
+
+		<field
+			name="icon_misc"
+			type="media"
+			label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_MISC_DESC"
+			hide_none="1"
+		/>
+	</fieldset>
+
+	<fieldset name="details" label="COM_CONTACT_CONTACT_DETAILS">
+
+		<field
+			name="@text_details"
+			type="note"
+			label=""
+			description="COM_CONTACT_EDIT_DETAILS"
+		/>
+
+		<field
+			name="image"
+			type="media"
+			label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
+			hide_none="1"
+		/>
+
+		<field
+			name="con_position"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_POSITION_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_POSITION_DESC"
+			size="30"
+		/>
+
+		<field
+			name="email_to"
+			type="email"
+			label="JGLOBAL_EMAIL"
+			description="COM_CONTACT_FIELD_INFORMATION_EMAIL_DESC"
+			size="30"
+		/>
+
+		<field
+			name="address"
+			type="textarea"
+			label="COM_CONTACT_FIELD_INFORMATION_ADDRESS_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_ADDRESS_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field
+			name="suburb"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_SUBURB_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_SUBURB_DESC"
+			size="30"
+		/>
+
+		<field
+			name="state"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_STATE_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_STATE_DESC"
+			size="30"
+		/>
+
+		<field
+			name="postcode"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_POSTCODE_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_POSTCODE_DESC"
+			size="30"
+		/>
+
+		<field
+			name="country"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_COUNTRY_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_COUNTRY_DESC"
+			size="30"
+		/>
+
+		<field
+			name="telephone"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_TELEPHONE_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_TELEPHONE_DESC"
+			size="30"
+		/>
+
+		<field
+			name="mobile"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_MOBILE_DESC"
+			size="30"
+		/>
+
+		<field
+			name="fax"
+			type="text"
+			label="COM_CONTACT_FIELD_INFORMATION_FAX_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_FAX_DESC"
+			size="30"
+		/>
+
+		<field
+			name="webpage"
+			type="url"
+			label="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_LABEL"
+			description="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_DESC"
+			size="30"
+			filter="url"
+		/>
+
+		<field
+			name="sortname1"
+			type="text"
+			label="COM_CONTACT_FIELD_SORTNAME1_LABEL"
+			description="COM_CONTACT_FIELD_SORTNAME1_DESC"
+			size="30"
+		/>
+
+		<field
+			name="sortname2"
+			type="text"
+			label="COM_CONTACT_FIELD_SORTNAME2_LABEL"
+			description="COM_CONTACT_FIELD_SORTNAME2_DESC"
+			size="30"
+		/>
+
+		<field
+			name="sortname3"
+			type="text"
+			label="COM_CONTACT_FIELD_SORTNAME3_LABEL"
+			description="COM_CONTACT_FIELD_SORTNAME3_DESC"
+			size="30"
+		/>
+	</fieldset>
+
+	<fields name="params" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
+
+		<fieldset name="display" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS"
+			 addfieldpath="/administrator/components/com_fields/models/fields">
+
+			<field
+				name="show_contact_category"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_CATEGORY_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
+				<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
+			</field>
+
+			<field
+				name="show_contact_list"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="presentation_style"
+				type="list"
+				label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
+				description="COM_CONTACT_FIELD_PRESENTATION_DESC"
+				useglobal="true"
+				>
+				<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
+				<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
+				<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
+			</field>
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_name"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_position"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_email"
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="add_mailto_link"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="show_street_address"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_suburb"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_state"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_postcode"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_country"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_telephone"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_mobile"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_fax"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_webpage"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_image"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				showon="show_info:1"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="allow_vcard"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_articles"
+				type="list"
+				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="articles_display_num"
+				type="list"
+				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="75">J75</option>
+				<option value="100">J100</option>
+				<option value="150">J150</option>
+				<option value="200">J200</option>
+				<option value="250">J250</option>
+				<option value="300">J300</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field
+				name="show_profile"
+				type="list"
+				label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_PROFILE_SHOW_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			
+			<field
+				name="show_user_custom_fields"
+				type="fieldgroups"
+				label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
+				multiple="true"
+				context="com_users.user"
+				>
+				<option value="-1">JALL</option>
+			</field>
+
+			<field
+				name="show_links"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="linka_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+			/>
+
+			<field
+				name="linka"
+				type="url"
+				label="COM_CONTACT_FIELD_LINKA_LABEL"
+				description="COM_CONTACT_FIELD_LINKA_DESC"
+				size="30"
+				filter="url"
+			/>
+
+			<field
+				name="linkb_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+			/>
+
+			<field
+				name="linkb"
+				type="url"
+				label="COM_CONTACT_FIELD_LINKB_LABEL"
+				description="COM_CONTACT_FIELD_LINKB_DESC"
+				size="30"
+				filter="url"
+			/>
+
+			<field
+				name="linkc_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+			/>
+
+			<field
+				name="linkc"
+				type="url"
+				label="COM_CONTACT_FIELD_LINKC_LABEL"
+				description="COM_CONTACT_FIELD_LINKC_DESC"
+				size="30"
+				filter="url"
+			/>
+
+			<field
+				name="linkd_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+			/>
+
+			<field
+				name="linkd"
+				type="url"
+				label="COM_CONTACT_FIELD_LINKD_LABEL"
+				description="COM_CONTACT_FIELD_LINKD_DESC"
+				size="30"
+				filter="url"
+			/>
+
+			<field
+				name="linke_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+			/>
+
+			<field
+				name="linke"
+				type="url"
+				label="COM_CONTACT_FIELD_LINKE_LABEL"
+				description="COM_CONTACT_FIELD_LINKE_DESC"
+				size="30"
+				filter="url"
+			/>
+
+			<field
+				name="contact_layout"
+				type="componentlayout"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				extension="com_contact"
+				view="contact"
+				useglobal="true"
+			/>
+		</fieldset>
+
+		<fieldset name="email" label="COM_CONTACT_FIELDSET_CONTACT_LABEL">
+
+			<field
+				name="show_email_form"
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_email_copy"
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="banned_email"
+				type="textarea"
+				label="COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_DESC"
+				rows="3"
+				cols="30"
+			/>
+
+			<field
+				name="banned_subject"
+				type="textarea"
+				label="COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_DESC"
+				rows="3"
+				cols="30"
+			/>
+
+			<field
+				name="banned_text"
+				type="textarea"
+				label="COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_DESC"
+				rows="3"
+				cols="30"
+			/>
+
+			<field
+				name="validate_session"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="custom_reply"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="redirect"
+				type="text"
+				label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+				size="30"
+			/>
+		</fieldset>
+	</fields>
+
+	<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+		<fieldset name="jmetadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+			<field
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+
+			<field
+				name="rights"
+				type="text"
+				label="JFIELD_METADATA_RIGHTS_LABEL"
+				description="JFIELD_METADATA_RIGHTS_DESC"
+				size="20"
+			/>
+		</fieldset>
+	</fields>
+
+	<field
+		name="hits"
+		type="number"
+		label="JGLOBAL_HITS"
+		description="COM_CONTACT_HITS_DESC"
+		class="readonly"
+		size="6"
+		readonly="true"
+		filter="unset"
+	/>
+
+	<field
+		name="version"
+		type="text"
+		label="COM_CONTACT_FIELD_VERSION_LABEL"
+		description="COM_CONTACT_FIELD_VERSION_DESC"
+		class="readonly"
+		size="6"
+		readonly="true"
+		filter="unset"
+	/>
+</form>
diff --git a/core/administrator/components/com_contact/models/forms/fields/mail.xml b/core/administrator/components/com_contact/models/forms/fields/mail.xml
new file mode 100644
index 00000000..452bcd4a
--- /dev/null
+++ b/core/administrator/components/com_contact/models/forms/fields/mail.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="basic">
+			<field
+				name="display"
+				type="hidden"
+				default="2"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_contact/models/forms/filter_contacts.xml b/core/administrator/components/com_contact/models/forms/filter_contacts.xml
new file mode 100644
index 00000000..60c8ad7d
--- /dev/null
+++ b/core/administrator/components/com_contact/models/forms/filter_contacts.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fields name="filter">
+
+		<field
+			name="search"
+			type="text"
+			label="COM_CONTACT_FILTER_SEARCH_LABEL"
+			description="COM_CONTACT_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="JOPTION_SELECT_PUBLISHED"
+			description="JOPTION_SELECT_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_contact"
+			published="0,1,2"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			mode="nested"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_TAG</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTACT_LIST_FULL_ORDERING"
+			description="COM_CONTACT_LIST_FULL_ORDERING_DESC"
+			default="a.name ASC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.featured ASC">JFEATURED_ASC</option>
+			<option value="a.featured DESC">JFEATURED_DESC</option>
+			<option value="a.name ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.name DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="ul.name ASC">COM_CONTACT_FIELD_LINKED_USER_LABEL_ASC</option>
+			<option value="ul.name DESC">COM_CONTACT_FIELD_LINKED_USER_LABEL_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option
+				value="association ASC"
+				requires="associations"
+				>
+				JASSOCIATIONS_ASC
+			</option>
+			<option
+				value="association DESC"
+				requires="associations"
+				>
+				JASSOCIATIONS_DESC
+			</option>
+			<option value="language_title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language_title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTACT_LIST_LIMIT"
+			description="COM_CONTACT_LIST_LIMIT_DESC"
+			default="25"
+			class="input-mini"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_contact/sql/install.mysql.utf8.sql b/core/administrator/components/com_contact/sql/install.mysql.utf8.sql
new file mode 100644
index 00000000..73a79307
--- /dev/null
+++ b/core/administrator/components/com_contact/sql/install.mysql.utf8.sql
@@ -0,0 +1,58 @@
+--
+-- Table structure for table `#__contact_details`
+--
+
+CREATE TABLE IF NOT EXISTS `#__contact_details` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `con_position` varchar(255) DEFAULT NULL,
+  `address` text,
+  `suburb` varchar(100) DEFAULT NULL,
+  `state` varchar(100) DEFAULT NULL,
+  `country` varchar(100) DEFAULT NULL,
+  `postcode` varchar(100) DEFAULT NULL,
+  `telephone` varchar(255) DEFAULT NULL,
+  `fax` varchar(255) DEFAULT NULL,
+  `misc` mediumtext,
+  `image` varchar(255) DEFAULT NULL,
+  `email_to` varchar(255) DEFAULT NULL,
+  `default_con` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `published` tinyint(1) NOT NULL DEFAULT 0,
+  `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ordering` int(11) NOT NULL DEFAULT 0,
+  `params` text NOT NULL,
+  `user_id` int(11) NOT NULL DEFAULT 0,
+  `catid` int(11) NOT NULL DEFAULT 0,
+  `access` int(10) unsigned NOT NULL DEFAULT 0,
+  `mobile` varchar(255) NOT NULL DEFAULT '',
+  `webpage` varchar(255) NOT NULL DEFAULT '',
+  `sortname1` varchar(255) NOT NULL,
+  `sortname2` varchar(255) NOT NULL,
+  `sortname3` varchar(255) NOT NULL,
+  `language` char(7) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `metakey` text NOT NULL,
+  `metadesc` text NOT NULL,
+  `metadata` text NOT NULL,
+  `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if contact is featured.',
+  `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
+  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `version` int(10) unsigned NOT NULL DEFAULT 1,
+  `hits` int(10) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `idx_access` (`access`),
+  KEY `idx_checkout` (`checked_out`),
+  KEY `idx_state` (`published`),
+  KEY `idx_catid` (`catid`),
+  KEY `idx_createdby` (`created_by`),
+  KEY `idx_featured_catid` (`featured`,`catid`),
+  KEY `idx_language` (`language`),
+  KEY `idx_xreference` (`xreference`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/core/administrator/components/com_contact/sql/uninstall.mysql.utf8.sql b/core/administrator/components/com_contact/sql/uninstall.mysql.utf8.sql
new file mode 100644
index 00000000..99de3fee
--- /dev/null
+++ b/core/administrator/components/com_contact/sql/uninstall.mysql.utf8.sql
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `#__contact_details`;
+
diff --git a/core/administrator/components/com_contact/tables/contact.php b/core/administrator/components/com_contact/tables/contact.php
new file mode 100644
index 00000000..d34d46d4
--- /dev/null
+++ b/core/administrator/components/com_contact/tables/contact.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * Contact Table class.
+ *
+ * @since  1.0
+ */
+class ContactTableContact extends JTable
+{
+	/**
+	 * Ensure the params and metadata in json encoded in the bind method
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	protected $_jsonEncode = array('params', 'metadata');
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__contact_details', 'id', $db);
+
+		JTableObserverTags::createObserver($this, array('typeAlias' => 'com_contact.contact'));
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_contact.contact'));
+	}
+
+	/**
+	 * Stores a contact.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		// Transform the params field
+		if (is_array($this->params))
+		{
+			$registry = new Registry($this->params);
+			$this->params = (string) $registry;
+		}
+
+		$date   = JFactory::getDate()->toSql();
+		$userId = JFactory::getUser()->id;
+
+		$this->modified = $date;
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified_by = $userId;
+		}
+		else
+		{
+			// New contact. A contact created and created_by field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created)
+			{
+				$this->created = $date;
+			}
+
+			if (empty($this->created_by))
+			{
+				$this->created_by = $userId;
+			}
+		}
+
+		// Set publish_up to null date if not set
+		if (!$this->publish_up)
+		{
+			$this->publish_up = $this->_db->getNullDate();
+		}
+
+		// Set publish_down to null date if not set
+		if (!$this->publish_down)
+		{
+			$this->publish_down = $this->_db->getNullDate();
+		}
+
+		// Set xreference to empty string if not set
+		if (!$this->xreference)
+		{
+			$this->xreference = '';
+		}
+
+		// Store utf8 email as punycode
+		$this->email_to = JStringPunycode::emailToPunycode($this->email_to);
+
+		// Convert IDN urls to punycode
+		$this->webpage = JStringPunycode::urlToPunycode($this->webpage);
+
+		// Verify that the alias is unique
+		$table = JTable::getInstance('Contact', 'ContactTable', array('dbo' => $this->_db));
+
+		if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(JText::_('COM_CONTACT_ERROR_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @see     JTable::check
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		$this->default_con = (int) $this->default_con;
+
+		if (JFilterInput::checkAttribute(array('href', $this->webpage)))
+		{
+			$this->setError(JText::_('COM_CONTACT_WARNING_PROVIDE_VALID_URL'));
+
+			return false;
+		}
+
+		// Check for valid name
+		if (trim($this->name) == '')
+		{
+			$this->setError(JText::_('COM_CONTACT_WARNING_PROVIDE_VALID_NAME'));
+
+			return false;
+		}
+
+		// Generate a valid alias
+		$this->generateAlias();
+
+		// Check for valid category
+		if (trim($this->catid) == '')
+		{
+			$this->setError(JText::_('COM_CONTACT_WARNING_CATEGORY'));
+
+			return false;
+		}
+
+		// Sanity check for user_id
+		if (!$this->user_id)
+		{
+			$this->user_id = 0;
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up)
+		{
+			$this->setError(JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
+
+			return false;
+		}
+
+		/*
+		 * Clean up keywords -- eliminate extra spaces between phrases
+		 * and cr (\r) and lf (\n) characters from string.
+		 * Only process if not empty.
+		 */
+		if (!empty($this->metakey))
+		{
+			// Array of characters to remove.
+			$badCharacters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters.
+			$afterClean = StringHelper::str_ireplace($badCharacters, '', $this->metakey);
+
+			// Create array using commas as delimiter.
+			$keys = explode(',', $afterClean);
+			$cleanKeys = array();
+
+			foreach ($keys as $key)
+			{
+				// Ignore blank keywords.
+				if (trim($key))
+				{
+					$cleanKeys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(', ', $cleanKeys);
+		}
+
+		// Clean up description -- eliminate quotes and <> brackets
+		if (!empty($this->metadesc))
+		{
+			// Only process if not empty
+			$badCharacters = array("\"", '<', '>');
+			$this->metadesc = StringHelper::str_ireplace($badCharacters, '', $this->metadesc);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Generate a valid alias from title / date.
+	 * Remains public to be able to check for duplicated alias before saving
+	 *
+	 * @return  string
+	 */
+	public function generateAlias()
+	{
+		if (empty($this->alias))
+		{
+			$this->alias = $this->name;
+		}
+
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		return $this->alias;
+	}
+}
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/edit.php b/core/administrator/components/com_contact/views/contact/tmpl/edit.php
new file mode 100644
index 00000000..38313b9f
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/edit.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', 'select');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+$assoc = JLanguageAssociations::isEnabled();
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "contact.cancel" || document.formvalidator.isValid(document.getElementById("contact-form")))
+		{
+			' . $this->form->getField('misc')->save() . '
+			Joomla.submitform(task, document.getElementById("contact-form"));
+
+			// @deprecated 4.0  The following js is not needed since 3.7.0.
+			if (task !== "contact.apply")
+			{
+				window.parent.jQuery("#contactEdit' . $this->item->id . 'Modal").modal("hide");
+			}
+		}
+	};
+');
+
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('details', 'item_associations', 'jmetadata');
+
+// In case of modal
+$isModal = $input->get('layout') == 'modal' ? true : false;
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_contact&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="contact-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', empty($this->item->id) ? JText::_('COM_CONTACT_NEW_CONTACT') : JText::_('COM_CONTACT_EDIT_CONTACT')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<div class="row-fluid form-horizontal-desktop float-cols" >
+					<div class="span6">
+						<?php echo $this->form->renderField('user_id'); ?>
+						<?php echo $this->form->renderField('image'); ?>
+						<?php echo $this->form->renderField('con_position'); ?>
+						<?php echo $this->form->renderField('email_to'); ?>
+						<?php echo $this->form->renderField('address'); ?>
+						<?php echo $this->form->renderField('suburb'); ?>
+						<?php echo $this->form->renderField('state'); ?>
+						<?php echo $this->form->renderField('postcode'); ?>
+						<?php echo $this->form->renderField('country'); ?>
+					</div>
+					<div class="span6">
+						<?php echo $this->form->renderField('telephone'); ?>
+						<?php echo $this->form->renderField('mobile'); ?>
+						<?php echo $this->form->renderField('fax'); ?>
+						<?php echo $this->form->renderField('webpage'); ?>
+						<?php echo $this->form->renderField('sortname1'); ?>
+						<?php echo $this->form->renderField('sortname2'); ?>
+						<?php echo $this->form->renderField('sortname3'); ?>
+					</div>
+				</div>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'misc', JText::_('JGLOBAL_FIELDSET_MISCELLANEOUS')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+				<div class="form-vertical">
+					<?php echo $this->form->renderField('misc'); ?>
+				</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php if ( ! $isModal && $assoc) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+			<?php echo $this->loadTemplate('associations'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php elseif ($isModal && $assoc) : ?>
+			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/edit_associations.php b/core/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
new file mode 100644
index 00000000..2aebf23a
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php b/core/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
new file mode 100644
index 00000000..3194ca93
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/edit_params.php b/core/administrator/components/com_contact/views/contact/tmpl/edit_params.php
new file mode 100644
index 00000000..6088e67c
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/edit_params.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	$paramstabs = 'params-' . $name;
+	echo JHtml::_('bootstrap.addTab', 'myTab', $paramstabs, JText::_($fieldSet->label));
+
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	endif;
+	?>
+		<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<div class="control-group">
+				<div class="control-label"><?php echo $field->label; ?></div>
+				<div class="controls"><?php echo $field->input; ?></div>
+			</div>
+		<?php endforeach; ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/modal.php b/core/administrator/components/com_contact/views/contact/tmpl/modal.php
new file mode 100644
index 00000000..3a551aa7
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/modal.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+
+// @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0.
+$function  = JFactory::getApplication()->input->getCmd('function', 'jEditContact_' . (int) $this->item->id);
+
+// Function to update input title when changed
+JFactory::getDocument()->addScriptDeclaration('
+	function jEditContactModal() {
+		if (window.parent && document.formvalidator.isValid(document.getElementById("contact-form"))) {
+			return window.parent.' . $this->escape($function) . '(document.getElementById("jform_name").value);
+		}
+	}
+');
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('contact.apply'); jEditContactModal();"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('contact.save'); jEditContactModal();"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('contact.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/modal_associations.php b/core/administrator/components/com_contact/views/contact/tmpl/modal_associations.php
new file mode 100644
index 00000000..2aebf23a
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/modal_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php b/core/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php
new file mode 100644
index 00000000..3194ca93
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_contact/views/contact/tmpl/modal_params.php b/core/administrator/components/com_contact/views/contact/tmpl/modal_params.php
new file mode 100644
index 00000000..6088e67c
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/tmpl/modal_params.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	$paramstabs = 'params-' . $name;
+	echo JHtml::_('bootstrap.addTab', 'myTab', $paramstabs, JText::_($fieldSet->label));
+
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	endif;
+	?>
+		<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<div class="control-group">
+				<div class="control-label"><?php echo $field->label; ?></div>
+				<div class="controls"><?php echo $field->input; ?></div>
+			</div>
+		<?php endforeach; ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_contact/views/contact/view.html.php b/core/administrator/components/com_contact/views/contact/view.html.php
new file mode 100644
index 00000000..1e109067
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contact/view.html.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a contact.
+ *
+ * @since  1.6
+ */
+class ContactViewContact extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise variables.
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// If we are forcing a language in modal (used for associations).
+		if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd'))
+		{
+			// Set the language field to the forcedLanguage and disable changing it.
+			$this->form->setValue('language', null, $forcedLanguage);
+			$this->form->setFieldAttribute('language', 'readonly', 'true');
+
+			// Only allow to select categories with All language or with the forced language.
+			$this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage);
+
+			// Only allow to select tags with All language or with the forced language.
+			$this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$userId     = $user->id;
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Since we don't track these assets at the item level, use the category id.
+		$canDo = JHelperContent::getActions('com_contact', 'category', $this->item->catid);
+
+		JToolbarHelper::title($isNew ? JText::_('COM_CONTACT_MANAGER_CONTACT_NEW') : JText::_('COM_CONTACT_MANAGER_CONTACT_EDIT'), 'address contact');
+
+		// Build the actions for new and existing records.
+		if ($isNew)
+		{
+			// For new records, check the create permission.
+			if ($isNew && (count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0))
+			{
+				JToolbarHelper::apply('contact.apply');
+				JToolbarHelper::save('contact.save');
+				JToolbarHelper::save2new('contact.save2new');
+			}
+
+			JToolbarHelper::cancel('contact.cancel');
+		}
+		else
+		{
+			// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
+			$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
+
+			// Can't save the record if it's checked out and editable
+			if (!$checkedOut && $itemEditable)
+			{
+				JToolbarHelper::apply('contact.apply');
+				JToolbarHelper::save('contact.save');
+
+				// We can save this record, but check the create permission to see if we can return to make a new one.
+				if ($canDo->get('core.create'))
+				{
+					JToolbarHelper::save2new('contact.save2new');
+				}
+			}
+
+			// If checked out, we can still save
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2copy('contact.save2copy');
+			}
+
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
+			{
+				JToolbarHelper::versions('com_contact.contact', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('contact.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_CONTACTS_CONTACTS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_contact/views/contacts/tmpl/default.php b/core/administrator/components/com_contact/views/contacts/tmpl/default.php
new file mode 100644
index 00000000..23cf5d56
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contacts/tmpl/default.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+$assoc     = JLanguageAssociations::isEnabled();
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_contact&task=contacts.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'contactList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_contact'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"></div>
+		<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+		<?php else : ?>
+			<table class="table table-striped" id="contactList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" style="min-width:55px" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($assoc) : ?>
+						<th width="5%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTACT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="10">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				$n = count($this->items);
+				foreach ($this->items as $i => $item) :
+					$canCreate  = $user->authorise('core.create',     'com_contact.category.' . $item->catid);
+					$canEdit    = $user->authorise('core.edit',       'com_contact.category.' . $item->catid);
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+					$canEditOwn = $user->authorise('core.edit.own',   'com_contact.category.' . $item->catid) && $item->created_by == $userId;
+					$canChange  = $user->authorise('core.edit.state', 'com_contact.category.' . $item->catid) && $canCheckin;
+
+					$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_contact&task=edit&type=other&id=' . $item->catid);
+					?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass; ?>">
+								<span class="icon-menu" aria-hidden="true"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5"
+									value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td class="center">
+							<div class="btn-group">
+								<?php echo JHtml::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+								<?php echo JHtml::_('contact.featured', $item->featured, $i, $canChange); ?>
+								<?php // Create dropdown items and render the dropdown list.
+								if ($canChange)
+								{
+									JHtml::_('actionsdropdown.' . ((int) $item->published === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'contacts');
+									JHtml::_('actionsdropdown.' . ((int) $item->published === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'contacts');
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+								}
+								?>
+							</div>
+						</td>
+						<td class="nowrap has-context">
+							<div class="pull-left">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit || $canEditOwn) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_contact&task=contact.edit&id=' . (int) $item->id); ?>"><?php echo $this->escape($item->name); ?></a>
+								<?php else : ?>
+									<?php echo $this->escape($item->name); ?>
+								<?php endif; ?>
+								<span class="small">
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								</span>
+								<div class="small">
+									<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+								</div>
+							</div>
+						</td>
+						<td class="small hidden-phone hidden-tablet">
+							<?php if (!empty($item->linked_user)) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . $item->user_id); ?>"><?php echo $item->linked_user; ?></a>
+								<div class="small"><?php echo $item->email; ?></div>
+							<?php endif; ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $item->access_level; ?>
+						</td>
+						<?php if ($assoc) : ?>
+						<td class="hidden-phone hidden-tablet">
+							<?php if ($item->association) : ?>
+								<?php echo JHtml::_('contact.association', $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<?php endif; ?>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', 'com_contact')
+				&& $user->authorise('core.edit', 'com_contact')
+				&& $user->authorise('core.edit.state', 'com_contact')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_CONTACT_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_contact/views/contacts/tmpl/default_batch.php b/core/administrator/components/com_contact/views/contacts/tmpl/default_batch.php
new file mode 100644
index 00000000..136e9384
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contacts/tmpl/default_batch.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$published = $this->state->get('filter.published');
+?>
+<div class="modal hide fade" id="collapseModal">
+	<div class="modal-header">
+		<button type="button" class="close" data-dismiss="modal">&#215;</button>
+		<h3><?php echo JText::_('COM_CONTACT_BATCH_OPTIONS'); ?></h3>
+	</div>
+	<div class="modal-body modal-batch">
+		<p><?php echo JText::_('COM_CONTACT_BATCH_TIP'); ?></p>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
+			</div>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
+			</div>
+		</div>
+		<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_contact'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+		<div class="row-fluid">
+			<div class="control-group">
+				<div class="controls">
+					<?php echo JHtml::_('batch.user'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="modal-footer">
+		<button class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+			<?php echo JText::_('JCANCEL'); ?>
+		</button>
+		<button class="btn btn-primary" type="submit" onclick="Joomla.submitbutton('contact.batch');">
+			<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+		</button>
+	</div>
+</div>
diff --git a/core/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php b/core/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php
new file mode 100644
index 00000000..16fd78fb
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_contact'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.user'); ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php b/core/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..500e7dd2
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('contact.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_contact/views/contacts/tmpl/modal.php b/core/administrator/components/com_contact/views/contacts/tmpl/modal.php
new file mode 100644
index 00000000..fa241fb8
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contacts/tmpl/modal.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JLoader::register('ContactHelperRoute', JPATH_ROOT . '/components/com_contact/helpers/route.php');
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+JHtml::_('script', 'com_contact/admin-contacts-modal.min.js', array('version' => 'auto', 'relative' => true));
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$function  = $app->input->getCmd('function', 'jSelectContact');
+$editor    = $app->input->getCmd('editor', '');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$onclick   = $this->escape($function);
+
+if (!empty($editor))
+{
+	// This view is used also in com_menus. Load the xtd script only if the editor is set!
+	JFactory::getDocument()->addScriptOptions('xtd-contacts', array('editor' => $editor));
+	$onclick = "jSelectContact";
+}
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped table-condensed">
+				<thead>
+					<tr>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="6">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				$iconStates = array(
+					-2 => 'icon-trash',
+					0  => 'icon-unpublish',
+					1  => 'icon-publish',
+					2  => 'icon-archive',
+				);
+				?>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<?php if ($item->language && JLanguageMultilang::isEnabled())
+					{
+						$tag = strlen($item->language);
+						if ($tag == 5)
+						{
+							$lang = substr($item->language, 0, 2);
+						}
+						elseif ($tag == 6)
+						{
+							$lang = substr($item->language, 0, 3);
+						}
+						else {
+							$lang = '';
+						}
+					}
+					elseif (!JLanguageMultilang::isEnabled())
+					{
+						$lang = '';
+					}
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
+						</td>
+						<td>
+							<a class="select-link" href="javascript:void(0)" data-function="<?php echo $this->escape($onclick); ?>" data-id="<?php echo $item->id; ?>" data-title="<?php echo $this->escape($item->name); ?>" data-uri="<?php echo $this->escape(ContactHelperRoute::getContactRoute($item->id, $item->catid, $item->language)); ?>" data-language="<?php echo $this->escape($lang); ?>">
+								<?php echo $this->escape($item->name); ?>
+							</a>
+							<?php echo $this->escape($item->name); ?></a>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+							</div>
+						</td>
+						<td>
+							<?php if (!empty($item->linked_user)) : ?>
+								<?php echo $item->linked_user; ?>
+							<?php endif; ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td align="center">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_contact/views/contacts/view.html.php b/core/administrator/components/com_contact/views/contacts/view.html.php
new file mode 100644
index 00000000..9233fca3
--- /dev/null
+++ b/core/administrator/components/com_contact/views/contacts/view.html.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of contacts.
+ *
+ * @since  1.6
+ */
+class ContactViewContacts extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Form object for search filters
+	 *
+	 * @var  JForm
+	 */
+	public $filterForm;
+
+	/**
+	 * The active search filters
+	 *
+	 * @var  array
+	 */
+	public $activeFilters;
+
+	/**
+	 * The sidebar markup
+	 *
+	 * @var  string
+	 */
+	protected $sidebar;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		if ($this->getLayout() !== 'modal')
+		{
+			ContactHelper::addSubmenu('contacts');
+		}
+
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Preprocess the list of items to find ordering divisions.
+		// TODO: Complete the ordering stuff with nested sets
+		foreach ($this->items as &$item)
+		{
+			$item->order_up = true;
+			$item->order_dn = true;
+		}
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			// We also need to change the category filter to show show categories with All or the forced language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+
+				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
+				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+			}
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_contact', 'category', $this->state->get('filter.category_id'));
+		$user  = JFactory::getUser();
+
+		JToolbarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACTS'), 'address contact');
+
+		if ($canDo->get('core.create') || count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0)
+		{
+			JToolbarHelper::addNew('contact.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('contact.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('contacts.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('contacts.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::custom('contacts.featured', 'featured.png', 'featured_f2.png', 'JFEATURE', true);
+			JToolbarHelper::custom('contacts.unfeatured', 'unfeatured.png', 'featured_f2.png', 'JUNFEATURE', true);
+			JToolbarHelper::archiveList('contacts.archive');
+			JToolbarHelper::checkin('contacts.checkin');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_contact')
+			&& $user->authorise('core.edit', 'com_contact')
+			&& $user->authorise('core.edit.state', 'com_contact'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			JToolbar::getInstance('toolbar')->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'contacts.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('contacts.trash');
+		}
+
+		if ($user->authorise('core.admin', 'com_contact') || $user->authorise('core.options', 'com_contact'))
+		{
+			JToolbarHelper::preferences('com_contact');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_CONTACTS_CONTACTS');
+
+		JHtmlSidebar::setAction('index.php?option=com_contact');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering'     => JText::_('JGRID_HEADING_ORDERING'),
+			'a.published'    => JText::_('JSTATUS'),
+			'a.name'         => JText::_('JGLOBAL_TITLE'),
+			'category_title' => JText::_('JCATEGORY'),
+			'ul.name'        => JText::_('COM_CONTACT_FIELD_LINKED_USER_LABEL'),
+			'a.featured'     => JText::_('JFEATURED'),
+			'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+			'a.language'     => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'           => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_content/access.xml b/core/administrator/components/com_content/access.xml
new file mode 100644
index 00000000..27f108a3
--- /dev/null
+++ b/core/administrator/components/com_content/access.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_content">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="JACTION_EDITVALUE_COMPONENT_DESC" />
+	</section>
+	<section name="category">
+		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
+	</section>
+	<section name="article">
+		<action name="core.delete" title="JACTION_DELETE" description="COM_CONTENT_ACCESS_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_CONTENT_ACCESS_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CONTENT_ACCESS_EDITSTATE_DESC" />
+	</section>
+	<section name="fieldgroup">
+		<action name="core.create" title="JACTION_CREATE" description="COM_FIELDS_GROUP_PERMISSION_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_GROUP_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_GROUP_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC" />
+	</section>
+	<section name="field">
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_FIELD_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_FIELD_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_content/config.xml b/core/administrator/components/com_content/config.xml
new file mode 100644
index 00000000..cb91b6f2
--- /dev/null
+++ b/core/administrator/components/com_content/config.xml
@@ -0,0 +1,1149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="articles"
+		label="JGLOBAL_ARTICLES"
+		description="COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC"
+	>
+
+		<field
+			name="article_layout"
+			type="componentlayout"
+			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_content"
+			view="article"
+		/>
+
+		<field
+			name="show_title"
+			type="radio"
+			label="JGLOBAL_SHOW_TITLE_LABEL"
+			description="JGLOBAL_SHOW_TITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_titles"
+			type="radio"
+			label="JGLOBAL_LINKED_TITLES_LABEL"
+			description="JGLOBAL_LINKED_TITLES_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_title:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_intro"
+			type="radio"
+			label="JGLOBAL_SHOW_INTRO_LABEL"
+			description="JGLOBAL_SHOW_INTRO_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="info_block_position"
+			type="list"
+			label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+			description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+			default="0"
+			>
+			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+			<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+		</field>
+
+		<field
+			name="info_block_show_title"
+			type="radio"
+			label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
+			description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_category"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_category"
+			type="radio"
+			label="JGLOBAL_LINK_CATEGORY_LABEL"
+			description="JGLOBAL_LINK_CATEGORY_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_category:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_parent_category"
+			type="radio"
+			label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_parent_category"
+			type="radio"
+			label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_parent_category:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="spacer1"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="show_associations"
+			type="radio"
+			label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
+			description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="flags"
+			type="radio"
+			label="JGLOBAL_SHOW_FLAG_LABEL"
+			description="JGLOBAL_SHOW_FLAG_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_associations:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="spacer3"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="show_author"
+			type="radio"
+			label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			description="JGLOBAL_SHOW_AUTHOR_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_author"
+			type="radio"
+			label="JGLOBAL_LINK_AUTHOR_LABEL"
+			description="JGLOBAL_LINK_AUTHOR_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="show_author:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_create_date"
+			type="radio"
+			label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_modify_date"
+			type="radio"
+			label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_publish_date"
+			type="radio"
+			label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_item_navigation"
+			type="radio"
+			label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			description="JGLOBAL_SHOW_NAVIGATION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_vote"
+			type="radio"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_readmore"
+			type="radio"
+			label="JGLOBAL_SHOW_READMORE_LABEL"
+			description="JGLOBAL_SHOW_READMORE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_readmore_title"
+			type="radio"
+			label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+			description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_readmore:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="readmore_limit"
+			type="number"
+			label="JGLOBAL_SHOW_READMORE_LIMIT_LABEL"
+			description="JGLOBAL_SHOW_READMORE_LIMIT_DESC"
+			default="100"
+			showon="show_readmore:1[AND]show_readmore_title:1"
+		/>
+
+		<field
+			name="show_tags"
+			type="radio"
+			label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
+			description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
+			id="show_tags"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="spacer2"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="show_icons"
+			type="radio"
+			label="JGLOBAL_SHOW_ICONS_LABEL"
+			description="JGLOBAL_SHOW_ICONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_print_icon"
+			type="radio"
+			label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_email_icon"
+			type="radio"
+			label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+			description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_hits"
+			type="radio"
+			label="JGLOBAL_SHOW_HITS_LABEL"
+			description="JGLOBAL_SHOW_HITS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_noauth"
+			type="radio"
+			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="urls_position"
+			type="radio"
+			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
+			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+		</field>
+	</fieldset>
+
+	<fieldset 
+		name="editinglayout" 
+		label="COM_CONTENT_EDITING_LAYOUT"
+		description="COM_CONTENT_CONFIG_EDITOR_LAYOUT"
+	>
+
+		<field
+			name="captcha"
+			type="plugins"
+			label="COM_CONTENT_FIELD_CAPTCHA_LABEL"
+			description="COM_CONTENT_FIELD_CAPTCHA_DESC"
+			folder="captcha"
+			filter="cmd"
+			useglobal="true"
+			>
+			<option value="0">JOPTION_DO_NOT_USE</option>
+		</field>
+
+		<field
+			name="show_publishing_options"
+			type="radio"
+			label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL"
+			description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_article_options"
+			type="radio"
+			label="COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL"
+			description="COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
+			default="10"
+			showon="save_history:1"
+		/>
+
+		<field
+			name="show_urls_images_frontend"
+			type="radio"
+			label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL"
+			description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_urls_images_backend"
+			type="radio"
+			label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL"
+			description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="spacer3"
+			type="spacer"
+			hr="true"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+		/>
+
+		<field
+			name="targeta"
+			type="list"
+			label="COM_CONTENT_URL_FIELD_A_BROWSERNAV_LABEL"
+			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
+			default="Parent"
+			filter="int"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+			>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="2">JBROWSERTARGET_POPUP</option>
+			<option value="3">JBROWSERTARGET_MODAL</option>
+		</field>
+
+		<field
+			name="targetb"
+			type="list"
+			label="COM_CONTENT_URL_FIELD_B_BROWSERNAV_LABEL"
+			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
+			default="Parent"
+			filter="int"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+			>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="2">JBROWSERTARGET_POPUP</option>
+			<option value="3">JBROWSERTARGET_MODAL</option>
+		</field>
+
+		<field
+			name="targetc"
+			type="list"
+			label="COM_CONTENT_URL_FIELD_C_BROWSERNAV_LABEL"
+			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
+			default="Parent"
+			filter="int"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+			>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="2">JBROWSERTARGET_POPUP</option>
+			<option value="3">JBROWSERTARGET_MODAL</option>
+		</field>
+
+		<field
+			name="spacer4"
+			type="spacer"
+			hr="true"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+		/>
+
+		<field
+			name="float_intro"
+			type="list"
+			label="COM_CONTENT_FLOAT_INTRO_LABEL"
+			description="COM_CONTENT_FLOAT_DESC"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+			>
+			<option value="right">COM_CONTENT_RIGHT</option>
+			<option value="left">COM_CONTENT_LEFT</option>
+			<option value="none">COM_CONTENT_NONE</option>
+		</field>
+
+		<field
+			name="float_fulltext"
+			type="list"
+			label="COM_CONTENT_FLOAT_FULLTEXT_LABEL"
+			description="COM_CONTENT_FLOAT_DESC"
+			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
+			>
+			<option value="right">COM_CONTENT_RIGHT</option>
+			<option value="left">COM_CONTENT_LEFT</option>
+			<option value="none">COM_CONTENT_NONE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="category"
+		label="JCATEGORY"
+		description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC"
+	>
+
+		<field
+			name="category_layout" 
+			type="componentlayout"
+			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_content"
+			view="category"
+		/>
+
+		<field
+			name="show_category_heading_title_text"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_category_title"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_TITLE"
+			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_description"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_description_image"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="maxLevel" 
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
+			<option value="0">JNONE</option>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field 
+			name="show_empty_categories"
+			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_no_articles"
+			type="radio"
+			label="COM_CONTENT_NO_ARTICLES_LABEL"
+			description="COM_CONTENT_NO_ARTICLES_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_subcat_desc"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_cat_num_articles"
+			type="radio"
+			label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+			description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_cat_tags" 
+			type="radio"
+			label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
+			description="COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset 
+		name="categories"
+		label="JCATEGORIES"
+		description="COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC"
+	>
+		<field 
+			name="show_base_description"
+			type="radio"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="maxLevelcat" 
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
+			<option value="0">JNONE</option>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field 
+			name="show_empty_categories_cat"
+			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="maxLevelcat:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_subcat_desc_cat"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="maxLevelcat:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_cat_num_articles_cat"
+			type="radio"
+			label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+			description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset 
+		name="blog_default_parameters"
+		label="COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL"
+		description="COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC"
+	>
+
+		<field 
+			name="num_leading_articles"
+			type="number"
+			label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+			description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+			default="1"			
+		/>
+
+		<field 
+			name="num_intro_articles"
+			type="number"
+			label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+			description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+			default="4"
+		/>
+
+		<field 
+			name="num_columns"
+			type="number"
+			label="JGLOBAL_NUM_COLUMNS_LABEL"
+			description="JGLOBAL_NUM_COLUMNS_DESC"
+			default="2"
+		/>
+
+		<field 
+			name="num_links"
+			type="number"
+			label="JGLOBAL_NUM_LINKS_LABEL"
+			description="JGLOBAL_NUM_LINKS_DESC"
+			default="4"
+		/>
+
+		<field 
+			name="multi_column_order"
+			type="list"
+			label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+			description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+			default="0"
+			showon="num_columns!:,0,1"
+			>
+			<option value="0">JGLOBAL_DOWN</option>
+			<option value="1">JGLOBAL_ACROSS</option>
+		</field>
+
+		<field 
+			name="spacer1"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field 
+			name="show_subcategory_content" 
+			type="list"
+			label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+			default="0"
+			>
+			<option value="0">JNONE</option>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+	</fieldset>
+
+	<fieldset 
+		name="list_default_parameters"
+		label="JGLOBAL_LIST_LAYOUT_OPTIONS"
+		description="COM_CONTENT_CONFIG_LIST_SETTINGS_DESC"
+		addfieldpath="/administrator/components/com_content/models/fields"
+	>
+
+		<field 
+			name="show_pagination_limit"
+			type="radio"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="filter_field"
+			type="list"
+			label="JGLOBAL_FILTER_FIELD_LABEL"
+			description="JGLOBAL_FILTER_FIELD_DESC"
+			default="hide"
+			>
+			<option value="hide">JHIDE</option>
+			<option value="title">JGLOBAL_TITLE</option>
+			<option value="author">JAUTHOR</option>
+			<option value="hits">JGLOBAL_HITS</option>
+			<option value="tag">JTAG</option>
+		</field>
+
+		<field 
+			name="show_headings"
+			type="radio"
+			label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			description="JGLOBAL_SHOW_HEADINGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="list_show_date"
+			type="list"
+			label="JGLOBAL_SHOW_DATE_LABEL"
+			description="JGLOBAL_SHOW_DATE_DESC"
+			default="0"
+			>
+			<option value="0">JHIDE</option>
+			<option value="created">JGLOBAL_CREATED</option>
+			<option value="modified">JGLOBAL_MODIFIED</option>
+			<option value="published">JPUBLISHED</option>
+		</field>
+
+		<field 
+			name="date_format"
+			type="text"
+			label="JGLOBAL_DATE_FORMAT_LABEL"
+			description="JGLOBAL_DATE_FORMAT_DESC"
+			size="15"
+			showon="list_show_date:created,modified,published"
+		/>
+
+		<field 
+			name="list_show_hits"
+			type="radio"
+			label="JGLOBAL_LIST_HITS_LABEL"
+			description="JGLOBAL_LIST_HITS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="list_show_author"
+			type="radio"
+			label="JGLOBAL_LIST_AUTHOR_LABEL"
+			description="JGLOBAL_LIST_AUTHOR_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="list_show_votes"
+			type="voteradio"
+			label="JGLOBAL_LIST_VOTES_LABEL"
+			description="JGLOBAL_LIST_VOTES_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="list_show_ratings"
+			type="voteradio"
+			label="JGLOBAL_LIST_RATINGS_LABEL"
+			description="JGLOBAL_LIST_RATINGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="shared"
+		label="COM_CONTENT_SHARED_LABEL"
+		description="COM_CONTENT_SHARED_DESC"
+	>
+	
+		<field 
+			name="orderby_pri"
+			type="list"
+			label="JGLOBAL_CATEGORY_ORDER_LABEL"
+			description="JGLOBAL_CATEGORY_ORDER_DESC"
+			default="none"
+			>
+			<option value="none">JGLOBAL_NO_ORDER</option>
+			<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+			<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+			<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+		</field>
+
+		<field 
+			name="orderby_sec"
+			type="list"
+			label="JGLOBAL_ARTICLE_ORDER_LABEL"
+			description="JGLOBAL_ARTICLE_ORDER_DESC"
+			default="rdate"
+			>
+			<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+			<option value="date">JGLOBAL_OLDEST_FIRST</option>
+			<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+			<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+			<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+			<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+			<option value="hits">JGLOBAL_MOST_HITS</option>
+			<option value="rhits">JGLOBAL_LEAST_HITS</option>
+			<option value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
+			<option value="rorder">JGLOBAL_ARTICLE_MANAGER_REVERSE_ORDER</option>
+			<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+			<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+			<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+			<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+		</field>
+
+		<field 
+			name="order_date" 
+			type="list"
+			label="JGLOBAL_ORDERING_DATE_LABEL"
+			description="JGLOBAL_ORDERING_DATE_DESC"
+			showon="orderby_sec:rdate,date"
+			default="published"
+			>
+			<option value="created">JGLOBAL_CREATED</option>
+			<option value="modified">JGLOBAL_MODIFIED</option>
+			<option value="published">JPUBLISHED</option>
+		</field>
+
+		<field 
+			name="show_pagination"
+			type="list"
+			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
+			default="2"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="2">JGLOBAL_AUTO</option>
+		</field>
+
+		<field 
+			name="show_pagination_results"
+			type="radio"
+			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_pagination:1,2"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_featured" 
+			type="list" 
+			label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
+			description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC"
+			default="show"
+			>
+			<option value="show">JSHOW</option>
+			<option value="hide">JHIDE</option>
+			<option value="only">JONLY</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset 
+		name="integration"
+		label="JGLOBAL_INTEGRATION_LABEL"
+		description="COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC"
+	>
+
+		<field
+			name="show_feed_link"
+			type="radio"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="feed_summary"
+			type="list"
+			label="JGLOBAL_FEED_SUMMARY_LABEL"
+			description="JGLOBAL_FEED_SUMMARY_DESC"
+			default="0"
+			showon="show_feed_link:1"
+			>
+			<option value="0">JGLOBAL_INTRO_TEXT</option>
+			<option value="1">JGLOBAL_FULL_TEXT</option>
+		</field>
+
+		<field
+			name="feed_show_readmore"
+			type="radio"
+			label="JGLOBAL_FEED_SHOW_READMORE_LABEL"
+			description="JGLOBAL_FEED_SHOW_READMORE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="show_feed_link:1[AND]feed_summary:0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="sef_advanced"
+			type="radio"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			label="JGLOBAL_SEF_ADVANCED_LABEL"
+			description="JGLOBAL_SEF_ADVANCED_DESC"
+			filter="integer"
+		>
+			<option value="0">JGLOBAL_SEF_ADVANCED_LEGACY</option>
+			<option value="1">JGLOBAL_SEF_ADVANCED_MODERN</option>
+		</field>
+
+		<field
+			name="sef_ids"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="0"
+			label="JGLOBAL_SEF_NOIDS_LABEL"
+			description="JGLOBAL_SEF_NOIDS_DESC"
+			showon="sef_advanced:1"
+			filter="integer">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+	>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			validate="rules"
+			filter="rules"
+			component="com_content"
+			section="component"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_content/content.php b/core/administrator/components/com_content/content.php
new file mode 100644
index 00000000..9ca9f558
--- /dev/null
+++ b/core/administrator/components/com_content/content.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_content'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+JLoader::register('ContentHelper', __DIR__ . '/helpers/content.php');
+
+$controller = JControllerLegacy::getInstance('Content');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_content/content.xml b/core/administrator/components/com_content/content.xml
new file mode 100644
index 00000000..2e07450a
--- /dev/null
+++ b/core/administrator/components/com_content/content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_content</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CONTENT_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>content.php</filename>
+		<filename>controller.php</filename>
+		<filename>router.php</filename>
+		<folder>helpers</folder>
+		<folder>models</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_content.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>content.php</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>elements</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_content.ini</language>
+			<language tag="en-GB">language/en-GB.com_content.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
+
diff --git a/core/administrator/components/com_content/controller.php b/core/administrator/components/com_content/controller.php
new file mode 100644
index 00000000..cead07fb
--- /dev/null
+++ b/core/administrator/components/com_content/controller.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Component Controller
+ *
+ * @since  1.5
+ */
+class ContentController extends JControllerLegacy
+{
+	/**
+	 * The default view.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $default_view = 'articles';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  ContentController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		$view   = $this->input->get('view', 'articles');
+		$layout = $this->input->get('layout', 'articles');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'article' && $layout == 'edit' && !$this->checkEditId('com_content.edit.article', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_content&view=articles', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_content/controllers/article.php b/core/administrator/components/com_content/controllers/article.php
new file mode 100644
index 00000000..1a504d40
--- /dev/null
+++ b/core/administrator/components/com_content/controllers/article.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * The article controller
+ *
+ * @since  1.6
+ */
+class ContentControllerArticle extends JControllerForm
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// An article edit form can come from the articles or featured view.
+		// Adjust the redirect view on the value of 'return' in the request.
+		if ($this->input->get('return') == 'featured')
+		{
+			$this->view_list = 'featured';
+			$this->view_item = 'article&return=featured';
+		}
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
+		$allow = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the data or URL check it.
+			$allow = JFactory::getUser()->authorise('core.create', 'com_content.category.' . $categoryId);
+		}
+
+		if ($allow === null)
+		{
+			// In the absense of better information, revert to the component permissions.
+			return parent::allowAdd();
+		}
+
+		return $allow;
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user = JFactory::getUser();
+
+		// Zero record (id:0), return component edit permission by calling parent controller method
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Check edit on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit', 'com_content.article.' . $recordId))
+		{
+			return true;
+		}
+
+		// Check edit own on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit.own', 'com_content.article.' . $recordId))
+		{
+			// Existing record already has an owner, get it
+			$record = $this->getModel()->getItem($recordId);
+
+			if (empty($record))
+			{
+				return false;
+			}
+
+			// Grant if current user is owner of the record
+			return $user->id == $record->created_by;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   1.6
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		/** @var ContentModelArticle $model */
+		$model = $this->getModel('Article', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_content&view=articles' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+}
diff --git a/core/administrator/components/com_content/controllers/articles.php b/core/administrator/components/com_content/controllers/articles.php
new file mode 100644
index 00000000..85948486
--- /dev/null
+++ b/core/administrator/components/com_content/controllers/articles.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Articles list controller class.
+ *
+ * @since  1.6
+ */
+class ContentControllerArticles extends JControllerAdmin
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Articles default form can come from the articles or featured view.
+		// Adjust the redirect view on the value of 'view' in the request.
+		if ($this->input->get('view') == 'featured')
+		{
+			$this->view_list = 'featured';
+		}
+
+		$this->registerTask('unfeatured', 'featured');
+	}
+
+	/**
+	 * Method to toggle the featured setting of a list of articles.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function featured()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user   = JFactory::getUser();
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('featured' => 1, 'unfeatured' => 0);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		// Access checks.
+		foreach ($ids as $i => $id)
+		{
+			if (!$user->authorise('core.edit.state', 'com_content.article.' . (int) $id))
+			{
+				// Prune items that you can't change.
+				unset($ids[$i]);
+				JError::raiseNotice(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+			}
+		}
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var ContentModelArticle $model */
+			$model = $this->getModel();
+
+			// Publish the items.
+			if (!$model->featured($ids, $value))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+
+			if ($value == 1)
+			{
+				$message = JText::plural('COM_CONTENT_N_ITEMS_FEATURED', count($ids));
+			}
+			else
+			{
+				$message = JText::plural('COM_CONTENT_N_ITEMS_UNFEATURED', count($ids));
+			}
+		}
+
+		$view = $this->input->get('view', '');
+
+		if ($view == 'featured')
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_content&view=featured', false), $message);
+		}
+		else
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_content&view=articles', false), $message);
+		}
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  JModelLegacy
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Article', $prefix = 'ContentModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_content/controllers/featured.php b/core/administrator/components/com_content/controllers/featured.php
new file mode 100644
index 00000000..f5ffbbc1
--- /dev/null
+++ b/core/administrator/components/com_content/controllers/featured.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentControllerArticles', __DIR__ . '/articles.php');
+
+/**
+ * Featured content controller class.
+ *
+ * @since  1.6
+ */
+class ContentControllerFeatured extends ContentControllerArticles
+{
+	/**
+	 * Removes an item.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function delete()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user = JFactory::getUser();
+		$ids  = $this->input->get('cid', array(), 'array');
+
+		// Access checks.
+		foreach ($ids as $i => $id)
+		{
+			if (!$user->authorise('core.delete', 'com_content.article.' . (int) $id))
+			{
+				// Prune items that you can't delete.
+				unset($ids[$i]);
+				JError::raiseNotice(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+			}
+		}
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var ContentModelFeature $model */
+			$model = $this->getModel();
+
+			// Remove the items.
+			if (!$model->featured($ids, 0))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_content&view=featured');
+	}
+
+	/**
+	 * Method to publish a list of articles.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function publish()
+	{
+		parent::publish();
+
+		$this->setRedirect('index.php?option=com_content&view=featured');
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Feature', $prefix = 'ContentModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_content/helpers/associations.php b/core/administrator/components/com_content/helpers/associations.php
new file mode 100644
index 00000000..24aa9851
--- /dev/null
+++ b/core/administrator/components/com_content/helpers/associations.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Association\AssociationExtensionHelper;
+
+/**
+ * Content associations helper.
+ *
+ * @since  3.7.0
+ */
+class ContentAssociationsHelper extends AssociationExtensionHelper
+{
+	/**
+	 * The extension name
+	 *
+	 * @var     array   $extension
+	 *
+	 * @since   3.7.0
+	 */
+	protected $extension = 'com_content';
+
+	/**
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
+	 *
+	 * @since   3.7.0
+	 */
+	protected $itemTypes = array('article', 'category');
+
+	/**
+	 * Has the extension association support
+	 *
+	 * @var     boolean   $associationsSupport
+	 *
+	 * @since   3.7.0
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'article':
+				$table = JTable::getInstance('Content');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('Category');
+				break;
+		}
+
+		if (is_null($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since   3.7.0
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+			switch ($typeName)
+			{
+				case 'article':
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['category'] = true;
+					$support['save2copy'] = true;
+
+					$tables = array(
+						'a' => '#__content'
+					);
+
+					$title = 'article';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['level'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}
diff --git a/core/administrator/components/com_content/helpers/content.php b/core/administrator/components/com_content/helpers/content.php
new file mode 100644
index 00000000..a8a0b62e
--- /dev/null
+++ b/core/administrator/components/com_content/helpers/content.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content component helper.
+ *
+ * @since  1.6
+ */
+class ContentHelper extends JHelperContent
+{
+	public static $extension = 'com_content';
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('JGLOBAL_ARTICLES'),
+			'index.php?option=com_content&view=articles',
+			$vName == 'articles'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_CONTENT_SUBMENU_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_content',
+			$vName == 'categories'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_CONTENT_SUBMENU_FEATURED'),
+			'index.php?option=com_content&view=featured',
+			$vName == 'featured'
+		);
+
+		if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_content')->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_content.article',
+				$vName == 'fields.fields'
+			);
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_fields&view=groups&context=com_content.article',
+				$vName == 'fields.groups'
+			);
+		}
+	}
+
+	/**
+	 * Applies the content tag filters to arbitrary text as per settings for current user group
+	 *
+	 * @param   text  $text  The string to filter
+	 *
+	 * @return  string  The filtered string
+	 *
+	 * @deprecated  4.0  Use JComponentHelper::filterText() instead.
+	 */
+	public static function filterText($text)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JComponentHelper::filterText() instead', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return JComponentHelper::filterText($text);
+	}
+
+	/**
+	 * Adds Count Items for Category Manager.
+	 *
+	 * @param   stdClass[]  $items  The banner category objects
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.5
+	 */
+	public static function countItems(&$items)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('state, count(*) AS count')
+				->from($db->qn('#__content'))
+				->where('catid = ' . (int) $item->id)
+				->group('state');
+			$db->setQuery($query);
+			$articles = $db->loadObjectList();
+
+			foreach ($articles as $article)
+			{
+				if ($article->state == 1)
+				{
+					$item->count_published = $article->count;
+				}
+
+				if ($article->state == 0)
+				{
+					$item->count_unpublished = $article->count;
+				}
+
+				if ($article->state == 2)
+				{
+					$item->count_archived = $article->count;
+				}
+
+				if ($article->state == -2)
+				{
+					$item->count_trashed = $article->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Adds Count Items for Tag Manager.
+	 *
+	 * @param   stdClass[]  $items      The content objects
+	 * @param   string      $extension  The name of the active view.
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.6
+	 */
+	public static function countTagItems(&$items, $extension)
+	{
+		$db = JFactory::getDbo();
+		$parts     = explode('.', $extension);
+		$section   = null;
+
+		if (count($parts) > 1)
+		{
+			$section = $parts[1];
+		}
+
+		$join  = $db->qn('#__content') . ' AS c ON ct.content_item_id=c.id';
+		$state = 'state';
+
+		if ($section === 'category')
+		{
+			$join = $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id';
+			$state = 'published as state';
+		}
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select($state . ', count(*) AS count')
+				->from($db->qn('#__contentitem_tag_map') . 'AS ct ')
+				->where('ct.tag_id = ' . (int) $item->id)
+				->where('ct.type_alias =' . $db->q($extension))
+				->join('LEFT', $join)
+				->group('state');
+			$db->setQuery($query);
+			$contents = $db->loadObjectList();
+
+			foreach ($contents as $content)
+			{
+				if ($content->state == 1)
+				{
+					$item->count_published = $content->count;
+				}
+
+				if ($content->state == 0)
+				{
+					$item->count_unpublished = $content->count;
+				}
+
+				if ($content->state == 2)
+				{
+					$item->count_archived = $content->count;
+				}
+
+				if ($content->state == -2)
+				{
+					$item->count_trashed = $content->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Returns a valid section for articles. If it is not valid then null
+	 * is returned.
+	 *
+	 * @param   string  $section  The section to get the mapping for
+	 *
+	 * @return  string|null  The new section
+	 *
+	 * @since   3.7.0
+	 */
+	public static function validateSection($section)
+	{
+		if (JFactory::getApplication()->isClient('site'))
+		{
+			// On the front end we need to map some sections
+			switch ($section)
+			{
+				// Editing an article
+				case 'form':
+
+				// Category list view
+				case 'featured':
+				case 'category':
+					$section = 'article';
+			}
+		}
+
+		if ($section != 'article')
+		{
+			// We don't know other sections
+			return null;
+		}
+
+		return $section;
+	}
+
+	/**
+	 * Returns valid contexts
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getContexts()
+	{
+		JFactory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+		$contexts = array(
+			'com_content.article'    => JText::_('COM_CONTENT'),
+			'com_content.categories' => JText::_('JCATEGORY')
+		);
+
+		return $contexts;
+	}
+}
diff --git a/core/administrator/components/com_content/helpers/html/contentadministrator.php b/core/administrator/components/com_content/helpers/html/contentadministrator.php
new file mode 100644
index 00000000..821c9d2d
--- /dev/null
+++ b/core/administrator/components/com_content/helpers/html/contentadministrator.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php');
+
+/**
+ * Content HTML helper
+ *
+ * @since  3.0
+ */
+abstract class JHtmlContentAdministrator
+{
+	/**
+	 * Render the list of associated items
+	 *
+	 * @param   integer  $articleid  The article item id
+	 *
+	 * @return  string  The language HTML
+	 *
+	 * @throws  Exception
+	 */
+	public static function association($articleid)
+	{
+		// Defaults
+		$html = '';
+
+		// Get the associations
+		if ($associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $articleid))
+		{
+			foreach ($associations as $tag => $associated)
+			{
+				$associations[$tag] = (int) $associated->id;
+			}
+
+			// Get the associated menu items
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('c.*')
+				->select('l.sef as lang_sef')
+				->select('l.lang_code')
+				->from('#__content as c')
+				->select('cat.title as category_title')
+				->join('LEFT', '#__categories as cat ON cat.id=c.catid')
+				->where('c.id IN (' . implode(',', array_values($associations)) . ')')
+				->where('c.id != ' . $articleid)
+				->join('LEFT', '#__languages as l ON c.language=l.lang_code')
+				->select('l.image')
+				->select('l.title as language_title');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				throw new Exception($e->getMessage(), 500, $e);
+			}
+
+			if ($items)
+			{
+				foreach ($items as &$item)
+				{
+					$text    = $item->lang_sef ? strtoupper($item->lang_sef) : 'XX';
+					$url     = JRoute::_('index.php?option=com_content&task=article.edit&id=' . (int) $item->id);
+
+					$tooltip = htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br />' . JText::sprintf('JCATEGORY_SPRINTF', $item->category_title);
+					$classes = 'hasPopover label label-association label-' . $item->lang_sef;
+
+					$item->link = '<a href="' . $url . '" title="' . $item->language_title . '" class="' . $classes
+						. '" data-content="' . $tooltip . '" data-placement="top">'
+						. $text . '</a>';
+				}
+			}
+
+			JHtml::_('bootstrap.popover');
+
+			$html = JLayoutHelper::render('joomla.content.associations', $items);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Show the feature/unfeature links
+	 *
+	 * @param   integer  $value      The state value
+	 * @param   integer  $i          Row number
+	 * @param   boolean  $canChange  Is user allowed to change?
+	 *
+	 * @return  string       HTML code
+	 */
+	public static function featured($value = 0, $i, $canChange = true)
+	{
+		JHtml::_('bootstrap.tooltip');
+
+		// Array of image, task, title, action
+		$states = array(
+			0 => array('unfeatured', 'articles.featured', 'COM_CONTENT_UNFEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
+			1 => array('featured', 'articles.unfeatured', 'COM_CONTENT_FEATURED', 'JGLOBAL_TOGGLE_FEATURED'),
+		);
+		$state = ArrayHelper::getValue($states, (int) $value, $states[1]);
+		$icon  = $state[0];
+
+		if ($canChange)
+		{
+			$html = '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="btn btn-micro hasTooltip'
+				. ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3])
+				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+		}
+		else
+		{
+			$html = '<a class="btn btn-micro hasTooltip disabled' . ($value == 1 ? ' active' : '') . '" title="'
+				. JHtml::_('tooltipText', $state[2]) . '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_content/models/article.php b/core/administrator/components/com_content/models/article.php
new file mode 100644
index 00000000..868182bd
--- /dev/null
+++ b/core/administrator/components/com_content/models/article.php
@@ -0,0 +1,996 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php');
+
+/**
+ * Item Model for an Article.
+ *
+ * @since  1.6
+ */
+class ContentModelArticle extends JModelAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_CONTENT';
+
+	/**
+	 * The type alias for this content type (for example, 'com_content.article').
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $typeAlias = 'com_content.article';
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var    string
+	 * @since  3.4.4
+	 */
+	protected $associationsContext = 'com_content.item';
+
+	/**
+	 * Batch copy items to a new category or current.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		$categoryId = (int) $value;
+
+		$newIds = array();
+
+		if (!$this->checkCategoryId($categoryId))
+		{
+			return false;
+		}
+
+		JPluginHelper::importPlugin('system');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Register FieldsHelper
+		JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+		// Parent exists so we let's proceed
+		while (!empty($pks))
+		{
+			// Pop the first ID off the stack
+			$pk = array_shift($pks);
+
+			$this->table->reset();
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			$fields = FieldsHelper::getFields('com_content.article', $this->table, true);
+			$fieldsData = array();
+
+			if (!empty($fields))
+			{
+				$fieldsData['com_fields'] = array();
+
+				foreach ($fields as $field)
+				{
+					$fieldsData['com_fields'][$field->name] = $field->rawvalue;
+				}
+			}
+
+			// Alter the title & alias
+			$data = $this->generateNewTitle($categoryId, $this->table->alias, $this->table->title);
+			$this->table->title = $data['0'];
+			$this->table->alias = $data['1'];
+
+			// Reset the ID because we are making a copy
+			$this->table->id = 0;
+
+			// Reset hits because we are making a copy
+			$this->table->hits = 0;
+
+			// Unpublish because we are making a copy
+			$this->table->state = 0;
+
+			// New category ID
+			$this->table->catid = $categoryId;
+
+			// TODO: Deal with ordering?
+			// $table->ordering	= 1;
+
+			// Get the featured state
+			$featured = $this->table->featured;
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $this->table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+
+			// Check if the article was featured and update the #__content_frontpage table
+			if ($featured == 1)
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->insert($db->quoteName('#__content_frontpage'))
+					->values($newId . ', 0');
+				$db->setQuery($query);
+				$db->execute();
+			}
+
+			// Run event for copied article
+			$dispatcher->trigger('onContentAfterSave', array('com_content.article', &$this->table, true, $fieldsData));
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch move categories to a new category.
+	 *
+	 * @param   integer  $value     The new category ID.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.8.6
+	 */
+	protected function batchMove($value, $pks, $contexts)
+	{
+		if (empty($this->batchSet))
+		{
+			// Set some needed variables.
+			$this->user = JFactory::getUser();
+			$this->table = $this->getTable();
+			$this->tableClassName = get_class($this->table);
+			$this->contentType = new JUcmType;
+			$this->type = $this->contentType->getTypeByTable($this->tableClassName);
+		}
+
+		$categoryId = (int) $value;
+
+		if (!$this->checkCategoryId($categoryId))
+		{
+			return false;
+		}
+
+		JPluginHelper::importPlugin('system');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Register FieldsHelper
+		JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+		// Parent exists so we proceed
+		foreach ($pks as $pk)
+		{
+			if (!$this->user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			$fields = FieldsHelper::getFields('com_content.article', $this->table, true);
+			$fieldsData = array();
+
+			if (!empty($fields))
+			{
+				$fieldsData['com_fields'] = array();
+
+				foreach ($fields as $field)
+				{
+					$fieldsData['com_fields'][$field->name] = $field->rawvalue;
+				}
+			}
+
+			// Set the new category ID
+			$this->table->catid = $categoryId;
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			if (!empty($this->type))
+			{
+				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+			}
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Run event for moved article
+			$dispatcher->trigger('onContentAfterSave', array('com_content.article', &$this->table, false, $fieldsData));
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return false;
+			}
+
+			return JFactory::getUser()->authorise('core.delete', 'com_content.article.' . (int) $record->id);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to test whether a record can have its state edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		// Check for existing article.
+		if (!empty($record->id))
+		{
+			return $user->authorise('core.edit.state', 'com_content.article.' . (int) $record->id);
+		}
+
+		// New article, so check against the category.
+		if (!empty($record->catid))
+		{
+			return $user->authorise('core.edit.state', 'com_content.category.' . (int) $record->catid);
+		}
+
+		// Default to component settings if neither article nor category known.
+		return parent::canEditState($record);
+	}
+
+	/**
+	 * Prepare and sanitise the table data prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		// Set the publish date to now
+		if ($table->state == 1 && (int) $table->publish_up == 0)
+		{
+			$table->publish_up = JFactory::getDate()->toSql();
+		}
+
+		if ($table->state == 1 && intval($table->publish_down) == 0)
+		{
+			$table->publish_down = $this->getDbo()->getNullDate();
+		}
+
+		// Increment the content version number.
+		$table->version++;
+
+		// Reorder the articles within the category so the new article is first
+		if (empty($table->id))
+		{
+			$table->reorder('catid = ' . (int) $table->catid . ' AND state >= 0');
+		}
+	}
+
+	/**
+	 * Returns a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable    A database object
+	 */
+	public function getTable($type = 'Content', $prefix = 'JTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Convert the params field to an array.
+			$registry = new Registry($item->attribs);
+			$item->attribs = $registry->toArray();
+
+			// Convert the metadata field to an array.
+			$registry = new Registry($item->metadata);
+			$item->metadata = $registry->toArray();
+
+			// Convert the images field to an array.
+			$registry = new Registry($item->images);
+			$item->images = $registry->toArray();
+
+			// Convert the urls field to an array.
+			$registry = new Registry($item->urls);
+			$item->urls = $registry->toArray();
+
+			$item->articletext = trim($item->fulltext) != '' ? $item->introtext . "<hr id=\"system-readmore\" />" . $item->fulltext : $item->introtext;
+
+			if (!empty($item->id))
+			{
+				$item->tags = new JHelperTags;
+				$item->tags->getTagIds($item->id, 'com_content.article');
+			}
+		}
+
+		// Load associated content items
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$item->associations = array();
+
+			if ($item->id != null)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $item->id);
+
+				foreach ($associations as $tag => $association)
+				{
+					$item->associations[$tag] = $association->id;
+				}
+			}
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_content.article', 'article', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$jinput = JFactory::getApplication()->input;
+
+		/*
+		 * The front end calls this model and uses a_id to avoid id clashes so we need to check for that first.
+		 * The back end uses id so we use that the rest of the time and set it to 0 by default.
+		 */
+		$id = $jinput->get('a_id', $jinput->get('id', 0));
+
+		// Determine correct permissions to check.
+		if ($this->getState('article.id'))
+		{
+			$id = $this->getState('article.id');
+
+			// Existing record. Can only edit in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.edit');
+
+			// Existing record. Can only edit own articles in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.edit.own');
+		}
+		else
+		{
+			// New record. Can only create in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.create');
+		}
+
+		$user = JFactory::getUser();
+
+		// Check for existing article.
+		// Modify the form based on Edit State access controls.
+		if ($id != 0 && (!$user->authorise('core.edit.state', 'com_content.article.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('core.edit.state', 'com_content')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('featured', 'disabled', 'true');
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('publish_up', 'disabled', 'true');
+			$form->setFieldAttribute('publish_down', 'disabled', 'true');
+			$form->setFieldAttribute('state', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is an article you can edit.
+			$form->setFieldAttribute('featured', 'filter', 'unset');
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('publish_up', 'filter', 'unset');
+			$form->setFieldAttribute('publish_down', 'filter', 'unset');
+			$form->setFieldAttribute('state', 'filter', 'unset');
+		}
+
+		// Prevent messing with article language and category when editing existing article with associations
+		$app = JFactory::getApplication();
+		$assoc = JLanguageAssociations::isEnabled();
+
+		// Check if article is associated
+		if ($this->getState('article.id') && $app->isClient('site') && $assoc)
+		{
+			$associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $id);
+
+			// Make fields read only
+			if (!empty($associations))
+			{
+				$form->setFieldAttribute('language', 'readonly', 'true');
+				$form->setFieldAttribute('catid', 'readonly', 'true');
+				$form->setFieldAttribute('language', 'filter', 'unset');
+				$form->setFieldAttribute('catid', 'filter', 'unset');
+			}
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$app  = JFactory::getApplication();
+		$data = $app->getUserState('com_content.edit.article.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Pre-select some filters (Status, Category, Language, Access) in edit form if those have been selected in Article Manager: Articles
+			if ($this->getState('article.id') == 0)
+			{
+				$filters = (array) $app->getUserState('com_content.articles.filter');
+				$data->set(
+					'state',
+					$app->input->getInt(
+						'state',
+						((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
+					)
+				);
+				$data->set('catid', $app->input->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
+				$data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+				$data->set('access',
+					$app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))
+				);
+			}
+		}
+
+		// If there are params fieldsets in the form it will fail with a registry object
+		if (isset($data->params) && $data->params instanceof Registry)
+		{
+			$data->params = $data->params->toArray();
+		}
+
+		$this->preprocessData('com_content.article', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to validate the form data.
+	 *
+	 * @param   JForm   $form   The form to validate against.
+	 * @param   array   $data   The data to validate.
+	 * @param   string  $group  The name of the field group to validate.
+	 *
+	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
+	 *
+	 * @see     JFormRule
+	 * @see     JFilterInput
+	 * @since   3.7.0
+	 */
+	public function validate($form, $data, $group = null)
+	{
+		// Don't allow to change the users if not allowed to access com_users.
+		if (JFactory::getApplication()->isClient('administrator') && !JFactory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			if (isset($data['created_by']))
+			{
+				unset($data['created_by']);
+			}
+
+			if (isset($data['modified_by']))
+			{
+				unset($data['modified_by']);
+			}
+		}
+
+		return parent::validate($form, $data, $group);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$input  = JFactory::getApplication()->input;
+		$filter = JFilterInput::getInstance();
+
+		if (isset($data['metadata']) && isset($data['metadata']['author']))
+		{
+			$data['metadata']['author'] = $filter->clean($data['metadata']['author'], 'TRIM');
+		}
+
+		if (isset($data['created_by_alias']))
+		{
+			$data['created_by_alias'] = $filter->clean($data['created_by_alias'], 'TRIM');
+		}
+
+		if (isset($data['images']) && is_array($data['images']))
+		{
+			$registry = new Registry($data['images']);
+
+			$data['images'] = (string) $registry;
+		}
+
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// Cast catid to integer for comparison
+		$catid = (int) $data['catid'];
+
+		// Check if New Category exists
+		if ($catid > 0)
+		{
+			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
+		}
+
+		// Save New Category
+		if ($catid == 0 && $this->canCreateCategory())
+		{
+			$table = array();
+			$table['title'] = $data['catid'];
+			$table['parent_id'] = 1;
+			$table['extension'] = 'com_content';
+			$table['language'] = $data['language'];
+			$table['published'] = 1;
+
+			// Create new category and get catid back
+			$data['catid'] = CategoriesHelper::createCategory($table);
+		}
+
+		if (isset($data['urls']) && is_array($data['urls']))
+		{
+			$check = $input->post->get('jform', array(), 'array');
+
+			foreach ($data['urls'] as $i => $url)
+			{
+				if ($url != false && ($i == 'urla' || $i == 'urlb' || $i == 'urlc'))
+				{
+					if (preg_match('~^#[a-zA-Z]{1}[a-zA-Z0-9-_:.]*$~', $check['urls'][$i]) == 1)
+					{
+						$data['urls'][$i] = $check['urls'][$i];
+					}
+					else
+					{
+						$data['urls'][$i] = JStringPunycode::urlToPunycode($url);
+					}
+				}
+			}
+
+			unset($check);
+
+			$registry = new Registry($data['urls']);
+
+			$data['urls'] = (string) $registry;
+		}
+
+		// Alter the title for save as copy
+		if ($input->get('task') == 'save2copy')
+		{
+			$origTable = clone $this->getTable();
+			$origTable->load($input->getInt('id'));
+
+			if ($data['title'] == $origTable->title)
+			{
+				list($title, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
+				$data['title'] = $title;
+				$data['alias'] = $alias;
+			}
+			else
+			{
+				if ($data['alias'] == $origTable->alias)
+				{
+					$data['alias'] = '';
+				}
+			}
+
+			$data['state'] = 0;
+		}
+
+		// Automatic handling of alias for empty fields
+		if (in_array($input->get('task'), array('apply', 'save', 'save2new')) && (!isset($data['id']) || (int) $data['id'] == 0))
+		{
+			if ($data['alias'] == null)
+			{
+				if (JFactory::getConfig()->get('unicodeslugs') == 1)
+				{
+					$data['alias'] = JFilterOutput::stringURLUnicodeSlug($data['title']);
+				}
+				else
+				{
+					$data['alias'] = JFilterOutput::stringURLSafe($data['title']);
+				}
+
+				$table = JTable::getInstance('Content', 'JTable');
+
+				if ($table->load(array('alias' => $data['alias'], 'catid' => $data['catid'])))
+				{
+					$msg = JText::_('COM_CONTENT_SAVE_WARNING');
+				}
+
+				list($title, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
+				$data['alias'] = $alias;
+
+				if (isset($msg))
+				{
+					JFactory::getApplication()->enqueueMessage($msg, 'warning');
+				}
+			}
+		}
+
+		if (parent::save($data))
+		{
+			if (isset($data['featured']))
+			{
+				$this->featured($this->getState($this->getName() . '.id'), $data['featured']);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to toggle the featured setting of articles.
+	 *
+	 * @param   array    $pks    The ids of the items to toggle.
+	 * @param   integer  $value  The value to toggle to.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function featured($pks, $value = 0)
+	{
+		// Sanitize the ids.
+		$pks = (array) $pks;
+		$pks = ArrayHelper::toInteger($pks);
+
+		if (empty($pks))
+		{
+			$this->setError(JText::_('COM_CONTENT_NO_ITEM_SELECTED'));
+
+			return false;
+		}
+
+		$table = $this->getTable('Featured', 'ContentTable');
+
+		try
+		{
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__content'))
+				->set('featured = ' . (int) $value)
+				->where('id IN (' . implode(',', $pks) . ')');
+			$db->setQuery($query);
+			$db->execute();
+
+			if ((int) $value == 0)
+			{
+				// Adjust the mapping table.
+				// Clear the existing features settings.
+				$query = $db->getQuery(true)
+					->delete($db->quoteName('#__content_frontpage'))
+					->where('content_id IN (' . implode(',', $pks) . ')');
+				$db->setQuery($query);
+				$db->execute();
+			}
+			else
+			{
+				// First, we find out which of our new featured articles are already featured.
+				$query = $db->getQuery(true)
+					->select('f.content_id')
+					->from('#__content_frontpage AS f')
+					->where('content_id IN (' . implode(',', $pks) . ')');
+				$db->setQuery($query);
+
+				$oldFeatured = $db->loadColumn();
+
+				// We diff the arrays to get a list of the articles that are newly featured
+				$newFeatured = array_diff($pks, $oldFeatured);
+
+				// Featuring.
+				$tuples = array();
+
+				foreach ($newFeatured as $pk)
+				{
+					$tuples[] = $pk . ', 0';
+				}
+
+				if (count($tuples))
+				{
+					$columns = array('content_id', 'ordering');
+					$query = $db->getQuery(true)
+						->insert($db->quoteName('#__content_frontpage'))
+						->columns($db->quoteName($columns))
+						->values($tuples);
+					$db->setQuery($query);
+					$db->execute();
+				}
+			}
+		}
+		catch (Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		$table->reorder();
+
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   object  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return array('catid = ' . (int) $table->catid);
+	}
+
+	/**
+	 * Allows preprocessing of the JForm object.
+	 *
+	 * @param   JForm   $form   The form object
+	 * @param   array   $data   The data to be merged into the form object
+	 * @param   string  $group  The plugin group to be executed
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		if ($this->canCreateCategory())
+		{
+			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+		}
+
+		// Association content items
+		if (JLanguageAssociations::isEnabled())
+		{
+			$languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc');
+
+			if (count($languages) > 1)
+			{
+				$addform = new SimpleXMLElement('<form />');
+				$fields = $addform->addChild('fields');
+				$fields->addAttribute('name', 'associations');
+				$fieldset = $fields->addChild('fieldset');
+				$fieldset->addAttribute('name', 'item_associations');
+
+				foreach ($languages as $language)
+				{
+					$field = $fieldset->addChild('field');
+					$field->addAttribute('name', $language->lang_code);
+					$field->addAttribute('type', 'modal_article');
+					$field->addAttribute('language', $language->lang_code);
+					$field->addAttribute('label', $language->title);
+					$field->addAttribute('translate_label', 'false');
+					$field->addAttribute('select', 'true');
+					$field->addAttribute('new', 'true');
+					$field->addAttribute('edit', 'true');
+					$field->addAttribute('clear', 'true');
+				}
+
+				$form->load($addform, false);
+			}
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Custom clean the cache of com_content and content modules
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('com_content');
+		parent::cleanCache('mod_articles_archive');
+		parent::cleanCache('mod_articles_categories');
+		parent::cleanCache('mod_articles_category');
+		parent::cleanCache('mod_articles_latest');
+		parent::cleanCache('mod_articles_news');
+		parent::cleanCache('mod_articles_popular');
+	}
+
+	/**
+	 * Void hit function for pagebreak when editing content from frontend
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function hit()
+	{
+		return;
+	}
+
+	/**
+	 * Is the user allowed to create an on the fly category?
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.1
+	 */
+	private function canCreateCategory()
+	{
+		return JFactory::getUser()->authorise('core.create', 'com_content');
+	}
+
+	/**
+	 * Delete #__content_frontpage items if the deleted articles was featured
+	 *
+	 * @param   object  $pks  The primary key related to the contents that was deleted.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function delete(&$pks)
+	{
+		$return = parent::delete($pks);
+
+		if ($return)
+		{
+			// Now check to see if this articles was featured if so delete it from the #__content_frontpage table
+			$db = $this->getDbo();
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__content_frontpage'))
+				->where('content_id IN (' . implode(',', $pks) . ')');
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_content/models/articles.php b/core/administrator/components/com_content/models/articles.php
new file mode 100644
index 00000000..c38c16b5
--- /dev/null
+++ b/core/administrator/components/com_content/models/articles.php
@@ -0,0 +1,441 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Methods supporting a list of article records.
+ *
+ * @since  1.6
+ */
+class ContentModelArticles extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_title',
+				'state', 'a.state',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'modified', 'a.modified',
+				'created_by', 'a.created_by',
+				'created_by_alias', 'a.created_by_alias',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'published', 'a.published',
+				'author_id',
+				'category_id',
+				'level',
+				'tag',
+				'rating_count', 'rating',
+			);
+
+			if (JLanguageAssociations::isEnabled())
+			{
+				$config['filter_fields'][] = 'association';
+			}
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.id', $direction = 'desc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+		$this->setState('filter.published', $published);
+
+		$level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level');
+		$this->setState('filter.level', $level);
+
+		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+		$this->setState('filter.language', $language);
+
+		$formSubmited = $app->input->post->get('form_submited');
+
+		$access     = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
+		$authorId   = $this->getUserStateFromRequest($this->context . '.filter.author_id', 'filter_author_id');
+		$categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+		$tag        = $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
+
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+
+			$authorId = $app->input->post->get('author_id');
+			$this->setState('filter.author_id', $authorId);
+
+			$categoryId = $app->input->post->get('category_id');
+			$this->setState('filter.category_id', $categoryId);
+
+			$tag = $app->input->post->get('tag');
+			$this->setState('filter.tag', $tag);
+		}
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('filter.language', $forcedLanguage);
+			$this->setState('filter.forcedLanguage', $forcedLanguage);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . serialize($this->getState('filter.access'));
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+		$id .= ':' . serialize($this->getState('filter.author_id'));
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . serialize($this->getState('filter.tag'));
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user  = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'DISTINCT a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid' .
+				', a.state, a.access, a.created, a.created_by, a.created_by_alias, a.modified, a.ordering, a.featured, a.language, a.hits' .
+				', a.publish_up, a.publish_down'
+			)
+		);
+		$query->from('#__content AS a');
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Join over the categories.
+		$query->select('c.title AS category_title')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name')
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
+
+		// Join on voting table
+		$assogroup = 'a.id, l.title, l.image, uc.name, ag.title, c.title, ua.name';
+
+		if (JPluginHelper::isEnabled('content', 'vote'))
+		{
+			$assogroup .= ', v.rating_sum, v.rating_count';
+			$query->select('COALESCE(NULLIF(ROUND(v.rating_sum  / v.rating_count, 0), 0), 0) AS rating, 
+					COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
+				->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
+		}
+
+		// Join over the associations.
+		if (JLanguageAssociations::isEnabled())
+		{
+			$query->select('COUNT(asso2.id)>1 as association')
+				->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_content.item'))
+				->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key')
+				->group($assogroup);
+		}
+
+		// Filter by access level.
+		$access = $this->getState('filter.access');
+
+		if (is_numeric($access))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+		elseif (is_array($access))
+		{
+			$access = ArrayHelper::toInteger($access);
+			$access = implode(',', $access);
+			$query->where('a.access IN (' . $access . ')');
+		}
+
+		// Filter by access level on categories.
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+			$query->where('c.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state = 0 OR a.state = 1)');
+		}
+
+		// Filter by categories and by level
+		$categoryId = $this->getState('filter.category_id', array());
+		$level = $this->getState('filter.level');
+
+		if (!is_array($categoryId))
+		{
+			$categoryId = $categoryId ? array($categoryId) : array();
+		}
+
+		// Case: Using both categories filter and by level filter
+		if (count($categoryId))
+		{
+			$categoryId = ArrayHelper::toInteger($categoryId);
+			$categoryTable = JTable::getInstance('Category', 'JTable');
+			$subCatItemsWhere = array();
+
+			foreach ($categoryId as $filter_catid)
+			{
+				$categoryTable->load($filter_catid);
+				$subCatItemsWhere[] = '(' .
+					($level ? 'c.level <= ' . ((int) $level + (int) $categoryTable->level - 1) . ' AND ' : '') .
+					'c.lft >= ' . (int) $categoryTable->lft . ' AND ' .
+					'c.rgt <= ' . (int) $categoryTable->rgt . ')';
+			}
+
+			$query->where('(' . implode(' OR ', $subCatItemsWhere) . ')');
+		}
+
+		// Case: Using only the by level filter
+		elseif ($level)
+		{
+			$query->where('c.level <= ' . (int) $level);
+		}
+
+		// Filter by author
+		$authorId = $this->getState('filter.author_id');
+
+		if (is_numeric($authorId))
+		{
+			$type = $this->getState('filter.author_id.include', true) ? '= ' : '<>';
+			$query->where('a.created_by ' . $type . (int) $authorId);
+		}
+		elseif (is_array($authorId))
+		{
+			$authorId = ArrayHelper::toInteger($authorId);
+			$authorId = implode(',', $authorId);
+			$query->where('a.created_by IN (' . $authorId . ')');
+		}
+
+		// Filter by search in title.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'author:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
+				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where('a.language = ' . $db->quote($language));
+		}
+
+		// Filter by a single or group of tags.
+		$hasTag = false;
+		$tagId  = $this->getState('filter.tag');
+
+		if (is_numeric($tagId))
+		{
+			$hasTag = true;
+
+			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId);
+		}
+		elseif (is_array($tagId))
+		{
+			$tagId = ArrayHelper::toInteger($tagId);
+			$tagId = implode(',', $tagId);
+
+			if (!empty($tagId))
+			{
+				$hasTag = true;
+
+				$query->where($db->quoteName('tagmap.tag_id') . ' IN (' . $tagId . ')');
+			}
+		}
+
+		if ($hasTag)
+		{
+			$query->join('LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap')
+				. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
+				. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_content.article')
+			);
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering', 'a.id');
+		$orderDirn = $this->state->get('list.direction', 'DESC');
+
+		$query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
+		return $query;
+	}
+
+	/**
+	 * Build a list of authors
+	 *
+	 * @return  stdClass
+	 *
+	 * @since   1.6
+	 */
+	public function getAuthors()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Construct the query
+		$query->select('u.id AS value, u.name AS text')
+			->from('#__users AS u')
+			->join('INNER', '#__content AS c ON c.created_by = u.id')
+			->group('u.id, u.name')
+			->order('u.name');
+
+		// Setup the query
+		$db->setQuery($query);
+
+		// Return the result
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Method to get a list of articles.
+	 * Overridden to add a check for access levels.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6.1
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+
+		if (JFactory::getApplication()->isClient('site'))
+		{
+			$groups = JFactory::getUser()->getAuthorisedViewLevels();
+
+			foreach (array_keys($items) as $x)
+			{
+				// Check the access level. Remove articles the user shouldn't see
+				if (!in_array($items[$x]->access, $groups))
+				{
+					unset($items[$x]);
+				}
+			}
+		}
+
+		return $items;
+	}
+}
diff --git a/core/administrator/components/com_content/models/feature.php b/core/administrator/components/com_content/models/feature.php
new file mode 100644
index 00000000..34f0c2ed
--- /dev/null
+++ b/core/administrator/components/com_content/models/feature.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentModelArticle', __DIR__ . '/article.php');
+
+/**
+ * Feature model.
+ *
+ * @since  1.6
+ */
+class ContentModelFeature extends ContentModelArticle
+{
+	/**
+	 * Returns a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable	A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Featured', $prefix = 'ContentTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   object  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return array();
+	}
+}
diff --git a/core/administrator/components/com_content/models/featured.php b/core/administrator/components/com_content/models/featured.php
new file mode 100644
index 00000000..944126fd
--- /dev/null
+++ b/core/administrator/components/com_content/models/featured.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ContentModelArticles', __DIR__ . '/articles.php');
+
+/**
+ * Methods supporting a list of featured article records.
+ *
+ * @since  1.6
+ */
+class ContentModelFeatured extends ContentModelArticles
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_title',
+				'state', 'a.state',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'created_by_alias', 'a.created_by_alias',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'fp.ordering',
+				'published', 'a.published',
+				'author_id',
+				'category_id',
+				'level',
+				'tag',
+				'rating_count', 'rating',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.hits,' .
+					'a.created_by, a.featured, a.language, a.created_by_alias, a.publish_up, a.publish_down'
+			)
+		);
+		$query->from('#__content AS a');
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the content table.
+		$query->select('fp.ordering')
+			->join('INNER', '#__content_frontpage AS fp ON fp.content_id = a.id');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Join over the categories.
+		$query->select('c.title AS category_title')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name')
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
+
+		// Join on voting table
+		if (JPluginHelper::isEnabled('content', 'vote'))
+		{
+			$query->select('COALESCE(NULLIF(ROUND(v.rating_sum  / v.rating_count, 0), 0), 0) AS rating,
+							COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
+				->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
+		}
+
+		// Filter by access level.
+		$access = $this->getState('filter.access');
+
+		if (is_numeric($access))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+		elseif (is_array($access))
+		{
+			$access = ArrayHelper::toInteger($access);
+			$access = implode(',', $access);
+			$query->where('a.access IN (' . $access . ')');
+		}
+
+		// Filter by access level on categories.
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+			$query->where('c.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state = 0 OR a.state = 1)');
+		}
+
+		// Filter by a single or group of categories.
+		$baselevel = 1;
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$cat_tbl = JTable::getInstance('Category', 'JTable');
+			$cat_tbl->load($categoryId);
+			$rgt = $cat_tbl->rgt;
+			$lft = $cat_tbl->lft;
+			$baselevel = (int) $cat_tbl->level;
+			$query->where('c.lft >= ' . (int) $lft)
+				->where('c.rgt <= ' . (int) $rgt);
+		}
+		elseif (is_array($categoryId))
+		{
+			$categoryId = implode(',', ArrayHelper::toInteger($categoryId));
+			$query->where('a.catid IN (' . $categoryId . ')');
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where('c.level <= ' . ((int) $level + (int) $baselevel - 1));
+		}
+
+		// Filter by author
+		$authorId = $this->getState('filter.author_id');
+
+		if (is_numeric($authorId))
+		{
+			$type = $this->getState('filter.author_id.include', true) ? '= ' : '<>';
+			$query->where('a.created_by ' . $type . (int) $authorId);
+		}
+		elseif (is_array($authorId))
+		{
+			$authorId = ArrayHelper::toInteger($authorId);
+			$authorId = implode(',', $authorId);
+			$query->where('a.created_by IN (' . $authorId . ')');
+		}
+
+		// Filter by search in title.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'author:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
+				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search);
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where('a.language = ' . $db->quote($language));
+		}
+
+		// Filter by a single or group of tags.
+		$tagId = $this->getState('filter.tag');
+
+		if (is_array($tagId) && count($tagId) === 1)
+		{
+			$tagId = current($tagId);
+		}
+
+		if (is_array($tagId))
+		{
+			$tagId = implode(',', ArrayHelper::toInteger($tagId));
+
+			if ($tagId)
+			{
+				$subQuery = $db->getQuery(true)
+					->select('DISTINCT content_item_id')
+					->from($db->quoteName('#__contentitem_tag_map'))
+					->where('tag_id IN (' . $tagId . ')')
+					->where('type_alias = ' . $db->quote('com_content.article'));
+
+				$query->join('INNER', '(' . (string) $subQuery . ') AS tagmap ON tagmap.content_item_id = a.id');
+			}
+		}
+		elseif ($tagId)
+		{
+			$query->join(
+				'INNER',
+				$db->quoteName('#__contentitem_tag_map', 'tagmap')
+				. ' ON tagmap.tag_id = ' . (int) $tagId
+				. ' AND tagmap.content_item_id = a.id'
+				. ' AND tagmap.type_alias = ' . $db->quote('com_content.article')
+			);
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering', 'a.title');
+		$orderDirn = $this->state->get('list.direction', 'ASC');
+
+		$query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	protected function populateState($ordering = 'a.title', $direction = 'asc')
+	{
+		parent::populateState($ordering, $direction);
+	}
+}
diff --git a/core/administrator/components/com_content/models/fields/modal/article.php b/core/administrator/components/com_content/models/fields/modal/article.php
new file mode 100644
index 00000000..28934a3c
--- /dev/null
+++ b/core/administrator/components/com_content/models/fields/modal/article.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Supports a modal article picker.
+ *
+ * @since  1.6
+ */
+class JFormFieldModal_Article extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'Modal_Article';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
+
+		// Load language
+		JFactory::getLanguage()->load('com_content', JPATH_ADMINISTRATOR);
+
+		// The active article id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Create the modal id.
+		$modalId = 'Article_' . $this->id;
+
+		// Add the modal field script to the document head.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true));
+
+		// Script to proxy the select modal function to the modal-fields.js file.
+		if ($allowSelect)
+		{
+			static $scriptSelect = null;
+
+			if (is_null($scriptSelect))
+			{
+				$scriptSelect = array();
+			}
+
+			if (!isset($scriptSelect[$this->id]))
+			{
+				JFactory::getDocument()->addScriptDeclaration("
+				function jSelectArticle_" . $this->id . "(id, title, catid, object, url, language) {
+					window.processModalSelect('Article', '" . $this->id . "', id, title, catid, object, url, language);
+				}
+				");
+
+				$scriptSelect[$this->id] = true;
+			}
+		}
+
+		// Setup variables for display.
+		$linkArticles = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$linkArticle  = 'index.php?option=com_content&amp;view=article&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+
+		if (isset($this->element['language']))
+		{
+			$linkArticles .= '&amp;forcedLanguage=' . $this->element['language'];
+			$linkArticle  .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle    = JText::_('COM_CONTENT_CHANGE_ARTICLE') . ' &#8212; ' . $this->element['label'];
+		}
+		else
+		{
+			$modalTitle    = JText::_('COM_CONTENT_CHANGE_ARTICLE');
+		}
+
+		$urlSelect = $linkArticles . '&amp;function=jSelectArticle_' . $this->id;
+		$urlEdit   = $linkArticle . '&amp;task=article.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
+		$urlNew    = $linkArticle . '&amp;task=article.add';
+
+		if ($value)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__content'))
+				->where($db->quoteName('id') . ' = ' . (int) $value);
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		$title = empty($title) ? JText::_('COM_CONTENT_SELECT_AN_ARTICLE') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The current article display field.
+		$html  = '<span class="input-append">';
+		$html .= '<input class="input-medium" id="' . $this->id . '_name" type="text" value="' . $title . '" disabled="disabled" size="35" />';
+
+		// Select article button
+		if ($allowSelect)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_select"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalSelect' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CONTENT_CHANGE_ARTICLE') . '">'
+				. '<span class="icon-file" aria-hidden="true"></span> ' . JText::_('JSELECT')
+				. '</a>';
+		}
+
+		// New article button
+		if ($allowNew)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_new"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalNew' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CONTENT_NEW_ARTICLE') . '">'
+				. '<span class="icon-new" aria-hidden="true"></span> ' . JText::_('JACTION_CREATE')
+				. '</a>';
+		}
+
+		// Edit article button
+		if ($allowEdit)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_edit"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalEdit' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_CONTENT_EDIT_ARTICLE') . '">'
+				. '<span class="icon-edit" aria-hidden="true"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
+		}
+
+		// Clear article button
+		if ($allowClear)
+		{
+			$html .= '<a'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_clear"'
+				. ' href="#"'
+				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
+				. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+				. '</a>';
+		}
+
+		$html .= '</span>';
+
+		// Select article modal
+		if ($allowSelect)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalSelect' . $modalId,
+				array(
+					'title'       => $modalTitle,
+					'url'         => $urlSelect,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+				)
+			);
+		}
+
+		// New article modal
+		if ($allowNew)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalNew' . $modalId,
+				array(
+					'title'       => JText::_('COM_CONTENT_NEW_ARTICLE'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlNew,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'article\', \'cancel\', \'item-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'article\', \'save\', \'item-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'article\', \'apply\', \'item-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Edit article modal
+		if ($allowEdit)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalEdit' . $modalId,
+				array(
+					'title'       => JText::_('COM_CONTENT_EDIT_ARTICLE'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlEdit,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'article\', \'cancel\', \'item-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'article\', \'save\', \'item-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'article\', \'apply\', \'item-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Note: class='required' for client side validation.
+		$class = $this->required ? ' class="required modal-value"' : '';
+
+		$html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
+			. '" data-text="' . htmlspecialchars(JText::_('COM_CONTENT_SELECT_AN_ARTICLE', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.4
+	 */
+	protected function getLabel()
+	{
+		return str_replace($this->id, $this->id . '_id', parent::getLabel());
+	}
+}
diff --git a/core/administrator/components/com_content/models/fields/voteradio.php b/core/administrator/components/com_content/models/fields/voteradio.php
new file mode 100644
index 00000000..2a2d2a63
--- /dev/null
+++ b/core/administrator/components/com_content/models/fields/voteradio.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('radio');
+
+/**
+ * Voteradio Field class.
+ *
+ * @since  3.8.0
+ */
+class JFormFieldVoteradio extends JFormFieldRadio
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.7.1
+	 */
+	protected $type = 'Voteradio';
+
+	/**
+	 * Method to get the field Label.
+	 *
+	 * @return array The field label objects.
+	 *
+	 * @throws \Exception
+	 *
+	 * @since  3.8.2
+	 */
+	public function getLabel()
+	{
+		// Requires vote plugin enabled
+		return JPluginHelper::isEnabled('content', 'vote') ? parent::getLabel() : null;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return array The field option objects.
+	 *
+	 * @throws \Exception
+	 *
+	 * @since  3.7.1
+	 */
+	public function getOptions()
+	{
+		// Requires vote plugin enabled
+		return JPluginHelper::isEnabled('content', 'vote') ? parent::getOptions() : array();
+	}
+}
diff --git a/core/administrator/components/com_content/models/forms/article.xml b/core/administrator/components/com_content/models/forms/article.xml
new file mode 100644
index 00000000..a186859f
--- /dev/null
+++ b/core/administrator/components/com_content/models/forms/article.xml
@@ -0,0 +1,1060 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_categories/models/fields" >
+		<field 
+			name="id" 
+			type="number" 
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC" 
+			class="readonly" 
+			size="10" 
+			default="0"
+			readonly="true" 
+		/>
+
+		<field 
+			name="asset_id" 
+			type="hidden" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="title" 
+			type="text" 
+			label="JGLOBAL_TITLE"
+			description="JFIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true" 
+		/>
+
+		<field 
+			name="alias" 
+			type="text" 
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+			size="40" 
+		/>
+
+		<field 
+			name="version_note" 
+			type="text" 
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			class="span12"
+			maxlength="255"
+			size="45"
+		/>
+
+		<field 
+			name="articletext" 
+			type="editor"
+			label="COM_CONTENT_FIELD_ARTICLETEXT_LABEL" 
+			description="COM_CONTENT_FIELD_ARTICLETEXT_DESC"
+			filter="JComponentHelper::filterText"
+			buttons="true" 
+		/>
+
+		<field 
+			name="state" 
+			type="list" 
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC" 
+			class="chzn-color-state"
+			filter="intval" 
+			size="1" 
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field 
+			name="catid"
+			type="categoryedit"
+			label="JCATEGORY"
+			description="JFIELD_CATEGORY_DESC"
+			required="true"
+			default=""
+		/>
+
+		<field 
+			name="tags"
+			type="tag"
+			label="JTAG"
+			description="JTAG_DESC"
+			class="span12"
+			multiple="true"
+		/>
+
+		<field
+			name="buttonspacer"
+			type="spacer" 
+			description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
+		/>
+
+		<field 
+			name="created" 
+			type="calendar" 
+			label="COM_CONTENT_FIELD_CREATED_LABEL"
+			description="COM_CONTENT_FIELD_CREATED_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc" 
+		/>
+
+		<field 
+			name="created_by" 
+			type="user"
+			label="COM_CONTENT_FIELD_CREATED_BY_LABEL" 
+			description="COM_CONTENT_FIELD_CREATED_BY_DESC" 
+		/>
+
+		<field 
+			name="created_by_alias" 
+			type="text"
+			label="COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL" 
+			description="COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20" 
+		/>
+
+		<field 
+			name="modified" 
+			type="calendar" 
+			label="JGLOBAL_FIELD_MODIFIED_LABEL" 
+			description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			class="readonly"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			readonly="true"
+			filter="user_utc" 
+		/>
+
+		<field 
+			name="modified_by" 
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field 
+			name="checked_out" 
+			type="hidden" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="checked_out_time" 
+			type="hidden" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="publish_up"
+			type="calendar"
+			label="COM_CONTENT_FIELD_PUBLISH_UP_LABEL"
+			description="COM_CONTENT_FIELD_PUBLISH_UP_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc" 
+		/>
+
+		<field 
+			name="publish_down"
+			type="calendar"
+			label="COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL"
+			description="COM_CONTENT_FIELD_PUBLISH_DOWN_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc" 
+		/>
+
+		<field
+			name="version" 
+			type="text" 
+			label="COM_CONTENT_FIELD_VERSION_LABEL" 
+			description="COM_CONTENT_FIELD_VERSION_DESC"
+			size="6" 
+			class="readonly"
+			readonly="true" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="ordering" 
+			type="text" 
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC" 
+			size="6"
+			default="0" 
+		/>
+
+		<field 
+			name="metakey" 
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL" 
+			description="JFIELD_META_KEYWORDS_DESC"
+			rows="3" 
+			cols="30"
+		/>
+
+		<field 
+			name="metadesc" 
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL" 
+			description="JFIELD_META_DESCRIPTION_DESC"
+			rows="3" 
+			cols="30" 
+		/>
+
+		<field 
+			name="access" 
+			type="accesslevel" 
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC" 
+			size="1" 
+		/>
+
+		<field 
+			name="hits" 
+			type="number" 
+			label="JGLOBAL_HITS"
+			description="COM_CONTENT_FIELD_HITS_DESC" 
+			class="readonly" 
+			size="6"
+			readonly="true" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="language" 
+			type="contentlanguage" 
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_CONTENT_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field 
+			name="featured" 
+			type="radio"
+			label="JFEATURED"
+			description="COM_CONTENT_FIELD_FEATURED_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field 
+			name="rules" 
+			type="rules" 
+			label="JFIELD_RULES_LABEL"
+			translate_label="false" 
+			filter="rules"
+			component="com_content" 
+			section="article" 
+			validate="rules"
+		/>
+
+	</fieldset>
+
+	<fields name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+		<fieldset name="basic" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+
+			<field 
+				name="article_layout" 
+				type="componentlayout"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				useglobal="true"
+				extension="com_content" 
+				view="article"
+			/>
+
+			<field
+				name="show_title"
+				type="list"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field
+				name="link_titles"
+				type="list"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option	value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_tags"
+				type="list"
+				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field 
+				name="show_intro"
+				type="list"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+				useglobal="true"
+				>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field
+				name="info_block_show_title"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_category"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_category"
+				type="list"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_parent_category"
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_parent_category"
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_associations"
+				type="list"
+				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
+				description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field
+				name="show_author"
+				type="list"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_author"
+				type="list"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_create_date"
+				type="list"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_modify_date"
+				type="list"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_publish_date"
+				type="list"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				class="chzn-color"
+				useglobal="true"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_item_navigation"
+				type="list"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_icons"
+				type="list"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_print_icon"
+				type="list"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_email_icon"
+				type="list"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_vote"
+				type="list"
+				label="JGLOBAL_SHOW_VOTE_LABEL"
+				description="JGLOBAL_SHOW_VOTE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_hits"
+				type="list"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_noauth"
+				type="list"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="urls_position"
+				type="list"
+				label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
+				description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+			</field>
+
+			<field
+				name="spacer2"
+				type="spacer"
+				hr="true"
+			/>
+
+			<field 
+				name="alternative_readmore" 
+				type="text"
+				label="JFIELD_READMORE_LABEL"
+				description="JFIELD_READMORE_DESC"
+				size="25" 
+			/>
+
+			<field 
+				name="article_page_title" 
+				type="text"
+				label="COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL"
+				description="COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_DESC"
+				size="25" 
+			/>
+		</fieldset>
+
+		<fieldset name="editorConfig" label="COM_CONTENT_EDITORCONFIG_FIELDSET_LABEL">
+			<field
+				name="show_publishing_options"
+				type="list"
+				label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL"
+				description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_article_options"
+				type="list"
+				label="COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL"
+				description="COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_urls_images_backend"
+				type="list"
+				label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL"
+				description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				default=""
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_urls_images_frontend"
+				type="list"
+				label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL"
+				description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				default=""
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="basic-limited" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+			<field
+				name="show_title"
+				type="hidden"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+			/>
+
+			<field
+				name="link_titles"
+				type="hidden"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+			/>
+
+			<field 
+				name="show_intro"
+				type="hidden"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+			/>
+
+			<field
+				name="show_category"
+				type="hidden"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+			/>
+
+			<field
+				name="link_category"
+				type="hidden"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+			/>
+
+			<field
+				name="show_parent_category"
+				type="hidden"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+			/>
+
+			<field
+				name="link_parent_category"
+				type="hidden"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+			/>
+
+			<field
+				name="show_author"
+				type="hidden"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+			/>
+
+			<field
+				name="link_author"
+				type="hidden"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+			/>
+
+			<field
+				name="show_create_date"
+				type="hidden"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+			/>
+
+			<field
+				name="show_modify_date"
+				type="hidden"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+			/>
+
+			<field
+				name="show_publish_date"
+				type="hidden"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+			/>
+
+			<field
+				name="show_item_navigation"
+				type="hidden"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+			/>
+
+			<field
+				name="show_icons"
+				type="hidden"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+			/>
+
+			<field
+				name="show_print_icon"
+				type="hidden"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+			/>
+
+			<field
+				name="show_email_icon"
+				type="hidden"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+			/>
+
+			<field
+				name="show_vote"
+				type="hidden"
+				label="JGLOBAL_SHOW_VOTE_LABEL"
+				description="JGLOBAL_SHOW_VOTE_DESC"
+			/>
+
+			<field
+				name="show_hits"
+				type="hidden"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+			/>
+
+			<field
+				name="show_noauth"
+				type="hidden"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+			/>
+
+			<field 
+				name="alternative_readmore" 
+				type="hidden"
+				label="JFIELD_READMORE_LABEL"
+				description="JFIELD_READMORE_DESC"
+				size="25" 
+			/>
+
+			<field 
+				name="article_layout" 
+				type="hidden"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				useglobal="true"
+				extension="com_content" view="article"
+			/>
+		</fieldset>
+	</fields>
+
+	<field 
+		name="xreference" 
+		type="text"
+		label="JFIELD_KEY_REFERENCE_LABEL"
+		description="JFIELD_KEY_REFERENCE_DESC"
+		size="20" 
+	/>
+
+	<fields name="images" label="COM_CONTENT_FIELD_IMAGE_OPTIONS">
+		<field
+			name="image_intro"
+			type="media"
+			label="COM_CONTENT_FIELD_INTRO_LABEL"
+			description="COM_CONTENT_FIELD_INTRO_DESC" 
+		/>
+		
+		<field
+			name="float_intro"
+			type="list"
+			label="COM_CONTENT_FLOAT_LABEL"
+			description="COM_CONTENT_FLOAT_DESC"
+			useglobal="true"
+			>
+			<option value="right">COM_CONTENT_RIGHT</option>
+			<option value="left">COM_CONTENT_LEFT</option>
+			<option value="none">COM_CONTENT_NONE</option>
+		</field>
+		
+		<field 
+			name="image_intro_alt"
+			type="text"
+			label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
+			description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
+			size="20"
+		/>
+
+		<field 
+			name="image_intro_caption"
+			type="text"
+			label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+			description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
+			size="20"
+		/>
+
+		<field
+			name="spacer1"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="image_fulltext"
+			type="media"
+			label="COM_CONTENT_FIELD_FULL_LABEL"
+			description="COM_CONTENT_FIELD_FULL_DESC"
+		/>
+
+		<field
+			name="float_fulltext"
+			type="list"
+			label="COM_CONTENT_FLOAT_LABEL"
+			description="COM_CONTENT_FLOAT_DESC"
+			useglobal="true"
+			>
+			<option value="right">COM_CONTENT_RIGHT</option>
+			<option value="left">COM_CONTENT_LEFT</option>
+			<option value="none">COM_CONTENT_NONE</option>
+		</field>
+
+		<field 
+			name="image_fulltext_alt"
+			type="text"
+			label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
+			description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
+			size="20"
+		/>
+			
+		<field 
+			name="image_fulltext_caption"
+			type="text"
+			label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+			description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
+			size="20"
+		/>
+	</fields>
+	<fields name="urls" label="COM_CONTENT_FIELD_URLS_OPTIONS">
+		<field
+			name="urla"
+			type="url"
+			label="COM_CONTENT_FIELD_URLA_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
+			validate="url"
+			filter="url"
+			relative="true"
+		/>
+
+		<field 
+			name="urlatext"
+			type="text"
+			label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
+			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+			size="20"
+		/>
+
+		<field
+			name="targeta"
+			type="list"
+			label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
+			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
+			default=""
+			filter="options"
+			useglobal="true"
+			>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="2">JBROWSERTARGET_POPUP</option>
+			<option value="3">JBROWSERTARGET_MODAL</option>
+		</field>
+
+		<field
+			name="spacer3"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="urlb"
+			type="url"
+			label="COM_CONTENT_FIELD_URLB_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
+			validate="url"
+			filter="url"
+			relative="true"
+		/>
+
+		<field 
+			name="urlbtext"
+			type="text"
+			label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
+			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+			size="20"
+		/>
+
+		<field
+			name="targetb"
+			type="list"
+			label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
+			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
+			default=""
+			filter="options"
+			useglobal="true"
+			>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="2">JBROWSERTARGET_POPUP</option>
+			<option value="3">JBROWSERTARGET_MODAL</option>
+		</field>
+
+		<field
+			name="spacer4"
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="urlc"
+			type="url"
+			label="COM_CONTENT_FIELD_URLC_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
+			validate="url"
+			filter="url"
+			relative="true"
+		/>
+
+		<field
+			name="urlctext"
+			type="text"
+			label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
+			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+			size="20"
+		/>
+
+		<field
+			name="targetc"
+			type="list"
+			label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
+			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
+			default=""
+			filter="options"
+			useglobal="true"
+			>
+			<option value="0">JBROWSERTARGET_PARENT</option>
+			<option value="1">JBROWSERTARGET_NEW</option>
+			<option value="2">JBROWSERTARGET_POPUP</option>
+			<option value="3">JBROWSERTARGET_MODAL</option>
+		</field>
+
+	</fields>
+
+	<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+		<fieldset name="jmetadata"
+			label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+			<field 
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+
+			<field 
+				name="author" 
+				type="text"
+				label="JAUTHOR"
+				description="JFIELD_METADATA_AUTHOR_DESC"
+				size="20" 
+			/>
+
+			<field 
+				name="rights" 
+				type="textarea" 
+				label="JFIELD_META_RIGHTS_LABEL"
+				description="JFIELD_META_RIGHTS_DESC" 
+				filter="string"
+				cols="30" 
+				rows="2" 
+			/>
+
+			<field 
+				name="xreference" 
+				type="text"
+				label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
+				description="COM_CONTENT_FIELD_XREFERENCE_DESC"
+				size="20" 
+			/>
+
+		</fieldset>
+	</fields>
+	<!-- These fields are used to get labels for the Content History Preview and Compare Views -->
+	<fields>
+		<field 
+			name="introtext" 
+			label="COM_CONTENT_FIELD_INTROTEXT" 
+		/>
+
+		<field 
+			name="fulltext" 
+			label="COM_CONTENT_FIELD_FULLTEXT" 
+		/>
+	</fields>
+
+</form>
diff --git a/core/administrator/components/com_content/models/forms/filter_articles.xml b/core/administrator/components/com_content/models/forms/filter_articles.xml
new file mode 100644
index 00000000..2e1995ca
--- /dev/null
+++ b/core/administrator/components/com_content/models/forms/filter_articles.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_CONTENT_FILTER_SEARCH_LABEL"
+			description="COM_CONTENT_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="COM_CONTENT_FILTER_PUBLISHED"
+			description="COM_CONTENT_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_content"
+			onchange="this.form.submit();"
+			published="0,1,2"
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="author_id"
+			type="author"
+			label="COM_CONTENT_FILTER_AUTHOR"
+			description="COM_CONTENT_FILTER_AUTHOR_DESC"
+			multiple="true"
+			class="multipleAuthors"
+			onchange="this.form.submit();"
+			>
+			<option value="0">JNONE</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			multiple="true"
+			class="multipleTags"
+			mode="nested"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+			</field>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.featured ASC">JFEATURED_ASC</option>
+			<option value="a.featured DESC">JFEATURED_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
+			<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
+			<option value="a.created_by ASC">JAUTHOR_ASC</option>
+			<option value="a.created_by DESC">JAUTHOR_DESC</option>
+			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.created ASC">JDATE_ASC</option>
+			<option value="a.created DESC">JDATE_DESC</option>
+			<option value="a.modified ASC">COM_CONTENT_MODIFIED_ASC</option>
+			<option value="a.modified DESC">COM_CONTENT_MODIFIED_DESC</option>
+			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
+			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
+			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
+			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
+			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
+			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
+			<option value="rating_count ASC" requires="vote">JGLOBAL_VOTES_ASC</option>
+			<option value="rating_count DESC" requires="vote">JGLOBAL_VOTES_DESC</option>
+			<option value="rating ASC" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			<option value="rating DESC" requires="vote">JGLOBAL_RATINGS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_content/models/forms/filter_featured.xml b/core/administrator/components/com_content/models/forms/filter_featured.xml
new file mode 100644
index 00000000..79bbe00f
--- /dev/null
+++ b/core/administrator/components/com_content/models/forms/filter_featured.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_CONTENT_FILTER_SEARCH_LABEL"
+			description="COM_CONTENT_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="COM_CONTENT_FILTER_PUBLISHED"
+			description="COM_CONTENT_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_content"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="author_id"
+			type="author"
+			label="COM_CONTENT_FILTER_AUTHOR"
+			description="COM_CONTENT_FILTER_AUTHOR_DESC"
+			multiple="true"
+			class="multipleAuthors"
+			onchange="this.form.submit();"
+			>
+			<option value="0">JNONE</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			multiple="true"
+			class="multipleTags"
+			mode="nested"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.title ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="fp.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="fp.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.created_by ASC">JAUTHOR_ASC</option>
+			<option value="a.created_by DESC">JAUTHOR_DESC</option>
+			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
+			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
+			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
+			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
+			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.created ASC">JDATE_ASC</option>
+			<option value="a.created DESC">JDATE_DESC</option>
+			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
+			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
+			<option value="rating_count ASC" requires="vote">JGLOBAL_VOTES_ASC</option>
+			<option value="rating_count DESC" requires="vote">JGLOBAL_VOTES_DESC</option>
+			<option value="rating ASC" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			<option value="rating DESC" requires="vote">JGLOBAL_RATINGS_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_content/tables/featured.php b/core/administrator/components/com_content/tables/featured.php
new file mode 100644
index 00000000..2a1d4808
--- /dev/null
+++ b/core/administrator/components/com_content/tables/featured.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Featured Table class.
+ *
+ * @since  1.6
+ */
+class ContentTableFeatured extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database connector object
+	 *
+	 * @since   1.6
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__content_frontpage', 'content_id', $db);
+	}
+}
diff --git a/core/administrator/components/com_content/views/article/tmpl/edit.php b/core/administrator/components/com_content/views/article/tmpl/edit.php
new file mode 100644
index 00000000..4e0a15ca
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/edit.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', 'select');
+
+$this->configFieldsets  = array('editorConfig');
+$this->hiddenFieldsets  = array('basic-limited');
+$this->ignore_fieldsets = array('jmetadata', 'item_associations');
+
+// Create shortcut to parameters.
+$params = clone $this->state->get('params');
+$params->merge(new Registry($this->item->attribs));
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+$assoc = JLanguageAssociations::isEnabled();
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "article.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
+		{
+			jQuery("#permissions-sliders select").attr("disabled", "disabled");
+			' . $this->form->getField('articletext')->save() . '
+			Joomla.submitform(task, document.getElementById("item-form"));
+
+			// @deprecated 4.0  The following js is not needed since 3.7.0.
+			if (task !== "article.apply")
+			{
+				window.parent.jQuery("#articleEdit' . (int) $this->item->id . 'Modal").modal("hide");
+			}
+		}
+	};
+');
+
+// In case of modal
+$isModal = $input->get('layout') == 'modal' ? true : false;
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('COM_CONTENT_ARTICLE_CONTENT')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<fieldset class="adminform">
+					<?php echo $this->form->getInput('articletext'); ?>
+				</fieldset>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php // Do not show the images and links options if the edit form is configured not to. ?>
+		<?php if ($params->get('show_urls_images_backend') == 1) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'images', JText::_('COM_CONTENT_FIELDSET_URLS_AND_IMAGES')); ?>
+			<div class="row-fluid form-horizontal-desktop">
+				<div class="span6">
+					<?php echo $this->form->renderField('images'); ?>
+					<?php foreach ($this->form->getGroup('images') as $field) : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				</div>
+				<div class="span6">
+					<?php foreach ($this->form->getGroup('urls') as $field) : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				</div>
+			</div>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php $this->show_options = $params->get('show_article_options', 1); ?>
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php // Do not show the publishing options if the edit form is configured not to. ?>
+		<?php if ($params->get('show_publishing_options', 1) == 1) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('COM_CONTENT_FIELDSET_PUBLISHING')); ?>
+			<div class="row-fluid form-horizontal-desktop">
+				<div class="span6">
+					<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+				</div>
+				<div class="span6">
+					<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+				</div>
+			</div>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+
+		<?php if ( ! $isModal && $assoc) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+			<?php echo $this->loadTemplate('associations'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php elseif ($isModal && $assoc) : ?>
+			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+		<?php endif; ?>
+
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'editor', JText::_('COM_CONTENT_SLIDER_EDITOR_CONFIG')); ?>
+			<?php echo $this->form->renderFieldset('editorConfig'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'permissions', JText::_('COM_CONTENT_FIELDSET_RULES')); ?>
+				<?php echo $this->form->getInput('rules'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="return" value="<?php echo $input->getCmd('return'); ?>" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_content/views/article/tmpl/edit.xml b/core/administrator/components/com_content/views/article/tmpl/edit.xml
new file mode 100755
index 00000000..f5efd601
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/edit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_ARTICLE_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_CONTENT_ARTICLE_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+	<fieldset name="request">
+		<fields name="request">
+			<field
+				name="id"
+				type="hidden"
+				default="0"
+			/>
+		</fields>
+	</fieldset>
+</metadata>
diff --git a/core/administrator/components/com_content/views/article/tmpl/edit_associations.php b/core/administrator/components/com_content/views/article/tmpl/edit_associations.php
new file mode 100644
index 00000000..96383368
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/edit_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_content/views/article/tmpl/edit_metadata.php b/core/administrator/components/com_content/views/article/tmpl/edit_metadata.php
new file mode 100644
index 00000000..764ea0ee
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/edit_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_content/views/article/tmpl/modal.php b/core/administrator/components/com_content/views/article/tmpl/modal.php
new file mode 100644
index 00000000..28dfda20
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/modal.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+
+// @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0.
+$function  = JFactory::getApplication()->input->getCmd('function', 'jEditArticle_' . (int) $this->item->id);
+
+// Function to update input title when changed
+JFactory::getDocument()->addScriptDeclaration('
+	function jEditArticleModal() {
+		if (window.parent && document.formvalidator.isValid(document.getElementById("item-form"))) {
+			return window.parent.' . $this->escape($function) . '(document.getElementById("jform_title").value);
+		}
+	}
+');
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('article.apply'); jEditArticleModal();"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('article.save'); jEditArticleModal();"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('article.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/core/administrator/components/com_content/views/article/tmpl/modal_associations.php b/core/administrator/components/com_content/views/article/tmpl/modal_associations.php
new file mode 100644
index 00000000..96383368
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/modal_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_content/views/article/tmpl/modal_metadata.php b/core/administrator/components/com_content/views/article/tmpl/modal_metadata.php
new file mode 100644
index 00000000..764ea0ee
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/modal_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_content/views/article/tmpl/pagebreak.php b/core/administrator/components/com_content/views/article/tmpl/pagebreak.php
new file mode 100644
index 00000000..a9684c5a
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/tmpl/pagebreak.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+JHtml::_('script', 'com_content/admin-article-pagebreak.min.js', array('version' => 'auto', 'relative' => true));
+
+$document    = JFactory::getDocument();
+$this->eName = JFactory::getApplication()->input->getCmd('e_name', '');
+$this->eName = preg_replace('#[^A-Z0-9\-\_\[\]]#i', '', $this->eName);
+
+$document->setTitle(JText::_('COM_CONTENT_PAGEBREAK_DOC_TITLE'));
+?>
+<div class="container-popup">
+	<form class="form-horizontal">
+
+		<div class="control-group">
+			<label for="title" class="control-label"><?php echo JText::_('COM_CONTENT_PAGEBREAK_TITLE'); ?></label>
+			<div class="controls"><input type="text" id="title" name="title" /></div>
+		</div>
+
+		<div class="control-group">
+			<label for="alias" class="control-label"><?php echo JText::_('COM_CONTENT_PAGEBREAK_TOC'); ?></label>
+			<div class="controls"><input type="text" id="alt" name="alt" /></div>
+		</div>
+
+		<button onclick="insertPagebreak('<?php echo $this->eName; ?>');" class="btn btn-success pull-right">
+			<?php echo JText::_('COM_CONTENT_PAGEBREAK_INSERT_BUTTON'); ?>
+		</button>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_content/views/article/view.html.php b/core/administrator/components/com_content/views/article/view.html.php
new file mode 100644
index 00000000..f0bfabc6
--- /dev/null
+++ b/core/administrator/components/com_content/views/article/view.html.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit an article.
+ *
+ * @since  1.6
+ */
+class ContentViewArticle extends JViewLegacy
+{
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * The actions the user is authorised to perform
+	 *
+	 * @var  JObject
+	 */
+	protected $canDo;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		if ($this->getLayout() == 'pagebreak')
+		{
+			return parent::display($tpl);
+		}
+
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+		$this->canDo = JHelperContent::getActions('com_content', 'article', $this->item->id);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// If we are forcing a language in modal (used for associations).
+		if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd'))
+		{
+			// Set the language field to the forcedLanguage and disable changing it.
+			$this->form->setValue('language', null, $forcedLanguage);
+			$this->form->setFieldAttribute('language', 'readonly', 'true');
+
+			// Only allow to select categories with All language or with the forced language.
+			$this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage);
+
+			// Only allow to select tags with All language or with the forced language.
+			$this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+		$user       = JFactory::getUser();
+		$userId     = $user->id;
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Built the actions for new and existing records.
+		$canDo = $this->canDo;
+
+		JToolbarHelper::title(
+			JText::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))),
+			'pencil-2 article-add'
+		);
+
+		// For new records, check the create permission.
+		if ($isNew && (count($user->getAuthorisedCategories('com_content', 'core.create')) > 0))
+		{
+			JToolbarHelper::apply('article.apply');
+			JToolbarHelper::save('article.save');
+			JToolbarHelper::save2new('article.save2new');
+			JToolbarHelper::cancel('article.cancel');
+		}
+		else
+		{
+			// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
+			$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
+
+			// Can't save the record if it's checked out and editable
+			if (!$checkedOut && $itemEditable)
+			{
+				JToolbarHelper::apply('article.apply');
+				JToolbarHelper::save('article.save');
+
+				// We can save this record, but check the create permission to see if we can return to make a new one.
+				if ($canDo->get('core.create'))
+				{
+					JToolbarHelper::save2new('article.save2new');
+				}
+			}
+
+			// If checked out, we can still save
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2copy('article.save2copy');
+			}
+
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
+			{
+				JToolbarHelper::versions('com_content.article', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('article.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_CONTENT_ARTICLE_MANAGER_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_content/views/articles/tmpl/default.php b/core/administrator/components/com_content/views/articles/tmpl/default.php
new file mode 100644
index 00000000..14d5f48f
--- /dev/null
+++ b/core/administrator/components/com_content/views/articles/tmpl/default.php
@@ -0,0 +1,281 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
+JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_ACCESS')));
+JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+$columns   = 10;
+
+if (strpos($listOrder, 'publish_up') !== false)
+{
+	$orderingColumn = 'publish_up';
+}
+elseif (strpos($listOrder, 'publish_down') !== false)
+{
+	$orderingColumn = 'publish_down';
+}
+elseif (strpos($listOrder, 'modified') !== false)
+{
+	$orderingColumn = 'modified';
+}
+else
+{
+	$orderingColumn = 'created';
+}
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_content&task=articles.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'articleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+
+$assoc = JLanguageAssociations::isEnabled();
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php
+		// Search tools bar
+		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+		?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="articleList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th style="min-width:100px" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort',  'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($assoc) : ?>
+							<?php $columns++; ?>
+							<th width="5%" class="nowrap hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+							</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort',  'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($this->vote) : ?>
+							<?php $columns++; ?>
+							<th width="1%" class="nowrap hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_VOTES', 'rating_count', $listDirn, $listOrder); ?>
+							</th>
+							<?php $columns++; ?>
+							<th width="1%" class="nowrap hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_RATINGS', 'rating', $listDirn, $listOrder); ?>
+							</th>
+						<?php endif; ?>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="<?php echo $columns; ?>">
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$item->max_ordering = 0;
+					$ordering   = ($listOrder == 'a.ordering');
+					$canCreate  = $user->authorise('core.create',     'com_content.category.' . $item->catid);
+					$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $item->id);
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+					$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $item->id) && $item->created_by == $userId;
+					$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+					?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass ?>">
+								<span class="icon-menu" aria-hidden="true"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td class="center">
+							<div class="btn-group">
+								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+								<?php echo JHtml::_('contentadministrator.featured', $item->featured, $i, $canChange); ?>
+								<?php // Create dropdown items and render the dropdown list.
+								if ($canChange)
+								{
+									JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'articles');
+									JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'articles');
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
+								}
+								?>
+							</div>
+						</td>
+						<td class="has-context">
+							<div class="pull-left break-word">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit || $canEditOwn) : ?>
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+										<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+								<?php endif; ?>
+								<span class="small break-word">
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								</span>
+								<div class="small">
+									<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+								</div>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<?php if ($assoc) : ?>
+						<td class="hidden-phone">
+							<?php if ($item->association) : ?>
+								<?php echo JHtml::_('contentadministrator.association', $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<?php endif; ?>
+						<td class="small hidden-phone">
+							<?php if ((int) $item->created_by != 0) : ?>
+								<?php if ($item->created_by_alias) : ?>
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo JText::_('JAUTHOR'); ?>">
+									<?php echo $this->escape($item->author_name); ?></a>
+									<div class="smallsub"><?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
+								<?php else : ?>
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo JText::_('JAUTHOR'); ?>">
+									<?php echo $this->escape($item->author_name); ?></a>
+								<?php endif; ?>
+							<?php else : ?>
+								<?php if ($item->created_by_alias) : ?>
+									<?php echo JText::_('JNONE'); ?>
+									<div class="smallsub"><?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
+								<?php else : ?>
+									<?php echo JText::_('JNONE'); ?>
+								<?php endif; ?>
+							<?php endif; ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php
+							$date = $item->{$orderingColumn};
+							echo $date > 0 ? JHtml::_('date', $date, JText::_('DATE_FORMAT_LC4')) : '-';
+							?>
+						</td>
+						<td class="hidden-phone center">
+							<span class="badge badge-info">
+								<?php echo (int) $item->hits; ?>
+							</span>
+						</td>
+						<?php if ($this->vote) : ?>
+							<td class="hidden-phone center">
+								<span class="badge badge-success" >
+								<?php echo (int) $item->rating_count; ?>
+								</span>
+							</td>
+							<td class="hidden-phone center">
+								<span class="badge badge-warning" >
+								<?php echo (int) $item->rating; ?>
+								</span>
+							</td>
+						<?php endif; ?>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', 'com_content')
+				&& $user->authorise('core.edit', 'com_content')
+				&& $user->authorise('core.edit.state', 'com_content')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_CONTENT_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<?php echo $this->pagination->getListFooter(); ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_content/views/articles/tmpl/default.xml b/core/administrator/components/com_content/views/articles/tmpl/default.xml
new file mode 100755
index 00000000..b3dec7f7
--- /dev/null
+++ b/core/administrator/components/com_content/views/articles/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_ARTICLES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CONTENT_ARTICLES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_content/views/articles/tmpl/default_batch_body.php b/core/administrator/components/com_content/views/articles/tmpl/default_batch_body.php
new file mode 100644
index 00000000..73afe728
--- /dev/null
+++ b/core/administrator/components/com_content/views/articles/tmpl/default_batch_body.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_content'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php b/core/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..5be5d8c9
--- /dev/null
+++ b/core/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-user-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('article.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_content/views/articles/tmpl/modal.php b/core/administrator/components/com_content/views/articles/tmpl/modal.php
new file mode 100644
index 00000000..1ccce20f
--- /dev/null
+++ b/core/administrator/components/com_content/views/articles/tmpl/modal.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php');
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+JHtml::_('script', 'com_content/admin-articles-modal.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
+JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_ACCESS')));
+JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$function  = $app->input->getCmd('function', 'jSelectArticle');
+$editor    = $app->input->getCmd('editor', '');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$onclick   = $this->escape($function);
+
+if (!empty($editor))
+{
+	// This view is used also in com_menus. Load the xtd script only if the editor is set!
+	JFactory::getDocument()->addScriptOptions('xtd-articles', array('editor' => $editor));
+	$onclick = "jSelectArticle";
+}
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1&editor=' . $editor); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+
+		<div class="clearfix"></div>
+
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped table-condensed">
+				<thead>
+					<tr>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="6">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				$iconStates = array(
+					-2 => 'icon-trash',
+					0  => 'icon-unpublish',
+					1  => 'icon-publish',
+					2  => 'icon-archive',
+				);
+				?>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<?php if ($item->language && JLanguageMultilang::isEnabled())
+					{
+						$tag = strlen($item->language);
+						if ($tag == 5)
+						{
+							$lang = substr($item->language, 0, 2);
+						}
+						elseif ($tag == 6)
+						{
+							$lang = substr($item->language, 0, 3);
+						}
+						else {
+							$lang = '';
+						}
+					}
+					elseif (!JLanguageMultilang::isEnabled())
+					{
+						$lang = '';
+					}
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>" aria-hidden="true"></span>
+						</td>
+						<td>
+							<?php $attribs = 'data-function="' . $this->escape($onclick) . '"'
+								. ' data-id="' . $item->id . '"'
+								. ' data-title="' . $this->escape($item->title) . '"'
+								. ' data-cat-id="' . $this->escape($item->catid) . '"'
+								. ' data-uri="' . $this->escape(ContentHelperRoute::getArticleRoute($item->id, $item->catid, $item->language)) . '"'
+								. ' data-language="' . $this->escape($lang) . '"';
+							?>
+							<a class="select-link" href="javascript:void(0)" <?php echo $attribs; ?>>
+								<?php echo $this->escape($item->title); ?>
+							</a>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="small">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_content/views/articles/view.html.php b/core/administrator/components/com_content/views/articles/view.html.php
new file mode 100644
index 00000000..3ce0edcb
--- /dev/null
+++ b/core/administrator/components/com_content/views/articles/view.html.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of articles.
+ *
+ * @since  1.6
+ */
+class ContentViewArticles extends JViewLegacy
+{
+	/**
+	 * The item authors
+	 *
+	 * @var  stdClass
+	 */
+	protected $authors;
+
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Form object for search filters
+	 *
+	 * @var  JForm
+	 */
+	public $filterForm;
+
+	/**
+	 * The active search filters
+	 *
+	 * @var  array
+	 */
+	public $activeFilters;
+
+	/**
+	 * The sidebar markup
+	 *
+	 * @var  string
+	 */
+	protected $sidebar;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		if ($this->getLayout() !== 'modal')
+		{
+			ContentHelper::addSubmenu('articles');
+		}
+
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->authors       = $this->get('Authors');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->vote          = JPluginHelper::isEnabled('content', 'vote');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Levels filter - Used in Hathor.
+		// @deprecated  4.0 To be removed with Hathor
+		$this->f_levels = array(
+			JHtml::_('select.option', '1', JText::_('J1')),
+			JHtml::_('select.option', '2', JText::_('J2')),
+			JHtml::_('select.option', '3', JText::_('J3')),
+			JHtml::_('select.option', '4', JText::_('J4')),
+			JHtml::_('select.option', '5', JText::_('J5')),
+			JHtml::_('select.option', '6', JText::_('J6')),
+			JHtml::_('select.option', '7', JText::_('J7')),
+			JHtml::_('select.option', '8', JText::_('J8')),
+			JHtml::_('select.option', '9', JText::_('J9')),
+			JHtml::_('select.option', '10', JText::_('J10')),
+		);
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			// We also need to change the category filter to show show categories with All or the forced language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+
+				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
+				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+			}
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_content', 'category', $this->state->get('filter.category_id'));
+		$user  = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		JToolbarHelper::title(JText::_('COM_CONTENT_ARTICLES_TITLE'), 'stack article');
+
+		if ($canDo->get('core.create') || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0)
+		{
+			JToolbarHelper::addNew('article.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('article.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('articles.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('articles.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::custom('articles.featured', 'featured.png', 'featured_f2.png', 'JFEATURE', true);
+			JToolbarHelper::custom('articles.unfeatured', 'unfeatured.png', 'featured_f2.png', 'JUNFEATURE', true);
+			JToolbarHelper::archiveList('articles.archive');
+			JToolbarHelper::checkin('articles.checkin');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_content')
+			&& $user->authorise('core.edit', 'com_content')
+			&& $user->authorise('core.edit.state', 'com_content'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('articles.trash');
+		}
+
+		if ($user->authorise('core.admin', 'com_content') || $user->authorise('core.options', 'com_content'))
+		{
+			JToolbarHelper::preferences('com_content');
+		}
+
+		JToolbarHelper::help('JHELP_CONTENT_ARTICLE_MANAGER');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering'     => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'        => JText::_('JSTATUS'),
+			'a.title'        => JText::_('JGLOBAL_TITLE'),
+			'category_title' => JText::_('JCATEGORY'),
+			'access_level'   => JText::_('JGRID_HEADING_ACCESS'),
+			'a.created_by'   => JText::_('JAUTHOR'),
+			'language'       => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.created'      => JText::_('JDATE'),
+			'a.id'           => JText::_('JGRID_HEADING_ID'),
+			'a.featured'     => JText::_('JFEATURED')
+		);
+	}
+}
diff --git a/core/administrator/components/com_content/views/featured/tmpl/default.php b/core/administrator/components/com_content/views/featured/tmpl/default.php
new file mode 100644
index 00000000..b6124c6e
--- /dev/null
+++ b/core/administrator/components/com_content/views/featured/tmpl/default.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_ACCESS')));
+JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
+JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'fp.ordering';
+$columns   = 10;
+
+if (strpos($listOrder, 'publish_up') !== false)
+{
+	$orderingColumn = 'publish_up';
+}
+elseif (strpos($listOrder, 'publish_down') !== false)
+{
+	$orderingColumn = 'publish_down';
+}
+else
+{
+	$orderingColumn = 'created';
+}
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_content&task=featured.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'articleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=featured'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<?php else : ?>
+		<div id="j-main-container">
+			<?php endif; ?>
+			<?php
+			// Search tools bar
+			echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+			?>
+			<?php if (empty($this->items)) : ?>
+				<div class="alert alert-no-items">
+					<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+				</div>
+			<?php else : ?>
+				<table class="table table-striped" id="articleList">
+					<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'fp.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" style="min-width:55px" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($this->vote) : ?>
+							<?php $columns++; ?>
+							<th width="1%" class="nowrap hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_VOTES', 'rating_count', $listDirn, $listOrder); ?>
+							</th>
+							<?php $columns++; ?>
+							<th width="1%" class="nowrap hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_RATINGS', 'rating', $listDirn, $listOrder); ?>
+							</th>
+						<?php endif; ?>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+					</thead>
+					<tfoot>
+					<tr>
+						<td colspan="<?php echo $columns; ?>">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+					</tfoot>
+					<tbody>
+					<?php $count = count($this->items); ?>
+					<?php foreach ($this->items as $i => $item) :
+						$item->max_ordering = 0;
+						$ordering   = ($listOrder == 'fp.ordering');
+						$assetId    = 'com_content.article.' . $item->id;
+						$canCreate  = $user->authorise('core.create', 'com_content.category.' . $item->catid);
+						$canEdit    = $user->authorise('core.edit', 'com_content.article.' . $item->id);
+						$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+						$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+						?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="order nowrap center hidden-phone">
+								<?php
+								$iconClass = '';
+
+								if (!$canChange)
+								{
+									$iconClass = ' inactive';
+								}
+								elseif (!$saveOrder)
+								{
+									$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+								}
+								?>
+								<span class="sortable-handler<?php echo $iconClass ?>">
+								<span class="icon-menu" aria-hidden="true"></span>
+							</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+								<?php endif; ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+									<?php echo JHtml::_('contentadministrator.featured', $item->featured, $i, $canChange); ?>
+									<?php // Create dropdown items and render the dropdown list.
+									if ($canChange)
+									{
+										JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'articles');
+										JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'articles');
+										echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
+									}
+									?>
+								</div>
+							</td>
+							<td class="has-context">
+								<div class="pull-left break-word">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit) : ?>
+										<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&return=featured&id=' . $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+											<?php echo $this->escape($item->title); ?></a>
+									<?php else : ?>
+										<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+									<?php endif; ?>
+									<span class="small break-word">
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								</span>
+									<div class="small">
+										<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+									</div>
+								</div>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php if ((int) $item->created_by != 0) : ?>
+									<?php if ($item->created_by_alias) : ?>
+										<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo JText::_('JAUTHOR'); ?>">
+										<?php echo $this->escape($item->author_name); ?></a>
+										<div class="smallsub"><?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
+									<?php else : ?>
+										<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>" title="<?php echo JText::_('JAUTHOR'); ?>">
+										<?php echo $this->escape($item->author_name); ?></a>
+									<?php endif; ?>
+								<?php else : ?>
+									<?php if ($item->created_by_alias) : ?>
+										<?php echo JText::_('JNONE'); ?>
+										<div class="smallsub"><?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
+									<?php else : ?>
+										<?php echo JText::_('JNONE'); ?>
+									<?php endif; ?>
+								<?php endif; ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="nowrap small hidden-phone">
+								<?php
+								$date = $item->{$orderingColumn};
+								echo $date > 0 ? JHtml::_('date', $date, JText::_('DATE_FORMAT_LC4')) : '-';
+								?>
+							</td>
+							<td class="center hidden-phone">
+								<span class="badge badge-info">
+								<?php echo (int) $item->hits; ?>
+								</span>
+							</td>
+							<?php if ($this->vote) : ?>
+								<td class="hidden-phone">
+									<span class="badge badge-success" >
+									<?php echo (int) $item->rating_count; ?>
+									</span>
+								</td>
+								<td class="hidden-phone">
+									<span class="badge badge-warning" >
+									<?php echo (int) $item->rating; ?>
+									</span>
+								</td>
+							<?php endif; ?>
+							<td class="center hidden-phone">
+								<?php echo (int) $item->id; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+					</tbody>
+				</table>
+			<?php endif; ?>
+
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="featured" value="1" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+</form>
diff --git a/core/administrator/components/com_content/views/featured/tmpl/default.xml b/core/administrator/components/com_content/views/featured/tmpl/default.xml
new file mode 100755
index 00000000..4697ce17
--- /dev/null
+++ b/core/administrator/components/com_content/views/featured/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CONTENT_FEATURED_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_content/views/featured/view.html.php b/core/administrator/components/com_content/views/featured/view.html.php
new file mode 100644
index 00000000..3a213b01
--- /dev/null
+++ b/core/administrator/components/com_content/views/featured/view.html.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of featured articles.
+ *
+ * @since  1.6
+ */
+class ContentViewFeatured extends JViewLegacy
+{
+	/**
+	 * The item authors
+	 *
+	 * @var  stdClass
+	 */
+	protected $authors;
+
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * Form object for search filters
+	 *
+	 * @var  JForm
+	 */
+	public $filterForm;
+
+	/**
+	 * The active search filters
+	 *
+	 * @var  array
+	 */
+	public $activeFilters;
+
+	/**
+	 * The sidebar markup
+	 *
+	 * @var  string
+	 */
+	protected $sidebar;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		ContentHelper::addSubmenu('featured');
+
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->authors       = $this->get('Authors');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->vote          = JPluginHelper::isEnabled('content', 'vote');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Levels filter - Used in Hathor.
+		// @deprecated  4.0 To be removed with Hathor
+		$this->f_levels = array(
+			JHtml::_('select.option', '1', JText::_('J1')),
+			JHtml::_('select.option', '2', JText::_('J2')),
+			JHtml::_('select.option', '3', JText::_('J3')),
+			JHtml::_('select.option', '4', JText::_('J4')),
+			JHtml::_('select.option', '5', JText::_('J5')),
+			JHtml::_('select.option', '6', JText::_('J6')),
+			JHtml::_('select.option', '7', JText::_('J7')),
+			JHtml::_('select.option', '8', JText::_('J8')),
+			JHtml::_('select.option', '9', JText::_('J9')),
+			JHtml::_('select.option', '10', JText::_('J10')),
+		);
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_content', 'category', $this->state->get('filter.category_id'));
+
+		JToolbarHelper::title(JText::_('COM_CONTENT_FEATURED_TITLE'), 'star featured');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('article.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('article.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('articles.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('articles.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::custom('articles.unfeatured', 'unfeatured.png', 'featured_f2.png', 'JUNFEATURE', true);
+			JToolbarHelper::archiveList('articles.archive');
+			JToolbarHelper::checkin('articles.checkin');
+		}
+
+		if ($state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('articles.trash');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_content');
+		}
+
+		JToolbarHelper::help('JHELP_CONTENT_FEATURED_ARTICLES');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'fp.ordering'    => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'        => JText::_('JSTATUS'),
+			'a.title'        => JText::_('JGLOBAL_TITLE'),
+			'category_title' => JText::_('JCATEGORY'),
+			'access_level'   => JText::_('JGRID_HEADING_ACCESS'),
+			'a.created_by'   => JText::_('JAUTHOR'),
+			'language'       => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.created'      => JText::_('JDATE'),
+			'a.id'           => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/contenthistory.php b/core/administrator/components/com_contenthistory/contenthistory.php
new file mode 100644
index 00000000..e7308dd0
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/contenthistory.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Disallow unauthenticated users
+if (JFactory::getUser()->guest)
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Contenthistory', array('base_path' => JPATH_COMPONENT_ADMINISTRATOR));
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_contenthistory/contenthistory.xml b/core/administrator/components/com_contenthistory/contenthistory.xml
new file mode 100644
index 00000000..1e878284
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/contenthistory.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.2" method="upgrade">
+	<name>com_contenthistory</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2013</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.0</version>
+	<description>COM_CONTENTHISTORY_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>contenthistory.php</filename>
+		<filename>index.html</filename>
+	</files>
+	<administration>
+		<files folder="admin">
+			<filename>controller.php</filename>
+			<filename>contenthistory.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>media</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_contenthistory.ini</language>
+			<language tag="en-GB">language/en-GB.com_contenthistory.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_contenthistory/controller.php b/core/administrator/components/com_contenthistory/controller.php
new file mode 100644
index 00000000..fb828a28
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/controller.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contenthistory Controller
+ *
+ * @since  3.2
+ */
+class ContenthistoryController extends JControllerLegacy
+{
+}
diff --git a/core/administrator/components/com_contenthistory/controllers/history.php b/core/administrator/components/com_contenthistory/controllers/history.php
new file mode 100644
index 00000000..1802a943
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/controllers/history.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Contenthistory list controller class.
+ *
+ * @since  3.2
+ */
+class ContenthistoryControllerHistory extends JControllerAdmin
+{
+	/**
+	 * Deletes and returns correctly.
+	 *
+	 * @return	void
+	 *
+	 * @since	3.2
+	 */
+	public function delete()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Get items to remove from the request.
+		$cid = $this->input->get('cid', array(), 'array');
+
+		if (!is_array($cid) || count($cid) < 1)
+		{
+			JError::raiseWarning(500, JText::_('COM_CONTENTHISTORY_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Remove the items.
+			if ($model->delete($cid))
+			{
+				$this->setMessage(JText::plural('COM_CONTENTHISTORY_N_ITEMS_DELETED', count($cid)));
+			}
+			else
+			{
+				$this->setMessage($model->getError());
+			}
+		}
+
+		$this->setRedirect(
+			JRoute::_(
+				'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id='
+				. $this->input->getInt('item_id') . '&type_id=' . $this->input->getInt('type_id')
+				. '&type_alias=' . $this->input->getCmd('type_alias') . '&' . JSession::getFormToken() . '=1', false
+			)
+		);
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The name of the model
+	 * @param   string  $prefix  The prefix for the model
+	 * @param   array   $config  An additional array of parameters
+	 *
+	 * @return  JModelLegacy  The model
+	 *
+	 * @since   3.2
+	 */
+	public function getModel($name = 'History', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Toggles the keep forever value for one or more history rows. If it was Yes, changes to No. If No, changes to Yes.
+	 *
+	 * @return	void
+	 *
+	 * @since	3.2
+	 */
+	public function keep()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Get items to remove from the request.
+		$cid = $this->input->get('cid', array(), 'array');
+
+		if (!is_array($cid) || count($cid) < 1)
+		{
+			JError::raiseWarning(500, JText::_('COM_CONTENTHISTORY_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Remove the items.
+			if ($model->keep($cid))
+			{
+				$this->setMessage(JText::plural('COM_CONTENTHISTORY_N_ITEMS_KEEP_TOGGLE', count($cid)));
+			}
+			else
+			{
+				$this->setMessage($model->getError());
+			}
+		}
+
+		$this->setRedirect(
+			JRoute::_(
+				'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id='
+				. $this->input->getInt('item_id') . '&type_id=' . $this->input->getInt('type_id')
+				. '&type_alias=' . $this->input->getCmd('type_alias') . '&' . JSession::getFormToken() . '=1', false
+			)
+		);
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/controllers/preview.php b/core/administrator/components/com_contenthistory/controllers/preview.php
new file mode 100644
index 00000000..1f926454
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/controllers/preview.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contenthistory list controller class.
+ *
+ * @since  3.2
+ */
+class ContenthistoryControllerPreview extends JControllerLegacy
+{
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The name of the model
+	 * @param   string  $prefix  The prefix for the model
+	 * @param   array   $config  An additional array of parameters
+	 *
+	 * @return  JModelLegacy  The model
+	 *
+	 * @since   3.2
+	 */
+	public function getModel($name = 'Preview', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/helpers/contenthistory.php b/core/administrator/components/com_contenthistory/helpers/contenthistory.php
new file mode 100644
index 00000000..9077ef75
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -0,0 +1,384 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Categories helper.
+ *
+ * @since  3.2
+ */
+class ContenthistoryHelper
+{
+	/**
+	 * Method to put all field names, including nested ones, in a single array for easy lookup.
+	 *
+	 * @param   stdClass  $object  Standard class object that may contain one level of nested objects.
+	 *
+	 * @return  array  Associative array of all field names, including ones in a nested object.
+	 *
+	 * @since   3.2
+	 */
+	public static function createObjectArray($object)
+	{
+		$result = array();
+
+		if ($object === null)
+		{
+			return $result;
+		}
+
+		foreach ($object as $name => $value)
+		{
+			$result[$name] = $value;
+
+			if (is_object($value))
+			{
+				foreach ($value as $subName => $subValue)
+				{
+					$result[$subName] = $subValue;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to decode JSON-encoded fields in a standard object. Used to unpack JSON strings in the content history data column.
+	 *
+	 * @param   stdClass  $jsonString  Standard class object that may contain one or more JSON-encoded fields.
+	 *
+	 * @return  stdClass  Object with any JSON-encoded fields unpacked.
+	 *
+	 * @since   3.2
+	 */
+	public static function decodeFields($jsonString)
+	{
+		$object = json_decode($jsonString);
+
+		if (is_object($object))
+		{
+			foreach ($object as $name => $value)
+			{
+				if ($subObject = json_decode($value))
+				{
+					$object->$name = $subObject;
+				}
+			}
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Method to get field labels for the fields in the JSON-encoded object.
+	 * First we see if we can find translatable labels for the fields in the object.
+	 * We translate any we can find and return an array in the format object->name => label.
+	 *
+	 * @param   stdClass           $object      Standard class object in the format name->value.
+	 * @param   JTableContenttype  $typesTable  Table object with content history options.
+	 *
+	 * @return  stdClass  Contains two associative arrays.
+	 *                    $formValues->labels in the format name => label (for example, 'id' => 'Article ID').
+	 *                    $formValues->values in the format name => value (for example, 'state' => 'Published'.
+	 *                    This translates the text from the selected option in the form.
+	 *
+	 * @since   3.2
+	 */
+	public static function getFormValues($object, JTableContenttype $typesTable)
+	{
+		$labels = array();
+		$values = array();
+		$expandedObjectArray = static::createObjectArray($object);
+		static::loadLanguageFiles($typesTable->type_alias);
+
+		if ($formFile = static::getFormFile($typesTable))
+		{
+			if ($xml = simplexml_load_file($formFile))
+			{
+				// Now we need to get all of the labels from the form
+				$fieldArray = $xml->xpath('//field');
+				$fieldArray = array_merge($fieldArray, $xml->xpath('//fields'));
+
+				foreach ($fieldArray as $field)
+				{
+					if ($label = (string) $field->attributes()->label)
+					{
+						$labels[(string) $field->attributes()->name] = JText::_($label);
+					}
+				}
+
+				// Get values for any list type fields
+				$listFieldArray = $xml->xpath('//field[@type="list" or @type="radio"]');
+
+				foreach ($listFieldArray as $field)
+				{
+					$name = (string) $field->attributes()->name;
+
+					if (isset($expandedObjectArray[$name]))
+					{
+						$optionFieldArray = $field->xpath('option[@value="' . $expandedObjectArray[$name] . '"]');
+
+						$valueText = null;
+
+						if (is_array($optionFieldArray) && count($optionFieldArray))
+						{
+							$valueText = trim((string) $optionFieldArray[0]);
+						}
+
+						$values[(string) $field->attributes()->name] = JText::_($valueText);
+					}
+				}
+			}
+		}
+
+		$result = new stdClass;
+		$result->labels = $labels;
+		$result->values = $values;
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the XML form file for this component. Used to get translated field names for history preview.
+	 *
+	 * @param   JTableContenttype  $typesTable  Table object with content history options.
+	 *
+	 * @return  mixed  JModel object if successful, false if no model found.
+	 *
+	 * @since   3.2
+	 */
+	public static function getFormFile(JTableContenttype $typesTable)
+	{
+		$result = false;
+		jimport('joomla.filesystem.file');
+		jimport('joomla.filesystem.folder');
+
+		// First, see if we have a file name in the $typesTable
+		$options = json_decode($typesTable->content_history_options);
+
+		if (is_object($options) && isset($options->formFile) && JFile::exists(JPATH_ROOT . '/' . $options->formFile))
+		{
+			$result = JPATH_ROOT . '/' . $options->formFile;
+		}
+		else
+		{
+			$aliasArray = explode('.', $typesTable->type_alias);
+
+			if (count($aliasArray) == 2)
+			{
+				$component = ($aliasArray[1] == 'category') ? 'com_categories' : $aliasArray[0];
+				$path  = JFolder::makeSafe(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/');
+				$file = JFile::makeSafe($aliasArray[1] . '.xml');
+				$result = JFile::exists($path . $file) ? $path . $file : false;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to query the database using values from lookup objects.
+	 *
+	 * @param   stdClass  $lookup  The std object with the values needed to do the query.
+	 * @param   mixed     $value   The value used to find the matching title or name. Typically the id.
+	 *
+	 * @return  mixed  Value from database (for example, name or title) on success, false on failure.
+	 *
+	 * @since   3.2
+	 */
+	public static function getLookupValue($lookup, $value)
+	{
+		$result = false;
+
+		if (isset($lookup->sourceColumn) && isset($lookup->targetTable) && isset($lookup->targetColumn)&& isset($lookup->displayColumn))
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select($db->quoteName($lookup->displayColumn))
+				->from($db->quoteName($lookup->targetTable))
+				->where($db->quoteName($lookup->targetColumn) . ' = ' . $db->quote($value));
+			$db->setQuery($query);
+
+			try
+			{
+				$result = $db->loadResult();
+			}
+			catch (Exception $e)
+			{
+				// Ignore any errors and just return false
+				return false;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to remove fields from the object based on values entered in the #__content_types table.
+	 *
+	 * @param   stdClass           $object     Object to be passed to view layout file.
+	 * @param   JTableContenttype  $typeTable  Table object with content history options.
+	 *
+	 * @return  stdClass  object with hidden fields removed.
+	 *
+	 * @since   3.2
+	 */
+	public static function hideFields($object, JTableContenttype $typeTable)
+	{
+		if ($options = json_decode($typeTable->content_history_options))
+		{
+			if (isset($options->hideFields) && is_array($options->hideFields))
+			{
+				foreach ($options->hideFields as $field)
+				{
+					unset($object->$field);
+				}
+			}
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Method to load the language files for the component whose history is being viewed.
+	 *
+	 * @param   string  $typeAlias  The type alias, for example 'com_content.article'.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function loadLanguageFiles($typeAlias)
+	{
+		$aliasArray = explode('.', $typeAlias);
+
+		if (is_array($aliasArray) && count($aliasArray) == 2)
+		{
+			$component = ($aliasArray[1] == 'category') ? 'com_categories' : $aliasArray[0];
+			$lang = JFactory::getLanguage();
+
+			/**
+			 * Loading language file from the administrator/language directory then
+			 * loading language file from the administrator/components/extension/language directory
+			 */
+			$lang->load($component, JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
+
+			// Force loading of backend global language file
+			$lang->load('joomla', JPath::clean(JPATH_ADMINISTRATOR), null, false, true);
+		}
+	}
+
+	/**
+	 * Method to create object to pass to the layout. Format is as follows:
+	 * field is std object with name, value.
+	 *
+	 * Value can be a std object with name, value pairs.
+	 *
+	 * @param   stdClass  $object      The std object from the JSON string. Can be nested 1 level deep.
+	 * @param   stdClass  $formValues  Standard class of label and value in an associative array.
+	 *
+	 * @return  stdClass  Object with translated labels where available
+	 *
+	 * @since   3.2
+	 */
+	public static function mergeLabels($object, $formValues)
+	{
+		$result = new stdClass;
+
+		if ($object === null)
+		{
+			return $result;
+		}
+
+		$labelsArray = $formValues->labels;
+		$valuesArray = $formValues->values;
+
+		foreach ($object as $name => $value)
+		{
+			$result->$name = new stdClass;
+			$result->$name->name = $name;
+			$result->$name->value = isset($valuesArray[$name]) ? $valuesArray[$name] : $value;
+			$result->$name->label = isset($labelsArray[$name]) ? $labelsArray[$name] : $name;
+
+			if (is_object($value))
+			{
+				$subObject = new stdClass;
+
+				foreach ($value as $subName => $subValue)
+				{
+					$subObject->$subName = new stdClass;
+					$subObject->$subName->name = $subName;
+					$subObject->$subName->value = isset($valuesArray[$subName]) ? $valuesArray[$subName] : $subValue;
+					$subObject->$subName->label = isset($labelsArray[$subName]) ? $labelsArray[$subName] : $subName;
+					$result->$name->value = $subObject;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to prepare the object for the preview and compare views.
+	 *
+	 * @param   JTableContenthistory  $table  Table object loaded with data.
+	 *
+	 * @return  stdClass  Object ready for the views.
+	 *
+	 * @since   3.2
+	 */
+	public static function prepareData(JTableContenthistory $table)
+	{
+		$object = static::decodeFields($table->version_data);
+		$typesTable = JTable::getInstance('Contenttype');
+		$typesTable->load(array('type_id' => $table->ucm_type_id));
+		$formValues = static::getFormValues($object, $typesTable);
+		$object = static::mergeLabels($object, $formValues);
+		$object = static::hideFields($object, $typesTable);
+		$object = static::processLookupFields($object, $typesTable);
+
+		return $object;
+	}
+
+	/**
+	 * Method to process any lookup values found in the content_history_options column for this table.
+	 * This allows category title and user name to be displayed instead of the id column.
+	 *
+	 * @param   stdClass           $object      The std object from the JSON string. Can be nested 1 level deep.
+	 * @param   JTableContenttype  $typesTable  Table object loaded with data.
+	 *
+	 * @return  stdClass  Object with lookup values inserted.
+	 *
+	 * @since   3.2
+	 */
+	public static function processLookupFields($object, JTableContenttype $typesTable)
+	{
+		if ($options = json_decode($typesTable->content_history_options))
+		{
+			if (isset($options->displayLookup) && is_array($options->displayLookup))
+			{
+				foreach ($options->displayLookup as $lookup)
+				{
+					$sourceColumn = isset($lookup->sourceColumn) ? $lookup->sourceColumn : false;
+					$sourceValue = isset($object->$sourceColumn->value) ? $object->$sourceColumn->value : false;
+
+					if ($sourceColumn && $sourceValue && ($lookupValue = static::getLookupValue($lookup, $sourceValue)))
+					{
+						$object->$sourceColumn->value = $lookupValue;
+					}
+				}
+			}
+		}
+
+		return $object;
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/helpers/html/textdiff.php b/core/administrator/components/com_contenthistory/helpers/html/textdiff.php
new file mode 100644
index 00000000..c81a9c3e
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/helpers/html/textdiff.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTML utility class for creating text diffs using jQuery, diff_patch_match.js and jquery.pretty-text-diff.js JavaScript libraries.
+ *
+ * @since       3.2
+ *
+ * @deprecated  4.0 No replacement
+ */
+abstract class JHtmlTextdiff
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.2
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Method to load Javascript text diff
+	 *
+	 * @param   string  $containerId  DOM id of the element where the diff will be rendered
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function textdiff($containerId)
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Depends on jQuery UI
+		JHtml::_('bootstrap.framework');
+		JHtml::_('script', 'com_contenthistory/diff_match_patch.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('script', 'com_contenthistory/jquery.pretty-text-diff.min.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('stylesheet', 'com_contenthistory/jquery.pretty-text-diff.css', array('version' => 'auto', 'relative' => true));
+
+		// Attach diff to document
+		JFactory::getDocument()->addScriptDeclaration("
+			(function ($){
+				$(document).ready(function (){
+ 					$('#" . $containerId . " tr').prettyTextDiff();
+ 				});
+			})(jQuery);
+			"
+		);
+
+		// Set static array
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/models/compare.php b/core/administrator/components/com_contenthistory/models/compare.php
new file mode 100644
index 00000000..8221ec7e
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/models/compare.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContenthistoryHelper', JPATH_ADMINISTRATOR . '/components/com_contenthistory/helpers/contenthistory.php');
+
+/**
+ * Methods supporting a list of contenthistory records.
+ *
+ * @since  3.2
+ */
+class ContenthistoryModelCompare extends JModelItem
+{
+	/**
+	 * Method to get a version history row.
+	 *
+	 * @return  array|boolean    On success, array of populated tables. False on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function getItems()
+	{
+		$input = JFactory::getApplication()->input;
+
+		/** @var JTableContenthistory $table1 */
+		$table1 = JTable::getInstance('Contenthistory');
+
+		/** @var JTableContenthistory $table2 */
+		$table2 = JTable::getInstance('Contenthistory');
+
+		$id1 = $input->getInt('id1');
+		$id2 = $input->getInt('id2');
+		$result = array();
+
+		if ($table1->load($id1) && $table2->load($id2))
+		{
+			// Get the first history record's content type record so we can check ACL
+			/** @var JTableContenttype $contentTypeTable */
+			$contentTypeTable = JTable::getInstance('Contenttype');
+			$ucmTypeId        = $table1->ucm_type_id;
+
+			if (!$contentTypeTable->load($ucmTypeId))
+			{
+				// Assume a failure to load the content type means broken data, abort mission
+				return false;
+			}
+
+			$user = JFactory::getUser();
+
+			// Access check
+			if ($user->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $table1->ucm_item_id) || $this->canEdit($table1))
+			{
+				$return = true;
+			}
+			else
+			{
+				$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
+
+				return false;
+			}
+
+			// All's well, process the records
+			if ($return == true)
+			{
+				foreach (array($table1, $table2) as $table)
+				{
+					$object = new stdClass;
+					$object->data = ContenthistoryHelper::prepareData($table);
+					$object->version_note = $table->version_note;
+
+					// Let's use custom calendars when present
+					$object->save_date = JHtml::_('date', $table->save_date, JText::_('DATE_FORMAT_LC6'));
+
+					$dateProperties = array (
+						'modified_time',
+						'created_time',
+						'modified',
+						'created',
+						'checked_out_time',
+						'publish_up',
+						'publish_down',
+					);
+
+					foreach ($dateProperties as $dateProperty)
+					{
+						if (array_key_exists($dateProperty, $object->data) && $object->data->$dateProperty->value != '0000-00-00 00:00:00')
+						{
+							$object->data->$dateProperty->value = JHtml::_('date', $object->data->$dateProperty->value, JText::_('DATE_FORMAT_LC6'));
+						}
+					}
+
+					$result[] = $object;
+				}
+
+				return $result;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to test whether a record is editable
+	 *
+	 * @param   JTableContenthistory  $record  A JTable object.
+	 *
+	 * @return  boolean  True if allowed to edit the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.6
+	 */
+	protected function canEdit($record)
+	{
+		$result = false;
+
+		if (!empty($record->ucm_type_id))
+		{
+			// Check that the type id matches the type alias
+			$typeAlias = JFactory::getApplication()->input->get('type_alias');
+
+			/** @var JTableContenttype $contentTypeTable */
+			$contentTypeTable = JTable::getInstance('Contenttype', 'JTable');
+
+			if ($contentTypeTable->getTypeId($typeAlias) == $record->ucm_type_id)
+			{
+				/**
+				 * Make sure user has edit privileges for this content item. Note that we use edit permissions
+				 * for the content item, not delete permissions for the content history row.
+				 */
+				$user   = JFactory::getUser();
+				$result = $user->authorise('core.edit', $typeAlias . '.' . (int) $record->ucm_item_id);
+			}
+
+			// Finally try session (this catches edit.own case too)
+			if (!$result)
+			{
+				$contentTypeTable->load($record->ucm_type_id);
+				$typeEditables = (array) JFactory::getApplication()->getUserState(str_replace('.', '.edit.', $contentTypeTable->type_alias) . '.id');
+				$result = in_array((int) $record->ucm_item_id, $typeEditables);
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/models/history.php b/core/administrator/components/com_contenthistory/models/history.php
new file mode 100644
index 00000000..84c24b84
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/models/history.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of contenthistory records.
+ *
+ * @since  3.2
+ */
+class ContenthistoryModelHistory extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   3.2
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'version_id',
+				'h.version_id',
+				'version_note',
+				'h.version_note',
+				'save_date',
+				'h.save_date',
+				'editor_user_id',
+				'h.editor_user_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to test whether a record is editable
+	 *
+	 * @param   JTableContenthistory  $record  A JTable object.
+	 *
+	 * @return  boolean  True if allowed to edit the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.2
+	 */
+	protected function canEdit($record)
+	{
+		$result = false;
+
+		if (!empty($record->ucm_type_id))
+		{
+			// Check that the type id matches the type alias
+			$typeAlias = JFactory::getApplication()->input->get('type_alias');
+
+			/** @var JTableContenttype $contentTypeTable */
+			$contentTypeTable = JTable::getInstance('Contenttype', 'JTable');
+
+			if ($contentTypeTable->getTypeId($typeAlias) == $record->ucm_type_id)
+			{
+				/**
+				 * Make sure user has edit privileges for this content item. Note that we use edit permissions
+				 * for the content item, not delete permissions for the content history row.
+				 */
+				$user   = JFactory::getUser();
+				$result = $user->authorise('core.edit', $typeAlias . '.' . (int) $record->ucm_item_id);
+			}
+
+			// Finally try session (this catches edit.own case too)
+			if (!$result)
+			{
+				$contentTypeTable->load($record->ucm_type_id);
+				$typeEditables = (array) JFactory::getApplication()->getUserState(str_replace('.', '.edit.', $contentTypeTable->type_alias) . '.id');
+				$result = in_array((int) $record->ucm_item_id, $typeEditables);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to test whether a history record can be deleted. Note that we check whether we have edit permissions
+	 * for the content item row.
+	 *
+	 * @param   JTableContenthistory  $record  A JTable object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.6
+	 */
+	protected function canDelete($record)
+	{
+		return canEdit($record);
+	}
+
+	/**
+	 * Method to delete one or more records from content history table.
+	 *
+	 * @param   array  $pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   3.2
+	 */
+	public function delete(&$pks)
+	{
+		$pks = (array) $pks;
+		$table = $this->getTable();
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($table->keep_forever === "1")
+				{
+					unset($pks[$i]);
+					continue;
+				}
+
+				if ($this->canEdit($table))
+				{
+					if (!$table->delete($pk))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					$error = $this->getError();
+
+					if ($error)
+					{
+						try
+						{
+							JLog::add($error, JLog::WARNING, 'jerror');
+						}
+						catch (RuntimeException $exception)
+						{
+							JFactory::getApplication()->enqueueMessage($error, 'warning');
+						}
+
+						return false;
+					}
+					else
+					{
+						try
+						{
+							JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING, 'jerror');
+						}
+						catch (RuntimeException $exception)
+						{
+							JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 'warning');
+						}
+
+						return false;
+					}
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.4.5
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+		$user = JFactory::getUser();
+
+		if ($items === false)
+		{
+			return false;
+		}
+
+		// This should be an array with at least one element
+		if (!is_array($items) || !isset($items[0]))
+		{
+			return $items;
+		}
+
+		// Get the content type's record so we can check ACL
+		/** @var JTableContenttype $contentTypeTable */
+		$contentTypeTable = JTable::getInstance('Contenttype');
+		$ucmTypeId        = $items[0]->ucm_type_id;
+
+		if (!$contentTypeTable->load($ucmTypeId))
+		{
+			// Assume a failure to load the content type means broken data, abort mission
+			return false;
+		}
+
+		// Access check
+		if ($user->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $items[0]->ucm_item_id) || $this->canEdit($items[0]))
+		{
+			return $items;
+		}
+		else
+		{
+			$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
+
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $type    The table name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.2
+	 */
+	public function getTable($type = 'Contenthistory', $prefix = 'JTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to toggle on and off the keep forever value for one or more records from content history table.
+	 *
+	 * @param   array  $pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   3.2
+	 */
+	public function keep(&$pks)
+	{
+		$pks = (array) $pks;
+		$table = $this->getTable();
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($this->canEdit($table))
+				{
+					$table->keep_forever = $table->keep_forever ? 0 : 1;
+
+					if (!$table->store())
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					$error = $this->getError();
+
+					if ($error)
+					{
+						try
+						{
+							JLog::add($error, JLog::WARNING, 'jerror');
+						}
+						catch (RuntimeException $exception)
+						{
+							JFactory::getApplication()->enqueueMessage($error, 'warning');
+						}
+
+						return false;
+					}
+					else
+					{
+						try
+						{
+							JLog::add(JText::_('COM_CONTENTHISTORY_ERROR_KEEP_NOT_PERMITTED'), JLog::WARNING, 'jerror');
+						}
+						catch (RuntimeException $exception)
+						{
+							JFactory::getApplication()->enqueueMessage(JText::_('COM_CONTENTHISTORY_ERROR_KEEP_NOT_PERMITTED'), 'warning');
+						}
+
+						return false;
+					}
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function populateState($ordering = 'h.save_date', $direction = 'DESC')
+	{
+		$input = JFactory::getApplication()->input;
+		$itemId = $input->get('item_id', 0, 'integer');
+		$typeId = $input->get('type_id', 0, 'integer');
+		$typeAlias = $input->get('type_alias', '', 'string');
+
+		$this->setState('item_id', $itemId);
+		$this->setState('type_id', $typeId);
+		$this->setState('type_alias', $typeAlias);
+		$this->setState('sha1_hash', $this->getSha1Hash());
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_contenthistory');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.2
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'h.version_id, h.ucm_item_id, h.ucm_type_id, h.version_note, h.save_date, h.editor_user_id,' .
+				'h.character_count, h.sha1_hash, h.version_data, h.keep_forever'
+			)
+		)
+			->from($db->quoteName('#__ucm_history') . ' AS h')
+			->where($db->quoteName('h.ucm_item_id') . ' = ' . (int) $this->getState('item_id'))
+			->where($db->quoteName('h.ucm_type_id') . ' = ' . (int) $this->getState('type_id'))
+
+		// Join over the users for the editor
+			->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id = h.editor_user_id');
+
+		// Add the list ordering clause.
+		$orderCol = $this->state->get('list.ordering');
+		$orderDirn = $this->state->get('list.direction');
+		$query->order($db->quoteName($orderCol) . $orderDirn);
+
+		return $query;
+	}
+
+	/**
+	 * Get the sha1 hash value for the current item being edited.
+	 *
+	 * @return  string  sha1 hash of row data
+	 *
+	 * @since   3.2
+	 */
+	protected function getSha1Hash()
+	{
+		$result = false;
+		$typeTable = JTable::getInstance('Contenttype', 'JTable');
+		$typeId = JFactory::getApplication()->input->getInteger('type_id', 0);
+		$typeTable->load($typeId);
+		$typeAliasArray = explode('.', $typeTable->type_alias);
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/' . $typeAliasArray[0] . '/tables');
+		$contentTable = $typeTable->getContentTable();
+		$keyValue = JFactory::getApplication()->input->getInteger('item_id', 0);
+
+		if ($contentTable && $contentTable->load($keyValue))
+		{
+			$helper = new JHelper;
+
+			$dataObject = $helper->getDataObject($contentTable);
+			$result = $this->getTable('Contenthistory', 'JTable')->getSha1(json_encode($dataObject), $typeTable);
+		}
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/models/preview.php b/core/administrator/components/com_contenthistory/models/preview.php
new file mode 100644
index 00000000..267aafa5
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/models/preview.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContenthistoryHelper', JPATH_ADMINISTRATOR . '/components/com_contenthistory/helpers/contenthistory.php');
+
+/**
+ * Methods supporting a list of contenthistory records.
+ *
+ * @since  3.2
+ */
+class ContenthistoryModelPreview extends JModelItem
+{
+	/**
+	 * Method to get a version history row.
+	 *
+	 * @return  stdClass|boolean    On success, standard object with row data. False on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function getItem()
+	{
+		/** @var JTableContenthistory $table */
+		$table = JTable::getInstance('Contenthistory');
+		$versionId = JFactory::getApplication()->input->getInt('version_id');
+
+		if (!$table->load($versionId))
+		{
+			return false;
+		}
+
+		// Get the content type's record so we can check ACL
+		/** @var JTableContenttype $contentTypeTable */
+		$contentTypeTable = JTable::getInstance('Contenttype');
+
+		if (!$contentTypeTable->load($table->ucm_type_id))
+		{
+			// Assume a failure to load the content type means broken data, abort mission
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		// Access check
+		if ($user->authorise('core.edit', $contentTypeTable->type_alias . '.' . (int) $table->ucm_item_id) || $this->canEdit($table))
+		{
+			$return = true;
+		}
+		else
+		{
+			$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
+
+			return false;
+		}
+
+		// Good to go, finish processing the data
+		if ($return == true)
+		{
+			$result = new stdClass;
+			$result->version_note = $table->version_note;
+			$result->data = ContenthistoryHelper::prepareData($table);
+
+			// Let's use custom calendars when present
+			$result->save_date = JHtml::_('date', $table->save_date, JText::_('DATE_FORMAT_LC6'));
+
+			$dateProperties = array (
+				'modified_time',
+				'created_time',
+				'modified',
+				'created',
+				'checked_out_time',
+				'publish_up',
+				'publish_down',
+			);
+
+			foreach ($dateProperties as $dateProperty)
+			{
+				if (array_key_exists($dateProperty, $result->data) && $result->data->$dateProperty->value != '0000-00-00 00:00:00')
+				{
+					$result->data->$dateProperty->value = JHtml::_('date', $result->data->$dateProperty->value, JText::_('DATE_FORMAT_LC6'));
+				}
+			}
+
+			return $result;
+		}
+	}
+
+	/**
+	 * Method to test whether a record is editable
+	 *
+	 * @param   JTableContenthistory  $record  A JTable object.
+	 *
+	 * @return  boolean  True if allowed to edit the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.6
+	 */
+	protected function canEdit($record)
+	{
+		$result = false;
+
+		if (!empty($record->ucm_type_id))
+		{
+			// Check that the type id matches the type alias
+			$typeAlias = JFactory::getApplication()->input->get('type_alias');
+
+			/** @var JTableContenttype $contentTypeTable */
+			$contentTypeTable = JTable::getInstance('Contenttype', 'JTable');
+
+			if ($contentTypeTable->getTypeId($typeAlias) == $record->ucm_type_id)
+			{
+				/**
+				 * Make sure user has edit privileges for this content item. Note that we use edit permissions
+				 * for the content item, not delete permissions for the content history row.
+				 */
+				$user   = JFactory::getUser();
+				$result = $user->authorise('core.edit', $typeAlias . '.' . (int) $record->ucm_item_id);
+			}
+
+			// Finally try session (this catches edit.own case too)
+			if (!$result)
+			{
+				$contentTypeTable->load($record->ucm_type_id);
+				$typeEditables = (array) JFactory::getApplication()->getUserState(str_replace('.', '.edit.', $contentTypeTable->type_alias) . '.id');
+				$result = in_array((int) $record->ucm_item_id, $typeEditables);
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/views/compare/tmpl/compare.php b/core/administrator/components/com_contenthistory/views/compare/tmpl/compare.php
new file mode 100644
index 00000000..2b7db450
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/views/compare/tmpl/compare.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+$version2 = $this->items[0];
+$version1 = $this->items[1];
+$object1 = $version1->data;
+$object2 = $version2->data;
+JHtml::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/helpers/html');
+JHtml::_('textdiff.textdiff', 'diff');
+
+JFactory::getDocument()->addScriptDeclaration("
+	(function ($){
+		$(document).ready(function (){
+            jQuery('.diffhtml, .diffhtml-header').hide();
+        });
+	})(jQuery);
+"
+);
+
+?>
+<fieldset>
+<legend>
+<?php echo JText::sprintf('COM_CONTENTHISTORY_COMPARE_TITLE'); ?>
+<div class="btn-group pull-right">
+&nbsp;<button id="toolbar-all-rows" class="btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_ALL_ROWS_DESC'); ?>"
+	onclick="jQuery('.items-equal').show(); jQuery('#toolbar-all-rows').hide(); jQuery('#toolbar-changed-rows').show()"
+	style="display:none" >
+	<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_ALL_ROWS'); ?></button>
+
+<button id="toolbar-changed-rows" class="btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_CHANGED_ROWS_DESC'); ?>"
+	onclick="jQuery('.items-equal').hide(); jQuery('#toolbar-all-rows').show(); jQuery('#toolbar-changed-rows').hide()">
+	<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_CHANGED_ROWS'); ?></button>
+
+<button class="diff-header btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_HTML_DESC'); ?>"
+	onclick="jQuery('.diffhtml, .diffhtml-header').show(); jQuery('.diff, .diff-header').hide()">
+	<span class="icon-wrench" aria-hidden="true"></span> <?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_HTML'); ?></button>
+
+<button class="diffhtml-header btn hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_TEXT_DESC'); ?>"
+	onclick="jQuery('.diffhtml, .diffhtml-header').hide(); jQuery('.diff, .diff-header').show()">
+	<span class="icon-pencil" aria-hidden="true"></span> <?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_TEXT'); ?></button>
+</div>
+</legend>
+<table id="diff" class="table table-striped table-condensed">
+<thead><tr>
+	<th width="25%"><?php echo JText::_('COM_CONTENTHISTORY_PREVIEW_FIELD'); ?></th>
+	<th style="display:none" />
+	<th style="display:none" />
+	<th><?php echo JText::sprintf('COM_CONTENTHISTORY_COMPARE_VALUE1', $version1->save_date, $version1->version_note); ?></th>
+	<th><?php echo JText::sprintf('COM_CONTENTHISTORY_COMPARE_VALUE2', $version2->save_date, $version2->version_note); ?></th>
+	<th class="diff-header"><?php echo JText::_('COM_CONTENTHISTORY_COMPARE_DIFF'); ?></th>
+	<th class="diffhtml-header"><?php echo JText::_('COM_CONTENTHISTORY_COMPARE_DIFF'); ?></th>
+</tr></thead>
+<tbody>
+<?php foreach ($object1 as $name => $value) : ?>
+	<?php $rowClass = ($value->value == $object2->$name->value) ? 'items-equal' : 'items-not-equal'; ?>
+	<tr class="<?php echo $rowClass; ?>">
+	<?php if (is_object($value->value)) : ?>
+		<td><strong><?php echo $value->label; ?></strong></td>
+		<td /><td /><td />
+		<?php foreach ($value->value as $subName => $subValue) : ?>
+			<?php $newSubValue = isset($object2->$name->value->$subName->value) ? $object2->$name->value->$subName->value : ''; ?>
+			<?php if ($subValue->value || $newSubValue) : ?>
+				<?php $rowClass = ($subValue->value == $newSubValue) ? 'items-equal' : 'items-not-equal'; ?>
+				<tr class="<?php echo $rowClass; ?>">
+				<td><i>&nbsp;&nbsp;<?php echo $subValue->label; ?></i></td>
+				<td class="originalhtml" style="display:none" ><?php echo htmlspecialchars($subValue->value, ENT_COMPAT, 'UTF-8'); ?></td>
+				<td class="changedhtml" style="display:none" ><?php echo htmlspecialchars($newSubValue, ENT_COMPAT, 'UTF-8'); ?></td>
+				<td class="original"><?php echo $subValue->value; ?></td>
+				<td class="changed"><?php echo $newSubValue; ?></td>
+				<td class="diff" />
+				<td class="diffhtml" />
+				</tr>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<td><strong><?php echo $value->label; ?></strong></td>
+		<td class="originalhtml" style="display:none" ><?php echo htmlspecialchars($value->value); ?></td>
+		<?php $object2->$name->value = is_object($object2->$name->value) ? json_encode($object2->$name->value) : $object2->$name->value; ?>
+		<td class="changedhtml" style="display:none" ><?php echo htmlspecialchars($object2->$name->value, ENT_COMPAT, 'UTF-8'); ?></td>
+		<td class="original"><?php echo $value->value; ?></td>
+		<td class="changed"><?php echo $object2->$name->value; ?></td>
+		<td class="diff" />
+		<td class="diffhtml" />
+	<?php endif; ?>
+	</tr>
+<?php endforeach; ?>
+</tbody>
+</table>
+</fieldset>
diff --git a/core/administrator/components/com_contenthistory/views/compare/view.html.php b/core/administrator/components/com_contenthistory/views/compare/view.html.php
new file mode 100644
index 00000000..59d2718c
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/views/compare/view.html.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of contenthistory.
+ *
+ * @since  3.2
+ */
+class ContenthistoryViewCompare extends JViewLegacy
+{
+	protected $items;
+
+	protected $state;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  Exception on failure, void on success.
+	 *
+	 * @since   3.2
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->items = $this->get('Items');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/core/administrator/components/com_contenthistory/views/history/tmpl/modal.php
new file mode 100644
index 00000000..4dc45a3c
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/views/history/tmpl/modal.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('behavior.multiselect');
+JHtml::_('jquery.framework');
+
+$input = JFactory::getApplication()->input;
+$field = $input->getCmd('field');
+$function = 'jSelectContenthistory_' . $field;
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+$message = JText::_('COM_CONTENTHISTORY_BUTTON_SELECT_ONE', true);
+$compareMessage = JText::_('COM_CONTENTHISTORY_BUTTON_SELECT_TWO', true);
+JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+$deleteMessage = "alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));";
+$aliasArray = explode('.', $this->state->type_alias);
+$option = (end($aliasArray) == 'category') ? 'com_categories&amp;extension=' . implode('.', array_slice($aliasArray, 0, count($aliasArray) - 1)) : $aliasArray[0];
+$filter = JFilterInput::getInstance();
+$task = $filter->clean(end($aliasArray)) . '.loadhistory';
+$loadUrl = JRoute::_('index.php?option=' . $filter->clean($option) . '&amp;task=' . $task);
+$deleteUrl = JRoute::_('index.php?option=com_contenthistory&task=history.delete');
+$hash = $this->state->get('sha1_hash');
+$formUrl = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&type_id='
+	. $this->state->get('type_id') . '&type_alias=' . $this->state->get('type_alias') . '&' . JSession::getFormToken() . '=1';
+
+JFactory::getDocument()->addScriptDeclaration("
+	(function ($){
+		$(document).ready(function (){
+			$('#toolbar-load').click(function() {
+				var ids = $('input[id*=\'cb\']:checked');
+				if (ids.length == 1) {
+					// Add version item id to URL
+					var url = $('#toolbar-load').attr('data-url') + '&version_id=' + ids[0].value;
+					$('#content-url').attr('data-url', url);
+					if (window.parent) {
+						window.parent.location = url;
+					}
+				} else {
+					alert('" . $message . "');
+				}
+			});
+
+		$('#toolbar-preview').click(function() {
+				var windowSizeArray = ['width=800, height=600, resizable=yes, scrollbars=yes'];
+				var ids = $('input[id*=\'cb\']:checked');
+				if (ids.length == 1) {
+					// Add version item id to URL
+					var url = $('#toolbar-preview').attr('data-url') + '&version_id=' + ids[0].value;
+					$('#content-url').attr('data-url', url);
+					if (window.parent) {
+						window.open(url, '', windowSizeArray);
+						return false;
+					}
+				} else {
+					alert('" . $message . "');
+				}
+			});
+
+			$('#toolbar-compare').click(function() {
+				var windowSizeArray = ['width=1000, height=600, resizable=yes, scrollbars=yes'];
+				var ids = $('input[id*=\'cb\']:checked');
+				if (ids.length == 2) {
+					// Add version item ids to URL
+					var url = $('#toolbar-compare').attr('data-url') + '&id1=' + ids[0].value + '&id2=' + ids[1].value;
+					$('#content-url').attr('data-url', url);
+					if (window.parent) {
+						window.open(url, '', windowSizeArray);
+						return false;
+					}
+				} else {
+					alert('" . $compareMessage . "');
+				}
+			});
+		});
+	})(jQuery);
+	"
+);
+
+?>
+<div class="container-popup">
+
+	<div class="btn-group pull-right">
+		<button id="toolbar-load" type="submit" class="btn hasTooltip" aria-label="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD_DESC'); ?>" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD_DESC'); ?>" data-url="<?php echo JRoute::_($loadUrl); ?>">
+			<span class="icon-upload" aria-hidden="true"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD'); ?></span></button>
+		<button id="toolbar-preview" type="button" class="btn hasTooltip" aria-label="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC'); ?>" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC'); ?>" data-url="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1'); ?>">
+			<span class="icon-search" aria-hidden="true"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_PREVIEW'); ?></span></button>
+		<button id="toolbar-compare" type="button" class="btn hasTooltip" aria-label="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_DESC'); ?>" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_DESC'); ?>" data-url="<?php echo JRoute::_('index.php?option=com_contenthistory&view=compare&layout=compare&tmpl=component&' . JSession::getFormToken() . '=1'); ?>">
+			<span class="icon-zoom-in" aria-hidden="true"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE'); ?></span></button>
+		<button onclick="if (document.adminForm.boxchecked.value==0){<?php echo $deleteMessage; ?>}else{ Joomla.submitbutton('history.keep')}" class="btn pointer hasTooltip" aria-label="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_DESC'); ?>" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_DESC'); ?>">
+			<span class="icon-lock" aria-hidden="true"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP'); ?></span></button>
+		<button onclick="if (document.adminForm.boxchecked.value==0){<?php echo $deleteMessage; ?>}else{ Joomla.submitbutton('history.delete')}" class="btn pointer hasTooltip" aria-label="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_DELETE_DESC'); ?>" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_DELETE_DESC'); ?>">
+			<span class="icon-delete" aria-hidden="true"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_DELETE'); ?></span></button>
+	</div>
+
+	<div class="clearfix"></div>
+	<hr class="hr-condensed" />
+
+	<form action="<?php echo JRoute::_($formUrl); ?>" method="post" name="adminForm" id="adminForm">
+		<table class="table table-striped table-condensed">
+			<thead>
+				<tr>
+					<th width="1%" class="center">
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+					</th>
+					<th width="15%">
+						<?php echo JText::_('JDATE'); ?>
+					</th>
+					<th width="15%" class="nowrap hidden-phone">
+						<?php echo JText::_('COM_CONTENTHISTORY_VERSION_NOTE'); ?>
+					</th>
+					<th width="10%" class="nowrap">
+						<?php echo JText::_('COM_CONTENTHISTORY_KEEP_VERSION'); ?>
+					</th>
+					<th width="15%" class="nowrap hidden-phone">
+						<?php echo JText::_('JAUTHOR'); ?>
+					</th>
+					<th width="10%" class="nowrap center">
+						<?php echo JText::_('COM_CONTENTHISTORY_CHARACTER_COUNT'); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="15">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php $i = 0; ?>
+			<?php foreach ($this->items as $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center">
+						<?php echo JHtml::_('grid.id', $i, $item->version_id); ?>
+					</td>
+					<td>
+						<a class="save-date" onclick="window.open(this.href,'win2','width=800,height=600,resizable=yes,scrollbars=yes'); return false;"
+							href="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1&version_id=' . $item->version_id); ?>">
+							<?php echo JHtml::_('date', $item->save_date, JText::_('DATE_FORMAT_LC6')); ?>
+						</a>
+						<?php if ($item->sha1_hash == $hash) : ?>
+							<span class="icon-featured" aria-hidden="true"><span class="element-invisible"><?php echo JText::_('JFEATURED'); ?></span></span>&nbsp;
+						<?php endif; ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo htmlspecialchars($item->version_note); ?>
+					</td>
+					<td>
+						<?php if ($item->keep_forever) : ?>
+							<a class="btn btn-mini active" rel="tooltip" href="javascript:void(0);"
+								onclick="return listItemTask('cb<?php echo $i; ?>','history.keep')"
+								data-original-title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_TOGGLE_OFF'); ?>">
+								<?php echo JText::_('JYES'); ?>&nbsp;<span class="icon-lock" aria-hidden="true"></span>
+							</a>
+						<?php else : ?>
+							<a class="btn btn-mini active" rel="tooltip" href="javascript:void(0);"
+								onclick="return listItemTask('cb<?php echo $i; ?>','history.keep')"
+								data-original-title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_TOGGLE_ON'); ?>">
+								<?php echo JText::_('JNO'); ?>
+							</a>
+						<?php endif; ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo htmlspecialchars($item->editor); ?>
+					</td>
+					<td class="center">
+						<?php echo number_format((int) $item->character_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?>
+					</td>
+				</tr>
+				<?php $i++; ?>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_contenthistory/views/history/view.html.php b/core/administrator/components/com_contenthistory/views/history/view.html.php
new file mode 100644
index 00000000..0cb7e078
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/views/history/view.html.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of contenthistory.
+ *
+ * @since  3.2
+ */
+class ContenthistoryViewHistory extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  Exception on failure, void on success.
+	 *
+	 * @since   3.2
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->items = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_contenthistory/views/preview/tmpl/preview.php b/core/administrator/components/com_contenthistory/views/preview/tmpl/preview.php
new file mode 100644
index 00000000..540a635b
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/views/preview/tmpl/preview.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+
+?>
+<h3>
+<?php echo JText::sprintf('COM_CONTENTHISTORY_PREVIEW_SUBTITLE_DATE', $this->item->save_date); ?>
+<?php if ($this->item->version_note) : ?>
+	&nbsp;&nbsp;<?php echo JText::sprintf('COM_CONTENTHISTORY_PREVIEW_SUBTITLE', $this->item->version_note); ?>
+<?php endif; ?>
+</h3>
+<table class="table table-striped" >
+<thead><tr>
+	<th width="25%"><?php echo JText::_('COM_CONTENTHISTORY_PREVIEW_FIELD'); ?></th>
+	<th><?php echo JText::_('COM_CONTENTHISTORY_PREVIEW_VALUE'); ?></th>
+</tr></thead>
+<tbody>
+<?php foreach ($this->item->data as $name => $value) : ?>
+	<tr>
+	<?php if (is_object($value->value)) : ?>
+		<td><strong><?php echo $value->label; ?></strong></td>
+		<td></td><tr>
+		<?php foreach ($value->value as $subName => $subValue) : ?>
+			<?php if ($subValue) : ?>
+				<tr>
+				<td><i>&nbsp;&nbsp;<?php echo $subValue->label; ?></i></td>
+				<td><?php echo $subValue->value; ?></td>
+				</tr>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<td><strong><?php echo $value->label; ?></strong></td>
+		<td><?php echo $value->value; ?></td>
+	<?php endif; ?>
+	</tr>
+<?php endforeach; ?>
+</tbody>
+</table>
diff --git a/core/administrator/components/com_contenthistory/views/preview/view.html.php b/core/administrator/components/com_contenthistory/views/preview/view.html.php
new file mode 100644
index 00000000..8b3a00b1
--- /dev/null
+++ b/core/administrator/components/com_contenthistory/views/preview/view.html.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of contenthistory.
+ *
+ * @since  1.5
+ */
+class ContenthistoryViewPreview extends JViewLegacy
+{
+	protected $items;
+
+	protected $state;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  Exception on failure, void on success.
+	 *
+	 * @since   3.2
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+
+		if (false === $this->item)
+		{
+			JFactory::getLanguage()->load('com_content', JPATH_SITE, null, true);
+
+			JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_cpanel/controller.php b/core/administrator/components/com_cpanel/controller.php
new file mode 100644
index 00000000..88971f64
--- /dev/null
+++ b/core/administrator/components/com_cpanel/controller.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cpanel
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cpanel Controller
+ *
+ * @since  1.5
+ */
+class CpanelController extends JControllerLegacy
+{
+}
diff --git a/core/administrator/components/com_cpanel/cpanel.php b/core/administrator/components/com_cpanel/cpanel.php
new file mode 100644
index 00000000..c075c623
--- /dev/null
+++ b/core/administrator/components/com_cpanel/cpanel.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cpanel
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// No access check.
+
+$controller = JControllerLegacy::getInstance('Cpanel');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_cpanel/cpanel.xml b/core/administrator/components/com_cpanel/cpanel.xml
new file mode 100644
index 00000000..ee09c6ee
--- /dev/null
+++ b/core/administrator/components/com_cpanel/cpanel.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_cpanel</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_CPANEL_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>controller.php</filename>
+			<filename>cpanel.php</filename>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_cpanel.ini</language>
+			<language tag="en-GB">language/en-GB.com_cpanel.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_cpanel/views/cpanel/tmpl/default.php b/core/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
new file mode 100644
index 00000000..9d3551d3
--- /dev/null
+++ b/core/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cpanel
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$user = JFactory::getUser();
+?>
+<div class="row-fluid">
+	<?php $iconmodules = JModuleHelper::getModules('icon');
+	if ($iconmodules) : ?>
+		<div class="span3">
+			<div class="cpanel-links">
+				<?php
+				// Display the submenu position modules
+				foreach ($iconmodules as $iconmodule)
+				{
+					echo JModuleHelper::renderModule($iconmodule);
+				}
+				?>
+			</div>
+		</div>
+	<?php endif; ?>
+	<div class="span<?php echo $iconmodules ? 9 : 12; ?>">
+		<?php if ($user->authorise('core.manage', 'com_postinstall') && $this->postinstall_message_count) : ?>
+			<div class="row-fluid">
+				<div class="alert alert-info">
+					<h3>
+						<?php echo JText::_('COM_CPANEL_MESSAGES_TITLE'); ?>
+					</h3>
+					<p>
+						<?php echo JText::_('COM_CPANEL_MESSAGES_BODY_NOCLOSE'); ?>
+					</p>
+					<p>
+						<?php echo JText::_('COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE'); ?>
+					</p>
+					<p>
+						<a href="index.php?option=com_postinstall&amp;eid=700" class="btn btn-primary">
+							<?php echo JText::_('COM_CPANEL_MESSAGES_REVIEW'); ?>
+						</a>
+					</p>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="row-fluid">
+			<?php
+			$spans = 0;
+
+			foreach ($this->modules as $module)
+			{
+				// Get module parameters
+				$params = new Registry($module->params);
+				$bootstrapSize = $params->get('bootstrap_size');
+				if (!$bootstrapSize)
+				{
+					$bootstrapSize = 12;
+				}
+				$spans += $bootstrapSize;
+				if ($spans > 12)
+				{
+					echo '</div><div class="row-fluid">';
+					$spans = $bootstrapSize;
+				}
+				echo JModuleHelper::renderModule($module, array('style' => 'well'));
+			}
+			?>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml b/core/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml
new file mode 100755
index 00000000..f9c3fdac
--- /dev/null
+++ b/core/administrator/components/com_cpanel/views/cpanel/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_cpanel/views/cpanel/view.html.php b/core/administrator/components/com_cpanel/views/cpanel/view.html.php
new file mode 100644
index 00000000..18e215b9
--- /dev/null
+++ b/core/administrator/components/com_cpanel/views/cpanel/view.html.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cpanel
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Cpanel component
+ *
+ * @since  1.0
+ */
+class CpanelViewCpanel extends JViewLegacy
+{
+	/**
+	 * Array of cpanel modules
+	 *
+	 * @var  array
+	 */
+	protected $modules = null;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		// Set toolbar items for the page
+		JToolbarHelper::title(JText::_('COM_CPANEL'), 'home-2 cpanel');
+		JToolbarHelper::help('screen.cpanel');
+
+		$input = JFactory::getApplication()->input;
+
+		/*
+		 * Set the template - this will display cpanel.php
+		 * from the selected admin template.
+		 */
+		$input->set('tmpl', 'cpanel');
+
+		// Display the cpanel modules
+		$this->modules = JModuleHelper::getModules('cpanel');
+
+		try
+		{
+			$messages_model = FOFModel::getTmpInstance('Messages', 'PostinstallModel')->eid(700);
+			$messages       = $messages_model->getItemList();
+		}
+		catch (RuntimeException $e)
+		{
+			$messages = array();
+
+			// Still render the error message from the Exception object
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		$this->postinstall_message_count = count($messages);
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_fields/controller.php b/core/administrator/components/com_fields/controller.php
new file mode 100644
index 00000000..6acbf0a9
--- /dev/null
+++ b/core/administrator/components/com_fields/controller.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Fields Controller
+ *
+ * @since  3.7.0
+ */
+class FieldsController extends JControllerLegacy
+{
+	/**
+	 * The default view.
+	 *
+	 * @var    string
+	 *
+	 * @since   3.7.0
+	 */
+	protected $default_view = 'fields';
+
+	/**
+	 * Typical view method for MVC based architecture
+	 *
+	 * This function is provide as a default implementation, in most cases
+	 * you will need to override it in your own controllers.
+	 *
+	 * @param   boolean     $cachable   If true, the view output will be cached
+	 * @param   array|bool  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}
+	 *
+	 * @return JControllerLegacy|boolean  A JControllerLegacy object to support chaining.
+	 *
+	 * @since   3.7.0
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', 'fields');
+		$id      = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($vName == 'field' && !$this->checkEditId('com_fields.edit.field', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_fields&view=fields&context=' . $this->input->get('context'), false));
+
+			return false;
+		}
+
+		return parent::display($cachable, $urlparams);
+	}
+}
diff --git a/core/administrator/components/com_fields/controllers/field.php b/core/administrator/components/com_fields/controllers/field.php
new file mode 100644
index 00000000..3b6d8f90
--- /dev/null
+++ b/core/administrator/components/com_fields/controllers/field.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * The Field controller
+ *
+ * @since  3.7.0
+ */
+class FieldsControllerField extends JControllerForm
+{
+	private $internalContext;
+
+	private $component;
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+
+	 * @since   3.7.0
+	 */
+	protected $text_prefix = 'COM_FIELDS_FIELD';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->internalContext = JFactory::getApplication()->getUserStateFromRequest('com_fields.fields.context', 'context', 'com_content.article', 'CMD');
+		$parts = FieldsHelper::extract($this->internalContext);
+		$this->component = $parts ? $parts[0] : null;
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	protected function allowAdd($data = array())
+	{
+		return JFactory::getUser()->authorise('core.create', $this->component);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user = JFactory::getUser();
+
+		// Zero record (id:0), return component edit permission by calling parent controller method
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Check edit on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit', $this->component . '.field.' . $recordId))
+		{
+			return true;
+		}
+
+		// Check edit own on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit.own', $this->component . '.field.' . $recordId))
+		{
+			// Existing record already has an owner, get it
+			$record = $this->getModel()->getItem($recordId);
+
+			if (empty($record))
+			{
+				return false;
+			}
+
+			// Grant if current user is owner of the record
+			return $user->id == $record->created_by;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   3.7.0
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Field');
+
+		// Preset the redirect
+		$this->setRedirect('index.php?option=com_fields&view=fields&context=' . $this->internalContext);
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		return parent::getRedirectToItemAppend($recordId) . '&context=' . $this->internalContext;
+	}
+
+	/**
+	 * Gets the URL arguments to append to a list redirect.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getRedirectToListAppend()
+	{
+		return parent::getRedirectToListAppend() . '&context=' . $this->internalContext;
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		$item = $model->getItem();
+
+		if (isset($item->params) && is_array($item->params))
+		{
+			$registry = new Registry;
+			$registry->loadArray($item->params);
+			$item->params = (string) $registry;
+		}
+
+		return;
+	}
+}
diff --git a/core/administrator/components/com_fields/controllers/fields.php b/core/administrator/components/com_fields/controllers/fields.php
new file mode 100644
index 00000000..d6429e27
--- /dev/null
+++ b/core/administrator/components/com_fields/controllers/fields.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Fields list controller class.
+ *
+ * @since  3.7.0
+ */
+class FieldsControllerFields extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 *
+	 * @since   3.7.0
+	 */
+	protected $text_prefix = 'COM_FIELDS_FIELD';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  FieldsModelField|boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function getModel($name = 'Field', $prefix = 'FieldsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_fields/controllers/group.php b/core/administrator/components/com_fields/controllers/group.php
new file mode 100644
index 00000000..d2e9a21b
--- /dev/null
+++ b/core/administrator/components/com_fields/controllers/group.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * The Group controller
+ *
+ * @since  3.7.0
+ */
+class FieldsControllerGroup extends JControllerForm
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+
+	 * @since   3.7.0
+	 */
+	protected $text_prefix = 'COM_FIELDS_GROUP';
+
+	/**
+	 * The component for which the group applies.
+	 *
+	 * @var    string
+	 * @since   3.7.0
+	 */
+	private $component = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$parts = FieldsHelper::extract($this->input->getCmd('context'));
+
+		if ($parts)
+		{
+			$this->component = $parts[0];
+		}
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   3.7.0
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Group');
+
+		// Preset the redirect
+		$this->setRedirect('index.php?option=com_fields&view=groups');
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	protected function allowAdd($data = array())
+	{
+		return JFactory::getUser()->authorise('core.create', $this->component);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	protected function allowEdit($data = array(), $key = 'parent_id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user = JFactory::getUser();
+
+		// Zero record (parent_id:0), return component edit permission by calling parent controller method
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Check edit on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit', $this->component . '.fieldgroup.' . $recordId))
+		{
+			return true;
+		}
+
+		// Check edit own on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit.own', $this->component . '.fieldgroup.' . $recordId) || $user->authorise('core.edit.own', $this->component))
+		{
+			// Existing record already has an owner, get it
+			$record = $this->getModel()->getItem($recordId);
+
+			if (empty($record))
+			{
+				return false;
+			}
+
+			// Grant if current user is owner of the record
+			return $user->id == $record->created_by;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		$item = $model->getItem();
+
+		if (isset($item->params) && is_array($item->params))
+		{
+			$registry = new Registry;
+			$registry->loadArray($item->params);
+			$item->params = (string) $registry;
+		}
+
+		return;
+	}
+}
diff --git a/core/administrator/components/com_fields/controllers/groups.php b/core/administrator/components/com_fields/controllers/groups.php
new file mode 100644
index 00000000..b2fb9a30
--- /dev/null
+++ b/core/administrator/components/com_fields/controllers/groups.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Groups list controller class.
+ *
+ * @since  3.7.0
+ */
+class FieldsControllerGroups extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 *
+	 * @since   3.7.0
+	 */
+	protected $text_prefix = 'COM_FIELDS_GROUP';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  JModelLegacy|boolean  Model object on success; otherwise false on failure.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getModel($name = 'Group', $prefix = 'FieldsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_fields/fields.php b/core/administrator/components/com_fields/fields.php
new file mode 100644
index 00000000..7e0d4eaf
--- /dev/null
+++ b/core/administrator/components/com_fields/fields.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+$app       = JFactory::getApplication();
+$context   = $app->getUserStateFromRequest(
+	'com_fields.groups.context',
+	'context',
+	$app->getUserStateFromRequest('com_fields.fields.context', 'context', 'com_content.article', 'CMD'),
+	'CMD'
+);
+
+$parts = FieldsHelper::extract($context);
+
+if (!$parts || !JFactory::getUser()->authorise('core.manage', $parts[0]))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Fields');
+$controller->execute($app->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_fields/fields.xml b/core/administrator/components/com_fields/fields.xml
new file mode 100644
index 00000000..9920c0a5
--- /dev/null
+++ b/core/administrator/components/com_fields/fields.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.7.0" method="upgrade">
+	<name>com_fields</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>COM_FIELDS_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>fields.php</filename>
+		<folder>controllers</folder>
+		<folder>layouts</folder>
+	</files>
+	<administration>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>controller.php</filename>
+			<filename>fields.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>libraries</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_fields.ini</language>
+			<language tag="en-GB">language/en-GB.com_fields.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
+
diff --git a/core/administrator/components/com_fields/helpers/fields.php b/core/administrator/components/com_fields/helpers/fields.php
new file mode 100644
index 00000000..f58c295f
--- /dev/null
+++ b/core/administrator/components/com_fields/helpers/fields.php
@@ -0,0 +1,800 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JLoader::register('JFolder', JPATH_LIBRARIES . '/joomla/filesystem/folder.php');
+
+/**
+ * FieldsHelper
+ *
+ * @since  3.7.0
+ */
+class FieldsHelper
+{
+	private static $fieldsCache = null;
+
+	private static $fieldCache = null;
+
+	/**
+	 * Extracts the component and section from the context string which has to
+	 * be in the format component.context.
+	 *
+	 * @param   string  $contextString  contextString
+	 * @param   object  $item           optional item object
+	 *
+	 * @return  array|null
+	 *
+	 * @since   3.7.0
+	 */
+	public static function extract($contextString, $item = null)
+	{
+		$parts = explode('.', $contextString, 2);
+
+		if (count($parts) < 2)
+		{
+			return null;
+		}
+
+		$component = $parts[0];
+		$eName = str_replace('com_', '', $component);
+
+		$path = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+
+		if (file_exists($path))
+		{
+			$cName = ucfirst($eName) . 'Helper';
+
+			JLoader::register($cName, $path);
+
+			if (class_exists($cName) && is_callable(array($cName, 'validateSection')))
+			{
+				$section = call_user_func_array(array($cName, 'validateSection'), array($parts[1], $item));
+
+				if ($section)
+				{
+					$parts[1] = $section;
+				}
+			}
+		}
+
+		return $parts;
+	}
+
+	/**
+	 * Returns the fields for the given context.
+	 * If the item is an object the returned fields do have an additional field
+	 * "value" which represents the value for the given item. If the item has an
+	 * assigned_cat_ids field, then additionally fields which belong to that
+	 * category will be returned.
+	 * Should the value being prepared to be shown in an HTML context then
+	 * prepareValue must be set to true. No further escaping needs to be done.
+	 * The values of the fields can be overridden by an associative array where the keys
+	 * have to be a name and its corresponding value.
+	 *
+	 * @param   string    $context           The context of the content passed to the helper
+	 * @param   stdClass  $item              item
+	 * @param   int|bool  $prepareValue      (if int is display event): 1 - AfterTitle, 2 - BeforeDisplay, 3 - AfterDisplay, 0 - OFF
+	 * @param   array     $valuesToOverride  The values to override
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getFields($context, $item = null, $prepareValue = false, array $valuesToOverride = null)
+	{
+		if (self::$fieldsCache === null)
+		{
+			// Load the model
+			JLoader::import('joomla.application.component.model');
+			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_fields/models', 'FieldsModel');
+
+			self::$fieldsCache = JModelLegacy::getInstance('Fields', 'FieldsModel', array(
+				'ignore_request' => true)
+			);
+
+			self::$fieldsCache->setState('filter.state', 1);
+			self::$fieldsCache->setState('list.limit', 0);
+		}
+
+		if (is_array($item))
+		{
+			$item = (object) $item;
+		}
+
+		if (JLanguageMultilang::isEnabled() && isset($item->language) && $item->language != '*')
+		{
+			self::$fieldsCache->setState('filter.language', array('*', $item->language));
+		}
+
+		self::$fieldsCache->setState('filter.context', $context);
+
+		/*
+		 * If item has assigned_cat_ids parameter display only fields which
+		 * belong to the category
+		 */
+		if ($item && (isset($item->catid) || isset($item->fieldscatid)))
+		{
+			$assignedCatIds = isset($item->catid) ? $item->catid : $item->fieldscatid;
+
+			if (!is_array($assignedCatIds))
+			{
+				$assignedCatIds = explode(',', $assignedCatIds);
+			}
+
+			// Fields without any category assigned should show as well
+			$assignedCatIds[] = 0;
+
+			self::$fieldsCache->setState('filter.assigned_cat_ids', $assignedCatIds);
+		}
+
+		$fields = self::$fieldsCache->getItems();
+
+		if ($fields === false)
+		{
+			return array();
+		}
+
+		if ($item && isset($item->id))
+		{
+			if (self::$fieldCache === null)
+			{
+				self::$fieldCache = JModelLegacy::getInstance('Field', 'FieldsModel', array('ignore_request' => true));
+			}
+
+			$fieldIds = array_map(
+				function ($f)
+				{
+					return $f->id;
+				},
+				$fields
+			);
+
+			$fieldValues = self::$fieldCache->getFieldValues($fieldIds, $item->id);
+
+			$new = array();
+
+			foreach ($fields as $key => $original)
+			{
+				/*
+				 * Doing a clone, otherwise fields for different items will
+				 * always reference to the same object
+				 */
+				$field = clone $original;
+
+				if ($valuesToOverride && key_exists($field->name, $valuesToOverride))
+				{
+					$field->value = $valuesToOverride[$field->name];
+				}
+				elseif ($valuesToOverride && key_exists($field->id, $valuesToOverride))
+				{
+					$field->value = $valuesToOverride[$field->id];
+				}
+				elseif (key_exists($field->id, $fieldValues))
+				{
+					$field->value = $fieldValues[$field->id];
+				}
+
+				if (!isset($field->value) || $field->value === '')
+				{
+					$field->value = $field->default_value;
+				}
+
+				$field->rawvalue = $field->value;
+
+				// If boolean prepare, if int, it is the event type: 1 - After Title, 2 - Before Display, 3 - After Display, 0 - Do not prepare
+				if ($prepareValue && (is_bool($prepareValue) || $prepareValue === (int) $field->params->get('display', '2')))
+				{
+					JPluginHelper::importPlugin('fields');
+
+					$dispatcher = JEventDispatcher::getInstance();
+
+					// Event allow plugins to modfify the output of the field before it is prepared
+					$dispatcher->trigger('onCustomFieldsBeforePrepareField', array($context, $item, &$field));
+
+					// Gathering the value for the field
+					$value = $dispatcher->trigger('onCustomFieldsPrepareField', array($context, $item, &$field));
+
+					if (is_array($value))
+					{
+						$value = implode(' ', $value);
+					}
+
+					// Event allow plugins to modfify the output of the prepared field
+					$dispatcher->trigger('onCustomFieldsAfterPrepareField', array($context, $item, $field, &$value));
+
+					// Assign the value
+					$field->value = $value;
+				}
+
+				$new[$key] = $field;
+			}
+
+			$fields = $new;
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Renders the layout file and data on the context and does a fall back to
+	 * Fields afterwards.
+	 *
+	 * @param   string  $context      The context of the content passed to the helper
+	 * @param   string  $layoutFile   layoutFile
+	 * @param   array   $displayData  displayData
+	 *
+	 * @return  NULL|string
+	 *
+	 * @since  3.7.0
+	 */
+	public static function render($context, $layoutFile, $displayData)
+	{
+		$value = '';
+
+		/*
+		 * Because the layout refreshes the paths before the render function is
+		 * called, so there is no way to load the layout overrides in the order
+		 * template -> context -> fields.
+		 * If there is no override in the context then we need to call the
+		 * layout from Fields.
+		 */
+		if ($parts = self::extract($context))
+		{
+			// Trying to render the layout on the component from the context
+			$value = JLayoutHelper::render($layoutFile, $displayData, null, array('component' => $parts[0], 'client' => 0));
+		}
+
+		if ($value == '')
+		{
+			// Trying to render the layout on Fields itself
+			$value = JLayoutHelper::render($layoutFile, $displayData, null, array('component' => 'com_fields','client' => 0));
+		}
+
+		return $value;
+	}
+
+	/**
+	 * PrepareForm
+	 *
+	 * @param   string  $context  The context of the content passed to the helper
+	 * @param   JForm   $form     form
+	 * @param   object  $data     data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public static function prepareForm($context, JForm $form, $data)
+	{
+		// Extracting the component and section
+		$parts = self::extract($context);
+
+		if (! $parts)
+		{
+			return true;
+		}
+
+		$context = $parts[0] . '.' . $parts[1];
+
+		// When no fields available return here
+		$fields = self::getFields($parts[0] . '.' . $parts[1], new JObject);
+
+		if (! $fields)
+		{
+			return true;
+		}
+
+		$component = $parts[0];
+		$section   = $parts[1];
+
+		$assignedCatids = isset($data->catid) ? $data->catid : (isset($data->fieldscatid) ? $data->fieldscatid : $form->getValue('catid'));
+
+		// Account for case that a submitted form has a multi-value category id field (e.g. a filtering form), just use the first category
+		$assignedCatids = is_array($assignedCatids)
+			? (int) reset($assignedCatids)
+			: (int) $assignedCatids;
+
+		if (!$assignedCatids && $formField = $form->getField('catid'))
+		{
+			$assignedCatids = $formField->getAttribute('default', null);
+
+			// Choose the first category available
+			$xml = new DOMDocument;
+			$xml->loadHTML($formField->__get('input'));
+			$options = $xml->getElementsByTagName('option');
+
+			if (!$assignedCatids && $firstChoice = $options->item(0))
+			{
+				$assignedCatids = $firstChoice->getAttribute('value');
+			}
+
+			$data->fieldscatid = $assignedCatids;
+		}
+
+		/*
+		 * If there is a catid field we need to reload the page when the catid
+		 * is changed
+		 */
+		if ($form->getField('catid') && $parts[0] != 'com_fields')
+		{
+			/*
+			 * Setting the onchange event to reload the page when the category
+			 * has changed
+			*/
+			$form->setFieldAttribute('catid', 'onchange', 'categoryHasChanged(this);');
+
+			// Preload spindle-wheel when we need to submit form due to category selector changed
+			JFactory::getDocument()->addScriptDeclaration("
+			function categoryHasChanged(element) {
+				var cat = jQuery(element);
+				if (cat.val() == '" . $assignedCatids . "')return;
+				Joomla.loadingLayer('show');
+				jQuery('input[name=task]').val('" . $section . ".reload');
+				element.form.submit();
+			}
+			jQuery( document ).ready(function() {
+				Joomla.loadingLayer('load');
+				var formControl = '#" . $form->getFormControl() . "_catid';
+				if (!jQuery(formControl).val() != '" . $assignedCatids . "'){jQuery(formControl).val('" . $assignedCatids . "');}
+			});"
+			);
+		}
+
+		// Getting the fields
+		$fields = self::getFields($parts[0] . '.' . $parts[1], $data);
+
+		if (!$fields)
+		{
+			return true;
+		}
+
+		$fieldTypes = self::getFieldTypes();
+
+		// Creating the dom
+		$xml = new DOMDocument('1.0', 'UTF-8');
+		$fieldsNode = $xml->appendChild(new DOMElement('form'))->appendChild(new DOMElement('fields'));
+		$fieldsNode->setAttribute('name', 'com_fields');
+
+		// Organizing the fields according to their group
+		$fieldsPerGroup = array(0 => array());
+
+		foreach ($fields as $field)
+		{
+			if (!array_key_exists($field->type, $fieldTypes))
+			{
+				// Field type is not available
+				continue;
+			}
+
+			if (!array_key_exists($field->group_id, $fieldsPerGroup))
+			{
+				$fieldsPerGroup[$field->group_id] = array();
+			}
+
+			if ($path = $fieldTypes[$field->type]['path'])
+			{
+				// Add the lookup path for the field
+				JFormHelper::addFieldPath($path);
+			}
+
+			if ($path = $fieldTypes[$field->type]['rules'])
+			{
+				// Add the lookup path for the rule
+				JFormHelper::addRulePath($path);
+			}
+
+			$fieldsPerGroup[$field->group_id][] = $field;
+		}
+
+		// On the front, sometimes the admin fields path is not included
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_fields/tables');
+
+		$model = JModelLegacy::getInstance('Groups', 'FieldsModel', array('ignore_request' => true));
+		$model->setState('filter.context', $context);
+
+		/**
+		 * $model->getItems() would only return existing groups, but we also
+		 * have the 'default' group with id 0 which is not in the database,
+		 * so we create it virtually here.
+		 */
+		$defaultGroup = new \stdClass;
+		$defaultGroup->id = 0;
+		$defaultGroup->title = '';
+		$defaultGroup->description = '';
+		$iterateGroups = array_merge(array($defaultGroup), $model->getItems());
+
+		// Looping through the groups
+		foreach ($iterateGroups as $group)
+		{
+			if (empty($fieldsPerGroup[$group->id]))
+			{
+				continue;
+			}
+
+			// Defining the field set
+			/** @var DOMElement $fieldset */
+			$fieldset = $fieldsNode->appendChild(new DOMElement('fieldset'));
+			$fieldset->setAttribute('name', 'fields-' . $group->id);
+			$fieldset->setAttribute('addfieldpath', '/administrator/components/' . $component . '/models/fields');
+			$fieldset->setAttribute('addrulepath', '/administrator/components/' . $component . '/models/rules');
+
+			$label       = $group->title;
+			$description = $group->description;
+
+			if (!$label)
+			{
+				$key = strtoupper($component . '_FIELDS_' . $section . '_LABEL');
+
+				if (!JFactory::getLanguage()->hasKey($key))
+				{
+					$key = 'JGLOBAL_FIELDS';
+				}
+
+				$label = $key;
+			}
+
+			if (!$description)
+			{
+				$key = strtoupper($component . '_FIELDS_' . $section . '_DESC');
+
+				if (JFactory::getLanguage()->hasKey($key))
+				{
+					$description = $key;
+				}
+			}
+
+			$fieldset->setAttribute('label', $label);
+			$fieldset->setAttribute('description', strip_tags($description));
+
+			// Looping through the fields for that context
+			foreach ($fieldsPerGroup[$group->id] as $field)
+			{
+				try
+				{
+					JFactory::getApplication()->triggerEvent('onCustomFieldsPrepareDom', array($field, $fieldset, $form));
+
+					/*
+					 * If the field belongs to an assigned_cat_id but the assigned_cat_ids in the data
+					 * is not known, set the required flag to false on any circumstance.
+					 */
+					if (!$assignedCatids && !empty($field->assigned_cat_ids) && $form->getField($field->name))
+					{
+						$form->setFieldAttribute($field->name, 'required', 'false');
+					}
+				}
+				catch (Exception $e)
+				{
+					JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+				}
+			}
+
+			// When the field set is empty, then remove it
+			if (!$fieldset->hasChildNodes())
+			{
+				$fieldsNode->removeChild($fieldset);
+			}
+		}
+
+		// Loading the XML fields string into the form
+		$form->load($xml->saveXML());
+
+		$model = JModelLegacy::getInstance('Field', 'FieldsModel', array('ignore_request' => true));
+
+		if ((!isset($data->id) || !$data->id) && JFactory::getApplication()->input->getCmd('controller') == 'config.display.modules'
+			&& JFactory::getApplication()->isClient('site'))
+		{
+			// Modules on front end editing don't have data and an id set
+			$data->id = JFactory::getApplication()->input->getInt('id');
+		}
+
+		// Looping through the fields again to set the value
+		if (!isset($data->id) || !$data->id)
+		{
+			return true;
+		}
+
+		foreach ($fields as $field)
+		{
+			$value = $model->getFieldValue($field->id, $data->id);
+
+			if ($value === null)
+			{
+				continue;
+			}
+
+			if (!is_array($value) && $value !== '')
+			{
+				// Function getField doesn't cache the fields, so we try to do it only when necessary
+				$formField = $form->getField($field->name, 'com_fields');
+
+				if ($formField && $formField->forceMultiple)
+				{
+					$value = (array) $value;
+				}
+			}
+
+			// Setting the value on the field
+			$form->setValue($field->name, 'com_fields', $value);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Return a boolean if the actual logged in user can edit the given field value.
+	 *
+	 * @param   stdClass  $field  The field
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public static function canEditFieldValue($field)
+	{
+		$parts = self::extract($field->context);
+
+		return JFactory::getUser()->authorise('core.edit.value', $parts[0] . '.field.' . (int) $field->id);
+	}
+
+	/**
+	 * Return a boolean based on field (and field group) display / show_on settings
+	 *
+	 * @param   stdClass  $field  The field
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.8.7
+	 */
+	public static function displayFieldOnForm($field)
+	{
+		$app = JFactory::getApplication();
+
+		// Detect if the field should be shown at all
+		if ($field->params->get('show_on') == 1 && $app->isClient('administrator'))
+		{
+			return false;
+		}
+		elseif ($field->params->get('show_on') == 2 && $app->isClient('site'))
+		{
+			return false;
+		}
+
+		if (!self::canEditFieldValue($field))
+		{
+			$fieldDisplayReadOnly = $field->params->get('display_readonly', '2');
+
+			if ($fieldDisplayReadOnly == '2')
+			{
+				// Inherit from field group display read-only setting
+				$groupModel = JModelLegacy::getInstance('Group', 'FieldsModel', array('ignore_request' => true));
+				$groupDisplayReadOnly = $groupModel->getItem($field->group_id)->params->get('display_readonly', '1');
+				$fieldDisplayReadOnly = $groupDisplayReadOnly;
+			}
+
+			if ($fieldDisplayReadOnly == '0')
+			{
+				// Do not display field on form when field is read-only
+				return false;
+			}
+		}
+
+		// Display field on form
+		return true;
+	}
+
+	/**
+	 * Adds Count Items for Category Manager.
+	 *
+	 * @param   stdClass[]  $items  The field category objects
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.7.0
+	 */
+	public static function countItems(&$items)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed     = 0;
+			$item->count_archived    = 0;
+			$item->count_unpublished = 0;
+			$item->count_published   = 0;
+
+			$query = $db->getQuery(true);
+			$query->select('state, count(1) AS count')
+				->from($db->quoteName('#__fields'))
+				->where('group_id = ' . (int) $item->id)
+				->group('state');
+			$db->setQuery($query);
+
+			$fields = $db->loadObjectList();
+
+			$states = array(
+				'-2' => 'count_trashed',
+				'0'  => 'count_unpublished',
+				'1'  => 'count_published',
+				'2'  => 'count_archived',
+			);
+
+			foreach ($fields as $field)
+			{
+				$property = $states[$field->state];
+				$item->$property = $field->count;
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Gets assigned categories titles for a field
+	 *
+	 * @param   stdClass[]  $fieldId  The field ID
+	 *
+	 * @return  array  Array with the assigned categories
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getAssignedCategoriesTitles($fieldId)
+	{
+		$fieldId = (int) $fieldId;
+
+		if (!$fieldId)
+		{
+			return array();
+		}
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select($db->quoteName('c.title'))
+			->from($db->quoteName('#__fields_categories', 'a'))
+			->join('INNER', $db->quoteName('#__categories', 'c') . ' ON a.category_id = c.id')
+			->where('field_id = ' . $fieldId);
+
+		$db->setQuery($query);
+
+		return $db->loadColumn();
+	}
+
+	/**
+	 * Gets the fields system plugin extension id.
+	 *
+	 * @return  integer  The fields system plugin extension id.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getFieldsPluginId()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('fields'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+			$result = 0;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $context  The context the fields are used for
+	 * @param   string  $vName    The view currently active
+	 *
+	 * @return  void
+	 *
+	 * @since    3.7.0
+	 */
+	public static function addSubmenu($context, $vName)
+	{
+		$parts = self::extract($context);
+
+		if (!$parts)
+		{
+			return;
+		}
+
+		$component = $parts[0];
+
+		// Avoid nonsense situation.
+		if ($component == 'com_fields')
+		{
+			return;
+		}
+
+		// Try to find the component helper.
+		$eName = str_replace('com_', '', $component);
+		$file  = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+
+		if (!file_exists($file))
+		{
+			return;
+		}
+
+		require_once $file;
+
+		$cName = ucfirst($eName) . 'Helper';
+
+		if (class_exists($cName) && is_callable(array($cName, 'addSubmenu')))
+		{
+			$lang = JFactory::getLanguage();
+			$lang->load($component, JPATH_ADMINISTRATOR)
+			|| $lang->load($component, JPATH_ADMINISTRATOR . '/components/' . $component);
+
+			$cName::addSubmenu('fields.' . $vName);
+		}
+	}
+
+	/**
+	 * Loads the fields plugins and returns an array of field types from the plugins.
+	 *
+	 * The returned array contains arrays with the following keys:
+	 * - label: The label of the field
+	 * - type:  The type of the field
+	 * - path:  The path of the folder where the field can be found
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getFieldTypes()
+	{
+		JPluginHelper::importPlugin('fields');
+		$eventData = JEventDispatcher::getInstance()->trigger('onCustomFieldsGetTypes');
+
+		$data = array();
+
+		foreach ($eventData as $fields)
+		{
+			foreach ($fields as $fieldDescription)
+			{
+				if (!array_key_exists('path', $fieldDescription))
+				{
+					$fieldDescription['path'] = null;
+				}
+
+				if (!array_key_exists('rules', $fieldDescription))
+				{
+					$fieldDescription['rules'] = null;
+				}
+
+				$data[$fieldDescription['type']] = $fieldDescription;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Clears the internal cache for the custom fields.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public static function clearFieldsCache()
+	{
+		self::$fieldCache  = null;
+		self::$fieldsCache = null;
+	}
+}
diff --git a/core/administrator/components/com_fields/libraries/fieldslistplugin.php b/core/administrator/components/com_fields/libraries/fieldslistplugin.php
new file mode 100644
index 00000000..2a17117a
--- /dev/null
+++ b/core/administrator/components/com_fields/libraries/fieldslistplugin.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Base plugin for all list based plugins
+ *
+ * @since  3.7.0
+ */
+class FieldsListPlugin extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('validate', 'options');
+
+		foreach ($this->getOptionsFromField($field) as $value => $name)
+		{
+			$option = new DOMElement('option', htmlspecialchars($value, ENT_COMPAT, 'UTF-8'));
+			$option->textContent = htmlspecialchars(JText::_($name), ENT_COMPAT, 'UTF-8');
+
+			$element = $fieldNode->appendChild($option);
+			$element->setAttribute('value', $value);
+		}
+
+		return $fieldNode;
+	}
+
+	/**
+	 * Returns an array of key values to put in a list from the given field.
+	 *
+	 * @param   stdClass  $field  The field.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public function getOptionsFromField($field)
+	{
+		$data = array();
+
+		// Fetch the options from the plugin
+		$params = clone $this->params;
+		$params->merge($field->fieldparams);
+
+		foreach ($params->get('options', array()) as $option)
+		{
+			$op = (object) $option;
+			$data[$op->value] = $op->name;
+		}
+
+		return $data;
+	}
+}
diff --git a/core/administrator/components/com_fields/libraries/fieldsplugin.php b/core/administrator/components/com_fields/libraries/fieldsplugin.php
new file mode 100644
index 00000000..3a88cb0e
--- /dev/null
+++ b/core/administrator/components/com_fields/libraries/fieldsplugin.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Abstract Fields Plugin
+ *
+ * @since  3.7.0
+ */
+abstract class FieldsPlugin extends JPlugin
+{
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Returns the custom fields types.
+	 *
+	 * @return  string[][]
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsGetTypes()
+	{
+		// Cache filesystem access / checks
+		static $types_cache = array();
+
+		if (isset($types_cache[$this->_type . $this->_name]))
+		{
+			return $types_cache[$this->_type . $this->_name];
+		}
+
+		$types = array();
+
+		// The root of the plugin
+		$root = JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name;
+
+		foreach (JFolder::files($root . '/tmpl', '.php') as $layout)
+		{
+			// Strip the extension
+			$layout = str_replace('.php', '', $layout);
+
+			// The data array
+			$data = array();
+
+			// The language key
+			$key = strtoupper($layout);
+
+			if ($key != strtoupper($this->_name))
+			{
+				$key = strtoupper($this->_name) . '_' . $layout;
+			}
+
+			// Needed attributes
+			$data['type'] = $layout;
+
+			if (JFactory::getLanguage()->hasKey('PLG_FIELDS_' . $key . '_LABEL'))
+			{
+				$data['label'] = JText::sprintf('PLG_FIELDS_' . $key . '_LABEL', strtolower($key));
+
+				// Fix wrongly set parentheses in RTL languages
+				if (JFactory::getLanguage()->isRTL())
+				{
+					$data['label'] = $data['label'] . '&#x200E;';
+				}
+			}
+			else
+			{
+				$data['label'] = $key;
+			}
+
+			$path = $root . '/fields';
+
+			// Add the path when it exists
+			if (file_exists($path))
+			{
+				$data['path'] = $path;
+			}
+
+			$path = $root . '/rules';
+
+			// Add the path when it exists
+			if (file_exists($path))
+			{
+				$data['rules'] = $path;
+			}
+
+			$types[] = $data;
+		}
+
+		// Add to cache and return the data
+		$types_cache[$this->_type . $this->_name] = $types;
+
+		return $types;
+	}
+
+	/**
+	 * Prepares the field value.
+	 *
+	 * @param   string    $context  The context.
+	 * @param   stdclass  $item     The item.
+	 * @param   stdclass  $field    The field.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareField($context, $item, $field)
+	{
+		// Check if the field should be processed by us
+		if (!$this->isTypeSupported($field->type))
+		{
+			return;
+		}
+
+		// Merge the params from the plugin and field which has precedence
+		$fieldParams = clone $this->params;
+		$fieldParams->merge($field->fieldparams);
+
+		// Get the path for the layout file
+		$path = JPluginHelper::getLayoutPath('fields', $field->type, $field->type);
+
+		// Render the layout
+		ob_start();
+		include $path;
+		$output = ob_get_clean();
+
+		// Return the output
+		return $output;
+	}
+
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		// Check if the field should be processed by us
+		if (!$this->isTypeSupported($field->type))
+		{
+			return null;
+		}
+
+		// Detect if the field is configured to be displayed on the form
+		if (!FieldsHelper::displayFieldOnForm($field))
+		{
+			return null;
+		}
+
+		// Create the node
+		$node = $parent->appendChild(new DOMElement('field'));
+
+		// Set the attributes
+		$node->setAttribute('name', $field->name);
+		$node->setAttribute('type', $field->type);
+		$node->setAttribute('label', $field->label);
+		$node->setAttribute('description', $field->description);
+		$node->setAttribute('class', $field->params->get('class'));
+		$node->setAttribute('hint', $field->params->get('hint'));
+		$node->setAttribute('required', $field->required ? 'true' : 'false');
+
+		if ($field->default_value !== '')
+		{
+			$defaultNode = $node->appendChild(new DOMElement('default'));
+			$defaultNode->appendChild(new DOMCdataSection($field->default_value));
+		}
+
+		// Combine the two params
+		$params = clone $this->params;
+		$params->merge($field->fieldparams);
+
+		// Set the specific field parameters
+		foreach ($params->toArray() as $key => $param)
+		{
+			if (is_array($param))
+			{
+				// Multidimensional arrays (eg. list options) can't be transformed properly
+				$param = count($param) == count($param, COUNT_RECURSIVE) ? implode(',', $param) : '';
+			}
+
+			if ($param === '' || (!is_string($param) && !is_numeric($param)))
+			{
+				continue;
+			}
+
+			$node->setAttribute($key, $param);
+		}
+
+		// Check if it is allowed to edit the field
+		if (!FieldsHelper::canEditFieldValue($field))
+		{
+			$node->setAttribute('disabled', 'true');
+		}
+
+		// Return the node
+		return $node;
+	}
+
+	/**
+	 * The form event. Load additional parameters when available into the field form.
+	 * Only when the type of the form is of interest.
+	 *
+	 * @param   JForm     $form  The form
+	 * @param   stdClass  $data  The data
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentPrepareForm(JForm $form, $data)
+	{
+		// Check if the field form is calling us
+		if (strpos($form->getName(), 'com_fields.field') !== 0)
+		{
+			return;
+		}
+
+		// Ensure it is an object
+		$formData = (object) $data;
+
+		// Gather the type
+		$type = $form->getValue('type');
+
+		if (!empty($formData->type))
+		{
+			$type = $formData->type;
+		}
+
+		// Not us
+		if (!$this->isTypeSupported($type))
+		{
+			return;
+		}
+
+		$path = JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name . '/params/' . $type . '.xml';
+
+		// Check if params file exists
+		if (!file_exists($path))
+		{
+			return;
+		}
+
+		// Load the specific plugin parameters
+		$form->load(file_get_contents($path), true, '/form/*');
+	}
+
+	/**
+	 * Returns true if the given type is supported by the plugin.
+	 *
+	 * @param   string  $type  The type
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	protected function isTypeSupported($type)
+	{
+		foreach ($this->onCustomFieldsGetTypes() as $typeSpecification)
+		{
+			if ($type == $typeSpecification['type'])
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/core/administrator/components/com_fields/models/field.php b/core/administrator/components/com_fields/models/field.php
new file mode 100644
index 00000000..2445eeda
--- /dev/null
+++ b/core/administrator/components/com_fields/models/field.php
@@ -0,0 +1,1138 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Field Model
+ *
+ * @since  3.7.0
+ */
+class FieldsModelField extends JModelAdmin
+{
+	/**
+	 * @var null|string
+	 *
+	 * @since   3.7.0
+	 */
+	public $typeAlias = null;
+
+	/**
+	 * @var string
+	 *
+	 * @since   3.7.0
+	 */
+	protected $text_prefix = 'COM_FIELDS';
+
+	/**
+	 * Batch copy/move command. If set to false,
+	 * the batch copy/move command is not supported
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $batch_copymove = 'group_id';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var array
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id'   => 'batchLanguage'
+	);
+
+	/**
+	 * @var array
+	 *
+	 * @since   3.7.0
+	 */
+	private $valueCache = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JModelLegacy
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->typeAlias = JFactory::getApplication()->input->getCmd('context', 'com_content.article') . '.field';
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success, False on error.
+	 *
+	 * @since   3.7.0
+	 */
+	public function save($data)
+	{
+		$field = null;
+
+		if (isset($data['id']) && $data['id'])
+		{
+			$field = $this->getItem($data['id']);
+		}
+
+		if (!isset($data['label']) && isset($data['params']['label']))
+		{
+			$data['label'] = $data['params']['label'];
+
+			unset($data['params']['label']);
+		}
+
+		// Alter the title for save as copy
+		$input = JFactory::getApplication()->input;
+
+		if ($input->get('task') == 'save2copy')
+		{
+			$origTable = clone $this->getTable();
+			$origTable->load($input->getInt('id'));
+
+			if ($data['title'] == $origTable->title)
+			{
+				list($title, $name) = $this->generateNewTitle($data['group_id'], $data['name'], $data['title']);
+				$data['title'] = $title;
+				$data['label'] = $title;
+				$data['name'] = $name;
+			}
+			else
+			{
+				if ($data['name'] == $origTable->name)
+				{
+					$data['name'] = '';
+				}
+			}
+
+			$data['state'] = 0;
+		}
+
+		// Load the fields plugins, perhaps they want to do something
+		JPluginHelper::importPlugin('fields');
+
+		$message = $this->checkDefaultValue($data);
+
+		if ($message !== true)
+		{
+			$this->setError($message);
+
+			return false;
+		}
+
+		if (!parent::save($data))
+		{
+			return false;
+		}
+
+		// Save the assigned categories into #__fields_categories
+		$db = $this->getDbo();
+		$id = (int) $this->getState('field.id');
+		$cats = isset($data['assigned_cat_ids']) ? (array) $data['assigned_cat_ids'] : array();
+		$cats = ArrayHelper::toInteger($cats);
+
+		$assignedCatIds = array();
+
+		foreach ($cats as $cat)
+		{
+			if ($cat)
+			{
+				$assignedCatIds[] = $cat;
+			}
+		}
+
+		// First delete all assigned categories
+		$query = $db->getQuery(true);
+		$query->delete('#__fields_categories')
+			->where('field_id = ' . $id);
+		$db->setQuery($query);
+		$db->execute();
+
+		// Inset new assigned categories
+		$tupel = new stdClass;
+		$tupel->field_id = $id;
+
+		foreach ($assignedCatIds as $catId)
+		{
+			$tupel->category_id = $catId;
+			$db->insertObject('#__fields_categories', $tupel);
+		}
+
+		// If the options have changed delete the values
+		if ($field && isset($data['fieldparams']['options']) && isset($field->fieldparams['options']))
+		{
+			$oldParams = $this->getParams($field->fieldparams['options']);
+			$newParams = $this->getParams($data['fieldparams']['options']);
+
+			if (is_object($oldParams) && is_object($newParams) && $oldParams != $newParams)
+			{
+				$names = array();
+
+				foreach ($newParams as $param)
+				{
+					$names[] = $db->q($param['value']);
+				}
+
+				$query = $db->getQuery(true);
+				$query->delete('#__fields_values')->where('field_id = ' . (int) $field->id)
+					->where('value NOT IN (' . implode(',', $names) . ')');
+				$db->setQuery($query);
+				$db->execute();
+			}
+		}
+
+		FieldsHelper::clearFieldsCache();
+
+		return true;
+	}
+
+
+	/**
+	 * Checks if the default value is valid for the given data. If a string is returned then
+	 * it can be assumed that the default value is invalid.
+	 *
+	 * @param   array  $data  The data.
+	 *
+	 * @return  true|string  true if valid, a string containing the exception message when not.
+	 *
+	 * @since   3.7.0
+	 */
+	private function checkDefaultValue($data)
+	{
+		// Empty default values are correct
+		if (empty($data['default_value']))
+		{
+			return true;
+		}
+
+		$types = FieldsHelper::getFieldTypes();
+
+		// Check if type exists
+		if (!key_exists($data['type'], $types))
+		{
+			return true;
+		}
+
+		$path = $types[$data['type']]['rules'];
+
+		// Add the path for the rules of the plugin when available
+		if ($path)
+		{
+			// Add the lookup path for the rule
+			JFormHelper::addRulePath($path);
+		}
+
+		// Create the fields object
+		$obj              = (object) $data;
+		$obj->params      = new Registry($obj->params);
+		$obj->fieldparams = new Registry(!empty($obj->fieldparams) ? $obj->fieldparams : array());
+
+		// Prepare the dom
+		$dom  = new DOMDocument;
+		$node = $dom->appendChild(new DOMElement('form'));
+
+		// Trigger the event to create the field dom node
+		JEventDispatcher::getInstance()->trigger('onCustomFieldsPrepareDom', array($obj, $node, new JForm($data['context'])));
+
+		// Check if a node is created
+		if (!$node->firstChild)
+		{
+			return true;
+		}
+
+		// Define the type either from the field or from the data
+		$type = $node->firstChild->getAttribute('validate') ? : $data['type'];
+
+		// Load the rule
+		$rule = JFormHelper::loadRuleType($type);
+
+		// When no rule exists, we allow the default value
+		if (!$rule)
+		{
+			return true;
+		}
+
+		try
+		{
+			// Perform the check
+			$result = $rule->test(simplexml_import_dom($node->firstChild), $data['default_value']);
+
+			// Check if the test succeeded
+			return $result === true ? : JText::_('COM_FIELDS_FIELD_INVALID_DEFAULT_VALUE');
+		}
+		catch (UnexpectedValueException $e)
+		{
+			return $e->getMessage();
+		}
+	}
+
+	/**
+	 * Converts the unknown params into an object.
+	 *
+	 * @param   mixed  $params  The params.
+	 *
+	 * @return  stdClass  Object on success, false on failure.
+	 *
+	 * @since   3.7.0
+	 */
+	private function getParams($params)
+	{
+		if (is_string($params))
+		{
+			$params = json_decode($params);
+		}
+
+		if (is_array($params))
+		{
+			$params = (object) $params;
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed    Object on success, false on failure.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItem($pk = null)
+	{
+		$result = parent::getItem($pk);
+
+		if ($result)
+		{
+			// Prime required properties.
+			if (empty($result->id))
+			{
+				$result->context = JFactory::getApplication()->input->getCmd('context', $this->getState('field.context'));
+			}
+
+			if (property_exists($result, 'fieldparams') && $result->fieldparams !== null)
+			{
+				$registry = new Registry;
+				$registry->loadString($result->fieldparams);
+				$result->fieldparams = $registry->toArray();
+			}
+
+			$db = $this->getDbo();
+			$query = $db->getQuery(true);
+			$query->select('category_id')
+				->from('#__fields_categories')
+				->where('field_id = ' . (int) $result->id);
+
+			$db->setQuery($query);
+			$result->assigned_cat_ids = $db->loadColumn() ?: array(0);
+
+			// Convert the created and modified dates to local user time for
+			// display in the form.
+			$tz = new DateTimeZone(JFactory::getApplication()->get('offset'));
+
+			if ((int) $result->created_time)
+			{
+				$date = new JDate($result->created_time);
+				$date->setTimezone($tz);
+
+				$result->created_time = $date->toSql(true);
+			}
+			else
+			{
+				$result->created_time = null;
+			}
+
+			if ((int) $result->modified_time)
+			{
+				$date = new JDate($result->modified_time);
+				$date->setTimezone($tz);
+
+				$result->modified_time = $date->toSql(true);
+			}
+			else
+			{
+				$result->modified_time = null;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.7.0
+	 * @throws  Exception
+	 */
+	public function getTable($name = 'Field', $prefix = 'FieldsTable', $options = array())
+	{
+		if (strpos(JPATH_COMPONENT, 'com_fields') === false)
+		{
+			$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_fields/tables');
+		}
+
+		// Default to text type
+		$table       = JTable::getInstance($name, $prefix, $options);
+		$table->type = 'text';
+
+		return $table;
+	}
+
+	/**
+	 * Method to change the title & name.
+	 *
+	 * @param   integer  $category_id  The id of the category.
+	 * @param   string   $name         The name.
+	 * @param   string   $title        The title.
+	 *
+	 * @return  array  Contains the modified title and name.
+	 *
+	 * @since    3.7.0
+	 */
+	protected function generateNewTitle($category_id, $name, $title)
+	{
+		// Alter the title & name
+		$table = $this->getTable();
+
+		while ($table->load(array('name' => $name)))
+		{
+			$title = StringHelper::increment($title);
+			$name = StringHelper::increment($name, 'dash');
+		}
+
+		return array(
+			$title,
+			$name,
+		);
+	}
+
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  $pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   3.7.0
+	 */
+	public function delete(&$pks)
+	{
+		$success = parent::delete($pks);
+
+		if ($success)
+		{
+			$pks = (array) $pks;
+			$pks = ArrayHelper::toInteger($pks);
+			$pks = array_filter($pks);
+
+			if (!empty($pks))
+			{
+				// Delete Values
+				$query = $this->getDbo()->getQuery(true);
+
+				$query->delete($query->qn('#__fields_values'))
+					->where($query->qn('field_id') . ' IN(' . implode(',', $pks) . ')');
+
+				$this->getDbo()->setQuery($query)->execute();
+
+				// Delete Assigned Categories
+				$query = $this->getDbo()->getQuery(true);
+
+				$query->delete($query->qn('#__fields_categories'))
+					->where($query->qn('field_id') . ' IN(' . implode(',', $pks) . ')');
+
+				$this->getDbo()->setQuery($query)->execute();
+			}
+		}
+
+		return $success;
+	}
+
+	/**
+	 * Abstract method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   3.7.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$context = $this->getState('field.context');
+		$jinput  = JFactory::getApplication()->input;
+
+		// A workaround to get the context into the model for save requests.
+		if (empty($context) && isset($data['context']))
+		{
+			$context = $data['context'];
+			$parts   = FieldsHelper::extract($context);
+
+			$this->setState('field.context', $context);
+
+			if ($parts)
+			{
+				$this->setState('field.component', $parts[0]);
+				$this->setState('field.section', $parts[1]);
+			}
+		}
+
+		if (isset($data['type']))
+		{
+			// This is needed that the plugins can determine the type
+			$this->setState('field.type', $data['type']);
+		}
+
+		// Load the fields plugin that they can add additional parameters to the form
+		JPluginHelper::importPlugin('fields');
+
+		// Get the form.
+		$form = $this->loadForm(
+			'com_fields.field' . $context, 'field',
+			array(
+				'control'   => 'jform',
+				'load_data' => true,
+			)
+		);
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on Edit State access controls.
+		if (empty($data['context']))
+		{
+			$data['context'] = $context;
+		}
+
+		$fieldId  = $jinput->get('id');
+		$assetKey = $this->state->get('field.component') . '.field.' . $fieldId;
+
+		if (!JFactory::getUser()->authorise('core.edit.state', $assetKey))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('state', 'disabled', 'true');
+
+			// Disable fields while saving. The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('state', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Setting the value for the given field id, context and item id.
+	 *
+	 * @param   string  $fieldId  The field ID.
+	 * @param   string  $itemId   The ID of the item.
+	 * @param   string  $value    The value.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function setFieldValue($fieldId, $itemId, $value)
+	{
+		$field  = $this->getItem($fieldId);
+		$params = $field->params;
+
+		if (is_array($params))
+		{
+			$params = new Registry($params);
+		}
+
+		// Don't save the value when the user is not authorized to change it
+		if (!$field || !FieldsHelper::canEditFieldValue($field))
+		{
+			return false;
+		}
+
+		$needsDelete = false;
+		$needsInsert = false;
+		$needsUpdate = false;
+
+		$oldValue = $this->getFieldValue($fieldId, $itemId);
+		$value    = (array) $value;
+
+		if ($oldValue === null)
+		{
+			// No records available, doing normal insert
+			$needsInsert = true;
+		}
+		elseif (count($value) == 1 && count((array) $oldValue) == 1)
+		{
+			// Only a single row value update can be done when not empty
+			$needsUpdate = is_array($value[0]) ? count($value[0]) : strlen($value[0]);
+			$needsDelete = !$needsUpdate;
+		}
+		else
+		{
+			// Multiple values, we need to purge the data and do a new
+			// insert
+			$needsDelete = true;
+			$needsInsert = true;
+		}
+
+		if ($needsDelete)
+		{
+			// Deleting the existing record as it is a reset
+			$query = $this->getDbo()->getQuery(true);
+
+			$query->delete($query->qn('#__fields_values'))
+				->where($query->qn('field_id') . ' = ' . (int) $fieldId)
+				->where($query->qn('item_id') . ' = ' . $query->q($itemId));
+
+			$this->getDbo()->setQuery($query)->execute();
+		}
+
+		if ($needsInsert)
+		{
+			$newObj = new stdClass;
+
+			$newObj->field_id = (int) $fieldId;
+			$newObj->item_id  = $itemId;
+
+			foreach ($value as $v)
+			{
+				$newObj->value = $v;
+
+				$this->getDbo()->insertObject('#__fields_values', $newObj);
+			}
+		}
+
+		if ($needsUpdate)
+		{
+			$updateObj = new stdClass;
+
+			$updateObj->field_id = (int) $fieldId;
+			$updateObj->item_id  = $itemId;
+			$updateObj->value    = reset($value);
+
+			$this->getDbo()->updateObject('#__fields_values', $updateObj, array('field_id', 'item_id'));
+		}
+
+		$this->valueCache = array();
+		FieldsHelper::clearFieldsCache();
+
+		return true;
+	}
+
+	/**
+	 * Returning the value for the given field id, context and item id.
+	 *
+	 * @param   string  $fieldId  The field ID.
+	 * @param   string  $itemId   The ID of the item.
+	 *
+	 * @return  NULL|string
+	 *
+	 * @since  3.7.0
+	 */
+	public function getFieldValue($fieldId, $itemId)
+	{
+		$values = $this->getFieldValues(array($fieldId), $itemId);
+
+		if (key_exists($fieldId, $values))
+		{
+			return $values[$fieldId];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returning the values for the given field ids, context and item id.
+	 *
+	 * @param   array   $fieldIds  The field Ids.
+	 * @param   string  $itemId    The ID of the item.
+	 *
+	 * @return  NULL|array
+	 *
+	 * @since  3.7.0
+	 */
+	public function getFieldValues(array $fieldIds, $itemId)
+	{
+		if (!$fieldIds)
+		{
+			return array();
+		}
+
+		// Create a unique key for the cache
+		$key = md5(serialize($fieldIds) . $itemId);
+
+		// Fill the cache when it doesn't exist
+		if (!key_exists($key, $this->valueCache))
+		{
+			// Create the query
+			$query = $this->getDbo()->getQuery(true);
+
+			$query->select(array($query->qn('field_id'), $query->qn('value')))
+				->from($query->qn('#__fields_values'))
+				->where($query->qn('field_id') . ' IN (' . implode(',', ArrayHelper::toInteger($fieldIds)) . ')')
+				->where($query->qn('item_id') . ' = ' . $query->q($itemId));
+
+			// Fetch the row from the database
+			$rows = $this->getDbo()->setQuery($query)->loadObjectList();
+
+			$data = array();
+
+			// Fill the data container from the database rows
+			foreach ($rows as $row)
+			{
+				// If there are multiple values for a field, create an array
+				if (key_exists($row->field_id, $data))
+				{
+					// Transform it to an array
+					if (!is_array($data[$row->field_id]))
+					{
+						$data[$row->field_id] = array($data[$row->field_id]);
+					}
+
+					// Set the value in the array
+					$data[$row->field_id][] = $row->value;
+
+					// Go to the next row, otherwise the value gets overwritten in the data container
+					continue;
+				}
+
+				// Set the value
+				$data[$row->field_id] = $row->value;
+			}
+
+			// Assign it to the internal cache
+			$this->valueCache[$key] = $data;
+		}
+
+		// Return the value from the cache
+		return $this->valueCache[$key];
+	}
+
+	/**
+	 * Cleaning up the values for the given item on the context.
+	 *
+	 * @param   string  $context  The context.
+	 * @param   string  $itemId   The Item ID.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function cleanupValues($context, $itemId)
+	{
+		// Delete with inner join is not possible so we need to do a subquery
+		$fieldsQuery = $this->getDbo()->getQuery(true);
+		$fieldsQuery->select($fieldsQuery->qn('id'))
+			->from($fieldsQuery->qn('#__fields'))
+			->where($fieldsQuery->qn('context') . ' = ' . $fieldsQuery->q($context));
+
+		$query = $this->getDbo()->getQuery(true);
+
+		$query->delete($query->qn('#__fields_values'))
+			->where($query->qn('field_id') . ' IN (' . $fieldsQuery . ')')
+			->where($query->qn('item_id') . ' = ' . $query->q($itemId));
+
+		$this->getDbo()->setQuery($query)->execute();
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->state != -2)
+			{
+				return false;
+			}
+
+			$parts = FieldsHelper::extract($record->context);
+
+			return JFactory::getUser()->authorise('core.delete', $parts[0] . '.field.' . (int) $record->id);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the
+	 *                   component.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function canEditState($record)
+	{
+		$user  = JFactory::getUser();
+		$parts = FieldsHelper::extract($record->context);
+
+		// Check for existing field.
+		if (!empty($record->id))
+		{
+			return $user->authorise('core.edit.state', $parts[0] . '.field.' . (int) $record->id);
+		}
+
+		return $user->authorise('core.edit.state', $parts[0]);
+	}
+
+	/**
+	 * Stock method to auto-populate the model state.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+		$this->setState($this->getName() . '.id', $pk);
+
+		$context = $app->input->get('context', 'com_content.article');
+		$this->setState('field.context', $context);
+		$parts = FieldsHelper::extract($context);
+
+		// Extract the component name
+		$this->setState('field.component', $parts[0]);
+
+		// Extract the optional section name
+		$this->setState('field.section', (count($parts) > 1) ? $parts[1] : null);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_fields');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  array  An array of conditions to add to ordering queries.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getReorderConditions($table)
+	{
+		return 'context = ' . $this->_db->quote($table->context);
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array  The default data is an empty array.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$app  = JFactory::getApplication();
+		$data = $app->getUserState('com_fields.edit.field.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Pre-select some filters (Status, Language, Access) in edit form
+			// if those have been selected in Category Manager
+			if (!$data->id)
+			{
+				// Check for which context the Category Manager is used and
+				// get selected fields
+				$filters = (array) $app->getUserState('com_fields.fields.filter');
+
+				$data->set('state', $app->input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
+				$data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+				$data->set('group_id', $app->input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
+				$data->set(
+					'access',
+					$app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))
+				);
+
+				// Set the type if available from the request
+				$data->set('type', $app->input->getWord('type', $this->state->get('field.type', $data->get('type'))));
+			}
+
+			if ($data->label && !isset($data->params['label']))
+			{
+				$data->params['label'] = $data->label;
+			}
+		}
+
+		$this->preprocessData('com_fields.field', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @see     JFormField
+	 * @since   3.7.0
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		$component  = $this->state->get('field.component');
+		$section    = $this->state->get('field.section');
+		$dataObject = $data;
+
+		if (is_array($dataObject))
+		{
+			$dataObject = (object) $dataObject;
+		}
+
+		if (isset($dataObject->type))
+		{
+			$form->setFieldAttribute('type', 'component', $component);
+
+			// Not allowed to change the type of an existing record
+			if ($dataObject->id)
+			{
+				$form->setFieldAttribute('type', 'readonly', 'true');
+			}
+
+			// Allow to override the default value label and description through the plugin
+			$key = 'PLG_FIELDS_' . strtoupper($dataObject->type) . '_DEFAULT_VALUE_LABEL';
+
+			if (JFactory::getLanguage()->hasKey($key))
+			{
+				$form->setFieldAttribute('default_value', 'label', $key);
+			}
+
+			$key = 'PLG_FIELDS_' . strtoupper($dataObject->type) . '_DEFAULT_VALUE_DESC';
+
+			if (JFactory::getLanguage()->hasKey($key))
+			{
+				$form->setFieldAttribute('default_value', 'description', $key);
+			}
+
+			// Remove placeholder field on list fields
+			if ($dataObject->type == 'list')
+			{
+				$form->removeField('hint', 'params');
+			}
+		}
+
+		// Setting the context for the category field
+		$cat = JCategories::getInstance(str_replace('com_', '', $component));
+
+		if ($cat && $cat->get('root')->hasChildren())
+		{
+			$form->setFieldAttribute('assigned_cat_ids', 'extension', $component);
+		}
+		else
+		{
+			$form->removeField('assigned_cat_ids');
+		}
+
+		$form->setFieldAttribute('type', 'component', $component);
+		$form->setFieldAttribute('group_id', 'context', $this->state->get('field.context'));
+		$form->setFieldAttribute('rules', 'component', $component);
+
+		// Looking first in the component models/forms folder
+		$path = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fields/' . $section . '.xml');
+
+		if (file_exists($path))
+		{
+			$lang = JFactory::getLanguage();
+			$lang->load($component, JPATH_BASE, null, false, true);
+			$lang->load($component, JPATH_BASE . '/components/' . $component, null, false, true);
+
+			if (!$form->loadFile($path, false))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+		}
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		$context = JFactory::getApplication()->input->get('context');
+
+		switch ($context)
+		{
+			case 'com_content':
+				parent::cleanCache('com_content');
+				parent::cleanCache('mod_articles_archive');
+				parent::cleanCache('mod_articles_categories');
+				parent::cleanCache('mod_articles_category');
+				parent::cleanCache('mod_articles_latest');
+				parent::cleanCache('mod_articles_news');
+				parent::cleanCache('mod_articles_popular');
+				break;
+			default:
+				parent::cleanCache($context);
+				break;
+		}
+	}
+
+	/**
+	 * Batch copy fields to a new group.
+	 *
+	 * @param   integer  $value     The new value matching a fields group.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  array|boolean  new IDs if successful, false otherwise and internal error is set.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		// Set the variables
+		$user      = JFactory::getUser();
+		$table     = $this->getTable();
+		$newIds    = array();
+		$component = $this->state->get('filter.component');
+		$value     = (int) $value;
+
+		foreach ($pks as $pk)
+		{
+			if ($user->authorise('core.create', $component . '.fieldgroup.' . $value))
+			{
+				$table->reset();
+				$table->load($pk);
+
+				$table->group_id = $value;
+
+				// Reset the ID because we are making a copy
+				$table->id = 0;
+
+				// Unpublish the new field
+				$table->state = 0;
+
+				if (!$table->store())
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+
+				// Get the new item ID
+				$newId = $table->get('id');
+
+				// Add the new ID to the array
+				$newIds[$pk] = $newId;
+			}
+			else
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch move fields to a new group.
+	 *
+	 * @param   integer  $value     The new value matching a fields group.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function batchMove($value, $pks, $contexts)
+	{
+		// Set the variables
+		$user      = JFactory::getUser();
+		$table     = $this->getTable();
+		$context   = explode('.', JFactory::getApplication()->getUserState('com_fields.fields.context'));
+		$value     = (int) $value;
+
+		foreach ($pks as $pk)
+		{
+			if ($user->authorise('core.edit', $context[0] . '.fieldgroup.' . $value))
+			{
+				$table->reset();
+				$table->load($pk);
+
+				$table->group_id = $value;
+
+				if (!$table->store())
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_fields/models/fields.php b/core/administrator/components/com_fields/models/fields.php
new file mode 100644
index 00000000..55179ea5
--- /dev/null
+++ b/core/administrator/components/com_fields/models/fields.php
@@ -0,0 +1,389 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Fields Model
+ *
+ * @since  3.7.0
+ */
+class FieldsModelFields extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JModelLegacy
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'type', 'a.type',
+				'name', 'a.name',
+				'state', 'a.state',
+				'access', 'a.access',
+				'access_level',
+				'language', 'a.language',
+				'ordering', 'a.ordering',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'created_time', 'a.created_time',
+				'created_user_id', 'a.created_user_id',
+				'category_title',
+				'category_id', 'a.category_id',
+				'group_id', 'a.group_id',
+				'assigned_cat_ids'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// List state information.
+		parent::populateState('a.ordering', 'asc');
+
+		$context = $this->getUserStateFromRequest($this->context . '.context', 'context', 'com_content.article', 'CMD');
+		$this->setState('filter.context', $context);
+
+		// Split context into component and optional section
+		$parts = FieldsHelper::extract($context);
+
+		if ($parts)
+		{
+			$this->setState('filter.component', $parts[0]);
+			$this->setState('filter.section', $parts[1]);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on the model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  An identifier string to generate the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.context');
+		$id .= ':' . serialize($this->getState('filter.assigned_cat_ids'));
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.group_id');
+		$id .= ':' . serialize($this->getState('filter.language'));
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to get a JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  JDatabaseQuery   A JDatabaseQuery object to retrieve the data set.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user  = JFactory::getUser();
+		$app   = JFactory::getApplication();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.name, a.checked_out, a.checked_out_time, a.note' .
+				', a.state, a.access, a.created_time, a.created_user_id, a.ordering, a.language' .
+				', a.fieldparams, a.params, a.type, a.default_value, a.context, a.group_id' .
+				', a.label, a.description, a.required'
+			)
+		);
+		$query->from('#__fields AS a');
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name')->join('LEFT', '#__users AS ua ON ua.id = a.created_user_id');
+
+		// Join over the field groups.
+		$query->select('g.title AS group_title, g.access as group_access, g.state AS group_state, g.note as group_note');
+		$query->join('LEFT', '#__fields_groups AS g ON g.id = a.group_id');
+
+		// Filter by context
+		if ($context = $this->getState('filter.context'))
+		{
+			$query->where('a.context = ' . $db->quote($context));
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			if (is_array($access))
+			{
+				$access = ArrayHelper::toInteger($access);
+				$query->where('a.access in (' . implode(',', $access) . ')');
+			}
+			else
+			{
+				$query->where('a.access = ' . (int) $access);
+			}
+		}
+
+		if (($categories = $this->getState('filter.assigned_cat_ids')) && $context)
+		{
+			$categories = (array) $categories;
+			$categories = ArrayHelper::toInteger($categories);
+			$parts = FieldsHelper::extract($context);
+
+			if ($parts)
+			{
+				// Get the category
+				$cat = JCategories::getInstance(str_replace('com_', '', $parts[0]));
+
+				if ($cat)
+				{
+					foreach ($categories as $assignedCatIds)
+					{
+						// Check if we have the actual category
+						$parent = $cat->get($assignedCatIds);
+
+						if ($parent)
+						{
+							$categories[] = (int) $parent->id;
+
+							// Traverse the tree up to get all the fields which are attached to a parent
+							while ($parent->getParent() && $parent->getParent()->id != 'root')
+							{
+								$parent = $parent->getParent();
+								$categories[] = (int) $parent->id;
+							}
+						}
+					}
+				}
+			}
+
+			$categories = array_unique($categories);
+
+			// Join over the assigned categories
+			$query->join('LEFT', $db->quoteName('#__fields_categories') . ' AS fc ON fc.field_id = a.id');
+
+			if (in_array('0', $categories))
+			{
+				$query->where('(fc.category_id IS NULL OR fc.category_id IN (' . implode(',', $categories) . '))');
+			}
+			else
+			{
+				$query->where('fc.category_id IN (' . implode(',', $categories) . ')');
+			}
+		}
+
+		// Implement View Level Access
+		if (!$app->isClient('administrator') || !$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ') AND (a.group_id = 0 OR g.access IN (' . $groups . '))');
+		}
+
+		// Filter by state
+		$state = $this->getState('filter.state');
+
+		// Include group state only when not on on back end list
+		$includeGroupState = !$app->isClient('administrator') ||
+			$app->input->get('option') != 'com_fields' ||
+			$app->input->get('view') != 'fields';
+
+		if (is_numeric($state))
+		{
+			$query->where('a.state = ' . (int) $state);
+
+			if ($includeGroupState)
+			{
+				$query->where('(a.group_id = 0 OR g.state = ' . (int) $state . ')');
+			}
+		}
+		elseif (!$state)
+		{
+			$query->where('a.state IN (0, 1)');
+
+			if ($includeGroupState)
+			{
+				$query->where('(a.group_id = 0 OR g.state IN (0, 1))');
+			}
+		}
+
+		$groupId = $this->getState('filter.group_id');
+
+		if (is_numeric($groupId))
+		{
+			$query->where('a.group_id = ' . (int) $groupId);
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (! empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'author:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%');
+				$query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')');
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(a.title LIKE ' . $search . ' OR a.name LIKE ' . $search . ' OR a.note LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$language = (array) $language;
+
+			foreach ($language as $key => $l)
+			{
+				$language[$key] = $db->quote($l);
+			}
+
+			$query->where('a.language in (' . implode(',', $language) . ')');
+		}
+
+		// Add the list ordering clause
+		$listOrdering  = $this->state->get('list.ordering', 'a.ordering');
+		$orderDirn     = $this->state->get('list.direction', 'ASC');
+
+		$query->order($db->escape($listOrdering) . ' ' . $db->escape($orderDirn));
+
+		return $query;
+	}
+
+	/**
+	 * Gets an array of objects from the results of database query.
+	 *
+	 * @param   string   $query       The query.
+	 * @param   integer  $limitstart  Offset.
+	 * @param   integer  $limit       The number of records.
+	 *
+	 * @return  array  An array of results.
+	 *
+	 * @since   3.7.0
+	 * @throws  RuntimeException
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$result = parent::_getList($query, $limitstart, $limit);
+
+		if (is_array($result))
+		{
+			foreach ($result as $field)
+			{
+				$field->fieldparams = new Registry($field->fieldparams);
+				$field->params = new Registry($field->params);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the filter form
+	 *
+	 * @param   array    $data      data
+	 * @param   boolean  $loadData  load current data
+	 *
+	 * @return  JForm|false  the JForm object or false
+	 *
+	 * @since   3.7.0
+	 */
+	public function getFilterForm($data = array(), $loadData = true)
+	{
+		$form = parent::getFilterForm($data, $loadData);
+
+		if ($form)
+		{
+			$form->setValue('context', null, $this->getState('filter.context'));
+			$form->setFieldAttribute('group_id', 'context', $this->getState('filter.context'), 'filter');
+			$form->setFieldAttribute('assigned_cat_ids', 'extension', $this->state->get('filter.component'), 'filter');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Get the groups for the batch method
+	 *
+	 * @return  array  An array of groups
+	 *
+	 * @since   3.7.0
+	 */
+	public function getGroups()
+	{
+		$user       = JFactory::getUser();
+		$viewlevels = ArrayHelper::toInteger($user->getAuthorisedViewLevels());
+
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('title AS text, id AS value, state');
+		$query->from('#__fields_groups');
+		$query->where('state IN (0,1)');
+		$query->where('context = ' . $db->quote($this->state->get('filter.context')));
+		$query->where('access IN (' . implode(',', $viewlevels) . ')');
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+}
diff --git a/core/administrator/components/com_fields/models/fields/fieldcontexts.php b/core/administrator/components/com_fields/models/fields/fieldcontexts.php
new file mode 100644
index 00000000..262c4f14
--- /dev/null
+++ b/core/administrator/components/com_fields/models/fields/fieldcontexts.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fields Contexts
+ *
+ * @since  3.7.0
+ */
+class JFormFieldFieldcontexts extends JFormFieldList
+{
+	public $type = 'Fieldcontexts';
+
+	/**
+	 * Method to get the field input markup for a generic list.
+	 * Use the multiple attribute to enable multiselect.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		return $this->getOptions() ? parent::getInput() : '';
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$parts = explode('.', $this->value);
+		$eName = str_replace('com_', '', $parts[0]);
+		$file = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $parts[0] . '/helpers/' . $eName . '.php');
+		$contexts = array();
+
+		if (!file_exists($file))
+		{
+			return array();
+		}
+
+		$prefix = ucfirst($eName);
+		$cName = $prefix . 'Helper';
+
+		JLoader::register($cName, $file);
+
+		if (class_exists($cName) && is_callable(array($cName, 'getContexts')))
+		{
+			$contexts = $cName::getContexts();
+		}
+
+		if (!$contexts || !is_array($contexts) || count($contexts) == 1)
+		{
+			return array();
+		}
+
+		return $contexts;
+	}
+}
diff --git a/core/administrator/components/com_fields/models/fields/fieldgroups.php b/core/administrator/components/com_fields/models/fields/fieldgroups.php
new file mode 100644
index 00000000..7932d501
--- /dev/null
+++ b/core/administrator/components/com_fields/models/fields/fieldgroups.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fields Groups
+ *
+ * @since  3.7.0
+ */
+class JFormFieldFieldgroups extends JFormFieldList
+{
+	public $type = 'Fieldgroups';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$context = (string) $this->element['context'];
+		$states    = $this->element['state'] ?: '0,1';
+		$states    = ArrayHelper::toInteger(explode(',', $states));
+
+		$user       = JFactory::getUser();
+		$viewlevels = ArrayHelper::toInteger($user->getAuthorisedViewLevels());
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('title AS text, id AS value, state');
+		$query->from('#__fields_groups');
+		$query->where('state IN (' . implode(',', $states) . ')');
+		$query->where('context = ' . $db->quote($context));
+		$query->where('access IN (' . implode(',', $viewlevels) . ')');
+		$query->order('ordering asc, id asc');
+
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		foreach ($options AS $option)
+		{
+			if ($option->state == 0)
+			{
+				$option->text = '[' . $option->text . ']';
+			}
+
+			if ($option->state == 2)
+			{
+				$option->text = '{' . $option->text . '}';
+			}
+		}
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_fields/models/fields/section.php b/core/administrator/components/com_fields/models/fields/section.php
new file mode 100644
index 00000000..75b99bd7
--- /dev/null
+++ b/core/administrator/components/com_fields/models/fields/section.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fields Section
+ *
+ * @since  3.7.0
+ */
+class JFormFieldSection extends JFormFieldList
+{
+	public $type = 'Section';
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		// Onchange must always be the change context function
+		$this->onchange = 'fieldsChangeContext(jQuery(this).val());';
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup for a generic list.
+	 * Use the multiple attribute to enable multiselect.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		// Add the change context function to the document
+		JFactory::getDocument()->addScriptDeclaration(
+			"function fieldsChangeContext(context)
+				{
+					var regex = new RegExp(\"([?;&])context[^&;]*[;&]?\");
+					var url = window.location.href;
+					var query = url.replace(regex, \"$1\").replace(/&$/, '');
+    					window.location.href = (query.length > 2 ? query + \"&\" : \"?\") + (context ? \"context=\" + context : '');
+				}"
+		);
+
+		return parent::getInput();
+	}
+}
diff --git a/core/administrator/components/com_fields/models/fields/type.php b/core/administrator/components/com_fields/models/fields/type.php
new file mode 100644
index 00000000..05b3270b
--- /dev/null
+++ b/core/administrator/components/com_fields/models/fields/type.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Fields Type
+ *
+ * @since  3.7.0
+ */
+class JFormFieldType extends JFormFieldList
+{
+	public $type = 'Type';
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		$this->onchange = 'typeHasChanged(this);';
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$options = parent::getOptions();
+
+		$fieldTypes = FieldsHelper::getFieldTypes();
+
+		foreach ($fieldTypes as $fieldType)
+		{
+			$options[] = JHtml::_('select.option', $fieldType['type'], $fieldType['label']);
+		}
+
+		// Sorting the fields based on the text which is displayed
+		usort(
+			$options,
+			function ($a, $b)
+			{
+				return strcmp($a->text, $b->text);
+			}
+		);
+
+		JFactory::getDocument()->addScriptDeclaration("
+			jQuery( document ).ready(function() {
+				Joomla.loadingLayer('load');
+			});
+			function typeHasChanged(element){
+				Joomla.loadingLayer('show');
+				var cat = jQuery(element);
+				jQuery('input[name=task]').val('field.reload');
+				element.form.submit();
+			}
+		"
+		);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_fields/models/forms/field.xml b/core/administrator/components/com_fields/models/forms/field.xml
new file mode 100644
index 00000000..79582341
--- /dev/null
+++ b/core/administrator/components/com_fields/models/forms/field.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_categories/models/fields" >
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			class="readonly"
+			readonly="true"
+		/>
+
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="context"
+			type="hidden"
+		/>
+
+		<field
+			name="group_id"
+			type="fieldgroups"
+			label="COM_FIELDS_FIELD_GROUP_LABEL"
+			description="COM_FIELDS_FIELD_GROUP_DESC"
+			>
+			<option value="0">JNONE</option>
+		</field>
+
+		<field
+			name="assigned_cat_ids"
+			type="category"
+			label="JCATEGORY"
+			description="JFIELD_FIELDS_CATEGORY_DESC"
+			extension="com_content"
+			multiple="true"
+			>
+			<option value="">JALL</option>
+		</field>
+
+		<field
+			name="title"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="JFIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="JFIELD_NAME_LABEL"
+			description="JFIELD_NAME_DESC"
+			hint="JFIELD_NAME_PLACEHOLDER"
+			size="45"
+		/>
+
+		<field
+			name="type"
+			type="type"
+			label="COM_FIELDS_FIELD_TYPE_LABEL"
+			description="COM_FIELDS_FIELD_TYPE_DESC"
+			default="text"
+			required="true"
+		/>
+
+		<field
+			name="required"
+			type="radio"
+			label="COM_FIELDS_FIELD_REQUIRED_LABEL"
+			description="COM_FIELDS_FIELD_REQUIRED_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="default_value"
+			type="textarea"
+			label="COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL"
+			description="COM_FIELDS_FIELD_DEFAULT_VALUE_DESC"
+			filter="raw"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			default="1"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="buttonspacer"
+			type="spacer"
+			label="JGLOBAL_ACTION_PERMISSIONS_LABEL"
+			description="JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION"
+		/>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="created_user_id"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+		/>
+
+		<field
+			name="created_time"
+			type="text"
+			label="JGLOBAL_CREATED_DATE"
+			class="readonly"
+			filter="unset"
+			readonly="true"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="modified_time"
+			type="text"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			class="readonly"
+			filter="unset"
+			readonly="true"
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_FIELDS_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="note"
+			type="text"
+			label="COM_FIELDS_FIELD_NOTE_LABEL"
+			description="COM_FIELDS_FIELD_NOTE_DESC"
+			class="span12"
+			size="40"
+		/>
+
+		<field
+			name="label"
+			type="text"
+			label="COM_FIELDS_FIELD_LABEL_LABEL"
+			description="COM_FIELDS_FIELD_LABEL_DESC"
+			size="40"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+		/>
+
+		<field
+			name="description"
+			type="textarea"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_FIELDS_FIELD_DESCRIPTION_DESC"
+			size="40"
+			filter="HTML"
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+		/>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JFIELD_RULES_LABEL"
+			id="rules"
+			translate_label="false"
+			filter="rules"
+			validate="rules"
+			section="field"
+		/>
+
+		<field
+			name="ordering"
+			type="text"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			class="inputbox"
+		/>
+	</fieldset>
+
+	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="basic">
+			<field
+				name="hint"
+				type="text"
+				label="COM_FIELDS_FIELD_PLACEHOLDER_LABEL"
+				description="COM_FIELDS_FIELD_PLACEHOLDER_DESC"
+				class="input-xxlarge"
+				size="40"
+			/>
+
+			<field
+				name="render_class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_RENDER_CLASS_DESC"
+				class="input-xxlarge"
+				size="40"
+			/>
+
+			<field
+				name="class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_CLASS_DESC"
+				class="input-xxlarge"
+				size="40"
+			/>
+
+			<field
+				name="showlabel"
+				type="radio"
+				label="COM_FIELDS_FIELD_SHOWLABEL_LABEL"
+				description="COM_FIELDS_FIELD_SHOWLABEL_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field
+				name="show_on"
+				type="radio"
+				label="COM_FIELDS_FIELD_SHOW_ON_LABEL"
+				description="COM_FIELDS_FIELD_SHOW_ON_DESC"
+				class="btn-group btn-group-yesno"
+				default=""
+				>
+				<option value="1">COM_FIELDS_FIELD_SHOW_ON_SITE</option>
+				<option value="2">COM_FIELDS_FIELD_SHOW_ON_ADMIN</option>
+				<option value="">COM_FIELDS_FIELD_SHOW_ON_BOTH</option>
+			</field>
+
+			<field
+				name="display"
+				type="list"
+				label="COM_FIELDS_FIELD_DISPLAY_LABEL"
+				description="COM_FIELDS_FIELD_DISPLAY_DESC"
+				default="2"
+				>
+				<option value="1">COM_FIELDS_FIELD_DISPLAY_AFTER_TITLE</option>
+				<option value="2">COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY</option>
+				<option value="3">COM_FIELDS_FIELD_DISPLAY_AFTER_DISPLAY</option>
+				<option value="0">COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY</option>
+			</field>
+
+			<field
+				name="display_readonly"
+				type="radio"
+				label="JFIELD_DISPLAY_READONLY_LABEL"
+				description="JFIELD_DISPLAY_READONLY_DESC"
+				class="btn-group btn-group-yesno"
+				default="2"
+				>
+				<option value="2">JGLOBAL_INHERIT</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_fields/models/forms/filter_fields.xml b/core/administrator/components/com_fields/models/forms/filter_fields.xml
new file mode 100644
index 00000000..aca47a63
--- /dev/null
+++ b/core/administrator/components/com_fields/models/forms/filter_fields.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="group">
+		<field
+			name="context"
+			type="fieldcontexts"
+			onchange="this.form.submit();"
+		/>
+	</fieldset>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label=""
+			hint="JSEARCH_FILTER"
+			class="js-stools-search-string"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="group_id"
+			type="fieldgroups"
+			state="0,1,2"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FIELDS_VIEW_FIELDS_SELECT_GROUP</option>
+		</field>
+
+		<field
+			name="assigned_cat_ids"
+			type="category"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FIELDS_VIEW_FIELDS_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			default="a.ordering ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.type ASC">COM_FIELDS_VIEW_FIELDS_SORT_TYPE_ASC</option>
+			<option value="a.type DESC">COM_FIELDS_VIEW_FIELDS_SORT_TYPE_DESC</option>
+			<option value="g.title ASC">COM_FIELDS_VIEW_FIELDS_SORT_GROUP_ASC</option>
+			<option value="g.title DESC">COM_FIELDS_VIEW_FIELDS_SORT_GROUP_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_FIELDS_LIST_LIMIT"
+			description="COM_FIELDS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_fields/models/forms/filter_groups.xml b/core/administrator/components/com_fields/models/forms/filter_groups.xml
new file mode 100644
index 00000000..6e18a7da
--- /dev/null
+++ b/core/administrator/components/com_fields/models/forms/filter_groups.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="group">
+		<field
+			name="context"
+			type="fieldcontexts"
+			onchange="this.form.submit();"
+		/>
+	</fieldset>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			hint="JSEARCH_FILTER"
+			class="js-stools-search-string"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.ordering ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_fields/models/forms/group.xml b/core/administrator/components/com_fields/models/forms/group.xml
new file mode 100644
index 00000000..4ed5c468
--- /dev/null
+++ b/core/administrator/components/com_fields/models/forms/group.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			class="readonly"
+			readonly="true"
+		/>
+
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="context"
+			type="hidden"
+			class="readonly"
+			readonly="true"
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="JFIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_CREATED_DATE"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			class="readonly"
+			readonly="true"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_FIELDS_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="note"
+			type="text"
+			label="COM_FIELDS_FIELD_NOTE_LABEL"
+			description="COM_FIELDS_FIELD_NOTE_DESC"
+			class="span12"
+			size="40"
+		/>
+
+		<field
+			name="description"
+			type="textarea"
+			label="JGLOBAL_DESCRIPTION"
+			size="40"
+			filter="HTML"
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+		/>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JFIELD_RULES_LABEL"
+			id="rules"
+			translate_label="false"
+			filter="rules"
+			validate="rules"
+			section="fieldgroup"
+		/>
+
+		<field
+			name="ordering"
+			type="text"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			class="inputbox"
+		/>
+	</fieldset>
+
+	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="basic">
+			<field
+				name="display_readonly"
+				type="radio"
+				label="JFIELD_DISPLAY_READONLY_LABEL"
+				description="JFIELD_DISPLAY_READONLY_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_fields/models/group.php b/core/administrator/components/com_fields/models/group.php
new file mode 100644
index 00000000..cf9147f8
--- /dev/null
+++ b/core/administrator/components/com_fields/models/group.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Group Model
+ *
+ * @since  3.7.0
+ */
+class FieldsModelGroup extends JModelAdmin
+{
+	/**
+	 * @var null|string
+	 *
+	 * @since   3.7.0
+	 */
+	public $typeAlias = null;
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var array
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id'   => 'batchLanguage'
+	);
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success, False on error.
+	 *
+	 * @since   3.7.0
+	 */
+	public function save($data)
+	{
+		// Alter the title for save as copy
+		$input = JFactory::getApplication()->input;
+
+		// Save new group as unpublished
+		if ($input->get('task') == 'save2copy')
+		{
+			$data['state'] = 0;
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.7.0
+	 * @throws  Exception
+	 */
+	public function getTable($name = 'Group', $prefix = 'FieldsTable', $options = array())
+	{
+		if (strpos(JPATH_COMPONENT, 'com_fields') === false)
+		{
+			$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_fields/tables');
+		}
+
+		return JTable::getInstance($name, $prefix, $options);
+	}
+
+	/**
+	 * Abstract method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   3.7.0
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$context = $this->getState('filter.context');
+		$jinput = JFactory::getApplication()->input;
+
+		if (empty($context) && isset($data['context']))
+		{
+			$context = $data['context'];
+			$this->setState('filter.context', $context);
+		}
+
+		// Get the form.
+		$form = $this->loadForm(
+			'com_fields.group.' . $context, 'group',
+			array(
+				'control'   => 'jform',
+				'load_data' => $loadData,
+			)
+		);
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on Edit State access controls.
+		if (empty($data['context']))
+		{
+			$data['context'] = $context;
+		}
+
+		if (!JFactory::getUser()->authorise('core.edit.state', $context . '.fieldgroup.' . $jinput->get('id')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('state', 'disabled', 'true');
+
+			// Disable fields while saving. The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('state', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function canDelete($record)
+	{
+		if (empty($record->id) || $record->state != -2)
+		{
+			return false;
+		}
+
+		return JFactory::getUser()->authorise('core.delete', $record->context . '.fieldgroup.' . (int) $record->id);
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the
+	 *                   component.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		// Check for existing fieldgroup.
+		if (!empty($record->id))
+		{
+			return $user->authorise('core.edit.state', $record->context . '.fieldgroup.' . (int) $record->id);
+		}
+
+		// Default to component settings.
+		return $user->authorise('core.edit.state', $record->context);
+	}
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function populateState()
+	{
+		parent::populateState();
+
+		$context = JFactory::getApplication()->getUserStateFromRequest('com_fields.groups.context', 'context', 'com_fields', 'CMD');
+		$this->setState('filter.context', $context);
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  array  An array of conditions to add to ordering queries.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getReorderConditions($table)
+	{
+		return 'context = ' . $this->_db->quote($table->context);
+	}
+
+	/**
+	 * Method to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @see     JFormField
+	 * @since   3.7.0
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		parent::preprocessForm($form, $data, $group);
+
+		$parts = FieldsHelper::extract($this->state->get('filter.context'));
+
+		// Extract the component name
+		$component = $parts[0];
+
+		// Extract the optional section name
+		$section = (count($parts) > 1) ? $parts[1] : null;
+
+		if ($parts)
+		{
+			// Set the access control rules field component value.
+			$form->setFieldAttribute('rules', 'component', $component);
+		}
+
+		if ($section !== null)
+		{
+			// Looking first in the component models/forms folder
+			$path = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/forms/fieldgroup/' . $section . '.xml');
+
+			if (file_exists($path))
+			{
+				$lang = JFactory::getLanguage();
+				$lang->load($component, JPATH_BASE, null, false, true);
+				$lang->load($component, JPATH_BASE . '/components/' . $component, null, false, true);
+
+				if (!$form->loadFile($path, false))
+				{
+					throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array    The default data is an empty array.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$app = JFactory::getApplication();
+		$data = $app->getUserState('com_fields.edit.group.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Pre-select some filters (Status, Language, Access) in edit form if those have been selected in Field Group Manager
+			if (!$data->id)
+			{
+				// Check for which context the Field Group Manager is used and get selected fields
+				$context = substr($app->getUserState('com_fields.groups.filter.context'), 4);
+				$filters = (array) $app->getUserState('com_fields.groups.' . $context . '.filter');
+
+				$data->set(
+					'state',
+					$app->input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
+				);
+				$data->set(
+					'language',
+					$app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
+				);
+				$data->set(
+					'access',
+					$app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))
+				);
+			}
+		}
+
+		$this->preprocessData('com_fields.group', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed    Object on success, false on failure.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Prime required properties.
+			if (empty($item->id))
+			{
+				$item->context = $this->getState('filter.context');
+			}
+
+			if (property_exists($item, 'params'))
+			{
+				$item->params = new Registry($item->params);
+			}
+
+			// Convert the created and modified dates to local user time for display in the form.
+			$tz = new DateTimeZone(JFactory::getApplication()->get('offset'));
+
+			if ((int) $item->created)
+			{
+				$date = new JDate($item->created);
+				$date->setTimezone($tz);
+				$item->created = $date->toSql(true);
+			}
+			else
+			{
+				$item->created = null;
+			}
+
+			if ((int) $item->modified)
+			{
+				$date = new JDate($item->modified);
+				$date->setTimezone($tz);
+				$item->modified = $date->toSql(true);
+			}
+			else
+			{
+				$item->modified = null;
+			}
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		$context = JFactory::getApplication()->input->get('context');
+
+		parent::cleanCache($context);
+	}
+}
diff --git a/core/administrator/components/com_fields/models/groups.php b/core/administrator/components/com_fields/models/groups.php
new file mode 100644
index 00000000..4619ab80
--- /dev/null
+++ b/core/administrator/components/com_fields/models/groups.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Groups Model
+ *
+ * @since  3.7.0
+ */
+class FieldsModelGroups extends JModelList
+{
+	/**
+	 * Context string for the model type.  This is used to handle uniqueness
+	 * when dealing with the getStoreId() method and caching data structures.
+	 *
+	 * @var    string
+	 * @since   3.7.0
+	 */
+	protected $context = 'com_fields.groups';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JModelLegacy
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'type', 'a.type',
+				'state', 'a.state',
+				'access', 'a.access',
+				'access_level',
+				'language', 'a.language',
+				'ordering', 'a.ordering',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// List state information.
+		parent::populateState('a.ordering', 'asc');
+
+		$context = $this->getUserStateFromRequest($this->context . '.context', 'context', 'com_content', 'CMD');
+		$this->setState('filter.context', $context);
+	}
+
+	/**
+	 * Method to get a store id based on the model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  An identifier string to generate the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.context');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . print_r($this->getState('filter.language'), true);
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to get a JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  JDatabaseQuery   A JDatabaseQuery object to retrieve the data set.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select($this->getState('list.select', 'a.*'));
+		$query->from('#__fields_groups AS a');
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name')->join('LEFT', '#__users AS ua ON ua.id = a.created_by');
+
+		// Filter by context
+		if ($context = $this->getState('filter.context', 'com_fields'))
+		{
+			$query->where('a.context = ' . $db->quote($context));
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			if (is_array($access))
+			{
+				$access = ArrayHelper::toInteger($access);
+				$query->where('a.access in (' . implode(',', $access) . ')');
+			}
+			else
+			{
+				$query->where('a.access = ' . (int) $access);
+			}
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.state = ' . (int) $state);
+		}
+		elseif (!$state)
+		{
+			$query->where('a.state IN (0, 1)');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('a.title LIKE ' . $search);
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$language = (array) $language;
+
+			foreach ($language as $key => $l)
+			{
+				$language[$key] = $db->quote($l);
+			}
+
+			$query->where('a.language in (' . implode(',', $language) . ')');
+		}
+
+		// Add the list ordering clause
+		$listOrdering = $this->getState('list.ordering', 'a.ordering');
+		$listDirn = $db->escape($this->getState('list.direction', 'ASC'));
+
+		$query->order($db->escape($listOrdering) . ' ' . $listDirn);
+
+		return $query;
+	}
+
+	/**
+	 * Gets an array of objects from the results of database query.
+	 *
+	 * @param   string   $query       The query.
+	 * @param   integer  $limitstart  Offset.
+	 * @param   integer  $limit       The number of records.
+	 *
+	 * @return  array  An array of results.
+	 *
+	 * @since   3.8.7
+	 * @throws  RuntimeException
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$result = parent::_getList($query, $limitstart, $limit);
+
+		if (is_array($result))
+		{
+			foreach ($result as $group)
+			{
+				$group->params = new Registry($group->params);
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_fields/tables/field.php b/core/administrator/components/com_fields/tables/field.php
new file mode 100644
index 00000000..daf46e68
--- /dev/null
+++ b/core/administrator/components/com_fields/tables/field.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Fields Table
+ *
+ * @since  3.7.0
+ */
+class FieldsTableField extends JTable
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver object.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($db = null)
+	{
+		parent::__construct('#__fields', 'id', $db);
+
+		$this->setColumnAlias('published', 'state');
+	}
+
+	/**
+	 * Method to bind an associative array or object to the JTable instance.This
+	 * method only binds properties that are publicly accessible and optionally
+	 * takes an array of properties to ignore when binding.
+	 *
+	 * @param   mixed  $src     An associative array or object to bind to the JTable instance.
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function bind($src, $ignore = '')
+	{
+		if (isset($src['params']) && is_array($src['params']))
+		{
+			$registry = new Registry;
+			$registry->loadArray($src['params']);
+			$src['params'] = (string) $registry;
+		}
+
+		if (isset($src['fieldparams']) && is_array($src['fieldparams']))
+		{
+			$registry = new Registry;
+			$registry->loadArray($src['fieldparams']);
+			$src['fieldparams'] = (string) $registry;
+		}
+
+		// Bind the rules.
+		if (isset($src['rules']) && is_array($src['rules']))
+		{
+			$rules = new JAccessRules($src['rules']);
+			$this->setRules($rules);
+		}
+
+		return parent::bind($src, $ignore);
+	}
+
+	/**
+	 * Method to perform sanity checks on the JTable instance properties to ensure
+	 * they are safe to store in the database.  Child classes should override this
+	 * method to make sure the data they are storing in the database is safe and
+	 * as expected before storage.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @link    https://docs.joomla.org/Special:MyLanguage/JTable/check
+	 * @since   3.7.0
+	 */
+	public function check()
+	{
+		// Check for valid name
+		if (trim($this->title) == '')
+		{
+			$this->setError(JText::_('COM_FIELDS_MUSTCONTAIN_A_TITLE_FIELD'));
+
+			return false;
+		}
+
+		if (empty($this->name))
+		{
+			$this->name = $this->title;
+		}
+
+		$this->name = JApplicationHelper::stringURLSafe($this->name, $this->language);
+
+		if (trim(str_replace('-', '', $this->name)) == '')
+		{
+			$this->name = Joomla\String\StringHelper::increment($this->name, 'dash');
+		}
+
+		$this->name = str_replace(',', '-', $this->name);
+
+		// Verify that the name is unique
+		$table = JTable::getInstance('Field', 'FieldsTable', array('dbo' => $this->_db));
+
+		if ($table->load(array('name' => $this->name)) && ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(JText::_('COM_FIELDS_ERROR_UNIQUE_NAME'));
+
+			return false;
+		}
+
+		$this->name = str_replace(',', '-', $this->name);
+
+		if (empty($this->type))
+		{
+			$this->type = 'text';
+		}
+
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified_time = $date->toSql();
+			$this->modified_by = $user->get('id');
+		}
+		else
+		{
+			if (!(int) $this->created_time)
+			{
+				$this->created_time = $date->toSql();
+			}
+
+			if (empty($this->created_user_id))
+			{
+				$this->created_user_id = $user->get('id');
+			}
+		}
+
+		if (empty($this->group_id))
+		{
+			$this->group_id = 0;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	protected function _getAssetName()
+	{
+		$contextArray = explode('.', $this->context);
+
+		return $contextArray[0] . '.field.' . (int) $this->id;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.  In
+	 * tracking the assets a title is kept for each asset so that there is some
+	 * context available in a unified access manager.  Usually this would just
+	 * return $this->title or $this->name or whatever is being used for the
+	 * primary name of the row. If this method is not overridden, the asset name is used.
+	 *
+	 * @return  string  The string to use as the title in the asset table.
+	 *
+	 * @link    https://docs.joomla.org/Special:MyLanguage/JTable/getAssetTitle
+	 * @since   3.7.0
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Method to get the parent asset under which to register this one.
+	 * By default, all assets are registered to the ROOT node with ID,
+	 * which will default to 1 if none exists.
+	 * The extended class can define a table and id to lookup.  If the
+	 * asset does not exist it will be created.
+	 *
+	 * @param   JTable   $table  A JTable object for the asset parent.
+	 * @param   integer  $id     Id to look up
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.7.0
+	 */
+	protected function _getAssetParentId(JTable $table = null, $id = null)
+	{
+		$contextArray = explode('.', $this->context);
+		$component = $contextArray[0];
+
+		if ($this->group_id)
+		{
+			$assetId = $this->getAssetId($component . '.fieldgroup.' . (int) $this->group_id);
+
+			if ($assetId)
+			{
+				return $assetId;
+			}
+		}
+		else
+		{
+			$assetId = $this->getAssetId($component);
+
+			if ($assetId)
+			{
+				return $assetId;
+			}
+		}
+
+		return parent::_getAssetParentId($table, $id);
+	}
+
+	/**
+	 * Returns an asset id for the given name or false.
+	 *
+	 * @param   string  $name  The asset name
+	 *
+	 * @return  number|boolean
+	 *
+	 * @since    3.7.0
+	 */
+	private function getAssetId($name)
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__assets'))
+			->where($db->quoteName('name') . ' = ' . $db->quote($name));
+
+		// Get the asset id from the database.
+		$db->setQuery($query);
+
+		$assetId = null;
+
+		if ($result = $db->loadResult())
+		{
+			$assetId = (int) $result;
+
+			if ($assetId)
+			{
+				return $assetId;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/core/administrator/components/com_fields/tables/group.php b/core/administrator/components/com_fields/tables/group.php
new file mode 100644
index 00000000..cec38c26
--- /dev/null
+++ b/core/administrator/components/com_fields/tables/group.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Groups Table
+ *
+ * @since  3.7.0
+ */
+class FieldsTableGroup extends JTable
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver object.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($db = null)
+	{
+		parent::__construct('#__fields_groups', 'id', $db);
+
+		$this->setColumnAlias('published', 'state');
+	}
+
+	/**
+	 * Method to bind an associative array or object to the JTable instance.This
+	 * method only binds properties that are publicly accessible and optionally
+	 * takes an array of properties to ignore when binding.
+	 *
+	 * @param   mixed  $src     An associative array or object to bind to the JTable instance.
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function bind($src, $ignore = '')
+	{
+		if (isset($src['params']) && is_array($src['params']))
+		{
+			$registry = new Registry;
+			$registry->loadArray($src['params']);
+			$src['params'] = (string) $registry;
+		}
+
+		// Bind the rules.
+		if (isset($src['rules']) && is_array($src['rules']))
+		{
+			$rules = new JAccessRules($src['rules']);
+			$this->setRules($rules);
+		}
+
+		return parent::bind($src, $ignore);
+	}
+
+	/**
+	 * Method to perform sanity checks on the JTable instance properties to ensure
+	 * they are safe to store in the database.  Child classes should override this
+	 * method to make sure the data they are storing in the database is safe and
+	 * as expected before storage.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @link    https://docs.joomla.org/Special:MyLanguage/JTable/check
+	 * @since   3.7.0
+	 */
+	public function check()
+	{
+		// Check for a title.
+		if (trim($this->title) == '')
+		{
+			$this->setError(JText::_('COM_FIELDS_MUSTCONTAIN_A_TITLE_GROUP'));
+
+			return false;
+		}
+
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		if ($this->id)
+		{
+			$this->modified = $date->toSql();
+			$this->modified_by = $user->get('id');
+		}
+		else
+		{
+			if (!(int) $this->created)
+			{
+				$this->created = $date->toSql();
+			}
+
+			if (empty($this->created_by))
+			{
+				$this->created_by = $user->get('id');
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	protected function _getAssetName()
+	{
+		$component = explode('.', $this->context);
+
+		return $component[0] . '.fieldgroup.' . (int) $this->id;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.  In
+	 * tracking the assets a title is kept for each asset so that there is some
+	 * context available in a unified access manager.  Usually this would just
+	 * return $this->title or $this->name or whatever is being used for the
+	 * primary name of the row. If this method is not overridden, the asset name is used.
+	 *
+	 * @return  string  The string to use as the title in the asset table.
+	 *
+	 * @link    https://docs.joomla.org/Special:MyLanguage/JTable/getAssetTitle
+	 * @since   3.7.0
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Method to get the parent asset under which to register this one.
+	 * By default, all assets are registered to the ROOT node with ID,
+	 * which will default to 1 if none exists.
+	 * The extended class can define a table and id to lookup.  If the
+	 * asset does not exist it will be created.
+	 *
+	 * @param   JTable   $table  A JTable object for the asset parent.
+	 * @param   integer  $id     Id to look up
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.7.0
+	 */
+	protected function _getAssetParentId(JTable $table = null, $id = null)
+	{
+		$component = explode('.', $this->context);
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__assets'))
+			->where($db->quoteName('name') . ' = ' . $db->quote($component[0]));
+		$db->setQuery($query);
+
+		if ($assetId = (int) $db->loadResult())
+		{
+			return $assetId;
+		}
+
+		return parent::_getAssetParentId($table, $id);
+	}
+}
diff --git a/core/administrator/components/com_fields/views/field/tmpl/edit.php b/core/administrator/components/com_fields/views/field/tmpl/edit.php
new file mode 100644
index 00000000..991273c7
--- /dev/null
+++ b/core/administrator/components/com_fields/views/field/tmpl/edit.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.tabstate');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', 'select');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "field.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
+		{
+			Joomla.submitform(task, document.getElementById("item-form"));
+		}
+	};
+	jQuery(document).ready(function() {
+		jQuery("#jform_title").data("dp-old-value", jQuery("#jform_title").val());
+		jQuery("#jform_title").change(function(data, handler) {
+			if(jQuery("#jform_title").data("dp-old-value") == jQuery("#jform_label").val()) {
+				jQuery("#jform_label").val(jQuery("#jform_title").val());
+			}
+
+			jQuery("#jform_title").data("dp-old-value", jQuery("#jform_title").val());
+		});
+	});
+');
+
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_fields&context=' . $input->getCmd('context', 'com_content') . '&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('COM_FIELDS_VIEW_FIELD_FIELDSET_GENERAL', true)); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php echo $this->form->renderField('type'); ?>
+				<?php echo $this->form->renderField('name'); ?>
+				<?php echo $this->form->renderField('label'); ?>
+				<?php echo $this->form->renderField('description'); ?>
+				<?php echo $this->form->renderField('required'); ?>
+				<?php echo $this->form->renderField('default_value'); ?>
+
+				<?php foreach ($this->form->getFieldsets('fieldparams') as $name => $fieldSet) : ?>
+					<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				<?php endforeach; ?>
+
+			</div>
+			<div class="span3">
+				<?php $this->set('fields',
+						array(
+							array(
+								'published',
+								'state',
+								'enabled',
+							),
+							'group_id',
+							'assigned_cat_ids',
+							'access',
+							'language',
+							'note',
+						)
+				); ?>
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+				<?php $this->set('fields', null); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php $this->set('ignore_fieldsets', array('fieldparams')); ?>
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'rules', JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL', true)); ?>
+			<?php echo $this->form->getInput('rules'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo $this->form->getInput('context'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_fields/views/field/view.html.php b/core/administrator/components/com_fields/views/field/view.html.php
new file mode 100644
index 00000000..2c665643
--- /dev/null
+++ b/core/administrator/components/com_fields/views/field/view.html.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Field View
+ *
+ * @since  3.7.0
+ */
+class FieldsViewField extends JViewLegacy
+{
+	/**
+	 * @var  JForm
+	 *
+	 * @since   3.7.0
+	 */
+	protected $form;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since   3.7.0
+	 */
+	protected $item;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since   3.7.0
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.7.0
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		$this->canDo = JHelperContent::getActions($this->state->get('field.component'), 'field', $this->item->id);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Adds the toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addToolbar()
+	{
+		$component = $this->state->get('field.component');
+		$section   = $this->state->get('field.section');
+		$userId    = JFactory::getUser()->get('id');
+		$canDo     = $this->canDo;
+
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Avoid nonsense situation.
+		if ($component == 'com_fields')
+		{
+			return;
+		}
+
+		// Load component language file
+		$lang = JFactory::getLanguage();
+		$lang->load($component, JPATH_ADMINISTRATOR)
+		|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
+
+		$title = JText::sprintf('COM_FIELDS_VIEW_FIELD_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE', JText::_(strtoupper($component)));
+
+		// Prepare the toolbar.
+		JToolbarHelper::title(
+			$title,
+			'puzzle field-' . ($isNew ? 'add' : 'edit') . ' ' . substr($component, 4) . ($section ? "-$section" : '') . '-field-' .
+			($isNew ? 'add' : 'edit')
+		);
+
+		// For new records, check the create permission.
+		if ($isNew)
+		{
+			JToolbarHelper::apply('field.apply');
+			JToolbarHelper::save('field.save');
+			JToolbarHelper::save2new('field.save2new');
+		}
+
+		// If not checked out, can save the item.
+		elseif (!$checkedOut && ($canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_user_id == $userId)))
+		{
+			JToolbarHelper::apply('field.apply');
+			JToolbarHelper::save('field.save');
+
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2new('field.save2new');
+			}
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('field.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('field.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('field.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_FIELDS_FIELDS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_fields/views/fields/tmpl/default.php b/core/administrator/components/com_fields/views/fields/tmpl/default.php
new file mode 100644
index 00000000..34fda940
--- /dev/null
+++ b/core/administrator/components/com_fields/views/fields/tmpl/default.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$context   = $this->escape($this->state->get('filter.context'));
+$component = $this->state->get('filter.component');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$ordering  = ($listOrder == 'a.ordering');
+$saveOrder = ($listOrder == 'a.ordering' && strtolower($listDirn) == 'asc');
+
+// The category object of the component
+$category = JCategories::getInstance(str_replace('com_', '', $component));
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_fields&task=fields.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'fieldList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_fields&view=fields'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<div id="filter-bar" class="js-stools-container-bar pull-left">
+			<div class="btn-group pull-left">
+				<?php echo $this->filterForm->getField('context')->input; ?>
+			</div>&nbsp;
+		</div>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="fieldList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_FIELDS_FIELD_TYPE_LABEL', 'a.type', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_FIELDS_FIELD_GROUP_LABEL', 'g.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php $ordering   = ($listOrder == 'a.ordering'); ?>
+						<?php $canEdit    = $user->authorise('core.edit', $component . '.field.' . $item->id); ?>
+						<?php $canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; ?>
+						<?php $canEditOwn = $user->authorise('core.edit.own', $component . '.field.' . $item->id) && $item->created_user_id == $userId; ?>
+						<?php $canChange  = $user->authorise('core.edit.state', $component . '.field.' . $item->id) && $canCheckin; ?>
+						<tr class="row<?php echo $i % 2; ?>" item-id="<?php echo $item->id ?>">
+							<td class="order nowrap center hidden-phone">
+								<?php $iconClass = ''; ?>
+								<?php if (!$canChange) : ?>
+									<?php $iconClass = ' inactive'; ?>
+								<?php elseif (!$saveOrder) : ?>
+									<?php $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); ?>
+								<?php endif; ?>
+								<span class="sortable-handler<?php echo $iconClass; ?>">
+									<span class="icon-menu" aria-hidden="true"></span>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" />
+								<?php endif; ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'fields.', $canChange, 'cb'); ?>
+									<?php // Create dropdown items and render the dropdown list. ?>
+									<?php if ($canChange) : ?>
+										<?php JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'fields'); ?>
+										<?php JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'fields'); ?>
+										<?php echo JHtml::_('actionsdropdown.render', $this->escape($item->title)); ?>
+									<?php endif; ?>
+								</div>
+							</td>
+							<td>
+								<div class="pull-left break-word">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'fields.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit || $canEditOwn) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_fields&task=field.edit&id=' . $item->id . '&context=' . $context); ?>">
+											<?php echo $this->escape($item->title); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->title); ?>
+									<?php endif; ?>
+									<span class="small break-word">
+										<?php if (empty($item->note)) : ?>
+											<?php echo JText::sprintf('JGLOBAL_LIST_NAME', $this->escape($item->name)); ?>
+										<?php else : ?>
+											<?php echo JText::sprintf('JGLOBAL_LIST_NAME_NOTE', $this->escape($item->name), $this->escape($item->note)); ?>
+										<?php endif; ?>
+									</span>
+									<div class="small">
+										<?php if ($category) : ?>
+											<?php echo JText::_('JCATEGORY') . ': '; ?>
+											<?php $categories = FieldsHelper::getAssignedCategoriesTitles($item->id); ?>
+											<?php if ($categories) : ?>
+												<?php echo implode(', ', $categories); ?>
+											<?php else : ?>
+												<?php echo JText::_('JALL'); ?>
+											<?php endif; ?>
+										<?php endif; ?>
+									</div>
+								</div>
+							</td>
+							<td class="small">
+								<?php echo $this->escape($item->type); ?>
+							</td>
+							<td>
+								<?php echo $this->escape($item->group_title); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<td class="small nowrap hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="center hidden-phone">
+								<span><?php echo (int) $item->id; ?></span>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php //Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', $component)
+				&& $user->authorise('core.edit', $component)
+				&& $user->authorise('core.edit.state', $component)) : ?>
+				<?php echo JHtml::_(
+						'bootstrap.renderModal',
+						'collapseModal',
+						array(
+							'title' => JText::_('COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS'),
+							'footer' => $this->loadTemplate('batch_footer')
+						),
+						$this->loadTemplate('batch_body')
+					); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php b/core/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php
new file mode 100644
index 00000000..fabf1e1e
--- /dev/null
+++ b/core/administrator/components/com_fields/views/fields/tmpl/default_batch_body.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+JFactory::getDocument()->addScriptDeclaration(
+	'
+		jQuery(document).ready(function($){
+			if ($("#batch-group-id").length){var batchSelector = $("#batch-group-id");}
+			if ($("#batch-copy-move").length) {
+				$("#batch-copy-move").hide();
+				batchSelector.on("change", function(){
+					if (batchSelector.val() != 0 || batchSelector.val() != "") {
+						$("#batch-copy-move").show();
+					} else {
+						$("#batch-copy-move").hide();
+					}
+				});
+			}
+		});
+			'
+);
+
+$context   = $this->escape($this->state->get('filter.context'));
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JLayoutHelper::render('joomla.html.batch.language', array()); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JLayoutHelper::render('joomla.html.batch.access', array()); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php $options = array(
+					JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
+					JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
+				);
+				?>
+				<label id="batch-choose-action-lbl" for="batch-choose-action"><?php echo JText::_('COM_FIELDS_BATCH_GROUP_LABEL'); ?></label>
+				<div id="batch-choose-action" class="control-group">
+					<select name="batch[group_id]" class="inputbox" id="batch-group-id">
+						<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+						<option value="nogroup"><?php echo JText::_('COM_FIELDS_BATCH_GROUP_OPTION_NONE'); ?></option>
+						<?php echo JHtml::_('select.options', $this->get('Groups'), 'value', 'text'); ?>
+					</select>
+				</div>
+				<div id="batch-copy-move" class="control-group radio">
+					<?php echo JText::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
+					<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php b/core/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..10ca5b03
--- /dev/null
+++ b/core/administrator/components/com_fields/views/fields/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<button class="btn" type="button" onclick="document.getElementById('batch-field-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</button>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('field.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_fields/views/fields/tmpl/modal.php b/core/administrator/components/com_fields/views/fields/tmpl/modal.php
new file mode 100644
index 00000000..2c5cb589
--- /dev/null
+++ b/core/administrator/components/com_fields/views/fields/tmpl/modal.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (JFactory::getApplication()->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JHtml::_('behavior.core');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('script', 'com_fields/admin-fields-modal.js', array('version' => 'auto', 'relative' => true));
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$editor    = JFactory::getApplication()->input->get('editor', '', 'cmd');
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_('index.php?option=com_fields&view=fields&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="moduleList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_FIELDS_FIELD_GROUP_LABEL', 'group_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_FIELDS_FIELD_TYPE_LABEL', 'a.type', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="8">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php
+					$iconStates = array(
+						-2 => 'icon-trash',
+						0  => 'icon-unpublish',
+						1  => 'icon-publish',
+						2  => 'icon-archive',
+					);
+					foreach ($this->items as $i => $item) :
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>" aria-hidden="true"></span>
+						</td>
+						<td class="has-context">
+							<a class="btn btn-small btn-block btn-success" href="#" onclick="Joomla.fieldIns('<?php echo $this->escape($item->id); ?>', '<?php echo $this->escape($editor); ?>');"><?php echo $this->escape($item->title); ?></a>
+						</td>
+						<td class="small hidden-phone">
+							<a class="btn btn-small btn-block btn-warning" href="#" onclick="Joomla.fieldgroupIns('<?php echo $this->escape($item->group_id); ?>', '<?php echo $this->escape($editor); ?>');"><?php echo $item->group_id ? $this->escape($item->group_title) : JText::_('JNONE'); ?></a>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $item->type; ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_fields/views/fields/view.html.php b/core/administrator/components/com_fields/views/fields/view.html.php
new file mode 100644
index 00000000..d2e72347
--- /dev/null
+++ b/core/administrator/components/com_fields/views/fields/view.html.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Fields View
+ *
+ * @since  3.7.0
+ */
+class FieldsViewFields extends JViewLegacy
+{
+	/**
+	 * @var  JForm
+	 *
+	 * @since  3.7.0
+	 */
+	public $filterForm;
+
+	/**
+	 * @var  array
+	 *
+	 * @since  3.7.0
+	 */
+	public $activeFilters;
+
+	/**
+	 * @var  array
+	 *
+	 * @since  3.7.0
+	 */
+	protected $items;
+
+	/**
+	 * @var  JPagination
+	 *
+	 * @since  3.7.0
+	 */
+	protected $pagination;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since  3.7.0
+	 */
+	protected $state;
+
+	/**
+	 * @var  string
+	 *
+	 * @since  3.7.0
+	 */
+	protected $sidebar;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.7.0
+	 */
+	public function display($tpl = null)
+	{
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Display a warning if the fields system plugin is disabled
+		if (!JPluginHelper::isEnabled('system', 'fields'))
+		{
+			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FieldsHelper::getFieldsPluginId());
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_FIELDS_SYSTEM_PLUGIN_NOT_ENABLED', $link), 'warning');
+		}
+
+		// Only add toolbar when not in modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+		}
+
+		FieldsHelper::addSubmenu($this->state->get('filter.context'), 'fields');
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Adds the toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addToolbar()
+	{
+		$fieldId   = $this->state->get('filter.field_id');
+		$component = $this->state->get('filter.component');
+		$section   = $this->state->get('filter.section');
+		$canDo     = JHelperContent::getActions($component, 'field', $fieldId);
+
+		// Get the toolbar object instance
+		$bar = JToolBar::getInstance('toolbar');
+
+		// Avoid nonsense situation.
+		if ($component == 'com_fields')
+		{
+			return;
+		}
+
+		// Load extension language file
+		$lang = JFactory::getLanguage();
+		$lang->load($component, JPATH_ADMINISTRATOR)
+		|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
+
+		$title = JText::sprintf('COM_FIELDS_VIEW_FIELDS_TITLE', JText::_(strtoupper($component)));
+
+		// Prepare the toolbar.
+		JToolbarHelper::title($title, 'puzzle fields ' . substr($component, 4) . ($section ? "-$section" : '') . '-fields');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('field.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('field.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('fields.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('fields.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::archiveList('fields.archive');
+		}
+
+		if (JFactory::getUser()->authorise('core.admin'))
+		{
+			JToolbarHelper::checkin('fields.checkin');
+		}
+
+		// Add a batch button
+		if ($canDo->get('core.create') && $canDo->get('core.edit') && $canDo->get('core.edit.state'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(
+				array(
+					'title' => $title,
+				)
+			);
+
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences($component);
+		}
+
+		if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete', $component))
+		{
+			JToolbarHelper::deleteList('', 'fields.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('fields.trash');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_FIELDS_FIELDS');
+	}
+
+	/**
+	 * Returns the sort fields.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'    => JText::_('JSTATUS'),
+			'a.title'    => JText::_('JGLOBAL_TITLE'),
+			'a.type'     => JText::_('COM_FIELDS_FIELD_TYPE_LABEL'),
+			'a.access'   => JText::_('JGRID_HEADING_ACCESS'),
+			'language'   => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'       => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_fields/views/group/tmpl/edit.php b/core/administrator/components/com_fields/views/group/tmpl/edit.php
new file mode 100644
index 00000000..e00f223e
--- /dev/null
+++ b/core/administrator/components/com_fields/views/group/tmpl/edit.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.tabstate');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "group.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
+		{
+			Joomla.submitform(task, document.getElementById("item-form"));
+		}
+	};
+');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_fields&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('COM_FIELDS_VIEW_FIELD_FIELDSET_GENERAL', true)); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php echo $this->form->renderField('label'); ?>
+				<?php echo $this->form->renderField('description'); ?>
+			</div>
+			<div class="span3">
+				<?php $this->set('fields',
+						array(
+							array(
+								'published',
+								'state',
+								'enabled',
+							),
+							'access',
+							'language',
+							'note',
+						)
+				); ?>
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+				<?php $this->set('fields', null); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php $this->set('ignore_fieldsets', array('fieldparams')); ?>
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'rules', JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL', true)); ?>
+			<?php echo $this->form->getInput('rules'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo $this->form->getInput('context'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_fields/views/group/view.html.php b/core/administrator/components/com_fields/views/group/view.html.php
new file mode 100644
index 00000000..c0179897
--- /dev/null
+++ b/core/administrator/components/com_fields/views/group/view.html.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Group View
+ *
+ * @since  3.7.0
+ */
+class FieldsViewGroup extends JViewLegacy
+{
+	/**
+	 * @var  JForm
+	 *
+	 * @since  3.7.0
+	 */
+	protected $form;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since  3.7.0
+	 */
+	protected $item;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since  3.7.0
+	 */
+	protected $state;
+
+	/**
+	 * The actions the user is authorised to perform
+	 *
+	 * @var  JObject
+	 *
+	 * @since  3.7.0
+	 */
+	protected $canDo;
+
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.7.0
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		$component = '';
+		$parts     = FieldsHelper::extract($this->state->get('filter.context'));
+
+		if ($parts)
+		{
+			$component = $parts[0];
+		}
+
+		$this->canDo = JHelperContent::getActions($component, 'fieldgroup', $this->item->id);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Adds the toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addToolbar()
+	{
+		$component = '';
+		$parts     = FieldsHelper::extract($this->state->get('filter.context'));
+
+		if ($parts)
+		{
+			$component = $parts[0];
+		}
+
+		$userId    = JFactory::getUser()->get('id');
+		$canDo     = $this->canDo;
+
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Avoid nonsense situation.
+		if ($component == 'com_fields')
+		{
+			return;
+		}
+
+		// Load component language file
+		$lang = JFactory::getLanguage();
+		$lang->load($component, JPATH_ADMINISTRATOR)
+		|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
+
+		$title = JText::sprintf('COM_FIELDS_VIEW_GROUP_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE', JText::_(strtoupper($component)));
+
+		// Prepare the toolbar.
+		JToolbarHelper::title(
+			$title,
+			'puzzle field-' . ($isNew ? 'add' : 'edit') . ' ' . substr($component, 4) . '-group-' .
+			($isNew ? 'add' : 'edit')
+		);
+
+		// For new records, check the create permission.
+		if ($isNew)
+		{
+			JToolbarHelper::apply('group.apply');
+			JToolbarHelper::save('group.save');
+			JToolbarHelper::save2new('group.save2new');
+		}
+
+		// If not checked out, can save the item.
+		elseif (!$checkedOut && ($canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId)))
+		{
+			JToolbarHelper::apply('group.apply');
+			JToolbarHelper::save('group.save');
+
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2new('group.save2new');
+			}
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('group.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('group.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('group.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_fields/views/groups/tmpl/default.php b/core/administrator/components/com_fields/views/groups/tmpl/default.php
new file mode 100644
index 00000000..65da48e8
--- /dev/null
+++ b/core/administrator/components/com_fields/views/groups/tmpl/default.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+$component = '';
+$parts     = FieldsHelper::extract($this->state->get('filter.context'));
+
+if ($parts)
+{
+	$component = $this->escape($parts[0]);
+}
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$ordering  = ($listOrder == 'a.ordering');
+$saveOrder = ($listOrder == 'a.ordering' && strtolower($listDirn) == 'asc');
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_fields&task=groups.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'groupList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_fields&view=groups'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<div id="filter-bar" class="js-stools-container-bar pull-left">
+			<div class="btn-group pull-left">
+				<?php echo $this->filterForm->getField('context')->input; ?>
+			</div>&nbsp;
+		</div>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="groupList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php $ordering   = ($listOrder == 'a.ordering'); ?>
+						<?php $canEdit    = $user->authorise('core.edit', $component . '.fieldgroup.' . $item->id); ?>
+						<?php $canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; ?>
+						<?php $canEditOwn = $user->authorise('core.edit.own', $component . '.fieldgroup.' . $item->id) && $item->created_by == $userId; ?>
+						<?php $canChange  = $user->authorise('core.edit.state', $component . '.fieldgroup.' . $item->id) && $canCheckin; ?>
+						<tr class="row<?php echo $i % 2; ?>" item-id="<?php echo $item->id ?>">
+							<td class="order nowrap center hidden-phone">
+								<?php $iconClass = ''; ?>
+								<?php if (!$canChange) : ?>
+									<?php $iconClass = ' inactive'; ?>
+								<?php elseif (!$saveOrder) : ?>
+									<?php $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); ?>
+								<?php endif; ?>
+								<span class="sortable-handler<?php echo $iconClass; ?>">
+									<span class="icon-menu" aria-hidden="true"></span>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" />
+								<?php endif; ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'groups.', $canChange, 'cb'); ?>
+									<?php // Create dropdown items and render the dropdown list. ?>
+									<?php if ($canChange) : ?>
+										<?php JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'groups'); ?>
+										<?php JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'groups'); ?>
+										<?php echo JHtml::_('actionsdropdown.render', $this->escape($item->title)); ?>
+									<?php endif; ?>
+								</div>
+							</td>
+							<td>
+								<div class="pull-left break-word">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'groups.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit || $canEditOwn) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_fields&task=group.edit&id=' . $item->id); ?>">
+											<?php echo $this->escape($item->title); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->title); ?>
+									<?php endif; ?>
+									<span class="small break-word">
+										<?php if ($item->note) : ?>
+											<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note)); ?>
+										<?php endif; ?>
+									</span>
+								</div>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<td class="small nowrap hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="center hidden-phone">
+								<span><?php echo (int) $item->id; ?></span>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php //Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', $component)
+				&& $user->authorise('core.edit', $component)
+				&& $user->authorise('core.edit.state', $component)) : ?>
+				<?php echo JHtml::_(
+						'bootstrap.renderModal',
+						'collapseModal',
+						array(
+							'title' => JText::_('COM_FIELDS_VIEW_GROUPS_BATCH_OPTIONS'),
+							'footer' => $this->loadTemplate('batch_footer')
+						),
+						$this->loadTemplate('batch_body')
+					); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php b/core/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php
new file mode 100644
index 00000000..e9e7a76e
--- /dev/null
+++ b/core/administrator/components/com_fields/views/groups/tmpl/default_batch_body.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JLayoutHelper::render('joomla.html.batch.language', array()); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JLayoutHelper::render('joomla.html.batch.access', array()); ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php b/core/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..4fcb5c8f
--- /dev/null
+++ b/core/administrator/components/com_fields/views/groups/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<button class="btn" type="button" onclick="document.getElementById('batch-field-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</button>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('group.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_fields/views/groups/view.html.php b/core/administrator/components/com_fields/views/groups/view.html.php
new file mode 100644
index 00000000..f08cc0d6
--- /dev/null
+++ b/core/administrator/components/com_fields/views/groups/view.html.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Groups View
+ *
+ * @since  3.7.0
+ */
+class FieldsViewGroups extends JViewLegacy
+{
+	/**
+	 * @var  JForm
+	 *
+	 * @since  3.7.0
+	 */
+	public $filterForm;
+
+	/**
+	 * @var  array
+	 *
+	 * @since  3.7.0
+	 */
+	public $activeFilters;
+
+	/**
+	 * @var  array
+	 *
+	 * @since  3.7.0
+	 */
+	protected $items;
+
+	/**
+	 * @var  JPagination
+	 *
+	 * @since  3.7.0
+	 */
+	protected $pagination;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since  3.7.0
+	 */
+	protected $state;
+
+	/**
+	 * @var  string
+	 *
+	 * @since  3.7.0
+	 */
+	protected $sidebar;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     JViewLegacy::loadTemplate()
+	 * @since   3.7.0
+	 */
+	public function display($tpl = null)
+	{
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Display a warning if the fields system plugin is disabled
+		if (!JPluginHelper::isEnabled('system', 'fields'))
+		{
+			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FieldsHelper::getFieldsPluginId());
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_FIELDS_SYSTEM_PLUGIN_NOT_ENABLED', $link), 'warning');
+		}
+
+		$this->addToolbar();
+
+		FieldsHelper::addSubmenu($this->state->get('filter.context'), 'groups');
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Adds the toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addToolbar()
+	{
+		$groupId   = $this->state->get('filter.group_id');
+		$component = '';
+		$parts     = FieldsHelper::extract($this->state->get('filter.context'));
+
+		if ($parts)
+		{
+			$component = $parts[0];
+		}
+
+		$canDo     = JHelperContent::getActions($component, 'fieldgroup', $groupId);
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Avoid nonsense situation.
+		if ($component == 'com_fields')
+		{
+			return;
+		}
+
+		// Load component language file
+		$lang = JFactory::getLanguage();
+		$lang->load($component, JPATH_ADMINISTRATOR)
+		|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component));
+
+		$title = JText::sprintf('COM_FIELDS_VIEW_GROUPS_TITLE', JText::_(strtoupper($component)));
+
+		// Prepare the toolbar.
+		JToolbarHelper::title($title, 'puzzle fields ' . substr($component, 4) . '-groups');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('group.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('group.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('groups.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('groups.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::archiveList('groups.archive');
+		}
+
+		if (JFactory::getUser()->authorise('core.admin'))
+		{
+			JToolbarHelper::checkin('groups.checkin');
+		}
+
+		// Add a batch button
+		if ($canDo->get('core.create') && $canDo->get('core.edit') && $canDo->get('core.edit.state'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(
+				array(
+					'title' => $title,
+				)
+			);
+
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences($component);
+		}
+
+		if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete', $component))
+		{
+			JToolbarHelper::deleteList('', 'groups.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('groups.trash');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_FIELDS_FIELD_GROUPS');
+	}
+
+	/**
+	 * Returns the sort fields.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering'  => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'     => JText::_('JSTATUS'),
+			'a.title'     => JText::_('JGLOBAL_TITLE'),
+			'a.access'    => JText::_('JGRID_HEADING_ACCESS'),
+			'language'    => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.context'   => JText::_('JGRID_HEADING_CONTEXT'),
+			'a.id'        => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_finder/access.xml b/core/administrator/components/com_finder/access.xml
new file mode 100644
index 00000000..7d09d2cb
--- /dev/null
+++ b/core/administrator/components/com_finder/access.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_finder">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_finder/config.xml b/core/administrator/components/com_finder/config.xml
new file mode 100644
index 00000000..869fba3f
--- /dev/null
+++ b/core/administrator/components/com_finder/config.xml
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="search"
+		label="COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL"
+		description="COM_FINDER_FIELDSET_SEARCH_OPTIONS_DESCRIPTION"
+		>
+
+		<field
+			name="enabled"
+			type="radio"
+			label="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
+			description="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_description"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="description_length"
+			type="number"
+			label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
+			description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION"
+			size="5"
+			default="255"
+			filter="integer"
+			showon="show_description:1"
+		/>
+
+
+		<field
+			name="allow_empty_query"
+			type="radio"
+			label="COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_LABEL"
+			description="COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_url"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_URL_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_URL_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_autosuggest"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_suggested_query"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			validate="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_explained_query"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			validate="options"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_advanced"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_ADVANCED_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_advanced_tips"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_advanced:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="expand_advanced"
+			type="radio"
+			label="COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL"
+			description="COM_FINDER_CONFIG_EXPAND_ADVANCED_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="show_advanced:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_date_filters"
+			type="radio"
+			label="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL"
+			description="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="show_advanced:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="sort_order"
+			type="list"
+			label="COM_FINDER_CONFIG_SORT_ORDER_LABEL"
+			description="COM_FINDER_CONFIG_SORT_ORDER_DESC"
+			default="relevance"
+			validate="options"
+			>
+			<option value="relevance">COM_FINDER_CONFIG_SORT_OPTION_RELEVANCE</option>
+			<option value="date">COM_FINDER_CONFIG_SORT_OPTION_START_DATE</option>
+			<option value="price">COM_FINDER_CONFIG_SORT_OPTION_LIST_PRICE</option>
+		</field>
+
+		<field
+			name="sort_direction"
+			type="list"
+			label="COM_FINDER_CONFIG_SORT_DIRECTION_LABEL"
+			description="COM_FINDER_CONFIG_SORT_DIRECTION_DESC"
+			default="desc"
+			validate="options"
+			>
+			<option value="desc">COM_FINDER_CONFIG_SORT_OPTION_DESCENDING</option>
+			<option value="asc">COM_FINDER_CONFIG_SORT_OPTION_ASCENDING</option>
+		</field>
+
+		<field
+			name="highlight_terms"
+			type="radio"
+			label="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL"
+			description="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="opensearch_name"
+			type="text"
+			label="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_LABEL"
+			description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION"
+			default=""
+		/>
+
+		<field
+			name="opensearch_description"
+			type="textarea"
+			label="COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL"
+			description="COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESCRIPTION"
+			default=""
+			cols="30"
+			rows="2"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="index"
+		label="COM_FINDER_FIELDSET_INDEX_OPTIONS_LABEL"
+		description="COM_FINDER_FIELDSET_INDEX_OPTIONS_DESCRIPTION"
+		>
+
+		<field
+			name="batch_size"
+			type="list"
+			label="COM_FINDER_CONFIG_BATCH_SIZE_LABEL"
+			description="COM_FINDER_CONFIG_BATCH_SIZE_DESCRIPTION"
+			default="50"
+			validate="options"
+			>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="25">J25</option>
+			<option value="50">J50</option>
+			<option value="75">J75</option>
+			<option value="100">J100</option>
+			<option value="150">J150</option>
+			<option value="200">J200</option>
+			<option value="250">J250</option>
+			<option value="300">J300</option>
+		</field>
+
+		<field
+			name="memory_table_limit"
+			type="number"
+			label="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_LABEL"
+			description="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_DESCRIPTION"
+			size="10"
+			default="30000"
+			filter="integer"
+		/>
+
+		<field
+			name="title_multiplier"
+			type="number"
+			label="COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_TITLE_MULTIPLIER_DESCRIPTION"
+			size="5"
+			default="1.7"
+		/>
+
+		<field
+			name="text_multiplier"
+			type="number"
+			label="COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_TEXT_MULTIPLIER_DESCRIPTION"
+			size="5"
+			default="0.7"
+		/>
+
+		<field
+			name="meta_multiplier"
+			type="number"
+			label="COM_FINDER_CONFIG_META_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_META_MULTIPLIER_DESCRIPTION"
+			size="5"
+			default="1.2"
+		/>
+
+		<field
+			name="path_multiplier"
+			type="number"
+			label="COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_PATH_MULTIPLIER_DESCRIPTION"
+			size="5"
+			default="2.0"
+		/>
+
+		<field
+			name="misc_multiplier"
+			type="number"
+			label="COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL"
+			description="COM_FINDER_CONFIG_MISC_MULTIPLIER_DESCRIPTION"
+			size="5"
+			default="0.3"
+		/>
+
+		<field
+			name="stem"
+			type="radio"
+			label="COM_FINDER_CONFIG_STEMMER_ENABLE_LABEL"
+			description="COM_FINDER_CONFIG_STEMMER_ENABLE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="stemmer"
+			type="list"
+			label="COM_FINDER_CONFIG_STEMMER_LABEL"
+			description="COM_FINDER_CONFIG_STEMMER_DESCRIPTION"
+			default="snowball"
+			showon="stem:1" 
+			>
+			<option value="porter_en">COM_FINDER_CONFIG_STEMMER_PORTER_EN</option>
+			<option value="fr">COM_FINDER_CONFIG_STEMMER_FR</option>
+			<option value="snowball">COM_FINDER_CONFIG_STEMMER_SNOWBALL</option>
+		</field>
+
+		<field
+			name="enable_logging"
+			type="radio"
+			label="COM_FINDER_CONFIG_ENABLE_LOGGING_LABEL"
+			description="COM_FINDER_CONFIG_ENABLE_LOGGING_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_finder"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_finder/controller.php b/core/administrator/components/com_finder/controller.php
new file mode 100644
index 00000000..339dc9b4
--- /dev/null
+++ b/core/administrator/components/com_finder/controller.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base controller class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderController extends JControllerLegacy
+{
+	/**
+	 * The default view.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $default_view = 'index';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  FinderController  A JControllerLegacy object to support chaining.
+	 *
+	 * @since	2.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		JLoader::register('FinderHelper', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/finder.php');
+
+		$view   = $this->input->get('view', 'index', 'word');
+		$layout = $this->input->get('layout', 'index', 'word');
+		$filterId = $this->input->get('filter_id', null, 'int');
+
+		// Check for edit form.
+		if ($view === 'filter' && $layout === 'edit' && !$this->checkEditId('com_finder.edit.filter', $filterId))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $filterId));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_finder&view=filters', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_finder/controllers/filter.php b/core/administrator/components/com_finder/controllers/filter.php
new file mode 100644
index 00000000..2948b065
--- /dev/null
+++ b/core/administrator/components/com_finder/controllers/filter.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Indexer controller class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderControllerFilter extends JControllerForm
+{
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+		$input = $app->input;
+		$model = $this->getModel();
+		$table = $model->getTable();
+		$data = $input->post->get('jform', array(), 'array');
+		$checkin = property_exists($table, 'checked_out');
+		$context = "$this->option.edit.$this->context";
+		$task = $this->getTask();
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		$recordId = $input->get($urlVar, '', 'int');
+
+		if (!$this->checkEditId($context, $recordId))
+		{
+			// Somehow the person just went to the form and tried to save it. We don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $recordId));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
+
+			return false;
+		}
+
+		// Populate the row id from the session.
+		$data[$key] = $recordId;
+
+		// The save2copy task needs to be handled slightly differently.
+		if ($task === 'save2copy')
+		{
+			// Check-in the original row.
+			if ($checkin && $model->checkin($data[$key]) === false)
+			{
+				// Check-in failed. Go back to the item and display a notice.
+				$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
+				$this->setMessage($this->getError(), 'error');
+				$this->setRedirect('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $urlVar));
+
+				return false;
+			}
+
+			// Reset the ID and then treat the request as for Apply.
+			$data[$key] = 0;
+			$task = 'apply';
+		}
+
+		// Access check.
+		if (!$this->allowSave($data, $key))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
+
+			return false;
+		}
+
+		// Validate the posted data.
+		// Sometimes the form needs some posted data, such as for plugins and modules.
+		$form = $model->getForm($data, false);
+
+		if (!$form)
+		{
+			$app->enqueueMessage($model->getError(), 'error');
+
+			return false;
+		}
+
+		// Test whether the data is valid.
+		$validData = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($validData === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->setRedirect(
+				JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false)
+			);
+
+			return false;
+		}
+
+		// Get and sanitize the filter data.
+		$validData['data'] = $input->post->get('t', array(), 'array');
+		$validData['data'] = array_unique($validData['data']);
+		$validData['data'] = ArrayHelper::toInteger($validData['data']);
+
+		// Remove any values of zero.
+		if (array_search(0, $validData['data'], true))
+		{
+			unset($validData['data'][array_search(0, $validData['data'], true)]);
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($validData))
+		{
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $validData);
+
+			// Redirect back to the edit screen.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(
+				JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false)
+			);
+
+			return false;
+		}
+
+		// Save succeeded, so check-in the record.
+		if ($checkin && $model->checkin($validData[$key]) === false)
+		{
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $validData);
+
+			// Check-in failed, so go back to the record and display a notice.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key));
+
+			return false;
+		}
+
+		$this->setMessage(
+			JText::_(
+				(JFactory::getLanguage()->hasKey($this->text_prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS')
+				? $this->text_prefix : 'JLIB_APPLICATION') . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'
+			)
+		);
+
+		// Redirect the user and adjust session state based on the chosen task.
+		switch ($task)
+		{
+			case 'apply':
+				// Set the record data in the session.
+				$recordId = $model->getState($this->context . '.id');
+				$this->holdEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+				$model->checkout($recordId);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(
+					JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, $key), false)
+				);
+
+				break;
+
+			case 'save2new':
+				// Clear the record id and data from the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(
+					JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend(null, $key), false)
+				);
+
+				break;
+
+			default:
+				// Clear the record id and data from the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+
+				// Redirect to the list screen.
+				$this->setRedirect(
+					JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false)
+				);
+
+				break;
+		}
+
+		// Invoke the postSave method to allow for the child class to access the model.
+		$this->postSaveHook($model, $validData);
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/controllers/filters.php b/core/administrator/components/com_finder/controllers/filters.php
new file mode 100644
index 00000000..f9c045f2
--- /dev/null
+++ b/core/administrator/components/com_finder/controllers/filters.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Filters controller class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderControllerFilters extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   2.5
+	 */
+	public function getModel($name = 'Filter', $prefix = 'FinderModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_finder/controllers/index.php b/core/administrator/components/com_finder/controllers/index.php
new file mode 100644
index 00000000..6c1de750
--- /dev/null
+++ b/core/administrator/components/com_finder/controllers/index.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Index controller class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderControllerIndex extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   2.5
+	 */
+	public function getModel($name = 'Index', $prefix = 'FinderModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to purge all indexed links from the database.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function purge()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Remove the script time limit.
+		@set_time_limit(0);
+
+		$model = $this->getModel('Index', 'FinderModel');
+
+		// Attempt to purge the index.
+		$return = $model->purge();
+
+		if (!$return)
+		{
+			$message = JText::_('COM_FINDER_INDEX_PURGE_FAILED', $model->getError());
+			$this->setRedirect('index.php?option=com_finder&view=index', $message);
+
+			return false;
+		}
+		else
+		{
+			$message = JText::_('COM_FINDER_INDEX_PURGE_SUCCESS');
+			$this->setRedirect('index.php?option=com_finder&view=index', $message);
+
+			return true;
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/controllers/indexer.json.php b/core/administrator/components/com_finder/controllers/indexer.json.php
new file mode 100644
index 00000000..b9c087b3
--- /dev/null
+++ b/core/administrator/components/com_finder/controllers/indexer.json.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Register dependent classes.
+JLoader::register('FinderIndexer', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/indexer.php');
+
+/**
+ * Indexer controller class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderControllerIndexer extends JControllerLegacy
+{
+	/**
+	 * Method to start the indexer.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function start()
+	{
+		$params = JComponentHelper::getParams('com_finder');
+
+		if ($params->get('enable_logging', '0'))
+		{
+			$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+			$options['text_file'] = 'indexer.php';
+			JLog::addLogger($options);
+		}
+
+		// Log the start
+		try
+		{
+			JLog::add('Starting the indexer', JLog::INFO);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// We don't want this form to be cached.
+		$app = JFactory::getApplication();
+		$app->setHeader('Expires', 'Mon, 1 Jan 2001 00:00:00 GMT', true);
+		$app->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+		$app->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+		$app->setHeader('Pragma', 'no-cache');
+
+		// Check for a valid token. If invalid, send a 403 with the error message.
+		JSession::checkToken('request') or static::sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+
+		// Put in a buffer to silence noise.
+		ob_start();
+
+		// Reset the indexer state.
+		FinderIndexer::resetState();
+
+		// Import the finder plugins.
+		JPluginHelper::importPlugin('finder');
+
+		// Add the indexer language to JS
+		JText::script('COM_FINDER_AN_ERROR_HAS_OCCURRED');
+		JText::script('COM_FINDER_NO_ERROR_RETURNED');
+
+		// Start the indexer.
+		try
+		{
+			// Trigger the onStartIndex event.
+			JEventDispatcher::getInstance()->trigger('onStartIndex');
+
+			// Get the indexer state.
+			$state = FinderIndexer::getState();
+			$state->start = 1;
+
+			// Send the response.
+			static::sendResponse($state);
+		}
+
+		// Catch an exception and return the response.
+		catch (Exception $e)
+		{
+			static::sendResponse($e);
+		}
+	}
+
+	/**
+	 * Method to run the next batch of content through the indexer.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function batch()
+	{
+		$params = JComponentHelper::getParams('com_finder');
+
+		if ($params->get('enable_logging', '0'))
+		{
+			$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+			$options['text_file'] = 'indexer.php';
+			JLog::addLogger($options);
+		}
+
+		// Log the start
+		try
+		{
+			JLog::add('Starting the indexer batch process', JLog::INFO);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// We don't want this form to be cached.
+		$app = JFactory::getApplication();
+		$app->setHeader('Expires', 'Mon, 1 Jan 2001 00:00:00 GMT', true);
+		$app->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+		$app->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+		$app->setHeader('Pragma', 'no-cache');
+
+		// Check for a valid token. If invalid, send a 403 with the error message.
+		JSession::checkToken('request') or static::sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+
+		// Put in a buffer to silence noise.
+		ob_start();
+
+		// Remove the script time limit.
+		@set_time_limit(0);
+
+		// Get the indexer state.
+		$state = FinderIndexer::getState();
+
+		// Reset the batch offset.
+		$state->batchOffset = 0;
+
+		// Update the indexer state.
+		FinderIndexer::setState($state);
+
+		// Import the finder plugins.
+		JPluginHelper::importPlugin('finder');
+
+		/*
+		 * We are going to swap out the raw document object with an HTML document
+		 * in order to work around some plugins that don't do proper environment
+		 * checks before trying to use HTML document functions.
+		 */
+		$raw = clone JFactory::getDocument();
+		$lang = JFactory::getLanguage();
+
+		// Get the document properties.
+		$attributes = array (
+			'charset'   => 'utf-8',
+			'lineend'   => 'unix',
+			'tab'       => '  ',
+			'language'  => $lang->getTag(),
+			'direction' => $lang->isRtl() ? 'rtl' : 'ltr'
+		);
+
+		// Get the HTML document.
+		$html = JDocument::getInstance('html', $attributes);
+
+		// Todo: Why is this document fetched and immediately overwritten?
+		$doc = JFactory::getDocument();
+
+		// Swap the documents.
+		$doc = $html;
+
+		// Get the admin application.
+		$admin = clone JFactory::getApplication();
+
+		// Get the site app.
+		$site = JApplicationCms::getInstance('site');
+
+		// Swap the app.
+		$app = JFactory::getApplication();
+
+		// Todo: Why is the app fetched and immediately overwritten?
+		$app = $site;
+
+		// Start the indexer.
+		try
+		{
+			// Trigger the onBeforeIndex event.
+			JEventDispatcher::getInstance()->trigger('onBeforeIndex');
+
+			// Trigger the onBuildIndex event.
+			JEventDispatcher::getInstance()->trigger('onBuildIndex');
+
+			// Get the indexer state.
+			$state = FinderIndexer::getState();
+			$state->start = 0;
+			$state->complete = 0;
+
+			// Swap the documents back.
+			$doc = $raw;
+
+			// Swap the applications back.
+			$app = $admin;
+
+			// Log batch completion and memory high-water mark.
+			try
+			{
+				JLog::add('Batch completed, peak memory usage: ' . number_format(memory_get_peak_usage(true)) . ' bytes', JLog::INFO);
+			}
+			catch (RuntimeException $exception)
+			{
+				// Informational log only
+			}
+
+			// Send the response.
+			static::sendResponse($state);
+		}
+
+		// Catch an exception and return the response.
+		catch (Exception $e)
+		{
+			// Swap the documents back.
+			$doc = $raw;
+
+			// Send the response.
+			static::sendResponse($e);
+		}
+	}
+
+	/**
+	 * Method to optimize the index and perform any necessary cleanup.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function optimize()
+	{
+		// We don't want this form to be cached.
+		$app = JFactory::getApplication();
+		$app->setHeader('Expires', 'Mon, 1 Jan 2001 00:00:00 GMT', true);
+		$app->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+		$app->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+		$app->setHeader('Pragma', 'no-cache');
+
+		// Check for a valid token. If invalid, send a 403 with the error message.
+		JSession::checkToken('request') or static::sendResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+
+		// Put in a buffer to silence noise.
+		ob_start();
+
+		// Import the finder plugins.
+		JPluginHelper::importPlugin('finder');
+
+		try
+		{
+			// Optimize the index
+			FinderIndexer::getInstance()->optimize();
+
+			// Get the indexer state.
+			$state = FinderIndexer::getState();
+			$state->start = 0;
+			$state->complete = 1;
+
+			// Send the response.
+			static::sendResponse($state);
+		}
+
+		// Catch an exception and return the response.
+		catch (Exception $e)
+		{
+			static::sendResponse($e);
+		}
+	}
+
+	/**
+	 * Method to handle a send a JSON response. The body parameter
+	 * can be an Exception object for when an error has occurred or
+	 * a JObject for a good response.
+	 *
+	 * @param   mixed  $data  JObject on success, Exception on error. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public static function sendResponse($data = null)
+	{
+		// This method always sends a JSON response
+		$app = JFactory::getApplication();
+		$app->mimeType = 'application/json';
+
+		$params = JComponentHelper::getParams('com_finder');
+
+		if ($params->get('enable_logging', '0'))
+		{
+			$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+			$options['text_file'] = 'indexer.php';
+			JLog::addLogger($options);
+		}
+
+		// Send the assigned error code if we are catching an exception.
+		if ($data instanceof Exception)
+		{
+			try
+			{
+				JLog::add($data->getMessage(), JLog::ERROR);
+			}
+			catch (RuntimeException $exception)
+			{
+				// Informational log only
+			}
+
+			$app->setHeader('status', $data->getCode());
+		}
+
+		// Create the response object.
+		$response = new FinderIndexerResponse($data);
+
+		// Add the buffer.
+		$response->buffer = JDEBUG ? ob_get_contents() : ob_end_clean();
+
+		// Send the JSON response.
+		$app->setHeader('Content-Type', $app->mimeType . '; charset=' . $app->charSet);
+		$app->sendHeaders();
+		echo json_encode($response);
+
+		// Close the application.
+		$app->close();
+	}
+}
+
+/**
+ * Finder Indexer JSON Response Class
+ *
+ * @since  2.5
+ */
+class FinderIndexerResponse
+{
+	/**
+	 * Class Constructor
+	 *
+	 * @param   mixed  $state  The processing state for the indexer
+	 *
+	 * @since   2.5
+	 */
+	public function __construct($state)
+	{
+		$params = JComponentHelper::getParams('com_finder');
+
+		if ($params->get('enable_logging', '0'))
+		{
+			$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+			$options['text_file'] = 'indexer.php';
+			JLog::addLogger($options);
+		}
+
+		// The old token is invalid so send a new one.
+		$this->token = JFactory::getSession()->getFormToken();
+
+		// Check if we are dealing with an error.
+		if ($state instanceof Exception)
+		{
+			// Log the error
+			try
+			{
+				JLog::add($state->getMessage(), JLog::ERROR);
+			}
+			catch (RuntimeException $exception)
+			{
+				// Informational log only
+			}
+
+			// Prepare the error response.
+			$this->error = true;
+			$this->header = JText::_('COM_FINDER_INDEXER_HEADER_ERROR');
+			$this->message = $state->getMessage();
+		}
+		else
+		{
+			// Prepare the response data.
+			$this->batchSize = (int) $state->batchSize;
+			$this->batchOffset = (int) $state->batchOffset;
+			$this->totalItems = (int) $state->totalItems;
+
+			$this->startTime = $state->startTime;
+			$this->endTime = JFactory::getDate()->toSql();
+
+			$this->start = !empty($state->start) ? (int) $state->start : 0;
+			$this->complete = !empty($state->complete) ? (int) $state->complete : 0;
+
+			// Set the appropriate messages.
+			if ($this->totalItems <= 0 && $this->complete)
+			{
+				$this->header = JText::_('COM_FINDER_INDEXER_HEADER_COMPLETE');
+				$this->message = JText::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE');
+			}
+			elseif ($this->totalItems <= 0)
+			{
+				$this->header = JText::_('COM_FINDER_INDEXER_HEADER_OPTIMIZE');
+				$this->message = JText::_('COM_FINDER_INDEXER_MESSAGE_OPTIMIZE');
+			}
+			else
+			{
+				$this->header = JText::_('COM_FINDER_INDEXER_HEADER_RUNNING');
+				$this->message = JText::_('COM_FINDER_INDEXER_MESSAGE_RUNNING');
+			}
+		}
+	}
+}
+
+// Register the error handler.
+JError::setErrorHandling(E_ALL, 'callback', array('FinderControllerIndexer', 'sendResponse'));
diff --git a/core/administrator/components/com_finder/controllers/maps.php b/core/administrator/components/com_finder/controllers/maps.php
new file mode 100644
index 00000000..0a31778d
--- /dev/null
+++ b/core/administrator/components/com_finder/controllers/maps.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Maps controller class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderControllerMaps extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Maps', $prefix = 'FinderModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_finder/finder.php b/core/administrator/components/com_finder/finder.php
new file mode 100644
index 00000000..4318352a
--- /dev/null
+++ b/core/administrator/components/com_finder/finder.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_finder'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Finder');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_finder/finder.xml b/core/administrator/components/com_finder/finder.xml
new file mode 100644
index 00000000..4a232b08
--- /dev/null
+++ b/core/administrator/components/com_finder/finder.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_finder</name>
+	<author>Joomla! Project</author>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<creationDate>August 2011</creationDate>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_FINDER_XML_DESCRIPTION</description>
+	<menu link="option=com_finder">COM_FINDER</menu>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>finder.php</filename>
+		<filename>router.php</filename>
+		<folder>controllers</folder>
+		<folder>helpers</folder>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<media destination="com_finder" folder="media">
+		<folder>js</folder>
+		<folder>css</folder>
+	</media>
+	<install>
+		<sql>
+			<file charset="utf8" driver="mysql">sql/install.mysql.sql</file>
+			<file charset="utf8" driver="postgresql">sql/install.postgresql.sql</file>
+		</sql>
+	</install>
+	<uninstall>
+		<sql>
+			<file charset="utf8" driver="mysql">sql/uninstall.mysql.sql</file>
+			<file charset="utf8" driver="postgresql">sql/uninstall.postgresql.sql</file>
+		</sql>
+	</uninstall>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_finder.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>finder.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>sql</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_finder.ini</language>
+			<language tag="en-GB">language/en-GB.com_finder.sys.ini</language>
+		</languages>
+		<menu img="class:finder" link="option=com_finder">COM_FINDER</menu>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_finder/helpers/finder.php b/core/administrator/components/com_finder/helpers/finder.php
new file mode 100644
index 00000000..07b6c82e
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/finder.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderHelper
+{
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public static $extension = 'com_finder';
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_FINDER_SUBMENU_INDEX'),
+			'index.php?option=com_finder&view=index',
+			$vName === 'index'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_FINDER_SUBMENU_MAPS'),
+			'index.php?option=com_finder&view=maps',
+			$vName === 'maps'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_FINDER_SUBMENU_FILTERS'),
+			'index.php?option=com_finder&view=filters',
+			$vName === 'filters'
+		);
+	}
+
+	/**
+	 * Gets the finder system plugin extension id.
+	 *
+	 * @return  integer  The finder system plugin extension id.
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getFinderPluginId()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('content'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('finder'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject  A JObject containing the allowed actions.
+	 *
+	 * @since   2.5
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_finder');
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/html/finder.php b/core/administrator/components/com_finder/helpers/html/finder.php
new file mode 100644
index 00000000..6995cd42
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/html/finder.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * HTML behavior class for Finder.
+ *
+ * @since  2.5
+ */
+abstract class JHtmlFinder
+{
+	/**
+	 * Creates a list of types to filter on.
+	 *
+	 * @return  array  An array containing the types that can be selected.
+	 *
+	 * @since   2.5
+	 */
+	public static function typeslist()
+	{
+		// Load the finder types.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT t.title AS text, t.id AS value')
+			->from($db->quoteName('#__finder_types') . ' AS t')
+			->join('LEFT', $db->quoteName('#__finder_links') . ' AS l ON l.type_id = t.id')
+			->order('t.title ASC');
+		$db->setQuery($query);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return array();
+		}
+
+		// Compile the options.
+		$options = array();
+
+		$lang = JFactory::getLanguage();
+
+		foreach ($rows as $row)
+		{
+			$key       = $lang->hasKey(FinderHelperLanguage::branchPlural($row->text)) ? FinderHelperLanguage::branchPlural($row->text) : $row->text;
+			$options[] = JHtml::_('select.option', $row->value, JText::sprintf('COM_FINDER_ITEM_X_ONLY', JText::_($key)));
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Creates a list of maps.
+	 *
+	 * @return  array  An array containing the maps that can be selected.
+	 *
+	 * @since   2.5
+	 */
+	public static function mapslist()
+	{
+		// Load the finder types.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('title', 'text'))
+			->select($db->quoteName('id', 'value'))
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = 1');
+		$db->setQuery($query);
+
+		try
+		{
+			$branches = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $db->getMessage());
+		}
+
+		// Translate.
+		$lang = JFactory::getLanguage();
+
+		foreach ($branches as $branch)
+		{
+			$key = FinderHelperLanguage::branchPlural($branch->text);
+			$branch->translatedText = $lang->hasKey($key) ? JText::_($key) : $branch->text;
+		}
+
+		// Order by title.
+		$branches = ArrayHelper::sortObjects($branches, 'translatedText', 1, true, true);
+
+		// Compile the options.
+		$options = array();
+		$options[] = JHtml::_('select.option', '', JText::_('COM_FINDER_MAPS_SELECT_BRANCH'));
+
+		// Convert the values to options.
+		foreach ($branches as $branch)
+		{
+			$options[] = JHtml::_('select.option', $branch->value, $branch->translatedText);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Creates a list of published states.
+	 *
+	 * @return  array  An array containing the states that can be selected.
+	 *
+	 * @since   2.5
+	 */
+	public static function statelist()
+	{
+		return array(
+			JHtml::_('select.option', '1', JText::sprintf('COM_FINDER_ITEM_X_ONLY', JText::_('JPUBLISHED'))),
+			JHtml::_('select.option', '0', JText::sprintf('COM_FINDER_ITEM_X_ONLY', JText::_('JUNPUBLISHED')))
+		);
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/adapter.php b/core/administrator/components/com_finder/helpers/indexer/adapter.php
new file mode 100644
index 00000000..6ef6b2e4
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/adapter.php
@@ -0,0 +1,927 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('FinderIndexer', __DIR__ . '/indexer.php');
+JLoader::register('FinderIndexerHelper', __DIR__ . '/helper.php');
+JLoader::register('FinderIndexerResult', __DIR__ . '/result.php');
+JLoader::register('FinderIndexerTaxonomy', __DIR__ . '/taxonomy.php');
+
+/**
+ * Prototype adapter class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+abstract class FinderIndexerAdapter extends JPlugin
+{
+	/**
+	 * The context is somewhat arbitrary but it must be unique or there will be
+	 * conflicts when managing plugin/indexer state. A good best practice is to
+	 * use the plugin name suffix as the context. For example, if the plugin is
+	 * named 'plgFinderContent', the context could be 'Content'.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context;
+
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $extension;
+
+	/**
+	 * The sublayout to use when rendering the results.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $layout;
+
+	/**
+	 * The mime type of the content the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $mime;
+
+	/**
+	 * The access level of an item before save.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	protected $old_access;
+
+	/**
+	 * The access level of a category before save.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	protected $old_cataccess;
+
+	/**
+	 * The type of content the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type_title;
+
+	/**
+	 * The type id of the content.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	protected $type_id;
+
+	/**
+	 * The database object.
+	 *
+	 * @var    object
+	 * @since  2.5
+	 */
+	protected $db;
+
+	/**
+	 * The table name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $table;
+
+	/**
+	 * The indexer object.
+	 *
+	 * @var    FinderIndexer
+	 * @since  3.0
+	 */
+	protected $indexer;
+
+	/**
+	 * The field the published state is stored in.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $state_field = 'state';
+
+	/**
+	 * Method to instantiate the indexer adapter.
+	 *
+	 * @param   object  $subject  The object to observe.
+	 * @param   array   $config   An array that holds the plugin configuration.
+	 *
+	 * @since   2.5
+	 */
+	public function __construct(&$subject, $config)
+	{
+		// Get the database object.
+		$this->db = JFactory::getDbo();
+
+		// Call the parent constructor.
+		parent::__construct($subject, $config);
+
+		// Get the type id.
+		$this->type_id = $this->getTypeId();
+
+		// Add the content type if it doesn't exist and is set.
+		if (empty($this->type_id) && !empty($this->type_title))
+		{
+			$this->type_id = FinderIndexerHelper::addContentType($this->type_title, $this->mime);
+		}
+
+		// Check for a layout override.
+		if ($this->params->get('layout'))
+		{
+			$this->layout = $this->params->get('layout');
+		}
+
+		// Get the indexer object
+		$this->indexer = FinderIndexer::getInstance();
+	}
+
+	/**
+	 * Method to get the adapter state and push it into the indexer.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on error.
+	 */
+	public function onStartIndex()
+	{
+		// Get the indexer state.
+		$iState = FinderIndexer::getState();
+
+		// Get the number of content items.
+		$total = (int) $this->getContentCount();
+
+		// Add the content count to the total number of items.
+		$iState->totalItems += $total;
+
+		// Populate the indexer state information for the adapter.
+		$iState->pluginState[$this->context]['total'] = $total;
+		$iState->pluginState[$this->context]['offset'] = 0;
+
+		// Set the indexer state.
+		FinderIndexer::setState($iState);
+	}
+
+	/**
+	 * Method to prepare for the indexer to be run. This method will often
+	 * be used to include dependencies and things of that nature.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on error.
+	 */
+	public function onBeforeIndex()
+	{
+		// Get the indexer and adapter state.
+		$iState = FinderIndexer::getState();
+		$aState = $iState->pluginState[$this->context];
+
+		// Check the progress of the indexer and the adapter.
+		if ($iState->batchOffset == $iState->batchSize || $aState['offset'] == $aState['total'])
+		{
+			return true;
+		}
+
+		// Run the setup method.
+		return $this->setup();
+	}
+
+	/**
+	 * Method to index a batch of content items. This method can be called by
+	 * the indexer many times throughout the indexing process depending on how
+	 * much content is available for indexing. It is important to track the
+	 * progress correctly so we can display it to the user.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on error.
+	 */
+	public function onBuildIndex()
+	{
+		// Get the indexer and adapter state.
+		$iState = FinderIndexer::getState();
+		$aState = $iState->pluginState[$this->context];
+
+		// Check the progress of the indexer and the adapter.
+		if ($iState->batchOffset == $iState->batchSize || $aState['offset'] == $aState['total'])
+		{
+			return true;
+		}
+
+		// Get the batch offset and size.
+		$offset = (int) $aState['offset'];
+		$limit = (int) ($iState->batchSize - $iState->batchOffset);
+
+		// Get the content items to index.
+		$items = $this->getItems($offset, $limit);
+
+		// Iterate through the items and index them.
+		for ($i = 0, $n = count($items); $i < $n; $i++)
+		{
+			// Index the item.
+			$this->index($items[$i]);
+
+			// Adjust the offsets.
+			$offset++;
+			$iState->batchOffset++;
+			$iState->totalItems--;
+		}
+
+		// Update the indexer state.
+		$aState['offset'] = $offset;
+		$iState->pluginState[$this->context] = $aState;
+		FinderIndexer::setState($iState);
+
+		return true;
+	}
+
+	/**
+	 * Method to change the value of a content item's property in the links
+	 * table. This is used to synchronize published and access states that
+	 * are changed when not editing an item directly.
+	 *
+	 * @param   string   $id        The ID of the item to change.
+	 * @param   string   $property  The property that is being changed.
+	 * @param   integer  $value     The new value of that property.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function change($id, $property, $value)
+	{
+		// Check for a property we know how to handle.
+		if ($property !== 'state' && $property !== 'access')
+		{
+			return true;
+		}
+
+		// Get the URL for the content id.
+		$item = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
+
+		// Update the content items.
+		$query = $this->db->getQuery(true)
+			->update($this->db->quoteName('#__finder_links'))
+			->set($this->db->quoteName($property) . ' = ' . (int) $value)
+			->where($this->db->quoteName('url') . ' = ' . $item);
+		$this->db->setQuery($query);
+		$this->db->execute();
+
+		return true;
+	}
+
+	/**
+	 * Method to index an item.
+	 *
+	 * @param   FinderIndexerResult  $item  The item to index as a FinderIndexerResult object.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	abstract protected function index(FinderIndexerResult $item);
+
+	/**
+	 * Method to reindex an item.
+	 *
+	 * @param   integer  $id  The ID of the item to reindex.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function reindex($id)
+	{
+		// Run the setup method.
+		$this->setup();
+
+		// Remove the old item.
+		$this->remove($id);
+
+		// Get the item.
+		$item = $this->getItem($id);
+
+		// Index the item.
+		$this->index($item);
+	}
+
+	/**
+	 * Method to remove an item from the index.
+	 *
+	 * @param   string  $id  The ID of the item to remove.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function remove($id)
+	{
+		// Get the item's URL
+		$url = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
+
+		// Get the link ids for the content items.
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('link_id'))
+			->from($this->db->quoteName('#__finder_links'))
+			->where($this->db->quoteName('url') . ' = ' . $url);
+		$this->db->setQuery($query);
+		$items = $this->db->loadColumn();
+
+		// Check the items.
+		if (empty($items))
+		{
+			return true;
+		}
+
+		// Remove the items.
+		foreach ($items as $item)
+		{
+			$this->indexer->remove($item);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to setup the adapter before indexing.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	abstract protected function setup();
+
+	/**
+	 * Method to update index data on category access level changes
+	 *
+	 * @param   JTable  $row  A JTable object
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function categoryAccessChange($row)
+	{
+		$query = clone $this->getStateQuery();
+		$query->where('c.id = ' . (int) $row->id);
+
+		// Get the access level.
+		$this->db->setQuery($query);
+		$items = $this->db->loadObjectList();
+
+		// Adjust the access level for each item within the category.
+		foreach ($items as $item)
+		{
+			// Set the access level.
+			$temp = max($item->access, $row->access);
+
+			// Update the item.
+			$this->change((int) $item->id, 'access', $temp);
+
+			// Reindex the item
+			$this->reindex($row->id);
+		}
+	}
+
+	/**
+	 * Method to update index data on category access level changes
+	 *
+	 * @param   array    $pks    A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value  The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function categoryStateChange($pks, $value)
+	{
+		/*
+		 * The item's published state is tied to the category
+		 * published state so we need to look up all published states
+		 * before we change anything.
+		 */
+		foreach ($pks as $pk)
+		{
+			$query = clone $this->getStateQuery();
+			$query->where('c.id = ' . (int) $pk);
+
+			// Get the published states.
+			$this->db->setQuery($query);
+			$items = $this->db->loadObjectList();
+
+			// Adjust the state for each item within the category.
+			foreach ($items as $item)
+			{
+				// Translate the state.
+				$temp = $this->translateState($item->state, $value);
+
+				// Update the item.
+				$this->change($item->id, 'state', $temp);
+
+				// Reindex the item
+				$this->reindex($item->id);
+			}
+		}
+	}
+
+	/**
+	 * Method to check the existing access level for categories
+	 *
+	 * @param   JTable  $row  A JTable object
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function checkCategoryAccess($row)
+	{
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('access'))
+			->from($this->db->quoteName('#__categories'))
+			->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
+		$this->db->setQuery($query);
+
+		// Store the access level to determine if it changes
+		$this->old_cataccess = $this->db->loadResult();
+	}
+
+	/**
+	 * Method to check the existing access level for items
+	 *
+	 * @param   JTable  $row  A JTable object
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function checkItemAccess($row)
+	{
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('access'))
+			->from($this->db->quoteName($this->table))
+			->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
+		$this->db->setQuery($query);
+
+		// Store the access level to determine if it changes
+		$this->old_access = $this->db->loadResult();
+	}
+
+	/**
+	 * Method to get the number of content items available to index.
+	 *
+	 * @return  integer  The number of content items available to index.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getContentCount()
+	{
+		$return = 0;
+
+		// Get the list query.
+		$query = $this->getListQuery();
+
+		// Check if the query is valid.
+		if (empty($query))
+		{
+			return $return;
+		}
+
+		// Tweak the SQL query to make the total lookup faster.
+		if ($query instanceof JDatabaseQuery)
+		{
+			$query = clone $query;
+			$query->clear('select')
+				->select('COUNT(*)')
+				->clear('order');
+		}
+
+		// Get the total number of content items to index.
+		$this->db->setQuery($query);
+
+		return (int) $this->db->loadResult();
+	}
+
+	/**
+	 * Method to get a content item to index.
+	 *
+	 * @param   integer  $id  The id of the content item.
+	 *
+	 * @return  FinderIndexerResult  A FinderIndexerResult object.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getItem($id)
+	{
+		// Get the list query and add the extra WHERE clause.
+		$query = $this->getListQuery();
+		$query->where('a.id = ' . (int) $id);
+
+		// Get the item to index.
+		$this->db->setQuery($query);
+		$row = $this->db->loadAssoc();
+
+		// Convert the item to a result object.
+		$item = ArrayHelper::toObject((array) $row, 'FinderIndexerResult');
+
+		// Set the item type.
+		$item->type_id = $this->type_id;
+
+		// Set the item layout.
+		$item->layout = $this->layout;
+
+		return $item;
+	}
+
+	/**
+	 * Method to get a list of content items to index.
+	 *
+	 * @param   integer         $offset  The list offset.
+	 * @param   integer         $limit   The list limit.
+	 * @param   JDatabaseQuery  $query   A JDatabaseQuery object. [optional]
+	 *
+	 * @return  array  An array of FinderIndexerResult objects.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getItems($offset, $limit, $query = null)
+	{
+		$items = array();
+
+		// Get the content items to index.
+		$this->db->setQuery($this->getListQuery($query), $offset, $limit);
+		$rows = $this->db->loadAssocList();
+
+		// Convert the items to result objects.
+		foreach ($rows as $row)
+		{
+			// Convert the item to a result object.
+			$item = ArrayHelper::toObject((array) $row, 'FinderIndexerResult');
+
+			// Set the item type.
+			$item->type_id = $this->type_id;
+
+			// Set the mime type.
+			$item->mime = $this->mime;
+
+			// Set the item layout.
+			$item->layout = $this->layout;
+
+			// Set the extension if present
+			if (isset($row->extension))
+			{
+				$item->extension = $row->extension;
+			}
+
+			// Add the item to the stack.
+			$items[] = $item;
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to get the SQL query used to retrieve the list of content items.
+	 *
+	 * @param   mixed  $query  A JDatabaseQuery object. [optional]
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery($query = null)
+	{
+		// Check if we can use the supplied SQL query.
+		return $query instanceof JDatabaseQuery ? $query : $this->db->getQuery(true);
+	}
+
+	/**
+	 * Method to get the plugin type
+	 *
+	 * @param   integer  $id  The plugin ID
+	 *
+	 * @return  string  The plugin type
+	 *
+	 * @since   2.5
+	 */
+	protected function getPluginType($id)
+	{
+		// Prepare the query
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('element'))
+			->from($this->db->quoteName('#__extensions'))
+			->where($this->db->quoteName('extension_id') . ' = ' . (int) $id);
+		$this->db->setQuery($query);
+
+		return $this->db->loadResult();
+	}
+
+	/**
+	 * Method to get a SQL query to load the published and access states for
+	 * an article and category.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStateQuery()
+	{
+		$query = $this->db->getQuery(true);
+
+		// Item ID
+		$query->select('a.id');
+
+		// Item and category published state
+		$query->select('a.' . $this->state_field . ' AS state, c.published AS cat_state');
+
+		// Item and category access levels
+		$query->select('a.access, c.access AS cat_access')
+			->from($this->table . ' AS a')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the query clause for getting items to update by time.
+	 *
+	 * @param   string  $time  The modified timestamp.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getUpdateQueryByTime($time)
+	{
+		// Build an SQL query based on the modified time.
+		$query = $this->db->getQuery(true)
+			->where('a.modified >= ' . $this->db->quote($time));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the query clause for getting items to update by id.
+	 *
+	 * @param   array  $ids  The ids to load.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getUpdateQueryByIds($ids)
+	{
+		// Build an SQL query based on the item ids.
+		$query = $this->db->getQuery(true)
+			->where('a.id IN(' . implode(',', $ids) . ')');
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the type id for the adapter content.
+	 *
+	 * @return  integer  The numeric type id for the content.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getTypeId()
+	{
+		// Get the type id from the database.
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('id'))
+			->from($this->db->quoteName('#__finder_types'))
+			->where($this->db->quoteName('title') . ' = ' . $this->db->quote($this->type_title));
+		$this->db->setQuery($query);
+
+		return (int) $this->db->loadResult();
+	}
+
+	/**
+	 * Method to get the URL for the item. The URL is how we look up the link
+	 * in the Finder index.
+	 *
+	 * @param   integer  $id         The id of the item.
+	 * @param   string   $extension  The extension the category is in.
+	 * @param   string   $view       The view for the URL.
+	 *
+	 * @return  string  The URL of the item.
+	 *
+	 * @since   2.5
+	 */
+	protected function getUrl($id, $extension, $view)
+	{
+		return 'index.php?option=' . $extension . '&view=' . $view . '&id=' . $id;
+	}
+
+	/**
+	 * Method to get the page title of any menu item that is linked to the
+	 * content item, if it exists and is set.
+	 *
+	 * @param   string  $url  The URL of the item.
+	 *
+	 * @return  mixed  The title on success, null if not found.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getItemMenuTitle($url)
+	{
+		$return = null;
+
+		// Set variables
+		$user = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		// Build a query to get the menu params.
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('params'))
+			->from($this->db->quoteName('#__menu'))
+			->where($this->db->quoteName('link') . ' = ' . $this->db->quote($url))
+			->where($this->db->quoteName('published') . ' = 1')
+			->where($this->db->quoteName('access') . ' IN (' . $groups . ')');
+
+		// Get the menu params from the database.
+		$this->db->setQuery($query);
+		$params = $this->db->loadResult();
+
+		// Check the results.
+		if (empty($params))
+		{
+			return $return;
+		}
+
+		// Instantiate the params.
+		$params = json_decode($params);
+
+		// Get the page title if it is set.
+		if (isset($params->page_title) && $params->page_title)
+		{
+			$return = $params->page_title;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to update index data on access level changes
+	 *
+	 * @param   JTable  $row  A JTable object
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function itemAccessChange($row)
+	{
+		$query = clone $this->getStateQuery();
+		$query->where('a.id = ' . (int) $row->id);
+
+		// Get the access level.
+		$this->db->setQuery($query);
+		$item = $this->db->loadObject();
+
+		// Set the access level.
+		$temp = max($row->access, $item->cat_access);
+
+		// Update the item.
+		$this->change((int) $row->id, 'access', $temp);
+	}
+
+	/**
+	 * Method to update index data on published state changes
+	 *
+	 * @param   array    $pks    A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value  The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function itemStateChange($pks, $value)
+	{
+		/*
+		 * The item's published state is tied to the category
+		 * published state so we need to look up all published states
+		 * before we change anything.
+		 */
+		foreach ($pks as $pk)
+		{
+			$query = clone $this->getStateQuery();
+			$query->where('a.id = ' . (int) $pk);
+
+			// Get the published states.
+			$this->db->setQuery($query);
+			$item = $this->db->loadObject();
+
+			// Translate the state.
+			$temp = $this->translateState($value, $item->cat_state);
+
+			// Update the item.
+			$this->change($pk, 'state', $temp);
+
+			// Reindex the item
+			$this->reindex($pk);
+		}
+	}
+
+	/**
+	 * Method to update index data when a plugin is disabled
+	 *
+	 * @param   array  $pks  A list of primary key ids of the content that has changed state.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function pluginDisable($pks)
+	{
+		// Since multiple plugins may be disabled at a time, we need to check first
+		// that we're handling the appropriate one for the context
+		foreach ($pks as $pk)
+		{
+			if ($this->getPluginType($pk) == strtolower($this->context))
+			{
+				// Get all of the items to unindex them
+				$query = clone $this->getStateQuery();
+				$this->db->setQuery($query);
+				$items = $this->db->loadColumn();
+
+				// Remove each item
+				foreach ($items as $item)
+				{
+					$this->remove($item);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to translate the native content states into states that the
+	 * indexer can use.
+	 *
+	 * @param   integer  $item      The item state.
+	 * @param   integer  $category  The category state. [optional]
+	 *
+	 * @return  integer  The translated indexer state.
+	 *
+	 * @since   2.5
+	 */
+	protected function translateState($item, $category = null)
+	{
+		// If category is present, factor in its states as well
+		if ($category !== null)
+		{
+			if ($category == 0)
+			{
+				$item = 0;
+			}
+		}
+
+		// Translate the state
+		switch ($item)
+		{
+			// Published and archived items only should return a published state
+			case 1;
+			case 2:
+				return 1;
+
+			// All other states should return an unpublished state
+			default:
+			case 0:
+				return 0;
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/core/administrator/components/com_finder/helpers/indexer/driver/mysql.php
new file mode 100644
index 00000000..c91c1295
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -0,0 +1,562 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.file');
+
+/**
+ * Indexer class supporting MySQL(i) for the Finder indexer package.
+ *
+ * The indexer class provides the core functionality of the Finder
+ * search engine. It is responsible for adding and updating the
+ * content links table; extracting and scoring tokens; and maintaining
+ * all referential information for the content.
+ *
+ * Note: All exceptions thrown from within this class should be caught
+ * by the controller.
+ *
+ * @since  3.0
+ */
+class FinderIndexerDriverMysql extends FinderIndexer
+{
+	/**
+	 * Method to index a content item.
+	 *
+	 * @param   FinderIndexerResult  $item    The content item to index.
+	 * @param   string               $format  The format of the content. [optional]
+	 *
+	 * @return  integer  The ID of the record in the links table.
+	 *
+	 * @since   3.0
+	 * @throws  Exception on database error.
+	 */
+	public function index($item, $format = 'html')
+	{
+		// Mark beforeIndexing in the profiler.
+		static::$profiler ? static::$profiler->mark('beforeIndexing') : null;
+		$db = $this->db;
+		$nd = $db->getNullDate();
+
+		// Check if the item is in the database.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('link_id') . ', ' . $db->quoteName('md5sum'))
+			->from($db->quoteName('#__finder_links'))
+			->where($db->quoteName('url') . ' = ' . $db->quote($item->url));
+
+		// Load the item  from the database.
+		$db->setQuery($query);
+		$link = $db->loadObject();
+
+		// Get the indexer state.
+		$state = static::getState();
+
+		// Get the signatures of the item.
+		$curSig = static::getSignature($item);
+		$oldSig = isset($link->md5sum) ? $link->md5sum : null;
+
+		// Get the other item information.
+		$linkId = empty($link->link_id) ? null : $link->link_id;
+		$isNew = empty($link->link_id) ? true : false;
+
+		// Check the signatures. If they match, the item is up to date.
+		if (!$isNew && $curSig == $oldSig)
+		{
+			return $linkId;
+		}
+
+		/*
+		 * If the link already exists, flush all the term maps for the item.
+		 * Maps are stored in 16 tables so we need to iterate through and flush
+		 * each table one at a time.
+		 */
+		if (!$isNew)
+		{
+			for ($i = 0; $i <= 15; $i++)
+			{
+				// Flush the maps for the link.
+				$query->clear()
+					->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
+					->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+				$db->setQuery($query);
+				$db->execute();
+			}
+
+			// Remove the taxonomy maps.
+			FinderIndexerTaxonomy::removeMaps($linkId);
+		}
+
+		// Mark afterUnmapping in the profiler.
+		static::$profiler ? static::$profiler->mark('afterUnmapping') : null;
+
+		// Perform cleanup on the item data.
+		$item->publish_start_date = (int) $item->publish_start_date != 0 ? $item->publish_start_date : $nd;
+		$item->publish_end_date = (int) $item->publish_end_date != 0 ? $item->publish_end_date : $nd;
+		$item->start_date = (int) $item->start_date != 0 ? $item->start_date : $nd;
+		$item->end_date = (int) $item->end_date != 0 ? $item->end_date : $nd;
+
+		// Prepare the item description.
+		$item->description = FinderIndexerHelper::parse($item->summary);
+
+		/*
+		 * Now, we need to enter the item into the links table. If the item
+		 * already exists in the database, we need to use an UPDATE query.
+		 * Otherwise, we need to use an INSERT to get the link id back.
+		 */
+
+		if ($isNew)
+		{
+			$columnsArray = array(
+				$db->quoteName('url'), $db->quoteName('route'), $db->quoteName('title'), $db->quoteName('description'),
+				$db->quoteName('indexdate'), $db->quoteName('published'), $db->quoteName('state'), $db->quoteName('access'),
+				$db->quoteName('language'), $db->quoteName('type_id'), $db->quoteName('object'), $db->quoteName('publish_start_date'),
+				$db->quoteName('publish_end_date'), $db->quoteName('start_date'), $db->quoteName('end_date'), $db->quoteName('list_price'),
+				$db->quoteName('sale_price')
+			);
+
+			// Insert the link.
+			$query->clear()
+				->insert($db->quoteName('#__finder_links'))
+				->columns($columnsArray)
+				->values(
+					$db->quote($item->url) . ', '
+					. $db->quote($item->route) . ', '
+					. $db->quote($item->title) . ', '
+					. $db->quote($item->description) . ', '
+					. $query->currentTimestamp() . ', '
+					. '1, '
+					. (int) $item->state . ', '
+					. (int) $item->access . ', '
+					. $db->quote($item->language) . ', '
+					. (int) $item->type_id . ', '
+					. $db->quote(serialize($item)) . ', '
+					. $db->quote($item->publish_start_date) . ', '
+					. $db->quote($item->publish_end_date) . ', '
+					. $db->quote($item->start_date) . ', '
+					. $db->quote($item->end_date) . ', '
+					. (double) ($item->list_price ?: 0) . ', '
+					. (double) ($item->sale_price ?: 0)
+				);
+			$db->setQuery($query);
+			$db->execute();
+
+			// Get the link id.
+			$linkId = (int) $db->insertid();
+		}
+		else
+		{
+			// Update the link.
+			$query->clear()
+				->update($db->quoteName('#__finder_links'))
+				->set($db->quoteName('route') . ' = ' . $db->quote($item->route))
+				->set($db->quoteName('title') . ' = ' . $db->quote($item->title))
+				->set($db->quoteName('description') . ' = ' . $db->quote($item->description))
+				->set($db->quoteName('indexdate') . ' = ' . $query->currentTimestamp())
+				->set($db->quoteName('state') . ' = ' . (int) $item->state)
+				->set($db->quoteName('access') . ' = ' . (int) $item->access)
+				->set($db->quoteName('language') . ' = ' . $db->quote($item->language))
+				->set($db->quoteName('type_id') . ' = ' . (int) $item->type_id)
+				->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
+				->set($db->quoteName('publish_start_date') . ' = ' . $db->quote($item->publish_start_date))
+				->set($db->quoteName('publish_end_date') . ' = ' . $db->quote($item->publish_end_date))
+				->set($db->quoteName('start_date') . ' = ' . $db->quote($item->start_date))
+				->set($db->quoteName('end_date') . ' = ' . $db->quote($item->end_date))
+				->set($db->quoteName('list_price') . ' = ' . (double) ($item->list_price ?: 0))
+				->set($db->quoteName('sale_price') . ' = ' . (double) ($item->sale_price ?: 0))
+				->where('link_id = ' . (int) $linkId);
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Set up the variables we will need during processing.
+		$count = 0;
+
+		// Mark afterLinking in the profiler.
+		static::$profiler ? static::$profiler->mark('afterLinking') : null;
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		/*
+		 * Process the item's content. The items can customize their
+		 * processing instructions to define extra properties to process
+		 * or rearrange how properties are weighted.
+		 */
+		foreach ($item->getInstructions() as $group => $properties)
+		{
+			// Iterate through the properties of the group.
+			foreach ($properties as $property)
+			{
+				// Check if the property exists in the item.
+				if (empty($item->$property))
+				{
+					continue;
+				}
+
+				// Tokenize the property.
+				if (is_array($item->$property))
+				{
+					// Tokenize an array of content and add it to the database.
+					foreach ($item->$property as $ip)
+					{
+						/*
+						 * If the group is path, we need to a few extra processing
+						 * steps to strip the extension and convert slashes and dashes
+						 * to spaces.
+						 */
+						if ($group === static::PATH_CONTEXT)
+						{
+							$ip = JFile::stripExt($ip);
+							$ip = str_replace('/', ' ', $ip);
+							$ip = str_replace('-', ' ', $ip);
+						}
+
+						// Tokenize a string of content and add it to the database.
+						$count += $this->tokenizeToDb($ip, $group, $item->language, $format);
+
+						// Check if we're approaching the memory limit of the token table.
+						if ($count > static::$state->options->get('memory_table_limit', 30000))
+						{
+							$this->toggleTables(false);
+						}
+					}
+				}
+				else
+				{
+					/*
+					 * If the group is path, we need to a few extra processing
+					 * steps to strip the extension and convert slashes and dashes
+					 * to spaces.
+					 */
+					if ($group === static::PATH_CONTEXT)
+					{
+						$item->$property = JFile::stripExt($item->$property);
+						$item->$property = str_replace('/', ' ', $item->$property);
+						$item->$property = str_replace('-', ' ', $item->$property);
+					}
+
+					// Tokenize a string of content and add it to the database.
+					$count += $this->tokenizeToDb($item->$property, $group, $item->language, $format);
+
+					// Check if we're approaching the memory limit of the token table.
+					if ($count > static::$state->options->get('memory_table_limit', 30000))
+					{
+						$this->toggleTables(false);
+					}
+				}
+			}
+		}
+
+		/*
+		 * Process the item's taxonomy. The items can customize their
+		 * taxonomy mappings to define extra properties to map.
+		 */
+		foreach ($item->getTaxonomy() as $branch => $nodes)
+		{
+			// Iterate through the nodes and map them to the branch.
+			foreach ($nodes as $node)
+			{
+				// Add the node to the tree.
+				$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access);
+
+				// Add the link => node map.
+				FinderIndexerTaxonomy::addMap($linkId, $nodeId);
+
+				// Tokenize the node title and add them to the database.
+				$count += $this->tokenizeToDb($node->title, static::META_CONTEXT, $item->language, $format);
+			}
+		}
+
+		// Mark afterProcessing in the profiler.
+		static::$profiler ? static::$profiler->mark('afterProcessing') : null;
+
+		/*
+		 * At this point, all of the item's content has been parsed, tokenized
+		 * and inserted into the #__finder_tokens table. Now, we need to
+		 * aggregate all the data into that table into a more usable form. The
+		 * aggregated data will be inserted into #__finder_tokens_aggregate
+		 * table.
+		 */
+		$query = 'INSERT INTO ' . $db->quoteName('#__finder_tokens_aggregate') .
+			' (' . $db->quoteName('term_id') .
+			', ' . $db->quoteName('map_suffix') .
+				', ' . $db->quoteName('term') .
+			', ' . $db->quoteName('stem') .
+			', ' . $db->quoteName('common') .
+			', ' . $db->quoteName('phrase') .
+			', ' . $db->quoteName('term_weight') .
+			', ' . $db->quoteName('context') .
+			', ' . $db->quoteName('context_weight') .
+			', ' . $db->quoteName('total_weight') .
+				', ' . $db->quoteName('language') . ')' .
+			' SELECT' .
+			' COALESCE(t.term_id, 0), \'\', t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
+			' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, 0, t1.language' .
+			' FROM (' .
+			'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+			'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
+			'   WHERE t1.context = %d' .
+			' ) AS t1' .
+			' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
+			' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
+			' WHERE t2.context = %d' .
+			' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+			' ORDER BY t1.term DESC';
+
+		// Iterate through the contexts and aggregate the tokens per context.
+		foreach ($state->weights as $context => $multiplier)
+		{
+			// Run the query to aggregate the tokens for this context..
+			$db->setQuery(sprintf($query, $multiplier, $context, $context));
+			$db->execute();
+		}
+
+		// Mark afterAggregating in the profiler.
+		static::$profiler ? static::$profiler->mark('afterAggregating') : null;
+
+		/*
+		 * When we pulled down all of the aggregate data, we did a LEFT JOIN
+		 * over the terms table to try to find all the term ids that
+		 * already exist for our tokens. If any of the rows in the aggregate
+		 * table have a term of 0, then no term record exists for that
+		 * term so we need to add it to the terms table.
+		 */
+		$db->setQuery(
+			'INSERT IGNORE INTO ' . $db->quoteName('#__finder_terms') .
+			' (' . $db->quoteName('term') .
+			', ' . $db->quoteName('stem') .
+			', ' . $db->quoteName('common') .
+			', ' . $db->quoteName('phrase') .
+			', ' . $db->quoteName('weight') .
+			', ' . $db->quoteName('soundex') .
+			', ' . $db->quoteName('language') . ')' .
+			' SELECT ta.term, ta.stem, ta.common, ta.phrase, ta.term_weight, SOUNDEX(ta.term), ta.language' .
+			' FROM ' . $db->quoteName('#__finder_tokens_aggregate') . ' AS ta' .
+			' WHERE ta.term_id = 0' .
+			' GROUP BY ta.term, ta.stem, ta.common, ta.phrase, ta.term_weight, SOUNDEX(ta.term), ta.language'
+		);
+		$db->execute();
+
+		/*
+		 * Now, we just inserted a bunch of new records into the terms table
+		 * so we need to go back and update the aggregate table with all the
+		 * new term ids.
+		 */
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__finder_tokens_aggregate') . ' AS ta')
+			->join('INNER', $db->quoteName('#__finder_terms') . ' AS t ON t.term = ta.term')
+			->set('ta.term_id = t.term_id')
+			->where('ta.term_id = 0');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterTerms in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTerms') : null;
+
+		/*
+		 * After we've made sure that all of the terms are in the terms table
+		 * and the aggregate table has the correct term ids, we need to update
+		 * the links counter for each term by one.
+		 */
+		$query->clear()
+			->update($db->quoteName('#__finder_terms') . ' AS t')
+			->join('INNER', $db->quoteName('#__finder_tokens_aggregate') . ' AS ta ON ta.term_id = t.term_id')
+			->set('t.' . $db->quoteName('links') . ' = t.links + 1');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterTerms in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTerms') : null;
+
+		/*
+		 * Before we can insert all of the mapping rows, we have to figure out
+		 * which mapping table the rows need to be inserted into. The mapping
+		 * table for each term is based on the first character of the md5 of
+		 * the first character of the term. In php, it would be expressed as
+		 * substr(md5(substr($token, 0, 1)), 0, 1)
+		 */
+		$query->clear()
+			->update($db->quoteName('#__finder_tokens_aggregate'))
+			->set($db->quoteName('map_suffix') . ' = SUBSTR(MD5(SUBSTR(' . $db->quoteName('term') . ', 1, 1)), 1, 1)');
+		$db->setQuery($query);
+		$db->execute();
+
+		/*
+		 * At this point, the aggregate table contains a record for each
+		 * term in each context. So, we're going to pull down all of that
+		 * data while grouping the records by term and add all of the
+		 * sub-totals together to arrive at the final total for each token for
+		 * this link. Then, we insert all of that data into the appropriate
+		 * mapping table.
+		 */
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Get the mapping table suffix.
+			$suffix = dechex($i);
+
+			/*
+			 * We have to run this query 16 times, one for each link => term
+			 * mapping table.
+			 */
+			$db->setQuery(
+				'INSERT INTO ' . $db->quoteName('#__finder_links_terms' . $suffix) .
+				' (' . $db->quoteName('link_id') .
+				', ' . $db->quoteName('term_id') .
+				', ' . $db->quoteName('weight') . ')' .
+				' SELECT ' . (int) $linkId . ', ' . $db->quoteName('term_id') . ',' .
+				' ROUND(SUM(' . $db->quoteName('context_weight') . '), 8)' .
+				' FROM ' . $db->quoteName('#__finder_tokens_aggregate') .
+				' WHERE ' . $db->quoteName('map_suffix') . ' = ' . $db->quote($suffix) .
+				' GROUP BY ' . $db->quoteName('term') . ', ' . $db->quoteName('term_id') .
+				' ORDER BY ' . $db->quoteName('term') . ' DESC'
+			);
+			$db->execute();
+		}
+
+		// Mark afterMapping in the profiler.
+		static::$profiler ? static::$profiler->mark('afterMapping') : null;
+
+		// Update the signature.
+		$query->clear()
+			->update($db->quoteName('#__finder_links'))
+			->set($db->quoteName('md5sum') . ' = ' . $db->quote($curSig))
+			->where($db->quoteName('link_id') . ' = ' . $db->quote($linkId));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterSigning in the profiler.
+		static::$profiler ? static::$profiler->mark('afterSigning') : null;
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		// Toggle the token tables back to memory tables.
+		$this->toggleTables(true);
+
+		// Mark afterTruncating in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTruncating') : null;
+
+		return $linkId;
+	}
+
+	/**
+	 * Method to optimize the index. We use this method to remove unused terms
+	 * and any other optimizations that might be necessary.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.0
+	 * @throws  Exception on database error.
+	 */
+	public function optimize()
+	{
+		// Get the database object.
+		$db = $this->db;
+		$query = $db->getQuery(true);
+
+		// Delete all orphaned terms.
+		$query->delete($db->quoteName('#__finder_terms'))
+			->where($db->quoteName('links') . ' <= 0');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Optimize the links table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_links'));
+		$db->execute();
+
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Optimize the terms mapping table.
+			$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_links_terms' . dechex($i)));
+			$db->execute();
+		}
+
+		// Optimize the filters table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_filters'));
+		$db->execute();
+
+		// Optimize the terms common table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_terms_common'));
+		$db->execute();
+
+		// Optimize the types table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_types'));
+		$db->execute();
+
+		// Remove the orphaned taxonomy nodes.
+		FinderIndexerTaxonomy::removeOrphanNodes();
+
+		// Optimize the taxonomy mapping table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_taxonomy_map'));
+		$db->execute();
+
+		// Optimize the taxonomy table.
+		$db->setQuery('OPTIMIZE TABLE ' . $db->quoteName('#__finder_taxonomy'));
+		$db->execute();
+
+		return true;
+	}
+
+
+	/**
+	 * Method to switch the token tables from Memory tables to MyISAM tables
+	 * when they are close to running out of memory.
+	 *
+	 * @param   boolean  $memory  Flag to control how they should be toggled.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.0
+	 * @throws  Exception on database error.
+	 */
+	protected function toggleTables($memory)
+	{
+		static $state;
+
+		// Get the database adapter.
+		$db = $this->db;
+
+		// Check if we are setting the tables to the Memory engine.
+		if ($memory === true && $state !== true)
+		{
+			// Set the tokens table to Memory.
+			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens') . ' ENGINE = MEMORY');
+			$db->execute();
+
+			// Set the tokens aggregate table to Memory.
+			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens_aggregate') . ' ENGINE = MEMORY');
+			$db->execute();
+
+			// Set the internal state.
+			$state = $memory;
+		}
+		// We must be setting the tables to the MyISAM engine.
+		elseif ($memory === false && $state !== false)
+		{
+			// Set the tokens table to MyISAM.
+			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens') . ' ENGINE = MYISAM');
+			$db->execute();
+
+			// Set the tokens aggregate table to MyISAM.
+			$db->setQuery('ALTER TABLE ' . $db->quoteName('#__finder_tokens_aggregate') . ' ENGINE = MYISAM');
+			$db->execute();
+
+			// Set the internal state.
+			$state = $memory;
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/core/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
new file mode 100644
index 00000000..cc3a3205
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
@@ -0,0 +1,516 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.file');
+
+/**
+ * Indexer class supporting PostgreSQL for the Finder indexer package.
+ *
+ * @since  3.0
+ */
+class FinderIndexerDriverPostgresql extends FinderIndexer
+{
+	/**
+	 * Method to index a content item.
+	 *
+	 * @param   FinderIndexerResult  $item    The content item to index.
+	 * @param   string               $format  The format of the content. [optional]
+	 *
+	 * @return  integer  The ID of the record in the links table.
+	 *
+	 * @since   3.0
+	 * @throws  Exception on database error.
+	 */
+	public function index($item, $format = 'html')
+	{
+		// Mark beforeIndexing in the profiler.
+		static::$profiler ? static::$profiler->mark('beforeIndexing') : null;
+		$db = $this->db;
+		$nd = $db->getNullDate();
+
+		// Check if the item is in the database.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('link_id') . ', ' . $db->quoteName('md5sum'))
+			->from($db->quoteName('#__finder_links'))
+			->where($db->quoteName('url') . ' = ' . $db->quote($item->url));
+
+		// Load the item  from the database.
+		$db->setQuery($query);
+		$link = $db->loadObject();
+
+		// Get the indexer state.
+		$state = static::getState();
+
+		// Get the signatures of the item.
+		$curSig = static::getSignature($item);
+		$oldSig = isset($link->md5sum) ? $link->md5sum : null;
+
+		// Get the other item information.
+		$linkId = empty($link->link_id) ? null : $link->link_id;
+		$isNew = empty($link->link_id) ? true : false;
+
+		// Check the signatures. If they match, the item is up to date.
+		if (!$isNew && $curSig == $oldSig)
+		{
+			return $linkId;
+		}
+
+		/*
+		 * If the link already exists, flush all the term maps for the item.
+		 * Maps are stored in 16 tables so we need to iterate through and flush
+		 * each table one at a time.
+		 */
+		if (!$isNew)
+		{
+			for ($i = 0; $i <= 15; $i++)
+			{
+				// Flush the maps for the link.
+				$query->clear()
+					->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
+					->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+				$db->setQuery($query);
+				$db->execute();
+			}
+
+			// Remove the taxonomy maps.
+			FinderIndexerTaxonomy::removeMaps($linkId);
+		}
+
+		// Mark afterUnmapping in the profiler.
+		static::$profiler ? static::$profiler->mark('afterUnmapping') : null;
+
+		// Perform cleanup on the item data.
+		$item->publish_start_date = (int) $item->publish_start_date != 0 ? $item->publish_start_date : $nd;
+		$item->publish_end_date = (int) $item->publish_end_date != 0 ? $item->publish_end_date : $nd;
+		$item->start_date = (int) $item->start_date != 0 ? $item->start_date : $nd;
+		$item->end_date = (int) $item->end_date != 0 ? $item->end_date : $nd;
+
+		// Prepare the item description.
+		$item->description = FinderIndexerHelper::parse($item->summary);
+
+		/*
+		 * Now, we need to enter the item into the links table. If the item
+		 * already exists in the database, we need to use an UPDATE query.
+		 * Otherwise, we need to use an INSERT to get the link id back.
+		 */
+
+		if ($isNew)
+		{
+			$columnsArray = array(
+				$db->quoteName('url'), $db->quoteName('route'), $db->quoteName('title'), $db->quoteName('description'),
+				$db->quoteName('indexdate'), $db->quoteName('published'), $db->quoteName('state'), $db->quoteName('access'),
+				$db->quoteName('language'), $db->quoteName('type_id'), $db->quoteName('object'), $db->quoteName('publish_start_date'),
+				$db->quoteName('publish_end_date'), $db->quoteName('start_date'), $db->quoteName('end_date'), $db->quoteName('list_price'),
+				$db->quoteName('sale_price')
+			);
+
+			// Insert the link.
+			$query->clear()
+				->insert($db->quoteName('#__finder_links'))
+				->columns($columnsArray)
+				->values(
+					$db->quote($item->url) . ', '
+					. $db->quote($item->route) . ', '
+					. $db->quote($item->title) . ', '
+					. $db->quote($item->description) . ', '
+					. $query->currentTimestamp() . ', '
+					. '1, '
+					. (int) $item->state . ', '
+					. (int) $item->access . ', '
+					. $db->quote($item->language) . ', '
+					. (int) $item->type_id . ', '
+					. $db->quote(serialize($item)) . ', '
+					. $db->quote($item->publish_start_date) . ', '
+					. $db->quote($item->publish_end_date) . ', '
+					. $db->quote($item->start_date) . ', '
+					. $db->quote($item->end_date) . ', '
+					. (double) ($item->list_price ?: 0) . ', '
+					. (double) ($item->sale_price ?: 0)
+				);
+			$db->setQuery($query);
+			$db->execute();
+
+			// Get the link id.
+			$linkId = (int) $db->insertid();
+		}
+		else
+		{
+			// Update the link.
+			$query->clear()
+				->update($db->quoteName('#__finder_links'))
+				->set($db->quoteName('route') . ' = ' . $db->quote($item->route))
+				->set($db->quoteName('title') . ' = ' . $db->quote($item->title))
+				->set($db->quoteName('description') . ' = ' . $db->quote($item->description))
+				->set($db->quoteName('indexdate') . ' = ' . $query->currentTimestamp())
+				->set($db->quoteName('state') . ' = ' . (int) $item->state)
+				->set($db->quoteName('access') . ' = ' . (int) $item->access)
+				->set($db->quoteName('language') . ' = ' . $db->quote($item->language))
+				->set($db->quoteName('type_id') . ' = ' . (int) $item->type_id)
+				->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
+				->set($db->quoteName('publish_start_date') . ' = ' . $db->quote($item->publish_start_date))
+				->set($db->quoteName('publish_end_date') . ' = ' . $db->quote($item->publish_end_date))
+				->set($db->quoteName('start_date') . ' = ' . $db->quote($item->start_date))
+				->set($db->quoteName('end_date') . ' = ' . $db->quote($item->end_date))
+				->set($db->quoteName('list_price') . ' = ' . (double) ($item->list_price ?: 0))
+				->set($db->quoteName('sale_price') . ' = ' . (double) ($item->sale_price ?: 0))
+				->where('link_id = ' . (int) $linkId);
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Set up the variables we will need during processing.
+		$count = 0;
+
+		// Mark afterLinking in the profiler.
+		static::$profiler ? static::$profiler->mark('afterLinking') : null;
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		/*
+		 * Process the item's content. The items can customize their
+		 * processing instructions to define extra properties to process
+		 * or rearrange how properties are weighted.
+		 */
+		foreach ($item->getInstructions() as $group => $properties)
+		{
+			// Iterate through the properties of the group.
+			foreach ($properties as $property)
+			{
+				// Check if the property exists in the item.
+				if (empty($item->$property))
+				{
+					continue;
+				}
+
+				// Tokenize the property.
+				if (is_array($item->$property))
+				{
+					// Tokenize an array of content and add it to the database.
+					foreach ($item->$property as $ip)
+					{
+						/*
+						 * If the group is path, we need to a few extra processing
+						 * steps to strip the extension and convert slashes and dashes
+						 * to spaces.
+						 */
+						if ($group === static::PATH_CONTEXT)
+						{
+							$ip = JFile::stripExt($ip);
+							$ip = str_replace('/', ' ', $ip);
+							$ip = str_replace('-', ' ', $ip);
+						}
+
+						// Tokenize a string of content and add it to the database.
+						$count += $this->tokenizeToDb($ip, $group, $item->language, $format);
+
+						// Check if we're approaching the memory limit of the token table.
+						if ($count > static::$state->options->get('memory_table_limit', 30000))
+						{
+							$this->toggleTables(false);
+						}
+					}
+				}
+				else
+				{
+					/*
+					 * If the group is path, we need to a few extra processing
+					 * steps to strip the extension and convert slashes and dashes
+					 * to spaces.
+					 */
+					if ($group === static::PATH_CONTEXT)
+					{
+						$item->$property = JFile::stripExt($item->$property);
+						$item->$property = str_replace('/', ' ', $item->$property);
+						$item->$property = str_replace('-', ' ', $item->$property);
+					}
+
+					// Tokenize a string of content and add it to the database.
+					$count += $this->tokenizeToDb($item->$property, $group, $item->language, $format);
+
+					// Check if we're approaching the memory limit of the token table.
+					if ($count > static::$state->options->get('memory_table_limit', 30000))
+					{
+						$this->toggleTables(false);
+					}
+				}
+			}
+		}
+
+		/*
+		 * Process the item's taxonomy. The items can customize their
+		 * taxonomy mappings to define extra properties to map.
+		 */
+		foreach ($item->getTaxonomy() as $branch => $nodes)
+		{
+			// Iterate through the nodes and map them to the branch.
+			foreach ($nodes as $node)
+			{
+				// Add the node to the tree.
+				$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access);
+
+				// Add the link => node map.
+				FinderIndexerTaxonomy::addMap($linkId, $nodeId);
+
+				// Tokenize the node title and add them to the database.
+				$count += $this->tokenizeToDb($node->title, static::META_CONTEXT, $item->language, $format);
+			}
+		}
+
+		// Mark afterProcessing in the profiler.
+		static::$profiler ? static::$profiler->mark('afterProcessing') : null;
+
+		/*
+		 * At this point, all of the item's content has been parsed, tokenized
+		 * and inserted into the #__finder_tokens table. Now, we need to
+		 * aggregate all the data into that table into a more usable form. The
+		 * aggregated data will be inserted into #__finder_tokens_aggregate
+		 * table.
+		 */
+		$query = 'INSERT INTO ' . $db->quoteName('#__finder_tokens_aggregate') .
+				' (' . $db->quoteName('term_id') .
+				', ' . $db->quoteName('term') .
+				', ' . $db->quoteName('stem') .
+				', ' . $db->quoteName('common') .
+				', ' . $db->quoteName('phrase') .
+				', ' . $db->quoteName('term_weight') .
+				', ' . $db->quoteName('context') .
+				', ' . $db->quoteName('context_weight') .
+				', ' . $db->quoteName('language') . ')' .
+				' SELECT' .
+				' t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
+				' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, t1.language' .
+				' FROM (' .
+				'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+				'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
+				'   WHERE t1.context = %d' .
+				' ) AS t1' .
+				' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
+				' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
+				' WHERE t2.context = %d AND t.term_id IS NOT NULL' .
+				' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+				' ORDER BY t1.term DESC';
+
+		// Iterate through the contexts and aggregate the tokens per context.
+		foreach ($state->weights as $context => $multiplier)
+		{
+			// Run the query to aggregate the tokens for this context..
+			$db->setQuery(sprintf($query, $multiplier, $context, $context));
+			$db->execute();
+		}
+
+		// Mark afterAggregating in the profiler.
+		static::$profiler ? static::$profiler->mark('afterAggregating') : null;
+
+		/*
+		 * When we pulled down all of the aggregate data, we did a LEFT JOIN
+		 * over the terms table to try to find all the term ids that
+		 * already exist for our tokens. If any of the rows in the aggregate
+		 * table have a term of 0, then no term record exists for that
+		 * term so we need to add it to the terms table.
+		 */
+
+		// Emulation of IGNORE INTO behaviour
+		$db->setQuery(
+			' SELECT ta.term' .
+			' FROM ' . $db->quoteName('#__finder_tokens_aggregate') . ' AS ta' .
+			' WHERE ta.term_id = 0'
+		);
+
+		if ($db->loadRow() == null)
+		{
+			$db->setQuery(
+				'INSERT INTO ' . $db->quoteName('#__finder_terms') .
+				' (' . $db->quoteName('term') .
+				', ' . $db->quoteName('stem') .
+				', ' . $db->quoteName('common') .
+				', ' . $db->quoteName('phrase') .
+				', ' . $db->quoteName('weight') .
+				', ' . $db->quoteName('soundex') .
+				', ' . $db->quoteName('language') . ')' .
+				' SELECT ta.term, ta.stem, ta.common, ta.phrase, ta.term_weight, SOUNDEX(ta.term), ta.language' .
+				' FROM ' . $db->quoteName('#__finder_tokens_aggregate') . ' AS ta' .
+				' WHERE ta.term_id = 0' .
+				' GROUP BY ta.term, ta.stem, ta.common, ta.phrase, ta.term_weight, SOUNDEX(ta.term), ta.language'
+			);
+			$db->execute();
+		}
+
+		/*
+		 * Now, we just inserted a bunch of new records into the terms table
+		 * so we need to go back and update the aggregate table with all the
+		 * new term ids.
+		 */
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__finder_tokens_aggregate') . ' AS ta')
+			->join('INNER', $db->quoteName('#__finder_terms') . ' AS t ON t.term = ta.term')
+			->set('term_id = t.term_id')
+			->where('ta.term_id = 0');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterTerms in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTerms') : null;
+
+		/*
+		 * After we've made sure that all of the terms are in the terms table
+		 * and the aggregate table has the correct term ids, we need to update
+		 * the links counter for each term by one.
+		 */
+		$query->clear()
+			->update($db->quoteName('#__finder_terms') . ' AS t')
+			->join('INNER', $db->quoteName('#__finder_tokens_aggregate') . ' AS ta ON ta.term_id = t.term_id')
+			->set($db->quoteName('links') . ' = t.links + 1');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterTerms in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTerms') : null;
+
+		/*
+		 * Before we can insert all of the mapping rows, we have to figure out
+		 * which mapping table the rows need to be inserted into. The mapping
+		 * table for each term is based on the first character of the md5 of
+		 * the first character of the term. In php, it would be expressed as
+		 * substr(md5(substr($token, 0, 1)), 0, 1)
+		 */
+		$query->clear()
+			->update($db->quoteName('#__finder_tokens_aggregate'))
+			->set($db->quoteName('map_suffix') . ' = SUBSTR(MD5(SUBSTR(' . $db->quoteName('term') . ', 1, 1)), 1, 1)');
+		$db->setQuery($query);
+		$db->execute();
+
+		/*
+		 * At this point, the aggregate table contains a record for each
+		 * term in each context. So, we're going to pull down all of that
+		 * data while grouping the records by term and add all of the
+		 * sub-totals together to arrive at the final total for each token for
+		 * this link. Then, we insert all of that data into the appropriate
+		 * mapping table.
+		 */
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Get the mapping table suffix.
+			$suffix = dechex($i);
+
+			/*
+			 * We have to run this query 16 times, one for each link => term
+			 * mapping table.
+			 */
+			$db->setQuery(
+				'INSERT INTO ' . $db->quoteName('#__finder_links_terms' . $suffix) .
+				' (' . $db->quoteName('link_id') .
+				', ' . $db->quoteName('term_id') .
+				', ' . $db->quoteName('weight') . ')' .
+				' SELECT ' . (int) $linkId . ', ' . $db->quoteName('term_id') . ',' .
+				' ROUND(SUM(' . $db->quoteName('context_weight') . '), 8)' .
+				' FROM ' . $db->quoteName('#__finder_tokens_aggregate') .
+				' WHERE ' . $db->quoteName('map_suffix') . ' = ' . $db->quote($suffix) .
+				' GROUP BY ' . $db->quoteName('term') . ', ' . $db->quoteName('term_id') .
+				' ORDER BY ' . $db->quoteName('term') . ' DESC'
+			);
+			$db->execute();
+		}
+
+		// Mark afterMapping in the profiler.
+		static::$profiler ? static::$profiler->mark('afterMapping') : null;
+
+		// Update the signature.
+		$query->clear()
+			->update($db->quoteName('#__finder_links'))
+			->set($db->quoteName('md5sum') . ' = ' . $db->quote($curSig))
+			->where($db->quoteName('link_id') . ' = ' . $db->quote($linkId));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterSigning in the profiler.
+		static::$profiler ? static::$profiler->mark('afterSigning') : null;
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		// Toggle the token tables back to memory tables.
+		$this->toggleTables(true);
+
+		// Mark afterTruncating in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTruncating') : null;
+
+		return $linkId;
+	}
+
+	/**
+	 * Method to optimize the index. We use this method to remove unused terms
+	 * and any other optimizations that might be necessary.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function optimize()
+	{
+		// Get the database object.
+		$db = $this->db;
+		$query = $db->getQuery(true);
+
+		// Delete all orphaned terms.
+		$query->delete($db->quoteName('#__finder_terms'))
+			->where($db->quoteName('links') . ' <= 0');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Optimize the links table.
+		$db->setQuery('VACUUM ' . $db->quoteName('#__finder_links'));
+		$db->execute();
+		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_links'));
+		$db->execute();
+
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Optimize the terms mapping table.
+			$db->setQuery('VACUUM ' . $db->quoteName('#__finder_links_terms' . dechex($i)));
+			$db->execute();
+			$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_links_terms' . dechex($i)));
+			$db->execute();
+		}
+
+		// Optimize the filters table.
+		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_filters'));
+		$db->execute();
+
+		// Optimize the terms common table.
+		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_terms_common'));
+		$db->execute();
+
+		// Optimize the types table.
+		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_types'));
+		$db->execute();
+
+		// Remove the orphaned taxonomy nodes.
+		FinderIndexerTaxonomy::removeOrphanNodes();
+
+		// Optimize the taxonomy mapping table.
+		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_taxonomy_map'));
+		$db->execute();
+
+		// Optimize the taxonomy table.
+		$db->setQuery('REINDEX TABLE ' . $db->quoteName('#__finder_taxonomy'));
+		$db->execute();
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php b/core/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
new file mode 100644
index 00000000..dd975dc1
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
@@ -0,0 +1,531 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.file');
+
+/**
+ * Indexer class supporting SQL Server for the Finder indexer package.
+ *
+ * The indexer class provides the core functionality of the Finder
+ * search engine. It is responsible for adding and updating the
+ * content links table; extracting and scoring tokens; and maintaining
+ * all referential information for the content.
+ *
+ * Note: All exceptions thrown from within this class should be caught
+ * by the controller.
+ *
+ * @since  3.1
+ */
+class FinderIndexerDriverSqlsrv extends FinderIndexer
+{
+	/**
+	 * Method to index a content item.
+	 *
+	 * @param   FinderIndexerResult  $item    The content item to index.
+	 * @param   string               $format  The format of the content. [optional]
+	 *
+	 * @return  integer  The ID of the record in the links table.
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	public function index($item, $format = 'html')
+	{
+		// Mark beforeIndexing in the profiler.
+		static::$profiler ? static::$profiler->mark('beforeIndexing') : null;
+		$db = $this->db;
+		$nd = $db->getNullDate();
+
+		// Check if the item is in the database.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('link_id') . ', ' . $db->quoteName('md5sum'))
+			->from($db->quoteName('#__finder_links'))
+			->where($db->quoteName('url') . ' = ' . $db->quote($item->url));
+
+		// Load the item  from the database.
+		$db->setQuery($query);
+		$link = $db->loadObject();
+
+		// Get the indexer state.
+		$state = static::getState();
+
+		// Get the signatures of the item.
+		$curSig = static::getSignature($item);
+		$oldSig = isset($link->md5sum) ? $link->md5sum : null;
+
+		// Get the other item information.
+		$linkId = empty($link->link_id) ? null : $link->link_id;
+		$isNew = empty($link->link_id) ? true : false;
+
+		// Check the signatures. If they match, the item is up to date.
+		if (!$isNew && $curSig == $oldSig)
+		{
+			return $linkId;
+		}
+
+		/*
+		 * If the link already exists, flush all the term maps for the item.
+		 * Maps are stored in 16 tables so we need to iterate through and flush
+		 * each table one at a time.
+		 */
+		if (!$isNew)
+		{
+			for ($i = 0; $i <= 15; $i++)
+			{
+				// Flush the maps for the link.
+				$query->clear()
+					->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
+					->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+				$db->setQuery($query);
+				$db->execute();
+			}
+
+			// Remove the taxonomy maps.
+			FinderIndexerTaxonomy::removeMaps($linkId);
+		}
+
+		// Mark afterUnmapping in the profiler.
+		static::$profiler ? static::$profiler->mark('afterUnmapping') : null;
+
+		// Perform cleanup on the item data.
+		$item->publish_start_date = (int) $item->publish_start_date != 0 ? $item->publish_start_date : $nd;
+		$item->publish_end_date = (int) $item->publish_end_date != 0 ? $item->publish_end_date : $nd;
+		$item->start_date = (int) $item->start_date != 0 ? $item->start_date : $nd;
+		$item->end_date = (int) $item->end_date != 0 ? $item->end_date : $nd;
+
+		// Prepare the item description.
+		$item->description = FinderIndexerHelper::parse($item->summary);
+
+		/*
+		 * Now, we need to enter the item into the links table. If the item
+		 * already exists in the database, we need to use an UPDATE query.
+		 * Otherwise, we need to use an INSERT to get the link id back.
+		 */
+
+		if ($isNew)
+		{
+			$columnsArray = array(
+				$db->quoteName('url'), $db->quoteName('route'), $db->quoteName('title'), $db->quoteName('description'),
+				$db->quoteName('indexdate'), $db->quoteName('published'), $db->quoteName('state'), $db->quoteName('access'),
+				$db->quoteName('language'), $db->quoteName('type_id'), $db->quoteName('object'), $db->quoteName('publish_start_date'),
+				$db->quoteName('publish_end_date'), $db->quoteName('start_date'), $db->quoteName('end_date'), $db->quoteName('list_price'),
+				$db->quoteName('sale_price')
+			);
+
+			// Insert the link.
+			$query->clear()
+				->insert($db->quoteName('#__finder_links'))
+				->columns($columnsArray)
+				->values(
+					$db->quote($item->url) . ', '
+					. $db->quote($item->route) . ', '
+					. $db->quote($item->title) . ', '
+					. $db->quote($item->description) . ', '
+					. $query->currentTimestamp() . ', '
+					. '1, '
+					. (int) $item->state . ', '
+					. (int) $item->access . ', '
+					. $db->quote($item->language) . ', '
+					. (int) $item->type_id . ', '
+					. $db->quote(serialize($item)) . ', '
+					. $db->quote($item->publish_start_date) . ', '
+					. $db->quote($item->publish_end_date) . ', '
+					. $db->quote($item->start_date) . ', '
+					. $db->quote($item->end_date) . ', '
+					. (double) ($item->list_price ?: 0) . ', '
+					. (double) ($item->sale_price ?: 0)
+				);
+			$db->setQuery($query);
+			$db->execute();
+
+			// Get the link id.
+			$linkId = (int) $db->insertid();
+		}
+		else
+		{
+			// Update the link.
+			$query->clear()
+				->update($db->quoteName('#__finder_links'))
+				->set($db->quoteName('route') . ' = ' . $db->quote($item->route))
+				->set($db->quoteName('title') . ' = ' . $db->quote($item->title))
+				->set($db->quoteName('description') . ' = ' . $db->quote($item->description))
+				->set($db->quoteName('indexdate') . ' = ' . $query->currentTimestamp())
+				->set($db->quoteName('state') . ' = ' . (int) $item->state)
+				->set($db->quoteName('access') . ' = ' . (int) $item->access)
+				->set($db->quoteName('language') . ' = ' . $db->quote($item->language))
+				->set($db->quoteName('type_id') . ' = ' . (int) $item->type_id)
+				->set($db->quoteName('object') . ' = ' . $db->quote(serialize($item)))
+				->set($db->quoteName('publish_start_date') . ' = ' . $db->quote($item->publish_start_date))
+				->set($db->quoteName('publish_end_date') . ' = ' . $db->quote($item->publish_end_date))
+				->set($db->quoteName('start_date') . ' = ' . $db->quote($item->start_date))
+				->set($db->quoteName('end_date') . ' = ' . $db->quote($item->end_date))
+				->set($db->quoteName('list_price') . ' = ' . (double) ($item->list_price ?: 0))
+				->set($db->quoteName('sale_price') . ' = ' . (double) ($item->sale_price ?: 0))
+				->where('link_id = ' . (int) $linkId);
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Set up the variables we will need during processing.
+		$count = 0;
+
+		// Mark afterLinking in the profiler.
+		static::$profiler ? static::$profiler->mark('afterLinking') : null;
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		/*
+		 * Process the item's content. The items can customize their
+		 * processing instructions to define extra properties to process
+		 * or rearrange how properties are weighted.
+		 */
+		foreach ($item->getInstructions() as $group => $properties)
+		{
+			// Iterate through the properties of the group.
+			foreach ($properties as $property)
+			{
+				// Check if the property exists in the item.
+				if (empty($item->$property))
+				{
+					continue;
+				}
+
+				// Tokenize the property.
+				if (is_array($item->$property))
+				{
+					// Tokenize an array of content and add it to the database.
+					foreach ($item->$property as $ip)
+					{
+						/*
+						 * If the group is path, we need to a few extra processing
+						 * steps to strip the extension and convert slashes and dashes
+						 * to spaces.
+						 */
+						if ($group === static::PATH_CONTEXT)
+						{
+							$ip = JFile::stripExt($ip);
+							$ip = str_replace('/', ' ', $ip);
+							$ip = str_replace('-', ' ', $ip);
+						}
+
+						// Tokenize a string of content and add it to the database.
+						$count += $this->tokenizeToDb($ip, $group, $item->language, $format);
+
+						// Check if we're approaching the memory limit of the token table.
+						if ($count > static::$state->options->get('memory_table_limit', 30000))
+						{
+							$this->toggleTables(false);
+						}
+					}
+				}
+				else
+				{
+					/*
+					 * If the group is path, we need to a few extra processing
+					 * steps to strip the extension and convert slashes and dashes
+					 * to spaces.
+					 */
+					if ($group === static::PATH_CONTEXT)
+					{
+						$item->$property = JFile::stripExt($item->$property);
+						$item->$property = str_replace('/', ' ', $item->$property);
+						$item->$property = str_replace('-', ' ', $item->$property);
+					}
+
+					// Tokenize a string of content and add it to the database.
+					$count += $this->tokenizeToDb($item->$property, $group, $item->language, $format);
+
+					// Check if we're approaching the memory limit of the token table.
+					if ($count > static::$state->options->get('memory_table_limit', 30000))
+					{
+						$this->toggleTables(false);
+					}
+				}
+			}
+		}
+
+		/*
+		 * Process the item's taxonomy. The items can customize their
+		 * taxonomy mappings to define extra properties to map.
+		 */
+		foreach ($item->getTaxonomy() as $branch => $nodes)
+		{
+			// Iterate through the nodes and map them to the branch.
+			foreach ($nodes as $node)
+			{
+				// Add the node to the tree.
+				$nodeId = FinderIndexerTaxonomy::addNode($branch, $node->title, $node->state, $node->access);
+
+				// Add the link => node map.
+				FinderIndexerTaxonomy::addMap($linkId, $nodeId);
+
+				// Tokenize the node title and add them to the database.
+				$count += $this->tokenizeToDb($node->title, static::META_CONTEXT, $item->language, $format);
+			}
+		}
+
+		// Mark afterProcessing in the profiler.
+		static::$profiler ? static::$profiler->mark('afterProcessing') : null;
+
+		/*
+		 * At this point, all of the item's content has been parsed, tokenized
+		 * and inserted into the #__finder_tokens table. Now, we need to
+		 * aggregate all the data into that table into a more usable form. The
+		 * aggregated data will be inserted into #__finder_tokens_aggregate
+		 * table.
+		 */
+		$query = 'INSERT INTO ' . $db->quoteName('#__finder_tokens_aggregate') .
+				' (' . $db->quoteName('term_id') .
+				', ' . $db->quoteName('term') .
+				', ' . $db->quoteName('stem') .
+				', ' . $db->quoteName('common') .
+				', ' . $db->quoteName('phrase') .
+				', ' . $db->quoteName('term_weight') .
+				', ' . $db->quoteName('context') .
+				', ' . $db->quoteName('context_weight') .
+				', ' . $db->quoteName('language') . ')' .
+				' SELECT' .
+				' t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context,' .
+				' ROUND( t1.weight * COUNT( t2.term ) * %F, 8 ) AS context_weight, t1.language' .
+				' FROM (' .
+				'   SELECT DISTINCT t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+				'   FROM ' . $db->quoteName('#__finder_tokens') . ' AS t1' .
+				'   WHERE t1.context = %d' .
+				' ) AS t1' .
+				' JOIN ' . $db->quoteName('#__finder_tokens') . ' AS t2 ON t2.term = t1.term' .
+				' LEFT JOIN ' . $db->quoteName('#__finder_terms') . ' AS t ON t.term = t1.term' .
+				' WHERE t2.context = %d' .
+				' GROUP BY t1.term, t.term_id, t1.term, t1.stem, t1.common, t1.phrase, t1.weight, t1.context, t1.language' .
+				' ORDER BY t1.term DESC';
+
+		// Iterate through the contexts and aggregate the tokens per context.
+		foreach ($state->weights as $context => $multiplier)
+		{
+			// Run the query to aggregate the tokens for this context..
+			$db->setQuery(sprintf($query, $multiplier, $context, $context));
+			$db->execute();
+		}
+
+		// Mark afterAggregating in the profiler.
+		static::$profiler ? static::$profiler->mark('afterAggregating') : null;
+
+		/*
+		 * When we pulled down all of the aggregate data, we did a LEFT JOIN
+		 * over the terms table to try to find all the term ids that
+		 * already exist for our tokens. If any of the rows in the aggregate
+		 * table have a term of 0, then no term record exists for that
+		 * term so we need to add it to the terms table.
+		 */
+		$db->setQuery(
+			'INSERT INTO ' . $db->quoteName('#__finder_terms') .
+			' (' . $db->quoteName('term') .
+			', ' . $db->quoteName('stem') .
+			', ' . $db->quoteName('common') .
+			', ' . $db->quoteName('phrase') .
+			', ' . $db->quoteName('weight') .
+			', ' . $db->quoteName('soundex') . ')' .
+			' SELECT ta.term, ta.stem, ta.common, ta.phrase, ta.term_weight, SOUNDEX(ta.term)' .
+			' FROM ' . $db->quoteName('#__finder_tokens_aggregate') . ' AS ta' .
+			' WHERE ta.term_id IS NULL' .
+			' GROUP BY ta.term, ta.stem, ta.common, ta.phrase, ta.term_weight'
+		);
+		$db->execute();
+
+		/*
+		 * Now, we just inserted a bunch of new records into the terms table
+		 * so we need to go back and update the aggregate table with all the
+		 * new term ids.
+		 */
+		$query = $db->getQuery(true)
+			->update('ta')
+			->set('ta.term_id = t.term_id from #__finder_tokens_aggregate AS ta INNER JOIN #__finder_terms AS t ON t.term = ta.term')
+			->where('ta.term_id IS NULL');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterTerms in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTerms') : null;
+
+		/*
+		 * After we've made sure that all of the terms are in the terms table
+		 * and the aggregate table has the correct term ids, we need to update
+		 * the links counter for each term by one.
+		 */
+		$query->clear()
+			->update('t')
+			->set('t.links = t.links + 1 FROM #__finder_terms AS t INNER JOIN #__finder_tokens_aggregate AS ta ON ta.term_id = t.term_id');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterTerms in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTerms') : null;
+
+		/*
+		 * Before we can insert all of the mapping rows, we have to figure out
+		 * which mapping table the rows need to be inserted into. The mapping
+		 * table for each term is based on the first character of the md5 of
+		 * the first character of the term. In php, it would be expressed as
+		 * substr(md5(substr($token, 0, 1)), 0, 1)
+		 */
+		$query->clear()
+			->update($db->quoteName('#__finder_tokens_aggregate'))
+			->set($db->quoteName('map_suffix') . " = SUBSTRING(HASHBYTES('MD5', SUBSTRING(" . $db->quoteName('term') . ', 1, 1)), 1, 1)');
+		$db->setQuery($query);
+		$db->execute();
+
+		/*
+		 * At this point, the aggregate table contains a record for each
+		 * term in each context. So, we're going to pull down all of that
+		 * data while grouping the records by term and add all of the
+		 * sub-totals together to arrive at the final total for each token for
+		 * this link. Then, we insert all of that data into the appropriate
+		 * mapping table.
+		 */
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Get the mapping table suffix.
+			$suffix = dechex($i);
+
+			/*
+			 * We have to run this query 16 times, one for each link => term
+			 * mapping table.
+			 */
+			$db->setQuery(
+				'INSERT INTO ' . $db->quoteName('#__finder_links_terms' . $suffix) .
+				' (' . $db->quoteName('link_id') .
+				', ' . $db->quoteName('term_id') .
+				', ' . $db->quoteName('weight') . ')' .
+				' SELECT ' . (int) $linkId . ', ' . $db->quoteName('term_id') . ',' .
+				' ROUND(SUM(' . $db->quoteName('context_weight') . '), 8)' .
+				' FROM ' . $db->quoteName('#__finder_tokens_aggregate') .
+				' WHERE ' . $db->quoteName('map_suffix') . ' = ' . $db->quote($suffix) .
+				' GROUP BY term, term_id' .
+				' ORDER BY ' . $db->quoteName('term') . ' DESC'
+			);
+			$db->execute();
+		}
+
+		// Mark afterMapping in the profiler.
+		static::$profiler ? static::$profiler->mark('afterMapping') : null;
+
+		// Update the signature.
+		$query->clear()
+			->update($db->quoteName('#__finder_links'))
+			->set($db->quoteName('md5sum') . ' = ' . $db->quote($curSig))
+			->where($db->quoteName('link_id') . ' = ' . $db->quote($linkId));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Mark afterSigning in the profiler.
+		static::$profiler ? static::$profiler->mark('afterSigning') : null;
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		// Toggle the token tables back to memory tables.
+		$this->toggleTables(true);
+
+		// Mark afterTruncating in the profiler.
+		static::$profiler ? static::$profiler->mark('afterTruncating') : null;
+
+		return $linkId;
+	}
+
+	/**
+	 * Method to remove a link from the index.
+	 *
+	 * @param   integer  $linkId  The id of the link.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	public function remove($linkId)
+	{
+		$db = $this->db;
+		$query = $db->getQuery(true);
+
+		// Update the link counts and remove the mapping records.
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Update the link counts for the terms.
+			$query->update('t')
+				->set('t.links = t.links - 1 from #__finder_terms AS t INNER JOIN #__finder_links_terms' . dechex($i) . ' AS m ON m.term_id = t.term_id')
+				->where('m.link_id = ' . $db->quote((int) $linkId));
+			$db->setQuery($query);
+			$db->execute();
+
+			// Remove all records from the mapping tables.
+			$query->clear()
+				->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
+				->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Delete all orphaned terms.
+		$query->clear()
+			->delete($db->quoteName('#__finder_terms'))
+			->where($db->quoteName('links') . ' <= 0');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Delete the link from the index.
+		$query->clear()
+			->delete($db->quoteName('#__finder_links'))
+			->where($db->quoteName('link_id') . ' = ' . $db->quote((int) $linkId));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Remove the taxonomy maps.
+		FinderIndexerTaxonomy::removeMaps($linkId);
+
+		// Remove the orphaned taxonomy nodes.
+		FinderIndexerTaxonomy::removeOrphanNodes();
+
+		return true;
+	}
+
+	/**
+	 * Method to optimize the index. We use this method to remove unused terms
+	 * and any other optimizations that might be necessary.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	public function optimize()
+	{
+		// Get the database object.
+		$db = $this->db;
+		$query = $db->getQuery(true);
+
+		// Delete all orphaned terms.
+		$query->delete($db->quoteName('#__finder_terms'))
+			->where($db->quoteName('links') . ' <= 0');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Remove the orphaned taxonomy nodes.
+		FinderIndexerTaxonomy::removeOrphanNodes();
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/helper.php b/core/administrator/components/com_finder/helpers/indexer/helper.php
new file mode 100644
index 00000000..3a8d3768
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/helper.php
@@ -0,0 +1,526 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+JLoader::register('FinderIndexerParser', __DIR__ . '/parser.php');
+JLoader::register('FinderIndexerStemmer', __DIR__ . '/stemmer.php');
+JLoader::register('FinderIndexerToken', __DIR__ . '/token.php');
+
+/**
+ * Helper class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerHelper
+{
+	/**
+	 * The token stemmer object. The stemmer is set by whatever class
+	 * wishes to use it but it must be an instance of FinderIndexerStemmer.
+	 *
+	 * @var		FinderIndexerStemmer
+	 * @since	2.5
+	 */
+	public static $stemmer;
+
+	/**
+	 * A state flag, in order to not constantly check if the stemmer is an instance of FinderIndexerStemmer
+	 *
+	 * @var		boolean
+	 * @since	3.7.0
+	 */
+	protected static $stemmerOK;
+
+	/**
+	 * Method to parse input into plain text.
+	 *
+	 * @param   string  $input   The raw input.
+	 * @param   string  $format  The format of the input. [optional]
+	 *
+	 * @return  string  The parsed input.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on invalid parser.
+	 */
+	public static function parse($input, $format = 'html')
+	{
+		// Get a parser for the specified format and parse the input.
+		return FinderIndexerParser::getInstance($format)->parse($input);
+	}
+
+	/**
+	 * Method to tokenize a text string.
+	 *
+	 * @param   string   $input   The input to tokenize.
+	 * @param   string   $lang    The language of the input.
+	 * @param   boolean  $phrase  Flag to indicate whether input could be a phrase. [optional]
+	 *
+	 * @return  array  An array of FinderIndexerToken objects.
+	 *
+	 * @since   2.5
+	 */
+	public static function tokenize($input, $lang, $phrase = false)
+	{
+		static $cache;
+		$store = StringHelper::strlen($input) < 128 ? md5($input . '::' . $lang . '::' . $phrase) : null;
+
+		// Check if the string has been tokenized already.
+		if ($store && isset($cache[$store]))
+		{
+			return $cache[$store];
+		}
+
+		$tokens = array();
+		$quotes = html_entity_decode('&#8216;&#8217;&#39;', ENT_QUOTES, 'UTF-8');
+
+		// Get the simple language key.
+		$lang = static::getPrimaryLanguage($lang);
+
+		/*
+		 * Parsing the string input into terms is a multi-step process.
+		 *
+		 * Regexes:
+		 *  1. Remove everything except letters, numbers, quotes, apostrophe, plus, dash, period, and comma.
+		 *  2. Remove plus, dash, period, and comma characters located before letter characters.
+		 *  3. Remove plus, dash, period, and comma characters located after other characters.
+		 *  4. Remove plus, period, and comma characters enclosed in alphabetical characters. Ungreedy.
+		 *  5. Remove orphaned apostrophe, plus, dash, period, and comma characters.
+		 *  6. Remove orphaned quote characters.
+		 *  7. Replace the assorted single quotation marks with the ASCII standard single quotation.
+		 *  8. Remove multiple space characters and replaces with a single space.
+		 */
+		$input = StringHelper::strtolower($input);
+		$input = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,]+#mui', ' ', $input);
+		$input = preg_replace('#(^|\s)[+-.,]+([\pL\pM]+)#mui', ' $1', $input);
+		$input = preg_replace('#([\pL\pM\pN]+)[+-.,]+(\s|$)#mui', '$1 ', $input);
+		$input = preg_replace('#([\pL\pM]+)[+.,]+([\pL\pM]+)#muiU', '$1 $2', $input);
+		$input = preg_replace('#(^|\s)[\'+-.,]+(\s|$)#mui', ' ', $input);
+		$input = preg_replace('#(^|\s)[\p{Pi}\p{Pf}]+(\s|$)#mui', ' ', $input);
+		$input = preg_replace('#[' . $quotes . ']+#mui', '\'', $input);
+		$input = preg_replace('#\s+#mui', ' ', $input);
+		$input = trim($input);
+
+		// Explode the normalized string to get the terms.
+		$terms = explode(' ', $input);
+
+		/*
+		 * If we have Unicode support and are dealing with Chinese text, Chinese
+		 * has to be handled specially because there are not necessarily any spaces
+		 * between the "words". So, we have to test if the words belong to the Chinese
+		 * character set and if so, explode them into single glyphs or "words".
+		 */
+		if ($lang === 'zh')
+		{
+			// Iterate through the terms and test if they contain Chinese.
+			for ($i = 0, $n = count($terms); $i < $n; $i++)
+			{
+				$charMatches = array();
+				$charCount = preg_match_all('#[\p{Han}]#mui', $terms[$i], $charMatches);
+
+				// Split apart any groups of Chinese characters.
+				for ($j = 0; $j < $charCount; $j++)
+				{
+					$tSplit = StringHelper::str_ireplace($charMatches[0][$j], '', $terms[$i], false);
+
+					if (!empty($tSplit))
+					{
+						$terms[$i] = $tSplit;
+					}
+					else
+					{
+						unset($terms[$i]);
+					}
+
+					$terms[] = $charMatches[0][$j];
+				}
+			}
+
+			// Reset array keys.
+			$terms = array_values($terms);
+		}
+
+		/*
+		 * If we have to handle the input as a phrase, that means we don't
+		 * tokenize the individual terms and we do not create the two and three
+		 * term combinations. The phrase must contain more than one word!
+		 */
+		if ($phrase === true && count($terms) > 1)
+		{
+			// Create tokens from the phrase.
+			$tokens[] = new FinderIndexerToken($terms, $lang);
+		}
+		else
+		{
+			// Create tokens from the terms.
+			for ($i = 0, $n = count($terms); $i < $n; $i++)
+			{
+				$tokens[] = new FinderIndexerToken($terms[$i], $lang);
+			}
+
+			// Create two and three word phrase tokens from the individual words.
+			for ($i = 0, $n = count($tokens); $i < $n; $i++)
+			{
+				// Setup the phrase positions.
+				$i2 = $i + 1;
+				$i3 = $i + 2;
+
+				// Create the two word phrase.
+				if ($i2 < $n && isset($tokens[$i2]))
+				{
+					// Tokenize the two word phrase.
+					$token = new FinderIndexerToken(array($tokens[$i]->term, $tokens[$i2]->term), $lang, $lang === 'zh' ? '' : ' ');
+					$token->derived = true;
+
+					// Add the token to the stack.
+					$tokens[] = $token;
+				}
+
+				// Create the three word phrase.
+				if ($i3 < $n && isset($tokens[$i3]))
+				{
+					// Tokenize the three word phrase.
+					$token = new FinderIndexerToken(array($tokens[$i]->term, $tokens[$i2]->term, $tokens[$i3]->term), $lang, $lang === 'zh' ? '' : ' ');
+					$token->derived = true;
+
+					// Add the token to the stack.
+					$tokens[] = $token;
+				}
+			}
+		}
+
+		if ($store)
+		{
+			$cache[$store] = count($tokens) > 1 ? $tokens : array_shift($tokens);
+
+			return $cache[$store];
+		}
+		else
+		{
+			return count($tokens) > 1 ? $tokens : array_shift($tokens);
+		}
+	}
+
+	/**
+	 * Method to get the base word of a token. This method uses the public
+	 * {@link FinderIndexerHelper::$stemmer} object if it is set. If no stemmer is set,
+	 * the original token is returned.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   2.5
+	 */
+	public static function stem($token, $lang)
+	{
+		// Trim apostrophes at either end of the token.
+		$token = trim($token, '\'');
+
+		// Trim everything after any apostrophe in the token.
+		if ($res = explode('\'', $token))
+		{
+			$token = $res[0];
+		}
+
+		if (static::$stemmerOK === true)
+		{
+			return static::$stemmer->stem($token, $lang);
+		}
+		else
+		{
+			// Stem the token if we have a valid stemmer to use.
+			if (static::$stemmer instanceof FinderIndexerStemmer)
+			{
+				static::$stemmerOK = true;
+
+				return static::$stemmer->stem($token, $lang);
+			}
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Method to add a content type to the database.
+	 *
+	 * @param   string  $title  The type of content. For example: PDF
+	 * @param   string  $mime   The mime type of the content. For example: PDF [optional]
+	 *
+	 * @return  integer  The id of the content type.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function addContentType($title, $mime = null)
+	{
+		static $types;
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Check if the types are loaded.
+		if (empty($types))
+		{
+			// Build the query to get the types.
+			$query->select('*')
+				->from($db->quoteName('#__finder_types'));
+
+			// Get the types.
+			$db->setQuery($query);
+			$types = $db->loadObjectList('title');
+		}
+
+		// Check if the type already exists.
+		if (isset($types[$title]))
+		{
+			return (int) $types[$title]->id;
+		}
+
+		// Add the type.
+		$query->clear()
+			->insert($db->quoteName('#__finder_types'))
+			->columns(array($db->quoteName('title'), $db->quoteName('mime')))
+			->values($db->quote($title) . ', ' . $db->quote($mime));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Return the new id.
+		return (int) $db->insertid();
+	}
+
+	/**
+	 * Method to check if a token is common in a language.
+	 *
+	 * @param   string  $token  The token to test.
+	 * @param   string  $lang   The language to reference.
+	 *
+	 * @return  boolean  True if common, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function isCommon($token, $lang)
+	{
+		static $data;
+		static $default;
+
+		$langCode = $lang;
+
+		// If language requested is wildcard, use the default language.
+		if ($lang == '*')
+		{
+			$default = $default === null ? substr(self::getDefaultLanguage(), 0, 2) : $default;
+			$langCode = $default;
+		}
+
+		// Load the common tokens for the language if necessary.
+		if (!isset($data[$langCode]))
+		{
+			$data[$langCode] = self::getCommonWords($langCode);
+		}
+
+		// Check if the token is in the common array.
+		return in_array($token, $data[$langCode], true);
+	}
+
+	/**
+	 * Method to get an array of common terms for a language.
+	 *
+	 * @param   string  $lang  The language to use.
+	 *
+	 * @return  array  Array of common terms.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function getCommonWords($lang)
+	{
+		$db = JFactory::getDbo();
+
+		// Create the query to load all the common terms for the language.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('term'))
+			->from($db->quoteName('#__finder_terms_common'))
+			->where($db->quoteName('language') . ' = ' . $db->quote($lang));
+
+		// Load all of the common terms for the language.
+		$db->setQuery($query);
+
+		return $db->loadColumn();
+	}
+
+	/**
+	 * Method to get the default language for the site.
+	 *
+	 * @return  string  The default language string.
+	 *
+	 * @since   2.5
+	 */
+	public static function getDefaultLanguage()
+	{
+		static $lang;
+
+		// We need to go to com_languages to get the site default language, it's the best we can guess.
+		if (empty($lang))
+		{
+			$lang = JComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+		}
+
+		return $lang;
+	}
+
+	/**
+	 * Method to parse a language/locale key and return a simple language string.
+	 *
+	 * @param   string  $lang  The language/locale key. For example: en-GB
+	 *
+	 * @return  string  The simple language string. For example: en
+	 *
+	 * @since   2.5
+	 */
+	public static function getPrimaryLanguage($lang)
+	{
+		static $data;
+
+		// Only parse the identifier if necessary.
+		if (!isset($data[$lang]))
+		{
+			if (is_callable(array('Locale', 'getPrimaryLanguage')))
+			{
+				// Get the language key using the Locale package.
+				$data[$lang] = Locale::getPrimaryLanguage($lang);
+			}
+			else
+			{
+				// Get the language key using string position.
+				$data[$lang] = StringHelper::substr($lang, 0, StringHelper::strpos($lang, '-'));
+			}
+		}
+
+		return $data[$lang];
+	}
+
+	/**
+	 * Method to get the path (SEF route) for a content item.
+	 *
+	 * @param   string  $url  The non-SEF route to the content item.
+	 *
+	 * @return  string  The path for the content item.
+	 *
+	 * @since   2.5
+	 */
+	public static function getContentPath($url)
+	{
+		static $router;
+
+		// Only get the router once.
+		if (!($router instanceof JRouter))
+		{
+			// Get and configure the site router.
+			$config = JFactory::getConfig();
+			$router = JRouter::getInstance('site');
+			$router->setMode($config->get('sef', 1));
+		}
+
+		// Build the relative route.
+		$uri = $router->build($url);
+		$route = $uri->toString(array('path', 'query', 'fragment'));
+		$route = str_replace(JUri::base(true) . '/', '', $route);
+
+		return $route;
+	}
+
+	/**
+	 * Method to get extra data for a content before being indexed. This is how
+	 * we add Comments, Tags, Labels, etc. that should be available to Finder.
+	 *
+	 * @param   FinderIndexerResult  $item  The item to index as a FinderIndexerResult object.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function getContentExtras(FinderIndexerResult &$item)
+	{
+		// Get the event dispatcher.
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Load the finder plugin group.
+		JPluginHelper::importPlugin('finder');
+
+		// Trigger the event.
+		$results = $dispatcher->trigger('onPrepareFinderContent', array(&$item));
+
+		// Check the returned results. This is for plugins that don't throw
+		// exceptions when they encounter serious errors.
+		if (in_array(false, $results))
+		{
+			throw new Exception($dispatcher->getError(), 500);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to process content text using the onContentPrepare event trigger.
+	 *
+	 * @param   string               $text    The content to process.
+	 * @param   Registry             $params  The parameters object. [optional]
+	 * @param   FinderIndexerResult  $item    The item which get prepared. [optional]
+	 *
+	 * @return  string  The processed content.
+	 *
+	 * @since   2.5
+	 */
+	public static function prepareContent($text, $params = null, FinderIndexerResult $item = null)
+	{
+		static $loaded;
+
+		// Get the dispatcher.
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Load the content plugins if necessary.
+		if (empty($loaded))
+		{
+			JPluginHelper::importPlugin('content');
+			$loaded = true;
+		}
+
+		// Instantiate the parameter object if necessary.
+		if (!($params instanceof Registry))
+		{
+			$registry = new Registry($params);
+			$params = $registry;
+		}
+
+		// Create a mock content object.
+		$content = JTable::getInstance('Content');
+		$content->text = $text;
+
+		if ($item)
+		{
+			$content->bind((array) $item);
+			$content->bind($item->getElements());
+		}
+
+		if ($item && !empty($item->context))
+		{
+			$content->context = $item->context;
+		}
+
+		// Fire the onContentPrepare event.
+		$dispatcher->trigger('onContentPrepare', array('com_finder.indexer', &$content, &$params, 0));
+
+		return $content->text;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/indexer.php b/core/administrator/components/com_finder/helpers/indexer/indexer.php
new file mode 100644
index 00000000..34af6698
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -0,0 +1,566 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+JLoader::register('FinderIndexerHelper', __DIR__ . '/helper.php');
+JLoader::register('FinderIndexerParser', __DIR__ . '/parser.php');
+JLoader::register('FinderIndexerStemmer', __DIR__ . '/stemmer.php');
+JLoader::register('FinderIndexerTaxonomy', __DIR__ . '/taxonomy.php');
+JLoader::register('FinderIndexerToken', __DIR__ . '/token.php');
+
+jimport('joomla.filesystem.file');
+
+/**
+ * Main indexer class for the Finder indexer package.
+ *
+ * The indexer class provides the core functionality of the Finder
+ * search engine. It is responsible for adding and updating the
+ * content links table; extracting and scoring tokens; and maintaining
+ * all referential information for the content.
+ *
+ * Note: All exceptions thrown from within this class should be caught
+ * by the controller.
+ *
+ * @since  2.5
+ */
+abstract class FinderIndexer
+{
+	/**
+	 * The title context identifier.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	const TITLE_CONTEXT = 1;
+
+	/**
+	 * The text context identifier.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	const TEXT_CONTEXT = 2;
+
+	/**
+	 * The meta context identifier.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	const META_CONTEXT = 3;
+
+	/**
+	 * The path context identifier.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	const PATH_CONTEXT = 4;
+
+	/**
+	 * The misc context identifier.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	const MISC_CONTEXT = 5;
+
+	/**
+	 * The indexer state object.
+	 *
+	 * @var    JObject
+	 * @since  2.5
+	 */
+	public static $state;
+
+	/**
+	 * The indexer profiler object.
+	 *
+	 * @var    JProfiler
+	 * @since  2.5
+	 */
+	public static $profiler;
+
+	/**
+	 * Database driver cache.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.8.0
+	 */
+	protected $db;
+
+	/**
+	 * Reusable Query Template. To be used with clone.
+	 *
+	 * @var    JDatabaseQuery
+	 * @since  3.8.0
+	 */
+	protected $addTokensToDbQueryTemplate;
+
+	/**
+	 * FinderIndexer constructor.
+	 *
+	 * @since  3.8.0
+	 */
+	public function __construct()
+	{
+		$this->db = JFactory::getDbo();
+
+		$db = $this->db;
+
+		// Set up query template for addTokensToDb
+		$this->addTokensToDbQueryTemplate = $db->getQuery(true)->insert($db->quoteName('#__finder_tokens'))
+			->columns(
+				array(
+					$db->quoteName('term'),
+					$db->quoteName('stem'),
+					$db->quoteName('common'),
+					$db->quoteName('phrase'),
+					$db->quoteName('weight'),
+					$db->quoteName('context'),
+					$db->quoteName('language')
+				)
+			);
+	}
+
+	/**
+	 * Returns a reference to the FinderIndexer object.
+	 *
+	 * @return  FinderIndexer instance based on the database driver
+	 *
+	 * @since   3.0
+	 * @throws  RuntimeException if driver class for indexer not present.
+	 */
+	public static function getInstance()
+	{
+		// Setup the adapter for the indexer.
+		$serverType = JFactory::getDbo()->getServerType();
+
+		// For `mssql` server types, convert the type to `sqlsrv`
+		if ($serverType === 'mssql')
+		{
+			$serverType = 'sqlsrv';
+		}
+
+		$path = __DIR__ . '/driver/' . $serverType . '.php';
+		$class = 'FinderIndexerDriver' . ucfirst($serverType);
+
+		// Check if a parser exists for the format.
+		if (file_exists($path))
+		{
+			// Instantiate the parser.
+			JLoader::register($class, $path);
+
+			return new $class;
+		}
+
+		// Throw invalid format exception.
+		throw new RuntimeException(JText::sprintf('COM_FINDER_INDEXER_INVALID_DRIVER', $serverType));
+	}
+
+	/**
+	 * Method to get the indexer state.
+	 *
+	 * @return  object  The indexer state object.
+	 *
+	 * @since   2.5
+	 */
+	public static function getState()
+	{
+		// First, try to load from the internal state.
+		if (!empty(static::$state))
+		{
+			return static::$state;
+		}
+
+		// If we couldn't load from the internal state, try the session.
+		$session = JFactory::getSession();
+		$data = $session->get('_finder.state', null);
+
+		// If the state is empty, load the values for the first time.
+		if (empty($data))
+		{
+			$data = new JObject;
+
+			// Load the default configuration options.
+			$data->options = JComponentHelper::getParams('com_finder');
+
+			// Setup the weight lookup information.
+			$data->weights = array(
+				self::TITLE_CONTEXT => round($data->options->get('title_multiplier', 1.7), 2),
+				self::TEXT_CONTEXT  => round($data->options->get('text_multiplier', 0.7), 2),
+				self::META_CONTEXT  => round($data->options->get('meta_multiplier', 1.2), 2),
+				self::PATH_CONTEXT  => round($data->options->get('path_multiplier', 2.0), 2),
+				self::MISC_CONTEXT  => round($data->options->get('misc_multiplier', 0.3), 2)
+			);
+
+			// Set the current time as the start time.
+			$data->startTime = JFactory::getDate()->toSql();
+
+			// Set the remaining default values.
+			$data->batchSize   = (int) $data->options->get('batch_size', 50);
+			$data->batchOffset = 0;
+			$data->totalItems  = 0;
+			$data->pluginState = array();
+		}
+
+		// Setup the profiler if debugging is enabled.
+		if (JFactory::getApplication()->get('debug'))
+		{
+			static::$profiler = JProfiler::getInstance('FinderIndexer');
+		}
+
+		// Setup the stemmer.
+		if ($data->options->get('stem', 1) && $data->options->get('stemmer', 'porter_en'))
+		{
+			FinderIndexerHelper::$stemmer = FinderIndexerStemmer::getInstance($data->options->get('stemmer', 'porter_en'));
+		}
+
+		// Set the state.
+		static::$state = $data;
+
+		return static::$state;
+	}
+
+	/**
+	 * Method to set the indexer state.
+	 *
+	 * @param   object  $data  A new indexer state object.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	public static function setState($data)
+	{
+		// Check the state object.
+		if (empty($data) || !$data instanceof JObject)
+		{
+			return false;
+		}
+
+		// Set the new internal state.
+		static::$state = $data;
+
+		// Set the new session state.
+		JFactory::getSession()->set('_finder.state', $data);
+
+		return true;
+	}
+
+	/**
+	 * Method to reset the indexer state.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public static function resetState()
+	{
+		// Reset the internal state to null.
+		self::$state = null;
+
+		// Reset the session state to null.
+		JFactory::getSession()->set('_finder.state', null);
+	}
+
+	/**
+	 * Method to index a content item.
+	 *
+	 * @param   FinderIndexerResult  $item    The content item to index.
+	 * @param   string               $format  The format of the content. [optional]
+	 *
+	 * @return  integer  The ID of the record in the links table.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	abstract public function index($item, $format = 'html');
+
+	/**
+	 * Method to remove a link from the index.
+	 *
+	 * @param   integer  $linkId  The id of the link.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function remove($linkId)
+	{
+		$db    = $this->db;
+		$query = $db->getQuery(true);
+
+		// Update the link counts and remove the mapping records.
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Update the link counts for the terms.
+			$query->clear()
+				->update($db->quoteName('#__finder_terms', 't'))
+				->join('INNER', $db->quoteName('#__finder_links_terms' . dechex($i), 'm') .
+					' ON ' . $db->quoteName('m.term_id') . ' = ' . $db->quoteName('t.term_id')
+				)
+				->set($db->quoteName('links') . ' = ' . $db->quoteName('links') . ' - 1')
+				->where($db->quoteName('m.link_id') . ' = ' . (int) $linkId);
+			$db->setQuery($query)->execute();
+
+			// Remove all records from the mapping tables.
+			$query->clear()
+				->delete($db->quoteName('#__finder_links_terms' . dechex($i)))
+				->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+			$db->setQuery($query)->execute();
+		}
+
+		// Delete all orphaned terms.
+		$query->clear()
+			->delete($db->quoteName('#__finder_terms'))
+			->where($db->quoteName('links') . ' <= 0');
+		$db->setQuery($query)->execute();
+
+		// Delete the link from the index.
+		$query->clear()
+			->delete($db->quoteName('#__finder_links'))
+			->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+		$db->setQuery($query)->execute();
+
+		// Remove the taxonomy maps.
+		FinderIndexerTaxonomy::removeMaps($linkId);
+
+		// Remove the orphaned taxonomy nodes.
+		FinderIndexerTaxonomy::removeOrphanNodes();
+
+		return true;
+	}
+
+	/**
+	 * Method to optimize the index. We use this method to remove unused terms
+	 * and any other optimizations that might be necessary.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	abstract public function optimize();
+
+	/**
+	 * Method to get a content item's signature.
+	 *
+	 * @param   object  $item  The content item to index.
+	 *
+	 * @return  string  The content item's signature.
+	 *
+	 * @since   2.5
+	 */
+	protected static function getSignature($item)
+	{
+		// Get the indexer state.
+		$state = static::getState();
+
+		// Get the relevant configuration variables.
+		$config = array(
+			$state->weights,
+			$state->options->get('stem', 1),
+			$state->options->get('stemmer', 'porter_en')
+		);
+
+		return md5(serialize(array($item, $config)));
+	}
+
+	/**
+	 * Method to parse input, tokenize it, and then add it to the database.
+	 *
+	 * @param   mixed    $input    String or resource to use as input. A resource input will automatically be chunked to conserve
+	 *                             memory. Strings will be chunked if longer than 2K in size.
+	 * @param   integer  $context  The context of the input. See context constants.
+	 * @param   string   $lang     The language of the input.
+	 * @param   string   $format   The format of the input.
+	 *
+	 * @return  integer  The number of tokens extracted from the input.
+	 *
+	 * @since   2.5
+	 */
+	protected function tokenizeToDb($input, $context, $lang, $format)
+	{
+		$count = 0;
+		$buffer = null;
+
+		if (empty($input))
+		{
+			return $count;
+		}
+
+		// If the input is a resource, batch the process out.
+		if (is_resource($input))
+		{
+			// Batch the process out to avoid memory limits.
+			while (!feof($input))
+			{
+				// Read into the buffer.
+				$buffer .= fread($input, 2048);
+
+				/*
+				 * If we haven't reached the end of the file, seek to the last
+				 * space character and drop whatever is after that to make sure
+				 * we didn't truncate a term while reading the input.
+				 */
+				if (!feof($input))
+				{
+					// Find the last space character.
+					$ls = strrpos($buffer, ' ');
+
+					// Adjust string based on the last space character.
+					if ($ls)
+					{
+						// Truncate the string to the last space character.
+						$string = substr($buffer, 0, $ls);
+
+						// Adjust the buffer based on the last space for the next iteration and trim.
+						$buffer = StringHelper::trim(substr($buffer, $ls));
+					}
+					// No space character was found.
+					else
+					{
+						$string = $buffer;
+					}
+				}
+				// We've reached the end of the file, so parse whatever remains.
+				else
+				{
+					$string = $buffer;
+				}
+
+				// Parse, tokenise and add tokens to the database.
+				$count = $this->tokenizeToDbShort($string, $context, $lang, $format, $count);
+
+				unset($string);
+				unset($tokens);
+			}
+
+			return $count;
+		}
+
+		// Parse, tokenise and add tokens to the database.
+		$count = $this->tokenizeToDbShort($input, $context, $lang, $format, $count);
+
+		return $count;
+	}
+
+	/**
+	 * Method to parse input, tokenise it, then add the tokens to the database.
+	 *
+	 * @param   string   $input    String to parse, tokenise and add to database.
+	 * @param   integer  $context  The context of the input. See context constants.
+	 * @param   string   $lang     The language of the input.
+	 * @param   string   $format   The format of the input.
+	 * @param   integer  $count    The number of tokens processed so far.
+	 *
+	 * @return  integer  Cummulative number of tokens extracted from the input so far.
+	 *
+	 * @since   3.7.0
+	 */
+	private function tokenizeToDbShort($input, $context, $lang, $format, $count)
+	{
+		// Parse the input.
+		$input = FinderIndexerHelper::parse($input, $format);
+
+		// Check the input.
+		if (empty($input))
+		{
+			return $count;
+		}
+
+		// Tokenize the input.
+		$tokens = FinderIndexerHelper::tokenize($input, $lang);
+
+		// Add the tokens to the database.
+		$count += $this->addTokensToDb($tokens, $context);
+
+		// Check if we're approaching the memory limit of the token table.
+		if ($count > static::$state->options->get('memory_table_limit', 30000))
+		{
+			$this->toggleTables(false);
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Method to add a set of tokens to the database.
+	 *
+	 * @param   mixed  $tokens   An array or single FinderIndexerToken object.
+	 * @param   mixed  $context  The context of the tokens. See context constants. [optional]
+	 *
+	 * @return  integer  The number of tokens inserted into the database.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function addTokensToDb($tokens, $context = '')
+	{
+		// Get the database object.
+		$db = $this->db;
+
+		$query = clone $this->addTokensToDbQueryTemplate;
+
+		// Check if a single FinderIndexerToken object was given and make it to be an array of FinderIndexerToken objects
+		$tokens = is_array($tokens) ? $tokens : array($tokens);
+
+		// Count the number of token values.
+		$values = 0;
+
+		// Break into chunks of no more than 1000 items
+		$chunks = array_chunk($tokens, 1000);
+
+		foreach ($chunks as $tokens)
+		{
+			$query->clear('values');
+
+			// Iterate through the tokens to create SQL value sets.
+			foreach ($tokens as $token)
+			{
+				$query->values(
+					$db->quote($token->term) . ', '
+					. $db->quote($token->stem) . ', '
+					. (int) $token->common . ', '
+					. (int) $token->phrase . ', '
+					. (float) $token->weight . ', '
+					. (int) $context . ', '
+					. $db->quote($token->language)
+				);
+				++$values;
+			}
+
+			$db->setQuery($query)->execute();
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Method to switch the token tables from Memory tables to Disk tables
+	 * when they are close to running out of memory.
+	 * Since this is not supported/implemented in all DB-drivers, the default is a stub method, which simply returns true.
+	 *
+	 * @param   boolean  $memory  Flag to control how they should be toggled.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function toggleTables($memory)
+	{
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/parser.php b/core/administrator/components/com_finder/helpers/indexer/parser.php
new file mode 100644
index 00000000..9237195a
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/parser.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Parser base class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+abstract class FinderIndexerParser
+{
+	/**
+	 * Method to get a parser, creating it if necessary.
+	 *
+	 * @param   string  $format  The type of parser to load.
+	 *
+	 * @return  FinderIndexerParser  A FinderIndexerParser instance.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on invalid parser.
+	 */
+	public static function getInstance($format)
+	{
+		static $instances;
+
+		// Only create one parser for each format.
+		if (isset($instances[$format]))
+		{
+			return $instances[$format];
+		}
+
+		// Create an array of instances if necessary.
+		if (!is_array($instances))
+		{
+			$instances = array();
+		}
+
+		// Setup the adapter for the parser.
+		$format = JFilterInput::getInstance()->clean($format, 'cmd');
+		$path = __DIR__ . '/parser/' . $format . '.php';
+		$class = 'FinderIndexerParser' . ucfirst($format);
+
+		// Check if a parser exists for the format.
+		if (!file_exists($path))
+		{
+			// Throw invalid format exception.
+			throw new Exception(JText::sprintf('COM_FINDER_INDEXER_INVALID_PARSER', $format));
+		}
+
+		// Instantiate the parser.
+		JLoader::register($class, $path);
+		$instances[$format] = new $class;
+
+		return $instances[$format];
+	}
+
+	/**
+	 * Method to parse input and extract the plain text. Because this method is
+	 * called from both inside and outside the indexer, it needs to be able to
+	 * batch out its parsing functionality to deal with the inefficiencies of
+	 * regular expressions. We will parse recursively in 2KB chunks.
+	 *
+	 * @param   string  $input  The input to parse.
+	 *
+	 * @return  string  The plain text input.
+	 *
+	 * @since   2.5
+	 */
+	public function parse($input)
+	{
+		// If the input is less than 2KB we can parse it in one go.
+		if (strlen($input) <= 2048)
+		{
+			return $this->process($input);
+		}
+
+		// Input is longer than 2Kb so parse it in chunks of 2Kb or less.
+		$start = 0;
+		$end = strlen($input);
+		$chunk = 2048;
+		$return = null;
+
+		while ($start < $end)
+		{
+			// Setup the string.
+			$string = substr($input, $start, $chunk);
+
+			// Find the last space character if we aren't at the end.
+			$ls = (($start + $chunk) < $end ? strrpos($string, ' ') : false);
+
+			// Truncate to the last space character.
+			if ($ls !== false)
+			{
+				$string = substr($string, 0, $ls);
+			}
+
+			// Adjust the start position for the next iteration.
+			$start += ($ls !== false ? ($ls + 1 - $chunk) + $chunk : $chunk);
+
+			// Parse the chunk.
+			$return .= $this->process($string);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to process input and extract the plain text.
+	 *
+	 * @param   string  $input  The input to process.
+	 *
+	 * @return  string  The plain text input.
+	 *
+	 * @since   2.5
+	 */
+	abstract protected function process($input);
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/parser/html.php b/core/administrator/components/com_finder/helpers/indexer/parser/html.php
new file mode 100644
index 00000000..4bf1e79b
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/parser/html.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexerParser', dirname(__DIR__) . '/parser.php');
+
+/**
+ * HTML Parser class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerParserHtml extends FinderIndexerParser
+{
+	/**
+	 * Method to parse input and extract the plain text. Because this method is
+	 * called from both inside and outside the indexer, it needs to be able to
+	 * batch out its parsing functionality to deal with the inefficiencies of
+	 * regular expressions. We will parse recursively in 2KB chunks.
+	 *
+	 * @param   string  $input  The input to parse.
+	 *
+	 * @return  string  The plain text input.
+	 *
+	 * @since   2.5
+	 */
+	public function parse($input)
+	{
+		// Strip invalid UTF-8 characters.
+		$input = iconv('utf-8', 'utf-8//IGNORE', $input);
+
+		// Remove anything between <head> and </head> tags.  Do this first
+		// because there might be <script> or <style> tags nested inside.
+		$input = $this->removeBlocks($input, '<head>', '</head>');
+
+		// Convert <style> and <noscript> tags to <script> tags
+		// so we can remove them efficiently.
+		$search = array(
+			'<style', '</style',
+			'<noscript', '</noscript',
+		);
+		$replace = array(
+			'<script', '</script',
+			'<script', '</script',
+		);
+		$input = str_replace($search, $replace, $input);
+
+		// Strip all script blocks.
+		$input = $this->removeBlocks($input, '<script', '</script>');
+
+		// Decode HTML entities.
+		$input = html_entity_decode($input, ENT_QUOTES, 'UTF-8');
+
+		// Convert entities equivalent to spaces to actual spaces.
+		$input = str_replace(array('&nbsp;', '&#160;'), ' ', $input);
+
+		// This fixes issues such as '<h1>Title</h1><p>Paragraph</p>'
+		// being transformed into 'TitleParagraph' with no space.
+		$input = str_replace('>', '> ', $input);
+
+		// Strip HTML tags.
+		$input = strip_tags($input);
+
+		return parent::parse($input);
+	}
+
+	/**
+	 * Method to process HTML input and extract the plain text.
+	 *
+	 * @param   string  $input  The input to process.
+	 *
+	 * @return  string  The plain text input.
+	 *
+	 * @since   2.5
+	 */
+	protected function process($input)
+	{
+		// Replace any amount of white space with a single space.
+		return preg_replace('#\s+#u', ' ', $input);
+	}
+
+	/**
+	 * Method to remove blocks of text between a start and an end tag.
+	 * Each block removed is effectively replaced by a single space.
+	 *
+	 * Note: The start tag and the end tag must be different.
+	 * Note: Blocks must not be nested.
+	 * Note: This method will function correctly with multi-byte strings.
+	 *
+	 * @param   string  $input     String to be processed.
+	 * @param   string  $startTag  String representing the start tag.
+	 * @param   string  $endTag    String representing the end tag.
+	 *
+	 * @return  string with blocks removed.
+	 */
+	private function removeBlocks($input, $startTag, $endTag)
+	{
+		$return = '';
+		$offset = 0;
+		$startTagLength = strlen($startTag);
+		$endTagLength = strlen($endTag);
+
+		// Find the first start tag.
+		$start = stripos($input, $startTag);
+
+		// If no start tags were found, return the string unchanged.
+		if ($start === false)
+		{
+			return $input;
+		}
+
+		// Look for all blocks defined by the start and end tags.
+		while ($start !== false)
+		{
+			// Accumulate the substring up to the start tag.
+			$return .= substr($input, $offset, $start - $offset) . ' ';
+
+			// Look for an end tag corresponding to the start tag.
+			$end = stripos($input, $endTag, $start + $startTagLength);
+
+			// If no corresponding end tag, leave the string alone.
+			if ($end === false)
+			{
+				// Fix the offset so part of the string is not duplicated.
+				$offset = $start;
+				break;
+			}
+
+			// Advance the start position.
+			$offset = $end + $endTagLength;
+
+			// Look for the next start tag and loop.
+			$start = stripos($input, $startTag, $offset);
+		}
+
+		// Add in the final substring after the last end tag.
+		$return .= substr($input, $offset);
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/parser/rtf.php b/core/administrator/components/com_finder/helpers/indexer/parser/rtf.php
new file mode 100644
index 00000000..fbb2563d
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/parser/rtf.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexerParser', dirname(__DIR__) . '/parser.php');
+
+/**
+ * RTF Parser class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerParserRtf extends FinderIndexerParser
+{
+	/**
+	 * Method to process RTF input and extract the plain text.
+	 *
+	 * @param   string  $input  The input to process.
+	 *
+	 * @return  string  The plain text input.
+	 *
+	 * @since   2.5
+	 */
+	protected function process($input)
+	{
+		// Remove embedded pictures.
+		$input = preg_replace('#{\\\pict[^}]*}#mis', '', $input);
+
+		// Remove control characters.
+		$input = str_replace(array('{', '}', "\\\n"), array(' ', ' ', "\n"), $input);
+		$input = preg_replace('#\\\([^;]+?);#mis', ' ', $input);
+		$input = preg_replace('#\\\[\'a-zA-Z0-9]+#mis', ' ', $input);
+
+		return $input;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/parser/txt.php b/core/administrator/components/com_finder/helpers/indexer/parser/txt.php
new file mode 100644
index 00000000..4b8b5168
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/parser/txt.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexerParser', dirname(__DIR__) . '/parser.php');
+
+/**
+ * Text Parser class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerParserTxt extends FinderIndexerParser
+{
+	/**
+	 * Method to process Text input and extract the plain text.
+	 *
+	 * @param   string  $input  The input to process.
+	 *
+	 * @return  string  The plain text input.
+	 *
+	 * @since   2.5
+	 */
+	protected function process($input)
+	{
+		return $input;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/query.php b/core/administrator/components/com_finder/helpers/indexer/query.php
new file mode 100644
index 00000000..02850fc1
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/query.php
@@ -0,0 +1,1366 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('FinderIndexerHelper', __DIR__ . '/helper.php');
+JLoader::register('FinderIndexerTaxonomy', __DIR__ . '/taxonomy.php');
+JLoader::register('FinderHelperRoute', JPATH_SITE . '/components/com_finder/helpers/route.php');
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+/**
+ * Query class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerQuery
+{
+	/**
+	 * Flag to show whether the query can return results.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	public $search;
+
+	/**
+	 * The query input string.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $input;
+
+	/**
+	 * The language of the query.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $language;
+
+	/**
+	 * The query string matching mode.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $mode;
+
+	/**
+	 * The included tokens.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $included = array();
+
+	/**
+	 * The excluded tokens.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $excluded = array();
+
+	/**
+	 * The tokens to ignore because no matches exist.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $ignored = array();
+
+	/**
+	 * The operators used in the query input string.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $operators = array();
+
+	/**
+	 * The terms to highlight as matches.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $highlight = array();
+
+	/**
+	 * The number of matching terms for the query input.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $terms;
+
+	/**
+	 * The static filter id.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $filter;
+
+	/**
+	 * The taxonomy filters. This is a multi-dimensional array of taxonomy
+	 * branches as the first level and then the taxonomy nodes as the values.
+	 *
+	 * For example:
+	 * $filters = array(
+	 *     'Type' = array(10, 32, 29, 11, ...);
+	 *     'Label' = array(20, 314, 349, 91, 82, ...);
+	 *        ...
+	 * );
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $filters = array();
+
+	/**
+	 * The start date filter.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $date1;
+
+	/**
+	 * The end date filter.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $date2;
+
+	/**
+	 * The start date filter modifier.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $when1;
+
+	/**
+	 * The end date filter modifier.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $when2;
+
+	/**
+	 * Method to instantiate the query object.
+	 *
+	 * @param   array  $options  An array of query options.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function __construct($options)
+	{
+		// Get the input string.
+		$this->input = isset($options['input']) ? $options['input'] : null;
+
+		// Get the empty query setting.
+		$this->empty = isset($options['empty']) ? (bool) $options['empty'] : false;
+
+		// Get the input language.
+		$this->language = !empty($options['language']) ? $options['language'] : FinderIndexerHelper::getDefaultLanguage();
+		$this->language = FinderIndexerHelper::getPrimaryLanguage($this->language);
+
+		// Get the matching mode.
+		$this->mode = 'AND';
+
+		// Initialize the temporary date storage.
+		$this->dates = new Registry;
+
+		// Populate the temporary date storage.
+		if (isset($options['date1']) && !empty($options['date1']))
+		{
+			$this->dates->set('date1', $options['date1']);
+		}
+
+		if (isset($options['date2']) && !empty($options['date1']))
+		{
+			$this->dates->set('date2', $options['date2']);
+		}
+
+		if (isset($options['when1']) && !empty($options['date1']))
+		{
+			$this->dates->set('when1', $options['when1']);
+		}
+
+		if (isset($options['when2']) && !empty($options['date1']))
+		{
+			$this->dates->set('when2', $options['when2']);
+		}
+
+		// Process the static taxonomy filters.
+		if (isset($options['filter']) && !empty($options['filter']))
+		{
+			$this->processStaticTaxonomy($options['filter']);
+		}
+
+		// Process the dynamic taxonomy filters.
+		if (isset($options['filters']) && !empty($options['filters']))
+		{
+			$this->processDynamicTaxonomy($options['filters']);
+		}
+
+		// Get the date filters.
+		$d1 = $this->dates->get('date1');
+		$d2 = $this->dates->get('date2');
+		$w1 = $this->dates->get('when1');
+		$w2 = $this->dates->get('when2');
+
+		// Process the date filters.
+		if (!empty($d1) || !empty($d2))
+		{
+			$this->processDates($d1, $d2, $w1, $w2);
+		}
+
+		// Process the input string.
+		$this->processString($this->input, $this->language, $this->mode);
+
+		// Get the number of matching terms.
+		foreach ($this->included as $token)
+		{
+			$this->terms += count($token->matches);
+		}
+
+		// Remove the temporary date storage.
+		unset($this->dates);
+
+		// Lastly, determine whether this query can return a result set.
+
+		// Check if we have a query string.
+		if (!empty($this->input))
+		{
+			$this->search = true;
+		}
+		// Check if we can search without a query string.
+		elseif ($this->empty && (!empty($this->filter) || !empty($this->filters) || !empty($this->date1) || !empty($this->date2)))
+		{
+			$this->search = true;
+		}
+		// We do not have a valid search query.
+		else
+		{
+			$this->search = false;
+		}
+	}
+
+	/**
+	 * Method to convert the query object into a URI string.
+	 *
+	 * @param   string  $base  The base URI. [optional]
+	 *
+	 * @return  string  The complete query URI.
+	 *
+	 * @since   2.5
+	 */
+	public function toUri($base = null)
+	{
+		// Set the base if not specified.
+		if (empty($base))
+		{
+			$base = 'index.php?option=com_finder&view=search';
+		}
+
+		// Get the base URI.
+		$uri = JUri::getInstance($base);
+
+		// Add the static taxonomy filter if present.
+		if (!empty($this->filter))
+		{
+			$uri->setVar('f', $this->filter);
+		}
+
+		// Get the filters in the request.
+		$t = JFactory::getApplication()->input->request->get('t', array(), 'array');
+
+		// Add the dynamic taxonomy filters if present.
+		if (!empty($this->filters))
+		{
+			foreach ($this->filters as $nodes)
+			{
+				foreach ($nodes as $node)
+				{
+					if (!in_array($node, $t))
+					{
+						continue;
+					}
+
+					$uri->setVar('t[]', $node);
+				}
+			}
+		}
+
+		// Add the input string if present.
+		if (!empty($this->input))
+		{
+			$uri->setVar('q', $this->input);
+		}
+
+		// Add the start date if present.
+		if (!empty($this->date1))
+		{
+			$uri->setVar('d1', $this->date1);
+		}
+
+		// Add the end date if present.
+		if (!empty($this->date2))
+		{
+			$uri->setVar('d2', $this->date2);
+		}
+
+		// Add the start date modifier if present.
+		if (!empty($this->when1))
+		{
+			$uri->setVar('w1', $this->when1);
+		}
+
+		// Add the end date modifier if present.
+		if (!empty($this->when2))
+		{
+			$uri->setVar('w2', $this->when2);
+		}
+
+		// Add a menu item id if one is not present.
+		if (!$uri->getVar('Itemid'))
+		{
+			// Get the menu item id.
+			$query = array(
+				'view' => $uri->getVar('view'),
+				'f'    => $uri->getVar('f'),
+				'q'    => $uri->getVar('q'),
+			);
+
+			$item = FinderHelperRoute::getItemid($query);
+
+			// Add the menu item id if present.
+			if ($item !== null)
+			{
+				$uri->setVar('Itemid', $item);
+			}
+		}
+
+		return $uri->toString(array('path', 'query'));
+	}
+
+	/**
+	 * Method to get a list of excluded search term ids.
+	 *
+	 * @return  array  An array of excluded term ids.
+	 *
+	 * @since   2.5
+	 */
+	public function getExcludedTermIds()
+	{
+		$results = array();
+
+		// Iterate through the excluded tokens and compile the matching terms.
+		for ($i = 0, $c = count($this->excluded); $i < $c; $i++)
+		{
+			$results = array_merge($results, $this->excluded[$i]->matches);
+		}
+
+		// Sanitize the terms.
+		$results = array_unique($results);
+
+		return ArrayHelper::toInteger($results);
+	}
+
+	/**
+	 * Method to get a list of included search term ids.
+	 *
+	 * @return  array  An array of included term ids.
+	 *
+	 * @since   2.5
+	 */
+	public function getIncludedTermIds()
+	{
+		$results = array();
+
+		// Iterate through the included tokens and compile the matching terms.
+		for ($i = 0, $c = count($this->included); $i < $c; $i++)
+		{
+			// Check if we have any terms.
+			if (empty($this->included[$i]->matches))
+			{
+				continue;
+			}
+
+			// Get the term.
+			$term = $this->included[$i]->term;
+
+			// Prepare the container for the term if necessary.
+			if (!array_key_exists($term, $results))
+			{
+				$results[$term] = array();
+			}
+
+			// Add the matches to the stack.
+			$results[$term] = array_merge($results[$term], $this->included[$i]->matches);
+		}
+
+		// Sanitize the terms.
+		foreach ($results as $key => $value)
+		{
+			$results[$key] = array_unique($results[$key]);
+			$results[$key] = ArrayHelper::toInteger($results[$key]);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Method to get a list of required search term ids.
+	 *
+	 * @return  array  An array of required term ids.
+	 *
+	 * @since   2.5
+	 */
+	public function getRequiredTermIds()
+	{
+		$results = array();
+
+		// Iterate through the included tokens and compile the matching terms.
+		for ($i = 0, $c = count($this->included); $i < $c; $i++)
+		{
+			// Check if the token is required.
+			if ($this->included[$i]->required)
+			{
+				// Get the term.
+				$term = $this->included[$i]->term;
+
+				// Prepare the container for the term if necessary.
+				if (!array_key_exists($term, $results))
+				{
+					$results[$term] = array();
+				}
+
+				// Add the matches to the stack.
+				$results[$term] = array_merge($results[$term], $this->included[$i]->matches);
+			}
+		}
+
+		// Sanitize the terms.
+		foreach ($results as $key => $value)
+		{
+			$results[$key] = array_unique($results[$key]);
+			$results[$key] = ArrayHelper::toInteger($results[$key]);
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Method to process the static taxonomy input. The static taxonomy input
+	 * comes in the form of a pre-defined search filter that is assigned to the
+	 * search form.
+	 *
+	 * @param   integer  $filterId  The id of static filter.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function processStaticTaxonomy($filterId)
+	{
+		// Get the database object.
+		$db = JFactory::getDbo();
+
+		// Initialize user variables
+		$groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
+
+		// Load the predefined filter.
+		$query = $db->getQuery(true)
+			->select('f.data, f.params')
+			->from($db->quoteName('#__finder_filters') . ' AS f')
+			->where('f.filter_id = ' . (int) $filterId);
+
+		$db->setQuery($query);
+		$return = $db->loadObject();
+
+		// Check the returned filter.
+		if (empty($return))
+		{
+			return false;
+		}
+
+		// Set the filter.
+		$this->filter = (int) $filterId;
+
+		// Get a parameter object for the filter date options.
+		$registry = new Registry($return->params);
+		$params = $registry;
+
+		// Set the dates if not already set.
+		$this->dates->def('d1', $params->get('d1'));
+		$this->dates->def('d2', $params->get('d2'));
+		$this->dates->def('w1', $params->get('w1'));
+		$this->dates->def('w2', $params->get('w2'));
+
+		// Remove duplicates and sanitize.
+		$filters = explode(',', $return->data);
+		$filters = array_unique($filters);
+		$filters = ArrayHelper::toInteger($filters);
+
+		// Remove any values of zero.
+		if (array_search(0, $filters, true) !== false)
+		{
+			unset($filters[array_search(0, $filters, true)]);
+		}
+
+		// Check if we have any real input.
+		if (empty($filters))
+		{
+			return true;
+		}
+
+		/*
+		 * Create the query to get filters from the database. We do this for
+		 * two reasons: one, it allows us to ensure that the filters being used
+		 * are real; two, we need to sort the filters by taxonomy branch.
+		 */
+		$query->clear()
+			->select('t1.id, t1.title, t2.title AS branch')
+			->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
+			->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
+			->where('t1.state = 1')
+			->where('t1.access IN (' . $groups . ')')
+			->where('t1.id IN (' . implode(',', $filters) . ')')
+			->where('t2.state = 1')
+			->where('t2.access IN (' . $groups . ')');
+
+		// Load the filters.
+		$db->setQuery($query);
+		$results = $db->loadObjectList();
+
+		// Sort the filter ids by branch.
+		foreach ($results as $result)
+		{
+			$this->filters[$result->branch][$result->title] = (int) $result->id;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to process the dynamic taxonomy input. The dynamic taxonomy input
+	 * comes in the form of select fields that the user chooses from. The
+	 * dynamic taxonomy input is processed AFTER the static taxonomy input
+	 * because the dynamic options can be used to further narrow a static
+	 * taxonomy filter.
+	 *
+	 * @param   array  $filters  An array of taxonomy node ids.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function processDynamicTaxonomy($filters)
+	{
+		// Initialize user variables
+		$groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
+
+		// Remove duplicates and sanitize.
+		$filters = array_unique($filters);
+		$filters = ArrayHelper::toInteger($filters);
+
+		// Remove any values of zero.
+		if (array_search(0, $filters, true) !== false)
+		{
+			unset($filters[array_search(0, $filters, true)]);
+		}
+
+		// Check if we have any real input.
+		if (empty($filters))
+		{
+			return true;
+		}
+
+		// Get the database object.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		/*
+		 * Create the query to get filters from the database. We do this for
+		 * two reasons: one, it allows us to ensure that the filters being used
+		 * are real; two, we need to sort the filters by taxonomy branch.
+		 */
+		$query->select('t1.id, t1.title, t2.title AS branch')
+			->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
+			->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
+			->where('t1.state = 1')
+			->where('t1.access IN (' . $groups . ')')
+			->where('t1.id IN (' . implode(',', $filters) . ')')
+			->where('t2.state = 1')
+			->where('t2.access IN (' . $groups . ')');
+
+		// Load the filters.
+		$db->setQuery($query);
+		$results = $db->loadObjectList();
+
+		// Cleared filter branches.
+		$cleared = array();
+
+		/*
+		 * Sort the filter ids by branch. Because these filters are designed to
+		 * override and further narrow the items selected in the static filter,
+		 * we will clear the values from the static filter on a branch by
+		 * branch basis before adding the dynamic filters. So, if the static
+		 * filter defines a type filter of "articles" and three "category"
+		 * filters but the user only limits the category further, the category
+		 * filters will be flushed but the type filters will not.
+		 */
+		foreach ($results as $result)
+		{
+			// Check if the branch has been cleared.
+			if (!in_array($result->branch, $cleared))
+			{
+				// Clear the branch.
+				$this->filters[$result->branch] = array();
+
+				// Add the branch to the cleared list.
+				$cleared[] = $result->branch;
+			}
+
+			// Add the filter to the list.
+			$this->filters[$result->branch][$result->title] = (int) $result->id;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to process the query date filters to determine start and end
+	 * date limitations.
+	 *
+	 * @param   string  $date1  The first date filter.
+	 * @param   string  $date2  The second date filter.
+	 * @param   string  $when1  The first date modifier.
+	 * @param   string  $when2  The second date modifier.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	protected function processDates($date1, $date2, $when1, $when2)
+	{
+		// Clean up the inputs.
+		$date1 = trim(StringHelper::strtolower($date1));
+		$date2 = trim(StringHelper::strtolower($date2));
+		$when1 = trim(StringHelper::strtolower($when1));
+		$when2 = trim(StringHelper::strtolower($when2));
+
+		// Get the time offset.
+		$offset = JFactory::getApplication()->get('offset');
+
+		// Array of allowed when values.
+		$whens = array('before', 'after', 'exact');
+
+		// The value of 'today' is a special case that we need to handle.
+		if ($date1 === StringHelper::strtolower(JText::_('COM_FINDER_QUERY_FILTER_TODAY')))
+		{
+			$date1 = JFactory::getDate('now', $offset)->format('%Y-%m-%d');
+		}
+
+		// Try to parse the date string.
+		$date = JFactory::getDate($date1, $offset);
+
+		// Check if the date was parsed successfully.
+		if ($date->toUnix() !== null)
+		{
+			// Set the date filter.
+			$this->date1 = $date->toSql();
+			$this->when1 = in_array($when1, $whens) ? $when1 : 'before';
+		}
+
+		// The value of 'today' is a special case that we need to handle.
+		if ($date2 === StringHelper::strtolower(JText::_('COM_FINDER_QUERY_FILTER_TODAY')))
+		{
+			$date2 = JFactory::getDate('now', $offset)->format('%Y-%m-%d');
+		}
+
+		// Try to parse the date string.
+		$date = JFactory::getDate($date2, $offset);
+
+		// Check if the date was parsed successfully.
+		if ($date->toUnix() !== null)
+		{
+			// Set the date filter.
+			$this->date2 = $date->toSql();
+			$this->when2 = in_array($when2, $whens) ? $when2 : 'before';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to process the query input string and extract required, optional,
+	 * and excluded tokens; taxonomy filters; and date filters.
+	 *
+	 * @param   string  $input  The query input string.
+	 * @param   string  $lang   The query input language.
+	 * @param   string  $mode   The query matching mode.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function processString($input, $lang, $mode)
+	{
+		// Clean up the input string.
+		$input = html_entity_decode($input, ENT_QUOTES, 'UTF-8');
+		$input = StringHelper::strtolower($input);
+		$input = preg_replace('#\s+#mi', ' ', $input);
+		$input = trim($input);
+		$debug = JFactory::getConfig()->get('debug_lang');
+
+		/*
+		 * First, we need to handle string based modifiers. String based
+		 * modifiers could potentially include things like "category:blah" or
+		 * "before:2009-10-21" or "type:article", etc.
+		 */
+		$patterns = array(
+			'before' => JText::_('COM_FINDER_FILTER_WHEN_BEFORE'),
+			'after'  => JText::_('COM_FINDER_FILTER_WHEN_AFTER'),
+		);
+
+		// Add the taxonomy branch titles to the possible patterns.
+		foreach (FinderIndexerTaxonomy::getBranchTitles() as $branch)
+		{
+			// Add the pattern.
+			$patterns[$branch] = StringHelper::strtolower(JText::_(FinderHelperLanguage::branchSingular($branch)));
+		}
+
+		// Container for search terms and phrases.
+		$terms   = array();
+		$phrases = array();
+
+		// Cleared filter branches.
+		$cleared = array();
+
+		/*
+		 * Compile the suffix pattern. This is used to match the values of the
+		 * filter input string. Single words can be input directly, multi-word
+		 * values have to be wrapped in double quotes.
+		 */
+		$quotes = html_entity_decode('&#8216;&#8217;&#39;', ENT_QUOTES, 'UTF-8');
+		$suffix = '(([\w\d' . $quotes . '-]+)|\"([\w\d\s' . $quotes . '-]+)\")';
+
+		/*
+		 * Iterate through the possible filter patterns and search for matches.
+		 * We need to match the key, colon, and a value pattern for the match
+		 * to be valid.
+		 */
+		foreach ($patterns as $modifier => $pattern)
+		{
+			$matches = array();
+
+			if ($debug)
+			{
+				$pattern = substr($pattern, 2, -2);
+			}
+
+			// Check if the filter pattern is in the input string.
+			if (preg_match('#' . $pattern . '\s*:\s*' . $suffix . '#mi', $input, $matches))
+			{
+				// Get the value given to the modifier.
+				$value = isset($matches[3]) ? $matches[3] : $matches[1];
+
+				// Now we have to handle the filter string.
+				switch ($modifier)
+				{
+					// Handle a before and after date filters.
+					case 'before':
+					case 'after':
+					{
+						// Get the time offset.
+						$offset = JFactory::getApplication()->get('offset');
+
+						// Array of allowed when values.
+						$whens = array('before', 'after', 'exact');
+
+						// The value of 'today' is a special case that we need to handle.
+						if ($value === StringHelper::strtolower(JText::_('COM_FINDER_QUERY_FILTER_TODAY')))
+						{
+							$value = JFactory::getDate('now', $offset)->format('%Y-%m-%d');
+						}
+
+						// Try to parse the date string.
+						$date = JFactory::getDate($value, $offset);
+
+						// Check if the date was parsed successfully.
+						if ($date->toUnix() !== null)
+						{
+							// Set the date filter.
+							$this->date1 = $date->toSql();
+							$this->when1 = in_array($modifier, $whens) ? $modifier : 'before';
+						}
+
+						break;
+					}
+
+					// Handle a taxonomy branch filter.
+					default:
+						{
+						// Try to find the node id.
+						$return = FinderIndexerTaxonomy::getNodeByTitle($modifier, $value);
+
+						// Check if the node id was found.
+						if ($return)
+						{
+							// Check if the branch has been cleared.
+							if (!in_array($modifier, $cleared))
+							{
+								// Clear the branch.
+								$this->filters[$modifier] = array();
+
+								// Add the branch to the cleared list.
+								$cleared[] = $modifier;
+							}
+
+							// Add the filter to the list.
+							$this->filters[$modifier][$return->title] = (int) $return->id;
+						}
+
+						break;
+					}
+				}
+
+				// Clean up the input string again.
+				$input = str_replace($matches[0], '', $input);
+				$input = preg_replace('#\s+#mi', ' ', $input);
+				$input = trim($input);
+			}
+		}
+
+		/*
+		 * Extract the tokens enclosed in double quotes so that we can handle
+		 * them as phrases.
+		 */
+		if (StringHelper::strpos($input, '"') !== false)
+		{
+			$matches = array();
+
+			// Extract the tokens enclosed in double quotes.
+			if (preg_match_all('#\"([^"]+)\"#mi', $input, $matches))
+			{
+				/*
+				 * One or more phrases were found so we need to iterate through
+				 * them, tokenize them as phrases, and remove them from the raw
+				 * input string before we move on to the next processing step.
+				 */
+				foreach ($matches[1] as $key => $match)
+				{
+					// Find the complete phrase in the input string.
+					$pos = StringHelper::strpos($input, $matches[0][$key]);
+					$len = StringHelper::strlen($matches[0][$key]);
+
+					// Add any terms that are before this phrase to the stack.
+					if (trim(StringHelper::substr($input, 0, $pos)))
+					{
+						$terms = array_merge($terms, explode(' ', trim(StringHelper::substr($input, 0, $pos))));
+					}
+
+					// Strip out everything up to and including the phrase.
+					$input = StringHelper::substr($input, $pos + $len);
+
+					// Clean up the input string again.
+					$input = preg_replace('#\s+#mi', ' ', $input);
+					$input = trim($input);
+
+					// Get the number of words in the phrase.
+					$parts = explode(' ', $match);
+
+					// Check if the phrase is longer than three words.
+					if (count($parts) > 3)
+					{
+						/*
+						 * If the phrase is longer than three words, we need to
+						 * break it down into smaller chunks of phrases that
+						 * are less than or equal to three words. We overlap
+						 * the chunks so that we can ensure that a match is
+						 * found for the complete phrase and not just portions
+						 * of it.
+						 */
+						for ($i = 0, $c = count($parts); $i < $c; $i += 2)
+						{
+							// Set up the chunk.
+							$chunk = array();
+
+							// The chunk has to be assembled based on how many
+							// pieces are available to use.
+							switch ($c - $i)
+							{
+								/*
+								 * If only one word is left, we can break from
+								 * the switch and loop because the last word
+								 * was already used at the end of the last
+								 * chunk.
+								 */
+								case 1:
+									break 2;
+
+								// If there words are left, we use them both as
+								// the last chunk of the phrase and we're done.
+								case 2:
+									$chunk[] = $parts[$i];
+									$chunk[] = $parts[$i + 1];
+									break;
+
+								// If there are three or more words left, we
+								// build a three word chunk and continue on.
+								default:
+									$chunk[] = $parts[$i];
+									$chunk[] = $parts[$i + 1];
+									$chunk[] = $parts[$i + 2];
+									break;
+							}
+
+							// If the chunk is not empty, add it as a phrase.
+							if (count($chunk))
+							{
+								$phrases[] = implode(' ', $chunk);
+								$terms[] = implode(' ', $chunk);
+							}
+						}
+					}
+					else
+					{
+						// The phrase is <= 3 words so we can use it as is.
+						$phrases[] = $match;
+						$terms[] = $match;
+					}
+				}
+			}
+		}
+
+		// Add the remaining terms if present.
+		if (!empty($input))
+		{
+			$terms = array_merge($terms, explode(' ', $input));
+		}
+
+		// An array of our boolean operators. $operator => $translation
+		$operators = array(
+			'AND' => StringHelper::strtolower(JText::_('COM_FINDER_QUERY_OPERATOR_AND')),
+			'OR'  => StringHelper::strtolower(JText::_('COM_FINDER_QUERY_OPERATOR_OR')),
+			'NOT' => StringHelper::strtolower(JText::_('COM_FINDER_QUERY_OPERATOR_NOT')),
+		);
+
+		// If language debugging is enabled you need to ignore the debug strings in matching.
+		if (JDEBUG)
+		{
+			$debugStrings = array('**', '??');
+			$operators = str_replace($debugStrings, '', $operators);
+		}
+
+		/*
+		 * Iterate through the terms and perform any sorting that needs to be
+		 * done based on boolean search operators. Terms that are before an
+		 * and/or/not modifier have to be handled in relation to their operator.
+		 */
+		for ($i = 0, $c = count($terms); $i < $c; $i++)
+		{
+			// Check if the term is followed by an operator that we understand.
+			if (isset($terms[$i + 1]) && in_array($terms[$i + 1], $operators))
+			{
+				// Get the operator mode.
+				$op = array_search($terms[$i + 1], $operators);
+
+				// Handle the AND operator.
+				if ($op === 'AND' && isset($terms[$i + 2]))
+				{
+					// Tokenize the current term.
+					$token = FinderIndexerHelper::tokenize($terms[$i], $lang, true);
+					$token = $this->getTokenData($token);
+
+					// Set the required flag.
+					$token->required = true;
+
+					// Add the current token to the stack.
+					$this->included[] = $token;
+					$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+
+					// Skip the next token (the mode operator).
+					$this->operators[] = $terms[$i + 1];
+
+					// Tokenize the term after the next term (current plus two).
+					$other = FinderIndexerHelper::tokenize($terms[$i + 2], $lang, true);
+					$other = $this->getTokenData($other);
+
+					// Set the required flag.
+					$other->required = true;
+
+					// Add the token after the next token to the stack.
+					$this->included[] = $other;
+					$this->highlight = array_merge($this->highlight, array_keys($other->matches));
+
+					// Remove the processed phrases if possible.
+					if (($pk = array_search($terms[$i], $phrases)) !== false)
+					{
+						unset($phrases[$pk]);
+					}
+
+					if (($pk = array_search($terms[$i + 2], $phrases)) !== false)
+					{
+						unset($phrases[$pk]);
+					}
+
+					// Remove the processed terms.
+					unset($terms[$i]);
+					unset($terms[$i + 1]);
+					unset($terms[$i + 2]);
+
+					// Adjust the loop.
+					$i += 2;
+					continue;
+				}
+				// Handle the OR operator.
+				elseif ($op === 'OR' && isset($terms[$i + 2]))
+				{
+					// Tokenize the current term.
+					$token = FinderIndexerHelper::tokenize($terms[$i], $lang, true);
+					$token = $this->getTokenData($token);
+
+					// Set the required flag.
+					$token->required = false;
+
+					// Add the current token to the stack.
+					if (count($token->matches))
+					{
+						$this->included[] = $token;
+						$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+					}
+					else
+					{
+						$this->ignored[] = $token;
+					}
+
+					// Skip the next token (the mode operator).
+					$this->operators[] = $terms[$i + 1];
+
+					// Tokenize the term after the next term (current plus two).
+					$other = FinderIndexerHelper::tokenize($terms[$i + 2], $lang, true);
+					$other = $this->getTokenData($other);
+
+					// Set the required flag.
+					$other->required = false;
+
+					// Add the token after the next token to the stack.
+					if (count($other->matches))
+					{
+						$this->included[] = $other;
+						$this->highlight = array_merge($this->highlight, array_keys($other->matches));
+					}
+					else
+					{
+						$this->ignored[] = $other;
+					}
+
+					// Remove the processed phrases if possible.
+					if (($pk = array_search($terms[$i], $phrases)) !== false)
+					{
+						unset($phrases[$pk]);
+					}
+
+					if (($pk = array_search($terms[$i + 2], $phrases)) !== false)
+					{
+						unset($phrases[$pk]);
+					}
+
+					// Remove the processed terms.
+					unset($terms[$i]);
+					unset($terms[$i + 1]);
+					unset($terms[$i + 2]);
+
+					// Adjust the loop.
+					$i += 2;
+					continue;
+				}
+			}
+			// Handle an orphaned OR operator.
+			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators) === 'OR')
+			{
+				// Skip the next token (the mode operator).
+				$this->operators[] = $terms[$i];
+
+				// Tokenize the next term (current plus one).
+				$other = FinderIndexerHelper::tokenize($terms[$i + 1], $lang, true);
+				$other = $this->getTokenData($other);
+
+				// Set the required flag.
+				$other->required = false;
+
+				// Add the token after the next token to the stack.
+				if (count($other->matches))
+				{
+					$this->included[] = $other;
+					$this->highlight = array_merge($this->highlight, array_keys($other->matches));
+				}
+				else
+				{
+					$this->ignored[] = $other;
+				}
+
+				// Remove the processed phrase if possible.
+				if (($pk = array_search($terms[$i + 1], $phrases)) !== false)
+				{
+					unset($phrases[$pk]);
+				}
+
+				// Remove the processed terms.
+				unset($terms[$i]);
+				unset($terms[$i + 1]);
+
+				// Adjust the loop.
+				$i++;
+				continue;
+			}
+			// Handle the NOT operator.
+			elseif (isset($terms[$i + 1]) && array_search($terms[$i], $operators) === 'NOT')
+			{
+				// Skip the next token (the mode operator).
+				$this->operators[] = $terms[$i];
+
+				// Tokenize the next term (current plus one).
+				$other = FinderIndexerHelper::tokenize($terms[$i + 1], $lang, true);
+				$other = $this->getTokenData($other);
+
+				// Set the required flag.
+				$other->required = false;
+
+				// Add the next token to the stack.
+				if (count($other->matches))
+				{
+					$this->excluded[] = $other;
+				}
+				else
+				{
+					$this->ignored[] = $other;
+				}
+
+				// Remove the processed phrase if possible.
+				if (($pk = array_search($terms[$i + 1], $phrases)) !== false)
+				{
+					unset($phrases[$pk]);
+				}
+
+				// Remove the processed terms.
+				unset($terms[$i]);
+				unset($terms[$i + 1]);
+
+				// Adjust the loop.
+				$i++;
+				continue;
+			}
+		}
+
+		/*
+		 * Iterate through any search phrases and tokenize them. We handle
+		 * phrases as autonomous units and do not break them down into two and
+		 * three word combinations.
+		 */
+		for ($i = 0, $c = count($phrases); $i < $c; $i++)
+		{
+			// Tokenize the phrase.
+			$token = FinderIndexerHelper::tokenize($phrases[$i], $lang, true);
+			$token = $this->getTokenData($token);
+
+			// Set the required flag.
+			$token->required = true;
+
+			// Add the current token to the stack.
+			$this->included[] = $token;
+			$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+
+			// Remove the processed term if possible.
+			if (($pk = array_search($phrases[$i], $terms)) !== false)
+			{
+				unset($terms[$pk]);
+			}
+
+			// Remove the processed phrase.
+			unset($phrases[$i]);
+		}
+
+		/*
+		 * Handle any remaining tokens using the standard processing mechanism.
+		 */
+		if (!empty($terms))
+		{
+			// Tokenize the terms.
+			$terms = implode(' ', $terms);
+			$tokens = FinderIndexerHelper::tokenize($terms, $lang, false);
+
+			// Make sure we are working with an array.
+			$tokens = is_array($tokens) ? $tokens : array($tokens);
+
+			// Get the token data and required state for all the tokens.
+			foreach ($tokens as $token)
+			{
+				// Get the token data.
+				$token = $this->getTokenData($token);
+
+				// Set the required flag for the token.
+				$token->required = $mode === 'AND' ? ($token->phrase ? false : true) : false;
+
+				// Add the token to the appropriate stack.
+				if (count($token->matches) || $token->required)
+				{
+					$this->included[] = $token;
+					$this->highlight = array_merge($this->highlight, array_keys($token->matches));
+				}
+				else
+				{
+					$this->ignored[] = $token;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the base and similar term ids and, if necessary, suggested
+	 * term data from the database. The terms ids are identified based on a
+	 * 'like' match in MySQL and/or a common stem. If no term ids could be
+	 * found, then we know that we will not be able to return any results for
+	 * that term and we should try to find a similar term to use that we can
+	 * match so that we can suggest the alternative search query to the user.
+	 *
+	 * @param   FinderIndexerToken  $token  A FinderIndexerToken object.
+	 *
+	 * @return  FinderIndexerToken  A FinderIndexerToken object.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getTokenData($token)
+	{
+		// Get the database object.
+		$db = JFactory::getDbo();
+
+		// Create a database query to build match the token.
+		$query = $db->getQuery(true)
+			->select('t.term, t.term_id')
+			->from('#__finder_terms AS t');
+
+		/*
+		 * If the token is a phrase, the lookup process is fairly simple. If
+		 * the token is a word, it is a little more complicated. We have to
+		 * create two queries to lookup the term and the stem respectively,
+		 * then union the result sets together. This is MUCH faster than using
+		 * an or condition in the database query.
+		 */
+		if ($token->phrase)
+		{
+			// Add the phrase to the query.
+			$query->where('t.term = ' . $db->quote($token->term))
+				->where('t.phrase = 1');
+		}
+		else
+		{
+			// Add the term to the query.
+			$query->where('t.term = ' . $db->quote($token->term))
+				->where('t.phrase = 0');
+
+			// Clone the query, replace the WHERE clause.
+			$sub = clone $query;
+			$sub->clear('where');
+			$sub->where('t.stem = ' . $db->quote($token->stem));
+			$sub->where('t.phrase = 0');
+
+			// Union the two queries.
+			$query->union($sub);
+		}
+
+		// Get the terms.
+		$db->setQuery($query);
+		$matches = $db->loadObjectList();
+
+		// Setup the container.
+		$token->matches = array();
+
+		// Check the matching terms.
+		if (!empty($matches))
+		{
+			// Add the matches to the token.
+			for ($i = 0, $c = count($matches); $i < $c; $i++)
+			{
+				$token->matches[$matches[$i]->term] = (int) $matches[$i]->term_id;
+			}
+		}
+
+		// If no matches were found, try to find a similar but better token.
+		if (empty($token->matches))
+		{
+			// Create a database query to get the similar terms.
+			// TODO: PostgreSQL doesn't support SOUNDEX out of the box
+			$query->clear()
+				->select('DISTINCT t.term_id AS id, t.term AS term')
+				->from('#__finder_terms AS t')
+				// ->where('t.soundex = ' . soundex($db->quote($token->term)))
+				->where('t.soundex = SOUNDEX(' . $db->quote($token->term) . ')')
+				->where('t.phrase = ' . (int) $token->phrase);
+
+			// Get the terms.
+			$db->setQuery($query);
+			$results = $db->loadObjectList();
+
+			// Check if any similar terms were found.
+			if (empty($results))
+			{
+				return $token;
+			}
+
+			// Stack for sorting the similar terms.
+			$suggestions = array();
+
+			// Get the levnshtein distance for all suggested terms.
+			foreach ($results as $sk => $st)
+			{
+				// Get the levenshtein distance between terms.
+				$distance = levenshtein($st->term, $token->term);
+
+				// Make sure the levenshtein distance isn't over 50.
+				if ($distance < 50)
+				{
+					$suggestions[$sk] = $distance;
+				}
+			}
+
+			// Sort the suggestions.
+			asort($suggestions, SORT_NUMERIC);
+
+			// Get the closest match.
+			$keys = array_keys($suggestions);
+			$key = $keys[0];
+
+			// Add the suggested term.
+			$token->suggestion = $results[$key]->term;
+		}
+
+		return $token;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/result.php b/core/administrator/components/com_finder/helpers/indexer/result.php
new file mode 100644
index 00000000..58629d06
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/result.php
@@ -0,0 +1,428 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexer', __DIR__ . '/indexer.php');
+
+/**
+ * Result class for the Finder indexer package.
+ *
+ * This class uses magic __get() and __set() methods to prevent properties
+ * being added that might confuse the system. All properties not explicitly
+ * declared will be pushed into the elements array and can be accessed
+ * explicitly using the getElement() method.
+ *
+ * @since  2.5
+ */
+class FinderIndexerResult
+{
+	/**
+	 * An array of extra result properties.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $elements = array();
+
+	/**
+	 * This array tells the indexer which properties should be indexed and what
+	 * weights to use for those properties.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $instructions = array(
+		FinderIndexer::TITLE_CONTEXT => array('title', 'subtitle', 'id'),
+		FinderIndexer::TEXT_CONTEXT  => array('summary', 'body'),
+		FinderIndexer::META_CONTEXT  => array('meta', 'list_price', 'sale_price'),
+		FinderIndexer::PATH_CONTEXT  => array('path', 'alias'),
+		FinderIndexer::MISC_CONTEXT  => array('comments'),
+	);
+
+	/**
+	 * The indexer will use this data to create taxonomy mapping entries for
+	 * the item so that it can be filtered by type, label, category,
+	 * or whatever.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $taxonomy = array();
+
+	/**
+	 * The content URL.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $url;
+
+	/**
+	 * The content route.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $route;
+
+	/**
+	 * The content title.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $title;
+
+	/**
+	 * The content description.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $description;
+
+	/**
+	 * The published state of the result.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $published;
+
+	/**
+	 * The content published state.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $state;
+
+	/**
+	 * The content access level.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $access;
+
+	/**
+	 * The content language.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $language = '*';
+
+	/**
+	 * The publishing start date.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $publish_start_date;
+
+	/**
+	 * The publishing end date.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $publish_end_date;
+
+	/**
+	 * The generic start date.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $start_date;
+
+	/**
+	 * The generic end date.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $end_date;
+
+	/**
+	 * The item list price.
+	 *
+	 * @var    mixed
+	 * @since  2.5
+	 */
+	public $list_price;
+
+	/**
+	 * The item sale price.
+	 *
+	 * @var    mixed
+	 * @since  2.5
+	 */
+	public $sale_price;
+
+	/**
+	 * The content type id. This is set by the adapter.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $type_id;
+
+	/**
+	 * The default language for content.
+	 *
+	 * @var    string
+	 * @since  3.0.2
+	 */
+	public $defaultLanguage;
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.0.3
+	 */
+	public function __construct()
+	{
+		$this->defaultLanguage = JComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+	}
+
+	/**
+	 * The magic set method is used to push additional values into the elements
+	 * array in order to preserve the cleanliness of the object.
+	 *
+	 * @param   string  $name   The name of the element.
+	 * @param   mixed   $value  The value of the element.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function __set($name, $value)
+	{
+		$this->setElement($name, $value);
+	}
+
+	/**
+	 * The magic get method is used to retrieve additional element values from the elements array.
+	 *
+	 * @param   string  $name  The name of the element.
+	 *
+	 * @return  mixed  The value of the element if set, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function __get($name)
+	{
+		return $this->getElement($name);
+	}
+
+	/**
+	 * The magic isset method is used to check the state of additional element values in the elements array.
+	 *
+	 * @param   string  $name  The name of the element.
+	 *
+	 * @return  boolean  True if set, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function __isset($name)
+	{
+		return isset($this->elements[$name]);
+	}
+
+	/**
+	 * The magic unset method is used to unset additional element values in the elements array.
+	 *
+	 * @param   string  $name  The name of the element.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function __unset($name)
+	{
+		unset($this->elements[$name]);
+	}
+
+	/**
+	 * Method to retrieve additional element values from the elements array.
+	 *
+	 * @param   string  $name  The name of the element.
+	 *
+	 * @return  mixed  The value of the element if set, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function getElement($name)
+	{
+		// Get the element value if set.
+		if (array_key_exists($name, $this->elements))
+		{
+			return $this->elements[$name];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to retrieve all elements.
+	 *
+	 * @return  array  The elements
+	 *
+	 * @since   3.8.3
+	 */
+	public function getElements()
+	{
+		return $this->elements;
+	}
+
+	/**
+	 * Method to set additional element values in the elements array.
+	 *
+	 * @param   string  $name   The name of the element.
+	 * @param   mixed   $value  The value of the element.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function setElement($name, $value)
+	{
+		$this->elements[$name] = $value;
+	}
+
+	/**
+	 * Method to get all processing instructions.
+	 *
+	 * @return  array  An array of processing instructions.
+	 *
+	 * @since   2.5
+	 */
+	public function getInstructions()
+	{
+		return $this->instructions;
+	}
+
+	/**
+	 * Method to add a processing instruction for an item property.
+	 *
+	 * @param   string  $group     The group to associate the property with.
+	 * @param   string  $property  The property to process.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function addInstruction($group, $property)
+	{
+		// Check if the group exists. We can't add instructions for unknown groups.
+		if (array_key_exists($group, $this->instructions))
+		{
+			// Check if the property exists in the group.
+			if (!in_array($property, $this->instructions[$group]))
+			{
+				// Add the property to the group.
+				$this->instructions[$group][] = $property;
+			}
+		}
+	}
+
+	/**
+	 * Method to remove a processing instruction for an item property.
+	 *
+	 * @param   string  $group     The group to associate the property with.
+	 * @param   string  $property  The property to process.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function removeInstruction($group, $property)
+	{
+		// Check if the group exists. We can't remove instructions for unknown groups.
+		if (array_key_exists($group, $this->instructions))
+		{
+			// Search for the property in the group.
+			$key = array_search($property, $this->instructions[$group]);
+
+			// If the property was found, remove it.
+			if ($key !== false)
+			{
+				unset($this->instructions[$group][$key]);
+			}
+		}
+	}
+
+	/**
+	 * Method to get the taxonomy maps for an item.
+	 *
+	 * @param   string  $branch  The taxonomy branch to get. [optional]
+	 *
+	 * @return  array  An array of taxonomy maps.
+	 *
+	 * @since   2.5
+	 */
+	public function getTaxonomy($branch = null)
+	{
+		// Get the taxonomy branch if available.
+		if ($branch !== null && isset($this->taxonomy[$branch]))
+		{
+			// Filter the input.
+			$branch = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,_]+#mui', ' ', $branch);
+
+			return $this->taxonomy[$branch];
+		}
+
+		return $this->taxonomy;
+	}
+
+	/**
+	 * Method to add a taxonomy map for an item.
+	 *
+	 * @param   string   $branch  The title of the taxonomy branch to add the node to.
+	 * @param   string   $title   The title of the taxonomy node.
+	 * @param   integer  $state   The published state of the taxonomy node. [optional]
+	 * @param   integer  $access  The access level of the taxonomy node. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function addTaxonomy($branch, $title, $state = 1, $access = 1)
+	{
+		// Filter the input.
+		$branch = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,_]+#mui', ' ', $branch);
+
+		// Create the taxonomy node.
+		$node = new JObject;
+		$node->title = $title;
+		$node->state = (int) $state;
+		$node->access = (int) $access;
+
+		// Add the node to the taxonomy branch.
+		$this->taxonomy[$branch][$node->title] = $node;
+	}
+
+	/**
+	 * Method to set the item language
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function setLanguage()
+	{
+		if ($this->language == '')
+		{
+			$this->language = $this->defaultLanguage;
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/stemmer.php b/core/administrator/components/com_finder/helpers/indexer/stemmer.php
new file mode 100644
index 00000000..15ecc7cb
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/stemmer.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Stemmer base class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+abstract class FinderIndexerStemmer
+{
+	/**
+	 * An internal cache of stemmed tokens.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $cache = array();
+
+	/**
+	 * Method to get a stemmer, creating it if necessary.
+	 *
+	 * @param   string  $adapter  The type of stemmer to load.
+	 *
+	 * @return  FinderIndexerStemmer  A FinderIndexerStemmer instance.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on invalid stemmer.
+	 */
+	public static function getInstance($adapter)
+	{
+		static $instances;
+
+		// Only create one stemmer for each adapter.
+		if (isset($instances[$adapter]))
+		{
+			return $instances[$adapter];
+		}
+
+		// Create an array of instances if necessary.
+		if (!is_array($instances))
+		{
+			$instances = array();
+		}
+
+		// Setup the adapter for the stemmer.
+		$adapter = JFilterInput::getInstance()->clean($adapter, 'cmd');
+		$path = __DIR__ . '/stemmer/' . $adapter . '.php';
+		$class = 'FinderIndexerStemmer' . ucfirst($adapter);
+
+		// Check if a stemmer exists for the adapter.
+		if (!file_exists($path))
+		{
+			// Throw invalid adapter exception.
+			throw new Exception(JText::sprintf('COM_FINDER_INDEXER_INVALID_STEMMER', $adapter));
+		}
+
+		// Instantiate the stemmer.
+		JLoader::register($class, $path);
+		$instances[$adapter] = new $class;
+
+		return $instances[$adapter];
+	}
+
+	/**
+	 * Method to stem a token and return the root.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   2.5
+	 */
+	abstract public function stem($token, $lang);
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/stemmer/fr.php b/core/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
new file mode 100644
index 00000000..8aa080ef
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexerStemmer', dirname(__DIR__) . '/stemmer.php');
+
+/**
+ * French stemmer class for Smart Search indexer.
+ *
+ * First contributed by Eric Sanou (bobotche@hotmail.fr)
+ * This class is inspired in  Alexis Ulrich's French stemmer code (http://alx2002.free.fr)
+ *
+ * @since  3.0
+ */
+class FinderIndexerStemmerFr extends FinderIndexerStemmer
+{
+	/**
+	 * Stemming rules.
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	private static $stemRules = null;
+
+	/**
+	 * Method to stem a token and return the root.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   3.0
+	 */
+	public function stem($token, $lang)
+	{
+		// Check if the token is long enough to merit stemming.
+		if (strlen($token) <= 2)
+		{
+			return $token;
+		}
+
+		// Check if the language is French or All.
+		if ($lang !== 'fr' && $lang != '*')
+		{
+			return $token;
+		}
+
+		// Stem the token if it is not in the cache.
+		if (!isset($this->cache[$lang][$token]))
+		{
+			// Stem the token.
+			$result = self::getStem($token);
+
+			// Add the token to the cache.
+			$this->cache[$lang][$token] = $result;
+		}
+
+		return $this->cache[$lang][$token];
+	}
+
+	/**
+	 * French stemmer rules variables.
+	 *
+	 * @return  array  The rules
+	 *
+	 * @since   3.0
+	 */
+	protected static function getStemRules()
+	{
+		if (self::$stemRules)
+		{
+			return self::$stemRules;
+		}
+
+		$vars = array();
+
+		// French accented letters in ISO-8859-1 encoding
+		$vars['accents'] = chr(224) . chr(226) . chr(232) . chr(233) . chr(234) . chr(235) . chr(238) . chr(239)
+			. chr(244) . chr(251) . chr(249) . chr(231);
+
+		// The rule patterns include all accented words for french language
+		$vars['rule_pattern'] = '/^([a-z' . $vars['accents'] . ']*)(\*){0,1}(\d)([a-z' . $vars['accents'] . ']*)([.|>])/';
+
+		// French vowels (including y) in ISO-8859-1 encoding
+		$vars['vowels'] = chr(97) . chr(224) . chr(226) . chr(101) . chr(232) . chr(233) . chr(234) . chr(235)
+			. chr(105) . chr(238) . chr(239) . chr(111) . chr(244) . chr(117) . chr(251) . chr(249) . chr(121);
+
+		// The French rules in ISO-8859-1 encoding
+		$vars['rules'] = array(
+			'esre1>', 'esio1>', 'siol1.', 'siof0.', 'sioe0.', 'sio3>', 'st1>', 'sf1>', 'sle1>', 'slo1>', 's' . chr(233) . '1>', chr(233) . 'tuae5.',
+			chr(233) . 'tuae2.', 'tnia0.', 'tniv1.', 'tni3>', 'suor1.', 'suo0.', 'sdrail5.', 'sdrai4.', 'er' . chr(232) . 'i1>', 'sesue3x>',
+			'esuey5i.', 'esue2x>', 'se1>', 'er' . chr(232) . 'g3.', 'eca1>', 'esiah0.', 'esi1>', 'siss2.', 'sir2>', 'sit2>', 'egan' . chr(233) . '1.',
+			'egalli6>', 'egass1.', 'egas0.', 'egat3.', 'ega3>', 'ette4>', 'ett2>', 'etio1.', 'tio' . chr(231) . '4c.', 'tio0.', 'et1>', 'eb1>',
+			'snia1>', 'eniatnau8>', 'eniatn4.', 'enia1>', 'niatnio3.', 'niatg3.', 'e' . chr(233) . '1>', chr(233) . 'hcat1.', chr(233) . 'hca4.',
+			chr(233) . 'tila5>', chr(233) . 'tici5.', chr(233) . 'tir1.', chr(233) . 'ti3>', chr(233) . 'gan1.', chr(233) . 'ga3>',
+			chr(233) . 'tehc1.', chr(233) . 'te3>', chr(233) . 'it0.', chr(233) . '1>', 'eire4.', 'eirue5.', 'eio1.', 'eia1.', 'ei1>', 'eng1.',
+			'xuaessi7.', 'xuae1>', 'uaes0.', 'uae3.', 'xuave2l.', 'xuav2li>', 'xua3la>', 'ela1>', 'lart2.', 'lani2>', 'la' . chr(233) . '2>',
+			'siay4i.', 'siassia7.', 'siarv1*.', 'sia1>', 'tneiayo6i.', 'tneiay6i.', 'tneiassia9.', 'tneiareio7.', 'tneia5>', 'tneia4>', 'tiario4.',
+			'tiarim3.', 'tiaria3.', 'tiaris3.', 'tiari5.', 'tiarve6>', 'tiare5>', 'iare4>', 'are3>', 'tiay4i.', 'tia3>', 'tnay4i.',
+			'em' . chr(232) . 'iu5>', 'em' . chr(232) . 'i4>', 'tnaun3.', 'tnauqo3.', 'tnau4>', 'tnaf0.', 'tnat' . chr(233) . '2>', 'tna3>', 'tno3>',
+			'zeiy4i.', 'zey3i.', 'zeire5>', 'zeird4.', 'zeirio4.', 'ze2>', 'ssiab0.', 'ssia4.', 'ssi3.', 'tnemma6>', 'tnemesuey9i.', 'tnemesue8>',
+			'tnemevi7.', 'tnemessia5.', 'tnemessi8.', 'tneme5>', 'tnemia4.', 'tnem' . chr(233) . '5>', 'el2l>', 'lle3le>', 'let' . chr(244) . '0.',
+			'lepp0.', 'le2>', 'srei1>', 'reit3.', 'reila2.', 'rei3>', 'ert' . chr(226) . 'e5.', 'ert' . chr(226) . chr(233) . '1.',
+			'ert' . chr(226) . '4.', 'drai4.', 'erdro0.', 'erute5.', 'ruta0.', 'eruta1.', 'erutiov1.', 'erub3.', 'eruh3.', 'erul3.', 'er2r>', 'nn1>',
+			'r' . chr(232) . 'i3.', 'srev0.', 'sr1>', 'rid2>', 're2>', 'xuei4.', 'esuei5.', 'lbati3.', 'lba3>', 'rueis0.', 'ruehcn4.', 'ecirta6.',
+			'ruetai6.', 'rueta5.', 'rueir0.', 'rue3>', 'esseti6.', 'essere6>', 'esserd1.', 'esse4>', 'essiab1.', 'essia5.', 'essio1.', 'essi4.',
+			'essal4.', 'essa1>', 'ssab1.', 'essurp1.', 'essu4.', 'essi1.', 'ssor1.', 'essor2.', 'esso1>', 'ess2>', 'tio3.', 'r' . chr(232) . 's2re.',
+			'r' . chr(232) . '0e.', 'esn1.', 'eu1>', 'sua0.', 'su1>', 'utt1>', 'tu' . chr(231) . '3c.', 'u' . chr(231) . '2c.', 'ur1.', 'ehcn2>',
+			'ehcu1>', 'snorr3.', 'snoru3.', 'snorua3.', 'snorv3.', 'snorio4.', 'snori5.', 'snore5>', 'snortt4>', 'snort' . chr(238) . 'a7.', 'snort3.',
+			'snor4.', 'snossi6.', 'snoire6.', 'snoird5.', 'snoitai7.', 'snoita6.', 'snoits1>', 'noits0.', 'snoi4>', 'noitaci7>', 'noitai6.', 'noita5.',
+			'noitu4.', 'noi3>', 'snoya0.', 'snoy4i.', 'sno' . chr(231) . 'a1.', 'sno' . chr(231) . 'r1.', 'snoe4.', 'snosiar1>', 'snola1.', 'sno3>',
+			'sno1>', 'noll2.', 'tnennei4.', 'ennei2>', 'snei1>', 'sne' . chr(233) . '1>', 'enne' . chr(233) . '5e.', 'ne' . chr(233) . '3e.', 'neic0.',
+			'neiv0.', 'nei3.', 'sc1.', 'sd1.', 'sg1.', 'sni1.', 'tiu0.', 'ti2.', 'sp1>', 'sna1>', 'sue1.', 'enn2>', 'nong2.', 'noss2.', 'rioe4.',
+			'riot0.', 'riorc1.', 'riovec5.', 'rio3.', 'ric2.', 'ril2.', 'tnerim3.', 'tneris3>', 'tneri5.', 't' . chr(238) . 'a3.', 'riss2.',
+			't' . chr(238) . '2.', 't' . chr(226) . '2>', 'ario2.', 'arim1.', 'ara1.', 'aris1.', 'ari3.', 'art1>', 'ardn2.', 'arr1.', 'arua1.',
+			'aro1.', 'arv1.', 'aru1.', 'ar2.', 'rd1.', 'ud1.', 'ul1.', 'ini1.', 'rin2.', 'tnessiab3.', 'tnessia7.', 'tnessi6.', 'tnessni4.', 'sini2.',
+			'sl1.', 'iard3.', 'iario3.', 'ia2>', 'io0.', 'iule2.', 'i1>', 'sid2.', 'sic2.', 'esoi4.', 'ed1.', 'ai2>', 'a1>', 'adr1.',
+			'tner' . chr(232) . '5>', 'evir1.', 'evio4>', 'evi3.', 'fita4.', 'fi2>', 'enie1.', 'sare4>', 'sari4>', 'sard3.', 'sart2>', 'sa2.',
+			'tnessa6>', 'tnessu6>', 'tnegna3.', 'tnegi3.', 'tneg0.', 'tneru5>', 'tnemg0.', 'tnerni4.', 'tneiv1.', 'tne3>', 'une1.', 'en1>', 'nitn2.',
+			'ecnay5i.', 'ecnal1.', 'ecna4.', 'ec1>', 'nn1.', 'rit2>', 'rut2>', 'rud2.', 'ugn1>', 'eg1>', 'tuo0.', 'tul2>', 't' . chr(251) . '2>',
+			'ev1>', 'v' . chr(232) . '2ve>', 'rtt1>', 'emissi6.', 'em1.', 'ehc1.', 'c' . chr(233) . 'i2c' . chr(232) . '.', 'libi2l.', 'llie1.',
+			'liei4i.', 'xuev1.', 'xuey4i.', 'xueni5>', 'xuell4.', 'xuere5.', 'xue3>', 'rb' . chr(233) . '3rb' . chr(232) . '.', 'tur2.',
+			'rir' . chr(233) . '4re.', 'rir2.', 'c' . chr(226) . '2ca.', 'snu1.', 'rt' . chr(238) . 'a4.', 'long2.', 'vec2.', chr(231) . '1c>',
+			'ssilp3.', 'silp2.', 't' . chr(232) . 'hc2te.', 'n' . chr(232) . 'm2ne.', 'llepp1.', 'tan2.', 'rv' . chr(232) . '3rve.',
+			'rv' . chr(233) . '3rve.', 'r' . chr(232) . '2re.', 'r' . chr(233) . '2re.', 't' . chr(232) . '2te.', 't' . chr(233) . '2te.', 'epp1.',
+			'eya2i.', 'ya1i.', 'yo1i.', 'esu1.', 'ugi1.', 'tt1.', 'end0.'
+		);
+
+		self::$stemRules = $vars;
+
+		return self::$stemRules;
+	}
+
+	/**
+	 * Returns the number of the first rule from the rule number
+	 * that can be applied to the given reversed input.
+	 * returns -1 if no rule can be applied, ie the stem has been found
+	 *
+	 * @param   string   $reversed_input  The input to check in reversed order
+	 * @param   integer  $rule_number     The rule number to check
+	 *
+	 * @return  integer  Number of the first rule
+	 *
+	 * @since   3.0
+	 */
+	private static function getFirstRule($reversed_input, $rule_number)
+	{
+		$vars = static::getStemRules();
+
+		$nb_rules = count($vars['rules']);
+
+		for ($i = $rule_number; $i < $nb_rules; $i++)
+		{
+			// Gets the letters from the current rule
+			$rule = $vars['rules'][$i];
+			$rule = preg_replace($vars['rule_pattern'], "\\1", $rule);
+
+			if (strncasecmp(utf8_decode($rule), $reversed_input, strlen(utf8_decode($rule))) == 0)
+			{
+				return $i;
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Check the acceptability of a stem for French language
+	 *
+	 * @param   string  $reversed_stem  The stem to check in reverse form
+	 *
+	 * @return  boolean  True if stem is acceptable
+	 *
+	 * @since   3.0
+	 */
+	private static function check($reversed_stem)
+	{
+		$vars = static::getStemRules();
+
+		if (preg_match('/[' . $vars['vowels'] . ']$/', utf8_encode($reversed_stem)))
+		{
+			// If the form starts with a vowel then at least two letters must remain after stemming (e.g.: "etaient" --> "et")
+			return (strlen($reversed_stem) > 2);
+		}
+		else
+		{
+			// If the reversed stem starts with a consonant then at least two letters must remain after stemming
+			if (strlen($reversed_stem) <= 2)
+			{
+				return false;
+			}
+
+			// And at least one of these must be a vowel or "y"
+			return preg_match('/[' . $vars['vowels'] . ']/', utf8_encode($reversed_stem));
+		}
+	}
+
+	/**
+	 * Paice/Husk stemmer which returns a stem for the given $input
+	 *
+	 * @param   string  $input  The word for which we want the stem in UTF-8
+	 *
+	 * @return  string  The stem
+	 *
+	 * @since   3.0
+	 */
+	private static function getStem($input)
+	{
+		$vars = static::getStemRules();
+
+		$intact = true;
+		$reversed_input = strrev(utf8_decode($input));
+		$rule_number = 0;
+
+		// This loop goes through the rules' array until it finds an ending one (ending by '.') or the last one ('end0.')
+		while (true)
+		{
+			$rule_number = self::getFirstRule($reversed_input, $rule_number);
+
+			if ($rule_number == -1)
+			{
+				// No other rule can be applied => the stem has been found
+				break;
+			}
+
+			$rule = $vars['rules'][$rule_number];
+			preg_match($vars['rule_pattern'], $rule, $matches);
+
+			if ($matches[2] != '*' || $intact)
+			{
+				$reversed_stem = utf8_decode($matches[4]) . substr($reversed_input, $matches[3], strlen($reversed_input) - $matches[3]);
+
+				if (self::check($reversed_stem))
+				{
+					$reversed_input = $reversed_stem;
+
+					if ($matches[5] == '.')
+					{
+						break;
+					}
+				}
+				else
+				{
+					// Go to another rule
+					$rule_number++;
+				}
+			}
+			else
+			{
+				// Go to another rule
+				$rule_number++;
+			}
+		}
+
+		return utf8_encode(strrev($reversed_input));
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php b/core/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
new file mode 100644
index 00000000..663cc6cf
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
@@ -0,0 +1,446 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexerStemmer', dirname(__DIR__) . '/stemmer.php');
+
+/**
+ * Porter English stemmer class for the Finder indexer package.
+ *
+ * This class was adapted from one written by Richard Heyes.
+ * See copyright and link information above.
+ *
+ * @since  2.5
+ */
+class FinderIndexerStemmerPorter_En extends FinderIndexerStemmer
+{
+	/**
+	 * Regex for matching a consonant.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	private static $regex_consonant = '(?:[bcdfghjklmnpqrstvwxz]|(?<=[aeiou])y|^y)';
+
+	/**
+	 * Regex for matching a vowel
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	private static $regex_vowel = '(?:[aeiou]|(?<![aeiou])y)';
+
+	/**
+	 * Method to stem a token and return the root.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   2.5
+	 */
+	public function stem($token, $lang)
+	{
+		// Check if the token is long enough to merit stemming.
+		if (strlen($token) <= 2)
+		{
+			return $token;
+		}
+
+		// Check if the language is English or All.
+		if ($lang !== 'en' && $lang != '*')
+		{
+			return $token;
+		}
+
+		// Stem the token if it is not in the cache.
+		if (!isset($this->cache[$lang][$token]))
+		{
+			// Stem the token.
+			$result = $token;
+			$result = self::step1ab($result);
+			$result = self::step1c($result);
+			$result = self::step2($result);
+			$result = self::step3($result);
+			$result = self::step4($result);
+			$result = self::step5($result);
+
+			// Add the token to the cache.
+			$this->cache[$lang][$token] = $result;
+		}
+
+		return $this->cache[$lang][$token];
+	}
+
+	/**
+	 * Step 1
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	private static function step1ab($word)
+	{
+		// Part a
+		if (substr($word, -1) == 's')
+		{
+			self::replace($word, 'sses', 'ss')
+			|| self::replace($word, 'ies', 'i')
+			|| self::replace($word, 'ss', 'ss')
+			|| self::replace($word, 's', '');
+		}
+
+		// Part b
+		if (substr($word, -2, 1) != 'e' || !self::replace($word, 'eed', 'ee', 0))
+		{
+			// First rule
+			$v = self::$regex_vowel;
+
+			// Words ending with ing and ed
+			// Note use of && and OR, for precedence reasons
+			if (preg_match("#$v+#", substr($word, 0, -3)) && self::replace($word, 'ing', '')
+				|| preg_match("#$v+#", substr($word, 0, -2)) && self::replace($word, 'ed', ''))
+			{
+				// If one of above two test successful
+				if (!self::replace($word, 'at', 'ate') && !self::replace($word, 'bl', 'ble') && !self::replace($word, 'iz', 'ize'))
+				{
+					// Double consonant ending
+					if (self::doubleConsonant($word) && substr($word, -2) != 'll' && substr($word, -2) != 'ss' && substr($word, -2) != 'zz')
+					{
+						$word = substr($word, 0, -1);
+					}
+					elseif (self::m($word) == 1 && self::cvc($word))
+					{
+						$word .= 'e';
+					}
+				}
+			}
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 1c
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	private static function step1c($word)
+	{
+		$v = self::$regex_vowel;
+
+		if (substr($word, -1) == 'y' && preg_match("#$v+#", substr($word, 0, -1)))
+		{
+			self::replace($word, 'y', 'i');
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 2
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	private static function step2($word)
+	{
+		switch (substr($word, -2, 1))
+		{
+			case 'a':
+				self::replace($word, 'ational', 'ate', 0)
+				|| self::replace($word, 'tional', 'tion', 0);
+				break;
+			case 'c':
+				self::replace($word, 'enci', 'ence', 0)
+				|| self::replace($word, 'anci', 'ance', 0);
+				break;
+			case 'e':
+				self::replace($word, 'izer', 'ize', 0);
+				break;
+			case 'g':
+				self::replace($word, 'logi', 'log', 0);
+				break;
+			case 'l':
+				self::replace($word, 'entli', 'ent', 0)
+				|| self::replace($word, 'ousli', 'ous', 0)
+				|| self::replace($word, 'alli', 'al', 0)
+				|| self::replace($word, 'bli', 'ble', 0)
+				|| self::replace($word, 'eli', 'e', 0);
+				break;
+			case 'o':
+				self::replace($word, 'ization', 'ize', 0)
+				|| self::replace($word, 'ation', 'ate', 0)
+				|| self::replace($word, 'ator', 'ate', 0);
+				break;
+			case 's':
+				self::replace($word, 'iveness', 'ive', 0)
+				|| self::replace($word, 'fulness', 'ful', 0)
+				|| self::replace($word, 'ousness', 'ous', 0)
+				|| self::replace($word, 'alism', 'al', 0);
+				break;
+			case 't':
+				self::replace($word, 'biliti', 'ble', 0)
+				|| self::replace($word, 'aliti', 'al', 0)
+				|| self::replace($word, 'iviti', 'ive', 0);
+				break;
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 3
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	private static function step3($word)
+	{
+		switch (substr($word, -2, 1))
+		{
+			case 'a':
+				self::replace($word, 'ical', 'ic', 0);
+				break;
+			case 's':
+				self::replace($word, 'ness', '', 0);
+				break;
+			case 't':
+				self::replace($word, 'icate', 'ic', 0)
+				|| self::replace($word, 'iciti', 'ic', 0);
+				break;
+			case 'u':
+				self::replace($word, 'ful', '', 0);
+				break;
+			case 'v':
+				self::replace($word, 'ative', '', 0);
+				break;
+			case 'z':
+				self::replace($word, 'alize', 'al', 0);
+				break;
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 4
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	private static function step4($word)
+	{
+		switch (substr($word, -2, 1))
+		{
+			case 'a':
+				self::replace($word, 'al', '', 1);
+				break;
+			case 'c':
+				self::replace($word, 'ance', '', 1)
+				|| self::replace($word, 'ence', '', 1);
+				break;
+			case 'e':
+				self::replace($word, 'er', '', 1);
+				break;
+			case 'i':
+				self::replace($word, 'ic', '', 1);
+				break;
+			case 'l':
+				self::replace($word, 'able', '', 1)
+				|| self::replace($word, 'ible', '', 1);
+				break;
+			case 'n':
+				self::replace($word, 'ant', '', 1)
+				|| self::replace($word, 'ement', '', 1)
+				|| self::replace($word, 'ment', '', 1)
+				|| self::replace($word, 'ent', '', 1);
+				break;
+			case 'o':
+				if (substr($word, -4) == 'tion' || substr($word, -4) == 'sion')
+				{
+					self::replace($word, 'ion', '', 1);
+				}
+				else
+				{
+					self::replace($word, 'ou', '', 1);
+				}
+				break;
+			case 's':
+				self::replace($word, 'ism', '', 1);
+				break;
+			case 't':
+				self::replace($word, 'ate', '', 1)
+				|| self::replace($word, 'iti', '', 1);
+				break;
+			case 'u':
+				self::replace($word, 'ous', '', 1);
+				break;
+			case 'v':
+				self::replace($word, 'ive', '', 1);
+				break;
+			case 'z':
+				self::replace($word, 'ize', '', 1);
+				break;
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 5
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	private static function step5($word)
+	{
+		// Part a
+		if (substr($word, -1) == 'e')
+		{
+			if (self::m(substr($word, 0, -1)) > 1)
+			{
+				self::replace($word, 'e', '');
+			}
+			elseif (self::m(substr($word, 0, -1)) == 1)
+			{
+				if (!self::cvc(substr($word, 0, -1)))
+				{
+					self::replace($word, 'e', '');
+				}
+			}
+		}
+
+		// Part b
+		if (self::m($word) > 1 && self::doubleConsonant($word) && substr($word, -1) == 'l')
+		{
+			$word = substr($word, 0, -1);
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Replaces the first string with the second, at the end of the string. If third
+	 * arg is given, then the preceding string must match that m count at least.
+	 *
+	 * @param   string   $str    String to check
+	 * @param   string   $check  Ending to check for
+	 * @param   string   $repl   Replacement string
+	 * @param   integer  $m      Optional minimum number of m() to meet
+	 *
+	 * @return  boolean  Whether the $check string was at the end
+	 *                   of the $str string. True does not necessarily mean
+	 *                   that it was replaced.
+	 *
+	 * @since   2.5
+	 */
+	private static function replace(&$str, $check, $repl, $m = null)
+	{
+		$len = 0 - strlen($check);
+
+		if (substr($str, $len) == $check)
+		{
+			$substr = substr($str, 0, $len);
+
+			if (is_null($m) || self::m($substr) > $m)
+			{
+				$str = $substr . $repl;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * m() measures the number of consonant sequences in $str. if c is
+	 * a consonant sequence and v a vowel sequence, and <..> indicates arbitrary
+	 * presence,
+	 *
+	 * <c><v>       gives 0
+	 * <c>vc<v>     gives 1
+	 * <c>vcvc<v>   gives 2
+	 * <c>vcvcvc<v> gives 3
+	 *
+	 * @param   string  $str  The string to return the m count for
+	 *
+	 * @return  integer  The m count
+	 *
+	 * @since   2.5
+	 */
+	private static function m($str)
+	{
+		$c = self::$regex_consonant;
+		$v = self::$regex_vowel;
+
+		$str = preg_replace("#^$c+#", '', $str);
+		$str = preg_replace("#$v+$#", '', $str);
+
+		preg_match_all("#($v+$c+)#", $str, $matches);
+
+		return count($matches[1]);
+	}
+
+	/**
+	 * Returns true/false as to whether the given string contains two
+	 * of the same consonant next to each other at the end of the string.
+	 *
+	 * @param   string  $str  String to check
+	 *
+	 * @return  boolean  Result
+	 *
+	 * @since   2.5
+	 */
+	private static function doubleConsonant($str)
+	{
+		$c = self::$regex_consonant;
+
+		return preg_match("#$c{2}$#", $str, $matches) && $matches[0]{0} == $matches[0]{1};
+	}
+
+	/**
+	 * Checks for ending CVC sequence where second C is not W, X or Y
+	 *
+	 * @param   string  $str  String to check
+	 *
+	 * @return  boolean  Result
+	 *
+	 * @since   2.5
+	 */
+	private static function cvc($str)
+	{
+		$c = self::$regex_consonant;
+		$v = self::$regex_vowel;
+
+		return preg_match("#($c$v$c)$#", $str, $matches) && strlen($matches[1]) == 3 && $matches[1]{2} != 'w' && $matches[1]{2} != 'x'
+			&& $matches[1]{2} != 'y';
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php b/core/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
new file mode 100644
index 00000000..44a88996
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderIndexerStemmer', dirname(__DIR__) . '/stemmer.php');
+
+/**
+ * Snowball stemmer class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerStemmerSnowball extends FinderIndexerStemmer
+{
+	/**
+	 * Method to stem a token and return the root.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   2.5
+	 */
+	public function stem($token, $lang)
+	{
+		// Language to use if All is specified.
+		static $defaultLang = '';
+
+		// If language is All then try to get site default language.
+		if ($lang == '*' && $defaultLang == '')
+		{
+			$languages = JLanguageHelper::getLanguages();
+			$defaultLang = isset($languages[0]->sef) ? $languages[0]->sef : '*';
+			$lang = $defaultLang;
+		}
+
+		// Stem the token if it is not in the cache.
+		if (!isset($this->cache[$lang][$token]))
+		{
+			// Get the stem function from the language string.
+			switch ($lang)
+			{
+				// Danish stemmer.
+				case 'da':
+					$function = 'stem_danish';
+					break;
+
+				// German stemmer.
+				case 'de':
+					$function = 'stem_german';
+					break;
+
+				// English stemmer.
+				default:
+				case 'en':
+					$function = 'stem_english';
+					break;
+
+				// Spanish stemmer.
+				case 'es':
+					$function = 'stem_spanish';
+					break;
+
+				// Finnish stemmer.
+				case 'fi':
+					$function = 'stem_finnish';
+					break;
+
+				// French stemmer.
+				case 'fr':
+					$function = 'stem_french';
+					break;
+
+				// Hungarian stemmer.
+				case 'hu':
+					$function = 'stem_hungarian';
+					break;
+
+				// Italian stemmer.
+				case 'it':
+					$function = 'stem_italian';
+					break;
+
+				// Norwegian stemmer.
+				case 'nb':
+					$function = 'stem_norwegian';
+					break;
+
+				// Dutch stemmer.
+				case 'nl':
+					$function = 'stem_dutch';
+					break;
+
+				// Portuguese stemmer.
+				case 'pt':
+					$function = 'stem_portuguese';
+					break;
+
+				// Romanian stemmer.
+				case 'ro':
+					$function = 'stem_romanian';
+					break;
+
+				// Russian stemmer.
+				case 'ru':
+					$function = 'stem_russian_unicode';
+					break;
+
+				// Swedish stemmer.
+				case 'sv':
+					$function = 'stem_swedish';
+					break;
+
+				// Turkish stemmer.
+				case 'tr':
+					$function = 'stem_turkish_unicode';
+					break;
+			}
+
+			// Stem the word if the stemmer method exists.
+			$this->cache[$lang][$token] = function_exists($function) ? $function($token) : $token;
+		}
+
+		return $this->cache[$lang][$token];
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/taxonomy.php b/core/administrator/components/com_finder/helpers/indexer/taxonomy.php
new file mode 100644
index 00000000..92637310
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/taxonomy.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Stemmer base class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerTaxonomy
+{
+	/**
+	 * An internal cache of taxonomy branch data.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public static $branches = array();
+
+	/**
+	 * An internal cache of taxonomy node data.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public static $nodes = array();
+
+	/**
+	 * Method to add a branch to the taxonomy tree.
+	 *
+	 * @param   string   $title   The title of the branch.
+	 * @param   integer  $state   The published state of the branch. [optional]
+	 * @param   integer  $access  The access state of the branch. [optional]
+	 *
+	 * @return  integer  The id of the branch.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function addBranch($title, $state = 1, $access = 1)
+	{
+		// Check to see if the branch is in the cache.
+		if (isset(static::$branches[$title]))
+		{
+			return static::$branches[$title]->id;
+		}
+
+		// Check to see if the branch is in the table.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = 1')
+			->where($db->quoteName('title') . ' = ' . $db->quote($title));
+		$db->setQuery($query);
+
+		// Get the result.
+		$result = $db->loadObject();
+
+		// Check if the database matches the input data.
+		if (!empty($result) && $result->state == $state && $result->access == $access)
+		{
+			// The data matches, add the item to the cache.
+			static::$branches[$title] = $result;
+
+			return static::$branches[$title]->id;
+		}
+
+		/*
+		 * The database did not match the input. This could be because the
+		 * state has changed or because the branch does not exist. Let's figure
+		 * out which case is true and deal with it.
+		 */
+		$branch = new JObject;
+
+		if (empty($result))
+		{
+			// Prepare the branch object.
+			$branch->parent_id = 1;
+			$branch->title = $title;
+			$branch->state = (int) $state;
+			$branch->access = (int) $access;
+		}
+		else
+		{
+			// Prepare the branch object.
+			$branch->id = (int) $result->id;
+			$branch->parent_id = (int) $result->parent_id;
+			$branch->title = $result->title;
+			$branch->state = (int) $result->title;
+			$branch->access = (int) $result->access;
+			$branch->ordering = (int) $result->ordering;
+		}
+
+		// Store the branch.
+		static::storeNode($branch);
+
+		// Add the branch to the cache.
+		static::$branches[$title] = $branch;
+
+		return static::$branches[$title]->id;
+	}
+
+	/**
+	 * Method to add a node to the taxonomy tree.
+	 *
+	 * @param   string   $branch  The title of the branch to store the node in.
+	 * @param   string   $title   The title of the node.
+	 * @param   integer  $state   The published state of the node. [optional]
+	 * @param   integer  $access  The access state of the node. [optional]
+	 *
+	 * @return  integer  The id of the node.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function addNode($branch, $title, $state = 1, $access = 1)
+	{
+		// Check to see if the node is in the cache.
+		if (isset(static::$nodes[$branch][$title]))
+		{
+			return static::$nodes[$branch][$title]->id;
+		}
+
+		// Get the branch id, insert it if it does not exist.
+		$branchId = static::addBranch($branch);
+
+		// Check to see if the node is in the table.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = ' . $db->quote($branchId))
+			->where($db->quoteName('title') . ' = ' . $db->quote($title));
+		$db->setQuery($query);
+
+		// Get the result.
+		$result = $db->loadObject();
+
+		// Check if the database matches the input data.
+		if (!empty($result) && $result->state == $state && $result->access == $access)
+		{
+			// The data matches, add the item to the cache.
+			static::$nodes[$branch][$title] = $result;
+
+			return static::$nodes[$branch][$title]->id;
+		}
+
+		/*
+		 * The database did not match the input. This could be because the
+		 * state has changed or because the node does not exist. Let's figure
+		 * out which case is true and deal with it.
+		 */
+		$node = new JObject;
+
+		if (empty($result))
+		{
+			// Prepare the node object.
+			$node->parent_id = (int) $branchId;
+			$node->title = $title;
+			$node->state = (int) $state;
+			$node->access = (int) $access;
+		}
+		else
+		{
+			// Prepare the node object.
+			$node->id = (int) $result->id;
+			$node->parent_id = (int) $result->parent_id;
+			$node->title = $result->title;
+			$node->state = (int) $result->title;
+			$node->access = (int) $result->access;
+			$node->ordering = (int) $result->ordering;
+		}
+
+		// Store the node.
+		static::storeNode($node);
+
+		// Add the node to the cache.
+		static::$nodes[$branch][$title] = $node;
+
+		return static::$nodes[$branch][$title]->id;
+	}
+
+	/**
+	 * Method to add a map entry between a link and a taxonomy node.
+	 *
+	 * @param   integer  $linkId  The link to map to.
+	 * @param   integer  $nodeId  The node to map to.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function addMap($linkId, $nodeId)
+	{
+		// Insert the map.
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('link_id'))
+			->from($db->quoteName('#__finder_taxonomy_map'))
+			->where($db->quoteName('link_id') . ' = ' . (int) $linkId)
+			->where($db->quoteName('node_id') . ' = ' . (int) $nodeId);
+		$db->setQuery($query);
+		$db->execute();
+		$id = (int) $db->loadResult();
+
+		$map = new JObject;
+		$map->link_id = (int) $linkId;
+		$map->node_id = (int) $nodeId;
+
+		if ($id)
+		{
+			$db->updateObject('#__finder_taxonomy_map', $map, array('link_id', 'node_id'));
+		}
+		else
+		{
+			$db->insertObject('#__finder_taxonomy_map', $map);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the title of all taxonomy branches.
+	 *
+	 * @return  array  An array of branch titles.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function getBranchTitles()
+	{
+		$db = JFactory::getDbo();
+
+		// Set user variables
+		$groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
+
+		// Create a query to get the taxonomy branch titles.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('title'))
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = 1')
+			->where($db->quoteName('state') . ' = 1')
+			->where($db->quoteName('access') . ' IN (' . $groups . ')');
+
+		// Get the branch titles.
+		$db->setQuery($query);
+
+		return $db->loadColumn();
+	}
+
+	/**
+	 * Method to find a taxonomy node in a branch.
+	 *
+	 * @param   string  $branch  The branch to search.
+	 * @param   string  $title   The title of the node.
+	 *
+	 * @return  mixed  Integer id on success, null on no match.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function getNodeByTitle($branch, $title)
+	{
+		$db = JFactory::getDbo();
+
+		// Set user variables
+		$groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
+
+		// Create a query to get the node.
+		$query = $db->getQuery(true)
+			->select('t1.*')
+			->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
+			->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
+			->where('t1.access IN (' . $groups . ')')
+			->where('t1.state = 1')
+			->where('t1.title LIKE ' . $db->quote($db->escape($title) . '%'))
+			->where('t2.access IN (' . $groups . ')')
+			->where('t2.state = 1')
+			->where('t2.title = ' . $db->quote($branch));
+
+		// Get the node.
+		$db->setQuery($query, 0, 1);
+
+		return $db->loadObject();
+	}
+
+	/**
+	 * Method to remove map entries for a link.
+	 *
+	 * @param   integer  $linkId  The link to remove.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function removeMaps($linkId)
+	{
+		// Delete the maps.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__finder_taxonomy_map'))
+			->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
+		$db->setQuery($query);
+		$db->execute();
+
+		return true;
+	}
+
+	/**
+	 * Method to remove orphaned taxonomy nodes and branches.
+	 *
+	 * @return  integer  The number of deleted rows.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public static function removeOrphanNodes()
+	{
+		// Delete all orphaned nodes.
+		$db = JFactory::getDbo();
+		$query     = $db->getQuery(true);
+		$subquery  = $db->getQuery(true);
+		$subquery1 = $db->getQuery(true);
+
+		$subquery1->select($db->quoteName('t.id'))
+			->from($db->quoteName('#__finder_taxonomy', 't'))
+			->join('LEFT', $db->quoteName('#__finder_taxonomy_map', 'm') . ' ON ' . $db->quoteName('m.node_id') . '=' . $db->quoteName('t.id'))
+			->where($db->quoteName('t.parent_id') . ' > 1 ')
+			->where($db->quoteName('m.link_id') . ' IS NULL');
+
+		$subquery->select($db->quoteName('id'))
+			->from('(' . $subquery1 . ') temp');
+
+		$query->delete($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('id') . ' IN (' . $subquery . ')');
+
+		$db->setQuery($query);
+		$db->execute();
+
+		return $db->getAffectedRows();
+	}
+
+	/**
+	 * Method to store a node to the database.  This method will accept either a branch or a node.
+	 *
+	 * @param   object  $item  The item to store.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected static function storeNode($item)
+	{
+		$db = JFactory::getDbo();
+
+		// Check if we are updating or inserting the item.
+		if (empty($item->id))
+		{
+			// Insert the item.
+			$db->insertObject('#__finder_taxonomy', $item, 'id');
+		}
+		else
+		{
+			// Update the item.
+			$db->updateObject('#__finder_taxonomy', $item, 'id');
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/indexer/token.php b/core/administrator/components/com_finder/helpers/indexer/token.php
new file mode 100644
index 00000000..ec804098
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/indexer/token.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Token class for the Finder indexer package.
+ *
+ * @since  2.5
+ */
+class FinderIndexerToken
+{
+	/**
+	 * This is the term that will be referenced in the terms table and the
+	 * mapping tables.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $term;
+
+	/**
+	 * The stem is used to match the root term and produce more potential
+	 * matches when searching the index.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $stem;
+
+	/**
+	 * If the token is numeric, it is likely to be short and uncommon so the
+	 * weight is adjusted to compensate for that situation.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	public $numeric;
+
+	/**
+	 * If the token is a common term, the weight is adjusted to compensate for
+	 * the higher frequency of the term in relation to other terms.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	public $common;
+
+	/**
+	 * Flag for phrase tokens.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	public $phrase;
+
+	/**
+	 * The length is used to calculate the weight of the token.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $length;
+
+	/**
+	 * The weight is calculated based on token size and whether the token is
+	 * considered a common term.
+	 *
+	 * @var    integer
+	 * @since  2.5
+	 */
+	public $weight;
+
+	/**
+	 * The simple language identifier for the token.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $language;
+
+	/**
+	 * Method to construct the token object.
+	 *
+	 * @param   mixed   $term    The term as a string for words or an array for phrases.
+	 * @param   string  $lang    The simple language identifier.
+	 * @param   string  $spacer  The space separator for phrases. [optional]
+	 *
+	 * @since   2.5
+	 */
+	public function __construct($term, $lang, $spacer = ' ')
+	{
+		$this->language = $lang;
+
+		// Tokens can be a single word or an array of words representing a phrase.
+		if (is_array($term))
+		{
+			// Populate the token instance.
+			$this->term = implode($spacer, $term);
+			$this->stem = implode($spacer, array_map(array('FinderIndexerHelper', 'stem'), $term, array($lang)));
+			$this->numeric = false;
+			$this->common = false;
+			$this->phrase = true;
+			$this->length = StringHelper::strlen($this->term);
+
+			/*
+			 * Calculate the weight of the token.
+			 *
+			 * 1. Length of the token up to 30 and divide by 30, add 1.
+			 * 2. Round weight to 4 decimal points.
+			 */
+			$this->weight = (($this->length >= 30 ? 30 : $this->length) / 30) + 1;
+			$this->weight = round($this->weight, 4);
+		}
+		else
+		{
+			// Populate the token instance.
+			$this->term = $term;
+			$this->stem = FinderIndexerHelper::stem($this->term, $lang);
+			$this->numeric = (is_numeric($this->term) || (bool) preg_match('#^[0-9,.\-\+]+$#', $this->term));
+			$this->common = $this->numeric ? false : FinderIndexerHelper::isCommon($this->term, $lang);
+			$this->phrase = false;
+			$this->length = StringHelper::strlen($this->term);
+
+			/*
+			 * Calculate the weight of the token.
+			 *
+			 * 1. Length of the token up to 15 and divide by 15.
+			 * 2. If common term, divide weight by 8.
+			 * 3. If numeric, multiply weight by 1.5.
+			 * 4. Round weight to 4 decimal points.
+			 */
+			$this->weight = (($this->length >= 15 ? 15 : $this->length) / 15);
+			$this->weight = ($this->common == true ? $this->weight / 8 : $this->weight);
+			$this->weight = ($this->numeric == true ? $this->weight * 1.5 : $this->weight);
+			$this->weight = round($this->weight, 4);
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/helpers/language.php b/core/administrator/components/com_finder/helpers/language.php
new file mode 100644
index 00000000..dce9e644
--- /dev/null
+++ b/core/administrator/components/com_finder/helpers/language.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Finder language helper class.
+ *
+ * @since  2.5
+ */
+class FinderHelperLanguage
+{
+	/**
+	 * Method to return a plural language code for a taxonomy branch.
+	 *
+	 * @param   string  $branchName  Branch title.
+	 *
+	 * @return  string  Language key code.
+	 *
+	 * @since   2.5
+	 */
+	public static function branchPlural($branchName)
+	{
+		$return = preg_replace('/[^a-zA-Z0-9]+/', '_', strtoupper($branchName));
+
+		if ($return !== '_')
+		{
+			return 'PLG_FINDER_QUERY_FILTER_BRANCH_P_' . $return;
+		}
+
+		return $branchName;
+	}
+
+	/**
+	 * Method to return a singular language code for a taxonomy branch.
+	 *
+	 * @param   string  $branchName  Branch name.
+	 *
+	 * @return  string  Language key code.
+	 *
+	 * @since   2.5
+	 */
+	public static function branchSingular($branchName)
+	{
+		$return = preg_replace('/[^a-zA-Z0-9]+/', '_', strtoupper($branchName));
+
+		return 'PLG_FINDER_QUERY_FILTER_BRANCH_S_' . $return;
+	}
+
+	/**
+	 * Method to return the language name for a language taxonomy branch.
+	 *
+	 * @param   string  $branchName  Language branch name.
+	 *
+	 * @return  string  The language title.
+	 *
+	 * @since   3.6.0
+	 */
+	public static function branchLanguageTitle($branchName)
+	{
+		$title = $branchName;
+
+		if ($branchName === '*')
+		{
+			$title = JText::_('JALL_LANGUAGE');
+		}
+		else
+		{
+			$languages = JLanguageHelper::getLanguages('lang_code');
+
+			if (isset($languages[$branchName]))
+			{
+				$title = $languages[$branchName]->title;
+			}
+		}
+
+		return $title;
+	}
+
+	/**
+	 * Method to load Smart Search component language file.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public static function loadComponentLanguage()
+	{
+		JFactory::getLanguage()->load('com_finder', JPATH_SITE);
+	}
+
+	/**
+	 * Method to load Smart Search plugin language files.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public static function loadPluginLanguage()
+	{
+		static $loaded = false;
+
+		// If already loaded, don't load again.
+		if ($loaded)
+		{
+			return;
+		}
+
+		$loaded = true;
+
+		// Get array of all the enabled Smart Search plugin names.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select(array($db->qn('name'), $db->qn('element')))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('finder'))
+			->where($db->quoteName('enabled') . ' = 1');
+		$db->setQuery($query);
+		$plugins = $db->loadObjectList();
+
+		if (empty($plugins))
+		{
+			return;
+		}
+
+		// Load generic language strings.
+		$lang = JFactory::getLanguage();
+		$lang->load('plg_content_finder', JPATH_ADMINISTRATOR);
+
+		// Load language file for each plugin.
+		foreach ($plugins as $plugin)
+		{
+			$lang->load($plugin->name, JPATH_ADMINISTRATOR)
+				|| $lang->load($plugin->name, JPATH_PLUGINS . '/finder/' . $plugin->element);
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/models/fields/branches.php b/core/administrator/components/com_finder/models/fields/branches.php
new file mode 100644
index 00000000..5e36f329
--- /dev/null
+++ b/core/administrator/components/com_finder/models/fields/branches.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die();
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Search Branches field for the Finder package.
+ *
+ * @since  3.5
+ */
+class JFormFieldBranches extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $type = 'Branches';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		return JHtml::_('finder.mapslist');
+	}
+}
diff --git a/core/administrator/components/com_finder/models/fields/contentmap.php b/core/administrator/components/com_finder/models/fields/contentmap.php
new file mode 100644
index 00000000..0bf38efc
--- /dev/null
+++ b/core/administrator/components/com_finder/models/fields/contentmap.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('groupedlist');
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+/**
+ * Supports a select grouped list of finder content map.
+ *
+ * @since  3.6.0
+ */
+class JFormFieldContentMap extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.6.0
+	 */
+	public $type = 'ContentMap';
+
+	/**
+	 * Method to get the list of content map options grouped by first level.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		// Get the database object and a new query object.
+		$db = JFactory::getDbo();
+
+		// Levels subquery.
+		$levelQuery = $db->getQuery(true);
+		$levelQuery->select('title AS branch_title, 1 as level')
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = 1');
+		$levelQuery2 = $db->getQuery(true);
+		$levelQuery2->select('b.title AS branch_title, 2 as level')
+			->select($db->quoteName('a.id'))
+			->from($db->quoteName('#__finder_taxonomy', 'a'))
+			->join('LEFT', $db->quoteName('#__finder_taxonomy', 'b') . ' ON ' . $db->qn('a.parent_id') . ' = ' . $db->qn('b.id'))
+			->where($db->quoteName('a.parent_id') . ' NOT IN (0, 1)');
+
+		$levelQuery->union($levelQuery2);
+
+		// Main query.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('a.title', 'text'))
+			->select($db->quoteName('a.id', 'value'))
+			->select($db->quoteName('d.level'))
+			->from($db->quoteName('#__finder_taxonomy', 'a'))
+			->join('LEFT', '(' . $levelQuery . ') AS d ON ' . $db->qn('d.id') . ' = ' . $db->qn('a.id'))
+			->where($db->quoteName('a.parent_id') . ' <> 0')
+			->order('d.branch_title ASC, d.level ASC, a.title ASC');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$contentMap = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return;
+		}
+
+		// Build the grouped list array.
+		if ($contentMap)
+		{
+			$lang = JFactory::getLanguage();
+
+			foreach ($contentMap as $branch)
+			{
+				if ((int) $branch->level === 1)
+				{
+					$name = $branch->text;
+				}
+				else
+				{
+					$levelPrefix = str_repeat('- ', max(0, $branch->level - 1));
+
+					if (trim($name, '**') === 'Language')
+					{
+						$text = FinderHelperLanguage::branchLanguageTitle($branch->text);
+					}
+					else
+					{
+						$key = FinderHelperLanguage::branchSingular($branch->text);
+						$text = $lang->hasKey($key) ? JText::_($key) : $branch->text;
+					}
+
+					// Initialize the group if necessary.
+					if (!isset($groups[$name]))
+					{
+						$groups[$name] = array();
+					}
+
+					$groups[$name][] = JHtml::_('select.option', $branch->value, $levelPrefix . $text);
+				}
+			}
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}
diff --git a/core/administrator/components/com_finder/models/fields/contenttypes.php b/core/administrator/components/com_finder/models/fields/contenttypes.php
new file mode 100644
index 00000000..013f833a
--- /dev/null
+++ b/core/administrator/components/com_finder/models/fields/contenttypes.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die();
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Content Types Filter field for the Finder package.
+ *
+ * @since  3.6.0
+ */
+class JFormFieldContentTypes extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.6.0
+	 */
+	protected $type = 'ContentTypes';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getOptions()
+	{
+		$lang    = JFactory::getLanguage();
+		$options = array();
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id', 'value'))
+			->select($db->quoteName('title', 'text'))
+			->from($db->quoteName('#__finder_types'));
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$contentTypes = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $db->getMessage());
+		}
+
+		// Translate.
+		foreach ($contentTypes as $contentType)
+		{
+			$key = FinderHelperLanguage::branchSingular($contentType->text);
+			$contentType->translatedText = $lang->hasKey($key) ? JText::_($key) : $contentType->text;
+		}
+
+		// Order by title.
+		$contentTypes = ArrayHelper::sortObjects($contentTypes, 'translatedText', 1, true, true);
+
+		// Convert the values to options.
+		foreach ($contentTypes as $contentType)
+		{
+			$options[] = JHtml::_('select.option', $contentType->value, $contentType->translatedText);
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_finder/models/fields/directories.php b/core/administrator/components/com_finder/models/fields/directories.php
new file mode 100644
index 00000000..49dc6c99
--- /dev/null
+++ b/core/administrator/components/com_finder/models/fields/directories.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load the base adapter.
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Renders a list of directories.
+ *
+ * @since  2.5
+ */
+class JFormFieldDirectories extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type = 'Directories';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   2.5
+	 */
+	public function getOptions()
+	{
+		$values  = array();
+		$options = array();
+		$exclude = array(
+			JPATH_ADMINISTRATOR,
+			JPATH_INSTALLATION,
+			JPATH_LIBRARIES,
+			JPATH_PLUGINS,
+			JPATH_SITE . '/cache',
+			JPATH_SITE . '/components',
+			JPATH_SITE . '/includes',
+			JPATH_SITE . '/language',
+			JPATH_SITE . '/modules',
+			JPATH_THEMES,
+			JFactory::getApplication()->get('log_path'),
+			JFactory::getApplication()->get('tmp_path')
+		);
+
+		// Get the base directories.
+		jimport('joomla.filesystem.folder');
+		$dirs = JFolder::folders(JPATH_SITE, '.', false, true);
+
+		// Iterate through the base directories and find the subdirectories.
+		foreach ($dirs as $dir)
+		{
+			// Check if the directory should be excluded.
+			if (in_array($dir, $exclude))
+			{
+				continue;
+			}
+
+			// Get the child directories.
+			$return = JFolder::folders($dir, '.', true, true);
+
+			// Merge the directories.
+			if (is_array($return))
+			{
+				$values[] = $dir;
+				$values = array_merge($values, $return);
+			}
+		}
+
+		// Convert the values to options.
+		foreach ($values as $value)
+		{
+			$options[] = JHtml::_('select.option', str_replace(JPATH_SITE . '/', '', $value), str_replace(JPATH_SITE . '/', '', $values));
+		}
+
+		// Add a null option.
+		array_unshift($options, JHtml::_('select.option', '', '- ' . JText::_('JNONE') . ' -'));
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_finder/models/fields/searchfilter.php b/core/administrator/components/com_finder/models/fields/searchfilter.php
new file mode 100644
index 00000000..07fa70aa
--- /dev/null
+++ b/core/administrator/components/com_finder/models/fields/searchfilter.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die();
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Search Filter field for the Finder package.
+ *
+ * @since  2.5
+ */
+class JFormFieldSearchFilter extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type = 'SearchFilter';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   2.5
+	 */
+	public function getOptions()
+	{
+		// Build the query.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('f.title AS text, f.filter_id AS value')
+			->from($db->quoteName('#__finder_filters') . ' AS f')
+			->where('f.state = 1')
+			->order('f.title ASC');
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		array_unshift($options, JHtml::_('select.option', '', JText::_('COM_FINDER_SELECT_SEARCH_FILTER'), 'value', 'text'));
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_finder/models/filter.php b/core/administrator/components/com_finder/models/filter.php
new file mode 100644
index 00000000..3c929027
--- /dev/null
+++ b/core/administrator/components/com_finder/models/filter.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Filter model class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderModelFilter extends JModelAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $text_prefix = 'COM_FINDER';
+
+	/**
+	 * Model context string.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'com_finder.filter';
+
+	/**
+	 * Custom clean cache method.
+	 *
+	 * @param   string   $group      The component name. [optional]
+	 * @param   integer  $client_id  The client ID. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function cleanCache($group = 'com_finder', $client_id = 1)
+	{
+		parent::cleanCache($group, $client_id);
+	}
+
+	/**
+	 * Method to get the filter data.
+	 *
+	 * @return  FinderTableFilter|boolean  The filter data or false on a failure.
+	 *
+	 * @since   2.5
+	 */
+	public function getFilter()
+	{
+		$filter_id = (int) $this->getState('filter.id');
+
+		// Get a FinderTableFilter instance.
+		$filter = $this->getTable();
+
+		// Attempt to load the row.
+		$return = $filter->load($filter_id);
+
+		// Check for a database error.
+		if ($return === false && $filter->getError())
+		{
+			$this->setError($filter->getError());
+
+			return false;
+		}
+
+		// Process the filter data.
+		if (!empty($filter->data))
+		{
+			$filter->data = explode(',', $filter->data);
+		}
+		elseif (empty($filter->data))
+		{
+			$filter->data = array();
+		}
+
+		// Check for a database error.
+		if ($this->_db->getErrorNum())
+		{
+			$this->setError($this->_db->getErrorMsg());
+
+			return false;
+		}
+
+		return $filter;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form. [optional]
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not. [optional]
+	 *
+	 * @return  JForm|boolean  A JForm object on success, false on failure
+	 *
+	 * @since   2.5
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_finder.filter', 'filter', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Returns a JTable object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate. [optional]
+	 * @param   string  $prefix  A prefix for the table class name. [optional]
+	 * @param   array   $config  Configuration array for model. [optional]
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   2.5
+	 */
+	public function getTable($type = 'Filter', $prefix = 'FinderTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   2.5
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_finder.edit.filter.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_finder.filter', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get the total indexed items
+	 *
+	 * @return  number the number of indexed items
+	 *
+	 * @since  3.5
+	 */
+	public function getTotal()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('MAX(link_id)')
+			->from('#__finder_links');
+
+		return $db->setQuery($query)->loadResult();
+	}
+}
diff --git a/core/administrator/components/com_finder/models/filters.php b/core/administrator/components/com_finder/models/filters.php
new file mode 100644
index 00000000..48e8e0ca
--- /dev/null
+++ b/core/administrator/components/com_finder/models/filters.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Filters model class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderModelFilters extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An associative array of configuration settings. [optional]
+	 *
+	 * @since   2.5
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'filter_id', 'a.filter_id',
+				'title', 'a.title',
+				'state', 'a.state',
+				'created_by_alias', 'a.created_by_alias',
+				'created', 'a.created',
+				'map_count', 'a.map_count'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery  A JDatabaseQuery object
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select all fields from the table.
+		$query->select('a.*')
+			->from($db->quoteName('#__finder_filters', 'a'));
+
+		// Join over the users for the checked out user.
+		$query->select($db->quoteName('uc.name', 'editor'))
+			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->quoteName('uc.id') . ' = ' . $db->quoteName('a.checked_out'));
+
+		// Join over the users for the author.
+		$query->select($db->quoteName('ua.name', 'user_name'))
+			->join('LEFT', $db->quoteName('#__users', 'ua') . ' ON ' . $db->quoteName('ua.id') . ' = ' . $db->quoteName('a.created_by'));
+
+		// Check for a search filter.
+		if ($search = $this->getState('filter.search'))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where($db->quoteName('a.title') . ' LIKE ' . $search);
+		}
+
+		// If the model is set to check item state, add to the query.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where($db->quoteName('a.state') . ' = ' . (int) $state);
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.title') . ' ' . $db->escape($this->getState('list.direction', 'ASC'))));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id. [optional]
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.  Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field. [optional]
+	 * @param   string  $direction  An optional direction. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState($ordering = 'a.title', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_finder');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+}
diff --git a/core/administrator/components/com_finder/models/forms/filter.xml b/core/administrator/components/com_finder/models/forms/filter.xml
new file mode 100644
index 00000000..f281aa88
--- /dev/null
+++ b/core/administrator/components/com_finder/models/forms/filter.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="filter_id"  
+			type="text" 
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC" 
+			class="readonly" 
+			size="10" 
+			default="0"
+			readonly="true"  
+		/>
+
+		<field 
+			name="title" 
+			type="text" 
+			label="JGLOBAL_TITLE"
+			description="COM_FINDER_FILTER_TITLE_DESCRIPTION"
+			class="input-xxlarge input-large-text"
+			size="40"
+			id="title"
+			required="true" 
+		/>
+
+		<field 
+			name="alias" 
+			type="text" 
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			hint="JFIELD_ALIAS_PLACEHOLDER" 
+			size="45" 
+		/>
+
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			description="JGLOBAL_FIELD_CREATED_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			description="COM_FINDER_FIELD_MODIFIED_DESCRIPTION"
+			class="readonly"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			readonly="true"
+			filter="user_utc"
+		/>
+
+		<field 
+			name="created_by" 
+			type="user"
+			label="COM_FINDER_FIELD_CREATED_BY_LABEL" 
+			description="COM_FINDER_FIELD_CREATED_BY_DESC" 
+		/>
+
+		<field 
+			name="created_by_alias" 
+			type="text"
+			label="COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL" 
+			description="COM_FINDER_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20" 
+		/>
+		
+		<field 
+			name="modified_by" 
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		 />
+
+		<field 
+			name="checked_out" 
+			type="hidden" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="checked_out_time" 
+			type="hidden" 
+			filter="unset" 
+		/>
+
+		<field 
+			name="state" 
+			type="list" 
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			filter="intval"
+			size="1"
+			default="1" 
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+		</field>
+
+		<field
+			name="map_count" 
+			type="text" 
+			label="COM_FINDER_FILTER_MAP_COUNT" 
+			description="COM_FINDER_FILTER_MAP_COUNT_DESCRIPTION"
+			class="readonly"
+			size="10" 
+			default="0" 
+			readonly="true" 
+		/>
+	</fieldset>
+
+	<fields name="params">
+		<fieldset name="jbasic" label="COM_FINDER_FILTER_FIELDSET_PARAMS">
+			<field
+				name="w1"
+				type="list"
+				label="COM_FINDER_FILTER_WHEN_START_DATE_LABEL"
+				description="COM_FINDER_FILTER_WHEN_START_DATE_DESCRIPTION"
+				default=""
+				filter="string"
+				>
+				<option value="">JNONE</option>
+				<option value="-1">COM_FINDER_FILTER_WHEN_BEFORE</option>
+				<option value="0">COM_FINDER_FILTER_WHEN_EXACTLY</option>
+				<option value="1">COM_FINDER_FILTER_WHEN_AFTER</option>
+			</field>
+
+			<field 
+				name="d1"
+				type="calendar"
+				label="COM_FINDER_FILTER_START_DATE_LABEL"
+				description="COM_FINDER_FILTER_START_DATE_DESCRIPTION"
+				translateformat="true"
+				size="22"
+				filter="user_utc"
+			/>
+
+			<field
+				name="w2"
+				type="list"
+				label="COM_FINDER_FILTER_WHEN_END_DATE_LABEL"
+				description="COM_FINDER_FILTER_WHEN_END_DATE_DESCRIPTION"
+				default=""
+				filter="string"
+				>
+				<option value="">JNONE</option>
+				<option value="-1">COM_FINDER_FILTER_WHEN_BEFORE</option>
+				<option value="0">COM_FINDER_FILTER_WHEN_EXACTLY</option>
+				<option value="1">COM_FINDER_FILTER_WHEN_AFTER</option>
+			</field>
+
+			<field
+				name="d2"
+				type="calendar"
+				label="COM_FINDER_FILTER_END_DATE_LABEL"
+				description="COM_FINDER_FILTER_END_DATE_DESCRIPTION"
+				translateformat="true"
+				size="22"
+				filter="user_utc"
+			/>
+		</fieldset>
+
+	</fields>
+</form>
diff --git a/core/administrator/components/com_finder/models/forms/filter_filters.xml b/core/administrator/components/com_finder/models/forms/filter_filters.xml
new file mode 100644
index 00000000..f5ea1528
--- /dev/null
+++ b/core/administrator/components/com_finder/models/forms/filter_filters.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_FINDER_SEARCH_FILTER_SEARCH_LABEL"
+			description="COM_FINDER_SEARCH_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			label="COM_FINDER_FILTER_PUBLISHED"
+			description="COM_FINDER_FILTER_PUBLISHED_DESC"
+			filter="0,1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="a.title ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.created_by_alias ASC">COM_FINDER_HEADING_CREATED_BY_ASC</option>
+			<option value="a.created_by_alias DESC">COM_FINDER_HEADING_CREATED_BY_DESC</option>
+			<option value="a.created ASC">COM_FINDER_HEADING_CREATED_ON_ASC</option>
+			<option value="a.created DESC">COM_FINDER_HEADING_CREATED_ON_DESC</option>
+			<option value="a.map_count ASC">COM_FINDER_HEADING_MAP_COUNT_ASC</option>
+			<option value="a.map_count DESC">COM_FINDER_HEADING_MAP_COUNT_DESC</option>
+			<option value="a.filter_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.filter_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_finder/models/forms/filter_index.xml b/core/administrator/components/com_finder/models/forms/filter_index.xml
new file mode 100644
index 00000000..0e380177
--- /dev/null
+++ b/core/administrator/components/com_finder/models/forms/filter_index.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_FINDER_INDEX_SEARCH_LABEL"
+			description="COM_FINDER_INDEX_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			label="COM_FINDER_FILTER_PUBLISHED"
+			description="COM_FINDER_FILTER_PUBLISHED_DESC"
+			filter="0,1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="type"
+			type="ContentTypes"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FINDER_MAPS_SELECT_TYPE</option>
+		</field>
+
+		<field
+			name="content_map"
+			type="ContentMap"
+			label="COM_FINDER_FILTER_CONTENT_MAP_LABEL"
+			description="COM_FINDER_FILTER_CONTENT_MAP_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FINDER_FILTER_SELECT_CONTENT_MAP</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="l.title ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="l.published ASC">JSTATUS_ASC</option>
+			<option value="l.published DESC">JSTATUS_DESC</option>
+			<option value="l.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="l.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="t.title ASC">COM_FINDER_INDEX_HEADING_INDEX_TYPE_ASC</option>
+			<option value="t.title DESC">COM_FINDER_INDEX_HEADING_INDEX_TYPE_DESC</option>
+			<option value="l.indexdate ASC">COM_FINDER_INDEX_HEADING_INDEX_DATE_ASC</option>
+			<option value="l.indexdate DESC">COM_FINDER_INDEX_HEADING_INDEX_DATE_DESC</option>
+			<option value="l.url ASC">COM_FINDER_INDEX_HEADING_LINK_URL_ASC</option>
+			<option value="l.url DESC">COM_FINDER_INDEX_HEADING_LINK_URL_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_finder/models/forms/filter_maps.xml b/core/administrator/components/com_finder/models/forms/filter_maps.xml
new file mode 100644
index 00000000..312d66aa
--- /dev/null
+++ b/core/administrator/components/com_finder/models/forms/filter_maps.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_FINDER_SEARCH_SEARCH_QUERY_LABEL"
+			description="COM_FINDER_SEARCH_SEARCH_QUERY_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			label="COM_FINDER_FILTER_PUBLISHED"
+			description="COM_FINDER_FILTER_PUBLISHED_DESC"
+			filter="0,1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="branch"
+			type="branches"
+			default="0"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="2"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="d.branch_title ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="d.branch_title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="d.branch_title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_finder/models/index.php b/core/administrator/components/com_finder/models/index.php
new file mode 100644
index 00000000..9d437ffb
--- /dev/null
+++ b/core/administrator/components/com_finder/models/index.php
@@ -0,0 +1,455 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Index model class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderModelIndex extends JModelList
+{
+	/**
+	 * The event to trigger after deleting the data.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $event_after_delete = 'onContentAfterDelete';
+
+	/**
+	 * The event to trigger before deleting the data.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $event_before_delete = 'onContentBeforeDelete';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An associative array of configuration settings. [optional]
+	 *
+	 * @since   2.5
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'state', 'published', 'l.published',
+				'title', 'l.title',
+				'type', 'type_id', 'l.type_id',
+				't.title', 't_title',
+				'url', 'l.url',
+				'indexdate', 'l.indexdate',
+				'content_map',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
+	 *
+	 * @since   2.5
+	 */
+	protected function canDelete($record)
+	{
+		return JFactory::getUser()->authorise('core.delete', $this->option);
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the component.
+	 *
+	 * @since   2.5
+	 */
+	protected function canEditState($record)
+	{
+		return JFactory::getUser()->authorise('core.edit.state', $this->option);
+	}
+
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  $pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   2.5
+	 */
+	public function delete(&$pks)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$pks = (array) $pks;
+		$table = $this->getTable();
+
+		// Include the content plugins for the on delete events.
+		JPluginHelper::importPlugin('content');
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($this->canDelete($table))
+				{
+					$context = $this->option . '.' . $this->name;
+
+					// Trigger the onContentBeforeDelete event.
+					$result = $dispatcher->trigger($this->event_before_delete, array($context, $table));
+
+					if (in_array(false, $result, true))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+
+					if (!$table->delete($pk))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+
+					// Trigger the onContentAfterDelete event.
+					$dispatcher->trigger($this->event_after_delete, array($context, $table));
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					$error = $this->getError();
+
+					if ($error)
+					{
+						$this->setError($error);
+					}
+					else
+					{
+						$this->setError(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
+					}
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery  A JDatabaseQuery object
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('l.*')
+			->select($db->quoteName('t.title', 't_title'))
+			->from($db->quoteName('#__finder_links', 'l'))
+			->join('INNER', $db->quoteName('#__finder_types', 't') . ' ON ' . $db->quoteName('t.id') . ' = ' . $db->quoteName('l.type_id'));
+
+		// Check the type filter.
+		$type = $this->getState('filter.type');
+
+		if (is_numeric($type))
+		{
+			$query->where($db->quoteName('l.type_id') . ' = ' . (int) $type);
+		}
+
+		// Check the map filter.
+		$contentMapId = $this->getState('filter.content_map');
+
+		if (is_numeric($contentMapId))
+		{
+			$query->join('INNER', $db->quoteName('#__finder_taxonomy_map', 'm') . ' ON ' . $db->quoteName('m.link_id') . ' = ' . $db->quoteName('l.link_id'))
+				->where($db->quoteName('m.node_id') . ' = ' . (int) $contentMapId);
+		}
+
+		// Check for state filter.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where($db->quoteName('l.published') . ' = ' . (int) $state);
+		}
+
+		// Check the search phrase.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			$search      = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$orSearchSql = $db->quoteName('l.title') . ' LIKE ' . $search . ' OR ' . $db->quoteName('l.url') . ' LIKE ' . $search;
+
+			// Filter by indexdate only if $search doesn't contains non-ascii characters
+			if (!preg_match('/[^\x00-\x7F]/', $search))
+			{
+				$orSearchSql .= ' OR ' . $query->castAsChar($db->quoteName('l.indexdate')) . ' LIKE ' . $search;
+			}
+
+			$query->where('(' . $orSearchSql . ')');
+		}
+
+		// Handle the list ordering.
+		$listOrder = $this->getState('list.ordering', 'l.title');
+		$listDir   = $this->getState('list.direction', 'ASC');
+
+		if ($listOrder === 't.title')
+		{
+			$ordering = $db->quoteName('t.title') . ' ' . $db->escape($listDir) . ', ' . $db->quoteName('l.title') . ' ' . $db->escape($listDir);
+		}
+		else
+		{
+			$ordering = $db->escape($listOrder) . ' ' . $db->escape($listDir);
+		}
+
+		$query->order($ordering);
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the state of the Smart Search Plugins.
+	 *
+	 * @return  array  Array of relevant plugins and whether they are enabled or not.
+	 *
+	 * @since   2.5
+	 */
+	public function getPluginState()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('name, enabled')
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->where($db->quoteName('folder') . ' IN (' . $db->quote('system') . ',' . $db->quote('content') . ')')
+			->where($db->quoteName('element') . ' = ' . $db->quote('finder'));
+		$db->setQuery($query);
+
+		return $db->loadObjectList('name');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id. [optional]
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.type');
+		$id .= ':' . $this->getState('filter.content_map');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Gets the total of indexed items.
+	 *
+	 * @return  integer  The total of indexed items.
+	 *
+	 * @since   3.6.0
+	 */
+	public function getTotalIndexed()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(link_id)')
+			->from($db->quoteName('#__finder_links'));
+		$db->setQuery($query);
+
+		$db->execute();
+
+		return (int) $db->loadResult();
+	}
+
+	/**
+	 * Returns a JTable object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate. [optional]
+	 * @param   string  $prefix  A prefix for the table class name. [optional]
+	 * @param   array   $config  Configuration array for model. [optional]
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   2.5
+	 */
+	public function getTable($type = 'Link', $prefix = 'FinderTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to purge the index, deleting all links.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error
+	 */
+	public function purge()
+	{
+		$db = $this->getDbo();
+
+		// Truncate the links table.
+		$db->truncateTable('#__finder_links');
+
+		// Truncate the links terms tables.
+		for ($i = 0; $i <= 15; $i++)
+		{
+			// Get the mapping table suffix.
+			$suffix = dechex($i);
+
+			$db->truncateTable('#__finder_links_terms' . $suffix);
+		}
+
+		// Truncate the terms table.
+		$db->truncateTable('#__finder_terms');
+
+		// Truncate the taxonomy map table.
+		$db->truncateTable('#__finder_taxonomy_map');
+
+		// Delete all the taxonomy nodes except the root.
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('id') . ' > 1');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Truncate the tokens tables.
+		$db->truncateTable('#__finder_tokens');
+
+		// Truncate the tokens aggregate table.
+		$db->truncateTable('#__finder_tokens_aggregate');
+
+		return true;
+	}
+
+	/**
+	 * Method to auto-populate the model state.  Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field. [optional]
+	 * @param   string  $direction  An optional direction. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState($ordering = 'l.title', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'cmd'));
+		$this->setState('filter.content_map', $this->getUserStateFromRequest($this->context . '.filter.content_map', 'filter_content_map', '', 'cmd'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_finder');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    $pks    A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state. [optional]
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$user = JFactory::getUser();
+		$table = $this->getTable();
+		$pks = (array) $pks;
+
+		// Include the content plugins for the change of state event.
+		JPluginHelper::importPlugin('content');
+
+		// Access checks.
+		foreach ($pks as $i => $pk)
+		{
+			$table->reset();
+
+			if ($table->load($pk) && !$this->canEditState($table))
+			{
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+
+				return false;
+			}
+		}
+
+		// Attempt to change the state of the records.
+		if (!$table->publish($pks, $value, $user->get('id')))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$context = $this->option . '.' . $this->name;
+
+		// Trigger the onContentChangeState event.
+		$result = $dispatcher->trigger('onContentChangeState', array($context, $pks, $value));
+
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/models/indexer.php b/core/administrator/components/com_finder/models/indexer.php
new file mode 100644
index 00000000..0a4d03ed
--- /dev/null
+++ b/core/administrator/components/com_finder/models/indexer.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Indexer model class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderModelIndexer extends JModelLegacy
+{
+}
diff --git a/core/administrator/components/com_finder/models/maps.php b/core/administrator/components/com_finder/models/maps.php
new file mode 100644
index 00000000..1dc75b1f
--- /dev/null
+++ b/core/administrator/components/com_finder/models/maps.php
@@ -0,0 +1,408 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * Maps model for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderModelMaps extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An associative array of configuration settings. [optional]
+	 *
+	 * @since   2.5
+	 * @see     JControllerLegacy
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'state', 'a.state',
+				'title', 'a.title',
+				'branch',
+				'branch_title', 'd.branch_title',
+				'level', 'd.level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
+	 *
+	 * @since   2.5
+	 */
+	protected function canDelete($record)
+	{
+		return JFactory::getUser()->authorise('core.delete', $this->option);
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the component.
+	 *
+	 * @since   2.5
+	 */
+	protected function canEditState($record)
+	{
+		return JFactory::getUser()->authorise('core.edit.state', $this->option);
+	}
+
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  $pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   2.5
+	 */
+	public function delete(&$pks)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$pks = (array) $pks;
+		$table = $this->getTable();
+
+		// Include the content plugins for the on delete events.
+		JPluginHelper::importPlugin('content');
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($this->canDelete($table))
+				{
+					$context = $this->option . '.' . $this->name;
+
+					// Trigger the onContentBeforeDelete event.
+					$result = $dispatcher->trigger('onContentBeforeDelete', array($context, $table));
+
+					if (in_array(false, $result, true))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+
+					if (!$table->delete($pk))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+
+					// Trigger the onContentAfterDelete event.
+					$dispatcher->trigger('onContentAfterDelete', array($context, $table));
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					$error = $this->getError();
+
+					if ($error)
+					{
+						$this->setError($error);
+					}
+					else
+					{
+						$this->setError(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
+					}
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery  A JDatabaseQuery object
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+
+		// Select all fields from the table.
+		$query = $db->getQuery(true)
+			->select('a.id, a.parent_id, a.title, a.state, a.access, a.ordering')
+			->select('CASE WHEN a.parent_id = 1 THEN 1 ELSE 2 END AS level')
+			->select('p.title AS parent_title')
+			->from($db->quoteName('#__finder_taxonomy', 'a'))
+			->leftJoin($db->quoteName('#__finder_taxonomy', 'p') . ' ON p.id = a.parent_id')
+			->where('a.parent_id != 0');
+
+		$childQuery = $db->getQuery(true)
+			->select('parent_id')
+			->select('COUNT(*) AS num_children')
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where('parent_id != 0')
+			->group('parent_id');
+
+		// Join to get children.
+		$query->select('b.num_children');
+		$query->select('CASE WHEN a.parent_id = 1 THEN a.title ELSE p.title END AS branch_title');
+		$query->leftJoin('(' . $childQuery . ') AS b ON b.parent_id = a.id');
+
+		// Join to get the map links.
+		$stateQuery = $db->getQuery(true)
+			->select('m.node_id')
+			->select('COUNT(NULLIF(l.published, 0)) AS count_published')
+			->select('COUNT(NULLIF(l.published, 1)) AS count_unpublished')
+			->from($db->quoteName('#__finder_taxonomy_map', 'm'))
+			->leftJoin($db->quoteName('#__finder_links', 'l') . ' ON l.link_id = m.link_id')
+			->group('m.node_id');
+
+		$query->select('COALESCE(s.count_published, 0) AS count_published');
+		$query->select('COALESCE(s.count_unpublished, 0) AS count_unpublished');
+		$query->leftJoin('(' . $stateQuery . ') AS s ON s.node_id = a.id');
+
+		// If the model is set to check item state, add to the query.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.state = ' . (int) $state);
+		}
+
+		// Filter over level.
+		$level = $this->getState('filter.level');
+
+		if (is_numeric($level) && (int) $level === 1)
+		{
+			$query->where('a.parent_id = 1');
+		}
+
+		// Filter the maps over the branch if set.
+		$branchId = $this->getState('filter.branch');
+
+		if (is_numeric($branchId))
+		{
+			$query->where('a.parent_id = ' . (int) $branchId);
+		}
+
+		// Filter the maps over the search string if set.
+		if ($search = $this->getState('filter.search'))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where('a.title LIKE ' . $search);
+		}
+
+		// Handle the list ordering.
+		$listOrdering = $this->getState('list.ordering', 'd.branch_title');
+		$listDirn     = $this->getState('list.direction', 'ASC');
+
+		if ($listOrdering === 'd.branch_title')
+		{
+			$query->order("branch_title $listDirn, level ASC, a.title $listDirn");
+		}
+		elseif ($listOrdering === 'a.state')
+		{
+			$query->order("a.state $listDirn, branch_title $listDirn, level ASC");
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Returns a record count for the query.
+	 *
+	 * @param   JDatabaseQuery|string  $query  The query.
+	 *
+	 * @return  integer  Number of rows for query.
+	 *
+	 * @since   3.0
+	 */
+	protected function _getListCount($query)
+	{
+		$query = clone $query;
+		$query->clear('select')->clear('join')->clear('order')->clear('limit')->clear('offset')->select('COUNT(*)');
+
+		return (int) $this->getDbo()->setQuery($query)->loadResult();
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id. [optional]
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.branch');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Returns a JTable object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate. [optional]
+	 * @param   string  $prefix  A prefix for the table class name. [optional]
+	 * @param   array   $config  Configuration array for model. [optional]
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   2.5
+	 */
+	public function getTable($type = 'Map', $prefix = 'FinderTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.  Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field. [optional]
+	 * @param   string  $direction  An optional direction. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState($ordering = 'd.branch_title', $direction = 'ASC')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+		$this->setState('filter.branch', $this->getUserStateFromRequest($this->context . '.filter.branch', 'filter_branch', '', 'cmd'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_finder');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    $pks    A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state. [optional]
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$user = JFactory::getUser();
+		$table = $this->getTable();
+		$pks = (array) $pks;
+
+		// Include the content plugins for the change of state event.
+		JPluginHelper::importPlugin('content');
+
+		// Access checks.
+		foreach ($pks as $i => $pk)
+		{
+			$table->reset();
+
+			if ($table->load($pk) && !$this->canEditState($table))
+			{
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+
+				return false;
+			}
+		}
+
+		// Attempt to change the state of the records.
+		if (!$table->publish($pks, $value, $user->get('id')))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$context = $this->option . '.' . $this->name;
+
+		// Trigger the onContentChangeState event.
+		$result = $dispatcher->trigger('onContentChangeState', array($context, $pks, $value));
+
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to purge all maps from the taxonomy.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	public function purge()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' > 1');
+		$db->setQuery($query);
+		$db->execute();
+
+		$query->clear()
+			->delete($db->quoteName('#__finder_taxonomy_map'))
+			->where('1');
+		$db->setQuery($query);
+		$db->execute();
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/models/statistics.php b/core/administrator/components/com_finder/models/statistics.php
new file mode 100644
index 00000000..a301d9b3
--- /dev/null
+++ b/core/administrator/components/com_finder/models/statistics.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Statistics model class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderModelStatistics extends JModelLegacy
+{
+	/**
+	 * Method to get the component statistics
+	 *
+	 * @return  JObject  The component statistics
+	 *
+	 * @since   2.5
+	 */
+	public function getData()
+	{
+		// Initialise
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$data = new JObject;
+
+		$query->select('COUNT(term_id)')
+			->from($db->quoteName('#__finder_terms'));
+		$db->setQuery($query);
+		$data->term_count = $db->loadResult();
+
+		$query->clear()
+			->select('COUNT(link_id)')
+			->from($db->quoteName('#__finder_links'));
+		$db->setQuery($query);
+		$data->link_count = $db->loadResult();
+
+		$query->clear()
+			->select('COUNT(id)')
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' = 1');
+		$db->setQuery($query);
+		$data->taxonomy_branch_count = $db->loadResult();
+
+		$query->clear()
+			->select('COUNT(id)')
+			->from($db->quoteName('#__finder_taxonomy'))
+			->where($db->quoteName('parent_id') . ' > 1');
+		$db->setQuery($query);
+		$data->taxonomy_node_count = $db->loadResult();
+
+		$query->clear()
+			->select('t.title AS type_title, COUNT(a.link_id) AS link_count')
+			->from($db->quoteName('#__finder_links') . ' AS a')
+			->join('INNER', $db->quoteName('#__finder_types') . ' AS t ON t.id = a.type_id')
+			->group('a.type_id, t.title')
+			->order($db->quoteName('type_title') . ' ASC');
+		$db->setQuery($query);
+		$data->type_list = $db->loadObjectList();
+
+		$lang  = JFactory::getLanguage();
+		$plugins = JPluginHelper::getPlugin('finder');
+
+		foreach ($plugins as $plugin)
+		{
+			$lang->load('plg_finder_' . $plugin->name . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load('plg_finder_' . $plugin->name . '.sys', JPATH_PLUGINS . '/finder/' . $plugin->name, null, false, true);
+		}
+
+		return $data;
+	}
+}
diff --git a/core/administrator/components/com_finder/sql/install.mysql.sql b/core/administrator/components/com_finder/sql/install.mysql.sql
new file mode 100644
index 00000000..4207fa21
--- /dev/null
+++ b/core/administrator/components/com_finder/sql/install.mysql.sql
@@ -0,0 +1,496 @@
+--
+-- Table structure for table `#__finder_filters`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_filters` (
+  `filter_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) NOT NULL,
+  `alias` varchar(255) NOT NULL,
+  `state` tinyint(1) NOT NULL DEFAULT 1,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL,
+  `created_by_alias` varchar(255) NOT NULL,
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `map_count` int(10) unsigned NOT NULL DEFAULT 0,
+  `data` text NOT NULL,
+  `params` mediumtext,
+  PRIMARY KEY (`filter_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links` (
+  `link_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `url` varchar(255) NOT NULL,
+  `route` varchar(255) NOT NULL,
+  `title` varchar(400) DEFAULT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `indexdate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `md5sum` varchar(32) DEFAULT NULL,
+  `published` tinyint(1) NOT NULL DEFAULT 1,
+  `state` int(5) DEFAULT 1,
+  `access` int(5) DEFAULT 0,
+  `language` varchar(8) NOT NULL,
+  `publish_start_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_end_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `start_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `end_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `list_price` double unsigned NOT NULL DEFAULT 0,
+  `sale_price` double unsigned NOT NULL DEFAULT 0,
+  `type_id` int(11) NOT NULL,
+  `object` mediumblob NOT NULL,
+  PRIMARY KEY (`link_id`),
+  KEY `idx_type` (`type_id`),
+  KEY `idx_title` (`title`(100)),
+  KEY `idx_md5` (`md5sum`),
+  KEY `idx_url` (`url`(75)),
+  KEY `idx_published_list` (`published`,`state`,`access`,`publish_start_date`,`publish_end_date`,`list_price`),
+  KEY `idx_published_sale` (`published`,`state`,`access`,`publish_start_date`,`publish_end_date`,`sale_price`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms0`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms0` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms1`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms1` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms2`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms2` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms3`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms3` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms4`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms4` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms5`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms5` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms6`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms6` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms7`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms7` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms8`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms8` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_terms9`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_terms9` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_termsa`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsa` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_termsb`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsb` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_termsc`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsc` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_termsd`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsd` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_termse`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termse` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_links_termsf`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_links_termsf` (
+  `link_id` int(10) unsigned NOT NULL,
+  `term_id` int(10) unsigned NOT NULL,
+  `weight` float unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`term_id`),
+  KEY `idx_term_weight` (`term_id`,`weight`),
+  KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_taxonomy`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int(10) unsigned NOT NULL DEFAULT 0,
+  `title` varchar(255) NOT NULL,
+  `state` tinyint(1) unsigned NOT NULL DEFAULT 1,
+  `access` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `ordering` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`),
+  KEY `parent_id` (`parent_id`),
+  KEY `state` (`state`),
+  KEY `ordering` (`ordering`),
+  KEY `access` (`access`),
+  KEY `idx_parent_published` (`parent_id`,`state`,`access`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Dumping data for table `#__finder_taxonomy`
+--
+
+REPLACE INTO `#__finder_taxonomy` (`id`, `parent_id`, `title`, `state`, `access`, `ordering`) VALUES
+(1, 0, 'ROOT', 0, 0, 0);
+
+--
+-- Table structure for table `#__finder_taxonomy_map`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_taxonomy_map` (
+  `link_id` int(10) unsigned NOT NULL,
+  `node_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`link_id`,`node_id`),
+  KEY `link_id` (`link_id`),
+  KEY `node_id` (`node_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_terms`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_terms` (
+  `term_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `term` varchar(75) NOT NULL,
+  `stem` varchar(75) NOT NULL,
+  `common` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `phrase` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `weight` float unsigned NOT NULL DEFAULT 0,
+  `soundex` varchar(75) NOT NULL,
+  `links` int(10) NOT NULL DEFAULT 0,
+  `language` char(3) NOT NULL DEFAULT '',
+  PRIMARY KEY (`term_id`),
+  UNIQUE KEY `idx_term` (`term`),
+  KEY `idx_term_phrase` (`term`,`phrase`),
+  KEY `idx_stem_phrase` (`stem`,`phrase`),
+  KEY `idx_soundex_phrase` (`soundex`,`phrase`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_terms_common`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_terms_common` (
+  `term` varchar(75) NOT NULL,
+  `language` varchar(3) NOT NULL,
+  KEY `idx_word_lang` (`term`,`language`),
+  KEY `idx_lang` (`language`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Dumping data for table `#__finder_terms_common`
+--
+
+REPLACE INTO `#__finder_terms_common` (`term`, `language`) VALUES
+('a', 'en'),
+('about', 'en'),
+('after', 'en'),
+('ago', 'en'),
+('all', 'en'),
+('am', 'en'),
+('an', 'en'),
+('and', 'en'),
+('any', 'en'),
+('are', 'en'),
+('aren''t', 'en'),
+('as', 'en'),
+('at', 'en'),
+('be', 'en'),
+('but', 'en'),
+('by', 'en'),
+('for', 'en'),
+('from', 'en'),
+('get', 'en'),
+('go', 'en'),
+('how', 'en'),
+('if', 'en'),
+('in', 'en'),
+('into', 'en'),
+('is', 'en'),
+('isn''t', 'en'),
+('it', 'en'),
+('its', 'en'),
+('me', 'en'),
+('more', 'en'),
+('most', 'en'),
+('must', 'en'),
+('my', 'en'),
+('new', 'en'),
+('no', 'en'),
+('none', 'en'),
+('not', 'en'),
+('nothing', 'en'),
+('of', 'en'),
+('off', 'en'),
+('often', 'en'),
+('old', 'en'),
+('on', 'en'),
+('onc', 'en'),
+('once', 'en'),
+('only', 'en'),
+('or', 'en'),
+('other', 'en'),
+('our', 'en'),
+('ours', 'en'),
+('out', 'en'),
+('over', 'en'),
+('page', 'en'),
+('she', 'en'),
+('should', 'en'),
+('small', 'en'),
+('so', 'en'),
+('some', 'en'),
+('than', 'en'),
+('thank', 'en'),
+('that', 'en'),
+('the', 'en'),
+('their', 'en'),
+('theirs', 'en'),
+('them', 'en'),
+('then', 'en'),
+('there', 'en'),
+('these', 'en'),
+('they', 'en'),
+('this', 'en'),
+('those', 'en'),
+('thus', 'en'),
+('time', 'en'),
+('times', 'en'),
+('to', 'en'),
+('too', 'en'),
+('true', 'en'),
+('under', 'en'),
+('until', 'en'),
+('up', 'en'),
+('upon', 'en'),
+('use', 'en'),
+('user', 'en'),
+('users', 'en'),
+('version', 'en'),
+('very', 'en'),
+('via', 'en'),
+('want', 'en'),
+('was', 'en'),
+('way', 'en'),
+('were', 'en'),
+('what', 'en'),
+('when', 'en'),
+('where', 'en'),
+('which', 'en'),
+('who', 'en'),
+('whom', 'en'),
+('whose', 'en'),
+('why', 'en'),
+('wide', 'en'),
+('will', 'en'),
+('with', 'en'),
+('within', 'en'),
+('without', 'en'),
+('would', 'en'),
+('yes', 'en'),
+('yet', 'en'),
+('you', 'en'),
+('your', 'en'),
+('yours', 'en');
+
+--
+-- Table structure for table `#__finder_tokens`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_tokens` (
+  `term` varchar(75) NOT NULL,
+  `stem` varchar(75) NOT NULL,
+  `common` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `phrase` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `weight` float unsigned NOT NULL DEFAULT 1,
+  `context` tinyint(1) unsigned NOT NULL DEFAULT 2,
+  `language` char(3) NOT NULL DEFAULT '',
+  KEY `idx_word` (`term`),
+  KEY `idx_context` (`context`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_tokens_aggregate`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_tokens_aggregate` (
+  `term_id` int(10) unsigned NOT NULL,
+  `map_suffix` char(1) NOT NULL,
+  `term` varchar(75) NOT NULL,
+  `stem` varchar(75) NOT NULL,
+  `common` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `phrase` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `term_weight` float unsigned NOT NULL,
+  `context` tinyint(1) unsigned NOT NULL DEFAULT 2,
+  `context_weight` float unsigned NOT NULL,
+  `total_weight` float unsigned NOT NULL,
+  `language` char(3) NOT NULL DEFAULT '',
+  KEY `token` (`term`),
+  KEY `keyword_id` (`term_id`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+--
+-- Table structure for table `#__finder_types`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_types` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(100) NOT NULL,
+  `mime` varchar(100) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `title` (`title`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
diff --git a/core/administrator/components/com_finder/sql/install.postgresql.sql b/core/administrator/components/com_finder/sql/install.postgresql.sql
new file mode 100644
index 00000000..8097507e
--- /dev/null
+++ b/core/administrator/components/com_finder/sql/install.postgresql.sql
@@ -0,0 +1,1025 @@
+--
+-- Table: #__finder_filters
+--
+CREATE TABLE "#__finder_filters" (
+  "filter_id" serial NOT NULL,
+  "title" character varying(255) NOT NULL,
+  "alias" character varying(255) NOT NULL,
+  "state" smallint DEFAULT 1 NOT NULL,
+  "created" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "created_by" integer NOT NULL,
+  "created_by_alias" character varying(255) NOT NULL,
+  "modified" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "modified_by" integer DEFAULT 0 NOT NULL,
+  "checked_out" integer DEFAULT 0 NOT NULL,
+  "checked_out_time" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "map_count" integer DEFAULT 0 NOT NULL,
+  "data" text NOT NULL,
+  "params" text,
+  PRIMARY KEY ("filter_id")
+);
+
+--
+-- Table: #__finder_links
+--
+CREATE TABLE "#__finder_links" (
+  "link_id" serial NOT NULL,
+  "url" character varying(255) NOT NULL,
+  "route" character varying(255) NOT NULL,
+  "title" character varying(255) DEFAULT NULL,
+  "description" character varying(255) DEFAULT NULL,
+  "indexdate" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "md5sum" character varying(32) DEFAULT NULL,
+  "published" smallint DEFAULT 1 NOT NULL,
+  "state" integer DEFAULT 1,
+  "access" integer DEFAULT 0,
+  "language" character varying(8) NOT NULL,
+  "publish_start_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "publish_end_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "start_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "end_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "list_price" numeric(8,2) DEFAULT 0 NOT NULL,
+  "sale_price" numeric(8,2) DEFAULT 0 NOT NULL,
+  "type_id" bigint NOT NULL,
+  "object" bytea NOT NULL,
+  PRIMARY KEY ("link_id")
+);
+CREATE INDEX "#__finder_links_idx_type" on "#__finder_links" ("type_id");
+CREATE INDEX "#__finder_links_idx_title" on "#__finder_links" ("title");
+CREATE INDEX "#__finder_links_idx_md5" on "#__finder_links" ("md5sum");
+CREATE INDEX "#__finder_links_idx_url" on "#__finder_links" (url(75));
+CREATE INDEX "#__finder_links_idx_published_list" on "#__finder_links" ("published", "state", "access", "publish_start_date", "publish_end_date", "list_price");
+CREATE INDEX "#__finder_links_idx_published_sale" on "#__finder_links" ("published", "state", "access", "publish_start_date", "publish_end_date", "sale_price");
+
+--
+-- Table: #__finder_links_terms0
+--
+CREATE TABLE "#__finder_links_terms0" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms0_idx_term_weight" on "#__finder_links_terms0" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms0_idx_link_term_weight" on "#__finder_links_terms0" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms1
+--
+CREATE TABLE "#__finder_links_terms1" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms1_idx_term_weight" on "#__finder_links_terms1" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms1_idx_link_term_weight" on "#__finder_links_terms1" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms2
+--
+CREATE TABLE "#__finder_links_terms2" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms2_idx_term_weight" on "#__finder_links_terms2" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms2_idx_link_term_weight" on "#__finder_links_terms2" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms3
+--
+CREATE TABLE "#__finder_links_terms3" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms3_idx_term_weight" on "#__finder_links_terms3" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms3_idx_link_term_weight" on "#__finder_links_terms3" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms4
+--
+CREATE TABLE "#__finder_links_terms4" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms4_idx_term_weight" on "#__finder_links_terms4" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms4_idx_link_term_weight" on "#__finder_links_terms4" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms5
+--
+CREATE TABLE "#__finder_links_terms5" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms5_idx_term_weight" on "#__finder_links_terms5" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms5_idx_link_term_weight" on "#__finder_links_terms5" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms6
+--
+CREATE TABLE "#__finder_links_terms6" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms6_idx_term_weight" on "#__finder_links_terms6" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms6_idx_link_term_weight" on "#__finder_links_terms6" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms7
+--
+CREATE TABLE "#__finder_links_terms7" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms7_idx_term_weight" on "#__finder_links_terms7" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms7_idx_link_term_weight" on "#__finder_links_terms7" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms8
+--
+CREATE TABLE "#__finder_links_terms8" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms8_idx_term_weight" on "#__finder_links_terms8" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms8_idx_link_term_weight" on "#__finder_links_terms8" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_terms9
+--
+CREATE TABLE "#__finder_links_terms9" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_terms9_idx_term_weight" on "#__finder_links_terms9" ("term_id", "weight");
+CREATE INDEX "#__finder_links_terms9_idx_link_term_weight" on "#__finder_links_terms9" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_termsa
+--
+CREATE TABLE "#__finder_links_termsa" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_termsa_idx_term_weight" on "#__finder_links_termsa" ("term_id", "weight");
+CREATE INDEX "#__finder_links_termsa_idx_link_term_weight" on "#__finder_links_termsa" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_termsb
+--
+CREATE TABLE "#__finder_links_termsb" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_termsb_idx_term_weight" on "#__finder_links_termsb" ("term_id", "weight");
+CREATE INDEX "#__finder_links_termsb_idx_link_term_weight" on "#__finder_links_termsb" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_termsc
+--
+CREATE TABLE "#__finder_links_termsc" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_termsc_idx_term_weight" on "#__finder_links_termsc" ("term_id", "weight");
+CREATE INDEX "#__finder_links_termsc_idx_link_term_weight" on "#__finder_links_termsc" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_termsd
+--
+CREATE TABLE "#__finder_links_termsd" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_termsd_idx_term_weight" on "#__finder_links_termsd" ("term_id", "weight");
+CREATE INDEX "#__finder_links_termsd_idx_link_term_weight" on "#__finder_links_termsd" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_termse
+--
+CREATE TABLE "#__finder_links_termse" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_termse_idx_term_weight" on "#__finder_links_termse" ("term_id", "weight");
+CREATE INDEX "#__finder_links_termse_idx_link_term_weight" on "#__finder_links_termse" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_links_termsf
+--
+CREATE TABLE "#__finder_links_termsf" (
+  "link_id" integer NOT NULL,
+  "term_id" integer NOT NULL,
+  "weight" numeric(8,2) NOT NULL,
+  PRIMARY KEY ("link_id", "term_id")
+);
+CREATE INDEX "#__finder_links_termsf_idx_term_weight" on "#__finder_links_termsf" ("term_id", "weight");
+CREATE INDEX "#__finder_links_termsf_idx_link_term_weight" on "#__finder_links_termsf" ("link_id", "term_id", "weight");
+
+--
+-- Table: #__finder_taxonomy
+--
+CREATE TABLE "#__finder_taxonomy" (
+  "id" serial NOT NULL,
+  "parent_id" integer DEFAULT 0 NOT NULL,
+  "title" character varying(255) NOT NULL,
+  "state" smallint DEFAULT 1 NOT NULL,
+  "access" smallint DEFAULT 0 NOT NULL,
+  "ordering" smallint DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__finder_taxonomy_parent_id" on "#__finder_taxonomy" ("parent_id");
+CREATE INDEX "#__finder_taxonomy_state" on "#__finder_taxonomy" ("state");
+CREATE INDEX "#__finder_taxonomy_ordering" on "#__finder_taxonomy" ("ordering");
+CREATE INDEX "#__finder_taxonomy_access" on "#__finder_taxonomy" ("access");
+CREATE INDEX "#__finder_taxonomy_idx_parent_published" on "#__finder_taxonomy" ("parent_id", "state", "access");
+
+--
+-- Dumping data for table #__finder_taxonomy
+--
+UPDATE "#__finder_taxonomy" SET ("id", "parent_id", "title", "state", "access", "ordering") = (1, 0, 'ROOT', 0, 0, 0) 
+WHERE "id"=1;
+
+INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "title", "state", "access", "ordering") 
+SELECT 1, 0, 'ROOT', 0, 0, 0 WHERE 1 NOT IN 
+(SELECT 1 FROM "#__finder_taxonomy" WHERE "id"=1);
+
+
+
+--
+-- Table: #__finder_taxonomy_map
+--
+CREATE TABLE "#__finder_taxonomy_map" (
+  "link_id" integer NOT NULL,
+  "node_id" integer NOT NULL,
+  PRIMARY KEY ("link_id", "node_id")
+);
+CREATE INDEX "#__finder_taxonomy_map_link_id" on "#__finder_taxonomy_map" ("link_id");
+CREATE INDEX "#__finder_taxonomy_map_node_id" on "#__finder_taxonomy_map" ("node_id");
+
+--
+-- Table: #__finder_terms
+--
+CREATE TABLE "#__finder_terms" (
+  "term_id" serial NOT NULL,
+  "term" character varying(75) NOT NULL,
+  "stem" character varying(75) NOT NULL,
+  "common" smallint DEFAULT 0 NOT NULL,
+  "phrase" smallint DEFAULT 0 NOT NULL,
+  "weight" numeric(8,2) DEFAULT 0 NOT NULL,
+  "soundex" character varying(75) NOT NULL,
+  "links" integer DEFAULT 0 NOT NULL,
+  PRIMARY KEY ("term_id"),
+  CONSTRAINT "#__finder_terms_idx_term" UNIQUE ("term")
+);
+CREATE INDEX "#__finder_terms_idx_term_phrase" on "#__finder_terms" ("term", "phrase");
+CREATE INDEX "#__finder_terms_idx_stem_phrase" on "#__finder_terms" ("stem", "phrase");
+CREATE INDEX "#__finder_terms_idx_soundex_phrase" on "#__finder_terms" ("soundex", "phrase");
+
+--
+-- Table: #__finder_terms_common
+--
+CREATE TABLE "#__finder_terms_common" (
+  "term" character varying(75) NOT NULL,
+  "language" character varying(3) NOT NULL
+);
+CREATE INDEX "#__finder_terms_common_idx_word_lang" on "#__finder_terms_common" ("term", "language");
+CREATE INDEX "#__finder_terms_common_idx_lang" on "#__finder_terms_common" ("language");
+
+
+--
+-- Dumping data for table `#__finder_terms_common`
+--
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('a', 'en') WHERE "term"='a';
+
+INSERT INTO "#__finder_terms_common" ("term", "language") 
+SELECT 'a', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='a');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('about', 'en') WHERE "term"='about';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'about', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='about');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('after', 'en') WHERE "term"='after';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'after', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='after');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('ago', 'en') WHERE "term"='ago';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'ago', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='ago');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('all', 'en') WHERE "term"='all';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'all', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='all');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('am', 'en') WHERE "term"='am';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'am', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='am');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('an', 'en') WHERE "term"='an';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'an', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='an');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('and', 'en') WHERE "term"='and';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'and', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='and');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('any', 'en') WHERE "term"='any';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'any', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='any');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('are', 'en') WHERE "term"='are';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'are', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='are');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('aren''t', 'en') WHERE "term"='aren''t';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'aren''t', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='aren''t');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('as', 'en') WHERE "term"='as';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'as', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='as');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('at', 'en') WHERE "term"='at';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'at', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='at');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('be', 'en') WHERE "term"='be';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'be', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='be');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('but', 'en') WHERE "term"='but';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'but', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='but');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('by', 'en') WHERE "term"='by';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'by', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='by');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('for', 'en') WHERE "term"='for';
+
+INSERT INTO "#__finder_terms_common" ("term", "language") SELECT 'for', 'en' WHERE 1 NOT IN 
+(SELECT 1 FROM "#__finder_terms_common" WHERE "term"='for');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('from', 'en') WHERE "term"='from';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'from', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='from');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('get', 'en') WHERE "term"='get';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'get', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='get');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('go', 'en') WHERE "term"='go';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'go', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='go');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('how', 'en') WHERE "term"='how';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'how', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='how');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('if', 'en') WHERE "term"='if';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'if', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='if');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('in', 'en') WHERE "term"='in';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'in', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='in');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('into', 'en') WHERE "term"='into';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'into', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='into');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('is', 'en') WHERE "term"='is';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'is', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='is');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('isn''t', 'en') WHERE "term"='isn''t';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'isn''t', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='isn''t');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('it', 'en') WHERE "term"='it';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'it', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='it');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('its', 'en') WHERE "term"='its';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'its', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='its');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('me', 'en') WHERE "term"='me';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'me', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='me');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('more', 'en') WHERE "term"='more';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'more', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='more');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('most', 'en') WHERE "term"='most';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'most', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='most');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('must', 'en') WHERE "term"='must';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'must', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='must');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('my', 'en') WHERE "term"='my';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'my', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='my');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('new', 'en') WHERE "term"='new';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'new', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='new');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('no', 'en') WHERE "term"='no';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'no', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='no');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('none', 'en') WHERE "term"='none';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'none', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='none');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('not', 'en') WHERE "term"='not';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'not', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='not');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('nothing', 'en') WHERE "term"='nothing';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'nothing', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='nothing');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('of', 'en') WHERE "term"='of';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'of', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='of');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('off', 'en') WHERE "term"='off';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'off', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='off');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('often', 'en') WHERE "term"='often';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'often', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='often');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('old', 'en') WHERE "term"='old';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'old', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='old');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('on', 'en') WHERE "term"='on';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'on', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='on');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('onc', 'en') WHERE "term"='onc';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'onc', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='onc');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('once', 'en') WHERE "term"='once';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'once', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='once');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('only', 'en') WHERE "term"='only';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'only', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='only');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('or', 'en') WHERE "term"='or';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'or', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='or');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('other', 'en') WHERE "term"='other';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'other', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='other');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('our', 'en') WHERE "term"='our';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'our', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='our');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('ours', 'en') WHERE "term"='ours';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'ours', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='ours');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('out', 'en') WHERE "term"='out';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'out', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='out');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('over', 'en') WHERE "term"='over';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'over', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='over');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('page', 'en') WHERE "term"='page';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'page', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='page');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('she', 'en') WHERE "term"='she';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'she', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='she');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('should', 'en') WHERE "term"='should';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'should', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='should');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('small', 'en') WHERE "term"='small';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'small', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='small');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('so', 'en') WHERE "term"='so';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'so', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='so');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('some', 'en') WHERE "term"='some';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'some', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='some');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('than', 'en') WHERE "term"='than';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'than', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='than');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('thank', 'en') WHERE "term"='thank';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'thank', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='thank');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('that', 'en') WHERE "term"='that';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'that', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='that');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('the', 'en') WHERE "term"='the';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'the', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='the');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('their', 'en') WHERE "term"='their';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'their', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='their');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('theirs', 'en') WHERE "term"='theirs';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'theirs', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='theirs');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('them', 'en') WHERE "term"='them';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'them', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='them');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('then', 'en') WHERE "term"='then';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'then', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='then');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('there', 'en') WHERE "term"='there';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'there', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='there');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('these', 'en') WHERE "term"='these';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'these', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='these');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('they', 'en') WHERE "term"='they';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'they', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='they');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('this', 'en') WHERE "term"='this';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'this', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='this');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('those', 'en') WHERE "term"='those';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'those', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='those');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('thus', 'en') WHERE "term"='thus';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'thus', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='thus');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('time', 'en') WHERE "term"='time';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'time', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='time');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('times', 'en') WHERE "term"='times';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'times', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='times');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('to', 'en') WHERE "term"='to';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'to', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='to');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('too', 'en') WHERE "term"='too';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'too', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='too');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('true', 'en') WHERE "term"='true';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'true', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='true');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('under', 'en')WHERE "term"='under';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'under', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='under');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('until', 'en') WHERE "term"='until';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'until', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='until');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('up', 'en') WHERE "term"='up';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'up', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='up');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('upon', 'en') WHERE "term"='upon';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'upon', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='upon');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('use', 'en') WHERE "term"='use';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'use', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='use');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('user', 'en') WHERE "term"='user';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'user', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='user');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('users', 'en') WHERE "term"='users';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'users', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='users');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('version', 'en') WHERE "term"='version';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'version', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='version');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('very', 'en') WHERE "term"='very';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'very', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='very');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('via', 'en') WHERE "term"='via';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'via', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='via');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('want', 'en') WHERE "term"='want';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'want', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='want');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('was', 'en') WHERE "term"='was';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'was', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='was');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('way', 'en') WHERE "term"='way';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'way', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='way');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('were', 'en') WHERE "term"='were';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'were', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='were');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('what', 'en') WHERE "term"='what';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'what', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='what');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('when', 'en') WHERE "term"='when';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'when', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='when');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('where', 'en') WHERE "term"='where';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'where', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='where');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('which', 'en') WHERE "term"='which';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'which', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='which');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('who', 'en') WHERE "term"='who';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'who', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='who');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('whom', 'en') WHERE "term"='whom';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'whom', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='whom');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('whose', 'en') WHERE "term"='whose';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'whose', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='whose');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('why', 'en') WHERE "term"='why';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'why', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='why');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('wide', 'en') WHERE "term"='wide';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'wide', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='wide');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('will', 'en') WHERE "term"='will';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'will', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='will');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('with', 'en') WHERE "term"='with';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'with', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='with');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('within', 'en') WHERE "term"='within';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'within', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='within');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('without', 'en') WHERE "term"='without';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'without', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='without');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('would', 'en') WHERE "term"='would';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'would', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='would');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('yes', 'en') WHERE "term"='yes';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'yes', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='yes');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('yet', 'en') WHERE "term"='yet';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'yet', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='yet');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('you', 'en') WHERE "term"='you';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'you', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='you');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('your', 'en') WHERE "term"='your';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'your', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='your');
+
+--
+UPDATE "#__finder_terms_common" SET ("term", "language") = ('yours', 'en') WHERE "term"='yours';
+
+INSERT INTO "#__finder_terms_common" ("term", "language")
+SELECT 'yours', 'en' WHERE 1 NOT IN (SELECT 1 FROM "#__finder_terms_common" WHERE "term"='yours');
+
+
+
+--
+-- Table: #__finder_tokens
+--
+CREATE TABLE "#__finder_tokens" (
+  "term" character varying(75) NOT NULL,
+  "stem" character varying(75) NOT NULL,
+  "common" smallint DEFAULT 0 NOT NULL,
+  "phrase" smallint DEFAULT 0 NOT NULL,
+  "weight" numeric(8,2) DEFAULT 1 NOT NULL,
+  "context" smallint DEFAULT 2 NOT NULL
+);
+CREATE INDEX "#__finder_tokens_idx_word" on "#__finder_tokens" ("term");
+CREATE INDEX "#__finder_tokens_idx_context" on "#__finder_tokens" ("context");
+
+--
+-- Table: #__finder_tokens_aggregate
+--
+CREATE TABLE "#__finder_tokens_aggregate" (
+  "term_id" integer NOT NULL,
+  "map_suffix" character(1) NOT NULL,
+  "term" character varying(75) NOT NULL,
+  "stem" character varying(75) NOT NULL,
+  "common" smallint DEFAULT 0 NOT NULL,
+  "phrase" smallint DEFAULT 0 NOT NULL,
+  "term_weight" numeric(8,2) NOT NULL,
+  "context" smallint DEFAULT 2 NOT NULL,
+  "context_weight" numeric(8,2) NOT NULL,
+  "total_weight" numeric(8,2) NOT NULL
+);
+CREATE INDEX "#__finder_tokens_aggregate_token" on "#__finder_tokens_aggregate" ("term");
+CREATE INDEX "_#__finder_tokens_aggregate_keyword_id" on "#__finder_tokens_aggregate" ("term_id");
+
+--
+-- Table: #__finder_types
+--
+CREATE TABLE "#__finder_types" (
+  "id" serial NOT NULL,
+  "title" character varying(100) NOT NULL,
+  "mime" character varying(100) NOT NULL,
+  PRIMARY KEY ("id"),
+  CONSTRAINT "#__finder_types_title" UNIQUE ("title")
+);
+
diff --git a/core/administrator/components/com_finder/sql/uninstall.mysql.sql b/core/administrator/components/com_finder/sql/uninstall.mysql.sql
new file mode 100644
index 00000000..89579b98
--- /dev/null
+++ b/core/administrator/components/com_finder/sql/uninstall.mysql.sql
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS `#__finder_filters`;
+DROP TABLE IF EXISTS `#__finder_links`;
+DROP TABLE IF EXISTS `#__finder_links_terms0`;
+DROP TABLE IF EXISTS `#__finder_links_terms1`;
+DROP TABLE IF EXISTS `#__finder_links_terms2`;
+DROP TABLE IF EXISTS `#__finder_links_terms3`;
+DROP TABLE IF EXISTS `#__finder_links_terms4`;
+DROP TABLE IF EXISTS `#__finder_links_terms5`;
+DROP TABLE IF EXISTS `#__finder_links_terms6`;
+DROP TABLE IF EXISTS `#__finder_links_terms7`;
+DROP TABLE IF EXISTS `#__finder_links_terms8`;
+DROP TABLE IF EXISTS `#__finder_links_terms9`;
+DROP TABLE IF EXISTS `#__finder_links_termsa`;
+DROP TABLE IF EXISTS `#__finder_links_termsb`;
+DROP TABLE IF EXISTS `#__finder_links_termsc`;
+DROP TABLE IF EXISTS `#__finder_links_termsd`;
+DROP TABLE IF EXISTS `#__finder_links_termse`;
+DROP TABLE IF EXISTS `#__finder_links_termsf`;
+DROP TABLE IF EXISTS `#__finder_taxonomy`;
+DROP TABLE IF EXISTS `#__finder_taxonomy_map`;
+DROP TABLE IF EXISTS `#__finder_terms`;
+DROP TABLE IF EXISTS `#__finder_terms_common`;
+DROP TABLE IF EXISTS `#__finder_tokens`;
+DROP TABLE IF EXISTS `#__finder_tokens_aggregate`;
+DROP TABLE IF EXISTS `#__finder_types`;
diff --git a/core/administrator/components/com_finder/sql/uninstall.postgresql.sql b/core/administrator/components/com_finder/sql/uninstall.postgresql.sql
new file mode 100644
index 00000000..76d79815
--- /dev/null
+++ b/core/administrator/components/com_finder/sql/uninstall.postgresql.sql
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS "#__finder_filters";
+DROP TABLE IF EXISTS "#__finder_links";
+DROP TABLE IF EXISTS "#__finder_links_terms0";
+DROP TABLE IF EXISTS "#__finder_links_terms1";
+DROP TABLE IF EXISTS "#__finder_links_terms2";
+DROP TABLE IF EXISTS "#__finder_links_terms3";
+DROP TABLE IF EXISTS "#__finder_links_terms4";
+DROP TABLE IF EXISTS "#__finder_links_terms5";
+DROP TABLE IF EXISTS "#__finder_links_terms6";
+DROP TABLE IF EXISTS "#__finder_links_terms7";
+DROP TABLE IF EXISTS "#__finder_links_terms8";
+DROP TABLE IF EXISTS "#__finder_links_terms9";
+DROP TABLE IF EXISTS "#__finder_links_termsa";
+DROP TABLE IF EXISTS "#__finder_links_termsb";
+DROP TABLE IF EXISTS "#__finder_links_termsc";
+DROP TABLE IF EXISTS "#__finder_links_termsd";
+DROP TABLE IF EXISTS "#__finder_links_termse";
+DROP TABLE IF EXISTS "#__finder_links_termsf";
+DROP TABLE IF EXISTS "#__finder_taxonomy";
+DROP TABLE IF EXISTS "#__finder_taxonomy_map";
+DROP TABLE IF EXISTS "#__finder_terms";
+DROP TABLE IF EXISTS "#__finder_terms_common";
+DROP TABLE IF EXISTS "#__finder_tokens";
+DROP TABLE IF EXISTS "#__finder_tokens_aggregate";
+DROP TABLE IF EXISTS "#__finder_types";
diff --git a/core/administrator/components/com_finder/tables/filter.php b/core/administrator/components/com_finder/tables/filter.php
new file mode 100644
index 00000000..35cc290d
--- /dev/null
+++ b/core/administrator/components/com_finder/tables/filter.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Filter table class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderTableFilter extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver connector object.
+	 *
+	 * @since   2.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__finder_filters', 'filter_id', $db);
+	}
+
+	/**
+	 * Method to bind an associative array or object to the JTable instance.  This
+	 * method only binds properties that are publicly accessible and optionally
+	 * takes an array of properties to ignore when binding.
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties
+	 *                          to ignore while binding. [optional]
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error string
+	 *
+	 * @since   2.5
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Method to perform sanity checks on the JTable instance properties to ensure
+	 * they are safe to store in the database.  Child classes should override this
+	 * method to make sure the data they are storing in the database is safe and
+	 * as expected before storage.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @since   2.5
+	 */
+	public function check()
+	{
+		if (trim($this->alias) === '')
+		{
+			$this->alias = $this->title;
+		}
+
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias);
+
+		if (trim(str_replace('-', '', $this->alias)) === '')
+		{
+			$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		$params = new Registry($this->params);
+
+		$nullDate = $this->_db->getNullDate();
+		$d1 = $params->get('d1', $nullDate);
+		$d2 = $params->get('d2', $nullDate);
+
+		// Check the end date is not earlier than the start date.
+		if ($d2 > $nullDate && $d2 < $d1)
+		{
+			// Swap the dates.
+			$params->set('d1', $d2);
+			$params->set('d2', $d1);
+			$this->params = (string) $params;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table. The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An array of primary key values to update.  If not
+	 *                            set the instance property value is used. [optional]
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published] [optional]
+	 * @param   integer  $userId  The user id of the user performing the operation. [optional]
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k . '=' . implode(' OR ' . $k . '=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = ' . (int) $userId . ')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->quoteName($this->_tbl))
+			->set($this->_db->quoteName('state') . ' = ' . (int) $state)
+			->where($where);
+		$this->_db->setQuery($query . $checkin);
+
+		try
+		{
+			$this->_db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && count($pks) === $this->_db->getAffectedRows())
+		{
+			// Checkin the rows.
+			foreach ($pks as $pk)
+			{
+				$this->checkIn($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+
+	/**
+	 * Method to store a row in the database from the JTable instance properties.
+	 * If a primary key value is set the row with that primary key value will be
+	 * updated with the instance property values.  If no primary key value is set
+	 * a new row will be inserted into the database with the properties from the
+	 * JTable instance.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null. [optional]
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate()->toSql();
+		$userId = JFactory::getUser()->id;
+
+		$this->modified = $date;
+
+		if ($this->filter_id)
+		{
+			// Existing item
+			$this->modified_by = $userId;
+		}
+		else
+		{
+			// New item. A filter's created field can be set by the user,
+			// so we don't touch it if it is set.
+			if (!(int) $this->created)
+			{
+				$this->created = $date;
+			}
+
+			if (empty($this->created_by))
+			{
+				$this->created_by = $userId;
+			}
+		}
+
+		if (is_array($this->data))
+		{
+			$this->map_count = count($this->data);
+			$this->data = implode(',', $this->data);
+		}
+		else
+		{
+			$this->map_count = 0;
+			$this->data = implode(',', array());
+		}
+
+		// Verify that the alias is unique
+		$table = JTable::getInstance('Filter', 'FinderTable', array('dbo' => $this->_db));
+
+		if ($table->load(array('alias' => $this->alias)) && ($table->filter_id != $this->filter_id || $this->filter_id == 0))
+		{
+			$this->setError(JText::_('JLIB_DATABASE_ERROR_ARTICLE_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/core/administrator/components/com_finder/tables/link.php b/core/administrator/components/com_finder/tables/link.php
new file mode 100644
index 00000000..7f8e6fbe
--- /dev/null
+++ b/core/administrator/components/com_finder/tables/link.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Link table class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderTableLink extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver connector object.
+	 *
+	 * @since   2.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__finder_links', 'link_id', $db);
+	}
+}
diff --git a/core/administrator/components/com_finder/tables/map.php b/core/administrator/components/com_finder/tables/map.php
new file mode 100644
index 00000000..cdb07f0d
--- /dev/null
+++ b/core/administrator/components/com_finder/tables/map.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Map table class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderTableMap extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  JDatabaseDriver connector object.
+	 *
+	 * @since   2.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__finder_taxonomy', 'id', $db);
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table. The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An array of primary key values to update.  If not
+	 *                            set the instance property value is used. [optional]
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published] [optional]
+	 * @param   integer  $userId  The user id of the user performing the operation. [optional]
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks = ArrayHelper::toInteger($pks);
+		$state = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k . '=' . implode(' OR ' . $k . '=', $pks);
+
+		// Update the publishing state for rows with the given primary keys.
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->quoteName($this->_tbl))
+			->set($this->_db->quoteName('state') . ' = ' . (int) $state)
+			->where($where);
+		$this->_db->setQuery($query);
+
+		try
+		{
+			$this->_db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_finder/views/filter/tmpl/edit.php b/core/administrator/components/com_finder/views/filter/tmpl/edit.php
new file mode 100644
index 00000000..822d0bd0
--- /dev/null
+++ b/core/administrator/components/com_finder/views/filter/tmpl/edit.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.tabstate');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "filter.cancel" || document.formvalidator.isValid(document.getElementById("adminForm")))
+		{
+			Joomla.submitform(task, document.getElementById("adminForm"));
+		}
+	};
+
+	jQuery(document).ready(function($) {
+		$("#rightbtn").on("click", function() {
+			if($(this).text() == "' . JText::_('COM_FINDER_FILTER_SHOW_ALL') . '") {
+				$(".collapse:not(.in)").each(function (index) {
+					$(this).collapse("toggle");
+				});
+				$(this).text("' . JText::_('COM_FINDER_FILTER_HIDE_ALL') . '");
+			} else {
+				$(this).text("' . JText::_('COM_FINDER_FILTER_SHOW_ALL') . '");
+				$(".collapse.in").each(function (index) {
+				$(this).collapse("toggle");
+			});
+		}
+		return false;
+		});
+
+		$(".filter-node").change(function() {
+			$(\'input[id="jform_map_count"]\').val(document.querySelectorAll(\'input[type="checkbox"]:checked\').length);
+		});
+
+
+	});
+');
+
+JFactory::getDocument()->addStyleDeclaration('
+	.accordion-inner .control-group .controls {
+		margin-left: 10px;
+	}
+	.accordion-inner > .control-group {
+		margin-bottom: 0;
+	}
+	');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=filter&layout=edit&filter_id=' . (int) $this->item->filter_id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_FINDER_EDIT_FILTER')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php if ($this->total > 0) : ?>
+					<div class="well">
+						<?php echo $this->form->renderField('map_count'); ?>
+					</div>
+					<button class="btn jform-rightbtn" type="button" onclick="jQuery('.filter-node').each(function () { this.click(); });">
+						<span class="icon-checkbox-partial" aria-hidden="true"></span> <?php echo JText::_('JGLOBAL_SELECTION_INVERT'); ?></button>
+
+					<button class="btn pull-right" type="button" id="rightbtn" ><?php echo JText::_('COM_FINDER_FILTER_SHOW_ALL'); ?></button>
+					<hr>
+				<?php endif; ?>
+
+				<?php echo JHtml::_('filter.slider', array('selected_nodes' => $this->filter->data)); ?>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="return" value="<?php echo JFactory::getApplication()->input->get('return', '', 'cmd'); ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_finder/views/filter/view.html.php b/core/administrator/components/com_finder/views/filter/view.html.php
new file mode 100644
index 00000000..a34c3216
--- /dev/null
+++ b/core/administrator/components/com_finder/views/filter/view.html.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Filter view class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderViewFilter extends JViewLegacy
+{
+	/**
+	 * The filter object
+	 *
+	 * @var  FinderTableFilter
+	 *
+	 * @since  3.6.2
+	 */
+	protected $filter;
+
+	/**
+	 * The JForm object
+	 *
+	 * @var  JForm
+	 *
+	 * @since  3.6.2
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  JObject|boolean
+	 *
+	 * @since  3.6.2
+	 */
+	protected $item;
+
+	/**
+	 * The model state
+	 *
+	 * @var  mixed
+	 *
+	 * @since  3.6.2
+	 */
+	protected $state;
+
+	/**
+	 * The total indexed items
+	 *
+	 * @var  integer
+	 *
+	 * @since  3.8.0
+	 */
+	protected $total;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Load the view data.
+		$this->filter = $this->get('Filter');
+		$this->item = $this->get('Item');
+		$this->form = $this->get('Form');
+		$this->state = $this->get('State');
+		$this->total = $this->get('Total');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		JHtml::addIncludePath(JPATH_SITE . '/components/com_finder/helpers/html');
+
+		// Configure the toolbar.
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Method to configure the toolbar for this view.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$isNew = ($this->item->filter_id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == JFactory::getUser()->id);
+		$canDo = JHelperContent::getActions('com_finder');
+
+		// Configure the toolbar.
+		JToolbarHelper::title(
+			$isNew ? JText::_('COM_FINDER_FILTER_NEW_TOOLBAR_TITLE') : JText::_('COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE'),
+			'zoom-in finder'
+		);
+
+		// Set the actions for new and existing records.
+		if ($isNew)
+		{
+			// For new records, check the create permission.
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::apply('filter.apply');
+				JToolbarHelper::save('filter.save');
+				JToolbarHelper::save2new('filter.save2new');
+			}
+
+			JToolbarHelper::cancel('filter.cancel');
+		}
+		else
+		{
+			// Can't save the record if it's checked out.
+			// Since it's an existing record, check the edit permission.
+			if (!$checkedOut && $canDo->get('core.edit'))
+			{
+				JToolbarHelper::apply('filter.apply');
+				JToolbarHelper::save('filter.save');
+
+				// We can save this record, but check the create permission to see if we can return to make a new one.
+				if ($canDo->get('core.create'))
+				{
+					JToolbarHelper::save2new('filter.save2new');
+				}
+			}
+
+			// If an existing item, can save as a copy
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2copy('filter.save2copy');
+			}
+
+			JToolbarHelper::cancel('filter.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_finder/views/filters/tmpl/default.php b/core/administrator/components/com_finder/views/filters/tmpl/default.php
new file mode 100644
index 00000000..b8ccb6f4
--- /dev/null
+++ b/core/administrator/components/com_finder/views/filters/tmpl/default.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == "filters.delete")
+		{
+			if (confirm(Joomla.JText._("COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		Joomla.submitform(pressbutton);
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
+		</div>
+		<?php else : ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+					<th width="1%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
+					</th>
+					<th width="5%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="7">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php
+				$canCreate                  = $user->authorise('core.create', 'com_finder');
+				$canEdit                    = $user->authorise('core.edit', 'com_finder');
+				$userAuthoriseCoreManage    = $user->authorise('core.manage', 'com_checkin');
+				$userAuthoriseCoreEditState = $user->authorise('core.edit.state', 'com_finder');
+				$userId                     = $user->get('id');
+				foreach ($this->items as $i => $item) :
+					$canCheckIn   = $userAuthoriseCoreManage || $item->checked_out == $userId || $item->checked_out == 0;
+					$canChange    = $userAuthoriseCoreEditState && $canCheckIn;
+					$escapedTitle = $this->escape($item->title);
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
+						</td>
+						<td class="center nowrap">
+							<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
+						</td>
+						<td>
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
+							<?php endif; ?>
+							<?php if ($canEdit) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
+									<?php echo $escapedTitle; ?></a>
+							<?php else : ?>
+								<?php echo $escapedTitle; ?>
+							<?php endif; ?>
+						</td>
+						<td class="nowrap hidden-phone">
+							<?php echo $item->created_by_alias ?: $item->user_name; ?>
+						</td>
+						<td class="nowrap hidden-phone">
+							<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+						</td>
+						<td class="nowrap hidden-phone">
+							<?php echo $item->map_count; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->filter_id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_finder/views/filters/view.html.php b/core/administrator/components/com_finder/views/filters/view.html.php
new file mode 100644
index 00000000..1cf544b5
--- /dev/null
+++ b/core/administrator/components/com_finder/views/filters/view.html.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Filters view class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderViewFilters extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 *
+	 * @since  3.6.1
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 *
+	 * @since  3.6.1
+	 */
+	protected $pagination;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var  string
+	 *
+	 * @since  3.6.1
+	 */
+	protected $sidebar;
+
+	/**
+	 * The model state
+	 *
+	 * @var  mixed
+	 *
+	 * @since  3.6.1
+	 */
+	protected $state;
+
+	/**
+	 * The total number of items
+	 *
+	 * @var  integer
+	 *
+	 * @since  3.6.1
+	 */
+	protected $total;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Load the view data.
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->total         = $this->get('Total');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		FinderHelper::addSubmenu('filters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		// Configure the toolbar.
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Method to configure the toolbar for this view.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_finder');
+
+		JToolbarHelper::title(JText::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'zoom-in finder');
+		$toolbar = JToolbar::getInstance('toolbar');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('filter.add');
+			JToolbarHelper::editList('filter.edit');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publishList('filters.publish');
+			JToolbarHelper::unpublishList('filters.unpublish');
+			JToolbarHelper::checkin('filters.checkin');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_finder');
+		}
+
+		JToolbarHelper::divider();
+		$toolbar->appendButton('Popup', 'bars', 'COM_FINDER_STATISTICS', 'index.php?option=com_finder&view=statistics&tmpl=component', 550, 350);
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS');
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('', 'filters.delete');
+			JToolbarHelper::divider();
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/views/index/tmpl/default.php b/core/administrator/components/com_finder/views/index/tmpl/default.php
new file mode 100644
index 00000000..422e6ad7
--- /dev/null
+++ b/core/administrator/components/com_finder/views/index/tmpl/default.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.popover');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$lang      = JFactory::getLanguage();
+
+JText::script('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT');
+JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == "index.purge")
+		{
+			if (confirm(Joomla.JText._("COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		if (pressbutton == "index.delete")
+		{
+			if (confirm(Joomla.JText._("COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		Joomla.submitform(pressbutton);
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=index'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'l.published', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'l.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="5%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_INDEX_HEADING_INDEX_TYPE', 't.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_INDEX_HEADING_INDEX_DATE', 'l.indexdate', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap center hidden-phone hidden-tablet">
+						<?php echo JText::_('COM_FINDER_INDEX_HEADING_DETAILS'); ?>
+					</th>
+					<th width="35%" class="nowrap hidden-phone hidden-tablet">
+						<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_INDEX_HEADING_LINK_URL', 'l.url', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="7">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php $canChange = JFactory::getUser()->authorise('core.manage', 'com_finder'); ?>
+				<?php foreach ($this->items as $i => $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center">
+						<?php echo JHtml::_('grid.id', $i, $item->link_id); ?>
+					</td>
+					<td class="center">
+						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'index.', $canChange, 'cb'); ?>
+					</td>
+					<td>
+						<label for="cb<?php echo $i ?>">
+							<?php echo $this->escape($item->title); ?>
+						</label>
+					</td>
+					<td class="small nowrap hidden-phone">
+						<?php
+						$key = FinderHelperLanguage::branchSingular($item->t_title);
+						echo $lang->hasKey($key) ? JText::_($key) : $item->t_title;
+						?>
+					</td>
+					<td class="small nowrap hidden-phone">
+						<?php echo JHtml::_('date', $item->indexdate, JText::_('DATE_FORMAT_LC4')); ?>
+					</td>
+					<td class="center hidden-phone hidden-tablet">
+						<?php if ((int) $item->publish_start_date || (int) $item->publish_end_date || (int) $item->start_date || (int) $item->end_date) : ?>
+							<span class="icon-calendar pop hasPopover" aria-hidden="true" data-placement="left" title="<?php echo JText::_('COM_FINDER_INDEX_DATE_INFO_TITLE'); ?>" data-content="<?php echo JText::sprintf('COM_FINDER_INDEX_DATE_INFO', $item->publish_start_date, $item->publish_end_date, $item->start_date, $item->end_date); ?>"></span>
+							<span class="element-invisible"><?php echo JText::sprintf('COM_FINDER_INDEX_DATE_INFO', $item->publish_start_date, $item->publish_end_date, $item->start_date, $item->end_date); ?></span>
+						<?php endif; ?>
+					</td>
+					<td class="small break-word hidden-phone hidden-tablet">
+						<?php echo (strlen($item->url) > 80) ? substr($item->url, 0, 70) . '...' : $item->url; ?>
+					</td>
+				</tr>
+
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<input type="hidden" name="task" value="display" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_finder/views/index/view.html.php b/core/administrator/components/com_finder/views/index/view.html.php
new file mode 100644
index 00000000..a30d5c87
--- /dev/null
+++ b/core/administrator/components/com_finder/views/index/view.html.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+/**
+ * Index view class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderViewIndex extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 *
+	 * @since  3.6.1
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 *
+	 * @since  3.6.1
+	 */
+	protected $pagination;
+
+	/**
+	 * The state of core Smart Search plugins
+	 *
+	 * @var  array
+	 *
+	 * @since  3.6.1
+	 */
+	protected $pluginState;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var  string
+	 *
+	 * @since  3.6.1
+	 */
+	protected $sidebar;
+
+	/**
+	 * The model state
+	 *
+	 * @var  mixed
+	 *
+	 * @since  3.6.1
+	 */
+	protected $state;
+
+	/**
+	 * The total number of items
+	 *
+	 * @var  integer
+	 *
+	 * @since  3.6.1
+	 */
+	protected $total;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Load plugin language files.
+		FinderHelperLanguage::loadPluginLanguage();
+
+		$this->items         = $this->get('Items');
+		$this->total         = $this->get('Total');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->pluginState   = $this->get('pluginState');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		FinderHelper::addSubmenu('index');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		if (!$this->pluginState['plg_content_finder']->enabled)
+		{
+			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . FinderHelper::getFinderPluginId());
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED', $link), 'warning');
+		}
+		elseif ($this->get('TotalIndexed') === 0)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_FINDER_INDEX_NO_DATA') . '  ' . JText::_('COM_FINDER_INDEX_TIP'), 'notice');
+		}
+
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		// Configure the toolbar.
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Method to configure the toolbar for this view.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_finder');
+
+		JToolbarHelper::title(JText::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'zoom-in finder');
+
+		$toolbar = JToolbar::getInstance('toolbar');
+		$toolbar->appendButton(
+			'Popup', 'archive', 'COM_FINDER_INDEX', 'index.php?option=com_finder&view=indexer&tmpl=component', 500, 210, 0, 0,
+			'window.parent.location.reload()', 'COM_FINDER_HEADING_INDEXER'
+		);
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publishList('index.publish');
+			JToolbarHelper::unpublishList('index.unpublish');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_finder');
+		}
+
+		$toolbar->appendButton('Popup', 'bars', 'COM_FINDER_STATISTICS', 'index.php?option=com_finder&view=statistics&tmpl=component', 550, 350);
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('', 'index.delete');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('index.purge', 'COM_FINDER_INDEX_TOOLBAR_PURGE', false);
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT');
+	}
+}
diff --git a/core/administrator/components/com_finder/views/indexer/tmpl/default.php b/core/administrator/components/com_finder/views/indexer/tmpl/default.php
new file mode 100644
index 00000000..53c8098c
--- /dev/null
+++ b/core/administrator/components/com_finder/views/indexer/tmpl/default.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.core');
+JHtml::_('jquery.framework');
+JHtml::_('script', 'com_finder/indexer.js', array('version' => 'auto', 'relative' => true));
+JFactory::getDocument()->addScriptDeclaration('var msg = "' . JText::_('COM_FINDER_INDEXER_MESSAGE_COMPLETE') . '";');
+?>
+
+<div id="finder-indexer-container">
+	<br /><br />
+	<h1 id="finder-progress-header"><?php echo JText::_('COM_FINDER_INDEXER_HEADER_INIT'); ?></h1>
+
+	<p id="finder-progress-message"><?php echo JText::_('COM_FINDER_INDEXER_MESSAGE_INIT'); ?></p>
+
+	<div id="progress" class="progress progress-striped active">
+		<div id="progress-bar" class="bar bar-success" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+	</div>
+
+	<input id="finder-indexer-token" type="hidden" name="<?php echo JFactory::getSession()->getFormToken(); ?>" value="1" />
+</div>
diff --git a/core/administrator/components/com_finder/views/indexer/view.html.php b/core/administrator/components/com_finder/views/indexer/view.html.php
new file mode 100644
index 00000000..3f17744a
--- /dev/null
+++ b/core/administrator/components/com_finder/views/indexer/view.html.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Indexer view class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderViewIndexer extends JViewLegacy
+{
+
+}
diff --git a/core/administrator/components/com_finder/views/maps/tmpl/default.php b/core/administrator/components/com_finder/views/maps/tmpl/default.php
new file mode 100644
index 00000000..ec06d97b
--- /dev/null
+++ b/core/administrator/components/com_finder/views/maps/tmpl/default.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder     = $this->escape($this->state->get('list.ordering'));
+$listDirn      = $this->escape($this->state->get('list.direction'));
+$lang          = JFactory::getLanguage();
+$branchFilter  = $this->escape($this->state->get('filter.branch'));
+$colSpan       = $branchFilter ? 5 : 6;
+JText::script('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == "map.delete")
+		{
+			if (confirm(Joomla.JText._("COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		Joomla.submitform(pressbutton);
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=maps'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('COM_FINDER_MAPS_NO_CONTENT'); ?>
+		</div>
+		<?php else : ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th width="1%" class="center nowrap">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+					<th width="1%" class="center nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'd.branch_title', $listDirn, $listOrder); ?>
+					</th>
+					<?php if (!$branchFilter) : ?>
+					<th width="1%" class="nowrap center">
+						<?php echo JText::_('COM_FINDER_HEADING_CHILDREN'); ?>
+					</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap center">
+						<span class="icon-publish" aria-hidden="true"></span>
+						<span class="hidden-phone"><?php echo JText::_('COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS'); ?></span>
+					</th>
+					<th width="1%" class="nowrap center">
+						<span class="icon-unpublish" aria-hidden="true"></span>
+						<span class="hidden-phone"><?php echo JText::_('COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS'); ?></span>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php $canChange = JFactory::getUser()->authorise('core.manage', 'com_finder'); ?>
+				<?php foreach ($this->items as $i => $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center">
+						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					</td>
+					<td class="center nowrap">
+						<?php echo JHtml::_('jgrid.published', $item->state, $i, 'maps.', $canChange, 'cb'); ?>
+					</td>
+					<td>
+					<?php
+					if (trim($item->parent_title, '**') === 'Language')
+					{
+						$title = FinderHelperLanguage::branchLanguageTitle($item->title);
+					}
+					else
+					{
+						$key = FinderHelperLanguage::branchSingular($item->title);
+						$title = $lang->hasKey($key) ? JText::_($key) : $item->title;
+					}
+					?>
+					<?php if ((int) $item->num_children === 0) : ?>
+						<span class="gi">&mdash;</span>
+					<?php endif; ?>
+					<label for="cb<?php echo $i; ?>" style="display:inline-block;">
+						<?php echo $this->escape($title); ?>
+					</label>
+					<?php if ($this->escape(trim($title, '**')) === 'Language' && JLanguageMultilang::isEnabled()) : ?>
+						<strong><?php echo JText::_('COM_FINDER_MAPS_MULTILANG'); ?></strong>
+					<?php endif; ?>
+					</td>
+					<?php if (!$branchFilter) : ?>
+					<td class="center btns">
+					<?php if ((int) $item->num_children !== 0) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_finder&view=maps&filter[branch]=' . $item->id); ?>">
+							<span class="badge <?php if ($item->num_children > 0) echo 'badge-info'; ?>"><?php echo $item->num_children; ?></span></a>
+					<?php else : ?>
+						-
+					<?php endif; ?>
+					</td>
+					<?php endif; ?>
+					<td class="center btns">
+					<?php if ((int) $item->num_children === 0) : ?>
+						<a class="badge <?php if ((int) $item->count_published > 0) echo 'badge-success'; ?>" title="<?php echo JText::_('COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=com_finder&view=index&filter[state]=1&filter[content_map]=' . $item->id); ?>">
+						<?php echo (int) $item->count_published; ?></a>
+					<?php else : ?>
+						-
+					<?php endif; ?>
+					</td>
+					<td class="center btns">
+					<?php if ((int) $item->num_children === 0) : ?>
+						<a class="badge <?php if ((int) $item->count_unpublished > 0) echo 'badge-important'; ?>" title="<?php echo JText::_('COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=com_finder&view=index&filter[state]=0&filter[content_map]=' . $item->id); ?>">
+						<?php echo (int) $item->count_unpublished; ?></a>
+					<?php else : ?>
+						-
+					<?php endif; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+	</div>
+
+	<input type="hidden" name="task" value="display" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_finder/views/maps/view.html.php b/core/administrator/components/com_finder/views/maps/view.html.php
new file mode 100644
index 00000000..31a0d0f4
--- /dev/null
+++ b/core/administrator/components/com_finder/views/maps/view.html.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+/**
+ * Groups view class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderViewMaps extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 *
+	 * @since  3.6.1
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 *
+	 * @since  3.6.1
+	 */
+	protected $pagination;
+
+	/**
+	 * The HTML markup for the sidebar
+	 *
+	 * @var  string
+	 *
+	 * @since  3.6.1
+	 */
+	protected $sidebar;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 *
+	 * @since  3.6.1
+	 */
+	protected $state;
+
+	/**
+	 * The total number of items
+	 *
+	 * @var  object
+	 *
+	 * @since  3.6.1
+	 */
+	protected $total;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Load plugin language files.
+		FinderHelperLanguage::loadPluginLanguage();
+
+		// Load the view data.
+		$this->items         = $this->get('Items');
+		$this->total         = $this->get('Total');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		FinderHelper::addSubmenu('maps');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		// Prepare the view.
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Method to configure the toolbar for this view.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_finder');
+
+		JToolbarHelper::title(JText::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'zoom-in finder');
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publishList('maps.publish');
+			JToolbarHelper::unpublishList('maps.unpublish');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_finder');
+		}
+
+		JToolbarHelper::divider();
+		JToolbar::getInstance('toolbar')->appendButton(
+			'Popup',
+			'bars',
+			'COM_FINDER_STATISTICS',
+			'index.php?option=com_finder&view=statistics&tmpl=component',
+			550,
+			350
+		);
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS');
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('', 'maps.delete');
+			JToolbarHelper::divider();
+		}
+	}
+}
diff --git a/core/administrator/components/com_finder/views/statistics/tmpl/default.php b/core/administrator/components/com_finder/views/statistics/tmpl/default.php
new file mode 100644
index 00000000..3ae82a50
--- /dev/null
+++ b/core/administrator/components/com_finder/views/statistics/tmpl/default.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<h3>
+	<?php echo JText::_('COM_FINDER_STATISTICS_TITLE'); ?>
+</h3>
+
+<div class="row-fluid">
+	<div class="span12">
+		<p class="tab-description"><?php echo JText::sprintf('COM_FINDER_STATISTICS_STATS_DESCRIPTION', number_format($this->data->term_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_node_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')), number_format($this->data->taxonomy_branch_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'))); ?></p>
+		<table class="table table-striped table-condensed">
+			<thead>
+				<tr>
+					<th>
+						<?php echo JText::_('COM_FINDER_STATISTICS_LINK_TYPE_HEADING'); ?>
+					</th>
+					<th>
+						<?php echo JText::_('COM_FINDER_STATISTICS_LINK_TYPE_COUNT'); ?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach ($this->data->type_list as $type) : ?>
+				<tr>
+					<td>
+						<?php
+						$lang_key    = 'PLG_FINDER_STATISTICS_' . str_replace(' ', '_', $type->type_title);
+						$lang_string = JText::_($lang_key);
+						echo $lang_string === $lang_key ? $type->type_title : $lang_string;
+						?>
+					</td>
+					<td>
+						<span class="badge badge-info"><?php echo number_format($type->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?></span>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+				<tr>
+					<td>
+						<strong><?php echo JText::_('COM_FINDER_STATISTICS_LINK_TYPE_TOTAL'); ?></strong>
+					</td>
+					<td>
+						<span class="badge badge-info"><?php echo number_format($this->data->link_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?></span>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>
diff --git a/core/administrator/components/com_finder/views/statistics/view.html.php b/core/administrator/components/com_finder/views/statistics/view.html.php
new file mode 100644
index 00000000..ab45541e
--- /dev/null
+++ b/core/administrator/components/com_finder/views/statistics/view.html.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Statistics view class for Finder.
+ *
+ * @since  2.5
+ */
+class FinderViewStatistics extends JViewLegacy
+{
+	/**
+	 * The index statistics
+	 *
+	 * @var  JObject
+	 *
+	 * @since  3.6.1
+	 */
+	protected $data;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Load the view data.
+		$this->data = $this->get('Data');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_installer/access.xml b/core/administrator/components/com_installer/access.xml
new file mode 100644
index 00000000..1c90bfc4
--- /dev/null
+++ b/core/administrator/components/com_installer/access.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_installer">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_installer/config.xml b/core/administrator/components/com_installer/config.xml
new file mode 100644
index 00000000..cc833115
--- /dev/null
+++ b/core/administrator/components/com_installer/config.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="preferences"
+		label="COM_INSTALLER_PREFERENCES_LABEL"
+		description="COM_INSTALLER_PREFERENCES_DESCRIPTION"
+		>
+
+		<field
+			name="show_jed_info"
+			type="radio"
+			label="COM_INSTALLER_SHOW_JED_INFORMATION_LABEL"
+			description="COM_INSTALLER_SHOW_JED_INFORMATION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">COM_INSTALLER_SHOW_JED_INFORMATION_SHOW_MESSAGE</option>
+			<option value="0">COM_INSTALLER_SHOW_JED_INFORMATION_HIDE_MESSAGE</option>
+		</field>
+
+		<field
+			name="cachetimeout"
+			type="integer"
+			label="COM_INSTALLER_CACHETIMEOUT_LABEL"
+			description="COM_INSTALLER_CACHETIMEOUT_DESC"
+			first="0"
+			last="24"
+			step="1"
+			default="6"
+		/>
+
+		<field
+			name="minimum_stability"
+			type="list"
+			label="COM_INSTALLER_MINIMUM_STABILITY_LABEL"
+			description="COM_INSTALLER_MINIMUM_STABILITY_DESC"
+			default="4"
+			>
+			<option value="0">COM_INSTALLER_MINIMUM_STABILITY_DEV</option>
+			<option value="1">COM_INSTALLER_MINIMUM_STABILITY_ALPHA</option>
+			<option value="2">COM_INSTALLER_MINIMUM_STABILITY_BETA</option>
+			<option value="3">COM_INSTALLER_MINIMUM_STABILITY_RC</option>
+			<option value="4">COM_INSTALLER_MINIMUM_STABILITY_STABLE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_installer"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_installer/controller.php b/core/administrator/components/com_installer/controller.php
new file mode 100644
index 00000000..12ecac70
--- /dev/null
+++ b/core/administrator/components/com_installer/controller.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer Controller
+ *
+ * @since  1.5
+ */
+class InstallerController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php');
+
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', 'install');
+		$vFormat = $document->getType();
+		$lName   = $this->input->get('layout', 'default', 'string');
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			$ftp = JClientHelper::setCredentialsFromRequest('ftp');
+			$view->ftp = &$ftp;
+
+			// Get the model for the view.
+			$model = $this->getModel($vName);
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load the submenu.
+			InstallerHelper::addSubmenu($vName);
+			$view->display();
+		}
+
+		return $this;
+	}
+}
diff --git a/core/administrator/components/com_installer/controllers/database.php b/core/administrator/components/com_installer/controllers/database.php
new file mode 100644
index 00000000..c4f0fa93
--- /dev/null
+++ b/core/administrator/components/com_installer/controllers/database.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer Database Controller
+ *
+ * @since  2.5
+ */
+class InstallerControllerDatabase extends JControllerLegacy
+{
+	/**
+	 * Tries to fix missing database updates
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 * @todo    Purge updates has to be replaced with an events system
+	 */
+	public function fix()
+	{
+		$model = $this->getModel('database');
+		$model->fix();
+
+		// Purge updates
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_joomlaupdate/models', 'JoomlaupdateModel');
+		$updateModel = JModelLegacy::getInstance('default', 'JoomlaupdateModel');
+		$updateModel->purge();
+
+		// Refresh versionable assets cache
+		JFactory::getApplication()->flushAssets();
+
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=database', false));
+	}
+}
diff --git a/core/administrator/components/com_installer/controllers/discover.php b/core/administrator/components/com_installer/controllers/discover.php
new file mode 100644
index 00000000..28d8220c
--- /dev/null
+++ b/core/administrator/components/com_installer/controllers/discover.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Discover Installation Controller
+ *
+ * @since  1.6
+ */
+class InstallerControllerDiscover extends JControllerLegacy
+{
+	/**
+	 * Refreshes the cache of discovered extensions.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function refresh()
+	{
+		$model = $this->getModel('discover');
+		$model->discover();
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=discover', false));
+	}
+
+	/**
+	 * Install a discovered extension.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function install()
+	{
+		$this->getModel('discover')->discover_install();
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=discover', false));
+	}
+
+	/**
+	 * Clean out the discovered extension cache.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function purge()
+	{
+		$model = $this->getModel('discover');
+		$model->purge();
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=discover', false), $model->_message);
+	}
+}
diff --git a/core/administrator/components/com_installer/controllers/install.php b/core/administrator/components/com_installer/controllers/install.php
new file mode 100644
index 00000000..f39ead23
--- /dev/null
+++ b/core/administrator/components/com_installer/controllers/install.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer controller for Joomla! installer class.
+ *
+ * @since  1.5
+ */
+class InstallerControllerInstall extends JControllerLegacy
+{
+	/**
+	 * Install an extension.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function install()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		/** @var InstallerModelInstall $model */
+		$model = $this->getModel('install');
+
+		// TODO: Reset the users acl here as well to kill off any missing bits.
+		$result = $model->install();
+
+		$app = JFactory::getApplication();
+		$redirect_url = $app->getUserState('com_installer.redirect_url');
+
+		if (!$redirect_url)
+		{
+			$redirect_url = base64_decode($app->input->get('return'));
+		}
+
+		// Don't redirect to an external URL.
+		if (!JUri::isInternal($redirect_url))
+		{
+			$redirect_url = '';
+		}
+
+		if (empty($redirect_url))
+		{
+			$redirect_url = JRoute::_('index.php?option=com_installer&view=install', false);
+		}
+		else
+		{
+			// Wipe out the user state when we're going to redirect.
+			$app->setUserState('com_installer.redirect_url', '');
+			$app->setUserState('com_installer.message', '');
+			$app->setUserState('com_installer.extension_message', '');
+		}
+
+		$this->setRedirect($redirect_url);
+
+		return $result;
+	}
+
+	/**
+	 * Install an extension from drag & drop ajax upload.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function ajax_upload()
+	{
+		$app = JFactory::getApplication();
+		$message = $app->getUserState('com_installer.message');
+
+		// Do install
+		$result = $this->install();
+
+		// Get redirect URL
+		$redirect = $this->redirect;
+
+		// Push message queue to session because we will redirect page by Javascript, not $app->redirect().
+		// The "application.queue" is only set in redirect() method, so we must manually store it.
+		$app->getSession()->set('application.queue', $app->getMessageQueue());
+
+		header('Content-Type: application/json');
+
+		echo new JResponseJson(array('redirect' => $redirect), $message, !$result);
+
+		exit();
+	}
+}
diff --git a/core/administrator/components/com_installer/controllers/manage.php b/core/administrator/components/com_installer/controllers/manage.php
new file mode 100644
index 00000000..3c0c17c7
--- /dev/null
+++ b/core/administrator/components/com_installer/controllers/manage.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Installer Manage Controller
+ *
+ * @since  1.6
+ */
+class InstallerControllerManage extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('unpublish', 'publish');
+		$this->registerTask('publish',   'publish');
+	}
+
+	/**
+	 * Enable/Disable an extension (if supported).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function publish()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('publish' => 1, 'unpublish' => 0);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			/** @var InstallerModelManage $model */
+			$model = $this->getModel('manage');
+
+			// Change the state of the records.
+			if (!$model->publish($ids, $value))
+			{
+				JError::raiseWarning(500, implode('<br />', $model->getErrors()));
+			}
+			else
+			{
+				if ($value == 1)
+				{
+					$ntext = 'COM_INSTALLER_N_EXTENSIONS_PUBLISHED';
+				}
+				elseif ($value == 0)
+				{
+					$ntext = 'COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED';
+				}
+
+				$this->setMessage(JText::plural($ntext, count($ids)));
+			}
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false));
+	}
+
+	/**
+	 * Remove an extension (Uninstall).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function remove()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$eid = $this->input->get('cid', array(), 'array');
+
+		/** @var InstallerModelManage $model */
+		$model = $this->getModel('manage');
+
+		$eid = ArrayHelper::toInteger($eid, array());
+		$model->remove($eid);
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false));
+	}
+
+	/**
+	 * Refreshes the cached metadata about an extension.
+	 *
+	 * Useful for debugging and testing purposes when the XML file might change.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function refresh()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$uid   = $this->input->get('cid', array(), 'array');
+		$model = $this->getModel('manage');
+
+		$uid = ArrayHelper::toInteger($uid, array());
+		$model->refresh($uid);
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=manage', false));
+	}
+}
diff --git a/core/administrator/components/com_installer/controllers/update.php b/core/administrator/components/com_installer/controllers/update.php
new file mode 100644
index 00000000..e179e77c
--- /dev/null
+++ b/core/administrator/components/com_installer/controllers/update.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Installer Update Controller
+ *
+ * @since  1.6
+ */
+class InstallerControllerUpdate extends JControllerLegacy
+{
+	/**
+	 * Update a set of extensions.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function update()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		/** @var InstallerModelUpdate $model */
+		$model = $this->getModel('update');
+		$uid   = $this->input->get('cid', array(), 'array');
+
+		$uid = ArrayHelper::toInteger($uid, array());
+
+		// Get the minimum stability.
+		$component     = JComponentHelper::getComponent('com_installer');
+		$params        = $component->params;
+		$minimum_stability = (int) $params->get('minimum_stability', JUpdater::STABILITY_STABLE);
+
+		$model->update($uid, $minimum_stability);
+
+		$app          = JFactory::getApplication();
+		$redirect_url = $app->getUserState('com_installer.redirect_url');
+
+		// Don't redirect to an external URL.
+		if (!JUri::isInternal($redirect_url))
+		{
+			$redirect_url = '';
+		}
+
+		if (empty($redirect_url))
+		{
+			$redirect_url = JRoute::_('index.php?option=com_installer&view=update', false);
+		}
+		else
+		{
+			// Wipe out the user state when we're going to redirect.
+			$app->setUserState('com_installer.redirect_url', '');
+			$app->setUserState('com_installer.message', '');
+			$app->setUserState('com_installer.extension_message', '');
+		}
+
+		$this->setRedirect($redirect_url);
+	}
+
+	/**
+	 * Find new updates.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function find()
+	{
+		(JSession::checkToken() or JSession::checkToken('get')) or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Get the caching duration.
+		$component     = JComponentHelper::getComponent('com_installer');
+		$params        = $component->params;
+		$cache_timeout = (int) $params->get('cachetimeout', 6);
+		$cache_timeout = 3600 * $cache_timeout;
+
+		// Get the minimum stability.
+		$minimum_stability = (int) $params->get('minimum_stability', JUpdater::STABILITY_STABLE);
+
+		// Find updates.
+		/** @var InstallerModelUpdate $model */
+		$model = $this->getModel('update');
+
+		$disabledUpdateSites = $model->getDisabledUpdateSites();
+
+		if ($disabledUpdateSites)
+		{
+			$updateSitesUrl = JRoute::_('index.php?option=com_installer&view=updatesites');
+			$this->setMessage(JText::sprintf('COM_INSTALLER_MSG_UPDATE_SITES_COUNT_CHECK', $updateSitesUrl), 'warning');
+		}
+
+		$model->findUpdates(0, $cache_timeout, $minimum_stability);
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=update', false));
+	}
+
+	/**
+	 * Purges updates.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function purge()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('update');
+		$model->purge();
+
+		/**
+		 * We no longer need to enable update sites in Joomla! 3.4 as we now allow the users to manage update sites
+		 * themselves.
+		 * $model->enableSites();
+		 */
+
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=update', false), $model->_message);
+	}
+
+	/**
+	 * Fetch and report updates in JSON format, for AJAX requests
+	 *
+	 * @return void
+	 *
+	 * @since 2.5
+	 */
+	public function ajax()
+	{
+		$app = JFactory::getApplication();
+
+		if (!JSession::checkToken('get'))
+		{
+			$app->setHeader('status', 403, true);
+			$app->sendHeaders();
+			echo JText::_('JINVALID_TOKEN');
+			$app->close();
+		}
+
+		$eid               = $this->input->getInt('eid', 0);
+		$skip              = $this->input->get('skip', array(), 'array');
+		$cache_timeout     = $this->input->getInt('cache_timeout', 0);
+		$minimum_stability = $this->input->getInt('minimum_stability', -1);
+
+		$component     = JComponentHelper::getComponent('com_installer');
+		$params        = $component->params;
+
+		if ($cache_timeout == 0)
+		{
+			$cache_timeout = (int) $params->get('cachetimeout', 6);
+			$cache_timeout = 3600 * $cache_timeout;
+		}
+
+		if ($minimum_stability < 0)
+		{
+			$minimum_stability = (int) $params->get('minimum_stability', JUpdater::STABILITY_STABLE);
+		}
+
+		/** @var InstallerModelUpdate $model */
+		$model = $this->getModel('update');
+		$model->findUpdates($eid, $cache_timeout, $minimum_stability);
+
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', 0);
+
+		if ($eid != 0)
+		{
+			$model->setState('filter.extension_id', $eid);
+		}
+
+		$updates = $model->getItems();
+
+		if (!empty($skip))
+		{
+			$unfiltered_updates = $updates;
+			$updates            = array();
+
+			foreach ($unfiltered_updates as $update)
+			{
+				if (!in_array($update->extension_id, $skip))
+				{
+					$updates[] = $update;
+				}
+			}
+		}
+
+		echo json_encode($updates);
+
+		$app->close();
+	}
+}
diff --git a/core/administrator/components/com_installer/controllers/updatesites.php b/core/administrator/components/com_installer/controllers/updatesites.php
new file mode 100644
index 00000000..d004167f
--- /dev/null
+++ b/core/administrator/components/com_installer/controllers/updatesites.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Installer Update Sites Controller
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ * @since       3.4
+ */
+class InstallerControllerUpdatesites extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.4
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('unpublish', 'publish');
+		$this->registerTask('publish',   'publish');
+		$this->registerTask('delete',    'delete');
+		$this->registerTask('rebuild',   'rebuild');
+	}
+
+	/**
+	 * Enable/Disable an extension (if supported).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 *
+	 * @throws  Exception on error
+	 */
+	public function publish()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('publish' => 1, 'unpublish' => 0);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		if (empty($ids))
+		{
+			throw new Exception(JText::_('COM_INSTALLER_ERROR_NO_UPDATESITES_SELECTED'), 500);
+		}
+
+		// Get the model.
+		$model = $this->getModel('Updatesites');
+
+		// Change the state of the records.
+		if (!$model->publish($ids, $value))
+		{
+			throw new Exception(implode('<br />', $model->getErrors()), 500);
+		}
+
+		$ntext = ($value == 0) ? 'COM_INSTALLER_N_UPDATESITES_UNPUBLISHED' : 'COM_INSTALLER_N_UPDATESITES_PUBLISHED';
+
+		$this->setMessage(JText::plural($ntext, count($ids)));
+
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=updatesites', false));
+	}
+
+	/**
+	 * Deletes an update site (if supported).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 *
+	 * @throws  Exception on error
+	 */
+	public function delete()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids = $this->input->get('cid', array(), 'array');
+
+		if (empty($ids))
+		{
+			throw new Exception(JText::_('COM_INSTALLER_ERROR_NO_UPDATESITES_SELECTED'), 500);
+		}
+
+		// Delete the records.
+		$this->getModel('Updatesites')->delete($ids);
+
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=updatesites', false));
+	}
+
+	/**
+	 * Rebuild update sites tables.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 */
+	public function rebuild()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Rebuild the update sites.
+		$this->getModel('Updatesites')->rebuild();
+
+		$this->setRedirect(JRoute::_('index.php?option=com_installer&view=updatesites', false));
+	}
+}
diff --git a/core/administrator/components/com_installer/helpers/html/manage.php b/core/administrator/components/com_installer/helpers/html/manage.php
new file mode 100644
index 00000000..4aaf19ee
--- /dev/null
+++ b/core/administrator/components/com_installer/helpers/html/manage.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer HTML class.
+ *
+ * @since  2.5
+ */
+abstract class InstallerHtmlManage
+{
+	/**
+	 * Returns a published state on a grid.
+	 *
+	 * @param   integer  $value     The state value.
+	 * @param   integer  $i         The row index.
+	 * @param   boolean  $enabled   An optional setting for access control on the action.
+	 * @param   string   $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string        The Html code
+	 *
+	 * @see JHtmlJGrid::state
+	 *
+	 * @since   2.5
+	 */
+	public static function state($value, $i, $enabled = true, $checkbox = 'cb')
+	{
+		$states = array(
+			2 => array(
+				'',
+				'COM_INSTALLER_EXTENSION_PROTECTED',
+				'',
+				'COM_INSTALLER_EXTENSION_PROTECTED',
+				true,
+				'protected',
+				'protected',
+			),
+			1 => array(
+				'unpublish',
+				'COM_INSTALLER_EXTENSION_ENABLED',
+				'COM_INSTALLER_EXTENSION_DISABLE',
+				'COM_INSTALLER_EXTENSION_ENABLED',
+				true,
+				'publish',
+				'publish',
+			),
+			0 => array(
+				'publish',
+				'COM_INSTALLER_EXTENSION_DISABLED',
+				'COM_INSTALLER_EXTENSION_ENABLE',
+				'COM_INSTALLER_EXTENSION_DISABLED',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+		);
+
+		return JHtml::_('jgrid.state', $states, $value, $i, 'manage.', $enabled, true, $checkbox);
+	}
+}
diff --git a/core/administrator/components/com_installer/helpers/html/updatesites.php b/core/administrator/components/com_installer/helpers/html/updatesites.php
new file mode 100644
index 00000000..6a69aa0a
--- /dev/null
+++ b/core/administrator/components/com_installer/helpers/html/updatesites.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer HTML class.
+ *
+ * @since  3.5
+ */
+abstract class InstallerHtmlUpdatesites
+{
+	/**
+	 * Returns a published state on a grid.
+	 *
+	 * @param   integer  $value     The state value.
+	 * @param   integer  $i         The row index.
+	 * @param   boolean  $enabled   An optional setting for access control on the action.
+	 * @param   string   $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string   The HTML code
+	 *
+	 * @see     JHtmlJGrid::state()
+	 * @since   3.5
+	 */
+	public static function state($value, $i, $enabled = true, $checkbox = 'cb')
+	{
+		$states	= array(
+			1 => array(
+				'unpublish',
+				'COM_INSTALLER_UPDATESITE_ENABLED',
+				'COM_INSTALLER_UPDATESITE_DISABLE',
+				'COM_INSTALLER_UPDATESITE_ENABLED',
+				true,
+				'publish',
+				'publish',
+			),
+			0 => array(
+				'publish',
+				'COM_INSTALLER_UPDATESITE_DISABLED',
+				'COM_INSTALLER_UPDATESITE_ENABLE',
+				'COM_INSTALLER_UPDATESITE_DISABLED',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+		);
+
+		return JHtml::_('jgrid.state', $states, $value, $i, 'updatesites.', $enabled, true, $checkbox);
+	}
+}
diff --git a/core/administrator/components/com_installer/helpers/installer.php b/core/administrator/components/com_installer/helpers/installer.php
new file mode 100644
index 00000000..6ca57ffb
--- /dev/null
+++ b/core/administrator/components/com_installer/helpers/installer.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer helper.
+ *
+ * @since  1.6
+ */
+class InstallerHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 */
+	public static function addSubmenu($vName = 'install')
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_INSTALL'),
+			'index.php?option=com_installer',
+			$vName == 'install'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_UPDATE'),
+			'index.php?option=com_installer&view=update',
+			$vName == 'update'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_MANAGE'),
+			'index.php?option=com_installer&view=manage',
+			$vName == 'manage'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_DISCOVER'),
+			'index.php?option=com_installer&view=discover',
+			$vName == 'discover'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_DATABASE'),
+			'index.php?option=com_installer&view=database',
+			$vName == 'database'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_WARNINGS'),
+			'index.php?option=com_installer&view=warnings',
+			$vName == 'warnings'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_LANGUAGES'),
+			'index.php?option=com_installer&view=languages',
+			$vName == 'languages'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_INSTALLER_SUBMENU_UPDATESITES'),
+			'index.php?option=com_installer&view=updatesites',
+			$vName == 'updatesites'
+		);
+	}
+
+	/**
+	 * Get a list of filter options for the extension types.
+	 *
+	 * @return  array  An array of stdClass objects.
+	 *
+	 * @since   3.0
+	 */
+	public static function getExtensionTypes()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT type')
+			->from('#__extensions');
+		$db->setQuery($query);
+		$types = $db->loadColumn();
+
+		$options = array();
+
+		foreach ($types as $type)
+		{
+			$options[] = JHtml::_('select.option', $type, JText::_('COM_INSTALLER_TYPE_' . strtoupper($type)));
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of filter options for the extension types.
+	 *
+	 * @return  array  An array of stdClass objects.
+	 *
+	 * @since   3.0
+	 */
+	public static function getExtensionGroupes()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT folder')
+			->from('#__extensions')
+			->where('folder != ' . $db->quote(''))
+			->order('folder');
+		$db->setQuery($query);
+		$folders = $db->loadColumn();
+
+		$options = array();
+
+		foreach ($folders as $folder)
+		{
+			$options[] = JHtml::_('select.option', $folder, $folder);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_installer');
+	}
+
+	/**
+	 * Get a list of filter options for the application clients.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @since   3.5
+	 */
+	public static function getClientOptions()
+	{
+		// Build the filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of filter options for the application statuses.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @since   3.5
+	 */
+	public static function getStateOptions()
+	{
+		// Build the filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JDISABLED'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JENABLED'));
+		$options[] = JHtml::_('select.option', '2', JText::_('JPROTECTED'));
+		$options[] = JHtml::_('select.option', '3', JText::_('JUNPROTECTED'));
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_installer/installer.php b/core/administrator/components/com_installer/installer.php
new file mode 100644
index 00000000..301771b9
--- /dev/null
+++ b/core/administrator/components/com_installer/installer.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_installer'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Installer');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_installer/installer.xml b/core/administrator/components/com_installer/installer.xml
new file mode 100644
index 00000000..e7873991
--- /dev/null
+++ b/core/administrator/components/com_installer/installer.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_installer</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_INSTALLER_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>installer.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_installer.ini</language>
+			<language tag="en-GB">language/en-GB.com_installer.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_installer/models/database.php b/core/administrator/components/com_installer/models/database.php
new file mode 100644
index 00000000..800519e3
--- /dev/null
+++ b/core/administrator/components/com_installer/models/database.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('InstallerModel', __DIR__ . '/extension.php');
+JLoader::register('JoomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php');
+
+/**
+ * Installer Database Model
+ *
+ * @since  1.6
+ */
+class InstallerModelDatabase extends InstallerModel
+{
+	protected $_context = 'com_installer.discover';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'name', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+		$this->setState('message', $app->getUserState('com_installer.message'));
+		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));
+		$app->setUserState('com_installer.message', '');
+		$app->setUserState('com_installer.extension_message', '');
+
+		// Prepare the utf8mb4 conversion check table
+		$this->prepareUtf8mb4StatusTable();
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Fixes database problems.
+	 *
+	 * @return  void
+	 */
+	public function fix()
+	{
+		if (!$changeSet = $this->getItems())
+		{
+			return false;
+		}
+
+		$changeSet->fix();
+		$this->fixSchemaVersion($changeSet);
+		$this->fixUpdateVersion();
+		$installer = new JoomlaInstallerScript;
+		$installer->deleteUnexistingFiles();
+		$this->fixDefaultTextFilters();
+
+		/*
+		 * Finally, if the schema updates succeeded, make sure the database is
+		 * converted to utf8mb4 or, if not suported by the server, compatible to it.
+		 */
+		$statusArray = $changeSet->getStatus();
+
+		if (count($statusArray['error']) == 0)
+		{
+			$installer->convertTablesToUtf8mb4(false);
+		}
+	}
+
+	/**
+	 * Gets the changeset object.
+	 *
+	 * @return  JSchemaChangeset
+	 */
+	public function getItems()
+	{
+		$folder = JPATH_ADMINISTRATOR . '/components/com_admin/sql/updates/';
+
+		try
+		{
+			$changeSet = JSchemaChangeset::getInstance($this->getDbo(), $folder);
+		}
+		catch (RuntimeException $e)
+		{
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'warning');
+
+			return false;
+		}
+
+		return $changeSet;
+	}
+
+	/**
+	 * Method to get a JPagination object for the data set.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.2
+	 */
+	public function getPagination()
+	{
+		return true;
+	}
+
+	/**
+	 * Get version from #__schemas table.
+	 *
+	 * @return  mixed  the return value from the query, or null if the query fails.
+	 *
+	 * @throws Exception
+	 */
+	public function getSchemaVersion()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('version_id')
+			->from($db->quoteName('#__schemas'))
+			->where('extension_id = 700');
+		$db->setQuery($query);
+		$result = $db->loadResult();
+
+		return $result;
+	}
+
+	/**
+	 * Fix schema version if wrong.
+	 *
+	 * @param   JSchemaChangeSet  $changeSet  Schema change set.
+	 *
+	 * @return   mixed  string schema version if success, false if fail.
+	 */
+	public function fixSchemaVersion($changeSet)
+	{
+		// Get correct schema version -- last file in array.
+		$schema = $changeSet->getSchema();
+
+		// Check value. If ok, don't do update.
+		if ($schema == $this->getSchemaVersion())
+		{
+			return $schema;
+		}
+
+		// Delete old row.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__schemas'))
+			->where($db->quoteName('extension_id') . ' = 700');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Add new row.
+		$query->clear()
+			->insert($db->quoteName('#__schemas'))
+			->columns($db->quoteName('extension_id') . ',' . $db->quoteName('version_id'))
+			->values('700, ' . $db->quote($schema));
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		return $schema;
+	}
+
+	/**
+	 * Get current version from #__extensions table.
+	 *
+	 * @return  mixed   version if successful, false if fail.
+	 */
+	public function getUpdateVersion()
+	{
+		$table = JTable::getInstance('Extension');
+		$table->load('700');
+		$cache = new Registry($table->manifest_cache);
+
+		return $cache->get('version');
+	}
+
+	/**
+	 * Fix Joomla version in #__extensions table if wrong (doesn't equal JVersion short version).
+	 *
+	 * @return   mixed  string update version if success, false if fail.
+	 */
+	public function fixUpdateVersion()
+	{
+		$table = JTable::getInstance('Extension');
+		$table->load('700');
+		$cache = new Registry($table->manifest_cache);
+		$updateVersion = $cache->get('version');
+		$cmsVersion = new JVersion;
+
+		if ($updateVersion == $cmsVersion->getShortVersion())
+		{
+			return $updateVersion;
+		}
+
+		$cache->set('version', $cmsVersion->getShortVersion());
+		$table->manifest_cache = $cache->toString();
+
+		if ($table->store())
+		{
+			return $cmsVersion->getShortVersion();
+		}
+
+		return false;
+	}
+
+	/**
+	 * For version 2.5.x only
+	 * Check if com_config parameters are blank.
+	 *
+	 * @return  string  default text filters (if any).
+	 */
+	public function getDefaultTextFilters()
+	{
+		$table = JTable::getInstance('Extension');
+		$table->load($table->find(array('name' => 'com_config')));
+
+		return $table->params;
+	}
+
+	/**
+	 * For version 2.5.x only
+	 * Check if com_config parameters are blank. If so, populate with com_content text filters.
+	 *
+	 * @return  mixed  boolean true if params are updated, null otherwise.
+	 */
+	public function fixDefaultTextFilters()
+	{
+		$table = JTable::getInstance('Extension');
+		$table->load($table->find(array('name' => 'com_config')));
+
+		// Check for empty $config and non-empty content filters.
+		if (!$table->params)
+		{
+			// Get filters from com_content and store if you find them.
+			$contentParams = JComponentHelper::getParams('com_content');
+
+			if ($contentParams->get('filters'))
+			{
+				$newParams = new Registry;
+				$newParams->set('filters', $contentParams->get('filters'));
+				$table->params = (string) $newParams;
+				$table->store();
+
+				return true;
+			}
+		}
+	}
+
+	/**
+	 * Prepare the table to save the status of utf8mb4 conversion
+	 * Make sure it contains 1 initialized record if there is not
+	 * already exactly 1 record.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	private function prepareUtf8mb4StatusTable()
+	{
+		$db = JFactory::getDbo();
+
+		$serverType = $db->getServerType();
+
+		if ($serverType != 'mysql')
+		{
+			return;
+		}
+
+		$creaTabSql = 'CREATE TABLE IF NOT EXISTS ' . $db->quoteName('#__utf8_conversion')
+			. ' (' . $db->quoteName('converted') . ' tinyint(4) NOT NULL DEFAULT 0'
+			. ') ENGINE=InnoDB';
+
+		if ($db->hasUTF8mb4Support())
+		{
+			$creaTabSql = $creaTabSql
+				. ' DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;';
+		}
+		else
+		{
+			$creaTabSql = $creaTabSql
+				. ' DEFAULT CHARSET=utf8 DEFAULT COLLATE=utf8_unicode_ci;';
+		}
+
+		$db->setQuery($creaTabSql)->execute();
+
+		$db->setQuery('SELECT COUNT(*) FROM ' . $db->quoteName('#__utf8_conversion') . ';');
+
+		$count = $db->loadResult();
+
+		if ($count > 1)
+		{
+			// Table messed up somehow, clear it
+			$db->setQuery('DELETE FROM ' . $db->quoteName('#__utf8_conversion') . ';')
+				->execute();
+			$db->setQuery('INSERT INTO ' . $db->quoteName('#__utf8_conversion')
+				. ' (' . $db->quoteName('converted') . ') VALUES (0);'
+			)->execute();
+		}
+		elseif ($count == 0)
+		{
+			// Record missing somehow, fix this
+			$db->setQuery('INSERT INTO ' . $db->quoteName('#__utf8_conversion')
+				. ' (' . $db->quoteName('converted') . ') VALUES (0);'
+			)->execute();
+		}
+	}
+}
diff --git a/core/administrator/components/com_installer/models/discover.php b/core/administrator/components/com_installer/models/discover.php
new file mode 100644
index 00000000..e2c45141
--- /dev/null
+++ b/core/administrator/components/com_installer/models/discover.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('InstallerModel', __DIR__ . '/extension.php');
+
+/**
+ * Installer Discover Model
+ *
+ * @since  1.6
+ */
+class InstallerModelDiscover extends InstallerModel
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.5
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'name',
+				'client_id',
+				'client', 'client_translated',
+				'type', 'type_translated',
+				'folder', 'folder_translated',
+				'extension_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function populateState($ordering = 'name', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', null, 'int'));
+		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'string'));
+		$this->setState('filter.folder', $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', '', 'string'));
+
+		$this->setState('message', $app->getUserState('com_installer.message'));
+		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));
+
+		$app->setUserState('com_installer.message', '');
+		$app->setUserState('com_installer.extension_message', '');
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get the database query.
+	 *
+	 * @return  JDatabaseQuery  the database query
+	 *
+	 * @since   3.1
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('state') . ' = -1');
+
+		// Process select filters.
+		$type     = $this->getState('filter.type');
+		$clientId = $this->getState('filter.client_id');
+		$folder   = $this->getState('filter.folder');
+
+		if ($type)
+		{
+			$query->where($db->quoteName('type') . ' = ' . $db->quote($type));
+		}
+
+		if ($clientId != '')
+		{
+			$query->where($db->quoteName('client_id') . ' = ' . (int) $clientId);
+		}
+
+		if ($folder != '' && in_array($type, array('plugin', 'library', '')))
+		{
+			$query->where($db->quoteName('folder') . ' = ' . $db->quote($folder == '*' ? '' : $folder));
+		}
+
+		// Process search filter.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('extension_id') . ' = ' . (int) substr($search, 3));
+			}
+		}
+
+		// Note: The search for name, ordering and pagination are processed by the parent InstallerModel class (in extension.php).
+
+		return $query;
+	}
+
+	/**
+	 * Discover extensions.
+	 *
+	 * Finds uninstalled extensions
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function discover()
+	{
+		// Purge the list of discovered extensions and fetch them again.
+		$this->purge();
+		$results = JInstaller::getInstance()->discover();
+
+		// Get all templates, including discovered ones
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('extension_id', 'element', 'folder', 'client_id', 'type')))
+			->from($db->quoteName('#__extensions'));
+		$db->setQuery($query);
+		$installedtmp = $db->loadObjectList();
+
+		$extensions = array();
+
+		foreach ($installedtmp as $install)
+		{
+			$key = implode(':', array($install->type, $install->element, $install->folder, $install->client_id));
+			$extensions[$key] = $install;
+		}
+
+		foreach ($results as $result)
+		{
+			// Check if we have a match on the element
+			$key = implode(':', array($result->type, $result->element, $result->folder, $result->client_id));
+
+			if (!array_key_exists($key, $extensions))
+			{
+				// Put it into the table
+				$result->check();
+				$result->store();
+			}
+		}
+	}
+
+	/**
+	 * Installs a discovered extension.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function discover_install()
+	{
+		$app   = JFactory::getApplication();
+		$input = $app->input;
+		$eid   = $input->get('cid', 0, 'array');
+
+		if (is_array($eid) || $eid)
+		{
+			if (!is_array($eid))
+			{
+				$eid = array($eid);
+			}
+
+			$eid = ArrayHelper::toInteger($eid);
+			$failed = false;
+
+			foreach ($eid as $id)
+			{
+				$installer = new JInstaller;
+
+				$result = $installer->discover_install($id);
+
+				if (!$result)
+				{
+					$failed = true;
+					$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_INSTALLFAILED') . ': ' . $id);
+				}
+			}
+
+			// TODO - We are only receiving the message for the last JInstaller instance
+			$this->setState('action', 'remove');
+			$this->setState('name', $installer->get('name'));
+			$app->setUserState('com_installer.message', $installer->message);
+			$app->setUserState('com_installer.extension_message', $installer->get('extension_message'));
+
+			if (!$failed)
+			{
+				$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_INSTALLSUCCESSFUL'));
+			}
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED'));
+		}
+	}
+
+	/**
+	 * Cleans out the list of discovered extensions.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function purge()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__extensions'))
+			->where($db->quoteName('state') . ' = -1');
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$this->_message = JText::_('COM_INSTALLER_MSG_DISCOVER_FAILEDTOPURGEEXTENSIONS');
+
+			return false;
+		}
+
+		$this->_message = JText::_('COM_INSTALLER_MSG_DISCOVER_PURGEDDISCOVEREDEXTENSIONS');
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_installer/models/extension.php b/core/administrator/components/com_installer/models/extension.php
new file mode 100644
index 00000000..203a20f2
--- /dev/null
+++ b/core/administrator/components/com_installer/models/extension.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Extension Manager Abstract Extension Model.
+ *
+ * @since  1.5
+ */
+class InstallerModel extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'name',
+				'client_id',
+				'client', 'client_translated',
+				'enabled',
+				'type', 'type_translated',
+				'folder', 'folder_translated',
+				'extension_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Returns an object list
+	 *
+	 * @param   string  $query       The query
+	 * @param   int     $limitstart  Offset
+	 * @param   int     $limit       The number of records
+	 *
+	 * @return  array
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$listOrder = $this->getState('list.ordering', 'name');
+		$listDirn  = $this->getState('list.direction', 'asc');
+
+		// Replace slashes so preg_match will work
+		$search = $this->getState('filter.search');
+		$search = str_replace('/', ' ', $search);
+		$db     = $this->getDbo();
+
+		// Define which fields have to be processed in a custom way because of translation.
+		$customOrderFields = array('name', 'client_translated', 'type_translated', 'folder_translated');
+
+		// Process searching, ordering and pagination for fields that need to be translated.
+		if (in_array($listOrder, $customOrderFields) || (!empty($search) && stripos($search, 'id:') !== 0))
+		{
+			// Get results from database and translate them.
+			$db->setQuery($query);
+			$result = $db->loadObjectList();
+			$this->translate($result);
+
+			// Process searching.
+			if (!empty($search) && stripos($search, 'id:') !== 0)
+			{
+				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
+
+				// By default search only the extension name field.
+				$searchFields = array('name');
+
+				// If in update sites view search also in the update site name field.
+				if ($this instanceof InstallerModelUpdatesites)
+				{
+					$searchFields[] = 'update_site_name';
+				}
+
+				foreach ($result as $i => $item)
+				{
+					// Check if search string exists in any of the fields to be searched.
+					$found = 0;
+
+					foreach ($searchFields as $key => $field)
+					{
+						if (!$found && preg_match('/' . $escapedSearchString . '/i', $item->{$field}))
+						{
+							$found = 1;
+						}
+					}
+
+					// If search string was not found in any of the fields searched remove it from results array.
+					if (!$found)
+					{
+						unset($result[$i]);
+					}
+				}
+			}
+
+			// Process ordering.
+			// Sort array object by selected ordering and selected direction. Sort is case insensative and using locale sorting.
+			$result = ArrayHelper::sortObjects($result, $listOrder, strtolower($listDirn) == 'desc' ? -1 : 1, false, true);
+
+			// Process pagination.
+			$total = count($result);
+			$this->cache[$this->getStoreId('getTotal')] = $total;
+
+			if ($total < $limitstart)
+			{
+				$limitstart = 0;
+				$this->setState('list.start', 0);
+			}
+
+			return array_slice($result, $limitstart, $limit ?: null);
+		}
+
+		// Process searching, ordering and pagination for regular database fields.
+		$query->order($db->quoteName($listOrder) . ' ' . $db->escape($listDirn));
+		$result = parent::_getList($query, $limitstart, $limit);
+		$this->translate($result);
+
+		return $result;
+	}
+
+	/**
+	 * Translate a list of objects
+	 *
+	 * @param   array  $items  The array of objects
+	 *
+	 * @return  array The array of translated objects
+	 */
+	protected function translate(&$items)
+	{
+		$lang = JFactory::getLanguage();
+
+		foreach ($items as &$item)
+		{
+			if (strlen($item->manifest_cache) && $data = json_decode($item->manifest_cache))
+			{
+				foreach ($data as $key => $value)
+				{
+					if ($key == 'type')
+					{
+						// Ignore the type field
+						continue;
+					}
+
+					$item->$key = $value;
+				}
+			}
+
+			$item->author_info       = @$item->authorEmail . '<br />' . @$item->authorUrl;
+			$item->client            = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE');
+			$item->client_translated = $item->client;
+			$item->type_translated   = JText::_('COM_INSTALLER_TYPE_' . strtoupper($item->type));
+			$item->folder_translated = @$item->folder ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE');
+
+			$path = $item->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+			switch ($item->type)
+			{
+				case 'component':
+					$extension = $item->element;
+					$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+						$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+					||	$lang->load("$extension.sys", $source, null, false, true);
+				break;
+				case 'file':
+					$extension = 'files_' . $item->element;
+						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
+				break;
+				case 'library':
+					$extension = 'lib_' . $item->element;
+						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
+				break;
+				case 'module':
+					$extension = $item->element;
+					$source = $path . '/modules/' . $extension;
+						$lang->load("$extension.sys", $path, null, false, true)
+					||	$lang->load("$extension.sys", $source, null, false, true);
+				break;
+				case 'plugin':
+					$extension = 'plg_' . $item->folder . '_' . $item->element;
+					$source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element;
+						$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+					||	$lang->load("$extension.sys", $source, null, false, true);
+				break;
+				case 'template':
+					$extension = 'tpl_' . $item->element;
+					$source = $path . '/templates/' . $item->element;
+						$lang->load("$extension.sys", $path, null, false, true)
+					||	$lang->load("$extension.sys", $source, null, false, true);
+				break;
+				case 'package':
+				default:
+					$extension = $item->element;
+						$lang->load("$extension.sys", JPATH_SITE, null, false, true);
+				break;
+			}
+
+			// Translate the extension name if possible
+			$item->name = JText::_($item->name);
+
+			settype($item->description, 'string');
+
+			if (!in_array($item->type, array('language')))
+			{
+				$item->description = JText::_($item->description);
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_installer/models/fields/extensionstatus.php b/core/administrator/components/com_installer/models/fields/extensionstatus.php
new file mode 100644
index 00000000..987b90d1
--- /dev/null
+++ b/core/administrator/components/com_installer/models/fields/extensionstatus.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Extension Status field.
+ *
+ * @since  3.5
+ */
+class JFormFieldExtensionStatus extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $type = 'ExtensionStatus';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		$options = InstallerHelper::getStateOptions();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_installer/models/fields/folder.php b/core/administrator/components/com_installer/models/fields/folder.php
new file mode 100644
index 00000000..0fcc969c
--- /dev/null
+++ b/core/administrator/components/com_installer/models/fields/folder.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Folder field.
+ *
+ * @since  3.5
+ */
+class JFormFieldFolder extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $type = 'Folder';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		$options = InstallerHelper::getExtensionGroupes();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_installer/models/fields/location.php b/core/administrator/components/com_installer/models/fields/location.php
new file mode 100644
index 00000000..95a53c0a
--- /dev/null
+++ b/core/administrator/components/com_installer/models/fields/location.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Location field.
+ *
+ * @since  3.5
+ */
+class JFormFieldLocation extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var	   string
+	 * @since  3.5
+	 */
+	protected $type = 'Location';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		$options = InstallerHelper::getClientOptions();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_installer/models/fields/type.php b/core/administrator/components/com_installer/models/fields/type.php
new file mode 100644
index 00000000..eddf06f0
--- /dev/null
+++ b/core/administrator/components/com_installer/models/fields/type.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerHelper', JPATH_ADMINISTRATOR . '/components/com_installer/helpers/installer.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form field for a list of extension types.
+ *
+ * @since  3.5
+ */
+class JFormFieldType extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var	   string
+	 * @since  3.5
+	 */
+	protected $type = 'Type';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		$options = InstallerHelper::getExtensionTypes();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_installer/models/forms/filter_discover.xml b/core/administrator/components/com_installer/models/forms/filter_discover.xml
new file mode 100644
index 00000000..b11e1f2d
--- /dev/null
+++ b/core/administrator/components/com_installer/models/forms/filter_discover.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_installer/models/fields"/>
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_INSTALLER_DISCOVER_FILTER_SEARCH_LABEL"
+			description="COM_INSTALLER_DISCOVER_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="client_id"
+			type="location"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
+		</field>
+
+		<field
+			name="type"
+			type="type"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
+		</field>
+
+		<field
+			name="folder"
+			type="folder"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="name ASC">COM_INSTALLER_HEADING_NAME_ASC</option>
+			<option value="name DESC">COM_INSTALLER_HEADING_NAME_DESC</option>
+			<option value="client_translated ASC">COM_INSTALLER_HEADING_LOCATION_ASC</option>
+			<option value="client_translated DESC">COM_INSTALLER_HEADING_LOCATION_DESC</option>
+			<option value="type_translated ASC">COM_INSTALLER_HEADING_TYPE_ASC</option>
+			<option value="type_translated DESC">COM_INSTALLER_HEADING_TYPE_DESC</option>
+			<option value="folder_translated ASC">COM_INSTALLER_HEADING_FOLDER_ASC</option>
+			<option value="folder_translated DESC">COM_INSTALLER_HEADING_FOLDER_DESC</option>
+			<option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_installer/models/forms/filter_languages.xml b/core/administrator/components/com_installer/models/forms/filter_languages.xml
new file mode 100644
index 00000000..bf421173
--- /dev/null
+++ b/core/administrator/components/com_installer/models/forms/filter_languages.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_INSTALLER_LANGUAGES_FILTER_SEARCH_LABEL"
+			description="COM_INSTALLER_LANGUAGES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="name ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="name DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="element ASC">COM_INSTALLER_HEADING_LANGUAGE_TAG_ASC</option>
+			<option value="element DESC">COM_INSTALLER_HEADING_LANGUAGE_TAG_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+    </fields>
+</form>
diff --git a/core/administrator/components/com_installer/models/forms/filter_manage.xml b/core/administrator/components/com_installer/models/forms/filter_manage.xml
new file mode 100644
index 00000000..c6553e2e
--- /dev/null
+++ b/core/administrator/components/com_installer/models/forms/filter_manage.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_installer/models/fields" />
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_INSTALLER_MANAGE_FILTER_SEARCH_LABEL"
+			description="COM_INSTALLER_MANAGE_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="status"
+			type="extensionstatus"
+			label="COM_PLUGINS_FILTER_PUBLISHED"
+			description="COM_PLUGINS_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="client_id"
+			type="location"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
+		</field>
+
+		<field
+			name="type"
+			type="type"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
+		</field>
+
+		<field
+			name="folder"
+			type="folder"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="status ASC">JSTATUS_ASC</option>
+			<option value="status DESC">JSTATUS_DESC</option>
+			<option value="name ASC">COM_INSTALLER_HEADING_NAME_ASC</option>
+			<option value="name DESC">COM_INSTALLER_HEADING_NAME_DESC</option>
+			<option value="client_translated ASC">COM_INSTALLER_HEADING_LOCATION_ASC</option>
+			<option value="client_translated DESC">COM_INSTALLER_HEADING_LOCATION_DESC</option>
+			<option value="type_translated ASC">COM_INSTALLER_HEADING_TYPE_ASC</option>
+			<option value="type_translated DESC">COM_INSTALLER_HEADING_TYPE_DESC</option>
+			<option value="folder_translated ASC">COM_INSTALLER_HEADING_FOLDER_ASC</option>
+			<option value="folder_translated DESC">COM_INSTALLER_HEADING_FOLDER_DESC</option>
+			<option value="package_id ASC">COM_INSTALLER_HEADING_PACKAGE_ID_ASC</option>
+			<option value="package_id DESC">COM_INSTALLER_HEADING_PACKAGE_ID_DESC</option>
+			<option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_installer/models/forms/filter_update.xml b/core/administrator/components/com_installer/models/forms/filter_update.xml
new file mode 100644
index 00000000..27493b8e
--- /dev/null
+++ b/core/administrator/components/com_installer/models/forms/filter_update.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_installer/models/fields"/>
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_INSTALLER_UPDATE_FILTER_SEARCH_LABEL"
+			description="COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="client_id"
+			type="location"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
+		</field>
+		<field
+			name="type"
+			type="type"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
+		</field>
+		<field
+			name="folder"
+			type="folder"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="u.name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="u.name ASC">COM_INSTALLER_HEADING_NAME_ASC</option>
+			<option value="u.name DESC">COM_INSTALLER_HEADING_NAME_DESC</option>
+			<option value="client_translated ASC">COM_INSTALLER_HEADING_LOCATION_ASC</option>
+			<option value="client_translated DESC">COM_INSTALLER_HEADING_LOCATION_DESC</option>
+			<option value="type_translated ASC">COM_INSTALLER_HEADING_TYPE_ASC</option>
+			<option value="type_translated DESC">COM_INSTALLER_HEADING_TYPE_DESC</option>
+			<option value="folder_translated ASC">COM_INSTALLER_HEADING_FOLDER_ASC</option>
+			<option value="folder_translated DESC">COM_INSTALLER_HEADING_FOLDER_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_installer/models/forms/filter_updatesites.xml b/core/administrator/components/com_installer/models/forms/filter_updatesites.xml
new file mode 100644
index 00000000..ec17aeec
--- /dev/null
+++ b/core/administrator/components/com_installer/models/forms/filter_updatesites.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_installer/models/fields"/>
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_INSTALLER_UPDATESITES_FILTER_SEARCH_LABEL"
+			description="COM_INSTALLER_UPDATESITES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="enabled"
+			type="list"
+			label="COM_PLUGINS_FILTER_PUBLISHED"
+			description="COM_PLUGINS_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+			<option value="0">JDISABLED</option>
+			<option value="1">JENABLED</option>
+		</field>
+		<field
+			name="client_id"
+			type="location"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_CLIENT_SELECT</option>
+		</field>
+		<field
+			name="type"
+			type="type"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_TYPE_SELECT</option>
+		</field>
+		<field
+			name="folder"
+			type="folder"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_INSTALLER_VALUE_FOLDER_SELECT</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="enabled ASC">JSTATUS_ASC</option>
+			<option value="enabled DESC">JSTATUS_DESC</option>
+			<option value="update_site_name ASC">COM_INSTALLER_HEADING_UPDATESITE_NAME_ASC</option>
+			<option value="update_site_name DESC">COM_INSTALLER_HEADING_UPDATESITE_NAME_DESC</option>
+			<option value="name ASC">COM_INSTALLER_HEADING_NAME_ASC</option>
+			<option value="name DESC">COM_INSTALLER_HEADING_NAME_DESC</option>
+			<option value="client_translated ASC">COM_INSTALLER_HEADING_LOCATION_ASC</option>
+			<option value="client_translated DESC">COM_INSTALLER_HEADING_LOCATION_DESC</option>
+			<option value="type_translated ASC">COM_INSTALLER_HEADING_TYPE_ASC</option>
+			<option value="type_translated DESC">COM_INSTALLER_HEADING_TYPE_DESC</option>
+			<option value="folder_translated ASC">COM_INSTALLER_HEADING_FOLDER_ASC</option>
+			<option value="folder_translated DESC">COM_INSTALLER_HEADING_FOLDER_DESC</option>
+			<option value="update_site_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="update_site_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_installer/models/install.php b/core/administrator/components/com_installer/models/install.php
new file mode 100644
index 00000000..963c515b
--- /dev/null
+++ b/core/administrator/components/com_installer/models/install.php
@@ -0,0 +1,415 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Extension Manager Install Model
+ *
+ * @since  1.5
+ */
+class InstallerModelInstall extends JModelLegacy
+{
+	/**
+	 * @var object JTable object
+	 */
+	protected $_table = null;
+
+	/**
+	 * @var object JTable object
+	 */
+	protected $_url = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	protected $_context = 'com_installer.install';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		$this->setState('message', $app->getUserState('com_installer.message'));
+		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));
+		$app->setUserState('com_installer.message', '');
+		$app->setUserState('com_installer.extension_message', '');
+
+		parent::populateState();
+	}
+
+	/**
+	 * Install an extension from either folder, URL or upload.
+	 *
+	 * @return  boolean result of install.
+	 *
+	 * @since   1.5
+	 */
+	public function install()
+	{
+		$this->setState('action', 'install');
+
+		// Set FTP credentials, if given.
+		JClientHelper::setCredentialsFromRequest('ftp');
+		$app = JFactory::getApplication();
+
+		// Load installer plugins for assistance if required:
+		JPluginHelper::importPlugin('installer');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		$package = null;
+
+		// This event allows an input pre-treatment, a custom pre-packing or custom installation.
+		// (e.g. from a JSON description).
+		$results = $dispatcher->trigger('onInstallerBeforeInstallation', array($this, &$package));
+
+		if (in_array(true, $results, true))
+		{
+			return true;
+		}
+
+		if (in_array(false, $results, true))
+		{
+			return false;
+		}
+
+		$installType = $app->input->getWord('installtype');
+
+		if ($package === null)
+		{
+			switch ($installType)
+			{
+				case 'folder':
+					// Remember the 'Install from Directory' path.
+					$app->getUserStateFromRequest($this->_context . '.install_directory', 'install_directory');
+					$package = $this->_getPackageFromFolder();
+					break;
+
+				case 'upload':
+					$package = $this->_getPackageFromUpload();
+					break;
+
+				case 'url':
+					$package = $this->_getPackageFromUrl();
+					break;
+
+				default:
+					$app->setUserState('com_installer.message', JText::_('COM_INSTALLER_NO_INSTALL_TYPE_FOUND'));
+
+					return false;
+					break;
+			}
+		}
+
+		// This event allows a custom installation of the package or a customization of the package:
+		$results = $dispatcher->trigger('onInstallerBeforeInstaller', array($this, &$package));
+
+		if (in_array(true, $results, true))
+		{
+			return true;
+		}
+
+		if (in_array(false, $results, true))
+		{
+			if (in_array($installType, array('upload', 'url')))
+			{
+				JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
+			}
+
+			return false;
+		}
+
+		// Get an installer instance.
+		$installer = JInstaller::getInstance();
+
+		/*
+		 * Check for a Joomla core package.
+		 * To do this we need to set the source path to find the manifest (the same first step as JInstaller::install())
+		 *
+		 * This must be done before the unpacked check because JInstallerHelper::detectType() returns a boolean false since the manifest
+		 * can't be found in the expected location.
+		 */
+		if (is_array($package) && isset($package['dir']) && is_dir($package['dir']))
+		{
+			$installer->setPath('source', $package['dir']);
+
+			if (!$installer->findManifest())
+			{
+				// If a manifest isn't found at the source, this may be a Joomla package; check the package directory for the Joomla manifest
+				if (file_exists($package['dir'] . '/administrator/manifests/files/joomla.xml'))
+				{
+					// We have a Joomla package
+					if (in_array($installType, array('upload', 'url')))
+					{
+						JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
+					}
+
+					$app->enqueueMessage(
+						JText::sprintf('COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE', JRoute::_('index.php?option=com_joomlaupdate')),
+						'warning'
+					);
+
+					return false;
+				}
+			}
+		}
+
+		// Was the package unpacked?
+		if (!$package || !$package['type'])
+		{
+			if (in_array($installType, array('upload', 'url')))
+			{
+				JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
+			}
+
+			$app->enqueueMessage(JText::_('COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE'), 'error');
+
+			return false;
+		}
+
+		// Install the package.
+		if (!$installer->install($package['dir']))
+		{
+			// There was an error installing the package.
+			$msg = JText::sprintf('COM_INSTALLER_INSTALL_ERROR', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
+			$result = false;
+			$msgType = 'error';
+		}
+		else
+		{
+			// Package installed successfully.
+			$msg = JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
+			$result = true;
+			$msgType = 'message';
+		}
+
+		// This event allows a custom a post-flight:
+		$dispatcher->trigger('onInstallerAfterInstaller', array($this, &$package, $installer, &$result, &$msg));
+
+		// Set some model state values.
+		$app = JFactory::getApplication();
+		$app->enqueueMessage($msg, $msgType);
+		$this->setState('name', $installer->get('name'));
+		$this->setState('result', $result);
+		$app->setUserState('com_installer.message', $installer->message);
+		$app->setUserState('com_installer.extension_message', $installer->get('extension_message'));
+		$app->setUserState('com_installer.redirect_url', $installer->get('redirect_url'));
+
+		// Cleanup the install files.
+		if (!is_file($package['packagefile']))
+		{
+			$config = JFactory::getConfig();
+			$package['packagefile'] = $config->get('tmp_path') . '/' . $package['packagefile'];
+		}
+
+		JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
+
+		// Clear the cached extension data and menu cache
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+		$this->cleanCache('com_modules', 0);
+		$this->cleanCache('com_modules', 1);
+		$this->cleanCache('com_plugins', 0);
+		$this->cleanCache('com_plugins', 1);
+		$this->cleanCache('mod_menu', 0);
+		$this->cleanCache('mod_menu', 1);
+
+		return $result;
+	}
+
+	/**
+	 * Works out an installation package from a HTTP upload.
+	 *
+	 * @return package definition or false on failure.
+	 */
+	protected function _getPackageFromUpload()
+	{
+		// Get the uploaded file information.
+		$input    = JFactory::getApplication()->input;
+
+		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
+		$userfile = $input->files->get('install_package', null, 'raw');
+
+		// Make sure that file uploads are enabled in php.
+		if (!(bool) ini_get('file_uploads'))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'));
+
+			return false;
+		}
+
+		// Make sure that zlib is loaded so that the package can be unpacked.
+		if (!extension_loaded('zlib'))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB'));
+
+			return false;
+		}
+
+		// If there is no uploaded file, we have a problem...
+		if (!is_array($userfile))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED'));
+
+			return false;
+		}
+
+		// Is the PHP tmp directory missing?
+		if ($userfile['error'] && ($userfile['error'] == UPLOAD_ERR_NO_TMP_DIR))
+		{
+			JError::raiseWarning(
+				'',
+				JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR') . '<br />' . JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET')
+			);
+
+			return false;
+		}
+
+		// Is the max upload size too small in php.ini?
+		if ($userfile['error'] && ($userfile['error'] == UPLOAD_ERR_INI_SIZE))
+		{
+			JError::raiseWarning(
+				'',
+				JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR') . '<br />' . JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE')
+			);
+
+			return false;
+		}
+
+		// Check if there was a different problem uploading the file.
+		if ($userfile['error'] || $userfile['size'] < 1)
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'));
+
+			return false;
+		}
+
+		// Build the appropriate paths.
+		$config   = JFactory::getConfig();
+		$tmp_dest = $config->get('tmp_path') . '/' . $userfile['name'];
+		$tmp_src  = $userfile['tmp_name'];
+
+		// Move uploaded file.
+		jimport('joomla.filesystem.file');
+		JFile::upload($tmp_src, $tmp_dest, false, true);
+
+		// Unpack the downloaded package file.
+		$package = JInstallerHelper::unpack($tmp_dest, true);
+
+		return $package;
+	}
+
+	/**
+	 * Install an extension from a directory
+	 *
+	 * @return  array  Package details or false on failure
+	 *
+	 * @since   1.5
+	 */
+	protected function _getPackageFromFolder()
+	{
+		$input = JFactory::getApplication()->input;
+
+		// Get the path to the package to install.
+		$p_dir = $input->getString('install_directory');
+		$p_dir = JPath::clean($p_dir);
+
+		// Did you give us a valid directory?
+		if (!is_dir($p_dir))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+
+			return false;
+		}
+
+		// Detect the package type
+		$type = JInstallerHelper::detectType($p_dir);
+
+		// Did you give us a valid package?
+		if (!$type)
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+		}
+
+		$package['packagefile'] = null;
+		$package['extractdir'] = null;
+		$package['dir'] = $p_dir;
+		$package['type'] = $type;
+
+		return $package;
+	}
+
+	/**
+	 * Install an extension from a URL.
+	 *
+	 * @return  Package details or false on failure.
+	 *
+	 * @since   1.5
+	 */
+	protected function _getPackageFromUrl()
+	{
+		$input = JFactory::getApplication()->input;
+
+		// Get the URL of the package to install.
+		$url = $input->getString('install_url');
+
+		// Did you give us a URL?
+		if (!$url)
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL'));
+
+			return false;
+		}
+
+		// Handle updater XML file case:
+		if (preg_match('/\.xml\s*$/', $url))
+		{
+			jimport('joomla.updater.update');
+			$update = new JUpdate;
+			$update->loadFromXml($url);
+			$package_url = trim($update->get('downloadurl', false)->_data);
+
+			if ($package_url)
+			{
+				$url = $package_url;
+			}
+
+			unset($update);
+		}
+
+		// Download the package at the URL given.
+		$p_file = JInstallerHelper::downloadPackage($url);
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_INVALID_URL'));
+
+			return false;
+		}
+
+		$config   = JFactory::getConfig();
+		$tmp_dest = $config->get('tmp_path');
+
+		// Unpack the downloaded package file.
+		$package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
+
+		return $package;
+	}
+}
diff --git a/core/administrator/components/com_installer/models/languages.php b/core/administrator/components/com_installer/models/languages.php
new file mode 100644
index 00000000..63f8c3b6
--- /dev/null
+++ b/core/administrator/components/com_installer/models/languages.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.updater.update');
+use Joomla\String\StringHelper;
+
+/**
+ * Languages Installer Model
+ *
+ * @since  2.5.7
+ */
+class InstallerModelLanguages extends JModelList
+{
+	/**
+	 * Language count
+	 *
+	 * @var     integer
+	 * @since   3.7.0
+	 */
+	private $languageCount;
+
+	/**
+	 * Constructor override, defines a whitelist of column filters.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   2.5.7
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'name',
+				'element',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Get the Update Site
+	 *
+	 * @since   3.7.0
+	 *
+	 * @return  string  The URL of the Accredited Languagepack Updatesite XML
+	 */
+	private function getUpdateSite()
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn('us.location'))
+			->from($db->qn('#__extensions', 'e'))
+			->where($db->qn('e.type') . ' = ' . $db->q('package'))
+			->where($db->qn('e.element') . ' = ' . $db->q('pkg_en-GB'))
+			->where($db->qn('e.client_id') . ' = 0')
+			->join('LEFT', $db->qn('#__update_sites_extensions', 'use') . ' ON ' . $db->qn('use.extension_id') . ' = ' . $db->qn('e.extension_id'))
+			->join('LEFT', $db->qn('#__update_sites', 'us') . ' ON ' . $db->qn('us.update_site_id') . ' = ' . $db->qn('use.update_site_id'));
+
+		return $db->setQuery($query)->loadResult();
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItems()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId();
+
+		// Try to load the data from internal storage.
+		if (isset($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		try
+		{
+			// Load the list items and add the items to the internal cache.
+			$this->cache[$store] = $this->getLanguages();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Gets an array of objects from the updatesite.
+	 *
+	 * @return  object[]  An array of results.
+	 *
+	 * @since   3.0
+	 * @throws  RuntimeException
+	 */
+	protected function getLanguages()
+	{
+		$updateSite = $this->getUpdateSite();
+
+		$http = new JHttp;
+
+		try
+		{
+			$response = $http->get($updateSite);
+		}
+		catch (RuntimeException $e)
+		{
+			$response = null;
+		}
+
+		if ($response === null || $response->code !== 200)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER'), 'warning');
+
+			return;
+		}
+
+		$updateSiteXML = simplexml_load_string($response->body);
+		$languages     = array();
+		$search        = strtolower($this->getState('filter.search'));
+
+		foreach ($updateSiteXML->extension as $extension)
+		{
+			$language = new stdClass;
+
+			foreach ($extension->attributes() as $key => $value)
+			{
+				$language->$key = (string) $value;
+			}
+
+			if ($search)
+			{
+				if (strpos(strtolower($language->name), $search) === false
+					&& strpos(strtolower($language->element), $search) === false)
+				{
+					continue;
+				}
+			}
+
+			$languages[$language->name] = $language;
+		}
+
+		// Workaround for php 5.3
+		$that = $this;
+
+		// Sort the array by value of subarray
+		usort(
+			$languages,
+			function($a, $b) use ($that)
+			{
+				$ordering = $that->getState('list.ordering');
+
+				if (strtolower($that->getState('list.direction')) === 'asc')
+				{
+					return StringHelper::strcmp($a->$ordering, $b->$ordering);
+				}
+				else
+				{
+					return StringHelper::strcmp($b->$ordering, $a->$ordering);
+				}
+			}
+		);
+
+		// Count the non-paginated list
+		$this->languageCount = count($languages);
+		$limit               = ($this->getState('list.limit') > 0) ? $this->getState('list.limit') : $this->languageCount;
+
+		return array_slice($languages, $this->getStart(), $limit);
+	}
+
+	/**
+	 * Returns a record count for the updatesite.
+	 *
+	 * @param   JDatabaseQuery|string  $query  The query.
+	 *
+	 * @return  integer  Number of rows for query.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function _getListCount($query)
+	{
+		return $this->languageCount;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5.7
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   list order
+	 * @param   string  $direction  direction in the list
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.7
+	 */
+	protected function populateState($ordering = 'name', $direction = 'asc')
+	{
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		$this->setState('extension_message', JFactory::getApplication()->getUserState('com_installer.extension_message'));
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to compare two languages in order to sort them.
+	 *
+	 * @param   object  $lang1  The first language.
+	 * @param   object  $lang2  The second language.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.7.0
+	 */
+	protected function compareLanguages($lang1, $lang2)
+	{
+		return strcmp($lang1->name, $lang2->name);
+	}
+}
diff --git a/core/administrator/components/com_installer/models/manage.php b/core/administrator/components/com_installer/models/manage.php
new file mode 100644
index 00000000..0781019d
--- /dev/null
+++ b/core/administrator/components/com_installer/models/manage.php
@@ -0,0 +1,350 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerModel', __DIR__ . '/extension.php');
+
+/**
+ * Installer Manage Model
+ *
+ * @since  1.5
+ */
+class InstallerModelManage extends InstallerModel
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'status',
+				'name',
+				'client_id',
+				'client', 'client_translated',
+				'type', 'type_translated',
+				'folder', 'folder_translated',
+				'package_id',
+				'extension_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'name', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', null, 'int'));
+		$this->setState('filter.status', $this->getUserStateFromRequest($this->context . '.filter.status', 'filter_status', '', 'string'));
+		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'string'));
+		$this->setState('filter.folder', $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', '', 'string'));
+
+		$this->setState('message', $app->getUserState('com_installer.message'));
+		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));
+		$app->setUserState('com_installer.message', '');
+		$app->setUserState('com_installer.extension_message', '');
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Enable/Disable an extension.
+	 *
+	 * @param   array  $eid    Extension ids to un/publish
+	 * @param   int    $value  Publish value
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function publish(&$eid = array(), $value = 1)
+	{
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('core.edit.state', 'com_installer'))
+		{
+			JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		$result = true;
+
+		/*
+		 * Ensure eid is an array of extension ids
+		 * TODO: If it isn't an array do we want to set an error and fail?
+		 */
+		if (!is_array($eid))
+		{
+			$eid = array($eid);
+		}
+
+		// Get a table object for the extension type
+		$table = JTable::getInstance('Extension');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_templates/tables');
+
+		// Enable the extension in the table and store it in the database
+		foreach ($eid as $i => $id)
+		{
+			$table->load($id);
+
+			if ($table->type == 'template')
+			{
+				$style = JTable::getInstance('Style', 'TemplatesTable');
+
+				if ($style->load(array('template' => $table->element, 'client_id' => $table->client_id, 'home' => 1)))
+				{
+					JError::raiseNotice(403, JText::_('COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED'));
+					unset($eid[$i]);
+					continue;
+				}
+			}
+
+			if ($table->protected == 1)
+			{
+				$result = false;
+				JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+			}
+			else
+			{
+				$table->enabled = $value;
+			}
+
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+				$result = false;
+			}
+		}
+
+		// Clear the cached extension data and menu cache
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+		$this->cleanCache('com_modules', 0);
+		$this->cleanCache('com_modules', 1);
+		$this->cleanCache('mod_menu', 0);
+		$this->cleanCache('mod_menu', 1);
+
+		return $result;
+	}
+
+	/**
+	 * Refreshes the cached manifest information for an extension.
+	 *
+	 * @param   int  $eid  extension identifier (key in #__extensions)
+	 *
+	 * @return  boolean  result of refresh
+	 *
+	 * @since   1.6
+	 */
+	public function refresh($eid)
+	{
+		if (!is_array($eid))
+		{
+			$eid = array($eid => 0);
+		}
+
+		// Get an installer object for the extension type
+		$installer = JInstaller::getInstance();
+		$result = 0;
+
+		// Uninstall the chosen extensions
+		foreach ($eid as $id)
+		{
+			$result |= $installer->refreshManifestCache($id);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Remove (uninstall) an extension
+	 *
+	 * @param   array  $eid  An array of identifiers
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function remove($eid = array())
+	{
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('core.delete', 'com_installer'))
+		{
+			JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		/*
+		 * Ensure eid is an array of extension ids in the form id => client_id
+		 * TODO: If it isn't an array do we want to set an error and fail?
+		 */
+		if (!is_array($eid))
+		{
+			$eid = array($eid => 0);
+		}
+
+		// Get an installer object for the extension type
+		$installer = JInstaller::getInstance();
+		$row = JTable::getInstance('extension');
+
+		// Uninstall the chosen extensions
+		$msgs = array();
+		$result = false;
+
+		foreach ($eid as $id)
+		{
+			$id = trim($id);
+			$row->load($id);
+			$result = false;
+
+			$langstring = 'COM_INSTALLER_TYPE_TYPE_' . strtoupper($row->type);
+			$rowtype = JText::_($langstring);
+
+			if (strpos($rowtype, $langstring) !== false)
+			{
+				$rowtype = $row->type;
+			}
+
+			if ($row->type)
+			{
+				$result = $installer->uninstall($row->type, $id);
+
+				// Build an array of extensions that failed to uninstall
+				if ($result === false)
+				{
+					// There was an error in uninstalling the package
+					$msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype);
+
+					continue;
+				}
+
+				// Package uninstalled successfully
+				$msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype);
+				$result = true;
+
+				continue;
+			}
+
+			// There was an error in uninstalling the package
+			$msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype);
+		}
+
+		$msg = implode('<br />', $msgs);
+		$app = JFactory::getApplication();
+		$app->enqueueMessage($msg);
+		$this->setState('action', 'remove');
+		$this->setState('name', $installer->get('name'));
+		$app->setUserState('com_installer.message', $installer->message);
+		$app->setUserState('com_installer.extension_message', $installer->get('extension_message'));
+
+		// Clear the cached extension data and menu cache
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+		$this->cleanCache('com_modules', 0);
+		$this->cleanCache('com_modules', 1);
+		$this->cleanCache('com_plugins', 0);
+		$this->cleanCache('com_plugins', 1);
+		$this->cleanCache('mod_menu', 0);
+		$this->cleanCache('mod_menu', 1);
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the database query
+	 *
+	 * @return  JDatabaseQuery  The database query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$query = $this->getDbo()->getQuery(true)
+			->select('*')
+			->select('2*protected+(1-protected)*enabled AS status')
+			->from('#__extensions')
+			->where('state = 0');
+
+		// Process select filters.
+		$status   = $this->getState('filter.status');
+		$type     = $this->getState('filter.type');
+		$clientId = $this->getState('filter.client_id');
+		$folder   = $this->getState('filter.folder');
+
+		if ($status != '')
+		{
+			if ($status == '2')
+			{
+				$query->where('protected = 1');
+			}
+			elseif ($status == '3')
+			{
+				$query->where('protected = 0');
+			}
+			else
+			{
+				$query->where('protected = 0')
+					->where('enabled = ' . (int) $status);
+			}
+		}
+
+		if ($type)
+		{
+			$query->where('type = ' . $this->_db->quote($type));
+		}
+
+		if ($clientId != '')
+		{
+			$query->where('client_id = ' . (int) $clientId);
+		}
+
+		if ($folder != '')
+		{
+			$query->where('folder = ' . $this->_db->quote($folder == '*' ? '' : $folder));
+		}
+
+		// Process search filter (extension id).
+		$search = $this->getState('filter.search');
+
+		if (!empty($search) && stripos($search, 'id:') === 0)
+		{
+			$query->where('extension_id = ' . (int) substr($search, 3));
+		}
+
+		// Note: The search for name, ordering and pagination are processed by the parent InstallerModel class (in extension.php).
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_installer/models/update.php b/core/administrator/components/com_installer/models/update.php
new file mode 100644
index 00000000..54c1dad5
--- /dev/null
+++ b/core/administrator/components/com_installer/models/update.php
@@ -0,0 +1,602 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.updater.update');
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Installer Update Model
+ *
+ * @since  1.6
+ */
+class InstallerModelUpdate extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'name', 'u.name',
+				'client_id', 'u.client_id', 'client_translated',
+				'type', 'u.type', 'type_translated',
+				'folder', 'u.folder', 'folder_translated',
+				'extension_id', 'u.extension_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'u.name', $direction = 'asc')
+	{
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', null, 'int'));
+		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'string'));
+		$this->setState('filter.folder', $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', '', 'string'));
+
+		$app = JFactory::getApplication();
+		$this->setState('message', $app->getUserState('com_installer.message'));
+		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));
+		$app->setUserState('com_installer.message', '');
+		$app->setUserState('com_installer.extension_message', '');
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get the database query
+	 *
+	 * @return  JDatabaseQuery  The database query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+
+		// Grab updates ignoring new installs
+		$query = $db->getQuery(true)
+			->select('u.*')
+			->select($db->quoteName('e.manifest_cache'))
+			->from($db->quoteName('#__updates', 'u'))
+			->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('u.extension_id'))
+			->where($db->quoteName('u.extension_id') . ' != ' . $db->quote(0));
+
+		// Process select filters.
+		$clientId    = $this->getState('filter.client_id');
+		$type        = $this->getState('filter.type');
+		$folder      = $this->getState('filter.folder');
+		$extensionId = $this->getState('filter.extension_id');
+
+		if ($type)
+		{
+			$query->where($db->quoteName('u.type') . ' = ' . $db->quote($type));
+		}
+
+		if ($clientId != '')
+		{
+			$query->where($db->quoteName('u.client_id') . ' = ' . (int) $clientId);
+		}
+
+		if ($folder != '' && in_array($type, array('plugin', 'library', '')))
+		{
+			$query->where($db->quoteName('u.folder') . ' = ' . $db->quote($folder == '*' ? '' : $folder));
+		}
+
+		if ($extensionId)
+		{
+			$query->where($db->quoteName('u.extension_id') . ' = ' . $db->quote((int) $extensionId));
+		}
+		else
+		{
+			$query->where($db->quoteName('u.extension_id') . ' != ' . $db->quote(0))
+				->where($db->quoteName('u.extension_id') . ' != ' . $db->quote(700));
+		}
+
+		// Process search filter.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'eid:') !== false)
+			{
+				$query->where($db->quoteName('u.extension_id') . ' = ' . (int) substr($search, 4));
+			}
+			else
+			{
+				if (stripos($search, 'uid:') !== false)
+				{
+					$query->where($db->quoteName('u.update_site_id') . ' = ' . (int) substr($search, 4));
+				}
+				elseif (stripos($search, 'id:') !== false)
+				{
+					$query->where($db->quoteName('u.update_id') . ' = ' . (int) substr($search, 3));
+				}
+				else
+				{
+					$query->where($db->quoteName('u.name') . ' LIKE ' . $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true)) . '%'));
+				}
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Translate a list of objects
+	 *
+	 * @param   array  $items  The array of objects
+	 *
+	 * @return  array The array of translated objects
+	 *
+	 * @since   3.5
+	 */
+	protected function translate(&$items)
+	{
+		foreach ($items as &$item)
+		{
+			$item->client_translated  = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE');
+			$manifest                 = json_decode($item->manifest_cache);
+			$item->current_version    = isset($manifest->version) ? $manifest->version : JText::_('JLIB_UNKNOWN');
+			$item->type_translated    = JText::_('COM_INSTALLER_TYPE_' . strtoupper($item->type));
+			$item->folder_translated  = $item->folder ?: JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE');
+			$item->install_type       = $item->extension_id ? JText::_('COM_INSTALLER_MSG_UPDATE_UPDATE') : JText::_('COM_INSTALLER_NEW_INSTALL');
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Returns an object list
+	 *
+	 * @param   string  $query       The query
+	 * @param   int     $limitstart  Offset
+	 * @param   int     $limit       The number of records
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$db = $this->getDbo();
+		$listOrder = $this->getState('list.ordering', 'u.name');
+		$listDirn  = $this->getState('list.direction', 'asc');
+
+		// Process ordering.
+		if (in_array($listOrder, array('client_translated', 'folder_translated', 'type_translated')))
+		{
+			$db->setQuery($query);
+			$result = $db->loadObjectList();
+			$this->translate($result);
+			$result = ArrayHelper::sortObjects($result, $listOrder, strtolower($listDirn) === 'desc' ? -1 : 1, true, true);
+			$total = count($result);
+
+			if ($total < $limitstart)
+			{
+				$limitstart = 0;
+				$this->setState('list.start', 0);
+			}
+
+			return array_slice($result, $limitstart, $limit ?: null);
+		}
+		else
+		{
+			$query->order($db->quoteName($listOrder) . ' ' . $db->escape($listDirn));
+
+			$result = parent::_getList($query, $limitstart, $limit);
+			$this->translate($result);
+
+			return $result;
+		}
+	}
+
+	/**
+	 * Get the count of disabled update sites
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.4
+	 */
+	public function getDisabledUpdateSites()
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from($db->quoteName('#__update_sites'))
+			->where($db->quoteName('enabled') . ' = 0');
+
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Finds updates for an extension.
+	 *
+	 * @param   int  $eid                Extension identifier to look for
+	 * @param   int  $cache_timeout      Cache timout
+	 * @param   int  $minimum_stability  Minimum stability for updates {@see JUpdater} (0=dev, 1=alpha, 2=beta, 3=rc, 4=stable)
+	 *
+	 * @return  boolean Result
+	 *
+	 * @since   1.6
+	 */
+	public function findUpdates($eid = 0, $cache_timeout = 0, $minimum_stability = JUpdater::STABILITY_STABLE)
+	{
+		// Purge the updates list
+		$this->purge();
+
+		JUpdater::getInstance()->findUpdates($eid, $cache_timeout, $minimum_stability);
+
+		return true;
+	}
+
+	/**
+	 * Removes all of the updates from the table.
+	 *
+	 * @return  boolean result of operation
+	 *
+	 * @since   1.6
+	 */
+	public function purge()
+	{
+		$db = $this->getDbo();
+
+		// Note: TRUNCATE is a DDL operation
+		// This may or may not mean depending on your database
+		$db->setQuery('TRUNCATE TABLE #__updates');
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$this->_message = JText::_('JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES');
+
+			return false;
+		}
+
+		// Reset the last update check timestamp
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__update_sites'))
+			->set($db->quoteName('last_check_timestamp') . ' = ' . $db->quote(0));
+		$db->setQuery($query);
+		$db->execute();
+		$this->_message = JText::_('JLIB_INSTALLER_PURGED_UPDATES');
+
+		return true;
+	}
+
+	/**
+	 * Enables any disabled rows in #__update_sites table
+	 *
+	 * @return  boolean result of operation
+	 *
+	 * @since   1.6
+	 */
+	public function enableSites()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__update_sites'))
+			->set($db->quoteName('enabled') . ' = 1')
+			->where($db->quoteName('enabled') . ' = 0');
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$this->_message .= JText::_('COM_INSTALLER_FAILED_TO_ENABLE_UPDATES');
+
+			return false;
+		}
+
+		if ($rows = $db->getAffectedRows())
+		{
+			$this->_message .= JText::plural('COM_INSTALLER_ENABLED_UPDATES', $rows);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Update function.
+	 *
+	 * Sets the "result" state with the result of the operation.
+	 *
+	 * @param   array  $uids               Array[int] List of updates to apply
+	 * @param   int    $minimum_stability  The minimum allowed stability for installed updates {@see JUpdater}
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function update($uids, $minimum_stability = JUpdater::STABILITY_STABLE)
+	{
+		$result = true;
+
+		foreach ($uids as $uid)
+		{
+			$update = new JUpdate;
+			$instance = JTable::getInstance('update');
+			$instance->load($uid);
+			$update->loadFromXml($instance->detailsurl, $minimum_stability);
+			$update->set('extra_query', $instance->extra_query);
+
+			$this->preparePreUpdate($update, $instance);
+
+			// Install sets state and enqueues messages
+			$res = $this->install($update);
+
+			if ($res)
+			{
+				$instance->delete($uid);
+			}
+
+			$result = $res & $result;
+		}
+
+		// Clear the cached extension data and menu cache
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+		$this->cleanCache('com_modules', 0);
+		$this->cleanCache('com_modules', 1);
+		$this->cleanCache('com_plugins', 0);
+		$this->cleanCache('com_plugins', 1);
+		$this->cleanCache('mod_menu', 0);
+		$this->cleanCache('mod_menu', 1);
+
+		// Set the final state
+		$this->setState('result', $result);
+	}
+
+	/**
+	 * Handles the actual update installation.
+	 *
+	 * @param   JUpdate  $update  An update definition
+	 *
+	 * @return  boolean   Result of install
+	 *
+	 * @since   1.6
+	 */
+	private function install($update)
+	{
+		$app = JFactory::getApplication();
+
+		if (!isset($update->get('downloadurl')->_data))
+		{
+			JError::raiseWarning('', JText::_('COM_INSTALLER_INVALID_EXTENSION_UPDATE'));
+
+			return false;
+		}
+
+		$url     = $update->downloadurl->_data;
+		$sources = $update->get('downloadSources', array());
+
+		if ($extra_query = $update->get('extra_query'))
+		{
+			$url .= (strpos($url, '?') === false) ? '?' : '&amp;';
+			$url .= $extra_query;
+		}
+
+		$mirror = 0;
+
+		while (!($p_file = JInstallerHelper::downloadPackage($url)) && isset($sources[$mirror]))
+		{
+			$name = $sources[$mirror];
+			$url  = $name->url;
+
+			if ($extra_query)
+			{
+				$url .= (strpos($url, '?') === false) ? '?' : '&amp;';
+				$url .= $extra_query;
+			}
+
+			$mirror++;
+		}
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			JError::raiseWarning('', JText::sprintf('COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED', $url));
+
+			return false;
+		}
+
+		$config   = JFactory::getConfig();
+		$tmp_dest = $config->get('tmp_path');
+
+		// Unpack the downloaded package file
+		$package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file);
+
+		// Get an installer instance
+		$installer = JInstaller::getInstance();
+		$update->set('type', $package['type']);
+
+		// Install the package
+		if (!$installer->update($package['dir']))
+		{
+			// There was an error updating the package
+			$msg    = JText::sprintf('COM_INSTALLER_MSG_UPDATE_ERROR', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
+			$result = false;
+		}
+		else
+		{
+			// Package updated successfully
+			$msg    = JText::sprintf('COM_INSTALLER_MSG_UPDATE_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
+			$result = true;
+		}
+
+		// Quick change
+		$this->type = $package['type'];
+
+		// Set some model state values
+		$app->enqueueMessage($msg);
+
+		// TODO: Reconfigure this code when you have more battery life left
+		$this->setState('name', $installer->get('name'));
+		$this->setState('result', $result);
+		$app->setUserState('com_installer.message', $installer->message);
+		$app->setUserState('com_installer.extension_message', $installer->get('extension_message'));
+
+		// Cleanup the install files
+		if (!is_file($package['packagefile']))
+		{
+			$config = JFactory::getConfig();
+			$package['packagefile'] = $config->get('tmp_path') . '/' . $package['packagefile'];
+		}
+
+		JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since	2.5.2
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		JForm::addFormPath(JPATH_COMPONENT . '/models/forms');
+		JForm::addFieldPath(JPATH_COMPONENT . '/models/fields');
+		$form = JForm::getInstance('com_installer.update', 'update', array('load_data' => $loadData));
+
+		// Check for an error.
+		if ($form == false)
+		{
+			$this->setError($form->getMessage());
+
+			return false;
+		}
+
+		// Check the session for previously entered form data.
+		$data = $this->loadFormData();
+
+		// Bind the form data if present.
+		if (!empty($data))
+		{
+			$form->bind($data);
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since	2.5.2
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState($this->context, array());
+
+		return $data;
+	}
+
+	/**
+	 * Method to add parameters to the update
+	 *
+	 * @param   JUpdate       $update  An update definition
+	 * @param   JTableUpdate  $table   The update instance from the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function preparePreUpdate($update, $table)
+	{
+		jimport('joomla.filesystem.file');
+
+		switch ($table->type)
+		{
+			// Components could have a helper which adds additional data
+			case 'component':
+				$ename = str_replace('com_', '', $table->element);
+				$fname = $ename . '.php';
+				$cname = ucfirst($ename) . 'Helper';
+
+				$path = JPATH_ADMINISTRATOR . '/components/' . $table->element . '/helpers/' . $fname;
+
+				if (JFile::exists($path))
+				{
+					require_once $path;
+
+					if (class_exists($cname) && is_callable(array($cname, 'prepareUpdate')))
+					{
+						call_user_func_array(array($cname, 'prepareUpdate'), array(&$update, &$table));
+					}
+				}
+
+				break;
+
+			// Modules could have a helper which adds additional data
+			case 'module':
+				$cname = str_replace('_', '', $table->element) . 'Helper';
+				$path = ($table->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/modules/' . $table->element . '/helper.php';
+
+				if (JFile::exists($path))
+				{
+					require_once $path;
+
+					if (class_exists($cname) && is_callable(array($cname, 'prepareUpdate')))
+					{
+						call_user_func_array(array($cname, 'prepareUpdate'), array(&$update, &$table));
+					}
+				}
+
+				break;
+
+			// If we have a plugin, we can use the plugin trigger "onInstallerBeforePackageDownload"
+			// But we should make sure, that our plugin is loaded, so we don't need a second "installer" plugin
+			case 'plugin':
+				$cname = str_replace('plg_', '', $table->element);
+				JPluginHelper::importPlugin($table->folder, $cname);
+				break;
+		}
+	}
+}
diff --git a/core/administrator/components/com_installer/models/updatesites.php b/core/administrator/components/com_installer/models/updatesites.php
new file mode 100644
index 00000000..d8097ace
--- /dev/null
+++ b/core/administrator/components/com_installer/models/updatesites.php
@@ -0,0 +1,472 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerModel', __DIR__ . '/extension.php');
+
+/**
+ * Installer Update Sites Model
+ *
+ * @since  3.4
+ */
+class InstallerModelUpdatesites extends InstallerModel
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.4
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'update_site_name',
+				'name',
+				'client_id',
+				'client', 'client_translated',
+				'status',
+				'type', 'type_translated',
+				'folder', 'folder_translated',
+				'update_site_id',
+				'enabled',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function populateState($ordering = 'name', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.client_id', $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', null, 'int'));
+		$this->setState('filter.enabled', $this->getUserStateFromRequest($this->context . '.filter.enabled', 'filter_enabled', '', 'string'));
+		$this->setState('filter.type', $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'string'));
+		$this->setState('filter.folder', $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', '', 'string'));
+
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Enable/Disable an extension.
+	 *
+	 * @param   array  $eid    Extension ids to un/publish
+	 * @param   int    $value  Publish value
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.4
+	 *
+	 * @throws  Exception on ACL error
+	 */
+	public function publish(&$eid = array(), $value = 1)
+	{
+		if (!JFactory::getUser()->authorise('core.edit.state', 'com_installer'))
+		{
+			throw new Exception(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 403);
+		}
+
+		$result = true;
+
+		// Ensure eid is an array of extension ids
+		if (!is_array($eid))
+		{
+			$eid = array($eid);
+		}
+
+		// Get a table object for the extension type
+		$table = JTable::getInstance('Updatesite');
+
+		// Enable the update site in the table and store it in the database
+		foreach ($eid as $i => $id)
+		{
+			$table->load($id);
+			$table->enabled = $value;
+
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+				$result = false;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Deletes an update site.
+	 *
+	 * @param   array  $ids  Extension ids to delete.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 *
+	 * @throws  Exception on ACL error
+	 */
+	public function delete($ids = array())
+	{
+		if (!JFactory::getUser()->authorise('core.delete', 'com_installer'))
+		{
+			throw new Exception(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 403);
+		}
+
+		// Ensure eid is an array of extension ids
+		if (!is_array($ids))
+		{
+			$ids = array($ids);
+		}
+
+		$db  = JFactory::getDbo();
+		$app = JFactory::getApplication();
+
+		$count = 0;
+
+		// Gets the update site names.
+		$query = $db->getQuery(true)
+			->select($db->qn(array('update_site_id', 'name')))
+			->from($db->qn('#__update_sites'))
+			->where($db->qn('update_site_id') . ' IN (' . implode(', ', $ids) . ')');
+		$db->setQuery($query);
+		$updateSitesNames = $db->loadObjectList('update_site_id');
+
+		// Gets Joomla core update sites Ids.
+		$joomlaUpdateSitesIds = $this->getJoomlaUpdateSitesIds(0);
+
+		// Enable the update site in the table and store it in the database
+		foreach ($ids as $i => $id)
+		{
+			// Don't allow to delete Joomla Core update sites.
+			if (in_array((int) $id, $joomlaUpdateSitesIds))
+			{
+				$app->enqueueMessage(JText::sprintf('COM_INSTALLER_MSG_UPDATESITES_DELETE_CANNOT_DELETE', $updateSitesNames[$id]->name), 'error');
+				continue;
+			}
+
+			// Delete the update site from all tables.
+			try
+			{
+				$query = $db->getQuery(true)
+					->delete($db->qn('#__update_sites'))
+					->where($db->qn('update_site_id') . ' = ' . (int) $id);
+				$db->setQuery($query);
+				$db->execute();
+
+				$query = $db->getQuery(true)
+					->delete($db->qn('#__update_sites_extensions'))
+					->where($db->qn('update_site_id') . ' = ' . (int) $id);
+				$db->setQuery($query);
+				$db->execute();
+
+				$query = $db->getQuery(true)
+					->delete($db->qn('#__updates'))
+					->where($db->qn('update_site_id') . ' = ' . (int) $id);
+				$db->setQuery($query);
+				$db->execute();
+
+				$count++;
+			}
+			catch (RuntimeException $e)
+			{
+				$app->enqueueMessage(JText::sprintf('COM_INSTALLER_MSG_UPDATESITES_DELETE_ERROR', $updateSitesNames[$id]->name, $e->getMessage()), 'error');
+			}
+		}
+
+		if ($count > 0)
+		{
+			$app->enqueueMessage(JText::plural('COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED', $count), 'message');
+		}
+	}
+
+	/**
+	 * Rebuild update sites tables.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 *
+	 * @throws  Exception on ACL error
+	 */
+	public function rebuild()
+	{
+		if (!JFactory::getUser()->authorise('core.admin', 'com_installer'))
+		{
+			throw new Exception(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_NOT_PERMITTED'), 403);
+		}
+
+		$db  = JFactory::getDbo();
+		$app = JFactory::getApplication();
+
+		// Check if Joomla Extension plugin is enabled.
+		if (!JPluginHelper::isEnabled('extension', 'joomla'))
+		{
+			$query = $db->getQuery(true)
+				->select($db->quoteName('extension_id'))
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('joomla'))
+				->where($db->quoteName('folder') . ' = ' . $db->quote('extension'));
+			$db->setQuery($query);
+
+			$pluginId = (int) $db->loadResult();
+
+			$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . $pluginId);
+			$app->enqueueMessage(JText::sprintf('COM_INSTALLER_MSG_UPDATESITES_REBUILD_EXTENSION_PLUGIN_NOT_ENABLED', $link), 'error');
+
+			return;
+		}
+
+		$clients               = array(JPATH_SITE, JPATH_ADMINISTRATOR);
+		$extensionGroupFolders = array('components', 'modules', 'plugins', 'templates', 'language', 'manifests');
+
+		$pathsToSearch = array();
+
+		// Identifies which folders to search for manifest files.
+		foreach ($clients as $clientPath)
+		{
+			foreach ($extensionGroupFolders as $extensionGroupFolderName)
+			{
+				// Components, modules, plugins, templates, languages and manifest (files, libraries, etc)
+				if ($extensionGroupFolderName != 'plugins')
+				{
+					foreach (glob($clientPath . '/' . $extensionGroupFolderName . '/*', GLOB_NOSORT | GLOB_ONLYDIR) as $extensionFolderPath)
+					{
+						$pathsToSearch[] = $extensionFolderPath;
+					}
+				}
+
+				// Plugins (another directory level is needed)
+				else
+				{
+					foreach (glob($clientPath . '/' . $extensionGroupFolderName . '/*', GLOB_NOSORT | GLOB_ONLYDIR) as $pluginGroupFolderPath)
+					{
+						foreach (glob($pluginGroupFolderPath . '/*', GLOB_NOSORT | GLOB_ONLYDIR) as $extensionFolderPath)
+						{
+							$pathsToSearch[] = $extensionFolderPath;
+						}
+					}
+				}
+			}
+		}
+
+		// Gets Joomla core update sites Ids.
+		$joomlaUpdateSitesIds = implode(', ', $this->getJoomlaUpdateSitesIds(0));
+
+		// Delete from all tables (except joomla core update sites).
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__update_sites'))
+			->where($db->quoteName('update_site_id') . ' NOT IN (' . $joomlaUpdateSitesIds . ')');
+		$db->setQuery($query);
+		$db->execute();
+
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__update_sites_extensions'))
+			->where($db->quoteName('update_site_id') . ' NOT IN (' . $joomlaUpdateSitesIds . ')');
+		$db->setQuery($query);
+		$db->execute();
+
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__updates'))
+			->where($db->quoteName('update_site_id') . ' NOT IN (' . $joomlaUpdateSitesIds . ')');
+		$db->setQuery($query);
+		$db->execute();
+
+		$count = 0;
+
+		// Gets Joomla core extension Ids.
+		$joomlaCoreExtensionIds = implode(', ', $this->getJoomlaUpdateSitesIds(1));
+
+		// Search for updateservers in manifest files inside the folders to search.
+		foreach ($pathsToSearch as $extensionFolderPath)
+		{
+			$tmpInstaller = new JInstaller;
+
+			$tmpInstaller->setPath('source', $extensionFolderPath);
+
+			// Main folder manifests (higher priority)
+			$parentXmlfiles = JFolder::files($tmpInstaller->getPath('source'), '.xml$', false, true);
+
+			// Search for children manifests (lower priority)
+			$allXmlFiles    = JFolder::files($tmpInstaller->getPath('source'), '.xml$', 1, true);
+
+			// Create an unique array of files ordered by priority
+			$xmlfiles = array_unique(array_merge($parentXmlfiles, $allXmlFiles));
+
+			if (!empty($xmlfiles))
+			{
+				foreach ($xmlfiles as $file)
+				{
+					// Is it a valid Joomla installation manifest file?
+					$manifest = $tmpInstaller->isManifest($file);
+
+					if (!is_null($manifest))
+					{
+						// Search if the extension exists in the extensions table. Excluding joomla core extensions (id < 10000) and discovered extensions.
+						$query = $db->getQuery(true)
+							->select($db->quoteName('extension_id'))
+							->from($db->quoteName('#__extensions'))
+							->where('(' 
+								. $db->quoteName('name') . ' = ' . $db->quote($manifest->name) 
+								. ' OR ' . $db->quoteName('name') . ' = ' . $db->quote($manifest->packagename) 
+								. ')' )
+							->where($db->quoteName('type') . ' = ' . $db->quote($manifest['type']))
+							->where($db->quoteName('extension_id') . ' NOT IN (' . $joomlaCoreExtensionIds . ')')
+							->where($db->quoteName('state') . ' != -1');
+						$db->setQuery($query);
+
+						$eid = (int) $db->loadResult();
+
+						if ($eid && $manifest->updateservers)
+						{
+							// Set the manifest object and path
+							$tmpInstaller->manifest = $manifest;
+							$tmpInstaller->setPath('manifest', $file);
+
+							// Load the extension plugin (if not loaded yet).
+							JPluginHelper::importPlugin('extension', 'joomla');
+
+							// Fire the onExtensionAfterUpdate
+							JEventDispatcher::getInstance()->trigger('onExtensionAfterUpdate', array('installer' => $tmpInstaller, 'eid' => $eid));
+
+							$count++;
+						}
+					}
+				}
+			}
+		}
+
+		if ($count > 0)
+		{
+			$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS'), 'message');
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE'), 'message');
+		}
+	}
+
+	/**
+	 * Fetch the Joomla update sites ids.
+	 *
+	 * @param   integer  $column  Column to return. 0 for update site ids, 1 for extension ids.
+	 *
+	 * @return  array  Array with joomla core update site ids.
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getJoomlaUpdateSitesIds($column = 0)
+	{
+		$db  = JFactory::getDbo();
+
+		// Fetch the Joomla core update sites ids and their extension ids. We search for all except the core joomla extension with update sites.
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('use.update_site_id', 'e.extension_id')))
+			->from($db->quoteName('#__update_sites_extensions', 'use'))
+			->join('LEFT', $db->quoteName('#__update_sites', 'us') . ' ON ' . $db->qn('us.update_site_id') . ' = ' . $db->qn('use.update_site_id'))
+			->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON ' . $db->qn('e.extension_id') . ' = ' . $db->qn('use.extension_id'))
+			->where('('
+				. '(' . $db->qn('e.type') . ' = ' . $db->quote('file') . ' AND ' . $db->qn('e.element') . ' = ' . $db->quote('joomla') . ')'
+				. ' OR (' . $db->qn('e.type') . ' = ' . $db->quote('package') . ' AND ' . $db->qn('e.element') . ' = ' . $db->quote('pkg_en-GB') . ')'
+				. ' OR (' . $db->qn('e.type') . ' = ' . $db->quote('component') . ' AND ' . $db->qn('e.element') . ' = ' . $db->quote('com_joomlaupdate') . ')'
+				. ')'
+			);
+
+		$db->setQuery($query);
+
+		return $db->loadColumn($column);
+	}
+
+	/**
+	 * Method to get the database query
+	 *
+	 * @return  JDatabaseQuery  The database query
+	 *
+	 * @since   3.4
+	 */
+	protected function getListQuery()
+	{
+		$query = JFactory::getDbo()->getQuery(true)
+			->select(
+				array(
+					's.update_site_id',
+					's.name AS update_site_name',
+					's.type AS update_site_type',
+					's.location',
+					's.enabled',
+					'e.extension_id',
+					'e.name',
+					'e.type',
+					'e.element',
+					'e.folder',
+					'e.client_id',
+					'e.state',
+					'e.manifest_cache',
+				)
+			)
+			->from('#__update_sites AS s')
+			->innerJoin('#__update_sites_extensions AS se ON (se.update_site_id = s.update_site_id)')
+			->innerJoin('#__extensions AS e ON (e.extension_id = se.extension_id)')
+			->where('state = 0');
+
+		// Process select filters.
+		$enabled  = $this->getState('filter.enabled');
+		$type     = $this->getState('filter.type');
+		$clientId = $this->getState('filter.client_id');
+		$folder   = $this->getState('filter.folder');
+
+		if ($enabled != '')
+		{
+			$query->where('s.enabled = ' . (int) $enabled);
+		}
+
+		if ($type)
+		{
+			$query->where('e.type = ' . $this->_db->quote($type));
+		}
+
+		if ($clientId != '')
+		{
+			$query->where('e.client_id = ' . (int) $clientId);
+		}
+
+		if ($folder != '' && in_array($type, array('plugin', 'library', '')))
+		{
+			$query->where('e.folder = ' . $this->_db->quote($folder == '*' ? '' : $folder));
+		}
+
+		// Process search filter (update site id).
+		$search = $this->getState('filter.search');
+
+		if (!empty($search) && stripos($search, 'id:') === 0)
+		{
+			$query->where('s.update_site_id = ' . (int) substr($search, 3));
+		}
+
+		// Note: The search for name, ordering and pagination are processed by the parent InstallerModel class (in extension.php).
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_installer/models/warnings.php b/core/administrator/components/com_installer/models/warnings.php
new file mode 100644
index 00000000..6f7856a6
--- /dev/null
+++ b/core/administrator/components/com_installer/models/warnings.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Installer Warnings Model
+ *
+ * @since  1.6
+ */
+class InstallerModelWarnings extends JModelList
+{
+	/**
+	 * Extension Type
+	 * @var	string
+	 */
+	public $type = 'warnings';
+
+	/**
+	 * Return the byte value of a particular string.
+	 *
+	 * @param   string  $val  String optionally with G, M or K suffix
+	 *
+	 * @return  integer   size in bytes
+	 *
+	 * @since 1.6
+	 */
+	public function return_bytes($val)
+	{
+		if (empty($val))
+		{
+			return 0;
+		}
+
+		$val = trim($val);
+
+		preg_match('#([0-9]+)[\s]*([a-z]+)#i', $val, $matches);
+
+		$last = '';
+
+		if (isset($matches[2]))
+		{
+			$last = $matches[2];
+		}
+
+		if (isset($matches[1]))
+		{
+			$val = (int) $matches[1];
+		}
+
+		switch (strtolower($last))
+		{
+			case 'g':
+			case 'gb':
+				$val *= 1024;
+			case 'm':
+			case 'mb':
+				$val *= 1024;
+			case 'k':
+			case 'kb':
+				$val *= 1024;
+		}
+
+		return (int) $val;
+	}
+
+	/**
+	 * Load the data.
+	 *
+	 * @return  array  Messages
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		static $messages;
+
+		if ($messages)
+		{
+			return $messages;
+		}
+
+		$messages = array();
+		$file_uploads = ini_get('file_uploads');
+
+		if (!$file_uploads)
+		{
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC'));
+		}
+
+		$upload_dir = ini_get('upload_tmp_dir');
+
+		if (!$upload_dir)
+		{
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC'));
+		}
+		else
+		{
+			if (!is_writeable($upload_dir))
+			{
+				$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE'),
+						'description' => JText::sprintf('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC', $upload_dir));
+			}
+		}
+
+		$config = JFactory::getConfig();
+		$tmp_path = $config->get('tmp_path');
+
+		if (!$tmp_path)
+		{
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC'));
+		}
+		else
+		{
+			if (!is_writeable($tmp_path))
+			{
+				$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE'),
+						'description' => JText::sprintf('COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC', $tmp_path));
+			}
+		}
+
+		$memory_limit = $this->return_bytes(ini_get('memory_limit'));
+
+		if ($memory_limit < (8 * 1024 * 1024) && $memory_limit != -1)
+		{
+			// 8MB
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC'));
+		}
+		elseif ($memory_limit < (16 * 1024 * 1024) && $memory_limit != -1)
+		{
+			// 16MB
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC'));
+		}
+
+		$post_max_size = $this->return_bytes(ini_get('post_max_size'));
+		$upload_max_filesize = $this->return_bytes(ini_get('upload_max_filesize'));
+
+		if ($post_max_size < $upload_max_filesize)
+		{
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC'));
+		}
+
+		if ($post_max_size < (8 * 1024 * 1024)) // 8MB
+		{
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC'));
+		}
+
+		if ($upload_max_filesize < (8 * 1024 * 1024)) // 8MB
+		{
+			$messages[] = array('message' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'),
+					'description' => JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC'));
+		}
+
+		return $messages;
+	}
+}
diff --git a/core/administrator/components/com_installer/views/database/tmpl/default.php b/core/administrator/components/com_installer/views/database/tmpl/default.php
new file mode 100644
index 00000000..ee591b46
--- /dev/null
+++ b/core/administrator/components/com_installer/views/database/tmpl/default.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div id="installer-database" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=database'); ?>" method="post" name="adminForm" id="adminForm">
+
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+		<?php if ($this->errorCount === 0) : ?>
+			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'other')); ?>
+		<?php else : ?>
+			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'problems')); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'problems', JText::plural('COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL', $this->errorCount)); ?>
+				<fieldset class="panelform">
+					<ul>
+						<?php if (!$this->filterParams) : ?>
+							<li><?php echo JText::_('COM_INSTALLER_MSG_DATABASE_FILTER_ERROR'); ?></li>
+						<?php endif; ?>
+
+						<?php if ($this->schemaVersion != $this->changeSet->getSchema()) : ?>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR', $this->schemaVersion, $this->changeSet->getSchema()); ?></li>
+						<?php endif; ?>
+
+						<?php if (version_compare($this->updateVersion, JVERSION) != 0) : ?>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_UPDATEVERSION_ERROR', $this->updateVersion, JVERSION); ?></li>
+						<?php endif; ?>
+
+						<?php foreach ($this->errors as $line => $error) : ?>
+							<?php $key = 'COM_INSTALLER_MSG_DATABASE_' . $error->queryType;
+							$msgs = $error->msgElements;
+							$file = basename($error->file);
+							$msg0 = isset($msgs[0]) ? $msgs[0] : ' ';
+							$msg1 = isset($msgs[1]) ? $msgs[1] : ' ';
+							$msg2 = isset($msgs[2]) ? $msgs[2] : ' ';
+							$message = JText::sprintf($key, $file, $msg0, $msg1, $msg2); ?>
+							<li><?php echo $message; ?></li>
+						<?php endforeach; ?>
+					</ul>
+				</fieldset>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'other', JText::_('COM_INSTALLER_MSG_DATABASE_INFO')); ?>
+				<div class="control-group" >
+					<fieldset class="panelform">
+						<ul>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION', $this->schemaVersion); ?></li>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_UPDATE_VERSION', $this->updateVersion); ?></li>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_DRIVER', JFactory::getDbo()->name); ?></li>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_CHECKED_OK', count($this->results['ok'])); ?></li>
+							<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SKIPPED', count($this->results['skipped'])); ?></li>
+						</ul>
+					</fieldset>
+				</div>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/database/tmpl/default.xml b/core/administrator/components/com_installer/views/database/tmpl/default.xml
new file mode 100755
index 00000000..c0285983
--- /dev/null
+++ b/core/administrator/components/com_installer/views/database/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_DATABASE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_DATABASE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/database/view.html.php b/core/administrator/components/com_installer/views/database/view.html.php
new file mode 100644
index 00000000..392f3dc0
--- /dev/null
+++ b/core/administrator/components/com_installer/views/database/view.html.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Database View
+ *
+ * @since  1.6
+ */
+class InstallerViewDatabase extends InstallerViewDefault
+{
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		// Set variables
+		$app = JFactory::getApplication();
+
+		// Get data from the model.
+		$this->state = $this->get('State');
+		$this->changeSet = $this->get('Items');
+		$this->errors = $this->changeSet->check();
+		$this->results = $this->changeSet->getStatus();
+		$this->schemaVersion = $this->get('SchemaVersion');
+		$this->updateVersion = $this->get('UpdateVersion');
+		$this->filterParams  = $this->get('DefaultTextFilters');
+		$this->schemaVersion = $this->schemaVersion ?: JText::_('JNONE');
+		$this->updateVersion = $this->updateVersion ?: JText::_('JNONE');
+		$this->pagination = $this->get('Pagination');
+		$this->errorCount = count($this->errors);
+
+		if ($this->schemaVersion != $this->changeSet->getSchema())
+		{
+			$this->errorCount++;
+		}
+
+		if (!$this->filterParams)
+		{
+			$this->errorCount++;
+		}
+
+		if (version_compare($this->updateVersion, JVERSION) != 0)
+		{
+			$this->errorCount++;
+		}
+
+		if ($this->errorCount === 0)
+		{
+			$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DATABASE_OK'), 'notice');
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_INSTALLER_MSG_DATABASE_ERRORS'), 'warning');
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		/*
+		 * Set toolbar items for the page.
+		 */
+		JToolbarHelper::custom('database.fix', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DATABASE_FIX', false);
+		JToolbarHelper::divider();
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE');
+	}
+}
diff --git a/core/administrator/components/com_installer/views/default/tmpl/default_ftp.php b/core/administrator/components/com_installer/views/default/tmpl/default_ftp.php
new file mode 100644
index 00000000..30b834db
--- /dev/null
+++ b/core/administrator/components/com_installer/views/default/tmpl/default_ftp.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset title="<?php echo JText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?>">
+	<legend><?php echo JText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
+
+	<?php echo JText::_('COM_INSTALLER_MSG_DESCFTP'); ?>
+
+	<?php if ($this->ftp instanceof Exception) : ?>
+		<p><?php echo JText::_($this->ftp->getMessage()); ?></p>
+	<?php endif; ?>
+
+	<table class="adminform">
+		<tbody>
+			<tr>
+				<td width="120">
+					<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+				</td>
+				<td>
+					<input type="text" id="username" name="username" class="input_box" size="70" value="" />
+				</td>
+			</tr>
+			<tr>
+				<td width="120">
+					<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+				</td>
+				<td>
+					<input type="password" id="password" name="password" class="input_box" size="70" value="" />
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+</fieldset>
diff --git a/core/administrator/components/com_installer/views/default/tmpl/default_message.php b/core/administrator/components/com_installer/views/default/tmpl/default_message.php
new file mode 100644
index 00000000..ed015443
--- /dev/null
+++ b/core/administrator/components/com_installer/views/default/tmpl/default_message.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$state    = $this->get('State');
+$message1 = $state->get('message');
+$message2 = $state->get('extension_message');
+?>
+
+<?php if ($message1) : ?>
+	<div class="row-fluid"> 
+		<div class="span12"> 
+			<strong><?php echo $message1; ?></strong>
+		</div>
+	</div> 
+<?php endif; ?> 
+<?php if ($message2) : ?> 
+	<div class="row-fluid">
+		<div class="span12"> 
+			<?php echo $message2; ?>
+		</div> 
+	</div>
+<?php endif; ?>
diff --git a/core/administrator/components/com_installer/views/default/view.php b/core/administrator/components/com_installer/views/default/view.php
new file mode 100644
index 00000000..a95d5cac
--- /dev/null
+++ b/core/administrator/components/com_installer/views/default/view.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Extension Manager Default View
+ *
+ * @since  1.5
+ */
+class InstallerViewDefault extends JViewLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  Configuration array
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($config = null)
+	{
+		$app = JFactory::getApplication();
+		parent::__construct($config);
+		$this->_addPath('template', $this->_basePath . '/views/default/tmpl');
+		$this->_addPath('template', JPATH_THEMES . '/' . $app->getTemplate() . '/html/com_installer/default');
+	}
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		// Get data from the model.
+		$state = $this->get('State');
+
+		// Are there messages to display?
+		$showMessage = false;
+
+		if (is_object($state))
+		{
+			$message1    = $state->get('message');
+			$message2    = $state->get('extension_message');
+			$showMessage = ($message1 || $message2);
+		}
+
+		$this->showMessage = $showMessage;
+		$this->state       = &$state;
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_installer');
+		JToolbarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install');
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_installer');
+			JToolbarHelper::divider();
+		}
+
+		// Render side bar.
+		$this->sidebar = JHtmlSidebar::render();
+	}
+}
diff --git a/core/administrator/components/com_installer/views/discover/tmpl/default.php b/core/administrator/components/com_installer/views/discover/tmpl/default.php
new file mode 100644
index 00000000..164e4da3
--- /dev/null
+++ b/core/administrator/components/com_installer/views/discover/tmpl/default.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div id="installer-discover" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=discover'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+		<?php else : ?>
+		<div id="j-main-container">
+		<?php endif; ?>
+			<?php if ($this->showMessage) : ?>
+				<?php echo $this->loadTemplate('message'); ?>
+			<?php endif; ?>
+			<?php if ($this->ftp) : ?>
+				<?php echo $this->loadTemplate('ftp'); ?>
+			<?php endif; ?>
+			<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+			<div class="clearfix"></div>
+			<div class="alert alert-no-items alert-info">
+				<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
+			</div>
+			<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+			<?php else : ?>
+
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_TYPE', 'type_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="hidden-phone">
+							<?php echo JText::_('JVERSION'); ?>
+						</th>
+						<th width="10%" class="hidden-phone hidden-tablet">
+							<?php echo JText::_('JDATE'); ?>
+						</th>
+						<th width="15%" class="hidden-phone hidden-tablet">
+							<?php echo JText::_('JAUTHOR'); ?>
+						</th>
+						<th class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9"><?php echo $this->pagination->getListFooter(); ?></td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
+						</td>
+						<td>
+							<label for="cb<?php echo $i;?>">
+								<span class="bold hasTooltip" title="<?php echo JHtml::_('tooltipText', $item->name, $item->description, 0); ?>"><?php echo $item->name; ?></span>
+							</label>
+						</td>
+						<td>
+							<?php echo $item->client_translated; ?>
+						</td>
+						<td>
+							<?php echo $item->type_translated; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo @$item->version != '' ? $item->version : '&#160;'; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_INSTALLER_AUTHOR_INFORMATION'), $item->author_info, 0); ?>">
+								<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
+							</span>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->folder_translated; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->extension_id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php endif; ?>
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/discover/tmpl/default.xml b/core/administrator/components/com_installer/views/discover/tmpl/default.xml
new file mode 100755
index 00000000..350dddaf
--- /dev/null
+++ b/core/administrator/components/com_installer/views/discover/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_DISCOVER_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_DISCOVER_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/discover/tmpl/default_item.php b/core/administrator/components/com_installer/views/discover/tmpl/default_item.php
new file mode 100644
index 00000000..aa3789f7
--- /dev/null
+++ b/core/administrator/components/com_installer/views/discover/tmpl/default_item.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<tr class="<?php echo 'row' . $this->item->index % 2; ?>" <?php echo $this->item->style; ?>>
+	<td>
+			<input type="checkbox" id="cb<?php echo $this->item->index; ?>" name="eid[]" value="<?php echo $this->item->extension_id; ?>" onclick="Joomla.isChecked(this.checked);" <?php echo $this->item->cbd; ?> />
+<!--		<input type="checkbox" id="cb<?php echo $this->item->index; ?>" name="eid" value="<?php echo $this->item->extension_id; ?>" onclick="Joomla.isChecked(this.checked);" <?php echo $this->item->cbd; ?> />-->
+		<span class="bold"><?php echo $this->item->name; ?></span>
+	</td>
+	<td>
+		<?php echo $this->item->type ?>
+	</td>
+	<td class="center">
+		<?php if (!$this->item->element) : ?>
+		<strong>X</strong>
+		<?php else : ?>
+		<a href="index.php?option=com_installer&amp;type=manage&amp;task=<?php echo $this->item->task; ?>&amp;eid[]=<?php echo $this->item->extension_id; ?>&amp;limitstart=<?php echo $this->pagination->limitstart; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"><?php echo JHtml::_('image', 'images/' . $this->item->img, $this->item->alt, array('title' => $this->item->action)); ?></a>
+		<?php endif; ?>
+	</td>
+	<td class="center"><?php echo @$this->item->folder != '' ? $this->item->folder : 'N/A'; ?></td>
+	<td class="center"><?php echo @$this->item->client != '' ? $this->item->client : 'N/A'; ?></td>
+	<td>
+		<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_INSTALLER_AUTHOR_INFORMATION'), $this->item->author_info, 0); ?>">
+			<?php echo @$this->item->author != '' ? $this->item->author : '&#160;'; ?>
+		</span>
+	</td>
+</tr>
diff --git a/core/administrator/components/com_installer/views/discover/view.html.php b/core/administrator/components/com_installer/views/discover/view.html.php
new file mode 100644
index 00000000..906928f6
--- /dev/null
+++ b/core/administrator/components/com_installer/views/discover/view.html.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Discover View
+ *
+ * @since  1.6
+ */
+class InstallerViewDiscover extends InstallerViewDefault
+{
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		// Run discover from the model.
+		if (!$this->checkExtensions())
+		{
+			$this->getModel('discover')->discover();
+		}
+
+		// Get data from the model.
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function addToolbar()
+	{
+		/*
+		 * Set toolbar items for the page.
+		 */
+		JToolbarHelper::custom('discover.install', 'upload', 'upload', 'JTOOLBAR_INSTALL', true);
+		JToolbarHelper::custom('discover.refresh', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DISCOVER', false);
+		JToolbarHelper::divider();
+
+		JHtmlSidebar::setAction('index.php?option=com_installer&view=discover');
+
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER');
+	}
+
+	/**
+	 * Check extensions.
+	 *
+	 * Checks uninstalled extensions in extensions table.
+	 *
+	 * @return  boolean  True if there are discovered extensions on the database.
+	 *
+	 * @since   3.5
+	 */
+	public function checkExtensions()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('state') . ' = -1');
+		$db->setQuery($query);
+		$discoveredExtensions = $db->loadObjectList();
+
+		return (count($discoveredExtensions) === 0) ? false : true;
+	}
+}
diff --git a/core/administrator/components/com_installer/views/install/tmpl/default.php b/core/administrator/components/com_installer/views/install/tmpl/default.php
new file mode 100644
index 00000000..bfc38688
--- /dev/null
+++ b/core/administrator/components/com_installer/views/install/tmpl/default.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// MooTools is loaded for B/C for extensions generating JavaScript in their install scripts, this call will be removed at 4.0
+JHtml::_('behavior.framework', true);
+JHtml::_('bootstrap.tooltip');
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+	Joomla.submitbutton4 = function() {
+		var form = document.getElementById("adminForm");
+
+		// do field validation
+		if (form.install_url.value == "" || form.install_url.value == "http://" || form.install_url.value == "https://") {
+			alert("' . JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true) . '");
+		}
+		else
+		{
+			JoomlaInstaller.showLoading();
+			
+			form.installtype.value = "url";
+			form.submit();
+		}
+	};
+
+	Joomla.submitbuttonInstallWebInstaller = function() {
+		var form = document.getElementById("adminForm");
+		
+		form.install_url.value = "https://appscdn.joomla.org/webapps/jedapps/webinstaller.xml";
+		
+		Joomla.submitbutton4();
+	};
+
+	// Add spindle-wheel for installations:
+	jQuery(document).ready(function($) {
+		var outerDiv = $("#installer-install");
+		
+		JoomlaInstaller.getLoadingOverlay()
+			.css("top", outerDiv.position().top - $(window).scrollTop())
+			.css("left", "0")
+			.css("width", "100%")
+			.css("height", "100%")
+			.css("display", "none")
+			.css("margin-top", "-10px");
+	});
+	
+	var JoomlaInstaller = {
+		getLoadingOverlay: function () {
+			return jQuery("#loading");
+		},
+		showLoading: function () {
+			this.getLoadingOverlay().css("display", "block");
+		},
+		hideLoading: function () {
+			this.getLoadingOverlay().css("display", "none");
+		}
+	};
+	'
+);
+
+JFactory::getDocument()->addStyleDeclaration(
+	'
+	#loading {
+		background: rgba(255, 255, 255, .8) url(\'' . JHtml::_('image', 'jui/ajax-loader.gif', '', null, true, true) . '\') 50% 15% no-repeat;
+		position: fixed;
+		opacity: 0.8;
+		-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 80);
+		filter: alpha(opacity = 80);
+		overflow: hidden;
+	}
+	'
+);
+
+?>
+
+<script type="text/javascript">
+	// Set the first tab to active if there is no other active tab
+	jQuery(document).ready(function($) {
+		var hasTab = function(href){
+			return $('a[data-toggle="tab"]a[href*="' + href + '"]').length;
+		};
+		if (!hasTab(localStorage.getItem('tab-href')))
+		{
+			var tabAnchor = $("#myTabTabs li:first a");
+			window.localStorage.setItem('tab-href', tabAnchor.attr('href'));
+			tabAnchor.click();
+		}
+	});
+</script>
+
+<div id="installer-install" class="clearfix">
+	<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install'); ?>"
+		method="post" name="adminForm" id="adminForm" class="form-horizontal">
+		<?php if (!empty($this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+			<?php else : ?>
+			<div id="j-main-container">
+				<?php endif; ?>
+				<!-- Render messages set by extension install scripts here -->
+				<?php if ($this->showMessage) : ?>
+					<?php echo $this->loadTemplate('message'); ?>
+				<?php elseif ($this->showJedAndWebInstaller) : ?>
+					<div class="alert alert-info j-jed-message"
+						style="margin-bottom: 40px; line-height: 2em; color:#333333;">
+						<?php echo JHtml::_(
+							'link',
+							JRoute::_('index.php?option=com_config&view=component&component=com_installer&path=&return=' . urlencode(base64_encode(JUri::getInstance()))),
+							'<span class="element-invisible">' . str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')) . '</span>',
+							'class="alert-options hasTooltip icon-options" data-dismiss="alert" title="' . str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')) . '"'
+						);
+						?>
+						<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>
+							<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
+						<input class="btn" type="button"
+							value="<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?>"
+							onclick="Joomla.submitbuttonInstallWebInstaller()"/>
+					</div>
+				<?php endif; ?>
+				<?php echo JHtml::_('bootstrap.startTabSet', 'myTab'); ?>
+				<?php // Show installation tabs at the start ?>
+				<?php $firstTab = JEventDispatcher::getInstance()->trigger('onInstallerViewBeforeFirstTab', array()); ?>
+				<?php // Show installation tabs ?>
+				<?php $tabs = JEventDispatcher::getInstance()->trigger('onInstallerAddInstallationTab', array()); ?>
+				<?php foreach ($tabs as $tab) : ?>
+					<?php echo JHtml::_('bootstrap.addTab', 'myTab', $tab['name'], $tab['label']); ?>
+					<fieldset class="uploadform">
+						<?php echo $tab['content']; ?>
+					</fieldset>
+					<?php echo JHtml::_('bootstrap.endTab'); ?>
+				<?php endforeach; ?>
+				<?php // Show installation tabs at the end ?>
+				<?php $lastTab = JEventDispatcher::getInstance()->trigger('onInstallerViewAfterLastTab', array()); ?>
+				<?php $tabs = array_merge($firstTab, $tabs, $lastTab); ?>
+				<?php if (!$tabs) : ?>
+					<?php JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND'), 'warning'); ?>
+				<?php endif; ?>
+
+				<?php if ($this->ftp) : ?>
+					<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'ftp', JText::_('COM_INSTALLER_MSG_DESCFTPTITLE')); ?>
+					<?php echo $this->loadTemplate('ftp'); ?>
+					<?php echo JHtml::_('bootstrap.endTab'); ?>
+				<?php endif; ?>
+
+				<input type="hidden" name="installtype" value=""/>
+				<input type="hidden" name="task" value="install.install"/>
+				<?php echo JHtml::_('form.token'); ?>
+
+				<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+			</div>
+	</form>
+</div>
+<div id="loading"></div>
diff --git a/core/administrator/components/com_installer/views/install/tmpl/default.xml b/core/administrator/components/com_installer/views/install/tmpl/default.xml
new file mode 100755
index 00000000..e6fd86b3
--- /dev/null
+++ b/core/administrator/components/com_installer/views/install/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_INSTALL_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_INSTALL_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/install/view.html.php b/core/administrator/components/com_installer/views/install/view.html.php
new file mode 100644
index 00000000..0fbd0b05
--- /dev/null
+++ b/core/administrator/components/com_installer/views/install/view.html.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Install View
+ *
+ * @since  1.5
+ */
+class InstallerViewInstall extends InstallerViewDefault
+{
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		$paths = new stdClass;
+		$paths->first = '';
+		$state = $this->get('state');
+
+		$this->paths = &$paths;
+		$this->state = &$state;
+
+		$this->showJedAndWebInstaller = JComponentHelper::getParams('com_installer')->get('show_jed_info', 1);
+
+		JPluginHelper::importPlugin('installer');
+
+		$dispatcher = JEventDispatcher::getInstance();
+		$dispatcher->trigger('onInstallerBeforeDisplay', array(&$this->showJedAndWebInstaller, $this));
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL');
+	}
+}
diff --git a/core/administrator/components/com_installer/views/languages/tmpl/default.php b/core/administrator/components/com_installer/views/languages/tmpl/default.php
new file mode 100644
index 00000000..801524df
--- /dev/null
+++ b/core/administrator/components/com_installer/views/languages/tmpl/default.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div id="installer-languages" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+			<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+			<div class="clearfix"></div>
+			<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+			<?php else : ?>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th width="5%"></th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_LANGUAGE_TAG', 'element', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="center">
+							<?php echo JText::_('JVERSION'); ?>
+						</th>
+						<th width="40%" class="nowrap hidden-phone">
+							<?php echo JText::_('COM_INSTALLER_HEADING_DETAILS_URL'); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="6">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				$version = new JVersion;
+				$currentShortVersion = preg_replace('#^([0-9\.]+)(|.*)$#', '$1', $version->getShortVersion());
+				$i = 0;
+				foreach ($this->items as $language) :
+					preg_match('#^pkg_([a-z]{2,3}-[A-Z]{2})$#', $language->element, $element);
+					$language->code  = $element[1];
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td>
+							<?php $buttonText = (isset($this->installedLang[0][$language->code]) || isset($this->installedLang[1][$language->code])) ? 'REINSTALL' : 'INSTALL'; ?>
+							<?php $onclick = 'document.getElementById(\'install_url\').value = \'' . $language->detailsurl . '\'; Joomla.submitbutton(\'install.install\');'; ?>
+							<input type="button" class="btn btn-small" value="<?php echo JText::_('COM_INSTALLER_' . $buttonText . '_BUTTON'); ?>" onclick="<?php echo $onclick; ?>" />
+						</td>
+						<td>
+							<?php echo $language->name; ?>
+						</td>
+						<td>
+							<?php echo $language->code; ?>
+						</td>
+						<td class="center">
+								<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
+								<?php // Display a Note if language pack version is not equal to Joomla version ?>
+								<?php if (strpos($language->version, $minorVersion) !== 0 || strpos($language->version, $currentShortVersion) !== 0) : ?>
+									<span class="label label-warning hasTooltip" title="<?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $language->version; ?></span>
+								<?php else : ?>
+									<span class="label label-success"><?php echo $language->version; ?></span>
+								<?php endif; ?>
+						</td>
+						<td class="small hidden-phone">
+							<a href="<?php echo $language->detailsurl; ?>" target="_blank"><?php echo $language->detailsurl; ?></a>
+						</td>
+					</tr>
+					<?php $i++; ?>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php endif; ?>
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="return" value="<?php echo base64_encode('index.php?option=com_installer&view=languages') ?>" />
+			<input type="hidden" id="install_url" name="install_url" />
+			<input type="hidden" name="installtype" value="url" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/languages/tmpl/default.xml b/core/administrator/components/com_installer/views/languages/tmpl/default.xml
new file mode 100755
index 00000000..4f52293e
--- /dev/null
+++ b/core/administrator/components/com_installer/views/languages/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/languages/view.html.php b/core/administrator/components/com_installer/views/languages/view.html.php
new file mode 100644
index 00000000..45f15897
--- /dev/null
+++ b/core/administrator/components/com_installer/views/languages/view.html.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Language Install View
+ *
+ * @since  2.5.7
+ */
+class InstallerViewLanguages extends InstallerViewDefault
+{
+	/**
+	 * @var object item list
+	 */
+	protected $items;
+
+	/**
+	 * @var object pagination information
+	 */
+	protected $pagination;
+
+	/**
+	 * @var object model state
+	 */
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   null  $tpl  template to display
+	 *
+	 * @return mixed|void
+	 */
+	public function display($tpl = null)
+	{
+		// Get data from the model.
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->installedLang = JLanguageHelper::getInstalledLanguages();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return void
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_installer');
+		JToolBarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install');
+
+		if ($canDo->get('core.admin'))
+		{
+			parent::addToolbar();
+
+			// TODO: this help screen will need to be created.
+			JToolBarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES');
+		}
+	}
+}
diff --git a/core/administrator/components/com_installer/views/manage/tmpl/default.php b/core/administrator/components/com_installer/views/manage/tmpl/default.php
new file mode 100644
index 00000000..d7dcd244
--- /dev/null
+++ b/core/administrator/components/com_installer/views/manage/tmpl/default.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div id="installer-manage" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=manage'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+		<?php else : ?>
+		<div id="j-main-container">
+		<?php endif; ?>
+			<?php if ($this->showMessage) : ?>
+				<?php echo $this->loadTemplate('message'); ?>
+			<?php endif; ?>
+			<?php if ($this->ftp) : ?>
+				<?php echo $this->loadTemplate('ftp'); ?>
+			<?php endif; ?>
+			<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+			<div class="clearfix"></div>
+			<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('COM_INSTALLER_MSG_MANAGE_NOEXTENSION'); ?>
+			</div>
+			<?php else : ?>
+			<table class="table table-striped" id="manageList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'status', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_TYPE', 'type_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="hidden-phone">
+							<?php echo JText::_('JVERSION'); ?>
+						</th>
+						<th width="10%" class="hidden-phone hidden-tablet">
+							<?php echo JText::_('JDATE'); ?>
+						</th>
+						<th width="15%" class="hidden-phone hidden-tablet">
+							<?php echo JText::_('JAUTHOR'); ?>
+						</th>
+						<th class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_PACKAGE_ID', 'package_id', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="11">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<tr class="row<?php echo $i % 2; if ($item->status == 2) echo ' protected'; ?>">
+						<td>
+							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
+						</td>
+						<td class="center">
+							<?php if (!$item->element) : ?>
+							<strong>X</strong>
+							<?php else : ?>
+								<?php echo JHtml::_('InstallerHtml.Manage.state', $item->status, $i, $item->status < 2, 'cb'); ?>
+							<?php endif; ?>
+						</td>
+						<td>
+							<label for="cb<?php echo $i; ?>">
+								<span class="bold hasTooltip" title="<?php echo JHtml::_('tooltipText', $item->name, $item->description, 0); ?>">
+									<?php echo $item->name; ?>
+								</span>
+							</label>
+						</td>
+						<td>
+							<?php echo $item->client_translated; ?>
+						</td>
+						<td>
+							<?php echo $item->type_translated; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo @$item->version != '' ? $item->version : '&#160;'; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_INSTALLER_AUTHOR_INFORMATION'), $item->author_info, 0); ?>">
+								<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
+							</span>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->folder_translated; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->package_id ?: '&#160;'; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->extension_id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php endif; ?>
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		<!-- End Content -->
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/manage/tmpl/default.xml b/core/administrator/components/com_installer/views/manage/tmpl/default.xml
new file mode 100755
index 00000000..13dc66fc
--- /dev/null
+++ b/core/administrator/components/com_installer/views/manage/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_MANAGE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_MANAGE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/manage/view.html.php b/core/administrator/components/com_installer/views/manage/view.html.php
new file mode 100644
index 00000000..3fe03cda
--- /dev/null
+++ b/core/administrator/components/com_installer/views/manage/view.html.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Manage View
+ *
+ * @since  1.6
+ */
+class InstallerViewManage extends InstallerViewDefault
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $form;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  mixed|void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		// Get data from the model.
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		// Display the view.
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_installer');
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('manage.publish', 'JTOOLBAR_ENABLE', true);
+			JToolbarHelper::unpublish('manage.unpublish', 'JTOOLBAR_DISABLE', true);
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::custom('manage.refresh', 'refresh', 'refresh', 'JTOOLBAR_REFRESH_CACHE', true);
+		JToolbarHelper::divider();
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('COM_INSTALLER_CONFIRM_UNINSTALL', 'manage.remove', 'JTOOLBAR_UNINSTALL');
+			JToolbarHelper::divider();
+		}
+
+		JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
+
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE');
+	}
+}
diff --git a/core/administrator/components/com_installer/views/update/tmpl/default.php b/core/administrator/components/com_installer/views/update/tmpl/default.php
new file mode 100644
index 00000000..0c5b6faf
--- /dev/null
+++ b/core/administrator/components/com_installer/views/update/tmpl/default.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div id="installer-update" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+			<?php else : ?>
+			<div id="j-main-container">
+				<?php endif; ?>
+				<?php if ($this->showMessage) : ?>
+					<?php echo $this->loadTemplate('message'); ?>
+				<?php endif; ?>
+
+				<?php if ($this->ftp) : ?>
+					<?php echo $this->loadTemplate('ftp'); ?>
+				<?php endif; ?>
+
+				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<div class="clearfix"></div>
+				<?php if (empty($this->items)) : ?>
+					<div class="alert alert-no-items alert-info">
+						<?php echo JText::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?>
+					</div>
+				<?php else : ?>
+					<table class="table table-striped">
+						<thead>
+						<tr>
+							<th width="1%" class="nowrap">
+								<?php echo JHtml::_('grid.checkall'); ?>
+							</th>
+							<th class="nowrap">
+								<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'u.name', $listDirn, $listOrder); ?>
+							</th>
+							<th class="nowrap center">
+								<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_translated', $listDirn, $listOrder); ?>
+							</th>
+							<th class="nowrap center">
+								<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_TYPE', 'type_translated', $listDirn, $listOrder); ?>
+							</th>
+							<th class="nowrap hidden-phone center">
+								<?php echo JText::_('COM_INSTALLER_CURRENT_VERSION'); ?>
+							</th>
+							<th class="nowrap center">
+								<?php echo JText::_('COM_INSTALLER_NEW_VERSION'); ?>
+							</th>
+							<th class="nowrap hidden-phone center">
+								<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
+							</th>
+							<th class="nowrap hidden-phone center">
+								<?php echo JText::_('COM_INSTALLER_HEADING_INSTALLTYPE'); ?>
+							</th>
+							<th width="40%" class="nowrap hidden-phone hidden-tablet">
+								<?php echo JText::_('COM_INSTALLER_HEADING_DETAILSURL'); ?>
+							</th>
+						</tr>
+						</thead>
+						<tfoot>
+						<tr>
+							<td colspan="9">
+								<?php echo $this->pagination->getListFooter(); ?>
+							</td>
+						</tr>
+						</tfoot>
+						<tbody>
+						<?php foreach ($this->items as $i => $item) : ?>
+							<?php
+							$client          = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE');
+							$manifest        = json_decode($item->manifest_cache);
+							$current_version = isset($manifest->version) ? $manifest->version : JText::_('JLIB_UNKNOWN');
+							?>
+							<tr class="row<?php echo $i % 2; ?>">
+								<td>
+									<?php echo JHtml::_('grid.id', $i, $item->update_id); ?>
+								</td>
+								<td>
+									<label for="cb<?php echo $i; ?>">
+								<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('JGLOBAL_DESCRIPTION'), $item->description ?: JText::_('COM_INSTALLER_MSG_UPDATE_NODESC'), 0); ?>">
+								<?php echo $this->escape($item->name); ?>
+								</span>
+									</label>
+								</td>
+								<td class="center">
+									<?php echo $item->client_translated; ?>
+								</td>
+								<td class="center">
+									<?php echo $item->type_translated; ?>
+								</td>
+								<td class="hidden-phone center">
+									<span class="label label-warning"><?php echo $item->current_version; ?></span>
+								</td>
+								<td class="center">
+									<span class="label label-success"><?php echo $item->version; ?></span>
+								</td>
+								<td class="hidden-phone center">
+									<?php echo $item->folder_translated; ?>
+								</td>
+								<td class="hidden-phone center">
+									<?php echo $item->install_type; ?>
+								</td>
+								<td class="hidden-phone hidden-tablet">
+							<span class="break-word">
+							<?php echo $item->detailsurl; ?>
+								<?php if (isset($item->infourl)) : ?>
+									<br />
+									<a href="<?php echo $item->infourl; ?>" target="_blank" rel="noopener noreferrer"><?php echo $this->escape($item->infourl); ?></a>
+								<?php endif; ?>
+							</span>
+								</td>
+							</tr>
+						<?php endforeach; ?>
+						</tbody>
+					</table>
+				<?php endif; ?>
+				<input type="hidden" name="task" value="" />
+				<input type="hidden" name="boxchecked" value="0" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/update/tmpl/default.xml b/core/administrator/components/com_installer/views/update/tmpl/default.xml
new file mode 100755
index 00000000..d262a8a9
--- /dev/null
+++ b/core/administrator/components/com_installer/views/update/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_UPDATE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_UPDATE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/update/view.html.php b/core/administrator/components/com_installer/views/update/view.html.php
new file mode 100644
index 00000000..d5ee00be
--- /dev/null
+++ b/core/administrator/components/com_installer/views/update/view.html.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Update View
+ *
+ * @since  1.6
+ */
+class InstallerViewUpdate extends InstallerViewDefault
+{
+	/**
+	 * List of update items.
+	 *
+	 * @var array
+	 */
+	protected $items;
+
+	/**
+	 * Model state object.
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	/**
+	 * List pagination.
+	 *
+	 * @var JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		// Get data from the model.
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		$paths = new stdClass;
+		$paths->first = '';
+
+		$this->paths = &$paths;
+
+		if (count($this->items) > 0)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE'), 'notice');
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JToolbarHelper::custom('update.update', 'upload', 'upload', 'COM_INSTALLER_TOOLBAR_UPDATE', true);
+		JToolbarHelper::custom('update.find', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_FIND_UPDATES', false);
+		JToolbarHelper::custom('update.purge', 'purge', 'purge', 'COM_INSTALLER_TOOLBAR_PURGE', false);
+		JToolbarHelper::divider();
+
+		JHtmlSidebar::setAction('index.php?option=com_installer&view=manage');
+
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE');
+	}
+}
diff --git a/core/administrator/components/com_installer/views/updatesites/tmpl/default.php b/core/administrator/components/com_installer/views/updatesites/tmpl/default.php
new file mode 100644
index 00000000..77a7bca4
--- /dev/null
+++ b/core/administrator/components/com_installer/views/updatesites/tmpl/default.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div id="installer-manage" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=updatesites'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+		<?php else : ?>
+		<div id="j-main-container">
+		<?php endif; ?>
+			<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+			<div class="clearfix"></div>
+			<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+			<?php else : ?>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_UPDATESITE_NAME', 'update_site_name', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th class="hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_TYPE', 'type_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th class="hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder_translated', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'update_site_id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="8">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<tr class="row<?php echo $i % 2; if ($item->enabled == 2) echo ' protected'; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->update_site_id); ?>
+						</td>
+						<td class="center">
+							<?php if (!$item->element) : ?>
+								<strong>X</strong>
+							<?php else : ?>
+								<?php echo JHtml::_('InstallerHtml.Updatesites.state', $item->enabled, $i, $item->enabled < 2, 'cb'); ?>
+							<?php endif; ?>
+						</td>
+						<td>
+							<label for="cb<?php echo $i; ?>">
+								<?php echo JText::_($item->update_site_name); ?>
+								<br />
+								<span class="small break-word">
+									<a href="<?php echo $item->location; ?>" target="_blank" rel="noopener noreferrer"><?php echo $this->escape($item->location); ?></a>
+								</span>
+							</label>
+						</td>
+						<td class="hidden-phone">
+							<span class="bold hasTooltip" title="<?php echo JHtml::_('tooltipText', $item->name, $item->description, 0); ?>">
+								<?php echo $item->name; ?>
+							</span>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo $item->client_translated; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->type_translated; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo $item->folder_translated; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->update_site_id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php endif; ?>
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/updatesites/tmpl/default.xml b/core/administrator/components/com_installer/views/updatesites/tmpl/default.xml
new file mode 100755
index 00000000..f9cf92a6
--- /dev/null
+++ b/core/administrator/components/com_installer/views/updatesites/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/updatesites/view.html.php b/core/administrator/components/com_installer/views/updatesites/view.html.php
new file mode 100644
index 00000000..a6065eb1
--- /dev/null
+++ b/core/administrator/components/com_installer/views/updatesites/view.html.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Update Sites View
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ * @since       3.4
+ */
+class InstallerViewUpdatesites extends InstallerViewDefault
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $form;
+
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  mixed|void
+	 *
+	 * @since   3.4
+	 *
+	 * @throws  Exception on errors
+	 */
+	public function display($tpl = null)
+	{
+		// Get data from the model
+		$this->state         = $this->get('State');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		// Display the view
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_installer');
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('updatesites.publish', 'JTOOLBAR_ENABLE', true);
+			JToolbarHelper::unpublish('updatesites.unpublish', 'JTOOLBAR_DISABLE', true);
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'updatesites.delete', 'JTOOLBAR_DELETE');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::custom('updatesites.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
+		}
+
+		JHtmlSidebar::setAction('index.php?option=com_installer&view=updatesites');
+
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES');
+	}
+}
diff --git a/core/administrator/components/com_installer/views/warnings/tmpl/default.php b/core/administrator/components/com_installer/views/warnings/tmpl/default.php
new file mode 100644
index 00000000..fa4a21dd
--- /dev/null
+++ b/core/administrator/components/com_installer/views/warnings/tmpl/default.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="installer-warnings" class="clearfix">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=warnings'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+		<?php if (count($this->messages)) : ?>
+			<?php echo JHtml::_('bootstrap.startAccordion', 'warnings', array('active' => 'warning0')); ?>
+				<?php $i = 0; ?>
+				<?php foreach ($this->messages as $message) : ?>
+					<?php echo JHtml::_('bootstrap.addSlide', 'warnings', $message['message'], 'warning' . ($i++)); ?>
+						<?php echo $message['description']; ?>
+					<?php echo JHtml::_('bootstrap.endSlide'); ?>
+				<?php endforeach; ?>
+					<?php echo JHtml::_('bootstrap.addSlide', 'warnings', JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'), 'furtherinfo'); ?>
+						<?php echo JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC'); ?>
+					<?php echo JHtml::_('bootstrap.endSlide'); ?>
+			<?php echo JHtml::_('bootstrap.endAccordion'); ?>
+		<?php endif; ?>
+			<div>
+				<input type="hidden" name="boxchecked" value="0" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/components/com_installer/views/warnings/tmpl/default.xml b/core/administrator/components/com_installer/views/warnings/tmpl/default.xml
new file mode 100755
index 00000000..8e6472cd
--- /dev/null
+++ b/core/administrator/components/com_installer/views/warnings/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_INSTALLER_WARNINGS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_INSTALLER_WARNINGS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_installer/views/warnings/view.html.php b/core/administrator/components/com_installer/views/warnings/view.html.php
new file mode 100644
index 00000000..e3d12bf1
--- /dev/null
+++ b/core/administrator/components/com_installer/views/warnings/view.html.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerViewDefault', dirname(__DIR__) . '/default/view.php');
+
+/**
+ * Extension Manager Warning View
+ *
+ * @since  1.6
+ */
+class InstallerViewWarnings extends InstallerViewDefault
+{
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  Template
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$items = $this->get('Items');
+		$this->messages = &$items;
+		parent::display($tpl);
+
+		if (count($items) > 0)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNINGS_NOTICE'), 'warning');
+		}
+		else
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNINGS_NONE'), 'notice');
+		}
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		parent::addToolbar();
+		JToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS');
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/access.xml b/core/administrator/components/com_joomlaupdate/access.xml
new file mode 100644
index 00000000..c8c9f3dd
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/access.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_joomlaupdate">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_joomlaupdate/config.xml b/core/administrator/components/com_joomlaupdate/config.xml
new file mode 100644
index 00000000..0253763b
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/config.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="sources"
+		label="COM_JOOMLAUPDATE_CONFIG_SOURCES_LABEL"
+		description="COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC"
+		>
+
+		<field
+			name="updatesource"
+			type="list"
+			label="COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL"
+			description="COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DESC"
+			default="default"
+			>
+			<!-- Note: Changed the values lts to default and sts to next with 3.4.0 -->
+			<!--       Eliminated the 'nochange' option with 3.4.0 -->
+			<!--       All invalid/unsupported/obsolete options equated to default in code with 3.4.0 -->
+			<option value="default">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT</option>
+			<option value="next">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT</option>
+			<option value="testing">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING</option>
+			<option value="custom">COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM</option>
+		</field>
+
+		<field
+			name="customurl"
+			type="text"
+			label="COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL"
+			description="COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC"
+			default=""
+			length="50"
+			showon="updatesource:custom"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_joomlaupdate"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_joomlaupdate/controller.php b/core/administrator/components/com_joomlaupdate/controller.php
new file mode 100644
index 00000000..c6bb6b22
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/controller.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Update Controller
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   2.5.4
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', 'default');
+		$vFormat = $document->getType();
+		$lName   = $this->input->get('layout', 'default', 'string');
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			$ftp = JClientHelper::setCredentialsFromRequest('ftp');
+			$view->ftp = &$ftp;
+
+			// Get the model for the view.
+			/** @var JoomlaupdateModelDefault $model */
+			$model = $this->getModel('default');
+
+			// Push the Installer Warnings model into the view, if we can load it
+			static::addModelPath(JPATH_ADMINISTRATOR . '/components/com_installer/models', 'InstallerModel');
+
+			$warningsModel = $this->getModel('warnings', 'InstallerModel');
+
+			if (is_object($warningsModel))
+			{
+				$view->setModel($warningsModel, false);
+			}
+
+			// Perform update source preference check and refresh update information.
+			$model->applyUpdateSite();
+			$model->refreshUpdates();
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+			$view->display();
+		}
+
+		return $this;
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/controllers/update.php b/core/administrator/components/com_joomlaupdate/controllers/update.php
new file mode 100644
index 00000000..cb57d84c
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/controllers/update.php
@@ -0,0 +1,473 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Joomla! update controller for the Update view
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateControllerUpdate extends JControllerLegacy
+{
+	/**
+	 * Performs the download of the update package
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.4
+	 */
+	public function download()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+		$options['text_file'] = 'joomla_update.php';
+		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
+		$user = JFactory::getUser();
+
+		try
+		{
+			JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_START', $user->id, $user->name, JVERSION), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$this->_applyCredentials();
+
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('Default');
+		$file = $model->download();
+
+		$message = null;
+		$messageType = null;
+
+		if ($file)
+		{
+			JFactory::getApplication()->setUserState('com_joomlaupdate.file', $file);
+			$url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1';
+
+			try
+			{
+				JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), JLog::INFO, 'Update');
+			}
+			catch (RuntimeException $exception)
+			{
+				// Informational log only
+			}
+		}
+		else
+		{
+			JFactory::getApplication()->setUserState('com_joomlaupdate.file', null);
+			$url = 'index.php?option=com_joomlaupdate';
+			$message = JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_DOWNLOADFAILED');
+			$messageType = 'error';
+		}
+
+		$this->setRedirect($url, $message, $messageType);
+	}
+
+	/**
+	 * Start the installation of the new Joomla! version
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.4
+	 */
+	public function install()
+	{
+		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+		$options['text_file'] = 'joomla_update.php';
+		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
+
+		try
+		{
+			JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL'), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$this->_applyCredentials();
+
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('Default');
+
+		$file = JFactory::getApplication()->getUserState('com_joomlaupdate.file', null);
+		$model->createRestorationFile($file);
+
+		$this->display();
+	}
+
+	/**
+	 * Finalise the upgrade by running the necessary scripts
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.4
+	 */
+	public function finalise()
+	{
+		/*
+		 * Finalize with login page. Used for pre-token check versions
+		 * to allow updates without problems but with a maximum of security.
+		 */
+		if (!JSession::checkToken('get'))
+		{
+			$this->setRedirect('index.php?option=com_joomlaupdate&view=update&layout=finaliseconfirm');
+
+			return false;
+		}
+
+		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+		$options['text_file'] = 'joomla_update.php';
+		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
+
+		try
+		{
+			JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_FINALISE'), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$this->_applyCredentials();
+
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('Default');
+
+		$model->finaliseUpgrade();
+
+		$url = 'index.php?option=com_joomlaupdate&task=update.cleanup&' . JFactory::getSession()->getFormToken() . '=1';
+		$this->setRedirect($url);
+	}
+
+	/**
+	 * Clean up after ourselves
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.4
+	 */
+	public function cleanup()
+	{
+		/*
+		 * Cleanup with login page. Used for pre-token check versions to be able to update
+		 * from =< 3.2.7 to allow updates without problems but with a maximum of security.
+		 */
+		if (!JSession::checkToken('get'))
+		{
+			$this->setRedirect('index.php?option=com_joomlaupdate&view=update&layout=finaliseconfirm');
+
+			return false;
+		}
+
+		$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
+		$options['text_file'] = 'joomla_update.php';
+		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
+
+		try
+		{
+			JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_CLEANUP'), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$this->_applyCredentials();
+
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('Default');
+
+		$model->cleanUp();
+
+		$url = 'index.php?option=com_joomlaupdate&view=default&layout=complete';
+		$this->setRedirect($url);
+
+		try
+		{
+			JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_COMPLETE', JVERSION), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+	}
+
+	/**
+	 * Purges updates.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function purge()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Purge updates
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('Default');
+		$model->purge();
+
+		$url = 'index.php?option=com_joomlaupdate';
+		$this->setRedirect($url, $model->_message);
+	}
+
+	/**
+	 * Uploads an update package to the temporary directory, under a random name
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function upload()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
+		JFactory::getUser()->authorise('core.admin') or jexit(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
+
+		$this->_applyCredentials();
+
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('Default');
+
+		try
+		{
+			$model->upload();
+		}
+		catch (RuntimeException $e)
+		{
+			$url = 'index.php?option=com_joomlaupdate';
+			$this->setRedirect($url, $e->getMessage(), 'error');
+		}
+
+		$token = JSession::getFormToken();
+		$url = 'index.php?option=com_joomlaupdate&task=update.captive&' . $token . '=1';
+		$this->setRedirect($url);
+	}
+
+	/**
+	 * Checks there is a valid update package and redirects to the captive view for super admin authentication.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	public function captive()
+	{
+		// Check for request forgeries
+		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		// Do I really have an update package?
+		$tempFile = JFactory::getApplication()->getUserState('com_joomlaupdate.temp_file', null);
+
+		JLoader::import('joomla.filesystem.file');
+
+		if (empty($tempFile) || !JFile::exists($tempFile))
+		{
+			throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		$this->input->set('view', 'upload');
+		$this->input->set('layout', 'captive');
+
+		$this->display();
+	}
+
+	/**
+	 * Checks the admin has super administrator privileges and then proceeds with the update.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	public function confirm()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Did a non Super User tried to upload something (a.k.a. pathetic hacking attempt)?
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		// Get the model
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('default');
+
+		// Get the captive file before the session resets
+		$tempFile = JFactory::getApplication()->getUserState('com_joomlaupdate.temp_file', null);
+
+		// Do I really have an update package?
+		if (!$model->captiveFileExists())
+		{
+			throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		// Try to log in
+		$credentials = array(
+			'username'  => $this->input->post->get('username', '', 'username'),
+			'password'  => $this->input->post->get('passwd', '', 'raw'),
+			'secretkey' => $this->input->post->get('secretkey', '', 'raw'),
+		);
+
+		$result = $model->captiveLogin($credentials);
+
+		if (!$result)
+		{
+			$model->removePackageFiles();
+
+			throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		// Set the update source in the session
+		JFactory::getApplication()->setUserState('com_joomlaupdate.file', basename($tempFile));
+
+		try
+		{
+			JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $tempFile), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Redirect to the actual update page
+		$url = 'index.php?option=com_joomlaupdate&task=update.install&' . JFactory::getSession()->getFormToken() . '=1';
+		$this->setRedirect($url);
+	}
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JoomlaupdateControllerUpdate  This object to support chaining.
+	 *
+	 * @since   2.5.4
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->get('view', 'update');
+		$vFormat = $document->getType();
+		$lName   = $this->input->get('layout', 'default', 'string');
+
+		// Get and render the view.
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			// Get the model for the view.
+			/** @var JoomlaupdateModelDefault $model */
+			$model = $this->getModel('Default');
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+			$view->display();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Applies FTP credentials to Joomla! itself, when required
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.4
+	 */
+	protected function _applyCredentials()
+	{
+		JFactory::getApplication()->getUserStateFromRequest('com_joomlaupdate.method', 'method', 'direct', 'cmd');
+
+		if (!JClientHelper::hasCredentials('ftp'))
+		{
+			$user = JFactory::getApplication()->getUserStateFromRequest('com_joomlaupdate.ftp_user', 'ftp_user', null, 'raw');
+			$pass = JFactory::getApplication()->getUserStateFromRequest('com_joomlaupdate.ftp_pass', 'ftp_pass', null, 'raw');
+
+			if ($user != '' && $pass != '')
+			{
+				// Add credentials to the session
+				if (!JClientHelper::setCredentials('ftp', $user, $pass))
+				{
+					JError::raiseWarning(500, JText::_('JLIB_CLIENT_ERROR_HELPER_SETCREDENTIALSFROMREQUEST_FAILED'));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Checks the admin has super administrator privileges and then proceeds with the final & cleanup steps.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.3
+	 */
+	public function finaliseconfirm()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Did a non Super User try do this?
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		// Get the model
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel('default');
+
+		// Try to log in
+		$credentials = array(
+			'username'  => $this->input->post->get('username', '', 'username'),
+			'password'  => $this->input->post->get('passwd', '', 'raw'),
+			'secretkey' => $this->input->post->get('secretkey', '', 'raw'),
+		);
+
+		$result = $model->captiveLogin($credentials);
+
+		// The login fails?
+		if (!$result)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JGLOBAL_AUTH_INVALID_PASS'), 'warning');
+			$this->setRedirect('index.php?option=com_joomlaupdate&view=update&layout=finaliseconfirm');
+
+			return false;
+		}
+
+		// Redirect back to the actual finalise page
+		$this->setRedirect('index.php?option=com_joomlaupdate&task=update.finalise&' . JFactory::getSession()->getFormToken() . '=1');
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php b/core/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
new file mode 100644
index 00000000..0044abdf
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! update helper.
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateHelper
+{
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @since	2.5.4
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_joomlaupdate');
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/helpers/select.php b/core/administrator/components/com_joomlaupdate/helpers/select.php
new file mode 100644
index 00000000..edf2de79
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/helpers/select.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! update selection list helper.
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateHelperSelect
+{
+	/**
+	 * Returns an HTML select element with the different extraction modes
+	 *
+	 * @param   string  $default  The default value of the select element
+	 * @param   string  $name     The name of the form field
+	 * @param   string  $id       The id of the select field
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5.4
+	 */
+	public static function getMethods($default = 'hybrid', $name = 'method', $id = 'extraction_method')
+	{
+		$options = array();
+		$options[] = JHtml::_('select.option', 'direct', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_DIRECT'));
+		$options[] = JHtml::_('select.option', 'hybrid', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_HYBRID'));
+		$options[] = JHtml::_('select.option', 'ftp', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_FTP'));
+
+		return JHtml::_('select.genericlist', $options, $name, '', 'value', 'text', $default, $id);
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/joomlaupdate.php b/core/administrator/components/com_joomlaupdate/joomlaupdate.php
new file mode 100644
index 00000000..4baf72dd
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/joomlaupdate.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_joomlaupdate'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Joomlaupdate');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_joomlaupdate/joomlaupdate.xml b/core/administrator/components/com_joomlaupdate/joomlaupdate.xml
new file mode 100644
index 00000000..c84bfe31
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/joomlaupdate.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_joomlaupdate</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2012</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.6.2</version>
+	<description>COM_JOOMLAUPDATE_XML_DESCRIPTION</description>
+	<media destination="com_joomlaupdate" folder="media">
+		<folder>js</folder>
+	</media>
+	<administration>
+		<menu img="class:joomlaupdate">com_joomlaupdate</menu>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>joomlaupdate.php</filename>
+			<filename>restore.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_joomlaupdate.ini</language>
+			<language tag="en-GB">language/en-GB.com_joomlaupdate.sys.ini</language>
+		</languages>
+	</administration>
+	<updateservers>
+		<server type="extension" name="Joomla! Update Component Update Site">https://update.joomla.org/core/extensions/com_joomlaupdate.xml</server>
+	</updateservers>
+</extension>
diff --git a/core/administrator/components/com_joomlaupdate/models/default.php b/core/administrator/components/com_joomlaupdate/models/default.php
new file mode 100644
index 00000000..6b046699
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/models/default.php
@@ -0,0 +1,1026 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.file');
+
+/**
+ * Joomla! update overview Model
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateModelDefault extends JModelLegacy
+{
+	/**
+	 * Detects if the Joomla! update site currently in use matches the one
+	 * configured in this component. If they don't match, it changes it.
+	 *
+	 * @return  void
+	 *
+	 * @since    2.5.4
+	 */
+	public function applyUpdateSite()
+	{
+		// Determine the intended update URL.
+		$params = JComponentHelper::getParams('com_joomlaupdate');
+
+		switch ($params->get('updatesource', 'nochange'))
+		{
+			// "Minor & Patch Release for Current version AND Next Major Release".
+			case 'sts':
+			case 'next':
+				$updateURL = 'https://update.joomla.org/core/sts/list_sts.xml';
+				break;
+
+			// "Testing"
+			case 'testing':
+				$updateURL = 'https://update.joomla.org/core/test/list_test.xml';
+				break;
+
+			// "Custom"
+			// TODO: check if the customurl is valid and not just "not empty".
+			case 'custom':
+				if (trim($params->get('customurl', '')) != '')
+				{
+					$updateURL = trim($params->get('customurl', ''));
+				}
+				else
+				{
+					return JError::raiseWarning(403, JText::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM_ERROR'));
+				}
+				break;
+
+			/**
+			 * "Minor & Patch Release for Current version (recommended and default)".
+			 * The commented "case" below are for documenting where 'default' and legacy options falls
+			 * case 'default':
+			 * case 'lts':
+			 * case 'nochange':
+			 */
+			default:
+				$updateURL = 'https://update.joomla.org/core/list.xml';
+		}
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('us') . '.*')
+			->from($db->quoteName('#__update_sites_extensions') . ' AS ' . $db->quoteName('map'))
+			->join(
+				'INNER', $db->quoteName('#__update_sites') . ' AS ' . $db->quoteName('us')
+				. ' ON (' . 'us.update_site_id = map.update_site_id)'
+			)
+			->where('map.extension_id = ' . $db->quote(700));
+		$db->setQuery($query);
+		$update_site = $db->loadObject();
+
+		if ($update_site->location != $updateURL)
+		{
+			// Modify the database record.
+			$update_site->last_check_timestamp = 0;
+			$update_site->location = $updateURL;
+			$db->updateObject('#__update_sites', $update_site, 'update_site_id');
+
+			// Remove cached updates.
+			$query->clear()
+				->delete($db->quoteName('#__updates'))
+				->where($db->quoteName('extension_id') . ' = ' . $db->quote('700'));
+			$db->setQuery($query);
+			$db->execute();
+		}
+	}
+
+	/**
+	 * Makes sure that the Joomla! update cache is up-to-date.
+	 *
+	 * @param   boolean  $force  Force reload, ignoring the cache timeout.
+	 *
+	 * @return  void
+	 *
+	 * @since    2.5.4
+	 */
+	public function refreshUpdates($force = false)
+	{
+		if ($force)
+		{
+			$cache_timeout = 0;
+		}
+		else
+		{
+			$update_params = JComponentHelper::getParams('com_installer');
+			$cache_timeout = $update_params->get('cachetimeout', 6, 'int');
+			$cache_timeout = 3600 * $cache_timeout;
+		}
+
+		$updater = JUpdater::getInstance();
+
+		$reflection = new ReflectionObject($updater);
+		$reflectionMethod = $reflection->getMethod('findUpdates');
+		$methodParameters = $reflectionMethod->getParameters();
+
+		if (count($methodParameters) >= 4)
+		{
+			// Reinstall support is available in JUpdater
+			$updater->findUpdates(700, $cache_timeout, JUpdater::STABILITY_STABLE, true);
+		}
+		else
+		{
+			$updater->findUpdates(700, $cache_timeout, JUpdater::STABILITY_STABLE);
+		}
+	}
+
+	/**
+	 * Returns an array with the Joomla! update information.
+	 *
+	 * @return  array
+	 *
+	 * @since   2.5.4
+	 */
+	public function getUpdateInformation()
+	{
+		// Initialise the return array.
+		$ret = array(
+			'installed' => JVERSION,
+			'latest'    => null,
+			'object'    => null,
+			'hasUpdate' => false
+		);
+
+		// Fetch the update information from the database.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__updates'))
+			->where($db->quoteName('extension_id') . ' = ' . $db->quote(700));
+		$db->setQuery($query);
+		$updateObject = $db->loadObject();
+
+		if (is_null($updateObject))
+		{
+			$ret['latest'] = JVERSION;
+
+			return $ret;
+		}
+
+		$ret['latest']    = $updateObject->version;
+		$ret['hasUpdate'] = $updateObject->version != JVERSION;
+
+		// Fetch the full update details from the update details URL.
+		jimport('joomla.updater.update');
+		$update = new JUpdate;
+		$update->loadFromXML($updateObject->detailsurl);
+
+		$ret['object'] = $update;
+
+		return $ret;
+	}
+
+	/**
+	 * Returns an array with the configured FTP options.
+	 *
+	 * @return  array
+	 *
+	 * @since   2.5.4
+	 */
+	public function getFTPOptions()
+	{
+		$config = JFactory::getConfig();
+
+		return array(
+			'host'      => $config->get('ftp_host'),
+			'port'      => $config->get('ftp_port'),
+			'username'  => $config->get('ftp_user'),
+			'password'  => $config->get('ftp_pass'),
+			'directory' => $config->get('ftp_root'),
+			'enabled'   => $config->get('ftp_enable'),
+		);
+	}
+
+	/**
+	 * Removes all of the updates from the table and enable all update streams.
+	 *
+	 * @return  boolean  Result of operation.
+	 *
+	 * @since   3.0
+	 */
+	public function purge()
+	{
+		$db = $this->getDbo();
+
+		// Modify the database record
+		$update_site = new stdClass;
+		$update_site->last_check_timestamp = 0;
+		$update_site->enabled = 1;
+		$update_site->update_site_id = 1;
+		$db->updateObject('#__update_sites', $update_site, 'update_site_id');
+
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__updates'))
+			->where($db->quoteName('update_site_id') . ' = ' . $db->quote('1'));
+		$db->setQuery($query);
+
+		if ($db->execute())
+		{
+			$this->_message = JText::_('COM_JOOMLAUPDATE_CHECKED_UPDATES');
+
+			return true;
+		}
+		else
+		{
+			$this->_message = JText::_('COM_JOOMLAUPDATE_FAILED_TO_CHECK_UPDATES');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Downloads the update package to the site.
+	 *
+	 * @return  boolean|string  False on failure, basename of the file in any other case.
+	 *
+	 * @since   2.5.4
+	 */
+	public function download()
+	{
+		$updateInfo = $this->getUpdateInformation();
+		$packageURL = $updateInfo['object']->downloadurl->_data;
+		$sources    = $updateInfo['object']->get('downloadSources', array());
+		$headers    = get_headers($packageURL, 1);
+
+		// Follow the Location headers until the actual download URL is known
+		while (isset($headers['Location']))
+		{
+			$packageURL = $headers['Location'];
+			$headers    = get_headers($packageURL, 1);
+		}
+
+		// Remove protocol, path and query string from URL
+		$basename = basename($packageURL);
+
+		if (strpos($basename, '?') !== false)
+		{
+			$basename = substr($basename, 0, strpos($basename, '?'));
+		}
+
+		// Find the path to the temp directory and the local package.
+		$config  = JFactory::getConfig();
+		$tempdir = $config->get('tmp_path');
+		$target  = $tempdir . '/' . $basename;
+
+		// Do we have a cached file?
+		$exists = JFile::exists($target);
+
+		if (!$exists)
+		{
+			// Not there, let's fetch it.
+			$mirror = 0;
+
+			while (!($download = $this->downloadPackage($packageURL, $target)) && isset($sources[$mirror]))
+			{
+				$name       = $sources[$mirror];
+				$packageURL = $name->url;
+				$mirror++;
+			}
+
+			return $download;
+		}
+		else
+		{
+			// Is it a 0-byte file? If so, re-download please.
+			$filesize = @filesize($target);
+
+			if (empty($filesize))
+			{
+				$mirror = 0;
+
+				while (!($download = $this->downloadPackage($packageURL, $target)) && isset($sources[$mirror]))
+				{
+					$name       = $sources[$mirror];
+					$packageURL = $name->url;
+					$mirror++;
+				}
+
+				return $download;
+			}
+
+			// Yes, it's there, skip downloading.
+			return $basename;
+		}
+	}
+
+	/**
+	 * Downloads a package file to a specific directory
+	 *
+	 * @param   string  $url     The URL to download from
+	 * @param   string  $target  The directory to store the file
+	 *
+	 * @return  boolean True on success
+	 *
+	 * @since   2.5.4
+	 */
+	protected function downloadPackage($url, $target)
+	{
+		JLoader::import('helpers.download', JPATH_COMPONENT_ADMINISTRATOR);
+
+		try
+		{
+			JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_URL', $url), JLog::INFO, 'Update');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get the handler to download the package
+		try
+		{
+			$http = JHttpFactory::getHttp(null, array('curl', 'stream'));
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+
+		jimport('joomla.filesystem.file');
+
+		// Make sure the target does not exist.
+		JFile::delete($target);
+
+		// Download the package
+		try
+		{
+			$result = $http->get($url);
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+
+		if (!$result || ($result->code != 200 && $result->code != 310))
+		{
+			return false;
+		}
+
+		// Write the file to disk
+		JFile::write($target, $result->body);
+
+		return basename($target);
+	}
+
+	/**
+	 * Create restoration file.
+	 *
+	 * @param   string  $basename  Optional base path to the file.
+	 *
+	 * @return  boolean True if successful; false otherwise.
+	 *
+	 * @since  2.5.4
+	 */
+	public function createRestorationFile($basename = null)
+	{
+		// Get a password
+		$password = JUserHelper::genRandomPassword(32);
+		$app = JFactory::getApplication();
+		$app->setUserState('com_joomlaupdate.password', $password);
+
+		// Do we have to use FTP?
+		$method = JFactory::getApplication()->getUserStateFromRequest('com_joomlaupdate.method', 'method', 'direct', 'cmd');
+
+		// Get the absolute path to site's root.
+		$siteroot = JPATH_SITE;
+
+		// If the package name is not specified, get it from the update info.
+		if (empty($basename))
+		{
+			$updateInfo = $this->getUpdateInformation();
+			$packageURL = $updateInfo['object']->downloadurl->_data;
+			$basename = basename($packageURL);
+		}
+
+		// Get the package name.
+		$config  = JFactory::getConfig();
+		$tempdir = $config->get('tmp_path');
+		$file    = $tempdir . '/' . $basename;
+
+		$filesize = @filesize($file);
+		$app->setUserState('com_joomlaupdate.password', $password);
+		$app->setUserState('com_joomlaupdate.filesize', $filesize);
+
+		$data = "<?php\ndefined('_AKEEBA_RESTORATION') or die('Restricted access');\n";
+		$data .= '$restoration_setup = array(' . "\n";
+		$data .= <<<ENDDATA
+	'kickstart.security.password' => '$password',
+	'kickstart.tuning.max_exec_time' => '5',
+	'kickstart.tuning.run_time_bias' => '75',
+	'kickstart.tuning.min_exec_time' => '0',
+	'kickstart.procengine' => '$method',
+	'kickstart.setup.sourcefile' => '$file',
+	'kickstart.setup.destdir' => '$siteroot',
+	'kickstart.setup.restoreperms' => '0',
+	'kickstart.setup.filetype' => 'zip',
+	'kickstart.setup.dryrun' => '0',
+	'kickstart.setup.renamefiles' => array(),
+	'kickstart.setup.postrenamefiles' => false
+ENDDATA;
+
+		if ($method != 'direct')
+		{
+			/*
+			 * Fetch the FTP parameters from the request. Note: The password should be
+			 * allowed as raw mode, otherwise something like !@<sdf34>43H% would be
+			 * sanitised to !@43H% which is just plain wrong.
+			 */
+			$ftp_host = $app->input->get('ftp_host', '');
+			$ftp_port = $app->input->get('ftp_port', '21');
+			$ftp_user = $app->input->get('ftp_user', '');
+			$ftp_pass = addcslashes($app->input->get('ftp_pass', '', 'raw'), "'\\");
+			$ftp_root = $app->input->get('ftp_root', '');
+
+			// Is the tempdir really writable?
+			$writable = @is_writeable($tempdir);
+
+			if ($writable)
+			{
+				// Let's be REALLY sure.
+				$fp = @fopen($tempdir . '/test.txt', 'w');
+
+				if ($fp === false)
+				{
+					$writable = false;
+				}
+				else
+				{
+					fclose($fp);
+					unlink($tempdir . '/test.txt');
+				}
+			}
+
+			// If the tempdir is not writable, create a new writable subdirectory.
+			if (!$writable)
+			{
+				$FTPOptions = JClientHelper::getCredentials('ftp');
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+				$dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir . '/admintools'), '/');
+
+				if (!@mkdir($tempdir . '/admintools'))
+				{
+					$ftp->mkdir($dest);
+				}
+
+				if (!@chmod($tempdir . '/admintools', 511))
+				{
+					$ftp->chmod($dest, 511);
+				}
+
+				$tempdir .= '/admintools';
+			}
+
+			// Just in case the temp-directory was off-root, try using the default tmp directory.
+			$writable = @is_writeable($tempdir);
+
+			if (!$writable)
+			{
+				$tempdir = JPATH_ROOT . '/tmp';
+
+				// Does the JPATH_ROOT/tmp directory exist?
+				if (!is_dir($tempdir))
+				{
+					JFolder::create($tempdir, 511);
+					$htaccessContents = "order deny,allow\ndeny from all\nallow from none\n";
+					JFile::write($tempdir . '/.htaccess', $htaccessContents);
+				}
+
+				// If it exists and it is unwritable, try creating a writable admintools subdirectory.
+				if (!is_writable($tempdir))
+				{
+					$FTPOptions = JClientHelper::getCredentials('ftp');
+					$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+					$dest = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $tempdir . '/admintools'), '/');
+
+					if (!@mkdir($tempdir . '/admintools'))
+					{
+						$ftp->mkdir($dest);
+					}
+
+					if (!@chmod($tempdir . '/admintools', 511))
+					{
+						$ftp->chmod($dest, 511);
+					}
+
+					$tempdir .= '/admintools';
+				}
+			}
+
+			// If we still have no writable directory, we'll try /tmp and the system's temp-directory.
+			$writable = @is_writeable($tempdir);
+
+			if (!$writable)
+			{
+				if (@is_dir('/tmp') && @is_writable('/tmp'))
+				{
+					$tempdir = '/tmp';
+				}
+				else
+				{
+					// Try to find the system temp path.
+					$tmpfile = @tempnam('dummy', '');
+					$systemp = @dirname($tmpfile);
+					@unlink($tmpfile);
+
+					if (!empty($systemp))
+					{
+						if (@is_dir($systemp) && @is_writable($systemp))
+						{
+							$tempdir = $systemp;
+						}
+					}
+				}
+			}
+
+			$data .= <<<ENDDATA
+	,
+	'kickstart.ftp.ssl' => '0',
+	'kickstart.ftp.passive' => '1',
+	'kickstart.ftp.host' => '$ftp_host',
+	'kickstart.ftp.port' => '$ftp_port',
+	'kickstart.ftp.user' => '$ftp_user',
+	'kickstart.ftp.pass' => '$ftp_pass',
+	'kickstart.ftp.dir' => '$ftp_root',
+	'kickstart.ftp.tempdir' => '$tempdir'
+ENDDATA;
+		}
+
+		$data .= ');';
+
+		// Remove the old file, if it's there...
+		$configpath = JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php';
+
+		if (JFile::exists($configpath))
+		{
+			JFile::delete($configpath);
+		}
+
+		// Write new file. First try with JFile.
+		$result = JFile::write($configpath, $data);
+
+		// In case JFile used FTP but direct access could help.
+		if (!$result)
+		{
+			if (function_exists('file_put_contents'))
+			{
+				$result = @file_put_contents($configpath, $data);
+
+				if ($result !== false)
+				{
+					$result = true;
+				}
+			}
+			else
+			{
+				$fp = @fopen($configpath, 'wt');
+
+				if ($fp !== false)
+				{
+					$result = @fwrite($fp, $data);
+
+					if ($result !== false)
+					{
+						$result = true;
+					}
+
+					@fclose($fp);
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Runs the schema update SQL files, the PHP update script and updates the
+	 * manifest cache and #__extensions entry. Essentially, it is identical to
+	 * JInstallerFile::install() without the file copy.
+	 *
+	 * @return  boolean True on success.
+	 *
+	 * @since   2.5.4
+	 */
+	public function finaliseUpgrade()
+	{
+		$installer = JInstaller::getInstance();
+
+		$manifest = $installer->isManifest(JPATH_MANIFESTS . '/files/joomla.xml');
+
+		if ($manifest === false)
+		{
+			$installer->abort(JText::_('JLIB_INSTALLER_ABORT_DETECTMANIFEST'));
+
+			return false;
+		}
+
+		$installer->manifest = $manifest;
+
+		$installer->setUpgrade(true);
+		$installer->setOverwrite(true);
+
+		$installer->extension = JTable::getInstance('extension');
+		$installer->extension->load(700);
+
+		$installer->setAdapter($installer->extension->type);
+
+		$installer->setPath('manifest', JPATH_MANIFESTS . '/files/joomla.xml');
+		$installer->setPath('source', JPATH_MANIFESTS . '/files');
+		$installer->setPath('extension_root', JPATH_ROOT);
+
+		// Run the script file.
+		JLoader::register('JoomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php');
+
+		$manifestClass = new JoomlaInstallerScript;
+
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($manifestClass && method_exists($manifestClass, 'preflight'))
+		{
+			if ($manifestClass->preflight('update', $installer) === false)
+			{
+				$installer->abort(JText::_('JLIB_INSTALLER_ABORT_FILE_INSTALL_CUSTOM_INSTALL_FAILURE'));
+
+				return false;
+			}
+		}
+
+		// Create msg object; first use here.
+		$msg = ob_get_contents();
+		ob_end_clean();
+
+		// Get a database connector object.
+		$db = $this->getDbo();
+
+		/*
+		 * Check to see if a file extension by the same name is already installed.
+		 * If it is, then update the table because if the files aren't there
+		 * we can assume that it was (badly) uninstalled.
+		 * If it isn't, add an entry to extensions.
+		 */
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('file'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('joomla'));
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			// Install failed, roll back changes.
+			$installer->abort(
+				JText::sprintf('JLIB_INSTALLER_ABORT_FILE_ROLLBACK', JText::_('JLIB_INSTALLER_UPDATE'), $e->getMessage())
+			);
+
+			return false;
+		}
+
+		$id = $db->loadResult();
+		$row = JTable::getInstance('extension');
+
+		if ($id)
+		{
+			// Load the entry and update the manifest_cache.
+			$row->load($id);
+
+			// Update name.
+			$row->set('name', 'files_joomla');
+
+			// Update manifest.
+			$row->manifest_cache = $installer->generateManifestCache();
+
+			if (!$row->store())
+			{
+				// Install failed, roll back changes.
+				$installer->abort(
+					JText::sprintf('JLIB_INSTALLER_ABORT_FILE_ROLLBACK', JText::_('JLIB_INSTALLER_UPDATE'), $row->getError())
+				);
+
+				return false;
+			}
+		}
+		else
+		{
+			// Add an entry to the extension table with a whole heap of defaults.
+			$row->set('name', 'files_joomla');
+			$row->set('type', 'file');
+			$row->set('element', 'joomla');
+
+			// There is no folder for files so leave it blank.
+			$row->set('folder', '');
+			$row->set('enabled', 1);
+			$row->set('protected', 0);
+			$row->set('access', 0);
+			$row->set('client_id', 0);
+			$row->set('params', '');
+			$row->set('system_data', '');
+			$row->set('manifest_cache', $installer->generateManifestCache());
+
+			if (!$row->store())
+			{
+				// Install failed, roll back changes.
+				$installer->abort(JText::sprintf('JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK', $row->getError()));
+
+				return false;
+			}
+
+			// Set the insert id.
+			$row->set('extension_id', $db->insertid());
+
+			// Since we have created a module item, we add it to the installation step stack
+			// so that if we have to rollback the changes we can undo it.
+			$installer->pushStep(array('type' => 'extension', 'extension_id' => $row->extension_id));
+		}
+
+		$result = $installer->parseSchemaUpdates($manifest->update->schemas, $row->extension_id);
+
+		if ($result === false)
+		{
+			// Install failed, rollback changes.
+			$installer->abort(JText::sprintf('JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR', $db->stderr(true)));
+
+			return false;
+		}
+
+		// Start Joomla! 1.6.
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($manifestClass && method_exists($manifestClass, 'update'))
+		{
+			if ($manifestClass->update($installer) === false)
+			{
+				// Install failed, rollback changes.
+				$installer->abort(JText::_('JLIB_INSTALLER_ABORT_FILE_INSTALL_CUSTOM_INSTALL_FAILURE'));
+
+				return false;
+			}
+		}
+
+		// Append messages.
+		$msg .= ob_get_contents();
+		ob_end_clean();
+
+		// Clobber any possible pending updates.
+		$update = JTable::getInstance('update');
+		$uid = $update->find(
+			array('element' => 'joomla', 'type' => 'file', 'client_id' => '0', 'folder' => '')
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// And now we run the postflight.
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($manifestClass && method_exists($manifestClass, 'postflight'))
+		{
+			$manifestClass->postflight('update', $installer);
+		}
+
+		// Append messages.
+		$msg .= ob_get_contents();
+		ob_end_clean();
+
+		if ($msg != '')
+		{
+			$installer->set('extension_message', $msg);
+		}
+
+		// Refresh versionable assets cache.
+		JFactory::getApplication()->flushAssets();
+
+		return true;
+	}
+
+	/**
+	 * Removes the extracted package file.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5.4
+	 */
+	public function cleanUp()
+	{
+		// Remove the update package.
+		$config = JFactory::getConfig();
+		$tempdir = $config->get('tmp_path');
+
+		$file = JFactory::getApplication()->getUserState('com_joomlaupdate.file', null);
+		$target = $tempdir . '/' . $file;
+
+		if (!@unlink($target))
+		{
+			JFile::delete($target);
+		}
+
+		// Remove the restoration.php file.
+		$target = JPATH_COMPONENT_ADMINISTRATOR . '/restoration.php';
+
+		if (!@unlink($target))
+		{
+			JFile::delete($target);
+		}
+
+		// Remove joomla.xml from the site's root.
+		$target = JPATH_ROOT . '/joomla.xml';
+
+		if (!@unlink($target))
+		{
+			JFile::delete($target);
+		}
+
+		// Unset the update filename from the session.
+		JFactory::getApplication()->setUserState('com_joomlaupdate.file', null);
+	}
+
+	/**
+	 * Uploads what is presumably an update ZIP file under a mangled name in the temporary directory.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function upload()
+	{
+		// Get the uploaded file information.
+		$input = JFactory::getApplication()->input;
+
+		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
+		$userfile = $input->files->get('install_package', null, 'raw');
+
+		// Make sure that file uploads are enabled in php.
+		if (!(bool) ini_get('file_uploads'))
+		{
+			throw new RuntimeException(JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE'), 500);
+		}
+
+		// Make sure that zlib is loaded so that the package can be unpacked.
+		if (!extension_loaded('zlib'))
+		{
+			throw new RuntimeException('COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB', 500);
+		}
+
+		// If there is no uploaded file, we have a problem...
+		if (!is_array($userfile))
+		{
+			throw new RuntimeException(JText::_('COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED'), 500);
+		}
+
+		// Is the PHP tmp directory missing?
+		if ($userfile['error'] && ($userfile['error'] == UPLOAD_ERR_NO_TMP_DIR))
+		{
+			throw new RuntimeException(
+				JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR') . '<br />' .
+				JText::_('COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET'),
+				500
+			);
+		}
+
+		// Is the max upload size too small in php.ini?
+		if ($userfile['error'] && ($userfile['error'] == UPLOAD_ERR_INI_SIZE))
+		{
+			throw new RuntimeException(
+				JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR') . '<br />' . JText::_('COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE'),
+				500
+			);
+		}
+
+		// Check if there was a different problem uploading the file.
+		if ($userfile['error'] || $userfile['size'] < 1)
+		{
+			throw new RuntimeException(JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'), 500);
+		}
+
+		// Build the appropriate paths.
+		$config   = JFactory::getConfig();
+		$tmp_dest = tempnam($config->get('tmp_path'), 'ju');
+		$tmp_src  = $userfile['tmp_name'];
+
+		// Move uploaded file.
+		jimport('joomla.filesystem.file');
+
+		if (version_compare(JVERSION, '3.4.0', 'ge'))
+		{
+			$result = JFile::upload($tmp_src, $tmp_dest, false, true);
+		}
+		else
+		{
+			// Old Joomla! versions didn't have UploadShield and don't need the fourth parameter to accept uploads
+			$result = JFile::upload($tmp_src, $tmp_dest);
+		}
+
+		if (!$result)
+		{
+			throw new RuntimeException(JText::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'), 500);
+		}
+
+		JFactory::getApplication()->setUserState('com_joomlaupdate.temp_file', $tmp_dest);
+	}
+
+	/**
+	 * Checks the super admin credentials are valid for the currently logged in users
+	 *
+	 * @param   array  $credentials  The credentials to authenticate the user with
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.0
+	 */
+	public function captiveLogin($credentials)
+	{
+		// Make sure the username matches
+		$username = isset($credentials['username']) ? $credentials['username'] : null;
+		$user     = JFactory::getUser();
+
+		if (strtolower($user->username) != strtolower($username))
+		{
+			return false;
+		}
+
+		// Make sure the user we're authorising is a Super User
+		if (!$user->authorise('core.admin'))
+		{
+			return false;
+		}
+
+		// Get the global JAuthentication object.
+		$authenticate = JAuthentication::getInstance();
+		$response     = $authenticate->authenticate($credentials);
+
+		if ($response->status !== JAuthentication::STATUS_SUCCESS)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Does the captive (temporary) file we uploaded before still exist?
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.0
+	 */
+	public function captiveFileExists()
+	{
+		$file = JFactory::getApplication()->getUserState('com_joomlaupdate.temp_file', null);
+
+		JLoader::import('joomla.filesystem.file');
+
+		if (empty($file) || !JFile::exists($file))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove the captive (temporary) file we uploaded before and the .
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function removePackageFiles()
+	{
+		$files = array(
+			JFactory::getApplication()->getUserState('com_joomlaupdate.temp_file', null),
+			JFactory::getApplication()->getUserState('com_joomlaupdate.file', null),
+		);
+
+		JLoader::import('joomla.filesystem.file');
+
+		foreach ($files as $file)
+		{
+			if (JFile::exists($file))
+			{
+				if (!@unlink($file))
+				{
+					JFile::delete($file);
+				}
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/restore.php b/core/administrator/components/com_joomlaupdate/restore.php
new file mode 100644
index 00000000..4c16959c
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/restore.php
@@ -0,0 +1,8439 @@
+<?php
+/**
+ * Akeeba Restore
+ *
+ * An archive extraction engine for ZIP, JPA and JPS archives.
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ */
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+define('_AKEEBA_RESTORATION', 1);
+defined('DS') or define('DS', DIRECTORY_SEPARATOR);
+
+// Unarchiver run states
+define('AK_STATE_NOFILE', 0); // File header not read yet
+define('AK_STATE_HEADER', 1); // File header read; ready to process data
+define('AK_STATE_DATA', 2); // Processing file data
+define('AK_STATE_DATAREAD', 3); // Finished processing file data; ready to post-process
+define('AK_STATE_POSTPROC', 4); // Post-processing
+define('AK_STATE_DONE', 5); // Done with post-processing
+
+/* Windows system detection */
+if (!defined('_AKEEBA_IS_WINDOWS'))
+{
+	if (function_exists('php_uname'))
+	{
+		define('_AKEEBA_IS_WINDOWS', stristr(php_uname(), 'windows'));
+	}
+	else
+	{
+		define('_AKEEBA_IS_WINDOWS', DIRECTORY_SEPARATOR == '\\');
+	}
+}
+
+// Get the file's root
+if (!defined('KSROOTDIR'))
+{
+	define('KSROOTDIR', dirname(__FILE__));
+}
+if (!defined('KSLANGDIR'))
+{
+	define('KSLANGDIR', KSROOTDIR);
+}
+
+// Make sure the locale is correct for basename() to work
+if (function_exists('setlocale'))
+{
+	@setlocale(LC_ALL, 'en_US.UTF8');
+}
+
+// fnmatch not available on non-POSIX systems
+// Thanks to soywiz@php.net for this usefull alternative function [http://gr2.php.net/fnmatch]
+if (!function_exists('fnmatch'))
+{
+	function fnmatch($pattern, $string)
+	{
+		return @preg_match(
+			'/^' . strtr(addcslashes($pattern, '/\\.+^$(){}=!<>|'),
+				array('*' => '.*', '?' => '.?')) . '$/i', $string
+		);
+	}
+}
+
+// Unicode-safe binary data length function
+if (!function_exists('akstringlen'))
+{
+	if (function_exists('mb_strlen'))
+	{
+		function akstringlen($string)
+		{
+			return mb_strlen($string, '8bit');
+		}
+	}
+	else
+	{
+		function akstringlen($string)
+		{
+			return strlen($string);
+		}
+	}
+}
+
+if (!function_exists('aksubstr'))
+{
+	if (function_exists('mb_strlen'))
+	{
+		function aksubstr($string, $start, $length = null)
+		{
+			return mb_substr($string, $start, $length, '8bit');
+		}
+	}
+	else
+	{
+		function aksubstr($string, $start, $length = null)
+		{
+			return substr($string, $start, $length);
+		}
+	}
+}
+
+/**
+ * Gets a query parameter from GET or POST data
+ *
+ * @param $key
+ * @param $default
+ */
+function getQueryParam($key, $default = null)
+{
+	$value = $default;
+
+	if (array_key_exists($key, $_REQUEST))
+	{
+		$value = $_REQUEST[$key];
+	}
+
+	if (get_magic_quotes_gpc() && !is_null($value))
+	{
+		$value = stripslashes($value);
+	}
+
+	return $value;
+}
+
+// Debugging function
+function debugMsg($msg)
+{
+	if (!defined('KSDEBUG'))
+	{
+		return;
+	}
+
+	$fp = fopen('debug.txt', 'at');
+
+	fwrite($fp, $msg . "\n");
+	fclose($fp);
+
+	// Echo to stdout if KSDEBUGCLI is defined
+	if (defined('KSDEBUGCLI'))
+	{
+		echo $msg . "\n";
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The base class of Akeeba Engine objects. Allows for error and warnings logging
+ * and propagation. Largely based on the Joomla! 1.5 JObject class.
+ */
+abstract class AKAbstractObject
+{
+	/** @var    array    The queue size of the $_errors array. Set to 0 for infinite size. */
+	protected $_errors_queue_size = 0;
+	/** @var    array    The queue size of the $_warnings array. Set to 0 for infinite size. */
+	protected $_warnings_queue_size = 0;
+	/** @var    array    An array of errors */
+	private $_errors = array();
+	/** @var    array    An array of warnings */
+	private $_warnings = array();
+
+	/**
+	 * Public constructor, makes sure we are instantiated only by the factory class
+	 */
+	public function __construct()
+	{
+		/*
+		// Assisted Singleton pattern
+		if(function_exists('debug_backtrace'))
+		{
+			$caller=debug_backtrace();
+			if(
+				($caller[1]['class'] != 'AKFactory') &&
+				($caller[2]['class'] != 'AKFactory') &&
+				($caller[3]['class'] != 'AKFactory') &&
+				($caller[4]['class'] != 'AKFactory')
+			) {
+				var_dump(debug_backtrace());
+				trigger_error("You can't create direct descendants of ".__CLASS__, E_USER_ERROR);
+			}
+		}
+		*/
+	}
+
+	/**
+	 * Get the most recent error message
+	 *
+	 * @param    integer $i Optional error index
+	 *
+	 * @return    string    Error message
+	 */
+	public function getError($i = null)
+	{
+		return $this->getItemFromArray($this->_errors, $i);
+	}
+
+	/**
+	 * Returns the last item of a LIFO string message queue, or a specific item
+	 * if so specified.
+	 *
+	 * @param array $array An array of strings, holding messages
+	 * @param int   $i     Optional message index
+	 *
+	 * @return mixed The message string, or false if the key doesn't exist
+	 */
+	private function getItemFromArray($array, $i = null)
+	{
+		// Find the item
+		if ($i === null)
+		{
+			// Default, return the last item
+			$item = end($array);
+		}
+		else if (!array_key_exists($i, $array))
+		{
+			// If $i has been specified but does not exist, return false
+			return false;
+		}
+		else
+		{
+			$item = $array[$i];
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Return all errors, if any
+	 *
+	 * @return    array    Array of error messages
+	 */
+	public function getErrors()
+	{
+		return $this->_errors;
+	}
+
+	/**
+	 * Resets all error messages
+	 */
+	public function resetErrors()
+	{
+		$this->_errors = array();
+	}
+
+	/**
+	 * Get the most recent warning message
+	 *
+	 * @param    integer $i Optional warning index
+	 *
+	 * @return    string    Error message
+	 */
+	public function getWarning($i = null)
+	{
+		return $this->getItemFromArray($this->_warnings, $i);
+	}
+
+	/**
+	 * Return all warnings, if any
+	 *
+	 * @return    array    Array of error messages
+	 */
+	public function getWarnings()
+	{
+		return $this->_warnings;
+	}
+
+	/**
+	 * Resets all warning messages
+	 */
+	public function resetWarnings()
+	{
+		$this->_warnings = array();
+	}
+
+	/**
+	 * Propagates errors and warnings to a foreign object. The foreign object SHOULD
+	 * implement the setError() and/or setWarning() methods but DOESN'T HAVE TO be of
+	 * AKAbstractObject type. For example, this can even be used to propagate to a
+	 * JObject instance in Joomla!. Propagated items will be removed from ourselves.
+	 *
+	 * @param object $object The object to propagate errors and warnings to.
+	 */
+	public function propagateToObject(&$object)
+	{
+		// Skip non-objects
+		if (!is_object($object))
+		{
+			return;
+		}
+
+		if (method_exists($object, 'setError'))
+		{
+			if (!empty($this->_errors))
+			{
+				foreach ($this->_errors as $error)
+				{
+					$object->setError($error);
+				}
+				$this->_errors = array();
+			}
+		}
+
+		if (method_exists($object, 'setWarning'))
+		{
+			if (!empty($this->_warnings))
+			{
+				foreach ($this->_warnings as $warning)
+				{
+					$object->setWarning($warning);
+				}
+				$this->_warnings = array();
+			}
+		}
+	}
+
+	/**
+	 * Propagates errors and warnings from a foreign object. Each propagated list is
+	 * then cleared on the foreign object, as long as it implements resetErrors() and/or
+	 * resetWarnings() methods.
+	 *
+	 * @param object $object The object to propagate errors and warnings from
+	 */
+	public function propagateFromObject(&$object)
+	{
+		if (method_exists($object, 'getErrors'))
+		{
+			$errors = $object->getErrors();
+			if (!empty($errors))
+			{
+				foreach ($errors as $error)
+				{
+					$this->setError($error);
+				}
+			}
+			if (method_exists($object, 'resetErrors'))
+			{
+				$object->resetErrors();
+			}
+		}
+
+		if (method_exists($object, 'getWarnings'))
+		{
+			$warnings = $object->getWarnings();
+			if (!empty($warnings))
+			{
+				foreach ($warnings as $warning)
+				{
+					$this->setWarning($warning);
+				}
+			}
+			if (method_exists($object, 'resetWarnings'))
+			{
+				$object->resetWarnings();
+			}
+		}
+	}
+
+	/**
+	 * Add an error message
+	 *
+	 * @param    string $error Error message
+	 */
+	public function setError($error)
+	{
+		if ($this->_errors_queue_size > 0)
+		{
+			if (count($this->_errors) >= $this->_errors_queue_size)
+			{
+				array_shift($this->_errors);
+			}
+		}
+
+		$this->_errors[] = $error;
+	}
+
+	/**
+	 * Add an error message
+	 *
+	 * @param    string $error Error message
+	 */
+	public function setWarning($warning)
+	{
+		if ($this->_warnings_queue_size > 0)
+		{
+			if (count($this->_warnings) >= $this->_warnings_queue_size)
+			{
+				array_shift($this->_warnings);
+			}
+		}
+
+		$this->_warnings[] = $warning;
+	}
+
+	/**
+	 * Sets the size of the error queue (acts like a LIFO buffer)
+	 *
+	 * @param int $newSize The new queue size. Set to 0 for infinite length.
+	 */
+	protected function setErrorsQueueSize($newSize = 0)
+	{
+		$this->_errors_queue_size = (int) $newSize;
+	}
+
+	/**
+	 * Sets the size of the warnings queue (acts like a LIFO buffer)
+	 *
+	 * @param int $newSize The new queue size. Set to 0 for infinite length.
+	 */
+	protected function setWarningsQueueSize($newSize = 0)
+	{
+		$this->_warnings_queue_size = (int) $newSize;
+	}
+
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The superclass of all Akeeba Kickstart parts. The "parts" are intelligent stateful
+ * classes which perform a single procedure and have preparation, running and
+ * finalization phases. The transition between phases is handled automatically by
+ * this superclass' tick() final public method, which should be the ONLY public API
+ * exposed to the rest of the Akeeba Engine.
+ */
+abstract class AKAbstractPart extends AKAbstractObject
+{
+	/**
+	 * Indicates whether this part has finished its initialisation cycle
+	 *
+	 * @var boolean
+	 */
+	protected $isPrepared = false;
+
+	/**
+	 * Indicates whether this part has more work to do (it's in running state)
+	 *
+	 * @var boolean
+	 */
+	protected $isRunning = false;
+
+	/**
+	 * Indicates whether this part has finished its finalization cycle
+	 *
+	 * @var boolean
+	 */
+	protected $isFinished = false;
+
+	/**
+	 * Indicates whether this part has finished its run cycle
+	 *
+	 * @var boolean
+	 */
+	protected $hasRan = false;
+
+	/**
+	 * The name of the engine part (a.k.a. Domain), used in return table
+	 * generation.
+	 *
+	 * @var string
+	 */
+	protected $active_domain = "";
+
+	/**
+	 * The step this engine part is in. Used verbatim in return table and
+	 * should be set by the code in the _run() method.
+	 *
+	 * @var string
+	 */
+	protected $active_step = "";
+
+	/**
+	 * A more detailed description of the step this engine part is in. Used
+	 * verbatim in return table and should be set by the code in the _run()
+	 * method.
+	 *
+	 * @var string
+	 */
+	protected $active_substep = "";
+
+	/**
+	 * Any configuration variables, in the form of an array.
+	 *
+	 * @var array
+	 */
+	protected $_parametersArray = array();
+
+	/** @var string The database root key */
+	protected $databaseRoot = array();
+	/** @var array An array of observers */
+	protected $observers = array();
+	/** @var int Last reported warnings's position in array */
+	private $warnings_pointer = -1;
+
+	/**
+	 * The public interface to an engine part. This method takes care for
+	 * calling the correct method in order to perform the initialisation -
+	 * run - finalisation cycle of operation and return a proper response array.
+	 *
+	 * @return    array    A Response Array
+	 */
+	final public function tick()
+	{
+		// Call the right action method, depending on engine part state
+		switch ($this->getState())
+		{
+			case "init":
+				$this->_prepare();
+				break;
+			case "prepared":
+				$this->_run();
+				break;
+			case "running":
+				$this->_run();
+				break;
+			case "postrun":
+				$this->_finalize();
+				break;
+		}
+
+		// Send a Return Table back to the caller
+		$out = $this->_makeReturnTable();
+
+		return $out;
+	}
+
+	/**
+	 * Returns the state of this engine part.
+	 *
+	 * @return string The state of this engine part. It can be one of
+	 * error, init, prepared, running, postrun, finished.
+	 */
+	final public function getState()
+	{
+		if ($this->getError())
+		{
+			return "error";
+		}
+
+		if (!($this->isPrepared))
+		{
+			return "init";
+		}
+
+		if (!($this->isFinished) && !($this->isRunning) && !($this->hasRun) && ($this->isPrepared))
+		{
+			return "prepared";
+		}
+
+		if (!($this->isFinished) && $this->isRunning && !($this->hasRun))
+		{
+			return "running";
+		}
+
+		if (!($this->isFinished) && !($this->isRunning) && $this->hasRun)
+		{
+			return "postrun";
+		}
+
+		if ($this->isFinished)
+		{
+			return "finished";
+		}
+	}
+
+	/**
+	 * Runs the preparation for this part. Should set _isPrepared
+	 * to true
+	 */
+	abstract protected function _prepare();
+
+	/**
+	 * Runs the main functionality loop for this part. Upon calling,
+	 * should set the _isRunning to true. When it finished, should set
+	 * the _hasRan to true. If an error is encountered, setError should
+	 * be used.
+	 */
+	abstract protected function _run();
+
+	/**
+	 * Runs the finalisation process for this part. Should set
+	 * _isFinished to true.
+	 */
+	abstract protected function _finalize();
+
+	/**
+	 * Constructs a Response Array based on the engine part's state.
+	 *
+	 * @return array The Response Array for the current state
+	 */
+	final protected function _makeReturnTable()
+	{
+		// Get a list of warnings
+		$warnings = $this->getWarnings();
+		// Report only new warnings if there is no warnings queue size
+		if ($this->_warnings_queue_size == 0)
+		{
+			if (($this->warnings_pointer > 0) && ($this->warnings_pointer < (count($warnings))))
+			{
+				$warnings = array_slice($warnings, $this->warnings_pointer + 1);
+				$this->warnings_pointer += count($warnings);
+			}
+			else
+			{
+				$this->warnings_pointer = count($warnings);
+			}
+		}
+
+		$out = array(
+			'HasRun'   => (!($this->isFinished)),
+			'Domain'   => $this->active_domain,
+			'Step'     => $this->active_step,
+			'Substep'  => $this->active_substep,
+			'Error'    => $this->getError(),
+			'Warnings' => $warnings
+		);
+
+		return $out;
+	}
+
+	/**
+	 * Returns a copy of the class's status array
+	 *
+	 * @return array
+	 */
+	public function getStatusArray()
+	{
+		return $this->_makeReturnTable();
+	}
+
+	/**
+	 * Sends any kind of setup information to the engine part. Using this,
+	 * we avoid passing parameters to the constructor of the class. These
+	 * parameters should be passed as an indexed array and should be taken
+	 * into account during the preparation process only. This function will
+	 * set the error flag if it's called after the engine part is prepared.
+	 *
+	 * @param array $parametersArray The parameters to be passed to the
+	 *                               engine part.
+	 */
+	final public function setup($parametersArray)
+	{
+		if ($this->isPrepared)
+		{
+			$this->setState('error', "Can't modify configuration after the preparation of " . $this->active_domain);
+		}
+		else
+		{
+			$this->_parametersArray = $parametersArray;
+			if (array_key_exists('root', $parametersArray))
+			{
+				$this->databaseRoot = $parametersArray['root'];
+			}
+		}
+	}
+
+	/**
+	 * Sets the engine part's internal state, in an easy to use manner
+	 *
+	 * @param    string $state        One of init, prepared, running, postrun, finished, error
+	 * @param    string $errorMessage The reported error message, should the state be set to error
+	 */
+	protected function setState($state = 'init', $errorMessage = 'Invalid setState argument')
+	{
+		switch ($state)
+		{
+			case 'init':
+				$this->isPrepared = false;
+				$this->isRunning  = false;
+				$this->isFinished = false;
+				$this->hasRun     = false;
+				break;
+
+			case 'prepared':
+				$this->isPrepared = true;
+				$this->isRunning  = false;
+				$this->isFinished = false;
+				$this->hasRun     = false;
+				break;
+
+			case 'running':
+				$this->isPrepared = true;
+				$this->isRunning  = true;
+				$this->isFinished = false;
+				$this->hasRun     = false;
+				break;
+
+			case 'postrun':
+				$this->isPrepared = true;
+				$this->isRunning  = false;
+				$this->isFinished = false;
+				$this->hasRun     = true;
+				break;
+
+			case 'finished':
+				$this->isPrepared = true;
+				$this->isRunning  = false;
+				$this->isFinished = true;
+				$this->hasRun     = false;
+				break;
+
+			case 'error':
+			default:
+				$this->setError($errorMessage);
+				break;
+		}
+	}
+
+	final public function getDomain()
+	{
+		return $this->active_domain;
+	}
+
+	final public function getStep()
+	{
+		return $this->active_step;
+	}
+
+	final public function getSubstep()
+	{
+		return $this->active_substep;
+	}
+
+	/**
+	 * Attaches an observer object
+	 *
+	 * @param AKAbstractPartObserver $obs
+	 */
+	function attach(AKAbstractPartObserver $obs)
+	{
+		$this->observers["$obs"] = $obs;
+	}
+
+	/**
+	 * Detaches an observer object
+	 *
+	 * @param AKAbstractPartObserver $obs
+	 */
+	function detach(AKAbstractPartObserver $obs)
+	{
+		delete($this->observers["$obs"]);
+	}
+
+	/**
+	 * Sets the BREAKFLAG, which instructs this engine part that the current step must break immediately,
+	 * in fear of timing out.
+	 */
+	protected function setBreakFlag()
+	{
+		AKFactory::set('volatile.breakflag', true);
+	}
+
+	final protected function setDomain($new_domain)
+	{
+		$this->active_domain = $new_domain;
+	}
+
+	final protected function setStep($new_step)
+	{
+		$this->active_step = $new_step;
+	}
+
+	final protected function setSubstep($new_substep)
+	{
+		$this->active_substep = $new_substep;
+	}
+
+	/**
+	 * Notifies observers each time something interesting happened to the part
+	 *
+	 * @param mixed $message The event object
+	 */
+	protected function notify($message)
+	{
+		foreach ($this->observers as $obs)
+		{
+			$obs->update($this, $message);
+		}
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The base class of unarchiver classes
+ */
+abstract class AKAbstractUnarchiver extends AKAbstractPart
+{
+	/** @var array List of the names of all archive parts */
+	public $archiveList = array();
+	/** @var int The total size of all archive parts */
+	public $totalSize = array();
+	/** @var array Which files to rename */
+	public $renameFiles = array();
+	/** @var array Which directories to rename */
+	public $renameDirs = array();
+	/** @var array Which files to skip */
+	public $skipFiles = array();
+	/** @var string Archive filename */
+	protected $filename = null;
+	/** @var integer Current archive part number */
+	protected $currentPartNumber = -1;
+	/** @var integer The offset inside the current part */
+	protected $currentPartOffset = 0;
+	/** @var bool Should I restore permissions? */
+	protected $flagRestorePermissions = false;
+	/** @var AKAbstractPostproc Post processing class */
+	protected $postProcEngine = null;
+	/** @var string Absolute path to prepend to extracted files */
+	protected $addPath = '';
+	/** @var string Absolute path to remove from extracted files */
+	protected $removePath = '';
+	/** @var integer Chunk size for processing */
+	protected $chunkSize = 524288;
+
+	/** @var resource File pointer to the current archive part file */
+	protected $fp = null;
+
+	/** @var int Run state when processing the current archive file */
+	protected $runState = null;
+
+	/** @var stdClass File header data, as read by the readFileHeader() method */
+	protected $fileHeader = null;
+
+	/** @var int How much of the uncompressed data we've read so far */
+	protected $dataReadLength = 0;
+
+	/** @var array Unwriteable files in these directories are always ignored and do not cause errors when not extracted */
+	protected $ignoreDirectories = array();
+
+	/**
+	 * Public constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Wakeup function, called whenever the class is unserialized
+	 */
+	public function __wakeup()
+	{
+		if ($this->currentPartNumber >= 0)
+		{
+			$this->fp = @fopen($this->archiveList[$this->currentPartNumber], 'rb');
+			if ((is_resource($this->fp)) && ($this->currentPartOffset > 0))
+			{
+				@fseek($this->fp, $this->currentPartOffset);
+			}
+		}
+	}
+
+	/**
+	 * Sleep function, called whenever the class is serialized
+	 */
+	public function shutdown()
+	{
+		if (is_resource($this->fp))
+		{
+			$this->currentPartOffset = @ftell($this->fp);
+			@fclose($this->fp);
+		}
+	}
+
+	/**
+	 * Is this file or directory contained in a directory we've decided to ignore
+	 * write errors for? This is useful to let the extraction work despite write
+	 * errors in the log, logs and tmp directories which MIGHT be used by the system
+	 * on some low quality hosts and Plesk-powered hosts.
+	 *
+	 * @param   string $shortFilename The relative path of the file/directory in the package
+	 *
+	 * @return  boolean  True if it belongs in an ignored directory
+	 */
+	public function isIgnoredDirectory($shortFilename)
+	{
+		// return false;
+
+		if (substr($shortFilename, -1) == '/')
+		{
+			$check = rtrim($shortFilename, '/');
+		}
+		else
+		{
+			$check = dirname($shortFilename);
+		}
+
+		return in_array($check, $this->ignoreDirectories);
+	}
+
+	/**
+	 * Implements the abstract _prepare() method
+	 */
+	final protected function _prepare()
+	{
+		parent::__construct();
+
+		if (count($this->_parametersArray) > 0)
+		{
+			foreach ($this->_parametersArray as $key => $value)
+			{
+				switch ($key)
+				{
+					// Archive's absolute filename
+					case 'filename':
+						$this->filename = $value;
+
+						// Sanity check
+						if (!empty($value))
+						{
+							$value = strtolower($value);
+
+							if (strlen($value) > 6)
+							{
+								if (
+									(substr($value, 0, 7) == 'http://')
+									|| (substr($value, 0, 8) == 'https://')
+									|| (substr($value, 0, 6) == 'ftp://')
+									|| (substr($value, 0, 7) == 'ssh2://')
+									|| (substr($value, 0, 6) == 'ssl://')
+								)
+								{
+									$this->setState('error', 'Invalid archive location');
+								}
+							}
+						}
+
+
+						break;
+
+					// Should I restore permissions?
+					case 'restore_permissions':
+						$this->flagRestorePermissions = $value;
+						break;
+
+					// Should I use FTP?
+					case 'post_proc':
+						$this->postProcEngine = AKFactory::getpostProc($value);
+						break;
+
+					// Path to add in the beginning
+					case 'add_path':
+						$this->addPath = $value;
+						$this->addPath = str_replace('\\', '/', $this->addPath);
+						$this->addPath = rtrim($this->addPath, '/');
+						if (!empty($this->addPath))
+						{
+							$this->addPath .= '/';
+						}
+						break;
+
+					// Path to remove from the beginning
+					case 'remove_path':
+						$this->removePath = $value;
+						$this->removePath = str_replace('\\', '/', $this->removePath);
+						$this->removePath = rtrim($this->removePath, '/');
+						if (!empty($this->removePath))
+						{
+							$this->removePath .= '/';
+						}
+						break;
+
+					// Which files to rename (hash array)
+					case 'rename_files':
+						$this->renameFiles = $value;
+						break;
+
+					// Which files to rename (hash array)
+					case 'rename_dirs':
+						$this->renameDirs = $value;
+						break;
+
+					// Which files to skip (indexed array)
+					case 'skip_files':
+						$this->skipFiles = $value;
+						break;
+
+					// Which directories to ignore when we can't write files in them (indexed array)
+					case 'ignoredirectories':
+						$this->ignoreDirectories = $value;
+						break;
+				}
+			}
+		}
+
+		$this->scanArchives();
+
+		$this->readArchiveHeader();
+		$errMessage = $this->getError();
+		if (!empty($errMessage))
+		{
+			$this->setState('error', $errMessage);
+		}
+		else
+		{
+			$this->runState = AK_STATE_NOFILE;
+			$this->setState('prepared');
+		}
+	}
+
+	/**
+	 * Scans for archive parts
+	 */
+	private function scanArchives()
+	{
+		if (defined('KSDEBUG'))
+		{
+			@unlink('debug.txt');
+		}
+		debugMsg('Preparing to scan archives');
+
+		$privateArchiveList = array();
+
+		// Get the components of the archive filename
+		$dirname         = dirname($this->filename);
+		$base_extension  = $this->getBaseExtension();
+		$basename        = basename($this->filename, $base_extension);
+		$this->totalSize = 0;
+
+		// Scan for multiple parts until we don't find any more of them
+		$count             = 0;
+		$found             = true;
+		$this->archiveList = array();
+		while ($found)
+		{
+			++$count;
+			$extension = substr($base_extension, 0, 2) . sprintf('%02d', $count);
+			$filename  = $dirname . DIRECTORY_SEPARATOR . $basename . $extension;
+			$found     = file_exists($filename);
+			if ($found)
+			{
+				debugMsg('- Found archive ' . $filename);
+				// Add yet another part, with a numeric-appended filename
+				$this->archiveList[] = $filename;
+
+				$filesize = @filesize($filename);
+				$this->totalSize += $filesize;
+
+				$privateArchiveList[] = array($filename, $filesize);
+			}
+			else
+			{
+				debugMsg('- Found archive ' . $this->filename);
+				// Add the last part, with the regular extension
+				$this->archiveList[] = $this->filename;
+
+				$filename = $this->filename;
+				$filesize = @filesize($filename);
+				$this->totalSize += $filesize;
+
+				$privateArchiveList[] = array($filename, $filesize);
+			}
+		}
+		debugMsg('Total archive parts: ' . $count);
+
+		$this->currentPartNumber = -1;
+		$this->currentPartOffset = 0;
+		$this->runState          = AK_STATE_NOFILE;
+
+		// Send start of file notification
+		$message                     = new stdClass;
+		$message->type               = 'totalsize';
+		$message->content            = new stdClass;
+		$message->content->totalsize = $this->totalSize;
+		$message->content->filelist  = $privateArchiveList;
+		$this->notify($message);
+	}
+
+	/**
+	 * Returns the base extension of the file, e.g. '.jpa'
+	 *
+	 * @return string
+	 */
+	private function getBaseExtension()
+	{
+		static $baseextension;
+
+		if (empty($baseextension))
+		{
+			$basename      = basename($this->filename);
+			$lastdot       = strrpos($basename, '.');
+			$baseextension = substr($basename, $lastdot);
+		}
+
+		return $baseextension;
+	}
+
+	/**
+	 * Concrete classes are supposed to use this method in order to read the archive's header and
+	 * prepare themselves to the point of being ready to extract the first file.
+	 */
+	protected abstract function readArchiveHeader();
+
+	protected function _run()
+	{
+		if ($this->getState() == 'postrun')
+		{
+			return;
+		}
+
+		$this->setState('running');
+
+		$timer = AKFactory::getTimer();
+
+		$status = true;
+		while ($status && ($timer->getTimeLeft() > 0))
+		{
+			switch ($this->runState)
+			{
+				case AK_STATE_NOFILE:
+					debugMsg(__CLASS__ . '::_run() - Reading file header');
+					$status = $this->readFileHeader();
+					if ($status)
+					{
+						// Send start of file notification
+						$message                        = new stdClass;
+						$message->type                  = 'startfile';
+						$message->content               = new stdClass;
+						$message->content->realfile     = $this->fileHeader->file;
+						$message->content->file         = $this->fileHeader->file;
+						$message->content->uncompressed = $this->fileHeader->uncompressed;
+
+						if (array_key_exists('realfile', get_object_vars($this->fileHeader)))
+						{
+							$message->content->realfile = $this->fileHeader->realFile;
+						}
+
+						if (array_key_exists('compressed', get_object_vars($this->fileHeader)))
+						{
+							$message->content->compressed = $this->fileHeader->compressed;
+						}
+						else
+						{
+							$message->content->compressed = 0;
+						}
+
+						debugMsg(__CLASS__ . '::_run() - Preparing to extract ' . $message->content->realfile);
+
+						$this->notify($message);
+					}
+					else
+					{
+						debugMsg(__CLASS__ . '::_run() - Could not read file header');
+					}
+					break;
+
+				case AK_STATE_HEADER:
+				case AK_STATE_DATA:
+					debugMsg(__CLASS__ . '::_run() - Processing file data');
+					$status = $this->processFileData();
+					break;
+
+				case AK_STATE_DATAREAD:
+				case AK_STATE_POSTPROC:
+					debugMsg(__CLASS__ . '::_run() - Calling post-processing class');
+					$this->postProcEngine->timestamp = $this->fileHeader->timestamp;
+					$status                          = $this->postProcEngine->process();
+					$this->propagateFromObject($this->postProcEngine);
+					$this->runState = AK_STATE_DONE;
+					break;
+
+				case AK_STATE_DONE:
+				default:
+					if ($status)
+					{
+						debugMsg(__CLASS__ . '::_run() - Finished extracting file');
+						// Send end of file notification
+						$message          = new stdClass;
+						$message->type    = 'endfile';
+						$message->content = new stdClass;
+						if (array_key_exists('realfile', get_object_vars($this->fileHeader)))
+						{
+							$message->content->realfile = $this->fileHeader->realFile;
+						}
+						else
+						{
+							$message->content->realfile = $this->fileHeader->file;
+						}
+						$message->content->file = $this->fileHeader->file;
+						if (array_key_exists('compressed', get_object_vars($this->fileHeader)))
+						{
+							$message->content->compressed = $this->fileHeader->compressed;
+						}
+						else
+						{
+							$message->content->compressed = 0;
+						}
+						$message->content->uncompressed = $this->fileHeader->uncompressed;
+						$this->notify($message);
+					}
+					$this->runState = AK_STATE_NOFILE;
+					continue;
+			}
+		}
+
+		$error = $this->getError();
+		if (!$status && ($this->runState == AK_STATE_NOFILE) && empty($error))
+		{
+			debugMsg(__CLASS__ . '::_run() - Just finished');
+			// We just finished
+			$this->setState('postrun');
+		}
+		elseif (!empty($error))
+		{
+			debugMsg(__CLASS__ . '::_run() - Halted with an error:');
+			debugMsg($error);
+			$this->setState('error', $error);
+		}
+	}
+
+	/**
+	 * Concrete classes must use this method to read the file header
+	 *
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
+	 */
+	protected abstract function readFileHeader();
+
+	/**
+	 * Concrete classes must use this method to process file data. It must set $runState to AK_STATE_DATAREAD when
+	 * it's finished processing the file data.
+	 *
+	 * @return bool True if processing the file data was successful, false if an error occurred
+	 */
+	protected abstract function processFileData();
+
+	protected function _finalize()
+	{
+		// Nothing to do
+		$this->setState('finished');
+	}
+
+	/**
+	 * Opens the next part file for reading
+	 */
+	protected function nextFile()
+	{
+		debugMsg('Current part is ' . $this->currentPartNumber . '; opening the next part');
+		++$this->currentPartNumber;
+
+		if ($this->currentPartNumber > (count($this->archiveList) - 1))
+		{
+			$this->setState('postrun');
+
+			return false;
+		}
+		else
+		{
+			if (is_resource($this->fp))
+			{
+				@fclose($this->fp);
+			}
+			debugMsg('Opening file ' . $this->archiveList[$this->currentPartNumber]);
+			$this->fp = @fopen($this->archiveList[$this->currentPartNumber], 'rb');
+			if ($this->fp === false)
+			{
+				debugMsg('Could not open file - crash imminent');
+				$this->setError(AKText::sprintf('ERR_COULD_NOT_OPEN_ARCHIVE_PART', $this->archiveList[$this->currentPartNumber]));
+			}
+			fseek($this->fp, 0);
+			$this->currentPartOffset = 0;
+
+			return true;
+		}
+	}
+
+	/**
+	 * Returns true if we have reached the end of file
+	 *
+	 * @param $local bool True to return EOF of the local file, false (default) to return if we have reached the end of
+	 *               the archive set
+	 *
+	 * @return bool True if we have reached End Of File
+	 */
+	protected function isEOF($local = false)
+	{
+		$eof = @feof($this->fp);
+
+		if (!$eof)
+		{
+			// Border case: right at the part's end (eeeek!!!). For the life of me, I don't understand why
+			// feof() doesn't report true. It expects the fp to be positioned *beyond* the EOF to report
+			// true. Incredible! :(
+			$position = @ftell($this->fp);
+			$filesize = @filesize($this->archiveList[$this->currentPartNumber]);
+			if ($filesize <= 0)
+			{
+				// 2Gb or more files on a 32 bit version of PHP tend to get screwed up. Meh.
+				$eof = false;
+			}
+			elseif ($position >= $filesize)
+			{
+				$eof = true;
+			}
+		}
+
+		if ($local)
+		{
+			return $eof;
+		}
+		else
+		{
+			return $eof && ($this->currentPartNumber >= (count($this->archiveList) - 1));
+		}
+	}
+
+	/**
+	 * Tries to make a directory user-writable so that we can write a file to it
+	 *
+	 * @param $path string A path to a file
+	 */
+	protected function setCorrectPermissions($path)
+	{
+		static $rootDir = null;
+
+		if (is_null($rootDir))
+		{
+			$rootDir = rtrim(AKFactory::get('kickstart.setup.destdir', ''), '/\\');
+		}
+
+		$directory = rtrim(dirname($path), '/\\');
+		if ($directory != $rootDir)
+		{
+			// Is this an unwritable directory?
+			if (!is_writeable($directory))
+			{
+				$this->postProcEngine->chmod($directory, 0755);
+			}
+		}
+		$this->postProcEngine->chmod($path, 0644);
+	}
+
+	/**
+	 * Reads data from the archive and notifies the observer with the 'reading' message
+	 *
+	 * @param $fp
+	 * @param $length
+	 */
+	protected function fread($fp, $length = null)
+	{
+		if (is_numeric($length))
+		{
+			if ($length > 0)
+			{
+				$data = fread($fp, $length);
+			}
+			else
+			{
+				$data = fread($fp, PHP_INT_MAX);
+			}
+		}
+		else
+		{
+			$data = fread($fp, PHP_INT_MAX);
+		}
+		if ($data === false)
+		{
+			$data = '';
+		}
+
+		// Send start of file notification
+		$message                  = new stdClass;
+		$message->type            = 'reading';
+		$message->content         = new stdClass;
+		$message->content->length = strlen($data);
+		$this->notify($message);
+
+		return $data;
+	}
+
+	/**
+	 * Removes the configured $removePath from the path $path
+	 *
+	 * @param   string $path The path to reduce
+	 *
+	 * @return  string  The reduced path
+	 */
+	protected function removePath($path)
+	{
+		if (empty($this->removePath))
+		{
+			return $path;
+		}
+
+		if (strpos($path, $this->removePath) === 0)
+		{
+			$path = substr($path, strlen($this->removePath));
+			$path = ltrim($path, '/\\');
+		}
+
+		return $path;
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * File post processor engines base class
+ */
+abstract class AKAbstractPostproc extends AKAbstractObject
+{
+	/** @var int The UNIX timestamp of the file's desired modification date */
+	public $timestamp = 0;
+	/** @var string The current (real) file path we'll have to process */
+	protected $filename = null;
+	/** @var int The requested permissions */
+	protected $perms = 0755;
+	/** @var string The temporary file path we gave to the unarchiver engine */
+	protected $tempFilename = null;
+
+	/**
+	 * Processes the current file, e.g. moves it from temp to final location by FTP
+	 */
+	abstract public function process();
+
+	/**
+	 * The unarchiver tells us the path to the filename it wants to extract and we give it
+	 * a different path instead.
+	 *
+	 * @param string $filename The path to the real file
+	 * @param int    $perms    The permissions we need the file to have
+	 *
+	 * @return string The path to the temporary file
+	 */
+	abstract public function processFilename($filename, $perms = 0755);
+
+	/**
+	 * Recursively creates a directory if it doesn't exist
+	 *
+	 * @param string $dirName The directory to create
+	 * @param int    $perms   The permissions to give to that directory
+	 */
+	abstract public function createDirRecursive($dirName, $perms);
+
+	abstract public function chmod($file, $perms);
+
+	abstract public function unlink($file);
+
+	abstract public function rmdir($directory);
+
+	abstract public function rename($from, $to);
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Descendants of this class can be used in the unarchiver's observer methods (attach, detach and notify)
+ *
+ * @author Nicholas
+ *
+ */
+abstract class AKAbstractPartObserver
+{
+	abstract public function update($object, $message);
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Direct file writer
+ */
+class AKPostprocDirect extends AKAbstractPostproc
+{
+	public function process()
+	{
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		if ($restorePerms)
+		{
+			@chmod($this->filename, $this->perms);
+		}
+		else
+		{
+			if (@is_file($this->filename))
+			{
+				@chmod($this->filename, 0644);
+			}
+			else
+			{
+				@chmod($this->filename, 0755);
+			}
+		}
+		if ($this->timestamp > 0)
+		{
+			@touch($this->filename, $this->timestamp);
+		}
+
+		return true;
+	}
+
+	public function processFilename($filename, $perms = 0755)
+	{
+		$this->perms    = $perms;
+		$this->filename = $filename;
+
+		return $filename;
+	}
+
+	public function createDirRecursive($dirName, $perms)
+	{
+		if (AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			return true;
+		}
+		if (@mkdir($dirName, 0755, true))
+		{
+			@chmod($dirName, 0755);
+
+			return true;
+		}
+
+		$root = AKFactory::get('kickstart.setup.destdir');
+		$root = rtrim(str_replace('\\', '/', $root), '/');
+		$dir  = rtrim(str_replace('\\', '/', $dirName), '/');
+		if (strpos($dir, $root) === 0)
+		{
+			$dir = ltrim(substr($dir, strlen($root)), '/');
+			$root .= '/';
+		}
+		else
+		{
+			$root = '';
+		}
+
+		if (empty($dir))
+		{
+			return true;
+		}
+
+		$dirArray = explode('/', $dir);
+		$path     = '';
+		foreach ($dirArray as $dir)
+		{
+			$path .= $dir . '/';
+			$ret = is_dir($root . $path) ? true : @mkdir($root . $path);
+			if (!$ret)
+			{
+				// Is this a file instead of a directory?
+				if (is_file($root . $path))
+				{
+					@unlink($root . $path);
+					$ret = @mkdir($root . $path);
+				}
+				if (!$ret)
+				{
+					$this->setError(AKText::sprintf('COULDNT_CREATE_DIR', $path));
+
+					return false;
+				}
+			}
+			// Try to set new directory permissions to 0755
+			@chmod($root . $path, $perms);
+		}
+
+		return true;
+	}
+
+	public function chmod($file, $perms)
+	{
+		if (AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			return true;
+		}
+
+		return @chmod($file, $perms);
+	}
+
+	public function unlink($file)
+	{
+		return @unlink($file);
+	}
+
+	public function rmdir($directory)
+	{
+		return @rmdir($directory);
+	}
+
+	public function rename($from, $to)
+	{
+		return @rename($from, $to);
+	}
+
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * FTP file writer
+ */
+class AKPostprocFTP extends AKAbstractPostproc
+{
+	/** @var bool Should I use FTP over implicit SSL? */
+	public $useSSL = false;
+	/** @var bool use Passive mode? */
+	public $passive = true;
+	/** @var string FTP host name */
+	public $host = '';
+	/** @var int FTP port */
+	public $port = 21;
+	/** @var string FTP user name */
+	public $user = '';
+	/** @var string FTP password */
+	public $pass = '';
+	/** @var string FTP initial directory */
+	public $dir = '';
+	/** @var resource The FTP handle */
+	private $handle = null;
+	/** @var string The temporary directory where the data will be stored */
+	private $tempDir = '';
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->useSSL  = AKFactory::get('kickstart.ftp.ssl', false);
+		$this->passive = AKFactory::get('kickstart.ftp.passive', true);
+		$this->host    = AKFactory::get('kickstart.ftp.host', '');
+		$this->port    = AKFactory::get('kickstart.ftp.port', 21);
+		if (trim($this->port) == '')
+		{
+			$this->port = 21;
+		}
+		$this->user    = AKFactory::get('kickstart.ftp.user', '');
+		$this->pass    = AKFactory::get('kickstart.ftp.pass', '');
+		$this->dir     = AKFactory::get('kickstart.ftp.dir', '');
+		$this->tempDir = AKFactory::get('kickstart.ftp.tempdir', '');
+
+		$connected = $this->connect();
+
+		if ($connected)
+		{
+			if (!empty($this->tempDir))
+			{
+				$tempDir  = rtrim($this->tempDir, '/\\') . '/';
+				$writable = $this->isDirWritable($tempDir);
+			}
+			else
+			{
+				$tempDir  = '';
+				$writable = false;
+			}
+
+			if (!$writable)
+			{
+				// Default temporary directory is the current root
+				$tempDir = KSROOTDIR;
+				if (empty($tempDir))
+				{
+					// Oh, we have no directory reported!
+					$tempDir = '.';
+				}
+				$absoluteDirToHere = $tempDir;
+				$tempDir           = rtrim(str_replace('\\', '/', $tempDir), '/');
+				if (!empty($tempDir))
+				{
+					$tempDir .= '/';
+				}
+				$this->tempDir = $tempDir;
+				// Is this directory writable?
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			if (!$writable)
+			{
+				// Nope. Let's try creating a temporary directory in the site's root.
+				$tempDir                 = $absoluteDirToHere . '/kicktemp';
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				$this->createDirRecursive($tempDir, $trustMeIKnowWhatImDoing);
+				// Try making it writable...
+				$this->fixPermissions($tempDir);
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			// Was the new directory writable?
+			if (!$writable)
+			{
+				// Let's see if the user has specified one
+				$userdir = AKFactory::get('kickstart.ftp.tempdir', '');
+				if (!empty($userdir))
+				{
+					// Is it an absolute or a relative directory?
+					$absolute = false;
+					$absolute = $absolute || (substr($userdir, 0, 1) == '/');
+					$absolute = $absolute || (substr($userdir, 1, 1) == ':');
+					$absolute = $absolute || (substr($userdir, 2, 1) == ':');
+					if (!$absolute)
+					{
+						// Make absolute
+						$tempDir = $absoluteDirToHere . $userdir;
+					}
+					else
+					{
+						// it's already absolute
+						$tempDir = $userdir;
+					}
+					// Does the directory exist?
+					if (is_dir($tempDir))
+					{
+						// Yeah. Is it writable?
+						$writable = $this->isDirWritable($tempDir);
+					}
+				}
+			}
+			$this->tempDir = $tempDir;
+
+			if (!$writable)
+			{
+				// No writable directory found!!!
+				$this->setError(AKText::_('FTP_TEMPDIR_NOT_WRITABLE'));
+			}
+			else
+			{
+				AKFactory::set('kickstart.ftp.tempdir', $tempDir);
+				$this->tempDir = $tempDir;
+			}
+		}
+	}
+
+	public function connect()
+	{
+		// Connect to server, using SSL if so required
+		if ($this->useSSL)
+		{
+			$this->handle = @ftp_ssl_connect($this->host, $this->port);
+		}
+		else
+		{
+			$this->handle = @ftp_connect($this->host, $this->port);
+		}
+		if ($this->handle === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_HOST'));
+
+			return false;
+		}
+
+		// Login
+		if (!@ftp_login($this->handle, $this->user, $this->pass))
+		{
+			$this->setError(AKText::_('WRONG_FTP_USER'));
+			@ftp_close($this->handle);
+
+			return false;
+		}
+
+		// Change to initial directory
+		if (!@ftp_chdir($this->handle, $this->dir))
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH1'));
+			@ftp_close($this->handle);
+
+			return false;
+		}
+
+		// Enable passive mode if the user requested it
+		if ($this->passive)
+		{
+			@ftp_pasv($this->handle, true);
+		}
+		else
+		{
+			@ftp_pasv($this->handle, false);
+		}
+
+		// Try to download ourselves
+		$testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
+		$tempHandle   = fopen('php://temp', 'r+');
+		if (@ftp_fget($this->handle, $tempHandle, $testFilename, FTP_ASCII, 0) === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH2'));
+			@ftp_close($this->handle);
+			fclose($tempHandle);
+
+			return false;
+		}
+		fclose($tempHandle);
+
+		return true;
+	}
+
+	private function isDirWritable($dir)
+	{
+		$fp = @fopen($dir . '/kickstart.dat', 'wb');
+		if ($fp === false)
+		{
+			return false;
+		}
+		else
+		{
+			@fclose($fp);
+			unlink($dir . '/kickstart.dat');
+
+			return true;
+		}
+	}
+
+	public function createDirRecursive($dirName, $perms)
+	{
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			// UNIXize the paths
+			$removePath = str_replace('\\', '/', $removePath);
+			$dirName    = str_replace('\\', '/', $dirName);
+			// Make sure they both end in a slash
+			$removePath = rtrim($removePath, '/\\') . '/';
+			$dirName    = rtrim($dirName, '/\\') . '/';
+			// Process the path removal
+			$left = substr($dirName, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$dirName = substr($dirName, strlen($removePath));
+			}
+		}
+		if (empty($dirName))
+		{
+			$dirName = '';
+		} // 'cause the substr() above may return FALSE.
+
+		$check = '/' . trim($this->dir, '/') . '/' . trim($dirName, '/');
+		if ($this->is_dir($check))
+		{
+			return true;
+		}
+
+		$alldirs     = explode('/', $dirName);
+		$previousDir = '/' . trim($this->dir);
+		foreach ($alldirs as $curdir)
+		{
+			$check = $previousDir . '/' . $curdir;
+			if (!$this->is_dir($check))
+			{
+				// Proactively try to delete a file by the same name
+				@ftp_delete($this->handle, $check);
+
+				if (@ftp_mkdir($this->handle, $check) === false)
+				{
+					// If we couldn't create the directory, attempt to fix the permissions in the PHP level and retry!
+					$this->fixPermissions($removePath . $check);
+					if (@ftp_mkdir($this->handle, $check) === false)
+					{
+						// Can we fall back to pure PHP mode, sire?
+						if (!@mkdir($check))
+						{
+							$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR', $check));
+
+							return false;
+						}
+						else
+						{
+							// Since the directory was built by PHP, change its permissions
+							$trustMeIKnowWhatImDoing =
+								500 + 10 + 1; // working around overzealous scanners written by bozos
+							@chmod($check, $trustMeIKnowWhatImDoing);
+
+							return true;
+						}
+					}
+				}
+				@ftp_chmod($this->handle, $perms, $check);
+			}
+			$previousDir = $check;
+		}
+
+		return true;
+	}
+
+	private function is_dir($dir)
+	{
+		return @ftp_chdir($this->handle, $dir);
+	}
+
+	private function fixPermissions($path)
+	{
+		// Turn off error reporting
+		if (!defined('KSDEBUG'))
+		{
+			$oldErrorReporting = @error_reporting(E_NONE);
+		}
+
+		// Get UNIX style paths
+		$relPath  = str_replace('\\', '/', $path);
+		$basePath = rtrim(str_replace('\\', '/', KSROOTDIR), '/');
+		$basePath = rtrim($basePath, '/');
+		if (!empty($basePath))
+		{
+			$basePath .= '/';
+		}
+		// Remove the leading relative root
+		if (substr($relPath, 0, strlen($basePath)) == $basePath)
+		{
+			$relPath = substr($relPath, strlen($basePath));
+		}
+		$dirArray  = explode('/', $relPath);
+		$pathBuilt = rtrim($basePath, '/');
+		foreach ($dirArray as $dir)
+		{
+			if (empty($dir))
+			{
+				continue;
+			}
+			$oldPath = $pathBuilt;
+			$pathBuilt .= '/' . $dir;
+			if (is_dir($oldPath . $dir))
+			{
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				@chmod($oldPath . $dir, $trustMeIKnowWhatImDoing);
+			}
+			else
+			{
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				if (@chmod($oldPath . $dir, $trustMeIKnowWhatImDoing) === false)
+				{
+					@unlink($oldPath . $dir);
+				}
+			}
+		}
+
+		// Restore error reporting
+		if (!defined('KSDEBUG'))
+		{
+			@error_reporting($oldErrorReporting);
+		}
+	}
+
+	function __wakeup()
+	{
+		$this->connect();
+	}
+
+	public function process()
+	{
+		if (is_null($this->tempFilename))
+		{
+			// If an empty filename is passed, it means that we shouldn't do any post processing, i.e.
+			// the entity was a directory or symlink
+			return true;
+		}
+
+		$remotePath = dirname($this->filename);
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			$removePath = ltrim($removePath, "/");
+			$remotePath = ltrim($remotePath, "/");
+			$left       = substr($remotePath, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$remotePath = substr($remotePath, strlen($removePath));
+			}
+		}
+
+		$absoluteFSPath  = dirname($this->filename);
+		$relativeFTPPath = trim($remotePath, '/');
+		$absoluteFTPPath = '/' . trim($this->dir, '/') . '/' . trim($remotePath, '/');
+		$onlyFilename    = basename($this->filename);
+
+		$remoteName = $absoluteFTPPath . '/' . $onlyFilename;
+
+		$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+		if ($ret === false)
+		{
+			$ret = $this->createDirRecursive($absoluteFSPath, 0755);
+			if ($ret === false)
+			{
+				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
+				return false;
+			}
+			$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+			if ($ret === false)
+			{
+				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
+				return false;
+			}
+		}
+
+		$ret = @ftp_put($this->handle, $remoteName, $this->tempFilename, FTP_BINARY);
+		if ($ret === false)
+		{
+			// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
+			$this->fixPermissions($this->filename);
+			$this->unlink($this->filename);
+
+			$fp = @fopen($this->tempFilename, 'rb');
+			if ($fp !== false)
+			{
+				$ret = @ftp_fput($this->handle, $remoteName, $fp, FTP_BINARY);
+				@fclose($fp);
+			}
+			else
+			{
+				$ret = false;
+			}
+		}
+		@unlink($this->tempFilename);
+
+		if ($ret === false)
+		{
+			$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
+			return false;
+		}
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		if ($restorePerms)
+		{
+			@ftp_chmod($this->_handle, $this->perms, $remoteName);
+		}
+		else
+		{
+			@ftp_chmod($this->_handle, 0644, $remoteName);
+		}
+
+		return true;
+	}
+
+	/*
+	 * Tries to fix directory/file permissions in the PHP level, so that
+	 * the FTP operation doesn't fail.
+	 * @param $path string The full path to a directory or file
+	 */
+
+	public function unlink($file)
+	{
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			$left = substr($file, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$file = substr($file, strlen($removePath));
+			}
+		}
+
+		$check = '/' . trim($this->dir, '/') . '/' . trim($file, '/');
+
+		return @ftp_delete($this->handle, $check);
+	}
+
+	public function processFilename($filename, $perms = 0755)
+	{
+		// Catch some error conditions...
+		if ($this->getError())
+		{
+			return false;
+		}
+
+		// If a null filename is passed, it means that we shouldn't do any post processing, i.e.
+		// the entity was a directory or symlink
+		if (is_null($filename))
+		{
+			$this->filename     = null;
+			$this->tempFilename = null;
+
+			return null;
+		}
+
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			$left = substr($filename, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$filename = substr($filename, strlen($removePath));
+			}
+		}
+
+		// Trim slash on the left
+		$filename = ltrim($filename, '/');
+
+		$this->filename     = $filename;
+		$this->tempFilename = tempnam($this->tempDir, 'kickstart-');
+		$this->perms        = $perms;
+
+		if (empty($this->tempFilename))
+		{
+			// Oops! Let's try something different
+			$this->tempFilename = $this->tempDir . '/kickstart-' . time() . '.dat';
+		}
+
+		return $this->tempFilename;
+	}
+
+	public function close()
+	{
+		@ftp_close($this->handle);
+	}
+
+	public function chmod($file, $perms)
+	{
+		return @ftp_chmod($this->handle, $perms, $file);
+	}
+
+	public function rmdir($directory)
+	{
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			$left = substr($directory, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$directory = substr($directory, strlen($removePath));
+			}
+		}
+
+		$check = '/' . trim($this->dir, '/') . '/' . trim($directory, '/');
+
+		return @ftp_rmdir($this->handle, $check);
+	}
+
+	public function rename($from, $to)
+	{
+		$originalFrom = $from;
+		$originalTo   = $to;
+
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			$left = substr($from, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$from = substr($from, strlen($removePath));
+			}
+		}
+		$from = '/' . trim($this->dir, '/') . '/' . trim($from, '/');
+
+		if (!empty($removePath))
+		{
+			$left = substr($to, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$to = substr($to, strlen($removePath));
+			}
+		}
+		$to = '/' . trim($this->dir, '/') . '/' . trim($to, '/');
+
+		$result = @ftp_rename($this->handle, $from, $to);
+		if ($result !== true)
+		{
+			return @rename($from, $to);
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * FTP file writer
+ */
+class AKPostprocSFTP extends AKAbstractPostproc
+{
+	/** @var bool Should I use FTP over implicit SSL? */
+	public $useSSL = false;
+	/** @var bool use Passive mode? */
+	public $passive = true;
+	/** @var string FTP host name */
+	public $host = '';
+	/** @var int FTP port */
+	public $port = 21;
+	/** @var string FTP user name */
+	public $user = '';
+	/** @var string FTP password */
+	public $pass = '';
+	/** @var string FTP initial directory */
+	public $dir = '';
+
+	/** @var resource SFTP resource handle */
+	private $handle = null;
+
+	/** @var resource SSH2 connection resource handle */
+	private $_connection = null;
+
+	/** @var string Current remote directory, including the remote directory string */
+	private $_currentdir;
+
+	/** @var string The temporary directory where the data will be stored */
+	private $tempDir = '';
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->host = AKFactory::get('kickstart.ftp.host', '');
+		$this->port = AKFactory::get('kickstart.ftp.port', 22);
+
+		if (trim($this->port) == '')
+		{
+			$this->port = 22;
+		}
+
+		$this->user    = AKFactory::get('kickstart.ftp.user', '');
+		$this->pass    = AKFactory::get('kickstart.ftp.pass', '');
+		$this->dir     = AKFactory::get('kickstart.ftp.dir', '');
+		$this->tempDir = AKFactory::get('kickstart.ftp.tempdir', '');
+
+		$connected = $this->connect();
+
+		if ($connected)
+		{
+			if (!empty($this->tempDir))
+			{
+				$tempDir  = rtrim($this->tempDir, '/\\') . '/';
+				$writable = $this->isDirWritable($tempDir);
+			}
+			else
+			{
+				$tempDir  = '';
+				$writable = false;
+			}
+
+			if (!$writable)
+			{
+				// Default temporary directory is the current root
+				$tempDir = KSROOTDIR;
+				if (empty($tempDir))
+				{
+					// Oh, we have no directory reported!
+					$tempDir = '.';
+				}
+				$absoluteDirToHere = $tempDir;
+				$tempDir           = rtrim(str_replace('\\', '/', $tempDir), '/');
+				if (!empty($tempDir))
+				{
+					$tempDir .= '/';
+				}
+				$this->tempDir = $tempDir;
+				// Is this directory writable?
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			if (!$writable)
+			{
+				// Nope. Let's try creating a temporary directory in the site's root.
+				$tempDir                 = $absoluteDirToHere . '/kicktemp';
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				$this->createDirRecursive($tempDir, $trustMeIKnowWhatImDoing);
+				// Try making it writable...
+				$this->fixPermissions($tempDir);
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			// Was the new directory writable?
+			if (!$writable)
+			{
+				// Let's see if the user has specified one
+				$userdir = AKFactory::get('kickstart.ftp.tempdir', '');
+				if (!empty($userdir))
+				{
+					// Is it an absolute or a relative directory?
+					$absolute = false;
+					$absolute = $absolute || (substr($userdir, 0, 1) == '/');
+					$absolute = $absolute || (substr($userdir, 1, 1) == ':');
+					$absolute = $absolute || (substr($userdir, 2, 1) == ':');
+					if (!$absolute)
+					{
+						// Make absolute
+						$tempDir = $absoluteDirToHere . $userdir;
+					}
+					else
+					{
+						// it's already absolute
+						$tempDir = $userdir;
+					}
+					// Does the directory exist?
+					if (is_dir($tempDir))
+					{
+						// Yeah. Is it writable?
+						$writable = $this->isDirWritable($tempDir);
+					}
+				}
+			}
+			$this->tempDir = $tempDir;
+
+			if (!$writable)
+			{
+				// No writable directory found!!!
+				$this->setError(AKText::_('SFTP_TEMPDIR_NOT_WRITABLE'));
+			}
+			else
+			{
+				AKFactory::set('kickstart.ftp.tempdir', $tempDir);
+				$this->tempDir = $tempDir;
+			}
+		}
+	}
+
+	public function connect()
+	{
+		$this->_connection = false;
+
+		if (!function_exists('ssh2_connect'))
+		{
+			$this->setError(AKText::_('SFTP_NO_SSH2'));
+
+			return false;
+		}
+
+		$this->_connection = @ssh2_connect($this->host, $this->port);
+
+		if (!@ssh2_auth_password($this->_connection, $this->user, $this->pass))
+		{
+			$this->setError(AKText::_('SFTP_WRONG_USER'));
+
+			$this->_connection = false;
+
+			return false;
+		}
+
+		$this->handle = @ssh2_sftp($this->_connection);
+
+		// I must have an absolute directory
+		if (!$this->dir)
+		{
+			$this->setError(AKText::_('SFTP_WRONG_STARTING_DIR'));
+
+			return false;
+		}
+
+		// Change to initial directory
+		if (!$this->sftp_chdir('/'))
+		{
+			$this->setError(AKText::_('SFTP_WRONG_STARTING_DIR'));
+
+			unset($this->_connection);
+			unset($this->handle);
+
+			return false;
+		}
+
+		// Try to download ourselves
+		$testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
+		$basePath     = '/' . trim($this->dir, '/');
+
+		if (@fopen("ssh2.sftp://{$this->handle}$basePath/$testFilename", 'r+') === false)
+		{
+			$this->setError(AKText::_('SFTP_WRONG_STARTING_DIR'));
+
+			unset($this->_connection);
+			unset($this->handle);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Changes to the requested directory in the remote server. You give only the
+	 * path relative to the initial directory and it does all the rest by itself,
+	 * including doing nothing if the remote directory is the one we want.
+	 *
+	 * @param   string $dir The (realtive) remote directory
+	 *
+	 * @return  bool True if successful, false otherwise.
+	 */
+	private function sftp_chdir($dir)
+	{
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			// UNIXize the paths
+			$removePath = str_replace('\\', '/', $removePath);
+			$dir        = str_replace('\\', '/', $dir);
+
+			// Make sure they both end in a slash
+			$removePath = rtrim($removePath, '/\\') . '/';
+			$dir        = rtrim($dir, '/\\') . '/';
+
+			// Process the path removal
+			$left = substr($dir, 0, strlen($removePath));
+
+			if ($left == $removePath)
+			{
+				$dir = substr($dir, strlen($removePath));
+			}
+		}
+
+		if (empty($dir))
+		{
+			// Because the substr() above may return FALSE.
+			$dir = '';
+		}
+
+		// Calculate "real" (absolute) SFTP path
+		$realdir = substr($this->dir, -1) == '/' ? substr($this->dir, 0, strlen($this->dir) - 1) : $this->dir;
+		$realdir .= '/' . $dir;
+		$realdir = substr($realdir, 0, 1) == '/' ? $realdir : '/' . $realdir;
+
+		if ($this->_currentdir == $realdir)
+		{
+			// Already there, do nothing
+			return true;
+		}
+
+		$result = @ssh2_sftp_stat($this->handle, $realdir);
+
+		if ($result === false)
+		{
+			return false;
+		}
+		else
+		{
+			// Update the private "current remote directory" variable
+			$this->_currentdir = $realdir;
+
+			return true;
+		}
+	}
+
+	private function isDirWritable($dir)
+	{
+		if (@fopen("ssh2.sftp://{$this->handle}$dir/kickstart.dat", 'wb') === false)
+		{
+			return false;
+		}
+		else
+		{
+			@ssh2_sftp_unlink($this->handle, $dir . '/kickstart.dat');
+
+			return true;
+		}
+	}
+
+	public function createDirRecursive($dirName, $perms)
+	{
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			// UNIXize the paths
+			$removePath = str_replace('\\', '/', $removePath);
+			$dirName    = str_replace('\\', '/', $dirName);
+			// Make sure they both end in a slash
+			$removePath = rtrim($removePath, '/\\') . '/';
+			$dirName    = rtrim($dirName, '/\\') . '/';
+			// Process the path removal
+			$left = substr($dirName, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$dirName = substr($dirName, strlen($removePath));
+			}
+		}
+		if (empty($dirName))
+		{
+			$dirName = '';
+		} // 'cause the substr() above may return FALSE.
+
+		$check = '/' . trim($this->dir, '/ ') . '/' . trim($dirName, '/');
+
+		if ($this->is_dir($check))
+		{
+			return true;
+		}
+
+		$alldirs     = explode('/', $dirName);
+		$previousDir = '/' . trim($this->dir, '/ ');
+
+		foreach ($alldirs as $curdir)
+		{
+			if (!$curdir)
+			{
+				continue;
+			}
+
+			$check = $previousDir . '/' . $curdir;
+
+			if (!$this->is_dir($check))
+			{
+				// Proactively try to delete a file by the same name
+				@ssh2_sftp_unlink($this->handle, $check);
+
+				if (@ssh2_sftp_mkdir($this->handle, $check) === false)
+				{
+					// If we couldn't create the directory, attempt to fix the permissions in the PHP level and retry!
+					$this->fixPermissions($check);
+
+					if (@ssh2_sftp_mkdir($this->handle, $check) === false)
+					{
+						// Can we fall back to pure PHP mode, sire?
+						if (!@mkdir($check))
+						{
+							$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR', $check));
+
+							return false;
+						}
+						else
+						{
+							// Since the directory was built by PHP, change its permissions
+							$trustMeIKnowWhatImDoing =
+								500 + 10 + 1; // working around overzealous scanners written by bozos
+							@chmod($check, $trustMeIKnowWhatImDoing);
+
+							return true;
+						}
+					}
+				}
+
+				@ssh2_sftp_chmod($this->handle, $check, $perms);
+			}
+
+			$previousDir = $check;
+		}
+
+		return true;
+	}
+
+	private function is_dir($dir)
+	{
+		return $this->sftp_chdir($dir);
+	}
+
+	private function fixPermissions($path)
+	{
+		// Turn off error reporting
+		if (!defined('KSDEBUG'))
+		{
+			$oldErrorReporting = @error_reporting(E_NONE);
+		}
+
+		// Get UNIX style paths
+		$relPath  = str_replace('\\', '/', $path);
+		$basePath = rtrim(str_replace('\\', '/', KSROOTDIR), '/');
+		$basePath = rtrim($basePath, '/');
+
+		if (!empty($basePath))
+		{
+			$basePath .= '/';
+		}
+
+		// Remove the leading relative root
+		if (substr($relPath, 0, strlen($basePath)) == $basePath)
+		{
+			$relPath = substr($relPath, strlen($basePath));
+		}
+
+		$dirArray  = explode('/', $relPath);
+		$pathBuilt = rtrim($basePath, '/');
+
+		foreach ($dirArray as $dir)
+		{
+			if (empty($dir))
+			{
+				continue;
+			}
+
+			$oldPath = $pathBuilt;
+			$pathBuilt .= '/' . $dir;
+
+			if (is_dir($oldPath . '/' . $dir))
+			{
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				@chmod($oldPath . '/' . $dir, $trustMeIKnowWhatImDoing);
+			}
+			else
+			{
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				if (@chmod($oldPath . '/' . $dir, $trustMeIKnowWhatImDoing) === false)
+				{
+					@unlink($oldPath . $dir);
+				}
+			}
+		}
+
+		// Restore error reporting
+		if (!defined('KSDEBUG'))
+		{
+			@error_reporting($oldErrorReporting);
+		}
+	}
+
+	function __wakeup()
+	{
+		$this->connect();
+	}
+
+	/*
+	 * Tries to fix directory/file permissions in the PHP level, so that
+	 * the FTP operation doesn't fail.
+	 * @param $path string The full path to a directory or file
+	 */
+
+	public function process()
+	{
+		if (is_null($this->tempFilename))
+		{
+			// If an empty filename is passed, it means that we shouldn't do any post processing, i.e.
+			// the entity was a directory or symlink
+			return true;
+		}
+
+		$remotePath      = dirname($this->filename);
+		$absoluteFSPath  = dirname($this->filename);
+		$absoluteFTPPath = '/' . trim($this->dir, '/') . '/' . trim($remotePath, '/');
+		$onlyFilename    = basename($this->filename);
+
+		$remoteName = $absoluteFTPPath . '/' . $onlyFilename;
+
+		$ret = $this->sftp_chdir($absoluteFTPPath);
+
+		if ($ret === false)
+		{
+			$ret = $this->createDirRecursive($absoluteFSPath, 0755);
+
+			if ($ret === false)
+			{
+				$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+
+				return false;
+			}
+
+			$ret = $this->sftp_chdir($absoluteFTPPath);
+
+			if ($ret === false)
+			{
+				$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+
+				return false;
+			}
+		}
+
+		// Create the file
+		$ret = $this->write($this->tempFilename, $remoteName);
+
+		// If I got a -1 it means that I wasn't able to open the file, so I have to stop here
+		if ($ret === -1)
+		{
+			$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+
+			return false;
+		}
+
+		if ($ret === false)
+		{
+			// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
+			$this->fixPermissions($this->filename);
+			$this->unlink($this->filename);
+
+			$ret = $this->write($this->tempFilename, $remoteName);
+		}
+
+		@unlink($this->tempFilename);
+
+		if ($ret === false)
+		{
+			$this->setError(AKText::sprintf('SFTP_COULDNT_UPLOAD', $this->filename));
+
+			return false;
+		}
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+
+		if ($restorePerms)
+		{
+			$this->chmod($remoteName, $this->perms);
+		}
+		else
+		{
+			$this->chmod($remoteName, 0644);
+		}
+
+		return true;
+	}
+
+	private function write($local, $remote)
+	{
+		$fp      = @fopen("ssh2.sftp://{$this->handle}$remote", 'w');
+		$localfp = @fopen($local, 'rb');
+
+		if ($fp === false)
+		{
+			return -1;
+		}
+
+		if ($localfp === false)
+		{
+			@fclose($fp);
+
+			return -1;
+		}
+
+		$res = true;
+
+		while (!feof($localfp) && ($res !== false))
+		{
+			$buffer = @fread($localfp, 65567);
+			$res    = @fwrite($fp, $buffer);
+		}
+
+		@fclose($fp);
+		@fclose($localfp);
+
+		return $res;
+	}
+
+	public function unlink($file)
+	{
+		$check = '/' . trim($this->dir, '/') . '/' . trim($file, '/');
+
+		return @ssh2_sftp_unlink($this->handle, $check);
+	}
+
+	public function chmod($file, $perms)
+	{
+		return @ssh2_sftp_chmod($this->handle, $file, $perms);
+	}
+
+	public function processFilename($filename, $perms = 0755)
+	{
+		// Catch some error conditions...
+		if ($this->getError())
+		{
+			return false;
+		}
+
+		// If a null filename is passed, it means that we shouldn't do any post processing, i.e.
+		// the entity was a directory or symlink
+		if (is_null($filename))
+		{
+			$this->filename     = null;
+			$this->tempFilename = null;
+
+			return null;
+		}
+
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		if (!empty($removePath))
+		{
+			$left = substr($filename, 0, strlen($removePath));
+			if ($left == $removePath)
+			{
+				$filename = substr($filename, strlen($removePath));
+			}
+		}
+
+		// Trim slash on the left
+		$filename = ltrim($filename, '/');
+
+		$this->filename     = $filename;
+		$this->tempFilename = tempnam($this->tempDir, 'kickstart-');
+		$this->perms        = $perms;
+
+		if (empty($this->tempFilename))
+		{
+			// Oops! Let's try something different
+			$this->tempFilename = $this->tempDir . '/kickstart-' . time() . '.dat';
+		}
+
+		return $this->tempFilename;
+	}
+
+	public function close()
+	{
+		unset($this->_connection);
+		unset($this->handle);
+	}
+
+	public function rmdir($directory)
+	{
+		$check = '/' . trim($this->dir, '/') . '/' . trim($directory, '/');
+
+		return @ssh2_sftp_rmdir($this->handle, $check);
+	}
+
+	public function rename($from, $to)
+	{
+		$from = '/' . trim($this->dir, '/') . '/' . trim($from, '/');
+		$to   = '/' . trim($this->dir, '/') . '/' . trim($to, '/');
+
+		$result = @ssh2_sftp_rename($this->handle, $from, $to);
+
+		if ($result !== true)
+		{
+			return @rename($from, $to);
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+}
+
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Hybrid direct / FTP mode file writer
+ */
+class AKPostprocHybrid extends AKAbstractPostproc
+{
+
+	/** @var bool Should I use the FTP layer? */
+	public $useFTP = false;
+
+	/** @var bool Should I use FTP over implicit SSL? */
+	public $useSSL = false;
+
+	/** @var bool use Passive mode? */
+	public $passive = true;
+
+	/** @var string FTP host name */
+	public $host = '';
+
+	/** @var int FTP port */
+	public $port = 21;
+
+	/** @var string FTP user name */
+	public $user = '';
+
+	/** @var string FTP password */
+	public $pass = '';
+
+	/** @var string FTP initial directory */
+	public $dir = '';
+
+	/** @var resource The FTP handle */
+	private $handle = null;
+
+	/** @var string The temporary directory where the data will be stored */
+	private $tempDir = '';
+
+	/** @var null The FTP connection handle */
+	private $_handle = null;
+
+	/**
+	 * Public constructor. Tries to connect to the FTP server.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->useFTP  = true;
+		$this->useSSL  = AKFactory::get('kickstart.ftp.ssl', false);
+		$this->passive = AKFactory::get('kickstart.ftp.passive', true);
+		$this->host    = AKFactory::get('kickstart.ftp.host', '');
+		$this->port    = AKFactory::get('kickstart.ftp.port', 21);
+		$this->user    = AKFactory::get('kickstart.ftp.user', '');
+		$this->pass    = AKFactory::get('kickstart.ftp.pass', '');
+		$this->dir     = AKFactory::get('kickstart.ftp.dir', '');
+		$this->tempDir = AKFactory::get('kickstart.ftp.tempdir', '');
+
+		if (trim($this->port) == '')
+		{
+			$this->port = 21;
+		}
+
+		// If FTP is not configured, skip it altogether
+		if (empty($this->host) || empty($this->user) || empty($this->pass))
+		{
+			$this->useFTP = false;
+		}
+
+		// Try to connect to the FTP server
+		$connected = $this->connect();
+
+		// If the connection fails, skip FTP altogether
+		if (!$connected)
+		{
+			$this->useFTP = false;
+		}
+
+		if ($connected)
+		{
+			if (!empty($this->tempDir))
+			{
+				$tempDir  = rtrim($this->tempDir, '/\\') . '/';
+				$writable = $this->isDirWritable($tempDir);
+			}
+			else
+			{
+				$tempDir  = '';
+				$writable = false;
+			}
+
+			if (!$writable)
+			{
+				// Default temporary directory is the current root
+				$tempDir = KSROOTDIR;
+				if (empty($tempDir))
+				{
+					// Oh, we have no directory reported!
+					$tempDir = '.';
+				}
+				$absoluteDirToHere = $tempDir;
+				$tempDir           = rtrim(str_replace('\\', '/', $tempDir), '/');
+				if (!empty($tempDir))
+				{
+					$tempDir .= '/';
+				}
+				$this->tempDir = $tempDir;
+				// Is this directory writable?
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			if (!$writable)
+			{
+				// Nope. Let's try creating a temporary directory in the site's root.
+				$tempDir                 = $absoluteDirToHere . '/kicktemp';
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				$this->createDirRecursive($tempDir, $trustMeIKnowWhatImDoing);
+				// Try making it writable...
+				$this->fixPermissions($tempDir);
+				$writable = $this->isDirWritable($tempDir);
+			}
+
+			// Was the new directory writable?
+			if (!$writable)
+			{
+				// Let's see if the user has specified one
+				$userdir = AKFactory::get('kickstart.ftp.tempdir', '');
+				if (!empty($userdir))
+				{
+					// Is it an absolute or a relative directory?
+					$absolute = false;
+					$absolute = $absolute || (substr($userdir, 0, 1) == '/');
+					$absolute = $absolute || (substr($userdir, 1, 1) == ':');
+					$absolute = $absolute || (substr($userdir, 2, 1) == ':');
+					if (!$absolute)
+					{
+						// Make absolute
+						$tempDir = $absoluteDirToHere . $userdir;
+					}
+					else
+					{
+						// it's already absolute
+						$tempDir = $userdir;
+					}
+					// Does the directory exist?
+					if (is_dir($tempDir))
+					{
+						// Yeah. Is it writable?
+						$writable = $this->isDirWritable($tempDir);
+					}
+				}
+			}
+			$this->tempDir = $tempDir;
+
+			if (!$writable)
+			{
+				// No writable directory found!!!
+				$this->setError(AKText::_('FTP_TEMPDIR_NOT_WRITABLE'));
+			}
+			else
+			{
+				AKFactory::set('kickstart.ftp.tempdir', $tempDir);
+				$this->tempDir = $tempDir;
+			}
+		}
+	}
+
+	/**
+	 * Tries to connect to the FTP server
+	 *
+	 * @return bool
+	 */
+	public function connect()
+	{
+		if (!$this->useFTP)
+		{
+			return false;
+		}
+
+		// Connect to server, using SSL if so required
+		if ($this->useSSL)
+		{
+			$this->handle = @ftp_ssl_connect($this->host, $this->port);
+		}
+		else
+		{
+			$this->handle = @ftp_connect($this->host, $this->port);
+		}
+		if ($this->handle === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_HOST'));
+
+			return false;
+		}
+
+		// Login
+		if (!@ftp_login($this->handle, $this->user, $this->pass))
+		{
+			$this->setError(AKText::_('WRONG_FTP_USER'));
+			@ftp_close($this->handle);
+
+			return false;
+		}
+
+		// Change to initial directory
+		if (!@ftp_chdir($this->handle, $this->dir))
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH1'));
+			@ftp_close($this->handle);
+
+			return false;
+		}
+
+		// Enable passive mode if the user requested it
+		if ($this->passive)
+		{
+			@ftp_pasv($this->handle, true);
+		}
+		else
+		{
+			@ftp_pasv($this->handle, false);
+		}
+
+		// Try to download ourselves
+		$testFilename = defined('KSSELFNAME') ? KSSELFNAME : basename(__FILE__);
+		$tempHandle   = fopen('php://temp', 'r+');
+
+		if (@ftp_fget($this->handle, $tempHandle, $testFilename, FTP_ASCII, 0) === false)
+		{
+			$this->setError(AKText::_('WRONG_FTP_PATH2'));
+			@ftp_close($this->handle);
+			fclose($tempHandle);
+
+			return false;
+		}
+
+		fclose($tempHandle);
+
+		return true;
+	}
+
+	/**
+	 * Is the directory writeable?
+	 *
+	 * @param string $dir The directory ti check
+	 *
+	 * @return bool
+	 */
+	private function isDirWritable($dir)
+	{
+		$fp = @fopen($dir . '/kickstart.dat', 'wb');
+
+		if ($fp === false)
+		{
+			return false;
+		}
+
+		@fclose($fp);
+		unlink($dir . '/kickstart.dat');
+
+		return true;
+	}
+
+	/**
+	 * Create a directory, recursively
+	 *
+	 * @param string $dirName The directory to create
+	 * @param int    $perms   The permissions to give to the directory
+	 *
+	 * @return bool
+	 */
+	public function createDirRecursive($dirName, $perms)
+	{
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+
+		if (!empty($removePath))
+		{
+			// UNIXize the paths
+			$removePath = str_replace('\\', '/', $removePath);
+			$dirName    = str_replace('\\', '/', $dirName);
+			// Make sure they both end in a slash
+			$removePath = rtrim($removePath, '/\\') . '/';
+			$dirName    = rtrim($dirName, '/\\') . '/';
+			// Process the path removal
+			$left = substr($dirName, 0, strlen($removePath));
+
+			if ($left == $removePath)
+			{
+				$dirName = substr($dirName, strlen($removePath));
+			}
+		}
+
+		// 'cause the substr() above may return FALSE.
+		if (empty($dirName))
+		{
+			$dirName = '';
+		}
+
+		$check   = '/' . trim($this->dir, '/') . '/' . trim($dirName, '/');
+		$checkFS = $removePath . trim($dirName, '/');
+
+		if ($this->is_dir($check))
+		{
+			return true;
+		}
+
+		$alldirs       = explode('/', $dirName);
+		$previousDir   = '/' . trim($this->dir);
+		$previousDirFS = rtrim($removePath, '/\\');
+
+		foreach ($alldirs as $curdir)
+		{
+			$check   = $previousDir . '/' . $curdir;
+			$checkFS = $previousDirFS . '/' . $curdir;
+
+			if (!is_dir($checkFS) && !$this->is_dir($check))
+			{
+				// Proactively try to delete a file by the same name
+				if (!@unlink($checkFS) && $this->useFTP)
+				{
+					@ftp_delete($this->handle, $check);
+				}
+
+				$createdDir = @mkdir($checkFS, 0755);
+
+				if (!$createdDir && $this->useFTP)
+				{
+					$createdDir = @ftp_mkdir($this->handle, $check);
+				}
+
+				if ($createdDir === false)
+				{
+					// If we couldn't create the directory, attempt to fix the permissions in the PHP level and retry!
+					$this->fixPermissions($checkFS);
+
+					$createdDir = @mkdir($checkFS, 0755);
+					if (!$createdDir && $this->useFTP)
+					{
+						$createdDir = @ftp_mkdir($this->handle, $check);
+					}
+
+					if ($createdDir === false)
+					{
+						$this->setError(AKText::sprintf('FTP_CANT_CREATE_DIR', $check));
+
+						return false;
+					}
+				}
+
+				if (!@chmod($checkFS, $perms) && $this->useFTP)
+				{
+					@ftp_chmod($this->handle, $perms, $check);
+				}
+			}
+
+			$previousDir   = $check;
+			$previousDirFS = $checkFS;
+		}
+
+		return true;
+	}
+
+	private function is_dir($dir)
+	{
+		if ($this->useFTP)
+		{
+			return @ftp_chdir($this->handle, $dir);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Tries to fix directory/file permissions in the PHP level, so that
+	 * the FTP operation doesn't fail.
+	 *
+	 * @param $path string The full path to a directory or file
+	 */
+	private function fixPermissions($path)
+	{
+		// Turn off error reporting
+		if (!defined('KSDEBUG'))
+		{
+			$oldErrorReporting = error_reporting(0);
+		}
+
+		// Get UNIX style paths
+		$relPath  = str_replace('\\', '/', $path);
+		$basePath = rtrim(str_replace('\\', '/', KSROOTDIR), '/');
+		$basePath = rtrim($basePath, '/');
+
+		if (!empty($basePath))
+		{
+			$basePath .= '/';
+		}
+
+		// Remove the leading relative root
+		if (substr($relPath, 0, strlen($basePath)) == $basePath)
+		{
+			$relPath = substr($relPath, strlen($basePath));
+		}
+
+		$dirArray  = explode('/', $relPath);
+		$pathBuilt = rtrim($basePath, '/');
+
+		foreach ($dirArray as $dir)
+		{
+			if (empty($dir))
+			{
+				continue;
+			}
+
+			$oldPath = $pathBuilt;
+			$pathBuilt .= '/' . $dir;
+
+			if (is_dir($oldPath . $dir))
+			{
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				@chmod($oldPath . $dir, $trustMeIKnowWhatImDoing);
+			}
+			else
+			{
+				$trustMeIKnowWhatImDoing = 500 + 10 + 1; // working around overzealous scanners written by bozos
+				if (@chmod($oldPath . $dir, $trustMeIKnowWhatImDoing) === false)
+				{
+					@unlink($oldPath . $dir);
+				}
+			}
+		}
+
+		// Restore error reporting
+		if (!defined('KSDEBUG'))
+		{
+			@error_reporting($oldErrorReporting);
+		}
+	}
+
+	/**
+	 * Called after unserialisation, tries to reconnect to FTP
+	 */
+	function __wakeup()
+	{
+		if ($this->useFTP)
+		{
+			$this->connect();
+		}
+	}
+
+	function __destruct()
+	{
+		if (!$this->useFTP)
+		{
+			@ftp_close($this->handle);
+		}
+	}
+
+	/**
+	 * Post-process an extracted file, using FTP or direct file writes to move it
+	 *
+	 * @return bool
+	 */
+	public function process()
+	{
+		if (is_null($this->tempFilename))
+		{
+			// If an empty filename is passed, it means that we shouldn't do any post processing, i.e.
+			// the entity was a directory or symlink
+			return true;
+		}
+
+		$remotePath = dirname($this->filename);
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+		$root       = rtrim($removePath, '/\\');
+
+		if (!empty($removePath))
+		{
+			$removePath = ltrim($removePath, "/");
+			$remotePath = ltrim($remotePath, "/");
+			$left       = substr($remotePath, 0, strlen($removePath));
+
+			if ($left == $removePath)
+			{
+				$remotePath = substr($remotePath, strlen($removePath));
+			}
+		}
+
+		$absoluteFSPath  = dirname($this->filename);
+		$relativeFTPPath = trim($remotePath, '/');
+		$absoluteFTPPath = '/' . trim($this->dir, '/') . '/' . trim($remotePath, '/');
+		$onlyFilename    = basename($this->filename);
+
+		$remoteName = $absoluteFTPPath . '/' . $onlyFilename;
+
+		// Does the directory exist?
+		if (!is_dir($root . '/' . $absoluteFSPath))
+		{
+			$ret = $this->createDirRecursive($absoluteFSPath, 0755);
+
+			if (($ret === false) && ($this->useFTP))
+			{
+				$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+			}
+
+			if ($ret === false)
+			{
+				$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
+				return false;
+			}
+		}
+
+		if ($this->useFTP)
+		{
+			$ret = @ftp_chdir($this->handle, $absoluteFTPPath);
+		}
+
+		// Try copying directly
+		$ret = @copy($this->tempFilename, $root . '/' . $this->filename);
+
+		if ($ret === false)
+		{
+			$this->fixPermissions($this->filename);
+			$this->unlink($this->filename);
+
+			$ret = @copy($this->tempFilename, $root . '/' . $this->filename);
+		}
+
+		if ($this->useFTP && ($ret === false))
+		{
+			$ret = @ftp_put($this->handle, $remoteName, $this->tempFilename, FTP_BINARY);
+
+			if ($ret === false)
+			{
+				// If we couldn't create the file, attempt to fix the permissions in the PHP level and retry!
+				$this->fixPermissions($this->filename);
+				$this->unlink($this->filename);
+
+				$fp = @fopen($this->tempFilename, 'rb');
+				if ($fp !== false)
+				{
+					$ret = @ftp_fput($this->handle, $remoteName, $fp, FTP_BINARY);
+					@fclose($fp);
+				}
+				else
+				{
+					$ret = false;
+				}
+			}
+		}
+
+		@unlink($this->tempFilename);
+
+		if ($ret === false)
+		{
+			$this->setError(AKText::sprintf('FTP_COULDNT_UPLOAD', $this->filename));
+
+			return false;
+		}
+
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		$perms        = $restorePerms ? $this->perms : 0644;
+
+		$ret = @chmod($root . '/' . $this->filename, $perms);
+
+		if ($this->useFTP && ($ret === false))
+		{
+			@ftp_chmod($this->_handle, $perms, $remoteName);
+		}
+
+		return true;
+	}
+
+	public function unlink($file)
+	{
+		$ret = @unlink($file);
+
+		if (!$ret && $this->useFTP)
+		{
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+			if (!empty($removePath))
+			{
+				$left = substr($file, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$file = substr($file, strlen($removePath));
+				}
+			}
+
+			$check = '/' . trim($this->dir, '/') . '/' . trim($file, '/');
+
+			$ret = @ftp_delete($this->handle, $check);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Create a temporary filename
+	 *
+	 * @param string $filename The original filename
+	 * @param int    $perms    The file permissions
+	 *
+	 * @return string
+	 */
+	public function processFilename($filename, $perms = 0755)
+	{
+		// Catch some error conditions...
+		if ($this->getError())
+		{
+			return false;
+		}
+
+		// If a null filename is passed, it means that we shouldn't do any post processing, i.e.
+		// the entity was a directory or symlink
+		if (is_null($filename))
+		{
+			$this->filename     = null;
+			$this->tempFilename = null;
+
+			return null;
+		}
+
+		// Strip absolute filesystem path to website's root
+		$removePath = AKFactory::get('kickstart.setup.destdir', '');
+
+		if (!empty($removePath))
+		{
+			$left = substr($filename, 0, strlen($removePath));
+
+			if ($left == $removePath)
+			{
+				$filename = substr($filename, strlen($removePath));
+			}
+		}
+
+		// Trim slash on the left
+		$filename = ltrim($filename, '/');
+
+		$this->filename     = $filename;
+		$this->tempFilename = tempnam($this->tempDir, 'kickstart-');
+		$this->perms        = $perms;
+
+		if (empty($this->tempFilename))
+		{
+			// Oops! Let's try something different
+			$this->tempFilename = $this->tempDir . '/kickstart-' . time() . '.dat';
+		}
+
+		return $this->tempFilename;
+	}
+
+	/**
+	 * Closes the FTP connection
+	 */
+	public function close()
+	{
+		if (!$this->useFTP)
+		{
+			@ftp_close($this->handle);
+		}
+	}
+
+	public function chmod($file, $perms)
+	{
+		if (AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			return true;
+		}
+
+		$ret = @chmod($file, $perms);
+
+		if (!$ret && $this->useFTP)
+		{
+			// Strip absolute filesystem path to website's root
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+
+			if (!empty($removePath))
+			{
+				$left = substr($file, 0, strlen($removePath));
+
+				if ($left == $removePath)
+				{
+					$file = substr($file, strlen($removePath));
+				}
+			}
+
+			// Trim slash on the left
+			$file = ltrim($file, '/');
+
+			$ret = @ftp_chmod($this->handle, $perms, $file);
+		}
+
+		return $ret;
+	}
+
+	public function rmdir($directory)
+	{
+		$ret = @rmdir($directory);
+
+		if (!$ret && $this->useFTP)
+		{
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+			if (!empty($removePath))
+			{
+				$left = substr($directory, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$directory = substr($directory, strlen($removePath));
+				}
+			}
+
+			$check = '/' . trim($this->dir, '/') . '/' . trim($directory, '/');
+
+			$ret = @ftp_rmdir($this->handle, $check);
+		}
+
+		return $ret;
+	}
+
+	public function rename($from, $to)
+	{
+		$ret = @rename($from, $to);
+
+		if (!$ret && $this->useFTP)
+		{
+			$originalFrom = $from;
+			$originalTo   = $to;
+
+			$removePath = AKFactory::get('kickstart.setup.destdir', '');
+			if (!empty($removePath))
+			{
+				$left = substr($from, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$from = substr($from, strlen($removePath));
+				}
+			}
+			$from = '/' . trim($this->dir, '/') . '/' . trim($from, '/');
+
+			if (!empty($removePath))
+			{
+				$left = substr($to, 0, strlen($removePath));
+				if ($left == $removePath)
+				{
+					$to = substr($to, strlen($removePath));
+				}
+			}
+			$to = '/' . trim($this->dir, '/') . '/' . trim($to, '/');
+
+			$ret = @ftp_rename($this->handle, $from, $to);
+		}
+
+		return $ret;
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * JPA archive extraction class
+ */
+class AKUnarchiverJPA extends AKAbstractUnarchiver
+{
+	protected $archiveHeaderData = array();
+
+	protected function readArchiveHeader()
+	{
+		debugMsg('Preparing to read archive header');
+		// Initialize header data array
+		$this->archiveHeaderData = new stdClass();
+
+		// Open the first part
+		debugMsg('Opening the first part');
+		$this->nextFile();
+
+		// Fail for unreadable files
+		if ($this->fp === false)
+		{
+			debugMsg('Could not open the first part');
+
+			return false;
+		}
+
+		// Read the signature
+		$sig = fread($this->fp, 3);
+
+		if ($sig != 'JPA')
+		{
+			// Not a JPA file
+			debugMsg('Invalid archive signature');
+			$this->setError(AKText::_('ERR_NOT_A_JPA_FILE'));
+
+			return false;
+		}
+
+		// Read and parse header length
+		$header_length_array = unpack('v', fread($this->fp, 2));
+		$header_length       = $header_length_array[1];
+
+		// Read and parse the known portion of header data (14 bytes)
+		$bin_data    = fread($this->fp, 14);
+		$header_data = unpack('Cmajor/Cminor/Vcount/Vuncsize/Vcsize', $bin_data);
+
+		// Load any remaining header data (forward compatibility)
+		$rest_length = $header_length - 19;
+
+		if ($rest_length > 0)
+		{
+			$junk = fread($this->fp, $rest_length);
+		}
+		else
+		{
+			$junk = '';
+		}
+
+		// Temporary array with all the data we read
+		$temp = array(
+			'signature'        => $sig,
+			'length'           => $header_length,
+			'major'            => $header_data['major'],
+			'minor'            => $header_data['minor'],
+			'filecount'        => $header_data['count'],
+			'uncompressedsize' => $header_data['uncsize'],
+			'compressedsize'   => $header_data['csize'],
+			'unknowndata'      => $junk
+		);
+
+		// Array-to-object conversion
+		foreach ($temp as $key => $value)
+		{
+			$this->archiveHeaderData->{$key} = $value;
+		}
+
+		debugMsg('Header data:');
+		debugMsg('Length              : ' . $header_length);
+		debugMsg('Major               : ' . $header_data['major']);
+		debugMsg('Minor               : ' . $header_data['minor']);
+		debugMsg('File count          : ' . $header_data['count']);
+		debugMsg('Uncompressed size   : ' . $header_data['uncsize']);
+		debugMsg('Compressed size	  : ' . $header_data['csize']);
+
+		$this->currentPartOffset = @ftell($this->fp);
+
+		$this->dataReadLength = 0;
+
+		return true;
+	}
+
+	/**
+	 * Concrete classes must use this method to read the file header
+	 *
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
+	 */
+	protected function readFileHeader()
+	{
+		// If the current part is over, proceed to the next part please
+		if ($this->isEOF(true))
+		{
+			debugMsg('Archive part EOF; moving to next file');
+			$this->nextFile();
+		}
+
+		$this->currentPartOffset = ftell($this->fp);
+
+		debugMsg("Reading file signature; part {$this->currentPartNumber}, offset {$this->currentPartOffset}");
+		// Get and decode Entity Description Block
+		$signature = fread($this->fp, 3);
+
+		$this->fileHeader            = new stdClass();
+		$this->fileHeader->timestamp = 0;
+
+		// Check signature
+		if ($signature != 'JPF')
+		{
+			if ($this->isEOF(true))
+			{
+				// This file is finished; make sure it's the last one
+				$this->nextFile();
+
+				if (!$this->isEOF(false))
+				{
+					debugMsg('Invalid file signature before end of archive encountered');
+					$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
+
+					return false;
+				}
+
+				// We're just finished
+				return false;
+			}
+			else
+			{
+				$screwed = true;
+
+				if (AKFactory::get('kickstart.setup.ignoreerrors', false))
+				{
+					debugMsg('Invalid file block signature; launching heuristic file block signature scanner');
+					$screwed = !$this->heuristicFileHeaderLocator();
+
+					if (!$screwed)
+					{
+						$signature = 'JPF';
+					}
+					else
+					{
+						debugMsg('Heuristics failed. Brace yourself for the imminent crash.');
+					}
+				}
+
+				if ($screwed)
+				{
+					debugMsg('Invalid file block signature');
+					// This is not a file block! The archive is corrupt.
+					$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
+
+					return false;
+				}
+			}
+		}
+		// This a JPA Entity Block. Process the header.
+
+		$isBannedFile = false;
+
+		// Read length of EDB and of the Entity Path Data
+		$length_array = unpack('vblocksize/vpathsize', fread($this->fp, 4));
+		// Read the path data
+		if ($length_array['pathsize'] > 0)
+		{
+			$file = fread($this->fp, $length_array['pathsize']);
+		}
+		else
+		{
+			$file = '';
+		}
+
+		// Handle file renaming
+		$isRenamed = false;
+		if (is_array($this->renameFiles) && (count($this->renameFiles) > 0))
+		{
+			if (array_key_exists($file, $this->renameFiles))
+			{
+				$file      = $this->renameFiles[$file];
+				$isRenamed = true;
+			}
+		}
+
+		// Handle directory renaming
+		$isDirRenamed = false;
+		if (is_array($this->renameDirs) && (count($this->renameDirs) > 0))
+		{
+			if (array_key_exists(dirname($file), $this->renameDirs))
+			{
+				$file         = rtrim($this->renameDirs[dirname($file)], '/') . '/' . basename($file);
+				$isRenamed    = true;
+				$isDirRenamed = true;
+			}
+		}
+
+		// Read and parse the known data portion
+		$bin_data    = fread($this->fp, 14);
+		$header_data = unpack('Ctype/Ccompression/Vcompsize/Vuncompsize/Vperms', $bin_data);
+		// Read any unknown data
+		$restBytes = $length_array['blocksize'] - (21 + $length_array['pathsize']);
+
+		if ($restBytes > 0)
+		{
+			// Start reading the extra fields
+			while ($restBytes >= 4)
+			{
+				$extra_header_data = fread($this->fp, 4);
+				$extra_header      = unpack('vsignature/vlength', $extra_header_data);
+				$restBytes -= 4;
+				$extra_header['length'] -= 4;
+
+				switch ($extra_header['signature'])
+				{
+					case 256:
+						// File modified timestamp
+						if ($extra_header['length'] > 0)
+						{
+							$bindata = fread($this->fp, $extra_header['length']);
+							$restBytes -= $extra_header['length'];
+							$timestamps                  = unpack('Vmodified', substr($bindata, 0, 4));
+							$filectime                   = $timestamps['modified'];
+							$this->fileHeader->timestamp = $filectime;
+						}
+						break;
+
+					default:
+						// Unknown field
+						if ($extra_header['length'] > 0)
+						{
+							$junk = fread($this->fp, $extra_header['length']);
+							$restBytes -= $extra_header['length'];
+						}
+						break;
+				}
+			}
+
+			if ($restBytes > 0)
+			{
+				$junk = fread($this->fp, $restBytes);
+			}
+		}
+
+		$compressionType = $header_data['compression'];
+
+		// Populate the return array
+		$this->fileHeader->file         = $file;
+		$this->fileHeader->compressed   = $header_data['compsize'];
+		$this->fileHeader->uncompressed = $header_data['uncompsize'];
+
+		switch ($header_data['type'])
+		{
+			case 0:
+				$this->fileHeader->type = 'dir';
+				break;
+
+			case 1:
+				$this->fileHeader->type = 'file';
+				break;
+
+			case 2:
+				$this->fileHeader->type = 'link';
+				break;
+		}
+
+		switch ($compressionType)
+		{
+			case 0:
+				$this->fileHeader->compression = 'none';
+				break;
+			case 1:
+				$this->fileHeader->compression = 'gzip';
+				break;
+			case 2:
+				$this->fileHeader->compression = 'bzip2';
+				break;
+		}
+
+		$this->fileHeader->permissions = $header_data['perms'];
+
+		// Find hard-coded banned files
+		if ((basename($this->fileHeader->file) == ".") || (basename($this->fileHeader->file) == ".."))
+		{
+			$isBannedFile = true;
+		}
+
+		// Also try to find banned files passed in class configuration
+		if ((count($this->skipFiles) > 0) && (!$isRenamed))
+		{
+			if (in_array($this->fileHeader->file, $this->skipFiles))
+			{
+				$isBannedFile = true;
+			}
+		}
+
+		// If we have a banned file, let's skip it
+		if ($isBannedFile)
+		{
+			debugMsg('Skipping file ' . $this->fileHeader->file);
+			// Advance the file pointer, skipping exactly the size of the compressed data
+			$seekleft = $this->fileHeader->compressed;
+			while ($seekleft > 0)
+			{
+				// Ensure that we can seek past archive part boundaries
+				$curSize = @filesize($this->archiveList[$this->currentPartNumber]);
+				$curPos  = @ftell($this->fp);
+				$canSeek = $curSize - $curPos;
+				if ($canSeek > $seekleft)
+				{
+					$canSeek = $seekleft;
+				}
+				@fseek($this->fp, $canSeek, SEEK_CUR);
+				$seekleft -= $canSeek;
+				if ($seekleft)
+				{
+					$this->nextFile();
+				}
+			}
+
+			$this->currentPartOffset = @ftell($this->fp);
+			$this->runState          = AK_STATE_DONE;
+
+			return true;
+		}
+
+		// Remove the removePath, if any
+		$this->fileHeader->file = $this->removePath($this->fileHeader->file);
+
+		// Last chance to prepend a path to the filename
+		if (!empty($this->addPath) && !$isDirRenamed)
+		{
+			$this->fileHeader->file = $this->addPath . $this->fileHeader->file;
+		}
+
+		// Get the translated path name
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		if ($this->fileHeader->type == 'file')
+		{
+			// Regular file; ask the postproc engine to process its filename
+			if ($restorePerms)
+			{
+				$this->fileHeader->realFile =
+					$this->postProcEngine->processFilename($this->fileHeader->file, $this->fileHeader->permissions);
+			}
+			else
+			{
+				$this->fileHeader->realFile = $this->postProcEngine->processFilename($this->fileHeader->file);
+			}
+		}
+		elseif ($this->fileHeader->type == 'dir')
+		{
+			$dir = $this->fileHeader->file;
+
+			// Directory; just create it
+			if ($restorePerms)
+			{
+				$this->postProcEngine->createDirRecursive($this->fileHeader->file, $this->fileHeader->permissions);
+			}
+			else
+			{
+				$this->postProcEngine->createDirRecursive($this->fileHeader->file, 0755);
+			}
+			$this->postProcEngine->processFilename(null);
+		}
+		else
+		{
+			// Symlink; do not post-process
+			$this->postProcEngine->processFilename(null);
+		}
+
+		$this->createDirectory();
+
+		// Header is read
+		$this->runState = AK_STATE_HEADER;
+
+		$this->dataReadLength = 0;
+
+		return true;
+	}
+
+	protected function heuristicFileHeaderLocator()
+	{
+		$ret     = false;
+		$fullEOF = false;
+
+		while (!$ret && !$fullEOF)
+		{
+			$this->currentPartOffset = @ftell($this->fp);
+
+			if ($this->isEOF(true))
+			{
+				$this->nextFile();
+			}
+
+			if ($this->isEOF(false))
+			{
+				$fullEOF = true;
+				continue;
+			}
+
+			// Read 512Kb
+			$chunk     = fread($this->fp, 524288);
+			$size_read = mb_strlen($chunk, '8bit');
+			//$pos = strpos($chunk, 'JPF');
+			$pos = mb_strpos($chunk, 'JPF', 0, '8bit');
+
+			if ($pos !== false)
+			{
+				// We found it!
+				$this->currentPartOffset += $pos + 3;
+				@fseek($this->fp, $this->currentPartOffset, SEEK_SET);
+				$ret = true;
+			}
+			else
+			{
+				// Not yet found :(
+				$this->currentPartOffset = @ftell($this->fp);
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Creates the directory this file points to
+	 */
+	protected function createDirectory()
+	{
+		if (AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			return true;
+		}
+
+		// Do we need to create a directory?
+		if (empty($this->fileHeader->realFile))
+		{
+			$this->fileHeader->realFile = $this->fileHeader->file;
+		}
+
+		$lastSlash = strrpos($this->fileHeader->realFile, '/');
+		$dirName   = substr($this->fileHeader->realFile, 0, $lastSlash);
+		$perms     = $this->flagRestorePermissions ? $this->fileHeader->permissions : 0755;
+		$ignore    = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($dirName);
+
+		if (($this->postProcEngine->createDirRecursive($dirName, $perms) == false) && (!$ignore))
+		{
+			$this->setError(AKText::sprintf('COULDNT_CREATE_DIR', $dirName));
+
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Concrete classes must use this method to process file data. It must set $runState to AK_STATE_DATAREAD when
+	 * it's finished processing the file data.
+	 *
+	 * @return bool True if processing the file data was successful, false if an error occurred
+	 */
+	protected function processFileData()
+	{
+		switch ($this->fileHeader->type)
+		{
+			case 'dir':
+				return $this->processTypeDir();
+				break;
+
+			case 'link':
+				return $this->processTypeLink();
+				break;
+
+			case 'file':
+				switch ($this->fileHeader->compression)
+				{
+					case 'none':
+						return $this->processTypeFileUncompressed();
+						break;
+
+					case 'gzip':
+					case 'bzip2':
+						return $this->processTypeFileCompressedSimple();
+						break;
+
+				}
+				break;
+
+			default:
+				debugMsg('Unknown file type ' . $this->fileHeader->type);
+				break;
+		}
+	}
+
+	/**
+	 * Process the file data of a directory entry
+	 *
+	 * @return bool
+	 */
+	private function processTypeDir()
+	{
+		// Directory entries in the JPA do not have file data, therefore we're done processing the entry
+		$this->runState = AK_STATE_DATAREAD;
+
+		return true;
+	}
+
+	/**
+	 * Process the file data of a link entry
+	 *
+	 * @return bool
+	 */
+	private function processTypeLink()
+	{
+		$readBytes   = 0;
+		$toReadBytes = 0;
+		$leftBytes   = $this->fileHeader->compressed;
+		$data        = '';
+
+		while ($leftBytes > 0)
+		{
+			$toReadBytes     = ($leftBytes > $this->chunkSize) ? $this->chunkSize : $leftBytes;
+			$mydata          = $this->fread($this->fp, $toReadBytes);
+			$reallyReadBytes = akstringlen($mydata);
+			$data .= $mydata;
+			$leftBytes -= $reallyReadBytes;
+
+			if ($reallyReadBytes < $toReadBytes)
+			{
+				// We read less than requested! Why? Did we hit local EOF?
+				if ($this->isEOF(true) && !$this->isEOF(false))
+				{
+					// Yeap. Let's go to the next file
+					$this->nextFile();
+				}
+				else
+				{
+					debugMsg('End of local file before reading all data with no more parts left. The archive is corrupt or truncated.');
+					// Nope. The archive is corrupt
+					$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+					return false;
+				}
+			}
+		}
+
+		$filename = isset($this->fileHeader->realFile) ? $this->fileHeader->realFile : $this->fileHeader->file;
+
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Try to remove an existing file or directory by the same name
+			if (file_exists($filename))
+			{
+				@unlink($filename);
+				@rmdir($filename);
+			}
+
+			// Remove any trailing slash
+			if (substr($filename, -1) == '/')
+			{
+				$filename = substr($filename, 0, -1);
+			}
+			// Create the symlink - only possible within PHP context. There's no support built in the FTP protocol, so no postproc use is possible here :(
+			@symlink($data, $filename);
+		}
+
+		$this->runState = AK_STATE_DATAREAD;
+
+		return true; // No matter if the link was created!
+	}
+
+	private function processTypeFileUncompressed()
+	{
+		// Uncompressed files are being processed in small chunks, to avoid timeouts
+		if (($this->dataReadLength == 0) && !AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Before processing file data, ensure permissions are adequate
+			$this->setCorrectPermissions($this->fileHeader->file);
+		}
+
+		// Open the output file
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			$ignore =
+				AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
+
+			if ($this->dataReadLength == 0)
+			{
+				$outfp = @fopen($this->fileHeader->realFile, 'wb');
+			}
+			else
+			{
+				$outfp = @fopen($this->fileHeader->realFile, 'ab');
+			}
+
+			// Can we write to the file?
+			if (($outfp === false) && (!$ignore))
+			{
+				// An error occurred
+				debugMsg('Could not write to output file');
+				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
+
+				return false;
+			}
+		}
+
+		// Does the file have any data, at all?
+		if ($this->fileHeader->compressed == 0)
+		{
+			// No file data!
+			if (!AKFactory::get('kickstart.setup.dryrun', '0') && is_resource($outfp))
+			{
+				@fclose($outfp);
+			}
+
+			$this->runState = AK_STATE_DATAREAD;
+
+			return true;
+		}
+
+		// Reference to the global timer
+		$timer = AKFactory::getTimer();
+
+		$toReadBytes = 0;
+		$leftBytes   = $this->fileHeader->compressed - $this->dataReadLength;
+
+		// Loop while there's data to read and enough time to do it
+		while (($leftBytes > 0) && ($timer->getTimeLeft() > 0))
+		{
+			$toReadBytes     = ($leftBytes > $this->chunkSize) ? $this->chunkSize : $leftBytes;
+			$data            = $this->fread($this->fp, $toReadBytes);
+			$reallyReadBytes = akstringlen($data);
+			$leftBytes -= $reallyReadBytes;
+			$this->dataReadLength += $reallyReadBytes;
+
+			if ($reallyReadBytes < $toReadBytes)
+			{
+				// We read less than requested! Why? Did we hit local EOF?
+				if ($this->isEOF(true) && !$this->isEOF(false))
+				{
+					// Yeap. Let's go to the next file
+					$this->nextFile();
+				}
+				else
+				{
+					// Nope. The archive is corrupt
+					debugMsg('Not enough data in file. The archive is truncated or corrupt.');
+					$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+					return false;
+				}
+			}
+
+			if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+			{
+				if (is_resource($outfp))
+				{
+					@fwrite($outfp, $data);
+				}
+			}
+		}
+
+		// Close the file pointer
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			if (is_resource($outfp))
+			{
+				@fclose($outfp);
+			}
+		}
+
+		// Was this a pre-timeout bail out?
+		if ($leftBytes > 0)
+		{
+			$this->runState = AK_STATE_DATA;
+		}
+		else
+		{
+			// Oh! We just finished!
+			$this->runState       = AK_STATE_DATAREAD;
+			$this->dataReadLength = 0;
+		}
+
+		return true;
+	}
+
+	private function processTypeFileCompressedSimple()
+	{
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Before processing file data, ensure permissions are adequate
+			$this->setCorrectPermissions($this->fileHeader->file);
+
+			// Open the output file
+			$outfp = @fopen($this->fileHeader->realFile, 'wb');
+
+			// Can we write to the file?
+			$ignore =
+				AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
+
+			if (($outfp === false) && (!$ignore))
+			{
+				// An error occurred
+				debugMsg('Could not write to output file');
+				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
+
+				return false;
+			}
+		}
+
+		// Does the file have any data, at all?
+		if ($this->fileHeader->compressed == 0)
+		{
+			// No file data!
+			if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+			{
+				if (is_resource($outfp))
+				{
+					@fclose($outfp);
+				}
+			}
+			$this->runState = AK_STATE_DATAREAD;
+
+			return true;
+		}
+
+		// Simple compressed files are processed as a whole; we can't do chunk processing
+		$zipData = $this->fread($this->fp, $this->fileHeader->compressed);
+		while (akstringlen($zipData) < $this->fileHeader->compressed)
+		{
+			// End of local file before reading all data, but have more archive parts?
+			if ($this->isEOF(true) && !$this->isEOF(false))
+			{
+				// Yeap. Read from the next file
+				$this->nextFile();
+				$bytes_left = $this->fileHeader->compressed - akstringlen($zipData);
+				$zipData .= $this->fread($this->fp, $bytes_left);
+			}
+			else
+			{
+				debugMsg('End of local file before reading all data with no more parts left. The archive is corrupt or truncated.');
+				$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+				return false;
+			}
+		}
+
+		if ($this->fileHeader->compression == 'gzip')
+		{
+			$unzipData = gzinflate($zipData);
+		}
+		elseif ($this->fileHeader->compression == 'bzip2')
+		{
+			$unzipData = bzdecompress($zipData);
+		}
+		unset($zipData);
+
+		// Write to the file.
+		if (!AKFactory::get('kickstart.setup.dryrun', '0') && is_resource($outfp))
+		{
+			@fwrite($outfp, $unzipData, $this->fileHeader->uncompressed);
+			@fclose($outfp);
+		}
+		unset($unzipData);
+
+		$this->runState = AK_STATE_DATAREAD;
+
+		return true;
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * ZIP archive extraction class
+ *
+ * Since the file data portion of ZIP and JPA are similarly structured (it's empty for dirs,
+ * linked node name for symlinks, dumped binary data for no compressions and dumped gzipped
+ * binary data for gzip compression) we just have to subclass AKUnarchiverJPA and change the
+ * header reading bits. Reusable code ;)
+ */
+class AKUnarchiverZIP extends AKUnarchiverJPA
+{
+	var $expectDataDescriptor = false;
+
+	protected function readArchiveHeader()
+	{
+		debugMsg('Preparing to read archive header');
+		// Initialize header data array
+		$this->archiveHeaderData = new stdClass();
+
+		// Open the first part
+		debugMsg('Opening the first part');
+		$this->nextFile();
+
+		// Fail for unreadable files
+		if ($this->fp === false)
+		{
+			debugMsg('The first part is not readable');
+
+			return false;
+		}
+
+		// Read a possible multipart signature
+		$sigBinary  = fread($this->fp, 4);
+		$headerData = unpack('Vsig', $sigBinary);
+
+		// Roll back if it's not a multipart archive
+		if ($headerData['sig'] == 0x04034b50)
+		{
+			debugMsg('The archive is not multipart');
+			fseek($this->fp, -4, SEEK_CUR);
+		}
+		else
+		{
+			debugMsg('The archive is multipart');
+		}
+
+		$multiPartSigs = array(
+			0x08074b50,        // Multi-part ZIP
+			0x30304b50,        // Multi-part ZIP (alternate)
+			0x04034b50        // Single file
+		);
+		if (!in_array($headerData['sig'], $multiPartSigs))
+		{
+			debugMsg('Invalid header signature ' . dechex($headerData['sig']));
+			$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+			return false;
+		}
+
+		$this->currentPartOffset = @ftell($this->fp);
+		debugMsg('Current part offset after reading header: ' . $this->currentPartOffset);
+
+		$this->dataReadLength = 0;
+
+		return true;
+	}
+
+	/**
+	 * Concrete classes must use this method to read the file header
+	 *
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
+	 */
+	protected function readFileHeader()
+	{
+		// If the current part is over, proceed to the next part please
+		if ($this->isEOF(true))
+		{
+			debugMsg('Opening next archive part');
+			$this->nextFile();
+		}
+
+		$this->currentPartOffset = ftell($this->fp);
+
+		if ($this->expectDataDescriptor)
+		{
+			// The last file had bit 3 of the general purpose bit flag set. This means that we have a
+			// 12 byte data descriptor we need to skip. To make things worse, there might also be a 4
+			// byte optional data descriptor header (0x08074b50).
+			$junk = @fread($this->fp, 4);
+			$junk = unpack('Vsig', $junk);
+			if ($junk['sig'] == 0x08074b50)
+			{
+				// Yes, there was a signature
+				$junk = @fread($this->fp, 12);
+				debugMsg('Data descriptor (w/ header) skipped at ' . (ftell($this->fp) - 12));
+			}
+			else
+			{
+				// No, there was no signature, just read another 8 bytes
+				$junk = @fread($this->fp, 8);
+				debugMsg('Data descriptor (w/out header) skipped at ' . (ftell($this->fp) - 8));
+			}
+
+			// And check for EOF, too
+			if ($this->isEOF(true))
+			{
+				debugMsg('EOF before reading header');
+
+				$this->nextFile();
+			}
+		}
+
+		// Get and decode Local File Header
+		$headerBinary = fread($this->fp, 30);
+		$headerData   =
+			unpack('Vsig/C2ver/vbitflag/vcompmethod/vlastmodtime/vlastmoddate/Vcrc/Vcompsize/Vuncomp/vfnamelen/veflen', $headerBinary);
+
+		// Check signature
+		if (!($headerData['sig'] == 0x04034b50))
+		{
+			debugMsg('Not a file signature at ' . (ftell($this->fp) - 4));
+
+			// The signature is not the one used for files. Is this a central directory record (i.e. we're done)?
+			if ($headerData['sig'] == 0x02014b50)
+			{
+				debugMsg('EOCD signature at ' . (ftell($this->fp) - 4));
+				// End of ZIP file detected. We'll just skip to the end of file...
+				while ($this->nextFile())
+				{
+				};
+				@fseek($this->fp, 0, SEEK_END); // Go to EOF
+				return false;
+			}
+			else
+			{
+				debugMsg('Invalid signature ' . dechex($headerData['sig']) . ' at ' . ftell($this->fp));
+				$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+				return false;
+			}
+		}
+
+		// If bit 3 of the bitflag is set, expectDataDescriptor is true
+		$this->expectDataDescriptor = ($headerData['bitflag'] & 4) == 4;
+
+		$this->fileHeader            = new stdClass();
+		$this->fileHeader->timestamp = 0;
+
+		// Read the last modified data and time
+		$lastmodtime = $headerData['lastmodtime'];
+		$lastmoddate = $headerData['lastmoddate'];
+
+		if ($lastmoddate && $lastmodtime)
+		{
+			// ----- Extract time
+			$v_hour    = ($lastmodtime & 0xF800) >> 11;
+			$v_minute  = ($lastmodtime & 0x07E0) >> 5;
+			$v_seconde = ($lastmodtime & 0x001F) * 2;
+
+			// ----- Extract date
+			$v_year  = (($lastmoddate & 0xFE00) >> 9) + 1980;
+			$v_month = ($lastmoddate & 0x01E0) >> 5;
+			$v_day   = $lastmoddate & 0x001F;
+
+			// ----- Get UNIX date format
+			$this->fileHeader->timestamp = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+		}
+
+		$isBannedFile = false;
+
+		$this->fileHeader->compressed   = $headerData['compsize'];
+		$this->fileHeader->uncompressed = $headerData['uncomp'];
+		$nameFieldLength                = $headerData['fnamelen'];
+		$extraFieldLength               = $headerData['eflen'];
+
+		// Read filename field
+		$this->fileHeader->file = fread($this->fp, $nameFieldLength);
+
+		// Handle file renaming
+		$isRenamed = false;
+		if (is_array($this->renameFiles) && (count($this->renameFiles) > 0))
+		{
+			if (array_key_exists($this->fileHeader->file, $this->renameFiles))
+			{
+				$this->fileHeader->file = $this->renameFiles[$this->fileHeader->file];
+				$isRenamed              = true;
+			}
+		}
+
+		// Handle directory renaming
+		$isDirRenamed = false;
+		if (is_array($this->renameDirs) && (count($this->renameDirs) > 0))
+		{
+			if (array_key_exists(dirname($this->fileHeader->file), $this->renameDirs))
+			{
+				$file         =
+					rtrim($this->renameDirs[dirname($this->fileHeader->file)], '/') . '/' . basename($this->fileHeader->file);
+				$isRenamed    = true;
+				$isDirRenamed = true;
+			}
+		}
+
+		// Read extra field if present
+		if ($extraFieldLength > 0)
+		{
+			$extrafield = fread($this->fp, $extraFieldLength);
+		}
+
+		debugMsg('*' . ftell($this->fp) . ' IS START OF ' . $this->fileHeader->file . ' (' . $this->fileHeader->compressed . ' bytes)');
+
+
+		// Decide filetype -- Check for directories
+		$this->fileHeader->type = 'file';
+		if (strrpos($this->fileHeader->file, '/') == strlen($this->fileHeader->file) - 1)
+		{
+			$this->fileHeader->type = 'dir';
+		}
+		// Decide filetype -- Check for symbolic links
+		if (($headerData['ver1'] == 10) && ($headerData['ver2'] == 3))
+		{
+			$this->fileHeader->type = 'link';
+		}
+
+		switch ($headerData['compmethod'])
+		{
+			case 0:
+				$this->fileHeader->compression = 'none';
+				break;
+			case 8:
+				$this->fileHeader->compression = 'gzip';
+				break;
+		}
+
+		// Find hard-coded banned files
+		if ((basename($this->fileHeader->file) == ".") || (basename($this->fileHeader->file) == ".."))
+		{
+			$isBannedFile = true;
+		}
+
+		// Also try to find banned files passed in class configuration
+		if ((count($this->skipFiles) > 0) && (!$isRenamed))
+		{
+			if (in_array($this->fileHeader->file, $this->skipFiles))
+			{
+				$isBannedFile = true;
+			}
+		}
+
+		// If we have a banned file, let's skip it
+		if ($isBannedFile)
+		{
+			// Advance the file pointer, skipping exactly the size of the compressed data
+			$seekleft = $this->fileHeader->compressed;
+			while ($seekleft > 0)
+			{
+				// Ensure that we can seek past archive part boundaries
+				$curSize = @filesize($this->archiveList[$this->currentPartNumber]);
+				$curPos  = @ftell($this->fp);
+				$canSeek = $curSize - $curPos;
+				if ($canSeek > $seekleft)
+				{
+					$canSeek = $seekleft;
+				}
+				@fseek($this->fp, $canSeek, SEEK_CUR);
+				$seekleft -= $canSeek;
+				if ($seekleft)
+				{
+					$this->nextFile();
+				}
+			}
+
+			$this->currentPartOffset = @ftell($this->fp);
+			$this->runState          = AK_STATE_DONE;
+
+			return true;
+		}
+
+		// Remove the removePath, if any
+		$this->fileHeader->file = $this->removePath($this->fileHeader->file);
+
+		// Last chance to prepend a path to the filename
+		if (!empty($this->addPath) && !$isDirRenamed)
+		{
+			$this->fileHeader->file = $this->addPath . $this->fileHeader->file;
+		}
+
+		// Get the translated path name
+		if ($this->fileHeader->type == 'file')
+		{
+			$this->fileHeader->realFile = $this->postProcEngine->processFilename($this->fileHeader->file);
+		}
+		elseif ($this->fileHeader->type == 'dir')
+		{
+			$this->fileHeader->timestamp = 0;
+
+			$dir = $this->fileHeader->file;
+
+			$this->postProcEngine->createDirRecursive($this->fileHeader->file, 0755);
+			$this->postProcEngine->processFilename(null);
+		}
+		else
+		{
+			// Symlink; do not post-process
+			$this->fileHeader->timestamp = 0;
+			$this->postProcEngine->processFilename(null);
+		}
+
+		$this->createDirectory();
+
+		// Header is read
+		$this->runState = AK_STATE_HEADER;
+
+		return true;
+	}
+
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * JPS archive extraction class
+ */
+class AKUnarchiverJPS extends AKUnarchiverJPA
+{
+	/**
+	 * Header data for the archive
+	 *
+	 * @var   array
+	 */
+	protected $archiveHeaderData = array();
+
+	/**
+	 * Plaintext password from which the encryption key will be derived with PBKDF2
+	 *
+	 * @var   string
+	 */
+	protected $password = '';
+
+	/**
+	 * Which hash algorithm should I use for key derivation with PBKDF2.
+	 *
+	 * @var   string
+	 */
+	private $pbkdf2Algorithm = 'sha1';
+
+	/**
+	 * How many iterations should I use for key derivation with PBKDF2
+	 *
+	 * @var   int
+	 */
+	private $pbkdf2Iterations = 1000;
+
+	/**
+	 * Should I use a static salt for key derivation with PBKDF2?
+	 *
+	 * @var   bool
+	 */
+	private $pbkdf2UseStaticSalt = 0;
+
+	/**
+	 * Static salt for key derivation with PBKDF2
+	 *
+	 * @var   string
+	 */
+	private $pbkdf2StaticSalt = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+	/**
+	 * How much compressed data I have read since the last file header read
+	 *
+	 * @var   int
+	 */
+	private $compressedSizeReadSinceLastFileHeader = 0;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->password = AKFactory::get('kickstart.jps.password', '');
+	}
+
+	public function __wakeup()
+	{
+		parent::__wakeup();
+
+		// Make sure the decryption is all set up (required!)
+		AKEncryptionAES::setPbkdf2Algorithm($this->pbkdf2Algorithm);
+		AKEncryptionAES::setPbkdf2Iterations($this->pbkdf2Iterations);
+		AKEncryptionAES::setPbkdf2UseStaticSalt($this->pbkdf2UseStaticSalt);
+		AKEncryptionAES::setPbkdf2StaticSalt($this->pbkdf2StaticSalt);
+	}
+
+
+	protected function readArchiveHeader()
+	{
+		// Initialize header data array
+		$this->archiveHeaderData = new stdClass();
+
+		// Open the first part
+		$this->nextFile();
+
+		// Fail for unreadable files
+		if ($this->fp === false)
+		{
+			return false;
+		}
+
+		// Read the signature
+		$sig = fread($this->fp, 3);
+
+		if ($sig != 'JPS')
+		{
+			// Not a JPA file
+			$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+			return false;
+		}
+
+		// Read and parse the known portion of header data (5 bytes)
+		$bin_data    = fread($this->fp, 5);
+		$header_data = unpack('Cmajor/Cminor/cspanned/vextra', $bin_data);
+
+		// Is this a v2 archive?
+		$versionHumanReadable = $header_data['major'] . '.' . $header_data['minor'];
+		$isV2Archive = version_compare($versionHumanReadable, '2.0', 'ge');
+
+		// Load any remaining header data
+		$rest_length = $header_data['extra'];
+
+		if ($isV2Archive && $rest_length)
+		{
+			// V2 archives only have one kind of extra header
+			if (!$this->readKeyExpansionExtraHeader())
+			{
+				return false;
+			}
+		}
+		elseif ($rest_length > 0)
+		{
+			$junk = fread($this->fp, $rest_length);
+		}
+
+		// Temporary array with all the data we read
+		$temp = array(
+			'signature' => $sig,
+			'major'     => $header_data['major'],
+			'minor'     => $header_data['minor'],
+			'spanned'   => $header_data['spanned']
+		);
+		// Array-to-object conversion
+		foreach ($temp as $key => $value)
+		{
+			$this->archiveHeaderData->{$key} = $value;
+		}
+
+		$this->currentPartOffset = @ftell($this->fp);
+
+		$this->dataReadLength = 0;
+
+		return true;
+	}
+
+	/**
+	 * Concrete classes must use this method to read the file header
+	 *
+	 * @return bool True if reading the file was successful, false if an error occurred or we reached end of archive
+	 */
+	protected function readFileHeader()
+	{
+		// If the current part is over, proceed to the next part please
+		if ($this->isEOF(true))
+		{
+			$this->nextFile();
+		}
+
+		$this->currentPartOffset = ftell($this->fp);
+
+		// Get and decode Entity Description Block
+		$signature = fread($this->fp, 3);
+
+		// Check for end-of-archive siganture
+		if ($signature == 'JPE')
+		{
+			$this->setState('postrun');
+
+			return true;
+		}
+
+		$this->fileHeader            = new stdClass();
+		$this->fileHeader->timestamp = 0;
+
+		// Check signature
+		if ($signature != 'JPF')
+		{
+			if ($this->isEOF(true))
+			{
+				// This file is finished; make sure it's the last one
+				$this->nextFile();
+				if (!$this->isEOF(false))
+				{
+					$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
+
+					return false;
+				}
+
+				// We're just finished
+				return false;
+			}
+			else
+			{
+				fseek($this->fp, -6, SEEK_CUR);
+				$signature = fread($this->fp, 3);
+				if ($signature == 'JPE')
+				{
+					return false;
+				}
+
+				$this->setError(AKText::sprintf('INVALID_FILE_HEADER', $this->currentPartNumber, $this->currentPartOffset));
+
+				return false;
+			}
+		}
+
+		// This a JPS Entity Block. Process the header.
+
+		$isBannedFile = false;
+
+		// Make sure the decryption is all set up
+		AKEncryptionAES::setPbkdf2Algorithm($this->pbkdf2Algorithm);
+		AKEncryptionAES::setPbkdf2Iterations($this->pbkdf2Iterations);
+		AKEncryptionAES::setPbkdf2UseStaticSalt($this->pbkdf2UseStaticSalt);
+		AKEncryptionAES::setPbkdf2StaticSalt($this->pbkdf2StaticSalt);
+
+		// Read and decrypt the header
+		$edbhData = fread($this->fp, 4);
+		$edbh     = unpack('vencsize/vdecsize', $edbhData);
+		$bin_data = fread($this->fp, $edbh['encsize']);
+
+		// Add the header length to the data read
+		$this->compressedSizeReadSinceLastFileHeader += $edbh['encsize'] + 4;
+
+		// Decrypt and truncate
+		$bin_data = AKEncryptionAES::AESDecryptCBC($bin_data, $this->password);
+		$bin_data = substr($bin_data, 0, $edbh['decsize']);
+
+		// Read length of EDB and of the Entity Path Data
+		$length_array = unpack('vpathsize', substr($bin_data, 0, 2));
+		// Read the path data
+		$file = substr($bin_data, 2, $length_array['pathsize']);
+
+		// Handle file renaming
+		$isRenamed = false;
+		if (is_array($this->renameFiles) && (count($this->renameFiles) > 0))
+		{
+			if (array_key_exists($file, $this->renameFiles))
+			{
+				$file      = $this->renameFiles[$file];
+				$isRenamed = true;
+			}
+		}
+
+		// Handle directory renaming
+		$isDirRenamed = false;
+		if (is_array($this->renameDirs) && (count($this->renameDirs) > 0))
+		{
+			if (array_key_exists(dirname($file), $this->renameDirs))
+			{
+				$file         = rtrim($this->renameDirs[dirname($file)], '/') . '/' . basename($file);
+				$isRenamed    = true;
+				$isDirRenamed = true;
+			}
+		}
+
+		// Read and parse the known data portion
+		$bin_data    = substr($bin_data, 2 + $length_array['pathsize']);
+		$header_data = unpack('Ctype/Ccompression/Vuncompsize/Vperms/Vfilectime', $bin_data);
+
+		$this->fileHeader->timestamp = $header_data['filectime'];
+		$compressionType             = $header_data['compression'];
+
+		// Populate the return array
+		$this->fileHeader->file         = $file;
+		$this->fileHeader->uncompressed = $header_data['uncompsize'];
+		switch ($header_data['type'])
+		{
+			case 0:
+				$this->fileHeader->type = 'dir';
+				break;
+
+			case 1:
+				$this->fileHeader->type = 'file';
+				break;
+
+			case 2:
+				$this->fileHeader->type = 'link';
+				break;
+		}
+		switch ($compressionType)
+		{
+			case 0:
+				$this->fileHeader->compression = 'none';
+				break;
+			case 1:
+				$this->fileHeader->compression = 'gzip';
+				break;
+			case 2:
+				$this->fileHeader->compression = 'bzip2';
+				break;
+		}
+		$this->fileHeader->permissions = $header_data['perms'];
+
+		// Find hard-coded banned files
+		if ((basename($this->fileHeader->file) == ".") || (basename($this->fileHeader->file) == ".."))
+		{
+			$isBannedFile = true;
+		}
+
+		// Also try to find banned files passed in class configuration
+		if ((count($this->skipFiles) > 0) && (!$isRenamed))
+		{
+			if (in_array($this->fileHeader->file, $this->skipFiles))
+			{
+				$isBannedFile = true;
+			}
+		}
+
+		// If we have a banned file, let's skip it
+		if ($isBannedFile)
+		{
+			$done = false;
+			while (!$done)
+			{
+				// Read the Data Chunk Block header
+				$binMiniHead = fread($this->fp, 8);
+				if (in_array(substr($binMiniHead, 0, 3), array('JPF', 'JPE')))
+				{
+					// Not a Data Chunk Block header, I am done skipping the file
+					@fseek($this->fp, -8, SEEK_CUR); // Roll back the file pointer
+					$done = true; // Mark as done
+					continue; // Exit loop
+				}
+				else
+				{
+					// Skip forward by the amount of compressed data
+					$miniHead = unpack('Vencsize/Vdecsize', $binMiniHead);
+					@fseek($this->fp, $miniHead['encsize'], SEEK_CUR);
+					$this->compressedSizeReadSinceLastFileHeader += 8 + $miniHead['encsize'];
+				}
+			}
+
+			$this->currentPartOffset                     = @ftell($this->fp);
+			$this->runState                              = AK_STATE_DONE;
+			$this->fileHeader->compressed                = $this->compressedSizeReadSinceLastFileHeader;
+			$this->compressedSizeReadSinceLastFileHeader = 0;
+
+			return true;
+		}
+
+		// Remove the removePath, if any
+		$this->fileHeader->file = $this->removePath($this->fileHeader->file);
+
+		// Last chance to prepend a path to the filename
+		if (!empty($this->addPath) && !$isDirRenamed)
+		{
+			$this->fileHeader->file = $this->addPath . $this->fileHeader->file;
+		}
+
+		// Get the translated path name
+		$restorePerms = AKFactory::get('kickstart.setup.restoreperms', false);
+		if ($this->fileHeader->type == 'file')
+		{
+			// Regular file; ask the postproc engine to process its filename
+			if ($restorePerms)
+			{
+				$this->fileHeader->realFile =
+					$this->postProcEngine->processFilename($this->fileHeader->file, $this->fileHeader->permissions);
+			}
+			else
+			{
+				$this->fileHeader->realFile = $this->postProcEngine->processFilename($this->fileHeader->file);
+			}
+		}
+		elseif ($this->fileHeader->type == 'dir')
+		{
+			$dir                        = $this->fileHeader->file;
+			$this->fileHeader->realFile = $dir;
+
+			// Directory; just create it
+			if ($restorePerms)
+			{
+				$this->postProcEngine->createDirRecursive($this->fileHeader->file, $this->fileHeader->permissions);
+			}
+			else
+			{
+				$this->postProcEngine->createDirRecursive($this->fileHeader->file, 0755);
+			}
+			$this->postProcEngine->processFilename(null);
+		}
+		else
+		{
+			// Symlink; do not post-process
+			$this->postProcEngine->processFilename(null);
+		}
+
+		$this->fileHeader->compressed                = $this->compressedSizeReadSinceLastFileHeader;
+		$this->compressedSizeReadSinceLastFileHeader = 0;
+
+		$this->createDirectory();
+
+		// Header is read
+		$this->runState = AK_STATE_HEADER;
+
+		$this->dataReadLength = 0;
+
+		return true;
+	}
+
+	/**
+	 * Creates the directory this file points to
+	 */
+	protected function createDirectory()
+	{
+		if (AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			return true;
+		}
+
+		// Do we need to create a directory?
+		$lastSlash = strrpos($this->fileHeader->realFile, '/');
+		$dirName   = substr($this->fileHeader->realFile, 0, $lastSlash);
+		$perms     = 0755;
+		$ignore    = AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($dirName);
+
+		if (($this->postProcEngine->createDirRecursive($dirName, $perms) == false) && (!$ignore))
+		{
+			$this->setError(AKText::sprintf('COULDNT_CREATE_DIR', $dirName));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Concrete classes must use this method to process file data. It must set $runState to AK_STATE_DATAREAD when
+	 * it's finished processing the file data.
+	 *
+	 * @return bool True if processing the file data was successful, false if an error occurred
+	 */
+	protected function processFileData()
+	{
+		switch ($this->fileHeader->type)
+		{
+			case 'dir':
+				return $this->processTypeDir();
+				break;
+
+			case 'link':
+				return $this->processTypeLink();
+				break;
+
+			case 'file':
+				switch ($this->fileHeader->compression)
+				{
+					case 'none':
+						return $this->processTypeFileUncompressed();
+						break;
+
+					case 'gzip':
+					case 'bzip2':
+						return $this->processTypeFileCompressedSimple();
+						break;
+
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Process the file data of a directory entry
+	 *
+	 * @return bool
+	 */
+	private function processTypeDir()
+	{
+		// Directory entries in the JPA do not have file data, therefore we're done processing the entry
+		$this->runState = AK_STATE_DATAREAD;
+
+		return true;
+	}
+
+	/**
+	 * Process the file data of a link entry
+	 *
+	 * @return bool
+	 */
+	private function processTypeLink()
+	{
+
+		// Does the file have any data, at all?
+		if ($this->fileHeader->uncompressed == 0)
+		{
+			// No file data!
+			$this->runState = AK_STATE_DATAREAD;
+
+			return true;
+		}
+
+		// Read the mini header
+		$binMiniHeader   = fread($this->fp, 8);
+		$reallyReadBytes = akstringlen($binMiniHeader);
+
+		if ($reallyReadBytes < 8)
+		{
+			// We read less than requested! Why? Did we hit local EOF?
+			if ($this->isEOF(true) && !$this->isEOF(false))
+			{
+				// Yeap. Let's go to the next file
+				$this->nextFile();
+				// Retry reading the header
+				$binMiniHeader   = fread($this->fp, 8);
+				$reallyReadBytes = akstringlen($binMiniHeader);
+				// Still not enough data? If so, the archive is corrupt or missing parts.
+				if ($reallyReadBytes < 8)
+				{
+					$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+					return false;
+				}
+			}
+			else
+			{
+				// Nope. The archive is corrupt
+				$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+				return false;
+			}
+		}
+
+		// Read the encrypted data
+		$miniHeader      = unpack('Vencsize/Vdecsize', $binMiniHeader);
+		$toReadBytes     = $miniHeader['encsize'];
+		$data            = $this->fread($this->fp, $toReadBytes);
+		$reallyReadBytes = akstringlen($data);
+		$this->compressedSizeReadSinceLastFileHeader += 8 + $miniHeader['encsize'];
+
+		if ($reallyReadBytes < $toReadBytes)
+		{
+			// We read less than requested! Why? Did we hit local EOF?
+			if ($this->isEOF(true) && !$this->isEOF(false))
+			{
+				// Yeap. Let's go to the next file
+				$this->nextFile();
+				// Read the rest of the data
+				$toReadBytes -= $reallyReadBytes;
+				$restData        = $this->fread($this->fp, $toReadBytes);
+				$reallyReadBytes = akstringlen($data);
+				if ($reallyReadBytes < $toReadBytes)
+				{
+					$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+					return false;
+				}
+				$data .= $restData;
+			}
+			else
+			{
+				// Nope. The archive is corrupt
+				$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+				return false;
+			}
+		}
+
+		// Decrypt the data
+		$data = AKEncryptionAES::AESDecryptCBC($data, $this->password);
+
+		// Is the length of the decrypted data less than expected?
+		$data_length = akstringlen($data);
+		if ($data_length < $miniHeader['decsize'])
+		{
+			$this->setError(AKText::_('ERR_INVALID_JPS_PASSWORD'));
+
+			return false;
+		}
+
+		// Trim the data
+		$data = substr($data, 0, $miniHeader['decsize']);
+
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Try to remove an existing file or directory by the same name
+			if (file_exists($this->fileHeader->file))
+			{
+				@unlink($this->fileHeader->file);
+				@rmdir($this->fileHeader->file);
+			}
+			// Remove any trailing slash
+			if (substr($this->fileHeader->file, -1) == '/')
+			{
+				$this->fileHeader->file = substr($this->fileHeader->file, 0, -1);
+			}
+			// Create the symlink - only possible within PHP context. There's no support built in the FTP protocol, so no postproc use is possible here :(
+			@symlink($data, $this->fileHeader->file);
+		}
+
+		$this->runState = AK_STATE_DATAREAD;
+
+		return true; // No matter if the link was created!
+	}
+
+	private function processTypeFileUncompressed()
+	{
+		// Uncompressed files are being processed in small chunks, to avoid timeouts
+		if (($this->dataReadLength == 0) && !AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Before processing file data, ensure permissions are adequate
+			$this->setCorrectPermissions($this->fileHeader->file);
+		}
+
+		// Open the output file
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			$ignore =
+				AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
+			if ($this->dataReadLength == 0)
+			{
+				$outfp = @fopen($this->fileHeader->realFile, 'wb');
+			}
+			else
+			{
+				$outfp = @fopen($this->fileHeader->realFile, 'ab');
+			}
+
+			// Can we write to the file?
+			if (($outfp === false) && (!$ignore))
+			{
+				// An error occurred
+				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
+
+				return false;
+			}
+		}
+
+		// Does the file have any data, at all?
+		if ($this->fileHeader->uncompressed == 0)
+		{
+			// No file data!
+			if (!AKFactory::get('kickstart.setup.dryrun', '0') && is_resource($outfp))
+			{
+				@fclose($outfp);
+			}
+			$this->runState = AK_STATE_DATAREAD;
+
+			return true;
+		}
+
+		$this->setError('An uncompressed file was detected; this is not supported by this archive extraction utility');
+
+		return false;
+	}
+
+	private function processTypeFileCompressedSimple()
+	{
+		$timer = AKFactory::getTimer();
+
+		// Files are being processed in small chunks, to avoid timeouts
+		if (($this->dataReadLength == 0) && !AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Before processing file data, ensure permissions are adequate
+			$this->setCorrectPermissions($this->fileHeader->file);
+		}
+
+		// Open the output file
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			// Open the output file
+			$outfp = @fopen($this->fileHeader->realFile, 'wb');
+
+			// Can we write to the file?
+			$ignore =
+				AKFactory::get('kickstart.setup.ignoreerrors', false) || $this->isIgnoredDirectory($this->fileHeader->file);
+			if (($outfp === false) && (!$ignore))
+			{
+				// An error occurred
+				$this->setError(AKText::sprintf('COULDNT_WRITE_FILE', $this->fileHeader->realFile));
+
+				return false;
+			}
+		}
+
+		// Does the file have any data, at all?
+		if ($this->fileHeader->uncompressed == 0)
+		{
+			// No file data!
+			if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+			{
+				if (is_resource($outfp))
+				{
+					@fclose($outfp);
+				}
+			}
+			$this->runState = AK_STATE_DATAREAD;
+
+			return true;
+		}
+
+		$leftBytes = $this->fileHeader->uncompressed - $this->dataReadLength;
+
+		// Loop while there's data to write and enough time to do it
+		while (($leftBytes > 0) && ($timer->getTimeLeft() > 0))
+		{
+			// Read the mini header
+			$binMiniHeader   = fread($this->fp, 8);
+			$reallyReadBytes = akstringlen($binMiniHeader);
+			if ($reallyReadBytes < 8)
+			{
+				// We read less than requested! Why? Did we hit local EOF?
+				if ($this->isEOF(true) && !$this->isEOF(false))
+				{
+					// Yeap. Let's go to the next file
+					$this->nextFile();
+					// Retry reading the header
+					$binMiniHeader   = fread($this->fp, 8);
+					$reallyReadBytes = akstringlen($binMiniHeader);
+					// Still not enough data? If so, the archive is corrupt or missing parts.
+					if ($reallyReadBytes < 8)
+					{
+						$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+						return false;
+					}
+				}
+				else
+				{
+					// Nope. The archive is corrupt
+					$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+					return false;
+				}
+			}
+
+			// Read the encrypted data
+			$miniHeader      = unpack('Vencsize/Vdecsize', $binMiniHeader);
+			$toReadBytes     = $miniHeader['encsize'];
+			$data            = $this->fread($this->fp, $toReadBytes);
+			$reallyReadBytes = akstringlen($data);
+
+			$this->compressedSizeReadSinceLastFileHeader += $miniHeader['encsize'] + 8;
+
+			if ($reallyReadBytes < $toReadBytes)
+			{
+				// We read less than requested! Why? Did we hit local EOF?
+				if ($this->isEOF(true) && !$this->isEOF(false))
+				{
+					// Yeap. Let's go to the next file
+					$this->nextFile();
+					// Read the rest of the data
+					$toReadBytes -= $reallyReadBytes;
+					$restData        = $this->fread($this->fp, $toReadBytes);
+					$reallyReadBytes = akstringlen($restData);
+					if ($reallyReadBytes < $toReadBytes)
+					{
+						$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+						return false;
+					}
+					if (akstringlen($data) == 0)
+					{
+						$data = $restData;
+					}
+					else
+					{
+						$data .= $restData;
+					}
+				}
+				else
+				{
+					// Nope. The archive is corrupt
+					$this->setError(AKText::_('ERR_CORRUPT_ARCHIVE'));
+
+					return false;
+				}
+			}
+
+			// Decrypt the data
+			$data = AKEncryptionAES::AESDecryptCBC($data, $this->password);
+
+			// Is the length of the decrypted data less than expected?
+			$data_length = akstringlen($data);
+			if ($data_length < $miniHeader['decsize'])
+			{
+				$this->setError(AKText::_('ERR_INVALID_JPS_PASSWORD'));
+
+				return false;
+			}
+
+			// Trim the data
+			$data = substr($data, 0, $miniHeader['decsize']);
+
+			// Decompress
+			$data    = gzinflate($data);
+			$unc_len = akstringlen($data);
+
+			// Write the decrypted data
+			if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+			{
+				if (is_resource($outfp))
+				{
+					@fwrite($outfp, $data, akstringlen($data));
+				}
+			}
+
+			// Update the read length
+			$this->dataReadLength += $unc_len;
+			$leftBytes = $this->fileHeader->uncompressed - $this->dataReadLength;
+		}
+
+		// Close the file pointer
+		if (!AKFactory::get('kickstart.setup.dryrun', '0'))
+		{
+			if (is_resource($outfp))
+			{
+				@fclose($outfp);
+			}
+		}
+
+		// Was this a pre-timeout bail out?
+		if ($leftBytes > 0)
+		{
+			$this->runState = AK_STATE_DATA;
+		}
+		else
+		{
+			// Oh! We just finished!
+			$this->runState       = AK_STATE_DATAREAD;
+			$this->dataReadLength = 0;
+		}
+
+		return true;
+	}
+
+	private function readKeyExpansionExtraHeader()
+	{
+		$signature = fread($this->fp, 4);
+
+		if ($signature != "JH\x00\x01")
+		{
+			// Not a valid JPS file
+			$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+			return false;
+		}
+
+		$bin_data    = fread($this->fp, 8);
+		$header_data = unpack('vlength/Calgo/Viterations/CuseStaticSalt', $bin_data);
+
+		if ($header_data['length'] != 76)
+		{
+			// Not a valid JPS file
+			$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+			return false;
+		}
+
+		switch ($header_data['algo'])
+		{
+			case 0:
+				$algorithm = 'sha1';
+				break;
+
+			case 1:
+				$algorithm = 'sha256';
+				break;
+
+			case 2:
+				$algorithm = 'sha512';
+				break;
+
+			default:
+				// Not a valid JPS file
+				$this->setError(AKText::_('ERR_NOT_A_JPS_FILE'));
+
+				return false;
+				break;
+		}
+
+		$this->pbkdf2Algorithm     = $algorithm;
+		$this->pbkdf2Iterations    = $header_data['iterations'];
+		$this->pbkdf2UseStaticSalt = $header_data['useStaticSalt'];
+		$this->pbkdf2StaticSalt    = fread($this->fp, 64);
+
+		return true;
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Timer class
+ */
+class AKCoreTimer extends AKAbstractObject
+{
+	/** @var int Maximum execution time allowance per step */
+	private $max_exec_time = null;
+
+	/** @var int Timestamp of execution start */
+	private $start_time = null;
+
+	/**
+	 * Public constructor, creates the timer object and calculates the execution time limits
+	 *
+	 * @return AECoreTimer
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Initialize start time
+		$this->start_time = $this->microtime_float();
+
+		// Get configured max time per step and bias
+		$config_max_exec_time = AKFactory::get('kickstart.tuning.max_exec_time', 14);
+		$bias                 = AKFactory::get('kickstart.tuning.run_time_bias', 75) / 100;
+
+		// Get PHP's maximum execution time (our upper limit)
+		if (@function_exists('ini_get'))
+		{
+			$php_max_exec_time = @ini_get("maximum_execution_time");
+			if ((!is_numeric($php_max_exec_time)) || ($php_max_exec_time == 0))
+			{
+				// If we have no time limit, set a hard limit of about 10 seconds
+				// (safe for Apache and IIS timeouts, verbose enough for users)
+				$php_max_exec_time = 14;
+			}
+		}
+		else
+		{
+			// If ini_get is not available, use a rough default
+			$php_max_exec_time = 14;
+		}
+
+		// Apply an arbitrary correction to counter CMS load time
+		$php_max_exec_time--;
+
+		// Apply bias
+		$php_max_exec_time    = $php_max_exec_time * $bias;
+		$config_max_exec_time = $config_max_exec_time * $bias;
+
+		// Use the most appropriate time limit value
+		if ($config_max_exec_time > $php_max_exec_time)
+		{
+			$this->max_exec_time = $php_max_exec_time;
+		}
+		else
+		{
+			$this->max_exec_time = $config_max_exec_time;
+		}
+	}
+
+	/**
+	 * Returns the current timestampt in decimal seconds
+	 */
+	private function microtime_float()
+	{
+		list($usec, $sec) = explode(" ", microtime());
+
+		return ((float) $usec + (float) $sec);
+	}
+
+	/**
+	 * Wake-up function to reset internal timer when we get unserialized
+	 */
+	public function __wakeup()
+	{
+		// Re-initialize start time on wake-up
+		$this->start_time = $this->microtime_float();
+	}
+
+	/**
+	 * Gets the number of seconds left, before we hit the "must break" threshold
+	 *
+	 * @return float
+	 */
+	public function getTimeLeft()
+	{
+		return $this->max_exec_time - $this->getRunningTime();
+	}
+
+	/**
+	 * Gets the time elapsed since object creation/unserialization, effectively how
+	 * long Akeeba Engine has been processing data
+	 *
+	 * @return float
+	 */
+	public function getRunningTime()
+	{
+		return $this->microtime_float() - $this->start_time;
+	}
+
+	/**
+	 * Enforce the minimum execution time
+	 */
+	public function enforce_min_exec_time()
+	{
+		// Try to get a sane value for PHP's maximum_execution_time INI parameter
+		if (@function_exists('ini_get'))
+		{
+			$php_max_exec = @ini_get("maximum_execution_time");
+		}
+		else
+		{
+			$php_max_exec = 10;
+		}
+		if (($php_max_exec == "") || ($php_max_exec == 0))
+		{
+			$php_max_exec = 10;
+		}
+		// Decrease $php_max_exec time by 500 msec we need (approx.) to tear down
+		// the application, as well as another 500msec added for rounding
+		// error purposes. Also make sure this is never gonna be less than 0.
+		$php_max_exec = max($php_max_exec * 1000 - 1000, 0);
+
+		// Get the "minimum execution time per step" Akeeba Backup configuration variable
+		$minexectime = AKFactory::get('kickstart.tuning.min_exec_time', 0);
+		if (!is_numeric($minexectime))
+		{
+			$minexectime = 0;
+		}
+
+		// Make sure we are not over PHP's time limit!
+		if ($minexectime > $php_max_exec)
+		{
+			$minexectime = $php_max_exec;
+		}
+
+		// Get current running time
+		$elapsed_time = $this->getRunningTime() * 1000;
+
+		// Only run a sleep delay if we haven't reached the minexectime execution time
+		if (($minexectime > $elapsed_time) && ($elapsed_time > 0))
+		{
+			$sleep_msec = $minexectime - $elapsed_time;
+			if (function_exists('usleep'))
+			{
+				usleep(1000 * $sleep_msec);
+			}
+			elseif (function_exists('time_nanosleep'))
+			{
+				$sleep_sec  = floor($sleep_msec / 1000);
+				$sleep_nsec = 1000000 * ($sleep_msec - ($sleep_sec * 1000));
+				time_nanosleep($sleep_sec, $sleep_nsec);
+			}
+			elseif (function_exists('time_sleep_until'))
+			{
+				$until_timestamp = time() + $sleep_msec / 1000;
+				time_sleep_until($until_timestamp);
+			}
+			elseif (function_exists('sleep'))
+			{
+				$sleep_sec = ceil($sleep_msec / 1000);
+				sleep($sleep_sec);
+			}
+		}
+		elseif ($elapsed_time > 0)
+		{
+			// No sleep required, even if user configured us to be able to do so.
+		}
+	}
+
+	/**
+	 * Reset the timer. It should only be used in CLI mode!
+	 */
+	public function resetTime()
+	{
+		$this->start_time = $this->microtime_float();
+	}
+
+	/**
+	 * @param int $max_exec_time
+	 */
+	public function setMaxExecTime($max_exec_time)
+	{
+		$this->max_exec_time = $max_exec_time;
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * A filesystem scanner which uses opendir()
+ */
+class AKUtilsLister extends AKAbstractObject
+{
+	public function &getFiles($folder, $pattern = '*')
+	{
+		// Initialize variables
+		$arr   = array();
+		$false = false;
+
+		if (!is_dir($folder))
+		{
+			return $false;
+		}
+
+		$handle = @opendir($folder);
+		// If directory is not accessible, just return FALSE
+		if ($handle === false)
+		{
+			$this->setWarning('Unreadable directory ' . $folder);
+
+			return $false;
+		}
+
+		while (($file = @readdir($handle)) !== false)
+		{
+			if (!fnmatch($pattern, $file))
+			{
+				continue;
+			}
+
+			if (($file != '.') && ($file != '..'))
+			{
+				$ds    =
+					($folder == '') || ($folder == '/') || (@substr($folder, -1) == '/') || (@substr($folder, -1) == DIRECTORY_SEPARATOR) ?
+						'' : DIRECTORY_SEPARATOR;
+				$dir   = $folder . $ds . $file;
+				$isDir = is_dir($dir);
+				if (!$isDir)
+				{
+					$arr[] = $dir;
+				}
+			}
+		}
+		@closedir($handle);
+
+		return $arr;
+	}
+
+	public function &getFolders($folder, $pattern = '*')
+	{
+		// Initialize variables
+		$arr   = array();
+		$false = false;
+
+		if (!is_dir($folder))
+		{
+			return $false;
+		}
+
+		$handle = @opendir($folder);
+		// If directory is not accessible, just return FALSE
+		if ($handle === false)
+		{
+			$this->setWarning('Unreadable directory ' . $folder);
+
+			return $false;
+		}
+
+		while (($file = @readdir($handle)) !== false)
+		{
+			if (!fnmatch($pattern, $file))
+			{
+				continue;
+			}
+
+			if (($file != '.') && ($file != '..'))
+			{
+				$ds    =
+					($folder == '') || ($folder == '/') || (@substr($folder, -1) == '/') || (@substr($folder, -1) == DIRECTORY_SEPARATOR) ?
+						'' : DIRECTORY_SEPARATOR;
+				$dir   = $folder . $ds . $file;
+				$isDir = is_dir($dir);
+				if ($isDir)
+				{
+					$arr[] = $dir;
+				}
+			}
+		}
+		@closedir($handle);
+
+		return $arr;
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * A simple INI-based i18n engine
+ */
+class AKText extends AKAbstractObject
+{
+	/**
+	 * The default (en_GB) translation used when no other translation is available
+	 *
+	 * @var array
+	 */
+	private $default_translation = array(
+		'AUTOMODEON'                      => 'Auto-mode enabled',
+		'ERR_NOT_A_JPA_FILE'              => 'The file is not a JPA archive',
+		'ERR_CORRUPT_ARCHIVE'             => 'The archive file is corrupt, truncated or archive parts are missing',
+		'ERR_INVALID_LOGIN'               => 'Invalid login',
+		'COULDNT_CREATE_DIR'              => 'Could not create %s folder',
+		'COULDNT_WRITE_FILE'              => 'Could not open %s for writing.',
+		'WRONG_FTP_HOST'                  => 'Wrong FTP host or port',
+		'WRONG_FTP_USER'                  => 'Wrong FTP username or password',
+		'WRONG_FTP_PATH1'                 => 'Wrong FTP initial directory - the directory doesn\'t exist',
+		'FTP_CANT_CREATE_DIR'             => 'Could not create directory %s',
+		'FTP_TEMPDIR_NOT_WRITABLE'        => 'Could not find or create a writable temporary directory',
+		'SFTP_TEMPDIR_NOT_WRITABLE'       => 'Could not find or create a writable temporary directory',
+		'FTP_COULDNT_UPLOAD'              => 'Could not upload %s',
+		'THINGS_HEADER'                   => 'Things you should know about Akeeba Kickstart',
+		'THINGS_01'                       => 'Kickstart is not an installer. It is an archive extraction tool. The actual installer was put inside the archive file at backup time.',
+		'THINGS_02'                       => 'Kickstart is not the only way to extract the backup archive. You can use Akeeba eXtract Wizard and upload the extracted files using FTP instead.',
+		'THINGS_03'                       => 'Kickstart is bound by your server\'s configuration. As such, it may not work at all.',
+		'THINGS_04'                       => 'You should download and upload your archive files using FTP in Binary transfer mode. Any other method could lead to a corrupt backup archive and restoration failure.',
+		'THINGS_05'                       => 'Post-restoration site load errors are usually caused by .htaccess or php.ini directives. You should understand that blank pages, 404 and 500 errors can usually be worked around by editing the aforementioned files. It is not our job to mess with your configuration files, because this could be dangerous for your site.',
+		'THINGS_06'                       => 'Kickstart overwrites files without a warning. If you are not sure that you are OK with that do not continue.',
+		'THINGS_07'                       => 'Trying to restore to the temporary URL of a cPanel host (e.g. http://1.2.3.4/~username) will lead to restoration failure and your site will appear to be not working. This is normal and it\'s just how your server and CMS software work.',
+		'THINGS_08'                       => 'You are supposed to read the documentation before using this software. Most issues can be avoided, or easily worked around, by understanding how this software works.',
+		'THINGS_09'                       => 'This text does not imply that there is a problem detected. It is standard text displayed every time you launch Kickstart.',
+		'CLOSE_LIGHTBOX'                  => 'Click here or press ESC to close this message',
+		'SELECT_ARCHIVE'                  => 'Select a backup archive',
+		'ARCHIVE_FILE'                    => 'Archive file:',
+		'SELECT_EXTRACTION'               => 'Select an extraction method',
+		'WRITE_TO_FILES'                  => 'Write to files:',
+		'WRITE_HYBRID'                    => 'Hybrid (use FTP only if needed)',
+		'WRITE_DIRECTLY'                  => 'Directly',
+		'WRITE_FTP'                       => 'Use FTP for all files',
+		'WRITE_SFTP'                      => 'Use SFTP for all files',
+		'FTP_HOST'                        => '(S)FTP host name:',
+		'FTP_PORT'                        => '(S)FTP port:',
+		'FTP_FTPS'                        => 'Use FTP over SSL (FTPS)',
+		'FTP_PASSIVE'                     => 'Use FTP Passive Mode',
+		'FTP_USER'                        => '(S)FTP user name:',
+		'FTP_PASS'                        => '(S)FTP password:',
+		'FTP_DIR'                         => '(S)FTP directory:',
+		'FTP_TEMPDIR'                     => 'Temporary directory:',
+		'FTP_CONNECTION_OK'               => 'FTP Connection Established',
+		'SFTP_CONNECTION_OK'              => 'SFTP Connection Established',
+		'FTP_CONNECTION_FAILURE'          => 'The FTP Connection Failed',
+		'SFTP_CONNECTION_FAILURE'         => 'The SFTP Connection Failed',
+		'FTP_TEMPDIR_WRITABLE'            => 'The temporary directory is writable.',
+		'FTP_TEMPDIR_UNWRITABLE'          => 'The temporary directory is not writable. Please check the permissions.',
+		'FTPBROWSER_ERROR_HOSTNAME'       => "Invalid FTP host or port",
+		'FTPBROWSER_ERROR_USERPASS'       => "Invalid FTP username or password",
+		'FTPBROWSER_ERROR_NOACCESS'       => "Directory doesn't exist or you don't have enough permissions to access it",
+		'FTPBROWSER_ERROR_UNSUPPORTED'    => "Sorry, your FTP server doesn't support our FTP directory browser.",
+		'FTPBROWSER_LBL_GOPARENT'         => "&lt;up one level&gt;",
+		'FTPBROWSER_LBL_INSTRUCTIONS'     => 'Click on a directory to navigate into it. Click on OK to select that directory, Cancel to abort the procedure.',
+		'FTPBROWSER_LBL_ERROR'            => 'An error occurred',
+		'SFTP_NO_SSH2'                    => 'Your web server does not have the SSH2 PHP module, therefore can not connect to SFTP servers.',
+		'SFTP_NO_FTP_SUPPORT'             => 'Your SSH server does not allow SFTP connections',
+		'SFTP_WRONG_USER'                 => 'Wrong SFTP username or password',
+		'SFTP_WRONG_STARTING_DIR'         => 'You must supply a valid absolute path',
+		'SFTPBROWSER_ERROR_NOACCESS'      => "Directory doesn't exist or you don't have enough permissions to access it",
+		'SFTP_COULDNT_UPLOAD'             => 'Could not upload %s',
+		'SFTP_CANT_CREATE_DIR'            => 'Could not create directory %s',
+		'UI-ROOT'                         => '&lt;root&gt;',
+		'CONFIG_UI_FTPBROWSER_TITLE'      => 'FTP Directory Browser',
+		'FTP_BROWSE'                      => 'Browse',
+		'BTN_CHECK'                       => 'Check',
+		'BTN_RESET'                       => 'Reset',
+		'BTN_TESTFTPCON'                  => 'Test FTP connection',
+		'BTN_TESTSFTPCON'                 => 'Test SFTP connection',
+		'BTN_GOTOSTART'                   => 'Start over',
+		'FINE_TUNE'                       => 'Fine tune',
+		'BTN_SHOW_FINE_TUNE'              => 'Show advanced options (for experts)',
+		'MIN_EXEC_TIME'                   => 'Minimum execution time:',
+		'MAX_EXEC_TIME'                   => 'Maximum execution time:',
+		'SECONDS_PER_STEP'                => 'seconds per step',
+		'EXTRACT_FILES'                   => 'Extract files',
+		'BTN_START'                       => 'Start',
+		'EXTRACTING'                      => 'Extracting',
+		'DO_NOT_CLOSE_EXTRACT'            => 'Do not close this window while the extraction is in progress',
+		'RESTACLEANUP'                    => 'Restoration and Clean Up',
+		'BTN_RUNINSTALLER'                => 'Run the Installer',
+		'BTN_CLEANUP'                     => 'Clean Up',
+		'BTN_SITEFE'                      => 'Visit your site\'s frontend',
+		'BTN_SITEBE'                      => 'Visit your site\'s backend',
+		'WARNINGS'                        => 'Extraction Warnings',
+		'ERROR_OCCURED'                   => 'An error occurred',
+		'STEALTH_MODE'                    => 'Stealth mode',
+		'STEALTH_URL'                     => 'HTML file to show to web visitors',
+		'ERR_NOT_A_JPS_FILE'              => 'The file is not a JPA archive',
+		'ERR_INVALID_JPS_PASSWORD'        => 'The password you gave is wrong or the archive is corrupt',
+		'JPS_PASSWORD'                    => 'Archive Password (for JPS files)',
+		'INVALID_FILE_HEADER'             => 'Invalid header in archive file, part %s, offset %s',
+		'NEEDSOMEHELPKS'                  => 'Want some help to use this tool? Read this first:',
+		'QUICKSTART'                      => 'Quick Start Guide',
+		'CANTGETITTOWORK'                 => 'Can\'t get it to work? Click me!',
+		'NOARCHIVESCLICKHERE'             => 'No archives detected. Click here for troubleshooting instructions.',
+		'POSTRESTORATIONTROUBLESHOOTING'  => 'Something not working after the restoration? Click here for troubleshooting instructions.',
+		'UPDATE_HEADER'                   => 'An updated version of Akeeba Kickstart (<span id="update-version">unknown</span>) is available!',
+		'UPDATE_NOTICE'                   => 'You are advised to always use the latest version of Akeeba Kickstart available. Older versions may be subject to bugs and will not be supported.',
+		'UPDATE_DLNOW'                    => 'Download now',
+		'UPDATE_MOREINFO'                 => 'More information',
+		'IGNORE_MOST_ERRORS'              => 'Ignore most errors',
+		'WRONG_FTP_PATH2'                 => 'Wrong FTP initial directory - the directory doesn\'t correspond to your site\'s web root',
+		'ARCHIVE_DIRECTORY'               => 'Archive directory:',
+		'RELOAD_ARCHIVES'                 => 'Reload',
+		'CONFIG_UI_SFTPBROWSER_TITLE'     => 'SFTP Directory Browser',
+		'ERR_COULD_NOT_OPEN_ARCHIVE_PART' => 'Could not open archive part file %s for reading. Check that the file exists, is readable by the web server and is not in a directory made out of reach by chroot, open_basedir restrictions or any other restriction put in place by your host.',
+		'RENAME_FILES'                    => 'Rename server configuration files',
+		'RESTORE_PERMISSIONS'             => 'Restore file permissions',
+	);
+
+	/**
+	 * The array holding the translation keys
+	 *
+	 * @var array
+	 */
+	private $strings;
+
+	/**
+	 * The currently detected language (ISO code)
+	 *
+	 * @var string
+	 */
+	private $language;
+
+	/*
+	 * Initializes the translation engine
+	 * @return AKText
+	 */
+	public function __construct()
+	{
+		// Start with the default translation
+		$this->strings = $this->default_translation;
+		// Try loading the translation file in English, if it exists
+		$this->loadTranslation('en-GB');
+		// Try loading the translation file in the browser's preferred language, if it exists
+		$this->getBrowserLanguage();
+		if (!is_null($this->language))
+		{
+			$this->loadTranslation();
+		}
+	}
+
+	private function loadTranslation($lang = null)
+	{
+		if (defined('KSLANGDIR'))
+		{
+			$dirname = KSLANGDIR;
+		}
+		else
+		{
+			$dirname = KSROOTDIR;
+		}
+		$basename = basename(__FILE__, '.php') . '.ini';
+		if (empty($lang))
+		{
+			$lang = $this->language;
+		}
+
+		$translationFilename = $dirname . DIRECTORY_SEPARATOR . $lang . '.' . $basename;
+		if (!@file_exists($translationFilename) && ($basename != 'kickstart.ini'))
+		{
+			$basename            = 'kickstart.ini';
+			$translationFilename = $dirname . DIRECTORY_SEPARATOR . $lang . '.' . $basename;
+		}
+		if (!@file_exists($translationFilename))
+		{
+			return;
+		}
+		$temp = self::parse_ini_file($translationFilename, false);
+
+		if (!is_array($this->strings))
+		{
+			$this->strings = array();
+		}
+		if (empty($temp))
+		{
+			$this->strings = array_merge($this->default_translation, $this->strings);
+		}
+		else
+		{
+			$this->strings = array_merge($this->strings, $temp);
+		}
+	}
+
+	/**
+	 * A PHP based INI file parser.
+	 *
+	 * Thanks to asohn ~at~ aircanopy ~dot~ net for posting this handy function on
+	 * the parse_ini_file page on http://gr.php.net/parse_ini_file
+	 *
+	 * @param string $file             Filename to process
+	 * @param bool   $process_sections True to also process INI sections
+	 *
+	 * @return array An associative array of sections, keys and values
+	 * @access private
+	 */
+	public static function parse_ini_file($file, $process_sections = false, $raw_data = false)
+	{
+		$process_sections = ($process_sections !== true) ? false : true;
+
+		if (!$raw_data)
+		{
+			$ini = @file($file);
+		}
+		else
+		{
+			$ini = $file;
+		}
+		if (count($ini) == 0)
+		{
+			return array();
+		}
+
+		$sections = array();
+		$values   = array();
+		$result   = array();
+		$globals  = array();
+		$i        = 0;
+		if (!empty($ini))
+		{
+			foreach ($ini as $line)
+			{
+				$line = trim($line);
+				$line = str_replace("\t", " ", $line);
+
+				// Comments
+				if (!preg_match('/^[a-zA-Z0-9[]/', $line))
+				{
+					continue;
+				}
+
+				// Sections
+				if ($line{0} == '[')
+				{
+					$tmp        = explode(']', $line);
+					$sections[] = trim(substr($tmp[0], 1));
+					$i++;
+					continue;
+				}
+
+				// Key-value pair
+				list($key, $value) = explode('=', $line, 2);
+				$key   = trim($key);
+				$value = trim($value);
+				if (strstr($value, ";"))
+				{
+					$tmp = explode(';', $value);
+					if (count($tmp) == 2)
+					{
+						if ((($value{0} != '"') && ($value{0} != "'")) ||
+							preg_match('/^".*"\s*;/', $value) || preg_match('/^".*;[^"]*$/', $value) ||
+							preg_match("/^'.*'\s*;/", $value) || preg_match("/^'.*;[^']*$/", $value)
+						)
+						{
+							$value = $tmp[0];
+						}
+					}
+					else
+					{
+						if ($value{0} == '"')
+						{
+							$value = preg_replace('/^"(.*)".*/', '$1', $value);
+						}
+						elseif ($value{0} == "'")
+						{
+							$value = preg_replace("/^'(.*)'.*/", '$1', $value);
+						}
+						else
+						{
+							$value = $tmp[0];
+						}
+					}
+				}
+				$value = trim($value);
+				$value = trim($value, "'\"");
+
+				if ($i == 0)
+				{
+					if (substr($line, -1, 2) == '[]')
+					{
+						$globals[$key][] = $value;
+					}
+					else
+					{
+						$globals[$key] = $value;
+					}
+				}
+				else
+				{
+					if (substr($line, -1, 2) == '[]')
+					{
+						$values[$i - 1][$key][] = $value;
+					}
+					else
+					{
+						$values[$i - 1][$key] = $value;
+					}
+				}
+			}
+		}
+
+		for ($j = 0; $j < $i; $j++)
+		{
+			if ($process_sections === true)
+			{
+				$result[$sections[$j]] = $values[$j];
+			}
+			else
+			{
+				$result[] = $values[$j];
+			}
+		}
+
+		return $result + $globals;
+	}
+
+	public function getBrowserLanguage()
+	{
+		// Detection code from Full Operating system language detection, by Harald Hope
+		// Retrieved from http://techpatterns.com/downloads/php_language_detection.php
+		$user_languages = array();
+		//check to see if language is set
+		if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
+		{
+			$languages = strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+			// $languages = ' fr-ch;q=0.3, da, en-us;q=0.8, en;q=0.5, fr;q=0.3';
+			// need to remove spaces from strings to avoid error
+			$languages = str_replace(' ', '', $languages);
+			$languages = explode(",", $languages);
+
+			foreach ($languages as $language_list)
+			{
+				// pull out the language, place languages into array of full and primary
+				// string structure:
+				$temp_array = array();
+				// slice out the part before ; on first step, the part before - on second, place into array
+				$temp_array[0] = substr($language_list, 0, strcspn($language_list, ';'));//full language
+				$temp_array[1] = substr($language_list, 0, 2);// cut out primary language
+				if ((strlen($temp_array[0]) == 5) && ((substr($temp_array[0], 2, 1) == '-') || (substr($temp_array[0], 2, 1) == '_')))
+				{
+					$langLocation  = strtoupper(substr($temp_array[0], 3, 2));
+					$temp_array[0] = $temp_array[1] . '-' . $langLocation;
+				}
+				//place this array into main $user_languages language array
+				$user_languages[] = $temp_array;
+			}
+		}
+		else// if no languages found
+		{
+			$user_languages[0] = array('', ''); //return blank array.
+		}
+
+		$this->language = null;
+		$basename       = basename(__FILE__, '.php') . '.ini';
+
+		// Try to match main language part of the filename, irrespective of the location, e.g. de_DE will do if de_CH doesn't exist.
+		if (class_exists('AKUtilsLister'))
+		{
+			$fs       = new AKUtilsLister();
+			$iniFiles = $fs->getFiles(KSROOTDIR, '*.' . $basename);
+			if (empty($iniFiles) && ($basename != 'kickstart.ini'))
+			{
+				$basename = 'kickstart.ini';
+				$iniFiles = $fs->getFiles(KSROOTDIR, '*.' . $basename);
+			}
+		}
+		else
+		{
+			$iniFiles = null;
+		}
+
+		if (is_array($iniFiles))
+		{
+			foreach ($user_languages as $languageStruct)
+			{
+				if (is_null($this->language))
+				{
+					// Get files matching the main lang part
+					$iniFiles = $fs->getFiles(KSROOTDIR, $languageStruct[1] . '-??.' . $basename);
+					if (count($iniFiles) > 0)
+					{
+						$filename       = $iniFiles[0];
+						$filename       = substr($filename, strlen(KSROOTDIR) + 1);
+						$this->language = substr($filename, 0, 5);
+					}
+					else
+					{
+						$this->language = null;
+					}
+				}
+			}
+		}
+
+		if (is_null($this->language))
+		{
+			// Try to find a full language match
+			foreach ($user_languages as $languageStruct)
+			{
+				if (@file_exists($languageStruct[0] . '.' . $basename) && is_null($this->language))
+				{
+					$this->language = $languageStruct[0];
+				}
+				else
+				{
+
+				}
+			}
+		}
+		else
+		{
+			// Do we have an exact match?
+			foreach ($user_languages as $languageStruct)
+			{
+				if (substr($this->language, 0, strlen($languageStruct[1])) == $languageStruct[1])
+				{
+					if (file_exists($languageStruct[0] . '.' . $basename))
+					{
+						$this->language = $languageStruct[0];
+					}
+				}
+			}
+		}
+
+		// Now, scan for full language based on the partial match
+
+	}
+
+	public static function sprintf($key)
+	{
+		$text = self::getInstance();
+		$args = func_get_args();
+		if (count($args) > 0)
+		{
+			$args[0] = $text->_($args[0]);
+
+			return @call_user_func_array('sprintf', $args);
+		}
+
+		return '';
+	}
+
+	/**
+	 * Singleton pattern for Language
+	 *
+	 * @return AKText The global AKText instance
+	 */
+	public static function &getInstance()
+	{
+		static $instance;
+
+		if (!is_object($instance))
+		{
+			$instance = new AKText();
+		}
+
+		return $instance;
+	}
+
+	public static function _($string)
+	{
+		$text = self::getInstance();
+
+		$key = strtoupper($string);
+		$key = substr($key, 0, 1) == '_' ? substr($key, 1) : $key;
+
+		if (isset ($text->strings[$key]))
+		{
+			$string = $text->strings[$key];
+		}
+		else
+		{
+			if (defined($string))
+			{
+				$string = constant($string);
+			}
+		}
+
+		return $string;
+	}
+
+	public function dumpLanguage()
+	{
+		$out = '';
+		foreach ($this->strings as $key => $value)
+		{
+			$out .= "$key=$value\n";
+		}
+
+		return $out;
+	}
+
+	public function asJavascript()
+	{
+		$out = '';
+		foreach ($this->strings as $key => $value)
+		{
+			$key   = addcslashes($key, '\\\'"');
+			$value = addcslashes($value, '\\\'"');
+			if (!empty($out))
+			{
+				$out .= ",\n";
+			}
+			$out .= "'$key':\t'$value'";
+		}
+
+		return $out;
+	}
+
+	public function resetTranslation()
+	{
+		$this->strings = $this->default_translation;
+	}
+
+	public function addDefaultLanguageStrings($stringList = array())
+	{
+		if (!is_array($stringList))
+		{
+			return;
+		}
+		if (empty($stringList))
+		{
+			return;
+		}
+
+		$this->strings = array_merge($stringList, $this->strings);
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The Akeeba Kickstart Factory class
+ * This class is reponssible for instanciating all Akeeba Kicsktart classes
+ */
+class AKFactory
+{
+	/** @var   array  A list of instantiated objects */
+	private $objectlist = array();
+
+	/** @var   array  Simple hash data storage */
+	private $varlist = array();
+
+	/** @var   self   Static instance */
+	private static $instance = null;
+
+	/** Private constructor makes sure we can't directly instantiate the class */
+	private function __construct()
+	{
+	}
+
+	/**
+	 * Gets a serialized snapshot of the Factory for safekeeping (hibernate)
+	 *
+	 * @return string The serialized snapshot of the Factory
+	 */
+	public static function serialize()
+	{
+		$engine = self::getUnarchiver();
+		$engine->shutdown();
+		$serialized = serialize(self::getInstance());
+
+		if (function_exists('base64_encode') && function_exists('base64_decode'))
+		{
+			$serialized = base64_encode($serialized);
+		}
+
+		return $serialized;
+	}
+
+	/**
+	 * Gets the unarchiver engine
+	 */
+	public static function &getUnarchiver($configOverride = null)
+	{
+		static $class_name;
+
+		if (!empty($configOverride))
+		{
+			if ($configOverride['reset'])
+			{
+				$class_name = null;
+			}
+		}
+
+		if (empty($class_name))
+		{
+			$filetype = self::get('kickstart.setup.filetype', null);
+
+			if (empty($filetype))
+			{
+				$filename      = self::get('kickstart.setup.sourcefile', null);
+				$basename      = basename($filename);
+				$baseextension = strtoupper(substr($basename, -3));
+				switch ($baseextension)
+				{
+					case 'JPA':
+						$filetype = 'JPA';
+						break;
+
+					case 'JPS':
+						$filetype = 'JPS';
+						break;
+
+					case 'ZIP':
+						$filetype = 'ZIP';
+						break;
+
+					default:
+						die('Invalid archive type or extension in file ' . $filename);
+						break;
+				}
+			}
+
+			$class_name = 'AKUnarchiver' . ucfirst($filetype);
+		}
+
+		$destdir = self::get('kickstart.setup.destdir', null);
+		if (empty($destdir))
+		{
+			$destdir = KSROOTDIR;
+		}
+
+		$object = self::getClassInstance($class_name);
+		if ($object->getState() == 'init')
+		{
+			$sourcePath = self::get('kickstart.setup.sourcepath', '');
+			$sourceFile = self::get('kickstart.setup.sourcefile', '');
+
+			if (!empty($sourcePath))
+			{
+				$sourceFile = rtrim($sourcePath, '/\\') . '/' . $sourceFile;
+			}
+
+			// Initialize the object –– Any change here MUST be reflected to echoHeadJavascript (default values)
+			$config = array(
+				'filename'            => $sourceFile,
+				'restore_permissions' => self::get('kickstart.setup.restoreperms', 0),
+				'post_proc'           => self::get('kickstart.procengine', 'direct'),
+				'add_path'            => self::get('kickstart.setup.targetpath', $destdir),
+				'remove_path'         => self::get('kickstart.setup.removepath', ''),
+				'rename_files'        => self::get('kickstart.setup.renamefiles', array(
+					'.htaccess' => 'htaccess.bak', 'php.ini' => 'php.ini.bak', 'web.config' => 'web.config.bak',
+					'.user.ini' => '.user.ini.bak'
+				)),
+				'skip_files'          => self::get('kickstart.setup.skipfiles', array(
+					basename(__FILE__), 'kickstart.php', 'abiautomation.ini', 'htaccess.bak', 'php.ini.bak',
+					'cacert.pem'
+				)),
+				'ignoredirectories'   => self::get('kickstart.setup.ignoredirectories', array(
+					'tmp', 'log', 'logs'
+				)),
+			);
+
+			if (!defined('KICKSTART'))
+			{
+				// In restore.php mode we have to exclude the restoration.php files
+				$moreSkippedFiles     = array(
+					// Akeeba Backup for Joomla!
+					'administrator/components/com_akeeba/restoration.php',
+					// Joomla! Update
+					'administrator/components/com_joomlaupdate/restoration.php',
+					// Akeeba Backup for WordPress
+					'wp-content/plugins/akeebabackupwp/app/restoration.php',
+					'wp-content/plugins/akeebabackupcorewp/app/restoration.php',
+					'wp-content/plugins/akeebabackup/app/restoration.php',
+					'wp-content/plugins/akeebabackupwpcore/app/restoration.php',
+					// Akeeba Solo
+					'app/restoration.php',
+				);
+				$config['skip_files'] = array_merge($config['skip_files'], $moreSkippedFiles);
+			}
+
+			if (!empty($configOverride))
+			{
+				$config = array_merge($config, $configOverride);
+			}
+
+			$object->setup($config);
+		}
+
+		return $object;
+	}
+
+	// ========================================================================
+	// Public factory interface
+	// ========================================================================
+
+	public static function get($key, $default = null)
+	{
+		$self = self::getInstance();
+
+		if (array_key_exists($key, $self->varlist))
+		{
+			return $self->varlist[$key];
+		}
+		else
+		{
+			return $default;
+		}
+	}
+
+	/**
+	 * Gets a single, internally used instance of the Factory
+	 *
+	 * @param string $serialized_data [optional] Serialized data to spawn the instance from
+	 *
+	 * @return AKFactory A reference to the unique Factory object instance
+	 */
+	protected static function &getInstance($serialized_data = null)
+	{
+		if (!is_object(self::$instance) || !is_null($serialized_data))
+		{
+			if (!is_null($serialized_data))
+			{
+				self::$instance = unserialize($serialized_data);
+			}
+			else
+			{
+				self::$instance = new self();
+			}
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Internal function which instanciates a class named $class_name.
+	 * The autoloader
+	 *
+	 * @param string $class_name
+	 *
+	 * @return object
+	 */
+	protected static function &getClassInstance($class_name)
+	{
+		$self = self::getInstance();
+
+		if (!isset($self->objectlist[$class_name]))
+		{
+			$self->objectlist[$class_name] = new $class_name;
+		}
+
+		return $self->objectlist[$class_name];
+	}
+
+	// ========================================================================
+	// Public hash data storage interface
+	// ========================================================================
+
+	/**
+	 * Regenerates the full Factory state from a serialized snapshot (resume)
+	 *
+	 * @param string $serialized_data The serialized snapshot to resume from
+	 */
+	public static function unserialize($serialized_data)
+	{
+		if (function_exists('base64_encode') && function_exists('base64_decode'))
+		{
+			$serialized_data = base64_decode($serialized_data);
+		}
+		self::getInstance($serialized_data);
+	}
+
+	/**
+	 * Reset the internal factory state, freeing all previously created objects
+	 */
+	public static function nuke()
+	{
+		self::$instance = null;
+	}
+
+	// ========================================================================
+	// Akeeba Kickstart classes
+	// ========================================================================
+
+	public static function set($key, $value)
+	{
+		$self                = self::getInstance();
+		$self->varlist[$key] = $value;
+	}
+
+	/**
+	 * Gets the post processing engine
+	 *
+	 * @param string $proc_engine
+	 */
+	public static function &getPostProc($proc_engine = null)
+	{
+		static $class_name;
+		if (empty($class_name))
+		{
+			if (empty($proc_engine))
+			{
+				$proc_engine = self::get('kickstart.procengine', 'direct');
+			}
+			$class_name = 'AKPostproc' . ucfirst($proc_engine);
+		}
+
+		return self::getClassInstance($class_name);
+	}
+
+	/**
+	 * Get the a reference to the Akeeba Engine's timer
+	 *
+	 * @return AKCoreTimer
+	 */
+	public static function &getTimer()
+	{
+		return self::getClassInstance('AKCoreTimer');
+	}
+
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Interface for AES encryption adapters
+ */
+interface AKEncryptionAESAdapterInterface
+{
+	/**
+	 * Decrypts a string. Returns the raw binary ciphertext, zero-padded.
+	 *
+	 * @param   string       $plainText  The plaintext to encrypt
+	 * @param   string       $key        The raw binary key (will be zero-padded or chopped if its size is different than the block size)
+	 *
+	 * @return  string  The raw encrypted binary string.
+	 */
+	public function decrypt($plainText, $key);
+
+	/**
+	 * Returns the encryption block size in bytes
+	 *
+	 * @return  int
+	 */
+	public function getBlockSize();
+
+	/**
+	 * Is this adapter supported?
+	 *
+	 * @return  bool
+	 */
+	public function isSupported();
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * Abstract AES encryption class
+ */
+abstract class AKEncryptionAESAdapterAbstract
+{
+	/**
+	 * Trims or zero-pads a key / IV
+	 *
+	 * @param   string $key  The key or IV to treat
+	 * @param   int    $size The block size of the currently used algorithm
+	 *
+	 * @return  null|string  Null if $key is null, treated string of $size byte length otherwise
+	 */
+	public function resizeKey($key, $size)
+	{
+		if (empty($key))
+		{
+			return null;
+		}
+
+		$keyLength = strlen($key);
+
+		if (function_exists('mb_strlen'))
+		{
+			$keyLength = mb_strlen($key, 'ASCII');
+		}
+
+		if ($keyLength == $size)
+		{
+			return $key;
+		}
+
+		if ($keyLength > $size)
+		{
+			if (function_exists('mb_substr'))
+			{
+				return mb_substr($key, 0, $size, 'ASCII');
+			}
+
+			return substr($key, 0, $size);
+		}
+
+		return $key . str_repeat("\0", ($size - $keyLength));
+	}
+
+	/**
+	 * Returns null bytes to append to the string so that it's zero padded to the specified block size
+	 *
+	 * @param   string $string    The binary string which will be zero padded
+	 * @param   int    $blockSize The block size
+	 *
+	 * @return  string  The zero bytes to append to the string to zero pad it to $blockSize
+	 */
+	protected function getZeroPadding($string, $blockSize)
+	{
+		$stringSize = strlen($string);
+
+		if (function_exists('mb_strlen'))
+		{
+			$stringSize = mb_strlen($string, 'ASCII');
+		}
+
+		if ($stringSize == $blockSize)
+		{
+			return '';
+		}
+
+		if ($stringSize < $blockSize)
+		{
+			return str_repeat("\0", $blockSize - $stringSize);
+		}
+
+		$paddingBytes = $stringSize % $blockSize;
+
+		return str_repeat("\0", $blockSize - $paddingBytes);
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+class Mcrypt extends AKEncryptionAESAdapterAbstract implements AKEncryptionAESAdapterInterface
+{
+	protected $cipherType = MCRYPT_RIJNDAEL_128;
+
+	protected $cipherMode = MCRYPT_MODE_CBC;
+
+	public function decrypt($cipherText, $key)
+	{
+		$iv_size    = $this->getBlockSize();
+		$key        = $this->resizeKey($key, $iv_size);
+		$iv         = substr($cipherText, 0, $iv_size);
+		$cipherText = substr($cipherText, $iv_size);
+		$plainText  = mcrypt_decrypt($this->cipherType, $key, $cipherText, $this->cipherMode, $iv);
+
+		return $plainText;
+	}
+
+	public function isSupported()
+	{
+		if (!function_exists('mcrypt_get_key_size'))
+		{
+			return false;
+		}
+
+		if (!function_exists('mcrypt_get_iv_size'))
+		{
+			return false;
+		}
+
+		if (!function_exists('mcrypt_create_iv'))
+		{
+			return false;
+		}
+
+		if (!function_exists('mcrypt_encrypt'))
+		{
+			return false;
+		}
+
+		if (!function_exists('mcrypt_decrypt'))
+		{
+			return false;
+		}
+
+		if (!function_exists('mcrypt_list_algorithms'))
+		{
+			return false;
+		}
+
+		if (!function_exists('hash'))
+		{
+			return false;
+		}
+
+		if (!function_exists('hash_algos'))
+		{
+			return false;
+		}
+
+		$algorightms = mcrypt_list_algorithms();
+
+		if (!in_array('rijndael-128', $algorightms))
+		{
+			return false;
+		}
+
+		if (!in_array('rijndael-192', $algorightms))
+		{
+			return false;
+		}
+
+		if (!in_array('rijndael-256', $algorightms))
+		{
+			return false;
+		}
+
+		$algorightms = hash_algos();
+
+		if (!in_array('sha256', $algorightms))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	public function getBlockSize()
+	{
+		return mcrypt_get_iv_size($this->cipherType, $this->cipherMode);
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+class OpenSSL extends AKEncryptionAESAdapterAbstract implements AKEncryptionAESAdapterInterface
+{
+	/**
+	 * The OpenSSL options for encryption / decryption
+	 *
+	 * @var  int
+	 */
+	protected $openSSLOptions = 0;
+
+	/**
+	 * The encryption method to use
+	 *
+	 * @var  string
+	 */
+	protected $method = 'aes-128-cbc';
+
+	public function __construct()
+	{
+		$this->openSSLOptions = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
+	}
+
+	public function decrypt($cipherText, $key)
+	{
+		$iv_size    = $this->getBlockSize();
+		$key        = $this->resizeKey($key, $iv_size);
+		$iv         = substr($cipherText, 0, $iv_size);
+		$cipherText = substr($cipherText, $iv_size);
+		$plainText  = openssl_decrypt($cipherText, $this->method, $key, $this->openSSLOptions, $iv);
+
+		return $plainText;
+	}
+
+	public function isSupported()
+	{
+		if (!function_exists('openssl_get_cipher_methods'))
+		{
+			return false;
+		}
+
+		if (!function_exists('openssl_random_pseudo_bytes'))
+		{
+			return false;
+		}
+
+		if (!function_exists('openssl_cipher_iv_length'))
+		{
+			return false;
+		}
+
+		if (!function_exists('openssl_encrypt'))
+		{
+			return false;
+		}
+
+		if (!function_exists('openssl_decrypt'))
+		{
+			return false;
+		}
+
+		if (!function_exists('hash'))
+		{
+			return false;
+		}
+
+		if (!function_exists('hash_algos'))
+		{
+			return false;
+		}
+
+		$algorightms = openssl_get_cipher_methods();
+
+		if (!in_array('aes-128-cbc', $algorightms))
+		{
+			return false;
+		}
+
+		$algorightms = hash_algos();
+
+		if (!in_array('sha256', $algorightms))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getBlockSize()
+	{
+		return openssl_cipher_iv_length($this->method);
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * AES implementation in PHP (c) Chris Veness 2005-2016.
+ * Right to use and adapt is granted for under a simple creative commons attribution
+ * licence. No warranty of any form is offered.
+ *
+ * Heavily modified for Akeeba Backup by Nicholas K. Dionysopoulos
+ * Also added AES-128 CBC mode (with mcrypt and OpenSSL) on top of AES CTR
+ */
+class AKEncryptionAES
+{
+	// Sbox is pre-computed multiplicative inverse in GF(2^8) used in SubBytes and KeyExpansion [�5.1.1]
+	protected static $Sbox =
+		array(0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+			0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+			0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+			0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+			0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+			0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+			0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+			0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+			0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+			0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+			0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+			0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+			0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+			0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+			0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+			0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16);
+
+	// Rcon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [�5.2]
+	protected static $Rcon = array(
+		array(0x00, 0x00, 0x00, 0x00),
+		array(0x01, 0x00, 0x00, 0x00),
+		array(0x02, 0x00, 0x00, 0x00),
+		array(0x04, 0x00, 0x00, 0x00),
+		array(0x08, 0x00, 0x00, 0x00),
+		array(0x10, 0x00, 0x00, 0x00),
+		array(0x20, 0x00, 0x00, 0x00),
+		array(0x40, 0x00, 0x00, 0x00),
+		array(0x80, 0x00, 0x00, 0x00),
+		array(0x1b, 0x00, 0x00, 0x00),
+		array(0x36, 0x00, 0x00, 0x00));
+
+	protected static $passwords = array();
+
+	/**
+	 * The algorithm to use for PBKDF2. Must be a supported hash_hmac algorithm. Default: sha1
+	 *
+	 * @var  string
+	 */
+	private static $pbkdf2Algorithm = 'sha1';
+
+	/**
+	 * Number of iterations to use for PBKDF2
+	 *
+	 * @var  int
+	 */
+	private static $pbkdf2Iterations = 1000;
+
+	/**
+	 * Should we use a static salt for PBKDF2?
+	 *
+	 * @var  int
+	 */
+	private static $pbkdf2UseStaticSalt = 0;
+
+	/**
+	 * The static salt to use for PBKDF2
+	 *
+	 * @var  string
+	 */
+	private static $pbkdf2StaticSalt = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+	/**
+	 * Encrypt a text using AES encryption in Counter mode of operation
+	 *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+	 *
+	 * Unicode multi-byte character safe
+	 *
+	 * @param   string $plaintext Source text to be encrypted
+	 * @param   string $password  The password to use to generate a key
+	 * @param   int    $nBits     Number of bits to be used in the key (128, 192, or 256)
+	 *
+	 * @return  string  Encrypted text
+	 */
+	public static function AESEncryptCtr($plaintext, $password, $nBits)
+	{
+		$blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+		if (!($nBits == 128 || $nBits == 192 || $nBits == 256))
+		{
+			return '';
+		}  // standard allows 128/192/256 bit keys
+		// note PHP (5) gives us plaintext and password in UTF8 encoding!
+
+		// use AES itself to encrypt password to get cipher key (using plain password as source for
+		// key expansion) - gives us well encrypted key
+		$nBytes  = $nBits / 8;  // no bytes in key
+		$pwBytes = array();
+		for ($i = 0; $i < $nBytes; $i++)
+		{
+			$pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
+		}
+		$key = self::Cipher($pwBytes, self::KeyExpansion($pwBytes));
+		$key = array_merge($key, array_slice($key, 0, $nBytes - 16));  // expand key to 16/24/32 bytes long
+
+		// initialise counter block (NIST SP800-38A �B.2): millisecond time-stamp for nonce in
+		// 1st 8 bytes, block counter in 2nd 8 bytes
+		$counterBlock = array();
+		$nonce        = floor(microtime(true) * 1000);   // timestamp: milliseconds since 1-Jan-1970
+		$nonceSec     = floor($nonce / 1000);
+		$nonceMs      = $nonce % 1000;
+		// encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
+		for ($i = 0; $i < 4; $i++)
+		{
+			$counterBlock[$i] = self::urs($nonceSec, $i * 8) & 0xff;
+		}
+		for ($i = 0; $i < 4; $i++)
+		{
+			$counterBlock[$i + 4] = $nonceMs & 0xff;
+		}
+		// and convert it to a string to go on the front of the ciphertext
+		$ctrTxt = '';
+		for ($i = 0; $i < 8; $i++)
+		{
+			$ctrTxt .= chr($counterBlock[$i]);
+		}
+
+		// generate key schedule - an expansion of the key into distinct Key Rounds for each round
+		$keySchedule = self::KeyExpansion($key);
+
+		$blockCount = ceil(strlen($plaintext) / $blockSize);
+		$ciphertxt  = array();  // ciphertext as array of strings
+
+		for ($b = 0; $b < $blockCount; $b++)
+		{
+			// set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+			// done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
+			for ($c = 0; $c < 4; $c++)
+			{
+				$counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
+			}
+			for ($c = 0; $c < 4; $c++)
+			{
+				$counterBlock[15 - $c - 4] = self::urs($b / 0x100000000, $c * 8);
+			}
+
+			$cipherCntr = self::Cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+
+			// block size is reduced on final block
+			$blockLength = $b < $blockCount - 1 ? $blockSize : (strlen($plaintext) - 1) % $blockSize + 1;
+			$cipherByte  = array();
+
+			for ($i = 0; $i < $blockLength; $i++)
+			{  // -- xor plaintext with ciphered counter byte-by-byte --
+				$cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b * $blockSize + $i, 1));
+				$cipherByte[$i] = chr($cipherByte[$i]);
+			}
+			$ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+		}
+
+		// implode is more efficient than repeated string concatenation
+		$ciphertext = $ctrTxt . implode('', $ciphertxt);
+		$ciphertext = base64_encode($ciphertext);
+
+		return $ciphertext;
+	}
+
+	/**
+	 * AES Cipher function: encrypt 'input' with Rijndael algorithm
+	 *
+	 * @param   array $input    Message as byte-array (16 bytes)
+	 * @param   array $w        key schedule as 2D byte-array (Nr+1 x Nb bytes) -
+	 *                          generated from the cipher key by KeyExpansion()
+	 *
+	 * @return  string  Ciphertext as byte-array (16 bytes)
+	 */
+	protected static function Cipher($input, $w)
+	{    // main Cipher function [�5.1]
+		$Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
+		$Nr = count($w) / $Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+
+		$state = array();  // initialise 4xNb byte-array 'state' with input [�3.4]
+		for ($i = 0; $i < 4 * $Nb; $i++)
+		{
+			$state[$i % 4][floor($i / 4)] = $input[$i];
+		}
+
+		$state = self::AddRoundKey($state, $w, 0, $Nb);
+
+		for ($round = 1; $round < $Nr; $round++)
+		{  // apply Nr rounds
+			$state = self::SubBytes($state, $Nb);
+			$state = self::ShiftRows($state, $Nb);
+			$state = self::MixColumns($state);
+			$state = self::AddRoundKey($state, $w, $round, $Nb);
+		}
+
+		$state = self::SubBytes($state, $Nb);
+		$state = self::ShiftRows($state, $Nb);
+		$state = self::AddRoundKey($state, $w, $Nr, $Nb);
+
+		$output = array(4 * $Nb);  // convert state to 1-d array before returning [�3.4]
+		for ($i = 0; $i < 4 * $Nb; $i++)
+		{
+			$output[$i] = $state[$i % 4][floor($i / 4)];
+		}
+
+		return $output;
+	}
+
+	protected static function AddRoundKey($state, $w, $rnd, $Nb)
+	{  // xor Round Key into state S [�5.1.4]
+		for ($r = 0; $r < 4; $r++)
+		{
+			for ($c = 0; $c < $Nb; $c++)
+			{
+				$state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
+			}
+		}
+
+		return $state;
+	}
+
+	protected static function SubBytes($s, $Nb)
+	{    // apply SBox to state S [�5.1.1]
+		for ($r = 0; $r < 4; $r++)
+		{
+			for ($c = 0; $c < $Nb; $c++)
+			{
+				$s[$r][$c] = self::$Sbox[$s[$r][$c]];
+			}
+		}
+
+		return $s;
+	}
+
+	protected static function ShiftRows($s, $Nb)
+	{    // shift row r of state S left by r bytes [�5.1.2]
+		$t = array(4);
+		for ($r = 1; $r < 4; $r++)
+		{
+			for ($c = 0; $c < 4; $c++)
+			{
+				$t[$c] = $s[$r][($c + $r) % $Nb];
+			}  // shift into temp copy
+			for ($c = 0; $c < 4; $c++)
+			{
+				$s[$r][$c] = $t[$c];
+			}         // and copy back
+		}          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
+		return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
+	}
+
+	protected static function MixColumns($s)
+	{
+		// combine bytes of each col of state S [�5.1.3]
+		for ($c = 0; $c < 4; $c++)
+		{
+			$a = array(4);  // 'a' is a copy of the current column from 's'
+			$b = array(4);  // 'b' is a�{02} in GF(2^8)
+
+			for ($i = 0; $i < 4; $i++)
+			{
+				$a[$i] = $s[$i][$c];
+				$b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
+			}
+
+			// a[n] ^ b[n] is a�{03} in GF(2^8)
+			$s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
+			$s[1][$c] = $a[0] ^ $b[1] ^ $a[2] ^ $b[2] ^ $a[3]; // a0 * 2*a1 + 3*a2 + a3
+			$s[2][$c] = $a[0] ^ $a[1] ^ $b[2] ^ $a[3] ^ $b[3]; // a0 + a1 + 2*a2 + 3*a3
+			$s[3][$c] = $a[0] ^ $b[0] ^ $a[1] ^ $a[2] ^ $b[3]; // 3*a0 + a1 + a2 + 2*a3
+		}
+
+		return $s;
+	}
+
+	/**
+	 * Key expansion for Rijndael Cipher(): performs key expansion on cipher key
+	 * to generate a key schedule
+	 *
+	 * @param   array $key Cipher key byte-array (16 bytes)
+	 *
+	 * @return  array  Key schedule as 2D byte-array (Nr+1 x Nb bytes)
+	 */
+	protected static function KeyExpansion($key)
+	{
+		// generate Key Schedule from Cipher Key [�5.2]
+
+		// block size (in words): no of columns in state (fixed at 4 for AES)
+		$Nb = 4;
+		// key length (in words): 4/6/8 for 128/192/256-bit keys
+		$Nk = (int) (count($key) / 4);
+		// no of rounds: 10/12/14 for 128/192/256-bit keys
+		$Nr = $Nk + 6;
+
+		$w    = array();
+		$temp = array();
+
+		for ($i = 0; $i < $Nk; $i++)
+		{
+			$r     = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
+			$w[$i] = $r;
+		}
+
+		for ($i = $Nk; $i < ($Nb * ($Nr + 1)); $i++)
+		{
+			$w[$i] = array();
+			for ($t = 0; $t < 4; $t++)
+			{
+				$temp[$t] = $w[$i - 1][$t];
+			}
+			if ($i % $Nk == 0)
+			{
+				$temp = self::SubWord(self::RotWord($temp));
+				for ($t = 0; $t < 4; $t++)
+				{
+					$rConIndex = (int) ($i / $Nk);
+					$temp[$t] ^= self::$Rcon[$rConIndex][$t];
+				}
+			}
+			else if ($Nk > 6 && $i % $Nk == 4)
+			{
+				$temp = self::SubWord($temp);
+			}
+			for ($t = 0; $t < 4; $t++)
+			{
+				$w[$i][$t] = $w[$i - $Nk][$t] ^ $temp[$t];
+			}
+		}
+
+		return $w;
+	}
+
+	protected static function SubWord($w)
+	{    // apply SBox to 4-byte word w
+		for ($i = 0; $i < 4; $i++)
+		{
+			$w[$i] = self::$Sbox[$w[$i]];
+		}
+
+		return $w;
+	}
+
+	/*
+	 * Unsigned right shift function, since PHP has neither >>> operator nor unsigned ints
+	 *
+	 * @param a  number to be shifted (32-bit integer)
+	 * @param b  number of bits to shift a to the right (0..31)
+	 * @return   a right-shifted and zero-filled by b bits
+	 */
+
+	protected static function RotWord($w)
+	{    // rotate 4-byte word w left by one byte
+		$tmp = $w[0];
+		for ($i = 0; $i < 3; $i++)
+		{
+			$w[$i] = $w[$i + 1];
+		}
+		$w[3] = $tmp;
+
+		return $w;
+	}
+
+	protected static function urs($a, $b)
+	{
+		$a &= 0xffffffff;
+		$b &= 0x1f;  // (bounds check)
+		if ($a & 0x80000000 && $b > 0)
+		{   // if left-most bit set
+			$a = ($a >> 1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
+			$a = $a >> ($b - 1);           //   remaining right-shifts
+		}
+		else
+		{                       // otherwise
+			$a = ($a >> $b);               //   use normal right-shift
+		}
+
+		return $a;
+	}
+
+	/**
+	 * Decrypt a text encrypted by AES in counter mode of operation
+	 *
+	 * @param   string  $ciphertext  Source text to be decrypted
+	 * @param   string  $password    The password to use to generate a key
+	 * @param   int     $nBits       Number of bits to be used in the key (128, 192, or 256)
+	 *
+	 * @return  string  Decrypted text
+	 */
+	public static function AESDecryptCtr($ciphertext, $password, $nBits)
+	{
+		$blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+
+		if (!($nBits == 128 || $nBits == 192 || $nBits == 256))
+		{
+			return '';
+		}
+
+		// standard allows 128/192/256 bit keys
+		$ciphertext = base64_decode($ciphertext);
+
+		// use AES to encrypt password (mirroring encrypt routine)
+		$nBytes  = $nBits / 8;  // no bytes in key
+		$pwBytes = array();
+
+		for ($i = 0; $i < $nBytes; $i++)
+		{
+			$pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
+		}
+
+		$key = self::Cipher($pwBytes, self::KeyExpansion($pwBytes));
+		$key = array_merge($key, array_slice($key, 0, $nBytes - 16));  // expand key to 16/24/32 bytes long
+
+		// recover nonce from 1st element of ciphertext
+		$counterBlock = array();
+		$ctrTxt       = substr($ciphertext, 0, 8);
+
+		for ($i = 0; $i < 8; $i++)
+		{
+			$counterBlock[$i] = ord(substr($ctrTxt, $i, 1));
+		}
+
+		// generate key schedule
+		$keySchedule = self::KeyExpansion($key);
+
+		// separate ciphertext into blocks (skipping past initial 8 bytes)
+		$nBlocks = ceil((strlen($ciphertext) - 8) / $blockSize);
+		$ct      = array();
+
+		for ($b = 0; $b < $nBlocks; $b++)
+		{
+			$ct[$b] = substr($ciphertext, 8 + $b * $blockSize, 16);
+		}
+
+		$ciphertext = $ct;  // ciphertext is now array of block-length strings
+
+		// plaintext will get generated block-by-block into array of block-length strings
+		$plaintxt = array();
+
+		for ($b = 0; $b < $nBlocks; $b++)
+		{
+			// set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+			for ($c = 0; $c < 4; $c++)
+			{
+				$counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
+			}
+
+			for ($c = 0; $c < 4; $c++)
+			{
+				$counterBlock[15 - $c - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
+			}
+
+			$cipherCntr = self::Cipher($counterBlock, $keySchedule);  // encrypt counter block
+
+			$plaintxtByte = array();
+
+			for ($i = 0; $i < strlen($ciphertext[$b]); $i++)
+			{
+				// -- xor plaintext with ciphered counter byte-by-byte --
+				$plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
+				$plaintxtByte[$i] = chr($plaintxtByte[$i]);
+
+			}
+
+			$plaintxt[$b] = implode('', $plaintxtByte);
+		}
+
+		// join array of blocks into single plaintext string
+		$plaintext = implode('', $plaintxt);
+
+		return $plaintext;
+	}
+
+	/**
+	 * AES decryption in CBC mode. This is the standard mode (the CTR methods
+	 * actually use Rijndael-128 in CTR mode, which - technically - isn't AES).
+	 *
+	 * It supports AES-128 only. It assumes that the last 4 bytes
+	 * contain a little-endian unsigned long integer representing the unpadded
+	 * data length.
+	 *
+	 * @since  3.0.1
+	 * @author Nicholas K. Dionysopoulos
+	 *
+	 * @param   string $ciphertext The data to encrypt
+	 * @param   string $password   Encryption password
+	 *
+	 * @return  string  The plaintext
+	 */
+	public static function AESDecryptCBC($ciphertext, $password)
+	{
+		$adapter = self::getAdapter();
+
+		if (!$adapter->isSupported())
+		{
+			return false;
+		}
+
+		// Read the data size
+		$data_size = unpack('V', substr($ciphertext, -4));
+
+		// Do I have a PBKDF2 salt?
+		$salt             = substr($ciphertext, -92, 68);
+		$rightStringLimit = -4;
+
+		$params        = self::getKeyDerivationParameters();
+		$keySizeBytes  = $params['keySize'];
+		$algorithm     = $params['algorithm'];
+		$iterations    = $params['iterations'];
+		$useStaticSalt = $params['useStaticSalt'];
+
+		if (substr($salt, 0, 4) == 'JPST')
+		{
+			// We have a stored salt. Retrieve it and tell decrypt to process the string minus the last 44 bytes
+			// (4 bytes for JPST, 16 bytes for the salt, 4 bytes for JPIV, 16 bytes for the IV, 4 bytes for the
+			// uncompressed string length - note that using PBKDF2 means we're also using a randomized IV per the
+			// format specification).
+			$salt             = substr($salt, 4);
+			$rightStringLimit -= 68;
+
+			$key          = self::pbkdf2($password, $salt, $algorithm, $iterations, $keySizeBytes);
+		}
+		elseif ($useStaticSalt)
+		{
+			// We have a static salt. Use it for PBKDF2.
+			$key = self::getStaticSaltExpandedKey($password);
+		}
+		else
+		{
+			// Get the expanded key from the password. THIS USES THE OLD, INSECURE METHOD.
+			$key = self::expandKey($password);
+		}
+
+		// Try to get the IV from the data
+		$iv               = substr($ciphertext, -24, 20);
+
+		if (substr($iv, 0, 4) == 'JPIV')
+		{
+			// We have a stored IV. Retrieve it and tell mdecrypt to process the string minus the last 24 bytes
+			// (4 bytes for JPIV, 16 bytes for the IV, 4 bytes for the uncompressed string length)
+			$iv               = substr($iv, 4);
+			$rightStringLimit -= 20;
+		}
+		else
+		{
+			// No stored IV. Do it the dumb way.
+			$iv = self::createTheWrongIV($password);
+		}
+
+		// Decrypt
+		$plaintext = $adapter->decrypt($iv . substr($ciphertext, 0, $rightStringLimit), $key);
+
+		// Trim padding, if necessary
+		if (strlen($plaintext) > $data_size)
+		{
+			$plaintext = substr($plaintext, 0, $data_size);
+		}
+
+		return $plaintext;
+	}
+
+	/**
+	 * That's the old way of creating an IV that's definitely not cryptographically sound.
+	 *
+	 * DO NOT USE, EVER, UNLESS YOU WANT TO DECRYPT LEGACY DATA
+	 *
+	 * @param   string $password The raw password from which we create an IV in a super bozo way
+	 *
+	 * @return  string  A 16-byte IV string
+	 */
+	public static function createTheWrongIV($password)
+	{
+		static $ivs = array();
+
+		$key = md5($password);
+
+		if (!isset($ivs[$key]))
+		{
+			$nBytes  = 16;  // AES uses a 128 -bit (16 byte) block size, hence the IV size is always 16 bytes
+			$pwBytes = array();
+			for ($i = 0; $i < $nBytes; $i++)
+			{
+				$pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
+			}
+			$iv    = self::Cipher($pwBytes, self::KeyExpansion($pwBytes));
+			$newIV = '';
+			foreach ($iv as $int)
+			{
+				$newIV .= chr($int);
+			}
+
+			$ivs[$key] = $newIV;
+		}
+
+		return $ivs[$key];
+	}
+
+	/**
+	 * Expand the password to an appropriate 128-bit encryption key
+	 *
+	 * @param   string $password
+	 *
+	 * @return  string
+	 *
+	 * @since   5.2.0
+	 * @author  Nicholas K. Dionysopoulos
+	 */
+	public static function expandKey($password)
+	{
+		// Try to fetch cached key or create it if it doesn't exist
+		$nBits     = 128;
+		$lookupKey = md5($password . '-' . $nBits);
+
+		if (array_key_exists($lookupKey, self::$passwords))
+		{
+			$key = self::$passwords[$lookupKey];
+
+			return $key;
+		}
+
+		// use AES itself to encrypt password to get cipher key (using plain password as source for
+		// key expansion) - gives us well encrypted key.
+		$nBytes  = $nBits / 8; // Number of bytes in key
+		$pwBytes = array();
+
+		for ($i = 0; $i < $nBytes; $i++)
+		{
+			$pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
+		}
+
+		$key    = self::Cipher($pwBytes, self::KeyExpansion($pwBytes));
+		$key    = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
+		$newKey = '';
+
+		foreach ($key as $int)
+		{
+			$newKey .= chr($int);
+		}
+
+		$key = $newKey;
+
+		self::$passwords[$lookupKey] = $key;
+
+		return $key;
+	}
+
+	/**
+	 * Returns the correct AES-128 CBC encryption adapter
+	 *
+	 * @return  AKEncryptionAESAdapterInterface
+	 *
+	 * @since   5.2.0
+	 * @author  Nicholas K. Dionysopoulos
+	 */
+	public static function getAdapter()
+	{
+		static $adapter = null;
+
+		if (is_object($adapter) && ($adapter instanceof AKEncryptionAESAdapterInterface))
+		{
+			return $adapter;
+		}
+
+		$adapter = new OpenSSL();
+
+		if (!$adapter->isSupported())
+		{
+			$adapter = new Mcrypt();
+		}
+
+		return $adapter;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getPbkdf2Algorithm()
+	{
+		return self::$pbkdf2Algorithm;
+	}
+
+	/**
+	 * @param string $pbkdf2Algorithm
+	 * @return void
+	 */
+	public static function setPbkdf2Algorithm($pbkdf2Algorithm)
+	{
+		self::$pbkdf2Algorithm = $pbkdf2Algorithm;
+	}
+
+	/**
+	 * @return int
+	 */
+	public static function getPbkdf2Iterations()
+	{
+		return self::$pbkdf2Iterations;
+	}
+
+	/**
+	 * @param int $pbkdf2Iterations
+	 * @return void
+	 */
+	public static function setPbkdf2Iterations($pbkdf2Iterations)
+	{
+		self::$pbkdf2Iterations = $pbkdf2Iterations;
+	}
+
+	/**
+	 * @return int
+	 */
+	public static function getPbkdf2UseStaticSalt()
+	{
+		return self::$pbkdf2UseStaticSalt;
+	}
+
+	/**
+	 * @param int $pbkdf2UseStaticSalt
+	 * @return void
+	 */
+	public static function setPbkdf2UseStaticSalt($pbkdf2UseStaticSalt)
+	{
+		self::$pbkdf2UseStaticSalt = $pbkdf2UseStaticSalt;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getPbkdf2StaticSalt()
+	{
+		return self::$pbkdf2StaticSalt;
+	}
+
+	/**
+	 * @param string $pbkdf2StaticSalt
+	 * @return void
+	 */
+	public static function setPbkdf2StaticSalt($pbkdf2StaticSalt)
+	{
+		self::$pbkdf2StaticSalt = $pbkdf2StaticSalt;
+	}
+
+	/**
+	 * Get the parameters fed into PBKDF2 to expand the user password into an encryption key. These are the static
+	 * parameters (key size, hashing algorithm and number of iterations). A new salt is used for each encryption block
+	 * to minimize the risk of attacks against the password.
+	 *
+	 * @return  array
+	 */
+	public static function getKeyDerivationParameters()
+	{
+		return array(
+			'keySize'       => 16,
+			'algorithm'     => self::$pbkdf2Algorithm,
+			'iterations'    => self::$pbkdf2Iterations,
+			'useStaticSalt' => self::$pbkdf2UseStaticSalt,
+			'staticSalt'    => self::$pbkdf2StaticSalt,
+		);
+	}
+
+	/**
+	 * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
+	 *
+	 * Test vectors can be found here: https://www.ietf.org/rfc/rfc6070.txt
+	 *
+	 * This implementation of PBKDF2 was originally created by https://defuse.ca
+	 * With improvements by http://www.variations-of-shadow.com
+	 * Modified for Akeeba Engine by Akeeba Ltd (removed unnecessary checks to make it faster)
+	 *
+	 * @param   string  $password    The password.
+	 * @param   string  $salt        A salt that is unique to the password.
+	 * @param   string  $algorithm   The hash algorithm to use. Default is sha1.
+	 * @param   int     $count       Iteration count. Higher is better, but slower. Default: 1000.
+	 * @param   int     $key_length  The length of the derived key in bytes.
+	 *
+	 * @return  string  A string of $key_length bytes
+	 */
+	public static function pbkdf2($password, $salt, $algorithm = 'sha1', $count = 1000, $key_length = 16)
+	{
+		if (function_exists("hash_pbkdf2"))
+		{
+			return hash_pbkdf2($algorithm, $password, $salt, $count, $key_length, true);
+		}
+
+		$hash_length = akstringlen(hash($algorithm, "", true));
+		$block_count = ceil($key_length / $hash_length);
+
+		$output = "";
+
+		for ($i = 1; $i <= $block_count; $i++)
+		{
+			// $i encoded as 4 bytes, big endian.
+			$last = $salt . pack("N", $i);
+
+			// First iteration
+			$xorResult = hash_hmac($algorithm, $last, $password, true);
+			$last      = $xorResult;
+
+			// Perform the other $count - 1 iterations
+			for ($j = 1; $j < $count; $j++)
+			{
+				$last = hash_hmac($algorithm, $last, $password, true);
+				$xorResult ^= $last;
+			}
+
+			$output .= $xorResult;
+		}
+
+		return aksubstr($output, 0, $key_length);
+	}
+
+	/**
+	 * Get the expanded key from the user supplied password using a static salt. The results are cached for performance
+	 * reasons.
+	 *
+	 * @param   string  $password  The user-supplied password, UTF-8 encoded.
+	 *
+	 * @return  string  The expanded key
+	 */
+	private static function getStaticSaltExpandedKey($password)
+	{
+		$params        = self::getKeyDerivationParameters();
+		$keySizeBytes  = $params['keySize'];
+		$algorithm     = $params['algorithm'];
+		$iterations    = $params['iterations'];
+		$staticSalt    = $params['staticSalt'];
+
+		$lookupKey = "PBKDF2-$algorithm-$iterations-" . md5($password . $staticSalt);
+
+		if (!array_key_exists($lookupKey, self::$passwords))
+		{
+			self::$passwords[$lookupKey] = self::pbkdf2($password, $staticSalt, $algorithm, $iterations, $keySizeBytes);
+		}
+
+		return self::$passwords[$lookupKey];
+	}
+
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+/**
+ * The Master Setup will read the configuration parameters from restoration.php or
+ * the JSON-encoded "configuration" input variable and return the status.
+ *
+ * @return bool True if the master configuration was applied to the Factory object
+ */
+function masterSetup()
+{
+	// ------------------------------------------------------------
+	// 1. Import basic setup parameters
+	// ------------------------------------------------------------
+
+	$ini_data = null;
+
+	// In restore.php mode, require restoration.php or fail
+	if (!defined('KICKSTART'))
+	{
+		// This is the standalone mode, used by Akeeba Backup Professional. It looks for a restoration.php
+		// file to perform its magic. If the file is not there, we will abort.
+		$setupFile = 'restoration.php';
+
+		if (!file_exists($setupFile))
+		{
+			AKFactory::set('kickstart.enabled', false);
+
+			return false;
+		}
+
+		// Load restoration.php. It creates a global variable named $restoration_setup
+		require_once $setupFile;
+
+		$ini_data = $restoration_setup;
+
+		if (empty($ini_data))
+		{
+			// No parameters fetched. Darn, how am I supposed to work like that?!
+			AKFactory::set('kickstart.enabled', false);
+
+			return false;
+		}
+
+		AKFactory::set('kickstart.enabled', true);
+	}
+	else
+	{
+		// Maybe we have $restoration_setup defined in the head of kickstart.php
+		global $restoration_setup;
+
+		if (!empty($restoration_setup) && !is_array($restoration_setup))
+		{
+			$ini_data = AKText::parse_ini_file($restoration_setup, false, true);
+		}
+		elseif (is_array($restoration_setup))
+		{
+			$ini_data = $restoration_setup;
+		}
+	}
+
+	// Import any data from $restoration_setup
+	if (!empty($ini_data))
+	{
+		foreach ($ini_data as $key => $value)
+		{
+			AKFactory::set($key, $value);
+		}
+		AKFactory::set('kickstart.enabled', true);
+	}
+
+	// Reinitialize $ini_data
+	$ini_data = null;
+
+	// ------------------------------------------------------------
+	// 2. Explode JSON parameters into $_REQUEST scope
+	// ------------------------------------------------------------
+
+	// Detect a JSON string in the request variable and store it.
+	$json = getQueryParam('json', null);
+
+	// Remove everything from the request, post and get arrays
+	if (!empty($_REQUEST))
+	{
+		foreach ($_REQUEST as $key => $value)
+		{
+			unset($_REQUEST[$key]);
+		}
+	}
+
+	if (!empty($_POST))
+	{
+		foreach ($_POST as $key => $value)
+		{
+			unset($_POST[$key]);
+		}
+	}
+
+	if (!empty($_GET))
+	{
+		foreach ($_GET as $key => $value)
+		{
+			unset($_GET[$key]);
+		}
+	}
+
+	// Decrypt a possibly encrypted JSON string
+	$password = AKFactory::get('kickstart.security.password', null);
+
+	if (!empty($json))
+	{
+		if (!empty($password))
+		{
+			$json = AKEncryptionAES::AESDecryptCtr($json, $password, 128);
+
+			if (empty($json))
+			{
+				die('###{"status":false,"message":"Invalid login"}###');
+			}
+		}
+
+		// Get the raw data
+		$raw = json_decode($json, true);
+
+		if (!empty($password) && (empty($raw)))
+		{
+			die('###{"status":false,"message":"Invalid login"}###');
+		}
+
+		// Pass all JSON data to the request array
+		if (!empty($raw))
+		{
+			foreach ($raw as $key => $value)
+			{
+				$_REQUEST[$key] = $value;
+			}
+		}
+	}
+	elseif (!empty($password))
+	{
+		die('###{"status":false,"message":"Invalid login"}###');
+	}
+
+	// ------------------------------------------------------------
+	// 3. Try the "factory" variable
+	// ------------------------------------------------------------
+	// A "factory" variable will override all other settings.
+	$serialized = getQueryParam('factory', null);
+
+	if (!is_null($serialized))
+	{
+		// Get the serialized factory
+		AKFactory::unserialize($serialized);
+		AKFactory::set('kickstart.enabled', true);
+
+		return true;
+	}
+
+	// ------------------------------------------------------------
+	// 4. Try the configuration variable for Kickstart
+	// ------------------------------------------------------------
+	if (defined('KICKSTART'))
+	{
+		$configuration = getQueryParam('configuration');
+
+		if (!is_null($configuration))
+		{
+			// Let's decode the configuration from JSON to array
+			$ini_data = json_decode($configuration, true);
+		}
+		else
+		{
+			// Neither exists. Enable Kickstart's interface anyway.
+			$ini_data = array('kickstart.enabled' => true);
+		}
+
+		// Import any INI data we might have from other sources
+		if (!empty($ini_data))
+		{
+			foreach ($ini_data as $key => $value)
+			{
+				AKFactory::set($key, $value);
+			}
+
+			AKFactory::set('kickstart.enabled', true);
+
+			return true;
+		}
+	}
+}
+
+/**
+ * Akeeba Restore
+ * A JSON-powered JPA, JPS and ZIP archive extraction library
+ *
+ * @copyright   2008-2017 Nicholas K. Dionysopoulos / Akeeba Ltd.
+ * @license     GNU GPL v2 or - at your option - any later version
+ * @package     akeebabackup
+ * @subpackage  kickstart
+ */
+
+// Mini-controller for restore.php
+if (!defined('KICKSTART'))
+{
+	// The observer class, used to report number of files and bytes processed
+	class RestorationObserver extends AKAbstractPartObserver
+	{
+		public $compressedTotal = 0;
+		public $uncompressedTotal = 0;
+		public $filesProcessed = 0;
+
+		public function update($object, $message)
+		{
+			if (!is_object($message))
+			{
+				return;
+			}
+
+			if (!array_key_exists('type', get_object_vars($message)))
+			{
+				return;
+			}
+
+			if ($message->type == 'startfile')
+			{
+				$this->filesProcessed++;
+				$this->compressedTotal += $message->content->compressed;
+				$this->uncompressedTotal += $message->content->uncompressed;
+			}
+		}
+
+		public function __toString()
+		{
+			return __CLASS__;
+		}
+
+	}
+
+	// Import configuration
+	masterSetup();
+
+	$retArray = array(
+		'status'  => true,
+		'message' => null
+	);
+
+	$enabled = AKFactory::get('kickstart.enabled', false);
+
+	if ($enabled)
+	{
+		$task = getQueryParam('task');
+
+		switch ($task)
+		{
+			case 'ping':
+				// ping task - realy does nothing!
+				$timer = AKFactory::getTimer();
+				$timer->enforce_min_exec_time();
+				break;
+
+			/**
+			 * There are two separate steps here since we were using an inefficient restoration intialization method in
+			 * the past. Now both startRestore and stepRestore are identical. The difference in behavior depends
+			 * exclusively on the calling Javascript. If no serialized factory was passed in the request then we start a
+			 * new restoration. If a serialized factory was passed in the request then the restoration is resumed. For
+			 * this reason we should NEVER call AKFactory::nuke() in startRestore anymore: that would simply reset the
+			 * extraction engine configuration which was done in masterSetup() leading to an error about the file being
+			 * invalid (since no file is found).
+			 */
+			case 'startRestore':
+			case 'stepRestore':
+				$engine   = AKFactory::getUnarchiver(); // Get the engine
+				$observer = new RestorationObserver(); // Create a new observer
+				$engine->attach($observer); // Attach the observer
+				$engine->tick();
+				$ret = $engine->getStatusArray();
+
+				if ($ret['Error'] != '')
+				{
+					$retArray['status']  = false;
+					$retArray['done']    = true;
+					$retArray['message'] = $ret['Error'];
+				}
+				elseif (!$ret['HasRun'])
+				{
+					$retArray['files']    = $observer->filesProcessed;
+					$retArray['bytesIn']  = $observer->compressedTotal;
+					$retArray['bytesOut'] = $observer->uncompressedTotal;
+					$retArray['status']   = true;
+					$retArray['done']     = true;
+				}
+				else
+				{
+					$retArray['files']    = $observer->filesProcessed;
+					$retArray['bytesIn']  = $observer->compressedTotal;
+					$retArray['bytesOut'] = $observer->uncompressedTotal;
+					$retArray['status']   = true;
+					$retArray['done']     = false;
+					$retArray['factory']  = AKFactory::serialize();
+				}
+				break;
+
+			case 'finalizeRestore':
+				$root = AKFactory::get('kickstart.setup.destdir');
+				// Remove the installation directory
+				recursive_remove_directory($root . '/installation');
+
+				$postproc = AKFactory::getPostProc();
+
+				/**
+				 * Should I rename the htaccess.bak and web.config.bak files back to their live filenames...?
+				 */
+				$renameFiles = AKFactory::get('kickstart.setup.postrenamefiles', true);
+
+				if ($renameFiles)
+				{
+					// Rename htaccess.bak to .htaccess
+					if (file_exists($root . '/htaccess.bak'))
+					{
+						if (file_exists($root . '/.htaccess'))
+						{
+							$postproc->unlink($root . '/.htaccess');
+						}
+						$postproc->rename($root . '/htaccess.bak', $root . '/.htaccess');
+					}
+
+					// Rename htaccess.bak to .htaccess
+					if (file_exists($root . '/web.config.bak'))
+					{
+						if (file_exists($root . '/web.config'))
+						{
+							$postproc->unlink($root . '/web.config');
+						}
+						$postproc->rename($root . '/web.config.bak', $root . '/web.config');
+					}
+				}
+
+				// Remove restoration.php
+				$basepath = KSROOTDIR;
+				$basepath = rtrim(str_replace('\\', '/', $basepath), '/');
+				if (!empty($basepath))
+				{
+					$basepath .= '/';
+				}
+				$postproc->unlink($basepath . 'restoration.php');
+
+				// Import a custom finalisation file
+				$filename = dirname(__FILE__) . '/restore_finalisation.php';
+				if (file_exists($filename))
+				{
+					// opcode cache busting before including the filename
+					if (function_exists('opcache_invalidate'))
+					{
+						opcache_invalidate($filename);
+					}
+					if (function_exists('apc_compile_file'))
+					{
+						apc_compile_file($filename);
+					}
+					if (function_exists('wincache_refresh_if_changed'))
+					{
+						wincache_refresh_if_changed(array($filename));
+					}
+					if (function_exists('xcache_asm'))
+					{
+						xcache_asm($filename);
+					}
+					include_once $filename;
+				}
+
+				// Run a custom finalisation script
+				if (function_exists('finalizeRestore'))
+				{
+					finalizeRestore($root, $basepath);
+				}
+				break;
+
+			default:
+				// Invalid task!
+				$enabled = false;
+				break;
+		}
+	}
+
+	// Maybe we weren't authorized or the task was invalid?
+	if (!$enabled)
+	{
+		// Maybe the user failed to enter any information
+		$retArray['status']  = false;
+		$retArray['message'] = AKText::_('ERR_INVALID_LOGIN');
+	}
+
+	// JSON encode the message
+	$json = json_encode($retArray);
+	// Do I have to encrypt?
+	$password = AKFactory::get('kickstart.security.password', null);
+	if (!empty($password))
+	{
+		$json = AKEncryptionAES::AESEncryptCtr($json, $password, 128);
+	}
+
+	// Return the message
+	echo "###$json###";
+
+}
+
+// ------------ lixlpixel recursive PHP functions -------------
+// recursive_remove_directory( directory to delete, empty )
+// expects path to directory and optional TRUE / FALSE to empty
+// of course PHP has to have the rights to delete the directory
+// you specify and all files and folders inside the directory
+// ------------------------------------------------------------
+function recursive_remove_directory($directory)
+{
+	// if the path has a slash at the end we remove it here
+	if (substr($directory, -1) == '/')
+	{
+		$directory = substr($directory, 0, -1);
+	}
+	// if the path is not valid or is not a directory ...
+	if (!file_exists($directory) || !is_dir($directory))
+	{
+		// ... we return false and exit the function
+		return false;
+		// ... if the path is not readable
+	}
+	elseif (!is_readable($directory))
+	{
+		// ... we return false and exit the function
+		return false;
+		// ... else if the path is readable
+	}
+	else
+	{
+		// we open the directory
+		$handle   = opendir($directory);
+		$postproc = AKFactory::getPostProc();
+		// and scan through the items inside
+		while (false !== ($item = readdir($handle)))
+		{
+			// if the filepointer is not the current directory
+			// or the parent directory
+			if ($item != '.' && $item != '..')
+			{
+				// we build the new path to delete
+				$path = $directory . '/' . $item;
+				// if the new path is a directory
+				if (is_dir($path))
+				{
+					// we call this function with the new path
+					recursive_remove_directory($path);
+					// if the new path is a file
+				}
+				else
+				{
+					// we remove the file
+					$postproc->unlink($path);
+				}
+			}
+		}
+		// close the directory
+		closedir($handle);
+		// try to delete the now empty directory
+		if (!$postproc->rmdir($directory))
+		{
+			// return false if not possible
+			return false;
+		}
+
+		// return success
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/restore_finalisation.php b/core/administrator/components/com_joomlaupdate/restore_finalisation.php
new file mode 100644
index 00000000..24eaa99a
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/restore_finalisation.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Require the restoration environment or fail cold. Prevents direct web access.
+defined('_AKEEBA_RESTORATION') or die();
+
+// Fake a miniature Joomla environment
+if (!defined('_JEXEC'))
+{
+	define('_JEXEC', 1);
+}
+
+if (!function_exists('jimport'))
+{
+	/**
+	 * We don't use it but the post-update script is using it anyway, so LET'S FAKE IT!
+	 *
+	 * @param   string  $path  A dot syntax path.
+	 * @param   string  $base  Search this directory for the class.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	function jimport($path, $base = null)
+	{
+		// Do nothing
+	}
+}
+
+// Fake the JFile class, mapping it to Restore's post-processing class
+if (!class_exists('JFile'))
+{
+	/**
+	 * JFile mock class proxing behaviour in the post-upgrade script to that of either native PHP or restore.php
+	 *
+	 * @since  3.5.1
+	 */
+	abstract class JFile
+	{
+		/**
+		 * Proxies checking a folder exists to the native php version
+		 *
+		 * @param   string  $fileName  The path to the file to be checked
+		 *
+		 * @return  boolean
+		 *
+		 * @since   3.5.1
+		 */
+		public static function exists($fileName)
+		{
+			return @file_exists($fileName);
+		}
+
+		/**
+		 * Proxies deleting a file to the restore.php version
+		 *
+		 * @param   string  $fileName  The path to the file to be deleted
+		 *
+		 * @return  boolean
+		 *
+		 * @since   3.5.1
+		 */
+		public static function delete($fileName)
+		{
+			$postproc = AKFactory::getPostProc();
+			$postproc->unlink($fileName);
+		}
+	}
+}
+
+// Fake the JFolder class, mapping it to Restore's post-processing class
+if (!class_exists('JFolder'))
+{
+	/**
+	 * JFolder mock class proxing behaviour in the post-upgrade script to that of either native PHP or restore.php
+	 *
+	 * @since  3.5.1
+	 */
+	abstract class JFolder
+	{
+		/**
+		 * Proxies checking a folder exists to the native php version
+		 *
+		 * @param   string  $folderName  The path to the folder to be checked
+		 *
+		 * @return  boolean
+		 *
+		 * @since   3.5.1
+		 */
+		public static function exists($folderName)
+		{
+			return @is_dir($folderName);
+		}
+
+		/**
+		 * Proxies deleting a folder to the restore.php version
+		 *
+		 * @param   string  $folderName  The path to the folder to be deleted
+		 *
+		 * @return  void
+		 *
+		 * @since   3.5.1
+		 */
+		public static function delete($folderName)
+		{
+			recursive_remove_directory($folderName);
+		}
+	}
+}
+
+// Fake the JText class - we aren't going to show errors to people anyhow
+if (!class_exists('JText'))
+{
+	/**
+	 * JText mock class proxing behaviour in the post-upgrade script to that of either native PHP or restore.php
+	 *
+	 * @since  3.5.1
+	 */
+	abstract class JText
+	{
+		/**
+		 * No need for translations in a non-interactive script, so always return an empty string here
+		 *
+		 * @param   string  $text  A language constant
+		 *
+		 * @return  string
+		 *
+		 * @since   3.5.1
+		 */
+		public static function sprintf($text)
+		{
+			return '';
+		}
+	}
+}
+
+if (!function_exists('finalizeRestore'))
+{
+	/**
+	 * Run part of the Joomla! finalisation script, namely the part that cleans up unused files/folders
+	 *
+	 * @param   string  $siteRoot     The root to the Joomla! site
+	 * @param   string  $restorePath  The base path to restore.php
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5.1
+	 */
+	function finalizeRestore($siteRoot, $restorePath)
+	{
+		if (!defined('JPATH_ROOT'))
+		{
+			define('JPATH_ROOT', $siteRoot);
+		}
+
+		$filePath = JPATH_ROOT . '/administrator/components/com_admin/script.php';
+
+		if (file_exists($filePath))
+		{
+			require_once $filePath;
+		}
+
+		// Make sure Joomla!'s code can figure out which files exist and need be removed
+		clearstatcache();
+
+		// Remove obsolete files - prevents errors occuring in some system plugins
+		if (class_exists('JoomlaInstallerScript'))
+		{
+			$script = new JoomlaInstallerScript;
+			$script->deleteUnexistingFiles();
+		}
+
+		// Clear OPcache
+		if (function_exists('opcache_reset'))
+		{
+			opcache_reset();
+		}
+		elseif (function_exists('apc_clear_cache'))
+		{
+			@apc_clear_cache();
+		}
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php
new file mode 100644
index 00000000..45b2f9c6
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<fieldset>
+	<legend>
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_COMPLETE_HEADING'); ?>
+	</legend>
+	<p class="alert alert-success">
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE', JVERSION); ?>
+	</p>
+</fieldset>
+<form action="<?php echo JRoute::_('index.php?option=com_joomlaupdate'); ?>" method="post" id="adminForm">
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
new file mode 100644
index 00000000..cbeacb47
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('script', 'com_joomlaupdate/default.js', array('version' => 'auto', 'relative' => true));
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($) {
+	$('#extraction_method').change(function(e){
+		extractionMethodHandler('#extraction_method', 'row_ftp');
+	});
+	$('#upload_method').change(function(e){
+		extractionMethodHandler('#upload_method', 'upload_ftp');
+	});
+
+	$('button.submit').on('click', function() {
+		$('div.download_message').show();
+	});
+});");
+?>
+
+<div id="joomlaupdate-wrapper">
+
+	<?php if ($this->showUploadAndUpdate) : ?>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'joomlaupdate-tabs', array('active' => 'online-update')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'joomlaupdate-tabs', 'online-update', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE')); ?>
+	<?php endif; ?>
+
+	<form enctype="multipart/form-data" action="index.php" method="post" id="adminForm" class="form-horizontal">
+
+		<?php if ($this->selfUpdate) : ?>
+			<?php // If we have a self update notice to install it first! ?>
+			<?php JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST'), 'error'); ?>
+			<?php echo $this->loadTemplate('updatemefirst'); ?>
+		<?php else : ?>
+			<?php if (!isset($this->updateInfo['object']->downloadurl->_data) && $this->updateInfo['installed'] < $this->updateInfo['latest']) : ?>
+				<?php // If we have no download URL we can't reinstall or update ?>
+				<?php echo $this->loadTemplate('nodownload'); ?>
+			<?php elseif (!$this->updateInfo['hasUpdate']) : ?>
+				<?php // If we have no update we can reinstall the core ?>
+				<?php echo $this->loadTemplate('reinstall'); ?>
+			<?php else : ?>
+				<?php // Ok let's show the update template ?>
+				<?php echo $this->loadTemplate('update'); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="update.download" />
+		<input type="hidden" name="option" value="com_joomlaupdate" />
+
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+
+	<?php // Only Super Users have access to the Update & Install for obvious security reasons ?>
+	<?php if ($this->showUploadAndUpdate) : ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'joomlaupdate-tabs', 'upload-update', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD')); ?>
+		<?php echo $this->loadTemplate('upload'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	<?php endif; ?>
+
+	<div class="download_message" style="display: none">
+		<p></p>
+		<p class="nowarning">
+			<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS'); ?>
+		</p>
+		<div class="joomlaupdate_spinner"></div>
+	</div>
+	<div id="loading"></div>
+</div>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml
new file mode 100755
index 00000000..61f8dafe
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php
new file mode 100644
index 00000000..9ea9f1a0
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_nodownload.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+?>
+
+<fieldset>
+	<legend>
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL'); ?>
+	</legend>
+	<p>
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC', $this->updateInfo['latest']); ?>
+	</p>
+</fieldset>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php
new file mode 100644
index 00000000..d124c14d
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_reinstall.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+?>
+<fieldset>
+	<legend>
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES'); ?>
+	</legend>
+	<p>
+		<?php echo JText::sprintf($this->langKey, $this->updateSourceKey); ?>
+	</p>
+
+	<div class="alert alert-success">
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE', JVERSION); ?>
+	</div>
+
+	<?php if (is_object($this->updateInfo['object']) && ($this->updateInfo['object'] instanceof JUpdate)) : ?>
+		<table class="table table-striped">
+			<tbody>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL'); ?>
+				</td>
+				<td>
+					<a href="<?php echo $this->updateInfo['object']->downloadurl->_data; ?>">
+						<?php echo $this->updateInfo['object']->downloadurl->_data; ?>
+					</a>
+				</td>
+			</tr>
+			<?php if (isset($this->updateInfo['object']->get('infourl')->_data)
+				&& isset($this->updateInfo['object']->get('infourl')->title)) : ?>
+				<tr>
+					<td>
+						<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL'); ?>
+					</td>
+					<td>
+						<a href="<?php echo $this->updateInfo['object']->get('infourl')->_data; ?>">
+							<?php echo $this->updateInfo['object']->get('infourl')->title; ?>
+						</a>
+					</td>
+				</tr>
+			<?php endif; ?>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD'); ?>
+				</td>
+				<td>
+					<?php echo $this->methodSelect; ?>
+				</td>
+			</tr>
+			<tr id="row_ftp_hostname" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_host" value="<?php echo $this->ftp['host']; ?>" />
+				</td>
+			</tr>
+			<tr id="row_ftp_port" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_port" value="<?php echo $this->ftp['port']; ?>" />
+				</td>
+			</tr>
+			<tr id="row_ftp_username" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_user" value="<?php echo $this->ftp['username']; ?>" />
+				</td>
+			</tr>
+			<tr id="row_ftp_password" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD'); ?>
+				</td>
+				<td>
+					<input type="password" name="ftp_pass" value="<?php echo $this->ftp['password']; ?>" />
+				</td>
+			</tr>
+			<tr id="row_ftp_directory" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_root" value="<?php echo $this->ftp['directory']; ?>" />
+				</td>
+			</tr>
+			</tbody>
+			<tfoot>
+			<tr>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					<button class="btn btn-warning" type="submit">
+						<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN'); ?>
+					</button>
+				</td>
+			</tr>
+			</tfoot>
+		</table>
+	<?php endif; ?>
+
+</fieldset>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php
new file mode 100644
index 00000000..5b5bd3cf
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+?>
+<fieldset>
+	<legend>
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND'); ?>
+	</legend>
+	<p>
+		<?php echo JText::sprintf($this->langKey, $this->updateSourceKey); ?>
+	</p>
+
+	<table class="table table-striped">
+		<tbody>
+		<tr>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED'); ?>
+			</td>
+			<td>
+				<?php echo $this->updateInfo['installed']; ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST'); ?>
+			</td>
+			<td>
+				<?php echo $this->updateInfo['latest']; ?>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE'); ?>
+			</td>
+			<td>
+				<a href="<?php echo $this->updateInfo['object']->downloadurl->_data; ?>">
+					<?php echo $this->updateInfo['object']->downloadurl->_data; ?>
+				</a>
+			</td>
+		</tr>
+		<?php if (isset($this->updateInfo['object']->get('infourl')->_data)
+			&& isset($this->updateInfo['object']->get('infourl')->title)) : ?>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL'); ?>
+				</td>
+				<td>
+					<a href="<?php echo $this->updateInfo['object']->get('infourl')->_data; ?>">
+						<?php echo $this->updateInfo['object']->get('infourl')->title; ?>
+					</a>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<tr>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD'); ?>
+			</td>
+			<td>
+				<?php echo $this->methodSelect; ?>
+			</td>
+		</tr>
+		<tr id="row_ftp_hostname" <?php echo $this->ftpFieldsDisplay; ?>>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME'); ?>
+			</td>
+			<td>
+				<input type="text" name="ftp_host" value="<?php echo $this->ftp['host']; ?>" />
+			</td>
+		</tr>
+		<tr id="row_ftp_port" <?php echo $this->ftpFieldsDisplay; ?>>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT'); ?>
+			</td>
+			<td>
+				<input type="text" name="ftp_port" value="<?php echo $this->ftp['port']; ?>" />
+			</td>
+		</tr>
+		<tr id="row_ftp_username" <?php echo $this->ftpFieldsDisplay; ?>>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME'); ?>
+			</td>
+			<td>
+				<input type="text" name="ftp_user" value="<?php echo $this->ftp['username']; ?>" />
+			</td>
+		</tr>
+		<tr id="row_ftp_password" <?php echo $this->ftpFieldsDisplay; ?>>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD'); ?>
+			</td>
+			<td>
+				<input type="password" name="ftp_pass" value="<?php echo $this->ftp['password']; ?>" />
+			</td>
+		</tr>
+		<tr id="row_ftp_directory" <?php echo $this->ftpFieldsDisplay; ?>>
+			<td>
+				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY'); ?>
+			</td>
+			<td>
+				<input type="text" name="ftp_root" value="<?php echo $this->ftp['directory']; ?>" />
+			</td>
+		</tr>
+		</tbody>
+		<tfoot>
+		<tr>
+			<td>
+				&nbsp;
+			</td>
+			<td>
+				<button class="btn btn-primary" type="submit">
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE'); ?>
+				</button>
+			</td>
+		</tr>
+		</tfoot>
+	</table>
+</fieldset>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php
new file mode 100644
index 00000000..8cf36215
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_updatemefirst.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+?>
+
+<fieldset>
+	<legend>
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE'); ?>
+	</legend>
+	<p>
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC'); ?>
+	</p>
+</fieldset>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php
new file mode 100644
index 00000000..f745d064
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+
+$errSelectPackage = JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true);
+$js               = <<< JS
+	Joomla.submitbuttonUpload = function() {
+		var form = document.getElementById("uploadForm");
+
+		// do field validation
+		if (form.install_package.value == "") {
+			alert("$errSelectPackage");
+		}
+		else
+		{
+			jQuery("#loading").css("display", "block");
+
+			form.submit();
+		}
+	};
+
+	// Add spindle-wheel for installations:
+	jQuery(document).ready(function($) {
+		var outerDiv = $("#joomlaupdate-wrapper");
+
+		$("#loading")
+		.css("top", outerDiv.position().top - $(window).scrollTop())
+		.css("left", "0")
+		.css("width", "100%")
+		.css("height", "100%")
+		.css("display", "none")
+		.css("margin-top", "-10px");
+	});
+
+JS;
+
+JFactory::getDocument()->addScriptDeclaration($js);
+
+$ajaxLoaderImage = JHtml::_('image', 'jui/ajax-loader.gif', '', null, true, true);
+$css             = <<< CSS
+	#loading {
+		background: rgba(255, 255, 255, .8) url('$ajaxLoaderImage') 50% 15% no-repeat;
+		position: fixed;
+		opacity: 1;
+		-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 80);
+		filter: alpha(opacity = 80);
+		overflow: hidden;
+	}
+CSS;
+JFactory::getDocument()->addStyleDeclaration($css);
+?>
+
+<div class="alert alert-info">
+	<p>
+		<span class="icon icon-info" aria-hidden="true"></span>
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO', 'https://downloads.joomla.org/latest'); ?>
+	</p>
+</div>
+
+<?php if (count($this->warnings)) : ?>
+<fieldset>
+	<legend>
+		<?php echo JText::_('COM_INSTALLER_SUBMENU_WARNINGS'); ?>
+	</legend>
+
+	<?php $i = 0; ?>
+	<?php echo JHtml::_('bootstrap.startAccordion', 'warnings', array('active' => 'warning' . $i)); ?>
+	<?php foreach ($this->warnings as $message) : ?>
+		<?php echo JHtml::_('bootstrap.addSlide', 'warnings', $message['message'], 'warning' . ($i++)); ?>
+		<?php echo $message['description']; ?>
+		<?php echo JHtml::_('bootstrap.endSlide'); ?>
+	<?php endforeach; ?>
+	<?php echo JHtml::_('bootstrap.addSlide', 'warnings', JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'), 'furtherinfo'); ?>
+	<?php echo JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC'); ?>
+	<?php echo JHtml::_('bootstrap.endSlide'); ?>
+	<?php echo JHtml::_('bootstrap.endAccordion'); ?>
+</fieldset>
+<?php endif; ?>
+
+<form enctype="multipart/form-data" action="index.php" method="post" id="uploadForm" class="form-horizontal">
+	<fieldset class="uploadform">
+		<legend><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD'); ?></legend>
+		<table class="table table-striped">
+			<tbody>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPLOAD_PACKAGE_FILE'); ?>
+				</td>
+				<td>
+					<input class="input_box" id="install_package" name="install_package" type="file" size="57" /><br>
+					<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize()); ?>
+					<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD'); ?>
+				</td>
+				<td>
+					<?php echo $this->methodSelectUpload; ?>
+				</td>
+			</tr>
+			<tr id="upload_ftp_hostname" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_host" value="<?php echo $this->ftp['host']; ?>" />
+				</td>
+			</tr>
+			<tr id="upload_ftp_port" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_port" value="<?php echo $this->ftp['port']; ?>" />
+				</td>
+			</tr>
+			<tr id="upload_ftp_username" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_user" value="<?php echo $this->ftp['username']; ?>" />
+				</td>
+			</tr>
+			<tr id="upload_ftp_password" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD'); ?>
+				</td>
+				<td>
+					<input type="password" name="ftp_pass" value="<?php echo $this->ftp['password']; ?>" />
+				</td>
+			</tr>
+			<tr id="upload_ftp_directory" <?php echo $this->ftpFieldsDisplay; ?>>
+				<td>
+					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY'); ?>
+				</td>
+				<td>
+					<input type="text" name="ftp_root" value="<?php echo $this->ftp['directory']; ?>" />
+				</td>
+			</tr>
+			</tbody>
+			<tfoot>
+			<tr>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					<button class="btn btn-primary" type="button" onclick="Joomla.submitbuttonUpload()"><?php echo JText::_('COM_INSTALLER_UPLOAD_AND_INSTALL'); ?></button>
+				</td>
+			</tr>
+			</tfoot>
+		</table>
+	</fieldset>
+
+	<input type="hidden" name="task" value="update.upload" />
+	<input type="hidden" name="option" value="com_joomlaupdate" />
+	<?php echo JHtml::_('form.token'); ?>
+
+</form>
diff --git a/core/administrator/components/com_joomlaupdate/views/default/view.html.php b/core/administrator/components/com_joomlaupdate/views/default/view.html.php
new file mode 100644
index 00000000..bf818032
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/default/view.html.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Update's Default View
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateViewDefault extends JViewLegacy
+{
+	/**
+	 * An array with the Joomla! update information.
+	 *
+	 * @var    array
+	 *
+	 * @since  3.6.0
+	 */
+	protected $updateInfo = null;
+
+	/**
+	 * The form field for the extraction select
+	 *
+	 * @var    string
+	 *
+	 * @since  3.6.0
+	 */
+	protected $methodSelect = null;
+
+	/**
+	 * The form field for the upload select
+	 *
+	 * @var   string
+	 *
+	 * @since  3.6.0
+	 */
+	protected $methodSelectUpload = null;
+
+	/**
+	 * Renders the view
+	 *
+	 * @param   string  $tpl  Template name
+	 *
+	 * @return void
+	 *
+	 * @since  2.5.4
+	 */
+	public function display($tpl = null)
+	{
+		// Get data from the model.
+		$this->state = $this->get('State');
+
+		// Load useful classes.
+		/** @var JoomlaupdateModelDefault $model */
+		$model = $this->getModel();
+		$this->loadHelper('select');
+
+		// Assign view variables.
+		$ftp           = $model->getFTPOptions();
+		$defaultMethod = $ftp['enabled'] ? 'hybrid' : 'direct';
+
+		$this->updateInfo         = $model->getUpdateInformation();
+		$this->methodSelect       = JoomlaupdateHelperSelect::getMethods($defaultMethod);
+		$this->methodSelectUpload = JoomlaupdateHelperSelect::getMethods($defaultMethod, 'method', 'upload_method');
+
+		// Set the toolbar information.
+		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
+		JToolbarHelper::custom('update.purge', 'loop', 'loop', 'COM_JOOMLAUPDATE_TOOLBAR_CHECK', false);
+
+		// Add toolbar buttons.
+		$user = JFactory::getUser();
+
+		if ($user->authorise('core.admin', 'com_joomlaupdate') || $user->authorise('core.options', 'com_joomlaupdate'))
+		{
+			JToolbarHelper::preferences('com_joomlaupdate');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');
+
+		if (!is_null($this->updateInfo['object']))
+		{
+			// Show the message if an update is found.
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'notice');
+		}
+
+		$this->ftpFieldsDisplay = $this->ftp['enabled'] ? '' : 'style = "display: none"';
+		$params                 = JComponentHelper::getParams('com_joomlaupdate');
+
+		switch ($params->get('updatesource', 'default'))
+		{
+			// "Minor & Patch Release for Current version AND Next Major Release".
+			case 'sts':
+			case 'next':
+				$this->langKey         = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT';
+				$this->updateSourceKey = JText::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT');
+				break;
+
+			// "Testing"
+			case 'testing':
+				$this->langKey         = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING';
+				$this->updateSourceKey = JText::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING');
+				break;
+
+			// "Custom"
+			case 'custom':
+				$this->langKey         = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM';
+				$this->updateSourceKey = JText::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM');
+				break;
+
+			/**
+			 * "Minor & Patch Release for Current version (recommended and default)".
+			 * The commented "case" below are for documenting where 'default' and legacy options falls
+			 * case 'default':
+			 * case 'lts':
+			 * case 'nochange':
+			 */
+			default:
+				$this->langKey         = 'COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT';
+				$this->updateSourceKey = JText::_('COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT');
+		}
+
+		$this->warnings = array();
+		/** @var InstallerModelWarnings $warningsModel */
+		$warningsModel = $this->getModel('warnings');
+
+		if (is_object($warningsModel) && $warningsModel instanceof JModelLegacy)
+		{
+			$language = JFactory::getLanguage();
+			$language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true);
+			$language->load('com_installer', JPATH_ADMINISTRATOR, null, true);
+
+			$this->warnings = $warningsModel->getItems();
+		}
+
+		$this->selfUpdate = $this->checkForSelfUpdate();
+
+		// Only Super Users have access to the Update & Install for obvious security reasons
+		$this->showUploadAndUpdate = JFactory::getUser()->authorise('core.admin');
+
+		// Remove temporary files
+		$model->removePackageFiles();
+
+		// Render the view.
+		parent::display($tpl);
+	}
+
+	/**
+	 * Makes sure that the Joomla! Update Component Update is in the database and check if there is a new version.
+	 *
+	 * @return  boolean  True if there is an update else false
+	 *
+	 * @since   3.6.3
+	 */
+	private function checkForSelfUpdate()
+	{
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate'));
+		$db->setQuery($query);
+
+		try
+		{
+			// Get the component extension ID
+			$joomlaUpdateComponentId = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			// Something is wrong here!
+			$joomlaUpdateComponentId = 0;
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		// Try the update only if we have an extension id
+		if ($joomlaUpdateComponentId != 0)
+		{
+			// Allways force to check for an update!
+			$cache_timeout = 0;
+
+			$updater = JUpdater::getInstance();
+			$updater->findUpdates($joomlaUpdateComponentId, $cache_timeout, JUpdater::STABILITY_STABLE);
+
+			// Fetch the update information from the database.
+			$query = $db->getQuery(true)
+				->select('*')
+				->from($db->quoteName('#__updates'))
+				->where($db->quoteName('extension_id') . ' = ' . $db->quote($joomlaUpdateComponentId));
+			$db->setQuery($query);
+
+			try
+			{
+				$joomlaUpdateComponentObject = $db->loadObject();
+			}
+			catch (RuntimeException $e)
+			{
+				// Something is wrong here!
+				$joomlaUpdateComponentObject = null;
+				JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+			}
+
+			if (is_null($joomlaUpdateComponentObject))
+			{
+				// No Update great!
+				return false;
+			}
+
+			return true;
+		}
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/views/update/tmpl/default.php b/core/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
new file mode 100644
index 00000000..cba3286f
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include jQuery.
+JHtml::_('jquery.framework');
+
+// Load the scripts
+JHtml::_('script', 'com_joomlaupdate/json2.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'com_joomlaupdate/encryption.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'com_joomlaupdate/update.js', array('version' => 'auto', 'relative' => true));
+
+$password = JFactory::getApplication()->getUserState('com_joomlaupdate.password', null);
+$filesize = JFactory::getApplication()->getUserState('com_joomlaupdate.filesize', null);
+$ajaxUrl = JUri::base() . 'components/com_joomlaupdate/restore.php';
+$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise&' . JFactory::getSession()->getFormToken() . '=1';
+
+JFactory::getDocument()->addScriptDeclaration(
+	"
+	var joomlaupdate_password = '$password';
+	var joomlaupdate_totalsize = '$filesize';
+	var joomlaupdate_ajax_url = '$ajaxUrl';
+	var joomlaupdate_return_url = '$returnUrl';
+
+	jQuery(document).ready(function(){
+		window.pingExtract();
+		});
+	"
+);
+?>
+
+<p class="nowarning"><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_INPROGRESS'); ?></p>
+
+<div id="update-progress">
+	<div id="extprogress">
+		<div id="progress" class="progress progress-striped active">
+			<div id="progress-bar" class="bar bar-success" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+		</div>
+		<div class="extprogrow">
+			<span class="extlabel"><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_PERCENT'); ?></span>
+			<span class="extvalue" id="extpercent"></span>
+		</div>
+		<div class="extprogrow">
+			<span class="extlabel"><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD'); ?></span>
+			<span class="extvalue" id="extbytesin"></span>
+		</div>
+		<div class="extprogrow">
+			<span class="extlabel"><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED'); ?></span>
+			<span class="extvalue" id="extbytesout"></span>
+		</div>
+		<div class="extprogrow">
+			<span class="extlabel"><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_FILESEXTRACTED'); ?></span>
+			<span class="extvalue" id="extfiles"></span>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php b/core/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php
new file mode 100644
index 00000000..eedb4d9e
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/update/tmpl/finaliseconfirm.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.tooltip');
+
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+
+?>
+
+<div class="alert alert-warning">
+	<h4 class="alert-heading">
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_HEAD'); ?>
+	</h4>
+	<p>
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_HEAD_DESC', JFactory::getConfig()->get('sitename')); ?>
+	</p>
+</div>
+
+<hr/>
+
+<form action="<?php echo JRoute::_('index.php', true); ?>" method="post" id="form-login" class="form-inline center">
+	<fieldset class="loginform">
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-user hasTooltip" title="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" aria-hidden="true"></span>
+						<label for="mod-login-username" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_USERNAME'); ?>
+						</label>
+					</span>
+					<input name="username" tabindex="1" id="mod-login-username" type="text" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" size="15" autofocus="true" />
+				</div>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-lock hasTooltip" title="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" aria-hidden="true"></span>
+						<label for="mod-login-password" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_PASSWORD'); ?>
+						</label>
+					</span>
+					<input name="passwd" tabindex="2" id="mod-login-password" type="password" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" size="15"/>
+				</div>
+			</div>
+		</div>
+		<?php if (count($twofactormethods) > 1) : ?>
+			<div class="control-group">
+				<div class="controls">
+					<div class="input-prepend input-append">
+						<span class="add-on">
+							<span class="icon-star hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" aria-hidden="true"></span>
+							<label for="mod-login-secretkey" class="element-invisible">
+								<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>
+							</label>
+						</span>
+						<input name="secretkey" autocomplete="off" tabindex="3" id="mod-login-secretkey" type="text" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" size="15"/>
+						<span class="btn width-auto hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY_HELP'); ?>">
+							<span class="icon-help" aria-hidden="true"></span>
+						</span>
+					</div>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="controls">
+				<div class="btn-group">
+					<a tabindex="4" class="btn btn-danger btn-small" href="index.php?option=com_joomlaupdate">
+						<span class="icon-cancel icon-white" aria-hidden="true"></span> <?php echo JText::_('JCANCEL'); ?>
+					</a>
+				</div>
+				<div class="btn-group">
+					<button tabindex="5" class="btn btn-primary btn-large">
+						<span class="icon-play icon-white" aria-hidden="true"></span> <?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_CONFIRM_AND_CONTINUE'); ?>
+					</button>
+				</div>
+			</div>
+		</div>
+
+		<input type="hidden" name="option" value="com_joomlaupdate"/>
+		<input type="hidden" name="task" value="update.finaliseconfirm" />
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/core/administrator/components/com_joomlaupdate/views/update/view.html.php b/core/administrator/components/com_joomlaupdate/views/update/view.html.php
new file mode 100644
index 00000000..cbbab460
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/update/view.html.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Update's Update View
+ *
+ * @since  2.5.4
+ */
+class JoomlaupdateViewUpdate extends JViewLegacy
+{
+	/**
+	 * Renders the view.
+	 *
+	 * @param   string  $tpl  Template name.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		// Set the toolbar information.
+		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
+
+		// Import com_login's model
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_login/models', 'LoginModel');
+
+		// Render the view.
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php b/core/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php
new file mode 100644
index 00000000..3f3d46fd
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/upload/tmpl/captive.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.tooltip');
+
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+
+?>
+<div class="alert alert-warning">
+	<h4 class="alert-heading">
+		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPLOAD_CAPTIVE_INTRO_HEAD'); ?>
+	</h4>
+	<p>
+		<?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_UPLOAD_CAPTIVE_INTRO_BODY', JFactory::getConfig()->get('sitename')); ?>
+	</p>
+</div>
+
+<hr/>
+
+<form action="<?php echo JRoute::_('index.php', true); ?>" method="post" id="form-login" class="form-inline center">
+	<fieldset class="loginform">
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-user hasTooltip" title="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" aria-hidden="true"></span>
+						<label for="mod-login-username" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_USERNAME'); ?>
+						</label>
+					</span>
+					<input name="username" tabindex="1" id="mod-login-username" type="text" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" size="15" autofocus="true" />
+				</div>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-lock hasTooltip" title="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" aria-hidden="true"></span>
+						<label for="mod-login-password" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_PASSWORD'); ?>
+						</label>
+					</span>
+					<input name="passwd" tabindex="2" id="mod-login-password" type="password" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" size="15"/>
+				</div>
+			</div>
+		</div>
+		<?php if (count($twofactormethods) > 1) : ?>
+			<div class="control-group">
+				<div class="controls">
+					<div class="input-prepend input-append">
+						<span class="add-on">
+							<span class="icon-star hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" aria-hidden="true"></span>
+							<label for="mod-login-secretkey" class="element-invisible">
+								<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>
+							</label>
+						</span>
+						<input name="secretkey" autocomplete="off" tabindex="3" id="mod-login-secretkey" type="text" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" size="15"/>
+						<span class="btn width-auto hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY_HELP'); ?>">
+							<span class="icon-help" aria-hidden="true"></span>
+						</span>
+					</div>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="controls">
+				<div class="btn-group">
+					<a tabindex="4" class="btn btn-danger" href="index.php?option=com_joomlaupdate">
+						<span class="icon-cancel icon-white" aria-hidden="true"></span> <?php echo JText::_('JCANCEL'); ?>
+					</a>
+				</div>
+				<div class="btn-group">
+					<button tabindex="5" class="btn btn-primary">
+						<span class="icon-play icon-white" aria-hidden="true"></span> <?php echo JText::_('COM_INSTALLER_INSTALL_BUTTON'); ?>
+					</button>
+				</div>
+			</div>
+		</div>
+
+		<input type="hidden" name="option" value="com_joomlaupdate"/>
+		<input type="hidden" name="task" value="update.confirm"/>
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_joomlaupdate/views/upload/view.html.php b/core/administrator/components/com_joomlaupdate/views/upload/view.html.php
new file mode 100644
index 00000000..aafadcf8
--- /dev/null
+++ b/core/administrator/components/com_joomlaupdate/views/upload/view.html.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Update's Update View
+ *
+ * @since  3.6.0
+ */
+class JoomlaupdateViewUpload extends JViewLegacy
+{
+	/**
+	 * Renders the view.
+	 *
+	 * @param   string  $tpl  Template name.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function display($tpl = null)
+	{
+		// Set the toolbar information.
+		JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'loop install');
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE');
+
+		// Load com_installer's language
+		$language = JFactory::getLanguage();
+		$language->load('com_installer', JPATH_ADMINISTRATOR, 'en-GB', false, true);
+		$language->load('com_installer', JPATH_ADMINISTRATOR, null, true);
+
+		// Import com_login's model
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_login/models', 'LoginModel');
+
+		// Render the view.
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_languages/access.xml b/core/administrator/components/com_languages/access.xml
new file mode 100644
index 00000000..bad626c9
--- /dev/null
+++ b/core/administrator/components/com_languages/access.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_languages">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_languages/config.xml b/core/administrator/components/com_languages/config.xml
new file mode 100644
index 00000000..1662ae7c
--- /dev/null
+++ b/core/administrator/components/com_languages/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_languages"
+			section="component" 
+		/>
+
+		<field
+			type="hidden"
+			name="site"
+		/>
+
+		<field
+			type="hidden"
+			name="administrator"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_languages/controller.php b/core/administrator/components/com_languages/controller.php
new file mode 100644
index 00000000..e8fdc664
--- /dev/null
+++ b/core/administrator/components/com_languages/controller.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Controller.
+ *
+ * @since  1.5
+ */
+class LanguagesController extends JControllerLegacy
+{
+	/**
+	 * @var		string	The default view.
+	 * @since   1.6
+	 */
+	protected $default_view = 'installed';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  LanguagesController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+
+		$view   = $this->input->get('view', 'languages');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'language' && $layout == 'edit' && !$this->checkEditId('com_languages.edit.language', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_languages&view=languages', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_languages/controllers/installed.php b/core/administrator/components/com_languages/controllers/installed.php
new file mode 100644
index 00000000..ce4716af
--- /dev/null
+++ b/core/administrator/components/com_languages/controllers/installed.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Controller.
+ *
+ * @since  1.5
+ */
+class LanguagesControllerInstalled extends JControllerLegacy
+{
+	/**
+	 * Task to set the default language.
+	 *
+	 * @return  void
+	 */
+	public function setDefault()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$cid = $this->input->get('cid', '');
+		$model = $this->getModel('installed');
+
+		if ($model->publish($cid))
+		{
+			// Switching to the new administrator language for the message
+			if ($model->getState('client_id') == 1)
+			{
+				$language = JFactory::getLanguage();
+				$newLang = JLanguage::getInstance($cid);
+				JFactory::$language = $newLang;
+				JFactory::getApplication()->loadLanguage($language = $newLang);
+				$newLang->load('com_languages', JPATH_ADMINISTRATOR);
+			}
+
+			$msg = JText::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
+			$type = 'message';
+		}
+		else
+		{
+			$msg = $this->getError();
+			$type = 'error';
+		}
+
+		$clientId = $model->getState('client_id');
+		$this->setredirect('index.php?option=com_languages&view=installed&client=' . $clientId, $msg, $type);
+	}
+
+	/**
+	 * Task to switch the administrator language.
+	 *
+	 * @return  void
+	 */
+	public function switchAdminLanguage()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$cid   = $this->input->get('cid', '');
+		$model = $this->getModel('installed');
+
+		// Fetching the language name from the xx-XX.xml
+		$file = JPATH_ADMINISTRATOR . '/language/' . $cid . '/' . $cid . '.xml';
+		$info = JInstaller::parseXMLInstallFile($file);
+		$languageName = $info['name'];
+
+		if ($model->switchAdminLanguage($cid))
+		{
+			// Switching to the new language for the message
+			$language = JFactory::getLanguage();
+			$newLang = JLanguage::getInstance($cid);
+			JFactory::$language = $newLang;
+			JFactory::getApplication()->loadLanguage($language = $newLang);
+			$newLang->load('com_languages', JPATH_ADMINISTRATOR);
+
+			$msg = JText::sprintf('COM_LANGUAGES_MSG_SWITCH_ADMIN_LANGUAGE_SUCCESS', $languageName);
+			$type = 'message';
+		}
+		else
+		{
+			$msg = $this->getError();
+			$type = 'error';
+		}
+
+		$this->setredirect('index.php?option=com_languages&view=installed', $msg, $type);
+	}
+}
diff --git a/core/administrator/components/com_languages/controllers/language.php b/core/administrator/components/com_languages/controllers/language.php
new file mode 100644
index 00000000..5c658edb
--- /dev/null
+++ b/core/administrator/components/com_languages/controllers/language.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages list actions controller.
+ *
+ * @since  1.6
+ */
+class LanguagesControllerLanguage extends JControllerForm
+{
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   int     $recordId  The primary key id for the item.
+	 * @param   string  $key       The name of the primary key variable.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $key = 'lang_id')
+	{
+		return parent::getRedirectToItemAppend($recordId, $key);
+	}
+}
diff --git a/core/administrator/components/com_languages/controllers/languages.php b/core/administrator/components/com_languages/controllers/languages.php
new file mode 100644
index 00000000..8bdd87f5
--- /dev/null
+++ b/core/administrator/components/com_languages/controllers/languages.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Languages controller Class.
+ *
+ * @since  1.6
+ */
+class LanguagesControllerLanguages extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Language', $prefix = 'LanguagesModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to save the submitted ordering values for records via AJAX.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function saveOrderAjax()
+	{
+		$pks   = $this->input->post->get('cid', array(), 'array');
+		$order = $this->input->post->get('order', array(), 'array');
+
+		// Sanitize the input.
+		$pks   = ArrayHelper::toInteger($pks);
+		$order = ArrayHelper::toInteger($order);
+
+		// Get the model.
+		$model = $this->getModel();
+
+		// Save the ordering.
+		$return = $model->saveorder($pks, $order);
+
+		if ($return)
+		{
+			echo '1';
+		}
+
+		// Close the application.
+		JFactory::getApplication()->close();
+	}
+}
diff --git a/core/administrator/components/com_languages/controllers/override.php b/core/administrator/components/com_languages/controllers/override.php
new file mode 100644
index 00000000..24815acf
--- /dev/null
+++ b/core/administrator/components/com_languages/controllers/override.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Override Controller
+ *
+ * @since  2.5
+ */
+class LanguagesControllerOverride extends JControllerForm
+{
+	/**
+	 * Method to edit an existing override.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable (not used here).
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (not used here).
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		// Do not cache the response to this, its a redirect
+		JFactory::getApplication()->allowCache(false);
+
+		$app     = JFactory::getApplication();
+		$cid     = $this->input->post->get('cid', array(), 'array');
+		$context = "$this->option.edit.$this->context";
+
+		// Get the constant name.
+		$recordId = (count($cid) ? $cid[0] : $this->input->get('id'));
+
+		// Access check.
+		if (!$this->allowEdit())
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
+
+			return;
+		}
+
+		$app->setUserState($context . '.data', null);
+		$this->setRedirect('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, 'id'));
+	}
+
+	/**
+	 * Method to save an override.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable (not used here).
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (not used here).
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app     = JFactory::getApplication();
+		$model   = $this->getModel();
+		$data    = $this->input->post->get('jform', array(), 'array');
+		$context = "$this->option.edit.$this->context";
+		$task    = $this->getTask();
+
+		$recordId = $this->input->get('id');
+		$data['id'] = $recordId;
+
+		// Access check.
+		if (!$this->allowSave($data, 'id'))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
+
+			return;
+		}
+
+		// Validate the posted data.
+		$form = $model->getForm($data, false);
+
+		if (!$form)
+		{
+			$app->enqueueMessage($model->getError(), 'error');
+
+			return;
+		}
+
+		// Require helper for filter functions called by JForm.
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+
+		// Test whether the data is valid.
+		$validData = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($validData === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->setRedirect(
+				JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, 'id'), false)
+			);
+
+			return;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($validData))
+		{
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $validData);
+
+			// Redirect back to the edit screen.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(
+				JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId, 'id'), false)
+			);
+
+			return;
+		}
+
+		// Add message of success.
+		$this->setMessage(JText::_('COM_LANGUAGES_VIEW_OVERRIDE_SAVE_SUCCESS'));
+
+		// Redirect the user and adjust session state based on the chosen task.
+		switch ($task)
+		{
+			case 'apply':
+				// Set the record data in the session.
+				$app->setUserState($context . '.data', null);
+
+				// Redirect back to the edit screen
+				$this->setRedirect(
+					JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($validData['key'], 'id'), false)
+				);
+				break;
+
+			case 'save2new':
+				// Clear the record id and data from the session.
+				$app->setUserState($context . '.data', null);
+
+				// Redirect back to the edit screen
+				$this->setRedirect(
+					JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend(null, 'id'), false)
+				);
+				break;
+
+			default:
+				// Clear the record id and data from the session.
+				$app->setUserState($context . '.data', null);
+
+				// Redirect to the list screen.
+				$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
+				break;
+		}
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable (not used here).
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function cancel($key = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app     = JFactory::getApplication();
+		$context = "$this->option.edit.$this->context";
+
+		$app->setUserState($context . '.data', null);
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
+	}
+}
diff --git a/core/administrator/components/com_languages/controllers/overrides.php b/core/administrator/components/com_languages/controllers/overrides.php
new file mode 100644
index 00000000..53699d55
--- /dev/null
+++ b/core/administrator/components/com_languages/controllers/overrides.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Overrides Controller.
+ *
+ * @since  2.5
+ */
+class LanguagesControllerOverrides extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var		string
+	 * @since	2.5
+	 */
+	protected $text_prefix = 'COM_LANGUAGES_VIEW_OVERRIDES';
+
+	/**
+	 * Method for deleting one or more overrides.
+	 *
+	 * @return  void
+	 *
+	 * @since		2.5
+	 */
+	public function delete()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+
+		// Get items to dlete from the request.
+		$cid = $this->input->get('cid', array(), 'array');
+
+		if (!is_array($cid) || count($cid) < 1)
+		{
+			$this->setMessage(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), 'warning');
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel('overrides');
+
+			// Remove the items.
+			if ($model->delete($cid))
+			{
+				$this->setMessage(JText::plural($this->text_prefix . '_N_ITEMS_DELETED', count($cid)));
+			}
+			else
+			{
+				$this->setMessage($model->getError());
+			}
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+	}
+
+	/**
+	 * Method to purge the overrider table.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.2
+	 */
+	public function purge()
+	{
+		$model = $this->getModel('overrides');
+		$model->purge();
+		$this->setRedirect(JRoute::_('index.php?option=com_languages&view=overrides', false));
+	}
+}
diff --git a/core/administrator/components/com_languages/controllers/strings.json.php b/core/administrator/components/com_languages/controllers/strings.json.php
new file mode 100644
index 00000000..a7466ea6
--- /dev/null
+++ b/core/administrator/components/com_languages/controllers/strings.json.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Strings JSON Controller
+ *
+ * @since  2.5
+ */
+class LanguagesControllerStrings extends JControllerAdmin
+{
+	/**
+	 * Method for refreshing the cache in the database with the known language strings
+	 *
+	 * @return  void
+	 *
+	 * @since		2.5
+	 */
+	public function refresh()
+	{
+		echo new JResponseJson($this->getModel('strings')->refresh());
+	}
+
+	/**
+	 * Method for searching language strings
+	 *
+	 * @return  void
+	 *
+	 * @since		2.5
+	 */
+	public function search()
+	{
+		echo new JResponseJson($this->getModel('strings')->search());
+	}
+}
diff --git a/core/administrator/components/com_languages/helpers/html/languages.php b/core/administrator/components/com_languages/helpers/html/languages.php
new file mode 100644
index 00000000..252b07f4
--- /dev/null
+++ b/core/administrator/components/com_languages/helpers/html/languages.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Utility class working with languages
+ *
+ * @since  1.6
+ */
+abstract class JHtmlLanguages
+{
+	/**
+	 * Method to generate an information about the default language.
+	 *
+	 * @param   boolean  $published  True if the language is the default.
+	 *
+	 * @return  string	HTML code.
+	 */
+	public static function published($published)
+	{
+		if (!$published)
+		{
+			return '&#160;';
+		}
+
+		return JHtml::_('image', 'menu/icon-16-default.png', JText::_('COM_LANGUAGES_HEADING_DEFAULT'), null, true);
+	}
+
+	/**
+	 * Method to generate an input radio button.
+	 *
+	 * @param   integer  $rowNum    The row number.
+	 * @param   string   $language  Language tag.
+	 *
+	 * @return  string	HTML code.
+	 */
+	public static function id($rowNum, $language)
+	{
+		return '<input'
+			. ' type="radio"'
+			. ' id="cb' . $rowNum . '"'
+			. ' name="cid"'
+			. ' value="' . htmlspecialchars($language, ENT_COMPAT, 'UTF-8') . '"'
+			. ' onclick="Joomla.isChecked(this.checked);"'
+			. ' title="' . ($rowNum + 1) . '"'
+			. '/>';
+	}
+
+	/**
+	 * Method to generate an array of clients.
+	 *
+	 * @return  array of client objects.
+	 */
+	public static function clients()
+	{
+		return array(
+			JHtml::_('select.option', 0, JText::_('JSITE')),
+			JHtml::_('select.option', 1, JText::_('JADMINISTRATOR'))
+		);
+	}
+
+	/**
+	 * Returns an array of published state filter options.
+	 *
+	 * @return  string  	The HTML code for the select tag.
+	 *
+	 * @since   1.6
+	 */
+	public static function publishedOptions()
+	{
+		// Build the active state filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '1', 'JPUBLISHED');
+		$options[] = JHtml::_('select.option', '0', 'JUNPUBLISHED');
+		$options[] = JHtml::_('select.option', '-2', 'JTRASHED');
+		$options[] = JHtml::_('select.option', '*', 'JALL');
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_languages/helpers/jsonresponse.php b/core/administrator/components/com_languages/helpers/jsonresponse.php
new file mode 100644
index 00000000..a5ef8f0c
--- /dev/null
+++ b/core/administrator/components/com_languages/helpers/jsonresponse.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * JSON Response class.
+ *
+ * @since       2.5
+ * @deprecated  4.0
+ */
+class JJsonResponse
+{
+	/**
+	 * Determines whether the request was successful.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	public $success = true;
+
+	/**
+	 * Determines whether the request wasn't successful.
+	 * This is always the negation of $this->success,
+	 * so you can use both flags equivalently.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	public $error = false;
+
+	/**
+	 * The main response message.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $message = null;
+
+	/**
+	 * Array of messages gathered in the JApplication object.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $messages = null;
+
+	/**
+	 * The response data.
+	 *
+	 * @var    mixed
+	 * @since  2.5
+	 */
+	public $data = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   mixed    $response  The Response data.
+	 * @param   string   $message   The main response message.
+	 * @param   boolean  $error     True, if the success flag shall be set to false, defaults to false.
+	 *
+	 * @since		2.5
+	 * @deprecated	4.0	 Use JResponseJson instead.
+	 */
+	public function __construct($response = null, $message = null, $error = false)
+	{
+		try
+		{
+			JLog::add(sprintf('%s is deprecated, use JResponseJson instead.', __CLASS__), JLog::WARNING, 'deprecated');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$this->message = $message;
+
+		// Get the message queue.
+		$messages = JFactory::getApplication()->getMessageQueue();
+
+		// Build the sorted messages list.
+		if (is_array($messages) && count($messages))
+		{
+			foreach ($messages as $message)
+			{
+				if (isset($message['type']) && isset($message['message']))
+				{
+					$lists[$message['type']][] = $message['message'];
+				}
+			}
+		}
+
+		// If messages exist add them to the output.
+		if (isset($lists) && is_array($lists))
+		{
+			$this->messages = $lists;
+		}
+
+		// Check if we are dealing with an error.
+		if ($response instanceof Exception)
+		{
+			// Prepare the error response.
+			$this->success = false;
+			$this->error   = true;
+			$this->message = $response->getMessage();
+		}
+		else
+		{
+			// Prepare the response data.
+			$this->success = !$error;
+			$this->error   = $error;
+			$this->data    = $response;
+		}
+	}
+
+	/**
+	 * Magic toString method for sending the response in JSON format.
+	 *
+	 * @return  string  The response in JSON format.
+	 *
+	 * @since   2.5
+	 */
+	public function __toString()
+	{
+		return json_encode($this);
+	}
+}
diff --git a/core/administrator/components/com_languages/helpers/languages.php b/core/administrator/components/com_languages/helpers/languages.php
new file mode 100644
index 00000000..72adc9c4
--- /dev/null
+++ b/core/administrator/components/com_languages/helpers/languages.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages component helper.
+ *
+ * @since  1.6
+ */
+class LanguagesHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName   The name of the active view.
+	 * @param   int     $client  The client id of the active view. Maybe be 0 or 1.
+	 *
+	 * @return  void
+	 *
+	 * @deprecated  4.0 $client parameter is not needed anymore.
+	 */
+	public static function addSubmenu($vName, $client = 0)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_LANGUAGES_SUBMENU_INSTALLED'),
+			'index.php?option=com_languages&view=installed',
+			$vName == 'installed'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_LANGUAGES_SUBMENU_CONTENT'),
+			'index.php?option=com_languages&view=languages',
+			$vName == 'languages'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_LANGUAGES_SUBMENU_OVERRIDES'),
+			'index.php?option=com_languages&view=overrides',
+			$vName == 'overrides'
+		);
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead.
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function.
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions.
+		return JHelperContent::getActions('com_languages');
+	}
+
+	/**
+	 * Method for parsing ini files.
+	 *
+	 * @param   string  $filename  Path and name of the ini file to parse.
+	 *
+	 * @return  array   Array of strings found in the file, the array indices will be the keys. On failure an empty array will be returned.
+	 *
+	 * @since   2.5
+	 */
+	public static function parseFile($filename)
+	{
+		if (!is_file($filename))
+		{
+			return array();
+		}
+
+		$contents = file_get_contents($filename);
+		$contents = str_replace('_QQ_', '"\""', $contents);
+		$strings  = @parse_ini_string($contents);
+
+		if ($strings === false)
+		{
+			return array();
+		}
+
+		return $strings;
+	}
+
+	/**
+	 * Filter method for language keys.
+	 * This method will be called by JForm while filtering the form data.
+	 *
+	 * @param   string  $value  The language key to filter.
+	 *
+	 * @return  string	The filtered language key.
+	 *
+	 * @since		2.5
+	 */
+	public static function filterKey($value)
+	{
+		$filter = JFilterInput::getInstance(null, null, 1, 1);
+
+		return strtoupper($filter->clean($value, 'cmd'));
+	}
+
+	/**
+	 * Filter method for language strings.
+	 * This method will be called by JForm while filtering the form data.
+	 *
+	 * @param   string  $value  The language string to filter.
+	 *
+	 * @return  string	The filtered language string.
+	 *
+	 * @since		2.5
+	 */
+	public static function filterText($value)
+	{
+		$filter = JFilterInput::getInstance(null, null, 1, 1);
+
+		return $filter->clean($value);
+	}
+}
diff --git a/core/administrator/components/com_languages/helpers/multilangstatus.php b/core/administrator/components/com_languages/helpers/multilangstatus.php
new file mode 100644
index 00000000..3c453ae8
--- /dev/null
+++ b/core/administrator/components/com_languages/helpers/multilangstatus.php
@@ -0,0 +1,321 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+use Joomla\Registry\Registry;
+
+/**
+ * Multilang status helper.
+ *
+ * @since  1.7.1
+ */
+abstract class MultilangstatusHelper
+{
+	/**
+	 * Method to get the number of published home pages.
+	 *
+	 * @return  integer
+	 */
+	public static function getHomes()
+	{
+		// Check for multiple Home pages.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from($db->quoteName('#__menu'))
+			->where('home = 1')
+			->where('published = 1')
+			->where('client_id = 0');
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Method to get the number of published language switcher modules.
+	 *
+	 * @return  integer
+	 */
+	public static function getLangswitchers()
+	{
+		// Check if switcher is published.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from($db->quoteName('#__modules'))
+			->where('module = ' . $db->quote('mod_languages'))
+			->where('published = 1')
+			->where('client_id = 0');
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Method to return a list of published content languages.
+	 *
+	 * @return  array of language objects.
+	 */
+	public static function getContentlangs()
+	{
+		// Check for published Content Languages.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.lang_code AS lang_code')
+			->select('a.published AS published')
+			->from('#__languages AS a');
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Method to return a list of published site languages.
+	 *
+	 * @return  array of language extension objects.
+	 *
+	 * @deprecated  4.0  Use JLanguageHelper::getInstalledLanguages(0) instead.
+	 */
+	public static function getSitelangs()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated, use JLanguageHelper::getInstalledLanguages(0) instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return JLanguageHelper::getInstalledLanguages(0);
+	}
+
+	/**
+	 * Method to return a list of language home page menu items.
+	 *
+	 * @return  array of menu objects.
+	 *
+	 * @deprecated  4.0  Use JLanguageMultilang::getSiteHomePages() instead.
+	 */
+	public static function getHomepages()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated, use JLanguageHelper::getSiteHomePages() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return JLanguageMultilang::getSiteHomePages();
+	}
+
+	/**
+	 * Method to return combined language status.
+	 *
+	 * @return  array of language objects.
+	 */
+	public static function getStatus()
+	{
+		// Check for combined status.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Select all fields from the languages table.
+		$query->select('a.*', 'l.home')
+			->select('a.published AS published')
+			->select('a.lang_code AS lang_code')
+			->from('#__languages AS a');
+
+		// Select the language home pages.
+		$query->select('l.home AS home')
+			->select('l.language AS home_language')
+			->join('LEFT', '#__menu AS l ON l.language = a.lang_code AND l.home=1 AND l.published=1 AND l.language <> \'*\'')
+			->select('e.enabled AS enabled')
+			->select('e.element AS element')
+			->join('LEFT', '#__extensions  AS e ON e.element = a.lang_code')
+			->where('e.client_id = 0')
+			->where('e.enabled = 1')
+			->where('e.state = 0');
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Method to return a list of contact objects.
+	 *
+	 * @return  array of contact objects.
+	 */
+	public static function getContacts()
+	{
+		$db = JFactory::getDbo();
+		$languages = count(JLanguageHelper::getLanguages());
+
+		// Get the number of contact with all as language
+		$alang = $db->getQuery(true)
+			->select('count(*)')
+			->from('#__contact_details AS cd')
+			->where('cd.user_id=u.id')
+			->where('cd.published=1')
+			->where('cd.language=' . $db->quote('*'));
+
+		// Get the number of languages for the contact
+		$slang = $db->getQuery(true)
+			->select('count(distinct(l.lang_code))')
+			->from('#__languages as l')
+			->join('LEFT', '#__contact_details AS cd ON cd.language=l.lang_code')
+			->where('cd.user_id=u.id')
+			->where('cd.published=1')
+			->where('l.published=1');
+
+		// Get the number of multiple contact/language
+		$mlang = $db->getQuery(true)
+			->select('count(*)')
+			->from('#__languages as l')
+			->join('LEFT', '#__contact_details AS cd ON cd.language=l.lang_code')
+			->where('cd.user_id=u.id')
+			->where('cd.published=1')
+			->where('l.published=1')
+			->group('l.lang_code')
+			->having('count(*) > 1');
+
+		// Get the contacts
+		$query = $db->getQuery(true)
+			->select('u.name, (' . $alang . ') as alang, (' . $slang . ') as slang, (' . $mlang . ') as mlang')
+			->from('#__users AS u')
+			->join('LEFT', '#__contact_details AS cd ON cd.user_id=u.id')
+			->where('EXISTS (SELECT 1 from #__content as c where  c.created_by=u.id)')
+			->group('u.id');
+
+		$db->setQuery($query);
+		$warnings = $db->loadObjectList();
+
+		foreach ($warnings as $index => $warn)
+		{
+			if ($warn->alang == 1 && $warn->slang == 0)
+			{
+				unset($warnings[$index]);
+			}
+
+			if ($warn->alang == 0 && $warn->slang == 0 && empty($warn->mlang))
+			{
+				unset($warnings[$index]);
+			}
+
+			if ($warn->alang == 0 && $warn->slang == $languages && empty($warn->mlang))
+			{
+				unset($warnings[$index]);
+			}
+		}
+
+		return $warnings;
+	}
+
+	/**
+	 * Method to get the status of the module displaying the menutype of the default Home page set to All languages.
+	 *
+	 * @return  boolean True if the module is published, false otherwise.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getDefaultHomeModule()
+	{
+		// Find Default Home menutype.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn('menutype'))
+			->from($db->qn('#__menu'))
+			->where($db->qn('home') . ' = ' . $db->q('1'))
+			->where($db->qn('published') . ' = ' . $db->q('1'))
+			->where($db->qn('client_id') . ' = ' . $db->q('0'))
+			->where($db->qn('language') . ' = ' . $db->q('*'));
+
+		$db->setQuery($query);
+
+		$menutype = $db->loadResult();
+
+		// Get published site menu modules titles.
+		$query->clear()
+			->select($db->qn('title'))
+			->from($db->qn('#__modules'))
+			->where($db->qn('module') . ' = ' . $db->q('mod_menu'))
+			->where($db->qn('published') . ' = ' . $db->q('1'))
+			->where($db->qn('client_id') . ' = ' . $db->q('0'));
+
+		$db->setQuery($query);
+
+		$menutitles = $db->loadColumn();
+
+		// Do we have a published menu module displaying the default Home menu item set to all languages?
+		foreach ($menutitles as $menutitle)
+		{
+			$module       = self::getModule('mod_menu', $menutitle);
+			$moduleParams = new JRegistry($module->params);
+			$param        = $moduleParams->get('menutype', '');
+
+			if ($param && $param != $menutype)
+			{
+				continue;
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Get module by name
+	 *
+	 * @param   string  $moduleName     The name of the module
+	 * @param   string  $instanceTitle  The title of the module, optional
+	 *
+	 * @return  stdClass  The Module object
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getModule($moduleName, $instanceTitle = null)
+	{
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('id, title, module, position, content, showtitle, params')
+			->from($db->qn('#__modules'))
+			->where($db->qn('module') . ' = ' . $db->q($moduleName))
+			->where($db->qn('published') . ' = ' . $db->q('1'))
+			->where($db->qn('client_id') . ' = ' . $db->q('0'));
+
+		if ($instanceTitle)
+		{
+			$query->where($db->qn('title') . ' = ' . $db->q($instanceTitle));
+		}
+
+		$db->setQuery($query);
+
+		try
+		{
+			$modules = $db->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			JLog::add(JText::sprintf('JLIB_APPLICATION_ERROR_MODULE_LOAD', $e->getMessage()), JLog::WARNING, 'jerror');
+		}
+
+		return $modules;
+	}
+}
diff --git a/core/administrator/components/com_languages/languages.php b/core/administrator/components/com_languages/languages.php
new file mode 100644
index 00000000..219b308e
--- /dev/null
+++ b/core/administrator/components/com_languages/languages.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_languages'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Languages');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_languages/languages.xml b/core/administrator/components/com_languages/languages.xml
new file mode 100644
index 00000000..33e98d4c
--- /dev/null
+++ b/core/administrator/components/com_languages/languages.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_languages</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_LANGUAGES_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>languages.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_languages.ini</language>
+			<language tag="en-GB">language/en-GB.com_languages.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_languages/models/forms/filter_installed.xml b/core/administrator/components/com_languages/models/forms/filter_installed.xml
new file mode 100644
index 00000000..2ab9f1e9
--- /dev/null
+++ b/core/administrator/components/com_languages/models/forms/filter_installed.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="client_id"
+		type="list"
+		onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
+		filtermode="selector"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_LANGUAGES_INSTALLED_FILTER_SEARCH_LABEL"
+			description="COM_LANGUAGES_INSTALLED_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="JGLOBAL_NO_MATCHING_RESULTS"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="name ASC">COM_LANGUAGES_HEADING_LANGUAGE_ASC</option>
+			<option value="name DESC">COM_LANGUAGES_HEADING_LANGUAGE_DESC</option>
+			<option value="nativeName ASC">COM_LANGUAGES_HEADING_TITLE_NATIVE_ASC</option>
+			<option value="nativeName DESC">COM_LANGUAGES_HEADING_TITLE_NATIVE_DESC</option>
+			<option value="language ASC">COM_LANGUAGES_HEADING_LANG_TAG_ASC</option>
+			<option value="language DESC">COM_LANGUAGES_HEADING_LANG_TAG_DESC</option>
+			<option value="published ASC">COM_LANGUAGES_HEADING_DEFAULT_ASC</option>
+			<option value="published DESC">COM_LANGUAGES_HEADING_DEFAULT_DESC</option>
+			<option value="version ASC">COM_LANGUAGES_HEADING_VERSION_ASC</option>
+			<option value="version DESC">COM_LANGUAGES_HEADING_VERSION_DESC</option>
+			<option value="creationDate ASC">COM_LANGUAGES_HEADING_DATE_ASC</option>
+			<option value="creationDate DESC">COM_LANGUAGES_HEADING_DATE_DESC</option>
+			<option value="author ASC">COM_LANGUAGES_HEADING_AUTHOR_ASC</option>
+			<option value="author DESC">COM_LANGUAGES_HEADING_AUTHOR_DESC</option>
+			<option value="authorEmail ASC">COM_LANGUAGES_HEADING_AUTHOR_EMAIL_ASC</option>
+			<option value="authorEmail DESC">COM_LANGUAGES_HEADING_AUTHOR_EMAIL_DESC</option>
+			<option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_languages/models/forms/filter_languages.xml b/core/administrator/components/com_languages/models/forms/filter_languages.xml
new file mode 100644
index 00000000..b770f5b0
--- /dev/null
+++ b/core/administrator/components/com_languages/models/forms/filter_languages.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="JSEARCH_FILTER"
+			description="COM_LANGUAGES_SEARCH_IN_TITLE"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="published"
+			type="status"
+			filter="1,0,-2,*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.ordering ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.title_native ASC">COM_LANGUAGES_HEADING_TITLE_NATIVE_ASC</option>
+			<option value="a.title_native DESC">COM_LANGUAGES_HEADING_TITLE_NATIVE_DESC</option>
+			<option value="a.lang_code ASC">COM_LANGUAGES_HEADING_LANG_TAG_ASC</option>
+			<option value="a.lang_code DESC">COM_LANGUAGES_HEADING_LANG_TAG_DESC</option>
+			<option value="a.sef ASC">COM_LANGUAGES_HEADING_LANG_CODE_ASC</option>
+			<option value="a.sef DESC">COM_LANGUAGES_HEADING_LANG_CODE_DESC</option>
+			<option value="a.image ASC">COM_LANGUAGES_HEADING_LANG_IMAGE_ASC</option>
+			<option value="a.image DESC">COM_LANGUAGES_HEADING_LANG_IMAGE_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="l.home ASC">COM_LANGUAGES_HEADING_HOMEPAGE_ASC</option>
+			<option value="l.home DESC">COM_LANGUAGES_HEADING_HOMEPAGE_DESC</option>
+			<option value="a.lang_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.lang_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_languages/models/forms/language.xml b/core/administrator/components/com_languages/models/forms/language.xml
new file mode 100644
index 00000000..61e900bc
--- /dev/null
+++ b/core/administrator/components/com_languages/models/forms/language.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="lang_id" 
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			default="0"
+			readonly="true"
+		/>
+
+		<field 
+			name="lang_code" 
+			type="text"
+			label="COM_LANGUAGES_FIELD_LANG_TAG_LABEL"
+			description="COM_LANGUAGES_FIELD_LANG_TAG_DESC"
+			maxlength="7"
+			required="true"
+			size="10"
+		/>
+
+		<field 
+			name="title"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="COM_LANGUAGES_FIELD_TITLE_DESC"
+			maxlength="50"
+			required="true"
+			size="40"
+		/>
+
+		<field 
+			name="title_native"
+			type="text"
+			label="COM_LANGUAGES_FIELD_TITLE_NATIVE_LABEL"
+			description="COM_LANGUAGES_FIELD_TITLE_NATIVE_DESC"
+			maxlength="50"
+			required="true"
+			size="40"
+		/>
+
+		<field 
+			name="sef" 
+			type="text"
+			label="COM_LANGUAGES_FIELD_LANG_CODE_LABEL"
+			description="COM_LANGUAGES_FIELD_LANG_CODE_DESC"
+			maxlength="50"
+			required="true"
+			size="10"
+		/>
+
+		<field
+			name="image"
+			type="filelist"
+			label="COM_LANGUAGES_FIELD_IMAGE_LABEL"
+			description="COM_LANGUAGES_FIELD_IMAGE_DESC"
+			stripext="1"
+			directory="media/mod_languages/images/"
+			hide_none="1"
+			hide_default="1"
+			filter="\.gif$"
+			size="10"
+			>
+			<option value="">JNONE</option>
+		</field>
+
+		<field 
+			name="description" 
+			type="textarea"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_LANGUAGES_FIELD_DESCRIPTION_DESC"
+			cols="80"
+			rows="5"
+		/>
+
+		<field 
+			name="published" 
+			type="list"
+			label="JSTATUS"
+			description="COM_LANGUAGES_FIELD_PUBLISHED_DESC"
+			default="1"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+		
+		<field 
+			name="access" 
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+	</fieldset>
+	<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+		<field 
+			name="metakey" 
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field 
+			name="metadesc" 
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
+			rows="3"
+			cols="30"
+		/>
+	</fieldset>
+	<fieldset name="site_name" label="COM_LANGUAGES_FIELDSET_SITE_NAME_LABEL">
+		<field 
+			name="sitename" 
+			type="text"
+			label="COM_LANGUAGES_FIELD_SITE_NAME_LABEL"
+			description="COM_LANGUAGES_FIELD_SITE_NAME_DESC"
+			filter="string"
+			size="50"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_languages/models/forms/override.xml b/core/administrator/components/com_languages/models/forms/override.xml
new file mode 100644
index 00000000..8d1a2ddb
--- /dev/null
+++ b/core/administrator/components/com_languages/models/forms/override.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="key"
+			type="text"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_KEY_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_KEY_DESC"
+			size="60"
+			required="true"
+			filter="LanguagesHelper::filterKey" 
+		/>
+
+		<field
+			name="override"
+			type="textarea"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_DESC"
+			cols="50"
+			rows="5"
+			filter="LanguagesHelper::filterText" 
+		/>
+
+		<field
+			name="both"
+			type="checkbox"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_BOTH_DESC"
+			value="true"
+			filter="boolean" 
+		/>
+
+		<field
+			name="searchstring"
+			type="text"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_DESC"
+			size="50"
+		/>
+
+		<field
+			name="searchtype"
+			type="list"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_DESC"
+			default="value"
+			>
+			<option value="constant">COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_CONSTANT</option>
+			<option value="value">COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_TEXT</option>
+		</field>
+
+		<field 
+			name="language" 
+			type="text"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_DESC"
+			filter="unset"
+			readonly="true"
+			class="readonly"
+			size="50"
+		/>
+
+		<field 
+			name="client" 
+			type="text"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_DESC"
+			filter="unset"
+			readonly="true"
+			class="readonly"
+			size="50"
+		/>
+
+		<field 
+			name="file" 
+			type="text"
+			label="COM_LANGUAGES_OVERRIDE_FIELD_FILE_LABEL"
+			description="COM_LANGUAGES_OVERRIDE_FIELD_FILE_DESC"
+			filter="unset"
+			readonly="true"
+			class="readonly"
+			size="80"
+		/>
+
+		<field
+			name="id"
+			type="hidden"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_languages/models/installed.php b/core/administrator/components/com_languages/models/installed.php
new file mode 100644
index 00000000..23da9a79
--- /dev/null
+++ b/core/administrator/components/com_languages/models/installed.php
@@ -0,0 +1,487 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Languages Component Languages Model
+ *
+ * @since  1.6
+ */
+class LanguagesModelInstalled extends JModelList
+{
+	/**
+	 * @var object client object
+	 * @deprecated 4.0
+	 */
+	protected $client = null;
+
+	/**
+	 * @var object user object
+	 */
+	protected $user = null;
+
+	/**
+	 * @var boolean|JExeption True, if FTP settings should be shown, or an exeption
+	 */
+	protected $ftp = null;
+
+	/**
+	 * @var string option name
+	 */
+	protected $option = null;
+
+	/**
+	 * @var array languages description
+	 */
+	protected $data = null;
+
+	/**
+	 * @var int total number pf languages
+	 */
+	protected $total = null;
+
+	/**
+	 * @var int total number pf languages installed
+	 * @deprecated 4.0
+	 */
+	protected $langlist = null;
+
+	/**
+	 * @var string language path
+	 */
+	protected $path = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.5
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'name',
+				'nativeName',
+				'language',
+				'author',
+				'published',
+				'version',
+				'creationDate',
+				'author',
+				'authorEmail',
+				'extension_id',
+				'client_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'name', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		// Special case for client id.
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$clientId = (!in_array($clientId, array (0, 1))) ? 0 : $clientId;
+		$this->setState('client_id', $clientId);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_languages');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id	.= ':' . $this->getState('client_id');
+		$id	.= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to get the client object.
+	 *
+	 * @return  object
+	 *
+	 * @since   1.6
+	 */
+	public function getClient()
+	{
+		return JApplicationHelper::getClientInfo($this->getState('client_id', 0));
+	}
+
+	/**
+	 * Method to get the ftp credentials.
+	 *
+	 * @return  object
+	 *
+	 * @since   1.6
+	 */
+	public function getFtp()
+	{
+		if (is_null($this->ftp))
+		{
+			$this->ftp = JClientHelper::setCredentialsFromRequest('ftp');
+		}
+
+		return $this->ftp;
+	}
+
+	/**
+	 * Method to get the option.
+	 *
+	 * @return  object
+	 *
+	 * @since   1.6
+	 */
+	public function getOption()
+	{
+		$option = $this->getState('option');
+
+		return $option;
+	}
+
+	/**
+	 * Method to get Languages item data.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getData()
+	{
+		// Fetch language data if not fetched yet.
+		if (is_null($this->data))
+		{
+			$this->data = array();
+
+			$isCurrentLanguageRtl = JFactory::getLanguage()->isRtl();
+			$params               = JComponentHelper::getParams('com_languages');
+			$installedLanguages   = JLanguageHelper::getInstalledLanguages(null, true, true, null, null, null);
+
+			// Compute all the languages.
+			foreach ($installedLanguages as $clientId => $languages)
+			{
+				$defaultLanguage = $params->get(JApplicationHelper::getClientInfo($clientId)->name, 'en-GB');
+
+				foreach ($languages as $lang)
+				{
+					$row               = new stdClass;
+					$row->language     = $lang->element;
+					$row->name         = $lang->metadata['name'];
+					$row->nativeName   = isset($lang->metadata['nativeName']) ? $lang->metadata['nativeName'] : '-';
+					$row->client_id    = (int) $lang->client_id;
+					$row->extension_id = (int) $lang->extension_id;
+					$row->author       = $lang->manifest['author'];
+					$row->creationDate = $lang->manifest['creationDate'];
+					$row->authorEmail  = $lang->manifest['authorEmail'];
+					$row->version      = $lang->manifest['version'];
+					$row->published    = $defaultLanguage === $row->language ? 1 : 0;
+					$row->checked_out  = 0;
+
+					// Fix wrongly set parentheses in RTL languages
+					if ($isCurrentLanguageRtl)
+					{
+						$row->name       = html_entity_decode($row->name . '&#x200E;', ENT_QUOTES, 'UTF-8');
+						$row->nativeName = html_entity_decode($row->nativeName . '&#x200E;', ENT_QUOTES, 'UTF-8');
+					}
+
+					$this->data[] = $row;
+				}
+			}
+		}
+
+		$installedLanguages = array_merge($this->data);
+
+		// Process filters.
+		$clientId = (int) $this->getState('client_id');
+		$search   = $this->getState('filter.search');
+
+		foreach ($installedLanguages as $key => $installedLanguage)
+		{
+			// Filter by client id.
+			if (in_array($clientId, array(0, 1)))
+			{
+				if ($installedLanguage->client_id !== $clientId)
+				{
+					unset($installedLanguages[$key]);
+					continue;
+				}
+			}
+
+			// Filter by search term.
+			if (!empty($search))
+			{
+				if (stripos($installedLanguage->name, $search) === false
+					&& stripos($installedLanguage->nativeName, $search) === false
+					&& stripos($installedLanguage->language, $search) === false)
+				{
+					unset($installedLanguages[$key]);
+					continue;
+				}
+			}
+		}
+
+		// Process ordering.
+		$listOrder = $this->getState('list.ordering', 'name');
+		$listDirn  = $this->getState('list.direction', 'ASC');
+		$installedLanguages = ArrayHelper::sortObjects($installedLanguages, $listOrder, strtolower($listDirn) === 'desc' ? -1 : 1, true, true);
+
+		// Process pagination.
+		$limit = (int) $this->getState('list.limit', 25);
+
+		// Sets the total for pagination.
+		$this->total = count($installedLanguages);
+
+		if ($limit !== 0)
+		{
+			$start = (int) $this->getState('list.start', 0);
+
+			return array_slice($installedLanguages, $start, $limit);
+		}
+
+		return $installedLanguages;
+	}
+
+	/**
+	 * Method to get installed languages data.
+	 *
+	 * @return  string	An SQL query.
+	 *
+	 * @since   1.6
+	 *
+	 * @deprecated   4.0
+	 */
+	protected function getLanguageList()
+	{
+		// Create a new db object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$client = $this->getState('client_id');
+		$type = 'language';
+
+		// Select field element from the extensions table.
+		$query->select($this->getState('list.select', 'a.element'))
+			->from('#__extensions AS a');
+
+		$type = $db->quote($type);
+		$query->where('(a.type = ' . $type . ')')
+			->where('state = 0')
+			->where('enabled = 1')
+			->where('client_id=' . (int) $client);
+
+		// For client_id = 1 do we need to check language table also?
+		$db->setQuery($query);
+
+		$this->langlist = $db->loadColumn();
+
+		return $this->langlist;
+	}
+
+	/**
+	 * Method to get the total number of Languages items.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.6
+	 */
+	public function getTotal()
+	{
+		if (is_null($this->total))
+		{
+			$this->getData();
+		}
+
+		return $this->total;
+	}
+
+	/**
+	 * Method to set the default language.
+	 *
+	 * @param   integer  $cid  Id of the language to publish.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function publish($cid)
+	{
+		if ($cid)
+		{
+			$client = $this->getClient();
+
+			$params = JComponentHelper::getParams('com_languages');
+			$params->set($client->name, $cid);
+
+			$table = JTable::getInstance('extension');
+			$id    = $table->find(array('element' => 'com_languages'));
+
+			// Load.
+			if (!$table->load($id))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			$table->params = (string) $params;
+
+			// Pre-save checks.
+			if (!$table->check())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Save the changes.
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+		else
+		{
+			$this->setError(JText::_('COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED'));
+
+			return false;
+		}
+
+		// Clean the cache of com_languages and component cache.
+		$this->cleanCache();
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+
+		return true;
+	}
+
+	/**
+	 * Method to get the folders.
+	 *
+	 * @return  array  Languages folders.
+	 *
+	 * @since   1.6
+	 */
+	protected function getFolders()
+	{
+		if (is_null($this->folders))
+		{
+			$path = $this->getPath();
+			jimport('joomla.filesystem.folder');
+			$this->folders = JFolder::folders($path, '.', false, false, array('.svn', 'CVS', '.DS_Store', '__MACOSX', 'pdf_fonts', 'overrides'));
+		}
+
+		return $this->folders;
+	}
+
+	/**
+	 * Method to get the path.
+	 *
+	 * @return  string	The path to the languages folders.
+	 *
+	 * @since   1.6
+	 */
+	protected function getPath()
+	{
+		if (is_null($this->path))
+		{
+			$client     = $this->getClient();
+			$this->path = JLanguageHelper::getLanguagePath($client->path);
+		}
+
+		return $this->path;
+	}
+
+	/**
+	 * Method to compare two languages in order to sort them.
+	 *
+	 * @param   object  $lang1  The first language.
+	 * @param   object  $lang2  The second language.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.6
+	 *
+	 * @deprecated   4.0
+	 */
+	protected function compareLanguages($lang1, $lang2)
+	{
+		return strcmp($lang1->name, $lang2->name);
+	}
+
+	/**
+	 * Method to switch the administrator language.
+	 *
+	 * @param   string  $cid  The language tag.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function switchAdminLanguage($cid)
+	{
+		if ($cid)
+		{
+			$client = $this->getClient();
+
+			if ($client->name == 'administrator')
+			{
+				JFactory::getApplication()->setUserState('application.lang', $cid);
+			}
+		}
+		else
+		{
+			JError::raiseWarning(500, JText::_('COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED'));
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_languages/models/language.php b/core/administrator/components/com_languages/models/language.php
new file mode 100644
index 00000000..92416726
--- /dev/null
+++ b/core/administrator/components/com_languages/models/language.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Languages Component Language Model
+ *
+ * @since  1.5
+ */
+class LanguagesModelLanguage extends JModelAdmin
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'event_after_save'  => 'onExtensionAfterSave',
+				'event_before_save' => 'onExtensionBeforeSave',
+				'events_map'        => array(
+					'save' => 'extension'
+				)
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Override to get the table.
+	 *
+	 * @param   string  $name     Name of the table.
+	 * @param   string  $prefix   Table name prefix.
+	 * @param   array   $options  Array of options.
+	 *
+	 * @return  JTable
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($name = '', $prefix = '', $options = array())
+	{
+		return JTable::getInstance('Language');
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app    = JFactory::getApplication('administrator');
+		$params = JComponentHelper::getParams('com_languages');
+
+		// Load the User state.
+		$langId = $app->input->getInt('lang_id');
+		$this->setState('language.id', $langId);
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get a member item.
+	 *
+	 * @param   integer  $langId  The id of the member to get.
+	 *
+	 * @return  mixed  User data object on success, false on failure.
+	 *
+	 * @since   1.0
+	 */
+	public function getItem($langId = null)
+	{
+		$langId = (!empty($langId)) ? $langId : (int) $this->getState('language.id');
+
+		// Get a member row instance.
+		$table = $this->getTable();
+
+		// Attempt to load the row.
+		$return = $table->load($langId);
+
+		// Check for a table object error.
+		if ($return === false && $table->getError())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Set a valid accesslevel in case '0' is stored due to a bug in the installation SQL (was fixed with PR 2714).
+		if ($table->access == '0')
+		{
+			$table->access = (int) JFactory::getConfig()->get('access');
+		}
+
+		$properties = $table->getProperties(1);
+		$value      = ArrayHelper::toObject($properties, 'JObject');
+
+		return $value;
+	}
+
+	/**
+	 * Method to get the group form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_languages.language', 'language', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_languages.edit.language.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_languages.language', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$langId = (!empty($data['lang_id'])) ? $data['lang_id'] : (int) $this->getState('language.id');
+		$isNew  = true;
+
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		$table   = $this->getTable();
+		$context = $this->option . '.' . $this->name;
+
+		// Load the row if saving an existing item.
+		if ($langId > 0)
+		{
+			$table->load($langId);
+			$isNew = false;
+		}
+
+		// Prevent white spaces, including East Asian double bytes.
+		$spaces = array('/\xE3\x80\x80/', ' ');
+
+		$data['lang_code'] = str_replace($spaces, '', $data['lang_code']);
+
+		// Prevent saving an incorrect language tag
+		if (!preg_match('#\b([a-z]{2,3})[-]([A-Z]{2})\b#', $data['lang_code']))
+		{
+			$this->setError(JText::_('COM_LANGUAGES_ERROR_LANG_TAG'));
+
+			return false;
+		}
+
+		$data['sef'] = str_replace($spaces, '', $data['sef']);
+		$data['sef'] = JApplicationHelper::stringURLSafe($data['sef']);
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before save event.
+		$result = $dispatcher->trigger($this->event_before_save, array($context, &$table, $isNew));
+
+		// Check the event responses.
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Store the data.
+		if (!$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger($this->event_after_save, array($context, &$table, $isNew));
+
+		$this->setState('language.id', $table->lang_id);
+
+		// Clean the cache.
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Custom clean cache method.
+	 *
+	 * @param   string   $group      Optional cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('_system');
+		parent::cleanCache('com_languages');
+	}
+}
diff --git a/core/administrator/components/com_languages/models/languages.php b/core/administrator/components/com_languages/models/languages.php
new file mode 100644
index 00000000..2cf61483
--- /dev/null
+++ b/core/administrator/components/com_languages/models/languages.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Model Class
+ *
+ * @since  1.6
+ */
+class LanguagesModelLanguages extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'lang_id', 'a.lang_id',
+				'lang_code', 'a.lang_code',
+				'title', 'a.title',
+				'title_native', 'a.title_native',
+				'sef', 'a.sef',
+				'image', 'a.image',
+				'published', 'a.published',
+				'ordering', 'a.ordering',
+				'access', 'a.access', 'access_level',
+				'home', 'l.home',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.ordering', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_languages');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.published');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return  string    An SQL query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select all fields from the languages table.
+		$query->select($this->getState('list.select', 'a.*', 'l.home'))
+			->from($db->quoteName('#__languages') . ' AS a');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Select the language home pages.
+		$query->select('l.home AS home')
+			->join('LEFT', $db->quoteName('#__menu') . ' AS l  ON  l.language = a.lang_code AND l.home=1  AND l.language <> ' . $db->quote('*'));
+
+		// Filter on the published state.
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.published IN (0, 1))');
+		}
+
+		// Filter by search in title.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where('(a.title LIKE ' . $search . ')');
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Set the published language(s).
+	 *
+	 * @param   array    $cid    An array of language IDs.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function setPublished($cid, $value = 0)
+	{
+		return JTable::getInstance('Language')->publish($cid, $value);
+	}
+
+	/**
+	 * Method to delete records.
+	 *
+	 * @param   array  $pks  An array of item primary keys.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function delete($pks)
+	{
+		// Sanitize the array.
+		$pks = (array) $pks;
+
+		// Get a row instance.
+		$table = JTable::getInstance('Language');
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $itemId)
+		{
+			if (!$table->delete((int) $itemId))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clean the cache.
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Custom clean cache method, 2 places for 2 clients.
+	 *
+	 * @param   string   $group      Optional cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('_system');
+		parent::cleanCache('com_languages');
+	}
+}
diff --git a/core/administrator/components/com_languages/models/override.php b/core/administrator/components/com_languages/models/override.php
new file mode 100644
index 00000000..29682a48
--- /dev/null
+++ b/core/administrator/components/com_languages/models/override.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Override Model
+ *
+ * @since  2.5
+ */
+class LanguagesModelOverride extends JModelAdmin
+{
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed A JForm object on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_languages.override', 'override', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$client   = $this->getState('filter.client', 'site');
+		$language = $this->getState('filter.language', 'en-GB');
+		$langName = JLanguage::getInstance($language)->getName();
+
+		if (!$langName)
+		{
+			// If a language only exists in frontend, its metadata cannot be
+			// loaded in backend at the moment, so fall back to the language tag.
+			$langName = $language;
+		}
+
+		$form->setValue('client', null, JText::_('COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_' . strtoupper($client)));
+		$form->setValue('language', null, JText::sprintf('COM_LANGUAGES_VIEW_OVERRIDE_LANGUAGE', $langName, $language));
+		$form->setValue('file', null, JPath::clean(constant('JPATH_' . strtoupper($client)) . '/language/overrides/' . $language . '.override.ini'));
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed The data for the form.
+	 *
+	 * @since   2.5
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_languages.edit.override.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_languages.override', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   string  $pk  The key name.
+	 *
+	 * @return  mixed  	Object on success, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function getItem($pk = null)
+	{
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+
+		$input    = JFactory::getApplication()->input;
+		$pk       = (!empty($pk)) ? $pk : $input->get('id');
+		$filename = constant('JPATH_' . strtoupper($this->getState('filter.client')))
+			. '/language/overrides/' . $this->getState('filter.language', 'en-GB') . '.override.ini';
+		$strings = LanguagesHelper::parseFile($filename);
+
+		$result = new stdClass;
+		$result->key      = '';
+		$result->override = '';
+
+		if (isset($strings[$pk]))
+		{
+			$result->key      = $pk;
+			$result->override = $strings[$pk];
+		}
+
+		$opposite_filename = constant('JPATH_' . strtoupper($this->getState('filter.client') == 'site' ? 'administrator' : 'site'))
+			. '/language/overrides/' . $this->getState('filter.language', 'en-GB') . '.override.ini';
+		$opposite_strings = LanguagesHelper::parseFile($opposite_filename);
+		$result->both = isset($opposite_strings[$pk]) && ($opposite_strings[$pk] == $strings[$pk]);
+
+		return $result;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array    $data             The form data.
+	 * @param   boolean  $opposite_client  Indicates whether the override should not be created for the current client.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function save($data, $opposite_client = false)
+	{
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+		jimport('joomla.filesystem.file');
+
+		$app = JFactory::getApplication();
+
+		$client   = $app->getUserState('com_languages.overrides.filter.client', 0);
+		$language = $app->getUserState('com_languages.overrides.filter.language', 'en-GB');
+
+		// If the override should be created for both.
+		if ($opposite_client)
+		{
+			$client = 1 - $client;
+		}
+
+		// Return false if the constant is a reserved word, i.e. YES, NO, NULL, FALSE, ON, OFF, NONE, TRUE
+		$blacklist = array('YES', 'NO', 'NULL', 'FALSE', 'ON', 'OFF', 'NONE', 'TRUE');
+
+		if (in_array($data['key'], $blacklist))
+		{
+			$this->setError(JText::_('COM_LANGUAGES_OVERRIDE_ERROR_RESERVED_WORDS'));
+
+			return false;
+		}
+
+		$client = $client ? 'administrator' : 'site';
+
+		// Parse the override.ini file in oder to get the keys and strings.
+		$filename = constant('JPATH_' . strtoupper($client)) . '/language/overrides/' . $language . '.override.ini';
+		$strings  = LanguagesHelper::parseFile($filename);
+
+		if (isset($strings[$data['id']]))
+		{
+			// If an existent string was edited check whether
+			// the name of the constant is still the same.
+			if ($data['key'] == $data['id'])
+			{
+				// If yes, simply override it.
+				$strings[$data['key']] = $data['override'];
+			}
+			else
+			{
+				// If no, delete the old string and prepend the new one.
+				unset($strings[$data['id']]);
+				$strings = array($data['key'] => $data['override']) + $strings;
+			}
+		}
+		else
+		{
+			// If it is a new override simply prepend it.
+			$strings = array($data['key'] => $data['override']) + $strings;
+		}
+
+		// Write override.ini file with the strings.
+		if (JLanguageHelper::saveToIniFile($filename, $strings) === false)
+		{
+			return false;
+		}
+
+		// If the override should be stored for both clients save
+		// it also for the other one and prevent endless recursion.
+		if (isset($data['both']) && $data['both'] && !$opposite_client)
+		{
+			return $this->save($data, true);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication();
+
+		$client = $app->getUserStateFromRequest('com_languages.overrides.filter.client', 'filter_client', 0, 'int') ? 'administrator' : 'site';
+		$this->setState('filter.client', $client);
+
+		$language = $app->getUserStateFromRequest('com_languages.overrides.filter.language', 'filter_language', 'en-GB', 'cmd');
+		$this->setState('filter.language', $language);
+	}
+}
diff --git a/core/administrator/components/com_languages/models/overrides.php b/core/administrator/components/com_languages/models/overrides.php
new file mode 100644
index 00000000..a7baba6a
--- /dev/null
+++ b/core/administrator/components/com_languages/models/overrides.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Overrides Model
+ *
+ * @since  2.5
+ */
+class LanguagesModelOverrides extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   2.5
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->filter_fields = array('key', 'text');
+	}
+
+	/**
+	 * Retrieves the overrides data
+	 *
+	 * @param   boolean  $all  True if all overrides shall be returned without considering pagination, defaults to false
+	 *
+	 * @return  array  Array of objects containing the overrides of the override.ini file
+	 *
+	 * @since   2.5
+	 */
+	public function getOverrides($all = false)
+	{
+		// Get a storage key.
+		$store = $this->getStoreId();
+
+		// Try to load the data from internal storage.
+		if (!empty($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		$client = in_array($this->state->get('filter.client'), array(0, 'site')) ? 'SITE' : 'ADMINISTRATOR';
+
+		// Parse the override.ini file in order to get the keys and strings.
+		$filename = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';
+		$strings = LanguagesHelper::parseFile($filename);
+
+		// Delete the override.ini file if empty.
+		if (file_exists($filename) && empty($strings))
+		{
+			JFile::delete($filename);
+		}
+
+		// Filter the loaded strings according to the search box.
+		$search = $this->getState('filter.search');
+
+		if ($search != '')
+		{
+			$search = preg_quote($search, '~');
+			$matchvals = preg_grep('~' . $search . '~i', $strings);
+			$matchkeys = array_intersect_key($strings, array_flip(preg_grep('~' . $search . '~i',  array_keys($strings))));
+			$strings = array_merge($matchvals, $matchkeys);
+		}
+
+		// Consider the ordering
+		if ($this->getState('list.ordering') == 'text')
+		{
+			if (strtoupper($this->getState('list.direction')) == 'DESC')
+			{
+				arsort($strings);
+			}
+			else
+			{
+				asort($strings);
+			}
+		}
+		else
+		{
+			if (strtoupper($this->getState('list.direction')) == 'DESC')
+			{
+				krsort($strings);
+			}
+			else
+			{
+				ksort($strings);
+			}
+		}
+
+		// Consider the pagination.
+		if (!$all && $this->getState('list.limit') && $this->getTotal() > $this->getState('list.limit'))
+		{
+			$strings = array_slice($strings, $this->getStart(), $this->getState('list.limit'), true);
+		}
+
+		// Add the items to the internal cache.
+		$this->cache[$store] = $strings;
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Method to get the total number of overrides.
+	 *
+	 * @return  integer  The total number of overrides.
+	 *
+	 * @since   2.5
+	 */
+	public function getTotal()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId('getTotal');
+
+		// Try to load the data from internal storage
+		if (!empty($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		// Add the total to the internal cache.
+		$this->cache[$store] = count($this->getOverrides(true));
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState($ordering = 'key', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		// Use default language of frontend for default filter.
+		$default = JComponentHelper::getParams('com_languages')->get('site') . '0';
+
+		$old_language_client = $app->getUserState('com_languages.overrides.filter.language_client', '');
+		$language_client     = $this->getUserStateFromRequest('com_languages.overrides.filter.language_client', 'filter_language_client', $default, 'cmd');
+
+		if ($old_language_client != $language_client)
+		{
+			$client   = substr($language_client, -1);
+			$language = substr($language_client, 0, -1);
+		}
+		else
+		{
+			$client   = $app->getUserState('com_languages.overrides.filter.client', 0);
+			$language = $app->getUserState('com_languages.overrides.filter.language', 'en-GB');
+		}
+
+		// Sets the search filter.
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$this->setState('filter.language_client', $language . $client);
+		$this->setState('filter.client', $client ? 'administrator' : 'site');
+		$this->setState('filter.language', $language);
+
+		// Add filters to the session because they won't be stored there by 'getUserStateFromRequest' if they aren't in the current request.
+		$app->setUserState('com_languages.overrides.filter.client', $client);
+		$app->setUserState('com_languages.overrides.filter.language', $language);
+
+		// List state information
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get all found languages of frontend and backend.
+	 *
+	 * The resulting array has entries of the following style:
+	 * <Language Tag>0|1 => <Language Name> - <Client Name>
+	 *
+	 * @return  array  Sorted associative array of languages.
+	 *
+	 * @since   2.5
+	 */
+	public function getLanguages()
+	{
+		// Try to load the data from internal storage.
+		if (!empty($this->cache['languages']))
+		{
+			return $this->cache['languages'];
+		}
+
+		// Get all languages of frontend and backend.
+		$languages       = array();
+		$site_languages  = JLanguageHelper::getKnownLanguages(JPATH_SITE);
+		$admin_languages = JLanguageHelper::getKnownLanguages(JPATH_ADMINISTRATOR);
+
+		// Create a single array of them.
+		foreach ($site_languages as $tag => $language)
+		{
+			$languages[$tag . '0'] = JText::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], JText::_('JSITE'));
+		}
+
+		foreach ($admin_languages as $tag => $language)
+		{
+			$languages[$tag . '1'] = JText::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM', $language['name'], JText::_('JADMINISTRATOR'));
+		}
+
+		// Sort it by language tag and by client after that.
+		ksort($languages);
+
+		// Add the languages to the internal cache.
+		$this->cache['languages'] = $languages;
+
+		return $this->cache['languages'];
+	}
+
+	/**
+	 * Method to delete one or more overrides.
+	 *
+	 * @param   array  $cids  Array of keys to delete.
+	 *
+	 * @return  integer  Number of successfully deleted overrides, boolean false if an error occurred.
+	 *
+	 * @since   2.5
+	 */
+	public function delete($cids)
+	{
+		// Check permissions first.
+		if (!JFactory::getUser()->authorise('core.delete', 'com_languages'))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		jimport('joomla.filesystem.file');
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+
+		$filterclient = JFactory::getApplication()->getUserState('com_languages.overrides.filter.client');
+		$client = $filterclient == 0 ? 'SITE' : 'ADMINISTRATOR';
+
+		// Parse the override.ini file in oder to get the keys and strings.
+		$filename = constant('JPATH_' . $client) . '/language/overrides/' . $this->getState('filter.language') . '.override.ini';
+		$strings = LanguagesHelper::parseFile($filename);
+
+		// Unset strings that shall be deleted
+		foreach ($cids as $key)
+		{
+			if (isset($strings[$key]))
+			{
+				unset($strings[$key]);
+			}
+		}
+
+		// Write override.ini file with the strings.
+		if (JLanguageHelper::saveToIniFile($filename, $strings) === false)
+		{
+			return false;
+		}
+
+		$this->cleanCache();
+
+		return count($cids);
+	}
+
+	/**
+	 * Removes all of the cached strings from the table.
+	 *
+	 * @return  boolean  result of operation
+	 *
+	 * @since   3.4.2
+	 */
+	public function purge()
+	{
+		$db = JFactory::getDbo();
+
+		// Note: TRUNCATE is a DDL operation
+		// This may or may not mean depending on your database
+		try
+		{
+			$db->truncateTable('#__overrider');
+		}
+		catch (RuntimeException $e)
+		{
+			return $e;
+		}
+
+		JFactory::getApplication()->enqueueMessage(JText::_('COM_LANGUAGES_VIEW_OVERRIDES_PURGE_SUCCESS'));
+	}
+}
diff --git a/core/administrator/components/com_languages/models/strings.php b/core/administrator/components/com_languages/models/strings.php
new file mode 100644
index 00000000..a0e5751d
--- /dev/null
+++ b/core/administrator/components/com_languages/models/strings.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Languages Strings Model
+ *
+ * @since  2.5
+ */
+class LanguagesModelStrings extends JModelLegacy
+{
+	/**
+	 * Method for refreshing the cache in the database with the known language strings.
+	 *
+	 * @return  boolean  True on success, Exception object otherwise.
+	 *
+	 * @since		2.5
+	 */
+	public function refresh()
+	{
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+
+		$app = JFactory::getApplication();
+
+		$app->setUserState('com_languages.overrides.cachedtime', null);
+
+		// Empty the database cache first.
+		try
+		{
+			$this->_db->setQuery('TRUNCATE TABLE ' . $this->_db->quoteName('#__overrider'));
+			$this->_db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			return $e;
+		}
+
+		// Create the insert query.
+		$query = $this->_db->getQuery(true)
+			->insert($this->_db->quoteName('#__overrider'))
+			->columns('constant, string, file');
+
+		// Initialize some variables.
+		$client   = $app->getUserState('com_languages.overrides.filter.client', 'site') ? 'administrator' : 'site';
+		$language = $app->getUserState('com_languages.overrides.filter.language', 'en-GB');
+
+		$base = constant('JPATH_' . strtoupper($client));
+		$path = $base . '/language/' . $language;
+
+		$files = array();
+
+		// Parse common language directory.
+		jimport('joomla.filesystem.folder');
+
+		if (is_dir($path))
+		{
+			$files = JFolder::files($path, $language . '.*ini$', false, true);
+		}
+
+		// Parse language directories of components.
+		$files = array_merge($files, JFolder::files($base . '/components', $language . '.*ini$', 3, true));
+
+		// Parse language directories of modules.
+		$files = array_merge($files, JFolder::files($base . '/modules', $language . '.*ini$', 3, true));
+
+		// Parse language directories of templates.
+		$files = array_merge($files, JFolder::files($base . '/templates', $language . '.*ini$', 3, true));
+
+		// Parse language directories of plugins.
+		$files = array_merge($files, JFolder::files(JPATH_PLUGINS, $language . '.*ini$', 4, true));
+
+		// Parse all found ini files and add the strings to the database cache.
+		foreach ($files as $file)
+		{
+			$strings = LanguagesHelper::parseFile($file);
+
+			if ($strings && count($strings))
+			{
+				$query->clear('values');
+
+				foreach ($strings as $key => $string)
+				{
+					$query->values($this->_db->quote($key) . ',' . $this->_db->quote($string) . ',' . $this->_db->quote(JPath::clean($file)));
+				}
+
+				try
+				{
+					$this->_db->setQuery($query);
+					$this->_db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					return $e;
+				}
+			}
+		}
+
+		// Update the cached time.
+		$app->setUserState('com_languages.overrides.cachedtime.' . $client . '.' . $language, time());
+
+		return true;
+	}
+
+	/**
+	 * Method for searching language strings.
+	 *
+	 * @return  array  Array of resuls on success, Exception object otherwise.
+	 *
+	 * @since		2.5
+	 */
+	public function search()
+	{
+		$results = array();
+		$input   = JFactory::getApplication()->input;
+		$filter  = JFilterInput::getInstance();
+		$searchTerm = $input->getString('searchstring');
+
+		$limitstart = $input->getInt('more');
+
+		try
+		{
+			$searchstring = $this->_db->quote('%' . $filter->clean($searchTerm, 'TRIM') . '%');
+
+			// Create the search query.
+			$query = $this->_db->getQuery(true)
+				->select('constant, string, file')
+				->from($this->_db->quoteName('#__overrider'));
+
+			if ($input->get('searchtype') == 'constant')
+			{
+				$query->where('constant LIKE ' . $searchstring);
+			}
+			else
+			{
+				$query->where('string LIKE ' . $searchstring);
+			}
+
+			// Consider the limitstart according to the 'more' parameter and load the results.
+			$this->_db->setQuery($query, $limitstart, 10);
+			$results['results'] = $this->_db->loadObjectList();
+
+			// Check whether there are more results than already loaded.
+			$query->clear('select')->clear('limit')
+				->select('COUNT(id)');
+			$this->_db->setQuery($query);
+
+			if ($this->_db->loadResult() > $limitstart + 10)
+			{
+				// If this is set a 'More Results' link will be displayed in the view.
+				$results['more'] = $limitstart + 10;
+			}
+		}
+		catch (RuntimeException $e)
+		{
+			return $e;
+		}
+
+		return $results;
+	}
+}
diff --git a/core/administrator/components/com_languages/views/installed/tmpl/default.php b/core/administrator/components/com_languages/views/installed/tmpl/default.php
new file mode 100644
index 00000000..e445862f
--- /dev/null
+++ b/core/administrator/components/com_languages/views/installed/tmpl/default.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Add specific helper files for html generation
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed'); ?>" method="post" id="adminForm" name="adminForm">
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->total > 0) : ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th width="1%">
+						&#160;
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'name', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_TITLE_NATIVE', 'nativeName', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_TAG', 'language', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_DEFAULT', 'published', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_VERSION', 'version', $listDirn, $listOrder); ?>
+					</th>
+					<th class="hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_DATE', 'creationDate', $listDirn, $listOrder); ?>
+					</th>
+					<th class="hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_AUTHOR', 'author', $listDirn, $listOrder); ?>
+					</th>
+					<th class="hidden-phone hidden-tablet">
+						<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_AUTHOR_EMAIL', 'authorEmail', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="10">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php
+			$version = new JVersion;
+			$currentShortVersion = preg_replace('#^([0-9\.]+)(|.*)$#', '$1', $version->getShortVersion());
+			foreach ($this->rows as $i => $row) :
+				$canCreate = $user->authorise('core.create',     'com_languages');
+				$canEdit   = $user->authorise('core.edit',       'com_languages');
+				$canChange = $user->authorise('core.edit.state', 'com_languages');
+			?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td>
+						<?php echo JHtml::_('languages.id', $i, $row->language); ?>
+					</td>
+					<td>
+						<label for="cb<?php echo $i; ?>">
+							<?php echo $this->escape($row->name); ?>
+						</label>
+					</td>
+					<td class="hidden-phone">
+						<?php echo $this->escape($row->nativeName); ?>
+					</td>
+					<td>
+						<?php echo $this->escape($row->language); ?>
+					</td>
+					<td class="center">
+						<?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published && $canChange); ?>
+					</td>
+					<td class="center small">
+					<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
+					<?php // Display a Note if language pack version is not equal to Joomla version ?>
+					<?php if (strpos($row->version, $minorVersion) !== 0 || strpos($row->version, $currentShortVersion) !== 0) : ?>
+						<span class="label label-warning hasTooltip" title="<?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $row->version; ?></span>
+					<?php else : ?>
+						<span class="label label-success"><?php echo $row->version; ?></span>
+					<?php endif; ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo $this->escape($row->creationDate); ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo $this->escape($row->author); ?>
+					</td>
+					<td class="hidden-phone hidden-tablet">
+						<?php echo JStringPunycode::emailToUTF8($this->escape($row->authorEmail)); ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo $this->escape($row->extension_id); ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_languages/views/installed/tmpl/default.xml b/core/administrator/components/com_languages/views/installed/tmpl/default.xml
new file mode 100755
index 00000000..3c92e7d9
--- /dev/null
+++ b/core/administrator/components/com_languages/views/installed/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_languages/views/installed/view.html.php b/core/administrator/components/com_languages/views/installed/view.html.php
new file mode 100644
index 00000000..9f5fcae7
--- /dev/null
+++ b/core/administrator/components/com_languages/views/installed/view.html.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Displays a list of the installed languages.
+ *
+ * @since  1.6
+ */
+class LanguagesViewInstalled extends JViewLegacy
+{
+	/**
+	 * @var object client object.
+	 * @deprecated 4.0
+	 */
+	protected $client = null;
+
+	/**
+	 * @var boolean|JException True, if FTP settings should be shown, or an exception.
+	 */
+	protected $ftp = null;
+
+	/**
+	 * @var string option name.
+	 */
+	protected $option = null;
+
+	/**
+	 * @var object pagination information.
+	 */
+	protected $pagination = null;
+
+	/**
+	 * @var array languages information.
+	 */
+	protected $rows = null;
+
+	/**
+	 * @var object user object
+	 */
+	protected $user = null;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->ftp           = $this->get('Ftp');
+		$this->option        = $this->get('Option');
+		$this->pagination    = $this->get('Pagination');
+		$this->rows          = $this->get('Data');
+		$this->total         = $this->get('Total');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		LanguagesHelper::addSubmenu('installed');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_languages');
+
+		if ((int) $this->state->get('client_id') === 1)
+		{
+			JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_ADMIN_TITLE'), 'comments-2 langmanager');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE'), 'comments-2 langmanager');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::makeDefault('installed.setDefault');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			// Add install languages link to the lang installer component.
+			$bar = JToolbar::getInstance('toolbar');
+
+			// Switch administrator language
+			if ($this->state->get('client_id', 0) == 1)
+			{
+				JToolbarHelper::custom('installed.switchadminlanguage', 'refresh', 'refresh', 'COM_LANGUAGES_SWITCH_ADMIN', false);
+				JToolbarHelper::divider();
+			}
+
+			$bar->appendButton('Link', 'upload', 'COM_LANGUAGES_INSTALL', 'index.php?option=com_installer&view=languages');
+			JToolbarHelper::divider();
+
+			JToolbarHelper::preferences('com_languages');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED');
+
+		$this->sidebar = JHtmlSidebar::render();
+	}
+}
diff --git a/core/administrator/components/com_languages/views/language/tmpl/edit.php b/core/administrator/components/com_languages/views/language/tmpl/edit.php
new file mode 100644
index 00000000..17889ece
--- /dev/null
+++ b/core/administrator/components/com_languages/views/language/tmpl/edit.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "language.cancel" || document.formvalidator.isValid(document.getElementById("language-form")))
+		{
+			Joomla.submitform(task, document.getElementById("language-form"));
+		}
+	};
+
+	jQuery(document).ready(function() {
+		jQuery("#jform_image").on("change", function() {
+			var flag = this.value;
+			if (flag) {
+				jQuery("#flag img").attr("src", "' . JUri::root(true) . '" + "/media/mod_languages/images/" + flag + ".gif").attr("alt", flag);
+			}
+			else
+			{
+				jQuery("#flag img").removeAttr("src").removeAttr("alt");
+			}
+	});
+});'
+);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=language&layout=edit&lang_id=' . (int) $this->item->lang_id); ?>" method="post" name="adminForm" id="language-form" class="form-validate form-horizontal">
+
+	<?php echo JLayoutHelper::render('joomla.edit.item_title', $this); ?>
+
+	<fieldset>
+	<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('JDETAILS')); ?>
+			<?php echo $this->form->renderField('title'); ?>
+			<?php echo $this->form->renderField('title_native'); ?>
+			<?php echo $this->form->renderField('lang_code'); ?>
+			<?php echo $this->form->renderField('sef'); ?>
+			<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('image'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('image'); ?>
+						<span id="flag">
+							<?php echo JHtml::_('image', 'mod_languages/' . $this->form->getValue('image') . '.gif', $this->form->getValue('image'), null, true); ?>
+						</span>
+					</div>
+			</div>
+			<?php if ($this->canDo->get('core.edit.state')) : ?>
+				<?php echo $this->form->renderField('published'); ?>
+			<?php endif; ?>
+
+			<?php echo $this->form->renderField('access'); ?>
+			<?php echo $this->form->renderField('description'); ?>
+			<?php echo $this->form->renderField('lang_id'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'metadata', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS')); ?>
+		<?php echo $this->form->renderFieldset('metadata'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'site_name', JText::_('COM_LANGUAGES_FIELDSET_SITE_NAME_LABEL')); ?>
+		<?php echo $this->form->renderFieldset('site_name'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</fieldset>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_languages/views/language/view.html.php b/core/administrator/components/com_languages/views/language/view.html.php
new file mode 100644
index 00000000..1c0d0a96
--- /dev/null
+++ b/core/administrator/components/com_languages/views/language/view.html.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Languages component.
+ *
+ * @since  1.5
+ */
+class LanguagesViewLanguage extends JViewLegacy
+{
+	public $item;
+
+	public $form;
+
+	public $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+		$this->state = $this->get('State');
+		$this->canDo = JHelperContent::getActions('com_languages');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JLoader::register('LanguagesHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/languages.php');
+
+		JFactory::getApplication()->input->set('hidemainmenu', 1);
+		$isNew = empty($this->item->lang_id);
+		$canDo = $this->canDo;
+
+		JToolbarHelper::title(
+			JText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'comments-2 langmanager'
+		);
+
+		if (($isNew && $canDo->get('core.create')) || (!$isNew && $canDo->get('core.edit')))
+		{
+			JToolbarHelper::apply('language.apply');
+			JToolbarHelper::save('language.save');
+		}
+
+		// If an existing item, can save to a copy only if we have create rights.
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('language.save2new');
+		}
+
+		if ($isNew)
+		{
+			JToolbarHelper::cancel('language.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('language.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_languages/views/languages/tmpl/default.php b/core/administrator/components/com_languages/views/languages/tmpl/default.php
new file mode 100644
index 00000000..bcdd7506
--- /dev/null
+++ b/core/administrator/components/com_languages/views/languages/tmpl/default.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_languages&task=languages.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'contentList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"></div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="contentList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%"  class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_TITLE_NATIVE', 'a.title_native', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_TAG', 'a.lang_code', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_CODE', 'a.sef', $listDirn, $listOrder); ?>
+						</th>
+						<th width="8%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_LANG_IMAGE', 'a.image', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_LANGUAGES_HEADING_HOMEPAGE', 'l.home', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.lang_id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="11">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				foreach ($this->items as $i => $item) :
+					$canCreate = $user->authorise('core.create',     'com_languages');
+					$canEdit   = $user->authorise('core.edit',       'com_languages');
+					$canChange = $user->authorise('core.edit.state', 'com_languages');
+				?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php if ($canChange) :
+								$disableClassName = '';
+								$disabledLabel	  = '';
+
+								if (!$saveOrder) :
+									$disabledLabel    = JText::_('JORDERINGDISABLED');
+									$disableClassName = 'inactive tip-top';
+								endif; ?>
+								<span class="sortable-handler hasTooltip <?php echo $disableClassName; ?>" title="<?php echo $disabledLabel; ?>">
+									<span class="icon-menu" aria-hidden="true"></span>
+								</span>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php else : ?>
+								<span class="sortable-handler inactive">
+									<span class="icon-menu" aria-hidden="true"></span>
+								</span>
+							<?php endif; ?>
+						</td>
+						<td>
+							<?php echo JHtml::_('grid.id', $i, $item->lang_id); ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('jgrid.published', $item->published, $i, 'languages.', $canChange); ?>
+						</td>
+						<td>
+							<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('JGLOBAL_EDIT_ITEM'), $item->title, 0); ?>">
+							<?php if ($canEdit) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_languages&task=language.edit&lang_id=' . (int) $item->lang_id); ?>"><?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+							</span>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo $this->escape($item->title_native); ?>
+						</td>
+						<td>
+							<?php echo $this->escape($item->lang_code); ?>
+						</td>
+						<td>
+							<?php echo $this->escape($item->sef); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php if ($item->image) : ?>
+								<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->image, null, true); ?>&nbsp;<?php echo $this->escape($item->image); ?>
+							<?php else : ?>
+								<?php echo JText::_('JNONE'); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo ($item->home == '1') ? JText::_('JYES') : JText::_('JNO'); ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo $this->escape($item->lang_id); ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_languages/views/languages/tmpl/default.xml b/core/administrator/components/com_languages/views/languages/tmpl/default.xml
new file mode 100755
index 00000000..4c7a003f
--- /dev/null
+++ b/core/administrator/components/com_languages/views/languages/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_languages/views/languages/view.html.php b/core/administrator/components/com_languages/views/languages/view.html.php
new file mode 100644
index 00000000..ba09b0e8
--- /dev/null
+++ b/core/administrator/components/com_languages/views/languages/view.html.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML Languages View class for the Languages component.
+ *
+ * @since  1.6
+ */
+class LanguagesViewLanguages extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		LanguagesHelper::addSubmenu('languages');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_languages');
+
+		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'comments-2 langmanager');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('language.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('language.edit');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if ($this->state->get('filter.published') != 2)
+			{
+				JToolbarHelper::publishList('languages.publish');
+				JToolbarHelper::unpublishList('languages.unpublish');
+			}
+		}
+
+		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'languages.delete', 'JTOOLBAR_EMPTY_TRASH');
+			JToolbarHelper::divider();
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('languages.trash');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			// Add install languages link to the lang installer component.
+			$bar = JToolbar::getInstance('toolbar');
+			$bar->appendButton('Link', 'upload', 'COM_LANGUAGES_INSTALL', 'index.php?option=com_installer&view=languages');
+			JToolbarHelper::divider();
+
+			JToolbarHelper::preferences('com_languages');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT');
+
+		JHtmlSidebar::setAction('index.php?option=com_languages&view=languages');
+
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by.
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value.
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering'     => JText::_('JGRID_HEADING_ORDERING'),
+			'a.published'    => JText::_('JSTATUS'),
+			'a.title'        => JText::_('JGLOBAL_TITLE'),
+			'a.title_native' => JText::_('COM_LANGUAGES_HEADING_TITLE_NATIVE'),
+			'a.lang_code'    => JText::_('COM_LANGUAGES_FIELD_LANG_TAG_LABEL'),
+			'a.sef'          => JText::_('COM_LANGUAGES_FIELD_LANG_CODE_LABEL'),
+			'a.image'        => JText::_('COM_LANGUAGES_HEADING_LANG_IMAGE'),
+			'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+			'a.lang_id'      => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_languages/views/multilangstatus/tmpl/default.php b/core/administrator/components/com_languages/views/multilangstatus/tmpl/default.php
new file mode 100644
index 00000000..f88f5d59
--- /dev/null
+++ b/core/administrator/components/com_languages/views/multilangstatus/tmpl/default.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$notice_homes     = $this->homes == 2 || $this->homes == 1 || $this->homes - 1 != count($this->contentlangs) && ($this->language_filter || $this->switchers != 0);
+$notice_disabled  = !$this->language_filter	&& ($this->homes > 1 || $this->switchers != 0);
+$notice_switchers = !$this->switchers && ($this->homes > 1 || $this->language_filter);
+?>
+<div class="mod-multilangstatus">
+	<?php if (!$this->language_filter && $this->switchers == 0) : ?>
+		<?php if ($this->homes == 1) : ?>
+			<div class="alert alert-info"><?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_NONE'); ?></div>
+		<?php else : ?>
+			<div class="alert alert-info"><?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_USELESS_HOMES'); ?></div>
+		<?php endif; ?>
+	<?php else : ?>
+	<table class="table table-striped table-condensed">
+		<tbody>
+		<?php if ($this->defaultHome == true) : ?>
+			<tr class="warning">
+				<td>
+					<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+				</td>
+				<td>
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED'); ?>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<?php if ($notice_homes) : ?>
+			<tr class="warning">
+				<td>
+					<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+				</td>
+				<td>
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_MISSING'); ?>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<?php if ($notice_disabled) : ?>
+			<tr class="warning">
+				<td>
+					<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+				</td>
+				<td>
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER_DISABLED'); ?>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<?php if ($notice_switchers) : ?>
+			<tr class="warning">
+				<td>
+					<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+				</td>
+				<td>
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED'); ?>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<?php foreach ($this->contentlangs as $contentlang) : ?>
+			<?php if (array_key_exists($contentlang->lang_code, $this->homepages) && (!array_key_exists($contentlang->lang_code, $this->site_langs) || !$contentlang->published)) : ?>
+				<tr class="warning">
+					<td>
+						<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+					</td>
+					<td>
+						<?php echo JText::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE', $contentlang->lang_code); ?>
+					</td>
+				</tr>
+			<?php endif; ?>
+			<?php if (!array_key_exists($contentlang->lang_code, $this->site_langs)) : ?>
+				<tr class="warning">
+					<td>
+						<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+					</td>
+					<td>
+						<?php echo JText::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG', $contentlang->lang_code); ?>
+					</td>
+				</tr>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<?php if ($this->listUsersError) : ?>
+			<tr class="info">
+				<td>
+					<span class="icon-help" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JHELP'); ?></span>
+				</td>
+				<td>
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP'); ?>
+					<ul>
+					<?php foreach ($this->listUsersError as $user) : ?>
+						<li>
+						<?php echo JText::sprintf('COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR', $user->name); ?>
+						</li>
+					<?php endforeach; ?>
+					</ul>
+				</td>
+			</tr>
+		<?php endif; ?>
+		</tbody>
+	</table>
+	<table class="table table-striped table-condensed" style="border-top: 1px solid #CCCCCC;">
+		<thead>
+			<tr>
+				<th>
+					<?php echo JText::_('JDETAILS'); ?>
+				</th>
+				<th class="center">
+					<?php echo JText::_('JSTATUS'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER'); ?>
+				</th>
+				<td class="center">
+					<?php if ($this->language_filter) : ?>
+						<?php echo JText::_('JENABLED'); ?>
+					<?php else : ?>
+						<?php echo JText::_('JDISABLED'); ?>
+					<?php endif; ?>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_PUBLISHED'); ?>
+				</th>
+				<td class="center">
+					<?php if ($this->switchers != 0) : ?>
+						<?php echo $this->switchers; ?>
+					<?php else : ?>
+						<?php echo JText::_('JNONE'); ?>
+					<?php endif; ?>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">
+					<?php if ($this->homes > 1) : ?>
+						<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_INCLUDING_ALL'); ?>
+					<?php else : ?>
+						<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED'); ?>
+					<?php endif; ?>
+				</th>
+				<td class="center">
+					<?php if ($this->homes > 1) : ?>
+						<?php echo $this->homes; ?>
+					<?php else : ?>
+						<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_ALL'); ?>
+					<?php endif; ?>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<table class="table table-striped table-condensed" style="border-top: 1px solid #CCCCCC;">
+		<thead>
+			<tr>
+				<th>
+					<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
+				</th>
+				<th class="center">
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_SITE_LANG_PUBLISHED'); ?>
+				</th>
+				<th class="center">
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED'); ?>
+				</th>
+				<th class="center">
+					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tbody>
+			<?php foreach ($this->statuses as $status) : ?>
+				<?php if ($status->element) : ?>
+					<tr>
+						<td>
+							<?php echo $status->element; ?>
+						</td>
+				<?php endif; ?>
+				<?php // Published Site languages ?>
+				<?php if ($status->element) : ?>
+						<td class="center">
+							<span class="icon-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JYES'); ?></span>
+						</td>
+				<?php else : ?>
+						<td class="center">
+							<?php echo JText::_('JNO'); ?>
+						</td>
+				<?php endif; ?>
+				<?php // Published Content languages ?>
+				<?php if ($status->lang_code && $status->published) : ?>
+						<td class="center">
+							<span class="icon-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JYES'); ?></span>
+						</td>
+				<?php else : ?>
+						<td class="center">
+							<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+						</td>
+				<?php endif; ?>
+				<?php // Published Home pages ?>
+				<?php if ($status->home_language) : ?>
+						<td class="center">
+							<span class="icon-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JYES'); ?></span>
+						</td>
+				<?php else : ?>
+						<td class="center">
+							<span class="icon-not-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JNO'); ?></span>
+						</td>
+						</td>
+				<?php endif; ?>
+				</tr>
+			<?php endforeach; ?>
+			<?php foreach ($this->contentlangs as $contentlang) : ?>
+				<?php if (!array_key_exists($contentlang->lang_code, $this->site_langs)) : ?>
+					<tr>
+						<td>
+							<?php echo $contentlang->lang_code; ?>
+						</td>
+						<td class="center">
+							<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+						</td>
+						<td class="center">
+							<?php if ($contentlang->published) : ?>
+								<span class="icon-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JYES'); ?></span>
+							<?php elseif (!$contentlang->published && array_key_exists($contentlang->lang_code, $this->homepages)) : ?>
+								<span class="icon-not-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JNO'); ?></span>
+							<?php elseif (!$contentlang->published) : ?>
+								<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php if (!array_key_exists($contentlang->lang_code, $this->homepages)) : ?>
+								<span class="icon-pending" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('WARNING'); ?></span>
+							<?php else : ?>
+								<span class="icon-ok" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JYES'); ?></span>
+							<?php endif; ?>
+						</td>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			</tr>
+		</tbody>
+	</table>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/components/com_languages/views/multilangstatus/view.html.php b/core/administrator/components/com_languages/views/multilangstatus/view.html.php
new file mode 100644
index 00000000..4f8612fe
--- /dev/null
+++ b/core/administrator/components/com_languages/views/multilangstatus/view.html.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Displays the multilang status.
+ *
+ * @since  1.7.1
+ */
+class LanguagesViewMultilangstatus extends JViewLegacy
+{
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		JLoader::register('MultilangstatusHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/multilangstatus.php');
+
+		$this->homes           = MultilangstatusHelper::getHomes();
+		$this->language_filter = JLanguageMultilang::isEnabled();
+		$this->switchers       = MultilangstatusHelper::getLangswitchers();
+		$this->listUsersError  = MultilangstatusHelper::getContacts();
+		$this->contentlangs    = MultilangstatusHelper::getContentlangs();
+		$this->site_langs      = JLanguageHelper::getInstalledLanguages(0);
+		$this->statuses        = MultilangstatusHelper::getStatus();
+		$this->homepages       = JLanguageMultilang::getSiteHomePages();
+		$this->defaultHome     = MultilangstatusHelper::getDefaultHomeModule();
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_languages/views/override/tmpl/edit.php b/core/administrator/components/com_languages/views/override/tmpl/edit.php
new file mode 100644
index 00000000..1718789f
--- /dev/null
+++ b/core/administrator/components/com_languages/views/override/tmpl/edit.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+$expired = ($this->state->get('cache_expired') == 1 ) ? '1' : '';
+
+JHtml::_('stylesheet', 'overrider/overrider.css', array('version' => 'auto', 'relative' => true));
+
+JHtml::_('behavior.core');
+JHtml::_('jquery.framework');
+JHtml::_('script', 'overrider/overrider.min.js', array('version' => 'auto', 'relative' => true));
+
+JFactory::getDocument()->addScriptDeclaration('
+	jQuery(document).ready(function($) {
+		$("#jform_searchstring").on("focus", function() {
+			if (!Joomla.overrider.states.refreshed)
+			{
+				var expired = "' . $expired . '";
+				if (expired)
+				{
+					Joomla.overrider.refreshCache();
+					Joomla.overrider.states.refreshed = true;
+				}
+			}
+			$(this).removeClass("invalid");
+		});
+	});
+
+	Joomla.submitbutton = function(task) {
+		if (task == "override.cancel" || document.formvalidator.isValid(document.getElementById("override-form")))
+		{
+			Joomla.submitform(task, document.getElementById("override-form"));
+		}
+	};
+');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_languages&id=' . $this->item->key); ?>" method="post" name="adminForm" id="override-form" class="form-validate form-horizontal">
+	<div class="row-fluid">
+		<div class="span6">
+			<fieldset>
+				<legend><?php echo empty($this->item->key) ? JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND') : JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND'); ?></legend>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('language'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('language'); ?>
+					</div>
+				</div>
+
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('client'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('client'); ?>
+					</div>
+				</div>
+
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('key'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('key'); ?>
+					</div>
+				</div>
+
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('override'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('override'); ?>
+					</div>
+				</div>
+
+				<?php if ($this->state->get('filter.client') == 'administrator') : ?>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('both'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('both'); ?>
+					</div>
+				</div>
+				<?php endif; ?>
+
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('file'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('file'); ?>
+					</div>
+				</div>
+			</fieldset>
+
+		</div>
+
+		<div class="span6">
+			<fieldset>
+				<legend><?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND'); ?></legend>
+
+				<div class="alert alert-info"><p><?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP'); ?></p></div>
+
+				<div class="control-group">
+					<?php echo $this->form->getInput('searchstring'); ?>
+					<button type="submit" class="btn btn-primary" onclick="Joomla.overrider.searchStrings();return false;" formnovalidate>
+						<?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_BUTTON'); ?>
+					</button>
+					<span id="refresh-status" class="overrider-spinner  help-block">
+						<?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDE_REFRESHING'); ?>
+					</span>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('searchtype'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('searchtype'); ?>
+					</div>
+				</div>
+
+			</fieldset>
+
+			<fieldset id="results-container" class="adminform">
+				<legend><?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDE_RESULTS_LEGEND'); ?></legend>
+				<span id="more-results">
+					<a href="javascript:Joomla.overrider.searchStrings(Joomla.overrider.states.more);">
+						<?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDE_MORE_RESULTS'); ?></a>
+				</span>
+			</fieldset>
+
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="id" value="<?php echo $this->item->key; ?>" />
+
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</div>
+</form>
diff --git a/core/administrator/components/com_languages/views/override/view.html.php b/core/administrator/components/com_languages/views/override/view.html.php
new file mode 100644
index 00000000..30d74e99
--- /dev/null
+++ b/core/administrator/components/com_languages/views/override/view.html.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a language override
+ *
+ * @since  2.5
+ */
+class LanguagesViewOverride extends JViewLegacy
+{
+	/**
+	 * The form to use for the view.
+	 *
+	 * @var		object
+	 * @since	2.5
+	 */
+	protected $form;
+
+	/**
+	 * The item to edit.
+	 *
+	 * @var		object
+	 * @since	2.5
+	 */
+	protected $item;
+
+	/**
+	 * The model state.
+	 *
+	 * @var		object
+	 * @since	2.5
+	 */
+	protected $state;
+
+	/**
+	 * Displays the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors));
+		}
+
+		// Check whether the cache has to be refreshed.
+		$cached_time = JFactory::getApplication()->getUserState(
+			'com_languages.overrides.cachedtime.' . $this->state->get('filter.client') . '.' . $this->state->get('filter.language'),
+			0
+		);
+
+		if (time() - $cached_time > 60 * 5)
+		{
+			$this->state->set('cache_expired', true);
+		}
+
+		// Add strings for translations in Javascript.
+		JText::script('COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS');
+		JText::script('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR');
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Adds the page title and toolbar.
+	 *
+	 * @return void
+	 *
+	 * @since	2.5
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$canDo = JHelperContent::getActions('com_languages');
+
+		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE'), 'comments-2 langmanager');
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::apply('override.apply');
+			JToolbarHelper::save('override.save');
+		}
+
+		// This component does not support Save as Copy.
+		if ($canDo->get('core.edit') && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('override.save2new');
+		}
+
+		if (empty($this->item->key))
+		{
+			JToolbarHelper::cancel('override.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('override.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_languages/views/overrides/tmpl/default.php b/core/administrator/components/com_languages/views/overrides/tmpl/default.php
new file mode 100644
index 00000000..77968936
--- /dev/null
+++ b/core/administrator/components/com_languages/views/overrides/tmpl/default.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+$client    = $this->state->get('filter.client') == '0' ? JText::_('JSITE') : JText::_('JADMINISTRATOR');
+$language  = $this->state->get('filter.language');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+$opposite_client   = $this->state->get('filter.client') == '1' ? JText::_('JSITE') : JText::_('JADMINISTRATOR');
+$opposite_filename = constant('JPATH_' . strtoupper(1 - $this->state->get('filter.client')? 'administrator' : 'site'))
+	. '/language/overrides/' . $this->state->get('filter.language', 'en-GB') . '.override.ini';
+$opposite_strings  = LanguagesHelper::parseFile($opposite_filename);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=overrides'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<div id="filter-bar" class="btn-toolbar clearfix">
+			<div class="filter-search btn-group pull-left">
+				<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC'); ?>" />
+			</div>
+			<div class="btn-group pull-left">
+				<button type="submit" class="btn hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>"><span class="icon-search" aria-hidden="true"></span></button>
+				<button type="button" class="btn hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>" onclick="document.getElementById('filter_search').value='';this.form.submit();"><span class="icon-remove" aria-hidden="true"></span></button>
+			</div>
+			<div class="btn-group pull-right hidden-phone">
+				<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+				<?php echo $this->pagination->getLimitBox(); ?>
+			</div>
+		</div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="overrideList">
+				<thead>
+					<tr>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="30%" class="left">
+							<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_KEY', 'key', $listDirn, $listOrder); ?>
+						</th>
+						<th class="left hidden-phone">
+							<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_TEXT', 'text', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap hidden-phone">
+							<?php echo JText::_('COM_LANGUAGES_FIELD_LANG_TAG_LABEL'); ?>
+						</th>
+						<th class="hidden-phone">
+							<?php echo JText::_('JCLIENT'); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php $canEdit = JFactory::getUser()->authorise('core.edit', 'com_languages'); ?>
+				<?php $i = 0; ?>
+				<?php foreach ($this->items as $key => $text) : ?>
+					<tr class="row<?php echo $i % 2; ?>" id="overriderrow<?php echo $i; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $key); ?>
+						</td>
+						<td>
+							<?php if ($canEdit) : ?>
+								<a id="key[<?php echo $this->escape($key); ?>]" href="<?php echo JRoute::_('index.php?option=com_languages&task=override.edit&id=' . $key); ?>"><?php echo $this->escape($key); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($key); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone">
+							<span id="string[<?php echo $this->escape($key); ?>]"><?php echo $this->escape($text); ?></span>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $language; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $client; ?><?php
+							if (isset($opposite_strings[$key]) && ($opposite_strings[$key] == $text))
+							{
+								echo '/' . $opposite_client;
+							}
+							?>
+						</td>
+					</tr>
+				<?php $i++; ?>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_languages/views/overrides/tmpl/default.xml b/core/administrator/components/com_languages/views/overrides/tmpl/default.xml
new file mode 100755
index 00000000..54b63dcf
--- /dev/null
+++ b/core/administrator/components/com_languages/views/overrides/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_languages/views/overrides/view.html.php b/core/administrator/components/com_languages/views/overrides/view.html.php
new file mode 100644
index 00000000..ef88e5e9
--- /dev/null
+++ b/core/administrator/components/com_languages/views/overrides/view.html.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View for language overrides list.
+ *
+ * @since  2.5
+ */
+class LanguagesViewOverrides extends JViewLegacy
+{
+	/**
+	 * The items to list.
+	 *
+	 * @var		array
+	 * @since	2.5
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var		object
+	 * @since	2.5
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var		object
+	 * @since	2.5
+	 */
+	protected $state;
+
+	/**
+	 * Displays the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		$this->state      = $this->get('State');
+		$this->items      = $this->get('Overrides');
+		$this->languages  = $this->get('Languages');
+		$this->pagination = $this->get('Pagination');
+
+		LanguagesHelper::addSubmenu('overrides');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors));
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Adds the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		// Get the results for each action
+		$canDo = JHelperContent::getActions('com_languages');
+
+		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_OVERRIDES_TITLE'), 'comments-2 langmanager');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('override.add');
+		}
+
+		if ($canDo->get('core.edit') && $this->pagination->total)
+		{
+			JToolbarHelper::editList('override.edit');
+		}
+
+		if ($canDo->get('core.delete') && $this->pagination->total)
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'overrides.delete', 'JTOOLBAR_DELETE');
+		}
+
+		if (JFactory::getUser()->authorise('core.admin'))
+		{
+			JToolbarHelper::custom('overrides.purge', 'refresh.png', 'refresh_f2.png', 'COM_LANGUAGES_VIEW_OVERRIDES_PURGE', false);
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::preferences('com_languages');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES');
+
+		JHtmlSidebar::setAction('index.php?option=com_languages&view=overrides');
+
+		JHtmlSidebar::addFilter(
+			'',
+			'filter_language_client',
+			JHtml::_('select.options', $this->languages, null, 'text', $this->state->get('filter.language_client')),
+			true
+		);
+
+		$this->sidebar = JHtmlSidebar::render();
+	}
+}
diff --git a/core/administrator/components/com_login/controller.php b/core/administrator/components/com_login/controller.php
new file mode 100644
index 00000000..ef368dc1
--- /dev/null
+++ b/core/administrator/components/com_login/controller.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Login Controller.
+ *
+ * @since  1.5
+ */
+class LoginController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		/*
+		 * Special treatment is required for this component, as this view may be called
+		 * after a session timeout. We must reset the view and layout prior to display
+		 * otherwise an error will occur.
+		 */
+		$this->input->set('view', 'login');
+		$this->input->set('layout', 'default');
+
+		// For non-html formats we do not have login view, so just display 403 instead
+		if ($this->input->get('format', 'html') !== 'html')
+		{
+			throw new RuntimeException(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		parent::display();
+	}
+
+	/**
+	 * Method to log in a user.
+	 *
+	 * @return  void
+	 */
+	public function login()
+	{
+		// Check for request forgeries.
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+
+		$model = $this->getModel('login');
+		$credentials = $model->getState('credentials');
+		$return = $model->getState('return');
+
+		$result = $app->login($credentials, array('action' => 'core.login.admin'));
+
+		if ($result && !($result instanceof Exception))
+		{
+			// Only redirect to an internal URL.
+			if (JUri::isInternal($return))
+			{
+				// If &tmpl=component - redirect to index.php
+				if (strpos($return, 'tmpl=component') === false)
+				{
+					$app->redirect($return);
+				}
+				else
+				{
+					$app->redirect('index.php');
+				}
+			}
+		}
+
+		$this->display();
+	}
+
+	/**
+	 * Method to log out a user.
+	 *
+	 * @return  void
+	 */
+	public function logout()
+	{
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+
+		$userid = $this->input->getInt('uid', null);
+
+		if ($app->get('shared_session', '0'))
+		{
+			$clientid = null;
+		}
+		else
+		{
+			$clientid = $userid ? 0 : 1;
+		}
+
+		$options = array(
+			'clientid' => $clientid,
+		);
+
+		$result = $app->logout($userid, $options);
+
+		if (!($result instanceof Exception))
+		{
+			$model  = $this->getModel('login');
+			$return = $model->getState('return');
+
+			// Only redirect to an internal URL.
+			if (JUri::isInternal($return))
+			{
+				$app->redirect($return);
+			}
+		}
+
+		parent::display();
+	}
+}
diff --git a/core/administrator/components/com_login/login.php b/core/administrator/components/com_login/login.php
new file mode 100644
index 00000000..c270b8cf
--- /dev/null
+++ b/core/administrator/components/com_login/login.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+$task = $input->get('task');
+
+if ($task != 'login' && $task != 'logout')
+{
+	$input->set('task', '');
+	$task = '';
+}
+
+$controller = JControllerLegacy::getInstance('Login');
+$controller->execute($task);
+$controller->redirect();
diff --git a/core/administrator/components/com_login/login.xml b/core/administrator/components/com_login/login.xml
new file mode 100644
index 00000000..82bebcab
--- /dev/null
+++ b/core/administrator/components/com_login/login.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_login</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_LOGIN_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>controller.php</filename>
+			<filename>login.php</filename>
+			<folder>views</folder>
+			<folder>models</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_login.ini</language>
+			<language tag="en-GB">language/en-GB.com_login.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_login/models/login.php b/core/administrator/components/com_login/models/login.php
new file mode 100644
index 00000000..530d7e39
--- /dev/null
+++ b/core/administrator/components/com_login/models/login.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Login Model
+ *
+ * @since  1.5
+ */
+class LoginModelLogin extends JModelLegacy
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$input = JFactory::getApplication()->input->getInputForRequestMethod();
+
+		$credentials = array(
+			'username'  => $input->get('username', '', 'USERNAME'),
+			'password'  => $input->get('passwd', '', 'RAW'),
+			'secretkey' => $input->get('secretkey', '', 'RAW'),
+		);
+
+		$this->setState('credentials', $credentials);
+
+		// Check for return URL from the request first.
+		if ($return = $input->get('return', '', 'BASE64'))
+		{
+			$return = base64_decode($return);
+
+			if (!JUri::isInternal($return))
+			{
+				$return = '';
+			}
+		}
+
+		// Set the return URL if empty.
+		if (empty($return))
+		{
+			$return = 'index.php';
+		}
+
+		$this->setState('return', $return);
+	}
+
+	/**
+	 * Get the administrator login module by name (real, eg 'login' or folder, eg 'mod_login').
+	 *
+	 * @param   string  $name   The name of the module.
+	 * @param   string  $title  The title of the module, optional.
+	 *
+	 * @return  object  The Module object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getLoginModule($name = 'mod_login', $title = null)
+	{
+		$result = null;
+		$modules = self::_load($name);
+		$total = count($modules);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			// Match the title if we're looking for a specific instance of the module.
+			if (!$title || $modules[$i]->title == $title)
+			{
+				$result = $modules[$i];
+				break;
+			}
+		}
+
+		// If we didn't find it, and the name is mod_something, create a dummy object.
+		if (is_null($result) && substr($name, 0, 4) == 'mod_')
+		{
+			$result = new stdClass;
+			$result->id = 0;
+			$result->title = '';
+			$result->module = $name;
+			$result->position = '';
+			$result->content = '';
+			$result->showtitle = 0;
+			$result->control = '';
+			$result->params = '';
+			$result->user = 0;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Load login modules.
+	 *
+	 * Note that we load regardless of state or access level since access
+	 * for public is the only thing that makes sense since users are not logged in
+	 * and the module lets them log in.
+	 * This is put in as a failsafe to avoid super user lock out caused by an unpublished
+	 * login module or by a module set to have a viewing access level that is not Public.
+	 *
+	 * @param   string  $module  The name of the module.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	protected static function _load($module)
+	{
+		static $clean;
+
+		if (isset($clean))
+		{
+			return $clean;
+		}
+
+		$app      = JFactory::getApplication();
+		$lang     = JFactory::getLanguage()->getTag();
+		$clientId = (int) $app->getClientId();
+
+		/** @var JCacheControllerCallback $cache */
+		$cache = JFactory::getCache('com_modules', 'callback');
+
+		$loader = function () use ($app, $lang, $module) {
+			$db = JFactory::getDbo();
+
+			$query = $db->getQuery(true)
+				->select('m.id, m.title, m.module, m.position, m.showtitle, m.params')
+				->from('#__modules AS m')
+				->where('m.module =' . $db->quote($module) . ' AND m.client_id = 1')
+				->join('LEFT', '#__extensions AS e ON e.element = m.module AND e.client_id = m.client_id')
+				->where('e.enabled = 1');
+
+			// Filter by language.
+			if ($app->isClient('site') && $app->getLanguageFilter())
+			{
+				$query->where('m.language IN (' . $db->quote($lang) . ',' . $db->quote('*') . ')');
+			}
+
+			$query->order('m.position, m.ordering');
+
+			// Set the query.
+			$db->setQuery($query);
+
+			return $db->loadObjectList();
+		};
+
+		try
+		{
+			return $clean = $cache->get($loader, array(), md5(serialize(array($clientId, $lang))));
+		}
+		catch (JCacheException $cacheException)
+		{
+			try
+			{
+				return $loader();
+			}
+			catch (JDatabaseExceptionExecuting $databaseException)
+			{
+				JError::raiseWarning(500, JText::sprintf('JLIB_APPLICATION_ERROR_MODULE_LOAD', $databaseException->getMessage()));
+
+				return array();
+			}
+		}
+		catch (JDatabaseExceptionExecuting $databaseException)
+		{
+			JError::raiseWarning(500, JText::sprintf('JLIB_APPLICATION_ERROR_MODULE_LOAD', $databaseException->getMessage()));
+
+			return array();
+		}
+	}
+}
diff --git a/core/administrator/components/com_login/views/login/tmpl/default.php b/core/administrator/components/com_login/views/login/tmpl/default.php
new file mode 100644
index 00000000..0774f913
--- /dev/null
+++ b/core/administrator/components/com_login/views/login/tmpl/default.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Get the login modules
+ * If you want to use a completely different login module change the value of name
+ * in your layout override.
+ */
+$loginmodule = LoginModelLogin::getLoginModule('mod_login');
+echo JModuleHelper::renderModule($loginmodule, array('style' => 'rounded', 'id' => 'section-box'));
+
+
+/**
+ * Get any other modules in the login position.
+ * If you want to use a different position for the modules, change the name here in your override.
+ */
+$modules = JModuleHelper::getModules('login');
+
+foreach ($modules as $module)
+// Render the login modules
+
+if ($module->module != 'mod_login'){
+	echo JModuleHelper::renderModule($module, array('style' => 'rounded', 'id' => 'section-box'));
+}
diff --git a/core/administrator/components/com_login/views/login/view.html.php b/core/administrator/components/com_login/views/login/view.html.php
new file mode 100644
index 00000000..9b3840c3
--- /dev/null
+++ b/core/administrator/components/com_login/views/login/view.html.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Login component
+ *
+ * @since  1.6
+ */
+class LoginViewLogin extends JViewLegacy
+{
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since  3.7.0
+	 */
+	public function display($tpl = null)
+	{
+		/**
+		 * To prevent clickjacking, only allow the login form to be used inside a frame in the same origin.
+		 * So send a X-Frame-Options HTTP Header with the SAMEORIGIN value.
+		 *
+		 * @link https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
+		 * @link https://tools.ietf.org/html/rfc7034
+		 */
+		JFactory::getApplication()->setHeader('X-Frame-Options', 'SAMEORIGIN');
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_media/access.xml b/core/administrator/components/com_media/access.xml
new file mode 100644
index 00000000..d4b0fee8
--- /dev/null
+++ b/core/administrator/components/com_media/access.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_media">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_media/config.xml b/core/administrator/components/com_media/config.xml
new file mode 100644
index 00000000..5e0ade06
--- /dev/null
+++ b/core/administrator/components/com_media/config.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset 
+		name="component"
+		label="COM_MEDIA_FIELDSET_OPTIONS_LABEL">
+		<field
+			name="upload_extensions"
+			type="text"
+			label="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL"
+			description="COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC"
+			size="50"
+			default="bmp,csv,doc,gif,ico,jpg,jpeg,odg,odp,ods,odt,pdf,png,ppt,txt,xcf,xls,BMP,CSV,DOC,GIF,ICO,JPG,JPEG,ODG,ODP,ODS,ODT,PDF,PNG,PPT,TXT,XCF,XLS"
+		/>
+
+		<field
+			name="upload_maxsize"
+			type="number"
+			label="COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL"
+			description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC" 
+			validate="number"
+			min="0"
+			size="50"
+			default="10"
+		/>
+
+		<field
+			name="spacer1" 
+			type="spacer" 
+			label="COM_MEDIA_FOLDERS_PATH_LABEL"
+			class="text"
+		/>
+
+		<field
+			name="file_path"
+			type="text"
+			label="COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL"
+			description="COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC" 
+			size="50"
+			default="images"
+		/>
+
+		<field
+			name="image_path"
+			type="text"
+			label="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL"
+			description="COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC"
+			size="50"
+			default="images"
+		/>
+
+		<field
+			name="restrict_uploads"
+			type="radio"
+			label="COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL"
+			description="COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="check_mime"
+			type="radio"
+			label="COM_MEDIA_FIELD_CHECK_MIME_LABEL"
+			description="COM_MEDIA_FIELD_CHECK_MIME_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="restrict_uploads:1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="image_extensions"
+			type="text"
+			label="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL"
+			description="COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC"
+			size="50"
+			default="bmp,gif,jpg,png"
+			showon="restrict_uploads:1"
+		/>
+
+		<field
+			name="ignore_extensions"
+			type="text"
+			label="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL"
+			description="COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC" 
+			size="50"
+		/>
+
+		<field
+			name="upload_mime"
+			type="text"
+			label="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL"
+			description="COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC"
+			size="50"
+			default="image/jpeg,image/gif,image/png,image/bmp,application/msword,application/excel,application/pdf,application/powerpoint,text/plain,application/x-zip"
+			showon="restrict_uploads:1"
+		/>
+
+		<field
+			name="upload_mime_illegal"
+			type="text"
+			label="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL"
+			description="COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC"
+			size="50"
+			default="text/html"
+			showon="restrict_uploads:1"
+		/>
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_media"
+			section="component"
+		 />
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_media/controller.php b/core/administrator/components/com_media/controller.php
new file mode 100644
index 00000000..f3098b1c
--- /dev/null
+++ b/core/administrator/components/com_media/controller.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Media Manager Component Controller
+ *
+ * @since  1.5
+ */
+class MediaController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JPluginHelper::importPlugin('content');
+
+		$vType    = JFactory::getDocument()->getType();
+		$vName    = $this->input->get('view', 'media');
+
+		switch ($vName)
+		{
+			case 'images':
+				$vLayout = $this->input->get('layout', 'default', 'string');
+				$mName   = 'manager';
+
+				break;
+
+			case 'imagesList':
+				$mName   = 'list';
+				$vLayout = $this->input->get('layout', 'default', 'string');
+
+				break;
+
+			case 'mediaList':
+				$app     = JFactory::getApplication();
+				$mName   = 'list';
+				$vLayout = $app->getUserStateFromRequest('media.list.layout', 'layout', 'thumbs', 'word');
+
+				break;
+
+			case 'media':
+			default:
+				$vName   = 'media';
+				$vLayout = $this->input->get('layout', 'default', 'string');
+				$mName   = 'manager';
+
+				break;
+		}
+
+		// Get/Create the view
+		$view = $this->getView($vName, $vType, '', array('base_path' => JPATH_COMPONENT_ADMINISTRATOR));
+
+		// Get/Create the model
+		if ($model = $this->getModel($mName))
+		{
+			// Push the model into the view (as default)
+			$view->setModel($model, true);
+		}
+
+		// Set the layout
+		$view->setLayout($vLayout);
+
+		// Display the view
+		$view->display();
+
+		return $this;
+	}
+
+	/**
+	 * Validate FTP credentials
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function ftpValidate()
+	{
+		// Set FTP credentials, if given
+		JClientHelper::setCredentialsFromRequest('ftp');
+	}
+}
diff --git a/core/administrator/components/com_media/controllers/file.json.php b/core/administrator/components/com_media/controllers/file.json.php
new file mode 100644
index 00000000..a76b13b9
--- /dev/null
+++ b/core/administrator/components/com_media/controllers/file.json.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+/**
+ * File Media Controller
+ *
+ * @since  1.6
+ */
+class MediaControllerFile extends JControllerLegacy
+{
+	/**
+	 * Upload a file
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function upload()
+	{
+		$params = JComponentHelper::getParams('com_media');
+
+		// Check for request forgeries
+		if (!JSession::checkToken('request'))
+		{
+			$response = array(
+				'status'  => '0',
+				'message' => JText::_('JINVALID_TOKEN'),
+				'error'   => JText::_('JINVALID_TOKEN')
+			);
+			echo json_encode($response);
+
+			return;
+		}
+
+		// Get the user
+		$user  = JFactory::getUser();
+		JLog::addLogger(array('text_file' => 'upload.error.php'), JLog::ALL, array('upload'));
+
+		// Get some data from the request
+		$file   = $this->input->files->get('Filedata', '', 'array');
+		$folder = $this->input->get('folder', '', 'path');
+
+		// Instantiate the media helper
+		$mediaHelper = new JHelperMedia;
+
+		if ($_SERVER['CONTENT_LENGTH'] > ($params->get('upload_maxsize', 0) * 1024 * 1024)
+			|| $_SERVER['CONTENT_LENGTH'] > $mediaHelper->toBytes(ini_get('upload_max_filesize'))
+			|| $_SERVER['CONTENT_LENGTH'] > $mediaHelper->toBytes(ini_get('post_max_size'))
+			|| $_SERVER['CONTENT_LENGTH'] > $mediaHelper->toBytes(ini_get('memory_limit')))
+		{
+			$response = array(
+				'status'  => '0',
+				'message' => JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'),
+				'error'   => JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE')
+			);
+			echo json_encode($response);
+
+			return;
+		}
+
+		// Set FTP credentials, if given
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		if (isset($file['name']))
+		{
+			// Make the filename safe
+			$file['name'] = JFile::makeSafe($file['name']);
+
+			// We need a URL safe name
+			$fileparts = pathinfo(COM_MEDIA_BASE . '/' . $folder . '/' . $file['name']);
+
+			// Transform filename to punycode
+			$fileparts['filename'] = JStringPunycode::toPunycode($fileparts['filename']);
+			$tempExt = (!empty($fileparts['extension'])) ? strtolower($fileparts['extension']) : '';
+
+			// Transform filename to punycode, then neglect otherthan non-alphanumeric characters & underscores. Also transform extension to lowercase
+			$safeFileName = preg_replace(array("/[\\s]/", '/[^a-zA-Z0-9_]/'), array('_', ''), $fileparts['filename']) . '.' . $tempExt;
+
+			// Create filepath with safe-filename
+			$files['final'] = $fileparts['dirname'] . DIRECTORY_SEPARATOR . $safeFileName;
+			$file['name']   = $safeFileName;
+
+			$filepath = JPath::clean($files['final']);
+
+			if (!$mediaHelper->canUpload($file, 'com_media'))
+			{
+				try
+				{
+					JLog::add('Invalid: ' . $filepath, JLog::INFO, 'upload');
+				}
+				catch (RuntimeException $exception)
+				{
+					// Informational log only
+				}
+
+				$response = array(
+					'status'  => '0',
+					'message' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE'),
+					'error'   => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE')
+				);
+
+				echo json_encode($response);
+
+				return;
+			}
+
+			// Trigger the onContentBeforeSave event.
+			JPluginHelper::importPlugin('content');
+			$dispatcher  = JEventDispatcher::getInstance();
+			$object_file = new JObject($file);
+			$object_file->filepath = $filepath;
+			$result = $dispatcher->trigger('onContentBeforeSave', array('com_media.file', &$object_file, true));
+
+			if (in_array(false, $result, true))
+			{
+				// There are some errors in the plugins
+				try
+				{
+					JLog::add(
+						'Errors before save: ' . $object_file->filepath . ' : ' . implode(', ', $object_file->getErrors()),
+						JLog::INFO,
+						'upload'
+					);
+				}
+				catch (RuntimeException $exception)
+				{
+					// Informational log only
+				}
+
+				$response = array(
+					'status'  => '0',
+					'message' => JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('<br />', $errors)),
+					'error'   => JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('<br />', $errors))
+				);
+
+				echo json_encode($response);
+
+				return;
+			}
+
+			if (JFile::exists($object_file->filepath))
+			{
+				// File exists
+				try
+				{
+					JLog::add('File exists: ' . $object_file->filepath . ' by user_id ' . $user->id, JLog::INFO, 'upload');
+				}
+				catch (RuntimeException $exception)
+				{
+					// Informational log only
+				}
+
+				$response = array(
+					'status'   => '0',
+					'message'  => JText::_('COM_MEDIA_ERROR_FILE_EXISTS'),
+					'error'    => JText::_('COM_MEDIA_ERROR_FILE_EXISTS'),
+					'location' => str_replace(JPATH_ROOT, '',  $filepath)
+				);
+
+				echo json_encode($response);
+
+				return;
+			}
+			elseif (!$user->authorise('core.create', 'com_media'))
+			{
+				// File does not exist and user is not authorised to create
+				try
+				{
+					JLog::add('Create not permitted: ' . $object_file->filepath . ' by user_id ' . $user->id, JLog::INFO, 'upload');
+				}
+				catch (RuntimeException $exception)
+				{
+					// Informational log only
+				}
+
+				$response = array(
+					'status'  => '0',
+					'error'   => JText::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED'),
+					'message' => JText::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED')
+				);
+
+				echo json_encode($response);
+
+				return;
+			}
+
+			if (!JFile::upload($object_file->tmp_name, $object_file->filepath))
+			{
+				// Error in upload
+				try
+				{
+					JLog::add('Error on upload: ' . $object_file->filepath, JLog::INFO, 'upload');
+				}
+				catch (RuntimeException $exception)
+				{
+					// Informational log only
+				}
+
+				$response = array(
+					'status'  => '0',
+					'message' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE'),
+					'error'   => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE')
+				);
+
+				echo json_encode($response);
+
+				return;
+			}
+			else
+			{
+				// Trigger the onContentAfterSave event.
+				$dispatcher->trigger('onContentAfterSave', array('com_media.file', &$object_file, true));
+
+				try
+				{
+					JLog::add($folder, JLog::INFO, 'upload');
+				}
+				catch (RuntimeException $exception)
+				{
+					// Informational log only
+				}
+
+				$returnUrl = str_replace(JPATH_ROOT, '',  $object_file->filepath);
+
+				$response = array(
+					'status'   => '1',
+					'message'  => JText::sprintf('COM_MEDIA_UPLOAD_COMPLETE', $returnUrl),
+					'error'    => JText::sprintf('COM_MEDIA_UPLOAD_COMPLETE', $returnUrl),
+					'location' => str_replace('\\', '/', $returnUrl)
+				);
+
+				echo json_encode($response);
+
+				return;
+			}
+		}
+		else
+		{
+			$response = array(
+				'status'  => '0',
+				'error'   => JText::_('COM_MEDIA_ERROR_BAD_REQUEST'),
+				'message' => JText::_('COM_MEDIA_ERROR_BAD_REQUEST')
+			);
+
+			echo json_encode($response);
+
+			return;
+		}
+	}
+}
diff --git a/core/administrator/components/com_media/controllers/file.php b/core/administrator/components/com_media/controllers/file.php
new file mode 100644
index 00000000..891a5bd3
--- /dev/null
+++ b/core/administrator/components/com_media/controllers/file.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+/**
+ * Media File Controller
+ *
+ * @since  1.5
+ */
+class MediaControllerFile extends JControllerLegacy
+{
+	/**
+	 * The folder we are uploading into
+	 *
+	 * @var   string
+	 */
+	protected $folder = '';
+
+	/**
+	 * Upload one or more files
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function upload()
+	{
+		// Check for request forgeries
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+		$params = JComponentHelper::getParams('com_media');
+
+		// Get some data from the request
+		$files        = $this->input->files->get('Filedata', array(), 'array');
+		$return       = JFactory::getSession()->get('com_media.return_url');
+		$this->folder = $this->input->get('folder', '', 'path');
+
+		// Don't redirect to an external URL.
+		if (!JUri::isInternal($return))
+		{
+			$return = '';
+		}
+
+		// Set the redirect
+		if ($return)
+		{
+			$this->setRedirect($return . '&folder=' . $this->folder);
+		}
+		else
+		{
+			$this->setRedirect('index.php?option=com_media&folder=' . $this->folder);
+		}
+
+		if (!$files)
+		{
+			// If we could not get any data from the request we can not upload it.
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_MEDIA_ERROR_WARNFILENOTSAFE'), 'error');
+
+			return false;
+		}
+
+		// Authorize the user
+		if (!$this->authoriseUser('create'))
+		{
+			return false;
+		}
+
+		// If there are no files to upload - then bail
+		if (empty($files))
+		{
+			return false;
+		}
+
+		// Total length of post back data in bytes.
+		$contentLength = (int) $_SERVER['CONTENT_LENGTH'];
+
+		// Instantiate the media helper
+		$mediaHelper = new JHelperMedia;
+
+		// Maximum allowed size of post back data in MB.
+		$postMaxSize = $mediaHelper->toBytes(ini_get('post_max_size'));
+
+		// Maximum allowed size of script execution in MB.
+		$memoryLimit = $mediaHelper->toBytes(ini_get('memory_limit'));
+
+		// Check for the total size of post back data.
+		if (($postMaxSize > 0 && $contentLength > $postMaxSize)
+			|| ($memoryLimit != -1 && $contentLength > $memoryLimit))
+		{
+			JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_WARNUPLOADTOOLARGE'));
+
+			return false;
+		}
+
+		$uploadMaxSize = $params->get('upload_maxsize', 0) * 1024 * 1024;
+		$uploadMaxFileSize = $mediaHelper->toBytes(ini_get('upload_max_filesize'));
+
+		// Perform basic checks on file info before attempting anything
+		foreach ($files as &$file)
+		{
+			$file['name']     = JFile::makeSafe($file['name']);
+			$file['name']     = str_replace(' ', '-', $file['name']);
+			$file['filepath'] = JPath::clean(implode(DIRECTORY_SEPARATOR, array(COM_MEDIA_BASE, $this->folder, $file['name'])));
+
+			if (($file['error'] == 1)
+				|| ($uploadMaxSize > 0 && $file['size'] > $uploadMaxSize)
+				|| ($uploadMaxFileSize > 0 && $file['size'] > $uploadMaxFileSize))
+			{
+				// File size exceed either 'upload_max_filesize' or 'upload_maxsize'.
+				JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'));
+
+				return false;
+			}
+
+			if (JFile::exists($file['filepath']))
+			{
+				// A file with this name already exists
+				JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_FILE_EXISTS'));
+
+				return false;
+			}
+
+			if (!isset($file['name']))
+			{
+				// No filename (after the name was cleaned by JFile::makeSafe)
+				$this->setRedirect('index.php', JText::_('COM_MEDIA_INVALID_REQUEST'), 'error');
+
+				return false;
+			}
+		}
+
+		// Set FTP credentials, if given
+		JClientHelper::setCredentialsFromRequest('ftp');
+		JPluginHelper::importPlugin('content');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		foreach ($files as &$file)
+		{
+			// The request is valid
+			$err = null;
+
+			if (!MediaHelper::canUpload($file, $err))
+			{
+				// The file can't be uploaded
+				return false;
+			}
+
+			// Trigger the onContentBeforeSave event.
+			$object_file = new JObject($file);
+			$result = $dispatcher->trigger('onContentBeforeSave', array('com_media.file', &$object_file, true));
+
+			if (in_array(false, $result, true))
+			{
+				// There are some errors in the plugins
+				JError::raiseWarning(100, JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('<br />', $errors)));
+
+				return false;
+			}
+
+			if (!JFile::upload($object_file->tmp_name, $object_file->filepath))
+			{
+				// Error in upload
+				JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE'));
+
+				return false;
+			}
+
+			// Trigger the onContentAfterSave event.
+			$dispatcher->trigger('onContentAfterSave', array('com_media.file', &$object_file, true));
+			$this->setMessage(JText::sprintf('COM_MEDIA_UPLOAD_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check that the user is authorized to perform this action
+	 *
+	 * @param   string  $action  - the action to be peformed (create or delete)
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function authoriseUser($action)
+	{
+		if (!JFactory::getUser()->authorise('core.' . strtolower($action), 'com_media'))
+		{
+			// User is not authorised
+			JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_' . strtoupper($action) . '_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Deletes paths from the current path
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function delete()
+	{
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user = JFactory::getUser();
+
+		// Get some data from the request
+		$tmpl   = $this->input->get('tmpl');
+		$paths  = $this->input->get('rm', array(), 'array');
+		$folder = $this->input->get('folder', '', 'path');
+
+		$redirect = 'index.php?option=com_media&folder=' . $folder;
+
+		if ($tmpl == 'component')
+		{
+			// We are inside the iframe
+			$redirect .= '&view=mediaList&tmpl=component';
+		}
+
+		$this->setRedirect($redirect);
+
+		// Just return if there's nothing to do
+		if (empty($paths))
+		{
+			$this->setMessage(JText::_('JERROR_NO_ITEMS_SELECTED'), 'error');
+
+			return true;
+		}
+
+		if (!$user->authorise('core.delete', 'com_media'))
+		{
+			// User is not authorised to delete
+			JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		// Need this to enqueue messages.
+		$app = JFactory::getApplication();
+
+		// Set FTP credentials, if given
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		JPluginHelper::importPlugin('content');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		$ret = true;
+
+		$safePaths = array_intersect($paths, array_map(array('JFile', 'makeSafe'), $paths));
+		$unsafePaths = array_diff($paths, $safePaths);
+
+		foreach ($unsafePaths as $path)
+		{
+			$path = JPath::clean(implode(DIRECTORY_SEPARATOR, array($folder, $path)));
+			$path = htmlspecialchars($path, ENT_COMPAT, 'UTF-8');
+			$app->enqueueMessage(JText::sprintf('COM_MEDIA_ERROR_UNABLE_TO_DELETE_FILE_WARNFILENAME', $path), 'error');
+		}
+
+		foreach ($safePaths as $path)
+		{
+			$fullPath = JPath::clean(implode(DIRECTORY_SEPARATOR, array(COM_MEDIA_BASE, $folder, $path)));
+			$object_file = new JObject(array('filepath' => $fullPath));
+
+			if (is_file($object_file->filepath))
+			{
+				// Trigger the onContentBeforeDelete event.
+				$result = $dispatcher->trigger('onContentBeforeDelete', array('com_media.file', &$object_file));
+
+				if (in_array(false, $result, true))
+				{
+					// There are some errors in the plugins
+					$errors = $object_file->getErrors();
+					JError::raiseWarning(100, JText::plural('COM_MEDIA_ERROR_BEFORE_DELETE', count($errors), implode('<br />', $errors)));
+
+					continue;
+				}
+
+				$ret &= JFile::delete($object_file->filepath);
+
+				// Trigger the onContentAfterDelete event.
+				$dispatcher->trigger('onContentAfterDelete', array('com_media.file', &$object_file));
+				$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+			}
+			elseif (is_dir($object_file->filepath))
+			{
+				$contents = JFolder::files($object_file->filepath, '.', true, false, array('.svn', 'CVS', '.DS_Store', '__MACOSX', 'index.html'));
+
+				if (!empty($contents))
+				{
+					// This makes no sense...
+					$folderPath = substr($object_file->filepath, strlen(COM_MEDIA_BASE));
+					JError::raiseWarning(100, JText::sprintf('COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_NOT_EMPTY', $folderPath));
+
+					continue;
+				}
+
+				// Trigger the onContentBeforeDelete event.
+				$result = $dispatcher->trigger('onContentBeforeDelete', array('com_media.folder', &$object_file));
+
+				if (in_array(false, $result, true))
+				{
+					// There are some errors in the plugins
+					$errors = $object_file->getErrors();
+					JError::raiseWarning(100, JText::plural('COM_MEDIA_ERROR_BEFORE_DELETE', count($errors), implode('<br />', $errors)));
+
+					continue;
+				}
+
+				$ret &= !JFolder::delete($object_file->filepath);
+
+				// Trigger the onContentAfterDelete event.
+				$dispatcher->trigger('onContentAfterDelete', array('com_media.folder', &$object_file));
+				$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+			}
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/administrator/components/com_media/controllers/folder.php b/core/administrator/components/com_media/controllers/folder.php
new file mode 100644
index 00000000..f1439adb
--- /dev/null
+++ b/core/administrator/components/com_media/controllers/folder.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+/**
+ * Folder Media Controller
+ *
+ * @since  1.5
+ */
+class MediaControllerFolder extends JControllerLegacy
+{
+	/**
+	 * Deletes paths from the current path
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function delete()
+	{
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user = JFactory::getUser();
+
+		// Get some data from the request
+		$tmpl   = $this->input->get('tmpl');
+		$paths  = $this->input->get('rm', array(), 'array');
+		$folder = $this->input->get('folder', '', 'path');
+
+		$redirect = 'index.php?option=com_media&folder=' . $folder;
+
+		if ($tmpl == 'component')
+		{
+			// We are inside the iframe
+			$redirect .= '&view=mediaList&tmpl=component';
+		}
+
+		$this->setRedirect($redirect);
+
+		// Just return if there's nothing to do
+		if (empty($paths))
+		{
+			$this->setMessage(JText::_('JERROR_NO_ITEMS_SELECTED'), 'error');
+
+			return true;
+		}
+
+		if (!$user->authorise('core.delete', 'com_media'))
+		{
+			// User is not authorised to delete
+			JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		// Need this to enqueue messages.
+		$app = JFactory::getApplication();
+
+		// Set FTP credentials, if given
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		JPluginHelper::importPlugin('content');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		$ret = true;
+
+		$safePaths = array_intersect($paths, array_map(array('JFile', 'makeSafe'), $paths));
+		$unsafePaths = array_diff($paths, $safePaths);
+
+		foreach ($unsafePaths as $path)
+		{
+			$path = JPath::clean(implode(DIRECTORY_SEPARATOR, array($folder, $path)));
+			$path = htmlspecialchars($path, ENT_COMPAT, 'UTF-8');
+			$app->enqueueMessage(JText::sprintf('COM_MEDIA_ERROR_UNABLE_TO_DELETE_FILE_WARNFILENAME', $path), 'error');
+		}
+
+		foreach ($safePaths as $path)
+		{
+			$fullPath = JPath::clean(implode(DIRECTORY_SEPARATOR, array(COM_MEDIA_BASE, $folder, $path)));
+			$object_file = new JObject(array('filepath' => $fullPath));
+
+			if (is_file($object_file->filepath))
+			{
+				// Trigger the onContentBeforeDelete event.
+				$result = $dispatcher->trigger('onContentBeforeDelete', array('com_media.file', &$object_file));
+
+				if (in_array(false, $result, true))
+				{
+					// There are some errors in the plugins
+					$errors = $object_file->getErrors();
+					JError::raiseWarning(100, JText::plural('COM_MEDIA_ERROR_BEFORE_DELETE', count($errors), implode('<br />', $errors)));
+
+					continue;
+				}
+
+				$ret &= JFile::delete($object_file->filepath);
+
+				// Trigger the onContentAfterDelete event.
+				$dispatcher->trigger('onContentAfterDelete', array('com_media.file', &$object_file));
+				$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+			}
+			elseif (is_dir($object_file->filepath))
+			{
+				$contents = JFolder::files($object_file->filepath, '.', true, false, array('.svn', 'CVS', '.DS_Store', '__MACOSX', 'index.html'));
+
+				if (!empty($contents))
+				{
+					// This makes no sense...
+					$folderPath = substr($object_file->filepath, strlen(COM_MEDIA_BASE));
+					JError::raiseWarning(100, JText::sprintf('COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_NOT_EMPTY', $folderPath));
+
+					continue;
+				}
+
+				// Trigger the onContentBeforeDelete event.
+				$result = $dispatcher->trigger('onContentBeforeDelete', array('com_media.folder', &$object_file));
+
+				if (in_array(false, $result, true))
+				{
+					// There are some errors in the plugins
+					$errors = $object_file->getErrors();
+					JError::raiseWarning(100, JText::plural('COM_MEDIA_ERROR_BEFORE_DELETE', count($errors), implode('<br />', $errors)));
+
+					continue;
+				}
+
+				$ret &= !JFolder::delete($object_file->filepath);
+
+				// Trigger the onContentAfterDelete event.
+				$dispatcher->trigger('onContentAfterDelete', array('com_media.folder', &$object_file));
+				$app->enqueueMessage(JText::sprintf('COM_MEDIA_DELETE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Create a folder
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function create()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user  = JFactory::getUser();
+
+		$folder      = $this->input->get('foldername', '');
+		$folderCheck = (string) $this->input->get('foldername', null, 'raw');
+		$parent      = $this->input->get('folderbase', '', 'path');
+
+		$this->setRedirect('index.php?option=com_media&folder=' . $parent . '&tmpl=' . $this->input->get('tmpl', 'index'));
+
+		if (strlen($folder) > 0)
+		{
+			if (!$user->authorise('core.create', 'com_media'))
+			{
+				// User is not authorised to create
+				JError::raiseWarning(403, JText::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED'));
+
+				return false;
+			}
+
+			// Set FTP credentials, if given
+			JClientHelper::setCredentialsFromRequest('ftp');
+
+			$this->input->set('folder', $parent);
+
+			if (($folderCheck !== null) && ($folder !== $folderCheck))
+			{
+				$app = JFactory::getApplication();
+				$app->enqueueMessage(JText::_('COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME'), 'warning');
+
+				return false;
+			}
+
+			$path = JPath::clean(COM_MEDIA_BASE . '/' . $parent . '/' . $folder);
+
+			if (!is_dir($path) && !is_file($path))
+			{
+				// Trigger the onContentBeforeSave event.
+				$object_file = new JObject(array('filepath' => $path));
+				JPluginHelper::importPlugin('content');
+				$dispatcher = JEventDispatcher::getInstance();
+				$result     = $dispatcher->trigger('onContentBeforeSave', array('com_media.folder', &$object_file, true));
+
+				if (in_array(false, $result, true))
+				{
+					// There are some errors in the plugins
+					JError::raiseWarning(100, JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('<br />', $errors)));
+
+					return false;
+				}
+
+				if (JFolder::create($object_file->filepath))
+				{
+					$data = "<html>\n<body bgcolor=\"#FFFFFF\">\n</body>\n</html>";
+					JFile::write($object_file->filepath . '/index.html', $data);
+
+					// Trigger the onContentAfterSave event.
+					$dispatcher->trigger('onContentAfterSave', array('com_media.folder', &$object_file, true));
+					$this->setMessage(JText::sprintf('COM_MEDIA_CREATE_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))));
+				}
+			}
+
+			$this->input->set('folder', ($parent) ? $parent . '/' . $folder : $folder);
+		}
+		else
+		{
+			// File name is of zero length (null).
+			JError::raiseWarning(100, JText::_('COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME'));
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_media/helpers/media.php b/core/administrator/components/com_media/helpers/media.php
new file mode 100644
index 00000000..03213eb8
--- /dev/null
+++ b/core/administrator/components/com_media/helpers/media.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Media helper class.
+ *
+ * @since       1.6
+ * @deprecated  4.0  Use JHelperMedia instead
+ */
+abstract class MediaHelper
+{
+	/**
+	 * Checks if the file is an image
+	 *
+	 * @param   string  $fileName  The filename
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use JHelperMedia::isImage instead
+	 */
+	public static function isImage($fileName)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperMedia::isImage() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$mediaHelper = new JHelperMedia;
+
+		return $mediaHelper->isImage($fileName);
+	}
+
+	/**
+	 * Gets the file extension for the purpose of using an icon.
+	 *
+	 * @param   string  $fileName  The filename
+	 *
+	 * @return  string  File extension
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use JHelperMedia::getTypeIcon instead
+	 */
+	public static function getTypeIcon($fileName)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperMedia::getTypeIcon() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$mediaHelper = new JHelperMedia;
+
+		return $mediaHelper->getTypeIcon($fileName);
+	}
+
+	/**
+	 * Checks if the file can be uploaded
+	 *
+	 * @param   array   $file   File information
+	 * @param   string  $error  An error message to be returned
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use JHelperMedia::canUpload instead
+	 */
+	public static function canUpload($file, $error = '')
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperMedia::canUpload() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$mediaHelper = new JHelperMedia;
+
+		return $mediaHelper->canUpload($file, 'com_media');
+	}
+
+	/**
+	 * Method to parse a file size
+	 *
+	 * @param   integer  $size  The file size in bytes
+	 *
+	 * @return  string  The converted file size
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0  Use JHtml::_('number.bytes') instead
+	 */
+	public static function parseSize($size)
+	{
+		try
+		{
+			JLog::add(
+				sprintf("%s() is deprecated. Use JHtml::_('number.bytes') instead.", __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return JHtml::_('number.bytes', $size);
+	}
+
+	/**
+	 * Calculate the size of a resized image
+	 *
+	 * @param   integer  $width   Image width
+	 * @param   integer  $height  Image height
+	 * @param   integer  $target  Target size
+	 *
+	 * @return  array  The new width and height
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Use JHelperMedia::imageResize instead
+	 */
+	public static function imageResize($width, $height, $target)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperMedia::imageResize() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$mediaHelper = new JHelperMedia;
+
+		return $mediaHelper->imageResize($width, $height, $target);
+	}
+
+	/**
+	 * Counts the files and directories in a directory that are not php or html files.
+	 *
+	 * @param   string  $dir  Directory name
+	 *
+	 * @return  array  The number of files and directories in the given directory
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use JHelperMedia::countFiles instead
+	 */
+	public static function countFiles($dir)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperMedia::countFiles() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		$mediaHelper = new JHelperMedia;
+
+		return $mediaHelper->countFiles($dir);
+	}
+}
diff --git a/core/administrator/components/com_media/layouts/toolbar/deletemedia.php b/core/administrator/components/com_media/layouts/toolbar/deletemedia.php
new file mode 100644
index 00000000..e6055667
--- /dev/null
+++ b/core/administrator/components/com_media/layouts/toolbar/deletemedia.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('JTOOLBAR_DELETE');
+JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+?>
+<script type="text/javascript">
+(function($){
+	// if any media is selected then only allow to submit otherwise show message
+	deleteMedia = function(){
+		if ( $('#folderframe').contents().find('input:checked[name="rm[]"]').length == 0){
+			alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
+			return false;
+		}
+
+	MediaManager.submit('folder.delete');
+	};
+
+})(jQuery);
+</script>
+
+<button onclick="deleteMedia()" class="btn btn-small">
+	<span class="icon-remove" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+</button>
diff --git a/core/administrator/components/com_media/layouts/toolbar/newfolder.php b/core/administrator/components/com_media/layouts/toolbar/newfolder.php
new file mode 100644
index 00000000..b62eeebc
--- /dev/null
+++ b/core/administrator/components/com_media/layouts/toolbar/newfolder.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('COM_MEDIA_CREATE_NEW_FOLDER');
+?>
+<button data-toggle="collapse" data-target="#collapseFolder" class="btn btn-small">
+	<span class="icon-folder" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+</button>
diff --git a/core/administrator/components/com_media/layouts/toolbar/uploadmedia.php b/core/administrator/components/com_media/layouts/toolbar/uploadmedia.php
new file mode 100644
index 00000000..2d0f5017
--- /dev/null
+++ b/core/administrator/components/com_media/layouts/toolbar/uploadmedia.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('JTOOLBAR_UPLOAD');
+?>
+<button data-toggle="collapse" data-target="#collapseUpload" class="btn btn-small btn-success">
+	<span class="icon-plus icon-white" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+</button>
diff --git a/core/administrator/components/com_media/media.php b/core/administrator/components/com_media/media.php
new file mode 100644
index 00000000..7069de51
--- /dev/null
+++ b/core/administrator/components/com_media/media.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input  = JFactory::getApplication()->input;
+$user   = JFactory::getUser();
+$asset  = $input->get('asset');
+$author = $input->get('author');
+
+// Access check.
+if (!$user->authorise('core.manage', 'com_media') && (!$asset || (!$user->authorise('core.edit', $asset)
+	&& !$user->authorise('core.create', $asset)
+	&& count($user->getAuthorisedCategories($asset, 'core.create')) == 0)
+	&& !($user->id == $author && $user->authorise('core.edit.own', $asset))))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$params = JComponentHelper::getParams('com_media');
+
+// Load the helper class
+JLoader::register('MediaHelper', JPATH_ADMINISTRATOR . '/components/com_media/helpers/media.php');
+
+// Set the path definitions
+$popup_upload = $input->get('pop_up', null);
+$path         = 'file_path';
+$view         = $input->get('view');
+
+if (substr(strtolower($view), 0, 6) == 'images' || $popup_upload == 1)
+{
+	$path = 'image_path';
+}
+
+define('COM_MEDIA_BASE', JPATH_ROOT . '/' . $params->get($path, 'images'));
+define('COM_MEDIA_BASEURL', JUri::root() . $params->get($path, 'images'));
+
+$controller = JControllerLegacy::getInstance('Media', array('base_path' => JPATH_COMPONENT_ADMINISTRATOR));
+$controller->execute($input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_media/media.xml b/core/administrator/components/com_media/media.xml
new file mode 100644
index 00000000..9bdf880a
--- /dev/null
+++ b/core/administrator/components/com_media/media.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_media</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_MEDIA_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>media.php</filename>
+		<folder>helpers</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_media.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>media.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>layouts</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_media.ini</language>
+			<language tag="en-GB">language/en-GB.com_media.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_media/models/list.php b/core/administrator/components/com_media/models/list.php
new file mode 100644
index 00000000..ef6848a6
--- /dev/null
+++ b/core/administrator/components/com_media/models/list.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.file');
+
+/**
+ * Media Component List Model
+ *
+ * @since  1.5
+ */
+class MediaModelList extends JModelLegacy
+{
+	/**
+	 * Method to get model state variables
+	 *
+	 * @param   string  $property  Optional parameter name
+	 * @param   mixed   $default   Optional default value
+	 *
+	 * @return  object  The property where specified, the state object where omitted
+	 *
+	 * @since   1.5
+	 */
+	public function getState($property = null, $default = null)
+	{
+		static $set;
+
+		if (!$set)
+		{
+			$input  = JFactory::getApplication()->input;
+			$folder = $input->get('folder', '', 'path');
+			$this->setState('folder', $folder);
+
+			$parent = str_replace("\\", '/', dirname($folder));
+			$parent = ($parent == '.') ? null : $parent;
+			$this->setState('parent', $parent);
+			$set = true;
+		}
+
+		return parent::getState($property, $default);
+	}
+
+	/**
+	 * Get the images on the current folder
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function getImages()
+	{
+		$list = $this->getList();
+
+		return $list['images'];
+	}
+
+	/**
+	 * Get the folders on the current folder
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function getFolders()
+	{
+		$list = $this->getList();
+
+		return $list['folders'];
+	}
+
+	/**
+	 * Get the documents on the current folder
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function getDocuments()
+	{
+		$list = $this->getList();
+
+		return $list['docs'];
+	}
+
+	/**
+	 * Build imagelist
+	 *
+	 * @return  array
+	 *
+	 * @since 1.5
+	 */
+	public function getList()
+	{
+		static $list;
+
+		// Only process the list once per request
+		if (is_array($list))
+		{
+			return $list;
+		}
+
+		// Get current path from request
+		$current = (string) $this->getState('folder');
+
+		$basePath  = COM_MEDIA_BASE . ((strlen($current) > 0) ? '/' . $current : '');
+		$mediaBase = str_replace(DIRECTORY_SEPARATOR, '/', COM_MEDIA_BASE . '/');
+
+		$images  = array ();
+		$folders = array ();
+		$docs    = array ();
+		$videos  = array ();
+
+		$fileList   = false;
+		$folderList = false;
+
+		if (file_exists($basePath))
+		{
+			// Get the list of files and folders from the given folder
+			$fileList   = JFolder::files($basePath);
+			$folderList = JFolder::folders($basePath);
+		}
+
+		// Iterate over the files if they exist
+		if ($fileList !== false)
+		{
+			$tmpBaseObject = new JObject;
+
+			foreach ($fileList as $file)
+			{
+				if (is_file($basePath . '/' . $file) && substr($file, 0, 1) != '.' && strtolower($file) !== 'index.html')
+				{
+					$tmp = clone $tmpBaseObject;
+					$tmp->name = $file;
+					$tmp->title = $file;
+					$tmp->path = str_replace(DIRECTORY_SEPARATOR, '/', JPath::clean($basePath . '/' . $file));
+					$tmp->path_relative = str_replace($mediaBase, '', $tmp->path);
+					$tmp->size = filesize($tmp->path);
+
+					$ext = strtolower(JFile::getExt($file));
+
+					switch ($ext)
+					{
+						// Image
+						case 'jpg':
+						case 'png':
+						case 'gif':
+						case 'xcf':
+						case 'odg':
+						case 'bmp':
+						case 'jpeg':
+						case 'ico':
+							$info = @getimagesize($tmp->path);
+							$tmp->width  = @$info[0];
+							$tmp->height = @$info[1];
+							$tmp->type   = @$info[2];
+							$tmp->mime   = @$info['mime'];
+
+							if (($info[0] > 60) || ($info[1] > 60))
+							{
+								$dimensions = MediaHelper::imageResize($info[0], $info[1], 60);
+								$tmp->width_60 = $dimensions[0];
+								$tmp->height_60 = $dimensions[1];
+							}
+							else
+							{
+								$tmp->width_60 = $tmp->width;
+								$tmp->height_60 = $tmp->height;
+							}
+
+							if (($info[0] > 16) || ($info[1] > 16))
+							{
+								$dimensions = MediaHelper::imageResize($info[0], $info[1], 16);
+								$tmp->width_16 = $dimensions[0];
+								$tmp->height_16 = $dimensions[1];
+							}
+							else
+							{
+								$tmp->width_16 = $tmp->width;
+								$tmp->height_16 = $tmp->height;
+							}
+
+							$images[] = $tmp;
+							break;
+
+						// Video
+						case 'mp4':
+							$tmp->icon_32 = 'media/mime-icon-32/' . $ext . '.png';
+							$tmp->icon_16 = 'media/mime-icon-16/' . $ext . '.png';
+							$videos[] = $tmp;
+							break;
+
+						// Non-image document
+						default:
+							$tmp->icon_32 = 'media/mime-icon-32/' . $ext . '.png';
+							$tmp->icon_16 = 'media/mime-icon-16/' . $ext . '.png';
+							$docs[] = $tmp;
+							break;
+					}
+				}
+			}
+		}
+
+		// Iterate over the folders if they exist
+		if ($folderList !== false)
+		{
+			$tmpBaseObject = new JObject;
+
+			foreach ($folderList as $folder)
+			{
+				$tmp = clone $tmpBaseObject;
+				$tmp->name = basename($folder);
+				$tmp->path = str_replace(DIRECTORY_SEPARATOR, '/', JPath::clean($basePath . '/' . $folder));
+				$tmp->path_relative = str_replace($mediaBase, '', $tmp->path);
+				$count = MediaHelper::countFiles($tmp->path);
+				$tmp->files = $count[0];
+				$tmp->folders = $count[1];
+
+				$folders[] = $tmp;
+			}
+		}
+
+		$list = array('folders' => $folders, 'docs' => $docs, 'images' => $images, 'videos' => $videos);
+
+		return $list;
+	}
+
+	/**
+	 * Get the videos on the current folder
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getVideos()
+	{
+		$list = $this->getList();
+
+		return $list['videos'];
+	}
+}
diff --git a/core/administrator/components/com_media/models/manager.php b/core/administrator/components/com_media/models/manager.php
new file mode 100644
index 00000000..bb8987e0
--- /dev/null
+++ b/core/administrator/components/com_media/models/manager.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Media Component Manager Model
+ *
+ * @since  1.5
+ */
+class MediaModelManager extends JModelLegacy
+{
+	/**
+	 * Method to get model state variables
+	 *
+	 * @param   string  $property  Optional parameter name
+	 * @param   mixed   $default   Optional default value
+	 *
+	 * @return  object  The property where specified, the state object where omitted
+	 *
+	 * @since   1.5
+	 */
+	public function getState($property = null, $default = null)
+	{
+		static $set;
+
+		if (!$set)
+		{
+			$input = JFactory::getApplication()->input;
+
+			$folder = $input->get('folder', '', 'path');
+			$this->setState('folder', $folder);
+
+			$fieldid = $input->get('fieldid', '');
+			$this->setState('field.id', $fieldid);
+
+			$parent = str_replace("\\", '/', dirname($folder));
+			$parent = ($parent == '.') ? null : $parent;
+			$this->setState('parent', $parent);
+			$set = true;
+		}
+
+		return parent::getState($property, $default);
+	}
+
+	/**
+	 * Get a select field with a list of available folders
+	 *
+	 * @param   string  $base  The image directory to display
+	 *
+	 * @return  html
+	 *
+	 * @since 1.5
+	 */
+	public function getFolderList($base = null)
+	{
+		// Get some paths from the request
+		if (empty($base))
+		{
+			$base = COM_MEDIA_BASE;
+		}
+
+		// Corrections for windows paths
+		$base = str_replace(DIRECTORY_SEPARATOR, '/', $base);
+		$com_media_base_uni = str_replace(DIRECTORY_SEPARATOR, '/', COM_MEDIA_BASE);
+
+		// Get the list of folders
+		jimport('joomla.filesystem.folder');
+		$folders = JFolder::folders($base, '.', true, true);
+
+		$document = JFactory::getDocument();
+		$document->setTitle(JText::_('COM_MEDIA_INSERT_IMAGE'));
+
+		// Build the array of select options for the folder list
+		$options[] = JHtml::_('select.option', '', '/');
+
+		foreach ($folders as $folder)
+		{
+			$folder    = str_replace($com_media_base_uni, '', str_replace(DIRECTORY_SEPARATOR, '/', $folder));
+			$value     = substr($folder, 1);
+			$text      = str_replace(DIRECTORY_SEPARATOR, '/', $folder);
+			$options[] = JHtml::_('select.option', $value, $text);
+		}
+
+		// Sort the folder list array
+		if (is_array($options))
+		{
+			sort($options);
+		}
+
+		// Get asset and author id (use integer filter)
+		$input = JFactory::getApplication()->input;
+		$asset = $input->get('asset', 0, 'integer');
+
+		// For new items the asset is a string. JAccess always checks type first
+		// so both string and integer are supported.
+		if ($asset == 0)
+		{
+			$asset = htmlspecialchars(json_encode(trim($input->get('asset', 0, 'cmd'))), ENT_COMPAT, 'UTF-8');
+		}
+
+		$author = $input->get('author', 0, 'integer');
+
+		// Create the dropdown folder select list
+		$attribs = 'size="1" onchange="ImageManager.setFolder(this.options[this.selectedIndex].value, ' . $asset . ', ' . $author . ')" ';
+		$list = JHtml::_('select.genericlist', $options, 'folderlist', $attribs, 'value', 'text', $base);
+
+		return $list;
+	}
+
+	/**
+	 * Get the folder tree
+	 *
+	 * @param   mixed  $base  Base folder | null for using base media folder
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function getFolderTree($base = null)
+	{
+		// Get some paths from the request
+		if (empty($base))
+		{
+			$base = COM_MEDIA_BASE;
+		}
+
+		$mediaBase = str_replace(DIRECTORY_SEPARATOR, '/', COM_MEDIA_BASE . '/');
+
+		// Get the list of folders
+		jimport('joomla.filesystem.folder');
+		$folders = JFolder::folders($base, '.', true, true);
+
+		$tree = array();
+
+		foreach ($folders as $folder)
+		{
+			$folder   = str_replace(DIRECTORY_SEPARATOR, '/', $folder);
+			$name     = substr($folder, strrpos($folder, '/') + 1);
+			$relative = str_replace($mediaBase, '', $folder);
+			$absolute = $folder;
+			$path     = explode('/', $relative);
+			$node     = (object) array('name' => $name, 'relative' => $relative, 'absolute' => $absolute);
+			$tmp      = &$tree;
+
+			for ($i = 0, $n = count($path); $i < $n; $i++)
+			{
+				if (!isset($tmp['children']))
+				{
+					$tmp['children'] = array();
+				}
+
+				if ($i == $n - 1)
+				{
+					// We need to place the node
+					$tmp['children'][$relative] = array('data' => $node, 'children' => array());
+
+					break;
+				}
+
+				if (array_key_exists($key = implode('/', array_slice($path, 0, $i + 1)), $tmp['children']))
+				{
+					$tmp = &$tmp['children'][$key];
+				}
+			}
+		}
+
+		$tree['data'] = (object) array('name' => JText::_('COM_MEDIA_MEDIA'), 'relative' => '', 'absolute' => $base);
+
+		return $tree;
+	}
+}
diff --git a/core/administrator/components/com_media/views/images/tmpl/default.php b/core/administrator/components/com_media/views/images/tmpl/default.php
new file mode 100644
index 00000000..4baf462a
--- /dev/null
+++ b/core/administrator/components/com_media/views/images/tmpl/default.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$user       = JFactory::getUser();
+$input      = JFactory::getApplication()->input;
+$params     = JComponentHelper::getParams('com_media');
+$lang       = JFactory::getLanguage();
+$onClick    = '';
+$fieldInput = $this->state->get('field.id');
+$isMoo      = $input->getInt('ismoo', 1);
+$author     = $input->getCmd('author');
+$asset      = $input->getCmd('asset');
+
+JHtml::_('formbehavior.chosen', 'select');
+
+// Load tooltip instance without HTML support because we have a HTML tag in the tip
+JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false));
+
+// Include jQuery
+JHtml::_('behavior.core');
+JHtml::_('jquery.framework');
+JHtml::_('script', 'media/popup-imagemanager.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'media/popup-imagemanager.css', array('version' => 'auto', 'relative' => true));
+
+if ($lang->isRtl())
+{
+	JHtml::_('stylesheet', 'media/popup-imagemanager_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+JFactory::getDocument()->addScriptOptions(
+	'mediamanager', array(
+		'base'   => $params->get('image_path', 'images') . '/',
+		'asset'  => $asset,
+		'author' => $author
+	)
+);
+
+/**
+ * Mootools compatibility
+ *
+ * There is an extra option passed in the URL for the iframe &ismoo=0 for the bootstrap fields.
+ * By default the value will be 1 or defaults to mootools behaviour
+ *
+ * This should be removed when mootools won't be shipped by Joomla.
+ */
+if (!empty($fieldInput)) // Media Form Field
+{
+	if ($isMoo)
+	{
+		$onClick = "window.parent.jInsertFieldValue(document.getElementById('f_url').value, '" . $fieldInput . "');window.parent.jModalClose();window.parent.jQuery('.modal.in').modal('hide');";
+	}
+}
+else // XTD Image plugin
+{
+	$onClick = 'ImageManager.onok();window.parent.jModalClose();';
+}
+?>
+<div class="container-popup">
+
+	<form action="index.php?option=com_media&amp;asset=<?php echo $asset; ?>&amp;author=<?php echo $author; ?>" class="form-vertical" id="imageForm" method="post" enctype="multipart/form-data">
+
+		<div id="messages" style="display: none;">
+			<span id="message"></span><?php echo JHtml::_('image', 'media/dots.gif', '...', array('width' => 22, 'height' => 12), true); ?>
+		</div>
+
+		<div class="well">
+			<div class="row">
+				<div class="span12 control-group">
+					<div class="control-label">
+						<label class="control-label" for="folder"><?php echo JText::_('COM_MEDIA_DIRECTORY'); ?></label>
+					</div>
+					<div class="controls">
+						<?php echo $this->folderList; ?>
+						<button class="btn" type="button" id="upbutton" title="<?php echo JText::_('COM_MEDIA_DIRECTORY_UP'); ?>"><?php echo JText::_('COM_MEDIA_UP'); ?></button>
+					</div>
+				</div>
+				<div class="pull-right">
+					<button class="btn btn-success button-save-selected" type="button" <?php if (!empty($onClick)) :
+					// This is for Mootools compatibility ?>onclick="<?php echo $onClick; ?>"<?php endif; ?> data-dismiss="modal"><?php echo JText::_('COM_MEDIA_INSERT'); ?></button>
+					<button class="btn button-cancel" type="button" onclick="window.parent.jQuery('.modal.in').modal('hide');<?php if (!empty($onClick)) :
+						// This is for Mootools compatibility ?>parent.jModalClose();<?php endif ?>" data-dismiss="modal"><?php echo JText::_('JCANCEL'); ?></button>
+				</div>
+			</div>
+		</div>
+
+		<iframe id="imageframe" name="imageframe" src="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;asset=<?php echo $asset; ?>&amp;author=<?php echo $author; ?>"></iframe>
+
+		<div class="well">
+			<div class="row-fluid">
+				<div class="span6 control-group">
+					<div class="control-label">
+						<label for="f_url"><?php echo JText::_('COM_MEDIA_IMAGE_URL'); ?></label>
+					</div>
+					<div class="controls">
+						<input type="text" id="f_url" value="" />
+					</div>
+				</div>
+				<?php if (!$this->state->get('field.id')) : ?>
+					<div class="span6 control-group">
+						<div class="control-label">
+							<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN'); ?></label>
+						</div>
+						<div class="controls">
+							<select size="1" id="f_align">
+								<option value="" selected="selected"><?php echo JText::_('COM_MEDIA_NOT_SET'); ?></option>
+								<option value="left"><?php echo JText::_('JGLOBAL_LEFT'); ?></option>
+								<option value="center"><?php echo JText::_('JGLOBAL_CENTER'); ?></option>
+								<option value="right"><?php echo JText::_('JGLOBAL_RIGHT'); ?></option>
+							</select>
+						</div>
+					</div>
+				<?php endif; ?>
+			</div>
+			<?php if (!$this->state->get('field.id')) : ?>
+				<div class="row-fluid">
+					<div class="span6 control-group">
+						<div class="control-label">
+							<label for="f_alt"><?php echo JText::_('COM_MEDIA_IMAGE_DESCRIPTION'); ?></label>
+						</div>
+						<div class="controls">
+							<input type="text" id="f_alt" value="" />
+						</div>
+					</div>
+					<div class="span6 control-group">
+						<div class="control-label">
+							<label for="f_title"><?php echo JText::_('COM_MEDIA_TITLE'); ?></label>
+						</div>
+						<div class="controls">
+							<input type="text" id="f_title" value="" />
+						</div>
+					</div>
+				</div>
+				<div class="row-fluid">
+					<div class="span6 control-group">
+						<div class="control-label">
+							<label for="f_caption"><?php echo JText::_('COM_MEDIA_CAPTION'); ?></label>
+						</div>
+						<div class="controls">
+							<input type="text" id="f_caption" value="" />
+						</div>
+					</div>
+					<div class="span6 control-group">
+						<div class="control-label">
+							<label title="<?php echo JText::_('COM_MEDIA_CAPTION_CLASS_DESC'); ?>" class="noHtmlTip" for="f_caption_class"><?php echo JText::_('COM_MEDIA_CAPTION_CLASS_LABEL'); ?></label>
+						</div>
+						<div class="controls">
+							<input type="text" list="d_caption_class" id="f_caption_class" value="" />
+							<datalist id="d_caption_class">
+								<option value="text-left">
+								<option value="text-center">
+								<option value="text-right">
+							</datalist>
+						</div>
+					</div>
+				</div>
+			<?php endif; ?>
+
+			<input type="hidden" id="dirPath" name="dirPath" />
+			<input type="hidden" id="f_file" name="f_file" />
+			<input type="hidden" id="tmpl" name="component" />
+
+		</div>
+	</form>
+
+	<?php if ($user->authorise('core.create', 'com_media')) : ?>
+		<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken(); ?>=1&amp;asset=<?php echo $asset; ?>&amp;author=<?php echo $author; ?>&amp;view=images" id="uploadForm" class="form-horizontal" name="uploadForm" method="post" enctype="multipart/form-data">
+			<div id="uploadform" class="well">
+				<fieldset id="upload-noflash" class="actions">
+					<div class="control-group">
+						<div class="control-label">
+							<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
+						</div>
+						<div class="controls">
+							<input required type="file" id="upload-file" name="Filedata[]" multiple /><button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
+							<p class="help-block">
+								<?php $cMax    = (int) $this->config->get('upload_maxsize'); ?>
+								<?php $maxSize = JUtility::getMaxUploadSize($cMax . 'MB'); ?>
+								<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize)); ?>
+							</p>
+						</div>
+					</div>
+				</fieldset>
+				<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media&view=images&tmpl=component&fieldid=' . $input->getCmd('fieldid', '') . '&e_name=' . $input->getCmd('e_name') . '&asset=' . $asset . '&author=' . $author); ?>
+			</div>
+		</form>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/components/com_media/views/images/view.html.php b/core/administrator/components/com_media/views/images/view.html.php
new file mode 100644
index 00000000..d8e029a3
--- /dev/null
+++ b/core/administrator/components/com_media/views/images/view.html.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Media component
+ *
+ * @since  1.0
+ */
+class MediaViewImages extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.0
+	 */
+	public function display($tpl = null)
+	{
+		$config = JComponentHelper::getParams('com_media');
+
+		/*
+		 * Display form for FTP credentials?
+		 * Don't set them here, as there are other functions called before this one if there is any file write operation
+		 */
+		$ftp = !JClientHelper::hasCredentials('ftp');
+
+		$this->session     = JFactory::getSession();
+		$this->config      = $config;
+		$this->state       = $this->get('state');
+		$this->folderList  = $this->get('folderList');
+		$this->require_ftp = $ftp;
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_media/views/imageslist/tmpl/default.php b/core/administrator/components/com_media/views/imageslist/tmpl/default.php
new file mode 100644
index 00000000..dbae859e
--- /dev/null
+++ b/core/administrator/components/com_media/views/imageslist/tmpl/default.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$lang = JFactory::getLanguage();
+
+JHtml::_('stylesheet', 'media/popup-imagelist.css', array('version' => 'auto', 'relative' => true));
+
+if ($lang->isRtl())
+{
+	JHtml::_('stylesheet', 'media/popup-imagelist_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+JFactory::getDocument()->addScriptDeclaration('var ImageManager = window.parent.ImageManager;');
+
+if ($lang->isRtl())
+{
+	JFactory::getDocument()->addStyleDeclaration(
+		'
+			@media (max-width: 767px) {
+				li.imgOutline.thumbnail.height-80.width-80.center {
+					float: right;
+					margin-right: 15px;
+				}
+			}
+		'
+	);
+}
+else
+{
+	JFactory::getDocument()->addStyleDeclaration(
+		'
+			@media (max-width: 767px) {
+				li.imgOutline.thumbnail.height-80.width-80.center {
+					float: left;
+					margin-left: 15px;
+				}
+			}
+		'
+	);
+}
+?>
+<?php if (count($this->images) > 0 || count($this->folders) > 0) : ?>
+	<ul class="manager thumbnails thumbnails-media">
+		<?php for ($i = 0, $n = count($this->folders); $i < $n; $i++) :
+			$this->setFolder($i);
+			echo $this->loadTemplate('folder');
+		endfor; ?>
+
+		<?php for ($i = 0, $n = count($this->images); $i < $n; $i++) :
+			$this->setImage($i);
+			echo $this->loadTemplate('image');
+		endfor; ?>
+	</ul>
+<?php else : ?>
+	<div id="media-noimages">
+		<div class="alert alert-info"><?php echo JText::_('COM_MEDIA_NO_IMAGES_FOUND'); ?></div>
+	</div>
+<?php endif; ?>
diff --git a/core/administrator/components/com_media/views/imageslist/tmpl/default_folder.php b/core/administrator/components/com_media/views/imageslist/tmpl/default_folder.php
new file mode 100644
index 00000000..c7acd2bf
--- /dev/null
+++ b/core/administrator/components/com_media/views/imageslist/tmpl/default_folder.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<a href="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->_tmp_folder->path_relative); ?>&amp;asset=<?php echo $input->getCmd('asset'); ?>&amp;author=<?php echo $input->getCmd('author'); ?>" target="imageframe">
+		<div class="height-50">
+			<span class="icon-folder-2"></span>
+		</div>
+		<div class="small">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_folder->name), 10, false); ?>
+		</div>
+	</a>
+</li>
diff --git a/core/administrator/components/com_media/views/imageslist/tmpl/default_image.php b/core/administrator/components/com_media/views/imageslist/tmpl/default_image.php
new file mode 100644
index 00000000..543c003f
--- /dev/null
+++ b/core/administrator/components/com_media/views/imageslist/tmpl/default_image.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+$dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_img, &$params));
+?>
+
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<a class="img-preview" href="javascript:ImageManager.populateFields('<?php echo $this->escape($this->_tmp_img->path_relative); ?>')" title="<?php echo $this->escape($this->_tmp_img->name); ?>" >
+		<div class="height-50">
+			<?php echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($this->_tmp_img->title), JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
+		</div>
+		<div class="small">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_img->name), 10, false); ?>
+		</div>
+	</a>
+</li>
+<?php
+$dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_img, &$params));
diff --git a/core/administrator/components/com_media/views/imageslist/view.html.php b/core/administrator/components/com_media/views/imageslist/view.html.php
new file mode 100644
index 00000000..716cea8f
--- /dev/null
+++ b/core/administrator/components/com_media/views/imageslist/view.html.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Media component
+ *
+ * @since  1.0
+ */
+class MediaViewImagesList extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.0
+	 */
+	public function display($tpl = null)
+	{
+		// Do not allow cache
+		JFactory::getApplication()->allowCache(false);
+
+		$images  = $this->get('images');
+		$folders = $this->get('folders');
+		$state   = $this->get('state');
+
+		$this->baseURL = COM_MEDIA_BASEURL;
+		$this->images  = &$images;
+		$this->folders = &$folders;
+		$this->state   = &$state;
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Set the active folder
+	 *
+	 * @param   integer  $index  Folder position
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setFolder($index = 0)
+	{
+		if (isset($this->folders[$index]))
+		{
+			$this->_tmp_folder = &$this->folders[$index];
+		}
+		else
+		{
+			$this->_tmp_folder = new JObject;
+		}
+	}
+
+	/**
+	 * Set the active image
+	 *
+	 * @param   integer  $index  Image position
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setImage($index = 0)
+	{
+		if (isset($this->images[$index]))
+		{
+			$this->_tmp_img = &$this->images[$index];
+		}
+		else
+		{
+			$this->_tmp_img = new JObject;
+		}
+	}
+}
diff --git a/core/administrator/components/com_media/views/media/tmpl/default.php b/core/administrator/components/com_media/views/media/tmpl/default.php
new file mode 100644
index 00000000..bc1488dd
--- /dev/null
+++ b/core/administrator/components/com_media/views/media/tmpl/default.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$user  = JFactory::getUser();
+$input = JFactory::getApplication()->input;
+$lang  = JFactory::getLanguage();
+$style = JFactory::getApplication()->getUserStateFromRequest('media.list.layout', 'layout', 'thumbs', 'word');
+
+if (DIRECTORY_SEPARATOR == '\\')
+{
+	$base = str_replace(DIRECTORY_SEPARATOR, "\\\\", COM_MEDIA_BASE);
+}
+else
+{
+	$base = COM_MEDIA_BASE;
+}
+
+JFactory::getDocument()->addScriptDeclaration(
+	"
+		var basepath = '" . $base . "';
+		var viewstyle = '" . $style . "';
+	"
+);
+
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.framework');
+JHtml::_('script', 'media/mediamanager.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'media/mediaelement-and-player.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'media/mediaelementplayer.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'system/mootree.css', array('version' => 'auto', 'relative' => true));
+
+if ($lang->isRtl())
+{
+	JHtml::_('stylesheet', 'system/mootree_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+?>
+<div class="row-fluid">
+	<!-- Begin Sidebar -->
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+		<div class="j-toggle-sidebar-header">
+		<h3><?php echo JText::_('COM_MEDIA_FOLDERS'); ?> </h3>
+		</div>
+		<div id="treeview" class="sidebar">
+			<div id="media-tree_tree" class="tree-holder">
+				<?php echo $this->loadTemplate('folders'); ?>
+			</div>
+		</div>
+	</div>
+	<!-- End Sidebar -->
+
+	<!-- Begin Content -->
+	<div id="j-main-container" class="span10">
+		<?php echo $this->loadTemplate('navigation'); ?>
+		<?php if (($user->authorise('core.create', 'com_media')) and $this->require_ftp) : ?>
+			<form action="index.php?option=com_media&amp;task=ftpValidate" name="ftpForm" id="ftpForm" method="post">
+				<fieldset title="<?php echo JText::_('COM_MEDIA_DESCFTPTITLE'); ?>">
+					<legend><?php echo JText::_('COM_MEDIA_DESCFTPTITLE'); ?></legend>
+					<?php echo JText::_('COM_MEDIA_DESCFTP'); ?>
+					<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+					<input type="text" id="username" name="username" size="70" value="" />
+
+					<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+					<input type="password" id="password" name="password" size="70" value="" />
+				</fieldset>
+			</form>
+		<?php endif; ?>
+
+		<form action="index.php?option=com_media" name="adminForm" id="mediamanager-form" method="post" enctype="multipart/form-data" >
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="cb1" id="cb1" value="0" />
+			<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->escape($this->state->folder); ?>" />
+		</form>
+
+		<?php if ($user->authorise('core.create', 'com_media')) : ?>
+		<!-- File Upload Form -->
+		<div id="collapseUpload" class="collapse">
+			<form action="<?php echo JUri::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName() . '=' . $this->session->getId(); ?>&amp;<?php echo JSession::getFormToken(); ?>=1&amp;format=html" id="uploadForm" class="form-inline" name="uploadForm" method="post" enctype="multipart/form-data">
+				<div id="uploadform" class="uploadform">
+					<fieldset id="upload-noflash" class="actions">
+							<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
+								<input required type="file" id="upload-file" name="Filedata[]" multiple /> <button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
+							<p class="help-block">
+								<?php $cMax    = (int) $this->config->get('upload_maxsize'); ?>
+								<?php $maxSize = JUtility::getMaxUploadSize($cMax . 'MB'); ?>
+								<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize)); ?>
+							</p>
+					</fieldset>
+					<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->escape($this->state->folder); ?>" />
+					<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media'); ?>
+				</div>
+			</form>
+		</div>
+		<div id="collapseFolder" class="collapse">
+			<form action="index.php?option=com_media&amp;task=folder.create&amp;tmpl=<?php echo $input->getCmd('tmpl', 'index'); ?>" name="folderForm" id="folderForm" class="form-inline" method="post">
+					<div class="path">
+						<input type="text" id="folderpath" readonly="readonly" class="update-folder" />
+						<input required type="text" id="foldername" name="foldername" />
+						<input class="update-folder" type="hidden" name="folderbase" id="folderbase" value="<?php echo $this->escape($this->state->folder); ?>" />
+						<button type="submit" class="btn"><span class="icon-folder-open"></span> <?php echo JText::_('COM_MEDIA_CREATE_FOLDER'); ?></button>
+					</div>
+					<?php echo JHtml::_('form.token'); ?>
+			</form>
+		</div>
+		<?php endif; ?>
+
+		<form action="index.php?option=com_media&amp;task=folder.create&amp;tmpl=<?php echo $input->getCmd('tmpl', 'index'); ?>" name="folderForm" id="folderForm" method="post">
+			<div id="folderview">
+				<div class="view">
+					<iframe class="thumbnail" src="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo $this->escape($this->state->folder); ?>" id="folderframe" name="folderframe" width="100%" height="500px" marginwidth="0" marginheight="0" scrolling="auto"></iframe>
+				</div>
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</form>
+	</div>
+<?php // Pre render all the bootstrap modals on the parent window
+
+echo JHtml::_(
+	'bootstrap.renderModal',
+	'imagePreview',
+	array(
+		'title'  => JText::_('COM_MEDIA_PREVIEW'),
+		'footer' => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+			. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+	),
+	'<div id="image" style="text-align:center;"><img id="imagePreviewSrc" src="../media/jui/img/alpha.png" alt="preview" style="max-width:100%; max-height:300px;"/></div>'
+);
+
+echo JHtml::_(
+	'bootstrap.renderModal',
+	'videoPreview',
+	array(
+		'title'  => JText::_('COM_MEDIA_PREVIEW'),
+		'footer' => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+			. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+	),
+	'<div id="videoPlayer" style="z-index: -100;"><video id="mejsPlayer" style="height: 250px;"/></div>'
+);
+?>
+	<!-- End Content -->
+</div>
diff --git a/core/administrator/components/com_media/views/media/tmpl/default.xml b/core/administrator/components/com_media/views/media/tmpl/default.xml
new file mode 100755
index 00000000..6aa1cbb2
--- /dev/null
+++ b/core/administrator/components/com_media/views/media/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_MEDIA_MEDIA_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_MEDIA_MEDIA_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_media/views/media/tmpl/default_folders.php b/core/administrator/components/com_media/views/media/tmpl/default_folders.php
new file mode 100644
index 00000000..9bf6e6b9
--- /dev/null
+++ b/core/administrator/components/com_media/views/media/tmpl/default_folders.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Set up the sanitised target for the ul
+$ulTarget = str_replace('/', '-', $this->folders['data']->relative);
+
+?>
+<ul class="nav nav-list" id="collapseFolder-<?php echo $ulTarget; ?>">
+<?php if (isset($this->folders['children'])) :
+	foreach ($this->folders['children'] as $folder) :
+	// Get a sanitised name for the target
+	$target = str_replace('/', '-', $folder['data']->relative); ?>
+	<li id="<?php echo $target; ?>" class="folder">
+		<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($folder['data']->relative); ?>" target="folderframe" class="folder-url" >
+			<span class="icon-folder"></span>
+			<?php echo $this->escape($folder['data']->name); ?>
+		</a>
+		<?php echo $this->getFolderLevel($folder); ?>
+	</li>
+<?php endforeach;
+endif; ?>
+</ul>
diff --git a/core/administrator/components/com_media/views/media/tmpl/default_navigation.php b/core/administrator/components/com_media/views/media/tmpl/default_navigation.php
new file mode 100644
index 00000000..3e283776
--- /dev/null
+++ b/core/administrator/components/com_media/views/media/tmpl/default_navigation.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$app   = JFactory::getApplication();
+$style = $app->getUserStateFromRequest('media.list.layout', 'layout', 'thumbs', 'word');
+?>
+
+<div class="media btn-group">
+	<a href="#" id="thumbs" onclick="MediaManager.setViewType('thumbs')" class="btn <?php echo ($style == 'thumbs') ? 'active' : ''; ?>">
+	<span class="icon-grid-view-2"></span> <?php echo JText::_('COM_MEDIA_THUMBNAIL_VIEW'); ?></a>
+	<a href="#" id="details" onclick="MediaManager.setViewType('details')" class="btn <?php echo ($style == 'details') ? 'active' : ''; ?>">
+	<span class="icon-list-view"></span> <?php echo JText::_('COM_MEDIA_DETAIL_VIEW'); ?></a>
+</div>
diff --git a/core/administrator/components/com_media/views/media/view.html.php b/core/administrator/components/com_media/views/media/view.html.php
new file mode 100644
index 00000000..813ac286
--- /dev/null
+++ b/core/administrator/components/com_media/views/media/view.html.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Media component
+ *
+ * @since  1.0
+ */
+class MediaViewMedia extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.0
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$config = JComponentHelper::getParams('com_media');
+
+		if (!$app->isClient('administrator'))
+		{
+			return $app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+		}
+
+		/*
+		 * Display form for FTP credentials?
+		 * Don't set them here, as there are other functions called before this one if there is any file write operation
+		 */
+		$ftp = !JClientHelper::hasCredentials('ftp');
+
+		$session           = JFactory::getSession();
+		$state             = $this->get('state');
+		$this->session     = $session;
+		$this->config      = &$config;
+		$this->state       = &$state;
+		$this->require_ftp = $ftp;
+		$this->folders_id  = ' id="media-tree"';
+		$this->folders     = $this->get('folderTree');
+
+		$this->sidebar = JHtmlSidebar::render();
+
+		// Set the toolbar
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		// Get the toolbar object instance
+		$bar  = JToolbar::getInstance('toolbar');
+		$user = JFactory::getUser();
+
+		// Set the titlebar text
+		JToolbarHelper::title(JText::_('COM_MEDIA'), 'images mediamanager');
+
+		// Add an upload button
+		if ($user->authorise('core.create', 'com_media'))
+		{
+			// Instantiate a new JLayoutFile instance and render the layout
+			$layout = new JLayoutFile('toolbar.uploadmedia');
+
+			$bar->appendButton('Custom', $layout->render(array()), 'upload');
+			JToolbarHelper::divider();
+		}
+
+		// Add a create folder button
+		if ($user->authorise('core.create', 'com_media'))
+		{
+			// Instantiate a new JLayoutFile instance and render the layout
+			$layout = new JLayoutFile('toolbar.newfolder');
+
+			$bar->appendButton('Custom', $layout->render(array()), 'create');
+			JToolbarHelper::divider();
+		}
+
+		// Add a delete button
+		if ($user->authorise('core.delete', 'com_media'))
+		{
+			// Instantiate a new JLayoutFile instance and render the layout
+			$layout = new JLayoutFile('toolbar.deletemedia');
+
+			$bar->appendButton('Custom', $layout->render(array()), 'delete');
+			JToolbarHelper::divider();
+		}
+
+		// Add a preferences button
+		if ($user->authorise('core.admin', 'com_media') || $user->authorise('core.options', 'com_media'))
+		{
+			JToolbarHelper::preferences('com_media');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_CONTENT_MEDIA_MANAGER');
+	}
+
+	/**
+	 * Display a folder level
+	 *
+	 * @param   array  $folder  Array with folder data
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	protected function getFolderLevel($folder)
+	{
+		$this->folders_id = null;
+		$txt              = null;
+
+		if (isset($folder['children']) && count($folder['children']))
+		{
+			$tmp           = $this->folders;
+			$this->folders = $folder;
+			$txt           = $this->loadTemplate('folders');
+			$this->folders = $tmp;
+		}
+
+		return $txt;
+	}
+}
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/default.php b/core/administrator/components/com_media/views/medialist/tmpl/default.php
new file mode 100644
index 00000000..9b0f1f17
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/default.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details.php b/core/administrator/components/com_media/views/medialist/tmpl/details.php
new file mode 100644
index 00000000..71675130
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$params = JComponentHelper::getParams('com_media');
+$path   = 'file_path';
+
+JHtml::_('jquery.framework');
+JHtml::_('behavior.core');
+
+$doc = JFactory::getDocument();
+
+// Need to override this core function because we use a different form id
+$doc->addScriptDeclaration(
+	"
+		Joomla.isChecked = function( isitchecked, form ) {
+			if ( typeof form  === 'undefined' ) {
+				form = document.getElementById( 'mediamanager-form' );
+			}
+
+			form.boxchecked.value += isitchecked ? 1 : -1;
+
+			// If we don't have a checkall-toggle, done.
+			if ( !form.elements[ 'checkall-toggle' ] ) return;
+
+			// Toggle main toggle checkbox depending on checkbox selection
+			var c = true,
+				i, e, n;
+
+			for ( i = 0, n = form.elements.length; i < n; i++ ) {
+				e = form.elements[ i ];
+
+				if ( e.type == 'checkbox' && e.name != 'checkall-toggle' && !e.checked ) {
+					c = false;
+					break;
+				}
+			}
+
+			form.elements[ 'checkall-toggle' ].checked = c;
+		};
+	"
+);
+
+$doc->addScriptDeclaration(
+	"
+		jQuery(document).ready(function($){
+			window.parent.document.updateUploader();
+			$('.img-preview, .preview').each(function(index, value) {
+				$(this).on('click', function(e) {
+					window.parent.jQuery('#imagePreviewSrc').attr('src', $(this).attr('href'));
+					window.parent.jQuery('#imagePreview').modal('show');
+					return false;
+				});
+			});
+			$('.video-preview').each(function(index, value) {
+				$(this).unbind('click');
+				$(this).on('click', function(e) {
+					e.preventDefault();
+					window.parent.jQuery('#videoPreview').modal('show');
+
+					var elementInitialised = window.parent.jQuery('#mejsPlayer').attr('src');
+
+					if (!elementInitialised)
+					{
+						window.parent.jQuery('#mejsPlayer').attr('src', $(this).attr('href'));
+						window.parent.jQuery('#mejsPlayer').mediaelementplayer();
+					}
+
+					window.parent.jQuery('#mejsPlayer')[0].player.media.setSrc($(this).attr('href'));
+
+					return false;
+				});
+			});
+		});
+	"
+);
+?>
+<form target="_parent" action="index.php?option=com_media&amp;tmpl=index&amp;folder=<?php echo rawurlencode($this->state->folder); ?>" method="post" id="mediamanager-form" name="mediamanager-form">
+	<div class="muted">
+		<p>
+			<span class="icon-folder"></span>
+			<?php
+				echo $params->get($path, 'images'),
+					($this->escape($this->state->folder) != '') ? '/' . $this->escape($this->state->folder) : '';
+			?>
+		</p>
+	</div>
+
+	<div class="manager">
+		<table class="table table-striped table-condensed">
+		<thead>
+			<tr>
+				<?php if ($this->canDelete) : ?>
+					<th width="1%">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+				<?php endif; ?>
+				<th width="1%"><?php echo JText::_('JGLOBAL_PREVIEW'); ?></th>
+				<th><?php echo JText::_('COM_MEDIA_NAME'); ?></th>
+				<th width="15%"><?php echo JText::_('COM_MEDIA_PIXEL_DIMENSIONS'); ?></th>
+				<th width="8%"><?php echo JText::_('COM_MEDIA_FILESIZE'); ?></th>
+
+				<?php if ($this->canDelete) : ?>
+					<th width="8%">
+						<?php echo JText::_('JACTION_DELETE'); ?>
+					</th>
+				<?php endif; ?>
+			</tr>
+		</thead>
+		<tbody>
+			<?php
+				echo $this->loadTemplate('up'),
+					$this->loadTemplate('folders'),
+					$this->loadTemplate('docs'),
+					$this->loadTemplate('videos'),
+					$this->loadTemplate('imgs');
+			?>
+		</tbody>
+		</table>
+	</div>
+
+	<input type="hidden" name="task" value="list" />
+	<input type="hidden" name="username" value="" />
+	<input type="hidden" name="password" value="" />
+	<input type="hidden" name="boxchecked" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_doc.php b/core/administrator/components/com_media/views/medialist/tmpl/details_doc.php
new file mode 100644
index 00000000..51d30eee
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_doc.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JHtml::_('bootstrap.tooltip');
+
+$user       = JFactory::getUser();
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+$dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_doc, &$params));
+?>
+
+<tr>
+	<td>
+		<a  title="<?php echo $this->escape($this->_tmp_doc->name); ?>">
+			<?php  echo JHtml::_('image', $this->_tmp_doc->icon_16, $this->escape($this->_tmp_doc->title), null, true, true) ? JHtml::_('image', $this->_tmp_doc->icon_16, $this->_tmp_doc->title, array('width' => 16, 'height' => 16), true) : JHtml::_('image', 'media/con_info.png', $this->escape($this->_tmp_doc->title), array('width' => 16, 'height' => 16), true);?> </a>
+	</td>
+	<td class="description"  title="<?php echo $this->escape($this->_tmp_doc->name); ?>">
+		<?php echo $this->escape($this->_tmp_doc->title); ?>
+	</td>
+	<td>&#160;
+
+	</td>
+	<td class="filesize">
+		<?php echo JHtml::_('number.bytes', $this->_tmp_doc->size); ?>
+	</td>
+<?php if ($user->authorise('core.delete', 'com_media')):?>
+	<td>
+		<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($this->_tmp_doc->name); ?>" rel="<?php echo $this->escape($this->_tmp_doc->name); ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a>
+		<input type="checkbox" name="rm[]" value="<?php echo $this->escape($this->_tmp_doc->name); ?>" />
+	</td>
+<?php endif;?>
+</tr>
+<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_doc, &$params));
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_docs.php b/core/administrator/components/com_media/views/medialist/tmpl/details_docs.php
new file mode 100644
index 00000000..83ef7388
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_docs.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JHtml::_('bootstrap.tooltip');
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+?>
+
+<?php foreach ($this->documents as $i => $doc) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$doc, &$params)); ?>
+	<tr>
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<?php echo JHtml::_('grid.id', $i, $this->escape($doc->name), false, 'rm', 'cb-document'); ?>
+			</td>
+		<?php endif; ?>
+
+		<td>
+			<a title="<?php echo $this->escape($doc->name); ?>">
+				<?php echo JHtml::_('image', $doc->icon_16, $this->escape($doc->title), null, true, true) ? JHtml::_('image', $doc->icon_16, $this->escape($doc->title), array('width' => 16, 'height' => 16), true) : JHtml::_('image', 'media/con_info.png', $this->escape($doc->title), array('width' => 16, 'height' => 16), true); ?>
+			</a>
+		</td>
+
+		<td class="description"  title="<?php echo $this->escape($doc->name); ?>">
+			<?php echo $this->escape($doc->title); ?>
+		</td>
+
+		<td>&#160;</td>
+
+		<td class="filesize">
+			<?php echo JHtml::_('number.bytes', $doc->size); ?>
+		</td>
+
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($doc->name); ?>" rel="<?php echo $this->escape($doc->name); ?>">
+					<span class="icon-remove hasTooltip" title="<?php echo JHtml::tooltipText('JACTION_DELETE'); ?>"></span>
+				</a>
+			</td>
+		<?php endif; ?>
+
+	</tr>
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$doc, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_folder.php b/core/administrator/components/com_media/views/medialist/tmpl/details_folder.php
new file mode 100644
index 00000000..6514c8e8
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_folder.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$user = JFactory::getUser();
+
+JHtml::_('bootstrap.tooltip');
+?>
+<tr>
+	<td class="imgTotal">
+		<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->_tmp_folder->path_relative); ?>" target="folderframe">
+			<span class="icon-folder-2"></span></a>
+	</td>
+	<td class="description">
+		<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->_tmp_folder->path_relative); ?>" target="folderframe"><?php echo $this->escape($this->_tmp_folder->name); ?></a>
+	</td>
+	<td>&#160;
+
+	</td>
+	<td>&#160;
+
+	</td>
+	<?php if ($user->authorise('core.delete', 'com_media')):?>
+		<td>
+			<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=folder.delete&amp;tmpl=index&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;<?php echo JSession::getFormToken(); ?>=1&amp;rm[]=<?php echo $this->_tmp_folder->name; ?>" rel="<?php echo $this->_tmp_folder->name; ?>' :: <?php echo $this->_tmp_folder->files + $this->_tmp_folder->folders; ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a>
+			<input type="checkbox" name="rm[]" value="<?php echo $this->_tmp_folder->name; ?>" />
+		</td>
+	<?php endif;?>
+</tr>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_folders.php b/core/administrator/components/com_media/views/medialist/tmpl/details_folders.php
new file mode 100644
index 00000000..8971eba4
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_folders.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+?>
+
+<?php foreach ($this->folders as $i => $folder) : ?>
+	<?php $link = 'index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=' . rawurlencode($folder->path_relative); ?>
+	<tr>
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<?php echo JHtml::_('grid.id', $i, $this->escape($folder->name), false, 'rm', 'cb-folder'); ?>
+			</td>
+		<?php endif; ?>
+		<td class="imgTotal">
+			<a href="<?php echo $link; ?>" target="folderframe"><span class="icon-folder-2"></span></a>
+		</td>
+
+		<td class="description">
+			<a href="<?php echo $link; ?>" target="folderframe"><?php echo $this->escape($folder->name); ?></a>
+		</td>
+
+		<td>&#160;</td>
+
+		<td>&#160;</td>
+
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=folder.delete&amp;tmpl=index&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;<?php echo JSession::getFormToken(); ?>=1&amp;rm[]=<?php echo $this->escape($folder->name); ?>" rel="<?php echo $this->escape($folder->name); ?> :: <?php echo $this->escape($folder->files) + $this->escape($folder->folders); ?>">
+					<span class="icon-remove hasTooltip" title="<?php echo JHtml::tooltipText('JACTION_DELETE'); ?>"></span>
+				</a>
+			</td>
+		<?php endif; ?>
+	</tr>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_img.php b/core/administrator/components/com_media/views/medialist/tmpl/details_img.php
new file mode 100644
index 00000000..a51db556
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_img.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JHtml::_('bootstrap.tooltip');
+
+$user       = JFactory::getUser();
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+$dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_img, &$params));
+?>
+
+<tr>
+	<td>
+		<a class="img-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . str_replace('%2F', '/', rawurlencode($this->_tmp_img->path_relative)); ?>" title="<?php echo $this->escape($this->_tmp_img->name); ?>"><?php echo JHtml::_('image', COM_MEDIA_BASEURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_16, 'height' => $this->_tmp_img->height_16)); ?></a>
+	</td>
+	<td class="description">
+		<a href="<?php echo COM_MEDIA_BASEURL . '/' . str_replace('%2F', '/', rawurlencode($this->_tmp_img->path_relative)); ?>" title="<?php echo $this->escape($this->_tmp_img->name); ?>" class="preview"><?php echo $this->escape($this->_tmp_img->title); ?></a>
+	</td>
+	<td class="dimensions">
+		<?php echo JText::sprintf('COM_MEDIA_IMAGE_DIMENSIONS', $this->_tmp_img->width, $this->_tmp_img->height); ?>
+	</td>
+	<td class="filesize">
+		<?php echo JHtml::_('number.bytes', $this->_tmp_img->size); ?>
+	</td>
+	<?php if ($user->authorise('core.delete', 'com_media')):?>
+		<td>
+			<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($this->_tmp_img->name); ?>" rel="<?php echo $this->escape($this->_tmp_img->name); ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a>
+			<input type="checkbox" name="rm[]" value="<?php echo $this->escape($this->_tmp_img->name); ?>" />
+		</td>
+	<?php endif;?>
+</tr>
+<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_img, &$params));
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_imgs.php b/core/administrator/components/com_media/views/medialist/tmpl/details_imgs.php
new file mode 100644
index 00000000..ced8035e
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_imgs.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JHtml::_('bootstrap.tooltip');
+
+$user       = JFactory::getUser();
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+?>
+
+<?php foreach ($this->images as $i => $image) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$image, &$params)); ?>
+	<tr>
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<?php echo JHtml::_('grid.id', $i, $this->escape($image->name), false, 'rm', 'cb-image'); ?>
+			</td>
+		<?php endif; ?>
+
+		<td>
+			<a class="img-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . str_replace('%2F', '/', rawurlencode($image->path_relative)); ?>" title="<?php echo $this->escape($image->name); ?>">
+				<?php echo JHtml::_('image', COM_MEDIA_BASEURL . '/' . $this->escape($image->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($image->title), JHtml::_('number.bytes', $image->size)), array('width' => $image->width_16, 'height' => $image->height_16)); ?>
+			</a>
+		</td>
+
+		<td class="description">
+			<a href="<?php echo  COM_MEDIA_BASEURL . '/' . str_replace('%2F', '/', rawurlencode($image->path_relative)); ?>" title="<?php echo $this->escape($image->name); ?>" class="preview">
+				<?php echo $this->escape($image->title); ?>
+			</a>
+		</td>
+
+		<td class="dimensions">
+			<?php echo JText::sprintf('COM_MEDIA_IMAGE_DIMENSIONS', $image->width, $image->height); ?>
+		</td>
+
+		<td class="filesize">
+			<?php echo JHtml::_('number.bytes', $image->size); ?>
+		</td>
+
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($image->name); ?>" rel="<?php echo $this->escape($image->name); ?>">
+					<span class="icon-remove hasTooltip" title="<?php echo JHtml::tooltipText('JACTION_DELETE'); ?>"></span>
+				</a>
+			</td>
+		<?php endif; ?>
+	</tr>
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$image, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_up.php b/core/administrator/components/com_media/views/medialist/tmpl/details_up.php
new file mode 100644
index 00000000..8e5adb2c
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_up.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$user = JFactory::getUser();
+?>
+<?php if ($this->state->folder != '') : ?>
+<tr>
+	<?php if ($this->canDelete) : ?>
+		<td>&#160;</td>
+	<?php endif; ?>
+	<td class="imgTotal">
+		<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->state->parent); ?>" target="folderframe">
+			<span class="icon-arrow-up"></span></a>
+	</td>
+	<td class="description">
+		<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->state->parent); ?>" target="folderframe">..</a>
+	</td>
+	<td>&#160;</td>
+	<td>&#160;</td>
+	<?php if ($user->authorise('core.delete', 'com_media')) : ?>
+		<td>&#160;</td>
+	<?php endif; ?>
+</tr>
+<?php endif; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_video.php b/core/administrator/components/com_media/views/medialist/tmpl/details_video.php
new file mode 100644
index 00000000..e19ed665
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_video.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JHtml::_('bootstrap.tooltip');
+
+$user       = JFactory::getUser();
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+$dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_video, &$params));
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($){
+	window.parent.jQuery('#videoPreview').on('hidden', function () {
+		window.parent.jQuery('#mejsPlayer')[0].player.pause();
+	});
+});
+");
+?>
+
+<tr>
+	<td>
+		<a class="video-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . rawurlencode($this->_tmp_video->name); ?>" title="<?php echo $this->escape($this->_tmp_video->title); ?>"><?php JHtml::_('image', $this->_tmp_video->icon_16, $this->escape($this->_tmp_video->title), null, true); ?></a>
+	</td>
+	<td class="description">
+		<a class="video-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . rawurlencode($this->_tmp_video->name); ?>" title="<?php echo $this->escape($this->_tmp_video->name); ?>">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_video->name), 10, false); ?>
+		</a>
+	</td>
+	<td class="dimensions">
+		<?php // Can we figure out the dimensions of the video? ?>
+	</td>
+	<td class="filesize">
+		<?php echo JHtml::_('number.bytes', $this->_tmp_video->size); ?>
+	</td>
+	<?php if ($user->authorise('core.delete', 'com_media')):?>
+		<td>
+			<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($this->_tmp_video->name); ?>" rel="<?php echo $this->escape($this->_tmp_video->name); ?>"><span class="icon-remove hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JACTION_DELETE');?>"></span></a>
+			<input type="checkbox" name="rm[]" value="<?php echo $this->escape($this->_tmp_video->name); ?>" />
+		</td>
+	<?php endif;?>
+</tr>
+
+<?php
+$dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_video, &$params));
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/details_videos.php b/core/administrator/components/com_media/views/medialist/tmpl/details_videos.php
new file mode 100644
index 00000000..358dbcc5
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/details_videos.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JHtml::_('bootstrap.tooltip');
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($){
+	window.parent.jQuery('#videoPreview').on('hidden', function () {
+		window.parent.jQuery('#mejsPlayer')[0].player.pause();
+	});
+});
+");
+?>
+
+<?php foreach ($this->videos as $i => $video) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$video, &$params)); ?>
+	<tr>
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<?php echo JHtml::_('grid.id', $i, $this->escape($video->name), false, 'rm', 'cb-video'); ?>
+			</td>
+		<?php endif; ?>
+
+		<td>
+			<a class="video-preview" href="<?php echo COM_MEDIA_BASEURL, '/', rawurlencode($video->name); ?>" title="<?php echo $this->escape($video->title); ?>">
+				<?php JHtml::_('image', $video->icon_16, $this->escape($video->title), null, true); ?>
+			</a>
+		</td>
+
+		<td class="description">
+			<a class="video-preview" href="<?php echo COM_MEDIA_BASEURL, '/', rawurlencode($video->name); ?>" title="<?php echo $this->escape($video->name); ?>">
+				<?php echo JHtml::_('string.truncate', $this->escape($video->name), 10, false); ?>
+			</a>
+		</td>
+
+		<td class="dimensions">
+			<?php // Can we figure out the dimensions of the video? ?>
+		</td>
+
+		<td class="filesize">
+			<?php echo JHtml::_('number.bytes', $video->size); ?>
+		</td>
+
+		<?php if ($this->canDelete) : ?>
+			<td>
+				<a class="delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($video->name); ?>" rel="<?php echo $this->escape($video->name); ?>">
+					<span class="icon-remove hasTooltip" title="<?php echo JHtml::tooltipText('JACTION_DELETE'); ?>"></span>
+				</a>
+			</td>
+		<?php endif; ?>
+	</tr>
+
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$video, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/core/administrator/components/com_media/views/medialist/tmpl/thumbs.php
new file mode 100644
index 00000000..95c88e02
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/thumbs.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$params = JComponentHelper::getParams('com_media');
+$path   = 'file_path';
+
+JHtml::_('jquery.framework');
+JHtml::_('behavior.core');
+
+$doc = JFactory::getDocument();
+
+// Need to override this core function because we use a different form id
+$doc->addScriptDeclaration(
+	"
+		Joomla.isChecked = function( isitchecked, form ) {
+			if ( typeof form  === 'undefined' ) {
+				form = document.getElementById( 'mediamanager-form' );
+			}
+
+			form.boxchecked.value += isitchecked ? 1 : -1;
+
+			// If we don't have a checkall-toggle, done.
+			if ( !form.elements[ 'checkall-toggle' ] ) return;
+
+			// Toggle main toggle checkbox depending on checkbox selection
+			var c = true,
+				i, e, n;
+
+			for ( i = 0, n = form.elements.length; i < n; i++ ) {
+				e = form.elements[ i ];
+
+				if ( e.type == 'checkbox' && e.name != 'checkall-toggle' && !e.checked ) {
+					c = false;
+					break;
+				}
+			}
+
+			form.elements[ 'checkall-toggle' ].checked = c;
+		};
+	"
+);
+
+$doc->addScriptDeclaration(
+	"
+		jQuery(document).ready(function($){
+			window.parent.document.updateUploader();
+			$('.img-preview, .preview').each(function(index, value) {
+				$(this).on('click', function(e) {
+					window.parent.jQuery('#imagePreviewSrc').attr('src', $(this).attr('href'));
+					window.parent.jQuery('#imagePreview').modal('show');
+					return false;
+				});
+			});
+			$('.video-preview').each(function(index, value) {
+				$(this).unbind('click');
+				$(this).on('click', function(e) {
+					e.preventDefault();
+					window.parent.jQuery('#videoPreview').modal('show');
+
+					var elementInitialised = window.parent.jQuery('#mejsPlayer').attr('src');
+
+					if (!elementInitialised)
+					{
+						window.parent.jQuery('#mejsPlayer').attr('src', $(this).attr('href'));
+						window.parent.jQuery('#mejsPlayer').mediaelementplayer();
+					}
+
+					window.parent.jQuery('#mejsPlayer')[0].player.media.setSrc($(this).attr('href'));
+
+					return false;
+				});
+			});
+		});
+	"
+);
+?>
+<form target="_parent" action="index.php?option=com_media&amp;tmpl=index&amp;folder=<?php echo rawurlencode($this->state->folder); ?>" method="post" id="mediamanager-form" name="mediamanager-form">
+	<div class="muted breadcrumbs">
+		<p>
+			<span class="icon-folder"></span>
+			<?php
+				echo $params->get($path, 'images'),
+					($this->escape($this->state->folder) != '') ? '/' . $this->escape($this->state->folder) : '';
+			?>
+		</p>
+	</div>
+
+	<div>
+		<label class="checkbox btn">
+			<?php echo JHtml::_('grid.checkall'); ?>
+			<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>
+		</label>
+	</div>
+
+	<ul class="manager thumbnails thumbnails-media">
+		<?php
+			echo $this->loadTemplate('up'),
+				$this->loadTemplate('folders'),
+				$this->loadTemplate('docs'),
+				$this->loadTemplate('videos'),
+				$this->loadTemplate('imgs');
+		?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="username" value="" />
+		<input type="hidden" name="password" value="" />
+		<input type="hidden" name="boxchecked" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</ul>
+</form>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php
new file mode 100644
index 00000000..e9ff7cf7
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_docs.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+?>
+
+<?php foreach ($this->documents as $i => $doc) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$doc, &$params)); ?>
+	<li class="imgOutline thumbnail height-80 width-80 center">
+		<?php if ($this->canDelete) : ?>
+			<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($doc->name); ?>" rel="<?php echo $this->escape($doc->name); ?>" title="<?php echo JText::_('JACTION_DELETE'); ?>">&#215;</a>
+			<div class="pull-left">
+				<?php echo JHtml::_('grid.id', $i, $this->escape($doc->name), false, 'rm', 'cb-document'); ?>
+			</div>
+			<div class="clearfix"></div>
+		<?php endif; ?>
+
+		<div class="height-50">
+			<a style="display: block; width: 100%; height: 100%" title="<?php echo $this->escape($doc->name); ?>" >
+				<?php echo JHtml::_('image', $doc->icon_32, $this->escape($doc->name), null, true, true) ? JHtml::_('image', $doc->icon_32, $this->escape($doc->title), null, true) : JHtml::_('image', 'media/con_info.png', $this->escape($doc->name), null, true); ?>
+			</a>
+		</div>
+
+		<div class="small" title="<?php echo $this->escape($doc->name); ?>" >
+			<?php echo JHtml::_('string.truncate', $this->escape($doc->name), 10, false); ?>
+		</div>
+	</li>
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$doc, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php
new file mode 100644
index 00000000..03483e24
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_folders.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php foreach ($this->folders as $i => $folder) : ?>
+	<li class="imgOutline thumbnail height-80 width-80 center">
+		<?php if ($this->canDelete) : ?>
+			<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=folder.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($folder->name); ?>" rel="<?php echo $this->escape($folder->name); ?> :: <?php echo $this->escape($folder->files) + $this->escape($folder->folders); ?>" title="<?php echo JText::_('JACTION_DELETE'); ?>">&#215;</a>
+			<div class="pull-left">
+				<?php echo JHtml::_('grid.id', $i, $this->escape($folder->name), false, 'rm', 'cb-folder'); ?>
+			</div>
+			<div class="clearfix"></div>
+		<?php endif; ?>
+
+		<div class="height-50">
+			<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($folder->path_relative); ?>" target="folderframe">
+				<span class="icon-folder-2"></span>
+			</a>
+		</div>
+
+		<div class="small">
+			<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($folder->path_relative); ?>" target="folderframe">
+				<?php echo JHtml::_('string.truncate', $this->escape($folder->name), 10, false); ?>
+			</a>
+		</div>
+	</li>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php
new file mode 100644
index 00000000..ad1cb310
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_imgs.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+?>
+
+<?php foreach ($this->images as $i => $img) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$img, &$params)); ?>
+	<li class="imgOutline thumbnail height-80 width-80 center">
+		<?php if ($this->canDelete) : ?>
+			<a class="close delete-item" target="_top"
+			href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($img->name); ?>"
+			rel="<?php echo $this->escape($img->name); ?>" title="<?php echo JText::_('JACTION_DELETE'); ?>">&#215;</a>
+			<div class="pull-left">
+				<?php echo JHtml::_('grid.id', $i, $this->escape($img->name), false, 'rm', 'cb-image'); ?>
+			</div>
+			<div class="clearfix"></div>
+		<?php endif; ?>
+
+		<div class="height-50">
+			<a class="img-preview" href="<?php echo COM_MEDIA_BASEURL . '/' . str_replace('%2F', '/', rawurlencode($img->path_relative)); ?>" title="<?php echo $this->escape($img->name); ?>" >
+				<?php echo JHtml::_('image', COM_MEDIA_BASEURL . '/' . $this->escape($img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($img->title), JHtml::_('number.bytes', $img->size)), array('width' => $img->width_60, 'height' => $img->height_60)); ?>
+			</a>
+		</div>
+
+		<div class="small">
+			<a href="<?php echo COM_MEDIA_BASEURL, '/', rawurlencode($img->path_relative); ?>" title="<?php echo $this->escape($img->name); ?>" class="preview">
+				<?php echo JHtml::_('string.truncate', $this->escape($img->name), 10, false); ?>
+			</a>
+		</div>
+	</li>
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$img, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
new file mode 100644
index 00000000..89c53d0b
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if ($this->state->folder != '') : ?>
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<div class="imgTotal">
+		<div class="imgBorder">
+			<a class="btn" href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->state->parent); ?>" target="folderframe">
+				<span class="icon-arrow-up"></span></a>
+		</div>
+	</div>
+	<div class="controls">
+		<span>&#160;</span>
+	</div>
+	<div class="imginfoBorder">
+		<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->state->parent); ?>" target="folderframe">..</a>
+	</div>
+</li>
+<?php endif; ?>
diff --git a/core/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php
new file mode 100644
index 00000000..087e4426
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/tmpl/thumbs_videos.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($){
+	window.parent.jQuery('#videoPreview').on('hidden', function () {
+		window.parent.jQuery('#mejsPlayer')[0].player.pause();
+	});
+});
+");
+?>
+<?php foreach ($this->videos as $i => $video) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$video, &$params)); ?>
+	<li class="imgOutline thumbnail height-80 width-80 center">
+		<?php if ($this->canDelete) : ?>
+			<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($video->name); ?>" rel="<?php echo $this->escape($video->name); ?>" title="<?php echo JText::_('JACTION_DELETE'); ?>">&#215;</a>
+			<div class="pull-left">
+				<?php echo JHtml::_('grid.id', $i, $this->escape($video->name), false, 'rm', 'cb-video'); ?>
+			</div>
+			<div class="clearfix"></div>
+		<?php endif; ?>
+
+		<div class="height-50">
+			<?php echo JHtml::_('image', $video->icon_32, $this->escape($video->title), null, true); ?>
+		</div>
+
+		<div class="small">
+			<a class="video-preview" href="<?php echo COM_MEDIA_BASEURL, '/', rawurlencode($video->path_relative); ?>" title="<?php echo $this->escape($video->name); ?>">
+				<?php echo JHtml::_('string.truncate', $this->escape($video->name), 10, false); ?>
+			</a>
+		</div>
+	</li>
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$video, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_media/views/medialist/view.html.php b/core/administrator/components/com_media/views/medialist/view.html.php
new file mode 100644
index 00000000..b8f082db
--- /dev/null
+++ b/core/administrator/components/com_media/views/medialist/view.html.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Media component
+ *
+ * @since  1.0
+ */
+class MediaViewMediaList extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.0
+	 */
+	public function display($tpl = null)
+	{
+		$app = JFactory::getApplication();
+
+		if (!$app->isClient('administrator'))
+		{
+			return $app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+		}
+
+		// Do not allow cache
+		$app->allowCache(false);
+
+		$this->images    = $this->get('images');
+		$this->documents = $this->get('documents');
+		$this->folders   = $this->get('folders');
+		$this->videos    = $this->get('videos');
+		$this->state     = $this->get('state');
+
+		// Check for invalid folder name
+		if (empty($this->state->folder))
+		{
+			$dirname = JFactory::getApplication()->input->getPath('folder', '');
+
+			if (!empty($dirname))
+			{
+				$dirname = htmlspecialchars($dirname, ENT_COMPAT, 'UTF-8');
+				JError::raiseWarning(100, JText::sprintf('COM_MEDIA_ERROR_UNABLE_TO_BROWSE_FOLDER_WARNDIRNAME', $dirname));
+			}
+		}
+
+		$user = JFactory::getUser();
+		$this->canDelete = $user->authorise('core.delete', 'com_media');
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_menus/access.xml b/core/administrator/components/com_menus/access.xml
new file mode 100644
index 00000000..c709842e
--- /dev/null
+++ b/core/administrator/components/com_menus/access.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_menus">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+	<section name="menu">
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_menus/config.xml b/core/administrator/components/com_menus/config.xml
new file mode 100644
index 00000000..3b1b94a2
--- /dev/null
+++ b/core/administrator/components/com_menus/config.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="page-options"
+		label="COM_MENUS_PAGE_OPTIONS_LABEL"
+		>
+
+		<field
+			name="page_title"
+			type="text"
+			label="COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC"
+			default=""
+		/>
+
+		<field
+			name="show_page_heading"
+			type="radio"
+			label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL"
+			description="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="page_heading"
+			type="text"
+			label="COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL"
+			description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC"
+			default=""
+			showon="show_page_heading:1"
+		/>
+
+		<field
+			name="pageclass_sfx"
+			type="text"
+			label="COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL"
+			description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC"
+			default=""
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_menus"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_menus/controller.php b/core/administrator/components/com_menus/controller.php
new file mode 100644
index 00000000..0a7c4518
--- /dev/null
+++ b/core/administrator/components/com_menus/controller.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base controller class for Menu Manager.
+ *
+ * @since  1.6
+ */
+class MenusController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean        $cachable   If true, the view output will be cached
+	 * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController    This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+		// Check custom administrator menu modules
+		if (JModuleHelper::isAdminMultilang())
+		{
+			$languages = JLanguageHelper::getInstalledLanguages(1, true);
+			$langCodes = array();
+
+			foreach ($languages as $language)
+			{
+				if (isset($language->metadata['nativeName']))
+				{
+					$languageName = $language->metadata['nativeName'];
+				}
+				else
+				{
+					$languageName = $language->metadata['name'];
+				}
+
+				$langCodes[$language->metadata['tag']] = $languageName;
+			}
+
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->select($db->qn('m.language'))
+				->from($db->qn('#__modules', 'm'))
+				->where($db->qn('m.module') . ' = ' . $db->quote('mod_menu'))
+				->where($db->qn('m.published') . ' = 1')
+				->where($db->qn('m.client_id') . ' = 1')
+				->group($db->qn('m.language'));
+
+			$mLanguages = $db->setQuery($query)->loadColumn();
+
+			// Check if we have a mod_menu module set to All languages or a mod_menu module for each admin language.
+			if (!in_array('*', $mLanguages) && count($langMissing = array_diff(array_keys($langCodes), $mLanguages)))
+			{
+				$app         = JFactory::getApplication();
+				$langMissing = array_intersect_key($langCodes, array_flip($langMissing));
+
+				$app->enqueueMessage(JText::sprintf('JMENU_MULTILANG_WARNING_MISSING_MODULES', implode(', ', $langMissing)), 'warning');
+			}
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_menus/controllers/item.php b/core/administrator/components/com_menus/controllers/item.php
new file mode 100644
index 00000000..e8ec6e2b
--- /dev/null
+++ b/core/administrator/components/com_menus/controllers/item.php
@@ -0,0 +1,613 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Menu Item Controller
+ *
+ * @since  1.6
+ */
+class MenusControllerItem extends JControllerForm
+{
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user = JFactory::getUser();
+
+		$menuType = JFactory::getApplication()->input->getCmd('menutype', isset($data['menutype']) ? $data['menutype'] : '');
+
+		$menutypeID = 0;
+
+		// Load menutype ID
+		if ($menuType)
+		{
+			$menutypeID = (int) $this->getMenuTypeId($menuType);
+		}
+
+		return $user->authorise('core.create', 'com_menus.menu.' . $menutypeID);
+	}
+
+	/**
+	 * Method to check if you edit a record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key; default is id.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$user = JFactory::getUser();
+
+		$menutypeID = 0;
+
+		if (isset($data[$key]))
+		{
+			$model = $this->getModel();
+			$item = $model->getItem($data[$key]);
+
+			if (!empty($item->menutype))
+			{
+				// Protected menutype, do not allow edit
+				if ($item->menutype == 'main')
+				{
+					return false;
+				}
+
+				$menutypeID = (int) $this->getMenuTypeId($item->menutype);
+			}
+		}
+
+		return $user->authorise('core.edit', 'com_menus.menu.' . (int) $menutypeID);
+	}
+
+	/**
+	 * Loads the menutype ID by a given menutype string
+	 *
+	 * @param   string  $menutype  The given menutype
+	 *
+	 * @return integer
+	 *
+	 * @since  3.6
+	 */
+	protected function getMenuTypeId($menutype)
+	{
+		$model = $this->getModel();
+		$table = $model->getTable('MenuType', 'JTable');
+
+		$table->load(array('menutype' => $menutype));
+
+		return (int) $table->id;
+	}
+
+	/**
+	 * Method to add a new menu item.
+	 *
+	 * @return  mixed  True if the record can be added, a JError object if not.
+	 *
+	 * @since   1.6
+	 */
+	public function add()
+	{
+		$app = JFactory::getApplication();
+		$context = 'com_menus.edit.item';
+
+		$result = parent::add();
+
+		if ($result)
+		{
+			$app->setUserState($context . '.type', null);
+			$app->setUserState($context . '.link', null);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean	 True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   1.6
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('Item', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_menus&view=items' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+		$context = 'com_menus.edit.item';
+		$result = parent::cancel();
+
+		if ($result)
+		{
+			// Clear the ancillary data from the session.
+			$app->setUserState($context . '.type', null);
+			$app->setUserState($context . '.link', null);
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend()
+					. '&menutype=' . $app->getUserState('com_menus.items.menutype'), false
+				)
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 * (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		$app = JFactory::getApplication();
+		$result = parent::edit();
+
+		if ($result)
+		{
+			// Push the new ancillary data into the session.
+			$app->setUserState('com_menus.edit.item.type', null);
+			$app->setUserState('com_menus.edit.item.link', null);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   12.2
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
+
+		if ($recordId)
+		{
+			$model    = $this->getModel();
+			$item     = $model->getItem($recordId);
+			$clientId = $item->client_id;
+			$append   = '&client_id=' . $clientId . $append;
+		}
+		else
+		{
+			$app      = JFactory::getApplication();
+			$clientId = $app->input->get('client_id', '0', 'int');
+			$menuType = $app->input->get('menutype', 'mainmenu', 'cmd');
+			$append   = '&client_id=' . $clientId . ($menuType ? '&menutype=' . $menuType : '') . $append;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$model    = $this->getModel('Item', '', array());
+		$table    = $model->getTable();
+		$data     = $this->input->post->get('jform', array(), 'array');
+		$task     = $this->getTask();
+		$context  = 'com_menus.edit.item';
+
+		// Set the menutype should we need it.
+		if ($data['menutype'] !== '')
+		{
+			$app->input->set('menutype', $data['menutype']);
+		}
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		$recordId = $this->input->getInt($urlVar);
+
+		// Populate the row id from the session.
+		$data[$key] = $recordId;
+
+		// The save2copy task needs to be handled slightly differently.
+		if ($task == 'save2copy')
+		{
+			// Check-in the original row.
+			if ($model->checkin($data['id']) === false)
+			{
+				// Check-in failed, go back to the item and display a notice.
+				$this->setMessage(JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'warning');
+
+				return false;
+			}
+
+			// Reset the ID and then treat the request as for Apply.
+			$data['id'] = 0;
+			$data['associations'] = array();
+			$task = 'apply';
+		}
+
+		// Access check.
+		if (!$this->allowSave($data, $key))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+
+			return false;
+		}
+
+		// Validate the posted data.
+		// This post is made up of two forms, one for the item and one for params.
+		$form = $model->getForm($data);
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		if ($data['type'] == 'url')
+		{
+			$data['link'] = str_replace(array('"', '>', '<'), '', $data['link']);
+
+			if (strstr($data['link'], ':'))
+			{
+				$segments = explode(':', $data['link']);
+				$protocol = strtolower($segments[0]);
+				$scheme   = array(
+					'http', 'https', 'ftp', 'ftps', 'gopher', 'mailto',
+					'news', 'prospero', 'telnet', 'rlogin', 'tn3270', 'wais',
+					'mid', 'cid', 'nntp', 'tel', 'urn', 'ldap', 'file', 'fax',
+					'modem', 'git', 'sms',
+				);
+
+				if (!in_array($protocol, $scheme))
+				{
+					$app->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'warning');
+					$this->setRedirect(
+						JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId), false)
+					);
+
+					return false;
+				}
+			}
+		}
+
+		$data = $model->validate($form, $data);
+
+		// Preprocess request fields to ensure that we remove not set or empty request params
+		$request = $form->getGroup('request');
+
+		// Check for the special 'request' entry.
+		if ($data['type'] == 'component' && !empty($request))
+		{
+			$removeArgs = array();
+
+			if (!isset($data['request']) || !is_array($data['request']))
+			{
+				$data['request'] = array();
+			}
+
+			foreach ($request as $field)
+			{
+				$fieldName = $field->getAttribute('name');
+
+				if (!isset($data['request'][$fieldName]) || $data['request'][$fieldName] == '')
+				{
+					$removeArgs[$fieldName] = '';
+				}
+			}
+
+			// Parse the submitted link arguments.
+			$args = array();
+			parse_str(parse_url($data['link'], PHP_URL_QUERY), $args);
+
+			// Merge in the user supplied request arguments.
+			$args = array_merge($args, $data['request']);
+
+			// Remove the unused request params
+			if (!empty($args) && !empty($removeArgs))
+			{
+				$args = array_diff_key($args, $removeArgs);
+			}
+
+			$data['link'] = 'index.php?' . urldecode(http_build_query($args, '', '&'));
+			unset($data['request']);
+		}
+
+		// Check for validation errors.
+		if ($data === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState('com_menus.edit.item.data', $data);
+
+			// Redirect back to the edit screen.
+			$editUrl = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId);
+			$this->setRedirect(JRoute::_($editUrl, false));
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($data))
+		{
+			// Save the data in the session.
+			$app->setUserState('com_menus.edit.item.data', $data);
+
+			// Redirect back to the edit screen.
+			$editUrl = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId);
+			$this->setMessage(JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
+			$this->setRedirect(JRoute::_($editUrl, false));
+
+			return false;
+		}
+
+		// Save succeeded, check-in the row.
+		if ($model->checkin($data['id']) === false)
+		{
+			// Check-in failed, go back to the row and display a notice.
+			$this->setMessage(JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'warning');
+			$redirectUrl = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId);
+			$this->setRedirect(JRoute::_($redirectUrl, false));
+
+			return false;
+		}
+
+		$this->setMessage(JText::_('COM_MENUS_SAVE_SUCCESS'));
+
+		// Redirect the user and adjust session state based on the chosen task.
+		switch ($task)
+		{
+			case 'apply':
+				// Set the row data in the session.
+				$recordId = $model->getState($this->context . '.id');
+				$this->holdEditId($context, $recordId);
+				$app->setUserState('com_menus.edit.item.data', null);
+				$app->setUserState('com_menus.edit.item.type', null);
+				$app->setUserState('com_menus.edit.item.link', null);
+
+				// Redirect back to the edit screen.
+				$editUrl = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId);
+				$this->setRedirect(JRoute::_($editUrl, false));
+				break;
+
+			case 'save2new':
+				// Clear the row id and data in the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState('com_menus.edit.item.data', null);
+				$app->setUserState('com_menus.edit.item.type', null);
+				$app->setUserState('com_menus.edit.item.link', null);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend(), false));
+				break;
+
+			default:
+				// Clear the row id and data in the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState('com_menus.edit.item.data', null);
+				$app->setUserState('com_menus.edit.item.type', null);
+				$app->setUserState('com_menus.edit.item.link', null);
+
+				// Redirect to the list screen.
+				$this->setRedirect(
+					JRoute::_(
+						'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend()
+						. '&menutype=' . $app->getUserState('com_menus.items.menutype'), false
+					)
+				);
+				break;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Sets the type of the menu item currently being edited.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function setType()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+
+		// Get the posted values from the request.
+		$data = $this->input->post->get('jform', array(), 'array');
+
+		// Get the type.
+		$type = $data['type'];
+
+		$type = json_decode(base64_decode($type));
+		$title = isset($type->title) ? $type->title : null;
+		$recordId = isset($type->id) ? $type->id : 0;
+
+		$specialTypes = array('alias', 'separator', 'url', 'heading', 'container');
+
+		if (!in_array($title, $specialTypes))
+		{
+			$title = 'component';
+		}
+		else
+		{
+			// Set correct component id to ensure proper 404 messages with system links
+			$data['component_id'] = 0;
+		}
+
+		$app->setUserState('com_menus.edit.item.type', $title);
+
+		if ($title == 'component')
+		{
+			if (isset($type->request))
+			{
+				// Clean component name
+				$type->request->option = JFilterInput::getInstance()->clean($type->request->option, 'CMD');
+
+				$component = JComponentHelper::getComponent($type->request->option);
+				$data['component_id'] = $component->id;
+
+				$app->setUserState('com_menus.edit.item.link', 'index.php?' . JUri::buildQuery((array) $type->request));
+			}
+		}
+		// If the type is alias you just need the item id from the menu item referenced.
+		elseif ($title == 'alias')
+		{
+			$app->setUserState('com_menus.edit.item.link', 'index.php?Itemid=');
+		}
+
+		unset($data['request']);
+
+		$data['type'] = $title;
+
+		if ($this->input->get('fieldtype') == 'type')
+		{
+			$data['link'] = $app->getUserState('com_menus.edit.item.link');
+		}
+
+		// Save the data in the session.
+		$app->setUserState('com_menus.edit.item.data', $data);
+
+		$this->type = $type;
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($recordId), false));
+	}
+
+	/**
+	 * Gets the parent items of the menu location currently.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function getParentItem()
+	{
+		$app = JFactory::getApplication();
+
+		$results  = array();
+		$menutype = $this->input->get->get('menutype');
+
+		if ($menutype)
+		{
+			$model = $this->getModel('Items', '', array());
+			$model->getState();
+			$model->setState('filter.menutype', $menutype);
+			$model->setState('list.select', 'a.id, a.title, a.level');
+			$model->setState('list.start', '0');
+			$model->setState('list.limit', '0');
+
+			/** @var  MenusModelItems  $model */
+			$results = $model->getItems();
+
+			// Pad the option text with spaces using depth level as a multiplier.
+			for ($i = 0, $n = count($results); $i < $n; $i++)
+			{
+				$results[$i]->title = str_repeat(' - ', $results[$i]->level) . $results[$i]->title;
+			}
+		}
+
+		// Output a JSON object
+		echo json_encode($results);
+
+		$app->close();
+	}
+}
diff --git a/core/administrator/components/com_menus/controllers/items.php b/core/administrator/components/com_menus/controllers/items.php
new file mode 100644
index 00000000..b215017c
--- /dev/null
+++ b/core/administrator/components/com_menus/controllers/items.php
@@ -0,0 +1,315 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * The Menu Item Controller
+ *
+ * @since  1.6
+ */
+class MenusControllerItems extends JControllerAdmin
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  Optional configuration array
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+		$this->registerTask('unsetDefault',	'setDefault');
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Item', $prefix = 'MenusModel', $config = array())
+	{
+		return parent::getModel($name, $prefix, array('ignore_request' => true));
+	}
+
+	/**
+	 * Rebuild the nested set tree.
+	 *
+	 * @return  boolean  False on failure or error, true on success.
+	 *
+	 * @since   1.6
+	 */
+	public function rebuild()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$this->setRedirect('index.php?option=com_menus&view=items');
+
+		$model = $this->getModel();
+
+		if ($model->rebuild())
+		{
+			// Reorder succeeded.
+			$this->setMessage(JText::_('COM_MENUS_ITEMS_REBUILD_SUCCESS'));
+
+			return true;
+		}
+		else
+		{
+			// Rebuild failed.
+			$this->setMessage(JText::sprintf('COM_MENUS_ITEMS_REBUILD_FAILED'), 'error');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Save the manual order inputs from the menu items list view
+	 *
+	 * @return      void
+	 *
+	 * @see         JControllerAdmin::saveorder()
+	 * @deprecated  4.0
+	 */
+	public function saveorder()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Function will be removed in 4.0.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get the arrays from the Request
+		$order = $this->input->post->get('order', null, 'array');
+		$originalOrder = explode(',', $this->input->getString('original_order_values'));
+
+		// Make sure something has changed
+		if (!($order === $originalOrder))
+		{
+			parent::saveorder();
+		}
+		else
+		{
+			// Nothing to reorder
+			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to set the home property for a list of items
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function setDefault()
+	{
+		// Check for request forgeries
+		JSession::checkToken('request') or die(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+
+		// Get items to publish from the request.
+		$cid   = $this->input->get('cid', array(), 'array');
+		$data  = array('setDefault' => 1, 'unsetDefault' => 0);
+		$task  = $this->getTask();
+		$value = ArrayHelper::getValue($data, $task, 0, 'int');
+
+		if (empty($cid))
+		{
+			JError::raiseWarning(500, JText::_($this->text_prefix . '_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Publish the items.
+			if (!$model->setHome($cid, $value))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				if ($value == 1)
+				{
+					$ntext = 'COM_MENUS_ITEMS_SET_HOME';
+				}
+				else
+				{
+					$ntext = 'COM_MENUS_ITEMS_UNSET_HOME';
+				}
+
+				$this->setMessage(JText::plural($ntext, count($cid)));
+			}
+		}
+
+		$this->setRedirect(
+			JRoute::_(
+				'index.php?option=' . $this->option . '&view=' . $this->view_list
+				. '&menutype=' . $app->getUserState('com_menus.items.menutype'), false
+			)
+		);
+	}
+
+	/**
+	 * Method to publish a list of items
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function publish()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
+
+		// Get items to publish from the request.
+		$cid = JFactory::getApplication()->input->get('cid', array(), 'array');
+		$data = array('publish' => 1, 'unpublish' => 0, 'trash' => -2, 'report' => -3);
+		$task = $this->getTask();
+		$value = ArrayHelper::getValue($data, $task, 0, 'int');
+
+		if (empty($cid))
+		{
+			try
+			{
+				JLog::add(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), JLog::WARNING, 'jerror');
+			}
+			catch (RuntimeException $exception)
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), 'warning');
+			}
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Publish the items.
+			try
+			{
+				$model->publish($cid, $value);
+				$errors      = $model->getErrors();
+				$messageType = 'message';
+
+				if ($value == 1)
+				{
+					if ($errors)
+					{
+						$messageType = 'error';
+						$ntext       = $this->text_prefix . '_N_ITEMS_FAILED_PUBLISHING';
+					}
+					else
+					{
+						$ntext = $this->text_prefix . '_N_ITEMS_PUBLISHED';
+					}
+				}
+				elseif ($value == 0)
+				{
+					$ntext = $this->text_prefix . '_N_ITEMS_UNPUBLISHED';
+				}
+				else
+				{
+					$ntext = $this->text_prefix . '_N_ITEMS_TRASHED';
+				}
+
+				$this->setMessage(JText::plural($ntext, count($cid)), $messageType);
+			}
+			catch (Exception $e)
+			{
+				$this->setMessage($e->getMessage(), 'error');
+			}
+		}
+
+		$this->setRedirect(
+			JRoute::_(
+				'index.php?option=' . $this->option . '&view=' . $this->view_list . '&menutype=' .
+				JFactory::getApplication()->getUserState('com_menus.items.menutype'),
+				false
+			)
+		);
+	}
+
+	/**
+	 * Check in of one or more records.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.6.0
+	 */
+	public function checkin()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids = JFactory::getApplication()->input->post->get('cid', array(), 'array');
+
+		$model = $this->getModel();
+		$return = $model->checkin($ids);
+
+		if ($return === false)
+		{
+			// Checkin failed.
+			$message = JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError());
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. '&menutype=' . JFactory::getApplication()->getUserState('com_menus.items.menutype'),
+					false
+				),
+				$message,
+				'error'
+			);
+
+			return false;
+		}
+		else
+		{
+			// Checkin succeeded.
+			$message = JText::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', count($ids));
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. '&menutype=' . JFactory::getApplication()->getUserState('com_menus.items.menutype'),
+					false
+				),
+				$message
+			);
+
+			return true;
+		}
+	}
+}
diff --git a/core/administrator/components/com_menus/controllers/menu.php b/core/administrator/components/com_menus/controllers/menu.php
new file mode 100644
index 00000000..4f115dd2
--- /dev/null
+++ b/core/administrator/components/com_menus/controllers/menu.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Menu Type Controller
+ *
+ * @since  1.6
+ */
+class MenusControllerMenu extends JControllerForm
+{
+	/**
+	 * Dummy method to redirect back to standard controller
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menus', false));
+	}
+
+	/**
+	 * Method to save a menu item.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$data     = $this->input->post->get('jform', array(), 'array');
+		$context  = 'com_menus.edit.menu';
+		$task     = $this->getTask();
+		$recordId = $this->input->getInt('id');
+
+		// Prevent using 'main' as menutype as this is reserved for backend menus
+		if (strtolower($data['menutype']) == 'main')
+		{
+			$msg = JText::_('COM_MENUS_ERROR_MENUTYPE');
+			JFactory::getApplication()->enqueueMessage($msg, 'error');
+
+			// Redirect back to the edit screen.
+			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false));
+
+			return false;
+		}
+
+		// Populate the row id from the session.
+		$data['id'] = $recordId;
+
+		// Get the model and attempt to validate the posted data.
+		$model = $this->getModel('Menu');
+		$form  = $model->getForm();
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		$validData = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($validData === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false));
+
+			return false;
+		}
+
+		if (isset($validData['preset']))
+		{
+			$preset = trim($validData['preset']) ?: null;
+
+			unset($validData['preset']);
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($validData))
+		{
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $validData);
+
+			// Redirect back to the edit screen.
+			$this->setMessage(JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false));
+
+			return false;
+		}
+
+		// Import the preset selected
+		if (isset($preset) && $data['client_id'] == 1)
+		{
+			try
+			{
+				MenusHelper::installPreset($preset, $data['menutype']);
+
+				$this->setMessage(JText::_('COM_MENUS_PRESET_IMPORT_SUCCESS'));
+			}
+			catch (Exception $e)
+			{
+				// Save was successful but the preset could not be loaded. Let it through with just a warning
+				$this->setMessage(JText::sprintf('COM_MENUS_PRESET_IMPORT_FAILED', $e->getMessage()));
+			}
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_MENUS_MENU_SAVE_SUCCESS'));
+		}
+
+		// Redirect the user and adjust session state based on the chosen task.
+		switch ($task)
+		{
+			case 'apply':
+				// Set the record data in the session.
+				$recordId = $model->getState($this->context . '.id');
+				$this->holdEditId($context, $recordId);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit' . $this->getRedirectToItemAppend($recordId), false));
+				break;
+
+			case 'save2new':
+				// Clear the record id and data from the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false));
+				break;
+
+			default:
+				// Clear the record id and data from the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+
+				// Redirect to the list screen.
+				$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menus', false));
+				break;
+		}
+	}
+
+	/**
+	 * Method to display a menu as preset xml.
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   3.8.0
+	 */
+	public function exportXml()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$cid   = $this->input->get('cid', array(), 'array');
+		$model = $this->getModel('Menu');
+		$item  = $model->getItem(reset($cid));
+
+		if (!$item->menutype)
+		{
+			$this->setMessage(JText::_('COM_MENUS_SELECT_MENU_FIRST_EXPORT'), 'warning');
+
+			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menus', false));
+
+			return false;
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&menutype=' . $item->menutype . '&format=xml', false));
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_menus/controllers/menus.php b/core/administrator/components/com_menus/controllers/menus.php
new file mode 100644
index 00000000..37548915
--- /dev/null
+++ b/core/administrator/components/com_menus/controllers/menus.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * The Menu List Controller
+ *
+ * @since  1.6
+ */
+class MenusControllerMenus extends JControllerLegacy
+{
+	/**
+	 * Display the view
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController        This object to support chaining.
+	 *
+	 * @since   1.6
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Menu', $prefix = 'MenusModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Remove an item.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function delete()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user = JFactory::getUser();
+		$app  = JFactory::getApplication();
+		$cids = (array) $this->input->get('cid', array(), 'array');
+
+		if (count($cids) < 1)
+		{
+			$app->enqueueMessage(JText::_('COM_MENUS_NO_MENUS_SELECTED'), 'notice');
+		}
+		else
+		{
+			// Access checks.
+			foreach ($cids as $i => $id)
+			{
+				if (!$user->authorise('core.delete', 'com_menus.menu.' . (int) $id))
+				{
+					// Prune items that you can't change.
+					unset($cids[$i]);
+					$app->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 'error');
+				}
+			}
+
+			if (count($cids) > 0)
+			{
+				// Get the model.
+				$model = $this->getModel();
+
+				// Make sure the item ids are integers
+				$cids = ArrayHelper::toInteger($cids);
+
+				// Remove the items.
+				if (!$model->delete($cids))
+				{
+					$this->setMessage($model->getError(), 'error');
+				}
+				else
+				{
+					$this->setMessage(JText::plural('COM_MENUS_N_MENUS_DELETED', count($cids)));
+				}
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_menus&view=menus');
+	}
+
+	/**
+	 * Rebuild the menu tree.
+	 *
+	 * @return  boolean  False on failure or error, true on success.
+	 *
+	 * @since   1.6
+	 */
+	public function rebuild()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$this->setRedirect('index.php?option=com_menus&view=menus');
+
+		$model = $this->getModel('Item');
+
+		if ($model->rebuild())
+		{
+			// Reorder succeeded.
+			$this->setMessage(JText::_('JTOOLBAR_REBUILD_SUCCESS'));
+
+			return true;
+		}
+		else
+		{
+			// Rebuild failed.
+			$this->setMessage(JText::sprintf('JTOOLBAR_REBUILD_FAILED', $model->getError()), 'error');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Temporary method. This should go into the 1.5 to 1.6 upgrade routines.
+	 *
+	 * @return  JException|void  JException instance on error
+	 *
+	 * @since   1.6
+	 */
+	public function resync()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$parts = null;
+
+		try
+		{
+			$query->select('element, extension_id')
+				->from('#__extensions')
+				->where('type = ' . $db->quote('component'));
+			$db->setQuery($query);
+
+			$components = $db->loadAssocList('element', 'extension_id');
+		}
+		catch (RuntimeException $e)
+		{
+			return JError::raiseWarning(500, $e->getMessage());
+		}
+
+		// Load all the component menu links
+		$query->select($db->quoteName('id'))
+			->select($db->quoteName('link'))
+			->select($db->quoteName('component_id'))
+			->from('#__menu')
+			->where($db->quoteName('type') . ' = ' . $db->quote('component.item'));
+			$db->setQuery($query);
+
+		try
+		{
+			$items = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return JError::raiseWarning(500, $e->getMessage());
+		}
+
+		foreach ($items as $item)
+		{
+			// Parse the link.
+			parse_str(parse_url($item->link, PHP_URL_QUERY), $parts);
+
+			// Tease out the option.
+			if (isset($parts['option']))
+			{
+				$option = $parts['option'];
+
+				// Lookup the component ID
+				if (isset($components[$option]))
+				{
+					$componentId = $components[$option];
+				}
+				else
+				{
+					// Mismatch. Needs human intervention.
+					$componentId = -1;
+				}
+
+				// Check for mis-matched component id's in the menu link.
+				if ($item->component_id != $componentId)
+				{
+					// Update the menu table.
+					$log = "Link $item->id refers to $item->component_id, converting to $componentId ($item->link)";
+					echo "<br />$log";
+
+					$query->clear();
+					$query->update('#__menu')
+						->set('component_id = ' . $componentId)
+						->where('id = ' . $item->id);
+
+					try
+					{
+						$db->setQuery($query)->execute();
+					}
+					catch (RuntimeException $e)
+					{
+						return JError::raiseWarning(500, $e->getMessage());
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_menus/helpers/associations.php b/core/administrator/components/com_menus/helpers/associations.php
new file mode 100644
index 00000000..780e9414
--- /dev/null
+++ b/core/administrator/components/com_menus/helpers/associations.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Association\AssociationExtensionHelper;
+
+/**
+ * Menu associations helper.
+ *
+ * @since  3.7.0
+ */
+class MenusAssociationsHelper extends AssociationExtensionHelper
+{
+	/**
+	 * The extension name
+	 *
+	 * @var     array   $extension
+	 *
+	 * @since   3.7.0
+	 */
+	protected $extension = 'com_menus';
+
+	/**
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
+	 *
+	 * @since   3.7.0
+	 */
+	protected $itemTypes = array('item');
+
+	/**
+	 * Has the extension association support
+	 *
+	 * @var     boolean   $associationsSupport
+	 *
+	 * @since   3.7.0
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context = $this->extension . '.item';
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			''
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'item':
+				$table = JTable::getInstance('menu');
+				break;
+		}
+
+		if (is_null($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since   3.7.0
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+			switch ($typeName)
+			{
+				case 'item':
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+					$fields['created_user_id'] = '';
+					$fields['menutype'] = 'a.menutype';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['level'] = true;
+
+					$tables = array(
+						'a' => '#__menu'
+					);
+
+					$title = 'menu';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}
diff --git a/core/administrator/components/com_menus/helpers/html/menus.php b/core/administrator/components/com_menus/helpers/html/menus.php
new file mode 100644
index 00000000..a6bc2160
--- /dev/null
+++ b/core/administrator/components/com_menus/helpers/html/menus.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Menus HTML helper class.
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ * @since       1.7
+ */
+abstract class MenusHtmlMenus
+{
+	/**
+	 * Generate the markup to display the item associations
+	 *
+	 * @param   int  $itemid  The menu item id
+	 *
+	 * @return  string
+	 *
+	 * @since   3.0
+	 *
+	 * @throws Exception If there is an error on the query
+	 */
+	public static function association($itemid)
+	{
+		// Defaults
+		$html = '';
+
+		// Get the associations
+		if ($associations = MenusHelper::getAssociations($itemid))
+		{
+			// Get the associated menu items
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('m.id, m.title')
+				->select('l.sef as lang_sef, l.lang_code')
+				->select('mt.title as menu_title')
+				->from('#__menu as m')
+				->join('LEFT', '#__menu_types as mt ON mt.menutype=m.menutype')
+				->where('m.id IN (' . implode(',', array_values($associations)) . ')')
+				->where('m.id != ' . $itemid)
+				->join('LEFT', '#__languages as l ON m.language=l.lang_code')
+				->select('l.image')
+				->select('l.title as language_title');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('id');
+			}
+			catch (runtimeException $e)
+			{
+				throw new Exception($e->getMessage(), 500);
+			}
+
+			// Construct html
+			if ($items)
+			{
+				foreach ($items as &$item)
+				{
+					$text = strtoupper($item->lang_sef);
+					$url = JRoute::_('index.php?option=com_menus&task=item.edit&id=' . (int) $item->id);
+
+					$tooltip = htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br />' . JText::sprintf('COM_MENUS_MENU_SPRINTF', $item->menu_title);
+					$classes = 'hasPopover label label-association label-' . $item->lang_sef;
+
+					$item->link = '<a href="' . $url . '" title="' . $item->language_title . '" class="' . $classes
+						. '" data-content="' . $tooltip . '" data-placement="top">'
+						. $text . '</a>';
+				}
+			}
+
+			JHtml::_('bootstrap.popover');
+
+			$html = JLayoutHelper::render('joomla.content.associations', $items);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Returns a published state on a grid
+	 *
+	 * @param   integer  $value     The state value.
+	 * @param   integer  $i         The row index
+	 * @param   boolean  $enabled   An optional setting for access control on the action.
+	 * @param   string   $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string        The Html code
+	 *
+	 * @see JHtmlJGrid::state
+	 *
+	 * @since   1.7.1
+	 */
+	public static function state($value, $i, $enabled = true, $checkbox = 'cb')
+	{
+		$states = array(
+			9  => array(
+				'unpublish',
+				'',
+				'COM_MENUS_HTML_UNPUBLISH_HEADING',
+				'',
+				true,
+				'publish',
+				'publish',
+			),
+			8  => array(
+				'publish',
+				'',
+				'COM_MENUS_HTML_PUBLISH_HEADING',
+				'',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+			7  => array(
+				'unpublish',
+				'',
+				'COM_MENUS_HTML_UNPUBLISH_SEPARATOR',
+				'',
+				true,
+				'publish',
+				'publish',
+			),
+			6  => array(
+				'publish',
+				'',
+				'COM_MENUS_HTML_PUBLISH_SEPARATOR',
+				'',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+			5  => array(
+				'unpublish',
+				'',
+				'COM_MENUS_HTML_UNPUBLISH_ALIAS',
+				'',
+				true,
+				'publish',
+				'publish',
+			),
+			4  => array(
+				'publish',
+				'',
+				'COM_MENUS_HTML_PUBLISH_ALIAS',
+				'',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+			3  => array(
+				'unpublish',
+				'',
+				'COM_MENUS_HTML_UNPUBLISH_URL',
+				'',
+				true,
+				'publish',
+				'publish',
+			),
+			2  => array(
+				'publish',
+				'',
+				'COM_MENUS_HTML_PUBLISH_URL',
+				'',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+			1  => array(
+				'unpublish',
+				'COM_MENUS_EXTENSION_PUBLISHED_ENABLED',
+				'COM_MENUS_HTML_UNPUBLISH_ENABLED',
+				'COM_MENUS_EXTENSION_PUBLISHED_ENABLED',
+				true,
+				'publish',
+				'publish',
+			),
+			0  => array(
+				'publish',
+				'COM_MENUS_EXTENSION_UNPUBLISHED_ENABLED',
+				'COM_MENUS_HTML_PUBLISH_ENABLED',
+				'COM_MENUS_EXTENSION_UNPUBLISHED_ENABLED',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+			-1 => array(
+				'unpublish',
+				'COM_MENUS_EXTENSION_PUBLISHED_DISABLED',
+				'COM_MENUS_HTML_UNPUBLISH_DISABLED',
+				'COM_MENUS_EXTENSION_PUBLISHED_DISABLED',
+				true,
+				'warning',
+				'warning',
+			),
+			-2 => array(
+				'publish',
+				'COM_MENUS_EXTENSION_UNPUBLISHED_DISABLED',
+				'COM_MENUS_HTML_PUBLISH_DISABLED',
+				'COM_MENUS_EXTENSION_UNPUBLISHED_DISABLED',
+				true,
+				'trash',
+				'trash',
+			),
+			-3 => array(
+				'publish',
+				'',
+				'COM_MENUS_HTML_PUBLISH',
+				'',
+				true,
+				'trash',
+				'trash',
+			),
+		);
+
+		return JHtml::_('jgrid.state', $states, $value, $i, 'items.', $enabled, true, $checkbox);
+	}
+
+	/**
+	 * Returns a visibility state on a grid
+	 *
+	 * @param   integer  $params  Params of item.
+	 *
+	 * @return  string  The Html code
+	 *
+	 * @since   3.7.0
+	 */
+	public static function visibility($params)
+	{
+		$registry = new Registry;
+
+		try
+		{
+			$registry->loadString($params);
+		}
+		catch (Exception $e)
+		{
+			// Invalid JSON
+		}
+
+		$show_menu = $registry->get('menu_show');
+
+		return ($show_menu === 0) ? '<span class="label">' . JText::_('COM_MENUS_LABEL_HIDDEN') . '</span>' : '';
+	}
+}
diff --git a/core/administrator/components/com_menus/helpers/menus.php b/core/administrator/components/com_menus/helpers/menus.php
new file mode 100644
index 00000000..29f51205
--- /dev/null
+++ b/core/administrator/components/com_menus/helpers/menus.php
@@ -0,0 +1,572 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Menu\MenuHelper;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+defined('_JEXEC') or die;
+
+/**
+ * Menus component helper.
+ *
+ * @since  1.6
+ */
+class MenusHelper
+{
+	/**
+	 * Defines the valid request variables for the reverse lookup.
+	 *
+	 * @since   1.6
+	 */
+	protected static $_filter = array('option', 'view', 'layout');
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_MENUS_SUBMENU_MENUS'),
+			'index.php?option=com_menus&view=menus',
+			$vName == 'menus'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_MENUS_SUBMENU_ITEMS'),
+			'index.php?option=com_menus&view=items',
+			$vName == 'items'
+		);
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @param   integer  $parentId  The menu ID.
+	 *
+	 * @return  JObject
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions($parentId = 0)
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_menus');
+	}
+
+	/**
+	 * Gets a standard form of a link for lookups.
+	 *
+	 * @param   mixed  $request  A link string or array of request variables.
+	 *
+	 * @return  mixed  A link in standard option-view-layout form, or false if the supplied response is invalid.
+	 *
+	 * @since   1.6
+	 */
+	public static function getLinkKey($request)
+	{
+		if (empty($request))
+		{
+			return false;
+		}
+
+		// Check if the link is in the form of index.php?...
+		if (is_string($request))
+		{
+			$args = array();
+
+			if (strpos($request, 'index.php') === 0)
+			{
+				parse_str(parse_url(htmlspecialchars_decode($request), PHP_URL_QUERY), $args);
+			}
+			else
+			{
+				parse_str($request, $args);
+			}
+
+			$request = $args;
+		}
+
+		// Only take the option, view and layout parts.
+		foreach ($request as $name => $value)
+		{
+			if ((!in_array($name, self::$_filter)) && (!($name == 'task' && !array_key_exists('view', $request))))
+			{
+				// Remove the variables we want to ignore.
+				unset($request[$name]);
+			}
+		}
+
+		ksort($request);
+
+		return 'index.php?' . http_build_query($request, '', '&');
+	}
+
+	/**
+	 * Get the menu list for create a menu module
+	 *
+	 * @param   int  $clientId  Optional client id - viz 0 = site, 1 = administrator, can be NULL for all
+	 *
+	 * @return  array  The menu array list
+	 *
+	 * @since    1.6
+	 */
+	public static function getMenuTypes($clientId = 0)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.menutype')
+			->from('#__menu_types AS a');
+
+		if (isset($clientId))
+		{
+			$query->where('a.client_id = ' . (int) $clientId);
+		}
+
+		$db->setQuery($query);
+
+		return $db->loadColumn();
+	}
+
+	/**
+	 * Get a list of menu links for one or all menus.
+	 *
+	 * @param   string   $menuType   An option menu to filter the list on, otherwise all menu with given client id links
+	 *                               are returned as a grouped array.
+	 * @param   integer  $parentId   An optional parent ID to pivot results around.
+	 * @param   integer  $mode       An optional mode. If parent ID is set and mode=2, the parent and children are excluded from the list.
+	 * @param   array    $published  An optional array of states
+	 * @param   array    $languages  Optional array of specify which languages we want to filter
+	 * @param   int      $clientId   Optional client id - viz 0 = site, 1 = administrator, can be NULL for all (used only if menutype not givein)
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0, $published = array(), $languages = array(), $clientId = 0)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT(a.id) AS value,
+					  a.title AS text,
+					  a.alias,
+					  a.level,
+					  a.menutype,
+					  a.client_id,
+					  a.type,
+					  a.published,
+					  a.template_style_id,
+					  a.checked_out,
+					  a.language,
+					  a.lft'
+			)
+			->from('#__menu AS a');
+
+		$query->select('e.name as componentname, e.element')
+			->join('left', '#__extensions e ON e.extension_id = a.component_id');
+
+		if (JLanguageMultilang::isEnabled())
+		{
+			$query->select('l.title AS language_title, l.image AS language_image, l.sef AS language_sef')
+				->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+		}
+
+		// Filter by the type if given, this is more specific than client id
+		if ($menuType)
+		{
+			$query->where('(a.menutype = ' . $db->quote($menuType) . ' OR a.parent_id = 0)');
+		}
+		elseif (isset($clientId))
+		{
+			$query->where('a.client_id = ' . (int) $clientId);
+		}
+
+		// Prevent the parent and children from showing if requested.
+		if ($parentId && $mode == 2)
+		{
+			$query->join('LEFT', '#__menu AS p ON p.id = ' . (int) $parentId)
+				->where('(a.lft <= p.lft OR a.rgt >= p.rgt)');
+		}
+
+		if (!empty($languages))
+		{
+			if (is_array($languages))
+			{
+				$languages = '(' . implode(',', array_map(array($db, 'quote'), $languages)) . ')';
+			}
+
+			$query->where('a.language IN ' . $languages);
+		}
+
+		if (!empty($published))
+		{
+			if (is_array($published))
+			{
+				$published = '(' . implode(',', $published) . ')';
+			}
+
+			$query->where('a.published IN ' . $published);
+		}
+
+		$query->where('a.published != -2');
+		$query->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$links = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return false;
+		}
+
+		if (empty($menuType))
+		{
+			// If the menutype is empty, group the items by menutype.
+			$query->clear()
+				->select('*')
+				->from('#__menu_types')
+				->where('menutype <> ' . $db->quote(''))
+				->order('title, menutype');
+
+			if (isset($clientId))
+			{
+				$query->where('client_id = ' . (int) $clientId);
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$menuTypes = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+
+				return false;
+			}
+
+			// Create a reverse lookup and aggregate the links.
+			$rlu = array();
+
+			foreach ($menuTypes as &$type)
+			{
+				$rlu[$type->menutype] = & $type;
+				$type->links = array();
+			}
+
+			// Loop through the list of menu links.
+			foreach ($links as &$link)
+			{
+				if (isset($rlu[$link->menutype]))
+				{
+					$rlu[$link->menutype]->links[] = & $link;
+
+					// Cleanup garbage.
+					unset($link->menutype);
+				}
+			}
+
+			return $menuTypes;
+		}
+		else
+		{
+			return $links;
+		}
+	}
+
+	/**
+	 * Get the associations
+	 *
+	 * @param   integer  $pk  Menu item id
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 */
+	public static function getAssociations($pk)
+	{
+		$langAssociations = JLanguageAssociations::getAssociations('com_menus', '#__menu', 'com_menus.item', $pk, 'id', '', '');
+		$associations     = array();
+
+		foreach ($langAssociations as $langAssociation)
+		{
+			$associations[$langAssociation->language] = $langAssociation->id;
+		}
+
+		return $associations;
+	}
+
+	/**
+	 * Load the menu items from database for the given menutype
+	 *
+	 * @param   string   $menutype     The selected menu type
+	 * @param   boolean  $enabledOnly  Whether to load only enabled/published menu items.
+	 * @param   int[]    $exclude      The menu items to exclude from the list
+	 *
+	 * @return  array
+	 *
+	 * @since   3.8.0
+	 */
+	public static function getMenuItems($menutype, $enabledOnly = false, $exclude = array())
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Prepare the query.
+		$query->select('m.*')
+			->from('#__menu AS m')
+			->where('m.menutype = ' . $db->q($menutype))
+			->where('m.client_id = 1')
+			->where('m.id > 1');
+
+		if ($enabledOnly)
+		{
+			$query->where('m.published = 1');
+		}
+
+		// Filter on the enabled states.
+		$query->select('e.element')
+			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+			->where('(e.enabled = 1 OR e.enabled IS NULL)');
+
+		if (count($exclude))
+		{
+			$exId = array_filter($exclude, 'is_numeric');
+			$exEl = array_filter($exclude, 'is_string');
+
+			if ($exId)
+			{
+				$query->where('m.id NOT IN (' . implode(', ', array_map('intval', $exId)) . ')');
+				$query->where('m.parent_id NOT IN (' . implode(', ', array_map('intval', $exId)) . ')');
+			}
+
+			if ($exEl)
+			{
+				$query->where('e.element NOT IN (' . implode(', ', $db->quote($exEl)) . ')');
+			}
+		}
+
+		// Order by lft.
+		$query->order('m.lft');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$menuItems = $db->loadObjectList();
+
+			foreach ($menuItems as &$menuitem)
+			{
+				$menuitem->params = new Registry($menuitem->params);
+			}
+		}
+		catch (RuntimeException $e)
+		{
+			$menuItems = array();
+
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		return $menuItems;
+	}
+
+	/**
+	 * Method to install a preset menu into database and link them to the given menutype
+	 *
+	 * @param   string  $preset    The preset name
+	 * @param   string  $menutype  The target menutype
+	 *
+	 * @return  void
+	 *
+	 * @throws  Exception
+	 *
+	 * @since   3.8.0
+	 */
+	public static function installPreset($preset, $menutype)
+	{
+		$items = MenuHelper::loadPreset($preset, false);
+
+		if (count($items) == 0)
+		{
+			throw new Exception(JText::_('COM_MENUS_PRESET_LOAD_FAILED'));
+		}
+
+		static::installPresetItems($items, $menutype, 1);
+	}
+
+	/**
+	 * Method to install a preset menu item into database and link it to the given menutype
+	 *
+	 * @param   stdClass[]  $items     The single menuitem instance with a list of its descendants
+	 * @param   string      $menutype  The target menutype
+	 * @param   int         $parent    The parent id or object
+	 *
+	 * @return  void
+	 *
+	 * @throws  Exception
+	 *
+	 * @since   3.8.0
+	 */
+	protected static function installPresetItems(&$items, $menutype, $parent = 1)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		static $components = array();
+
+		if (!$components)
+		{
+			$query->select('extension_id, element')->from('#__extensions')->where('type = ' . $db->q('component'));
+			$components = $db->setQuery($query)->loadObjectList();
+			$components = ArrayHelper::getColumn((array) $components, 'element', 'extension_id');
+		}
+
+		$dispatcher = JEventDispatcher::getInstance();
+		$dispatcher->trigger('onPreprocessMenuItems', array('com_menus.administrator.import', &$items, null, true));
+
+		foreach ($items as &$item)
+		{
+			/** @var  JTableMenu  $table */
+			$table = JTable::getInstance('Menu');
+
+			$item->alias = $menutype . '-' . $item->title;
+
+			if ($item->type == 'separator')
+			{
+				// Do not reuse a separator
+				$item->title = $item->title ?: '-';
+				$item->alias = microtime(true);
+			}
+			elseif ($item->type == 'heading' || $item->type == 'container')
+			{
+				// Try to match an existing record to have minimum collision for a heading
+				$keys  = array(
+					'menutype'  => $menutype,
+					'type'      => $item->type,
+					'title'     => $item->title,
+					'parent_id' => $parent,
+					'client_id' => 1,
+				);
+				$table->load($keys);
+			}
+			elseif ($item->type == 'url' || $item->type == 'component')
+			{
+				if (substr($item->link, 0, 8) === 'special:')
+				{
+					$special = substr($item->link, 8);
+
+					if ($special === 'language-forum')
+					{
+						$item->link = 'index.php?option=com_admin&amp;view=help&amp;layout=langforum';
+					}
+					elseif ($special === 'custom-forum')
+					{
+						$item->link = '';
+					}
+				}
+
+				// Try to match an existing record to have minimum collision for a link
+				$keys  = array(
+					'menutype'  => $menutype,
+					'type'      => $item->type,
+					'link'      => $item->link,
+					'parent_id' => $parent,
+					'client_id' => 1,
+				);
+				$table->load($keys);
+			}
+
+			// Translate "hideitems" param value from "element" into "menu-item-id"
+			if ($item->type == 'container' && count($hideitems = (array) $item->params->get('hideitems')))
+			{
+				foreach ($hideitems as &$hel)
+				{
+					if (!is_numeric($hel))
+					{
+						$hel = array_search($hel, $components);
+					}
+				}
+
+				$query->clear()->select('id')->from('#__menu')->where('component_id IN (' . implode(', ', $hideitems) . ')');
+				$hideitems = $db->setQuery($query)->loadColumn();
+
+				$item->params->set('hideitems', $hideitems);
+			}
+
+			$record = array(
+				'menutype'     => $menutype,
+				'title'        => $item->title,
+				'alias'        => $item->alias,
+				'type'         => $item->type,
+				'link'         => $item->link,
+				'browserNav'   => $item->browserNav ? 1 : 0,
+				'img'          => $item->class,
+				'access'       => $item->access,
+				'component_id' => array_search($item->element, $components),
+				'parent_id'    => $parent,
+				'client_id'    => 1,
+				'published'    => 1,
+				'language'     => '*',
+				'home'         => 0,
+				'params'       => (string) $item->params,
+			);
+
+			if (!$table->bind($record))
+			{
+				throw new Exception('Bind failed: ' . $table->getError());
+			}
+
+			$table->setLocation($parent, 'last-child');
+
+			if (!$table->check())
+			{
+				throw new Exception('Check failed: ' . $table->getError());
+			}
+
+			if (!$table->store())
+			{
+				throw new Exception('Saved failed: ' . $table->getError());
+			}
+
+			$item->id = $table->get('id');
+
+			if (!empty($item->submenu))
+			{
+				static::installPresetItems($item->submenu, $menutype, $item->id);
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php b/core/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
new file mode 100644
index 00000000..fd8fa2d2
--- /dev/null
+++ b/core/administrator/components/com_menus/layouts/joomla/menu/edit_modules.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app       = JFactory::getApplication();
+$form      = $displayData->getForm();
+$input     = $app->input;
+$component = $input->getCmd('option', 'com_content');
+
+if ($component == 'com_categories')
+{
+	$extension = $input->getCmd('extension', 'com_content');
+	$parts     = explode('.', $extension);
+	$component = $parts[0];
+}
+
+$saveHistory = JComponentHelper::getParams($component)->get('save_history', 0);
+
+$fields = $displayData->get('fields') ?: array(
+	array('parent', 'parent_id'),
+	array('published', 'state', 'enabled'),
+	array('category', 'catid'),
+	'featured',
+	'sticky',
+	'access',
+	'language',
+	'tags',
+	'note',
+	'version_note',
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+if (!$saveHistory)
+{
+	$hiddenFields[] = 'version_note';
+}
+
+$html   = array();
+$html[] = '<fieldset class="form-horizontal"><ul class="horizontal-buttons unstyled">';
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			$html[] = '<li>' . $form->renderField($f) . '</li>';
+			break;
+		}
+	}
+}
+
+$html[] = '</ul></fieldset>';
+
+echo implode('', $html);
diff --git a/core/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/core/administrator/components/com_menus/layouts/joomla/searchtools/default.php
new file mode 100644
index 00000000..422ce210
--- /dev/null
+++ b/core/administrator/components/com_menus/layouts/joomla/searchtools/default.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/** @var  array  $displayData */
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if ($data['view'] instanceof MenusViewItems || $data['view'] instanceof MenusViewMenus)
+{
+	$doc = JFactory::getDocument();
+
+	$doc->addStyleDeclaration("
+		/* Fixed filter field in search bar */
+		.js-stools .js-stools-menutype,
+		.js-stools .js-stools-client_id {
+			float: left;
+			margin-right: 10px;
+			min-width: 220px;
+		}
+		html[dir=rtl] .js-stools .js-stools-menutype,
+		html[dir=rtl] .js-stools .js-stools-client_id {
+			float: right;
+			margin-left: 10px
+			margin-right: 0;
+		}
+		.js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container {
+			padding: 3px 0;
+		}
+	");
+
+	// Client selector doesn't have to activate the filter bar.
+	unset($data['view']->activeFilters['client_id']);
+
+	// Menutype filter doesn't have to activate the filter bar
+	unset($data['view']->activeFilters['menutype']);
+}
+
+// Set some basic options
+$customOptions = array(
+	'filtersHidden'       => isset($data['options']['filtersHidden']) ? $data['options']['filtersHidden'] : empty($data['view']->activeFilters),
+	'defaultLimit'        => isset($data['options']['defaultLimit']) ? $data['options']['defaultLimit'] : JFactory::getApplication()->get('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'orderFieldSelector'  => '#list_fullordering',
+	'totalResults'        => isset($data['options']['totalResults']) ? $data['options']['totalResults'] : -1,
+	'noResultsText'       => isset($data['options']['noResultsText']) ? $data['options']['noResultsText'] : JText::_('JGLOBAL_NO_MATCHING_RESULTS'),
+);
+
+$data['options'] = array_merge($customOptions, $data['options']);
+
+$formSelector = !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm';
+
+// Load search tools
+JHtml::_('searchtools.form', $formSelector, $data['options']);
+
+$filtersClass = isset($data['view']->activeFilters) && $data['view']->activeFilters ? ' js-stools-container-filters-visible' : '';
+?>
+<div class="js-stools clearfix">
+	<div class="clearfix">
+		<div class="js-stools-container-bar">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
+		</div>
+		<div class="js-stools-container-list hidden-phone hidden-tablet">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.list', $data); ?>
+		</div>
+	</div>
+	<!-- Filters div -->
+	<div class="js-stools-container-filters hidden-phone clearfix<?php echo $filtersClass; ?>">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default.filters', $data); ?>
+	</div>
+</div>
+<?php if ($data['options']['totalResults'] === 0) : ?>
+	<?php echo JLayoutHelper::render('joomla.searchtools.default.noitems', $data); ?>
+<?php endif; ?>
diff --git a/core/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php b/core/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
new file mode 100644
index 00000000..b0a53389
--- /dev/null
+++ b/core/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/** @var  array  $displayData */
+$data = $displayData;
+
+if ($data['view'] instanceof MenusViewItems)
+{
+	// We will get the menutype filter & remove it from the form filters
+	$menuTypeField = $data['view']->filterForm->getField('menutype');
+
+	// Add the client selector before the form filters.
+	$clientIdField = $data['view']->filterForm->getField('client_id');
+
+	if ($clientIdField): ?>
+	<div class="js-stools-field-filter js-stools-client_id">
+		<?php echo $clientIdField->input; ?>
+	</div>
+	<?php endif; ?>
+
+	<div class="js-stools-field-filter js-stools-menutype">
+		<?php echo $menuTypeField->input; ?>
+	</div>
+	<?php
+}
+elseif ($data['view'] instanceof MenusViewMenus)
+{
+	// Add the client selector before the form filters.
+	$clientIdField = $data['view']->filterForm->getField('client_id');
+	?>
+	<div class="js-stools-field-filter js-stools-client_id">
+		<?php echo $clientIdField->input; ?>
+	</div>
+	<?php
+}
+
+// Display the main joomla layout
+echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none'));
diff --git a/core/administrator/components/com_menus/menus.php b/core/administrator/components/com_menus/menus.php
new file mode 100644
index 00000000..4e1b7cf1
--- /dev/null
+++ b/core/administrator/components/com_menus/menus.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_menus'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Menus');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_menus/menus.xml b/core/administrator/components/com_menus/menus.xml
new file mode 100644
index 00000000..56c350c7
--- /dev/null
+++ b/core/administrator/components/com_menus/menus.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_menus</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_MENUS_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>menus.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+			<folder>presets</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_menus.ini</language>
+			<language tag="en-GB">language/en-GB.com_menus.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_menus/models/fields/componentscategory.php b/core/administrator/components/com_menus/models/fields/componentscategory.php
new file mode 100644
index 00000000..df282807
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/componentscategory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Components Category field.
+ *
+ * @since  1.6
+ */
+class JFormFieldComponentsCategory extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.7.0
+	 */
+	protected $type = 'ComponentsCategory';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array  An array of JHtml options.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		// Initialise variable.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT a.name AS text, a.element AS value')
+			->from('#__extensions as a')
+			->where('a.enabled >= 1')
+			->where('a.type =' . $db->quote('component'))
+			->join('INNER', '#__categories as b ON a.element=b.extension');
+
+		$items = $db->setQuery($query)->loadObjectList();
+
+		if (count($items))
+		{
+			$lang = JFactory::getLanguage();
+
+			foreach ($items as &$item)
+			{
+				// Load language
+				$extension = $item->value;
+				$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+				$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load("$extension.sys", $source, null, false, true);
+
+				// Translate component name
+				$item->text = JText::_($item->text);
+			}
+
+			// Sort by component name
+			$items = ArrayHelper::sortObjects($items, 'text', 1, true, true);
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $items);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_menus/models/fields/menuitembytype.php b/core/administrator/components/com_menus/models/fields/menuitembytype.php
new file mode 100644
index 00000000..5e7d7c4d
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/menuitembytype.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('groupedlist');
+
+// Import the com_menus helper.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Supports an HTML grouped select list of menu item grouped by menu
+ *
+ * @since  3.8.0
+ */
+class JFormFieldMenuitemByType extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	public $type = 'MenuItemByType';
+
+	/**
+	 * The menu type.
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	protected $menuType;
+
+	/**
+	 * The client id.
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	protected $clientId;
+
+	/**
+	 * The language.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	protected $language;
+
+	/**
+	 * The published status.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	protected $published;
+
+	/**
+	 * The disabled status.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	protected $disable;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.8.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'menuType':
+			case 'clientId':
+			case 'language':
+			case 'published':
+			case 'disable':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'menuType':
+				$this->menuType = (string) $value;
+				break;
+
+			case 'clientId':
+				$this->clientId = (int) $value;
+				break;
+
+			case 'language':
+			case 'published':
+			case 'disable':
+				$value = (string) $value;
+				$this->$name = $value ? explode(',', $value) : array();
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.8.0
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result == true)
+		{
+			$menuType = (string) $this->element['menu_type'];
+
+			if (!$menuType)
+			{
+				$app = JFactory::getApplication('administrator');
+				$currentMenuType = $app->getUserState('com_menus.items.menutype', '');
+				$menuType        = $app->input->getString('menutype', $currentMenuType);
+			}
+
+			$this->menuType  = $menuType;
+			$this->clientId  = (int) $this->element['client_id'];
+			$this->published = $this->element['published'] ? explode(',', (string) $this->element['published']) : array();
+			$this->disable   = $this->element['disable'] ? explode(',', (string) $this->element['disable']) : array();
+			$this->language  = $this->element['language'] ? explode(',', (string) $this->element['language']) : array();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field option groups.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   3.8.0
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		$menuType = $this->menuType;
+
+		// Get the menu items.
+		$items = MenusHelper::getMenuLinks($menuType, 0, 0, $this->published, $this->language, $this->clientId);
+
+		// Build group for a specific menu type.
+		if ($menuType)
+		{
+			// If the menutype is empty, group the items by menutype.
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__menu_types'))
+				->where($db->quoteName('menutype') . ' = ' . $db->quote($menuType));
+			$db->setQuery($query);
+
+			try
+			{
+				$menuTitle = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$menuTitle = $menuType;
+			}
+
+			// Initialize the group.
+			$groups[$menuTitle] = array();
+
+			// Build the options array.
+			foreach ($items as $key => $link)
+			{
+				// Unset if item is menu_item_root
+				if ($link->text === 'Menu_Item_Root')
+				{
+					unset($items[$key]);
+					continue;
+				}
+
+				$levelPrefix = str_repeat('- ', max(0, $link->level - 1));
+
+				// Displays language code if not set to All
+				if ($link->language !== '*')
+				{
+					$lang = ' (' . $link->language . ')';
+				}
+				else
+				{
+					$lang = '';
+				}
+
+				$groups[$menuTitle][] = JHtml::_('select.option',
+					$link->value, $levelPrefix . $link->text . $lang,
+					'value',
+					'text',
+					in_array($link->type, $this->disable)
+				);
+			}
+		}
+		// Build groups for all menu types.
+		else
+		{
+			// Build the groups arrays.
+			foreach ($items as $menu)
+			{
+				// Initialize the group.
+				$groups[$menu->title] = array();
+
+				// Build the options array.
+				foreach ($menu->links as $link)
+				{
+					$levelPrefix = str_repeat('- ', max(0, $link->level - 1));
+
+					// Displays language code if not set to All
+					if ($link->language !== '*')
+					{
+						$lang = ' (' . $link->language . ')';
+					}
+					else
+					{
+						$lang = '';
+					}
+
+					$groups[$menu->title][] = JHtml::_('select.option',
+						$link->value,
+						$levelPrefix . $link->text . $lang,
+						'value',
+						'text',
+						in_array($link->type, $this->disable)
+					);
+				}
+			}
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}
diff --git a/core/administrator/components/com_menus/models/fields/menuordering.php b/core/administrator/components/com_menus/models/fields/menuordering.php
new file mode 100644
index 00000000..f06373e7
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/menuordering.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Menu Ordering field.
+ *
+ * @since  1.6
+ */
+class JFormFieldMenuOrdering extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var        string
+	 * @since   1.7
+	 */
+	protected $type = 'MenuOrdering';
+
+	/**
+	 * Method to get the list of siblings in a menu.
+	 * The method requires that parent be set.
+	 *
+	 * @return  array  The field option objects or false if the parent field has not been set
+	 *
+	 * @since   1.7
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Get the parent
+		$parent_id = $this->form->getValue('parent_id', 0);
+
+		if (empty($parent_id))
+		{
+			return false;
+		}
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.id AS value, a.title AS text, a.client_id AS ' . $db->quoteName('clientId'))
+			->from('#__menu AS a')
+
+			->where('a.published >= 0')
+			->where('a.parent_id =' . (int) $parent_id);
+
+		if ($menuType = $this->form->getValue('menutype'))
+		{
+			$query->where('a.menutype = ' . $db->quote($menuType));
+		}
+		else
+		{
+			$query->where('a.menutype != ' . $db->quote(''));
+		}
+
+		$query->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		// Allow translation of custom admin menus
+		foreach ($options as &$option)
+		{
+			if ($option->clientId != 0)
+			{
+				$option->text = JText::_($option->text);
+			}
+		}
+
+		$options = array_merge(
+			array(array('value' => '-1', 'text' => JText::_('COM_MENUS_ITEM_FIELD_ORDERING_VALUE_FIRST'))),
+			$options,
+			array(array('value' => '-2', 'text' => JText::_('COM_MENUS_ITEM_FIELD_ORDERING_VALUE_LAST')))
+		);
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.7
+	 */
+	protected function getInput()
+	{
+		if ($this->form->getValue('id', 0) == 0)
+		{
+			return '<span class="readonly">' . JText::_('COM_MENUS_ITEM_FIELD_ORDERING_TEXT') . '</span>';
+		}
+		else
+		{
+			return parent::getInput();
+		}
+	}
+}
diff --git a/core/administrator/components/com_menus/models/fields/menuparent.php b/core/administrator/components/com_menus/models/fields/menuparent.php
new file mode 100644
index 00000000..e1089b77
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/menuparent.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Menu Parent field.
+ *
+ * @since  1.6
+ */
+class JFormFieldMenuParent extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var        string
+	 * @since   1.6
+	 */
+	protected $type = 'MenuParent';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT(a.id) AS value, a.title AS text, a.level, a.lft')
+			->from('#__menu AS a');
+
+		// Filter by menu type.
+		if ($menuType = $this->form->getValue('menutype'))
+		{
+			$query->where('a.menutype = ' . $db->quote($menuType));
+		}
+		else
+		{
+			// Skip special menu types
+			$query->where('a.menutype != ' . $db->quote(''));
+			$query->where('a.menutype != ' . $db->quote('main'));
+		}
+
+		// Filter by client id.
+		$clientId = $this->getAttribute('clientid');
+
+		if (!is_null($clientId))
+		{
+			$query->where($db->quoteName('a.client_id') . ' = ' . (int) $clientId);
+		}
+
+		// Prevent parenting to children of this item.
+		if ($id = $this->form->getValue('id'))
+		{
+			$query->join('LEFT', $db->quoteName('#__menu') . ' AS p ON p.id = ' . (int) $id)
+				->where('NOT(a.lft >= p.lft AND a.rgt <= p.rgt)');
+		}
+
+		$query->where('a.published != -2')
+			->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		// Pad the option text with spaces using depth level as a multiplier.
+		for ($i = 0, $n = count($options); $i < $n; $i++)
+		{
+			if ($clientId != 0)
+			{
+				// Allow translation of custom admin menus
+				$options[$i]->text = str_repeat('- ', $options[$i]->level) . JText::_($options[$i]->text);
+			}
+			else
+			{
+				$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->text;
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_menus/models/fields/menupreset.php b/core/administrator/components/com_menus/models/fields/menupreset.php
new file mode 100644
index 00000000..e0cfa0a8
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/menupreset.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\CMS\Menu\MenuHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Administrator Menu Presets list field.
+ *
+ * @since  3.8.0
+ */
+class JFormFieldMenuPreset extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $type = 'MenuPreset';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since  3.8.0
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+		$presets = MenuHelper::getPresets();
+
+		foreach ($presets as $preset)
+		{
+			$options[] = JHtml::_('select.option', $preset->name, JText::_($preset->title));
+		}
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_menus/models/fields/menutype.php b/core/administrator/components/com_menus/models/fields/menutype.php
new file mode 100644
index 00000000..103512a7
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/menutype.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Menu Type field.
+ *
+ * @since  1.6
+ */
+class JFormFieldMenutype extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   1.6
+	 */
+	protected $type = 'menutype';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$html     = array();
+		$recordId = (int) $this->form->getValue('id');
+		$size     = (string) ($v = $this->element['size']) ? ' size="' . $v . '"' : '';
+		$class    = (string) ($v = $this->element['class']) ? ' class="' . $v . '"' : 'class="text_area"';
+		$required = (string) $this->element['required'] ? ' required="required"' : '';
+		$clientId = (int) $this->element['clientid'] ?: 0;
+
+		// Get a reverse lookup of the base link URL to Title
+		switch ($this->value)
+		{
+			case 'url':
+				$value = JText::_('COM_MENUS_TYPE_EXTERNAL_URL');
+				break;
+
+			case 'alias':
+				$value = JText::_('COM_MENUS_TYPE_ALIAS');
+				break;
+
+			case 'separator':
+				$value = JText::_('COM_MENUS_TYPE_SEPARATOR');
+				break;
+
+			case 'heading':
+				$value = JText::_('COM_MENUS_TYPE_HEADING');
+				break;
+
+			case 'container':
+				$value = JText::_('COM_MENUS_TYPE_CONTAINER');
+				break;
+
+			default:
+				$link = $this->form->getValue('link');
+
+				/** @var  MenusModelMenutypes $model */
+				$model = JModelLegacy::getInstance('Menutypes', 'MenusModel', array('ignore_request' => true));
+				$model->setState('client_id', $clientId);
+
+				$rlu   = $model->getReverseLookup();
+
+				// Clean the link back to the option, view and layout
+				$value = JText::_(ArrayHelper::getValue($rlu, MenusHelper::getLinkKey($link)));
+				break;
+		}
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration('
+			function jSelectPosition_' . $this->id . '(name) {
+				document.getElementById("' . $this->id . '").value = name;
+			}
+		'
+		);
+
+		$link = JRoute::_('index.php?option=com_menus&view=menutypes&tmpl=component&client_id=' . $clientId . '&recordId=' . $recordId);
+		$html[] = '<span class="input-append"><input type="text" ' . $required . ' readonly="readonly" id="' . $this->id
+			. '" value="' . $value . '" ' . $size . $class . ' />';
+		$html[] = '<a href="#menuTypeModal" role="button" class="btn btn-primary" data-toggle="modal" title="' . JText::_('JSELECT') . '">'
+			. '<span class="icon-list icon-white" aria-hidden="true"></span> '
+			. JText::_('JSELECT') . '</a></span>';
+		$html[] = JHtml::_(
+			'bootstrap.renderModal',
+			'menuTypeModal',
+			array(
+				'url'        => $link,
+				'title'      => JText::_('COM_MENUS_ITEM_FIELD_TYPE_LABEL'),
+				'width'      => '800px',
+				'height'     => '300px',
+				'modalWidth' => '80',
+				'bodyHeight' => '70',
+				'footer'     => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+						. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+			)
+		);
+		$html[] = '<input class="input-small" type="hidden" name="' . $this->name . '" value="'
+			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" />';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/core/administrator/components/com_menus/models/fields/modal/menu.php b/core/administrator/components/com_menus/models/fields/modal/menu.php
new file mode 100644
index 00000000..58c5ed4d
--- /dev/null
+++ b/core/administrator/components/com_menus/models/fields/modal/menu.php
@@ -0,0 +1,404 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+JHtml::_('bootstrap.tooltip', '.hasTooltip');
+
+/**
+ * Supports a modal menu item picker.
+ *
+ * @since  3.7.0
+ */
+class JFormFieldModal_Menu extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.7.0
+	 */
+	protected $type = 'Modal_Menu';
+
+	/**
+	 * Determinate, if the select button is shown
+	 *
+	 * @var     boolean
+	 * @since   3.7.0
+	 */
+	protected $allowSelect = true;
+
+	/**
+	 * Determinate, if the clear button is shown
+	 *
+	 * @var     boolean
+	 * @since   3.7.0
+	 */
+	protected $allowClear = true;
+
+	/**
+	 * Determinate, if the create button is shown
+	 *
+	 * @var     boolean
+	 * @since   3.7.0
+	 */
+	protected $allowNew = false;
+
+	/**
+	 * Determinate, if the edit button is shown
+	 *
+	 * @var     boolean
+	 * @since   3.7.0
+	 */
+	protected $allowEdit = false;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'allowSelect':
+			case 'allowClear':
+			case 'allowNew':
+			case 'allowEdit':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'allowSelect':
+			case 'allowClear':
+			case 'allowNew':
+			case 'allowEdit':
+				$value = (string) $value;
+				$this->$name = !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.7.0
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->allowSelect = ((string) $this->element['select']) !== 'false';
+			$this->allowClear = ((string) $this->element['clear']) !== 'false';
+			$this->allowNew = ((string) $this->element['new']) === 'true';
+			$this->allowEdit = ((string) $this->element['edit']) === 'true';
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		$clientId    = (int) $this->element['clientid'];
+
+		// Load language
+		JFactory::getLanguage()->load('com_menus', JPATH_ADMINISTRATOR);
+
+		// The active article id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Create the modal id.
+		$modalId = 'Item_' . $this->id;
+
+		// Add the modal field script to the document head.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true));
+
+		// Script to proxy the select modal function to the modal-fields.js file.
+		if ($this->allowSelect)
+		{
+			static $scriptSelect = null;
+
+			if (is_null($scriptSelect))
+			{
+				$scriptSelect = array();
+			}
+
+			if (!isset($scriptSelect[$this->id]))
+			{
+				JFactory::getDocument()->addScriptDeclaration("
+				function jSelectMenu_" . $this->id . "(id, title, object) {
+					window.processModalSelect('Item', '" . $this->id . "', id, title, '', object);
+				}
+				"
+				);
+
+				$scriptSelect[$this->id] = true;
+			}
+		}
+
+		// Setup variables for display.
+		$linkSuffix = '&amp;layout=modal&amp;client_id=' . $clientId . '&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$linkItems  = 'index.php?option=com_menus&amp;view=items' . $linkSuffix;
+		$linkItem   = 'index.php?option=com_menus&amp;view=item' . $linkSuffix;
+		$modalTitle = JText::_('COM_MENUS_CHANGE_MENUITEM');
+
+		if (isset($this->element['language']))
+		{
+			$linkItems  .= '&amp;forcedLanguage=' . $this->element['language'];
+			$linkItem   .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle .= ' &#8212; ' . $this->element['label'];
+		}
+
+		$urlSelect = $linkItems . '&amp;function=jSelectMenu_' . $this->id;
+		$urlEdit   = $linkItem . '&amp;task=item.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
+		$urlNew    = $linkItem . '&amp;task=item.add';
+
+		if ($value)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__menu'))
+				->where($db->quoteName('id') . ' = ' . (int) $value);
+
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		// Placeholder if option is present or not
+		if (empty($title))
+		{
+			if ($this->element->option && (string) $this->element->option['value'] == '')
+			{
+				$title_holder = JText::_($this->element->option);
+			}
+			else
+			{
+				$title_holder = JText::_('COM_MENUS_SELECT_A_MENUITEM');
+			}
+		}
+
+		$title = empty($title) ? $title_holder : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The current menu item display field.
+		$html  = '<span class="input-append">';
+		$html .= '<input class="input-medium" id="' . $this->id . '_name" type="text" value="' . $title . '" disabled="disabled" size="35" />';
+
+		// Select menu item button
+		if ($this->allowSelect)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_select"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalSelect' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_MENUS_CHANGE_MENUITEM') . '">'
+				. '<span class="icon-file" aria-hidden="true"></span> ' . JText::_('JSELECT')
+				. '</a>';
+		}
+
+		// New menu item button
+		if ($this->allowNew)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_new"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalNew' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_MENUS_NEW_MENUITEM') . '">'
+				. '<span class="icon-new" aria-hidden="true"></span> ' . JText::_('JACTION_CREATE')
+				. '</a>';
+		}
+
+		// Edit menu item button
+		if ($this->allowEdit)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_edit"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalEdit' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_MENUS_EDIT_MENUITEM') . '">'
+				. '<span class="icon-edit" aria-hidden="true"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
+		}
+
+		// Clear menu item button
+		if ($this->allowClear)
+		{
+			$html .= '<a'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_clear"'
+				. ' href="#"'
+				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
+				. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+				. '</a>';
+		}
+
+		$html .= '</span>';
+
+		// Select menu item modal
+		if ($this->allowSelect)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalSelect' . $modalId,
+				array(
+					'title'       => $modalTitle,
+					'url'         => $urlSelect,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+				)
+			);
+		}
+
+		// New menu item modal
+		if ($this->allowNew)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalNew' . $modalId,
+				array(
+					'title'       => JText::_('COM_MENUS_NEW_MENUITEM'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlNew,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'item\', \'cancel\', \'item-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'item\', \'save\', \'item-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'item\', \'apply\', \'item-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Edit menu item modal
+		if ($this->allowEdit)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalEdit' . $modalId,
+				array(
+					'title'       => JText::_('COM_MENUS_EDIT_MENUITEM'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlEdit,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'item\', \'cancel\', \'item-form\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'item\', \'save\', \'item-form\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'item\', \'apply\', \'item-form\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Note: class='required' for client side validation.
+		$class = $this->required ? ' class="required modal-value"' : '';
+
+		// Placeholder if option is present or not when clearing field
+		if ($this->element->option && (string) $this->element->option['value'] == '')
+		{
+			$title_holder = JText::_($this->element->option);
+		}
+		else
+		{
+			$title_holder = JText::_('COM_MENUS_SELECT_A_MENUITEM');
+		}
+
+		$html .= '<input type="hidden" id="' . $this->id . '_id" ' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
+			. '" data-text="' . htmlspecialchars($title_holder, ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getLabel()
+	{
+		return str_replace($this->id, $this->id . '_id', parent::getLabel());
+	}
+}
diff --git a/core/administrator/components/com_menus/models/forms/filter_items.xml b/core/administrator/components/com_menus/models/forms/filter_items.xml
new file mode 100644
index 00000000..28672454
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/filter_items.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="client_id"
+		type="list"
+		label=""
+		filtermode="selector"
+		onchange="this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<field
+		name="menutype"
+		type="menu"
+		label="COM_MENUS_FILTER_CATEGORY"
+		description="JOPTION_FILTER_CATEGORY_DESC"
+		accesstype="manage"
+		clientid=""
+		showAll="false"
+		filtermode="selector"
+		onchange="this.form.submit();"
+		>
+		<option value="">COM_MENUS_SELECT_MENU</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MENUS_ITEMS_SEARCH_FILTER_LABEL"
+			description="COM_MENUS_ITEMS_SEARCH_FILTER"
+			hint="JSEARCH_FILTER"
+			noresults="JGLOBAL_NO_MATCHING_RESULTS"
+		/>
+		<field
+			name="published"
+			type="status"
+			label="COM_MENUS_FILTER_PUBLISHED"
+			description="COM_MENUS_FILTER_PUBLISHED_DESC"
+			filter="*,0,1,-2"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+		<field
+			name="parent_id"
+			type="menuitembytype"
+			label="COM_MENUS_FILTER_PARENT_MENU_ITEM_LABEL"
+			description="COM_MENUS_FILTER_PARENT_MENU_ITEM_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			default="a.lft ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.lft DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="menutype_title ASC">COM_MENUS_HEADING_MENU_ASC</option>
+			<option value="menutype_title DESC">COM_MENUS_HEADING_MENU_DESC</option>
+			<option value="a.home ASC">COM_MENUS_HEADING_HOME_ASC</option>
+			<option value="a.home DESC">COM_MENUS_HEADING_HOME_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
+			<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
+			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_MENUS_LIST_LIMIT"
+			description="COM_MENUS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/filter_itemsadmin.xml b/core/administrator/components/com_menus/models/forms/filter_itemsadmin.xml
new file mode 100644
index 00000000..d31482bd
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/filter_itemsadmin.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="client_id"
+		type="list"
+		label=""
+		filtermode="selector"
+		onchange="this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+
+	<field
+		name="menutype"
+		type="menu"
+		label="COM_MENUS_FILTER_CATEGORY"
+		description="JOPTION_FILTER_CATEGORY_DESC"
+		accesstype="manage"
+		clientid=""
+		showAll="false"
+		filtermode="selector"
+		onchange="this.form.submit();"
+		>
+		<option value="">COM_MENUS_SELECT_MENU</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MENUS_ITEMS_SEARCH_FILTER_LABEL"
+			description="COM_MENUS_ITEMS_SEARCH_FILTER"
+			hint="JSEARCH_FILTER"
+			noresults="JGLOBAL_NO_MATCHING_RESULTS"
+		/>
+		<field
+			name="published"
+			type="status"
+			label="COM_MENUS_FILTER_PUBLISHED"
+			description="COM_MENUS_FILTER_PUBLISHED_DESC"
+			filter="*,0,1,-2"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			default="a.lft ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.lft DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="menutype_title ASC">COM_MENUS_HEADING_MENU_ASC</option>
+			<option value="menutype_title DESC">COM_MENUS_HEADING_MENU_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_MENUS_LIST_LIMIT"
+			description="COM_MENUS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/filter_menus.xml b/core/administrator/components/com_menus/models/forms/filter_menus.xml
new file mode 100644
index 00000000..1d5cdefd
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/filter_menus.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="client_id"
+		type="list"
+		label=""
+		filtermode="selector"
+		onchange="this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MENUS_MENUS_FILTER_SEARCH_LABEL"
+			description="COM_MENUS_MENUS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.title ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="5"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/item.xml b/core/administrator/components/com_menus/models/forms/item.xml
new file mode 100644
index 00000000..45672368
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/item.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="hidden"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			default="0"
+			filter="int"
+			readonly="true"
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_MENUS_ITEM_FIELD_TITLE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="alias"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+			size="40"
+		/>
+
+		<field
+			name="note"
+			type="text"
+			label="JFIELD_NOTE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_NOTE_DESC"
+			maxlength="255"
+			class="span12"
+			size="40"
+		/>
+
+		<field
+			name="link"
+			type="link"
+			label="COM_MENUS_ITEM_FIELD_LINK_LABEL"
+			description="COM_MENUS_ITEM_FIELD_LINK_DESC"
+			readonly="true"
+			class="input-xxlarge"
+			size="50"
+		/>
+
+		<field
+			name="menutype"
+			type="menu"
+			label="COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL"
+			description="COM_MENUS_ITEM_FIELD_ASSIGNED_DESC"
+			required="true"
+			clientid="0"
+			size="1"
+			>
+			<option value="">COM_MENUS_SELECT_MENU</option>
+		</field>
+
+		<field
+			name="type"
+			type="menutype"
+			label="COM_MENUS_ITEM_FIELD_TYPE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_TYPE_DESC"
+			class="input-medium"
+			required="true"
+			size="40" 
+		/>
+
+		<field
+			name="published"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			id="published"
+			class="chzn-color-state"
+			size="1"
+			default="1"
+			filter="integer"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="parent_id"
+			type="menuparent"
+			label="COM_MENUS_ITEM_FIELD_PARENT_LABEL"
+			description="COM_MENUS_ITEM_FIELD_PARENT_DESC"
+			default="1"
+			filter="int"
+			clientid="0"
+			size="1"
+			>
+			<option value="1">COM_MENUS_ITEM_ROOT</option>
+		</field>
+
+		<field
+			name="menuordering"
+			type="menuordering"
+			label="COM_MENUS_ITEM_FIELD_ORDERING_LABEL"
+			description="COM_MENUS_ITEM_FIELD_ORDERING_DESC"
+			filter="int"
+			size="1">
+		</field>
+
+		<field
+			name="component_id"
+			type="hidden"
+			filter="int"
+		/>
+
+		<field
+			name="browserNav"
+			type="list"
+			label="COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL"
+			description="COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC"
+			default="0"
+			filter="int"
+			>
+			<option value="0">COM_MENUS_FIELD_VALUE_PARENT</option>
+			<option value="1">COM_MENUS_FIELD_VALUE_NEW_WITH_NAV</option>
+			<option value="2">COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			id="access"
+			filter="integer"
+			/>
+
+		<field
+			name="template_style_id"
+			type="templatestyle"
+			label="COM_MENUS_ITEM_FIELD_TEMPLATE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_TEMPLATE_DESC"
+			client="site"
+			filter="int"
+			>
+			<option value="0">JOPTION_USE_DEFAULT</option>
+		</field>
+
+		<field
+			name="home"
+			type="radio"
+			label="COM_MENUS_ITEM_FIELD_HOME_LABEL"
+			description="COM_MENUS_ITEM_FIELD_HOME_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="path"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="level"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="lft"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="rgt"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="toggle_modules_assigned"
+			type="radio"
+			label="COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_LABEL"
+			description="COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			filter="integer"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="toggle_modules_published"
+			type="radio"
+			label="COM_MENUS_ITEM_FIELD_HIDE_UNPUBLISHED_LABEL"
+			description="COM_MENUS_ITEM_FIELD_HIDE_UNPUBLISHED_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			filter="integer"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fields name="params">
+	</fields>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/item_alias.xml b/core/administrator/components/com_menus/models/forms/item_alias.xml
new file mode 100644
index 00000000..3b09c6fc
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/item_alias.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<!-- Add fields to the request variables for the layout. -->
+
+	<fields name="params">
+
+		<fieldset name="aliasoptions">
+			<field 
+				name="aliasoptions" 
+				type="modal_menu"
+				label="COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
+				clientid="0"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+
+		<fieldset name="menu-options"
+				label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+			>
+
+			<field 
+				name="menu-anchor_title" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_css" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				default="1"
+				filter="integer"
+				class="btn-group btn-group-yesno"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS" />
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/item_component.xml b/core/administrator/components/com_menus/models/forms/item_component.xml
new file mode 100644
index 00000000..6b9cbe52
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/item_component.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+	>
+		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
+
+			<field 
+				name="menu-anchor_title" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_css" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="page-options" label="COM_MENUS_PAGE_OPTIONS_LABEL">
+
+			<field
+				name="page_title"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC"
+				useglobal="true"
+			/>
+
+			<field
+				name="show_page_heading"
+				type="list"
+				label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL"
+				description="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC"
+				class="chzn-color"
+				default=""
+				useglobal="true"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="page_heading"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL"
+				description="COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC"
+			/>
+
+			<field
+				name="pageclass_sfx"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC"
+			/>
+
+		</fieldset>
+
+		<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+			<field 
+				name="menu-meta_description" 
+				type="textarea"
+				label="JFIELD_META_DESCRIPTION_LABEL" 
+				description="JFIELD_META_DESCRIPTION_DESC"
+				rows="3" 
+				cols="40" 
+			/>
+
+			<field 
+				name="menu-meta_keywords" 
+				type="textarea"
+				label="JFIELD_META_KEYWORDS_LABEL" 
+				description="JFIELD_META_KEYWORDS_DESC"
+				rows="3" 
+				cols="40" 
+			/>
+
+			<field 
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+
+			<field 
+				name="secure" 
+				type="list"
+				label="COM_MENUS_ITEM_FIELD_SECURE_LABEL" 
+				description="COM_MENUS_ITEM_FIELD_SECURE_DESC"
+				default="0" 
+				filter="integer"
+				>
+				<option value="-1">JOFF</option>
+				<option value="1">JON</option>
+				<option value="0">COM_MENUS_FIELD_VALUE_IGNORE</option>
+			</field>
+		</fieldset>
+
+	</fields>
+
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/item_heading.xml b/core/administrator/components/com_menus/models/forms/item_heading.xml
new file mode 100644
index 00000000..39a36e7b
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/item_heading.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="menu-options"
+			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+		>
+			<field 
+				name="menu-anchor_title" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_css" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING" />
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/item_separator.xml b/core/administrator/components/com_menus/models/forms/item_separator.xml
new file mode 100644
index 00000000..7bdb02fa
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/item_separator.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="menu-options"
+			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+		>
+
+			<field 
+				name="menu-anchor_css" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR" />
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/item_url.xml b/core/administrator/components/com_menus/models/forms/item_url.xml
new file mode 100644
index 00000000..29696bab
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/item_url.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+		>
+
+			<field 
+				name="menu-anchor_title"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_rel" 
+				type="list"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_REL_DESC"
+				default=""
+				>
+				<option value="">JNONE</option>
+				<option value="alternate"/>
+				<option value="author"/>
+				<option value="bookmark"/>
+				<option value="help"/>
+				<option value="license"/>
+				<option value="next"/>
+				<option value="nofollow"/>
+				<option value="noreferrer"/>
+				<option value="prefetch"/>
+				<option value="prev"/>
+				<option value="search"/>
+				<option value="tag"/>
+			</field>
+
+			<field 
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_EXTERNAL_URL" />
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin.xml b/core/administrator/components/com_menus/models/forms/itemadmin.xml
new file mode 100644
index 00000000..4ef196c7
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="hidden"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			default="0"
+			filter="int"
+			readonly="true"
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_MENUS_ITEM_FIELD_TITLE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="alias"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+			size="40"
+		/>
+
+		<field
+			name="note"
+			type="text"
+			label="JFIELD_NOTE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_NOTE_DESC"
+			maxlength="255"
+			class="span12"
+			size="40"
+		/>
+
+		<field
+			name="link"
+			type="link"
+			label="COM_MENUS_ITEM_FIELD_LINK_LABEL"
+			description="COM_MENUS_ITEM_FIELD_LINK_DESC"
+			readonly="true"
+			class="input-xxlarge"
+			size="50"
+		/>
+
+		<field
+			name="menutype"
+			type="menu"
+			label="COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL"
+			description="COM_MENUS_ITEM_FIELD_ASSIGNED_DESC"
+			required="true"
+			clientid="1"
+			size="1"
+			>
+			<option value="">COM_MENUS_SELECT_MENU</option>
+		</field>
+
+		<field
+			name="type"
+			type="menutype"
+			label="COM_MENUS_ITEM_FIELD_TYPE_LABEL"
+			description="COM_MENUS_ITEM_FIELD_TYPE_DESC"
+			class="input-medium"
+			required="true"
+			size="40"
+		/>
+
+		<field
+			name="published"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			id="published"
+			size="1"
+			default="1"
+			filter="integer"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="parent_id"
+			type="menuparent"
+			label="COM_MENUS_ITEM_FIELD_PARENT_LABEL"
+			description="COM_MENUS_ITEM_FIELD_PARENT_DESC"
+			default="1"
+			filter="int"
+			clientid="1"
+			size="1"
+			>
+			<option value="1">COM_MENUS_ITEM_ROOT</option>
+		</field>
+
+		<field
+			name="menuordering"
+			type="menuordering"
+			label="COM_MENUS_ITEM_FIELD_ORDERING_LABEL"
+			description="COM_MENUS_ITEM_FIELD_ORDERING_DESC"
+			filter="int"
+			size="1"
+		/>
+
+		<field
+			name="component_id"
+			type="hidden"
+			filter="int"
+		/>
+
+		<field
+			name="browserNav"
+			type="list"
+			label="COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL"
+			description="COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC"
+			default="0"
+			filter="int"
+			>
+			<option value="0">COM_MENUS_FIELD_VALUE_PARENT</option>
+			<option value="1">COM_MENUS_FIELD_VALUE_NEW_WITH_NAV</option>
+		</field>
+
+		<field
+			name="home"
+			type="hidden"
+			default="0"
+		/>
+
+		<field
+			name="access"
+			type="hidden"
+			id="access"
+			default="0"
+		/>
+
+		<field
+			name="template_style_id"
+			type="hidden"
+			default="0"
+		/>
+
+		<field
+			name="language"
+			type="hidden"
+			default="*"
+		/>
+
+		<field
+			name="path"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="level"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="lft"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="rgt"
+			type="hidden"
+			filter="unset"
+		/>
+	</fieldset>
+
+	<fields name="params">
+	</fields>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin_alias.xml b/core/administrator/components/com_menus/models/forms/itemadmin_alias.xml
new file mode 100644
index 00000000..1cfc97e3
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin_alias.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="params">
+		<fieldset name="aliasoptions">
+			<field
+				name="aliasoptions"
+				type="modal_menu"
+				label="COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
+				clientid="1"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+
+		<fieldset
+			name="menu-options"
+			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+		>
+
+			<field
+				name="menu-anchor_title"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC"
+			/>
+
+			<field
+				name="menu-anchor_css"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC"
+			/>
+
+			<field
+				name="menu_image"
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field
+				name="menu_text"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS"/>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin_component.xml b/core/administrator/components/com_menus/models/forms/itemadmin_component.xml
new file mode 100644
index 00000000..7a297a36
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin_component.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
+		<fieldset name="menu-options"
+			label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
+		>
+
+			<field 
+				name="menu-anchor_title" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
+
+			<field
+				name="menu-anchor_css" 
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" 
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin_container.xml b/core/administrator/components/com_menus/models/forms/itemadmin_container.xml
new file mode 100644
index 00000000..54f506c3
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin_container.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<!-- Container type menu item does not have a navigation -->
+		<field
+			name="link"
+			type="hidden"
+		/>
+
+		<field
+			name="browserNav"
+			type="hidden"
+			default="0"
+		/>
+	</fieldset>
+
+	<fields name="params">
+		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
+			<field
+				name="menu-anchor_title"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC"
+			/>
+
+			<field
+				name="menu-anchor_css"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC"
+			/>
+
+			<field
+				name="menu_image"
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field
+				name="menu_text"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+		<field
+			name="hideitems"
+			type="checkboxes"
+			label="COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_LABEL"
+			description="COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_DESC"
+			filter="array"
+		/>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_MENU_ITEM_CONTAINER"/>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin_heading.xml b/core/administrator/components/com_menus/models/forms/itemadmin_heading.xml
new file mode 100644
index 00000000..68c4d6a2
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin_heading.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<!-- Heading type menu item does not have a navigation -->
+		<field
+			name="link"
+			type="hidden"
+		/>
+
+		<field
+			name="browserNav"
+			type="hidden"
+			default="0"
+		/>
+	</fieldset>
+
+	<fields name="params">
+		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
+			<field
+				name="menu-anchor_title"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC"
+			/>
+
+			<field
+				name="menu-anchor_css"
+				type="text"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC"
+			/>
+
+			<field
+				name="menu_image"
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field
+				name="menu_text"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING"/>
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin_separator.xml b/core/administrator/components/com_menus/models/forms/itemadmin_separator.xml
new file mode 100644
index 00000000..6130cfa8
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin_separator.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<!-- Text separator type menu item does not have a navigation -->
+		<field
+			name="link"
+			type="hidden"
+		/>
+
+		<field
+			name="browserNav"
+			type="hidden"
+			default="0"
+		/>
+
+		<fields name="params">
+			<field
+				name="text_separator"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_TEXT_SEPARATOR_LABEL"
+				description="COM_MENUS_ITEM_FIELD_TEXT_SEPARATOR_DESC"
+				class="btn-group btn-group-yesno"
+				default="0"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+		</fields>
+	</fieldset>
+
+	<help key="JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR" />
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/itemadmin_url.xml b/core/administrator/components/com_menus/models/forms/itemadmin_url.xml
new file mode 100644
index 00000000..29bab562
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/itemadmin_url.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
+			<field 
+				name="menu-anchor_title"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu-anchor_rel" 
+				type="list"
+				label="COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL"
+				description="COM_MENUS_ITEM_FIELD_ANCHOR_REL_DESC"
+				default=""
+				>
+				<option value="">JNONE</option>
+				<option value="alternate"/>
+				<option value="author"/>
+				<option value="bookmark"/>
+				<option value="help"/>
+				<option value="license"/>
+				<option value="next"/>
+				<option value="nofollow"/>
+				<option value="noreferrer"/>
+				<option value="prefetch"/>
+				<option value="prev"/>
+				<option value="search"/>
+				<option value="tag"/>
+			</field>
+
+			<field 
+				name="menu_image" 
+				type="media"
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
+			/>
+
+			<field 
+				name="menu_image_css"
+				type="text" 
+				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC" 
+			/>
+
+			<field 
+				name="menu_text" 
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
+				default="1" filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="menu_show"
+				type="radio"
+				label="COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL"
+				description="COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+	<help key="JHELP_MENUS_MENU_ITEM_EXTERNAL_URL" />
+</form>
diff --git a/core/administrator/components/com_menus/models/forms/menu.xml b/core/administrator/components/com_menus/models/forms/menu.xml
new file mode 100644
index 00000000..b2199b31
--- /dev/null
+++ b/core/administrator/components/com_menus/models/forms/menu.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="hidden"
+			id="id"
+			default="0"
+			filter="int"
+			readonly="true"
+		/>
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset"
+		/>
+		<field
+			name="menutype"
+			type="text"
+			label="COM_MENUS_MENU_MENUTYPE_LABEL"
+			description="COM_MENUS_MENU_MENUTYPE_DESC"
+			id="menutype"
+			size="30"
+			maxlength="24"
+			required="true"
+		/>
+		<field
+			name="title"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="COM_MENUS_MENU_TITLE_DESC"
+			id="title"
+			size="30"
+			maxlength="48"
+			required="true"
+		/>
+		<field
+			name="description"
+			type="text"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_MENUS_MENU_DESCRIPTION_DESC"
+			id="menudescription"
+			size="30"
+			maxlength="255"
+		/>
+		<field
+			name="client_id"
+			type="radio"
+			label="COM_MENUS_MENU_CLIENT_ID_LABEL"
+			description="COM_MENUS_MENU_CLIENT_ID_DESC"
+			id="client_id"
+			default="0"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			>
+			<option value="0">JSITE</option>
+			<option value="1">JADMINISTRATOR</option>
+		</field>
+		<field
+			name="preset"
+			type="menuPreset"
+			label="COM_MENUS_FIELD_PRESET_LABEL"
+			description="COM_MENUS_FIELD_PRESET_DESC"
+			showon="client_id:1"
+		>
+			<option value="">JNONE</option>
+		</field>
+		<field
+			name="rules"
+			type="rules"
+			label="JFIELD_RULES_LABEL"
+			translate_label="false"
+			filter="rules"
+			component="com_menus"
+			section="menu"
+			validate="rules" 
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_menus/models/item.php b/core/administrator/components/com_menus/models/item.php
new file mode 100644
index 00000000..0a131dee
--- /dev/null
+++ b/core/administrator/components/com_menus/models/item.php
@@ -0,0 +1,1771 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+jimport('joomla.filesystem.path');
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Menu Item Model for Menus.
+ *
+ * @since  1.6
+ */
+class MenusModelItem extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	public $typeAlias = 'com_menus.item';
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var    string
+	 * @since  3.4.4
+	 */
+	protected $associationsContext = 'com_menus.item';
+
+	/**
+	 * @var    string  The prefix to use with controller messages.
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_MENUS_ITEM';
+
+	/**
+	 * @var    string  The help screen key for the menu item.
+	 * @since  1.6
+	 */
+	protected $helpKey = 'JHELP_MENUS_MENU_ITEM_MANAGER_EDIT';
+
+	/**
+	 * @var    string  The help screen base URL for the menu item.
+	 * @since  1.6
+	 */
+	protected $helpURL;
+
+	/**
+	 * @var    boolean  True to use local lookup for the help screen.
+	 * @since  1.6
+	 */
+	protected $helpLocal = false;
+
+	/**
+	 * Batch copy/move command. If set to false,
+	 * the batch copy/move command is not supported
+	 *
+	 * @var   string
+	 */
+	protected $batch_copymove = 'menu_id';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var   array
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id'   => 'batchLanguage'
+	);
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		$user = JFactory::getUser();
+
+		if (!empty($record->id))
+		{
+			// Only delete trashed items
+			if ($record->published != -2)
+			{
+				return false;
+			}
+
+			$menuTypeId = 0;
+
+			if (!empty($record->menutype))
+			{
+				$menuTypeId = $this->getMenuTypeId($record->menutype);
+			}
+
+			return $user->authorise('core.delete', 'com_menus.menu.' . (int) $menuTypeId);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to test whether the state of a record can be edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the component.
+	 *
+	 * @since   3.6
+	 */
+	protected function canEditState($record)
+	{
+		$menuTypeId = !empty($record->menutype) ? $this->getMenuTypeId($record->menutype) : 0;
+		$assetKey   = $menuTypeId ? 'com_menus.menu.' . (int) $menuTypeId : 'com_menus';
+
+		return JFactory::getUser()->authorise('core.edit.state', $assetKey);
+	}
+
+	/**
+	 * Batch copy menu items to a new menu or parent.
+	 *
+	 * @param   integer  $value     The new menu or sub-item.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   1.6
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		// $value comes as {menutype}.{parent_id}
+		$parts    = explode('.', $value);
+		$menuType = $parts[0];
+		$parentId = ArrayHelper::getValue($parts, 1, 0, 'int');
+
+		$table  = $this->getTable();
+		$db     = $this->getDbo();
+		$query  = $db->getQuery(true);
+		$newIds = array();
+
+		// Check that the parent exists
+		if ($parentId)
+		{
+			if (!$table->load($parentId))
+			{
+				if ($error = $table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Non-fatal error
+					$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
+					$parentId = 0;
+				}
+			}
+		}
+
+		// If the parent is 0, set it to the ID of the root item in the tree
+		if (empty($parentId))
+		{
+			if (!$parentId = $table->getRootId())
+			{
+				$this->setError($db->getErrorMsg());
+
+				return false;
+			}
+		}
+
+		// Check that user has create permission for menus
+		$user = JFactory::getUser();
+
+		$menuTypeId = (int) $this->getMenuTypeId($menuType);
+
+		if (!$user->authorise('core.create', 'com_menus.menu.' . $menuTypeId))
+		{
+			$this->setError(JText::_('COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE'));
+
+			return false;
+		}
+
+		// We need to log the parent ID
+		$parents = array();
+
+		// Calculate the emergency stop count as a precaution against a runaway loop bug
+		$query->select('COUNT(id)')
+			->from($db->quoteName('#__menu'));
+		$db->setQuery($query);
+
+		try
+		{
+			$count = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Parent exists so we let's proceed
+		while (!empty($pks) && $count > 0)
+		{
+			// Pop the first id off the stack
+			$pk = array_shift($pks);
+
+			$table->reset();
+
+			// Check that the row actually exists
+			if (!$table->load($pk))
+			{
+				if ($error = $table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Copy is a bit tricky, because we also need to copy the children
+			$query->clear()
+				->select('id')
+				->from($db->quoteName('#__menu'))
+				->where('lft > ' . (int) $table->lft)
+				->where('rgt < ' . (int) $table->rgt);
+			$db->setQuery($query);
+			$childIds = $db->loadColumn();
+
+			// Add child ID's to the array only if they aren't already there.
+			foreach ($childIds as $childId)
+			{
+				if (!in_array($childId, $pks))
+				{
+					$pks[] = $childId;
+				}
+			}
+
+			// Make a copy of the old ID and Parent ID
+			$oldId = $table->id;
+			$oldParentId = $table->parent_id;
+
+			// Reset the id because we are making a copy.
+			$table->id = 0;
+
+			// If we a copying children, the Old ID will turn up in the parents list
+			// otherwise it's a new top level item
+			$table->parent_id = isset($parents[$oldParentId]) ? $parents[$oldParentId] : $parentId;
+			$table->menutype = $menuType;
+
+			// Set the new location in the tree for the node.
+			$table->setLocation($table->parent_id, 'last-child');
+
+			// TODO: Deal with ordering?
+			// $table->ordering = 1;
+			$table->level = null;
+			$table->lft   = null;
+			$table->rgt   = null;
+			$table->home  = 0;
+
+			// Alter the title & alias
+			list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title);
+			$table->title = $title;
+			$table->alias = $alias;
+
+			// Check the row.
+			if (!$table->check())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Store the row.
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+
+			// Now we log the old 'parent' to the new 'parent'
+			$parents[$oldId] = $table->id;
+			$count--;
+		}
+
+		// Rebuild the hierarchy.
+		if (!$table->rebuild())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Rebuild the tree path.
+		if (!$table->rebuildPath($table->id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch move menu items to a new menu or parent.
+	 *
+	 * @param   integer  $value     The new menu or sub-item.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	protected function batchMove($value, $pks, $contexts)
+	{
+		// $value comes as {menutype}.{parent_id}
+		$parts    = explode('.', $value);
+		$menuType = $parts[0];
+		$parentId = ArrayHelper::getValue($parts, 1, 0, 'int');
+
+		$table = $this->getTable();
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Check that the parent exists.
+		if ($parentId)
+		{
+			if (!$table->load($parentId))
+			{
+				if ($error = $table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Non-fatal error
+					$this->setError(JText::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
+					$parentId = 0;
+				}
+			}
+		}
+
+		// Check that user has create and edit permission for menus
+		$user = JFactory::getUser();
+
+		$menuTypeId = (int) $this->getMenuTypeId($menuType);
+
+		if (!$user->authorise('core.create', 'com_menus.menu.' . $menuTypeId))
+		{
+			$this->setError(JText::_('COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE'));
+
+			return false;
+		}
+
+		if (!$user->authorise('core.edit', 'com_menus.menu.' . $menuTypeId))
+		{
+			$this->setError(JText::_('COM_MENUS_BATCH_MENU_ITEM_CANNOT_EDIT'));
+
+			return false;
+		}
+
+		// We are going to store all the children and just moved the menutype
+		$children = array();
+
+		// Parent exists so we let's proceed
+		foreach ($pks as $pk)
+		{
+			// Check that the row actually exists
+			if (!$table->load($pk))
+			{
+				if ($error = $table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Set the new location in the tree for the node.
+			$table->setLocation($parentId, 'last-child');
+
+			// Set the new Parent Id
+			$table->parent_id = $parentId;
+
+			// Check if we are moving to a different menu
+			if ($menuType != $table->menutype)
+			{
+				// Add the child node ids to the children array.
+				$query->clear()
+					->select($db->quoteName('id'))
+					->from($db->quoteName('#__menu'))
+					->where($db->quoteName('lft') . ' BETWEEN ' . (int) $table->lft . ' AND ' . (int) $table->rgt);
+				$db->setQuery($query);
+				$children = array_merge($children, (array) $db->loadColumn());
+			}
+
+			// Check the row.
+			if (!$table->check())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Store the row.
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Rebuild the tree path.
+			if (!$table->rebuildPath())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Process the child rows
+		if (!empty($children))
+		{
+			// Remove any duplicates and sanitize ids.
+			$children = array_unique($children);
+			$children = ArrayHelper::toInteger($children);
+
+			// Update the menutype field in all nodes where necessary.
+			$query->clear()
+				->update($db->quoteName('#__menu'))
+				->set($db->quoteName('menutype') . ' = ' . $db->quote($menuType))
+				->where($db->quoteName('id') . ' IN (' . implode(',', $children) . ')');
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to check if you can save a record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function canSave($data = array(), $key = 'id')
+	{
+		return JFactory::getUser()->authorise('core.edit', $this->option);
+	}
+
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// The folder and element vars are passed when saving the form.
+		if (empty($data))
+		{
+			$item = $this->getItem();
+
+			// The type should already be set.
+			$this->setState('item.link', $item->link);
+		}
+		else
+		{
+			$this->setState('item.link', ArrayHelper::getValue($data, 'link'));
+			$this->setState('item.type', ArrayHelper::getValue($data, 'type'));
+		}
+
+		$clientId = $this->getState('item.client_id');
+
+		// Get the form.
+		if ($clientId == 1)
+		{
+			$form = $this->loadForm('com_menus.item.admin', 'itemadmin', array('control' => 'jform', 'load_data' => $loadData), true);
+		}
+		else
+		{
+			$form = $this->loadForm('com_menus.item', 'item', array('control' => 'jform', 'load_data' => $loadData), true);
+		}
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		if ($loadData)
+		{
+			$data = $this->loadFormData();
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('menuordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is an article you can edit.
+			$form->setFieldAttribute('menuordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+		}
+
+		// Filter available menus
+		$action = $this->getState('item.id') > 0 ? 'edit' : 'create';
+
+		$form->setFieldAttribute('menutype', 'accesstype', $action);
+		$form->setFieldAttribute('type', 'clientid', $clientId);
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+
+		// Check the session for previously entered form data, providing it has an ID and it is the same.
+		$itemData = (array) $this->getItem();
+		$sessionData = (array) JFactory::getApplication()->getUserState('com_menus.edit.item.data', array());
+
+		// Only merge if there is a session and itemId or itemid is null.
+		if (isset($sessionData['id']) && isset($itemData['id']) && $sessionData['id'] === $itemData['id']
+			|| is_null($itemData['id']))
+		{
+			$data = array_merge($itemData, $sessionData);
+		}
+		else
+		{
+			$data = $itemData;
+		}
+
+		// For a new menu item, pre-select some filters (Status, Language, Access) in edit form if those have been selected in Menu Manager
+		if ($this->getItem()->id == 0)
+		{
+			// Get selected fields
+			$filters = JFactory::getApplication()->getUserState('com_menus.items.filter');
+			$data['parent_id'] = (isset($filters['parent_id']) ? $filters['parent_id'] : null);
+			$data['published'] = (isset($filters['published']) ? $filters['published'] : null);
+			$data['language'] = (isset($filters['language']) ? $filters['language'] : null);
+			$data['access'] = (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'));
+		}
+
+		if (isset($data['menutype']) && !$this->getState('item.menutypeid'))
+		{
+			$menuTypeId = (int) $this->getMenuTypeId($data['menutype']);
+
+			$this->setState('item.menutypeid', $menuTypeId);
+		}
+
+		$data = (object) $data;
+
+		$this->preprocessData('com_menus.item', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Get the necessary data to load an item help screen.
+	 *
+	 * @return  object  An object with key, url, and local properties for loading the item help screen.
+	 *
+	 * @since   1.6
+	 */
+	public function getHelp()
+	{
+		return (object) array('key' => $this->helpKey, 'url' => $this->helpURL, 'local' => $this->helpLocal);
+	}
+
+	/**
+	 * Method to get a menu item.
+	 *
+	 * @param   integer  $pk  An optional id of the object to get, otherwise the id from the model state is used.
+	 *
+	 * @return  mixed  Menu item data object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('item.id');
+
+		// Get a level row instance.
+		$table = $this->getTable();
+
+		// Attempt to load the row.
+		$table->load($pk);
+
+		// Check for a table object error.
+		if ($error = $table->getError())
+		{
+			$this->setError($error);
+
+			return false;
+		}
+
+		// Prime required properties.
+
+		if ($type = $this->getState('item.type'))
+		{
+			$table->type = $type;
+		}
+
+		if (empty($table->id))
+		{
+			$table->parent_id = $this->getState('item.parent_id');
+			$table->menutype  = $this->getState('item.menutype');
+			$table->client_id = $this->getState('item.client_id');
+			$table->params = '{}';
+		}
+
+		// If the link has been set in the state, possibly changing link type.
+		if ($link = $this->getState('item.link'))
+		{
+			// Check if we are changing away from the actual link type.
+			if (MenusHelper::getLinkKey($table->link) !== MenusHelper::getLinkKey($link) && (int) $table->id === (int) $this->getState('item.id'))
+			{
+				$table->link = $link;
+			}
+		}
+
+		switch ($table->type)
+		{
+			case 'alias':
+				$table->component_id = 0;
+				$args = array();
+
+				parse_str(parse_url($table->link, PHP_URL_QUERY), $args);
+				break;
+
+			case 'separator':
+			case 'heading':
+			case 'container':
+				$table->link = '';
+				$table->component_id = 0;
+				break;
+
+			case 'url':
+				$table->component_id = 0;
+
+				$args = array();
+				parse_str(parse_url($table->link, PHP_URL_QUERY), $args);
+				break;
+
+			case 'component':
+			default:
+				// Enforce a valid type.
+				$table->type = 'component';
+
+				// Ensure the integrity of the component_id field is maintained, particularly when changing the menu item type.
+				$args = array();
+				parse_str(parse_url($table->link, PHP_URL_QUERY), $args);
+
+				if (isset($args['option']))
+				{
+					// Load the language file for the component.
+					$lang = JFactory::getLanguage();
+					$lang->load($args['option'], JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load($args['option'], JPATH_ADMINISTRATOR . '/components/' . $args['option'], null, false, true);
+
+					// Determine the component id.
+					$component = JComponentHelper::getComponent($args['option']);
+
+					if (isset($component->id))
+					{
+						$table->component_id = $component->id;
+					}
+				}
+				break;
+		}
+
+		// We have a valid type, inject it into the state for forms to use.
+		$this->setState('item.type', $table->type);
+
+		// Convert to the JObject before adding the params.
+		$properties = $table->getProperties(1);
+		$result = ArrayHelper::toObject($properties);
+
+		// Convert the params field to an array.
+		$registry = new Registry($table->params);
+		$result->params = $registry->toArray();
+
+		// Merge the request arguments in to the params for a component.
+		if ($table->type == 'component')
+		{
+			// Note that all request arguments become reserved parameter names.
+			$result->request = $args;
+			$result->params = array_merge($result->params, $args);
+
+			// Special case for the Login menu item.
+			// Display the login or logout redirect URL fields if not empty
+			if ($table->link == 'index.php?option=com_users&view=login')
+			{
+				if (!empty($result->params['login_redirect_url']))
+				{
+					$result->params['loginredirectchoice'] = '0';
+				}
+
+				if (!empty($result->params['logout_redirect_url']))
+				{
+					$result->params['logoutredirectchoice'] = '0';
+				}
+			}
+		}
+
+		if ($table->type == 'alias')
+		{
+			// Note that all request arguments become reserved parameter names.
+			$result->params = array_merge($result->params, $args);
+		}
+
+		if ($table->type == 'url')
+		{
+			// Note that all request arguments become reserved parameter names.
+			$result->params = array_merge($result->params, $args);
+		}
+
+		// Load associated menu items, only supported for frontend for now
+		if ($this->getState('item.client_id') == 0 && JLanguageAssociations::isEnabled())
+		{
+			if ($pk != null)
+			{
+				$result->associations = MenusHelper::getAssociations($pk);
+			}
+			else
+			{
+				$result->associations = array();
+			}
+		}
+
+		$result->menuordering = $pk;
+
+		return $result;
+	}
+
+	/**
+	 * Get the list of modules not in trash.
+	 *
+	 * @return  mixed  An array of module records (id, title, position), or false on error.
+	 *
+	 * @since   1.6
+	 */
+	public function getModules()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Currently any setting that affects target page for a backend menu is not supported, hence load no modules.
+		if ($this->getState('item.client_id') == 1)
+		{
+			return false;
+		}
+
+		/**
+		 * Join on the module-to-menu mapping table.
+		 * We are only interested if the module is displayed on ALL or THIS menu item (or the inverse ID number).
+		 * sqlsrv changes for modulelink to menu manager
+		 */
+		$query->select('a.id, a.title, a.position, a.published, map.menuid')
+			->from('#__modules AS a')
+			->join('LEFT', sprintf('#__modules_menu AS map ON map.moduleid = a.id AND map.menuid IN (0, %1$d, -%1$d)', $this->getState('item.id')))
+			->select('(SELECT COUNT(*) FROM #__modules_menu WHERE moduleid = a.id AND menuid < 0) AS ' . $db->quoteName('except'));
+
+		// Join on the asset groups table.
+		$query->select('ag.title AS access_title')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access')
+			->where('a.published >= 0')
+			->where('a.client_id = ' . (int) $this->getState('item.client_id'))
+			->order('a.position, a.ordering');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$result = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the list of all view levels
+	 *
+	 * @return  array|boolean  An array of all view levels (id, title).
+	 *
+	 * @since   3.4
+	 */
+	public function getViewLevels()
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Get all the available view levels
+		$query->select($db->quoteName('id'))
+			->select($db->quoteName('title'))
+			->from($db->quoteName('#__viewlevels'))
+			->order($db->quoteName('id'));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$result = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * A protected method to get the where clause for the reorder.
+	 * This ensures that the row will be moved relative to a row with the same menutype.
+	 *
+	 * @param   JTableMenu  $table  instance.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return array('menutype = ' . $this->_db->quote($table->get('menutype')));
+	}
+
+	/**
+	 * Returns a Table object, always creating it
+	 *
+	 * @param   string  $type    The table type to instantiate.
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable|JTableNested  A database object.
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Menu', $prefix = 'MenusTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+		$this->setState('item.id', $pk);
+
+		if (!($parentId = $app->getUserState('com_menus.edit.item.parent_id')))
+		{
+			$parentId = $app->input->getInt('parent_id');
+		}
+
+		$this->setState('item.parent_id', $parentId);
+
+		$menuType = $app->getUserStateFromRequest('com_menus.items.menutype', 'menutype', '', 'string');
+
+		// If we have a menutype we take client_id from there, unless forced otherwise
+		if ($menuType)
+		{
+			$menuTypeObj = $this->getMenuType($menuType);
+
+			// An invalid menutype will be handled as clientId = 0 and menuType = ''
+			$menuType   = (string) $menuTypeObj->menutype;
+			$menuTypeId = (int) $menuTypeObj->client_id;
+			$clientId   = (int) $menuTypeObj->client_id;
+		}
+		else
+		{
+			$menuTypeId = 0;
+			$clientId   = $app->getUserState('com_menus.items.client_id', 0);
+		}
+
+		// Forced client id will override/clear menuType if conflicted
+		$forcedClientId = $app->input->get('client_id', null, 'string');
+
+		// Current item if not new, we don't allow changing client id at all
+		if ($pk)
+		{
+			$table = $this->getTable();
+			$table->load($pk);
+			$forcedClientId = $table->get('client_id', $forcedClientId);
+		}
+
+		if (isset($forcedClientId) && $forcedClientId != $clientId)
+		{
+			$clientId   = $forcedClientId;
+			$menuType   = '';
+			$menuTypeId = 0;
+		}
+
+		// Set the menu type and client id on the list view state, so we return to this menu after saving.
+		$app->setUserState('com_menus.items.menutype', $menuType);
+		$app->setUserState('com_menus.items.client_id', $clientId);
+
+		$this->setState('item.menutype', $menuType);
+		$this->setState('item.client_id', $clientId);
+		$this->setState('item.menutypeid', $menuTypeId);
+
+		if (!($type = $app->getUserState('com_menus.edit.item.type')))
+		{
+			$type = $app->input->get('type');
+
+			/**
+			 * Note: a new menu item will have no field type.
+			 * The field is required so the user has to change it.
+			 */
+		}
+
+		$this->setState('item.type', $type);
+
+		if ($link = $app->getUserState('com_menus.edit.item.link'))
+		{
+			$this->setState('item.link', $link);
+		}
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_menus');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Loads the menutype object by a given menutype string
+	 *
+	 * @param   string  $menutype  The given menutype
+	 *
+	 * @return  stdClass
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getMenuType($menutype)
+	{
+		$table = $this->getTable('MenuType', 'JTable');
+
+		$table->load(array('menutype' => $menutype));
+
+		return (object) $table->getProperties();
+	}
+
+	/**
+	 * Loads the menutype ID by a given menutype string
+	 *
+	 * @param   string  $menutype  The given menutype
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.6
+	 */
+	protected function getMenuTypeId($menutype)
+	{
+		$menu = $this->getMenuType($menutype);
+
+		return (int) $menu->id;
+	}
+
+	/**
+	 * Method to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		$link     = $this->getState('item.link');
+		$type     = $this->getState('item.type');
+		$clientId = $this->getState('item.client_id');
+		$formFile = false;
+
+		// Load the specific type file
+		$typeFile   = $clientId == 1 ? 'itemadmin_' . $type : 'item_' . $type;
+		$clientInfo = JApplicationHelper::getClientInfo($clientId);
+
+		// Initialise form with component view params if available.
+		if ($type == 'component')
+		{
+			$link = htmlspecialchars_decode($link);
+
+			// Parse the link arguments.
+			$args = array();
+			parse_str(parse_url(htmlspecialchars_decode($link), PHP_URL_QUERY), $args);
+
+			// Confirm that the option is defined.
+			$option = '';
+			$base = '';
+
+			if (isset($args['option']))
+			{
+				// The option determines the base path to work with.
+				$option = $args['option'];
+				$base = $clientInfo->path . '/components/' . $option;
+			}
+
+			if (isset($args['view']))
+			{
+				$view = $args['view'];
+
+				// Determine the layout to search for.
+				if (isset($args['layout']))
+				{
+					$layout = $args['layout'];
+				}
+				else
+				{
+					$layout = 'default';
+				}
+
+				// Check for the layout XML file. Use standard xml file if it exists.
+				$tplFolders = array(
+					$base . '/views/' . $view . '/tmpl',
+					$base . '/view/' . $view . '/tmpl'
+				);
+				$path = JPath::find($tplFolders, $layout . '.xml');
+
+				if (is_file($path))
+				{
+					$formFile = $path;
+				}
+
+				// If custom layout, get the xml file from the template folder
+				// template folder is first part of file name -- template:folder
+				if (!$formFile && (strpos($layout, ':') > 0))
+				{
+					list($altTmpl, $altLayout) = explode(':', $layout);
+
+					$templatePath = JPath::clean($clientInfo->path . '/templates/' . $altTmpl . '/html/' . $option . '/' . $view . '/' . $altLayout . '.xml');
+
+					if (is_file($templatePath))
+					{
+						$formFile = $templatePath;
+					}
+				}
+			}
+
+			// Now check for a view manifest file
+			if (!$formFile)
+			{
+				if (isset($view))
+				{
+					$metadataFolders = array(
+						$base . '/view/' . $view,
+						$base . '/views/' . $view
+					);
+					$metaPath = JPath::find($metadataFolders, 'metadata.xml');
+
+					if (is_file($path = JPath::clean($metaPath)))
+					{
+						$formFile = $path;
+					}
+				}
+				else
+				{
+					// Now check for a component manifest file
+					$path = JPath::clean($base . '/metadata.xml');
+
+					if (is_file($path))
+					{
+						$formFile = $path;
+					}
+				}
+			}
+		}
+
+		if ($formFile)
+		{
+			// If an XML file was found in the component, load it first.
+			// We need to qualify the full path to avoid collisions with component file names.
+
+			if ($form->loadFile($formFile, true, '/metadata') == false)
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+
+			// Attempt to load the xml file.
+			if (!$xml = simplexml_load_file($formFile))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+
+			// Get the help data from the XML file if present.
+			$help = $xml->xpath('/metadata/layout/help');
+		}
+		else
+		{
+			// We don't have a component. Load the form XML to get the help path
+			$xmlFile = JPath::find(JPATH_ADMINISTRATOR . '/components/com_menus/models/forms', $typeFile . '.xml');
+
+			if ($xmlFile)
+			{
+				if (!$xml = simplexml_load_file($xmlFile))
+				{
+					throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+				}
+
+				// Get the help data from the XML file if present.
+				$help = $xml->xpath('/form/help');
+			}
+		}
+
+		if (!empty($help))
+		{
+			$helpKey = trim((string) $help[0]['key']);
+			$helpURL = trim((string) $help[0]['url']);
+			$helpLoc = trim((string) $help[0]['local']);
+
+			$this->helpKey = $helpKey ?: $this->helpKey;
+			$this->helpURL = $helpURL ?: $this->helpURL;
+			$this->helpLocal = (($helpLoc == 'true') || ($helpLoc == '1') || ($helpLoc == 'local')) ? true : false;
+		}
+
+		if (!$form->loadFile($typeFile, true, false))
+		{
+			throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+		}
+
+		// Association menu items, we currently do not support this for admin menu… may be later
+		if ($clientId == 0 && JLanguageAssociations::isEnabled())
+		{
+			$languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc');
+
+			if (count($languages) > 1)
+			{
+				$addform = new SimpleXMLElement('<form />');
+				$fields = $addform->addChild('fields');
+				$fields->addAttribute('name', 'associations');
+				$fieldset = $fields->addChild('fieldset');
+				$fieldset->addAttribute('name', 'item_associations');
+
+				foreach ($languages as $language)
+				{
+					$field = $fieldset->addChild('field');
+					$field->addAttribute('name', $language->lang_code);
+					$field->addAttribute('type', 'modal_menu');
+					$field->addAttribute('language', $language->lang_code);
+					$field->addAttribute('label', $language->title);
+					$field->addAttribute('translate_label', 'false');
+					$field->addAttribute('select', 'true');
+					$field->addAttribute('new', 'true');
+					$field->addAttribute('edit', 'true');
+					$field->addAttribute('clear', 'true');
+					$option = $field->addChild('option', 'COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE');
+					$option->addAttribute('value', '');
+				}
+
+				$form->load($addform, false);
+			}
+		}
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method rebuild the entire nested set tree.
+	 *
+	 * @return  boolean|JException  Boolean true on success, boolean false or JException instance on error
+	 *
+	 * @since   1.6
+	 */
+	public function rebuild()
+	{
+		// Initialise variables.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$table = $this->getTable();
+
+		try
+		{
+			$rebuildResult = $table->rebuild();
+		}
+		catch (Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		if (!$rebuildResult)
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$query->select('id, params')
+			->from('#__menu')
+			->where('params NOT LIKE ' . $db->quote('{%'))
+			->where('params <> ' . $db->quote(''));
+		$db->setQuery($query);
+
+		try
+		{
+			$items = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return JError::raiseWarning(500, $e->getMessage());
+		}
+
+		foreach ($items as &$item)
+		{
+			$registry = new Registry($item->params);
+			$params = (string) $registry;
+
+			$query->clear();
+			$query->update('#__menu')
+				->set('params = ' . $db->quote($params))
+				->where('id = ' . $item->id);
+
+			try
+			{
+				$db->setQuery($query)->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				return JError::raiseWarning(500, $e->getMessage());
+			}
+
+			unset($registry);
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('item.id');
+		$isNew      = true;
+		$table   = $this->getTable();
+		$context = $this->option . '.' . $this->name;
+
+		// Include the plugins for the on save events.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Load the row if saving an existing item.
+		if ($pk > 0)
+		{
+			$table->load($pk);
+			$isNew = false;
+		}
+
+		if (!$isNew)
+		{
+			if ($table->parent_id == $data['parent_id'])
+			{
+				// If first is chosen make the item the first child of the selected parent.
+				if ($data['menuordering'] == -1)
+				{
+					$table->setLocation($data['parent_id'], 'first-child');
+				}
+				// If last is chosen make it the last child of the selected parent.
+				elseif ($data['menuordering'] == -2)
+				{
+					$table->setLocation($data['parent_id'], 'last-child');
+				}
+				// Don't try to put an item after itself. All other ones put after the selected item.
+				// $data['id'] is empty means it's a save as copy
+				elseif ($data['menuordering'] && $table->id != $data['menuordering'] || empty($data['id']))
+				{
+					$table->setLocation($data['menuordering'], 'after');
+				}
+				// Just leave it where it is if no change is made.
+				elseif ($data['menuordering'] && $table->id == $data['menuordering'])
+				{
+					unset($data['menuordering']);
+				}
+			}
+			// Set the new parent id if parent id not matched and put in last position
+			else
+			{
+				$table->setLocation($data['parent_id'], 'last-child');
+			}
+		}
+		// We have a new item, so it is not a change.
+		else
+		{
+			$menuType = $this->getMenuType($data['menutype']);
+
+			$data['client_id'] = $menuType->client_id;
+
+			$table->setLocation($data['parent_id'], 'last-child');
+		}
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Alter the title & alias for save as copy.  Also, unset the home record.
+		if (!$isNew && $data['id'] == 0)
+		{
+			list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title);
+
+			$table->title     = $title;
+			$table->alias     = $alias;
+			$table->published = 0;
+			$table->home      = 0;
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before save event.
+		$result = $dispatcher->trigger($this->event_before_save, array($context, &$table, $isNew));
+
+		// Store the data.
+		if (in_array(false, $result, true)|| !$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger($this->event_after_save, array($context, &$table, $isNew));
+
+		// Rebuild the tree path.
+		if (!$table->rebuildPath($table->id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$this->setState('item.id', $table->id);
+		$this->setState('item.menutype', $table->menutype);
+
+		// Load associated menu items, for now not supported for admin menu… may be later
+		if ($table->get('client_id') == 0 && JLanguageAssociations::isEnabled())
+		{
+			// Adding self to the association
+			$associations = isset($data['associations']) ? $data['associations'] : array();
+
+			// Unset any invalid associations
+			$associations = Joomla\Utilities\ArrayHelper::toInteger($associations);
+
+			foreach ($associations as $tag => $id)
+			{
+				if (!$id)
+				{
+					unset($associations[$tag]);
+				}
+			}
+
+			// Detecting all item menus
+			$all_language = $table->language == '*';
+
+			if ($all_language && !empty($associations))
+			{
+				JError::raiseNotice(403, JText::_('COM_MENUS_ERROR_ALL_LANGUAGE_ASSOCIATED'));
+			}
+
+			// Get associationskey for edited item
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('key'))
+				->from($db->quoteName('#__associations'))
+				->where($db->quoteName('context') . ' = ' . $db->quote($this->associationsContext))
+				->where($db->quoteName('id') . ' = ' . (int) $table->id);
+			$db->setQuery($query);
+			$old_key = $db->loadResult();
+
+			// Deleting old associations for the associated items
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__associations'))
+				->where($db->quoteName('context') . ' = ' . $db->quote($this->associationsContext));
+
+			if ($associations)
+			{
+				$query->where('(' . $db->quoteName('id') . ' IN (' . implode(',', $associations) . ') OR '
+					. $db->quoteName('key') . ' = ' . $db->quote($old_key) . ')'
+				);
+			}
+			else
+			{
+				$query->where($db->quoteName('key') . ' = ' . $db->quote($old_key));
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			// Adding self to the association
+			if (!$all_language)
+			{
+				$associations[$table->language] = (int) $table->id;
+			}
+
+			if (count($associations) > 1)
+			{
+				// Adding new association for these items
+				$key = md5(json_encode($associations));
+				$query->clear()
+					->insert('#__associations');
+
+				foreach ($associations as $id)
+				{
+					$query->values(((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key));
+				}
+
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		if (isset($data['link']))
+		{
+			$base = JUri::base();
+			$juri = JUri::getInstance($base . $data['link']);
+			$option = $juri->getVar('option');
+
+			// Clean the cache
+			parent::cleanCache($option);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to save the reordered nested set tree.
+	 * First we save the new order values in the lft values of the changed ids.
+	 * Then we invoke the table rebuild to implement the new ordering.
+	 *
+	 * @param   array  $idArray    Rows identifiers to be reordered
+	 * @param   array  $lft_array  lft values of rows to be reordered
+	 *
+	 * @return  boolean false on failuer or error, true otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function saveorder($idArray = null, $lft_array = null)
+	{
+		// Get an instance of the table object.
+		$table = $this->getTable();
+
+		if (!$table->saveorder($idArray, $lft_array))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the home state of one or more items.
+	 *
+	 * @param   array    $pks    A list of the primary keys to change.
+	 * @param   integer  $value  The value of the home state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function setHome(&$pks, $value = 1)
+	{
+		$table = $this->getTable();
+		$pks = (array) $pks;
+
+		$languages = array();
+		$onehome = false;
+
+		// Remember that we can set a home page for different languages,
+		// so we need to loop through the primary key array.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if (!array_key_exists($table->language, $languages))
+				{
+					$languages[$table->language] = true;
+
+					if ($table->home == $value)
+					{
+						unset($pks[$i]);
+						JError::raiseNotice(403, JText::_('COM_MENUS_ERROR_ALREADY_HOME'));
+					}
+					elseif ($table->menutype == 'main')
+					{
+						// Prune items that you can't change.
+						unset($pks[$i]);
+						JError::raiseWarning(403, JText::_('COM_MENUS_ERROR_MENUTYPE_HOME'));
+					}
+					else
+					{
+						$table->home = $value;
+
+						if ($table->language == '*')
+						{
+							$table->published = 1;
+						}
+
+						if (!$this->canSave($table))
+						{
+							// Prune items that you can't change.
+							unset($pks[$i]);
+							JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+						}
+						elseif (!$table->check())
+						{
+							// Prune the items that failed pre-save checks.
+							unset($pks[$i]);
+							JError::raiseWarning(403, $table->getError());
+						}
+						elseif (!$table->store())
+						{
+							// Prune the items that could not be stored.
+							unset($pks[$i]);
+							JError::raiseWarning(403, $table->getError());
+						}
+					}
+				}
+				else
+				{
+					unset($pks[$i]);
+
+					if (!$onehome)
+					{
+						$onehome = true;
+						JError::raiseNotice(403, JText::sprintf('COM_MENUS_ERROR_ONE_HOME'));
+					}
+				}
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    $pks    A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		$table = $this->getTable();
+		$pks   = (array) $pks;
+
+		// Default menu item existence checks.
+		if ($value != 1)
+		{
+			foreach ($pks as $i => $pk)
+			{
+				if ($table->load($pk) && $table->home && $table->language == '*')
+				{
+					// Prune items that you can't change.
+					JError::raiseWarning(403, JText::_('JLIB_DATABASE_ERROR_MENU_UNPUBLISH_DEFAULT_HOME'));
+					unset($pks[$i]);
+					break;
+				}
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		// Ensure that previous checks doesn't empty the array
+		if (empty($pks))
+		{
+			return true;
+		}
+
+		return parent::publish($pks, $value);
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $parent_id  The id of the parent.
+	 * @param   string   $alias      The alias.
+	 * @param   string   $title      The title.
+	 *
+	 * @return  array  Contains the modified title and alias.
+	 *
+	 * @since   1.6
+	 */
+	protected function generateNewTitle($parent_id, $alias, $title)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id)))
+		{
+			if ($title == $table->title)
+			{
+				$title = StringHelper::increment($title);
+			}
+
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($title, $alias);
+	}
+
+	/**
+	 * Custom clean the cache
+	 *
+	 * @param   string   $group      Cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('com_menus', 0);
+		parent::cleanCache('com_modules');
+		parent::cleanCache('mod_menu', 0);
+		parent::cleanCache('mod_menu', 1);
+	}
+}
diff --git a/core/administrator/components/com_menus/models/items.php b/core/administrator/components/com_menus/models/items.php
new file mode 100644
index 00000000..8903539b
--- /dev/null
+++ b/core/administrator/components/com_menus/models/items.php
@@ -0,0 +1,553 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Menu Item List Model for Menus.
+ *
+ * @since  1.6
+ */
+class MenusModelItems extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'menutype', 'a.menutype', 'menutype_title',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'published', 'a.published',
+				'access', 'a.access', 'access_level',
+				'language', 'a.language',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'lft', 'a.lft',
+				'rgt', 'a.rgt',
+				'level', 'a.level',
+				'path', 'a.path',
+				'client_id', 'a.client_id',
+				'home', 'a.home',
+				'parent_id', 'a.parent_id',
+				'a.ordering'
+			);
+
+			$app = JFactory::getApplication();
+			$assoc = JLanguageAssociations::isEnabled();
+
+			if ($assoc)
+			{
+				$config['filter_fields'][] = 'association';
+			}
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.lft', $direction = 'asc')
+	{
+		$app = JFactory::getApplication('administrator');
+		$user = JFactory::getUser();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		$search = $this->getUserStateFromRequest($this->context . '.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$published = $this->getUserStateFromRequest($this->context . '.published', 'filter_published', '');
+		$this->setState('filter.published', $published);
+
+		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
+		$this->setState('filter.access', $access);
+
+		$parentId = $this->getUserStateFromRequest($this->context . '.filter.parent_id', 'filter_parent_id');
+		$this->setState('filter.parent_id', $parentId);
+
+		$level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level');
+		$this->setState('filter.level', $level);
+
+		// Watch changes in client_id and menutype and keep sync whenever needed.
+		$currentClientId = $app->getUserState($this->context . '.client_id', 0);
+		$clientId        = $app->input->getInt('client_id', $currentClientId);
+
+		// Load mod_menu.ini file when client is administrator
+		if ($clientId == 1)
+		{
+			JFactory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR, null, false, true);
+		}
+
+		$currentMenuType = $app->getUserState($this->context . '.menutype', '');
+		$menuType        = $app->input->getString('menutype', $currentMenuType);
+
+		// If client_id changed clear menutype and reset pagination
+		if ($clientId != $currentClientId)
+		{
+			$menuType = '';
+
+			$app->input->set('limitstart', 0);
+			$app->input->set('menutype', '');
+		}
+
+		// If menutype changed reset pagination.
+		if ($menuType != $currentMenuType)
+		{
+			$app->input->set('limitstart', 0);
+		}
+
+		if (!$menuType)
+		{
+			$app->setUserState($this->context . '.menutype', '');
+			$this->setState('menutypetitle', '');
+			$this->setState('menutypeid', '');
+		}
+		// Special menu types, if selected explicitly, will be allowed as a filter
+		elseif ($menuType == 'main')
+		{
+			// Adjust client_id to match the menutype. This is safe as client_id was not changed in this request.
+			$app->input->set('client_id', 1);
+
+			$app->setUserState($this->context . '.menutype', $menuType);
+			$this->setState('menutypetitle', ucfirst($menuType));
+			$this->setState('menutypeid', -1);
+		}
+		// Get the menutype object with appropriate checks.
+		elseif ($cMenu = $this->getMenu($menuType, true))
+		{
+			// Adjust client_id to match the menutype. This is safe as client_id was not changed in this request.
+			$app->input->set('client_id', $cMenu->client_id);
+
+			$app->setUserState($this->context . '.menutype', $menuType);
+			$this->setState('menutypetitle', $cMenu->title);
+			$this->setState('menutypeid', $cMenu->id);
+		}
+		// This menutype does not exist, leave client id unchanged but reset menutype and pagination
+		else
+		{
+			$menuType = '';
+
+			$app->input->set('limitstart', 0);
+			$app->input->set('menutype', $menuType);
+
+			$app->setUserState($this->context . '.menutype', $menuType);
+			$this->setState('menutypetitle', '');
+			$this->setState('menutypeid', '');
+		}
+
+		// Client id filter
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$this->setState('filter.client_id', $clientId);
+
+		// Use a different filter file when client is administrator
+		if ($clientId == 1)
+		{
+			$this->filterFormName = 'filter_itemsadmin';
+		}
+
+		$this->setState('filter.menutype', $menuType);
+
+		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+		$this->setState('filter.language', $language);
+
+		// Component parameters.
+		$params = JComponentHelper::getParams('com_menus');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('filter.language', $forcedLanguage);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.parent_id');
+		$id .= ':' . $this->getState('filter.menutype');
+		$id .= ':' . $this->getState('filter.client_id');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Builds an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery    A query object.
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+		$app = JFactory::getApplication();
+
+		// Select all fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				$db->quoteName(
+					array(
+						'a.id', 'a.menutype', 'a.title', 'a.alias', 'a.note', 'a.path', 'a.link', 'a.type', 'a.parent_id',
+						'a.level', 'a.published', 'a.component_id', 'a.checked_out', 'a.checked_out_time', 'a.browserNav',
+						'a.access', 'a.img', 'a.template_style_id', 'a.params', 'a.lft', 'a.rgt', 'a.home', 'a.language', 'a.client_id'
+					),
+					array(
+						null, null, null, null, null, null, null, null, null,
+						null, 'a.published', null, null, null, null,
+						null, null, null, null, null, null, null, null, null
+					)
+				)
+			)
+		);
+		$query->select(
+			'CASE ' .
+				' WHEN a.type = ' . $db->quote('component') . ' THEN a.published+2*(e.enabled-1) ' .
+				' WHEN a.type = ' . $db->quote('url') . ' AND a.published != -2 THEN a.published+2 ' .
+				' WHEN a.type = ' . $db->quote('url') . ' AND a.published = -2 THEN a.published-1 ' .
+				' WHEN a.type = ' . $db->quote('alias') . ' AND a.published != -2 THEN a.published+4 ' .
+				' WHEN a.type = ' . $db->quote('alias') . ' AND a.published = -2 THEN a.published-1 ' .
+				' WHEN a.type = ' . $db->quote('separator') . ' AND a.published != -2 THEN a.published+6 ' .
+				' WHEN a.type = ' . $db->quote('separator') . ' AND a.published = -2 THEN a.published-1 ' .
+				' WHEN a.type = ' . $db->quote('heading') . ' AND a.published != -2 THEN a.published+8 ' .
+				' WHEN a.type = ' . $db->quote('heading') . ' AND a.published = -2 THEN a.published-1 ' .
+				' WHEN a.type = ' . $db->quote('container') . ' AND a.published != -2 THEN a.published+8 ' .
+				' WHEN a.type = ' . $db->quote('container') . ' AND a.published = -2 THEN a.published-1 ' .
+			' END AS published '
+		);
+		$query->from($db->quoteName('#__menu') . ' AS a');
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image, l.sef AS language_sef')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the users.
+		$query->select('u.name AS editor')
+			->join('LEFT', $db->quoteName('#__users') . ' AS u ON u.id = a.checked_out');
+
+		// Join over components
+		$query->select('c.element AS componentname')
+			->join('LEFT', $db->quoteName('#__extensions') . ' AS c ON c.extension_id = a.component_id');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Join over the menu types.
+		$query->select($db->quoteName(array('mt.id', 'mt.title'), array('menutype_id', 'menutype_title')))
+			->join('LEFT', $db->quoteName('#__menu_types', 'mt') . ' ON ' . $db->qn('mt.menutype') . ' = ' . $db->qn('a.menutype'));
+
+		// Join over the associations.
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$query->select('COUNT(asso2.id)>1 as association')
+				->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_menus.item'))
+				->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key')
+				->group('a.id, e.enabled, l.title, l.image, u.name, c.element, ag.title, e.name, mt.id, mt.title, l.sef');
+		}
+
+		// Join over the extensions
+		$query->select('e.name AS name')
+			->join('LEFT', '#__extensions AS e ON e.extension_id = a.component_id');
+
+		// Exclude the root category.
+		$query->where('a.id > 1')
+			->where('a.client_id = ' . (int) $this->getState('filter.client_id'));
+
+		// Filter on the published state.
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('a.published IN (0, 1)');
+		}
+
+		// Filter by search in title, alias or id
+		if ($search = trim($this->getState('filter.search')))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'link:') === 0)
+			{
+				if ($search = substr($search, 5))
+				{
+					$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+					$query->where('a.link LIKE ' . $search);
+				}
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(' . 'a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ' OR a.note LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter the items over the parent id if set.
+		$parentId = $this->getState('filter.parent_id');
+
+		if (!empty($parentId))
+		{
+			$query->where('a.parent_id = ' . (int) $parentId);
+		}
+
+		// Filter the items over the menu id if set.
+		$menuType = $this->getState('filter.menutype');
+
+		// A value "" means all
+		if ($menuType == '')
+		{
+			// Load all menu types we have manage access
+			$query2 = $this->getDbo()->getQuery(true)
+				->select($this->getDbo()->qn(array('id', 'menutype')))
+				->from('#__menu_types')
+				->where('client_id = ' . (int) $this->getState('filter.client_id'))
+				->order('title');
+
+			// Show protected items on explicit filter only
+			$query->where('a.menutype != ' . $db->q('main'));
+
+			$menuTypes = $this->getDbo()->setQuery($query2)->loadObjectList();
+
+			if ($menuTypes)
+			{
+				$types = array();
+
+				foreach ($menuTypes as $type)
+				{
+					if ($user->authorise('core.manage', 'com_menus.menu.' . (int) $type->id))
+					{
+						$types[] = $query->q($type->menutype);
+					}
+				}
+
+				$query->where($types ? 'a.menutype IN(' . implode(',', $types) . ')' : 0);
+			}
+		}
+		// Default behavior => load all items from a specific menu
+		elseif (strlen($menuType))
+		{
+			$query->where('a.menutype = ' . $db->quote($menuType));
+		}
+		// Empty menu type => error
+		else
+		{
+			$query->where('1 != 1');
+		}
+
+		// Filter on the access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = $user->getAuthorisedViewLevels();
+
+			if (!empty($groups))
+			{
+				$query->where('a.access IN (' . implode(',', $groups) . ')');
+			}
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where('a.level <= ' . (int) $level);
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where('a.language = ' . $db->quote($language));
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		$name = $form->getName();
+
+		if ($name == 'com_menus.items.filter')
+		{
+			$clientId = $this->getState('filter.client_id');
+			$form->setFieldAttribute('menutype', 'clientid', $clientId);
+		}
+		elseif (false !== strpos($name, 'com_menus.items.modal.'))
+		{
+			$form->removeField('client_id');
+
+			$clientId = $this->getState('filter.client_id');
+			$form->setFieldAttribute('menutype', 'clientid', $clientId);
+		}
+	}
+
+	/**
+	 * Get the client id for a menu
+	 *
+	 * @param   string   $menuType  The menutype identifier for the menu
+	 * @param   boolean  $check     Flag whether to perform check against ACL as well as existence
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getMenu($menuType, $check = false)
+	{
+		$query = $this->_db->getQuery(true);
+
+		$query->select('a.*')
+			->from($this->_db->qn('#__menu_types', 'a'))
+			->where('menutype = ' . $this->_db->q($menuType));
+
+		$cMenu = $this->_db->setQuery($query)->loadObject();
+
+		if ($check)
+		{
+			// Check if menu type exists.
+			if (!$cMenu)
+			{
+				JLog::add(JText::_('COM_MENUS_ERROR_MENUTYPE_NOT_FOUND'), JLog::ERROR, 'jerror');
+
+				return false;
+			}
+			// Check if menu type is valid against ACL.
+			elseif (!JFactory::getUser()->authorise('core.manage', 'com_menus.menu.' . $cMenu->id))
+			{
+				JLog::add(JText::_('JERROR_ALERTNOAUTHOR'), JLog::ERROR, 'jerror');
+
+				return false;
+			}
+		}
+
+		return $cMenu;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   12.2
+	 */
+	public function getItems()
+	{
+		$store = $this->getStoreId();
+
+		if (!isset($this->cache[$store]))
+		{
+			$items = parent::getItems();
+			$lang  = JFactory::getLanguage();
+			$client = $this->state->get('filter.client_id');
+
+			if ($items)
+			{
+				foreach ($items as $item)
+				{
+					if ($extension = $item->componentname)
+					{
+						$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+						|| $lang->load("$extension.sys", JPATH_ADMINISTRATOR . '/components/' . $extension, null, false, true);
+					}
+
+					// Translate component name
+					if ($client === 1)
+					{
+						$item->title = JText::_($item->title);
+					}
+				}
+			}
+
+			$this->cache[$store] = $items;
+		}
+
+		return $this->cache[$store];
+	}
+}
diff --git a/core/administrator/components/com_menus/models/menu.php b/core/administrator/components/com_menus/models/menu.php
new file mode 100644
index 00000000..0d0794ad
--- /dev/null
+++ b/core/administrator/components/com_menus/models/menu.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Menu Item Model for Menus.
+ *
+ * @since  1.6
+ */
+class MenusModelMenu extends JModelForm
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_MENUS_MENU';
+
+	/**
+	 * Model context string.
+	 *
+	 * @var  string
+	 */
+	protected $_context = 'com_menus.menu';
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.delete', 'com_menus.menu.' . (int) $record->id);
+	}
+
+	/**
+	 * Method to test whether the state of a record can be edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.edit.state', 'com_menus.menu.' . (int) $record->id);
+	}
+
+	/**
+	 * Returns a Table object, always creating it
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'MenuType', $prefix = 'JTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$id = $app->input->getInt('id');
+		$this->setState('menu.id', $id);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_menus');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get a menu item.
+	 *
+	 * @param   integer  $itemId  The id of the menu item to get.
+	 *
+	 * @return  mixed  Menu item data object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function &getItem($itemId = null)
+	{
+		$itemId = (!empty($itemId)) ? $itemId : (int) $this->getState('menu.id');
+
+		// Get a menu item row instance.
+		$table = $this->getTable();
+
+		// Attempt to load the row.
+		$return = $table->load($itemId);
+
+		// Check for a table object error.
+		if ($return === false && $table->getError())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$properties = $table->getProperties(1);
+		$value      = ArrayHelper::toObject($properties, 'JObject');
+
+		return $value;
+	}
+
+	/**
+	 * Method to get the menu item form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_menus.menu', 'menu', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_menus.edit.menu.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+		else
+		{
+			unset($data['preset']);
+		}
+
+		$this->preprocessData('com_menus.menu', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$id         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('menu.id');
+		$isNew      = true;
+
+		// Get a row instance.
+		$table = $this->getTable();
+
+		// Include the plugins for the save events.
+		JPluginHelper::importPlugin('content');
+
+		// Load the row if saving an existing item.
+		if ($id > 0)
+		{
+			$isNew = false;
+			$table->load($id);
+		}
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before event.
+		$result = $dispatcher->trigger('onContentBeforeSave', array($this->_context, &$table, $isNew));
+
+		// Store the data.
+		if (in_array(false, $result, true) || !$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger('onContentAfterSave', array($this->_context, &$table, $isNew));
+
+		$this->setState('menu.id', $table->id);
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to delete groups.
+	 *
+	 * @param   array  $itemIds  An array of item ids.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function delete($itemIds)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Sanitize the ids.
+		$itemIds = ArrayHelper::toInteger((array) $itemIds);
+
+		// Get a group row instance.
+		$table = $this->getTable();
+
+		// Include the plugins for the delete events.
+		JPluginHelper::importPlugin('content');
+
+		// Iterate the items to delete each one.
+		foreach ($itemIds as $itemId)
+		{
+			if ($table->load($itemId))
+			{
+				// Trigger the before delete event.
+				$result = $dispatcher->trigger('onContentBeforeDelete', array($this->_context, $table));
+
+				if (in_array(false, $result, true) || !$table->delete($itemId))
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+
+				// Trigger the after delete event.
+				$dispatcher->trigger('onContentAfterDelete', array($this->_context, $table));
+
+				// TODO: Delete the menu associations - Menu items and Modules
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Gets a list of all mod_mainmenu modules and collates them by menutype
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function &getModules()
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->from('#__modules as a')
+			->select('a.id, a.title, a.params, a.position')
+			->where('module = ' . $db->quote('mod_menu'))
+			->select('ag.title AS access_title')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+		$db->setQuery($query);
+
+		$modules = $db->loadObjectList();
+
+		$result = array();
+
+		foreach ($modules as &$module)
+		{
+			$params = new Registry($module->params);
+
+			$menuType = $params->get('menutype');
+
+			if (!isset($result[$menuType]))
+			{
+				$result[$menuType] = array();
+			}
+
+			$result[$menuType][] = & $module;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Custom clean the cache
+	 *
+	 * @param   string   $group      Cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('com_menus', 0);
+		parent::cleanCache('com_modules');
+		parent::cleanCache('mod_menu', 0);
+		parent::cleanCache('mod_menu', 1);
+	}
+}
diff --git a/core/administrator/components/com_menus/models/menus.php b/core/administrator/components/com_menus/models/menus.php
new file mode 100644
index 00000000..f1e888a4
--- /dev/null
+++ b/core/administrator/components/com_menus/models/menus.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Menu List Model for Menus.
+ *
+ * @since  1.6
+ */
+class MenusModelMenus extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'menutype', 'a.menutype',
+				'client_id', 'a.client_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Overrides the getItems method to attach additional metrics to the list.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6.1
+	 */
+	public function getItems()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId('getItems');
+
+		// Try to load the data from internal storage.
+		if (!empty($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		// Load the list items.
+		$items = parent::getItems();
+
+		// If emtpy or an error, just return.
+		if (empty($items))
+		{
+			return array();
+		}
+
+		// Getting the following metric by joins is WAY TOO SLOW.
+		// Faster to do three queries for very large menu trees.
+
+		// Get the menu types of menus in the list.
+		$db = $this->getDbo();
+		$menuTypes = ArrayHelper::getColumn((array) $items, 'menutype');
+
+		// Quote the strings.
+		$menuTypes = implode(
+			',',
+			array_map(array($db, 'quote'), $menuTypes)
+		);
+
+		// Get the published menu counts.
+		$query = $db->getQuery(true)
+			->select('m.menutype, COUNT(DISTINCT m.id) AS count_published')
+			->from('#__menu AS m')
+			->where('m.published = 1')
+			->where('m.menutype IN (' . $menuTypes . ')')
+			->group('m.menutype');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$countPublished = $db->loadAssocList('menutype', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Get the unpublished menu counts.
+		$query->clear('where')
+			->where('m.published = 0')
+			->where('m.menutype IN (' . $menuTypes . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$countUnpublished = $db->loadAssocList('menutype', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Get the trashed menu counts.
+		$query->clear('where')
+			->where('m.published = -2')
+			->where('m.menutype IN (' . $menuTypes . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$countTrashed = $db->loadAssocList('menutype', 'count_published');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Inject the values back into the array.
+		foreach ($items as $item)
+		{
+			$item->count_published   = isset($countPublished[$item->menutype]) ? $countPublished[$item->menutype] : 0;
+			$item->count_unpublished = isset($countUnpublished[$item->menutype]) ? $countUnpublished[$item->menutype] : 0;
+			$item->count_trashed     = isset($countTrashed[$item->menutype]) ? $countTrashed[$item->menutype] : 0;
+		}
+
+		// Add the items to the internal cache.
+		$this->cache[$store] = $items;
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return  string  An SQL query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select all fields from the table.
+		$query->select($this->getState('list.select', 'a.id, a.menutype, a.title, a.description, a.client_id'))
+			->from($db->quoteName('#__menu_types') . ' AS a')
+			->where('a.id > 0');
+
+		$query->where('a.client_id = ' . (int) $this->getState('client_id'));
+
+		// Filter by search in title or menutype
+		if ($search = trim($this->getState('filter.search')))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where('(' . 'a.title LIKE ' . $search . ' OR a.menutype LIKE ' . $search . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.id')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.title', $direction = 'asc')
+	{
+		$search   = $this->getUserStateFromRequest($this->context . '.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$this->setState('client_id', $clientId);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Gets the extension id of the core mod_menu module.
+	 *
+	 * @return  integer
+	 *
+	 * @since   2.5
+	 */
+	public function getModMenuId()
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('e.extension_id')
+			->from('#__extensions AS e')
+			->where('e.type = ' . $db->quote('module'))
+			->where('e.element = ' . $db->quote('mod_menu'))
+			->where('e.client_id = ' . (int) $this->getState('client_id'));
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Gets a list of all mod_mainmenu modules and collates them by menutype
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function &getModules()
+	{
+		$model = JModelLegacy::getInstance('Menu', 'MenusModel', array('ignore_request' => true));
+		$result = $model->getModules();
+
+		return $result;
+	}
+}
diff --git a/core/administrator/components/com_menus/models/menutypes.php b/core/administrator/components/com_menus/models/menutypes.php
new file mode 100644
index 00000000..6340ae4c
--- /dev/null
+++ b/core/administrator/components/com_menus/models/menutypes.php
@@ -0,0 +1,621 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.path');
+/**
+ * Menu Item Types Model for Menus.
+ *
+ * @since  1.6
+ */
+class MenusModelMenutypes extends JModelLegacy
+{
+	/**
+	 * A reverse lookup of the base link URL to Title
+	 *
+	 * @var  array
+	 */
+	protected $rlu = array();
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * @return  void
+	 *
+	 * @note    Calling getState in this method will result in recursion.
+	 * @since   12.2
+	 */
+	protected function populateState()
+	{
+		parent::populateState();
+
+		$app      = JFactory::getApplication();
+		$clientId = $app->input->get('client_id', 0);
+
+		$this->state->set('client_id', $clientId);
+	}
+
+	/**
+	 * Method to get the reverse lookup of the base link URL to Title
+	 *
+	 * @return  array  Array of reverse lookup of the base link URL to Title
+	 *
+	 * @since   1.6
+	 */
+	public function getReverseLookup()
+	{
+		if (empty($this->rlu))
+		{
+			$this->getTypeOptions();
+		}
+
+		return $this->rlu;
+	}
+
+	/**
+	 * Method to get the available menu item type options.
+	 *
+	 * @return  array  Array of groups with menu item types.
+	 *
+	 * @since   1.6
+	 */
+	public function getTypeOptions()
+	{
+		jimport('joomla.filesystem.file');
+
+		$lang = JFactory::getLanguage();
+		$list = array();
+
+		// Get the list of components.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('name, element AS ' . $db->quoteName('option'))
+			->from('#__extensions')
+			->where('type = ' . $db->quote('component'))
+			->where('enabled = 1')
+			->order('name ASC');
+		$db->setQuery($query);
+		$components = $db->loadObjectList();
+
+		foreach ($components as $component)
+		{
+			$options = $this->getTypeOptionsByComponent($component->option);
+
+			if ($options)
+			{
+				$list[$component->name] = $options;
+
+				// Create the reverse lookup for link-to-name.
+				foreach ($options as $option)
+				{
+					if (isset($option->request))
+					{
+						$this->addReverseLookupUrl($option);
+
+						if (isset($option->request['option']))
+						{
+							$componentLanguageFolder = JPATH_ADMINISTRATOR . '/components/' . $option->request['option'];
+							$lang->load($option->request['option'] . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+								||	$lang->load($option->request['option'] . '.sys', $componentLanguageFolder, null, false, true);
+						}
+					}
+				}
+			}
+		}
+
+		// Allow a system plugin to insert dynamic menu types to the list shown in menus:
+		JEventDispatcher::getInstance()->trigger('onAfterGetMenuTypeOptions', array(&$list, $this));
+
+		return $list;
+	}
+
+	/**
+	 * Method to create the reverse lookup for link-to-name.
+	 * (can be used from onAfterGetMenuTypeOptions handlers)
+	 *
+	 * @param   JObject  $option  with request array or string and title public variables
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function addReverseLookupUrl($option)
+	{
+		$this->rlu[MenusHelper::getLinkKey($option->request)] = $option->get('title');
+	}
+
+	/**
+	 * Get menu types by component.
+	 *
+	 * @param   string  $component  Component URL option.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	protected function getTypeOptionsByComponent($component)
+	{
+		$options = array();
+		$client  = JApplicationHelper::getClientInfo($this->getState('client_id'));
+		$mainXML = $client->path . '/components/' . $component . '/metadata.xml';
+
+		if (is_file($mainXML))
+		{
+			$options = $this->getTypeOptionsFromXml($mainXML, $component);
+		}
+
+		if (empty($options))
+		{
+			$options = $this->getTypeOptionsFromMvc($component);
+		}
+
+		if ($client->id == 1 && empty($options))
+		{
+			$options = $this->getTypeOptionsFromManifest($component);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get the menu types from an XML file
+	 *
+	 * @param   string  $file       File path
+	 * @param   string  $component  Component option as in URL
+	 *
+	 * @return  array|boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function getTypeOptionsFromXml($file, $component)
+	{
+		$options = array();
+
+		// Attempt to load the xml file.
+		if (!$xml = simplexml_load_file($file))
+		{
+			return false;
+		}
+
+		// Look for the first menu node off of the root node.
+		if (!$menu = $xml->xpath('menu[1]'))
+		{
+			return false;
+		}
+		else
+		{
+			$menu = $menu[0];
+		}
+
+		// If we have no options to parse, just add the base component to the list of options.
+		if (!empty($menu['options']) && $menu['options'] == 'none')
+		{
+			// Create the menu option for the component.
+			$o = new JObject;
+			$o->title       = (string) $menu['name'];
+			$o->description = (string) $menu['msg'];
+			$o->request     = array('option' => $component);
+
+			$options[] = $o;
+
+			return $options;
+		}
+
+		// Look for the first options node off of the menu node.
+		if (!$optionsNode = $menu->xpath('options[1]'))
+		{
+			return false;
+		}
+		else
+		{
+			$optionsNode = $optionsNode[0];
+		}
+
+		// Make sure the options node has children.
+		if (!$children = $optionsNode->children())
+		{
+			return false;
+		}
+
+		// Process each child as an option.
+		foreach ($children as $child)
+		{
+			if ($child->getName() == 'option')
+			{
+				// Create the menu option for the component.
+				$o = new JObject;
+				$o->title       = (string) $child['name'];
+				$o->description = (string) $child['msg'];
+				$o->request     = array('option' => $component, (string) $optionsNode['var'] => (string) $child['value']);
+
+				$options[] = $o;
+			}
+			elseif ($child->getName() == 'default')
+			{
+				// Create the menu option for the component.
+				$o = new JObject;
+				$o->title       = (string) $child['name'];
+				$o->description = (string) $child['msg'];
+				$o->request     = array('option' => $component);
+
+				$options[] = $o;
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get menu types from MVC
+	 *
+	 * @param   string  $component  Component option like in URLs
+	 *
+	 * @return  array|boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function getTypeOptionsFromMvc($component)
+	{
+		$options = array();
+		$client  = JApplicationHelper::getClientInfo($this->getState('client_id'));
+
+		// Get the views for this component.
+		if (is_dir($client->path . '/components/' . $component))
+		{
+			$folders = JFolder::folders($client->path . '/components/' . $component, '^view[s]?$', false, true);
+		}
+
+		$path = '';
+
+		if (!empty($folders[0]))
+		{
+			$path = $folders[0];
+		}
+
+		if (is_dir($path))
+		{
+			$views = JFolder::folders($path);
+		}
+		else
+		{
+			return false;
+		}
+
+		foreach ($views as $view)
+		{
+			// Ignore private views.
+			if (strpos($view, '_') !== 0)
+			{
+				// Determine if a metadata file exists for the view.
+				$file = $path . '/' . $view . '/metadata.xml';
+
+				if (is_file($file))
+				{
+					// Attempt to load the xml file.
+					if ($xml = simplexml_load_file($file))
+					{
+						// Look for the first view node off of the root node.
+						if ($menu = $xml->xpath('view[1]'))
+						{
+							$menu = $menu[0];
+
+							// If the view is hidden from the menu, discard it and move on to the next view.
+							if (!empty($menu['hidden']) && $menu['hidden'] == 'true')
+							{
+								unset($xml);
+								continue;
+							}
+
+							// Do we have an options node or should we process layouts?
+							// Look for the first options node off of the menu node.
+							if ($optionsNode = $menu->xpath('options[1]'))
+							{
+								$optionsNode = $optionsNode[0];
+
+								// Make sure the options node has children.
+								if ($children = $optionsNode->children())
+								{
+									// Process each child as an option.
+									foreach ($children as $child)
+									{
+										if ($child->getName() == 'option')
+										{
+											// Create the menu option for the component.
+											$o = new JObject;
+											$o->title       = (string) $child['name'];
+											$o->description = (string) $child['msg'];
+											$o->request     = array('option' => $component, 'view' => $view, (string) $optionsNode['var'] => (string) $child['value']);
+
+											$options[] = $o;
+										}
+										elseif ($child->getName() == 'default')
+										{
+											// Create the menu option for the component.
+											$o = new JObject;
+											$o->title       = (string) $child['name'];
+											$o->description = (string) $child['msg'];
+											$o->request     = array('option' => $component, 'view' => $view);
+
+											$options[] = $o;
+										}
+									}
+								}
+							}
+							else
+							{
+								$options = array_merge($options, (array) $this->getTypeOptionsFromLayouts($component, $view));
+							}
+						}
+
+						unset($xml);
+					}
+				}
+				else
+				{
+					$options = array_merge($options, (array) $this->getTypeOptionsFromLayouts($component, $view));
+				}
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get menu types from Component manifest
+	 *
+	 * @param   string  $component  Component option like in URLs
+	 *
+	 * @return  array|boolean
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getTypeOptionsFromManifest($component)
+	{
+		// Load the component manifest
+		$fileName = JPATH_ADMINISTRATOR . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml';
+
+		if (!is_file($fileName))
+		{
+			return false;
+		}
+
+		if (!($manifest = simplexml_load_file($fileName)))
+		{
+			return false;
+		}
+
+		// Check for a valid XML root tag.
+		if ($manifest->getName() != 'extension')
+		{
+			return false;
+		}
+
+		$options = array();
+
+		// Start with the component root menu.
+		$rootMenu = $manifest->administration->menu;
+
+		// If the menu item doesn't exist or is hidden do nothing.
+		if (!$rootMenu || in_array((string) $rootMenu['hidden'], array('true', 'hidden')))
+		{
+			return $options;
+		}
+
+		// Create the root menu option.
+		$ro = new stdClass;
+		$ro->title       = (string) trim($rootMenu);
+		$ro->description = '';
+		$ro->request     = array('option' => $component);
+
+		// Process submenu options.
+		$submenu = $manifest->administration->submenu;
+
+		if (!$submenu)
+		{
+			return $options;
+		}
+
+		foreach ($submenu->menu as $child)
+		{
+			$attributes = $child->attributes();
+
+			$o = new stdClass;
+			$o->title       = (string) trim($child);
+			$o->description = '';
+
+			if ((string) $attributes->link)
+			{
+				parse_str((string) $attributes->link, $request);
+			}
+			else
+			{
+				$request = array();
+
+				$request['option']     = $component;
+				$request['act']        = (string) $attributes->act;
+				$request['task']       = (string) $attributes->task;
+				$request['controller'] = (string) $attributes->controller;
+				$request['view']       = (string) $attributes->view;
+				$request['layout']     = (string) $attributes->layout;
+				$request['sub']        = (string) $attributes->sub;
+			}
+
+			$o->request = array_filter($request, 'strlen');
+			$options[]  = new JObject($o);
+
+			// Do not repeat the default view link (index.php?option=com_abc).
+			if (count($o->request) == 1)
+			{
+				$ro = null;
+			}
+		}
+
+		if ($ro)
+		{
+			$options[] = new JObject($ro);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get the menu types from component layouts
+	 *
+	 * @param   string  $component  Component option as in URLs
+	 * @param   string  $view       Name of the view
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	protected function getTypeOptionsFromLayouts($component, $view)
+	{
+		$options     = array();
+		$layouts     = array();
+		$layoutNames = array();
+		$lang        = JFactory::getLanguage();
+		$path        = '';
+		$client      = JApplicationHelper::getClientInfo($this->getState('client_id'));
+
+		// Get the views for this component.
+		if (is_dir($client->path . '/components/' . $component))
+		{
+			$folders = JFolder::folders($client->path . '/components/' . $component, '^view[s]?$', false, true);
+		}
+
+		if (!empty($folders[0]))
+		{
+			$path = $folders[0] . '/' . $view . '/tmpl';
+		}
+
+		if (is_dir($path))
+		{
+			$layouts = array_merge($layouts, JFolder::files($path, '.xml$', false, true));
+		}
+		else
+		{
+			return $options;
+		}
+
+		// Build list of standard layout names
+		foreach ($layouts as $layout)
+		{
+			// Ignore private layouts.
+			if (strpos(basename($layout), '_') === false)
+			{
+				// Get the layout name.
+				$layoutNames[] = basename($layout, '.xml');
+			}
+		}
+
+		// Get the template layouts
+		// TODO: This should only search one template -- the current template for this item (default of specified)
+		$folders = JFolder::folders($client->path . '/templates', '', false, true);
+
+		// Array to hold association between template file names and templates
+		$templateName = array();
+
+		foreach ($folders as $folder)
+		{
+			if (is_dir($folder . '/html/' . $component . '/' . $view))
+			{
+				$template = basename($folder);
+				$lang->load('tpl_' . $template . '.sys', $client->path, null, false, true)
+				|| $lang->load('tpl_' . $template . '.sys', $client->path . '/templates/' . $template, null, false, true);
+
+				$templateLayouts = JFolder::files($folder . '/html/' . $component . '/' . $view, '.xml$', false, true);
+
+				foreach ($templateLayouts as $layout)
+				{
+					// Get the layout name.
+					$templateLayoutName = basename($layout, '.xml');
+
+					// Add to the list only if it is not a standard layout
+					if (array_search($templateLayoutName, $layoutNames) === false)
+					{
+						$layouts[] = $layout;
+
+						// Set template name array so we can get the right template for the layout
+						$templateName[$layout] = basename($folder);
+					}
+				}
+			}
+		}
+
+		// Process the found layouts.
+		foreach ($layouts as $layout)
+		{
+			// Ignore private layouts.
+			if (strpos(basename($layout), '_') === false)
+			{
+				$file = $layout;
+
+				// Get the layout name.
+				$layout = basename($layout, '.xml');
+
+				// Create the menu option for the layout.
+				$o = new JObject;
+				$o->title       = ucfirst($layout);
+				$o->description = '';
+				$o->request     = array('option' => $component, 'view' => $view);
+
+				// Only add the layout request argument if not the default layout.
+				if ($layout != 'default')
+				{
+					// If the template is set, add in format template:layout so we save the template name
+					$o->request['layout'] = isset($templateName[$file]) ? $templateName[$file] . ':' . $layout : $layout;
+				}
+
+				// Load layout metadata if it exists.
+				if (is_file($file))
+				{
+					// Attempt to load the xml file.
+					if ($xml = simplexml_load_file($file))
+					{
+						// Look for the first view node off of the root node.
+						if ($menu = $xml->xpath('layout[1]'))
+						{
+							$menu = $menu[0];
+
+							// If the view is hidden from the menu, discard it and move on to the next view.
+							if (!empty($menu['hidden']) && $menu['hidden'] == 'true')
+							{
+								unset($xml);
+								unset($o);
+								continue;
+							}
+
+							// Populate the title and description if they exist.
+							if (!empty($menu['title']))
+							{
+								$o->title = trim((string) $menu['title']);
+							}
+
+							if (!empty($menu->message[0]))
+							{
+								$o->description = trim((string) $menu->message[0]);
+							}
+						}
+					}
+				}
+
+				// Add the layout to the options array.
+				$options[] = $o;
+			}
+		}
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_menus/presets/joomla.xml b/core/administrator/components/com_menus/presets/joomla.xml
new file mode 100644
index 00000000..67917c6f
--- /dev/null
+++ b/core/administrator/components/com_menus/presets/joomla.xml
@@ -0,0 +1,582 @@
+<?xml version="1.0"?>
+<menu
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:joomla.org"
+	xsi:schemaLocation="urn:joomla.org menu.xsd">
+	<menuitem
+		title="MOD_MENU_SYSTEM"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_CONTROL_PANEL"
+			link="index.php"
+			element="com_cpanel"
+			class="class:cpanel"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_CONFIGURATION"
+			type="component"
+			element="com_config"
+			link="index.php?option=com_config"
+			class="class:config"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_GLOBAL_CHECKIN"
+			type="component"
+			element="com_checkin"
+			link="index.php?option=com_checkin"
+			class="class:checkin"
+		/>
+		<menuitem
+			title="MOD_MENU_CLEAR_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache"
+			class="class:clear"
+		/>
+		<menuitem
+			title="MOD_MENU_PURGE_EXPIRED_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache&amp;view=purge"
+			class="class:purge"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_SYSTEM_INFORMATION"
+			type="component"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=sysinfo"
+			class="class:info"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_USERS_USERS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_USERS_USER_MANAGER"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=users"
+			class="class:user">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_USER"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=user.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_GROUPS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=groups"
+			class="class:groups">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_GROUP"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=group.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_LEVELS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=levels"
+			class="class:levels">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_LEVEL"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=level.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_users.user"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_users.user"
+			class="class:category"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTES"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=notes"
+			class="class:user-note">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_NOTE"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=note.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_users"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MASS_MAIL_USERS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=mail"
+			class="class:massmail"
+			scope="massmail"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_MENUS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_MENU_MANAGER"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=menus"
+			class="class:menumgr">
+			<menuitem
+				title="MOD_MENU_MENU_MANAGER_NEW_MENU"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=menu&amp;layout=edit"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MENUS_ALL_ITEMS"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=items&amp;menutype="
+			class="class:allmenu"
+		/>
+		<!--
+		Following is an example of repeatable group based on simple database query.
+		This requires sql_* attributes (sql_select and sql_from are required)
+		The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+		The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+		-->
+		<menuitem
+			type="separator"
+			title="JSITE"
+			hidden="false"
+			sql_select="a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:mod_languages/', l.image, '.gif') END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
+			sql_from="#__menu_types AS a"
+			sql_where="a.client_id = 0"
+			sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
+			sql_group="a.id, m.language, l.image"
+			sql_order="a.title ASC">
+			<menuitem
+				title="{sql:title} "
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				icon="{sql:icon}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+		<menuitem
+			type="separator"
+			title="JADMINISTRATOR"
+			hidden="false"
+			sql_select="title, menutype"
+			sql_from="#__menu_types"
+			sql_where="client_id = 1"
+			sql_order="title ASC">
+			<menuitem
+				title="{sql:title}"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_CONTENT"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content"
+			class="class:article">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+				type="component"
+				element="com_content"
+				link="index.php?option=com_content&amp;task=article.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;extension=com_content"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_content"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_FEATURED"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content&amp;view=featured"
+			class="class:featured"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_content.article"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_content.article"
+			class="class:category"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MEDIA_MANAGER"
+			type="component"
+			element="com_media"
+			link="index.php?option=com_media"
+			class="class:media"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COMPONENTS"
+		type="container"
+	/>
+	<menuitem
+		title="MOD_MENU_EXTENSIONS_EXTENSIONS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_EXTENSION_MANAGER"
+			type="component"
+			element="com_installer"
+			link="index.php?option=com_installer"
+			class="class:install">
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_INSTALL"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=update"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_MANAGE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=manage"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DISCOVER"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=discover"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DATABASE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=database"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_WARNINGS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=warnings"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_LANGUAGES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=languages"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATESITES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=updatesites"
+				class="class:install"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER"
+			type="component"
+			element="com_modules"
+			link="index.php?option=com_modules"
+			class="class:module"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_PLUGIN_MANAGER"
+			type="component"
+			element="com_plugins"
+			link="index.php?option=com_plugins"
+			class="class:plugin"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER"
+			type="component"
+			element="com_templates"
+			link="index.php?option=com_templates"
+			class="class:themes">
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=styles"
+				class="class:themes"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=templates"
+				class="class:themes"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER"
+			type="component"
+			element="com_languages"
+			link="index.php?option=com_languages"
+			class="class:language">
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=installed"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=languages"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=overrides"
+				class="class:language"
+			/>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_HELP"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_HELP_JOOMLA"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=help"
+			class="class:help"
+			scope="help"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM"
+			link="https://forum.joomla.org"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM"
+			link="special:custom-forum"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM"
+			link="special:language-forum"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DOCUMENTATION"
+			link="https://docs.joomla.org"
+			class="class:help-docs"
+			scope="help"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_EXTENSIONS"
+			link="https://extensions.joomla.org"
+			class="class:help-jed"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_TRANSLATIONS"
+			link="https://community.joomla.org/translations.html"
+			class="class:help-trans"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_RESOURCES"
+			link="https://resources.joomla.org"
+			class="class:help-jrd"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_COMMUNITY"
+			link="https://community.joomla.org"
+			class="class:help-community"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SECURITY"
+			link="https://developer.joomla.org/security-centre.html"
+			class="class:help-security"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DEVELOPER"
+			link="https://developer.joomla.org"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_XCHANGE"
+			link="https://joomla.stackexchange.com"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SHOP"
+			link="https://community.joomla.org/the-joomla-shop.html"
+			class="class:help-shop"
+			scope="help"
+		/>
+	</menuitem>
+</menu>
diff --git a/core/administrator/components/com_menus/presets/menu.xsd b/core/administrator/components/com_menus/presets/menu.xsd
new file mode 100644
index 00000000..01d4d07a
--- /dev/null
+++ b/core/administrator/components/com_menus/presets/menu.xsd
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+	attributeFormDefault="unqualified" elementFormDefault="qualified"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="urn:joomla.org"
+	xmlns="urn:joomla.org">
+	<xs:element name="menu" type="menuType"/>
+	<xs:simpleType name="typeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="component" />
+			<xs:enumeration value="container" />
+			<xs:enumeration value="heading" />
+			<xs:enumeration value="separator" />
+			<xs:enumeration value="url" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="elementType">
+		<xs:restriction base="xs:string">
+			<xs:pattern value="com_(.+)" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="scopeType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="default" />
+			<xs:enumeration value="edit" />
+			<xs:enumeration value="help" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="trueFalse">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="true" />
+			<xs:enumeration value="false"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="browserNavType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="_blank" />
+			<xs:enumeration value=""/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="menuType">
+		<xs:sequence>
+			<xs:element type="menuitemType" name="menuitem" maxOccurs="unbounded" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="menuitemType" mixed="true">
+		<xs:sequence>
+			<xs:element type="xs:string" name="params" minOccurs="0" maxOccurs="1"/>
+			<xs:element type="menuitemType" name="menuitem" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:attribute type="typeType" name="type" use="required"/>
+		<xs:attribute type="xs:string" name="title" use="optional"/>
+		<xs:attribute type="xs:string" name="link" use="optional"/>
+		<xs:attribute type="xs:string" name="class" use="optional"/>
+		<xs:attribute type="xs:string" name="icon" use="optional"/>
+		<xs:attribute type="elementType" name="element" use="optional"/>
+		<xs:attribute type="trueFalse" name="hidden" use="optional" default="false"/>
+		<xs:attribute type="xs:string" name="sql_select" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_from" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_where" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_leftjoin" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_innerjoin" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_group" use="optional"/>
+		<xs:attribute type="xs:string" name="sql_order" use="optional"/>
+		<xs:attribute type="browserNavType" name="target" use="optional" default=""/>
+		<xs:attribute type="scopeType" name="scope" use="optional" default="default"/>
+	</xs:complexType>
+</xs:schema>
diff --git a/core/administrator/components/com_menus/presets/modern.xml b/core/administrator/components/com_menus/presets/modern.xml
new file mode 100644
index 00000000..886dfa95
--- /dev/null
+++ b/core/administrator/components/com_menus/presets/modern.xml
@@ -0,0 +1,612 @@
+<?xml version="1.0"?>
+<menu
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:joomla.org"
+	xsi:schemaLocation="urn:joomla.org menu.xsd">
+	<menuitem
+		title="MOD_MENU_SYSTEM"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_CONTROL_PANEL"
+			link="index.php"
+			element="com_cpanel"
+			class="class:cpanel"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_CONFIGURATION"
+			type="component"
+			element="com_config"
+			link="index.php?option=com_config"
+			class="class:config"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_GLOBAL_CHECKIN"
+			type="component"
+			element="com_checkin"
+			link="index.php?option=com_checkin"
+			class="class:checkin"
+		/>
+		<menuitem
+			title="MOD_MENU_CLEAR_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache"
+			class="class:clear"
+		/>
+		<menuitem
+			title="MOD_MENU_PURGE_EXPIRED_CACHE"
+			type="component"
+			element="com_cache"
+			link="index.php?option=com_cache&amp;view=purge"
+			class="class:purge"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_SYSTEM_INFORMATION"
+			type="component"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=sysinfo"
+			class="class:info"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_USERS_USERS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_USERS_USER_MANAGER"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=users"
+			class="class:user">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_USER"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=user.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_GROUPS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=groups"
+			class="class:groups">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_GROUP"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=group.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_LEVELS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=levels"
+			class="class:levels">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_LEVEL"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=level.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_users.user"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_users.user"
+			class="class:category"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTES"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=notes"
+			class="class:user-note">
+			<menuitem
+				title="MOD_MENU_COM_USERS_ADD_NOTE"
+				type="component"
+				element="com_users"
+				link="index.php?option=com_users&amp;task=note.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_users"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MASS_MAIL_USERS"
+			type="component"
+			element="com_users"
+			link="index.php?option=com_users&amp;view=mail"
+			class="class:massmail"
+			scope="massmail"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_MENUS"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_MENU_MANAGER"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=menus"
+			class="class:menumgr">
+			<menuitem
+				title="MOD_MENU_MENU_MANAGER_NEW_MENU"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=menu&amp;layout=edit"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MENUS_ALL_ITEMS"
+			type="component"
+			element="com_menus"
+			link="index.php?option=com_menus&amp;view=items&amp;menutype="
+			class="class:allmenu"
+		/>
+		<!--
+		Following is an example of repeatable group based on simple database query.
+		This requires sql_* attributes (sql_select and sql_from are required)
+		The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+		The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+		-->
+		<menuitem
+			type="separator"
+			title="JSITE"
+			hidden="false"
+			sql_select="a.title, a.menutype, CASE COALESCE(SUM(m.home), 0) WHEN 0 THEN '' WHEN 1 THEN CASE m.language WHEN '*' THEN 'class:icon-home' ELSE CONCAT('image:mod_languages/', l.image, '.gif') END ELSE 'image:mod_languages/icon-16-language.png' END AS icon"
+			sql_from="#__menu_types AS a"
+			sql_where="a.client_id = 0"
+			sql_leftjoin="#__menu AS m ON m.menutype = a.menutype AND m.home = 1 LEFT JOIN #__languages AS l ON l.lang_code = m.language"
+			sql_group="a.id, m.language, l.image"
+			sql_order="a.title ASC">
+			<menuitem
+				title="{sql:title} "
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				icon="{sql:icon}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+		<menuitem
+			type="separator"
+			title="JADMINISTRATOR"
+			hidden="false"
+			sql_select="title, menutype"
+			sql_from="#__menu_types"
+			sql_where="client_id = 1"
+			sql_order="title ASC">
+			<menuitem
+				title="{sql:title}"
+				type="component"
+				element="com_menus"
+				link="index.php?option=com_menus&amp;view=items&amp;menutype={sql:menutype}"
+				class="class:menu">
+				<menuitem
+					title="MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM"
+					type="component"
+					element="com_menus"
+					link="index.php?option=com_menus&amp;view=item&amp;layout=edit&amp;menutype={sql:menutype}"
+					class="class:menu"
+					scope="edit"
+				/>
+			</menuitem>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COM_CONTENT"
+		type="heading"
+		>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content"
+			class="class:article">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+				type="component"
+				element="com_content"
+				link="index.php?option=com_content&amp;task=article.add"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
+			type="component"
+			element="com_categories"
+			link="index.php?option=com_categories&amp;extension=com_content"
+			class="class:category">
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+				type="component"
+				element="com_categories"
+				link="index.php?option=com_categories&amp;task=category.add&amp;extension=com_content"
+				class="class:newarticle"
+				scope="edit"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_COM_CONTENT_FEATURED"
+			type="component"
+			element="com_content"
+			link="index.php?option=com_content&amp;view=featured"
+			class="class:featured"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;context=com_content.article"
+			class="class:fields"
+		/>
+		<menuitem
+			title="MOD_MENU_FIELDS_GROUP"
+			type="component"
+			element="com_fields"
+			link="index.php?option=com_fields&amp;view=groups&amp;context=com_content.article"
+			class="class:category"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_MEDIA_MANAGER"
+			type="component"
+			element="com_media"
+			link="index.php?option=com_media"
+			class="class:media"
+		/>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_COMPONENTS"
+		type="container"
+	>
+		<params><![CDATA[{"hideitems":["com_joomlaupdate","com_postinstall"]}]]></params>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_EXTENSIONS_EXTENSION_MANAGER"
+		type="heading"
+	>
+		<menuitem
+			title="COM_JOOMLAUPDATE"
+			type="component"
+			element="com_joomlaupdate"
+			link="index.php?option=com_joomlaupdate"
+			class="class:component"
+		/>
+		<menuitem
+			title="COM_POSTINSTALL"
+			type="component"
+			element="com_postinstall"
+			link="index.php?option=com_postinstall"
+			class="class:component"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_SYSTEM"
+			type="component"
+			element="com_installer"
+			link="index.php?option=com_installer&amp;view=database"
+			class="class:install">
+
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DATABASE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=database"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_WARNINGS"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=warnings"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATESITES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=updatesites"
+				class="class:install"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_EXTENSIONS"
+			type="component"
+			element="com_installer"
+			link="index.php?option=com_installer"
+			class="class:install">
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_INSTALL"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_UPDATE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=update"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_MANAGE"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=manage"
+				class="class:install"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_DISCOVER"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=discover"
+				class="class:install"
+			/>
+			<menuitem
+				type="separator"
+			/>
+			<menuitem
+				title="MOD_MENU_INSTALLER_SUBMENU_LANGUAGES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=languages"
+				class="class:install"
+			/>
+		</menuitem>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER"
+			type="component"
+			element="com_modules"
+			link="index.php?option=com_modules"
+			class="class:module"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_PLUGIN_MANAGER"
+			type="component"
+			element="com_plugins"
+			link="index.php?option=com_plugins"
+			class="class:plugin"
+		/>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER"
+			type="component"
+			element="com_templates"
+			link="index.php?option=com_templates"
+			class="class:themes">
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=styles"
+				class="class:themes"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES"
+				type="component"
+				element="com_templates"
+				link="index.php?option=com_templates&amp;view=templates"
+				class="class:themes"
+			/>
+		</menuitem>
+		<menuitem
+			title="MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER"
+			type="component"
+			element="com_languages"
+			link="index.php?option=com_languages"
+			class="class:language">
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=installed"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=languages"
+				class="class:language"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES"
+				type="component"
+				element="com_languages"
+				link="index.php?option=com_languages&amp;view=overrides"
+				class="class:language"
+			/>
+		</menuitem>
+	</menuitem>
+	<menuitem
+		title="MOD_MENU_HELP"
+		type="heading"
+		>
+		<menuitem
+			type="component"
+			title="MOD_MENU_HELP_JOOMLA"
+			element="com_admin"
+			link="index.php?option=com_admin&amp;view=help"
+			class="class:help"
+			scope="help"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM"
+			link="https://forum.joomla.org"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM"
+			link="special:custom-forum"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM"
+			link="special:language-forum"
+			class="class:help-forum"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DOCUMENTATION"
+			link="https://docs.joomla.org"
+			class="class:help-docs"
+			scope="help"
+		/>
+		<menuitem
+			type="separator"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_EXTENSIONS"
+			link="https://extensions.joomla.org"
+			class="class:help-jed"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_TRANSLATIONS"
+			link="https://community.joomla.org/translations.html"
+			class="class:help-trans"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_RESOURCES"
+			link="https://resources.joomla.org"
+			class="class:help-jrd"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_COMMUNITY"
+			link="https://community.joomla.org"
+			class="class:help-community"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SECURITY"
+			link="https://developer.joomla.org/security-centre.html"
+			class="class:help-security"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_DEVELOPER"
+			link="https://developer.joomla.org"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_XCHANGE"
+			link="https://joomla.stackexchange.com"
+			class="class:help-dev"
+			scope="help"
+		/>
+		<menuitem
+			type="url"
+			target="_blank"
+			title="MOD_MENU_HELP_SHOP"
+			link="https://community.joomla.org/the-joomla-shop.html"
+			class="class:help-shop"
+			scope="help"
+		/>
+	</menuitem>
+</menu>
diff --git a/core/administrator/components/com_menus/tables/menu.php b/core/administrator/components/com_menus/tables/menu.php
new file mode 100644
index 00000000..c0e4f506
--- /dev/null
+++ b/core/administrator/components/com_menus/tables/menu.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Menu table
+ *
+ * @since  1.6
+ */
+class MenusTableMenu extends JTableMenu
+{
+	/**
+	 * Method to delete a node and, optionally, its child nodes from the table.
+	 *
+	 * @param   integer  $pk        The primary key of the node to delete.
+	 * @param   boolean  $children  True to delete child nodes, false to move them up a level.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function delete($pk = null, $children = false)
+	{
+		$return = parent::delete($pk, $children);
+
+		if ($return)
+		{
+			// Delete key from the #__modules_menu table
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__modules_menu'))
+				->where($db->quoteName('menuid') . ' = ' . $pk);
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_menus/views/item/tmpl/edit.php b/core/administrator/components/com_menus/views/item/tmpl/edit.php
new file mode 100644
index 00000000..604de3a3
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/edit.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('behavior.tabstate');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.keepalive');
+
+JText::script('ERROR');
+JText::script('JGLOBAL_VALIDATION_FORM_FAILED');
+
+$assoc = JLanguageAssociations::isEnabled();
+
+// Ajax for parent items
+$script = "
+jQuery(document).ready(function ($){
+	$('#jform_menutype').change(function(){
+		var menutype = $(this).val();
+		$.ajax({
+			url: 'index.php?option=com_menus&task=item.getParentItem&menutype=' + menutype,
+			dataType: 'json'
+		}).done(function(data) {
+			$('#jform_parent_id option').each(function() {
+				if ($(this).val() != '1') {
+					$(this).remove();
+				}
+			});
+
+			$.each(data, function (i, val) {
+				var option = $('<option>');
+				option.text(val.title).val(val.id);
+				$('#jform_parent_id').append(option);
+			});
+			$('#jform_parent_id').trigger('liszt:updated');
+		});
+	});
+
+	// Menu type Login Form specific
+	$('#item-form').on('submit', function() {
+		if ($('#jform_params_login_redirect_url') && $('#jform_params_logout_redirect_url')) {
+			// Login
+			if ($('#jform_params_login_redirect_url').closest('.control-group').css('display') === 'block') {
+				$('#jform_params_login_redirect_menuitem_id').val('');
+			}
+			if ($('#jform_params_login_redirect_menuitem_name').closest('.control-group').css('display') === 'block') {
+				$('#jform_params_login_redirect_url').val('');
+
+			}
+
+			// Logout
+			if ($('#jform_params_logout_redirect_url').closest('.control-group').css('display') === 'block') {
+				$('#jform_params_logout_redirect_menuitem_id').val('');
+			}
+			if ($('#jform_params_logout_redirect_menuitem_id').closest('.control-group').css('display') === 'block') {
+				$('#jform_params_logout_redirect_url').val('');
+			}
+		}
+	});
+});
+
+Joomla.submitbutton = function(task, type){
+	if (task == 'item.setType' || task == 'item.setMenuType')
+	{
+		if (task == 'item.setType')
+		{
+			jQuery('#item-form input[name=\"jform[type]\"]').val(type);
+			jQuery('#fieldtype').val('type');
+		} else {
+			jQuery('#item-form input[name=\"jform[menutype]\"]').val(type);
+		}
+		Joomla.submitform('item.setType', document.getElementById('item-form'));
+	} else if (task == 'item.cancel' || document.formvalidator.isValid(document.getElementById('item-form')))
+	{
+		Joomla.submitform(task, document.getElementById('item-form'));
+
+		// @deprecated 4.0  The following js is not needed since 3.7.0.
+		if (task !== 'item.apply')
+		{
+			window.parent.jQuery('#menuEdit" . (int) $this->item->id . "Modal').modal('hide');
+		}
+	}
+	else
+	{
+		// special case for modal popups validation response
+		jQuery('#item-form .modal-value.invalid').each(function(){
+			var field = jQuery(this),
+				idReversed = field.attr('id').split('').reverse().join(''),
+				separatorLocation = idReversed.indexOf('_'),
+				nameId = '#' + idReversed.substr(separatorLocation).split('').reverse().join('') + 'name';
+			jQuery(nameId).addClass('invalid');
+		});
+	}
+};
+";
+
+$input = JFactory::getApplication()->input;
+
+// Add the script to the document head.
+JFactory::getDocument()->addScriptDeclaration($script);
+// In case of modal
+$isModal  = $input->get('layout') == 'modal' ? true : false;
+$layout   = $isModal ? 'modal' : 'edit';
+$tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+$clientId = $this->state->get('item.client_id', 0);
+$lang     = JFactory::getLanguage()->getTag();
+
+// Load mod_menu.ini file when client is administrator
+if ($clientId === 1)
+{
+	JFactory::getLanguage()->load('mod_menu', JPATH_ADMINISTRATOR, null, false, true);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=item&client_id=' . $clientId . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<?php // Add the translation of the menu item title when client is administrator ?>
+	<?php if ($clientId === 1 && $this->item->id != 0) : ?>
+		<div class="form-inline form-inline-header">
+			<div class="control-group">
+				<div class="control-label">
+					<label><?php echo JText::sprintf('COM_MENUS_TITLE_TRANSLATION', $lang); ?></label>
+				</div>
+				<div class="controls">
+					<input class="input-xlarge" value="<?php echo JText::_($this->item->title); ?>" readonly="readonly" type="text">
+				</div>
+			</div>
+		</div>
+	<?php endif; ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_MENUS_ITEM_DETAILS')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<?php
+				echo $this->form->renderField('type');
+
+				if ($this->item->type == 'alias')
+				{
+					echo $this->form->renderFieldset('aliasoptions');
+				}
+
+				if ($this->item->type == 'separator')
+				{
+					echo $this->form->renderField('text_separator', 'params');
+				}
+
+				echo $this->form->renderFieldset('request');
+
+				if ($this->item->type == 'url')
+				{
+					$this->form->setFieldAttribute('link', 'readonly', 'false');
+					$this->form->setFieldAttribute('link', 'required', 'true');
+				}
+
+				echo $this->form->renderField('link');
+
+				echo $this->form->renderField('browserNav');
+				echo $this->form->renderField('template_style_id');
+
+				if (!$isModal && $this->item->type == 'container')
+				{
+					echo $this->loadTemplate('container');
+				}
+				?>
+			</div>
+			<div class="span3">
+				<?php
+				// Set main fields.
+				$this->fields = array(
+					'id',
+					'client_id',
+					'menutype',
+					'parent_id',
+					'menuordering',
+					'published',
+					'home',
+					'access',
+					'language',
+					'note',
+				);
+
+				if ($this->item->type != 'component')
+				{
+					$this->fields = array_diff($this->fields, array('home'));
+				}
+
+				echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php
+		$this->fieldsets = array();
+		$this->ignore_fieldsets = array('aliasoptions', 'request', 'item_associations');
+		echo JLayoutHelper::render('joomla.edit.params', $this);
+		?>
+
+		<?php if (!$isModal && $assoc && $this->state->get('item.client_id') != 1) : ?>
+			<?php if ($this->item->type !== 'alias' && $this->item->type !== 'url'
+				&& $this->item->type !== 'separator' && $this->item->type !== 'heading') : ?>
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+				<?php echo $this->loadTemplate('associations'); ?>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
+		<?php elseif ($isModal && $assoc && $this->state->get('item.client_id') != 1) : ?>
+			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+		<?php endif; ?>
+
+		<?php if (!empty($this->modules)) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'modules', JText::_('COM_MENUS_ITEM_MODULE_ASSIGNMENT')); ?>
+			<?php echo $this->loadTemplate('modules'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
+	<?php echo $this->form->getInput('component_id'); ?>
+	<?php echo JHtml::_('form.token'); ?>
+	<input type="hidden" id="fieldtype" name="fieldtype" value="" />
+</form>
diff --git a/core/administrator/components/com_menus/views/item/tmpl/edit.xml b/core/administrator/components/com_menus/views/item/tmpl/edit.xml
new file mode 100755
index 00000000..cd8bb713
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/edit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_MENUS_ITEM_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_MENUS_ITEM_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+	<fieldset name="request">
+		<fields name="request">
+			<field
+				name="menutype"
+				type="menu"
+				label="COM_MENUS_ITEMS_CHOOSE_MENU_LABEL"
+				description="COM_MENUS_ITEMS_CHOOSE_MENU_DESC"
+				clientid=""
+				>
+				<option value="">COM_MENUS_SELECT_MENU</option>
+			</field>
+		</fields>
+	</fieldset>
+</metadata>
diff --git a/core/administrator/components/com_menus/views/item/tmpl/edit_associations.php b/core/administrator/components/com_menus/views/item/tmpl/edit_associations.php
new file mode 100644
index 00000000..4170e5f1
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/edit_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_menus/views/item/tmpl/edit_container.php b/core/administrator/components/com_menus/views/item/tmpl/edit_container.php
new file mode 100644
index 00000000..c49164eb
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/edit_container.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+// Initialise related data.
+$menuLinks = MenusHelper::getMenuLinks('main');
+
+JHtml::_('script', 'jui/treeselectmenu.jquery.min.js', array('version' => 'auto', 'relative' => true));
+
+$script = <<<'JS'
+	jQuery(document).ready(function ($) {
+		var propagate = function () {
+			var $this = $(this);
+			var sub = $this.closest('li').find('.treeselect-sub [type="checkbox"]');
+			sub.prop('checked', this.checked);
+			if ($this.val() == 1)
+				sub.each(propagate);
+			else
+				sub.attr('disabled', this.checked ? 'disabled' : null);
+		};
+		$('.treeselect')
+			.on('click', '[type="checkbox"]', propagate)
+			.find('[type="checkbox"]:checked').each(propagate);
+	});
+JS;
+
+$style = <<<'CSS'
+	.checkbox-toggle {
+		display: none !important;
+	}
+	.checkbox-toggle[disabled] ~ .btn-hide {
+		opacity: 0.5;
+	}
+	.checkbox-toggle ~ .btn-show {
+		display: inline;
+	}
+	.checkbox-toggle ~ .btn-hide {
+		display: none;
+	}
+	.checkbox-toggle:checked ~ .btn-show {
+		display: none;
+	}
+	.checkbox-toggle:checked ~ .btn-hide {
+		display: inline;
+	}
+CSS;
+
+JFactory::getDocument()->addScriptDeclaration($script);
+JFactory::getDocument()->addStyleDeclaration($style);
+?>
+<div id="menuselect-group" class="control-group">
+	<div class="control-label"><?php echo $this->form->getLabel('hideitems', 'params'); ?></div>
+
+	<div id="jform_params_hideitems" class="controls">
+		<?php if (!empty($menuLinks)) : ?>
+		<?php $id = 'jform_params_hideitems'; ?>
+
+		<div class="well well-small">
+			<div class="form-inline">
+				<span class="small"><?php echo JText::_('COM_MENUS_ACTION_EXPAND'); ?>:
+					<a id="treeExpandAll" href="javascript://"><?php echo JText::_('JALL'); ?></a>,
+					<a id="treeCollapseAll" href="javascript://"><?php echo JText::_('JNONE'); ?></a>|
+					<?php echo JText::_('JSHOW'); ?>:
+					<a id="treeUncheckAll" href="javascript://"><?php echo JText::_('JALL'); ?></a>,
+					<a id="treeCheckAll" href="javascript://"><?php echo JText::_('JNONE'); ?></a>
+				</span>
+				<input type="text" id="treeselectfilter" name="treeselectfilter" class="input-medium search-query pull-right" size="16"
+					autocomplete="off" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" aria-invalid="false" tabindex="-1">
+			</div>
+
+			<div class="clearfix"></div>
+
+			<hr class="hr-condensed" />
+
+			<ul class="treeselect">
+
+				<?php if (count($menuLinks)) : ?>
+					<?php $prevlevel = 0; ?>
+					<div class="alert alert-info"><?php echo JText::_('COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_DESC')?></div>
+					<li>
+					<?php
+					$params      = new Registry($this->item->params);
+					$hiddenLinks = (array) $params->get('hideitems');
+
+					foreach ($menuLinks as $i => $link) : ?>
+						<?php
+						if ($extension = $link->element):
+							$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+							|| $lang->load("$extension.sys", JPATH_ADMINISTRATOR . '/components/' . $extension, null, false, true);
+						endif;
+
+						if ($prevlevel < $link->level)
+						{
+							echo '<ul class="treeselect-sub">';
+						}
+						elseif ($prevlevel > $link->level)
+						{
+							echo str_repeat('</li></ul>', $prevlevel - $link->level);
+						}
+						else
+						{
+							echo '</li>';
+						}
+
+						$selected = in_array($link->value, $hiddenLinks) ? 1 : 0;
+						?>
+							<li>
+								<div class="treeselect-item pull-left">
+									<input type="checkbox" <?php echo $link->value > 1 ? ' name="jform[params][hideitems][]" ' : ''; ?>
+										   id="<?php echo $id . $link->value; ?>" value="<?php echo (int) $link->value; ?>" class="novalidate checkbox-toggle"
+										<?php echo $selected ? ' checked="checked"' : ''; ?> />
+
+									<?php if ($link->value == 1): ?>
+										<label for="<?php echo $id . $link->value; ?>" class="btn btn-mini btn-info pull-left"><?php echo JText::_('JALL') ?></label>
+									<?php else: ?>
+										<label for="<?php echo $id . $link->value; ?>" class="btn btn-mini btn-danger btn-hide pull-left"><?php echo JText::_('JHIDE') ?></label>
+										<label for="<?php echo $id . $link->value; ?>" class="btn btn-mini btn-success btn-show pull-left"><?php echo JText::_('JSHOW') ?></label>
+										<label for="<?php echo $id . $link->value; ?>" class="pull-left"><?php echo JText::_($link->text); ?></label>
+									<?php endif; ?>
+								</div>
+						<?php
+
+						if (!isset($menuLinks[$i + 1]))
+						{
+							echo str_repeat('</li></ul>', $link->level);
+						}
+						$prevlevel = $link->level;
+						?>
+						<?php endforeach; ?>
+					</li>
+					<?php endif; ?>
+
+			</ul>
+			<div id="noresultsfound" style="display:none;" class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/core/administrator/components/com_menus/views/item/tmpl/edit_modules.php b/core/administrator/components/com_menus/views/item/tmpl/edit_modules.php
new file mode 100644
index 00000000..a1ef5bc4
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/edit_modules.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+
+foreach ($this->levels as $key => $value) {
+	$allLevels[$value->id] = $value->title;
+}
+
+JFactory::getDocument()->addScriptDeclaration('
+	var viewLevels = ' . json_encode($allLevels) . ',
+		menuId = parseInt(' . (int) $this->item->id . ');
+
+	jQuery(function($) {
+		var baseLink = "index.php?option=com_modules&amp;client_id=0&amp;task=module.edit&amp;tmpl=component&amp;view=module&amp;layout=modal&amp;id=",
+			iFrameAttr = "class=\"iframe jviewport-height70\"";
+
+		$(document)
+			.on("click", "input:radio[id^=\'jform_toggle_modules_assigned1\']", function (event) {
+				$(".table tr.no").hide();
+			})
+			.on("click", "input:radio[id^=\'jform_toggle_modules_assigned0\']", function (event) {
+				$(".table tr.no").show();
+			})
+			.on("click", "input:radio[id^=\'jform_toggle_modules_published1\']", function (event) {
+				$(".table tr.unpublished").hide();
+			})
+			.on("click", "input:radio[id^=\'jform_toggle_modules_published0\']", function (event) {
+				$(".table tr.unpublished").show();
+			})
+			.on("click", ".module-edit-link", function () {
+				var link = baseLink + $(this).data("moduleId"),
+					iFrame = $("<iframe src=\"" + link + "\" " + iFrameAttr + "></iframe>");
+
+				$("#moduleEditModal").modal()
+					.find(".modal-body").empty().prepend(iFrame);
+			})
+			.on("click", "#moduleEditModal .modal-footer .btn", function () {
+				var target = $(this).data("target");
+
+				if (target) {
+					$("#moduleEditModal iframe").contents().find(target).click();
+				}
+			});
+	});
+');
+
+JFactory::getDocument()->addStyleDeclaration('
+ul.horizontal-buttons li {
+  display: inline-block;
+  padding-right: 10%;
+}
+');
+
+// Set up the bootstrap modal that will be used for all module editors
+echo JHtml::_(
+	'bootstrap.renderModal',
+	'moduleEditModal',
+	array(
+		'title'       => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
+		'backdrop'    => 'static',
+		'keyboard'    => false,
+		'closeButton' => false,
+		'bodyHeight'  => '70',
+		'modalWidth'  => '80',
+		'footer'      => '<a type="button" class="btn" data-dismiss="modal" data-target="#closeBtn" aria-hidden="true">'
+				. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+				. '<button type="button" class="btn btn-primary" data-dismiss="modal" data-target="#saveBtn" aria-hidden="true">'
+				. JText::_('JSAVE') . '</button>'
+				. '<button type="button" class="btn btn-success" data-target="#applyBtn" aria-hidden="true">'
+				. JText::_('JAPPLY') . '</button>',
+	)
+);
+
+?>
+<?php
+// Set main fields.
+$this->fields = array('toggle_modules_assigned','toggle_modules_published');
+
+echo JLayoutHelper::render('joomla.menu.edit_modules', $this); ?>
+
+	<table class="table table-striped">
+		<thead>
+		<tr>
+			<th class="left">
+				<?php echo JText::_('COM_MENUS_HEADING_ASSIGN_MODULE'); ?>
+			</th>
+			<th>
+				<?php echo JText::_('COM_MENUS_HEADING_LEVELS'); ?>
+			</th>
+			<th>
+				<?php echo JText::_('COM_MENUS_HEADING_POSITION'); ?>
+			</th>
+			<th>
+				<?php echo JText::_('COM_MENUS_HEADING_DISPLAY'); ?>
+			</th>
+			<th>
+				<?php echo JText::_('COM_MENUS_HEADING_PUBLISHED_ITEMS'); ?>
+			</th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php foreach ($this->modules as $i => &$module) : ?>
+			<?php if (is_null($module->menuid)) : ?>
+				<?php if (!$module->except || $module->menuid < 0) : ?>
+					<?php $no = 'no '; ?>
+				<?php else : ?>
+					<?php $no = ''; ?>
+				<?php endif; ?>
+			<?php else : ?>
+				<?php $no = ''; ?>
+			<?php endif; ?>
+			<?php if ($module->published) : ?>
+				<?php $status = ''; ?>
+			<?php else : ?>
+				<?php $status = 'unpublished '; ?>
+			<?php endif; ?>
+			<tr class="<?php echo $no; ?><?php echo $status; ?>row<?php echo $i % 2; ?>" id="tr-<?php echo $module->id; ?>" style="display:table-row">
+				<td id="<?php echo $module->id; ?>">
+					<a href="#moduleEditModal"
+						role="button"
+						class="btn btn-link module-edit-link"
+						title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'); ?>"
+						id="title-<?php echo $module->id; ?>"
+						data-module-id="<?php echo $module->id; ?>">
+						<?php echo $this->escape($module->title); ?></a>
+				</td>
+				<td id="access-<?php echo $module->id; ?>">
+					<?php echo $this->escape($module->access_title); ?>
+				</td>
+				<td id="position-<?php echo $module->id; ?>">
+					<?php echo $this->escape($module->position); ?>
+				</td>
+				<td id="menus-<?php echo $module->id; ?>">
+					<?php if (is_null($module->menuid)) : ?>
+						<?php if ($module->except) : ?>
+							<span class="label label-success">
+								<?php echo JText::_('JYES'); ?>
+							</span>
+						<?php else : ?>
+							<span class="label label-important">
+								<?php echo JText::_('JNO'); ?>
+							</span>
+						<?php endif; ?>
+					<?php elseif ($module->menuid > 0) : ?>
+						<span class="label label-success">
+							<?php echo JText::_('JYES'); ?>
+						</span>
+					<?php elseif ($module->menuid < 0) : ?>
+						<span class="label label-important">
+							<?php echo JText::_('JNO'); ?>
+						</span>
+					<?php else : ?>
+						<span class="label label-info">
+							<?php echo JText::_('JALL'); ?>
+						</span>
+					<?php endif; ?>
+				</td>
+				<td id="status-<?php echo $module->id; ?>">
+						<?php if ($module->published) : ?>
+							<span class="label label-success">
+								<?php echo JText::_('JYES'); ?>
+							</span>
+						<?php else : ?>
+							<span class="label label-important">
+								<?php echo JText::_('JNO'); ?>
+							</span>
+						<?php endif; ?>
+				</td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
diff --git a/core/administrator/components/com_menus/views/item/tmpl/edit_options.php b/core/administrator/components/com_menus/views/item/tmpl/edit_options.php
new file mode 100644
index 00000000..ccaf371c
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/edit_options.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php
+	echo JHtml::_('bootstrap.startAccordion', 'menuOptions', array('active' => 'collapse0'));
+	$fieldSets = $this->form->getFieldsets('params');
+	$i = 0;
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		if (!(($this->item->link == 'index.php?option=com_wrapper&view=wrapper') && $fieldSet->name == 'request')
+				&& !($this->item->link == 'index.php?Itemid=' && $fieldSet->name == 'aliasoptions')) :
+			$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_' . $name . '_FIELDSET_LABEL';
+			echo JHtml::_('bootstrap.addSlide', 'menuOptions', JText::_($label), 'collapse' . ($i++));
+				if (isset($fieldSet->description) && trim($fieldSet->description)) :
+					echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+				endif;
+				?>
+					<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+
+						<div class="control-group">
+
+							<div class="control-label">
+								<?php echo $field->label; ?>
+							</div>
+							<div class="controls">
+								<?php echo $field->input; ?>
+							</div>
+
+						</div>
+					<?php endforeach;
+			echo JHtml::_('bootstrap.endSlide');
+		endif;
+	endforeach; ?>
+<?php
+
+echo JHtml::_('bootstrap.endAccordion');
diff --git a/core/administrator/components/com_menus/views/item/tmpl/modal.php b/core/administrator/components/com_menus/views/item/tmpl/modal.php
new file mode 100644
index 00000000..ff43174e
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/modal.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+
+// @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0.
+$function  = JFactory::getApplication()->input->getCmd('function', 'jEditMenu_' . (int) $this->item->id);
+
+// Function to update input title when changed
+JFactory::getDocument()->addScriptDeclaration('
+	function jEditMenuModal() {
+		if (window.parent && document.formvalidator.isValid(document.getElementById("item-form"))) {
+			return window.parent.' . $this->escape($function) . '(document.getElementById("jform_title").value);
+		}
+	}
+');
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('item.apply'); jEditMenuModal();"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('item.save'); jEditMenuModal();"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('item.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/core/administrator/components/com_menus/views/item/tmpl/modal_associations.php b/core/administrator/components/com_menus/views/item/tmpl/modal_associations.php
new file mode 100644
index 00000000..4170e5f1
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/modal_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_menus/views/item/tmpl/modal_options.php b/core/administrator/components/com_menus/views/item/tmpl/modal_options.php
new file mode 100644
index 00000000..ccaf371c
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/tmpl/modal_options.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php
+	echo JHtml::_('bootstrap.startAccordion', 'menuOptions', array('active' => 'collapse0'));
+	$fieldSets = $this->form->getFieldsets('params');
+	$i = 0;
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		if (!(($this->item->link == 'index.php?option=com_wrapper&view=wrapper') && $fieldSet->name == 'request')
+				&& !($this->item->link == 'index.php?Itemid=' && $fieldSet->name == 'aliasoptions')) :
+			$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_' . $name . '_FIELDSET_LABEL';
+			echo JHtml::_('bootstrap.addSlide', 'menuOptions', JText::_($label), 'collapse' . ($i++));
+				if (isset($fieldSet->description) && trim($fieldSet->description)) :
+					echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+				endif;
+				?>
+					<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+
+						<div class="control-group">
+
+							<div class="control-label">
+								<?php echo $field->label; ?>
+							</div>
+							<div class="controls">
+								<?php echo $field->input; ?>
+							</div>
+
+						</div>
+					<?php endforeach;
+			echo JHtml::_('bootstrap.endSlide');
+		endif;
+	endforeach; ?>
+<?php
+
+echo JHtml::_('bootstrap.endAccordion');
diff --git a/core/administrator/components/com_menus/views/item/view.html.php b/core/administrator/components/com_menus/views/item/view.html.php
new file mode 100644
index 00000000..95bb7d06
--- /dev/null
+++ b/core/administrator/components/com_menus/views/item/view.html.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The HTML Menus Menu Item View.
+ *
+ * @since  1.6
+ */
+class MenusViewItem extends JViewLegacy
+{
+	/**
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * @var  mixed
+	 */
+	protected $modules;
+
+	/**
+	 * @var  JObject
+	 */
+	protected $state;
+
+	/**
+	 * @var  JObject
+	 */
+	protected $canDo;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$user = JFactory::getUser();
+
+		$this->state   = $this->get('State');
+		$this->form    = $this->get('Form');
+		$this->item    = $this->get('Item');
+		$this->modules = $this->get('Modules');
+		$this->levels  = $this->get('ViewLevels');
+		$this->canDo   = JHelperContent::getActions('com_menus', 'menu', (int) $this->state->get('item.menutypeid'));
+
+		// Check if we're allowed to edit this item
+		// No need to check for create, because then the moduletype select is empty
+		if (!empty($this->item->id) && !$this->canDo->get('core.edit'))
+		{
+			throw new Exception(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return;
+		}
+
+		// If we are forcing a language in modal (used for associations).
+		if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd'))
+		{
+			// Set the language field to the forcedLanguage and disable changing it.
+			$this->form->setValue('language', null, $forcedLanguage);
+			$this->form->setFieldAttribute('language', 'readonly', 'true');
+
+			// Only allow to select categories with All language or with the forced language.
+			$this->form->setFieldAttribute('parent_id', 'language', '*,' . $forcedLanguage);
+		}
+
+		parent::display($tpl);
+		$this->addToolbar();
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$input = JFactory::getApplication()->input;
+		$input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+		$canDo      = $this->canDo;
+
+		JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_ITEM_TITLE' : 'COM_MENUS_VIEW_EDIT_ITEM_TITLE'), 'list menu-add');
+
+		// If a new item, can save the item.  Allow users with edit permissions to apply changes to prevent returning to grid.
+		if ($isNew && $canDo->get('core.create'))
+		{
+			if ($canDo->get('core.edit'))
+			{
+				JToolbarHelper::apply('item.apply');
+			}
+
+			JToolbarHelper::save('item.save');
+		}
+
+		// If not checked out, can save the item.
+		if (!$isNew && !$checkedOut && $canDo->get('core.edit'))
+		{
+			JToolbarHelper::apply('item.apply');
+			JToolbarHelper::save('item.save');
+		}
+
+		// If the user can create new items, allow them to see Save & New
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('item.save2new');
+		}
+
+		// If an existing item, can save to a copy only if we have create rights.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('item.save2copy');
+		}
+
+		if ($isNew)
+		{
+			JToolbarHelper::cancel('item.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('item.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+
+		// Get the help information for the menu item.
+		$lang = JFactory::getLanguage();
+
+		$help = $this->get('Help');
+
+		if ($lang->hasKey($help->url))
+		{
+			$debug = $lang->setDebug(false);
+			$url   = JText::_($help->url);
+			$lang->setDebug($debug);
+		}
+		else
+		{
+			$url = $help->url;
+		}
+
+		JToolbarHelper::help($help->key, $help->local, $url);
+	}
+}
diff --git a/core/administrator/components/com_menus/views/items/tmpl/default.php b/core/administrator/components/com_menus/views/items/tmpl/default.php
new file mode 100644
index 00000000..54c2328e
--- /dev/null
+++ b/core/administrator/components/com_menus/views/items/tmpl/default.php
@@ -0,0 +1,281 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user       = JFactory::getUser();
+$app        = JFactory::getApplication();
+$userId     = $user->get('id');
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$ordering   = ($listOrder == 'a.lft');
+$saveOrder  = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
+$menuType   = (string) $app->getUserState('com_menus.items.menutype', '', 'string');
+
+if ($saveOrder && $menuType)
+{
+	$saveOrderingUrl = 'index.php?option=com_menus&task=items.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'itemList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+
+$assoc   = JLanguageAssociations::isEnabled() && $this->state->get('filter.client_id') == 0;
+$colSpan = $assoc ? 10 : 9;
+
+if ($menuType == '')
+{
+	$colSpan--;
+}
+?>
+<?php // Set up the filter bar. ?>
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=items'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'menutype'))); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="itemList">
+				<thead>
+					<tr>
+						<?php if ($menuType) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+							</th>
+						<?php endif; ?>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MENUS_HEADING_MENU', 'menutype_title', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($this->state->get('filter.client_id') == 0) : ?>
+						<th width="5%" class="center nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MENUS_HEADING_HOME', 'a.home', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<?php if ($this->state->get('filter.client_id') == 0) : ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort',  'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<?php if ($assoc) : ?>
+							<th width="5%" class="nowrap hidden-phone">
+								<?php echo JHtml::_('searchtools.sort', 'COM_MENUS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+							</th>
+						<?php endif; ?>
+						<?php if ($this->state->get('filter.client_id') == 0) : ?>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="<?php echo $colSpan; ?>">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+
+				<tbody>
+				<?php
+
+				foreach ($this->items as $i => $item) :
+					$orderkey   = array_search($item->id, $this->ordering[$item->parent_id]);
+					$canCreate  = $user->authorise('core.create',     'com_menus.menu.' . $item->menutype_id);
+					$canEdit    = $user->authorise('core.edit',       'com_menus.menu.' . $item->menutype_id);
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id')|| $item->checked_out == 0;
+					$canChange  = $user->authorise('core.edit.state', 'com_menus.menu.' . $item->menutype_id) && $canCheckin;
+
+					// Get the parents of item for sorting
+					if ($item->level > 1)
+					{
+						$parentsStr = '';
+						$_currentParentId = $item->parent_id;
+						$parentsStr = ' ' . $_currentParentId;
+
+						for ($j = 0; $j < $item->level; $j++)
+						{
+							foreach ($this->ordering as $k => $v)
+							{
+								$v = implode('-', $v);
+								$v = '-' . $v . '-';
+
+								if (strpos($v, '-' . $_currentParentId . '-') !== false)
+								{
+									$parentsStr .= ' ' . $k;
+									$_currentParentId = $k;
+									break;
+								}
+							}
+						}
+					}
+					else
+					{
+						$parentsStr = '';
+					}
+					?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->parent_id; ?>" item-id="<?php echo $item->id; ?>" parents="<?php echo $parentsStr; ?>" level="<?php echo $item->level; ?>">
+						<?php if ($menuType) : ?>
+							<td class="order nowrap center hidden-phone">
+								<?php
+								$iconClass = '';
+
+								if (!$canChange)
+								{
+									$iconClass = ' inactive';
+								}
+								elseif (!$saveOrder)
+								{
+									$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+								}
+								?>
+								<span class="sortable-handler<?php echo $iconClass ?>">
+									<span class="icon-menu" aria-hidden="true"></span>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>" />
+								<?php endif; ?>
+							</td>
+						<?php endif; ?>
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td class="center">
+							<?php
+							// Show protected items as published always. We don't allow state change for them. Show/Hide is the module's job.
+							$published = $item->protected ? 3 : $item->published;
+							echo JHtml::_('MenusHtml.Menus.state', $published, $i, $canChange && !$item->protected, 'cb'); ?>
+						</td>
+						<td>
+							<?php $prefix = JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+							<?php echo $prefix; ?>
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'items.', $canCheckin); ?>
+							<?php endif; ?>
+							<?php if ($canEdit && !$item->protected) : ?>
+								<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_menus&task=item.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+									<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+							<span class="small">
+							<?php if ($item->type != 'url') : ?>
+								<?php if (empty($item->note)) : ?>
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								<?php else : ?>
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+								<?php endif; ?>
+							<?php elseif ($item->type == 'url' && $item->note) : ?>
+								<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note)); ?>
+							<?php endif; ?>
+							</span>
+							<?php echo JHtml::_('MenusHtml.Menus.visibility', $item->params); ?>
+							<div title="<?php echo $this->escape($item->path); ?>">
+								<?php echo $prefix; ?>
+								<span class="small"  title="<?php echo isset($item->item_type_desc) ? htmlspecialchars($this->escape($item->item_type_desc), ENT_COMPAT, 'UTF-8') : ''; ?>">
+									<?php echo $this->escape($item->item_type); ?></span>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->menutype_title ?: ucwords($item->menutype)); ?>
+						</td>
+						<?php if ($this->state->get('filter.client_id') == 0) : ?>
+						<td class="center hidden-phone">
+							<?php if ($item->type == 'component') : ?>
+								<?php if ($item->language == '*' || $item->home == '0') : ?>
+									<?php echo JHtml::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected); ?>
+								<?php elseif ($canChange) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_menus&task=items.unsetDefault&cid[]=' . $item->id . '&' . JSession::getFormToken() . '=1'); ?>">
+										<?php if ($item->language_image) : ?>
+											<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
+										<?php else : ?>
+											<span class="label" title="<?php echo JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+										<?php endif; ?>
+									</a>
+								<?php else : ?>
+									<?php if ($item->language_image) : ?>
+										<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
+									<?php else : ?>
+										<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+									<?php endif; ?>
+								<?php endif; ?>
+							<?php endif; ?>
+						</td>
+						<?php endif; ?>
+						<?php if ($this->state->get('filter.client_id') == 0) : ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<?php endif; ?>
+						<?php if ($assoc) : ?>
+							<td class="small hidden-phone">
+								<?php if ($item->association) : ?>
+									<?php echo JHtml::_('MenusHtml.Menus.association', $item->id); ?>
+								<?php endif; ?>
+							</td>
+						<?php endif; ?>
+						<?php if ($this->state->get('filter.client_id') == 0) : ?>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<?php endif; ?>
+						<td class="hidden-phone">
+							<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+								<?php echo (int) $item->id; ?>
+							</span>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form if user is allowed ?>
+			<?php if ($user->authorise('core.create', 'com_menus') || $user->authorise('core.edit', 'com_menus')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title' => JText::_('COM_MENUS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer')
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_menus/views/items/tmpl/default.xml b/core/administrator/components/com_menus/views/items/tmpl/default.xml
new file mode 100755
index 00000000..f584706c
--- /dev/null
+++ b/core/administrator/components/com_menus/views/items/tmpl/default.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_MENUS_ITEMS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_MENUS_ITEMS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fieldset name="request">
+		<fields name="request">
+			<field
+				name="menutype"
+				type="menu"
+				label="COM_MENUS_ITEMS_CHOOSE_MENU_LABEL"
+				description="COM_MENUS_ITEMS_CHOOSE_MENU_DESC"
+				clientid=""
+				>
+				<option value="">COM_MENUS_SELECT_MENU</option>
+			</field>
+		</fields>
+	</fieldset>
+</metadata>
diff --git a/core/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/core/administrator/components/com_menus/views/items/tmpl/default_batch_body.php
new file mode 100644
index 00000000..8658e10a
--- /dev/null
+++ b/core/administrator/components/com_menus/views/items/tmpl/default_batch_body.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$options = array(
+	JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
+	JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
+);
+$published = $this->state->get('filter.published');
+$clientId  = $this->state->get('filter.client_id');
+$menuType  = JFactory::getApplication()->getUserState('com_menus.items.menutype');
+if ($clientId == 1) :
+	JFactory::getDocument()->addScriptDeclaration(
+		'
+			jQuery(document).ready(function($){
+				if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
+				if ($("#batch-copy-move").length) {
+					$("#batch-copy-move").hide();
+					batchSelector.on("change", function(){
+						if (batchSelector.val() != 0 || batchSelector.val() != "") {
+							$("#batch-copy-move").show();
+						} else {
+							$("#batch-copy-move").hide();
+						}
+					});
+				}
+			});
+		'
+	);
+endif;
+
+?>
+<div class="container-fluid">
+	<?php if (strlen($menuType) && $menuType != '*') : ?>
+	<?php if ($clientId != 1) : ?>
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<?php endif; ?>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div id="batch-choose-action" class="combo control-group">
+				<label id="batch-choose-action-lbl" class="control-label" for="batch-menu-id">
+					<?php echo JText::_('COM_MENUS_BATCH_MENU_LABEL'); ?>
+				</label>
+				<div class="controls">
+					<select name="batch[menu_id]" id="batch-menu-id">
+						<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+						<?php
+						$opts     = array(
+							'published' => $published,
+							'checkacl'  => (int) $this->state->get('menutypeid'),
+							'clientid'  => (int) $clientId,
+						);
+						echo JHtml::_('select.options', JHtml::_('menu.menuitems', $opts));
+						?>
+					</select>
+				</div>
+			</div>
+			<div id="batch-copy-move" class="control-group radio">
+				<?php echo JText::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
+				<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+			</div>
+		<?php endif; ?>
+
+		<?php if ($published < 0 && $clientId == 1): ?>
+			<p><?php echo JText::_('COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED'); ?></p>
+		<?php endif; ?>
+	</div>
+	<?php else : ?>
+	<div class="row-fluid">
+		<p><?php echo JText::_('COM_MENUS_SELECT_MENU_FIRST'); ?></p>
+	</div>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php b/core/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..f4362516
--- /dev/null
+++ b/core/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+$clientId  = $this->state->get('filter.client_id');
+$menuType = JFactory::getApplication()->getUserState('com_menus.items.menutype');
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-menu-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<?php if ((strlen($menuType) && $menuType != '*' && $clientId == 0) || ($published > 0 && $clientId == 1)): ?>
+	<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('item.batch');">
+		<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+	</button>
+<?php endif; ?>
diff --git a/core/administrator/components/com_menus/views/items/tmpl/modal.php b/core/administrator/components/com_menus/views/items/tmpl/modal.php
new file mode 100644
index 00000000..fc357aac
--- /dev/null
+++ b/core/administrator/components/com_menus/views/items/tmpl/modal.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JHtml::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+JHtml::_('script', 'com_menus/admin-items-modal.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$function     = $app->input->get('function', 'jSelectMenuItem', 'cmd');
+$editor    = $app->input->getCmd('editor', '');
+$listOrder    = $this->escape($this->state->get('list.ordering'));
+$listDirn     = $this->escape($this->state->get('list.direction'));
+$link         = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1';
+
+if (!empty($editor))
+{
+	// This view is used also in com_menus. Load the xtd script only if the editor is set!
+	JFactory::getDocument()->addScriptOptions('xtd-menus', array('editor' => $editor));
+	$onclick = "jSelectMenuItem";
+	$link    = 'index.php?option=com_menus&view=items&layout=modal&tmpl=component&editor=' . $editor . '&' . JSession::getFormToken() . '=1';
+}
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_($link); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped table-condensed">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MENUS_HEADING_MENU', 'menutype_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="center nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MENUS_HEADING_HOME', 'a.home', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort',  'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="7">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+				<?php $uselessMenuItem = in_array($item->type, array('separator', 'heading', 'alias', 'url', 'container')); ?>
+					<?php if ($item->language && JLanguageMultilang::isEnabled())
+					{
+						if ($item->language !== '*')
+						{
+							$language = $item->language;
+						}
+						else
+						{
+							$language = '';
+						}
+					}
+					elseif (!JLanguageMultilang::isEnabled())
+					{
+						$language = '';
+					}
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('MenusHtml.Menus.state', $item->published, $i, 0); ?>
+						</td>
+						<td>
+							<?php $prefix = JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+							<?php echo $prefix; ?>
+							<?php if (!$uselessMenuItem) : ?>
+								<a class="select-link" href="javascript:void(0)" data-function="<?php echo $this->escape($function); ?>" data-id="<?php echo $item->id; ?>" data-title="<?php echo $this->escape($item->title); ?>" data-uri="<?php echo 'index.php?Itemid=' . $item->id; ?>" data-language="<?php echo $this->escape($language); ?>">
+									<?php echo $this->escape($item->title); ?>
+								</a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>	
+							<span class="small">
+								<?php if (empty($item->note)) : ?>
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								<?php else : ?>
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+								<?php endif; ?>
+							</span>
+							<div title="<?php echo $this->escape($item->path); ?>">
+								<?php echo $prefix; ?>
+								<span class="small" title="<?php echo isset($item->item_type_desc) ? htmlspecialchars($this->escape($item->item_type_desc), ENT_COMPAT, 'UTF-8') : ''; ?>">
+									<?php echo $this->escape($item->item_type); ?></span>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->menutype_title); ?>
+						</td>
+						<td class="center hidden-phone">
+							<?php if ($item->type == 'component') : ?>
+								<?php if ($item->language == '*' || $item->home == '0') : ?>
+									<?php echo JHtml::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && 0); ?>
+								<?php else : ?>
+									<?php if ($item->language_image) : ?>
+										<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
+									<?php else : ?>
+										<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+									<?php endif; ?>
+								<?php endif; ?>
+							<?php endif; ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php if ($item->language == '') : ?>
+								<?php echo JText::_('JDEFAULT'); ?>
+							<?php elseif ($item->language == '*') : ?>
+								<?php echo JText::alt('JALL', 'language'); ?>
+							<?php else : ?>
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone">
+							<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+								<?php echo (int) $item->id; ?>
+							</span>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="function" value="<?php echo $function; ?>" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_menus/views/items/view.html.php b/core/administrator/components/com_menus/views/items/view.html.php
new file mode 100644
index 00000000..ccadd065
--- /dev/null
+++ b/core/administrator/components/com_menus/views/items/view.html.php
@@ -0,0 +1,383 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The HTML Menus Menu Items View.
+ *
+ * @since  1.6
+ */
+class MenusViewItems extends JViewLegacy
+{
+	/**
+	 * @var  array
+	 */
+	protected $f_levels;
+
+	/**
+	 * @var  mixed
+	 */
+	protected $items;
+
+	/**
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * @var  JObject
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$lang = JFactory::getLanguage();
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->total         = $this->get('Total');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			MenusHelper::addSubmenu('items');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->ordering = array();
+
+		// Preprocess the list of items to find ordering divisions.
+		foreach ($this->items as $item)
+		{
+			$this->ordering[$item->parent_id][] = $item->id;
+
+			// Item type text
+			switch ($item->type)
+			{
+				case 'url':
+					$value = JText::_('COM_MENUS_TYPE_EXTERNAL_URL');
+					break;
+
+				case 'alias':
+					$value = JText::_('COM_MENUS_TYPE_ALIAS');
+					break;
+
+				case 'separator':
+					$value = JText::_('COM_MENUS_TYPE_SEPARATOR');
+					break;
+
+				case 'heading':
+					$value = JText::_('COM_MENUS_TYPE_HEADING');
+					break;
+
+				case 'container':
+					$value = JText::_('COM_MENUS_TYPE_CONTAINER');
+					break;
+
+				case 'component':
+				default:
+					// Load language
+						$lang->load($item->componentname . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load($item->componentname . '.sys', JPATH_ADMINISTRATOR . '/components/' . $item->componentname, null, false, true);
+
+					if (!empty($item->componentname))
+					{
+						$titleParts   = array();
+						$titleParts[] = JText::_($item->componentname);
+						$vars         = null;
+
+						parse_str($item->link, $vars);
+
+						if (isset($vars['view']))
+						{
+							// Attempt to load the view xml file.
+							$file = JPATH_SITE . '/components/' . $item->componentname . '/views/' . $vars['view'] . '/metadata.xml';
+
+							if (!is_file($file))
+							{
+								$file = JPATH_SITE . '/components/' . $item->componentname . '/view/' . $vars['view'] . '/metadata.xml';
+							}
+
+							if (is_file($file) && $xml = simplexml_load_file($file))
+							{
+								// Look for the first view node off of the root node.
+								if ($view = $xml->xpath('view[1]'))
+								{
+									// Add view title if present.
+									if (!empty($view[0]['title']))
+									{
+										$viewTitle = trim((string) $view[0]['title']);
+
+										// Check if the key is valid. Needed due to B/C so we don't show untranslated keys. This check should be removed with Joomla 4.
+										if ($lang->hasKey($viewTitle))
+										{
+											$titleParts[] = JText::_($viewTitle);
+										}
+									}
+								}
+							}
+
+							$vars['layout'] = isset($vars['layout']) ? $vars['layout'] : 'default';
+
+							// Attempt to load the layout xml file.
+							// If Alternative Menu Item, get template folder for layout file
+							if (strpos($vars['layout'], ':') > 0)
+							{
+								// Use template folder for layout file
+								$temp = explode(':', $vars['layout']);
+								$file = JPATH_SITE . '/templates/' . $temp[0] . '/html/' . $item->componentname . '/' . $vars['view'] . '/' . $temp[1] . '.xml';
+
+								// Load template language file
+								$lang->load('tpl_' . $temp[0] . '.sys', JPATH_SITE, null, false, true)
+								||	$lang->load('tpl_' . $temp[0] . '.sys', JPATH_SITE . '/templates/' . $temp[0], null, false, true);
+							}
+							else
+							{
+								// Get XML file from component folder for standard layouts
+								$file = JPATH_SITE . '/components/' . $item->componentname . '/views/' . $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
+
+								if (!file_exists($file))
+								{
+									$file = JPATH_SITE . '/components/' . $item->componentname . '/view/' . $vars['view'] . '/tmpl/' . $vars['layout'] . '.xml';
+								}
+							}
+
+							if (is_file($file) && $xml = simplexml_load_file($file))
+							{
+								// Look for the first view node off of the root node.
+								if ($layout = $xml->xpath('layout[1]'))
+								{
+									if (!empty($layout[0]['title']))
+									{
+										$titleParts[] = JText::_(trim((string) $layout[0]['title']));
+									}
+								}
+
+								if (!empty($layout[0]->message[0]))
+								{
+									$item->item_type_desc = JText::_(trim((string) $layout[0]->message[0]));
+								}
+							}
+
+							unset($xml);
+
+							// Special case if neither a view nor layout title is found
+							if (count($titleParts) == 1)
+							{
+								$titleParts[] = $vars['view'];
+							}
+						}
+
+						$value = implode(' » ', $titleParts);
+					}
+					else
+					{
+						if (preg_match("/^index.php\?option=([a-zA-Z\-0-9_]*)/", $item->link, $result))
+						{
+							$value = JText::sprintf('COM_MENUS_TYPE_UNEXISTING', $result[1]);
+						}
+						else
+						{
+							$value = JText::_('COM_MENUS_TYPE_UNKNOWN');
+						}
+					}
+					break;
+			}
+
+			$item->item_type = $value;
+			$item->protected = $item->menutype == 'main';
+		}
+
+		// Levels filter.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '1', JText::_('J1'));
+		$options[] = JHtml::_('select.option', '2', JText::_('J2'));
+		$options[] = JHtml::_('select.option', '3', JText::_('J3'));
+		$options[] = JHtml::_('select.option', '4', JText::_('J4'));
+		$options[] = JHtml::_('select.option', '5', JText::_('J5'));
+		$options[] = JHtml::_('select.option', '6', JText::_('J6'));
+		$options[] = JHtml::_('select.option', '7', JText::_('J7'));
+		$options[] = JHtml::_('select.option', '8', JText::_('J8'));
+		$options[] = JHtml::_('select.option', '9', JText::_('J9'));
+		$options[] = JHtml::_('select.option', '10', JText::_('J10'));
+
+		$this->f_levels = $options;
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In menu associations modal we need to remove language filter if forcing a language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+			}
+		}
+
+		// Allow a system plugin to insert dynamic menu types to the list shown in menus:
+		JEventDispatcher::getInstance()->trigger('onBeforeRenderMenuItems', array($this));
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$menutypeId = (int) $this->state->get('menutypeid');
+
+		$canDo = JHelperContent::getActions('com_menus', 'menu', (int) $menutypeId);
+		$user  = JFactory::getUser();
+
+		// Get the menu title
+		$menuTypeTitle = $this->get('State')->get('menutypetitle');
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		if ($menuTypeTitle)
+		{
+			JToolbarHelper::title(JText::sprintf('COM_MENUS_VIEW_ITEMS_MENU_TITLE', $menuTypeTitle), 'list menumgr');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_MENUS_VIEW_ITEMS_ALL_TITLE'), 'list menumgr');
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('item.add');
+		}
+
+		$protected = $this->state->get('filter.menutype') == 'main';
+
+		if ($canDo->get('core.edit') && !$protected)
+		{
+			JToolbarHelper::editList('item.edit');
+		}
+
+		if ($canDo->get('core.edit.state') && !$protected)
+		{
+			JToolbarHelper::publish('items.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('items.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+		}
+
+		if (JFactory::getUser()->authorise('core.admin') && !$protected)
+		{
+			JToolbarHelper::checkin('items.checkin', 'JTOOLBAR_CHECKIN', true);
+		}
+
+		if ($canDo->get('core.edit.state') && $this->state->get('filter.client_id') == 0)
+		{
+			JToolbarHelper::makeDefault('items.setDefault', 'COM_MENUS_TOOLBAR_SET_HOME');
+		}
+
+		if (JFactory::getUser()->authorise('core.admin'))
+		{
+			JToolbarHelper::custom('items.rebuild', 'refresh.png', 'refresh_f2.png', 'JToolbar_Rebuild', false);
+		}
+
+		// Add a batch button
+		if (!$protected && $user->authorise('core.create', 'com_menus')
+			&& $user->authorise('core.edit', 'com_menus')
+			&& $user->authorise('core.edit.state', 'com_menus'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if (!$protected && $this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'items.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif (!$protected && $canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('items.trash');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::preferences('com_menus');
+		}
+
+		JToolbarHelper::help('JHELP_MENUS_MENU_ITEM_MANAGER');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		$this->state = $this->get('State');
+
+		if ($this->state->get('filter.client_id') == 0)
+		{
+			return array(
+				'a.lft'       => JText::_('JGRID_HEADING_ORDERING'),
+				'a.published' => JText::_('JSTATUS'),
+				'a.title'     => JText::_('JGLOBAL_TITLE'),
+				'a.home'      => JText::_('COM_MENUS_HEADING_HOME'),
+				'a.access'    => JText::_('JGRID_HEADING_ACCESS'),
+				'association' => JText::_('COM_MENUS_HEADING_ASSOCIATION'),
+				'language'    => JText::_('JGRID_HEADING_LANGUAGE'),
+				'a.id'        => JText::_('JGRID_HEADING_ID')
+			);
+		}
+		else
+		{
+			return array(
+				'a.lft'       => JText::_('JGRID_HEADING_ORDERING'),
+				'a.published' => JText::_('JSTATUS'),
+				'a.title'     => JText::_('JGLOBAL_TITLE'),
+				'a.id'        => JText::_('JGRID_HEADING_ID')
+			);
+		}
+	}
+}
diff --git a/core/administrator/components/com_menus/views/menu/tmpl/edit.php b/core/administrator/components/com_menus/views/menu/tmpl/edit.php
new file mode 100644
index 00000000..baf2cfd0
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menu/tmpl/edit.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+JText::script('ERROR');
+
+JFactory::getDocument()->addScriptDeclaration("
+		Joomla.submitbutton = function(task)
+		{
+			var form = document.getElementById('item-form');
+			if (task == 'menu.cancel' || document.formvalidator.isValid(form))
+			{
+				Joomla.submitform(task, form);
+			}
+		};
+");
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_menus&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_MENUS_MENU_DETAILS')); ?>
+
+			<?php
+			echo $this->form->renderField('menutype');
+
+			echo $this->form->renderField('description');
+
+			echo $this->form->renderField('client_id');
+
+			echo $this->form->renderField('preset');
+			?>
+
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php if ($this->canDo->get('core.admin')) : ?>
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'permissions', JText::_('COM_MENUS_FIELDSET_RULES')); ?>
+					<?php echo $this->form->getInput('rules'); ?>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</div>
+</form>
diff --git a/core/administrator/components/com_menus/views/menu/tmpl/edit.xml b/core/administrator/components/com_menus/views/menu/tmpl/edit.xml
new file mode 100755
index 00000000..9765a0da
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menu/tmpl/edit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_MENUS_MENU_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_MENUS_MENU_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_menus/views/menu/view.html.php b/core/administrator/components/com_menus/views/menu/view.html.php
new file mode 100644
index 00000000..c0cbfe8e
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menu/view.html.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The HTML Menus Menu Item View.
+ *
+ * @since  1.6
+ */
+class MenusViewMenu extends JViewLegacy
+{
+	/**
+	 * @var  JForm
+	 */
+	protected $form;
+
+	/**
+	 * @var  mixed
+	 */
+	protected $item;
+
+	/**
+	 * @var  JObject
+	 */
+	protected $state;
+
+	/**
+	 *
+	 * @var  JObject
+	 */
+	protected $canDo;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->form	 = $this->get('Form');
+		$this->item	 = $this->get('Item');
+		$this->state = $this->get('State');
+
+		$this->canDo = JHelperContent::getActions('com_menus', 'menu', $this->item->id);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		parent::display($tpl);
+		$this->addToolbar();
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$input = JFactory::getApplication()->input;
+		$input->set('hidemainmenu', true);
+
+		$isNew = ($this->item->id == 0);
+
+		JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_MENU_TITLE' : 'COM_MENUS_VIEW_EDIT_MENU_TITLE'), 'list menu');
+
+		// If a new item, can save the item.  Allow users with edit permissions to apply changes to prevent returning to grid.
+		if ($isNew && $this->canDo->get('core.create'))
+		{
+			if ($this->canDo->get('core.edit'))
+			{
+				JToolbarHelper::apply('menu.apply');
+			}
+
+			JToolbarHelper::save('menu.save');
+		}
+
+		// If user can edit, can save the item.
+		if (!$isNew && $this->canDo->get('core.edit'))
+		{
+			JToolbarHelper::apply('menu.apply');
+			JToolbarHelper::save('menu.save');
+		}
+
+		// If the user can create new items, allow them to see Save & New
+		if ($this->canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('menu.save2new');
+		}
+
+		if ($isNew)
+		{
+			JToolbarHelper::cancel('menu.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('menu.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_MENUS_MENU_MANAGER_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_menus/views/menu/view.xml.php b/core/administrator/components/com_menus/views/menu/view.xml.php
new file mode 100644
index 00000000..d5aa5ab2
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menu/view.xml.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Menu\MenuHelper;
+
+/**
+ * The HTML Menus Menu Item View.
+ *
+ * @since  3.8.0
+ */
+class MenusViewMenu extends JViewLegacy
+{
+	/**
+	 * @var  stdClass[]
+	 *
+	 * @since  3.8.0
+	 */
+	protected $items;
+
+	/**
+	 * @var  JObject
+	 *
+	 * @since  3.8.0
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function display($tpl = null)
+	{
+		$app      = JFactory::getApplication();
+		$menutype = $app->input->getCmd('menutype');
+
+		if ($menutype)
+		{
+			$items = MenusHelper::getMenuItems($menutype, true);
+		}
+
+		if (empty($items))
+		{
+			JLog::add(JText::_('COM_MENUS_SELECT_MENU_FIRST_EXPORT'), JLog::WARNING, 'jerror');
+
+			$app->redirect(JRoute::_('index.php?option=com_menus&view=menus', false));
+
+			return;
+		}
+
+		$this->items = MenuHelper::createLevels($items);
+
+		$xml = new SimpleXMLElement('<menu ' .
+			'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
+			'xmlns="urn:joomla.org"	xsi:schemaLocation="urn:joomla.org menu.xsd"' .
+			'></menu>'
+		);
+
+		foreach ($this->items as $item)
+		{
+			$this->addXmlChild($xml, $item);
+		}
+
+		if (headers_sent($file, $line))
+		{
+			JLog::add("Headers already sent at $file:$line.", JLog::ERROR, 'jerror');
+
+			return;
+		}
+
+		header('content-type: application/xml');
+		header('content-disposition: attachment; filename="' . $menutype . '.xml"');
+		header("Cache-Control: no-cache, must-revalidate");
+		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		header('Pragma: private');
+
+		$dom = new DOMDocument;
+		$dom->preserveWhiteSpace = true;
+		$dom->formatOutput = true;
+		$dom->loadXML($xml->asXML());
+
+		echo $dom->saveXML();
+
+		$app->close();
+	}
+
+	/**
+	 * Add a child node to the xml
+	 *
+	 * @param   SimpleXMLElement  $xml   The current XML node which would become the parent to the new node
+	 * @param   stdClass          $item  The menuitem object to create the child XML node from
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	protected function addXmlChild($xml, $item)
+	{
+		$node = $xml->addChild('menuitem');
+
+		$node['type'] = $item->type;
+
+		if ($item->title)
+		{
+			$node['title'] = $item->title;
+		}
+
+		if ($item->link)
+		{
+			$node['link'] = $item->link;
+		}
+
+		if ($item->element)
+		{
+			$node['element'] = $item->element;
+		}
+
+		if ($item->class)
+		{
+			$node['class'] = $item->class;
+		}
+
+		if ($item->access)
+		{
+			$node['access'] = $item->access;
+		}
+
+		if ($item->browserNav)
+		{
+			$node['target'] = '_blank';
+		}
+
+		if (count($item->params))
+		{
+			$hideitems = $item->params->get('hideitems');
+
+			if (count($hideitems))
+			{
+				$db    = JFactory::getDbo();
+				$query = $db->getQuery(true);
+
+				$query->select('e.element')->from('#__extensions e')
+					->join('inner', '#__menu m ON m.component_id = e.extension_id')
+					->where('m.id IN (' . implode(', ', $db->quote($hideitems)) . ')');
+
+				$hideitems = $db->setQuery($query)->loadColumn();
+
+				$item->params->set('hideitems', $hideitems);
+			}
+
+			$node->addChild('params', (string) $item->params);
+		}
+
+		foreach ($item->submenu as $sub)
+		{
+			$this->addXmlChild($node, $sub);
+		}
+	}
+}
diff --git a/core/administrator/components/com_menus/views/menus/tmpl/default.php b/core/administrator/components/com_menus/views/menus/tmpl/default.php
new file mode 100644
index 00000000..c6b5b510
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menus/tmpl/default.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$uri       = JUri::getInstance();
+$return    = base64_encode($uri);
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$modMenuId = (int) $this->get('ModMenuId');
+
+$script = array();
+$script[] = 'jQuery(document).ready(function() {';
+
+foreach ($this->items as $item) :
+	if ($user->authorise('core.edit', 'com_menus')) :
+		$script[] = '	function jSelectPosition_' . $item->id . '(name) {';
+		$script[] = '		document.getElementById("' . $item->id . '").value = name;';
+		$script[] = '		jQuery(".modal").modal("hide");';
+		$script[] = '	};';
+	endif;
+endforeach;
+
+$script[] = '	jQuery(".modal").on("hidden", function () {';
+$script[] = '		setTimeout(function(){';
+$script[] = '			window.parent.location.reload();';
+$script[] = '		},1000);';
+$script[] = '	});';
+$script[] = '});';
+$script[] = '
+	(function (originalFn) {
+		Joomla.submitform = function(task, form) {
+		 	originalFn(task, form);
+		 	if (task == "menu.exportXml") {
+		 		document.adminForm.task.value = "";
+		 	}
+		};
+	})(Joomla.submitform);
+';
+
+JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=menus'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="menuList">
+				<thead>
+					<tr>
+						<th width="1%">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap center">
+							<span class="icon-publish" aria-hidden="true"></span>
+							<span class="hidden-phone"><?php echo JText::_('COM_MENUS_HEADING_PUBLISHED_ITEMS'); ?></span>
+						</th>
+						<th width="10%" class="nowrap center">
+							<span class="icon-unpublish" aria-hidden="true"></span>
+							<span class="hidden-phone"><?php echo JText::_('COM_MENUS_HEADING_UNPUBLISHED_ITEMS'); ?></span>
+						</th>
+						<th width="10%" class="nowrap center">
+							<span class="icon-trash" aria-hidden="true"></span>
+							<span class="hidden-phone"><?php echo JText::_('COM_MENUS_HEADING_TRASHED_ITEMS'); ?></span>
+						</th>
+						<th width="20%" class="nowrap center">
+							<span class="icon-cube" aria-hidden="true"></span>
+							<span class="hidden-phone"><?php echo JText::_('COM_MENUS_HEADING_LINKED_MODULES'); ?></span>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="15">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$canEdit        = $user->authorise('core.edit',   'com_menus.menu.' . (int) $item->id);
+					$canManageItems = $user->authorise('core.manage', 'com_menus.menu.' . (int) $item->id);
+				?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td>
+							<?php if ($canManageItems) : ?>
+							<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype=' . $item->menutype); ?>">
+								<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+							<div class="small">
+								<?php echo JText::_('COM_MENUS_MENU_MENUTYPE_LABEL'); ?>:
+								<?php if ($canEdit) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_menus&task=menu.edit&id=' . $item->id); ?>" title="<?php echo $this->escape($item->description); ?>">
+									<?php echo $this->escape($item->menutype); ?></a>
+								<?php else : ?>
+									<?php echo $this->escape($item->menutype); ?>
+								<?php endif; ?>
+							</div>
+						</td>
+						<td class="center btns">
+							<?php if ($canManageItems) : ?>
+								<a class="badge<?php if ($item->count_published > 0) echo ' badge-success'; ?>" href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype=' . $item->menutype . '&filter[published]=1'); ?>">
+									<?php echo $item->count_published; ?></a>
+							<?php else : ?>
+								<span class="badge<?php if ($item->count_published > 0) echo ' badge-success'; ?>">
+									<?php echo $item->count_published; ?></span>
+							<?php endif; ?>
+						</td>
+						<td class="center btns">
+							<?php if ($canManageItems) : ?>
+								<a class="badge<?php if ($item->count_unpublished > 0) echo ' badge-important'; ?>" href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype=' . $item->menutype . '&filter[published]=0'); ?>">
+									<?php echo $item->count_unpublished; ?></a>
+							<?php else : ?>
+								<span class="badge<?php if ($item->count_unpublished > 0) echo ' badge-important'; ?>">
+									<?php echo $item->count_unpublished; ?></span>
+							<?php endif; ?>
+						</td>
+						<td class="center btns">
+							<?php if ($canManageItems) : ?>
+								<a class="badge<?php if ($item->count_trashed > 0) echo ' badge-inverse'; ?>" href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype=' . $item->menutype . '&filter[published]=-2'); ?>">
+									<?php echo $item->count_trashed; ?></a>
+							<?php else : ?>
+								<span class="badge<?php if ($item->count_trashed > 0) echo ' badge-inverse'; ?>">
+									<?php echo $item->count_trashed; ?></span>
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php if (isset($this->modules[$item->menutype])) : ?>
+								<div class="btn-group">
+									<a href="#" class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+										<?php echo JText::_('COM_MENUS_MODULES'); ?>
+										<span class="caret"></span>
+									</a>
+									<ul class="dropdown-menu">
+										<?php foreach ($this->modules[$item->menutype] as &$module) : ?>
+											<li>
+												<?php if ($user->authorise('core.edit', 'com_modules.module.' . (int) $module->id)) : ?>
+													<?php $link = JRoute::_('index.php?option=com_modules&task=module.edit&id=' . $module->id . '&return=' . $return . '&tmpl=component&layout=modal'); ?>
+													<a href="#moduleEdit<?php echo $module->id; ?>Modal" role="button" class="button" data-toggle="modal" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'); ?>">
+														<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
+												<?php else : ?>
+													<a href="#" class="disabled" disabled="disabled">
+														<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
+												<?php endif; ?>
+											</li>
+										<?php endforeach; ?>
+									</ul>
+								 </div>
+								<?php foreach ($this->modules[$item->menutype] as &$module) : ?>
+									<?php if ($user->authorise('core.edit', 'com_modules.module.' . (int) $module->id)) : ?>
+										<?php $link = JRoute::_('index.php?option=com_modules&task=module.edit&id=' . $module->id . '&return=' . $return . '&tmpl=component&layout=modal'); ?>
+										<?php echo JHtml::_(
+												'bootstrap.renderModal',
+												'moduleEdit' . $module->id . 'Modal',
+												array(
+													'title'       => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
+													'backdrop'    => 'static',
+													'keyboard'    => false,
+													'closeButton' => false,
+													'url'         => $link,
+													'height'      => '400px',
+													'width'       => '800px',
+													'bodyHeight'  => '70',
+													'modalWidth'  => '80',
+													'footer'      => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
+															. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
+															. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+															. '<button type="button" class="btn btn-primary" aria-hidden="true"'
+															. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
+															. JText::_('JSAVE') . '</button>'
+															. '<button type="button" class="btn btn-success" aria-hidden="true"'
+															. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#applyBtn\').click();">'
+															. JText::_('JAPPLY') . '</button>',
+												)
+											); ?>
+									<?php endif; ?>
+								<?php endforeach; ?>
+							<?php elseif ($modMenuId) : ?>
+								<?php $link = JRoute::_('index.php?option=com_modules&task=module.add&eid=' . $modMenuId . '&params[menutype]=' . $item->menutype . '&tmpl=component&layout=modal'); ?>
+								<a class="btn btn-small btn-primary" data-toggle="modal" role="button" href="#moduleAddModal"><?php echo JText::_('COM_MENUS_ADD_MENU_MODULE'); ?></a>
+								<?php echo JHtml::_(
+										'bootstrap.renderModal',
+										'moduleAddModal',
+										array(
+											'title'       => JText::_('COM_MENUS_ADD_MENU_MODULE'),
+											'backdrop'    => 'static',
+											'keyboard'    => false,
+											'closeButton' => false,
+											'url'         => $link,
+											'height'      => '400px',
+											'width'       => '800px',
+											'bodyHeight'  => '70',
+											'modalWidth'  => '80',
+											'footer'      => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
+													. ' onclick="jQuery(\'#moduleAddModal iframe\').contents().find(\'#closeBtn\').click();">'
+													. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+													. '<button type="button" class="btn btn-primary" aria-hidden="true"'
+													. ' onclick="jQuery(\'#moduleAddModal iframe\').contents().find(\'#saveBtn\').click();">'
+													. JText::_('JSAVE') . '</button>'
+													. '<button type="button" class="btn btn-success" aria-hidden="true"'
+													. ' onclick="jQuery(\'#moduleAddModal iframe\').contents().find(\'#applyBtn\').click();">'
+													. JText::_('JAPPLY') . '</button>',
+										)
+									); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_menus/views/menus/tmpl/default.xml b/core/administrator/components/com_menus/views/menus/tmpl/default.xml
new file mode 100755
index 00000000..7a64aba9
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menus/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_MENUS_MENUS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_MENUS_MENUS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_menus/views/menus/view.html.php b/core/administrator/components/com_menus/views/menus/view.html.php
new file mode 100644
index 00000000..8f8310c7
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menus/view.html.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The HTML Menus Menu Menus View.
+ *
+ * @since  1.6
+ */
+class MenusViewMenus extends JViewLegacy
+{
+	/**
+	 * @var  mixed
+	 */
+	protected $items;
+
+	/**
+	 * @var  array
+	 */
+	protected $modules;
+
+	/**
+	 * @var  JPagination
+	 */
+	protected $pagination;
+
+	/**
+	 * @var  JObject
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->items      = $this->get('Items');
+		$this->modules    = $this->get('Modules');
+		$this->pagination = $this->get('Pagination');
+		$this->state      = $this->get('State');
+
+		if ($this->getLayout() == 'default')
+		{
+			$this->filterForm    = $this->get('FilterForm');
+			$this->activeFilters = $this->get('ActiveFilters');
+		}
+
+		MenusHelper::addSubmenu('menus');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_menus');
+
+		JToolbarHelper::title(JText::_('COM_MENUS_VIEW_MENUS_TITLE'), 'list menumgr');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('menu.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('menu.edit');
+		}
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::deleteList('COM_MENUS_MENU_CONFIRM_DELETE', 'menus.delete', 'JTOOLBAR_DELETE');
+		}
+
+		JToolbarHelper::custom('menus.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false);
+
+		if ($canDo->get('core.admin') && $this->state->get('client_id') == 1)
+		{
+			JToolbarHelper::custom('menu.exportXml', 'download', 'download', 'COM_MENUS_MENU_EXPORT_BUTTON', true);
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::preferences('com_menus');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_MENUS_MENU_MANAGER');
+	}
+}
diff --git a/core/administrator/components/com_menus/views/menutypes/tmpl/default.php b/core/administrator/components/com_menus/views/menutypes/tmpl/default.php
new file mode 100644
index 00000000..41afc9be
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menutypes/tmpl/default.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+
+// Checking if loaded via index.php or component.php
+$tmpl = ($input->getCmd('tmpl') != '') ? '1' : '';
+
+JHtml::_('behavior.core');
+JFactory::getDocument()->addScriptDeclaration('
+		setmenutype = function(type) {
+			var tmpl = ' . json_encode($tmpl) . ';
+			if (tmpl)
+			{
+				window.parent.Joomla.submitbutton("item.setType", type);
+				window.parent.jQuery("#menuTypeModal").modal("hide");
+			}
+			else
+			{
+				window.location="index.php?option=com_menus&view=item&task=item.setType&layout=edit&type=" + type;
+			}
+		};
+');
+
+?>
+<?php echo JHtml::_('bootstrap.startAccordion', 'collapseTypes', array('active' => 'slide1')); ?>
+	<?php $i = 0; ?>
+	<?php foreach ($this->types as $name => $list) : ?>
+		<?php echo JHtml::_('bootstrap.addSlide', 'collapseTypes', $name, 'collapse' . ($i++)); ?>
+			<ul class="nav nav-tabs nav-stacked">
+				<?php foreach ($list as $title => $item) : ?>
+					<li>
+						<?php $menutype = array('id' => $this->recordId, 'title' => isset($item->type) ? $item->type : $item->title, 'request' => $item->request); ?>
+						<?php $menutype = base64_encode(json_encode($menutype)); ?>
+						<a class="choose_type" href="#" title="<?php echo JText::_($item->description); ?>"
+							onclick="setmenutype('<?php echo $menutype; ?>')">
+							<?php echo $title;?>
+							<small class="muted">
+								<?php echo JText::_($item->description); ?>
+							</small>
+						</a>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		<?php echo JHtml::_('bootstrap.endSlide'); ?>
+	<?php endforeach; ?>
+<?php echo JHtml::_('bootstrap.endSlide'); ?>
+<?php echo JHtml::_('bootstrap.endAccordion');
diff --git a/core/administrator/components/com_menus/views/menutypes/view.html.php b/core/administrator/components/com_menus/views/menutypes/view.html.php
new file mode 100644
index 00000000..56f0a307
--- /dev/null
+++ b/core/administrator/components/com_menus/views/menutypes/view.html.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The HTML Menus Menu Item TYpes View.
+ *
+ * @since  1.6
+ */
+class MenusViewMenutypes extends JViewLegacy
+{
+	/**
+	 * @var  JObject[]
+	 */
+	protected $types;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$app            = JFactory::getApplication();
+		$this->recordId = $app->input->getInt('recordId');
+
+		$types = $this->get('TypeOptions');
+
+		$this->addCustomTypes($types);
+
+		$sortedTypes = array();
+
+		foreach ($types as $name => $list)
+		{
+			$tmp = array();
+
+			foreach ($list as $item)
+			{
+				$tmp[JText::_($item->title)] = $item;
+			}
+
+			ksort($tmp);
+			$sortedTypes[JText::_($name)] = $tmp;
+		}
+
+		ksort($sortedTypes);
+
+		$this->types = $sortedTypes;
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function addToolbar()
+	{
+		// Add page title
+		JToolbarHelper::title(JText::_('COM_MENUS'), 'list menumgr');
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Cancel
+		$title = JText::_('JTOOLBAR_CANCEL');
+		$dhtml = "<button onClick=\"location.href='index.php?option=com_menus&view=items'\" class=\"btn\">
+					<span class=\"icon-remove\" title=\"$title\"></span>
+					$title</button>";
+		$bar->appendButton('Custom', $dhtml, 'new');
+	}
+
+	/**
+	 * Method to add system link types to the link types array
+	 *
+	 * @param   array  $types  The list of link types
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function addCustomTypes(&$types)
+	{
+		if (empty($types))
+		{
+			$types = array();
+		}
+
+		// Adding System Links
+		$list           = array();
+		$o              = new JObject;
+		$o->title       = 'COM_MENUS_TYPE_EXTERNAL_URL';
+		$o->type        = 'url';
+		$o->description = 'COM_MENUS_TYPE_EXTERNAL_URL_DESC';
+		$o->request     = null;
+		$list[]         = $o;
+
+		$o              = new JObject;
+		$o->title       = 'COM_MENUS_TYPE_ALIAS';
+		$o->type        = 'alias';
+		$o->description = 'COM_MENUS_TYPE_ALIAS_DESC';
+		$o->request     = null;
+		$list[]         = $o;
+
+		$o              = new JObject;
+		$o->title       = 'COM_MENUS_TYPE_SEPARATOR';
+		$o->type        = 'separator';
+		$o->description = 'COM_MENUS_TYPE_SEPARATOR_DESC';
+		$o->request     = null;
+		$list[]         = $o;
+
+		$o              = new JObject;
+		$o->title       = 'COM_MENUS_TYPE_HEADING';
+		$o->type        = 'heading';
+		$o->description = 'COM_MENUS_TYPE_HEADING_DESC';
+		$o->request     = null;
+		$list[]         = $o;
+
+		if ($this->get('state')->get('client_id') == 1)
+		{
+			$o              = new JObject;
+			$o->title       = 'COM_MENUS_TYPE_CONTAINER';
+			$o->type        = 'container';
+			$o->description = 'COM_MENUS_TYPE_CONTAINER_DESC';
+			$o->request     = null;
+			$list[]         = $o;
+		}
+
+		$types['COM_MENUS_TYPE_SYSTEM'] = $list;
+	}
+}
diff --git a/core/administrator/components/com_messages/access.xml b/core/administrator/components/com_messages/access.xml
new file mode 100644
index 00000000..db0d1992
--- /dev/null
+++ b/core/administrator/components/com_messages/access.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_messages">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_messages/config.xml b/core/administrator/components/com_messages/config.xml
new file mode 100644
index 00000000..ddb9b37b
--- /dev/null
+++ b/core/administrator/components/com_messages/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_messages"
+			section="component" 
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_messages/controller.php b/core/administrator/components/com_messages/controller.php
new file mode 100644
index 00000000..eafdd938
--- /dev/null
+++ b/core/administrator/components/com_messages/controller.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Messages master display controller.
+ *
+ * @since  1.6
+ */
+class MessagesController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('MessagesHelper', JPATH_ADMINISTRATOR . '/components/com_messages/helpers/messages.php');
+
+		$view   = $this->input->get('view', 'messages');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'message' && $layout == 'edit' && !$this->checkEditId('com_messages.edit.message', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_messages&view=messages', false));
+
+			return false;
+		}
+
+		// Load the submenu.
+		MessagesHelper::addSubmenu($this->input->get('view', 'messages'));
+		parent::display();
+	}
+}
diff --git a/core/administrator/components/com_messages/controllers/config.php b/core/administrator/components/com_messages/controllers/config.php
new file mode 100644
index 00000000..f251f68e
--- /dev/null
+++ b/core/administrator/components/com_messages/controllers/config.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Messages Component Message Model
+ *
+ * @since  1.6
+ */
+class MessagesControllerConfig extends JControllerLegacy
+{
+	/**
+	 * Method to save a record.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function save()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel('Config', 'MessagesModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		$data = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($data === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Redirect back to the main list.
+			$this->setRedirect(JRoute::_('index.php?option=com_messages&view=messages', false));
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($data))
+		{
+			// Redirect back to the main list.
+			$this->setMessage(JText::sprintf('JERROR_SAVE_FAILED', $model->getError()), 'warning');
+			$this->setRedirect(JRoute::_('index.php?option=com_messages&view=messages', false));
+
+			return false;
+		}
+
+		// Redirect to the list screen.
+		$this->setMessage(JText::_('COM_MESSAGES_CONFIG_SAVED'));
+		$this->setRedirect(JRoute::_('index.php?option=com_messages&view=messages', false));
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_messages/controllers/message.php b/core/administrator/components/com_messages/controllers/message.php
new file mode 100644
index 00000000..92784f7e
--- /dev/null
+++ b/core/administrator/components/com_messages/controllers/message.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Messages Component Message Model
+ *
+ * @since  1.6
+ */
+class MessagesControllerMessage extends JControllerForm
+{
+	/**
+	 * Method (override) to check if you can save a new or existing record.
+	 *
+	 * Adjusts for the primary key name and hands off to the parent class.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowSave($data, $key = 'message_id')
+	{
+		return parent::allowSave($data, $key);
+	}
+
+	/**
+	 * Reply to an existing message.
+	 *
+	 * This is a simple redirect to the compose form.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function reply()
+	{
+		if ($replyId = $this->input->getInt('reply_id'))
+		{
+			$this->setRedirect('index.php?option=com_messages&view=message&layout=edit&reply_id=' . $replyId);
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_MESSAGES_INVALID_REPLY_ID'));
+			$this->setRedirect('index.php?option=com_messages&view=messages');
+		}
+	}
+}
diff --git a/core/administrator/components/com_messages/controllers/messages.php b/core/administrator/components/com_messages/controllers/messages.php
new file mode 100644
index 00000000..8d42d197
--- /dev/null
+++ b/core/administrator/components/com_messages/controllers/messages.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Messages list controller class.
+ *
+ * @since  1.6
+ */
+class MessagesControllerMessages extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Message', $prefix = 'MessagesModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_messages/helpers/html/messages.php b/core/administrator/components/com_messages/helpers/html/messages.php
new file mode 100644
index 00000000..95a39791
--- /dev/null
+++ b/core/administrator/components/com_messages/helpers/html/messages.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * JHtml administrator messages class.
+ *
+ * @since  1.6
+ */
+class JHtmlMessages
+{
+	/**
+	 * Get the HTML code of the state switcher
+	 *
+	 * @param   int      $value      The state value
+	 * @param   int      $i          Row number
+	 * @param   boolean  $canChange  Can the user change the state?
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 *
+	 * @deprecated  4.0  Use JHtmlMessages::status() instead
+	 */
+	public static function state($value = 0, $i = 0, $canChange = false)
+	{
+		// Log deprecated message
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlMessages::status() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Note: $i is required but has to be an optional argument in the function call due to argument order
+		if (null === $i)
+		{
+			throw new InvalidArgumentException('$i is a required argument in JHtmlMessages::state');
+		}
+
+		// Note: $canChange is required but has to be an optional argument in the function call due to argument order
+		if (null === $canChange)
+		{
+			throw new InvalidArgumentException('$canChange is a required argument in JHtmlMessages::state');
+		}
+
+		return static::status($i, $value, $canChange);
+	}
+
+	/**
+	 * Get the HTML code of the state switcher
+	 *
+	 * @param   int      $i          Row number
+	 * @param   int      $value      The state value
+	 * @param   boolean  $canChange  Can the user change the state?
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	public static function status($i, $value = 0, $canChange = false)
+	{
+		// Array of image, task, title, action.
+		$states = array(
+			-2 => array('trash', 'messages.unpublish', 'JTRASHED', 'COM_MESSAGES_MARK_AS_UNREAD'),
+			1  => array('publish', 'messages.unpublish', 'COM_MESSAGES_OPTION_READ', 'COM_MESSAGES_MARK_AS_UNREAD'),
+			0  => array('unpublish', 'messages.publish', 'COM_MESSAGES_OPTION_UNREAD', 'COM_MESSAGES_MARK_AS_READ'),
+		);
+
+		$state = ArrayHelper::getValue($states, (int) $value, $states[0]);
+		$icon  = $state[0];
+
+		if ($canChange)
+		{
+			$html = '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="btn btn-micro hasTooltip'
+				. ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3])
+				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_messages/helpers/messages.php b/core/administrator/components/com_messages/helpers/messages.php
new file mode 100644
index 00000000..74d1e493
--- /dev/null
+++ b/core/administrator/components/com_messages/helpers/messages.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Messages helper class.
+ *
+ * @since  1.6
+ */
+class MessagesHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_MESSAGES_ADD'),
+			'index.php?option=com_messages&view=message&layout=edit',
+			$vName == 'message'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_MESSAGES_READ'),
+			'index.php?option=com_messages',
+			$vName == 'messages'
+		);
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_messages');
+	}
+
+	/**
+	 * Get a list of filter options for the state of a module.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @since   1.6
+	 */
+	public static function getStateOptions()
+	{
+		// Build the filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '1', JText::_('COM_MESSAGES_OPTION_READ'));
+		$options[] = JHtml::_('select.option', '0', JText::_('COM_MESSAGES_OPTION_UNREAD'));
+		$options[] = JHtml::_('select.option', '-2', JText::_('JTRASHED'));
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_messages/messages.php b/core/administrator/components/com_messages/messages.php
new file mode 100644
index 00000000..1fb402fb
--- /dev/null
+++ b/core/administrator/components/com_messages/messages.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_messages'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$task       = JFactory::getApplication()->input->get('task');
+$controller = JControllerLegacy::getInstance('Messages');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_messages/messages.xml b/core/administrator/components/com_messages/messages.xml
new file mode 100644
index 00000000..ff1e967d
--- /dev/null
+++ b/core/administrator/components/com_messages/messages.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_messages</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_MESSAGES_XML_DESCRIPTION</description>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_messages.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>messages.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_messages.ini</language>
+			<language tag="en-GB">language/en-GB.com_messages.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_messages/models/config.php b/core/administrator/components/com_messages/models/config.php
new file mode 100644
index 00000000..273ca9eb
--- /dev/null
+++ b/core/administrator/components/com_messages/models/config.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Message configuration model.
+ *
+ * @since  1.6
+ */
+class MessagesModelConfig extends JModelForm
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$user = JFactory::getUser();
+
+		$this->setState('user.id', $user->get('id'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_messages');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function &getItem()
+	{
+		$item = new JObject;
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('cfg_name, cfg_value')
+			->from('#__messages_cfg')
+			->where($db->quoteName('user_id') . ' = ' . (int) $this->getState('user.id'));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		foreach ($rows as $row)
+		{
+			$item->set($row->cfg_name, $row->cfg_value);
+		}
+
+		$this->preprocessData('com_messages.config', $item);
+
+		return $item;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm	 A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_messages.config', 'config', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$db = $this->getDbo();
+
+		if ($userId = (int) $this->getState('user.id'))
+		{
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__messages_cfg'))
+				->where($db->quoteName('user_id') . '=' . (int) $userId);
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			if (count($data))
+			{
+				$query = $db->getQuery(true)
+					->insert($db->quoteName('#__messages_cfg'))
+					->columns($db->quoteName(array('user_id', 'cfg_name', 'cfg_value')));
+
+				foreach ($data as $k => $v)
+				{
+					$query->values($userId . ', ' . $db->quote($k) . ', ' . $db->quote($v));
+				}
+
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->setError('COM_MESSAGES_ERR_INVALID_USER');
+
+			return false;
+		}
+	}
+}
diff --git a/core/administrator/components/com_messages/models/fields/messagestates.php b/core/administrator/components/com_messages/models/fields/messagestates.php
new file mode 100644
index 00000000..4918b930
--- /dev/null
+++ b/core/administrator/components/com_messages/models/fields/messagestates.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('MessagesHelper', JPATH_ADMINISTRATOR . '/components/com_messages/helpers/messages.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Message States field.
+ *
+ * @since  3.6.0
+ */
+class JFormFieldMessageStates extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.6.0
+	 */
+	protected $type = 'MessageStates';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getOptions()
+	{
+		// Merge state options with any additional options in the XML definition.
+		return array_merge(parent::getOptions(), MessagesHelper::getStateOptions());
+	}
+}
diff --git a/core/administrator/components/com_messages/models/fields/usermessages.php b/core/administrator/components/com_messages/models/fields/usermessages.php
new file mode 100644
index 00000000..59a9d1c9
--- /dev/null
+++ b/core/administrator/components/com_messages/models/fields/usermessages.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('user');
+
+/**
+ * Supports a modal select of users that have access to com_messages
+ *
+ * @since  1.6
+ */
+class JFormFieldUserMessages extends JFormFieldUser
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   1.6
+	 */
+	public $type = 'UserMessages';
+
+	/**
+	 * Method to get the filtering groups (null means no filtering)
+	 *
+	 * @return  array|null	array of filtering groups or null.
+	 *
+	 * @since   1.6
+	 */
+	protected function getGroups()
+	{
+		// Compute usergroups
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('id')
+			->from('#__usergroups');
+		$db->setQuery($query);
+
+		try
+		{
+			$groups = $db->loadColumn();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseNotice(500, $e->getMessage());
+
+			return null;
+		}
+
+		foreach ($groups as $i => $group)
+		{
+			if (JAccess::checkGroup($group, 'core.admin'))
+			{
+				continue;
+			}
+
+			if (!JAccess::checkGroup($group, 'core.manage', 'com_messages'))
+			{
+				unset($groups[$i]);
+				continue;
+			}
+
+			if (!JAccess::checkGroup($group, 'core.login.admin'))
+			{
+				unset($groups[$i]);
+				continue;
+			}
+		}
+
+		return array_values($groups);
+	}
+
+	/**
+	 * Method to get the users to exclude from the list of users
+	 *
+	 * @return  array|null array of users to exclude or null to to not exclude them
+	 *
+	 * @since   1.6
+	 */
+	protected function getExcluded()
+	{
+		return array(JFactory::getUser()->id);
+	}
+}
diff --git a/core/administrator/components/com_messages/models/forms/config.xml b/core/administrator/components/com_messages/models/forms/config.xml
new file mode 100644
index 00000000..3f162a72
--- /dev/null
+++ b/core/administrator/components/com_messages/models/forms/config.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="lock"
+			type="radio"
+			label="COM_MESSAGES_FIELD_LOCK_LABEL"
+			description="COM_MESSAGES_FIELD_LOCK_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="mail_on_new"
+			type="radio"
+			label="COM_MESSAGES_FIELD_MAIL_ON_NEW_LABEL"
+			description="COM_MESSAGES_FIELD_MAIL_ON_NEW_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="auto_purge"
+			type="number"
+			label="COM_MESSAGES_FIELD_AUTO_PURGE_LABEL"
+			description="COM_MESSAGES_FIELD_AUTO_PURGE_DESC" 
+			size="6"
+			default="7"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_messages/models/forms/filter_messages.xml b/core/administrator/components/com_messages/models/forms/filter_messages.xml
new file mode 100644
index 00000000..719e73a2
--- /dev/null
+++ b/core/administrator/components/com_messages/models/forms/filter_messages.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MESSAGES_FILTER_SEARCH_LABEL"
+			description="COM_MESSAGES_SEARCH_IN_SUBJECT"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="state"
+			type="messagestates"
+			label="COM_MESSAGES_FILTER_STATES_LABEL"
+			description="COM_MESSAGES_FILTER_STATES_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+			<option value="*">JALL</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.date_time DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.subject ASC">COM_MESSAGES_HEADING_SUBJECT_ASC</option>
+			<option value="a.subject DESC">COM_MESSAGES_HEADING_SUBJECT_DESC</option>
+			<option value="a.state ASC">COM_MESSAGES_HEADING_READ_ASC</option>
+			<option value="a.state DESC">COM_MESSAGES_HEADING_READ_DESC</option>
+			<option value="a.user_id_from ASC">COM_MESSAGES_HEADING_FROM_ASC</option>
+			<option value="a.user_id_from DESC">COM_MESSAGES_HEADING_FROM_DESC</option>
+			<option value="a.date_time ASC">JDATE_ASC</option>
+			<option value="a.date_time DESC">JDATE_DESC</option>
+		</field> 
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="5"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_messages/models/forms/message.xml b/core/administrator/components/com_messages/models/forms/message.xml
new file mode 100644
index 00000000..2d1054a7
--- /dev/null
+++ b/core/administrator/components/com_messages/models/forms/message.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="user_id_to"
+			type="usermessages"
+			label="COM_MESSAGES_FIELD_USER_ID_TO_LABEL"
+			description="COM_MESSAGES_FIELD_USER_ID_TO_DESC"
+			default="0"
+			required="true" 
+		/>
+
+		<field
+			name="subject"
+			type="text"
+			label="COM_MESSAGES_FIELD_SUBJECT_LABEL"
+			description="COM_MESSAGES_FIELD_SUBJECT_DESC"
+			required="true" 
+		/>
+
+		<field
+			name="message"
+			type="editor"
+			label="COM_MESSAGES_FIELD_MESSAGE_LABEL"
+			description="COM_MESSAGES_FIELD_MESSAGE_DESC"
+			required="true"
+			filter="JComponentHelper::filterText"
+			buttons="false" 
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_messages/models/message.php b/core/administrator/components/com_messages/models/message.php
new file mode 100644
index 00000000..5a19d851
--- /dev/null
+++ b/core/administrator/components/com_messages/models/message.php
@@ -0,0 +1,412 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Private Message model.
+ *
+ * @since  1.6
+ */
+class MessagesModelMessage extends JModelAdmin
+{
+	/**
+	 * Message
+	 */
+	protected $item;
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		parent::populateState();
+
+		$input = JFactory::getApplication()->input;
+
+		$user  = JFactory::getUser();
+		$this->setState('user.id', $user->get('id'));
+
+		$messageId = (int) $input->getInt('message_id');
+		$this->setState('message.id', $messageId);
+
+		$replyId = (int) $input->getInt('reply_id');
+		$this->setState('reply.id', $replyId);
+	}
+
+	/**
+	 * Check that recipient user is the one trying to delete and then call parent delete method
+	 *
+	 * @param   array  &$pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since  3.1
+	 */
+	public function delete(&$pks)
+	{
+		$pks   = (array) $pks;
+		$table = $this->getTable();
+		$user  = JFactory::getUser();
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($table->user_id_to != $user->id)
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+
+					try
+					{
+						JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING, 'jerror');
+					}
+					catch (RuntimeException $exception)
+					{
+						JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), 'warning');
+					}
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return parent::delete($pks);
+	}
+
+	/**
+	 * Returns a Table object, always creating it.
+	 *
+	 * @param   type    $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Message', $prefix = 'MessagesTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed    Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if (!isset($this->item))
+		{
+			if ($this->item = parent::getItem($pk))
+			{
+				// Prime required properties.
+				if (empty($this->item->message_id))
+				{
+					// Prepare data for a new record.
+					if ($replyId = $this->getState('reply.id'))
+					{
+						// If replying to a message, preload some data.
+						$db    = $this->getDbo();
+						$query = $db->getQuery(true)
+							->select($db->quoteName(array('subject', 'user_id_from')))
+							->from($db->quoteName('#__messages'))
+							->where($db->quoteName('message_id') . ' = ' . (int) $replyId);
+
+						try
+						{
+							$message = $db->setQuery($query)->loadObject();
+						}
+						catch (RuntimeException $e)
+						{
+							$this->setError($e->getMessage());
+
+							return false;
+						}
+
+						$this->item->set('user_id_to', $message->user_id_from);
+						$re = JText::_('COM_MESSAGES_RE');
+
+						if (stripos($message->subject, $re) !== 0)
+						{
+							$this->item->set('subject', $re . $message->subject);
+						}
+					}
+				}
+				elseif ($this->item->user_id_to != JFactory::getUser()->id)
+				{
+					$this->setError(JText::_('JERROR_ALERTNOAUTHOR'));
+
+					return false;
+				}
+				else
+				{
+					// Mark message read
+					$db    = $this->getDbo();
+					$query = $db->getQuery(true)
+						->update($db->quoteName('#__messages'))
+						->set($db->quoteName('state') . ' = 1')
+						->where($db->quoteName('message_id') . ' = ' . $this->item->message_id);
+					$db->setQuery($query)->execute();
+				}
+			}
+
+			// Get the user name for an existing messasge.
+			if ($this->item->user_id_from && $fromUser = new JUser($this->item->user_id_from))
+			{
+				$this->item->set('from_user_name', $fromUser->name);
+			}
+		}
+
+		return $this->item;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm   A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_messages.message', 'message', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_messages.edit.message.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_messages.message', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Checks that the current user matches the message recipient and calls the parent publish method
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		$user  = JFactory::getUser();
+		$table = $this->getTable();
+		$pks   = (array) $pks;
+
+		// Check that the recipient matches the current user
+		foreach ($pks as $i => $pk)
+		{
+			$table->reset();
+
+			if ($table->load($pk))
+			{
+				if ($table->user_id_to != $user->id)
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+
+					try
+					{
+						JLog::add(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), JLog::WARNING, 'jerror');
+					}
+					catch (RuntimeException $exception)
+					{
+						JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 'warning');
+					}
+
+					return false;
+				}
+			}
+		}
+
+		return parent::publish($pks, $value);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$table = $this->getTable();
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Assign empty values.
+		if (empty($table->user_id_from))
+		{
+			$table->user_id_from = JFactory::getUser()->get('id');
+		}
+
+		if ((int) $table->date_time == 0)
+		{
+			$table->date_time = JFactory::getDate()->toSql();
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Load the recipient user configuration.
+		$model  = JModelLegacy::getInstance('Config', 'MessagesModel', array('ignore_request' => true));
+		$model->setState('user.id', $table->user_id_to);
+		$config = $model->getItem();
+
+		if (empty($config))
+		{
+			$this->setError($model->getError());
+
+			return false;
+		}
+
+		if ($config->get('locked', false))
+		{
+			$this->setError(JText::_('COM_MESSAGES_ERR_SEND_FAILED'));
+
+			return false;
+		}
+
+		// Store the data.
+		if (!$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		if ($config->get('mail_on_new', true))
+		{
+			// Load the user details (already valid from table check).
+			$fromUser         = JUser::getInstance($table->user_id_from);
+			$toUser           = JUser::getInstance($table->user_id_to);
+			$debug            = JFactory::getConfig()->get('debug_lang');
+			$default_language = JComponentHelper::getParams('com_languages')->get('administrator');
+			$lang             = JLanguage::getInstance($toUser->getParam('admin_language', $default_language), $debug);
+			$lang->load('com_messages', JPATH_ADMINISTRATOR);
+
+			// Build the email subject and message
+			$sitename = JFactory::getApplication()->get('sitename');
+			$fromName = $fromUser->get('name');
+			$siteURL  = JUri::root() . 'administrator/index.php?option=com_messages&view=message&message_id=' . $table->message_id;
+			$subject  = html_entity_decode($table->subject, ENT_COMPAT, 'UTF-8');
+			$message  = strip_tags(html_entity_decode($table->message, ENT_COMPAT, 'UTF-8'));
+
+			$subj	  = sprintf($lang->_('COM_MESSAGES_NEW_MESSAGE'), $fromName, $sitename);
+			$msg 	  = $subject . "\n\n" . $message . "\n\n" . sprintf($lang->_('COM_MESSAGES_PLEASE_LOGIN'), $siteURL);
+
+			// Send the email
+			$mailer = JFactory::getMailer();
+
+			if (!$mailer->addReplyTo($fromUser->email, $fromUser->name))
+			{
+				try
+				{
+					JLog::add(JText::_('COM_MESSAGES_ERROR_COULD_NOT_SEND_INVALID_REPLYTO'), JLog::WARNING, 'jerror');
+				}
+				catch (RuntimeException $exception)
+				{
+					JFactory::getApplication()->enqueueMessage(JText::_('COM_MESSAGES_ERROR_COULD_NOT_SEND_INVALID_REPLYTO'), 'warning');
+				}
+
+				// The message is still saved in the database, we do not allow this failure to cause the entire save routine to fail
+				return true;
+			}
+
+			if (!$mailer->addRecipient($toUser->email, $toUser->name))
+			{
+				try
+				{
+					JLog::add(JText::_('COM_MESSAGES_ERROR_COULD_NOT_SEND_INVALID_RECIPIENT'), JLog::WARNING, 'jerror');
+				}
+				catch (RuntimeException $exception)
+				{
+					JFactory::getApplication()->enqueueMessage(JText::_('COM_MESSAGES_ERROR_COULD_NOT_SEND_INVALID_RECIPIENT'), 'warning');
+				}
+
+				// The message is still saved in the database, we do not allow this failure to cause the entire save routine to fail
+				return true;
+			}
+
+			$mailer->setSubject($subj);
+			$mailer->setBody($msg);
+
+			// The Send method will raise an error via JError on a failure, we do not need to check it ourselves here
+			$mailer->Send();
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_messages/models/messages.php b/core/administrator/components/com_messages/models/messages.php
new file mode 100644
index 00000000..f6c88e4b
--- /dev/null
+++ b/core/administrator/components/com_messages/models/messages.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Messages Component Messages Model
+ *
+ * @since  1.6
+ */
+class MessagesModelMessages extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'message_id', 'a.id',
+				'subject', 'a.subject',
+				'state', 'a.state',
+				'user_id_from', 'a.user_id_from',
+				'user_id_to', 'a.user_id_to',
+				'date_time', 'a.date_time',
+				'priority', 'a.priority',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.date_time', $direction = 'desc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string    A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*, ' .
+					'u.name AS user_from'
+			)
+		);
+		$query->from('#__messages AS a');
+
+		// Join over the users for message owner.
+		$query->join('INNER', '#__users AS u ON u.id = a.user_id_from')
+			->where('a.user_id_to = ' . (int) $user->get('id'));
+
+		// Filter by published state.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.state = ' . (int) $state);
+		}
+		elseif ($state !== '*')
+		{
+			$query->where('(a.state IN (0, 1))');
+		}
+
+		// Filter by search in subject or message.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where('a.subject LIKE ' . $search . ' OR a.message LIKE ' . $search);
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.date_time')) . ' ' . $db->escape($this->getState('list.direction', 'DESC')));
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_messages/tables/message.php b/core/administrator/components/com_messages/tables/message.php
new file mode 100644
index 00000000..f2b39226
--- /dev/null
+++ b/core/administrator/components/com_messages/tables/message.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Message Table class
+ *
+ * @since  1.5
+ */
+class MessagesTableMessage extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  &$db  Database connector object
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__messages', 'message_id', $db);
+	}
+
+	/**
+	 * Validation and filtering.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		// Check the to and from users.
+		$user = new JUser($this->user_id_from);
+
+		if (empty($user->id))
+		{
+			$this->setError(JText::_('COM_MESSAGES_ERROR_INVALID_FROM_USER'));
+
+			return false;
+		}
+
+		$user = new JUser($this->user_id_to);
+
+		if (empty($user->id))
+		{
+			$this->setError(JText::_('COM_MESSAGES_ERROR_INVALID_TO_USER'));
+
+			return false;
+		}
+
+		if (empty($this->subject))
+		{
+			$this->setError(JText::_('COM_MESSAGES_ERROR_INVALID_SUBJECT'));
+
+			return false;
+		}
+
+		if (empty($this->message))
+		{
+			$this->setError(JText::_('COM_MESSAGES_ERROR_INVALID_MESSAGE'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not
+	 *                            set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks = ArrayHelper::toInteger($pks);
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k . ' IN (' . implode(',', $pks) . ')';
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery(
+			'UPDATE ' . $this->_db->quoteName($this->_tbl)
+			. ' SET ' . $this->_db->quoteName('state') . ' = ' . (int) $state
+			. ' WHERE (' . $where . ')'
+		);
+
+		try
+		{
+			$this->_db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_messages/views/config/tmpl/default.php b/core/administrator/components/com_messages/views/config/tmpl/default.php
new file mode 100644
index 00000000..2d4347f3
--- /dev/null
+++ b/core/administrator/components/com_messages/views/config/tmpl/default.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+
+JFactory::getDocument()->addScriptDeclaration(
+	"
+		Joomla.submitbutton = function(task)
+		{
+			if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('config-form')))
+			{
+				Joomla.submitform(task, document.getElementById('config-form'));
+			}
+		};
+	"
+);
+?>
+<div class="container-popup">
+	<form action="<?php echo JRoute::_('index.php?option=com_messages&view=config'); ?>" method="post" name="adminForm" id="message-form" class="form-validate form-horizontal">
+		<fieldset>
+			<?php echo $this->form->renderField('lock'); ?>
+			<?php echo $this->form->renderField('mail_on_new'); ?>
+			<?php echo $this->form->renderField('auto_purge'); ?>
+		</fieldset>
+		<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitform('config.save', this.form);"></button>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/administrator/components/com_messages/views/config/view.html.php b/core/administrator/components/com_messages/views/config/view.html.php
new file mode 100644
index 00000000..3e2b9ec0
--- /dev/null
+++ b/core/administrator/components/com_messages/views/config/view.html.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit messages user configuration.
+ *
+ * @since  1.6
+ */
+class MessagesViewConfig extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Bind the record to the form.
+		$this->form->bind($this->item);
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_messages/views/message/tmpl/default.php b/core/administrator/components/com_messages/views/message/tmpl/default.php
new file mode 100644
index 00000000..6b3a8065
--- /dev/null
+++ b/core/administrator/components/com_messages/views/message/tmpl/default.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+JHtml::_('formbehavior.chosen', 'select');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+	<fieldset>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo JText::_('COM_MESSAGES_FIELD_USER_ID_FROM_LABEL'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->item->get('from_user_name'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo JText::_('COM_MESSAGES_FIELD_DATE_TIME_LABEL'); ?>
+			</div>
+			<div class="controls">
+				<?php echo JHtml::_('date', $this->item->date_time, JText::_('DATE_FORMAT_LC2')); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo JText::_('COM_MESSAGES_FIELD_SUBJECT_LABEL'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->item->subject; ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo JText::_('COM_MESSAGES_FIELD_MESSAGE_LABEL'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->item->message; ?>
+			</div>
+		</div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="reply_id" value="<?php echo $this->item->message_id; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_messages/views/message/tmpl/edit.php b/core/administrator/components/com_messages/views/message/tmpl/edit.php
new file mode 100644
index 00000000..73d5281f
--- /dev/null
+++ b/core/administrator/components/com_messages/views/message/tmpl/edit.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+
+JFactory::getDocument()->addScriptDeclaration("
+		Joomla.submitbutton = function(task)
+		{
+			if (task == 'message.cancel' || document.formvalidator.isValid(document.getElementById('message-form')))
+			{
+				Joomla.submitform(task, document.getElementById('message-form'));
+			}
+		};
+");
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form" class="form-validate form-horizontal">
+	<fieldset class="adminform">
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('user_id_to'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('user_id_to'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('subject'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('subject'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('message'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('message'); ?>
+			</div>
+		</div>
+	</fieldset>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_messages/views/message/view.html.php b/core/administrator/components/com_messages/views/message/view.html.php
new file mode 100644
index 00000000..6d3d2238
--- /dev/null
+++ b/core/administrator/components/com_messages/views/message/view.html.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Messages component
+ *
+ * @since  1.6
+ */
+class MessagesViewMessage extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		parent::display($tpl);
+		$this->addToolbar();
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		if ($this->getLayout() == 'edit')
+		{
+			JFactory::getApplication()->input->set('hidemainmenu', true);
+			JToolbarHelper::title(JText::_('COM_MESSAGES_WRITE_PRIVATE_MESSAGE'), 'envelope-opened new-privatemessage');
+			JToolbarHelper::save('message.save', 'COM_MESSAGES_TOOLBAR_SEND');
+			JToolbarHelper::cancel('message.cancel');
+			JToolbarHelper::help('JHELP_COMPONENTS_MESSAGING_WRITE');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_MESSAGES_VIEW_PRIVATE_MESSAGE'), 'envelope inbox');
+			$sender = JUser::getInstance($this->item->user_id_from);
+
+			if ($sender->authorise('core.admin') || $sender->authorise('core.manage', 'com_messages') && $sender->authorise('core.login.admin'))
+			{
+				JToolbarHelper::custom('message.reply', 'redo', null, 'COM_MESSAGES_TOOLBAR_REPLY', false);
+			}
+
+			JToolbarHelper::cancel('message.cancel');
+			JToolbarHelper::help('JHELP_COMPONENTS_MESSAGING_READ');
+		}
+	}
+}
diff --git a/core/administrator/components/com_messages/views/messages/tmpl/default.php b/core/administrator/components/com_messages/views/messages/tmpl/default.php
new file mode 100644
index 00000000..f497700b
--- /dev/null
+++ b/core/administrator/components/com_messages/views/messages/tmpl/default.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+JFactory::getDocument()->addStyleDeclaration(
+	'
+	@media (min-width: 768px) {
+		div.modal {
+			left: none;
+			width: 500px;
+			margin-left: -250px;
+		}
+	}
+	'
+);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_messages&view=messages'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"></div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th class="title nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MESSAGES_HEADING_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MESSAGES_HEADING_READ', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MESSAGES_HEADING_FROM', 'a.user_id_from', $listDirn, $listOrder); ?>
+						</th>
+						<th width="20%" class="nowrap hidden-tablet hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JDATE', 'a.date_time', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$canChange = $user->authorise('core.edit.state', 'com_messages');
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->message_id); ?>
+						</td>
+						<td>
+							<a href="<?php echo JRoute::_('index.php?option=com_messages&view=message&message_id=' . (int) $item->message_id); ?>">
+								<?php echo $this->escape($item->subject); ?></a>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('messages.status', $i, $item->state, $canChange); ?>
+						</td>
+						<td>
+							<?php echo $item->user_from; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo JHtml::_('date', $item->date_time, JText::_('DATE_FORMAT_LC2')); ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+		<div>
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</div>
+</form>
diff --git a/core/administrator/components/com_messages/views/messages/view.html.php b/core/administrator/components/com_messages/views/messages/view.html.php
new file mode 100644
index 00000000..93e8f972
--- /dev/null
+++ b/core/administrator/components/com_messages/views/messages/view.html.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of messages.
+ *
+ * @since  1.6
+ */
+class MessagesViewMessages extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_messages');
+		JToolbarHelper::title(JText::_('COM_MESSAGES_MANAGER_MESSAGES'), 'envelope inbox');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('message.add');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::publish('messages.publish', 'COM_MESSAGES_TOOLBAR_MARK_AS_READ', true);
+			JToolbarHelper::unpublish('messages.unpublish', 'COM_MESSAGES_TOOLBAR_MARK_AS_UNREAD', true);
+		}
+
+		JToolbarHelper::divider();
+		$bar = JToolBar::getInstance('toolbar');
+		$bar->appendButton(
+			'Popup',
+			'cog',
+			'COM_MESSAGES_TOOLBAR_MY_SETTINGS',
+			'index.php?option=com_messages&amp;view=config&amp;tmpl=component',
+			500,
+			250,
+			0,
+			0,
+			'',
+			'',
+			'<button class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
+			. JText::_('JCANCEL')
+			. '</button>'
+			. '<button class="btn btn-success" type="button" data-dismiss="modal" aria-hidden="true"'
+			. ' onclick="jQuery(\'#modal-cog iframe\').contents().find(\'#saveBtn\').click();">'
+			. JText::_('JSAVE')
+			. '</button>'
+		);
+
+		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'messages.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::trash('messages.trash');
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::preferences('com_messages');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_MESSAGING_INBOX');
+	}
+}
diff --git a/core/administrator/components/com_modules/access.xml b/core/administrator/components/com_modules/access.xml
new file mode 100644
index 00000000..6acf5f1e
--- /dev/null
+++ b/core/administrator/components/com_modules/access.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_modules">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="module.edit.frontend" title="COM_MODULES_ACTION_EDITFRONTEND" description="COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC" />
+	</section>
+	<section name="module">
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="module.edit.frontend" title="COM_MODULES_ACTION_EDITFRONTEND" description="COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC" />
+	</section>
+</access>
\ No newline at end of file
diff --git a/core/administrator/components/com_modules/config.xml b/core/administrator/components/com_modules/config.xml
new file mode 100644
index 00000000..3eb9b198
--- /dev/null
+++ b/core/administrator/components/com_modules/config.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="modules"
+		label="COM_MODULES_GENERAL"
+		description="COM_MODULES_GENERAL_FIELDSET_DESC"
+		>
+		<field
+			name="redirect_edit"
+			type="list"
+			class="advancedSelect"
+			default="site"
+			label="COM_MODULES_REDIRECT_EDIT_LABEL"
+			description="COM_MODULES_REDIRECT_EDIT_DESC"
+			>
+			<option value="admin">JADMINISTRATOR</option>
+			<option value="site">JSITE</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="admin_modules"
+		label="COM_MODULES_ADMIN_LANG_FILTER_FIELDSET_LABEL"
+		>
+		<field
+			name="adminlangfilter"
+			type="radio"
+			label="COM_MODULES_ADMIN_LANG_FILTER_LABEL"
+			description="COM_MODULES_ADMIN_LANG_FILTER_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_modules"
+			section="component"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_modules/controller.php b/core/administrator/components/com_modules/controller.php
new file mode 100644
index 00000000..daf39c1a
--- /dev/null
+++ b/core/administrator/components/com_modules/controller.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Modules manager master display controller.
+ *
+ * @since  1.6
+ */
+class ModulesController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean        $cachable   If true, the view output will be cached
+	 * @param   array|boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}
+	 *
+	 * @return  JController    This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$id     = $this->input->getInt('id');
+
+		$document = JFactory::getDocument();
+
+		// For JSON requests
+		if ($document->getType() == 'json')
+		{
+			$view = new ModulesViewModule;
+
+			// Get/Create the model
+			if ($model = new ModulesModelModule)
+			{
+				// Checkin table entry
+				if (!$model->checkout($id))
+				{
+					JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'), 'error');
+
+					return false;
+				}
+
+				// Push the model into the view (as default)
+				$view->setModel($model, true);
+			}
+
+			$view->document = $document;
+
+			return $view->display();
+		}
+
+		JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php');
+
+		$layout = $this->input->get('layout', 'edit');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($layout == 'edit' && !$this->checkEditId('com_modules.edit.module', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_modules&view=modules', false));
+
+			return false;
+		}
+
+		// Load the submenu.
+		ModulesHelper::addSubmenu($this->input->get('view', 'modules'));
+
+		// Check custom administrator menu modules
+		if (JModuleHelper::isAdminMultilang())
+		{
+			$languages = JLanguageHelper::getInstalledLanguages(1, true);
+			$langCodes = array();
+
+			foreach ($languages as $language)
+			{
+				if (isset($language->metadata['nativeName']))
+				{
+					$languageName = $language->metadata['nativeName'];
+				}
+				else
+				{
+					$languageName = $language->metadata['name'];
+				}
+
+				$langCodes[$language->metadata['tag']] = $languageName;
+			}
+
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			$query->select($db->qn('m.language'))
+				->from($db->qn('#__modules', 'm'))
+				->where($db->qn('m.module') . ' = ' . $db->quote('mod_menu'))
+				->where($db->qn('m.published') . ' = 1')
+				->where($db->qn('m.client_id') . ' = 1')
+				->group($db->qn('m.language'));
+
+			$mLanguages = $db->setQuery($query)->loadColumn();
+
+			// Check if we have a mod_menu module set to All languages or a mod_menu module for each admin language.
+			if (!in_array('*', $mLanguages) && count($langMissing = array_diff(array_keys($langCodes), $mLanguages)))
+			{
+				$app         = JFactory::getApplication();
+				$langMissing = array_intersect_key($langCodes, array_flip($langMissing));
+
+				$app->enqueueMessage(JText::sprintf('JMENU_MULTILANG_WARNING_MISSING_MODULES', implode(', ', $langMissing)), 'warning');
+			}
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_modules/controllers/module.php b/core/administrator/components/com_modules/controllers/module.php
new file mode 100644
index 00000000..0fd9b3a0
--- /dev/null
+++ b/core/administrator/components/com_modules/controllers/module.php
@@ -0,0 +1,310 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Module controller class.
+ *
+ * @since  1.6
+ */
+class ModulesControllerModule extends JControllerForm
+{
+	/**
+	 * Override parent add method.
+	 *
+	 * @return  mixed  True if the record can be added, a JError object if not.
+	 *
+	 * @since   1.6
+	 */
+	public function add()
+	{
+		$app = JFactory::getApplication();
+
+		// Get the result of the parent method. If an error, just return it.
+		$result = parent::add();
+
+		if ($result instanceof Exception)
+		{
+			return $result;
+		}
+
+		// Look for the Extension ID.
+		$extensionId = $app->input->get('eid', 0, 'int');
+
+		if (empty($extensionId))
+		{
+			$redirectUrl = 'index.php?option=' . $this->option . '&view=' . $this->view_item . '&layout=edit';
+
+			$this->setRedirect(JRoute::_($redirectUrl, false));
+
+			return JError::raiseWarning(500, JText::_('COM_MODULES_ERROR_INVALID_EXTENSION'));
+		}
+
+		$app->setUserState('com_modules.add.module.extension_id', $extensionId);
+		$app->setUserState('com_modules.add.module.params', null);
+
+		// Parameters could be coming in for a new item, so let's set them.
+		$params = $app->input->get('params', array(), 'array');
+		$app->setUserState('com_modules.add.module.params', $params);
+	}
+
+	/**
+	 * Override parent cancel method to reset the add module state.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = null)
+	{
+		$app = JFactory::getApplication();
+
+		$result = parent::cancel();
+
+		$app->setUserState('com_modules.add.module.extension_id', null);
+		$app->setUserState('com_modules.add.module.params', null);
+
+		return $result;
+	}
+
+	/**
+	 * Override parent allowSave method.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowSave($data, $key = 'id')
+	{
+		// Use custom position if selected
+		if (isset($data['custom_position']))
+		{
+			if (empty($data['position']))
+			{
+				$data['position'] = $data['custom_position'];
+			}
+
+			unset($data['custom_position']);
+		}
+
+		return parent::allowSave($data, $key);
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Initialise variables.
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user = JFactory::getUser();
+
+		// Zero record (id:0), return component edit permission by calling parent controller method
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Check edit on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit', 'com_modules.module.' . $recordId))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   string  $model  The model
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.7
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Module', '', array());
+
+		// Preset the redirect
+		$redirectUrl = 'index.php?option=com_modules&view=modules' . $this->getRedirectToListAppend();
+
+		$this->setRedirect(JRoute::_($redirectUrl, false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		$app = JFactory::getApplication();
+		$task = $this->getTask();
+
+		switch ($task)
+		{
+			case 'save2new':
+				$app->setUserState('com_modules.add.module.extension_id', $model->getState('module.extension_id'));
+				break;
+
+			default:
+				$app->setUserState('com_modules.add.module.extension_id', null);
+				break;
+		}
+
+		$app->setUserState('com_modules.add.module.params', null);
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		if (!JSession::checkToken())
+		{
+			JFactory::getApplication()->redirect('index.php', JText::_('JINVALID_TOKEN'));
+		}
+
+		if (JFactory::getDocument()->getType() == 'json')
+		{
+			$model = $this->getModel();
+			$data  = $this->input->post->get('jform', array(), 'array');
+			$item = $model->getItem($this->input->get('id'));
+			$properties = $item->getProperties();
+
+			if (isset($data['params']))
+			{
+				unset($properties['params']);
+			}
+
+			// Replace changed properties
+			$data = array_replace_recursive($properties, $data);
+
+			if (!empty($data['assigned']))
+			{
+				$data['assigned'] = array_map('abs', $data['assigned']);
+			}
+
+			// Add new data to input before process by parent save()
+			$this->input->post->set('jform', $data);
+
+			// Add path of forms directory
+			JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/com_modules/models/forms');
+		}
+
+		parent::save($key, $urlVar);
+
+	}
+
+	/**
+	 * Method to get the other modules in the same position
+	 *
+	 * @return  string  The data for the Ajax request.
+	 *
+	 * @since   3.6.3
+	 */
+	public function orderPosition()
+	{
+		$app = JFactory::getApplication();
+
+		// Send json mime type.
+		$app->mimeType = 'application/json';
+		$app->setHeader('Content-Type', $app->mimeType . '; charset=' . $app->charSet);
+		$app->sendHeaders();
+
+		// Check if user token is valid.
+		if (!JSession::checkToken('get'))
+		{
+			$app->enqueueMessage(JText::_('JINVALID_TOKEN'), 'error');
+			echo new JResponseJson;
+			$app->close();
+		}
+
+		$jinput   = $app->input;
+		$clientId = $jinput->getValue('client_id');
+		$position = $jinput->getValue('position');
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('position, ordering, title')
+			->from('#__modules')
+			->where('client_id = ' . (int) $clientId . ' AND position = ' . $db->q($position))
+			->order('ordering');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$orders = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return '';
+		}
+
+		$orders2 = array();
+		$n = count($orders);
+
+		if ($n > 0)
+		{
+			for ($i = 0, $n; $i < $n; $i++)
+			{
+				if (!isset($orders2[$orders[$i]->position]))
+				{
+					$orders2[$orders[$i]->position] = 0;
+				}
+
+				$orders2[$orders[$i]->position]++;
+				$ord = $orders2[$orders[$i]->position];
+				$title = JText::sprintf('COM_MODULES_OPTION_ORDER_POSITION', $ord, htmlspecialchars($orders[$i]->title, ENT_QUOTES, 'UTF-8'));
+
+				$html[] = $orders[$i]->position . ',' . $ord . ',' . $title;
+			}
+		}
+		else
+		{
+			$html[] = $position . ',' . 1 . ',' . JText::_('JNONE');
+		}
+
+		echo new JResponseJson($html);
+		$app->close();
+	}
+}
diff --git a/core/administrator/components/com_modules/controllers/modules.php b/core/administrator/components/com_modules/controllers/modules.php
new file mode 100644
index 00000000..7025c7f6
--- /dev/null
+++ b/core/administrator/components/com_modules/controllers/modules.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Modules list controller class.
+ *
+ * @since  1.6
+ */
+class ModulesControllerModules extends JControllerAdmin
+{
+	/**
+	 * Method to clone an existing module.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function duplicate()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$pks = $this->input->post->get('cid', array(), 'array');
+		$pks = ArrayHelper::toInteger($pks);
+
+		try
+		{
+			if (empty($pks))
+			{
+				throw new Exception(JText::_('COM_MODULES_ERROR_NO_MODULES_SELECTED'));
+			}
+
+			$model = $this->getModel();
+			$model->duplicate($pks);
+			$this->setMessage(JText::plural('COM_MODULES_N_MODULES_DUPLICATED', count($pks)));
+		}
+		catch (Exception $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		$this->setRedirect('index.php?option=com_modules&view=modules');
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Module', $prefix = 'ModulesModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_modules/helpers/html/modules.php b/core/administrator/components/com_modules/helpers/html/modules.php
new file mode 100644
index 00000000..39f6c18c
--- /dev/null
+++ b/core/administrator/components/com_modules/helpers/html/modules.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * JHtml module helper class.
+ *
+ * @since  1.6
+ */
+abstract class JHtmlModules
+{
+	/**
+	 * Builds an array of template options
+	 *
+	 * @param   integer  $clientId  The client id.
+	 * @param   string   $state     The state of the template.
+	 *
+	 * @return  array
+	 */
+	public static function templates($clientId = 0, $state = '')
+	{
+		$options   = array();
+		$templates = ModulesHelper::getTemplates($clientId, $state);
+
+		foreach ($templates as $template)
+		{
+			$options[] = JHtml::_('select.option', $template->element, $template->name);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Builds an array of template type options
+	 *
+	 * @return  array
+	 */
+	public static function types()
+	{
+		$options = array();
+		$options[] = JHtml::_('select.option', 'user', 'COM_MODULES_OPTION_POSITION_USER_DEFINED');
+		$options[] = JHtml::_('select.option', 'template', 'COM_MODULES_OPTION_POSITION_TEMPLATE_DEFINED');
+
+		return $options;
+	}
+
+	/**
+	 * Builds an array of template state options
+	 *
+	 * @return  array
+	 */
+	public static function templateStates()
+	{
+		$options = array();
+		$options[] = JHtml::_('select.option', '1', 'JENABLED');
+		$options[] = JHtml::_('select.option', '0', 'JDISABLED');
+
+		return $options;
+	}
+
+	/**
+	 * Returns a published state on a grid
+	 *
+	 * @param   integer  $value     The state value.
+	 * @param   integer  $i         The row index
+	 * @param   boolean  $enabled   An optional setting for access control on the action.
+	 * @param   string   $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string        The Html code
+	 *
+	 * @see     JHtmlJGrid::state
+	 * @since   1.7.1
+	 */
+	public static function state($value, $i, $enabled = true, $checkbox = 'cb')
+	{
+		$states = array(
+			1  => array(
+				'unpublish',
+				'COM_MODULES_EXTENSION_PUBLISHED_ENABLED',
+				'COM_MODULES_HTML_UNPUBLISH_ENABLED',
+				'COM_MODULES_EXTENSION_PUBLISHED_ENABLED',
+				true,
+				'publish',
+				'publish',
+			),
+			0  => array(
+				'publish',
+				'COM_MODULES_EXTENSION_UNPUBLISHED_ENABLED',
+				'COM_MODULES_HTML_PUBLISH_ENABLED',
+				'COM_MODULES_EXTENSION_UNPUBLISHED_ENABLED',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+			-1 => array(
+				'unpublish',
+				'COM_MODULES_EXTENSION_PUBLISHED_DISABLED',
+				'COM_MODULES_HTML_UNPUBLISH_DISABLED',
+				'COM_MODULES_EXTENSION_PUBLISHED_DISABLED',
+				true,
+				'warning',
+				'warning',
+			),
+			-2 => array(
+				'publish',
+				'COM_MODULES_EXTENSION_UNPUBLISHED_DISABLED',
+				'COM_MODULES_HTML_PUBLISH_DISABLED',
+				'COM_MODULES_EXTENSION_UNPUBLISHED_DISABLED',
+				true,
+				'unpublish',
+				'unpublish',
+			),
+		);
+
+		return JHtml::_('jgrid.state', $states, $value, $i, 'modules.', $enabled, true, $checkbox);
+	}
+
+	/**
+	 * Display a batch widget for the module position selector.
+	 *
+	 * @param   integer  $clientId          The client ID.
+	 * @param   integer  $state             The state of the module (enabled, unenabled, trashed).
+	 * @param   string   $selectedPosition  The currently selected position for the module.
+	 *
+	 * @return  string   The necessary positions for the widget.
+	 *
+	 * @since   2.5
+	 */
+	public static function positions($clientId, $state = 1, $selectedPosition = '')
+	{
+		JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php');
+
+		$templates      = array_keys(ModulesHelper::getTemplates($clientId, $state));
+		$templateGroups = array();
+
+		// Add an empty value to be able to deselect a module position
+		$option = ModulesHelper::createOption();
+		$templateGroups[''] = ModulesHelper::createOptionGroup('', array($option));
+
+		// Add positions from templates
+		$isTemplatePosition = false;
+
+		foreach ($templates as $template)
+		{
+			$options = array();
+
+			$positions = TemplatesHelper::getPositions($clientId, $template);
+
+			if (is_array($positions))
+			{
+				foreach ($positions as $position)
+				{
+					$text = ModulesHelper::getTranslatedModulePosition($clientId, $template, $position) . ' [' . $position . ']';
+					$options[] = ModulesHelper::createOption($position, $text);
+
+					if (!$isTemplatePosition && $selectedPosition === $position)
+					{
+						$isTemplatePosition = true;
+					}
+				}
+
+				$options = ArrayHelper::sortObjects($options, 'text');
+			}
+
+			$templateGroups[$template] = ModulesHelper::createOptionGroup(ucfirst($template), $options);
+		}
+
+		// Add custom position to options
+		$customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION');
+
+		$editPositions = true;
+		$customPositions = ModulesHelper::getPositions($clientId, $editPositions);
+		$templateGroups[$customGroupText] = ModulesHelper::createOptionGroup($customGroupText, $customPositions);
+
+		return $templateGroups;
+	}
+
+	/**
+	 * Get a select with the batch action options
+	 *
+	 * @return  void
+	 */
+	public static function batchOptions()
+	{
+		// Create the copy/move options.
+		$options = array(
+			JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
+			JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
+		);
+
+		echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm');
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @param   integer  $clientId  The client ID
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   2.5
+	 */
+	public static function positionList($clientId = 0)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT(position) as value')
+			->select('position as text')
+			->from($db->quoteName('#__modules'))
+			->where($db->quoteName('client_id') . ' = ' . (int) $clientId)
+			->order('position');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		// Pop the first item off the array if it's blank
+		if (count($options))
+		{
+			if (strlen($options[0]->text) < 1)
+			{
+				array_shift($options);
+			}
+		}
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_modules/helpers/modules.php b/core/administrator/components/com_modules/helpers/modules.php
new file mode 100644
index 00000000..5bbe4a44
--- /dev/null
+++ b/core/administrator/components/com_modules/helpers/modules.php
@@ -0,0 +1,359 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Modules component helper.
+ *
+ * @since  1.6
+ */
+abstract class ModulesHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 */
+	public static function addSubmenu($vName)
+	{
+		// Not used in this component.
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @param   integer  $moduleId  The module ID.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions($moduleId = 0)
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		if (empty($moduleId))
+		{
+			$result = JHelperContent::getActions('com_modules');
+		}
+		else
+		{
+			$result = JHelperContent::getActions('com_modules', 'module', $moduleId);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get a list of filter options for the state of a module.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 */
+	public static function getStateOptions()
+	{
+		// Build the filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '1', JText::_('JPUBLISHED'));
+		$options[] = JHtml::_('select.option', '0', JText::_('JUNPUBLISHED'));
+		$options[] = JHtml::_('select.option', '-2', JText::_('JTRASHED'));
+		$options[] = JHtml::_('select.option', '*', JText::_('JALL'));
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of filter options for the application clients.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 */
+	public static function getClientOptions()
+	{
+		// Build the filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of modules positions
+	 *
+	 * @param   integer  $clientId       Client ID
+	 * @param   boolean  $editPositions  Allow to edit the positions
+	 *
+	 * @return  array  A list of positions
+	 */
+	public static function getPositions($clientId, $editPositions = false)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT(position)')
+			->from('#__modules')
+			->where($db->quoteName('client_id') . ' = ' . (int) $clientId)
+			->order('position');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$positions = $db->loadColumn();
+			$positions = is_array($positions) ? $positions : array();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return;
+		}
+
+		// Build the list
+		$options = array();
+
+		foreach ($positions as $position)
+		{
+			if (!$position && !$editPositions)
+			{
+				$options[] = JHtml::_('select.option', 'none', JText::_('COM_MODULES_NONE'));
+			}
+			else
+			{
+				$options[] = JHtml::_('select.option', $position, $position);
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Return a list of templates
+	 *
+	 * @param   integer  $clientId  Client ID
+	 * @param   string   $state     State
+	 * @param   string   $template  Template name
+	 *
+	 * @return  array  List of templates
+	 */
+	public static function getTemplates($clientId = 0, $state = '', $template = '')
+	{
+		$db = JFactory::getDbo();
+
+		// Get the database object and a new query object.
+		$query = $db->getQuery(true);
+
+		// Build the query.
+		$query->select('element, name, enabled')
+			->from('#__extensions')
+			->where('client_id = ' . (int) $clientId)
+			->where('type = ' . $db->quote('template'));
+
+		if ($state != '')
+		{
+			$query->where('enabled = ' . $db->quote($state));
+		}
+
+		if ($template != '')
+		{
+			$query->where('element = ' . $db->quote($template));
+		}
+
+		// Set the query and load the templates.
+		$db->setQuery($query);
+		$templates = $db->loadObjectList('element');
+
+		return $templates;
+	}
+
+	/**
+	 * Get a list of the unique modules installed in the client application.
+	 *
+	 * @param   int  $clientId  The client id.
+	 *
+	 * @return  array  Array of unique modules
+	 */
+	public static function getModules($clientId)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('element AS value, name AS text')
+			->from('#__extensions as e')
+			->where('e.client_id = ' . (int) $clientId)
+			->where('type = ' . $db->quote('module'))
+			->join('LEFT', '#__modules as m ON m.module=e.element AND m.client_id=e.client_id')
+			->where('m.module IS NOT NULL')
+			->group('element,name');
+
+		$db->setQuery($query);
+		$modules = $db->loadObjectList();
+		$lang = JFactory::getLanguage();
+
+		foreach ($modules as $i => $module)
+		{
+			$extension = $module->value;
+			$path = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
+			$source = $path . "/modules/$extension";
+				$lang->load("$extension.sys", $path, null, false, true)
+			||	$lang->load("$extension.sys", $source, null, false, true);
+			$modules[$i]->text = JText::_($module->text);
+		}
+
+		$modules = ArrayHelper::sortObjects($modules, 'text', 1, true, true);
+
+		return $modules;
+	}
+
+	/**
+	 * Get a list of the assignment options for modules to menus.
+	 *
+	 * @param   int  $clientId  The client id.
+	 *
+	 * @return  array
+	 */
+	public static function getAssignmentOptions($clientId)
+	{
+		$options = array();
+		$options[] = JHtml::_('select.option', '0', 'COM_MODULES_OPTION_MENU_ALL');
+		$options[] = JHtml::_('select.option', '-', 'COM_MODULES_OPTION_MENU_NONE');
+
+		if ($clientId == 0)
+		{
+			$options[] = JHtml::_('select.option', '1', 'COM_MODULES_OPTION_MENU_INCLUDE');
+			$options[] = JHtml::_('select.option', '-1', 'COM_MODULES_OPTION_MENU_EXCLUDE');
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Return a translated module position name
+	 *
+	 * @param   integer  $clientId  Application client id 0: site | 1: admin
+	 * @param   string   $template  Template name
+	 * @param   string   $position  Position name
+	 *
+	 * @return  string  Return a translated position name
+	 *
+	 * @since   3.0
+	 */
+	public static function getTranslatedModulePosition($clientId, $template, $position)
+	{
+		// Template translation
+		$lang = JFactory::getLanguage();
+		$path = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+		$loaded = $lang->getPaths('tpl_' . $template . '.sys');
+
+		// Only load the template's language file if it hasn't been already
+		if (!$loaded)
+		{
+			$lang->load('tpl_' . $template . '.sys', $path, null, false, false)
+			||	$lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, null, false, false)
+			||	$lang->load('tpl_' . $template . '.sys', $path, $lang->getDefault(), false, false)
+			||	$lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, $lang->getDefault(), false, false);
+		}
+
+		$langKey = strtoupper('TPL_' . $template . '_POSITION_' . $position);
+		$text = JText::_($langKey);
+
+		// Avoid untranslated strings
+		if (!self::isTranslatedText($langKey, $text))
+		{
+			// Modules component translation
+			$langKey = strtoupper('COM_MODULES_POSITION_' . $position);
+			$text = JText::_($langKey);
+
+			// Avoid untranslated strings
+			if (!self::isTranslatedText($langKey, $text))
+			{
+				// Try to humanize the position name
+				$text = ucfirst(preg_replace('/^' . $template . '\-/', '', $position));
+				$text = ucwords(str_replace(array('-', '_'), ' ', $text));
+			}
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Check if the string was translated
+	 *
+	 * @param   string  $langKey  Language file text key
+	 * @param   string  $text     The "translated" text to be checked
+	 *
+	 * @return  boolean  Return true for translated text
+	 *
+	 * @since   3.0
+	 */
+	public static function isTranslatedText($langKey, $text)
+	{
+		return $text !== $langKey;
+	}
+
+	/**
+	 * Create and return a new Option
+	 *
+	 * @param   string  $value  The option value [optional]
+	 * @param   string  $text   The option text [optional]
+	 *
+	 * @return  object  The option as an object (stdClass instance)
+	 *
+	 * @since   3.0
+	 */
+	public static function createOption($value = '', $text = '')
+	{
+		if (empty($text))
+		{
+			$text = $value;
+		}
+
+		$option = new stdClass;
+		$option->value = $value;
+		$option->text  = $text;
+
+		return $option;
+	}
+
+	/**
+	 * Create and return a new Option Group
+	 *
+	 * @param   string  $label    Value and label for group [optional]
+	 * @param   array   $options  Array of options to insert into group [optional]
+	 *
+	 * @return  array  Return the new group as an array
+	 *
+	 * @since   3.0
+	 */
+	public static function createOptionGroup($label = '', $options = array())
+	{
+		$group = array();
+		$group['value'] = $label;
+		$group['text']  = $label;
+		$group['items'] = $options;
+
+		return $group;
+	}
+}
diff --git a/core/administrator/components/com_modules/helpers/xml.php b/core/administrator/components/com_modules/helpers/xml.php
new file mode 100644
index 00000000..1272caed
--- /dev/null
+++ b/core/administrator/components/com_modules/helpers/xml.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+try
+{
+	JLog::add('ModulesHelperXML is deprecated. Do not use.', JLog::WARNING, 'deprecated');
+}
+catch (RuntimeException $exception)
+{
+	// Informational log only
+}
+
+/**
+ * Helper for parse XML module files
+ *
+ * @since       1.5
+ * @deprecated  3.2  Do not use.
+ */
+class ModulesHelperXML
+{
+	/**
+	 * Parse the module XML file
+	 *
+	 * @param   array  &$rows  XML rows
+	 *
+	 * @return  void
+	 *
+	 * @since       1.5
+	 *
+	 * @deprecated  3.2  Do not use.
+	 */
+	public function parseXMLModuleFile(&$rows)
+	{
+		foreach ($rows as $i => $row)
+		{
+			if ($row->module == '')
+			{
+				$rows[$i]->name    = 'custom';
+				$rows[$i]->module  = 'custom';
+				$rows[$i]->descrip = 'Custom created module, using Module Manager New function';
+			}
+			else
+			{
+				$data = JInstaller::parseXMLInstallFile($row->path . '/' . $row->file);
+
+				if ($data['type'] == 'module')
+				{
+					$rows[$i]->name    = $data['name'];
+					$rows[$i]->descrip = $data['description'];
+				}
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/core/administrator/components/com_modules/layouts/toolbar/cancelselect.php
new file mode 100644
index 00000000..e7f6e4d5
--- /dev/null
+++ b/core/administrator/components/com_modules/layouts/toolbar/cancelselect.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$text = JText::_('JTOOLBAR_CANCEL');
+?>
+<button onclick="location.href='index.php?option=com_modules'" class="btn" title="<?php echo $text; ?>">
+	<span class="icon-remove" aria-hidden="true"></span> <?php echo $text; ?>
+</button>
diff --git a/core/administrator/components/com_modules/layouts/toolbar/newmodule.php b/core/administrator/components/com_modules/layouts/toolbar/newmodule.php
new file mode 100644
index 00000000..2f10cf9a
--- /dev/null
+++ b/core/administrator/components/com_modules/layouts/toolbar/newmodule.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$text = JText::_('JTOOLBAR_NEW');
+?>
+<button onclick="location.href='index.php?option=com_modules&amp;view=select'" class="btn btn-small btn-success" title="<?php echo $text; ?>">
+	<span class="icon-plus icon-white" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/administrator/components/com_modules/models/fields/modulesmodule.php b/core/administrator/components/com_modules/models/fields/modulesmodule.php
new file mode 100644
index 00000000..362228e3
--- /dev/null
+++ b/core/administrator/components/com_modules/models/fields/modulesmodule.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Modules Module field.
+ *
+ * @since  3.4.2
+ */
+class JFormFieldModulesModule extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.4.2
+	 */
+	protected $type = 'ModulesModule';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.4.2
+	 */
+	public function getOptions()
+	{
+		$clientId = JFactory::getApplication()->input->get('client_id', 0, 'int');
+		$options  = ModulesHelper::getModules($clientId);
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_modules/models/fields/modulesposition.php b/core/administrator/components/com_modules/models/fields/modulesposition.php
new file mode 100644
index 00000000..ca8ba9e2
--- /dev/null
+++ b/core/administrator/components/com_modules/models/fields/modulesposition.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('ModulesHelper', JPATH_ADMINISTRATOR . '/components/com_modules/helpers/modules.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Modules Position field.
+ *
+ * @since  3.4.2
+ */
+class JFormFieldModulesPosition extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.4.2
+	 */
+	protected $type = 'ModulesPosition';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.4.2
+	 */
+	public function getOptions()
+	{
+		$clientId = JFactory::getApplication()->input->get('client_id', 0, 'int');
+		$options  = ModulesHelper::getPositions($clientId);
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_modules/models/forms/advanced.xml b/core/administrator/components/com_modules/models/forms/advanced.xml
new file mode 100644
index 00000000..3914d565
--- /dev/null
+++ b/core/administrator/components/com_modules/models/forms/advanced.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset
+			name="advanced">
+
+			<field
+				name="module_tag"
+				type="moduletag"
+				label="COM_MODULES_FIELD_MODULE_TAG_LABEL"
+				description="COM_MODULES_FIELD_MODULE_TAG_DESC"
+				default="div"
+			/>
+
+			<field
+				name="bootstrap_size"
+				type="integer"
+				label="COM_MODULES_FIELD_BOOTSTRAP_SIZE_LABEL"
+				description="COM_MODULES_FIELD_BOOTSTRAP_SIZE_DESC"
+				first="0"
+				last="12"
+				step="1"
+			/>
+
+			<field
+				name="header_tag"
+				type="headertag"
+				label="COM_MODULES_FIELD_HEADER_TAG_LABEL"
+				description="COM_MODULES_FIELD_HEADER_TAG_DESC"
+				default="h3"
+			/>
+
+			<field
+				name="header_class"
+				type="text"
+				label="COM_MODULES_FIELD_HEADER_CLASS_LABEL"
+				description="COM_MODULES_FIELD_HEADER_CLASS_DESC"
+			/>
+
+			<field
+				name="style"
+				type="chromestyle"
+				label="COM_MODULES_FIELD_MODULE_STYLE_LABEL"
+				description="COM_MODULES_FIELD_MODULE_STYLE_DESC"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_modules/models/forms/filter_modules.xml b/core/administrator/components/com_modules/models/forms/filter_modules.xml
new file mode 100644
index 00000000..4728b3d4
--- /dev/null
+++ b/core/administrator/components/com_modules/models/forms/filter_modules.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_modules/models/fields" />
+
+	<field
+		name="client_id"
+		type="list"
+		label=""
+		filtermode="selector"
+		layout="default"
+		onchange="jQuery('#filter_position, #filter_module, #filter_language, #filter_menuitem').val('');this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MODULES_MODULES_FILTER_SEARCH_LABEL"
+			description="COM_MODULES_MODULES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_MODULES_MSG_MANAGE_NO_MODULES"
+		/>
+		<field
+			name="state"
+			type="status"
+			label="JSTATUS"
+			filter="*,-2,0,1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="position"
+			type="modulesposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_POSITION</option>
+		</field>
+		<field
+			name="module"
+			type="ModulesModule"
+			label="COM_MODULES_OPTION_SELECT_MODULE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_MODULE</option>
+		</field>
+		<field
+			name="menuitem"
+			type="menuitem"
+			label="COM_MODULES_OPTION_SELECT_MENU_ITEM"
+			disable="separator,alias,heading,url"
+			onchange="this.form.submit();"
+			>
+			<option	value="">COM_MODULES_OPTION_SELECT_MENU_ITEM</option>
+			<option	value="-1">COM_MODULES_NONE</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,-2"
+			onchange="this.form.submit();"
+			default="a.position ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.position ASC">COM_MODULES_HEADING_POSITION_ASC</option>
+			<option value="a.position DESC">COM_MODULES_HEADING_POSITION_DESC</option>
+			<option value="name ASC">COM_MODULES_HEADING_MODULE_ASC</option>
+			<option value="name DESC">COM_MODULES_HEADING_MODULE_DESC</option>
+			<option value="pages ASC">COM_MODULES_HEADING_PAGES_ASC</option>
+			<option value="pages DESC">COM_MODULES_HEADING_PAGES_DESC</option>
+			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="l.title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="l.title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_MODULES_LIST_LIMIT"
+			description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_modules/models/forms/filter_modulesadmin.xml b/core/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
new file mode 100644
index 00000000..3f1eb377
--- /dev/null
+++ b/core/administrator/components/com_modules/models/forms/filter_modulesadmin.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_modules/models/fields" />
+
+	<field
+		name="client_id"
+		type="list"
+		label=""
+		filtermode="selector"
+		layout="default"
+		onchange="jQuery('#filter_position, #filter_module, #filter_language').val('');this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MODULES_MODULES_FILTER_SEARCH_LABEL"
+			description="COM_MODULES_MODULES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_MODULES_MSG_MANAGE_NO_MODULES"
+		/>
+		<field
+			name="state"
+			type="status"
+			label="JSTATUS"
+			filter="*,-2,0,1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="position"
+			type="modulesposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_POSITION</option>
+		</field>
+		<field
+			name="module"
+			type="ModulesModule"
+			label="COM_MODULES_OPTION_SELECT_MODULE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_MODULE</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+		<field
+			name="language"
+			type="language"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			client="administrator"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,-2"
+			onchange="this.form.submit();"
+			default="a.position ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.position ASC">COM_MODULES_HEADING_POSITION_ASC</option>
+			<option value="a.position DESC">COM_MODULES_HEADING_POSITION_DESC</option>
+			<option value="name ASC">COM_MODULES_HEADING_MODULE_ASC</option>
+			<option value="name DESC">COM_MODULES_HEADING_MODULE_DESC</option>
+			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.language ASC" requires="adminlanguage">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC" requires="adminlanguage">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_MODULES_LIST_LIMIT"
+			description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_modules/models/forms/module.xml b/core/administrator/components/com_modules/models/forms/module.xml
new file mode 100644
index 00000000..ea43b185
--- /dev/null
+++ b/core/administrator/components/com_modules/models/forms/module.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="id" 
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			readonly="true"
+		/>
+
+		<field 
+			name="title" 
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="COM_MODULES_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			maxlength="100"
+			required="true"
+		/>
+
+		<field 
+			name="note" 
+			type="text"
+			label="COM_MODULES_FIELD_NOTE_LABEL"
+			description="COM_MODULES_FIELD_NOTE_DESC"
+			maxlength="255"
+			size="40"
+			class="span12"
+		/>
+
+		<field 
+			name="module" 
+			type="hidden"
+			label="COM_MODULES_FIELD_MODULE_LABEL"
+			description="COM_MODULES_FIELD_MODULE_DESC"
+			readonly="readonly"
+			size="20"
+		/>
+
+		<field 
+			name="showtitle" 
+			type="radio"
+			label="COM_MODULES_FIELD_SHOWTITLE_LABEL"
+			description="COM_MODULES_FIELD_SHOWTITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			size="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="published" 
+			type="list"
+			label="JSTATUS"
+			description="COM_MODULES_FIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			default="1"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="COM_MODULES_FIELD_PUBLISH_UP_LABEL"
+			description="COM_MODULES_FIELD_PUBLISH_UP_DESC"
+			filter="user_utc"
+			translateformat="true"
+			showtime="true"
+			size="22"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="COM_MODULES_FIELD_PUBLISH_DOWN_LABEL"
+			description="COM_MODULES_FIELD_PUBLISH_DOWN_DESC"
+			filter="user_utc"
+			translateformat="true"
+			showtime="true"
+			size="22"
+		/>
+
+		<field 
+			name="client_id" 
+			type="hidden"
+			label="COM_MODULES_FIELD_CLIENT_ID_LABEL"
+			description="COM_MODULES_FIELD_CLIENT_ID_DESC"
+			readonly="true"
+			size="1"
+		/>
+
+		<field 
+			name="position" 
+			type="moduleposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			description="COM_MODULES_FIELD_POSITION_DESC"
+			default=""
+			maxlength="50"
+		/>
+
+		<field 
+			name="access" 
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+
+		<field 
+			name="ordering" 
+			type="moduleorder"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			linked="position"
+		/>
+
+		<field 
+			name="content" 
+			type="editor"
+			label="COM_MODULES_FIELD_CONTENT_LABEL"
+			description="COM_MODULES_FIELD_CONTENT_DESC"
+			buttons="true"
+			filter="JComponentHelper::filterText"
+			hide="readmore,pagebreak,module"
+		/>
+
+		<field 
+			name="language" 
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_MODULE_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field 
+			name="assignment" 
+			type="hidden"
+		/>
+
+		<field 
+			name="assigned" 
+			type="hidden"
+		/>
+
+		<field 
+			name="asset_id" 
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field 
+			name="rules" 
+			type="rules"
+			label="JFIELD_RULES_LABEL"
+			translate_label="false"
+			filter="rules"
+			component="com_modules"
+			section="module"
+			validate="rules"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_modules/models/forms/moduleadmin.xml b/core/administrator/components/com_modules/models/forms/moduleadmin.xml
new file mode 100644
index 00000000..5766d1ca
--- /dev/null
+++ b/core/administrator/components/com_modules/models/forms/moduleadmin.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="id" 
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			readonly="true"
+		/>
+
+		<field 
+			name="title" 
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="COM_MODULES_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			maxlength="100"
+			required="true"
+		/>
+
+		<field 
+			name="note" 
+			type="text"
+			label="COM_MODULES_FIELD_NOTE_LABEL"
+			description="COM_MODULES_FIELD_NOTE_DESC"
+			maxlength="255"
+			size="40"
+			class="span12"
+		/>
+
+		<field 
+			name="module" 
+			type="hidden"
+			label="COM_MODULES_FIELD_MODULE_LABEL"
+			description="COM_MODULES_FIELD_MODULE_DESC"
+			readonly="readonly"
+			size="20"
+		/>
+
+		<field 
+			name="showtitle" 
+			type="radio"
+			label="COM_MODULES_FIELD_SHOWTITLE_LABEL"
+			description="COM_MODULES_FIELD_SHOWTITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			size="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="published" 
+			type="list"
+			label="JSTATUS"
+			description="COM_MODULES_FIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			default="1"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="COM_MODULES_FIELD_PUBLISH_UP_LABEL"
+			description="COM_MODULES_FIELD_PUBLISH_UP_DESC"
+			filter="user_utc"
+			translateformat="true"
+			showtime="true"
+			size="22"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="COM_MODULES_FIELD_PUBLISH_DOWN_LABEL"
+			description="COM_MODULES_FIELD_PUBLISH_DOWN_DESC"
+			filter="user_utc"
+			translateformat="true"
+			showtime="true"
+			size="22"
+		/>
+
+		<field 
+			name="client_id" 
+			type="hidden"
+			label="COM_MODULES_FIELD_CLIENT_ID_LABEL"
+			description="COM_MODULES_FIELD_CLIENT_ID_DESC"
+			readonly="true"
+			size="1"
+		/>
+
+		<field 
+			name="position" 
+			type="moduleposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			description="COM_MODULES_FIELD_POSITION_DESC"
+			default=""
+			maxlength="50"
+		/>
+
+		<field 
+			name="access" 
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+
+		<field 
+			name="ordering" 
+			type="moduleorder"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			linked="position"
+		/>
+
+		<field
+			name="language"
+			type="language"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_MODULE_LANGUAGE_DESC"
+			default="*"
+			client="administrator"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field 
+			name="content" 
+			type="editor"
+			label="COM_MODULES_FIELD_CONTENT_LABEL"
+			description="COM_MODULES_FIELD_CONTENT_DESC"
+			buttons="true"
+			filter="JComponentHelper::filterText"
+			hide="readmore,pagebreak,module"
+		/>
+
+		<field name="assignment" type="hidden" />
+
+		<field name="assigned" type="hidden" />
+
+		<field name="asset_id" type="hidden"
+			filter="unset"
+		/>
+
+		<field 
+			name="rules" 
+			type="rules"
+			label="JFIELD_RULES_LABEL"
+			translate_label="false"
+			filter="rules"
+			component="com_modules"
+			section="module"
+			validate="rules"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_modules/models/module.php b/core/administrator/components/com_modules/models/module.php
new file mode 100644
index 00000000..fc10db5d
--- /dev/null
+++ b/core/administrator/components/com_modules/models/module.php
@@ -0,0 +1,1120 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Module model.
+ *
+ * @since  1.6
+ */
+class ModulesModelModule extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var      string
+	 * @since    3.4
+	 */
+	public $typeAlias = 'com_modules.module';
+
+	/**
+	 * @var    string  The prefix to use with controller messages.
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_MODULES';
+
+	/**
+	 * @var    string  The help screen key for the module.
+	 * @since  1.6
+	 */
+	protected $helpKey = 'JHELP_EXTENSIONS_MODULE_MANAGER_EDIT';
+
+	/**
+	 * @var    string  The help screen base URL for the module.
+	 * @since  1.6
+	 */
+	protected $helpURL;
+
+	/**
+	 * Batch copy/move command. If set to false,
+	 * the batch copy/move command is not supported
+	 *
+	 * @var string
+	 */
+	protected $batch_copymove = 'position_id';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var array
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id' => 'batchLanguage',
+	);
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'event_after_delete'  => 'onExtensionAfterDelete',
+				'event_after_save'    => 'onExtensionAfterSave',
+				'event_before_delete' => 'onExtensionBeforeDelete',
+				'event_before_save'   => 'onExtensionBeforeSave',
+				'events_map'          => array(
+					'save'   => 'extension',
+					'delete' => 'extension'
+				)
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+
+		if (!$pk)
+		{
+			if ($extensionId = (int) $app->getUserState('com_modules.add.module.extension_id'))
+			{
+				$this->setState('extension.id', $extensionId);
+			}
+		}
+
+		$this->setState('module.id', $pk);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_modules');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Batch copy modules to a new position or current.
+	 *
+	 * @param   integer  $value     The new value matching a module position.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		// Set the variables
+		$user = JFactory::getUser();
+		$table = $this->getTable();
+		$newIds = array();
+
+		foreach ($pks as $pk)
+		{
+			if ($user->authorise('core.create', 'com_modules'))
+			{
+				$table->reset();
+				$table->load($pk);
+
+				// Set the new position
+				if ($value == 'noposition')
+				{
+					$position = '';
+				}
+				elseif ($value == 'nochange')
+				{
+					$position = $table->position;
+				}
+				else
+				{
+					$position = $value;
+				}
+
+				$table->position = $position;
+
+				// Alter the title if necessary
+				$data = $this->generateNewTitle(0, $table->title, $table->position);
+				$table->title = $data['0'];
+
+				// Reset the ID because we are making a copy
+				$table->id = 0;
+
+				// Unpublish the new module
+				$table->published = 0;
+
+				if (!$table->store())
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+
+				// Get the new item ID
+				$newId = $table->get('id');
+
+				// Add the new ID to the array
+				$newIds[$pk] = $newId;
+
+				// Now we need to handle the module assignments
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select($db->quoteName('menuid'))
+					->from($db->quoteName('#__modules_menu'))
+					->where($db->quoteName('moduleid') . ' = ' . $pk);
+				$db->setQuery($query);
+				$menus = $db->loadColumn();
+
+				// Insert the new records into the table
+				foreach ($menus as $menu)
+				{
+					$query->clear()
+						->insert($db->quoteName('#__modules_menu'))
+						->columns(array($db->quoteName('moduleid'), $db->quoteName('menuid')))
+						->values($newId . ', ' . $menu);
+					$db->setQuery($query);
+					$db->execute();
+				}
+			}
+			else
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch move modules to a new position or current.
+	 *
+	 * @param   integer  $value     The new value matching a module position.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	protected function batchMove($value, $pks, $contexts)
+	{
+		// Set the variables
+		$user = JFactory::getUser();
+		$table = $this->getTable();
+
+		foreach ($pks as $pk)
+		{
+			if ($user->authorise('core.edit', 'com_modules'))
+			{
+				$table->reset();
+				$table->load($pk);
+
+				// Set the new position
+				if ($value == 'noposition')
+				{
+					$position = '';
+				}
+				elseif ($value == 'nochange')
+				{
+					$position = $table->position;
+				}
+				else
+				{
+					$position = $value;
+				}
+
+				$table->position = $position;
+
+				if (!$table->store())
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to test whether a record can have its state edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.2
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		// Check for existing module.
+		if (!empty($record->id))
+		{
+			return $user->authorise('core.edit.state', 'com_modules.module.' . (int) $record->id);
+		}
+		// Default to component settings if module not known.
+		else
+		{
+			return parent::canEditState('com_modules');
+		}
+	}
+
+	/**
+	 * Method to delete rows.
+	 *
+	 * @param   array  &$pks  An array of item ids.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 * @throws  Exception
+	 */
+	public function delete(&$pks)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$pks        = (array) $pks;
+		$user       = JFactory::getUser();
+		$table      = $this->getTable();
+		$context    = $this->option . '.' . $this->name;
+
+		// Include the plugins for the on delete events.
+		JPluginHelper::importPlugin($this->events_map['delete']);
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $pk)
+		{
+			if ($table->load($pk))
+			{
+				// Access checks.
+				if (!$user->authorise('core.delete', 'com_modules.module.' . (int) $pk) || $table->published != -2)
+				{
+					JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+
+					return;
+				}
+
+				// Trigger the before delete event.
+				$result = $dispatcher->trigger($this->event_before_delete, array($context, $table));
+
+				if (in_array(false, $result, true) || !$table->delete($pk))
+				{
+					throw new Exception($table->getError());
+				}
+				else
+				{
+					// Delete the menu assignments
+					$db    = $this->getDbo();
+					$query = $db->getQuery(true)
+						->delete('#__modules_menu')
+						->where('moduleid=' . (int) $pk);
+					$db->setQuery($query);
+					$db->execute();
+
+					// Trigger the after delete event.
+					$dispatcher->trigger($this->event_after_delete, array($context, $table));
+				}
+
+				// Clear module cache
+				parent::cleanCache($table->module, $table->client_id);
+			}
+			else
+			{
+				throw new Exception($table->getError());
+			}
+		}
+
+		// Clear modules cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to duplicate modules.
+	 *
+	 * @param   array  &$pks  An array of primary key IDs.
+	 *
+	 * @return  boolean|JException  Boolean true on success, JException instance on error
+	 *
+	 * @since   1.6
+	 * @throws  Exception
+	 */
+	public function duplicate(&$pks)
+	{
+		$user = JFactory::getUser();
+		$db   = $this->getDbo();
+
+		// Access checks.
+		if (!$user->authorise('core.create', 'com_modules'))
+		{
+			throw new Exception(JText::_('JERROR_CORE_CREATE_NOT_PERMITTED'));
+		}
+
+		$table = $this->getTable();
+
+		foreach ($pks as $pk)
+		{
+			if ($table->load($pk, true))
+			{
+				// Reset the id to create a new record.
+				$table->id = 0;
+
+				// Alter the title.
+				$m = null;
+
+				if (preg_match('#\((\d+)\)$#', $table->title, $m))
+				{
+					$table->title = preg_replace('#\(\d+\)$#', '(' . ($m[1] + 1) . ')', $table->title);
+				}
+
+				$data = $this->generateNewTitle(0, $table->title, $table->position);
+				$table->title = $data[0];
+
+				// Unpublish duplicate module
+				$table->published = 0;
+
+				if (!$table->check() || !$table->store())
+				{
+					throw new Exception($table->getError());
+				}
+
+				$query = $db->getQuery(true)
+					->select($db->quoteName('menuid'))
+					->from($db->quoteName('#__modules_menu'))
+					->where($db->quoteName('moduleid') . ' = ' . (int) $pk);
+
+				$db->setQuery($query);
+				$rows = $db->loadColumn();
+
+				foreach ($rows as $menuid)
+				{
+					$tuples[] = (int) $table->id . ',' . (int) $menuid;
+				}
+			}
+			else
+			{
+				throw new Exception($table->getError());
+			}
+		}
+
+		if (!empty($tuples))
+		{
+			// Module-Menu Mapping: Do it in one query
+			$query = $db->getQuery(true)
+				->insert($db->quoteName('#__modules_menu'))
+				->columns($db->quoteName(array('moduleid', 'menuid')))
+				->values($tuples);
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				return JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		// Clear modules cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the title.
+	 *
+	 * @param   integer  $category_id  The id of the category. Not used here.
+	 * @param   string   $title        The title.
+	 * @param   string   $position     The position.
+	 *
+	 * @return  array  Contains the modified title.
+	 *
+	 * @since   2.5
+	 */
+	protected function generateNewTitle($category_id, $title, $position)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('position' => $position, 'title' => $title)))
+		{
+			$title = StringHelper::increment($title);
+		}
+
+		return array($title);
+	}
+
+	/**
+	 * Method to get the client object
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function &getClient()
+	{
+		return $this->_client;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// The folder and element vars are passed when saving the form.
+		if (empty($data))
+		{
+			$item     = $this->getItem();
+			$clientId = $item->client_id;
+			$module   = $item->module;
+			$id       = $item->id;
+		}
+		else
+		{
+			$clientId = ArrayHelper::getValue($data, 'client_id');
+			$module   = ArrayHelper::getValue($data, 'module');
+			$id       = ArrayHelper::getValue($data, 'id');
+		}
+
+		// Add the default fields directory
+		$baseFolder = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
+		JForm::addFieldPath($baseFolder . '/modules' . '/' . $module . '/field');
+
+		// These variables are used to add data from the plugin XML files.
+		$this->setState('item.client_id', $clientId);
+		$this->setState('item.module', $module);
+
+		// Get the form.
+		if ($clientId == 1)
+		{
+			$form = $this->loadForm('com_modules.module.admin', 'moduleadmin', array('control' => 'jform', 'load_data' => $loadData), true);
+
+			// Display language field to filter admin custom menus per language
+			if (!JModuleHelper::isAdminMultilang())
+			{
+				$form->setFieldAttribute('language', 'type', 'hidden');
+			}
+		}
+		else
+		{
+			$form = $this->loadForm('com_modules.module', 'module', array('control' => 'jform', 'load_data' => $loadData), true);
+		}
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$form->setFieldAttribute('position', 'client', $this->getState('item.client_id') == 0 ? 'site' : 'administrator');
+
+		$user = JFactory::getUser();
+
+		/**
+		 * Check for existing module
+		 * Modify the form based on Edit State access controls.
+		 */
+		if ($id != 0 && (!$user->authorise('core.edit.state', 'com_modules.module.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('core.edit.state', 'com_modules'))		)
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+			$form->setFieldAttribute('publish_up', 'disabled', 'true');
+			$form->setFieldAttribute('publish_down', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+			$form->setFieldAttribute('publish_up', 'filter', 'unset');
+			$form->setFieldAttribute('publish_down', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		$app = JFactory::getApplication();
+
+		// Check the session for previously entered form data.
+		$data = $app->getUserState('com_modules.edit.module.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager
+			if (!$data->id)
+			{
+				$filters = (array) $app->getUserState('com_modules.modules.filter');
+				$data->set('published', $app->input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
+				$data->set('position', $app->input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
+				$data->set('language', $app->input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+				$data->set('access', $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access'))));
+			}
+
+			// Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.
+			if (empty($data->params))
+			{
+				// This allows us to inject parameter settings into a new module.
+				$params = $app->getUserState('com_modules.add.module.params');
+
+				if (is_array($params))
+				{
+					$data->set('params', $params);
+				}
+			}
+		}
+
+		$this->preprocessData('com_modules.module', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? (int) $pk : (int) $this->getState('module.id');
+		$db = $this->getDbo();
+
+		if (!isset($this->_cache[$pk]))
+		{
+			// Get a row instance.
+			$table = $this->getTable();
+
+			// Attempt to load the row.
+			$return = $table->load($pk);
+
+			// Check for a table object error.
+			if ($return === false && $error = $table->getError())
+			{
+				$this->setError($error);
+
+				return false;
+			}
+
+			// Check if we are creating a new extension.
+			if (empty($pk))
+			{
+				if ($extensionId = (int) $this->getState('extension.id'))
+				{
+					$query = $db->getQuery(true)
+						->select('element, client_id')
+						->from('#__extensions')
+						->where('extension_id = ' . $extensionId)
+						->where('type = ' . $db->quote('module'));
+					$db->setQuery($query);
+
+					try
+					{
+						$extension = $db->loadObject();
+					}
+					catch (RuntimeException $e)
+					{
+						$this->setError($e->getMessage());
+
+						return false;
+					}
+
+					if (empty($extension))
+					{
+						$this->setError('COM_MODULES_ERROR_CANNOT_FIND_MODULE');
+
+						return false;
+					}
+
+					// Extension found, prime some module values.
+					$table->module    = $extension->element;
+					$table->client_id = $extension->client_id;
+				}
+				else
+				{
+					JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_modules&view=modules', false));
+
+					return false;
+				}
+			}
+
+			// Convert to the JObject before adding other data.
+			$properties        = $table->getProperties(1);
+			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject');
+
+			// Convert the params field to an array.
+			$registry = new Registry($table->params);
+			$this->_cache[$pk]->params = $registry->toArray();
+
+			// Determine the page assignment mode.
+			$query = $db->getQuery(true)
+				->select($db->quoteName('menuid'))
+				->from($db->quoteName('#__modules_menu'))
+				->where($db->quoteName('moduleid') . ' = ' . (int) $pk);
+			$db->setQuery($query);
+			$assigned = $db->loadColumn();
+
+			if (empty($pk))
+			{
+				// If this is a new module, assign to all pages.
+				$assignment = 0;
+			}
+			elseif (empty($assigned))
+			{
+				// For an existing module it is assigned to none.
+				$assignment = '-';
+			}
+			else
+			{
+				if ($assigned[0] > 0)
+				{
+					$assignment = 1;
+				}
+				elseif ($assigned[0] < 0)
+				{
+					$assignment = -1;
+				}
+				else
+				{
+					$assignment = 0;
+				}
+			}
+
+			$this->_cache[$pk]->assigned   = $assigned;
+			$this->_cache[$pk]->assignment = $assignment;
+
+			// Get the module XML.
+			$client = JApplicationHelper::getClientInfo($table->client_id);
+			$path   = JPath::clean($client->path . '/modules/' . $table->module . '/' . $table->module . '.xml');
+
+			if (file_exists($path))
+			{
+				$this->_cache[$pk]->xml = simplexml_load_file($path);
+			}
+			else
+			{
+				$this->_cache[$pk]->xml = null;
+			}
+		}
+
+		return $this->_cache[$pk];
+	}
+
+	/**
+	 * Get the necessary data to load an item help screen.
+	 *
+	 * @return  object  An object with key, url, and local properties for loading the item help screen.
+	 *
+	 * @since   1.6
+	 */
+	public function getHelp()
+	{
+		return (object) array('key' => $this->helpKey, 'url' => $this->helpURL);
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Module', $prefix = 'JTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  The database object
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		$table->title    = htmlspecialchars_decode($table->title, ENT_QUOTES);
+		$table->position = trim($table->position);
+	}
+
+	/**
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		jimport('joomla.filesystem.path');
+
+		$lang     = JFactory::getLanguage();
+		$clientId = $this->getState('item.client_id');
+		$module   = $this->getState('item.module');
+
+		$client   = JApplicationHelper::getClientInfo($clientId);
+		$formFile = JPath::clean($client->path . '/modules/' . $module . '/' . $module . '.xml');
+
+		// Load the core and/or local language file(s).
+		$lang->load($module, $client->path, null, false, true)
+		||	$lang->load($module, $client->path . '/modules/' . $module, null, false, true);
+
+		if (file_exists($formFile))
+		{
+			// Get the module form.
+			if (!$form->loadFile($formFile, false, '//config'))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+
+			// Attempt to load the xml file.
+			if (!$xml = simplexml_load_file($formFile))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+
+			// Get the help data from the XML file if present.
+			$help = $xml->xpath('/extension/help');
+
+			if (!empty($help))
+			{
+				$helpKey = trim((string) $help[0]['key']);
+				$helpURL = trim((string) $help[0]['url']);
+
+				$this->helpKey = $helpKey ?: $this->helpKey;
+				$this->helpURL = $helpURL ?: $this->helpURL;
+			}
+		}
+
+		// Load the default advanced params
+		JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/com_modules/models/forms');
+		$form->loadFile('advanced', false);
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Loads ContentHelper for filters before validating data.
+	 *
+	 * @param   object  $form   The form to validate against.
+	 * @param   array   $data   The data to validate.
+	 * @param   string  $group  The name of the group(defaults to null).
+	 *
+	 * @return  mixed  Array of filtered data if valid, false otherwise.
+	 *
+	 * @since   1.1
+	 */
+	public function validate($form, $data, $group = null)
+	{
+		JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php');
+
+		return parent::validate($form, $data, $group);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$input      = JFactory::getApplication()->input;
+		$table      = $this->getTable();
+		$pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('module.id');
+		$isNew      = true;
+		$context    = $this->option . '.' . $this->name;
+
+		// Include the plugins for the save event.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Load the row if saving an existing record.
+		if ($pk > 0)
+		{
+			$table->load($pk);
+			$isNew = false;
+		}
+
+		// Alter the title and published state for Save as Copy
+		if ($input->get('task') == 'save2copy')
+		{
+			$orig_table = clone $this->getTable();
+			$orig_table->load((int) $input->getInt('id'));
+			$data['published'] = 0;
+
+			if ($data['title'] == $orig_table->title)
+			{
+				$data['title'] = StringHelper::increment($data['title']);
+			}
+		}
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Prepare the row for saving
+		$this->prepareTable($table);
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before save event.
+		$result = $dispatcher->trigger($this->event_before_save, array($context, &$table, $isNew));
+
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Store the data.
+		if (!$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Process the menu link mappings.
+		$assignment = isset($data['assignment']) ? $data['assignment'] : 0;
+
+		// Delete old module to menu item associations
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->delete('#__modules_menu')
+			->where('moduleid = ' . (int) $table->id);
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// If the assignment is numeric, then something is selected (otherwise it's none).
+		if (is_numeric($assignment))
+		{
+			// Variable is numeric, but could be a string.
+			$assignment = (int) $assignment;
+
+			// Logic check: if no module excluded then convert to display on all.
+			if ($assignment == -1 && empty($data['assigned']))
+			{
+				$assignment = 0;
+			}
+
+			// Check needed to stop a module being assigned to `All`
+			// and other menu items resulting in a module being displayed twice.
+			if ($assignment === 0)
+			{
+				// Assign new module to `all` menu item associations.
+				$query->clear()
+					->insert('#__modules_menu')
+					->columns(array($db->quoteName('moduleid'), $db->quoteName('menuid')))
+					->values((int) $table->id . ', 0');
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+			elseif (!empty($data['assigned']))
+			{
+				// Get the sign of the number.
+				$sign = $assignment < 0 ? -1 : 1;
+
+				$query->clear()
+					->insert($db->quoteName('#__modules_menu'))
+					->columns($db->quoteName(array('moduleid', 'menuid')));
+
+				foreach ($data['assigned'] as &$pk)
+				{
+					$query->values((int) $table->id . ',' . (int) $pk * $sign);
+				}
+
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger($this->event_after_save, array($context, &$table, $isNew));
+
+		// Compute the extension id of this module in case the controller wants it.
+		$query->clear()
+			->select('extension_id')
+			->from('#__extensions AS e')
+			->join('LEFT', '#__modules AS m ON e.element = m.module')
+			->where('m.id = ' . (int) $table->id);
+		$db->setQuery($query);
+
+		try
+		{
+			$extensionId = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return false;
+		}
+
+		$this->setState('module.extension_id', $extensionId);
+		$this->setState('module.id', $table->id);
+
+		// Clear modules cache
+		$this->cleanCache();
+
+		// Clean module cache
+		parent::cleanCache($table->module, $table->client_id);
+
+		return true;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   object  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		$condition = array();
+		$condition[] = 'client_id = ' . (int) $table->client_id;
+		$condition[] = 'position = ' . $this->_db->quote($table->position);
+
+		return $condition;
+	}
+
+	/**
+	 * Custom clean cache method for different clients
+	 *
+	 * @param   string   $group      The name of the plugin group to import (defaults to null).
+	 * @param   integer  $client_id  The client ID. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('com_modules', $this->getClient());
+	}
+}
diff --git a/core/administrator/components/com_modules/models/modules.php b/core/administrator/components/com_modules/models/modules.php
new file mode 100644
index 00000000..13642440
--- /dev/null
+++ b/core/administrator/components/com_modules/models/modules.php
@@ -0,0 +1,426 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Modules Component Module Model
+ *
+ * @since  1.5
+ */
+class ModulesModelModules extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'published', 'a.published', 'state',
+				'access', 'a.access',
+				'ag.title', 'access_level',
+				'ordering', 'a.ordering',
+				'module', 'a.module',
+				'language', 'a.language',
+				'l.title', 'language_title',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'client_id', 'a.client_id',
+				'position', 'a.position',
+				'pages',
+				'name', 'e.name',
+				'menuitem',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.position', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$layout = $app->input->get('layout', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout)
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.position', $this->getUserStateFromRequest($this->context . '.filter.position', 'filter_position', '', 'string'));
+		$this->setState('filter.module', $this->getUserStateFromRequest($this->context . '.filter.module', 'filter_module', '', 'string'));
+		$this->setState('filter.menuitem', $this->getUserStateFromRequest($this->context . '.filter.menuitem', 'filter_menuitem', '', 'cmd'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
+
+		// If in modal layout on the frontend, state and language are always forced.
+		if ($app->isClient('site') && $layout === 'modal')
+		{
+			$this->setState('filter.language', 'current');
+			$this->setState('filter.state', 1);
+		}
+		// If in backend (modal or not) we get the same fields from the user request.
+		else
+		{
+			$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
+			$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'));
+		}
+
+		// Special case for the client id.
+		if ($app->isClient('site') || $layout === 'modal')
+		{
+			$this->setState('client_id', 0);
+			$clientId = 0;
+		}
+		else
+		{
+			$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+			$clientId = (!in_array($clientId, array (0, 1))) ? 0 : $clientId;
+			$this->setState('client_id', $clientId);
+		}
+
+		// Use a different filter file when client is administrator
+		if ($clientId == 1)
+		{
+			$this->filterFormName = 'filter_modulesadmin';
+		}
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_modules');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string    A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('client_id');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.position');
+		$id .= ':' . $this->getState('filter.module');
+		$id .= ':' . $this->getState('filter.menuitem');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.language');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Returns an object list
+	 *
+	 * @param   string  $query       The query
+	 * @param   int     $limitstart  Offset
+	 * @param   int     $limit       The number of records
+	 *
+	 * @return  array
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$listOrder = $this->getState('list.ordering', 'a.position');
+		$listDirn  = $this->getState('list.direction', 'asc');
+
+		// If ordering by fields that need translate we need to sort the array of objects after translating them.
+		if (in_array($listOrder, array('pages', 'name')))
+		{
+			// Fetch the results.
+			$this->_db->setQuery($query);
+			$result = $this->_db->loadObjectList();
+
+			// Translate the results.
+			$this->translate($result);
+
+			// Sort the array of translated objects.
+			$result = ArrayHelper::sortObjects($result, $listOrder, strtolower($listDirn) == 'desc' ? -1 : 1, true, true);
+
+			// Process pagination.
+			$total = count($result);
+			$this->cache[$this->getStoreId('getTotal')] = $total;
+
+			if ($total < $limitstart)
+			{
+				$limitstart = 0;
+				$this->setState('list.start', 0);
+			}
+
+			return array_slice($result, $limitstart, $limit ?: null);
+		}
+
+		// If ordering by fields that doesn't need translate just order the query.
+		if ($listOrder === 'a.ordering')
+		{
+			$query->order($this->_db->quoteName('a.position') . ' ASC')
+				->order($this->_db->quoteName($listOrder) . ' ' . $this->_db->escape($listDirn));
+		}
+		elseif ($listOrder === 'a.position')
+		{
+			$query->order($this->_db->quoteName($listOrder) . ' ' . $this->_db->escape($listDirn))
+				->order($this->_db->quoteName('a.ordering') . ' ASC');
+		}
+		else
+		{
+			$query->order($this->_db->quoteName($listOrder) . ' ' . $this->_db->escape($listDirn));
+		}
+
+		// Process pagination.
+		$result = parent::_getList($query, $limitstart, $limit);
+
+		// Translate the results.
+		$this->translate($result);
+
+		return $result;
+	}
+
+	/**
+	 * Translate a list of objects
+	 *
+	 * @param   array  &$items  The array of objects
+	 *
+	 * @return  array The array of translated objects
+	 */
+	protected function translate(&$items)
+	{
+		$lang = JFactory::getLanguage();
+		$clientPath = $this->getState('client_id') ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+		foreach ($items as $item)
+		{
+			$extension = $item->module;
+			$source = $clientPath . "/modules/$extension";
+			$lang->load("$extension.sys", $clientPath, null, false, true)
+				|| $lang->load("$extension.sys", $source, null, false, true);
+			$item->name = JText::_($item->name);
+
+			if (is_null($item->pages))
+			{
+				$item->pages = JText::_('JNONE');
+			}
+			elseif ($item->pages < 0)
+			{
+				$item->pages = JText::_('COM_MODULES_ASSIGNED_VARIES_EXCEPT');
+			}
+			elseif ($item->pages > 0)
+			{
+				$item->pages = JText::_('COM_MODULES_ASSIGNED_VARIES_ONLY');
+			}
+			else
+			{
+				$item->pages = JText::_('JALL');
+			}
+		}
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		$app = JFactory::getApplication();
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.note, a.position, a.module, a.language,' .
+					'a.checked_out, a.checked_out_time, a.published AS published, e.enabled AS enabled, a.access, a.ordering, a.publish_up, a.publish_down'
+			)
+		);
+
+		// From modules table.
+		$query->from($db->quoteName('#__modules', 'a'));
+
+		// Join over the language
+		$query->select($db->quoteName('l.title', 'language_title'))
+			->select($db->quoteName('l.image', 'language_image'))
+			->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = ' . $db->quoteName('a.language'));
+
+		// Join over the users for the checked out user.
+		$query->select($db->quoteName('uc.name', 'editor'))
+			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->quoteName('uc.id') . ' = ' . $db->quoteName('a.checked_out'));
+
+		// Join over the asset groups.
+		$query->select($db->quoteName('ag.title', 'access_level'))
+			->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->quoteName('ag.id') . ' = ' . $db->quoteName('a.access'));
+
+		// Join over the module menus
+		$query->select('MIN(mm.menuid) AS pages')
+			->join('LEFT', $db->quoteName('#__modules_menu', 'mm') . ' ON ' . $db->quoteName('mm.moduleid') . ' = ' . $db->quoteName('a.id'));
+
+		// Join over the extensions
+		$query->select($db->quoteName('e.name', 'name'))
+			->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON ' . $db->quoteName('e.element') . ' = ' . $db->quoteName('a.module'));
+
+		// Group (careful with PostgreSQL)
+		$query->group(
+			'a.id, a.title, a.note, a.position, a.module, a.language, a.checked_out, '
+			. 'a.checked_out_time, a.published, a.access, a.ordering, l.title, l.image, uc.name, ag.title, e.name, '
+			. 'l.lang_code, uc.id, ag.id, mm.moduleid, e.element, a.publish_up, a.publish_down, e.enabled'
+		);
+
+		// Filter by client.
+		$clientId = $this->getState('client_id');
+		$query->where($db->quoteName('a.client_id') . ' = ' . (int) $clientId . ' AND ' . $db->quoteName('e.client_id') . ' = ' . (int) $clientId);
+
+		// Filter by current user access level.
+		$user = JFactory::getUser();
+
+		// Get the current user for authorisation checks
+		if ($user->authorise('core.admin') !== true)
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where($db->quoteName('a.access') . ' = ' . (int) $access);
+		}
+
+		// Filter by published state.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where($db->quoteName('a.published') . ' = ' . (int) $state);
+		}
+		elseif ($state === '')
+		{
+			$query->where($db->quoteName('a.published') . ' IN (0, 1)');
+		}
+
+		// Filter by position.
+		if ($position = $this->getState('filter.position'))
+		{
+			$query->where($db->quoteName('a.position') . ' = ' . $db->quote(($position === 'none') ? '' : $position));
+		}
+
+		// Filter by module.
+		if ($module = $this->getState('filter.module'))
+		{
+			$query->where($db->quoteName('a.module') . ' = ' . $db->quote($module));
+		}
+
+		// Filter by menuitem id (only for site client).
+		if ((int) $clientId === 0 && $menuItemId = $this->getState('filter.menuitem'))
+		{
+			// If user selected the modules not assigned to any page (menu item).
+			if ((int) $menuItemId === -1)
+			{
+				$query->having('MIN(' . $db->quoteName('mm.menuid') . ') IS NULL');
+			}
+			// If user selected the modules assigned to some particlar page (menu item).
+			else
+			{
+				// Modules in "All" pages.
+				$subQuery1 = $db->getQuery(true);
+				$subQuery1->select('MIN(' . $db->quoteName('menuid') . ')')
+					->from($db->quoteName('#__modules_menu'))
+					->where($db->quoteName('moduleid') . ' = ' . $db->quoteName('a.id'));
+
+				// Modules in "Selected" pages that have the chosen menu item id.
+				$subQuery2 = $db->getQuery(true);
+				$subQuery2->select($db->quoteName('moduleid'))
+					->from($db->quoteName('#__modules_menu'))
+					->where($db->quoteName('menuid') . ' = ' . (int) $menuItemId);
+
+				// Modules in "All except selected" pages that doesn't have the chosen menu item id.
+				$subQuery3 = $db->getQuery(true);
+				$subQuery3->select($db->quoteName('moduleid'))
+					->from($db->quoteName('#__modules_menu'))
+					->where($db->quoteName('menuid') . ' = -' . (int) $menuItemId);
+
+				// Filter by modules assigned to the selected menu item.
+				$query->where('(
+					(' . $subQuery1 . ') = 0
+					OR ((' . $subQuery1 . ') > 0 AND ' . $db->quoteName('a.id') . ' IN (' . $subQuery2 . '))
+					OR ((' . $subQuery1 . ') < 0 AND ' . $db->quoteName('a.id') . ' NOT IN (' . $subQuery3 . '))
+					)'
+				);
+			}
+		}
+
+		// Filter by search in title or note or id:.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . strtolower($search) . '%');
+				$query->where('(LOWER(a.title) LIKE ' . $search . ' OR LOWER(a.note) LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			if ($language === 'current')
+			{
+				$query->where($db->quoteName('a.language') . ' IN (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+			}
+			else
+			{
+				$query->where($db->quoteName('a.language') . ' = ' . $db->quote($language));
+			}
+		}
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_modules/models/positions.php b/core/administrator/components/com_modules/models/positions.php
new file mode 100644
index 00000000..9daa4b36
--- /dev/null
+++ b/core/administrator/components/com_modules/models/positions.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Modules Component Positions Model
+ *
+ * @since  1.6
+ */
+class ModulesModelPositions extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'value',
+				'templates',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'value', $direction = 'asc')
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter state.
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$state = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string');
+		$this->setState('filter.state', $state);
+
+		$template = $this->getUserStateFromRequest($this->context . '.filter.template', 'filter_template', '', 'string');
+		$this->setState('filter.template', $template);
+
+		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type', '', 'string');
+		$this->setState('filter.type', $type);
+
+		// Special case for the client id.
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$clientId = (!in_array((int) $clientId, array (0, 1))) ? 0 : (int) $clientId;
+		$this->setState('client_id', $clientId);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_modules');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		if (!isset($this->items))
+		{
+			$lang            = JFactory::getLanguage();
+			$search          = $this->getState('filter.search');
+			$state           = $this->getState('filter.state');
+			$clientId        = $this->getState('client_id');
+			$filter_template = $this->getState('filter.template');
+			$type            = $this->getState('filter.type');
+			$ordering        = $this->getState('list.ordering');
+			$direction       = $this->getState('list.direction');
+			$limitstart      = $this->getState('list.start');
+			$limit           = $this->getState('list.limit');
+			$client          = JApplicationHelper::getClientInfo($clientId);
+
+			if ($type != 'template')
+			{
+				// Get the database object and a new query object.
+				$query = $this->_db->getQuery(true)
+					->select('DISTINCT(position) as value')
+					->from('#__modules')
+					->where($this->_db->quoteName('client_id') . ' = ' . (int) $clientId);
+
+				if ($search)
+				{
+					$search = $this->_db->quote('%' . str_replace(' ', '%', $this->_db->escape(trim($search), true) . '%'));
+					$query->where('position LIKE ' . $search);
+				}
+
+				$this->_db->setQuery($query);
+
+				try
+				{
+					$positions = $this->_db->loadObjectList('value');
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+
+				foreach ($positions as $value => $position)
+				{
+					$positions[$value] = array();
+				}
+			}
+			else
+			{
+				$positions = array();
+			}
+
+			// Load the positions from the installed templates.
+			foreach (ModulesHelper::getTemplates($clientId) as $template)
+			{
+				$path = JPath::clean($client->path . '/templates/' . $template->element . '/templateDetails.xml');
+
+				if (file_exists($path))
+				{
+					$xml = simplexml_load_file($path);
+
+					if (isset($xml->positions[0]))
+					{
+						$lang->load('tpl_' . $template->element . '.sys', $client->path, null, false, true)
+						|| $lang->load('tpl_' . $template->element . '.sys', $client->path . '/templates/' . $template->element, null, false, true);
+
+						foreach ($xml->positions[0] as $position)
+						{
+							$value = (string) $position['value'];
+							$label = (string) $position;
+
+							if (!$value)
+							{
+								$value = $label;
+								$label = preg_replace('/[^a-zA-Z0-9_\-]/', '_', 'TPL_' . $template->element . '_POSITION_' . $value);
+								$altlabel = preg_replace('/[^a-zA-Z0-9_\-]/', '_', 'COM_MODULES_POSITION_' . $value);
+
+								if (!$lang->hasKey($label) && $lang->hasKey($altlabel))
+								{
+									$label = $altlabel;
+								}
+							}
+
+							if ($type == 'user' || ($state != '' && $state != $template->enabled))
+							{
+								unset($positions[$value]);
+							}
+							elseif (preg_match(chr(1) . $search . chr(1) . 'i', $value) && ($filter_template == '' || $filter_template == $template->element))
+							{
+								if (!isset($positions[$value]))
+								{
+									$positions[$value] = array();
+								}
+
+								$positions[$value][$template->name] = $label;
+							}
+						}
+					}
+				}
+			}
+
+			$this->total = count($positions);
+
+			if ($limitstart >= $this->total)
+			{
+				$limitstart = $limitstart < $limit ? 0 : $limitstart - $limit;
+				$this->setState('list.start', $limitstart);
+			}
+
+			if ($ordering == 'value')
+			{
+				if ($direction == 'asc')
+				{
+					ksort($positions);
+				}
+				else
+				{
+					krsort($positions);
+				}
+			}
+			else
+			{
+				if ($direction == 'asc')
+				{
+					asort($positions);
+				}
+				else
+				{
+					arsort($positions);
+				}
+			}
+
+			$this->items = array_slice($positions, $limitstart, $limit ?: null);
+		}
+
+		return $this->items;
+	}
+
+	/**
+	 * Method to get the total number of items.
+	 *
+	 * @return  integer  The total number of items.
+	 *
+	 * @since   1.6
+	 */
+	public function getTotal()
+	{
+		if (!isset($this->total))
+		{
+			$this->getItems();
+		}
+
+		return $this->total;
+	}
+}
diff --git a/core/administrator/components/com_modules/models/select.php b/core/administrator/components/com_modules/models/select.php
new file mode 100644
index 00000000..e3badbed
--- /dev/null
+++ b/core/administrator/components/com_modules/models/select.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Module model.
+ *
+ * @since  1.6
+ */
+class ModulesModelSelect extends JModelList
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the filter state.
+		$clientId = $app->getUserState('com_modules.modules.client_id', 0);
+		$this->setState('client_id', (int) $clientId);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_modules');
+		$this->setState('params', $params);
+
+		// Manually set limits to get all modules.
+		$this->setState('list.limit', 0);
+		$this->setState('list.start', 0);
+		$this->setState('list.ordering', 'a.name');
+		$this->setState('list.direction', 'ASC');
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string    A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('client_id');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.extension_id, a.name, a.element AS module'
+			)
+		);
+		$query->from($db->quoteName('#__extensions') . ' AS a');
+
+		// Filter by module
+		$query->where('a.type = ' . $db->quote('module'));
+
+		// Filter by client.
+		$clientId = $this->getState('client_id');
+		$query->where('a.client_id = ' . (int) $clientId);
+
+		// Filter by enabled
+		$query->where('a.enabled = 1');
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a list of items.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		// Get the list of items from the database.
+		$items = parent::getItems();
+
+		$client = JApplicationHelper::getClientInfo($this->getState('client_id', 0));
+		$lang = JFactory::getLanguage();
+
+		// Loop through the results to add the XML metadata,
+		// and load language support.
+		foreach ($items as &$item)
+		{
+			$path = JPath::clean($client->path . '/modules/' . $item->module . '/' . $item->module . '.xml');
+
+			if (file_exists($path))
+			{
+				$item->xml = simplexml_load_file($path);
+			}
+			else
+			{
+				$item->xml = null;
+			}
+
+			// 1.5 Format; Core files or language packs then
+			// 1.6 3PD Extension Support
+			$lang->load($item->module . '.sys', $client->path, null, false, true)
+				|| $lang->load($item->module . '.sys', $client->path . '/modules/' . $item->module, null, false, true);
+			$item->name = JText::_($item->name);
+
+			if (isset($item->xml) && $text = trim($item->xml->description))
+			{
+				$item->desc = JText::_($text);
+			}
+			else
+			{
+				$item->desc = JText::_('COM_MODULES_NODESCRIPTION');
+			}
+		}
+
+		$items = ArrayHelper::sortObjects($items, 'name', 1, true, true);
+
+		// TODO: Use the cached XML from the extensions table?
+
+		return $items;
+	}
+}
diff --git a/core/administrator/components/com_modules/modules.php b/core/administrator/components/com_modules/modules.php
new file mode 100644
index 00000000..b85013fc
--- /dev/null
+++ b/core/administrator/components/com_modules/modules.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+$user  = JFactory::getUser();
+$input = JFactory::getApplication()->input;
+
+if (($input->get('layout') !== 'modal' && $input->get('view') !== 'modules')
+	&& !$user->authorise('core.manage', 'com_modules'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Modules');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_modules/modules.xml b/core/administrator/components/com_modules/modules.xml
new file mode 100644
index 00000000..640b6fbb
--- /dev/null
+++ b/core/administrator/components/com_modules/modules.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_modules</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_MODULES_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>modules.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_modules.ini</language>
+			<language tag="en-GB">language/en-GB.com_modules.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_modules/views/module/tmpl/edit.php b/core/administrator/components/com_modules/views/module/tmpl/edit.php
new file mode 100644
index 00000000..8c30971e
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.combobox');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', '#jform_position', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_CATEGORY')));
+JHtml::_('formbehavior.chosen', '.multipleTags', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_TAG')));
+JHtml::_('formbehavior.chosen', '.multipleAuthors', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR')));
+JHtml::_('formbehavior.chosen', '.multipleAuthorAliases', null, array('placeholder_text_multiple' => JText::_('JOPTION_SELECT_AUTHOR_ALIAS')));
+JHtml::_('formbehavior.chosen', 'select');
+
+$hasContent = empty($this->item->module) ||  isset($this->item->xml->customContent);
+$hasContentFieldName = 'content';
+
+// For a later improvement
+if ($hasContent)
+{
+	$hasContentFieldName = 'content';
+}
+
+// Get Params Fieldsets
+$this->fieldsets = $this->form->getFieldsets('params');
+
+$script = "
+	Joomla.submitbutton = function(task) {
+			if (task == 'module.cancel' || document.formvalidator.isValid(document.getElementById('module-form')))
+			{
+";
+if ($hasContent)
+{
+	$script .= $this->form->getField($hasContentFieldName)->save();
+}
+$script .= "
+			Joomla.submitform(task, document.getElementById('module-form'));
+
+				jQuery('#permissions-sliders select').attr('disabled', 'disabled');
+
+				if (self != top)
+				{
+					if (parent.viewLevels)
+					{
+						var updPosition = jQuery('#jform_position').chosen().val(),
+							updTitle = jQuery('#jform_title').val(),
+							updMenus = jQuery('#jform_assignment').chosen().val(),
+							updStatus = jQuery('#jform_published').chosen().val(),
+							updAccess = jQuery('#jform_access').chosen().val(),
+							tmpMenu = jQuery('#menus-" . $this->item->id . "', parent.document),
+							tmpRow = jQuery('#tr-" . $this->item->id . "', parent.document);
+							tmpStatus = jQuery('#status-" . $this->item->id . "', parent.document);
+							window.parent.inMenus = new Array();
+							window.parent.numMenus = jQuery(':input[name=\"jform[assigned][]\"]').length;
+
+						jQuery('input[name=\"jform[assigned][]\"]').each(function(){
+							if (updMenus > 0 )
+							{
+								if (jQuery(this).is(':checked'))
+								{
+									window.parent.inMenus.push(parseInt(jQuery(this).val()));
+								}
+							}
+							if (updMenus < 0 )
+							{
+								if (!jQuery(this).is(':checked'))
+								{
+									window.parent.inMenus.push(parseInt(jQuery(this).val()));
+								}
+							}
+						});
+						if (updMenus == 0) {
+							tmpMenu.html('<span class=\"label label-info\">" . JText::_('JALL') . "</span>');
+							if (tmpRow.hasClass('no')) { tmpRow.removeClass('no '); }
+						}
+						if (updMenus == '-') {
+							tmpMenu.html('<span class=\"label label-important\">" . JText::_('JNO') . "</span>');
+							if (!tmpRow.hasClass('no') || tmpRow.hasClass('')) { tmpRow.addClass('no '); }
+						}
+						if (updMenus > 0) {
+							if (window.parent.inMenus.indexOf(parent.menuId) >= 0)
+							{
+								if (window.parent.numMenus == window.parent.inMenus.length)
+								{
+									tmpMenu.html('<span class=\"label label-info\">" . JText::_('JALL') . "</span>');
+									if (tmpRow.hasClass('no') || tmpRow.hasClass('')) { tmpRow.removeClass('no'); }
+								}
+								else
+								{
+									tmpMenu.html('<span class=\"label label-success\">" . JText::_('JYES') . "</span>');
+									if (tmpRow.hasClass('no')) { tmpRow.removeClass('no'); }
+								}
+							}
+							if (window.parent.inMenus.indexOf(parent.menuId) < 0)
+							{
+								tmpMenu.html('<span class=\"label label-important\">" . JText::_('JNO') . "</span>');
+								if (!tmpRow.hasClass('no')) { tmpRow.addClass('no'); }
+							}
+						}
+						if (updMenus < 0) {
+							if (window.parent.inMenus.indexOf(parent.menuId) >= 0)
+							{
+								if (window.parent.numMenus == window.parent.inMenus.length)
+								{
+									tmpMenu.html('<span class=\"label label-info\">" . JText::_('JALL') . "</span>');
+									if (tmpRow.hasClass('no')) { tmpRow.removeClass('no'); }
+								}
+								else
+								{
+									tmpMenu.html('<span class=\"label label-success\">" . JText::_('JYES') . "</span>');
+									if (tmpRow.hasClass('no')) { tmpRow.removeClass('no'); }
+								}
+							}
+							if (window.parent.inMenus.indexOf(parent.menuId) < 0)
+							{
+								tmpMenu.html('<span class=\"label label-important\">" . JText::_('JNO') . "</span>');
+								if (!tmpRow.hasClass('no') || tmpRow.hasClass('')) { tmpRow.addClass('no'); }
+							}
+						}
+						if (updStatus == 1) {
+							tmpStatus.html('<span class=\"label label-success\">" . JText::_('JYES') . "</span>');
+							if (tmpRow.hasClass('unpublished')) { tmpRow.removeClass('unpublished '); }
+						}
+						if (updStatus == 0) {
+							tmpStatus.html('<span class=\"label label-important\">" . JText::_('JNO') . "</span>');
+							if (!tmpRow.hasClass('unpublished') || tmpRow.hasClass('')) { tmpRow.addClass('unpublished'); }
+						}
+						if (updStatus == -2) {
+							tmpStatus.html('<span class=\"label label-default\">" . JText::_('JTRASHED') . "</span>');
+							if (!tmpRow.hasClass('unpublished') || tmpRow.hasClass('')) { tmpRow.addClass('unpublished'); }
+						}
+						if (document.formvalidator.isValid(document.getElementById('module-form'))) {
+							jQuery('#title-" . $this->item->id . "', parent.document).text(updTitle);
+							jQuery('#position-" . $this->item->id . "', parent.document).text(updPosition);
+							jQuery('#access-" . $this->item->id . "', parent.document).html(parent.viewLevels[updAccess]);
+						}
+					}
+				}
+
+				if (task !== 'module.apply')
+				{
+					window.parent.jQuery('#module" . ((int) $this->item->id == 0 ? 'Add' : 'Edit' . (int) $this->item->id) . "Modal').modal('hide');
+				}
+			}
+	};";
+
+JFactory::getDocument()->addScriptDeclaration($script);
+
+$input = JFactory::getApplication()->input;
+
+// In case of modal
+$isModal = $input->get('layout') == 'modal' ? true : false;
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_modules&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('COM_MODULES_MODULE')); ?>
+
+		<div class="row-fluid">
+			<div class="span9">
+				<?php if ($this->item->xml) : ?>
+					<?php if ($this->item->xml->description) : ?>
+						<h2>
+							<?php
+							if ($this->item->xml)
+							{
+								echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->module;
+							}
+							else
+							{
+								echo JText::_('COM_MODULES_ERR_XML');
+							}
+							?>
+						</h2>
+						<div class="info-labels">
+							<span class="label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_MODULES_FIELD_CLIENT_ID_LABEL'); ?>">
+								<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
+							</span>
+						</div>
+						<div>
+							<?php
+							$short_description = JText::_($this->item->xml->description);
+							$this->fieldset = 'description';
+							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
+							if (!$long_description) {
+								$truncated = JHtmlString::truncate($short_description, 550, true, false);
+								if (strlen($truncated) > 500) {
+									$long_description = $short_description;
+									$short_description = JHtmlString::truncate($truncated, 250);
+									if ($short_description == $long_description) {
+										$long_description = '';
+									}
+								}
+							}
+							?>
+							<p><?php echo $short_description; ?></p>
+							<?php if ($long_description) : ?>
+								<p class="readmore">
+									<a href="#" onclick="jQuery('.nav-tabs a[href=\'#description\']').tab('show');">
+										<?php echo JText::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
+									</a>
+								</p>
+							<?php endif; ?>
+						</div>
+					<?php endif; ?>
+				<?php else : ?>
+					<div class="alert alert-error"><?php echo JText::_('COM_MODULES_ERR_XML'); ?></div>
+				<?php endif; ?>
+				<?php
+				if ($hasContent)
+				{
+					echo $this->form->getInput($hasContentFieldName);
+				}
+				$this->fieldset = 'basic';
+				$html = JLayoutHelper::render('joomla.edit.fieldset', $this);
+				echo $html ? '<hr />' . $html : '';
+				?>
+			</div>
+			<div class="span3">
+				<fieldset class="form-vertical">
+					<?php echo $this->form->renderField('showtitle'); ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('position'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->loadTemplate('positions'); ?>
+						</div>
+					</div>
+				</fieldset>
+				<?php
+				// Set main fields.
+				$this->fields = array(
+					'published',
+					'publish_up',
+					'publish_down',
+					'access',
+					'ordering',
+					'language',
+					'note'
+				);
+
+				?>
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php if (isset($long_description) && $long_description != '') : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
+			<?php echo $long_description; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php if ($this->item->client_id == 0) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'assignment', JText::_('COM_MODULES_MENU_ASSIGNMENT')); ?>
+			<?php echo $this->loadTemplate('assignment'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php
+		$this->fieldsets = array();
+		$this->ignore_fieldsets = array('basic', 'description');
+		echo JLayoutHelper::render('joomla.edit.params', $this);
+		?>
+
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'permissions', JText::_('COM_MODULES_FIELDSET_RULES')); ?>
+			<?php echo $this->form->getInput('rules'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+		<?php echo $this->form->getInput('module'); ?>
+		<?php echo $this->form->getInput('client_id'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/core/administrator/components/com_modules/views/module/tmpl/edit_assignment.php
new file mode 100644
index 00000000..aa4d9674
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/tmpl/edit_assignment.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Initialise related data.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+$menuTypes = MenusHelper::getMenuLinks();
+
+JHtml::_('script', 'jui/treeselectmenu.jquery.min.js', array('version' => 'auto', 'relative' => true));
+
+$script = "
+	jQuery(document).ready(function()
+	{
+		menuHide(jQuery('#jform_assignment').val());
+		jQuery('#jform_assignment').change(function()
+		{
+			menuHide(jQuery(this).val());
+		})
+	});
+	function menuHide(val)
+	{
+		if (val == 0 || val == '-')
+		{
+			jQuery('#menuselect-group').hide();
+		}
+		else
+		{
+			jQuery('#menuselect-group').show();
+		}
+	}
+";
+
+// Add the script to the document head
+JFactory::getDocument()->addScriptDeclaration($script);
+?>
+<div class="control-group">
+	<label id="jform_menus-lbl" class="control-label" for="jform_menus"><?php echo JText::_('COM_MODULES_MODULE_ASSIGN'); ?></label>
+
+	<div id="jform_menus" class="controls">
+		<select name="jform[assignment]" id="jform_assignment">
+			<?php echo JHtml::_('select.options', ModulesHelper::getAssignmentOptions($this->item->client_id), 'value', 'text', $this->item->assignment, true); ?>
+		</select>
+	</div>
+</div>
+<div id="menuselect-group" class="control-group">
+	<label id="jform_menuselect-lbl" class="control-label" for="jform_menuselect"><?php echo JText::_('JGLOBAL_MENU_SELECTION'); ?></label>
+
+	<div id="jform_menuselect" class="controls">
+		<?php if (!empty($menuTypes)) : ?>
+		<?php $id = 'jform_menuselect'; ?>
+
+		<div class="well well-small">
+			<div class="form-inline">
+				<span class="small"><?php echo JText::_('JSELECT'); ?>:
+					<a id="treeCheckAll" href="javascript://"><?php echo JText::_('JALL'); ?></a>,
+					<a id="treeUncheckAll" href="javascript://"><?php echo JText::_('JNONE'); ?></a>
+				</span>
+				<span class="width-20">|</span>
+				<span class="small"><?php echo JText::_('COM_MODULES_EXPAND'); ?>:
+					<a id="treeExpandAll" href="javascript://"><?php echo JText::_('JALL'); ?></a>,
+					<a id="treeCollapseAll" href="javascript://"><?php echo JText::_('JNONE'); ?></a>
+				</span>
+				<input type="text" id="treeselectfilter" name="treeselectfilter" class="input-medium search-query pull-right" size="16"
+					autocomplete="off" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" aria-invalid="false" tabindex="-1">
+			</div>
+
+			<div class="clearfix"></div>
+
+			<hr class="hr-condensed" />
+
+			<ul class="treeselect">
+				<?php foreach ($menuTypes as &$type) : ?>
+				<?php if (count($type->links)) : ?>
+					<?php $prevlevel = 0; ?>
+					<li>
+						<div class="treeselect-item pull-left">
+							<label class="pull-left nav-header"><?php echo $type->title; ?></label></div>
+					<?php foreach ($type->links as $i => $link) : ?>
+						<?php
+						if ($prevlevel < $link->level)
+						{
+							echo '<ul class="treeselect-sub">';
+						} elseif ($prevlevel > $link->level)
+						{
+							echo str_repeat('</li></ul>', $prevlevel - $link->level);
+						} else {
+							echo '</li>';
+						}
+						$selected = 0;
+						if ($this->item->assignment == 0)
+						{
+							$selected = 1;
+						} elseif ($this->item->assignment < 0)
+						{
+							$selected = in_array(-$link->value, $this->item->assigned);
+						} elseif ($this->item->assignment > 0)
+						{
+							$selected = in_array($link->value, $this->item->assigned);
+						}
+						?>
+							<li>
+								<div class="treeselect-item pull-left">
+									<?php
+									$uselessMenuItem = in_array($link->type, array('separator', 'heading', 'alias', 'url'));
+									?>
+									<input type="checkbox" class="pull-left novalidate" name="jform[assigned][]" id="<?php echo $id . $link->value; ?>" value="<?php echo (int) $link->value; ?>"<?php echo $selected ? ' checked="checked"' : ''; echo $uselessMenuItem ? ' disabled="disabled"' : ''; ?> />
+									<label for="<?php echo $id . $link->value; ?>" class="pull-left">
+										<?php echo $link->text; ?> <span class="small"><?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($link->alias)); ?></span>
+										<?php if (JLanguageMultilang::isEnabled() && $link->language != '' && $link->language != '*') : ?>
+											<?php if ($link->language_image) : ?>
+												<?php echo JHtml::_('image', 'mod_languages/' . $link->language_image . '.gif', $link->language_title, array('title' => $link->language_title), true); ?>
+											<?php else : ?>
+												<?php echo '<span class="label" title="' . $link->language_title . '">' . $link->language_sef . '</span>'; ?>
+											<?php endif; ?>
+										<?php endif; ?>
+										<?php if ($link->published == 0) : ?>
+											<?php echo ' <span class="label">' . JText::_('JUNPUBLISHED') . '</span>'; ?>
+										<?php endif; ?>
+										<?php if ($uselessMenuItem) : ?>
+											<?php echo ' <span class="label">' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . '</span>'; ?>
+										<?php endif; ?>
+									</label>
+								</div>
+						<?php
+
+						if (!isset($type->links[$i + 1]))
+						{
+							echo str_repeat('</li></ul>', $link->level);
+						}
+						$prevlevel = $link->level;
+						?>
+						<?php endforeach; ?>
+					</li>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</ul>
+			<div id="noresultsfound" style="display:none;" class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+			<div style="display:none;" id="treeselectmenu">
+				<div class="pull-left nav-hover treeselect-menu">
+					<div class="btn-group">
+						<a href="#" data-toggle="dropdown" class="dropdown-toggle btn btn-micro">
+							<span class="caret"></span>
+						</a>
+						<ul class="dropdown-menu">
+							<li class="nav-header"><?php echo JText::_('COM_MODULES_SUBITEMS'); ?></li>
+							<li class="divider"></li>
+							<li class=""><a class="checkall" href="javascript://"><span class="icon-checkbox" aria-hidden="true"></span> <?php echo JText::_('JSELECT'); ?></a>
+							</li>
+							<li><a class="uncheckall" href="javascript://"><span class="icon-checkbox-unchecked" aria-hidden="true"></span> <?php echo JText::_('COM_MODULES_DESELECT'); ?></a>
+							</li>
+							<div class="treeselect-menu-expand">
+							<li class="divider"></li>
+							<li><a class="expandall" href="javascript://"><span class="icon-plus" aria-hidden="true"></span> <?php echo JText::_('COM_MODULES_EXPAND'); ?></a></li>
+							<li><a class="collapseall" href="javascript://"><span class="icon-minus" aria-hidden="true"></span> <?php echo JText::_('COM_MODULES_COLLAPSE'); ?></a></li>
+							</div>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/core/administrator/components/com_modules/views/module/tmpl/edit_options.php b/core/administrator/components/com_modules/views/module/tmpl/edit_options.php
new file mode 100644
index 00000000..6814bb22
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/tmpl/edit_options.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php
+	echo JHtml::_('bootstrap.startAccordion', 'moduleOptions', array('active' => 'collapse0'));
+	$fieldSets = $this->form->getFieldsets('params');
+	$i = 0;
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MODULES_' . $name . '_FIELDSET_LABEL';
+		$class = isset($fieldSet->class) && !empty($fieldSet->class) ? $fieldSet->class : '';
+
+		echo JHtml::_('bootstrap.addSlide', 'moduleOptions', JText::_($label), 'collapse' . ($i++), $class);
+			if (isset($fieldSet->description) && trim($fieldSet->description)) :
+				echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+			endif;
+			?>
+				<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php echo $field->input; ?>
+						</div>
+					</div>
+				<?php endforeach;
+		echo JHtml::_('bootstrap.endSlide');
+	endforeach;
+echo JHtml::_('bootstrap.endAccordion');
diff --git a/core/administrator/components/com_modules/views/module/tmpl/edit_positions.php b/core/administrator/components/com_modules/views/module/tmpl/edit_positions.php
new file mode 100644
index 00000000..cbaddc87
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/tmpl/edit_positions.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php');
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+$clientId       = $this->item->client_id;
+$state          = 1;
+$selectedPosition = $this->item->position;
+$positions = JHtml::_('modules.positions', $clientId, $state, $selectedPosition);
+
+
+// Add custom position to options
+$customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION');
+
+// Build field
+$attr = array(
+	'id'          => 'jform_position',
+	'list.select' => $this->item->position,
+	'list.attr'   => 'class="chzn-custom-value" '
+	. 'data-custom_group_text="' . $customGroupText . '" '
+	. 'data-no_results_text="' . JText::_('COM_MODULES_ADD_CUSTOM_POSITION') . '" '
+	. 'data-placeholder="' . JText::_('COM_MODULES_TYPE_OR_SELECT_POSITION') . '" '
+);
+
+echo JHtml::_('select.groupedlist', $positions, 'jform[position]', $attr);
diff --git a/core/administrator/components/com_modules/views/module/tmpl/modal.php b/core/administrator/components/com_modules/views/module/tmpl/modal.php
new file mode 100644
index 00000000..63aba8a6
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/tmpl/modal.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('module.apply');"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('module.save');"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('module.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/core/administrator/components/com_modules/views/module/view.html.php b/core/administrator/components/com_modules/views/module/view.html.php
new file mode 100644
index 00000000..f12cca82
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/view.html.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a module.
+ *
+ * @since  1.6
+ */
+class ModulesViewModule extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+		$this->canDo = JHelperContent::getActions('com_modules', 'module', $this->item->id);
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+		$canDo      = $this->canDo;
+
+		JToolbarHelper::title(JText::sprintf('COM_MODULES_MANAGER_MODULE', JText::_($this->item->module)), 'cube module');
+
+		// For new records, check the create permission.
+		if ($isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::apply('module.apply');
+			JToolbarHelper::save('module.save');
+			JToolbarHelper::save2new('module.save2new');
+			JToolbarHelper::cancel('module.cancel');
+		}
+		else
+		{
+			// Can't save the record if it's checked out.
+			if (!$checkedOut)
+			{
+				// Since it's an existing record, check the edit permission.
+				if ($canDo->get('core.edit'))
+				{
+					JToolbarHelper::apply('module.apply');
+					JToolbarHelper::save('module.save');
+
+					// We can save this record, but check the create permission to see if we can return to make a new one.
+					if ($canDo->get('core.create'))
+					{
+						JToolbarHelper::save2new('module.save2new');
+					}
+				}
+			}
+
+			// If checked out, we can still save
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2copy('module.save2copy');
+			}
+
+			JToolbarHelper::cancel('module.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		// Get the help information for the menu item.
+		$lang = JFactory::getLanguage();
+
+		$help = $this->get('Help');
+
+		if ($lang->hasKey($help->url))
+		{
+			$debug = $lang->setDebug(false);
+			$url = JText::_($help->url);
+			$lang->setDebug($debug);
+		}
+		else
+		{
+			$url = null;
+		}
+
+		JToolbarHelper::help($help->key, false, $url);
+	}
+}
diff --git a/core/administrator/components/com_modules/views/module/view.json.php b/core/administrator/components/com_modules/views/module/view.json.php
new file mode 100644
index 00000000..82e30b2c
--- /dev/null
+++ b/core/administrator/components/com_modules/views/module/view.json.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a module.
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ * @since       3.2
+ */
+class ModulesViewModule extends JViewLegacy
+{
+	protected $item;
+
+	protected $form;
+
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$app = JFactory::getApplication();
+
+		try
+		{
+			$this->item = $this->get('Item');
+		}
+		catch (Exception $e)
+		{
+			$app->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		$paramsList = $this->item->getProperties();
+
+		unset($paramsList['xml']);
+
+		$paramsList = json_encode($paramsList);
+
+		return $paramsList;
+
+	}
+}
diff --git a/core/administrator/components/com_modules/views/modules/tmpl/default.php b/core/administrator/components/com_modules/views/modules/tmpl/default.php
new file mode 100644
index 00000000..5a782326
--- /dev/null
+++ b/core/administrator/components/com_modules/views/modules/tmpl/default.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$clientId   = (int) $this->state->get('client_id', 0);
+$user		= JFactory::getUser();
+$listOrder	= $this->escape($this->state->get('list.ordering'));
+$listDirn	= $this->escape($this->state->get('list.direction'));
+$saveOrder	= ($listOrder == 'a.ordering');
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_modules&task=modules.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'moduleList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+$colSpan = $clientId === 1 ? 8 : 10;
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_modules'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->total > 0) : ?>
+			<table class="table table-striped" id="moduleList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center" style="min-width:55px">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MODULES_HEADING_POSITION', 'a.position', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($clientId === 0) : ?>
+						<th width="10%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'ag.title', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($clientId === 0) : ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.title', $listDirn, $listOrder); ?>
+						</th>
+						<?php elseif ($clientId === 1 && JModuleHelper::isAdminMultilang()) : ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="<?php echo $colSpan; ?>">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$ordering   = ($listOrder == 'a.ordering');
+					$canCreate  = $user->authorise('core.create',     'com_modules');
+					$canEdit	= $user->authorise('core.edit',		  'com_modules.module.' . $item->id);
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id')|| $item->checked_out == 0;
+					$canChange  = $user->authorise('core.edit.state', 'com_modules.module.' . $item->id) && $canCheckin;
+				?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->position ?: 'none'; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass; ?>">
+								<span class="icon-menu"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php if ($item->enabled > 0) : ?>
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<div class="btn-group">
+							<?php // Check if extension is enabled ?>
+							<?php if ($item->enabled > 0) : ?>
+								<?php echo JHtml::_('jgrid.published', $item->published, $i, 'modules.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+								<?php // Create dropdown items and render the dropdown list.
+								if ($canCreate)
+								{
+									JHtml::_('actionsdropdown.duplicate', 'cb' . $i, 'modules');
+								}
+								if ($canChange)
+								{
+									JHtml::_('actionsdropdown.' . ((int) $item->published === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'modules');
+								}
+								if ($canCreate || $canChange)
+								{
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
+								}
+								?>
+							<?php else : ?>
+								<?php // Extension is not enabled, show a message that indicates this. ?>
+								<button class="btn btn-micro hasTooltip" title="<?php echo JText::_('COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED'); ?>">
+									<span class="icon-ban-circle" aria-hidden="true"></span>
+								</button>
+							<?php endif; ?>
+							</div>
+						</td>
+						<td class="has-context">
+							<div class="pull-left">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit) : ?>
+									<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+										<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<?php echo $this->escape($item->title); ?>
+								<?php endif; ?>
+
+								<?php if (!empty($item->note)) : ?>
+									<div class="small">
+										<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note)); ?>
+									</div>
+								<?php endif; ?>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php if ($item->position) : ?>
+								<span class="label label-info">
+									<?php echo $item->position; ?>
+								</span>
+							<?php else : ?>
+								<span class="label">
+									<?php echo JText::_('JNONE'); ?>
+								</span>
+							<?php endif; ?>
+						</td>
+						<td class="small hidden-phone hidden-tablet">
+							<?php echo $item->name; ?>
+						</td>
+						<?php if ($clientId === 0) : ?>
+						<td class="small hidden-phone hidden-tablet">
+							<?php echo $item->pages; ?>
+						</td>
+						<?php endif; ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<?php if ($clientId === 0) : ?>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<?php elseif ($clientId === 1 && JModuleHelper::isAdminMultilang()) : ?>
+							<td class="small hidden-phone">
+								<?php if ($item->language == ''):?>
+									<?php echo JText::_('JUNDEFINED'); ?>
+								<?php elseif ($item->language == '*'):?>
+									<?php echo JText::alt('JALL', 'language'); ?>
+								<?php else:?>
+									<?php echo $this->escape($item->language); ?>
+								<?php endif; ?>
+							</td>
+						<?php endif; ?>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<?php // Load the batch processing form. ?>
+		<?php if ($user->authorise('core.create', 'com_modules')
+			&& $user->authorise('core.edit', 'com_modules')
+			&& $user->authorise('core.edit.state', 'com_modules')) : ?>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'collapseModal',
+				array(
+					'title'  => JText::_('COM_MODULES_BATCH_OPTIONS'),
+					'footer' => $this->loadTemplate('batch_footer'),
+				),
+				$this->loadTemplate('batch_body')
+			); ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_modules/views/modules/tmpl/default.xml b/core/administrator/components/com_modules/views/modules/tmpl/default.xml
new file mode 100755
index 00000000..4d323670
--- /dev/null
+++ b/core/administrator/components/com_modules/views/modules/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_MODULES_MODULES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_MODULES_MODULES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php b/core/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
new file mode 100644
index 00000000..35dd65dd
--- /dev/null
+++ b/core/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$clientId  = $this->state->get('client_id');
+
+// Show only Module Positions of published Templates
+$published = 1;
+$positions = JHtml::_('modules.positions', $clientId, $published);
+$positions['']['items'][] = ModulesHelper::createOption('nochange', JText::_('COM_MODULES_BATCH_POSITION_NOCHANGE'));
+$positions['']['items'][] = ModulesHelper::createOption('noposition', JText::_('COM_MODULES_BATCH_POSITION_NOPOSITION'));
+
+// Add custom position to options
+$customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION');
+
+// Build field
+$attr = array(
+	'id'        => 'batch-position-id',
+	'list.attr' => 'class="chzn-custom-value input-xlarge" '
+		. 'data-custom_group_text="' . $customGroupText . '" '
+		. 'data-no_results_text="' . JText::_('COM_MODULES_ADD_CUSTOM_POSITION') . '" '
+		. 'data-placeholder="' . JText::_('COM_MODULES_TYPE_OR_SELECT_POSITION') . '" '
+);
+
+?>
+<div class="container-fluid">
+	<p><?php echo JText::_('COM_MODULES_BATCH_TIP'); ?></p>
+	<div class="row-fluid">
+		<?php if ($clientId != 1) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JLayoutHelper::render('joomla.html.batch.language', array()); ?>
+				</div>
+			</div>
+		<?php elseif ($clientId == 1 && JModuleHelper::isAdminMultilang()) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JLayoutHelper::render('joomla.html.batch.adminlanguage', array()); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="span6">
+				<div class="controls">
+					<label id="batch-choose-action-lbl" for="batch-choose-action">
+						<?php echo JText::_('COM_MODULES_BATCH_POSITION_LABEL'); ?>
+					</label>
+					<div id="batch-choose-action" class="control-group">
+						<?php echo JHtml::_('select.groupedlist', $positions, 'batch[position_id]', $attr); ?>
+						<div id="batch-copy-move" class="control-group radio">
+							<?php echo JHtml::_('modules.batchOptions'); ?>
+						</div>
+					</div>
+				</div>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/core/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php b/core/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..2538a9eb
--- /dev/null
+++ b/core/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-position-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('module.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_modules/views/modules/tmpl/modal.php b/core/administrator/components/com_modules/views/modules/tmpl/modal.php
new file mode 100644
index 00000000..577bfa8d
--- /dev/null
+++ b/core/administrator/components/com_modules/views/modules/tmpl/modal.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (JFactory::getApplication()->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+// Load needed scripts
+JHtml::_('behavior.core');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Scripts for the modules xtd-button
+JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+JHtml::_('script', 'com_modules/admin-modules-modal.min.js', array('version' => 'auto', 'relative' => true));
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$editor    = JFactory::getApplication()->input->get('editor', '', 'cmd');
+$link      = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&' . JSession::getFormToken() . '=1';
+
+if (!empty($editor))
+{
+	$link = 'index.php?option=com_modules&view=modules&layout=modal&tmpl=component&editor=' . $editor . '&' . JSession::getFormToken() . '=1';
+}
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_($link); ?>" method="post" name="adminForm" id="adminForm">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->total > 0) : ?>
+		<table class="table table-striped" id="moduleList">
+			<thead>
+				<tr>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+					</th>
+					<th class="title">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_MODULES_HEADING_POSITION', 'a.position', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone hidden-tablet">
+						<?php echo JHtml::_('searchtools.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'ag.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="8">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php
+				$iconStates = array(
+					-2 => 'icon-trash',
+					0  => 'icon-unpublish',
+					1  => 'icon-publish',
+					2  => 'icon-archive',
+				);
+				foreach ($this->items as $i => $item) :
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center">
+						<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
+					</td>
+					<td class="has-context">
+						<a class="js-module-insert btn btn-small btn-block btn-success" href="#" data-module="<?php echo $this->escape($item->module); ?>" data-title="<?php echo $this->escape($item->title); ?>" data-editor="<?php echo $this->escape($editor); ?>">
+							<?php echo $this->escape($item->title); ?>
+						</a>
+					</td>
+					<td class="small hidden-phone">
+						<?php if ($item->position) : ?>
+						<a class="js-position-insert btn btn-small btn-block btn-warning" href="#" data-position="<?php echo $this->escape($item->position); ?>" data-editor="<?php echo $this->escape($editor); ?>"><?php echo $this->escape($item->position); ?></a>
+						<?php else : ?>
+						<span class="label"><?php echo JText::_('JNONE'); ?></span>
+						<?php endif; ?>
+					</td>
+					<td class="small hidden-phone">
+						<?php echo $item->name; ?>
+					</td>
+					<td class="small hidden-phone hidden-tablet">
+						<?php echo $item->pages; ?>
+					</td>
+					<td class="small hidden-phone">
+						<?php echo $this->escape($item->access_level); ?>
+					</td>
+					<td class="small hidden-phone">
+						<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo (int) $item->id; ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="editor" value="<?php echo $editor; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_modules/views/modules/view.html.php b/core/administrator/components/com_modules/views/modules/view.html.php
new file mode 100644
index 00000000..5a0a572d
--- /dev/null
+++ b/core/administrator/components/com_modules/views/modules/view.html.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of modules.
+ *
+ * @since  1.6
+ */
+class ModulesViewModules extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->total         = $this->get('Total');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->clientId      = $this->state->get('client_id');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// We do not need the Language filter when modules are not filtered
+		if ($this->clientId == 1 && !JModuleHelper::isAdminMultilang())
+		{
+			unset($this->activeFilters['language']);
+			$this->filterForm->removeField('language', 'filter');
+		}
+
+		// We don't need the toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+		}
+		// If in modal layout.
+		else
+		{
+			// Client id selector should not exist.
+			$this->filterForm->removeField('client_id', '');
+
+			// If in the frontend state and language should not activate the search tools.
+			if (JFactory::getApplication()->isClient('site'))
+			{
+				unset($this->activeFilters['state']);
+				unset($this->activeFilters['language']);
+			}
+		}
+
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_modules');
+		$user  = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		if ($state->get('client_id') == 1)
+		{
+			JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_ADMIN'), 'cube module');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_SITE'), 'cube module');
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			// Instantiate a new JLayoutFile instance and render the layout
+			$layout = new JLayoutFile('toolbar.newmodule');
+
+			$bar->appendButton('Custom', $layout->render(array()), 'new');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('module.edit');
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::custom('modules.duplicate', 'copy.png', 'copy_f2.png', 'JTOOLBAR_DUPLICATE', true);
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('modules.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('modules.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::checkin('modules.checkin');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_modules') && $user->authorise('core.edit', 'com_modules')
+			&& $user->authorise('core.edit.state', 'com_modules'))
+		{
+			JHtml::_('bootstrap.renderModal', 'collapseModal');
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'modules.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('modules.trash');
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::preferences('com_modules');
+		}
+
+		JToolbarHelper::help('JHELP_EXTENSIONS_MODULE_MANAGER');
+
+		if (JHtmlSidebar::getEntries())
+		{
+			$this->sidebar = JHtmlSidebar::render();
+		}
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		$this->state = $this->get('State');
+
+		if ($this->state->get('client_id') == 0)
+		{
+			if ($this->getLayout() == 'default')
+			{
+				return array(
+					'ordering'       => JText::_('JGRID_HEADING_ORDERING'),
+					'a.published'    => JText::_('JSTATUS'),
+					'a.title'        => JText::_('JGLOBAL_TITLE'),
+					'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+					'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+					'pages'          => JText::_('COM_MODULES_HEADING_PAGES'),
+					'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+					'language_title' => JText::_('JGRID_HEADING_LANGUAGE'),
+					'a.id'           => JText::_('JGRID_HEADING_ID')
+				);
+			}
+
+			return array(
+				'a.title'        => JText::_('JGLOBAL_TITLE'),
+				'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+				'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+				'pages'          => JText::_('COM_MODULES_HEADING_PAGES'),
+				'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+				'language_title' => JText::_('JGRID_HEADING_LANGUAGE'),
+				'a.id'           => JText::_('JGRID_HEADING_ID')
+			);
+		}
+		else
+		{
+			if ($this->getLayout() == 'default')
+			{
+				return array(
+					'ordering'       => JText::_('JGRID_HEADING_ORDERING'),
+					'a.published'    => JText::_('JSTATUS'),
+					'a.title'        => JText::_('JGLOBAL_TITLE'),
+					'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+					'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+					'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+					'a.language'     => JText::_('JGRID_HEADING_LANGUAGE'),
+					'a.id'           => JText::_('JGRID_HEADING_ID')
+				);
+			}
+
+			return array(
+					'a.title'        => JText::_('JGLOBAL_TITLE'),
+					'position'       => JText::_('COM_MODULES_HEADING_POSITION'),
+					'name'           => JText::_('COM_MODULES_HEADING_MODULE'),
+					'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+					'a.language'     => JText::_('JGRID_HEADING_LANGUAGE'),
+					'a.id'           => JText::_('JGRID_HEADING_ID')
+			);
+		}
+	}
+}
diff --git a/core/administrator/components/com_modules/views/positions/tmpl/modal.php b/core/administrator/components/com_modules/views/positions/tmpl/modal.php
new file mode 100644
index 00000000..a746556c
--- /dev/null
+++ b/core/administrator/components/com_modules/views/positions/tmpl/modal.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// @deprecated  4.0 without replacement only used in hathor
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('formbehavior.chosen', 'select');
+
+$function  = JFactory::getApplication()->input->getCmd('function', 'jSelectPosition');
+$lang      = JFactory::getLanguage();
+$ordering  = $this->escape($this->state->get('list.ordering'));
+$direction = $this->escape($this->state->get('list.direction'));
+$clientId  = $this->state->get('client_id');
+$state     = $this->state->get('filter.state');
+$template  = $this->state->get('filter.template');
+$type      = $this->state->get('filter.type');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_modules&view=positions&layout=modal&tmpl=component&function=' . $function . '&client_id=' . $clientId); ?>" method="post" name="adminForm" id="adminForm">
+	<fieldset class="filter clearfix">
+		<div class="left">
+			<label for="filter_search">
+				<?php echo JText::_('JSEARCH_FILTER_LABEL'); ?>
+			</label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" size="30" title="<?php echo JText::_('COM_MODULES_FILTER_SEARCH_DESC'); ?>" />
+
+			<button type="submit">
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="right">
+			<select name="filter_state" onchange="this.form.submit()">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('modules.templateStates'), 'value', 'text', $state, true); ?>
+			</select>
+
+			<select name="filter_type" onchange="this.form.submit()">
+				<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_TYPE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('modules.types'), 'value', 'text', $type, true); ?>
+			</select>
+
+			<select name="filter_template" onchange="this.form.submit()">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TEMPLATE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('modules.templates', $clientId), 'value', 'text', $template, true); ?>
+			</select>
+		</div>
+	</fieldset>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="title" width="20%">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'value', $direction, $ordering); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_TEMPLATES', 'templates', $direction, $ordering); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="15">
+					<?php echo $this->pagination->getListFooter(); ?>
+				</td>
+			</tr>
+		</tfoot>
+		<tbody>
+		<?php $i = 1; foreach ($this->items as $value => $templates) : ?>
+			<tr class="row<?php echo $i = 1 - $i; ?>">
+				<td>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $function; ?>('<?php echo $value; ?>');"><?php echo $this->escape($value); ?></a>
+				</td>
+				<td>
+					<?php if (!empty($templates)) : ?>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $function; ?>('<?php echo $value; ?>');">
+						<ul>
+						<?php foreach ($templates as $template => $label) : ?>
+							<li><?php echo $lang->hasKey($label) ? JText::sprintf('COM_MODULES_MODULE_TEMPLATE_POSITION', JText::_($template), JText::_($label)) : JText::_($template); ?></li>
+						<?php endforeach; ?>
+						</ul>
+					</a>
+					<?php endif; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $ordering; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $direction; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_modules/views/positions/view.html.php b/core/administrator/components/com_modules/views/positions/view.html.php
new file mode 100644
index 00000000..87469927
--- /dev/null
+++ b/core/administrator/components/com_modules/views/positions/view.html.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// @deprecated  4.0 without replacement only used in hathor
+
+defined('_JEXEC') or die;
+
+/**
+ * View Module positions class.
+ *
+ * @since  1.6
+ */
+class ModulesViewPositions extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->items      = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->state      = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_modules/views/preview/tmpl/default.php b/core/administrator/components/com_modules/views/preview/tmpl/default.php
new file mode 100644
index 00000000..977c94f8
--- /dev/null
+++ b/core/administrator/components/com_modules/views/preview/tmpl/default.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// @deprecated  4.0 not used for a long time
+
+defined('_JEXEC') or die;
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+	var form = window.top.document.adminForm
+	var title = form.title.value;
+	var alltext = window.top.' . $this->editor->getContent('text') . ';
+
+	jQuery(document).ready(function() {
+		document.getElementById("td-title").innerHTML = title;
+		document.getElementById("td-text").innerHTML = alltext;
+	});'
+);
+?>
+
+<table class="center" width="90%">
+	<tr>
+		<td class="contentheading" colspan="2" id="td-title"></td>
+	</tr>
+<tr>
+	<td valign="top" height="90%" colspan="2" id="td-text"></td>
+</tr>
+</table>
diff --git a/core/administrator/components/com_modules/views/preview/view.html.php b/core/administrator/components/com_modules/views/preview/view.html.php
new file mode 100644
index 00000000..04c675d5
--- /dev/null
+++ b/core/administrator/components/com_modules/views/preview/view.html.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// @deprecated  4.0 not used for a long time
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Modules component
+ *
+ * @since  1.6
+ */
+class ModulesViewPreview extends JViewLegacy
+{
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$editor = JFactory::getConfig()->get('editor');
+
+		$this->editor = JEditor::getInstance($editor);
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/administrator/components/com_modules/views/select/tmpl/default.php b/core/administrator/components/com_modules/views/select/tmpl/default.php
new file mode 100644
index 00000000..818130c4
--- /dev/null
+++ b/core/administrator/components/com_modules/views/select/tmpl/default.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.popover');
+$document = JFactory::getDocument();
+?>
+
+<h2><?php echo JText::_('COM_MODULES_TYPE_CHOOSE'); ?></h2>
+<ul id="new-modules-list" class="list list-striped">
+<?php foreach ($this->items as &$item) : ?>
+	<?php // Prepare variables for the link. ?>
+	<?php $link       = 'index.php?option=com_modules&task=module.add&eid=' . $item->extension_id; ?>
+	<?php $name       = $this->escape($item->name); ?>
+	<?php $desc       = JHtml::_('string.truncate', $this->escape(strip_tags($item->desc)), 200); ?>
+	<?php $short_desc = JHtml::_('string.truncate', $this->escape(strip_tags($item->desc)), 90); ?>
+
+	<?php if ($document->direction != 'rtl') : ?>
+	<li>
+		<a href="<?php echo JRoute::_($link); ?>">
+			<strong><?php echo $name; ?></strong></a>
+		<small class="hasPopover" data-placement="right" title="<?php echo $name; ?>" data-content="<?php echo $desc; ?>"><?php echo $short_desc; ?></small>
+	</li>
+	<?php else : ?>
+	<li>
+		<small rel="popover" data-placement="left" title="<?php echo $name; ?>" data-content="<?php echo $desc; ?>"><?php echo $short_desc; ?></small>
+		<a href="<?php echo JRoute::_($link); ?>">
+			<strong><?php echo $name; ?></strong></a>
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
+</ul>
+<div class="clr"></div>
diff --git a/core/administrator/components/com_modules/views/select/view.html.php b/core/administrator/components/com_modules/views/select/view.html.php
new file mode 100644
index 00000000..3982d61a
--- /dev/null
+++ b/core/administrator/components/com_modules/views/select/view.html.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Modules component
+ *
+ * @since  1.6
+ */
+class ModulesViewSelect extends JViewLegacy
+{
+	protected $state;
+
+	protected $items;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$state = $this->get('State');
+		$items = $this->get('Items');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->state = &$state;
+		$this->items = &$items;
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+
+		// Add page title
+		if ($state->get('client_id') == 1)
+		{
+			JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_ADMIN'), 'cube module');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_SITE'), 'cube module');
+		}
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new JLayoutFile('toolbar.cancelselect');
+
+		$bar->appendButton('Custom', $layout->render(array()), 'new');
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/access.xml b/core/administrator/components/com_newsfeeds/access.xml
new file mode 100644
index 00000000..0cf23a39
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/access.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_newsfeeds">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
+	</section>
+	<section name="category">
+		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
+	</section>
+</access>
\ No newline at end of file
diff --git a/core/administrator/components/com_newsfeeds/config.xml b/core/administrator/components/com_newsfeeds/config.xml
new file mode 100644
index 00000000..3e0b074a
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/config.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+
+	<fieldset
+		name="newsfeed"
+		label="COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_LABEL"
+		description="COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_DESC"
+		>
+
+		<field
+			name="newsfeed_layout"
+			type="componentlayout"
+			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_newsfeeds"
+			view="newsfeed"
+		/>
+		
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			default="5"
+			filter="integer"
+			showon="save_history:1"
+		/>
+
+		<field
+			name="show_feed_image"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_DESC"
+			id="show_feed_image"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_feed_description"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC"
+			id="show_feed_description"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_item_description"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC"
+			id="show_item_description"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="feed_character_count"
+			type="number"
+			label="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_LABEL"
+			description="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC"
+			id="feed_character_count"
+			default="0"
+			size="6"
+		/>
+
+		<field 
+			name="feed_display_order" 
+			type="list"
+			label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
+			description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"
+			id="feed_display_order"
+			>
+			<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
+			<option value="asc">JGLOBAL_OLDEST_FIRST</option>
+		</field>
+		
+		<field
+			name="float_first"
+			type="list"
+			label="COM_NEWSFEEDS_FLOAT_FIRST_LABEL"
+			description="COM_NEWSFEEDS_FLOAT_DESC"
+			>
+			<option value="right">COM_NEWSFEEDS_RIGHT</option>
+			<option value="left">COM_NEWSFEEDS_LEFT</option>
+			<option value="none">COM_NEWSFEEDS_NONE</option>
+		</field>
+
+		<field
+			name="float_second"
+			type="list"
+			label="COM_NEWSFEEDS_FLOAT_SECOND_LABEL"
+			description="COM_NEWSFEEDS_FLOAT_DESC"
+			>
+			<option value="right">COM_NEWSFEEDS_RIGHT</option>
+			<option value="left">COM_NEWSFEEDS_LEFT</option>
+			<option value="none">COM_NEWSFEEDS_NONE</option>
+		</field>
+
+		<field
+			name="show_tags"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_TAGS_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_TAGS_DESC"
+			id="show_tags"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="category"
+		label="JCATEGORY"
+		description="COM_NEWSFEEDS_FIELD_CONFIG_CATEGORY_SETTINGS_DESC"
+		>
+
+		<field
+			name="category_layout"
+			type="componentlayout"
+			label="JGLOBAL_FIELD_LAYOUT_LABEL"
+			description="JGLOBAL_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_newsfeeds"
+			view="category"
+		/>
+
+		<field
+			name="show_category_title"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_TITLE"
+			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_description"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+			id="show_description"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_description_image"
+			type="radio"
+			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="maxLevel"
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
+			<option value="0">JNONE</option>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field
+			name="show_empty_categories"
+			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="maxLevel:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_subcat_desc"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="maxLevel:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_cat_items"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
+			id="show_cat_items"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_cat_tags"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_CAT_TAGS_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_CAT_TAGS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="categories"
+		label="JCATEGORIES"
+		description="COM_NEWSFEEDS_CATEGORIES_DESC"
+		>
+
+		<field
+			name="show_base_description"
+			type="radio"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="maxLevelcat"
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			default="-1"
+			>
+			<option value="-1">JALL</option>
+			<option value="0">JNONE</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field
+			name="show_empty_categories_cat"
+			type="radio"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			showon="maxLevelcat:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_subcat_desc_cat"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="maxLevelcat:-1,1,2,3,4,5"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_cat_items_cat"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="listlayout"
+		label="JGLOBAL_LIST_LAYOUT_OPTIONS"
+		description="COM_NEWSFEEDS_FIELD_CONFIG_LIST_SETTINGS_DESC"
+		>
+
+		<field
+			name="filter_field"
+			type="radio"
+			label="JGLOBAL_FILTER_FIELD_LABEL"
+			description="JGLOBAL_FILTER_FIELD_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_pagination_limit"
+			type="radio"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_headings"
+			type="radio"
+			label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			description="JGLOBAL_SHOW_HEADINGS_DESC"
+			id="show_headings"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_articles"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL"
+			description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC"
+			id="show_articles"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_link"
+			type="radio"
+			label="COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL"
+			description="COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC"
+			id="show_link"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_pagination"
+			type="list"
+			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
+			default="2"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+			<option value="2">JGLOBAL_AUTO</option>
+		</field>
+
+		<field
+			name="show_pagination_results"
+			type="radio"
+			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			showon="show_pagination:1,2"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+	</fieldset>
+
+	<fieldset name="integration"
+		label="JGLOBAL_INTEGRATION_LABEL"
+		description="COM_NEWSFEEDS_CONFIG_INTEGRATION_SETTINGS_DESC"
+	>
+
+		<field
+			name="sef_advanced"
+			type="radio"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			label="JGLOBAL_SEF_ADVANCED_LABEL"
+			description="JGLOBAL_SEF_ADVANCED_DESC"
+			filter="integer"
+		>
+			<option value="0">JGLOBAL_SEF_ADVANCED_LEGACY</option>
+			<option value="1">JGLOBAL_SEF_ADVANCED_MODERN</option>
+		</field>
+
+		<field
+			name="sef_ids"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			default="0"
+			label="JGLOBAL_SEF_NOIDS_LABEL"
+			description="JGLOBAL_SEF_NOIDS_DESC"
+			showon="sef_advanced:1"
+			filter="integer">
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_newsfeeds"
+			section="component"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_newsfeeds/controller.php b/core/administrator/components/com_newsfeeds/controller.php
new file mode 100644
index 00000000..e36d7656
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/controller.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Newsfeeds master display controller.
+ *
+ * @since  1.6
+ */
+class NewsfeedsController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		JLoader::register('NewsfeedsHelper', JPATH_ADMINISTRATOR . '/components/com_newsfeeds/helpers/newsfeeds.php');
+
+		$view   = $this->input->get('view', 'newsfeeds');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'newsfeed' && $layout == 'edit' && !$this->checkEditId('com_newsfeeds.edit.newsfeed', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/controllers/newsfeed.php b/core/administrator/components/com_newsfeeds/controllers/newsfeed.php
new file mode 100644
index 00000000..c21d9be0
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/controllers/newsfeed.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Newsfeed controller class.
+ *
+ * @since  1.6
+ */
+class NewsfeedsControllerNewsfeed extends JControllerForm
+{
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
+		$allow = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the URL check it.
+			$allow = JFactory::getUser()->authorise('core.create', $this->option . '.category.' . $categoryId);
+		}
+
+		if ($allow === null)
+		{
+			// In the absence of better information, revert to the component permissions.
+			return parent::allowAdd($data);
+		}
+		else
+		{
+			return $allow;
+		}
+	}
+
+	/**
+	 * Method to check if you can edit a record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+
+		// Since there is no asset tracking, fallback to the component permissions.
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Get the item.
+		$item = $this->getModel()->getItem($recordId);
+
+		// Since there is no item, return false.
+		if (empty($item))
+		{
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		// Check if can edit own core.edit.own.
+		$canEditOwn = $user->authorise('core.edit.own', $this->option . '.category.' . (int) $item->catid) && $item->created_by == $user->id;
+
+		// Check the category core.edit permissions.
+		return $canEditOwn || $user->authorise('core.edit', $this->option . '.category.' . (int) $item->catid);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean   True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Newsfeed', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/controllers/newsfeeds.php b/core/administrator/components/com_newsfeeds/controllers/newsfeeds.php
new file mode 100644
index 00000000..98c37632
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/controllers/newsfeeds.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Newsfeeds list controller class.
+ *
+ * @since  1.6
+ */
+class NewsfeedsControllerNewsfeeds extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Newsfeed', $prefix = 'NewsfeedsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the item has been deleted.
+	 *
+	 * @param   JModelLegacy  $model  The data model object.
+	 * @param   integer       $ids    The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postDeleteHook(JModelLegacy $model, $ids = null)
+	{
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/helpers/associations.php b/core/administrator/components/com_newsfeeds/helpers/associations.php
new file mode 100644
index 00000000..a806a4d8
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/helpers/associations.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Association\AssociationExtensionHelper;
+
+JTable::addIncludePath(__DIR__ . '/../tables');
+
+/**
+ * Content associations helper.
+ *
+ * @since  3.7.0
+ */
+class NewsfeedsAssociationsHelper extends AssociationExtensionHelper
+{
+	/**
+	 * The extension name
+	 *
+	 * @var       array   $extension
+	 *
+	 * @since    3.7.0
+	 */
+	protected $extension = 'com_newsfeeds';
+
+	/**
+	 * Array of item types
+	 *
+	 * @var       array   $itemTypes
+	 *
+	 * @since    3.7.0
+	 */
+	protected $itemTypes = array('newsfeed', 'category');
+
+	/**
+	 * Has the extension association support
+	 *
+	 * @var       boolean   $associationsSupport
+	 *
+	 * @since    3.7.0
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since   3.7.0
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'newsfeed':
+				$table = JTable::getInstance('Newsfeed', 'NewsfeedsTable');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('Category');
+				break;
+		}
+
+		if (empty($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since   3.7.0
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+			switch ($typeName)
+			{
+				case 'newsfeed':
+					$fields['title'] = 'a.name';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['category'] = true;
+					$support['save2copy'] = true;
+
+					$tables = array(
+						'a' => '#__newsfeeds'
+					);
+					$title = 'newsfeed';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+					$support['level'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/helpers/html/newsfeed.php b/core/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
new file mode 100644
index 00000000..716258ad
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('NewsfeedsHelper', JPATH_ADMINISTRATOR . '/components/com_newsfeeds/helpers/newsfeeds.php');
+
+/**
+ * Utility class for creating HTML Grids.
+ *
+ * @since  1.5
+ */
+class JHtmlNewsfeed
+{
+	/**
+	 * Get the associated language flags
+	 *
+	 * @param   int  $newsfeedid  The item id to search associations
+	 *
+	 * @return  string  The language HTML
+	 *
+	 * @throws  Exception  Throws a 500 Exception on Database failure
+	 */
+	public static function association($newsfeedid)
+	{
+		// Defaults
+		$html = '';
+
+		// Get the associations
+		if ($associations = JLanguageAssociations::getAssociations('com_newsfeeds', '#__newsfeeds', 'com_newsfeeds.item', $newsfeedid))
+		{
+			foreach ($associations as $tag => $associated)
+			{
+				$associations[$tag] = (int) $associated->id;
+			}
+
+			// Get the associated newsfeed items
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('c.id, c.name as title')
+				->select('l.sef as lang_sef, lang_code')
+				->from('#__newsfeeds as c')
+				->select('cat.title as category_title')
+				->join('LEFT', '#__categories as cat ON cat.id=c.catid')
+				->where('c.id IN (' . implode(',', array_values($associations)) . ')')
+				->where('c.id != ' . $newsfeedid)
+				->join('LEFT', '#__languages as l ON c.language=l.lang_code')
+				->select('l.image')
+				->select('l.title as language_title');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				throw new Exception($e->getMessage(), 500);
+			}
+
+			if ($items)
+			{
+				foreach ($items as &$item)
+				{
+					$text = strtoupper($item->lang_sef);
+					$url = JRoute::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id=' . (int) $item->id);
+					$tooltip = htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br />' . JText::sprintf('JCATEGORY_SPRINTF', $item->category_title);
+					$classes = 'hasPopover label label-association label-' . $item->lang_sef;
+
+					$item->link = '<a href="' . $url . '" title="' . $item->language_title . '" class="' . $classes
+						. '" data-content="' . $tooltip . '" data-placement="top">'
+						. $text . '</a>';
+				}
+			}
+
+			JHtml::_('bootstrap.popover');
+
+			$html = JLayoutHelper::render('joomla.content.associations', $items);
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/core/administrator/components/com_newsfeeds/helpers/newsfeeds.php
new file mode 100644
index 00000000..d2c65e45
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/helpers/newsfeeds.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Newsfeeds component helper.
+ *
+ * @since  1.6
+ */
+class NewsfeedsHelper extends JHelperContent
+{
+	public static $extension = 'com_newsfeeds';
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_NEWSFEEDS_SUBMENU_NEWSFEEDS'),
+			'index.php?option=com_newsfeeds&view=newsfeeds',
+			$vName == 'newsfeeds'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_NEWSFEEDS_SUBMENU_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_newsfeeds',
+			$vName == 'categories'
+		);
+	}
+
+	/**
+	 * Adds Count Items for Category Manager.
+	 *
+	 * @param   stdClass[]  &$items  The banner category objects
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.5
+	 */
+	public static function countItems(&$items)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('published AS state, count(*) AS count')
+				->from($db->qn('#__newsfeeds'))
+				->where('catid = ' . (int) $item->id)
+				->group('state');
+			$db->setQuery($query);
+			$newfeeds = $db->loadObjectList();
+
+			foreach ($newfeeds as $newsfeed)
+			{
+				if ($newsfeed->state == 1)
+				{
+					$item->count_published = $newsfeed->count;
+				}
+
+				if ($newsfeed->state == 0)
+				{
+					$item->count_unpublished = $newsfeed->count;
+				}
+
+				if ($newsfeed->state == 2)
+				{
+					$item->count_archived = $newsfeed->count;
+				}
+
+				if ($newsfeed->state == -2)
+				{
+					$item->count_trashed = $newsfeed->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Adds Count Items for Tag Manager.
+	 *
+	 * @param   stdClass[]  &$items     The newsfeed tag objects
+	 * @param   string      $extension  The name of the active view.
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.6
+	 */
+	public static function countTagItems(&$items, $extension)
+	{
+		$db = JFactory::getDbo();
+		$parts     = explode('.', $extension);
+		$section   = null;
+
+		if (count($parts) > 1)
+		{
+			$section = $parts[1];
+		}
+
+		$join = $db->qn('#__newsfeeds') . ' AS c ON ct.content_item_id=c.id';
+
+		if ($section === 'category')
+		{
+			$join = $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id';
+		}
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('published AS state, count(*) AS count')
+				->from($db->qn('#__contentitem_tag_map') . 'AS ct ')
+				->where('ct.tag_id = ' . (int) $item->id)
+				->where('ct.type_alias =' . $db->q($extension))
+				->join('LEFT', $join)
+				->group('state');
+
+			$db->setQuery($query);
+			$newsfeeds = $db->loadObjectList();
+
+			foreach ($newsfeeds as $newsfeed)
+			{
+				if ($newsfeed->state == 1)
+				{
+					$item->count_published = $newsfeed->count;
+				}
+
+				if ($newsfeed->state == 0)
+				{
+					$item->count_unpublished = $newsfeed->count;
+				}
+
+				if ($newsfeed->state == 2)
+				{
+					$item->count_archived = $newsfeed->count;
+				}
+
+				if ($newsfeed->state == -2)
+				{
+					$item->count_trashed = $newsfeed->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/core/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
new file mode 100644
index 00000000..050c040b
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Supports a modal newsfeeds picker.
+ *
+ * @since  1.6
+ */
+class JFormFieldModal_Newsfeed extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   1.6
+	 */
+	protected $type = 'Modal_Newsfeed';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		$allowNew    = ((string) $this->element['new'] == 'true');
+		$allowEdit   = ((string) $this->element['edit'] == 'true');
+		$allowClear  = ((string) $this->element['clear'] != 'false');
+		$allowSelect = ((string) $this->element['select'] != 'false');
+
+		// Load language
+		JFactory::getLanguage()->load('com_newsfeeds', JPATH_ADMINISTRATOR);
+
+		// The active newsfeed id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Create the modal id.
+		$modalId = 'Newsfeed_' . $this->id;
+
+		// Add the modal field script to the document head.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/modal-fields.js', array('version' => 'auto', 'relative' => true));
+
+		// Script to proxy the select modal function to the modal-fields.js file.
+		if ($allowSelect)
+		{
+			static $scriptSelect = null;
+
+			if (is_null($scriptSelect))
+			{
+				$scriptSelect = array();
+			}
+
+			if (!isset($scriptSelect[$this->id]))
+			{
+				JFactory::getDocument()->addScriptDeclaration("
+				function jSelectNewsfeed_" . $this->id . "(id, title, object) {
+					window.processModalSelect('Newsfeed', '" . $this->id . "', id, title, '', object);
+				}
+				"
+				);
+
+				$scriptSelect[$this->id] = true;
+			}
+		}
+
+		// Setup variables for display.
+		$linkNewsfeeds = 'index.php?option=com_newsfeeds&amp;view=newsfeeds&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$linkNewsfeed  = 'index.php?option=com_newsfeeds&amp;view=newsfeed&amp;layout=modal&amp;tmpl=component&amp;' . JSession::getFormToken() . '=1';
+		$modalTitle    = JText::_('COM_NEWSFEEDS_CHANGE_FEED');
+
+		if (isset($this->element['language']))
+		{
+			$linkNewsfeeds .= '&amp;forcedLanguage=' . $this->element['language'];
+			$linkNewsfeed  .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle    .= ' &#8212; ' . $this->element['label'];
+		}
+
+		$urlSelect = $linkNewsfeeds . '&amp;function=jSelectNewsfeed_' . $this->id;
+		$urlEdit   = $linkNewsfeed . '&amp;task=newsfeed.edit&amp;id=\' + document.getElementById("' . $this->id . '_id").value + \'';
+		$urlNew    = $linkNewsfeed . '&amp;task=newsfeed.add';
+
+		if ($value)
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('name'))
+				->from($db->quoteName('#__newsfeeds'))
+				->where($db->quoteName('id') . ' = ' . (int) $value);
+			$db->setQuery($query);
+
+			try
+			{
+				$title = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+			}
+		}
+
+		$title = empty($title) ? JText::_('COM_NEWSFEEDS_SELECT_A_FEED') : htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
+
+		// The current newsfeed display field.
+		$html  = '<span class="input-append">';
+		$html .= '<input class="input-medium" id="' . $this->id . '_name" type="text" value="' . $title . '" disabled="disabled" size="35" />';
+
+		// Select newsfeed button
+		if ($allowSelect)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_select"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalSelect' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_NEWSFEEDS_CHANGE_FEED') . '">'
+				. '<span class="icon-file" aria-hidden="true"></span> ' . JText::_('JSELECT')
+				. '</a>';
+		}
+
+		// New newsfeed button
+		if ($allowNew)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? ' hidden' : '') . '"'
+				. ' id="' . $this->id . '_new"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalNew' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_NEWSFEEDS_NEW_NEWSFEED') . '">'
+				. '<span class="icon-new" aria-hidden="true"></span> ' . JText::_('JACTION_CREATE')
+				. '</a>';
+		}
+
+		// Edit newsfeed button
+		if ($allowEdit)
+		{
+			$html .= '<a'
+				. ' class="btn hasTooltip' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_edit"'
+				. ' data-toggle="modal"'
+				. ' role="button"'
+				. ' href="#ModalEdit' . $modalId . '"'
+				. ' title="' . JHtml::tooltipText('COM_NEWSFEEDS_EDIT_NEWSFEED') . '">'
+				. '<span class="icon-edit" aria-hidden="true"></span> ' . JText::_('JACTION_EDIT')
+				. '</a>';
+		}
+
+		// Clear newsfeed button
+		if ($allowClear)
+		{
+			$html .= '<a'
+				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+				. ' id="' . $this->id . '_clear"'
+				. ' href="#"'
+				. ' onclick="window.processModalParent(\'' . $this->id . '\'); return false;">'
+				. '<span class="icon-remove" aria-hidden="true"></span>' . JText::_('JCLEAR')
+				. '</a>';
+		}
+
+		$html .= '</span>';
+
+		// Select newsfeed modal
+		if ($allowSelect)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalSelect' . $modalId,
+				array(
+					'title'       => $modalTitle,
+					'url'         => $urlSelect,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" data-dismiss="modal" aria-hidden="true">' . JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+				)
+			);
+		}
+
+		// New newsfeed modal
+		if ($allowNew)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalNew' . $modalId,
+				array(
+					'title'       => JText::_('COM_NEWSFEEDS_NEW_NEWSFEED'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlNew,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'add\', \'newsfeed\', \'cancel\', \'newsfeed-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'add\', \'newsfeed\', \'save\', \'newsfeed-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'add\', \'newsfeed\', \'apply\', \'newsfeed-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Edit newsfeed modal.
+		if ($allowEdit)
+		{
+			$html .= JHtml::_(
+				'bootstrap.renderModal',
+				'ModalEdit' . $modalId,
+				array(
+					'title'       => JText::_('COM_NEWSFEEDS_EDIT_NEWSFEED'),
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'closeButton' => false,
+					'url'         => $urlEdit,
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \'' . $this->id
+							. '\', \'edit\', \'newsfeed\', \'cancel\', \'newsfeed-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+							. '<a role="button" class="btn btn-primary" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'edit\', \'newsfeed\', \'save\', \'newsfeed-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JSAVE') . '</a>'
+							. '<a role="button" class="btn btn-success" aria-hidden="true"'
+							. ' onclick="window.processModalEdit(this, \''
+							. $this->id . '\', \'edit\', \'newsfeed\', \'apply\', \'newsfeed-form\', \'jform_id\', \'jform_name\'); return false;">'
+							. JText::_('JAPPLY') . '</a>',
+				)
+			);
+		}
+
+		// Add class='required' for client side validation
+		$class = $this->required ? ' class="required modal-value"' : '';
+
+		$html .= '<input type="hidden" id="' . $this->id . '_id"' . $class . ' data-required="' . (int) $this->required . '" name="' . $this->name
+			. '" data-text="' . htmlspecialchars(JText::_('COM_NEWSFEEDS_SELECT_A_FEED', true), ENT_COMPAT, 'UTF-8') . '" value="' . $value . '" />';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.4
+	 */
+	protected function getLabel()
+	{
+		return str_replace($this->id, $this->id . '_id', parent::getLabel());
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/models/fields/newsfeeds.php b/core/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
new file mode 100644
index 00000000..e3ec0feb
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * News Feed List field.
+ *
+ * @since  1.6
+ */
+class JFormFieldNewsfeeds extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   1.6
+	 */
+	protected $type = 'Newsfeeds';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('id As value, name As text')
+			->from('#__newsfeeds AS a')
+			->order('a.name');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $db->getMessage());
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml b/core/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml
new file mode 100644
index 00000000..60f597b3
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fields name="filter">
+
+		<field
+			name="search"
+			type="text"
+			label="COM_NEWSFEEDS_FILTER_SEARCH_LABEL"
+			description="COM_NEWSFEEDS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="COM_NEWSFEEDS_FILTER_PUBLISHED"
+			description="COM_NEWSFEEDS_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_newsfeeds"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			mode="nested"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_TAG</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_NEWSFEEDS_LIST_FULL_ORDERING"
+			description="COM_NEWSFEEDS_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.name ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.name DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="numarticles ASC">COM_NEWSFEEDS_NUM_ARTICLES_HEADING_ASC</option>
+			<option value="numarticles DESC">COM_NEWSFEEDS_NUM_ARTICLES_HEADING_DESC</option>
+			<option value="a.cache_time ASC">COM_NEWSFEEDS_CACHE_TIME_HEADING_ASC</option>
+			<option value="a.cache_time DESC">COM_NEWSFEEDS_CACHE_TIME_HEADING_DESC</option>
+			<option
+				value="association ASC"
+				requires="associations"
+				>
+				JASSOCIATIONS_ASC
+			</option>
+			<option
+				value="association DESC"
+				requires="associations"
+				>
+				JASSOCIATIONS_DESC
+			</option>
+			<option value="language_title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language_title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_NEWSFEEDS_LIST_LIMIT"
+			description="COM_NEWSFEEDS_LIST_LIMIT_DESC"
+			default="25"
+			class="input-mini"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/core/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
new file mode 100644
index 00000000..db1acff4
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+
+	<fieldset addfieldpath="/administrator/components/com_categories/models/fields" >
+
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			class="readonly"
+			readonly="true"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="JFIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
+			required="true"
+		/>
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			size="45"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+		/>
+
+		<field
+			name="published"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
+			class="chzn-color-state"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="catid"
+			type="categoryedit"
+			label="JCATEGORY"
+			description="COM_NEWSFEEDS_FIELD_CATEGORY_DESC"
+			extension="com_newsfeeds"
+			required="true"
+			default=""
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="COM_NEWSFEEDS_FIELD_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tags"
+			type="tag"
+			label="JTAG"
+			description="JTAG_DESC"
+			class="span12"
+			multiple="true"
+		/>
+
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			labelclass="control-label"
+			class="span12"
+			size="45"
+			maxlength="255"
+		/>
+
+		<field
+			name="description"
+			type="editor"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_NEWSFEEDS_FIELD_DESCRIPTION_DESC"
+			buttons="true"
+			hide="pagebreak,readmore"
+			filter="JComponentHelper::filterText"
+		/>
+
+		<field
+			name="link"
+			type="url"
+			label="COM_NEWSFEEDS_FIELD_LINK_LABEL"
+			description="COM_NEWSFEEDS_FIELD_LINK_DESC"
+			class="span12"
+			size="60"
+			required="true"
+			filter="url"
+		/>
+
+		<field
+			name="numarticles"
+			type="number"
+			label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_LABEL"
+			description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_DESC"
+			default="5"
+			size="2"
+		/>
+
+		<field
+			name="cache_time"
+			type="number"
+			label="COM_NEWSFEEDS_FIELD_CACHETIME_LABEL"
+			description="JGLOBAL_FIELD_FIELD_CACHETIME_DESC"
+			default="3600"
+			size="4"
+		/>
+
+		<field
+			name="ordering"
+			type="ordering"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			content_type="com_newsfeeds.newsfeed"
+		/>
+
+		<field
+			name="created"
+			type="calendar"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			description="JGLOBAL_FIELD_CREATED_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="created_by"
+			type="user"
+			label="JGLOBAL_FIELD_Created_by_Label"
+			description="JGLOBAL_FIELD_CREATED_BY_DESC"
+		/>
+
+		<field
+			name="created_by_alias"
+			type="text"
+			label="JGLOBAL_FIELD_Created_by_alias_Label"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			size="20"
+		/>
+
+		<field
+			name="modified"
+			type="calendar"
+			label="JGLOBAL_FIELD_Modified_Label"
+			description="COM_NEWSFEEDS_FIELD_MODIFIED_DESC"
+			class="readonly"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			readonly="true"
+			filter="user_utc"
+		/>
+
+		<field
+			name="modified_by"
+			type="user"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="COM_NEWSFEEDS_FIELD_MODIFIED_BY_DESC"
+			class="readonly"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="version"
+			type="text"
+			label="COM_NEWSFEEDS_FIELD_VERSION_LABEL"
+			description="COM_NEWSFEEDS_FIELD_VERSION_DESC"
+			class="readonly"
+			size="6"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out"
+			type="Text"
+			label="JGLOBAL_FIELD_CHECKEDOUT_LABEL"
+			description="JGLOBAL_FIELD_CHECKEDOUT_DESC"
+			size="6"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="Text"
+			label="JGLOBAL_FIELD_CHECKEDOUT_TIME_LABEL"
+			description="JGLOBAL_FIELD_CHECKEDOUT_TIME_DESC"
+			size="6"
+			readonly="true"
+			filter="unset"
+		/>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_UP_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+
+		<field
+			name="metakey"
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field
+			name="metadesc"
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
+			rows="3"
+			cols="30"
+		/>
+
+		<field
+			name="xreference"
+			type="text"
+			label="JFIELD_XREFERENCE_LABEL"
+			description="JFIELD_XREFERENCE_DESC"
+			size="20"
+		/>
+
+		<fields name="images">
+
+			<fieldset name="images" label="JGLOBAL_FIELDSET_IMAGE_OPTIONS">
+
+				<field
+					name="image_first"
+					type="media"
+					label="COM_NEWSFEEDS_FIELD_FIRST_LABEL"
+					description="COM_NEWSFEEDS_FIELD_FIRST_DESC"
+				/>
+
+				<field
+					name="float_first"
+					type="list"
+					label="COM_NEWSFEEDS_FLOAT_LABEL"
+					description="COM_NEWSFEEDS_FLOAT_DESC"
+					useglobal="true"
+					>
+					<option value="right">COM_NEWSFEEDS_RIGHT</option>
+					<option value="left">COM_NEWSFEEDS_LEFT</option>
+					<option value="none">COM_NEWSFEEDS_NONE</option>
+				</field>
+
+				<field
+					name="image_first_alt"
+					type="text"
+					label="COM_NEWSFEEDS_FIELD_IMAGE_ALT_LABEL"
+					description="COM_NEWSFEEDS_FIELD_IMAGE_ALT_DESC"
+					size="20"
+				/>
+
+				<field
+					name="image_first_caption"
+					type="text"
+					label="COM_NEWSFEEDS_FIELD_IMAGE_CAPTION_LABEL"
+					description="COM_NEWSFEEDS_FIELD_IMAGE_CAPTION_DESC"
+					size="20"
+				/>
+
+				<field
+					name="spacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="image_second"
+					type="media"
+					label="COM_NEWSFEEDS_FIELD_SECOND_LABEL"
+					description="COM_NEWSFEEDS_FIELD_SECOND_DESC"
+				/>
+
+				<field
+					name="float_second"
+					type="list"
+					label="COM_NEWSFEEDS_FLOAT_LABEL"
+					description="COM_NEWSFEEDS_FLOAT_DESC"
+					useglobal="true"
+					>
+					<option value="right">COM_NEWSFEEDS_RIGHT</option>
+					<option value="left">COM_NEWSFEEDS_LEFT</option>
+					<option value="none">COM_NEWSFEEDS_NONE</option>
+				</field>
+
+				<field
+					name="image_second_alt"
+					type="text"
+					label="COM_NEWSFEEDS_FIELD_IMAGE_ALT_LABEL"
+					description="COM_NEWSFEEDS_FIELD_IMAGE_ALT_DESC"
+					size="20"
+				/>
+
+				<field
+					name="image_second_caption"
+					type="text"
+					label="COM_NEWSFEEDS_FIELD_IMAGE_CAPTION_LABEL"
+					description="COM_NEWSFEEDS_FIELD_IMAGE_CAPTION_DESC"
+					size="20"
+				/>
+			</fieldset>
+		</fields>
+	</fieldset>
+
+	<fieldset name="jbasic" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
+
+		<field
+			name="numarticles"
+			type="number"
+			label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_LABEL"
+			description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_DESC"
+			default="5"
+			size="2"
+		/>
+
+		<field
+			name="cache_time"
+			type="number"
+			label="COM_NEWSFEEDS_FIELD_CACHETIME_LABEL"
+			description="JGLOBAL_FIELD_FIELD_CACHETIME_DESC"
+			default="3600"
+			size="4"
+		/>
+
+		<field
+			name="rtl"
+			type="list"
+			label="COM_NEWSFEEDS_FIELD_RTL_LABEL"
+			description="COM_NEWSFEEDS_FIELD_RTL_DESC"
+			default="0"
+			>
+			<option value="0">COM_NEWSFEEDS_FIELD_VALUE_SITE</option>
+			<option value="1">COM_NEWSFEEDS_FIELD_VALUE_LTR</option>
+			<option value="2">COM_NEWSFEEDS_FIELD_VALUE_RTL</option>
+		</field>
+
+		<fields name="params" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
+
+			<field
+				name="show_feed_image"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_feed_description"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_item_description"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="feed_character_count"
+				type="number"
+				label="COM_NEWSFEEDS_FIELD_CHARACTERS_COUNT_LABEL"
+				description="COM_NEWSFEEDS_FIELD_CHARACTERS_COUNT_DESC"
+				size="6"
+				useglobal="true"
+			/>
+
+			<field
+				name="newsfeed_layout"
+				type="componentlayout"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				extension="com_newsfeeds"
+				view="newsfeed"
+				useglobal="true"
+			/>
+
+			<field
+				name="feed_display_order"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
+				description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="asc">JGLOBAL_OLDEST_FIRST</option>
+			</field>
+		</fields>
+	</fieldset>
+
+	<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+		<fieldset name="jmetadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+			<field
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+
+			<field
+				name="rights"
+				type="text"
+				label="JFIELD_META_RIGHTS_LABEL"
+				description="JFIELD_META_RIGHTS_DESC"
+				rows="2"
+				cols="30"
+				filter="string"
+			/>
+
+			<field
+				name="hits"
+				type="number"
+				label="JGLOBAL_HITS"
+				description="COM_NEWSFEEDS_HITS_DESC"
+				class="readonly"
+				size="6"
+				readonly="true"
+				filter="unset"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_newsfeeds/models/newsfeed.php b/core/administrator/components/com_newsfeeds/models/newsfeed.php
new file mode 100644
index 00000000..97ee5863
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/models/newsfeed.php
@@ -0,0 +1,588 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+JLoader::register('NewsfeedsHelper', JPATH_ADMINISTRATOR . '/components/com_newsfeeds/helpers/newsfeeds.php');
+
+/**
+ * Newsfeed model.
+ *
+ * @since  1.6
+ */
+class NewsfeedsModelNewsfeed extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var      string
+	 * @since    3.2
+	 */
+	public $typeAlias = 'com_newsfeeds.newsfeed';
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var string
+	 * @since    3.4.4
+	 */
+	protected $associationsContext = 'com_newsfeeds.item';
+
+	/**
+	 * @var     string    The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_NEWSFEEDS';
+
+	/**
+	 * Batch copy items to a new category or current.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  mixed  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		$categoryId = (int) $value;
+
+		$newIds = array();
+
+		if (!parent::checkCategoryId($categoryId))
+		{
+			return false;
+		}
+
+		// Parent exists so we let's proceed
+		while (!empty($pks))
+		{
+			// Pop the first ID off the stack
+			$pk = array_shift($pks);
+
+			$this->table->reset();
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Alter the title & alias
+			$data = $this->generateNewTitle($categoryId, $this->table->alias, $this->table->name);
+			$this->table->name = $data['0'];
+			$this->table->alias = $data['1'];
+
+			// Reset the ID because we are making a copy
+			$this->table->id = 0;
+
+			// Unpublish because we are making a copy
+			$this->table->published = 0;
+
+			// New category ID
+			$this->table->catid = $categoryId;
+
+			// TODO: Deal with ordering?
+			// $this->table->ordering = 1;
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			parent::createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $this->table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->published != -2)
+			{
+				return false;
+			}
+
+			$user = JFactory::getUser();
+
+			if (!empty($record->catid))
+			{
+				return $user->authorise('core.delete', 'com_newsfeed.category.' . (int) $record->catid);
+			}
+			else
+			{
+				return parent::canDelete($record);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		if (!empty($record->catid))
+		{
+			return $user->authorise('core.edit.state', 'com_newsfeeds.category.' . (int) $record->catid);
+		}
+		else
+		{
+			return parent::canEditState($record);
+		}
+	}
+
+	/**
+	 * Returns a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable    A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Newsfeed', $prefix = 'NewsfeedsTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_newsfeeds.newsfeed', 'newsfeed', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Determine correct permissions to check.
+		if ($this->getState('newsfeed.id'))
+		{
+			// Existing record. Can only edit in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.edit');
+		}
+		else
+		{
+			// New record. Can only create in selected categories.
+			$form->setFieldAttribute('catid', 'action', 'core.create');
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+			$form->setFieldAttribute('publish_up', 'disabled', 'true');
+			$form->setFieldAttribute('publish_down', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+			$form->setFieldAttribute('publish_up', 'filter', 'unset');
+			$form->setFieldAttribute('publish_down', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_newsfeeds.edit.newsfeed.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Prime some default values.
+			if ($this->getState('newsfeed.id') == 0)
+			{
+				$app = JFactory::getApplication();
+				$data->set('catid', $app->input->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));
+			}
+		}
+
+		$this->preprocessData('com_newsfeeds.newsfeed', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.0
+	 */
+	public function save($data)
+	{
+		$input = JFactory::getApplication()->input;
+
+		JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
+
+		// Cast catid to integer for comparison
+		$catid = (int) $data['catid'];
+
+		// Check if New Category exists
+		if ($catid > 0)
+		{
+			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_newsfeeds');
+		}
+
+		// Save New Category
+		if ($catid == 0 && $this->canCreateCategory())
+		{
+			$table = array();
+			$table['title'] = $data['catid'];
+			$table['parent_id'] = 1;
+			$table['extension'] = 'com_newsfeeds';
+			$table['language'] = $data['language'];
+			$table['published'] = 1;
+
+			// Create new category and get catid back
+			$data['catid'] = CategoriesHelper::createCategory($table);
+		}
+
+		// Alter the name for save as copy
+		if ($input->get('task') == 'save2copy')
+		{
+			$origTable = clone $this->getTable();
+			$origTable->load($input->getInt('id'));
+
+			if ($data['name'] == $origTable->name)
+			{
+				list($name, $alias) = $this->generateNewTitle($data['catid'], $data['alias'], $data['name']);
+				$data['name'] = $name;
+				$data['alias'] = $alias;
+			}
+			else
+			{
+				if ($data['alias'] == $origTable->alias)
+				{
+					$data['alias'] = '';
+				}
+			}
+
+			$data['published'] = 0;
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		if ($item = parent::getItem($pk))
+		{
+			// Convert the params field to an array.
+			$registry = new Registry($item->metadata);
+			$item->metadata = $registry->toArray();
+
+			// Convert the images field to an array.
+			$registry = new Registry($item->images);
+			$item->images = $registry->toArray();
+		}
+
+		// Load associated newsfeeds items
+		$app = JFactory::getApplication();
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$item->associations = array();
+
+			if ($item->id != null)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_newsfeeds', '#__newsfeeds', 'com_newsfeeds.item', $item->id);
+
+				foreach ($associations as $tag => $association)
+				{
+					$item->associations[$tag] = $association->id;
+				}
+			}
+		}
+
+		if (!empty($item->id))
+		{
+			$item->tags = new JHelperTags;
+			$item->tags->getTagIds($item->id, 'com_newsfeeds.newsfeed');
+			$item->metadata['tags'] = $item->tags;
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  The table object
+	 *
+	 * @return  void
+	 */
+	protected function prepareTable($table)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$table->name = htmlspecialchars_decode($table->name, ENT_QUOTES);
+		$table->alias = JApplicationHelper::stringURLSafe($table->alias, $table->language);
+
+		if (empty($table->alias))
+		{
+			$table->alias = JApplicationHelper::stringURLSafe($table->name, $table->language);
+		}
+
+		if (empty($table->id))
+		{
+			// Set the values
+			$table->created = $date->toSql();
+
+			// Set ordering to the last item if not set
+			if (empty($table->ordering))
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select('MAX(ordering)')
+					->from($db->quoteName('#__newsfeeds'));
+				$db->setQuery($query);
+				$max = $db->loadResult();
+
+				$table->ordering = $max + 1;
+			}
+		}
+		else
+		{
+			// Set the values
+			$table->modified = $date->toSql();
+			$table->modified_by = $user->get('id');
+		}
+
+		// Increment the content version number.
+		$table->version++;
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		$result = parent::publish($pks, $value);
+
+		// Clean extra cache for newsfeeds
+		$this->cleanCache('feed_parser');
+
+		return $result;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   object  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		$condition = array();
+		$condition[] = 'catid = ' . (int) $table->catid;
+
+		return $condition;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   JForm   $form   The form object.
+	 * @param   array   $data   The data to be injected into the form
+	 * @param   string  $group  The plugin group to process
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		if ($this->canCreateCategory())
+		{
+			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+		}
+
+		// Association newsfeeds items
+		if (JLanguageAssociations::isEnabled())
+		{
+			$languages = JLanguageHelper::getContentLanguages(false, true, null, 'ordering', 'asc');
+
+			if (count($languages) > 1)
+			{
+				$addform = new SimpleXMLElement('<form />');
+				$fields = $addform->addChild('fields');
+				$fields->addAttribute('name', 'associations');
+				$fieldset = $fields->addChild('fieldset');
+				$fieldset->addAttribute('name', 'item_associations');
+
+				foreach ($languages as $language)
+				{
+					$field = $fieldset->addChild('field');
+					$field->addAttribute('name', $language->lang_code);
+					$field->addAttribute('type', 'modal_newsfeed');
+					$field->addAttribute('language', $language->lang_code);
+					$field->addAttribute('label', $language->title);
+					$field->addAttribute('translate_label', 'false');
+					$field->addAttribute('select', 'true');
+					$field->addAttribute('new', 'true');
+					$field->addAttribute('edit', 'true');
+					$field->addAttribute('clear', 'true');
+				}
+
+				$form->load($addform, false);
+			}
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $category_id  The id of the parent.
+	 * @param   string   $alias        The alias.
+	 * @param   string   $name         The title.
+	 *
+	 * @return  array  Contains the modified title and alias.
+	 *
+	 * @since   3.1
+	 */
+	protected function generateNewTitle($category_id, $alias, $name)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'catid' => $category_id)))
+		{
+			if ($name == $table->name)
+			{
+				$name = StringHelper::increment($name);
+			}
+
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($name, $alias);
+	}
+
+	/**
+	 * Is the user allowed to create an on the fly category?
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.1
+	 */
+	private function canCreateCategory()
+	{
+		return JFactory::getUser()->authorise('core.create', 'com_newsfeeds');
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/models/newsfeeds.php b/core/administrator/components/com_newsfeeds/models/newsfeeds.php
new file mode 100644
index 00000000..babf971d
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/models/newsfeeds.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of newsfeed records.
+ *
+ * @since  1.6
+ */
+class NewsfeedsModelNewsfeeds extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_id', 'category_title',
+				'published', 'a.published',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'ordering', 'a.ordering',
+				'language', 'a.language', 'language_title',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'cache_time', 'a.cache_time',
+				'numarticles',
+				'tag',
+				'level', 'c.level',
+				'tag',
+			);
+
+			$assoc = JLanguageAssociations::isEnabled();
+
+			if ($assoc)
+			{
+				$config['filter_fields'][] = 'association';
+			}
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.name', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd'));
+		$this->setState('filter.language', $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string'));
+		$this->setState('filter.tag', $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', null, 'int'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_newsfeeds');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('filter.language', $forcedLanguage);
+		}
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.category_id');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.language');
+		$id .= ':' . $this->getState('filter.level');
+		$id .= ':' . serialize($this->getState('filter.tag'));
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user  = JFactory::getUser();
+		$app   = JFactory::getApplication();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'DISTINCT a.id, a.name, a.alias, a.checked_out, a.checked_out_time, a.catid,' .
+				' a.numarticles, a.cache_time, a.created_by,' .
+				' a.published, a.access, a.ordering, a.language, a.publish_up, a.publish_down'
+			)
+		);
+		$query->from($db->quoteName('#__newsfeeds', 'a'));
+
+		// Join over the language
+		$query->select($db->quoteName('l.title', 'language_title'))
+			->select($db->quoteName('l.image', 'language_image'))
+			->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn('a.language'));
+
+		// Join over the users for the checked out user.
+		$query->select($db->quoteName('uc.name', 'editor'))
+			->join('LEFT', $db->quoteName('#__users', 'uc') . ' ON ' . $db->qn('uc.id') . ' = ' . $db->qn('a.checked_out'));
+
+		// Join over the asset groups.
+		$query->select($db->quoteName('ag.title', 'access_level'))
+			->join('LEFT', $db->quoteName('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn('a.access'));
+
+		// Join over the categories.
+		$query->select($db->quoteName('c.title', 'category_title'))
+			->join('LEFT', $db->quoteName('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn('a.catid'));
+
+		// Join over the associations.
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			$query->select('COUNT(asso2.id)>1 AS association')
+				->join('LEFT', $db->quoteName('#__associations', 'asso') . ' ON asso.id = a.id AND asso.context = ' . $db->quote('com_newsfeeds.item'))
+				->join('LEFT', $db->quoteName('#__associations', 'asso2') . ' ON asso2.key = asso.key')
+				->group('a.id, l.title, l.image, uc.name, ag.title, c.title');
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where($db->quoteName('a.access') . ' = ' . (int) $access);
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$query->where($db->quoteName('a.access') . ' IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')');
+		}
+
+		// Filter by published state.
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where($db->quoteName('a.published') . ' = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where($db->quoteName('a.published') . ' IN (0, 1)');
+		}
+
+		// Filter by category.
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$query->where($db->quoteName('a.catid') . ' = ' . (int) $categoryId);
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where($db->quoteName('c.level') . ' <= ' . (int) $level);
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(a.name LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where($db->quoteName('a.language') . ' = ' . $db->quote($language));
+		}
+
+		// Filter by a single or group of tags.
+		$hasTag = false;
+		$tagId  = $this->getState('filter.tag');
+
+		if (is_numeric($tagId))
+		{
+			$hasTag = true;
+
+			$query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId);
+		}
+		elseif (is_array($tagId))
+		{
+			ArrayHelper::toInteger($tagId);
+			$tagId = implode(',', $tagId);
+
+			if (!empty($tagId))
+			{
+				$hasTag = true;
+
+				$query->where($db->quoteName('tagmap.tag_id') . ' IN (' . $tagId . ')');
+			}
+		}
+
+		if ($hasTag)
+		{
+			$query->join('LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap')
+				. ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id')
+				. ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed')
+			);
+		}
+
+		// Add the list ordering clause.
+		$orderCol  = $this->state->get('list.ordering', 'a.name');
+		$orderDirn = $this->state->get('list.direction', 'ASC');
+
+		if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
+		{
+			$orderCol = 'c.title ' . $orderDirn . ', a.ordering';
+		}
+
+		$query->order($db->escape($orderCol . ' ' . $orderDirn));
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/newsfeeds.php b/core/administrator/components/com_newsfeeds/newsfeeds.php
new file mode 100644
index 00000000..e52cfd39
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/newsfeeds.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_newsfeeds'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Newsfeeds');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_newsfeeds/newsfeeds.xml b/core/administrator/components/com_newsfeeds/newsfeeds.xml
new file mode 100644
index 00000000..695bf2d5
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/newsfeeds.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_newsfeeds</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_NEWSFEEDS_XML_DESCRIPTION</description>
+	<install> <!-- Runs on install -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/install.mysql.utf8.sql</file>
+		</sql>
+	</install>
+	<uninstall> <!-- Runs on uninstall -->
+		<sql>
+			<file driver="mysql" charset="utf8">sql/uninstall.mysql.utf8.sql</file>
+		</sql>
+	</uninstall>
+
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>metadata.xml</filename>
+		<filename>newsfeeds.php</filename>
+		<filename>router.php</filename>
+		<folder>helpers</folder>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_newsfeeds.ini</language>
+	</languages>
+	<administration>
+		<menu img="class:newsfeeds">com_newsfeeds</menu>
+		<submenu>
+			<!--
+				Note that all & must be escaped to &amp; for the file to be valid
+				XML and be parsed by the installer
+			-->
+			<menu link="option=com_newsfeeds" view="feeds" img="class:newsfeeds"
+				alt="Newsfeeds/Feeds">com_newsfeeds_feeds</menu>
+			<menu link="option=com_categories&amp;extension=com_newsfeeds"
+				view="categories" img="class:newsfeeds-cat" alt="Newsfeeds/Categories">com_newsfeeds_categories</menu>
+		</submenu>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>newsfeeds.php</filename>
+			<folder>controllers</folder>
+			<folder>elements</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_newsfeeds.ini</language>
+			<language tag="en-GB">language/en-GB.com_newsfeeds.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql b/core/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql
new file mode 100644
index 00000000..da029c00
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql
@@ -0,0 +1,44 @@
+--
+-- Table structure for table `#__newsfeeds`
+--
+
+CREATE TABLE IF NOT EXISTS `#__newsfeeds` (
+  `catid` int(11) NOT NULL DEFAULT 0,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) NOT NULL DEFAULT '',
+  `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `link` varchar(2048) NOT NULL DEFAULT '',
+  `published` tinyint(1) NOT NULL DEFAULT 0,
+  `numarticles` int(10) unsigned NOT NULL DEFAULT 1,
+  `cache_time` int(10) unsigned NOT NULL DEFAULT 3600,
+  `checked_out` int(10) unsigned NOT NULL DEFAULT 0,
+  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ordering` int(11) NOT NULL DEFAULT 0,
+  `rtl` tinyint(4) NOT NULL DEFAULT 0,
+  `access` int(10) unsigned NOT NULL DEFAULT 0,
+  `language` char(7) NOT NULL DEFAULT '',
+  `params` text NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `created_by_alias` varchar(255) NOT NULL DEFAULT '',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_by` int(10) unsigned NOT NULL DEFAULT 0,
+  `metakey` text NOT NULL,
+  `metadesc` text NOT NULL,
+  `metadata` text NOT NULL,
+  `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.',
+  `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `description` text NOT NULL,
+  `version` int(10) unsigned NOT NULL DEFAULT 1,
+  `hits` int(10) unsigned NOT NULL DEFAULT 0,
+  `images` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `idx_access` (`access`),
+  KEY `idx_checkout` (`checked_out`),
+  KEY `idx_state` (`published`),
+  KEY `idx_catid` (`catid`),
+  KEY `idx_createdby` (`created_by`),
+  KEY `idx_language` (`language`),
+  KEY `idx_xreference` (`xreference`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
diff --git a/core/administrator/components/com_newsfeeds/sql/uninstall.mysql.utf8.sql b/core/administrator/components/com_newsfeeds/sql/uninstall.mysql.utf8.sql
new file mode 100644
index 00000000..f29779aa
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/sql/uninstall.mysql.utf8.sql
@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS `#__newsfeeds`;
+
diff --git a/core/administrator/components/com_newsfeeds/tables/newsfeed.php b/core/administrator/components/com_newsfeeds/tables/newsfeed.php
new file mode 100644
index 00000000..5a0085c0
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/tables/newsfeed.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Newsfeed Table class.
+ *
+ * @since  1.6
+ */
+class NewsfeedsTableNewsfeed extends JTable
+{
+	/**
+	 * Ensure the params, metadata and images are json encoded in the bind method
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	protected $_jsonEncode = array('params', 'metadata', 'images');
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  &$db  A database connector object
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__newsfeeds', 'id', $db);
+
+		JTableObserverTags::createObserver($this, array('typeAlias' => 'com_newsfeeds.newsfeed'));
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_newsfeeds.newsfeed'));
+	}
+
+	/**
+	 * Overloaded check method to ensure data integrity.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function check()
+	{
+		// Check for valid name.
+		if (trim($this->name) == '')
+		{
+			$this->setError(JText::_('COM_NEWSFEEDS_WARNING_PROVIDE_VALID_NAME'));
+
+			return false;
+		}
+
+		if (empty($this->alias))
+		{
+			$this->alias = $this->name;
+		}
+
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up)
+		{
+			$this->setError(JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
+
+			return false;
+		}
+
+		// Clean up keywords -- eliminate extra spaces between phrases
+		// and cr (\r) and lf (\n) characters from string if not empty
+		if (!empty($this->metakey))
+		{
+			// Array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->metakey);
+
+			// Create array using commas as delimiter
+			$keys = explode(',', $after_clean);
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				if (trim($key))
+				{
+					// Ignore blank keywords
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(', ', $clean_keys);
+		}
+
+		// Clean up description -- eliminate quotes and <> brackets
+		if (!empty($this->metadesc))
+		{
+			// Only process if not empty
+			$bad_characters = array("\"", '<', '>');
+			$this->metadesc = StringHelper::str_ireplace($bad_characters, '', $this->metadesc);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overriden JTable::store to set modified data.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$this->modified = $date->toSql();
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified_by = $user->get('id');
+		}
+		else
+		{
+			// New newsfeed. A feed created and created_by field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created)
+			{
+				$this->created = $date->toSql();
+			}
+
+			if (empty($this->created_by))
+			{
+				$this->created_by = $user->get('id');
+			}
+		}
+
+		// Verify that the alias is unique
+		$table = JTable::getInstance('Newsfeed', 'NewsfeedsTable', array('dbo' => $this->_db));
+
+		if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(JText::_('COM_NEWSFEEDS_ERROR_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		// Save links as punycode.
+		$this->link = JStringPunycode::urlToPunycode($this->link);
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
new file mode 100644
index 00000000..eec01df5
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
+JHtml::_('formbehavior.chosen', 'select');
+
+$app   = JFactory::getApplication();
+$input = $app->input;
+
+$assoc = JLanguageAssociations::isEnabled();
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "newsfeed.cancel" || document.formvalidator.isValid(document.getElementById("newsfeed-form"))) {
+			Joomla.submitform(task, document.getElementById("newsfeed-form"));
+
+			// @deprecated 4.0  The following js is not needed since 3.7.0.
+			if (task !== "newsfeed.apply")
+			{
+				window.parent.jQuery("#newsfeedEdit' . $this->item->id . 'Modal").modal("hide");
+			}
+		}
+	};
+');
+
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('images', 'jbasic', 'jmetadata', 'item_associations');
+
+// In case of modal
+$isModal = $input->get('layout') == 'modal' ? true : false;
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="newsfeed-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', empty($this->item->id) ? JText::_('COM_NEWSFEEDS_NEW_NEWSFEED') : JText::_('COM_NEWSFEEDS_EDIT_NEWSFEED')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<div class="form-vertical">
+					<?php echo $this->form->renderField('link'); ?>
+					<?php echo $this->form->renderField('description'); ?>
+				</div>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'images', JText::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS')); ?>
+		<div class="row-fluid">
+			<div class="span6">
+					<?php echo $this->form->renderField('images'); ?>
+					<?php foreach ($this->form->getGroup('images') as $field) : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				</div>
+			</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'attrib-jbasic', JText::_('JGLOBAL_FIELDSET_DISPLAY_OPTIONS')); ?>
+		<?php echo $this->loadTemplate('display'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php if ( ! $isModal && $assoc) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+			<?php echo $this->loadTemplate('associations'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php elseif ($isModal && $assoc) : ?>
+			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php
new file mode 100644
index 00000000..6fc43ee8
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php
new file mode 100644
index 00000000..0d2c57e4
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->fieldset = 'jbasic';
+echo JLayoutHelper::render('joomla.edit.fieldset', $this);
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php
new file mode 100644
index 00000000..2d278c9a
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php
new file mode 100644
index 00000000..fba6abf5
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	?>
+	<div class="tab-pane" id="params-<?php echo $name; ?>">
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+	<?php endif; ?>
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+				<div class="control-group">
+					<div class="control-label"><?php echo $field->label; ?></div>
+					<div class="controls"><?php echo $field->input; ?></div>
+				</div>
+			<?php endforeach; ?>
+	</div>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
new file mode 100644
index 00000000..5e4c05b0
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+
+// @deprecated 4.0 the function parameter, the inline js and the buttons are not needed since 3.7.0.
+$function  = JFactory::getApplication()->input->getCmd('function', 'jEditNewsfeed_' . (int) $this->item->id);
+
+// Function to update input title when changed
+JFactory::getDocument()->addScriptDeclaration('
+	function jEditNewsfeedModal() {
+		if (window.parent && document.formvalidator.isValid(document.getElementById("newsfeed-form"))) {
+			return window.parent.' . $this->escape($function) . '(document.getElementById("jform_name").value);
+		}
+	}
+');
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('newsfeed.apply'); jEditNewsfeedModal();"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('newsfeed.save'); jEditNewsfeedModal();"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('newsfeed.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php
new file mode 100644
index 00000000..6fc43ee8
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.associations', $this);
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php
new file mode 100644
index 00000000..0d2c57e4
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->fieldset = 'jbasic';
+echo JLayoutHelper::render('joomla.edit.fieldset', $this);
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php
new file mode 100644
index 00000000..2d278c9a
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo JLayoutHelper::render('joomla.edit.metadata', $this);
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php
new file mode 100644
index 00000000..fba6abf5
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	?>
+	<div class="tab-pane" id="params-<?php echo $name; ?>">
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+	<?php endif; ?>
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+				<div class="control-group">
+					<div class="control-label"><?php echo $field->label; ?></div>
+					<div class="controls"><?php echo $field->input; ?></div>
+				</div>
+			<?php endforeach; ?>
+	</div>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/core/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
new file mode 100644
index 00000000..286f360c
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a newsfeed.
+ *
+ * @since  1.6
+ */
+class NewsfeedsViewNewsfeed extends JViewLegacy
+{
+	/**
+	 * The item object for the newsfeed
+	 *
+	 * @var    JObject
+	 * @since  1.6
+	 */
+	protected $item;
+
+	/**
+	 * The form object for the newsfeed
+	 *
+	 * @var    JForm
+	 * @since  1.6
+	 */
+	protected $form;
+
+	/**
+	 * The model state of the newsfeed
+	 *
+	 * @var    JObject
+	 * @since  1.6
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// If we are forcing a language in modal (used for associations).
+		if ($this->getLayout() === 'modal' && $forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd'))
+		{
+			// Set the language field to the forcedLanguage and disable changing it.
+			$this->form->setValue('language', null, $forcedLanguage);
+			$this->form->setFieldAttribute('language', 'readonly', 'true');
+
+			// Only allow to select categories with All language or with the forced language.
+			$this->form->setFieldAttribute('catid', 'language', '*,' . $forcedLanguage);
+
+			// Only allow to select tags with All language or with the forced language.
+			$this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user       = JFactory::getUser();
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+
+		// Since we don't track these assets at the item level, use the category id.
+		$canDo = JHelperContent::getActions('com_newsfeeds', 'category', $this->item->catid);
+
+		JToolbarHelper::title($isNew ? JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEED_NEW') : JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEED_EDIT'), 'feed newsfeeds');
+
+		// If not checked out, can save the item.
+		if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0))
+		{
+			JToolbarHelper::apply('newsfeed.apply');
+			JToolbarHelper::save('newsfeed.save');
+		}
+
+		if (!$checkedOut && count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0)
+		{
+			JToolbarHelper::save2new('newsfeed.save2new');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('newsfeed.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('newsfeed.cancel');
+		}
+		else
+		{
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			{
+				JToolbarHelper::versions('com_newsfeeds.newsfeed', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('newsfeed.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
new file mode 100644
index 00000000..4c5680aa
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+$assoc     = JLanguageAssociations::isEnabled();
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_newsfeeds&task=newsfeeds.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'newsfeedList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"></div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="newsfeedList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="5%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_NEWSFEEDS_NUM_ARTICLES_HEADING', 'numarticles', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_NEWSFEEDS_CACHE_TIME_HEADING', 'a.cache_time', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($assoc) : ?>
+						<th width="5%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_NEWSFEEDS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+						</th>
+						<?php endif; ?>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="11">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$ordering   = ($listOrder == 'a.ordering');
+					$canCreate  = $user->authorise('core.create',     'com_newsfeeds.category.' . $item->catid);
+					$canEdit    = $user->authorise('core.edit',       'com_newsfeeds.category.' . $item->catid);
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+					$canEditOwn = $user->authorise('core.edit.own',   'com_newsfeeds.category.' . $item->catid) && $item->created_by == $user->id;
+					$canChange  = $user->authorise('core.edit.state', 'com_newsfeeds.category.' . $item->catid) && $canCheckin;
+					?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass ?>">
+								<span class="icon-menu" aria-hidden="true"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td class="center">
+							<div class="btn-group">
+								<?php echo JHtml::_('jgrid.published', $item->published, $i, 'newsfeeds.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+								<?php // Create dropdown items and render the dropdown list.
+								if ($canChange)
+								{
+									JHtml::_('actionsdropdown.' . ((int) $item->published === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'newsfeeds');
+									JHtml::_('actionsdropdown.' . ((int) $item->published === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'newsfeeds');
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+								}
+								?>
+							</div>
+						</td>
+						<td class="nowrap has-context">
+							<div class="pull-left">
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit || $canEditOwn) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id=' . (int) $item->id); ?>">
+										<?php echo $this->escape($item->name); ?></a>
+								<?php else : ?>
+										<?php echo $this->escape($item->name); ?>
+								<?php endif; ?>
+								<span class="small">
+									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+								</span>
+								<div class="small">
+									<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+								</div>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->numarticles; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo (int) $item->cache_time; ?>
+						</td>
+						<?php if ($assoc) : ?>
+						<td class="hidden-phone hidden-tablet">
+							<?php if ($item->association) : ?>
+								<?php echo JHtml::_('newsfeed.association', $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<?php endif; ?>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form if user is allowed ?>
+			<?php if ($user->authorise('core.create', 'com_newsfeeds')
+				&& $user->authorise('core.edit', 'com_newsfeeds')
+				&& $user->authorise('core.edit.state', 'com_newsfeeds')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_NEWSFEEDS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php
new file mode 100644
index 00000000..ceb861db
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+	<div class="row-fluid">
+		<?php if ($published >= 0) : ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.item', 'com_newsfeeds'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.tag'); ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..4d79f87e
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-category-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value='';document.getElementById('batch-tag-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('newsfeed.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
new file mode 100644
index 00000000..68db2463
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('NewsfeedsHelperRoute', JPATH_ROOT . '/components/com_newsfeeds/helpers/route.php');
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.core');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$app = JFactory::getApplication();
+
+$function  = $app->input->getCmd('function', 'jSelectNewsfeed');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<div class="container-popup">
+
+	<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds&layout=modal&tmpl=component&function=' . $function); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped table-condensed">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap title">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				$iconStates = array(
+					-2 => 'icon-trash',
+					0  => 'icon-unpublish',
+					1  => 'icon-publish',
+					2  => 'icon-archive',
+				);
+				?>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<?php if ($item->language && JLanguageMultilang::isEnabled())
+					{
+						$tag = strlen($item->language);
+						if ($tag == 5)
+						{
+							$lang = substr($item->language, 0, 2);
+						}
+						elseif ($tag == 6)
+						{
+							$lang = substr($item->language, 0, 3);
+						}
+						else {
+							$lang = '';
+						}
+					}
+					elseif (!JLanguageMultilang::isEnabled())
+					{
+						$lang = '';
+					}
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->published)]; ?>" aria-hidden="true"></span>
+						</td>
+						<td>
+							<a href="javascript:void(0)" onclick="if (window.parent) window.parent.<?php echo $this->escape($function); ?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->name)); ?>', '<?php echo $this->escape($item->catid); ?>', null, '<?php echo $this->escape(NewsfeedsHelperRoute::getNewsfeedRoute($item->id, $item->catid, $item->language)); ?>', '<?php echo $this->escape($lang); ?>', null);">
+							<?php echo $this->escape($item->name); ?></a>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+							</div>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'CMD'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/core/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
new file mode 100644
index 00000000..8e1de2d3
--- /dev/null
+++ b/core/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of newsfeeds.
+ *
+ * @since  1.6
+ */
+class NewsfeedsViewNewsfeeds extends JViewLegacy
+{
+	/**
+	 * The list of newsfeeds
+	 *
+	 * @var    JObject
+	 * @since  1.6
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 * @since  1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var    JObject
+	 * @since  1.6
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Modal layout doesn't need the submenu.
+		if ($this->getLayout() !== 'modal')
+		{
+			NewsfeedsHelper::addSubmenu('newsfeeds');
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// We don't need toolbar in the modal layout.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			// We also need to change the category filter to show show categories with All or the forced language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+
+				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
+				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_newsfeeds', 'category', $state->get('filter.category_id'));
+		$user  = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+		JToolbarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEEDS'), 'feed newsfeeds');
+
+		if (count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0)
+		{
+			JToolbarHelper::addNew('newsfeed.add');
+		}
+
+		if ($canDo->get('core.edit') || $canDo->get('core.edit.own'))
+		{
+			JToolbarHelper::editList('newsfeed.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('newsfeeds.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('newsfeeds.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::archiveList('newsfeeds.archive');
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::checkin('newsfeeds.checkin');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_newsfeeds')
+			&& $user->authorise('core.edit', 'com_newsfeeds')
+			&& $user->authorise('core.edit.state', 'com_newsfeeds'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'newsfeeds.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('newsfeeds.trash');
+		}
+
+		if ($user->authorise('core.admin', 'com_newsfeeds') || $user->authorise('core.options', 'com_newsfeeds'))
+		{
+			JToolbarHelper::preferences('com_newsfeeds');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_NEWSFEEDS_FEEDS');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering'     => JText::_('JGRID_HEADING_ORDERING'),
+			'a.published'    => JText::_('JSTATUS'),
+			'a.name'         => JText::_('JGLOBAL_TITLE'),
+			'category_title' => JText::_('JCATEGORY'),
+			'a.access'       => JText::_('JGRID_HEADING_ACCESS'),
+			'numarticles'    => JText::_('COM_NEWSFEEDS_NUM_ARTICLES_HEADING'),
+			'a.cache_time'   => JText::_('COM_NEWSFEEDS_CACHE_TIME_HEADING'),
+			'a.language'     => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'           => JText::_('JGRID_HEADING_ID')
+		);
+	}
+}
diff --git a/core/administrator/components/com_plugins/access.xml b/core/administrator/components/com_plugins/access.xml
new file mode 100644
index 00000000..c7e06d05
--- /dev/null
+++ b/core/administrator/components/com_plugins/access.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_plugins">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_plugins/config.xml b/core/administrator/components/com_plugins/config.xml
new file mode 100644
index 00000000..f95a4f66
--- /dev/null
+++ b/core/administrator/components/com_plugins/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC">
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_plugins"
+			section="component" 
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_plugins/controller.php b/core/administrator/components/com_plugins/controller.php
new file mode 100644
index 00000000..3a784e11
--- /dev/null
+++ b/core/administrator/components/com_plugins/controller.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugins master display controller.
+ *
+ * @since  1.5
+ */
+class PluginsController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('PluginsHelper', JPATH_ADMINISTRATOR . '/components/com_plugins/helpers/plugins.php');
+
+		// Load the submenu.
+		PluginsHelper::addSubmenu($this->input->get('view', 'plugins'));
+
+		$view   = $this->input->get('view', 'plugins');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('extension_id');
+
+		// Check for edit form.
+		if ($view == 'plugin' && $layout == 'edit' && !$this->checkEditId('com_plugins.edit.plugin', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_plugins&view=plugins', false));
+
+			return false;
+		}
+
+		parent::display();
+	}
+}
diff --git a/core/administrator/components/com_plugins/controllers/plugin.php b/core/administrator/components/com_plugins/controllers/plugin.php
new file mode 100644
index 00000000..7fb11de4
--- /dev/null
+++ b/core/administrator/components/com_plugins/controllers/plugin.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugin controller class.
+ *
+ * @since  1.6
+ */
+class PluginsControllerPlugin extends JControllerForm
+{
+}
diff --git a/core/administrator/components/com_plugins/controllers/plugins.php b/core/administrator/components/com_plugins/controllers/plugins.php
new file mode 100644
index 00000000..cfdbb56b
--- /dev/null
+++ b/core/administrator/components/com_plugins/controllers/plugins.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugins list controller class.
+ *
+ * @since  1.6
+ */
+class PluginsControllerPlugins extends JControllerAdmin
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Plugin', $prefix = 'PluginsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_plugins/helpers/plugins.php b/core/administrator/components/com_plugins/helpers/plugins.php
new file mode 100644
index 00000000..e69b6b22
--- /dev/null
+++ b/core/administrator/components/com_plugins/helpers/plugins.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugins component helper.
+ *
+ * @since  1.6
+ */
+class PluginsHelper
+{
+	public static $extension = 'com_plugins';
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 */
+	public static function addSubmenu($vName)
+	{
+		// No submenu for this component.
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function.
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions.
+		return JHelperContent::getActions('com_plugins');
+	}
+
+	/**
+	 * Returns an array of standard published state filter options.
+	 *
+	 * @return  string    The HTML code for the select tag
+	 */
+	public static function publishedOptions()
+	{
+		// Build the active state filter options.
+		$options = array();
+		$options[] = JHtml::_('select.option', '1', 'JENABLED');
+		$options[] = JHtml::_('select.option', '0', 'JDISABLED');
+
+		return $options;
+	}
+
+	/**
+	 * Returns an array of standard published state filter options.
+	 *
+	 * @return  string    The HTML code for the select tag
+	 */
+	public static function folderOptions()
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT(folder) AS value, folder AS text')
+			->from('#__extensions')
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->order('folder');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Parse the template file.
+	 *
+	 * @param   string  $templateBaseDir  Base path to the template directory.
+	 * @param   string  $templateDir      Template directory.
+	 *
+	 * @return  JObject
+	 */
+	public function parseXMLTemplateFile($templateBaseDir, $templateDir)
+	{
+		$data = new JObject;
+
+		// Check of the xml file exists.
+		$filePath = JPath::clean($templateBaseDir . '/templates/' . $templateDir . '/templateDetails.xml');
+
+		if (is_file($filePath))
+		{
+			$xml = JInstaller::parseXMLInstallFile($filePath);
+
+			if ($xml['type'] != 'template')
+			{
+				return false;
+			}
+
+			foreach ($xml as $key => $value)
+			{
+				$data->set($key, $value);
+			}
+		}
+
+		return $data;
+	}
+}
diff --git a/core/administrator/components/com_plugins/models/fields/pluginordering.php b/core/administrator/components/com_plugins/models/fields/pluginordering.php
new file mode 100644
index 00000000..9e5775bd
--- /dev/null
+++ b/core/administrator/components/com_plugins/models/fields/pluginordering.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('ordering');
+
+/**
+ * Supports an HTML select list of plugins.
+ *
+ * @since  1.6
+ */
+class JFormFieldPluginordering extends JFormFieldOrdering
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   1.6
+	 */
+	protected $type = 'Pluginordering';
+
+	/**
+	 * Builds the query for the ordering list.
+	 *
+	 * @return  JDatabaseQuery  The query for the ordering form field.
+	 */
+	protected function getQuery()
+	{
+		$db     = JFactory::getDbo();
+		$folder = $this->form->getValue('folder');
+
+		// Build the query for the ordering list.
+		$query = $db->getQuery(true)
+			->select(
+				array(
+					$db->quoteName('ordering', 'value'),
+					$db->quoteName('name', 'text'),
+					$db->quoteName('type'),
+					$db->quote('folder'),
+					$db->quote('extension_id')
+				)
+			)
+			->from($db->quoteName('#__extensions'))
+			->where('(type =' . $db->quote('plugin') . 'AND folder=' . $db->quote($folder) . ')')
+			->order('ordering');
+
+		return $query;
+	}
+
+	/**
+	 * Retrieves the current Item's Id.
+	 *
+	 * @return  integer  The current item ID.
+	 */
+	protected function getItemId()
+	{
+		return (int) $this->form->getValue('extension_id');
+	}
+}
diff --git a/core/administrator/components/com_plugins/models/fields/plugintype.php b/core/administrator/components/com_plugins/models/fields/plugintype.php
new file mode 100644
index 00000000..ba00bd9f
--- /dev/null
+++ b/core/administrator/components/com_plugins/models/fields/plugintype.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('PluginsHelper', JPATH_ADMINISTRATOR . '/components/com_plugins/helpers/plugins.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Plugin Type field.
+ *
+ * @since  3.5
+ */
+class JFormFieldPluginType extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $type = 'PluginType';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		$options = PluginsHelper::folderOptions();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_plugins/models/forms/filter_plugins.xml b/core/administrator/components/com_plugins/models/forms/filter_plugins.xml
new file mode 100644
index 00000000..9c92446e
--- /dev/null
+++ b/core/administrator/components/com_plugins/models/forms/filter_plugins.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_plugins/models/fields" />
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_PLUGINS_FILTER_SEARCH_LABEL"
+			description="COM_PLUGINS_SEARCH_IN_TITLE"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="enabled"
+			type="plugin_status"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="folder"
+			type="plugintype"
+			onchange="this.form.submit();"
+		>
+			<option value="">COM_PLUGINS_OPTION_FOLDER</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="folder ASC"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="enabled ASC">JSTATUS_ASC</option>
+			<option value="enabled DESC">JSTATUS_DESC</option>
+			<option value="name ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="name DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="folder ASC">COM_PLUGINS_HEADING_FOLDER_ASC</option>
+			<option value="folder DESC">COM_PLUGINS_HEADING_FOLDER_DESC</option>
+			<option value="element ASC">COM_PLUGINS_HEADING_ELEMENT_ASC</option>
+			<option value="element DESC">COM_PLUGINS_HEADING_ELEMENT_DESC</option>
+			<option value="access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="extension_id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="extension_id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_plugins/models/forms/plugin.xml b/core/administrator/components/com_plugins/models/forms/plugin.xml
new file mode 100644
index 00000000..271fc20e
--- /dev/null
+++ b/core/administrator/components/com_plugins/models/forms/plugin.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset
+		addfieldpath="/administrator/components/com_plugins/models/fields"
+	>
+		<field
+			name="extension_id"
+			type="text"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			readonly="true"
+			class="readonly" 
+		/>
+
+		<field
+			name="name"
+			type="hidden"
+			label="COM_PLUGINS_FIELD_NAME_LABEL"
+			description="COM_PLUGINS_FIELD_NAME_DESC" 
+		/>
+
+		<field
+			name="enabled"
+			type="list"
+			label="JSTATUS"
+			description="COM_PLUGINS_FIELD_ENABLED_DESC"
+			class="chzn-color-state"
+			size="1"
+			default="1"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1" 
+		/>
+
+		<field
+			name="ordering"
+			type="pluginordering"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC" 
+		/>
+
+		<field
+			name="folder"
+			type="text"
+			label="COM_PLUGINS_FIELD_FOLDER_LABEL"
+			description="COM_PLUGINS_FIELD_FOLDER_DESC"
+			class="readonly"
+			size="20"
+			readonly="true" 
+		/>
+
+		<field
+			name="element"
+			type="text"
+			label="COM_PLUGINS_FIELD_ELEMENT_LABEL"
+			description="COM_PLUGINS_FIELD_ELEMENT_DESC"
+			class="readonly"
+			size="20"
+			readonly="true" 
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_plugins/models/plugin.php b/core/administrator/components/com_plugins/models/plugin.php
new file mode 100644
index 00000000..31ffc493
--- /dev/null
+++ b/core/administrator/components/com_plugins/models/plugin.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Plugin model.
+ *
+ * @since  1.6
+ */
+class PluginsModelPlugin extends JModelAdmin
+{
+	/**
+	 * @var     string  The help screen key for the module.
+	 * @since   1.6
+	 */
+	protected $helpKey = 'JHELP_EXTENSIONS_PLUGIN_MANAGER_EDIT';
+
+	/**
+	 * @var     string  The help screen base URL for the module.
+	 * @since   1.6
+	 */
+	protected $helpURL;
+
+	/**
+	 * @var     array  An array of cached plugin items.
+	 * @since   1.6
+	 */
+	protected $_cache;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'event_after_save'  => 'onExtensionAfterSave',
+				'event_before_save' => 'onExtensionBeforeSave',
+				'events_map'        => array(
+					'save' => 'extension'
+				)
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// The folder and element vars are passed when saving the form.
+		if (empty($data))
+		{
+			$item    = $this->getItem();
+			$folder  = $item->folder;
+			$element = $item->element;
+		}
+		else
+		{
+			$folder  = ArrayHelper::getValue($data, 'folder', '', 'cmd');
+			$element = ArrayHelper::getValue($data, 'element', '', 'cmd');
+		}
+
+		// Add the default fields directory
+		JForm::addFieldPath(JPATH_PLUGINS . '/' . $folder . '/' . $element . '/field');
+
+		// These variables are used to add data from the plugin XML files.
+		$this->setState('item.folder', $folder);
+		$this->setState('item.element', $element);
+
+		// Get the form.
+		$form = $this->loadForm('com_plugins.plugin', 'plugin', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('enabled', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('enabled', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_plugins.edit.plugin.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_plugins.plugin', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('plugin.id');
+
+		if (!isset($this->_cache[$pk]))
+		{
+			// Get a row instance.
+			$table = $this->getTable();
+
+			// Attempt to load the row.
+			$return = $table->load($pk);
+
+			// Check for a table object error.
+			if ($return === false && $table->getError())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Convert to the JObject before adding other data.
+			$properties = $table->getProperties(1);
+			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject');
+
+			// Convert the params field to an array.
+			$registry = new Registry($table->params);
+			$this->_cache[$pk]->params = $registry->toArray();
+
+			// Get the plugin XML.
+			$path = JPath::clean(JPATH_PLUGINS . '/' . $table->folder . '/' . $table->element . '/' . $table->element . '.xml');
+
+			if (file_exists($path))
+			{
+				$this->_cache[$pk]->xml = simplexml_load_file($path);
+			}
+			else
+			{
+				$this->_cache[$pk]->xml = null;
+			}
+		}
+
+		return $this->_cache[$pk];
+	}
+
+	/**
+	 * Returns a reference to the Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate.
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable	A database object
+	 */
+	public function getTable($type = 'Extension', $prefix = 'JTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		// Execute the parent method.
+		parent::populateState();
+
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('extension_id');
+		$this->setState('plugin.id', $pk);
+	}
+
+	/**
+	 * Preprocess the form.
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  Cache group name.
+	 *
+	 * @return  mixed  True if successful.
+	 *
+	 * @throws	Exception if there is an error in the form event.
+	 * @since   1.6
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		jimport('joomla.filesystem.path');
+
+		$folder  = $this->getState('item.folder');
+		$element = $this->getState('item.element');
+		$lang    = JFactory::getLanguage();
+
+		// Load the core and/or local language sys file(s) for the ordering field.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('element'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote($folder));
+		$db->setQuery($query);
+		$elements = $db->loadColumn();
+
+		foreach ($elements as $elementa)
+		{
+			$lang->load('plg_' . $folder . '_' . $elementa . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load('plg_' . $folder . '_' . $elementa . '.sys', JPATH_PLUGINS . '/' . $folder . '/' . $elementa, null, false, true);
+		}
+
+		if (empty($folder) || empty($element))
+		{
+			$app = JFactory::getApplication();
+			$app->redirect(JRoute::_('index.php?option=com_plugins&view=plugins', false));
+		}
+
+		$formFile = JPath::clean(JPATH_PLUGINS . '/' . $folder . '/' . $element . '/' . $element . '.xml');
+
+		if (!file_exists($formFile))
+		{
+			throw new Exception(JText::sprintf('COM_PLUGINS_ERROR_FILE_NOT_FOUND', $element . '.xml'));
+		}
+
+		// Load the core and/or local language file(s).
+			$lang->load('plg_' . $folder . '_' . $element, JPATH_ADMINISTRATOR, null, false, true)
+		||	$lang->load('plg_' . $folder . '_' . $element, JPATH_PLUGINS . '/' . $folder . '/' . $element, null, false, true);
+
+		if (file_exists($formFile))
+		{
+			// Get the plugin form.
+			if (!$form->loadFile($formFile, false, '//config'))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+		}
+
+		// Attempt to load the xml file.
+		if (!$xml = simplexml_load_file($formFile))
+		{
+			throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+		}
+
+		// Get the help data from the XML file if present.
+		$help = $xml->xpath('/extension/help');
+
+		if (!empty($help))
+		{
+			$helpKey = trim((string) $help[0]['key']);
+			$helpURL = trim((string) $help[0]['url']);
+
+			$this->helpKey = $helpKey ?: $this->helpKey;
+			$this->helpURL = $helpURL ?: $this->helpURL;
+		}
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   object  $table  A record object.
+	 *
+	 * @return  array  An array of conditions to add to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		$condition = array();
+		$condition[] = 'type = ' . $this->_db->quote($table->type);
+		$condition[] = 'folder = ' . $this->_db->quote($table->folder);
+
+		return $condition;
+	}
+
+	/**
+	 * Override method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		// Setup type.
+		$data['type'] = 'plugin';
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Get the necessary data to load an item help screen.
+	 *
+	 * @return  object  An object with key, url, and local properties for loading the item help screen.
+	 *
+	 * @since   1.6
+	 */
+	public function getHelp()
+	{
+		return (object) array('key' => $this->helpKey, 'url' => $this->helpURL);
+	}
+
+	/**
+	 * Custom clean cache method, plugins are cached in 2 places for different clients.
+	 *
+	 * @param   string   $group      Cache group name.
+	 * @param   integer  $client_id  Application client id.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('com_plugins', 0);
+		parent::cleanCache('com_plugins', 1);
+	}
+}
diff --git a/core/administrator/components/com_plugins/models/plugins.php b/core/administrator/components/com_plugins/models/plugins.php
new file mode 100644
index 00000000..0d6217ac
--- /dev/null
+++ b/core/administrator/components/com_plugins/models/plugins.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Methods supporting a list of plugin records.
+ *
+ * @since  1.6
+ */
+class PluginsModelPlugins extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'extension_id', 'a.extension_id',
+				'name', 'a.name',
+				'folder', 'a.folder',
+				'element', 'a.element',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'state', 'a.state',
+				'enabled', 'a.enabled',
+				'access', 'a.access', 'access_level',
+				'ordering', 'a.ordering',
+				'client_id', 'a.client_id',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'folder', $direction = 'asc')
+	{
+		// Load the filter state.
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string');
+		$this->setState('filter.search', $search);
+
+		$accessId = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'cmd');
+		$this->setState('filter.access', $accessId);
+
+		$state = $this->getUserStateFromRequest($this->context . '.filter.enabled', 'filter_enabled', '', 'cmd');
+		$this->setState('filter.enabled', $state);
+
+		$folder = $this->getUserStateFromRequest($this->context . '.filter.folder', 'filter_folder', '', 'string');
+		$this->setState('filter.folder', $folder);
+
+		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '', 'string');
+		$this->setState('filter.language', $language);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_plugins');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string    A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.enabled');
+		$id .= ':' . $this->getState('filter.folder');
+		$id .= ':' . $this->getState('filter.language');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Returns an object list.
+	 *
+	 * @param   JDatabaseQuery  $query       A database query object.
+	 * @param   integer         $limitstart  Offset.
+	 * @param   integer         $limit       The number of records.
+	 *
+	 * @return  array
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$search = $this->getState('filter.search');
+		$ordering = $this->getState('list.ordering', 'ordering');
+
+		// If "Sort Table By:" is not set, set ordering to name
+		if ($ordering == '')
+		{
+			$ordering = 'name';
+		}
+
+		if ($ordering == 'name' || (!empty($search) && stripos($search, 'id:') !== 0))
+		{
+			$this->_db->setQuery($query);
+			$result = $this->_db->loadObjectList();
+			$this->translate($result);
+
+			if (!empty($search))
+			{
+				$escapedSearchString = $this->refineSearchStringToRegex($search, '/');
+
+				foreach ($result as $i => $item)
+				{
+					if (!preg_match("/$escapedSearchString/i", $item->name))
+					{
+						unset($result[$i]);
+					}
+				}
+			}
+
+			$orderingDirection = strtolower($this->getState('list.direction'));
+			$direction         = ($orderingDirection == 'desc') ? -1 : 1;
+			$result = ArrayHelper::sortObjects($result, $ordering, $direction, true, true);
+
+			$total = count($result);
+			$this->cache[$this->getStoreId('getTotal')] = $total;
+
+			if ($total < $limitstart)
+			{
+				$limitstart = 0;
+				$this->setState('list.start', 0);
+			}
+
+			return array_slice($result, $limitstart, $limit ?: null);
+		}
+		else
+		{
+			if ($ordering == 'ordering')
+			{
+				$query->order('a.folder ASC');
+				$ordering = 'a.ordering';
+			}
+
+			$query->order($this->_db->quoteName($ordering) . ' ' . $this->getState('list.direction'));
+
+			if ($ordering == 'folder')
+			{
+				$query->order('a.ordering ASC');
+			}
+
+			$result = parent::_getList($query, $limitstart, $limit);
+			$this->translate($result);
+
+			return $result;
+		}
+	}
+
+	/**
+	 * Translate a list of objects.
+	 *
+	 * @param   array  &$items  The array of objects.
+	 *
+	 * @return  array The array of translated objects.
+	 */
+	protected function translate(&$items)
+	{
+		$lang = JFactory::getLanguage();
+
+		foreach ($items as &$item)
+		{
+			$source = JPATH_PLUGINS . '/' . $item->folder . '/' . $item->element;
+			$extension = 'plg_' . $item->folder . '_' . $item->element;
+			$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+				|| $lang->load($extension . '.sys', $source, null, false, true);
+			$item->name = JText::_($item->name);
+		}
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.extension_id , a.name, a.element, a.folder, a.checked_out, a.checked_out_time,' .
+					' a.enabled, a.access, a.ordering'
+			)
+		)
+			->from($db->quoteName('#__extensions') . ' AS a')
+			->where($db->quoteName('type') . ' = ' . $db->quote('plugin'));
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the asset groups.
+		$query->select('ag.title AS access_level')
+			->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+
+		// Filter by published state.
+		$published = $this->getState('filter.enabled');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.enabled = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.enabled IN (0, 1))');
+		}
+
+		// Filter by state.
+		$query->where('a.state >= 0');
+
+		// Filter by folder.
+		if ($folder = $this->getState('filter.folder'))
+		{
+			$query->where('a.folder = ' . $db->quote($folder));
+		}
+
+		// Filter by search in name or id.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.extension_id = ' . (int) substr($search, 3));
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 *
+	 * @since	3.5
+	 */
+	protected function loadFormData()
+	{
+		$data = parent::loadFormData();
+
+		// Set the selected filter values for pages that use the JLayouts for filtering
+		$data->list['sortTable'] = $this->state->get('list.ordering');
+		$data->list['directionTable'] = $this->state->get('list.direction');
+
+		return $data;
+	}
+}
diff --git a/core/administrator/components/com_plugins/plugins.php b/core/administrator/components/com_plugins/plugins.php
new file mode 100644
index 00000000..f6d29bd7
--- /dev/null
+++ b/core/administrator/components/com_plugins/plugins.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_plugins'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Plugins');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_plugins/plugins.xml b/core/administrator/components/com_plugins/plugins.xml
new file mode 100644
index 00000000..494d3f06
--- /dev/null
+++ b/core/administrator/components/com_plugins/plugins.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_plugins</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_PLUGINS_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>plugins.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_plugins.ini</language>
+			<language tag="en-GB">language/en-GB.com_plugins.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/core/administrator/components/com_plugins/views/plugin/tmpl/edit.php
new file mode 100644
index 00000000..d33bf499
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+$this->fieldsets = $this->form->getFieldsets('params');
+
+$input = JFactory::getApplication()->input;
+
+// In case of modal
+$isModal  = $input->get('layout') === 'modal' ? true : false;
+$layout   = $isModal ? 'modal' : 'edit';
+$tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task) {
+		if (task === 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) {
+			Joomla.submitform(task, document.getElementById('style-form'));
+
+			if (task !== 'plugin.apply') {
+				if (self !== top ) {
+					window.top.setTimeout('window.parent.location = window.top.location.href', 1000);
+					window.parent.jQuery('#plugin" . $this->item->extension_id . "Modal').modal('hide');
+				}
+			}
+		}
+	};
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugin&layout=' . $layout . $tmpl . '&extension_id=' . (int) $this->item->extension_id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+	<div class="form-horizontal">
+
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('COM_PLUGINS_PLUGIN')); ?>
+
+		<div class="row-fluid">
+			<div class="span9">
+				<?php if ($this->item->xml) : ?>
+					<?php if ($this->item->xml->description) : ?>
+						<h2>
+							<?php
+							if ($this->item->xml)
+							{
+								echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->name;
+							}
+							else
+							{
+								echo JText::_('COM_PLUGINS_XML_ERR');
+							}
+							?>
+						</h2>
+						<div class="info-labels">
+							<span class="label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_PLUGINS_FIELD_FOLDER_LABEL', 'COM_PLUGINS_FIELD_FOLDER_DESC'); ?>">
+								<?php echo $this->form->getValue('folder'); ?>
+							</span> /
+							<span class="label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_PLUGINS_FIELD_ELEMENT_LABEL', 'COM_PLUGINS_FIELD_ELEMENT_DESC'); ?>">
+								<?php echo $this->form->getValue('element'); ?>
+							</span>
+						</div>
+						<div>
+							<?php
+							$short_description = JText::_($this->item->xml->description);
+							$this->fieldset = 'description';
+							$long_description = JLayoutHelper::render('joomla.edit.fieldset', $this);
+							if (!$long_description) {
+								$truncated = JHtmlString::truncate($short_description, 550, true, false);
+								if (strlen($truncated) > 500) {
+									$long_description = $short_description;
+									$short_description = JHtmlString::truncate($truncated, 250);
+									if ($short_description == $long_description) {
+										$long_description = '';
+									}
+								}
+							}
+							?>
+							<p><?php echo $short_description; ?></p>
+							<?php if ($long_description) : ?>
+								<p class="readmore">
+									<a href="#" onclick="jQuery('.nav-tabs a[href=\'#description\']').tab('show');">
+										<?php echo JText::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
+									</a>
+								</p>
+							<?php endif; ?>
+						</div>
+					<?php endif; ?>
+				<?php else : ?>
+					<div class="alert alert-error"><?php echo JText::_('COM_PLUGINS_XML_ERR'); ?></div>
+				<?php endif; ?>
+
+				<?php
+				$this->fieldset = 'basic';
+				$html = JLayoutHelper::render('joomla.edit.fieldset', $this);
+				echo $html ? '<hr />' . $html : '';
+				?>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+				<div class="form-vertical">
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('ordering'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('ordering'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('folder'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('folder'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('element'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('element'); ?>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php if (isset($long_description) && $long_description != '') : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
+			<?php echo $long_description; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php
+		$this->fieldsets = array();
+		$this->ignore_fieldsets = array('basic', 'description');
+		echo JLayoutHelper::render('joomla.edit.params', $this);
+		?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
+
diff --git a/core/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/core/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
new file mode 100644
index 00000000..536fd304
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+foreach ($this->fieldsets as $name => $fieldset)
+{
+	if (!isset($fieldset->repeat) || isset($fieldset->repeat) && $fieldset->repeat == false)
+	{
+		$label = !empty($fieldset->label) ? JText::_($fieldset->label) : JText::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true);
+		$optionsname = 'options-' . $fieldset->name;
+		echo JHtml::_('bootstrap.addTab', 'myTab', $optionsname,  $label);
+
+		if (isset($fieldset->description) && trim($fieldset->description))
+		{
+			echo '<p class="tip">' . $this->escape(JText::_($fieldset->description)) . '</p>';
+		}
+
+		$hidden_fields = '';
+
+		foreach ($this->form->getFieldset($name) as $field)
+		{
+			if (!$field->hidden)
+			{
+				?>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $field->label; ?>
+					</div>
+					<div class="controls">
+						<?php echo $field->input; ?>
+					</div>
+				</div>
+			<?php
+			}
+			else
+			{
+				$hidden_fields .= $field->input;
+			}
+		}
+		echo $hidden_fields;
+
+		echo JHtml::_('bootstrap.endTab');
+	}
+}
diff --git a/core/administrator/components/com_plugins/views/plugin/tmpl/modal.php b/core/administrator/components/com_plugins/views/plugin/tmpl/modal.php
new file mode 100644
index 00000000..abb73ef7
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugin/tmpl/modal.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// This code is needed for proper check out in case of modal close
+JFactory::getDocument()->addScriptDeclaration('
+	window.parent.jQuery(".modal").on("hidden", function () {
+	if (typeof window.parent.jQuery("#plugin' . $this->item->extension_id . 'Modal iframe").contents().find("#closeBtn") !== "undefined") {
+		window.parent.jQuery("#plugin' . $this->item->extension_id . 'Modal iframe").contents().find("#closeBtn").click();
+		}
+	});
+');
+?>
+<button id="applyBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.apply');"></button>
+<button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.save');"></button>
+<button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('plugin.cancel');"></button>
+
+<div class="container-popup">
+	<?php $this->setLayout('edit'); ?>
+	<?php echo $this->loadTemplate(); ?>
+</div>
+
diff --git a/core/administrator/components/com_plugins/views/plugin/view.html.php b/core/administrator/components/com_plugins/views/plugin/view.html.php
new file mode 100644
index 00000000..35f4afaf
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugin/view.html.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a plugin.
+ *
+ * @since  1.5
+ */
+class PluginsViewPlugin extends JViewLegacy
+{
+	protected $item;
+
+	protected $form;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$canDo = JHelperContent::getActions('com_plugins');
+
+		JToolbarHelper::title(JText::sprintf('COM_PLUGINS_MANAGER_PLUGIN', JText::_($this->item->name)), 'power-cord plugin');
+
+		// If not checked out, can save the item.
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::apply('plugin.apply');
+			JToolbarHelper::save('plugin.save');
+		}
+
+		JToolbarHelper::cancel('plugin.cancel', 'JTOOLBAR_CLOSE');
+		JToolbarHelper::divider();
+
+		// Get the help information for the plugin item.
+		$lang = JFactory::getLanguage();
+
+		$help = $this->get('Help');
+
+		if ($lang->hasKey($help->url))
+		{
+			$debug = $lang->setDebug(false);
+			$url = JText::_($help->url);
+			$lang->setDebug($debug);
+		}
+		else
+		{
+			$url = null;
+		}
+
+		JToolbarHelper::help($help->key, false, $url);
+	}
+}
diff --git a/core/administrator/components/com_plugins/views/plugins/tmpl/default.php b/core/administrator/components/com_plugins/views/plugins/tmpl/default.php
new file mode 100644
index 00000000..219a28f5
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugins/tmpl/default.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'ordering';
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_plugins&task=plugins.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'pluginList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugins'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('COM_PLUGINS_MSG_MANAGE_NO_PLUGINS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="pluginList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="8">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$ordering   = ($listOrder == 'ordering');
+					$canEdit    = $user->authorise('core.edit',       'com_plugins');
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+					$canChange  = $user->authorise('core.edit.state', 'com_plugins') && $canCheckin;
+					?>
+					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->folder; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass; ?>">
+								<span class="icon-menu" aria-hidden="true"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
+						</td>
+						<td class="center">
+							<?php echo JHtml::_('jgrid.published', $item->enabled, $i, 'plugins.', $canChange); ?>
+						</td>
+						<td>
+							<?php if ($item->checked_out) : ?>
+								<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'plugins.', $canCheckin); ?>
+							<?php endif; ?>
+							<?php if ($canEdit) : ?>
+								<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . (int) $item->extension_id); ?>" title="<?php echo JText::_('JACTION_EDIT'); ?>">
+									<?php echo $item->name; ?></a>
+							<?php else : ?>
+									<?php echo $item->name; ?>
+							<?php endif; ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo $this->escape($item->folder); ?>
+						</td>
+						<td class="nowrap small hidden-phone">
+							<?php echo $this->escape($item->element); ?>
+						</td>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->extension_id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_plugins/views/plugins/tmpl/default.xml b/core/administrator/components/com_plugins/views/plugins/tmpl/default.xml
new file mode 100755
index 00000000..9d181a9f
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugins/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_PLUGINS_PLUGINS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_PLUGINS_PLUGINS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_plugins/views/plugins/view.html.php b/core/administrator/components/com_plugins/views/plugins/view.html.php
new file mode 100644
index 00000000..7ab0843e
--- /dev/null
+++ b/core/administrator/components/com_plugins/views/plugins/view.html.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_plugins
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of plugins.
+ *
+ * @since  1.5
+ */
+class PluginsViewPlugins extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->items = $this->get('Items');
+		$this->pagination = $this->get('Pagination');
+		$this->state = $this->get('State');
+		$this->filterForm = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_plugins');
+
+		JToolbarHelper::title(JText::_('COM_PLUGINS_MANAGER_PLUGINS'), 'power-cord plugin');
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('plugin.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('plugins.publish', 'JTOOLBAR_ENABLE', true);
+			JToolbarHelper::unpublish('plugins.unpublish', 'JTOOLBAR_DISABLE', true);
+			JToolbarHelper::checkin('plugins.checkin');
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::preferences('com_plugins');
+		}
+
+		JToolbarHelper::help('JHELP_EXTENSIONS_PLUGIN_MANAGER');
+
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by.
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value.
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'ordering'     => JText::_('JGRID_HEADING_ORDERING'),
+			'enabled'      => JText::_('JSTATUS'),
+			'name'         => JText::_('JGLOBAL_TITLE'),
+			'folder'       => JText::_('COM_PLUGINS_FOLDER_HEADING'),
+			'element'      => JText::_('COM_PLUGINS_ELEMENT_HEADING'),
+			'access'       => JText::_('JGRID_HEADING_ACCESS'),
+			'extension_id' => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_postinstall/access.xml b/core/administrator/components/com_postinstall/access.xml
new file mode 100644
index 00000000..70c6eb67
--- /dev/null
+++ b/core/administrator/components/com_postinstall/access.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<access component="com_postinstall">
+	<section name="component">
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_postinstall/config.xml b/core/administrator/components/com_postinstall/config.xml
new file mode 100644
index 00000000..620bddaa
--- /dev/null
+++ b/core/administrator/components/com_postinstall/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			component="com_postinstall"
+			section="component" 
+		/>
+	</fieldset>	
+</config>
\ No newline at end of file
diff --git a/core/administrator/components/com_postinstall/controllers/message.php b/core/administrator/components/com_postinstall/controllers/message.php
new file mode 100644
index 00000000..a8277158
--- /dev/null
+++ b/core/administrator/components/com_postinstall/controllers/message.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Postinstall message controller.
+ *
+ * @since  3.2
+ */
+class PostinstallControllerMessage extends FOFController
+{
+	/**
+	 * Resets all post-installation messages of the specified extension.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function reset()
+	{
+		/** @var PostinstallModelMessages $model */
+		$model = $this->getThisModel();
+
+		$eid = (int) $model->getState('eid', '700', 'int');
+
+		if (empty($eid))
+		{
+			$eid = 700;
+		}
+
+		$model->resetMessages($eid);
+
+		$this->setRedirect('index.php?option=com_postinstall&eid=' . $eid);
+	}
+
+	/**
+	 * Hides all post-installation messages of the specified extension.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.7
+	 */
+	public function hideAll()
+	{
+		/** @var PostinstallModelMessages $model */
+		$model = $this->getThisModel();
+
+		$eid = (int) $model->getState('eid', '700', 'int');
+
+		if (empty($eid))
+		{
+			$eid = 700;
+		}
+
+		$model->hideMessages($eid);
+
+		$this->setRedirect('index.php?option=com_postinstall&eid=' . $eid);
+	}
+
+	/**
+	 * Executes the action associated with an item.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function action()
+	{
+		// CSRF prevention.
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$item = $model->getItem();
+
+		switch ($item->type)
+		{
+			case 'link':
+				$this->setRedirect($item->action);
+
+				return;
+
+				break;
+
+			case 'action':
+				jimport('joomla.filesystem.file');
+
+				$file = FOFTemplateUtils::parsePath($item->action_file, true);
+
+				if (JFile::exists($file))
+				{
+					require_once $file;
+
+					call_user_func($item->action);
+				}
+				break;
+
+			case 'message':
+			default:
+				break;
+		}
+
+		$this->setRedirect('index.php?option=com_postinstall');
+	}
+}
diff --git a/core/administrator/components/com_postinstall/fof.xml b/core/administrator/components/com_postinstall/fof.xml
new file mode 100644
index 00000000..6e1ccce4
--- /dev/null
+++ b/core/administrator/components/com_postinstall/fof.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fof>
+	<backend>
+		<dispatcher>
+			<option name="default_view">messages</option>
+		</dispatcher>
+		<view name="messages">
+			<acl>
+				<task name="reset">core.edit.state</task>
+			</acl>
+			<taskmap>
+				<task name="read">browse</task>
+				<task name="add">browse</task>
+				<task name="edit">browse</task>
+			</taskmap>
+		</view>
+	</backend>
+</fof>
diff --git a/core/administrator/components/com_postinstall/models/messages.php b/core/administrator/components/com_postinstall/models/messages.php
new file mode 100644
index 00000000..824f3f77
--- /dev/null
+++ b/core/administrator/components/com_postinstall/models/messages.php
@@ -0,0 +1,487 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Model class to manage postinstall messages
+ *
+ * @since  3.2
+ */
+class PostinstallModelMessages extends FOFModel
+{
+	/**
+	 * Builds the SELECT query
+	 *
+	 * @param   boolean  $overrideLimits  Are we requested to override the set limits?
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   3.2
+	 */
+	public function buildQuery($overrideLimits = false)
+	{
+		$query = parent::buildQuery($overrideLimits);
+
+		$db = $this->getDbo();
+
+		// Add a forced extension filtering to the list
+		$eid = $this->getState('eid', 700);
+		$query->where($db->qn('extension_id') . ' = ' . $db->q($eid));
+
+		// Force filter only enabled messages
+		$published = $this->getState('published', 1, 'int');
+		$query->where($db->qn('enabled') . ' = ' . (int) $published);
+
+		return $query;
+	}
+
+	/**
+	 * Returns the name of an extension, as registered in the #__extensions table
+	 *
+	 * @param   integer  $eid  The extension ID
+	 *
+	 * @return  string  The extension name
+	 *
+	 * @since   3.2
+	 */
+	public function getExtensionName($eid)
+	{
+		// Load the extension's information from the database
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select(array('name', 'element', 'client_id'))
+			->from($db->qn('#__extensions'))
+			->where($db->qn('extension_id') . ' = ' . (int) $eid);
+
+		$db->setQuery($query, 0, 1);
+
+		$extension = $db->loadObject();
+
+		if (!is_object($extension))
+		{
+			return '';
+		}
+
+		// Load language files
+		$basePath = JPATH_ADMINISTRATOR;
+
+		if ($extension->client_id == 0)
+		{
+			$basePath = JPATH_SITE;
+		}
+
+		$lang = JFactory::getLanguage();
+		$lang->load($extension->element, $basePath);
+
+		// Return the localised name
+		return JText::_(strtoupper($extension->name));
+	}
+
+	/**
+	 * Resets all messages for an extension
+	 *
+	 * @param   integer  $eid  The extension ID whose messages we'll reset
+	 *
+	 * @return  mixed  False if we fail, a db cursor otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function resetMessages($eid)
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->update($db->qn('#__postinstall_messages'))
+			->set($db->qn('enabled') . ' = 1')
+			->where($db->qn('extension_id') . ' = ' . (int) $eid);
+		$db->setQuery($query);
+
+		return $db->execute();
+	}
+
+	/**
+	 * Hides all messages for an extension
+	 *
+	 * @param   integer  $eid  The extension ID whose messages we'll hide
+	 *
+	 * @return  mixed  False if we fail, a db cursor otherwise
+	 *
+	 * @since   3.8.7
+	 */
+	public function hideMessages($eid)
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->update($db->qn('#__postinstall_messages'))
+			->set($db->qn('enabled') . ' = 0')
+			->where($db->qn('extension_id') . ' = ' . (int) $eid);
+		$db->setQuery($query);
+
+		return $db->execute();
+	}
+
+	/**
+	 * List post-processing. This is used to run the programmatic display
+	 * conditions against each list item and decide if we have to show it or
+	 * not.
+	 *
+	 * Do note that this a core method of the RAD Layer which operates directly
+	 * on the list it's being fed. A little touch of modern magic.
+	 *
+	 * @param   array  &$resultArray  A list of items to process
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function onProcessList(&$resultArray)
+	{
+		$unset_keys          = array();
+		$language_extensions = array();
+
+		// Order the results DESC so the newest is on the top.
+		$resultArray = array_reverse($resultArray);
+
+		foreach ($resultArray as $key => $item)
+		{
+			// Filter out messages based on dynamically loaded programmatic conditions.
+			if (!empty($item->condition_file) && !empty($item->condition_method))
+			{
+				jimport('joomla.filesystem.file');
+
+				$file = FOFTemplateUtils::parsePath($item->condition_file, true);
+
+				if (JFile::exists($file))
+				{
+					require_once $file;
+
+					$result = call_user_func($item->condition_method);
+
+					if ($result === false)
+					{
+						$unset_keys[] = $key;
+					}
+				}
+			}
+
+			// Load the necessary language files.
+			if (!empty($item->language_extension))
+			{
+				$hash = $item->language_client_id . '-' . $item->language_extension;
+
+				if (!in_array($hash, $language_extensions))
+				{
+					$language_extensions[] = $hash;
+					JFactory::getLanguage()->load($item->language_extension, $item->language_client_id == 0 ? JPATH_SITE : JPATH_ADMINISTRATOR);
+				}
+			}
+		}
+
+		if (!empty($unset_keys))
+		{
+			foreach ($unset_keys as $key)
+			{
+				unset($resultArray[$key]);
+			}
+		}
+	}
+
+	/**
+	 * Get the dropdown options for the list of component with post-installation messages
+	 *
+	 * @since 3.4
+	 *
+	 * @return  array  Compatible with JHtmlSelect::genericList
+	 */
+	public function getComponentOptions()
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select('extension_id')
+			->from($db->qn('#__postinstall_messages'))
+			->group(array($db->qn('extension_id')));
+		$db->setQuery($query);
+		$extension_ids = $db->loadColumn();
+
+		$options = array();
+
+		JFactory::getLanguage()->load('files_joomla.sys', JPATH_SITE, null, false, false);
+
+		foreach ($extension_ids as $eid)
+		{
+			$options[] = JHtml::_('select.option', $eid, $this->getExtensionName($eid));
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Adds or updates a post-installation message (PIM) definition. You can use this in your post-installation script using this code:
+	 *
+	 * require_once JPATH_LIBRARIES . '/fof/include.php';
+	 * FOFModel::getTmpInstance('Messages', 'PostinstallModel')->addPostInstallationMessage($options);
+	 *
+	 * The $options array contains the following mandatory keys:
+	 *
+	 * extension_id        The numeric ID of the extension this message is for (see the #__extensions table)
+	 *
+	 * type                One of message, link or action. Their meaning is:
+	 *                         message  Informative message. The user can dismiss it.
+	 *                         link     The action button links to a URL. The URL is defined in the action parameter.
+	 *                         action   A PHP action takes place when the action button is clicked. You need to specify the action_file
+	 *                                  (RAD path to the PHP file) and action (PHP function name) keys. See below for more information.
+	 *
+	 * title_key           The JText language key for the title of this PIM.
+	 *                     Example: COM_FOOBAR_POSTINSTALL_MESSAGEONE_TITLE
+	 *
+	 * description_key     The JText language key for the main body (description) of this PIM
+	 *                     Example: COM_FOOBAR_POSTINSTALL_MESSAGEONE_DESCRIPTION
+	 *
+	 * action_key          The JText language key for the action button. Ignored and not required when type=message
+	 *                     Example: COM_FOOBAR_POSTINSTALL_MESSAGEONE_ACTION
+	 *
+	 * language_extension  The extension name which holds the language keys used above.
+	 *                     For example, com_foobar, mod_something, plg_system_whatever, tpl_mytemplate
+	 *
+	 * language_client_id  Should we load the frontend (0) or backend (1) language keys?
+	 *
+	 * version_introduced  Which was the version of your extension where this message appeared for the first time?
+	 *                     Example: 3.2.1
+	 *
+	 * enabled             Must be 1 for this message to be enabled. If you omit it, it defaults to 1.
+	 *
+	 * condition_file      The RAD path to a PHP file containing a PHP function which determines whether this message should be shown to
+	 *                     the user. @see FOFTemplateUtils::parsePath() for RAD path format. Joomla! will include this file before calling
+	 *                     the condition_method.
+	 *                     Example:   admin://components/com_foobar/helpers/postinstall.php
+	 *
+	 * condition_method    The name of a PHP function which will be used to determine whether to show this message to the user. This must be
+	 *                     a simple PHP user function (not a class method, static method etc) which returns true to show the message and false
+	 *                     to hide it. This function is defined in the condition_file.
+	 *                     Example: com_foobar_postinstall_messageone_condition
+	 *
+	 * When type=message no additional keys are required.
+	 *
+	 * When type=link the following additional keys are required:
+	 *
+	 * action  The URL which will open when the user clicks on the PIM's action button
+	 *         Example:    index.php?option=com_foobar&view=tools&task=installSampleData
+	 *
+	 * When type=action the following additional keys are required:
+	 *
+	 * action_file  The RAD path to a PHP file containing a PHP function which performs the action of this PIM. @see FOFTemplateUtils::parsePath()
+	 *              for RAD path format. Joomla! will include this file before calling the function defined in the action key below.
+	 *              Example:   admin://components/com_foobar/helpers/postinstall.php
+	 *
+	 * action       The name of a PHP function which will be used to run the action of this PIM. This must be a simple PHP user function
+	 *              (not a class method, static method etc) which returns no result.
+	 *              Example: com_foobar_postinstall_messageone_action
+	 *
+	 * @param   array  $options  See description
+	 *
+	 * @return  $this
+	 *
+	 * @throws  Exception
+	 */
+	public function addPostInstallationMessage(array $options)
+	{
+		// Make sure there are options set
+		if (!is_array($options))
+		{
+			throw new Exception('Post-installation message definitions must be of type array', 500);
+		}
+
+		// Initialise array keys
+		$defaultOptions = array(
+			'extension_id'       => '',
+			'type'               => '',
+			'title_key'          => '',
+			'description_key'    => '',
+			'action_key'         => '',
+			'language_extension' => '',
+			'language_client_id' => '',
+			'action_file'        => '',
+			'action'             => '',
+			'condition_file'     => '',
+			'condition_method'   => '',
+			'version_introduced' => '',
+			'enabled'            => '1',
+		);
+
+		$options = array_merge($defaultOptions, $options);
+
+		// Array normalisation. Removes array keys not belonging to a definition.
+		$defaultKeys = array_keys($defaultOptions);
+		$allKeys     = array_keys($options);
+		$extraKeys   = array_diff($allKeys, $defaultKeys);
+
+		if (!empty($extraKeys))
+		{
+			foreach ($extraKeys as $key)
+			{
+				unset($options[$key]);
+			}
+		}
+
+		// Normalisation of integer values
+		$options['extension_id']       = (int) $options['extension_id'];
+		$options['language_client_id'] = (int) $options['language_client_id'];
+		$options['enabled']            = (int) $options['enabled'];
+
+		// Normalisation of 0/1 values
+		foreach (array('language_client_id', 'enabled') as $key)
+		{
+			$options[$key] = $options[$key] ? 1 : 0;
+		}
+
+		// Make sure there's an extension_id
+		if (!(int) $options['extension_id'])
+		{
+			throw new Exception('Post-installation message definitions need an extension_id', 500);
+		}
+
+		// Make sure there's a valid type
+		if (!in_array($options['type'], array('message', 'link', 'action')))
+		{
+			throw new Exception('Post-installation message definitions need to declare a type of message, link or action', 500);
+		}
+
+		// Make sure there's a title key
+		if (empty($options['title_key']))
+		{
+			throw new Exception('Post-installation message definitions need a title key', 500);
+		}
+
+		// Make sure there's a description key
+		if (empty($options['description_key']))
+		{
+			throw new Exception('Post-installation message definitions need a description key', 500);
+		}
+
+		// If the type is anything other than message you need an action key
+		if (($options['type'] != 'message') && empty($options['action_key']))
+		{
+			throw new Exception('Post-installation message definitions need an action key when they are of type "' . $options['type'] . '"', 500);
+		}
+
+		// You must specify the language extension
+		if (empty($options['language_extension']))
+		{
+			throw new Exception('Post-installation message definitions need to specify which extension contains their language keys', 500);
+		}
+
+		// The action file and method are only required for the "action" type
+		if ($options['type'] == 'action')
+		{
+			if (empty($options['action_file']))
+			{
+				throw new Exception('Post-installation message definitions need an action file when they are of type "action"', 500);
+			}
+
+			$file_path = FOFTemplateUtils::parsePath($options['action_file'], true);
+
+			if (!@is_file($file_path))
+			{
+				throw new Exception('The action file ' . $options['action_file'] . ' of your post-installation message definition does not exist', 500);
+			}
+
+			if (empty($options['action']))
+			{
+				throw new Exception('Post-installation message definitions need an action (function name) when they are of type "action"', 500);
+			}
+		}
+
+		if ($options['type'] == 'link')
+		{
+			if (empty($options['link']))
+			{
+				throw new Exception('Post-installation message definitions need an action (URL) when they are of type "link"', 500);
+			}
+		}
+
+		// The condition file and method are only required when the type is not "message"
+		if ($options['type'] != 'message')
+		{
+			if (empty($options['condition_file']))
+			{
+				throw new Exception('Post-installation message definitions need a condition file when they are of type "' . $options['type'] . '"', 500);
+			}
+
+			$file_path = FOFTemplateUtils::parsePath($options['condition_file'], true);
+
+			if (!@is_file($file_path))
+			{
+				throw new Exception('The condition file ' . $options['condition_file'] . ' of your post-installation message definition does not exist', 500);
+			}
+
+			if (empty($options['condition_method']))
+			{
+				throw new Exception(
+					'Post-installation message definitions need a condition method (function name) when they are of type "'
+					. $options['type'] . '"',
+					500
+				);
+			}
+		}
+
+		// Check if the definition exists
+		$table     = $this->getTable();
+		$tableName = $table->getTableName();
+
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn($tableName))
+			->where($db->qn('extension_id') . ' = ' . (int) $options['extension_id'])
+			->where($db->qn('type') . ' = ' . $db->q($options['type']))
+			->where($db->qn('title_key') . ' = ' . $db->q($options['title_key']));
+
+		$existingRow = $db->setQuery($query)->loadAssoc();
+
+		// Is the existing definition the same as the one we're trying to save?
+		if (!empty($existingRow))
+		{
+			$same = true;
+
+			foreach ($options as $k => $v)
+			{
+				if ($existingRow[$k] != $v)
+				{
+					$same = false;
+					break;
+				}
+			}
+
+			// Trying to add the same row as the existing one; quit
+			if ($same)
+			{
+				return $this;
+			}
+
+			// Otherwise it's not the same row. Remove the old row before insert a new one.
+			$query = $db->getQuery(true)
+				->delete($db->qn($tableName))
+				->where($db->q('extension_id') . ' = ' . (int) $options['extension_id'])
+				->where($db->q('type') . ' = ' . $db->q($options['type']))
+				->where($db->q('title_key') . ' = ' . $db->q($options['title_key']));
+
+			$db->setQuery($query)->execute();
+		}
+
+		// Insert the new row
+		$options = (object) $options;
+		$db->insertObject($tableName, $options);
+
+		return $this;
+	}
+}
diff --git a/core/administrator/components/com_postinstall/postinstall.php b/core/administrator/components/com_postinstall/postinstall.php
new file mode 100644
index 00000000..a25b9f89
--- /dev/null
+++ b/core/administrator/components/com_postinstall/postinstall.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Dispatch the component.
+FOFDispatcher::getTmpInstance('com_postinstall')->dispatch();
diff --git a/core/administrator/components/com_postinstall/postinstall.xml b/core/administrator/components/com_postinstall/postinstall.xml
new file mode 100644
index 00000000..4f5fa211
--- /dev/null
+++ b/core/administrator/components/com_postinstall/postinstall.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.2" method="upgrade">
+	<name>com_postinstall</name>
+	<author>Joomla! Project</author>
+	<creationDate>September 2013</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.0</version>
+	<description>COM_POSTINSTALL_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>fof.xml</filename>
+			<filename>postinstall.php</filename>
+			<filename>toolbar.php</filename>
+			<folder>controllers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_postinstall.ini</language>
+			<language tag="en-GB">language/en-GB.com_postinstall.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_postinstall/toolbar.php b/core/administrator/components/com_postinstall/toolbar.php
new file mode 100644
index 00000000..e797f406
--- /dev/null
+++ b/core/administrator/components/com_postinstall/toolbar.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Toolbar class renders the component title area and the toolbar.
+ *
+ * @since  3.2
+ */
+class PostinstallToolbar extends FOFToolbar
+{
+	/**
+	 * Setup the toolbar and title
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function onMessages()
+	{
+		JToolBarHelper::preferences($this->config['option'], 550, 875);
+		JToolbarHelper::help('JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES');
+	}
+}
diff --git a/core/administrator/components/com_postinstall/views/messages/tmpl/default.php b/core/administrator/components/com_postinstall/views/messages/tmpl/default.php
new file mode 100644
index 00000000..b9c8b62b
--- /dev/null
+++ b/core/administrator/components/com_postinstall/views/messages/tmpl/default.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$renderer = JFactory::getDocument()->loadRenderer('module');
+$options  = array('style' => 'raw');
+$mod      = JModuleHelper::getModule('mod_feed');
+$param    = array(
+	'rssurl'      => 'https://www.joomla.org/announcements/release-news.feed?type=rss',
+	'rsstitle'    => 0,
+	'rssdesc'     => 0,
+	'rssimage'    => 1,
+	'rssitems'    => 5,
+	'rssitemdesc' => 1,
+	'word_count'  => 200,
+	'cache'       => 0,
+	);
+$params = array('params' => json_encode($param));
+
+JHtml::_('formbehavior.chosen', 'select');
+?>
+
+<form action="index.php" method="post" name="adminForm" class="form-inline" id="adminForm">
+	<input type="hidden" name="option" value="com_postinstall">
+	<input type="hidden" name="task" value="">
+	<label for="eid"><?php echo JText::_('COM_POSTINSTALL_MESSAGES_FOR'); ?></label>
+	<?php echo JHtml::_('select.genericlist', $this->extension_options, 'eid', array('onchange' => 'this.form.submit()', 'class' => 'input-xlarge'), 'value', 'text', $this->eid, 'eid'); ?>
+</form>
+
+<?php if ($this->eid == 700) : ?>
+<div class="row-fluid">
+	<div class="span8">
+<?php endif; ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="hero-unit">
+				<h2><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE'); ?></h2>
+				<p><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_DESC'); ?></p>
+				<a href="index.php?option=com_postinstall&amp;view=messages&amp;task=reset&amp;eid=<?php echo $this->eid; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-warning btn-large">
+					<span class="icon icon-eye-open" aria-hidden="true"></span>
+					<?php echo JText::_('COM_POSTINSTALL_BTN_RESET'); ?>
+				</a>
+			</div>
+		<?php else : ?>
+			<?php foreach ($this->items as $item) : ?>
+			<fieldset>
+				<legend><?php echo JText::_($item->title_key); ?></legend>
+				<p class="small">
+					<?php echo JText::sprintf('COM_POSTINSTALL_LBL_SINCEVERSION', $item->version_introduced); ?>
+				</p>
+				<div>
+					<?php echo JText::_($item->description_key); ?>
+					<?php if ($item->type !== 'message') : ?>
+					<a href="index.php?option=com_postinstall&amp;view=messages&amp;task=action&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-primary">
+						<?php echo JText::_($item->action_key); ?>
+					</a>
+					<?php endif; ?>
+					<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
+					<a href="index.php?option=com_postinstall&amp;view=message&amp;task=unpublish&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-inverse btn-small">
+						<?php echo JText::_('COM_POSTINSTALL_BTN_HIDE'); ?>
+					</a>
+					<?php endif; ?>
+				</div>
+			</fieldset>
+			<?php endforeach; ?>
+		<?php endif; ?>
+<?php if ($this->eid == 700) : ?>
+	</div>
+	<div class="span4">
+		<h2><?php echo JText::_('COM_POSTINSTALL_LBL_RELEASENEWS'); ?></h2>
+		<?php echo $renderer->render($mod, $params, $options); ?>
+	</div>
+</div>
+<?php endif; ?>
diff --git a/core/administrator/components/com_postinstall/views/messages/tmpl/default.xml b/core/administrator/components/com_postinstall/views/messages/tmpl/default.xml
new file mode 100755
index 00000000..f4b7d574
--- /dev/null
+++ b/core/administrator/components/com_postinstall/views/messages/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_postinstall/views/messages/view.html.php b/core/administrator/components/com_postinstall/views/messages/view.html.php
new file mode 100644
index 00000000..2bbfe4ee
--- /dev/null
+++ b/core/administrator/components/com_postinstall/views/messages/view.html.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Model class to display postinstall messages
+ *
+ * @since  3.2
+ */
+class PostinstallViewMessages extends FOFViewHtml
+{
+	/**
+	 * Executes before rendering the page for the Browse task.
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 *
+	 * @since   3.2
+	 */
+	protected function onBrowse($tpl = null)
+	{
+		/** @var PostinstallModelMessages $model */
+		$model = $this->getModel();
+
+		$this->eid = (int) $model->getState('eid', '700', 'int');
+
+		if (empty($this->eid))
+		{
+			$this->eid = 700;
+		}
+
+		$this->token = JFactory::getSession()->getFormToken();
+		$this->extension_options = $model->getComponentOptions();
+
+		JToolBarHelper::title(JText::sprintf('COM_POSTINSTALL_MESSAGES_TITLE', $model->getExtensionName($this->eid)));
+
+		return parent::onBrowse($tpl);
+	}
+
+	/**
+	 * Executes on display of the page
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 *
+	 * @since   3.8.7
+	 */
+	protected function onDisplay($tpl = null)
+	{
+		$return = parent::onDisplay($tpl);
+
+		if (!empty($this->items))
+		{
+			JToolbarHelper::custom('hideAll', 'unpublish.png', 'unpublish_f2.png', 'COM_POSTINSTALL_HIDE_ALL_MESSAGES', false);
+		}
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_redirect/access.xml b/core/administrator/components/com_redirect/access.xml
new file mode 100644
index 00000000..ddf5198b
--- /dev/null
+++ b/core/administrator/components/com_redirect/access.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_redirect">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_redirect/config.xml b/core/administrator/components/com_redirect/config.xml
new file mode 100644
index 00000000..9c87ece0
--- /dev/null
+++ b/core/administrator/components/com_redirect/config.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset 
+		name="redirect"
+		label="COM_REDIRECT_ADVANCED_OPTIONS"
+		>
+		<field
+			name="mode"
+			type="radio"
+			label="COM_REDIRECT_MODE_LABEL"
+			description="COM_REDIRECT_MODE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field
+			name="separator"
+			type="text"
+			label="COM_REDIRECT_BULK_SEPARATOR_LABEL"
+			description="COM_REDIRECT_BULK_SEPARATOR_DESC"
+			default="|"
+		/>
+		<field
+			name="defaultImportState"
+			type="radio"
+			label="COM_REDIRECT_DEFAULT_IMPORT_STATE_LABEL"
+			description="COM_REDIRECT_DEFAULT_IMPORT_STATE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_redirect"
+			section="component" 
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_redirect/controller.php b/core/administrator/components/com_redirect/controller.php
new file mode 100644
index 00000000..7ce22435
--- /dev/null
+++ b/core/administrator/components/com_redirect/controller.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Redirect master display controller.
+ *
+ * @since  1.6
+ */
+class RedirectController extends JControllerLegacy
+{
+	/**
+	 * @var		string	The default view.
+	 * @since   1.6
+	 */
+	protected $default_view = 'links';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   mixed    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('RedirectHelper', JPATH_ADMINISTRATOR . '/components/com_redirect/helpers/redirect.php');
+
+		// Load the submenu.
+		RedirectHelper::addSubmenu($this->input->get('view', 'links'));
+
+		$view   = $this->input->get('view', 'links');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'link' && $layout == 'edit' && !$this->checkEditId('com_redirect.edit.link', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_redirect&view=links', false));
+
+			return false;
+		}
+
+		parent::display();
+	}
+}
diff --git a/core/administrator/components/com_redirect/controllers/link.php b/core/administrator/components/com_redirect/controllers/link.php
new file mode 100644
index 00000000..2d1e8fb0
--- /dev/null
+++ b/core/administrator/components/com_redirect/controllers/link.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Redirect link controller class.
+ *
+ * @since  1.6
+ */
+class RedirectControllerLink extends JControllerForm
+{
+	// Parent class access checks are sufficient for this controller.
+}
diff --git a/core/administrator/components/com_redirect/controllers/links.php b/core/administrator/components/com_redirect/controllers/links.php
new file mode 100644
index 00000000..925c5bc4
--- /dev/null
+++ b/core/administrator/components/com_redirect/controllers/links.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Redirect link list controller class.
+ *
+ * @since  1.6
+ */
+class RedirectControllerLinks extends JControllerAdmin
+{
+	/**
+	 * Method to update a record.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function activate()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids     = $this->input->get('cid', array(), 'array');
+		$newUrl  = $this->input->getString('new_url');
+		$comment = $this->input->getString('comment');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_REDIRECT_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			$ids = ArrayHelper::toInteger($ids);
+
+			// Remove the items.
+			if (!$model->activate($ids, $newUrl, $comment))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				$this->setMessage(JText::plural('COM_REDIRECT_N_LINKS_UPDATED', count($ids)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_redirect&view=links');
+	}
+
+	/**
+	 * Method to duplicate URLs in records.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function duplicateUrls()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids     = $this->input->get('cid', array(), 'array');
+		$newUrl  = $this->input->getString('new_url');
+		$comment = $this->input->getString('comment');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_REDIRECT_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			$ids = ArrayHelper::toInteger($ids);
+
+			// Remove the items.
+			if (!$model->duplicateUrls($ids, $newUrl, $comment))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				$this->setMessage(JText::plural('COM_REDIRECT_N_LINKS_UPDATED', count($ids)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_redirect&view=links');
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  The prefix of the model.
+	 * @param   array   $config  An array of settings.
+	 *
+	 * @return  JModel instance
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Link', $prefix = 'RedirectModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Executes the batch process to add URLs to the database
+	 *
+	 * @return  void
+	 */
+	public function batch()
+	{
+		$batch_urls_request = $this->input->post->get('batch_urls', array(), 'array');
+		$batch_urls_lines   = array_map('trim', explode("\n", $batch_urls_request[0]));
+
+		$batch_urls = array();
+
+		foreach ($batch_urls_lines as $batch_urls_line)
+		{
+			if (!empty($batch_urls_line))
+			{
+				$params = JComponentHelper::getParams('com_redirect');
+				$separator = $params->get('separator', '|');
+
+				// Basic check to make sure the correct separator is being used
+				if (!\Joomla\String\StringHelper::strpos($batch_urls_line, $separator))
+				{
+					$this->setMessage(JText::sprintf('COM_REDIRECT_NO_SEPARATOR_FOUND', $separator), 'error');
+					$this->setRedirect('index.php?option=com_redirect&view=links');
+
+					return false;
+				}
+
+				$batch_urls[] = array_map('trim', explode($separator, $batch_urls_line));
+			}
+		}
+
+		// Set default message on error - overwrite if successful
+		$this->setMessage(JText::_('COM_REDIRECT_NO_ITEM_ADDED'), 'error');
+
+		if (!empty($batch_urls))
+		{
+			$model = $this->getModel('Links');
+
+			// Execute the batch process
+			if ($model->batchProcess($batch_urls))
+			{
+				$this->setMessage(JText::plural('COM_REDIRECT_N_LINKS_ADDED', count($batch_urls)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_redirect&view=links');
+	}
+
+	/**
+	 * Clean out the unpublished links.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function purge()
+	{
+		$model = $this->getModel('Links');
+
+		if ($model->purge())
+		{
+			$message = JText::_('COM_REDIRECT_CLEAR_SUCCESS');
+		}
+		else
+		{
+			$message = JText::_('COM_REDIRECT_CLEAR_FAIL');
+		}
+
+		$this->setRedirect('index.php?option=com_redirect&view=links', $message);
+	}
+}
diff --git a/core/administrator/components/com_redirect/helpers/html/redirect.php b/core/administrator/components/com_redirect/helpers/html/redirect.php
new file mode 100644
index 00000000..e9f0eb4c
--- /dev/null
+++ b/core/administrator/components/com_redirect/helpers/html/redirect.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Utility class for creating HTML Grids.
+ *
+ * @since  1.6
+ */
+class JHtmlRedirect
+{
+	/**
+	 * Display the published or unpublished state of an item.
+	 *
+	 * @param   int      $value      The state value.
+	 * @param   int      $i          The ID of the item.
+	 * @param   boolean  $canChange  An optional prefix for the task.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 *
+	 * @throws  InvalidArgumentException
+	 */
+	public static function published($value = 0, $i = null, $canChange = true)
+	{
+		// Note: $i is required but has to be an optional argument in the function call due to argument order
+		if (null === $i)
+		{
+			throw new InvalidArgumentException('$i is a required argument in JHtmlRedirect::published');
+		}
+
+		// Array of image, task, title, action
+		$states = array(
+			1  => array('publish', 'links.unpublish', 'JENABLED', 'COM_REDIRECT_DISABLE_LINK'),
+			0  => array('unpublish', 'links.publish', 'JDISABLED', 'COM_REDIRECT_ENABLE_LINK'),
+			2  => array('archive', 'links.unpublish', 'JARCHIVED', 'JUNARCHIVE'),
+			-2 => array('trash', 'links.publish', 'JTRASHED', 'COM_REDIRECT_ENABLE_LINK'),
+		);
+
+		$state = ArrayHelper::getValue($states, (int) $value, $states[0]);
+		$icon  = $state[0];
+
+		if ($canChange)
+		{
+			$html = '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $state[1] . '\')" class="btn btn-micro hasTooltip'
+				. ($value == 1 ? ' active' : '') . '" title="' . JHtml::_('tooltipText', $state[3])
+				. '"><span class="icon-' . $icon . '" aria-hidden="true"></span></a>';
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_redirect/helpers/redirect.php b/core/administrator/components/com_redirect/helpers/redirect.php
new file mode 100644
index 00000000..763e7ab6
--- /dev/null
+++ b/core/administrator/components/com_redirect/helpers/redirect.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Redirect component helper.
+ *
+ * @since  1.6
+ */
+class RedirectHelper
+{
+	public static $extension = 'com_redirect';
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		// No submenu for this component.
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_redirect');
+	}
+
+	/**
+	 * Returns an array of standard published state filter options.
+	 *
+	 * @return  array  An array containing the options
+	 *
+	 * @since   1.6
+	 */
+	public static function publishedOptions()
+	{
+		// Build the active state filter options.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '*', 'JALL');
+		$options[] = JHtml::_('select.option', '1', 'JENABLED');
+		$options[] = JHtml::_('select.option', '0', 'JDISABLED');
+		$options[] = JHtml::_('select.option', '2', 'JARCHIVED');
+		$options[] = JHtml::_('select.option', '-2', 'JTRASHED');
+
+		return $options;
+	}
+
+	/**
+	 * Gets the redirect system plugin extension id.
+	 *
+	 * @return  integer  The redirect system plugin extension id.
+	 *
+	 * @since   3.6.0
+	 */
+	public static function getRedirectPluginId()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('redirect'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Checks whether the option "Collect URLs" is enabled for the output message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public static function collectUrlsEnabled()
+	{
+		$collect_urls = false;
+
+		if (JPluginHelper::isEnabled('system', 'redirect'))
+		{
+			$params       = new Registry(JPluginHelper::getPlugin('system', 'redirect')->params);
+			$collect_urls = (bool) $params->get('collect_urls', 1);
+		}
+
+		return $collect_urls;
+	}
+}
diff --git a/core/administrator/components/com_redirect/layouts/toolbar/batch.php b/core/administrator/components/com_redirect/layouts/toolbar/batch.php
new file mode 100644
index 00000000..6eb3c021
--- /dev/null
+++ b/core/administrator/components/com_redirect/layouts/toolbar/batch.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$title = $displayData['title'];
+
+?>
+<button data-toggle="modal" onclick="{jQuery( '#collapseModal' ).modal('show'); return true;}" class="btn btn-small">
+	<span class="icon-checkbox-partial" aria-hidden="true"></span>
+	<?php echo $title; ?>
+</button>
diff --git a/core/administrator/components/com_redirect/models/fields/redirect.php b/core/administrator/components/com_redirect/models/fields/redirect.php
new file mode 100644
index 00000000..d1655c04
--- /dev/null
+++ b/core/administrator/components/com_redirect/models/fields/redirect.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * A dropdown containing all valid HTTP 1.1 response codes.
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ * @since       3.4
+ */
+class JFormFieldRedirect extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $type = 'Redirect';
+
+	/**
+	 * A map of integer HTTP 1.1 response codes to the full HTTP Status for the headers.
+	 *
+	 * @var    object
+	 * @since  3.4
+	 * @link   http://www.iana.org/assignments/http-status-codes/
+	 */
+	protected $responseMap = array(
+		100 => 'HTTP/1.1 100 Continue',
+		101 => 'HTTP/1.1 101 Switching Protocols',
+		102 => 'HTTP/1.1 102 Processing',
+		200 => 'HTTP/1.1 200 OK',
+		201 => 'HTTP/1.1 201 Created',
+		202 => 'HTTP/1.1 202 Accepted',
+		203 => 'HTTP/1.1 203 Non-Authoritative Information',
+		204 => 'HTTP/1.1 204 No Content',
+		205 => 'HTTP/1.1 205 Reset Content',
+		206 => 'HTTP/1.1 206 Partial Content',
+		207 => 'HTTP/1.1 207 Multi-Status',
+		208 => 'HTTP/1.1 208 Already Reported',
+		226 => 'HTTP/1.1 226 IM Used',
+		300 => 'HTTP/1.1 300 Multiple Choices',
+		301 => 'HTTP/1.1 301 Moved Permanently',
+		302 => 'HTTP/1.1 302 Found',
+		303 => 'HTTP/1.1 303 See other',
+		304 => 'HTTP/1.1 304 Not Modified',
+		305 => 'HTTP/1.1 305 Use Proxy',
+		306 => 'HTTP/1.1 306 (Unused)',
+		307 => 'HTTP/1.1 307 Temporary Redirect',
+		308 => 'HTTP/1.1 308 Permanent Redirect',
+		400 => 'HTTP/1.1 400 Bad Request',
+		401 => 'HTTP/1.1 401 Unauthorized',
+		402 => 'HTTP/1.1 402 Payment Required',
+		403 => 'HTTP/1.1 403 Forbidden',
+		404 => 'HTTP/1.1 404 Not Found',
+		405 => 'HTTP/1.1 405 Method Not Allowed',
+		406 => 'HTTP/1.1 406 Not Acceptable',
+		407 => 'HTTP/1.1 407 Proxy Authentication Required',
+		408 => 'HTTP/1.1 408 Request Timeout',
+		409 => 'HTTP/1.1 409 Conflict',
+		410 => 'HTTP/1.1 410 Gone',
+		411 => 'HTTP/1.1 411 Length Required',
+		412 => 'HTTP/1.1 412 Precondition Failed',
+		413 => 'HTTP/1.1 413 Payload Too Large',
+		414 => 'HTTP/1.1 414 URI Too Long',
+		415 => 'HTTP/1.1 415 Unsupported Media Type',
+		416 => 'HTTP/1.1 416 Requested Range Not Satisfiable',
+		417 => 'HTTP/1.1 417 Expectation Failed',
+		418 => 'HTTP/1.1 418 I\'m a teapot',
+		422 => 'HTTP/1.1 422 Unprocessable Entity',
+		423 => 'HTTP/1.1 423 Locked',
+		424 => 'HTTP/1.1 424 Failed Dependency',
+		425 => 'HTTP/1.1 425 Reserved for WebDAV advanced collections expired proposal',
+		426 => 'HTTP/1.1 426 Upgrade Required',
+		428 => 'HTTP/1.1 428 Precondition Required',
+		429 => 'HTTP/1.1 429 Too Many Requests',
+		431 => 'HTTP/1.1 431 Request Header Fields Too Large',
+		451 => 'HTTP/1.1 451 Unavailable For Legal Reasons',
+		500 => 'HTTP/1.1 500 Internal Server Error',
+		501 => 'HTTP/1.1 501 Not Implemented',
+		502 => 'HTTP/1.1 502 Bad Gateway',
+		503 => 'HTTP/1.1 503 Service Unavailable',
+		504 => 'HTTP/1.1 504 Gateway Timeout',
+		505 => 'HTTP/1.1 505 HTTP Version Not Supported',
+		506 => 'HTTP/1.1 506 Variant Also Negotiates (Experimental)',
+		507 => 'HTTP/1.1 507 Insufficient Storage',
+		508 => 'HTTP/1.1 508 Loop Detected',
+		510 => 'HTTP/1.1 510 Not Extended',
+		511 => 'HTTP/1.1 511 Network Authentication Required',
+	);
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   3.4
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		foreach ($this->responseMap as $key => $value)
+		{
+			$options[] = JHtml::_('select.option', $key, $value);
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_redirect/models/forms/filter_links.xml b/core/administrator/components/com_redirect/models/forms/filter_links.xml
new file mode 100644
index 00000000..ae51da8f
--- /dev/null
+++ b/core/administrator/components/com_redirect/models/forms/filter_links.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_REDIRECT_FILTER_SEARCH_LABEL"
+			description="COM_REDIRECT_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="state"
+			type="redirect_status"
+			label="COM_REDIRECT_FILTER_PUBLISHED"
+			description="COM_REDIRECT_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="http_status"
+			type="Redirect"
+			label="COM_REDIRECT_FILTER_HTTP_HEADER_LABEL"
+			description="COM_REDIRECT_FILTER_HTTP_HEADER_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_REDIRECT_FILTER_SELECT_OPTION_HTTP_HEADER</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.old_url ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.old_url ASC">COM_REDIRECT_HEADING_OLD_URL_ASC</option>
+			<option value="a.old_url DESC">COM_REDIRECT_HEADING_OLD_URL_DESC</option>
+			<option value="a.new_url ASC">COM_REDIRECT_HEADING_NEW_URL_ASC</option>
+			<option value="a.new_url DESC">COM_REDIRECT_HEADING_NEW_URL_DESC</option>
+			<option value="a.referer ASC">COM_REDIRECT_HEADING_REFERRER_ASC</option>
+			<option value="a.referer DESC">COM_REDIRECT_HEADING_REFERRER_DESC</option>
+			<option value="a.created_date ASC">COM_REDIRECT_HEADING_CREATED_DATE_ASC</option>
+			<option value="a.created_date DESC">COM_REDIRECT_HEADING_CREATED_DATE_DESC</option>
+			<option value="a.hits ASC">COM_REDIRECT_HEADING_HITS_ASC</option>
+			<option value="a.hits DESC">COM_REDIRECT_HEADING_HITS_DESC</option>
+			<option value="a.header ASC">COM_REDIRECT_HEADING_STATUS_CODE_ASC</option>
+			<option value="a.header DESC">COM_REDIRECT_HEADING_STATUS_CODE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="5"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_redirect/models/forms/link.xml b/core/administrator/components/com_redirect/models/forms/link.xml
new file mode 100644
index 00000000..80d1656a
--- /dev/null
+++ b/core/administrator/components/com_redirect/models/forms/link.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			id="id"
+			default="0"
+			readonly="true"
+			class="readonly"
+		 />
+
+		<field
+			name="old_url"
+			type="text"
+			label="COM_REDIRECT_FIELD_OLD_URL_LABEL"
+			description="COM_REDIRECT_FIELD_OLD_URL_DESC"
+			class="input-xxlarge"
+			size="50"
+			required="true" 
+		/>
+
+		<field
+			name="new_url"
+			type="text"
+			label="COM_REDIRECT_FIELD_NEW_URL_LABEL"
+			description="COM_REDIRECT_FIELD_NEW_URL_DESC"
+			class="input-xxlarge"
+			size="50"
+			required="true" 
+		/>
+
+		<field
+			name="comment"
+			type="text"
+			label="COM_REDIRECT_FIELD_COMMENT_LABEL"
+			description="COM_REDIRECT_FIELD_COMMENT_DESC"
+			size="40" 
+		/>
+
+		<field
+			name="published"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="chzn-color-state"
+			size="1"
+			default="1"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="referer"
+			type="text"
+			label="COM_REDIRECT_FIELD_REFERRER_LABEL"
+			id="referer"
+			size="50"
+			readonly="true" 
+		/>
+
+		<field
+			name="created_date"
+			type="text"
+			label="COM_REDIRECT_FIELD_CREATED_DATE_LABEL"
+			id="created_date"
+			class="readonly"
+			size="20"
+			readonly="true" 
+		/>
+
+		<field
+			name="modified_date"
+			type="text"
+			label="COM_REDIRECT_FIELD_UPDATED_DATE_LABEL"
+			id="modified_date"
+			class="readonly"
+			size="20"
+			readonly="true" 
+		/>
+
+		<field
+			name="hits"
+			type="number"
+			label="JGLOBAL_HITS"
+			id="hits"
+			class="readonly"
+			size="20"
+			readonly="true"
+			filter="unset" 
+		/>
+	</fieldset>
+	<fieldset name="advanced">
+		<field
+			name="header"
+			type="redirect"
+			label="COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_LABEL"
+			description="COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_DESC"
+			default="301"
+			class="input-xlarge"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_redirect/models/link.php b/core/administrator/components/com_redirect/models/link.php
new file mode 100644
index 00000000..f393a828
--- /dev/null
+++ b/core/administrator/components/com_redirect/models/link.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Redirect link model.
+ *
+ * @since  1.6
+ */
+class RedirectModelLink extends JModelAdmin
+{
+	/**
+	 * @var        string    The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_REDIRECT';
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		if ($record->published != -2)
+		{
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.delete', 'com_redirect');
+	}
+
+	/**
+	 * Method to test whether a record can have its state edited.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		// Check the component since there are no categories or other assets.
+		return $user->authorise('core.edit.state', 'com_redirect');
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable    A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Link', $prefix = 'RedirectTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_redirect.link', 'link', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on access controls.
+		if ($this->canEditState((object) $data) != true)
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('published', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('published', 'filter', 'unset');
+		}
+
+		// If in advanced mode then we make sure the new URL field is not compulsory and the header
+		// field compulsory in case people select non-3xx redirects
+		if (JComponentHelper::getParams('com_redirect')->get('mode', 0) == true)
+		{
+			$form->setFieldAttribute('new_url', 'required', 'false');
+			$form->setFieldAttribute('header', 'required', 'true');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_redirect.edit.link.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_redirect.link', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to activate links.
+	 *
+	 * @param   array   &$pks     An array of link ids.
+	 * @param   string  $url      The new URL to set for the redirect.
+	 * @param   string  $comment  A comment for the redirect links.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function activate(&$pks, $url, $comment = null)
+	{
+		$user = JFactory::getUser();
+		$db = $this->getDbo();
+
+		// Sanitize the ids.
+		$pks = (array) $pks;
+		$pks = ArrayHelper::toInteger($pks);
+
+		// Populate default comment if necessary.
+		$comment = (!empty($comment)) ? $comment : JText::sprintf('COM_REDIRECT_REDIRECTED_ON', JHtml::_('date', time()));
+
+		// Access checks.
+		if (!$user->authorise('core.edit', 'com_redirect'))
+		{
+			$pks = array();
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		if (!empty($pks))
+		{
+			// Update the link rows.
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__redirect_links'))
+				->set($db->quoteName('new_url') . ' = ' . $db->quote($url))
+				->set($db->quoteName('published') . ' = ' . (int) 1)
+				->set($db->quoteName('comment') . ' = ' . $db->quote($comment))
+				->where($db->quoteName('id') . ' IN (' . implode(',', $pks) . ')');
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to batch update URLs to have new redirect urls and comments. Note will publish any unpublished URLs.
+	 *
+	 * @param   array   &$pks     An array of link ids.
+	 * @param   string  $url      The new URL to set for the redirect.
+	 * @param   string  $comment  A comment for the redirect links.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   3.6.0
+	 */
+	public function duplicateUrls(&$pks, $url, $comment = null)
+	{
+		$user = JFactory::getUser();
+		$db = $this->getDbo();
+
+		// Sanitize the ids.
+		$pks = (array) $pks;
+		$pks = ArrayHelper::toInteger($pks);
+
+		// Access checks.
+		if (!$user->authorise('core.edit', 'com_redirect'))
+		{
+			$pks = array();
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		if (!empty($pks))
+		{
+			$date = JFactory::getDate()->toSql();
+
+			// Update the link rows.
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__redirect_links'))
+				->set($db->quoteName('new_url') . ' = ' . $db->quote($url))
+				->set($db->quoteName('modified_date') . ' = ' . $db->quote($date))
+				->set($db->quoteName('published') . ' = ' . 1)
+				->where($db->quoteName('id') . ' IN (' . implode(',', $pks) . ')');
+
+			if (!empty($comment))
+			{
+				$query->set($db->quoteName('comment') . ' = ' . $db->quote($comment));
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_redirect/models/links.php b/core/administrator/components/com_redirect/models/links.php
new file mode 100644
index 00000000..088bb625
--- /dev/null
+++ b/core/administrator/components/com_redirect/models/links.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of redirect links.
+ *
+ * @since  1.6
+ */
+class RedirectModelLinks extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'state', 'a.state',
+				'old_url', 'a.old_url',
+				'new_url', 'a.new_url',
+				'referer', 'a.referer',
+				'hits', 'a.hits',
+				'created_date', 'a.created_date',
+				'published', 'a.published',
+				'header', 'a.header', 'http_status',
+			);
+		}
+
+		parent::__construct($config);
+	}
+	/**
+	 * Removes all of the unpublished redirects from the table.
+	 *
+	 * @return  boolean result of operation
+	 *
+	 * @since   3.5
+	 */
+	public function purge()
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true);
+
+		$query->delete('#__redirect_links')->where($db->qn('published') . '= 0');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.old_url', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'string'));
+		$this->setState('filter.http_status', $this->getUserStateFromRequest($this->context . '.filter.http_status', 'filter_http_status', '', 'cmd'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_redirect');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.http_status');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from($db->quoteName('#__redirect_links', 'a'));
+
+		// Filter by published state
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where($db->quoteName('a.published') . ' = ' . (int) $state);
+		}
+		elseif ($state === '')
+		{
+			$query->where($db->quoteName('a.published') . ' IN (0,1)');
+		}
+
+		// Filter the items over the HTTP status code header.
+		if ($httpStatusCode = $this->getState('filter.http_status'))
+		{
+			$query->where($db->quoteName('a.header') . ' = ' . (int) $httpStatusCode);
+		}
+
+		// Filter the items over the search string if set.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where(
+					'(' . $db->quoteName('old_url') . ' LIKE ' . $search .
+					' OR ' . $db->quoteName('new_url') . ' LIKE ' . $search .
+					' OR ' . $db->quoteName('comment') . ' LIKE ' . $search .
+					' OR ' . $db->quoteName('referer') . ' LIKE ' . $search . ')'
+				);
+			}
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.old_url')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Add the entered URLs into the database
+	 *
+	 * @param   array  $batch_urls  Array of URLs to enter into the database
+	 *
+	 * @return boolean
+	 */
+	public function batchProcess($batch_urls)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$params = JComponentHelper::getParams('com_redirect');
+		$state  = (int) $params->get('defaultImportState', 0);
+
+		$columns = array(
+			$db->quoteName('old_url'),
+			$db->quoteName('new_url'),
+			$db->quoteName('referer'),
+			$db->quoteName('comment'),
+			$db->quoteName('hits'),
+			$db->quoteName('published'),
+			$db->quoteName('created_date')
+		);
+
+		$query->columns($columns);
+
+		foreach ($batch_urls as $batch_url)
+		{
+			$old_url = $batch_url[0];
+
+			// Destination URL can also be an external URL
+			if (!empty($batch_url[1]))
+			{
+				$new_url = $batch_url[1];
+			}
+			else
+			{
+				$new_url = '';
+			}
+
+			$query->insert($db->quoteName('#__redirect_links'), false)
+				->values(
+					$db->quote($old_url) . ', ' . $db->quote($new_url) . ' ,' . $db->quote('') . ', ' . $db->quote('') . ', 0, ' . $state . ', ' .
+					$db->quote(JFactory::getDate()->toSql())
+				);
+		}
+
+		$db->setQuery($query);
+		$db->execute();
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_redirect/redirect.php b/core/administrator/components/com_redirect/redirect.php
new file mode 100644
index 00000000..129c48c3
--- /dev/null
+++ b/core/administrator/components/com_redirect/redirect.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_redirect'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Redirect');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_redirect/redirect.xml b/core/administrator/components/com_redirect/redirect.xml
new file mode 100644
index 00000000..d5168eae
--- /dev/null
+++ b/core/administrator/components/com_redirect/redirect.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_redirect</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_REDIRECT_XML_DESCRIPTION</description>
+	<administration>
+		<menu link="option=com_redirect" img="class:redirect">Redirect</menu>
+
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>redirect.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_redirect.ini</language>
+			<language tag="en-GB">language/en-GB.com_redirect.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_redirect/tables/link.php b/core/administrator/components/com_redirect/tables/link.php
new file mode 100644
index 00000000..7e7eb654
--- /dev/null
+++ b/core/administrator/components/com_redirect/tables/link.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Link Table for Redirect.
+ *
+ * @since  1.6
+ */
+class RedirectTableLink extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database object.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__redirect_links', 'id', $db);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function check()
+	{
+		$this->old_url = trim(rawurldecode($this->old_url));
+		$this->new_url = trim(rawurldecode($this->new_url));
+
+		// Check for valid name.
+		if (empty($this->old_url))
+		{
+			$this->setError(JText::_('COM_REDIRECT_ERROR_SOURCE_URL_REQUIRED'));
+
+			return false;
+		}
+
+		// Check for NOT NULL.
+		if (empty($this->referer))
+		{
+			$this->referer = '';
+		}
+
+		// Check for valid name if not in advanced mode.
+		if (empty($this->new_url) && JComponentHelper::getParams('com_redirect')->get('mode', 0) == false)
+		{
+			$this->setError(JText::_('COM_REDIRECT_ERROR_DESTINATION_URL_REQUIRED'));
+
+			return false;
+		}
+		elseif (empty($this->new_url) && JComponentHelper::getParams('com_redirect')->get('mode', 0) == true)
+		{
+			// Else if an empty URL and in redirect mode only throw the same error if the code is a 3xx status code
+			if ($this->header < 400 && $this->header >= 300)
+			{
+				$this->setError(JText::_('COM_REDIRECT_ERROR_DESTINATION_URL_REQUIRED'));
+
+				return false;
+			}
+		}
+
+		// Check for duplicates
+		if ($this->old_url == $this->new_url)
+		{
+			$this->setError(JText::_('COM_REDIRECT_ERROR_DUPLICATE_URLS'));
+
+			return false;
+		}
+
+		$db = $this->getDbo();
+
+		// Check for existing name
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->select($db->quoteName('old_url'))
+			->from('#__redirect_links')
+			->where($db->quoteName('old_url') . ' = ' . $db->quote($this->old_url));
+		$db->setQuery($query);
+		$urls = $db->loadAssocList();
+
+		foreach ($urls as $url)
+		{
+			if ($url['old_url'] === $this->old_url && (int) $url['id'] != (int) $this->id)
+			{
+				$this->setError(JText::_('COM_REDIRECT_ERROR_DUPLICATE_OLD_URL'));
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overriden store method to set dates.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate()->toSql();
+
+		$this->modified_date = $date;
+
+		if (!$this->id)
+		{
+			// New record.
+			$this->created_date = $date;
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/core/administrator/components/com_redirect/views/link/tmpl/edit.php b/core/administrator/components/com_redirect/views/link/tmpl/edit.php
new file mode 100644
index 00000000..8cf3d374
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/link/tmpl/edit.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'link.cancel' || document.formvalidator.isValid(document.getElementById('link-form')))
+		{
+			Joomla.submitform(task, document.getElementById('link-form'));
+		}
+	};
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_redirect&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="link-form" class="form-validate form-horizontal">
+	<fieldset>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'basic')); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic', empty($this->item->id) ? JText::_('COM_REDIRECT_NEW_LINK') : JText::sprintf('COM_REDIRECT_EDIT_LINK', $this->item->id)); ?>
+				<?php echo $this->form->renderField('old_url'); ?>
+				<?php echo $this->form->renderField('new_url'); ?>
+				<?php echo $this->form->renderField('published'); ?>
+				<?php echo $this->form->renderField('comment'); ?>
+				<?php echo $this->form->renderField('id'); ?>
+				<?php echo $this->form->renderField('created_date'); ?>
+				<?php echo $this->form->renderField('modified_date'); ?>
+				<?php if (JComponentHelper::getParams('com_redirect')->get('mode')) : ?>
+					<?php echo $this->form->renderFieldset('advanced'); ?>
+				<?php endif; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_redirect/views/link/view.html.php b/core/administrator/components/com_redirect/views/link/view.html.php
new file mode 100644
index 00000000..f5673544
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/link/view.html.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a redirect link.
+ *
+ * @since  1.6
+ */
+class RedirectViewLink extends JViewLegacy
+{
+	protected $item;
+
+	protected $form;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  False if unsuccessful, otherwise void.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$isNew = ($this->item->id == 0);
+		$canDo = JHelperContent::getActions('com_redirect');
+
+		JToolbarHelper::title($isNew ? JText::_('COM_REDIRECT_MANAGER_LINK_NEW') : JText::_('COM_REDIRECT_MANAGER_LINK_EDIT'), 'refresh redirect');
+
+		// If not checked out, can save the item.
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::apply('link.apply');
+			JToolbarHelper::save('link.save');
+		}
+
+		/**
+		 * This component does not support Save as Copy due to uniqueness checks.
+		 * While it can be done, it causes too much confusion if the user does
+		 * not change the Old URL.
+		 */
+		if ($canDo->get('core.edit') && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('link.save2new');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('link.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('link.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_redirect/views/links/tmpl/default.php b/core/administrator/components/com_redirect/views/links/tmpl/default.php
new file mode 100644
index 00000000..deae24b3
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/links/tmpl/default.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_redirect&view=links'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-main-container">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if ($this->redirectPluginId) : ?>
+			<?php $link = JRoute::_('index.php?option=com_plugins&client_id=0&task=plugin.edit&extension_id=' . $this->redirectPluginId . '&tmpl=component&layout=modal'); ?>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'plugin' . $this->redirectPluginId . 'Modal',
+				array(
+					'url'         => $link,
+					'title'       => JText::_('COM_REDIRECT_EDIT_PLUGIN_SETTINGS'),
+					'height'      => '400px',
+					'width'       => '800px',
+					'bodyHeight'  => '70',
+					'modalWidth'  => '80',
+					'closeButton' => false,
+					'backdrop'    => 'static',
+					'keyboard'    => false,
+					'footer'      => '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
+						. ' onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
+						. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
+						. '<button type="button" class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
+						. JText::_("JSAVE") . '</button>'
+						. '<button type="button" class="btn btn-success" aria-hidden="true" onclick="jQuery(\'#plugin' . $this->redirectPluginId . 'Modal iframe\').contents().find(\'#applyBtn\').click(); return false;">'
+						. JText::_("JAPPLY") . '</button>'
+				)
+			); ?>
+		<?php endif; ?>
+
+		<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+		<?php else : ?>
+			<table class="table table-striped">
+				<thead>
+					<tr>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap title">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_OLD_URL', 'a.old_url', $listDirn, $listOrder); ?>
+						</th>
+						<th width="30%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_NEW_URL', 'a.new_url', $listDirn, $listOrder); ?>
+						</th>
+						<th width="30%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_REFERRER', 'a.referer', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_CREATED_DATE', 'a.created_date', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_HITS', 'a.hits', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_REDIRECT_HEADING_STATUS_CODE', 'a.header', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$canEdit   = $user->authorise('core.edit',       'com_redirect');
+					$canChange = $user->authorise('core.edit.state', 'com_redirect');
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td class="center">
+							<div class="btn-group">
+								<?php echo JHtml::_('redirect.published', $item->published, $i); ?>
+								<?php // Create dropdown items and render the dropdown list.
+								if ($canChange)
+								{
+									JHtml::_('actionsdropdown.' . ((int) $item->published === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'links');
+									JHtml::_('actionsdropdown.' . ((int) $item->published === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'links');
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->old_url));
+								}
+								?>
+							</div>
+						</td>
+						<td class="break-word">
+							<?php if ($canEdit) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_redirect&task=link.edit&id=' . $item->id); ?>" title="<?php echo $this->escape($item->old_url); ?>">
+									<?php echo $this->escape(str_replace(JUri::root(), '', rawurldecode($item->old_url))); ?></a>
+							<?php else : ?>
+									<?php echo $this->escape(str_replace(JUri::root(), '', rawurldecode($item->old_url))); ?>
+							<?php endif; ?>
+						</td>
+						<td class="small break-word">
+							<?php echo $this->escape(rawurldecode($item->new_url)); ?>
+						</td>
+						<td class="small break-word hidden-phone hidden-tablet">
+							<?php echo $this->escape($item->referer); ?>
+						</td>
+						<td class="small hidden-phone hidden-tablet">
+							<?php echo JHtml::_('date', $item->created_date, JText::_('DATE_FORMAT_LC4')); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->hits; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->header; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<?php if (!empty($this->items)) : ?>
+			<?php echo $this->loadTemplate('addform'); ?>
+		<?php endif; ?>
+		<?php // Load the batch processing form if user is allowed ?>
+			<?php if ($user->authorise('core.create', 'com_redirect')
+				&& $user->authorise('core.edit', 'com_redirect')
+				&& $user->authorise('core.edit.state', 'com_redirect')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_REDIRECT_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_redirect/views/links/tmpl/default.xml b/core/administrator/components/com_redirect/views/links/tmpl/default.xml
new file mode 100644
index 00000000..2158f363
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/links/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_REDIRECT">
+		<message>
+			<![CDATA[COM_REDIRECT_XML_DESCRIPTION]]>
+		</message>
+	</layout>
+</metadata>
\ No newline at end of file
diff --git a/core/administrator/components/com_redirect/views/links/tmpl/default_addform.php b/core/administrator/components/com_redirect/views/links/tmpl/default_addform.php
new file mode 100644
index 00000000..81f9b81d
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/links/tmpl/default_addform.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="accordion hidden-phone" id="accordion1">
+	<div class="accordion-group">
+		<div class="accordion-heading">
+			<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#batch">
+				<?php echo JText::_('COM_REDIRECT_BATCH_UPDATE_WITH_NEW_URL'); ?>
+			</a>
+		</div>
+		<div id="batch" class="accordion-body collapse">
+			<div class="accordion-inner">
+				<fieldset class="batch form-inline">
+					<div class="control-group">
+						<label for="new_url" class="control-label"><?php echo JText::_('COM_REDIRECT_FIELD_NEW_URL_LABEL'); ?></label>
+						<div class="controls">
+							<input type="text" name="new_url" id="new_url" value="" size="50" title="<?php echo JText::_('COM_REDIRECT_FIELD_NEW_URL_DESC'); ?>" />
+						</div>
+					</div>
+					<div class="control-group">
+						<label for="comment" class="control-label"><?php echo JText::_('COM_REDIRECT_FIELD_COMMENT_LABEL'); ?></label>
+						<div class="controls">
+							<input type="text" name="comment" id="comment" value="" size="50" title="<?php echo JText::_('COM_REDIRECT_FIELD_COMMENT_DESC'); ?>" />
+						</div>
+					</div>
+					<button class="btn btn-primary" type="button" onclick="this.form.task.value='links.duplicateUrls';this.form.submit();"><?php echo JText::_('COM_REDIRECT_BUTTON_UPDATE_LINKS'); ?></button>
+				</fieldset>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php b/core/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php
new file mode 100644
index 00000000..4db253d9
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+$params    = $this->params;
+$separator = $params->get('separator', '|');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span12">
+			<p><?php echo JText::sprintf('COM_REDIRECT_BATCH_TIP', $separator); ?></p>
+			<div class="controls">
+				<textarea class="span12" rows="10" aria-required="true" value="" id="batch_urls" name="batch_urls"></textarea>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php b/core/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..d28cb1e2
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" data-dismiss="modal" type="button" onclick="document.getElementById('batch_urls').value='';">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('links.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
diff --git a/core/administrator/components/com_redirect/views/links/view.html.php b/core/administrator/components/com_redirect/views/links/view.html.php
new file mode 100644
index 00000000..40319b23
--- /dev/null
+++ b/core/administrator/components/com_redirect/views/links/view.html.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of redirection links.
+ *
+ * @since  1.6
+ */
+class RedirectViewLinks extends JViewLegacy
+{
+	protected $enabled;
+
+	protected $collect_urls_enabled;
+
+	protected $redirectPluginId = 0;
+
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	public $filterForm;
+
+	public $activeFilters;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  False if unsuccessful, otherwise void.
+	 *
+	 * @since   1.6
+	 *
+	 * @throws  Exception
+	 */
+	public function display($tpl = null)
+	{
+		// Set variables
+		$app                        = JFactory::getApplication();
+		$this->enabled              = JPluginHelper::isEnabled('system', 'redirect');
+		$this->collect_urls_enabled = RedirectHelper::collectUrlsEnabled();
+		$this->items                = $this->get('Items');
+		$this->pagination           = $this->get('Pagination');
+		$this->state                = $this->get('State');
+		$this->filterForm           = $this->get('FilterForm');
+		$this->activeFilters        = $this->get('ActiveFilters');
+		$this->params               = JComponentHelper::getParams('com_redirect');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Show messages about the enabled plugin and if the plugin should collect URLs
+		if ($this->enabled && $this->collect_urls_enabled)
+		{
+			$app->enqueueMessage(JText::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
+		}
+		else
+		{
+			$this->redirectPluginId = RedirectHelper::getRedirectPluginId();
+
+			$link = JHtml::_(
+				'link',
+				'#plugin' . $this->redirectPluginId . 'Modal',
+				JText::_('COM_REDIRECT_SYSTEM_PLUGIN'),
+				'class="alert-link" data-toggle="modal" id="title-' . $this->redirectPluginId . '"'
+			);
+
+			// To be removed in Joomla 4
+			if (JFactory::getApplication()->getTemplate() === 'hathor')
+			{
+				$link = JHtml::_(
+					'link',
+					JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId()),
+					JText::_('COM_REDIRECT_SYSTEM_PLUGIN')
+				);
+			}
+
+			if ($this->enabled && !$this->collect_urls_enabled)
+			{
+				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED'), $link), 'notice');
+			}
+			else
+			{
+				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');
+			}
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_redirect');
+
+		JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINKS'), 'refresh redirect');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('link.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('link.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			if ($state->get('filter.state') != 2)
+			{
+				JToolbarHelper::divider();
+				JToolbarHelper::publish('links.publish', 'JTOOLBAR_ENABLE', true);
+				JToolbarHelper::unpublish('links.unpublish', 'JTOOLBAR_DISABLE', true);
+			}
+
+			if ($state->get('filter.state') != -1)
+			{
+				JToolbarHelper::divider();
+
+				if ($state->get('filter.state') != 2)
+				{
+					JToolbarHelper::archiveList('links.archive');
+				}
+				elseif ($state->get('filter.state') == 2)
+				{
+					JToolbarHelper::unarchiveList('links.publish', 'JTOOLBAR_UNARCHIVE');
+				}
+			}
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			// Get the toolbar object instance
+			$bar = JToolbar::getInstance('toolbar');
+
+			$title = JText::_('JTOOLBAR_BULK_IMPORT');
+
+			JHtml::_('bootstrap.modal', 'collapseModal');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($state->get('filter.state') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'links.delete', 'JTOOLBAR_EMPTY_TRASH');
+			JToolbarHelper::divider();
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::custom('links.purge', 'delete', 'delete', 'COM_REDIRECT_TOOLBAR_PURGE', false);
+			JToolbarHelper::trash('links.trash');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_redirect');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_REDIRECT_MANAGER');
+	}
+}
diff --git a/core/administrator/components/com_search/access.xml b/core/administrator/components/com_search/access.xml
new file mode 100644
index 00000000..9b65a750
--- /dev/null
+++ b/core/administrator/components/com_search/access.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_search">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_search/config.xml b/core/administrator/components/com_search/config.xml
new file mode 100644
index 00000000..1e735fd8
--- /dev/null
+++ b/core/administrator/components/com_search/config.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset 
+		name="component"
+		label="COM_SEARCH_FIELDSET_SEARCH_OPTIONS_LABEL">
+		<field
+			name="enabled"
+			type="radio"
+			label="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
+			description="COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="search_phrases"
+			type="radio"
+			label="COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL"
+			description="COM_SEARCH_FIELD_SEARCH_PHRASES_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="search_areas"
+			type="radio"
+			label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"
+			description="COM_SEARCH_FIELD_SEARCH_AREAS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_date"
+			type="radio"
+			label="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL"
+			description="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="opensearch_name"
+			type="text"
+			label="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_LABEL"
+			description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_DESC"
+			default=""
+		/>
+
+		<field
+			name="opensearch_description"
+			type="textarea"
+			label="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL"
+			description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESC"
+			default=""
+			cols="30"
+			rows="2"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_search"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_search/controller.php b/core/administrator/components/com_search/controller.php
new file mode 100644
index 00000000..a11fcf1b
--- /dev/null
+++ b/core/administrator/components/com_search/controller.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Search master display controller.
+ *
+ * @since  1.6
+ */
+class SearchController extends JControllerLegacy
+{
+	/**
+	 * @var		string	The default view.
+	 * @since   1.6
+	 */
+	protected $default_view = 'searches';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  SearchController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		JLoader::register('SearchHelper', JPATH_ADMINISTRATOR . '/components/com_search/helpers/search.php');
+
+		// Load the submenu.
+		SearchHelper::addSubmenu($this->input->get('view', 'searches'));
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_search/controllers/searches.php b/core/administrator/components/com_search/controllers/searches.php
new file mode 100644
index 00000000..91047565
--- /dev/null
+++ b/core/administrator/components/com_search/controllers/searches.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of search terms.
+ *
+ * @since  1.6
+ */
+class SearchControllerSearches extends JControllerLegacy
+{
+	/**
+	 * Method to reset the search log table.
+	 *
+	 * @return  boolean
+	 */
+	public function reset()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('Searches');
+
+		if (!$model->reset())
+		{
+			JError::raiseWarning(500, $model->getError());
+		}
+
+		$this->setRedirect('index.php?option=com_search&view=searches');
+	}
+
+	/**
+	 * Method to toggle the view of results.
+	 *
+	 * @return  boolean
+	 */
+	public function toggleResults()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		if ($this->getModel('Searches')->getState('show_results', 1, 'int') === 0)
+		{
+			$this->setRedirect('index.php?option=com_search&view=searches&show_results=1');
+		}
+		else
+		{
+			$this->setRedirect('index.php?option=com_search&view=searches&show_results=0');
+		}
+	}
+}
diff --git a/core/administrator/components/com_search/helpers/search.php b/core/administrator/components/com_search/helpers/search.php
new file mode 100644
index 00000000..2663e20a
--- /dev/null
+++ b/core/administrator/components/com_search/helpers/search.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Search component helper.
+ *
+ * @since  1.5
+ */
+class SearchHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		// Not required.
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead.
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function.
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions.
+		return JHelperContent::getActions('com_search');
+	}
+
+	/**
+	 * Sanitise search word.
+	 *
+	 * @param   string  &$searchword   Search word to be sanitised.
+	 * @param   string  $searchphrase  Either 'all', 'any' or 'exact'.
+	 *
+	 * @return  boolean  True if search word needs to be sanitised.
+	 */
+	public static function santiseSearchWord(&$searchword, $searchphrase)
+	{
+		$ignored = false;
+
+		$lang          = JFactory::getLanguage();
+		$tag           = $lang->getTag();
+		$search_ignore = $lang->getIgnoredSearchWords();
+
+		// Deprecated in 1.6 use $lang->getIgnoredSearchWords instead.
+		$ignoreFile = JLanguageHelper::getLanguagePath() . '/' . $tag . '/' . $tag . '.ignore.php';
+
+		if (file_exists($ignoreFile))
+		{
+			include $ignoreFile;
+		}
+
+		// Check for words to ignore.
+		$aterms = explode(' ', StringHelper::strtolower($searchword));
+
+		// First case is single ignored word.
+		if (count($aterms) == 1 && in_array(StringHelper::strtolower($searchword), $search_ignore))
+		{
+			$ignored = true;
+		}
+
+		// Filter out search terms that are too small.
+		$lower_limit = $lang->getLowerLimitSearchWord();
+
+		foreach ($aterms as $aterm)
+		{
+			if (StringHelper::strlen($aterm) < $lower_limit)
+			{
+				$search_ignore[] = $aterm;
+			}
+		}
+
+		// Next is to remove ignored words from type 'all' or 'any' (not exact) searches with multiple words.
+		if (count($aterms) > 1 && $searchphrase != 'exact')
+		{
+			$pruned     = array_diff($aterms, $search_ignore);
+			$searchword = implode(' ', $pruned);
+		}
+
+		return $ignored;
+	}
+
+	/**
+	 * Does search word need to be limited?
+	 *
+	 * @param   string  &$searchword  Search word to be checked.
+	 *
+	 * @return  boolean  True if search word should be limited; false otherwise.
+	 *
+	 * @since  1.5
+	 */
+	public static function limitSearchWord(&$searchword)
+	{
+		$restriction = false;
+
+		$lang = JFactory::getLanguage();
+
+		// Limit searchword to a maximum of characters.
+		$upper_limit = $lang->getUpperLimitSearchWord();
+
+		if (StringHelper::strlen($searchword) > $upper_limit)
+		{
+			$searchword  = StringHelper::substr($searchword, 0, $upper_limit - 1);
+			$restriction = true;
+		}
+
+		// Searchword must contain a minimum of characters.
+		if ($searchword && StringHelper::strlen($searchword) < $lang->getLowerLimitSearchWord())
+		{
+			$searchword  = '';
+			$restriction = true;
+		}
+
+		return $restriction;
+	}
+
+	/**
+	 * Logs a search term.
+	 *
+	 * @param   string  $search_term  The term being searched.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use \Joomla\CMS\Helper\SearchHelper::logSearch() instead.
+	 */
+	public static function logSearch($search_term)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use \Joomla\CMS\Helper\SearchHelper::logSearch() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		\Joomla\CMS\Helper\SearchHelper::logSearch($search_term, 'com_search');
+	}
+
+	/**
+	 * Prepares results from search for display.
+	 *
+	 * @param   string  $text        The source string.
+	 * @param   string  $searchword  The searchword to select around.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function prepareSearchContent($text, $searchword)
+	{
+		// Strips tags won't remove the actual jscript.
+		$text = preg_replace("'<script[^>]*>.*?</script>'si", '', $text);
+		$text = preg_replace('/{.+?}/', '', $text);
+
+		// $text = preg_replace('/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is','\2', $text);
+
+		// Replace line breaking tags with whitespace.
+		$text = preg_replace("'<(br[^/>]*?/|hr[^/>]*?/|/(div|h[1-6]|li|p|td))>'si", ' ', $text);
+
+		return self::_smartSubstr(strip_tags($text), $searchword);
+	}
+
+	/**
+	 * Checks an object for search terms (after stripping fields of HTML).
+	 *
+	 * @param   object  $object      The object to check.
+	 * @param   string  $searchTerm  Search words to check for.
+	 * @param   array   $fields      List of object variables to check against.
+	 *
+	 * @return  boolean True if searchTerm is in object, false otherwise.
+	 */
+	public static function checkNoHtml($object, $searchTerm, $fields)
+	{
+		$searchRegex = array(
+			'#<script[^>]*>.*?</script>#si',
+			'#<style[^>]*>.*?</style>#si',
+			'#<!.*?(--|]])>#si',
+			'#<[^>]*>#i'
+		);
+		$terms = explode(' ', $searchTerm);
+
+		if (empty($fields))
+		{
+			return false;
+		}
+
+		foreach ($fields as $field)
+		{
+			if (!isset($object->$field))
+			{
+				continue;
+			}
+
+			$text = self::remove_accents($object->$field);
+
+			foreach ($searchRegex as $regex)
+			{
+				$text = preg_replace($regex, '', $text);
+			}
+
+			foreach ($terms as $term)
+			{
+				$term = self::remove_accents($term);
+
+				if (StringHelper::stristr($text, $term) !== false)
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Transliterates given text to ASCII.
+	 *
+	 * @param   string  $str  String to remove accents from.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function remove_accents($str)
+	{
+		$str = JLanguageTransliterate::utf8_latin_to_ascii($str);
+
+		// @TODO: remove other prefixes as well?
+		return preg_replace("/[\"'^]([a-z])/ui", '\1', $str);
+	}
+
+	/**
+	 * Returns substring of characters around a searchword.
+	 *
+	 * @param   string   $text        The source string.
+	 * @param   integer  $searchword  Number of chars to return.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function _smartSubstr($text, $searchword)
+	{
+		$lang        = JFactory::getLanguage();
+		$length      = $lang->getSearchDisplayedCharactersNumber();
+		$ltext       = self::remove_accents($text);
+		$textlen     = StringHelper::strlen($ltext);
+		$lsearchword = StringHelper::strtolower(self::remove_accents($searchword));
+		$wordfound   = false;
+		$pos         = 0;
+
+		while ($wordfound === false && $pos < $textlen)
+		{
+			if (($wordpos = @StringHelper::strpos($ltext, ' ', $pos + $length)) !== false)
+			{
+				$chunk_size = $wordpos - $pos;
+			}
+			else
+			{
+				$chunk_size = $length;
+			}
+
+			$chunk     = StringHelper::substr($ltext, $pos, $chunk_size);
+			$wordfound = StringHelper::strpos(StringHelper::strtolower($chunk), $lsearchword);
+
+			if ($wordfound === false)
+			{
+				$pos += $chunk_size + 1;
+			}
+		}
+
+		if ($wordfound !== false)
+		{
+			return (($pos > 0) ? '...&#160;' : '') . StringHelper::substr($text, $pos, $chunk_size) . '&#160;...';
+		}
+		else
+		{
+			if (($wordpos = @StringHelper::strpos($text, ' ', $length)) !== false)
+			{
+				return StringHelper::substr($text, 0, $wordpos) . '&#160;...';
+			}
+			else
+			{
+				return StringHelper::substr($text, 0, $length);
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_search/helpers/site.php b/core/administrator/components/com_search/helpers/site.php
new file mode 100644
index 00000000..0b3c2ec7
--- /dev/null
+++ b/core/administrator/components/com_search/helpers/site.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Mock JSite class used to fool the frontend search plugins because they route the results.
+ *
+ * @since  1.5
+ */
+class JSite extends JObject
+{
+	/**
+	 * False method to fool the frontend search plugins.
+	 *
+	 * @return  JSite
+	 *
+	 * @since  1.5
+	 */
+	public function getMenu()
+	{
+		$result = new JSite;
+
+		return $result;
+	}
+
+	/**
+	 * False method to fool the frontend search plugins.
+	 *
+	 * @return  array
+	 *
+	 * @since  1.5
+	 */
+	public function getItems()
+	{
+		return array();
+	}
+}
diff --git a/core/administrator/components/com_search/models/forms/filter_searches.xml b/core/administrator/components/com_search/models/forms/filter_searches.xml
new file mode 100644
index 00000000..c22da9f4
--- /dev/null
+++ b/core/administrator/components/com_search/models/forms/filter_searches.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_SEARCH_SEARCH_IN_PHRASE"
+			description="COM_SEARCH_SEARCH_IN_PHRASE"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="a.hits ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.search_term ASC">COM_SEARCH_HEADING_SEARCH_TERM_ASC</option>
+			<option value="a.search_term DESC">COM_SEARCH_HEADING_SEARCH_TERM_DESC</option>
+			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
+			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_search/models/searches.php b/core/administrator/components/com_search/models/searches.php
new file mode 100644
index 00000000..32bbc596
--- /dev/null
+++ b/core/administrator/components/com_search/models/searches.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of search terms.
+ *
+ * @since  1.6
+ */
+class SearchModelSearches extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'search_term', 'a.search_term',
+				'hits', 'a.hits',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.hits', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		// Special state for toggle results button.
+		$this->setState('show_results', $this->getUserStateFromRequest($this->context . '.show_results', 'show_results', 1, 'int'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_search');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('show_results');
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from($db->quoteName('#__core_log_searches', 'a'));
+
+		// Filter by search in title
+		if ($search = $this->getState('filter.search'))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where($db->quoteName('a.search_term') . ' LIKE ' . $search);
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.hits')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Override the parent getItems to inject optional data.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+
+		// Determine if number of results for search item should be calculated
+		// by default it is `off` as it is highly query intensive
+		if ($this->getState('show_results'))
+		{
+			JPluginHelper::importPlugin('search');
+			$app = JFactory::getApplication();
+
+			if (!class_exists('JSite'))
+			{
+				// This fools the routers in the search plugins into thinking it's in the frontend
+				JLoader::register('JSite', JPATH_ADMINISTRATOR . '/components/com_search/helpers/site.php');
+			}
+
+			foreach ($items as &$item)
+			{
+				$results = $app->triggerEvent('onContentSearch', array($item->search_term));
+				$item->returns = 0;
+
+				foreach ($results as $result)
+				{
+					$item->returns += count($result);
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to reset the seach log table.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function reset()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__core_log_searches'));
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_search/search.php b/core/administrator/components/com_search/search.php
new file mode 100644
index 00000000..8275e0bf
--- /dev/null
+++ b/core/administrator/components/com_search/search.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_search'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Search');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_search/search.xml b/core/administrator/components/com_search/search.xml
new file mode 100644
index 00000000..d395afa9
--- /dev/null
+++ b/core/administrator/components/com_search/search.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_search</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_SEARCH_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>router.php</filename>
+		<filename>search.php</filename>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_search.ini</language>
+	</languages>
+	<administration>
+		<menu link="option=com_search" img="class:search">Search</menu>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>search.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_search.ini</language>
+			<language tag="en-GB">language/en-GB.com_search.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_search/views/searches/tmpl/default.php b/core/administrator/components/com_search/views/searches/tmpl/default.php
new file mode 100644
index 00000000..6b607329
--- /dev/null
+++ b/core/administrator/components/com_search/views/searches/tmpl/default.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_search&view=searches'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<?php else : ?>
+	<div id="j-main-container">
+	<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+		<?php else : ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_SEARCH_HEADING_PHRASE', 'a.search_term', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JText::_('COM_SEARCH_HEADING_RESULTS'); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="3">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="break-word">
+						<?php echo $this->escape($item->search_term); ?>
+					</td>
+					<td>
+						<?php echo (int) $item->hits; ?>
+					</td>
+					<?php if ($this->state->get('show_results')) : ?>
+
+					<td class="center btns">
+						<a class="badge <?php if ($item->returns > 0) echo 'badge-success'; ?>" target="_blank" href="<?php echo JUri::root(); ?>index.php?option=com_search&amp;view=search&amp;searchword=<?php echo JFilterOutput::stringURLSafe($item->search_term); ?>">
+							<?php echo $item->returns; ?><span class="icon-out-2" aria-hidden="true"></span><span class="element-invisible"><?php echo JText::_('JBROWSERTARGET_NEW'); ?></span></a>
+					</td>
+					<?php else : ?>
+					<td class="center">
+						<?php echo JText::_('COM_SEARCH_NO_RESULTS'); ?>
+					</td>
+					<?php endif; ?>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_search/views/searches/tmpl/default.xml b/core/administrator/components/com_search/views/searches/tmpl/default.xml
new file mode 100644
index 00000000..ff4f089e
--- /dev/null
+++ b/core/administrator/components/com_search/views/searches/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_SEARCH_SEARCH_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_SEARCH_SEARCH_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
\ No newline at end of file
diff --git a/core/administrator/components/com_search/views/searches/view.html.php b/core/administrator/components/com_search/views/searches/view.html.php
new file mode 100644
index 00000000..004993e8
--- /dev/null
+++ b/core/administrator/components/com_search/views/searches/view.html.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of search terms.
+ *
+ * @since  1.5
+ */
+class SearchViewSearches extends JViewLegacy
+{
+	protected $enabled;
+
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app                 = JFactory::getApplication();
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->enabled       = $this->state->params->get('enabled');
+		$this->canDo         = JHelperContent::getActions('com_search');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Check if plugin is enabled
+		if ($this->enabled)
+		{
+			$app->enqueueMessage(JText::_('COM_SEARCH_LOGGING_ENABLED'), 'notice');
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_SEARCH_LOGGING_DISABLED'), 'warning');
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = $this->canDo;
+
+		JToolbarHelper::title(JText::_('COM_SEARCH_MANAGER_SEARCHES'), 'search');
+
+		$showResults = $this->state->get('show_results', 1, 'int');
+
+		if ($showResults === 0)
+		{
+			JToolbarHelper::custom('searches.toggleresults', 'zoom-in.png', null, 'COM_SEARCH_SHOW_SEARCH_RESULTS', false);
+		}
+		else
+		{
+			JToolbarHelper::custom('searches.toggleresults', 'zoom-out.png', null, 'COM_SEARCH_HIDE_SEARCH_RESULTS', false);
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::custom('searches.reset', 'refresh.png', 'refresh_f2.png', 'JSEARCH_RESET', false);
+		}
+
+		JToolbarHelper::divider();
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_search');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_SEARCH');
+	}
+}
diff --git a/core/administrator/components/com_tags/access.xml b/core/administrator/components/com_tags/access.xml
new file mode 100644
index 00000000..c4f8083a
--- /dev/null
+++ b/core/administrator/components/com_tags/access.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_tags">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_tags/config.xml b/core/administrator/components/com_tags/config.xml
new file mode 100644
index 00000000..cd7c55ff
--- /dev/null
+++ b/core/administrator/components/com_tags/config.xml
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="taglist"
+		label="COM_TAGS_CONFIG_TAG_SETTINGS_LABEL"
+		description="COM_TAGS_CONFIG_TAG_SETTINGS_DESC">
+
+		<field
+			name="tag_layout"
+			type="componentlayout"
+			label="COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_LABEL"
+			description="COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_tags"
+			view="tag"
+		/>
+
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
+			default="5"
+			showon="save_history:1"
+		/>
+
+		<field 
+			name="show_tag_title" 
+			type="radio"
+			label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
+			description="COM_TAGS_SHOW_TAG_TITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="tag_list_show_tag_image" 
+			type="radio"
+			label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
+			description="COM_TAGS_SHOW_TAG_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="tag_list_show_tag_description" 
+			type="radio" 
+			label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
+			description="COM_TAGS_SHOW_TAG_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="tag_list_image" 
+			type="media"
+			label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
+			description="COM_TAGS_TAG_LIST_MEDIA_DESC"
+		/>
+	
+		<field 
+			name="tag_list_orderby"
+			type="list"
+			label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
+			description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
+			default="title"
+			>
+			<option value="c.core_title">JGLOBAL_TITLE</option>
+			<option value="match_count">COM_TAGS_MATCH_COUNT</option>
+			<option value="c.core_created_time">JGLOBAL_CREATED_DATE</option>
+			<option value="c.core_modified_time">JGLOBAL_MODIFIED_DATE</option>
+			<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
+		</field>
+
+		<field 
+			name="tag_list_orderby_direction" 
+			type="radio" 
+			label="JGLOBAL_ORDER_DIRECTION_LABEL"
+			description="JGLOBAL_ORDER_DIRECTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="ASC"
+			>
+			<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
+			<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
+		</field>
+
+		<field 
+			name="show_headings" 
+			type="radio"
+			label="COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL"
+			description="COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"			
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="tag_list_show_date"
+			type="list"
+			label="COM_TAGS_TAG_LIST_SHOW_DATE_DESC"
+			description="COM_TAGS_TAG_LIST_SHOW_DATE_LABEL"
+			default="0"
+			>
+			<option value="0">JHIDE</option>
+			<option value="created">JGLOBAL_CREATED</option>
+			<option value="modified">JGLOBAL_MODIFIED</option>
+			<option value="published">JPUBLISHED</option>
+		</field>
+
+		<field 
+			name="tag_list_show_item_image" 
+			type="radio" 
+			label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
+			description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+		
+		<field 
+			name="tag_list_show_item_description" 
+			type="radio"
+			label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
+			description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+		
+		<field
+			name="tag_list_item_maximum_characters"
+			type="number"
+			label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
+			description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+			filter="integer"
+			showon="tag_list_show_item_description:1"
+		/>
+
+	</fieldset>
+	
+	<fieldset
+		name="tagselection"
+		label="COM_TAGS_CONFIG_SELECTION_SETTINGS_LABEL"
+		description="COM_TAGS_CONFIG_SELECTION_SETTINGS_DESC">
+
+		<field
+			name="min_term_length"
+			type="integer"
+			label="COM_TAGS_CONFIG_TAG_MIN_LENGTH_LABEL"
+			description="COM_TAGS_CONFIG_TAG_MIN_LENGTH_DESC"
+			first="1"
+			last="3"
+			step="1"
+			default="3"
+		/>
+
+		<field 
+			name="return_any_or_all" 
+			type="radio" 
+			label="COM_TAGS_SEARCH_TYPE_LABEL"
+			description="COM_TAGS_SEARCH_TYPE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">COM_TAGS_ANY</option>
+			<option value="0">COM_TAGS_ALL</option>
+		</field>
+		
+		<field 
+			name="include_children" 
+			type="radio" 
+			label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
+			description="COM_TAGS_INCLUDE_CHILDREN_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">COM_TAGS_INCLUDE</option>
+			<option value="0">COM_TAGS_EXCLUDE</option>
+		</field>
+		
+		<field
+			name="maximum"
+			type="number"
+			label="COM_TAGS_LIST_MAX_LABEL"
+			description="COM_TAGS_LIST_MAX_DESC"
+			default="200"
+			filter="integer"
+		/>
+		
+		<field 
+			name="tag_list_language_filter"
+			type="contentlanguage"
+			label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
+			description="COM_TAGS_FIELD_LANGUAGE_FILTER_DESC"
+			default="all"
+			>
+			<option value="all">JALL</option>
+			<option value="current_language">JCURRENT</option>
+		</field>
+		
+	</fieldset>	
+
+	<fieldset
+		name="alltags"
+		label="COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_LABEL"
+		description="COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_DESC">
+
+		<field
+			name="tags_layout" 
+			type="componentlayout"
+			label="COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_LABEL"
+			description="COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_DESC"
+			menuitems="true"
+			extension="com_tags"
+			view="tags"
+		/>
+
+		<field 
+			name="all_tags_orderby"
+			type="list"
+			label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
+			description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
+			default="title"
+			>
+			<option value="title">JGLOBAL_TITLE</option>
+			<option value="hits">JGLOBAL_HITS</option>
+			<option value="created_time">JGLOBAL_CREATED_DATE</option>
+			<option value="modified_time">JGLOBAL_MODIFIED_DATE</option>
+			<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
+		</field>
+
+		<field 
+			name="all_tags_orderby_direction" 
+			type="radio"
+			label="JGLOBAL_ORDER_DIRECTION_LABEL"
+			description="JGLOBAL_ORDER_DIRECTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="ASC"
+			>
+			<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
+			<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
+		</field>
+
+		<field 
+			name="all_tags_show_tag_image" 
+			type="radio" 
+			label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
+			description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="all_tags_show_tag_descripion" 
+			type="radio" 
+			label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
+			description="COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+		
+		<field
+			name="all_tags_tag_maximum_characters"
+			type="number"
+			label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
+			description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+			filter="integer"
+			showon="all_tags_show_tag_descripion:1"
+		/>
+		
+		<field 
+			name="all_tags_show_tag_hits" 
+			type="radio" 
+			label="JGLOBAL_HITS"
+			description="COM_TAGS_FIELD_CONFIG_HITS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="shared"
+		label="COM_TAGS_CONFIG_SHARED_SETTINGS_LABEL"
+		description="COM_TAGS_CONFIG_SHARED_SETTINGS_DESC">
+		
+		<field
+			name="filter_field"
+			type="radio"
+			label="JGLOBAL_FILTER_FIELD_LABEL"
+			description="JGLOBAL_FILTER_FIELD_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="show_pagination_limit" 
+			type="radio"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+		
+		<field 
+			name="show_pagination" 
+			type="list"
+			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
+			default="2"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+			<option value="2">JGLOBAL_AUTO</option>
+		</field>
+
+		<field
+			name="show_pagination_results"
+			type="radio"
+			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			showon="show_pagination:1,2"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+		
+	</fieldset>
+	
+	<fieldset
+		name="data_entry"
+		label="COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_LABEL"
+		description="COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_DESC">
+		
+		<field 
+			name="tag_field_ajax_mode" 
+			type="radio" 
+			label="COM_TAGS_TAG_FIELD_MODE_LABEL"
+			description="COM_TAGS_TAG_FIELD_MODE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">COM_TAGS_TAG_FIELD_MODE_AJAX</option>
+			<option value="0">COM_TAGS_TAG_FIELD_MODE_NESTED</option>
+		</field>
+
+	</fieldset>
+	
+	<fieldset 
+		name="integration"
+		label="JGLOBAL_INTEGRATION_LABEL"
+		description="COM_TAGS_CONFIG_INTEGRATION_SETTINGS_DESC"
+	>
+
+		<field
+			name="show_feed_link"
+			type="radio"
+			label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			description="JGLOBAL_SHOW_FEED_LINK_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_tags"
+			section="component"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_tags/controller.php b/core/administrator/components/com_tags/controller.php
new file mode 100644
index 00000000..cdd19de6
--- /dev/null
+++ b/core/administrator/components/com_tags/controller.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tags view class for the Tags package.
+ *
+ * @since  3.1
+ */
+class TagsController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   3.1
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$view   = $this->input->get('view', 'tags');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		// Check for edit form.
+		if ($view == 'tag' && $layout == 'edit' && !$this->checkEditId('com_tags.edit.tag', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_tags&view=tags', false));
+
+			return false;
+		}
+
+		parent::display();
+
+		return $this;
+	}
+}
diff --git a/core/administrator/components/com_tags/controllers/tag.php b/core/administrator/components/com_tags/controllers/tag.php
new file mode 100644
index 00000000..7623d25b
--- /dev/null
+++ b/core/administrator/components/com_tags/controllers/tag.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Tag Controller
+ *
+ * @since  3.1
+ */
+class TagsControllerTag extends JControllerForm
+{
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.create', 'com_tags');
+	}
+
+	/**
+	 * Method to check if you can edit a record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Since there is no asset tracking and no categories, revert to the component permissions.
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean	 True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   3.1
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('Tag');
+
+		// Preset the redirect
+		$this->setRedirect('index.php?option=com_tags&view=tags');
+
+		return parent::batch($model);
+	}
+}
diff --git a/core/administrator/components/com_tags/controllers/tags.php b/core/administrator/components/com_tags/controllers/tags.php
new file mode 100644
index 00000000..21df3c04
--- /dev/null
+++ b/core/administrator/components/com_tags/controllers/tags.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Tags List Controller
+ *
+ * @since  3.1
+ */
+class TagsControllerTags extends JControllerAdmin
+{
+	/**
+	 * Proxy for getModel
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  An optional associative array of configuration settings.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   3.1
+	 */
+	public function getModel($name = 'Tag', $prefix = 'TagsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Rebuild the nested set tree.
+	 *
+	 * @return  boolean  False on failure or error, true on success.
+	 *
+	 * @since   3.1
+	 */
+	public function rebuild()
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$this->setRedirect(JRoute::_('index.php?option=com_tags&view=tags', false));
+
+		$model = $this->getModel();
+
+		if ($model->rebuild())
+		{
+			// Rebuild succeeded.
+			$this->setMessage(JText::_('COM_TAGS_REBUILD_SUCCESS'));
+
+			return true;
+		}
+		else
+		{
+			// Rebuild failed.
+			$this->setMessage(JText::_('COM_TAGS_REBUILD_FAILURE'));
+
+			return false;
+		}
+	}
+}
diff --git a/core/administrator/components/com_tags/helpers/tags.php b/core/administrator/components/com_tags/helpers/tags.php
new file mode 100644
index 00000000..3ad8d607
--- /dev/null
+++ b/core/administrator/components/com_tags/helpers/tags.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tags helper.
+ *
+ * @since       3.1
+ * @deprecated  4.0
+ */
+class TagsHelper extends JHelperContent
+{
+	/**
+	 * Configure the Submenu links.
+	 *
+	 * @param   string  $extension  The extension.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.1
+	 * @deprecated  4.0
+	 */
+	public static function addSubmenu($extension)
+	{
+		$parts     = explode('.', $extension);
+		$component = $parts[0];
+
+		// Avoid nonsense situation.
+		if ($component == 'tags')
+		{
+			return;
+		}
+
+		// Try to find the component helper.
+		$file = JPath::clean(JPATH_ADMINISTRATOR . '/components/com_tags/helpers/tags.php');
+
+		if (file_exists($file))
+		{
+			$cName = 'TagsHelper';
+
+			JLoader::register($cName, $file);
+
+			if (class_exists($cName))
+			{
+				if (is_callable(array($cName, 'addSubmenu')))
+				{
+					$lang = JFactory::getLanguage();
+
+					// Loading language file from administrator/language directory then administrator/components/<extension>/language
+					$lang->load($component, JPATH_BASE, null, false, true)
+					||	$lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
+				}
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_tags/models/forms/filter_tags.xml b/core/administrator/components/com_tags/models/forms/filter_tags.xml
new file mode 100644
index 00000000..63d08d83
--- /dev/null
+++ b/core/administrator/components/com_tags/models/forms/filter_tags.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_TAGS_FILTER_SEARCH_LABEL"
+			description="COM_TAGS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="published"
+			type="status"
+			label="COM_TAGS_FILTER_PUBLISHED"
+			description="COM_TAGS_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+        <field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+        </field>
+		<field
+			name="extension"
+			type="aliastag"
+			label="COM_TAGS_FILTER_ALIASTYPE_LABEL"
+			description="COM_TAGS_FIELD_ALIASTYPE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_TAGS_SELECT_TAGTYPE</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+            name="fullordering"
+			type="list"
+			label="COM_TAGS_LIST_FULL_ORDERING"
+			description="COM_TAGS_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.lft ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.lft DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="a.language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_TAGS_LIST_LIMIT"
+			description="COM_TAGS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_tags/models/forms/tag.xml b/core/administrator/components/com_tags/models/forms/tag.xml
new file mode 100644
index 00000000..1ad11685
--- /dev/null
+++ b/core/administrator/components/com_tags/models/forms/tag.xml
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="id"
+		type="number"
+		label="JGLOBAL_FIELD_ID_LABEL"
+		description="JGLOBAL_FIELD_ID_DESC"
+		default="0"
+		class="readonly"
+		readonly="true"
+	/>
+
+	<field
+		name="hits"
+		type="number"
+		label="JGLOBAL_HITS"
+		description="COM_TAGS_FIELD_HITS_DESC"
+		class="readonly"
+		default="0"
+		readonly="true"
+	/>
+
+	<field
+		name="parent_id"
+		type="tag"
+		label="COM_TAGS_FIELD_PARENT_LABEL"
+		description="COM_TAGS_FIELD_PARENT_DESC"
+		mode="nested"
+		validate="notequals"
+		field="id"
+		parent="parent"
+		>
+		<option value="1">JNONE</option>
+	</field>
+
+	<field
+		name="lft"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="rgt"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="level"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="path"
+		type="text"
+		label="CATEGORIES_PATH_LABEL"
+		description="CATEGORIES_PATH_DESC"
+		class="readonly"
+		size="40"
+		readonly="true"
+	/>
+
+	<field
+		name="title"
+		type="text"
+		label="JGLOBAL_TITLE"
+		description="JFIELD_TITLE_DESC"
+		class="input-xxlarge input-large-text"
+		size="40"
+		required="true"
+	/>
+
+	<field
+		name="note"
+		type="text"
+		label="COM_TAGS_FIELD_NOTE_LABEL"
+		description="COM_TAGS_FIELD_NOTE_DESC"
+		maxlength="255"
+		class="span12"
+		size="40"
+	/>
+
+	<field
+		name="description"
+		type="editor"
+		label="JGLOBAL_DESCRIPTION"
+		description="COM_TAGS_DESCRIPTION_DESC"
+		filter="JComponentHelper::filterText"
+		buttons="true"
+		hide="readmore,pagebreak"
+	/>
+
+	<field
+		name="published"
+		type="list"
+		label="JSTATUS"
+		description="JFIELD_PUBLISHED_DESC"
+		class="chzn-color-state"
+		default="1"
+		size="1"
+		>
+		<option value="1">JPUBLISHED</option>
+		<option value="0">JUNPUBLISHED</option>
+		<option value="2">JARCHIVED</option>
+		<option value="-2">JTRASHED</option>
+	</field>
+
+	<field
+		name="checked_out"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="checked_out_time"
+		type="hidden"
+		filter="unset"
+	/>
+
+	<field
+		name="access"
+		type="accesslevel"
+		label="JFIELD_ACCESS_LABEL"
+		description="JFIELD_ACCESS_DESC"
+	/>
+
+	<field
+		name="metadesc"
+		type="textarea"
+		label="JFIELD_META_DESCRIPTION_LABEL"
+		description="JFIELD_META_DESCRIPTION_DESC"
+		rows="3"
+		cols="40"
+	/>
+
+	<field
+		name="metakey"
+		type="textarea"
+		label="JFIELD_META_KEYWORDS_LABEL"
+		description="JFIELD_META_KEYWORDS_DESC"
+		rows="3"
+		cols="40"
+	/>
+
+	<field
+		name="alias"
+		type="text"
+		label="JFIELD_ALIAS_LABEL"
+		description="JFIELD_ALIAS_DESC"
+		hint="JFIELD_ALIAS_PLACEHOLDER"
+		size="40"
+	/>
+
+	<field
+		name="created_user_id"
+		type="user"
+		label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+		description="JGLOBAL_FIELD_CREATED_BY_DESC"
+	/>
+
+	<field
+		name="created_by_alias"
+		type="text"
+		label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+		description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+		labelclass="control-label"
+		size="20"
+	/>
+
+	<field
+		name="created_time"
+		type="calendar"
+		label="JGLOBAL_CREATED_DATE"
+		description="COM_TAGS_FIELD_CREATED_DATE_DESC"
+		class="readonly"
+		translateformat="true"
+		showtime="true"
+		filter="user_utc"
+		readonly="true"
+	/>
+
+	<field
+		name="modified_user_id"
+		type="user"
+		label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+		class="readonly"
+		readonly="true"
+		filter="unset"
+	/>
+
+	<field
+		name="modified_time"
+		type="calendar"
+		label="JGLOBAL_FIELD_MODIFIED_LABEL"
+		description="COM_TAGS_FIELD_MODIFIED_DESC"
+		class="readonly"
+		translateformat="true"
+		showtime="true"
+		filter="user_utc"
+		readonly="true"
+	/>
+
+	<field
+		name="language"
+		type="contentlanguage"
+		label="JFIELD_LANGUAGE_LABEL"
+		description="COM_TAGS_FIELD_LANGUAGE_DESC"
+		>
+		<option value="*">JALL</option>
+	</field>
+
+	<field 
+		name="version_note"
+		type="text"
+		label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+		description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+		maxlength="255"
+		class="span12" size="45"
+		labelclass="control-label"
+	/>
+
+	<fields name="params" label="JGLOBAL_FIELDSET_DISPLAY_OPTIONS">
+		<fieldset
+			name="basic"
+			label="COM_TAGS_BASIC_FIELDSET_LABEL"
+		>
+
+			<field
+				name="tag_layout"
+				type="componentlayout"
+				label="JFIELD_ALT_LAYOUT_LABEL"
+				description="JFIELD_ALT_COMPONENT_LAYOUT_DESC"
+				labelclass="control-label"
+				useglobal="true"
+				extension="com_tags"
+				view="tag"
+			/>
+
+			<field
+				name="tag_link_class"
+				type="text"
+				label="COM_TAGS_FIELD_TAG_LINK_CLASS"
+				description="COM_TAGS_FIELD_TAG_LINK_CLASS_DESC"
+				labelclass="control-label"
+				size="20"
+				default="label label-info"
+			/>
+
+		</fieldset>
+	</fields>
+
+	<fields name="images">
+		<fieldset name="images" label="JGLOBAL_FIELDSET_IMAGE_OPTIONS">
+			<field
+				name="image_intro"
+				type="media"
+				label="COM_TAGS_FIELD_INTRO_LABEL"
+				description="COM_TAGS_FIELD_INTRO_DESC"
+				labelclass="control-label"
+			/>
+
+			<field
+				name="float_intro"
+				type="list"
+				label="COM_TAGS_FLOAT_LABEL"
+				description="COM_TAGS_FLOAT_DESC"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_SELECT_AN_OPTION</option>
+				<option value="right">COM_TAGS_RIGHT</option>
+				<option value="left">COM_TAGS_LEFT</option>
+				<option value="none">COM_TAGS_NONE</option>
+			</field>
+
+			<field
+				name="image_intro_alt"
+				type="text"
+				label="COM_TAGS_FIELD_IMAGE_ALT_LABEL"
+				description="COM_TAGS_FIELD_IMAGE_ALT_DESC"
+				labelclass="control-label"
+				size="20"
+			/>
+
+			<field
+				name="image_intro_caption"
+				type="text"
+				label="COM_TAGS_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_TAGS_FIELD_IMAGE_CAPTION_DESC"
+				size="20"
+				labelclass="control-label"
+			/>
+
+			<field
+				name="spacer1"
+				type="spacer"
+				hr="true"
+			/>
+
+			<field
+				name="image_fulltext"
+				type="media"
+				label="COM_TAGS_FIELD_FULL_LABEL"
+				description="COM_TAGS_FIELD_FULL_DESC"
+				labelclass="control-label"
+			/>
+
+			<field
+				name="float_fulltext"
+				type="list"
+				label="COM_TAGS_FLOAT_LABEL"
+				description="COM_TAGS_FLOAT_DESC"
+				labelclass="control-label"
+				>
+				<option value="">JGLOBAL_SELECT_AN_OPTION</option>
+				<option value="right">COM_TAGS_RIGHT</option>
+				<option value="left">COM_TAGS_LEFT</option>
+				<option value="none">COM_TAGS_NONE</option>
+			</field>
+
+			<field
+				name="image_fulltext_alt"
+				type="text"
+				label="COM_TAGS_FIELD_IMAGE_ALT_LABEL"
+				description="COM_TAGS_FIELD_IMAGE_ALT_DESC"
+				labelclass="control-label"
+				size="20"
+			/>
+
+			<field
+				name="image_fulltext_caption"
+				type="text"
+				label="COM_TAGS_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_TAGS_FIELD_IMAGE_CAPTION_DESC"
+				labelclass="control-label"
+				size="20"
+			/>
+		</fieldset>
+	</fields>
+
+	<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+		<fieldset name="jmetadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+			<field
+				name="author"
+				type="text"
+				label="JAUTHOR"
+				description="JFIELD_METADATA_AUTHOR_DESC"
+				size="30"
+			/>
+
+			<field
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_tags/models/tag.php b/core/administrator/components/com_tags/models/tag.php
new file mode 100644
index 00000000..e4d43b2f
--- /dev/null
+++ b/core/administrator/components/com_tags/models/tag.php
@@ -0,0 +1,444 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * Tags Component Tag Model
+ *
+ * @since  3.1
+ */
+class TagsModelTag extends JModelAdmin
+{
+	/**
+	 * @var    string  The prefix to use with controller messages.
+	 * @since  3.1
+	 */
+	protected $text_prefix = 'COM_TAGS';
+
+	/**
+	 * @var    string  The type alias for this content type.
+	 * @since  3.2
+	 */
+	public $typeAlias = 'com_tags.tag';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id' => 'batchLanguage',
+	);
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.1
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->published != -2)
+			{
+				return false;
+			}
+
+			return parent::canDelete($record);
+		}
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.1
+	 */
+	protected function canEditState($record)
+	{
+		return parent::canEditState($record);
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $type    The table name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.1
+	 */
+	public function getTable($type = 'Tag', $prefix = 'TagsTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Auto-populate the model state.
+	 *
+	 * @note Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		$parentId = $app->input->getInt('parent_id');
+		$this->setState('tag.parent_id', $parentId);
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+		$this->setState($this->getName() . '.id', $pk);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_tags');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get a tag.
+	 *
+	 * @param   integer  $pk  An optional id of the object to get, otherwise the id from the model state is used.
+	 *
+	 * @return  mixed  Tag data object on success, false on failure.
+	 *
+	 * @since   3.1
+	 */
+	public function getItem($pk = null)
+	{
+		if ($result = parent::getItem($pk))
+		{
+			// Prime required properties.
+			if (empty($result->id))
+			{
+				$result->parent_id = $this->getState('tag.parent_id');
+			}
+
+			// Convert the metadata field to an array.
+			$registry = new Registry($result->metadata);
+			$result->metadata = $registry->toArray();
+
+			// Convert the images field to an array.
+			$registry = new Registry($result->images);
+			$result->images = $registry->toArray();
+
+			// Convert the urls field to an array.
+			$registry = new Registry($result->urls);
+			$result->urls = $registry->toArray();
+
+			// Convert the created and modified dates to local user time for display in the form.
+			$tz = new DateTimeZone(JFactory::getApplication()->get('offset'));
+
+			if ((int) $result->created_time)
+			{
+				$date = new JDate($result->created_time);
+				$date->setTimezone($tz);
+				$result->created_time = $date->toSql(true);
+			}
+			else
+			{
+				$result->created_time = null;
+			}
+
+			if ((int) $result->modified_time)
+			{
+				$date = new JDate($result->modified_time);
+				$date->setTimezone($tz);
+				$result->modified_time = $date->toSql(true);
+			}
+			else
+			{
+				$result->modified_time = null;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$jinput = JFactory::getApplication()->input;
+
+		// Get the form.
+		$form = $this->loadForm('com_tags.tag', 'tag', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('core.edit.state', 'com_tags' . $jinput->get('id')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('ordering', 'disabled', 'true');
+			$form->setFieldAttribute('published', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('ordering', 'filter', 'unset');
+			$form->setFieldAttribute('published', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   3.1
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_tags.edit.tag.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_tags.tag', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function save($data)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$table      = $this->getTable();
+		$input      = JFactory::getApplication()->input;
+		$pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState($this->getName() . '.id');
+		$isNew      = true;
+		$context    = $this->option . '.' . $this->name;
+
+		// Include the plugins for the save events.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Load the row if saving an existing tag.
+		if ($pk > 0)
+		{
+			$table->load($pk);
+			$isNew = false;
+		}
+
+		// Set the new parent id if parent id not matched OR while New/Save as Copy .
+		if ($table->parent_id != $data['parent_id'] || $data['id'] == 0)
+		{
+			$table->setLocation($data['parent_id'], 'last-child');
+		}
+
+		if (isset($data['images']) && is_array($data['images']))
+		{
+			$registry = new Registry($data['images']);
+			$data['images'] = (string) $registry;
+		}
+
+		if (isset($data['urls']) && is_array($data['urls']))
+		{
+			$registry = new Registry($data['urls']);
+			$data['urls'] = (string) $registry;
+		}
+
+		// Alter the title for save as copy
+		if ($input->get('task') == 'save2copy')
+		{
+			list($title, $alias) = $this->generateNewTitle($data['parent_id'], $data['alias'], $data['title']);
+			$data['title']       = $title;
+			$data['alias']       = $alias;
+		}
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Bind the rules.
+		if (isset($data['rules']))
+		{
+			$rules = new JAccessRules($data['rules']);
+			$table->setRules($rules);
+		}
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before save event.
+		$result = $dispatcher->trigger($this->event_before_save, array($context, &$table, $isNew));
+
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Store the data.
+		if (!$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the after save event.
+		$dispatcher->trigger($this->event_after_save, array($context, &$table, $isNew));
+
+		// Rebuild the path for the tag:
+		if (!$table->rebuildPath($table->id))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Rebuild the paths of the tag's children:
+		if (!$table->rebuild($table->id, $table->lft, $table->level, $table->path))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$this->setState($this->getName() . '.id', $table->id);
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method rebuild the entire nested set tree.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   3.1
+	 */
+	public function rebuild()
+	{
+		// Get an instance of the table object.
+		$table = $this->getTable();
+
+		if (!$table->rebuild())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to save the reordered nested set tree.
+	 * First we save the new order values in the lft values of the changed ids.
+	 * Then we invoke the table rebuild to implement the new ordering.
+	 *
+	 * @param   array    $idArray    An array of primary key ids.
+	 * @param   integer  $lft_array  The lft value
+	 *
+	 * @return  boolean  False on failure or error, True otherwise
+	 *
+	 * @since   3.1
+	 */
+	public function saveorder($idArray = null, $lft_array = null)
+	{
+		// Get an instance of the table object.
+		$table = $this->getTable();
+
+		if (!$table->saveorder($idArray, $lft_array))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $parent_id  The id of the parent.
+	 * @param   string   $alias      The alias.
+	 * @param   string   $title      The title.
+	 *
+	 * @return  array  Contains the modified title and alias.
+	 *
+	 * @since   3.1
+	 */
+	protected function generateNewTitle($parent_id, $alias, $title)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'parent_id' => $parent_id)))
+		{
+			$title = ($table->title != $title) ? $title : StringHelper::increment($title);
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($title, $alias);
+	}
+}
diff --git a/core/administrator/components/com_tags/models/tags.php b/core/administrator/components/com_tags/models/tags.php
new file mode 100644
index 00000000..38472621
--- /dev/null
+++ b/core/administrator/components/com_tags/models/tags.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tags Component Tags Model
+ *
+ * @since  3.1
+ */
+class TagsModelTags extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see    JController
+	 * @since  3.0.3
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'published', 'a.published',
+				'access', 'a.access', 'access_level',
+				'language', 'a.language',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'created_time', 'a.created_time',
+				'created_user_id', 'a.created_user_id',
+				'lft', 'a.lft',
+				'rgt', 'a.rgt',
+				'level', 'a.level',
+				'path', 'a.path',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return    void
+	 *
+	 * @since    3.1
+	 */
+	protected function populateState($ordering = 'a.lft', $direction = 'asc')
+	{
+		$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+		$this->setState('filter.search', $search);
+
+		$level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '');
+		$this->setState('filter.level', $level);
+
+		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '');
+		$this->setState('filter.access', $access);
+
+		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+		$this->setState('filter.published', $published);
+
+		$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+		$this->setState('filter.language', $language);
+
+		$extension = $this->getUserStateFromRequest($this->context . '.filter.extension', 'extension', 'com_content', 'cmd');
+
+		$this->setState('filter.extension', $extension);
+		$parts = explode('.', $extension);
+
+		// Extract the component name
+		$this->setState('filter.component', $parts[0]);
+
+		// Extract the optional section name
+		$this->setState('filter.section', (count($parts) > 1) ? $parts[1] : null);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_tags');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   3.1
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.extension');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.level');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.language');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to create a query for a list of items.
+	 *
+	 * @return  string
+	 *
+	 * @since  3.1
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$user = JFactory::getUser();
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.alias, a.note, a.published, a.access' .
+					', a.checked_out, a.checked_out_time, a.created_user_id' .
+					', a.path, a.parent_id, a.level, a.lft, a.rgt' .
+					', a.language'
+			)
+		);
+		$query->from('#__tags AS a')
+			->where('a.alias <> ' . $db->quote('root'));
+
+		// Join over the language
+		$query->select('l.title AS language_title, l.image AS language_image')
+			->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');
+
+		// Join over the users for the author.
+		$query->select('ua.name AS author_name')
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_user_id')
+
+			->select('ug.title AS access_title')
+			->join('LEFT', '#__viewlevels AS ug on ug.id = a.access');
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where('a.level <= ' . (int) $level);
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where('a.access = ' . (int) $access);
+		}
+
+		// Implement View Level Access
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.published IN (0, 1))');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ' OR a.note LIKE ' . $search . ')');
+			}
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('filter.language'))
+		{
+			$query->where('a.language = ' . $db->quote($language));
+		}
+
+		// Add the list ordering clause
+		$listOrdering = $this->getState('list.ordering', 'a.lft');
+		$listDirn = $db->escape($this->getState('list.direction', 'ASC'));
+
+		if ($listOrdering == 'a.access')
+		{
+			$query->order('a.access ' . $listDirn . ', a.lft ' . $listDirn);
+		}
+		else
+		{
+			$query->order($db->escape($listOrdering) . ' ' . $listDirn);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method override to check-in a record or an array of record
+	 *
+	 * @param   mixed  $pks  The ID of the primary key or an array of IDs
+	 *
+	 * @return  mixed  Boolean false if there is an error, otherwise the count of records checked in.
+	 *
+	 * @since   12.2
+	 */
+	public function checkin($pks = array())
+	{
+		$pks = (array) $pks;
+		$table = $this->getTable();
+		$count = 0;
+
+		if (empty($pks))
+		{
+			$pks = array((int) $this->getState($this->getName() . '.id'));
+		}
+
+		// Check in all items.
+		foreach ($pks as $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($table->checked_out > 0)
+				{
+					// Only attempt to check the row in if it exists.
+					if ($pk)
+					{
+						$user = JFactory::getUser();
+
+						// Get an instance of the row to checkin.
+						$table = $this->getTable();
+
+						if (!$table->load($pk))
+						{
+							$this->setError($table->getError());
+
+							return false;
+						}
+
+						// Check if this is the user having previously checked out the row.
+						if ($table->checked_out > 0 && $table->checked_out != $user->get('id') && !$user->authorise('core.admin', 'com_checkin'))
+						{
+							$this->setError(JText::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'));
+
+							return false;
+						}
+
+						// Attempt to check the row in.
+						if (!$table->checkin($pk))
+						{
+							$this->setError($table->getError());
+
+							return false;
+						}
+					}
+
+					$count++;
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $type    The table name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A JTable object
+	 *
+	 * @since   3.1
+	 */
+	public function getTable($type = 'Tag', $prefix = 'TagsTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   12.2
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+
+		if ($items != false)
+		{
+			$extension = $this->getState('filter.extension');
+
+			$this->countItems($items, $extension);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to load the countItems method from the extensions
+	 *
+	 * @param   stdClass[]  &$items     The category items
+	 * @param   string      $extension  The category extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function countItems(&$items, $extension)
+	{
+		$parts = explode('.', $extension);
+		$component = $parts[0];
+		$section = null;
+
+		if (count($parts) < 2)
+		{
+			return;
+		}
+
+		// Try to find the component helper.
+		$eName = str_replace('com_', '', $component);
+		$file = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php');
+
+		if (file_exists($file))
+		{
+			$prefix = ucfirst(str_replace('com_', '', $component));
+			$cName = $prefix . 'Helper';
+
+			JLoader::register($cName, $file);
+
+			if (class_exists($cName) && is_callable(array($cName, 'countTagItems')))
+			{
+				$cName::countTagItems($items, $extension);
+			}
+		}
+	}
+}
diff --git a/core/administrator/components/com_tags/tables/tag.php b/core/administrator/components/com_tags/tables/tag.php
new file mode 100644
index 00000000..c1ae9af0
--- /dev/null
+++ b/core/administrator/components/com_tags/tables/tag.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * Tags table
+ *
+ * @since  3.1
+ */
+class TagsTableTag extends JTableNested
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  A database connector object
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__tags', 'id', $db);
+
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_tags.tag'));
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties
+	 * to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error string
+	 *
+	 * @see     JTable::bind
+	 * @since   3.1
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		if (isset($array['metadata']) && is_array($array['metadata']))
+		{
+			$registry = new Registry($array['metadata']);
+			$array['metadata'] = (string) $registry;
+		}
+
+		if (isset($array['urls']) && is_array($array['urls']))
+		{
+			$registry = new Registry($array['urls']);
+			$array['urls'] = (string) $registry;
+		}
+
+		if (isset($array['images']) && is_array($array['images']))
+		{
+			$registry = new Registry($array['images']);
+			$array['images'] = (string) $registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check method to ensure data integrity.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  UnexpectedValueException
+	 */
+	public function check()
+	{
+		// Check for valid name.
+		if (trim($this->title) == '')
+		{
+			throw new UnexpectedValueException(sprintf('The title is empty'));
+		}
+
+		if (empty($this->alias))
+		{
+			$this->alias = $this->title;
+		}
+
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up)
+		{
+			throw new UnexpectedValueException(sprintf('End publish date is before start publish date.'));
+		}
+
+		// Clean up keywords -- eliminate extra spaces between phrases
+		// and cr (\r) and lf (\n) characters from string
+		if (!empty($this->metakey))
+		{
+			// Only process if not empty
+			// Define array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->metakey);
+
+			// Create array using commas as delimiter
+			$keys = explode(',', $after_clean);
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				if (trim($key))
+				{
+					// Ignore blank keywords
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(', ', $clean_keys);
+		}
+
+		// Clean up description -- eliminate quotes and <> brackets
+		if (!empty($this->metadesc))
+		{
+			// Only process if not empty
+			$bad_characters = array("\"", '<', '>');
+			$this->metadesc = StringHelper::str_ireplace($bad_characters, '', $this->metadesc);
+		}
+
+		// Not Null sanity check
+		$date = JFactory::getDate();
+
+		if (empty($this->params))
+		{
+			$this->params = '{}';
+		}
+
+		if (empty($this->metadesc))
+		{
+			$this->metadesc = '';
+		}
+
+		if (empty($this->metakey))
+		{
+			$this->metakey = '';
+		}
+
+		if (empty($this->metadata))
+		{
+			$this->metadata = '{}';
+		}
+
+		if (empty($this->urls))
+		{
+			$this->urls = '{}';
+		}
+
+		if (empty($this->images))
+		{
+			$this->images = '{}';
+		}
+
+		if (!(int) $this->checked_out_time)
+		{
+			$this->checked_out_time = $date->toSql();
+		}
+
+		if (!(int) $this->modified_time)
+		{
+			$this->modified_time = $date->toSql();
+		}
+
+		if (!(int) $this->modified_time)
+		{
+			$this->modified_time = $date->toSql();
+		}
+
+		if (!(int) $this->publish_up)
+		{
+			$this->publish_up = $date->toSql();
+		}
+
+		if (!(int) $this->publish_down)
+		{
+			$this->publish_down = $date->toSql();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overriden JTable::store to set modified data and user id.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate();
+		$user = JFactory::getUser();
+
+		$this->modified_time = $date->toSql();
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified_user_id = $user->get('id');
+		}
+		else
+		{
+			// New tag. A tag created and created_by field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created_time)
+			{
+				$this->created_time = $date->toSql();
+			}
+
+			if (empty($this->created_user_id))
+			{
+				$this->created_user_id = $user->get('id');
+			}
+		}
+
+		// Verify that the alias is unique
+		$table = JTable::getInstance('Tag', 'TagsTable', array('dbo' => $this->_db));
+
+		if ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(JText::_('COM_TAGS_ERROR_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Method to delete a node and, optionally, its child nodes from the table.
+	 *
+	 * @param   integer  $pk        The primary key of the node to delete.
+	 * @param   boolean  $children  True to delete child nodes, false to move them up a level.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function delete($pk = null, $children = false)
+	{
+		$return = parent::delete($pk, $children);
+
+		if ($return)
+		{
+			$helper = new JHelperTags;
+			$helper->tagDeleteInstances($pk);
+		}
+
+		return $return;
+	}
+}
diff --git a/core/administrator/components/com_tags/tags.php b/core/administrator/components/com_tags/tags.php
new file mode 100644
index 00000000..76d7890b
--- /dev/null
+++ b/core/administrator/components/com_tags/tags.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_tags'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+$controller = JControllerLegacy::getInstance('Tags');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_tags/tags.xml b/core/administrator/components/com_tags/tags.xml
new file mode 100644
index 00000000..2ceb149a
--- /dev/null
+++ b/core/administrator/components/com_tags/tags.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_tags</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2013</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.1.0</version>
+	<description>COM_TAGS_XML_DESCRIPTION</description>
+
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>metadata.xml</filename>
+		<filename>newsfeeds.php</filename>
+		<filename>router.php</filename>
+		<folder>helpers</folder>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_tags.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>tags.php</filename>
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_tags.ini</language>
+			<language tag="en-GB">language/en-GB.com_tags.sys.ini</language>
+		</languages>
+		<menu link="option=com_tags" img="class:tags">com_tags</menu>
+
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_tags/views/tag/tmpl/edit.php b/core/administrator/components/com_tags/views/tag/tmpl/edit.php
new file mode 100644
index 00000000..d7b7d835
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tag/tmpl/edit.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'tag.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) {
+			" . $this->form->getField('description')->save() . "
+			Joomla.submitform(task, document.getElementById('item-form'));
+		}
+	};
+");
+
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('jmetadata');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_tags&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_TAGS_FIELDSET_DETAILS')); ?>
+		<div class="row-fluid">
+			<div class="span9">
+				<div class="form-vertical">
+					<?php echo $this->form->renderField('description'); ?>
+				</div>
+			</div>
+			<div class="span3">
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			</div>
+			<div class="span6">
+				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</div>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php b/core/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
new file mode 100644
index 00000000..45e13c46
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="control-group">
+	<?php echo $this->form->getLabel('metadesc'); ?>
+	<div class="controls">
+		<?php echo $this->form->getInput('metadesc'); ?>
+	</div>
+</div>
+<div class="control-group">
+	<?php echo $this->form->getLabel('metakey'); ?>
+	<div class="controls">
+		<?php echo $this->form->getInput('metakey'); ?>
+	</div>
+</div>
+<?php foreach ($this->form->getGroup('metadata') as $field) : ?>
+<div class="control-group">
+	<?php if (!$field->hidden) : ?>
+		<?php echo $field->label; ?>
+	<?php endif; ?>
+	<div class="controls">
+		<?php echo $field->input; ?>
+	</div>
+</div>
+<?php endforeach; ?>
diff --git a/core/administrator/components/com_tags/views/tag/tmpl/edit_options.php b/core/administrator/components/com_tags/views/tag/tmpl/edit_options.php
new file mode 100644
index 00000000..1cefcdcc
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tag/tmpl/edit_options.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php
+	echo JHtml::_('bootstrap.startAccordion', 'categoryOptions', array('active' => 'collapse0'));
+	$fieldSets = $this->form->getFieldsets('params');
+	$i = 0;
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_TAGS_' . $name . '_FIELDSET_LABEL';
+		echo JHtml::_('bootstrap.addSlide', 'categoryOptions', JText::_($label), 'collapse' . ($i++));
+			if (isset($fieldSet->description) && trim($fieldSet->description)) :
+				echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+			endif;
+			?>
+				<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php echo $field->input; ?>
+						</div>
+					</div>
+				<?php endforeach; ?>
+
+				<?php if ($name == 'basic') : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('note'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('note'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('tag_layout'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('tag_layout'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('tag_link_class'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('tag_link_class'); ?>
+						</div>
+					</div>
+				<?php endif;
+		echo JHtml::_('bootstrap.endSlide');
+	endforeach;
+echo JHtml::_('bootstrap.endAccordion');
diff --git a/core/administrator/components/com_tags/views/tag/view.html.php b/core/administrator/components/com_tags/views/tag/view.html.php
new file mode 100644
index 00000000..48ae84ec
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tag/view.html.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Tags component
+ *
+ * @since  3.1
+ */
+class TagsViewTag extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $state;
+
+	protected $assoc;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+		$this->canDo = JHelperContent::getActions('com_tags');
+		$this->assoc = $this->get('Assoc');
+
+		$input = JFactory::getApplication()->input;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$input->set('hidemainmenu', true);
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since  3.1
+	 *
+	 * @return void
+	 */
+	protected function addToolbar()
+	{
+		$user       = JFactory::getUser();
+		$userId     = $user->get('id');
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
+		// Need to load the menu language file as mod_menu hasn't been loaded yet.
+		$lang = JFactory::getLanguage();
+		$lang->load('com_tags', JPATH_BASE, null, false, true)
+		|| $lang->load('com_tags', JPATH_ADMINISTRATOR . '/components/com_tags', null, false, true);
+
+		// Get the results for each action.
+		$canDo = $this->canDo;
+		$title = JText::_('COM_TAGS_BASE_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE');
+
+		/**
+		 * Prepare the toolbar.
+		 * If it is new we get: `tag tag-add add`
+		 * else we get `tag tag-edit edit`
+		 */
+		JToolbarHelper::title($title, 'tag tag-' . ($isNew ? 'add add' : 'edit edit'));
+
+		// For new records, check the create permission.
+		if ($isNew)
+		{
+			JToolbarHelper::apply('tag.apply');
+			JToolbarHelper::save('tag.save');
+			JToolbarHelper::save2new('tag.save2new');
+			JToolbarHelper::cancel('tag.cancel');
+		}
+
+		// If not checked out, can save the item.
+		else
+		{
+			// Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
+			$itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_user_id == $userId);
+
+			// Can't save the record if it's checked out and editable
+			if (!$checkedOut && $itemEditable)
+			{
+				JToolbarHelper::apply('tag.apply');
+				JToolbarHelper::save('tag.save');
+
+				if ($canDo->get('core.create'))
+				{
+					JToolbarHelper::save2new('tag.save2new');
+				}
+			}
+
+			// If an existing item, can save to a copy.
+			if ($canDo->get('core.create'))
+			{
+				JToolbarHelper::save2copy('tag.save2copy');
+			}
+
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable)
+			{
+				JToolbarHelper::versions('com_tags.tag', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('tag.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_COMPONENTS_TAGS_MANAGER_EDIT');
+		JToolbarHelper::divider();
+	}
+}
diff --git a/core/administrator/components/com_tags/views/tags/tmpl/default.php b/core/administrator/components/com_tags/views/tags/tmpl/default.php
new file mode 100644
index 00000000..36e04661
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tags/tmpl/default.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\Inflector;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc');
+$extension = $this->escape($this->state->get('filter.extension'));
+$parts     = explode('.', $extension);
+$component = $parts[0];
+$section   = null;
+$mode      = false;
+$columns   = 7;
+
+if (count($parts) > 1)
+{
+	$section = $parts[1];
+	$inflector = Inflector::getInstance();
+
+	if (!$inflector->isPlural($section))
+	{
+		$section = $inflector->toPlural($section);
+	}
+}
+
+if ($section === 'categories')
+{
+	$mode = true;
+	$section = $component;
+	$component = 'com_categories';
+}
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_tags&task=tags.saveOrderAjax';
+	JHtml::_('sortablelist.sortable', 'categoryList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_tags&view=tags'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php
+		// Search tools bar
+		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+		?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="categoryList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap hidden-phone center">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.lft', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_TAGS_COUNT_PUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_TAGS_COUNT_PUBLISHED_ITEMS'); ?></span></span>
+							</th>
+							<?php $columns++; ?>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_TAGS_COUNT_UNPUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_TAGS_COUNT_UNPUBLISHED_ITEMS'); ?></span></span>
+							</th>
+							<?php $columns++; ?>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_TAGS_COUNT_ARCHIVED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_TAGS_COUNT_ARCHIVED_ITEMS'); ?></span></span>
+							</th>
+							<?php $columns++; ?>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_TAGS_COUNT_TRASHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_TAGS_COUNT_TRASHED_ITEMS'); ?></span></span>
+							</th>
+							<?php $columns++; ?>
+						<?php endif; ?>
+
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort',  'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="<?php echo $columns; ?>">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php
+				foreach ($this->items as $i => $item) :
+					$orderkey   = array_search($item->id, $this->ordering[$item->parent_id]);
+					$canCreate  = $user->authorise('core.create',     'com_tags');
+					$canEdit    = $user->authorise('core.edit',       'com_tags');
+					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id')|| $item->checked_out == 0;
+					$canChange  = $user->authorise('core.edit.state', 'com_tags') && $canCheckin;
+
+					// Get the parents of item for sorting
+					if ($item->level > 1)
+					{
+						$parentsStr = '';
+						$_currentParentId = $item->parent_id;
+						$parentsStr = ' ' . $_currentParentId;
+						for ($j = 0; $j < $item->level; $j++)
+						{
+							foreach ($this->ordering as $k => $v)
+							{
+								$v = implode('-', $v);
+								$v = '-' . $v . '-';
+								if (strpos($v, '-' . $_currentParentId . '-') !== false)
+								{
+									$parentsStr .= ' ' . $k;
+									$_currentParentId = $k;
+									break;
+								}
+							}
+						}
+					}
+					else
+					{
+						$parentsStr = '';
+					}
+					?>
+						<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->parent_id; ?>" item-id="<?php echo $item->id; ?>" parents="<?php echo $parentsStr; ?>" level="<?php echo $item->level; ?>">
+							<td class="order nowrap center hidden-phone">
+								<?php
+								$iconClass = '';
+								if (!$canChange)
+								{
+									$iconClass = ' inactive';
+								}
+								elseif (!$saveOrder)
+								{
+									$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+								}
+								?>
+								<span class="sortable-handler<?php echo $iconClass ?>">
+									<span class="icon-menu"></span>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>" />
+								<?php endif; ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->published, $i, 'tags.', $canChange); ?>
+									<?php // Create dropdown items and render the dropdown list.
+									if ($canChange)
+									{
+										JHtml::_('actionsdropdown.' . ((int) $item->published === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'tags');
+										JHtml::_('actionsdropdown.' . ((int) $item->published === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'tags');
+										echo JHtml::_('actionsdropdown.render', $this->escape($item->title));
+									}
+									?>
+								</div>
+							</td>
+							<td>
+								<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'tags.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_tags&task=tag.edit&id=' . $item->id); ?>">
+										<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<?php echo $this->escape($item->title); ?>
+								<?php endif; ?>
+								<span class="small" title="<?php echo $this->escape($item->path); ?>">
+									<?php if (empty($item->note)) : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+									<?php else : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+									<?php endif; ?>
+								</span>
+							</td>
+
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+							<td class="center btns hidden-phone">
+								<a class="badge <?php if ($item->count_published > 0) echo 'badge-success'; ?>" title="<?php echo JText::_('COM_TAGS_COUNT_PUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($mode ? '&extension=' . $section : '&view=' . $section) . '&filter[tag]=' . (int) $item->id . '&filter[published]=1'); ?>">
+									<?php echo $item->count_published; ?></a>
+							</td>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+							<td class="center btns hidden-phone">
+								<a class="badge <?php if ($item->count_unpublished > 0) echo 'badge-important'; ?>" title="<?php echo JText::_('COM_TAGS_COUNT_UNPUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($mode ? '&extension=' . $section : '&view=' . $section) . '&filter[tag]=' . (int) $item->id . '&filter[published]=0'); ?>">
+									<?php echo $item->count_unpublished; ?></a>
+							</td>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+							<td class="center btns hidden-phone">
+								<a class="badge <?php if ($item->count_archived > 0) echo 'badge-info'; ?>" title="<?php echo JText::_('COM_TAGS_COUNT_ARCHIVED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($mode ? '&extension=' . $section : '&view=' . $section) . '&filter[tag]=' . (int) $item->id . '&filter[published]=2'); ?>">
+									<?php echo $item->count_archived; ?></a>
+							</td>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+							<td class="center btns hidden-phone">
+								<a class="badge <?php if ($item->count_trashed > 0) echo 'badge-inverse'; ?>" title="<?php echo JText::_('COM_TAGS_COUNT_TRASHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . ($mode ? '&extension=' . $section : '&view=' . $section) . '&filter[tag]=' . (int) $item->id . '&filter[published]=-2'); ?>">
+									<?php echo $item->count_trashed; ?></a>
+							</td>
+						<?php endif; ?>
+
+
+
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_title); ?>
+						</td>
+						<td class="small nowrap hidden-phone">
+							<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+						</td>
+						<td class="hidden-phone">
+							<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+								<?php echo (int) $item->id; ?></span>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form if user is allowed ?>
+			<?php if ($user->authorise('core.create', 'com_tags')
+				&& $user->authorise('core.edit', 'com_tags')
+				&& $user->authorise('core.edit.state', 'com_tags')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_TAGS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_tags/views/tags/tmpl/default.xml b/core/administrator/components/com_tags/views/tags/tmpl/default.xml
new file mode 100644
index 00000000..7cbc9e36
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tags/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_TAGS_TAGS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_TAGS_TAGS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
\ No newline at end of file
diff --git a/core/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php b/core/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php
new file mode 100644
index 00000000..e01ab965
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+$published = $this->state->get('filter.published');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.language'); ?>
+			</div>
+		</div>
+		<div class="control-group span6">
+			<div class="controls">
+				<?php echo JHtml::_('batch.access'); ?>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/core/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php b/core/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..01420189
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-tag-id').value='';document.getElementById('batch-access').value='';document.getElementById('batch-language-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('tag.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_tags/views/tags/view.html.php b/core/administrator/components/com_tags/views/tags/view.html.php
new file mode 100644
index 00000000..b2d0b39e
--- /dev/null
+++ b/core/administrator/components/com_tags/views/tags/view.html.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tags view class for the Tags package.
+ *
+ * @since  3.1
+ */
+class TagsViewTags extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed   A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Preprocess the list of items to find ordering divisions.
+		foreach ($this->items as &$item)
+		{
+			$this->ordering[$item->parent_id][] = $item->id;
+		}
+
+		// Levels filter.
+		$options   = array();
+		$options[] = JHtml::_('select.option', '1', JText::_('J1'));
+		$options[] = JHtml::_('select.option', '2', JText::_('J2'));
+		$options[] = JHtml::_('select.option', '3', JText::_('J3'));
+		$options[] = JHtml::_('select.option', '4', JText::_('J4'));
+		$options[] = JHtml::_('select.option', '5', JText::_('J5'));
+		$options[] = JHtml::_('select.option', '6', JText::_('J6'));
+		$options[] = JHtml::_('select.option', '7', JText::_('J7'));
+		$options[] = JHtml::_('select.option', '8', JText::_('J8'));
+		$options[] = JHtml::_('select.option', '9', JText::_('J9'));
+		$options[] = JHtml::_('select.option', '10', JText::_('J10'));
+
+		$this->f_levels = $options;
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return void
+	 *
+	 * @since   3.1
+	 */
+	protected function addToolbar()
+	{
+		$state = $this->get('State');
+		$canDo = JHelperContent::getActions('com_tags');
+		$user  = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		JToolbarHelper::title(JText::_('COM_TAGS_MANAGER_TAGS'), 'tags');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('tag.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('tag.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::publish('tags.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('tags.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+			JToolbarHelper::archiveList('tags.archive');
+		}
+
+		if ($canDo->get('core.admin'))
+		{
+			JToolbarHelper::checkin('tags.checkin');
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_tags')
+			&& $user->authorise('core.edit', 'com_tags')
+			&& $user->authorise('core.edit.state', 'com_tags'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'tags.delete', 'JTOOLBAR_EMPTY_TRASH');
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('tags.trash');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_tags');
+		}
+
+		JToolbarHelper::help('JHELP_COMPONENTS_TAGS_MANAGER');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.lft'      => JText::_('JGRID_HEADING_ORDERING'),
+			'a.state'    => JText::_('JSTATUS'),
+			'a.title'    => JText::_('JGLOBAL_TITLE'),
+			'a.access'   => JText::_('JGRID_HEADING_ACCESS'),
+			'a.language' => JText::_('JGRID_HEADING_LANGUAGE'),
+			'a.id'       => JText::_('JGRID_HEADING_ID')
+		);
+	}
+}
diff --git a/core/administrator/components/com_templates/access.xml b/core/administrator/components/com_templates/access.xml
new file mode 100644
index 00000000..085a53d7
--- /dev/null
+++ b/core/administrator/components/com_templates/access.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_templates">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_templates/config.xml b/core/administrator/components/com_templates/config.xml
new file mode 100644
index 00000000..dbf6c016
--- /dev/null
+++ b/core/administrator/components/com_templates/config.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="templates"
+		label="COM_TEMPLATES_SUBMENU_TEMPLATES"
+		description="COM_TEMPLATES_CONFIG_FIELDSET_DESC">
+
+		<field
+			name="template_positions_display"
+			type="radio"
+			label="COM_TEMPLATES_CONFIG_POSITIONS_LABEL"
+			description="COM_TEMPLATES_CONFIG_POSITIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JENABLED</option>
+			<option value="0">JDISABLED</option>
+		</field>
+
+		<field
+			name="upload_limit" 
+			type="number"
+			label="COM_TEMPLATES_CONFIG_UPLOAD_LABEL"
+			description="COM_TEMPLATES_CONFIG_UPLOAD_DESC"
+			default="10"
+			extension="com_templates"
+		/>
+
+		<field
+			name="warning" 
+			type="note"
+			label="COM_TEMPLATES_CONFIG_SUPPORTED_LABEL"
+			description="COM_TEMPLATES_CONFIG_SUPPORTED_DESC"
+			default="zip"
+			extension="com_templates"
+		/>
+
+		<field
+			name="image_formats" 
+			type="text"
+			label="COM_TEMPLATES_CONFIG_IMAGE_LABEL"
+			description="COM_TEMPLATES_CONFIG_IMAGE_DESC"
+			default="gif,bmp,jpg,jpeg"
+			extension="com_templates"
+		/>
+
+		<field
+			name="source_formats" 
+			type="text"
+			label="COM_TEMPLATES_CONFIG_SOURCE_LABEL"
+			description="COM_TEMPLATES_CONFIG_SOURCE_DESC"
+			default="txt,less,ini,xml,js,php,css,sass,scss"
+			extension="com_templates"
+		/>
+
+		<field
+			name="font_formats" 
+			type="text"
+			label="COM_TEMPLATES_CONFIG_FONT_LABEL"
+			description="COM_TEMPLATES_CONFIG_FONT_DESC"
+			default="woff,ttf,otf"
+			extension="com_templates"
+		/>
+
+		<field
+			name="compressed_formats" 
+			type="hidden"
+			default="zip"
+			extension="com_templates"
+		/>
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_templates"
+			section="component"
+		/>
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_templates/controller.php b/core/administrator/components/com_templates/controller.php
new file mode 100644
index 00000000..a8cc5f7d
--- /dev/null
+++ b/core/administrator/components/com_templates/controller.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Templates manager master display controller.
+ *
+ * @since  1.6
+ */
+class TemplatesController extends JControllerLegacy
+{
+	/**
+	 * @var		string	The default view.
+	 * @since   1.6
+	 */
+	protected $default_view = 'styles';
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  TemplatesController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$view   = $this->input->get('view', 'styles');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		$document = JFactory::getDocument();
+
+		// For JSON requests
+		if ($document->getType() == 'json')
+		{
+			$view = new TemplatesViewStyle;
+
+			// Get/Create the model
+			if ($model = new TemplatesModelStyle)
+			{
+				$model->addTablePath(JPATH_ADMINISTRATOR . '/components/com_templates/tables');
+
+				// Push the model into the view (as default)
+				$view->setModel($model, true);
+			}
+
+			$view->document = $document;
+
+			return $view->display();
+		}
+
+		// Check for edit form.
+		if ($view == 'style' && $layout == 'edit' && !$this->checkEditId('com_templates.edit.style', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_templates&view=styles', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_templates/controllers/style.php b/core/administrator/components/com_templates/controllers/style.php
new file mode 100644
index 00000000..e114480f
--- /dev/null
+++ b/core/administrator/components/com_templates/controllers/style.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Template style controller class.
+ *
+ * @since  1.6
+ */
+class TemplatesControllerStyle extends JControllerForm
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var		string
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_TEMPLATES_STYLE';
+
+	/**
+	 * Method to save a template style.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		if (!JSession::checkToken())
+		{
+			JFactory::getApplication()->redirect('index.php', JText::_('JINVALID_TOKEN'));
+		}
+
+		$document = JFactory::getDocument();
+
+		if ($document->getType() === 'json')
+		{
+			$app   = JFactory::getApplication();
+			$lang  = JFactory::getLanguage();
+			$model = $this->getModel();
+			$table = $model->getTable();
+			$data  = $this->input->post->get('params', array(), 'array');
+			$checkin = property_exists($table, 'checked_out');
+			$context = $this->option . '.edit.' . $this->context;
+			$task = $this->getTask();
+
+			$item = $model->getItem($app->getTemplate(true)->id);
+
+			// Setting received params
+			$item->set('params', $data);
+
+			$data = $item->getProperties();
+			unset($data['xml']);
+
+			$key = $table->getKeyName();
+
+			// Access check.
+			if (!$this->allowSave($data, $key))
+			{
+				$app->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'error');
+
+				return false;
+			}
+
+			JForm::addFormPath(JPATH_ADMINISTRATOR . '/components/com_templates/models/forms');
+
+			// Validate the posted data.
+			// Sometimes the form needs some posted data, such as for plugins and modules.
+			$form = $model->getForm($data, false);
+
+			if (!$form)
+			{
+				$app->enqueueMessage($model->getError(), 'error');
+
+				return false;
+			}
+
+			// Test whether the data is valid.
+			$validData = $model->validate($form, $data);
+
+			if ($validData === false)
+			{
+				// Get the validation messages.
+				$errors = $model->getErrors();
+
+				// Push up to three validation messages out to the user.
+				for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+				{
+					if ($errors[$i] instanceof Exception)
+					{
+						$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+					}
+					else
+					{
+						$app->enqueueMessage($errors[$i], 'warning');
+					}
+				}
+
+				// Save the data in the session.
+				$app->setUserState($context . '.data', $data);
+
+				return false;
+			}
+
+			if (!isset($validData['tags']))
+			{
+				$validData['tags'] = null;
+			}
+
+			// Attempt to save the data.
+			if (!$model->save($validData))
+			{
+				// Save the data in the session.
+				$app->setUserState($context . '.data', $validData);
+
+				$app->enqueueMessage(JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
+
+				return false;
+			}
+
+			// Save succeeded, so check-in the record.
+			if ($checkin && $model->checkin($validData[$key]) === false)
+			{
+				// Save the data in the session.
+				$app->setUserState($context . '.data', $validData);
+
+				// Check-in failed, so go back to the record and display a notice.
+				$app->enqueueMessage(JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
+
+				return false;
+			}
+
+			// Redirect the user and adjust session state
+			// Set the record data in the session.
+			$recordId = $model->getState($this->context . '.id');
+			$this->holdEditId($context, $recordId);
+			$app->setUserState($context . '.data', null);
+			$model->checkout($recordId);
+
+			// Invoke the postSave method to allow for the child class to access the model.
+			$this->postSaveHook($model, $validData);
+
+			return true;
+		}
+		else
+		{
+			parent::save($key, $urlVar);
+		}
+	}
+}
diff --git a/core/administrator/components/com_templates/controllers/styles.php b/core/administrator/components/com_templates/controllers/styles.php
new file mode 100644
index 00000000..eca41c97
--- /dev/null
+++ b/core/administrator/components/com_templates/controllers/styles.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Template styles list controller class.
+ *
+ * @since  1.6
+ */
+class TemplatesControllerStyles extends JControllerAdmin
+{
+	/**
+	 * Method to clone and existing template style.
+	 *
+	 * @return  void
+	 */
+	public function duplicate()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$pks = $this->input->post->get('cid', array(), 'array');
+
+		try
+		{
+			if (empty($pks))
+			{
+				throw new Exception(JText::_('COM_TEMPLATES_NO_TEMPLATE_SELECTED'));
+			}
+
+			$pks = ArrayHelper::toInteger($pks);
+
+			$model = $this->getModel();
+			$model->duplicate($pks);
+			$this->setMessage(JText::_('COM_TEMPLATES_SUCCESS_DUPLICATED'));
+		}
+		catch (Exception $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		$this->setRedirect('index.php?option=com_templates&view=styles');
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Style', $prefix = 'TemplatesModel', $config = array())
+	{
+		return parent::getModel($name, $prefix, array('ignore_request' => true));
+	}
+
+	/**
+	 * Method to set the home template for a client.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function setDefault()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$pks = $this->input->post->get('cid', array(), 'array');
+
+		try
+		{
+			if (empty($pks))
+			{
+				throw new Exception(JText::_('COM_TEMPLATES_NO_TEMPLATE_SELECTED'));
+			}
+
+			$pks = ArrayHelper::toInteger($pks);
+
+			// Pop off the first element.
+			$id = array_shift($pks);
+			$model = $this->getModel();
+			$model->setHome($id);
+			$this->setMessage(JText::_('COM_TEMPLATES_SUCCESS_HOME_SET'));
+		}
+		catch (Exception $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		$this->setRedirect('index.php?option=com_templates&view=styles');
+	}
+
+	/**
+	 * Method to unset the default template for a client and for a language
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function unsetDefault()
+	{
+		// Check for request forgeries
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$pks = $this->input->get->get('cid', array(), 'array');
+		$pks = ArrayHelper::toInteger($pks);
+
+		try
+		{
+			if (empty($pks))
+			{
+				throw new Exception(JText::_('COM_TEMPLATES_NO_TEMPLATE_SELECTED'));
+			}
+
+			// Pop off the first element.
+			$id = array_shift($pks);
+			$model = $this->getModel();
+			$model->unsetHome($id);
+			$this->setMessage(JText::_('COM_TEMPLATES_SUCCESS_HOME_UNSET'));
+		}
+		catch (Exception $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+		}
+
+		$this->setRedirect('index.php?option=com_templates&view=styles');
+	}
+}
diff --git a/core/administrator/components/com_templates/controllers/template.php b/core/administrator/components/com_templates/controllers/template.php
new file mode 100644
index 00000000..ed695117
--- /dev/null
+++ b/core/administrator/components/com_templates/controllers/template.php
@@ -0,0 +1,749 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('InstallerModelInstall', JPATH_ADMINISTRATOR . '/components/com_installer/models/install.php');
+
+/**
+ * Template style controller class.
+ *
+ * @since  1.6
+ */
+class TemplatesControllerTemplate extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   3.2
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Apply, Save & New, and Save As copy should be standard on forms.
+		$this->registerTask('apply', 'save');
+	}
+
+	/**
+	 * Method for closing the template.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function cancel()
+	{
+		$this->setRedirect(JRoute::_('index.php?option=com_templates&view=templates', false));
+	}
+
+	/**
+	 * Method for closing a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function close()
+	{
+		$app  = JFactory::getApplication();
+		$file = base64_encode('home');
+		$id   = $app->input->get('id');
+		$url  = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+		$this->setRedirect(JRoute::_($url, false));
+	}
+
+	/**
+	 * Method for copying the template.
+	 *
+	 * @return  boolean     true on success, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function copy()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app = JFactory::getApplication();
+		$this->input->set('installtype', 'folder');
+		$newName    = $this->input->get('new_name');
+		$newNameRaw = $this->input->get('new_name', null, 'string');
+		$templateID = $this->input->getInt('id', 0);
+		$file       = $this->input->get('file');
+
+		$this->setRedirect('index.php?option=com_templates&view=template&id=' . $templateID . '&file=' . $file);
+		$model = $this->getModel('Template', 'TemplatesModel');
+		$model->setState('new_name', $newName);
+		$model->setState('tmp_prefix', uniqid('template_copy_'));
+		$model->setState('to_path', JFactory::getConfig()->get('tmp_path') . '/' . $model->getState('tmp_prefix'));
+
+		// Process only if we have a new name entered
+		if (strlen($newName) > 0)
+		{
+			if (!JFactory::getUser()->authorise('core.create', 'com_templates'))
+			{
+				// User is not authorised to delete
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_CREATE_NOT_PERMITTED'), 'error');
+
+				return false;
+			}
+
+			// Set FTP credentials, if given
+			JClientHelper::setCredentialsFromRequest('ftp');
+
+			// Check that new name is valid
+			if (($newNameRaw !== null) && ($newName !== $newNameRaw))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_INVALID_TEMPLATE_NAME'), 'error');
+
+				return false;
+			}
+
+			// Check that new name doesn't already exist
+			if (!$model->checkNewName())
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_DUPLICATE_TEMPLATE_NAME'), 'error');
+
+				return false;
+			}
+
+			// Check that from name does exist and get the folder name
+			$fromName = $model->getFromName();
+
+			if (!$fromName)
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_INVALID_FROM_NAME'), 'error');
+
+				return false;
+			}
+
+			// Call model's copy method
+			if (!$model->copy())
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_COULD_NOT_COPY'), 'error');
+
+				return false;
+			}
+
+			// Call installation model
+			$this->input->set('install_directory', JFactory::getConfig()->get('tmp_path') . '/' . $model->getState('tmp_prefix'));
+			$installModel = $this->getModel('Install', 'InstallerModel');
+			JFactory::getLanguage()->load('com_installer');
+
+			if (!$installModel->install())
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_COULD_NOT_INSTALL'), 'error');
+
+				return false;
+			}
+
+			$this->setMessage(JText::sprintf('COM_TEMPLATES_COPY_SUCCESS', $newName));
+			$model->cleanup();
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional (note, the empty array is atypical compared to other models).
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   3.2
+	 */
+	public function getModel($name = 'Template', $prefix = 'TemplatesModel', $config = array())
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	protected function allowEdit()
+	{
+		return JFactory::getUser()->authorise('core.edit', 'com_templates');
+	}
+
+	/**
+	 * Method to check if you can save a new or existing record.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	protected function allowSave()
+	{
+		return $this->allowEdit();
+	}
+
+	/**
+	 * Saves a template source file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function save()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app          = JFactory::getApplication();
+		$data         = $this->input->post->get('jform', array(), 'array');
+		$task         = $this->getTask();
+		$model        = $this->getModel();
+		$fileName     = $app->input->get('file');
+		$explodeArray = explode(':', base64_decode($fileName));
+
+		// Access check.
+		if (!$this->allowSave())
+		{
+			$app->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'error');
+
+			return false;
+		}
+
+		// Match the stored id's with the submitted.
+		if (empty($data['extension_id']) || empty($data['filename']))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_ID_FILENAME_MISMATCH'), 'error');
+
+			return false;
+		}
+		elseif ($data['extension_id'] != $model->getState('extension.id'))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_ID_FILENAME_MISMATCH'), 'error');
+
+			return false;
+		}
+		elseif ($data['filename'] != end($explodeArray))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_ID_FILENAME_MISMATCH'), 'error');
+
+			return false;
+		}
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form)
+		{
+			$app->enqueueMessage($model->getError(), 'error');
+
+			return false;
+		}
+
+		$data = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($data === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Redirect back to the edit screen.
+			$url = 'index.php?option=com_templates&view=template&id=' . $model->getState('extension.id') . '&file=' . $fileName;
+			$this->setRedirect(JRoute::_($url, false));
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($data))
+		{
+			// Redirect back to the edit screen.
+			$this->setMessage(JText::sprintf('JERROR_SAVE_FAILED', $model->getError()), 'warning');
+			$url = 'index.php?option=com_templates&view=template&id=' . $model->getState('extension.id') . '&file=' . $fileName;
+			$this->setRedirect(JRoute::_($url, false));
+
+			return false;
+		}
+
+		$this->setMessage(JText::_('COM_TEMPLATES_FILE_SAVE_SUCCESS'));
+
+		// Redirect the user based on the chosen task.
+		switch ($task)
+		{
+			case 'apply':
+				// Redirect back to the edit screen.
+				$url = 'index.php?option=com_templates&view=template&id=' . $model->getState('extension.id') . '&file=' . $fileName;
+				$this->setRedirect(JRoute::_($url, false));
+				break;
+
+			default:
+				// Redirect to the list screen.
+				$file = base64_encode('home');
+				$id   = $app->input->get('id');
+				$url  = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+				$this->setRedirect(JRoute::_($url, false));
+				break;
+		}
+	}
+
+	/**
+	 * Method for creating override.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function overrides()
+	{
+		$app      = JFactory::getApplication();
+		$model    = $this->getModel();
+		$file     = $app->input->get('file');
+		$override = base64_decode($app->input->get('folder'));
+		$id       = $app->input->get('id');
+
+		if ($model->createOverride($override))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_OVERRIDE_SUCCESS'));
+		}
+
+		// Redirect back to the edit screen.
+		$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+		$this->setRedirect(JRoute::_($url, false));
+	}
+
+	/**
+	 * Method for compiling LESS.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function less()
+	{
+		$app   = JFactory::getApplication();
+		$model = $this->getModel();
+		$id    = $app->input->get('id');
+		$file  = $app->input->get('file');
+
+		if ($model->compileLess($file))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_COMPILE_SUCCESS'));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_COMPILE_ERROR'), 'error');
+		}
+
+		$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+		$this->setRedirect(JRoute::_($url, false));
+	}
+
+	/**
+	 * Method for deleting a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function delete()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel();
+		$id    = $app->input->get('id');
+		$file  = $app->input->get('file');
+
+		if (base64_decode(urldecode($file)) == 'index.php')
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_INDEX_DELETE'), 'warning');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+
+		elseif ($model->deleteFile($file))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_FILE_DELETE_SUCCESS'));
+			$file = base64_encode('home');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FILE_DELETE'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for creating a new file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function createFile()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$model    = $this->getModel();
+		$id       = $app->input->get('id');
+		$file     = $app->input->get('file');
+		$name     = $app->input->get('name');
+		$location = base64_decode($app->input->get('address'));
+		$type     = $app->input->get('type');
+
+		if ($type == 'null')
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_INVALID_FILE_TYPE'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif (!preg_match('/^[a-zA-Z0-9-_]+$/', $name))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_INVALID_FILE_NAME'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif ($model->createFile($name, $type, $location))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_FILE_CREATE_SUCCESS'));
+			$file = urlencode(base64_encode($location . '/' . $name . '.' . $type));
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FILE_CREATE'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for uploading a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function uploadFile()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$model    = $this->getModel();
+		$id       = $app->input->get('id');
+		$file     = $app->input->get('file');
+		$upload   = $app->input->files->get('files');
+		$location = base64_decode($app->input->get('address'));
+
+		if ($return = $model->uploadFile($upload, $location))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_UPLOAD_SUCCESS') . $upload['name']);
+			$redirect = base64_encode($return);
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $redirect;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FILE_UPLOAD'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for creating a new folder.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function createFolder()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$model    = $this->getModel();
+		$id       = $app->input->get('id');
+		$file     = $app->input->get('file');
+		$name     = $app->input->get('name');
+		$location = base64_decode($app->input->get('address'));
+
+		if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $name))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_INVALID_FOLDER_NAME'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif ($model->createFolder($name, $location))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_FOLDER_CREATE_SUCCESS'));
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FOLDER_CREATE'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for deleting a folder.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function deleteFolder()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$model    = $this->getModel();
+		$id       = $app->input->get('id');
+		$file     = $app->input->get('file');
+		$location = base64_decode($app->input->get('address'));
+
+		if (empty($location))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_ROOT_DELETE'), 'warning');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif ($model->deleteFolder($location))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_FOLDER_DELETE_SUCCESS'));
+
+			if (stristr(base64_decode($file), $location) != false)
+			{
+				$file = base64_encode('home');
+			}
+
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FOLDER_DELETE_ERROR'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for renaming a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function renameFile()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app     = JFactory::getApplication();
+		$model   = $this->getModel();
+		$id      = $app->input->get('id');
+		$file    = $app->input->get('file');
+		$newName = $app->input->get('new_name');
+
+		if (base64_decode(urldecode($file)) == 'index.php')
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_RENAME_INDEX'), 'warning');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif (!preg_match('/^[a-zA-Z0-9-_]+$/', $newName))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_INVALID_FILE_NAME'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif ($rename = $model->renameFile($file, $newName))
+		{
+			$this->setMessage(JText::_('COM_TEMPLATES_FILE_RENAME_SUCCESS'));
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $rename;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FILE_RENAME'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for cropping an image.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function cropImage()
+	{
+		$app   = JFactory::getApplication();
+		$id    = $app->input->get('id');
+		$file  = $app->input->get('file');
+		$x     = $app->input->get('x');
+		$y     = $app->input->get('y');
+		$w     = $app->input->get('w');
+		$h     = $app->input->get('h');
+		$model = $this->getModel();
+
+		if (empty($w) && empty($h) && empty($x) && empty($y))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_CROP_AREA_ERROR'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif ($model->cropImage($file, $w, $h, $x, $y))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_CROP_SUCCESS'));
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_CROP_ERROR'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for resizing an image.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function resizeImage()
+	{
+		$app    = JFactory::getApplication();
+		$id     = $app->input->get('id');
+		$file   = $app->input->get('file');
+		$width  = $app->input->get('width');
+		$height = $app->input->get('height');
+		$model  = $this->getModel();
+
+		if ($model->resizeImage($file, $width, $height))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_RESIZE_SUCCESS'));
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_RESIZE_ERROR'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for copying a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function copyFile()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app      = JFactory::getApplication();
+		$id       = $app->input->get('id');
+		$file     = $app->input->get('file');
+		$newName  = $app->input->get('new_name');
+		$location = base64_decode($app->input->get('address'));
+		$model    = $this->getModel();
+
+		if (!preg_match('/^[a-zA-Z0-9-_]+$/', $newName))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_INVALID_FILE_NAME'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		elseif ($model->copyFile($newName, $location, $file))
+		{
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_COPY_FAIL'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+
+	/**
+	 * Method for extracting an archive file.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function extractArchive()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$app   = JFactory::getApplication();
+		$id    = $app->input->get('id');
+		$file  = $app->input->get('file');
+		$model = $this->getModel();
+
+		if ($model->extractArchive($file))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS'));
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL'), 'error');
+			$url = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+			$this->setRedirect(JRoute::_($url, false));
+		}
+	}
+}
diff --git a/core/administrator/components/com_templates/helpers/html/templates.php b/core/administrator/components/com_templates/helpers/html/templates.php
new file mode 100644
index 00000000..97a7e251
--- /dev/null
+++ b/core/administrator/components/com_templates/helpers/html/templates.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * JHtml helper class.
+ *
+ * @since  1.6
+ */
+class JHtmlTemplates
+{
+	/**
+	 * Display the thumb for the template.
+	 *
+	 * @param   string   $template  The name of the template.
+	 * @param   integer  $clientId  The application client ID the template applies to
+	 *
+	 * @return  string  The html string
+	 *
+	 * @since   1.6
+	 */
+	public static function thumb($template, $clientId = 0)
+	{
+		$client = JApplicationHelper::getClientInfo($clientId);
+		$basePath = $client->path . '/templates/' . $template;
+		$thumb = $basePath . '/template_thumbnail.png';
+		$preview = $basePath . '/template_preview.png';
+		$html = '';
+
+		if (file_exists($thumb))
+		{
+			JHtml::_('bootstrap.tooltip');
+
+			$clientPath = ($clientId == 0) ? '' : 'administrator/';
+			$thumb = $clientPath . 'templates/' . $template . '/template_thumbnail.png';
+			$html = JHtml::_('image', $thumb, JText::_('COM_TEMPLATES_PREVIEW'));
+
+			if (file_exists($preview))
+			{
+				$html = '<a href="#' . $template . '-Modal" role="button" class="thumbnail pull-left hasTooltip" data-toggle="modal" title="' .
+					JHtml::_('tooltipText', 'COM_TEMPLATES_CLICK_TO_ENLARGE') . '">' . $html . '</a>';
+			}
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Renders the html for the modal linked to thumb.
+	 *
+	 * @param   string   $template  The name of the template.
+	 * @param   integer  $clientId  The application client ID the template applies to
+	 *
+	 * @return  string  The html string
+	 *
+	 * @since   3.4
+	 */
+	public static function thumbModal($template, $clientId = 0)
+	{
+		$client = JApplicationHelper::getClientInfo($clientId);
+		$basePath = $client->path . '/templates/' . $template;
+		$baseUrl = ($clientId == 0) ? JUri::root(true) : JUri::root(true) . '/administrator';
+		$thumb = $basePath . '/template_thumbnail.png';
+		$preview = $basePath . '/template_preview.png';
+		$html = '';
+
+		if (file_exists($thumb))
+		{
+			if (file_exists($preview))
+			{
+				$preview = $baseUrl . '/templates/' . $template . '/template_preview.png';
+				$footer = '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+					. JText::_('JTOOLBAR_CLOSE') . '</button>';
+
+				$html .= JHtml::_(
+					'bootstrap.renderModal',
+					$template . '-Modal',
+					array(
+						'title'  => JText::_('COM_TEMPLATES_BUTTON_PREVIEW'),
+						'height' => '500px',
+						'width'  => '800px',
+						'footer' => $footer,
+					),
+					$body = '<div><img src="' . $preview . '" style="max-width:100%" alt="' . $template . '"></div>'
+				);
+			}
+		}
+
+		return $html;
+	}
+}
diff --git a/core/administrator/components/com_templates/helpers/template.php b/core/administrator/components/com_templates/helpers/template.php
new file mode 100644
index 00000000..89b98753
--- /dev/null
+++ b/core/administrator/components/com_templates/helpers/template.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Template Helper class.
+ *
+ * @since  3.2
+ */
+abstract class TemplateHelper
+{
+	/**
+	 * Checks if the file is an image
+	 *
+	 * @param   string  $fileName  The filename
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public static function getTypeIcon($fileName)
+	{
+		// Get file extension
+		return strtolower(substr($fileName, strrpos($fileName, '.') + 1));
+	}
+
+	/**
+	 * Checks if the file can be uploaded
+	 *
+	 * @param   array   $file  File information
+	 * @param   string  $err   An error message to be returned
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public static function canUpload($file, $err = '')
+	{
+		$params = JComponentHelper::getParams('com_templates');
+
+		if (empty($file['name']))
+		{
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_UPLOAD_INPUT'), 'error');
+
+			return false;
+		}
+
+		// Media file names should never have executable extensions buried in them.
+		$executable = array(
+			'exe', 'phtml','java', 'perl', 'py', 'asp','dll', 'go', 'jar',
+			'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta', 'ins', 'isp',
+			'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb',
+			'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh'
+		);
+		$explodedFileName = explode('.', $file['name']);
+
+		if (count($explodedFileName) > 2)
+		{
+			foreach ($executable as $extensionName)
+			{
+				if (in_array($extensionName, $explodedFileName))
+				{
+					$app = JFactory::getApplication();
+					$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_EXECUTABLE'), 'error');
+
+					return false;
+				}
+			}
+		}
+
+		jimport('joomla.filesystem.file');
+
+		if ($file['name'] !== JFile::makeSafe($file['name']) || preg_match('/\s/', JFile::makeSafe($file['name'])))
+		{
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_WARNFILENAME'), 'error');
+
+			return false;
+		}
+
+		$format = strtolower(JFile::getExt($file['name']));
+
+		$imageTypes   = explode(',', $params->get('image_formats'));
+		$sourceTypes  = explode(',', $params->get('source_formats'));
+		$fontTypes    = explode(',', $params->get('font_formats'));
+		$archiveTypes = explode(',', $params->get('compressed_formats'));
+
+		$allowable = array_merge($imageTypes, $sourceTypes, $fontTypes, $archiveTypes);
+
+		if ($format == '' || $format == false || (!in_array($format, $allowable)))
+		{
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_WARNFILETYPE'), 'error');
+
+			return false;
+		}
+
+		if (in_array($format, $archiveTypes))
+		{
+			$zip = new ZipArchive;
+
+			if ($zip->open($file['tmp_name']) === true)
+			{
+				for ($i = 0; $i < $zip->numFiles; $i++)
+				{
+					$entry     = $zip->getNameIndex($i);
+					$endString = substr($entry, -1);
+
+					if ($endString != DIRECTORY_SEPARATOR)
+					{
+						$explodeArray = explode('.', $entry);
+						$ext          = end($explodeArray);
+
+						if (!in_array($ext, $allowable))
+						{
+							$app = JFactory::getApplication();
+							$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_UNSUPPORTED_ARCHIVE'), 'error');
+
+							return false;
+						}
+					}
+				}
+			}
+			else
+			{
+				$app = JFactory::getApplication();
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_OPEN_FAIL'), 'error');
+
+				return false;
+			}
+		}
+
+		// Max upload size set to 2 MB for Template Manager
+		$maxSize = (int) ($params->get('upload_limit') * 1024 * 1024);
+
+		if ($maxSize > 0 && (int) $file['size'] > $maxSize)
+		{
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_WARNFILETOOLARGE'), 'error');
+
+			return false;
+		}
+
+		$xss_check = file_get_contents($file['tmp_name'], false, null, -1, 256);
+		$html_tags = array(
+			'abbr', 'acronym', 'address', 'applet', 'area', 'audioscope', 'base', 'basefont', 'bdo', 'bgsound', 'big', 'blackface', 'blink', 'blockquote',
+			'body', 'bq', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'comment', 'custom', 'dd', 'del', 'dfn', 'dir', 'div',
+			'dl', 'dt', 'em', 'embed', 'fieldset', 'fn', 'font', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+			'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'keygen', 'kbd', 'label', 'layer', 'legend', 'li', 'limittext', 'link', 'listing',
+			'map', 'marquee', 'menu', 'meta', 'multicol', 'nobr', 'noembed', 'noframes', 'noscript', 'nosmartquotes', 'object', 'ol', 'optgroup', 'option',
+			'param', 'plaintext', 'pre', 'rt', 'ruby', 's', 'samp', 'script', 'select', 'server', 'shadow', 'sidebar', 'small', 'spacer', 'span', 'strike',
+			'strong', 'style', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title', 'tr', 'tt', 'ul', 'var', 'wbr', 'xml',
+			'xmp', '!DOCTYPE', '!--'
+		);
+
+		foreach ($html_tags as $tag)
+		{
+			// A tag is '<tagname ', so we need to add < and a space or '<tagname>'
+			if (stristr($xss_check, '<' . $tag . ' ') || stristr($xss_check, '<' . $tag . '>'))
+			{
+				$app = JFactory::getApplication();
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_WARNIEXSS'), 'error');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_templates/helpers/templates.php b/core/administrator/components/com_templates/helpers/templates.php
new file mode 100644
index 00000000..e24bb662
--- /dev/null
+++ b/core/administrator/components/com_templates/helpers/templates.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Templates component helper.
+ *
+ * @since  1.6
+ */
+class TemplatesHelper
+{
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_TEMPLATES_SUBMENU_STYLES'),
+			'index.php?option=com_templates&view=styles',
+			$vName == 'styles'
+		);
+		JHtmlSidebar::addEntry(
+			JText::_('COM_TEMPLATES_SUBMENU_TEMPLATES'),
+			'index.php?option=com_templates&view=templates',
+			$vName == 'templates'
+		);
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_templates');
+	}
+
+	/**
+	 * Get a list of filter options for the application clients.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 */
+	public static function getClientOptions()
+	{
+		// Build the filter options.
+		$options = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of filter options for the templates with styles.
+	 *
+	 * @param   mixed  $clientId  The CMS client id (0:site | 1:administrator) or '*' for all.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 */
+	public static function getTemplateOptions($clientId = '*')
+	{
+		// Build the filter options.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select($db->quoteName('element', 'value'))
+			->select($db->quoteName('name', 'text'))
+			->select($db->quoteName('extension_id', 'e_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('template'))
+			->where($db->quoteName('enabled') . ' = 1')
+			->order($db->quoteName('client_id') . ' ASC')
+			->order($db->quoteName('name') . ' ASC');
+
+		if ($clientId != '*')
+		{
+			$query->where($db->quoteName('client_id') . ' = ' . (int) $clientId);
+		}
+
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		return $options;
+	}
+
+	/**
+	 * TODO
+	 *
+	 * @param   string  $templateBaseDir  TODO
+	 * @param   string  $templateDir      TODO
+	 *
+	 * @return  boolean|JObject
+	 */
+	public static function parseXMLTemplateFile($templateBaseDir, $templateDir)
+	{
+		$data = new JObject;
+
+		// Check of the xml file exists
+		$filePath = JPath::clean($templateBaseDir . '/templates/' . $templateDir . '/templateDetails.xml');
+
+		if (is_file($filePath))
+		{
+			$xml = JInstaller::parseXMLInstallFile($filePath);
+
+			if ($xml['type'] != 'template')
+			{
+				return false;
+			}
+
+			foreach ($xml as $key => $value)
+			{
+				$data->set($key, $value);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * TODO
+	 *
+	 * @param   integer  $clientId     TODO
+	 * @param   string   $templateDir  TODO
+	 *
+	 * @return  boolean|array
+	 *
+	 * @since   3.0
+	 */
+	public static function getPositions($clientId, $templateDir)
+	{
+		$positions = array();
+
+		$templateBaseDir = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
+		$filePath = JPath::clean($templateBaseDir . '/templates/' . $templateDir . '/templateDetails.xml');
+
+		if (is_file($filePath))
+		{
+			// Read the file to see if it's a valid component XML file
+			$xml = simplexml_load_file($filePath);
+
+			if (!$xml)
+			{
+				return false;
+			}
+
+			// Check for a valid XML root tag.
+
+			// Extensions use 'extension' as the root tag.  Languages use 'metafile' instead
+
+			if ($xml->getName() != 'extension' && $xml->getName() != 'metafile')
+			{
+				unset($xml);
+
+				return false;
+			}
+
+			$positions = (array) $xml->positions;
+
+			if (isset($positions['position']))
+			{
+				$positions = (array) $positions['position'];
+			}
+			else
+			{
+				$positions = array();
+			}
+		}
+
+		return $positions;
+	}
+}
diff --git a/core/administrator/components/com_templates/models/fields/templatelocation.php b/core/administrator/components/com_templates/models/fields/templatelocation.php
new file mode 100644
index 00000000..8db12707
--- /dev/null
+++ b/core/administrator/components/com_templates/models/fields/templatelocation.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Template Location field.
+ *
+ * @since  3.5
+ */
+class JFormFieldTemplateLocation extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var	   string
+	 * @since  3.5
+	 */
+	protected $type = 'TemplateLocation';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.5
+	 */
+	public function getOptions()
+	{
+		$options = TemplatesHelper::getClientOptions();
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_templates/models/fields/templatename.php b/core/administrator/components/com_templates/models/fields/templatename.php
new file mode 100644
index 00000000..9c1b6e29
--- /dev/null
+++ b/core/administrator/components/com_templates/models/fields/templatename.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('TemplatesHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/templates.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Template Name field.
+ *
+ * @since  3.5
+ */
+class JFormFieldTemplateName extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var	   string
+	 * @since  3.5
+	 */
+	protected $type = 'TemplateName';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	public function getOptions()
+	{
+		// Get the client_id filter from the user state.
+		$clientId = JFactory::getApplication()->getUserStateFromRequest('com_templates.styles.client_id', 'client_id', '0', 'string');
+
+		// Get the templates for the selected client_id.
+		$options = TemplatesHelper::getTemplateOptions($clientId);
+
+		// Merge into the parent options.
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_templates/models/forms/filter_styles.xml b/core/administrator/components/com_templates/models/forms/filter_styles.xml
new file mode 100644
index 00000000..1578ff80
--- /dev/null
+++ b/core/administrator/components/com_templates/models/forms/filter_styles.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_templates/models/fields" />
+	<field
+		name="client_id"
+		type="list"
+		filtermode="selector"
+		onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="JSEARCH_FILTER"
+			description="COM_TEMPLATES_STYLES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_TEMPLATES_MSG_MANAGE_NO_STYLES"
+		/>
+		<field
+			name="menuitem"
+			type="menuitem"
+			label="COM_TEMPLATES_OPTION_SELECT_MENU_ITEM"
+			disable="separator,alias,heading,url"
+			showon="client_id:0"
+			onchange="this.form.submit();"
+			>
+			<option	value="">COM_TEMPLATES_OPTION_SELECT_MENU_ITEM</option>
+			<option	value="-1">COM_TEMPLATES_OPTION_NONE</option>
+		</field>
+		<field
+			name="template"
+			type="templatename"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_TEMPLATE</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.template ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.title ASC">COM_TEMPLATES_HEADING_STYLE_ASC</option>
+			<option value="a.title DESC">COM_TEMPLATES_HEADING_STYLE_DESC</option>
+			<option value="a.home ASC">COM_TEMPLATES_HEADING_DEFAULT_ASC</option>
+			<option value="a.home DESC">COM_TEMPLATES_HEADING_DEFAULT_DESC</option>
+			<option value="a.template ASC">COM_TEMPLATES_HEADING_TEMPLATE_ASC</option>
+			<option value="a.template DESC">COM_TEMPLATES_HEADING_TEMPLATE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+    </fields>
+</form>
diff --git a/core/administrator/components/com_templates/models/forms/filter_templates.xml b/core/administrator/components/com_templates/models/forms/filter_templates.xml
new file mode 100644
index 00000000..7a4c190b
--- /dev/null
+++ b/core/administrator/components/com_templates/models/forms/filter_templates.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_templates/models/fields" />
+	<field
+		name="client_id"
+		type="list"
+		filtermode="selector"
+		onchange="jQuery('#filter_search, select[id^=filter_], #list_fullordering').val('');this.form.submit();"
+		>
+		<option value="0">JSITE</option>
+		<option value="1">JADMINISTRATOR</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="JSEARCH_FILTER"
+			description="COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_TEMPLATES_MSG_MANAGE_NO_TEMPLATES"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.element ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.element ASC">COM_TEMPLATES_HEADING_TEMPLATE_ASC</option>
+			<option value="a.element DESC">COM_TEMPLATES_HEADING_TEMPLATE_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_templates/models/forms/source.xml b/core/administrator/components/com_templates/models/forms/source.xml
new file mode 100644
index 00000000..5aadea8d
--- /dev/null
+++ b/core/administrator/components/com_templates/models/forms/source.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="extension_id"
+			type="hidden" 
+		/>
+
+		<field
+			name="filename"
+			type="hidden"
+		 />
+
+		<field
+			name="source"
+			type="editor"
+			label="COM_TEMPLATES_FIELD_SOURCE_LABEL"
+			description="COM_TEMPLATES_FIELD_SOURCE_DESC"
+			editor="codemirror|none"
+			buttons="no"
+			height="500px"
+			rows="20"
+			cols="80"
+			syntax="php"
+			filter="raw" 
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_templates/models/forms/style.xml b/core/administrator/components/com_templates/models/forms/style.xml
new file mode 100644
index 00000000..897efc18
--- /dev/null
+++ b/core/administrator/components/com_templates/models/forms/style.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			id="id"
+			default="0"
+			readonly="true"
+			class="readonly"
+		/>
+
+		<field
+			name="template"
+			type="text"
+			label="COM_TEMPLATES_FIELD_TEMPLATE_LABEL"
+			description="COM_TEMPLATES_FIELD_TEMPLATE_DESC"
+			class="readonly"
+			size="30"
+			readonly="true" 
+		/>
+
+		<field
+			name="client_id"
+			type="hidden"
+			label="COM_TEMPLATES_FIELD_CLIENT_LABEL"
+			description="COM_TEMPLATES_FIELD_CLIENT_DESC"
+			class="readonly"
+			default="0"
+			readonly="true" 
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_TEMPLATES_FIELD_TITLE_LABEL"
+			description="COM_TEMPLATES_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="50"
+			required="true" 
+		/>
+
+		<field 
+			name="assigned" 
+			type="hidden" 
+		/>
+
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_templates/models/forms/style_administrator.xml b/core/administrator/components/com_templates/models/forms/style_administrator.xml
new file mode 100644
index 00000000..219d381b
--- /dev/null
+++ b/core/administrator/components/com_templates/models/forms/style_administrator.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="home"
+			type="radio"
+			label="COM_TEMPLATES_FIELD_HOME_LABEL"
+			description="COM_TEMPLATES_FIELD_HOME_ADMINISTRATOR_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_templates/models/forms/style_site.xml b/core/administrator/components/com_templates/models/forms/style_site.xml
new file mode 100644
index 00000000..d30c7809
--- /dev/null
+++ b/core/administrator/components/com_templates/models/forms/style_site.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="home"
+			type="contentlanguage"
+			label="COM_TEMPLATES_FIELD_HOME_LABEL"
+			description="COM_TEMPLATES_FIELD_HOME_SITE_DESC"
+			default="0"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JALL</option>
+		</field>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_templates/models/style.php b/core/administrator/components/com_templates/models/style.php
new file mode 100644
index 00000000..ff12a704
--- /dev/null
+++ b/core/administrator/components/com_templates/models/style.php
@@ -0,0 +1,729 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Template style model.
+ *
+ * @since  1.6
+ */
+class TemplatesModelStyle extends JModelAdmin
+{
+	/**
+	 * The help screen key for the module.
+	 *
+	 * @var	    string
+	 * @since   1.6
+	 */
+	protected $helpKey = 'JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT';
+
+	/**
+	 * The help screen base URL for the module.
+	 *
+	 * @var     string
+	 * @since   1.6
+	 */
+	protected $helpURL;
+
+	/**
+	 * Item cache.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	private $_cache = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'event_before_delete' => 'onExtensionBeforeDelete',
+				'event_after_delete'  => 'onExtensionAfterDelete',
+				'event_before_save'   => 'onExtensionBeforeSave',
+				'event_after_save'    => 'onExtensionAfterSave',
+				'events_map'          => array('delete' => 'extension', 'save' => 'extension')
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @note    Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+		$this->setState('style.id', $pk);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_templates');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to delete rows.
+	 *
+	 * @param   array  &$pks  An array of item ids.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 * @throws  Exception
+	 */
+	public function delete(&$pks)
+	{
+		$pks        = (array) $pks;
+		$user       = JFactory::getUser();
+		$table      = $this->getTable();
+		$dispatcher = JEventDispatcher::getInstance();
+		$context    = $this->option . '.' . $this->name;
+
+		JPluginHelper::importPlugin($this->events_map['delete']);
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $pk)
+		{
+			if ($table->load($pk))
+			{
+				// Access checks.
+				if (!$user->authorise('core.delete', 'com_templates'))
+				{
+					throw new Exception(JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+				}
+
+				// You should not delete a default style
+				if ($table->home != '0')
+				{
+					JError::raiseWarning(500, JText::_('COM_TEMPLATES_STYLE_CANNOT_DELETE_DEFAULT_STYLE'));
+
+					return false;
+				}
+
+				// Trigger the before delete event.
+				$result = $dispatcher->trigger($this->event_before_delete, array($context, $table));
+
+				if (in_array(false, $result, true) || !$table->delete($pk))
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+
+				// Trigger the after delete event.
+				$dispatcher->trigger($this->event_after_delete, array($context, $table));
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clean cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to duplicate styles.
+	 *
+	 * @param   array  &$pks  An array of primary key IDs.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @throws  Exception
+	 */
+	public function duplicate(&$pks)
+	{
+		$user = JFactory::getUser();
+
+		// Access checks.
+		if (!$user->authorise('core.create', 'com_templates'))
+		{
+			throw new Exception(JText::_('JERROR_CORE_CREATE_NOT_PERMITTED'));
+		}
+
+		$dispatcher = JEventDispatcher::getInstance();
+		$context    = $this->option . '.' . $this->name;
+
+		// Include the plugins for the save events.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		$table = $this->getTable();
+
+		foreach ($pks as $pk)
+		{
+			if ($table->load($pk, true))
+			{
+				// Reset the id to create a new record.
+				$table->id = 0;
+
+				// Reset the home (don't want dupes of that field).
+				$table->home = 0;
+
+				// Alter the title.
+				$m = null;
+				$table->title = $this->generateNewTitle(null, null, $table->title);
+
+				if (!$table->check())
+				{
+					throw new Exception($table->getError());
+				}
+
+				// Trigger the before save event.
+				$result = $dispatcher->trigger($this->event_before_save, array($context, &$table, true));
+
+				if (in_array(false, $result, true) || !$table->store())
+				{
+					throw new Exception($table->getError());
+				}
+
+				// Trigger the after save event.
+				$dispatcher->trigger($this->event_after_save, array($context, &$table, true));
+			}
+			else
+			{
+				throw new Exception($table->getError());
+			}
+		}
+
+		// Clean cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the title.
+	 *
+	 * @param   integer  $category_id  The id of the category.
+	 * @param   string   $alias        The alias.
+	 * @param   string   $title        The title.
+	 *
+	 * @return  string  New title.
+	 *
+	 * @since   1.7.1
+	 */
+	protected function generateNewTitle($category_id, $alias, $title)
+	{
+		// Alter the title
+		$table = $this->getTable();
+
+		while ($table->load(array('title' => $title)))
+		{
+			$title = StringHelper::increment($title);
+		}
+
+		return $title;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// The folder and element vars are passed when saving the form.
+		if (empty($data))
+		{
+			$item	   = $this->getItem();
+			$clientId  = $item->client_id;
+			$template  = $item->template;
+		}
+		else
+		{
+			$clientId  = ArrayHelper::getValue($data, 'client_id');
+			$template  = ArrayHelper::getValue($data, 'template');
+		}
+
+		// Add the default fields directory
+		$baseFolder = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE;
+		JForm::addFieldPath($baseFolder . '/templates/' . $template . '/field');
+
+		// These variables are used to add data from the plugin XML files.
+		$this->setState('item.client_id', $clientId);
+		$this->setState('item.template', $template);
+
+		// Get the form.
+		$form = $this->loadForm('com_templates.style', 'style', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Modify the form based on access controls.
+		if (!$this->canEditState((object) $data))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('home', 'disabled', 'true');
+
+			// Disable fields while saving.
+			// The controller has already verified this is a record you can edit.
+			$form->setFieldAttribute('home', 'filter', 'unset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_templates.edit.style.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_templates.style', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('style.id');
+
+		if (!isset($this->_cache[$pk]))
+		{
+			// Get a row instance.
+			$table = $this->getTable();
+
+			// Attempt to load the row.
+			$return = $table->load($pk);
+
+			// Check for a table object error.
+			if ($return === false && $table->getError())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Convert to the JObject before adding other data.
+			$properties        = $table->getProperties(1);
+			$this->_cache[$pk] = ArrayHelper::toObject($properties, 'JObject');
+
+			// Convert the params field to an array.
+			$registry = new Registry($table->params);
+			$this->_cache[$pk]->params = $registry->toArray();
+
+			// Get the template XML.
+			$client = JApplicationHelper::getClientInfo($table->client_id);
+			$path   = JPath::clean($client->path . '/templates/' . $table->template . '/templateDetails.xml');
+
+			if (file_exists($path))
+			{
+				$this->_cache[$pk]->xml = simplexml_load_file($path);
+			}
+			else
+			{
+				$this->_cache[$pk]->xml = null;
+			}
+		}
+
+		return $this->_cache[$pk];
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   type    $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 */
+	public function getTable($type = 'Style', $prefix = 'TemplatesTable', $config = array())
+	{
+		return JTable::getInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		$clientId = $this->getState('item.client_id');
+		$template = $this->getState('item.template');
+		$lang     = JFactory::getLanguage();
+		$client   = JApplicationHelper::getClientInfo($clientId);
+
+		if (!$form->loadFile('style_' . $client->name, true))
+		{
+			throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+		}
+
+		jimport('joomla.filesystem.path');
+
+		$formFile = JPath::clean($client->path . '/templates/' . $template . '/templateDetails.xml');
+
+		// Load the core and/or local language file(s).
+			$lang->load('tpl_' . $template, $client->path, null, false, true)
+		||	$lang->load('tpl_' . $template, $client->path . '/templates/' . $template, null, false, true);
+
+		if (file_exists($formFile))
+		{
+			// Get the template form.
+			if (!$form->loadFile($formFile, false, '//config'))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+		}
+
+		// Disable home field if it is default style
+
+		if ((is_array($data) && array_key_exists('home', $data) && $data['home'] == '1')
+			|| (is_object($data) && isset($data->home) && $data->home == '1'))
+		{
+			$form->setFieldAttribute('home', 'readonly', 'true');
+		}
+
+		// Attempt to load the xml file.
+		if (!$xml = simplexml_load_file($formFile))
+		{
+			throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+		}
+
+		// Get the help data from the XML file if present.
+		$help = $xml->xpath('/extension/help');
+
+		if (!empty($help))
+		{
+			$helpKey = trim((string) $help[0]['key']);
+			$helpURL = trim((string) $help[0]['url']);
+
+			$this->helpKey = $helpKey ?: $this->helpKey;
+			$this->helpURL = $helpURL ?: $this->helpURL;
+		}
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function save($data)
+	{
+		// Detect disabled extension
+		$extension = JTable::getInstance('Extension');
+
+		if ($extension->load(array('enabled' => 0, 'type' => 'template', 'element' => $data['template'], 'client_id' => $data['client_id'])))
+		{
+			$this->setError(JText::_('COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE'));
+
+			return false;
+		}
+
+		$app        = JFactory::getApplication();
+		$dispatcher = JEventDispatcher::getInstance();
+		$table      = $this->getTable();
+		$pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('style.id');
+		$isNew      = true;
+
+		// Include the extension plugins for the save events.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Load the row if saving an existing record.
+		if ($pk > 0)
+		{
+			$table->load($pk);
+			$isNew = false;
+		}
+
+		if ($app->input->get('task') == 'save2copy')
+		{
+			$data['title']    = $this->generateNewTitle(null, null, $data['title']);
+			$data['home']     = 0;
+			$data['assigned'] = '';
+		}
+
+		// Bind the data.
+		if (!$table->bind($data))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Prepare the row for saving
+		$this->prepareTable($table);
+
+		// Check the data.
+		if (!$table->check())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Trigger the before save event.
+		$result = $dispatcher->trigger($this->event_before_save, array('com_templates.style', &$table, $isNew));
+
+		// Store the data.
+		if (in_array(false, $result, true) || !$table->store())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$user = JFactory::getUser();
+
+		if ($user->authorise('core.edit', 'com_menus') && $table->client_id == 0)
+		{
+			$n    = 0;
+			$db   = $this->getDbo();
+			$user = JFactory::getUser();
+
+			if (!empty($data['assigned']) && is_array($data['assigned']))
+			{
+				$data['assigned'] = ArrayHelper::toInteger($data['assigned']);
+
+				// Update the mapping for menu items that this style IS assigned to.
+				$query = $db->getQuery(true)
+					->update('#__menu')
+					->set('template_style_id = ' . (int) $table->id)
+					->where('id IN (' . implode(',', $data['assigned']) . ')')
+					->where('template_style_id != ' . (int) $table->id)
+					->where('checked_out IN (0,' . (int) $user->id . ')');
+				$db->setQuery($query);
+				$db->execute();
+				$n += $db->getAffectedRows();
+			}
+
+			// Remove style mappings for menu items this style is NOT assigned to.
+			// If unassigned then all existing maps will be removed.
+			$query = $db->getQuery(true)
+				->update('#__menu')
+				->set('template_style_id = 0');
+
+			if (!empty($data['assigned']))
+			{
+				$query->where('id NOT IN (' . implode(',', $data['assigned']) . ')');
+			}
+
+			$query->where('template_style_id = ' . (int) $table->id)
+				->where('checked_out IN (0,' . (int) $user->id . ')');
+			$db->setQuery($query);
+			$db->execute();
+
+			$n += $db->getAffectedRows();
+
+			if ($n > 0)
+			{
+				$app->enqueueMessage(JText::plural('COM_TEMPLATES_MENU_CHANGED', $n));
+			}
+		}
+
+		// Clean the cache.
+		$this->cleanCache();
+
+		// Trigger the after save event.
+		$dispatcher->trigger($this->event_after_save, array('com_templates.style', &$table, $isNew));
+
+		$this->setState('style.id', $table->id);
+
+		return true;
+	}
+
+	/**
+	 * Method to set a template style as home.
+	 *
+	 * @param   integer  $id  The primary key ID for the style.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @throws	Exception
+	 */
+	public function setHome($id = 0)
+	{
+		$user = JFactory::getUser();
+		$db   = $this->getDbo();
+
+		// Access checks.
+		if (!$user->authorise('core.edit.state', 'com_templates'))
+		{
+			throw new Exception(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+		}
+
+		$style = JTable::getInstance('Style', 'TemplatesTable');
+
+		if (!$style->load((int) $id))
+		{
+			throw new Exception(JText::_('COM_TEMPLATES_ERROR_STYLE_NOT_FOUND'));
+		}
+
+		// Detect disabled extension
+		$extension = JTable::getInstance('Extension');
+
+		if ($extension->load(array('enabled' => 0, 'type' => 'template', 'element' => $style->template, 'client_id' => $style->client_id)))
+		{
+			throw new Exception(JText::_('COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE'));
+		}
+
+		// Reset the home fields for the client_id.
+		$query = $db->getQuery(true)
+			->update('#__template_styles')
+			->set('home = ' .  $db->q('0'))
+			->where('client_id = ' . (int) $style->client_id)
+			->where('home = ' . $db->q('1'));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Set the new home style.
+		$query = $db->getQuery(true)
+			->update('#__template_styles')
+			->set('home = ' . $db->q('1'))
+			->where('id = ' . (int) $id);
+		$db->setQuery($query);
+		$db->execute();
+
+		// Clean the cache.
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to unset a template style as default for a language.
+	 *
+	 * @param   integer  $id  The primary key ID for the style.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @throws	Exception
+	 */
+	public function unsetHome($id = 0)
+	{
+		$user = JFactory::getUser();
+		$db   = $this->getDbo();
+
+		// Access checks.
+		if (!$user->authorise('core.edit.state', 'com_templates'))
+		{
+			throw new Exception(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+		}
+
+		// Lookup the client_id.
+		$query = $db->getQuery(true)
+			->select('client_id, home')
+			->from('#__template_styles')
+			->where('id = ' . (int) $id);
+		$db->setQuery($query);
+		$style = $db->loadObject();
+
+		if (!is_numeric($style->client_id))
+		{
+			throw new Exception(JText::_('COM_TEMPLATES_ERROR_STYLE_NOT_FOUND'));
+		}
+		elseif ($style->home == '1')
+		{
+			throw new Exception(JText::_('COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE'));
+		}
+
+		// Set the new home style.
+		$query = $db->getQuery(true)
+			->update('#__template_styles')
+			->set('home = ' . $db->q('0'))
+			->where('id = ' . (int) $id);
+		$db->setQuery($query);
+		$db->execute();
+
+		// Clean the cache.
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Get the necessary data to load an item help screen.
+	 *
+	 * @return  object  An object with key, url, and local properties for loading the item help screen.
+	 *
+	 * @since   1.6
+	 */
+	public function getHelp()
+	{
+		return (object) array('key' => $this->helpKey, 'url' => $this->helpURL);
+	}
+
+	/**
+	 * Custom clean cache method
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		parent::cleanCache('com_templates');
+		parent::cleanCache('_system');
+	}
+}
diff --git a/core/administrator/components/com_templates/models/styles.php b/core/administrator/components/com_templates/models/styles.php
new file mode 100644
index 00000000..e00b1679
--- /dev/null
+++ b/core/administrator/components/com_templates/models/styles.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of template style records.
+ *
+ * @since  1.6
+ */
+class TemplatesModelStyles extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'template', 'a.template',
+				'home', 'a.home',
+				'menuitem',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.template', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.template', $this->getUserStateFromRequest($this->context . '.filter.template', 'filter_template', '', 'string'));
+		$this->setState('filter.menuitem', $this->getUserStateFromRequest($this->context . '.filter.menuitem', 'filter_menuitem', '', 'cmd'));
+
+		// Special case for the client id.
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$clientId = (!in_array($clientId, array (0, 1))) ? 0 : $clientId;
+		$this->setState('client_id', $clientId);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_templates');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('client_id');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.template');
+		$id .= ':' . $this->getState('filter.menuitem');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		$clientId = (int) $this->getState('client_id');
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.template, a.title, a.home, a.client_id, l.title AS language_title, l.image as image, l.sef AS language_sef'
+			)
+		);
+		$query->from($db->quoteName('#__template_styles', 'a'))
+			->where($db->quoteName('a.client_id') . ' = ' . $clientId);
+
+		// Join on menus.
+		$query->select('COUNT(m.template_style_id) AS assigned')
+			->join('LEFT', $db->quoteName('#__menu', 'm') . ' ON ' . $db->quoteName('m.template_style_id') . ' = ' . $db->quoteName('a.id'))
+			->group('a.id, a.template, a.title, a.home, a.client_id, l.title, l.image, e.extension_id, l.sef');
+
+		// Join over the language.
+		$query->join('LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = ' . $db->quoteName('a.home'));
+
+		// Filter by extension enabled.
+		$query->select($db->quoteName('extension_id', 'e_id'))
+			->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON e.element = a.template AND e.client_id = a.client_id')
+			->where($db->quoteName('e.enabled') . ' = 1')
+			->where($db->quoteName('e.type') . ' = ' . $db->quote('template'));
+
+		// Filter by template.
+		if ($template = $this->getState('filter.template'))
+		{
+			$query->where($db->quoteName('a.template') . ' = ' . $db->quote($template));
+		}
+
+		// Filter by menuitem.
+		$menuItemId = $this->getState('filter.menuitem');
+
+		if ($clientId === 0 && is_numeric($menuItemId))
+		{
+			// If user selected the templates styles that are not assigned to any page.
+			if ((int) $menuItemId === -1)
+			{
+				// Only custom template styles overrides not assigned to any menu item.
+				$query->where($db->quoteName('a.home') . ' = ' . $db->quote(0))
+					->where($db->quoteName('m.id') . ' IS NULL');
+			}
+			// If user selected the templates styles assigned to particular pages.
+			else
+			{
+				// Subquery to get the language of the selected menu item.
+				$menuItemLanguageSubQuery = $db->getQuery(true);
+				$menuItemLanguageSubQuery->select($db->quoteName('language'))
+					->from($db->quoteName('#__menu'))
+					->where($db->quoteName('id') . ' = ' . $menuItemId);
+
+				// Subquery to get the language of the selected menu item.
+				$templateStylesMenuItemsSubQuery = $db->getQuery(true);
+				$templateStylesMenuItemsSubQuery->select($db->quoteName('id'))
+					->from($db->quoteName('#__menu'))
+					->where($db->quoteName('template_style_id') . ' = ' . $db->quoteName('a.id'));
+
+				// Main query where clause.
+				$query->where('(' .
+					// Default template style (fallback template style to all menu items).
+					$db->quoteName('a.home') . ' = ' . $db->quote(1) . ' OR ' .
+					// Default template style for specific language (fallback template style to the selected menu item language).
+					$db->quoteName('a.home') . ' IN (' . $menuItemLanguageSubQuery . ') OR ' .
+					// Custom template styles override (only if assigned to the selected menu item).
+					'(' . $db->quoteName('a.home') . ' = ' . $db->quote(0) . ' AND ' . $menuItemId . ' IN (' . $templateStylesMenuItemsSubQuery . '))' .
+					')'
+				);
+			}
+		}
+
+		// Filter by search in title.
+		if ($search = $this->getState('filter.search'))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . strtolower($search) . '%');
+				$query->where('(' . ' LOWER(a.template) LIKE ' . $search . ' OR LOWER(a.title) LIKE ' . $search . ')');
+			}
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.template')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_templates/models/template.php b/core/administrator/components/com_templates/models/template.php
new file mode 100644
index 00000000..3a7c36bf
--- /dev/null
+++ b/core/administrator/components/com_templates/models/template.php
@@ -0,0 +1,1451 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Template model class.
+ *
+ * @since  1.6
+ */
+class TemplatesModelTemplate extends JModelForm
+{
+	/**
+	 * The information in a template
+	 *
+	 * @var    stdClass
+	 * @since  1.6
+	 */
+	protected $template = null;
+
+	/**
+	 * The path to the template
+	 *
+	 * @var    stdClass
+	 * @since  3.2
+	 */
+	protected $element = null;
+
+	/**
+	 * Internal method to get file properties.
+	 *
+	 * @param   string  $path  The base path.
+	 * @param   string  $name  The file name.
+	 *
+	 * @return  object
+	 *
+	 * @since   1.6
+	 */
+	protected function getFile($path, $name)
+	{
+		$temp = new stdClass;
+
+		if ($template = $this->getTemplate())
+		{
+			$temp->name = $name;
+			$temp->id = urlencode(base64_encode($path . $name));
+
+			return $temp;
+		}
+	}
+
+	/**
+	 * Method to get a list of all the files to edit in a template.
+	 *
+	 * @return  array  A nested array of relevant files.
+	 *
+	 * @since   1.6
+	 */
+	public function getFiles()
+	{
+		$result = array();
+
+		if ($template = $this->getTemplate())
+		{
+			jimport('joomla.filesystem.folder');
+			$app    = JFactory::getApplication();
+			$client = JApplicationHelper::getClientInfo($template->client_id);
+			$path   = JPath::clean($client->path . '/templates/' . $template->element . '/');
+			$lang   = JFactory::getLanguage();
+
+			// Load the core and/or local language file(s).
+			$lang->load('tpl_' . $template->element, $client->path, null, false, true) ||
+			$lang->load('tpl_' . $template->element, $client->path . '/templates/' . $template->element, null, false, true);
+			$this->element = $path;
+
+			if (!is_writable($path))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_DIRECTORY_NOT_WRITABLE'), 'error');
+			}
+
+			if (is_dir($path))
+			{
+				$result = $this->getDirectoryTree($path);
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_TEMPLATE_FOLDER_NOT_FOUND'), 'error');
+
+				return false;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the directory tree.
+	 *
+	 * @param   string  $dir  The path of the directory to scan
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public function getDirectoryTree($dir)
+	{
+		$result = array();
+
+		$dirFiles = scandir($dir);
+
+		foreach ($dirFiles as $key => $value)
+		{
+			if (!in_array($value, array('.', '..')))
+			{
+				if (is_dir($dir . $value))
+				{
+					$relativePath = str_replace($this->element, '', $dir . $value);
+					$result['/' . $relativePath] = $this->getDirectoryTree($dir . $value . '/');
+				}
+				else
+				{
+					$ext           = pathinfo($dir . $value, PATHINFO_EXTENSION);
+					$allowedFormat = $this->checkFormat($ext);
+
+					if ($allowedFormat == true)
+					{
+						$relativePath = str_replace($this->element, '', $dir);
+						$info = $this->getFile('/' . $relativePath, $value);
+						$result[] = $info;
+					}
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		jimport('joomla.filesystem.file');
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+		$this->setState('extension.id', $pk);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_templates');
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get the template information.
+	 *
+	 * @return  mixed  Object if successful, false if not and internal error is set.
+	 *
+	 * @since   1.6
+	 */
+	public function &getTemplate()
+	{
+		if (empty($this->template))
+		{
+			$pk  = $this->getState('extension.id');
+			$db  = $this->getDbo();
+			$app = JFactory::getApplication();
+
+			// Get the template information.
+			$query = $db->getQuery(true)
+				->select('extension_id, client_id, element, name, manifest_cache')
+				->from('#__extensions')
+				->where($db->quoteName('extension_id') . ' = ' . (int) $pk)
+				->where($db->quoteName('type') . ' = ' . $db->quote('template'));
+			$db->setQuery($query);
+
+			try
+			{
+				$result = $db->loadObject();
+			}
+			catch (RuntimeException $e)
+			{
+				$app->enqueueMessage($e->getMessage(), 'warning');
+				$this->template = false;
+
+				return false;
+			}
+
+			if (empty($result))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_EXTENSION_RECORD_NOT_FOUND'), 'error');
+				$this->template = false;
+			}
+			else
+			{
+				$this->template = $result;
+			}
+		}
+
+		return $this->template;
+	}
+
+	/**
+	 * Method to check if new template name already exists
+	 *
+	 * @return  boolean   true if name is not used, false otherwise
+	 *
+	 * @since	2.5
+	 */
+	public function checkNewName()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from('#__extensions')
+			->where('name = ' . $db->quote($this->getState('new_name')));
+		$db->setQuery($query);
+
+		return ($db->loadResult() == 0);
+	}
+
+	/**
+	 * Method to check if new template name already exists
+	 *
+	 * @return  string     name of current template
+	 *
+	 * @since	2.5
+	 */
+	public function getFromName()
+	{
+		return $this->getTemplate()->element;
+	}
+
+	/**
+	 * Method to check if new template name already exists
+	 *
+	 * @return  boolean   true if name is not used, false otherwise
+	 *
+	 * @since	2.5
+	 */
+	public function copy()
+	{
+		$app = JFactory::getApplication();
+
+		if ($template = $this->getTemplate())
+		{
+			jimport('joomla.filesystem.folder');
+			$client = JApplicationHelper::getClientInfo($template->client_id);
+			$fromPath = JPath::clean($client->path . '/templates/' . $template->element . '/');
+
+			// Delete new folder if it exists
+			$toPath = $this->getState('to_path');
+
+			if (JFolder::exists($toPath))
+			{
+				if (!JFolder::delete($toPath))
+				{
+					$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_COULD_NOT_WRITE'), 'error');
+
+					return false;
+				}
+			}
+
+			// Copy all files from $fromName template to $newName folder
+			if (!JFolder::copy($fromPath, $toPath) || !$this->fixTemplateName())
+			{
+				return false;
+			}
+
+			return true;
+		}
+		else
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_INVALID_FROM_NAME'), 'error');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Method to delete tmp folder
+	 *
+	 * @return  boolean   true if delete successful, false otherwise
+	 *
+	 * @since	2.5
+	 */
+	public function cleanup()
+	{
+		// Clear installation messages
+		$app = JFactory::getApplication();
+		$app->setUserState('com_installer.message', '');
+		$app->setUserState('com_installer.extension_message', '');
+
+		// Delete temporary directory
+		return JFolder::delete($this->getState('to_path'));
+	}
+
+	/**
+	 * Method to rename the template in the XML files and rename the language files
+	 *
+	 * @return  boolean  true if successful, false otherwise
+	 *
+	 * @since	2.5
+	 */
+	protected function fixTemplateName()
+	{
+		// Rename Language files
+		// Get list of language files
+		$result   = true;
+		$files    = JFolder::files($this->getState('to_path'), '.ini', true, true);
+		$newName  = strtolower($this->getState('new_name'));
+		$template = $this->getTemplate();
+		$oldName  = $template->element;
+		$manifest = json_decode($template->manifest_cache);
+
+		jimport('joomla.filesystem.file');
+
+		foreach ($files as $file)
+		{
+			$newFile = str_replace($oldName, $newName, $file);
+			$result = JFile::move($file, $newFile) && $result;
+		}
+
+		// Edit XML file
+		$xmlFile = $this->getState('to_path') . '/templateDetails.xml';
+
+		if (JFile::exists($xmlFile))
+		{
+			$contents = file_get_contents($xmlFile);
+			$pattern[] = '#<name>\s*' . $manifest->name . '\s*</name>#i';
+			$replace[] = '<name>' . $newName . '</name>';
+			$pattern[] = '#<language(.*)' . $oldName . '(.*)</language>#';
+			$replace[] = '<language${1}' . $newName . '${2}</language>';
+			$contents = preg_replace($pattern, $replace, $contents);
+			$result = JFile::write($xmlFile, $contents) && $result;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$app = JFactory::getApplication();
+
+		// Codemirror or Editor None should be enabled
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from('#__extensions as a')
+			->where(
+				'(a.name =' . $db->quote('plg_editors_codemirror') .
+				' AND a.enabled = 1) OR (a.name =' .
+				$db->quote('plg_editors_none') .
+				' AND a.enabled = 1)'
+			);
+		$db->setQuery($query);
+		$state = $db->loadResult();
+
+		if ((int) $state < 1)
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_EDITOR_DISABLED'), 'warning');
+		}
+
+		// Get the form.
+		$form = $this->loadForm('com_templates.source', 'source', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		$data = $this->getSource();
+
+		$this->preprocessData('com_templates.source', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function &getSource()
+	{
+		$app = JFactory::getApplication();
+		$item = new stdClass;
+
+		if (!$this->template)
+		{
+			$this->getTemplate();
+		}
+
+		if ($this->template)
+		{
+			$input    = JFactory::getApplication()->input;
+			$fileName = base64_decode($input->get('file'));
+			$client   = JApplicationHelper::getClientInfo($this->template->client_id);
+
+			try
+			{
+				$filePath = JPath::check($client->path . '/templates/' . $this->template->element . '/' . $fileName);
+			}
+			catch (Exception $e)
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_FOUND'), 'error');
+
+				return;
+			}
+
+			if (file_exists($filePath))
+			{
+				$item->extension_id = $this->getState('extension.id');
+				$item->filename = $fileName;
+				$item->source = file_get_contents($filePath);
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_FOUND'), 'error');
+			}
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Method to store the source file contents.
+	 *
+	 * @param   array  $data  The source data to save.
+	 *
+	 * @return  boolean  True on success, false otherwise and internal error set.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		jimport('joomla.filesystem.file');
+
+		// Get the template.
+		$template = $this->getTemplate();
+
+		if (empty($template))
+		{
+			return false;
+		}
+
+		$app = JFactory::getApplication();
+		$fileName = base64_decode($app->input->get('file'));
+		$client = JApplicationHelper::getClientInfo($template->client_id);
+		$filePath = JPath::clean($client->path . '/templates/' . $template->element . '/' . $fileName);
+
+		// Include the extension plugins for the save events.
+		JPluginHelper::importPlugin('extension');
+
+		$user = get_current_user();
+		chown($filePath, $user);
+		JPath::setPermissions($filePath, '0644');
+
+		// Try to make the template file writable.
+		if (!is_writable($filePath))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_WRITABLE'), 'warning');
+			$app->enqueueMessage(JText::sprintf('COM_TEMPLATES_FILE_PERMISSIONS', JPath::getPermissions($filePath)), 'warning');
+
+			if (!JPath::isOwner($filePath))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_CHECK_FILE_OWNERSHIP'), 'warning');
+			}
+
+			return false;
+		}
+
+		// Make sure EOL is Unix
+		$data['source'] = str_replace(array("\r\n", "\r"), "\n", $data['source']);
+
+		$return = JFile::write($filePath, $data['source']);
+
+		if (!$return)
+		{
+			$app->enqueueMessage(JText::sprintf('COM_TEMPLATES_ERROR_FAILED_TO_SAVE_FILENAME', $fileName), 'error');
+
+			return false;
+		}
+
+		// Get the extension of the changed file.
+		$explodeArray = explode('.', $fileName);
+		$ext = end($explodeArray);
+
+		if ($ext == 'less')
+		{
+			$app->enqueueMessage(JText::sprintf('COM_TEMPLATES_COMPILE_LESS', $fileName));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get overrides folder.
+	 *
+	 * @param   string  $name  The name of override.
+	 * @param   string  $path  Location of override.
+	 *
+	 * @return  object  containing override name and path.
+	 *
+	 * @since   3.2
+	 */
+	public function getOverridesFolder($name,$path)
+	{
+		$folder = new stdClass;
+		$folder->name = $name;
+		$folder->path = base64_encode($path . $name);
+
+		return $folder;
+	}
+
+	/**
+	 * Get a list of overrides.
+	 *
+	 * @return  array containing overrides.
+	 *
+	 * @since   3.2
+	 */
+	public function getOverridesList()
+	{
+		if ($template = $this->getTemplate())
+		{
+			$client        = JApplicationHelper::getClientInfo($template->client_id);
+			$componentPath = JPath::clean($client->path . '/components/');
+			$modulePath    = JPath::clean($client->path . '/modules/');
+			$layoutPath    = JPath::clean(JPATH_ROOT . '/layouts/');
+			$components    = JFolder::folders($componentPath);
+
+			foreach ($components as $component)
+			{
+				if (file_exists($componentPath . '/' . $component . '/views/'))
+				{
+					$viewPath = JPath::clean($componentPath . '/' . $component . '/views/');
+				}
+				elseif (file_exists($componentPath . '/' . $component . '/view/'))
+				{
+					$viewPath = JPath::clean($componentPath . '/' . $component . '/view/');
+				}
+				else
+				{
+					$viewPath = '';
+				}
+
+				if ($viewPath)
+				{
+					$views = JFolder::folders($viewPath);
+
+					foreach ($views as $view)
+					{
+						// Only show the view has layout inside it
+						if (file_exists($viewPath . $view . '/tmpl'))
+						{
+							$result['components'][$component][] = $this->getOverridesFolder($view, $viewPath);
+						}
+					}
+				}
+			}
+
+			$modules = JFolder::folders($modulePath);
+
+			foreach ($modules as $module)
+			{
+				$result['modules'][] = $this->getOverridesFolder($module, $modulePath);
+			}
+
+			$layoutFolders = JFolder::folders($layoutPath);
+
+			foreach ($layoutFolders as $layoutFolder)
+			{
+				$layoutFolderPath = JPath::clean($layoutPath . '/' . $layoutFolder . '/');
+				$layouts = JFolder::folders($layoutFolderPath);
+
+				foreach ($layouts as $layout)
+				{
+					$result['layouts'][$layoutFolder][] = $this->getOverridesFolder($layout, $layoutFolderPath);
+				}
+			}
+
+			// Check for layouts in component folders
+			foreach ($components as $component)
+			{
+				if (file_exists($componentPath . '/' . $component . '/layouts/'))
+				{
+					$componentLayoutPath = JPath::clean($componentPath . '/' . $component . '/layouts/');
+
+					if ($componentLayoutPath)
+					{
+						$layouts = JFolder::folders($componentLayoutPath);
+
+						foreach ($layouts as $layout)
+						{
+							$result['layouts'][$component][] = $this->getOverridesFolder($layout, $componentLayoutPath);
+						}
+					}
+				}
+			}
+		}
+
+		if (!empty($result))
+		{
+			return $result;
+		}
+	}
+
+	/**
+	 * Create overrides.
+	 *
+	 * @param   string  $override  The override location.
+	 *
+	 * @return   boolean  true if override creation is successful, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function createOverride($override)
+	{
+		jimport('joomla.filesystem.folder');
+
+		if ($template = $this->getTemplate())
+		{
+			$app          = JFactory::getApplication();
+			$explodeArray = explode(DIRECTORY_SEPARATOR, $override);
+			$name         = end($explodeArray);
+			$client       = JApplicationHelper::getClientInfo($template->client_id);
+
+			if (stristr($name, 'mod_') != false)
+			{
+				$htmlPath   = JPath::clean($client->path . '/templates/' . $template->element . '/html/' . $name);
+			}
+			elseif (stristr($override, 'com_') != false)
+			{
+				$size = count($explodeArray);
+
+				$url = JPath::clean($explodeArray[$size - 3] . '/' . $explodeArray[$size - 1]);
+
+				if ($explodeArray[$size - 2] == 'layouts')
+				{
+					$htmlPath = JPath::clean($client->path . '/templates/' . $template->element . '/html/layouts/' . $url);
+				}
+				else
+				{
+					$htmlPath = JPath::clean($client->path . '/templates/' . $template->element . '/html/' . $url);
+				}
+			}
+			else
+			{
+				$layoutPath = implode('/', array_slice($explodeArray, -2));
+				$htmlPath   = JPath::clean($client->path . '/templates/' . $template->element . '/html/layouts/' . $layoutPath);
+			}
+
+			// Check Html folder, create if not exist
+			if (!JFolder::exists($htmlPath))
+			{
+				if (!JFolder::create($htmlPath))
+				{
+					$app->enqueueMessage(JText::_('COM_TEMPLATES_FOLDER_ERROR'), 'error');
+
+					return false;
+				}
+			}
+
+			if (stristr($name, 'mod_') != false)
+			{
+				$return = $this->createTemplateOverride(JPath::clean($override . '/tmpl'), $htmlPath);
+			}
+			elseif (stristr($override, 'com_') != false && stristr($override, 'layouts') == false)
+			{
+				$return = $this->createTemplateOverride(JPath::clean($override . '/tmpl'), $htmlPath);
+			}
+			else
+			{
+				$return = $this->createTemplateOverride($override, $htmlPath);
+			}
+
+			if ($return)
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_OVERRIDE_CREATED') . str_replace(JPATH_ROOT, '', $htmlPath));
+
+				return true;
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_OVERRIDE_FAILED'), 'error');
+
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Create override folder & file
+	 *
+	 * @param   string  $overridePath  The override location
+	 * @param   string  $htmlPath      The html location
+	 *
+	 * @return  boolean                True on success. False otherwise.
+	 */
+	public function createTemplateOverride($overridePath, $htmlPath)
+	{
+		$return = false;
+
+		if (empty($overridePath) || empty($htmlPath))
+		{
+			return $return;
+		}
+
+		// Get list of template folders
+		$folders = JFolder::folders($overridePath, null, true, true);
+
+		if (!empty($folders))
+		{
+			foreach ($folders as $folder)
+			{
+				$htmlFolder = $htmlPath . str_replace($overridePath, '', $folder);
+
+				if (!JFolder::exists($htmlFolder))
+				{
+					JFolder::create($htmlFolder);
+				}
+			}
+		}
+
+		// Get list of template files (Only get *.php file for template file)
+		$files = JFolder::files($overridePath, '.php', true, true);
+
+		if (empty($files))
+		{
+			return true;
+		}
+
+		foreach ($files as $file)
+		{
+			$overrideFilePath = str_replace($overridePath, '', $file);
+			$htmlFilePath = $htmlPath . $overrideFilePath;
+
+			if (JFile::exists($htmlFilePath))
+			{
+				// Generate new unique file name base on current time
+				$today = JFactory::getDate();
+				$htmlFilePath = JFile::stripExt($htmlFilePath) . '-' . $today->format('Ymd-His') . '.' . JFile::getExt($htmlFilePath);
+			}
+
+			$return = JFile::copy($file, $htmlFilePath, '', true);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Compile less using the less compiler under /build.
+	 *
+	 * @param   string  $input  The relative location of the less file.
+	 *
+	 * @return  boolean  true if compilation is successful, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function compileLess($input)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app          = JFactory::getApplication();
+			$client       = JApplicationHelper::getClientInfo($template->client_id);
+			$path         = JPath::clean($client->path . '/templates/' . $template->element . '/');
+			$inFile       = urldecode(base64_decode($input));
+			$explodeArray = explode('/', $inFile);
+			$fileName     = end($explodeArray);
+			$outFile      = reset(explode('.', $fileName));
+
+			$less = new JLess;
+			$less->setFormatter(new JLessFormatterJoomla);
+
+			try
+			{
+				$less->compileFile($path . $inFile, $path . 'css/' . $outFile . '.css');
+
+				return true;
+			}
+			catch (Exception $e)
+			{
+				$app->enqueueMessage($e->getMessage(), 'error');
+			}
+		}
+	}
+
+	/**
+	 * Delete a particular file.
+	 *
+	 * @param   string  $file  The relative location of the file.
+	 *
+	 * @return   boolean  True if file deletion is successful, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function deleteFile($file)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app      = JFactory::getApplication();
+			$client   = JApplicationHelper::getClientInfo($template->client_id);
+			$path     = JPath::clean($client->path . '/templates/' . $template->element . '/');
+			$filePath = $path . urldecode(base64_decode($file));
+
+			$return = JFile::delete($filePath);
+
+			if (!$return)
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_DELETE_FAIL'), 'error');
+
+				return false;
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Create new file.
+	 *
+	 * @param   string  $name      The name of file.
+	 * @param   string  $type      The extension of the file.
+	 * @param   string  $location  Location for the new file.
+	 *
+	 * @return  boolean  true if file created successfully, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function createFile($name, $type, $location)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app    = JFactory::getApplication();
+			$client = JApplicationHelper::getClientInfo($template->client_id);
+			$path   = JPath::clean($client->path . '/templates/' . $template->element . '/');
+
+			if (file_exists(JPath::clean($path . '/' . $location . '/' . $name . '.' . $type)))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_EXISTS'), 'error');
+
+				return false;
+			}
+
+			if (!fopen(JPath::clean($path . '/' . $location . '/' . $name . '.' . $type), 'x'))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_CREATE_ERROR'), 'error');
+
+				return false;
+			}
+
+			// Check if the format is allowed and will be showed in the backend
+			$check = $this->checkFormat($type);
+
+			// Add a message if we are not allowed to show this file in the backend.
+			if (!$check)
+			{
+				$app->enqueueMessage(JText::sprintf('COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE', $type), 'warning');
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Upload new file.
+	 *
+	 * @param   string  $file      The name of the file.
+	 * @param   string  $location  Location for the new file.
+	 *
+	 * @return   boolean  True if file uploaded successfully, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function uploadFile($file, $location)
+	{
+		jimport('joomla.filesystem.folder');
+
+		if ($template = $this->getTemplate())
+		{
+			$app      = JFactory::getApplication();
+			$client   = JApplicationHelper::getClientInfo($template->client_id);
+			$path     = JPath::clean($client->path . '/templates/' . $template->element . '/');
+			$fileName = JFile::makeSafe($file['name']);
+
+			$err = null;
+			JLoader::register('TemplateHelper', JPATH_ADMINISTRATOR . '/components/com_templates/helpers/template.php');
+
+			if (!TemplateHelper::canUpload($file, $err))
+			{
+				// Can't upload the file
+				return false;
+			}
+
+			if (file_exists(JPath::clean($path . '/' . $location . '/' . $file['name'])))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_EXISTS'), 'error');
+
+				return false;
+			}
+
+			if (!JFile::upload($file['tmp_name'], JPath::clean($path . '/' . $location . '/' . $fileName)))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_UPLOAD_ERROR'), 'error');
+
+				return false;
+			}
+
+			$url = JPath::clean($location . '/' . $fileName);
+
+			return $url;
+		}
+	}
+
+	/**
+	 * Create new folder.
+	 *
+	 * @param   string  $name      The name of the new folder.
+	 * @param   string  $location  Location for the new folder.
+	 *
+	 * @return   boolean  True if override folder is created successfully, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function createFolder($name, $location)
+	{
+		jimport('joomla.filesystem.folder');
+
+		if ($template = $this->getTemplate())
+		{
+			$app    = JFactory::getApplication();
+			$client = JApplicationHelper::getClientInfo($template->client_id);
+			$path   = JPath::clean($client->path . '/templates/' . $template->element . '/');
+
+			if (file_exists(JPath::clean($path . '/' . $location . '/' . $name . '/')))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FOLDER_EXISTS'), 'error');
+
+				return false;
+			}
+
+			if (!JFolder::create(JPath::clean($path . '/' . $location . '/' . $name)))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FOLDER_CREATE_ERROR'), 'error');
+
+				return false;
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Delete a folder.
+	 *
+	 * @param   string  $location  The name and location of the folder.
+	 *
+	 * @return  boolean  True if override folder is deleted successfully, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function deleteFolder($location)
+	{
+		jimport('joomla.filesystem.folder');
+
+		if ($template = $this->getTemplate())
+		{
+			$app    = JFactory::getApplication();
+			$client = JApplicationHelper::getClientInfo($template->client_id);
+			$path   = JPath::clean($client->path . '/templates/' . $template->element . '/' . $location);
+
+			if (!file_exists($path))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FOLDER_NOT_EXISTS'), 'error');
+
+				return false;
+			}
+
+			$return = JFolder::delete($path);
+
+			if (!$return)
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_DELETE_ERROR'), 'error');
+
+				return false;
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Rename a file.
+	 *
+	 * @param   string  $file  The name and location of the old file
+	 * @param   string  $name  The new name of the file.
+	 *
+	 * @return  string  Encoded string containing the new file location.
+	 *
+	 * @since   3.2
+	 */
+	public function renameFile($file, $name)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app          = JFactory::getApplication();
+			$client       = JApplicationHelper::getClientInfo($template->client_id);
+			$path         = JPath::clean($client->path . '/templates/' . $template->element . '/');
+			$fileName     = base64_decode($file);
+			$explodeArray = explode('.', $fileName);
+			$type         = end($explodeArray);
+			$explodeArray = explode('/', $fileName);
+			$newName      = str_replace(end($explodeArray), $name . '.' . $type, $fileName);
+
+			if (file_exists($path . $newName))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_EXISTS'), 'error');
+
+				return false;
+			}
+
+			if (!rename($path . $fileName, $path . $newName))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_RENAME_ERROR'), 'error');
+
+				return false;
+			}
+
+			return base64_encode($newName);
+		}
+	}
+
+	/**
+	 * Get an image address, height and width.
+	 *
+	 * @return  array an associative array containing image address, height and width.
+	 *
+	 * @since   3.2
+	 */
+	public function getImage()
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app      = JFactory::getApplication();
+			$client   = JApplicationHelper::getClientInfo($template->client_id);
+			$fileName = base64_decode($app->input->get('file'));
+			$path     = JPath::clean($client->path . '/templates/' . $template->element . '/');
+
+			if (stristr($client->path, 'administrator') == false)
+			{
+				$folder = '/templates/';
+			}
+			else
+			{
+				$folder = '/administrator/templates/';
+			}
+
+			$uri = JUri::root(true) . $folder . $template->element;
+
+			if (file_exists(JPath::clean($path . $fileName)))
+			{
+				$JImage = new JImage(JPath::clean($path . $fileName));
+				$image['address'] = $uri . $fileName;
+				$image['path']    = $fileName;
+				$image['height']  = $JImage->getHeight();
+				$image['width']   = $JImage->getWidth();
+			}
+
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_IMAGE_FILE_NOT_FOUND'), 'error');
+
+				return false;
+			}
+
+			return $image;
+		}
+	}
+
+	/**
+	 * Crop an image.
+	 *
+	 * @param   string  $file  The name and location of the file
+	 * @param   string  $w     width.
+	 * @param   string  $h     height.
+	 * @param   string  $x     x-coordinate.
+	 * @param   string  $y     y-coordinate.
+	 *
+	 * @return  boolean     true if image cropped successfully, false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function cropImage($file, $w, $h, $x, $y)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app      = JFactory::getApplication();
+			$client   = JApplicationHelper::getClientInfo($template->client_id);
+			$relPath  = base64_decode($file);
+			$path     = JPath::clean($client->path . '/templates/' . $template->element . '/' . $relPath);
+			$JImage   = new JImage($path);
+
+			try
+			{
+				$image = $JImage->crop($w, $h, $x, $y, true);
+				$image->toFile($path);
+
+				return true;
+			}
+			catch (Exception $e)
+			{
+				$app->enqueueMessage($e->getMessage(), 'error');
+			}
+		}
+	}
+
+	/**
+	 * Resize an image.
+	 *
+	 * @param   string  $file    The name and location of the file
+	 * @param   string  $width   The new width of the image.
+	 * @param   string  $height  The new height of the image.
+	 *
+	 * @return   boolean  true if image resize successful, false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function resizeImage($file, $width, $height)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app     = JFactory::getApplication();
+			$client  = JApplicationHelper::getClientInfo($template->client_id);
+			$relPath = base64_decode($file);
+			$path    = JPath::clean($client->path . '/templates/' . $template->element . '/' . $relPath);
+
+			$JImage = new JImage($path);
+
+			try
+			{
+				$image = $JImage->resize($width, $height, true, 1);
+				$image->toFile($path);
+
+				return true;
+			}
+			catch (Exception $e)
+			{
+				$app->enqueueMessage($e->getMessage(), 'error');
+			}
+		}
+	}
+
+	/**
+	 * Template preview.
+	 *
+	 * @return  object  object containing the id of the template.
+	 *
+	 * @since   3.2
+	 */
+	public function getPreview()
+	{
+		$app = JFactory::getApplication();
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('id, client_id');
+		$query->from('#__template_styles');
+		$query->where($db->quoteName('template') . ' = ' . $db->quote($this->template->element));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$result = $db->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			$app->enqueueMessage($e->getMessage(), 'warning');
+		}
+
+		if (empty($result))
+		{
+			$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_EXTENSION_RECORD_NOT_FOUND'), 'warning');
+		}
+		else
+		{
+			return $result;
+		}
+	}
+
+	/**
+	 * Rename a file.
+	 *
+	 * @return  mixed  array on success, false on failure
+	 *
+	 * @since   3.2
+	 */
+	public function getFont()
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app          = JFactory::getApplication();
+			$client       = JApplicationHelper::getClientInfo($template->client_id);
+			$relPath      = base64_decode($app->input->get('file'));
+			$explodeArray = explode('/', $relPath);
+			$fileName     = end($explodeArray);
+			$path         = JPath::clean($client->path . '/templates/' . $template->element . '/' . $relPath);
+
+			if (stristr($client->path, 'administrator') == false)
+			{
+				$folder = '/templates/';
+			}
+			else
+			{
+				$folder = '/administrator/templates/';
+			}
+
+			$uri = JUri::root(true) . $folder . $template->element;
+
+			if (file_exists(JPath::clean($path)))
+			{
+				$font['address'] = $uri . $relPath;
+
+				$font['rel_path'] = $relPath;
+
+				$font['name'] = $fileName;
+			}
+
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FONT_FILE_NOT_FOUND'), 'error');
+
+				return false;
+			}
+
+			return $font;
+		}
+	}
+
+	/**
+	 * Copy a file.
+	 *
+	 * @param   string  $newName   The name of the copied file
+	 * @param   string  $location  The final location where the file is to be copied
+	 * @param   string  $file      The name and location of the file
+	 *
+	 * @return   boolean  true if image resize successful, false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function copyFile($newName, $location, $file)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app          = JFactory::getApplication();
+			$client       = JApplicationHelper::getClientInfo($template->client_id);
+			$relPath      = base64_decode($file);
+			$explodeArray = explode('.', $relPath);
+			$ext          = end($explodeArray);
+			$path         = JPath::clean($client->path . '/templates/' . $template->element . '/');
+			$newPath      = JPath::clean($path . '/' . $location . '/' . $newName . '.' . $ext);
+
+			if (file_exists($newPath))
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_EXISTS'), 'error');
+
+				return false;
+			}
+
+			if (JFile::copy($path . $relPath, $newPath))
+			{
+				$app->enqueueMessage(JText::sprintf('COM_TEMPLATES_FILE_COPY_SUCCESS', $newName . '.' . $ext));
+
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Get the compressed files.
+	 *
+	 * @return   array if file exists, false otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function getArchive()
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app     = JFactory::getApplication();
+			$client  = JApplicationHelper::getClientInfo($template->client_id);
+			$relPath = base64_decode($app->input->get('file'));
+			$path    = JPath::clean($client->path . '/templates/' . $template->element . '/' . $relPath);
+
+			if (file_exists(JPath::clean($path)))
+			{
+				$files = array();
+				$zip = new ZipArchive;
+
+				if ($zip->open($path) === true)
+				{
+					for ($i = 0; $i < $zip->numFiles; $i++)
+					{
+						$entry = $zip->getNameIndex($i);
+						$files[] = $entry;
+					}
+				}
+				else
+				{
+					$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_OPEN_FAIL'), 'error');
+
+					return false;
+				}
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_ERROR_FONT_FILE_NOT_FOUND'), 'error');
+
+				return false;
+			}
+
+			return $files;
+		}
+	}
+
+	/**
+	 * Extract contents of an archive file.
+	 *
+	 * @param   string  $file  The name and location of the file
+	 *
+	 * @return  boolean  true if image extraction is successful, false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function extractArchive($file)
+	{
+		if ($template = $this->getTemplate())
+		{
+			$app          = JFactory::getApplication();
+			$client       = JApplicationHelper::getClientInfo($template->client_id);
+			$relPath      = base64_decode($file);
+			$explodeArray = explode('/', $relPath);
+			$fileName     = end($explodeArray);
+			$folderPath   = stristr($relPath, $fileName, true);
+			$path         = JPath::clean($client->path . '/templates/' . $template->element . '/' . $folderPath . '/');
+
+			if (file_exists(JPath::clean($path . '/' . $fileName)))
+			{
+				$zip = new ZipArchive;
+
+				if ($zip->open(JPath::clean($path . '/' . $fileName)) === true)
+				{
+					for ($i = 0; $i < $zip->numFiles; $i++)
+					{
+						$entry = $zip->getNameIndex($i);
+
+						if (file_exists(JPath::clean($path . '/' . $entry)))
+						{
+							$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_EXISTS'), 'error');
+
+							return false;
+						}
+					}
+
+					$zip->extractTo($path);
+
+					return true;
+				}
+				else
+				{
+					$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_OPEN_FAIL'), 'error');
+
+					return false;
+				}
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('COM_TEMPLATES_FILE_ARCHIVE_NOT_FOUND'), 'error');
+
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Check if the extension is allowed and will be shown in the template manager
+	 *
+	 * @param   string  $ext  The extension to check if it is allowed
+	 *
+	 * @return  boolean  true if the extension is allowed false otherwise
+	 *
+	 * @since   3.6.0
+	 */
+	protected function checkFormat($ext)
+	{
+		if (!isset($this->allowedFormats))
+		{
+			$params       = JComponentHelper::getParams('com_templates');
+			$imageTypes   = explode(',', $params->get('image_formats'));
+			$sourceTypes  = explode(',', $params->get('source_formats'));
+			$fontTypes    = explode(',', $params->get('font_formats'));
+			$archiveTypes = explode(',', $params->get('compressed_formats'));
+
+			$this->allowedFormats = array_merge($imageTypes, $sourceTypes, $fontTypes, $archiveTypes);
+		}
+
+		return in_array($ext, $this->allowedFormats);
+	}
+}
diff --git a/core/administrator/components/com_templates/models/templates.php b/core/administrator/components/com_templates/models/templates.php
new file mode 100644
index 00000000..77e2e1b2
--- /dev/null
+++ b/core/administrator/components/com_templates/models/templates.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of template extension records.
+ *
+ * @since  1.6
+ */
+class TemplatesModelTemplates extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JControllerLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'folder', 'a.folder',
+				'element', 'a.element',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'state', 'a.state',
+				'enabled', 'a.enabled',
+				'ordering', 'a.ordering',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Override parent getItems to add extra XML metadata.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+
+		foreach ($items as &$item)
+		{
+			$client = JApplicationHelper::getClientInfo($item->client_id);
+			$item->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $item->element);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.extension_id, a.name, a.element, a.client_id'
+			)
+		);
+		$query->from($db->quoteName('#__extensions', 'a'))
+			->where($db->quoteName('a.client_id') . ' = ' . (int) $this->getState('client_id'))
+			->where($db->quoteName('a.enabled') . ' = 1')
+			->where($db->quoteName('a.type') . ' = ' . $db->quote('template'));
+
+		// Filter by search in title.
+		if ($search = $this->getState('filter.search'))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->quoteName('a.id') . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . strtolower($search) . '%');
+				$query->where('(' . ' LOWER(a.element) LIKE ' . $search . ' OR LOWER(a.name) LIKE ' . $search . ')');
+			}
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.element')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('client_id');
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.element', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		// Special case for the client id.
+		$clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int');
+		$clientId = (!in_array($clientId, array (0, 1))) ? 0 : $clientId;
+		$this->setState('client_id', $clientId);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_templates');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+}
diff --git a/core/administrator/components/com_templates/tables/style.php b/core/administrator/components/com_templates/tables/style.php
new file mode 100644
index 00000000..08bec641
--- /dev/null
+++ b/core/administrator/components/com_templates/tables/style.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Template style table class.
+ *
+ * @since  1.6
+ */
+class TemplatesTableStyle extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  &$db  A database connector object
+	 *
+	 * @since   1.6
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__template_styles', 'id', $db);
+	}
+
+	/**
+	 * Overloaded bind function to pre-process the params.
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  null|string	null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @since   1.6
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		// Verify that the default style is not unset
+		if ($array['home'] == '0' && $this->home == '1')
+		{
+			$this->setError(JText::_('COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE'));
+
+			return false;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check method to ensure data integrity.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function check()
+	{
+		if (empty($this->title))
+		{
+			$this->setError(JText::_('COM_TEMPLATES_ERROR_STYLE_REQUIRES_TITLE'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded store method to ensure unicity of default style.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		if ($this->home != '0')
+		{
+			$query = $this->_db->getQuery(true)
+				->update('#__template_styles')
+				->set('home=\'0\'')
+				->where('client_id=' . (int) $this->client_id)
+				->where('home=' . $this->_db->quote($this->home));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Overloaded store method to unsure existence of a default style for a template.
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function delete($pk = null)
+	{
+		$k = $this->_tbl_key;
+		$pk = is_null($pk) ? $this->$k : $pk;
+
+		if (!is_null($pk))
+		{
+			$query = $this->_db->getQuery(true)
+				->from('#__template_styles')
+				->select('id')
+				->where('client_id=' . (int) $this->client_id)
+				->where('template=' . $this->_db->quote($this->template));
+			$this->_db->setQuery($query);
+			$results = $this->_db->loadColumn();
+
+			if (count($results) == 1 && $results[0] == $pk)
+			{
+				$this->setError(JText::_('COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE'));
+
+				return false;
+			}
+		}
+
+		return parent::delete($pk);
+	}
+}
diff --git a/core/administrator/components/com_templates/templates.php b/core/administrator/components/com_templates/templates.php
new file mode 100644
index 00000000..0e902ffb
--- /dev/null
+++ b/core/administrator/components/com_templates/templates.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_templates'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+JLoader::register('TemplatesHelper', __DIR__ . '/helpers/templates.php');
+
+$controller = JControllerLegacy::getInstance('Templates');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_templates/templates.xml b/core/administrator/components/com_templates/templates.xml
new file mode 100644
index 00000000..4335da1e
--- /dev/null
+++ b/core/administrator/components/com_templates/templates.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_templates</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_TEMPLATES_XML_DESCRIPTION</description>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>templates.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>tables</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_templates.ini</language>
+			<language tag="en-GB">language/en-GB.com_templates.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
+
diff --git a/core/administrator/components/com_templates/views/style/tmpl/edit.php b/core/administrator/components/com_templates/views/style/tmpl/edit.php
new file mode 100644
index 00000000..610ff986
--- /dev/null
+++ b/core/administrator/components/com_templates/views/style/tmpl/edit.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+$user = JFactory::getUser();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'style.cancel' || document.formvalidator.isValid(document.getElementById('style-form'))) {
+			Joomla.submitform(task, document.getElementById('style-form'));
+		}
+	};
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_templates&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+
+	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+
+	<div class="form-horizontal">
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('JDETAILS')); ?>
+
+		<div class="row-fluid">
+			<div class="span9">
+				<h2>
+					<?php echo JText::_($this->item->template); ?>
+				</h2>
+				<div class="info-labels">
+					<span class="label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_FIELD_CLIENT_LABEL'); ?>">
+						<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
+					</span>
+				</div>
+				<div>
+					<p><?php echo JText::_($this->item->xml->description); ?></p>
+					<?php
+					$this->fieldset = 'description';
+					$description = JLayoutHelper::render('joomla.edit.fieldset', $this);
+					?>
+					<?php if ($description) : ?>
+						<p class="readmore">
+							<a href="#" onclick="jQuery('.nav-tabs a[href=\'#description\']').tab('show');">
+								<?php echo JText::_('JGLOBAL_SHOW_FULL_DESCRIPTION'); ?>
+							</a>
+						</p>
+					<?php endif; ?>
+				</div>
+				<?php
+				$this->fieldset = 'basic';
+				$html = JLayoutHelper::render('joomla.edit.fieldset', $this);
+				echo $html ? '<hr />' . $html : '';
+				?>
+			</div>
+			<div class="span3">
+				<?php
+				// Set main fields.
+				$this->fields = array(
+					'home',
+					'client_id',
+					'template'
+				);
+				?>
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			</div>
+		</div>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php if ($description) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
+			<?php echo $description; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php
+		$this->fieldsets = array();
+		$this->ignore_fieldsets = array('basic', 'description');
+		echo JLayoutHelper::render('joomla.edit.params', $this);
+		?>
+
+		<?php if ($user->authorise('core.edit', 'com_menus') && $this->item->client_id == 0 && $this->canDo->get('core.edit.state')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'assignment', JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT')); ?>
+			<?php echo $this->loadTemplate('assignment'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/core/administrator/components/com_templates/views/style/tmpl/edit_assignment.php
new file mode 100644
index 00000000..e3467788
--- /dev/null
+++ b/core/administrator/components/com_templates/views/style/tmpl/edit_assignment.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Initiasile related data.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+$menuTypes = MenusHelper::getMenuLinks();
+$user      = JFactory::getUser();
+?>
+<label id="jform_menuselect-lbl" for="jform_menuselect"><?php echo JText::_('JGLOBAL_MENU_SELECTION'); ?></label>
+<div class="btn-toolbar">
+	<button class="btn jform-rightbtn" type="button" onclick="jQuery('.chk-menulink').attr('checked', !jQuery('.chk-menulink').attr('checked'));">
+		<span class="icon-checkbox-partial" aria-hidden="true"></span> <?php echo JText::_('JGLOBAL_SELECTION_INVERT_ALL'); ?>
+	</button>
+</div>
+<div id="menu-assignment">
+	<ul class="menu-links">
+
+		<?php foreach ($menuTypes as &$type) : ?>
+			<li>
+				<div class="menu-links-block">
+					<button class="btn jform-rightbtn" type="button" onclick="jQuery('.<?php echo $type->menutype; ?>').attr('checked', !jQuery('.<?php echo $type->menutype; ?>').attr('checked'));">
+						<span class="icon-checkbox-partial" aria-hidden="true"></span> <?php echo JText::_('JGLOBAL_SELECTION_INVERT'); ?>
+					</button>
+					<h5><?php echo $type->title ?: $type->menutype; ?></h5>
+	
+					<?php foreach ($type->links as $link) : ?>
+						<label class="checkbox small" for="link<?php echo (int) $link->value; ?>" >
+						<input type="checkbox" name="jform[assigned][]" value="<?php echo (int) $link->value; ?>" id="link<?php echo (int) $link->value; ?>"<?php if ($link->template_style_id == $this->item->id) : ?> checked="checked"<?php endif; ?><?php if ($link->checked_out && $link->checked_out != $user->id) : ?> disabled="disabled"<?php else : ?> class="chk-menulink <?php echo $type->menutype; ?>"<?php endif; ?> />
+						<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $link->level)) . $link->text; ?>
+						</label>
+					<?php endforeach; ?>
+
+				</div>
+			</li>
+		<?php endforeach; ?>
+
+	</ul>
+</div>
diff --git a/core/administrator/components/com_templates/views/style/tmpl/edit_options.php b/core/administrator/components/com_templates/views/style/tmpl/edit_options.php
new file mode 100644
index 00000000..a68dbfd1
--- /dev/null
+++ b/core/administrator/components/com_templates/views/style/tmpl/edit_options.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load chosen.css
+JHtml::_('formbehavior.chosen', 'select');
+
+?>
+<?php
+	echo JHtml::_('bootstrap.startAccordion', 'templatestyleOptions', array('active' => 'collapse0'));
+	$fieldSets = $this->form->getFieldsets('params');
+	$i = 0;
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_TEMPLATES_' . $name . '_FIELDSET_LABEL';
+		echo JHtml::_('bootstrap.addSlide', 'templatestyleOptions', JText::_($label), 'collapse' . ($i++));
+			if (isset($fieldSet->description) && trim($fieldSet->description)) :
+				echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+			endif;
+			?>
+				<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php echo $field->input; ?>
+						</div>
+					</div>
+				<?php endforeach;
+		echo JHtml::_('bootstrap.endSlide');
+	endforeach;
+echo JHtml::_('bootstrap.endAccordion');
diff --git a/core/administrator/components/com_templates/views/style/view.html.php b/core/administrator/components/com_templates/views/style/view.html.php
new file mode 100644
index 00000000..3eee1842
--- /dev/null
+++ b/core/administrator/components/com_templates/views/style/view.html.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a template style.
+ *
+ * @since  1.6
+ */
+class TemplatesViewStyle extends JViewLegacy
+{
+	/**
+	 * The JObject (on success, false on failure)
+	 *
+	 * @var   JObject
+	 */
+	protected $item;
+
+	/**
+	 * The form object
+	 *
+	 * @var   JForm
+	 */
+	protected $form;
+
+	/**
+	 * The model state
+	 *
+	 * @var   JObject
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+		$this->form  = $this->get('Form');
+		$this->canDo = JHelperContent::getActions('com_templates');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$isNew = ($this->item->id == 0);
+		$canDo = $this->canDo;
+
+		JToolbarHelper::title(
+			$isNew ? JText::_('COM_TEMPLATES_MANAGER_ADD_STYLE')
+			: JText::_('COM_TEMPLATES_MANAGER_EDIT_STYLE'), 'eye thememanager'
+		);
+
+		// If not checked out, can save the item.
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::apply('style.apply');
+			JToolbarHelper::save('style.save');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('style.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('style.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('style.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+
+		// Get the help information for the template item.
+		$lang = JFactory::getLanguage();
+		$help = $this->get('Help');
+
+		if ($lang->hasKey($help->url))
+		{
+			$debug = $lang->setDebug(false);
+			$url = JText::_($help->url);
+			$lang->setDebug($debug);
+		}
+		else
+		{
+			$url = null;
+		}
+
+		JToolbarHelper::help($help->key, false, $url);
+	}
+}
diff --git a/core/administrator/components/com_templates/views/style/view.json.php b/core/administrator/components/com_templates/views/style/view.json.php
new file mode 100644
index 00000000..fdc2d73b
--- /dev/null
+++ b/core/administrator/components/com_templates/views/style/view.json.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a template style.
+ *
+ * @since  1.6
+ */
+class TemplatesViewStyle extends JViewLegacy
+{
+	/**
+	 * The JObject (on success, false on failure)
+	 *
+	 * @var   JObject
+	 */
+	protected $item;
+
+	/**
+	 * The form object
+	 *
+	 * @var   JForm
+	 */
+	protected $form;
+
+	/**
+	 * The model state
+	 *
+	 * @var   JObject
+	 */
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		try
+		{
+			$this->item = $this->get('Item');
+		}
+		catch (Exception $e)
+		{
+			$app = JFactory::getApplication();
+			$app->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		$paramsList = $this->item->getProperties();
+
+		unset($paramsList['xml']);
+
+		$paramsList = json_encode($paramsList);
+
+		return $paramsList;
+
+	}
+}
diff --git a/core/administrator/components/com_templates/views/styles/tmpl/default.php b/core/administrator/components/com_templates/views/styles/tmpl/default.php
new file mode 100644
index 00000000..9e76138f
--- /dev/null
+++ b/core/administrator/components/com_templates/views/styles/tmpl/default.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$clientId = (int) $this->state->get('client_id', 0);
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$colSpan = $clientId === 1 ? 5 : 6;
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_templates&view=styles'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'client_id'))); ?>
+		<?php if ($this->total > 0) : ?>
+			<table class="table table-striped" id="styleList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							&#160;
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_STYLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_DEFAULT', 'a.home', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($clientId === 0) : ?>
+						<th width="20%" class="nowrap hidden-phone">
+							<?php echo JText::_('COM_TEMPLATES_HEADING_PAGES'); ?>
+						</th>
+						<?php endif; ?>
+						<th width="30%" class="hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.template', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="<?php echo $colSpan; ?>">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) :
+						$canCreate = $user->authorise('core.create',     'com_templates');
+						$canEdit   = $user->authorise('core.edit',       'com_templates');
+						$canChange = $user->authorise('core.edit.state', 'com_templates');
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td width="1%" class="center">
+							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						</td>
+						<td>
+							<?php if ($this->preview && $item->client_id == '0') : ?>
+								<a target="_blank" href="<?php echo JUri::root() . 'index.php?tp=1&templateStyle=' . (int) $item->id ?>" class="jgrid">
+								<span class="icon-eye-open hasTooltip" aria-hidden="true" title="<?php echo JHtml::_('tooltipText', JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'), $item->title, 0); ?>"></span>
+								<span class="element-invisible"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></span>
+								</a>
+							<?php elseif ($item->client_id == '1') : ?>
+								<span class="icon-eye-close disabled hasTooltip" aria-hidden="true" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>"></span>
+								<span class="element-invisible"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?></span>
+							<?php else: ?>
+								<span class="icon-eye-close disabled hasTooltip" aria-hidden="true" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"></span>
+								<span class="element-invisible"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
+							<?php endif; ?>
+							<?php if ($canEdit) : ?>
+							<a href="<?php echo JRoute::_('index.php?option=com_templates&task=style.edit&id=' . (int) $item->id); ?>">
+								<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php if ($item->home == '0' || $item->home == '1') : ?>
+								<?php echo JHtml::_('jgrid.isdefault', $item->home != '0', $i, 'styles.', $canChange && $item->home != '1'); ?>
+							<?php elseif ($canChange) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_templates&task=styles.unsetDefault&cid[]=' . $item->id . '&' . JSession::getFormToken() . '=1'); ?>">
+									<?php if ($item->image) : ?>
+										<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
+									<?php else : ?>
+										<span class="label" title="<?php echo JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+									<?php endif; ?>
+								</a>
+							<?php else : ?>
+								<?php if ($item->image) : ?>
+									<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
+								<?php else : ?>
+									<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+								<?php endif; ?>
+							<?php endif; ?>
+						</td>
+						<?php if ($clientId === 0) : ?>
+						<td class="small hidden-phone">
+							<?php if ($item->home == '1') : ?>
+								<?php echo JText::_('COM_TEMPLATES_STYLES_PAGES_ALL'); ?>
+							<?php elseif ($item->home != '0' && $item->home != '1') : ?>
+								<?php echo JText::sprintf('COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE', $this->escape($item->language_title)); ?>
+							<?php elseif ($item->assigned > 0) : ?>
+								<?php echo JText::sprintf('COM_TEMPLATES_STYLES_PAGES_SELECTED', $this->escape($item->assigned)); ?>
+							<?php else : ?>
+								<?php echo JText::_('COM_TEMPLATES_STYLES_PAGES_NONE'); ?>
+							<?php endif; ?>
+						</td>
+						<?php endif; ?>
+						<td class="hidden-phone hidden-tablet">
+							<label for="cb<?php echo $i; ?>" class="small">
+								<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . (int) $item->e_id); ?>  ">
+									<?php echo ucfirst($this->escape($item->template)); ?>
+								</a>
+							</label>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_templates/views/styles/tmpl/default.xml b/core/administrator/components/com_templates/views/styles/tmpl/default.xml
new file mode 100755
index 00000000..95ef7adb
--- /dev/null
+++ b/core/administrator/components/com_templates/views/styles/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_TEMPLATES_STYLE_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_TEMPLATES_STYLE_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_templates/views/styles/view.html.php b/core/administrator/components/com_templates/views/styles/view.html.php
new file mode 100644
index 00000000..937f940c
--- /dev/null
+++ b/core/administrator/components/com_templates/views/styles/view.html.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of template styles.
+ *
+ * @since  1.6
+ */
+class TemplatesViewStyles extends JViewLegacy
+{
+	protected $items;
+
+	protected $pagination;
+
+	protected $state;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->total         = $this->get('Total');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->preview       = JComponentHelper::getParams('com_templates')->get('template_positions_display');
+
+		TemplatesHelper::addSubmenu('styles');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_templates');
+
+		// Set the title.
+		if ((int) $this->get('State')->get('client_id') === 1)
+		{
+			JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_STYLES_ADMIN'), 'eye thememanager');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_STYLES_SITE'), 'eye thememanager');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::makeDefault('styles.setDefault', 'COM_TEMPLATES_TOOLBAR_SET_HOME');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('style.edit');
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::custom('styles.duplicate', 'copy.png', 'copy_f2.png', 'JTOOLBAR_DUPLICATE', true);
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'styles.delete', 'JTOOLBAR_DELETE');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_templates');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES');
+
+		JHtmlSidebar::setAction('index.php?option=com_templates&view=styles');
+
+	}
+}
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default.php b/core/administrator/components/com_templates/views/template/tmpl/default.php
new file mode 100644
index 00000000..b6fa01ec
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default.php
@@ -0,0 +1,504 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.tabstate');
+
+$input = JFactory::getApplication()->input;
+
+// No access if not global SuperUser
+if (!JFactory::getUser()->authorise('core.admin'))
+{
+	JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+}
+
+if ($this->type == 'image')
+{
+	JHtml::_('script', 'system/jquery.Jcrop.min.js', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', 'system/jquery.Jcrop.min.css', array('version' => 'auto', 'relative' => true));
+}
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($){
+
+	// Hide all the folder when the page loads
+	$('.folder ul, .component-folder ul, .layout-folder ul').hide();
+
+	// Display the tree after loading
+	$('.directory-tree').removeClass('directory-tree');
+
+	// Show all the lists in the path of an open file
+	$('.show > ul').show();
+
+	// Stop the default action of anchor tag on a click event
+	$('.folder-url, .component-folder-url, .layout-folder-url').click(function(event){
+		event.preventDefault();
+	});
+
+	// Prevent the click event from proliferating
+	$('.file, .component-file-url').bind('click',function(e){
+		e.stopPropagation();
+	});
+
+	// Toggle the child indented list on a click event
+	$('.folder, .component-folder, .layout-folder').bind('click',function(e){
+		$(this).children('ul').toggle();
+		e.stopPropagation();
+	});
+
+	// New file tree
+	$('#fileModal .folder-url').bind('click',function(e){
+		$('.folder-url').removeClass('selected');
+		e.stopPropagation();
+		$('#fileModal input.address').val($(this).attr('data-id'));
+		$(this).addClass('selected');
+	});
+
+	// Folder manager tree
+	$('#folderModal .folder-url').bind('click',function(e){
+		$('.folder-url').removeClass('selected');
+		e.stopPropagation();
+		$('#folderModal input.address').val($(this).attr('data-id'));
+		$(this).addClass('selected');
+	});
+
+	var containerDiv = document.querySelector('.span3.tree-holder'),
+		treeContainer = containerDiv.querySelector('.nav.nav-list'),
+		liEls = treeContainer.querySelectorAll('.folder.show'),
+		filePathEl = document.querySelector('p.lead.hidden.path');
+
+	if(filePathEl)
+		var filePathTmp = document.querySelector('p.lead.hidden.path').innerText;
+
+	 if(filePathTmp && filePathTmp.charAt( 0 ) === '/' ) {
+			filePathTmp = filePathTmp.slice( 1 );
+			filePathTmp = filePathTmp.split('/');
+			filePathTmp = filePathTmp[filePathTmp.length - 1];
+			var re = new RegExp( filePathTmp );
+
+		for (var i = 0, l = liEls.length; i < l; i++) {
+			liEls[i].querySelector('a').classList.add('active');
+			if (i === liEls.length - 1) {
+				var parentUl = liEls[i].querySelector('ul'),
+					allLi = parentUl.querySelectorAll('li'); 
+	
+				for (var i = 0, l = allLi.length; i < l; i++) {
+					aEl = allLi[i].querySelector('a'),
+					spanEl = aEl.querySelector('span');
+	
+					if (spanEl && re.test(spanEl.innerText)) {
+						aEl.classList.add('active');
+					}
+				}
+			}
+		}
+	}
+});");
+
+if ($this->type == 'image')
+{
+	JFactory::getDocument()->addScriptDeclaration("
+		jQuery(document).ready(function($) {
+			var jcrop_api;
+
+			// Configuration for image cropping
+			$('#image-crop').Jcrop({
+				onChange:   showCoords,
+				onSelect:   showCoords,
+				onRelease:  clearCoords,
+				trueSize:   [" . $this->image['width'] . ',' . $this->image['height'] . "]
+			},function(){
+				jcrop_api = this;
+			});
+
+			// Function for calculating the crop coordinates
+			function showCoords(c)
+			{
+				$('#x').val(c.x);
+				$('#y').val(c.y);
+				$('#w').val(c.w);
+				$('#h').val(c.h);
+			};
+
+			// Function for clearing the coordinates
+			function clearCoords()
+			{
+				$('#adminForm input').val('');
+			};
+		});");
+}
+
+JFactory::getDocument()->addStyleDeclaration('
+	/* Styles for modals */
+	.selected{
+		background: #08c;
+		color: #fff;
+	}
+	.selected:hover{
+		background: #08c !important;
+		color: #fff;
+	}
+	.modal-body .column-left {
+		float: left; max-height: 70vh; overflow-y: auto;
+	}
+	.modal-body .column-right {
+		float: right;
+	}
+	@media (max-width: 767px) {
+		.modal-body .column-right {
+			float: left;
+		}
+	}
+	#deleteFolder{
+		margin: 0;
+	}
+
+	#image-crop{
+		max-width: 100% !important;
+		width: auto;
+		height: auto;
+	}
+
+	.directory-tree{
+		display: none;
+	}
+
+	.tree-holder{
+		overflow-x: auto;
+	}
+');
+
+if ($this->type == 'font')
+{
+	JFactory::getDocument()->addStyleDeclaration(
+			"/* Styles for font preview */
+		@font-face
+		{
+			font-family: previewFont;
+			src: url('" . $this->font['address'] . "')
+		}
+
+		.font-preview{
+			font-family: previewFont !important;
+		}"
+	);
+}
+?>
+<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'editor')); ?>
+<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'editor', JText::_('COM_TEMPLATES_TAB_EDITOR')); ?>
+<div class="row-fluid">
+	<div class="span12">
+		<?php if ($this->type == 'file') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
+		<?php endif; ?>
+		<?php if ($this->type == 'image') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->image['path']; ?></p>
+
+		<?php endif; ?>
+		<?php if ($this->type == 'font') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->font['rel_path']; ?></p>
+
+		<?php endif; ?>
+	</div>
+</div>
+<div class="row-fluid">
+	<div class="span3 tree-holder">
+		<?php echo $this->loadTemplate('tree'); ?>
+	</div>
+	<div class="span9">
+		<?php if ($this->type == 'home') : ?>
+			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+				<input type="hidden" name="task" value="" />
+				<?php echo JHtml::_('form.token'); ?>
+				<div class="hero-unit" style="text-align: justify;">
+					<h2><?php echo JText::_('COM_TEMPLATES_HOME_HEADING'); ?></h2>
+					<p><?php echo JText::_('COM_TEMPLATES_HOME_TEXT'); ?></p>
+					<p>
+						<a href="https://docs.joomla.org/Special:MyLanguage/J3.x:How_to_use_the_Template_Manager" target="_blank" class="btn btn-primary btn-large">
+							<?php echo JText::_('COM_TEMPLATES_HOME_BUTTON'); ?>
+						</a>
+					</p>
+				</div>
+			</form>
+		<?php endif; ?>
+		<?php if ($this->type == 'file') : ?>
+			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+
+				<div class="editor-border">
+					<?php echo $this->form->getInput('source'); ?>
+				</div>
+				<input type="hidden" name="task" value="" />
+				<?php echo JHtml::_('form.token'); ?>
+				<?php echo $this->form->getInput('extension_id'); ?>
+				<?php echo $this->form->getInput('filename'); ?>
+
+			</form>
+		<?php endif; ?>
+		<?php if ($this->type == 'archive') : ?>
+			<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
+			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+				<ul class="nav nav-stacked nav-list well">
+					<?php foreach ($this->archive as $file) : ?>
+						<li>
+							<?php if (substr($file, -1) === DIRECTORY_SEPARATOR) : ?>
+								<span class="icon-folder" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+							<?php endif; ?>
+							<?php if (substr($file, -1) != DIRECTORY_SEPARATOR) : ?>
+								<span class="icon-file" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+							<?php endif; ?>
+						</li>
+					<?php endforeach; ?>
+				</ul>
+				<input type="hidden" name="task" value="" />
+				<?php echo JHtml::_('form.token'); ?>
+
+			</form>
+		<?php endif; ?>
+		<?php if ($this->type == 'image') : ?>
+			<img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>" />
+			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+				<fieldset class="adminform">
+					<input type ="hidden" id="x" name="x" />
+					<input type ="hidden" id="y" name="y" />
+					<input type ="hidden" id="h" name="h" />
+					<input type ="hidden" id="w" name="w" />
+					<input type="hidden" name="task" value="" />
+					<?php echo JHtml::_('form.token'); ?>
+				</fieldset>
+			</form>
+		<?php endif; ?>
+		<?php if ($this->type == 'font') : ?>
+			<div class="font-preview">
+				<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+					<fieldset class="adminform">
+						<p class="lead">H1</p><h1>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h1>
+						<p class="lead">H2</p><h2>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h2>
+						<p class="lead">H3</p><h3>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h3>
+						<p class="lead">H4</p><h4>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h4>
+						<p class="lead">H5</p><h5>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h5>
+						<p class="lead">H6</p> <h6>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h6>
+						<p class="lead">Bold</p><b>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </b>
+						<p class="lead">Italics</p><i>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </i>
+						<p class="lead">Unordered List</p>
+						<ul>
+							<li>Item</li>
+							<li>Item</li>
+							<li>Item<br />
+								<ul>
+									<li>Item</li>
+									<li>Item</li>
+									<li>Item<br />
+										<ul>
+											<li>Item</li>
+											<li>Item</li>
+											<li>Item</li>
+										</ul>
+									</li>
+								</ul>
+							</li>
+						</ul>
+						<p class="lead">Ordered List</p>
+						<ol>
+							<li>Item</li>
+							<li>Item</li>
+							<li>Item<br />
+								<ul>
+									<li>Item</li>
+									<li>Item</li>
+									<li>Item<br />
+										<ul>
+											<li>Item</li>
+											<li>Item</li>
+											<li>Item</li>
+										</ul>
+									</li>
+								</ul>
+							</li>
+						</ol>
+						<input type="hidden" name="task" value="" />
+						<?php echo JHtml::_('form.token'); ?>
+					</fieldset>
+				</form>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>
+<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'overrides', JText::_('COM_TEMPLATES_TAB_OVERRIDES')); ?>
+<div class="row-fluid">
+	<div class="span4">
+		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_MODULES'); ?></legend>
+		<ul class="nav nav-list">
+			<?php $token = JSession::getFormToken() . '=' . 1; ?>
+			<?php foreach ($this->overridesList['modules'] as $module) : ?>
+				<li>
+					<?php
+					$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $module->path
+							. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
+					?>
+					<a href="<?php echo JRoute::_($overrideLinkUrl); ?>">
+						<span class="icon-copy" aria-hidden="true"></span>&nbsp;<?php echo $module->name; ?>
+					</a>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+	<div class="span4">
+		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_COMPONENTS'); ?></legend>
+		<ul class="nav nav-list">
+			<?php $token = JSession::getFormToken() . '=' . 1; ?>
+			<?php foreach ($this->overridesList['components'] as $key => $value) : ?>
+				<li class="component-folder">
+					<a href="#" class="component-folder-url">
+						<span class="icon-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
+					</a>
+					<ul class="nav nav-list">
+						<?php foreach ($value as $view) : ?>
+							<li>
+								<?php
+								$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $view->path
+										. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
+								?>
+								<a class="component-file-url" href="<?php echo JRoute::_($overrideLinkUrl); ?>">
+									<span class="icon-copy" aria-hidden="true"></span>&nbsp;<?php echo $view->name; ?>
+								</a>
+							</li>
+						<?php endforeach; ?>
+					</ul>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+	<div class="span4">
+		<legend><?php echo JText::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'); ?></legend>
+		<ul class="nav nav-list">
+			<?php $token = JSession::getFormToken() . '=' . 1; ?>
+			<?php foreach ($this->overridesList['layouts'] as $key => $value) : ?>
+			<li class="layout-folder">
+				<a href="#" class="layout-folder-url">
+					<span class="icon-folder" aria-hidden="true"></span>&nbsp;<?php echo $key; ?>
+				</a>
+				<ul class="nav nav-list">
+					<?php foreach ($value as $layout) : ?>
+						<li>
+							<?php
+							$overrideLinkUrl = 'index.php?option=com_templates&view=template&task=template.overrides&folder=' . $layout->path
+									. '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token;
+							?>
+							<a href="<?php echo JRoute::_($overrideLinkUrl); ?>">
+								<span class="icon-copy" aria-hidden="true"></span>&nbsp;<?php echo $layout->name; ?>
+							</a>
+						</li>
+					<?php endforeach; ?>
+				</ul>
+			</li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+</div>
+<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('COM_TEMPLATES_TAB_DESCRIPTION')); ?>
+<?php echo $this->loadTemplate('description'); ?>
+<?php echo JHtml::_('bootstrap.endTab'); ?>
+<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+<?php // Collapse Modal
+$copyModalData = array(
+	'selector' => 'copyModal',
+	'params'   => array(
+		'title'  => JText::_('COM_TEMPLATES_TEMPLATE_COPY'),
+		'footer' => $this->loadTemplate('modal_copy_footer'),
+	),
+	'body'     => $this->loadTemplate('modal_copy_body'),
+);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_templates&task=template.copy&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
+	<?php echo JLayoutHelper::render('joomla.modal.main', $copyModalData); ?>
+	<?php echo JHtml::_('form.token'); ?>
+</form>
+<?php if ($this->type != 'home') : ?>
+	<?php // Rename Modal
+	$renameModalData = array(
+		'selector' => 'renameModal',
+		'params'   => array(
+			'title'  => JText::sprintf('COM_TEMPLATES_RENAME_FILE', $this->fileName),
+			'footer' => $this->loadTemplate('modal_rename_footer'),
+		),
+		'body'     => $this->loadTemplate('modal_rename_body'),
+	);
+	?>
+	<form action="<?php echo JRoute::_('index.php?option=com_templates&task=template.renameFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post">
+		<?php echo JLayoutHelper::render('joomla.modal.main', $renameModalData); ?>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+<?php endif; ?>
+<?php if ($this->type != 'home') : ?>
+	<?php // Delete Modal
+	$deleteModalData = array(
+		'selector' => 'deleteModal',
+		'params'   => array(
+			'title'  => JText::_('COM_TEMPLATES_ARE_YOU_SURE'),
+			'footer' => $this->loadTemplate('modal_delete_footer'),
+		),
+		'body'     => $this->loadTemplate('modal_delete_body'),
+	);
+	?>
+	<?php echo JLayoutHelper::render('joomla.modal.main', $deleteModalData); ?>
+<?php endif; ?>
+<?php // File Modal
+$fileModalData = array(
+	'selector' => 'fileModal',
+	'params'   => array(
+		'title'  => JText::_('COM_TEMPLATES_NEW_FILE_HEADER'),
+		'footer' => $this->loadTemplate('modal_file_footer'),
+	),
+	'body'     => $this->loadTemplate('modal_file_body'),
+);
+?>
+<?php echo JLayoutHelper::render('joomla.modal.main', $fileModalData); ?>
+<?php // Folder Modal
+$folderModalData = array(
+	'selector' => 'folderModal',
+	'params'   => array(
+		'title'  => JText::_('COM_TEMPLATES_MANAGE_FOLDERS'),
+		'footer' => $this->loadTemplate('modal_folder_footer'),
+	),
+	'body'     => $this->loadTemplate('modal_folder_body'),
+);
+?>
+<?php echo JLayoutHelper::render('joomla.modal.main', $folderModalData); ?>
+<?php if ($this->type != 'home') : ?>
+	<?php // Resize Modal
+	$resizeModalData = array(
+		'selector' => 'resizeModal',
+		'params'   => array(
+			'title'  => JText::_('COM_TEMPLATES_RESIZE_IMAGE'),
+			'footer' => $this->loadTemplate('modal_resize_footer'),
+		),
+		'body'     => $this->loadTemplate('modal_resize_body'),
+	);
+	?>
+	<form action="<?php echo JRoute::_('index.php?option=com_templates&task=template.resizeImage&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post">
+		<?php echo JLayoutHelper::render('joomla.modal.main', $resizeModalData); ?>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+<?php endif; ?>
\ No newline at end of file
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_description.php b/core/administrator/components/com_templates/views/template/tmpl/default_description.php
new file mode 100644
index 00000000..40b3ce77
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_description.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<div class="pull-left">
+	<?php echo JHtml::_('templates.thumb', $this->template->element, $this->template->client_id); ?>
+	<?php echo JHtml::_('templates.thumbModal', $this->template->element, $this->template->client_id); ?>
+</div>
+<h2><?php echo ucfirst($this->template->element); ?></h2>
+<?php $client = JApplicationHelper::getClientInfo($this->template->client_id); ?>
+<p><?php $this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $this->template->element); ?></p>
+<p><?php echo JText::_($this->template->xmldata->description); ?></p>
\ No newline at end of file
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_folders.php b/core/administrator/components/com_templates/views/template/tmpl/default_folders.php
new file mode 100644
index 00000000..7d673807
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_folders.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+ksort($this->files, SORT_STRING);
+?>
+
+<ul class='nav nav-list directory-tree'>
+	<?php foreach ($this->files as $key => $value) : ?>
+		<?php if (is_array($value)) : ?>
+			<li class="folder-select">
+				<a class='folder-url nowrap' data-id='<?php echo base64_encode($key); ?>' href=''>
+					<span class='icon-folder'>&nbsp;<?php $explodeArray = explode('/', $key); echo $this->escape(end($explodeArray)); ?></span>
+				</a>
+				<?php echo $this->folderTree($value); ?>
+			</li>
+		<?php endif; ?>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php
new file mode 100644
index 00000000..e733508a
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_body.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="template-manager-copy" class="container-fluid">
+	<div class="row-fluid">
+		<div class="form-horizontal">
+			<div class="control-group">
+				<div class="control-label">
+					<label for="new_name" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL', 'COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC'); ?>">
+						<?php echo JText::_('COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL'); ?>
+					</label>
+				</div>
+				<div class="controls">
+					<input class="input-xlarge" type="text" id="new_name" name="new_name"  />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php
new file mode 100644
index 00000000..cdc26f3f
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_copy_footer.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+<button class="btn btn-primary" type="submit"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_COPY'); ?></button>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php
new file mode 100644
index 00000000..d8d8f59d
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_body.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="template-manager-delete" class="container-fluid">
+	<div class="row-fluid">
+		<p><?php echo JText::sprintf('COM_TEMPLATES_MODAL_FILE_DELETE', $this->fileName); ?></p>
+	</div>
+</div>
\ No newline at end of file
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php
new file mode 100644
index 00000000..a98ecf24
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_delete_footer.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<form method="post" action="">
+	<input type="hidden" name="option" value="com_templates" />
+	<input type="hidden" name="task" value="template.delete" />
+	<input type="hidden" name="id" value="<?php echo $input->getInt('id'); ?>" />
+	<input type="hidden" name="file" value="<?php echo $this->file; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+	<button type="submit" class="btn btn-danger"><?php echo JText::_('COM_TEMPLATES_BUTTON_DELETE'); ?></button>
+</form>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php
new file mode 100644
index 00000000..7b41a197
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<div id="template-manager-file" class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<div class="span6 column-right">
+				<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.createFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" class="well">
+					<fieldset class="form-inline">
+						<label><?php echo JText::_('COM_TEMPLATES_FILE_NAME'); ?></label>
+						<input type="text" name="name" required />
+						<select class="input-medium" data-chosen="true" name="type" required >
+							<option value="">- <?php echo JText::_('COM_TEMPLATES_NEW_FILE_SELECT'); ?> -</option>
+							<option value="css">css</option>
+							<option value="php">php</option>
+							<option value="js">js</option>
+							<option value="xml">xml</option>
+							<option value="ini">ini</option>
+							<option value="less">less</option>
+							<option value="sass">sass</option>
+							<option value="scss">scss</option>
+							<option value="txt">txt</option>
+						</select>
+						<input type="hidden" class="address" name="address" />
+						<?php echo JHtml::_('form.token'); ?>
+						<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_CREATE'); ?>" class="btn btn-primary" />
+					</fieldset>
+				</form>
+				<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.uploadFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" class="well" enctype="multipart/form-data">
+					<fieldset class="form-inline">
+						<input type="hidden" class="address" name="address" />
+						<input type="file" name="files" required />
+						<?php echo JHtml::_('form.token'); ?>
+						<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_UPLOAD'); ?>" class="btn btn-primary" /><br>
+						<?php $cMax    = $this->state->get('params')->get('upload_limit'); ?>
+						<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize($cMax . 'MB')); ?>
+						<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
+					</fieldset>
+				</form>
+				<?php if ($this->type != 'home') : ?>
+					<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.copyFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" class="well" enctype="multipart/form-data">
+						<fieldset class="form-inline">
+							<input type="hidden" class="address" name="address" />
+							<label for="new_name" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_FILE_NEW_NAME_DESC'); ?>">
+								<?php echo JText::_('COM_TEMPLATES_FILE_NEW_NAME_LABEL')?>
+							</label>
+							<input type="text" id="new_name" name="new_name" required />
+							<?php echo JHtml::_('form.token'); ?>
+							<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_COPY_FILE'); ?>" class="btn btn-primary" />
+						</fieldset>
+					</form>
+				<?php endif; ?>
+			</div>
+			<div class="span6 column-left">
+				<?php echo $this->loadTemplate('folders'); ?>
+				<hr class="hr-condensed" />
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php
new file mode 100644
index 00000000..e13f4a73
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_file_footer.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php
new file mode 100644
index 00000000..105488d5
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_body.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<div id="template-manager-folder" class="container-fluid">
+	<div class="row-fluid">
+		<div class="span12">
+			<div class="span6 column-right">
+				<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.createFolder&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" class="well">
+					<fieldset class="form-inline">
+						<label><?php echo JText::_('COM_TEMPLATES_FOLDER_NAME'); ?></label>
+						<input type="text" name="name" required />
+						<input type="hidden" class="address" name="address" />
+						<?php echo JHtml::_('form.token'); ?>
+						<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_CREATE'); ?>" class="btn btn-primary" />
+					</fieldset>
+				</form>
+			</div>
+			<div class="span6 column-left">
+				<?php echo $this->loadTemplate('folders'); ?>
+				<hr class="hr-condensed" />
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php
new file mode 100644
index 00000000..d27a6232
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_folder_footer.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<form id="deleteFolder" method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.deleteFolder&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+	<fieldset>
+		<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+		<input type="hidden" class="address" name="address" />
+		<?php echo JHtml::_('form.token'); ?>
+		<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_DELETE'); ?>" class="btn btn-danger" />
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php
new file mode 100644
index 00000000..83402a0c
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_body.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div id="template-manager-rename" class="container-fluid">
+	<div class="row-fluid">
+		<div class="form-horizontal">
+			<div class="control-group">
+				<div class="control-label">
+					<label for="new_name" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_TEMPLATES_NEW_FILE_NAME')); ?>">
+						<?php echo JText::_('COM_TEMPLATES_NEW_FILE_NAME')?>
+					</label>
+				</div>
+				<div class="controls">
+					<div class="input-append">
+						<input class="input-xlarge" type="text" name="new_name" required />
+						<span class="add-on">.<?php echo JFile::getExt($this->fileName); ?></span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php
new file mode 100644
index 00000000..c37c1eb4
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_rename_footer.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+<button class="btn btn-primary" type="submit"><?php echo JText::_('COM_TEMPLATES_BUTTON_RENAME'); ?></button>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php
new file mode 100644
index 00000000..b53b6f71
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_body.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="template-manager-resize" class="container-fluid">
+	<div class="row-fluid">
+		<div class="control-group">
+			<div class="control-label">
+				<label for="height" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_IMAGE_HEIGHT'); ?>">
+					<?php echo JText::_('COM_TEMPLATES_IMAGE_HEIGHT')?>
+				</label>
+			</div>
+			<div class="controls">
+				<input class="input-xlarge" type="number" name="height" placeholder="<?php echo $this->image['height']; ?> px" required />
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<label for="width" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_IMAGE_WIDTH'); ?>">
+					<?php echo JText::_('COM_TEMPLATES_IMAGE_WIDTH')?>
+				</label>
+			</div>
+			<div class="controls">
+				<input class="input-xlarge" type="number" name="width" placeholder="<?php echo $this->image['width']; ?> px" required />
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php b/core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php
new file mode 100644
index 00000000..9430bba8
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_modal_resize_footer.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+<button class="btn btn-primary" type="submit"><?php echo JText::_('COM_TEMPLATES_BUTTON_RESIZE'); ?></button>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/default_tree.php b/core/administrator/components/com_templates/views/template/tmpl/default_tree.php
new file mode 100644
index 00000000..f00e3876
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/default_tree.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+ksort($this->files, SORT_STRING);
+?>
+
+<ul class='nav nav-list directory-tree'>
+	<?php foreach ($this->files as $key => $value) : ?>
+		<?php if (is_array($value)) : ?>
+			<?php
+			$keyArray  = explode('/', $key);
+			$fileArray = explode('/', $this->fileName);
+			$count     = 0;
+
+			$keyArrayCount = count($keyArray);
+
+			if (count($fileArray) >= $keyArrayCount)
+			{
+				for ($i = 0; $i < $keyArrayCount; $i++)
+				{
+					if ($keyArray[$i] === $fileArray[$i])
+					{
+						$count++;
+					}
+				}
+
+				if ($count === $keyArrayCount)
+				{
+					$class = 'folder show';
+				}
+				else
+				{
+					$class = 'folder';
+				}
+			}
+			else
+			{
+				$class = 'folder';
+			}
+
+			?>
+			<li class="<?php echo $class; ?>">
+				<a class='folder-url nowrap' href=''>
+					<span class='icon-folder'>&nbsp;<?php $explodeArray = explode('/', $key); echo $this->escape(end($explodeArray)); ?></span>
+				</a>
+				<?php echo $this->directoryTree($value); ?>
+			</li>
+		<?php endif; ?>
+		<?php if (is_object($value)) : ?>
+			<li>
+				<a class="file nowrap" href='<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $this->id . '&file=' . $value->id) ?>'>
+					<span class='icon-file'>&nbsp;<?php echo $this->escape($value->name); ?></span>
+				</a>
+			</li>
+		<?php endif; ?>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/components/com_templates/views/template/tmpl/readonly.php b/core/administrator/components/com_templates/views/template/tmpl/readonly.php
new file mode 100644
index 00000000..06bf02de
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/tmpl/readonly.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+
+$input = JFactory::getApplication()->input;
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+	<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'description')); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('COM_TEMPLATES_TAB_DESCRIPTION')); ?>
+			<?php echo $this->loadTemplate('description'); ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_templates/views/template/view.html.php b/core/administrator/components/com_templates/views/template/view.html.php
new file mode 100644
index 00000000..681ec0f0
--- /dev/null
+++ b/core/administrator/components/com_templates/views/template/view.html.php
@@ -0,0 +1,299 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a template style.
+ *
+ * @since  1.6
+ */
+class TemplatesViewTemplate extends JViewLegacy
+{
+	/**
+	 * For loading extension state
+	 */
+	protected $state;
+
+	/**
+	 * For loading template details
+	 */
+	protected $template;
+
+	/**
+	 * For loading the source form
+	 */
+	protected $form;
+
+	/**
+	 * For loading source file contents
+	 */
+	protected $source;
+
+	/**
+	 * Extension id
+	 */
+	protected $id;
+
+	/**
+	 * Encrypted file path
+	 */
+	protected $file;
+
+	/**
+	 * List of available overrides
+	 */
+	protected $overridesList;
+
+	/**
+	 * Name of the present file
+	 */
+	protected $fileName;
+
+	/**
+	 * Type of the file - image, source, font
+	 */
+	protected $type;
+
+	/**
+	 * For loading image information
+	 */
+	protected $image;
+
+	/**
+	 * Template id for showing preview button
+	 */
+	protected $preview;
+
+	/**
+	 * For loading font information
+	 */
+	protected $font;
+
+	/**
+	 * A nested array containing lst of files and folders
+	 */
+	protected $files;
+
+	/**
+	 * An array containing a list of compressed files
+	 */
+	protected $archive;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app            = JFactory::getApplication();
+		$this->file     = $app->input->get('file');
+		$this->fileName = JFilterInput::getInstance()->clean(base64_decode($this->file), 'string');
+		$explodeArray   = explode('.', $this->fileName);
+		$ext            = end($explodeArray);
+		$this->files    = $this->get('Files');
+		$this->state    = $this->get('State');
+		$this->template = $this->get('Template');
+		$this->preview  = $this->get('Preview');
+
+		$params       = JComponentHelper::getParams('com_templates');
+		$imageTypes   = explode(',', $params->get('image_formats'));
+		$sourceTypes  = explode(',', $params->get('source_formats'));
+		$fontTypes    = explode(',', $params->get('font_formats'));
+		$archiveTypes = explode(',', $params->get('compressed_formats'));
+
+		if (in_array($ext, $sourceTypes))
+		{
+			$this->form   = $this->get('Form');
+			$this->form->setFieldAttribute('source', 'syntax', $ext);
+			$this->source = $this->get('Source');
+			$this->type   = 'file';
+		}
+		elseif (in_array($ext, $imageTypes))
+		{
+			$this->image = $this->get('Image');
+			$this->type  = 'image';
+		}
+		elseif (in_array($ext, $fontTypes))
+		{
+			$this->font = $this->get('Font');
+			$this->type = 'font';
+		}
+		elseif (in_array($ext, $archiveTypes))
+		{
+			$this->archive = $this->get('Archive');
+			$this->type    = 'archive';
+		}
+		else
+		{
+			$this->type = 'home';
+		}
+
+		$this->overridesList = $this->get('OverridesList');
+		$this->id            = $this->state->get('extension.id');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			$app->enqueueMessage(implode("\n", $errors));
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			$this->setLayout('readonly');
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @since   1.6
+	 *
+	 * @return  void
+	 */
+	protected function addToolbar()
+	{
+		$app   = JFactory::getApplication();
+		$user  = JFactory::getUser();
+		$app->input->set('hidemainmenu', true);
+
+		// User is global SuperUser
+		$isSuperUser = $user->authorise('core.admin');
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+		$explodeArray = explode('.', $this->fileName);
+		$ext = end($explodeArray);
+
+		JToolbarHelper::title(JText::sprintf('COM_TEMPLATES_MANAGER_VIEW_TEMPLATE', ucfirst($this->template->name)), 'eye thememanager');
+
+		// Only show file edit buttons for global SuperUser
+		if ($isSuperUser)
+		{
+			// Add an Apply and save button
+			if ($this->type == 'file')
+			{
+				JToolbarHelper::apply('template.apply');
+				JToolbarHelper::save('template.save');
+			}
+			// Add a Crop and Resize button
+			elseif ($this->type == 'image')
+			{
+				JToolbarHelper::custom('template.cropImage', 'move', 'move', 'COM_TEMPLATES_BUTTON_CROP', false);
+				JToolbarHelper::modal('resizeModal', 'icon-refresh', 'COM_TEMPLATES_BUTTON_RESIZE');
+			}
+			// Add an extract button
+			elseif ($this->type == 'archive')
+			{
+				JToolbarHelper::custom('template.extractArchive', 'arrow-down', 'arrow-down', 'COM_TEMPLATES_BUTTON_EXTRACT_ARCHIVE', false);
+			}
+
+			// Add a copy template button (Hathor override doesn't need the button)
+			if ($app->getTemplate() != 'hathor')
+			{
+				JToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
+			}
+		}
+
+		// Add a Template preview button
+		if ($this->preview->client_id == 0)
+		{
+			$bar->appendButton('Popup', 'picture', 'COM_TEMPLATES_BUTTON_PREVIEW', JUri::root() . 'index.php?tp=1&templateStyle=' . $this->preview->id, 800, 520);
+		}
+
+		// Only show file manage buttons for global SuperUser
+		if ($isSuperUser)
+		{
+			// Add Manage folders button
+			JToolbarHelper::modal('folderModal', 'icon-folder icon white', 'COM_TEMPLATES_BUTTON_FOLDERS');
+
+			// Add a new file button
+			JToolbarHelper::modal('fileModal', 'icon-file', 'COM_TEMPLATES_BUTTON_FILE');
+
+			// Add a Rename file Button (Hathor override doesn't need the button)
+			if ($app->getTemplate() != 'hathor' && $this->type != 'home')
+			{
+				JToolbarHelper::modal('renameModal', 'icon-refresh', 'COM_TEMPLATES_BUTTON_RENAME_FILE');
+			}
+
+			// Add a Delete file Button
+			if ($this->type != 'home')
+			{
+				JToolbarHelper::modal('deleteModal', 'icon-remove', 'COM_TEMPLATES_BUTTON_DELETE_FILE');
+			}
+
+			// Add a Compile Button
+			if ($ext == 'less')
+			{
+				JToolbarHelper::custom('template.less', 'play', 'play', 'COM_TEMPLATES_BUTTON_LESS', false);
+			}
+		}
+
+		if ($this->type == 'home')
+		{
+			JToolbarHelper::cancel('template.cancel', 'JTOOLBAR_CLOSE');
+		}
+		else
+		{
+			JToolbarHelper::cancel('template.close', 'COM_TEMPLATES_BUTTON_CLOSE_FILE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT');
+	}
+
+	/**
+	 * Method for creating the collapsible tree.
+	 *
+	 * @param   array  $array  The value of the present node for recursion
+	 *
+	 * @return  string
+	 *
+	 * @note    Uses recursion
+	 * @since   3.2
+	 */
+	protected function directoryTree($array)
+	{
+		$temp        = $this->files;
+		$this->files = $array;
+		$txt         = $this->loadTemplate('tree');
+		$this->files = $temp;
+
+		return $txt;
+	}
+
+	/**
+	 * Method for listing the folder tree in modals.
+	 *
+	 * @param   array  $array  The value of the present node for recursion
+	 *
+	 * @return  string
+	 *
+	 * @note    Uses recursion
+	 * @since   3.2
+	 */
+	protected function folderTree($array)
+	{
+		$temp        = $this->files;
+		$this->files = $array;
+		$txt         = $this->loadTemplate('folders');
+		$this->files = $temp;
+
+		return $txt;
+	}
+}
diff --git a/core/administrator/components/com_templates/views/templates/tmpl/default.php b/core/administrator/components/com_templates/views/templates/tmpl/default.php
new file mode 100644
index 00000000..784ed2d7
--- /dev/null
+++ b/core/administrator/components/com_templates/views/templates/tmpl/default.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_templates&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('selectorFieldName' => 'client_id'))); ?>
+		<?php if ($this->total > 0) : ?>
+		<table class="table table-striped" id="template-mgr">
+			<thead>
+				<tr>
+					<th class="col1template hidden-phone" width="20%">
+						<?php echo JText::_('COM_TEMPLATES_HEADING_IMAGE'); ?>
+					</th>
+					<th width="30%">
+						<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="hidden-phone">
+						<?php echo JText::_('JVERSION'); ?>
+					</th>
+					<th width="15%" class="hidden-phone">
+						<?php echo JText::_('JDATE'); ?>
+					</th>
+					<th width="25%" class="hidden-phone">
+						<?php echo JText::_('JAUTHOR'); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="5">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center hidden-phone">
+						<?php echo JHtml::_('templates.thumb', $item->element, $item->client_id); ?>
+						<?php echo JHtml::_('templates.thumbModal', $item->element, $item->client_id); ?>
+					</td>
+					<td class="template-name">
+						<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . (int) $item->extension_id . '&file=' . $this->file); ?>">
+							<?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_DETAILS', ucfirst($item->name)); ?></a>
+						<div>
+						<?php if ($this->preview && $item->client_id == '0') : ?>
+							<a href="<?php echo JRoute::_(JUri::root() . 'index.php?tp=1&template=' . $item->element); ?>" target="_blank">
+							<?php echo JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
+							</a>
+						<?php elseif ($item->client_id == '1') : ?>
+							<?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>
+						<?php else : ?>
+							<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC'); ?>"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
+						<?php endif; ?>
+						</div>
+					</td>
+					<td class="small hidden-phone">
+						<?php echo $this->escape($item->xmldata->get('version')); ?>
+					</td>
+					<td class="small hidden-phone">
+						<?php echo $this->escape($item->xmldata->get('creationDate')); ?>
+					</td>
+					<td class="hidden-phone">
+						<?php if ($author = $item->xmldata->get('author')) : ?>
+							<div><?php echo $this->escape($author); ?></div>
+						<?php else : ?>
+							&mdash;
+						<?php endif; ?>
+						<?php if ($email = $item->xmldata->get('authorEmail')) : ?>
+							<div><?php echo $this->escape($email); ?></div>
+						<?php endif; ?>
+						<?php if ($url = $item->xmldata->get('authorUrl')) : ?>
+							<div><a href="<?php echo $this->escape($url); ?>"><?php echo $this->escape($url); ?></a></div>
+						<?php endif; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_templates/views/templates/tmpl/default.xml b/core/administrator/components/com_templates/views/templates/tmpl/default.xml
new file mode 100755
index 00000000..b867cf71
--- /dev/null
+++ b/core/administrator/components/com_templates/views/templates/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_templates/views/templates/view.html.php b/core/administrator/components/com_templates/views/templates/view.html.php
new file mode 100644
index 00000000..57dddc66
--- /dev/null
+++ b/core/administrator/components/com_templates/views/templates/view.html.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of template styles.
+ *
+ * @since  1.6
+ */
+class TemplatesViewTemplates extends JViewLegacy
+{
+	/**
+	 * @var		array
+	 * @since   1.6
+	 */
+	protected $items;
+
+	/**
+	 * @var		object
+	 * @since   1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * @var		object
+	 * @since   1.6
+	 */
+	protected $state;
+
+	/**
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $file;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->total         = $this->get('Total');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->preview       = JComponentHelper::getParams('com_templates')->get('template_positions_display');
+		$this->file          = base64_encode('home');
+
+		TemplatesHelper::addSubmenu('templates');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_templates');
+
+		// Set the title.
+		if ((int) $this->get('State')->get('client_id') === 1)
+		{
+			JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_TEMPLATES_ADMIN'), 'eye thememanager');
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_TEMPLATES_SITE'), 'eye thememanager');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_templates');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES');
+
+		JHtmlSidebar::setAction('index.php?option=com_templates&view=templates');
+
+		$this->sidebar = JHtmlSidebar::render();
+	}
+}
diff --git a/core/administrator/components/com_users/access.xml b/core/administrator/components/com_users/access.xml
new file mode 100644
index 00000000..01051d5e
--- /dev/null
+++ b/core/administrator/components/com_users/access.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_users">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+		<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="JACTION_DELETE_COMPONENT_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="JACTION_EDIT_COMPONENT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="JACTION_EDITSTATE_COMPONENT_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="JACTION_EDITVALUE_COMPONENT_DESC" />
+	</section>
+	<section name="category">
+		<action name="core.create" title="JACTION_CREATE" description="COM_CATEGORIES_ACCESS_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_CATEGORIES_ACCESS_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_CATEGORIES_ACCESS_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_CATEGORIES_ACCESS_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_CATEGORIES_ACCESS_EDITOWN_DESC" />
+	</section>
+	<section name="fieldgroup">
+		<action name="core.create" title="JACTION_CREATE" description="COM_FIELDS_GROUP_PERMISSION_CREATE_DESC" />
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_GROUP_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_GROUP_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.own" title="JACTION_EDITOWN" description="COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC" />
+	</section>
+	<section name="field">
+		<action name="core.delete" title="JACTION_DELETE" description="COM_FIELDS_FIELD_PERMISSION_DELETE_DESC" />
+		<action name="core.edit" title="JACTION_EDIT" description="COM_FIELDS_FIELD_PERMISSION_EDIT_DESC" />
+		<action name="core.edit.state" title="JACTION_EDITSTATE" description="COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC" />
+		<action name="core.edit.value" title="JACTION_EDITVALUE" description="COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC" />
+	</section>
+</access>
diff --git a/core/administrator/components/com_users/config.xml b/core/administrator/components/com_users/config.xml
new file mode 100644
index 00000000..a0a03011
--- /dev/null
+++ b/core/administrator/components/com_users/config.xml
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset 
+		name="user_options"
+		label="COM_USERS_CONFIG_USER_OPTIONS" >
+		<field
+			name="allowUserRegistration"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL"
+			description="COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="new_usertype"
+			type="usergrouplist"
+			label="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL"
+			description="COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC"
+			default="2"
+			checksuperusergroup="1"
+		/>
+
+		<field
+			name="guest_usergroup"
+			type="usergrouplist"
+			label="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_LABEL"
+			description="COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_DESC"
+			default="1"
+			checksuperusergroup="1"
+		/>
+
+		<field
+			name="sendpassword"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL"
+			description="COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="useractivation"
+			type="list"
+			label="COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL"
+			description="COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC"
+			default="2"
+			>
+			<option value="0">JNONE</option>
+			<option value="1">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION</option>
+			<option value="2">COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION</option>
+		</field>
+
+		<field
+			name="mail_to_admin"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_MAILTOADMIN_LABEL"
+			description="COM_USERS_CONFIG_FIELD_MAILTOADMIN_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="captcha"
+			type="plugins"
+			label="COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL"
+			description="COM_USERS_CONFIG_FIELD_CAPTCHA_DESC"
+			folder="captcha"
+			filter="cmd"
+			useglobal="true"
+			>
+			<option value="0">JOPTION_DO_NOT_USE</option>
+		</field>
+
+		<field
+			name="frontend_userparams"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_LABEL"
+			description="COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="site_language"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_FRONTEND_LANG_LABEL"
+			description="COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			showon="frontend_userparams:1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="change_login_name"
+			type="radio"
+			label="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL"
+			description="COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="password_options"
+		label="COM_USERS_CONFIG_PASSWORD_OPTIONS" >
+		<field
+			name="reset_count"
+			type="integer"
+			label="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_LABEL"
+			description="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_DESC"
+			first="0"
+			last="20"
+			step="1"
+			default="10"
+		/>
+
+		<field
+			name="reset_time"
+			type="integer"
+			label="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_LABEL"
+			description="COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_DESC"
+			first="1"
+			last="24"
+			step="1"
+			default="1"
+		/>
+
+		<field
+			name="minimum_length"
+			type="integer"
+			label="COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH"
+			description="COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH_DESC"
+			first="4"
+			last="99"
+			step="1"
+			default="4"
+		/>
+
+		<field
+			name="minimum_integers"
+			type="integer"
+			label="COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS"
+			description="COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS_DESC"
+			first="0"
+			last="98"
+			step="1"
+			default="0"
+		/>
+
+		<field
+			name="minimum_symbols"
+			type="integer"
+			label="COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS"
+			description="COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS_DESC"
+			first="0"
+			last="98"
+			step="1"
+			default="0"
+		/>
+
+		<field
+			name="minimum_uppercase"
+			type="integer"
+			label="COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE"
+			description="COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE_DESC"
+			first="0"
+			last="98"
+			step="1"
+			default="0"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="user_notes_history"
+		label="COM_USERS_CONFIG_FIELD_NOTES_HISTORY" >
+
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			description="JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC"
+			filter="integer"
+			default="5"
+			showon="save_history:1"
+		/>
+
+	</fieldset>
+
+ 	<fieldset
+		name="massmail"
+		label="COM_USERS_MASS_MAIL"
+		description="COM_USERS_MASS_MAIL_DESC">
+
+		<field
+ 			name="mailSubjectPrefix"
+ 			type="text"
+			label="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL"
+			description="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC"
+		/>
+
+ 		<field
+ 			name="mailBodySuffix"
+			type="textarea"
+			label="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL"
+			description="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_DESC"
+ 			rows="5"
+ 			cols="30"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="debug"
+		label="COM_USERS_DEBUG_LABEL"
+		description="COM_USERS_DEBUG_DESC">
+
+		<field
+			name="debugUsers"
+			type="radio"
+			label="COM_USERS_DEBUG_USERS_LABEL"
+			description="COM_USERS_DEBUG_USERS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="debugGroups"
+			type="radio"
+			label="COM_USERS_DEBUG_GROUPS_LABEL"
+			description="COM_USERS_DEBUG_GROUPS_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset name="integration"
+		label="JGLOBAL_INTEGRATION_LABEL"
+		description="COM_USERS_CONFIG_INTEGRATION_SETTINGS_DESC"
+	>
+
+		<field
+			name="sef_advanced"
+			type="radio"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			label="JGLOBAL_SEF_ADVANCED_LABEL"
+			description="JGLOBAL_SEF_ADVANCED_DESC"
+			filter="integer"
+		>
+			<option value="0">JGLOBAL_SEF_ADVANCED_LEGACY</option>
+			<option value="1">JGLOBAL_SEF_ADVANCED_MODERN</option>
+		</field>
+
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC"
+		>
+
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_users"
+			section="component"
+		/>
+
+	</fieldset>
+</config>
diff --git a/core/administrator/components/com_users/controller.php b/core/administrator/components/com_users/controller.php
new file mode 100644
index 00000000..8e64e70e
--- /dev/null
+++ b/core/administrator/components/com_users/controller.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users master display controller.
+ *
+ * @since  1.6
+ */
+class UsersController extends JControllerLegacy
+{
+	/**
+	 * Checks whether a user can see this view.
+	 *
+	 * @param   string  $view  The view name.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function canView($view)
+	{
+		$canDo = JHelperContent::getActions('com_users');
+
+		switch ($view)
+		{
+			// Special permissions.
+			case 'groups':
+			case 'group':
+			case 'levels':
+			case 'level':
+				return $canDo->get('core.admin');
+				break;
+
+			// Default permissions.
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController	 This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$view   = $this->input->get('view', 'users');
+		$layout = $this->input->get('layout', 'default');
+		$id     = $this->input->getInt('id');
+
+		if (!$this->canView($view))
+		{
+			throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		// Check for edit form.
+		if ($view == 'user' && $layout == 'edit' && !$this->checkEditId('com_users.edit.user', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=users', false));
+
+			return false;
+		}
+		elseif ($view == 'group' && $layout == 'edit' && !$this->checkEditId('com_users.edit.group', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=groups', false));
+
+			return false;
+		}
+		elseif ($view == 'level' && $layout == 'edit' && !$this->checkEditId('com_users.edit.level', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=levels', false));
+
+			return false;
+		}
+		elseif ($view == 'note' && $layout == 'edit' && !$this->checkEditId('com_users.edit.note', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+			$this->setMessage($this->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=notes', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/group.php b/core/administrator/components/com_users/controllers/group.php
new file mode 100644
index 00000000..e0ea7e35
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/group.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User view level controller class.
+ *
+ * @since  1.6
+ */
+class UsersControllerGroup extends JControllerForm
+{
+	/**
+	 * @var	    string  The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_USERS_GROUP';
+
+	/**
+	 * Method to check if you can save a new or existing record.
+	 *
+	 * Overrides JControllerForm::allowSave to check the core.admin permission.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowSave($data, $key = 'id')
+	{
+		return (JFactory::getUser()->authorise('core.admin', $this->option) && parent::allowSave($data, $key));
+	}
+
+	/**
+	 * Overrides JControllerForm::allowEdit
+	 *
+	 * Checks that non-Super Admins are not editing Super Admins.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Check if this group is a Super Admin
+		if (JAccess::checkGroup($data[$key], 'core.admin'))
+		{
+			// If I'm not a Super Admin, then disallow the edit.
+			if (!JFactory::getUser()->authorise('core.admin'))
+			{
+				return false;
+			}
+		}
+
+		return parent::allowEdit($data, $key);
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/groups.php b/core/administrator/components/com_users/controllers/groups.php
new file mode 100644
index 00000000..7992a518
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/groups.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User groups list controller class.
+ *
+ * @since  1.6
+ */
+class UsersControllerGroups extends JControllerAdmin
+{
+	/**
+	 * @var     string  The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_USERS_GROUPS';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Group', $prefix = 'UsersModel', $config = array())
+	{
+		return parent::getModel($name, $prefix, array('ignore_request' => true));
+	}
+
+	/**
+	 * Removes an item.
+	 *
+	 * Overrides JControllerAdmin::delete to check the core.admin permission.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function delete()
+	{
+		if (!JFactory::getUser()->authorise('core.admin', $this->option))
+		{
+			JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+			jexit();
+		}
+
+		return parent::delete();
+	}
+
+	/**
+	 * Method to publish a list of records.
+	 *
+	 * Overrides JControllerAdmin::publish to check the core.admin permission.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function publish()
+	{
+		if (!JFactory::getUser()->authorise('core.admin', $this->option))
+		{
+			JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+			jexit();
+		}
+
+		return parent::publish();
+	}
+
+	/**
+	 * Changes the order of one or more records.
+	 *
+	 * Overrides JControllerAdmin::reorder to check the core.admin permission.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function reorder()
+	{
+		if (!JFactory::getUser()->authorise('core.admin', $this->option))
+		{
+			JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+			jexit();
+		}
+
+		return parent::reorder();
+	}
+
+	/**
+	 * Method to save the submitted ordering values for records.
+	 *
+	 * Overrides JControllerAdmin::saveorder to check the core.admin permission.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function saveorder()
+	{
+		if (!JFactory::getUser()->authorise('core.admin', $this->option))
+		{
+			JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+			jexit();
+		}
+
+		return parent::saveorder();
+	}
+
+	/**
+	 * Check in of one or more records.
+	 *
+	 * Overrides JControllerAdmin::checkin to check the core.admin permission.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function checkin()
+	{
+		if (!JFactory::getUser()->authorise('core.admin', $this->option))
+		{
+			JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+			jexit();
+		}
+
+		return parent::checkin();
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/level.php b/core/administrator/components/com_users/controllers/level.php
new file mode 100644
index 00000000..e5a518d1
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/level.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * User view level controller class.
+ *
+ * @since  1.6
+ */
+class UsersControllerLevel extends JControllerForm
+{
+	/**
+	 * @var     string  The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_USERS_LEVEL';
+
+	/**
+	 * Method to check if you can save a new or existing record.
+	 *
+	 * Overrides JControllerForm::allowSave to check the core.admin permission.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowSave($data, $key = 'id')
+	{
+		return (JFactory::getUser()->authorise('core.admin', $this->option) && parent::allowSave($data, $key));
+	}
+
+	/**
+	 * Overrides JControllerForm::allowEdit
+	 *
+	 * Checks that non-Super Admins are not editing Super Admins.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.8.8
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Get user instance
+		$user = JFactory::getUser();
+
+		// Check for if Super Admin can edit
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__viewlevels'))
+			->where($db->quoteName('id') . ' = ' . (int) $data['id']);
+		$db->setQuery($query);
+
+		$viewlevel = $db->loadAssoc();
+
+		// Decode level groups
+		$groups = json_decode($viewlevel['rules']);
+
+		// If this group is super admin and this user is not super admin, canEdit is false
+		if (!$user->authorise('core.admin') && JAccess::checkGroup($groups[0], 'core.admin'))
+		{
+			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Removes an item.
+	 *
+	 * Overrides JControllerAdmin::delete to check the core.admin permission.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function delete()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids = $this->input->get('cid', array(), 'array');
+
+		if (!JFactory::getUser()->authorise('core.admin', $this->option))
+		{
+			JError::raiseError(500, JText::_('JERROR_ALERTNOAUTHOR'));
+			jexit();
+		}
+		elseif (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_USERS_NO_LEVELS_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			$ids = ArrayHelper::toInteger($ids);
+
+			// Remove the items.
+			if (!$model->delete($ids))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				$this->setMessage(JText::plural('COM_USERS_N_LEVELS_DELETED', count($ids)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_users&view=levels');
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/levels.php b/core/administrator/components/com_users/controllers/levels.php
new file mode 100644
index 00000000..1744575e
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/levels.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User view levels list controller class.
+ *
+ * @since  1.6
+ */
+class UsersControllerLevels extends JControllerAdmin
+{
+	/**
+	 * @var     string  The prefix to use with controller messages.
+	 * @since   1.6
+	 */
+	protected $text_prefix = 'COM_USERS_LEVELS';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Level', $prefix = 'UsersModel', $config = array())
+	{
+		return parent::getModel($name, $prefix, array('ignore_request' => true));
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/mail.php b/core/administrator/components/com_users/controllers/mail.php
new file mode 100644
index 00000000..759186b2
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/mail.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users mail controller.
+ *
+ * @since  1.6
+ */
+class UsersControllerMail extends JControllerLegacy
+{
+	/**
+	 * Send the mail
+	 *
+	 * @return void
+	 *
+	 * @since 1.6
+	 */
+	public function send()
+	{
+		// Redirect to admin index if mass mailer disabled in conf
+		if (JFactory::getApplication()->get('massmailoff', 0) == 1)
+		{
+			JFactory::getApplication()->redirect(JRoute::_('index.php', false));
+		}
+
+		// Check for request forgeries.
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('Mail');
+
+		if ($model->send())
+		{
+			$type = 'message';
+		}
+		else
+		{
+			$type = 'error';
+		}
+
+		$msg = $model->getError();
+		$this->setredirect('index.php?option=com_users&view=mail', $msg, $type);
+	}
+
+	/**
+	 * Cancel the mail
+	 *
+	 * @return void
+	 *
+	 * @since 1.6
+	 */
+	public function cancel()
+	{
+		// Check for request forgeries.
+		JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN'));
+		$this->setRedirect('index.php');
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/note.php b/core/administrator/components/com_users/controllers/note.php
new file mode 100644
index 00000000..2136f7da
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/note.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User note controller class.
+ *
+ * @since  2.5
+ */
+class UsersControllerNote extends JControllerForm
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $text_prefix = 'COM_USERS_NOTE';
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $key       The name of the primary key variable.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   2.5
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $key = 'id')
+	{
+		$append = parent::getRedirectToItemAppend($recordId, $key);
+
+		$userId = JFactory::getApplication()->input->get('u_id', 0, 'int');
+
+		if ($userId)
+		{
+			$append .= '&u_id=' . $userId;
+		}
+
+		return $append;
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/notes.php b/core/administrator/components/com_users/controllers/notes.php
new file mode 100644
index 00000000..ba42bd85
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/notes.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User notes controller class.
+ *
+ * @since  2.5
+ */
+class UsersControllerNotes extends JControllerAdmin
+{
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $text_prefix = 'COM_USERS_NOTES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   2.5
+	 */
+	public function getModel($name = 'Note', $prefix = 'UsersModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/profile.json.php b/core/administrator/components/com_users/controllers/profile.json.php
new file mode 100644
index 00000000..2b7fade2
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/profile.json.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersControllerProfile_Base_Json', JPATH_SITE . '/components/com_users/controllers/profile_base_json.php');
+
+/**
+ * Profile controller class for Users.
+ *
+ * @since  3.5
+ */
+class UsersControllerProfile extends UsersControllerProfile_Base_Json
+{
+}
diff --git a/core/administrator/components/com_users/controllers/user.php b/core/administrator/components/com_users/controllers/user.php
new file mode 100644
index 00000000..84207326
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/user.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User controller class.
+ *
+ * @since  1.6
+ */
+class UsersControllerUser extends JControllerForm
+{
+	/**
+	 * @var    string  The prefix to use with controller messages.
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_USERS_USER';
+
+	/**
+	 * Overrides JControllerForm::allowEdit
+	 *
+	 * Checks that non-Super Admins are not editing Super Admins.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean  True if allowed, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		// Check if this person is a Super Admin
+		if (JAccess::check($data[$key], 'core.admin'))
+		{
+			// If I'm not a Super Admin, then disallow the edit.
+			if (!JFactory::getUser()->authorise('core.admin'))
+			{
+				return false;
+			}
+		}
+
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   object  $model  The model.
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @since   2.5
+	 */
+	public function batch($model = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Set the model
+		$model = $this->getModel('User', '', array());
+
+		// Preset the redirect
+		$this->setRedirect(JRoute::_('index.php?option=com_users&view=users' . $this->getRedirectToListAppend(), false));
+
+		return parent::batch($model);
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		return;
+	}
+}
diff --git a/core/administrator/components/com_users/controllers/users.php b/core/administrator/components/com_users/controllers/users.php
new file mode 100644
index 00000000..607ce592
--- /dev/null
+++ b/core/administrator/components/com_users/controllers/users.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Users list controller class.
+ *
+ * @since  1.6
+ */
+class UsersControllerUsers extends JControllerAdmin
+{
+	/**
+	 * @var    string  The prefix to use with controller messages.
+	 * @since  1.6
+	 */
+	protected $text_prefix = 'COM_USERS_USERS';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 * @see     JController
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		$this->registerTask('block', 'changeBlock');
+		$this->registerTask('unblock', 'changeBlock');
+	}
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'User', $prefix = 'UsersModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to change the block status on a record.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function changeBlock()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('block' => 1, 'unblock' => 0);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_USERS_USERS_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Change the state of the records.
+			if (!$model->block($ids, $value))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				if ($value == 1)
+				{
+					$this->setMessage(JText::plural('COM_USERS_N_USERS_BLOCKED', count($ids)));
+				}
+				elseif ($value == 0)
+				{
+					$this->setMessage(JText::plural('COM_USERS_N_USERS_UNBLOCKED', count($ids)));
+				}
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_users&view=users');
+	}
+
+	/**
+	 * Method to activate a record.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function activate()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$ids = $this->input->get('cid', array(), 'array');
+
+		if (empty($ids))
+		{
+			JError::raiseWarning(500, JText::_('COM_USERS_USERS_NO_ITEM_SELECTED'));
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Change the state of the records.
+			if (!$model->activate($ids))
+			{
+				JError::raiseWarning(500, $model->getError());
+			}
+			else
+			{
+				$this->setMessage(JText::plural('COM_USERS_N_USERS_ACTIVATED', count($ids)));
+			}
+		}
+
+		$this->setRedirect('index.php?option=com_users&view=users');
+	}
+}
diff --git a/core/administrator/components/com_users/helpers/debug.php b/core/administrator/components/com_users/helpers/debug.php
new file mode 100644
index 00000000..4a938950
--- /dev/null
+++ b/core/administrator/components/com_users/helpers/debug.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Users component debugging helper.
+ *
+ * @since  1.6
+ */
+class UsersHelperDebug
+{
+	/**
+	 * Get a list of the components.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function getComponents()
+	{
+		// Initialise variable.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('name AS text, element AS value')
+			->from('#__extensions')
+			->where('enabled >= 1')
+			->where('type =' . $db->quote('component'));
+
+		$items = $db->setQuery($query)->loadObjectList();
+
+		if (count($items))
+		{
+			$lang = JFactory::getLanguage();
+
+			foreach ($items as &$item)
+			{
+				// Load language
+				$extension = $item->value;
+				$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+				$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load("$extension.sys", $source, null, false, true);
+
+				// Translate component name
+				$item->text = JText::_($item->text);
+			}
+
+			// Sort by component name
+			$items = ArrayHelper::sortObjects($items, 'text', 1, true, true);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get a list of the actions for the component or code actions.
+	 *
+	 * @param   string  $component  The name of the component.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function getDebugActions($component = null)
+	{
+		$actions = array();
+
+		// Try to get actions for the component
+		if (!empty($component))
+		{
+			$component_actions = JAccess::getActions($component);
+
+			if (!empty($component_actions))
+			{
+				foreach ($component_actions as &$action)
+				{
+					$actions[$action->title] = array($action->name, $action->description);
+				}
+			}
+		}
+
+		// Use default actions from configuration if no component selected or component doesn't have actions
+		if (empty($actions))
+		{
+			$filename = JPATH_ADMINISTRATOR . '/components/com_config/model/form/application.xml';
+
+			if (is_file($filename))
+			{
+				$xml = simplexml_load_file($filename);
+
+				foreach ($xml->children()->fieldset as $fieldset)
+				{
+					if ('permissions' == (string) $fieldset['name'])
+					{
+						foreach ($fieldset->children() as $field)
+						{
+							if ('rules' == (string) $field['name'])
+							{
+								foreach ($field->children() as $action)
+								{
+									$actions[(string) $action['title']] = array(
+										(string) $action['name'],
+										(string) $action['description']
+									);
+								}
+
+								break;
+							}
+						}
+					}
+				}
+
+				// Load language
+				$lang = JFactory::getLanguage();
+				$extension = 'com_config';
+				$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+
+				$lang->load($extension, JPATH_ADMINISTRATOR, null, false, false)
+					|| $lang->load($extension, $source, null, false, false)
+					|| $lang->load($extension, JPATH_ADMINISTRATOR, $lang->getDefault(), false, false)
+					|| $lang->load($extension, $source, $lang->getDefault(), false, false);
+			}
+		}
+
+		return $actions;
+	}
+
+	/**
+	 * Get a list of filter options for the levels.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 */
+	public static function getLevelsOptions()
+	{
+		// Build the filter options.
+		$options = array();
+		$options[] = JHtml::_('select.option', '1', JText::sprintf('COM_USERS_OPTION_LEVEL_COMPONENT', 1));
+		$options[] = JHtml::_('select.option', '2', JText::sprintf('COM_USERS_OPTION_LEVEL_CATEGORY', 2));
+		$options[] = JHtml::_('select.option', '3', JText::sprintf('COM_USERS_OPTION_LEVEL_DEEPER', 3));
+		$options[] = JHtml::_('select.option', '4', '4');
+		$options[] = JHtml::_('select.option', '5', '5');
+		$options[] = JHtml::_('select.option', '6', '6');
+
+		return $options;
+	}
+}
diff --git a/core/administrator/components/com_users/helpers/html/users.php b/core/administrator/components/com_users/helpers/html/users.php
new file mode 100644
index 00000000..e1a81604
--- /dev/null
+++ b/core/administrator/components/com_users/helpers/html/users.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Extended Utility class for the Users component.
+ *
+ * @since  2.5
+ */
+class JHtmlUsers
+{
+	/**
+	 * Display an image.
+	 *
+	 * @param   string  $src  The source of the image
+	 *
+	 * @return  string  A <img> element if the specified file exists, otherwise, a null string
+	 *
+	 * @since   2.5
+	 */
+	public static function image($src)
+	{
+		$src = preg_replace('#[^A-Z0-9\-_\./]#i', '', $src);
+		$file = JPATH_SITE . '/' . $src;
+
+		jimport('joomla.filesystem.path');
+		JPath::check($file);
+
+		if (!file_exists($file))
+		{
+			return '';
+		}
+
+		return '<img src="' . JUri::root() . $src . '" alt="" />';
+	}
+
+	/**
+	 * Displays an icon to add a note for this user.
+	 *
+	 * @param   integer  $userId  The user ID
+	 *
+	 * @return  string  A link to add a note
+	 *
+	 * @since   2.5
+	 */
+	public static function addNote($userId)
+	{
+		$title = JText::_('COM_USERS_ADD_NOTE');
+
+		return '<a href="' . JRoute::_('index.php?option=com_users&task=note.add&u_id=' . (int) $userId) . '" class="hasTooltip btn btn-mini" title="'
+			. $title . '"><span class="icon-vcard" aria-hidden="true"></span><span class="hidden-phone">' . $title . '</span></a>';
+	}
+
+	/**
+	 * Displays an icon to filter the notes list on this user.
+	 *
+	 * @param   integer  $count   The number of notes for the user
+	 * @param   integer  $userId  The user ID
+	 *
+	 * @return  string  A link to apply a filter
+	 *
+	 * @since   2.5
+	 */
+	public static function filterNotes($count, $userId)
+	{
+		if (empty($count))
+		{
+			return '';
+		}
+
+		$title = JText::_('COM_USERS_FILTER_NOTES');
+
+		return '<a href="' . JRoute::_('index.php?option=com_users&view=notes&filter[search]=uid:' . (int) $userId)
+			. '" class="hasTooltip btn btn-mini" title="' . $title . '"><span class="icon-filter"></span></a>';
+	}
+
+	/**
+	 * Displays a note icon.
+	 *
+	 * @param   integer  $count   The number of notes for the user
+	 * @param   integer  $userId  The user ID
+	 *
+	 * @return  string  A link to a modal window with the user notes
+	 *
+	 * @since   2.5
+	 */
+	public static function notes($count, $userId)
+	{
+		if (empty($count))
+		{
+			return '';
+		}
+
+		$title = JText::plural('COM_USERS_N_USER_NOTES', $count);
+
+		return '<a href="#userModal_' . (int) $userId . '" id="modal-' . (int) $userId . '" data-toggle="modal" class="hasTooltip btn btn-mini" title="'
+			. $title . '"><span class="icon-drawer-2" aria-hidden="true"></span><span class="hidden-phone">' . $title . '</span></a>';
+	}
+
+	/**
+	 * Renders the modal html.
+	 *
+	 * @param   integer  $count   The number of notes for the user
+	 * @param   integer  $userId  The user ID
+	 *
+	 * @return  string   The html for the rendered modal
+	 *
+	 * @since   3.4.1
+	 */
+	public static function notesModal($count, $userId)
+	{
+		if (empty($count))
+		{
+			return '';
+		}
+
+		$title = JText::plural('COM_USERS_N_USER_NOTES', $count);
+		$footer = '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+			. JText::_('JTOOLBAR_CLOSE') . '</button>';
+
+		return JHtml::_(
+			'bootstrap.renderModal',
+			'userModal_' . (int) $userId,
+			array(
+				'title'       => $title,
+				'backdrop'    => 'static',
+				'keyboard'    => true,
+				'closeButton' => true,
+				'footer'      => $footer,
+				'url'         => JRoute::_('index.php?option=com_users&view=notes&tmpl=component&layout=modal&filter[user_id]=' . (int) $userId),
+				'height'      => '300px',
+				'width'       => '800px',
+			)
+		);
+
+	}
+
+	/**
+	 * Build an array of block/unblock user states to be used by jgrid.state,
+	 * State options will be different for any user
+	 * and for currently logged in user
+	 *
+	 * @param   boolean  $self  True if state array is for currently logged in user
+	 *
+	 * @return  array  a list of possible states to display
+	 *
+	 * @since  3.0
+	 */
+	public static function blockStates( $self = false)
+	{
+		if ($self)
+		{
+			$states = array(
+				1 => array(
+					'task'           => 'unblock',
+					'text'           => '',
+					'active_title'   => 'COM_USERS_USER_FIELD_BLOCK_DESC',
+					'inactive_title' => '',
+					'tip'            => true,
+					'active_class'   => 'unpublish',
+					'inactive_class' => 'unpublish',
+				),
+				0 => array(
+					'task'           => 'block',
+					'text'           => '',
+					'active_title'   => '',
+					'inactive_title' => 'COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF',
+					'tip'            => true,
+					'active_class'   => 'publish',
+					'inactive_class' => 'publish',
+				)
+			);
+		}
+		else
+		{
+			$states = array(
+				1 => array(
+					'task'           => 'unblock',
+					'text'           => '',
+					'active_title'   => 'COM_USERS_TOOLBAR_UNBLOCK',
+					'inactive_title' => '',
+					'tip'            => true,
+					'active_class'   => 'unpublish',
+					'inactive_class' => 'unpublish',
+				),
+				0 => array(
+					'task'           => 'block',
+					'text'           => '',
+					'active_title'   => 'COM_USERS_USER_FIELD_BLOCK_DESC',
+					'inactive_title' => '',
+					'tip'            => true,
+					'active_class'   => 'publish',
+					'inactive_class' => 'publish',
+				)
+			);
+		}
+
+		return $states;
+	}
+
+	/**
+	 * Build an array of activate states to be used by jgrid.state,
+	 *
+	 * @return  array  a list of possible states to display
+	 *
+	 * @since  3.0
+	 */
+	public static function activateStates()
+	{
+		$states = array(
+			1 => array(
+				'task'           => 'activate',
+				'text'           => '',
+				'active_title'   => 'COM_USERS_TOOLBAR_ACTIVATE',
+				'inactive_title' => '',
+				'tip'            => true,
+				'active_class'   => 'unpublish',
+				'inactive_class' => 'unpublish',
+			),
+			0 => array(
+				'task'           => '',
+				'text'           => '',
+				'active_title'   => '',
+				'inactive_title' => 'COM_USERS_ACTIVATED',
+				'tip'            => true,
+				'active_class'   => 'publish',
+				'inactive_class' => 'publish',
+			)
+		);
+
+		return $states;
+	}
+}
diff --git a/core/administrator/components/com_users/helpers/users.php b/core/administrator/components/com_users/helpers/users.php
new file mode 100644
index 00000000..78bbc496
--- /dev/null
+++ b/core/administrator/components/com_users/helpers/users.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users component helper.
+ *
+ * @since  1.6
+ */
+class UsersHelper
+{
+	/**
+	 * @var    JObject  A cache for the available actions.
+	 * @since  1.6
+	 */
+	protected static $actions;
+
+	/**
+	 * Configure the Linkbar.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function addSubmenu($vName)
+	{
+		JHtmlSidebar::addEntry(
+			JText::_('COM_USERS_SUBMENU_USERS'),
+			'index.php?option=com_users&view=users',
+			$vName == 'users'
+		);
+
+		// Groups and Levels are restricted to core.admin
+		$canDo = JHelperContent::getActions('com_users');
+
+		if ($canDo->get('core.admin'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('COM_USERS_SUBMENU_GROUPS'),
+				'index.php?option=com_users&view=groups',
+				$vName == 'groups'
+			);
+			JHtmlSidebar::addEntry(
+				JText::_('COM_USERS_SUBMENU_LEVELS'),
+				'index.php?option=com_users&view=levels',
+				$vName == 'levels'
+			);
+		}
+
+		if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_users.user',
+				$vName == 'fields.fields'
+			);
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_fields&view=groups&context=com_users.user',
+				$vName == 'fields.groups'
+			);
+		}
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_USERS_SUBMENU_NOTES'),
+			'index.php?option=com_users&view=notes',
+			$vName == 'notes'
+		);
+
+		JHtmlSidebar::addEntry(
+			JText::_('COM_USERS_SUBMENU_NOTE_CATEGORIES'),
+			'index.php?option=com_categories&extension=com_users',
+			$vName == 'categories'
+		);
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @return  JObject
+	 *
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
+	 */
+	public static function getActions()
+	{
+		// Log usage of deprecated function
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHelperContent::getActions() with new arguments order instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		// Get list of actions
+		return JHelperContent::getActions('com_users');
+	}
+
+	/**
+	 * Get a list of filter options for the blocked state of a user.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @since   1.6
+	 */
+	public static function getStateOptions()
+	{
+		// Build the filter options.
+		$options = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JENABLED'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JDISABLED'));
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of filter options for the activated state of a user.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @since   1.6
+	 */
+	public static function getActiveOptions()
+	{
+		// Build the filter options.
+		$options = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('COM_USERS_ACTIVATED'));
+		$options[] = JHtml::_('select.option', '1', JText::_('COM_USERS_UNACTIVATED'));
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of the user groups for filtering.
+	 *
+	 * @return  array  An array of JHtmlOption elements.
+	 *
+	 * @since   1.6
+	 */
+	public static function getGroups()
+	{
+		$options = JHelperUsergroups::getInstance()->getAll();
+
+		foreach ($options as &$option)
+		{
+			$option->value = $option->id;
+			$option->text = str_repeat('- ', $option->level) . $option->title;
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Creates a list of range options used in filter select list
+	 * used in com_users on users view
+	 *
+	 * @return  array
+	 *
+	 * @since   2.5
+	 */
+	public static function getRangeOptions()
+	{
+		$options = array(
+			JHtml::_('select.option', 'today', JText::_('COM_USERS_OPTION_RANGE_TODAY')),
+			JHtml::_('select.option', 'past_week', JText::_('COM_USERS_OPTION_RANGE_PAST_WEEK')),
+			JHtml::_('select.option', 'past_1month', JText::_('COM_USERS_OPTION_RANGE_PAST_1MONTH')),
+			JHtml::_('select.option', 'past_3month', JText::_('COM_USERS_OPTION_RANGE_PAST_3MONTH')),
+			JHtml::_('select.option', 'past_6month', JText::_('COM_USERS_OPTION_RANGE_PAST_6MONTH')),
+			JHtml::_('select.option', 'past_year', JText::_('COM_USERS_OPTION_RANGE_PAST_YEAR')),
+			JHtml::_('select.option', 'post_year', JText::_('COM_USERS_OPTION_RANGE_POST_YEAR')),
+		);
+
+		return $options;
+	}
+
+	/**
+	 * Creates a list of two factor authentication methods used in com_users
+	 * on user view
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2.0
+	 */
+	public static function getTwoFactorMethods()
+	{
+		FOFPlatform::getInstance()->importPlugin('twofactorauth');
+		$identities = FOFPlatform::getInstance()->runPlugins('onUserTwofactorIdentify', array());
+
+		$options = array(
+			JHtml::_('select.option', 'none', JText::_('JGLOBAL_OTPMETHOD_NONE'), 'value', 'text'),
+		);
+
+		if (!empty($identities))
+		{
+			foreach ($identities as $identity)
+			{
+				if (!is_object($identity))
+				{
+					continue;
+				}
+
+				$options[] = JHtml::_('select.option', $identity->method, $identity->title, 'value', 'text');
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get a list of the User Groups for Viewing Access Levels
+	 *
+	 * @param   string  $rules  User Groups in JSON format
+	 *
+	 * @return  string  $groups  Comma separated list of User Groups
+	 *
+	 * @since   3.6
+	 */
+	public static function getVisibleByGroups($rules)
+	{
+		$rules = json_decode($rules);
+
+		if (!$rules)
+		{
+			return false;
+		}
+
+		$rules = implode(',', $rules);
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.title AS text')
+			->from('#__usergroups as a')
+			->where('a.id IN (' . $rules . ')');
+		$db->setQuery($query);
+
+		$groups = $db->loadColumn();
+		$groups = implode(', ', $groups);
+
+		return $groups;
+	}
+
+	/**
+	 * Adds Count Items for Tag Manager.
+	 *
+	 * @param   stdClass[]  &$items     The user note tag objects
+	 * @param   string      $extension  The name of the active view.
+	 *
+	 * @return  stdClass[]
+	 *
+	 * @since   3.6
+	 */
+	public static function countTagItems(&$items, $extension)
+	{
+		$db = JFactory::getDbo();
+
+		foreach ($items as $item)
+		{
+			$item->count_trashed = 0;
+			$item->count_archived = 0;
+			$item->count_unpublished = 0;
+			$item->count_published = 0;
+			$query = $db->getQuery(true);
+			$query->select('published as state, count(*) AS count')
+				->from($db->qn('#__contentitem_tag_map') . 'AS ct ')
+				->where('ct.tag_id = ' . (int) $item->id)
+				->where('ct.type_alias =' . $db->q($extension))
+				->join('LEFT', $db->qn('#__categories') . ' AS c ON ct.content_item_id=c.id')
+				->group('c.published');
+
+			$db->setQuery($query);
+			$users = $db->loadObjectList();
+
+			foreach ($users as $user)
+			{
+				if ($user->state == 1)
+				{
+					$item->count_published = $user->count;
+				}
+
+				if ($user->state == 0)
+				{
+					$item->count_unpublished = $user->count;
+				}
+
+				if ($user->state == 2)
+				{
+					$item->count_archived = $user->count;
+				}
+
+				if ($user->state == -2)
+				{
+					$item->count_trashed = $user->count;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Returns a valid section for users. If it is not valid then null
+	 * is returned.
+	 *
+	 * @param   string  $section  The section to get the mapping for
+	 *
+	 * @return  string|null  The new section
+	 *
+	 * @since   3.7.0
+	 */
+	public static function validateSection($section)
+	{
+		if (JFactory::getApplication()->isClient('site'))
+		{
+			switch ($section)
+			{
+				case 'registration':
+				case 'profile':
+					$section = 'user';
+			}
+		}
+
+		if ($section != 'user')
+		{
+			// We don't know other sections
+			return null;
+		}
+
+		return $section;
+	}
+
+	/**
+	 * Returns valid contexts
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getContexts()
+	{
+		JFactory::getLanguage()->load('com_users', JPATH_ADMINISTRATOR);
+
+		$contexts = array(
+			'com_users.user' => JText::_('COM_USERS'),
+		);
+
+		return $contexts;
+	}
+}
diff --git a/core/administrator/components/com_users/models/debuggroup.php b/core/administrator/components/com_users/models/debuggroup.php
new file mode 100644
index 00000000..bb87ebad
--- /dev/null
+++ b/core/administrator/components/com_users/models/debuggroup.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersHelperDebug', JPATH_ADMINISTRATOR . '/components/com_users/helpers/debug.php');
+
+/**
+ * Methods supporting a list of User ACL permissions
+ *
+ * @since  1.6
+ */
+class UsersModelDebuggroup extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.6.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'a.title',
+				'component', 'a.name',
+				'a.lft',
+				'a.id',
+				'level_start', 'level_end', 'a.level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Get a list of the actions.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getDebugActions()
+	{
+		$component = $this->getState('filter.component');
+
+		return UsersHelperDebug::getDebugActions($component);
+	}
+
+	/**
+	 * Override getItems method.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		$groupId = $this->getState('group_id');
+
+		if (($assets = parent::getItems()) && $groupId)
+		{
+			$actions = $this->getDebugActions();
+
+			foreach ($assets as &$asset)
+			{
+				$asset->checks = array();
+
+				foreach ($actions as $action)
+				{
+					$name = $action[0];
+
+					$asset->checks[$name] = JAccess::checkGroup($groupId, $name, $asset->name);
+				}
+			}
+		}
+
+		return $assets;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.lft', $direction = 'asc')
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Adjust the context to support modal layouts.
+		$layout = $app->input->get('layout', 'default');
+
+		if ($layout)
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('group_id', $this->getUserStateFromRequest($this->context . '.group_id', 'group_id', 0, 'int', false));
+
+		$levelStart = $this->getUserStateFromRequest($this->context . '.filter.level_start', 'filter_level_start', '', 'cmd');
+		$this->setState('filter.level_start', $levelStart);
+
+		$value = $this->getUserStateFromRequest($this->context . '.filter.level_end', 'filter_level_end', '', 'cmd');
+
+		if ($value > 0 && $value < $levelStart)
+		{
+			$value = $levelStart;
+		}
+
+		$this->setState('filter.level_end', $value);
+
+		$this->setState('filter.component', $this->getUserStateFromRequest($this->context . '.filter.component', 'filter_component', '', 'string'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_users');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('group_id');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.level_start');
+		$id .= ':' . $this->getState('filter.level_end');
+		$id .= ':' . $this->getState('filter.component');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Get the group being debugged.
+	 *
+	 * @return  JObject
+	 *
+	 * @since   1.6
+	 */
+	public function getGroup()
+	{
+		$groupId = (int) $this->getState('group_id');
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('id, title')
+			->from('#__usergroups')
+			->where('id = ' . $groupId);
+
+		$db->setQuery($query);
+
+		try
+		{
+			$group = $db->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $group;
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.name, a.title, a.level, a.lft, a.rgt'
+			)
+		);
+		$query->from($db->quoteName('#__assets', 'a'));
+
+		// Filter the items over the search string if set.
+		if ($this->getState('filter.search'))
+		{
+			// Escape the search token.
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($this->getState('filter.search')), true) . '%'));
+
+			// Compile the different search clauses.
+			$searches = array();
+			$searches[] = 'a.name LIKE ' . $search;
+			$searches[] = 'a.title LIKE ' . $search;
+
+			// Add the clauses to the query.
+			$query->where('(' . implode(' OR ', $searches) . ')');
+		}
+
+		// Filter on the start and end levels.
+		$levelStart = (int) $this->getState('filter.level_start');
+		$levelEnd = (int) $this->getState('filter.level_end');
+
+		if ($levelEnd > 0 && $levelEnd < $levelStart)
+		{
+			$levelEnd = $levelStart;
+		}
+
+		if ($levelStart > 0)
+		{
+			$query->where('a.level >= ' . $levelStart);
+		}
+
+		if ($levelEnd > 0)
+		{
+			$query->where('a.level <= ' . $levelEnd);
+		}
+
+		// Filter the items over the component if set.
+		if ($this->getState('filter.component'))
+		{
+			$component = $this->getState('filter.component');
+			$query->where('(a.name = ' . $db->quote($component) . ' OR a.name LIKE ' . $db->quote($component . '.%') . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_users/models/debuguser.php b/core/administrator/components/com_users/models/debuguser.php
new file mode 100644
index 00000000..749ce512
--- /dev/null
+++ b/core/administrator/components/com_users/models/debuguser.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersHelperDebug', JPATH_ADMINISTRATOR . '/components/com_users/helpers/debug.php');
+
+/**
+ * Methods supporting a list of User ACL permissions
+ *
+ * @since  1.6
+ */
+class UsersModelDebugUser extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.6.0
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'a.title',
+				'component', 'a.name',
+				'a.lft',
+				'a.id',
+				'level_start', 'level_end', 'a.level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Get a list of the actions.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getDebugActions()
+	{
+		$component = $this->getState('filter.component');
+
+		return UsersHelperDebug::getDebugActions($component);
+	}
+
+	/**
+	 * Override getItems method.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		$userId = $this->getState('user_id');
+		$user   = JFactory::getUser($userId);
+
+		if (($assets = parent::getItems()) && $userId)
+		{
+			$actions = $this->getDebugActions();
+
+			foreach ($assets as &$asset)
+			{
+				$asset->checks = array();
+
+				foreach ($actions as $action)
+				{
+					$name = $action[0];
+
+					$asset->checks[$name] = $user->authorise($name, $asset->name);
+				}
+			}
+		}
+
+		return $assets;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.lft', $direction = 'asc')
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Adjust the context to support modal layouts.
+		$layout = $app->input->get('layout', 'default');
+
+		if ($layout)
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('user_id', $this->getUserStateFromRequest($this->context . '.user_id', 'user_id', 0, 'int', false));
+
+		$levelStart = $this->getUserStateFromRequest($this->context . '.filter.level_start', 'filter_level_start', '', 'cmd');
+		$this->setState('filter.level_start', $levelStart);
+
+		$value = $this->getUserStateFromRequest($this->context . '.filter.level_end', 'filter_level_end', '', 'cmd');
+
+		if ($value > 0 && $value < $levelStart)
+		{
+			$value = $levelStart;
+		}
+
+		$this->setState('filter.level_end', $value);
+
+		$this->setState('filter.component', $this->getUserStateFromRequest($this->context . '.filter.component', 'filter_component', '', 'string'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_users');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('user_id');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.level_start');
+		$id .= ':' . $this->getState('filter.level_end');
+		$id .= ':' . $this->getState('filter.component');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Get the user being debugged.
+	 *
+	 * @return  JUser
+	 *
+	 * @since   1.6
+	 */
+	public function getUser()
+	{
+		$userId = $this->getState('user_id');
+
+		return JFactory::getUser($userId);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.name, a.title, a.level, a.lft, a.rgt'
+			)
+		);
+		$query->from($db->quoteName('#__assets', 'a'));
+
+		// Filter the items over the search string if set.
+		if ($this->getState('filter.search'))
+		{
+			// Escape the search token.
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($this->getState('filter.search')), true) . '%'));
+
+			// Compile the different search clauses.
+			$searches = array();
+			$searches[] = 'a.name LIKE ' . $search;
+			$searches[] = 'a.title LIKE ' . $search;
+
+			// Add the clauses to the query.
+			$query->where('(' . implode(' OR ', $searches) . ')');
+		}
+
+		// Filter on the start and end levels.
+		$levelStart = (int) $this->getState('filter.level_start');
+		$levelEnd = (int) $this->getState('filter.level_end');
+
+		if ($levelEnd > 0 && $levelEnd < $levelStart)
+		{
+			$levelEnd = $levelStart;
+		}
+
+		if ($levelStart > 0)
+		{
+			$query->where('a.level >= ' . $levelStart);
+		}
+
+		if ($levelEnd > 0)
+		{
+			$query->where('a.level <= ' . $levelEnd);
+		}
+
+		// Filter the items over the component if set.
+		if ($this->getState('filter.component'))
+		{
+			$component = $this->getState('filter.component');
+			$query->where('(a.name = ' . $db->quote($component) . ' OR a.name LIKE ' . $db->quote($component . '.%') . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+}
diff --git a/core/administrator/components/com_users/models/fields/groupparent.php b/core/administrator/components/com_users/models/fields/groupparent.php
new file mode 100644
index 00000000..479a0f42
--- /dev/null
+++ b/core/administrator/components/com_users/models/fields/groupparent.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * User Group Parent field..
+ *
+ * @since  1.6
+ */
+class JFormFieldGroupParent extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var        string
+	 * @since   1.6
+	 */
+	protected $type = 'GroupParent';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		$options = JHelperUsergroups::getInstance()->getAll();
+
+		// Prevent parenting to children of this item.
+		if ($id = $this->form->getValue('id'))
+		{
+			unset($options[$id]);
+		}
+
+		$options      = array_values($options);
+		$isSuperAdmin = JFactory::getUser()->authorise('core.admin');
+
+		// Pad the option text with spaces using depth level as a multiplier.
+		for ($i = 0, $n = count($options); $i < $n; $i++)
+		{
+			// Show groups only if user is super admin or group is not super admin
+			if ($isSuperAdmin || !JAccess::checkGroup($options[$i]->id, 'core.admin'))
+			{
+				$options[$i]->value = $options[$i]->id;
+				$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->title;
+			}
+			else
+			{
+				unset($options[$i]);
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/administrator/components/com_users/models/fields/levels.php b/core/administrator/components/com_users/models/fields/levels.php
new file mode 100644
index 00000000..6c55ed09
--- /dev/null
+++ b/core/administrator/components/com_users/models/fields/levels.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Access Levels field.
+ *
+ * @since  3.6.0
+ */
+class JFormFieldLevels extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.6.0
+	 */
+	protected $type = 'Levels';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects
+	 *
+	 * @since   3.6.0
+	 */
+	protected function getOptions()
+	{
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getOptions(), UsersHelperDebug::getLevelsOptions());
+	}
+}
diff --git a/core/administrator/components/com_users/models/forms/fields/user.xml b/core/administrator/components/com_users/models/forms/fields/user.xml
new file mode 100644
index 00000000..2c830864
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/fields/user.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="basic">
+			<field
+				name="display"
+				type="hidden"
+			    	default="2"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/filter_debuggroup.xml b/core/administrator/components/com_users/models/forms/filter_debuggroup.xml
new file mode 100644
index 00000000..72eb8deb
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/filter_debuggroup.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_USERS_SEARCH_ASSETS"
+			description="COM_USERS_SEARCH_IN_ASSETS"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="component"
+			type="Components"
+			label="COM_USERS_FILTER_COMPONENT_LABEL"
+			description="COM_USERS_FILTER_COMPONENT_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_SELECT_COMPONENT</option>
+		</field>
+
+		<field
+			name="level_start"
+			type="Levels"
+			label="COM_USERS_FILTER_LEVEL_START_LABEL"
+			description="COM_USERS_FILTER_LEVEL_START_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_SELECT_LEVEL_START</option>
+		</field>
+
+		<field
+			name="level_end"
+			type="Levels"
+			label="COM_USERS_FILTER_LEVEL_END_LABEL"
+			description="COM_USERS_FILTER_LEVEL_END_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_SELECT_LEVEL_END</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="a.lft ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.title ASC">COM_USERS_HEADING_ASSET_TITLE_ASC</option>
+			<option value="a.title DESC">COM_USERS_HEADING_ASSET_TITLE_DESC</option>
+			<option value="a.name ASC">COM_USERS_HEADING_ASSET_NAME_ASC</option>
+			<option value="a.name DESC">COM_USERS_HEADING_ASSET_NAME_DESC</option>
+			<option value="a.lft ASC">COM_USERS_HEADING_LFT_ASC</option>
+			<option value="a.lft DESC">COM_USERS_HEADING_LFT_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/filter_debuguser.xml b/core/administrator/components/com_users/models/forms/filter_debuguser.xml
new file mode 100644
index 00000000..f09569a9
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/filter_debuguser.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_USERS_SEARCH_ASSETS"
+			description="COM_USERS_SEARCH_IN_ASSETS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="component"
+			type="Components"
+			label="COM_USERS_FILTER_COMPONENT_LABEL"
+			description="COM_USERS_FILTER_COMPONENT_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_SELECT_COMPONENT</option>
+		</field>
+		<field
+			name="level_start"
+			type="Levels"
+			label="COM_USERS_FILTER_LEVEL_START_LABEL"
+			description="COM_USERS_FILTER_LEVEL_START_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_SELECT_LEVEL_START</option>
+		</field>
+		<field
+			name="level_end"
+			type="Levels"
+			label="COM_USERS_FILTER_LEVEL_END_LABEL"
+			description="COM_USERS_FILTER_LEVEL_END_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_SELECT_LEVEL_END</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="a.lft ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.title ASC">COM_USERS_HEADING_ASSET_TITLE_ASC</option>
+			<option value="a.title DESC">COM_USERS_HEADING_ASSET_TITLE_DESC</option>
+			<option value="a.name ASC">COM_USERS_HEADING_ASSET_NAME_ASC</option>
+			<option value="a.name DESC">COM_USERS_HEADING_ASSET_NAME_DESC</option>
+			<option value="a.lft ASC">COM_USERS_HEADING_LFT_ASC</option>
+			<option value="a.lft DESC">COM_USERS_HEADING_LFT_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/filter_groups.xml b/core/administrator/components/com_users/models/forms/filter_groups.xml
new file mode 100644
index 00000000..1bc22b04
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/filter_groups.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_USERS_SEARCH_GROUPS_LABEL"
+			description="COM_USERS_SEARCH_IN_GROUPS"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.lft ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.lft DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.title ASC">COM_USERS_HEADING_GROUP_TITLE_ASC</option>
+			<option value="a.title DESC">COM_USERS_HEADING_GROUP_TITLE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/filter_levels.xml b/core/administrator/components/com_users/models/forms/filter_levels.xml
new file mode 100644
index 00000000..081189f1
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/filter_levels.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_USERS_SEARCH_ACCESS_LEVELS"
+			description="COM_USERS_SEARCH_IN_LEVEL_NAME"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.ordering ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.title ASC">COM_USERS_HEADING_LEVEL_NAME_ASC</option>
+			<option value="a.title DESC">COM_USERS_HEADING_LEVEL_NAME_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/filter_notes.xml b/core/administrator/components/com_users/models/forms/filter_notes.xml
new file mode 100644
index 00000000..b4895e2e
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/filter_notes.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_USERS_SEARCH_USER_NOTES"
+			description="COM_USERS_SEARCH_IN_NOTE_TITLE"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="published"
+			type="status"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_users"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			onchange="this.form.submit();"
+			default="a.review_time DESC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.subject ASC">COM_USERS_HEADING_SUBJECT_ASC</option>
+			<option value="a.subject DESC">COM_USERS_HEADING_SUBJECT_DESC</option>
+			<option value="c.title ASC">COM_USERS_HEADING_CATEGORY_ASC</option>
+			<option value="c.title DESC">COM_USERS_HEADING_CATEGORY_DESC</option>
+			<option value="u.name ASC">COM_USERS_HEADING_USER_ASC</option>
+			<option value="u.name DESC">COM_USERS_HEADING_USER_DESC</option>
+			<option value="a.review_time ASC">COM_USERS_HEADING_REVIEW_ASC</option>
+			<option value="a.review_time DESC">COM_USERS_HEADING_REVIEW_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="JGLOBAL_LIMIT"
+			description="JGLOBAL_LIMIT"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/filter_users.xml b/core/administrator/components/com_users/models/forms/filter_users.xml
new file mode 100644
index 00000000..af0a88b6
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/filter_users.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_USERS_SEARCH_USERS"
+			description="COM_USERS_SEARCH_IN_NAME"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="state"
+			type="userstate"
+			label="COM_USERS_FILTER_STATE"
+			description="COM_USERS_FILTER_STATE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_FILTER_STATE</option>
+		</field>
+		<field
+			name="active"
+			type="useractive"
+			label="COM_USERS_FILTER_ACTIVE"
+			description="COM_USERS_FILTER_ACTIVE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_FILTER_ACTIVE</option>
+		</field>
+		<field
+			name="group_id"
+			type="usergrouplist"
+			label="COM_USERS_FILTER_GROUP"
+			description="COM_USERS_FILTER_GROUP_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_FILTER_USERGROUP</option>
+		</field>
+		<field
+			name="lastvisitrange"
+			type="lastvisitdaterange"
+			label="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+			description="COM_USERS_OPTION_FILTER_LAST_VISIT_DATE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_FILTER_LAST_VISIT_DATE</option>
+		</field>
+		<field
+			name="range"
+			type="registrationdaterange"
+			label="COM_USERS_OPTION_FILTER_DATE"
+			description="COM_USERS_OPTION_FILTER_DATE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_USERS_OPTION_FILTER_DATE</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.name ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.name ASC">COM_USERS_HEADING_NAME_ASC</option>
+			<option value="a.name DESC">COM_USERS_HEADING_NAME_DESC</option>
+			<option value="a.username ASC">COM_USERS_HEADING_USERNAME_ASC</option>
+			<option value="a.username DESC">COM_USERS_HEADING_USERNAME_DESC</option>
+			<option value="a.block ASC">COM_USERS_HEADING_ENABLED_ASC</option>
+			<option value="a.block DESC">COM_USERS_HEADING_ENABLED_DESC</option>
+			<option value="a.activation ASC">COM_USERS_HEADING_ACTIVATED_ASC</option>
+			<option value="a.activation DESC">COM_USERS_HEADING_ACTIVATED_DESC</option>
+			<option value="a.email ASC">COM_USERS_HEADING_EMAIL_ASC</option>
+			<option value="a.email DESC">COM_USERS_HEADING_EMAIL_DESC</option>
+			<option value="a.lastvisitDate ASC">COM_USERS_HEADING_LAST_VISIT_DATE_ASC</option>
+			<option value="a.lastvisitDate DESC">COM_USERS_HEADING_LAST_VISIT_DATE_DESC</option>
+			<option value="a.registerDate ASC">COM_USERS_HEADING_REGISTRATION_DATE_ASC</option>
+			<option value="a.registerDate DESC">COM_USERS_HEADING_REGISTRATION_DATE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/group.xml b/core/administrator/components/com_users/models/forms/group.xml
new file mode 100644
index 00000000..d56950c3
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/group.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="id" 
+			type="hidden"
+			default="0"
+			required="true"
+			readonly="true"
+		/>
+
+		<field 
+			name="title" 
+			type="text"
+			label="COM_USERS_GROUP_FIELD_TITLE_LABEL"
+			description="COM_USERS_GROUP_FIELD_TITLE_DESC"
+			required="true"
+			size="40"
+		/>
+
+		<field 
+			name="parent_id" 
+			type="groupparent"
+			label="COM_USERS_GROUP_FIELD_PARENT_LABEL"
+			description="COM_USERS_GROUP_FIELD_PARENT_DESC"
+		/>
+
+		<field 
+			name="actions" 
+			type="hidden"
+			multiple="true"
+		/>
+
+		<field 
+			name="lft" 
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field 
+			name="rgt" 
+			type="hidden"
+			filter="unset"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/level.xml b/core/administrator/components/com_users/models/forms/level.xml
new file mode 100644
index 00000000..0651cacb
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/level.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="id" 
+			type="hidden"
+			default="0"
+			readonly="true"
+			required="true"
+		/>
+
+		<field 
+			name="title" 
+			type="text"
+			label="COM_USERS_LEVEL_FIELD_TITLE_LABEL"
+			description="COM_USERS_LEVEL_FIELD_TITLE_DESC"
+			required="true"
+			size="50"
+		/>
+
+		<field 
+			name="ordering" 
+			type="text"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			default="0"
+		/>
+
+		<field 
+			name="rules" 
+			type="hidden"
+			filter="int_array"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/mail.xml b/core/administrator/components/com_users/models/forms/mail.xml
new file mode 100644
index 00000000..c1e8d5b6
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/mail.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+
+		<field 
+			name="recurse" 
+			type="checkbox"
+			label="COM_USERS_MAIL_FIELD_RECURSE_LABEL"
+			description="COM_USERS_MAIL_FIELD_RECURSE_DESC"
+			value="1"
+		/>
+
+		<field 
+			name="mode" 
+			type="checkbox"
+			label="COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL"
+			description="COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC"
+			value="1"
+		/>
+
+		<field 
+			name="disabled" 
+			type="checkbox"
+			label="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_LABEL"
+			description="COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_DESC"
+			value="1"
+		/>
+
+		<field 
+			name="group" 
+			type="usergrouplist"
+			label="COM_USERS_MAIL_FIELD_GROUP_LABEL"
+			description="COM_USERS_MAIL_FIELD_GROUP_DESC"
+			default="0"
+			size="10"
+			>
+			<option value="0">COM_USERS_MAIL_FIELD_VALUE_ALL_USERS_GROUPS</option>
+		</field>
+
+		<field 
+			name="bcc" 
+			type="checkbox"
+			label="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL"
+			description="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC"
+			default="1"
+			value="1"
+			checked="1"
+		/>
+
+		<field 
+			name="subject" 
+			type="text"
+			label="COM_USERS_MAIL_FIELD_SUBJECT_LABEL"
+			description="COM_USERS_MAIL_FIELD_SUBJECT_DESC"
+			class="span8"
+			maxlength="150"
+			size="30"
+		/>
+
+		<field 
+			name="message" 
+			type="textarea"
+			label="COM_USERS_MAIL_FIELD_MESSAGE_LABEL"
+			description="COM_USERS_MAIL_FIELD_MESSAGE_DESC"
+			class="span11 vert"
+			cols="70"
+			rows="20"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/note.xml b/core/administrator/components/com_users/models/forms/note.xml
new file mode 100644
index 00000000..13cd9379
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/note.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset
+		addfieldpath="/administrator/components/com_categories/models/fields"
+	>
+		<field
+			name="id"
+			type="hidden"
+			label="COM_USERS_FIELD_ID_LABEL"
+			class="readonly"
+			size="6"
+			default="0"
+			readonly="true"
+		/>
+
+		<field
+			name="user_id"
+			type="user"
+			label="COM_USERS_FIELD_USER_ID_LABEL"
+			description="JLIB_FORM_SELECT_USER"
+			size="50"
+			class="input-medium"
+			required="true"
+		/>
+
+		<field
+			name="catid"
+			type="modal_category"
+			label="COM_USERS_FIELD_CATEGORY_ID_LABEL"
+			description="JFIELD_CATEGORY_DESC"
+			extension="com_users"
+			required="true"
+			select="true"
+			new="true"
+			edit="true"
+			clear="true"
+		/>
+
+		<field
+			name="subject"
+			type="text"
+			label="COM_USERS_FIELD_SUBJECT_LABEL"
+			description="COM_USERS_FIELD_SUBJECT_DESC"
+			size="80"
+		/>
+
+		<field
+			name="body"
+			type="editor"
+			label="COM_USERS_FIELD_NOTEBODY_LABEL"
+			description="COM_USERS_FIELD_NOTEBODY_DESC"
+			rows="10"
+			cols="80"
+			filter="safehtml"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="COM_USERS_FIELD_STATE_DESC"
+			size="1"
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="review_time"
+			type="calendar"
+			label="COM_USERS_FIELD_REVIEW_TIME_LABEL"
+			description="COM_USERS_FIELD_REVIEW_TIME_DESC"
+			default="NOW"
+			translateformat="true"
+		/>
+
+		<field
+			name="checked_out"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="checked_out_time"
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field
+			name="created_user_id"
+			type="hidden"
+			label="JGLOBAL_FIELD_CREATED_BY_LABEL"
+			filter="unset"
+		/>
+
+		<field
+			name="created_time"
+			type="hidden"
+			label="JGLOBAL_FIELD_CREATED_LABEL"
+			filter="unset"
+		/>
+
+		<field
+			name="modified_user_id"
+			type="hidden"
+			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			filter="unset"
+		/>
+
+		<field
+			name="modified_time"
+			type="hidden"
+			label="JGLOBAL_FIELD_MODIFIED_LABEL"
+			filter="unset"
+		/>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_UP_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			maxlength="255"
+			size="45"
+			labelclass="control-label"
+		/>
+	</fieldset>
+</form>
diff --git a/core/administrator/components/com_users/models/forms/user.xml b/core/administrator/components/com_users/models/forms/user.xml
new file mode 100644
index 00000000..0ec33fc9
--- /dev/null
+++ b/core/administrator/components/com_users/models/forms/user.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="user_details">
+		<field 
+			name="name" 
+			type="text"
+			label="COM_USERS_USER_FIELD_NAME_LABEL"
+			description="COM_USERS_USER_FIELD_NAME_DESC"
+			required="true"
+			size="30"
+		/>
+
+		<field 
+			name="username"
+			type="text"
+			label="COM_USERS_USER_FIELD_USERNAME_LABEL"
+			description="COM_USERS_USER_FIELD_USERNAME_DESC"
+			required="true"
+			size="30"
+		/>
+
+		<field 
+			name="password" 
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			description="COM_USERS_USER_FIELD_PASSWORD_DESC"
+			autocomplete="off"
+			class="validate-password"
+			filter="raw"
+			validate="password"
+			size="30"
+		/>
+
+		<field 
+			name="password2" 
+			type="password"
+			label="COM_USERS_USER_FIELD_PASSWORD2_LABEL"
+			description="COM_USERS_USER_FIELD_PASSWORD2_DESC"
+			autocomplete="off"
+			class="validate-password"
+			filter="raw"
+			message="COM_USERS_USER_FIELD_PASSWORD1_MESSAGE"
+			size="30"
+			validate="equals"
+			field="password"
+		/>
+
+		<field 
+			name="email" 
+			type="email"
+			label="JGLOBAL_EMAIL"
+			description="COM_USERS_USER_FIELD_EMAIL_DESC"
+			required="true"
+			size="30"
+			validate="email"
+		/>
+
+		<field
+			name="registerDate"
+			type="calendar"
+			label="COM_USERS_USER_FIELD_REGISTERDATE_LABEL"
+			description="COM_USERS_USER_FIELD_REGISTERDATE_DESC"
+			class="readonly"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="lastvisitDate"
+			type="calendar"
+			label="COM_USERS_USER_FIELD_LASTVISIT_LABEL"
+			description="COM_USERS_USER_FIELD_LASTVISIT_DESC"
+			class="readonly"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="lastResetTime"
+			type="calendar"
+			label="COM_USERS_USER_FIELD_LASTRESET_LABEL"
+			description="COM_USERS_USER_FIELD_LASTRESET_DESC"
+			class="readonly"
+			readonly="true"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="resetCount"
+			type="number"
+			label="COM_USERS_USER_FIELD_RESETCOUNT_LABEL"
+			description="COM_USERS_USER_FIELD_RESETCOUNT_DESC"
+			class="readonly"
+			default="0"
+			readonly="true"
+		/>
+
+		<field
+			name="sendEmail"
+			type="radio"
+			label="COM_USERS_USER_FIELD_SENDEMAIL_LABEL"
+			description="COM_USERS_USER_FIELD_SENDEMAIL_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="block"
+			type="radio"
+			label="COM_USERS_USER_FIELD_BLOCK_LABEL"
+			description="COM_USERS_USER_FIELD_BLOCK_DESC"
+			class="btn-group btn-group-yesno btn-group-reversed"
+			default="0"
+			>
+			<option value="1">COM_USERS_USER_FIELD_BLOCK</option>
+			<option value="0">COM_USERS_USER_FIELD_ENABLE</option>
+		</field>
+
+		<field
+			name="requireReset"
+			type="radio"
+			label="COM_USERS_USER_FIELD_REQUIRERESET_LABEL"
+			description="COM_USERS_USER_FIELD_REQUIRERESET_DESC"
+			default="0"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			class="readonly"
+			default="0"
+			readonly="true"
+		/>
+
+	</fieldset>
+	<field name="groups" type="hidden" />
+	<field name="twofactor" type="hidden" />
+
+	<fields name="params">
+
+		<!--  Basic user account settings. -->
+		<fieldset name="settings" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
+
+			<field 
+				name="admin_style" 
+				type="templatestyle"
+				label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
+				description="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				filter="uint"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="admin_language" 
+				type="language"
+				label="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL"
+				description="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="language" 
+				type="language"
+				label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
+				description="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="editor" 
+				type="plugins" 
+				label="COM_USERS_USER_FIELD_EDITOR_LABEL"
+				description="COM_USERS_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="helpsite" 
+				type="helpsite"
+				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
+				description="COM_USERS_USER_FIELD_HELPSITE_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="timezone" 
+				type="timezone"
+				label="COM_USERS_USER_FIELD_TIMEZONE_LABEL"
+				description="COM_USERS_USER_FIELD_TIMEZONE_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+		</fieldset>
+
+	</fields>
+</form>
diff --git a/core/administrator/components/com_users/models/group.php b/core/administrator/components/com_users/models/group.php
new file mode 100644
index 00000000..decedb93
--- /dev/null
+++ b/core/administrator/components/com_users/models/group.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * User group model.
+ *
+ * @since  1.6
+ */
+class UsersModelGroup extends JModelAdmin
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'event_after_delete'  => 'onUserAfterDeleteGroup',
+				'event_after_save'    => 'onUserAfterSaveGroup',
+				'event_before_delete' => 'onUserBeforeDeleteGroup',
+				'event_before_save'   => 'onUserBeforeSaveGroup',
+				'events_map'          => array('delete' => 'user', 'save' => 'user')
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable	A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Usergroup', $prefix = 'JTable', $config = array())
+	{
+		$return = JTable::getInstance($type, $prefix, $config);
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm	A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.group', 'group', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_users.edit.group.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_users.group', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Override preprocessForm to load the user plugin group instead of content.
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = '')
+	{
+		$obj = is_array($data) ? ArrayHelper::toObject($data, 'JObject') : $data;
+
+		if (isset($obj->parent_id) && $obj->parent_id == 0 && $obj->id > 0)
+		{
+			$form->setFieldAttribute('parent_id', 'type', 'hidden');
+			$form->setFieldAttribute('parent_id', 'hidden', 'true');
+		}
+
+		parent::preprocessForm($form, $data, 'user');
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		// Include the user plugins for events.
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		/**
+		 * Check the super admin permissions for group
+		 * We get the parent group permissions and then check the group permissions manually
+		 * We have to calculate the group permissions manually because we haven't saved the group yet
+		 */
+		$parentSuperAdmin = JAccess::checkGroup($data['parent_id'], 'core.admin');
+
+		// Get core.admin rules from the root asset
+		$rules = JAccess::getAssetRules('root.1')->getData('core.admin');
+
+		// Get the value for the current group (will be true (allowed), false (denied), or null (inherit)
+		$groupSuperAdmin = $rules['core.admin']->allow($data['id']);
+
+		// We only need to change the $groupSuperAdmin if the parent is true or false. Otherwise, the value set in the rule takes effect.
+		if ($parentSuperAdmin === false)
+		{
+			// If parent is false (Denied), effective value will always be false
+			$groupSuperAdmin = false;
+		}
+		elseif ($parentSuperAdmin === true)
+		{
+			// If parent is true (allowed), group is true unless explicitly set to false
+			$groupSuperAdmin = ($groupSuperAdmin === false) ? false : true;
+		}
+
+		// Check for non-super admin trying to save with super admin group
+		$iAmSuperAdmin = JFactory::getUser()->authorise('core.admin');
+
+		if (!$iAmSuperAdmin && $groupSuperAdmin)
+		{
+			$this->setError(JText::_('JLIB_USER_ERROR_NOT_SUPERADMIN'));
+
+			return false;
+		}
+
+		/**
+		 * Check for super-admin changing self to be non-super-admin
+		 * First, are we a super admin
+		 */
+		if ($iAmSuperAdmin)
+		{
+			// Next, are we a member of the current group?
+			$myGroups = JAccess::getGroupsByUser(JFactory::getUser()->get('id'), false);
+
+			if (in_array($data['id'], $myGroups))
+			{
+				// Now, would we have super admin permissions without the current group?
+				$otherGroups = array_diff($myGroups, array($data['id']));
+				$otherSuperAdmin = false;
+
+				foreach ($otherGroups as $otherGroup)
+				{
+					$otherSuperAdmin = $otherSuperAdmin ?: JAccess::checkGroup($otherGroup, 'core.admin');
+				}
+
+				/**
+				 * If we would not otherwise have super admin permissions
+				 * and the current group does not have super admin permissions, throw an exception
+				 */
+				if ((!$otherSuperAdmin) && (!$groupSuperAdmin))
+				{
+					$this->setError(JText::_('JLIB_USER_ERROR_CANNOT_DEMOTE_SELF'));
+
+					return false;
+				}
+			}
+		}
+
+		if (JFactory::getApplication()->input->get('task') == 'save2copy')
+		{
+			$data['title'] = $this->generateGroupTitle($data['parent_id'], $data['title']);
+		}
+
+		// Proceed with the save
+		return parent::save($data);
+	}
+
+	/**
+	 * Method to delete rows.
+	 *
+	 * @param   array  &$pks  An array of item ids.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 * @throws  Exception
+	 */
+	public function delete(&$pks)
+	{
+		// Typecast variable.
+		$pks    = (array) $pks;
+		$user   = JFactory::getUser();
+		$groups = JAccess::getGroupsByUser($user->get('id'));
+
+		// Get a row instance.
+		$table = $this->getTable();
+
+		// Load plugins.
+		JPluginHelper::importPlugin($this->events_map['delete']);
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Check if I am a Super Admin
+		$iAmSuperAdmin = $user->authorise('core.admin');
+
+		// Do not allow to delete groups to which the current user belongs
+		foreach ($pks as $pk)
+		{
+			if (in_array($pk, $groups))
+			{
+				JError::raiseWarning(403, JText::_('COM_USERS_DELETE_ERROR_INVALID_GROUP'));
+
+				return false;
+			}
+		}
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				// Access checks.
+				$allow = $user->authorise('core.edit.state', 'com_users');
+
+				// Don't allow non-super-admin to delete a super admin
+				$allow = (!$iAmSuperAdmin && JAccess::checkGroup($pk, 'core.admin')) ? false : $allow;
+
+				if ($allow)
+				{
+					// Fire the before delete event.
+					$dispatcher->trigger($this->event_before_delete, array($table->getProperties()));
+
+					if (!$table->delete($pk))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+					else
+					{
+						// Trigger the after delete event.
+						$dispatcher->trigger($this->event_after_delete, array($table->getProperties(), true, $this->getError()));
+					}
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to generate the title of group on Save as Copy action
+	 *
+	 * @param   integer  $parentId  The id of the parent.
+	 * @param   string   $title     The title of group
+	 *
+	 * @return  string  Contains the modified title.
+	 *
+	 * @since   3.3.7
+	 */
+	protected function generateGroupTitle($parentId, $title)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('title' => $title, 'parent_id' => $parentId)))
+		{
+			if ($title == $table->title)
+			{
+				$title = StringHelper::increment($title);
+			}
+		}
+
+		return $title;
+	}
+}
diff --git a/core/administrator/components/com_users/models/groups.php b/core/administrator/components/com_users/models/groups.php
new file mode 100644
index 00000000..6c2167f7
--- /dev/null
+++ b/core/administrator/components/com_users/models/groups.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of user group records.
+ *
+ * @since  1.6
+ */
+class UsersModelGroups extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'parent_id', 'a.parent_id',
+				'title', 'a.title',
+				'lft', 'a.lft',
+				'rgt', 'a.rgt',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.lft', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_users');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Gets the list of groups and adds expensive joins to the result set.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId();
+
+		// Try to load the data from internal storage.
+		if (empty($this->cache[$store]))
+		{
+			$items = parent::getItems();
+
+			// Bail out on an error or empty list.
+			if (empty($items))
+			{
+				$this->cache[$store] = $items;
+
+				return $items;
+			}
+
+			try
+			{
+				$items = $this->populateExtraData($items);
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			// Add the items to the internal cache.
+			$this->cache[$store] = $items;
+		}
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from($db->quoteName('#__usergroups') . ' AS a');
+
+		// Filter the comments over the search string if set.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('a.title LIKE ' . $search);
+			}
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Populate level & path for items.
+	 *
+	 * @param   array  $items  Array of stdClass objects
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.3
+	 */
+	private function populateExtraData(array $items)
+	{
+		// First pass: get list of the group id's and reset the counts.
+		$groupsByKey = array();
+
+		foreach ($items as $item)
+		{
+			$groupsByKey[(int) $item->id] = $item;
+		}
+
+		$groupIds = array_keys($groupsByKey);
+
+		$db = $this->getDbo();
+
+		// Get total enabled users in group.
+		$query = $db->getQuery(true);
+
+		// Count the objects in the user group.
+		$query->select('map.group_id, COUNT(DISTINCT map.user_id) AS user_count')
+			->from($db->quoteName('#__user_usergroup_map', 'map'))
+			->join('LEFT', $db->quoteName('#__users', 'u') . ' ON ' . $db->quoteName('u.id') . ' = ' . $db->quoteName('map.user_id'))
+			->where($db->quoteName('map.group_id') . ' IN (' . implode(',', $groupIds) . ')')
+			->where($db->quoteName('u.block') . ' = 0')
+			->group($db->quoteName('map.group_id'));
+		$db->setQuery($query);
+
+		try
+		{
+			$countEnabled = $db->loadAssocList('group_id', 'count_enabled');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Get total disabled users in group.
+		$query->clear('where')
+			->where('map.group_id IN (' . implode(',', $groupIds) . ')')
+			->where('u.block = 1');
+		$db->setQuery($query);
+
+		try
+		{
+			$countDisabled = $db->loadAssocList('group_id', 'count_disabled');
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Inject the values back into the array.
+		foreach ($groupsByKey as &$item)
+		{
+			$item->count_enabled   = isset($countEnabled[$item->id]) ? (int) $countEnabled[$item->id]['user_count'] : 0;
+			$item->count_disabled  = isset($countDisabled[$item->id]) ? (int) $countDisabled[$item->id]['user_count'] : 0;
+			$item->user_count      = $item->count_enabled + $item->count_disabled;
+		}
+
+		$groups = new JHelperUsergroups($groupsByKey);
+
+		return array_values($groups->getAll());
+	}
+}
diff --git a/core/administrator/components/com_users/models/level.php b/core/administrator/components/com_users/models/level.php
new file mode 100644
index 00000000..3a0f763a
--- /dev/null
+++ b/core/administrator/components/com_users/models/level.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Helper\UserGroupsHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * User view level model.
+ *
+ * @since  1.6
+ */
+class UsersModelLevel extends AdminModel
+{
+	/**
+	 * @var	array	A list of the access levels in use.
+	 * @since   1.6
+	 */
+	protected $levelsInUse = null;
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		// Check if the access level is being used by any content.
+		if ($this->levelsInUse === null)
+		{
+			// Populate the list once.
+			$this->levelsInUse = array();
+
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select('DISTINCT access');
+
+			// Get all the tables and the prefix
+			$tables = $db->getTableList();
+			$prefix = $db->getPrefix();
+
+			foreach ($tables as $table)
+			{
+				// Get all of the columns in the table
+				$fields = $db->getTableColumns($table);
+
+				/**
+				 * We are looking for the access field.  If custom tables are using something other
+				 * than the 'access' field they are on their own unfortunately.
+				 * Also make sure the table prefix matches the live db prefix (eg, it is not a "bak_" table)
+				 */
+				if (strpos($table, $prefix) === 0 && isset($fields['access']))
+				{
+					// Lookup the distinct values of the field.
+					$query->clear('from')
+						->from($db->quoteName($table));
+					$db->setQuery($query);
+
+					try
+					{
+						$values = $db->loadColumn();
+					}
+					catch (RuntimeException $e)
+					{
+						$this->setError($e->getMessage());
+
+						return false;
+					}
+
+					$this->levelsInUse = array_merge($this->levelsInUse, $values);
+
+					// TODO Could assemble an array of the tables used by each view level list those,
+					// giving the user a clue in the error where to look.
+				}
+			}
+
+			// Get uniques.
+			$this->levelsInUse = array_unique($this->levelsInUse);
+
+			// Ok, after all that we are ready to check the record :)
+		}
+
+		if (in_array($record->id, $this->levelsInUse))
+		{
+			$this->setError(JText::sprintf('COM_USERS_ERROR_VIEW_LEVEL_IN_USE', $record->id, $record->title));
+
+			return false;
+		}
+
+		return parent::canDelete($record);
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'Viewlevel', $prefix = 'JTable', $config = array())
+	{
+		$return = JTable::getInstance($type, $prefix, $config);
+
+		return $return;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		$result = parent::getItem($pk);
+
+		// Convert the params field to an array.
+		$result->rules = json_decode($result->rules);
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm	A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.level', 'level', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_users.edit.level.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_users.level', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = '')
+	{
+		parent::preprocessForm($form, $data, 'user');
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		if (!isset($data['rules']))
+		{
+			$data['rules'] = array();
+		}
+
+		$data['title'] = JFilterInput::getInstance()->clean($data['title'], 'TRIM');
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Method to validate the form data.
+	 *
+	 * @param   \JForm  $form   The form to validate against.
+	 * @param   array   $data   The data to validate.
+	 * @param   string  $group  The name of the field group to validate.
+	 *
+	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
+	 *
+	 * @see     \JFormRule
+	 * @see     \JFilterInput
+	 * @since   3.8.8
+	 */
+	public function validate($form, $data, $group = null)
+	{
+		$isSuperAdmin = Factory::getUser()->authorise('core.admin');
+
+		// Non Super user should not be able to change the access levels of super user groups
+		if (!$isSuperAdmin)
+		{
+			if (!isset($data['rules']) || !is_array($data['rules']))
+			{
+				$data['rules'] = array();
+			}
+
+			$groups = array_values(UserGroupsHelper::getInstance()->getAll());
+
+			$rules = array();
+
+			if (!empty($data['id']))
+			{
+				$table = $this->getTable();
+
+				$table->load($data['id']);
+
+				$rules = json_decode($table->rules);
+			}
+
+			$rules = ArrayHelper::toInteger($rules);
+
+			for ($i = 0, $n = count($groups); $i < $n; ++$i)
+			{
+				if (Access::checkGroup((int) $groups[$i]->id, 'core.admin'))
+				{
+					if (in_array($groups[$i]->id, $rules) && !in_array($groups[$i]->id, $data['rules']))
+					{
+						$data['rules'][] = (int) $groups[$i]->id;
+					}
+					elseif (!in_array($groups[$i]->id, $rules) && in_array($groups[$i]->id, $data['rules']))
+					{
+						$this->setError(Text::_('JLIB_USER_ERROR_NOT_SUPERADMIN'));
+
+						return false;
+					}
+				}
+			}
+		}
+
+		return parent::validate($form, $data, $group);
+	}
+}
diff --git a/core/administrator/components/com_users/models/levels.php b/core/administrator/components/com_users/models/levels.php
new file mode 100644
index 00000000..896cdbe8
--- /dev/null
+++ b/core/administrator/components/com_users/models/levels.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of user access level records.
+ *
+ * @since  1.6
+ */
+class UsersModelLevels extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'ordering', 'a.ordering',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.ordering', $direction = 'asc')
+	{
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'));
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_users');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from($db->quoteName('#__viewlevels') . ' AS a');
+
+		// Add the level in the tree.
+		$query->group('a.id, a.title, a.ordering, a.rules');
+
+		// Filter the items over the search string if set.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('a.title LIKE ' . $search);
+			}
+		}
+
+		$query->group('a.id');
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to adjust the ordering of a row.
+	 *
+	 * @param   integer  $pk         The ID of the primary key to move.
+	 * @param   integer  $direction  Increment, usually +1 or -1
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 */
+	public function reorder($pk, $direction = 0)
+	{
+		// Sanitize the id and adjustment.
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('level.id');
+		$user = JFactory::getUser();
+
+		// Get an instance of the record's table.
+		$table = JTable::getInstance('viewlevel');
+
+		// Load the row.
+		if (!$table->load($pk))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Access checks.
+		$allow = $user->authorise('core.edit.state', 'com_users');
+
+		if (!$allow)
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+
+			return false;
+		}
+
+		// Move the row.
+		// TODO: Where clause to restrict category.
+		$table->move($pk);
+
+		return true;
+	}
+
+	/**
+	 * Saves the manually set order of records.
+	 *
+	 * @param   array    $pks    An array of primary key ids.
+	 * @param   integer  $order  Order position
+	 *
+	 * @return  boolean|JException  Boolean true on success, boolean false or JException instance on error
+	 */
+	public function saveorder($pks, $order)
+	{
+		$table = JTable::getInstance('viewlevel');
+		$user = JFactory::getUser();
+		$conditions = array();
+
+		if (empty($pks))
+		{
+			return JError::raiseWarning(500, JText::_('COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED'));
+		}
+
+		// Update ordering values
+		foreach ($pks as $i => $pk)
+		{
+			$table->load((int) $pk);
+
+			// Access checks.
+			$allow = $user->authorise('core.edit.state', 'com_users');
+
+			if (!$allow)
+			{
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+			}
+			elseif ($table->ordering != $order[$i])
+			{
+				$table->ordering = $order[$i];
+
+				if (!$table->store())
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+			}
+		}
+
+		// Execute reorder for each category.
+		foreach ($conditions as $cond)
+		{
+			$table->load($cond[0]);
+			$table->reorder($cond[1]);
+		}
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_users/models/mail.php b/core/administrator/components/com_users/models/mail.php
new file mode 100644
index 00000000..274fb616
--- /dev/null
+++ b/core/administrator/components/com_users/models/mail.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users mail model.
+ *
+ * @since  1.6
+ */
+class UsersModelMail extends JModelAdmin
+{
+	/**
+	 * Method to get the row form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm	A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.mail', 'mail', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_users.display.mail.data', array());
+
+		$this->preprocessData('com_users.mail', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error loading the form.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Send the email
+	 *
+	 * @return  boolean
+	 */
+	public function send()
+	{
+		$app    = JFactory::getApplication();
+		$data   = $app->input->post->get('jform', array(), 'array');
+		$user   = JFactory::getUser();
+		$access = new JAccess;
+		$db     = $this->getDbo();
+
+		$mode         = array_key_exists('mode', $data) ? (int) $data['mode'] : 0;
+		$subject      = array_key_exists('subject', $data) ? $data['subject'] : '';
+		$grp          = array_key_exists('group', $data) ? (int) $data['group'] : 0;
+		$recurse      = array_key_exists('recurse', $data) ? (int) $data['recurse'] : 0;
+		$bcc          = array_key_exists('bcc', $data) ? (int) $data['bcc'] : 0;
+		$disabled     = array_key_exists('disabled', $data) ? (int) $data['disabled'] : 0;
+		$message_body = array_key_exists('message', $data) ? $data['message'] : '';
+
+		// Automatically removes html formatting
+		if (!$mode)
+		{
+			$message_body = JFilterInput::getInstance()->clean($message_body, 'string');
+		}
+
+		// Check for a message body and subject
+		if (!$message_body || !$subject)
+		{
+			$app->setUserState('com_users.display.mail.data', $data);
+			$this->setError(JText::_('COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY'));
+
+			return false;
+		}
+
+		// Get users in the group out of the ACL
+		$to = $access->getUsersByGroup($grp, $recurse);
+
+		// Get all users email and group except for senders
+		$query = $db->getQuery(true)
+			->select('email')
+			->from('#__users')
+			->where('id != ' . (int) $user->get('id'));
+
+		if ($grp !== 0)
+		{
+			if (empty($to))
+			{
+				$query->where('0');
+			}
+			else
+			{
+				$query->where('id IN (' . implode(',', $to) . ')');
+			}
+		}
+
+		if ($disabled == 0)
+		{
+			$query->where('block = 0');
+		}
+
+		$db->setQuery($query);
+		$rows = $db->loadColumn();
+
+		// Check to see if there are any users in this group before we continue
+		if (!count($rows))
+		{
+			$app->setUserState('com_users.display.mail.data', $data);
+
+			if (in_array($user->id, $to))
+			{
+				$this->setError(JText::_('COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP'));
+			}
+			else
+			{
+				$this->setError(JText::_('COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP'));
+			}
+
+			return false;
+		}
+
+		// Get the Mailer
+		$mailer = JFactory::getMailer();
+		$params = JComponentHelper::getParams('com_users');
+
+		// Build email message format.
+		$mailer->setSender(array($app->get('mailfrom'), $app->get('fromname')));
+		$mailer->setSubject($params->get('mailSubjectPrefix') . stripslashes($subject));
+		$mailer->setBody($message_body . $params->get('mailBodySuffix'));
+		$mailer->IsHtml($mode);
+
+		// Add recipients
+		if ($bcc)
+		{
+			$mailer->addBcc($rows);
+			$mailer->addRecipient($app->get('mailfrom'));
+		}
+		else
+		{
+			$mailer->addRecipient($rows);
+		}
+
+		// Send the Mail
+		$rs = $mailer->Send();
+
+		// Check for an error
+		if ($rs instanceof Exception)
+		{
+			$app->setUserState('com_users.display.mail.data', $data);
+			$this->setError($rs->getError());
+
+			return false;
+		}
+		elseif (empty($rs))
+		{
+			$app->setUserState('com_users.display.mail.data', $data);
+			$this->setError(JText::_('COM_USERS_MAIL_THE_MAIL_COULD_NOT_BE_SENT'));
+
+			return false;
+		}
+		else
+		{
+			/**
+			 * Fill the data (specially for the 'mode', 'group' and 'bcc': they could not exist in the array
+			 * when the box is not checked and in this case, the default value would be used instead of the '0'
+			 * one)
+			 */
+			$data['mode']    = $mode;
+			$data['subject'] = $subject;
+			$data['group']   = $grp;
+			$data['recurse'] = $recurse;
+			$data['bcc']     = $bcc;
+			$data['message'] = $message_body;
+			$app->setUserState('com_users.display.mail.data', array());
+			$app->enqueueMessage(JText::plural('COM_USERS_MAIL_EMAIL_SENT_TO_N_USERS', count($rows)), 'message');
+
+			return true;
+		}
+	}
+}
diff --git a/core/administrator/components/com_users/models/note.php b/core/administrator/components/com_users/models/note.php
new file mode 100644
index 00000000..123961ed
--- /dev/null
+++ b/core/administrator/components/com_users/models/note.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User note model.
+ *
+ * @since  2.5
+ */
+class UsersModelNote extends JModelAdmin
+{
+	/**
+	 * The type alias for this content type.
+	 *
+	 * @var      string
+	 * @since    3.2
+	 */
+	public $typeAlias = 'com_users.note';
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   2.5
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.note', 'note', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	public function getItem($pk = null)
+	{
+		$result = parent::getItem($pk);
+
+		// Get the dispatcher and load the content plugins.
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('content');
+
+		// Load the user plugins for backward compatibility (v3.3.3 and earlier).
+		JPluginHelper::importPlugin('user');
+
+		// Trigger the data preparation event.
+		$dispatcher->trigger('onContentPrepareData', array('com_users.note', $result));
+
+		return $result;
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  The table object
+	 *
+	 * @since   2.5
+	 */
+	public function getTable($name = 'Note', $prefix = 'UsersTable', $options = array())
+	{
+		return JTable::getInstance($name, $prefix, $options);
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Get the application
+		$app = JFactory::getApplication();
+
+		// Check the session for previously entered form data.
+		$data = $app->getUserState('com_users.edit.note.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+
+			// Prime some default values.
+			if ($this->getState('note.id') == 0)
+			{
+				$data->set('catid', $app->input->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int'));
+			}
+
+			$userId = $app->input->get('u_id', 0, 'int');
+
+			if ($userId != 0)
+			{
+				$data->user_id = $userId;
+			}
+		}
+
+		$this->preprocessData('com_users.note', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState()
+	{
+		parent::populateState();
+
+		$userId = JFactory::getApplication()->input->get('u_id', 0, 'int');
+		$this->setState('note.user_id', $userId);
+	}
+}
diff --git a/core/administrator/components/com_users/models/notes.php b/core/administrator/components/com_users/models/notes.php
new file mode 100644
index 00000000..4bb9b247
--- /dev/null
+++ b/core/administrator/components/com_users/models/notes.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User notes model class.
+ *
+ * @since  2.5
+ */
+class UsersModelNotes extends JModelList
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since  2.5
+	 */
+	public function __construct($config = array())
+	{
+		// Set the list ordering fields.
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'user_id', 'a.user_id',
+				'u.name',
+				'subject', 'a.subject',
+				'catid', 'a.catid', 'category_id',
+				'state', 'a.state', 'published',
+				'c.title',
+				'review_time', 'a.review_time',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'level', 'c.level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery  A JDatabaseQuery object to retrieve the data set.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState('list.select',
+				'a.id, a.subject, a.checked_out, a.checked_out_time,' .
+				'a.catid, a.created_time, a.review_time,' .
+				'a.state, a.publish_up, a.publish_down'
+			)
+		);
+		$query->from('#__user_notes AS a');
+
+		// Join over the category
+		$query->select('c.title AS category_title, c.params AS category_params')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		// Join over the users for the note user.
+		$query->select('u.name AS user_name')
+			->join('LEFT', '#__users AS u ON u.id = a.user_id');
+
+		// Join over the users for the checked out user.
+		$query->select('uc.name AS editor')
+			->join('LEFT', '#__users AS uc ON uc.id = a.checked_out');
+
+		// Filter by search in title
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'uid:') === 0)
+			{
+				$query->where('a.user_id = ' . (int) substr($search, 4));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('((a.subject LIKE ' . $search . ') OR (u.name LIKE ' . $search . ') OR (u.username LIKE ' . $search . '))');
+			}
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			$query->where('a.state = ' . (int) $published);
+		}
+		elseif ($published === '')
+		{
+			$query->where('(a.state IN (0, 1))');
+		}
+
+		// Filter by a single category.
+		$categoryId = (int) $this->getState('filter.category_id');
+
+		if ($categoryId)
+		{
+			$query->where('a.catid = ' . $categoryId);
+		}
+
+		// Filter by a single user.
+		$userId = (int) $this->getState('filter.user_id');
+
+		if ($userId)
+		{
+			// Add the body and where filter.
+			$query->select('a.body')
+				->where('a.user_id = ' . $userId);
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$query->where($db->quoteName('c.level') . ' <= ' . (int) $level);
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.review_time')) . ' ' . $db->escape($this->getState('list.direction', 'DESC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.category_id');
+		$id .= ':' . $this->getState('filter.user_id');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Gets a user object if the user filter is set.
+	 *
+	 * @return  JUser  The JUser object
+	 *
+	 * @since   2.5
+	 */
+	public function getUser()
+	{
+		$user = new JUser;
+
+		// Filter by search in title
+		$search = (int) $this->getState('filter.user_id');
+
+		if ($search != 0)
+		{
+			$user->load((int) $search);
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.review_time', $direction = 'desc')
+	{
+		// Adjust the context to support modal layouts.
+		if ($layout = JFactory::getApplication()->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'));
+		$this->setState('filter.published', $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '', 'string'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id'));
+		$this->setState('filter.user_id', $this->getUserStateFromRequest($this->context . '.filter.user_id', 'filter_user_id'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+
+		parent::populateState($ordering, $direction);
+	}
+}
diff --git a/core/administrator/components/com_users/models/user.php b/core/administrator/components/com_users/models/user.php
new file mode 100644
index 00000000..6d74f773
--- /dev/null
+++ b/core/administrator/components/com_users/models/user.php
@@ -0,0 +1,1396 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * User model.
+ *
+ * @since  1.6
+ */
+class UsersModelUser extends JModelAdmin
+{
+	/**
+	 * An item.
+	 *
+	 * @var    array
+	 */
+	protected $_item = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.2
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'event_after_delete'  => 'onUserAfterDelete',
+				'event_after_save'    => 'onUserAfterSave',
+				'event_before_delete' => 'onUserBeforeDelete',
+				'event_before_save'   => 'onUserBeforeSave',
+				'events_map'          => array('save' => 'user', 'delete' => 'user', 'validate' => 'user')
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Returns a reference to the a Table object, always creating it.
+	 *
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JTable  A database object
+	 *
+	 * @since   1.6
+	 */
+	public function getTable($type = 'User', $prefix = 'JTable', $config = array())
+	{
+		$table = JTable::getInstance($type, $prefix, $config);
+
+		return $table;
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  mixed  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('user.id');
+
+		if ($this->_item === null)
+		{
+			$this->_item = array();
+		}
+
+		if (!isset($this->_item[$pk]))
+		{
+			$result = parent::getItem($pk);
+
+			if ($result)
+			{
+				$result->tags = new JHelperTags;
+				$result->tags->getTagIds($result->id, 'com_users.user');
+			}
+
+			$this->_item[$pk] = $result;
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$pluginParams = new Registry;
+
+		if (JPluginHelper::isEnabled('user', 'joomla'))
+		{
+			$plugin = JPluginHelper::getPlugin('user', 'joomla');
+			$pluginParams->loadString($plugin->params);
+		}
+
+		// Get the form.
+		$form = $this->loadForm('com_users.user', 'user', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$userId = $form->getValue('id');
+
+		// Passwords fields are required when mail to user is set to No in the joomla user plugin
+		if ($userId === 0 && $pluginParams->get('mail_to_user', '1') === '0')
+		{
+			$form->setFieldAttribute('password', 'required', 'true');
+			$form->setFieldAttribute('password2', 'required', 'true');
+		}
+
+		// If the user needs to change their password, mark the password fields as required
+		if (JFactory::getUser()->requireReset)
+		{
+			$form->setFieldAttribute('password', 'required', 'true');
+			$form->setFieldAttribute('password2', 'required', 'true');
+		}
+
+		// When multilanguage is set, a user's default site language should also be a Content Language
+		if (JLanguageMultilang::isEnabled())
+		{
+			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
+		}
+
+		// The user should not be able to set the requireReset value on their own account
+		if ((int) $userId === (int) JFactory::getUser()->id)
+		{
+			$form->removeField('requireReset');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = JFactory::getApplication()->getUserState('com_users.edit.user.data', array());
+
+		if (empty($data))
+		{
+			$data = $this->getItem();
+		}
+
+		$this->preprocessData('com_users.profile', $data, 'user');
+
+		return $data;
+	}
+
+	/**
+	 * Override JModelAdmin::preprocessForm to ensure the correct plugin group is loaded.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$pk   = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
+		$user = JUser::getInstance($pk);
+
+		$my = JFactory::getUser();
+		$iAmSuperAdmin = $my->authorise('core.admin');
+
+		// User cannot modify own user groups
+		if ((int) $user->id == (int) $my->id && !$iAmSuperAdmin && isset($data['groups']))
+		{
+			// Form was probably tampered with
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_USERS_USERS_ERROR_CANNOT_EDIT_OWN_GROUP'), 'warning');
+
+			$data['groups'] = null;
+		}
+
+		if ($data['block'] && $pk == $my->id && !$my->block)
+		{
+			$this->setError(JText::_('COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF'));
+
+			return false;
+		}
+
+		// Make sure user groups is selected when add/edit an account
+		if (empty($data['groups']) && ((int) $user->id != (int) $my->id || $iAmSuperAdmin))
+		{
+			$this->setError(JText::_('COM_USERS_USERS_ERROR_CANNOT_SAVE_ACCOUNT_WITHOUT_GROUPS'));
+
+			return false;
+		}
+
+		// Make sure that we are not removing ourself from Super Admin group
+		if ($iAmSuperAdmin && $my->get('id') == $pk)
+		{
+			// Check that at least one of our new groups is Super Admin
+			$stillSuperAdmin = false;
+			$myNewGroups = $data['groups'];
+
+			foreach ($myNewGroups as $group)
+			{
+				$stillSuperAdmin = $stillSuperAdmin ?: JAccess::checkGroup($group, 'core.admin');
+			}
+
+			if (!$stillSuperAdmin)
+			{
+				$this->setError(JText::_('COM_USERS_USERS_ERROR_CANNOT_DEMOTE_SELF'));
+
+				return false;
+			}
+		}
+
+		// Handle the two factor authentication setup
+		if (array_key_exists('twofactor', $data))
+		{
+			$twoFactorMethod = $data['twofactor']['method'];
+
+			// Get the current One Time Password (two factor auth) configuration
+			$otpConfig = $this->getOtpConfig($pk);
+
+			if ($twoFactorMethod != 'none')
+			{
+				// Run the plugins
+				FOFPlatform::getInstance()->importPlugin('twofactorauth');
+				$otpConfigReplies = FOFPlatform::getInstance()->runPlugins('onUserTwofactorApplyConfiguration', array($twoFactorMethod));
+
+				// Look for a valid reply
+				foreach ($otpConfigReplies as $reply)
+				{
+					if (!is_object($reply) || empty($reply->method) || ($reply->method != $twoFactorMethod))
+					{
+						continue;
+					}
+
+					$otpConfig->method = $reply->method;
+					$otpConfig->config = $reply->config;
+
+					break;
+				}
+
+				// Save OTP configuration.
+				$this->setOtpConfig($pk, $otpConfig);
+
+				// Generate one time emergency passwords if required (depleted or not set)
+				if (empty($otpConfig->otep))
+				{
+					$oteps = $this->generateOteps($pk);
+				}
+			}
+			else
+			{
+				$otpConfig->method = 'none';
+				$otpConfig->config = array();
+				$this->setOtpConfig($pk, $otpConfig);
+			}
+
+			// Unset the raw data
+			unset($data['twofactor']);
+
+			// Reload the user record with the updated OTP configuration
+			$user->load($pk);
+		}
+
+		// Bind the data.
+		if (!$user->bind($data))
+		{
+			$this->setError($user->getError());
+
+			return false;
+		}
+
+		// Store the data.
+		if (!$user->save())
+		{
+			$this->setError($user->getError());
+
+			return false;
+		}
+
+		$this->setState('user.id', $user->id);
+
+		return true;
+	}
+
+	/**
+	 * Method to delete rows.
+	 *
+	 * @param   array  &$pks  An array of item ids.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function delete(&$pks)
+	{
+		$user  = JFactory::getUser();
+		$table = $this->getTable();
+		$pks   = (array) $pks;
+
+		// Check if I am a Super Admin
+		$iAmSuperAdmin = $user->authorise('core.admin');
+
+		JPluginHelper::importPlugin($this->events_map['delete']);
+		$dispatcher = JEventDispatcher::getInstance();
+
+		if (in_array($user->id, $pks))
+		{
+			$this->setError(JText::_('COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF'));
+
+			return false;
+		}
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				// Access checks.
+				$allow = $user->authorise('core.delete', 'com_users');
+
+				// Don't allow non-super-admin to delete a super admin
+				$allow = (!$iAmSuperAdmin && JAccess::check($pk, 'core.admin')) ? false : $allow;
+
+				if ($allow)
+				{
+					// Get users data for the users to delete.
+					$user_to_delete = JFactory::getUser($pk);
+
+					// Fire the before delete event.
+					$dispatcher->trigger($this->event_before_delete, array($table->getProperties()));
+
+					if (!$table->delete($pk))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+					else
+					{
+						// Trigger the after delete event.
+						$dispatcher->trigger($this->event_after_delete, array($user_to_delete->getProperties(), true, $this->getError()));
+					}
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					JError::raiseWarning(403, JText::_('JERROR_CORE_DELETE_NOT_PERMITTED'));
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to block user records.
+	 *
+	 * @param   array    &$pks   The ids of the items to publish.
+	 * @param   integer  $value  The value of the published state
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function block(&$pks, $value = 1)
+	{
+		$app        = JFactory::getApplication();
+		$dispatcher = JEventDispatcher::getInstance();
+		$user       = JFactory::getUser();
+
+		// Check if I am a Super Admin
+		$iAmSuperAdmin = $user->authorise('core.admin');
+		$table         = $this->getTable();
+		$pks           = (array) $pks;
+
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Prepare the logout options.
+		$options = array(
+			'clientid' => $app->get('shared_session', '0') ? null : 0,
+		);
+
+		// Access checks.
+		foreach ($pks as $i => $pk)
+		{
+			if ($value == 1 && $pk == $user->get('id'))
+			{
+				// Cannot block yourself.
+				unset($pks[$i]);
+				JError::raiseWarning(403, JText::_('COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF'));
+			}
+			elseif ($table->load($pk))
+			{
+				$old   = $table->getProperties();
+				$allow = $user->authorise('core.edit.state', 'com_users');
+
+				// Don't allow non-super-admin to delete a super admin
+				$allow = (!$iAmSuperAdmin && JAccess::check($pk, 'core.admin')) ? false : $allow;
+
+				if ($allow)
+				{
+					// Skip changing of same state
+					if ($table->block == $value)
+					{
+						unset($pks[$i]);
+						continue;
+					}
+
+					$table->block = (int) $value;
+
+					// If unblocking, also change password reset count to zero to unblock reset
+					if ($table->block === 0)
+					{
+						$table->resetCount = 0;
+					}
+
+					// Allow an exception to be thrown.
+					try
+					{
+						if (!$table->check())
+						{
+							$this->setError($table->getError());
+
+							return false;
+						}
+
+						// Trigger the before save event.
+						$result = $dispatcher->trigger($this->event_before_save, array($old, false, $table->getProperties()));
+
+						if (in_array(false, $result, true))
+						{
+							// Plugin will have to raise its own error or throw an exception.
+							return false;
+						}
+
+						// Store the table.
+						if (!$table->store())
+						{
+							$this->setError($table->getError());
+
+							return false;
+						}
+
+						// Trigger the after save event
+						$dispatcher->trigger($this->event_after_save, array($table->getProperties(), false, true, null));
+					}
+					catch (Exception $e)
+					{
+						$this->setError($e->getMessage());
+
+						return false;
+					}
+
+					// Log the user out.
+					if ($value)
+					{
+						$app->logout($table->id, $options);
+					}
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to activate user records.
+	 *
+	 * @param   array  &$pks  The ids of the items to activate.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function activate(&$pks)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		$user       = JFactory::getUser();
+
+		// Check if I am a Super Admin
+		$iAmSuperAdmin = $user->authorise('core.admin');
+		$table         = $this->getTable();
+		$pks           = (array) $pks;
+
+		JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Access checks.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				$old   = $table->getProperties();
+				$allow = $user->authorise('core.edit.state', 'com_users');
+
+				// Don't allow non-super-admin to delete a super admin
+				$allow = (!$iAmSuperAdmin && JAccess::check($pk, 'core.admin')) ? false : $allow;
+
+				if (empty($table->activation))
+				{
+					// Ignore activated accounts.
+					unset($pks[$i]);
+				}
+				elseif ($allow)
+				{
+					$table->block      = 0;
+					$table->activation = '';
+
+					// Allow an exception to be thrown.
+					try
+					{
+						if (!$table->check())
+						{
+							$this->setError($table->getError());
+
+							return false;
+						}
+
+						// Trigger the before save event.
+						$result = $dispatcher->trigger($this->event_before_save, array($old, false, $table->getProperties()));
+
+						if (in_array(false, $result, true))
+						{
+							// Plugin will have to raise it's own error or throw an exception.
+							return false;
+						}
+
+						// Store the table.
+						if (!$table->store())
+						{
+							$this->setError($table->getError());
+
+							return false;
+						}
+
+						// Fire the after save event
+						$dispatcher->trigger($this->event_after_save, array($table->getProperties(), false, true, null));
+					}
+					catch (Exception $e)
+					{
+						$this->setError($e->getMessage());
+
+						return false;
+					}
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to perform batch operations on an item or a set of items.
+	 *
+	 * @param   array  $commands  An array of commands to perform.
+	 * @param   array  $pks       An array of item ids.
+	 * @param   array  $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	public function batch($commands, $pks, $contexts)
+	{
+		// Sanitize user ids.
+		$pks = array_unique($pks);
+		$pks = ArrayHelper::toInteger($pks);
+
+		// Remove any values of zero.
+		if (array_search(0, $pks, true))
+		{
+			unset($pks[array_search(0, $pks, true)]);
+		}
+
+		if (empty($pks))
+		{
+			$this->setError(JText::_('COM_USERS_USERS_NO_ITEM_SELECTED'));
+
+			return false;
+		}
+
+		$done = false;
+
+		if (!empty($commands['group_id']))
+		{
+			$cmd = ArrayHelper::getValue($commands, 'group_action', 'add');
+
+			if (!$this->batchUser((int) $commands['group_id'], $pks, $cmd))
+			{
+				return false;
+			}
+
+			$done = true;
+		}
+
+		if (!empty($commands['reset_id']))
+		{
+			if (!$this->batchReset($pks, $commands['reset_id']))
+			{
+				return false;
+			}
+
+			$done = true;
+		}
+
+		if (!$done)
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch flag users as being required to reset their passwords
+	 *
+	 * @param   array   $user_ids  An array of user IDs on which to operate
+	 * @param   string  $action    The action to perform
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @since   3.2
+	 */
+	public function batchReset($user_ids, $action)
+	{
+		$user_ids = ArrayHelper::toInteger($user_ids);
+
+		// Check if I am a Super Admin
+		$iAmSuperAdmin = JFactory::getUser()->authorise('core.admin');
+
+		// Non-super super user cannot work with super-admin user.
+		if (!$iAmSuperAdmin && JUserHelper::checkSuperUserInUsers($user_ids))
+		{
+			$this->setError(JText::_('COM_USERS_ERROR_CANNOT_BATCH_SUPERUSER'));
+
+			return false;
+		}
+
+		// Set the action to perform
+		if ($action === 'yes')
+		{
+			$value = 1;
+		}
+		else
+		{
+			$value = 0;
+		}
+
+		// Prune out the current user if they are in the supplied user ID array
+		$user_ids = array_diff($user_ids, array(JFactory::getUser()->id));
+
+		if (empty($user_ids))
+		{
+			$this->setError(JText::_('COM_USERS_USERS_ERROR_CANNOT_REQUIRERESET_SELF'));
+
+			return false;
+		}
+
+		// Get the DB object
+		$db = $this->getDbo();
+
+		$user_ids = ArrayHelper::toInteger($user_ids);
+
+		$query = $db->getQuery(true);
+
+		// Update the reset flag
+		$query->update($db->quoteName('#__users'))
+			->set($db->quoteName('requireReset') . ' = ' . $value)
+			->where($db->quoteName('id') . ' IN (' . implode(',', $user_ids) . ')');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Perform batch operations
+	 *
+	 * @param   integer  $group_id  The group ID which assignments are being edited
+	 * @param   array    $user_ids  An array of user IDs on which to operate
+	 * @param   string   $action    The action to perform
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function batchUser($group_id, $user_ids, $action)
+	{
+		$user_ids = ArrayHelper::toInteger($user_ids);
+
+		// Check if I am a Super Admin
+		$iAmSuperAdmin = JFactory::getUser()->authorise('core.admin');
+
+		// Non-super super user cannot work with super-admin user.
+		if (!$iAmSuperAdmin && JUserHelper::checkSuperUserInUsers($user_ids))
+		{
+			$this->setError(JText::_('COM_USERS_ERROR_CANNOT_BATCH_SUPERUSER'));
+
+			return false;
+		}
+
+		// Non-super admin cannot work with super-admin group.
+		if ((!$iAmSuperAdmin && JAccess::checkGroup($group_id, 'core.admin')) || $group_id < 1)
+		{
+			$this->setError(JText::_('COM_USERS_ERROR_INVALID_GROUP'));
+
+			return false;
+		}
+
+		// Get the DB object
+		$db = $this->getDbo();
+
+		switch ($action)
+		{
+			// Sets users to a selected group
+			case 'set':
+				$doDelete = 'all';
+				$doAssign = true;
+				break;
+
+			// Remove users from a selected group
+			case 'del':
+				$doDelete = 'group';
+				break;
+
+			// Add users to a selected group
+			case 'add':
+			default:
+				$doAssign = true;
+				break;
+		}
+
+		// Remove the users from the group if requested.
+		if (isset($doDelete))
+		{
+			$query = $db->getQuery(true);
+
+			// Remove users from the group
+			$query->delete($db->quoteName('#__user_usergroup_map'))
+				->where($db->quoteName('user_id') . ' IN (' . implode(',', $user_ids) . ')');
+
+			// Only remove users from selected group
+			if ($doDelete == 'group')
+			{
+				$query->where($db->quoteName('group_id') . ' = ' . (int) $group_id);
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		// Assign the users to the group if requested.
+		if (isset($doAssign))
+		{
+			$query = $db->getQuery(true);
+
+			// First, we need to check if the user is already assigned to a group
+			$query->select($db->quoteName('user_id'))
+				->from($db->quoteName('#__user_usergroup_map'))
+				->where($db->quoteName('group_id') . ' = ' . (int) $group_id);
+			$db->setQuery($query);
+			$users = $db->loadColumn();
+
+			// Build the values clause for the assignment query.
+			$query->clear();
+			$groups = false;
+
+			foreach ($user_ids as $id)
+			{
+				if (!in_array($id, $users))
+				{
+					$query->values($id . ',' . $group_id);
+					$groups = true;
+				}
+			}
+
+			// If we have no users to process, throw an error to notify the user
+			if (!$groups)
+			{
+				$this->setError(JText::_('COM_USERS_ERROR_NO_ADDITIONS'));
+
+				return false;
+			}
+
+			$query->insert($db->quoteName('#__user_usergroup_map'))
+				->columns(array($db->quoteName('user_id'), $db->quoteName('group_id')));
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the available groups.
+	 *
+	 * @return  array  An array of groups
+	 *
+	 * @since   1.6
+	 */
+	public function getGroups()
+	{
+		$user = JFactory::getUser();
+
+		if ($user->authorise('core.edit', 'com_users') && $user->authorise('core.manage', 'com_users'))
+		{
+			$model = JModelLegacy::getInstance('Groups', 'UsersModel', array('ignore_request' => true));
+
+			return $model->getItems();
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Gets the groups this object is assigned to
+	 *
+	 * @param   integer  $userId  The user ID to retrieve the groups for
+	 *
+	 * @return  array  An array of assigned groups
+	 *
+	 * @since   1.6
+	 */
+	public function getAssignedGroups($userId = null)
+	{
+		$userId = (!empty($userId)) ? $userId : (int) $this->getState('user.id');
+
+		if (empty($userId))
+		{
+			$result   = array();
+			$form     = $this->getForm();
+
+			if ($form)
+			{
+				$groupsIDs = $form->getValue('groups');
+			}
+
+			if (!empty($groupsIDs))
+			{
+				$result = $groupsIDs;
+			}
+			else
+			{
+				$config = JComponentHelper::getParams('com_users');
+
+				if ($groupId = $config->get('new_usertype'))
+				{
+					$result[] = $groupId;
+				}
+			}
+		}
+		else
+		{
+			$result = JUserHelper::getUserGroups($userId);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns the one time password (OTP) – a.k.a. two factor authentication –
+	 * configuration for a particular user.
+	 *
+	 * @param   integer  $user_id  The numeric ID of the user
+	 *
+	 * @return  stdClass  An object holding the OTP configuration for this user
+	 *
+	 * @since   3.2
+	 */
+	public function getOtpConfig($user_id = null)
+	{
+		$user_id = (!empty($user_id)) ? $user_id : (int) $this->getState('user.id');
+
+		// Initialise
+		$otpConfig = (object) array(
+			'method' => 'none',
+			'config' => array(),
+			'otep'   => array()
+		);
+
+		/**
+		 * Get the raw data, without going through JUser (required in order to
+		 * be able to modify the user record before logging in the user).
+		 */
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn('#__users'))
+			->where($db->qn('id') . ' = ' . (int) $user_id);
+		$db->setQuery($query);
+		$item = $db->loadObject();
+
+		// Make sure this user does have OTP enabled
+		if (empty($item->otpKey))
+		{
+			return $otpConfig;
+		}
+
+		// Get the encrypted data
+		list($method, $config) = explode(':', $item->otpKey, 2);
+		$encryptedOtep = $item->otep;
+
+		// Get the secret key, yes the thing that is saved in the configuration file
+		$key = $this->getOtpConfigEncryptionKey();
+
+		if (strpos($config, '{') === false)
+		{
+			$openssl         = new FOFEncryptAes($key, 256);
+			$mcrypt          = new FOFEncryptAes($key, 256, 'cbc', null, 'mcrypt');
+
+			$decryptedConfig = $mcrypt->decryptString($config);
+
+			if (strpos($decryptedConfig, '{') !== false)
+			{
+				// Data encrypted with mcrypt
+				$decryptedOtep = $mcrypt->decryptString($encryptedOtep);
+				$encryptedOtep = $openssl->encryptString($decryptedOtep);
+			}
+			else
+			{
+				// Config data seems to be save encrypted, this can happen with 3.6.3 and openssl, lets get the data
+				$decryptedConfig = $openssl->decryptString($config);
+			}
+
+			$otpKey = $method . ':' . $decryptedConfig;
+
+			$query = $db->getQuery(true)
+				->update($db->qn('#__users'))
+				->set($db->qn('otep') . '=' . $db->q($encryptedOtep))
+				->set($db->qn('otpKey') . '=' . $db->q($otpKey))
+				->where($db->qn('id') . ' = ' . $db->q($user_id));
+			$db->setQuery($query);
+			$db->execute();
+		}
+		else
+		{
+			$decryptedConfig = $config;
+		}
+
+		// Create an encryptor class
+		$aes = new FOFEncryptAes($key, 256);
+
+		// Decrypt the data
+		$decryptedOtep = $aes->decryptString($encryptedOtep);
+
+		// Remove the null padding added during encryption
+		$decryptedConfig = rtrim($decryptedConfig, "\0");
+		$decryptedOtep = rtrim($decryptedOtep, "\0");
+
+		// Update the configuration object
+		$otpConfig->method = $method;
+		$otpConfig->config = @json_decode($decryptedConfig);
+		$otpConfig->otep = @json_decode($decryptedOtep);
+
+		/*
+		 * If the decryption failed for any reason we essentially disable the
+		 * two-factor authentication. This prevents impossible to log in sites
+		 * if the site admin changes the site secret for any reason.
+		 */
+		if (is_null($otpConfig->config))
+		{
+			$otpConfig->config = array();
+		}
+
+		if (is_object($otpConfig->config))
+		{
+			$otpConfig->config = (array) $otpConfig->config;
+		}
+
+		if (is_null($otpConfig->otep))
+		{
+			$otpConfig->otep = array();
+		}
+
+		if (is_object($otpConfig->otep))
+		{
+			$otpConfig->otep = (array) $otpConfig->otep;
+		}
+
+		// Return the configuration object
+		return $otpConfig;
+	}
+
+	/**
+	 * Sets the one time password (OTP) – a.k.a. two factor authentication –
+	 * configuration for a particular user. The $otpConfig object is the same as
+	 * the one returned by the getOtpConfig method.
+	 *
+	 * @param   integer   $user_id    The numeric ID of the user
+	 * @param   stdClass  $otpConfig  The OTP configuration object
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 */
+	public function setOtpConfig($user_id, $otpConfig)
+	{
+		$user_id = (!empty($user_id)) ? $user_id : (int) $this->getState('user.id');
+
+		$updates = (object) array(
+			'id'     => $user_id,
+			'otpKey' => '',
+			'otep'   => ''
+		);
+
+		// Create an encryptor class
+		$key = $this->getOtpConfigEncryptionKey();
+		$aes = new FOFEncryptAes($key, 256);
+
+		// Create the encrypted option strings
+		if (!empty($otpConfig->method) && ($otpConfig->method != 'none'))
+		{
+			$decryptedConfig = json_encode($otpConfig->config);
+			$decryptedOtep = json_encode($otpConfig->otep);
+			$updates->otpKey = $otpConfig->method . ':' . $decryptedConfig;
+			$updates->otep = $aes->encryptString($decryptedOtep);
+		}
+
+		$db = $this->getDbo();
+		$result = $db->updateObject('#__users', $updates, 'id');
+
+		return $result;
+	}
+
+	/**
+	 * Gets the symmetric encryption key for the OTP configuration data. It
+	 * currently returns the site's secret.
+	 *
+	 * @return  string  The encryption key
+	 *
+	 * @since   3.2
+	 */
+	public function getOtpConfigEncryptionKey()
+	{
+		return JFactory::getConfig()->get('secret');
+	}
+
+	/**
+	 * Gets the configuration forms for all two-factor authentication methods
+	 * in an array.
+	 *
+	 * @param   integer  $user_id  The user ID to load the forms for (optional)
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public function getTwofactorform($user_id = null)
+	{
+		$user_id = (!empty($user_id)) ? $user_id : (int) $this->getState('user.id');
+
+		$otpConfig = $this->getOtpConfig($user_id);
+
+		FOFPlatform::getInstance()->importPlugin('twofactorauth');
+
+		return FOFPlatform::getInstance()->runPlugins('onUserTwofactorShowConfiguration', array($otpConfig, $user_id));
+	}
+
+	/**
+	 * Generates a new set of One Time Emergency Passwords (OTEPs) for a given user.
+	 *
+	 * @param   integer  $user_id  The user ID
+	 * @param   integer  $count    How many OTEPs to generate? Default: 10
+	 *
+	 * @return  array  The generated OTEPs
+	 *
+	 * @since   3.2
+	 */
+	public function generateOteps($user_id, $count = 10)
+	{
+		$user_id = (!empty($user_id)) ? $user_id : (int) $this->getState('user.id');
+
+		// Initialise
+		$oteps = array();
+
+		// Get the OTP configuration for the user
+		$otpConfig = $this->getOtpConfig($user_id);
+
+		// If two factor authentication is not enabled, abort
+		if (empty($otpConfig->method) || ($otpConfig->method == 'none'))
+		{
+			return $oteps;
+		}
+
+		$salt = '0123456789';
+		$base = strlen($salt);
+		$length = 16;
+
+		for ($i = 0; $i < $count; $i++)
+		{
+			$makepass = '';
+			$random = JCrypt::genRandomBytes($length + 1);
+			$shift = ord($random[0]);
+
+			for ($j = 1; $j <= $length; ++$j)
+			{
+				$makepass .= $salt[($shift + ord($random[$j])) % $base];
+				$shift += ord($random[$j]);
+			}
+
+			$oteps[] = $makepass;
+		}
+
+		$otpConfig->otep = $oteps;
+
+		// Save the now modified OTP configuration
+		$this->setOtpConfig($user_id, $otpConfig);
+
+		return $oteps;
+	}
+
+	/**
+	 * Checks if the provided secret key is a valid two factor authentication
+	 * secret key. If not, it will check it against the list of one time
+	 * emergency passwords (OTEPs). If it's a valid OTEP it will also remove it
+	 * from the user's list of OTEPs.
+	 *
+	 * This method will return true in the following conditions:
+	 * - The two factor authentication is not enabled
+	 * - You have provided a valid secret key for
+	 * - You have provided a valid OTEP
+	 *
+	 * You can define the following options in the $options array:
+	 * otp_config		The OTP (one time password, a.k.a. two factor auth)
+	 *				    configuration object. If not set we'll load it automatically.
+	 * warn_if_not_req	Issue a warning if you are checking a secret key against
+	 *					a user account which doesn't have any two factor
+	 *					authentication method enabled.
+	 * warn_irq_msg		The string to use for the warn_if_not_req warning
+	 *
+	 * @param   integer  $user_id    The user's numeric ID
+	 * @param   string   $secretkey  The secret key you want to check
+	 * @param   array    $options    Options; see above
+	 *
+	 * @return  boolean  True if it's a valid secret key for this user.
+	 *
+	 * @since   3.2
+	 */
+	public function isValidSecretKey($user_id, $secretkey, $options = array())
+	{
+		// Load the user's OTP (one time password, a.k.a. two factor auth) configuration
+		if (!array_key_exists('otp_config', $options))
+		{
+			$otpConfig = $this->getOtpConfig($user_id);
+			$options['otp_config'] = $otpConfig;
+		}
+		else
+		{
+			$otpConfig = $options['otp_config'];
+		}
+
+		// Check if the user has enabled two factor authentication
+		if (empty($otpConfig->method) || ($otpConfig->method == 'none'))
+		{
+			// Load language
+			$lang = JFactory::getLanguage();
+			$extension = 'com_users';
+			$source = JPATH_ADMINISTRATOR . '/components/' . $extension;
+
+			$lang->load($extension, JPATH_ADMINISTRATOR, null, false, true)
+				|| $lang->load($extension, $source, null, false, true);
+
+			$warn = true;
+			$warnMessage = JText::_('COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA');
+
+			if (array_key_exists('warn_if_not_req', $options))
+			{
+				$warn = $options['warn_if_not_req'];
+			}
+
+			if (array_key_exists('warn_irq_msg', $options))
+			{
+				$warnMessage = $options['warn_irq_msg'];
+			}
+
+			// Warn the user if they are using a secret code but they have not
+			// enabled two factor auth in their account.
+			if (!empty($secretkey) && $warn)
+			{
+				try
+				{
+					$app = JFactory::getApplication();
+					$app->enqueueMessage($warnMessage, 'warning');
+				}
+				catch (Exception $exc)
+				{
+					// This happens when we are in CLI mode. In this case
+					// no warning is issued
+					return true;
+				}
+			}
+
+			return true;
+		}
+
+		$credentials = array(
+			'secretkey' => $secretkey,
+		);
+
+		// Try to validate the OTP
+		FOFPlatform::getInstance()->importPlugin('twofactorauth');
+
+		$otpAuthReplies = FOFPlatform::getInstance()->runPlugins('onUserTwofactorAuthenticate', array($credentials, $options));
+
+		$check = false;
+
+		/*
+		 * This looks like noob code but DO NOT TOUCH IT and do not convert
+		 * to in_array(). During testing in_array() inexplicably returned
+		 * null when the OTEP begins with a zero! o_O
+		 */
+		if (!empty($otpAuthReplies))
+		{
+			foreach ($otpAuthReplies as $authReply)
+			{
+				$check = $check || $authReply;
+			}
+		}
+
+		// Fall back to one time emergency passwords
+		if (!$check)
+		{
+			$check = $this->isValidOtep($user_id, $secretkey, $otpConfig);
+		}
+
+		return $check;
+	}
+
+	/**
+	 * Checks if the supplied string is a valid one time emergency password
+	 * (OTEP) for this user. If it is it will be automatically removed from the
+	 * user's list of OTEPs.
+	 *
+	 * @param   integer  $user_id    The user ID against which you are checking
+	 * @param   string   $otep       The string you want to test for validity
+	 * @param   object   $otpConfig  Optional; the two factor authentication configuration (automatically fetched if not set)
+	 *
+	 * @return  boolean  True if it's a valid OTEP or if two factor auth is not
+	 *                   enabled in this user's account.
+	 *
+	 * @since   3.2
+	 */
+	public function isValidOtep($user_id, $otep, $otpConfig = null)
+	{
+		if (is_null($otpConfig))
+		{
+			$otpConfig = $this->getOtpConfig($user_id);
+		}
+
+		// Did the user use an OTEP instead?
+		if (empty($otpConfig->otep))
+		{
+			if (empty($otpConfig->method) || ($otpConfig->method == 'none'))
+			{
+				// Two factor authentication is not enabled on this account.
+				// Any string is assumed to be a valid OTEP.
+				return true;
+			}
+			else
+			{
+				/**
+				 * Two factor authentication enabled and no OTEPs defined. The
+				 * user has used them all up. Therefore anything they enter is
+				 * an invalid OTEP.
+				 */
+				return false;
+			}
+		}
+
+		// Clean up the OTEP (remove dashes, spaces and other funny stuff
+		// our beloved users may have unwittingly stuffed in it)
+		$otep = filter_var($otep, FILTER_SANITIZE_NUMBER_INT);
+		$otep = str_replace('-', '', $otep);
+
+		$check = false;
+
+		// Did we find a valid OTEP?
+		if (in_array($otep, $otpConfig->otep))
+		{
+			// Remove the OTEP from the array
+			$otpConfig->otep = array_diff($otpConfig->otep, array($otep));
+
+			$this->setOtpConfig($user_id, $otpConfig);
+
+			// Return true; the OTEP was a valid one
+			$check = true;
+		}
+
+		return $check;
+	}
+}
diff --git a/core/administrator/components/com_users/models/users.php b/core/administrator/components/com_users/models/users.php
new file mode 100644
index 00000000..c3e99c67
--- /dev/null
+++ b/core/administrator/components/com_users/models/users.php
@@ -0,0 +1,523 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Methods supporting a list of user records.
+ *
+ * @since  1.6
+ */
+class UsersModelUsers extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'username', 'a.username',
+				'email', 'a.email',
+				'block', 'a.block',
+				'sendEmail', 'a.sendEmail',
+				'registerDate', 'a.registerDate',
+				'lastvisitDate', 'a.lastvisitDate',
+				'activation', 'a.activation',
+				'active',
+				'group_id',
+				'range',
+				'lastvisitrange',
+				'state',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'a.name', $direction = 'asc')
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout', 'default', 'cmd'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Load the filter state.
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.active', $this->getUserStateFromRequest($this->context . '.filter.active', 'filter_active', '', 'cmd'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+		$this->setState('filter.group_id', $this->getUserStateFromRequest($this->context . '.filter.group_id', 'filter_group_id', null, 'int'));
+		$this->setState('filter.range', $this->getUserStateFromRequest($this->context . '.filter.range', 'filter_range', '', 'cmd'));
+		$this->setState(
+			'filter.lastvisitrange', $this->getUserStateFromRequest($this->context . '.filter.lastvisitrange', 'filter_lastvisitrange', '', 'cmd')
+		);
+
+		$groups = json_decode(base64_decode($app->input->get('groups', '', 'BASE64')));
+
+		if (isset($groups))
+		{
+			$groups = ArrayHelper::toInteger($groups);
+		}
+
+		$this->setState('filter.groups', $groups);
+
+		$excluded = json_decode(base64_decode($app->input->get('excluded', '', 'BASE64')));
+
+		if (isset($excluded))
+		{
+			$excluded = ArrayHelper::toInteger($excluded);
+		}
+
+		$this->setState('filter.excluded', $excluded);
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_users');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.active');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.group_id');
+		$id .= ':' . $this->getState('filter.range');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Gets the list of users and adds expensive joins to the result set.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId();
+
+		// Try to load the data from internal storage.
+		if (empty($this->cache[$store]))
+		{
+			$groups  = $this->getState('filter.groups');
+			$groupId = $this->getState('filter.group_id');
+
+			if (isset($groups) && (empty($groups) || $groupId && !in_array($groupId, $groups)))
+			{
+				$items = array();
+			}
+			else
+			{
+				$items = parent::getItems();
+			}
+
+			// Bail out on an error or empty list.
+			if (empty($items))
+			{
+				$this->cache[$store] = $items;
+
+				return $items;
+			}
+
+			// Joining the groups with the main query is a performance hog.
+			// Find the information only on the result set.
+
+			// First pass: get list of the user id's and reset the counts.
+			$userIds = array();
+
+			foreach ($items as $item)
+			{
+				$userIds[] = (int) $item->id;
+				$item->group_count = 0;
+				$item->group_names = '';
+				$item->note_count = 0;
+			}
+
+			// Get the counts from the database only for the users in the list.
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true);
+
+			// Join over the group mapping table.
+			$query->select('map.user_id, COUNT(map.group_id) AS group_count')
+				->from('#__user_usergroup_map AS map')
+				->where('map.user_id IN (' . implode(',', $userIds) . ')')
+				->group('map.user_id')
+				// Join over the user groups table.
+				->join('LEFT', '#__usergroups AS g2 ON g2.id = map.group_id');
+
+			$db->setQuery($query);
+
+			// Load the counts into an array indexed on the user id field.
+			try
+			{
+				$userGroups = $db->loadObjectList('user_id');
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			$query->clear()
+				->select('n.user_id, COUNT(n.id) As note_count')
+				->from('#__user_notes AS n')
+				->where('n.user_id IN (' . implode(',', $userIds) . ')')
+				->where('n.state >= 0')
+				->group('n.user_id');
+
+			$db->setQuery($query);
+
+			// Load the counts into an array indexed on the aro.value field (the user id).
+			try
+			{
+				$userNotes = $db->loadObjectList('user_id');
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			// Second pass: collect the group counts into the master items array.
+			foreach ($items as &$item)
+			{
+				if (isset($userGroups[$item->id]))
+				{
+					$item->group_count = $userGroups[$item->id]->group_count;
+
+					// Group_concat in other databases is not supported
+					$item->group_names = $this->_getUserDisplayedGroups($item->id);
+				}
+
+				if (isset($userNotes[$item->id]))
+				{
+					$item->note_count = $userNotes[$item->id]->note_count;
+				}
+			}
+
+			// Add the items to the internal cache.
+			$this->cache[$store] = $items;
+		}
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+
+		$query->from($db->quoteName('#__users') . ' AS a');
+
+		// If the model is set to check item state, add to the query.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.block = ' . (int) $state);
+		}
+
+		// If the model is set to check the activated state, add to the query.
+		$active = $this->getState('filter.active');
+
+		if (is_numeric($active))
+		{
+			if ($active == '0')
+			{
+				$query->where('a.activation IN (' . $db->quote('') . ', ' . $db->quote('0') . ')');
+			}
+			elseif ($active == '1')
+			{
+				$query->where($query->length('a.activation') . ' > 1');
+			}
+		}
+
+		// Filter the items over the group id if set.
+		$groupId = $this->getState('filter.group_id');
+		$groups  = $this->getState('filter.groups');
+
+		if ($groupId || isset($groups))
+		{
+			$query->join('LEFT', '#__user_usergroup_map AS map2 ON map2.user_id = a.id')
+				->group(
+					$db->quoteName(
+						array(
+							'a.id',
+							'a.name',
+							'a.username',
+							'a.password',
+							'a.block',
+							'a.sendEmail',
+							'a.registerDate',
+							'a.lastvisitDate',
+							'a.activation',
+							'a.params',
+							'a.email'
+						)
+					)
+				);
+
+			if ($groupId)
+			{
+				$query->where('map2.group_id = ' . (int) $groupId);
+			}
+
+			if (isset($groups))
+			{
+				$query->where('map2.group_id IN (' . implode(',', $groups) . ')');
+			}
+		}
+
+		// Filter the items over the search string if set.
+		$search = $this->getState('filter.search');
+
+		if (!empty($search))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where('a.id = ' . (int) substr($search, 3));
+			}
+			elseif (stripos($search, 'username:') === 0)
+			{
+				$search = $db->quote('%' . $db->escape(substr($search, 9), true) . '%');
+				$query->where('a.username LIKE ' . $search);
+			}
+			else
+			{
+				// Escape the search token.
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+
+				// Compile the different search clauses.
+				$searches   = array();
+				$searches[] = 'a.name LIKE ' . $search;
+				$searches[] = 'a.username LIKE ' . $search;
+				$searches[] = 'a.email LIKE ' . $search;
+
+				// Add the clauses to the query.
+				$query->where('(' . implode(' OR ', $searches) . ')');
+			}
+		}
+
+		// Add filter for registration ranges select list
+		$range = $this->getState('filter.range');
+
+		// Apply the range filter.
+		if ($range)
+		{
+			$dates = $this->buildDateRange($range);
+
+			if ($dates['dNow'] === false)
+			{
+				$query->where(
+					$db->qn('a.registerDate') . ' < ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s'))
+				);
+			}
+			else
+			{
+				$query->where(
+					$db->qn('a.registerDate') . ' >= ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s')) .
+					' AND ' . $db->qn('a.registerDate') . ' <= ' . $db->quote($dates['dNow']->format('Y-m-d H:i:s'))
+				);
+			}
+		}
+
+		// Add filter for registration ranges select list
+		$lastvisitrange = $this->getState('filter.lastvisitrange');
+
+		// Apply the range filter.
+		if ($lastvisitrange)
+		{
+			$dates = $this->buildDateRange($lastvisitrange);
+
+			if (is_string($dates['dStart']))
+			{
+				$query->where(
+					$db->qn('a.lastvisitDate') . ' = ' . $db->quote($dates['dStart'])
+				);
+			}
+			elseif ($dates['dNow'] === false)
+			{
+				$query->where(
+					$db->qn('a.lastvisitDate') . ' < ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s'))
+				);
+			}
+			else
+			{
+				$query->where(
+					$db->qn('a.lastvisitDate') . ' >= ' . $db->quote($dates['dStart']->format('Y-m-d H:i:s')) .
+					' AND ' . $db->qn('a.lastvisitDate') . ' <= ' . $db->quote($dates['dNow']->format('Y-m-d H:i:s'))
+				);
+			}
+		}
+
+		// Filter by excluded users
+		$excluded = $this->getState('filter.excluded');
+
+		if (!empty($excluded))
+		{
+			$query->where('id NOT IN (' . implode(',', $excluded) . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->qn($db->escape($this->getState('list.ordering', 'a.name'))) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Construct the date range to filter on.
+	 *
+	 * @param   string  $range  The textual range to construct the filter for.
+	 *
+	 * @return  string  The date range to filter on.
+	 *
+	 * @since   3.6.0
+	 */
+	private function buildDateRange($range)
+	{
+		// Get UTC for now.
+		$dNow   = new JDate;
+		$dStart = clone $dNow;
+
+		switch ($range)
+		{
+			case 'past_week':
+				$dStart->modify('-7 day');
+				break;
+
+			case 'past_1month':
+				$dStart->modify('-1 month');
+				break;
+
+			case 'past_3month':
+				$dStart->modify('-3 month');
+				break;
+
+			case 'past_6month':
+				$dStart->modify('-6 month');
+				break;
+
+			case 'post_year':
+				$dNow = false;
+			case 'past_year':
+				$dStart->modify('-1 year');
+				break;
+
+			case 'today':
+				// Ranges that need to align with local 'days' need special treatment.
+				$app    = JFactory::getApplication();
+				$offset = $app->get('offset');
+
+				// Reset the start time to be the beginning of today, local time.
+				$dStart = new JDate('now', $offset);
+				$dStart->setTime(0, 0, 0);
+
+				// Now change the timezone back to UTC.
+				$tz = new DateTimeZone('GMT');
+				$dStart->setTimezone($tz);
+				break;
+			case 'never':
+				$dNow = false;
+				$dStart = $this->_db->getNullDate();
+				break;
+		}
+
+		return array('dNow' => $dNow, 'dStart' => $dStart);
+	}
+
+	/**
+	 * SQL server change
+	 *
+	 * @param   integer  $user_id  User identifier
+	 *
+	 * @return  string   Groups titles imploded :$
+	 */
+	protected function _getUserDisplayedGroups($user_id)
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn('title'))
+			->from($db->qn('#__usergroups', 'ug'))
+			->join('LEFT', $db->qn('#__user_usergroup_map', 'map') . ' ON (ug.id = map.group_id)')
+			->where($db->qn('map.user_id') . ' = ' . (int) $user_id);
+
+		try
+		{
+			$result = $db->setQuery($query)->loadColumn();
+		}
+		catch (RunTimeException $e)
+		{
+			$result = array();
+		}
+
+		return implode("\n", $result);
+	}
+}
diff --git a/core/administrator/components/com_users/tables/note.php b/core/administrator/components/com_users/tables/note.php
new file mode 100644
index 00000000..e8a644d4
--- /dev/null
+++ b/core/administrator/components/com_users/tables/note.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * User notes table class
+ *
+ * @since  2.5
+ */
+class UsersTableNote extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  &$db  Database object
+	 *
+	 * @since  2.5
+	 */
+	public function __construct(&$db)
+	{
+		parent::__construct('#__user_notes', 'id', $db);
+
+		JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_users.note'));
+	}
+
+	/**
+	 * Overloaded store method for the notes table.
+	 *
+	 * @param   boolean  $updateNulls  Toggle whether null values should be updated.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = JFactory::getDate()->toSql();
+		$userId = JFactory::getUser()->get('id');
+
+		$this->modified_time = $date;
+		$this->modified_user_id = $userId;
+
+		if (!((int) $this->review_time))
+		{
+			// Null date.
+			$this->review_time = $this->_db->getNullDate();
+		}
+
+		if (empty($this->id))
+		{
+			// New record.
+			$this->created_time = $date;
+			$this->created_user_id = $userId;
+		}
+
+		// Attempt to store the data.
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to check-in rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->quoteName($this->_tbl))
+			->set($this->_db->quoteName('state') . ' = ' . (int) $state);
+
+		// Build the WHERE clause for the primary keys.
+		$query->where($k . '=' . implode(' OR ' . $k . '=', $pks));
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = false;
+		}
+		else
+		{
+			$query->where('(checked_out = 0 OR checked_out = ' . (int) $userId . ')');
+			$checkin = true;
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$this->_db->setQuery($query);
+
+		try
+		{
+			$this->_db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($this->_db->getMessage());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach ($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/core/administrator/components/com_users/users.php b/core/administrator/components/com_users/users.php
new file mode 100644
index 00000000..48bdfbbc
--- /dev/null
+++ b/core/administrator/components/com_users/users.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+JLoader::register('UsersHelper', __DIR__ . '/helpers/users.php');
+
+$controller = JControllerLegacy::getInstance('Users');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/administrator/components/com_users/users.xml b/core/administrator/components/com_users/users.xml
new file mode 100644
index 00000000..0eafa984
--- /dev/null
+++ b/core/administrator/components/com_users/users.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_users</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_USERS_XML_DESCRIPTION</description>
+
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>router.php</filename>
+		<filename>users.php</filename>
+		<folder>controllers</folder>
+		<folder>helpers</folder>
+		<folder>models</folder>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_users.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>config.xml</filename>
+			<filename>controller.php</filename>
+			<filename>users.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_users.ini</language>
+			<language tag="en-GB">language/en-GB.com_users.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/administrator/components/com_users/views/debuggroup/tmpl/default.php b/core/administrator/components/com_users/views/debuggroup/tmpl/default.php
new file mode 100644
index 00000000..532db349
--- /dev/null
+++ b/core/administrator/components/com_users/views/debuggroup/tmpl/default.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$colSpan   = 4 + count($this->actions);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=debuggroup&group_id=' . (int) $this->state->get('group_id')); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ASSET_TITLE', 'a.title', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
+					</th>
+					<?php foreach ($this->actions as $key => $action) : ?>
+					<th width="5%" class="center">
+						<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', $key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
+					</th>
+					<?php endforeach; ?>
+					<th width="5%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<tr class="row0">
+						<td>
+							<?php echo $this->escape($item->title); ?>
+						</td>
+						<td class="nowrap">
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level + 1)) . $this->escape($item->name); ?>
+						</td>
+						<?php foreach ($this->actions as $action) : ?>
+							<?php
+							$name  = $action[0];
+							$check = $item->checks[$name];
+							if ($check === true) :
+								$class  = 'icon-ok';
+								$button = 'btn-success';
+							elseif ($check === false) :
+								$class  = 'icon-remove';
+								$button = 'btn-danger';
+							elseif ($check === null) :
+								$class  = 'icon-ban-circle';
+								$button = 'btn-warning';
+							else :
+								$class  = '';
+								$button = '';
+							endif;
+							?>
+						<td class="center">
+							<span class="icon-white <?php echo $class; ?>"></span>
+						</td>
+						<?php endforeach; ?>
+						<td class="center">
+							<?php echo (int) $item->lft; ?>
+							- <?php echo (int) $item->rgt; ?>
+						</td>
+						<td class="center">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+		<div>
+			<?php echo JText::_('COM_USERS_DEBUG_LEGEND'); ?>
+			<span class="icon-white icon-ban-circle"></span><?php echo JText::_('COM_USERS_DEBUG_IMPLICIT_DENY'); ?>&nbsp;
+			<span class="icon-white icon-ok"></span><?php echo JText::_('COM_USERS_DEBUG_EXPLICIT_ALLOW'); ?>&nbsp;
+			<span class="icon-white icon-remove"></span><?php echo JText::_('COM_USERS_DEBUG_EXPLICIT_DENY'); ?>
+			<br /><br />
+		</div>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/debuggroup/view.html.php b/core/administrator/components/com_users/views/debuggroup/view.html.php
new file mode 100644
index 00000000..c0e7fd8c
--- /dev/null
+++ b/core/administrator/components/com_users/views/debuggroup/view.html.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of User Group ACL permissions.
+ *
+ * @since  1.6
+ */
+class UsersViewDebuggroup extends JViewLegacy
+{
+	protected $actions;
+
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var   JPagination
+	 * @since 1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		// Access check.
+		if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		$this->actions       = $this->get('DebugActions');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->group         = $this->get('Group');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Vars only used in hathor.
+		// @deprecated  4.0 To be removed with Hathor
+		$this->levels        = UsersHelperDebug::getLevelsOptions();
+		$this->components    = UsersHelperDebug::getComponents();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_users');
+
+		JToolbarHelper::title(JText::sprintf('COM_USERS_VIEW_DEBUG_GROUP_TITLE', $this->group->id, $this->group->title), 'users groups');
+		JToolbarHelper::cancel('group.cancel', 'JTOOLBAR_CLOSE');
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_users');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_USERS_DEBUG_GROUPS');
+	}
+}
diff --git a/core/administrator/components/com_users/views/debuguser/tmpl/default.php b/core/administrator/components/com_users/views/debuguser/tmpl/default.php
new file mode 100644
index 00000000..e2b366ca
--- /dev/null
+++ b/core/administrator/components/com_users/views/debuguser/tmpl/default.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$colSpan   = 4 + count($this->actions);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=debuguser&user_id=' . (int) $this->state->get('user_id')); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<div class="clearfix"> </div>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ASSET_TITLE', 'a.title', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
+					</th>
+					<?php foreach ($this->actions as $key => $action) : ?>
+					<th width="5%" class="center">
+						<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', $key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
+					</th>
+					<?php endforeach; ?>
+					<th width="5%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<tr class="row0">
+						<td>
+							<?php echo $this->escape($item->title); ?>
+						</td>
+						<td class="nowrap">
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level + 1)) . $this->escape($item->name); ?>
+						</td>
+						<?php foreach ($this->actions as $action) : ?>
+							<?php
+							$name  = $action[0];
+							$check = $item->checks[$name];
+							if ($check === true) :
+								$class  = 'icon-ok';
+								$button = 'btn-success';
+							elseif ($check === false) :
+								$class  = 'icon-remove';
+								$button = 'btn-danger';
+							elseif ($check === null) :
+								$class  = 'icon-ban-circle';
+								$button = 'btn-warning';
+							else :
+								$class  = '';
+								$button = '';
+							endif;
+							?>
+						<td class="center">
+							<span class="icon-white <?php echo $class; ?>"></span>
+						</td>
+						<?php endforeach; ?>
+						<td class="center">
+							<?php echo (int) $item->lft; ?>
+							- <?php echo (int) $item->rgt; ?>
+						</td>
+						<td class="center">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+		<div>
+			<?php echo JText::_('COM_USERS_DEBUG_LEGEND'); ?>
+			<span class="icon-white icon-ban-circle"></span><?php echo JText::_('COM_USERS_DEBUG_IMPLICIT_DENY'); ?>&nbsp;
+			<span class="icon-white icon-ok"></span><?php echo JText::_('COM_USERS_DEBUG_EXPLICIT_ALLOW'); ?>&nbsp;
+			<span class="icon-white icon-remove"></span><?php echo JText::_('COM_USERS_DEBUG_EXPLICIT_DENY'); ?>
+			<br /><br />
+		</div>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/debuguser/view.html.php b/core/administrator/components/com_users/views/debuguser/view.html.php
new file mode 100644
index 00000000..7a68dd46
--- /dev/null
+++ b/core/administrator/components/com_users/views/debuguser/view.html.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of User ACL permissions.
+ *
+ * @since  1.6
+ */
+class UsersViewDebuguser extends JViewLegacy
+{
+	protected $actions;
+
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var   JPagination
+	 * @since 1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		// Access check.
+		if (!JFactory::getUser()->authorise('core.manage', 'com_users'))
+		{
+			throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+		}
+
+		$this->actions       = $this->get('DebugActions');
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->user          = $this->get('User');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// Vars only used in hathor.
+		// @deprecated  4.0 To be removed with Hathor
+		$this->levels        = UsersHelperDebug::getLevelsOptions();
+		$this->components    = UsersHelperDebug::getComponents();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_users');
+
+		JToolbarHelper::title(JText::sprintf('COM_USERS_VIEW_DEBUG_USER_TITLE', $this->user->id, $this->user->name), 'users user');
+		JToolbarHelper::cancel('user.cancel', 'JTOOLBAR_CLOSE');
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_users');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_USERS_DEBUG_USERS');
+	}
+}
diff --git a/core/administrator/components/com_users/views/group/tmpl/edit.php b/core/administrator/components/com_users/views/group/tmpl/edit.php
new file mode 100644
index 00000000..d2303520
--- /dev/null
+++ b/core/administrator/components/com_users/views/group/tmpl/edit.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'group.cancel' || document.formvalidator.isValid(document.getElementById('group-form')))
+		{
+			Joomla.submitform(task, document.getElementById('group-form'));
+		}
+	};
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="group-form" class="form-validate form-horizontal">
+	<fieldset>
+		<legend><?php echo JText::_('COM_USERS_USERGROUP_DETAILS'); ?></legend>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('title'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('title'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<?php $parent_id = $this->form->getField('parent_id'); ?>
+			<?php if (!$parent_id->hidden) : ?>
+				<div class="control-label">
+					<?php echo $parent_id->label; ?>
+				</div>
+			<?php endif; ?>
+			<div class="controls">
+				<?php echo $parent_id->input; ?>
+			</div>
+		</div>
+	</fieldset>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_users/views/group/tmpl/edit.xml b/core/administrator/components/com_users/views/group/tmpl/edit.xml
new file mode 100755
index 00000000..bcc58adf
--- /dev/null
+++ b/core/administrator/components/com_users/views/group/tmpl/edit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_GROUP_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_GROUP_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/group/view.html.php b/core/administrator/components/com_users/views/group/view.html.php
new file mode 100644
index 00000000..baf3b311
--- /dev/null
+++ b/core/administrator/components/com_users/views/group/view.html.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a user group.
+ *
+ * @since  1.6
+ */
+class UsersViewGroup extends JViewLegacy
+{
+	protected $form;
+
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $item;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$isNew = ($this->item->id == 0);
+		$canDo = JHelperContent::getActions('com_users');
+
+		JToolbarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_GROUP_TITLE' : 'COM_USERS_VIEW_EDIT_GROUP_TITLE'), 'users groups-add');
+
+		if ($canDo->get('core.edit') || $canDo->get('core.create'))
+		{
+			JToolbarHelper::apply('group.apply');
+			JToolbarHelper::save('group.save');
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('group.save2new');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('group.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('group.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('group.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_USERS_GROUPS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_users/views/groups/tmpl/default.php b/core/administrator/components/com_users/views/groups/tmpl/default.php
new file mode 100644
index 00000000..b7c83cce
--- /dev/null
+++ b/core/administrator/components/com_users/views/groups/tmpl/default.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user        = JFactory::getUser();
+$listOrder   = $this->escape($this->state->get('list.ordering'));
+$listDirn    = $this->escape($this->state->get('list.direction'));
+$debugGroups = $this->state->get('params')->get('debugGroups', 1);
+
+JText::script('COM_USERS_GROUPS_CONFIRM_DELETE');
+
+JFactory::getDocument()->addScriptDeclaration('
+		Joomla.submitbutton = function(task) {
+			if (task == "groups.delete") {
+				var i, cids = document.getElementsByName("cid[]");
+				for (i = 0; i < cids.length; i++) {
+					if (cids[i].checked && cids[i].parentNode.getAttribute("data-usercount") != 0) {
+						if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) {
+							Joomla.submitform(task);
+						}
+						return false;
+					}
+				}
+			}
+
+			Joomla.submitform(task);
+			return false;
+		};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=groups'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="groupList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_GROUP_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_USERS_COUNT_ENABLED_USERS'); ?>">
+								<span class="element-invisible"><?php echo JText::_('COM_USERS_COUNT_ENABLED_USERS'); ?></span>
+							</span>
+						</th>
+						<th width="1%" class="nowrap center">
+							<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_USERS_COUNT_DISABLED_USERS'); ?>">
+								<span class="element-invisible"><?php echo JText::_('COM_USERS_COUNT_DISABLED_USERS'); ?></span>
+							</span>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$canCreate = $user->authorise('core.create', 'com_users');
+					$canEdit   = $user->authorise('core.edit', 'com_users');
+
+					// If this group is super admin and this user is not super admin, $canEdit is false
+					if (!$user->authorise('core.admin') && JAccess::checkGroup($item->id, 'core.admin'))
+					{
+						$canEdit = false;
+					}
+					$canChange = $user->authorise('core.edit.state', 'com_users');
+				?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center" data-usercount="<?php echo $item->user_count; ?>">
+							<?php if ($canEdit) : ?>
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<td>
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level + 1)); ?>
+							<?php if ($canEdit) : ?>
+							<a href="<?php echo JRoute::_('index.php?option=com_users&task=group.edit&id=' . $item->id); ?>">
+								<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+							<?php if ($debugGroups) : ?>
+								<div class="small"><a href="<?php echo JRoute::_('index.php?option=com_users&view=debuggroup&group_id=' . (int) $item->id); ?>">
+								<?php echo JText::_('COM_USERS_DEBUG_GROUP'); ?></a></div>
+							<?php endif; ?>
+						</td>
+						<td class="center btns">
+							<a class="badge <?php if ($item->count_enabled > 0) echo 'badge-success'; ?>" href="<?php echo JRoute::_('index.php?option=com_users&view=users&filter[group_id]=' . (int) $item->id . '&filter[state]=0'); ?>">
+								<?php echo $item->count_enabled; ?></a>
+						</td>
+						<td class="center btns">
+							<a class="badge <?php if ($item->count_disabled > 0) echo 'badge-important'; ?>" href="<?php echo JRoute::_('index.php?option=com_users&view=users&filter[group_id]=' . (int) $item->id . '&filter[state]=1'); ?>">
+								<?php echo $item->count_disabled; ?></a>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/groups/tmpl/default.xml b/core/administrator/components/com_users/views/groups/tmpl/default.xml
new file mode 100755
index 00000000..b5cccb81
--- /dev/null
+++ b/core/administrator/components/com_users/views/groups/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_GROUPS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_GROUPS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/groups/view.html.php b/core/administrator/components/com_users/views/groups/view.html.php
new file mode 100644
index 00000000..c9fe9741
--- /dev/null
+++ b/core/administrator/components/com_users/views/groups/view.html.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of user groups.
+ *
+ * @since  1.6
+ */
+class UsersViewGroups extends JViewLegacy
+{
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var   JPagination
+	 * @since 1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		UsersHelper::addSubmenu('groups');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_users');
+
+		JToolbarHelper::title(JText::_('COM_USERS_VIEW_GROUPS_TITLE'), 'users groups');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('group.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('group.edit');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'groups.delete', 'JTOOLBAR_DELETE');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_users');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_USERS_GROUPS');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.title' => JText::_('COM_USERS_HEADING_GROUP_TITLE'),
+			'a.id'    => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_users/views/level/tmpl/edit.php b/core/administrator/components/com_users/views/level/tmpl/edit.php
new file mode 100644
index 00000000..2c081a34
--- /dev/null
+++ b/core/administrator/components/com_users/views/level/tmpl/edit.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'level.cancel' || document.formvalidator.isValid(document.getElementById('level-form')))
+		{
+			Joomla.submitform(task, document.getElementById('level-form'));
+		}
+	};
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="level-form" class="form-validate form-horizontal">
+	<fieldset>
+		<legend><?php echo JText::_('COM_USERS_LEVEL_DETAILS'); ?></legend>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('title'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('title'); ?>
+			</div>
+		</div>
+	</fieldset>
+
+	<fieldset>
+		<legend><?php echo JText::_('COM_USERS_USER_GROUPS_HAVING_ACCESS'); ?></legend>
+		<?php echo JHtml::_('access.usergroups', 'jform[rules]', $this->item->rules, true); ?>
+	</fieldset>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_users/views/level/tmpl/edit.xml b/core/administrator/components/com_users/views/level/tmpl/edit.xml
new file mode 100755
index 00000000..fc078486
--- /dev/null
+++ b/core/administrator/components/com_users/views/level/tmpl/edit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_LEVEL_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_LEVEL_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/level/view.html.php b/core/administrator/components/com_users/views/level/view.html.php
new file mode 100644
index 00000000..5638941b
--- /dev/null
+++ b/core/administrator/components/com_users/views/level/view.html.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a user view level.
+ *
+ * @since  1.6
+ */
+class UsersViewLevel extends JViewLegacy
+{
+	protected $form;
+
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $item;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->form  = $this->get('Form');
+		$this->item  = $this->get('Item');
+		$this->state = $this->get('State');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$isNew = ($this->item->id == 0);
+		$canDo = JHelperContent::getActions('com_users');
+
+		JToolbarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_LEVEL_TITLE' : 'COM_USERS_VIEW_EDIT_LEVEL_TITLE'), 'users levels-add');
+
+		if ($canDo->get('core.edit') || $canDo->get('core.create'))
+		{
+			JToolbarHelper::apply('level.apply');
+			JToolbarHelper::save('level.save');
+		}
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::save2new('level.save2new');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && $canDo->get('core.create'))
+		{
+			JToolbarHelper::save2copy('level.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('level.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('level.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_USERS_ACCESS_LEVELS_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_users/views/levels/tmpl/default.php b/core/administrator/components/com_users/views/levels/tmpl/default.php
new file mode 100644
index 00000000..98c69bc6
--- /dev/null
+++ b/core/administrator/components/com_users/views/levels/tmpl/default.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user       = JFactory::getUser();
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$saveOrder  = $listOrder == 'a.ordering';
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_users&task=levels.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'levelList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+}
+
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=levels'); ?>" method="post" id="adminForm" name="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+		<div class="clearfix"> </div>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="levelList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+						</th>
+						<th width="1%">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_LEVEL_NAME', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap hidden-phone">
+							<?php echo JText::_('COM_USERS_USER_GROUPS_HAVING_ACCESS'); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="5">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php $count = count($this->items); ?>
+				<?php foreach ($this->items as $i => $item) :
+					$ordering  = ($listOrder == 'a.ordering');
+					$canCreate = $user->authorise('core.create',     'com_users');
+					$canEdit   = $user->authorise('core.edit',       'com_users');
+					$canChange = $user->authorise('core.edit.state', 'com_users');
+
+					// Decode level groups
+					$groups = json_decode($item->rules);
+
+					// If this group is super admin and this user is not super admin, $canEdit is false
+					if (!JFactory::getUser()->authorise('core.admin') && JAccess::checkGroup($groups[0], 'core.admin'))
+					{
+						$canEdit   = false;
+						$canChange = false;
+					}
+					?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="order nowrap center hidden-phone">
+							<?php
+							$iconClass = '';
+							if (!$canChange)
+							{
+								$iconClass = ' inactive';
+							}
+							elseif (!$saveOrder)
+							{
+								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::_('tooltipText', 'JORDERINGDISABLED');
+							}
+							?>
+							<span class="sortable-handler<?php echo $iconClass ?>">
+								<span class="icon-menu" aria-hidden="true"></span>
+							</span>
+							<?php if ($canChange && $saveOrder) : ?>
+								<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order" />
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php if ($canEdit) : ?>
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<td>
+							<?php if ($canEdit) : ?>
+							<a href="<?php echo JRoute::_('index.php?option=com_users&task=level.edit&id=' . $item->id); ?>">
+								<?php echo $this->escape($item->title); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->title); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo UsersHelper::getVisibleByGroups($item->rules); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/levels/tmpl/default.xml b/core/administrator/components/com_users/views/levels/tmpl/default.xml
new file mode 100755
index 00000000..77c94281
--- /dev/null
+++ b/core/administrator/components/com_users/views/levels/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_LEVELS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_LEVELS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/levels/view.html.php b/core/administrator/components/com_users/views/levels/view.html.php
new file mode 100644
index 00000000..ff439227
--- /dev/null
+++ b/core/administrator/components/com_users/views/levels/view.html.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of view levels.
+ *
+ * @since  1.6
+ */
+class UsersViewLevels extends JViewLegacy
+{
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var   JPagination
+	 * @since 1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		UsersHelper::addSubmenu('levels');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_users');
+
+		JToolbarHelper::title(JText::_('COM_USERS_VIEW_LEVELS_TITLE'), 'users levels');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('level.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('level.edit');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'level.delete', 'JTOOLBAR_DELETE');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_users');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_USERS_ACCESS_LEVELS');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.title'    => JText::_('COM_USERS_HEADING_LEVEL_NAME'),
+			'a.id'       => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/components/com_users/views/mail/tmpl/default.php b/core/administrator/components/com_users/views/mail/tmpl/default.php
new file mode 100644
index 00000000..671f7f8e
--- /dev/null
+++ b/core/administrator/components/com_users/views/mail/tmpl/default.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$script = "\t" . 'Joomla.submitbutton = function(pressbutton) {' . "\n";
+$script .= "\t\t" . 'var form = document.adminForm;' . "\n";
+$script .= "\t\t" . 'if (pressbutton == \'mail.cancel\') {' . "\n";
+$script .= "\t\t\t" . 'Joomla.submitform(pressbutton);' . "\n";
+$script .= "\t\t\t" . 'return;' . "\n";
+$script .= "\t\t" . '}' . "\n";
+$script .= "\t\t" . '// do field validation' . "\n";
+$script .= "\t\t" . 'if (form.jform_subject.value == ""){' . "\n";
+$script .= "\t\t\t" . 'alert("' . JText::_('COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT', true) . '");' . "\n";
+$script .= "\t\t" . '} else if (getSelectedValue(\'adminForm\',\'jform[group]\') < 0){' . "\n";
+$script .= "\t\t\t" . 'alert("' . JText::_('COM_USERS_MAIL_PLEASE_SELECT_A_GROUP', true) . '");' . "\n";
+$script .= "\t\t" . '} else if (form.jform_message.value == ""){' . "\n";
+$script .= "\t\t\t" . 'alert("' . JText::_('COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE', true) . '");' . "\n";
+$script .= "\t\t" . '} else {' . "\n";
+$script .= "\t\t\t" . 'Joomla.submitform(pressbutton);' . "\n";
+$script .= "\t\t" . '}' . "\n";
+$script .= "\t\t" . '}' . "\n";
+
+JHtml::_('behavior.core');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration($script);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=mail'); ?>" name="adminForm" method="post" id="adminForm">
+	<div class="row-fluid">
+		<div class="span9">
+			<fieldset class="adminform">
+				<div class="control-group">
+					<div class="control-label"><?php echo $this->form->getLabel('subject'); ?></div>
+					<div class="controls"><?php echo JComponentHelper::getParams('com_users')->get('mailSubjectPrefix'); ?>
+						<?php echo $this->form->getInput('subject'); ?></div>
+				</div>
+				<div class="control-group">
+					<div class="control-label"><?php echo $this->form->getLabel('message'); ?></div>
+					<div class="controls"><?php echo $this->form->getInput('message'); ?><br>
+						<?php echo JComponentHelper::getParams('com_users')->get('mailBodySuffix'); ?></div>
+				</div>
+			</fieldset>
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+		<div class="span3">
+			<fieldset class="form-inline">
+				<div class="control-group checkbox">
+					<div class="controls"><?php echo $this->form->getInput('recurse'); ?> <?php echo $this->form->getLabel('recurse'); ?></div>
+				</div>
+				<div class="control-group checkbox">
+					<div class="control-label"><?php echo $this->form->getInput('mode'); ?> <?php echo $this->form->getLabel('mode'); ?></div>
+				</div>
+				<div class="control-group checkbox">
+					<div class="control-label"><?php echo $this->form->getInput('disabled'); ?> <?php echo $this->form->getLabel('disabled'); ?></div>
+				</div>
+				<div class="control-group checkbox">
+					<div class="control-label"><?php echo $this->form->getInput('bcc'); ?> <?php echo $this->form->getLabel('bcc'); ?></div>
+				</div>
+				<div class="control-group">
+					<div class="control-label"><?php echo $this->form->getLabel('group'); ?></div>
+					<div class="controls"><?php echo $this->form->getInput('group'); ?></div>
+				</div>
+			</fieldset>
+		</div>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/mail/tmpl/default.xml b/core/administrator/components/com_users/views/mail/tmpl/default.xml
new file mode 100755
index 00000000..075e0da0
--- /dev/null
+++ b/core/administrator/components/com_users/views/mail/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_MAIL_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_MAIL_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/mail/view.html.php b/core/administrator/components/com_users/views/mail/view.html.php
new file mode 100644
index 00000000..ae4f2831
--- /dev/null
+++ b/core/administrator/components/com_users/views/mail/view.html.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users mail view.
+ *
+ * @since  1.6
+ */
+class UsersViewMail extends JViewLegacy
+{
+	/**
+	 * @var object form object
+	 */
+	protected $form;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		// Redirect to admin index if mass mailer disabled in conf
+		if (JFactory::getApplication()->get('massmailoff', 0) == 1)
+		{
+			JFactory::getApplication()->redirect(JRoute::_('index.php', false));
+		}
+
+		// Get data from the model
+		$this->form = $this->get('Form');
+
+		$this->addToolbar();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		JToolbarHelper::title(JText::_('COM_USERS_MASS_MAIL'), 'users massmail');
+		JToolbarHelper::custom('mail.send', 'envelope.png', 'send_f2.png', 'COM_USERS_TOOLBAR_MAIL_SEND_MAIL', false);
+		JToolbarHelper::cancel('mail.cancel');
+		JToolbarHelper::divider();
+		JToolbarHelper::preferences('com_users');
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_USERS_MASS_MAIL_USERS');
+	}
+}
diff --git a/core/administrator/components/com_users/views/note/tmpl/edit.php b/core/administrator/components/com_users/views/note/tmpl/edit.php
new file mode 100644
index 00000000..3b448113
--- /dev/null
+++ b/core/administrator/components/com_users/views/note/tmpl/edit.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration('
+jQuery(document).ready(function() {
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "note.cancel" || document.formvalidator.isValid(document.getElementById("note-form")))
+		{
+			' . $this->form->getField('body')->save() . '
+			Joomla.submitform(task, document.getElementById("note-form"));
+		}
+	}
+});');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=note&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="note-form" class="form-validate form-horizontal">
+		<fieldset class="adminform">
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('subject'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('subject'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('user_id'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('user_id'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('catid'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('catid'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('state'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('state'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('review_time'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('review_time'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('version_note'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('version_note'); ?>
+				</div>
+			</div>
+
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('body'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('body'); ?>
+				</div>
+			</div>
+
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</fieldset>
+</form>
diff --git a/core/administrator/components/com_users/views/note/tmpl/edit.xml b/core/administrator/components/com_users/views/note/tmpl/edit.xml
new file mode 100755
index 00000000..7a6a20b6
--- /dev/null
+++ b/core/administrator/components/com_users/views/note/tmpl/edit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_NOTE_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_NOTE_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/note/view.html.php b/core/administrator/components/com_users/views/note/view.html.php
new file mode 100644
index 00000000..2b6e97be
--- /dev/null
+++ b/core/administrator/components/com_users/views/note/view.html.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User note edit view
+ *
+ * @since  2.5
+ */
+class UsersViewNote extends JViewLegacy
+{
+	/**
+	 * The edit form.
+	 *
+	 * @var    JForm
+	 * @since  2.5
+	 */
+	protected $form;
+
+	/**
+	 * The item data.
+	 *
+	 * @var    object
+	 * @since  2.5
+	 */
+	protected $item;
+
+	/**
+	 * The model state.
+	 *
+	 * @var    JObject
+	 * @since  2.5
+	 */
+	protected $state;
+
+	/**
+	 * Override the display method for the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise view variables.
+		$this->state = $this->get('State');
+		$this->item  = $this->get('Item');
+		$this->form  = $this->get('Form');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Get the component HTML helpers
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		parent::display($tpl);
+		$this->addToolbar();
+	}
+
+	/**
+	 * Display the toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		$input = JFactory::getApplication()->input;
+		$input->set('hidemainmenu', 1);
+
+		$user       = JFactory::getUser();
+		$isNew      = ($this->item->id == 0);
+		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
+
+		// Since we don't track these assets at the item level, use the category id.
+		$canDo = JHelperContent::getActions('com_users', 'category', $this->item->catid);
+
+		JToolbarHelper::title(JText::_('COM_USERS_NOTES'), 'users user');
+
+		// If not checked out, can save the item.
+		if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_users', 'core.create'))))
+		{
+			JToolbarHelper::apply('note.apply');
+			JToolbarHelper::save('note.save');
+		}
+
+		if (!$checkedOut && count($user->getAuthorisedCategories('com_users', 'core.create')))
+		{
+			JToolbarHelper::save2new('note.save2new');
+		}
+
+		// If an existing item, can save to a copy.
+		if (!$isNew && (count($user->getAuthorisedCategories('com_users', 'core.create')) > 0))
+		{
+			JToolbarHelper::save2copy('note.save2copy');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('note.cancel');
+		}
+		else
+		{
+			if (JComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit'))
+			{
+				JToolbarHelper::versions('com_users.note', $this->item->id);
+			}
+
+			JToolbarHelper::cancel('note.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_USERS_USER_NOTES_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_users/views/notes/tmpl/default.php b/core/administrator/components/com_users/views/notes/tmpl/default.php
new file mode 100644
index 00000000..0882e6d1
--- /dev/null
+++ b/core/administrator/components/com_users/views/notes/tmpl/default.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$user       = JFactory::getUser();
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=notes'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('grid.checkall'); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
+					</th>
+					<th width="20%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_USER', 'u.name', $listDirn, $listOrder); ?>
+					</th>
+					<th width="10%" class="nowrap hidden-phone hidden-tablet">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_REVIEW', 'a.review_time', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="6">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$canEdit    = $user->authorise('core.edit',       'com_users.category.' . $item->catid);
+				$canCheckin = $user->authorise('core.admin',      'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+				$canChange  = $user->authorise('core.edit.state', 'com_users.category.' . $item->catid) && $canCheckin;
+				$subject    = $item->subject ?: JText::_('COM_USERS_EMPTY_SUBJECT');
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center checklist">
+						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					</td>
+					<td class="center">
+						<div class="btn-group">
+							<?php echo JHtml::_('jgrid.published', $item->state, $i, 'notes.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+							<?php // Create dropdown items and render the dropdown list.
+							if ($canChange)
+							{
+								JHtml::_('actionsdropdown.' . ((int) $item->state === 2 ? 'un' : '') . 'archive', 'cb' . $i, 'notes');
+								JHtml::_('actionsdropdown.' . ((int) $item->state === -2 ? 'un' : '') . 'trash', 'cb' . $i, 'notes');
+								echo JHtml::_('actionsdropdown.render', $this->escape($subject));
+							}
+							?>
+						</div>
+					</td>
+					<td>
+						<?php if ($item->checked_out) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'notes.', $canCheckin); ?>
+						<?php endif; ?>
+						<?php $subject = $item->subject ?: JText::_('COM_USERS_EMPTY_SUBJECT'); ?>
+						<?php if ($canEdit) : ?>
+							<a href="<?php echo JRoute::_('index.php?option=com_users&task=note.edit&id=' . $item->id); ?>"><?php echo $this->escape($subject); ?></a>
+						<?php else : ?>
+							<?php echo $this->escape($subject); ?>
+						<?php endif; ?>
+						<div class="small">
+							<?php echo JText::_('JCATEGORY') . ': ' . $this->escape($item->category_title); ?>
+						</div>
+					</td>
+					<td class="hidden-phone">
+						<?php echo $this->escape($item->user_name); ?>
+					</td>
+					<td class="hidden-phone hidden-tablet">
+						<?php if ($item->review_time !== JFactory::getDbo()->getNullDate()) : ?>
+							<?php echo JHtml::_('date', $item->review_time, JText::_('DATE_FORMAT_LC4')); ?>
+						<?php else : ?>
+							<?php echo JText::_('COM_USERS_EMPTY_REVIEW'); ?>
+						<?php endif; ?>
+					</td>
+					<td class="hidden-phone">
+						<?php echo (int) $item->id; ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+
+		<div>
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/notes/tmpl/default.xml b/core/administrator/components/com_users/views/notes/tmpl/default.xml
new file mode 100755
index 00000000..a1a88fbd
--- /dev/null
+++ b/core/administrator/components/com_users/views/notes/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_NOTES_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_NOTES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/notes/tmpl/modal.php b/core/administrator/components/com_users/views/notes/tmpl/modal.php
new file mode 100644
index 00000000..b810c3ed
--- /dev/null
+++ b/core/administrator/components/com_users/views/notes/tmpl/modal.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+?>
+<div class="unotes">
+	<h1><?php echo JText::sprintf('COM_USERS_NOTES_FOR_USER', $this->user->name, $this->user->id); ?></h1>
+<?php if (empty($this->items)) : ?>
+	<?php echo JText::_('COM_USERS_NO_NOTES'); ?>
+<?php else : ?>
+	<ul class="alternating">
+	<?php foreach ($this->items as $item) : ?>
+		<li>
+			<div class="fltlft utitle">
+				<?php if ($item->subject) : ?>
+					<h4><?php echo JText::sprintf('COM_USERS_NOTE_N_SUBJECT', (int) $item->id, $this->escape($item->subject)); ?></h4>
+				<?php else : ?>
+					<h4><?php echo JText::sprintf('COM_USERS_NOTE_N_SUBJECT', (int) $item->id, JText::_('COM_USERS_EMPTY_SUBJECT')); ?></h4>
+				<?php endif; ?>
+			</div>
+
+			<div class="fltlft utitle">
+				<?php echo JHtml::_('date', $item->created_time, JText::_('DATE_FORMAT_LC2')); ?>
+			</div>
+
+			<?php $category_image = $item->cparams->get('image'); ?>
+
+			<?php if ($item->catid && isset($category_image)) : ?>
+			<div class="fltlft utitle">
+				<?php echo JHtml::_('users.image', $category_image); ?>
+			</div>
+
+			<div class="fltlft utitle">
+				<em><?php echo $this->escape($item->category_title); ?></em>
+			</div>
+			<?php endif; ?>
+
+			<div class="clr"></div>
+			<div class="ubody">
+				<?php echo (isset($item->body) ? JHtml::_('content.prepare', $item->body) : ''); ?>
+			</div>
+		</li>
+	<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
+</div>
diff --git a/core/administrator/components/com_users/views/notes/view.html.php b/core/administrator/components/com_users/views/notes/view.html.php
new file mode 100644
index 00000000..e01db127
--- /dev/null
+++ b/core/administrator/components/com_users/views/notes/view.html.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * User notes list view
+ *
+ * @since  2.5
+ */
+class UsersViewNotes extends JViewLegacy
+{
+	/**
+	 * A list of user note objects.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var    JPagination
+	 * @since  2.5
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var    JObject
+	 * @since  2.5
+	 */
+	protected $state;
+
+	/**
+	 * The model state.
+	 *
+	 * @var    JUser
+	 * @since  2.5
+	 */
+	protected $user;
+
+	/**
+	 * Override the display method for the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Initialise view variables.
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->user          = $this->get('User');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		UsersHelper::addSubmenu('notes');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Get the component HTML helpers
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		// Turn parameters into registry objects
+		foreach ($this->items as $item)
+		{
+			$item->cparams = new Registry($item->category_params);
+		}
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Display the toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function addToolbar()
+	{
+		$canDo = JHelperContent::getActions('com_users', 'category', $this->state->get('filter.category_id'));
+
+		JToolbarHelper::title(JText::_('COM_USERS_VIEW_NOTES_TITLE'), 'users user');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('note.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('note.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::publish('notes.publish', 'JTOOLBAR_PUBLISH', true);
+			JToolbarHelper::unpublish('notes.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+
+			JToolbarHelper::divider();
+			JToolbarHelper::archiveList('notes.archive');
+			JToolbarHelper::checkin('notes.checkin');
+		}
+
+		if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'notes.delete', 'JTOOLBAR_EMPTY_TRASH');
+			JToolbarHelper::divider();
+		}
+		elseif ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::trash('notes.trash');
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_users');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_USERS_USER_NOTES');
+
+		JHtmlSidebar::setAction('index.php?option=com_users&view=notes');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'u.name'        => JText::_('COM_USERS_USER_HEADING'),
+			'a.subject'     => JText::_('COM_USERS_SUBJECT_HEADING'),
+			'c.title'       => JText::_('COM_USERS_CATEGORY_HEADING'),
+			'a.state'       => JText::_('JSTATUS'),
+			'a.review_time' => JText::_('COM_USERS_REVIEW_HEADING'),
+			'a.id'          => JText::_('JGRID_HEADING_ID')
+		);
+	}
+}
diff --git a/core/administrator/components/com_users/views/user/tmpl/edit.php b/core/administrator/components/com_users/views/user/tmpl/edit.php
new file mode 100644
index 00000000..0ee07452
--- /dev/null
+++ b/core/administrator/components/com_users/views/user/tmpl/edit.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'user.cancel' || document.formvalidator.isValid(document.getElementById('user-form')))
+		{
+			Joomla.submitform(task, document.getElementById('user-form'));
+		}
+	};
+
+	Joomla.twoFactorMethodChange = function(e)
+	{
+		var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val();
+
+		jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) {
+			if (el.id != selectedPane)
+			{
+				jQuery('#' + el.id).hide(0);
+			}
+			else
+			{
+				jQuery('#' + el.id).show(0);
+			}
+		});
+	};
+");
+
+// Get the form fieldsets.
+$fieldsets = $this->form->getFieldsets();
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="user-form" class="form-validate form-horizontal" enctype="multipart/form-data">
+
+	<?php echo JLayoutHelper::render('joomla.edit.item_title', $this); ?>
+
+	<fieldset>
+		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_USERS_USER_ACCOUNT_DETAILS')); ?>
+				<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php if ($field->fieldname == 'password') : ?>
+								<?php // Disables autocomplete ?> <input type="password" style="display:none">
+							<?php endif; ?>
+							<?php echo $field->input; ?>
+						</div>
+					</div>
+				<?php endforeach; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php if ($this->grouplist) : ?>
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'groups', JText::_('COM_USERS_ASSIGNED_GROUPS')); ?>
+					<?php echo $this->loadTemplate('groups'); ?>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
+
+			<?php
+			$this->ignore_fieldsets = array('user_details');
+			echo JLayoutHelper::render('joomla.edit.params', $this);
+			?>
+
+		<?php if (!empty($this->tfaform) && $this->item->id) : ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'twofactorauth', JText::_('COM_USERS_USER_TWO_FACTOR_AUTH')); ?>
+		<div class="control-group">
+			<div class="control-label">
+				<label id="jform_twofactor_method-lbl" for="jform_twofactor_method" class="hasTooltip"
+						title="<?php echo '<strong>' . JText::_('COM_USERS_USER_FIELD_TWOFACTOR_LABEL') . '</strong><br />' . JText::_('COM_USERS_USER_FIELD_TWOFACTOR_DESC'); ?>">
+					<?php echo JText::_('COM_USERS_USER_FIELD_TWOFACTOR_LABEL'); ?>
+				</label>
+			</div>
+			<div class="controls">
+				<?php echo JHtml::_('select.genericlist', Usershelper::getTwoFactorMethods(), 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange()'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
+			</div>
+		</div>
+		<div id="com_users_twofactor_forms_container">
+			<?php foreach ($this->tfaform as $form) : ?>
+			<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
+			<div id="com_users_twofactor_<?php echo $form['method'] ?>" style="<?php echo $style; ?>">
+				<?php echo $form['form'] ?>
+			</div>
+			<?php endforeach; ?>
+		</div>
+
+		<fieldset>
+			<legend>
+				<?php echo JText::_('COM_USERS_USER_OTEPS'); ?>
+			</legend>
+			<div class="alert alert-info">
+				<?php echo JText::_('COM_USERS_USER_OTEPS_DESC'); ?>
+			</div>
+			<?php if (empty($this->otpConfig->otep)) : ?>
+			<div class="alert alert-warning">
+				<?php echo JText::_('COM_USERS_USER_OTEPS_WAIT_DESC'); ?>
+			</div>
+			<?php else : ?>
+			<?php foreach ($this->otpConfig->otep as $otep) : ?>
+			<span class="span3">
+				<?php echo substr($otep, 0, 4); ?>-<?php echo substr($otep, 4, 4); ?>-<?php echo substr($otep, 8, 4); ?>-<?php echo substr($otep, 12, 4); ?>
+			</span>
+			<?php endforeach; ?>
+			<div class="clearfix"></div>
+			<?php endif; ?>
+		</fieldset>
+
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	</fieldset>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/components/com_users/views/user/tmpl/edit.xml b/core/administrator/components/com_users/views/user/tmpl/edit.xml
new file mode 100755
index 00000000..045a8e9a
--- /dev/null
+++ b/core/administrator/components/com_users/views/user/tmpl/edit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_USER_VIEW_EDIT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_USER_VIEW_EDIT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/user/tmpl/edit_groups.php b/core/administrator/components/com_users/views/user/tmpl/edit_groups.php
new file mode 100644
index 00000000..0dab8f7d
--- /dev/null
+++ b/core/administrator/components/com_users/views/user/tmpl/edit_groups.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+?>
+<?php echo JHtml::_('access.usergroups', 'jform[groups]', $this->groups, true); ?>
diff --git a/core/administrator/components/com_users/views/user/view.html.php b/core/administrator/components/com_users/views/user/view.html.php
new file mode 100644
index 00000000..511403dd
--- /dev/null
+++ b/core/administrator/components/com_users/views/user/view.html.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * User view class.
+ *
+ * @since  1.5
+ */
+class UsersViewUser extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $grouplist;
+
+	protected $groups;
+
+	protected $state;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		$this->form      = $this->get('Form');
+		$this->item      = $this->get('Item');
+		$this->state     = $this->get('State');
+		$this->tfaform   = $this->get('Twofactorform');
+		$this->otpConfig = $this->get('otpConfig');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Prevent user from modifying own group(s)
+		$user = JFactory::getUser();
+
+		if ((int) $user->id != (int) $this->item->id || $user->authorise('core.admin'))
+		{
+			$this->grouplist = $this->get('Groups');
+			$this->groups    = $this->get('AssignedGroups');
+		}
+
+		$this->form->setValue('password', null);
+		$this->form->setValue('password2', null);
+
+		parent::display($tpl);
+		$this->addToolbar();
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		JFactory::getApplication()->input->set('hidemainmenu', true);
+
+		$user      = JFactory::getUser();
+		$canDo     = JHelperContent::getActions('com_users');
+		$isNew     = ($this->item->id == 0);
+		$isProfile = $this->item->id == $user->id;
+
+		JToolbarHelper::title(
+			JText::_(
+				$isNew ? 'COM_USERS_VIEW_NEW_USER_TITLE' : ($isProfile ? 'COM_USERS_VIEW_EDIT_PROFILE_TITLE' : 'COM_USERS_VIEW_EDIT_USER_TITLE')
+			),
+			'user ' . ($isNew ? 'user-add' : ($isProfile ? 'user-profile' : 'user-edit'))
+		);
+
+		if ($canDo->get('core.edit') || $canDo->get('core.create'))
+		{
+			JToolbarHelper::apply('user.apply');
+			JToolbarHelper::save('user.save');
+		}
+
+		if ($canDo->get('core.create') && $canDo->get('core.manage'))
+		{
+			JToolbarHelper::save2new('user.save2new');
+		}
+
+		if (empty($this->item->id))
+		{
+			JToolbarHelper::cancel('user.cancel');
+		}
+		else
+		{
+			JToolbarHelper::cancel('user.cancel', 'JTOOLBAR_CLOSE');
+		}
+
+		JToolbarHelper::divider();
+		JToolbarHelper::help('JHELP_USERS_USER_MANAGER_EDIT');
+	}
+}
diff --git a/core/administrator/components/com_users/views/users/tmpl/default.php b/core/administrator/components/com_users/views/users/tmpl/default.php
new file mode 100644
index 00000000..7b949f80
--- /dev/null
+++ b/core/administrator/components/com_users/views/users/tmpl/default.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$loggeduser = JFactory::getUser();
+$debugUsers = $this->state->get('params')->get('debugUsers', 1);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=users'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif; ?>
+		<?php
+		// Search tools bar
+		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+		?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="table table-striped" id="userList">
+				<thead>
+					<tr>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap center hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap">
+							<?php echo JText::_('COM_USERS_HEADING_GROUPS'); ?>
+						</th>
+						<th width="15%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_EMAIL', 'a.email', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_LAST_VISIT_DATE', 'a.lastvisitDate', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone hidden-tablet">
+							<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_REGISTRATION_DATE', 'a.registerDate', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="10">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+				<?php foreach ($this->items as $i => $item) :
+					$canEdit   = $this->canDo->get('core.edit');
+					$canChange = $loggeduser->authorise('core.edit.state',	'com_users');
+
+					// If this group is super admin and this user is not super admin, $canEdit is false
+					if ((!$loggeduser->authorise('core.admin')) && JAccess::check($item->id, 'core.admin'))
+					{
+						$canEdit   = false;
+						$canChange = false;
+					}
+				?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center">
+							<?php if ($canEdit || $canChange) : ?>
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							<?php endif; ?>
+						</td>
+						<td>
+							<div class="name break-word">
+							<?php if ($canEdit) : ?>
+								<a href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->id); ?>" title="<?php echo JText::sprintf('COM_USERS_EDIT_USER', $this->escape($item->name)); ?>">
+									<?php echo $this->escape($item->name); ?></a>
+							<?php else : ?>
+								<?php echo $this->escape($item->name); ?>
+							<?php endif; ?>
+							</div>
+							<div class="btn-group">
+								<?php echo JHtml::_('users.filterNotes', $item->note_count, $item->id); ?>
+								<?php echo JHtml::_('users.notes', $item->note_count, $item->id); ?>
+								<?php echo JHtml::_('users.addNote', $item->id); ?>
+							</div>
+							<?php echo JHtml::_('users.notesModal', $item->note_count, $item->id); ?>
+							<?php if ($item->requireReset == '1') : ?>
+								<span class="label label-warning"><?php echo JText::_('COM_USERS_PASSWORD_RESET_REQUIRED'); ?></span>
+							<?php endif; ?>
+							<?php if ($debugUsers) : ?>
+								<div class="small"><a href="<?php echo JRoute::_('index.php?option=com_users&view=debuguser&user_id=' . (int) $item->id); ?>">
+								<?php echo JText::_('COM_USERS_DEBUG_USER'); ?></a></div>
+							<?php endif; ?>
+						</td>
+						<td class="break-word">
+							<?php echo $this->escape($item->username); ?>
+						</td>
+						<td class="center">
+							<?php
+							$self = $loggeduser->id == $item->id;
+
+							if ($canChange) :
+								echo JHtml::_('jgrid.state', JHtmlUsers::blockStates($self), $item->block, $i, 'users.', !$self);
+							else :
+								echo JHtml::_('jgrid.state', JHtmlUsers::blockStates($self), $item->block, $i, 'users.', false);
+							endif; ?>
+						</td>
+						<td class="center hidden-phone">
+							<?php
+							$activated = empty( $item->activation) ? 0 : 1;
+							echo JHtml::_('jgrid.state', JHtmlUsers::activateStates(), $activated, $i, 'users.', (boolean) $activated);
+							?>
+						</td>
+						<td>
+							<?php if (substr_count($item->group_names, "\n") > 1) : ?>
+								<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_USERS_HEADING_GROUPS'), nl2br($item->group_names), 0); ?>"><?php echo JText::_('COM_USERS_USERS_MULTIPLE_GROUPS'); ?></span>
+							<?php else : ?>
+								<?php echo nl2br($item->group_names); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone break-word hidden-tablet">
+							<?php echo JStringPunycode::emailToUTF8($this->escape($item->email)); ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
+								<?php echo JHtml::_('date', $item->lastvisitDate, JText::_('DATE_FORMAT_LC6')); ?>
+							<?php else : ?>
+								<?php echo JText::_('JNEVER'); ?>
+							<?php endif; ?>
+						</td>
+						<td class="hidden-phone hidden-tablet">
+							<?php echo JHtml::_('date', $item->registerDate, JText::_('DATE_FORMAT_LC6')); ?>
+						</td>
+						<td class="hidden-phone">
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php // Load the batch processing form if user is allowed ?>
+			<?php if ($loggeduser->authorise('core.create', 'com_users')
+				&& $loggeduser->authorise('core.edit', 'com_users')
+				&& $loggeduser->authorise('core.edit.state', 'com_users')) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_USERS_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/components/com_users/views/users/tmpl/default.xml b/core/administrator/components/com_users/views/users/tmpl/default.xml
new file mode 100755
index 00000000..28b9faff
--- /dev/null
+++ b/core/administrator/components/com_users/views/users/tmpl/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USERS_USERS_VIEW_DEFAULT_TITLE">
+		<message>
+			<![CDATA[COM_USERS_USERS_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/administrator/components/com_users/views/users/tmpl/default_batch_body.php b/core/administrator/components/com_users/views/users/tmpl/default_batch_body.php
new file mode 100644
index 00000000..38bc4a76
--- /dev/null
+++ b/core/administrator/components/com_users/views/users/tmpl/default_batch_body.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Create the copy/move options.
+$options = array(
+	JHtml::_('select.option', 'add', JText::_('COM_USERS_BATCH_ADD')),
+	JHtml::_('select.option', 'del', JText::_('COM_USERS_BATCH_DELETE')),
+	JHtml::_('select.option', 'set', JText::_('COM_USERS_BATCH_SET'))
+);
+
+// Create the reset password options.
+$resetOptions = array(
+	JHtml::_('select.option', '', JText::_('COM_USERS_NO_ACTION')),
+	JHtml::_('select.option', 'yes', JText::_('JYES')),
+	JHtml::_('select.option', 'no', JText::_('JNO'))
+);
+JHtml::_('formbehavior.chosen', 'select');
+?>
+
+<div class="container-fluid">
+	<div class="row-fluid">
+		<div class="controls">
+			<label id="batch-choose-action-lbl" class="control-label" for="batch-group-id">
+				<?php echo JText::_('COM_USERS_BATCH_GROUP'); ?>
+			</label>
+			<div id="batch-choose-action" class="combo controls">
+				<div class="control-group">
+					<select name="batch[group_id]" id="batch-group-id">
+						<option value=""><?php echo JText::_('JSELECT'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('user.groups')); ?>
+					</select>
+				</div>
+			</div>
+			<div class="control-group radio">
+				<?php echo JHtml::_('select.radiolist', $options, 'batch[group_action]', '', 'value', 'text', 'add'); ?>
+			</div>
+		</div>
+	</div>
+	<label><?php echo JText::_('COM_USERS_REQUIRE_PASSWORD_RESET'); ?></label>
+	<div class="control-group radio">
+		<?php echo JHtml::_('select.radiolist', $resetOptions, 'batch[reset_id]', '', 'value', 'text', ''); ?>
+	</div>
+</div>
diff --git a/core/administrator/components/com_users/views/users/tmpl/default_batch_footer.php b/core/administrator/components/com_users/views/users/tmpl/default_batch_footer.php
new file mode 100644
index 00000000..1da0d370
--- /dev/null
+++ b/core/administrator/components/com_users/views/users/tmpl/default_batch_footer.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+?>
+<a class="btn" type="button" onclick="document.getElementById('batch-group-id').value=''" data-dismiss="modal">
+	<?php echo JText::_('JCANCEL'); ?>
+</a>
+<button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('user.batch');">
+	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+</button>
\ No newline at end of file
diff --git a/core/administrator/components/com_users/views/users/tmpl/modal.php b/core/administrator/components/com_users/views/users/tmpl/modal.php
new file mode 100644
index 00000000..f9991fd2
--- /dev/null
+++ b/core/administrator/components/com_users/views/users/tmpl/modal.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'bottom'));
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.multiselect');
+
+// Special case for the search field tooltip.
+$searchFilterDesc = $this->filterForm->getFieldAttribute('search', 'description', null, 'filter');
+JHtml::_('bootstrap.tooltip', '#filter_search', array('title' => JText::_($searchFilterDesc), 'placement' => 'bottom'));
+
+$input           = JFactory::getApplication()->input;
+$field           = $input->getCmd('field');
+$listOrder       = $this->escape($this->state->get('list.ordering'));
+$listDirn        = $this->escape($this->state->get('list.direction'));
+$enabledStates   = array(0 => 'icon-publish', 1 => 'icon-unpublish');
+$activatedStates = array(0 => 'icon-publish', 1 => 'icon-unpublish');
+$userRequired    = (int) $input->get('required', 0, 'int');
+
+/**
+ * Mootools compatibility
+ *
+ * There is an extra option passed in the URL for the iframe &ismoo=0 for the bootstraped field.
+ * By default the value will be 1 or defaults to mootools behaviour using function jSelectUser()
+ *
+ * This should be removed when mootools won't be shipped by Joomla.
+ */
+$isMoo = $input->getInt('ismoo', 1);
+
+if ($isMoo)
+{
+	$onClick = "window.parent.jSelectUser(this);window.parent.jQuery('.modal.in').modal('hide');";
+}
+
+?>
+<div class="container-popup">
+	<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component&groups=' . $input->get('groups', '', 'BASE64') . '&excluded=' . $input->get('excluded', '', 'BASE64')); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!$userRequired) : ?>
+		<div class="pull-left">
+			<button type="button" class="btn button-select" data-user-value="0" data-user-name="<?php echo $this->escape(JText::_('JLIB_FORM_SELECT_USER')); ?>"
+				data-user-field="<?php echo $this->escape($field); ?>" <?php if ($isMoo) : ?>value="" onclick="window.parent.jSelectUser(this)"<?php endif; ?>><?php echo JText::_('JOPTION_NO_USER'); ?></button>&nbsp;
+		</div>
+		<?php endif; ?>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+		<?php else : ?>
+		<table class="table table-striped table-condensed">
+			<thead>
+				<tr>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
+					</th>
+					<th width="25%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
+					</th>
+					<th width="1%" class="nowrap center">
+						<?php echo JHtml::_('searchtools.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>
+					</th>
+					<th width="25%" class="nowrap">
+						<?php echo JText::_('COM_USERS_HEADING_GROUPS'); ?>
+					</th>
+					<th width="1%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="6">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+				<?php $i = 0; ?>
+				<?php foreach ($this->items as $item) : ?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td>
+							<a class="pointer button-select" href="#" data-user-value="<?php echo $item->id; ?>" data-user-name="<?php echo $this->escape($item->name); ?>"
+								data-user-field="<?php echo $this->escape($field); ?>" <?php if ($isMoo) : ?>onclick="<?php echo $onClick; ?>"<?php endif; ?>>
+								<?php echo $this->escape($item->name); ?>
+							</a>
+						</td>
+						<td>
+							<?php echo $this->escape($item->username); ?>
+						</td>
+						<td class="center">
+							<span class="<?php echo $enabledStates[(int) $this->escape($item->block)]; ?>"></span>
+						</td>
+						<td class="center">
+							<span class="<?php echo $activatedStates[(empty($item->activation) ? 0 : 1)]; ?>"></span>
+						</td>
+						<td>
+							<?php echo nl2br($item->group_names); ?>
+						</td>
+						<td>
+							<?php echo (int) $item->id; ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="field" value="<?php echo $this->escape($field); ?>" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="required" value="<?php echo $userRequired; ?>" />
+		<input type="hidden" name="ismoo" value="<?php echo $isMoo; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/administrator/components/com_users/views/users/view.html.php b/core/administrator/components/com_users/views/users/view.html.php
new file mode 100644
index 00000000..91824550
--- /dev/null
+++ b/core/administrator/components/com_users/views/users/view.html.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of users.
+ *
+ * @since  1.6
+ */
+class UsersViewUsers extends JViewLegacy
+{
+	/**
+	 * The item data.
+	 *
+	 * @var   object
+	 * @since 1.6
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var   JPagination
+	 * @since 1.6
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state.
+	 *
+	 * @var   JObject
+	 * @since 1.6
+	 */
+	protected $state;
+
+	/**
+	 * A JForm instance with filter fields.
+	 *
+	 * @var    JForm
+	 * @since  3.6.3
+	 */
+	public $filterForm;
+
+	/**
+	 * An array with active filters.
+	 *
+	 * @var    array
+	 * @since  3.6.3
+	 */
+	public $activeFilters;
+
+	/**
+	 * An ACL object to verify user rights.
+	 *
+	 * @var    JObject
+	 * @since  3.6.3
+	 */
+	protected $canDo;
+
+	/**
+	 * An instance of JDatabaseDriver.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.6.3
+	 */
+	protected $db;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 */
+	public function display($tpl = null)
+	{
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->canDo         = JHelperContent::getActions('com_users');
+		$this->db            = JFactory::getDbo();
+
+		UsersHelper::addSubmenu('users');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+		}
+
+		// Include the component HTML helpers.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+		$this->addToolbar();
+		$this->sidebar = JHtmlSidebar::render();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = $this->canDo;
+		$user  = JFactory::getUser();
+
+		// Get the toolbar object instance
+		$bar = JToolbar::getInstance('toolbar');
+
+		JToolbarHelper::title(JText::_('COM_USERS_VIEW_USERS_TITLE'), 'users user');
+
+		if ($canDo->get('core.create'))
+		{
+			JToolbarHelper::addNew('user.add');
+		}
+
+		if ($canDo->get('core.edit'))
+		{
+			JToolbarHelper::editList('user.edit');
+		}
+
+		if ($canDo->get('core.edit.state'))
+		{
+			JToolbarHelper::divider();
+			JToolbarHelper::publish('users.activate', 'COM_USERS_TOOLBAR_ACTIVATE', true);
+			JToolbarHelper::unpublish('users.block', 'COM_USERS_TOOLBAR_BLOCK', true);
+			JToolbarHelper::custom('users.unblock', 'unblock.png', 'unblock_f2.png', 'COM_USERS_TOOLBAR_UNBLOCK', true);
+			JToolbarHelper::divider();
+		}
+
+		if ($canDo->get('core.delete'))
+		{
+			JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'users.delete', 'JTOOLBAR_DELETE');
+			JToolbarHelper::divider();
+		}
+
+		// Add a batch button
+		if ($user->authorise('core.create', 'com_users')
+			&& $user->authorise('core.edit', 'com_users')
+			&& $user->authorise('core.edit.state', 'com_users'))
+		{
+			$title = JText::_('JTOOLBAR_BATCH');
+
+			// Instantiate a new JLayoutFile instance and render the batch button
+			$layout = new JLayoutFile('joomla.toolbar.batch');
+
+			$dhtml = $layout->render(array('title' => $title));
+			$bar->appendButton('Custom', $dhtml, 'batch');
+		}
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			JToolbarHelper::preferences('com_users');
+			JToolbarHelper::divider();
+		}
+
+		JToolbarHelper::help('JHELP_USERS_USER_MANAGER');
+	}
+
+	/**
+	 * Returns an array of fields the table can be sorted by
+	 *
+	 * @return  array  Array containing the field name to sort by as the key and display text as value
+	 *
+	 * @since   3.0
+	 */
+	protected function getSortFields()
+	{
+		return array(
+			'a.name'          => JText::_('COM_USERS_HEADING_NAME'),
+			'a.username'      => JText::_('JGLOBAL_USERNAME'),
+			'a.block'         => JText::_('COM_USERS_HEADING_ENABLED'),
+			'a.activation'    => JText::_('COM_USERS_HEADING_ACTIVATED'),
+			'a.email'         => JText::_('JGLOBAL_EMAIL'),
+			'a.lastvisitDate' => JText::_('COM_USERS_HEADING_LAST_VISIT_DATE'),
+			'a.registerDate'  => JText::_('COM_USERS_HEADING_REGISTRATION_DATE'),
+			'a.id'            => JText::_('JGRID_HEADING_ID'),
+		);
+	}
+}
diff --git a/core/administrator/help/en-GB/toc.json b/core/administrator/help/en-GB/toc.json
new file mode 100644
index 00000000..b2cf6954
--- /dev/null
+++ b/core/administrator/help/en-GB/toc.json
@@ -0,0 +1 @@
+{ "COMPONENTS_ASSOCIATIONS": "COMPONENTS_ASSOCIATIONS", "COMPONENTS_ASSOCIATIONS_EDIT": "COMPONENTS_ASSOCIATIONS_EDIT", "COMPONENTS_BANNERS_BANNERS": "COMPONENTS_BANNERS_BANNERS", "COMPONENTS_BANNERS_BANNERS_EDIT": "COMPONENTS_BANNERS_BANNERS_EDIT", "COMPONENTS_BANNERS_CATEGORIES": "COMPONENTS_BANNERS_CATEGORIES", "COMPONENTS_BANNERS_CATEGORY_EDIT": "COMPONENTS_BANNERS_CATEGORIES_EDIT", "COMPONENTS_BANNERS_CLIENTS": "COMPONENTS_BANNERS_CLIENTS", "COMPONENTS_BANNERS_CLIENTS_EDIT": "COMPONENTS_BANNERS_CLIENTS_EDIT", "COMPONENTS_BANNERS_TRACKS": "COMPONENTS_BANNERS_TRACKS", "COMPONENTS_CONTACTS_CONTACTS": "COMPONENTS_CONTACTS_CONTACTS", "COMPONENTS_CONTACTS_CONTACTS_EDIT": "COMPONENTS_CONTACTS_CONTACTS_EDIT", "COMPONENTS_CONTACT_CATEGORIES": "COMPONENTS_CONTACT_CATEGORIES", "COMPONENTS_CONTACT_CATEGORY_EDIT": "COMPONENTS_CONTACT_CATEGORIES_EDIT", "COMPONENTS_CONTENT_CATEGORIES": "COMPONENTS_CONTENT_CATEGORIES", "COMPONENTS_CONTENT_CATEGORY_EDIT": "COMPONENTS_CONTENT_CATEGORIES_EDIT", "COMPONENTS_FIELDS_FIELDS": "COMPONENTS_FIELDS_FIELDS", "COMPONENTS_FIELDS_FIELDS_EDIT": "COMPONENTS_FIELDS_FIELDS_EDIT", "COMPONENTS_FIELDS_FIELD_GROUPS": "COMPONENTS_FIELDS_FIELD_GROUPS", "COMPONENTS_FIELDS_FIELD_GROUPS_EDIT": "COMPONENTS_FIELDS_FIELD_GROUPS_EDIT", "COMPONENTS_FINDER_MANAGE_CONTENT_MAPS": "COMPONENTS_FINDER_MANAGE_CONTENT_MAPS", "COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT": "COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT", "COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS": "COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS", "COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT": "COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT", "COMPONENTS_JOOMLA_UPDATE": "COMPONENTS_JOOMLA_UPDATE", "COMPONENTS_MESSAGING_INBOX": "COMPONENTS_MESSAGING_INBOX", "COMPONENTS_MESSAGING_READ": "COMPONENTS_MESSAGING_READ", "COMPONENTS_MESSAGING_WRITE": "COMPONENTS_MESSAGING_WRITE", "COMPONENTS_NEWSFEEDS_CATEGORIES": "COMPONENTS_NEWSFEEDS_CATEGORIES", "COMPONENTS_NEWSFEEDS_CATEGORY_EDIT": "COMPONENTS_NEWSFEEDS_CATEGORIES_EDIT", "COMPONENTS_NEWSFEEDS_FEEDS": "COMPONENTS_NEWSFEEDS_FEEDS", "COMPONENTS_NEWSFEEDS_FEEDS_EDIT": "COMPONENTS_NEWSFEEDS_FEEDS_EDIT", "COMPONENTS_POST_INSTALLATION_MESSAGES": "COMPONENTS_POST_INSTALLATION_MESSAGES", "COMPONENTS_REDIRECT_MANAGER": "COMPONENTS_REDIRECT_MANAGER", "COMPONENTS_REDIRECT_MANAGER_EDIT": "COMPONENTS_REDIRECT_MANAGER_EDIT", "COMPONENTS_SEARCH": "COMPONENTS_SEARCH", "COMPONENTS_TAGS_MANAGER": "COMPONENTS_TAGS_MANAGER", "COMPONENTS_TAGS_MANAGER_EDIT": "COMPONENTS_TAGS_MANAGER_EDIT", "COMPONENTS_WEBLINKS_CATEGORIES": "COMPONENTS_WEBLINKS_CATEGORIES", "COMPONENTS_WEBLINKS_CATEGORY_EDIT": "COMPONENTS_WEBLINKS_CATEGORIES_EDIT", "COMPONENTS_WEBLINKS_LINKS": "COMPONENTS_WEBLINKS_LINKS", "COMPONENTS_WEBLINKS_LINKS_EDIT": "COMPONENTS_WEBLINKS_LINKS_EDIT", "CONTENT_ARTICLE_MANAGER": "CONTENT_ARTICLE_MANAGER", "CONTENT_ARTICLE_MANAGER_EDIT": "CONTENT_ARTICLE_MANAGER_EDIT", "CONTENT_FEATURED_ARTICLES": "CONTENT_FEATURED_ARTICLES", "CONTENT_MEDIA_MANAGER": "CONTENT_MEDIA_MANAGER", "EXTENSIONS_EXTENSION_MANAGER_DATABASE": "EXTENSIONS_EXTENSION_MANAGER_DATABASE", "EXTENSIONS_EXTENSION_MANAGER_DISCOVER": "EXTENSIONS_EXTENSION_MANAGER_DISCOVER", "EXTENSIONS_EXTENSION_MANAGER_INSTALL": "EXTENSIONS_EXTENSION_MANAGER_INSTALL", "EXTENSIONS_EXTENSION_MANAGER_MANAGE": "EXTENSIONS_EXTENSION_MANAGER_MANAGE", "EXTENSIONS_EXTENSION_MANAGER_UPDATE": "EXTENSIONS_EXTENSION_MANAGER_UPDATE", "EXTENSIONS_EXTENSION_MANAGER_WARNINGS": "EXTENSIONS_EXTENSION_MANAGER_WARNINGS", "EXTENSIONS_LANGUAGE_MANAGER_CONTENT": "EXTENSIONS_LANGUAGE_MANAGER_CONTENT", "EXTENSIONS_LANGUAGE_MANAGER_EDIT": "EXTENSIONS_LANGUAGE_MANAGER_EDIT", "EXTENSIONS_LANGUAGE_MANAGER_INSTALLED": "EXTENSIONS_LANGUAGE_MANAGER_INSTALLED", "EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES": "EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES", "EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT": "EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT", "EXTENSIONS_MODULE_MANAGER": "EXTENSIONS_MODULE_MANAGER", "EXTENSIONS_MODULE_MANAGER_EDIT": "EXTENSIONS_MODULE_MANAGER_EDIT", "EXTENSIONS_PLUGIN_MANAGER": "EXTENSIONS_PLUGIN_MANAGER", "EXTENSIONS_PLUGIN_MANAGER_EDIT": "EXTENSIONS_PLUGIN_MANAGER_EDIT", "EXTENSIONS_TEMPLATE_MANAGER_STYLES": "EXTENSIONS_TEMPLATE_MANAGER_STYLES", "EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT": "EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT", "EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES": "EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES", "EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT": "EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT", "EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE": "EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE", "MENUS_MENU_ITEM_MANAGER": "MENUS_MENU_ITEM_MANAGER", "MENUS_MENU_ITEM_MANAGER_EDIT": "MENUS_MENU_ITEM_MANAGER_EDIT", "MENUS_MENU_MANAGER": "MENUS_MENU_MANAGER", "MENUS_MENU_MANAGER_EDIT": "MENUS_MENU_MANAGER_EDIT", "SITE_GLOBAL_CONFIGURATION": "SITE_GLOBAL_CONFIGURATION", "SITE_MAINTENANCE_CLEAR_CACHE": "SITE_MAINTENANCE_CLEAR_CACHE", "SITE_MAINTENANCE_GLOBAL_CHECK-IN": "SITE_MAINTENANCE_GLOBAL_CHECK-IN", "SITE_MAINTENANCE_PURGE_EXPIRED_CACHE": "SITE_MAINTENANCE_PURGE_EXPIRED_CACHE", "SITE_SYSTEM_INFORMATION": "SITE_SYSTEM_INFORMATION", "START_HERE": "START_HERE", "USERS_ACCESS_LEVELS": "USERS_ACCESS_LEVELS", "USERS_ACCESS_LEVELS_EDIT": "USERS_ACCESS_LEVELS_EDIT", "USERS_DEBUG_USERS": "USERS_DEBUG_USER", "USERS_GROUPS": "USERS_GROUPS", "USERS_GROUPS_EDIT": "USERS_GROUPS_EDIT", "USERS_MASS_MAIL_USERS": "USERS_MASS_MAIL_USERS", "USERS_USER_MANAGER": "USERS_USER_MANAGER", "USERS_USER_MANAGER_EDIT": "USERS_USER_MANAGER_EDIT", "USERS_USER_NOTES": "USERS_USER_NOTES", "USERS_USER_NOTES_EDIT": "USERS_USER_NOTES_EDIT" }
\ No newline at end of file
diff --git a/core/administrator/help/helpsites.xml b/core/administrator/help/helpsites.xml
new file mode 100644
index 00000000..f47417e6
--- /dev/null
+++ b/core/administrator/help/helpsites.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<joshelp>
+	<sites>
+		<site tag="en-GB" url="https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&amp;lang={langcode}">English (GB) - Joomla help wiki</site>
+		<site tag="fr-FR" url="https://help.joomla.fr/index.php?option=com_help&amp;keyref=Help{major}{minor}:{keyref}">Français (FR) - Aide de Joomla!</site>
+	</sites>
+</joshelp>
diff --git a/core/administrator/includes/defines.php b/core/administrator/includes/defines.php
new file mode 100644
index 00000000..cf0c11a6
--- /dev/null
+++ b/core/administrator/includes/defines.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package    Joomla.Administrator
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Global definitions
+$parts = explode(DIRECTORY_SEPARATOR, JPATH_BASE);
+array_pop($parts);
+
+// Defines
+define('JPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
+define('JPATH_SITE',          JPATH_ROOT);
+define('JPATH_CONFIGURATION', JPATH_ROOT);
+define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
+define('JPATH_LIBRARIES',     JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
+define('JPATH_PLUGINS',       JPATH_ROOT . DIRECTORY_SEPARATOR . 'plugins');
+define('JPATH_INSTALLATION',  JPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
+define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
+define('JPATH_CACHE',         JPATH_BASE . DIRECTORY_SEPARATOR . 'cache');
+define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
diff --git a/core/administrator/includes/framework.php b/core/administrator/includes/framework.php
new file mode 100644
index 00000000..27b22a8b
--- /dev/null
+++ b/core/administrator/includes/framework.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    Joomla.Administrator
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Joomla system checks.
+@ini_set('magic_quotes_runtime', 0);
+
+// System includes
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+// Set system error handling
+JError::setErrorHandling(E_NOTICE, 'message');
+JError::setErrorHandling(E_WARNING, 'message');
+JError::setErrorHandling(E_ERROR, 'message', array('JError', 'customErrorPage'));
+
+$version = new JVersion;
+
+// Installation check, and check on removal of the install directory.
+if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
+	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
+	|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === $version->isInDevelopmentState())))
+{
+	if (file_exists(JPATH_INSTALLATION . '/index.php'))
+	{
+		header('Location: ../installation/index.php');
+
+		exit();
+	}
+	else
+	{
+		echo 'No configuration file found and no installation code available. Exiting...';
+
+		exit;
+	}
+}
+
+// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
+ob_start();
+require_once JPATH_CONFIGURATION . '/configuration.php';
+ob_end_clean();
+
+// System configuration.
+$config = new JConfig;
+
+// Set the error_reporting
+switch ($config->error_reporting)
+{
+	case 'default':
+	case '-1':
+		break;
+
+	case 'none':
+	case '0':
+		error_reporting(0);
+
+		break;
+
+	case 'simple':
+		error_reporting(E_ERROR | E_WARNING | E_PARSE);
+		ini_set('display_errors', 1);
+
+		break;
+
+	case 'maximum':
+		error_reporting(E_ALL);
+		ini_set('display_errors', 1);
+
+		break;
+
+	case 'development':
+		error_reporting(-1);
+		ini_set('display_errors', 1);
+
+		break;
+
+	default:
+		error_reporting($config->error_reporting);
+		ini_set('display_errors', 1);
+
+		break;
+}
+
+define('JDEBUG', $config->debug);
+
+unset($config);
+
+// System profiler
+if (JDEBUG)
+{
+	// @deprecated 4.0 - The $_PROFILER global will be removed
+	$_PROFILER = JProfiler::getInstance('Application');
+}
diff --git a/core/administrator/includes/helper.php b/core/administrator/includes/helper.php
new file mode 100644
index 00000000..1a7bb7d7
--- /dev/null
+++ b/core/administrator/includes/helper.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package    Joomla.Administrator
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Administrator Application helper class.
+ * Provide many supporting API functions.
+ *
+ * @since       1.5
+ *
+ * @deprecated  4.0 Deprecated without replacement
+ */
+class JAdministratorHelper
+{
+	/**
+	 * Return the application option string [main component].
+	 *
+	 * @return  string  The component to access.
+	 *
+	 * @since   1.5
+	 */
+	public static function findOption()
+	{
+		$app = JFactory::getApplication();
+		$option = strtolower($app->input->get('option'));
+
+		$app->loadIdentity();
+		$user = $app->getIdentity();
+
+		if ($user->get('guest') || !$user->authorise('core.login.admin'))
+		{
+			$option = 'com_login';
+		}
+
+		if (empty($option))
+		{
+			$option = 'com_cpanel';
+		}
+
+		$app->input->set('option', $option);
+
+		return $option;
+	}
+}
diff --git a/core/administrator/includes/subtoolbar.php b/core/administrator/includes/subtoolbar.php
new file mode 100644
index 00000000..03833f6d
--- /dev/null
+++ b/core/administrator/includes/subtoolbar.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * @package    Joomla.Administrator
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Utility class for the submenu.
+ *
+ * @package     Joomla.Administrator
+ * @since       1.5
+ * @deprecated  4.0  Use JHtmlSidebar instead.
+ */
+abstract class JSubMenuHelper
+{
+	/**
+	 * Menu entries
+	 *
+	 * @var    array
+	 * @since  3.0
+	 * @deprecated  4.0
+	 */
+	protected static $entries = array();
+
+	/**
+	 * Filters
+	 *
+	 * @var    array
+	 * @since  3.0
+	 * @deprecated  4.0
+	 */
+	protected static $filters = array();
+
+	/**
+	 * Value for the action attribute of the form.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 * @deprecated  4.0
+	 */
+	protected static $action = '';
+
+	/**
+	 * Method to add a menu item to submenu.
+	 *
+	 * @param   string   $name    Name of the menu item.
+	 * @param   string   $link    URL of the menu item.
+	 * @param   boolean  $active  True if the item is active, false otherwise.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use JHtmlSidebar::addEntry() instead.
+	 */
+	public static function addEntry($name, $link = '', $active = false)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlSidebar::addEntry() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		self::$entries[] = array($name, $link, $active);
+	}
+
+	/**
+	 * Returns an array of all submenu entries
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Use JHtmlSidebar::getEntries() instead.
+	 */
+	public static function getEntries()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlSidebar::getEntries() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return self::$entries;
+	}
+
+	/**
+	 * Method to add a filter to the submenu
+	 *
+	 * @param   string   $label      Label for the menu item.
+	 * @param   string   $name       name for the filter. Also used as id.
+	 * @param   string   $options    options for the select field.
+	 * @param   boolean  $noDefault  Don't the label as the empty option
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Use JHtmlSidebar::addFilter() instead.
+	 */
+	public static function addFilter($label, $name, $options, $noDefault = false)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlSidebar::addFilter() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		self::$filters[] = array('label' => $label, 'name' => $name, 'options' => $options, 'noDefault' => $noDefault);
+	}
+
+	/**
+	 * Returns an array of all filters
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Use JHtmlSidebar::getFilters() instead.
+	 */
+	public static function getFilters()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlSidebar::getFilters() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return self::$filters;
+	}
+
+	/**
+	 * Set value for the action attribute of the filter form
+	 *
+	 * @param   string  $action  Value for the action attribute of the form
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Use JHtmlSidebar::setAction() instead.
+	 */
+	public static function setAction($action)
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlSidebar::setAction() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		self::$action = $action;
+	}
+
+	/**
+	 * Get value for the action attribute of the filter form
+	 *
+	 * @return  string  Value for the action attribute of the form
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Use JHtmlSidebar::getAction() instead.
+	 */
+	public static function getAction()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated. Use JHtmlSidebar::getAction() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return self::$action;
+	}
+}
diff --git a/core/administrator/includes/toolbar.php b/core/administrator/includes/toolbar.php
new file mode 100644
index 00000000..c7c5e843
--- /dev/null
+++ b/core/administrator/includes/toolbar.php
@@ -0,0 +1,655 @@
+<?php
+/**
+ * @package    Joomla.Administrator
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('JSubMenuHelper', JPATH_BASE . '/includes/subtoolbar.php');
+
+/**
+ * Utility class for the button bar.
+ *
+ * @since  1.5
+ */
+abstract class JToolbarHelper
+{
+	/**
+	 * Title cell.
+	 * For the title and toolbar to be rendered correctly,
+	 * this title function must be called before the starttable function and the toolbars icons
+	 * this is due to the nature of how the css has been used to position the title in respect to the toolbar.
+	 *
+	 * @param   string  $title  The title.
+	 * @param   string  $icon   The space-separated names of the image.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function title($title, $icon = 'generic.png')
+	{
+		$layout = new JLayoutFile('joomla.toolbar.title');
+		$html   = $layout->render(array('title' => $title, 'icon' => $icon));
+
+		$app = JFactory::getApplication();
+		$app->JComponentTitle = $html;
+		JFactory::getDocument()->setTitle(strip_tags($title) . ' - ' . $app->get('sitename') . ' - ' . JText::_('JADMINISTRATION'));
+	}
+
+	/**
+	 * Writes a spacer cell.
+	 *
+	 * @param   string  $width  The width for the cell
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function spacer($width = '')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a spacer.
+		$bar->appendButton('Separator', 'spacer', $width);
+	}
+
+	/**
+	 * Writes a divider between menu buttons
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function divider()
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a divider.
+		$bar->appendButton('Separator', 'divider');
+	}
+
+	/**
+	 * Writes a custom option and task button for the button bar.
+	 *
+	 * @param   string  $task        The task to perform (picked up by the switch($task) blocks).
+	 * @param   string  $icon        The image to display.
+	 * @param   string  $iconOver    The image to display when moused over.
+	 * @param   string  $alt         The alt text for the icon image.
+	 * @param   bool    $listSelect  True if required to check that a standard list item is checked.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function custom($task = '', $icon = '', $iconOver = '', $alt = '', $listSelect = true)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Strip extension.
+		$icon = preg_replace('#\.[^.]*$#', '', $icon);
+
+		// Add a standard button.
+		$bar->appendButton('Standard', $icon, $alt, $task, $listSelect);
+	}
+
+	/**
+	 * Writes a preview button for a given option (opens a popup window).
+	 *
+	 * @param   string  $url            The name of the popup file (excluding the file extension)
+	 * @param   bool    $updateEditors  Unused
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function preview($url = '', $updateEditors = false)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a preview button.
+		$bar->appendButton('Popup', 'preview', 'Preview', $url . '&task=preview');
+	}
+
+	/**
+	 * Writes a preview button for a given option (opens a popup window).
+	 *
+	 * @param   string  $ref        The name of the popup file (excluding the file extension for an xml file).
+	 * @param   bool    $com        Use the help file in the component directory.
+	 * @param   string  $override   Use this URL instead of any other
+	 * @param   string  $component  Name of component to get Help (null for current component)
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function help($ref, $com = false, $override = null, $component = null)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a help button.
+		$bar->appendButton('Help', $ref, $com, $override, $component);
+	}
+
+	/**
+	 * Writes a cancel button that will go back to the previous page without doing
+	 * any other operation.
+	 *
+	 * @param   string  $alt   Alternative text.
+	 * @param   string  $href  URL of the href attribute.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function back($alt = 'JTOOLBAR_BACK', $href = 'javascript:history.back();')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a back button.
+		$bar->appendButton('Link', 'back', $alt, $href);
+	}
+
+	/**
+	 * Creates a button to redirect to a link
+	 *
+	 * @param   string  $url   The link url
+	 * @param   string  $text  Button text
+	 * @param   string  $name  Name to be used as apart of the id
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public static function link($url, $text, $name = 'link')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		$bar->appendButton('Link', $name, $text, $url);
+	}
+
+	/**
+	 * Writes a media_manager button.
+	 *
+	 * @param   string  $directory  The subdirectory to upload the media to.
+	 * @param   string  $alt        An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function media_manager($directory = '', $alt = 'JTOOLBAR_UPLOAD')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an upload button.
+		$bar->appendButton('Popup', 'upload', $alt, 'index.php?option=com_media&tmpl=component&task=popupUpload&folder=' . $directory, 800, 520);
+	}
+
+	/**
+	 * Writes a common 'default' button for a record.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function makeDefault($task = 'default', $alt = 'JTOOLBAR_DEFAULT')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a default button.
+		$bar->appendButton('Standard', 'default', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'assign' button for a record.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function assign($task = 'assign', $alt = 'JTOOLBAR_ASSIGN')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an assign button.
+		$bar->appendButton('Standard', 'assign', $alt, $task, true);
+	}
+
+	/**
+	 * Writes the common 'new' icon for the button bar.
+	 *
+	 * @param   string   $task   An override for the task.
+	 * @param   string   $alt    An override for the alt text.
+	 * @param   boolean  $check  True if required to check that a standard list item is checked.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function addNew($task = 'add', $alt = 'JTOOLBAR_NEW', $check = false)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a new button.
+		$bar->appendButton('Standard', 'new', $alt, $task, $check);
+	}
+
+	/**
+	 * Writes a common 'publish' button.
+	 *
+	 * @param   string   $task   An override for the task.
+	 * @param   string   $alt    An override for the alt text.
+	 * @param   boolean  $check  True if required to check that a standard list item is checked.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function publish($task = 'publish', $alt = 'JTOOLBAR_PUBLISH', $check = false)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a publish button.
+		$bar->appendButton('Standard', 'publish', $alt, $task, $check);
+	}
+
+	/**
+	 * Writes a common 'publish' button for a list of records.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function publishList($task = 'publish', $alt = 'JTOOLBAR_PUBLISH')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a publish button (list).
+		$bar->appendButton('Standard', 'publish', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'unpublish' button.
+	 *
+	 * @param   string   $task   An override for the task.
+	 * @param   string   $alt    An override for the alt text.
+	 * @param   boolean  $check  True if required to check that a standard list item is checked.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function unpublish($task = 'unpublish', $alt = 'JTOOLBAR_UNPUBLISH', $check = false)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an unpublish button
+		$bar->appendButton('Standard', 'unpublish', $alt, $task, $check);
+	}
+
+	/**
+	 * Writes a common 'unpublish' button for a list of records.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function unpublishList($task = 'unpublish', $alt = 'JTOOLBAR_UNPUBLISH')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an unpublish button (list).
+		$bar->appendButton('Standard', 'unpublish', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'archive' button for a list of records.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function archiveList($task = 'archive', $alt = 'JTOOLBAR_ARCHIVE')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an archive button.
+		$bar->appendButton('Standard', 'archive', $alt, $task, true);
+	}
+
+	/**
+	 * Writes an unarchive button for a list of records.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function unarchiveList($task = 'unarchive', $alt = 'JTOOLBAR_UNARCHIVE')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an unarchive button (list).
+		$bar->appendButton('Standard', 'unarchive', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'edit' button for a list of records.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function editList($task = 'edit', $alt = 'JTOOLBAR_EDIT')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an edit button.
+		$bar->appendButton('Standard', 'edit', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'edit' button for a template html.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function editHtml($task = 'edit_source', $alt = 'JTOOLBAR_EDIT_HTML')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an edit html button.
+		$bar->appendButton('Standard', 'edithtml', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'edit' button for a template css.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function editCss($task = 'edit_css', $alt = 'JTOOLBAR_EDIT_CSS')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an edit css button (hide).
+		$bar->appendButton('Standard', 'editcss', $alt, $task, true);
+	}
+
+	/**
+	 * Writes a common 'delete' button for a list of records.
+	 *
+	 * @param   string  $msg   Postscript for the 'are you sure' message.
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function deleteList($msg = '', $task = 'remove', $alt = 'JTOOLBAR_DELETE')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a delete button.
+		if ($msg)
+		{
+			$bar->appendButton('Confirm', $msg, 'delete', $alt, $task, true);
+		}
+		else
+		{
+			$bar->appendButton('Standard', 'delete', $alt, $task, true);
+		}
+	}
+
+	/**
+	 * Writes a common 'trash' button for a list of records.
+	 *
+	 * @param   string  $task   An override for the task.
+	 * @param   string  $alt    An override for the alt text.
+	 * @param   bool    $check  True to allow lists.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function trash($task = 'remove', $alt = 'JTOOLBAR_TRASH', $check = true)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a trash button.
+		$bar->appendButton('Standard', 'trash', $alt, $task, $check, false);
+	}
+
+	/**
+	 * Writes a save button for a given option.
+	 * Apply operation leads to a save action only (does not leave edit mode).
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function apply($task = 'apply', $alt = 'JTOOLBAR_APPLY')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add an apply button
+		$bar->appendButton('Standard', 'apply', $alt, $task, false);
+	}
+
+	/**
+	 * Writes a save button for a given option.
+	 * Save operation leads to a save and then close action.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function save($task = 'save', $alt = 'JTOOLBAR_SAVE')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a save button.
+		$bar->appendButton('Standard', 'save', $alt, $task, false);
+	}
+
+	/**
+	 * Writes a save and create new button for a given option.
+	 * Save and create operation leads to a save and then add action.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function save2new($task = 'save2new', $alt = 'JTOOLBAR_SAVE_AND_NEW')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a save and create new button.
+		$bar->appendButton('Standard', 'save-new', $alt, $task, false);
+	}
+
+	/**
+	 * Writes a save as copy button for a given option.
+	 * Save as copy operation leads to a save after clearing the key,
+	 * then returns user to edit mode with new key.
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function save2copy($task = 'save2copy', $alt = 'JTOOLBAR_SAVE_AS_COPY')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a save and create new button.
+		$bar->appendButton('Standard', 'save-copy', $alt, $task, false);
+	}
+
+	/**
+	 * Writes a checkin button for a given option.
+	 *
+	 * @param   string   $task   An override for the task.
+	 * @param   string   $alt    An override for the alt text.
+	 * @param   boolean  $check  True if required to check that a standard list item is checked.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7
+	 */
+	public static function checkin($task = 'checkin', $alt = 'JTOOLBAR_CHECKIN', $check = true)
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a save and create new button.
+		$bar->appendButton('Standard', 'checkin', $alt, $task, $check);
+	}
+
+	/**
+	 * Writes a cancel button and invokes a cancel operation (eg a checkin).
+	 *
+	 * @param   string  $task  An override for the task.
+	 * @param   string  $alt   An override for the alt text.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function cancel($task = 'cancel', $alt = 'JTOOLBAR_CANCEL')
+	{
+		$bar = JToolbar::getInstance('toolbar');
+
+		// Add a cancel button.
+		$bar->appendButton('Standard', 'cancel', $alt, $task, false);
+	}
+
+	/**
+	 * Writes a configuration button and invokes a cancel operation (eg a checkin).
+	 *
+	 * @param   string   $component  The name of the component, eg, com_content.
+	 * @param   integer  $height     The height of the popup. [UNUSED]
+	 * @param   integer  $width      The width of the popup. [UNUSED]
+	 * @param   string   $alt        The name of the button.
+	 * @param   string   $path       An alternative path for the configuation xml relative to JPATH_SITE.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function preferences($component, $height = '550', $width = '875', $alt = 'JToolbar_Options', $path = '')
+	{
+		$component = urlencode($component);
+		$path = urlencode($path);
+		$bar = JToolbar::getInstance('toolbar');
+
+		$uri = (string) JUri::getInstance();
+		$return = urlencode(base64_encode($uri));
+
+		// Add a button linking to config for component.
+		$bar->appendButton(
+			'Link',
+			'options',
+			$alt,
+			'index.php?option=com_config&amp;view=component&amp;component=' . $component . '&amp;path=' . $path . '&amp;return=' . $return
+		);
+	}
+
+	/**
+	 * Writes a version history
+	 *
+	 * @param   string   $typeAlias  The component and type, for example 'com_content.article'
+	 * @param   integer  $itemId     The id of the item, for example the article id.
+	 * @param   integer  $height     The height of the popup.
+	 * @param   integer  $width      The width of the popup.
+	 * @param   string   $alt        The name of the button.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function versions($typeAlias, $itemId, $height = 800, $width = 500, $alt = 'JTOOLBAR_VERSIONS')
+	{
+		$lang = JFactory::getLanguage();
+		$lang->load('com_contenthistory', JPATH_ADMINISTRATOR, $lang->getTag(), true);
+		$contentTypeTable = JTable::getInstance('Contenttype');
+		$typeId           = $contentTypeTable->getTypeId($typeAlias);
+
+		// Options array for JLayout
+		$options              = array();
+		$options['title']     = JText::_($alt);
+		$options['height']    = $height;
+		$options['width']     = $width;
+		$options['itemId']    = $itemId;
+		$options['typeId']    = $typeId;
+		$options['typeAlias'] = $typeAlias;
+
+		$bar    = JToolbar::getInstance('toolbar');
+		$layout = new JLayoutFile('joomla.toolbar.versions');
+		$bar->appendButton('Custom', $layout->render($options), 'versions');
+	}
+
+	/**
+	 * Displays a modal button
+	 *
+	 * @param   string  $targetModalId  ID of the target modal box
+	 * @param   string  $icon           Icon class to show on modal button
+	 * @param   string  $alt            Title for the modal button
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function modal($targetModalId, $icon, $alt)
+	{
+		$title = JText::_($alt);
+		$dhtml = '<button data-toggle="modal" data-target="#' . $targetModalId . '" class="btn btn-small">
+			<span class="' . $icon . '" title="' . $title . '"></span> ' . $title . '</button>';
+
+		$bar = JToolbar::getInstance('toolbar');
+		$bar->appendButton('Custom', $dhtml, $alt);
+	}
+}
diff --git a/core/administrator/index.php b/core/administrator/index.php
new file mode 100644
index 00000000..ac537b53
--- /dev/null
+++ b/core/administrator/index.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package    Joomla.Administrator
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
+ */
+define('JOOMLA_MINIMUM_PHP', '5.3.10');
+
+if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
+{
+	die('Your host needs to use PHP ' . JOOMLA_MINIMUM_PHP . ' or higher to run this version of Joomla!');
+}
+
+// Saves the start time and memory usage.
+$startTime = microtime(1);
+$startMem  = memory_get_usage();
+
+/**
+ * Constant that is checked in included files to prevent direct access.
+ * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower
+ */
+define('_JEXEC', 1);
+
+if (file_exists(__DIR__ . '/defines.php'))
+{
+	include_once __DIR__ . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', __DIR__);
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+require_once JPATH_BASE . '/includes/framework.php';
+require_once JPATH_BASE . '/includes/helper.php';
+require_once JPATH_BASE . '/includes/toolbar.php';
+
+// Set profiler start time and memory usage and mark afterLoad in the profiler.
+JDEBUG ? JProfiler::getInstance('Application')->setStart($startTime, $startMem)->mark('afterLoad') : null;
+
+// Instantiate the application.
+$app = JFactory::getApplication('administrator');
+
+// Execute the application.
+$app->execute();
diff --git a/core/administrator/language/en-GB/en-GB.com_admin.ini b/core/administrator/language/en-GB/en-GB.com_admin.ini
new file mode 100644
index 00000000..3ff9f0a5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_admin.ini
@@ -0,0 +1,196 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ADMIN="System Information"
+COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index"
+COM_ADMIN_CACHE_DIRECTORY="(Cache Folder)"
+COM_ADMIN_CLEAR_RESULTS="Clear results"
+COM_ADMIN_CONFIGURATION_FILE="Configuration File"
+COM_ADMIN_DATABASE_COLLATION="Database Collation"
+COM_ADMIN_DATABASE_CONNECTION_COLLATION="Database Connection Collation"
+COM_ADMIN_DATABASE_TYPE="Database Type"
+COM_ADMIN_DATABASE_VERSION="Database Version"
+COM_ADMIN_DIRECTORY="Folder"
+COM_ADMIN_DIRECTORY_PERMISSIONS="Folder Permissions"
+COM_ADMIN_DISABLED_FUNCTIONS="Disabled Functions"
+COM_ADMIN_DISPLAY_ERRORS="Display Errors"
+COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT="Download as text"
+COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON="Download as JSON"
+COM_ADMIN_EXTENSIONS="Extensions"
+COM_ADMIN_FILE_UPLOADS="File Uploads"
+COM_ADMIN_GLOSSARY="Glossary"
+COM_ADMIN_GO="Go"
+COM_ADMIN_HELP="Joomla! Help"
+COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS="Multilingual Associations"
+COM_ADMIN_HELP_COMPONENTS_ASSOCIATIONS_EDIT="Multilingual Associations: Select"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_BANNERS="Banners"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_BANNERS_EDIT="Banners: New/Edit"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_CATEGORIES="Banners: Categories"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_CATEGORIES_EDIT="Banners: Categories - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_CLIENTS="Banners: Clients"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Banners: Clients - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_BANNERS_TRACKS="Banners: Tracks"
+COM_ADMIN_HELP_COMPONENTS_CONTACTS_CONTACTS="Contacts"
+COM_ADMIN_HELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Contacts: New/Edit"
+COM_ADMIN_HELP_COMPONENTS_CONTACT_CATEGORIES="Contacts: Categories"
+COM_ADMIN_HELP_COMPONENTS_CONTACT_CATEGORIES_EDIT="Contacts: Categories - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_CONTENT_CATEGORIES="Articles: Categories"
+COM_ADMIN_HELP_COMPONENTS_CONTENT_CATEGORIES_EDIT="Articles: Categories - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_FIELDS_FIELDS="Fields"
+COM_ADMIN_HELP_COMPONENTS_FIELDS_FIELDS_EDIT="Fields: New/Edit"
+COM_ADMIN_HELP_COMPONENTS_FIELDS_FIELD_GROUPS="Field Groups"
+COM_ADMIN_HELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT="Field Groups: New/Edit"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Smart Search: Content Maps"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Smart Search: Indexed Content"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Smart Search: Filters - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Smart Search: Search Filters"
+COM_ADMIN_HELP_COMPONENTS_JOOMLA_UPDATE="Joomla Update"
+COM_ADMIN_HELP_COMPONENTS_MESSAGING_INBOX="Private Messages: Inbox"
+COM_ADMIN_HELP_COMPONENTS_MESSAGING_READ="Private Messages: Read"
+COM_ADMIN_HELP_COMPONENTS_MESSAGING_WRITE="Private Messages: Write"
+COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_CATEGORIES="News Feeds: Categories"
+COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_CATEGORIES_EDIT="News Feeds: Categories - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_FEEDS="News Feeds"
+COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News Feeds: New/Edit"
+COM_ADMIN_HELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-Installation Messages"
+COM_ADMIN_HELP_COMPONENTS_REDIRECT_MANAGER="Redirect: Links"
+COM_ADMIN_HELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirect: Links - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_SEARCH="Search"
+COM_ADMIN_HELP_COMPONENTS_TAGS_MANAGER="Tags"
+COM_ADMIN_HELP_COMPONENTS_TAGS_MANAGER_EDIT="Tags: New/Edit"
+COM_ADMIN_HELP_COMPONENTS_WEBLINKS_CATEGORIES="Web Links: Categories"
+COM_ADMIN_HELP_COMPONENTS_WEBLINKS_CATEGORIES_EDIT="Web Links: Categories - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_WEBLINKS_LINKS="Web Links"
+COM_ADMIN_HELP_COMPONENTS_WEBLINKS_LINKS_EDIT="Web Links: New/Edit"
+COM_ADMIN_HELP_CONTENT_ARTICLE_MANAGER="Articles"
+COM_ADMIN_HELP_CONTENT_ARTICLE_MANAGER_EDIT="Articles: New/Edit"
+COM_ADMIN_HELP_CONTENT_FEATURED_ARTICLES="Articles: Featured "
+COM_ADMIN_HELP_CONTENT_MEDIA_MANAGER="Media"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Extensions: Check Database"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extensions: Discover"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extensions: Install"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extensions: Install Accredited Language Translations"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extensions: Manage"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extensions: Update"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Extensions: Warnings"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Languages: Content"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Languages: New/Edit"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Languages: Installed"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Languages: Overrides"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Languages: Overrides - New/Edit"
+COM_ADMIN_HELP_EXTENSIONS_MODULE_MANAGER="Modules"
+COM_ADMIN_HELP_EXTENSIONS_MODULE_MANAGER_EDIT="Modules: Edit"
+COM_ADMIN_HELP_EXTENSIONS_PLUGIN_MANAGER="Plugins"
+COM_ADMIN_HELP_EXTENSIONS_PLUGIN_MANAGER_EDIT="Plugins: New/Edit"
+COM_ADMIN_HELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES="Templates: Styles"
+COM_ADMIN_HELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT="Templates: Styles - Edit"
+COM_ADMIN_HELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES="Templates"
+COM_ADMIN_HELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT="Templates: Edit"
+COM_ADMIN_HELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE="Templates: Source - Edit"
+COM_ADMIN_HELP_GLOSSARY="Glossary"
+COM_ADMIN_HELP_MENUS_MENU_ITEM_MANAGER="Menu: Items"
+COM_ADMIN_HELP_MENUS_MENU_ITEM_MANAGER_EDIT="Menu: Items New/Edit"
+COM_ADMIN_HELP_MENUS_MENU_MANAGER="Menus"
+COM_ADMIN_HELP_MENUS_MENU_MANAGER_EDIT="Menus: New/Edit"
+COM_ADMIN_HELP_SITE_GLOBAL_CONFIGURATION="Global Configuration"
+COM_ADMIN_HELP_SITE_MAINTENANCE_CLEAR_CACHE="Cache: Clear Cache"
+COM_ADMIN_HELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Global Check-in"
+COM_ADMIN_HELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE="Cache: Clear Expired Cache"
+COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information"
+COM_ADMIN_HELP_START_HERE="Start Here"
+COM_ADMIN_HELP_USERS_ACCESS_LEVELS="Users: Access Levels"
+COM_ADMIN_HELP_USERS_ACCESS_LEVELS_EDIT="Users: Access Levels - New/Edit"
+COM_ADMIN_HELP_USERS_DEBUG_USER="Users: Debug Users Permissions"
+COM_ADMIN_HELP_USERS_GROUPS="Users: Groups"
+COM_ADMIN_HELP_USERS_GROUPS_EDIT="Users: Groups - New/Edit"
+COM_ADMIN_HELP_USERS_MASS_MAIL_USERS="Mass Mail Users"
+COM_ADMIN_HELP_USERS_USER_NOTES="Users: User Notes"
+COM_ADMIN_HELP_USERS_USER_NOTES_EDIT="Users: User Notes - New/Edit"
+COM_ADMIN_HELP_USERS_USER_MANAGER="Users"
+COM_ADMIN_HELP_USERS_USER_MANAGER_EDIT="Users: New/Edit"
+COM_ADMIN_ICONV_AVAILABLE="Iconv Available"
+COM_ADMIN_INFORMATION="System Information"
+COM_ADMIN_JOOMLA_VERSION="Joomla! Version"
+COM_ADMIN_LATEST_VERSION_CHECK="Latest Version Check"
+COM_ADMIN_LICENSE="License"
+COM_ADMIN_LOG_DIRECTORY="(Log folder)"
+COM_ADMIN_MAGIC_QUOTES="Magic Quotes"
+COM_ADMIN_MAX_INPUT_VARS="Maximum Input Variables"
+COM_ADMIN_MBSTRING_ENABLED="Multibyte String (mbstring) Enabled"
+COM_ADMIN_MCRYPT_ENABLED="Mcrypt Enabled"
+COM_ADMIN_NA="n/a"
+COM_ADMIN_OPEN_BASEDIR="Open basedir"
+COM_ADMIN_OUTPUT_BUFFERING="Output Buffering"
+COM_ADMIN_PHP_BUILT_ON="PHP Built On"
+COM_ADMIN_PHP_INFORMATION="PHP Information"
+COM_ADMIN_PHP_SETTINGS="PHP Settings"
+COM_ADMIN_PHP_VERSION="PHP Version"
+COM_ADMIN_PHPINFO_DISABLED="The built in phpinfo() function has been disabled by your host."
+COM_ADMIN_PLATFORM_VERSION="Joomla! Platform Version"
+COM_ADMIN_REGISTER_GLOBALS="Register Globals"
+COM_ADMIN_RELEVANT_PHP_SETTINGS="Relevant PHP Settings"
+COM_ADMIN_SAFE_MODE="Safe Mode"
+COM_ADMIN_SEARCH="Search"
+COM_ADMIN_SESSION_AUTO_START="Session Auto Start"
+COM_ADMIN_SESSION_SAVE_PATH="Session Save Path"
+COM_ADMIN_SETTING="Setting"
+COM_ADMIN_SHORT_OPEN_TAGS="Short Open Tags"
+COM_ADMIN_START_HERE="Start here"
+COM_ADMIN_STATUS="Status"
+COM_ADMIN_SYSTEM_INFO="System Info"
+COM_ADMIN_SYSTEM_INFORMATION="System Information"
+COM_ADMIN_TEMP_DIRECTORY="(Temp folder)"
+COM_ADMIN_UNWRITABLE="Unwritable"
+COM_ADMIN_USER_ACCOUNT_DETAILS="My Profile Details"
+COM_ADMIN_USER_AGENT="User Agent"
+COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_DESC="Select the Language for the Administrator Backend interface. This will only affect this User."
+COM_ADMIN_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language"
+COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_DESC="Select the template style for the Administrator Backend interface. This will only affect this User."
+COM_ADMIN_USER_FIELD_BACKEND_TEMPLATE_LABEL="Backend Template Style"
+COM_ADMIN_USER_FIELD_EDITOR_DESC="Editor for this user."
+COM_ADMIN_USER_FIELD_EDITOR_LABEL="Editor"
+COM_ADMIN_USER_FIELD_EMAIL_DESC="Enter an email address for the user."
+COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_DESC="Select the Language for the Frontend interface. This will only affect this User."
+COM_ADMIN_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
+COM_ADMIN_USER_FIELD_HELPSITE_DESC="Help site for this user."
+COM_ADMIN_USER_FIELD_HELPSITE_LABEL="Help Site"
+COM_ADMIN_USER_FIELD_LASTVISIT_DESC="Last visit date."
+COM_ADMIN_USER_FIELD_LASTVISIT_LABEL="Last Visit Date"
+COM_ADMIN_USER_FIELD_NAME_DESC="Enter the name of the user."
+COM_ADMIN_USER_FIELD_NOCHANGE_USERNAME_DESC="If you want to change your Username, please contact a site administrator."
+COM_ADMIN_USER_FIELD_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
+COM_ADMIN_USER_FIELD_PASSWORD2_DESC="Confirm the user's password."
+COM_ADMIN_USER_FIELD_PASSWORD2_LABEL="Confirm Password"
+COM_ADMIN_USER_FIELD_PASSWORD_DESC="Enter the password for the user."
+COM_ADMIN_USER_FIELD_REGISTERDATE_DESC="Registration date."
+COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL="Registration Date"
+COM_ADMIN_USER_FIELD_TIMEZONE_DESC="Time zone for this user."
+COM_ADMIN_USER_FIELD_TIMEZONE_LABEL="Time Zone"
+COM_ADMIN_USER_FIELD_USERNAME_DESC="Enter the login name (Username) for the user."
+COM_ADMIN_USER_FIELD_USERNAME_LABEL="Login Name"
+COM_ADMIN_USER_HEADING_NAME="Name"
+COM_ADMIN_USER_SETTINGS_FIELDSET_LABEL="Basic Settings"
+COM_ADMIN_VALUE="Value"
+COM_ADMIN_VIEW="View"
+COM_ADMIN_VIEW_PROFILE_TITLE="My Profile"
+COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE="WebServer to PHP Interface"
+COM_ADMIN_WEB_SERVER="Web Server"
+COM_ADMIN_WRITABLE="Writable"
+COM_ADMIN_XML_DESCRIPTION="Administration system information component."
+COM_ADMIN_XML_ENABLED="XML Enabled"
+COM_ADMIN_ZIP_ENABLED="Native ZIP Enabled"
+COM_ADMIN_ZLIB_ENABLED="Zlib Enabled"
+
+; Messages
+COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
+COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
+COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
+COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough uppercase characters. At least %s upper case characters are required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough uppercase characters. At least 1 upper case character is required."
+COM_USERS_MSG_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
+COM_USERS_MSG_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."
+COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end."
+
diff --git a/core/administrator/language/en-GB/en-GB.com_admin.sys.ini b/core/administrator/language/en-GB/en-GB.com_admin.sys.ini
new file mode 100644
index 00000000..7c5a6191
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_admin.sys.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ADMIN="System Information"
+COM_ADMIN_XML_DESCRIPTION="Administration system information component."
+
+COM_ADMIN_HELP_VIEW_DEFAULT_DESC="Get help on various pages in your Joomla administrator interface."
+COM_ADMIN_HELP_VIEW_DEFAULT_TITLE="Joomla! Help"
+COM_ADMIN_SYSINFO_VIEW_DEFAULT_DESC="View detailed information about your Joomla site and server configuration settings."
+COM_ADMIN_SYSINFO_VIEW_DEFAULT_TITLE="System Information"
diff --git a/core/administrator/language/en-GB/en-GB.com_ajax.ini b/core/administrator/language/en-GB/en-GB.com_ajax.ini
new file mode 100644
index 00000000..cef5ced3
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_ajax.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+COM_AJAX="Ajax Interface"
+COM_AJAX_XML_DESCRIPTION="An extendable Ajax interface for Joomla."
+COM_AJAX_SPECIFY_FORMAT="Please specify a valid response format, other than that of HTML, such as json, raw, debug, etc."
+COM_AJAX_METHOD_NOT_EXISTS="Method %s does not exist."
+COM_AJAX_FILE_NOT_EXISTS="The file at %s does not exist."
+COM_AJAX_MODULE_NOT_ACCESSIBLE="Module %s is not published, you do not have access to it, or it's not assigned to the current menu item."
+COM_AJAX_TEMPLATE_NOT_ACCESSIBLE="Template %s is not assigned to the current menu item."
diff --git a/core/administrator/language/en-GB/en-GB.com_ajax.sys.ini b/core/administrator/language/en-GB/en-GB.com_ajax.sys.ini
new file mode 100644
index 00000000..a281c571
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_ajax.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+COM_AJAX="Ajax Interface"
+COM_AJAX_XML_DESCRIPTION="An extendable Ajax interface for Joomla."
diff --git a/core/administrator/language/en-GB/en-GB.com_associations.ini b/core/administrator/language/en-GB/en-GB.com_associations.ini
new file mode 100644
index 00000000..e4d06b58
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_associations.ini
@@ -0,0 +1,52 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ASSOCIATIONS="Multilingual Associations"
+COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION="Add new association"
+COM_ASSOCIATIONS_ASSOCIATED_ITEM="Target"
+COM_ASSOCIATIONS_CHANGE_TARGET="Change Target"
+COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED="The extension %s does not support multilingual associations."
+COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC="Select a component from this list"
+COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL="Select component"
+COM_ASSOCIATIONS_CONFIGURATION="Multilingual Associations: Options"
+COM_ASSOCIATIONS_COPY_REFERENCE="Copy Reference to Target"
+COM_ASSOCIATIONS_DELETE_ORPHANS="Delete Orphans"
+COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED="Failed to delete orphans."
+COM_ASSOCIATIONS_DELETE_ORPHANS_NONE="There were no orphans to delete."
+COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS="All orphans have been deleted."
+COM_ASSOCIATIONS_EDIT_ASSOCIATION="Edit association"
+COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE="Hide Reference"
+COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE="Show Reference"
+COM_ASSOCIATIONS_ERROR_NO_ASSOC="The Multilingual Associations component can't be used if the site is not set as multilingual and/or Associations is not enabled in the <a href="_QQ_"%s"_QQ_">Language Filter plugin</a>."
+COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC="Select a Menu"
+COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL="Menu"
+COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by its title"
+COM_ASSOCIATIONS_FILTER_SEARCH_LABEL="Search item"
+COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE="- Select Item Type -"
+COM_ASSOCIATIONS_HEADING_ASSOCIATION="Associations"
+COM_ASSOCIATIONS_HEADING_MENUTYPE="Menu"
+COM_ASSOCIATIONS_HEADING_MENUTYPE_ASC="Menu ascending"
+COM_ASSOCIATIONS_HEADING_MENUTYPE_DESC="Menu descending"
+COM_ASSOCIATIONS_HEADING_NO_ASSOCIATION="Not Associated"
+COM_ASSOCIATIONS_ITEMS="Items"
+COM_ASSOCIATIONS_NO_ASSOCIATION="There is no association for this language"
+COM_ASSOCIATIONS_NOTICE_NO_SELECTORS="Please select an Item Type and a reference language to view the associations."
+COM_ASSOCIATIONS_PURGE="Delete All Associations"
+COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT="Are you sure you want to delete all associations? Confirming will permanently delete them!"
+COM_ASSOCIATIONS_PURGE_FAILED="Failed to delete all associations."
+COM_ASSOCIATIONS_PURGE_NONE="There were no associations to delete."
+COM_ASSOCIATIONS_PURGE_SUCCESS="All associations have been deleted."
+COM_ASSOCIATIONS_REFERENCE_ITEM="Reference"
+COM_ASSOCIATIONS_SAVE_REFERENCE="Save Reference"
+COM_ASSOCIATIONS_SAVE_TARGET="Save Target"
+COM_ASSOCIATIONS_SELECT_MENU="- Select Menu -"
+COM_ASSOCIATIONS_SELECT_TARGET="Select Target"
+COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE="- Select Target Language -"
+COM_ASSOCIATIONS_TITLE="Associations"
+COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1s &gt; %2s)"
+COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1s &gt; %2s)"
+COM_ASSOCIATIONS_TITLE_LIST_SELECT="Multilingual Associations: Select Item Type and Language"
+COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
+COM_ASSOCIATIONS_YOU_ARE_NOT_ALLOWED_TO_CHECKIN_THIS_ITEM="You can't check in this item"
diff --git a/core/administrator/language/en-GB/en-GB.com_associations.sys.ini b/core/administrator/language/en-GB/en-GB.com_associations.sys.ini
new file mode 100644
index 00000000..f6f948ce
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_associations.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ASSOCIATIONS="Multilingual Associations"
+COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.com_banners.ini b/core/administrator/language/en-GB/en-GB.com_banners.ini
new file mode 100644
index 00000000..24d37881
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_banners.ini
@@ -0,0 +1,246 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_BANNERS="Banners"
+COM_BANNERS_BANNER_DETAILS="Details"
+COM_BANNERS_BANNER_SAVE_SUCCESS="Banner saved."
+COM_BANNERS_BANNERS_FILTER_SEARCH_DESC="Search in banner name and alias. Prefix with ID: to search for a banner ID."
+COM_BANNERS_BANNERS_FILTER_SEARCH_LABEL="Search Banners"
+COM_BANNERS_BANNERS_HTML_PIN_BANNER="Pinned banner"
+COM_BANNERS_BANNERS_HTML_UNPIN_BANNER="Unpinned banner"
+COM_BANNERS_BANNERS_N_ITEMS_ARCHIVED="%d banners archived."
+COM_BANNERS_BANNERS_N_ITEMS_ARCHIVED_1="%d banner archived."
+COM_BANNERS_BANNERS_N_ITEMS_CHECKED_IN_0="No banner checked in."
+COM_BANNERS_BANNERS_N_ITEMS_CHECKED_IN_1="%d banner checked in."
+COM_BANNERS_BANNERS_N_ITEMS_CHECKED_IN_MORE="%d banners checked in."
+COM_BANNERS_BANNERS_N_ITEMS_DELETED="%d banners deleted."
+COM_BANNERS_BANNERS_N_ITEMS_DELETED_1="%d banner deleted."
+COM_BANNERS_BANNERS_N_ITEMS_PUBLISHED="%d banners published."
+COM_BANNERS_BANNERS_N_ITEMS_PUBLISHED_1="%d banner published."
+COM_BANNERS_BANNERS_N_ITEMS_TRASHED="%d banners trashed."
+COM_BANNERS_BANNERS_N_ITEMS_TRASHED_1="%d banner trashed."
+COM_BANNERS_BANNERS_N_ITEMS_UNPUBLISHED="%d banners unpublished."
+COM_BANNERS_BANNERS_N_ITEMS_UNPUBLISHED_1="%d banner unpublished."
+COM_BANNERS_BANNERS_NO_ITEM_SELECTED="No Banners selected."
+COM_BANNERS_BANNERS_PINNED="Pinned Banner"
+COM_BANNERS_BANNERS_UNPINNED="Unpinned Banner"
+COM_BANNERS_BATCH_CLIENT_LABEL="Set Client"
+COM_BANNERS_BATCH_CLIENT_LABEL_DESC="Not making a selection will keep the original client when processing."
+COM_BANNERS_BATCH_CLIENT_NOCHANGE="- Keep original Client -"
+COM_BANNERS_BATCH_OPTIONS="Batch process the selected banners"
+COM_BANNERS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved banners. Otherwise, all actions are applied to the selected banners."
+COM_BANNERS_BEGIN_DESC="Banner begin date"
+COM_BANNERS_BEGIN_HINT="Begin date (yyyy-mm-dd)"
+COM_BANNERS_BEGIN_LABEL="Begin Date"
+COM_BANNERS_CANCEL="Cancel"
+COM_BANNERS_CLICK="Click"
+COM_BANNERS_CLIENT_SAVE_SUCCESS="Client saved."
+COM_BANNERS_CLIENTS_FILTER_SEARCH_DESC="Search in client name. Prefix with ID: to search for a client ID."
+COM_BANNERS_CLIENTS_FILTER_SEARCH_LABEL="Search Clients"
+COM_BANNERS_CLIENTS_N_ITEMS_ARCHIVED="%d clients archived."
+COM_BANNERS_CLIENTS_N_ITEMS_ARCHIVED_1="%d client archived."
+COM_BANNERS_CLIENTS_N_ITEMS_CHECKED_IN_0="No client checked in."
+COM_BANNERS_CLIENTS_N_ITEMS_CHECKED_IN_1="%d client checked in."
+COM_BANNERS_CLIENTS_N_ITEMS_CHECKED_IN_MORE="%d clients checked in."
+COM_BANNERS_CLIENTS_N_ITEMS_DELETED="%d clients deleted."
+COM_BANNERS_CLIENTS_N_ITEMS_DELETED_1="%d client deleted."
+COM_BANNERS_CLIENTS_N_ITEMS_PUBLISHED="%d clients published."
+COM_BANNERS_CLIENTS_N_ITEMS_PUBLISHED_1="%d client published."
+COM_BANNERS_CLIENTS_N_ITEMS_TRASHED="%d clients trashed."
+COM_BANNERS_CLIENTS_N_ITEMS_TRASHED_1="%d client trashed."
+COM_BANNERS_CLIENTS_N_ITEMS_UNPUBLISHED="%d clients unpublished."
+COM_BANNERS_CLIENTS_N_ITEMS_UNPUBLISHED_1="%d client unpublished."
+COM_BANNERS_CLIENTS_NO_ITEM_SELECTED="No clients selected."
+COM_BANNERS_CONFIGURATION="Banners: Options"
+COM_BANNERS_COUNT_ARCHIVED_ITEMS="Archived banners"
+COM_BANNERS_COUNT_PUBLISHED_ITEMS="Published banners"
+COM_BANNERS_COUNT_TRASHED_ITEMS="Trashed banners"
+COM_BANNERS_COUNT_UNPUBLISHED_ITEMS="Unpublished banners"
+COM_BANNERS_DEFAULT="Default (%s)"
+COM_BANNERS_DELETE_MSG="Are you sure you want to delete all these tracks?"
+COM_BANNERS_EDIT_BANNER="Edit Banner"
+COM_BANNERS_EDIT_CLIENT="Details"
+COM_BANNERS_END_DESC="Banner end date"
+COM_BANNERS_END_HINT="End date (yyyy-mm-dd)"
+COM_BANNERS_END_LABEL="End Date"
+COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE="Zip adapter failure"
+COM_BANNERS_ERR_ZIP_CREATE_FAILURE="Zip create failure"
+COM_BANNERS_ERR_ZIP_DELETE_FAILURE="Zip delete failure"
+COM_BANNERS_ERROR_UNIQUE_ALIAS="Another Banner from this category has the same alias (remember it may be a trashed item)."
+COM_BANNERS_EXTRA="Additional Information"
+COM_BANNERS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each banner in the same category."
+COM_BANNERS_FIELD_ALT_DESC="Alternative text used for visitors without access to images."
+COM_BANNERS_FIELD_ALT_LABEL="Alt Text"
+COM_BANNERS_FIELD_BANNEROWNPREFIX_DESC="Use own prefix or the client prefix."
+COM_BANNERS_FIELD_BANNEROWNPREFIX_LABEL="Use Own Prefix"
+COM_BANNERS_FIELD_BASENAME_DESC="File name pattern which can have<br />__SITE__ for the site name<br />__CATID__ for the category ID<br />__CATNAME__ for the category name<br />__CLIENTID__ for the client ID<br />__CLIENTNAME__ for the client name<br />__TYPE__ for the type<br />__TYPENAME__ for the type name<br />__BEGIN__ for the begin date<br />__END__ for the end date."
+COM_BANNERS_FIELD_BASENAME_LABEL="File Name"
+COM_BANNERS_FIELD_CATEGORY_DESC="Choose a category for this banner."
+COM_BANNERS_FIELD_CLICKS_DESC="Displays the number of clicks on the banner. Select reset if desired."
+COM_BANNERS_FIELD_CLICKS_LABEL="Total Clicks"
+COM_BANNERS_FIELD_CLICKURL_DESC="The URL used when the banner is clicked on."
+COM_BANNERS_FIELD_CLICKURL_LABEL="Click URL"
+COM_BANNERS_FIELD_CLIENT_DESC="Choose a client for this banner."
+COM_BANNERS_FIELD_CLIENT_LABEL="Client"
+COM_BANNERS_FIELD_CLIENT_METAKEYWORDPREFIX_DESC="When matching Meta keywords, only search for Meta keywords with this prefix (improves performance)."
+COM_BANNERS_FIELD_CLIENT_METAKEYWORDPREFIX_LABEL="Meta Keyword Prefix"
+COM_BANNERS_FIELD_CLIENT_METAKEYWORDS_DESC="Enter the meta keywords for the clients' banners."
+COM_BANNERS_FIELD_CLIENT_NAME_DESC="Enter a name for the client."
+COM_BANNERS_FIELD_CLIENT_NAME_LABEL="Client Name"
+COM_BANNERS_FIELD_CLIENT_STATE_DESC="Defines the status of the client."
+COM_BANNERS_FIELD_CLIENTOWNPREFIX_DESC="Use own prefix or the component prefix."
+COM_BANNERS_FIELD_CLIENTOWNPREFIX_LABEL="Use Own Prefix"
+COM_BANNERS_FIELD_COMPRESSED_DESC="Option to compress file for export."
+COM_BANNERS_FIELD_COMPRESSED_LABEL="Compressed"
+COM_BANNERS_FIELD_CONTACT_DESC="Enter the name of a user as contact."
+COM_BANNERS_FIELD_CONTACT_LABEL="Contact Name"
+COM_BANNERS_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the banner."
+COM_BANNERS_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
+COM_BANNERS_FIELD_CREATED_BY_DESC="Select the name of the user who created the banner."
+COM_BANNERS_FIELD_CREATED_BY_LABEL="Created By"
+COM_BANNERS_FIELD_CREATED_DESC="Banner created date."
+COM_BANNERS_FIELD_CREATED_LABEL="Created Date"
+COM_BANNERS_FIELD_CUSTOMCODE_DESC="Enter your custom code for the banner."
+COM_BANNERS_FIELD_CUSTOMCODE_LABEL="Custom Code"
+COM_BANNERS_FIELD_DESCRIPTION_DESC="Enter a description for the banner."
+COM_BANNERS_FIELD_EMAIL_DESC="Enter a valid Contact email."
+COM_BANNERS_FIELD_EMAIL_LABEL="Contact Email"
+COM_BANNERS_FIELD_EXTRAINFO_DESC="Enter extra information for this client."
+COM_BANNERS_FIELD_EXTRAINFO_LABEL="Additional Information"
+COM_BANNERS_FIELD_HEIGHT_DESC="The height of the banner."
+COM_BANNERS_FIELD_HEIGHT_LABEL="Height"
+COM_BANNERS_FIELD_IMAGE_DESC="Select or upload an image for this banner."
+COM_BANNERS_FIELD_IMAGE_LABEL="Image"
+COM_BANNERS_FIELD_IMPMADE_DESC="Displays the number of impressions made for the banner."
+COM_BANNERS_FIELD_IMPMADE_LABEL="Total Impressions"
+COM_BANNERS_FIELD_IMPTOTAL_DESC="Total limit of impressions defined for the banner."
+COM_BANNERS_FIELD_IMPTOTAL_LABEL="Max. Impressions"
+COM_BANNERS_FIELD_LANGUAGE_DESC="Assign a language to this banner."
+COM_BANNERS_FIELD_METAKEYWORDPREFIX_DESC="When matching Meta keywords, only search for Meta keywords with this prefix (improves performance)."
+COM_BANNERS_FIELD_METAKEYWORDPREFIX_LABEL="Meta Keyword Prefix"
+COM_BANNERS_FIELD_METAKEYWORDS_DESC="Enter the meta keywords for the banner."
+COM_BANNERS_FIELD_MODIFIED_BY_DESC="Name of the user who modified this banner."
+COM_BANNERS_FIELD_NAME_DESC="Enter a name for the banner."
+COM_BANNERS_FIELD_NAME_LABEL="Name"
+COM_BANNERS_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the banner."
+COM_BANNERS_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_BANNERS_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the banner."
+COM_BANNERS_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+COM_BANNERS_FIELD_PURCHASETYPE_DESC="Select the type of purchase in the list."
+COM_BANNERS_FIELD_PURCHASETYPE_LABEL="Purchase Type"
+COM_BANNERS_FIELD_STATE_DESC="Defines the status of the banner."
+COM_BANNERS_FIELD_STICKY_DESC="Whether or not the Banner is 'pinned'. If one or more Banners in a Category are pinned, they will take priority over Banners that are not pinned. For example, if two Banners in a Category are pinned and a third Banner is not pinned, the third Banner will not display if the module setting is 'Pinned, Randomise'. Only the two pinned Banners will display."
+COM_BANNERS_FIELD_STICKY_LABEL="Pinned"
+COM_BANNERS_FIELD_TRACKCLICK_DESC="Record the number of clicks on the banners on a daily basis."
+COM_BANNERS_FIELD_TRACKCLICK_LABEL="Track Clicks"
+COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the banners on a daily basis."
+COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions"
+COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image. Select Custom to enter your custom code."
+COM_BANNERS_FIELD_TYPE_LABEL="Type"
+; The following five strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
+COM_BANNERS_FIELD_VALUE_1="Unlimited"
+COM_BANNERS_FIELD_VALUE_2="Yearly"
+COM_BANNERS_FIELD_VALUE_3="Monthly"
+COM_BANNERS_FIELD_VALUE_4="Weekly"
+COM_BANNERS_FIELD_VALUE_5="Daily"
+COM_BANNERS_FIELD_VALUE_UNLIMITED="Unlimited"
+COM_BANNERS_FIELD_VALUE_YEARLY="Yearly"
+COM_BANNERS_FIELD_VALUE_MONTHLY="Monthly"
+COM_BANNERS_FIELD_VALUE_WEEKLY="Weekly"
+COM_BANNERS_FIELD_VALUE_DAILY="Daily"
+COM_BANNERS_FIELD_VALUE_CUSTOM="Custom"
+COM_BANNERS_FIELD_VALUE_IMAGE="Image"
+COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT="-- Use Client Default --"
+COM_BANNERS_FIELD_VALUE_USECOMPONENTDEFAULT="-- Use Component Default --"
+COM_BANNERS_FIELD_VERSION_LABEL="Revision"
+COM_BANNERS_FIELD_VERSION_DESC="A count of the number of times this banner has been revised."
+COM_BANNERS_FIELD_WIDTH_LABEL="Width"
+COM_BANNERS_FIELD_WIDTH_DESC="The width of the banner."
+COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_DESC="These settings apply to version history for Banners, Banner Categories and Banner Clients."
+COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_LABEL="History"
+COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL="Client"
+COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_DESC="These settings apply for all clients unless they are changed for a specific client."
+COM_BANNERS_FILENAME="%1$s-banners-tracks-%2$s"
+COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS="Publishing Options"
+COM_BANNERS_GROUP_LABEL_BANNER_DETAILS="Banner Details"
+COM_BANNERS_HEADING_ACTIVE="Active"
+COM_BANNERS_HEADING_ACTIVE_ASC="Active ascending"
+COM_BANNERS_HEADING_ACTIVE_DESC="Active descending"
+COM_BANNERS_HEADING_BANNERS="Banners"
+COM_BANNERS_HEADING_BANNERS_ASC="Banners ascending"
+COM_BANNERS_HEADING_BANNERS_DESC="Banners descending"
+COM_BANNERS_HEADING_CLICKS="Clicks"
+COM_BANNERS_HEADING_CLICKS_ASC="Clicks ascending"
+COM_BANNERS_HEADING_CLICKS_DESC="Clicks descending"
+COM_BANNERS_HEADING_CLIENT="Client"
+COM_BANNERS_HEADING_CLIENT_ASC="Client ascending"
+COM_BANNERS_HEADING_CLIENT_DESC="Client descending"
+COM_BANNERS_HEADING_CONTACT="Contact"
+COM_BANNERS_HEADING_CONTACT_ASC="Contact ascending"
+COM_BANNERS_HEADING_CONTACT_DESC="Contact descending"
+COM_BANNERS_HEADING_COUNT="Count"
+COM_BANNERS_HEADING_COUNT_ASC="Count ascending"
+COM_BANNERS_HEADING_COUNT_DESC="Count descending"
+COM_BANNERS_HEADING_IMPRESSIONS="Impressions"
+COM_BANNERS_HEADING_IMPRESSIONS_ASC="Impressions ascending"
+COM_BANNERS_HEADING_IMPRESSIONS_DESC="Impressions descending"
+COM_BANNERS_HEADING_METAKEYWORDS="Meta Keywords"
+COM_BANNERS_HEADING_NAME="Name"
+COM_BANNERS_HEADING_NAME_ASC="Name ascending"
+COM_BANNERS_HEADING_NAME_DESC="Name descending"
+COM_BANNERS_HEADING_PURCHASETYPE="Purchase Type"
+COM_BANNERS_HEADING_PURCHASETYPE_ASC="Purchase Type ascending"
+COM_BANNERS_HEADING_PURCHASETYPE_DESC="Purchase Type descending"
+COM_BANNERS_HEADING_STICKY="Pinned"
+COM_BANNERS_HEADING_STICKY_ASC="Pinned ascending"
+COM_BANNERS_HEADING_STICKY_DESC="Pinned descending"
+COM_BANNERS_HEADING_TYPE="Type"
+COM_BANNERS_HEADING_TYPE_ASC="Type ascending"
+COM_BANNERS_HEADING_TYPE_DESC="Type descending"
+COM_BANNERS_IMPRESSION="Impression"
+COM_BANNERS_IMPRESSIONS="%1$s of %2$s"
+COM_BANNERS_MANAGER="Banners"
+COM_BANNERS_MANAGER_BANNER_EDIT="Banners: Edit"
+COM_BANNERS_MANAGER_BANNER_NEW="Banners: New"
+COM_BANNERS_MANAGER_BANNERS="Banners"
+COM_BANNERS_MANAGER_CLIENT_EDIT="Banners: Edit Client"
+COM_BANNERS_MANAGER_CLIENT_NEW="Banners: New Client"
+COM_BANNERS_MANAGER_CLIENTS="Banners: Clients"
+COM_BANNERS_MANAGER_TRACKS="Banners: Tracks"
+COM_BANNERS_METADATA="Metadata"
+COM_BANNERS_FIELD_MODIFIED_DESC="The date and time that the banner was last modified."
+COM_BANNERS_N_BANNERS_STUCK="%d banners pinned."
+COM_BANNERS_N_BANNERS_STUCK_1="%d banner pinned."
+COM_BANNERS_N_BANNERS_UNSTUCK="%d banners unpinned."
+COM_BANNERS_N_BANNERS_UNSTUCK_1="%d banner unpinned."
+COM_BANNERS_NEW_BANNER="New Banner"
+COM_BANNERS_NEW_CLIENT="New Client"
+COM_BANNERS_NO_BANNERS_SELECTED="No banners selected."
+COM_BANNERS_NO_CLIENT="- No client -"
+COM_BANNERS_NO_CLIENTS_SELECTED="No clients selected."
+COM_BANNERS_NOCATEGORYNAME="No category"
+COM_BANNERS_NOCLIENTNAME="No client"
+COM_BANNERS_RESET_CLICKS="Reset clicks"
+COM_BANNERS_RESET_IMPMADE="Reset impressions"
+COM_BANNERS_SEARCH_IN_TITLE="Search in title"
+COM_BANNERS_SELECT_CLIENT="- Select Client -"
+COM_BANNERS_SELECT_TYPE="- Select Type -"
+COM_BANNERS_SUBMENU_BANNERS="Banners"
+COM_BANNERS_SUBMENU_CATEGORIES="Categories"
+COM_BANNERS_SUBMENU_CLIENTS="Clients"
+COM_BANNERS_SUBMENU_TRACKS="Tracks"
+COM_BANNERS_TRACKS_DELETE="Delete Tracks"
+COM_BANNERS_TRACKS_DOWNLOAD="Download tracks"
+COM_BANNERS_TRACKS_EXPORT="Export"
+COM_BANNERS_TRACKS_FILTER_SEARCH_DESC="Search in track name and track client name."
+COM_BANNERS_TRACKS_FILTER_SEARCH_LABEL="Search Tracks"
+COM_BANNERS_TRACKS_NO_ITEMS_DELETED="No Tracks to Delete."
+COM_BANNERS_TRACKS_N_ITEMS_DELETED="%d tracks deleted."
+COM_BANNERS_TRACKS_N_ITEMS_DELETED_1="%d track deleted."
+COM_BANNERS_TYPE1="Impressions"
+COM_BANNERS_TYPE2="Clicks"
+COM_BANNERS_UNLIMITED="Unlimited"
+COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_banners.sys.ini b/core/administrator/language/en-GB/en-GB.com_banners.sys.ini
new file mode 100644
index 00000000..6d6483da
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_banners.sys.ini
@@ -0,0 +1,17 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_BANNERS="Banners"
+COM_BANNERS_BANNERS="Banners"
+COM_BANNERS_CATEGORY_ADD_TITLE="Banners: Add Category"
+COM_BANNERS_CATEGORY_EDIT_TITLE="Banners: Edit Category"
+COM_BANNERS_CATEGORIES="Categories"
+COM_BANNERS_CONTENT_TYPE_BANNER="Banner"
+COM_BANNERS_CONTENT_TYPE_CLIENT="Banner Client"
+COM_BANNERS_CONTENT_TYPE_CATEGORY="Banner Category"
+COM_BANNERS_CLIENTS="Clients"
+COM_BANNERS_TAGS_CATEGORY="Banner Category"
+COM_BANNERS_TRACKS="Tracks"
+COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients."
diff --git a/core/administrator/language/en-GB/en-GB.com_cache.ini b/core/administrator/language/en-GB/en-GB.com_cache.ini
new file mode 100644
index 00000000..9bfb89d7
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_cache.ini
@@ -0,0 +1,41 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CACHE="Cache"
+COM_CACHE_BACK_CACHE_MANAGER="Return to Cache"
+COM_CACHE_CLEAR_CACHE_ADMIN="Clear Cache Administrator"
+COM_CACHE_CLEAR_CACHE="Maintenance: Clear Cache"
+COM_CACHE_CLEAR_CACHE_ADMIN_TITLE="Maintenance: Clear Cache (Administrator)"
+COM_CACHE_CLEAR_CACHE_SITE_TITLE="Maintenance: Clear Cache (Site)"
+COM_CACHE_PURGE_EXPIRED_CACHE="Maintenance: Clear Expired Cache"
+COM_CACHE_CONFIGURATION="Cache: Options"
+COM_CACHE_ERROR_CACHE_CONNECTION_FAILED="Could not connect to the cache store to fetch the cache data."
+COM_CACHE_ERROR_CACHE_DRIVER_UNSUPPORTED="Could not read the cache data, the configured cache handler is not supported by this environment."
+COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_DELETED="The selected cache group(s) have been cleared."
+COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED="Expired cached items have been cleared."
+COM_CACHE_EXPIRED_ITEMS_DELETE_ERROR="Error clearing cache group(s): %s."
+COM_CACHE_EXPIRED_ITEMS_PURGING_ERROR="Error clearing expired cached items."
+COM_CACHE_FILTER_SEARCH_DESC="Search in cache group."
+COM_CACHE_FILTER_SEARCH_LABEL="Search Cache"
+COM_CACHE_GROUP="Cache Group"
+COM_CACHE_HEADING_GROUP_ASC="Cache Group ascending"
+COM_CACHE_HEADING_GROUP_DESC="Cache Group descending"
+COM_CACHE_HEADING_COUNT_ASC="Number of Files ascending"
+COM_CACHE_HEADING_COUNT_DESC="Number of Files descending"
+COM_CACHE_HEADING_SIZE_ASC="Size ascending"
+COM_CACHE_HEADING_SIZE_DESC="Size descending"
+COM_CACHE_MANAGER="Cache"
+COM_CACHE_MSG_ALL_CACHE_GROUPS_CLEARED="All cache group(s) have been cleared."
+COM_CACHE_MSG_SOME_CACHE_GROUPS_CLEARED="Only some cache group(s) have been cleared."
+COM_CACHE_NUMBER_OF_FILES="Number of Files"
+COM_CACHE_PURGE_CACHE_ADMIN="Clear Cache Administrator"
+COM_CACHE_PURGE_EXPIRED="Clear Expired Cache"
+COM_CACHE_PURGE_EXPIRED_ITEMS="Clear expired items"
+COM_CACHE_PURGE_INSTRUCTIONS="Select the Clear Expired Cache icon in the toolbar to delete all expired cache files. Note: Cache files that are still current will not be deleted."
+COM_CACHE_RESOURCE_INTENSIVE_WARNING="This can be resource intensive on sites with a large number of items!"
+COM_CACHE_SIZE="Size"
+COM_CACHE_SELECT_CLIENT="- Select Location -"
+COM_CACHE_XML_DESCRIPTION="Component for cache management."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_cache.sys.ini b/core/administrator/language/en-GB/en-GB.com_cache.sys.ini
new file mode 100644
index 00000000..128c5080
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_cache.sys.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CACHE="Cache"
+COM_CACHE_CACHE_VIEW_DEFAULT_DESC="Maintenance: Clear Cache"
+COM_CACHE_CACHE_VIEW_DEFAULT_TITLE="Clear Cache"
+COM_CACHE_PURGE_VIEW_DEFAULT_DESC="Maintenance: Clear Expired Cache"
+COM_CACHE_PURGE_VIEW_DEFAULT_TITLE="Clear Expired Cache"
+COM_CACHE_XML_DESCRIPTION="Component for cache management."
diff --git a/core/administrator/language/en-GB/en-GB.com_categories.ini b/core/administrator/language/en-GB/en-GB.com_categories.ini
new file mode 100644
index 00000000..ad3a570e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_categories.ini
@@ -0,0 +1,87 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+CATEGORIES_FIELDSET_OPTIONS="Options"
+COM_CATEGORIES="Categories"
+COM_CATEGORIES_ACCESS_CREATE_DESC="New setting for <strong>create actions</strong> in this category and the calculated setting based on the parent category and group permissions."
+COM_CATEGORIES_ACCESS_DELETE_DESC="New setting for <strong>delete actions</strong> on this category and the calculated setting based on the parent category and group permissions."
+COM_CATEGORIES_ACCESS_EDIT_DESC="New setting for <strong>edit actions</strong> on this category and the calculated setting based on the parent category and group permissions."
+COM_CATEGORIES_ACCESS_EDITOWN_DESC="New setting for <strong>edit own actions</strong> on this category and the calculated setting based on the parent category and group permissions."
+COM_CATEGORIES_ACCESS_EDITSTATE_DESC="New setting for <strong>edit state actions</strong> on this category and the calculated setting based on the parent category and group permissions."
+COM_CATEGORIES_BASIC_FIELDSET_LABEL="Options"
+COM_CATEGORIES_BATCH_CANNOT_CREATE="You are not allowed to create new categories in this category."
+COM_CATEGORIES_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these categories."
+; COM_CATEGORIES_BATCH_CATEGORY_LABEL is deprecated, use JLIB_HTML_BATCH_MENU_LABEL instead.
+COM_CATEGORIES_BATCH_CATEGORY_LABEL="To Move or Copy your selection please select a Category."
+COM_CATEGORIES_BATCH_OPTIONS="Batch process the selected categories."
+COM_CATEGORIES_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved categories. Otherwise, all actions are applied to the selected categories."
+COM_CATEGORIES_CATEGORIES_BASE_TITLE="Categories"
+COM_CATEGORIES_CATEGORIES_TITLE="%s: Categories"
+COM_CATEGORIES_CATEGORY_ADD_TITLE="%s: New Category"
+COM_CATEGORIES_CATEGORY_BASE_ADD_TITLE="Categories: New Category"
+COM_CATEGORIES_CATEGORY_BASE_EDIT_TITLE="Categories: Edit Category"
+COM_CATEGORIES_CATEGORY_EDIT_TITLE="%s: Edit Category"
+COM_CATEGORIES_CATEGORY_OPTIONS="Category"
+COM_CATEGORIES_CHANGE_CATEGORY="Select or Change Category"
+COM_CATEGORIES_DELETE_NOT_ALLOWED="Delete not allowed for category %s."
+COM_CATEGORIES_DESCRIPTION_DESC="Enter an optional category description in the text area."
+COM_CATEGORIES_EDIT_CATEGORY="Edit Category"
+COM_CATEGORIES_ERROR_ALL_LANGUAGE_ASSOCIATED="A category item set to All languages can't be associated. Associations have not been set."
+COM_CATEGORIES_FIELD_BASIC_LABEL="Options"
+COM_CATEGORIES_FIELD_HITS_DESC="Number of hits for this category."
+COM_CATEGORIES_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_CATEGORIES_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images."
+COM_CATEGORIES_FIELD_IMAGE_DESC="Select or upload an image for this category."
+COM_CATEGORIES_FIELD_IMAGE_LABEL="Image"
+COM_CATEGORIES_FIELD_LANGUAGE_DESC="Assign a language to this category."
+COM_CATEGORIES_FIELD_NOTE_DESC="An optional note to display in the category list."
+COM_CATEGORIES_FIELD_NOTE_LABEL="Note"
+COM_CATEGORIES_FIELD_PARENT_DESC="Select a parent category."
+COM_CATEGORIES_FIELD_PARENT_LABEL="Parent"
+COM_CATEGORIES_FIELDSET_DETAILS="Category Details"
+COM_CATEGORIES_FIELDSET_PUBLISHING="Publishing"
+COM_CATEGORIES_FIELDSET_RULES="Permissions"
+COM_CATEGORIES_FILTER_SEARCH_DESC="Search in title, alias and note. Prefix with ID: to search for a category ID."
+COM_CATEGORIES_FILTER_SEARCH_LABEL="Search Categories"
+COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS="%d items are assigned to this category's subcategories."
+COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS_1="%d item is assigned to one of this category's subcategories."
+; The following 2 strings are deprecated and will be removed with 4.0.
+COM_CATEGORIES_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Category Item Associations"
+COM_CATEGORIES_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a category item for the target language. This association will let the Language Switcher module redirect to the associated category item in another language. If used, make sure to display the Language switcher module on the relevant pages. A category item set to language 'All' can't be associated."
+COM_CATEGORIES_ITEMS_SEARCH_FILTER="Search"
+COM_CATEGORIES_N_ITEMS_ARCHIVED="%d categories archived."
+COM_CATEGORIES_N_ITEMS_ARCHIVED_1="%d category archived."
+COM_CATEGORIES_N_ITEMS_ASSIGNED="%d items are assigned to this category."
+COM_CATEGORIES_N_ITEMS_ASSIGNED_1="%d item is assigned to this category."
+COM_CATEGORIES_N_ITEMS_CHECKED_IN_0="No category checked in."
+COM_CATEGORIES_N_ITEMS_CHECKED_IN_1="%d category checked in."
+COM_CATEGORIES_N_ITEMS_CHECKED_IN_MORE="%d categories checked in."
+COM_CATEGORIES_N_ITEMS_DELETED="%d categories deleted."
+COM_CATEGORIES_N_ITEMS_DELETED_1="%d category deleted."
+COM_CATEGORIES_N_ITEMS_FAILED_PUBLISHING="Failed publishing %d categories as at least one of their parents is unpublished or one of their children is checked out."
+COM_CATEGORIES_N_ITEMS_FAILED_PUBLISHING_1="Failed publishing %d category as at least one of its parents is unpublished or one of its children is checked out."
+COM_CATEGORIES_N_ITEMS_PUBLISHED="%d categories published."
+COM_CATEGORIES_N_ITEMS_PUBLISHED_1="%d category published."
+COM_CATEGORIES_N_ITEMS_TRASHED="%d categories trashed."
+COM_CATEGORIES_N_ITEMS_TRASHED_1="%d category trashed."
+COM_CATEGORIES_N_ITEMS_UNPUBLISHED="%d categories unpublished."
+COM_CATEGORIES_N_ITEMS_UNPUBLISHED_1="%d category unpublished."
+COM_CATEGORIES_NEW_CATEGORY="New Category"
+COM_CATEGORIES_NO_ITEM_SELECTED="Please first make a selection from the list."
+COM_CATEGORIES_PATH_LABEL="Category Path"
+COM_CATEGORIES_REBUILD_FAILURE="Failed rebuilding Categories tree data."
+COM_CATEGORIES_REBUILD_SUCCESS="Categories tree data rebuilt."
+COM_CATEGORIES_SAVE_SUCCESS="Category saved."
+COM_CATEGORIES_SELECT_A_CATEGORY="Select a Category"
+COM_CATEGORIES_TIP_ASSOCIATION="Associated categories"
+COM_CATEGORIES_XML_DESCRIPTION="This component manages categories."
+COM_CATEGORY_COUNT_ARCHIVED_ITEMS="Archived items"
+COM_CATEGORY_COUNT_PUBLISHED_ITEMS="Published items"
+COM_CATEGORY_COUNT_TRASHED_ITEMS="Trashed items"
+COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS="Unpublished items"
+COM_CATEGORY_HEADING_ASSOCIATION="Association"
+JGLOBAL_NO_ITEM_SELECTED="No categories selected."
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Select the tabs above to customise these settings by action."
+JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this category and all child categories.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_categories.sys.ini b/core/administrator/language/en-GB/en-GB.com_categories.sys.ini
new file mode 100644
index 00000000..17708ea6
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_categories.sys.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CATEGORIES="Categories"
+COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_DESC="Shows a List of All categories in the selected component."
+COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_TITLE="List All Categories"
+COM_CATEGORIES_CATEGORY_VIEW_EDIT_DESC="Create a new Category in the selected component."
+COM_CATEGORIES_CATEGORY_VIEW_EDIT_TITLE="Create New Category"
+COM_CATEGORIES_CHOOSE_COMPONENT_DESC="Select a component to which this category should be linked. <br />If a component using categories is not shown in the list, please create at least one category for it using the default regular menu."
+COM_CATEGORIES_CHOOSE_COMPONENT_LABEL="Choose a Component"
+COM_CATEGORIES_XML_DESCRIPTION="This component manages categories."
diff --git a/core/administrator/language/en-GB/en-GB.com_checkin.ini b/core/administrator/language/en-GB/en-GB.com_checkin.ini
new file mode 100644
index 00000000..3e9ee429
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_checkin.ini
@@ -0,0 +1,23 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CHECKIN="Check-in"
+COM_CHECKIN_CONFIGURATION="Check-in: Options"
+COM_CHECKIN_DATABASE_TABLE="Database Table"
+COM_CHECKIN_DATABASE_TABLE_ASC="Database Table ascending"
+COM_CHECKIN_DATABASE_TABLE_DESC="Database Table descending"
+COM_CHECKIN_FILTER_SEARCH_DESC="Search database tables with items to check-in."
+COM_CHECKIN_FILTER_SEARCH_LABEL="Search Database Tables"
+COM_CHECKIN_GLOBAL_CHECK_IN="Maintenance: Global Check-in"
+COM_CHECKIN_ITEMS_TO_CHECK_IN="Items to check-in"
+COM_CHECKIN_ITEMS_TO_CHECK_IN_ASC="Items to check-in ascending"
+COM_CHECKIN_ITEMS_TO_CHECK_IN_DESC="Items to check-in descending"
+COM_CHECKIN_N_ITEMS_CHECKED_IN_0="No item checked in."
+COM_CHECKIN_N_ITEMS_CHECKED_IN_1="1 item checked in."
+COM_CHECKIN_N_ITEMS_CHECKED_IN_MORE="%s items checked in."
+COM_CHECKIN_NO_ITEMS="There are no tables with checked out items or there are no tables with checked out items that match your search."
+COM_CHECKIN_TABLE="<em>%s</em> table"
+COM_CHECKIN_XML_DESCRIPTION="Check-in Component."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.com_checkin.sys.ini b/core/administrator/language/en-GB/en-GB.com_checkin.sys.ini
new file mode 100644
index 00000000..e272c305
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_checkin.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CHECKIN="Check-in"
+COM_CHECKIN_XML_DESCRIPTION="Check-in Component"
+
+COM_CHECKIN_CHECKIN_VIEW_DEFAULT_DESC="Shows a list of checked out items from all components/tables."
+COM_CHECKIN_CHECKIN_VIEW_DEFAULT_TITLE="Global Check-in"
diff --git a/core/administrator/language/en-GB/en-GB.com_config.ini b/core/administrator/language/en-GB/en-GB.com_config.ini
new file mode 100644
index 00000000..1e5ce8a8
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_config.ini
@@ -0,0 +1,265 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONFIG="Configuration Manager"
+COM_CONFIG_ACTION_ADMIN_DESC="Allows users in the group to perform any action over the whole site regardless of any other permission settings."
+COM_CONFIG_ACTION_CREATE_DESC="Allows users in the group to create any content in any extension."
+COM_CONFIG_ACTION_DELETE_DESC="Allows users in the group to delete any content in any extension."
+COM_CONFIG_ACTION_EDIT_DESC="Allows users in the group to edit any content in any extension."
+COM_CONFIG_ACTION_EDITOWN_DESC="Allows users in the group to edit any content they own in any extension."
+COM_CONFIG_ACTION_EDITVALUE_DESC="Allows users in the group to edit any value of custom fields submitted in any extension."
+COM_CONFIG_ACTION_EDITSTATE_DESC="Allows users in the group to edit the state of any content in any extension."
+COM_CONFIG_ACTION_LOGIN_ADMIN_DESC="Allows users in the group to login to the Backend Administrator site."
+COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC="Allows users in the group to access the Frontend site when site is offline."
+COM_CONFIG_ACTION_LOGIN_SITE_DESC="Allows users in the group to login to the Frontend site."
+COM_CONFIG_ACTION_MANAGE_DESC="Allows users in the group to access all of the administration interface except Global Configuration."
+COM_CONFIG_ACTION_OPTIONS_DESC="Allows users in the group to edit the options except the permissions of any extension."
+COM_CONFIG_CACHE_SETTINGS="Cache Settings"
+COM_CONFIG_CACHE_WARNING="Failed to clear cache automatically, you may need to do so manually."
+COM_CONFIG_COMPONENT_FIELDSET_LABEL="Component"
+COM_CONFIG_COMPONENT_NO_CONFIG_FIELDS_MESSAGE="This component has no configuration options."
+COM_CONFIG_COOKIE_SETTINGS="Cookie Settings"
+COM_CONFIG_DATABASE_SETTINGS="Database Settings"
+COM_CONFIG_DEBUG_SETTINGS="Debug Settings"
+COM_CONFIG_ERROR_CACHE_PATH_NOTWRITABLE="The cache folder is not writable: %s"
+COM_CONFIG_ERROR_CACHE_CONNECTION_FAILED="Could not connect to the cache handler to clean the cache."
+COM_CONFIG_ERROR_CACHE_DRIVER_UNSUPPORTED="Could not clean the cache, the configured cache handler is not supported by this environment."
+COM_CONFIG_ERROR_COMPONENT_ASSET_NOT_FOUND="The asset for the component could not be found. Permissions have not been saved."
+COM_CONFIG_ERROR_CONFIG_EXTENSION_NOT_FOUND="The Global Configuration extension could not be found. Text filter settings have not been saved."
+COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTUNWRITABLE="Could not make configuration.php unwritable."
+COM_CONFIG_ERROR_CONFIGURATION_PHP_NOTWRITABLE="Could not make configuration.php writable."
+COM_CONFIG_ERROR_CUSTOM_CACHE_PATH_NOTWRITABLE_USING_DEFAULT="The folder at %1$s is not writable and cannot be used for the cache, using the default %2$s instead."
+COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE="The new Help Sites list could not be saved."
+COM_CONFIG_ERROR_HELPREFRESH_FETCH="The current Help Sites list could not be fetched from the remote server."
+COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved."
+COM_CONFIG_ERROR_SSL_NOT_AVAILABLE="HTTPS has not been enabled as it is not available on this server. HTTPS connection test failed with the following error: <em>%s</em>"
+COM_CONFIG_ERROR_SSL_NOT_AVAILABLE_HTTP_CODE="HTTPS version of the site returned an invalid HTTP status code."
+COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN="You can't remove your own Super User permissions."
+COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file"
+COM_CONFIG_FIELD_CACHE_HANDLER_DESC="Choose the cache handler. Native caching mechanism is file-based. Please make sure the cache folders are writable."
+COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler"
+COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL="Platform Specific Caching"
+COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_DESC="Enable or disable platform specific caching. Enable when HTML output on mobile differs from other devices. (Default disabled.)"
+COM_CONFIG_FIELD_CACHE_LABEL="System Cache"
+COM_CONFIG_FIELD_CACHE_DESC="Enable or disable caching and set caching level. Conservative level: smaller system cache, Progressive level (default): faster, bigger system cache, includes module renderers cache. Not appropriate for extremely large sites."
+COM_CONFIG_FIELD_CACHE_PATH_DESC="Please specify a writable folder to store cache files if you do not wish to use the default folder."
+COM_CONFIG_FIELD_CACHE_PATH_LABEL="Path to Cache Folder"
+COM_CONFIG_FIELD_CACHE_TIME_DESC="The maximum length of time in minutes for a cache file to be stored before it is refreshed."
+COM_CONFIG_FIELD_CACHE_TIME_LABEL="Cache Time"
+COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Domain to use when setting session cookies. Precede domain with '.' if cookie should be valid for all subdomains."
+COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain"
+COM_CONFIG_FIELD_COOKIE_PATH_DESC="Path the cookie should be valid for."
+COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path"
+COM_CONFIG_FIELD_DATABASE_HOST_DESC="The hostname for your database entered during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)."
+COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host"
+COM_CONFIG_FIELD_DATABASE_NAME_DESC="The name for your database entered during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)."
+COM_CONFIG_FIELD_DATABASE_NAME_LABEL="Database Name"
+COM_CONFIG_FIELD_DATABASE_PREFIX_DESC="The prefix used for your database tables, created during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)."
+COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix"
+COM_CONFIG_FIELD_DATABASE_TYPE_DESC="The type of database in use, selected during the installation process. Do not edit this field unless you are migrating to a different type of database, perhaps due to changing your hosting provider."
+COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type"
+COM_CONFIG_FIELD_DATABASE_USERNAME_DESC="The username for access to your database entered during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)."
+COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
+COM_CONFIG_FIELD_DEBUG_LANG_DESC="Select if the debugging indicators (<strong>** ... **</strong>) or (<strong>?? ... ??</strong>) for the Joomla Language files will be displayed. Debug Language will work without Debug System being activated, but you will not get the additional detailed references that will help you correct any errors."
+COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
+COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="If enabled, diagnostic information, language translation and SQL errors (if present) will be displayed. The information will be displayed at the foot of every page you view within the Joomla Backend and Frontend. It is not advisable to leave the debug mode activated when running a live website."
+COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
+COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Select the default access level for new content, menu items and other items created on your site."
+COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
+COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC="Select the default text editor for your site. Registered Users will be able to change their preference in their personal details if you allow that option."
+COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
+COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Select the default captcha for your site. You may need to enter required information for your captcha plugin in the Plugin Manager."
+COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
+COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC="Select the number of content items to show in the feed(s)."
+COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL="Default Feed Limit"
+COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC="Sets the default length of lists in the Control Panel for all users."
+COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
+COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Select the level of reporting. See the Help Screen for full details."
+COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting"
+COM_CONFIG_FIELD_FEED_EMAIL_DESC="The RSS and Atom news feeds include the author's email address. Select Author Email Address to use each author's email address (from the User Manager) in the news feed. Select Site Email Address to include the site 'Mail from' email address for each article."
+COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed Email Address"
+COM_CONFIG_FIELD_FILTERS_DEFAULT_BLACK_LIST="Default Blacklist"
+COM_CONFIG_FIELD_FILTERS_CUSTOM_BLACK_LIST="Custom Blacklist"
+COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML"
+COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering"
+COM_CONFIG_FIELD_FILTERS_WHITE_LIST="Whitelist"
+COM_CONFIG_FRONTEDITING_DESC="Select if you want inline editing for modules and menu items (support may depend on your template)."
+COM_CONFIG_FRONTEDITING_LABEL="Inline Editing"
+COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus"
+COM_CONFIG_FRONTEDITING_MENUSANDMODULES_ADMIN_TOO="Modules & Menus (administrator too)"
+COM_CONFIG_FRONTEDITING_MODULES="Modules"
+COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access in the selected areas to occur only with HTTPS (encrypted HTTP connections with the https:// protocol prefix) and also force the use of secure cookies. Note, you must have HTTPS enabled on your server to utilise this option."
+COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
+COM_CONFIG_FIELD_FTP_ENABLE_DESC="Enable the built in FTP (File Transfer Protocol) functionality which is needed, in some server environments, instead of the normal upload functionality of Joomla."
+COM_CONFIG_FIELD_FTP_ENABLE_LABEL="Enable FTP"
+COM_CONFIG_FIELD_FTP_HOST_DESC="Enter the name of the host of your FTP server."
+COM_CONFIG_FIELD_FTP_HOST_LABEL="FTP Host"
+COM_CONFIG_FIELD_FTP_PASSWORD_DESC="Enter your FTP password."
+COM_CONFIG_FIELD_FTP_PASSWORD_LABEL="FTP Password"
+COM_CONFIG_FIELD_FTP_PORT_DESC="Enter the port that FTP should be accessed by. The default is port 21."
+COM_CONFIG_FIELD_FTP_PORT_LABEL="FTP Port"
+COM_CONFIG_FIELD_FTP_ROOT_DESC="The path to the root folder of the FTP server. The root folder is the base folder to which the FTP server is allowed access."
+COM_CONFIG_FIELD_FTP_ROOT_LABEL="FTP Root"
+COM_CONFIG_FIELD_FTP_USERNAME_DESC="The username used to access the FTP server."
+COM_CONFIG_FIELD_FTP_USERNAME_LABEL="FTP Username"
+COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Compress buffered output if supported."
+COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
+COM_CONFIG_FIELD_HELP_SERVER_DESC="Select the name of the help server from which your system will collect the help screen displays."
+COM_CONFIG_FIELD_HELP_SERVER_LABEL="Help Server"
+COM_CONFIG_FIELD_LOG_PATH_DESC="Please specify a folder to store log files."
+COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
+COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The email address that will be used to send site email."
+COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From Email"
+COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name."
+COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL="Reply To Email"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_DESC="The email address that will be used to receive end user(s) reply"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL="Reply To Name"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_DESC="Text displayed in the header &quot;To:&quot; field when end user(s) replying to received email"
+COM_CONFIG_FIELD_MAIL_MAILONLINE_DESC="Select Yes to turn on mail sending, select No to turn off mail sending. Warning: It is recommended to put the site offline when disabling the mail function!"
+COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL="Send Mail"
+COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC="Select Yes to disable the Mass Mail Users function, select No to make it active."
+COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL="Disable Mass Mail"
+COM_CONFIG_FIELD_MAIL_MAILER_DESC="Select which mailer for the delivery of site email."
+COM_CONFIG_FIELD_MAIL_MAILER_LABEL="Mailer"
+COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_DESC="Enter the path to the sendmail program folder on the host server."
+COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL="Sendmail Path"
+COM_CONFIG_FIELD_MAIL_SMTP_AUTH_DESC="Select Yes if your SMTP Host requires SMTP Authentication."
+COM_CONFIG_FIELD_MAIL_SMTP_AUTH_LABEL="SMTP Authentication"
+COM_CONFIG_FIELD_MAIL_SMTP_HOST_DESC="Enter the name of the SMTP host."
+COM_CONFIG_FIELD_MAIL_SMTP_HOST_LABEL="SMTP Host"
+COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_DESC="Enter the password for the SMTP host."
+COM_CONFIG_FIELD_MAIL_SMTP_PASSWORD_LABEL="SMTP Password"
+COM_CONFIG_FIELD_MAIL_SMTP_PORT_DESC="Enter the port number of the SMTP server Joomla will use to send emails. Usually:<br />- 25 when using an unsecure mail server<br />- 465 when using a secure server with SMTPS<br />- 25 or 587 when using a secure server with SMTP with STARTTLS extension."
+COM_CONFIG_FIELD_MAIL_SMTP_PORT_LABEL="SMTP Port"
+COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC="Select the security model of the SMTP server Joomla will use to send emails.<br />- None for no encryption<br />- SSL/TLS for SMTPS (usually on port 465)<br />- STARTTLS for SMTP with STARTTLS extension (usually on port 25 or port 587)"
+COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL="SMTP Security"
+COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC="Enter the username for access to the SMTP host."
+COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL="SMTP Username"
+COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC="Memcache(d) compression."
+COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL="Memcache(d) Compression"
+COM_CONFIG_FIELD_MEMCACHE_HOST_DESC="Memcache(d) server host."
+COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL="Memcache(d) Server Host"
+COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC="Persistent Memcache(d)."
+COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL="Persistent Memcache(d)"
+COM_CONFIG_FIELD_MEMCACHE_PORT_DESC="Memcache(d) server port."
+COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache(d) Server Port"
+COM_CONFIG_FIELD_REDIS_AUTH_DESC="Redis server authentication."
+COM_CONFIG_FIELD_REDIS_AUTH_LABEL="Redis Server Authentication"
+COM_CONFIG_FIELD_REDIS_DB_DESC="Redis database."
+COM_CONFIG_FIELD_REDIS_DB_LABEL="Redis Database"
+COM_CONFIG_FIELD_REDIS_HOST_DESC="Redis server host."
+COM_CONFIG_FIELD_REDIS_HOST_LABEL="Redis Server Host"
+COM_CONFIG_FIELD_REDIS_PERSISTENT_DESC="Persistent Redis."
+COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
+COM_CONFIG_FIELD_REDIS_PORT_DESC="Redis server port."
+COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
+COM_CONFIG_FIELD_METAAUTHOR_DESC="Show the author meta tag when viewing articles."
+COM_CONFIG_FIELD_METAAUTHOR_LABEL="Show Author Meta Tag"
+COM_CONFIG_FIELD_METADESC_DESC="Enter a description of the overall website that may be used by search engines. Generally, a maximum of 20 words is best."
+COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description"
+COM_CONFIG_FIELD_METAKEYS_DESC="Enter the keywords and phrases that best describe your website. Separate keywords and phrases with a comma."
+COM_CONFIG_FIELD_METAKEYS_LABEL="Site Meta Keywords"
+COM_CONFIG_FIELD_METALANGUAGE_DESC="Places the selected language in the metadata for the site."
+COM_CONFIG_FIELD_METALANGUAGE_LABEL="Site Meta Language"
+COM_CONFIG_FIELD_METAVERSION_LABEL="Show Joomla Version"
+COM_CONFIG_FIELD_METAVERSION_DESC="Show the Joomla version number in the generator meta tag."
+COM_CONFIG_FIELD_OFFLINE_IMAGE_DESC="Select or upload an optional image to be displayed on the default offline page. Make sure the image is less than 400px wide."
+COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL="Offline Image"
+COM_CONFIG_FIELD_OFFLINE_MESSAGE_DESC="The custom offline message will be used if the 'Offline Message' field is set to 'Use Custom Message'."
+COM_CONFIG_FIELD_OFFLINE_MESSAGE_LABEL="Custom Message"
+COM_CONFIG_FIELD_PROXY_ENABLE_DESC="Enable Joomla to use a proxy which is needed in some server environments to fetch URLs like in the Joomla Update component."
+COM_CONFIG_FIELD_PROXY_ENABLE_LABEL="Enable Proxy"
+COM_CONFIG_FIELD_PROXY_HOST_DESC="Enter the name of the host of your Proxy server."
+COM_CONFIG_FIELD_PROXY_HOST_LABEL="Proxy Host"
+COM_CONFIG_FIELD_PROXY_PASSWORD_DESC="Enter your Proxy password."
+COM_CONFIG_FIELD_PROXY_PASSWORD_LABEL="Proxy Password"
+COM_CONFIG_FIELD_PROXY_PORT_DESC="Enter the port that Proxy should be accessed by."
+COM_CONFIG_FIELD_PROXY_PORT_LABEL="Proxy Port"
+COM_CONFIG_FIELD_PROXY_USERNAME_DESC="The username used to access the Proxy server."
+COM_CONFIG_FIELD_PROXY_USERNAME_LABEL="Proxy Username"
+COM_CONFIG_FIELD_SECRET_DESC="This is an auto-generated, unique alphanumeric code for every Joomla installation. It is used for security functions."
+COM_CONFIG_FIELD_SECRET_LABEL="Secret"
+COM_CONFIG_FIELD_SEF_REWRITE_DESC="Select to use a server's rewrite engine to catch URLs that meet specific conditions and rewrite them as directed. Available for IIS 7 and Apache. <br /><strong>Apache users only!</strong><br />Rename htaccess.txt to .htaccess before activating.<br /><strong>IIS 7 users only!</strong><br />Rename web.config.txt to web.config and install IIS URL Rewrite Module before activating.<br />"
+COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
+COM_CONFIG_FIELD_SEF_SUFFIX_DESC="If yes, the system will add a suffix to the URL based on the document type."
+COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
+COM_CONFIG_FIELD_SEF_URL_DESC="Select if the URLs are optimised for Search Engines."
+COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
+COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Choose a city in the list to configure the date and time for display."
+COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Server Time Zone"
+COM_CONFIG_FIELD_SESSION_HANDLER_DESC="The mechanism by which Joomla identifies a User once they are connected to the website using non-persistent cookies.<br />If 'PHP' is selected, the <em>session.save_handler</em> value from the PHP configuration will be used."
+COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler"
+COM_CONFIG_FIELD_SESSION_TIME_DESC="Auto log out a User after they have been inactive for the entered number of minutes. Do not set too high."
+COM_CONFIG_FIELD_SESSION_TIME_LABEL="Session Lifetime"
+COM_CONFIG_FIELD_SHARED_SESSION_DESC="When enabled, a user's session is shared between the frontend and administrator sections of the site. Note that changing this value will invalidate all existing sessions on the site. This is not available when the \"Force HTTPS\" option is set to \"Administrator Only\"."
+COM_CONFIG_FIELD_SHARED_SESSION_LABEL="Shared Sessions"
+COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_DESC="Display or not a Frontend message when the site is offline. The custom offline message uses the value defined in the 'Custom message' field. The language offline message uses the value defined in the site language ini file."
+COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL="Offline Message"
+COM_CONFIG_FIELD_SITE_NAME_DESC="Enter the name of your website. This will be used in various locations (eg the Backend browser title bar and <em>Site Offline</em> pages)."
+COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
+COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select if access to the Site Frontend is available. If Yes, the Frontend will display or not a message depending on the settings below."
+COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
+COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC="Begin or end all Page Titles with the site name (for example, My Site Name - My Article Name)."
+COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Site Name in Page Titles"
+COM_CONFIG_FIELD_TEMP_PATH_DESC="Please specify a writable folder to store temporary files."
+COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder"
+COM_CONFIG_FIELD_UNICODESLUGS_DESC="Choose between transliteration and unicode aliases. Transliteration is the default."
+COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases"
+COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY="Administrator Only"
+COM_CONFIG_FIELD_VALUE_AFTER="After"
+COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL="Author Email"
+COM_CONFIG_FIELD_VALUE_BEFORE="Before"
+COM_CONFIG_FIELD_VALUE_CACHE_OFF="OFF - Caching disabled"
+COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE="ON - Conservative caching"
+COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE="ON - Progressive caching"
+COM_CONFIG_FIELD_VALUE_DEVELOPMENT="Development"
+COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM="Use Custom Message"
+COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE="Use Site Language Default Message"
+COM_CONFIG_FIELD_VALUE_ENTIRE_SITE="Entire Site"
+COM_CONFIG_FIELD_VALUE_MAXIMUM="Maximum"
+COM_CONFIG_FIELD_VALUE_NO_EMAIL="No Email"
+COM_CONFIG_FIELD_VALUE_NONE="None"
+COM_CONFIG_FIELD_VALUE_PHP_MAIL="PHP Mail"
+COM_CONFIG_FIELD_VALUE_SENDMAIL="Sendmail"
+COM_CONFIG_FIELD_VALUE_SIMPLE="Simple"
+COM_CONFIG_FIELD_VALUE_SITE_EMAIL="Site Email"
+COM_CONFIG_FIELD_VALUE_SMTP="SMTP"
+COM_CONFIG_FIELD_VALUE_SSL="SSL/TLS"
+COM_CONFIG_FIELD_VALUE_SYSTEM_DEFAULT="System Default"
+COM_CONFIG_FIELD_VALUE_TLS="STARTTLS"
+COM_CONFIG_FTP_DETAILS="FTP Login Details"
+COM_CONFIG_FTP_DETAILS_TIP="For updating your configuration.php file, Joomla will most likely need your FTP account details. Please enter them in the form fields below."
+COM_CONFIG_FTP_SETTINGS="FTP Settings"
+COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration"
+COM_CONFIG_HELPREFRESH_SUCCESS="The Help Sites list has been refreshed."
+COM_CONFIG_LOCATION_SETTINGS="Location Settings"
+COM_CONFIG_MAIL_SETTINGS="Mail Settings"
+COM_CONFIG_METADATA_SETTINGS="Metadata Settings"
+COM_CONFIG_PERMISSION_SETTINGS="Permission Settings"
+COM_CONFIG_PERMISSIONS="Permissions"
+COM_CONFIG_PROXY_SETTINGS="Proxy Settings"
+COM_CONFIG_SAVE_SUCCESS="Configuration saved."
+COM_CONFIG_SENDMAIL_ACTION_BUTTON="Send Test Mail"
+COM_CONFIG_SENDMAIL_BODY="This is a test mail sent using "_QQ_"%s"_QQ_". Your email settings are correct!"
+COM_CONFIG_SENDMAIL_ERROR="Test mail could not be sent."
+COM_CONFIG_SENDMAIL_METHOD_MAIL="PHP Mail"
+COM_CONFIG_SENDMAIL_METHOD_SENDMAIL="Sendmail"
+COM_CONFIG_SENDMAIL_METHOD_SMTP="SMTP"
+COM_CONFIG_SENDMAIL_SUBJECT="Test mail from %s"
+COM_CONFIG_SENDMAIL_SUCCESS="The email was sent to <strong>%s</strong> using <strong>%s</strong>. You should check that you've received the test email."
+COM_CONFIG_SENDMAIL_SUCCESS_FALLBACK="The email was sent to <strong>%s</strong> but using <strong>%s</strong> as fallback. You should check that you've received the test email."
+COM_CONFIG_SEO_SETTINGS="SEO Settings"
+COM_CONFIG_SERVER="Server"
+COM_CONFIG_SERVER_SETTINGS="Server Settings"
+COM_CONFIG_SESSION_SETTINGS="Session Settings"
+COM_CONFIG_SITE_SETTINGS="Site Settings"
+COM_CONFIG_SYSTEM="System"
+COM_CONFIG_SYSTEM_SETTINGS="System Settings"
+COM_CONFIG_TEXT_FILTER_SETTINGS="Text Filter Settings"
+COM_CONFIG_TEXT_FILTERS="Text Filters"
+COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all text editor fields in the selected groups.<br />These filtering options give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site's needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with website attacks."
+COM_CONFIG_XML_DESCRIPTION="Configuration Manager"
+JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that:<br /><em><strong>Inherited</strong></em> means that the permissions from the parent group will be used.<br /><em><strong>Denied</strong></em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br /><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Locked)</strong></em> under Calculated Settings).<br /><em><strong>Not Set</strong></em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items."
diff --git a/core/administrator/language/en-GB/en-GB.com_config.sys.ini b/core/administrator/language/en-GB/en-GB.com_config.sys.ini
new file mode 100644
index 00000000..15431907
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_config.sys.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONFIG="Configuration Manager"
+COM_CONFIG_XML_DESCRIPTION="Configuration Manager"
+
+COM_CONFIG_COMPONENT_VIEW_DEFAULT_DESC="Display the configuration options for the selected component."
+COM_CONFIG_COMPONENT_VIEW_DEFAULT_TITLE="Component Configuration Options"
+COM_CONFIG_CONFIG_VIEW_DEFAULT_DESC="Displays global site configuration options."
+COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE="Site Configuration Options"
+COM_CONFIG_TEMPLATES_VIEW_DEFAULT_DESC="Displays template parameter options if the template allows this."
+COM_CONFIG_TEMPLATES_VIEW_DEFAULT_TITLE="Display Template Options"
diff --git a/core/administrator/language/en-GB/en-GB.com_contact.ini b/core/administrator/language/en-GB/en-GB.com_contact.ini
new file mode 100644
index 00000000..0f2f2d5c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_contact.ini
@@ -0,0 +1,315 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTACT="Contacts"
+COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL="Contact Display Options"
+; COM_CONTACT_BATCH_MENU_LABEL is deprecated, use JLIB_HTML_BATCH_MENU_LABEL instead.
+COM_CONTACT_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
+COM_CONTACT_BATCH_OPTIONS="Batch process the selected contacts"
+COM_CONTACT_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved contacts. Otherwise, all actions are applied to the selected contacts."
+COM_CONTACT_CATEGORIES_VIEW_DEFAULT_DESC="Shows a list of contact categories within a category."
+COM_CONTACT_CATEGORY_VIEW_DEFAULT_DESC="This view lists the contacts in a category."
+COM_CONTACT_CHANGE_CONTACT="Select or Change Contact"
+; COM_CONTACT_CHANGE_CONTACT_BUTTON deprecated, use COM_CONTACT_CHANGE_CONTACT instead.
+COM_CONTACT_CHANGE_CONTACT_BUTTON="Change Contact"
+COM_CONTACT_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Contact Component will integrate with other extensions."
+COM_CONTACT_CONFIGURATION="Contacts: Options"
+COM_CONTACT_CONTACT_DETAILS="Details"
+COM_CONTACT_CONTACT_DISPLAY_DETAILS="Display options for the individual contact page."
+COM_CONTACT_CONTACT_SETTINGS_LABEL="Contact Options"
+COM_CONTACT_CONTACT_VIEW_DEFAULT_DESC="This links to the contact information for one contact."
+COM_CONTACT_CONTACTS="Contacts"
+COM_CONTACT_DETAILS="Contact Information"
+COM_CONTACT_EDIT_CONTACT="Edit Contact"
+COM_CONTACT_EDIT_DETAILS="Edit contact information displayed on an individual page."
+COM_CONTACT_ERROR_UNIQUE_ALIAS="Another Contact from this category has the same alias (remember it may be a trashed item)."
+COM_CONTACT_ERROR_ALL_LANGUAGE_ASSOCIATED="A contact item set to All languages can't be associated. Associations have not been set."
+COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC="Number of articles to list."
+COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL="# Articles to List"
+COM_CONTACT_FIELD_ARTICLES_SHOW_DESC="If this contact is mapped to a user, and if this is set to Show, then a list of articles created by this user will show."
+COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL="Show User Articles"
+COM_CONTACT_FIELD_BREADCRUMBS_DESC="Show or hide category breadcrumbs."
+COM_CONTACT_FIELD_BREADCRUMBS_LABEL="Show Category Breadcrumbs"
+COM_CONTACT_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the contact form. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Global' is selected, make sure a captcha plugin is selected in Global Configuration."
+COM_CONTACT_FIELD_CAPTCHA_LABEL="Allow Captcha on Contact"
+COM_CONTACT_FIELD_CATEGORIES_DESC="Displays a list of contact categories within a category."
+COM_CONTACT_FIELD_CATEGORIES_LABEL="Choose a Parent Category"
+COM_CONTACT_FIELD_CATEGORY_DESC="Select a contact category to display."
+COM_CONTACT_FIELD_CATEGORY_LABEL="Select a Category"
+COM_CONTACT_FIELD_CONFIG_ALLOW_VCARD_DESC="Allow vCard to be displayed."
+COM_CONTACT_FIELD_CONFIG_ALLOW_VCARD_LABEL="Allow vCard"
+COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semicolon."
+COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL="Banned Email"
+COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semicolon."
+COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL="Banned Subject"
+COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semicolon."
+COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL="Banned Text"
+COM_CONTACT_FIELD_CONFIG_CATEGORIES_DESC="These settings apply for Contact Categories Options unless they are changed for a specific menu item."
+COM_CONTACT_FIELD_CONFIG_CATEGORY_DESC="These settings apply for Contact Category Options unless they are changed for a specific menu item."
+COM_CONTACT_FIELD_CONFIG_CONTACT_FORM="Form"
+COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC="Show or hide a Country column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL="Country"
+COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC="Turns off the automated reply, allowing for Plugins to handle integration with other systems."
+COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL="Custom Reply"
+COM_CONTACT_FIELD_CONFIG_EMAIL_DESC="Show or hide an Email column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_FAX_DESC="Show or hide a Fax column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_FAX_LABEL="Fax"
+COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC="These settings apply for single Contact unless they are changed for a specific menu item or Contact."
+COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DISPLAY="Contact"
+COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL="Image"
+COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_DESC="Show or hide an Image column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_MOBILE_DESC="Show or hide show a Mobile column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL="Mobile"
+COM_CONTACT_FIELD_CONFIG_PHONE_DESC="Show or hide a Phone column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_PHONE_LABEL="Phone"
+COM_CONTACT_FIELD_CONFIG_POSITION_DESC="Show or hide a Position column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_POSITION_LABEL="Position"
+COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC="Enter an alternative URL where the user will be redirected to after mail is sent."
+COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL="Contact Redirect"
+COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC="Check for the existence of session cookie. This means that users without cookies enabled will not be able to send emails."
+COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL="Session Check"
+COM_CONTACT_FIELD_CONFIG_STATE_LABEL="State or County"
+COM_CONTACT_FIELD_CONFIG_STATE_DESC="Show or hide a State or County column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_SUBURB_DESC="Show or hide a City or Suburb column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL="City or Suburb"
+COM_CONTACT_FIELD_CONFIG_TABLE_OF_CONTACTS_DESC="These settings apply for Contact List Options unless they are changed for a specific menu item."
+COM_CONTACT_FIELD_CONFIG_VCARD_DESC="Show or hide a vCard column in the list of Contacts."
+COM_CONTACT_FIELD_CONFIG_VCARD_LABEL="vCard"
+COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC="If &quot;Hide&quot;, the Contact Category will not show. If &quot;Show Without Link&quot;, Category will show as text. If &quot;Show With Link&quot;, Category will show as a link to a Single Category Menu Item."
+COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL="Contact Category"
+COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC="If Show, the user will be able to change which contact is shown by selecting a contact from a dropdown list of all contacts in the current contact category."
+COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL="Show Contact List"
+COM_CONTACT_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the contact."
+COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created By Alias"
+COM_CONTACT_FIELD_CREATED_BY_DESC="Select the name of the user who created the contact."
+COM_CONTACT_FIELD_CREATED_DESC="Date when the contact was created."
+COM_CONTACT_FIELD_CREATED_LABEL="Created Date"
+COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semicolon."
+COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_LABEL="Banned Email"
+COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semicolon."
+COM_CONTACT_FIELD_EMAIL_BANNED_SUBJECT_LABEL="Banned Subject"
+COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semicolon."
+COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL="Banned Text"
+COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC="Hide or Show checkbox to allow copy of email to be sent to submitter."
+COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL="Send Copy to Submitter"
+COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC="Show or hide the contact form."
+COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL="Contact Form"
+COM_CONTACT_FIELD_FEATURED_DESC="If marked yes, will be displayed in featured view."
+COM_CONTACT_FIELD_FEEDLINK_DESC="Show or hide a feed link for this contact category."
+COM_CONTACT_FIELD_FEEDLINK_LABEL="Feed Link"
+COM_CONTACT_FIELD_ICONS_ADDRESS_DESC="Select or upload an image for the Address icon. If none selected, the default icon will be displayed."
+COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL="Address Icon"
+COM_CONTACT_FIELD_ICONS_EMAIL_DESC="Select or upload an image for the Email icon. If none selected, the default icon will be displayed."
+COM_CONTACT_FIELD_ICONS_EMAIL_LABEL="Email Icon"
+COM_CONTACT_FIELD_ICONS_FAX_DESC="Select or upload an image for the Fax icon. If none selected, the default icon will be displayed."
+COM_CONTACT_FIELD_ICONS_FAX_LABEL="Fax Icon"
+COM_CONTACT_FIELD_ICONS_MISC_DESC="Select or upload an image for the Misc icon. If none selected, the default icon will be displayed."
+COM_CONTACT_FIELD_ICONS_MISC_LABEL="Misc Icon"
+COM_CONTACT_FIELD_ICONS_MOBILE_DESC="Select or upload an image for the Mobile icon. If none selected, the default icon will be displayed."
+COM_CONTACT_FIELD_ICONS_MOBILE_LABEL="Mobile Icon"
+COM_CONTACT_FIELD_ICONS_SETTINGS_DESC="Show icons, text or nothing next to the information."
+COM_CONTACT_FIELD_ICONS_SETTINGS_LABEL="Settings"
+COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC="Select or upload an image for the Telephone icon. If none selected, the default icon will be displayed."
+COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL="Telephone Icon"
+COM_CONTACT_FIELD_IMAGE_ALIGN_DESC="Alignment of the image."
+COM_CONTACT_FIELD_IMAGE_ALIGN_LABEL="Image Alignment"
+COM_CONTACT_FIELD_INFORMATION_ADDRESS_DESC="Contact's address."
+COM_CONTACT_FIELD_INFORMATION_ADDRESS_LABEL="Address"
+COM_CONTACT_FIELD_INFORMATION_COUNTRY_DESC="Contact's country."
+COM_CONTACT_FIELD_INFORMATION_COUNTRY_LABEL="Country"
+COM_CONTACT_FIELD_INFORMATION_EMAIL_DESC="Contact's email."
+COM_CONTACT_FIELD_INFORMATION_FAX_DESC="Contact's fax."
+COM_CONTACT_FIELD_INFORMATION_FAX_LABEL="Fax"
+COM_CONTACT_FIELD_INFORMATION_MISC_DESC="Contact's miscellaneous information."
+COM_CONTACT_FIELD_INFORMATION_MISC_LABEL="Miscellaneous Information"
+COM_CONTACT_FIELD_INFORMATION_MOBILE_DESC="Contact's mobile phone."
+COM_CONTACT_FIELD_INFORMATION_MOBILE_LABEL="Mobile"
+COM_CONTACT_FIELD_INFORMATION_POSITION_DESC="Contact's position."
+COM_CONTACT_FIELD_INFORMATION_POSITION_LABEL="Position"
+COM_CONTACT_FIELD_INFORMATION_POSTCODE_DESC="Contact's Postal/ZIP code."
+COM_CONTACT_FIELD_INFORMATION_POSTCODE_LABEL="Postal/ZIP Code"
+COM_CONTACT_FIELD_INFORMATION_STATE_DESC="Contact's state or county."
+COM_CONTACT_FIELD_INFORMATION_STATE_LABEL="State or County"
+COM_CONTACT_FIELD_INFORMATION_SUBURB_DESC="Contact's city or suburb."
+COM_CONTACT_FIELD_INFORMATION_SUBURB_LABEL="City or Suburb"
+COM_CONTACT_FIELD_INFORMATION_TELEPHONE_DESC="Contact's telephone."
+COM_CONTACT_FIELD_INFORMATION_TELEPHONE_LABEL="Telephone"
+COM_CONTACT_FIELD_INFORMATION_WEBPAGE_DESC="Contact's Website. IDN (International) Links are converted to punycode when they are saved."
+COM_CONTACT_FIELD_INFORMATION_WEBPAGE_LABEL="Website"
+COM_CONTACT_FIELD_INITIAL_SORT_DESC="Choose the field or fields by which contacts will be sorted."
+COM_CONTACT_FIELD_INITIAL_SORT_LABEL="Sort By"
+COM_CONTACT_FIELD_LANGUAGE_DESC="Assign a language for this contact."
+COM_CONTACT_FIELD_LIMIT_BOX_DESC="Show or hide limit box."
+COM_CONTACT_FIELD_LIMIT_BOX_LABEL="Limit box"
+COM_CONTACT_FIELD_LINK_NAME_DESC="An additional link for this contact."
+COM_CONTACT_FIELD_LINKA_DESC="Enter a URL for Link A."
+COM_CONTACT_FIELD_LINKA_LABEL="Link A URL"
+COM_CONTACT_FIELD_LINKA_NAME_LABEL="Link A Label"
+COM_CONTACT_FIELD_LINKB_DESC="Enter a URL for Link B."
+COM_CONTACT_FIELD_LINKB_LABEL="Link B URL"
+COM_CONTACT_FIELD_LINKB_NAME_LABEL="Link B Label"
+COM_CONTACT_FIELD_LINKC_DESC="Enter a URL for Link C."
+COM_CONTACT_FIELD_LINKC_LABEL="Link C URL"
+COM_CONTACT_FIELD_LINKC_NAME_LABEL="Link C Label"
+COM_CONTACT_FIELD_LINKD_DESC="Enter a URL for Link D."
+COM_CONTACT_FIELD_LINKD_LABEL="Link D URL"
+COM_CONTACT_FIELD_LINKD_NAME_LABEL="Link D Label"
+COM_CONTACT_FIELD_LINKE_DESC="Enter a URL for Link E."
+COM_CONTACT_FIELD_LINKE_LABEL="Link E URL"
+COM_CONTACT_FIELD_LINKE_NAME_LABEL="Link E Label"
+COM_CONTACT_FIELD_LINKED_USER_DESC="Linked Joomla User."
+COM_CONTACT_FIELD_LINKED_USER_LABEL="Linked User"
+COM_CONTACT_FIELD_LINKED_USER_LABEL_ASC="Linked User ascending"
+COM_CONTACT_FIELD_LINKED_USER_LABEL_DESC="Linked User descending"
+COM_CONTACT_FIELD_MODIFIED_BY_DESC="Name of the user who modified this contact."
+COM_CONTACT_FIELD_MODIFIED_DESC="The date and time that the contact was last modified."
+COM_CONTACT_FIELD_NAME_DESC="Contact name."
+COM_CONTACT_FIELD_NAME_LABEL="Name"
+COM_CONTACT_FIELD_NUM_CONTACTS_DESC="Number of Contacts to display as list."
+COM_CONTACT_FIELD_NUM_CONTACTS_LABEL="Number of Contacts"
+COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_DESC="Adds a mailto: link to the displayed email address."
+COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL="Add Mailto: Link"
+COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC="Show or hide contact email."
+COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC="Show or hide position."
+COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL="Contact's Position"
+COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC="Show or hide country."
+COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL="Country"
+COM_CONTACT_FIELD_PARAMS_FAX_DESC="Show or hide fax number."
+COM_CONTACT_FIELD_PARAMS_FAX_LABEL="Fax"
+COM_CONTACT_FIELD_PARAMS_IMAGE_DESC="Select or upload the contact image."
+COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL="Image"
+COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC="Show or hide miscellaneous information."
+COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL="Miscellaneous Information"
+COM_CONTACT_FIELD_PARAMS_MOBILE_DESC="Show or hide mobile number."
+COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL="Mobile Phone"
+COM_CONTACT_FIELD_PARAMS_NAME_DESC="Show or hide name of the contact."
+COM_CONTACT_FIELD_PARAMS_NAME_LABEL="Name"
+COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC="Show or hide the Postal/ZIP code."
+COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL="Postal/ZIP Code"
+COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC="Show or hide image."
+COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL="Image"
+COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC="Show or hide state or county."
+COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL="State or County"
+COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC="Show or hide street address."
+COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL="Street Address"
+COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC="Show or hide telephone number."
+COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL="Telephone"
+COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC="Show or hide city or suburb."
+COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL="City or Suburb"
+COM_CONTACT_FIELD_PARAMS_VCARD_DESC="Show or hide a link to allow export to vCard format."
+COM_CONTACT_FIELD_PARAMS_VCARD_LABEL="vCard"
+COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC="Show or hide webpage."
+COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL="Webpage"
+COM_CONTACT_FIELD_PRESENTATION_DESC="Determines the style used to display sections of the contact form."
+COM_CONTACT_FIELD_PRESENTATION_LABEL="Display Format"
+COM_CONTACT_FIELD_PROFILE_SHOW_DESC="If the contact is mapped to a user and this option is set to Show, then the profile of the user will be shown in the contact details."
+COM_CONTACT_FIELD_PROFILE_SHOW_LABEL="User Profile"
+COM_CONTACT_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the contact."
+COM_CONTACT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_CONTACT_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the contact."
+COM_CONTACT_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC="Show or hide the number of contacts in category."
+COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL="# Contacts in Category"
+COM_CONTACT_FIELD_SHOW_CATEGORY_DESC="Displays the category."
+COM_CONTACT_FIELD_SHOW_LINKS_DESC="Show or hide the contact links."
+COM_CONTACT_FIELD_SHOW_LINKS_LABEL="Contact Links"
+COM_CONTACT_FIELD_SHOW_CAT_TAGS_DESC="Show or hide the tags for a contact category."
+COM_CONTACT_FIELD_SHOW_CAT_TAGS_LABEL="Category Tags"
+COM_CONTACT_FIELD_SHOW_TAGS_DESC="Show or hide the tags for a contact."
+COM_CONTACT_FIELD_SHOW_TAGS_LABEL="Tags"
+COM_CONTACT_FIELD_SHOW_INFO_LABEL="Contact Information"
+COM_CONTACT_FIELD_SHOW_INFO_DESC="Show or hide the contact information."
+COM_CONTACT_FIELD_SORTNAME1_DESC="The part of the name to use as the first sort field."
+COM_CONTACT_FIELD_SORTNAME1_LABEL="First Sort Field"
+COM_CONTACT_FIELD_SORTNAME2_DESC="The part of the name to use as the second sort field."
+COM_CONTACT_FIELD_SORTNAME2_LABEL="Second Sort Field"
+COM_CONTACT_FIELD_SORTNAME3_DESC="The part of the name to use as the third sort field."
+COM_CONTACT_FIELD_SORTNAME3_LABEL="Third Sort Field"
+COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL="Show User Custom Fields"
+COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC="Show user custom fields which belong to all or only selected field groups."
+COM_CONTACT_FIELD_VALUE_ICONS="Icons"
+COM_CONTACT_FIELD_VALUE_NAME="Name"
+COM_CONTACT_FIELD_VALUE_NO_LINK="Show Without Link"
+COM_CONTACT_FIELD_VALUE_NONE="None"
+COM_CONTACT_FIELD_VALUE_ORDERING="Ordering"
+COM_CONTACT_FIELD_VALUE_PLAIN="Plain"
+COM_CONTACT_FIELD_VALUE_SLIDERS="Sliders"
+COM_CONTACT_FIELD_VALUE_SORT_NAME="Sort Name"
+COM_CONTACT_FIELD_VALUE_TABS="Tabs"
+COM_CONTACT_FIELD_VALUE_TEXT="Text"
+COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS="Use Contact Settings"
+COM_CONTACT_FIELD_VALUE_WITH_LINK="Show With Link"
+COM_CONTACT_FIELD_VERSION_LABEL="Revision"
+COM_CONTACT_FIELD_VERSION_DESC="A count of the number of times this contact has been revised."
+COM_CONTACT_FIELDS_CONTACT_FIELDS_TITLE="Contacts: Fields"
+COM_CONTACT_FIELDS_CONTACT_FIELD_ADD_TITLE="Contacts: New Field"
+COM_CONTACT_FIELDS_CONTACT_FIELD_EDIT_TITLE="Contacts: Edit Field"
+COM_CONTACT_FIELDS_CONTEXT_CONTACT="Contact"
+COM_CONTACT_FIELDS_CONTEXT_MAIL="Mail"
+COM_CONTACT_FIELDSET_CONTACT_FORM="Contact form"
+COM_CONTACT_FIELDSET_CONTACT_LABEL="Form"
+COM_CONTACT_FIELDSET_CONTACTFORM_LABEL="Mail Options"
+COM_CONTACT_FIELDSET_OPTIONS="Display Options"
+COM_CONTACT_FILTER_DESC="Choose the type of filter to display per default."
+COM_CONTACT_FILTER_LABEL="Filter field"
+COM_CONTACT_FILTER_SEARCH_DESC="Search in contact name and alias. Prefix with ID: to search for a contact ID."
+COM_CONTACT_FILTER_SEARCH_LABEL="Search Contacts"
+COM_CONTACT_ICONS_SETTINGS="Icons"
+COM_CONTACT_HEADING_ASSOCIATION="Association"
+COM_CONTACT_HITS_DESC="Number of hits for this contact."
+COM_CONTACT_ID_LABEL="ID"
+; The following 2 strings are deprecated and will be removed with 4.0.
+COM_CONTACT_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Contact Item Associations"
+COM_CONTACT_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a contact item for the target language. This association will let the Language Switcher module redirect to the associated contact item in another language. If used, make sure to display the Language switcher module on the relevant pages. A contact item set to language 'All' can't be associated."
+COM_CONTACT_MAIL_FIELDSET_LABEL="Mail Options"
+COM_CONTACT_MANAGER_CONTACT="Contacts: New/Edit"
+COM_CONTACT_MANAGER_CONTACT_EDIT="Contacts: Edit"
+COM_CONTACT_MANAGER_CONTACT_NEW="Contacts: New"
+COM_CONTACT_MANAGER_CONTACTS="Contacts"
+COM_CONTACT_N_ITEMS_ARCHIVED="%d contacts archived."
+COM_CONTACT_N_ITEMS_ARCHIVED_1="%d contact archived."
+COM_CONTACT_N_ITEMS_CHECKED_IN_0="No contact checked in."
+COM_CONTACT_N_ITEMS_CHECKED_IN_1="%d contact checked in."
+COM_CONTACT_N_ITEMS_CHECKED_IN_MORE="%d contacts checked in."
+COM_CONTACT_N_ITEMS_DELETED="%d contacts deleted."
+COM_CONTACT_N_ITEMS_DELETED_1="%d contact deleted."
+COM_CONTACT_N_ITEMS_FEATURED="%d contacts featured."
+COM_CONTACT_N_ITEMS_FEATURED_1="%d contact featured."
+COM_CONTACT_N_ITEMS_PUBLISHED="%d contacts published."
+COM_CONTACT_N_ITEMS_PUBLISHED_1="%d contact published."
+COM_CONTACT_N_ITEMS_TRASHED="%d contacts trashed."
+COM_CONTACT_N_ITEMS_TRASHED_1="%d contact trashed."
+COM_CONTACT_N_ITEMS_UNFEATURED="%d contacts unfeatured."
+COM_CONTACT_N_ITEMS_UNFEATURED_1="%d contact unfeatured."
+COM_CONTACT_N_ITEMS_UNPUBLISHED="%d contacts unpublished."
+COM_CONTACT_N_ITEMS_UNPUBLISHED_1="%d contact unpublished."
+COM_CONTACT_NAME_DESC="Contact name."
+COM_CONTACT_NEW_CONTACT="New Contact"
+COM_CONTACT_NO_ITEM_SELECTED="No contacts selected."
+COM_CONTACT_OPTIONS="Options"
+COM_CONTACT_SAVE_SUCCESS="Contact saved."
+COM_CONTACT_SEARCH_IN_NAME="Search contacts by name"
+COM_CONTACT_SELECT_A_CONTACT="Select a Contact"
+COM_CONTACT_SELECT_CONTACT_DESC="Select or create a contact to be displayed."
+COM_CONTACT_SELECT_CONTACT_LABEL="Select Contact"
+COM_CONTACT_SELECT_USER="Select User"
+COM_CONTACT_SHOW_EMAIL_ADDRESS_DESC="Show email address."
+COM_CONTACT_SHOW_EMAIL_ADDRESS_LABEL="Email Address"
+COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty if it has no Contacts or subcategories."
+COM_CONTACT_SUBMENU_CATEGORIES="Categories"
+COM_CONTACT_SUBMENU_CONTACTS="Contacts"
+COM_CONTACT_TIP_ASSOCIATION="Associated contacts"
+COM_CONTACT_TOGGLE_TO_FEATURE="Toggle to change contact state to 'Featured'."
+COM_CONTACT_TOGGLE_TO_UNFEATURE="Toggle to change contact state to 'Unfeatured'."
+COM_CONTACT_UNFEATURED="Unfeatured contact"
+COM_CONTACT_WARNING_CATEGORY="This category is invalid."
+COM_CONTACT_WARNING_PROVIDE_VALID_NAME="Please provide a valid name."
+COM_CONTACT_WARNING_PROVIDE_VALID_URL="Please provide a valid URL."
+COM_CONTACT_WARNING_SELECT_CONTACT_TOPUBLISH="Please select a contact to publish."
+COM_CONTACT_XML_DESCRIPTION="This component shows a listing of contact information."
+JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information"
+JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved."
+JLIB_HTML_BATCH_USER_LABEL="Set Linked User"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_contact.sys.ini b/core/administrator/language/en-GB/en-GB.com_contact.sys.ini
new file mode 100644
index 00000000..c65d6e6a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_contact.sys.ini
@@ -0,0 +1,27 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTACT="Contacts"
+COM_CONTACT_CATEGORIES="Categories"
+COM_CONTACT_CATEGORIES_VIEW_DEFAULT_DESC="Shows a list of contact categories within a category."
+COM_CONTACT_CATEGORIES_VIEW_DEFAULT_OPTION="Default"
+COM_CONTACT_CATEGORIES_VIEW_DEFAULT_TITLE="List All Contact Categories"
+COM_CONTACT_CATEGORY_ADD_TITLE="Contacts: New Category"
+COM_CONTACT_CATEGORY_EDIT_TITLE="Contacts: Edit Category"
+COM_CONTACT_CATEGORY_VIEW_DEFAULT_DESC="This view lists the contacts in a category."
+COM_CONTACT_CATEGORY_VIEW_DEFAULT_OPTION="Default"
+COM_CONTACT_CATEGORY_VIEW_DEFAULT_TITLE="List Contacts in a Category"
+COM_CONTACT_CONTACT_VIEW_DEFAULT_DESC="This links to the contact information for one contact."
+COM_CONTACT_CONTACT_VIEW_DEFAULT_OPTION="Default"
+COM_CONTACT_CONTACT_VIEW_DEFAULT_TITLE="Single Contact"
+COM_CONTACT_CONTENT_TYPE_CONTACT="Contact"
+COM_CONTACT_CONTENT_TYPE_CATEGORY="Contact Category"
+COM_CONTACT_FEATURED_VIEW_DEFAULT_DESC="This view lists the featured contacts."
+COM_CONTACT_FEATURED_VIEW_DEFAULT_OPTION="Default"
+COM_CONTACT_FEATURED_VIEW_DEFAULT_TITLE="Featured Contacts"
+COM_CONTACT_CONTACTS="Contacts"
+COM_CONTACT_TAGS_CONTACT="Contact"
+COM_CONTACT_TAGS_CATEGORY="Contact Category"
+COM_CONTACT_XML_DESCRIPTION="This component shows a listing of Contact Information."
diff --git a/core/administrator/language/en-GB/en-GB.com_content.ini b/core/administrator/language/en-GB/en-GB.com_content.ini
new file mode 100644
index 00000000..deaddc6e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_content.ini
@@ -0,0 +1,209 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTENT="Articles"
+COM_CONTENT_ACCESS_DELETE_DESC="New setting for <strong>delete actions</strong> on this article and the calculated setting based on the parent category and group permissions."
+COM_CONTENT_ACCESS_EDIT_DESC="New setting for <strong>edit actions</strong> on this article and the calculated setting based on the parent category and group permissions."
+COM_CONTENT_ACCESS_EDITSTATE_DESC="New setting for <strong>edit state actions</strong> on this article and the calculated setting based on the parent category and group permissions."
+COM_CONTENT_ARTICLE_CONTENT="Content"
+COM_CONTENT_ARTICLE_DETAILS="Article Details"
+COM_CONTENT_ARTICLES_TITLE="Articles"
+COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL="Options"
+COM_CONTENT_ATTRIBS_FIELDSET_LABEL="Options"
+; COM_CONTENT_BATCH_MENU_LABEL is deprecated, use JLIB_HTML_BATCH_MENU_LABEL instead.
+COM_CONTENT_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
+COM_CONTENT_BATCH_OPTIONS="Batch process the selected articles"
+COM_CONTENT_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved articles. Otherwise, all actions are applied to the selected articles."
+COM_CONTENT_CHANGE_ARTICLE="Select or Change article"
+COM_CONTENT_CHANGE_ARTICLE_BUTTON="Select/Change"
+COM_CONTENT_CHOOSE_CATEGORY_DESC="Select a parent category."
+COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC="These settings apply for article layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC="These settings apply for blog or featured layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL="Blog/Featured Layouts"
+COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC="These settings apply for Articles Categories Options, unless they are changed by the individual category or menu settings."
+COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC="These settings apply for Articles Category Options unless they are changed by the individual category or menu settings."
+COM_CONTENT_CONFIG_EDITOR_LAYOUT="These options control the layout of the article editing page."
+COM_CONTENT_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Article Component will integrate with other extensions."
+COM_CONTENT_CONFIG_LIST_SETTINGS_DESC="These settings apply for List Layouts Options unless they are changed for a specific menu item or category."
+COM_CONTENT_CONFIGURATION="Articles: Options"
+COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_DESC="Select the page the user will be redirected to after Canceling article submission. The default is to redirect to the same article submission page (cleaning form)."
+COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_LABEL="Cancel Redirect"
+COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL="Default Category"
+COM_CONTENT_CREATE_ARTICLE_CATEGORY_DESC="If set to 'Yes', this page will only let you create articles in the category selected below."
+COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC="If set to 'Yes', you can set a redirection page, distinct from above 'Submission/Cancel Redirect', to redirect to when user Cancels article submission.<br />If set to 'No', when user Cancels article submission, the user is redirected to the above 'Submission/Cancel Redirect' page."
+COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_LABEL="Custom Redirect on Cancel"
+COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_DESC="Select the page the user will be redirected to after a successful article submission and after cancel (if not set differently below). The default is to redirect to the home page."
+COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_LABEL="Submission/Cancel Redirect"
+COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display,<br />make sure you define the Options in the desired layout."
+COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, show articles in a list or blog layout."
+COM_CONTENT_DRILL_DOWN_LAYOUT_LABEL="List or Blog Layout"
+COM_CONTENT_EDIT_ARTICLE="Edit Article"
+COM_CONTENT_EDITORCONFIG_FIELDSET_LABEL="Configure Edit Screen"
+COM_CONTENT_EDITING_LAYOUT="Editing Layout"
+COM_CONTENT_ERROR_ALL_LANGUAGE_ASSOCIATED="A content item set to All languages can't be associated. Associations have not been set."
+COM_CONTENT_FEATURED="Featured Article"
+COM_CONTENT_FEATURED_ARTICLES="Featured Articles"
+COM_CONTENT_FEATURED_CATEGORIES_DESC="Optional list of categories. If selected, only featured articles from the selected categories will show."
+COM_CONTENT_FEATURED_CATEGORIES_LABEL="Select Categories"
+COM_CONTENT_FEATURED_ORDER="Featured Articles Order"
+COM_CONTENT_FEATURED_TITLE="Articles: Featured"
+COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_DESC="Optional text for the &quot;Browser page title&quot; element to be used when the article is viewed with a non-article menu item. If blank, the article's title is used instead."
+COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL="Browser Page Title"
+COM_CONTENT_FIELD_ARTICLETEXT_DESC="Enter the article content in the text area."
+COM_CONTENT_FIELD_ARTICLETEXT_LABEL="Article Text"
+COM_CONTENT_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the article submit form. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Global' is selected, make sure a captcha plugin is selected in Global Configuration."
+COM_CONTENT_FIELD_CAPTCHA_LABEL="Allow Captcha on submit"
+COM_CONTENT_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the article."
+COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
+COM_CONTENT_FIELD_CREATED_BY_DESC="Select the name of the user who created the article."
+COM_CONTENT_FIELD_CREATED_BY_LABEL="Created By"
+COM_CONTENT_FIELD_CREATED_DESC="Created date."
+COM_CONTENT_FIELD_CREATED_LABEL="Created Date"
+COM_CONTENT_FIELD_FEATURED_DESC="Assign the article to the featured blog layout."
+COM_CONTENT_FIELD_FULL_DESC="Select or upload an image for the single article display."
+COM_CONTENT_FIELD_FULL_LABEL="Full Article Image"
+COM_CONTENT_FIELD_FULLTEXT="Full text"
+COM_CONTENT_FIELD_HITS_DESC="Number of hits for this article."
+COM_CONTENT_FIELD_IMAGE_DESC="The image to be displayed."
+COM_CONTENT_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images."
+COM_CONTENT_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_CONTENT_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image."
+COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL="Caption"
+COM_CONTENT_FIELD_IMAGE_OPTIONS="Image Options"
+COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC="Puts the article information block above or below the text or splits it into two separate blocks, one above and the other below."
+COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL="Position of Article Info"
+COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC="Displays the 'Article Info' title on top of the article information block."
+COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL="Article Info Title"
+COM_CONTENT_FIELD_INTRO_DESC="Image for the intro text layouts such as blogs and featured."
+COM_CONTENT_FIELD_INTRO_LABEL="Intro Image"
+COM_CONTENT_FIELD_INTROTEXT="Intro Text"
+COM_CONTENT_FIELD_LANGUAGE_DESC="The language that the article is assigned to."
+COM_CONTENT_FIELD_MODIFIED_DESC="The date and time that the article was last modified."
+COM_CONTENT_FIELD_OPTION_ABOVE="Above"
+COM_CONTENT_FIELD_OPTION_BELOW="Below"
+COM_CONTENT_FIELD_OPTION_SPLIT="Split"
+COM_CONTENT_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the article."
+COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_CONTENT_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the article."
+COM_CONTENT_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+COM_CONTENT_FIELD_SELECT_ARTICLE_DESC="Select or create an article to be displayed."
+COM_CONTENT_FIELD_SELECT_ARTICLE_LABEL="Select Article"
+COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for the category."
+COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags"
+COM_CONTENT_FIELD_SHOW_TAGS_DESC="Show the tags for each article."
+COM_CONTENT_FIELD_SHOW_TAGS_LABEL="Show Tags"
+COM_CONTENT_FIELD_URL_DESC="The actual link to which users will be redirected."
+COM_CONTENT_FIELD_URL_LINK_TEXT_DESC="Text to display for the link."
+COM_CONTENT_FIELD_URL_LINK_TEXT_LABEL="Link Text"
+COM_CONTENT_FIELD_URLA_LABEL="Link A"
+COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL="Link A Text"
+COM_CONTENT_FIELD_URLB_LABEL="Link B"
+COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL="Link B Text"
+COM_CONTENT_FIELD_URLC_LABEL="Link C"
+COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL="Link C Text"
+COM_CONTENT_FIELD_URLS_OPTIONS="URL Options"
+COM_CONTENT_FIELD_URLSPOSITION_LABEL="Positioning of the Links"
+COM_CONTENT_FIELD_URLSPOSITION_DESC="Display the links above or below the content."
+COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS="Use Article Settings"
+COM_CONTENT_FIELD_VERSION_DESC="A count of the number of times this article has been revised."
+COM_CONTENT_FIELD_VERSION_LABEL="Revision"
+COM_CONTENT_FIELD_XREFERENCE_DESC="An optional reference used to link to external data sources."
+COM_CONTENT_FIELD_XREFERENCE_LABEL="External Reference"
+COM_CONTENT_FIELDS_ARTICLE_FIELDS_TITLE="Articles: Fields"
+COM_CONTENT_FIELDS_ARTICLE_FIELD_ADD_TITLE="Articles: New Field"
+COM_CONTENT_FIELDS_ARTICLE_FIELD_EDIT_TITLE="Articles: Edit Field"
+COM_CONTENT_FIELDS_TYPE_MODAL_ARTICLE="Article"
+COM_CONTENT_FIELDSET_PUBLISHING="Publishing"
+COM_CONTENT_FIELDSET_RULES="Permissions"
+COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images and Links"
+COM_CONTENT_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author."
+COM_CONTENT_FILTER_SEARCH_LABEL="Search Articles"
+COM_CONTENT_FLOAT_DESC="Controls placement of the image."
+COM_CONTENT_FLOAT_FULLTEXT_LABEL="Full Text Image Float"
+COM_CONTENT_FLOAT_LABEL="Image Float"
+COM_CONTENT_FLOAT_INTRO_LABEL="Intro Image Float"
+COM_CONTENT_HEADING_ASSOCIATION="Association"
+COM_CONTENT_HEADING_DATE_CREATED="Date Created"
+COM_CONTENT_HEADING_DATE_MODIFIED="Date Modified"
+COM_CONTENT_HEADING_DATE_PUBLISH_UP="Start Publishing"
+COM_CONTENT_HEADING_DATE_PUBLISH_DOWN="Finish Publishing"
+COM_CONTENT_ID_LABEL="ID"
+; The following 2 strings are deprecated and will be removed with 4.0.
+COM_CONTENT_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Content Item Associations"
+COM_CONTENT_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a content item for the target language. This association will let the Language Switcher module redirect to the associated content item in another language. If used, make sure to display the Language switcher module on the relevant pages. A content item set to language 'All' can't be associated."
+COM_CONTENT_LEFT="Left"
+COM_CONTENT_MODIFIED_ASC="Date Modified ascending"
+COM_CONTENT_MODIFIED_DESC="Date Modified descending"
+COM_CONTENT_MONTH="Month"
+COM_CONTENT_N_ITEMS_ARCHIVED="%s articles archived."
+COM_CONTENT_N_ITEMS_ARCHIVED_1="%s article archived."
+COM_CONTENT_N_ITEMS_CHECKED_IN_0="No article checked in."
+COM_CONTENT_N_ITEMS_CHECKED_IN_1="%d article checked in."
+COM_CONTENT_N_ITEMS_CHECKED_IN_MORE="%d articles checked in."
+COM_CONTENT_N_ITEMS_DELETED="%s articles deleted."
+COM_CONTENT_N_ITEMS_DELETED_1="%s article deleted."
+COM_CONTENT_N_ITEMS_FEATURED="%s articles featured."
+COM_CONTENT_N_ITEMS_FEATURED_1="%s article featured."
+COM_CONTENT_N_ITEMS_PUBLISHED="%s articles published."
+COM_CONTENT_N_ITEMS_PUBLISHED_1="%s article published."
+COM_CONTENT_N_ITEMS_TRASHED="%s articles trashed."
+COM_CONTENT_N_ITEMS_TRASHED_1="%s article trashed."
+COM_CONTENT_N_ITEMS_UNFEATURED="%s articles unfeatured."
+COM_CONTENT_N_ITEMS_UNFEATURED_1="%s article unfeatured."
+COM_CONTENT_N_ITEMS_UNPUBLISHED="%s articles unpublished."
+COM_CONTENT_N_ITEMS_UNPUBLISHED_1="%s article unpublished."
+COM_CONTENT_NEW_ARTICLE="New Article"
+COM_CONTENT_NO_ARTICLES_DESC="If Show, the message 'There are no articles in this category' will display when there are no articles in the category or when 'Empty Categories' is set to show."
+COM_CONTENT_NO_ARTICLES_LABEL="No Articles Message"
+COM_CONTENT_NO_ITEM_SELECTED="Please first make a selection from the list."
+COM_CONTENT_NONE="None"
+COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
+COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL="# Articles in Category"
+COM_CONTENT_PAGE_ADD_ARTICLE="Articles: New"
+COM_CONTENT_PAGE_EDIT_ARTICLE="Articles: Edit"
+COM_CONTENT_PAGE_VIEW_ARTICLE="Articles: View"
+COM_CONTENT_PAGEBREAK_DOC_TITLE="Page Break"
+COM_CONTENT_PAGEBREAK_INSERT_BUTTON="Insert Page Break"
+COM_CONTENT_PAGEBREAK_TITLE="Page Title:"
+COM_CONTENT_PAGEBREAK_TOC="Table of Contents Alias:"
+COM_CONTENT_PUBLISH_DOWN_ASC="Finish Publishing ascending"
+COM_CONTENT_PUBLISH_DOWN_DESC="Finish Publishing descending"
+COM_CONTENT_PUBLISH_UP_ASC="Start Publishing ascending"
+COM_CONTENT_PUBLISH_UP_DESC="Start Publishing descending"
+COM_CONTENT_RIGHT="Right"
+COM_CONTENT_SAVE_SUCCESS="Article saved."
+COM_CONTENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the article to customise the alias."
+COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
+COM_CONTENT_SHARED_DESC="These settings apply for Shared Options in List, Blog and Featured unless they are changed by the menu settings."
+COM_CONTENT_SHARED_LABEL="Shared"
+COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC="Show or hide article options slider in the Backend article edit view. These options allow overriding of the global options."
+COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL="Show Article Options"
+COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty if it has no articles or subcategories."
+COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC="Show or hide fields to insert images and links in the Administrator."
+COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL="Administrator Images and Links"
+COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC="Show or hide fields to insert images and links when Frontend editing."
+COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL="Frontend Images and Links"
+COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC="Show or hide the publishing options slider in the article edit view. These options allow changes in dates and author identities."
+COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL="Show Publishing Options"
+COM_CONTENT_SLIDER_EDITOR_CONFIG="Configure Edit Screen"
+COM_CONTENT_SUBMENU_CATEGORIES="Categories"
+COM_CONTENT_SUBMENU_FEATURED="Featured Articles"
+COM_CONTENT_TIP_ASSOCIATION="Associated articles"
+COM_CONTENT_TOGGLE_TO_FEATURE="Toggle to change article state to 'Featured'"
+COM_CONTENT_TOGGLE_TO_UNFEATURE="Toggle to change article state to 'Unfeatured'"
+COM_CONTENT_UNFEATURED="Unfeatured Article"
+COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL="URL Target Window"
+COM_CONTENT_URL_FIELD_BROWSERNAV_DESC="Target browser window when the link is selected."
+COM_CONTENT_URL_FIELD_A_BROWSERNAV_LABEL="URL A Target Window"
+COM_CONTENT_URL_FIELD_B_BROWSERNAV_LABEL="URL B Target Window"
+COM_CONTENT_URL_FIELD_C_BROWSERNAV_LABEL="URL C Target Window"
+COM_CONTENT_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank title."
+COM_CONTENT_XML_DESCRIPTION="Article management component."
+
+JGLOBAL_NO_ITEM_SELECTED="No articles selected"
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new articles in this category."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this article only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_content.sys.ini b/core/administrator/language/en-GB/en-GB.com_content.sys.ini
new file mode 100644
index 00000000..f6d6a311
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_content.sys.ini
@@ -0,0 +1,45 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTENT="Articles"
+COM_CONTENT_ARCHIVE_VIEW_DEFAULT_DESC="Display all archived articles."
+COM_CONTENT_ARCHIVE_VIEW_DEFAULT_OPTION="Default"
+COM_CONTENT_ARCHIVE_VIEW_DEFAULT_TITLE="Archived Articles"
+COM_CONTENT_ARTICLE_MANAGER="Articles"
+COM_CONTENT_ARTICLE_VIEW_DEFAULT_DESC="Display a single article."
+COM_CONTENT_ARTICLE_VIEW_DEFAULT_OPTION="Default"
+COM_CONTENT_ARTICLE_VIEW_DEFAULT_TITLE="Single Article"
+COM_CONTENT_ARTICLE_VIEW_EDIT_DESC="Shows a form to create a New Article."
+COM_CONTENT_ARTICLE_VIEW_EDIT_TITLE="Create an Article"
+COM_CONTENT_ARTICLES="Articles"
+COM_CONTENT_ARTICLES_VIEW_DEFAULT_DESC="Shows a list of all the articles."
+COM_CONTENT_ARTICLES_VIEW_DEFAULT_TITLE="List All Articles"
+COM_CONTENT_CATEGORIES="Categories"
+COM_CONTENT_CATEGORIES_VIEW_DEFAULT_DESC="Shows a list of all the article categories within a category."
+COM_CONTENT_CATEGORIES_VIEW_DEFAULT_OPTION="Default"
+COM_CONTENT_CATEGORIES_VIEW_DEFAULT_TITLE="List All Categories"
+COM_CONTENT_CATEGORY_ADD_TITLE="Articles: New Category"
+COM_CONTENT_CATEGORY_EDIT_TITLE="Articles: Edit Category"
+COM_CONTENT_CATEGORY_VIEW_BLOG_DESC="Displays article introductions in a single or multi-column layout."
+COM_CONTENT_CATEGORY_VIEW_BLOG_OPTION="Blog"
+COM_CONTENT_CATEGORY_VIEW_BLOG_TITLE="Category Blog"
+COM_CONTENT_CATEGORY_VIEW_DEFAULT_DESC="Displays a list of articles in a category."
+COM_CONTENT_CATEGORY_VIEW_DEFAULT_OPTION="List"
+COM_CONTENT_CATEGORY_VIEW_DEFAULT_TITLE="Category List"
+COM_CONTENT_CATEGORY_VIEW_FEATURED_DESC="Show all featured articles from one or multiple categories in a single or multi-column layout."
+COM_CONTENT_CATEGORY_VIEW_FEATURED_OPTION="Default"
+COM_CONTENT_CATEGORY_VIEW_FEATURED_TITLE="Featured Articles Single Category"
+COM_CONTENT_CONTENT_TYPE_ARTICLE="Article"
+COM_CONTENT_CONTENT_TYPE_CATEGORY="Article Category"
+COM_CONTENT_FEATURED="Featured"
+COM_CONTENT_FEATURED_VIEW_DEFAULT_DESC="Displays article introductions in a single or multi-column layout for featured articles from all categories."
+COM_CONTENT_FEATURED_VIEW_DEFAULT_OPTION="Default"
+COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE="Featured Articles"
+COM_CONTENT_FORM_VIEW_DEFAULT_DESC="Create a new article."
+COM_CONTENT_FORM_VIEW_DEFAULT_OPTION="Create"
+COM_CONTENT_FORM_VIEW_DEFAULT_TITLE="Create Article"
+COM_CONTENT_TAGS_ARTICLE="Article"
+COM_CONTENT_TAGS_CATEGORY="Article Category"
+COM_CONTENT_XML_DESCRIPTION="Article management component."
diff --git a/core/administrator/language/en-GB/en-GB.com_contenthistory.ini b/core/administrator/language/en-GB/en-GB.com_contenthistory.ini
new file mode 100644
index 00000000..d9fedf02
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_contenthistory.ini
@@ -0,0 +1,47 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTENTHISTORY_BUTTON_COMPARE_ALL_ROWS_DESC="Select to see all values for the item, including ones that haven't changed."
+COM_CONTENTHISTORY_BUTTON_COMPARE_ALL_ROWS="All Values"
+COM_CONTENTHISTORY_BUTTON_COMPARE_CHANGED_ROWS_DESC="Select to see only those values that have changed."
+COM_CONTENTHISTORY_BUTTON_COMPARE_CHANGED_ROWS="Changed Values"
+COM_CONTENTHISTORY_BUTTON_COMPARE_DESC="Choose two versions and select to compare them."
+COM_CONTENTHISTORY_BUTTON_COMPARE_HTML_DESC="Select to see the HTML source code for the changes."
+COM_CONTENTHISTORY_BUTTON_COMPARE_HTML="Show HTML Code"
+COM_CONTENTHISTORY_BUTTON_COMPARE_TEXT_DESC="Select to see the item changes as text."
+COM_CONTENTHISTORY_BUTTON_COMPARE_TEXT="Show Text"
+COM_CONTENTHISTORY_BUTTON_COMPARE="Compare"
+COM_CONTENTHISTORY_BUTTON_DELETE_DESC="Choose one or more versions and select to permanently delete them."
+COM_CONTENTHISTORY_BUTTON_DELETE="Delete"
+COM_CONTENTHISTORY_BUTTON_KEEP_DESC="Choose one or more versions and select to toggle the keep forever on or off."
+COM_CONTENTHISTORY_BUTTON_KEEP_TOGGLE_OFF="Select to allow this version to be deleted automatically according to the delete schedule."
+COM_CONTENTHISTORY_BUTTON_KEEP_TOGGLE_ON="Select to prevent this version being deleted automatically."
+COM_CONTENTHISTORY_BUTTON_KEEP="Keep On/Off"
+COM_CONTENTHISTORY_BUTTON_LOAD_DESC="This button loads the selected version into the edit form."
+COM_CONTENTHISTORY_BUTTON_LOAD="Restore"
+COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC="This button allows you to see a preview of the selected version."
+COM_CONTENTHISTORY_BUTTON_PREVIEW="Preview"
+COM_CONTENTHISTORY_BUTTON_SELECT_ONE="Please select one version."
+COM_CONTENTHISTORY_BUTTON_SELECT_TWO="Please select two versions."
+COM_CONTENTHISTORY_CHARACTER_COUNT="Character Count"
+COM_CONTENTHISTORY_COMPARE_DIFF="Changes"
+COM_CONTENTHISTORY_COMPARE_TITLE="Compare View"
+COM_CONTENTHISTORY_COMPARE_VALUE1="Saved on %s %s"
+COM_CONTENTHISTORY_COMPARE_VALUE2="Saved on %s %s"
+COM_CONTENTHISTORY_ERROR_KEEP_NOT_PERMITTED="You are not permitted to change the keep forever status."
+COM_CONTENTHISTORY_KEEP_VERSION="Keep Forever"
+COM_CONTENTHISTORY_MODAL_TITLE="Item Version History"
+COM_CONTENTHISTORY_N_ITEMS_DELETED_1="%s history version deleted."
+COM_CONTENTHISTORY_N_ITEMS_DELETED="%s history versions deleted."
+COM_CONTENTHISTORY_N_ITEMS_KEEP_TOGGLE_1="Successfully changed the keep forever value for %s history version."
+COM_CONTENTHISTORY_N_ITEMS_KEEP_TOGGLE="Successfully changed the keep forever value for %s history versions."
+COM_CONTENTHISTORY_NO_ITEM_SELECTED="No history version selected."
+COM_CONTENTHISTORY_PREVIEW_FIELD="Field"
+COM_CONTENTHISTORY_PREVIEW_SUBTITLE_DATE="Preview of version from %s"
+COM_CONTENTHISTORY_PREVIEW_SUBTITLE="Version note: %s"
+COM_CONTENTHISTORY_PREVIEW_TITLE="Preview of Selected Item"
+COM_CONTENTHISTORY_PREVIEW_VALUE="Value"
+COM_CONTENTHISTORY_VERSION_NOTE="Version Note"
+
diff --git a/core/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini b/core/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
new file mode 100644
index 00000000..dcdc1dd7
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTENTHISTORY="Content History"
+COM_CONTENTHISTORY_XML_DESCRIPTION="Content History Component."
diff --git a/core/administrator/language/en-GB/en-GB.com_cpanel.ini b/core/administrator/language/en-GB/en-GB.com_cpanel.ini
new file mode 100644
index 00000000..febcd316
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_cpanel.ini
@@ -0,0 +1,39 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CPANEL="Control Panel"
+COM_CPANEL_HEADER_SUBMENU="Submenu"
+COM_CPANEL_HEADER_SYSTEM="System"
+COM_CPANEL_LINK_CHECKIN="Global Check-in"
+COM_CPANEL_LINK_CLEAR_CACHE="Clear Cache"
+COM_CPANEL_LINK_DASHBOARD="Dashboard"
+COM_CPANEL_LINK_EXTENSIONS="Install Extensions"
+COM_CPANEL_LINK_GLOBAL_CONFIG="Global Configuration"
+COM_CPANEL_LINK_SYSINFO="System Information"
+COM_CPANEL_MESSAGES_BODY_NOCLOSE="There are important post-installation messages that require your attention."
+COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE="This information area won't appear when you have hidden all the messages."
+COM_CPANEL_MESSAGES_REVIEW="Read Messages"
+COM_CPANEL_MESSAGES_TITLE="You have post-installation messages"
+COM_CPANEL_MSG_EACCELERATOR_BODY="eAccelerator is not compatible with Joomla! By selecting the Change to File Caching button below we will change the cache handler to file. If you want to use a different cache handler, please change it in the Global Configuration page."
+COM_CPANEL_MSG_EACCELERATOR_BUTTON="Change to File."
+COM_CPANEL_MSG_EACCELERATOR_TITLE="eAccelerator is not compatible with Joomla!"
+COM_CPANEL_MSG_HTACCESS_BODY="A change to the default .htaccess and web.config files was made in Joomla! 3.4 to disallow folder listings by default.  Users are recommended to implement this change in their files.  Please see <a href="_QQ_"https://docs.joomla.org/Special:MyLanguage/Preconfigured_htaccess"_QQ_">this page</a> for more information."
+COM_CPANEL_MSG_HTACCESS_TITLE=".htaccess & web.config Update"
+COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_TITLE="Prepare for the next Major Release of Joomla"
+COM_CPANEL_MSG_JOOMLA40_PRE_CHECKS_BODY="<p>Beginning with Joomla! 4.0 we are raising the minimum server requirements. If you are seeing this message then your current configuration does not meet these new minimum requirements.</p><p>The <a href="_QQ_"https://developer.joomla.org/news/704-looking-forward-with-joomla-4.html"_QQ_"><strong>minimum</strong> requirements</a> are the following:</p><ul><li>PHP 7.0</li><li>MySQL 5.5.3</li><li>PostgreSQL 9.2</li><li>MS SQL will <strong>not</strong> be supported</li><li>MySQL using the legacy `ext/mysql` PHP extension will <strong>not</strong> be supported, MySQLi or PDO MySQL must be used instead</li></ul><p>Please contact your hosting provider to ask how you can meet these raised server requirements - it is usually a very simple change. If you already meet these new requirements then this message will not be displayed.</p>"
+COM_CPANEL_MSG_LANGUAGEACCESS340_TITLE="You have possible issues with your multilingual settings"
+COM_CPANEL_MSG_LANGUAGEACCESS340_BODY="Since Joomla! 3.4.0 you may have issues with the System - Language Filter plugin on your website. To fix them please open the <a href="_QQ_"index.php?option=com_languages&view=languages"_QQ_">Language Manager</a> and save each content language manually to make sure an Access level is saved."
+; The following two strings are deprecated and will be removed with 4.0
+COM_CPANEL_MSG_PHPVERSION_BODY="Beginning with Joomla! 3.3, the version of PHP this site is using will no longer be supported. Joomla! 3.3 will require at least <a href="_QQ_"https://community.joomla.org/blogs/leadership/1798-raising-the-bar-on-security.html"_QQ_">PHP version 5.3.10 to provide enhanced security features to its users</a>."
+COM_CPANEL_MSG_PHPVERSION_TITLE="Your PHP Version Will Be Unsupported in Joomla! 3.3"
+COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
+COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in Joomla! 3.3 to allow Google to access templates and media files by default to improve SEO. This change is not applied automatically on upgrades and users are recommended to review the changes in the robots.txt.dist file and implement these changes in their own robots.txt file."
+COM_CPANEL_MSG_STATS_COLLECTION_BODY="<p>Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.</p><p>This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.</p><p>In the interest of full transparency and to help developers <a href="_QQ_"https://developer.joomla.org/about/stats.html"_QQ_">this data is publicly available.</a> An API and graphs will show the Joomla version, PHP versions and database engines in use.</p><p>If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics.</p>"
+COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="<p>As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site.</p><p>The changed settings are:</p><ul><li>Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default Blacklist\"</li><li>Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default</li><li>Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded</li><li>Articles > Show Email: The option to show an email icon with articles is disabled by default</li></ul><p>We have created a <a href=\"https://docs.joomla.org/Special:MyLanguage/J3.x:Joomla_3.8.8_notes_about_the_changed_default_settings\">dedicated documentation page</a> explaining these changes.</p>"
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations"
+COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href="_QQ_"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners"_QQ_">Joomla! Beginners Guide</a></li><li><a href="_QQ_"https://forum.joomla.org/viewforum.php?f=706"_QQ_">New to Joomla! Forum</a></li></ul>"
+COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
+COM_CPANEL_XML_DESCRIPTION="Control Panel component"
diff --git a/core/administrator/language/en-GB/en-GB.com_cpanel.sys.ini b/core/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
new file mode 100644
index 00000000..b8a55976
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CPANEL="Control Panel"
+COM_CPANEL_XML_DESCRIPTION="Control Panel component."
+
+COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE="Control Panel"
+COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE_DESC="Shows the Joomla! Administration Dashboard page."
diff --git a/core/administrator/language/en-GB/en-GB.com_fields.ini b/core/administrator/language/en-GB/en-GB.com_fields.ini
new file mode 100644
index 00000000..0c202fec
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_fields.ini
@@ -0,0 +1,105 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_FIELDS="Fields"
+COM_FIELDS_BATCH_GROUP_LABEL="To Move or Copy your selection please select a group."
+COM_FIELDS_BATCH_GROUP_OPTION_NONE="- No Group -"
+COM_FIELDS_ERROR_UNIQUE_NAME="Another Field has the same name (remember it may be a trashed item)."
+COM_FIELDS_FIELD_CLASS_DESC="The class attributes of the field in the edit form. If multiple classes are needed, list them with spaces."
+COM_FIELDS_FIELD_CLASS_LABEL="Edit Class"
+COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field renders."
+COM_FIELDS_FIELD_SHOWLABEL_LABEL="Show Label"
+COM_FIELDS_FIELD_DEFAULT_VALUE_DESC="The default value of the field."
+COM_FIELDS_FIELD_DEFAULT_VALUE_LABEL="Default Value"
+COM_FIELDS_FIELD_DESCRIPTION_DESC="A description of the field that will be displayed in the label tooltip."
+COM_FIELDS_FIELD_DISPLAY_AFTER_DISPLAY="After Display"
+COM_FIELDS_FIELD_DISPLAY_AFTER_TITLE="After Title"
+COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY="Before Display"
+COM_FIELDS_FIELD_DISPLAY_DESC="Joomla offers some content events which are triggered during the content creation process. This is the place to define how the custom fields should be integrated into content."
+COM_FIELDS_FIELD_DISPLAY_LABEL="Automatic Display"
+COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY="Do not automatically display"
+COM_FIELDS_FIELD_GROUP_DESC="The group this field belongs to."
+COM_FIELDS_FIELD_GROUP_LABEL="Field Group"
+COM_FIELDS_FIELD_PLACEHOLDER_DESC="Placeholder text which will appear inside the field as a hint to the user for the required input."
+COM_FIELDS_FIELD_PLACEHOLDER_LABEL="Placeholder"
+COM_FIELDS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images."
+COM_FIELDS_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_FIELDS_FIELD_IMAGE_DESC="Image label."
+COM_FIELDS_FIELD_IMAGE_LABEL="Image"
+COM_FIELDS_FIELD_INVALID_DEFAULT_VALUE="The default value is invalid."
+COM_FIELDS_FIELD_LABEL_DESC="The label of the field to display."
+COM_FIELDS_FIELD_LABEL_LABEL="Label"
+COM_FIELDS_FIELD_LANGUAGE_DESC="Assign a language to this field."
+COM_FIELDS_FIELD_NOTE_DESC="An optional note for the field."
+COM_FIELDS_FIELD_NOTE_LABEL="Note"
+COM_FIELDS_FIELD_PERMISSION_DELETE_DESC="New setting for <strong>delete actions</strong> on this field and the calculated setting based on the parent extension and group permissions."
+COM_FIELDS_FIELD_PERMISSION_EDITSTATE_DESC="New setting for <strong>edit state actions</strong> on this field and the calculated setting based on the parent extension and group permissions."
+COM_FIELDS_FIELD_PERMISSION_EDITVALUE_DESC="Who can edit the custom field value in the form editor?"
+COM_FIELDS_FIELD_PERMISSION_EDIT_DESC="New setting for <strong>edit actions</strong> on this field and the calculated setting based on the parent extension and group permissions."
+COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the field is rendered. If multiple classes are needed, list them with spaces."
+COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class"
+COM_FIELDS_FIELD_REQUIRED_DESC="Is this a mandatory field?"
+COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
+COM_FIELDS_FIELD_SHOW_ON_ADMIN="Administrator"
+COM_FIELDS_FIELD_SHOW_ON_BOTH="Both"
+COM_FIELDS_FIELD_SHOW_ON_DESC="On which part of the site should the field be shown?"
+COM_FIELDS_FIELD_SHOW_ON_LABEL="Show On"
+COM_FIELDS_FIELD_SHOW_ON_SITE="Site"
+COM_FIELDS_FIELD_TYPE_DESC="The type of the field."
+COM_FIELDS_FIELD_TYPE_LABEL="Type"
+COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"
+COM_FIELDS_GROUP_PERMISSION_CREATE_DESC="New setting for <strong>create actions</strong> in this field group and the calculated setting based on the parent extension permissions."
+COM_FIELDS_GROUP_PERMISSION_DELETE_DESC="New setting for <strong>delete actions</strong> on this field group and the calculated setting based on the parent extension permissions."
+COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC="New setting for <strong>edit own actions</strong> on this field group and the calculated setting based on the parent extension permissions."
+COM_FIELDS_GROUP_PERMISSION_EDITSTATE_DESC="New setting for <strong>edit state actions</strong> on this field group and the calculated setting based on the parent extension permissions."
+COM_FIELDS_GROUP_PERMISSION_EDITVALUE_DESC="Who can edit the field value in the form editor."
+COM_FIELDS_GROUP_PERMISSION_EDIT_DESC="New setting for <strong>edit actions</strong> on this field group and the calculated setting based on the parent extension permissions."
+COM_FIELDS_MUSTCONTAIN_A_TITLE_FIELD="Field must have a title."
+COM_FIELDS_MUSTCONTAIN_A_TITLE_GROUP="Field Group must have a title."
+COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved"
+COM_FIELDS_FIELD_N_ITEMS_ARCHIVED="%d fields archived"
+COM_FIELDS_FIELD_N_ITEMS_ARCHIVED_1="%d field archived"
+COM_FIELDS_FIELD_N_ITEMS_CHECKED_IN="%d fields checked in"
+COM_FIELDS_FIELD_N_ITEMS_CHECKED_IN_0="No field checked in"
+COM_FIELDS_FIELD_N_ITEMS_CHECKED_IN_1="%d field checked in"
+COM_FIELDS_FIELD_N_ITEMS_DELETED="%d fields deleted"
+COM_FIELDS_FIELD_N_ITEMS_DELETED_1="%d field deleted"
+COM_FIELDS_FIELD_N_ITEMS_PUBLISHED="%d fields published"
+COM_FIELDS_FIELD_N_ITEMS_PUBLISHED_1="%d field published"
+COM_FIELDS_FIELD_N_ITEMS_TRASHED="%d fields trashed"
+COM_FIELDS_FIELD_N_ITEMS_TRASHED_1="%d field trashed"
+COM_FIELDS_FIELD_N_ITEMS_UNPUBLISHED="%d fields unpublished"
+COM_FIELDS_FIELD_N_ITEMS_UNPUBLISHED_1="%d field unpublished"
+COM_FIELDS_GROUP_SAVE_SUCCESS="Field Group saved"
+COM_FIELDS_GROUP_N_ITEMS_ARCHIVED="%d field groups archived"
+COM_FIELDS_GROUP_N_ITEMS_ARCHIVED_1="%d field group archived"
+COM_FIELDS_GROUP_N_ITEMS_CHECKED_IN="%d field groups checked in"
+COM_FIELDS_GROUP_N_ITEMS_CHECKED_IN_0="No field group checked in"
+COM_FIELDS_GROUP_N_ITEMS_CHECKED_IN_1="%d field group checked in"
+COM_FIELDS_GROUP_N_ITEMS_DELETED="%d field groups deleted"
+COM_FIELDS_GROUP_N_ITEMS_DELETED_1="%d field group deleted"
+COM_FIELDS_GROUP_N_ITEMS_PUBLISHED="%d field groups published"
+COM_FIELDS_GROUP_N_ITEMS_PUBLISHED_1="%d field group published"
+COM_FIELDS_GROUP_N_ITEMS_TRASHED="%d field groups trashed"
+COM_FIELDS_GROUP_N_ITEMS_TRASHED_1="%d field group trashed"
+COM_FIELDS_GROUP_N_ITEMS_UNPUBLISHED="%d field groups unpublished"
+COM_FIELDS_GROUP_N_ITEMS_UNPUBLISHED_1="%d field group unpublished"
+COM_FIELDS_SYSTEM_PLUGIN_NOT_ENABLED="The <a href="_QQ_"%s"_QQ_">System - Fields</a> plugin is disabled. Custom fields will not display until you enable this plugin."
+COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS="Batch process the selected fields."
+COM_FIELDS_VIEW_FIELDS_SELECT_GROUP="- Select Field Group -"
+COM_FIELDS_VIEW_FIELDS_SELECT_CATEGORY="- Select Assigned Category -"
+COM_FIELDS_VIEW_FIELDS_SORT_GROUP_ASC="Field Group ascending"
+COM_FIELDS_VIEW_FIELDS_SORT_GROUP_DESC="Field Group descending"
+COM_FIELDS_VIEW_FIELDS_SORT_TYPE_ASC="Type ascending"
+COM_FIELDS_VIEW_FIELDS_SORT_TYPE_DESC="Type descending"
+COM_FIELDS_VIEW_FIELDS_TITLE="%s: Fields"
+COM_FIELDS_VIEW_FIELD_ADD_TITLE="%s: New Field"
+COM_FIELDS_VIEW_FIELD_EDIT_TITLE="%s: Edit Field"
+COM_FIELDS_VIEW_FIELD_FIELDSET_GENERAL="General"
+COM_FIELDS_VIEW_GROUPS_BATCH_OPTIONS="Batch process the selected field groups."
+COM_FIELDS_VIEW_GROUPS_TITLE="%s: Field Groups"
+COM_FIELDS_VIEW_GROUP_ADD_TITLE="%s: New Field Group"
+COM_FIELDS_VIEW_GROUP_EDIT_TITLE="%s: Edit Field Group"
+COM_FIELDS_XML_DESCRIPTION="Component to manage custom fields."
diff --git a/core/administrator/language/en-GB/en-GB.com_fields.sys.ini b/core/administrator/language/en-GB/en-GB.com_fields.sys.ini
new file mode 100644
index 00000000..7363e71d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_fields.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_FIELDS="Fields"
+COM_FIELDS_XML_DESCRIPTION="Component to manage custom fields."
diff --git a/core/administrator/language/en-GB/en-GB.com_finder.ini b/core/administrator/language/en-GB/en-GB.com_finder.ini
new file mode 100644
index 00000000..6a3b7474
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_finder.ini
@@ -0,0 +1,242 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_FINDER="Smart Search"
+COM_FINDER_ALLOW_EMPTY_QUERY_DESC="Only if a filter is selected, allow an empty search string to initiate a search within the filter constraints."
+COM_FINDER_ALLOW_EMPTY_QUERY_LABEL="Allow Empty Search"
+COM_FINDER_AN_ERROR_HAS_OCCURRED="An Error Has Occurred"
+COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_DESCRIPTION="Only if a filter is selected, allow an empty search string to initiate a search within the filter restraints."
+COM_FINDER_CONFIG_ALLOW_EMPTY_QUERY_LABEL="Allow Empty Search"
+COM_FINDER_CONFIG_BATCH_SIZE_DESCRIPTION="The batch size controls how many items are processed per batch. Large batch sizes require lots of memory whereas small batch sizes require less memory but execute more requests which tends to take longer."
+COM_FINDER_CONFIG_BATCH_SIZE_LABEL="Indexer Batch Size"
+COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESC="Description text for search results will be truncated to the specified character length."
+COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION="Description text for search results will be truncated to the specified character length."
+COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL="Description Length"
+COM_FINDER_CONFIG_ENABLE_LOGGING_DESCRIPTION="Enable this option to create a log file in your site's logs folder during the index process. This file is useful for troubleshooting issues with the index process. It is recommended that logging be disabled unless necessary."
+COM_FINDER_CONFIG_ENABLE_LOGGING_LABEL="Enable Logging"
+COM_FINDER_CONFIG_EXPAND_ADVANCED_DESC="Toggle if the advanced search options should be expanded by default."
+COM_FINDER_CONFIG_EXPAND_ADVANCED_DESCRIPTION="Toggle if the advanced search options should be expanded by default."
+COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL="Expand Advanced Search"
+COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESCRIPTION="Description displayed for this site as a search provider."
+COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL="OpenSearch Description"
+COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION="Name displayed for this site as a search provider."
+COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_LABEL="OpenSearch Name"
+COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_DESCRIPTION="Record the search phrases submitted by visitors."
+COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
+COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_DESCRIPTION="Toggle if search terms should be highlighted in search results."
+COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
+COM_FINDER_CONFIG_IMPORT_EXPORT="Import/Export"
+COM_FINDER_CONFIG_IMPORT_EXPORT_HELP="Help"
+COM_FINDER_CONFIG_IMPORT_EXPORT_INSTRUCTIONS="To export your configuration options, select the Export button in the toolbar above.<br /><br />To import an existing configuration, select the browse button to choose a file from your hard drive or copy/paste the data into the text field below and then select the Import button in the toolbar above."
+COM_FINDER_CONFIG_IMPORT_FROM_FILE="Import From File:"
+COM_FINDER_CONFIG_IMPORT_FROM_STRING="Import From Text:"
+COM_FINDER_CONFIG_IMPORT_TOOLBAR_TITLE="Smart Search: Import/Export Configuration"
+COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_DESCRIPTION="The memory table limit should not be changed unless you are getting errors indicating that the finder_tokens or finder_tokens_aggregate tables are full. The default is 30,000."
+COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_LABEL="Memory Table Limit"
+COM_FINDER_CONFIG_META_MULTIPLIER_DESCRIPTION="The multiplier is used to control how much influence matching text has on the overall relevance score of a search result. A multiplier is considered in relationship to the other multipliers. The metadata comes from a number of sources including the meta keywords and meta description, author names, etc."
+COM_FINDER_CONFIG_META_MULTIPLIER_LABEL="Metadata Weight Multiplier"
+COM_FINDER_CONFIG_MISC_MULTIPLIER_DESCRIPTION="The multiplier is used to control how much influence matching text has on the overall relevance score of a search result. A multiplier is considered in relationship to the other multipliers. The miscellaneous text comes from a number of sources including comments and other associated data."
+COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL="Misc. Text Weight Multiplier"
+COM_FINDER_CONFIG_PATH_MULTIPLIER_DESCRIPTION="The multiplier is used to control how much influence matching text has on the overall relevance score of a search result. A multiplier is considered in relationship to the other multipliers. The path text comes from the SEF URL of the content."
+COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL="Path Text Weight Multiplier"
+COM_FINDER_CONFIG_SHOW_ADVANCED_DESC="Toggle if users should be able to see advanced search options."
+COM_FINDER_CONFIG_SHOW_ADVANCED_DESCRIPTION="Toggle if users should be able to see advanced search options."
+COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL="Advanced Search"
+COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_DESCRIPTION="Toggle if users should be able to see advanced search tips."
+COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_LABEL="Advanced Tips"
+COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_DESCRIPTION="Toggle if automatic search suggestions should be displayed."
+COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_LABEL="Search Suggestions"
+COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESC="Show the start and end date filters in the advanced search."
+COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESCRIPTION="Show the start and end date filters in the advanced search."
+COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL="Date Filters"
+COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESC="Toggle if the description should be displayed with search results."
+COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESCRIPTION="Toggle if the description should be displayed with search results."
+COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL="Result Description"
+COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC="Show or hide a detailed explanation of the search requested."
+COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL="Query Explanation"
+; The following 4 strings are deprecated and will be removed with 4.0.
+COM_FINDER_CONFIG_SHOW_FEED_DESC="Show the syndication feed link."
+COM_FINDER_CONFIG_SHOW_FEED_LABEL="Show Feed"
+COM_FINDER_CONFIG_SHOW_FEED_TEXT_DESC="Show the associated text with the feed, otherwise the title is shown in the feed."
+COM_FINDER_CONFIG_SHOW_FEED_TEXT_LABEL="Show Feed Text"
+COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC="Whether to suggest alternative search terms when a search produces no results."
+COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL="Did You Mean"
+COM_FINDER_CONFIG_SHOW_URL_DESC="Show the associated URL that for the item."
+COM_FINDER_CONFIG_SHOW_URL_DESCRIPTION="Show the associated URL for the item."
+COM_FINDER_CONFIG_SHOW_URL_LABEL="Result URL"
+COM_FINDER_CONFIG_SORT_DIRECTION_DESC="The direction in which to sort the search results."
+COM_FINDER_CONFIG_SORT_DIRECTION_LABEL="Sort Direction"
+COM_FINDER_CONFIG_SORT_OPTION_ASCENDING="Ascending"
+COM_FINDER_CONFIG_SORT_OPTION_DESCENDING="Descending"
+COM_FINDER_CONFIG_SORT_OPTION_LIST_PRICE="List price"
+COM_FINDER_CONFIG_SORT_OPTION_RELEVANCE="Relevance"
+COM_FINDER_CONFIG_SORT_OPTION_START_DATE="Date"
+COM_FINDER_CONFIG_SORT_ORDER_DESC="The field on which to sort the search results."
+COM_FINDER_CONFIG_SORT_ORDER_LABEL="Sort Field"
+COM_FINDER_CONFIG_STEMMER_DESCRIPTION="The language stemmer to use. Choose snowball if a stemmer for your language is not available or you have multilingual content."
+COM_FINDER_CONFIG_STEMMER_ENABLE_DESCRIPTION="Enable language stemming if available."
+COM_FINDER_CONFIG_STEMMER_ENABLE_LABEL="Enable Stemmer"
+COM_FINDER_CONFIG_STEMMER_FR="French Only"
+COM_FINDER_CONFIG_STEMMER_LABEL="Stemmer"
+COM_FINDER_CONFIG_STEMMER_PORTER_EN="English Only"
+COM_FINDER_CONFIG_STEMMER_SNOWBALL="Snowball"
+COM_FINDER_CONFIG_TEXT_MULTIPLIER_DESCRIPTION="The multiplier is used to control how much influence matching text has on the overall relevance score of a search result. A multiplier is considered in relationship to the other multipliers. The body text comes from the summary and/or body of the content."
+COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL="Body Text Weight Multiplier"
+COM_FINDER_CONFIG_TITLE_MULTIPLIER_DESCRIPTION="The multiplier is used to control how much influence matching text has on the overall relevance score of a search result. A multiplier is considered in relationship to the other multipliers. The title text comes from the title of the content."
+COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL="Title Text Weight Multiplier"
+COM_FINDER_CONFIGURATION="Smart Search: Options"
+COM_FINDER_CREATE_FILTER="Create a filter."
+COM_FINDER_EDIT_FILTER="Edit Filter"
+COM_FINDER_EXPORT="Export"
+COM_FINDER_FIELD_CREATED_BY_ALIAS_DESC="Displayed name of the filter creator."
+COM_FINDER_FIELD_CREATED_BY_ALIAS_LABEL="Alias"
+COM_FINDER_FIELD_CREATED_BY_DESC="Creator of the filter."
+COM_FINDER_FIELD_CREATED_BY_LABEL="Created By"
+COM_FINDER_FIELD_MODIFIED_DESCRIPTION="The date and time that the filter was last modified."
+COM_FINDER_FIELDSET_INDEX_OPTIONS_DESCRIPTION="Indexing options"
+COM_FINDER_FIELDSET_INDEX_OPTIONS_LABEL="Index"
+COM_FINDER_FIELDSET_SEARCH_OPTIONS_DESCRIPTION="Smart Search options"
+COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL="Smart Search"
+COM_FINDER_FILTER_BRANCH_LABEL="Search by %s"
+COM_FINDER_FILTER_BY="Show %s:"
+COM_FINDER_FILTER_CONTENT_MAP_DESC="Filter the indexed content by content map."
+COM_FINDER_FILTER_CONTENT_MAP_LABEL="Select the Content Map"
+COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE="Smart Search: Edit Filter"
+COM_FINDER_FILTER_END_DATE_DESCRIPTION="Format YYYY-MM-DD"
+COM_FINDER_FILTER_END_DATE_LABEL="End Date"
+COM_FINDER_FILTER_FIELDSET_DETAILS="Filter Details"
+COM_FINDER_FILTER_FIELDSET_PARAMS="Filter Timeline"
+COM_FINDER_FILTER_HIDE_ALL="Collapse all"
+COM_FINDER_FILTER_MAP_COUNT="Map Count"
+COM_FINDER_FILTER_MAP_COUNT_DESCRIPTION="The number of maps included in the filter."
+COM_FINDER_FILTER_NEW_TOOLBAR_TITLE="Smart Search: New Filter"
+COM_FINDER_FILTER_SEARCH_DESCRIPTION="Filter the list by a title."
+COM_FINDER_FILTER_SELECT_CONTENT_MAP="- Select Content Map -"
+COM_FINDER_FILTER_SELECT_ALL_LABEL="Search All"
+COM_FINDER_FILTER_START_DATE_DESCRIPTION="Format YYYY-MM-DD"
+COM_FINDER_FILTER_START_DATE_LABEL="Start Date"
+COM_FINDER_FILTER_TIMESTAMP="Created On"
+COM_FINDER_FILTER_SHOW_ALL="Expand all"
+COM_FINDER_FILTER_TITLE_DESCRIPTION="The title of the filter."
+COM_FINDER_FILTER_WHEN_AFTER="After"
+COM_FINDER_FILTER_WHEN_BEFORE="Before"
+COM_FINDER_FILTER_WHEN_END_DATE_DESCRIPTION="When to search relative to the end date (before, after or exactly)"
+COM_FINDER_FILTER_WHEN_END_DATE_LABEL="When (End Date)"
+COM_FINDER_FILTER_WHEN_EXACTLY="Exactly"
+COM_FINDER_FILTER_WHEN_START_DATE_DESCRIPTION="When to search relative to the start date (before, after or exactly)"
+COM_FINDER_FILTER_WHEN_START_DATE_LABEL="When (Start Date)"
+COM_FINDER_FILTERS="Filters"
+COM_FINDER_FILTERS_DELETE_CONFIRMATION="Are you sure you want to delete the selected filters(s)?"
+COM_FINDER_FILTERS_TOOLBAR_TITLE="Smart Search: Search Filters"
+COM_FINDER_GO="Go"
+COM_FINDER_HEADING_CHILDREN="Maps"
+COM_FINDER_HEADING_CREATED_BY="Created By"
+COM_FINDER_HEADING_CREATED_BY_ASC="Created By ascending"
+COM_FINDER_HEADING_CREATED_BY_DESC="Created By descending"
+COM_FINDER_HEADING_CREATED_ON="Created On"
+COM_FINDER_HEADING_CREATED_ON_ASC="Created On ascending"
+COM_FINDER_HEADING_CREATED_ON_DESC="Created On descending"
+COM_FINDER_HEADING_INDEXER="Smart Search Indexer"
+COM_FINDER_HEADING_MAP_COUNT="Map Count"
+COM_FINDER_HEADING_MAP_COUNT_ASC="Map Count ascending"
+COM_FINDER_HEADING_MAP_COUNT_DESC="Map Count descending"
+COM_FINDER_HEADING_NODES="Items"
+COM_FINDER_IMPORT="Import"
+COM_FINDER_INDEX="Index"
+COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selected item(s)?"
+COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT="Are you sure you want to delete ALL items from the index? This can take a long time on large sites."
+COM_FINDER_INDEX_DATE_INFO="<strong>Published Start:</strong> %s<br /><strong>Published End:</strong> %s<br /><strong>Content Start:</strong> %s<br /><strong>Content End:</strong> %s"
+COM_FINDER_INDEX_DATE_INFO_TITLE="Link Date Information"
+COM_FINDER_INDEX_FILTER_BY_STATE="Any Published State"
+COM_FINDER_INDEX_HEADING_DETAILS="Details"
+COM_FINDER_INDEX_HEADING_INDEX_DATE="Last Updated"
+COM_FINDER_INDEX_HEADING_INDEX_DATE_ASC="Last Updated ascending"
+COM_FINDER_INDEX_HEADING_INDEX_DATE_DESC="Last Updated descending"
+COM_FINDER_INDEX_HEADING_INDEX_TYPE="Type"
+COM_FINDER_INDEX_HEADING_INDEX_TYPE_ASC="Type ascending"
+COM_FINDER_INDEX_HEADING_INDEX_TYPE_DESC="Type descending"
+COM_FINDER_INDEX_HEADING_LINK_URL="Raw URL"
+COM_FINDER_INDEX_HEADING_LINK_URL_ASC="Raw URL ascending"
+COM_FINDER_INDEX_HEADING_LINK_URL_DESC="Raw URL descending"
+COM_FINDER_INDEX_NO_CONTENT="No content matches your search criteria."
+COM_FINDER_INDEX_NO_DATA="No content has been indexed."
+COM_FINDER_INDEX_PLUGIN_CONTENT_NOT_ENABLED="The <a href="_QQ_"%s"_QQ_">Smart Search Content Plugin</a> is disabled. Changes to content will not update the Smart Search index if you do not enable this plugin."
+COM_FINDER_INDEX_PURGE_FAILED="Failed to delete selected items."
+COM_FINDER_INDEX_PURGE_SUCCESS="All items have been deleted."
+COM_FINDER_INDEX_SEARCH_DESC="Search in title, URL and last updated date."
+COM_FINDER_INDEX_SEARCH_LABEL="Search Indexed Content"
+COM_FINDER_INDEX_TIP="Start the indexer by pressing the Index button in the toolbar."
+COM_FINDER_INDEX_TOOLBAR_PURGE="Clear Index"
+COM_FINDER_INDEX_TOOLBAR_TITLE="Smart Search: Indexed Content"
+COM_FINDER_INDEX_TYPE_FILTER="Any Type of Content"
+COM_FINDER_INDEXER_HEADER_COMPLETE="Indexing Complete"
+COM_FINDER_INDEXER_HEADER_ERROR="An Error Has Occurred"
+COM_FINDER_INDEXER_HEADER_INIT="Starting Indexer"
+COM_FINDER_INDEXER_HEADER_OPTIMIZE="Optimising Index"
+COM_FINDER_INDEXER_HEADER_RUNNING="Indexer Running"
+COM_FINDER_INDEXER_INVALID_DRIVER="The indexer does not support processing on the %s database driver."
+COM_FINDER_INDEXER_INVALID_PARSER="Invalid parser type %s"
+COM_FINDER_INDEXER_INVALID_STEMMER="Invalid stemmer type %s"
+COM_FINDER_INDEXER_MESSAGE_COMPLETE="The indexing process is complete. It is now safe to close this window."
+COM_FINDER_INDEXER_MESSAGE_INIT="The indexer is starting. Do not close this window."
+COM_FINDER_INDEXER_MESSAGE_OPTIMIZE="The index tables are being optimised for the best possible performance. Do not close this window."
+COM_FINDER_INDEXER_MESSAGE_RUNNING="Your content is being indexed. Do not close this window."
+COM_FINDER_ITEM_X_ONLY="%s Only"
+COM_FINDER_ITEMS="Content"
+COM_FINDER_MAP_PUBLISH_FAILED="The selected map(s) could not be published. The returned error message is: %s."
+COM_FINDER_MAP_PUBLISH_SUCCESS="The selected map(s) were published."
+COM_FINDER_MAP_UNPUBLISH_FAILED="The selected map(s) could not be unpublished. The returned error message is: %s."
+COM_FINDER_MAP_UNPUBLISH_SUCCESS="The selected map(s) were unpublished."
+COM_FINDER_MAPS="Maps"
+COM_FINDER_MAPS_BRANCH_LINK="Select to show the children in this branch."
+COM_FINDER_MAPS_BRANCHES="Branches Only"
+COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selected map(s)?"
+COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS="Published Indexed Content"
+COM_FINDER_MAPS_COUNT_UNPUBLISHED_ITEMS="Unpublished Indexed Content"
+COM_FINDER_MAPS_MULTILANG="Note: Language filter system plugin has been enabled, so this branch will not be used."
+COM_FINDER_MAPS_NO_CONTENT="No results to display. Either no content has been indexed or no content meets your filter criteria."
+COM_FINDER_MAPS_RETURN_TO_BRANCHES="Return to Map Groups"
+COM_FINDER_MAPS_SELECT_BRANCH="- Select Map Group -"
+COM_FINDER_MAPS_SELECT_TYPE="- Select Type of Content -"
+COM_FINDER_MAPS_TOOLBAR_TITLE="Smart Search: Content Maps"
+COM_FINDER_MESSAGE_RETURNED="The following message was returned by the server:"
+COM_FINDER_N_ITEMS_CHECKED_IN_0="No item checked in."
+COM_FINDER_N_ITEMS_CHECKED_IN_1="%d item checked in."
+COM_FINDER_N_ITEMS_CHECKED_IN_MORE="%d items checked in."
+COM_FINDER_N_ITEMS_DELETED="%d items deleted."
+COM_FINDER_N_ITEMS_DELETED_1="%d item deleted."
+COM_FINDER_N_ITEMS_PUBLISHED="%d items published."
+COM_FINDER_N_ITEMS_PUBLISHED_1="%d item published."
+COM_FINDER_N_ITEMS_TRASHED="%d items trashed."
+COM_FINDER_N_ITEMS_TRASHED_1="%d item trashed."
+COM_FINDER_N_ITEMS_UNPUBLISHED="%d items unpublished."
+COM_FINDER_N_ITEMS_UNPUBLISHED_1="%d item unpublished."
+COM_FINDER_NO_ERROR_RETURNED="No error was returned. Make sure error reporting is enabled."
+COM_FINDER_NO_FILTERS="No filters have been created yet."
+COM_FINDER_NO_RESULTS="No results match your search criteria."
+COM_FINDER_NO_RESULTS_OR_FILTERS="No results match your search criteria or no filters have been created yet."
+COM_FINDER_QUERY_FILTER_TODAY="Today"
+COM_FINDER_QUERY_OPERATOR_AND="And"
+COM_FINDER_QUERY_OPERATOR_NOT="Not"
+COM_FINDER_QUERY_OPERATOR_OR="Or"
+COM_FINDER_SEARCH_FILTER_SEARCH_DESC="Search in filter title."
+COM_FINDER_SEARCH_FILTER_SEARCH_LABEL="Search Filters"
+COM_FINDER_SEARCH_LABEL="Search %s:"
+COM_FINDER_SEARCH_SEARCH_QUERY_DESC="Search in content map title."
+COM_FINDER_SEARCH_SEARCH_QUERY_LABEL="Search Content Maps"
+COM_FINDER_SELECT_SEARCH_FILTER="Select filter"
+COM_FINDER_STATISTICS="Statistics"
+COM_FINDER_STATISTICS_LINK_TYPE_COUNT="Count"
+COM_FINDER_STATISTICS_LINK_TYPE_HEADING="Link Type"
+COM_FINDER_STATISTICS_LINK_TYPE_TOTAL="Total"
+COM_FINDER_STATISTICS_STATS_DESCRIPTION="The indexed content on this site includes %s terms across %s links with %s attributes in %s branches."
+COM_FINDER_STATISTICS_TITLE="Smart Search Statistics"
+COM_FINDER_SUBMENU_FILTERS="Search Filters"
+COM_FINDER_SUBMENU_INDEX="Indexed Content"
+COM_FINDER_SUBMENU_MAPS="Content Maps"
+COM_FINDER_UPDATER_MESSAGE_COMPLETE="Smart Search is up to date."
+COM_FINDER_UPDATER_MESSAGE_OPTIMIZE="Smart Search is optimising."
+COM_FINDER_UPDATER_MESSAGE_PROCESS="Smart Search is updating."
+COM_FINDER_XML_DESCRIPTION="Smart Search."
diff --git a/core/administrator/language/en-GB/en-GB.com_finder.sys.ini b/core/administrator/language/en-GB/en-GB.com_finder.sys.ini
new file mode 100644
index 00000000..82e4efce
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_finder.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_FINDER="Smart Search"
+COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TEXT="The default search layout."
+COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TITLE="Search"
+COM_FINDER_XML_DESCRIPTION="Smart Search"
diff --git a/core/administrator/language/en-GB/en-GB.com_installer.ini b/core/administrator/language/en-GB/en-GB.com_installer.ini
new file mode 100644
index 00000000..28163f9e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_installer.ini
@@ -0,0 +1,276 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_INSTALLER="Installer"
+COM_INSTALLER_AUTHOR_INFORMATION="Author Information"
+COM_INSTALLER_CACHETIMEOUT_DESC="For how many hours should Joomla cache update information. This is also the cache time for the Update Notification Plugin, if enabled"
+COM_INSTALLER_CACHETIMEOUT_LABEL="Updates Caching (in hours)"
+COM_INSTALLER_CONFIGURATION="Installer: Options"
+COM_INSTALLER_CONFIRM_UNINSTALL="Are you sure you want to uninstall? Confirming will permanently delete the selected item(s)!"
+COM_INSTALLER_CURRENT_VERSION="Installed"
+COM_INSTALLER_DISCOVER_FILTER_SEARCH_DESC="Search in discovered extension name. Prefix with ID: to search for an extension ID."
+COM_INSTALLER_DISCOVER_FILTER_SEARCH_LABEL="Search Discovered Extensions"
+COM_INSTALLER_ENABLED_UPDATES_1=", 1 disabled site was enabled."
+COM_INSTALLER_ENABLED_UPDATES_MORE=", %s disabled sites were enabled."
+COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disable default template is not permitted."
+COM_INSTALLER_ERROR_METHOD="Method Not Implemented"
+COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED="No extensions selected."
+COM_INSTALLER_ERROR_NO_UPDATESITES_SELECTED="No update sites selected."
+COM_INSTALLER_EXTENSION_DISABLE="Disable extension"
+COM_INSTALLER_EXTENSION_DISABLED="Disabled extension"
+COM_INSTALLER_EXTENSION_ENABLE="Enable extension"
+COM_INSTALLER_EXTENSION_ENABLED="Enabled extension"
+COM_INSTALLER_EXTENSION_PACKAGE_FILE="Extension package file"
+COM_INSTALLER_EXTENSION_PROTECTED="Protected extension"
+COM_INSTALLER_EXTENSION_PUBLISHED="Extension enabled."
+COM_INSTALLER_EXTENSION_UNPUBLISHED="Extension disabled."
+COM_INSTALLER_FAILED_TO_ENABLE_UPDATES=", failed to enable updates"
+COM_INSTALLER_FILTER_LABEL="Search by Extension Name"
+COM_INSTALLER_HEADER_DATABASE="Extensions: Database"
+COM_INSTALLER_HEADER_DISCOVER="Extensions: Discover"
+COM_INSTALLER_HEADER_INSTALL="Extensions: Install"
+COM_INSTALLER_HEADER_LANGUAGES="Extensions: Install Languages"
+COM_INSTALLER_HEADER_MANAGE="Extensions: Manage"
+COM_INSTALLER_HEADER_UPDATE="Extensions: Update"
+COM_INSTALLER_HEADER_UPDATESITES="Extensions: Update Sites"
+COM_INSTALLER_HEADER_WARNINGS="Extensions: Warnings"
+COM_INSTALLER_HEADING_CLIENT="Client"
+COM_INSTALLER_HEADING_DETAILS_URL="Details URL"
+COM_INSTALLER_HEADING_DETAILSURL="URL Details"
+COM_INSTALLER_HEADING_FOLDER="Folder"
+COM_INSTALLER_HEADING_FOLDER_ASC="Folder ascending"
+COM_INSTALLER_HEADING_FOLDER_DESC="Folder descending"
+COM_INSTALLER_HEADING_ID="ID"
+COM_INSTALLER_HEADING_INSTALLTYPE="Install Type"
+COM_INSTALLER_HEADING_LANGUAGE_TAG="Language Tag"
+COM_INSTALLER_HEADING_LANGUAGE_TAG_ASC="Language Tag ascending"
+COM_INSTALLER_HEADING_LANGUAGE_TAG_DESC="Language Tag descending"
+COM_INSTALLER_HEADING_LOCATION="Location"
+COM_INSTALLER_HEADING_LOCATION_ASC="Location ascending"
+COM_INSTALLER_HEADING_LOCATION_DESC="Location descending"
+COM_INSTALLER_HEADING_NAME="Name"
+COM_INSTALLER_HEADING_NAME_ASC="Name ascending"
+COM_INSTALLER_HEADING_NAME_DESC="Name descending"
+COM_INSTALLER_HEADING_PACKAGE_ID="Package ID"
+COM_INSTALLER_HEADING_PACKAGE_ID_ASC="Package ID ascending"
+COM_INSTALLER_HEADING_PACKAGE_ID_DESC="Package ID descending"
+COM_INSTALLER_HEADING_TYPE="Type"
+COM_INSTALLER_HEADING_TYPE_ASC="Type ascending"
+COM_INSTALLER_HEADING_TYPE_DESC="Type descending"
+COM_INSTALLER_HEADING_UPDATESITE_NAME="Update Site"
+COM_INSTALLER_HEADING_UPDATESITE_NAME_ASC="Update Site ascending"
+COM_INSTALLER_HEADING_UPDATESITE_NAME_DESC="Update Site descending"
+COM_INSTALLER_HEADING_UPDATESITEID="ID"
+COM_INSTALLER_INSTALL_BUTTON="Install"
+COM_INSTALLER_INSTALL_DIRECTORY="Install Folder"
+COM_INSTALLER_INSTALL_ERROR="Error installing %s"
+COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
+COM_INSTALLER_INSTALL_FROM_URL="Install from URL"
+COM_INSTALLER_INSTALL_FROM_WEB="Install from Web"
+COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB="Add &quot;Install from Web&quot; tab"
+COM_INSTALLER_INSTALL_FROM_WEB_INFO="<a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://extensions.joomla.org"_QQ_" target="_QQ_"_blank"_QQ_">Joomla! Extensions Directory&trade; (JED)</a> now available with <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://docs.joomla.org/Special:MyLanguage/Install_from_Web"_QQ_" target="_QQ_"_blank"_QQ_">Install from Web</a> on this page."
+COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting "_QQ_"Add Install from Web tab"_QQ_" below, you agree to the JED <a class="_QQ_"alert-link"_QQ_" href="_QQ_"https://extensions.joomla.org/tos"_QQ_" target="_QQ_"_blank"_QQ_">Terms of Service</a> and all applicable third party license terms."
+COM_INSTALLER_INSTALL_LANGUAGE_SUCCESS="Installation of the <strong>%s</strong> language was successful."
+COM_INSTALLER_INSTALL_SUCCESS="Installation of the %s was successful."
+COM_INSTALLER_INSTALL_URL="Install URL"
+COM_INSTALLER_INVALID_EXTENSION_UPDATE="Invalid extension update"
+COM_INSTALLER_LABEL_HIDEPROTECTED_DESC="Hide protected extensions. Protected extensions can't be uninstalled."
+COM_INSTALLER_LABEL_HIDEPROTECTED_LABEL="Hide Protected Extensions"
+COM_INSTALLER_LANGUAGES_AVAILABLE_LANGUAGES="Available Languages"
+COM_INSTALLER_LANGUAGES_FILTER_SEARCH_DESC="Search in language name and language tag."
+COM_INSTALLER_LANGUAGES_FILTER_SEARCH_LABEL="Search Languages"
+COM_INSTALLER_MANAGE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID: to search for an extension ID."
+COM_INSTALLER_MANAGE_FILTER_SEARCH_LABEL="Search Extensions"
+COM_INSTALLER_MINIMUM_STABILITY_ALPHA="Alpha"
+COM_INSTALLER_MINIMUM_STABILITY_BETA="Beta"
+COM_INSTALLER_MINIMUM_STABILITY_DESC="The minimum stability of the extension updates you would like to see. Development is the least stable, Stable is production quality. If an extension doesn't specify a level it is assumed to be Stable."
+COM_INSTALLER_MINIMUM_STABILITY_DEV="Development"
+COM_INSTALLER_MINIMUM_STABILITY_LABEL="Minimum Stability"
+COM_INSTALLER_MINIMUM_STABILITY_STABLE="Stable"
+COM_INSTALLER_MINIMUM_STABILITY_RC="Release Candidate"
+COM_INSTALLER_MSG_DATABASE="This screen allows to you check that your database table structure is up to date with changes from the previous versions."
+COM_INSTALLER_MSG_DATABASE_ADD_COLUMN="Table %2$s does not have column %3$s. (From file %1$s.)"
+COM_INSTALLER_MSG_DATABASE_ADD_INDEX="Table %2$s does not have index %3$s. (From file %1$s.)"
+COM_INSTALLER_MSG_DATABASE_CHANGE_COLUMN_TYPE="Table %2$s has the wrong type or attributes for column %3$s with type %4$s. (From file %1$s.)"
+COM_INSTALLER_MSG_DATABASE_CHECKED_OK="%s database changes were checked."
+COM_INSTALLER_MSG_DATABASE_CREATE_TABLE="Table %2$s does not exist. (From file %1$s.)"
+COM_INSTALLER_MSG_DATABASE_DRIVER="Database driver: %s."
+COM_INSTALLER_MSG_DATABASE_DROP_COLUMN="Table %2$s should not have column %3$s. (From file %1$s.)"
+COM_INSTALLER_MSG_DATABASE_DROP_INDEX="Table %2$s should not have index %3$s. (From file %1$s.)"
+COM_INSTALLER_MSG_DATABASE_ERRORS="Warning: Database is not up to date!"
+COM_INSTALLER_MSG_DATABASE_FILTER_ERROR="No default text filters found."
+COM_INSTALLER_MSG_DATABASE_INFO="Other Information"
+COM_INSTALLER_MSG_DATABASE_OK="Database table structure is up to date."
+COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR="Database schema version (%s) does not match CMS version (%s)."
+COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION="Database schema version (in #__schemas): %s."
+COM_INSTALLER_MSG_DATABASE_SKIPPED="%s database changes did not alter table structure and were skipped."
+COM_INSTALLER_MSG_DATABASE_UPDATE_VERSION="Update version (in #__extensions): %s."
+COM_INSTALLER_MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match CMS version (%s)."
+COM_INSTALLER_MSG_DATABASE_UTF8_CONVERSION_UTF8="The Joomla! Core database tables have not been converted yet to UTF-8."
+COM_INSTALLER_MSG_DATABASE_UTF8_CONVERSION_UTF8MB4="The Joomla! Core database tables have not been converted yet to UTF-8 Multibyte (utf8mb4)."
+COM_INSTALLER_MSG_DESCFTP="For installing or uninstalling Extensions, Joomla will most likely need your FTP account details. Please enter them in the form fields below."
+COM_INSTALLER_MSG_DESCFTPTITLE="FTP Login Details"
+COM_INSTALLER_MSG_DISCOVER_DESCRIPTION="Discover extensions that have not gone through the normal installation process."
+COM_INSTALLER_MSG_DISCOVER_FAILEDTOPURGEEXTENSIONS="Failed to clear discovered extensions"
+COM_INSTALLER_MSG_DISCOVER_INSTALLFAILED="Discover install failed."
+COM_INSTALLER_MSG_DISCOVER_INSTALLSUCCESSFUL="Discover install successful."
+COM_INSTALLER_MSG_DISCOVER_NOEXTENSION="<strong>No extensions have been discovered.</strong> Select Discover to find new extensions that might be available for install."
+COM_INSTALLER_MSG_DISCOVER_NOEXTENSIONSELECTED="No extension selected."
+COM_INSTALLER_MSG_DISCOVER_PURGEDDISCOVEREDEXTENSIONS="Cleared discovered extensions."
+COM_INSTALLER_MSG_INSTALL_ENTER_A_URL="Please enter a URL"
+COM_INSTALLER_MSG_INSTALL_INVALID_URL="Invalid URL"
+COM_INSTALLER_MSG_INSTALL_NO_FILE_SELECTED="No file selected."
+COM_INSTALLER_MSG_INSTALL_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE="Path does not have a valid package."
+COM_INSTALLER_MSG_INSTALL_PLEASE_ENTER_A_PACKAGE_DIRECTORY="Please enter a package folder."
+COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY="Please select a folder."
+COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE="Please select a package location."
+COM_INSTALLER_MSG_INSTALL_WARNINSTALLFILE="The installer can't continue until file uploads are enabled for the server."
+COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR="There was an error uploading this file to the server."
+COM_INSTALLER_MSG_INSTALL_WARNINSTALLZLIB="The installer can't continue until Zlib is installed."
+COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_MANIFEST="The installer can't get the URL to the XML manifest file of the %s language."
+COM_INSTALLER_MSG_LANGUAGES_CANT_FIND_REMOTE_PACKAGE="The installer can't get the URL to the remote %s language."
+COM_INSTALLER_MSG_LANGUAGES_NOLANGUAGES="There are no available languages to install at the moment. Please select the &quot;Find languages&quot; button to check for updates on the Joomla! Languages server. You will need an internet connection for this to work."
+COM_INSTALLER_MSG_LANGUAGES_TRY_LATER="Try again later or <a href="_QQ_"https://community.joomla.org/translations/joomla-3-translations.html"_QQ_">contact the language team coordinator</a>."
+COM_INSTALLER_MSG_MANAGE_NOEXTENSION="There are no extensions installed matching your query."
+COM_INSTALLER_MSG_MANAGE_NOUPDATESITE="There are no update sites matching your query."
+COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL="%d Database Problems Found."
+COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL_1="1 Database Problem Found."
+COM_INSTALLER_MSG_UPDATE_ERROR="Error updating %s."
+COM_INSTALLER_MSG_UPDATE_NODESC="No description available for this item."
+COM_INSTALLER_MSG_UPDATE_NOUPDATES="There are no updates available at the moment. Please check again later."
+COM_INSTALLER_MSG_UPDATE_SITES_COUNT_CHECK="Some update sites are disabled. You may want to check the <a href="_QQ_"%s"_QQ_">Update Sites Manager</a>."
+COM_INSTALLER_MSG_UPDATE_SUCCESS="Updating %s was successful."
+COM_INSTALLER_MSG_UPDATE_UPDATE="Update"
+COM_INSTALLER_MSG_UPDATESITES_DELETE_ERROR="An error has occurred while trying to delete "_QQ_"%s"_QQ_" update site: %s."
+COM_INSTALLER_MSG_UPDATESITES_DELETE_CANNOT_DELETE="%s update site cannot be deleted."
+COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED="%s update sites have been deleted."
+COM_INSTALLER_MSG_UPDATESITES_N_DELETE_UPDATESITES_DELETED_1="1 update site has been deleted."
+COM_INSTALLER_MSG_UPDATESITES_REBUILD_EXTENSION_PLUGIN_NOT_ENABLED="The <a href="_QQ_"%s"_QQ_">Joomla Extension Plugin</a> is disabled. This plugin must be enabled to rebuild the update sites."
+COM_INSTALLER_MSG_UPDATESITES_REBUILD_MESSAGE="Update sites have been rebuilt. No extension with an update site has been discovered."
+COM_INSTALLER_MSG_UPDATESITES_REBUILD_NOT_PERMITTED="Rebuilding update sites is not permitted."
+COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered."
+COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt from manifest files."
+COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER="The update table is not up to date. Please <a href="_QQ_"index.php?option=com_installer&view=updatesites"_QQ_" target="_QQ_"_blank"_QQ_">rebuild your update server table</a>"
+COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings"
+COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information on warnings, see the <a href="_QQ_"https://docs.joomla.org"_QQ_" target="_QQ_"_blank"_QQ_">Joomla! Documentation Site</a>."
+COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions into the installer."
+COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled."
+COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set."
+COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSETDESC="The Joomla temporary folder is where Joomla copies an extension, extracts the extension and the files are copied into the correct directories. If this configuration is not set in configuration.php ($tmp_path) then you won't be able to upload extensions. Create a folder to enable Joomla to write to the folder to fix the issue."
+COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE="The Joomla temporary folder is not writable or does not exist."
+COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLEDESC="The Joomla temporary folder is not writeable by the Joomla instance, or may not exist, which may cause issues when trying to upload extensions to Joomla. If you are having issues uploading extensions, make sure the folder defined in your configuration.php exists or check the '%s' and set it to be writeable and see if this fixes the issue."
+COM_INSTALLER_MSG_WARNINGS_LOWMEMORYDESC="Low PHP memory limit."
+COM_INSTALLER_MSG_WARNINGS_LOWMEMORYWARN="Your PHP memory limit is set below 8MB which may cause some issues when installing large extensions. Please set your memory limit to at least 16MB."
+COM_INSTALLER_MSG_WARNINGS_MEDMEMORYDESC="Potentially low PHP memory limit."
+COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN="Your PHP memory limit is set below 16MB which may cause some issues when installing large extensions. Please set your memory limit to at least 16MB."
+COM_INSTALLER_MSG_WARNINGS_NONE="No warnings detected."
+COM_INSTALLER_MSG_WARNINGS_NOTCOMPLETE="<h1>Warning: Update Not Complete!</h1><p>The update is only partially complete. Please do the second update to complete the process.</p>"
+COM_INSTALLER_MSG_WARNINGS_NOTICE="There are some warnings detected."
+COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET="The PHP temporary folder is not set."
+COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC="The PHP temporary folder is the folder that PHP uses to store an uploaded file before Joomla can access this file. Whilst the folder not being set isn't always a problem, if you are having issues with manifest files not being detected or uploaded files not being detected, setting this in your php.ini file might fix the issue."
+COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE="The PHP temporary folder is not writeable."
+COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC="The PHP temporary folder is not writeable by the Joomla! instance, which may cause issues when trying to upload extensions to Joomla. If you are having issues uploading extensions, check the '%s' and set it to be writeable and see if this fixes the issue."
+COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size."
+COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and packages. This value is less than 8MB which may impact on uploading large packages. This is set in the php.ini under post_max_size."
+COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small: This is set in php.ini in both upload_max_filesize and post_max_size settings of your PHP settings (located in php.ini and/or .htaccess file)."
+COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large packages."
+COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation."
+COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST="PHP Upload Size bigger than POST size."
+COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC="The value of the upload_max_filesize in the php.ini file is greater than the post_max_size variable. The post_max_size variable will take precedence and block requests larger than it. This is generally a server misconfiguration when trying to increase upload sizes. Please increase the upload_max_filesize to at least match the post_max_size variable or vice versa."
+COM_INSTALLER_N_EXTENSIONS_PUBLISHED="%d extensions enabled."
+COM_INSTALLER_N_EXTENSIONS_PUBLISHED_1="%d extension enabled."
+COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED="%d extensions disabled."
+COM_INSTALLER_N_EXTENSIONS_UNPUBLISHED_1="%d extension disabled."
+COM_INSTALLER_N_UPDATESITES_PUBLISHED="%d update sites enabled."
+COM_INSTALLER_N_UPDATESITES_PUBLISHED_1="%d update site enabled."
+COM_INSTALLER_N_UPDATESITES_UNPUBLISHED="%d update sites disabled."
+COM_INSTALLER_N_UPDATESITES_UNPUBLISHED_1="%d update site disabled."
+COM_INSTALLER_NEW_INSTALL="New Install"
+COM_INSTALLER_NEW_VERSION="Available"
+COM_INSTALLER_NO_INSTALL_TYPE_FOUND="No Install Type Found"
+COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND="No installation plugin has been enabled. At least one must be enabled to be able to use the installer. Go to the <a href='index.php?option=com_plugins&view=plugins&filter[folder]=installer' title='Plugin Manager'>Plugin Manager</a> to enable the plugins."
+COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED="Failed to download package. Download it and install manually from <a href='%1$s'>%1$s</a>."
+COM_INSTALLER_PACKAGE_FILE="Package File"
+COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine tune how extensions installation and updates work."
+COM_INSTALLER_PREFERENCES_LABEL="Preferences"
+COM_INSTALLER_REINSTALL_BUTTON="Reinstall"
+COM_INSTALLER_SHOW_JED_INFORMATION_DESC="Show or hide the information at the top of the installer page about the Joomla! Extensions Directory&trade;."
+COM_INSTALLER_SHOW_JED_INFORMATION_HIDE_MESSAGE="Hide message"
+COM_INSTALLER_SHOW_JED_INFORMATION_LABEL="Joomla! Extensions Directory"
+COM_INSTALLER_SHOW_JED_INFORMATION_SHOW_MESSAGE="Show message"
+COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP="Opens Installer Options for setting to hide this Joomla! Extensions Directory&trade; message."
+COM_INSTALLER_SUBMENU_DATABASE="Database"
+COM_INSTALLER_SUBMENU_DISCOVER="Discover"
+COM_INSTALLER_SUBMENU_INSTALL="Install"
+COM_INSTALLER_SUBMENU_LANGUAGES="Install Languages"
+COM_INSTALLER_SUBMENU_MANAGE="Manage"
+COM_INSTALLER_SUBMENU_UPDATE="Update"
+COM_INSTALLER_SUBMENU_UPDATESITES="Update Sites"
+COM_INSTALLER_SUBMENU_WARNINGS="Warnings"
+COM_INSTALLER_TITLE_DATABASE="Extensions: Database"
+COM_INSTALLER_TITLE_DISCOVER="Extensions: Discover"
+COM_INSTALLER_TITLE_INSTALL="Extensions: Install"
+COM_INSTALLER_TITLE_LANGUAGES="Extensions: Install Languages"
+COM_INSTALLER_TITLE_MANAGE="Extension: Manage"
+COM_INSTALLER_TITLE_UPDATE="Extension: Update"
+COM_INSTALLER_TITLE_UPDATESITES="Extensions: Update Sites"
+COM_INSTALLER_TITLE_WARNINGS="Extensions: Warnings"
+COM_INSTALLER_TOOLBAR_DATABASE_FIX="Fix"
+COM_INSTALLER_TOOLBAR_DISCOVER="Discover"
+COM_INSTALLER_TOOLBAR_FIND_LANGUAGES="Find languages"
+COM_INSTALLER_TOOLBAR_FIND_UPDATES="Find Updates"
+COM_INSTALLER_TOOLBAR_INSTALL="Install"
+COM_INSTALLER_TOOLBAR_PURGE="Clear Cache"
+COM_INSTALLER_TOOLBAR_UPDATE="Update"
+COM_INSTALLER_TYPE_CLIENT="Location"
+COM_INSTALLER_TYPE_COMPONENT="Component"
+COM_INSTALLER_TYPE_FILE="File"
+COM_INSTALLER_TYPE_LANGUAGE="Language"
+COM_INSTALLER_TYPE_LIBRARY="Library"
+COM_INSTALLER_TYPE_MODULE="Module"
+COM_INSTALLER_TYPE_NONAPPLICABLE="N/A"
+COM_INSTALLER_TYPE_PACKAGE="Package"
+COM_INSTALLER_TYPE_PLUGIN="Plugin"
+COM_INSTALLER_TYPE_TEMPLATE="Template"
+COM_INSTALLER_TYPE_TYPE_COMPONENT="component"
+COM_INSTALLER_TYPE_TYPE_FILE="file"
+COM_INSTALLER_TYPE_TYPE_LANGUAGE="language"
+COM_INSTALLER_TYPE_TYPE_LIBRARY="library"
+COM_INSTALLER_TYPE_TYPE_MODULE="module"
+COM_INSTALLER_TYPE_TYPE_PACKAGE="package"
+COM_INSTALLER_TYPE_TYPE_PLUGIN="plugin"
+COM_INSTALLER_TYPE_TYPE_TEMPLATE="template"
+COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package"
+COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The Joomla package cannot be installed through the Extension Manager. Please use the <a href='%s'>Joomla! Update</a> component to update Joomla."
+COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s."
+; This string is deprecated and will be removed with 4.0.
+COM_INSTALLER_UNINSTALL_LANGUAGE="A language should always have been installed as a package. <br />To uninstall a language, filter type by package and uninstall the package."
+COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful."
+COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for a update ID, update site ID or extension ID."
+COM_INSTALLER_UPDATE_FILTER_SEARCH_LABEL="Search Extensions with Updates"
+COM_INSTALLER_UPDATESITE_DISABLE="Disable update site"
+COM_INSTALLER_UPDATESITE_DISABLED="Disabled update site"
+COM_INSTALLER_UPDATESITE_ENABLE="Enable update site"
+COM_INSTALLER_UPDATESITE_ENABLED="Enabled update site"
+COM_INSTALLER_UPDATESITES_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID: to search for an update site ID."
+COM_INSTALLER_UPDATESITES_FILTER_SEARCH_LABEL="Search Update Sites"
+COM_INSTALLER_UPLOAD_AND_INSTALL="Upload &amp; Install"
+COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install Joomla Extension"
+COM_INSTALLER_UPLOAD_PACKAGE_FILE="Upload Package File"
+COM_INSTALLER_VALUE_CLIENT_SELECT="- Select Location -"
+COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE="N/A"
+COM_INSTALLER_VALUE_FOLDER_SELECT="- Select Folder -"
+COM_INSTALLER_VALUE_STATE_SELECT="- Select Status -"
+COM_INSTALLER_VALUE_TYPE_SELECT="- Select Type -"
+COM_INSTALLER_WEBINSTALLER_INSTALL_OBSOLETE="The Install from Web plugin needs to be updated."
+COM_INSTALLER_WEBINSTALLER_INSTALL_UPDATE_AVAILABLE="There is a new update available for the Install from Web plugin. It is advisable that you update as soon as possible."
+COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM="Please confirm the installation by selecting the Install button"
+COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_NAME="Extension Name"
+COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_URL="Install from"
+COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading ..."
+COM_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Can't connect to the Joomla! server. Please try again later."
+COM_INSTALLER_WEBINSTALLER_LOAD_APPS="Select to load extensions browser"
+COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_installer.sys.ini b/core/administrator/language/en-GB/en-GB.com_installer.sys.ini
new file mode 100644
index 00000000..9f61e1b5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_installer.sys.ini
@@ -0,0 +1,23 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_INSTALLER="Installer"
+COM_INSTALLER_DATABASE_VIEW_DEFAULT_DESC="Check and fix any database issues with your website."
+COM_INSTALLER_DATABASE_VIEW_DEFAULT_TITLE="Check Database"
+COM_INSTALLER_DISCOVER_VIEW_DEFAULT_DESC="Discover extensions that have not gone through the normal installation process."
+COM_INSTALLER_DISCOVER_VIEW_DEFAULT_TITLE="Discover Extensions"
+COM_INSTALLER_INSTALL_VIEW_DEFAULT_DESC="Install extensions into your Joomla! installation."
+COM_INSTALLER_INSTALL_VIEW_DEFAULT_TITLE="Install Extensions"
+COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_DESC="Install Language packs into your Joomla! website."
+COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_TITLE="Install Languages"
+COM_INSTALLER_MANAGE_VIEW_DEFAULT_DESC="Manage extensions that are already installed on your Joomla! website."
+COM_INSTALLER_MANAGE_VIEW_DEFAULT_TITLE="Manage Extensions"
+COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_DESC="Manage "_QQ_"Update Sites"_QQ_" for various installed extensions."
+COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_TITLE="Update Sites"
+COM_INSTALLER_UPDATE_VIEW_DEFAULT_DESC="Find and Install updates for the installed extensions."
+COM_INSTALLER_UPDATE_VIEW_DEFAULT_TITLE="Update Extensions"
+COM_INSTALLER_WARNINGS_VIEW_DEFAULT_DESC="Displays warnings related to your installed extensions."
+COM_INSTALLER_WARNINGS_VIEW_DEFAULT_TITLE="Warnings"
+COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions."
diff --git a/core/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/core/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
new file mode 100644
index 00000000..28cb73bc
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -0,0 +1,81 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_JOOMLAUPDATE_CHECKED_UPDATES="Checked for updates."
+COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC="This is a custom XML update source URL, used only when the &quot;Update Source&quot; option is set to &quot;Custom URL&quot;."
+COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL="Custom URL"
+COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where Joomla gets its update information from."
+COM_JOOMLAUPDATE_CONFIG_SOURCES_LABEL="Update Source"
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM="Custom URL"
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM_ERROR="The custom URL field is empty."
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT="Default"
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DESC="The update channel Joomla will use to find out if there is an update available."
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL="Update Channel"
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="Joomla Next"
+COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing"
+COM_JOOMLAUPDATE_CONFIGURATION="Joomla Update: Options"
+COM_JOOMLAUPDATE_FAILED_TO_CHECK_UPDATES="Failed to check for updates."
+COM_JOOMLAUPDATE_TOOLBAR_CHECK="Check for Updates"
+COM_JOOMLAUPDATE_OVERVIEW="Joomla Update"
+COM_JOOMLAUPDATE_UPDATE_LOG_CLEANUP="Cleaning up after installation."
+COM_JOOMLAUPDATE_UPDATE_LOG_COMPLETE="Update to version %s is complete."
+; The following two strings are deprecated and will be removed with 4.0
+COM_JOOMLAUPDATE_UPDATE_LOG_CONFIRM_FINALISE="The confirm for the finalise step has passed."
+COM_JOOMLAUPDATE_UPDATE_LOG_CONFIRM_FINALISE_FAIL="The confirm of the finalise step has failed"
+COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES="Deleting removed files and folders."
+COM_JOOMLAUPDATE_UPDATE_LOG_FILE="File %s downloaded."
+COM_JOOMLAUPDATE_UPDATE_LOG_FINALISE="Finalising installation."
+COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL="Starting installation of new version."
+COM_JOOMLAUPDATE_UPDATE_LOG_START="Update started by user %2$s (%1$s). Old version is %3$s."
+COM_JOOMLAUPDATE_UPDATE_LOG_URL="Downloading update file from %s."
+COM_JOOMLAUPDATE_VIEW_COMPLETE_HEADING="Joomla Version Update Status"
+COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE="Your site has been updated. Your Joomla version is now %s."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait ..."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL="We can't find a download URL"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC="An update to Joomla %1$s was found, but it wasn't possible to fetch the download URL for that update. There are two possibilities why this happens:<br>- Your host doesn't support <a href="_QQ_"https://downloads.joomla.org/technical-requirements"_QQ_">the minimum requirements for Joomla %1$s</a> and there is no alternative download for your configuration available.<br>- There is a problem with the Joomla Update Server.<br><br>Please try to download the update package from <a href="_QQ_"https://downloads.joomla.org/latest"_QQ_">the official Joomla download page</a> and use the Upload and Update tab."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE="Live Update is not available"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_LIVE_UPDATE_DESC="There is a new version of the Joomla Update Component that needs to be installed first. <a class=\"alert-link\" href="_QQ_"index.php?option=com_installer&view=update"_QQ_">Click here to update the component</a>."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_DIRECTORY="FTP Root"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_HOSTNAME="FTP Host"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PASSWORD="FTP Password"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_PORT="FTP Port"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_FTP_USERNAME="FTP Username"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_INFOURL="Additional Information"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST="You must update to the latest version of the Joomla Update Component before you can install the Joomla Core Update!"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLAGAIN="Reinstall Joomla core files"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLED="Installed Joomla version"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE="Install the Update"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_LATEST="Latest Joomla version"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_DIRECT="Write files directly"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_FTP="Write files using FTP"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD_HYBRID="Hybrid (use FTP only if needed)"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_METHOD="Installation method"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES="No updates available."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE="You already have the latest Joomla version, %s."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE="Live Update"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD="Upload & Update"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Before you update Joomla, ensure that the installed extensions are available for the new Joomla version."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND="A Joomla update was found."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM="You are on the &quot;%s&quot; update channel. This is not an official Joomla update channel."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="You are on the &quot;%s&quot; update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (3.x)"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="You are on the &quot;%s&quot; update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (3.x) and you will also be notified when the future major release (4.x) will be available. Before upgrading to 4.x you'll need to assess its compatibility with your environment."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING="You are on the &quot;%s&quot; update channel. This channel is designed for testing new releases and fixes in Joomla.<br />It is only intended for JBS (Joomla Bug Squad&trade;) members and others within the Joomla community who are testing. Do not use this setting on a production site."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update Joomla if your server is behind a firewall or otherwise unable to contact the update servers. First download the Joomla <em>Upgrade Package</em> in ZIP format from <a class=\"alert-link\" href=\"%s\">the official Joomla download page</a>. Then use the fields below to upload and install it."
+COM_JOOMLAUPDATE_VIEW_PROGRESS="Update progress"
+COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted"
+COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESREAD="Bytes read"
+COM_JOOMLAUPDATE_VIEW_UPDATE_DOWNLOADFAILED="Download of update package failed."
+COM_JOOMLAUPDATE_VIEW_UPDATE_FILESEXTRACTED="Files extracted"
+COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_CONFIRM_AND_CONTINUE="Confirm & Continue"
+COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_HEAD="Joomla Update is finishing and cleaning up"
+COM_JOOMLAUPDATE_VIEW_UPDATE_FINALISE_HEAD_DESC="To complete the update Process please confirm your identity by re-entering the login information for your site &quot;%s&quot; below."
+COM_JOOMLAUPDATE_VIEW_UPDATE_INPROGRESS="Updating your Joomla files. Please wait ..."
+COM_JOOMLAUPDATE_VIEW_UPDATE_PERCENT="Percent complete"
+COM_JOOMLAUPDATE_VIEW_UPLOAD_CAPTIVE_INTRO_BODY="Make sure that the update file you have uploaded comes from the official Joomla download page. Afterwards, please confirm that you want to install it by re-entering the login information for your site &quot;%s&quot; below."
+COM_JOOMLAUPDATE_VIEW_UPLOAD_CAPTIVE_INTRO_HEAD="Are you sure you want to install the file you uploaded?"
+COM_JOOMLAUPDATE_VIEW_UPLOAD_PACKAGE_FILE="Joomla package file"
+COM_JOOMLAUPDATE_XML_DESCRIPTION="Updates Joomla to the latest version with one click."
diff --git a/core/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini b/core/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
new file mode 100644
index 00000000..28a9ca99
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_JOOMLAUPDATE="Joomla! Update"
+COM_JOOMLAUPDATE_XML_DESCRIPTION="One-click update to the latest Joomla release."
+
+COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_DESC="Check for Joomla! updates and update your website with the latest available release."
+COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_TITLE="View Joomla! Updates"
diff --git a/core/administrator/language/en-GB/en-GB.com_languages.ini b/core/administrator/language/en-GB/en-GB.com_languages.ini
new file mode 100644
index 00000000..e20bff90
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_languages.ini
@@ -0,0 +1,154 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_LANGUAGES="Languages"
+COM_LANGUAGES_CONFIGURATION="Languages: Options"
+COM_LANGUAGES_ERR_DELETE="Select a language to delete"
+COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED="No language selected."
+COM_LANGUAGES_ERROR_LANG_TAG="<br />The Language Tag should have 2 or 3 lowercase letters corresponding to the ISO language, a dash and 2 uppercase letters corresponding to the ISO country code. <br />This should be the exact prefix used for the language installed or to be installed. Example: en-GB, srp-ME."
+COM_LANGUAGES_ERROR_LANGUAGE_METAFILE_MISSING="Could not load %s language meta XML file from %s."
+COM_LANGUAGES_ERR_PUBLISH="Select a language to publish."
+COM_LANGUAGES_FIELD_DESCRIPTION_DESC="Enter a description for the language."
+COM_LANGUAGES_FIELD_IMAGE_DESC="Name of the image file for this language when using the &quot;Use image flags&quot; Language Switcher basic option. Example: if 'en' is chosen, then the image will be en.gif. Images and CSS for this module are in media/mod_languages/."
+COM_LANGUAGES_FIELD_IMAGE_LABEL="Image"
+COM_LANGUAGES_FIELD_LANG_TAG_DESC="Enter the language tag – example: en-GB for English (en-GB). This should be the exact prefix used for the language installed or to be installed."
+COM_LANGUAGES_FIELD_LANG_TAG_LABEL="Language Tag"
+COM_LANGUAGES_INSTALL="Install Languages"
+COM_LANGUAGES_INSTALLED_FILTER_SEARCH_DESC="Search in title and language tag."
+COM_LANGUAGES_INSTALLED_FILTER_SEARCH_LABEL="Search Installed Languages"
+COM_LANGUAGES_OVERRIDE_ERROR_RESERVED_WORDS="YES, NO, NULL, FALSE, ON, OFF, NONE, TRUE are reserved words and can't be used as language constants."
+COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL="For Both Locations"
+COM_LANGUAGES_OVERRIDE_FIELD_BOTH_DESC="If this box is checked the override will be stored for both administrator (Backend) and site (Frontend). This is essential for creating language overrides for some plugins because their language files, while stored in backend, are also used in frontend (example: plg_content_vote).<br />Please note that the two overrides will be completely independent from each other after storing them."
+COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_LABEL="Location"
+COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_DESC="Indicates if the override is created for the site (Frontend) or Administrator (Backend) client."
+COM_LANGUAGES_OVERRIDE_FIELD_FILE_LABEL="File"
+COM_LANGUAGES_OVERRIDE_FIELD_FILE_DESC="Language overrides are stored in a specific INI file (as it's the case for the original texts, too). Here you can see in which file the current override is stored."
+COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_LABEL="Language"
+COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_DESC="Language for which the constant is overridden."
+COM_LANGUAGES_OVERRIDE_FIELD_KEY_LABEL="Language Constant"
+COM_LANGUAGES_OVERRIDE_FIELD_KEY_DESC="The language constant of the string you want to override."
+COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_LABEL="Text"
+COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_DESC="Enter the text that you want to be displayed instead of the original one.<br /><strong>Please note</strong> that there may be placeholders (eg %s, %d or %1$s) in the text which could be important (they will be replaced by other texts before displaying), so you should leave them in there."
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL="Search Text"
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_DESC="Please enter the text to search for here. It may be in any of the language files."
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_LABEL="Search For"
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_DESC="Select if you want to search for constant names or the values (the actual text)."
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_CONSTANT="Constant"
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_TEXT="Value"
+COM_LANGUAGES_FIELD_PUBLISHED_DESC="Whether this content language is published or not. If published, it will display as a choice in the Language Switcher module in Frontend."
+COM_LANGUAGES_FIELD_LANG_CODE_DESC="This Language Code will be appended to the site URL. When SEF is enabled, you will get http://example.com/en/. If SEF is disabled the suffix &amp;lang=en will be appended at the end of the URL. Note <em>the Language Code must be unique among all the languages</em>."
+COM_LANGUAGES_FIELD_LANG_CODE_LABEL="URL Language Code"
+COM_LANGUAGES_FIELD_SITE_NAME_DESC="Enter a custom site name for this content language. If the site name is set to display, this custom site name will be used instead of the Global Configuration setting."
+COM_LANGUAGES_FIELD_SITE_NAME_LABEL="Custom Site Name"
+COM_LANGUAGES_FIELDSET_SITE_NAME_LABEL="Site Name"
+COM_LANGUAGES_FIELD_TITLE_DESC="The name of the language as it will appear in the lists."
+COM_LANGUAGES_FIELD_TITLE_NATIVE_DESC="Title in native language."
+COM_LANGUAGES_FIELD_TITLE_NATIVE_LABEL="Title Native"
+COM_LANGUAGES_FILTER_CLIENT_LABEL="Filter Location:"
+COM_LANGUAGES_FTP_DESC="For setting Languages as default, Joomla will most likely need your FTP account details. Please enter them in the form fields below."
+COM_LANGUAGES_FTP_TITLE="FTP Login Details"
+COM_LANGUAGES_HEADING_AUTHOR="Author"
+COM_LANGUAGES_HEADING_AUTHOR_ASC="Author ascending"
+COM_LANGUAGES_HEADING_AUTHOR_DESC="Author descending"
+COM_LANGUAGES_HEADING_AUTHOR_EMAIL="Author Email"
+COM_LANGUAGES_HEADING_AUTHOR_EMAIL_ASC="Author Email ascending"
+COM_LANGUAGES_HEADING_AUTHOR_EMAIL_DESC="Author Email descending"
+COM_LANGUAGES_HEADING_DATE="Date"
+COM_LANGUAGES_HEADING_DATE_ASC="Date ascending"
+COM_LANGUAGES_HEADING_DATE_DESC="Date descending"
+COM_LANGUAGES_HEADING_DEFAULT="Default"
+COM_LANGUAGES_HEADING_DEFAULT_ASC="Default ascending"
+COM_LANGUAGES_HEADING_DEFAULT_DESC="Default descending"
+COM_LANGUAGES_HEADING_HOMEPAGE="Home"
+COM_LANGUAGES_HEADING_HOMEPAGE_ASC="Home ascending"
+COM_LANGUAGES_HEADING_HOMEPAGE_DESC="Home descending"
+COM_LANGUAGES_HEADING_LANGUAGE="Language"
+COM_LANGUAGES_HEADING_LANGUAGE_ASC="Language ascending"
+COM_LANGUAGES_HEADING_LANGUAGE_DESC="Language descending"
+COM_LANGUAGES_HEADING_LANG_CODE="URL Language Code"
+COM_LANGUAGES_HEADING_LANG_CODE_ASC="URL Language Code ascending"
+COM_LANGUAGES_HEADING_LANG_CODE_DESC="URL Language Code descending"
+COM_LANGUAGES_HEADING_LANG_IMAGE="Image"
+COM_LANGUAGES_HEADING_LANG_IMAGE_ASC="Image ascending"
+COM_LANGUAGES_HEADING_LANG_IMAGE_DESC="Image descending"
+COM_LANGUAGES_HEADING_LANG_TAG="Language Tag"
+COM_LANGUAGES_HEADING_LANG_TAG_ASC="Language Tag ascending"
+COM_LANGUAGES_HEADING_LANG_TAG_DESC="Language Tag descending"
+COM_LANGUAGES_HEADING_VERSION="Version"
+COM_LANGUAGES_HEADING_VERSION_ASC="Version ascending"
+COM_LANGUAGES_HEADING_VERSION_DESC="Version descending"
+COM_LANGUAGES_HEADING_TITLE_NATIVE="Native Title"
+COM_LANGUAGES_HEADING_TITLE_NATIVE_ASC="Native Title ascending"
+COM_LANGUAGES_HEADING_TITLE_NATIVE_DESC="Native Title descending"
+COM_LANGUAGES_HOMEPAGE="Home"
+COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.<br /><strong class="_QQ_"red"_QQ_">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_MSG_SWITCH_ADMIN_LANGUAGE_SUCCESS="The Administrator Language has been switched to &quot;<strong>%s</strong>&quot;."
+COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR="Some of the contacts linked to the user <strong>%s</strong> are incorrect."
+COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP="Warning! A user/author should have only one contact to which is assigned language 'All' OR one contact for each published Content Language."
+COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages"
+COM_LANGUAGES_MULTILANGSTATUS_DEFAULT_HOME_MODULE_PUBLISHED="This site is set as a multilingual site. The menu module displaying the Home menu item set to language &quot;All&quot; should not be published."
+COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the <strong>%s</strong> Content Language although a Site Language for this Content Language is not installed or published AND/OR the Content Language is not published."
+COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag <strong>%s</strong> does not match the Site Language tag. Check that the Site Language is installed and published and the correct language tag is used for the Content Language. Example: for English (en-GB) both tags should be 'en-GB'."
+COM_LANGUAGES_MULTILANGSTATUS_HOMES_MISSING="This site is set as a multilingual site. One or more of the Default Home pages for the published Content languages are missing although the Language Filter plugin is enabled AND/OR one or more Language Switcher modules are published."
+COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED="Published Default Home pages"
+COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_ALL="1 assigned to language 'All'."
+COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_INCLUDING_ALL="Published Default Home pages (including 1 assigned to language &quot;All&quot;)."
+COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_PUBLISHED="Published Language Switcher Modules."
+COM_LANGUAGES_MULTILANGSTATUS_LANGSWITCHER_UNPUBLISHED="This site is set as a multilingual site, at least one Language Switcher module set to language &quot;All&quot; has to be published. Disregard this message if you do not use a language switcher module but direct links."
+COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER="Language Filter Plugin"
+COM_LANGUAGES_MULTILANGSTATUS_LANGUAGEFILTER_DISABLED="This site is set as a multilingual site. The Language Filter plugin is not enabled although one or more Language Switcher modules AND/OR one or more specific Content language Default Home pages are published."
+COM_LANGUAGES_MULTILANGSTATUS_NONE="This site is not set as a multilingual site."
+COM_LANGUAGES_MULTILANGSTATUS_SITE_LANG_PUBLISHED="Published Site Languages"
+COM_LANGUAGES_MULTILANGSTATUS_USELESS_HOMES="This site is not set as a multilingual site.<br /><strong>Note</strong>: at least one Default Home page is assigned to a Content Language. This will not break a monolingual site but is useless."
+COM_LANGUAGES_N_ITEMS_DELETED="%d Content Languages deleted."
+COM_LANGUAGES_N_ITEMS_DELETED_1="%d Content Language deleted."
+COM_LANGUAGES_N_ITEMS_PUBLISHED="%d Content Languages published."
+COM_LANGUAGES_N_ITEMS_PUBLISHED_1="%d Content Language published."
+COM_LANGUAGES_N_ITEMS_TRASHED="%d Content Languages trashed."
+COM_LANGUAGES_N_ITEMS_TRASHED_1="%d Content Language trashed."
+COM_LANGUAGES_N_ITEMS_UNPUBLISHED="%d Content Languages unpublished. <br /><strong class="_QQ_"red"_QQ_">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%d Content Language unpublished. <br /><strong class="_QQ_"red"_QQ_">Warning!</strong> When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_NO_ITEM_SELECTED="No languages selected."
+COM_LANGUAGES_SAVE_SUCCESS="Content Language saved."
+COM_LANGUAGES_SEARCH_IN_TITLE="Search in title."
+COM_LANGUAGES_SUBMENU_CONTENT="Content Languages"
+COM_LANGUAGES_SUBMENU_INSTALLED="Installed"
+COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR="Installed - Administrator"
+COM_LANGUAGES_SUBMENU_INSTALLED_SITE="Installed - Site"
+COM_LANGUAGES_SUBMENU_OVERRIDES="Overrides"
+COM_LANGUAGES_SWITCH_ADMIN="Switch Language"
+COM_LANGUAGES_VIEW_INSTALLED_ADMIN_TITLE="Languages: Installed (Administrator)"
+COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE="Languages: Installed (Site)"
+COM_LANGUAGES_VIEW_INSTALLED_TITLE="Languages: Installed"
+COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE="Languages: Edit Content Language"
+COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Languages: New Content Language"
+COM_LANGUAGES_VIEW_LANGUAGES_TITLE="Languages: Content"
+COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_SITE="Site"
+COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_ADMINISTRATOR="Administrator"
+COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE="Languages: Edit Override"
+COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND="Create a New Override"
+COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND="Edit this Override"
+COM_LANGUAGES_VIEW_OVERRIDE_LANGUAGE="%1$s [%2$s]"
+COM_LANGUAGES_VIEW_OVERRIDE_MORE_RESULTS="More Results"
+COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS="No matching texts found."
+COM_LANGUAGES_VIEW_OVERRIDE_REFRESHING="Please wait while the cache is recreated."
+COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR="Error while performing an Ajax request."
+COM_LANGUAGES_VIEW_OVERRIDE_RESULTS_LEGEND="Search Results"
+COM_LANGUAGES_VIEW_OVERRIDE_SAVE_SUCCESS="Language Override was saved."
+COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_BUTTON="Search"
+COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND="Search text you want to change."
+COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP="A language string is composed of two parts: a specific language constant and its value.<br />For example, in the string: COM_CONTENT_READ_MORE=&quot;Read more: &quot;<br />'<u>COM_CONTENT_READ_MORE</u>' is the constant and '<u>Read more: </u>' is the value.<br />You have to use the specific language constant to create an override of the value.<br />Therefore, you can search for the constant or the value you want to change with the search field below.<br />By selecting the desired result the correct constant will automatically be inserted into the form."
+COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC="Search constant or text."
+COM_LANGUAGES_VIEW_OVERRIDES_KEY="Constant"
+COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM="%1$s - %2$s"
+COM_LANGUAGES_VIEW_OVERRIDES_N_ITEMS_DELETED="%d language overrides were deleted."
+COM_LANGUAGES_VIEW_OVERRIDES_N_ITEMS_DELETED_1="%d language override was deleted."
+COM_LANGUAGES_VIEW_OVERRIDES_NO_ITEM_SELECTED="You haven't selected any overrides."
+COM_LANGUAGES_VIEW_OVERRIDES_PURGE="Clear Cache"
+COM_LANGUAGES_VIEW_OVERRIDES_PURGE_SUCCESS="Overrider cache table cleared."
+COM_LANGUAGES_VIEW_OVERRIDES_TEXT="Text"
+COM_LANGUAGES_VIEW_OVERRIDES_TITLE="Languages: Overrides"
+COM_LANGUAGES_XML_DESCRIPTION="Component for language management"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_languages.sys.ini b/core/administrator/language/en-GB/en-GB.com_languages.sys.ini
new file mode 100644
index 00000000..a4dd305a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_languages.sys.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_LANGUAGES="Languages"
+COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_DESC="Displays language packs installed into your Joomla! website."
+COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_TITLE="Installed Languages"
+COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_DESC="Create or manage content languages for your Joomla! website."
+COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_TITLE="Content Languages"
+COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_DESC="Here you assign custom text for a language key that you want to use instead of language pack default text."
+COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_TITLE="Language Overrides"
+COM_LANGUAGES_XML_DESCRIPTION="Component for language management."
diff --git a/core/administrator/language/en-GB/en-GB.com_login.ini b/core/administrator/language/en-GB/en-GB.com_login.ini
new file mode 100644
index 00000000..fbc2839a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_login.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_LOGIN="Login"
+COM_LOGIN_JOOMLA_ADMINISTRATION_LOGIN="Joomla! Administration Login"
+COM_LOGIN_RETURN_TO_SITE_HOME_PAGE="Go to site home page"
+COM_LOGIN_VALID="Use a valid username and password to gain access to the Administrator Backend."
+COM_LOGIN_XML_DESCRIPTION="This component lets users login to the site."
diff --git a/core/administrator/language/en-GB/en-GB.com_login.sys.ini b/core/administrator/language/en-GB/en-GB.com_login.sys.ini
new file mode 100644
index 00000000..e2c8c849
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_login.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_LOGIN="Login"
+COM_LOGIN_XML_DESCRIPTION="This component lets users login to the site."
diff --git a/core/administrator/language/en-GB/en-GB.com_mailto.sys.ini b/core/administrator/language/en-GB/en-GB.com_mailto.sys.ini
new file mode 100644
index 00000000..bce4aeba
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_mailto.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MAILTO="Mail to"
+COM_MAILTO_XML_DESCRIPTION="A generic mail to friend component."
+
diff --git a/core/administrator/language/en-GB/en-GB.com_media.ini b/core/administrator/language/en-GB/en-GB.com_media.ini
new file mode 100644
index 00000000..afadfb0c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_media.ini
@@ -0,0 +1,104 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MEDIA="Media"
+COM_MEDIA_ALIGN="Image Float"
+COM_MEDIA_ALIGN_DESC="This will apply the classes 'pull-left', 'pull-center' or 'pull-right' to the '<figure>' or '<img>' element."
+COM_MEDIA_BROWSE_FILES="Browse files"
+COM_MEDIA_CAPTION="Caption"
+COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
+COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'."
+COM_MEDIA_CLEAR_LIST="Clear List"
+COM_MEDIA_CONFIGURATION="Media: Options"
+COM_MEDIA_CREATE_COMPLETE="Create Complete: %s"
+COM_MEDIA_CREATE_FOLDER="Create Folder"
+COM_MEDIA_CREATE_NEW_FOLDER="Create New Folder"
+COM_MEDIA_CURRENT_PROGRESS="Current progress"
+COM_MEDIA_DELETE_COMPLETE="Delete Complete: %s"
+COM_MEDIA_DESCFTPTITLE="FTP Login Details"
+COM_MEDIA_DESCFTP="To upload, change and delete media files, Joomla will most likely need your FTP account details. Please enter them in the form fields below."
+COM_MEDIA_DETAIL_VIEW="Detail View"
+COM_MEDIA_DIRECTORY="Folder"
+COM_MEDIA_DIRECTORY_UP="Folder Up"
+COM_MEDIA_ERROR_BAD_REQUEST="Bad Request"
+COM_MEDIA_ERROR_BEFORE_DELETE_0="No error occurred before deleting the media."
+COM_MEDIA_ERROR_BEFORE_DELETE_1="An error occurred before deleting the media: %s"
+COM_MEDIA_ERROR_BEFORE_DELETE_MORE="Some errors occurred before deleting the media: %s"
+COM_MEDIA_ERROR_BEFORE_SAVE_0="No error occurred before saving the media."
+COM_MEDIA_ERROR_BEFORE_SAVE_1="An error occurred before saving the media: %s"
+COM_MEDIA_ERROR_BEFORE_SAVE_MORE="Some errors occurred before saving the media: %s"
+COM_MEDIA_ERROR_CREATE_NOT_PERMITTED="Create not permitted."
+COM_MEDIA_ERROR_FILE_EXISTS="File already exists."
+COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME="Unable to create folder. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_BROWSE_FOLDER_WARNDIRNAME="Unable to browse:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FILE_WARNFILENAME="Unable to delete:&#160;%s. File name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_NOT_EMPTY="Unable to delete:&#160;%s. Folder is not empty!"
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_WARNDIRNAME="Unable to delete:&#160;%s."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE="Unable to delete:&#160;"
+COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE="Unable to upload file."
+COM_MEDIA_ERROR_UPLOAD_INPUT="Please input a file to upload"
+COM_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_WARNFILENOTSAFE="You have tried to upload file(s) that are not safe."
+COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
+COM_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
+COM_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
+COM_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
+COM_MEDIA_ERROR_WARNINVALID_MIME="Illegal or invalid mime type detected."
+COM_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you are not a manager or higher."
+COM_MEDIA_ERROR_WARNNOTEMPTY="Not empty!"
+COM_MEDIA_ERROR_WARNUPLOADTOOLARGE="Total size of upload exceeds the limit."
+COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify files. Try disabling this if you get invalid mime type errors."
+COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
+COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
+COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
+COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload (blacklist)."
+COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Illegal MIME Types"
+COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)."
+COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)"
+COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers."
+COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)"
+COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload."
+COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types"
+COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="The maximum size for an upload (in megabytes). Use zero for no limit. Note: your server has a maximum limit."
+COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)"
+COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the files folder relative to the root of your webspace. Warning! Changing to another path than the default 'images' may break your links. Note: Do not start the path with a slash!"
+COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL="Path to Files Folder"
+COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the images folder relative to the root of your webspace. This path <strong>has to be the same as path to files (default) or to a subfolder of the path to file folder.</strong>. Note: Do not start the path with a slash!"
+COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Images Folder"
+COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to images if Fileinfo or MIME Magic isn't installed."
+COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
+COM_MEDIA_FIELDSET_OPTIONS_LABEL="Media"
+COM_MEDIA_FILES="Files"
+COM_MEDIA_FILESIZE="File size"
+COM_MEDIA_FOLDER="Folder"
+COM_MEDIA_FOLDERS="Media Folders"
+COM_MEDIA_FOLDERS_PATH_LABEL="<strong>Warning! Path Folder</strong><br />Changing the 'Path to files folder' from the default of 'images' may break your links.<br />The 'Path to images' folder has to be the same or a subfolder of 'Path to files'."
+COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
+COM_MEDIA_IMAGE_DIMENSIONS="%1$s x %2$s"
+COM_MEDIA_IMAGE_TITLE="%1$s - %2$s"
+COM_MEDIA_IMAGE_URL="Image URL"
+COM_MEDIA_INSERT_IMAGE="Insert Image"
+COM_MEDIA_INSERT="Insert"
+COM_MEDIA_INVALID_REQUEST="Invalid Request"
+COM_MEDIA_MEDIA="Media"
+COM_MEDIA_NAME="Image Name"
+COM_MEDIA_NO_IMAGES_FOUND="No Images Found"
+COM_MEDIA_NOT_SET="Not Set"
+COM_MEDIA_OVERALL_PROGRESS="Overall Progress"
+COM_MEDIA_PIXEL_DIMENSIONS="Dimensions (px)"
+COM_MEDIA_PREVIEW="Preview"
+COM_MEDIA_START_UPLOAD="Start Upload"
+COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
+COM_MEDIA_TITLE="Image Title"
+COM_MEDIA_UPLOAD_COMPLETE="Upload Complete: %s"
+COM_MEDIA_UPLOAD_FILE="Upload file"
+; The following two strings are deprecated with 3.7.0 and will be removed in 4.0
+COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)"
+COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)"
+COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
+COM_MEDIA_UPLOAD="Upload"
+COM_MEDIA_UP="Up"
+COM_MEDIA_XML_DESCRIPTION="Component for managing site media"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_media.sys.ini b/core/administrator/language/en-GB/en-GB.com_media.sys.ini
new file mode 100644
index 00000000..7138cb9e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_media.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MEDIA="Media"
+COM_MEDIA_MEDIA_VIEW_DEFAULT_DESC="Upload or manage images and other media files on you Joomla! website."
+COM_MEDIA_MEDIA_VIEW_DEFAULT_TITLE="Media Manager"
+COM_MEDIA_XML_DESCRIPTION="Component for managing site media."
diff --git a/core/administrator/language/en-GB/en-GB.com_menus.ini b/core/administrator/language/en-GB/en-GB.com_menus.ini
new file mode 100644
index 00000000..579e302f
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_menus.ini
@@ -0,0 +1,241 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MENUS="Menus"
+COM_MENUS_ACTION_COLLAPSE="Collapse"
+COM_MENUS_ACTION_DESELECT="Deselect"
+COM_MENUS_ACTION_EXPAND="Expand"
+COM_MENUS_ACTION_SELECT="Select"
+COM_MENUS_ADD_MENU_MODULE="Add a module for this menu"
+COM_MENUS_ADVANCED_FIELDSET_LABEL="Advanced"
+COM_MENUS_BASIC_FIELDSET_LABEL="Options"
+COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE="You are not allowed to create new menu items."
+COM_MENUS_BATCH_MENU_ITEM_CANNOT_EDIT="You are not allowed to edit menu items."
+COM_MENUS_BATCH_MENU_LABEL="To Move or Copy your selection please select a Menu or parent item."
+COM_MENUS_BATCH_OPTIONS="Batch process the selected menu items"
+COM_MENUS_BATCH_TIP="If a menu or parent is selected for move/copy, any actions selected will be applied to the copied or moved menu items. Otherwise, all actions are applied to the selected menu items."
+COM_MENUS_CHANGE_MENUITEM="Select or Change Menu Item"
+COM_MENUS_CONFIGURATION="Menus: Options"
+COM_MENUS_EDIT_MENUITEM="Edit Menu Item"
+COM_MENUS_EDIT_MODULE_SETTINGS="Edit module settings"
+COM_MENUS_ERROR_ALL_LANGUAGE_ASSOCIATED="A menu item set to All languages can't be associated. Associations have not been set."
+COM_MENUS_ERROR_ALREADY_HOME="Menu item already set to home."
+COM_MENUS_ERROR_MENUTYPE="Please change the Menu type. The term 'main' is reserved for internal usage."
+COM_MENUS_ERROR_MENUTYPE_HOME="The term 'main' is reserved for internal usage."
+COM_MENUS_ERROR_MENUTYPE_NOT_FOUND="The Menu type doesn't exist."
+COM_MENUS_ERROR_ONE_HOME="Only one menu item can be a home link for each language."
+COM_MENUS_EXTENSION_PUBLISHED_DISABLED="Component disabled and menu item published."
+COM_MENUS_EXTENSION_PUBLISHED_ENABLED="Component enabled and menu item published."
+COM_MENUS_EXTENSION_UNPUBLISHED_DISABLED="Component disabled and menu item unpublished."
+COM_MENUS_EXTENSION_UNPUBLISHED_ENABLED="Component enabled and menu item unpublished."
+COM_MENUS_FIELD_FEEDLINK_DESC="Display a feed link for this menu item."
+COM_MENUS_FIELD_FEEDLINK_LABEL="Feed link"
+COM_MENUS_FIELD_PRESET_LABEL="Import a preset"
+COM_MENUS_FIELD_PRESET_DESC="Select a preset if you want to populate this menu with the menu items in that preset. Otherwise leave this empty."
+COM_MENUS_FIELD_VALUE_IGNORE="Ignore"
+COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
+COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV="New Without Navigation"
+COM_MENUS_FIELD_VALUE_PARENT="Parent"
+COM_MENUS_FIELDSET_RULES="Permissions"
+COM_MENUS_FILTER_PARENT_MENU_ITEM_DESC="Filters the menu items list where the parent is this selected menu item."
+COM_MENUS_FILTER_PARENT_MENU_ITEM_LABEL="Parent Menu Item"
+COM_MENUS_FILTER_SELECT_PARENT_MENU_ITEM="- Select Parent Menu Item -"
+COM_MENUS_GRID_UNSET_LANGUAGE="Unset %s Default"
+COM_MENUS_HEADING_ASSIGN_MODULE="Module"
+COM_MENUS_HEADING_ASSOCIATION="Association"
+COM_MENUS_HEADING_DISPLAY="Display"
+COM_MENUS_HEADING_HOME="Home"
+COM_MENUS_HEADING_HOME_ASC="Home ascending"
+COM_MENUS_HEADING_HOME_DESC="Home descending"
+COM_MENUS_HEADING_LEVELS="View Level"
+COM_MENUS_HEADING_LINKED_MODULES="Linked Modules"
+COM_MENUS_HEADING_MENU="Menu"
+COM_MENUS_HEADING_MENU_ASC="Menu ascending"
+COM_MENUS_HEADING_MENU_DESC="Menu descending"
+COM_MENUS_HEADING_NUMBER_MENU_ITEMS="Number of Menu Items"
+COM_MENUS_HEADING_POSITION="Position"
+COM_MENUS_HEADING_PUBLISHED_ITEMS="Published"
+COM_MENUS_HEADING_TRASHED_ITEMS="Trashed"
+COM_MENUS_HEADING_UNPUBLISHED_ITEMS="Unpublished"
+COM_MENUS_HTML_PUBLISH="Publish menu item"
+COM_MENUS_HTML_PUBLISH_ALIAS="Publish the menu item alias"
+COM_MENUS_HTML_PUBLISH_DISABLED="Publish menu item::Component disabled"
+COM_MENUS_HTML_PUBLISH_ENABLED="Publish menu item::Component enabled"
+COM_MENUS_HTML_PUBLISH_HEADING="Publish the heading menu item"
+COM_MENUS_HTML_PUBLISH_SEPARATOR="Publish the separator menu item"
+COM_MENUS_HTML_PUBLISH_URL="Publish the URL menu item"
+COM_MENUS_HTML_UNPUBLISH_ALIAS="Unpublish the menu item alias"
+COM_MENUS_HTML_UNPUBLISH_DISABLED="Unpublish menu item::Component disabled"
+COM_MENUS_HTML_UNPUBLISH_ENABLED="Unpublish menu item::Component enabled"
+COM_MENUS_HTML_UNPUBLISH_HEADING="Unpublish the heading menu item"
+COM_MENUS_HTML_UNPUBLISH_SEPARATOR="Unpublish the separator menu item"
+COM_MENUS_HTML_UNPUBLISH_URL="Unpublish the URL menu item"
+COM_MENUS_INTEGRATION_FIELDSET_LABEL="Integration"
+; The following 2 strings are deprecated and will be removed with 4.0.
+COM_MENUS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Menu Item Associations"
+COM_MENUS_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a menu item for the target language. This association will let the Language Switcher module redirect to the associated menu item in another language. If used, make sure to display the Language switcher module on the relevant pages. A menu item set to language 'All' can't be associated."
+COM_MENUS_ITEM_DETAILS="Details"
+COM_MENUS_ITEM_FIELD_ALIAS_DESC="The alias is used in the URL when SEF is on."
+COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC="Menu Item to link to."
+COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL="Menu Item"
+COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC="An optional class to apply to the menu hyperlink."
+COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL="Link Class"
+COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC="An optional, custom description for the title attribute of the menu hyperlink."
+COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL="Link Title Attribute"
+COM_MENUS_ITEM_FIELD_ANCHOR_REL_DESC="An optional, custom rel attribute to get more information about the menu hyperlink (search engines purpose)."
+COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL="Link Rel Attribute"
+COM_MENUS_ITEM_FIELD_ASSIGNED_DESC="Shows which menu the link will appear in."
+COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL="Menu"
+COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE="- No association -"
+COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC="Target browser window when the menu item is selected."
+COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL="Target Window"
+COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_DESC="Select the menu items that should or should not be shown under this container. If there are no items to show, then this container will also be hidden.<br>Please note that when you install a new component it will be displayed by default until you come back here and hide it too."
+COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_LABEL="Show or Hide Menu Items"
+COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED="Hide Unassigned Modules"
+COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_DESC="Show or hide modules unassigned to this menu item."
+COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_LABEL="Unassigned Modules"
+COM_MENUS_ITEM_FIELD_HIDE_UNPUBLISHED="Hide Unpublished Modules"
+COM_MENUS_ITEM_FIELD_HIDE_UNPUBLISHED_DESC="Show or hide modules that are unpublished."
+COM_MENUS_ITEM_FIELD_HIDE_UNPUBLISHED_LABEL="Unpublished Modules"
+COM_MENUS_ITEM_FIELD_HOME_DESC="Sets this menu item as the default or home page of the site. You must have a default page set at all times."
+COM_MENUS_ITEM_FIELD_HOME_LABEL="Default Page"
+COM_MENUS_ITEM_FIELD_LANGUAGE_DESC="Assign a language to this menu item."
+COM_MENUS_ITEM_FIELD_LINK_DESC="Link for this menu."
+COM_MENUS_ITEM_FIELD_LINK_LABEL="Link"
+COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC="Select or upload an optional image to be used with the menu hyperlink."
+COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL="Link Image"
+COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_DESC="An optional class to apply to the image."
+COM_MENUS_ITEM_FIELD_MENU_IMAGE_CSS_LABEL="Image Class"
+COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC="Select 'No' if you want to hide this menu item. Note any submenu items will also be hidden."
+COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL="Display in Menu"
+COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC="If the optional image is added, adds the menu title next to the image. Default is 'Yes'."
+COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL="Add Menu Title"
+COM_MENUS_ITEM_FIELD_NOTE_DESC="An optional note to display in the Menu Manager."
+COM_MENUS_ITEM_FIELD_ORDERING_DESC="The menu item will be placed in the menu after the selected menu item."
+COM_MENUS_ITEM_FIELD_ORDERING_LABEL="Ordering"
+COM_MENUS_ITEM_FIELD_ORDERING_TEXT="Ordering will be available after saving."
+COM_MENUS_ITEM_FIELD_ORDERING_VALUE_FIRST="- First -"
+COM_MENUS_ITEM_FIELD_ORDERING_VALUE_LAST="- Last -"
+COM_MENUS_ITEM_FIELD_PAGE_CLASS_DESC="Optional CSS class to add to elements in this page. This allows CSS styling specific to this page."
+COM_MENUS_ITEM_FIELD_PAGE_CLASS_LABEL="Page Class"
+COM_MENUS_ITEM_FIELD_PAGE_HEADING_DESC="Optional alternative text for the Page heading."
+COM_MENUS_ITEM_FIELD_PAGE_HEADING_LABEL="Page Heading"
+COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC="Optional text for the &quot;Browser page title&quot; element. If blank, a default value is used based on the Menu Item Title."
+COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL="Browser Page Title"
+COM_MENUS_ITEM_FIELD_PARENT_DESC="Select a parent item."
+COM_MENUS_ITEM_FIELD_PARENT_LABEL="Parent Item"
+COM_MENUS_ITEM_FIELD_SECURE_DESC="Selects if this link should use HTTPS (encrypted HTTP connections with the https:// protocol prefix). Note, you must have HTTPS enabled on your server to utilise this option."
+COM_MENUS_ITEM_FIELD_SECURE_LABEL="Secure"
+COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC="Show or hide the Browser Page Title in the heading of the page ( If no optional text entered - will default to value based on the Menu Item Title ). The Page heading is usually displayed inside the &quot;H1&quot; tag."
+COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL="Show Page Heading"
+COM_MENUS_ITEM_FIELD_TEMPLATE_DESC="Select a specific template style for this menu item or use the default template."
+COM_MENUS_ITEM_FIELD_TEMPLATE_LABEL="Template Style"
+COM_MENUS_ITEM_FIELD_TEXT_SEPARATOR_DESC="Choose whether this separator will be displayed as a label. If the title has only dashes (-) and spaces, it will not be displayed as a label."
+COM_MENUS_ITEM_FIELD_TEXT_SEPARATOR_LABEL="Display as a label"
+COM_MENUS_ITEM_FIELD_TITLE_DESC="The title of the menu item that will display in the menu."
+COM_MENUS_ITEM_FIELD_TITLE_LABEL="Menu Title"
+COM_MENUS_ITEM_FIELD_TYPE_DESC="The type of link: Component, URL, Alias, Separator or Heading."
+COM_MENUS_ITEM_FIELD_TYPE_LABEL="Menu Item Type"
+COM_MENUS_ITEM_IS_DEFAULT="Is default"
+COM_MENUS_ITEM_MODULE_ASSIGNMENT="Module Assignment"
+COM_MENUS_ITEM_REQUIRED="Required"
+COM_MENUS_ITEM_ROOT="Menu Item Root"
+COM_MENUS_ITEMS_REBUILD_FAILED="Failed rebuilding Menu Items list."
+COM_MENUS_ITEMS_REBUILD_SUCCESS="Menu items list rebuilt."
+COM_MENUS_ITEMS_SEARCH_FILTER="Search in title, alias and notes. Prefix with ID: to search for a menu item ID."
+COM_MENUS_ITEMS_SEARCH_FILTER_LABEL="Search Menu Items"
+COM_MENUS_ITEMS_SET_HOME_0="No menu item set to home."
+COM_MENUS_ITEMS_SET_HOME_1="1 menu item set to home."
+COM_MENUS_ITEMS_SET_HOME_MORE="%d menu items set to home."
+COM_MENUS_ITEMS_UNSET_HOME="1 menu item unset to home."
+COM_MENUS_LABEL_HIDDEN="Hidden"
+COM_MENUS_LAYOUT_FEATURED_OPTIONS="Layout"
+COM_MENUS_LAYOUT_MENUTYPE_OPTIONS_LABEL="Menu Type"
+COM_MENUS_LINKTYPE_OPTIONS_LABEL="Link Type"
+COM_MENUS_MENU_CLIENT_ID_LABEL="Client"
+COM_MENUS_MENU_CLIENT_ID_DESC="Select if this Menu is to be used in the Site or the Administrator."
+COM_MENUS_MENU_CONFIRM_DELETE="Are you sure you want to delete these menus? Confirming will delete the selected menu types, all their menu items and the associated menu modules."
+COM_MENUS_MENU_DESCRIPTION_DESC="A description about the purpose of the menu."
+COM_MENUS_MENU_DETAILS="Menu Details"
+COM_MENUS_MENU_EXPORT_BUTTON="Download as Preset"
+COM_MENUS_MENU_ITEM_SAVE_SUCCESS="Menu item saved."
+COM_MENUS_MENU_MENUTYPE_DESC="The system name of the menu."
+COM_MENUS_MENU_MENUTYPE_LABEL="Menu Type"
+COM_MENUS_MENU_SAVE_SUCCESS="Menu saved"
+COM_MENUS_MENU_SEARCH_FILTER="Search in Title or Menu type"
+COM_MENUS_MENU_SPRINTF="Menu: %s"
+COM_MENUS_MENUS="Menu items"
+COM_MENUS_MENU_TYPE_PROTECTED_MAIN_LABEL="Main (Protected)"
+COM_MENUS_MENU_TITLE_DESC="The title of the menu to display in the Administrator Menubar and lists."
+COM_MENUS_MENUS_FILTER_SEARCH_DESC="Search in title and menu type."
+COM_MENUS_MENUS_FILTER_SEARCH_LABEL="Search Menus"
+; in the following string
+; %1$s is for module title, %2$s is for access-title, %3$s is for position
+COM_MENUS_MODULE_ACCESS_POSITION="%1$s <small>(%2$s in %3$s)</small>"
+COM_MENUS_MODULE_SHOW_VARIES="Varies"
+COM_MENUS_MODULES="Modules"
+COM_MENUS_N_ITEMS_CHECKED_IN_0="No menu item checked in."
+COM_MENUS_N_ITEMS_CHECKED_IN_1="%d menu item checked in."
+COM_MENUS_N_ITEMS_CHECKED_IN_MORE="%d menu items checked in."
+COM_MENUS_N_ITEMS_DELETED="%d menu items deleted."
+COM_MENUS_N_ITEMS_DELETED_1="%d menu item deleted."
+COM_MENUS_N_ITEMS_FAILED_PUBLISHING="Failed publishing %d menu items as at least one of their parents is unpublished or one of their children is checked out."
+COM_MENUS_N_ITEMS_FAILED_PUBLISHING_1="Failed publishing %d menu item as at least one of its parents is unpublished or one of its children is checked out."
+COM_MENUS_N_ITEMS_PUBLISHED="%d menu items published."
+COM_MENUS_N_ITEMS_PUBLISHED_1="%d menu item published."
+COM_MENUS_N_ITEMS_TRASHED="%d menu items trashed."
+COM_MENUS_N_ITEMS_TRASHED_1="%d menu item trashed."
+COM_MENUS_N_ITEMS_UNPUBLISHED="%d menu items unpublished."
+COM_MENUS_N_ITEMS_UNPUBLISHED_1="%d menu item unpublished."
+COM_MENUS_N_MENUS_DELETED="%d menu types deleted."
+COM_MENUS_N_MENUS_DELETED_1="Menu type deleted."
+COM_MENUS_NEW_MENUITEM="New Menu Item"
+COM_MENUS_NO_ITEM_SELECTED="No menu items selected."
+COM_MENUS_NO_MENUS_SELECTED="No menu selected."
+COM_MENUS_OPTION_SELECT_COMPONENT="- Select Component -"
+COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -"
+COM_MENUS_PAGE_OPTIONS_LABEL="Page Display"
+COM_MENUS_PRESET_IMPORT_SUCCESS="Menu was saved and the menu items were imported from the selected preset."
+COM_MENUS_PRESET_IMPORT_FAILED="Menu was saved but failed to import the preset: %s"
+COM_MENUS_PRESET_LOAD_FAILED="Failed to load the specified preset."
+COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
+COM_MENUS_SAVE_SUCCESS="Menu item saved."
+COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
+COM_MENUS_SELECT_MENU="- Select Menu -"
+COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED="Filter the list by a state other than trashed or clear the filter."
+COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager."
+COM_MENUS_SELECT_MENU_FIRST_EXPORT="To use export, please first select a valid Menu in the manager."
+COM_MENUS_SUBMENU_ITEMS="Menu Items"
+COM_MENUS_SUBMENU_MENUS="Menus"
+COM_MENUS_SUCCESS_REORDERED="Menu item reordered."
+COM_MENUS_TIP_ALIAS_LABEL="<strong>Warning!</strong><br />Leave the alias field empty if the menu item alias and the menu item linked to by the alias have the same parent."
+COM_MENUS_TIP_ASSOCIATION="Associated menu items"
+COM_MENUS_TITLE_EDIT_ITEM="Menu Manager: Title Edit Item"
+COM_MENUS_TITLE_TRANSLATION="Title (%s)"
+COM_MENUS_TOOLBAR_SET_HOME="Home"
+COM_MENUS_TYPE_ALIAS="Menu Item Alias"
+COM_MENUS_TYPE_ALIAS_DESC="Create an alias to another menu item."
+COM_MENUS_TYPE_CHOOSE="Select a Menu Item Type:"
+COM_MENUS_TYPE_CONTAINER="Components Menu Container"
+COM_MENUS_TYPE_CONTAINER_DESC="This will create a container menu which will show the items in the protected menu type 'main'. You can also selectively hide or show menu items."
+COM_MENUS_TYPE_EXTERNAL_URL="URL"
+COM_MENUS_TYPE_EXTERNAL_URL_DESC="An external or internal URL."
+COM_MENUS_TYPE_HEADING="Menu Heading"
+COM_MENUS_TYPE_HEADING_DESC="A heading for the parent of submenu items."
+COM_MENUS_TYPE_SEPARATOR="Separator"
+COM_MENUS_TYPE_SEPARATOR_DESC="A separator with or without a text label, useful to separate items within a menu."
+COM_MENUS_TYPE_SYSTEM="System Links"
+COM_MENUS_TYPE_UNEXISTING="Component '%s' does not exist."
+COM_MENUS_TYPE_UNKNOWN="Unknown"
+COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menus: Edit Item"
+COM_MENUS_VIEW_EDIT_MENU_TITLE="Menus: Edit"
+COM_MENUS_VIEW_ITEMS_ALL_TITLE="Menus: All Menu Items"
+COM_MENUS_VIEW_ITEMS_MENU_TITLE="Menus: Items (%s)"
+COM_MENUS_VIEW_ITEMS_TITLE="Menus: Items"
+COM_MENUS_VIEW_MENUS_TITLE="Menus"
+COM_MENUS_VIEW_NEW_ITEM_TITLE="Menus: New Item"
+COM_MENUS_VIEW_NEW_MENU_TITLE="Menus: Add"
+COM_MENUS_XML_DESCRIPTION="Component for creating menus."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_menus.sys.ini b/core/administrator/language/en-GB/en-GB.com_menus.sys.ini
new file mode 100644
index 00000000..af384cc1
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_menus.sys.ini
@@ -0,0 +1,17 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MENUS="Menus"
+COM_MENUS_ITEMS_CHOOSE_MENU_DESC="Choose a Menutype for the target page.<br><br>Not to be confused with the <strong>Menu</strong> under which this menu item will be assigned."
+COM_MENUS_ITEMS_CHOOSE_MENU_LABEL="Choose a Menutype"
+COM_MENUS_ITEMS_VIEW_DEFAULT_DESC="Shows a list of menu items"
+COM_MENUS_ITEMS_VIEW_DEFAULT_TITLE="Menu Items"
+COM_MENUS_ITEM_VIEW_EDIT_DESC="Shows a form to create a new menu item"
+COM_MENUS_ITEM_VIEW_EDIT_TITLE="New Menu Item"
+COM_MENUS_MENUS_VIEW_DEFAULT_DESC="Shows a list of Menu Types"
+COM_MENUS_MENUS_VIEW_DEFAULT_TITLE="Menus"
+COM_MENUS_MENU_VIEW_EDIT_DESC="Shows a form to create a new menu"
+COM_MENUS_MENU_VIEW_EDIT_TITLE="New Menu"
+COM_MENUS_XML_DESCRIPTION="Component for creating menus."
diff --git a/core/administrator/language/en-GB/en-GB.com_messages.ini b/core/administrator/language/en-GB/en-GB.com_messages.ini
new file mode 100644
index 00000000..210960ed
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_messages.ini
@@ -0,0 +1,77 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MESSAGES="Messaging"
+COM_MESSAGES_ADD="New Private Message"
+COM_MESSAGES_CONFIG_SAVED="Configuration saved."
+COM_MESSAGES_CONFIGURATION="Messages: Options"
+COM_MESSAGES_ERR_INVALID_USER="Invalid user"
+COM_MESSAGES_ERR_SEND_FAILED="The user has locked their mailbox. Message failed."
+COM_MESSAGES_ERROR_COULD_NOT_SEND_INVALID_RECIPIENT="The email message cannot be sent due to an invalid recipient address."
+COM_MESSAGES_ERROR_COULD_NOT_SEND_INVALID_REPLYTO="The email message cannot be sent due to an invalid reply-to address."
+COM_MESSAGES_ERROR_INVALID_FROM_USER="Invalid sender"
+COM_MESSAGES_ERROR_INVALID_MESSAGE="Invalid message content"
+COM_MESSAGES_ERROR_INVALID_SUBJECT="Invalid subject"
+COM_MESSAGES_ERROR_INVALID_TO_USER="Invalid recipient"
+COM_MESSAGES_FIELD_AUTO_PURGE_DESC="Automatically delete private messages after the given number of days."
+COM_MESSAGES_FIELD_AUTO_PURGE_LABEL="Auto-delete Messages (days)"
+COM_MESSAGES_FIELD_DATE_TIME_LABEL="Posted"
+COM_MESSAGES_FIELD_LOCK_DESC="Lock your private message inbox."
+COM_MESSAGES_FIELD_LOCK_LABEL="Lock Inbox"
+COM_MESSAGES_FIELD_MAIL_ON_NEW_DESC="Email me when a new private message arrives."
+COM_MESSAGES_FIELD_MAIL_ON_NEW_LABEL="Email New Messages"
+COM_MESSAGES_FIELD_MESSAGE_DESC="You must enter a message."
+COM_MESSAGES_FIELD_MESSAGE_LABEL="Message"
+COM_MESSAGES_FIELD_SUBJECT_DESC="You must enter a subject."
+COM_MESSAGES_FIELD_SUBJECT_LABEL="Subject"
+COM_MESSAGES_FIELD_USER_ID_FROM_LABEL="From"
+COM_MESSAGES_FIELD_USER_ID_TO_DESC="You must select a recipient."
+COM_MESSAGES_FIELD_USER_ID_TO_LABEL="Recipient"
+COM_MESSAGES_FILTER_SEARCH_LABEL="Search Messages"
+COM_MESSAGES_FILTER_STATES_DESC="Filter by message state."
+COM_MESSAGES_FILTER_STATES_LABEL="State"
+COM_MESSAGES_HEADING_FROM="From"
+COM_MESSAGES_HEADING_FROM_ASC="From ascending"
+COM_MESSAGES_HEADING_FROM_DESC="From descending"
+COM_MESSAGES_HEADING_READ="Read"
+COM_MESSAGES_HEADING_READ_ASC="Read ascending"
+COM_MESSAGES_HEADING_READ_DESC="Read descending"
+COM_MESSAGES_HEADING_SUBJECT="Subject"
+COM_MESSAGES_HEADING_SUBJECT_ASC="Subject ascending"
+COM_MESSAGES_HEADING_SUBJECT_DESC="Subject descending"
+COM_MESSAGES_INVALID_REPLY_ID="Invalid recipient"
+COM_MESSAGES_MANAGER_MESSAGES="Private Messages"
+COM_MESSAGES_MARK_AS_READ="Mark as Read"
+COM_MESSAGES_MARK_AS_UNREAD="Mark as Unread"
+COM_MESSAGES_MY_SETTINGS="My Settings"
+COM_MESSAGES_N_ITEMS_DELETED="%d messages deleted."
+COM_MESSAGES_N_ITEMS_DELETED_1="Message deleted."
+COM_MESSAGES_N_ITEMS_PUBLISHED="%d messages marked as read."
+COM_MESSAGES_N_ITEMS_PUBLISHED_1="Message marked as read."
+COM_MESSAGES_N_ITEMS_TRASHED="%d messages trashed."
+COM_MESSAGES_N_ITEMS_TRASHED_1="Message trashed."
+COM_MESSAGES_N_ITEMS_UNPUBLISHED="%d messages marked as unread."
+COM_MESSAGES_N_ITEMS_UNPUBLISHED_1="Message marked as unread."
+COM_MESSAGES_NEW_MESSAGE="New Message from %1$s at %2$s"
+; The following string is deprecated and will be removed in Joomla 4.0
+COM_MESSAGES_NEW_MESSAGE_ARRIVED="A new private message has arrived from %s"
+COM_MESSAGES_NO_ITEM_SELECTED="No messages selected."
+COM_MESSAGES_OPTION_READ="Read"
+COM_MESSAGES_OPTION_UNREAD="Unread"
+COM_MESSAGES_PLEASE_LOGIN="Please log in to %s to read your message."
+COM_MESSAGES_RE="Re:"
+COM_MESSAGES_READ="Messages"
+COM_MESSAGES_READ_PRIVATE_MESSAGE="Read Private Message"
+COM_MESSAGES_SEARCH_IN_SUBJECT="Search in message subject and description."
+COM_MESSAGES_TOOLBAR_MARK_AS_READ="Mark as Read"
+COM_MESSAGES_TOOLBAR_MARK_AS_UNREAD="Mark as Unread"
+COM_MESSAGES_TOOLBAR_MY_SETTINGS="My Settings"
+COM_MESSAGES_TOOLBAR_REPLY="Reply"
+COM_MESSAGES_TOOLBAR_SEND="Send"
+COM_MESSAGES_VIEW_PRIVATE_MESSAGE="Private Messages: View"
+COM_MESSAGES_WRITE_PRIVATE_MESSAGE="Private Messages: Write"
+COM_MESSAGES_XML_DESCRIPTION="Component for private messaging support in Backend."
+JLIB_APPLICATION_SAVE_SUCCESS="Message sent."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_messages.sys.ini b/core/administrator/language/en-GB/en-GB.com_messages.sys.ini
new file mode 100644
index 00000000..b70ced0e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_messages.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MESSAGES="Messaging"
+COM_MESSAGES_ADD="New Private Message"
+COM_MESSAGES_READ="Read Private Messages"
+COM_MESSAGES_XML_DESCRIPTION="Component for private messaging support in the Backend."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.com_modules.ini b/core/administrator/language/en-GB/en-GB.com_modules.ini
new file mode 100644
index 00000000..cd1948b7
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_modules.ini
@@ -0,0 +1,204 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MODULES="Modules Manager"
+COM_MODULES_ACTION_EDITFRONTEND="Frontend Editing"
+COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC="Allows users in the group to edit in Frontend."
+COM_MODULES_ADMIN_LANG_FILTER_FIELDSET_LABEL="Administrator Modules"
+COM_MODULES_ADMIN_LANG_FILTER_DESC="Allows filtering administrator modules per administrator language."
+COM_MODULES_ADMIN_LANG_FILTER_LABEL="Language Filtering"
+COM_MODULES_ADVANCED_FIELDSET_LABEL="Advanced"
+COM_MODULES_ASSIGNED_VARIES_EXCEPT="All except selected"
+COM_MODULES_ASSIGNED_VARIES_ONLY="Selected"
+COM_MODULES_BASIC_FIELDSET_LABEL="Options"
+COM_MODULES_BATCH_POSITION_LABEL="Set Position"
+COM_MODULES_BATCH_POSITION_NOCHANGE="Keep original Position"
+COM_MODULES_BATCH_POSITION_NOPOSITION="No Module Position"
+COM_MODULES_BATCH_OPTIONS="Batch process the selected modules"
+COM_MODULES_BATCH_TIP="If choosing to copy a module, any other actions selected will be applied to the copied module. Otherwise, all actions are applied to the selected module. When copying and not changing position, it is nevertheless necessary to select 'Keep Original Position' in the dropdown."
+COM_MODULES_CHANGE_POSITION_BUTTON="Select"
+COM_MODULES_CHANGE_POSITION_TITLE="Change"
+COM_MODULES_CONFIGURATION="Module: Options"
+COM_MODULES_CUSTOM_OUTPUT="Custom Output"
+COM_MODULES_ERR_XML="Module XML data not available"
+COM_MODULES_ERROR_CANNOT_FIND_MODULE="Can't find module"
+COM_MODULES_ERROR_CANNOT_GET_MODULE="Can't get module"
+COM_MODULES_ERROR_INVALID_EXTENSION="Invalid module"
+COM_MODULES_ERROR_NO_MODULES_SELECTED="No module selected."
+COM_MODULES_EXTENSION_PUBLISHED_DISABLED="Module disabled and published."
+COM_MODULES_EXTENSION_PUBLISHED_ENABLED="Module enabled and published."
+COM_MODULES_EXTENSION_UNPUBLISHED_DISABLED="Module disabled and unpublished."
+COM_MODULES_EXTENSION_UNPUBLISHED_ENABLED="Module enabled and unpublished."
+COM_MODULES_EXTRA_STYLE_DESC="Specify the style for the module or the modules in the position selected."
+COM_MODULES_EXTRA_STYLE_TITLE="Module(s) style"
+COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL="Automatic Title"
+COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC="Set yes if you want an automatic translated title. Its use depends on the Administrator template."
+COM_MODULES_FIELD_CACHE_TIME_DESC="The time in seconds before the module is recached."
+COM_MODULES_FIELD_CACHE_TIME_LABEL="Cache Time"
+COM_MODULES_FIELD_CACHING_DESC="Use the global cache setting to cache the content of this module or disable caching for this module."
+COM_MODULES_FIELD_CACHING_LABEL="Caching"
+COM_MODULES_FIELD_CLIENT_ID_DESC="The location of the module, Frontend or Backend. You can't change this value."
+COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"
+COM_MODULES_FIELD_CONTENT_DESC="Text"
+COM_MODULES_FIELD_CONTENT_LABEL="Text"
+COM_MODULES_FIELD_MODULE_DESC="Module type."
+COM_MODULES_FIELD_MODULE_LABEL="Module Type"
+COM_MODULES_FIELD_MODULECLASS_SFX_DESC="A suffix to be applied to the CSS class of the module. This allows for individual module styling."
+COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class Suffix"
+COM_MODULES_FIELD_NOTE_DESC="An optional note to display in the Module Manager."
+COM_MODULES_FIELD_NOTE_LABEL="Note"
+COM_MODULES_FIELD_POSITION_DESC="You may select a module position from the list of pre-defined positions or enter your own module position by typing the name in the field and pressing enter."
+COM_MODULES_FIELD_POSITION_LABEL="Position"
+COM_MODULES_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the module."
+COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+COM_MODULES_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the module."
+COM_MODULES_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+COM_MODULES_FIELD_PUBLISHED_DESC="If published, this module will display on your site Frontend or Backend depending on the module."
+COM_MODULES_FIELD_SHOWTITLE_DESC="Show or hide module title on display. Effect will depend on the chrome style in the template."
+COM_MODULES_FIELD_SHOWTITLE_LABEL="Show Title"
+COM_MODULES_FIELD_TITLE_DESC="Module must have a title."
+COM_MODULES_FIELD_VALUE_NOCACHING="No caching"
+COM_MODULES_FIELD_MODULE_TAG_LABEL="Module Tag"
+COM_MODULES_FIELD_MODULE_TAG_DESC="The HTML tag for module."
+COM_MODULES_FIELD_BOOTSTRAP_SIZE_LABEL="Bootstrap Size"
+COM_MODULES_FIELD_BOOTSTRAP_SIZE_DESC="An option to specify how many columns the module will use."
+COM_MODULES_FIELD_HEADER_TAG_LABEL="Header Tag"
+COM_MODULES_FIELD_HEADER_TAG_DESC="The HTML tag for module header/title."
+COM_MODULES_FIELD_HEADER_CLASS_LABEL="Header Class"
+COM_MODULES_FIELD_HEADER_CLASS_DESC="The CSS class for module header/title."
+COM_MODULES_FIELD_MODULE_STYLE_LABEL="Module Style"
+COM_MODULES_FIELD_MODULE_STYLE_DESC="Use this option to override the template style for its position."
+COM_MODULES_FIELDSET_RULES="Permissions"
+COM_MODULES_FILTER_SEARCH_DESC="Filter by position name."
+COM_MODULES_GENERAL_FIELDSET_DESC="Configure module edit interface settings."
+COM_MODULES_HEADING_MODULE="Type"
+COM_MODULES_HEADING_MODULE_ASC="Type ascending"
+COM_MODULES_HEADING_MODULE_DESC="Type descending"
+COM_MODULES_HEADING_PAGES="Pages"
+COM_MODULES_HEADING_PAGES_ASC="Pages ascending"
+COM_MODULES_HEADING_PAGES_DESC="Pages descending"
+COM_MODULES_HEADING_POSITION="Position"
+COM_MODULES_HEADING_POSITION_ASC="Position ascending"
+COM_MODULES_HEADING_POSITION_DESC="Position descending"
+COM_MODULES_HEADING_TEMPLATES="Templates"
+COM_MODULES_HTML_PUBLISH_DISABLED="Publish module::Extension disabled"
+COM_MODULES_HTML_PUBLISH_ENABLED="Publish module::Extension enabled"
+COM_MODULES_HTML_UNPUBLISH_DISABLED="Unpublish module::Extension disabled"
+COM_MODULES_HTML_UNPUBLISH_ENABLED="Unpublish module::Extension enabled"
+COM_MODULES_MANAGER_MODULE="Modules: %s"
+COM_MODULES_MANAGER_MODULE_ADD="Modules: Add New Module"
+COM_MODULES_MANAGER_MODULE_EDIT="Modules: Edit Module"
+COM_MODULES_MANAGER_MODULES="Modules"
+COM_MODULES_MANAGER_MODULES_ADMIN="Modules (Administrator)"
+COM_MODULES_MANAGER_MODULES_SITE="Modules (Site)"
+COM_MODULES_MENU_ASSIGNMENT="Menu Assignment"
+COM_MODULES_MENU_ITEM_SEPARATOR="Separator"
+COM_MODULES_MENU_ITEM_HEADING="Heading"
+COM_MODULES_MENU_ITEM_ALIAS="Alias"
+COM_MODULES_MENU_ITEM_URL="URL"
+COM_MODULES_MODULE_ASSIGN="Module Assignment"
+COM_MODULES_MODULE="Module"
+COM_MODULES_MODULE_DESCRIPTION="Module Description"
+COM_MODULES_MODULE_TEMPLATE_POSITION="%1$s (%2$s)"
+COM_MODULES_MODULES="Modules"
+COM_MODULES_MODULES_FILTER_SEARCH_DESC="Search in module title and note. Prefix with ID: to search for a module ID."
+COM_MODULES_MODULES_FILTER_SEARCH_LABEL="Search Modules"
+COM_MODULES_MSG_MANAGE_NO_MODULES="There are no modules matching your query"
+COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED="This module is disabled. Use Extensions => Manage to enable it."
+COM_MODULES_N_ITEMS_ARCHIVED="%d modules archived."
+COM_MODULES_N_ITEMS_ARCHIVED_1="%d module archived."
+COM_MODULES_N_ITEMS_CHECKED_IN_0="No module checked in."
+COM_MODULES_N_ITEMS_CHECKED_IN_1="%d module checked in."
+COM_MODULES_N_ITEMS_CHECKED_IN_MORE="%d modules checked in."
+COM_MODULES_N_ITEMS_DELETED="%d modules deleted."
+COM_MODULES_N_ITEMS_DELETED_1="%d module deleted."
+COM_MODULES_N_ITEMS_PUBLISHED="%d modules published."
+COM_MODULES_N_ITEMS_PUBLISHED_1="%d module published."
+COM_MODULES_N_ITEMS_TRASHED="%d modules trashed."
+COM_MODULES_N_ITEMS_TRASHED_1="%d module trashed."
+COM_MODULES_N_ITEMS_UNPUBLISHED="%d modules unpublished."
+COM_MODULES_N_ITEMS_UNPUBLISHED_1="%d module unpublished."
+COM_MODULES_N_MODULES_DUPLICATED="%d modules duplicated."
+COM_MODULES_N_MODULES_DUPLICATED_1="%d module duplicated."
+COM_MODULES_NO_ITEM_SELECTED="No modules selected."
+COM_MODULES_NODESCRIPTION="No description available."
+COM_MODULES_NONE=":: None ::"
+COM_MODULES_OPTION_MENU_ALL="On all pages"
+COM_MODULES_OPTION_MENU_EXCLUDE="On all pages except those selected"
+COM_MODULES_OPTION_MENU_INCLUDE="Only on the pages selected"
+COM_MODULES_OPTION_MENU_NONE="No pages"
+COM_MODULES_OPTION_ORDER_POSITION="%d. %s"
+COM_MODULES_OPTION_POSITION_TEMPLATE_DEFINED="Template"
+COM_MODULES_OPTION_POSITION_USER_DEFINED="User"
+COM_MODULES_OPTION_SELECT_CLIENT="- Select Type -"
+COM_MODULES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
+COM_MODULES_OPTION_SELECT_MODULE="- Select Type -"
+; Deprecated 4.0
+COM_MODULES_OPTION_SELECT_PAGE="- Select Page -"
+COM_MODULES_OPTION_SELECT_POSITION="- Select Position -"
+COM_MODULES_OPTION_SELECT_TYPE="- Select type -"
+COM_MODULES_POSITION_ANALYTICS="Analytics"
+COM_MODULES_POSITION_BANNER="Banner"
+COM_MODULES_POSITION_BOTTOM="Bottom"
+COM_MODULES_POSITION_BREADCRUMB="Breadcrumb"
+COM_MODULES_POSITION_BREADCRUMBS="Breadcrumbs"
+COM_MODULES_POSITION_DEBUG="Debug"
+COM_MODULES_POSITION_FOOTER="Footer"
+COM_MODULES_POSITION_HEADER="Header"
+COM_MODULES_POSITION_LEFT2="Left 2"
+COM_MODULES_POSITION_LEFT="Left"
+COM_MODULES_POSITION_MAINNAV="Main Navigation"
+COM_MODULES_POSITION_NAV="Navigation"
+COM_MODULES_POSITION_OFFLINE="Offline"
+COM_MODULES_POSITION_POSITION-0="Position 0"
+COM_MODULES_POSITION_POSITION-10="Position 10"
+COM_MODULES_POSITION_POSITION-11="Position 11"
+COM_MODULES_POSITION_POSITION-12="Position 12"
+COM_MODULES_POSITION_POSITION-13="Position 13"
+COM_MODULES_POSITION_POSITION-14="Position 14"
+COM_MODULES_POSITION_POSITION-15="Position 15"
+COM_MODULES_POSITION_POSITION-1="Position 1"
+COM_MODULES_POSITION_POSITION-2="Position 2"
+COM_MODULES_POSITION_POSITION-3="Position 3"
+COM_MODULES_POSITION_POSITION-4="Position 4"
+COM_MODULES_POSITION_POSITION-5="Position 5"
+COM_MODULES_POSITION_POSITION-6="Position 6"
+COM_MODULES_POSITION_POSITION-7="Position 7"
+COM_MODULES_POSITION_POSITION-8="Position 8"
+COM_MODULES_POSITION_POSITION-9="Position 9"
+COM_MODULES_POSITION_RIGHT2="Right 2"
+COM_MODULES_POSITION_RIGHT="Right"
+COM_MODULES_POSITION_SUB1="Sub 1"
+COM_MODULES_POSITION_SUB2="Sub 2"
+COM_MODULES_POSITION_SUB3="Sub 3"
+COM_MODULES_POSITION_SUB4="Sub 4"
+COM_MODULES_POSITION_SUB5="Sub 5"
+COM_MODULES_POSITION_SUB6="Sub 6"
+COM_MODULES_POSITION_SUB="Sub"
+COM_MODULES_POSITION_SUBNAV="Sub Navigation"
+COM_MODULES_POSITION_SYNDICATE="Syndicate"
+COM_MODULES_POSITION_TOP2="Top 2"
+COM_MODULES_POSITION_TOP3="Top 3"
+COM_MODULES_POSITION_TOP4="Top 4"
+COM_MODULES_POSITION_TOP="Top"
+COM_MODULES_POSITION_USER1="User 1"
+COM_MODULES_POSITION_USER2="User 2"
+COM_MODULES_POSITION_USER3="User 3"
+COM_MODULES_POSITION_USER4="User 4"
+COM_MODULES_POSITION_USER5="User 5"
+COM_MODULES_POSITION_USER6="User 6"
+COM_MODULES_POSITION_USER7="User 7"
+COM_MODULES_POSITION_USER8="User 8"
+COM_MODULES_SAVE_SUCCESS="Module saved"
+COM_MODULES_TYPE_CHOOSE="Select a Module Type:"
+COM_MODULES_XML_DESCRIPTION="Component for module management in Backend"
+COM_MODULES_ADD_CUSTOM_POSITION="Add custom position"
+COM_MODULES_CUSTOM_POSITION="Active Positions"
+COM_MODULES_TYPE_OR_SELECT_POSITION="Type or Select a Position"
+COM_MODULES_DESELECT="Deselect"
+COM_MODULES_EXPAND="Expand"
+COM_MODULES_COLLAPSE="Collapse"
+COM_MODULES_SUBITEMS="Sub-items:"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_modules.sys.ini b/core/administrator/language/en-GB/en-GB.com_modules.sys.ini
new file mode 100644
index 00000000..75cb85d6
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_modules.sys.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MODULES="Modules"
+COM_MODULES_ACTION_EDITFRONTEND="Frontend Editing"
+COM_MODULES_ACTION_EDITFRONTEND_COMPONENT_DESC="Allows users in the group to edit in Frontend."
+COM_MODULES_GENERAL="General"
+COM_MODULES_MODULES_VIEW_DEFAULT_DESC="Shows a list of modules to manage"
+COM_MODULES_MODULES_VIEW_DEFAULT_TITLE="Module Manager"
+COM_MODULES_REDIRECT_EDIT_DESC="Select if module editing should be opened in the site or administration interface."
+COM_MODULES_REDIRECT_EDIT_LABEL="Edit Module"
+COM_MODULES_XML_DESCRIPTION="Component for module management on the Backend."
diff --git a/core/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/core/administrator/language/en-GB/en-GB.com_newsfeeds.ini
new file mode 100644
index 00000000..7e950d96
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_newsfeeds.ini
@@ -0,0 +1,140 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_NEWSFEEDS="News Feeds"
+; COM_NEWSFEEDS_BATCH_MENU_LABEL is deprecated, use JLIB_HTML_BATCH_MENU_LABEL instead.
+COM_NEWSFEEDS_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
+COM_NEWSFEEDS_BATCH_OPTIONS="Batch process the selected news feeds"
+COM_NEWSFEEDS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved news feeds. Otherwise, all actions are applied to the selected news feeds."
+COM_NEWSFEEDS_CACHE_TIME_HEADING="Cache Time"
+COM_NEWSFEEDS_CACHE_TIME_HEADING_ASC="Cache Time ascending"
+COM_NEWSFEEDS_CACHE_TIME_HEADING_DESC="Cache Time descending"
+COM_NEWSFEEDS_CATEGORIES_DESC="These settings apply for News Feeds Categories Options unless they are changed for a specific menu item."
+COM_NEWSFEEDS_CHANGE_FEED="Select or Change News Feed"
+; COM_NEWSFEEDS_CHANGE_FEED_BUTTON is deprecated, use COM_NEWSFEEDS_CHANGE_FEED instead;
+COM_NEWSFEEDS_CHANGE_FEED_BUTTON="Select Feed"
+COM_NEWSFEEDS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Newsfeeds Component will integrate with other extensions."
+COM_NEWSFEEDS_CONFIGURATION="News Feed: Options"
+COM_NEWSFEEDS_EDIT_NEWSFEED="Edit News Feed"
+COM_NEWSFEEDS_ERROR_UNIQUE_ALIAS="Another News feed from this category has the same alias (remember it may be a trashed item)."
+COM_NEWSFEEDS_ERROR_ALL_LANGUAGE_ASSOCIATED="A news feed item set to All languages can't be associated. Associations have not been set."
+COM_NEWSFEEDS_FEED_CATEGORY_OPTIONS_LABEL="Feeds Category Display Options"
+COM_NEWSFEEDS_FIELD_CACHETIME_DESC="The number of minutes before the news feed cache is refreshed."
+COM_NEWSFEEDS_FIELD_CACHETIME_LABEL="Cache Time"
+COM_NEWSFEEDS_FIELD_CATEGORIES_OPTIONS_LABEL="Feeds Categories Display Options"
+COM_NEWSFEEDS_FIELD_CATEGORY_DESC="The category that this feed is assigned to."
+COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC="Number of characters to display per feed. 0 will show all the text."
+COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_LABEL="Characters Count"
+COM_NEWSFEEDS_FIELD_CHARACTERS_COUNT_DESC="Number of characters to include in the feed. 0 will show all the text."
+COM_NEWSFEEDS_FIELD_CHARACTERS_COUNT_LABEL="Characters Count"
+COM_NEWSFEEDS_FIELD_CONFIG_CATEGORY_SETTINGS_DESC="These settings apply for News Feeds Category Options unless they are changed for a specific menu item."
+COM_NEWSFEEDS_FIELD_CONFIG_LIST_SETTINGS_DESC="These settings apply for List Layout Options unless they are changed for a specific menu item."
+COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_DESC="These settings apply for single news feeds unless they are changed for a specific menu item or news feed."
+COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_LABEL="News Feed"
+COM_NEWSFEEDS_FIELD_DESCRIPTION_DESC="Enter a description for the feed."
+COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC="The order used to display the feed."
+COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL="Feed Display Order"
+COM_NEWSFEEDS_FIELD_FEED_OPTIONS_DESC="Feeds display options."
+COM_NEWSFEEDS_FIELD_FEED_OPTIONS_LABEL="Feeds Display Options"
+COM_NEWSFEEDS_FIELD_FIRST_DESC="Select or upload the image to be displayed."
+COM_NEWSFEEDS_FIELD_FIRST_LABEL="First Image"
+COM_NEWSFEEDS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images. Replaced with caption text if it is present."
+COM_NEWSFEEDS_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_NEWSFEEDS_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image."
+COM_NEWSFEEDS_FIELD_IMAGE_CAPTION_LABEL="Caption"
+COM_NEWSFEEDS_FIELD_LANGUAGE_DESC="Assign a language to this news feed."
+COM_NEWSFEEDS_FIELD_LINK_DESC="Link to the news feed. IDN (International) Links are converted to punycode when they are saved."
+COM_NEWSFEEDS_FIELD_LINK_LABEL="Link"
+COM_NEWSFEEDS_FIELD_MODIFIED_BY_DESC="Name of the user who modified this news feed."
+COM_NEWSFEEDS_FIELD_MODIFIED_DESC="The date and time the news feed was last modified."
+COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC="Show or hide the Number of Articles in each Feed (You can set this value in each News feed)."
+COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL="# Articles"
+COM_NEWSFEEDS_FIELD_NUM_ARTICLES_DESC="Number of articles from the feed to display."
+COM_NEWSFEEDS_FIELD_NUM_ARTICLES_LABEL="Number of Articles"
+COM_NEWSFEEDS_FIELD_NUMBER_ITEMS_LIST_DESC="Default number of feeds to list on a page."
+COM_NEWSFEEDS_FIELD_NUMBER_ITEMS_LIST_LABEL="# Feeds to List"
+COM_NEWSFEEDS_FIELD_NUMFEEDS_DESC="Number of feeds to display."
+COM_NEWSFEEDS_FIELD_NUMFEEDS_LABEL="Number of Feeds"
+COM_NEWSFEEDS_FIELD_OPTIONS="Feed"
+COM_NEWSFEEDS_FIELD_RTL_DESC="Select the language direction of the feed."
+COM_NEWSFEEDS_FIELD_RTL_LABEL="Language Direction"
+COM_NEWSFEEDS_FIELD_SECOND_DESC="Select or upload the second image to be displayed."
+COM_NEWSFEEDS_FIELD_SECOND_LABEL="Second Image"
+COM_NEWSFEEDS_FIELD_SELECT_CATEGORY_DESC="Choose a feed category to display."
+COM_NEWSFEEDS_FIELD_SELECT_FEED_DESC="Select a feed to display."
+COM_NEWSFEEDS_FIELD_SELECT_FEED_LABEL="Feed"
+COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC="Show or hide the number of news feeds in category."
+COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL="# Feeds in Category"
+COM_NEWSFEEDS_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for a category."
+COM_NEWSFEEDS_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags"
+COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC="Show or hide feed description."
+COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL="Feed Description"
+COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_DESC="Show or hide feed images."
+COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL="Feed Image"
+COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC="Show or hide feed content."
+COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL="Feed Content"
+COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC="Show or hide feed links URL."
+COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL="Feed Links"
+COM_NEWSFEEDS_FIELD_SHOW_TAGS_DESC="Show the tags for a news feed."
+COM_NEWSFEEDS_FIELD_SHOW_TAGS_LABEL="Show Tags"
+COM_NEWSFEEDS_FIELD_VALUE_LTR="Left to Right Direction"
+COM_NEWSFEEDS_FIELD_VALUE_NONE="None"
+COM_NEWSFEEDS_FIELD_VALUE_RTL="Right to Left Direction"
+COM_NEWSFEEDS_FIELD_VALUE_SITE="Site Language Direction"
+COM_NEWSFEEDS_FIELD_VERSION_LABEL="Revision"
+COM_NEWSFEEDS_FIELD_VERSION_DESC="A count of the number of times this news feed has been revised."
+COM_NEWSFEEDS_FIELDSET_IMAGES="Images"
+COM_NEWSFEEDS_FIELDSET_MORE_OPTIONS_LABEL="Feed Display Options"
+COM_NEWSFEEDS_FILTER_SEARCH_DESC="Search in news feed title and alias. Prefix with ID: to search for a news feed ID."
+COM_NEWSFEEDS_FILTER_SEARCH_LABEL="Search News Feeds"
+COM_NEWSFEEDS_FLOAT_DESC="Controls placement of the image."
+COM_NEWSFEEDS_FLOAT_FIRST_LABEL="First Image Float"
+COM_NEWSFEEDS_FLOAT_LABEL="Image Float"
+COM_NEWSFEEDS_FLOAT_SECOND_LABEL="Second Image Float"
+COM_NEWSFEEDS_HEADING_ASSOCIATION="Association"
+COM_NEWSFEEDS_HITS_DESC="Number of hits for this news feed."
+; The following 2 strings are deprecated and will be removed with 4.0.
+COM_NEWSFEEDS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="News Feed Item Association"
+COM_NEWSFEEDS_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a news feed item for the target language. This association will let the Language Switcher module redirect to the associated news feed item in another language. If used, make sure to display the Language switcher module on the relevant pages. A news feed item set to language 'All' can't be associated."
+COM_NEWSFEEDS_LEFT="Left"
+COM_NEWSFEEDS_MANAGER_NEWSFEED="News Feeds: New/Edit"
+COM_NEWSFEEDS_MANAGER_NEWSFEED_NEW="News Feeds: New"
+COM_NEWSFEEDS_MANAGER_NEWSFEED_EDIT="News Feeds: Edit"
+COM_NEWSFEEDS_MANAGER_NEWSFEEDS="News Feeds"
+COM_NEWSFEEDS_N_ITEMS_ARCHIVED="%d news feeds archived."
+COM_NEWSFEEDS_N_ITEMS_ARCHIVED_1="News feed archived."
+COM_NEWSFEEDS_N_ITEMS_CHECKED_IN_0="No news feed checked in."
+COM_NEWSFEEDS_N_ITEMS_CHECKED_IN_1="News feed checked in."
+COM_NEWSFEEDS_N_ITEMS_CHECKED_IN_MORE="%d news feeds checked in."
+COM_NEWSFEEDS_N_ITEMS_DELETED="%d news feeds deleted."
+COM_NEWSFEEDS_N_ITEMS_DELETED_1="News feed deleted."
+COM_NEWSFEEDS_N_ITEMS_PUBLISHED="%d news feeds published."
+COM_NEWSFEEDS_N_ITEMS_PUBLISHED_1="News feed published."
+COM_NEWSFEEDS_N_ITEMS_TRASHED="%d news feeds trashed."
+COM_NEWSFEEDS_N_ITEMS_TRASHED_1="News feed trashed."
+COM_NEWSFEEDS_N_ITEMS_UNPUBLISHED="%d news feeds unpublished."
+COM_NEWSFEEDS_N_ITEMS_UNPUBLISHED_1="News feed unpublished."
+COM_NEWSFEEDS_NEW_NEWSFEED="New News Feed"
+COM_NEWSFEEDS_NEWSFEEDS="Newsfeeds"
+COM_NEWSFEEDS_NO_ITEM_SELECTED="No news feeds selected."
+COM_NEWSFEEDS_NONE="None"
+COM_NEWSFEEDS_NUM_ARTICLES_HEADING="# Articles"
+COM_NEWSFEEDS_NUM_ARTICLES_HEADING_ASC="# Articles ascending"
+COM_NEWSFEEDS_NUM_ARTICLES_HEADING_DESC="# Articles descending"
+COM_NEWSFEEDS_PUBLISH_ITEM="Publish News Feed"
+COM_NEWSFEEDS_RIGHT="Right"
+COM_NEWSFEEDS_SAVE_SUCCESS="News feed saved."
+COM_NEWSFEEDS_SEARCH_IN_TITLE="Search"
+COM_NEWSFEEDS_SELECT_A_FEED="Select a News Feed"
+COM_NEWSFEEDS_SELECT_FEED="Select feed"
+COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty if it has no news feeds or subcategories."
+COM_NEWSFEEDS_SUBMENU_CATEGORIES="Categories"
+COM_NEWSFEEDS_SUBMENU_NEWSFEEDS="News Feeds"
+COM_NEWSFEEDS_TIP_ASSOCIATION="Associated news feeds"
+COM_NEWSFEEDS_UNPUBLISH_ITEM="Unpublish News Feed"
+COM_NEWSFEEDS_WARNING_PROVIDE_VALID_NAME="Please provide a valid name."
+COM_NEWSFEEDS_XML_DESCRIPTION="This component manages RSS and Atom news feeds."
+JGLOBAL_NEWITEMSLAST_DESC="New news feeds default to the last position. The ordering can be changed after this news feed has been saved."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini b/core/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
new file mode 100644
index 00000000..4f1afe09
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
@@ -0,0 +1,24 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_NEWSFEEDS="News Feeds"
+COM_NEWSFEEDS_CATEGORIES="Categories"
+COM_NEWSFEEDS_CATEGORIES_VIEW_DEFAULT_DESC="Show all the news feed categories within a category."
+COM_NEWSFEEDS_CATEGORIES_VIEW_DEFAULT_OPTION="Default"
+COM_NEWSFEEDS_CATEGORIES_VIEW_DEFAULT_TITLE="List All News Feed Categories"
+COM_NEWSFEEDS_CATEGORY_ADD_TITLE="News Feed: Add Category"
+COM_NEWSFEEDS_CATEGORY_EDIT_TITLE="News Feed: Edit Category"
+COM_NEWSFEEDS_CATEGORY_VIEW_DEFAULT_DESC="Show all news feeds within a category."
+COM_NEWSFEEDS_CATEGORY_VIEW_DEFAULT_OPTION="Default"
+COM_NEWSFEEDS_CATEGORY_VIEW_DEFAULT_TITLE="List News Feeds in a Category"
+COM_NEWSFEEDS_CONTENT_TYPE_NEWSFEED="News feed"
+COM_NEWSFEEDS_CONTENT_TYPE_CATEGORY="News Feed Category"
+COM_NEWSFEEDS_FEEDS="Feeds"
+COM_NEWSFEEDS_NEWSFEED_VIEW_DEFAULT_DESC="Show a single news feed."
+COM_NEWSFEEDS_NEWSFEED_VIEW_DEFAULT_OPTION="Default"
+COM_NEWSFEEDS_NEWSFEED_VIEW_DEFAULT_TITLE="Single News Feed"
+COM_NEWSFEEDS_TAGS_NEWSFEED="News Feed"
+COM_NEWSFEEDS_TAGS_CATEGORY="News Feed Category"
+COM_NEWSFEEDS_XML_DESCRIPTION="This component manages RSS and Atom news feeds."
diff --git a/core/administrator/language/en-GB/en-GB.com_plugins.ini b/core/administrator/language/en-GB/en-GB.com_plugins.ini
new file mode 100644
index 00000000..d3935b27
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_plugins.ini
@@ -0,0 +1,46 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_PLUGINS="Plugins"
+COM_PLUGINS_ADVANCED_FIELDSET_LABEL="Advanced"
+COM_PLUGINS_BASIC_FIELDSET_LABEL="Basic"
+COM_PLUGINS_CONFIGURATION="Plugin: Options"
+COM_PLUGINS_ELEMENT_HEADING="Element"
+COM_PLUGINS_ERROR_FILE_NOT_FOUND="The file %s could not be found."
+COM_PLUGINS_FIELD_ELEMENT_DESC="Plugin main file name."
+COM_PLUGINS_FIELD_ELEMENT_LABEL="Plugin File"
+COM_PLUGINS_FIELD_ENABLED_DESC="The enabled status of this plugin."
+COM_PLUGINS_FIELD_FOLDER_DESC="Category/folder of plugins this plugin belongs to."
+COM_PLUGINS_FIELD_FOLDER_LABEL="Plugin Type"
+COM_PLUGINS_FIELD_NAME_DESC="The name of the plugin as defined in its xml."
+COM_PLUGINS_FIELD_NAME_LABEL="Plugin Name"
+COM_PLUGINS_FILTER_SEARCH_LABEL="Search Plugins"
+COM_PLUGINS_FOLDER_HEADING="Type"
+COM_PLUGINS_HEADING_ELEMENT_ASC="Element ascending"
+COM_PLUGINS_HEADING_ELEMENT_DESC="Element descending"
+COM_PLUGINS_HEADING_FOLDER_ASC="Type ascending"
+COM_PLUGINS_HEADING_FOLDER_DESC="Type descending"
+COM_PLUGINS_MANAGER_PLUGIN="Plugins: %s"
+COM_PLUGINS_MANAGER_PLUGINS="Plugins"
+COM_PLUGINS_MSG_MANAGE_NO_PLUGINS="There are no plugins installed matching your query."
+COM_PLUGINS_N_ITEMS_CHECKED_IN_0="No plugin checked in."
+COM_PLUGINS_N_ITEMS_CHECKED_IN_1="%d plugin checked in."
+COM_PLUGINS_N_ITEMS_CHECKED_IN_MORE="%d plugins checked in."
+COM_PLUGINS_N_ITEMS_PUBLISHED="%d plugins enabled."
+COM_PLUGINS_N_ITEMS_PUBLISHED_1="Plugin enabled."
+COM_PLUGINS_N_ITEMS_UNPUBLISHED="%d plugins disabled."
+COM_PLUGINS_N_ITEMS_UNPUBLISHED_1="Plugin disabled."
+COM_PLUGINS_NAME_HEADING="Plugin Name"
+COM_PLUGINS_NO_ITEM_SELECTED="No plugins selected."
+COM_PLUGINS_OPTION_FOLDER="- Select Type -"
+COM_PLUGINS_PLUGIN="Plugin"
+COM_PLUGINS_PLUGINS="Plugins"
+COM_PLUGINS_SAVE_SUCCESS="Plugin saved."
+COM_PLUGINS_SEARCH_IN_TITLE="Search in plugin name. Prefix with ID: to search for a plugin ID."
+COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins."
+COM_PLUGINS_XML_ERR="Plugins XML data not available."
+JLIB_HTML_PUBLISH_ITEM="Enable plugin"
+JLIB_HTML_UNPUBLISH_ITEM="Disable plugin"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_plugins.sys.ini b/core/administrator/language/en-GB/en-GB.com_plugins.sys.ini
new file mode 100644
index 00000000..65abe9dc
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_plugins.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_PLUGINS="Plugins"
+COM_PLUGINS_PLUGINS_VIEW_DEFAULT_DESC="Shows a list of plugins to manage"
+COM_PLUGINS_PLUGINS_VIEW_DEFAULT_TITLE="Plugin Manager"
+COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins."
diff --git a/core/administrator/language/en-GB/en-GB.com_postinstall.ini b/core/administrator/language/en-GB/en-GB.com_postinstall.ini
new file mode 100644
index 00000000..567782e0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_postinstall.ini
@@ -0,0 +1,18 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_POSTINSTALL="Post-installation Messages"
+COM_POSTINSTALL_BTN_HIDE="Hide this message"
+COM_POSTINSTALL_BTN_RESET="Reset Messages"
+COM_POSTINSTALL_CONFIGURATION="Post-installation Messages: Options"
+COM_POSTINSTALL_HIDE_ALL_MESSAGES="Hide all messages"
+COM_POSTINSTALL_LBL_MESSAGES="Post-installation and Upgrade Messages"
+COM_POSTINSTALL_LBL_NOMESSAGES_DESC="You have read all the messages."
+COM_POSTINSTALL_LBL_NOMESSAGES_TITLE="No Messages"
+COM_POSTINSTALL_LBL_RELEASENEWS="Release news <a href="_QQ_"https://www.joomla.org/announcements/release-news.html"_QQ_">from the Joomla! Project</a>"
+COM_POSTINSTALL_LBL_SINCEVERSION="Since version %s"
+COM_POSTINSTALL_MESSAGES_FOR="Showing messages for"
+COM_POSTINSTALL_MESSAGES_TITLE="Post-installation Messages for %s"
+COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla and its extensions."
diff --git a/core/administrator/language/en-GB/en-GB.com_postinstall.sys.ini b/core/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
new file mode 100644
index 00000000..90113f0b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_POSTINSTALL="Post-installation Messages"
+COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_DESC="Displays post-installation and post-upgrade messages for Joomla! and its extensions."
+COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_TITLE="Post-Installation Messages"
+COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions."
diff --git a/core/administrator/language/en-GB/en-GB.com_redirect.ini b/core/administrator/language/en-GB/en-GB.com_redirect.ini
new file mode 100644
index 00000000..f0ba0c75
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_redirect.ini
@@ -0,0 +1,100 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_REDIRECT="Redirects"
+COM_REDIRECT_ADVANCED_OPTIONS="Advanced"
+COM_REDIRECT_BATCH_OPTIONS="Bulk process to add new URLs"
+COM_REDIRECT_BATCH_TIP="Enter expired URL (mandatory) with a new URL (optional) separated with %1$s (eg old-url%1$snew-url). Each line one entry!"
+COM_REDIRECT_BULK_SEPARATOR_DESC="The separator used for bulk import, by default it is '|' but it can be ',' for a copy / paste from a CSV file for instance."
+COM_REDIRECT_BULK_SEPARATOR_LABEL="Bulk Import Separator"
+COM_REDIRECT_BUTTON_UPDATE_LINKS="Update Links"
+COM_REDIRECT_CLEAR_FAIL="Failed to delete disabled links."
+COM_REDIRECT_CLEAR_SUCCESS="All disabled links have been deleted."
+COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED="%1$s The 'Collect URLs' option in the %2$s is disabled. Error page URLs will not be collected by this component."
+COM_REDIRECT_COLLECT_URLS_ENABLED="%1$s The option 'Collect URLs' is enabled."
+; The following string is deprecated and will be removed with 4.0.
+COM_REDIRECT_COLLECT_URLS_DISABLED="The 'Collect URLs' option in the <a href="_QQ_"%s"_QQ_">Redirect System Plugin</a> is disabled. Error page URLs will not be collected by this component."
+COM_REDIRECT_CONFIGURATION="Redirect: Options"
+COM_REDIRECT_DEFAULT_IMPORT_STATE_DESC="When batch importing redirects, enable or disable by default."
+COM_REDIRECT_DEFAULT_IMPORT_STATE_LABEL="Import State"
+COM_REDIRECT_DISABLE_LINK="Disable Link"
+COM_REDIRECT_EDIT_LINK="Edit Link #%d"
+COM_REDIRECT_EDIT_PLUGIN_SETTINGS="Edit Plugin Settings"
+COM_REDIRECT_ENABLE_LINK="Enable Link"
+COM_REDIRECT_ERROR_DESTINATION_URL_REQUIRED="The redirect must have a destination URL"
+COM_REDIRECT_ERROR_DUPLICATE_OLD_URL="The source URL must be unique."
+COM_REDIRECT_ERROR_DUPLICATE_URLS="The source and destination URLs can't be the same."
+COM_REDIRECT_ERROR_SOURCE_URL_REQUIRED="The redirect must have a source URL."
+COM_REDIRECT_FILTER_SEARCH_DESC="Search in expired URL, new URL, referring page and comment. Prefix with ID: to search for a link ID."
+COM_REDIRECT_FILTER_SEARCH_LABEL="Search Links"
+COM_REDIRECT_FILTER_FILTER_HTTP_HEADER_LABEL="HTTP Status Code"
+COM_REDIRECT_FILTER_FILTER_HTTP_HEADER_DESC="Filter by the redirect HTTP Status Code."
+COM_REDIRECT_FILTER_SELECT_OPTION_HTTP_HEADER="- Select HTTP Status Code -"
+COM_REDIRECT_FIELD_COMMENT_DESC="Sometimes it is helpful to describe the URLs for redirect management later on."
+COM_REDIRECT_FIELD_COMMENT_LABEL="Comment"
+COM_REDIRECT_FIELD_CREATED_DATE_LABEL="Created Date"
+COM_REDIRECT_FIELD_NEW_URL_DESC="Enter the URL to be redirected to."
+COM_REDIRECT_BATCH_UPDATE_WITH_NEW_URL="Batch update new URL(s)"
+COM_REDIRECT_FIELD_NEW_URL_LABEL="New URL"
+COM_REDIRECT_FIELD_OLD_URL_DESC="Enter the URL that has to be redirected."
+COM_REDIRECT_FIELD_OLD_URL_LABEL="Expired URL"
+COM_REDIRECT_FIELD_REFERRER_LABEL="Link Referrer"
+COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_LABEL="Redirect Status Code"
+COM_REDIRECT_FIELD_REDIRECT_STATUS_CODE_DESC="Choose the HTTP 1.1 status code to associate with the redirect."
+COM_REDIRECT_FIELD_UPDATED_DATE_LABEL="Last Updated Date"
+COM_REDIRECT_HEADING_CREATED_DATE="Created Date"
+COM_REDIRECT_HEADING_CREATED_DATE_ASC="Created Date ascending"
+COM_REDIRECT_HEADING_CREATED_DATE_DESC="Created Date descending"
+COM_REDIRECT_HEADING_HITS="404 Hits"
+COM_REDIRECT_HEADING_HITS_ASC="404 Hits ascending"
+COM_REDIRECT_HEADING_HITS_DESC="404 Hits descending"
+COM_REDIRECT_HEADING_NEW_URL="New URL"
+COM_REDIRECT_HEADING_NEW_URL_ASC="New URL ascending"
+COM_REDIRECT_HEADING_NEW_URL_DESC="New URL descending"
+COM_REDIRECT_HEADING_OLD_URL="Expired URL"
+COM_REDIRECT_HEADING_OLD_URL_ASC="Expired URL ascending"
+COM_REDIRECT_HEADING_OLD_URL_DESC="Expired URL descending"
+COM_REDIRECT_HEADING_REFERRER="Referring Page"
+COM_REDIRECT_HEADING_REFERRER_ASC="Referring Page ascending"
+COM_REDIRECT_HEADING_REFERRER_DESC="Referring Page descending"
+COM_REDIRECT_HEADING_STATUS_CODE="Status Code"
+COM_REDIRECT_HEADING_STATUS_CODE_ASC="Status Code ascending"
+COM_REDIRECT_HEADING_STATUS_CODE_DESC="Status Code descending"
+COM_REDIRECT_HEADING_UPDATE_LINKS="Update selected links to the following new URL."
+COM_REDIRECT_MANAGER_LINK="Redirects: New/Edit"
+COM_REDIRECT_MANAGER_LINK_EDIT="Redirects: Edit"
+COM_REDIRECT_MANAGER_LINK_NEW="Redirects: New"
+COM_REDIRECT_MANAGER_LINKS="Redirects: Links"
+COM_REDIRECT_MODE_LABEL="Activate Advanced Mode"
+COM_REDIRECT_MODE_DESC="Enable more advanced functionality for the component. Only use this if you know what you're doing."
+COM_REDIRECT_N_ITEMS_ARCHIVED="%d links archived."
+COM_REDIRECT_N_ITEMS_ARCHIVED_1="Link archived."
+COM_REDIRECT_N_ITEMS_DELETED="%d links deleted."
+COM_REDIRECT_N_ITEMS_DELETED_1="Link deleted."
+COM_REDIRECT_N_ITEMS_PUBLISHED="%d links enabled."
+COM_REDIRECT_N_ITEMS_PUBLISHED_1="Link enabled."
+COM_REDIRECT_N_ITEMS_TRASHED="%d links trashed."
+COM_REDIRECT_N_ITEMS_TRASHED_1="Link trashed."
+COM_REDIRECT_N_ITEMS_UNPUBLISHED="%d links disabled."
+COM_REDIRECT_N_ITEMS_UNPUBLISHED_1="Link disabled."
+COM_REDIRECT_N_LINKS_ADDED="%d links added."
+COM_REDIRECT_N_LINKS_ADDED_1="1 link has been added."
+COM_REDIRECT_N_LINKS_UPDATED="%d links updated."
+COM_REDIRECT_N_LINKS_UPDATED_1="1 link has been updated."
+COM_REDIRECT_NEW_LINK="New Link"
+COM_REDIRECT_NO_ITEM_ADDED="No links added."
+COM_REDIRECT_NO_ITEM_SELECTED="No links selected."
+COM_REDIRECT_NO_SEPARATOR_FOUND="The separator %s was not found in your import."
+; The following string is deprecated and will be removed with 4.0.
+COM_REDIRECT_PLUGIN_DISABLED="The <a href="_QQ_"%s"_QQ_">Redirect System Plugin</a> is disabled. It needs to be enabled for this component to work."
+COM_REDIRECT_PLUGIN_ENABLED="The Redirect Plugin is enabled."
+COM_REDIRECT_PLUGIN_MODAL_DISABLED="The %s is disabled. It needs to be enabled for this component to work."
+COM_REDIRECT_REDIRECTED_ON="Redirected on: %s."
+COM_REDIRECT_SAVE_SUCCESS="Link saved."
+COM_REDIRECT_SEARCH_LINKS="Search in link fields."
+COM_REDIRECT_SYSTEM_PLUGIN="Redirect System Plugin"
+COM_REDIRECT_TOOLBAR_PURGE="Purge Disabled"
+COM_REDIRECT_XML_DESCRIPTION="This component implements link redirection."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_redirect.sys.ini b/core/administrator/language/en-GB/en-GB.com_redirect.sys.ini
new file mode 100644
index 00000000..ee153a72
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_redirect.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_REDIRECT="Redirects"
+COM_REDIRECT_XML_DESCRIPTION="This component implements link redirection."
diff --git a/core/administrator/language/en-GB/en-GB.com_search.ini b/core/administrator/language/en-GB/en-GB.com_search.ini
new file mode 100644
index 00000000..132da579
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_search.ini
@@ -0,0 +1,47 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_SEARCH="Search"
+COM_SEARCH_ALL_WORDS="All Words"
+COM_SEARCH_ALPHABETICAL="Alphabetical"
+COM_SEARCH_ANY_WORDS="Any Words"
+COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC="Show created date."
+COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL="Created Date"
+COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_DESC="Record the search phrases submitted by visitors."
+COM_SEARCH_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
+COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_LABEL="OpenSearch Name"
+COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_DESC="Name displayed for this site as a search provider."
+COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL="OpenSearch Description"
+COM_SEARCH_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESC="Description displayed for this site as a search provider."
+COM_SEARCH_CONFIGURATION="Search: Options"
+COM_SEARCH_EXACT_PHRASE="Exact phrase"
+COM_SEARCH_FIELD_DESC="Word, words or phrase to search for."
+COM_SEARCH_FIELD_LABEL="Search Term (Optional)"
+COM_SEARCH_FIELD_SEARCH_PHRASES_DESC="Show the search options."
+COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL="Use Search Options"
+COM_SEARCH_FIELD_SEARCH_AREAS_DESC="Show the search areas checkboxes."
+COM_SEARCH_FIELD_SEARCH_AREAS_LABEL="Use Search Areas"
+COM_SEARCH_FIELDSET_OPTIONAL_LABEL="Optional Search Term"
+COM_SEARCH_FIELDSET_SEARCH_OPTIONS_LABEL="Search"
+COM_SEARCH_FOR_DESC="The type of search."
+COM_SEARCH_FOR_LABEL="Search For"
+COM_SEARCH_HEADING_PHRASE="Search Phrase"
+COM_SEARCH_HEADING_SEARCH_TERM_ASC="Search Phrase ascending"
+COM_SEARCH_HEADING_SEARCH_TERM_DESC="Search Phrase descending"
+COM_SEARCH_HEADING_RESULTS="Results"
+COM_SEARCH_HIDE_SEARCH_RESULTS="Hide Search Results"
+COM_SEARCH_LOGGING_DISABLED="Gathering statistics disabled. Enable it in the Options."
+COM_SEARCH_LOGGING_ENABLED="Gathering statistics enabled"
+COM_SEARCH_MANAGER_SEARCHES="Search Term Analysis"
+COM_SEARCH_MOST_POPULAR="Popularity"
+COM_SEARCH_NEWEST_FIRST="Newest First"
+COM_SEARCH_NO_RESULTS="Off"
+COM_SEARCH_OLDEST_FIRST="Oldest First"
+COM_SEARCH_ORDERING_DESC="Defines what ordering results are listed in."
+COM_SEARCH_ORDERING_LABEL="Results Ordering"
+COM_SEARCH_SAVED_SEARCH_OPTIONS="Default Search Options"
+COM_SEARCH_SEARCH_IN_PHRASE="Search in phrases."
+COM_SEARCH_SHOW_SEARCH_RESULTS="Show Search Results"
+COM_SEARCH_XML_DESCRIPTION="Component for search functions."
diff --git a/core/administrator/language/en-GB/en-GB.com_search.sys.ini b/core/administrator/language/en-GB/en-GB.com_search.sys.ini
new file mode 100644
index 00000000..4e17169d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_search.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_SEARCH="Search"
+COM_SEARCH_SEARCH_VIEW_DEFAULT_DESC="Display search results."
+COM_SEARCH_SEARCH_VIEW_DEFAULT_OPTION="Default"
+COM_SEARCH_SEARCH_VIEW_DEFAULT_TITLE="Search Form or Search Results"
+COM_SEARCH_XML_DESCRIPTION="Component for search functions."
diff --git a/core/administrator/language/en-GB/en-GB.com_tags.ini b/core/administrator/language/en-GB/en-GB.com_tags.ini
new file mode 100644
index 00000000..4b75d816
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_tags.ini
@@ -0,0 +1,189 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_TAGS="Tags"
+COM_TAGS_ALL="All"
+COM_TAGS_ALL_TAGS_DESCRIPTION_DESC="Description to display at the heading of tags list."
+COM_TAGS_ALL_TAGS_DESCRIPTION_LABEL="Heading Description"
+COM_TAGS_ALL_TAGS_MEDIA_DESC="Select or upload the image to display in the heading of the tags list."
+COM_TAGS_ALL_TAGS_MEDIA_LABEL="Heading Image File"
+COM_TAGS_ANY="Any"
+COM_TAGS_BASE_ADD_TITLE="Tags: New"
+COM_TAGS_BASE_EDIT_TITLE="Tags: Edit"
+COM_TAGS_BASIC_FIELDSET_LABEL="Options"
+COM_TAGS_BATCH_CANNOT_CREATE="You are not allowed to create new tags."
+COM_TAGS_BATCH_CANNOT_EDIT="You are not allowed to edit tags."
+COM_TAGS_BATCH_OPTIONS="Batch process the selected tags"
+COM_TAGS_BATCH_TIP="Actions will apply to chosen Tags."
+COM_TAGS_COMPACT_COLUMNS_LABEL="Number of Columns"
+COM_TAGS_CONFIG_TAG_MIN_LENGTH_LABEL="Minimum Search Length"
+COM_TAGS_CONFIG_TAG_MIN_LENGTH_DESC="This setting controls the minimum character length for the search and adding tags using the tags field Ajax mode."
+COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_DESC="Choose a default layout for List of all tags."
+COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_LABEL="Default List All Tags Layout"
+COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_DESC="These settings apply for a List of all Tags unless they are changed for a specific menu item."
+COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_LABEL="List All Tags"
+COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_DESC="These settings control the way tags are entered."
+COM_TAGS_CONFIG_DATA_ENTRY_SETTINGS_LABEL="Data Entry"
+COM_TAGS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Tags Component will integrate with other extensions."
+COM_TAGS_CONFIG_NUMBER_OF_ITEMS="Number of Items Tagged"
+COM_TAGS_CONFIG_SELECTION_SETTINGS_DESC="These settings control which items get selected in the Tagged Items list layouts."
+COM_TAGS_CONFIG_SELECTION_SETTINGS_LABEL="Item Selection"
+COM_TAGS_CONFIG_SHARED_SETTINGS_DESC="These settings apply to all tag layouts unless they are changed for a specific menu item."
+COM_TAGS_CONFIG_SHARED_SETTINGS_LABEL="Shared Layout"
+COM_TAGS_CONFIG_TAG_SETTINGS_DESC="These settings apply for a Tagged Items List or Compact List of Tagged Items unless they are changed for a specific menu item."
+COM_TAGS_CONFIG_TAG_SETTINGS_LABEL="Tagged Items"
+COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_DESC="Choose a default layout for tagged items. This layout will be used when a user selects a tag that doesn't have a menu item defined."
+COM_TAGS_CONFIG_TAGGED_ITEMS_FIELD_LAYOUT_LABEL="Default Tagged Items Layout"
+COM_TAGS_CONFIGURATION="Tags: Options"
+COM_TAGS_COUNT_ARCHIVED_ITEMS="Archived items"
+COM_TAGS_COUNT_PUBLISHED_ITEMS="Published items"
+COM_TAGS_COUNT_TRASHED_ITEMS="Trashed items"
+COM_TAGS_COUNT_UNPUBLISHED_ITEMS="Unpublished items"
+COM_TAGS_DELETE_NOT_ALLOWED="Delete not allowed for tag %s."
+COM_TAGS_DESCRIPTION_DESC="Enter an optional tag description in the text area."
+COM_TAGS_ERROR_UNIQUE_ALIAS="Another Tag has the same alias (remember it may be a trashed item)."
+COM_TAGS_EXCLUDE="Exclude"
+COM_TAGS_FIELD_CONFIG_HITS_DESC="Displays the number of hits."
+COM_TAGS_FIELD_CONFIG_TAGDESCRIPTION_DESC="Configure com_tags."
+COM_TAGS_FIELD_CONFIG_TAGDESCRIPTION_LABEL="Tags"
+COM_TAGS_FIELD_CONTENT_TYPE_DESC="Only tagged items of these types will be displayed."
+COM_TAGS_FIELD_CONTENT_TYPE_LABEL="Content types"
+COM_TAGS_FIELD_CREATED_DATE_DESC="The date and time that the tag was created."
+COM_TAGS_FIELD_FULL_DESC="Select or upload an image that will be displayed in the single tag view."
+COM_TAGS_FIELD_FULL_LABEL="Full Image"
+COM_TAGS_FIELD_HITS_DESC="Number of hits for this tag."
+COM_TAGS_FIELD_IMAGE_ALT_DESC="Alt text for the image."
+COM_TAGS_FIELD_IMAGE_ALT_LABEL="Alt"
+COM_TAGS_FIELD_IMAGE_CAPTION_DESC="Caption for the image."
+COM_TAGS_FIELD_IMAGE_CAPTION_LABEL="Caption"
+COM_TAGS_FIELD_IMAGE_DESC="Select or upload an image for this tag."
+COM_TAGS_FIELD_IMAGE_LABEL="Image"
+COM_TAGS_FIELD_INTRO_DESC="Select or upload an image that will be displayed as part of a list."
+COM_TAGS_FIELD_INTRO_LABEL="Teaser Image"
+COM_TAGS_FIELD_ITEM_BODY_DESC="Show the body for each item."
+COM_TAGS_FIELD_LANGUAGE_DESC="Assign a language to this tag."
+COM_TAGS_FIELD_LANGUAGE_FILTER_DESC="Optionally filter the list of tags based on language."
+COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL="Language Filter"
+COM_TAGS_FIELD_MODIFIED_DESC="The date and time that the tag was last modified."
+COM_TAGS_FIELD_NOTE_DESC="An optional note to display in the tag list."
+COM_TAGS_FIELD_NOTE_LABEL="Note"
+COM_TAGS_FIELD_NUMBER_ITEMS_LIST_DESC="Default number of tagged items to list on a page."
+COM_TAGS_FIELD_NUMBER_ITEMS_LIST_LABEL="# Items to List"
+COM_TAGS_FIELD_PARENT_DESC="Select a parent tag."
+COM_TAGS_FIELD_PARENT_LABEL="Parent"
+COM_TAGS_FIELD_PARENT_TAG_DESC="If set only tags that are direct children of the selected tag will be displayed."
+COM_TAGS_FIELD_PARENT_TAG_LABEL="Parent Tag"
+COM_TAGS_FIELD_SELECT_TAG_DESC="Select one or more tags."
+COM_TAGS_FIELD_TAG_BODY_DESC="Show or hide the tag description."
+COM_TAGS_FIELD_TAG_BODY_LABEL="Description."
+COM_TAGS_FIELD_TAG_LABEL="Tag"
+COM_TAGS_FIELD_TAG_LINK_CLASS="CSS Class for tag link"
+COM_TAGS_FIELD_TAG_LINK_CLASS_DESC="Add specific CSS classes for the tag link. If empty 'label label-info' will be added by the default tag layout."
+COM_TAGS_FIELD_TYPE_DESC="Only tags of the selected types will be displayed (optional)."
+COM_TAGS_FIELD_TYPE_LABEL="Content Type"
+COM_TAGS_FIELDSET_DETAILS="Tag Details"
+COM_TAGS_FIELDSET_OPTIONS="Options"
+COM_TAGS_FIELDSET_PUBLISHING="Publishing"
+COM_TAGS_FIELDSET_TAGGED_ITEMS="Tagged Items"
+COM_TAGS_FIELDSET_URLS_AND_IMAGES="Links and Images"
+COM_TAGS_FILTER_SEARCH_DESC="Search in tag title, alias and note. Prefix with ID: to search for a tag ID."
+COM_TAGS_FILTER_SEARCH_LABEL="Search Tags"
+COM_TAGS_FLOAT_DESC="Float attribute for the image."
+COM_TAGS_FLOAT_LABEL="Float"
+COM_TAGS_HAS_SUBCATEGORY_ITEMS="%d items are assigned to this tag's subtags."
+COM_TAGS_HAS_SUBCATEGORY_ITEMS_1="%d item is assigned to one of this tag's subtags."
+COM_TAGS_INCLUDE="Include"
+COM_TAGS_INCLUDE_CHILDREN_DESC="Include or exclude child tags from the result list for a tag."
+COM_TAGS_INCLUDE_CHILDREN_LABEL="Child Tags"
+COM_TAGS_ITEM_OPTIONS="Item Options"
+COM_TAGS_ITEMS_SEARCH_FILTER="Search"
+COM_TAGS_LEFT="Left"
+COM_TAGS_LIST_ALL_SELECTION_OPTIONS="Selection Options"
+COM_TAGS_LIST_MAX_CHARACTERS_DESC="The maximum number of characters to display from the description in each tag."
+COM_TAGS_LIST_MAX_CHARACTERS_LABEL="Maximum Characters"
+COM_TAGS_LIST_MAX_DESC="The maximum number of results to return."
+COM_TAGS_LIST_MAX_LABEL="Maximum Items"
+COM_TAGS_LIST_SELECTION_OPTIONS="Item Selection Options"
+COM_TAGS_MANAGER_TAGS="Tags"
+COM_TAGS_MATCH_COUNT="Number of matching tags"
+COM_TAGS_N_ITEMS_ARCHIVED="%d tags archived."
+COM_TAGS_N_ITEMS_ARCHIVED_1="%d tag archived."
+COM_TAGS_N_ITEMS_CHECKED_IN_0="No tag checked in."
+COM_TAGS_N_ITEMS_CHECKED_IN_1="%d tag checked in."
+COM_TAGS_N_ITEMS_CHECKED_IN_MORE="%d tags checked in."
+COM_TAGS_N_ITEMS_DELETED="%d tags deleted."
+COM_TAGS_N_ITEMS_DELETED_1="%d tag deleted."
+COM_TAGS_N_ITEMS_FAILED_PUBLISHING="Failed publishing %d tags as at least one of their parents is unpublished or one of their children is checked out."
+COM_TAGS_N_ITEMS_FAILED_PUBLISHING_1="Failed publishing %d tag as at least one of its parents is unpublished or one of its children is checked out."
+COM_TAGS_N_ITEMS_PUBLISHED="%d tags published."
+COM_TAGS_N_ITEMS_PUBLISHED_1="%d tag published."
+COM_TAGS_N_ITEMS_TRASHED="%d tags trashed."
+COM_TAGS_N_ITEMS_TRASHED_1="%d tag trashed."
+COM_TAGS_N_ITEMS_UNPUBLISHED="%d tags unpublished."
+COM_TAGS_N_ITEMS_UNPUBLISHED_1="%d tag unpublished."
+COM_TAGS_NONE="None"
+COM_TAGS_NUMBER_COLUMNS_DESC="Number of columns to arrange the tags in. Note that this may not be the number displayed if 12 does not divide evenly into it because display is based on a 12 column grid."
+COM_TAGS_NUMBER_TAG_ITEMS_DESC="Shows the number of items with a given tag."
+COM_TAGS_NUMBER_TAG_ITEMS_LABEL="Show Number of Items"
+COM_TAGS_OPTIONS="Tag Options"
+COM_TAGS_PAGINATION_OPTIONS="Pagination Options"
+COM_TAGS_REBUILD_FAILURE="Failed rebuilding Tags tree data."
+COM_TAGS_REBUILD_SUCCESS="Tags tree data rebuilt."
+COM_TAGS_RIGHT="Right"
+COM_TAGS_SAVE_SUCCESS="Tag saved."
+COM_TAGS_SEARCH_TYPE_DESC="All will return items that have all of the tags. Any will return items that have at least one of the tags."
+COM_TAGS_SEARCH_TYPE_LABEL="Match Type"
+COM_TAGS_SELECT_TAGTYPE="- Select Tag Type -"
+COM_TAGS_SHOW_ALL_TAGS_DESCRIPTION_DESC="Optional description to show at the top of the all tags list."
+COM_TAGS_SHOW_ALL_TAGS_DESCRIPTION_LABEL="Heading Description"
+COM_TAGS_SHOW_ALL_TAGS_IMAGE_DESC="Shows an image at the heading of the tags list."
+COM_TAGS_SHOW_ALL_TAGS_IMAGE_LABEL="Show Heading Image"
+COM_TAGS_SHOW_EMPTY_TAG_DESC="Show empty tags."
+COM_TAGS_SHOW_ITEM_BODY_DESC="Show or hide the body text for the tagged items."
+COM_TAGS_SHOW_ITEM_BODY_LABEL="Item Body"
+COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC="Show or hide the description for each tag listed."
+COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL="Tag Descriptions"
+COM_TAGS_SHOW_ITEM_IMAGE_DESC="Shows the first image for each item in the list."
+COM_TAGS_SHOW_ITEM_IMAGE_LABEL="Item Images"
+COM_TAGS_SHOW_TAG_BODY_DESC="For a layout with one tag, show the tag description."
+COM_TAGS_SHOW_TAG_BODY_LABEL="Show Tag Description"
+COM_TAGS_SHOW_TAG_DESCRIPTION_DESC="Show or hide the description for the tag (only used when a single tag is selected)."
+COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL="Tag Description"
+COM_TAGS_SHOW_TAG_IMAGE_DESC="For a layout with one tag, show the image for the tag."
+COM_TAGS_SHOW_TAG_IMAGE_LABEL="Tag Image"
+COM_TAGS_SHOW_TAG_LIST_DESCRIPTION_LABEL="Description"
+COM_TAGS_SHOW_TAG_TITLE_DESC="For a layout with one tag, show the tag name."
+COM_TAGS_SHOW_TAG_TITLE_LABEL="Show Tag Name"
+COM_TAGS_SUBSLIDER_DRILL_TAG_LIST_LABEL="Options for each item in the list."
+COM_TAGS_TAG_FIELD_MODE_AJAX="AJAX"
+COM_TAGS_TAG_FIELD_MODE_DESC="Ajax mode searches tags while typing and allows you on the fly tag creation. Nested tags show you a nested view with all the available tags."
+COM_TAGS_TAG_FIELD_MODE_LABEL="Tag Entry Mode"
+COM_TAGS_TAG_FIELD_MODE_NESTED="Nested"
+COM_TAGS_TAG_LIST_DESCRIPTION_DESC="Optional description to show at the top of the list. For example, this can be used when you have a layout that includes more than one tag."
+COM_TAGS_TAG_LIST_DESCRIPTION_LABEL="Layout Description"
+COM_TAGS_TAG_LIST_FIELD_ITEM_DESCRIPTION_LABEL="Item Body"
+COM_TAGS_TAG_LIST_ITEM_DESCRIPTION_DESC="Shows the body text for the individual items (depends on the source table)."
+COM_TAGS_TAG_LIST_ITEM_HITS_DESC="Shows the number of hits for each individual item."
+COM_TAGS_TAG_LIST_MEDIA_DESC="Select or upload the tag image (full image)."
+COM_TAGS_TAG_LIST_MEDIA_LABEL="Image"
+COM_TAGS_TAG_LIST_SHOW_DATE_DESC="Show Date"
+COM_TAGS_TAG_LIST_SHOW_DATE_LABEL="Show  or hide a date column in the compact list layout. Select Hide to hide the date, or select which date you wish to show."
+COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC="Show or hide the headings in the compact list layout."
+COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL="Table Headings"
+COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_DESC="Shows the image for each item."
+COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL="Item Image"
+COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC="Show or hide the description for each item in the list. The length may be limited using the Maximum Characters option."
+COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL="Item Description"
+COM_TAGS_TAG_VIEW_LIST_DESC="Displays a compact list of items with the selected tags."
+COM_TAGS_TAG_VIEW_LIST_OPTION="List view options"
+COM_TAGS_TAG_VIEW_LIST_TITLE="Tagged items list"
+COM_TAGS_TAGGED_ITEMS_ACCESS="Access"
+COM_TAGS_TAGGED_ITEMS_AUTHOR="Author"
+COM_TAGS_TAGGED_ITEMS_DATE="Date"
+COM_TAGS_TAGGED_ITEMS_ID="ID"
+COM_TAGS_TAGGED_ITEMS_LANGUAGE="Language"
+COM_TAGS_TAGGED_ITEMS_TITLE="Title"
+COM_TAGS_XML_DESCRIPTION="This component manages tags."
+JGLOBAL_NO_ITEM_SELECTED="No tags selected"
diff --git a/core/administrator/language/en-GB/en-GB.com_tags.sys.ini b/core/administrator/language/en-GB/en-GB.com_tags.sys.ini
new file mode 100644
index 00000000..a3bcadfc
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_tags.sys.ini
@@ -0,0 +1,36 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_TAGS="Tags"
+COM_TAGS_CONTENT_TYPE_ARTICLE="Article"
+COM_TAGS_CONTENT_TYPE_ARTICLE_CATEGORY="Article Category"
+COM_TAGS_CONTENT_TYPE_BANNER="Banner"
+COM_TAGS_CONTENT_TYPE_BANNER_CLIENT="Banner Client"
+COM_TAGS_CONTENT_TYPE_BANNERS_CATEGORY="Banner Category"
+COM_TAGS_CONTENT_TYPE_CONTACT="Contact"
+COM_TAGS_CONTENT_TYPE_CONTACT_CATEGORY="Contact Category"
+COM_TAGS_CONTENT_TYPE_NEWSFEED="News Feed"
+COM_TAGS_CONTENT_TYPE_NEWSFEEDS_CATEGORY="News Feed Category"
+COM_TAGS_CONTENT_TYPE_TAG="Tag"
+COM_TAGS_CONTENT_TYPE_USER="User"
+COM_TAGS_CONTENT_TYPE_USER_NOTES="User Notes"
+COM_TAGS_CONTENT_TYPE_USER_NOTES_CATEGORY="User Notes Category"
+COM_TAGS_CONTENT_TYPE_WEBLINK="Web Link"
+COM_TAGS_CONTENT_TYPE_WEBLINKS_CATEGORY="Web Links Category"
+COM_TAGS_TAG="Tag"
+COM_TAGS_TAG_VIEW_DEFAULT_DESC="This links to a list of items with specific tags."
+COM_TAGS_TAG_VIEW_DEFAULT_OPTION="Default"
+COM_TAGS_TAG_VIEW_DEFAULT_TITLE="Tagged Items"
+COM_TAGS_TAG_VIEW_LIST_COMPACT_OPTION="Compact layout"
+COM_TAGS_TAG_VIEW_LIST_COMPACT_TITLE="Compact list of tagged items"
+COM_TAGS_TAG_VIEW_LIST_DESC="List of items that have been tagged with the selected tags."
+COM_TAGS_TAG_VIEW_LIST_OPTION="List view options"
+COM_TAGS_TAG_VIEW_LIST_TITLE="Tagged items list"
+COM_TAGS_TAGS="Tags"
+COM_TAGS_TAGS_VIEW_COMPACT_DESC="Compact list of tags."
+COM_TAGS_TAGS_VIEW_COMPACT_TITLE="Compact Tags View"
+COM_TAGS_TAGS_VIEW_DEFAULT_DESC="This links to a detailed list of all tags."
+COM_TAGS_TAGS_VIEW_DEFAULT_TITLE="List of all tags"
+COM_TAGS_XML_DESCRIPTION="A component for tagging content items."
diff --git a/core/administrator/language/en-GB/en-GB.com_templates.ini b/core/administrator/language/en-GB/en-GB.com_templates.ini
new file mode 100644
index 00000000..37c73f5e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_templates.ini
@@ -0,0 +1,246 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_TEMPLATES="Templates"
+COM_TEMPLATES_ADVANCED_FIELDSET_LABEL="Advanced"
+COM_TEMPLATES_ARE_YOU_SURE="Are you sure?"
+COM_TEMPLATES_ASSIGNED_1="Assigned to one menu item."
+COM_TEMPLATES_ASSIGNED_MORE="Assigned to %d menu items."
+COM_TEMPLATES_BASIC_FIELDSET_LABEL="Options"
+COM_TEMPLATES_BUTTON_CLOSE_FILE="Close File"
+COM_TEMPLATES_BUTTON_COPY_TEMPLATE="Copy Template"
+COM_TEMPLATES_BUTTON_COPY_FILE="Copy File"
+COM_TEMPLATES_BUTTON_CREATE="Create"
+COM_TEMPLATES_BUTTON_CROP="Crop"
+COM_TEMPLATES_BUTTON_DELETE="Delete"
+COM_TEMPLATES_BUTTON_DELETE_FILE="Delete File"
+COM_TEMPLATES_BUTTON_EXTRACT_ARCHIVE="Extract Here"
+COM_TEMPLATES_BUTTON_FILE="New File"
+COM_TEMPLATES_BUTTON_FOLDERS="Manage Folders"
+COM_TEMPLATES_BUTTON_LESS="Compile LESS"
+COM_TEMPLATES_BUTTON_PREVIEW="Template Preview"
+COM_TEMPLATES_BUTTON_RENAME="Rename"
+COM_TEMPLATES_BUTTON_RENAME_FILE="Rename File"
+COM_TEMPLATES_BUTTON_RESIZE="Resize"
+COM_TEMPLATES_BUTTON_UPLOAD="Upload"
+COM_TEMPLATES_CHECK_FILE_OWNERSHIP="Check file ownership"
+COM_TEMPLATES_CLICK_TO_ENLARGE="Select to enlarge."
+COM_TEMPLATES_COMPILE_ERROR="An error occurred. Failed to compile."
+COM_TEMPLATES_COMPILE_LESS="You should compile %s to generate a CSS file."
+COM_TEMPLATES_COMPILE_SUCCESS="Successfully compiled LESS."
+COM_TEMPLATES_CONFIG_FIELDSET_DESC="Global configuration for templates."
+COM_TEMPLATES_CONFIG_POSITIONS_DESC="Enable the preview of the module positions in the template by appending tp=1 to the web address. Also enables the Preview button in the list of templates."
+COM_TEMPLATES_CONFIG_POSITIONS_LABEL="Preview Module Positions"
+COM_TEMPLATES_CONFIG_FONT_DESC="These file types will be available for font preview."
+COM_TEMPLATES_CONFIG_FONT_LABEL="Valid Font Formats"
+COM_TEMPLATES_CONFIG_IMAGE_DESC="These file types will be available for cropping and resizing."
+COM_TEMPLATES_CONFIG_IMAGE_LABEL="Valid Image Formats"
+COM_TEMPLATES_CONFIG_SOURCE_DESC="These file types will be available for editing."
+COM_TEMPLATES_CONFIG_SOURCE_LABEL="Valid Source Formats"
+COM_TEMPLATES_CONFIG_SUPPORTED_DESC="Be careful before changing the file types. Read the tool tips before editing."
+COM_TEMPLATES_CONFIG_SUPPORTED_LABEL="Supported File Formats"
+COM_TEMPLATES_CONFIG_UPLOAD_DESC="The maximum upload size for files inside Template Manager."
+COM_TEMPLATES_CONFIG_UPLOAD_LABEL="Upload Size (MB)"
+COM_TEMPLATES_CONFIGURATION="Template: Options"
+COM_TEMPLATES_COPY_SUCCESS="New template called %s was installed."
+COM_TEMPLATES_CROP_AREA_ERROR="Crop area not selected."
+COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some features may not work."
+COM_TEMPLATES_ERR_XML="Template XML data not available"
+COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Can't delete the last style of a template. To uninstall/delete a template go to: Extensions-> Manage-> Manage-> Select template to be deleted-> Select 'Uninstall'."
+COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Can't unset default style."
+COM_TEMPLATES_ERROR_COULD_NOT_COPY="Unable to copy template files to temporary folder."
+COM_TEMPLATES_ERROR_COULD_NOT_INSTALL="Unable to install new template from temporary folder."
+COM_TEMPLATES_ERROR_COULD_NOT_WRITE="Unable to delete temporary folder."
+COM_TEMPLATES_ERROR_CREATE_NOT_PERMITTED="Unable to create temporary folder."
+COM_TEMPLATES_ERROR_DUPLICATE_TEMPLATE_NAME="A template with this name already is installed."
+COM_TEMPLATES_ERROR_EDITOR_DISABLED="Either the CodeMirror or the None editor plugin should be enabled to edit template files."
+COM_TEMPLATES_ERROR_EXECUTABLE="Can't upload executable files."
+COM_TEMPLATES_ERROR_EXTENSION_RECORD_NOT_FOUND="Extension record not found in database."
+COM_TEMPLATES_ERROR_FAILED_TO_SAVE_FILENAME="An error occurred. The file %s could not be saved."
+COM_TEMPLATES_ERROR_FILE_CREATE="Failed to create file."
+COM_TEMPLATES_ERROR_FILE_DELETE="An error occurred. Failed to delete the file."
+COM_TEMPLATES_ERROR_FILE_FORMAT="File format not supported."
+COM_TEMPLATES_ERROR_FILE_RENAME="An error occurred. Failed to rename file."
+COM_TEMPLATES_ERROR_FILE_UPLOAD="Failed to upload file."
+COM_TEMPLATES_ERROR_FOLDER_CREATE="Failed to create folder."
+COM_TEMPLATES_ERROR_FONT_FILE_NOT_FOUND="Font file not found."
+COM_TEMPLATES_ERROR_IMAGE_FILE_NOT_FOUND="Image file not found."
+COM_TEMPLATES_ERROR_INDEX_DELETE="The file index.php can't be deleted. Make changes in the editor if you want to change the file."
+COM_TEMPLATES_ERROR_INVALID_FROM_NAME="Template to copy from can't be found."
+COM_TEMPLATES_ERROR_INVALID_TEMPLATE_NAME="Invalid template name. Please use only letters, numbers, dashes and underscores."
+COM_TEMPLATES_ERROR_RENAME_INDEX="The file index.php can't be renamed."
+COM_TEMPLATES_ERROR_ROOT_DELETE="The root folder can't be deleted."
+COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE="Unable to save a style associated to a disabled template."
+COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_FOUND="Source file not found."
+COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_UNWRITABLE="Source file can't be returned to unwritable status."
+COM_TEMPLATES_ERROR_SOURCE_FILE_NOT_WRITABLE="Source file not writable."
+COM_TEMPLATES_ERROR_SOURCE_ID_FILENAME_MISMATCH="Stored ID does not match the submitted one."
+COM_TEMPLATES_ERROR_STYLE_NOT_FOUND="Style not found."
+COM_TEMPLATES_ERROR_STYLE_REQUIRES_TITLE="The style requires a title."
+COM_TEMPLATES_ERROR_TEMPLATE_FOLDER_NOT_FOUND="Template folder not found."
+COM_TEMPLATES_ERROR_UPLOAD_INPUT="No file was found."
+COM_TEMPLATES_ERROR_WARNFILENAME="Invalid file name. Please correct the name of the file and upload again."
+COM_TEMPLATES_ERROR_WARNFILETOOLARGE="File bigger than 2 MB can't be uploaded."
+COM_TEMPLATES_ERROR_WARNFILETYPE="File format not supported."
+COM_TEMPLATES_ERROR_WARNIEXSS="Can't be uploaded. Has XSS."
+COM_TEMPLATES_FIELD_CLIENT_DESC="Whether this template is used for the Frontend (0) or the Backend (1)."
+COM_TEMPLATES_FIELD_CLIENT_LABEL="Location"
+COM_TEMPLATES_FIELD_HOME_ADMINISTRATOR_DESC="This template style is defined as the default."
+COM_TEMPLATES_FIELD_HOME_LABEL="Default"
+COM_TEMPLATES_FIELD_HOME_SITE_DESC="If the multilingual functionality is not implemented, please limit your choice between <b>No</b> and <b>All</b>. This template style will be defined as the global default template style.<br />If the <b>System - Language Filter</b> plugin is enabled and you use different template styles depending on your content languages please assign a language to this style."
+COM_TEMPLATES_FIELD_SOURCE_DESC="Source code."
+COM_TEMPLATES_FIELD_SOURCE_LABEL="Source Code"
+COM_TEMPLATES_FIELD_TEMPLATE_DESC="Template name."
+COM_TEMPLATES_FIELD_TEMPLATE_LABEL="Template"
+COM_TEMPLATES_FIELD_TITLE_DESC="Style name."
+COM_TEMPLATES_FIELD_TITLE_LABEL="Style Name"
+COM_TEMPLATES_FILE_ARCHIVE_OPEN_FAIL="Failed to open the archive file."
+COM_TEMPLATES_FILE_ARCHIVE_EXISTS="Some files with the same name already exist."
+COM_TEMPLATES_FILE_ARCHIVE_NOT_FOUND="Archive file not found."
+COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS="Successfully extracted the archive file."
+COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL="Failed to extract the archive file."
+COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
+COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
+COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview"
+COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
+COM_TEMPLATES_FILE_COPY_SUCCESS="The current file was copied as %s."
+COM_TEMPLATES_FILE_CROP_ERROR="Failed to crop image."
+COM_TEMPLATES_FILE_CROP_SUCCESS="Image cropped."
+COM_TEMPLATES_FILE_DELETE_ERROR="Not able to delete the file."
+COM_TEMPLATES_FILE_DELETE_FAIL="Not able to delete the file."
+COM_TEMPLATES_FILE_DELETE_SUCCESS="File deleted."
+COM_TEMPLATES_FILE_NEW_NAME_DESC="Enter the name of the new copied file."
+COM_TEMPLATES_FILE_NEW_NAME_LABEL="Copied File Name"
+COM_TEMPLATES_FILE_EXISTS="File with the same name already exists."
+COM_TEMPLATES_FILE_INFO="File Information"
+COM_TEMPLATES_FILE_NAME="File Name"
+COM_TEMPLATES_FILE_PERMISSIONS="The File Permissions are %s"
+COM_TEMPLATES_FILE_RENAME_ERROR="An error occurred renaming the file."
+COM_TEMPLATES_FILE_RENAME_SUCCESS="File renamed."
+COM_TEMPLATES_FILE_RESIZE_ERROR="Failed to resize image."
+COM_TEMPLATES_FILE_RESIZE_SUCCESS="Image resized."
+COM_TEMPLATES_FILE_SAVE_SUCCESS="File saved."
+COM_TEMPLATES_FILE_UNSUPPORTED_ARCHIVE="Unsupported files present inside the zip file."
+COM_TEMPLATES_FILE_UPLOAD_ERROR="There was an error uploading the file."
+COM_TEMPLATES_FILE_UPLOAD_SUCCESS="Successfully uploaded file."
+COM_TEMPLATES_FILTER_TEMPLATE="- Select Template -"
+COM_TEMPLATES_FOLDER_CREATE_ERROR="There was an error creating the folder."
+COM_TEMPLATES_FOLDER_CREATE_SUCCESS="Folder created."
+COM_TEMPLATES_FOLDER_DELETE_ERROR="An error occurred. Failed to delete folder."
+COM_TEMPLATES_FOLDER_DELETE_SUCCESS="Folder deleted."
+COM_TEMPLATES_FOLDER_ERROR="Not able to create folder."
+COM_TEMPLATES_FOLDER_EXISTS="Folder with the same name already exists."
+COM_TEMPLATES_FOLDER_NAME="Folder Name"
+COM_TEMPLATES_FOLDER_NOT_EXISTS="The folder does not exist."
+COM_TEMPLATES_FTP_DESC="For updating the template source files, Joomla will most likely need your FTP account details. Please enter them in the form fields below."
+COM_TEMPLATES_FTP_TITLE="FTP Login Details"
+COM_TEMPLATES_GRID_UNSET_LANGUAGE="Unset %s Default"
+COM_TEMPLATES_HOME_BUTTON="Documentation"
+COM_TEMPLATES_HOME_HEADING="Select a File"
+COM_TEMPLATES_HOME_TEXT="You can select from a number of options for customising the look of your templates. The Template Manager supports Source files, Image files, Font files, Zip archives and most of the operations that can be performed on those files. Select a file and you are good to go. Check the documentation if you want to know more."
+COM_TEMPLATES_HEADING_ASSIGNED="Assigned"
+COM_TEMPLATES_HEADING_DEFAULT="Default"
+COM_TEMPLATES_HEADING_DEFAULT_ASC="Default ascending"
+COM_TEMPLATES_HEADING_DEFAULT_DESC="Default descending"
+COM_TEMPLATES_HEADING_IMAGE="Image"
+COM_TEMPLATES_HEADING_LOCATION_ASC="Location ascending"
+COM_TEMPLATES_HEADING_LOCATION_DESC="Location descending"
+COM_TEMPLATES_HEADING_PAGES="Pages"
+COM_TEMPLATES_HEADING_STYLE="Style"
+COM_TEMPLATES_HEADING_STYLE_ASC="Style ascending"
+COM_TEMPLATES_HEADING_STYLE_DESC="Style descending"
+COM_TEMPLATES_HEADING_TEMPLATE="Template"
+COM_TEMPLATES_HEADING_TEMPLATE_ASC="Template ascending"
+COM_TEMPLATES_HEADING_TEMPLATE_DESC="Template descending"
+COM_TEMPLATES_IMAGE_HEIGHT="Height"
+COM_TEMPLATES_IMAGE_WIDTH="Width"
+COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name with a-z, A-Z, 0-9, - and _."
+COM_TEMPLATES_INVALID_FILE_TYPE="File type not selected."
+COM_TEMPLATES_INVALID_FOLDER_NAME="Invalid folder name. Please choose a folder name with a-z, A-Z, 0-9, - and _."
+COM_TEMPLATES_MANAGER="Templates"
+COM_TEMPLATES_MANAGER_ADD_STYLE="Templates: Add Style"
+COM_TEMPLATES_MANAGER_EDIT_FILE="Templates: Edit File"
+COM_TEMPLATES_MANAGER_EDIT_STYLE="Templates: Edit Style"
+COM_TEMPLATES_MANAGE_FOLDERS="Manage Folders"
+COM_TEMPLATES_MANAGER_STYLES="Templates: Styles"
+COM_TEMPLATES_MANAGER_STYLES_ADMIN="Templates: Styles (Administrator)"
+COM_TEMPLATES_MANAGER_STYLES_SITE="Templates: Styles (Site)"
+COM_TEMPLATES_MANAGER_TEMPLATES="Templates"
+COM_TEMPLATES_MANAGER_TEMPLATES_ADMIN="Templates: Templates (Administrator)"
+COM_TEMPLATES_MANAGER_TEMPLATES_SITE="Templates: Templates (Site)"
+COM_TEMPLATES_MANAGER_VIEW_TEMPLATE="Templates: Customise (%s)"
+COM_TEMPLATES_MENU_CHANGED_1="1 menu item has been assigned or unassigned to this style."
+COM_TEMPLATES_MENU_CHANGED_MORE="%d menu items have been assigned or unassigned to this style."
+COM_TEMPLATES_MENUS_ASSIGNMENT="Menu Assignment"
+COM_TEMPLATES_MODAL_FILE_DELETE="The file %s will be deleted."
+COM_TEMPLATES_MSG_MANAGE_NO_STYLES="There are no styles installed matching your query."
+COM_TEMPLATES_MSG_MANAGE_NO_TEMPLATES="There are no templates installed matching your query."
+COM_TEMPLATES_N_ITEMS_DELETED="%d template styles deleted."
+COM_TEMPLATES_N_ITEMS_DELETED_1="Template style deleted."
+COM_TEMPLATES_NEW_FILE_HEADER="Create or Upload a new file."
+COM_TEMPLATES_NEW_FILE_NAME="New File Name"
+COM_TEMPLATES_NEW_FILE_SELECT="Select a file type"
+COM_TEMPLATES_NEW_FILE_TYPE="File Type"
+COM_TEMPLATES_NO_TEMPLATE_SELECTED="No template selected."
+COM_TEMPLATES_OPTION_NONE=":: None ::"
+; Deprecated 4.0
+COM_TEMPLATES_OPTION_SELECT_PAGE="- Select Page -"
+COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
+COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
+COM_TEMPLATES_OVERRIDE_EXISTS="Override already exists."
+COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."
+COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
+COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
+COM_TEMPLATES_OVERRIDES_MODULES="Modules"
+COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"
+COM_TEMPLATES_PREVIEW="Preview"
+COM_TEMPLATES_RENAME_FILE="Rename file %s"
+COM_TEMPLATES_RESIZE_IMAGE="Resize Image"
+COM_TEMPLATES_SOURCE_CODE="Source"
+COM_TEMPLATES_SITE_PREVIEW="Site Preview"
+COM_TEMPLATES_STYLE_CANNOT_DELETE_DEFAULT_STYLE="Can't delete default style."
+COM_TEMPLATES_STYLE_SAVE_SUCCESS="Style saved."
+COM_TEMPLATES_STYLES_FILTER_SEARCH_DESC="Search in style description."
+COM_TEMPLATES_STYLES_PAGES_ALL="Default for all pages"
+COM_TEMPLATES_STYLES_PAGES_ALL_LANGUAGE="Default for %s pages"
+COM_TEMPLATES_STYLES_PAGES_SELECTED="Assigned on %s pages"
+COM_TEMPLATES_STYLES_PAGES_NONE="Not assigned"
+COM_TEMPLATES_SUBMENU_STYLES="Styles"
+COM_TEMPLATES_SUBMENU_TEMPLATES="Templates"
+COM_TEMPLATES_SUCCESS_DUPLICATED="Style duplicated."
+COM_TEMPLATES_SUCCESS_HOME_SET="Default style set."
+COM_TEMPLATES_SUCCESS_HOME_UNSET="Default style unset."
+COM_TEMPLATES_TAB_DESCRIPTION="Template Description"
+COM_TEMPLATES_TAB_EDITOR="Editor"
+COM_TEMPLATES_TAB_OVERRIDES="Create Overrides"
+COM_TEMPLATES_TEMPLATE_ADD_CSS="Add new stylesheet"
+COM_TEMPLATES_TEMPLATE_ADD_ERROR="Add custom error page template (optional)."
+COM_TEMPLATES_TEMPLATE_CLOSE="Close"
+COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
+COM_TEMPLATES_TEMPLATE_CSS="Stylesheets"
+COM_TEMPLATES_TEMPLATE_DESCRIPTION="Template description."
+COM_TEMPLATES_TEMPLATE_DETAILS="%s Details and Files"
+COM_TEMPLATES_TEMPLATE_EDIT_CSS="Edit %s"
+COM_TEMPLATES_TEMPLATE_EDIT_ERROR="Edit error page template"
+COM_TEMPLATES_TEMPLATE_EDIT_MAIN="Edit main page template"
+COM_TEMPLATES_TEMPLATE_EDIT_OFFLINEVIEW="Edit offline page template"
+COM_TEMPLATES_TEMPLATE_EDIT_PRINTVIEW="Edit print view template"
+COM_TEMPLATES_TEMPLATE_FILENAME="Editing file &quot;%s&quot; in template &quot;%s&quot;."
+COM_TEMPLATES_TEMPLATE_FILES="Template Files"
+COM_TEMPLATES_TEMPLATE_HTML="HTML files"
+COM_TEMPLATES_TEMPLATE_MASTER_FILES="Template Master Files"
+COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC="Enter the name of the new template. Please use letters, numbers and underscore only."
+COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL="New Template Name"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW="No preview available. You can enable preview in the options."
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN="No preview available for Administrator templates"
+COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC="To enable template previews, enable the Preview Module Positions option in Template Options."
+COM_TEMPLATES_TEMPLATE_NOT_SPECIFIED="Template not specified."
+COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
+COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
+COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
+COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
+COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE="You have created a new file with the extension '%s'. This is supported but as you did not have that file extension in the list of supported formats this can't be displayed. Please double check the options for Templates and add the format if needed."
+COM_TEMPLATES_XML_DESCRIPTION="This component manages templates"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_templates.sys.ini b/core/administrator/language/en-GB/en-GB.com_templates.sys.ini
new file mode 100644
index 00000000..7cf330ab
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_templates.sys.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_TEMPLATES="Templates"
+COM_TEMPLATES_STYLE_VIEW_DEFAULT_DESC="Shows a List of Template styles"
+COM_TEMPLATES_STYLE_VIEW_DEFAULT_TITLE="Template Styles"
+COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_DESC="Shows a List of Installed Templates"
+COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_TITLE="Templates"
+COM_TEMPLATES_XML_DESCRIPTION="This component manages templates."
diff --git a/core/administrator/language/en-GB/en-GB.com_users.ini b/core/administrator/language/en-GB/en-GB.com_users.ini
new file mode 100644
index 00000000..68665284
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_users.ini
@@ -0,0 +1,382 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_USERS="Users"
+COM_USERS_ACTIONS_AVAILABLE="Actions Permitted"
+COM_USERS_ACTIVATED="Activated"
+COM_USERS_ADD_NOTE="Add a Note"
+COM_USERS_ASSIGNED_GROUPS="Assigned User Groups"
+COM_USERS_BATCH_ADD="Add To Group"
+COM_USERS_BATCH_DELETE="Delete From Group"
+COM_USERS_BATCH_GROUP="Select Group"
+COM_USERS_BATCH_OPTIONS="Batch process the selected users"
+COM_USERS_BATCH_SET="Set To Group"
+COM_USERS_CATEGORIES_TITLE="User Notes: Categories"
+COM_USERS_CATEGORY_HEADING="Category"
+COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC="If set to Yes, new Users are allowed to self-register."
+COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration"
+COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the registration, password and username reminder forms. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Global' is selected, make sure a captcha plugin is selected in Global Configuration."
+COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha"
+COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Username when editing their profile."
+COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Username"
+COM_USERS_CONFIG_FIELD_FRONTEND_LANG_DESC="If 'Frontend User Parameters' is set to 'Show', users will be able to select their Frontend language preference when registering."
+COM_USERS_CONFIG_FIELD_FRONTEND_LANG_LABEL="Frontend Language"
+COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_DESC="The maximum number of password resets allowed within the time period. Zero indicates no limit."
+COM_USERS_CONFIG_FIELD_FRONTEND_RESET_COUNT_LABEL="Maximum Reset Count"
+COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_DESC="The time period, in hours, for the reset counter."
+COM_USERS_CONFIG_FIELD_FRONTEND_RESET_TIME_LABEL="Reset Time"
+COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_DESC="If set to Show, Users will be able to select their language, editor and Help Site preferences on their details screen when logged-in to the Frontend."
+COM_USERS_CONFIG_FIELD_FRONTEND_USERPARAMS_LABEL="Frontend User Parameters"
+COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_DESC="The default Group that will be applied to Guest (not logged-in) Users."
+COM_USERS_CONFIG_FIELD_GUEST_USER_GROUP_LABEL="Guest User Group"
+COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_DESC="This is added after the mail text."
+COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_LABEL="Mailbody Suffix"
+COM_USERS_CONFIG_FIELD_MAILTOADMIN_DESC="If set to Yes then a notification mail will be sent to administrators if 'New User Account Activation' is set to 'None' or 'Self'."
+COM_USERS_CONFIG_FIELD_MAILTOADMIN_LABEL="Send Mail to Administrators"
+COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS="Minimum Integers"
+COM_USERS_CONFIG_FIELD_MINIMUM_INTEGERS_DESC="Set the minimum number of integers that must be included in a password."
+COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH="Minimum Length"
+COM_USERS_CONFIG_FIELD_MINIMUM_PASSWORD_LENGTH_DESC="Set the minimum length for a password."
+COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS="Minimum Symbols"
+COM_USERS_CONFIG_FIELD_MINIMUM_SYMBOLS_DESC="Set the minimum number of symbols (such as !@#$) required in a password."
+COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE="Minimum Upper Case"
+COM_USERS_CONFIG_FIELD_MINIMUM_UPPERCASE_DESC="Set the minimum number of upper case alphabetical characters required for a password."
+COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_DESC="The default group that will be applied to New Users Registering via the Frontend."
+COM_USERS_CONFIG_FIELD_NEW_USER_TYPE_LABEL="New User Registration Group"
+COM_USERS_CONFIG_FIELD_NOTES_HISTORY="User Notes History"
+COM_USERS_CONFIG_FIELD_SENDPASSWORD_LABEL="Send Password"
+COM_USERS_CONFIG_FIELD_SENDPASSWORD_DESC="If set to Yes the user's first password will be emailed to the user as part of the registration mail."
+COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC="This is added in front of each mail subject."
+COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_LABEL="Subject Prefix"
+COM_USERS_CONFIG_FIELD_USERACTIVATION_DESC="If set to None the user will be registered immediately. If set to Self the User will be emailed a link to activate their account before they can log in. If set to Administrator the user will be emailed a link to verify their email address and then all users set to receive system emails and who have the permission to create users will be notified to activate the user's account."
+COM_USERS_CONFIG_FIELD_USERACTIVATION_LABEL="New User Account Activation"
+COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Administrator"
+COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self"
+COM_USERS_CONFIG_IMPORT_FAILED="An error was encountered while importing the configuration: %s."
+COM_USERS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Users Component will integrate with other extensions."
+COM_USERS_CONFIG_PASSWORD_OPTIONS="Password Options"
+COM_USERS_CONFIG_SAVE_FAILED="An error was encountered while saving the configuration: %s."
+COM_USERS_CONFIG_USER_OPTIONS="User Options"
+COM_USERS_CONFIGURATION="Users: Options"
+COM_USERS_COUNT_ENABLED_USERS="Enabled Users"
+COM_USERS_COUNT_DISABLED_USERS="Disabled Users"
+COM_USERS_DEBUG_DESC="Display the Advanced Permission Reports."
+COM_USERS_DEBUG_EXPLICIT_ALLOW="Allowed"
+COM_USERS_DEBUG_EXPLICIT_DENY="Forbidden"
+COM_USERS_DEBUG_GROUP="Advanced Permissions Report"
+COM_USERS_DEBUG_GROUPS_LABEL="Advanced Groups Permissions"
+COM_USERS_DEBUG_GROUPS_DESC="Display the Advanced Groups Permissions Reports."
+COM_USERS_DEBUG_IMPLICIT_DENY="Not Allowed"
+COM_USERS_DEBUG_LABEL="Advanced"
+COM_USERS_DEBUG_LEGEND="Legend:"
+COM_USERS_DEBUG_USER="Advanced Permissions Report"
+COM_USERS_DEBUG_USERS_LABEL="Advanced Users Permissions"
+COM_USERS_DEBUG_USERS_DESC="Display the Advanced Users Permissions Reports."
+COM_USERS_DELETE_ERROR_INVALID_GROUP="You can't delete user groups to which you belong."
+COM_USERS_DESIRED_PASSWORD="Enter your desired password."
+COM_USERS_EDIT_NOTE="Edit Note"
+COM_USERS_EDIT_NOTE_N="Editing note with ID #%d"
+COM_USERS_EDIT_USER="Edit User %s"
+COM_USERS_EMPTY_REVIEW="-"
+COM_USERS_EMPTY_SUBJECT="- No subject -"
+COM_USERS_ERROR_CANNOT_BATCH_SUPERUSER="A non-Super User can't perform batch operations on Super Users."
+COM_USERS_ERROR_INVALID_GROUP="Invalid Group"
+COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED="No View Permission Level(s) selected."
+COM_USERS_ERROR_NO_ADDITIONS="The selected user(s) are already assigned to the selected group."
+COM_USERS_ERROR_VIEW_LEVEL_IN_USE="You can't delete the view access level '%d:%s' because it is being used by content."
+COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA="You have entered a Secret Code but two factor authentication is not enabled in your user account. If you want to use a secret code to secure your login please edit your user profile and enable two factor authentication."
+COM_USERS_FIELD_CATEGORY_ID_LABEL="Category"
+COM_USERS_FIELD_ID_LABEL="ID"
+COM_USERS_FIELD_LOGIN_MENUITEM="Menu Item"
+COM_USERS_FIELD_LOGIN_REDIRECT_PLACEHOLDER="index.php?Itemid=999&lang=en-GB"
+COM_USERS_FIELD_LOGIN_REDIRECT_CHOICE_DESC="'Internal URL' lets you manually enter any internal URL in the Redirect field. 'Menu Item' lets you directly select an existing menu item.<br />For a multilingual site, it is recommended to use 'Menu Item'."
+COM_USERS_FIELD_LOGIN_REDIRECT_CHOICE_LABEL="Choose Login Redirect Type"
+COM_USERS_FIELD_LOGIN_REDIRECT_ERROR="Only one of the login redirect fields should have a value."
+COM_USERS_FIELD_LOGIN_REDIRECTMENU_DESC="Select or create the page the user will be redirected to after a successful login. The default is to stay on the same page."
+COM_USERS_FIELD_LOGIN_REDIRECTMENU_LABEL="Menu Item Login Redirect"
+COM_USERS_FIELD_LOGIN_URL="Internal URL"
+COM_USERS_FIELD_LOGOUT_REDIRECT_CHOICE_LABEL="Choose Logout Redirect Type"
+COM_USERS_FIELD_LOGOUT_REDIRECT_ERROR="Only one of the logout redirect fields should have a value."
+COM_USERS_FIELD_LOGOUT_REDIRECTMENU_DESC="Select or create the page the user will be redirected to after ending their current session by logging out. The default is to stay on the same page."
+COM_USERS_FIELD_LOGOUT_REDIRECTMENU_LABEL="Menu Item Logout Redirect"
+COM_USERS_FIELD_NOTEBODY_DESC="Note"
+COM_USERS_FIELD_NOTEBODY_LABEL="Note"
+COM_USERS_FIELD_REVIEW_TIME_DESC="Review Date is a manually entered date you can use as fits in your workflow. Examples would be to put in a date when you want to review a user or the last date you reviewed the user."
+COM_USERS_FIELD_REVIEW_TIME_LABEL="Review Date"
+COM_USERS_FIELD_STATE_DESC="Set publication status."
+COM_USERS_FIELD_SUBJECT_DESC="The subject line for the note."
+COM_USERS_FIELD_SUBJECT_LABEL="Subject"
+COM_USERS_FIELD_USER_ID_LABEL="User"
+COM_USERS_FIELDS_USER_FIELDS_TITLE="Users: Fields"
+COM_USERS_FIELDS_USER_FIELD_ADD_TITLE="Users: New Field"
+COM_USERS_FIELDS_USER_FIELD_EDIT_TITLE="Users: Edit Field"
+COM_USERS_FILTER_ACTIVE="- Select Active State -"
+COM_USERS_FILTER_COMPONENT_LABEL="Component"
+COM_USERS_FILTER_COMPONENT_DESC="Component to debug."
+COM_USERS_FILTER_LABEL="Filter Users by:&#160;"
+COM_USERS_FILTER_LEVEL_END_LABEL="Level End"
+COM_USERS_FILTER_LEVEL_END_DESC="Asset end level."
+COM_USERS_FILTER_LEVEL_START_LABEL="Level Start"
+COM_USERS_FILTER_LEVEL_START_DESC="Asset start level."
+COM_USERS_FILTER_NOTES="Show notes list for this user"
+COM_USERS_FILTER_STATE="- Select State -"
+COM_USERS_FILTER_USER_GROUP="Filter User Group"
+COM_USERS_FILTER_USERGROUP="- Select Group -"
+COM_USERS_GROUP_FIELD_PARENT_DESC="Choose a Parent for this Group."
+COM_USERS_GROUP_FIELD_PARENT_LABEL="Group Parent"
+COM_USERS_GROUP_FIELD_TITLE_DESC="Enter a Title for the Group."
+COM_USERS_GROUP_FIELD_TITLE_LABEL="Group Title"
+COM_USERS_GROUP_SAVE_SUCCESS="Group saved."
+COM_USERS_GROUPS_CONFIRM_DELETE="Are you sure you wish to delete groups that have users?"
+COM_USERS_GROUPS_N_ITEMS_DELETED="%d User Groups deleted."
+COM_USERS_GROUPS_N_ITEMS_DELETED_1="1 User Group deleted."
+COM_USERS_GROUPS_NO_ITEM_SELECTED="No User Groups selected."
+COM_USERS_HEADING_ACTIVATED="Activated"
+COM_USERS_HEADING_ACTIVATED_ASC="Activated ascending"
+COM_USERS_HEADING_ACTIVATED_DESC="Activated descending"
+COM_USERS_HEADING_ASSET_NAME="Asset Name"
+COM_USERS_HEADING_ASSET_NAME_ASC="Asset Name ascending"
+COM_USERS_HEADING_ASSET_NAME_DESC="Asset Name descending"
+COM_USERS_HEADING_ASSET_TITLE="Asset Title"
+COM_USERS_HEADING_ASSET_TITLE_ASC="Asset Title ascending"
+COM_USERS_HEADING_ASSET_TITLE_DESC="Asset Title descending"
+COM_USERS_HEADING_CATEGORY="Category"
+COM_USERS_HEADING_CATEGORY_ASC="Category ascending"
+COM_USERS_HEADING_CATEGORY_DESC="Category descending"
+COM_USERS_HEADING_EMAIL_ASC="Email ascending"
+COM_USERS_HEADING_EMAIL_DESC="Email descending"
+COM_USERS_HEADING_ENABLED="Enabled"
+COM_USERS_HEADING_ENABLED_ASC="Enabled ascending"
+COM_USERS_HEADING_ENABLED_DESC="Enabled descending"
+COM_USERS_HEADING_GROUP_TITLE="Group Title"
+COM_USERS_HEADING_GROUP_TITLE_ASC="Group Title ascending"
+COM_USERS_HEADING_GROUP_TITLE_DESC="Group Title descending"
+COM_USERS_HEADING_GROUPS="User Groups"
+COM_USERS_HEADING_LAST_VISIT_DATE="Last Visit Date"
+COM_USERS_HEADING_LAST_VISIT_DATE_ASC="Last visit date ascending"
+COM_USERS_HEADING_LAST_VISIT_DATE_DESC="Last visit date descending"
+COM_USERS_HEADING_LEVEL_NAME="Level Name"
+COM_USERS_HEADING_LEVEL_NAME_ASC="Level Name ascending"
+COM_USERS_HEADING_LEVEL_NAME_DESC="Level Name descending"
+COM_USERS_HEADING_LFT="LFT"
+COM_USERS_HEADING_LFT_ASC="LFT ascending"
+COM_USERS_HEADING_LFT_DESC="LFT descending"
+COM_USERS_HEADING_NAME="Name"
+COM_USERS_HEADING_NAME_ASC="Name ascending"
+COM_USERS_HEADING_NAME_DESC="Name descending"
+COM_USERS_HEADING_REGISTRATION_DATE="Registration Date"
+COM_USERS_HEADING_REGISTRATION_DATE_ASC="Registration date ascending"
+COM_USERS_HEADING_REGISTRATION_DATE_DESC="Registration date descending"
+COM_USERS_HEADING_REVIEW="Review Date"
+COM_USERS_HEADING_REVIEW_ASC="Review Date ascending"
+COM_USERS_HEADING_REVIEW_DESC="Review Date descending"
+COM_USERS_HEADING_SUBJECT="Subject"
+COM_USERS_HEADING_SUBJECT_ASC="Subject ascending"
+COM_USERS_HEADING_SUBJECT_DESC="Subject descending"
+COM_USERS_HEADING_USER="User"
+COM_USERS_HEADING_USER_ASC="User ascending"
+COM_USERS_HEADING_USER_DESC="User descending"
+COM_USERS_HEADING_USERNAME_ASC="Username ascending"
+COM_USERS_HEADING_USERNAME_DESC="Username descending"
+COM_USERS_HEADING_USERS_IN_GROUP="Users in group"
+COM_USERS_LEVEL_DETAILS="Level Details"
+COM_USERS_LEVEL_FIELD_TITLE_DESC="Enter a Title for this Access level."
+COM_USERS_LEVEL_FIELD_TITLE_LABEL="Level Title"
+COM_USERS_LEVEL_HEADER_ERROR="User header access level error."
+COM_USERS_LEVEL_SAVE_SUCCESS="Access level saved."
+COM_USERS_LEVELS_N_ITEMS_DELETED="%d View Permission Level deleted."
+COM_USERS_LEVELS_N_ITEMS_DELETED_1="1 View Permission Level deleted."
+COM_USERS_MAIL_DETAILS="Details"
+COM_USERS_MAIL_EMAIL_SENT_TO_N_USERS="Email sent to %s users."
+COM_USERS_MAIL_EMAIL_SENT_TO_N_USERS_1="Email sent to one user."
+COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_DESC="If checked, disabled users will be included when sending mail."
+COM_USERS_MAIL_FIELD_EMAIL_DISABLED_USERS_LABEL="Send to Disabled Users"
+COM_USERS_MAIL_FIELD_GROUP_DESC="Choose a group to send the mail to."
+COM_USERS_MAIL_FIELD_GROUP_LABEL="Group:"
+COM_USERS_MAIL_FIELD_MESSAGE_DESC="Enter a default message."
+COM_USERS_MAIL_FIELD_MESSAGE_LABEL="Message"
+COM_USERS_MAIL_FIELD_RECURSE_DESC="If checked, the email will also be sent to users who are members of any child groups of the selected groups."
+COM_USERS_MAIL_FIELD_RECURSE_LABEL="Mail to Child User Groups"
+COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hide the recipient list and use the site email address for the To: field."
+COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL="Recipients as BCC"
+COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC="If checked, the email will be sent with HTML tags. If not checked, email will be sent in plain text."
+COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL="Send in HTML Mode"
+COM_USERS_MAIL_FIELD_SUBJECT_DESC="Enter the subject of the mail."
+COM_USERS_MAIL_FIELD_SUBJECT_LABEL="Subject"
+COM_USERS_MAIL_FIELD_VALUE_ALL_USERS_GROUPS="All Users Groups"
+COM_USERS_MAIL_MESSAGE="Message"
+COM_USERS_MAIL_NO_USERS_COULD_BE_FOUND_IN_THIS_GROUP="No users could be found in this group."
+COM_USERS_MAIL_ONLY_YOU_COULD_BE_FOUND_IN_THIS_GROUP="You are the only user in this group."
+COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correctly."
+COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message"
+COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject"
+COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group"
+COM_USERS_MAIL_THE_MAIL_COULD_NOT_BE_SENT="The mail could not be sent."
+COM_USERS_MASS_MAIL="Mass Mail Users"
+COM_USERS_MASS_MAIL_DESC="Mass Mail options."
+COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
+COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
+COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
+COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough uppercase characters. At least %s upper case characters are required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough uppercase characters. At least 1 upper case character is required."
+COM_USERS_MSG_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
+COM_USERS_MSG_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."
+COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not have spaces at the beginning or end."
+COM_USERS_N_LEVELS_DELETED="%d View Access Levels removed."
+COM_USERS_N_LEVELS_DELETED_0="No View Access Levels removed."
+COM_USERS_N_LEVELS_DELETED_1="%d View Access Level removed."
+COM_USERS_N_USER_NOTES="Display %d notes"
+COM_USERS_N_USER_NOTES_1="Display %d note"
+COM_USERS_N_USER_NOTES_0="No notes to display"
+COM_USERS_N_USERS_ACTIVATED="%s Users activated."
+COM_USERS_N_USERS_ACTIVATED_0="No user activated."
+COM_USERS_N_USERS_ACTIVATED_1="User activated."
+COM_USERS_N_USERS_BLOCKED="%s Users blocked."
+COM_USERS_N_USERS_BLOCKED_0="No User blocked."
+COM_USERS_N_USERS_BLOCKED_1="User blocked."
+COM_USERS_N_USERS_UNBLOCKED="%s Users enabled."
+COM_USERS_N_USERS_UNBLOCKED_0="No User enabled."
+COM_USERS_N_USERS_UNBLOCKED_1="User enabled."
+COM_USERS_NEW_NOTE="New Note"
+COM_USERS_NO_ACTION="No Action"
+COM_USERS_NO_NOTES="No notes available for this user."
+COM_USERS_NO_LEVELS_SELECTED="No Viewing Access Levels selected."
+COM_USERS_NOTE_N_SUBJECT="#%d %s"
+COM_USERS_NOTES="User Notes: New/Edit"
+COM_USERS_NOTES_FOR_USER="Notes for user %s (ID #%d)"
+COM_USERS_NOTES_N_ITEMS_ARCHIVED="%d User Notes archived."
+COM_USERS_NOTES_N_ITEMS_ARCHIVED_1="%d User Note archived."
+COM_USERS_NOTES_N_ITEMS_CHECKED_IN="%d User Notes checked in."
+COM_USERS_NOTES_N_ITEMS_CHECKED_IN_1="%d User Note checked in."
+COM_USERS_NOTES_N_ITEMS_DELETED="%d User Notes deleted."
+COM_USERS_NOTES_N_ITEMS_DELETED_1="%d User Note deleted."
+COM_USERS_NOTES_N_ITEMS_PUBLISHED="%d User Notes published."
+COM_USERS_NOTES_N_ITEMS_PUBLISHED_1="%d User Note published."
+COM_USERS_NOTES_N_ITEMS_TRASHED="%d User Notes trashed."
+COM_USERS_NOTES_N_ITEMS_TRASHED_1="%d User Note trashed."
+COM_USERS_NOTES_N_ITEMS_UNPUBLISHED="%d User Notes unpublished."
+COM_USERS_NOTES_N_ITEMS_UNPUBLISHED_1="%d User Note unpublished."
+COM_USERS_OPTION_FILTER_DATE="- Select Registration Date -"
+COM_USERS_OPTION_FILTER_LAST_VISIT_DATE="- Select Last Visit Date -"
+COM_USERS_OPTION_RANGE_NEVER="never"
+COM_USERS_OPTION_RANGE_PAST_1MONTH="in the last month"
+COM_USERS_OPTION_RANGE_PAST_3MONTH="in the last 3 months"
+COM_USERS_OPTION_RANGE_PAST_6MONTH="in the last 6 months"
+COM_USERS_OPTION_RANGE_PAST_WEEK="in the last week"
+COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year"
+COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago"
+COM_USERS_OPTION_RANGE_TODAY="today"
+COM_USERS_OPTION_LEVEL_CATEGORY="%d (top category)"
+COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)"
+COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)"
+COM_USERS_OPTION_SELECT_COMPONENT="- Select Component -"
+COM_USERS_OPTION_SELECT_LEVEL_END="- Select End Level -"
+COM_USERS_OPTION_SELECT_LEVEL_START="- Select Start Level -"
+COM_USERS_PASSWORD_RESET_REQUIRED="Password Reset Required"
+COM_USERS_REQUIRE_PASSWORD_RESET="Require Password Reset"
+COM_USERS_REVIEW_HEADING="Review Date"
+COM_USERS_SEARCH_ACCESS_LEVELS="Search Viewing Access Levels"
+COM_USERS_SEARCH_ASSETS="Search Assets"
+COM_USERS_SEARCH_GROUPS_LABEL="Search User Groups"
+COM_USERS_SEARCH_IN_GROUPS="Search in group title. Prefix with ID: to search for a group ID."
+COM_USERS_SEARCH_IN_NAME="Search in name, username or email. Prefix with ID: to search for a user ID."
+COM_USERS_SEARCH_IN_NOTE_TITLE="Search in subject, name or username. Prefix with ID: or UID: to search for a note ID or user ID."
+COM_USERS_SEARCH_IN_LEVEL_NAME="Search in level name. Prefix with ID: to search for an access level ID."
+COM_USERS_SEARCH_IN_ASSETS="Search in asset name or title."
+COM_USERS_SEARCH_TITLE_LEVELS="Search Access Levels"
+COM_USERS_SEARCH_USER_NOTES="Search User Notes"
+COM_USERS_SEARCH_USERS="Search Users"
+COM_USERS_SETTINGS_FIELDSET_LABEL="Basic Settings"
+COM_USERS_SUBMENU_GROUPS="User Groups"
+COM_USERS_SUBMENU_LEVELS="Viewing Access Levels"
+COM_USERS_SUBMENU_NOTES="User Notes"
+COM_USERS_SUBMENU_NOTE_CATEGORIES="User Note Categories"
+COM_USERS_SUBMENU_USERS="Users"
+COM_USERS_SUBJECT_HEADING="Subject"
+COM_USERS_TOOLBAR_ACTIVATE="Activate"
+COM_USERS_TOOLBAR_BLOCK="Block"
+COM_USERS_TOOLBAR_MAIL_SEND_MAIL="Send email"
+COM_USERS_TOOLBAR_UNBLOCK="Unblock"
+COM_USERS_UNACTIVATED="Unactivated"
+COM_USERS_USER_ACCOUNT_DETAILS="Account Details"
+COM_USERS_USER_BATCH_FAILED="An error was encountered while performing the batch operation: %s."
+COM_USERS_USER_BATCH_SUCCESS="Batch operation completed."
+COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC="Select the Language for the Administrator Backend interface. This will only affect this User."
+COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language"
+COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC="Select the template style for the Administrator Backend interface. This will only affect this User."
+COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL="Backend Template Style"
+COM_USERS_USER_FIELD_BLOCK="Blocked"
+COM_USERS_USER_FIELD_BLOCK_DESC="Enable or Block this user."
+COM_USERS_USER_FIELD_BLOCK_LABEL="User Status"
+COM_USERS_USER_FIELD_EDITOR_DESC="Editor for this user."
+COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
+COM_USERS_USER_FIELD_EMAIL_DESC="Enter an email address for the user."
+COM_USERS_USER_FIELD_ENABLE="Enabled"
+COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC="Select the Language for the Frontend interface. This will only affect this User."
+COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
+COM_USERS_USER_FIELD_HELPSITE_DESC="Help site for this user."
+COM_USERS_USER_FIELD_HELPSITE_LABEL="Help Site"
+COM_USERS_USER_FIELD_LASTRESET_DESC="Date and time of last password reset."
+COM_USERS_USER_FIELD_LASTRESET_LABEL="Last Reset Date"
+COM_USERS_USER_FIELD_LASTVISIT_DESC="Last visit date."
+COM_USERS_USER_FIELD_LASTVISIT_LABEL="Last Visit Date"
+COM_USERS_USER_FIELD_NAME_DESC="Enter the name of the user."
+COM_USERS_USER_FIELD_NAME_LABEL="Name"
+COM_USERS_USER_FIELD_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
+COM_USERS_USER_FIELD_PASSWORD2_DESC="Confirm the user's password."
+COM_USERS_USER_FIELD_PASSWORD2_LABEL="Confirm Password"
+COM_USERS_USER_FIELD_PASSWORD_DESC="Enter the password for the user."
+COM_USERS_USER_FIELD_REGISTERDATE_DESC="Registration date."
+COM_USERS_USER_FIELD_REGISTERDATE_LABEL="Registration Date"
+COM_USERS_USER_FIELD_REQUIRERESET_DESC="Setting this option to yes requires the user to reset their password the next time they log into the site."
+COM_USERS_USER_FIELD_REQUIRERESET_LABEL="Require Password Reset"
+COM_USERS_USER_FIELD_RESETCOUNT_DESC="Number of password resets since last reset date."
+COM_USERS_USER_FIELD_RESETCOUNT_LABEL="Password Reset Count"
+COM_USERS_USER_FIELD_SENDEMAIL_DESC="If set to yes, the user will receive system emails."
+COM_USERS_USER_FIELD_SENDEMAIL_LABEL="Receive System Emails"
+COM_USERS_USER_FIELD_TIMEZONE_DESC="Time zone for this user."
+COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone"
+COM_USERS_USER_FIELD_TWOFACTOR_LABEL="Authentication Method"
+COM_USERS_USER_FIELD_TWOFACTOR_DESC="Which two factor authentication method you want to activate on the user account."
+COM_USERS_USER_FIELD_USERNAME_DESC="Enter the login name (Username) for the user."
+COM_USERS_USER_FIELD_USERNAME_LABEL="Login Name"
+COM_USERS_USER_GROUPS_HAVING_ACCESS="User Groups Having Viewing Access"
+COM_USERS_USER_HEADING="User"
+COM_USERS_USER_OTEPS="One time emergency passwords"
+COM_USERS_USER_OTEPS_DESC="If you do not have access to your two factor authentication device you can use any of the following passwords instead of a regular security code. Each one of these emergency passwords is immediately destroyed upon use. We recommend printing these passwords out and keeping the printout in a safe and accessible location, eg your wallet or a safety deposit box."
+COM_USERS_USER_OTEPS_WAIT_DESC="There are no emergency one time passwords generated in your account. The passwords will be generated automatically and displayed here as soon as you activate two factor authentication."
+COM_USERS_USER_SAVE_FAILED="An error was encountered while saving the member: %s."
+COM_USERS_USER_SAVE_SUCCESS="User saved."
+COM_USERS_USER_TWO_FACTOR_AUTH="Two Factor Authentication"
+COM_USERS_USERGROUP_DETAILS="User Group Details"
+COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF="You can't block yourself."
+COM_USERS_USERS_ERROR_CANNOT_EDIT_OWN_GROUP="You can't edit your own user groups. User groups saving was skipped."
+COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF="You can't delete yourself."
+COM_USERS_USERS_ERROR_CANNOT_DEMOTE_SELF="You can't remove your own Super User permissions."
+COM_USERS_USERS_ERROR_CANNOT_REQUIRERESET_SELF="You can't require a Password reset for yourself."
+COM_USERS_USERS_ERROR_CANNOT_SAVE_ACCOUNT_WITHOUT_GROUPS="You can't save a user account without selecting at least one user group."
+COM_USERS_USERS_MULTIPLE_GROUPS="Multiple groups"
+COM_USERS_USERS_N_ITEMS_DELETED="%d users deleted."
+COM_USERS_USERS_N_ITEMS_DELETED_1="1 user deleted."
+COM_USERS_USERS_NO_ITEM_SELECTED="No Users selected."
+COM_USERS_VIEW_DEBUG_GROUP_TITLE="Advanced Permissions Report for Group #%d, %s"
+COM_USERS_VIEW_DEBUG_USER_TITLE="Advanced Permissions Report for User #%d, %s"
+COM_USERS_VIEW_EDIT_GROUP_TITLE="Users: Edit Group"
+COM_USERS_VIEW_EDIT_LEVEL_TITLE="Users: Edit Viewing Access Level"
+COM_USERS_VIEW_EDIT_PROFILE_TITLE="Users: Edit Profile"
+COM_USERS_VIEW_EDIT_USER_TITLE="Users: Edit"
+COM_USERS_VIEW_GROUPS_TITLE="Users: Groups"
+COM_USERS_VIEW_LEVELS_TITLE="Users: Viewing Access Levels"
+COM_USERS_VIEW_NEW_GROUP_TITLE="Users: New Group"
+COM_USERS_VIEW_NEW_LEVEL_TITLE="Users: New Viewing Access Level"
+COM_USERS_VIEW_NEW_USER_TITLE="Users: New"
+COM_USERS_VIEW_NOTES_TITLE="User Notes"
+COM_USERS_VIEW_USERS_TITLE="Users"
+COM_USERS_XML_DESCRIPTION="Component for managing users"
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+; Categories overrides
+COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
+COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
diff --git a/core/administrator/language/en-GB/en-GB.com_users.sys.ini b/core/administrator/language/en-GB/en-GB.com_users.sys.ini
new file mode 100644
index 00000000..e99cc7c5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_users.sys.ini
@@ -0,0 +1,50 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_USERS="Users"
+COM_USERS_CONTENT_TYPE_CATEGORY="User Notes Category"
+COM_USERS_CONTENT_TYPE_NOTE="User Notes"
+COM_USERS_CONTENT_TYPE_USER="User"
+COM_USERS_GROUPS_VIEW_DEFAULT_DESC="Shows a List of User Groups"
+COM_USERS_GROUPS_VIEW_DEFAULT_TITLE="User Groups"
+COM_USERS_GROUP_VIEW_EDIT_DESC="Shows a form to create a new User Group"
+COM_USERS_GROUP_VIEW_EDIT_TITLE="Create User Group"
+COM_USERS_LEVELS_VIEW_DEFAULT_DESC="Shows a List of Access Levels"
+COM_USERS_LEVELS_VIEW_DEFAULT_TITLE="Access Levels"
+COM_USERS_LEVEL_VIEW_EDIT_DESC="Shows a form to create a new Access Level"
+COM_USERS_LEVEL_VIEW_EDIT_TITLE="Create Access Level"
+COM_USERS_MAIL_VIEW_DEFAULT_DESC="Shows a form to send mass email to multiple users."
+COM_USERS_MAIL_VIEW_DEFAULT_TITLE="Mass Mail Users"
+COM_USERS_NOTES_VIEW_DEFAULT_DESC="Shows a List of User Notes"
+COM_USERS_NOTES_VIEW_DEFAULT_TITLE="User Notes"
+COM_USERS_NOTE_VIEW_EDIT_DESC="Shows a form to create a new User Note"
+COM_USERS_NOTE_VIEW_EDIT_TITLE="Create User Note"
+COM_USERS_TAGS_CATEGORY="User Note Category"
+COM_USERS_USERS_VIEW_DEFAULT_DESC="Shows a List of Users"
+COM_USERS_USERS_VIEW_DEFAULT_TITLE="Users"
+COM_USERS_USER_VIEW_EDIT_DESC="Shows a form to create a new User Account"
+COM_USERS_USER_VIEW_EDIT_TITLE="Create User"
+COM_USER_LOGIN_VIEW_DEFAULT_DESC="Displays a login form."
+COM_USER_LOGIN_VIEW_DEFAULT_OPTION="Login Form"
+COM_USER_LOGIN_VIEW_DEFAULT_TITLE="Login Form"
+COM_USER_LOGOUT_VIEW_DEFAULT_DESC="Direct logout and redirect to page."
+COM_USER_LOGOUT_VIEW_DEFAULT_OPTION="Logout"
+COM_USER_LOGOUT_VIEW_DEFAULT_TITLE="Logout"
+COM_USER_PROFILE_EDIT_DEFAULT_DESC="Edit a user profile."
+COM_USER_PROFILE_EDIT_DEFAULT_OPTION="Edit User Profile"
+COM_USER_PROFILE_EDIT_DEFAULT_TITLE="Edit User Profile"
+COM_USER_PROFILE_VIEW_DEFAULT_DESC="Displays a user profile."
+COM_USER_PROFILE_VIEW_DEFAULT_OPTION="User Profile"
+COM_USER_PROFILE_VIEW_DEFAULT_TITLE="User Profile"
+COM_USER_REGISTRATION_VIEW_DEFAULT_DESC="Displays a registration form."
+COM_USER_REGISTRATION_VIEW_DEFAULT_OPTION="Default"
+COM_USER_REGISTRATION_VIEW_DEFAULT_TITLE="Registration Form"
+COM_USER_REMIND_VIEW_DEFAULT_DESC="Displays a username reminder request."
+COM_USER_REMIND_VIEW_DEFAULT_OPTION="Default"
+COM_USER_REMIND_VIEW_DEFAULT_TITLE="Username Reminder Request"
+COM_USER_RESET_VIEW_DEFAULT_DESC="Displays a request to reset password."
+COM_USER_RESET_VIEW_DEFAULT_OPTION="Default"
+COM_USER_RESET_VIEW_DEFAULT_TITLE="Password Reset"
+COM_USERS_XML_DESCRIPTION="Component for managing users."
diff --git a/core/administrator/language/en-GB/en-GB.com_weblinks.ini b/core/administrator/language/en-GB/en-GB.com_weblinks.ini
new file mode 100644
index 00000000..d2c7ac37
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_weblinks.ini
@@ -0,0 +1,127 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WEBLINKS="Web Links"
+COM_WEBLINKS_ACCESS_HEADING="Access"
+COM_WEBLINKS_BATCH_OPTIONS="Batch process the selected links"
+COM_WEBLINKS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved links. Otherwise, all actions are applied to the selected links."
+COM_WEBLINKS_CATEGORIES_DESC="These settings apply for Web Links Categories Options unless they are changed for a specific menu item."
+COM_WEBLINKS_CATEGORY_DESC="These settings apply for Web Links Category Options unless they are changed for a specific menu item."
+COM_WEBLINKS_COMPONENT_DESC="These settings apply for Web Links unless they are changed for a specific menu item or web link."
+COM_WEBLINKS_COMPONENT_LABEL="Web Link"
+COM_WEBLINKS_CONFIG_INTEGRATION_SETTINGS_DESC="These settings determine how the Web Links Component will integrate with other extensions."
+COM_WEBLINKS_CONFIGURATION="Web Links Manager Options"
+COM_WEBLINKS_EDIT_WEBLINK="Edit Web Link"
+COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again."
+COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL"
+COM_WEBLINKS_ERR_TABLES_TITLE="Your web link must have a title."
+COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another web link from this category has the same alias (remember it may be a trashed item)."
+COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category."
+COM_WEBLINKS_FIELD_CATEGORY_DESC="Choose a category for this Web link."
+COM_WEBLINKS_FIELD_CATEGORYCHOOSE_DESC="Please choose a Web Links category to display."
+COM_WEBLINKS_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the web link submit form. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration."
+COM_WEBLINKS_FIELD_CAPTCHA_LABEL="Allow Captcha on Web Link"
+COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC="Show or hide the number of Web Links in each Category."
+COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL="# Web Links"
+COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
+COM_WEBLINKS_FIELD_CONFIG_COUNTCLICKS_LABEL="Count Clicks"
+COM_WEBLINKS_FIELD_CONFIG_DESCRIPTION_DESC="Show or hide the description below."
+COM_WEBLINKS_FIELD_CONFIG_HITS_DESC="Show or hide hits."
+COM_WEBLINKS_FIELD_CONFIG_ICON_DESC="If Icon is chosen above, select an icon to display with the Web Links. If none is selected, the default icon will be used."
+COM_WEBLINKS_FIELD_CONFIG_ICON_LABEL="Select Icon"
+COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC="Show or hide the links description."
+COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL="Links Description"
+COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_DESC="Show or hide other categories."
+COM_WEBLINKS_FIELD_CONFIG_OTHERCATS_LABEL="Other Categories"
+COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_DESC="Show or hide the Report Bad Link option."
+COM_WEBLINKS_FIELD_CONFIG_SHOWREPORT_LABEL="Reports"
+COM_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
+COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks"
+COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for the web link."
+COM_WEBLINKS_FIELD_DISPLAY_NUM_DESC="Default number of Web links to list on a page."
+COM_WEBLINKS_FIELD_DISPLAY_NUM_LABEL="# of Web links to List"
+COM_WEBLINKS_FIELD_FIRST_DESC="The image to be displayed."
+COM_WEBLINKS_FIELD_FIRST_LABEL="First Image"
+
+COM_WEBLINKS_FIELD_HEIGHT_DESC="Height of the target popup or modal window. Defaults to 600x500 if one field is left empty."
+COM_WEBLINKS_FIELD_HEIGHT_LABEL="Height"
+COM_WEBLINKS_FIELD_ICON_DESC="Displays a text, an icon or nothing with the Web links. Default is 'Icon'."
+COM_WEBLINKS_FIELD_ICON_LABEL="Text/Icon/Web Link Only"
+COM_WEBLINKS_FIELD_ICON_OPTION_ICON="Icon"
+COM_WEBLINKS_FIELD_ICON_OPTION_TEXT="Text"
+COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK="Web Link Only"
+COM_WEBLINKS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images. Replaced with caption text if it is present."
+COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image."
+COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption"
+
+COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this web link."
+COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified."
+COM_WEBLINKS_FIELD_SECOND_DESC="The second image to be displayed."
+COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image"
+COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC="Select a web links category to display."
+COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL="Select a Category"
+COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for a category."
+COM_WEBLINKS_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags"
+COM_WEBLINKS_FIELD_SHOW_TAGS_DESC="Show the tags for a web link."
+COM_WEBLINKS_FIELD_SHOW_TAGS_LABEL="Show Tags"
+COM_WEBLINKS_FIELD_STATE_DESC="Set publication status."
+COM_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected."
+COM_WEBLINKS_FIELD_TARGET_LABEL="Target"
+COM_WEBLINKS_FIELD_TITLE_DESC="Web Link must have a title."
+COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL. IDN (International) Links are converted to punycode when they are saved."
+COM_WEBLINKS_FIELD_URL_LABEL="URL"
+COM_WEBLINKS_FIELD_VALUE_REPORTED="Reported"
+COM_WEBLINKS_FIELD_VERSION_DESC="A count of the number of times this web link has been revised."
+COM_WEBLINKS_FIELD_VERSION_LABEL="Revision"
+COM_WEBLINKS_FIELD_WIDTH_DESC="Width of the target popup or modal window. Defaults to 600x500 if one field is left empty."
+COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
+COM_WEBLINKS_FIELDSET_IMAGES="Images"
+COM_WEBLINKS_FIELDSET_OPTIONS="Options"
+COM_WEBLINKS_FILTER_CATEGORY="Filter Category"
+COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for a web link ID."
+COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
+COM_WEBLINKS_FILTER_STATE="Filter State"
+COM_WEBLINKS_FLOAT_DESC="Controls placement of the image."
+COM_WEBLINKS_FLOAT_LABEL="Image Float"
+COM_WEBLINKS_HITS_DESC="Number of hits for this web link."
+COM_WEBLINKS_LEFT="Left"
+COM_WEBLINKS_LIST_LAYOUT_DESC="These settings apply for Web Links List Layout Options unless they are changed for a specific menu item."
+COM_WEBLINKS_MANAGER_WEBLINK="Web Links"
+COM_WEBLINKS_MANAGER_WEBLINKS="Web Links"
+COM_WEBLINKS_MANAGER_WEBLINK_EDIT="Web Link: Edit"
+COM_WEBLINKS_MANAGER_WEBLINK_NEW="Web Link: New"
+COM_WEBLINKS_N_ITEMS_ARCHIVED="%d web links archived."
+COM_WEBLINKS_N_ITEMS_ARCHIVED_1="%d web link archived."
+COM_WEBLINKS_N_ITEMS_CHECKED_IN_0="No web link checked in."
+COM_WEBLINKS_N_ITEMS_CHECKED_IN_1="%d web link checked in."
+COM_WEBLINKS_N_ITEMS_CHECKED_IN_MORE="%d web links checked in."
+COM_WEBLINKS_N_ITEMS_DELETED="%d web links deleted."
+COM_WEBLINKS_N_ITEMS_DELETED_1="%d web link deleted."
+COM_WEBLINKS_N_ITEMS_PUBLISHED="%d web links published."
+COM_WEBLINKS_N_ITEMS_PUBLISHED_1="%d web link published."
+COM_WEBLINKS_N_ITEMS_TRASHED="%d web links trashed."
+COM_WEBLINKS_N_ITEMS_TRASHED_1="%d web link trashed."
+COM_WEBLINKS_N_ITEMS_UNPUBLISHED="%d web links unpublished."
+COM_WEBLINKS_N_ITEMS_UNPUBLISHED_1="%d web link unpublished."
+COM_WEBLINKS_NEW_WEBLINK="New Web Link"
+COM_WEBLINKS_NONE="None"
+COM_WEBLINKS_OPTION_FILTER_ACCESS="- Filter Access -"
+COM_WEBLINKS_OPTION_FILTER_CATEGORY="- Filter Category -"
+COM_WEBLINKS_OPTION_FILTER_PUBLISHED="- Filter State -"
+COM_WEBLINKS_OPTIONS="Options"
+COM_WEBLINKS_ORDER_HEADING="Order"
+COM_WEBLINKS_RIGHT="Right"
+COM_WEBLINKS_SAVE_SUCCESS="Web link saved"
+COM_WEBLINKS_SEARCH_IN_TITLE="Search in title"
+COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty if it has no Web links or subcategories."
+COM_WEBLINKS_SUBMENU_CATEGORIES="Categories"
+COM_WEBLINKS_SUBMENU_WEBLINKS="Web Links"
+COM_WEBLINKS_XML_DESCRIPTION="Component for web links management"
+JGLOBAL_NO_ITEM_SELECTED="No web links selected"
+JGLOBAL_NEWITEMSLAST_DESC="New Web links default to the last position. Ordering can be changed after this Web link is saved."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new web links in this category."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these web links."
+JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/core/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/core/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
new file mode 100644
index 00000000..12d92492
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WEBLINKS="Web Links"
+COM_WEBLINKS_CATEGORIES="Categories"
+COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_DESC="Show all the web link categories within a category."
+COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_OPTION="Default"
+COM_WEBLINKS_CATEGORIES_VIEW_DEFAULT_TITLE="List All Web Link Categories"
+COM_WEBLINKS_CATEGORY_ADD_TITLE="Category Manager: Add A New Web Links Category"
+COM_WEBLINKS_CATEGORY_EDIT_TITLE="Category Manager: Edit A Web Links Category"
+COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_DESC="Displays a list of Web Links for a category."
+COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_OPTION="Default"
+COM_WEBLINKS_CATEGORY_VIEW_DEFAULT_TITLE="List Web Links in a Category"
+COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link"
+COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category"
+COM_WEBLINKS_FORM_VIEW_DEFAULT_DESC="Display a form to submit a web link in the Frontend."
+COM_WEBLINKS_FORM_VIEW_DEFAULT_OPTION="Default"
+COM_WEBLINKS_FORM_VIEW_DEFAULT_TITLE="Submit a Web Link"
+COM_WEBLINKS_LINKS="Links"
+COM_WEBLINKS_TAGS_WEBLINK="Web Link"
+COM_WEBLINKS_TAGS_CATEGORY="Web Link Category"
+COM_WEBLINKS_XML_DESCRIPTION="Component for web links management."
+
diff --git a/core/administrator/language/en-GB/en-GB.com_wrapper.ini b/core/administrator/language/en-GB/en-GB.com_wrapper.ini
new file mode 100644
index 00000000..b223cbf6
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_wrapper.ini
@@ -0,0 +1,22 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WRAPPER="Wrapper"
+COM_WRAPPER_FIELD_ADD_DESC="By default, http:// will be added unless it detects http:// or https:// in the URL you provide. This allows you to switch off this functionality."
+COM_WRAPPER_FIELD_ADD_LABEL="Auto Add"
+COM_WRAPPER_FIELD_FRAME_DESC="Show frame border which wrap the iframe."
+COM_WRAPPER_FIELD_FRAME_LABEL="Frame Border"
+COM_WRAPPER_FIELD_HEIGHT_DESC="Height of the iframe window in pixels."
+COM_WRAPPER_FIELD_HEIGHT_LABEL="Height"
+COM_WRAPPER_FIELD_HEIGHTAUTO_DESC="If height is set to auto, the height will automatically be set to the size of the external page. This will only work for pages on your own domain. If you see a JavaScript error, make sure this parameter is disabled. This will break XHTML compatibility for this page."
+COM_WRAPPER_FIELD_HEIGHTAUTO_LABEL="Auto Height"
+COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS="Scroll Bar Parameters"
+COM_WRAPPER_FIELD_SCROLLBARS_DESC="Show or hide the horizontal &amp; vertical scrollbars. If you choose 'Auto', make sure the Auto advanced parameter is set."
+COM_WRAPPER_FIELD_SCROLLBARS_LABEL="Scroll Bars"
+COM_WRAPPER_FIELD_URL_DESC="URL to site/file you wish to display within the iframe."
+COM_WRAPPER_FIELD_URL_LABEL="URL"
+COM_WRAPPER_FIELD_VALUE_AUTO="Auto"
+COM_WRAPPER_FIELD_WIDTH_DESC="Width of the iframe window. You may enter an absolute figure in pixels or a relative figure by adding a %."
+COM_WRAPPER_XML_DESCRIPTION="Displays an iframe to wrap an external page or site into Joomla!"
diff --git a/core/administrator/language/en-GB/en-GB.com_wrapper.sys.ini b/core/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
new file mode 100644
index 00000000..e1ef05b7
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WRAPPER="Wrapper"
+COM_WRAPPER_XML_DESCRIPTION="Displays an iframe to wrap an external page or site into Joomla!"
+COM_WRAPPER_WRAPPER_VIEW_DEFAULT_DESC="Displays a URL in an iframe."
+COM_WRAPPER_WRAPPER_VIEW_DEFAULT_OPTION="Default"
+COM_WRAPPER_WRAPPER_VIEW_DEFAULT_TITLE="Iframe Wrapper"
diff --git a/core/administrator/language/en-GB/en-GB.ini b/core/administrator/language/en-GB/en-GB.ini
new file mode 100644
index 00000000..2942c6c2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.ini
@@ -0,0 +1,1064 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+; Common boolean values
+; Note: YES, NO, TRUE, FALSE are reserved words in INI format.
+
+; Keep this string on top
+JERROR_PARSING_LANGUAGE_FILE="&#160;: error(s) in line(s) %s"
+
+J1="1"
+J2="2"
+J3="3"
+J4="4"
+J5="5"
+J6="6"
+J7="7"
+J8="8"
+J9="9"
+J10="10"
+J15="15"
+J20="20"
+J25="25"
+J30="30"
+J50="50"
+J75="75"
+J100="100"
+J150="150"
+J200="200"
+J250="250"
+J300="300"
+J500="500"
+
+JH1="h1"
+JH2="h2"
+JH3="h3"
+JH4="h4"
+JH5="h5"
+JH6="h6"
+
+ERROR="Error"
+MESSAGE="Message"
+NOTICE="Notice"
+WARNING="Warning"
+
+JADMINISTRATION="Administration"
+JADMINISTRATOR="Administrator"
+JALL="All"
+JALL_LANGUAGE="All"
+JAPPLY="Save"
+JARCHIVED="Archived"
+JAUTHOR="Author"
+JAUTHOR_ASC="Author ascending"
+JAUTHOR_DESC="Author descending"
+JASSOCIATIONS_ASC="Associations ascending"
+JASSOCIATIONS_DESC="Associations descending"
+JCANCEL="Cancel"
+JCATEGORIES="Categories"
+JCATEGORY="Category"
+JCATEGORY_ASC="Category ascending"
+JCATEGORY_DESC="Category descending"
+JCATEGORY_SPRINTF="Category: %s"
+JCLEAR="Clear"
+JCLIENT="Location"
+JCONFIG_PERMISSIONS_DESC="Default permissions used for all content in this component."
+JCONFIG_PERMISSIONS_LABEL="Permissions"
+JCURRENT="Current"
+JDATE="Date"
+JDATE_ASC="Date ascending"
+JDATE_DESC="Date descending"
+JDAY="Day"
+JDEFAULT="Default"
+JDEFAULTLANGUAGE="Language - Default"
+JDETAILS="Details"
+JDISABLED="Disabled"
+JENABLED="Enabled"
+JFALSE="False"
+JFEATURED="Featured"
+JFEATURED_ASC="Featured ascending"
+JFEATURED_DESC="Featured descending"
+JUNFEATURED="Unfeatured"
+JFEATURE="Feature"
+JUNFEATURE="Unfeature"
+JHELP="Help"
+JHIDE="Hide"
+JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JLOGIN="Log in"
+JLOGOUT="Log out"
+JMONTH="Month"
+JMENU_MULTILANG_WARNING_MISSING_MODULES="An administrator menu module for <strong>%s</strong> does not exist. <br>Create a custom administrator menu and module for each administrator language or publish a menu module set to All languages."
+JMODIFY="Modify"
+JNEVER="Never"
+JNEXT="Next"
+JNEXT_TITLE="Next article: %s"
+JNO="No"
+JNONE="None"
+JOFF="Off"
+JON="On"
+JONLY="Only"
+JOPTIONS="Options"
+JPREV="Prev"
+JPREVIOUS="Previous"
+JPREVIOUS_TITLE="Previous article: %s"
+JPROTECTED="Protected"
+JPUBLISHED="Published"
+JRECORD_NUMBER="Record Number"
+JREGISTER="Register"
+JORDERINGDISABLED="Please sort by order to enable reordering"
+
+JSAVE="Save &amp; Close"
+JSELECT="Select"
+JSTATUS="Status"
+JSTATUS_ASC="Status ascending"
+JSTATUS_DESC="Status descending"
+JSHOW="Show"
+JSITE="Site"
+JSUBMIT="Submit"
+JTAG="Tags"
+JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
+JTAG_FIELD_SELECT_DESC="Select the tag to use."
+JTOOLBAR="Toolbar"
+JTRASH="Trash"
+JTRASHED="Trashed"
+JTRUE="True"
+JUNARCHIVE="Remove from archive status"
+JUNDEFINED="Undefined"
+JUNPROTECTED="Unprotected"
+JUNPUBLISHED="Unpublished"
+JYEAR="Year"
+JVERSION="Version"
+JYES="Yes"
+JACTIONS="Actions for: %s"
+
+JACTION_ADMIN="Configure ACL & Options"
+JACTION_ADMIN_COMPONENT_DESC="Allows users in the group to edit the options and permissions of this extension."
+JACTION_ADMIN_GLOBAL="Super User"
+JACTION_ADMIN_GLOBAL_DESC="Allows users in the group to perform any action regardless of the settings."
+JACTION_COMPONENT_SETTINGS="Component Settings"
+JACTION_CREATE="Create"
+JACTION_CREATE_COMPONENT_DESC="Allows users in the group to create any content in this extension."
+JACTION_DELETE="Delete"
+JACTION_DELETE_COMPONENT_DESC="Allows users in the group to delete any content in this extension."
+JACTION_EDIT="Edit"
+JACTION_EDIT_COMPONENT_DESC="Allows users in the group to edit any content in this extension."
+JACTION_EDITOWN="Edit Own"
+JACTION_EDITOWN_COMPONENT_DESC="Allows users in the group to edit any content they submitted in this extension."
+JACTION_EDITVALUE="Edit Custom Field Value"
+JACTION_EDITVALUE_COMPONENT_DESC="Allows users in the group to edit any value of custom fields submitted in this extension."
+JACTION_EDITSTATE="Edit State"
+JACTION_EDITSTATE_COMPONENT_DESC="Allows users in the group to change the state of any content in this extension."
+JACTION_LOGIN_ADMIN="Administrator Login"
+JACTION_LOGIN_OFFLINE="Offline Access"
+JACTION_LOGIN_SITE="Site Login"
+JACTION_MANAGE="Access Administration Interface"
+JACTION_MANAGE_COMPONENT_DESC="Allows users in the group to access the administration interface for this extension."
+JACTION_OPTIONS="Configure Options Only"
+JACTION_OPTIONS_COMPONENT_DESC="Allows users in the group to edit the options except the permissions of this extension."
+
+JBROWSERTARGET_MODAL="Modal"
+JBROWSERTARGET_NEW="Open in new window"
+JBROWSERTARGET_PARENT="Open in parent window"
+JBROWSERTARGET_POPUP="Open in popup"
+
+JERROR_ALERTNOAUTHOR="You are not authorised to view this resource."
+JERROR_ALERTNOTEMPLATE="The template for this display is not available."
+JERROR_AN_ERROR_HAS_OCCURRED="An error has occurred."
+JERROR_CORE_CREATE_NOT_PERMITTED="Create not permitted."
+JERROR_CORE_DELETE_NOT_PERMITTED="Delete not permitted."
+JERROR_COULD_NOT_FIND_TEMPLATE="Could not find template "_QQ_"%s"_QQ_"."
+JERROR_INVALID_CONTROLLER="Invalid controller"
+JERROR_INVALID_CONTROLLER_CLASS="Invalid controller class"
+JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
+JERROR_LOADFILE_FAILED="Error loading form file"
+JERROR_LOADING_MENUS="Error loading Menus: %s"
+JERROR_LOGIN_DENIED="You do not have access to the Administrator section of this site."
+JERROR_MAGIC_QUOTES="Your host needs to disable magic_quotes_gpc to run this version of Joomla!"
+JERROR_NO_ITEMS_SELECTED="No item(s) selected."
+JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet."
+JERROR_SENDING_EMAIL="Email could not be sent."
+JERROR_SESSION_STARTUP="Error starting the session."
+JERROR_SAVE_FAILED="Could not save data. Error: %s"
+
+JFIELD_ACCESS_DESC="The access level group that is allowed to view this item."
+JFIELD_ACCESS_LABEL="Access"
+JFIELD_ALIAS_DESC="The Alias will be used in the SEF URL. Leave this blank and Joomla will fill in a default value from the title. This value will depend on the SEO settings (Global Configuration->Site). <br />Using Unicode will produce UTF-8 aliases. You may also enter manually any UTF-8 character. Spaces and some forbidden characters will be changed to hyphens.<br />When using default transliteration it will produce an alias in lower case and with dashes instead of spaces. You may enter the Alias manually. Use lowercase letters and hyphens (-). No spaces or underscores are allowed. Default value will be a date and time if the title is typed in non-latin letters."
+JFIELD_ALIAS_LABEL="Alias"
+JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title"
+JFIELD_ALT_COMPONENT_LAYOUT_DESC="Use a layout from the supplied component view or overrides in the templates."
+JFIELD_ALT_LAYOUT_LABEL="Layout"
+JFIELD_ALT_MODULE_LAYOUT_DESC="Use a layout from the supplied module or overrides in the templates."
+JFIELD_ALT_PAGE_TITLE_DESC="An optional alternative page title to set that will change the TITLE tag in the HTML output."
+JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title"
+JFIELD_ASSET_ID_DESC="Asset ID"
+JFIELD_ASSET_ID_LABEL="Asset ID"
+JFIELD_BASIS_LOGIN_DESCRIPTION_DESC="Text to display on login page."
+JFIELD_BASIS_LOGIN_DESCRIPTION_LABEL="Login Description Text"
+JFIELD_BASIS_LOGIN_DESCRIPTION_SHOW_DESC="Show or hide login description."
+JFIELD_BASIS_LOGIN_DESCRIPTION_SHOW_LABEL="Login Description"
+JFIELD_BASIS_LOGOUT_DESCRIPTION_DESC="Text for logout page."
+JFIELD_BASIS_LOGOUT_DESCRIPTION_LABEL="Logout Description Text"
+JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_DESC="Show or hide logout description."
+JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_LABEL="Logout Description"
+JFIELD_CATEGORY_DESC="The category that this item is assigned to. You may select an existing category or enter a new category by typing the name in the field and pressing enter."
+JFIELD_DISPLAY_READONLY_DESC="Whether to display the field on forms when read-only. Inherit defaults to value set in field group."
+JFIELD_DISPLAY_READONLY_LABEL="Display When Read-Only"
+JFIELD_ENABLED_DESC="The enabled status of this item."
+JFIELD_FIELDS_CATEGORY_DESC="Select the category that this field is assigned to."
+JFIELD_KEY_REFERENCE_DESC="Used to store information referring to an external resource."
+JFIELD_KEY_REFERENCE_LABEL="Key Reference"
+JFIELD_LANGUAGE_DESC="Assign a language to this article."
+JFIELD_LANGUAGE_LABEL="Language"
+JFIELD_LOGIN_IMAGE_DESC="Select or upload an image to display on login page."
+JFIELD_LOGIN_IMAGE_LABEL="Login Image"
+JFIELD_LOGIN_REDIRECT_URL_DESC="If a URL is entered here, users will be redirected to it after login.<br />The URL must be internal (eg: index.php?Itemid=999)."
+JFIELD_LOGIN_REDIRECT_URL_LABEL="Login Redirect"
+JFIELD_LOGOUT_IMAGE_DESC="Select or upload an image to display on logout page."
+JFIELD_LOGOUT_IMAGE_LABEL="Logout Image"
+JFIELD_LOGOUT_REDIRECT_URL_DESC="If a URL is entered here, users will be redirected to it after logout.<br />The URL must be internal (eg: index.php?Itemid=999)."
+JFIELD_LOGOUT_REDIRECT_URL_LABEL="Logout Redirect"
+JFIELD_LOGOUT_REDIRECT_PAGE_DESC="Select or create the page the user will be redirected to after ending their current session by logging out. The default is to stay on the same page."
+JFIELD_LOGOUT_REDIRECT_PAGE_LABEL="Logout Redirection Page"
+JFIELD_META_DESCRIPTION_DESC="An optional paragraph to be used as the description of the page in the HTML output. This will generally display in the results of search engines."
+JFIELD_META_DESCRIPTION_LABEL="Meta Description"
+JFIELD_META_KEYWORDS_DESC="An optional comma-separated list of keywords and/or phrases to be used in the HTML output."
+JFIELD_META_KEYWORDS_LABEL="Meta Keywords"
+JFIELD_META_RIGHTS_DESC="Describe what rights others have to use this content."
+JFIELD_META_RIGHTS_LABEL="Content Rights"
+JFIELD_METADATA_AUTHOR_DESC="The author of this content."
+JFIELD_METADATA_RIGHTS_DESC="Publication rights for the content."
+JFIELD_METADATA_RIGHTS_LABEL="Rights"
+JFIELD_METADATA_ROBOTS_DESC="Robots instructions."
+JFIELD_METADATA_ROBOTS_LABEL="Robots"
+JFIELD_METADATA_XREFERENCE_DESC="An optional reference used to link to external data sources."
+JFIELD_METADATA_XREFERENCE_LABEL="Cross Reference"
+JFIELD_MODULE_LANGUAGE_DESC="Assign a language to this module."
+JFIELD_NAME_DESC="The name will be used to identify the field. Leave this blank and Joomla will fill in a default value from the title."
+JFIELD_NAME_LABEL="Name"
+JFIELD_NAME_PLACEHOLDER="Auto-generate from title"
+JFIELD_NOTE_DESC="Note"
+JFIELD_NOTE_LABEL="Note"
+JFIELD_OPTION_NONE="None"
+JFIELD_ORDERING_DESC="Select the ordering."
+JFIELD_ORDERING_LABEL="Ordering"
+JFIELD_PARAMS_LABEL="Options"
+JFIELD_PLG_SEARCH_ALL_DESC="Include published items in the search."
+JFIELD_PLG_SEARCH_ALL_LABEL="Search Published"
+JFIELD_PLG_SEARCH_ARCHIVED_DESC="Include archived items in the search."
+JFIELD_PLG_SEARCH_ARCHIVED_LABEL="Search Archived"
+JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC="Sets the maximum number of results to return."
+JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL="Search Limit"
+JFIELD_PUBLISHED_DESC="Set publication status."
+JFIELD_READMORE_DESC="Add a custom text instead of Read More."
+JFIELD_READMORE_LABEL="Read More Text"
+JFIELD_SPACER_LABEL="<span style="_QQ_"width:auto"_QQ_"><hr /></span>"
+JFIELD_TITLE_DESC="Title"
+JFIELD_VERSION_HISTORY_DESC="This button allows you to open a window to view older versions of this item."
+JFIELD_VERSION_HISTORY_LABEL="Prior Versions"
+JFIELD_VERSION_HISTORY_SELECT="View Prior Versions"
+JFIELD_XREFERENCE_DESC="An optional field to allow this record to be cross-referenced to an external data system if required."
+JFIELD_XREFERENCE_LABEL="External Reference"
+JGLOBAL_ACROSS="Across"
+JGLOBAL_ACTION_PERMISSIONS_LABEL="Permissions"
+JGLOBAL_ACTION_PERMISSIONS_DESCRIPTION="Set the action permissions for this asset"
+JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category"
+JGLOBAL_ALL_ARTICLE="Max Levels Articles"
+JGLOBAL_ALL_LIST="Max Levels as List"
+JGLOBAL_ALLOW_COMMENTS_DESC="If Yes, viewers will be able to add and view comments for the article."
+JGLOBAL_ALLOW_COMMENTS_LABEL="Allow Comments"
+JGLOBAL_ALLOW_RATINGS_DESC="If Yes, viewers will be able to add and view ratings for the article."
+JGLOBAL_ALLOW_RATINGS_LABEL="Allow Ratings"
+JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_DESC="Please enter in a numeric character limit value. The introtext will be trimmed to the number of characters you enter."
+JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_LABEL="Intro text Limit"
+JGLOBAL_ARCHIVE_OPTIONS="Archive"
+JGLOBAL_ARTICLE_COUNT_DESC="Show or hide a count of articles in each category."
+JGLOBAL_ARTICLE_COUNT_LABEL="Article Count"
+JGLOBAL_ARTICLE_MANAGER_ORDER="Ordering"
+JGLOBAL_ARTICLE_MANAGER_REVERSE_ORDER="Ordering Reverse"
+JGLOBAL_ARTICLE_ORDER_DESC="The order that articles will show in."
+JGLOBAL_ARTICLE_ORDER_LABEL="Article Order"
+JGLOBAL_ARTICLES="Articles"
+JGLOBAL_ASSOC_NOT_POSSIBLE="To define associations, please make sure the item language is not set to 'All'."
+JGLOBAL_ASSOCIATIONS_RESET_WARNING="The language has been changed. If you save this item again it will reset the available associations. If this was not intended, close the item."
+JGLOBAL_AUTH_ACCESS_DENIED="Access Denied"
+JGLOBAL_AUTH_ACCESS_GRANTED="Access Granted"
+JGLOBAL_AUTH_BIND_FAILED="Failed binding to LDAP server"
+JGLOBAL_AUTH_CANCEL="Authentication cancelled"
+JGLOBAL_AUTH_CURL_NOT_INSTALLED="Curl isn't installed"
+JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED="Empty password not allowed."
+JGLOBAL_AUTH_FAIL="Authentication failed"
+JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
+JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
+JGLOBAL_AUTH_INVALID_PASS="Username and password do not match or you do not have an account yet."
+JGLOBAL_AUTH_INVALID_SECRETKEY="The two factor authentication Secret Key is invalid."
+; The following 2 strings are deprecated and will be removed with 4.0.
+JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
+JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
+JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
+JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
+JGLOBAL_AUTH_NOT_CONNECT="Unable to connect to authentication service."
+JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore folder %s. Please check the effective permissions."
+JGLOBAL_AUTH_PASS_BLANK="LDAP can't have blank password"
+JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
+JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted."
+JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user."
+JGLOBAL_AUTHOR_ALPHABETICAL="Author Alphabetical"
+JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL="Author Reverse Alphabetical"
+JGLOBAL_AUTO="Auto"
+JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND="Can't find the destination parent for this move."
+JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND="Can't find the destination row for this move."
+JGLOBAL_BATCH_PROCESS="Process"
+JGLOBAL_BLOG="Blog"
+JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout"
+JGLOBAL_CATEGORIES_OPTIONS="Categories"
+JGLOBAL_CATEGORY_LAYOUT_DESC="Layout"
+JGLOBAL_CATEGORY_LAYOUT_LABEL="Choose a Layout"
+JGLOBAL_CATEGORY_MANAGER_ORDER="Category Order"
+JGLOBAL_CATEGORY_NOT_FOUND="Category not found"
+JGLOBAL_CATEGORY_OPTIONS="Category"
+JGLOBAL_CATEGORY_ORDER_DESC="The order that categories will show in."
+JGLOBAL_CATEGORY_ORDER_LABEL="Category Order"
+JGLOBAL_CENTER="Center"
+JGLOBAL_CHECK_ALL="Check All Items"
+JGLOBAL_CHOOSE_CATEGORY_DESC="Select or create a category to be displayed."
+JGLOBAL_CHOOSE_CATEGORY_LABEL="Choose a Category"
+JGLOBAL_CHOOSE_COMPONENT_DESC="Choose a component from the list."
+JGLOBAL_CHOOSE_COMPONENT_LABEL="Choose a component"
+JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Select to sort by this column"
+JGLOBAL_CLICK_TO_TOGGLE_STATE="Select icon to toggle state."
+JGLOBAL_CONFIRM_DELETE="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!"
+JGLOBAL_COPY="(copy)"
+JGLOBAL_CREATED="Created"
+JGLOBAL_CREATED_DATE="Created Date"
+JGLOBAL_CUSTOM_CATEGORY="New Categories"
+JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC="Enable the creation of custom fields."
+JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL="Enable Custom Fields"
+JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. For example, D M Y for day month year or you can use d-m-y for a short version eg. 28-12-16. See http://www.php.net/manual/en/function.date.php. If left blank, it uses DATE_FORMAT_LC1 from your language file."
+JGLOBAL_DATE_FORMAT_LABEL="Date Format"
+JGLOBAL_DESCRIPTION="Description"
+JGLOBAL_DISPLAY_NUM="Display #"
+JGLOBAL_DISPLAY_SELECT_DESC="Show or hide the Display Select dropdown listbox."
+JGLOBAL_DISPLAY_SELECT_LABEL="Display Select"
+JGLOBAL_DOWN="Down"
+JGLOBAL_EDIT_ITEM="Edit item"
+JGLOBAL_EDIT_PREFERENCES="Edit Preferences"
+JGLOBAL_EMAIL="Email"
+JGLOBAL_EMPTY_CATEGORIES_DESC="Show or hide categories that have no articles and no subcategories."
+JGLOBAL_EMPTY_CATEGORIES_LABEL="Empty Categories"
+JGLOBAL_ERROR_INSUFFICIENT_BATCH_INFORMATION="Insufficient information to perform the batch operation"
+JGLOBAL_FEED_SHOW_READMORE_DESC="Displays a &quot;Read More&quot; link in the news feeds if Intro Text is set to Show."
+JGLOBAL_FEED_SHOW_READMORE_LABEL="Show &quot;Read More&quot;"
+JGLOBAL_FEED_SUMMARY_DESC="If set to Intro Text, only the Intro Text of each article will show in the news feed. If set to Full Text, the whole article will show in the news feed."
+JGLOBAL_FEED_SUMMARY_LABEL="Include in Feed"
+JGLOBAL_FIELDS="Fields"
+JGLOBAL_FIELD_ADD="Add"
+JGLOBAL_FIELD_GROUPS="Field Groups"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed."
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category"
+JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will replace the Top Level Category Description, if it has one."
+JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Alternative Description"
+JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display."
+JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
+JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this."
+JGLOBAL_FIELD_CREATED_BY_LABEL="Created By"
+JGLOBAL_FIELD_CREATED_DESC="Created Date."
+JGLOBAL_FIELD_CREATED_LABEL="Created Date"
+JGLOBAL_FIELD_FIELD_CACHETIME_DESC="The number of minutes before the cache is refreshed."
+JGLOBAL_FIELD_FIELD_ORDERING_LABEL="Order"
+JGLOBAL_FIELD_FIELD_ORDERING_DESC="Order items will be displayed in."
+JGLOBAL_FIELD_ID_DESC="Record number in the database."
+JGLOBAL_FIELD_ID_LABEL="ID"
+JGLOBAL_FIELD_LAYOUT_DESC="Default layout to use for items."
+JGLOBAL_FIELD_LAYOUT_LABEL="Choose a Layout"
+JGLOBAL_FIELD_MODIFIED_LABEL="Modified Date"
+JGLOBAL_FIELD_MODIFIED_BY_DESC="The user who did the last modification."
+JGLOBAL_FIELD_MODIFIED_BY_LABEL="Modified By"
+JGLOBAL_FIELD_MOVE="Move"
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level."
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of Categories"
+JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to stop publishing."
+JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to start publishing."
+JGLOBAL_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+JGLOBAL_FIELD_REMOVE="Remove"
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or alternatively replace with the text from the description field found in the menu item. If using Root as a top level category, the description field has to be filled."
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Top Level Category Description"
+JGLOBAL_FIELD_VERSION_NOTE_DESC="Enter an optional note for this version of the item."
+JGLOBAL_FIELD_VERSION_NOTE_LABEL="Version Note"
+JGLOBAL_FIELDSET_ASSOCIATIONS="Associations"
+JGLOBAL_FIELDSET_DISPLAY_OPTIONS="Display"
+JGLOBAL_FIELDSET_IMAGE_OPTIONS="Images"
+JGLOBAL_FIELDSET_INTEGRATION="Integration"
+JGLOBAL_FIELDSET_METADATA_OPTIONS="Metadata"
+JGLOBAL_FIELDSET_OPTIONS="Options"
+JGLOBAL_FIELDSET_CONTENT="Content"
+JGLOBAL_FIELDSET_PUBLISHING="Publishing"
+JGLOBAL_FIELDSET_DESCRIPTION="Description"
+JGLOBAL_FIELDSET_ADVANCED="Advanced"
+JGLOBAL_FIELDSET_BASIC="Options"
+JGLOBAL_FILTER_ATTRIBUTES_DESC="3. List additional attributes, separating each attribute name with a space or comma. For example: <i>class,title,id</i>."
+JGLOBAL_FILTER_ATTRIBUTES_LABEL="Filter Attributes<sup>3</sup>"
+JGLOBAL_FILTER_CLIENT="- Select Location -"
+JGLOBAL_FILTER_FIELD_DESC="Show or hide a filter field for the list."
+JGLOBAL_FILTER_FIELD_LABEL="Filter Field"
+JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters applied to. Other groups will have no filtering performed."
+JGLOBAL_FILTER_GROUPS_LABEL="Filter Groups"
+JGLOBAL_FILTER_TAGS_DESC="2. List additional tags, separating each tag name with a space or comma. For example: <i>p,div,span</i>."
+JGLOBAL_FILTER_TAGS_LABEL="Filter Tags<sup>2</sup>"
+JGLOBAL_FILTER_TYPE_DESC="1. Blacklist allows all tags and attributes except for those in the blacklist.<br /><strong>--</strong> Tags for the Default Blacklist include: 'applet', 'body', 'bgsound', 'base', 'basefont', 'canvas', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml'<br /><strong>--</strong> Attributes for the Default Blacklist include: 'action', 'background', 'codebase', 'dynsrc', 'lowsrc', 'formaction'<br /><strong>--</strong> You can blacklist additional tags and attributes by adding to the Filter Tags and Filter Attributes fields, separating each tag or attribute name with a comma.<br /><strong>--</strong> Custom Blacklist allows you to override the Default Blacklist. Add the tags and attributes to be blacklisted in the Filter Tags and Filter Attributes fields.</p><p>Whitelist allows only the tags listed in the Filter Tags and Filter Attributes fields.</p><p>No HTML removes all HTML tags from the content when it is saved.</p><p>Please note that these settings work regardless of the editor that you are using. <br />Even if you are using a WYSIWYG editor, the filtering settings may strip additional tags and attributes prior to saving information in the database."
+JGLOBAL_FILTER_TYPE_LABEL="Filter Type<sup>1</sup>"
+JGLOBAL_FULL_TEXT="Full Text"
+JGLOBAL_GT="&gt;"
+JGLOBAL_HELPREFRESH_BUTTON="Refresh"
+JGLOBAL_HISTORY_LIMIT_OPTIONS_DESC="The maximum number of old versions of an item to save. If zero, all old versions will be saved."
+JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL="Maximum Versions"
+JGLOBAL_HITS="Hits"
+JGLOBAL_HITS_ASC="Hits ascending"
+JGLOBAL_HITS_DESC="Hits descending"
+JGLOBAL_INDEX_FOLLOW="Index, Follow"
+JGLOBAL_INDEX_NOFOLLOW="Index, No follow"
+JGLOBAL_INHERIT="Inherit"
+JGLOBAL_INTEGRATION_LABEL="Integration"
+JGLOBAL_INTRO_TEXT="Intro Text"
+JGLOBAL_ISFREESOFTWARE="%s is free software released under the <a href="_QQ_"https://www.gnu.org/licenses/gpl-2.0.html"_QQ_" target="_QQ_"_blank"_QQ_">GNU General Public License</a>."
+JGLOBAL_KEEP_TYPING="Keep typing ..."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing and will be displayed in English."
+JGLOBAL_LEAST_HITS="Least Hits"
+JGLOBAL_LEFT="Left"
+JGLOBAL_LINK_AUTHOR_DESC="If set to Yes, the Name of the article's Author will be linked to its contact page. You must create a contact linked to the author's user record, <strong>and the &quot;Content - Contact&quot; plugin must be enabled</strong>, for this to be in effect."
+JGLOBAL_LINK_AUTHOR_LABEL="Link Author"
+JGLOBAL_LINK_CATEGORY_DESC="If set to Yes, and if Show Category is set to 'Show', the Category Title will link to a layout showing articles in that Category."
+JGLOBAL_LINK_CATEGORY_LABEL="Link Category"
+JGLOBAL_LINK_PARENT_CATEGORY_DESC="If set to Yes, and if Show Parent is set to 'Show', the Parent Category Title will link to a layout showing articles in that Category."
+JGLOBAL_LINK_PARENT_CATEGORY_LABEL="Link Parent"
+JGLOBAL_LINKED_TITLES_DESC="If set to Yes, the article title will be a link to the article."
+JGLOBAL_LINKED_TITLES_LABEL="Linked Titles"
+JGLOBAL_LIST="List"
+JGLOBAL_LIST_ALIAS="(<span>Alias</span>: %s)"
+JGLOBAL_LIST_ALIAS_NOTE="(<span>Alias</span>: %s, <span>Note</span>: %s)"
+JGLOBAL_LIST_AUTHOR_DESC="Show or hide the article author in the list of articles."
+JGLOBAL_LIST_AUTHOR_LABEL="Show Author in List"
+JGLOBAL_LIST_HITS_DESC="Show or hide article hits in the list of articles."
+JGLOBAL_LIST_HITS_LABEL="Show Hits in List"
+JGLOBAL_LIST_LAYOUT_OPTIONS="List Layouts"
+JGLOBAL_LIST_NAME="(<span>Name</span>: %s)"
+JGLOBAL_LIST_NAME_NOTE="(<span>Name</span>: %s, <span>Note</span>: %s)"
+JGLOBAL_LIST_NOTE="(<span>Note</span>: %s)"
+JGLOBAL_LIST_RATINGS_DESC="Whether to show article ratings in the list of articles."
+JGLOBAL_LIST_RATINGS_LABEL="Show Ratings in List"
+JGLOBAL_LIST_TITLE_DESC="If Show, Category Title will show in the list of categories."
+JGLOBAL_LIST_TITLE_LABEL="Category Title"
+JGLOBAL_LIST_VOTES_DESC="Whether to show article votes in the list of articles."
+JGLOBAL_LIST_VOTES_LABEL="Show Votes in List"
+JGLOBAL_LOOKING_FOR="Looking for"
+JGLOBAL_LT="&lt;"
+JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC="The number of subcategory levels to display."
+JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL="Subcategory Levels"
+JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: <strong>%s</strong>"
+JGLOBAL_MAXLEVEL_DESC="Maximum number of levels of subcategories to show."
+JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels"
+JGLOBAL_MENU_SELECTION="Menu Selection:"
+JGLOBAL_MODIFIED="Modified"
+JGLOBAL_MODIFIED_DATE="Modified Date"
+JGLOBAL_MOST_HITS="Most Hits"
+JGLOBAL_MOST_RECENT_FIRST="Most Recent First"
+JGLOBAL_MULTI_COLUMN_ORDER_DESC="Order articles down or across columns."
+JGLOBAL_MULTI_COLUMN_ORDER_LABEL="Multi Column Order"
+JGLOBAL_MULTI_LEVEL="Multi Level"
+JGLOBAL_NEWITEMSFIRST_DESC="New items default to the first position. The ordering can be changed after this item is saved."
+JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. The ordering can be changed after this item is saved."
+JGLOBAL_NO_ITEM_SELECTED="No items selected"
+JGLOBAL_NO_ORDER="No Order"
+JGLOBAL_NOINDEX_FOLLOW="No index, follow"
+JGLOBAL_NOINDEX_NOFOLLOW="No index, no follow"
+JGLOBAL_NUM_COLUMNS_DESC="The number of columns in which to show Intro Articles. Normally 1, 2, or 3."
+JGLOBAL_NUM_COLUMNS_LABEL="# Columns"
+JGLOBAL_NUM_INTRO_ARTICLES_DESC="Number of articles to show after the leading article. Articles will be shown in columns."
+JGLOBAL_NUM_INTRO_ARTICLES_LABEL="# Intro Articles"
+JGLOBAL_NUM_LEADING_ARTICLES_DESC="Number of leading articles to display as full-width at the beginning of the page."
+JGLOBAL_NUM_LEADING_ARTICLES_LABEL="# Leading Articles"
+JGLOBAL_NUM_LINKS_DESC="Number of articles to display as links, normally below the Intro Articles."
+JGLOBAL_NUM_LINKS_LABEL="# Links"
+JGLOBAL_NUMBER_CATEGORY_ITEMS_DESC="If Show, the number of articles in the category will show."
+JGLOBAL_NUMBER_CATEGORY_ITEMS_LABEL="Show Article Count"
+JGLOBAL_NUMBER_ITEMS_LIST_DESC="Default number of articles to list on a page."
+JGLOBAL_NUMBER_ITEMS_LIST_LABEL="# Articles to List"
+JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
+JGLOBAL_OLDEST_FIRST="Oldest First"
+JGLOBAL_ORDER_ASCENDING="Ascending"
+JGLOBAL_ORDER_DESCENDING="Descending"
+JGLOBAL_ORDER_DIRECTION_LABEL="Direction"
+JGLOBAL_ORDER_DIRECTION_DESC="Sort order. Descending is highest to lowest. Ascending is lowest to highest."
+JGLOBAL_ORDERING="Article Order"
+JGLOBAL_ORDERING_DATE_DESC="If articles are ordered by date, which date to use."
+JGLOBAL_ORDERING_DATE_LABEL="Date for Ordering"
+JGLOBAL_OTPMETHOD_NONE="Disable Two Factor Authentication"
+JGLOBAL_PAGINATION_DESC="Show or hide Pagination support. Pagination provides page links at the bottom of the page that allow the User to navigate to additional pages. These are needed if the Information will not fit on one page."
+JGLOBAL_PAGINATION_LABEL="Pagination"
+JGLOBAL_PAGINATION_RESULTS_DESC="Show or hide pagination results information, for example, &quot;Page 1 of 4&quot;."
+JGLOBAL_PAGINATION_RESULTS_LABEL="Pagination Results"
+JGLOBAL_PASSWORD="Password"
+JGLOBAL_PASSWORD_RESET_REQUIRED="You are required to reset your password before proceeding."
+JGLOBAL_PERMISSIONS_ANCHOR="Set Permissions"
+JGLOBAL_PREVIEW="Preview"
+JGLOBAL_PUBLISHED_DATE="Published Date"
+JGLOBAL_RANDOM_ORDER="Random Order"
+JGLOBAL_RATINGS="Ratings"
+JGLOBAL_RATINGS_ASC="Ratings ascending"
+JGLOBAL_RATINGS_DESC="Ratings descending"
+JGLOBAL_RECORD_NUMBER="Record ID: %d"
+JGLOBAL_REMEMBER_ME="Remember Me"
+JGLOBAL_REVERSE_ORDERING="Article Reverse Order"
+JGLOBAL_RIGHT="Right"
+JGLOBAL_ROOT="Root"
+JGLOBAL_ROOT_PARENT="- No parent -"
+JGLOBAL_SAVE_HISTORY_OPTIONS_DESC="Automatically save old versions of an item. If set to Yes, old versions of items are saved automatically. When editing, you may restore from a previous version of the item."
+JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL="Enable Versions"
+JGLOBAL_SECRETKEY="Secret Key"
+JGLOBAL_SECRETKEY_HELP="If you have enabled two factor authentication in your user account please enter your secret key. If you do not know what this means, you can leave this field blank."
+; The following 4 strings are deprecated and will be removed with 4.0.
+JGLOBAL_SEF_ADVANCED_DESC="Modern routing enables advanced features but may change your URLs. Legacy routing ensures full compatibility for existing sites. This is configured per component."
+JGLOBAL_SEF_ADVANCED_LABEL="URL Routing"
+JGLOBAL_SEF_ADVANCED_LEGACY="Legacy"
+JGLOBAL_SEF_ADVANCED_MODERN="Modern"
+JGLOBAL_SEF_NOIDS_DESC="Remove the IDs from the URLs of this component."
+JGLOBAL_SEF_NOIDS_LABEL="Remove IDs from URLs"
+JGLOBAL_SELECT_ALLOW_DENY_GROUP="Change %s permission for %s group."
+JGLOBAL_SELECT_AN_OPTION="Select an option"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"
+JGLOBAL_SELECT_SOME_OPTIONS="Select some options"
+JGLOBAL_SELECTION_ALL="Select All"
+JGLOBAL_SELECTION_INVERT="Toggle Selection"
+JGLOBAL_SELECTION_INVERT_ALL="Toggle All Selections"
+JGLOBAL_SELECTION_NONE="Clear Selection"
+JGLOBAL_SHOW_ASSOCIATIONS_DESC="Multilingual only. If set to Show, the associated articles flags or URL Language Code will be displayed."
+JGLOBAL_SHOW_ASSOCIATIONS_LABEL="Show Associations"
+JGLOBAL_SHOW_AUTHOR_DESC="If set to Show, the Name of the article's Author will be displayed."
+JGLOBAL_SHOW_AUTHOR_LABEL="Show Author"
+JGLOBAL_SHOW_CATEGORY_DESC="If set to Show, the title of the article&rsquo;s category will show."
+JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC="Show or hide the description of the selected Category."
+JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL="Category Description"
+JGLOBAL_SHOW_CATEGORY_IMAGE_DESC="Show or hide the image of the selected Category."
+JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL="Category Image"
+JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL="Show Subcategories Text"
+JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC="If Show, the &quot;Subcategories&quot; will show as a subheading on the page. The subheading is usually displayed inside the &quot;H3&quot; tag."
+JGLOBAL_SHOW_CATEGORY_LABEL="Show Category"
+JGLOBAL_SHOW_CATEGORY_TITLE="Category Title"
+JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the &quot;H2&quot; tag."
+JGLOBAL_SHOW_CREATE_DATE_DESC="If set to Show, the date and time an Article was created will be displayed. This is a global setting but can be changed at Menu and Article levels."
+JGLOBAL_SHOW_CREATE_DATE_LABEL="Show Create Date"
+JGLOBAL_SHOW_DATE_DESC="Show or hide a date column in the list of articles, or select which date you wish to show."
+JGLOBAL_SHOW_DATE_LABEL="Show Date"
+JGLOBAL_SHOW_EMAIL_ICON_DESC="Show or hide the email link. This allows you to email an article."
+JGLOBAL_SHOW_EMAIL_ICON_LABEL="Show Email"
+JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty if it has no items or subcategories."
+JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories"
+JGLOBAL_SHOW_FEATURED_ARTICLES_DESC="Select to show, hide or only display featured articles."
+JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL="Featured Articles"
+JGLOBAL_SHOW_FEED_LINK_DESC="Show or hide an RSS Feed Link. (A Feed Link will show up as a feed icon in the address bar of most modern browsers)."
+JGLOBAL_SHOW_FEED_LINK_LABEL="Show Feed Link"
+JGLOBAL_SHOW_FLAG_DESC="If set to 'Yes', will display language choice as image flags. Otherwise will use the content language URL Language Code."
+JGLOBAL_SHOW_FLAG_LABEL="Use Image Flags"
+JGLOBAL_SHOW_FULL_DESCRIPTION="Show full description ..."
+JGLOBAL_SHOW_HEADINGS_DESC="Show or hide the headings in list layouts."
+JGLOBAL_SHOW_HEADINGS_LABEL="Table Headings"
+JGLOBAL_SHOW_HITS_DESC="If set to Show, the number of Hits on a particular Article will be displayed."
+JGLOBAL_SHOW_HITS_LABEL="Show Hits"
+JGLOBAL_SHOW_ICONS_DESC="Print and email will utilise icons or text."
+JGLOBAL_SHOW_ICONS_LABEL="Show Icons"
+JGLOBAL_SHOW_INTRO_DESC="If set to Show, the Intro Text of the article will show when you drill down to the article. If set to Hide, only the part of the article after the &quot;Read More&quot; break will show."
+JGLOBAL_SHOW_INTRO_LABEL="Show Intro Text"
+JGLOBAL_SHOW_MODIFY_DATE_DESC="If set to Show, the date and time an Article was last modified will be displayed."
+JGLOBAL_SHOW_MODIFY_DATE_LABEL="Show Modify Date"
+JGLOBAL_SHOW_NAVIGATION_DESC="If set to Show, shows a navigation link (Next, Previous) between articles."
+JGLOBAL_SHOW_NAVIGATION_LABEL="Show Navigation"
+JGLOBAL_SHOW_PARENT_CATEGORY_DESC="If set to Show, the title of the article&rsquo;s parent category will show."
+JGLOBAL_SHOW_PARENT_CATEGORY_LABEL="Show Parent"
+JGLOBAL_SHOW_PRINT_ICON_DESC="Show or hide the print. This allows you to print an article."
+JGLOBAL_SHOW_PRINT_ICON_LABEL="Show Print"
+JGLOBAL_SHOW_PUBLISH_DATE_DESC="If set to Show, the date and time an Article was published will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels."
+JGLOBAL_SHOW_PUBLISH_DATE_LABEL="Show Publish Date"
+JGLOBAL_SHOW_READMORE_DESC="If set to Show, the Read more ...Link will show if Main text has been provided for the Article."
+JGLOBAL_SHOW_READMORE_LABEL="Show &quot;Read More&quot;"
+JGLOBAL_SHOW_READMORE_TITLE_DESC="If set to show the title of the Article will be shown on the Read More button."
+JGLOBAL_SHOW_READMORE_TITLE_LABEL="Show Title with Read More"
+JGLOBAL_SHOW_READMORE_LIMIT_DESC="Set a limit of number of characters in Article Title to show in Read More button."
+JGLOBAL_SHOW_READMORE_LIMIT_LABEL="Read More Limit"
+JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show or hide the subcategories descriptions."
+JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
+JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL="Include Subcategories"
+JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC="If None, only articles from this category will show. If a number, all articles from the category and the subcategories up to and including that level will show in the blog."
+JGLOBAL_SHOW_TAGS_DESC="Show the tags for this link."
+JGLOBAL_SHOW_TAGS_LABEL="Show Tags"
+JGLOBAL_SHOW_TITLE_DESC="If set to Show, the article title is shown."
+JGLOBAL_SHOW_TITLE_LABEL="Show Title"
+JGLOBAL_SHOW_UNAUTH_LINKS_DESC="If set to Yes, links to registered content will be shown even if you are not logged-in. You will need to log in to access the full item."
+JGLOBAL_SHOW_UNAUTH_LINKS_LABEL="Show Unauthorised Links"
+JGLOBAL_SHOW_VOTE_DESC="If set to show, a voting system will be enabled for Articles."
+JGLOBAL_SHOW_VOTE_LABEL="Show Voting"
+JGLOBAL_SINGLE_LEVEL="Single Level"
+JGLOBAL_SORT_BY="Sort Table By:"
+JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before finish publishing date"
+JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
+JGLOBAL_SUBHEADING_LABEL="Page Subheading"
+JGLOBAL_SUBMENU_CHECKIN="Check-in"
+JGLOBAL_SUBMENU_CLEAR_CACHE="Clear Cache"
+JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE="Clear Expired Cache"
+JGLOBAL_SUBSLIDER_BLOG_EXTENDED_LABEL="The option below gives the ability to include articles from subcategories in the Blog layout."
+JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL="If a field is left blank, global settings will be used."
+JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are also used when you select <br />one of the category links, on the first page and/or thereafter,<br />unless they are changed for a specific menu item."
+JGLOBAL_TITLE="Title"
+JGLOBAL_TITLE_ASC="Title ascending"
+JGLOBAL_TITLE_DESC="Title descending"
+JGLOBAL_TITLE_ALPHABETICAL="Title Alphabetical"
+JGLOBAL_TITLE_REVERSE_ALPHABETICAL="Title Reverse Alphabetical"
+JGLOBAL_TOGGLE_FEATURED="Toggle featured status."
+JGLOBAL_TOP="Top"
+JGLOBAL_TPL_CPANEL_LINK_TEXT="Return to Control Panel"
+JGLOBAL_TYPE_OR_SELECT_CATEGORY="Type or Select a Category"
+JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
+JGLOBAL_USE_GLOBAL="Use Global"
+JGLOBAL_USE_GLOBAL_VALUE="Use Global (%s)"
+JGLOBAL_USERNAME="Username"
+JGLOBAL_VALIDATION_FORM_FAILED="Invalid form"
+JGLOBAL_VIEW_SITE="View Site"
+JGLOBAL_VOTES="Votes"
+JGLOBAL_VOTES_ASC="Votes ascending"
+JGLOBAL_VOTES_DESC="Votes descending"
+JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator Backend."
+JGLOBAL_WIDTH="Width"
+
+JGRID_HEADING_ACCESS="Access"
+JGRID_HEADING_ACCESS_ASC="Access ascending"
+JGRID_HEADING_ACCESS_DESC="Access descending"
+JGRID_HEADING_CREATED_BY="Created by"
+JGRID_HEADING_ID="ID"
+JGRID_HEADING_ID_ASC="ID ascending"
+JGRID_HEADING_ID_DESC="ID descending"
+JGRID_HEADING_LANGUAGE="Language"
+JGRID_HEADING_LANGUAGE_ASC="Language ascending"
+JGRID_HEADING_LANGUAGE_DESC="Language descending"
+JGRID_HEADING_MENU_ITEM_TYPE="Menu Item Type"
+JGRID_HEADING_ORDERING="Ordering"
+JGRID_HEADING_ORDERING_ASC="Ordering ascending"
+JGRID_HEADING_ORDERING_DESC="Ordering descending"
+
+JHELP_COMPONENTS_ASSOCIATIONS="Components_Associations"
+JHELP_COMPONENTS_ASSOCIATIONS_EDIT="Components_Associations_Edit"
+JHELP_COMPONENTS_BANNERS_BANNERS_EDIT="Components_Banners_Banners_Edit"
+JHELP_COMPONENTS_BANNERS_BANNERS="Components_Banners_Banners"
+JHELP_COMPONENTS_BANNERS_CATEGORIES="Components_Banners_Categories"
+JHELP_COMPONENTS_BANNERS_CATEGORY_ADD="Components_Banners_Categories_Edit"
+JHELP_COMPONENTS_BANNERS_CATEGORY_EDIT="Components_Banners_Categories_Edit"
+JHELP_COMPONENTS_BANNERS_CLIENTS_EDIT="Components_Banners_Clients_Edit"
+JHELP_COMPONENTS_BANNERS_CLIENTS="Components_Banners_Clients"
+JHELP_COMPONENTS_BANNERS_TRACKS="Components_Banners_Tracks"
+JHELP_COMPONENTS_CACHE_MANAGER_SETTINGS="Components_Cache_Manager_Settings"
+JHELP_COMPONENTS_CHECK-IN_CONFIGURATION="Components_Check-in_Configuration"
+JHELP_COMPONENTS_COM_BANNERS_OPTIONS="Components_Banner_Manager_Options"
+JHELP_COMPONENTS_COM_ASSOCIATIONS_OPTIONS="Components_Associations_Options"
+JHELP_COMPONENTS_COM_CACHE_OPTIONS="Components_Cache_Manager_Settings"
+JHELP_COMPONENTS_COM_CHECKIN_OPTIONS="Components_Check_in_Configuration"
+JHELP_COMPONENTS_COM_CONTACT_OPTIONS="Components_Contact_Manager_Options"
+JHELP_COMPONENTS_COM_CONTENT_OPTIONS="Components_Article_Manager_Options"
+JHELP_COMPONENTS_COM_FINDER_OPTIONS="Components_Smart_Search_Configuration"
+JHELP_COMPONENTS_COM_INSTALLER_OPTIONS="Components_Installer_Configuration"
+JHELP_COMPONENTS_COM_JOOMLAUPDATE_OPTIONS="Components_Joomla_Update_Configuration"
+JHELP_COMPONENTS_COM_LANGUAGES_OPTIONS="Components_Language_Manager_Options"
+JHELP_COMPONENTS_COM_MEDIA_OPTIONS="Components_Media_Manager_Options"
+JHELP_COMPONENTS_COM_MENUS_OPTIONS="Components_Menus_Configuration"
+JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Components_Messages_Configuration"
+JHELP_COMPONENTS_COM_MODULES_OPTIONS="Components_Module_Manager_Options"
+JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="Components_News_Feed_Manager_Options"
+JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Components_Plugin_Manager_Options"
+JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Components_Post_installation_Messages_Configuration"
+JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Components_Redirect_Manager_Options"
+JHELP_COMPONENTS_COM_SEARCH_OPTIONS="Components_Search_Manager_Options"
+JHELP_COMPONENTS_COM_TAGS_OPTIONS="Components_Tags_Manager_Options"
+JHELP_COMPONENTS_COM_TEMPLATES_OPTIONS="Components_Template_Manager_Options"
+JHELP_COMPONENTS_COM_USERS_OPTIONS="Components_Users_Configuration"
+JHELP_COMPONENTS_COM_WEBLINKS_OPTIONS="Components_Web_Links_Manager_Options"
+JHELP_COMPONENTS_CONTACT_CATEGORIES="Components_Contacts_Categories"
+JHELP_COMPONENTS_CONTACT_CATEGORY_ADD="Components_Contacts_Categories_Edit"
+JHELP_COMPONENTS_CONTACT_CATEGORY_EDIT="Components_Contacts_Categories_Edit"
+JHELP_COMPONENTS_CONTACTS_CONTACTS_EDIT="Components_Contacts_Contacts_Edit"
+JHELP_COMPONENTS_CONTACTS_CONTACTS="Components_Contacts_Contacts"
+JHELP_COMPONENTS_CONTENT_CATEGORIES="Components_Content_Categories"
+JHELP_COMPONENTS_CONTENT_CATEGORY_ADD="Components_Content_Categories_Edit"
+JHELP_COMPONENTS_CONTENT_CATEGORY_EDIT="Components_Content_Categories_Edit"
+JHELP_COMPONENTS_FIELDS_FIELDS="Components_Fields_Fields"
+JHELP_COMPONENTS_FIELDS_FIELDS_EDIT="Components_Fields_Fields_Edit"
+JHELP_COMPONENTS_FIELDS_FIELD_GROUPS="Components_Fields_Field_Groups"
+JHELP_COMPONENTS_FIELDS_FIELD_GROUPS_EDIT="Components_Fields_Field_Groups_Edit"
+JHELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Components_Finder_Manage_Content_Maps"
+JHELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Components_Finder_Manage_Indexed_Content"
+JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Components_Finder_Manage_Search_Filters_Edit"
+JHELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Components_Finder_Manage_Search_Filters"
+JHELP_COMPONENTS_INSTALLER_CONFIGURATION="Components_Installer_Configuration"
+JHELP_COMPONENTS_JOOMLA_UPDATE="Components_Joomla_Update"
+JHELP_COMPONENTS_JOOMLA_UPDATE_CONFIGURATION="Components_Joomla_Update_Configuration"
+JHELP_COMPONENTS_MENUS_CONFIGURATION="Components_Menus_Configuration"
+JHELP_COMPONENTS_MESSAGES_CONFIGURATION="Components_Messages_Configuration"
+JHELP_COMPONENTS_MESSAGING_INBOX="Components_Messaging_Inbox"
+JHELP_COMPONENTS_MESSAGING_READ="Components_Messaging_Read"
+JHELP_COMPONENTS_MESSAGING_WRITE="Components_Messaging_Write"
+JHELP_COMPONENTS_NEWSFEEDS_CATEGORIES="Components_Newsfeeds_Categories"
+JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_ADD="Components_Newsfeeds_Categories_Edit"
+JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="Components_Newsfeeds_Categories_Edit"
+JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="Components_Newsfeeds_Feeds_Edit"
+JHELP_COMPONENTS_NEWSFEEDS_FEEDS="Components_Newsfeeds_Feeds"
+JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Components_Post_installation_Messages"
+JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Components_Redirect_Manager_Edit"
+JHELP_COMPONENTS_REDIRECT_MANAGER="Components_Redirect_Manager"
+JHELP_COMPONENTS_SEARCH="Components_Search"
+JHELP_COMPONENTS_SMART_SEARCH_CONFIGURATION="Components_Smart_Search_Configuration"
+JHELP_COMPONENTS_TAGS_MANAGER="Components_Tags_Manager"
+JHELP_COMPONENTS_TAGS_MANAGER_EDIT="Components_Tags_Manager_Edit"
+JHELP_COMPONENTS_USERS_CATEGORIES="Users_User_Note_Categories"
+JHELP_COMPONENTS_USERS_CATEGORY_ADD="Users_User_Note_Category_Edit"
+JHELP_COMPONENTS_USERS_CATEGORY_EDIT="Users_User_Note_Category_Edit"
+JHELP_COMPONENTS_WEBLINKS_CATEGORIES="Components_Weblinks_Categories"
+JHELP_COMPONENTS_WEBLINKS_CATEGORY_ADD="Components_Weblinks_Categories_Edit"
+JHELP_COMPONENTS_WEBLINKS_CATEGORY_EDIT="Components_Weblinks_Categories_Edit"
+JHELP_COMPONENTS_WEBLINKS_LINKS_EDIT="Components_Weblinks_Links_Edit"
+JHELP_COMPONENTS_WEBLINKS_LINKS="Components_Weblinks_Links"
+JHELP_CONTENT_ARTICLE_MANAGER="Content_Article_Manager"
+JHELP_CONTENT_ARTICLE_MANAGER_EDIT="Content_Article_Manager_Edit"
+JHELP_CONTENT_FEATURED_ARTICLES="Content_Featured_Articles"
+JHELP_CONTENT_MEDIA_MANAGER="Content_Media_Manager"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Extensions_Extension_Manager_Database"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extensions_Extension_Manager_Discover"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extensions_Extension_Manager_Install"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extensions_Extension_Manager_languages"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extensions_Extension_Manager_Manage"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extensions_Extension_Manager_Update"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES="Extensions_Extension_Manager_Updatesites"
+JHELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Extensions_Extension_Manager_Warnings"
+JHELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Extensions_Language_Manager_Content"
+JHELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Extensions_Language_Manager_Edit"
+JHELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Extensions_Language_Manager_Installed"
+JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Extensions_Language_Manager_Overrides"
+JHELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Extensions_Language_Manager_Overrides_Edit"
+JHELP_EXTENSIONS_MODULE_MANAGER="Extensions_Module_Manager"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM="Extensions_Module_Manager_Admin_Custom"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED="Extensions_Module_Manager_Admin_Feed"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST="Extensions_Module_Manager_Admin_Latest"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED="Extensions_Module_Manager_Admin_Logged"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN="Extensions_Module_Manager_Admin_Login"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU="Extensions_Module_Manager_Admin_Menu"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG="Extensions_Module_Manager_Admin_Multilang"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_ONLINE="Extensions_Module_Manager_Admin_Online"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR="Extensions_Module_Manager_Admin_Popular"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON="Extensions_Module_Manager_Admin_Quickicon"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS="Extensions_Module_Manager_Admin_Status"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU="Extensions_Module_Manager_Admin_Submenu"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TITLE="Extensions_Module_Manager_Admin_Title"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TOOLBAR="Extensions_Module_Manager_Admin_Toolbar"
+JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_UNREAD="Extensions_Module_Manager_Admin_Unread"
+JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE="Extensions_Module_Manager_Articles_Archive"
+JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES="Extensions_Module_Manager_Articles_Categories"
+JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY="Extensions_Module_Manager_Articles_Category"
+JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH="Extensions_Module_Manager_Articles_Newsflash"
+JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED="Extensions_Module_Manager_Articles_Related"
+JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS="Extensions_Module_Manager_Banners"
+JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS="Extensions_Module_Manager_Breadcrumbs"
+JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML="Extensions_Module_Manager_Custom_HTML"
+JHELP_EXTENSIONS_MODULE_MANAGER_EDIT="Extensions_Module_Manager_Edit"
+JHELP_EXTENSIONS_MODULE_MANAGER_FEED_DISPLAY="Extensions_Module_Manager_Feed_Display"
+JHELP_EXTENSIONS_MODULE_MANAGER_FOOTER="Extensions_Module_Manager_Footer"
+JHELP_EXTENSIONS_MODULE_MANAGER_LANGUAGE_SWITCHER="Extensions_Module_Manager_Language_Switcher"
+JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_NEWS="Extensions_Module_Manager_Latest_News"
+JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_USERS="Extensions_Module_Manager_Latest_Users"
+JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN="Extensions_Module_Manager_Login"
+JHELP_EXTENSIONS_MODULE_MANAGER_MENU="Extensions_Module_Manager_Menu"
+JHELP_EXTENSIONS_MODULE_MANAGER_MOST_READ="Extensions_Module_Manager_Most_Read"
+JHELP_EXTENSIONS_MODULE_MANAGER_RANDOM_IMAGE="Extensions_Module_Manager_Random_Image"
+JHELP_EXTENSIONS_MODULE_MANAGER_SEARCH="Extensions_Module_Manager_Search"
+JHELP_EXTENSIONS_MODULE_MANAGER_SMART_SEARCH="Extensions_Module_Manager_Smart_Search"
+JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS="Extensions_Module_Manager_Statistics"
+JHELP_EXTENSIONS_MODULE_MANAGER_SYNDICATION_FEEDS="Extensions_Module_Manager_Syndication_Feeds"
+JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_POPULAR="Extensions_Module_Manager_Tags_Popular"
+JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_SIMILAR="Extensions_Module_Manager_Tags_Similar"
+JHELP_EXTENSIONS_MODULE_MANAGER_WEBLINKS="Extensions_Module_Manager_Weblinks"
+JHELP_EXTENSIONS_MODULE_MANAGER_WHO_ONLINE="Extensions_Module_Manager_Who_Online"
+JHELP_EXTENSIONS_MODULE_MANAGER_WRAPPER="Extensions_Module_Manager_Wrapper"
+JHELP_EXTENSIONS_PLUGIN_MANAGER="Extensions_Plugin_Manager"
+JHELP_EXTENSIONS_PLUGIN_MANAGER_EDIT="Extensions_Plugin_Manager_Edit"
+JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES="Extensions_Template_Manager_Styles"
+JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT="Extensions_Template_Manager_Styles_Edit"
+JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES="Extensions_Template_Manager_Templates"
+JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT="Extensions_Template_Manager_Templates_Edit"
+JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE="Extensions_Template_Manager_Templates_Edit_Source"
+JHELP_GLOSSARY="Glossary"
+JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED="Menus_Menu_Item_Article_Archived"
+JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES="Menus_Menu_Item_Article_Categories"
+JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG="Menus_Menu_Item_Article_Category_Blog"
+JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST="Menus_Menu_Item_Article_Category_List"
+JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE="Menus_Menu_Item_Article_Create"
+JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED="Menus_Menu_Item_Article_Featured"
+JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE="Menus_Menu_Item_Article_Single_Article"
+JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES="Menus_Menu_Item_Contact_Categories"
+JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY="Menus_Menu_Item_Contact_Category"
+JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED="Menus_Menu_Item_Contact_Featured"
+JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT="Menus_Menu_Item_Contact_Single_Contact"
+JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION="Menus_Menu_Item_Display_Site_Configuration"
+JHELP_MENUS_MENU_ITEM_DISPLAY_TEMPLATE_OPTIONS="Menus_Menu_Item_Display_Template_Options"
+JHELP_MENUS_MENU_ITEM_EXTERNAL_URL="Menus_Menu_Item_External_URL"
+JHELP_MENUS_MENU_ITEM_FINDER_SEARCH="Menus_Menu_Item_Finder_Search"
+JHELP_MENUS_MENU_ITEM_MANAGER="Menus_Menu_Item_Manager"
+JHELP_MENUS_MENU_ITEM_MANAGER_EDIT="Menus_Menu_Item_Manager_Edit"
+JHELP_MENUS_MENU_ITEM_MENU_ITEM_ALIAS="Menus_Menu_Item_Menu_Item_Alias"
+JHELP_MENUS_MENU_ITEM_MENU_ITEM_HEADING="Menus_Menu_Item_Menu_Item_Heading"
+JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES="Menus_Menu_Item_Newsfeed_Categories"
+JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY="Menus_Menu_Item_Newsfeed_Category"
+JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED="Menus_Menu_Item_Newsfeed_Single_Newsfeed"
+JHELP_MENUS_MENU_ITEM_SEARCH_RESULTS="Menus_Menu_Item_Search_Results"
+JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST="Menus_Menu_Item_Tags_Items_Compact_List"
+JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST="Menus_Menu_Item_Tags_Items_List"
+JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST_ALL="Menus_Menu_Item_Tags_Items_List_All"
+JHELP_MENUS_MENU_ITEM_TEXT_SEPARATOR="Menus_Menu_Item_Text_Separator"
+JHELP_MENUS_MENU_ITEM_USER_LOGIN="Menus_Menu_Item_User_Login"
+JHELP_MENUS_MENU_ITEM_USER_LOGOUT="Menus_Menu_Item_User_Logout"
+JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET="Menus_Menu_Item_User_Password_Reset"
+JHELP_MENUS_MENU_ITEM_USER_PROFILE="Menus_Menu_Item_User_Profile"
+JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT="Menus_Menu_Item_User_Profile_Edit"
+JHELP_MENUS_MENU_ITEM_USER_REGISTRATION="Menus_Menu_Item_User_Registration"
+JHELP_MENUS_MENU_ITEM_USER_REMINDER="Menus_Menu_Item_User_Reminder"
+JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORIES="Menus_Menu_Item_Weblink_Categories"
+JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORY="Menus_Menu_Item_Weblink_Category"
+JHELP_MENUS_MENU_ITEM_WEBLINK_SUBMIT="Menus_Menu_Item_Weblink_Submit"
+JHELP_MENUS_MENU_ITEM_WRAPPER="Menus_Menu_Item_Wrapper"
+JHELP_MENUS_MENU_MANAGER="Menus_Menu_Manager"
+JHELP_MENUS_MENU_MANAGER_EDIT="Menus_Menu_Manager_Edit"
+JHELP_SITE_GLOBAL_CONFIGURATION="Site_Global_Configuration"
+JHELP_SITE_MAINTENANCE_CLEAR_CACHE="Site_Maintenance_Clear_Cache"
+JHELP_SITE_MAINTENANCE_GLOBAL_CHECK-IN="Site_Maintenance_Global_Check-in"
+JHELP_SITE_MAINTENANCE_PURGE_EXPIRED_CACHE="Site_Maintenance_Purge_Expired_Cache"
+JHELP_SITE_SYSTEM_INFORMATION="Site_System_Information"
+JHELP_ADMIN_USER_PROFILE_EDIT="Site_My_Profile"
+JHELP_START_HERE="Start_Here"
+JHELP_USERS_ACCESS_LEVELS="Users_Access_Levels"
+JHELP_USERS_ACCESS_LEVELS_EDIT="Users_Access_Levels_Edit"
+JHELP_USERS_DEBUG_GROUPS="Users_Debug_Groups"
+JHELP_USERS_DEBUG_USERS="Users_Debug_Users"
+JHELP_USERS_GROUPS="Users_Groups"
+JHELP_USERS_GROUPS_EDIT="Users_Groups_Edit"
+JHELP_USERS_MASS_MAIL_USERS="Users_Mass_Mail_Users"
+JHELP_USERS_USER_MANAGER="Users_User_Manager"
+JHELP_USERS_USER_MANAGER_EDIT="Users_User_Manager_Edit"
+JHELP_USERS_USER_NOTES="Users_User_Notes"
+JHELP_USERS_USER_NOTES_EDIT="Users_User_Notes_Edit"
+
+; if there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded
+; we therefore have to load the strings from en-GB.ini
+
+JLIB_DATABASE_ERROR_ADAPTER_MYSQL="The MySQL adapter 'mysql' is not available."
+JLIB_DATABASE_ERROR_ADAPTER_MYSQLI="The MySQL adapter 'mysqli' is not available."
+JLIB_DATABASE_ERROR_CONNECT_DATABASE="Unable to connect to the Database: %s"
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL."
+JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database"
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
+JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError"
+
+JOPTION_ACCESS_SHOW_ALL_ACCESS="Show All Access"
+JOPTION_ACCESS_SHOW_ALL_GROUPS="Show All Groups"
+JOPTION_ACCESS_SHOW_ALL_LEVELS="Show All Access Levels"
+JOPTION_ALL_CATEGORIES="- All Categories -"
+JOPTION_ANY_CATEGORY="Any Category"
+JOPTION_ANY="Any"
+JOPTION_DO_NOT_USE="- None Selected -"
+JOPTION_FROM_COMPONENT="---From Component---"
+JOPTION_FROM_MODULE="---From Module---"
+JOPTION_FROM_TEMPLATE="---From %s Template---"
+JOPTION_FROM_STANDARD="---From Global Options---"
+JOPTION_MENUS="Menus"
+JOPTION_NO_USER="- No User -"
+JOPTION_OPTIONAL="Optional"
+JOPTION_ORDER_FIRST="Order First"
+JOPTION_ORDER_LAST="Order Last"
+JOPTION_REQUIRED="Required"
+JOPTION_SELECT_ACCESS="- Select Access -"
+JOPTION_SELECT_AUTHOR_ALIAS="- Select Author Alias -"
+JOPTION_SELECT_AUTHOR_ALIASES="- Select Author Aliases -"
+JOPTION_SELECT_AUTHOR="- Select Author -"
+JOPTION_SELECT_AUTHORS="- Select Authors -"
+JOPTION_SELECT_CATEGORY="- Select Category -"
+JOPTION_SELECT_EDITOR="- Select Editor -"
+JOPTION_SELECT_IMAGE="- Select Image -"
+JOPTION_SELECT_LANGUAGE="- Select Language -"
+JOPTION_SELECT_MENU="- Select Menu -"
+JOPTION_SELECT_MENU_ITEM="- Select Menu Item -"
+JOPTION_SELECT_PUBLISHED="- Select Status -"
+JOPTION_SELECT_TEMPLATE="- Select Template -"
+JOPTION_SELECT_MAX_LEVELS="- Select Max Levels -"
+JOPTION_SELECT_TAG="- Select Tag -"
+JOPTION_UNASSIGNED="Unassigned"
+JOPTION_USE_DEFAULT_MODULE_SETTING="- Use Default Module Setting -"
+JOPTION_USE_DEFAULT="- Use Default -"
+JOPTION_USE_MENU_REQUEST_SETTING="- Use Menu or Request Setting -"
+
+JSEARCH_FILTER_LABEL="Filter:"
+JSEARCH_FILTER_CLEAR="Clear"
+JSEARCH_FILTER_SUBMIT="Search"
+JSEARCH_FILTER="Search"
+JSEARCH_TITLE="Search %s"
+JSEARCH_RESET="Reset"
+
+JTOGGLE_SIDEBAR_LABEL="Sidebar"
+JTOGGLE_HIDE_SIDEBAR="Hide the sidebar"
+JTOGGLE_SHOW_SIDEBAR="Show the sidebar"
+
+JTOOLBAR_APPLY="Save"
+JTOOLBAR_ARCHIVE="Archive"
+JTOOLBAR_ASSIGN="Assign"
+JTOOLBAR_BACK="Back"
+JTOOLBAR_BATCH="Batch"
+JTOOLBAR_BULK_IMPORT="Bulk Import"
+JTOOLBAR_CANCEL="Cancel"
+JTOOLBAR_CHECKIN="Check-in"
+JTOOLBAR_CLOSE="Close"
+JTOOLBAR_DEFAULT="Default"
+JTOOLBAR_DELETE="Delete"
+JTOOLBAR_DELETE_ALL="Delete All"
+JTOOLBAR_DISABLE="Disable"
+JTOOLBAR_DUPLICATE="Duplicate"
+JTOOLBAR_EDIT="Edit"
+JTOOLBAR_EDIT_CSS="Edit CSS"
+JTOOLBAR_EDIT_HTML="Edit HTML"
+JTOOLBAR_EMPTY_TRASH="Empty trash"
+JTOOLBAR_ENABLE="Enable"
+JTOOLBAR_EXPORT="Export"
+JTOOLBAR_HELP="Help"
+JTOOLBAR_INSTALL="Install"
+JTOOLBAR_NEW="New"
+JTOOLBAR_OPTIONS="Options"
+JTOOLBAR_PUBLISH="Publish"
+JTOOLBAR_PURGE_CACHE="Clear Cache"
+JTOOLBAR_REBUILD="Rebuild"
+JTOOLBAR_REBUILD_FAILED="Rebuild failed: %s"
+JTOOLBAR_REBUILD_SUCCESS="Successfully rebuilt"
+JTOOLBAR_REFRESH_CACHE="Refresh Cache"
+JTOOLBAR_REMOVE="Remove"
+JTOOLBAR_SAVE="Save &amp; Close"
+JTOOLBAR_SAVE_AND_NEW="Save &amp; New"
+JTOOLBAR_SAVE_AS_COPY="Save as Copy"
+JTOOLBAR_UNARCHIVE="Unarchive"
+JTOOLBAR_UNINSTALL="Uninstall"
+JTOOLBAR_UNPUBLISH="Unpublish"
+JTOOLBAR_UPLOAD="Upload"
+JTOOLBAR_TRASH="Trash"
+JTOOLBAR_UNTRASH="Untrash"
+JTOOLBAR_VERSIONS="Versions"
+
+JWARNING_PUBLISH_MUST_SELECT="You must select at least one item to publish."
+JWARNING_ARCHIVE_MUST_SELECT="You must select at least one item to archive."
+JWARNING_UNPUBLISH_MUST_SELECT="You must select at least one item to unpublish."
+JWARNING_TRASH_MUST_SELECT="You must select at least one item to remove."
+JWARNING_DELETE_MUST_SELECT="You must select at least one item to permanently delete."
+JWARNING_REMOVE_ROOT_USER="You are logged-in using the emergency Root User setting in configuration.php.<br />You should remove $root_user from the configuration.php as soon as you have restored control to your site to avoid future security breaches.<br /><a href='%s'>Select here to try to do it automatically.</a>"
+JWARNING_REMOVE_ROOT_USER_ADMIN="The emergency Root User setting is enabled for the user(id): %s.<br />You should remove $root_user from the configuration.php as soon as you have restored control to your site to avoid future security breaches.<br /><a href='%s'>Select here to try to do it automatically.</a>"
+
+; Date format
+
+DATE_FORMAT_LC="l, d F Y"
+DATE_FORMAT_LC1="l, d F Y"
+DATE_FORMAT_LC2="l, d F Y H:i"
+DATE_FORMAT_LC3="d F Y"
+DATE_FORMAT_LC4="Y-m-d"
+DATE_FORMAT_LC5="Y-m-d H:i"
+DATE_FORMAT_LC6="Y-m-d H:i:s"
+DATE_FORMAT_JS1="y-m-d"
+DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
+DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
+DATE_FORMAT_FILTER_DATE="Y-m-d"
+DATE_FORMAT_FILTER_DATETIME="Y-m-d H:i:s"
+
+; Months
+
+JANUARY_SHORT="Jan"
+JANUARY="January"
+FEBRUARY_SHORT="Feb"
+FEBRUARY="February"
+MARCH_SHORT="Mar"
+MARCH="March"
+APRIL_SHORT="Apr"
+APRIL="April"
+MAY_SHORT="May"
+MAY="May"
+JUNE_SHORT="Jun"
+JUNE="June"
+JULY_SHORT="Jul"
+JULY="July"
+AUGUST_SHORT="Aug"
+AUGUST="August"
+SEPTEMBER_SHORT="Sep"
+SEPTEMBER="September"
+OCTOBER_SHORT="Oct"
+OCTOBER="October"
+NOVEMBER_SHORT="Nov"
+NOVEMBER="November"
+DECEMBER_SHORT="Dec"
+DECEMBER="December"
+
+; Days of the Week
+
+SAT="Sat"
+SATURDAY="Saturday"
+SUN="Sun"
+SUNDAY="Sunday"
+MON="Mon"
+MONDAY="Monday"
+TUE="Tue"
+TUESDAY="Tuesday"
+WED="Wed"
+WEDNESDAY="Wednesday"
+THU="Thu"
+THURSDAY="Thursday"
+FRI="Fri"
+FRIDAY="Friday"
+
+; Localised number format
+
+DECIMALS_SEPARATOR="."
+THOUSANDS_SEPARATOR=","
+
+; Time Zones - this data has been removed as it is no longer used by Joomla 3.x
+
+; Mailer Codes
+PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient email address."
+PHPMAILER_MAILER_IS_NOT_SUPPORTED="Mailer is not supported."
+PHPMAILER_EXECUTE="Could not execute: "
+PHPMAILER_EXTENSION_MISSING="Extension missing: "
+PHPMAILER_INSTANTIATE="Could not start mail function."
+PHPMAILER_AUTHENTICATE="SMTP Error! Could not authenticate."
+PHPMAILER_FROM_FAILED="The following from address failed: "
+PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
+PHPMAILER_DATA_NOT_ACCEPTED="SMTP Error! Data not accepted."
+PHPMAILER_CONNECT_HOST="SMTP Error! Could not connect to SMTP host."
+PHPMAILER_FILE_ACCESS="Could not access file: "
+PHPMAILER_FILE_OPEN="File Error: Could not open file: "
+PHPMAILER_ENCODING="Unknown encoding: "
+PHPMAILER_SIGNING_ERROR="Signing error: "
+PHPMAILER_SMTP_ERROR="SMTP server error: "
+PHPMAILER_EMPTY_MESSAGE="Empty message body"
+PHPMAILER_INVALID_ADDRESS="Invalid address"
+PHPMAILER_VARIABLE_SET="Can't set or reset variable: "
+PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
+PHPMAILER_TLS="Could not start TLS"
+
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+PDOMYSQL="MySQL (PDO)"
+POSTGRESQL="PostgreSQL"
+SQLAZURE="Microsoft SQL Azure"
+SQLITE="SQLite"
+SQLSRV="Microsoft SQL Server"
+
+; Search tools
+JSEARCH_TOOLS="Search Tools"
+JSEARCH_TOOLS_DESC="Filter the list items."
+JSEARCH_TOOLS_ORDERING="Order by:"
diff --git a/core/administrator/language/en-GB/en-GB.lib_joomla.ini b/core/administrator/language/en-GB/en-GB.lib_joomla.ini
new file mode 100644
index 00000000..6ccd43d9
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -0,0 +1,747 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+; Common boolean values
+; Note: YES, NO, TRUE, FALSE are reserved words in INI format.
+
+; Keep this string on top
+JERROR_PARSING_LANGUAGE_FILE="&#160;: error(s) in line(s) %s"
+
+JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN="Access forbidden."
+JLIB_APPLICATION_ERROR_APPLICATION_GET_NAME="JApplication: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_APPLICATION_LOAD="Unable to load application: %s"
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new items in this category."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these items."
+JLIB_APPLICATION_ERROR_BATCH_FAILED="Batch process failed with following error: %s"
+JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND="Can't find the destination category for this move."
+JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND="Can't find the item being moved."
+JLIB_APPLICATION_ERROR_CHECKIN_FAILED="Check-in failed with the following error: %s"
+JLIB_APPLICATION_ERROR_CHECKIN_NOT_CHECKED="Item is not checked out."
+JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH="The user checking in does not match the user who checked out the item."
+JLIB_APPLICATION_ERROR_CHECKOUT_FAILED="Check-out failed with the following error: %s"
+JLIB_APPLICATION_ERROR_CHECKOUT_USER_MISMATCH="The user checking out does not match the user who checked out the item."
+JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND="Component not found."
+JLIB_APPLICATION_ERROR_COMPONENT_NOT_LOADING="Error loading component: %1$s, %2$s"
+JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME="JController: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED="Create record not permitted."
+JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED="Delete not permitted."
+JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED="Edit state is not permitted."
+JLIB_APPLICATION_ERROR_EDIT_ITEM_NOT_PERMITTED="Edit is not permitted."
+JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED="Edit not permitted."
+JLIB_APPLICATION_ERROR_HISTORY_ID_MISMATCH="Error restoring item version from history."
+JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION="Insufficient information to perform the batch operation."
+JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS="Invalid controller class: %s"
+JLIB_APPLICATION_ERROR_INVALID_CONTROLLER="Invalid controller: name='%s', format='%s'"
+JLIB_APPLICATION_ERROR_LAYOUTFILE_NOT_FOUND="Layout %s not found."
+JLIB_APPLICATION_ERROR_LIBRARY_NOT_FOUND="Library not found."
+JLIB_APPLICATION_ERROR_LIBRARY_NOT_LOADING="Error loading library: %1$s, %2$s"
+JLIB_APPLICATION_ERROR_MENU_LOAD="Error loading menu: %s"
+JLIB_APPLICATION_ERROR_MODEL_GET_NAME="JModel: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_MODULE_LOAD="Error loading module %s"
+JLIB_APPLICATION_ERROR_PATHWAY_LOAD="Unable to load pathway: %s"
+JLIB_APPLICATION_ERROR_REORDER_FAILED="Reorder failed. Error: %s"
+JLIB_APPLICATION_ERROR_ROUTER_LOAD="Unable to load router: %s"
+JLIB_APPLICATION_ERROR_MODELCLASS_NOT_FOUND="Model class %s not found in file."
+JLIB_APPLICATION_ERROR_SAVE_FAILED="Save failed with the following error: %s"
+JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED="Save not permitted."
+JLIB_APPLICATION_ERROR_TABLE_NAME_NOT_SUPPORTED="Table %s not supported. File not found."
+JLIB_APPLICATION_ERROR_TASK_NOT_FOUND="Task [%s] not found."
+JLIB_APPLICATION_ERROR_UNHELD_ID="You are not permitted to use that link to directly access that page (#%d)."
+JLIB_APPLICATION_ERROR_VIEW_CLASS_NOT_FOUND="View class not found [class, file]: %1$s, %2$s"
+JLIB_APPLICATION_ERROR_VIEW_GET_NAME_SUBSTRING="JView: :getName() : Your classname has the substring 'view'. This causes problems when extracting the classname from the name of your objects view. Avoid Object names with the substring 'view'."
+JLIB_APPLICATION_ERROR_VIEW_GET_NAME="JView: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_VIEW_NOT_FOUND="View not found [name, type, prefix]: %1$s, %2$s, %3$s"
+JLIB_APPLICATION_SAVE_SUCCESS="Item saved."
+JLIB_APPLICATION_SUBMIT_SAVE_SUCCESS="Item submitted."
+JLIB_APPLICATION_SUCCESS_BATCH="Batch process completed."
+JLIB_APPLICATION_SUCCESS_ITEM_REORDERED="Ordering saved."
+JLIB_APPLICATION_SUCCESS_ORDERING_SAVED="Ordering saved."
+JLIB_APPLICATION_SUCCESS_LOAD_HISTORY="Prior version restored. Saved on %s %s."
+
+JLIB_LOGIN_AUTHENTICATE="Username and password do not match or you do not have an account yet."
+
+JLIB_CACHE_ERROR_CACHE_HANDLER_LOAD="Unable to load Cache Handler: %s"
+JLIB_CACHE_ERROR_CACHE_STORAGE_LOAD="Unable to load Cache Storage: %s"
+
+JLIB_CAPTCHA_ERROR_PLUGIN_NOT_FOUND="Captcha plugin not set or not found. Please contact a site administrator."
+
+JLIB_CLIENT_ERROR_JFTP_NO_CONNECT="JFTP: :connect: Could not connect to host ' %1$s ' on port ' %2$s '"
+JLIB_CLIENT_ERROR_JFTP_NO_CONNECT_SOCKET="JFTP: :connect: Could not connect to host ' %1$s ' on port ' %2$s '. Socket error number: %3$s and error message: %4$s"
+JLIB_CLIENT_ERROR_JFTP_BAD_RESPONSE="JFTP: :connect: Bad response. Server response: %s [Expected: 220]"
+JLIB_CLIENT_ERROR_JFTP_BAD_USERNAME="JFTP: :login: Bad Username. Server response: %1$s [Expected: 331]. Username sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_BAD_PASSWORD="JFTP: :login: Bad Password. Server response: %1$s [Expected: 230]. Password sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_PWD_BAD_RESPONSE_NATIVE="FTP: :pwd: Bad response."
+JLIB_CLIENT_ERROR_JFTP_PWD_BAD_RESPONSE="JFTP: :pwd: Bad response. Server response: %s [Expected: 257]"
+JLIB_CLIENT_ERROR_JFTP_SYST_BAD_RESPONSE_NATIVE="JFTP: :syst: Bad response."
+JLIB_CLIENT_ERROR_JFTP_SYST_BAD_RESPONSE="JFTP: :syst: Bad response. Server response: %s [Expected: 215]"
+JLIB_CLIENT_ERROR_JFTP_CHDIR_BAD_RESPONSE_NATIVE="JFTP: :chdir: Bad response."
+JLIB_CLIENT_ERROR_JFTP_CHDIR_BAD_RESPONSE="JFTP: :chdir: Bad response. Server response: %1$s [Expected: 250]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_REINIT_BAD_RESPONSE_NATIVE="JFTP: :reinit: Bad response."
+JLIB_CLIENT_ERROR_JFTP_REINIT_BAD_RESPONSE="JFTP: :reinit: Bad response. Server response: %s [Expected: 220]"
+JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_NATIVE="JFTP: :rename: Bad response."
+JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_FROM="JFTP: :rename: Bad response. Server response: %1$s [Expected: 350]. From path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_TO="JFTP: :rename: Bad response. Server response: %1$s [Expected: 250]. To path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE_NATIVE="JFTP: :chmod: Bad response."
+JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE="JFTP: :chmod: Bad response. Server response: %1$s [Expected: 250]. Path sent: %2$s. Mode sent: %3$s"
+JLIB_CLIENT_ERROR_JFTP_DELETE_BAD_RESPONSE_NATIVE="JFTP: :delete: Bad response."
+JLIB_CLIENT_ERROR_JFTP_DELETE_BAD_RESPONSE="JFTP: :delete: Bad response. Server response: %1$s [Expected: 250]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_MKDIR_BAD_RESPONSE_NATIVE="JFTP: :mkdir: Bad response."
+JLIB_CLIENT_ERROR_JFTP_MKDIR_BAD_RESPONSE="JFTP: :mkdir: Bad response. Server response: %1$s [Expected: 257]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_RESTART_BAD_RESPONSE_NATIVE="JFTP: :restart: Bad response."
+JLIB_CLIENT_ERROR_JFTP_RESTART_BAD_RESPONSE="JFTP: :restart: Bad response. Server response: %1$s [Expected: 350]. Restart point sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_BUFFER="JFTP: :create: Bad response."
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_PASSIVE="JFTP: :create: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE="JFTP: :create: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_TRANSFER="JFTP: :create: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_BUFFER="JFTP: :read: Bad response."
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_PASSIVE="JFTP: :read: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE="JFTP: :read: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_TRANSFER="JFTP: :read: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE="JFTP: :get: Bad response."
+JLIB_CLIENT_ERROR_JFTP_GET_PASSIVE="JFTP: :get: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_GET_WRITING_LOCAL="JFTP: :get: Unable to open local file for writing. Local path: %s"
+JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE_RETR="JFTP: :get: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE_TRANSFER="JFTP: :get: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_STORE_PASSIVE="JFTP: :store: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE="JFTP: :store: Bad response."
+JLIB_CLIENT_ERROR_JFTP_STORE_READING_LOCAL="JFTP: :store: Unable to open local file for reading. Local path: %s"
+JLIB_CLIENT_ERROR_JFTP_STORE_FIND_LOCAL="JFTP: :store: Unable to find local file. Local path: %s"
+JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE_STOR="JFTP: :store: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_STORE_DATA_PORT="JFTP: :store: Unable to write to data port socket."
+JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE_TRANSFER="JFTP: :store: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_WRITE_PASSIVE="JFTP: :write: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE="JFTP: :write: Bad response."
+JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE_STOR="JFTP: :write: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_WRITE_DATA_PORT="JFTP: :write: Unable to write to data port socket."
+JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE_TRANSFER="JFTP: :write: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_APPEND_PASSIVE="JFTP: :append: Unable to use passive mode"
+JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE="JFTP: :append: Bad response"
+JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE_APPE="JFTP: :append: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_APPEND_DATA_PORT="JFTP: :append: Unable to write to data port socket"
+JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE_TRANSFER="JFTP: :append: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_SIZE_BAD_RESPONSE="JFTP: :size: Bad response"
+JLIB_CLIENT_ERROR_JFTP_SIZE_PASSIVE="JFTP: :size: Unable to use passive mode"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_PASSIVE="JFTP: :listNames: Unable to use passive mode"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE="JFTP: :listNames: Bad response"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_NLST="JFTP: :listNames: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_TRANSFER="JFTP: :listNames: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE="JFTP: :listDetails: Bad response."
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_PASSIVE="JFTP: :listDetails: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE_LIST="JFTP: :listDetails: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE_TRANSFER="JFTP: :listDetails: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_UNRECOGNISED="JFTP: :listDetails: Unrecognised folder listing format."
+JLIB_CLIENT_ERROR_JFTP_PUTCMD_UNCONNECTED="JFTP: :_putCmd: Not connected to the control port."
+JLIB_CLIENT_ERROR_JFTP_PUTCMD_SEND="JFTP: :_putCmd: Unable to send command: %s"
+JLIB_CLIENT_ERROR_JFTP_VERIFYRESPONSE="JFTP: :_verifyResponse: Timeout or unrecognised response while waiting for a response from the server. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_CONNECT_PORT="JFTP: :_passive: Not connected to the control port."
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_RESPONSE="JFTP: :_passive: Timeout or unrecognised response while waiting for a response from the server. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_IP_OBTAIN="JFTP: :_passive: Unable to obtain IP and port for data transfer. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_IP_VALID="JFTP: :_passive: IP and port for data transfer not valid. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_CONNECT="JFTP: :_passive: Could not connect to host %1$s on port %2$s. Socket error number: %3$s and error message: %4$s"
+JLIB_CLIENT_ERROR_JFTP_MODE_BINARY="JFTP: :_mode: Bad response. Server response: %s [Expected: 200]. Mode sent: Binary."
+JLIB_CLIENT_ERROR_JFTP_MODE_ASCII="JFTP: :_mode: Bad response. Server response: %s [Expected: 200]. Mode sent: Ascii."
+JLIB_CLIENT_ERROR_HELPER_SETCREDENTIALSFROMREQUEST_FAILED="Looks like User's credentials are no good."
+JLIB_CLIENT_ERROR_LDAP_ADDRESS_NOT_AVAILABLE="Address not available."
+
+JLIB_CMS_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank title."
+
+JLIB_DATABASE_ERROR_ADAPTER_MYSQL="The MySQL adapter 'mysql' is not available."
+JLIB_DATABASE_ERROR_ADAPTER_MYSQLI="The MySQL adapter 'mysqli' is not available."
+JLIB_DATABASE_ERROR_BIND_FAILED_INVALID_SOURCE_ARGUMENT="%s: :bind failed. Invalid source argument."
+JLIB_DATABASE_ERROR_ARTICLE_UNIQUE_ALIAS="Another article from this category has the same alias (remember it may be a trashed item)."
+JLIB_DATABASE_ERROR_CATEGORY_UNIQUE_ALIAS="Another category with the same parent category has the same alias (remember it may be a trashed item)."
+JLIB_DATABASE_ERROR_CHECK_FAILED="%s: :check Failed - %s"
+JLIB_DATABASE_ERROR_CHECKIN_FAILED="%s: :check-in failed - %s"
+JLIB_DATABASE_ERROR_CHECKOUT_FAILED="%s: :check-out failed - %s"
+JLIB_DATABASE_ERROR_CHILD_ROWS_CHECKED_OUT="Child rows checked out."
+JLIB_DATABASE_ERROR_CLASS_DOES_NOT_SUPPORT_ORDERING="%s does not support ordering."
+JLIB_DATABASE_ERROR_CLASS_IS_MISSING_FIELD="Missing field in the database: %s &#160; %s."
+JLIB_DATABASE_ERROR_CLASS_NOT_FOUND_IN_FILE="Table class %s not found in file."
+JLIB_DATABASE_ERROR_CONNECT_DATABASE="Unable to connect to the Database: %s"
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL."
+JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database."
+JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED="MySQL Database Upgrade failed. Please check the <a href="_QQ_"index.php?option=com_installer&view=database"_QQ_">Database Fixer</a>."
+JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Can't delete category."
+JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s"
+JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories can't be deleted."
+JLIB_DATABASE_ERROR_EMAIL_INUSE="This email address is already registered."
+JLIB_DATABASE_ERROR_EMPTY_ROW_RETURNED="The database row is empty."
+JLIB_DATABASE_ERROR_FUNCTION_FAILED="DB function failed with error number %s <br /><span style="_QQ_"color: red;"_QQ_">%s</span>"
+JLIB_DATABASE_ERROR_GET_NEXT_ORDER_FAILED="%s: :getNextOrder failed - %s"
+JLIB_DATABASE_ERROR_GET_TREE_FAILED="%s: :getTree Failed - %s"
+JLIB_DATABASE_ERROR_GETNODE_FAILED="%s: :_getNode Failed - %s"
+JLIB_DATABASE_ERROR_GETROOTID_FAILED="%s: :getRootId Failed - %s"
+JLIB_DATABASE_ERROR_HIT_FAILED="%s: :hit failed - %s"
+JLIB_DATABASE_ERROR_INVALID_LOCATION="%s: :setLocation - Invalid location."
+JLIB_DATABASE_ERROR_INVALID_NODE_RECURSION="%s: :move Failed - Can't move the node to be a child of itself."
+JLIB_DATABASE_ERROR_INVALID_PARENT_ID="Invalid parent ID."
+JLIB_DATABASE_ERROR_LANGUAGE_NO_TITLE="The language should have a title."
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE="A content language already exists with this Image."
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_LANG_CODE="A content language already exists with this Language Tag."
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_SEF="A content language already exists with this URL Language Code."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
+JLIB_DATABASE_ERROR_MENUTYPE="Some menu items or some menu modules related to this menutype are checked out by another user or the default menu item is in this menu."
+JLIB_DATABASE_ERROR_MENUTYPE_CHECKOUT="The user checking out does not match the user who checked out this menu and/or its linked menu module."
+JLIB_DATABASE_ERROR_MENUTYPE_EMPTY="Menu type empty."
+JLIB_DATABASE_ERROR_MENUTYPE_EXISTS="Menu type exists: %s"
+JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT="The Language parameter for this menu item must be set to 'All'. At least one Default menu item must have Language set to All, even if the site is multilingual."
+JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT_DEFAULT="At least one menu item has to be set as Default."
+JLIB_DATABASE_ERROR_MENU_UNPUBLISH_DEFAULT_HOME="Can't unpublish default home."
+JLIB_DATABASE_ERROR_MENU_DEFAULT_CHECKIN_USER_MISMATCH="The current home menu for this language is checked out."
+JLIB_DATABASE_ERROR_MENU_UNIQUE_ALIAS="The alias <strong>%1$s</strong> is already being used by <strong>%2$s</strong> menu item in the <strong>%3$s</strong> menu (remember it may be a trashed item)."
+JLIB_DATABASE_ERROR_MENU_UNIQUE_ALIAS_ROOT="Another menu item has the same alias in Root (remember it may be a trashed item). Root is the top level parent."
+JLIB_DATABASE_ERROR_MENU_HOME_NOT_COMPONENT="The home menu item must be a component."
+JLIB_DATABASE_ERROR_MENU_HOME_NOT_UNIQUE_IN_MENU="A menu should have only one Default home."
+JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_COMPONENT="A first level menu item alias can't be 'component'."
+JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_FOLDER="A first level menu item alias can't be '%s' because '%s' is a sub-folder of your joomla installation folder."
+JLIB_DATABASE_ERROR_MOVE_FAILED="%s: :move failed - %s"
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_CATEGORY="Category must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_EXTENSION="Extension must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MENUITEM="Menu Item must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MODULE="Module must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_UPDATESITE="Update site must have a title."
+JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED="%s can't be negative."
+JLIB_DATABASE_ERROR_NO_ROWS_SELECTED="No rows selected."
+JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND="Table %s not supported. File not found."
+JLIB_DATABASE_ERROR_NULL_PRIMARY_KEY="Null primary key not allowed."
+JLIB_DATABASE_ERROR_ORDERDOWN_FAILED="%s: :orderDown Failed - %s"
+JLIB_DATABASE_ERROR_ORDERUP_FAILED="%s: :orderUp Failed - %s"
+JLIB_DATABASE_ERROR_PLEASE_ENTER_A_USER_NAME="Please enter a username."
+JLIB_DATABASE_ERROR_PLEASE_ENTER_YOUR_NAME="Please enter your name."
+JLIB_DATABASE_ERROR_PUBLISH_FAILED="%s: :publish failed - %s"
+JLIB_DATABASE_ERROR_REBUILD_FAILED="%s: :rebuild Failed - %s"
+JLIB_DATABASE_ERROR_REBUILDPATH_FAILED="%s: :rebuildPath Failed - %s"
+JLIB_DATABASE_ERROR_REORDER_FAILED="%s: :reorder failed - %s"
+JLIB_DATABASE_ERROR_REORDER_UPDATE_ROW_FAILED="%s: :reorder update the row %s failed - %s"
+JLIB_DATABASE_ERROR_ROOT_NODE_NOT_FOUND="Root node not found."
+JLIB_DATABASE_ERROR_STORE_FAILED_UPDATE_ASSET_ID="The asset_id field could not be updated."
+JLIB_DATABASE_ERROR_STORE_FAILED="%1$s: :store failed<br />%2$s"
+JLIB_DATABASE_ERROR_USERGROUP_TITLE="User group must have a title."
+JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS="User group title already exists. Title must be unique with the same parent."
+JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS="Level with the name &quot;%s&quot; already exists."
+JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Can't use this username."
+JLIB_DATABASE_ERROR_USERNAME_INUSE="Username in use."
+JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters and must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) &."
+JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid email address."
+JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title."
+JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors."
+JLIB_DATABASE_QUERY_FAILED="Database query failed (error # %s): %s"
+
+JLIB_DOCUMENT_ERROR_UNABLE_LOAD_DOC_CLASS="Unable to load document class."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Your session has expired. Please log in again."
+JLIB_ENVIRONMENT_SESSION_INVALID="Invalid session cookie. Please check that you have cookies enabled in your web browser."
+JLIB_ERROR_COMPONENTS_ACL_CONFIGURATION_FILE_MISSING_OR_IMPROPERLY_STRUCTURED="The %s component's ACL configuration file is either missing or improperly structured."
+JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError."
+JLIB_EVENT_ERROR_DISPATCHER="JEventDispatcher: :register: Event handler not recognised. Handler: %s"
+JLIB_FILESYSTEM_BZIP_NOT_SUPPORTED="BZip2 Not Supported."
+JLIB_FILESYSTEM_BZIP_UNABLE_TO_READ="Unable to read archive (bz2)."
+JLIB_FILESYSTEM_BZIP_UNABLE_TO_WRITE="Unable to write archive (bz2)."
+JLIB_FILESYSTEM_BZIP_UNABLE_TO_WRITE_FILE="Unable to write file (bz2)."
+JLIB_FILESYSTEM_GZIP_NOT_SUPPORTED="GZlib Not Supported."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_READ="Unable to read archive (gz)."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_WRITE="Unable to write archive (gz)."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_WRITE_FILE="Unable to write file (gz)."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_DECOMPRESS="Unable to decompress data."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_READ="Unable to read archive (tar)."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_DECOMPRESS="Unable to decompress data."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_CREATE_DESTINATION="Unable to create destination."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_WRITE_ENTRY="Unable to write entry."
+JLIB_FILESYSTEM_ZIP_NOT_SUPPORTED="Zlib Not Supported."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_READ="Unable to read archive (zip)."
+JLIB_FILESYSTEM_ZIP_INFO_FAILED="Get ZIP Information failed."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_CREATE_DESTINATION="Unable to create destination."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_WRITE_ENTRY="Unable to write entry."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_READ_ENTRY="Unable to read entry."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_OPEN_ARCHIVE="Unable to open archive."
+JLIB_FILESYSTEM_ZIP_INVALID_ZIP_DATA="Invalid ZIP data."
+JLIB_FILESYSTEM_STREAM_FAILED="Failed to register string stream."
+JLIB_FILESYSTEM_UNKNOWNARCHIVETYPE="Unknown Archive type."
+JLIB_FILESYSTEM_UNABLE_TO_LOAD_ARCHIVE="Unable to load archive."
+JLIB_FILESYSTEM_ERROR_JFILE_FIND_COPY="JFile: :copy: Can't find or read file: %s"
+JLIB_FILESYSTEM_ERROR_JFILE_STREAMS="JFile: :copy(%1$s, %2$s): %3$s"
+JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed."
+JLIB_FILESYSTEM_ERROR_COPY_FAILED_ERR01="Copy failed: %1$s to %2$s"
+JLIB_FILESYSTEM_DELETE_FAILED="Failed deleting %s"
+JLIB_FILESYSTEM_CANNOT_FIND_SOURCE_FILE="Can't find source file."
+JLIB_FILESYSTEM_ERROR_JFILE_MOVE_STREAMS="JFile: :move: %s"
+JLIB_FILESYSTEM_ERROR_RENAME_FILE="Rename failed."
+JLIB_FILESYSTEM_ERROR_READ_UNABLE_TO_OPEN_FILE="JFile: :read: Unable to open file: %s"
+JLIB_FILESYSTEM_ERROR_WRITE_STREAMS="JFile: :write(%1$s): %2$s"
+JLIB_FILESYSTEM_ERROR_UPLOAD="JFile: :upload: %s"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR01="Warning: Failed to change file permissions!"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR02="Warning: Failed to move file!"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR03="Warning: File %s not uploaded for security reasons!"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR04="Warning: Failed to move file: %1$s to %2$s"
+JLIB_FILESYSTEM_ERROR_FIND_SOURCE_FOLDER="Can't find source folder."
+JLIB_FILESYSTEM_ERROR_FOLDER_EXISTS="Folder already exists."
+JLIB_FILESYSTEM_ERROR_FOLDER_CREATE="Unable to create target folder."
+JLIB_FILESYSTEM_ERROR_FOLDER_OPEN="Unable to open source folder."
+JLIB_FILESYSTEM_ERROR_FOLDER_LOOP="Infinite loop detected."
+JLIB_FILESYSTEM_ERROR_FOLDER_PATH="Path not in open_basedir paths."
+JLIB_FILESYSTEM_ERROR_COULD_NOT_CREATE_DIRECTORY="Could not create folder."
+JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY="You can't delete a base folder."
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :delete: Path is not a folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_FOLDER_DELETE="JFolder: :delete: Could not delete folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_FOLDER_RENAME="Rename failed: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Path is not a folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FOLDER="JFolder: :folder: Path is not a folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_STREAMS_FILE_SIZE="Failed to get file size. This may not work for all streams!"
+JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN="File not open."
+JLIB_FILESYSTEM_ERROR_STREAMS_FILENAME="File name not set."
+JLIB_FILESYSTEM_ERROR_NO_DATA_WRITTEN="Warning: No data written."
+JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_WRITER="Failed to open writer: %s"
+JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_READER="Failed to open reader: %s"
+JLIB_FILESYSTEM_ERROR_STREAMS_NOT_UPLOADED_FILE="Not an uploaded file!"
+
+JLIB_FILTER_PARAMS_ALNUM="Alpha Numeric"
+JLIB_FILTER_PARAMS_FLOAT="Float"
+JLIB_FILTER_PARAMS_INTEGER="Integer"
+JLIB_FILTER_PARAMS_RAW="Raw"
+JLIB_FILTER_PARAMS_SAFEHTML="Safe HTML"
+JLIB_FILTER_PARAMS_TEL="Telephone"
+JLIB_FILTER_PARAMS_TEXT="Text"
+
+JLIB_FORM_BUTTON_CLEAR="Clear"
+JLIB_FORM_BUTTON_SELECT="Select"
+JLIB_FORM_CHANGE_IMAGE="Change Image"
+JLIB_FORM_CHANGE_IMAGE_BUTTON="Change Image Button"
+JLIB_FORM_CHANGE_USER="Select User"
+JLIB_FORM_ERROR_FIELDS_CATEGORY_ERROR_EXTENSION_EMPTY="Extension attribute is empty in the category field."
+JLIB_FORM_ERROR_FIELDS_GROUPEDLIST_ELEMENT_NAME="Unknown element type: %s"
+JLIB_FORM_ERROR_NO_DATA="No data."
+JLIB_FORM_ERROR_VALIDATE_FIELD="Invalid xml field."
+JLIB_FORM_ERROR_XML_FILE_DID_NOT_LOAD="XML file did not load."
+JLIB_FORM_FIELD_INVALID="Invalid field:&#160"
+JLIB_FORM_INPUTMODE="latin"
+JLIB_FORM_INVALID_FORM_OBJECT="Invalid Form Object: :%s"
+JLIB_FORM_INVALID_FORM_RULE="Invalid Form Rule: :%s"
+JLIB_FORM_MEDIA_PREVIEW_ALT="Selected image."
+JLIB_FORM_MEDIA_PREVIEW_EMPTY="No image selected."
+JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE="Selected image."
+JLIB_FORM_MEDIA_PREVIEW_TIP_TITLE="Preview"
+JLIB_FORM_SELECT_USER="Select a User"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
+JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s"
+JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING="Invalid URL: URL schema is missing in %1$s. Please add one of the following at the beginning: %2$s."
+JLIB_FORM_VALUE_CACHE_APC="Alternative PHP Cache"
+JLIB_FORM_VALUE_CACHE_APCU="APC User Cache"
+JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite"
+JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator"
+JLIB_FORM_VALUE_CACHE_FILE="File"
+JLIB_FORM_VALUE_CACHE_MEMCACHE="Memcache"
+JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)"
+JLIB_FORM_VALUE_CACHE_REDIS="Redis"
+JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache"
+JLIB_FORM_VALUE_CACHE_XCACHE="XCache"
+JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache"
+JLIB_FORM_VALUE_SESSION_DATABASE="Database"
+JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator"
+JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache"
+JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)"
+JLIB_FORM_VALUE_SESSION_NONE="PHP"
+JLIB_FORM_VALUE_SESSION_REDIS="Redis"
+JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache"
+JLIB_FORM_VALUE_SESSION_XCACHE="XCache"
+JLIB_FORM_VALUE_TIMEZONE_UTC="Universal Time, Coordinated (UTC)"
+JLIB_FORM_VALUE_FROM_TEMPLATE="From Template"
+JLIB_FORM_VALUE_INHERITED="Inherited"
+
+JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_ACL="ACL"
+JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_TABLE="Table"
+JLIB_HTML_ACCESS_SUMMARY_DESC_CAPTION="ACL Summary Table"
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this article. Select the tabs above to customise these settings by action."
+JLIB_HTML_ACCESS_SUMMARY="Summary."
+JLIB_HTML_ADD_TO_ROOT="Add to root."
+JLIB_HTML_ADD_TO_THIS_MENU="Add to this menu."
+JLIB_HTML_BATCH_ACCESS_LABEL="Set Access Level"
+JLIB_HTML_BATCH_ACCESS_LABEL_DESC="Not making a selection will keep the original access levels when processing."
+JLIB_HTML_BATCH_COPY="Copy"
+JLIB_HTML_BATCH_FLIPORDERING_LABEL="Reverse the ordering of all articles in the selected categories"
+JLIB_HTML_BATCH_LANGUAGE_LABEL="Set Language"
+JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC="Not making a selection will keep the original language when processing."
+JLIB_HTML_BATCH_LANGUAGE_NOCHANGE="- Keep original Language -"
+JLIB_HTML_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
+JLIB_HTML_BATCH_MOVE="Move"
+JLIB_HTML_BATCH_MOVE_QUESTION="Do you want to move the items or make a copy of them?"
+JLIB_HTML_BATCH_NO_CATEGORY="- Don't move or copy -"
+JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -"
+JLIB_HTML_BATCH_TAG_LABEL="Add Tag"
+JLIB_HTML_BATCH_TAG_LABEL_DESC="Add a tag to selected items."
+JLIB_HTML_BATCH_TAG_NOCHANGE="- Keep original Tags -"
+JLIB_HTML_BATCH_USER_LABEL="Set User."
+JLIB_HTML_BATCH_USER_LABEL_DESC="Not making a selection will keep the original user when processing."
+JLIB_HTML_BATCH_USER_NOCHANGE="- Keep original User -"
+JLIB_HTML_BATCH_USER_NOUSER="No User."
+JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar"
+JLIB_HTML_BEHAVIOR_CLOSE="Close"
+JLIB_HTML_BEHAVIOR_DATE_SELECTION="Date selection:\n"
+JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST="Display %s first"
+JLIB_HTML_BEHAVIOR_DRAG_TO_MOVE="Drag to move."
+JLIB_HTML_BEHAVIOR_GO_TODAY="Go to today"
+JLIB_HTML_BEHAVIOR_GREEN="Green"
+JLIB_HTML_BEHAVIOR_HOLD_MOUSE="- Hold mouse button on any of the buttons above for faster selection."
+JLIB_HTML_BEHAVIOR_MONTH_SELECT="- Use the < and > buttons to select month\n"
+JLIB_HTML_BEHAVIOR_NEXT_MONTH_HOLD_FOR_MENU="Select to move to the next month. Select and hold for a list of the months."
+JLIB_HTML_BEHAVIOR_NEXT_YEAR_HOLD_FOR_MENU="Select to move to the next year. Select and hold for a list of years."
+JLIB_HTML_BEHAVIOR_OPEN_CALENDAR="Open the calendar"
+JLIB_HTML_BEHAVIOR_PREV_MONTH_HOLD_FOR_MENU="Select to move to the previous month. Select and hold for a list of the months."
+JLIB_HTML_BEHAVIOR_PREV_YEAR_HOLD_FOR_MENU="Select to move to the previous year. Select and hold for a list of years."
+JLIB_HTML_BEHAVIOR_SELECT_DATE="Select a date."
+JLIB_HTML_BEHAVIOR_SHIFT_CLICK_OR_DRAG_TO_CHANGE_VALUE="(Shift-)Select or Drag to change the value."
+JLIB_HTML_BEHAVIOR_TIME="Time:"
+JLIB_HTML_BEHAVIOR_TODAY="Today"
+JLIB_HTML_BEHAVIOR_TT_DATE_FORMAT="%a, %b %e"
+JLIB_HTML_BEHAVIOR_WK="wk"
+JLIB_HTML_BEHAVIOR_YEAR_SELECT="- Use the « and » buttons to select year\n"
+JLIB_HTML_BUTTON_BASE_CLASS="Could not load button base class."
+JLIB_HTML_BUTTON_NO_LOAD="Could not load button %s (%s);"
+JLIB_HTML_BUTTON_NOT_DEFINED="Button not defined for type = %s"
+JLIB_HTML_CALENDAR="Calendar"
+JLIB_HTML_CHECKED_OUT="Checked out"
+JLIB_HTML_CHECKIN="Check-in"
+JLIB_HTML_CLOAKING="This email address is being protected from spambots. You need JavaScript enabled to view it."
+JLIB_HTML_DATE_RELATIVE_DAYS="%s days ago."
+JLIB_HTML_DATE_RELATIVE_DAYS_1="%s day ago."
+JLIB_HTML_DATE_RELATIVE_DAYS_0="%s days ago."
+JLIB_HTML_DATE_RELATIVE_HOURS="%s hours ago."
+JLIB_HTML_DATE_RELATIVE_HOURS_1="%s hour ago."
+JLIB_HTML_DATE_RELATIVE_HOURS_0="%s hours ago."
+JLIB_HTML_DATE_RELATIVE_LESSTHANAMINUTE="Less than a minute ago."
+JLIB_HTML_DATE_RELATIVE_MINUTES="%s minutes ago."
+JLIB_HTML_DATE_RELATIVE_MINUTES_1="%s minute ago."
+JLIB_HTML_DATE_RELATIVE_MINUTES_0="%s minutes ago."
+JLIB_HTML_DATE_RELATIVE_WEEKS="%s weeks ago."
+JLIB_HTML_DATE_RELATIVE_WEEKS_1="%s week ago."
+JLIB_HTML_DATE_RELATIVE_WEEKS_0="%s weeks ago."
+JLIB_HTML_EDIT_MENU_ITEM="Edit menu item."
+JLIB_HTML_EDIT_MENU_ITEM_ID="Item ID: %s"
+JLIB_HTML_EDIT_MODULE="Edit module"
+JLIB_HTML_EDIT_MODULE_IN_POSITION="Position: %s"
+JLIB_HTML_EDITOR_CANNOT_LOAD="Can't load the editor."
+JLIB_HTML_END="End"
+JLIB_HTML_ERROR_FUNCTION_NOT_SUPPORTED="Function not supported."
+JLIB_HTML_ERROR_NOTFOUNDINFILE="%s: :%s not found in file."
+JLIB_HTML_ERROR_NOTSUPPORTED_NOFILE="%s: :%s not supported. File not found."
+JLIB_HTML_ERROR_NOTSUPPORTED="%s: :%s not supported."
+JLIB_HTML_GOTO_PAGE="Go to page %s"
+JLIB_HTML_GOTO_POSITION="Go to %s page"
+JLIB_HTML_MOVE_DOWN="Move Down"
+JLIB_HTML_MOVE_UP="Move Up"
+JLIB_HTML_NO_PARAMETERS_FOR_THIS_ITEM="There are no parameters for this item."
+JLIB_HTML_NO_RECORDS_FOUND="No records found."
+JLIB_HTML_PAGE_CURRENT="Page %s"
+JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s"
+JLIB_HTML_PAGINATION="Pagination"
+JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list."
+JLIB_HTML_PUBLISH_ITEM="Publish Item"
+JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired."
+JLIB_HTML_PUBLISHED_FINISHED="Finish: %s"
+JLIB_HTML_PUBLISHED_ITEM="Published and is Current."
+JLIB_HTML_PUBLISHED_PENDING_ITEM="Published, but is Pending."
+JLIB_HTML_PUBLISHED_START="Start: %s"
+JLIB_HTML_RESULTS_OF="Results %s - %s of %s"
+JLIB_HTML_SAVE_ORDER="Save Order"
+JLIB_HTML_SELECT_STATE="Select State"
+JLIB_HTML_START="Start"
+JLIB_HTML_UNPUBLISH_ITEM="Unpublish Item"
+JLIB_HTML_VIEW_ALL="View All"
+JLIB_HTML_SETDEFAULT_ITEM="Set default"
+JLIB_HTML_UNSETDEFAULT_ITEM="Unset default"
+
+JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT_ALREADYINSTALLED="Extension is already installed."
+JLIB_INSTALLER_ABORT_ALREADY_EXISTS="Extension %1$s: Extension %2$s already exists."
+JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED="Error building Administrator Menus."
+JLIB_INSTALLER_ABORT_COMP_COPY_MANIFEST="Component %1$s: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_COMP_COPY_SETUP="Component %1$s: Could not copy setup file."
+JLIB_INSTALLER_ABORT_COMP_FAIL_ADMIN_FILES="Component %s: Failed to copy administrator files."
+JLIB_INSTALLER_ABORT_COMP_FAIL_SITE_FILES="Component %s: Failed to copy site files."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_COPY_SETUP="Component Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_CUSTOM_INSTALL_FAILURE="Component Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_MANIFEST="Component Install: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_PHP_INSTALL="Component Install: Could not copy PHP install file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_PHP_UNINSTALL="Component Install: Could not copy PHP uninstall file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_ROLLBACK="Component Install: %s"
+JLIB_INSTALLER_ABORT_COMP_INSTALL_SQL_ERROR="Component Install: SQL error file %s"
+JLIB_INSTALLER_ABORT_COMP_UPDATESITEMENUS_FAILED="Component Install: Failed to update menu items."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_ADMIN_ELEMENT="Component Update: The XML file did not have an administration element."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_COPY_SETUP="Component Update: Could not copy setup file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_MANIFEST="Component Update: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_PHP_INSTALL="Component Update: Could not copy PHP install file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_PHP_UNINSTALL="Component Update: Could not copy PHP uninstall file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_ROLLBACK="Component Update: %s"
+JLIB_INSTALLER_ABORT_COMP_UPDATE_SQL_ERROR="Component Update: SQL error file %s"
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder: %2$s"
+JLIB_INSTALLER_ABORT_DEBUG="Installation unexpectedly stopped:"
+JLIB_INSTALLER_ABORT_DETECTMANIFEST="Unable to detect manifest file."
+JLIB_INSTALLER_ABORT_DIRECTORY="Extension %1$s: Another %2$s is already using the named folder: %3$s. Are you trying to install the same extension again?"
+JLIB_INSTALLER_ABORT_ERROR_DELETING_EXTENSIONS_RECORD="Could not delete the extension's record from the database."
+JLIB_INSTALLER_ABORT_EXTENSIONNOTVALID="Extension is not valid."
+JLIB_INSTALLER_ABORT_FILE_INSTALL_COPY_SETUP="Files Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_FILE_INSTALL_CUSTOM_INSTALL_FAILURE="Files Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_FILE_INSTALL_FAIL_SOURCE_DIRECTORY="Files Install: Failed to find source folder: %s"
+JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK="Files Install: %s"
+JLIB_INSTALLER_ABORT_FILE_INSTALL_SQL_ERROR="Files %1$s: SQL error file %2$s"
+JLIB_INSTALLER_ABORT_FILE_ROLLBACK="Files Install: %s"
+JLIB_INSTALLER_ABORT_FILE_SAME_NAME="Files Install: Another extension with same name already exists."
+JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR="Files Update: SQL error file %s"
+JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE="Extension %s: Custom install routine failure."
+JLIB_INSTALLER_ABORT_LIB_COPY_FILES="Library %s: Could not copy files from the source."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED="Library Install: Library already installed."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_COPY_SETUP="Library Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_FAILED_TO_CREATE_DIRECTORY="Library Install: Failed to create folder: %s"
+JLIB_INSTALLER_ABORT_LIB_INSTALL_NOFILE="Library Install: No library file specified."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_ROLLBACK="Library Install: %s"
+JLIB_INSTALLER_ABORT_LOAD_DETAILS="Failed to load extension details."
+JLIB_INSTALLER_ABORT_MANIFEST="Extension %1$s: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_METHODNOTSUPPORTED="Method not supported for this extension type."
+JLIB_INSTALLER_ABORT_METHODNOTSUPPORTED_TYPE="Method not supported for this extension type: %s"
+JLIB_INSTALLER_ABORT_MOD_COPY_FILES="Module %s: Could not copy files from the source."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_COPY_SETUP="Module Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_CREATE_DIRECTORY="Module %1$s: Failed to create folder: %2$s"
+JLIB_INSTALLER_ABORT_MOD_INSTALL_CUSTOM_INSTALL_FAILURE="Module Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_DIRECTORY="Module %1$s: Another module is already using folder: %2$s"
+JLIB_INSTALLER_ABORT_MOD_INSTALL_MANIFEST="Module Install: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_NOFILE="Module %s: No module file specified."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_SQL_ERROR="Module %1$s: SQL error file %2$s"
+JLIB_INSTALLER_ABORT_MOD_ROLLBACK="Module %1$s: %2$s"
+JLIB_INSTALLER_ABORT_MOD_UNINSTALL_UNKNOWN_CLIENT="Module Uninstall: Unknown client type [%s]"
+JLIB_INSTALLER_ABORT_MOD_UNKNOWN_CLIENT="Module %1$s: Unknown client type [%2$s]"
+JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist."
+JLIB_INSTALLER_ABORT_NOUPDATEPATH="Update path does not exist."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_COPY_SETUP="Package Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_CREATE_DIRECTORY="Package Install: Failed to create folder: %s."
+JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_CUSTOM_INSTALL_FAILURE="Package Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_MANIFEST="Installation failed: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Package %s: There were no files to install!"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_PACK="Package %s: No package file specified."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ROLLBACK="Package Install: %s"
+JLIB_INSTALLER_ABORT_PLG_COPY_FILES="Plugin %s: Could not copy files from the source."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_ALLREADY_EXISTS="Plugin %1$s: Plugin %2$s already exists."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_COPY_SETUP="Plugin %s: Could not copy setup file."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_CREATE_DIRECTORY="Plugin %1$s: Failed to create folder: %2$s"
+JLIB_INSTALLER_ABORT_PLG_INSTALL_CUSTOM_INSTALL_FAILURE="Plugin Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_DIRECTORY="Plugin %1$s: Another plugin is already using folder: %2$s"
+JLIB_INSTALLER_ABORT_PLG_INSTALL_MANIFEST="Plugin %s: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_NO_FILE="Plugin %s: No plugin file specified."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_ROLLBACK="Plugin %1$s: %2$s"
+JLIB_INSTALLER_ABORT_PLG_INSTALL_SQL_ERROR="Plugin %1$s: SQL error file %2$s"
+JLIB_INSTALLER_ABORT_PLG_UNINSTALL_SQL_ERROR="Plugin Uninstall: SQL error file %s"
+JLIB_INSTALLER_ABORT_REFRESH_MANIFEST_CACHE="Refresh Manifest Cache failed: %s Extension is not currently installed."
+JLIB_INSTALLER_ABORT_REFRESH_MANIFEST_CACHE_VALID="Refresh Manifest Cache failed: Extension is not valid."
+JLIB_INSTALLER_ABORT_ROLLBACK="Extension %1$s: %2$s"
+JLIB_INSTALLER_ABORT_SQL_ERROR="Extension %1$s: SQL error processing query: %2$s"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_ALREADY_INSTALLED="Template Install: Template already installed."
+JLIB_INSTALLER_ABORT_TPL_INSTALL_ANOTHER_TEMPLATE_USING_DIRECTORY="Template Install: There is already a Template using the named folder: %s. Are you trying to install the same template again?"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_FILES="Template Install: Could not copy files from the %s source."
+JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_SETUP="Template Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_TPL_INSTALL_FAILED_CREATE_DIRECTORY="Template Install: Failed to create folder: %s"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK="Template Install: %s"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT="Template Install: Unknown client type [%s]"
+JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION="For the extension %1$s version %2$s is available, but it requires at least PHP version %3$s while your system only has %4$s"
+JLIB_INSTALLER_AVAILABLE_UPDATE_DB_MINIMUM="For the extension %1$s version %2$s is available, but your current database %3$s is version %4$s and is not supported. Please contact your web host to update your Database version to at least version %5$s."
+JLIB_INSTALLER_AVAILABLE_UPDATE_DB_TYPE="For the extension %1$s version %2$s is available, but your current database %3$s is not supported anymore."
+JLIB_INSTALLER_PURGED_UPDATES="Cleared updates"
+JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES="Failed to clear updates."
+JLIB_INSTALLER_DEFAULT_STYLE="%s - Default"
+JLIB_INSTALLER_DISCOVER="Discover"
+JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE="The %s extension is part of a package which does not allow individual extensions to be uninstalled."
+JLIB_INSTALLER_ERROR_COMP_DISCOVER_STORE_DETAILS="Component Discover install: Failed to store component details."
+JLIB_INSTALLER_ERROR_COMP_FAILED_TO_CREATE_DIRECTORY="Component %1$s: Failed to create folder: %2$s."
+JLIB_INSTALLER_ERROR_COMP_INSTALL_ADMIN_ELEMENT="Component Install: The XML file did not have an administration element."
+JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_ADMIN="Component Install: Another component is already using folder: %s"
+JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_SITE="Component Install: Another component is already using folder: %s"
+JLIB_INSTALLER_ERROR_COMP_INSTALL_FAILED_TO_CREATE_DIRECTORY_ADMIN="Component Install: Failed to create administrator folder: %s"
+JLIB_INSTALLER_ERROR_COMP_INSTALL_FAILED_TO_CREATE_DIRECTORY_SITE="Component Install: Failed to create site folder: %s"
+JLIB_INSTALLER_ERROR_COMP_REFRESH_MANIFEST_CACHE="Component Refresh manifest cache: Failed to store component details."
+JLIB_INSTALLER_ERROR_COMP_REMOVING_ADMIN_MENUS_FAILED="Could not delete the Administrator menus."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_CUSTOM="Component Uninstall: Custom Uninstall script unsuccessful."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_DELETE_CATEGORIES="Component Uninstall: Unable to delete the component categories."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_ERRORREMOVEMANUALLY="Component Uninstall: Can't uninstall. Please remove manually."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_ERRORUNKOWNEXTENSION="Component Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_ADMIN="Component Uninstall: Unable to remove the component administrator folder."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_SITE="Component Uninstall: Unable to remove the component site folder."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_NO_OPTION="Component Uninstall: Option field empty, can't remove files."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_SQL_ERROR="Component Uninstall: SQL error file %s"
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_WARNCORECOMPONENT="Component Uninstall: Trying to uninstall a core component."
+JLIB_INSTALLER_ERROR_COMP_UPDATE_FAILED_TO_CREATE_DIRECTORY_ADMIN="Component Update: Failed to create administrator folder: %s"
+JLIB_INSTALLER_ERROR_COMP_UPDATE_FAILED_TO_CREATE_DIRECTORY_SITE="Component Update: Failed to create site folder: %s"
+JLIB_INSTALLER_ERROR_CREATE_DIRECTORY="JInstaller: :Install: Failed to create folder: %s"
+JLIB_INSTALLER_ERROR_CREATE_FOLDER_FAILED="Failed to create folder [%s]"
+JLIB_INSTALLER_ERROR_DEPRECATED_FORMAT="Deprecated install format (client="_QQ_"both"_QQ_"), use package installer in future."
+JLIB_INSTALLER_ERROR_DISCOVER_INSTALL_UNSUPPORTED="A %s extension can not be installed using the discover method. Please install this extension from Extension Manager: Install."
+JLIB_INSTALLER_ERROR_DOWNGRADE="Sorry! You cannot downgrade from version %s to %s"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connecting to the server: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FOLDER="JInstaller: :Install: Failed to copy folder %1$s to %2$s"
+JLIB_INSTALLER_ERROR_FAILED_READING_NETWORK_RESOURCES="Failed reading network resource: %s"
+JLIB_INSTALLER_ERROR_FILE_EXISTS="JInstaller: :Install: File already exists %s"
+JLIB_INSTALLER_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_MANIFEST="Files Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Files Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_ENTRY="Files Uninstall: Could not load extension entry."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_MANIFEST="Files Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_SQL_ERROR="Files Uninstall: SQL error file %s"
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_WARNCOREFILE="File Uninstall: Trying to uninstall core files."
+JLIB_INSTALLER_ERROR_FOLDER_IN_USE="Another extension is already using folder [%s]"
+JLIB_INSTALLER_ERROR_LANG_DISCOVER_STORE_DETAILS="Language Discover install: Failed to store language details."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_DEFAULT="This language can't be uninstalled as long as it is defined as a default language."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_DIRECTORY="Language Uninstall: Unable to remove the specified Language folder."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_ELEMENT_EMPTY="Language Uninstall: Element is empty, can't uninstall files."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_PATH_EMPTY="Language Uninstall: Language path is empty, can't uninstall files."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_PROTECTED="This language can't be uninstalled. It is protected in the database (usually en-GB)."
+JLIB_INSTALLER_ERROR_LIB_DISCOVER_STORE_DETAILS="Library Discover install: Failed to store library details."
+JLIB_INSTALLER_ERROR_LIB_REFRESH_MANIFEST_CACHE="Library Refresh manifest cache: Failed to store library details."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_MANIFEST="Library Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Library Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_LOAD_MANIFEST="Library Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_WARNCORELIBRARY="Library Uninstall: Trying to uninstall a core library."
+JLIB_INSTALLER_ERROR_LOAD_XML="JInstaller: :Install: Failed to load XML File: %s"
+JLIB_INSTALLER_ERROR_MOD_DISCOVER_STORE_DETAILS="Module Discover install: Failed to store module details."
+JLIB_INSTALLER_ERROR_MOD_REFRESH_MANIFEST_CACHE="Module Refresh manifest cache: Failed to store module details."
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_ERRORUNKOWNEXTENSION="Module Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_EXCEPTION="Module Uninstall: %s"
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Module Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_SQL_ERROR="Module Uninstall: SQL error file %s"
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_WARNCOREMODULE="Module Uninstall: Trying to uninstall a core module: %s"
+JLIB_INSTALLER_ERROR_NO_CORE_LANGUAGE="No core pack exists for the language [%s]"
+JLIB_INSTALLER_ERROR_NO_FILE="JInstaller: :Install: File does not exist %s"
+JLIB_INSTALLER_ERROR_NO_LANGUAGE_TAG="The package did not specify a language tag. Are you trying to install an old language package?"
+JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE="JInstaller: :Install: Can't find Joomla XML setup file."
+JLIB_INSTALLER_ERROR_NOTFINDXMLSETUPFILE="JInstaller: :Install: Can't find XML setup file."
+JLIB_INSTALLER_ERROR_PACK_REFRESH_MANIFEST_CACHE="Package Refresh manifest cache: Failed to store package details."
+JLIB_INSTALLER_ERROR_PACK_SETTING_PACKAGE_ID="Could not record the package ID for this package's extensions."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_MANIFEST="Package Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Package Uninstall: Manifest file invalid or not found: %s"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_LOAD_MANIFEST="Package Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Errors were detected, manifest file not removed!"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstall properly: %s"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
+JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."
+JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE="Plugin Refresh manifest cache: Failed to store plugin details."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_ERRORUNKOWNEXTENSION="Plugin Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_FOLDER_FIELD_EMPTY="Plugin Uninstall: Folder field empty, can't remove files."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_INVALID_MANIFEST="Plugin Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Plugin Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_LOAD_MANIFEST="Plugin Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_WARNCOREPLUGIN="Plugin Uninstall: Trying to uninstall a core plugin: %s"
+JLIB_INSTALLER_ERROR_SQL_ERROR="JInstaller: :Install: Error SQL %s"
+JLIB_INSTALLER_ERROR_SQL_FILENOTFOUND="JInstaller: :Install: SQL File not found %s"
+JLIB_INSTALLER_ERROR_SQL_READBUFFER="JInstaller: :Install: SQL File Buffer Read Error."
+JLIB_INSTALLER_ERROR_TPL_DISCOVER_STORE_DETAILS="Template Discover install: Failed to store template details."
+JLIB_INSTALLER_ERROR_TPL_REFRESH_MANIFEST_CACHE="Template Refresh manifest cache: Failed to store template details."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_ERRORUNKOWNEXTENSION="Template Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_INVALID_CLIENT="Template Uninstall: Invalid client."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Template Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DEFAULT="Template Uninstall: Can't remove default template."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DIRECTORY="Template Uninstall: Folder does not exist, can't remove files."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_ID_EMPTY="Template Uninstall: Template ID is empty, can't uninstall files."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_WARNCORETEMPLATE="Template Uninstall: Trying to uninstall a core template: %s"
+JLIB_INSTALLER_ERROR_UNKNOWN_CLIENT_TYPE="Unknown Client Type [%s]"
+JLIB_INSTALLER_FILE_ERROR_MOVE="Error on moving file %s"
+JLIB_INSTALLER_INCORRECT_SEQUENCE="Downgrading from version %1$s to version %2$s is not allowed."
+JLIB_INSTALLER_INSTALL="Install"
+JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum Joomla version requirement of J%s"
+JLIB_INSTALLER_MINIMUM_PHP="Your server doesn't meet the minimum PHP version requirement of %s"
+JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users."
+JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for %d user."
+JLIB_INSTALLER_UNINSTALL="Uninstall"
+JLIB_INSTALLER_UPDATE="Update"
+JLIB_INSTALLER_ERROR_EXTENSION_INVALID_CLIENT_IDENTIFIER="Invalid client identifier specified in extension manifest."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
+JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed."
+JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."
+JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s"
+
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
+JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code."
+JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br/><code style="_QQ_"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
+
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE="Could not load %s language XML file from %s."
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA="Could not load %s metadata from %s."
+
+JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent."
+JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
+JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)."
+
+JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
+JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
+JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
+JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
+JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
+JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
+JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
+JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
+JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
+
+JLIB_MENUS_PRESET_JOOMLA="Preset - Joomla"
+JLIB_MENUS_PRESET_MODERN="Preset - Modern"
+
+JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
+
+JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
+JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class."
+
+JLIB_RULES_ACTION="Action"
+JLIB_RULES_ALLOWED="Allowed"
+JLIB_RULES_ALLOWED_ADMIN="Allowed (Super User)"
+JLIB_RULES_ALLOWED_INHERITED="Allowed (Inherited)"
+JLIB_RULES_CALCULATED_SETTING="Calculated Setting"
+JLIB_RULES_CONFLICT="Conflict"
+JLIB_RULES_DATABASE_FAILURE="Failed storing the data to the database."
+JLIB_RULES_DENIED="Denied"
+JLIB_RULES_GROUP="%s"
+JLIB_RULES_GROUPS="Groups"
+JLIB_RULES_INHERIT="Inherit"
+JLIB_RULES_INHERITED="Inherited"
+JLIB_RULES_NOT_ALLOWED="Not Allowed"
+JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT="Conflict"
+JLIB_RULES_NOT_ALLOWED_DEFAULT="Not Allowed (Default)"
+JLIB_RULES_NOT_ALLOWED_INHERITED="Not Allowed (Inherited)"
+JLIB_RULES_NOT_ALLOWED_LOCKED="Not Allowed (Locked)"
+JLIB_RULES_NOT_SET="Not Set"
+JLIB_RULES_NOTICE_RECALCULATE_GROUP_PERMISSIONS="Super User permissions changed. Save or reload to recalculate this group permissions."
+JLIB_RULES_NOTICE_RECALCULATE_GROUP_CHILDS_PERMISSIONS="Permissions changed in a group with child groups. Save or reload to recalculate the child groups permissions."
+JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server."
+JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions."
+JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group."
+JLIB_RULES_SELECT_SETTING="Select New Setting"
+JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that <em><strong>Denied</strong></em> will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, <em><strong>Deny</strong></em> will take precedence. <em><strong>Not Set</strong></em> is equivalent to <em><strong>Denied</strong></em> but can be changed in child groups, components and content."
+JLIB_RULES_SETTING_NOTES_ITEM="If you change the setting, it will apply to this item. Note that:<br /><em><strong>Inherited</strong></em> means that the permissions from global configuration, parent group and category will be used.<br /><em><strong>Denied</strong></em> means that no matter what the global configuration, parent group or category settings are, the group being edited can't take this action on this item.<br /><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action for this item (but if this is in conflict with the global configuration, parent group or category it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Inherited)</strong></em> under Calculated Settings)."
+JLIB_RULES_SETTINGS_DESC="Manage the permission settings for the user groups below. See notes at the bottom."
+
+JLIB_STEMMER_INVALID_STEMMER="Invalid stemmer type %s"
+
+JLIB_UNKNOWN="Unknown"
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Could not open %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Could not parse %s"
+JLIB_UPDATER_ERROR_EXTENSION_OPEN_URL="Update: :Extension: Could not open %s"
+JLIB_UPDATER_ERROR_EXTENSION_PARSE_URL="Update: :Extension: Could not parse %s"
+JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d &quot;%s&quot;, URL: %s"
+JLIB_USER_ERROR_AUTHENTICATION_FAILED_LOAD_PLUGIN="JAuthentication: :authenticate: Failed to load plugin: %s"
+JLIB_USER_ERROR_AUTHENTICATION_LIBRARIES="JAuthentication: :__construct: Could not load authentication libraries."
+JLIB_USER_ERROR_BIND_ARRAY="Unable to bind array to user object."
+JLIB_USER_ERROR_CANNOT_CHANGE_SUPER_USER="A user is not allowed to change permissions of a Super User group."
+JLIB_USER_ERROR_CANNOT_CHANGE_OWN_GROUPS="A user is not allowed to change permissions of their own group(s)."
+JLIB_USER_ERROR_CANNOT_CHANGE_OWN_PARENT_GROUPS="A user is not allowed to change permissions of their own group(s) parent group(s)."
+JLIB_USER_ERROR_CANNOT_DEMOTE_SELF="You can't remove your own Super User permissions."
+JLIB_USER_ERROR_CANNOT_REUSE_PASSWORD="You can't reuse your current password, please enter a new password."
+JLIB_USER_ERROR_ID_NOT_EXISTS="JUser: :_load: User %s does not exist."
+JLIB_USER_ERROR_NOT_SUPERADMIN="Only users with Super User permissions can change other Super User user accounts."
+JLIB_USER_ERROR_PASSWORD_NOT_MATCH="Passwords do not match. Please re-enter password."
+JLIB_USER_ERROR_UNABLE_TO_FIND_USER="Unable to find a user with given activation string."
+JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="JUser: :_load: Unable to load user with ID: %s"
+JLIB_USER_EXCEPTION_ACCESS_USERGROUP_INVALID="User group does not exist."
+JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Startup Error."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database <br />joomla.library: %1$s - %2$s"
+JLIB_UTIL_ERROR_DOMIT="DommitDocument is deprecated. Use DomDocument instead."
+JLIB_UTIL_ERROR_LOADING_FEED_DATA="Error loading feed data."
+JLIB_UTIL_ERROR_XML_LOAD="Failed loading XML file."
diff --git a/core/administrator/language/en-GB/en-GB.localise.php b/core/administrator/language/en-GB/en-GB.localise.php
new file mode 100644
index 00000000..db62e563
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.localise.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package    Joomla.Language
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * en-GB localise class.
+ *
+ * @since  1.6
+ */
+abstract class En_GBLocalise
+{
+	/**
+	 * Returns the potential suffixes for a specific number of items
+	 *
+	 * @param   integer  $count  The number of items.
+	 *
+	 * @return  array  An array of potential suffixes.
+	 *
+	 * @since   1.6
+	 */
+	public static function getPluralSuffixes($count)
+	{
+		if ($count == 0)
+		{
+			return array('0');
+		}
+		elseif ($count == 1)
+		{
+			return array('1');
+		}
+		else
+		{
+			return array('MORE');
+		}
+	}
+
+	/**
+	 * Returns the ignored search words
+	 *
+	 * @return  array  An array of ignored search words.
+	 *
+	 * @since   1.6
+	 */
+	public static function getIgnoredSearchWords()
+	{
+		return array('and', 'in', 'on');
+	}
+
+	/**
+	 * Returns the lower length limit of search words
+	 *
+	 * @return  integer  The lower length limit of search words.
+	 *
+	 * @since   1.6
+	 */
+	public static function getLowerLimitSearchWord()
+	{
+		return 3;
+	}
+
+	/**
+	 * Returns the upper length limit of search words
+	 *
+	 * @return  integer  The upper length limit of search words.
+	 *
+	 * @since   1.6
+	 */
+	public static function getUpperLimitSearchWord()
+	{
+		return 20;
+	}
+
+	/**
+	 * Returns the number of chars to display when searching
+	 *
+	 * @return  integer  The number of chars to display when searching.
+	 *
+	 * @since   1.6
+	 */
+	public static function getSearchDisplayedCharactersNumber()
+	{
+		return 200;
+	}
+}
diff --git a/core/administrator/language/en-GB/en-GB.mod_custom.ini b/core/administrator/language/en-GB/en-GB.mod_custom.ini
new file mode 100644
index 00000000..273bc50c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_custom.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_CUSTOM="Custom"
+MOD_CUSTOM_FIELD_PREPARE_CONTENT_DESC="Optionally prepare the content with Joomla Content Plugins."
+MOD_CUSTOM_FIELD_PREPARE_CONTENT_LABEL="Prepare Content"
+MOD_CUSTOM_XML_DESCRIPTION="This module allows you to create your own Module using a WYSIWYG editor."
diff --git a/core/administrator/language/en-GB/en-GB.mod_custom.sys.ini b/core/administrator/language/en-GB/en-GB.mod_custom.sys.ini
new file mode 100644
index 00000000..311fe1dc
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_custom.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_CUSTOM="Custom"
+MOD_CUSTOM_XML_DESCRIPTION="This module allows you to create your own Module using a WYSIWYG editor."
+MOD_CUSTOM_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_feed.ini b/core/administrator/language/en-GB/en-GB.mod_feed.ini
new file mode 100644
index 00000000..c0a6019b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_feed.ini
@@ -0,0 +1,26 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_FEED="Feed Display"
+MOD_FEED_ERR_CACHE="Please make cache folder writable."
+MOD_FEED_ERR_NO_URL="No feed URL specified."
+MOD_FEED_ERR_FEED_NOT_RETRIEVED="Feed not found."
+MOD_FEED_FIELD_DESCRIPTION_DESC="Show the description text for the whole Feed."
+MOD_FEED_FIELD_DESCRIPTION_LABEL="Feed Description"
+MOD_FEED_FIELD_IMAGE_DESC="Show the image associated with the whole feed."
+MOD_FEED_FIELD_IMAGE_LABEL="Feed Image"
+MOD_FEED_FIELD_ITEMDESCRIPTION_DESC="Show the Description or Intro text of individual RSS Items."
+MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL="Item Description"
+MOD_FEED_FIELD_ITEMS_DESC="Enter number of RSS items to display."
+MOD_FEED_FIELD_ITEMS_LABEL="Items"
+MOD_FEED_FIELD_RSSTITLE_DESC="Display news feed title."
+MOD_FEED_FIELD_RSSTITLE_LABEL="Feed Title"
+MOD_FEED_FIELD_RSSURL_DESC="Enter the URL of the RSS/RDF/ATOM feed."
+MOD_FEED_FIELD_RSSURL_LABEL="Feed URL"
+MOD_FEED_FIELD_RTL_DESC="Display feed in RTL direction."
+MOD_FEED_FIELD_RTL_LABEL="RTL Feed"
+MOD_FEED_FIELD_WORDCOUNT_DESC="Allows you to limit the amount of visible Item description text. 0 will show all the text."
+MOD_FEED_FIELD_WORDCOUNT_LABEL="Word Count"
+MOD_FEED_XML_DESCRIPTION="This module allows the displaying of a syndicated feed."
diff --git a/core/administrator/language/en-GB/en-GB.mod_feed.sys.ini b/core/administrator/language/en-GB/en-GB.mod_feed.sys.ini
new file mode 100644
index 00000000..56b6f497
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_feed.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_FEED="Feed Display"
+MOD_FEED_XML_DESCRIPTION="This module allows the displaying of a syndicated feed."
+MOD_FEED_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_latest.ini b/core/administrator/language/en-GB/en-GB.mod_latest.ini
new file mode 100644
index 00000000..5da22a71
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_latest.ini
@@ -0,0 +1,61 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LATEST="Articles - Latest"
+MOD_LATEST_CREATED="Created"
+MOD_LATEST_CREATED_BY="Created By"
+MOD_LATEST_FIELD_AUTHORS_DESC="A filter for the authors."
+MOD_LATEST_FIELD_AUTHORS_LABEL="Authors"
+MOD_LATEST_FIELD_CATEGORY_DESC="Select Articles from a specific Category or all Categories."
+MOD_LATEST_FIELD_COUNT_DESC="The number of items to display (default 5)."
+MOD_LATEST_FIELD_COUNT_LABEL="Count"
+MOD_LATEST_FIELD_ORDERING_DESC="Ordering options."
+MOD_LATEST_FIELD_ORDERING_LABEL="Order"
+MOD_LATEST_FIELD_VALUE_AUTHORS_ANYONE="Anyone"
+MOD_LATEST_FIELD_VALUE_AUTHORS_BY_ME="Added or modified by me"
+MOD_LATEST_FIELD_VALUE_AUTHORS_NOT_BY_ME="Not added or modified by me"
+MOD_LATEST_FIELD_VALUE_ORDERING_ADDED="Recently Added First"
+MOD_LATEST_FIELD_VALUE_ORDERING_MODIFIED="Recently Modified First"
+MOD_LATEST_LATEST_ITEMS="Latest Items"
+MOD_LATEST_NO_MATCHING_RESULTS="No Matching Results"
+MOD_LATEST_TITLE="Recently Created Articles"
+MOD_LATEST_TITLE_CREATED="Last Added Articles"
+MOD_LATEST_TITLE_CREATED_1="Last Added Article"
+MOD_LATEST_TITLE_CREATED_MORE="Last %1$s Added Articles"
+MOD_LATEST_TITLE_CREATED_NOT_ME="Last Added Articles Not By Me"
+MOD_LATEST_TITLE_CREATED_NOT_ME_1="Last Added Article Not By Me"
+MOD_LATEST_TITLE_CREATED_NOT_ME_MORE="Last %1$s Added Articles Not By Me"
+MOD_LATEST_TITLE_CREATED_BY_ME="Last Added Articles By Me"
+MOD_LATEST_TITLE_CREATED_BY_ME_1="Last Added Article By Me"
+MOD_LATEST_TITLE_CREATED_BY_ME_MORE="Last %1$s Added Articles By Me"
+MOD_LATEST_TITLE_CREATED_CATEGORY="Last Added Articles (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_1="Last Added Article (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_MORE="Last %1$s Added Articles (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_BY_ME="Last Added Articles By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_BY_ME_1="Last Added Article By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_BY_ME_MORE="Last %1$s Added Articles By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_NOT_ME="Last Added Articles Not By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_NOT_ME_1="Last Added Article Not By Me (%2$s category)"
+MOD_LATEST_TITLE_CREATED_CATEGORY_NOT_ME_MORE="Last %1$s Added Articles Not By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED="Last Modified Articles"
+MOD_LATEST_TITLE_MODIFIED_1="Last Modified Article"
+MOD_LATEST_TITLE_MODIFIED_MORE="Last %1$s Modified Articles"
+MOD_LATEST_TITLE_MODIFIED_BY_ME="Last Modified Articles By Me"
+MOD_LATEST_TITLE_MODIFIED_BY_ME_1="Last Modified Article By Me"
+MOD_LATEST_TITLE_MODIFIED_BY_ME_MORE="Last %1$s Modified Articles By Me"
+MOD_LATEST_TITLE_MODIFIED_NOT_ME="Last Modified Articles Not By Me"
+MOD_LATEST_TITLE_MODIFIED_NOT_ME_1="Last Modified Article Not By Me"
+MOD_LATEST_TITLE_MODIFIED_NOT_ME_MORE="Last %1$s Modified Articles Not By Me"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY="Last Modified Articles (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_1="Last Modified Article (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_MORE="Last %1$s Modified Articles (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_BY_ME="Last Modified Articles By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_BY_ME_1="Last Modified Article By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_BY_ME_MORE="Last %1$s Modified Articles By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_NOT_ME="Last Modified Articles Not By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_NOT_ME_1="Last Modified Article Not By Me (%2$s category)"
+MOD_LATEST_TITLE_MODIFIED_CATEGORY_NOT_ME_MORE="Last %1$s Modified Articles Not By Me (%2$s category)"
+MOD_LATEST_UNEXISTING="<i>Non existent</i>"
+MOD_LATEST_XML_DESCRIPTION="This module shows a list of the most recently created Articles."
diff --git a/core/administrator/language/en-GB/en-GB.mod_latest.sys.ini b/core/administrator/language/en-GB/en-GB.mod_latest.sys.ini
new file mode 100644
index 00000000..e73364c1
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_latest.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+MOD_LATEST="Articles - Latest"
+MOD_LATEST_XML_DESCRIPTION="This module shows a list of the most recently created Articles."
+MOD_LATEST_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_logged.ini b/core/administrator/language/en-GB/en-GB.mod_logged.ini
new file mode 100644
index 00000000..feb38d33
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_logged.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+MOD_LOGGED="Logged-in Users"
+MOD_LOGGED_ADMINISTRATOR="Administrator"
+MOD_LOGGED_EDIT_USER="Edit user"
+MOD_LOGGED_FIELD_COUNT_DESC="The number of items to display (default 5)."
+MOD_LOGGED_FIELD_COUNT_LABEL="Count"
+MOD_LOGGED_FIELD_NAME_DESC="Displays name or username."
+MOD_LOGGED_LAST_ACTIVITY="Last Activity"
+MOD_LOGGED_LOGOUT="Logout"
+MOD_LOGGED_NAME="Name"
+MOD_LOGGED_SITE="Site"
+MOD_LOGGED_TITLE="Last Logged-in Users"
+MOD_LOGGED_TITLE_1="Last Logged-in User"
+MOD_LOGGED_TITLE_MORE="Last %s Logged-in Users"
+MOD_LOGGED_XML_DESCRIPTION="This module shows a list of the Logged-in Users."
diff --git a/core/administrator/language/en-GB/en-GB.mod_logged.sys.ini b/core/administrator/language/en-GB/en-GB.mod_logged.sys.ini
new file mode 100644
index 00000000..da1a8331
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_logged.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+MOD_LOGGED="Logged-in Users"
+MOD_LOGGED_XML_DESCRIPTION="This module shows a list of the Logged-in Users."
+MOD_LOGGED_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_login.ini b/core/administrator/language/en-GB/en-GB.mod_login.ini
new file mode 100644
index 00000000..704896ed
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_login.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LOGIN="Login Form"
+MOD_LOGIN_FIELD_USESECURE_DESC="Submit encrypted login data using HTTPS (encrypted HTTP connections with the https:// protocol prefix). Note, you must have HTTPS enabled on your server to utilise this option."
+MOD_LOGIN_FIELD_USESECURE_LABEL="Encrypt Login Form"
+MOD_LOGIN_LANGUAGE="Language"
+MOD_LOGIN_LOGIN="Log in"
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It should not be unpublished."
+MOD_LOGIN_REMIND="Forgot your username?"
+MOD_LOGIN_RESET="Forgot your password?"
diff --git a/core/administrator/language/en-GB/en-GB.mod_login.sys.ini b/core/administrator/language/en-GB/en-GB.mod_login.sys.ini
new file mode 100644
index 00000000..fc0003ce
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_login.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It can't be unpublished."
+MOD_LOGIN="Login Form"
+MOD_LOGIN_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_menu.ini b/core/administrator/language/en-GB/en-GB.mod_menu.ini
new file mode 100644
index 00000000..df62a579
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_menu.ini
@@ -0,0 +1,109 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MENU="Administrator Menu"
+MOD_MENU_CLEAR_CACHE="Clear Cache"
+MOD_MENU_COMPONENTS="Components"
+MOD_MENU_COM_CONTENT="Content"
+MOD_MENU_COM_CONTENT_ARTICLE_MANAGER="Articles"
+MOD_MENU_COM_CONTENT_CATEGORY_MANAGER="Categories"
+MOD_MENU_COM_CONTENT_FEATURED="Featured Articles"
+MOD_MENU_COM_CONTENT_NEW_ARTICLE="Add New Article"
+MOD_MENU_COM_CONTENT_NEW_CATEGORY="Add New Category"
+MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT="Content Languages"
+MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED="Installed"
+MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES="Overrides"
+MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES="Styles"
+MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES="Templates"
+MOD_MENU_COM_USERS="Users"
+MOD_MENU_COM_USERS_ADD_GROUP="Add New Group"
+MOD_MENU_COM_USERS_ADD_LEVEL="Add New Access Level"
+MOD_MENU_COM_USERS_ADD_USER="Add New User"
+MOD_MENU_COM_USERS_GROUPS="Groups"
+MOD_MENU_COM_USERS_LEVELS="Access Levels"
+MOD_MENU_COM_USERS_USERS="Users"
+MOD_MENU_COM_USERS_USER_MANAGER="Manage"
+MOD_MENU_COM_USERS_ADD_NOTE="Add User Note"
+MOD_MENU_COM_USERS_NOTES="User Notes"
+MOD_MENU_COM_USERS_NOTE_CATEGORIES="User Note Categories"
+MOD_MENU_CONFIGURATION="Global Configuration"
+MOD_MENU_CONTROL_PANEL="Control Panel"
+MOD_MENU_EXTENSIONS_EXTENSIONS="Extensions"
+MOD_MENU_EXTENSIONS_EXTENSION_MANAGER="Manage"
+MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Language(s)"
+MOD_MENU_EXTENSIONS_MODULE_MANAGER="Modules"
+MOD_MENU_EXTENSIONS_PLUGIN_MANAGER="Plugins"
+MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER="Templates"
+MOD_MENU_FIELD_CHECK_DESC="Check for the presence of important menu items."
+MOD_MENU_FIELD_CHECK_LABEL="Check Menu"
+MOD_MENU_FIELD_FORUMURL_DESC="Enter the URL to a forum other than the default."
+MOD_MENU_FIELD_FORUMURL_LABEL="Custom Support Forum"
+MOD_MENU_FIELD_MENUTYPE_LABEL="Menu to Show"
+MOD_MENU_FIELD_MENUTYPE_DESC="Choose which menu should be rendered with this instance of module."
+MOD_MENU_FIELD_MENUTYPE_OPTION_PREDEFINED="Use a Preset"
+MOD_MENU_FIELD_PRESET_LABEL="Choose Preset"
+MOD_MENU_FIELD_PRESET_DESC="Choose a preset to use as the backend menu"
+MOD_MENU_FIELD_SHOWHELP="Help Menu"
+MOD_MENU_FIELD_SHOWHELP_DESC="Show or hide the Help menu which includes links to various joomla.org sites useful to users."
+MOD_MENU_FIELD_SHOWNEW="Add New Shortcuts"
+MOD_MENU_FIELD_SHOWNEW_DESC="Show or hide various 'Add New ...' shortcuts against users, groups, access levels, articles and categories."
+MOD_MENU_FIELDS="Fields"
+MOD_MENU_FIELDS_GROUP="Field Groups"
+MOD_MENU_GLOBAL_CHECKIN="Global Check-in"
+MOD_MENU_HELP="Help"
+MOD_MENU_HELP_COMMUNITY="Community Portal"
+MOD_MENU_HELP_CURRENT="Help with this page"
+MOD_MENU_HELP_DEVELOPER="Developer Resources"
+MOD_MENU_HELP_DOCUMENTATION="Documentation Wiki"
+MOD_MENU_HELP_EXTENSIONS="Joomla! Extensions"
+MOD_MENU_HELP_JOOMLA="Joomla! Help"
+MOD_MENU_HELP_LINKS="Useful Joomla! links"
+MOD_MENU_HELP_RESOURCES="Joomla! Resources"
+MOD_MENU_HELP_SECURITY="Security Centre"
+MOD_MENU_HELP_SHOP="Joomla! Shop"
+MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum"
+; the string below will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL
+MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum"
+; Enter in the string below the # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). If left empty, it will use '511' which is the section for all languages forums.
+MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
+; If you have chosen to display in the string above the section for all languages, translate the string below. 
+; If you have displayed the specific language forum, use something like "Official French Forum" in your language. 
+MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums"
+MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations"
+MOD_MENU_HELP_XCHANGE="Stack Exchange"
+MOD_MENU_HOME_DEFAULT="Home"
+MOD_MENU_HOME_MULTIPLE="Warning! Multiple homes!"
+MOD_MENU_IMPORTANT_ITEM_MENU_MANAGER="Menu Manager"
+MOD_MENU_IMPORTANT_ITEM_MODULE_MANAGER="Module Manager"
+MOD_MENU_IMPORTANT_ITEM_COMPONENTS_CONTAINER="Components Container"
+MOD_MENU_IMPORTANT_ITEMS_INACCESSIBLE_LIST_WARNING="The administrator menu <strong>%1$s</strong> does not have - <strong>%2$s</strong>. Select to <strong><a href='%3$s'>turn on the menu recovery mode</a></strong>."
+MOD_MENU_INSTALLER_SUBMENU_DATABASE="Database"
+MOD_MENU_INSTALLER_SUBMENU_DISCOVER="Discover"
+MOD_MENU_INSTALLER_SUBMENU_INSTALL="Install"
+MOD_MENU_INSTALLER_SUBMENU_LANGUAGES="Install Languages"
+MOD_MENU_INSTALLER_SUBMENU_MANAGE="Manage"
+MOD_MENU_INSTALLER_SUBMENU_UPDATE="Update"
+MOD_MENU_INSTALLER_SUBMENU_UPDATESITES="Update Sites"
+MOD_MENU_INSTALLER_SUBMENU_WARNINGS="Warnings"
+MOD_MENU_LOGOUT="Logout"
+MOD_MENU_MASS_MAIL_USERS="Mass Mail Users"
+MOD_MENU_MEDIA_MANAGER="Media"
+MOD_MENU_MENUS="Menus"
+MOD_MENU_MENUS_ALL_ITEMS="All Menu Items"
+MOD_MENU_MENU_MANAGER="Manage"
+MOD_MENU_MENU_MANAGER_NEW_MENU="Add New Menu"
+MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM="Add New Menu Item"
+MOD_MENU_NEW_PRIVATE_MESSAGE="New Private Message"
+MOD_MENU_PURGE_EXPIRED_CACHE="Clear Expired Cache"
+MOD_MENU_READ_PRIVATE_MESSAGES="Read Private Messages"
+MOD_MENU_RECOVERY_EXIT="Exit Recovery Mode"
+MOD_MENU_RECOVERY_MENU_ROOT="Menu Recovery"
+MOD_MENU_SETTINGS="Settings"
+MOD_MENU_MAINTENANCE="Maintenance"
+MOD_MENU_SYSTEM_INFORMATION="System Information"
+MOD_MENU_SYSTEM="System"
+MOD_MENU_TOOLS="Tools"
+MOD_MENU_USER_PROFILE="My Profile"
+MOD_MENU_XML_DESCRIPTION="This module displays an administrator menu module."
diff --git a/core/administrator/language/en-GB/en-GB.mod_menu.sys.ini b/core/administrator/language/en-GB/en-GB.mod_menu.sys.ini
new file mode 100644
index 00000000..c0dcc329
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_menu.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MENU="Administrator Menu"
+MOD_MENU_XML_DESCRIPTION="This module displays an administrator menu module."
+MOD_MENU_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_multilangstatus.ini b/core/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
new file mode 100644
index 00000000..38bae3fe
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MULTILANGSTATUS="Multilingual Status"
+MOD_MULTILANGSTATUS_XML_DESCRIPTION="This module shows the status of the multilingual parameters."
diff --git a/core/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/core/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
new file mode 100644
index 00000000..a9bef39c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MULTILANGSTATUS="Multilingual Status"
+MOD_MULTILANGSTATUS_XML_DESCRIPTION="This module shows the status of the multilingual parameters."
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_popular.ini b/core/administrator/language/en-GB/en-GB.mod_popular.ini
new file mode 100644
index 00000000..dc0d100b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_popular.ini
@@ -0,0 +1,37 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_POPULAR="Popular Articles"
+MOD_POPULAR_CREATED="Created"
+MOD_POPULAR_FIELD_AUTHORS_DESC="A filter for the Authors."
+MOD_POPULAR_FIELD_AUTHORS_LABEL="Authors"
+MOD_POPULAR_FIELD_CATEGORY_DESC="Select Articles from a specific Category or all Categories."
+MOD_POPULAR_FIELD_COUNT_DESC="The number of items to display (default 5)."
+MOD_POPULAR_FIELD_COUNT_LABEL="Count"
+MOD_POPULAR_FIELD_VALUE_ADDED_OR_MODIFIED_BY_ME="Added or modified by me"
+MOD_POPULAR_FIELD_VALUE_ANYONE="Anyone"
+MOD_POPULAR_FIELD_VALUE_NOT_ADDED_OR_MODIFIED_BY_ME="Not added or modified by me"
+MOD_POPULAR_ITEMS="Popular Items"
+MOD_POPULAR_NO_MATCHING_RESULTS="No Matching Results"
+MOD_POPULAR_TITLE="Popular Articles"
+MOD_POPULAR_TITLE_1="Top Popular Article"
+MOD_POPULAR_TITLE_MORE="Top %1$s Popular Articles"
+MOD_POPULAR_TITLE_BY_ME="Top Popular Articles By Me"
+MOD_POPULAR_TITLE_BY_ME_1="Top Popular Article By Me"
+MOD_POPULAR_TITLE_BY_ME_MORE="Top %1$s Popular Articles By Me"
+MOD_POPULAR_TITLE_NOT_ME="Top Popular Articles Not By Me"
+MOD_POPULAR_TITLE_NOT_ME_1="Top Popular Article Not By Me"
+MOD_POPULAR_TITLE_NOT_ME_MORE="Top %1$s Popular Articles Not By Me"
+MOD_POPULAR_TITLE_CATEGORY="Top Popular Articles (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_1="Top Popular Article (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_MORE="Top %1$s Popular Articles (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_BY_ME="Top Popular Articles By Me (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_BY_ME_1="Top Popular Article By Me (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_BY_ME_MORE="Top %1$s Popular Articles By Me (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_NOT_ME="Top Popular Articles Not By Me (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_NOT_ME_1="Top Popular Article Not By Me (%2$s category)"
+MOD_POPULAR_TITLE_CATEGORY_NOT_ME_MORE="Top %1$s Popular Articles Not By Me (%2$s category)"
+MOD_POPULAR_UNEXISTING="<i>Non existent</i>"
+MOD_POPULAR_XML_DESCRIPTION="This module shows a list of the most popular published Articles that are still current. Some that are shown may have expired even though they are the most recent."
diff --git a/core/administrator/language/en-GB/en-GB.mod_popular.sys.ini b/core/administrator/language/en-GB/en-GB.mod_popular.sys.ini
new file mode 100644
index 00000000..5ce33361
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_popular.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_POPULAR_XML_DESCRIPTION="This module shows a list of the most popular published Articles that are still current. Some that are shown may have expired even though they are the most recent."
+MOD_POPULAR="Popular Articles"
+MOD_POPULAR_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_quickicon.ini b/core/administrator/language/en-GB/en-GB.mod_quickicon.ini
new file mode 100644
index 00000000..9815084f
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_quickicon.ini
@@ -0,0 +1,33 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_QUICKICON="Quick Icons"
+MOD_QUICKICON_ADD_NEW_ARTICLE="New Article"
+MOD_QUICKICON_ARTICLE_MANAGER="Articles"
+MOD_QUICKICON_CATEGORY_MANAGER="Categories"
+MOD_QUICKICON_CLEAR_CACHE="Clear Cache"
+MOD_QUICKICON_CONFIGURATION="Configuration"
+MOD_QUICKICON_CONTENT="Content"
+MOD_QUICKICON_EXTENSIONS="Extensions"
+MOD_QUICKICON_EXTENSION_MANAGER="Extension Manager"
+MOD_QUICKICON_FRONTPAGE_MANAGER="Front Page Manager"
+MOD_QUICKICON_GLOBAL_CHECKIN="Global Check-in"
+MOD_QUICKICON_GLOBAL_CONFIGURATION="Global"
+MOD_QUICKICON_GROUP_DESC="The group of this module (this value is compared with the group value used in <b>Quick Icons</b> plugins to inject icons). The 'mod_quickicon' group always displays the Joomla! core icons."
+MOD_QUICKICON_GROUP_LABEL="Group"
+MOD_QUICKICON_INSTALL_EXTENSIONS="Install Extensions"
+MOD_QUICKICON_LANGUAGE_MANAGER="Language(s)"
+MOD_QUICKICON_MAINTENANCE="Maintenance"
+MOD_QUICKICON_MEDIA_MANAGER="Media"
+MOD_QUICKICON_MENU_MANAGER="Menu(s)"
+MOD_QUICKICON_MODULE_MANAGER="Modules"
+MOD_QUICKICON_PROFILE="Edit Profile"
+MOD_QUICKICON_STRUCTURE="Structure"
+MOD_QUICKICON_SYSTEM_INFORMATION="System Information"
+MOD_QUICKICON_TEMPLATE_MANAGER="Templates"
+MOD_QUICKICON_TITLE="Quick Icons"
+MOD_QUICKICON_USER_MANAGER="Users"
+MOD_QUICKICON_USERS="Users"
+MOD_QUICKICON_XML_DESCRIPTION="This module shows Quick Icons that are visible on the Control Panel (administrator area home page)."
diff --git a/core/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini b/core/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
new file mode 100644
index 00000000..6eca5f74
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_QUICKICON="Quick Icons"
+MOD_QUICKICON_XML_DESCRIPTION="This module shows Quick Icons that are visible on the Control Panel (administrator area home page)"
+MOD_QUICKICON_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_sampledata.ini b/core/administrator/language/en-GB/en-GB.mod_sampledata.ini
new file mode 100644
index 00000000..bc53c096
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_sampledata.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SAMPLEDATA="Sample Data"
+MOD_SAMPLEDATA_CONFIRM_START="Proceeding will install a sample data set into your Joomla website. This process can't be reverted once done."
+MOD_SAMPLEDATA_INVALID_RESPONSE="There is an error in a sample data plugin. Response is invalid."
+MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED="This sample data set is already installed."
+MOD_SAMPLEDATA_XML_DESCRIPTION="This Module allows to install sample data."
diff --git a/core/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini b/core/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
new file mode 100644
index 00000000..173677eb
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_sampledata.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SAMPLEDATA="Sample Data"
+MOD_SAMPLEDATA_XML_DESCRIPTION="This Module allows to install sample data."
diff --git a/core/administrator/language/en-GB/en-GB.mod_stats_admin.ini b/core/administrator/language/en-GB/en-GB.mod_stats_admin.ini
new file mode 100644
index 00000000..477ecf7b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_stats_admin.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATS_ADMIN="Statistics"
+MOD_STATS_ARTICLES="Articles"
+MOD_STATS_ARTICLES_VIEW_HITS="Articles View Hits"
+MOD_STATS_CACHING="Caching"
+MOD_STATS_FIELD_COUNTER_DESC="Display hit counter."
+MOD_STATS_FIELD_COUNTER_LABEL="Hit Counter"
+MOD_STATS_FIELD_INCREASECOUNTER_DESC="Enter the number of hits to increase the counter by."
+MOD_STATS_FIELD_INCREASECOUNTER_LABEL="Increase Counter"
+MOD_STATS_FIELD_SERVERINFO_DESC="Display server information."
+MOD_STATS_FIELD_SERVERINFO_LABEL="Server Information"
+MOD_STATS_FIELD_SITEINFO_DESC="Display site information."
+MOD_STATS_FIELD_SITEINFO_LABEL="Site Information"
+MOD_STATS_GZIP="Gzip"
+MOD_STATS_MYSQL="MySQL"
+MOD_STATS_OS="OS"
+MOD_STATS_PHP="PHP"
+MOD_STATS_TIME="Time"
+MOD_STATS_USERS="Users"
+MOD_STATS_WEBLINKS="Web Links"
+MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
diff --git a/core/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini b/core/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
new file mode 100644
index 00000000..e75343b4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATS_ADMIN="Statistics"
+MOD_STATS_LAYOUT_DEFAULT="Default"
+MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_status.ini b/core/administrator/language/en-GB/en-GB.mod_status.ini
new file mode 100644
index 00000000..aac0da98
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_status.ini
@@ -0,0 +1,34 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATUS="User Status"
+MOD_STATUS_BACKEND_USERS_0="Administrators"
+MOD_STATUS_BACKEND_USERS_1="Administrator"
+MOD_STATUS_BACKEND_USERS_MORE="Administrators"
+MOD_STATUS_FIELD_SHOW_VIEWSITE_LABEL="View Site"
+MOD_STATUS_FIELD_SHOW_VIEWSITE_DESC="Show a link to the website home page."
+MOD_STATUS_FIELD_LINK_VIEWADMIN_LABEL="Show Admin"
+MOD_STATUS_FIELD_SHOW_VIEWADMIN_LABEL="View Administrator"
+MOD_STATUS_FIELD_SHOW_VIEWADMIN_DESC="Show a link to open a new Administrator window."
+MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_ADMIN_DESC="Show the number of users logged-in to the Backend."
+MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_ADMIN_LABEL="Logged-in Backend Users"
+MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_DESC="Show the number of users logged-in to the Frontend."
+MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_LABEL="Logged-in Users"
+MOD_STATUS_FIELD_SHOW_MESSAGES_DESC="Show the messages count for the current user's inbox."
+MOD_STATUS_FIELD_SHOW_MESSAGES_LABEL="Messages"
+MOD_STATUS_LOG_OUT="Log out"
+MOD_STATUS_MESSAGES_0="%d Messages"
+MOD_STATUS_MESSAGES_1="%d Message"
+MOD_STATUS_MESSAGES_LABEL_0="Messages"
+MOD_STATUS_MESSAGES_LABEL_1="Message"
+MOD_STATUS_MESSAGES_LABEL_MORE="Messages"
+MOD_STATUS_MESSAGES_MORE="%d Messages"
+MOD_STATUS_TOTAL_USERS_0="Users"
+MOD_STATUS_TOTAL_USERS_1="User"
+MOD_STATUS_TOTAL_USERS_MORE="Users"
+MOD_STATUS_USERS_0="Visitors"
+MOD_STATUS_USERS_1="Visitor"
+MOD_STATUS_USERS_MORE="Visitors"
+MOD_STATUS_XML_DESCRIPTION="This module shows the status of the logged-in users and various shortcut links."
diff --git a/core/administrator/language/en-GB/en-GB.mod_status.sys.ini b/core/administrator/language/en-GB/en-GB.mod_status.sys.ini
new file mode 100644
index 00000000..a65c54f9
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_status.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATUS="User Status"
+MOD_STATUS_XML_DESCRIPTION="This module shows the status of the logged-in users and various shortcut links."
+MOD_STATUS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_submenu.ini b/core/administrator/language/en-GB/en-GB.mod_submenu.ini
new file mode 100644
index 00000000..e11bf776
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_submenu.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SUBMENU="Administrator Sub-Menu"
+MOD_SUBMENU_XML_DESCRIPTION="This module shows the Sub-Menu Navigation Module."
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_submenu.sys.ini b/core/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
new file mode 100644
index 00000000..639dffb2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SUBMENU="Administrator Sub-Menu"
+MOD_SUBMENU_XML_DESCRIPTION="This module shows the Sub-Menu Navigation Module."
+MOD_SUBMENU_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_title.ini b/core/administrator/language/en-GB/en-GB.mod_title.ini
new file mode 100644
index 00000000..ead702d3
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_title.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TITLE="Title"
+MOD_TITLE_XML_DESCRIPTION="This module shows the Toolbar Component Title."
diff --git a/core/administrator/language/en-GB/en-GB.mod_title.sys.ini b/core/administrator/language/en-GB/en-GB.mod_title.sys.ini
new file mode 100644
index 00000000..92f6d828
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_title.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TITLE="Title"
+MOD_TITLE_XML_DESCRIPTION="This module shows the Toolbar Component Title."
+MOD_TITLE_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_toolbar.ini b/core/administrator/language/en-GB/en-GB.mod_toolbar.ini
new file mode 100644
index 00000000..f0cf4950
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_toolbar.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TOOLBAR="Toolbar"
+MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini b/core/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
new file mode 100644
index 00000000..97ca14d5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TOOLBAR="Toolbar"
+MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."
+MOD_TOOLBAR_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/language/en-GB/en-GB.mod_version.ini b/core/administrator/language/en-GB/en-GB.mod_version.ini
new file mode 100644
index 00000000..7eb18812
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_version.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_VERSION="Joomla! Version Information"
+MOD_VERSION_FORMAT_DESC="The long version includes code name and date."
+MOD_VERSION_FORMAT_LABEL="Version Format"
+MOD_VERSION_FORMAT_LONG="Long"
+MOD_VERSION_FORMAT_SHORT="Short"
+MOD_VERSION_PRODUCT_DESC="Include the text &quot;Joomla!&quot;."
+MOD_VERSION_PRODUCT_LABEL="Show Joomla!"
+MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.mod_version.sys.ini b/core/administrator/language/en-GB/en-GB.mod_version.sys.ini
new file mode 100644
index 00000000..7b3b9455
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.mod_version.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_VERSION="Joomla! Version Information"
+MOD_VERSION_LAYOUT_DEFAULT="Default"
+MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
new file mode 100644
index 00000000..8d02e7fe
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTH_COOKIE_ERROR_LOG_INVALIDATED_COOKIES="The authentication tokens were invalidated for user %u because there was no matching record."
+PLG_AUTH_COOKIE_ERROR_LOG_LOGIN_FAILED="Cookie login failed for user %u."
+PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_DESC="The number of days until the authentication cookie will expire. Other factors may cause it to expire before this. Longer lengths are less secure."
+PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_LABEL="Cookie Lifetime"
+PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_DESC="The length of the key to use to encrypt the cookie. Longer lengths are more secure, but they will slow performance."
+PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_LABEL="Key Length"
+PLG_AUTH_COOKIE_XML_DESCRIPTION="Handles Joomla's cookie User authentication.<br /><strong> Warning! You must have at least one other authentication plugin enabled.</strong> <br />You will also need a plugin such as the System - Remember Me plugin to implement cookie login."
+PLG_AUTHENTICATION_COOKIE="Authentication - Cookie"
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
new file mode 100644
index 00000000..d2c3ea89
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTH_COOKIE_XML_DESCRIPTION="Handles Joomla's cookie User authentication.<br /><strong> Warning! You must have at least one other authentication plugin enabled.</strong><br />You will also need a plugin such as the System - Remember Me plugin to implement cookie login."
+PLG_AUTHENTICATION_COOKIE="Authentication - Cookie"
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
new file mode 100644
index 00000000..c1fa6dfd
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
@@ -0,0 +1,22 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTHENTICATION_GMAIL="Authentication - Gmail"
+PLG_GMAIL_ERROR_ACCOUNT_DISABLED_OR_NOT_ACTIVATED="Your local account is disabled or not activated."
+PLG_GMAIL_ERROR_LOCAL_USERNAME_CONFLICT="A local username conflicts with your Gmail username."
+PLG_GMAIL_FIELD_APPLYSUFFIX_DESC="Options for applying the suffix: Don't apply the suffix, only apply the suffix if missing (any user supplied suffix will be used) or always apply the suffix replacing any user supplied suffix."
+PLG_GMAIL_FIELD_APPLYSUFFIX_LABEL="Apply Username Suffix"
+PLG_GMAIL_FIELD_BACKEND_LOGIN_DESC="Allow Backend login via Gmail account?"
+PLG_GMAIL_FIELD_BACKEND_LOGIN_LABEL="Backend Login"
+PLG_GMAIL_FIELD_SUFFIX_DESC="A suffix to use for the username, typically gmail.com (or googlemail.com) is the suffix but you may wish to use a Google Apps for Your Domain suffix, this doesn't include the @ symbol. If left blank username suffix will be ignored."
+PLG_GMAIL_FIELD_SUFFIX_LABEL="Username Suffix"
+PLG_GMAIL_FIELD_USER_BLACKLIST_DESC="A list of usernames not permitted to log in via the Gmail plugin. The usernames should be separated by a comma."
+PLG_GMAIL_FIELD_USER_BLACKLIST_LABEL="User Blacklist"
+PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXALWAYS="Always use suffix"
+PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXMISSING="Apply suffix if missing"
+PLG_GMAIL_FIELD_VALUE_NOAPPLYSUFFIX="Don't Apply Suffix"
+PLG_GMAIL_FIELD_VERIFYPEER_DESC="Verify the peer connection using a CA certificate. In some situations authentication will fail due to certificate issues, disabling this should resolve the situation in that case."
+PLG_GMAIL_FIELD_VERIFYPEER_LABEL="Verify Peer"
+PLG_GMAIL_XML_DESCRIPTION="Handles User Authentication with a Gmail or Googlemail account (Requires cURL).<br />Users may need to enable <em>Access for less secure apps</em> at <a href="_QQ_"https://www.google.com/settings/security/lesssecureapps"_QQ_" target="_QQ_"_blank"_QQ_">https://www.google.com/settings/security/lesssecureapps</a> to be able to log in using this method.<br /><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
new file mode 100644
index 00000000..530998b1
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTHENTICATION_GMAIL="Authentication - Gmail"
+PLG_GMAIL_XML_DESCRIPTION="Handles User Authentication with a Gmail or Googlemail account (Requires cURL).<br />Users may need to enable <em>Access for less secure apps</em> at <a href="_QQ_"https://www.google.com/settings/security/lesssecureapps"_QQ_" target="_QQ_"_blank"_QQ_">https://www.google.com/settings/security/lesssecureapps</a> to be able to log in using this method.<br /><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
new file mode 100644
index 00000000..ea9741ff
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTH_JOOMLA_ERR_SECRET_CODE_WITHOUT_TFA="You need to enable two factor authentication in your user profile to use the secret code field."
+PLG_AUTH_JOOMLA_XML_DESCRIPTION="Handles Joomla's default User authentication.<br /><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
+PLG_AUTHENTICATION_JOOMLA="Authentication - Joomla"
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
new file mode 100644
index 00000000..99322184
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTH_JOOMLA_XML_DESCRIPTION="Handles Joomla's default User authentication.<br /><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
+PLG_AUTHENTICATION_JOOMLA="Authentication - Joomla"
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
new file mode 100644
index 00000000..fc16bfe8
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
@@ -0,0 +1,37 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTHENTICATION_LDAP="Authentication - LDAP"
+PLG_LDAP_FIELD_AUTHMETHOD_DESC="The authorisation method to validate the credentials."
+PLG_LDAP_FIELD_AUTHMETHOD_LABEL="Authorisation Method"
+PLG_LDAP_FIELD_BASEDN_DESC="The base DN of your LDAP server, eg o=example.com."
+PLG_LDAP_FIELD_BASEDN_LABEL="Base DN"
+PLG_LDAP_FIELD_EMAIL_DESC="LDAP attribute which has the User's email address."
+PLG_LDAP_FIELD_EMAIL_LABEL="Map: Email"
+PLG_LDAP_FIELD_FULLNAME_DESC="LDAP attribute which has the User's full name."
+PLG_LDAP_FIELD_FULLNAME_LABEL="Map: Full Name"
+PLG_LDAP_FIELD_HOST_DESC="Eg: openldap.example.com."
+PLG_LDAP_FIELD_HOST_LABEL="Host"
+PLG_LDAP_FIELD_NEGOCIATE_DESC="Negotiate TLS encryption with the LDAP server. This requires all traffic to and from the LDAP server to be encrypted."
+PLG_LDAP_FIELD_NEGOCIATE_LABEL="Negotiate TLS"
+PLG_LDAP_FIELD_PASSWORD_DESC="The Connect Password is the password of an administrative account. This is used in Authenticate then Bind and Authenticated Compare authorisation methods."
+PLG_LDAP_FIELD_PASSWORD_LABEL="Connect Password"
+PLG_LDAP_FIELD_PORT_DESC="Default port is 389."
+PLG_LDAP_FIELD_PORT_LABEL="Port"
+PLG_LDAP_FIELD_REFERRALS_DESC="This option sets the value of the LDAP_OPT_REFERRALS flag. You will need to set it to No for Windows 2003 servers."
+PLG_LDAP_FIELD_REFERRALS_LABEL="Follow Referrals"
+PLG_LDAP_FIELD_SEARCHSTRING_DESC="A query string used to search for a given User. The [search] keyword is dynamically replaced by the User-provided login. An example string is: uid=[search]. Several strings can be used separated by semicolons. Only used when searching."
+PLG_LDAP_FIELD_SEARCHSTRING_LABEL="Search String"
+PLG_LDAP_FIELD_UID_DESC="LDAP Attribute which has the User's Login ID. For Active Directory this is sAMAccountName."
+PLG_LDAP_FIELD_UID_LABEL="Map: User ID"
+PLG_LDAP_FIELD_USERNAME_DESC="The Connect Username and Connect Password define connection parameters for the DN lookup phase. Two options are available:- Anonymous DN lookup (leave both fields blank); Administrative connection: Connect Username is the username of an administrative account, for example Administrator. Connect password is the actual password of your administrative account."
+PLG_LDAP_FIELD_USERNAME_LABEL="Connect Username"
+PLG_LDAP_FIELD_USERSDN_DESC="The [username] keyword is dynamically replaced by the User-provided login. An example string is: uid=[username], dc=my-domain, dc=com. Several strings can be used, separated by semicolons. Only used for direct binds."
+PLG_LDAP_FIELD_USERSDN_LABEL="User's DN"
+PLG_LDAP_FIELD_V3_DESC="Default is LDAP2, but the latest versions of OpenLdap require clients to use LDAPV3."
+PLG_LDAP_FIELD_V3_LABEL="LDAP V3"
+PLG_LDAP_FIELD_VALUE_BINDSEARCH="Bind and Search"
+PLG_LDAP_FIELD_VALUE_BINDUSER="Bind Directly as User"
+PLG_LDAP_XML_DESCRIPTION="Handles User Authentication against an LDAP server.<br /><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
diff --git a/core/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini b/core/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
new file mode 100644
index 00000000..795bd6f2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_AUTHENTICATION_LDAP="Authentication - LDAP"
+PLG_LDAP_XML_DESCRIPTION="Handles User Authentication against an LDAP server.<br /><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
diff --git a/core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
new file mode 100644
index 00000000..29821c12
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
@@ -0,0 +1,65 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href="_QQ_"https://www.google.com/recaptcha"_QQ_" target="_QQ_"_blank"_QQ_">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
+PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
+PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_ACTION="Update reCAPTCHA settings"
+PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_TITLE="reCAPTCHA v1 - discontinued"
+PLG_PLG_RECAPTCHA_VERSION_1_POSTINSTALL_BODY="Support for reCAPTCHA v1 will be turned off by Google on March 31, 2018. Please update the settings in the reCAPTCHA plugin to use Version 2.0."
+; Params
+PLG_RECAPTCHA_VERSION_1_WARNING_LABEL="You have selected Version 1.0. As of March 31, 2018 this will no longer work and you should use Version 2.0."
+PLG_RECAPTCHA_VERSION_LABEL="Version"
+PLG_RECAPTCHA_VERSION_DESC="Version 2.0 is the recommended version."
+; The following two strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
+PLG_RECAPTCHA_VERSION_1="1.0"
+PLG_RECAPTCHA_VERSION_2="2.0"
+PLG_RECAPTCHA_VERSION_V1="1.0"
+PLG_RECAPTCHA_VERSION_V2="2.0"
+PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site Key"
+PLG_RECAPTCHA_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users. See the plugin description for instructions on getting a site key."
+PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret Key"
+PLG_RECAPTCHA_PRIVATE_KEY_DESC="Used in the communication between your server and the reCAPTCHA server. Be sure to keep it a secret. See the plugin description for instructions on getting a secret key."
+PLG_RECAPTCHA_THEME_LABEL="Theme"
+PLG_RECAPTCHA_THEME_DESC="Defines which theme to use for reCAPTCHA."
+PLG_RECAPTCHA_THEME_RED="Red"
+PLG_RECAPTCHA_THEME_WHITE="White"
+PLG_RECAPTCHA_THEME_BLACKGLASS="BlackGlass"
+PLG_RECAPTCHA_THEME_CLEAN="Clean"
+PLG_RECAPTCHA_THEME_LIGHT="Light"
+PLG_RECAPTCHA_THEME_DARK="Dark"
+PLG_RECAPTCHA_LANG_LABEL="Language"
+PLG_RECAPTCHA_LANG_DESC="Select the language for the reCAPTCHA. If default is set and the language file has a custom translation, it will be used."
+PLG_RECAPTCHA_SIZE_LABEL="Size"
+PLG_RECAPTCHA_SIZE_DESC="Select the size for the reCAPTCHA field."
+PLG_RECAPTCHA_THEME_NORMAL="Normal"
+PLG_RECAPTCHA_THEME_COMPACT="Compact"
+
+; Error messages
+PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY="reCAPTCHA plugin needs a site key to be set in its parameters. Please contact a site administrator."
+PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION="Please complete the CAPTCHA."
+PLG_RECAPTCHA_ERROR_NO_IP="For security reasons, you must pass the remote IP address to reCAPTCHA."
+PLG_RECAPTCHA_ERROR_UNKNOWN="Unknown error."
+PLG_RECAPTCHA_ERROR_INVALID_SITE_PUBLIC_KEY="We weren't able to verify the site key."
+PLG_RECAPTCHA_ERROR_INVALID_SITE_PRIVATE_KEY="We weren't able to verify the secret key."
+PLG_RECAPTCHA_ERROR_INVALID_REQUEST_COOKIE="The challenge parameter of the verify script was incorrect."
+PLG_RECAPTCHA_ERROR_INCORRECT_CAPTCHA_SOL="The CAPTCHA was incorrect."
+PLG_RECAPTCHA_ERROR_VERIFY_PARAMS_INCORRECT="The parameters to verify were incorrect, make sure you are passing all the required parameters."
+PLG_RECAPTCHA_ERROR_INVALID_REFERRER="reCAPTCHA API keys are tied to a specific domain name for security reasons."
+PLG_RECAPTCHA_ERROR_RECAPTCHA_NOT_REACHABLE="Unable to contact the reCAPTCHA verify server."
+
+; Uncomment(remove the ";" from the beginning of the line) the following lines if reCAPTCHA is not available in your language
+; When uncommenting, do NOT translate PLG_RECAPTCHA_CUSTOM_LANG
+; As of 01/01/2012, the following languages do not need translation: en, nl, fr, de, pt, ru, es, tr
+;PLG_RECAPTCHA_CUSTOM_LANG="true"
+;PLG_RECAPTCHA_INSTRUCTIONS_VISUAL="Type the two words:"
+;PLG_RECAPTCHA_INSTRUCTIONS_AUDIO="Type what you hear:"
+;PLG_RECAPTCHA_PLAY_AGAIN="Play sound again"
+;PLG_RECAPTCHA_CANT_HEAR_THIS="Download sound as MP3"
+;PLG_RECAPTCHA_VISUAL_CHALLENGE="Get a visual challenge"
+;PLG_RECAPTCHA_AUDIO_CHALLENGE="Get an audio challenge"
+;PLG_RECAPTCHA_REFRESH_BTN="Get a new challenge"
+;PLG_RECAPTCHA_HELP_BTN="Help"
+;PLG_RECAPTCHA_INCORRECT_TRY_AGAIN="Incorrect. Try again."
diff --git a/core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini b/core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
new file mode 100644
index 00000000..929448dc
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to https://www.google.com/recaptcha. To use this for new account registration, go to Options in the User Manager and select Captcha - reCaptcha as the Captcha."
+PLG_CAPTCHA_RECAPTCHA="Captcha - ReCaptcha"
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_contact.ini b/core/administrator/language/en-GB/en-GB.plg_content_contact.ini
new file mode 100644
index 00000000..3728451c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_contact.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_CONTACT="Content - Contact"
+PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
new file mode 100644
index 00000000..3728451c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_CONTACT="Content - Contact"
+PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini b/core/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
new file mode 100644
index 00000000..aba3b809
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_EMAILCLOAK="Content - Email Cloaking"
+PLG_CONTENT_EMAILCLOAK_LINKABLE="As linkable mailto address"
+PLG_CONTENT_EMAILCLOAK_MODE_DESC="Select how email addresses will be displayed."
+PLG_CONTENT_EMAILCLOAK_MODE_LABEL="Mode"
+PLG_CONTENT_EMAILCLOAK_NONLINKABLE="Non-linkable Text"
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all email addresses in content from spambots using JavaScript."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
new file mode 100644
index 00000000..c45b5fd8
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_EMAILCLOAK="Content - Email Cloaking"
+PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION="Cloaks all email addresses in content from spambots using JavaScript."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_fields.ini b/core/administrator/language/en-GB/en-GB.plg_content_fields.ini
new file mode 100644
index 00000000..ff7f27a5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_fields.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_FIELDS="Content - Fields"
+PLG_CONTENT_FIELDS_XML_DESCRIPTION="This plugin allows you to display a custom field which has been inserted with the 'Button - Fields' plugin or using Syntax: {field #} directly into the editor area.<br><strong>Possible Syntax:</strong><br><ul><li><code>{field 1}</code> will display the field with the ID 1</li><li><code>{field 1,foo}</code> will display the selected field using the alternative layout 'foo'.</li><li><code>{fieldgroup 2}</code> will display all fields within the fieldgroup with the ID 2.</li></ul>"
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini
new file mode 100644
index 00000000..189d6b52
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_fields.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_FIELDS="Content - Fields"
+PLG_CONTENT_FIELDS_XML_DESCRIPTION="This plugin allows you to display a custom field which has been inserted with the 'Button - Fields' plugin or using Syntax: {field #} directly into the editor area."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_finder.ini b/core/administrator/language/en-GB/en-GB.plg_content_finder.ini
new file mode 100644
index 00000000..738db4b0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_finder.ini
@@ -0,0 +1,17 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_FINDER="Content - Smart Search"
+PLG_CONTENT_FINDER_XML_DESCRIPTION="Changes to content will not update the Smart Search index if you do not enable this plugin."
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P__="All"
+
+PLG_FINDER_QUERY_FILTER_BRANCH_S_TYPE="Type"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_LANGUAGE="Language"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_CATEGORY="Category"
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P_TYPE="Types"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_LANGUAGE="Languages"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_CATEGORY="Categories"
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
new file mode 100644
index 00000000..2ddda8f6
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_FINDER="Content - Smart Search"
+PLG_CONTENT_FINDER_XML_DESCRIPTION="Changes to content will not update the Smart Search index if you do not enable this plugin."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_joomla.ini b/core/administrator/language/en-GB/en-GB.plg_content_joomla.ini
new file mode 100644
index 00000000..6ef4aba2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_joomla.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_JOOMLA="Content - Joomla"
+PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_DESC="Check that categories are fully empty before they are deleted."
+PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_LABEL="Check Category Deletion"
+PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_DESC="Email users if 'Send email' is on when there is a new article submitted via the Frontend."
+PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_LABEL="Email on New Site Article"
+PLG_CONTENT_JOOMLA_XML_DESCRIPTION="This plugin does category processing for core extensions; sends an email when new article is submitted in the Frontend."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
new file mode 100644
index 00000000..d806639f
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_JOOMLA="Content - Joomla"
+PLG_CONTENT_JOOMLA_XML_DESCRIPTION="This plugin does category processing for core extensions; sends an email when new article is submitted in the Frontend."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini b/core/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
new file mode 100644
index 00000000..26f451ae
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_LOADMODULE="Content - Load Modules"
+PLG_LOADMODULE_FIELD_STYLE_DESC="Code that will wrap Modules."
+PLG_LOADMODULE_FIELD_STYLE_LABEL="Style"
+PLG_LOADMODULE_FIELD_VALUE_DIVS="Wrapped by Divs"
+PLG_LOADMODULE_FIELD_VALUE_HORIZONTAL="Wrapped by table (horizontal)"
+PLG_LOADMODULE_FIELD_VALUE_MULTIPLEDIVS="Wrapped by Multiple Divs"
+PLG_LOADMODULE_FIELD_VALUE_RAW="No wrapping (raw output)"
+PLG_LOADMODULE_FIELD_VALUE_TABLE="Wrapped by table (column)"
+PLG_LOADMODULE_XML_DESCRIPTION="Within content this plugin loads Module positions, Syntax: {loadposition user1} or Modules by name, Syntax: {loadmodule mod_login}. Optionally can specify module style and for loadmodule a specific module by title, Syntax: {loadmodule mod_login,module title,style}."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
new file mode 100644
index 00000000..a22dc3be
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_LOADMODULE="Content - Load Modules"
+PLG_LOADMODULE_XML_DESCRIPTION="Within content this plugin loads Module positions, Syntax: {loadposition user1} or Modules by name, Syntax: {loadmodule mod_login}. Optionally can specify module style and for loadmodule a specific module by title, Syntax: {loadmodule mod_login,module title,style}."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini b/core/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
new file mode 100644
index 00000000..8ece9990
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
@@ -0,0 +1,27 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+PLG_CONTENT_PAGEBREAK="Content - Page Break"
+PLG_CONTENT_PAGEBREAK_ALL_PAGES="All Pages"
+PLG_CONTENT_PAGEBREAK_ARTICLE_INDEX="Article Index"
+PLG_CONTENT_PAGEBREAK_NO_TITLE="No title"
+PLG_CONTENT_PAGEBREAK_PAGES="Pages"
+PLG_CONTENT_PAGEBREAK_PAGE_NUM="Page %s"
+PLG_CONTENT_PAGEBREAK_SHOW_ALL_DESC="Displays the full article."
+PLG_CONTENT_PAGEBREAK_SHOW_ALL_LABEL="Show All"
+PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEXTEXT="Custom Article Index Heading"
+PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEXTEXT_DESC="Enter a custom text for the Article Index Heading. If empty, standard will be used."
+PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEX_DESC="Show or hide Article Index Heading. The Heading displays on top of the Table of Contents."
+PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEX_LABEL="Article Index Heading"
+PLG_CONTENT_PAGEBREAK_SITE_TITLE_DESC="Title and heading attributes from Plugin added to Site Title tag."
+PLG_CONTENT_PAGEBREAK_SITE_TITLE_LABEL="Show Site Title"
+PLG_CONTENT_PAGEBREAK_SLIDERS="Sliders"
+PLG_CONTENT_PAGEBREAK_STYLE_DESC="Display the article with separate pages, tabs or sliders."
+PLG_CONTENT_PAGEBREAK_STYLE_LABEL="Presentation Style"
+PLG_CONTENT_PAGEBREAK_TABS="Tabs"
+PLG_CONTENT_PAGEBREAK_TOC_DESC="Display a table of contents on multipage Articles."
+PLG_CONTENT_PAGEBREAK_TOC_LABEL="Table of Contents"
+PLG_CONTENT_PAGEBREAK_XML_DESCRIPTION="Allow the creation of a paginated article with an optional table of contents.<br /><br />Insert page breaks through the use of the page break button normally found in the WYSIWYG editor toolbar. The location of the page break in an article will be displayed in the editor as a simple horizontal line.<br /><br />The text displayed will depend on the options chosen and may be either the title, alternate text (if provided) or page numbers. <br /><br />The HTML usage is:<br />&lt;hr class=&quot;system-pagebreak&quot; /&gt;<br />&lt;hr class=&quot;system-pagebreak&quot; title=&quot;The page title&quot; /&gt; or <br />&lt;hr class=&quot;system-pagebreak&quot; alt=&quot;The first page&quot; /&gt; or <br />&lt;hr class=&quot;system-pagebreak&quot; title=&quot;The page title&quot; alt=&quot;The first page&quot; /&gt; or <br />&lt;hr class=&quot;system-pagebreak&quot; alt=&quot;The first page&quot; title=&quot;The page title&quot; /&gt;"
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
new file mode 100644
index 00000000..bacb670b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+PLG_CONTENT_PAGEBREAK="Content - Page Break"
+PLG_CONTENT_PAGEBREAK_XML_DESCRIPTION="Allow the creation of a paginated article with an optional table of contents.<br /><br />Insert page breaks through the use of the page break button normally found in the WYSIWYG editor toolbar. The location of the page break in an article will be displayed in the editor as a simple horizontal line.<br /><br />The text displayed will depend on the options chosen and may be either the title, alternate text (if provided) or page numbers. <br /><br />The HTML usage is:<br />&lt;hr class=&quot;system-pagebreak&quot; /&gt;<br />&lt;hr class=&quot;system-pagebreak&quot; title=&quot;The page title&quot; /&gt; or <br />&lt;hr class=&quot;system-pagebreak&quot; alt=&quot;The first page&quot; /&gt; or <br />&lt;hr class=&quot;system-pagebreak&quot; title=&quot;The page title&quot; alt=&quot;The first page&quot; /&gt; or <br />&lt;hr class=&quot;system-pagebreak&quot; alt=&quot;The first page&quot; title=&quot;The page title&quot; /&gt;"
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini b/core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
new file mode 100644
index 00000000..8adbfd7c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_PAGENAVIGATION="Content - Page Navigation"
+PLG_PAGENAVIGATION_FIELD_DISPLAY_DESC="Choose what to display as the link text."
+PLG_PAGENAVIGATION_FIELD_DISPLAY_LABEL="Link Text"
+PLG_PAGENAVIGATION_FIELD_POSITION_DESC="The position of the <em>Page Navigation</em> function on the viewed page in relation to the text."
+PLG_PAGENAVIGATION_FIELD_POSITION_LABEL="Position"
+PLG_PAGENAVIGATION_FIELD_RELATIVE_DESC="Assigns the relative location for the Position parameter. Text will place it directly above or below the article content. Full Article will place it above or below the full display including title and readmore."
+PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL="Relative To"
+PLG_PAGENAVIGATION_FIELD_VALUE_ABOVE="Above"
+PLG_PAGENAVIGATION_FIELD_VALUE_ARTICLE="Full Article"
+PLG_PAGENAVIGATION_FIELD_VALUE_BELOW="Below"
+PLG_PAGENAVIGATION_FIELD_VALUE_NEXTPREV="Next/Previous (static text)"
+PLG_PAGENAVIGATION_FIELD_VALUE_TEXT="Text"
+PLG_PAGENAVIGATION_FIELD_VALUE_TITLE="Title of the Article"
+PLG_PAGENAVIGATION_XML_DESCRIPTION="Enables you to add <em>Next &amp; Previous</em> functionality to an Article."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
new file mode 100644
index 00000000..b1fa4d2a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_PAGENAVIGATION="Content - Page Navigation"
+PLG_PAGENAVIGATION_XML_DESCRIPTION="Enables you to add <em>Next &amp; Previous</em> functionality to an Article."
+
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_vote.ini b/core/administrator/language/en-GB/en-GB.plg_content_vote.ini
new file mode 100644
index 00000000..b7fba7ba
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_vote.ini
@@ -0,0 +1,17 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_VOTE="Content - Vote"
+PLG_VOTE_BOTTOM="Bottom"
+PLG_VOTE_LABEL="Please Rate"
+PLG_VOTE_POSITION_DESC="Set where the voting is displayed."
+PLG_VOTE_POSITION_LABEL="Position"
+PLG_VOTE_RATE="Rate"
+PLG_VOTE_STAR_ACTIVE="Star Active"
+PLG_VOTE_STAR_INACTIVE="Star Inactive"
+PLG_VOTE_TOP="Top"
+PLG_VOTE_USER_RATING="User Rating:&#160;%1$s&#160;/&#160;%2$s"
+PLG_VOTE_VOTE="Vote %s"
+PLG_VOTE_XML_DESCRIPTION="Add Voting functionality to Articles."
diff --git a/core/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini b/core/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
new file mode 100644
index 00000000..3e702fec
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_VOTE="Content - Vote"
+PLG_VOTE_XML_DESCRIPTION="Add Voting functionality to Articles."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
new file mode 100644
index 00000000..3347b490
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_ARTICLE_BUTTON_ARTICLE="Article"
+PLG_ARTICLE_XML_DESCRIPTION="Displays a button to insert links to articles into an Article. Displays a popup allowing you to choose the article."
+PLG_EDITORS-XTD_ARTICLE="Button - Article"
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
new file mode 100644
index 00000000..75587706
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_ARTICLE_XML_DESCRIPTION="Displays a button to insert links to articles into an Article. Displays a popup allowing you to choose the article."
+PLG_EDITORS-XTD_ARTICLE="Button - Article"
+
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini
new file mode 100644
index 00000000..dbd9c666
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_CONTACT="Button - Contact"
+PLG_EDITORS-XTD_CONTACT_BUTTON_CONTACT="Contact"
+PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION="Displays a button to insert links to Contacts in an article. Displays a popup allowing you to choose the contact."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini
new file mode 100644
index 00000000..7ab09f92
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_contact.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_CONTACT="Button - Contact"
+PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION="Displays a button to insert links to Contacts in an article. Displays a popup allowing you to choose the contact."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini
new file mode 100644
index 00000000..c4487e74
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_FIELDS="Button - Field"
+PLG_EDITORS-XTD_FIELDS_BUTTON_FIELD="Field"
+PLG_EDITORS-XTD_FIELDS_XML_DESCRIPTION="Displays a button to insert a custom field into an editor area. Displays a popup allowing you to choose the field.<br/><strong>Warning!</strong>: the custom field will not be rendered if the <a href=\"index.php?option=com_plugins&view=plugins&filter[folder]=content\">Content - Fields</a> plugin is not enabled."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini
new file mode 100644
index 00000000..2765df4c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_fields.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_FIELDS="Button - Field"
+PLG_EDITORS-XTD_FIELDS_XML_DESCRIPTION="Displays a button to insert a custom field into an editor area. Displays a popup allowing you to choose the field.<br/><strong>Warning!</strong>: the custom field will not be rendered if the <a href=\"index.php?option=com_plugins&view=plugins&filter[folder]=content\">Content - Fields</a> plugin is not enabled."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
new file mode 100644
index 00000000..a924f55e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_IMAGE="Button - Image"
+PLG_IMAGE_BUTTON_IMAGE="Image"
+PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an Article. Displays a popup allowing you to configure an image's properties and upload new image files."
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
new file mode 100644
index 00000000..fc10f769
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_IMAGE="Button - Image"
+PLG_IMAGE_XML_DESCRIPTION="Displays a button to insert images into an Article. Displays a popup allowing you to configure an image's properties and upload new image files."
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini
new file mode 100644
index 00000000..bdb50691
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_MENU="Button - Menu"
+PLG_EDITORS-XTD_MENU_BUTTON_MENU="Menu"
+PLG_EDITORS-XTD_MENU_XML_DESCRIPTION="Displays a button to insert menu item links into an Article. Displays a popup allowing you to choose the menu item."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini
new file mode 100644
index 00000000..1e5cd11b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_menu.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_MENU="Button - Menu"
+PLG_EDITORS-XTD_MENU_XML_DESCRIPTION="Displays a button to insert menu item links into an Article. Displays a popup allowing you to choose the menu item."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini
new file mode 100644
index 00000000..bbec3352
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_MODULE="Button - Module"
+PLG_MODULE_BUTTON_MODULE="Module"
+PLG_MODULE_XML_DESCRIPTION="Displays a button to insert a module into an Article. Displays a popup allowing you to choose the module."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini
new file mode 100644
index 00000000..6b783551
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_MODULE="Button - Module"
+PLG_MODULE_XML_DESCRIPTION="Displays a button to insert a module into an Article. Displays a popup allowing you to choose the module."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
new file mode 100644
index 00000000..d4d91685
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_PAGEBREAK="Button - Page Break"
+PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK="Page Break"
+PLG_EDITORSXTD_PAGEBREAK_XML_DESCRIPTION="Provides a button to enable a page break to be inserted into an Article. A popup allows you to configure the settings to be used."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
new file mode 100644
index 00000000..b16632f0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_PAGEBREAK="Button - Page Break"
+PLG_EDITORSXTD_PAGEBREAK_XML_DESCRIPTION="Provides a button to enable a page break to be inserted into an Article. A popup allows you to configure the settings to be used."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
new file mode 100644
index 00000000..045e0daa
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_READMORE="Button - Readmore"
+PLG_READMORE_ALREADY_EXISTS="There is already a Read more ... link that has been inserted. Only one link is permitted. Use {pagebreak} to split the page up further."
+PLG_READMORE_BUTTON_READMORE="Read More"
+PLG_READMORE_XML_DESCRIPTION="Enables a button which allows you to insert the <em>Read more ...</em> link into an Article."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
new file mode 100644
index 00000000..2ebbdb32
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS-XTD_READMORE="Button - Readmore"
+PLG_READMORE_XML_DESCRIPTION="Enables a button which allows you to insert the <em>Read more ...</em> link into an Article."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini b/core/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
new file mode 100644
index 00000000..cc18d89e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
@@ -0,0 +1,70 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_DESC="The colour to use for highlighting the active line. Will be displayed at 50% opacity."
+PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_LABEL="Active Line Colour"
+PLG_CODEMIRROR_FIELD_ACTIVELINE_DESC="Adds a highlight to the line the cursor is on."
+PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL="Highlight Active Line"
+PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_DESC="Automatic bracket completion."
+PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_LABEL="Bracket Completion"
+PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_DESC="Automatic tag completion."
+PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL="Tag Completion"
+; The following two strings are deprecated and will be removed in J4
+PLG_CODEMIRROR_FIELD_AUTOFOCUS_DESC="Auto focus."
+PLG_CODEMIRROR_FIELD_AUTOFOCUS_LABEL="Auto Focus"
+PLG_CODEMIRROR_FIELD_CODEFOLDING_DESC="Allow blocks of code to be folded."
+PLG_CODEMIRROR_FIELD_CODEFOLDING_LABEL="Code Folding"
+PLG_CODEMIRROR_FIELD_FONT_FAMILY_DESC="The font to use in the editor. If not installed, will be loaded from https://www.google.com/fonts/."
+PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL="Font"
+PLG_CODEMIRROR_FIELD_FONT_SIZE_DESC="The size of the font in the editor."
+PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)"
+PLG_CODEMIRROR_FIELD_FULLSCREEN_DESC="Select the function key to use to toggle fullscreen mode."
+PLG_CODEMIRROR_FIELD_FULLSCREEN_LABEL="Toggle Fullscreen"
+PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_DESC="Select any modifier keys to use with the fullscreen toggle key."
+PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL="Use Modifiers"
+PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_DESC="The background colour to use for highlighting matching tags. Will be displayed at 50% opacity."
+PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching Tag Colour"
+PLG_CODEMIRROR_FIELD_KEYMAP_DESC="Make CodeMirror work like other popular editors."
+PLG_CODEMIRROR_FIELD_KEYMAP_EMACS="Emacs"
+PLG_CODEMIRROR_FIELD_KEYMAP_LABEL="Key Map"
+PLG_CODEMIRROR_FIELD_KEYMAP_SUBLIME="Sublime Text"
+PLG_CODEMIRROR_FIELD_KEYMAP_VIM="Vim"
+PLG_CODEMIRROR_FIELD_LINE_HEIGHT_DESC="The height of one line of text. This is in ems, meaning that 1.0 is equal to the font size and 2.0 is equal to 2x the font size."
+PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL="Line Height (em)"
+PLG_CODEMIRROR_FIELD_LINENUMBERS_DESC="Display line numbers."
+PLG_CODEMIRROR_FIELD_LINENUMBERS_LABEL="Line Numbers"
+PLG_CODEMIRROR_FIELD_LINEWRAPPING_DESC="Enable/Disable line wrapping."
+PLG_CODEMIRROR_FIELD_LINEWRAPPING_LABEL="Line Wrapping"
+PLG_CODEMIRROR_FIELD_MARKERGUTTER_DESC="Code Marker and Code Folding."
+PLG_CODEMIRROR_FIELD_MARKERGUTTER_LABEL="Gutters"
+PLG_CODEMIRROR_FIELD_MATCHBRACKETS_DESC="Highlight matching brackets."
+PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL="Match Brackets"
+PLG_CODEMIRROR_FIELD_MATCHTAGS_DESC="Highlight matching tags."
+PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL="Match Tags"
+PLG_CODEMIRROR_FIELD_PREVIEW_DESC="An example of what your CodeMirror editor fields will look like with the current settings (save to update)."
+PLG_CODEMIRROR_FIELD_PREVIEW_LABEL="Preview"
+PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_DESC="Highlight instances of the selected word throughout the document."
+PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_LABEL="Highlight Selection Matches"
+PLG_CODEMIRROR_FIELD_THEME_DESC="Sets the colours for the editor."
+PLG_CODEMIRROR_FIELD_THEME_LABEL="Theme"
+PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT="Browser Default"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_ALT="Alt"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CMD="Command"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CTRL="Control"
+PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_SHIFT="Shift"
+PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DEFAULT="Default"
+PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DESC="Select the scrollbar style you'd like CodeMirror to use."
+PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_LABEL="Scrollbar Style"
+PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_OVERLAY="Overlay"
+PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_SIMPLE="Simple"
+PLG_CODEMIRROR_FIELD_VALUE_THEME_DARK="Dark"
+PLG_CODEMIRROR_FIELD_VALUE_THEME_LIGHT="Light"
+PLG_CODEMIRROR_FIELD_VIM_KEYBINDING_DESC="Select this option to make CodeMirror work in Vim mode."
+PLG_CODEMIRROR_FIELD_VIM_KEYBINDING_LABEL="Vim Keybinding"
+PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL="Appearance Options"
+PLG_CODEMIRROR_FIELDSET_TOOLBAR_OPTIONS_LABEL="Toolbar Options"
+PLG_CODEMIRROR_TOGGLE_FULL_SCREEN="Press %1$s %2$s to toggle Full Screen editing."
+PLG_CODEMIRROR_XML_DESCRIPTION="This plugin loads the CodeMirror editor."
+PLG_EDITORS_CODEMIRROR="Editor - CodeMirror"
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
new file mode 100644
index 00000000..a3c6a26c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CODEMIRROR_XML_DESCRIPTION="This plugin loads the CodeMirror editor."
+PLG_EDITORS_CODEMIRROR="Editor - CodeMirror"
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors_none.ini b/core/administrator/language/en-GB/en-GB.plg_editors_none.ini
new file mode 100644
index 00000000..82d58c6b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors_none.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS_NONE="Editor - None"
+PLG_NONE_XML_DESCRIPTION="This loads a basic text entry field."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
new file mode 100644
index 00000000..82d58c6b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS_NONE="Editor - None"
+PLG_NONE_XML_DESCRIPTION="This loads a basic text entry field."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/core/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
new file mode 100644
index 00000000..17b4ed6c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
@@ -0,0 +1,160 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS_TINYMCE="Editor - TinyMCE"
+PLG_TINY_BUTTON_TOGGLE_EDITOR="Toggle editor"
+PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC="If on, the text filter from the Joomla Global Configuration for every user group is applied. <br />If off, the filters as defined here are used for all user groups."
+PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL="Use Joomla Text Filter"
+PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT="The file name %s was entered in the TinyMCE Custom CSS field. This file could not be found in the default template folder. No styles are available."
+PLG_TINY_ERR_EDITORCSSFILENOTPRESENT="Could not find the file 'editor.css' in the template or templates/system folder. No styles are available."
+PLG_TINY_ERR_UNSUPPORTEDBROWSER="Drag and drop image upload is not available for your browser. Please consider using a fully HTML5 compatible browser."
+PLG_TINY_FIELD_ADVIMAGE_DESC="Turn on/off a more advanced image dialog."
+PLG_TINY_FIELD_ADVIMAGE_LABEL="Advanced Image"
+PLG_TINY_FIELD_ADVLIST_DESC="Turn on/off to enable to set number formats and bullet types in ordered and unordered lists."
+PLG_TINY_FIELD_ADVLIST_LABEL="Advanced List"
+PLG_TINY_FIELD_ALIGN_DESC="Turn on/off to enable the alignment of the text."
+PLG_TINY_FIELD_ALIGN_LABEL="Text Alignment"
+PLG_TINY_FIELD_BLOCKQUOTE_DESC="Turn on/off blockquotes."
+PLG_TINY_FIELD_BLOCKQUOTE_LABEL="Blockquote"
+PLG_TINY_FIELD_CODESAMPLE_DESC="Turn on/off code highlighting"
+PLG_TINY_FIELD_CODESAMPLE_LABEL="Code Sample"
+PLG_TINY_FIELD_COLORS_DESC="Show or hide the Colours control buttons."
+PLG_TINY_FIELD_COLORS_LABEL="Colours"
+PLG_TINY_FIELD_CONTEXTMENU_DESC="Turn on/off Context Menu."
+PLG_TINY_FIELD_CONTEXTMENU_LABEL="Context Menu"
+PLG_TINY_FIELD_CSS_DESC="By default the Plugin looks for an editor.css file. If it can't find one in the default template CSS folder, it loads the editor.css file from the system template."
+PLG_TINY_FIELD_CSS_LABEL="Template CSS Classes"
+PLG_TINY_FIELD_CUSTOMBUTTON_DESC="Add custom button(s)."
+PLG_TINY_FIELD_CUSTOMBUTTON_LABEL="Custom Button"
+PLG_TINY_FIELD_CUSTOMPLUGIN_DESC="Add custom plugin(s)."
+PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL="Custom Plugin"
+PLG_TINY_FIELD_CUSTOM_CSS_DESC="Optional CSS file that will override the standard editor.css file. Enter a file name to point to a file in the CSS folder of the default template (for example, templates/beez3/css/). Or enter a full URL path to the custom CSS file. If you enter a value in this field, this file will be used instead of the editor.css file."
+PLG_TINY_FIELD_CUSTOM_CSS_LABEL="Custom CSS Classes"
+PLG_TINY_FIELD_CUSTOM_PATH_DESC="The directory with the image files to be listed relative to the default image folder (set in Media > Options)."
+PLG_TINY_FIELD_CUSTOM_PATH_LABEL="Images Directory"
+PLG_TINY_FIELD_DATE_DESC="Show or hide the Insert Date button."
+PLG_TINY_FIELD_DATE_LABEL="Insert Date"
+PLG_TINY_FIELD_DIRECTION_DESC="Choose default text direction."
+PLG_TINY_FIELD_DIRECTION_LABEL="Text Direction"
+PLG_TINY_FIELD_DRAG_DROP_DESC="Enable drag and drop for uploading images"
+PLG_TINY_FIELD_DRAG_DROP_LABEL="Images Drag and Drop"
+PLG_TINY_FIELD_ELEMENTS_DESC="Allows the addition of specific valid elements to the existing rule set."
+PLG_TINY_FIELD_ELEMENTS_LABEL="Extended Valid Elements"
+PLG_TINY_FIELD_ENCODING_DESC="Controls how HTML entities are encoded. Recommended setting is 'raw'. 'named' = used named entity encoding (for example, '&lt;'). 'numeric' = use numeric HTML encoding (for example, '%03c'). raw = Do not encode HTML entities. Note that searching content may not work properly if setting is not 'raw'."
+PLG_TINY_FIELD_ENCODING_LABEL="Entity Encoding"
+PLG_TINY_FIELD_FONTS_DESC="Show or hide the Font control selectors."
+PLG_TINY_FIELD_FONTS_LABEL="Fonts"
+PLG_TINY_FIELD_FULLSCREEN_DESC="Show or hide the Fullscreen button."
+PLG_TINY_FIELD_FULLSCREEN_LABEL="Fullscreen"
+PLG_TINY_FIELD_FUNCTIONALITY_DESC="Select level of functionality."
+PLG_TINY_FIELD_FUNCTIONALITY_LABEL="Functionality"
+PLG_TINY_FIELD_HR_DESC="Show or hide the Horizontal Rule button."
+PLG_TINY_FIELD_HR_LABEL="Horizontal Rule"
+PLG_TINY_FIELD_HTMLHEIGHT_DESC="Height of HTML editor. Only applies in Advanced and Extended mode."
+PLG_TINY_FIELD_HTMLHEIGHT_LABEL="HTML Height"
+PLG_TINY_FIELD_HTMLWIDTH_DESC="Width of HTML editor. Should normally be left empty to let it flow. Only applies in Advanced and Extended mode."
+PLG_TINY_FIELD_HTMLWIDTH_LABEL="HTML Width"
+PLG_TINY_FIELD_INLINEPOPUPS_DESC="All dialogs to open as floating div layers instead of popup windows. This option can be very useful to get around popup blockers."
+PLG_TINY_FIELD_INLINEPOPUPS_LABEL="Inline Popups"
+PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS="Advanced"
+PLG_TINY_FIELD_LANGCODE_DESC="Editor UI Language. The value will be used if Automatic language is not set."
+PLG_TINY_FIELD_LANGCODE_LABEL="Language Code"
+PLG_TINY_FIELD_LANGSELECT_DESC="If Yes, editor language will automatically match selected UI language. If the tiny language does not exist, the editor language will default to English."
+PLG_TINY_FIELD_LANGSELECT_LABEL="Automatic Language Selection"
+PLG_TINY_FIELD_LINK_DESC="Select to enable the Link icons."
+PLG_TINY_FIELD_LINK_LABEL="Links"
+PLG_TINY_FIELD_MEDIA_DESC="Show or hide the Media button."
+PLG_TINY_FIELD_MEDIA_LABEL="Media"
+PLG_TINY_FIELD_MOBILE_DESC="This mode puts any mobile devices into the simple functionality with enlarged buttons for easy access."
+PLG_TINY_FIELD_MOBILE_LABEL="Mobile Mode"
+PLG_TINY_FIELD_NAME_EXTENDED_LABEL="<strong>Extended Mode Options</strong><br />Below you can set the access level for each one of the fields individually.<br />Please keep in mind that these options will only have an effect in <strong>Extended</strong> mode."
+PLG_TINY_FIELD_NEWLINES_DESC="New lines will be created using the selected option."
+PLG_TINY_FIELD_NEWLINES_LABEL="New Lines"
+PLG_TINY_FIELD_NONBREAKING_DESC="Insert non-breaking space entities."
+PLG_TINY_FIELD_NONBREAKING_LABEL="Non-breaking"
+PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL="Number of Sets"
+PLG_TINY_FIELD_NUMBER_OF_SETS_DESC="Number of sets that can be created. Minimum 3"
+PLG_TINY_FIELD_PASTE_DESC="Show or hide the Paste button."
+PLG_TINY_FIELD_PASTE_LABEL="Paste"
+PLG_TINY_FIELD_PATH_DESC="If set to ON, it displays the set classes for the marked text."
+PLG_TINY_FIELD_PATH_LABEL="Element Path"
+PLG_TINY_FIELD_PRINT_DESC="Turn on/off the print and print preview icons in the editor."
+PLG_TINY_FIELD_PRINT_LABEL="Print/Preview"
+PLG_TINY_FIELD_PROHIBITED_DESC="Elements that will be cleaned from the text. Do not leave empty - if you do not want to prohibit anything enter dummy text eg cms."
+PLG_TINY_FIELD_PROHIBITED_LABEL="Prohibited Elements"
+PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC="Enable/disable the horizontal resizing."
+PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal Resizing"
+PLG_TINY_FIELD_RESIZING_DESC="Enable/disable the resizing of the editor area (vertically and also horizontally if 'Horizontal Resizing' is enabled)."
+PLG_TINY_FIELD_RESIZING_LABEL="Resizing"
+PLG_TINY_FIELD_RTL_DESC="Show or hide the RTL button."
+PLG_TINY_FIELD_RTL_LABEL="Directionality"
+; The two following strings are deprecated
+PLG_TINY_FIELD_SAVEWARNING_DESC="Gives warning if you cancel without saving changes."
+PLG_TINY_FIELD_SAVEWARNING_LABEL="Save Warning"
+PLG_TINY_FIELD_SEARCH-REPLACE_DESC="Show or hide the Search &amp; Replace button."
+PLG_TINY_FIELD_SEARCH-REPLACE_LABEL="Search &amp; Replace"
+PLG_TINY_FIELD_SETACCESS_DESC="Restrict users that will use this set to those in the selected user groups.<br>If a user belongs to multiple groups, the set used will be the one which is assigned to a group higher in the hierarchy.<br>Example: if a set is assigned to Author and another set to Publishers, if the user belongs to both groups, the set assigned to Publishers will be used."
+PLG_TINY_FIELD_SETACCESS_LABEL="Assign this Set to"
+PLG_TINY_FIELD_SKIN_ADMIN_DESC="Select skin for the Administrator Backend interface."
+PLG_TINY_FIELD_SKIN_ADMIN_LABEL="Administrator Skin"
+PLG_TINY_FIELD_SKIN_DESC="Select skin for the Frontend interface."
+PLG_TINY_FIELD_SKIN_INFO_DESC="Copy your new skins to: /media/editors/tinymce/skins."
+PLG_TINY_FIELD_SKIN_INFO_LABEL="For customised skins go to: <a href="_QQ_"http://skin.tinymce.com"_QQ_" target="_QQ_"_blank"_QQ_">Skin Creator</a>"
+PLG_TINY_FIELD_SKIN_LABEL="Site Skin"
+PLG_TINY_FIELD_SMILIES_DESC="Show or hide the Smilies buttons."
+PLG_TINY_FIELD_SMILIES_LABEL="Smilies"
+PLG_TINY_FIELD_TABLE_DESC="Show or hide the Table control buttons."
+PLG_TINY_FIELD_TABLE_LABEL="Table"
+PLG_TINY_FIELD_TEMPLATE_DESC="Show or hide the Insert predefined template content button."
+PLG_TINY_FIELD_TEMPLATE_LABEL="Template"
+PLG_TINY_FIELD_URLS_DESC="URL behaviour."
+PLG_TINY_FIELD_URLS_LABEL="URLs"
+PLG_TINY_FIELD_VALIDELEMENTS_DESC="Defines which elements will stay in the edited text when the editor saves (the default rule set for this option is a mixture of the full HTML5 and HTML4 specification)."
+PLG_TINY_FIELD_VALIDELEMENTS_LABEL="Valid Elements"
+PLG_TINY_FIELD_VALUE_ABSOLUTE="Absolute"
+PLG_TINY_FIELD_VALUE_ADVANCED="Advanced"
+PLG_TINY_FIELD_VALUE_ALWAYS="Always"
+PLG_TINY_FIELD_VALUE_BOTTOM="Bottom"
+PLG_TINY_FIELD_VALUE_BR="BR Elements"
+PLG_TINY_FIELD_VALUE_CENTER="Center"
+PLG_TINY_FIELD_VALUE_DEFAULT="Default"
+PLG_TINY_FIELD_VALUE_EXTENDED="Extended"
+PLG_TINY_FIELD_VALUE_FRONT="Front Only"
+PLG_TINY_FIELD_VALUE_LEFT="Left"
+PLG_TINY_FIELD_VALUE_LTR="Left to Right"
+PLG_TINY_FIELD_VALUE_NAMED="named"
+PLG_TINY_FIELD_VALUE_NEVER="Never"
+PLG_TINY_FIELD_VALUE_NUMERIC="numeric"
+PLG_TINY_FIELD_VALUE_P="P Elements"
+PLG_TINY_FIELD_VALUE_RAW="raw"
+PLG_TINY_FIELD_VALUE_RELATIVE="Relative"
+PLG_TINY_FIELD_VALUE_RIGHT="Right"
+PLG_TINY_FIELD_VALUE_RTL="Right to Left"
+PLG_TINY_FIELD_VALUE_SIMPLE="Simple"
+PLG_TINY_FIELD_VALUE_TOP="Top"
+PLG_TINY_FIELD_VISUALBLOCKS_DESC="See the outline of HTML block elements."
+PLG_TINY_FIELD_VISUALBLOCKS_LABEL="Visualblocks"
+PLG_TINY_FIELD_VISUALCHARS_DESC="See invisible characters, specifically non-breaking spaces."
+PLG_TINY_FIELD_VISUALCHARS_LABEL="Visualchars"
+PLG_TINY_FIELD_WORDCOUNT_DESC="Turn on/off word count."
+PLG_TINY_FIELD_WORDCOUNT_LABEL="Word Count"
+PLG_TINY_LEGACY_WARNING="The <a href="_QQ_"%s"_QQ_">TinyMCE Editor Plugin</a> has been updated. Currently it uses your existing configuration. By editing the plugin, you can now assign and customise various layouts to specific user groups. <br />Warning: when editing the plugin, you will lose all your previous settings!"
+PLG_TINY_SET_TARGET_PANEL_DESCRIPTION="<strong>Existing sets of the TinyMCE panel, and options for each set.</strong><br />In each set you can add or remove from <strong>the available menus and buttons</strong>."
+PLG_TINY_SET_TITLE="Set %s"
+PLG_TINY_SET_PRESET_BUTTON_ADVANCED="Use advanced preset"
+PLG_TINY_SET_PRESET_BUTTON_MEDIUM="Use medium preset"
+PLG_TINY_SET_PRESET_BUTTON_SIMPLE="Use simple preset"
+PLG_TINY_SET_SOURCE_PANEL_DESCRIPTION="<strong>All available menus and buttons.</strong><br />Use them (drag and drop) to edit or build your custom TinyMCE panel."
+PLG_TINY_TEMPLATE_LAYOUT1_DESC="HTML layout."
+PLG_TINY_TEMPLATE_LAYOUT1_TITLE="Layout"
+PLG_TINY_TEMPLATE_SNIPPET1_DESC="Simple HTML snippet."
+PLG_TINY_TEMPLATE_SNIPPET1_TITLE="Simple Snippet"
+; TinyMCE toolbar buttons
+PLG_TINY_TOOLBAR_BUTTON_FONTSELECT="Font Select"
+PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT="Font Size Select"
+PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT="Format Select"
+PLG_TINY_TOOLBAR_BUTTON_STYLESELECT="Style Select"
+PLG_TINY_TOOLBAR_BUTTON_SEPARATOR="Separator"
+PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor."
diff --git a/core/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini b/core/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
new file mode 100644
index 00000000..ae9e2d86
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EDITORS_TINYMCE="Editor - TinyMCE"
+PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor."
diff --git a/core/administrator/language/en-GB/en-GB.plg_extension_joomla.ini b/core/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
new file mode 100644
index 00000000..19983aec
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EXTENSION_JOOMLA="Extension - Joomla"
+PLG_EXTENSION_JOOMLA_XML_DESCRIPTION="Manage the update sites for extensions."
+PLG_EXTENSION_JOOMLA_UNKNOWN_SITE="Unknown Site"
diff --git a/core/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini b/core/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
new file mode 100644
index 00000000..120bae6a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EXTENSION_JOOMLA="Extension - Joomla"
+PLG_EXTENSION_JOOMLA_XML_DESCRIPTION="Manage the update sites for extensions."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_calendar.ini b/core/administrator/language/en-GB/en-GB.plg_fields_calendar.ini
new file mode 100644
index 00000000..acc43d36
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_calendar.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_CALENDAR="Fields - Calendar"
+PLG_FIELDS_CALENDAR_DEFAULT_VALUE_LABEL="Default Date"
+PLG_FIELDS_CALENDAR_DEFAULT_VALUE_DESC="This is the default date. The value can be an ISO 8601 format (YYYY-MM-DD HH:MM:SS) or NOW, which displays the actual date."
+PLG_FIELDS_CALENDAR_LABEL="Calendar (%s)"
+PLG_FIELDS_CALENDAR_PARAMS_SHOWTIME_DESC="If enabled, the calendar field expects a date and time and will also display the time. The formats are localised using the regular language strings."
+PLG_FIELDS_CALENDAR_PARAMS_SHOWTIME_LABEL="Show Time"
+PLG_FIELDS_CALENDAR_XML_DESCRIPTION="This plugin lets you create new fields of type 'calendar' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini
new file mode 100644
index 00000000..cb803746
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_calendar.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_CALENDAR="Fields - Calendar"
+PLG_FIELDS_CALENDAR_XML_DESCRIPTION="This plugin lets you create new fields of type 'calendar' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini b/core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini
new file mode 100644
index 00000000..f76e652b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_CHECKBOXES="Fields - Checkboxes"
+PLG_FIELDS_CHECKBOXES_LABEL="Checkboxes (%s)"
+PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC="The values of the checkboxes."
+PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL="Checkbox Values"
+PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_VALUE_LABEL="Value"
+PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_NAME_LABEL="Text"
+PLG_FIELDS_CHECKBOXES_XML_DESCRIPTION="This plugin lets you create new fields of type 'checkboxes' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini
new file mode 100644
index 00000000..9b7a4951
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_checkboxes.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_CHECKBOXES="Fields - Checkboxes"
+PLG_FIELDS_CHECKBOXES_XML_DESCRIPTION="This plugin lets you create new fields of type 'checkboxes' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_color.ini b/core/administrator/language/en-GB/en-GB.plg_fields_color.ini
new file mode 100644
index 00000000..d2e6c1bd
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_color.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_COLOR="Fields - Colour"
+PLG_FIELDS_COLOR_LABEL="Colour (%s)"
+PLG_FIELDS_COLOR_XML_DESCRIPTION="This plugin lets you create new fields of type 'color' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini
new file mode 100644
index 00000000..bcfc7e06
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_color.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_COLOR="Fields - Colour"
+PLG_FIELDS_COLOR_XML_DESCRIPTION="This plugin lets you create new fields of type 'color' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_editor.ini b/core/administrator/language/en-GB/en-GB.plg_fields_editor.ini
new file mode 100644
index 00000000..615efee2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_editor.ini
@@ -0,0 +1,17 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_EDITOR="Fields - Editor"
+PLG_FIELDS_EDITOR_LABEL="Editor (%s)"
+PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_LABEL="Hide Buttons"
+PLG_FIELDS_EDITOR_PARAMS_FILTER_DESC="Allow the system to save certain html tags or raw data."
+PLG_FIELDS_EDITOR_PARAMS_FILTER_LABEL="Filter"
+PLG_FIELDS_EDITOR_PARAMS_HEIGHT_DESC="Defines the height (in pixels) of the WYSIWYG editor and defaults to 250px."
+PLG_FIELDS_EDITOR_PARAMS_HEIGHT_LABEL="Height"
+PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_DESC="Should the editors-xtd plugin buttons be shown?"
+PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_LABEL="Show Buttons"
+PLG_FIELDS_EDITOR_PARAMS_WIDTH_DESC="Defines the width (in pixels) of the WYSIWYG editor and defaults to 100%."
+PLG_FIELDS_EDITOR_PARAMS_WIDTH_LABEL="Width"
+PLG_FIELDS_EDITOR_XML_DESCRIPTION="This plugin lets you create new fields of type 'editor' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini
new file mode 100644
index 00000000..75fbfc8e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_editor.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_EDITOR="Fields - Editor"
+PLG_FIELDS_EDITOR_XML_DESCRIPTION="This plugin lets you create new fields of type 'editor' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_image.ini b/core/administrator/language/en-GB/en-GB.plg_fields_image.ini
new file mode 100644
index 00000000..63e727b7
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_image.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_IMAGE="Fields - Image"
+PLG_FIELDS_IMAGE_LABEL="Image (%s)"
+PLG_FIELDS_IMAGE_XML_DESCRIPTION="This plugin lets you create new fields of type 'image' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini
new file mode 100644
index 00000000..4347b378
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_image.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_IMAGE="Fields - Image"
+PLG_FIELDS_IMAGE_XML_DESCRIPTION="This plugin lets you create new fields of type 'image' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini b/core/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini
new file mode 100644
index 00000000..54979dc4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_IMAGELIST="Fields - Imagelist"
+PLG_FIELDS_IMAGELIST_LABEL="List of Images (%s)"
+PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="The directory with the image files to be listed relative to the default image folder (set in Media > Options)."
+PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL="Directory"
+PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_DESC="The class which is added to the image (src tag)."
+PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL="Image Class"
+PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected."
+PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL="Multiple"
+PLG_FIELDS_IMAGELIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'imagelist' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini
new file mode 100644
index 00000000..f21daf57
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_imagelist.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_IMAGELIST="Fields - Imagelist"
+PLG_FIELDS_IMAGELIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'imagelist' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_integer.ini b/core/administrator/language/en-GB/en-GB.plg_fields_integer.ini
new file mode 100644
index 00000000..8415cae4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_integer.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_INTEGER="Fields - Integer"
+PLG_FIELDS_INTEGER_LABEL="Integer (%s)"
+PLG_FIELDS_INTEGER_PARAMS_FIRST_DESC="This value is the lowest on the list."
+PLG_FIELDS_INTEGER_PARAMS_FIRST_LABEL="First"
+PLG_FIELDS_INTEGER_PARAMS_LAST_DESC="This value is the highest on the list."
+PLG_FIELDS_INTEGER_PARAMS_LAST_LABEL="Last"
+PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected."
+PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL="Multiple"
+PLG_FIELDS_INTEGER_PARAMS_STEP_DESC="Each option will be the previous option incremented by this integer, starting with the first value until the last value is reached."
+PLG_FIELDS_INTEGER_PARAMS_STEP_LABEL="Step"
+PLG_FIELDS_INTEGER_XML_DESCRIPTION="This plugin lets you create new fields of type 'integer' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini
new file mode 100644
index 00000000..79fd8ce0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_integer.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_INTEGER="Fields - Integer"
+PLG_FIELDS_INTEGER_XML_DESCRIPTION="This plugin lets you create new fields of type 'integer' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_list.ini b/core/administrator/language/en-GB/en-GB.plg_fields_list.ini
new file mode 100644
index 00000000..dcc3fc17
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_list.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_LIST="Fields - List"
+PLG_FIELDS_LIST_LABEL="List (%s)"
+PLG_FIELDS_LIST_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected."
+PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL="Multiple"
+PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC="The values of the list."
+PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL="List Values"
+PLG_FIELDS_LIST_PARAMS_OPTIONS_VALUE_LABEL="Value"
+PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL="Text"
+PLG_FIELDS_LIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'list' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini
new file mode 100644
index 00000000..1055c1ec
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_list.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_LIST="Fields - List"
+PLG_FIELDS_LIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'list' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_media.ini b/core/administrator/language/en-GB/en-GB.plg_fields_media.ini
new file mode 100644
index 00000000..8047cdc0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_media.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_MEDIA="Fields - Media"
+PLG_FIELDS_MEDIA_LABEL="Media (%s)"
+PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC="The directory with the image files to be listed relative to the default image folder (set in Media > Options)."
+PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL="Directory"
+PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_DESC="The class which is added to the image (src tag)."
+PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_LABEL="Image Class"
+PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC="Shows or hides the preview of the selected image."
+PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE="Inline"
+PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL="Preview"
+PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP="Tooltip"
+PLG_FIELDS_MEDIA_XML_DESCRIPTION="This plugin lets you create new fields of type 'media' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini
new file mode 100644
index 00000000..cc3afe3d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_media.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_MEDIA="Fields - Media"
+PLG_FIELDS_MEDIA_XML_DESCRIPTION="This plugin lets you create new fields of type 'media' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_radio.ini b/core/administrator/language/en-GB/en-GB.plg_fields_radio.ini
new file mode 100644
index 00000000..ca70c1b4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_radio.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_RADIO="Fields - Radio"
+PLG_FIELDS_RADIO_LABEL="Radio (%s)"
+PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC="The values of the radio list."
+PLG_FIELDS_RADIO_PARAMS_OPTIONS_NAME_LABEL="Text"
+PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL="Radio Values"
+PLG_FIELDS_RADIO_PARAMS_OPTIONS_VALUE_LABEL="Value"
+PLG_FIELDS_RADIO_XML_DESCRIPTION="This plugin lets you create new fields of type 'radio' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini
new file mode 100644
index 00000000..edfc7aa4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_radio.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_RADIO="Fields - Radio"
+PLG_FIELDS_RADIO_XML_DESCRIPTION="This plugin lets you create new fields of type 'radio' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_sql.ini b/core/administrator/language/en-GB/en-GB.plg_fields_sql.ini
new file mode 100644
index 00000000..0ca95c90
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_sql.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_SQL="Fields - SQL"
+PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE="Only a Super User can create an SQL field!"
+PLG_FIELDS_SQL_LABEL="SQL (%s)"
+PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected."
+PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple"
+; In the string below the terms 'value' and 'text' should not be translated
+PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' with the text in the dropdown list."
+PLG_FIELDS_SQL_PARAMS_QUERY_LABEL="Query"
+PLG_FIELDS_SQL_RULES_ADAPTED="For increased security the edit permission for this SQL field was set to denied for all non Super Users."
+PLG_FIELDS_SQL_XML_DESCRIPTION="This plugin lets you create new fields of type 'sql' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini
new file mode 100644
index 00000000..a400989f
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_sql.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_SQL="Fields - SQL"
+PLG_FIELDS_SQL_XML_DESCRIPTION="This plugin lets you create new fields of type 'sql' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_text.ini b/core/administrator/language/en-GB/en-GB.plg_fields_text.ini
new file mode 100644
index 00000000..41a1373d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_text.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_TEXT="Fields - Text"
+PLG_FIELDS_TEXT_LABEL="Text (%s)"
+PLG_FIELDS_TEXT_PARAMS_FILTER_DESC="Allow the system to save certain html tags or raw data."
+PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL="Filter"
+PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_LABEL="Maximum Length"
+PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_DESC="The maximum number of characters that can be entered."
+PLG_FIELDS_TEXT_XML_DESCRIPTION="This plugin lets you create new fields of type 'text' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini
new file mode 100644
index 00000000..cccdd863
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_text.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_TEXT="Fields - Text"
+PLG_FIELDS_TEXT_XML_DESCRIPTION="This plugin lets you create new fields of type 'text' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_textarea.ini b/core/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
new file mode 100644
index 00000000..50c63b8f
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_TEXTAREA="Fields - Textarea"
+PLG_FIELDS_TEXTAREA_LABEL="Text Area (%s)"
+PLG_FIELDS_TEXTAREA_PARAMS_COLS_DESC="The width of the visible text area in characters. If omitted the width is determined by the browser. The value does not limit the number of characters that may be entered."
+PLG_FIELDS_TEXTAREA_PARAMS_COLS_LABEL="Columns"
+PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC="Allow the system to save certain html tags or raw data."
+PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL="Filter"
+PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_LABEL="Maximum Length"
+PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_DESC="The maximum number of characters that can be entered."
+PLG_FIELDS_TEXTAREA_PARAMS_ROWS_DESC="The height of the visible text area in lines. If omitted the height is determined by the browser. The value does not limit the number of lines that may be entered."
+PLG_FIELDS_TEXTAREA_PARAMS_ROWS_LABEL="Rows"
+PLG_FIELDS_TEXTAREA_XML_DESCRIPTION="This plugin lets you create new fields of type 'textarea' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini
new file mode 100644
index 00000000..a312cf56
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_textarea.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_TEXTAREA="Fields - Textarea"
+PLG_FIELDS_TEXTAREA_XML_DESCRIPTION="This plugin lets you create new fields of type 'textarea' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_url.ini b/core/administrator/language/en-GB/en-GB.plg_fields_url.ini
new file mode 100644
index 00000000..4b0888a2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_url.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_URL="Fields - URL"
+PLG_FIELDS_URL_LABEL="URL (%s)"
+PLG_FIELDS_URL_PARAMS_RELATIVE_DESC="Are relative URLs allowed."
+PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL="Relative"
+PLG_FIELDS_URL_PARAMS_SCHEMES_DESC="The allowed schemes."
+PLG_FIELDS_URL_PARAMS_SCHEMES_LABEL="Schemes"
+PLG_FIELDS_URL_XML_DESCRIPTION="This plugin lets you create new fields of type 'URL' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini
new file mode 100644
index 00000000..316f43a5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_url.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_URL="Fields - URL"
+PLG_FIELDS_URL_XML_DESCRIPTION="This plugin lets you create new fields of type 'URL' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_user.ini b/core/administrator/language/en-GB/en-GB.plg_fields_user.ini
new file mode 100644
index 00000000..5891df07
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_user.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_USER="Fields - User"
+PLG_FIELDS_USER_DEFAULT_VALUE_DESC="The default user."
+PLG_FIELDS_USER_DEFAULT_VALUE_LABEL="Default User"
+PLG_FIELDS_USER_LABEL="User (%s)"
+PLG_FIELDS_USER_XML_DESCRIPTION="This plugin lets you create new fields of type 'user' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini
new file mode 100644
index 00000000..cd088239
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_user.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_USER="Fields - User"
+PLG_FIELDS_USER_XML_DESCRIPTION="This plugin lets you create new fields of type 'user' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini b/core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini
new file mode 100644
index 00000000..97612a28
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_USERGROUPLIST="Fields - Usergrouplist"
+PLG_FIELDS_USERGROUPLIST_DEFAULT_VALUE_DESC="A comma separated list of user group ids."
+PLG_FIELDS_USERGROUPLIST_DEFAULT_VALUE_LABEL="Default User Groups"
+PLG_FIELDS_USERGROUPLIST_LABEL="User Groups (%s)"
+PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected."
+PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL="Multiple"
+PLG_FIELDS_USERGROUPLIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'usergrouplist' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini b/core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini
new file mode 100644
index 00000000..5200b4eb
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_USERGROUPLIST="Fields - Usergrouplist"
+PLG_FIELDS_USERGROUPLIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'usergrouplist' in any extensions where custom fields are supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_categories.ini b/core/administrator/language/en-GB/en-GB.plg_finder_categories.ini
new file mode 100644
index 00000000..35d19da9
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_categories.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_CATEGORIES="Smart Search - Categories"
+PLG_FINDER_CATEGORIES_XML_DESCRIPTION="This plugin indexes Joomla! Categories."
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini b/core/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
new file mode 100644
index 00000000..0864389a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_CATEGORIES="Smart Search - Categories"
+PLG_FINDER_CATEGORIES_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;Smart Search - Categories&quot; plugin."
+PLG_FINDER_CATEGORIES_XML_DESCRIPTION="This plugin indexes Joomla! Categories."
+PLG_FINDER_STATISTICS_CATEGORY="Category"
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_contacts.ini b/core/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
new file mode 100644
index 00000000..80aa8b86
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_CONTACTS="Smart Search - Contacts"
+PLG_FINDER_CONTACTS_XML_DESCRIPTION="This plugin indexes Joomla! Contacts."
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P_CONTACT="Contacts"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_COUNTRY="Countries"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_REGION="Regions"
+
+PLG_FINDER_QUERY_FILTER_BRANCH_S_CONTACT="Contact"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_COUNTRY="Country"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_REGION="Region"
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini b/core/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
new file mode 100644
index 00000000..832df889
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_CONTACTS="Smart Search - Contacts"
+PLG_FINDER_CONTACTS_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;Smart Search - Contacts&quot; plugin."
+PLG_FINDER_CONTACTS_XML_DESCRIPTION="This plugin indexes Joomla! Contacts."
+PLG_FINDER_STATISTICS_CONTACT="Contact"
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_content.ini b/core/administrator/language/en-GB/en-GB.plg_finder_content.ini
new file mode 100644
index 00000000..13508bae
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_content.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_CONTENT="Smart Search - Content"
+PLG_FINDER_CONTENT_XML_DESCRIPTION="Updates the indexes of Joomla! Articles whenever an article is created, modified or deleted. NOTE the Content - Smart Search plugin must be enabled."
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P_ARTICLE="Articles"
+PLG_FINDER_QUERY_FILTER_BRANCH_P_AUTHOR="Authors"
+
+PLG_FINDER_QUERY_FILTER_BRANCH_S_ARTICLE="Article"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_AUTHOR="Author"
+
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini b/core/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
new file mode 100644
index 00000000..89a81348
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_CONTENT="Smart Search - Content"
+PLG_FINDER_CONTENT_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;Smart Search - Content&quot; plugin."
+PLG_FINDER_CONTENT_XML_DESCRIPTION="Updates the indexes of Joomla! Articles whenever an article is created, modified or deleted. NOTE the Content - Smart Search plugin must be enabled."
+PLG_FINDER_STATISTICS_ARTICLE="Article"
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini b/core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
new file mode 100644
index 00000000..eb97acf5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_NEWSFEEDS="Smart Search - News Feeds"
+PLG_FINDER_NEWSFEEDS_XML_DESCRIPTION="This plugin indexes Joomla! News feeds."
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P_NEWS_FEED="News feeds"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_NEWS_FEED="News feed"
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini b/core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
new file mode 100644
index 00000000..857f3d30
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_NEWSFEEDS="Smart Search - News Feeds"
+PLG_FINDER_NEWSFEEDS_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;Smart Search - Joomla! News Feeds&quot; plugin."
+PLG_FINDER_NEWSFEEDS_XML_DESCRIPTION="This plugin indexes Joomla! News feeds."
+PLG_FINDER_STATISTICS_NEWS_FEED="News Feed"
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_tags.ini b/core/administrator/language/en-GB/en-GB.plg_finder_tags.ini
new file mode 100644
index 00000000..6a230584
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_tags.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P_TAG="Tags"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_TAG="Tag"
+PLG_FINDER_TAGS="Smart Search - Tags"
+PLG_FINDER_TAGS_XML_DESCRIPTION="This plugin indexes Joomla! Tags."
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini b/core/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
new file mode 100644
index 00000000..7ed87669
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_STATISTICS_TAG="Tag"
+PLG_FINDER_TAGS="Smart Search - Tags"
+PLG_FINDER_TAGS_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;Smart Search - Tags&quot; plugin."
+PLG_FINDER_TAGS_XML_DESCRIPTION="This plugin indexes Joomla! Tags."
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini b/core/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
new file mode 100644
index 00000000..aaf6bc17
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_WEBLINKS="Smart Search - Web Links"
+PLG_FINDER_WEBLINKS_XML_DESCRIPTION="This plugin indexes Joomla! Web Links."
+
+PLG_FINDER_QUERY_FILTER_BRANCH_P_WEB_LINK="Web links"
+PLG_FINDER_QUERY_FILTER_BRANCH_S_WEB_LINK="Web link"
diff --git a/core/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini b/core/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
new file mode 100644
index 00000000..20094e1b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FINDER_STATISTICS_WEB_LINK="Web Link"
+PLG_FINDER_WEBLINKS="Smart Search - Web Links"
+PLG_FINDER_WEBLINKS_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;Smart Search - Web Links&quot; plugin."
+PLG_FINDER_WEBLINKS_XML_DESCRIPTION="This plugin indexes Joomla! Web Links."
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini b/core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini
new file mode 100644
index 00000000..a9d19b36
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_FOLDERINSTALLER_TEXT="Install from Folder"
+PLG_INSTALLER_FOLDERINSTALLER_BUTTON="Check and Install"
+PLG_INSTALLER_FOLDERINSTALLER_NO_INSTALL_PATH="Please enter a Folder."
+PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a folder."
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini b/core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini
new file mode 100644
index 00000000..e13df44d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_folderinstaller.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_FOLDERINSTALLER="Installer - Install from Folder"
+PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a folder."
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini b/core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini
new file mode 100644
index 00000000..f2747e0d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_PACKAGEINSTALLER_DRAG_FILE_HERE="Drag and drop file here to upload."
+PLG_INSTALLER_PACKAGEINSTALLER_EXTENSION_PACKAGE_FILE="Extension package file"
+PLG_INSTALLER_PACKAGEINSTALLER_NO_PACKAGE="Please select a package to upload"
+PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from your local computer."
+PLG_INSTALLER_PACKAGEINSTALLER_SELECT_FILE="Or browse for file"
+PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install Joomla Extension"
+PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_PACKAGE_FILE="Upload Package File"
+PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_AND_INSTALL="Upload & Install"
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini b/core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini
new file mode 100644
index 00000000..0be372c2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_packageinstaller.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_PACKAGEINSTALLER="Installer - Install from Upload"
+PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from your local computer."
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini b/core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
new file mode 100644
index 00000000..e90fecda
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_URLINSTALLER_BUTTON="Check and Install"
+PLG_INSTALLER_URLINSTALLER_INSTALLER_URLFOLDERINSTALLER="Installer - Install from URL."
+PLG_INSTALLER_URLINSTALLER_NO_URL="Please enter a URL."
+PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a URL."
+PLG_INSTALLER_URLINSTALLER_TEXT="Install from URL"
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini b/core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini
new file mode 100644
index 00000000..bf75762a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_urlinstaller.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION="This plugin allows you to install packages from a URL."
+PLG_INSTALLER_URLINSTALLER="Installer - Install from URL"
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
new file mode 100644
index 00000000..82610224
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
@@ -0,0 +1,12 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_WEBINSTALLER="Installer - Install from Web"
+PLG_INSTALLER_WEBINSTALLER_LOAD_APPS="Display the extensions"
+PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_DESC="Place the Install from Web tab first or last."
+PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_LABEL="Tab Position"
+PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_FIRST="First"
+PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_LAST="Last"
+PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin offers functionality for the 'Install from Web' tab."
diff --git a/core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini b/core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
new file mode 100644
index 00000000..5149faf1
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_INSTALLER_WEBINSTALLER="Installer - Install from Web"
+PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin offers functionality for the 'Install from Web' tab."
diff --git a/core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
new file mode 100644
index 00000000..81f7d7b6
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_EXTENSIONUPDATE="Quick Icon - Joomla! Extensions Updates Notification"
+PLG_QUICKICON_EXTENSIONUPDATE_CHECKING="Checking extensions ..."
+PLG_QUICKICON_EXTENSIONUPDATE_ERROR="Unknown extensions ..."
+PLG_QUICKICON_EXTENSIONUPDATE_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
+PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL="Group"
+PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND="Updates are available! <span class='label label-important'>%s</span>"
+PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON="View Updates"
+PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE="<span class='label label-important'>%s</span> Extension Update(s) are available:"
+PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="All extensions are up to date."
+PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION="Checks for updates of your installed third-party extensions and notifies you when you visit the Control Panel page."
diff --git a/core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini b/core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
new file mode 100644
index 00000000..3625c7b5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_EXTENSIONUPDATE="Quick Icon - Joomla! Extensions Updates Notification"
+PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION="Checks for updates of your installed third-party extensions and notifies you when you visit the Control Panel page."
diff --git a/core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
new file mode 100644
index 00000000..7541d4d7
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_JOOMLAUPDATE="Quick Icon - Joomla Update Notification"
+PLG_QUICKICON_JOOMLAUPDATE_CHECKING="Checking Joomla..."
+PLG_QUICKICON_JOOMLAUPDATE_ERROR="Unknown Joomla..."
+PLG_QUICKICON_JOOMLAUPDATE_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
+PLG_QUICKICON_JOOMLAUPDATE_GROUP_LABEL="Group"
+PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND="Joomla <span class='label label-important'>%s</span>, Update now!"
+PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON="Update Now"
+PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE="Joomla <span class='label label-important'>%s</span> is available:"
+PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="Joomla is up to date."
+PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION="Checks for Joomla updates and notifies you when you visit the Control Panel page."
diff --git a/core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini b/core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
new file mode 100644
index 00000000..03ae8301
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_JOOMLAUPDATE="Quick Icon - Joomla! Update Notification"
+PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION="Checks for Joomla! updates and notifies you when you visit the Control Panel page."
diff --git a/core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini b/core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini
new file mode 100644
index 00000000..c4fe47d5
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_PHPVERSIONCHECK="Quick Icon - PHP Version Check"
+; Key 1 is the server's current PHP version, key 2 is the date at which support will end for the current PHP version
+PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes at this time from the PHP project. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version (PHP 7.x is recommended). Please contact your host for upgrade instructions."
+; Key 1 is the server's current PHP version, key 2 is the recommended PHP version, and key 3 is the date at which support will end for the recommended PHP version
+PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. The Joomla! Project recommends upgrading your site to PHP %2$s or later which will receive security updates at least until %3$s. Please ask your host to make PHP %2$s or a later version the default version for your site. If your host is already PHP %2$s ready please enable PHP %2$s on your site's root and 'administrator' directories – typically you can do this yourself through a tool in your hosting control panel, but it's best to ask your host if you are unsure."
+PLG_QUICKICON_PHPVERSIONCHECK_XML_DESCRIPTION="Checks the support status of your installation's PHP version and raises a warning if not fully supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini b/core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini
new file mode 100644
index 00000000..605dc09a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_quickicon_phpversioncheck.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_QUICKICON_PHPVERSIONCHECK="Quick Icon - PHP Version Check"
+PLG_QUICKICON_PHPVERSIONCHECK_XML_DESCRIPTION="Checks the support status of your installation's PHP version and raises a warning if not fully supported."
diff --git a/core/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini b/core/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
new file mode 100644
index 00000000..f0dacd22
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_sampledata_blog.ini
@@ -0,0 +1,64 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SAMPLEDATA_BLOG="Sample Data - Blog"
+PLG_SAMPLEDATA_BLOG_OVERVIEW_DESC="Sample data which will set up a blog site.<br>If the site is multilingual, the data will be tagged to the active backend language."
+PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE="Blog Sample data"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_INTROTEXT="<p>This tells you a bit about this blog and the person who writes it. </p><p>When you are logged in you will be able to edit this page by selecting the edit icon.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_TITLE="About"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or 'back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the top menu. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. In the Extensions menu select Extensions Manager and then go to the Install tab. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules, articles or weblinks setting the Access level to Registered will mean that only logged in users can see them</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href='https://docs.joomla.org/'>Joomla documentation site</a> and get help from other users at the <a href='https://forum.joomla.org/'>Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_TITLE="Working on Your Site"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_INTROTEXT="<p>This is a sample blog posting.</p><p>If you log in to the site (the Author Login link is on the very bottom of this page) you will be able to edit it and all of the other existing articles. You will also be able to create a new article and make other changes to the site.</p><p>As you add and modify articles you will see how your site changes and also how you can customise it in various ways.</p><p>Go ahead, you can't break it.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_2_TITLE="Welcome to your blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_FULLTEXT="<p>On the full page you will see both the introductory content and the rest of the article. You can change the settings to hide the introduction if you want.</p><p></p><p></p><p></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is set to display the four most recent articles from the blog category in a column. Then there are links to the 4 next oldest articles. You can change those numbers by editing the content options settings in the blog tab in your site administrator. There is a link to your site administrator in the top menu.</p><p>If you want to have your blog post broken into two parts, an introduction and then a full length separate page, use the Read More button to insert a break.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image Module which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Most Read Posts which lists articles based on the number of times they have been read.</li><li>Older Articles which lists out articles by month.</li><li>Syndicate which allows your readers to read your posts in a news reader.</li><li>Popular Tags, which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. Moving your mouse over a module and selecting the edit icon will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more module that you can find at the <a href='https://extensions.joomla.org/'>Joomla Extensions Directory.</a></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Protostar template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the top menu (visible when you login).</p><p>For example you can change the site background color, highlights color, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_TITLE="Your Template"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE="Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE="Help"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE="Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE="About"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE="Author Login"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE="Create a Post"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE="Working on Your Site"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_5_TITLE="Site Administrator"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE="Change Password"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE="Log out"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE="Author Login"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_9_TITLE="Site Settings"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE="Template Settings"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_0_DESCRIPTION="The main menu for the site"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_0_TITLE="Main Menu Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_1_DESCRIPTION=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_1_TITLE="Author Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_2_DESCRIPTION=""
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_2_TITLE="Bottom Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_0_TITLE="Main Menu Blog"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_1_TITLE="Author Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_2_TITLE="Syndication"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_3_TITLE="Archived Articles"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_4_TITLE="Most Read Posts"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_5_TITLE="Older Posts"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_6_TITLE="Bottom Menu"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_7_TITLE="Search"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE="Image"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_9_TITLE="Popular Tags"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_10_TITLE="Similar Items"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_11_TITLE="Site Information"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_12_TITLE="Release News"
+PLG_SAMPLEDATA_BLOG_STEP_FAILED="Step %1$u Failed: %2$s"
+PLG_SAMPLEDATA_BLOG_STEP_SKIPPED="Step %1$u Skipped: '%2$s' is either not installed or disabled."
+PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS="Step 1: Articles done!"
+PLG_SAMPLEDATA_BLOG_STEP2_SUCCESS="Step 2: Menus done!"
+PLG_SAMPLEDATA_BLOG_STEP3_SUCCESS="Step 3: Modules done!"
+PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION="Provides the blog sample data. Can be installed using the sample data module."
diff --git a/core/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini b/core/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
new file mode 100644
index 00000000..f5b59750
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_sampledata_blog.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SAMPLEDATA_BLOG="Sample Data - Blog"
+PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION="Provides the blog sample data. Can be installed using the sample data module."
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_categories.ini b/core/administrator/language/en-GB/en-GB.plg_search_categories.ini
new file mode 100644
index 00000000..cc032df4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_categories.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+PLG_SEARCH_CATEGORIES_CATEGORIES="Categories"
+PLG_SEARCH_CATEGORIES="Search - Categories"
+PLG_SEARCH_CATEGORIES_FIELD_SEARCHLIMIT_DESC="Number of search items to return."
+PLG_SEARCH_CATEGORIES_FIELD_SEARCHLIMIT_LABEL="Search Limit"
+PLG_SEARCH_CATEGORIES_XML_DESCRIPTION="Enables searching of Category information."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini b/core/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
new file mode 100644
index 00000000..6d23dbcd
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_CATEGORIES="Search - Categories"
+PLG_SEARCH_CATEGORIES_XML_DESCRIPTION="Enables searching of Category information."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_contacts.ini b/core/administrator/language/en-GB/en-GB.plg_search_contacts.ini
new file mode 100644
index 00000000..81003bcd
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_contacts.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_CONTACTS="Search - Contacts"
+PLG_SEARCH_CONTACTS_CONTACTS="Contacts"
+PLG_SEARCH_CONTACTS_FIELD_SEARCHLIMIT_DESC="Number of search items to return."
+PLG_SEARCH_CONTACTS_FIELD_SEARCHLIMIT_LABEL="Search Limit"
+PLG_SEARCH_CONTACTS_XML_DESCRIPTION="Enables searching of the Contact Component."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini b/core/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
new file mode 100644
index 00000000..95d672c8
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_CONTACTS="Search - Contacts"
+PLG_SEARCH_CONTACTS_XML_DESCRIPTION="Enables searching of the Contact Component."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_content.ini b/core/administrator/language/en-GB/en-GB.plg_search_content.ini
new file mode 100644
index 00000000..f7cfa5bd
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_content.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_CONTENT="Search - Content"
+PLG_SEARCH_CONTENT_FIELD_ARCHIVED_DESC="Enables searching of Archived Articles."
+PLG_SEARCH_CONTENT_FIELD_ARCHIVED_LABEL="Archived Articles"
+PLG_SEARCH_CONTENT_FIELD_CONTENT_DESC="Enables searching of all Articles."
+PLG_SEARCH_CONTENT_FIELD_CONTENT_LABEL="Articles"
+PLG_SEARCH_CONTENT_FIELD_SEARCHLIMIT_DESC="Number of search items to return."
+PLG_SEARCH_CONTENT_FIELD_SEARCHLIMIT_LABEL="Search Limit"
+PLG_SEARCH_CONTENT_XML_DESCRIPTION="Enables searching in Articles."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_content.sys.ini b/core/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
new file mode 100644
index 00000000..0ec97e3a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_CONTENT="Search - Content"
+PLG_SEARCH_CONTENT_XML_DESCRIPTION="Enables searching in Articles."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini b/core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
new file mode 100644
index 00000000..3cc45d5b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_NEWSFEEDS="Search - News Feeds"
+PLG_SEARCH_NEWSFEEDS_FIELD_SEARCHLIMIT_DESC="Number of search items to return."
+PLG_SEARCH_NEWSFEEDS_FIELD_SEARCHLIMIT_LABEL="Search Limit"
+PLG_SEARCH_NEWSFEEDS_NEWSFEEDS="News Feeds"
+PLG_SEARCH_NEWSFEEDS_XML_DESCRIPTION="Enables searching of News feeds."
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini b/core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
new file mode 100644
index 00000000..918dc803
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_NEWSFEEDS="Search - News Feeds"
+PLG_SEARCH_NEWSFEEDS_XML_DESCRIPTION="Enables searching of news feeds."
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_tags.ini b/core/administrator/language/en-GB/en-GB.plg_search_tags.ini
new file mode 100644
index 00000000..b37087a9
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_tags.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_TAGS="Search - Tags"
+PLG_SEARCH_TAGS_FIELD_SEARCHLIMIT_DESC="Number of search items to return."
+PLG_SEARCH_TAGS_FIELD_SEARCHLIMIT_LABEL="Search Limit"
+PLG_SEARCH_TAGS_FIELD_SHOW_TAGGED_ITEMS_DESC="Display or not the items that hold the tags related to the search."
+PLG_SEARCH_TAGS_FIELD_SHOW_TAGGED_ITEMS_LABEL="Show Tagged Items"
+PLG_SEARCH_TAGS_ITEM_TAGGED_WITH="%s tagged with: %s"
+PLG_SEARCH_TAGS_TAGS="Tags"
+PLG_SEARCH_TAGS_XML_DESCRIPTION="Enables searching in Tags."
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini b/core/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
new file mode 100644
index 00000000..0b024eaf
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_TAGS="Search - Tags"
+PLG_SEARCH_TAGS_XML_DESCRIPTION="Enables searching in Tags."
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_weblinks.ini b/core/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
new file mode 100644
index 00000000..518ef861
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_WEBLINKS="Search - Web Links"
+PLG_SEARCH_WEBLINKS_FIELD_SEARCHLIMIT_DESC="Number of search items to return."
+PLG_SEARCH_WEBLINKS_FIELD_SEARCHLIMIT_LABEL="Search Limit"
+PLG_SEARCH_WEBLINKS_WEBLINKS="Web Links"
+PLG_SEARCH_WEBLINKS_XML_DESCRIPTION="Enables searching of Web Links Component."
diff --git a/core/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/core/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
new file mode 100644
index 00000000..c115072d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEARCH_WEBLINKS="Search - Web Links"
+PLG_SEARCH_WEBLINKS_XML_DESCRIPTION="Enables searching of Web Links Component."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_cache.ini b/core/administrator/language/en-GB/en-GB.plg_system_cache.ini
new file mode 100644
index 00000000..91daea81
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_cache.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CACHE_FIELD_BROWSERCACHE_DESC="If yes, use mechanism for storing page cache in the browser."
+PLG_CACHE_FIELD_BROWSERCACHE_LABEL="Use Browser Caching"
+PLG_CACHE_FIELD_EXCLUDE_DESC="Specify which URLs you want to exclude from caching, each on a separate line. Regular expressions are supported, eg. <br /><strong>about\-[a-z]+</strong> - will exclude all URLs that have 'about-', for example 'about-us', 'about-me', 'about-joomla' etc.<br /><strong>\/component\/users\/</strong> - will exclude all URLs that have /component/users/"
+PLG_CACHE_FIELD_EXCLUDE_LABEL="Exclude URLs"
+PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_DESC="Select which menu items you want to exclude from caching."
+PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_LABEL="Exclude Menu Items"
+PLG_CACHE_FIELD_LIFETIME_DESC="Page cache lifetime in minutes."
+PLG_CACHE_FIELD_LIFETIME_LABEL="Cache Lifetime"
+PLG_CACHE_XML_DESCRIPTION="Provides page caching."
+PLG_SYSTEM_CACHE="System - Page Cache"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
new file mode 100644
index 00000000..f60ac92b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+PLG_CACHE_XML_DESCRIPTION="Provides page caching."
+PLG_SYSTEM_CACHE="System - Page Cache"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_debug.ini b/core/administrator/language/en-GB/en-GB.plg_system_debug.ini
new file mode 100644
index 00000000..b626d0d9
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_debug.ini
@@ -0,0 +1,106 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_DEBUG_BYTES="Bytes"
+PLG_DEBUG_CALL_STACK="Call Stack"
+PLG_DEBUG_CALL_STACK_CALLER="Caller"
+PLG_DEBUG_CALL_STACK_FILE_AND_LINE="File and line number"
+PLG_DEBUG_CALL_STACK_SAME_FILE="<em>Same as call in the line below.</em>"
+PLG_DEBUG_ERRORS="Errors"
+PLG_DEBUG_EXPLAIN="Explain"
+PLG_DEBUG_FIELD_ALLOWED_GROUPS_DESC="Optionally restrict users that can see debug information to those in the selected user groups. If none selected, all users will see the debug information."
+PLG_DEBUG_FIELD_ALLOWED_GROUPS_LABEL="Allowed Groups"
+PLG_DEBUG_FIELD_EXECUTEDSQL_DESC="If enabled, executed SQL queries will be logged. Only use this setting for short periods of time and for benchmarking purposes."
+PLG_DEBUG_FIELD_EXECUTEDSQL_LABEL="Log Executed Queries"
+PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_DESC="Display a list of the language files that are in error according to the Joomla ini specification."
+PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_LABEL="Show Errors When Parsing Language Files"
+PLG_DEBUG_FIELD_LANGUAGE_FILES_DESC="Display a list of the language files that Joomla has tried to load."
+PLG_DEBUG_FIELD_LANGUAGE_FILES_LABEL="Show Language Files"
+PLG_DEBUG_FIELD_LANGUAGE_STRING_DESC="Display a list of the untranslated language strings."
+PLG_DEBUG_FIELD_LANGUAGE_STRING_LABEL="Show Language String"
+PLG_DEBUG_FIELD_LOGS_DESC="Display a list of logged messages."
+PLG_DEBUG_FIELD_LOGS_LABEL="Show Log Entries"
+PLG_DEBUG_FIELD_LOG_CATEGORIES_DESC="A comma separated list of log categories to include. Common log categories include but are not limited to: database, databasequery, database-error, deprecated and jerror. If empty, all categories will be shown."
+PLG_DEBUG_FIELD_LOG_CATEGORIES_LABEL="Log Categories"
+PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_DESC="Select if the listed categories should be included or excluded."
+PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_EXCLUDE="Exclude"
+PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_INCLUDE="Include"
+PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_LABEL="Log Category Mode"
+PLG_DEBUG_FIELD_LOG_DEPRECATED_DESC="If enabled, API marked as deprecated will be logged. Only use this setting for short periods of time for refactoring purposes."
+PLG_DEBUG_FIELD_LOG_DEPRECATED_LABEL="Log Deprecated API"
+PLG_DEBUG_FIELD_LOG_EVERYTHING_DESC="If enabled, all log messages produced by Joomla! will be logged except for deprecated API and database queries. Only use this setting for short periods of time for site debugging purposes."
+PLG_DEBUG_FIELD_LOG_EVERYTHING_LABEL="Log Almost Everything"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_ALERT="Alert"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_ALL="All"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_CRITICAL="Critical"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_DEBUG="Debug"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_DESC="Select which log priority levels to display."
+PLG_DEBUG_FIELD_LOG_PRIORITIES_EMERGENCY="Emergency"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_ERROR="Error"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_INFO="Info"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_LABEL="Log Priorities"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_NOTICE="Notice"
+PLG_DEBUG_FIELD_LOG_PRIORITIES_WARNING="Warning"
+PLG_DEBUG_FIELD_MEMORY_DESC="Display the total memory usage."
+PLG_DEBUG_FIELD_MEMORY_LABEL="Show Memory Usage"
+PLG_DEBUG_FIELD_PROFILING_DESC="Display the profiling waypoints."
+PLG_DEBUG_FIELD_PROFILING_LABEL="Show Profiling"
+PLG_DEBUG_FIELD_QUERIES_DESC="Display a list of the queries executed while displaying the page."
+PLG_DEBUG_FIELD_QUERIES_LABEL="Show Queries"
+PLG_DEBUG_FIELD_QUERY_TYPES_DESC="Display a list of unique query types and their number of occurrences for the current page. Useful for finding out about repeated queries that are either redundant or which can be grouped into a single, more efficient query."
+PLG_DEBUG_FIELD_QUERY_TYPES_LABEL="Show Query Types"
+PLG_DEBUG_FIELD_REFRESH_ASSETS_DESC="If enabled will, on each page reload, add a different hash to every script/stylesheet file with auto version so that they never use the browser cache."
+PLG_DEBUG_FIELD_REFRESH_ASSETS_LABEL="Refresh Assets"
+PLG_DEBUG_FIELD_SESSION_DESC="Display the session data."
+PLG_DEBUG_FIELD_SESSION_LABEL="Show Session Data"
+PLG_DEBUG_FIELD_STRIP_FIRST_DESC="In multi-word strings, always strip the first word."
+PLG_DEBUG_FIELD_STRIP_FIRST_LABEL="Strip First Word"
+PLG_DEBUG_FIELD_STRIP_PREFIX_DESC="Strip words from the beginning of the string. For multiple words, use the format: (word1|word2)."
+PLG_DEBUG_FIELD_STRIP_PREFIX_LABEL="Strip From Start"
+PLG_DEBUG_FIELD_STRIP_SUFFIX_DESC="Strip words from the end of the string. For multiple words, use the format: (word1|word2)."
+PLG_DEBUG_FIELD_STRIP_SUFFIX_LABEL="Strip From End"
+PLG_DEBUG_LANGUAGE_FIELDSET_LABEL="Language"
+PLG_DEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files"
+PLG_DEBUG_LANGUAGE_FILES_LOADED="Language Files Loaded"
+PLG_DEBUG_LANG_LOADED="Loaded"
+PLG_DEBUG_LANG_NOT_LOADED="Not loaded"
+PLG_DEBUG_LINK_FORMAT="Add xdebug.file_link_format directive to your php.ini file to have links for files."
+PLG_DEBUG_LOGGING_FIELDSET_LABEL="Logging"
+PLG_DEBUG_LOGS="Log Messages"
+PLG_DEBUG_LOGS_DEPRECATED_FOUND_TEXT="The code that is marked as deprecated will not work in upcoming Joomla versions, please review it."
+PLG_DEBUG_LOGS_DEPRECATED_FOUND_TITLE="%s deprecated messages logged!"
+PLG_DEBUG_LOGS_LOGGED="%s messages logged"
+PLG_DEBUG_MEMORY="Memory"
+PLG_DEBUG_MEMORY_USED_FOR_QUERY="Query memory: %s Memory before query: %s"
+PLG_DEBUG_MEMORY_USAGE="Memory Usage"
+PLG_DEBUG_NO_PROFILE="No SHOW PROFILE (maybe because there are more than 100 queries)"
+PLG_DEBUG_OTHER_QUERIES="OTHER Tables:"
+PLG_DEBUG_PROFILE="Profile"
+PLG_DEBUG_PROFILE_INFORMATION="Profile Information"
+PLG_DEBUG_QUERIES="Database Queries"
+PLG_DEBUG_QUERIES_LOGGED="%d Queries Logged"
+PLG_DEBUG_QUERIES_TIME="Database queries total: %s"
+PLG_DEBUG_QUERY_AFTER_LAST="After last query: %s"
+PLG_DEBUG_QUERY_DUPLICATES="Duplicate queries"
+PLG_DEBUG_QUERY_DUPLICATES_FOUND="Duplicate found!"
+PLG_DEBUG_QUERY_DUPLICATES_NUMBER="%s duplicates"
+PLG_DEBUG_QUERY_DUPLICATES_TOTAL_NUMBER="%s duplicate found!"
+PLG_DEBUG_QUERY_EXPLAIN_NOT_POSSIBLE="EXPLAIN not possible on query: %s"
+PLG_DEBUG_QUERY_TIME="Query Time: %s"
+PLG_DEBUG_QUERY_TYPES_LOGGED="%d Query Types Logged, Sorted by Occurrences."
+PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES="%2$d &#215; %1$s"
+PLG_DEBUG_ROWS_RETURNED_BY_QUERY="Rows returned: %s"
+PLG_DEBUG_SELECT_QUERIES="SELECT Tables:"
+PLG_DEBUG_SESSION="Session"
+PLG_DEBUG_TIME="Time"
+PLG_DEBUG_TITLE="Joomla! Debug Console"
+PLG_DEBUG_UNKNOWN_FILE="Unknown file"
+PLG_DEBUG_UNTRANSLATED_STRINGS="Untranslated Strings"
+PLG_DEBUG_WARNING_NO_INDEX="NO INDEX KEY COULD BE USED"
+PLG_DEBUG_WARNING_NO_INDEX_DESC="This table probably has a missing index on WHERE equalities and/or JOIN ON column(s) or is written in a way that no index can be used, causing a time-consuming full table scan."
+PLG_DEBUG_WARNING_USING_FILESORT="Using filesort"
+PLG_DEBUG_WARNING_USING_FILESORT_DESC="This table probably has a missing index on WHERE/ON equality column(s) ending by the ORDER BY column(s) or is written in a way that no index can be used, causing a time-consuming filesort."
+PLG_DEBUG_XML_DESCRIPTION="This plugin provides a variety of system information as well as help for the creation of translation files."
+PLG_SYSTEM_DEBUG="System - Debug"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
new file mode 100644
index 00000000..0df88329
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_DEBUG_XML_DESCRIPTION="This plugin provides a variety of system information and help for the creation of translation files."
+PLG_SYSTEM_DEBUG="System - Debug"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_fields.ini b/core/administrator/language/en-GB/en-GB.plg_system_fields.ini
new file mode 100644
index 00000000..b2f9aaca
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_fields.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_FIELDS="System - Fields"
+PLG_SYSTEM_FIELDS_XML_DESCRIPTION="The system fields plugin that is required to display the custom fields."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini
new file mode 100644
index 00000000..b2f9aaca
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_fields.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_FIELDS="System - Fields"
+PLG_SYSTEM_FIELDS_XML_DESCRIPTION="The system fields plugin that is required to display the custom fields."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_highlight.ini b/core/administrator/language/en-GB/en-GB.plg_system_highlight.ini
new file mode 100644
index 00000000..08178bb9
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_highlight.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_HIGHLIGHT="System - Highlight"
+PLG_SYSTEM_HIGHLIGHT_XML_DESCRIPTION="System plugin to highlight specified terms."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
new file mode 100644
index 00000000..6539a55d
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_HIGHLIGHT="System - Highlight"
+PLG_SYSTEM_HIGHLIGHT_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the &quot;System - Highlight&quot; plugin"
+PLG_SYSTEM_HIGHLIGHT_XML_DESCRIPTION="System plugin to highlight specified terms."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_languagecode.ini b/core/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
new file mode 100644
index 00000000..20bc4c41
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LANGUAGECODE="System - Language Code"
+PLG_SYSTEM_LANGUAGECODE_FIELD_DESC="Changes the language code used for the <em>%s</em> language."
+PLG_SYSTEM_LANGUAGECODE_FIELDSET_DESC="Changes the language code for the generated HTML document. Example usage: You have installed the fr-FR language pack and want the Search Engines to recognise the page as aimed at French-speaking Canada. Add the tag 'fr-CA' to the corresponding field for 'fr-FR' to resolve this."
+PLG_SYSTEM_LANGUAGECODE_FIELDSET_LABEL="Language Codes"
+PLG_SYSTEM_LANGUAGECODE_XML_DESCRIPTION="Provides the ability to change the language code in the generated HTML document to improve SEO.<br />The fields will appear when the plugin is enabled and saved.<br />More information at <a href="_QQ_"https://www.w3.org/TR/xhtml1/#docconf"_QQ_">W3.org</a>."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
new file mode 100644
index 00000000..f7765e9f
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LANGUAGECODE="System - Language Code"
+PLG_SYSTEM_LANGUAGECODE_XML_DESCRIPTION="Provides ability to change the language code in the generated HTML document to improve SEO."
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini b/core/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
new file mode 100644
index 00000000..9d957af0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
@@ -0,0 +1,28 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LANGUAGEFILTER="System - Language Filter"
+PLG_SYSTEM_LANGUAGEFILTER_BROWSER_SETTINGS="Browser Settings"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC="Add alternative meta tags for items with associated items in other languages."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_LABEL="Add Alternate Meta Tags"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_DESC="This option will automatically change the content language used in the Frontend when a user site language is changed."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_LABEL="Automatic Language Change"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_DESC="Language cookies can be set to expire at the end of the session or after a year. Default is session."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_LABEL="Cookie Lifetime"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_DESC="Choose site default language or try to detect the browser settings language. It will default to site language if browser settings can't be found."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_LABEL="Language Selection for new Visitors"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_DESC="This option will allow item associations when switching from one language to another. Default home menu items are always associated."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_LABEL="Associations"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_DESC="This option will add the x-default meta tag to improve SEO."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LABEL="Add x-default Meta Tag"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LANGUAGE_DESC="Choose the x-default language."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LANGUAGE_LABEL="x-default Language"
+PLG_SYSTEM_LANGUAGEFILTER_OPTION_DEFAULT_LANGUAGE="Default frontend language"
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_DESC="Remove the defined URL Language Code of the Content Language that corresponds to the default site language when Search Engine Friendly URLs is set to 'Yes'."
+PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_LABEL="Remove URL Language Code"
+PLG_SYSTEM_LANGUAGEFILTER_OPTION_SESSION="Session"
+PLG_SYSTEM_LANGUAGEFILTER_OPTION_YEAR="Year"
+PLG_SYSTEM_LANGUAGEFILTER_SITE_LANGUAGE="Site Language"
+PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION="This plugin filters the displayed content depending on language.<br /><strong>This plugin is to be enabled only when the Language Switcher module is published.</strong><br />If this plugin is activated, it is recommended to also publish the Administrator multilingual status module."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
new file mode 100644
index 00000000..5d7950e3
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LANGUAGEFILTER="System - Language Filter"
+PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION="This plugin filters the displayed content depending on language."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_log.ini b/core/administrator/language/en-GB/en-GB.plg_system_log.ini
new file mode 100644
index 00000000..24c3e975
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_log.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_LOG_XML_DESCRIPTION="Provides logging when the user login fails."
+PLG_SYSTEM_LOG="System - User Log"
+PLG_SYSTEM_LOG_FIELD_LOG_USERNAME_DESC="This option will log the username used when an authentication fails."
+PLG_SYSTEM_LOG_FIELD_LOG_USERNAME_LABEL="Log Usernames"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_log.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
new file mode 100644
index 00000000..086c63af
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_LOG_XML_DESCRIPTION="Provides logging when the user login fails."
+PLG_SYSTEM_LOG="System - User Log"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_logout.ini b/core/administrator/language/en-GB/en-GB.plg_system_logout.ini
new file mode 100644
index 00000000..e4d57d6a
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_logout.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LOGOUT_XML_DESCRIPTION="The system logout plugin enables Joomla to redirect the user to the home page if they choose to logout while they are on a protected access page."
+PLG_SYSTEM_LOGOUT="System - Logout"
+PLG_SYSTEM_LOGOUT_REDIRECT="You have been redirected to the home page following logout."
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
new file mode 100644
index 00000000..6dabe0b0
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LOGOUT_XML_DESCRIPTION="The system logout plugin enables Joomla to redirect the user to the home page if they choose to logout while they are on a protected access page."
+PLG_SYSTEM_LOGOUT="System - Logout"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_p3p.ini b/core/administrator/language/en-GB/en-GB.plg_system_p3p.ini
new file mode 100644
index 00000000..a2b9dc81
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_p3p.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_P3P_XML_DESCRIPTION="The system P3P policy plugin allows Joomla! to send a customised string of P3P policy tags in the HTTP header. This is required for the sessions to work on certain browsers, ie Internet Explorer 6 and 7."
+PLG_SYSTEM_P3P="System - P3P Policy"
+PLG_P3P_HEADER_DESCRIPTION="Enter your P3P policy tags. For more information consult The Platform for Privacy Preferences specification, https://www.w3.org/TR/P3P/"
+PLG_P3P_HEADER_LABEL="P3P Tags"
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
new file mode 100644
index 00000000..6ff09375
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_P3P_XML_DESCRIPTION="The system P3P policy plugin allows Joomla! to send a customised string of P3P policy tags in the HTTP header. This is required for the sessions to work on certain browsers, ie Internet Explorer 6 and 7."
+PLG_SYSTEM_P3P="System - P3P Policy"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_redirect.ini b/core/administrator/language/en-GB/en-GB.plg_system_redirect.ini
new file mode 100644
index 00000000..c8533535
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_redirect.ini
@@ -0,0 +1,18 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_REDIRECT="System - Redirect"
+PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE="An error occurred while updating the database."
+PLG_SYSTEM_REDIRECT_FIELD_COLLECT_URLS_DESC="This option controls the collection of URLs. This is useful to avoid unnecessary load on the database."
+PLG_SYSTEM_REDIRECT_FIELD_COLLECT_URLS_LABEL="Collect URLs"
+PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_DESC="Define regular expressions or terms which should be excluded in saving."
+PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_LABEL="Exclude URLs"
+PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_REGEXP_DESC="Should the term be handled as regular expression."
+PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_REGEXP_LABEL="Regular Expression"
+PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_TERM_DESC="A regular expression or a term which should be excluded."
+PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_TERM_LABEL="Term"
+PLG_SYSTEM_REDIRECT_FIELD_STORE_FULL_URL_DESC="Save the expired URL as absolute (include domain) or relative (exclude domain)."
+PLG_SYSTEM_REDIRECT_FIELD_STORE_FULL_URL_LABEL="Include Domain Name in Expired URL"
+PLG_SYSTEM_REDIRECT_XML_DESCRIPTION="The system redirect plugin enables the Joomla Redirect system to catch missing pages and redirect users."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
new file mode 100644
index 00000000..1d3978c3
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_REDIRECT="System - Redirect"
+PLG_SYSTEM_REDIRECT_XML_DESCRIPTION="The system redirect plugin enables the Joomla Redirect system to catch missing pages and redirect users."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_remember.ini b/core/administrator/language/en-GB/en-GB.plg_system_remember.ini
new file mode 100644
index 00000000..6d4aa2ad
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_remember.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_REMEMBER_XML_DESCRIPTION="Provides remember me functionality. The cookie authentication plugin must be enabled for this plugin to function."
+PLG_SYSTEM_REMEMBER="System - Remember Me"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
new file mode 100644
index 00000000..5c4868ef
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_REMEMBER_XML_DESCRIPTION="Provides remember me functionality."
+PLG_SYSTEM_REMEMBER="System - Remember Me"
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_sef.ini b/core/administrator/language/en-GB/en-GB.plg_system_sef.ini
new file mode 100644
index 00000000..71791b04
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_sef.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEF_XML_DESCRIPTION="Adds SEF support to links in the document. It operates directly on the HTML and does not require a special tag."
+PLG_SYSTEM_SEF="System - SEF"
+PLG_SEF_DOMAIN_LABEL="Site Domain"
+PLG_SEF_DOMAIN_DESCRIPTION="If your site can be accessed through more than one domain enter the preferred (sometimes referred to as canonical) domain here. <br /><strong>Note:</strong> https://example.com and https://www.example.com are different domains."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
new file mode 100644
index 00000000..26579bdb
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SEF_XML_DESCRIPTION="Adds SEF support to links in the document. It operates directly on the HTML and does not require a special tag."
+PLG_SYSTEM_SEF="System - SEF"
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini b/core/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini
new file mode 100644
index 00000000..6f887911
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_sessiongc.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_SESSIONGC="System - Session Data Purge"
+PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_GC_DESC="When enabled, this plugin will attempt to purge expired data based on the frequency calculated by the probability and divisor."
+PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_GC_LABEL="Enable Session Data Cleanup"
+PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_METADATA_GC_DESC="When enabled, this plugin will clean optional session metadata from the database. Note that this operation will not run when the database handler is in use as that data is cleared as part of the Session Data Cleanup operation."
+PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_METADATA_GC_LABEL="Enable Session Metadata Cleanup"
+PLG_SYSTEM_SESSIONGC_GC_DIVISOR_DESC="In combination with the probability field, these two fields are used to determine the frequency of the session data cleanup operation being triggered on a request. The probability is calculated by using probability/divisor, e.g. 1/100 means there is a 1% chance that the process runs on each request."
+PLG_SYSTEM_SESSIONGC_GC_DIVISOR_LABEL="Divisor"
+PLG_SYSTEM_SESSIONGC_GC_PROBABILITY_DESC="In combination with the divisor field, these two fields are used to determine the frequency of the session data cleanup operation being triggered on a request."
+PLG_SYSTEM_SESSIONGC_GC_PROBABILITY_LABEL="Probability"
+PLG_SYSTEM_SESSIONGC_XML_DESCRIPTION="System Plugin that purges expired data and metadata depending on the session handler set in Global Configuration."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini
new file mode 100644
index 00000000..415d42e4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_sessiongc.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_SESSIONGC="System - Session Data Purge"
+PLG_SYSTEM_SESSIONGC_XML_DESCRIPTION="System Plugin that purges expired data and metadata depending on the session handler set in Global Configuration."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_stats.ini b/core/administrator/language/en-GB/en-GB.plg_system_stats.ini
new file mode 100644
index 00000000..e1b5b483
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_stats.ini
@@ -0,0 +1,33 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_STATS="System - Joomla! Statistics"
+PLG_SYSTEM_STATS_BTN_NEVER_SEND="Never"
+PLG_SYSTEM_STATS_BTN_SEND_ALWAYS="Always"
+PLG_SYSTEM_STATS_BTN_SEND_NOW="Once"
+; The following two strings are deprecated for 4.0
+PLG_SYSTEM_STATS_DEBUG_DESC="Enable debug for testing purposes. Statistics will be sent on every page load."
+PLG_SYSTEM_STATS_DEBUG_LABEL="Debug"
+PLG_SYSTEM_STATS_INTERVAL_DESC="Statistics will be sent every X hours. The default is 12."
+PLG_SYSTEM_STATS_INTERVAL_LABEL="Interval (hours)"
+PLG_SYSTEM_STATS_LABEL_CMS_VERSION="CMS Version"
+PLG_SYSTEM_STATS_LABEL_DB_TYPE="DB Type"
+PLG_SYSTEM_STATS_LABEL_DB_VERSION="DB Version"
+PLG_SYSTEM_STATS_LABEL_MESSAGE_TITLE="Joomla! would like your permission to collect some basic statistics."
+PLG_SYSTEM_STATS_LABEL_PHP_VERSION="PHP Version"
+PLG_SYSTEM_STATS_LABEL_SERVER_OS="Server OS"
+PLG_SYSTEM_STATS_LABEL_UNIQUE_ID="Unique ID"
+PLG_SYSTEM_STATS_MODE_DESC="Select the way that you want the statistics to be sent."
+PLG_SYSTEM_STATS_MODE_LABEL="Mode"
+PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND="Always send"
+PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND="Never send"
+PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND="On demand"
+PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA="Enable Joomla Statistics?"
+PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="To better understand our install base and end user environments it is helpful if you send some site information back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System - Joomla! Statistics."
+PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT="Select here to see the information that will be sent."
+PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique ID"
+PLG_SYSTEM_STATS_UNIQUE_ID_DESC="An identifier that allows the Joomla! project to count unique installs of the plugin. This is sent with the statistics back to the server."
+PLG_SYSTEM_STATS_UNIQUE_ID_LABEL="Unique ID"
+PLG_SYSTEM_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type, Database version and Server type."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
new file mode 100644
index 00000000..f8d2facf
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_STATS="System - Joomla! Statistics"
+PLG_SYSTEM_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type, Database version and Server type."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/core/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
new file mode 100644
index 00000000..b7f997c4
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
+PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails"
+PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email."
+; You can use the following merge codes:
+; [NEWVERSION]		New Joomla! version, e.g. 1.2.3
+; [CURVERSION]		Currently installed Joomla! version, e.g. 1.2.0
+; [SITENAME]		Site name, as set in Global Configuration.
+; [URL]				URL of the site's frontend page.
+; [LINK]			Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in).
+; [RELEASENEWS]		URL to the release news on joomla.org
+; \n				Newline character. Use it to start a new line in the email.
+PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]"
+PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME] - [URL] \n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed:        [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please select the following link. (If the URL is not a link, copy & paste it to your browser).\n\nUpdate link: [LINK]\n\nRelease News can be found here: [RELEASENEWS]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what Joomla! is and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]"
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email Language"
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the site language at the time the plugin is triggered. By selecting a language here you are forcing the update notification emails to be sent in this specific language."
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
+PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME="The Joomla! Update Notification will not run in this configuration"
+PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_BODY="In your Installer Configuration you have set the Option Update Cache (in Hours) to 0 this means that Joomla is not caching the Update. This means an email should be sent on every page visit but this is not possible. Please increase the value (6 is default) or confirm that the Joomla! Update Notification will never send you mails."
+PLG_SYSTEM_UPDATENOTIFICATION_POSTINSTALL_UPDATECACHETIME_ACTION="Set it back to the default setting (6 Hours)"
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
diff --git a/core/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini b/core/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
new file mode 100644
index 00000000..3af36485
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
new file mode 100644
index 00000000..a8447d46
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
@@ -0,0 +1,36 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_TWOFACTORAUTH_TOTP="Two Factor Authentication - Google Authenticator"
+PLG_TWOFACTORAUTH_TOTP_ERR_VALIDATIONFAILED="You did not enter a valid security code. Please check your Google Authenticator setup and make sure that the time on your device matches the time on the site."
+PLG_TWOFACTORAUTH_TOTP_INTRO="This feature allows you to use Google Authenticator, or a compatible application such as FreeOTP, for two factor authentication. In addition to your username and password you will also need to provide a six digit security code to be able to login to this site. The security code is rotated every 30 seconds. This provides extra protection against hackers logging in to your account even if they were able to get hold of your password."
+PLG_TWOFACTORAUTH_TOTP_METHOD_TITLE="Google Authenticator"
+PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE="Two Factor Authentication is Available"
+PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY="<p>Joomla! comes with a built-in two factor authentication system. It secures your site login with a secondary secret code that's changing every 30 seconds. You can use your mobile device and the <a href="_QQ_"https://en.wikipedia.org/wiki/Google_Authenticator"_QQ_" target="_QQ_"_blank"_QQ_">Google Authenticator</a> app to produce that code.</p><p>By selecting the button below:</p><ul><li>Joomla! will enable the two factor authentication plugins</li><li>Two Factor Authentication is going to be available for all users.</li><li>Each user can configure Two Factor Authentication in User Details.</li><li>You can always disable Two Factor Authentication plugin, or configure it for Backend usage only.</li><li>You will be taken to your user profile page where you can find more information on two factor authentication and enable it for your user account.</li></ul>"
+PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION="Enable two factor authentication"
+PLG_TWOFACTORAUTH_TOTP_SECTION_ADMIN="Administrator (Backend)"
+PLG_TWOFACTORAUTH_TOTP_SECTION_BOTH="Both"
+PLG_TWOFACTORAUTH_TOTP_SECTION_DESC="In which sections of your site do you want to enable two factor authentication?"
+PLG_TWOFACTORAUTH_TOTP_SECTION_LABEL="Site Section"
+PLG_TWOFACTORAUTH_TOTP_SECTION_SITE="Site (Frontend)"
+PLG_TWOFACTORAUTH_TOTP_STEP1_HEAD="Step 1 - Get Google Authenticator"
+PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1="Official Google Authenticator app for Android, iOS and BlackBerry"
+; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw)
+PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447"
+PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2="Compatible clients for other devices and operating system (listed in Wikipedia)."
+; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish)
+PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation"
+PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install <a href="_QQ_"https://en.wikipedia.org/wiki/Google_Authenticator"_QQ_" target="_QQ_"_blank"_QQ_">Google Authenticator</a>, or a compatible application such as <a href="_QQ_"https://freeotp.github.io/"_QQ_" target="_QQ_"_blank"_QQ_">FreeOTP</a>, on your smartphone or desktop. Use one of the following:"
+PLG_TWOFACTORAUTH_TOTP_STEP1_WARN="Please remember to sync your device's clock with a time-server. Time drift in your device may cause an inability to log in to your site."
+PLG_TWOFACTORAUTH_TOTP_STEP2_ACCOUNT="Account"
+PLG_TWOFACTORAUTH_TOTP_STEP2_ALTTEXT="Alternatively, you can scan the following QR code in Google Authenticator."
+PLG_TWOFACTORAUTH_TOTP_STEP2_HEAD="Step 2 - Set up"
+PLG_TWOFACTORAUTH_TOTP_STEP2_KEY="Key"
+PLG_TWOFACTORAUTH_TOTP_STEP2_RESET="If you want to change the key, disable the two factor authentication. When you try enabling it again it will generate a new key."
+PLG_TWOFACTORAUTH_TOTP_STEP2_TEXT="You will need to enter the following information to Google Authenticator or a compatible app."
+PLG_TWOFACTORAUTH_TOTP_STEP3_HEAD="Step 3 - Activate Two Factor Authentication"
+PLG_TWOFACTORAUTH_TOTP_STEP3_SECURITYCODE="Security Code"
+PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT="To verify that everything is set up properly, please enter the security code displayed in Google Authenticator in the field below. Afterwards, please save your user profile. If the code is correct, the Two Factor Authentication feature will be enabled."
+PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using <a href="_QQ_"https://en.wikipedia.org/wiki/Google_Authenticator"_QQ_" target="_QQ_"_blank"_QQ_">Google Authenticator</a> or other compatible time-based One Time Password generators such as <a href="_QQ_"https://freeotp.github.io/"_QQ_" target="_QQ_"_blank"_QQ_">FreeOTP</a>. To use two factor authentication please edit the user profile and enable two factor authentication."
diff --git a/core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
new file mode 100644
index 00000000..0d0a68de
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_TWOFACTORAUTH_TOTP="Two Factor Authentication - Google Authenticator"
+PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION="Allows users on your site to use two factor authentication using <a href="_QQ_"https://en.wikipedia.org/wiki/Google_Authenticator"_QQ_" target="_QQ_"_blank"_QQ_">Google Authenticator</a> or other compatible time-based One Time Password generators such as <a href="_QQ_"https://freeotp.github.io/"_QQ_" target="_QQ_"_blank"_QQ_">FreeOTP</a>. To use two factor authentication please edit the user profile and enable two factor authentication."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
new file mode 100644
index 00000000..f7ada89b
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
@@ -0,0 +1,22 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_TWOFACTORAUTH_YUBIKEY="Two Factor Authentication - YubiKey"
+
+PLG_TWOFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED="You did not enter a valid YubiKey secret code or the YubiCloud servers are unreachable at this time."
+PLG_TWOFACTORAUTH_YUBIKEY_INTRO="This feature allows you to use a YubiKey secure hardware token for two factor authentication. In addition to your username and password you will also need to insert your YubiKey into your computer's USB port, select inside the Secret Key area of the site's login area and touch YubiKey's gold disk. The secret code generated by your YubiKey is unique to your device and changes constantly. This provides extra protection against hackers logging in to your account even if they were able to get hold of your password."
+PLG_TWOFACTORAUTH_YUBIKEY_METHOD_TITLE="YubiKey"
+PLG_TWOFACTORAUTH_TOTP_RESET_HEAD="Your YubiKey is already linked to your user account."
+PLG_TWOFACTORAUTH_TOTP_RESET_TEXT="Your YubiKey is already linked to your user account. If you want to unlink your YubiKey from your user account or use another YubiKey, please first disable two factor authentication and save your user profile. Then come back to this user profile page and re-activate two factor authentication with the YubiKey method."
+PLG_TWOFACTORAUTH_YUBIKEY_SECTION_ADMIN="Administrator (Backend)"
+PLG_TWOFACTORAUTH_YUBIKEY_SECTION_BOTH="Both"
+PLG_TWOFACTORAUTH_YUBIKEY_SECTION_DESC="In which sections of your site do you want to enable two factor authentication?"
+PLG_TWOFACTORAUTH_YUBIKEY_SECTION_LABEL="Site Section"
+PLG_TWOFACTORAUTH_YUBIKEY_SECTION_SITE="Site (Frontend)"
+PLG_TWOFACTORAUTH_YUBIKEY_SECURITYCODE="Security Code"
+PLG_TWOFACTORAUTH_YUBIKEY_STEP1_HEAD="Set up"
+PLG_TWOFACTORAUTH_YUBIKEY_STEP1_TEXT="Please insert your YubiKey device into your computer's USB port. Select the Security Code field below. Then touch the gold disk on your YubiKey device for one second. Afterwards, please save your user profile. If the code generated by your YubiKey is validated by YubiCloud the Two Factor Authentication feature will be enabled and this YubiKey will be linked with your user account."
+PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION="Allows users on your site to use two factor authentication using a YubiKey secure hardware token. Users need their own Yubikey available from https://www.yubico.com/. To use two factor authentication users have to edit their user profile and enable two factor authentication."
+
diff --git a/core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
new file mode 100644
index 00000000..704efa72
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_TWOFACTORAUTH_YUBIKEY="Two Factor Authentication - YubiKey"
+PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION="Allows users on your site to use two factor authentication using a YubiKey secure hardware token. Users need their own Yubikey available from https://www.yubico.com/. To use two factor authentication users have to edit their user profile and enable two factor authentication."
diff --git a/core/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini b/core/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
new file mode 100644
index 00000000..d593e0ef
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTACTCREATOR_ERR_FAILED_CREATING_CONTACT="Automatic contact creation failed. Please contact a site administrator."
+PLG_CONTACTCREATOR_ERR_NO_CATEGORY="Contact automatic creation failed because contact category is not set!"
+PLG_CONTACTCREATOR_FIELD_AUTOMATIC_WEBPAGE_DESC="A formatted string to automatically generate a contact's web page. [name] is replaced with the name, [username] is replaced with the username, [userid] is replaced with the user ID and [email] is replaced with the email."
+PLG_CONTACTCREATOR_FIELD_AUTOMATIC_WEBPAGE_LABEL="Automatic Webpage"
+PLG_CONTACTCREATOR_FIELD_AUTOPUBLISH_DESC="Optionally have the contact default to published or unpublished."
+PLG_CONTACTCREATOR_FIELD_AUTOPUBLISH_LABEL="Automatically Publish the Contact"
+PLG_CONTACTCREATOR_FIELD_CATEGORY_DESC="Category to assign contacts to by default."
+PLG_CONTACTCREATOR_XML_DESCRIPTION="Plugin to automatically create contact information for new users."
+PLG_USER_CONTACTCREATOR="User - Contact Creator"
diff --git a/core/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini b/core/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
new file mode 100644
index 00000000..70896265
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTACTCREATOR_XML_DESCRIPTION="Plugin to automatically create contact information for new users."
+PLG_USER_CONTACTCREATOR="User - Contact Creator"
diff --git a/core/administrator/language/en-GB/en-GB.plg_user_joomla.ini b/core/administrator/language/en-GB/en-GB.plg_user_joomla.ini
new file mode 100644
index 00000000..32134929
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_user_joomla.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_USER_JOOMLA="User - Joomla!"
+PLG_USER_JOOMLA_FIELD_AUTOREGISTER_DESC="Automatically create Registered Users where possible."
+PLG_USER_JOOMLA_FIELD_AUTOREGISTER_LABEL="Auto-create Users"
+PLG_USER_JOOMLA_FIELD_FORCELOGOUT_DESC="Set to No to disable this."
+PLG_USER_JOOMLA_FIELD_FORCELOGOUT_LABEL="Force Logout for all Sessions?"
+PLG_USER_JOOMLA_FIELD_MAILTOUSER_DESC="When an administrator creates a user account, this determines if an email, which has their username and password, is sent to the user."
+PLG_USER_JOOMLA_FIELD_MAILTOUSER_LABEL="Notification Mail to User"
+PLG_USER_JOOMLA_FIELD_STRONG_PASSWORDS_DESC="If set to yes, use the bcrypt encryption method if available in this version of PHP."
+PLG_USER_JOOMLA_FIELD_STRONG_PASSWORDS_LABEL="Strong Passwords"
+PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY="Hello %s,\n\n\nYou have been added as a User to %s by an Administrator.\n\nThis email has your username and password to log in to %s\n\nUsername: %s\nPassword: %s\n\n\nPlease do not respond to this message as it is automatically generated and is for information purposes only."
+PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT="New User Details"
+PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_BTN="Enable Strong Password Encryption"
+PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TEXT="As a security feature, Joomla allows you to switch to strong password encryption.<br />To turn strong passwords on select the button below. Alternatively you can edit the User - Joomla plugin and change the strong password setting to On.<br />Before enabling you should verify that all third party registration/login, user management or bridge extensions installed on your site support this strong password encryption."
+PLG_USER_JOOMLA_POSTINSTALL_STRONGPW_TITLE="Strong passwords"
+PLG_USER_JOOMLA_XML_DESCRIPTION="Handles Joomla's default User synchronisation.<br /><strong>Warning! You must have enabled at least one plugin that handles the user session management or you will lose all access to your site.</strong>"
diff --git a/core/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini b/core/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
new file mode 100644
index 00000000..1e51c1d2
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_USER_JOOMLA="User - Joomla!"
+PLG_USER_JOOMLA_XML_DESCRIPTION="Handles Joomla's default User synchronisation.<br /><strong>Warning! You must have enabled at least one plugin that handles the user session management or you will lose all access to your site.</strong>"
diff --git a/core/administrator/language/en-GB/en-GB.plg_user_profile.ini b/core/administrator/language/en-GB/en-GB.plg_user_profile.ini
new file mode 100644
index 00000000..50fdeb31
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_user_profile.ini
@@ -0,0 +1,46 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTENT_CHANGE_ARTICLE="Select or Change article"
+COM_CONTENT_CHANGE_ARTICLE_BUTTON="Select/Change"
+COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
+PLG_USER_PROFILE="User - Profile"
+PLG_USER_PROFILE_ERROR_INVALID_DOB="The date of birth you entered is invalid. Please enter a valid date."
+PLG_USER_PROFILE_ERROR_INVALID_DOB_FUTURE_DATE="The date of birth you entered is in the future."
+PLG_USER_PROFILE_FIELD_ABOUT_ME_DESC="Choose an option for the field About Me."
+PLG_USER_PROFILE_FIELD_ABOUT_ME_LABEL="About Me"
+PLG_USER_PROFILE_FIELD_ADDRESS1_DESC="Choose an option for the field Address1."
+PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL="Address 1"
+PLG_USER_PROFILE_FIELD_ADDRESS2_DESC="Choose an option for the field Address2."
+PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL="Address 2"
+PLG_USER_PROFILE_FIELD_CITY_DESC="Choose an option for the field City."
+PLG_USER_PROFILE_FIELD_CITY_LABEL="City"
+PLG_USER_PROFILE_FIELD_COUNTRY_DESC="Choose an option for the field Country."
+PLG_USER_PROFILE_FIELD_COUNTRY_LABEL="Country"
+PLG_USER_PROFILE_FIELD_DOB_DESC="Choose an option for the field Date of Birth."
+PLG_USER_PROFILE_FIELD_DOB_LABEL="Date of Birth"
+PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_DESC="Choose an option for the field Favourite Book."
+PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL="Favourite Book"
+PLG_USER_PROFILE_FIELD_NAME_PROFILE_REQUIRE_USER="User profile fields for profile edit form"
+PLG_USER_PROFILE_FIELD_NAME_REGISTER_REQUIRE_USER="User profile fields for registration and administrator user forms"
+PLG_USER_PROFILE_FIELD_PHONE_DESC="Choose an option for the field Phone."
+PLG_USER_PROFILE_FIELD_PHONE_LABEL="Phone"
+PLG_USER_PROFILE_FIELD_POSTAL_CODE_DESC="Choose an option for the field Postal/ZIP Code."
+PLG_USER_PROFILE_FIELD_POSTAL_CODE_LABEL="Postal/ZIP Code"
+PLG_USER_PROFILE_FIELD_REGION_DESC="Choose an option for the field Region."
+PLG_USER_PROFILE_FIELD_REGION_LABEL="Region"
+PLG_USER_PROFILE_FIELD_TOS_ARTICLE_DESC="Select the desired Terms of Service article from the list."
+PLG_USER_PROFILE_FIELD_TOS_ARTICLE_LABEL="Select TOS Article"
+PLG_USER_PROFILE_FIELD_TOS_DESC="Agree to terms of service."
+PLG_USER_PROFILE_FIELD_TOS_DESC_SITE="Please read the Terms of Service. You will not be able to register if you do not agree with them."
+PLG_USER_PROFILE_FIELD_TOS_LABEL="Terms of Service"
+PLG_USER_PROFILE_FIELD_WEB_SITE_DESC="Choose an option for the field website."
+PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL="Website"
+PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field."
+PLG_USER_PROFILE_OPTION_AGREE="Agree"
+PLG_USER_PROFILE_SLIDER_LABEL="User Profile"
+; Adapt the following string to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
+PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, ie 0000-00-00"
+PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin"
diff --git a/core/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini b/core/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
new file mode 100644
index 00000000..aaa3df4c
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_USER_PROFILE="User - Profile"
+PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin"
diff --git a/core/administrator/language/en-GB/en-GB.tpl_hathor.ini b/core/administrator/language/en-GB/en-GB.tpl_hathor.ini
new file mode 100644
index 00000000..63b27730
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.tpl_hathor.ini
@@ -0,0 +1,33 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+HATHOR="Hathor Administrator template"
+TPL_HATHOR_ALTERNATE_MENU_DESC="Use the alternative menu which integrates mouse and keyboard. JavaScript Required. The regular menu for Hathor is accessible with or without JavaScript, but leaves the mouse and keyboard independent."
+TPL_HATHOR_ALTERNATE_MENU_LABEL="Alternative Menu"
+TPL_HATHOR_BOLD_TEXT_DESC="Use bold text."
+TPL_HATHOR_BOLD_TEXT_LABEL="Bold Text"
+TPL_HATHOR_CHANGED_DEFAULT_TEMPLATE_TO_ISIS="We have set the default administrator template style to '%s'"
+TPL_HATHOR_CHECKMARK_ALL="Checkmark All"
+TPL_HATHOR_COLOUR_CHOICE_BLUE="Blue"
+TPL_HATHOR_COLOUR_CHOICE_DESC="Select the colour palette to use with the template. You can use this option to select a high contrast version or use it to create custom branding."
+TPL_HATHOR_COLOUR_CHOICE_LABEL="Select Colour"
+TPL_HATHOR_COLOUR_CHOICE_STANDARD="Standard"
+TPL_HATHOR_COLOUR_CHOICE_HIGH_CONTRAST="High Contrast"
+TPL_HATHOR_COLOUR_CHOICE_BROWN="Brown"
+TPL_HATHOR_COM_MENUS_MENU="Menu"
+TPL_HATHOR_COM_MODULES_CUSTOM_POSITION_LABEL="Select"
+TPL_HATHOR_CPANEL_LINK_TEXT="Return to Control Panel"
+TPL_HATHOR_GO="Go"
+TPL_HATHOR_LOGO_DESC="Select or upload a custom logo for the administrator template."
+TPL_HATHOR_LOGO_LABEL="Logo"
+TPL_HATHOR_MAIN_MENU="Main Menu"
+TPL_HATHOR_MESSAGE_POSTINSTALL_TITLE="Information about the Hathor administrator template"
+TPL_HATHOR_MESSAGE_POSTINSTALL_BODY="The Hathor administrator template style is set as your personal or global default administrator template. Please note - any new features for Joomla will only be available with the Isis template. We recommend that you switch your default backend template style to Isis. You can do this by selecting the button below. This will only change the default setting for the administrator template, if you have access to it, as well as your personal default style, if necessary. It does not change the frontend template or any other user's settings."
+TPL_HATHOR_MESSAGE_POSTINSTALL_ACTION="Set the default administrator template style to Isis"
+TPL_HATHOR_SHOW_SITE_NAME_DESC="Show the site name in the template header."
+TPL_HATHOR_SHOW_SITE_NAME_LABEL="Show Site Name"
+TPL_HATHOR_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
+TPL_HATHOR_SUB_MENU="Sub Menu"
+TPL_HATHOR_XML_DESCRIPTION="Hathor is an accessible Administrator template for Joomla! The Colour CSS files can also be used for custom colour branding."
diff --git a/core/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini b/core/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
new file mode 100644
index 00000000..fe42e0d1
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+HATHOR="Hathor Administrator template"
+TPL_HATHOR_POSITION_CP_SHELL="Unused"
+TPL_HATHOR_POSITION_CPANEL="Control Panel"
+TPL_HATHOR_POSITION_DEBUG="Debug"
+TPL_HATHOR_POSITION_FOOTER="Footer"
+TPL_HATHOR_POSITION_ICON="Quick Icons"
+TPL_HATHOR_POSITION_LOGIN="Login"
+TPL_HATHOR_POSITION_MENU="Menu"
+TPL_HATHOR_POSITION_POSTINSTALL="Postinstall"
+TPL_HATHOR_POSITION_STATUS="Status"
+TPL_HATHOR_POSITION_SUBMENU="Submenu"
+TPL_HATHOR_POSITION_TITLE="Title"
+TPL_HATHOR_POSITION_TOOLBAR="Toolbar"
+TPL_HATHOR_XML_DESCRIPTION="Hathor is an accessible Administrator template for Joomla! The Colour CSS files can also be used for custom colour branding."
\ No newline at end of file
diff --git a/core/administrator/language/en-GB/en-GB.tpl_isis.ini b/core/administrator/language/en-GB/en-GB.tpl_isis.ini
new file mode 100644
index 00000000..65eb10b8
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.tpl_isis.ini
@@ -0,0 +1,43 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+ISIS="Isis Administrator template"
+TPL_ISIS_CLEAR_CACHE="Clear Cache"
+TPL_ISIS_COLOR_DESC="Choose a colour for the navigation bar. If left blank, the default value will be used."
+TPL_ISIS_COLOR_HEADER_DESC="Choose a colour for the header. If left blank, the default value will be used."
+TPL_ISIS_COLOR_HEADER_LABEL="Header Colour"
+TPL_ISIS_COLOR_LABEL="Nav Bar Colour"
+TPL_ISIS_COLOR_LOGIN_BACKGROUND_DESC="Choose a colour for the background of the login screen. If left blank, the default value will be used."
+TPL_ISIS_COLOR_LOGIN_BACKGROUND_LABEL="Login Background Colour"
+TPL_ISIS_COLOR_SIDEBAR_DESC="Choose a colour for the Sidebar Background. If left blank, the default value will be used."
+TPL_ISIS_COLOR_SIDEBAR_LABEL="Sidebar Colour"
+TPL_ISIS_COLOR_LINK_DESC="Choose a colour for the Link. If left blank, the default value will be used."
+TPL_ISIS_COLOR_LINK_LABEL="Link Colour"
+TPL_ISIS_CONTROL_PANEL="Control Panel"
+TPL_ISIS_EDIT_ACCOUNT="Edit Account"
+TPL_ISIS_FIELD_ADMIN_MENUS_DESC="If you intend to use Joomla Administrator on a monitor, set this to 'No'. It will prevent the collapse of the Administrator menus when reducing the width of the window. Default is 'Yes'."
+TPL_ISIS_FIELD_ADMIN_MENUS_LABEL="Collapse Administrator Menu"
+TPL_ISIS_HEADER_DESC="Optional display of header."
+TPL_ISIS_HEADER_LABEL="Display Header"
+TPL_ISIS_INSTALLER="Installer"
+TPL_ISIS_ISFREESOFTWARE="Joomla is free software released under the GNU General Public License."
+TPL_ISIS_LOGIN_LOGO_DESC="Select or upload a custom logo for the login area of administrator template."
+TPL_ISIS_LOGIN_LOGO_LABEL="Login Logo"
+TPL_ISIS_LOGO_DESC="Upload a custom logo for the administrator template."
+TPL_ISIS_LOGO_LABEL="Logo"
+TPL_ISIS_LOGOUT="Logout"
+TPL_ISIS_PREVIEW="Preview %s"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE="Main content begins here"
+TPL_ISIS_STATUS_BOTTOM="Fixed bottom"
+TPL_ISIS_STATUS_DESC="Choose the location of the status module."
+TPL_ISIS_STATUS_LABEL="Status Module Position"
+TPL_ISIS_STATUS_TOP="Top"
+TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
+TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
+TPL_ISIS_TOGGLE_MENU="Toggle Navigation"
+TPL_ISIS_TOOLBAR="Toolbar"
+TPL_ISIS_USERMENU="User Menu"
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/administrator/language/en-GB/en-GB.tpl_isis.sys.ini b/core/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
new file mode 100644
index 00000000..fdc72b89
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+ISIS="Isis Administrator template"
+TPL_ISIS_POSITION_BOTTOM="Bottom"
+TPL_ISIS_POSITION_CPANEL="Cpanel"
+TPL_ISIS_POSITION_CP_SHELL="Unused"
+TPL_ISIS_POSITION_DEBUG="Debug"
+TPL_ISIS_POSITION_FOOTER="Footer"
+TPL_ISIS_POSITION_ICON="Quick Icons"
+TPL_ISIS_POSITION_LOGIN="Login"
+TPL_ISIS_POSITION_MENU="Menu"
+TPL_ISIS_POSITION_POSTINSTALL="Postinstall"
+TPL_ISIS_POSITION_STATUS="Status"
+TPL_ISIS_POSITION_SUBMENU="Submenu"
+TPL_ISIS_POSITION_TITLE="Title"
+TPL_ISIS_POSITION_TOOLBAR="Toolbar"
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/administrator/language/en-GB/en-GB.xml b/core/administrator/language/en-GB/en-GB.xml
new file mode 100644
index 00000000..88bd5e6e
--- /dev/null
+++ b/core/administrator/language/en-GB/en-GB.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metafile version="3.8" client="administrator">
+	<name>English (en-GB)</name>
+	<version>3.8.11</version>
+	<creationDate>July 2018</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description><![CDATA[en-GB administrator language]]></description>
+	<metadata>
+		<name>English (en-GB)</name>
+		<nativeName>English (United Kingdom)</nativeName>
+		<tag>en-GB</tag>
+		<rtl>0</rtl>
+		<locale>en_GB.utf8, en_GB.UTF-8, en_GB, eng_GB, en, english, english-uk, uk, gbr, britain, england, great britain, uk, united kingdom, united-kingdom</locale>
+		<firstDay>0</firstDay>
+		<weekEnd>0,6</weekEnd>
+		<calendar>gregorian</calendar>
+	</metadata>
+	<params />
+</metafile>
diff --git a/core/administrator/language/en-GB/install.xml b/core/administrator/language/en-GB/install.xml
new file mode 100644
index 00000000..17ffbbf2
--- /dev/null
+++ b/core/administrator/language/en-GB/install.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.8" client="administrator" type="language" method="upgrade">
+	<name>English (en-GB)</name>
+	<tag>en-GB</tag>
+	<version>3.8.11</version>
+	<creationDate>July 2018</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>en-GB administrator language</description>
+	<files>
+		<folder>/</folder>
+		<filename file="meta">install.xml</filename>
+	</files>
+	<params />
+</extension>
diff --git a/core/administrator/language/overrides/index.html b/core/administrator/language/overrides/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/administrator/language/overrides/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/administrator/logs/index.html b/core/administrator/logs/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/administrator/logs/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/administrator/manifests/files/joomla.xml b/core/administrator/manifests/files/joomla.xml
new file mode 100644
index 00000000..f833ee19
--- /dev/null
+++ b/core/administrator/manifests/files/joomla.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="3.6" type="file" method="upgrade">
+	<name>files_joomla</name>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<version>3.8.11</version>
+	<creationDate>July 2018</creationDate>
+	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
+
+	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
+
+	<update>
+		<schemas>
+			<schemapath type="mysql">administrator/components/com_admin/sql/updates/mysql</schemapath>
+			<schemapath type="sqlsrv">administrator/components/com_admin/sql/updates/sqlazure</schemapath>
+			<schemapath type="sqlazure">administrator/components/com_admin/sql/updates/sqlazure</schemapath>
+			<schemapath type="postgresql">administrator/components/com_admin/sql/updates/postgresql</schemapath>
+		</schemas>
+	</update>
+
+	<fileset>
+		<files>
+			<folder>administrator</folder>
+			<folder>bin</folder>
+			<folder>cache</folder>
+			<folder>cli</folder>
+			<folder>components</folder>
+			<folder>images</folder>
+			<folder>includes</folder>
+			<folder>language</folder>
+			<folder>layouts</folder>
+			<folder>libraries</folder>
+			<folder>media</folder>
+			<folder>modules</folder>
+			<folder>plugins</folder>
+			<folder>templates</folder>
+			<folder>tmp</folder>
+			<file>htaccess.txt</file>
+			<file>web.config.txt</file>
+			<file>LICENSE.txt</file>
+			<file>README.txt</file>
+			<file>index.php</file>
+		</files>
+	</fileset>
+
+	<updateservers>
+		<server name="Joomla! Core" type="collection">https://update.joomla.org/core/list.xml</server>
+	</updateservers>
+</extension>
diff --git a/core/administrator/manifests/libraries/fof.xml b/core/administrator/manifests/libraries/fof.xml
new file mode 100644
index 00000000..1b91bb7f
--- /dev/null
+++ b/core/administrator/manifests/libraries/fof.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="library" version="2.5" method="upgrade">
+	<name>FOF</name>
+	<libraryname>fof</libraryname>
+	<description>LIB_FOF_XML_DESCRIPTION</description>
+	<creationDate>2015-04-22 13:15:32</creationDate>
+	<author>Nicholas K. Dionysopoulos / Akeeba Ltd</author>
+	<authorEmail>nicholas@akeebabackup.com</authorEmail>
+	<authorUrl>https://www.akeebabackup.com</authorUrl>
+	<copyright>(C)2011-2015 Nicholas K. Dionysopoulos</copyright>
+	<license>GNU GPLv2 or later</license>
+	<version>2.4.3</version>
+	<packager>Akeeba Ltd</packager>
+	<packagerurl>https://www.AkeebaBackup.com/download.html</packagerurl>
+
+	<languages folder="_lang">
+		<language tag="en-GB">en-GB/en-GB.lib_fof.ini</language>
+	</languages>
+
+	<files folder="fof">
+		<folder>autoloader</folder>
+		<folder>config</folder>
+		<folder>controller</folder>
+		<folder>database</folder>
+		<folder>dispatcher</folder>
+		<folder>download</folder>
+		<folder>encrypt</folder>
+		<folder>form</folder>
+		<folder>hal</folder>
+		<folder>inflector</folder>
+		<folder>integration</folder>
+		<folder>input</folder>
+		<folder>layout</folder>
+		<folder>less</folder>
+		<folder>model</folder>
+		<folder>platform</folder>
+		<folder>query</folder>
+		<folder>render</folder>
+		<folder>string</folder>
+		<folder>table</folder>
+		<folder>template</folder>
+		<folder>toolbar</folder>
+		<folder>utils</folder>
+		<folder>view</folder>
+		<file>LICENSE.txt</file>
+		<file>include.php</file>
+		<file>version.txt</file>
+	</files>
+</extension>
diff --git a/core/administrator/manifests/libraries/idna_convert.xml b/core/administrator/manifests/libraries/idna_convert.xml
new file mode 100644
index 00000000..6f8c36da
--- /dev/null
+++ b/core/administrator/manifests/libraries/idna_convert.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<extension type="library" version="3.1">
+	<name>LIB_IDNA</name>
+	<libraryname>idna_convert</libraryname>
+	<version>0.8.0</version>
+	<description>LIB_IDNA_XML_DESCRIPTION</description>
+	<creationDate>2004</creationDate>
+	<copyright>2004-2011 phlyLabs Berlin, http://phlylabs.de</copyright>
+	<license>https://www.gnu.org/licenses/lgpl-2.1.html GNU/LGPL</license>
+	<author>phlyLabs</author>
+	<authorEmail>phlymail@phlylabs.de</authorEmail>
+	<authorUrl>http://phlylabs.de</authorUrl>
+	<packager>Joomla!</packager>
+	<packagerurl>https://www.joomla.org</packagerurl>
+	<files folder="libraries">
+		<folder>idna_convert</folder>
+	</files>
+</extension>
diff --git a/core/administrator/manifests/libraries/joomla.xml b/core/administrator/manifests/libraries/joomla.xml
new file mode 100644
index 00000000..51c5dc08
--- /dev/null
+++ b/core/administrator/manifests/libraries/joomla.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<extension type="library" version="3.1">
+	<name>LIB_JOOMLA</name>
+	<libraryname>joomla</libraryname>
+	<version>13.1</version>
+	<description>LIB_JOOMLA_XML_DESCRIPTION</description>
+	<creationDate>2008</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>https://www.joomla.org</authorUrl>
+	<packager>Joomla!</packager>
+	<packagerurl>https://www.joomla.org</packagerurl>
+	<files folder="libraries">
+		<folder>compat</folder>
+		<folder>joomla</folder>
+		<folder>legacy</folder>
+		<file>import.legacy.php</file>
+		<file>import.php</file>
+		<file>loader.php</file>
+		<file>platform.php</file>
+	</files>
+</extension>
diff --git a/core/administrator/manifests/libraries/phpass.xml b/core/administrator/manifests/libraries/phpass.xml
new file mode 100644
index 00000000..55bb9d50
--- /dev/null
+++ b/core/administrator/manifests/libraries/phpass.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="library" version="3.2" method="upgrade">
+	<name>LIB_PHPASS</name>
+	<libraryname>phpass</libraryname>
+	<description>LIB_PHPASS_XML_DESCRIPTION</description>
+	<creationDate>2004-2006</creationDate>
+	<author>Solar Designer</author>
+	<authorEmail>solar@openwall.com</authorEmail>
+	<authorUrl>http://www.openwall.com/phpass/</authorUrl>
+	<license>PD / GWC</license>
+	<version>0.3</version>
+	<packagerurl>http://www.openwall.com/phpass/</packagerurl>
+
+	<files folder="phpass">
+		<file>PasswordHash.php</file>
+	</files>
+</extension>
diff --git a/core/administrator/manifests/libraries/phputf8.xml b/core/administrator/manifests/libraries/phputf8.xml
new file mode 100644
index 00000000..9c809fad
--- /dev/null
+++ b/core/administrator/manifests/libraries/phputf8.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<extension type="library" version="3.1">
+	<name>LIB_PHPUTF8</name>
+	<libraryname>phputf8</libraryname>
+	<version>0.5</version>
+	<description>LIB_PHPUTF8_XML_DESCRIPTION</description>
+	<creationDate>2006</creationDate>
+	<copyright>Copyright various authors</copyright>
+	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<author>Harry Fuecks</author>
+	<authorEmail>hfuecks@gmail.com</authorEmail>
+	<authorUrl>http://sourceforge.net/projects/phputf8</authorUrl>
+	<packager>Joomla!</packager>
+	<packagerurl>https://www.joomla.org</packagerurl>
+	<files folder="libraries">
+		<folder>phputf8</folder>
+	</files>
+</extension>
diff --git a/core/administrator/manifests/packages/index.html b/core/administrator/manifests/packages/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/administrator/manifests/packages/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/administrator/manifests/packages/pkg_en-GB.xml b/core/administrator/manifests/packages/pkg_en-GB.xml
new file mode 100644
index 00000000..29f33c1a
--- /dev/null
+++ b/core/administrator/manifests/packages/pkg_en-GB.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<extension type="package" version="3.8" method="upgrade">
+	<name>English (en-GB) Language Pack</name>
+	<packagename>en-GB</packagename>
+	<version>3.8.11.1</version>
+	<creationDate>July 2018</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<license>https://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<url>https://github.com/joomla/joomla-cms</url>
+	<packager>Joomla! Project</packager>
+	<packagerurl>www.joomla.org</packagerurl>
+	<description><![CDATA[en-GB language pack]]></description>
+	<blockChildUninstall>true</blockChildUninstall>
+	<files>
+		<folder type="language" client="site" id="en-GB">site_en-GB</folder>
+		<folder type="language" client="administrator" id="en-GB">admin_en-GB</folder>
+	</files>
+	<updateservers>
+		<server type="collection" priority="1" name="Accredited Joomla! Translations">
+			https://update.joomla.org/language/translationlist_3.xml
+		</server>
+	</updateservers>
+</extension>
diff --git a/core/administrator/modules/mod_custom/mod_custom.php b/core/administrator/modules/mod_custom/mod_custom.php
new file mode 100644
index 00000000..deeb16df
--- /dev/null
+++ b/core/administrator/modules/mod_custom/mod_custom.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_custom
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if ($params->def('prepare_content', 1))
+{
+	JPluginHelper::importPlugin('content');
+	$module->content = JHtml::_('content.prepare', $module->content, '', 'mod_custom.content');
+}
+
+// Replace 'images/' to '../images/' when using an image from /images in backend.
+$module->content = preg_replace('*src\=\"(?!administrator\/)images/*', 'src="../images/', $module->content);
+
+require JModuleHelper::getLayoutPath('mod_custom', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_custom/mod_custom.xml b/core/administrator/modules/mod_custom/mod_custom.xml
new file mode 100644
index 00000000..f1bacd4e
--- /dev/null
+++ b/core/administrator/modules/mod_custom/mod_custom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_custom</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_CUSTOM_XML_DESCRIPTION</description>
+
+	<customContent />
+
+	<files>
+		<filename module="mod_custom">mod_custom.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_custom.ini</language>
+		<language tag="en-GB">en-GB.mod_custom.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_CUSTOM" />
+	<config>
+		<fields name="params">
+			<fieldset name="options" label="COM_MODULES_BASIC_FIELDSET_LABEL">
+				<field
+					name="prepare_content"
+					type="radio"
+					label="MOD_CUSTOM_FIELD_PREPARE_CONTENT_LABEL"
+					description="MOD_CUSTOM_FIELD_PREPARE_CONTENT_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset
+				name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_custom/tmpl/default.php b/core/administrator/modules/mod_custom/tmpl/default.php
new file mode 100644
index 00000000..e2d00403
--- /dev/null
+++ b/core/administrator/modules/mod_custom/tmpl/default.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_custom
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+echo $module->content;
diff --git a/core/administrator/modules/mod_feed/helper.php b/core/administrator/modules/mod_feed/helper.php
new file mode 100644
index 00000000..2bd61090
--- /dev/null
+++ b/core/administrator/modules/mod_feed/helper.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_feed
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_feed
+ *
+ * @since  1.5
+ */
+class ModFeedHelper
+{
+	/**
+	 * Method to load a feed.
+	 *
+	 * @param   JRegisty  $params  The parameters object.
+	 *
+	 * @return  JFeedReader|string  Return a JFeedReader object or a string message if error.
+	 *
+	 * @since   1.5
+	 */
+	public static function getFeed($params)
+	{
+		// Module params
+		$rssurl = $params->get('rssurl', '');
+
+		// Get RSS parsed object
+		try
+		{
+			jimport('joomla.feed.factory');
+			$feed   = new JFeedFactory;
+			$rssDoc = $feed->getFeed($rssurl);
+		}
+		catch (Exception $e)
+		{
+			return JText::_('MOD_FEED_ERR_FEED_NOT_RETRIEVED');
+		}
+
+		if (empty($rssDoc))
+		{
+			return JText::_('MOD_FEED_ERR_FEED_NOT_RETRIEVED');
+		}
+
+		return $rssDoc;
+	}
+}
diff --git a/core/administrator/modules/mod_feed/mod_feed.php b/core/administrator/modules/mod_feed/mod_feed.php
new file mode 100644
index 00000000..185bf6eb
--- /dev/null
+++ b/core/administrator/modules/mod_feed/mod_feed.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_feed
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the feed functions only once
+JLoader::register('ModFeedHelper', __DIR__ . '/helper.php');
+
+$rssurl = $params->get('rssurl', '');
+$rssrtl = $params->get('rssrtl', 0);
+
+// Check if feed URL has been set
+if (empty ($rssurl))
+{
+	echo '<div>';
+	echo JText::_('MOD_FEED_ERR_NO_URL');
+	echo '</div>';
+
+	return;
+}
+
+$feed            = ModFeedHelper::getFeed($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_feed', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_feed/mod_feed.xml b/core/administrator/modules/mod_feed/mod_feed.xml
new file mode 100644
index 00000000..7041c514
--- /dev/null
+++ b/core/administrator/modules/mod_feed/mod_feed.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_feed</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_FEED_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_feed">mod_feed.php</filename>
+		<filename>helper.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_feed.ini</language>
+		<language tag="en-GB">en-GB.mod_feed.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_FEED" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="rssurl"
+					type="url"
+					label="MOD_FEED_FIELD_RSSURL_LABEL"
+					description="MOD_FEED_FIELD_RSSURL_DESC"
+					filter="url"
+					size="50"
+					required="true"
+					validate="url"
+				/>
+
+				<field
+					name="rssrtl"
+					type="radio"
+					label="MOD_FEED_FIELD_RTL_LABEL"
+					description="MOD_FEED_FIELD_RTL_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rsstitle"
+					type="radio"
+					label="MOD_FEED_FIELD_RSSTITLE_LABEL"
+					description="MOD_FEED_FIELD_RSSTITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rssdesc"
+					type="radio"
+					label="MOD_FEED_FIELD_DESCRIPTION_LABEL"
+					description="MOD_FEED_FIELD_DESCRIPTION_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rssimage"
+					type="radio"
+					label="MOD_FEED_FIELD_IMAGE_LABEL"
+					description="MOD_FEED_FIELD_IMAGE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rssitems"
+					type="number"
+					label="MOD_FEED_FIELD_ITEMS_LABEL"
+					description="MOD_FEED_FIELD_ITEMS_DESC"
+					default="3"
+					filter="integer"
+				/>
+
+				<field
+					name="rssitemdesc"
+					type="radio"
+					label="MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL"
+					description="MOD_FEED_FIELD_ITEMDESCRIPTION_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="word_count"
+					type="number"
+					label="MOD_FEED_FIELD_WORDCOUNT_LABEL"
+					description="MOD_FEED_FIELD_WORDCOUNT_DESC"
+					size="6"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_feed/tmpl/default.php b/core/administrator/modules/mod_feed/tmpl/default.php
new file mode 100644
index 00000000..ea378c42
--- /dev/null
+++ b/core/administrator/modules/mod_feed/tmpl/default.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_feed
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (!empty($feed) && is_string($feed))
+{
+	echo $feed;
+}
+else
+{
+	$lang      = JFactory::getLanguage();
+	$myrtl     = $params->get('rssrtl', 0);
+	$direction = ' ';
+
+	if ($lang->isRtl() && $myrtl == 0)
+	{
+		$direction = ' redirect-rtl';
+	}
+
+	// Feed description
+	elseif ($lang->isRtl() && $myrtl == 1)
+	{
+		$direction = ' redirect-ltr';
+	}
+
+	elseif ($lang->isRtl() && $myrtl == 2)
+	{
+		$direction = ' redirect-rtl';
+	}
+
+	elseif ($myrtl == 0)
+	{
+		$direction = ' redirect-ltr';
+	}
+	elseif ($myrtl == 1)
+	{
+		$direction = ' redirect-ltr';
+	}
+	elseif ($myrtl == 2)
+	{
+		$direction = ' redirect-rtl';
+	}
+
+	if ($feed != false) :
+		// Image handling
+		$iUrl   = isset($feed->image) ? $feed->image : null;
+		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
+		?>
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> !important"  class="feed<?php echo $moduleclass_sfx; ?>">
+		<?php
+
+		// Feed description
+		if (!is_null($feed->title) && $params->get('rsstitle', 1)) : ?>
+			<h2 class="<?php echo $direction; ?>">
+				<a href="<?php echo str_replace('&', '&amp;', $rssurl); ?>" target="_blank">
+				<?php echo $feed->title; ?></a>
+			</h2>
+		<?php endif; ?>
+
+		<!-- Feed description -->
+		<?php if ($params->get('rssdesc', 1)) : ?>
+			<?php echo $feed->description; ?>
+		<?php endif; ?>
+
+		<!--  Feed image  -->
+		<?php if ($params->get('rssimage', 1) && $iUrl) : ?>
+			<img src="<?php echo $iUrl; ?>" alt="<?php echo @$iTitle; ?>"/>
+		<?php endif; ?>
+
+
+	<!-- Show items -->
+	<?php if (!empty($feed)) : ?>
+		<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?>">
+		<?php for ($i = 0; $i < $params->get('rssitems', 3); $i++) :
+
+			if (!$feed->offsetExists($i)) :
+				break;
+			endif;
+			$uri  = $feed[$i]->uri || !$feed[$i]->isPermaLink ? trim($feed[$i]->uri) : trim($feed[$i]->guid);
+			$uri  = !$uri || stripos($uri, 'http') !== 0 ? $rssurl : $uri;
+			$text = $feed[$i]->content !== '' ? trim($feed[$i]->content) : '';
+			?>
+				<li>
+					<?php if (!empty($uri)) : ?>
+						<h5 class="feed-link">
+						<a href="<?php echo $uri; ?>" target="_blank">
+						<?php echo trim($feed[$i]->title); ?></a></h5>
+					<?php else : ?>
+						<h5 class="feed-link"><?php echo trim($feed[$i]->title); ?></h5>
+					<?php endif; ?>
+
+					<?php if ($params->get('rssitemdesc', 1) && $text !== '') : ?>
+						<div class="feed-item-description">
+						<?php
+							// Strip the images.
+							$text = JFilterOutput::stripImages($text);
+							$text = JHtml::_('string.truncate', $text, $params->get('word_count', 0), true, false);
+							echo str_replace('&apos;', "'", $text);
+						?>
+						</div>
+					<?php endif; ?>
+				</li>
+		<?php endfor; ?>
+		</ul>
+	<?php endif; ?>
+	</div>
+	<?php endif;
+}
diff --git a/core/administrator/modules/mod_latest/helper.php b/core/administrator/modules/mod_latest/helper.php
new file mode 100644
index 00000000..adcb2155
--- /dev/null
+++ b/core/administrator/modules/mod_latest/helper.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/models', 'ContentModel');
+
+/**
+ * Helper for mod_latest
+ *
+ * @since  1.5
+ */
+abstract class ModLatestHelper
+{
+	/**
+	 * Get a list of articles.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The module parameters.
+	 *
+	 * @return  mixed  An array of articles, or false on error.
+	 */
+	public static function getList(&$params)
+	{
+		$user = JFactory::getuser();
+
+		// Get an instance of the generic articles model
+		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		// Set List SELECT
+		$model->setState('list.select', 'a.id, a.title, a.checked_out, a.checked_out_time, ' .
+			' a.access, a.created, a.created_by, a.created_by_alias, a.featured, a.state, a.publish_up, a.publish_down');
+
+		// Set Ordering filter
+		switch ($params->get('ordering', 'c_dsc'))
+		{
+			case 'm_dsc':
+				$model->setState('list.ordering', 'modified DESC, created');
+				$model->setState('list.direction', 'DESC');
+				break;
+
+			case 'c_dsc':
+			default:
+				$model->setState('list.ordering', 'created');
+				$model->setState('list.direction', 'DESC');
+				break;
+		}
+
+		// Set Category Filter
+		$categoryId = $params->get('catid', null);
+
+		if (is_numeric($categoryId))
+		{
+			$model->setState('filter.category_id', $categoryId);
+		}
+
+		// Set User Filter.
+		$userId = $user->get('id');
+
+		switch ($params->get('user_id', '0'))
+		{
+			case 'by_me':
+				$model->setState('filter.author_id', $userId);
+				break;
+
+			case 'not_me':
+				$model->setState('filter.author_id', $userId);
+				$model->setState('filter.author_id.include', false);
+				break;
+		}
+
+		// Set the Start and Limit
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', $params->get('count', 5));
+
+		$items = $model->getItems();
+
+		if ($error = $model->getError())
+		{
+			JError::raiseError(500, $error);
+
+			return false;
+		}
+
+		// Set the links
+		foreach ($items as &$item)
+		{
+			if ($user->authorise('core.edit', 'com_content.article.' . $item->id))
+			{
+				$item->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $item->id);
+			}
+			else
+			{
+				$item->link = '';
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get the alternate title for the module.
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  The module parameters.
+	 *
+	 * @return  string  The alternate title for the module.
+	 */
+	public static function getTitle($params)
+	{
+		$who   = $params->get('user_id', '0');
+		$catid = (int) $params->get('catid', null);
+		$type  = $params->get('ordering', 'c_dsc') == 'c_dsc' ? '_CREATED' : '_MODIFIED';
+
+		if ($catid)
+		{
+			$category = JCategories::getInstance('Content')->get($catid);
+
+			if ($category)
+			{
+				$title = $category->title;
+			}
+			else
+			{
+				$title = JText::_('MOD_POPULAR_UNEXISTING');
+			}
+		}
+		else
+		{
+			$title = '';
+		}
+
+		return JText::plural(
+			'MOD_LATEST_TITLE' . $type . ($catid ? '_CATEGORY' : '') . ($who != '0' ? "_$who" : ''),
+			(int) $params->get('count', 5),
+			$title
+		);
+	}
+}
diff --git a/core/administrator/modules/mod_latest/mod_latest.php b/core/administrator/modules/mod_latest/mod_latest.php
new file mode 100644
index 00000000..ac8f754a
--- /dev/null
+++ b/core/administrator/modules/mod_latest/mod_latest.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include dependencies.
+JLoader::register('ModLatestHelper', __DIR__ . '/helper.php');
+
+$list = ModLatestHelper::getList($params);
+
+if ($params->get('automatic_title', 0))
+{
+	$module->title = ModLatestHelper::getTitle($params);
+}
+
+require JModuleHelper::getLayoutPath('mod_latest', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_latest/mod_latest.xml b/core/administrator/modules/mod_latest/mod_latest.xml
new file mode 100644
index 00000000..ac206f94
--- /dev/null
+++ b/core/administrator/modules/mod_latest/mod_latest.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_latest</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_LATEST_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_latest">mod_latest.php</filename>
+		<filename>helper.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_latest.ini</language>
+		<language tag="en-GB">en-GB.mod_latest.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="count"
+					type="number"
+					label="MOD_LATEST_FIELD_COUNT_LABEL"
+					description="MOD_LATEST_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="ordering"
+					type="list"
+					label="MOD_LATEST_FIELD_ORDERING_LABEL"
+					description="MOD_LATEST_FIELD_ORDERING_DESC"
+					default="c_dsc"
+					>
+					<option value="c_dsc">MOD_LATEST_FIELD_VALUE_ORDERING_ADDED</option>
+					<option value="m_dsc">MOD_LATEST_FIELD_VALUE_ORDERING_MODIFIED</option>
+				</field>
+
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_LATEST_FIELD_CATEGORY_DESC"
+					id="catid"
+					extension="com_content"
+					default=""
+					filter="integer"
+					>
+					<option value="">JOPTION_ANY_CATEGORY</option>
+				</field>
+
+				<field
+					name="user_id"
+					type="list"
+					label="MOD_LATEST_FIELD_AUTHORS_LABEL"
+					description="MOD_LATEST_FIELD_AUTHORS_DESC"
+					default="0"
+					>
+					<option value="0">MOD_LATEST_FIELD_VALUE_AUTHORS_ANYONE</option>
+					<option value="by_me">MOD_LATEST_FIELD_VALUE_AUTHORS_BY_ME</option>
+					<option value="not_me">MOD_LATEST_FIELD_VALUE_AUTHORS_NOT_BY_ME</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="automatic_title"
+					type="radio"
+					label="COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL"
+					description="COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_latest/tmpl/default.php b/core/administrator/modules/mod_latest/tmpl/default.php
new file mode 100644
index 00000000..3a4ac0bf
--- /dev/null
+++ b/core/administrator/modules/mod_latest/tmpl/default.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+?>
+<div class="row-striped">
+	<?php if (count($list)) : ?>
+		<?php foreach ($list as $i => $item) : ?>
+			<div class="row-fluid">
+				<div class="span8 truncate">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', false, 'cb', $item->publish_up, $item->publish_down); ?>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
+					<?php endif; ?>
+
+					<strong class="row-title" title="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+						<?php if ($item->link) : ?>
+							<a href="<?php echo $item->link; ?>">
+								<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a>
+						<?php else : ?>
+							<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
+						<?php endif; ?>
+					</strong>
+
+					<small class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'MOD_LATEST_CREATED_BY'); ?>">
+						<?php echo $item->author_name; ?>
+					</small>
+				</div>
+				<div class="span4">
+					<div class="small pull-right hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGLOBAL_FIELD_CREATED_LABEL'); ?>">
+						<span class="icon-calendar" aria-hidden="true"></span> <?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC5')); ?>
+					</div>
+				</div>
+			</div>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<div class="row-fluid">
+			<div class="span12">
+				<div class="alert"><?php echo JText::_('MOD_LATEST_NO_MATCHING_RESULTS');?></div>
+			</div>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/modules/mod_logged/helper.php b/core/administrator/modules/mod_logged/helper.php
new file mode 100644
index 00000000..d9c1051c
--- /dev/null
+++ b/core/administrator/modules/mod_logged/helper.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_logged
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_logged
+ *
+ * @since  1.5
+ */
+abstract class ModLoggedHelper
+{
+	/**
+	 * Get a list of logged users.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The module parameters.
+	 *
+	 * @return  mixed  An array of users, or false on error.
+	 *
+	 * @throws  RuntimeException
+	 */
+	public static function getList(&$params)
+	{
+		$db    = JFactory::getDbo();
+		$user  = JFactory::getUser();
+		$query = $db->getQuery(true)
+			->select('s.time, s.client_id, u.id, u.name, u.username')
+			->from('#__session AS s')
+			->join('LEFT', '#__users AS u ON s.userid = u.id')
+			->where('s.guest = 0');
+		$db->setQuery($query, 0, $params->get('count', 5));
+
+		try
+		{
+			$results = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			throw $e;
+		}
+
+		foreach ($results as $k => $result)
+		{
+			$results[$k]->logoutLink = '';
+
+			if ($user->authorise('core.manage', 'com_users'))
+			{
+				$results[$k]->editLink   = JRoute::_('index.php?option=com_users&task=user.edit&id=' . $result->id);
+				$results[$k]->logoutLink = JRoute::_('index.php?option=com_login&task=logout&uid=' . $result->id . '&' . JSession::getFormToken() . '=1');
+			}
+
+			if ($params->get('name', 1) == 0)
+			{
+				$results[$k]->name = $results[$k]->username;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Get the alternate title for the module
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  The module parameters.
+	 *
+	 * @return  string    The alternate title for the module.
+	 */
+	public static function getTitle($params)
+	{
+		return JText::plural('MOD_LOGGED_TITLE', $params->get('count', 5));
+	}
+}
diff --git a/core/administrator/modules/mod_logged/mod_logged.php b/core/administrator/modules/mod_logged/mod_logged.php
new file mode 100644
index 00000000..6b96cff5
--- /dev/null
+++ b/core/administrator/modules/mod_logged/mod_logged.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_logged
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include dependencies.
+JLoader::register('ModLoggedHelper', __DIR__ . '/helper.php');
+
+$users = ModLoggedHelper::getList($params);
+
+if ($params->get('automatic_title', 0))
+{
+	$module->title = ModLoggedHelper::getTitle($params);
+}
+
+require JModuleHelper::getLayoutPath('mod_logged', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_logged/mod_logged.xml b/core/administrator/modules/mod_logged/mod_logged.xml
new file mode 100644
index 00000000..f9300b07
--- /dev/null
+++ b/core/administrator/modules/mod_logged/mod_logged.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_logged</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_LOGGED_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_logged">mod_logged.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_logged.ini</language>
+		<language tag="en-GB">en-GB.mod_logged.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGGED" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="count"
+					type="number"
+					label="MOD_LOGGED_FIELD_COUNT_LABEL"
+					description="MOD_LOGGED_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="name"
+					type="list"
+					label="MOD_LOGGED_NAME"
+					description="MOD_LOGGED_FIELD_NAME_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">MOD_LOGGED_NAME</option>
+					<option value="0">JGLOBAL_USERNAME</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="automatic_title"
+					type="radio"
+					label="COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL"
+					description="COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_logged/tmpl/default.php b/core/administrator/modules/mod_logged/tmpl/default.php
new file mode 100644
index 00000000..cc084a36
--- /dev/null
+++ b/core/administrator/modules/mod_logged/tmpl/default.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_logged
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+?>
+<div class="row-striped">
+	<?php foreach ($users as $user) : ?>
+		<div class="row-fluid">
+			<div class="span8">
+				<?php if ($user->client_id == 0) : ?>
+					<a title="<?php echo JHtml::_('tooltipText', 'MOD_LOGGED_LOGOUT'); ?>" href="<?php echo $user->logoutLink; ?>" class="btn btn-danger btn-mini hasTooltip">
+						<span class="icon-remove icon-white" aria-hidden="true"><span class="element-invisible"><?php echo JText::_('JLOGOUT'); ?></span></span>
+					</a>
+				<?php endif; ?>
+
+				<strong class="row-title">
+					<?php if (isset($user->editLink)) : ?>
+						<a href="<?php echo $user->editLink; ?>" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGRID_HEADING_ID'); ?> : <?php echo $user->id; ?>">
+							<?php echo $user->name; ?></a>
+					<?php else : ?>
+						<?php echo $user->name; ?>
+					<?php endif; ?>
+				</strong>
+
+				<small class="small hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JCLIENT'); ?>">
+					<?php if ($user->client_id === null) : ?>
+						<?php // Don't display a client ?>
+					<?php elseif ($user->client_id) : ?>
+						<?php echo JText::_('JADMINISTRATION'); ?>
+					<?php else : ?>
+						<?php echo JText::_('JSITE'); ?>
+					<?php endif; ?>
+				</small>
+			</div>
+			<div class="span4">
+				<div class="small pull-right hasTooltip" title="<?php echo JHtml::_('tooltipText', 'MOD_LOGGED_LAST_ACTIVITY'); ?>">
+					<span class="icon-calendar" aria-hidden="true"></span> <?php echo JHtml::_('date', $user->time, JText::_('DATE_FORMAT_LC5')); ?>
+				</div>
+			</div>
+		</div>
+	<?php endforeach; ?>
+</div>
diff --git a/core/administrator/modules/mod_login/helper.php b/core/administrator/modules/mod_login/helper.php
new file mode 100644
index 00000000..122261b1
--- /dev/null
+++ b/core/administrator/modules/mod_login/helper.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_login
+ *
+ * @since  1.6
+ */
+abstract class ModLoginHelper
+{
+	/**
+	 * Get an HTML select list of the available languages.
+	 *
+	 * @return  string
+	 */
+	public static function getLanguageList()
+	{
+		$languages = JLanguageHelper::createLanguageList(null, JPATH_ADMINISTRATOR, false, true);
+
+		if (count($languages) <= 1)
+		{
+			return '';
+		}
+
+		usort(
+			$languages,
+			function ($a, $b)
+			{
+				return strcmp($a['value'], $b['value']);
+			}
+		);
+
+		// Fix wrongly set parentheses in RTL languages
+		if (JFactory::getLanguage()->isRtl())
+		{
+			foreach ($languages as &$language)
+			{
+				$language['text'] = $language['text'] . '&#x200E;';
+			}
+		}
+
+		array_unshift($languages, JHtml::_('select.option', '', JText::_('JDEFAULTLANGUAGE')));
+
+		return JHtml::_('select.genericlist', $languages, 'lang', 'class="advancedSelect" tabindex="4"', 'value', 'text', null);
+	}
+
+	/**
+	 * Get the redirect URI after login.
+	 *
+	 * @return  string
+	 */
+	public static function getReturnUri()
+	{
+		$uri    = JUri::getInstance();
+		$return = 'index.php' . $uri->toString(array('query'));
+
+		if ($return != 'index.php?option=com_login')
+		{
+			return base64_encode($return);
+		}
+		else
+		{
+			return base64_encode('index.php');
+		}
+	}
+
+	/**
+	 * Creates a list of two factor authentication methods used in com_users
+	 * on user view
+	 *
+	 * @return  array
+	 *
+	 * @deprecated  4.0  Use JAuthenticationHelper::getTwoFactorMethods() instead.
+	 */
+	public static function getTwoFactorMethods()
+	{
+		try
+		{
+			JLog::add(
+				sprintf('%s() is deprecated, use JAuthenticationHelper::getTwoFactorMethods() instead.', __METHOD__),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
+
+		return JAuthenticationHelper::getTwoFactorMethods();
+	}
+}
diff --git a/core/administrator/modules/mod_login/mod_login.php b/core/administrator/modules/mod_login/mod_login.php
new file mode 100644
index 00000000..f777066e
--- /dev/null
+++ b/core/administrator/modules/mod_login/mod_login.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the login functions only once
+JLoader::register('ModLoginHelper', __DIR__ . '/helper.php');
+
+$langs            = ModLoginHelper::getLanguageList();
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+$return           = ModLoginHelper::getReturnUri();
+
+require JModuleHelper::getLayoutPath('mod_login', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_login/mod_login.xml b/core/administrator/modules/mod_login/mod_login.xml
new file mode 100644
index 00000000..6f11213a
--- /dev/null
+++ b/core/administrator/modules/mod_login/mod_login.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_login</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_LOGIN_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_login">mod_login.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_login.ini</language>
+		<language tag="en-GB">en-GB.mod_login.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LOGIN" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="usesecure"
+					type="radio"
+					label="MOD_LOGIN_FIELD_USESECURE_LABEL"
+					description="MOD_LOGIN_FIELD_USESECURE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+				 	rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_login/tmpl/default.php b/core/administrator/modules/mod_login/tmpl/default.php
new file mode 100644
index 00000000..1a19a285
--- /dev/null
+++ b/core/administrator/modules/mod_login/tmpl/default.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.tooltip');
+
+// Load chosen if we have language selector, ie, more than one administrator language installed and enabled.
+if ($langs)
+{
+	JHtml::_('formbehavior.chosen', '.advancedSelect');
+}
+?>
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure', 0)); ?>" method="post" id="form-login" class="form-inline">
+	<fieldset class="loginform">
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-user hasTooltip" title="<?php echo JText::_('JGLOBAL_USERNAME'); ?>"></span>
+						<label for="mod-login-username" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_USERNAME'); ?>
+						</label>
+					</span>
+					<input name="username" tabindex="1" id="mod-login-username" type="text" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" size="15" autofocus="true" />
+					<a href="<?php echo JUri::root(); ?>index.php?option=com_users&view=remind" class="btn width-auto hasTooltip" title="<?php echo JText::_('MOD_LOGIN_REMIND'); ?>">
+						<span class="icon-help"></span>
+					</a>
+				</div>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-lock hasTooltip" title="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>"></span>
+						<label for="mod-login-password" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_PASSWORD'); ?>
+						</label>
+					</span>
+					<input name="passwd" tabindex="2" id="mod-login-password" type="password" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" size="15"/>
+					<a href="<?php echo JUri::root(); ?>index.php?option=com_users&view=reset" class="btn width-auto hasTooltip" title="<?php echo JText::_('MOD_LOGIN_RESET'); ?>">
+						<span class="icon-help"></span>
+					</a>
+				</div>
+			</div>
+		</div>
+		<?php if (count($twofactormethods) > 1): ?>
+		<div class="control-group">
+			<div class="controls">
+				<div class="input-prepend input-append">
+					<span class="add-on">
+						<span class="icon-star hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>"></span>
+						<label for="mod-login-secretkey" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>
+						</label>
+					</span>
+					<input name="secretkey" autocomplete="off" tabindex="3" id="mod-login-secretkey" type="text" class="input-medium" placeholder="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" size="15"/>
+					<span class="btn width-auto hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY_HELP'); ?>">
+						<span class="icon-help"></span>
+					</span>
+				</div>
+			</div>
+		</div>
+		<?php endif; ?>
+		<?php if (!empty($langs)) : ?>
+			<div class="control-group">
+				<div class="controls">
+					<div class="input-prepend">
+						<span class="add-on">
+							<span class="icon-comment hasTooltip" title="<?php echo JHtml::_('tooltipText', 'MOD_LOGIN_LANGUAGE'); ?>"></span>
+							<label for="lang" class="element-invisible">
+								<?php echo JText::_('MOD_LOGIN_LANGUAGE'); ?>
+							</label>
+						</span>
+						<?php echo $langs; ?>
+					</div>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="controls">
+				<div class="btn-group">
+					<button tabindex="5" class="btn btn-primary btn-block btn-large login-button">
+						<span class="icon-lock icon-white"></span> <?php echo JText::_('MOD_LOGIN_LOGIN'); ?>
+					</button>
+				</div>
+			</div>
+		</div>
+		<input type="hidden" name="option" value="com_login"/>
+		<input type="hidden" name="task" value="login"/>
+		<input type="hidden" name="return" value="<?php echo $return; ?>"/>
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+</form>
diff --git a/core/administrator/modules/mod_menu/helper.php b/core/administrator/modules/mod_menu/helper.php
new file mode 100644
index 00000000..9e9a515e
--- /dev/null
+++ b/core/administrator/modules/mod_menu/helper.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_menu
+ *
+ * @since  1.5
+ */
+abstract class ModMenuHelper
+{
+	/**
+	 * Get a list of the available menus.
+	 *
+	 * @return  array  An array of the available menus (from the menu types table).
+	 *
+	 * @since   1.6
+	 */
+	public static function getMenus()
+	{
+		$db     = JFactory::getDbo();
+
+		// Search for home menu and language if exists
+		$subQuery = $db->getQuery(true)
+			->select('b.menutype, b.home, b.language, l.image, l.sef, l.title_native')
+			->from('#__menu AS b')
+			->leftJoin('#__languages AS l ON l.lang_code = b.language')
+			->where('b.home != 0')
+			->where('(b.client_id = 0 OR b.client_id IS NULL)');
+
+		// Get all menu types with optional home menu and language
+		$query = $db->getQuery(true)
+			->select('a.id, a.asset_id, a.menutype, a.title, a.description, a.client_id')
+			->select('c.home, c.language, c.image, c.sef, c.title_native')
+			->from('#__menu_types AS a')
+			->leftJoin('(' . (string) $subQuery . ') c ON c.menutype = a.menutype')
+			->order('a.id');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$result = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$result = array();
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('JERROR_LOADING_MENUS', $e->getMessage()), 'error');
+		}
+
+		return $result;
+	}
+}
diff --git a/core/administrator/modules/mod_menu/menu.php b/core/administrator/modules/mod_menu/menu.php
new file mode 100644
index 00000000..882ee939
--- /dev/null
+++ b/core/administrator/modules/mod_menu/menu.php
@@ -0,0 +1,477 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Menu\Node;
+use Joomla\CMS\Menu\Tree;
+use Joomla\CMS\Menu\MenuHelper;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Tree based class to render the admin menu
+ *
+ * @since  1.5
+ */
+class JAdminCssMenu
+{
+	/**
+	 * The Menu tree object
+	 *
+	 * @var    Tree
+	 *
+	 * @since  3.8.0
+	 */
+	protected $tree;
+
+	/**
+	 * The module options
+	 *
+	 * @var    Registry
+	 *
+	 * @since  3.8.0
+	 */
+	protected $params;
+
+	/**
+	 * The menu bar state
+	 *
+	 * @var    bool
+	 *
+	 * @since  3.8.0
+	 */
+	protected $enabled;
+
+	/**
+	 * Get the current menu tree
+	 *
+	 * @return  Tree
+	 *
+	 * @since   3.8.0
+	 */
+	public function getTree()
+	{
+		if (!$this->tree)
+		{
+			$this->tree = new Tree;
+		}
+
+		return $this->tree;
+	}
+
+	/**
+	 * Populate the menu items in the menu tree object
+	 *
+	 * @param   Registry  $params   Menu configuration parameters
+	 * @param   bool      $enabled  Whether the menu should be enabled or disabled
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function load($params, $enabled)
+	{
+		$this->tree    = $this->getTree();
+		$this->params  = $params;
+		$this->enabled = $enabled;
+		$menutype      = $this->params->get('menutype', '*');
+
+		if ($menutype === '*')
+		{
+			$name   = $this->params->get('preset', 'joomla');
+			$levels = MenuHelper::loadPreset($name);
+		}
+		else
+		{
+			$items = MenusHelper::getMenuItems($menutype, true);
+
+			if ($this->enabled && $this->params->get('check', 1))
+			{
+				if ($this->check($items, $this->params))
+				{
+					$this->params->set('recovery', true);
+
+					// In recovery mode, load the preset inside a special root node.
+					$this->tree->addChild(new Node\Heading('MOD_MENU_RECOVERY_MENU_ROOT'), true);
+
+					$levels = MenuHelper::loadPreset('joomla');
+					$levels = $this->preprocess($levels);
+
+					$this->populateTree($levels);
+
+					$this->tree->addChild(new Node\Separator);
+
+					// Add link to exit recovery mode
+					$uri = clone JUri::getInstance();
+					$uri->setVar('recover_menu', 0);
+
+					$this->tree->addChild(new Node\Url('MOD_MENU_RECOVERY_EXIT', $uri->toString()));
+
+					$this->tree->getParent();
+				}
+			}
+
+			$levels = MenuHelper::createLevels($items);
+		}
+
+		$levels = $this->preprocess($levels);
+
+		$this->populateTree($levels);
+	}
+
+	/**
+	 * Method to render a given level of a menu using provided layout file
+	 *
+	 * @param   string  $layoutFile  The layout file to be used to render
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function renderSubmenu($layoutFile)
+	{
+		if (is_file($layoutFile))
+		{
+			$children = $this->tree->getCurrent()->getChildren();
+
+			foreach ($children as $child)
+			{
+				$this->tree->setCurrent($child);
+
+				// This sets the scope to this object for the layout file and also isolates other `include`s
+				require $layoutFile;
+			}
+		}
+	}
+
+	/**
+	 * Check the flat list of menu items for important links
+	 *
+	 * @param   array     $items   The menu items array
+	 * @param   Registry  $params  Module options
+	 *
+	 * @return  boolean  Whether to show recovery menu
+	 *
+	 * @since   3.8.0
+	 */
+	protected function check($items, Registry $params)
+	{
+		$me          = JFactory::getUser();
+		$authMenus   = $me->authorise('core.manage', 'com_menus');
+		$authModules = $me->authorise('core.manage', 'com_modules');
+
+		if (!$authMenus && !$authModules)
+		{
+			return false;
+		}
+
+		$app        = JFactory::getApplication();
+		$types      = ArrayHelper::getColumn($items, 'type');
+		$elements   = ArrayHelper::getColumn($items, 'element');
+		$rMenu      = $authMenus && !in_array('com_menus', $elements);
+		$rModule    = $authModules && !in_array('com_modules', $elements);
+		$rContainer = !in_array('container', $types);
+
+		if ($rMenu || $rModule || $rContainer)
+		{
+			$recovery = $app->getUserStateFromRequest('mod_menu.recovery', 'recover_menu', 0, 'int');
+
+			if ($recovery)
+			{
+				return true;
+			}
+
+			$missing = array();
+
+			if ($rMenu)
+			{
+				$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_MENU_MANAGER');
+			}
+
+			if ($rModule)
+			{
+				$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_MODULE_MANAGER');
+			}
+
+			if ($rContainer)
+			{
+				$missing[] = JText::_('MOD_MENU_IMPORTANT_ITEM_COMPONENTS_CONTAINER');
+			}
+
+			$uri = clone JUri::getInstance();
+			$uri->setVar('recover_menu', 1);
+
+			$table    = JTable::getInstance('MenuType');
+			$menutype = $params->get('menutype');
+
+			$table->load(array('menutype' => $menutype));
+
+			$menutype = $table->get('title', $menutype);
+			$message  = JText::sprintf('MOD_MENU_IMPORTANT_ITEMS_INACCESSIBLE_LIST_WARNING', $menutype, implode(', ', $missing), $uri);
+
+			$app->enqueueMessage($message, 'warning');
+		}
+
+		return false;
+	}
+
+	/**
+	 * Filter and perform other preparatory tasks for loaded menu items based on access rights and module configurations for display
+	 *
+	 * @param   \stdClass[]  $items  The levelled array of menu item objects
+	 *
+	 * @return  array
+	 *
+	 * @since   3.8.0
+	 */
+	protected function preprocess($items)
+	{
+		$result     = array();
+		$user       = JFactory::getUser();
+		$language   = JFactory::getLanguage();
+
+		$noSeparator = true;
+
+		// Call preprocess for the menu items on plugins.
+		// Plugins should normally process the current level only unless their logic needs deep levels too.
+		$dispatcher = JEventDispatcher::getInstance();
+		$dispatcher->trigger('onPreprocessMenuItems', array('com_menus.administrator.module', &$items, $this->params, $this->enabled));
+
+		foreach ($items as $i => &$item)
+		{
+			// Exclude item with menu item option set to exclude from menu modules
+			if ($item->params->get('menu_show', 1) == 0)
+			{
+				continue;
+			}
+
+			$item->scope = isset($item->scope) ? $item->scope : 'default';
+			$item->icon  = isset($item->icon) ? $item->icon : '';
+
+			// Whether this scope can be displayed. Applies only to preset items. Db driven items should use un/published state.
+			if (($item->scope === 'help' && !$this->params->get('showhelp', 1)) || ($item->scope === 'edit' && !$this->params->get('shownew', 1)))
+			{
+				continue;
+			}
+
+			if (substr($item->link, 0, 8) === 'special:')
+			{
+				$special = substr($item->link, 8);
+
+				if ($special === 'language-forum')
+				{
+					$item->link = 'index.php?option=com_admin&amp;view=help&amp;layout=langforum';
+				}
+				elseif ($special === 'custom-forum')
+				{
+					$item->link = $this->params->get('forum_url');
+				}
+			}
+
+			// Exclude item if is not enabled
+			if ($item->element && !JComponentHelper::isEnabled($item->element))
+			{
+				continue;
+			}
+
+			// Exclude Mass Mail if disabled in global configuration
+			if ($item->scope === 'massmail' && (JFactory::getApplication()->get('massmailoff', 0) == 1))
+			{
+				continue;
+			}
+
+			// Exclude item if the component is not authorised
+			$assetName = $item->element;
+
+			if ($item->element === 'com_categories')
+			{
+				parse_str($item->link, $query);
+				$assetName = isset($query['extension']) ? $query['extension'] : 'com_content';
+			}
+			elseif ($item->element === 'com_fields')
+			{
+				parse_str($item->link, $query);
+
+				// Only display Fields menus when enabled in the component
+				$createFields = null;
+
+				if (isset($query['context']))
+				{
+					$createFields = JComponentHelper::getParams(strstr($query['context'], '.', true))->get('custom_fields_enable', 1);
+				}
+
+				if (!$createFields)
+				{
+					continue;
+				}
+
+				list($assetName) = isset($query['context']) ? explode('.', $query['context'], 2) : array('com_fields');
+			}
+			elseif ($item->element === 'com_config' && !$user->authorise('core.admin'))
+			{
+				continue;
+			}
+			elseif ($item->element === 'com_admin')
+			{
+				parse_str($item->link, $query);
+
+				if (isset($query['view']) && $query['view'] === 'sysinfo' && !$user->authorise('core.admin'))
+				{
+					continue;
+				}
+			}
+
+			if ($assetName && !$user->authorise(($item->scope === 'edit') ? 'core.create' : 'core.manage', $assetName))
+			{
+				continue;
+			}
+
+			// Exclude if link is invalid
+			if (!in_array($item->type, array('separator', 'heading', 'container')) && trim($item->link) === '')
+			{
+				continue;
+			}
+
+			// Process any children if exists
+			$item->submenu = $this->preprocess($item->submenu);
+
+			// Populate automatic children for container items
+			if ($item->type === 'container')
+			{
+				$exclude    = (array) $item->params->get('hideitems') ?: array();
+				$components = MenusHelper::getMenuItems('main', false, $exclude);
+
+				$item->components = MenuHelper::createLevels($components);
+				$item->components = $this->preprocess($item->components);
+				$item->components = ArrayHelper::sortObjects($item->components, 'text', 1, false, true);
+			}
+
+			// Exclude if there are no child items under heading or container
+			if (in_array($item->type, array('heading', 'container')) && empty($item->submenu) && empty($item->components))
+			{
+				continue;
+			}
+
+			// Remove repeated and edge positioned separators, It is important to put this check at the end of any logical filtering.
+			if ($item->type === 'separator')
+			{
+				if ($noSeparator)
+				{
+					continue;
+				}
+
+				$noSeparator = true;
+			}
+			else
+			{
+				$noSeparator = false;
+			}
+
+			// Ok we passed everything, load language at last only
+			if ($item->element)
+			{
+				$language->load($item->element . '.sys', JPATH_ADMINISTRATOR, null, false, true) ||
+				$language->load($item->element . '.sys', JPATH_ADMINISTRATOR . '/components/' . $item->element, null, false, true);
+			}
+
+			if ($item->type === 'separator' && $item->params->get('text_separator') == 0)
+			{
+				$item->title = '';
+			}
+
+			$item->text = JText::_($item->title);
+
+			$result[$i] = $item;
+		}
+
+		// If last one was a separator remove it too.
+		if ($noSeparator && isset($i))
+		{
+			unset($result[$i]);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Load the menu items from a hierarchical list of items into the menu tree
+	 *
+	 * @param   stdClass[]  $levels  Menu items as a hierarchical list format
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	protected function populateTree($levels)
+	{
+		foreach ($levels as $item)
+		{
+			$class = $this->enabled ? $item->class : 'disabled';
+
+			if ($item->type === 'separator')
+			{
+				$this->tree->addChild(new Node\Separator($item->title));
+			}
+			elseif ($item->type === 'heading')
+			{
+				// We already excluded heading type menu item with no children.
+				$this->tree->addChild(new Node\Heading($item->title, $class, null, $item->icon), $this->enabled);
+
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
+					$this->tree->getParent();
+				}
+			}
+			elseif ($item->type === 'url')
+			{
+				$cNode = new Node\Url($item->title, $item->link, $item->browserNav, $class, null, $item->icon);
+				$this->tree->addChild($cNode, $this->enabled);
+
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
+					$this->tree->getParent();
+				}
+			}
+			elseif ($item->type === 'component')
+			{
+				$cNode = new Node\Component($item->title, $item->element, $item->link, $item->browserNav, $class, null, $item->icon);
+				$this->tree->addChild($cNode, $this->enabled);
+
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
+					$this->tree->getParent();
+				}
+			}
+			elseif ($item->type === 'container')
+			{
+				// We already excluded container type menu item with no children.
+				$this->tree->addChild(new Node\Container($item->title, $item->class, null, $item->icon), $this->enabled);
+
+				if ($this->enabled)
+				{
+					$this->populateTree($item->submenu);
+
+					// Add a separator between dynamic menu items and components menu items
+					if (count($item->submenu) && count($item->components))
+					{
+						$this->tree->addChild(new Node\Separator);
+					}
+
+					$this->populateTree($item->components);
+
+					$this->tree->getParent();
+				}
+			}
+		}
+	}
+}
diff --git a/core/administrator/modules/mod_menu/mod_menu.php b/core/administrator/modules/mod_menu/mod_menu.php
new file mode 100644
index 00000000..83397a3f
--- /dev/null
+++ b/core/administrator/modules/mod_menu/mod_menu.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+// Include the module helper classes.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+JLoader::register('ModMenuHelper', __DIR__ . '/helper.php');
+JLoader::register('JAdminCssMenu', __DIR__ . '/menu.php');
+
+/** @var  Registry  $params */
+$lang    = JFactory::getLanguage();
+$user    = JFactory::getUser();
+$input   = JFactory::getApplication()->input;
+$enabled = !$input->getBool('hidemainmenu');
+
+$menu = new JAdminCssMenu;
+$menu->load($params, $enabled);
+
+// Render the module layout
+require JModuleHelper::getLayoutPath('mod_menu', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_menu/mod_menu.xml b/core/administrator/modules/mod_menu/mod_menu.xml
new file mode 100644
index 00000000..e4473cd0
--- /dev/null
+++ b/core/administrator/modules/mod_menu/mod_menu.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_menu</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_MENU_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_menu">mod_menu.php</filename>
+		<folder>preset</folder>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+		<filename>menu.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_menu.ini</language>
+		<language tag="en-GB">en-GB.mod_menu.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MENU" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="menutype"
+					type="menu"
+					label="MOD_MENU_FIELD_MENUTYPE_LABEL"
+					description="MOD_MENU_FIELD_MENUTYPE_DESC"
+					clientid="1"
+					>
+					<option value="*">MOD_MENU_FIELD_MENUTYPE_OPTION_PREDEFINED</option>
+				</field>
+
+				<field
+					name="preset"
+					type="menuPreset"
+					label="MOD_MENU_FIELD_PRESET_LABEL"
+					description="MOD_MENU_FIELD_PRESET_DESC"
+					addfieldpath="administrator/components/com_menus/models/fields"
+					showon="menutype:*"
+				/>
+
+				<field
+					name="check"
+					type="radio"
+					label="MOD_MENU_FIELD_CHECK_LABEL"
+					description="MOD_MENU_FIELD_CHECK_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="menutype!:*"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="shownew"
+					type="radio"
+					label="MOD_MENU_FIELD_SHOWNEW"
+					description="MOD_MENU_FIELD_SHOWNEW_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="menutype:*"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="showhelp"
+					type="radio"
+					label="MOD_MENU_FIELD_SHOWHELP"
+					description="MOD_MENU_FIELD_SHOWHELP_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="menutype:*"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="forum_url"
+					type="url"
+					label="MOD_MENU_FIELD_FORUMURL_LABEL"
+					description="MOD_MENU_FIELD_FORUMURL_DESC"
+					filter="url"
+					size="30"
+					default=""
+					showon="menutype:*"
+				/>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_menu/tmpl/default.php b/core/administrator/modules/mod_menu/tmpl/default.php
new file mode 100644
index 00000000..d4bca98b
--- /dev/null
+++ b/core/administrator/modules/mod_menu/tmpl/default.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doc       = JFactory::getDocument();
+$direction = $doc->direction == 'rtl' ? 'pull-right' : '';
+$class     = $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction;
+
+// Recurse through children of root node if they exist
+$menuTree = $menu->getTree();
+$root     = $menuTree->reset();
+
+if ($root->hasChildren())
+{
+	echo '<ul id="menu" class="' . $class . '">' . "\n";
+
+	// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
+	$menu->renderSubmenu(JModuleHelper::getLayoutPath('mod_menu', 'default_submenu'));
+
+	echo "</ul>\n";
+
+	echo '<ul id="nav-empty" class="dropdown-menu nav-empty hidden-phone"></ul>';
+
+	if ($css = $menuTree->getCss())
+	{
+		$doc->addStyleDeclaration(implode("\n", $css));
+	}
+}
diff --git a/core/administrator/modules/mod_menu/tmpl/default_submenu.php b/core/administrator/modules/mod_menu/tmpl/default_submenu.php
new file mode 100644
index 00000000..82721c8b
--- /dev/null
+++ b/core/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+use Joomla\CMS\Menu\Node\Separator;
+
+defined('_JEXEC') or die;
+
+/**
+ * =========================================================================================================
+ * IMPORTANT: The scope of this layout file is the `JAdminCssMenu` object and NOT the module context.
+ * =========================================================================================================
+ */
+/** @var  JAdminCssMenu  $this */
+$current = $this->tree->getCurrent();
+
+// Build the CSS class suffix
+if (!$this->enabled)
+{
+	$class = ' class="disabled"';
+}
+elseif ($current instanceOf Separator)
+{
+	$class = $current->get('title') ? ' class="menuitem-group"' : ' class="divider"';
+}
+elseif ($current->hasChildren())
+{
+	if ($current->getLevel() == 1)
+	{
+		$class = ' class="dropdown"';
+	}
+	elseif ($current->get('class') == 'scrollable-menu')
+	{
+		$class = ' class="dropdown scrollable-menu"';
+	}
+	else
+	{
+		$class = ' class="dropdown-submenu"';
+	}
+}
+else
+{
+	$class = '';
+}
+
+// Print the item
+echo '<li' . $class . '>';
+
+// Print a link if it exists
+$linkClass     = array();
+$dataToggle    = '';
+$dropdownCaret = '';
+
+if ($current->hasChildren())
+{
+	$linkClass[] = 'dropdown-toggle';
+	$dataToggle  = ' data-toggle="dropdown"';
+
+	if ($current->getLevel() == 1)
+	{
+		$dropdownCaret = ' <span class="caret"></span>';
+	}
+}
+else
+{
+	$linkClass[] = 'no-dropdown';
+}
+
+if (!($current instanceof Separator) && ($current->getLevel() > 1))
+{
+	$iconClass = $this->tree->getIconClass();
+
+	if (trim($iconClass))
+	{
+		$linkClass[] = $iconClass;
+	}
+}
+
+// Implode out $linkClass for rendering
+$linkClass = ' class="' . implode(' ', $linkClass) . '" ';
+
+// Links: component/url/heading/container
+if ($link = $current->get('link'))
+{
+	$icon = $current->get('icon');
+
+	if ($icon)
+	{
+		if (substr($icon, 0, 6) == 'class:')
+		{
+			$icon = '<span class="' . substr($icon, 6) . '"></span>';
+		}
+		elseif (substr($icon, 0, 6) == 'image:')
+		{
+			$icon = JHtml::_('image', substr($icon, 6), null, null, true);
+		}
+		else
+		{
+			$icon = JHtml::_('image', $icon, null);
+		}
+	}
+
+	$target = $current->get('target') ? 'target="' . $current->get('target') . '"' : '';
+
+	echo '<a' . $linkClass . $dataToggle . ' href="' . $link . '" ' . $target . '>' .
+				JText::_($current->get('title')) . $icon . $dropdownCaret . '</a>';
+}
+// Separator
+else
+{
+	echo '<span>' . JText::_($current->get('title')) . '</span>';
+}
+
+// Recurse through children if they exist
+if ($this->enabled && $current->hasChildren())
+{
+	if ($current->getLevel() > 1)
+	{
+		$id = $current->get('id') ? ' id="menu-' . strtolower($current->get('id')) . '"' : '';
+
+		echo '<ul' . $id . ' class="dropdown-menu menu-scrollable">' . "\n";
+	}
+	else
+	{
+		echo '<ul class="dropdown-menu scroll-menu">' . "\n";
+	}
+
+	// WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
+	$this->renderSubmenu(__FILE__);
+
+	echo "</ul>\n";
+}
+
+echo "</li>\n";
diff --git a/core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini b/core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
new file mode 100644
index 00000000..9c77d205
--- /dev/null
+++ b/core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MULTILANGSTATUS="Multilanguage Status"
+MOD_MULTILANGSTATUS_XML_DESCRIPTION="This module shows the status of the multilanguage parameters."
diff --git a/core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
new file mode 100644
index 00000000..9c77d205
--- /dev/null
+++ b/core/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MULTILANGSTATUS="Multilanguage Status"
+MOD_MULTILANGSTATUS_XML_DESCRIPTION="This module shows the status of the multilanguage parameters."
diff --git a/core/administrator/modules/mod_multilangstatus/mod_multilangstatus.php b/core/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
new file mode 100644
index 00000000..8280d069
--- /dev/null
+++ b/core/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_multilangstatus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+require JModuleHelper::getLayoutPath('mod_multilangstatus', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/core/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
new file mode 100644
index 00000000..ba1df73d
--- /dev/null
+++ b/core/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_multilangstatus</name>
+	<author>Joomla! Project</author>
+	<creationDate>September 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_MULTILANGSTATUS_XML_DESCRIPTION</description>
+
+	<files>
+		<filename module="mod_multilangstatus">mod_multilangstatus.php</filename>
+		<folder>tmpl</folder>
+		<folder>language</folder>
+	</files>
+
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.mod_multilangstatus.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.mod_multilangstatus.sys.ini</language>
+	</languages>
+
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_MULTILANG" />
+
+	<config>
+
+		<fields name="params">
+
+			<fieldset name="advanced">
+
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_multilangstatus/tmpl/default.php b/core/administrator/modules/mod_multilangstatus/tmpl/default.php
new file mode 100644
index 00000000..8276cd37
--- /dev/null
+++ b/core/administrator/modules/mod_multilangstatus/tmpl/default.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_multilangstatus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include jQuery
+JHtml::_('jquery.framework');
+
+// Use javascript to remove the modal added below from the current div and add it to the end of html body tag.
+JFactory::getDocument()->addScriptDeclaration("
+	jQuery(document).ready(function($) {
+		var multilangueModal = $('#multiLangModal').clone();
+		$('#multiLangModal').remove();
+		$('body').append(multilangueModal);
+	});
+");
+?>
+
+<div class="btn-group multilanguage">
+	<a data-toggle="modal"
+		href="#multiLangModal"
+		title="<?php echo JText::_('MOD_MULTILANGSTATUS'); ?>"
+		role="button">
+		<span class="icon-comment" aria-hidden="true"></span><?php echo JText::_('MOD_MULTILANGSTATUS'); ?>
+	</a>
+	<span class="btn-group separator"></span>
+</div>
+
+<?php echo JHtml::_(
+	'bootstrap.renderModal',
+	'multiLangModal',
+	array(
+		'title'       => JText::_('MOD_MULTILANGSTATUS'),
+		'url'         => JRoute::_('index.php?option=com_languages&view=multilangstatus&tmpl=component'),
+		'height'      => '400px',
+		'width'       => '800px',
+		'bodyHeight'  => '70',
+		'modalWidth'  => '80',
+		'footer'      => '<a class="btn" data-dismiss="modal" type="button" aria-hidden="true">'
+				. JText::_('JTOOLBAR_CLOSE') . '</a>',
+	)
+);
diff --git a/core/administrator/modules/mod_popular/helper.php b/core/administrator/modules/mod_popular/helper.php
new file mode 100644
index 00000000..51dd05c1
--- /dev/null
+++ b/core/administrator/modules/mod_popular/helper.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/models', 'ContentModel');
+
+/**
+ * Helper for mod_popular
+ *
+ * @since  1.6
+ */
+abstract class ModPopularHelper
+{
+	/**
+	 * Get a list of the most popular articles
+	 *
+	 * @param   JObject  &$params  The module parameters.
+	 *
+	 * @return  array
+	 */
+	public static function getList(&$params)
+	{
+		$user = JFactory::getuser();
+
+		// Get an instance of the generic articles model
+		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		// Set List SELECT
+		$model->setState('list.select', 'a.id, a.title, a.checked_out, a.checked_out_time, ' .
+				' a.created, a.hits');
+
+		// Set Ordering filter
+		$model->setState('list.ordering', 'a.hits');
+		$model->setState('list.direction', 'DESC');
+
+		// Set Category Filter
+		$categoryId = $params->get('catid', null);
+
+		if (is_numeric($categoryId))
+		{
+			$model->setState('filter.category_id', $categoryId);
+		}
+
+		// Set User Filter.
+		$userId = $user->get('id');
+
+		switch ($params->get('user_id', '0'))
+		{
+			case 'by_me':
+				$model->setState('filter.author_id', $userId);
+				break;
+
+			case 'not_me':
+				$model->setState('filter.author_id', $userId);
+				$model->setState('filter.author_id.include', false);
+				break;
+		}
+
+		// Set the Start and Limit
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', $params->get('count', 5));
+
+		$items = $model->getItems();
+
+		if ($error = $model->getError())
+		{
+			JError::raiseError(500, $error);
+
+			return false;
+		}
+
+		// Set the links
+		foreach ($items as &$item)
+		{
+			if ($user->authorise('core.edit', 'com_content.article.' . $item->id))
+			{
+				$item->link = JRoute::_('index.php?option=com_content&task=article.edit&id=' . $item->id);
+			}
+			else
+			{
+				$item->link = '';
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get the alternate title for the module
+	 *
+	 * @param   JObject  $params  The module parameters.
+	 *
+	 * @return  string	The alternate title for the module.
+	 */
+	public static function getTitle($params)
+	{
+		$who   = $params->get('user_id', '0');
+		$catid = (int) $params->get('catid', null);
+
+		if ($catid)
+		{
+			$category = JCategories::getInstance('Content')->get($catid);
+
+			if ($category)
+			{
+				$title = $category->title;
+			}
+			else
+			{
+				$title = JText::_('MOD_POPULAR_UNEXISTING');
+			}
+		}
+		else
+		{
+			$title = '';
+		}
+
+		return JText::plural(
+			'MOD_POPULAR_TITLE' . ($catid ? '_CATEGORY' : '') . ($who != '0' ? "_$who" : ''),
+			(int) $params->get('count', 5),
+			$title
+		);
+	}
+}
diff --git a/core/administrator/modules/mod_popular/mod_popular.php b/core/administrator/modules/mod_popular/mod_popular.php
new file mode 100644
index 00000000..3736b18e
--- /dev/null
+++ b/core/administrator/modules/mod_popular/mod_popular.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the mod_popular functions only once.
+JLoader::register('ModPopularHelper', __DIR__ . '/helper.php');
+
+// Get module data.
+$list = ModPopularHelper::getList($params);
+
+if ($params->get('automatic_title', 0))
+{
+	$module->title = ModPopularHelper::getTitle($params);
+}
+
+// Render the module
+require JModuleHelper::getLayoutPath('mod_popular', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_popular/mod_popular.xml b/core/administrator/modules/mod_popular/mod_popular.xml
new file mode 100644
index 00000000..c93ab1bc
--- /dev/null
+++ b/core/administrator/modules/mod_popular/mod_popular.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_popular</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_POPULAR_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_popular">mod_popular.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_popular.ini</language>
+		<language tag="en-GB">en-GB.mod_popular.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_POPULAR" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="count"
+					type="number"
+					label="MOD_POPULAR_FIELD_COUNT_LABEL"
+					description="MOD_POPULAR_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_POPULAR_FIELD_CATEGORY_DESC"
+					id="catid"
+					extension="com_content"
+					default=""
+					filter="integer"
+					>
+					<option value="">JOPTION_ANY_CATEGORY</option>
+				</field>
+
+				<field
+					name="user_id"
+					type="list"
+					label="MOD_POPULAR_FIELD_AUTHORS_LABEL"
+					description="MOD_POPULAR_FIELD_AUTHORS_DESC"
+					default="0"
+					>
+					<option value="0">MOD_POPULAR_FIELD_VALUE_ANYONE</option>
+					<option value="by_me">MOD_POPULAR_FIELD_VALUE_ADDED_OR_MODIFIED_BY_ME</option>
+					<option value="not_me">MOD_POPULAR_FIELD_VALUE_NOT_ADDED_OR_MODIFIED_BY_ME</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="automatic_title"
+					type="radio"
+					label="COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL"
+					description="COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_popular/tmpl/default.php b/core/administrator/modules/mod_popular/tmpl/default.php
new file mode 100644
index 00000000..2bd11c83
--- /dev/null
+++ b/core/administrator/modules/mod_popular/tmpl/default.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+?>
+<div class="row-striped">
+	<?php if (count($list)) : ?>
+		<?php foreach ($list as $i => $item) : ?>
+			<?php // Calculate popular items ?>
+			<?php $hits = (int) $item->hits; ?>
+			<?php $hits_class = ($hits >= 10000 ? 'important' : ($hits >= 1000 ? 'warning' : ($hits >= 100 ? 'info' : ''))); ?>
+			<div class="row-fluid">
+				<div class="span8 truncate">
+					<span class="badge badge-<?php echo $hits_class; ?> hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGLOBAL_HITS'); ?>"><?php echo $item->hits; ?></span>
+					<?php if ($item->checked_out) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
+					<?php endif; ?>
+
+					<strong class="row-title" title="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+						<?php if ($item->link) : ?>
+							<a href="<?php echo $item->link; ?>">
+								<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?></a>
+						<?php else : ?>
+							<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
+						<?php endif; ?>
+					</strong>
+				</div>
+				<div class="span4">
+					<div class="small pull-right hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JGLOBAL_FIELD_CREATED_LABEL'); ?>">
+						<span class="icon-calendar" aria-hidden="true"></span> <?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC5')); ?>
+					</div>
+				</div>
+			</div>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<div class="row-fluid">
+			<div class="span12">
+				<div class="alert"><?php echo JText::_('MOD_POPULAR_NO_MATCHING_RESULTS'); ?></div>
+			</div>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/modules/mod_quickicon/helper.php b/core/administrator/modules/mod_quickicon/helper.php
new file mode 100644
index 00000000..81fd764f
--- /dev/null
+++ b/core/administrator/modules/mod_quickicon/helper.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_quickicon
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_quickicon
+ *
+ * @since  1.6
+ */
+abstract class ModQuickIconHelper
+{
+	/**
+	 * Stack to hold buttons
+	 *
+	 * @since   1.6
+	 */
+	protected static $buttons = array();
+
+	/**
+	 * Helper method to return button list.
+	 *
+	 * This method returns the array by reference so it can be
+	 * used to add custom buttons or remove default ones.
+	 *
+	 * @param   JObject  $params  The module parameters.
+	 *
+	 * @return  array  An array of buttons
+	 *
+	 * @since   1.6
+	 */
+	public static function &getButtons($params)
+	{
+		$key = (string) $params;
+
+		if (!isset(self::$buttons[$key]))
+		{
+			$context = $params->get('context', 'mod_quickicon');
+
+			if ($context == 'mod_quickicon')
+			{
+				// Load mod_quickicon language file in case this method is called before rendering the module
+				JFactory::getLanguage()->load('mod_quickicon');
+
+				self::$buttons[$key] = array(
+					array(
+						'link'   => JRoute::_('index.php?option=com_content&task=article.add'),
+						'image'  => 'pencil-2',
+						'icon'   => 'header/icon-48-article-add.png',
+						'text'   => JText::_('MOD_QUICKICON_ADD_NEW_ARTICLE'),
+						'access' => array('core.manage', 'com_content', 'core.create', 'com_content'),
+						'group'  => 'MOD_QUICKICON_CONTENT',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_content'),
+						'image'  => 'stack',
+						'icon'   => 'header/icon-48-article.png',
+						'text'   => JText::_('MOD_QUICKICON_ARTICLE_MANAGER'),
+						'access' => array('core.manage', 'com_content'),
+						'group'  => 'MOD_QUICKICON_CONTENT',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_categories&extension=com_content'),
+						'image'  => 'folder',
+						'icon'   => 'header/icon-48-category.png',
+						'text'   => JText::_('MOD_QUICKICON_CATEGORY_MANAGER'),
+						'access' => array('core.manage', 'com_content'),
+						'group'  => 'MOD_QUICKICON_CONTENT',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_media'),
+						'image'  => 'pictures',
+						'icon'   => 'header/icon-48-media.png',
+						'text'   => JText::_('MOD_QUICKICON_MEDIA_MANAGER'),
+						'access' => array('core.manage', 'com_media'),
+						'group'  => 'MOD_QUICKICON_CONTENT',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_menus'),
+						'image'  => 'list-view',
+						'icon'   => 'header/icon-48-menumgr.png',
+						'text'   => JText::_('MOD_QUICKICON_MENU_MANAGER'),
+						'access' => array('core.manage', 'com_menus'),
+						'group'  => 'MOD_QUICKICON_STRUCTURE',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_users'),
+						'image'  => 'users',
+						'icon'   => 'header/icon-48-user.png',
+						'text'   => JText::_('MOD_QUICKICON_USER_MANAGER'),
+						'access' => array('core.manage', 'com_users'),
+						'group'  => 'MOD_QUICKICON_USERS',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_modules'),
+						'image'  => 'cube',
+						'icon'   => 'header/icon-48-module.png',
+						'text'   => JText::_('MOD_QUICKICON_MODULE_MANAGER'),
+						'access' => array('core.manage', 'com_modules'),
+						'group'  => 'MOD_QUICKICON_STRUCTURE',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_config'),
+						'image'  => 'cog',
+						'icon'   => 'header/icon-48-config.png',
+						'text'   => JText::_('MOD_QUICKICON_GLOBAL_CONFIGURATION'),
+						'access' => array('core.manage', 'com_config', 'core.admin', 'com_config'),
+						'group'  => 'MOD_QUICKICON_CONFIGURATION',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_templates'),
+						'image'  => 'eye',
+						'icon'   => 'header/icon-48-themes.png',
+						'text'   => JText::_('MOD_QUICKICON_TEMPLATE_MANAGER'),
+						'access' => array('core.manage', 'com_templates'),
+						'group'  => 'MOD_QUICKICON_CONFIGURATION',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_languages'),
+						'image'  => 'comments-2',
+						'icon'   => 'header/icon-48-language.png',
+						'text'   => JText::_('MOD_QUICKICON_LANGUAGE_MANAGER'),
+						'access' => array('core.manage', 'com_languages'),
+						'group'  => 'MOD_QUICKICON_CONFIGURATION',
+					),
+					array(
+						'link'   => JRoute::_('index.php?option=com_installer'),
+						'image'  => 'download',
+						'icon'   => 'header/icon-48-extension.png',
+						'text'   => JText::_('MOD_QUICKICON_INSTALL_EXTENSIONS'),
+						'access' => array('core.manage', 'com_installer'),
+						'group'  => 'MOD_QUICKICON_EXTENSIONS',
+					),
+				);
+			}
+			else
+			{
+				self::$buttons[$key] = array();
+			}
+
+			// Include buttons defined by published quickicon plugins
+			JPluginHelper::importPlugin('quickicon');
+			$app = JFactory::getApplication();
+			$arrays = (array) $app->triggerEvent('onGetIcons', array($context));
+
+			foreach ($arrays as $response)
+			{
+				foreach ($response as $icon)
+				{
+					$default = array(
+						'link'   => null,
+						'image'  => 'cog',
+						'text'   => null,
+						'access' => true,
+						'group'  => 'MOD_QUICKICON_EXTENSIONS',
+					);
+					$icon = array_merge($default, $icon);
+
+					if (!is_null($icon['link']) && !is_null($icon['text']))
+					{
+						self::$buttons[$key][] = $icon;
+					}
+				}
+			}
+		}
+
+		return self::$buttons[$key];
+	}
+
+	/**
+	 * Classifies the $buttons by group
+	 *
+	 * @param   array  $buttons  The buttons
+	 *
+	 * @return  array  The buttons sorted by groups
+	 *
+	 * @since   3.2
+	 */
+	public static function groupButtons($buttons)
+	{
+		$groupedButtons = array();
+
+		foreach ($buttons as $button)
+		{
+			$groupedButtons[$button['group']][] = $button;
+		}
+
+		return $groupedButtons;
+	}
+
+	/**
+	 * Get the alternate title for the module
+	 *
+	 * @param   JObject  $params  The module parameters.
+	 * @param   JObject  $module  The module.
+	 *
+	 * @return  string	The alternate title for the module.
+	 *
+	 * @deprecated  4.0 Unused. Title can be adjusted in module itself if needed.
+	 */
+	public static function getTitle($params, $module)
+	{
+		$key = $params->get('context', 'mod_quickicon') . '_title';
+
+		if (JFactory::getLanguage()->hasKey($key))
+		{
+			return JText::_($key);
+		}
+		else
+		{
+			return $module->title;
+		}
+	}
+}
diff --git a/core/administrator/modules/mod_quickicon/mod_quickicon.php b/core/administrator/modules/mod_quickicon/mod_quickicon.php
new file mode 100644
index 00000000..789eb045
--- /dev/null
+++ b/core/administrator/modules/mod_quickicon/mod_quickicon.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_quickicon
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ModQuickIconHelper', __DIR__ . '/helper.php');
+
+$buttons = ModQuickIconHelper::getButtons($params);
+
+require JModuleHelper::getLayoutPath('mod_quickicon', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_quickicon/mod_quickicon.xml b/core/administrator/modules/mod_quickicon/mod_quickicon.xml
new file mode 100644
index 00000000..e614e008
--- /dev/null
+++ b/core/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_quickicon</name>
+	<author>Joomla! Project</author>
+	<creationDate>Nov 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_QUICKICON_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_quickicon">mod_quickicon.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_quickicon.ini</language>
+		<language tag="en-GB">en-GB.mod_quickicon.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_QUICKICON" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="context"
+					type="text"
+					label="MOD_QUICKICON_GROUP_LABEL"
+					description="MOD_QUICKICON_GROUP_DESC"
+					default="mod_quickicon"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_quickicon/tmpl/default.php b/core/administrator/modules/mod_quickicon/tmpl/default.php
new file mode 100644
index 00000000..a5b5f12a
--- /dev/null
+++ b/core/administrator/modules/mod_quickicon/tmpl/default.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_quickicon
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$html = JHtml::_('links.linksgroups', ModQuickIconHelper::groupButtons($buttons));
+?>
+<?php if (!empty($html)) : ?>
+	<div class="sidebar-nav quick-icons">
+		<?php echo $html;?>
+	</div>
+<?php endif;?>
diff --git a/core/administrator/modules/mod_sampledata/helper.php b/core/administrator/modules/mod_sampledata/helper.php
new file mode 100644
index 00000000..3bbd569f
--- /dev/null
+++ b/core/administrator/modules/mod_sampledata/helper.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_sampledata
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_sampledata
+ *
+ * @since  3.8.0
+ */
+abstract class ModSampledataHelper
+{
+	/**
+	 * Get a list of sampledata.
+	 *
+	 * @return  mixed  An array of sampledata, or false on error.
+	 *
+	 * @since  3.8.0
+	 */
+	public static function getList()
+	{
+		JPluginHelper::importPlugin('sampledata');
+		$dispatcher = JEventDispatcher::getInstance();
+		$data = $dispatcher->trigger('onSampledataGetOverview', array('test', 'foo'));
+
+		return $data;
+	}
+}
diff --git a/core/administrator/modules/mod_sampledata/mod_sampledata.php b/core/administrator/modules/mod_sampledata/mod_sampledata.php
new file mode 100644
index 00000000..c729900f
--- /dev/null
+++ b/core/administrator/modules/mod_sampledata/mod_sampledata.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_sampledata
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include dependencies.
+JLoader::register('ModSampledataHelper', __DIR__ . '/helper.php');
+
+$items = ModSampledataHelper::getList();
+require JModuleHelper::getLayoutPath('mod_sampledata', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_sampledata/mod_sampledata.xml b/core/administrator/modules/mod_sampledata/mod_sampledata.xml
new file mode 100644
index 00000000..c80d46cc
--- /dev/null
+++ b/core/administrator/modules/mod_sampledata/mod_sampledata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.8" client="administrator" method="upgrade">
+	<name>mod_sampledata</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.8.0</version>
+	<description>MOD_SAMPLEDATA_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_sampledata">mod_sampledata.php</filename>
+		<filename>helper.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<media destination="mod_sampledata" folder="media">
+		<folder>js</folder>
+	</media>
+	<languages>
+		<language tag="en-GB">en-GB.mod_sampledata.ini</language>
+		<language tag="en-GB">en-GB.mod_sampledata.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_LATEST" />
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_sampledata/tmpl/default.php b/core/administrator/modules/mod_sampledata/tmpl/default.php
new file mode 100644
index 00000000..94602172
--- /dev/null
+++ b/core/administrator/modules/mod_sampledata/tmpl/default.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_sampledata
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('script', 'mod_sampledata/sampledata-process.js', false, true);
+
+JText::script('MOD_SAMPLEDATA_CONFIRM_START');
+JText::script('MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED');
+JText::script('MOD_SAMPLEDATA_INVALID_RESPONSE');
+
+JFactory::getDocument()->addScriptDeclaration('
+	var modSampledataUrl = "index.php?option=com_ajax&format=json&group=sampledata",
+		modSampledataIconProgress = "' . JUri::root(true) . '/media/jui/img/ajax-loader.gif";
+');
+?>
+<div class="sampledata-container">
+	<?php if ($items) : ?>
+		<div class="row-striped">
+			<?php foreach($items as $i => $item) : ?>
+				<div class="row-fluid sampledata-<?php echo $item->name; ?>">
+					<div class="span4">
+						<a href="#" onclick="sampledataApply(this)" data-type="<?php echo $item->name; ?>" data-steps="<?php echo $item->steps; ?>">
+							<strong class="row-title">
+								<span class="icon-<?php echo $item->icon; ?>" aria-hidden="true"> </span>
+								<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
+							</strong>
+						</a>
+					</div>
+					<div class="span6">
+						<small>
+							<?php echo $item->description; ?>
+						</small>
+					</div>
+				</div>
+				<!-- Progress bar -->
+				<div class="row-fluid sampledata-progress-<?php echo $item->name; ?> hide">
+					<progress class="span12"></progress>
+				</div>
+				<!-- Progress messages -->
+				<div class="row-fluid sampledata-progress-<?php echo $item->name; ?> hide">
+					<ul class="unstyled"></ul>
+				</div>
+			<?php endforeach; ?>
+		</div>
+	<?php else : ?>
+		<div class="alert"><?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS');?></div>
+	<?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/core/administrator/modules/mod_stats_admin/helper.php b/core/administrator/modules/mod_stats_admin/helper.php
new file mode 100644
index 00000000..5a7de5a4
--- /dev/null
+++ b/core/administrator/modules/mod_stats_admin/helper.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_stats_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper class for admin stats module
+ *
+ * @since  3.0
+ */
+class ModStatsHelper
+{
+	/**
+	 * Method to retrieve information about the site
+	 *
+	 * @param   JObject  &$params  Params object
+	 *
+	 * @return  array  Array containing site information
+	 *
+	 * @since   3.0
+	 */
+	public static function getStats(&$params)
+	{
+		$app   = JFactory::getApplication();
+		$db    = JFactory::getDbo();
+		$rows  = array();
+		$query = $db->getQuery(true);
+
+		$serverinfo = $params->get('serverinfo', 0);
+		$siteinfo   = $params->get('siteinfo', 0);
+		$counter    = $params->get('counter', 0);
+		$increase   = $params->get('increase', 0);
+
+		$i = 0;
+
+		if ($serverinfo)
+		{
+			$rows[$i]        = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_OS');
+			$rows[$i]->icon  = 'screen';
+			$rows[$i]->data  = substr(php_uname(), 0, 7);
+			$i++;
+
+			$rows[$i]        = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_PHP');
+			$rows[$i]->icon  = 'cogs';
+			$rows[$i]->data  = phpversion();
+			$i++;
+
+			$rows[$i]        = new stdClass;
+			$rows[$i]->title = JText::_($db->name);
+			$rows[$i]->icon  = 'database';
+			$rows[$i]->data  = $db->getVersion();
+			$i++;
+
+			$rows[$i]        = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_TIME');
+			$rows[$i]->icon  = 'clock';
+			$rows[$i]->data  = JHtml::_('date', 'now', 'H:i');
+			$i++;
+
+			$rows[$i]        = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_CACHING');
+			$rows[$i]->icon  = 'dashboard';
+			$rows[$i]->data  = $app->get('caching') ? JText::_('JENABLED') : JText::_('JDISABLED');
+			$i++;
+
+			$rows[$i]        = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_GZIP');
+			$rows[$i]->icon  = 'lightning';
+			$rows[$i]->data  = $app->get('gzip') ? JText::_('JENABLED') : JText::_('JDISABLED');
+			$i++;
+		}
+
+		if ($siteinfo)
+		{
+			$query->select('COUNT(id) AS count_users')
+				->from('#__users');
+			$db->setQuery($query);
+
+			try
+			{
+				$users = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$users = false;
+			}
+
+			$query->clear()
+				->select('COUNT(id) AS count_items')
+				->from('#__content')
+				->where('state = 1');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$items = false;
+			}
+
+			if ($users)
+			{
+				$rows[$i]        = new stdClass;
+				$rows[$i]->title = JText::_('MOD_STATS_USERS');
+				$rows[$i]->icon  = 'users';
+				$rows[$i]->data  = $users;
+				$i++;
+			}
+
+			if ($items)
+			{
+				$rows[$i]        = new stdClass;
+				$rows[$i]->title = JText::_('MOD_STATS_ARTICLES');
+				$rows[$i]->icon  = 'file';
+				$rows[$i]->data  = $items;
+				$i++;
+			}
+		}
+
+		if ($counter)
+		{
+			$query->clear()
+				->select('SUM(hits) AS count_hits')
+				->from('#__content')
+				->where('state = 1');
+			$db->setQuery($query);
+
+			try
+			{
+				$hits = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$hits = false;
+			}
+
+			if ($hits)
+			{
+				$rows[$i]        = new stdClass;
+				$rows[$i]->title = JText::_('MOD_STATS_ARTICLES_VIEW_HITS');
+				$rows[$i]->icon  = 'eye';
+				$rows[$i]->data  = number_format($hits + $increase, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'));
+				$i++;
+			}
+		}
+
+		// Include additional data defined by published system plugins
+		JPluginHelper::importPlugin('system');
+
+		$app    = JFactory::getApplication();
+		$arrays = (array) $app->triggerEvent('onGetStats', array('mod_stats_admin'));
+
+		foreach ($arrays as $response)
+		{
+			foreach ($response as $row)
+			{
+				// We only add a row if the title and data are given
+				if (isset($row['title']) && isset($row['data']))
+				{
+					$rows[$i]        = new stdClass;
+					$rows[$i]->title = $row['title'];
+					$rows[$i]->icon  = isset($row['icon']) ? $row['icon'] : 'info';
+					$rows[$i]->data  = $row['data'];
+					$i++;
+				}
+			}
+		}
+
+		return $rows;
+	}
+}
diff --git a/core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini b/core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
new file mode 100644
index 00000000..345d42e1
--- /dev/null
+++ b/core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
@@ -0,0 +1,24 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATS_ADMIN="Statistics"
+MOD_STATS_ARTICLES="Articles"
+MOD_STATS_ARTICLES_VIEW_HITS="Articles View Hits"
+MOD_STATS_CACHING="Caching"
+MOD_STATS_FIELD_COUNTER_DESC="Display hit counter."
+MOD_STATS_FIELD_COUNTER_LABEL="Hit Counter"
+MOD_STATS_FIELD_INCREASECOUNTER_DESC="Enter the number of hits to increase the counter by."
+MOD_STATS_FIELD_INCREASECOUNTER_LABEL="Increase Counter"
+MOD_STATS_FIELD_SERVERINFO_DESC="Display server information."
+MOD_STATS_FIELD_SERVERINFO_LABEL="Server Information"
+MOD_STATS_FIELD_SITEINFO_DESC="Display site information."
+MOD_STATS_FIELD_SITEINFO_LABEL="Site Information"
+MOD_STATS_GZIP="Gzip"
+MOD_STATS_OS="OS"
+MOD_STATS_PHP="PHP"
+MOD_STATS_TIME="Time"
+MOD_STATS_USERS="Users"
+MOD_STATS_WEBLINKS="Web Links"
+MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
diff --git a/core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini b/core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
new file mode 100644
index 00000000..d47a4e9f
--- /dev/null
+++ b/core/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATS_ADMIN="Statistics"
+MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
+MOD_STATS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/administrator/modules/mod_stats_admin/mod_stats_admin.php b/core/administrator/modules/mod_stats_admin/mod_stats_admin.php
new file mode 100644
index 00000000..a6791db0
--- /dev/null
+++ b/core/administrator/modules/mod_stats_admin/mod_stats_admin.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_stats_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the mod_stats functions only once
+JLoader::register('ModStatsHelper', __DIR__ . '/helper.php');
+
+$serverinfo      = $params->get('serverinfo');
+$siteinfo        = $params->get('siteinfo');
+$list            = ModStatsHelper::getStats($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_stats_admin', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/core/administrator/modules/mod_stats_admin/mod_stats_admin.xml
new file mode 100644
index 00000000..75fceeb9
--- /dev/null
+++ b/core/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_stats_admin</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_STATS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_stats_admin">mod_stats_admin.php</filename>
+		<folder>tmpl</folder>
+		<folder>language</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_stats.ini</language>
+		<language tag="en-GB">en-GB.mod_stats.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="serverinfo"
+					type="radio"
+					label="MOD_STATS_FIELD_SERVERINFO_LABEL"
+					description="MOD_STATS_FIELD_SERVERINFO_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="siteinfo"
+					type="radio"
+					label="MOD_STATS_FIELD_SITEINFO_LABEL"
+					description="MOD_STATS_FIELD_SITEINFO_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="counter"
+					type="radio"
+					label="MOD_STATS_FIELD_COUNTER_LABEL"
+					description="MOD_STATS_FIELD_COUNTER_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="increase"
+					type="number"
+					label="MOD_STATS_FIELD_INCREASECOUNTER_LABEL"
+					description="MOD_STATS_FIELD_INCREASECOUNTER_DESC"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+				 	rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_stats_admin/tmpl/default.php b/core/administrator/modules/mod_stats_admin/tmpl/default.php
new file mode 100644
index 00000000..4308cff8
--- /dev/null
+++ b/core/administrator/modules/mod_stats_admin/tmpl/default.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_stats_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="list-striped list-condensed stats-module<?php echo $moduleclass_sfx ?>">
+	<?php foreach ($list as $item) : ?>
+		<li><span class="icon-<?php echo $item->icon; ?>" title="<?php echo $item->title; ?>" aria-hidden="true"></span> <?php echo $item->title; ?> <?php echo $item->data; ?></li>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/modules/mod_status/mod_status.php b/core/administrator/modules/mod_status/mod_status.php
new file mode 100644
index 00000000..064f5c21
--- /dev/null
+++ b/core/administrator/modules/mod_status/mod_status.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_status
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$config = JFactory::getConfig();
+$user   = JFactory::getUser();
+$db     = JFactory::getDbo();
+$lang   = JFactory::getLanguage();
+$input  = JFactory::getApplication()->input;
+
+// Get the number of unread messages in your inbox.
+$query = $db->getQuery(true)
+	->select('COUNT(*)')
+	->from('#__messages')
+	->where('state = 0 AND user_id_to = ' . (int) $user->get('id'));
+
+$db->setQuery($query);
+$unread = (int) $db->loadResult();
+
+$count = 0;
+
+// Get the number of backend logged in users if shared sessions is not enabled.
+if (!$config->get('shared_session', '0'))
+{
+	$query->clear()
+		->select('COUNT(session_id)')
+		->from('#__session')
+		->where('guest = 0 AND client_id = 1');
+
+	$db->setQuery($query);
+	$count = (int) $db->loadResult();
+}
+
+// Set the inbox link.
+if ($input->getBool('hidemainmenu'))
+{
+	$inboxLink = '';
+}
+else
+{
+	$inboxLink = JRoute::_('index.php?option=com_messages');
+}
+
+// Set the inbox class.
+if ($unread)
+{
+	$inboxClass = 'unread-messages';
+}
+else
+{
+	$inboxClass = 'no-unread-messages';
+}
+
+$online_num = 0;
+
+// Get the number of frontend logged in users if shared sessions is not enabled.
+if (!$config->get('shared_session', '0'))
+{
+	$query->clear()
+		->select('COUNT(session_id)')
+		->from('#__session')
+		->where('guest = 0 AND client_id = 0');
+
+	$db->setQuery($query);
+	$online_num = (int) $db->loadResult();
+}
+
+$total_users = 0;
+
+// Get the number of logged in users if shared sessions is enabled.
+if ($config->get('shared_session', '0'))
+{
+	$query->clear()
+		->select('COUNT(session_id)')
+		->from('#__session')
+		->where('guest = 0');
+
+	$db->setQuery($query);
+	$total_users = (int) $db->loadResult();
+}
+
+require JModuleHelper::getLayoutPath('mod_status', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_status/mod_status.xml b/core/administrator/modules/mod_status/mod_status.xml
new file mode 100644
index 00000000..3eb7939a
--- /dev/null
+++ b/core/administrator/modules/mod_status/mod_status.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_status</name>
+	<author>Joomla! Project</author>
+	<creationDate>Feb 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_STATUS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_status">mod_status.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_status.ini</language>
+		<language tag="en-GB">en-GB.mod_status.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_STATUS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="show_viewsite"
+					type="radio"
+					label="MOD_STATUS_FIELD_SHOW_VIEWSITE_LABEL"
+					description="MOD_STATUS_FIELD_SHOW_VIEWSITE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_viewadmin"
+					type="radio"
+					label="MOD_STATUS_FIELD_SHOW_VIEWADMIN_LABEL"
+					description="MOD_STATUS_FIELD_SHOW_VIEWADMIN_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_loggedin_users"
+					type="radio"
+					label="MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_LABEL"
+					description="MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_loggedin_users_admin"
+					type="radio"
+					label="MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_ADMIN_LABEL"
+					description="MOD_STATUS_FIELD_SHOW_LOGGEDIN_USERS_ADMIN_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_messages"
+					type="radio"
+					label="MOD_STATUS_FIELD_SHOW_MESSAGES_LABEL"
+					description="MOD_STATUS_FIELD_SHOW_MESSAGES_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_status/tmpl/default.php b/core/administrator/modules/mod_status/tmpl/default.php
new file mode 100644
index 00000000..3e21cb10
--- /dev/null
+++ b/core/administrator/modules/mod_status/tmpl/default.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_status
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$hideLinks = $input->getBool('hidemainmenu');
+$task      = $input->getCmd('task');
+$output    = array();
+
+// Print the Preview link to Main site.
+if ($params->get('show_viewsite', 1))
+{
+	// Gets the FrontEnd Main page Uri
+	$frontEndUri = JUri::getInstance(JUri::root());
+	$frontEndUri->setScheme(((int) JFactory::getApplication()->get('force_ssl', 0) === 2) ? 'https' : 'http');
+
+	$output[] = '<div class="btn-group viewsite">'
+		. '<a href="' . $frontEndUri->toString() . '" target="_blank">'
+		. '<span class="icon-out-2" aria-hidden="true"></span>' . JText::_('JGLOBAL_VIEW_SITE')
+		. '</a>'
+		. '<span class="btn-group separator"></span>'
+		. '</div>';
+}
+
+// Print the link to open a new Administrator window.
+if ($params->get('show_viewadmin', 0))
+{
+	$output[] = '<div class="btn-group viewsite">'
+		. '<a href="' . JUri::base() . 'index.php" target="_blank">'
+		. '<span class="icon-out-2" aria-hidden="true"></span>' . JText::_('MOD_STATUS_FIELD_LINK_VIEWADMIN_LABEL')
+		. '</a>'
+		. '<span class="btn-group separator"></span>'
+		. '</div>';
+}
+
+// Print logged in user count based on the shared session state
+if (JFactory::getConfig()->get('shared_session', '0'))
+{
+	// Print the frontend logged in  users.
+	if ($params->get('show_loggedin_users', 1))
+	{
+		$output[] = '<div class="btn-group loggedin-users">'
+			. '<span class="badge">' . $total_users . '</span>'
+			. JText::plural('MOD_STATUS_TOTAL_USERS', $total_users)
+			. '<span class="btn-group separator"></span>'
+			. '</div>';
+	}
+}
+else
+{
+	// Print the frontend logged in  users.
+	if ($params->get('show_loggedin_users', 1))
+	{
+		$output[] = '<div class="btn-group loggedin-users">'
+			. '<span class="badge">' . $online_num . '</span>'
+			. JText::plural('MOD_STATUS_USERS', $online_num)
+			. '<span class="btn-group separator"></span>'
+			. '</div>';
+	}
+
+	// Print the backend logged in users.
+	if ($params->get('show_loggedin_users_admin', 1))
+	{
+		$output[] = '<div class="btn-group backloggedin-users">'
+			. '<span class="badge">' . $count . '</span>'
+			. JText::plural('MOD_STATUS_BACKEND_USERS', $count)
+			. '<span class="btn-group separator"></span>'
+			. '</div>';
+	}
+}
+
+//  Print the inbox message.
+if ($params->get('show_messages', 1))
+{
+	$active   = $unread ? ' badge-warning' : '';
+	$output[] = '<div class="btn-group ' . $inboxClass . '">'
+		. ($hideLinks ? '' : '<a href="' . $inboxLink . '">')
+		. '<span class="badge' . $active . '">' . $unread . '</span>'
+		. JText::plural('MOD_STATUS_MESSAGES_LABEL', $unread)
+		. ($hideLinks ? '' : '</a>')
+		. '<span class="btn-group separator"></span>'
+		. '</div>';
+}
+
+// Print the logout link.
+if ($task == 'edit' || $task == 'editA' || $input->getInt('hidemainmenu'))
+{
+	$logoutLink = '';
+}
+else
+{
+	$logoutLink = JRoute::_('index.php?option=com_login&task=logout&' . JSession::getFormToken() . '=1');
+}
+
+if ($params->get('show_logout', 1))
+{
+	$output[] = '<div class="btn-group logout">'
+		. ($hideLinks ? '' : '<a href="' . $logoutLink . '">')
+		. '<span class="icon-minus-2" aria-hidden="true"></span>' . JText::_('JLOGOUT')
+		. ($hideLinks ? '' : '</a>')
+		. '</div>';
+}
+
+// Output the items.
+foreach ($output as $item)
+{
+	echo $item;
+}
diff --git a/core/administrator/modules/mod_submenu/mod_submenu.php b/core/administrator/modules/mod_submenu/mod_submenu.php
new file mode 100644
index 00000000..c6b57f69
--- /dev/null
+++ b/core/administrator/modules/mod_submenu/mod_submenu.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_submenu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$list    = JSubMenuHelper::getEntries();
+$filters = JSubMenuHelper::getFilters();
+$action  = JSubMenuHelper::getAction();
+
+$displayMenu    = count($list);
+$displayFilters = count($filters);
+
+$hide = JFactory::getApplication()->input->getBool('hidemainmenu');
+
+if ($displayMenu || $displayFilters)
+{
+	require JModuleHelper::getLayoutPath('mod_submenu', $params->get('layout', 'default'));
+}
diff --git a/core/administrator/modules/mod_submenu/mod_submenu.xml b/core/administrator/modules/mod_submenu/mod_submenu.xml
new file mode 100644
index 00000000..8d6357cf
--- /dev/null
+++ b/core/administrator/modules/mod_submenu/mod_submenu.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_submenu</name>
+	<author>Joomla! Project</author>
+	<creationDate>Feb 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_SUBMENU_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_submenu">mod_submenu.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_submenu.ini</language>
+		<language tag="en-GB">en-GB.mod_submenu.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_SUBMENU" />
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_submenu/tmpl/default.php b/core/administrator/modules/mod_submenu/tmpl/default.php
new file mode 100644
index 00000000..47711f2c
--- /dev/null
+++ b/core/administrator/modules/mod_submenu/tmpl/default.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_submenu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div id="sidebar">
+	<div class="sidebar-nav">
+		<?php if ($displayMenu) : ?>
+		<ul id="submenu" class="nav nav-list">
+			<?php foreach ($list as $item) : ?>
+			<?php if (isset ($item[2]) && $item[2] == 1) : ?>
+				<li class="active">
+			<?php else : ?>
+				<li>
+			<?php endif; ?>
+			<?php if ($hide) : ?>
+				<a class="nolink"><?php echo $item[0]; ?></a>
+			<?php else : ?>
+				<?php if (strlen($item[1])) : ?>
+					<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+				<?php else : ?>
+					<?php echo $item[0]; ?>
+				<?php endif; ?>
+			<?php endif; ?>
+			</li>
+			<?php endforeach; ?>
+		</ul>
+		<?php endif; ?>
+		<?php if ($displayMenu && $displayFilters) : ?>
+		<hr />
+		<?php endif; ?>
+		<?php if ($displayFilters) : ?>
+		<div class="filter-select hidden-phone">
+			<h4 class="page-header"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></h4>
+			<form action="<?php echo JRoute::_($action); ?>" method="post">
+				<?php foreach ($filters as $filter) : ?>
+					<label for="<?php echo $filter['name']; ?>" class="element-invisible"><?php echo $filter['label']; ?></label>
+					<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="span12 small" onchange="this.form.submit()">
+						<?php if (!$filter['noDefault']) : ?>
+							<option value=""><?php echo $filter['label']; ?></option>
+						<?php endif; ?>
+						<?php echo $filter['options']; ?>
+					</select>
+					<hr class="hr-condensed" />
+				<?php endforeach; ?>
+			</form>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/core/administrator/modules/mod_title/mod_title.php b/core/administrator/modules/mod_title/mod_title.php
new file mode 100644
index 00000000..870d3fe2
--- /dev/null
+++ b/core/administrator/modules/mod_title/mod_title.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_title
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Get the component title div
+if (isset(JFactory::getApplication()->JComponentTitle))
+{
+	$title = JFactory::getApplication()->JComponentTitle;
+}
+
+require JModuleHelper::getLayoutPath('mod_title', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_title/mod_title.xml b/core/administrator/modules/mod_title/mod_title.xml
new file mode 100644
index 00000000..daed57d7
--- /dev/null
+++ b/core/administrator/modules/mod_title/mod_title.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_title</name>
+	<author>Joomla! Project</author>
+	<creationDate>Nov 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_TITLE_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_title">mod_title.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_title.ini</language>
+		<language tag="en-GB">en-GB.mod_title.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TITLE" />
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_title/tmpl/default.php b/core/administrator/modules/mod_title/tmpl/default.php
new file mode 100644
index 00000000..fcb25679
--- /dev/null
+++ b/core/administrator/modules/mod_title/tmpl/default.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_title
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (!empty($title)) : ?>
+	<?php echo $title; ?>
+<?php endif; ?>
diff --git a/core/administrator/modules/mod_toolbar/mod_toolbar.php b/core/administrator/modules/mod_toolbar/mod_toolbar.php
new file mode 100644
index 00000000..00298ec4
--- /dev/null
+++ b/core/administrator/modules/mod_toolbar/mod_toolbar.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_toolbar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$toolbar = JToolbar::getInstance('toolbar')->render('toolbar');
+
+require JModuleHelper::getLayoutPath('mod_toolbar', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_toolbar/mod_toolbar.xml b/core/administrator/modules/mod_toolbar/mod_toolbar.xml
new file mode 100644
index 00000000..3969bf29
--- /dev/null
+++ b/core/administrator/modules/mod_toolbar/mod_toolbar.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_toolbar</name>
+	<author>Joomla! Project</author>
+	<creationDate>Nov 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_TOOLBAR_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_toolbar">mod_toolbar.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_toolbar.ini</language>
+		<language tag="en-GB">en-GB.mod_toolbar.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_TOOLBAR" />
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_toolbar/tmpl/default.php b/core/administrator/modules/mod_toolbar/tmpl/default.php
new file mode 100644
index 00000000..635f5c58
--- /dev/null
+++ b/core/administrator/modules/mod_toolbar/tmpl/default.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_toolbar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Echo the toolbar.
+echo $toolbar;
diff --git a/core/administrator/modules/mod_version/helper.php b/core/administrator/modules/mod_version/helper.php
new file mode 100644
index 00000000..07d1b2e3
--- /dev/null
+++ b/core/administrator/modules/mod_version/helper.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_version
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_version
+ *
+ * @since  1.6
+ */
+abstract class ModVersionHelper
+{
+	/**
+	 * Get the member items of the submenu.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The parameters object.
+	 *
+	 * @return  string  String containing the current Joomla version based on the selected format.
+	 */
+	public static function getVersion(&$params)
+	{
+		$version     = new JVersion;
+		$versionText = $version->getShortVersion();
+		$product     = $params->get('product', 1);
+
+		if ($params->get('format', 'short') === 'long')
+		{
+			$versionText = str_replace($version::PRODUCT . ' ', '', $version->getLongVersion());
+		}
+
+		if (!empty($product))
+		{
+			$versionText = $version::PRODUCT . ' ' . $versionText;
+		}
+
+		return $versionText;
+	}
+}
diff --git a/core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini b/core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini
new file mode 100644
index 00000000..ec0b0a53
--- /dev/null
+++ b/core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_VERSION="Joomla! Version Information"
+MOD_VERSION_FORMAT_DESC="The long version includes code name and date."
+MOD_VERSION_FORMAT_LABEL="Version Format"
+MOD_VERSION_FORMAT_LONG="Long"
+MOD_VERSION_FORMAT_SHORT="Short"
+MOD_VERSION_PRODUCT_DESC="Include Joomla! name when using short format."
+MOD_VERSION_PRODUCT_LABEL="Show Joomla!"
+MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
\ No newline at end of file
diff --git a/core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini b/core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini
new file mode 100644
index 00000000..7b3b9455
--- /dev/null
+++ b/core/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_VERSION="Joomla! Version Information"
+MOD_VERSION_LAYOUT_DEFAULT="Default"
+MOD_VERSION_XML_DESCRIPTION="This module displays the Joomla! version."
diff --git a/core/administrator/modules/mod_version/mod_version.php b/core/administrator/modules/mod_version/mod_version.php
new file mode 100644
index 00000000..78863533
--- /dev/null
+++ b/core/administrator/modules/mod_version/mod_version.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_version
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ModVersionHelper', __DIR__ . '/helper.php');
+
+$version = ModVersionHelper::getVersion($params);
+
+require JModuleHelper::getLayoutPath('mod_version', $params->get('layout', 'default'));
diff --git a/core/administrator/modules/mod_version/mod_version.xml b/core/administrator/modules/mod_version/mod_version.xml
new file mode 100644
index 00000000..84e2f6e3
--- /dev/null
+++ b/core/administrator/modules/mod_version/mod_version.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="administrator" method="upgrade">
+	<name>mod_version</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2012</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_VERSION_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_version">mod_version.php</filename>
+		<folder>language</folder>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.mod_version.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.mod_version.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ADMIN_VERSION" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="format"
+					type="list"
+					label="MOD_VERSION_FORMAT_LABEL"
+					description="MOD_VERSION_FORMAT_DESC"
+					default="short"
+					>
+					<option value="short">MOD_VERSION_FORMAT_SHORT</option>
+					<option value="long">MOD_VERSION_FORMAT_LONG</option>
+				</field>
+
+				<field
+					name="product"
+					type="radio"
+					label="MOD_VERSION_PRODUCT_LABEL"
+					description="MOD_VERSION_PRODUCT_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/modules/mod_version/tmpl/default.php b/core/administrator/modules/mod_version/tmpl/default.php
new file mode 100644
index 00000000..9c257829
--- /dev/null
+++ b/core/administrator/modules/mod_version/tmpl/default.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_version
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (!empty($version)) : ?>
+	<p class="text-center"><?php echo $version; ?></p>
+<?php endif; ?>
diff --git a/core/administrator/templates/hathor/LICENSE.txt b/core/administrator/templates/hathor/LICENSE.txt
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/administrator/templates/hathor/LICENSE.txt
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/administrator/templates/hathor/component.php b/core/administrator/templates/hathor/component.php
new file mode 100644
index 00000000..8d898a5e
--- /dev/null
+++ b/core/administrator/templates/hathor/component.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+// Get additional language strings prefixed with TPL_HATHOR
+// @todo: Do we realy need this?
+$lang = JFactory::getLanguage();
+$lang->load('tpl_hathor', JPATH_ADMINISTRATOR)
+|| $lang->load('tpl_hathor', JPATH_ADMINISTRATOR . '/templates/hathor/language');
+
+$app = JFactory::getApplication();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// jQuery needed by template.js
+JHtml::_('jquery.framework');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Load system style CSS
+JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto'));
+
+// Loadtemplate CSS
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for colors
+if (!$this->params->get('colourChoice'))
+{
+	$colour = 'standard';
+}
+else
+{
+	$colour = htmlspecialchars($this->params->get('colourChoice'));
+}
+
+JHtml::_('stylesheet', 'colour_' . $colour . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for rtl sites
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load additional CSS styles for bold Text
+if ($this->params->get('boldText'))
+{
+	JHtml::_('stylesheet', 'boldtext.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+// IE specific
+JHtml::_('stylesheet', 'ie8.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 8'));
+JHtml::_('stylesheet', 'ie7.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 7'));
+
+// Logo file
+if ($this->params->get('logoFile'))
+{
+	$logo = JUri::root() . $this->params->get('logoFile');
+}
+else
+{
+	$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
+}
+
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body class="contentpane">
+	<jdoc:include type="message" />
+	<jdoc:include type="component" />
+</body>
+</html>
diff --git a/core/administrator/templates/hathor/cpanel.php b/core/administrator/templates/hathor/cpanel.php
new file mode 100644
index 00000000..dd456477
--- /dev/null
+++ b/core/administrator/templates/hathor/cpanel.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app   = JFactory::getApplication();
+$lang  = JFactory::getLanguage();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Load system style CSS
+JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto'));
+
+// Load template CSS
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for colors
+if (!$this->params->get('colourChoice'))
+{
+	$colour = 'standard';
+}
+else
+{
+	$colour = htmlspecialchars($this->params->get('colourChoice'));
+}
+
+JHtml::_('stylesheet', 'colour_' . $colour . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for rtl sites
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load additional CSS styles for bold Text
+if ($this->params->get('boldText'))
+{
+	JHtml::_('stylesheet', 'boldtext.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+// IE specific
+JHtml::_('stylesheet', 'ie8.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 8'));
+JHtml::_('stylesheet', 'ie7.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 7'));
+
+// Logo file
+if ($this->params->get('logoFile'))
+{
+	$logo = JUri::root() . $this->params->get('logoFile');
+}
+else
+{
+	$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
+}
+
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body id="minwidth" class="cpanel-page">
+<div id="containerwrap">
+	<!-- Header Logo -->
+	<div id="header">
+		<!-- Site Title and Skip to Content -->
+		<div class="title-ua">
+			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
+			<div id="skiplinkholder"><p><a id="skiplink" href="#skiptarget"><?php echo JText::_('TPL_HATHOR_SKIP_TO_MAIN_CONTENT'); ?></a></p></div>
+		</div>
+	</div><!-- end header -->
+	<!-- Main Menu Navigation -->
+	<div id="nav">
+		<div id="module-menu">
+			<h2 class="element-invisible"><?php echo JText::_('TPL_HATHOR_MAIN_MENU'); ?></h2>
+			<jdoc:include type="modules" name="menu" />
+		</div>
+		<div class="clr"></div>
+	</div><!-- end nav -->
+	<!-- Status Module -->
+	<div id="module-status">
+		<jdoc:include type="modules" name="status"/>
+	</div>
+	<!-- Content Area -->
+	<div id="content">
+		<!-- Component Title -->
+		<jdoc:include type="modules" name="title" />
+		<!-- System Messages -->
+		<jdoc:include type="message" />
+		<!-- Sub Menu Navigation -->
+		<div id="no-submenu"></div>
+		<div class="clr"></div>
+		<!-- Beginning of Actual Content -->
+		<div id="element-box">
+			<p id="skiptargetholder"><a id="skiptarget" class="skip" tabindex="-1"></a></p>
+				<div class="adminform">
+					<!-- Display the Quick Icon Shortcuts -->
+					<div class="cpanel-icons">
+						<jdoc:include type="modules" name="icon" />
+					</div>
+					<!-- Display Admin Information Panels -->
+					<div class="cpanel-component">
+						<jdoc:include type="component" />
+					</div>
+				</div>
+				<div class="clr"></div>
+		</div><!-- end element-box -->
+		<noscript>
+			<?php echo JText::_('JGLOBAL_WARNJAVASCRIPT'); ?>
+		</noscript>
+		<div class="clr"></div>
+	</div><!-- end content -->
+		<div class="clr"></div>
+	</div><!-- end containerwrap -->
+	<!-- Footer -->
+	<div id="footer">
+		<jdoc:include type="modules" name="footer" style="none"  />
+		<p class="copyright">
+			<?php
+			// Fix wrong display of Joomla!® in RTL language
+			if ($lang->isRtl())
+			{
+				$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
+			}
+			else
+			{
+				$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
+			}
+			echo JText::sprintf('JGLOBAL_ISFREESOFTWARE', $joomla);
+			?>
+		</p>
+	</div>
+</body>
+</html>
diff --git a/core/administrator/templates/hathor/css/boldtext.css b/core/administrator/templates/hathor/css/boldtext.css
new file mode 100644
index 00000000..42e544cb
--- /dev/null
+++ b/core/administrator/templates/hathor/css/boldtext.css
@@ -0,0 +1,18 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * Changes to use bold text as the default
+ */
+
+/**
+ * Default to bold text
+ */
+body {
+	font-weight: bold;
+}
diff --git a/core/administrator/templates/hathor/css/colour_blue.css b/core/administrator/templates/hathor/css/colour_blue.css
new file mode 100644
index 00000000..1151b5fb
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_blue.css
@@ -0,0 +1,1802 @@
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 25px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+#form-login .btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 15px;
+	*line-height: 15px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#ffffff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+#form-login .btn:hover,
+#form-login .btn:focus,
+#form-login .btn:active,
+#form-login .btn.active,
+#form-login .btn.disabled,
+#form-login .btn[disabled] {
+	color: #333333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+#form-login .btn:active,
+#form-login .btn.active {
+	background-color: #cccccc \9;
+}
+#form-login .btn:first-child {
+	*margin-left: 0;
+}
+#form-login .btn:hover {
+	color: #333333;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+#form-login .btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+#form-login .btn.active,
+#form-login .btn:active {
+	background-color: #e6e6e6;
+	background-color: #d9d9d9 \9;
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+#form-login .btn.disabled,
+#form-login .btn[disabled] {
+	cursor: default;
+	background-color: #e6e6e6;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 9px 14px;
+	font-size: 15px;
+	line-height: normal;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.btn-large [class^="icon-"] {
+	margin-top: 2px;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+.input-append,
+.input-prepend {
+	margin-bottom: 5px;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	font-size: 13px;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 15px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 15px;
+	text-align: center;
+	text-shadow: 0 1px 0 #ffffff;
+	background-color: #eeeeee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-append .active,
+.input-prepend .active {
+	background-color: #a9dba9;
+	border-color: #46a546;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0 !important;
+	margin: 0 !important;
+	border: 0;
+	height: 1px;
+	width: 1px !important;
+	overflow: hidden;
+}
+#form-login select,
+#form-login input[type="text"],
+#form-login input[type="password"] {
+	display: inline-block;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px;
+	line-height: 15px;
+	color: #555555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	width: 175px;
+}
+.subform-repeatable-wrapper div.btn-toolbar {
+	float: none;
+}
+.subform-repeatable-wrapper .text-right {
+	text-align: right;
+}
+.subform-repeatable-wrapper .ui-sortable-helper {
+	background: #ffffff;
+}
+.subform-repeatable-wrapper tr.ui-sortable-helper {
+	display: table;
+}
+.subform-repeatable-wrapper .subform-repeatable-group {
+	clear: both;
+}
+.label,
+.badge {
+	display: inline-block;
+	padding: 2px 4px;
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #ffffff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999999;
+}
+.label {
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding-left: 9px;
+	padding-right: 9px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+	display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+	color: #ffffff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #a20000;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #6f0000;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #005800;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #002500;
+}
+.label-info,
+.badge-info {
+	background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+body {
+	background-color: #ffffff;
+	color: #2c2c2c;
+}
+h1 {
+	color: #2c2c2c;
+}
+a:link {
+	color: #054993;
+}
+a:visited {
+	color: #054993;
+}
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat;
+}
+#header h1.title {
+	color: #2c2c2c;
+}
+#nav {
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	border: 1px solid #738498;
+}
+#content {
+	background: #ffffff;
+}
+#no-submenu {
+	border-bottom: 1px solid #738498;
+}
+#element-box {
+	background: #ffffff;
+	border-right: 1px solid #738498;
+	border-bottom: 1px solid #738498;
+	border-left: 1px solid #738498;
+}
+#element-box.login {
+	border-top: 1px solid #738498;
+}
+.enabled,
+.success,
+.allow,
+span.writable {
+	color: #005800;
+}
+.disabled,
+p.error,
+.warning,
+.deny,
+span.unwritable {
+	color: #a20000;
+}
+.nowarning {
+	color: #2c2c2c;
+}
+.none,
+.protected {
+	color: #738498;
+}
+span.note {
+	background: #ffffff;
+	color: #2c2c2c;
+}
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+.ol-foreground {
+	background-color: #c3d2e5;
+}
+.ol-background {
+	background-color: #005800;
+}
+.ol-textfont {
+	color: #2c2c2c;
+}
+.ol-captionfont {
+	color: #ffffff;
+}
+.ol-captionfont a {
+	color: #054993;
+}
+div.subheader .padding {
+	background: #ffffff;
+}
+.pagetitle h2 {
+	color: #2c2c2c;
+}
+div.configuration {
+	color: #2c2c2c;
+	background-image: url(../images/menu/icon-16-config.png);
+	background-repeat: no-repeat;
+}
+div.toolbar-box {
+	border-right: 1px solid #738498;
+	border-bottom: 1px solid #738498;
+	border-left: 1px solid #738498;
+	background: #ffffff;
+}
+div.toolbar-list li {
+	color: #2c2c2c;
+}
+div.toolbar-list li.divider {
+	border-right: 1px dotted #e5d9c3;
+}
+div.toolbar-list a {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #738498;
+	border-bottom: 1px solid #738498;
+	background: #c3d2e5;
+}
+div.toolbar-list a:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+}
+div.btn-toolbar {
+	margin-left: 5px;
+	padding-top: 3px;
+}
+div.btn-toolbar li.divider {
+	border-right: 1px dotted #e5d9c3;
+}
+div.btn-toolbar div.btn-group button {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #738498;
+	border-bottom: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	padding: 5px 4px 5px 4px;
+}
+div.btn-toolbar div.btn-group button:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+	cursor: pointer;
+}
+div.btn-toolbar a {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #738498;
+	border-bottom: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	padding: 6px 5px;
+	text-align: center;
+	white-space: nowrap;
+	font-size: 1.2em;
+	text-decoration: none;
+}
+div.btn-toolbar a:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+	cursor: pointer;
+}
+div.btn-toolbar div.btn-group button.inactive {
+	background: #c3d2e5;
+}
+.pane-sliders .title {
+	color: #2c2c2c;
+}
+.pane-sliders .panel {
+	border: 1px solid #738498;
+}
+.pane-sliders .panel h3 {
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	color: #054993;
+}
+.pane-sliders .panel h3:hover {
+	background: #e5d9c3;
+}
+.pane-sliders .panel h3:hover a {
+	text-decoration: none;
+}
+.pane-sliders .adminlist {
+	border: 0 none;
+}
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+.pane-toggler span {
+	background: transparent url(../images/j_arrow.png) 5px 50% no-repeat;
+}
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) 5px 50% no-repeat;
+}
+.pane-toggler-down {
+	border-bottom: 1px solid #738498;
+}
+dl.tabs dt {
+	border: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	color: #054993;
+}
+dl.tabs dt:hover {
+	background: #e5d9c3;
+}
+dl.tabs dt.open {
+	background: #ffffff;
+	border-bottom: 1px solid #ffffff;
+	color: #2c2c2c;
+}
+dl.tabs dt.open a:visited {
+	color: #2c2c2c;
+}
+dl.tabs dt a:hover {
+	text-decoration: none;
+}
+dl.tabs dt a:focus {
+	text-decoration: underline;
+}
+div.current {
+	border: 1px solid #738498;
+	background: #ffffff;
+}
+div.current fieldset {
+	border: none 0;
+}
+div.current fieldset.adminform {
+	border: 1px solid #738498;
+}
+#login-page .pagetitle h2 {
+	background: transparent;
+}
+#login-page #header {
+	border-bottom: 1px solid #738498;
+}
+#login-page #lock {
+	background: url(../images/j_login_lock.png) 50% 0 no-repeat;
+}
+#login-page #element-box.login {
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+#form-login {
+	background: #ffffff;
+	border: 1px solid #738498;
+}
+#form-login label {
+	color: #2c2c2c;
+}
+#form-login div.button1 a {
+	color: #054993;
+}
+#cpanel div.icon a,
+.cpanel div.icon a {
+	color: #054993;
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #738498;
+	border-bottom: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus,
+.cpanel div.icon a:hover,
+.cpanel div.icon a:focus {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	color: #054993;
+	background: #e5d9c3;
+}
+fieldset {
+	border: 1px #738498 solid;
+}
+legend {
+	color: #2c2c2c;
+}
+fieldset ul.checklist input:focus {
+	outline: thin dotted #2c2c2c;
+}
+fieldset#filter-bar {
+	border-top: 0 solid #738498;
+	border-right: 0 solid #738498;
+	border-bottom: 1px solid #738498;
+	border-left: 0 solid #738498;
+}
+fieldset#filter-bar ol,
+fieldset#filter-bar ul {
+	border: 0;
+}
+fieldset#filter-bar ol li fieldset,
+fieldset#filter-bar ul li fieldset {
+	border: 0;
+}
+.invalid {
+	color: #a20000;
+}
+input.invalid {
+	border: 1px solid #a20000;
+}
+input.readonly,
+span.faux-input {
+	border: 0;
+}
+input.required {
+	background-color: #e5f0fa;
+}
+input.disabled {
+	background-color: #eeeeee;
+}
+input,
+select,
+span.faux-input {
+	background-color: #ffffff;
+	border: 1px solid #738498;
+}
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+	color: #054993;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+input[type="button"]:hover,
+input[type="button"]:focus,
+input[type="submit"]:hover,
+input[type="submit"]:focus,
+input[type="reset"]:hover,
+input[type="reset"]:focus {
+	background: #e5d9c3;
+}
+textarea {
+	background-color: #ffffff;
+	border: 1px solid #738498;
+}
+input:focus,
+select:focus,
+textarea:focus,
+option:focus,
+input:hover,
+select:hover,
+textarea:hover,
+option:hover {
+	background-color: #e5d9c3;
+	color: #054993;
+}
+.paramrules {
+	background: #c3d2e5;
+}
+span.gi {
+	color: #738498;
+}
+table.admintable td.key,
+table.admintable td.paramlist_key {
+	background-color: #c3d2e5;
+	color: #2c2c2c;
+	border-bottom: 1px solid #738498;
+	border-right: 1px solid #738498;
+}
+table.paramlist td.paramlist_description {
+	background-color: #c3d2e5;
+	color: #2c2c2c;
+	border-bottom: 1px solid #738498;
+	border-right: 1px solid #738498;
+}
+fieldset.adminform {
+	border: 1px solid #738498;
+}
+table.adminform {
+	background-color: #ffffff;
+}
+table.adminform tr.row0 {
+	background-color: #ffffff;
+}
+table.adminform tr.row1 {
+	background-color: #e5d9c3;
+}
+table.adminform th {
+	color: #2c2c2c;
+	background: #ffffff;
+}
+table.adminform tr {
+	border-bottom: 1px solid #738498;
+	border-right: 1px solid #738498;
+}
+table.adminlist {
+	border-spacing: 1px;
+	background-color: #ffffff;
+	color: #2c2c2c;
+}
+table.adminlist.modal {
+	border-top: 1px solid #738498;
+	border-right: 1px solid #738498;
+	border-left: 1px solid #738498;
+}
+table.adminlist a {
+	color: #054993;
+}
+table.adminlist thead th {
+	background: #ffffff;
+	color: #2c2c2c;
+	border-bottom: 1px solid #738498;
+}
+table.adminlist tbody tr {
+	background: #ffffff;
+}
+table.adminlist tbody tr.row1 {
+	background: #ffffff;
+}
+table.adminlist tbody tr.row1:last-child td,
+table.adminlist tbody tr.row1:last-child th {
+	border-bottom: 1px solid #738498;
+}
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td,
+table.adminlist tbody tr.row0:hover th,
+table.adminlist tbody tr.row1:hover th,
+table.adminlist tbody tr.row0:focus td,
+table.adminlist tbody tr.row1:focus td,
+table.adminlist tbody tr.row0:focus th,
+table.adminlist tbody tr.row1:focus th {
+	background-color: #e5d9c3;
+}
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-right: 1px solid #738498;
+}
+table.adminlist tbody tr td:last-child {
+	border-right: none;
+}
+table.adminlist tbody tr.row0:last-child td,
+table.adminlist tbody tr.row0:last-child th {
+	border-bottom: 1px solid #738498;
+}
+table.adminlist tbody tr.row0 td,
+table.adminlist tbody tr.row0 th {
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+table.adminlist {
+	border-bottom: 0 solid #738498;
+}
+table.adminlist tfoot tr {
+	color: #2c2c2c;
+}
+table.adminlist tfoot td,
+table.adminlist tfoot th {
+	background-color: #ffffff;
+	border-top: 1px solid #738498;
+}
+table.adminlist tr td.btns a {
+	border: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	color: #054993;
+}
+table.adminlist tr td.btns a:hover,
+table.adminlist tr td.btns a:active,
+table.adminlist tr td.btns a:focus {
+	background-color: #ffffff;
+}
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+fieldset.batch {
+	background: #ffffff;
+}
+button {
+	color: #054993;
+	border: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+button:hover,
+button:focus {
+	background: #e5d9c3;
+}
+.invalid {
+	color: #ff0000;
+}
+.button1 {
+	border: 1px solid #738498;
+	color: #054993;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+.button1 a {
+	color: #054993;
+}
+.button1 a:hover,
+.button1 a:focus {
+	background: #e5d9c3;
+}
+.button2-left,
+.button2-right {
+	border: 1px solid #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	color: #054993;
+}
+.button2-left span,
+.button2-right span {
+	color: #999999;
+}
+.page span,
+.blank span {
+	color: #054993;
+}
+.button2-left a:hover,
+.button2-right a:hover,
+.button2-left a:focus,
+.button2-right a:focus {
+	background: #e5d9c3;
+}
+.pagination .page span {
+	color: #999999;
+}
+.tip {
+	background: #000000;
+	border: 1px solid #FFFFFF;
+}
+.tip-title {
+	background: url(../images/selector-arrow-std.png) no-repeat;
+}
+a img.calendar {
+	background: url(../images/calendar.png) no-repeat;
+}
+.jgrid span.publish {
+	background-image: url(../images/admin/tick.png);
+}
+.jgrid span.unpublish {
+	background-image: url(../images/admin/publish_x.png);
+}
+.jgrid span.archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+.jgrid span.trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+.jgrid span.default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+.jgrid span.notdefault {
+	background-image: url(../images/menu/icon-16-notdefault.png);
+}
+.jgrid span.checkedout {
+	background-image: url(../images/admin/checked_out.png);
+}
+.jgrid span.downarrow {
+	background-image: url(../images/admin/downarrow.png);
+}
+.jgrid span.downarrow_disabled {
+	background-image: url(../images/admin/downarrow0.png);
+}
+.jgrid span.uparrow {
+	background-image: url(../images/admin/uparrow.png);
+}
+.jgrid span.uparrow_disabled {
+	background-image: url(../images/admin/uparrow0.png);
+}
+.jgrid span.published {
+	background-image: url(../images/admin/publish_g.png);
+}
+.jgrid span.expired {
+	background-image: url(../images/admin/publish_r.png);
+}
+.jgrid span.pending {
+	background-image: url(../images/admin/publish_y.png);
+}
+.jgrid span.warning {
+	background-image: url(../images/admin/publish_y.png);
+}
+.icon-32-send {
+	background-image: url(../images/toolbar/icon-32-send.png);
+}
+.icon-32-delete {
+	background-image: url(../images/toolbar/icon-32-delete.png);
+}
+.icon-32-help {
+	background-image: url(../images/toolbar/icon-32-help.png);
+}
+.icon-32-cancel {
+	background-image: url(../images/toolbar/icon-32-cancel.png);
+}
+.icon-32-checkin {
+	background-image: url(../images/toolbar/icon-32-checkin.png);
+}
+.icon-32-options {
+	background-image: url(../images/toolbar/icon-32-config.png);
+}
+.icon-32-apply {
+	background-image: url(../images/toolbar/icon-32-apply.png);
+}
+.icon-32-back {
+	background-image: url(../images/toolbar/icon-32-back.png);
+}
+.icon-32-forward {
+	background-image: url(../images/toolbar/icon-32-forward.png);
+}
+.icon-32-save {
+	background-image: url(../images/toolbar/icon-32-save.png);
+}
+.icon-32-edit {
+	background-image: url(../images/toolbar/icon-32-edit.png);
+}
+.icon-32-copy {
+	background-image: url(../images/toolbar/icon-32-copy.png);
+}
+.icon-32-move {
+	background-image: url(../images/toolbar/icon-32-move.png);
+}
+.icon-32-new {
+	background-image: url(../images/toolbar/icon-32-new.png);
+}
+.icon-32-upload {
+	background-image: url(../images/toolbar/icon-32-upload.png);
+}
+.icon-32-assign {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+.icon-32-html {
+	background-image: url(../images/toolbar/icon-32-html.png);
+}
+.icon-32-css {
+	background-image: url(../images/toolbar/icon-32-css.png);
+}
+.icon-32-menus {
+	background-image: url(../images/toolbar/icon-32-menu.png);
+}
+.icon-32-publish {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+.icon-32-unblock {
+	background-image: url(../images/toolbar/icon-32-unblock.png);
+}
+.icon-32-unpublish {
+	background-image: url(../images/toolbar/icon-32-unpublish.png);
+}
+.icon-32-restore {
+	background-image: url(../images/toolbar/icon-32-revert.png);
+}
+.icon-32-trash {
+	background-image: url(../images/toolbar/icon-32-trash.png);
+}
+.icon-32-archive {
+	background-image: url(../images/toolbar/icon-32-archive.png);
+}
+.icon-32-unarchive {
+	background-image: url(../images/toolbar/icon-32-unarchive.png);
+}
+.icon-32-preview {
+	background-image: url(../images/toolbar/icon-32-preview.png);
+}
+.icon-32-default {
+	background-image: url(../images/toolbar/icon-32-default.png);
+}
+.icon-32-refresh {
+	background-image: url(../images/toolbar/icon-32-refresh.png);
+}
+.icon-32-save-new {
+	background-image: url(../images/toolbar/icon-32-save-new.png);
+}
+.icon-32-save-copy {
+	background-image: url(../images/toolbar/icon-32-save-copy.png);
+}
+.icon-32-error {
+	background-image: url(../images/toolbar/icon-32-error.png);
+}
+.icon-32-new-style {
+	background-image: url(../images/toolbar/icon-32-new-style.png);
+}
+.icon-32-delete-style {
+	background-image: url(../images/toolbar/icon-32-delete-style.png);
+}
+.icon-32-purge {
+	background-image: url(../images/toolbar/icon-32-purge.png);
+}
+.icon-32-remove {
+	background-image: url(../images/toolbar/icon-32-remove.png);
+}
+.icon-32-featured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+}
+.icon-32-unfeatured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+	background-position: 0% 100%;
+}
+.icon-32-export {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+.icon-32-stats {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+.icon-32-print {
+	background-image: url(../images/toolbar/icon-32-print.png);
+}
+.icon-32-batch {
+	background-image: url(../images/toolbar/icon-32-batch.png);
+}
+.icon-32-envelope {
+	background-image: url(../images/toolbar/icon-32-messaging.png);
+}
+.icon-32-download {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+.icon-32-bars {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+.icon-48-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-generic {
+	background-image: url(../images/header/icon-48-generic.png);
+}
+.icon-48-banners {
+	background-image: url(../images/header/icon-48-banner.png);
+}
+.icon-48-banners-categories {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+.icon-48-banners-category-edit {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+.icon-48-banners-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-banners-clients {
+	background-image: url(../images/header/icon-48-banner-client.png);
+}
+.icon-48-banners-tracks {
+	background-image: url(../images/header/icon-48-banner-tracks.png);
+}
+.icon-48-checkin {
+	background-image: url(../images/header/icon-48-checkin.png);
+}
+.icon-48-clear {
+	background-image: url(../images/header/icon-48-clear.png);
+}
+.icon-48-contact {
+	background-image: url(../images/header/icon-48-contacts.png);
+}
+.icon-48-contact-categories {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+.icon-48-contact-category-edit {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+.icon-48-contact-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-purge {
+	background-image: url(../images/header/icon-48-purge.png);
+}
+.icon-48-cpanel {
+	background-image: url(../images/header/icon-48-cpanel.png);
+}
+.icon-48-config {
+	background-image: url(../images/header/icon-48-config.png);
+}
+.icon-48-groups {
+	background-image: url(../images/header/icon-48-groups.png);
+}
+.icon-48-groups-add {
+	background-image: url(../images/header/icon-48-groups-add.png);
+}
+.icon-48-levels {
+	background-image: url(../images/header/icon-48-levels.png);
+}
+.icon-48-levels-add {
+	background-image: url(../images/header/icon-48-levels-add.png);
+}
+.icon-48-module {
+	background-image: url(../images/header/icon-48-module.png);
+}
+.icon-48-menu {
+	background-image: url(../images/header/icon-48-menu.png);
+}
+.icon-48-menu-add {
+	background-image: url(../images/header/icon-48-menu-add.png);
+}
+.icon-48-menumgr {
+	background-image: url(../images/header/icon-48-menumgr.png);
+}
+.icon-48-trash {
+	background-image: url(../images/header/icon-48-trash.png);
+}
+.icon-48-user {
+	background-image: url(../images/header/icon-48-user.png);
+}
+.icon-48-user-add {
+	background-image: url(../images/header/icon-48-user-add.png);
+}
+.icon-48-user-edit {
+	background-image: url(../images/header/icon-48-user-edit.png);
+}
+.icon-48-user-profile {
+	background-image: url(../images/header/icon-48-user-profile.png);
+}
+.icon-48-inbox {
+	background-image: url(../images/header/icon-48-inbox.png);
+}
+.icon-48-new-privatemessage {
+	background-image: url(../images/header/icon-48-new-privatemessage.png);
+}
+.icon-48-msgconfig {
+	background-image: url(../images/header/icon-48-message_config.png);
+}
+.icon-48-langmanager {
+	background-image: url(../images/header/icon-48-language.png);
+}
+.icon-48-mediamanager {
+	background-image: url(../images/header/icon-48-media.png);
+}
+.icon-48-plugin {
+	background-image: url(../images/header/icon-48-plugin.png);
+}
+.icon-48-help_header {
+	background-image: url(../images/header/icon-48-help_header.png);
+}
+.icon-48-impressions {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-browser {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-searchtext {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-thememanager {
+	background-image: url(../images/header/icon-48-themes.png);
+}
+.icon-48-writemess {
+	background-image: url(../images/header/icon-48-writemess.png);
+}
+.icon-48-featured {
+	background-image: url(../images/header/icon-48-featured.png);
+}
+.icon-48-sections {
+	background-image: url(../images/header/icon-48-section.png);
+}
+.icon-48-article-add {
+	background-image: url(../images/header/icon-48-article-add.png);
+}
+.icon-48-article-edit {
+	background-image: url(../images/header/icon-48-article-edit.png);
+}
+.icon-48-article {
+	background-image: url(../images/header/icon-48-article.png);
+}
+.icon-48-content-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-content-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-content-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-install {
+	background-image: url(../images/header/icon-48-extension.png);
+}
+.icon-48-dbbackup {
+	background-image: url(../images/header/icon-48-backup.png);
+}
+.icon-48-dbrestore {
+	background-image: url(../images/header/icon-48-dbrestore.png);
+}
+.icon-48-dbquery {
+	background-image: url(../images/header/icon-48-query.png);
+}
+.icon-48-systeminfo {
+	background-image: url(../images/header/icon-48-info.png);
+}
+.icon-48-massmail {
+	background-image: url(../images/header/icon-48-massmail.png);
+}
+.icon-48-redirect {
+	background-image: url(../images/header/icon-48-redirect.png);
+}
+.icon-48-search {
+	background-image: url(../images/header/icon-48-search.png);
+}
+.icon-48-finder {
+	background-image: url(../images/header/icon-48-search.png);
+}
+.icon-48-newsfeeds {
+	background-image: url(../images/header/icon-48-newsfeeds.png);
+}
+.icon-48-newsfeeds-categories {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+.icon-48-newsfeeds-category-edit {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+.icon-48-newsfeeds-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-weblinks {
+	background-image: url(../images/header/icon-48-links.png);
+}
+.icon-48-weblinks-categories {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+.icon-48-weblinks-category-edit {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+.icon-48-weblinks-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-tags {
+	background-image: url(../images/header/icon-48-tags.png);
+}
+.icon-48-assoc {
+	background-image: url(../images/header/icon-48-assoc.png);
+}
+.icon-48-puzzle {
+	background-image: url(../images/header/icon-48-puzzle.png);
+}
+div.message {
+	border: 1px solid #738498;
+	color: #2c2c2c;
+}
+.helpFrame {
+	border-left: 0 solid #738498;
+	border-right: none;
+	border-top: none;
+	border-bottom: none;
+}
+.outline {
+	border: 1px solid #738498;
+	background: #ffffff;
+}
+dl.menu_type dt {
+	border-bottom: 1px solid #738498;
+}
+ul#new-modules-list {
+	border-top: 1px solid #738498;
+}
+#skiplinkholder a,
+#skiplinkholder a:link,
+#skiplinkholder a:visited {
+	color: #ffffff;
+	background: #054993;
+	border-bottom: solid #336 2px;
+}
+fieldset.panelform {
+	border: none 0;
+}
+a.move_up {
+	background-image: url('../images/admin/uparrow.png');
+}
+span.move_up {
+	background-image: url('../images/admin/uparrow0.png');
+}
+a.move_down {
+	background-image: url('../images/admin/downarrow.png');
+}
+span.move_down {
+	background-image: url('../images/admin/downarrow0.png');
+}
+a.grid_false {
+	background-image: url('../images/admin/publish_x.png');
+}
+a.grid_true {
+	background-image: url('../images/admin/tick.png');
+}
+a.grid_trash {
+	background-image: url('../images/admin/icon-16-trash.png');
+}
+tr.row1 {
+	background-color: #c3d2e5;
+}
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-left: 1px solid #738498;
+}
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) 0 0 no-repeat;
+}
+label.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+label.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+a.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allowinactive {
+	background: url(../images/admin/icon-16-allowinactive.png) no-repeat;
+}
+a.icon-16-denyinactive {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+ul.acllegend li.acl-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat left;
+}
+ul.acllegend li.acl-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat left;
+}
+li.acl-editgroups,
+li.acl-resetbtn {
+	background-color: #c3d2e5;
+	border: 1px solid #738498;
+}
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	color: #054993;
+}
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	background-color: #e5d9c3;
+}
+table#acl-config {
+	border: 1px solid #738498;
+}
+table#acl-config th,
+table#acl-config td {
+	background: #c3d2e5;
+	border-bottom: 1px solid #738498;
+}
+table#acl-config th.acl-groups {
+	border-right: 1px solid #738498;
+}
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) right top no-repeat;
+}
+#permissions-sliders .tip {
+	background: #ffffff;
+	border: 1px solid #738498;
+}
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+	border: solid 0 #738498;
+	background: #ffffff;
+}
+ul#rules li .pane-sliders .panel h3.title {
+	border: solid 0 #738498;
+}
+#permissions-sliders ul#rules .pane-slider {
+	border: solid 1px #738498;
+}
+#permissions-sliders ul#rules li h3 {
+	border: solid 1px #738498;
+}
+#permissions-sliders ul#rules li h3.pane-toggler-down a {
+	border: solid 0;
+}
+#permissions-sliders ul#rules .group-kind {
+	color: #2c2c2c;
+}
+#permissions-sliders ul#rules table.group-rules {
+	border: solid 1px #738498;
+}
+#permissions-sliders ul#rules table.group-rules td {
+	border-right: solid 1px #738498;
+	border-bottom: solid 1px #738498;
+}
+#permissions-sliders ul#rules table.group-rules th {
+	background: #e5d9c3;
+	border-right: solid 1px #738498;
+	border-bottom: solid 1px #738498;
+	color: #2c2c2c;
+}
+ul#rules table.aclmodify-table {
+	border: solid 1px #738498;
+}
+ul#rules table.group-rules td label {
+	border: solid 0 #738498;
+}
+#permissions-sliders ul#rules .mypanel {
+	border: solid 0 #738498;
+}
+#permissions-sliders  ul#rules  table.group-rules td {
+	background: #ffffff;
+}
+#permissions-sliders span.level {
+	color: #738498;
+	background-image: none;
+}
+.check-0,
+table.adminlist tbody td.check-0 {
+	background-color: #ffffcf;
+}
+.check-a,
+table.adminlist tbody td.check-a {
+	background-color: #cfffda;
+}
+.check-d,
+table.adminlist tbody td.check-d {
+	background-color: #ffcfcf;
+}
+#system-message dd ul {
+	color: #2c2c2c;
+}
+#system-message dd.error ul {
+	color: #2c2c2c;
+}
+#system-message dd.message ul {
+	color: #2c2c2c;
+}
+#system-message dd.notice ul {
+	color: #2c2c2c;
+}
+#menu {
+	color: #2c2c2c;
+}
+#menu ul.dropdown-menu {
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	color: #2c2c2c;
+}
+#menu ul.dropdown-menu li.dropdown-submenu {
+	background: url(../images/j_arrow.png) no-repeat right 50%;
+}
+#menu ul.dropdown-menu li.divider {
+	margin-bottom: 0;
+	border-bottom: 1px dotted #738498;
+}
+#menu a {
+	color: #054993;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+#menu li {
+	border-right: 1px solid #738498;
+	background-color: transparent;
+}
+#menu li a:hover,
+#menu li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	color: #738498;
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+}
+#menu li ul {
+	border: 1px solid #738498;
+}
+#menu li li {
+	background-color: transparent;
+}
+#menu li.sfhover a {
+	background-color: #e5d9c3;
+}
+#menu li.sfhover li a {
+	background-color: transparent;
+}
+#menu li.sfhover li.sfhover a,
+#menu li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li.sfhover li.sfhover li a {
+	background-color: transparent;
+}
+#menu li.sfhover li.sfhover li.sfhover a,
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li li a:focus,
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#submenu {
+	border-bottom: 1px solid #738498;
+}
+#submenu li,
+#submenu span.nolink {
+	background-color: #b1c4db;
+	background-image: -moz-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#a5bbd4),to(#c3d2e5));
+	background-image: -webkit-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: -o-linear-gradient(top,#a5bbd4,#c3d2e5);
+	background-image: linear-gradient(to bottom,#a5bbd4,#c3d2e5);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa5bbd4', endColorstr='#ffc3d2e5', GradientType=0);
+	border: 1px solid #738498;
+	color: #054993;
+}
+#submenu li:hover,
+#submenu li:focus {
+	background: #e5d9c3;
+}
+#submenu li.active,
+#submenu span.nolink.active {
+	background: #ffffff;
+	border-bottom: 1px solid #ffffff;
+}
+#submenu li.active a,
+#submenu span.nolink.active {
+	color: #000;
+}
+.element-invisible {
+	margin: 0;
+	padding: 0;
+}
+div.CodeMirror-wrapping {
+	border: 1px solid #738498;
+}
+table.adminform tr.row0 {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(odd) {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(even) {
+	background-color: #c3d2e5;
+}
+ol.alternating > li:nth-child(odd) {
+	background-color: #ffffff;
+}
+ol.alternating > li:nth-child(even) {
+	background-color: #c3d2e5;
+}
+#installer-database,
+#installer-discover,
+#installer-update,
+#installer-warnings {
+	border-top: 1px solid #738498;
+}
+#installer-database p.warning {
+	background: transparent url(../images/admin/icon-16-deny.png) center left no-repeat;
+}
+#installer-database p.nowarning {
+	background: transparent url(../images/admin/icon-16-allow.png) center left no-repeat;
+}
+.input-append,
+.input-prepend {
+	font-size: 1.2em;
+}
diff --git a/core/administrator/templates/hathor/css/colour_blue_rtl.css b/core/administrator/templates/hathor/css/colour_blue_rtl.css
new file mode 100644
index 00000000..be76bc14
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_blue_rtl.css
@@ -0,0 +1,374 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * RTL CSS file for the color standard
+ */
+
+/**
+ * Overall Styles
+ */
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat top right;
+}
+
+#element-box {
+	border-left: 1px solid #738498;
+	border-right: 1px solid #738498;
+}
+
+
+/**
+ * Various Styles
+ */
+
+div.checkin-tick {
+		background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+
+/**
+ * Subheader, toolbar, page title
+ */
+
+div.toolbar-box {
+	border-left: 1px solid #738498;
+	border-right: 1px solid #738498;
+}
+
+div.toolbar-list li.divider {
+	border-left: 1px dotted #e5d9c3;
+	border-right: none;
+}
+
+div.toolbar-list a:hover {
+	border-right: 1px solid #e5d9c3;
+	border-left: 1px solid #738498;
+}
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+.pane-toggler  span {
+	background: transparent url(../images/j_arrow_left.png) right 50% no-repeat;
+}
+
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) right 50% no-repeat;
+}
+
+/**
+ * Cpanel Settings
+ */
+
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus {
+	border-right: 1px solid #e5d9c3;
+	border-left: 1px solid #738498;
+}
+
+fieldset#filter-bar {
+	border-left: none;
+	border-right: none;
+}
+
+/**
+ * Admintable Styles
+ */
+
+table.admintable td.key,table.admintable td.paramlist_key {
+	border-left: 1px solid #738498;
+	border-right: none;
+}
+
+table.paramlist td.paramlist_description {
+	border-left: 1px solid #738498;
+	border-right: none;
+}
+
+/**
+ * Admin Form Styles
+ */
+table.adminform tr {
+	border-left: 1px solid #738498;
+	border-right: none;
+}
+
+/**
+ * Adminlist Table layout
+ */
+
+table.adminlist.modal {
+	border-right: 1px solid #738498;
+	border-left: 1px solid #738498;
+}
+
+/* Table row styles */
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-left: 1px solid #738498;
+	border-right: none;
+}
+
+table.adminlist tbody tr td:last-child {
+	border-left: none;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+
+/**
+ * Button styling
+ */
+
+/* Button 1 Type */
+
+	/* Use this if you add images to the buttons such as directional arrows */
+
+.button1 a {
+	/* add padding if you are using the directional images */
+	/* padding: 0 6px 0 30px; */
+}
+
+	/* Button 2 Type */
+
+.button2-right .prev {
+	background-image: url(../images/j_button2_prev.png);
+	background-position: right center;
+}
+
+.button2-right.off .prev {
+	background: url(../images/j_button2_prev_off.png) no-repeat;
+}
+
+.button2-right .start {
+	background-image: url(../images/j_button2_first.png);
+	background-position: right center;
+}
+
+.button2-left .next {
+	background-image: url(../images/j_button2_next.png);
+	background-position: left center;
+}
+
+.button2-left.off .next { /* @TODO check the x position */
+	background: url(../images/j_button2_next_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .end {
+	background-image: url(../images/j_arrow_left.png);
+	background-position: left center;
+}
+
+.button2-left.off .end { /* @TODO check the x position */
+	background: url(../images/j_button2_last_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .image {
+	background: url(../images/j_button2_image.png) 100% 0 no-repeat;
+}
+
+.button2-left .readmore {
+	background: url(../images/j_button2_readmore.png) 100% 0 no-repeat;
+}
+
+.button2-left .pagebreak {
+	background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat;
+}
+
+/**
+ * Tooltips
+ */
+
+/**
+ * System Standard Messages
+ */
+#system-message dd.message ul {
+	background: #C3D2E5 url(../images/notice-info.png) 99.5% center no-repeat;
+}
+
+/**
+ * System Error Messages
+ */
+#system-message dd.error ul {
+	background: #E6C0C0 url(../images/notice-alert.png) 99.5% top no-repeat;
+}
+
+/**
+ * System Notice Messages
+ */
+#system-message dd.notice ul {
+	background: #EFE7B8 url(../images/notice-note.png) 99%.5 top no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+
+/**
+ * General styles
+ */
+
+.helpFrame {
+	border-right: 0 solid #738498;
+	border-left: none;
+	border-top: none;
+}
+
+/* -- ACL STYLES relocated from com_users/media/grid.css ----------- */
+
+/* -- ACL PANEL STYLES  ----------- */
+
+
+/* All Tabs */
+
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-right: 1px solid #738498;
+	border-left: none;
+}
+
+/* Icons */
+
+ul.acllegend li.acl-allowed {
+	background:url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+ul.acllegend li.acl-denied {
+	background:url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+table#acl-config th.acl-groups {
+	border-left: 1px solid #738498;
+}
+
+table#acl-config th.acl-groups {
+	text-align: right;
+}
+
+.acl-action {
+	margin: auto 0;
+}
+
+/* Icons */
+
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat right;
+}
+
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) no-repeat right;
+}
+
+/**
+* Mod_rewrite Warning
+*/
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) left top no-repeat;
+}
+
+/**
+* Modal S-Box overrides
+*/
+
+#sbox-window {
+	text-align: right;
+}
+
+/**
+* Permission Rules
+*/
+
+#permissions-sliders ul#rules table.group-rules td
+{
+    border-left: solid 1px #738498;
+    border-right: solid 0 #738498;
+}
+
+#permissions-sliders ul#rules table.group-rules th
+{
+    border-left: solid 1px #738498;
+    border-right: solid 0 #738498;
+}
+
+/**
+ * Menu Styling
+ */
+
+#menu ul li.node {
+	background-image: url(../images/j_arrow_left.png);
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+
+#menu a {
+	background-position: right 50%;
+}
+
+#menu li {
+	border-left: 1px solid #738498;
+	border-right: 0 solid #738498;
+}
+
+#menu li li li a:focus {
+	border-right: 1px solid #fafafa;
+}
+
+/* Installer Database */
+#installer-database p.warning {
+	background-position: center right;
+}
+
+#installer-database p.nowarning {
+	background-position: center right;
+}
diff --git a/core/administrator/templates/hathor/css/colour_brown.css b/core/administrator/templates/hathor/css/colour_brown.css
new file mode 100644
index 00000000..01749071
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_brown.css
@@ -0,0 +1,1802 @@
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 25px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+#form-login .btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 15px;
+	*line-height: 15px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#ffffff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+#form-login .btn:hover,
+#form-login .btn:focus,
+#form-login .btn:active,
+#form-login .btn.active,
+#form-login .btn.disabled,
+#form-login .btn[disabled] {
+	color: #333333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+#form-login .btn:active,
+#form-login .btn.active {
+	background-color: #cccccc \9;
+}
+#form-login .btn:first-child {
+	*margin-left: 0;
+}
+#form-login .btn:hover {
+	color: #333333;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+#form-login .btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+#form-login .btn.active,
+#form-login .btn:active {
+	background-color: #e6e6e6;
+	background-color: #d9d9d9 \9;
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+#form-login .btn.disabled,
+#form-login .btn[disabled] {
+	cursor: default;
+	background-color: #e6e6e6;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 9px 14px;
+	font-size: 15px;
+	line-height: normal;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.btn-large [class^="icon-"] {
+	margin-top: 2px;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+.input-append,
+.input-prepend {
+	margin-bottom: 5px;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	font-size: 13px;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 15px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 15px;
+	text-align: center;
+	text-shadow: 0 1px 0 #ffffff;
+	background-color: #eeeeee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-append .active,
+.input-prepend .active {
+	background-color: #a9dba9;
+	border-color: #46a546;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0 !important;
+	margin: 0 !important;
+	border: 0;
+	height: 1px;
+	width: 1px !important;
+	overflow: hidden;
+}
+#form-login select,
+#form-login input[type="text"],
+#form-login input[type="password"] {
+	display: inline-block;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px;
+	line-height: 15px;
+	color: #555555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	width: 175px;
+}
+.subform-repeatable-wrapper div.btn-toolbar {
+	float: none;
+}
+.subform-repeatable-wrapper .text-right {
+	text-align: right;
+}
+.subform-repeatable-wrapper .ui-sortable-helper {
+	background: #ffffff;
+}
+.subform-repeatable-wrapper tr.ui-sortable-helper {
+	display: table;
+}
+.subform-repeatable-wrapper .subform-repeatable-group {
+	clear: both;
+}
+.label,
+.badge {
+	display: inline-block;
+	padding: 2px 4px;
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #ffffff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999999;
+}
+.label {
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding-left: 9px;
+	padding-right: 9px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+	display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+	color: #ffffff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #a20000;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #6f0000;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #005800;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #002500;
+}
+.label-info,
+.badge-info {
+	background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+body {
+	background-color: #ffffff;
+	color: #2c2c2c;
+}
+h1 {
+	color: #2c2c2c;
+}
+a:link {
+	color: #054993;
+}
+a:visited {
+	color: #054993;
+}
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat;
+}
+#header h1.title {
+	color: #2c2c2c;
+}
+#nav {
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	border: 1px solid #000000;
+}
+#content {
+	background: #ffffff;
+}
+#no-submenu {
+	border-bottom: 1px solid #000000;
+}
+#element-box {
+	background: #ffffff;
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	border-left: 1px solid #000000;
+}
+#element-box.login {
+	border-top: 1px solid #000000;
+}
+.enabled,
+.success,
+.allow,
+span.writable {
+	color: #005800;
+}
+.disabled,
+p.error,
+.warning,
+.deny,
+span.unwritable {
+	color: #a20000;
+}
+.nowarning {
+	color: #2c2c2c;
+}
+.none,
+.protected {
+	color: #000000;
+}
+span.note {
+	background: #ffffff;
+	color: #2c2c2c;
+}
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+.ol-foreground {
+	background-color: #d5c1b2;
+}
+.ol-background {
+	background-color: #005800;
+}
+.ol-textfont {
+	color: #2c2c2c;
+}
+.ol-captionfont {
+	color: #ffffff;
+}
+.ol-captionfont a {
+	color: #054993;
+}
+div.subheader .padding {
+	background: #ffffff;
+}
+.pagetitle h2 {
+	color: #2c2c2c;
+}
+div.configuration {
+	color: #2c2c2c;
+	background-image: url(../images/menu/icon-16-config.png);
+	background-repeat: no-repeat;
+}
+div.toolbar-box {
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	border-left: 1px solid #000000;
+	background: #ffffff;
+}
+div.toolbar-list li {
+	color: #2c2c2c;
+}
+div.toolbar-list li.divider {
+	border-right: 1px dotted #e5d9c3;
+}
+div.toolbar-list a {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	background: #d5c1b2;
+}
+div.toolbar-list a:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+}
+div.btn-toolbar {
+	margin-left: 5px;
+	padding-top: 3px;
+}
+div.btn-toolbar li.divider {
+	border-right: 1px dotted #e5d9c3;
+}
+div.btn-toolbar div.btn-group button {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	padding: 5px 4px 5px 4px;
+}
+div.btn-toolbar div.btn-group button:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+	cursor: pointer;
+}
+div.btn-toolbar a {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	padding: 6px 5px;
+	text-align: center;
+	white-space: nowrap;
+	font-size: 1.2em;
+	text-decoration: none;
+}
+div.btn-toolbar a:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+	cursor: pointer;
+}
+div.btn-toolbar div.btn-group button.inactive {
+	background: #d5c1b2;
+}
+.pane-sliders .title {
+	color: #2c2c2c;
+}
+.pane-sliders .panel {
+	border: 1px solid #000000;
+}
+.pane-sliders .panel h3 {
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	color: #054993;
+}
+.pane-sliders .panel h3:hover {
+	background: #e5d9c3;
+}
+.pane-sliders .panel h3:hover a {
+	text-decoration: none;
+}
+.pane-sliders .adminlist {
+	border: 0 none;
+}
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+.pane-toggler span {
+	background: transparent url(../images/j_arrow.png) 5px 50% no-repeat;
+}
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) 5px 50% no-repeat;
+}
+.pane-toggler-down {
+	border-bottom: 1px solid #000000;
+}
+dl.tabs dt {
+	border: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	color: #054993;
+}
+dl.tabs dt:hover {
+	background: #e5d9c3;
+}
+dl.tabs dt.open {
+	background: #ffffff;
+	border-bottom: 1px solid #ffffff;
+	color: #2c2c2c;
+}
+dl.tabs dt.open a:visited {
+	color: #2c2c2c;
+}
+dl.tabs dt a:hover {
+	text-decoration: none;
+}
+dl.tabs dt a:focus {
+	text-decoration: underline;
+}
+div.current {
+	border: 1px solid #000000;
+	background: #ffffff;
+}
+div.current fieldset {
+	border: none 0;
+}
+div.current fieldset.adminform {
+	border: 1px solid #000000;
+}
+#login-page .pagetitle h2 {
+	background: transparent;
+}
+#login-page #header {
+	border-bottom: 1px solid #000000;
+}
+#login-page #lock {
+	background: url(../images/j_login_lock.png) 50% 0 no-repeat;
+}
+#login-page #element-box.login {
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+#form-login {
+	background: #ffffff;
+	border: 1px solid #000000;
+}
+#form-login label {
+	color: #2c2c2c;
+}
+#form-login div.button1 a {
+	color: #054993;
+}
+#cpanel div.icon a,
+.cpanel div.icon a {
+	color: #054993;
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #000000;
+	border-bottom: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus,
+.cpanel div.icon a:hover,
+.cpanel div.icon a:focus {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	color: #054993;
+	background: #e5d9c3;
+}
+fieldset {
+	border: 1px #000000 solid;
+}
+legend {
+	color: #2c2c2c;
+}
+fieldset ul.checklist input:focus {
+	outline: thin dotted #2c2c2c;
+}
+fieldset#filter-bar {
+	border-top: 0 solid #000000;
+	border-right: 0 solid #000000;
+	border-bottom: 1px solid #000000;
+	border-left: 0 solid #000000;
+}
+fieldset#filter-bar ol,
+fieldset#filter-bar ul {
+	border: 0;
+}
+fieldset#filter-bar ol li fieldset,
+fieldset#filter-bar ul li fieldset {
+	border: 0;
+}
+.invalid {
+	color: #a20000;
+}
+input.invalid {
+	border: 1px solid #a20000;
+}
+input.readonly,
+span.faux-input {
+	border: 0;
+}
+input.required {
+	background-color: #e5f0fa;
+}
+input.disabled {
+	background-color: #eeeeee;
+}
+input,
+select,
+span.faux-input {
+	background-color: #ffffff;
+	border: 1px solid #000000;
+}
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+	color: #054993;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+input[type="button"]:hover,
+input[type="button"]:focus,
+input[type="submit"]:hover,
+input[type="submit"]:focus,
+input[type="reset"]:hover,
+input[type="reset"]:focus {
+	background: #e5d9c3;
+}
+textarea {
+	background-color: #ffffff;
+	border: 1px solid #000000;
+}
+input:focus,
+select:focus,
+textarea:focus,
+option:focus,
+input:hover,
+select:hover,
+textarea:hover,
+option:hover {
+	background-color: #e5d9c3;
+	color: #054993;
+}
+.paramrules {
+	background: #d5c1b2;
+}
+span.gi {
+	color: #000000;
+}
+table.admintable td.key,
+table.admintable td.paramlist_key {
+	background-color: #d5c1b2;
+	color: #2c2c2c;
+	border-bottom: 1px solid #000000;
+	border-right: 1px solid #000000;
+}
+table.paramlist td.paramlist_description {
+	background-color: #d5c1b2;
+	color: #2c2c2c;
+	border-bottom: 1px solid #000000;
+	border-right: 1px solid #000000;
+}
+fieldset.adminform {
+	border: 1px solid #000000;
+}
+table.adminform {
+	background-color: #ffffff;
+}
+table.adminform tr.row0 {
+	background-color: #ffffff;
+}
+table.adminform tr.row1 {
+	background-color: #e5d9c3;
+}
+table.adminform th {
+	color: #2c2c2c;
+	background: #ffffff;
+}
+table.adminform tr {
+	border-bottom: 1px solid #000000;
+	border-right: 1px solid #000000;
+}
+table.adminlist {
+	border-spacing: 1px;
+	background-color: #ffffff;
+	color: #2c2c2c;
+}
+table.adminlist.modal {
+	border-top: 1px solid #000000;
+	border-right: 1px solid #000000;
+	border-left: 1px solid #000000;
+}
+table.adminlist a {
+	color: #054993;
+}
+table.adminlist thead th {
+	background: #ffffff;
+	color: #2c2c2c;
+	border-bottom: 1px solid #000000;
+}
+table.adminlist tbody tr {
+	background: #ffffff;
+}
+table.adminlist tbody tr.row1 {
+	background: #ffffff;
+}
+table.adminlist tbody tr.row1:last-child td,
+table.adminlist tbody tr.row1:last-child th {
+	border-bottom: 1px solid #000000;
+}
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td,
+table.adminlist tbody tr.row0:hover th,
+table.adminlist tbody tr.row1:hover th,
+table.adminlist tbody tr.row0:focus td,
+table.adminlist tbody tr.row1:focus td,
+table.adminlist tbody tr.row0:focus th,
+table.adminlist tbody tr.row1:focus th {
+	background-color: #e5d9c3;
+}
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-right: 1px solid #000000;
+}
+table.adminlist tbody tr td:last-child {
+	border-right: none;
+}
+table.adminlist tbody tr.row0:last-child td,
+table.adminlist tbody tr.row0:last-child th {
+	border-bottom: 1px solid #000000;
+}
+table.adminlist tbody tr.row0 td,
+table.adminlist tbody tr.row0 th {
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+table.adminlist {
+	border-bottom: 0 solid #000000;
+}
+table.adminlist tfoot tr {
+	color: #2c2c2c;
+}
+table.adminlist tfoot td,
+table.adminlist tfoot th {
+	background-color: #ffffff;
+	border-top: 1px solid #000000;
+}
+table.adminlist tr td.btns a {
+	border: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	color: #054993;
+}
+table.adminlist tr td.btns a:hover,
+table.adminlist tr td.btns a:active,
+table.adminlist tr td.btns a:focus {
+	background-color: #ffffff;
+}
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+fieldset.batch {
+	background: #ffffff;
+}
+button {
+	color: #054993;
+	border: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+button:hover,
+button:focus {
+	background: #e5d9c3;
+}
+.invalid {
+	color: #ff0000;
+}
+.button1 {
+	border: 1px solid #000000;
+	color: #054993;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+.button1 a {
+	color: #054993;
+}
+.button1 a:hover,
+.button1 a:focus {
+	background: #e5d9c3;
+}
+.button2-left,
+.button2-right {
+	border: 1px solid #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	color: #054993;
+}
+.button2-left span,
+.button2-right span {
+	color: #999999;
+}
+.page span,
+.blank span {
+	color: #054993;
+}
+.button2-left a:hover,
+.button2-right a:hover,
+.button2-left a:focus,
+.button2-right a:focus {
+	background: #e5d9c3;
+}
+.pagination .page span {
+	color: #999999;
+}
+.tip {
+	background: #000000;
+	border: 1px solid #FFFFFF;
+}
+.tip-title {
+	background: url(../images/selector-arrow-std.png) no-repeat;
+}
+a img.calendar {
+	background: url(../images/calendar.png) no-repeat;
+}
+.jgrid span.publish {
+	background-image: url(../images/admin/tick.png);
+}
+.jgrid span.unpublish {
+	background-image: url(../images/admin/publish_x.png);
+}
+.jgrid span.archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+.jgrid span.trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+.jgrid span.default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+.jgrid span.notdefault {
+	background-image: url(../images/menu/icon-16-notdefault.png);
+}
+.jgrid span.checkedout {
+	background-image: url(../images/admin/checked_out.png);
+}
+.jgrid span.downarrow {
+	background-image: url(../images/admin/downarrow.png);
+}
+.jgrid span.downarrow_disabled {
+	background-image: url(../images/admin/downarrow0.png);
+}
+.jgrid span.uparrow {
+	background-image: url(../images/admin/uparrow.png);
+}
+.jgrid span.uparrow_disabled {
+	background-image: url(../images/admin/uparrow0.png);
+}
+.jgrid span.published {
+	background-image: url(../images/admin/publish_g.png);
+}
+.jgrid span.expired {
+	background-image: url(../images/admin/publish_r.png);
+}
+.jgrid span.pending {
+	background-image: url(../images/admin/publish_y.png);
+}
+.jgrid span.warning {
+	background-image: url(../images/admin/publish_y.png);
+}
+.icon-32-send {
+	background-image: url(../images/toolbar/icon-32-send.png);
+}
+.icon-32-delete {
+	background-image: url(../images/toolbar/icon-32-delete.png);
+}
+.icon-32-help {
+	background-image: url(../images/toolbar/icon-32-help.png);
+}
+.icon-32-cancel {
+	background-image: url(../images/toolbar/icon-32-cancel.png);
+}
+.icon-32-checkin {
+	background-image: url(../images/toolbar/icon-32-checkin.png);
+}
+.icon-32-options {
+	background-image: url(../images/toolbar/icon-32-config.png);
+}
+.icon-32-apply {
+	background-image: url(../images/toolbar/icon-32-apply.png);
+}
+.icon-32-back {
+	background-image: url(../images/toolbar/icon-32-back.png);
+}
+.icon-32-forward {
+	background-image: url(../images/toolbar/icon-32-forward.png);
+}
+.icon-32-save {
+	background-image: url(../images/toolbar/icon-32-save.png);
+}
+.icon-32-edit {
+	background-image: url(../images/toolbar/icon-32-edit.png);
+}
+.icon-32-copy {
+	background-image: url(../images/toolbar/icon-32-copy.png);
+}
+.icon-32-move {
+	background-image: url(../images/toolbar/icon-32-move.png);
+}
+.icon-32-new {
+	background-image: url(../images/toolbar/icon-32-new.png);
+}
+.icon-32-upload {
+	background-image: url(../images/toolbar/icon-32-upload.png);
+}
+.icon-32-assign {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+.icon-32-html {
+	background-image: url(../images/toolbar/icon-32-html.png);
+}
+.icon-32-css {
+	background-image: url(../images/toolbar/icon-32-css.png);
+}
+.icon-32-menus {
+	background-image: url(../images/toolbar/icon-32-menu.png);
+}
+.icon-32-publish {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+.icon-32-unblock {
+	background-image: url(../images/toolbar/icon-32-unblock.png);
+}
+.icon-32-unpublish {
+	background-image: url(../images/toolbar/icon-32-unpublish.png);
+}
+.icon-32-restore {
+	background-image: url(../images/toolbar/icon-32-revert.png);
+}
+.icon-32-trash {
+	background-image: url(../images/toolbar/icon-32-trash.png);
+}
+.icon-32-archive {
+	background-image: url(../images/toolbar/icon-32-archive.png);
+}
+.icon-32-unarchive {
+	background-image: url(../images/toolbar/icon-32-unarchive.png);
+}
+.icon-32-preview {
+	background-image: url(../images/toolbar/icon-32-preview.png);
+}
+.icon-32-default {
+	background-image: url(../images/toolbar/icon-32-default.png);
+}
+.icon-32-refresh {
+	background-image: url(../images/toolbar/icon-32-refresh.png);
+}
+.icon-32-save-new {
+	background-image: url(../images/toolbar/icon-32-save-new.png);
+}
+.icon-32-save-copy {
+	background-image: url(../images/toolbar/icon-32-save-copy.png);
+}
+.icon-32-error {
+	background-image: url(../images/toolbar/icon-32-error.png);
+}
+.icon-32-new-style {
+	background-image: url(../images/toolbar/icon-32-new-style.png);
+}
+.icon-32-delete-style {
+	background-image: url(../images/toolbar/icon-32-delete-style.png);
+}
+.icon-32-purge {
+	background-image: url(../images/toolbar/icon-32-purge.png);
+}
+.icon-32-remove {
+	background-image: url(../images/toolbar/icon-32-remove.png);
+}
+.icon-32-featured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+}
+.icon-32-unfeatured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+	background-position: 0% 100%;
+}
+.icon-32-export {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+.icon-32-stats {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+.icon-32-print {
+	background-image: url(../images/toolbar/icon-32-print.png);
+}
+.icon-32-batch {
+	background-image: url(../images/toolbar/icon-32-batch.png);
+}
+.icon-32-envelope {
+	background-image: url(../images/toolbar/icon-32-messaging.png);
+}
+.icon-32-download {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+.icon-32-bars {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+.icon-48-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-generic {
+	background-image: url(../images/header/icon-48-generic.png);
+}
+.icon-48-banners {
+	background-image: url(../images/header/icon-48-banner.png);
+}
+.icon-48-banners-categories {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+.icon-48-banners-category-edit {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+.icon-48-banners-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-banners-clients {
+	background-image: url(../images/header/icon-48-banner-client.png);
+}
+.icon-48-banners-tracks {
+	background-image: url(../images/header/icon-48-banner-tracks.png);
+}
+.icon-48-checkin {
+	background-image: url(../images/header/icon-48-checkin.png);
+}
+.icon-48-clear {
+	background-image: url(../images/header/icon-48-clear.png);
+}
+.icon-48-contact {
+	background-image: url(../images/header/icon-48-contacts.png);
+}
+.icon-48-contact-categories {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+.icon-48-contact-category-edit {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+.icon-48-contact-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-purge {
+	background-image: url(../images/header/icon-48-purge.png);
+}
+.icon-48-cpanel {
+	background-image: url(../images/header/icon-48-cpanel.png);
+}
+.icon-48-config {
+	background-image: url(../images/header/icon-48-config.png);
+}
+.icon-48-groups {
+	background-image: url(../images/header/icon-48-groups.png);
+}
+.icon-48-groups-add {
+	background-image: url(../images/header/icon-48-groups-add.png);
+}
+.icon-48-levels {
+	background-image: url(../images/header/icon-48-levels.png);
+}
+.icon-48-levels-add {
+	background-image: url(../images/header/icon-48-levels-add.png);
+}
+.icon-48-module {
+	background-image: url(../images/header/icon-48-module.png);
+}
+.icon-48-menu {
+	background-image: url(../images/header/icon-48-menu.png);
+}
+.icon-48-menu-add {
+	background-image: url(../images/header/icon-48-menu-add.png);
+}
+.icon-48-menumgr {
+	background-image: url(../images/header/icon-48-menumgr.png);
+}
+.icon-48-trash {
+	background-image: url(../images/header/icon-48-trash.png);
+}
+.icon-48-user {
+	background-image: url(../images/header/icon-48-user.png);
+}
+.icon-48-user-add {
+	background-image: url(../images/header/icon-48-user-add.png);
+}
+.icon-48-user-edit {
+	background-image: url(../images/header/icon-48-user-edit.png);
+}
+.icon-48-user-profile {
+	background-image: url(../images/header/icon-48-user-profile.png);
+}
+.icon-48-inbox {
+	background-image: url(../images/header/icon-48-inbox.png);
+}
+.icon-48-new-privatemessage {
+	background-image: url(../images/header/icon-48-new-privatemessage.png);
+}
+.icon-48-msgconfig {
+	background-image: url(../images/header/icon-48-message_config.png);
+}
+.icon-48-langmanager {
+	background-image: url(../images/header/icon-48-language.png);
+}
+.icon-48-mediamanager {
+	background-image: url(../images/header/icon-48-media.png);
+}
+.icon-48-plugin {
+	background-image: url(../images/header/icon-48-plugin.png);
+}
+.icon-48-help_header {
+	background-image: url(../images/header/icon-48-help_header.png);
+}
+.icon-48-impressions {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-browser {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-searchtext {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-thememanager {
+	background-image: url(../images/header/icon-48-themes.png);
+}
+.icon-48-writemess {
+	background-image: url(../images/header/icon-48-writemess.png);
+}
+.icon-48-featured {
+	background-image: url(../images/header/icon-48-featured.png);
+}
+.icon-48-sections {
+	background-image: url(../images/header/icon-48-section.png);
+}
+.icon-48-article-add {
+	background-image: url(../images/header/icon-48-article-add.png);
+}
+.icon-48-article-edit {
+	background-image: url(../images/header/icon-48-article-edit.png);
+}
+.icon-48-article {
+	background-image: url(../images/header/icon-48-article.png);
+}
+.icon-48-content-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-content-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-content-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-install {
+	background-image: url(../images/header/icon-48-extension.png);
+}
+.icon-48-dbbackup {
+	background-image: url(../images/header/icon-48-backup.png);
+}
+.icon-48-dbrestore {
+	background-image: url(../images/header/icon-48-dbrestore.png);
+}
+.icon-48-dbquery {
+	background-image: url(../images/header/icon-48-query.png);
+}
+.icon-48-systeminfo {
+	background-image: url(../images/header/icon-48-info.png);
+}
+.icon-48-massmail {
+	background-image: url(../images/header/icon-48-massmail.png);
+}
+.icon-48-redirect {
+	background-image: url(../images/header/icon-48-redirect.png);
+}
+.icon-48-search {
+	background-image: url(../images/header/icon-48-search.png);
+}
+.icon-48-finder {
+	background-image: url(../images/header/icon-48-search.png);
+}
+.icon-48-newsfeeds {
+	background-image: url(../images/header/icon-48-newsfeeds.png);
+}
+.icon-48-newsfeeds-categories {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+.icon-48-newsfeeds-category-edit {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+.icon-48-newsfeeds-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-weblinks {
+	background-image: url(../images/header/icon-48-links.png);
+}
+.icon-48-weblinks-categories {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+.icon-48-weblinks-category-edit {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+.icon-48-weblinks-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-tags {
+	background-image: url(../images/header/icon-48-tags.png);
+}
+.icon-48-assoc {
+	background-image: url(../images/header/icon-48-assoc.png);
+}
+.icon-48-puzzle {
+	background-image: url(../images/header/icon-48-puzzle.png);
+}
+div.message {
+	border: 1px solid #000000;
+	color: #2c2c2c;
+}
+.helpFrame {
+	border-left: 0 solid #000000;
+	border-right: none;
+	border-top: none;
+	border-bottom: none;
+}
+.outline {
+	border: 1px solid #000000;
+	background: #ffffff;
+}
+dl.menu_type dt {
+	border-bottom: 1px solid #000000;
+}
+ul#new-modules-list {
+	border-top: 1px solid #000000;
+}
+#skiplinkholder a,
+#skiplinkholder a:link,
+#skiplinkholder a:visited {
+	color: #ffffff;
+	background: #054993;
+	border-bottom: solid #336 2px;
+}
+fieldset.panelform {
+	border: none 0;
+}
+a.move_up {
+	background-image: url('../images/admin/uparrow.png');
+}
+span.move_up {
+	background-image: url('../images/admin/uparrow0.png');
+}
+a.move_down {
+	background-image: url('../images/admin/downarrow.png');
+}
+span.move_down {
+	background-image: url('../images/admin/downarrow0.png');
+}
+a.grid_false {
+	background-image: url('../images/admin/publish_x.png');
+}
+a.grid_true {
+	background-image: url('../images/admin/tick.png');
+}
+a.grid_trash {
+	background-image: url('../images/admin/icon-16-trash.png');
+}
+tr.row1 {
+	background-color: #d5c1b2;
+}
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-left: 1px solid #000000;
+}
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) 0 0 no-repeat;
+}
+label.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+label.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+a.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allowinactive {
+	background: url(../images/admin/icon-16-allowinactive.png) no-repeat;
+}
+a.icon-16-denyinactive {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+ul.acllegend li.acl-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat left;
+}
+ul.acllegend li.acl-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat left;
+}
+li.acl-editgroups,
+li.acl-resetbtn {
+	background-color: #d5c1b2;
+	border: 1px solid #000000;
+}
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	color: #054993;
+}
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	background-color: #e5d9c3;
+}
+table#acl-config {
+	border: 1px solid #000000;
+}
+table#acl-config th,
+table#acl-config td {
+	background: #d5c1b2;
+	border-bottom: 1px solid #000000;
+}
+table#acl-config th.acl-groups {
+	border-right: 1px solid #000000;
+}
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) right top no-repeat;
+}
+#permissions-sliders .tip {
+	background: #ffffff;
+	border: 1px solid #000000;
+}
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+	border: solid 0 #000000;
+	background: #ffffff;
+}
+ul#rules li .pane-sliders .panel h3.title {
+	border: solid 0 #000000;
+}
+#permissions-sliders ul#rules .pane-slider {
+	border: solid 1px #000000;
+}
+#permissions-sliders ul#rules li h3 {
+	border: solid 1px #000000;
+}
+#permissions-sliders ul#rules li h3.pane-toggler-down a {
+	border: solid 0;
+}
+#permissions-sliders ul#rules .group-kind {
+	color: #2c2c2c;
+}
+#permissions-sliders ul#rules table.group-rules {
+	border: solid 1px #000000;
+}
+#permissions-sliders ul#rules table.group-rules td {
+	border-right: solid 1px #000000;
+	border-bottom: solid 1px #000000;
+}
+#permissions-sliders ul#rules table.group-rules th {
+	background: #e5d9c3;
+	border-right: solid 1px #000000;
+	border-bottom: solid 1px #000000;
+	color: #2c2c2c;
+}
+ul#rules table.aclmodify-table {
+	border: solid 1px #000000;
+}
+ul#rules table.group-rules td label {
+	border: solid 0 #000000;
+}
+#permissions-sliders ul#rules .mypanel {
+	border: solid 0 #000000;
+}
+#permissions-sliders  ul#rules  table.group-rules td {
+	background: #ffffff;
+}
+#permissions-sliders span.level {
+	color: #000000;
+	background-image: none;
+}
+.check-0,
+table.adminlist tbody td.check-0 {
+	background-color: #ffffcf;
+}
+.check-a,
+table.adminlist tbody td.check-a {
+	background-color: #cfffda;
+}
+.check-d,
+table.adminlist tbody td.check-d {
+	background-color: #ffcfcf;
+}
+#system-message dd ul {
+	color: #2c2c2c;
+}
+#system-message dd.error ul {
+	color: #2c2c2c;
+}
+#system-message dd.message ul {
+	color: #2c2c2c;
+}
+#system-message dd.notice ul {
+	color: #2c2c2c;
+}
+#menu {
+	color: #2c2c2c;
+}
+#menu ul.dropdown-menu {
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	color: #2c2c2c;
+}
+#menu ul.dropdown-menu li.dropdown-submenu {
+	background: url(../images/j_arrow.png) no-repeat right 50%;
+}
+#menu ul.dropdown-menu li.divider {
+	margin-bottom: 0;
+	border-bottom: 1px dotted #000000;
+}
+#menu a {
+	color: #054993;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+#menu li {
+	border-right: 1px solid #000000;
+	background-color: transparent;
+}
+#menu li a:hover,
+#menu li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	color: #000000;
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+}
+#menu li ul {
+	border: 1px solid #000000;
+}
+#menu li li {
+	background-color: transparent;
+}
+#menu li.sfhover a {
+	background-color: #e5d9c3;
+}
+#menu li.sfhover li a {
+	background-color: transparent;
+}
+#menu li.sfhover li.sfhover a,
+#menu li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li.sfhover li.sfhover li a {
+	background-color: transparent;
+}
+#menu li.sfhover li.sfhover li.sfhover a,
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li li a:focus,
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#submenu {
+	border-bottom: 1px solid #000000;
+}
+#submenu li,
+#submenu span.nolink {
+	background-color: #d5c1b2;
+	background-image: -moz-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#d5c1b2),to(#d5c1b2));
+	background-image: -webkit-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: -o-linear-gradient(top,#d5c1b2,#d5c1b2);
+	background-image: linear-gradient(to bottom,#d5c1b2,#d5c1b2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd5c1b2', endColorstr='#ffd5c1b2', GradientType=0);
+	border: 1px solid #000000;
+	color: #054993;
+}
+#submenu li:hover,
+#submenu li:focus {
+	background: #e5d9c3;
+}
+#submenu li.active,
+#submenu span.nolink.active {
+	background: #ffffff;
+	border-bottom: 1px solid #ffffff;
+}
+#submenu li.active a,
+#submenu span.nolink.active {
+	color: #000;
+}
+.element-invisible {
+	margin: 0;
+	padding: 0;
+}
+div.CodeMirror-wrapping {
+	border: 1px solid #000000;
+}
+table.adminform tr.row0 {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(odd) {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(even) {
+	background-color: #d5c1b2;
+}
+ol.alternating > li:nth-child(odd) {
+	background-color: #ffffff;
+}
+ol.alternating > li:nth-child(even) {
+	background-color: #d5c1b2;
+}
+#installer-database,
+#installer-discover,
+#installer-update,
+#installer-warnings {
+	border-top: 1px solid #000000;
+}
+#installer-database p.warning {
+	background: transparent url(../images/admin/icon-16-deny.png) center left no-repeat;
+}
+#installer-database p.nowarning {
+	background: transparent url(../images/admin/icon-16-allow.png) center left no-repeat;
+}
+.input-append,
+.input-prepend {
+	font-size: 1.2em;
+}
diff --git a/core/administrator/templates/hathor/css/colour_brown_rtl.css b/core/administrator/templates/hathor/css/colour_brown_rtl.css
new file mode 100644
index 00000000..d0d15b37
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_brown_rtl.css
@@ -0,0 +1,316 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * RTL CSS file for the color standard
+ */
+
+/**
+ * Overall Styles
+ */
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat top right;
+}
+
+/**
+ * Various Styles
+ */
+div.checkin-tick {
+		background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+.pane-toggler  span {
+	background: transparent url(../images/j_arrow_left.png) right 50% no-repeat;
+}
+
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) right 50% no-repeat;
+}
+
+/**
+ * Cpanel Settings
+ */
+fieldset#filter-bar {
+	border-left: none;
+	border-right: none;
+}
+
+/**
+ * Admintable Styles
+ */
+
+table.admintable td.key,table.admintable td.paramlist_key {
+	border-left: 1px solid #e9e9e9;
+	border-right: none;
+}
+
+table.paramlist td.paramlist_description {
+	border-left: 1px solid #e9e9e9;
+	border-right: none;
+}
+
+/**
+ * Admin Form Styles
+ */
+table.adminform tr {
+	border-left: 1px solid #000000;
+	border-right: none;
+}
+
+/**
+ * Adminlist Table layout
+ */
+
+table.adminlist.modal {
+	border-right: 1px solid #000000;
+	border-left: 1px solid #000000;
+}
+
+	/* Table row styles */
+table.adminlist tbody tr td:last-child {
+	border-left: none;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+
+/**
+ * Button styling
+ */
+
+/* Button 1 Type */
+
+	/* Use this if you add images to the buttons such as directional arrows */
+
+.button1 a {
+	/* add padding if you are using the directional images */
+	/* padding: 0 6px 0 30px; */
+}
+
+	/* Button 2 Type */
+
+.button2-right .prev {
+	background-image: url(../images/j_button2_prev.png);
+	background-position: right center;
+}
+
+.button2-right.off .prev {
+	background: url(../images/j_button2_prev_off.png) no-repeat;
+}
+
+.button2-right .start {
+	background-image: url(../images/j_button2_first.png);
+	background-position: right center;
+}
+
+.button2-left .next {
+	background-image: url(../images/j_button2_next.png);
+	background-position: left center;
+}
+
+.button2-left.off .next { /* @TODO check the x position */
+	background: url(../images/j_button2_next_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .end {
+	background-image: url(../images/j_arrow_left.png);
+	background-position: left center;
+}
+
+.button2-left.off .end { /* @TODO check the x position */
+	background: url(../images/j_button2_last_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .image {
+	background: url(../images/j_button2_image.png) 100% 0 no-repeat;
+}
+
+.button2-left .readmore {
+	background: url(../images/j_button2_readmore.png) 100% 0 no-repeat;
+}
+
+.button2-left .pagebreak {
+	background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat;
+}
+
+/**
+ * Tooltips
+ */
+
+
+/**
+ * System Standard Messages
+ */
+#system-message dd.message ul {
+	background: #C3D2E5 url(../images/notice-info.png) 99.5% center no-repeat;
+}
+
+/**
+ * System Error Messages
+ */
+#system-message dd.error ul {
+	background: #E6C0C0 url(../images/notice-alert.png) 99.5% top no-repeat;
+}
+
+/**
+ * System Notice Messages
+ */
+#system-message dd.notice ul {
+	background: #EFE7B8 url(../images/notice-note.png) 99%.5 top no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+
+/**
+ * General styles
+ */
+
+.helpFrame {
+	border-right: 0 solid #222;
+	border-left: none;
+	border-top: none;
+}
+
+/* -- ACL STYLES relocated from com_users/media/grid.css ----------- */
+
+/* -- ACL PANEL STYLES  ----------- */
+
+
+/* All Tabs */
+
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-right: 1px solid #cbcbcb;
+	border-left: none;
+}
+
+/* Icons */
+
+ul.acllegend li.acl-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+ul.acllegend li.acl-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+table#acl-config th.acl-groups {
+	border-left: 1px solid #000000;
+}
+
+table#acl-config th.acl-groups {
+	text-align: right;
+}
+
+.acl-action {
+	margin: auto 0;
+}
+
+/* Icons */
+
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat right;
+}
+
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) no-repeat right;
+}
+
+/**
+* Mod_rewrite Warning
+*/
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) left top no-repeat;
+}
+
+/**
+* Permission Rules
+*/
+
+#permissions-sliders ul#rules table.group-rules td {
+    border-left: solid 1px #000000;
+    border-right: solid 0 #000000;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+    border-left: solid 1px #000000;
+    border-right: solid 0 #000000;
+}
+
+/**
+ * Menu Styling
+ */
+
+#menu ul li.node {
+	background-image: url(../images/j_arrow_left.png);
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+
+#menu a {
+	background-position: right 50%;
+}
+
+/* Installer Database */
+#installer-database p.warning {
+	background-position: center right;
+}
+
+#installer-database p.nowarning {
+	background-position: center right;
+}
diff --git a/core/administrator/templates/hathor/css/colour_highcontrast.css b/core/administrator/templates/hathor/css/colour_highcontrast.css
new file mode 100644
index 00000000..fb892500
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_highcontrast.css
@@ -0,0 +1,2155 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * Changes to use high contrast colors
+ */
+
+/**
+ * Main Colors
+ * #163365	Text background/border
+ * #1c4181  Alternative text background 1/border
+ * #1b3f7c	Alternative text background 2/border
+ * #fcff20	Text
+ * #ffffff	Highlighted Text
+ * #10254a	Main hover color/border
+ * #000000	Highlight/shadow border
+ * #a20000	Invalid Alert Color
+ * #00f800	Success Alert Color
+ * #feffbf  Disabled Menu/Protected
+ *
+ * MENU:
+ *
+ * Standard Link
+ * #1b3f7c  Link Background
+ * #ffffff	Text
+ * #10254a	Border
+ *
+ * Pressed Link
+ * #163365	Text background
+ * #ffffff	Highlighted Text
+ * #000000	Left & Top Border
+ * #1b3f7c	Right & Bottom Border
+ *
+ * Background behind the links
+ * #163365	Background
+ * #122b56	Border
+ *
+ * Inactive (Disabled)
+ * #cccccc	Text
+ *
+ * SUBMENU
+ * #163365	Active Tab Background
+ * #fcff20	Active Tab Text color
+ * #10254a	Hover background
+ * #10254a	Border
+ * #1b3f7c	"off" Tab Background
+ * #ffffff	"off" Tab Text color
+ *
+ * #1c4181	Color behind the tabs
+ */
+
+/**
+ * General styles
+ */
+body {
+	background-color: #1c4181;
+	color: #fcff20;
+}
+
+div#sbox-content {
+	background-color: #1c4181;
+	color: #fcff20;
+}
+
+h1 {
+	color: #163365;
+}
+
+a:link {
+	color: #ffffff;
+}
+
+a:visited {
+	color: #ffffff;
+}
+
+a:hover,a:focus {
+	text-decoration: underline;
+	color: #fcff20;
+}
+
+/**
+ * Overall Styles
+ */
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat;
+}
+
+#header h1.title {
+	color: #163365;
+}
+
+#footer {
+	background: #163365;
+	border: 1px solid #1b3f7c;
+}
+
+#nav {
+	background: #163365;
+	border: 1px solid #1b3f7c;
+}
+
+#content {
+	background: #1c4181;
+}
+
+#no-submenu {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+#element-box {
+	background: #163365;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #1b3f7c;
+}
+
+#element-box.login {
+	border-top: 1px solid #1b3f7c;
+}
+
+/**
+ * Status layout
+ */
+#module-status a, #module-status span {
+	color: #163365;
+}
+
+#module-status .preview {
+	background: url(../images/menu/icon-16-media.png) 3px 3px no-repeat;
+}
+
+#module-status .viewsite {
+	background: url(../images/menu/icon-16-viewsite.png) 3px 3px no-repeat;
+}
+
+#module-status .unread-messages,#module-status .no-unread-messages {
+	background: url(../images/menu/icon-16-messages.png) 3px 3px no-repeat;
+}
+
+#module-status .loggedin-users {
+	background: url(../images/menu/icon-16-user.png) 3px 3px no-repeat;
+}
+
+#module-status .backloggedin-users {
+	background: url(../images/menu/icon-16-back-user.png) 3px 3px no-repeat;
+}
+
+#module-status .multilanguage {
+	background: url(../images/menu/icon-16-language.png) 3px 3px no-repeat;
+}
+
+#module-status .logout {
+	background: url(../images/menu/icon-16-logout.png) 3px 3px no-repeat;
+}
+
+/**
+ * Various Styles
+ */
+.enabled,
+.success ,
+.allow,
+span.writable {
+	color: #00f800;
+}
+
+.disabled,
+p.error,
+.warning,
+.deny,
+span.unwritable	{
+	color: #a20000;
+}
+
+.nowarning {
+	color: #fcff20;
+}
+
+.none,.protected {
+	color: #feffbf;
+}
+
+span.note {
+	background: #163365;
+	color: #fcff20;
+}
+
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+
+/**
+ * Overlib
+ */
+.ol-foreground {
+	background-color: #fcff20;
+}
+
+.ol-background {
+	background-color: #1b3f7c;
+}
+
+.ol-textfont {
+	color: #163365;
+}
+
+.ol-captionfont {
+	color: #ffffff;
+}
+
+.ol-captionfont a {
+	color: #1b3f7c;
+}
+
+/**
+ * Subheader, toolbar, page title
+ */
+.pagetitle h2 {
+	color: #fcff20;
+}
+
+div.configuration {
+	color: #fcff20;
+	background-image: url(../images/menu/icon-16-config.png);
+	background-repeat: no-repeat;
+}
+
+div.toolbar-box {
+	border-right: 1px solid #10254a;
+	border-bottom: 1px solid #10254a;
+	border-left: 1px solid #10254a;
+	background: #163365;
+}
+
+div.toolbar-list li {
+	color: #fcff20;
+}
+
+div.toolbar-list li.divider {
+	border-right:1px dotted #1b3f7c;
+}
+
+div.toolbar-list a {
+	border: 1px solid #10254a;
+	color: #fcff20;
+	background: #1b3f7c;
+}
+
+div.toolbar-list a:hover {
+	border-left: 1px solid #000000;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	background: #163365;
+	color: #ffffff;
+}
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+.pane-sliders .title {
+	color: #fcff20;
+	border: 1px solid #10254a;
+}
+
+.pane-sliders .panel {
+	border: 1px solid #1b3f7c;
+}
+
+.pane-sliders .panel h3 {
+	background: #1c4181;
+	color: #fcff20;
+}
+
+.pane-sliders .content {
+	background: #163365;
+}
+
+.pane-sliders .adminlist {
+	border: 0 none;
+}
+
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+
+.pane-toggler  span {
+	background: transparent url(../images/j_arrow.png) 5px 50% no-repeat;
+}
+
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) 5px 50%
+		no-repeat;
+}
+
+.pane-toggler-down {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+/**
+ * Tabs
+ */
+dl.tabs dt {
+	border: 1px solid #10254a;
+	background: #1c4181;
+	color: #fcff20;
+}
+
+dl.tabs dt.open {
+	background: #163365;
+	border-bottom: 1px solid #163365;
+	color: #fcff20;
+}
+
+dl.tabs dt.open a:visited {
+	color: #fcff20;
+}
+
+div.current {
+	border: 1px solid #10254a;
+	background: #163365;
+}
+
+div.current dd {
+	padding: 0;
+	margin: 0;
+}
+
+div#menu-assignment h3 {
+	border-bottom: 1px solid #fcff20;
+}
+
+/**
+ * Login Settings
+ */
+#login-page .pagetitle h2 {
+	background-color: transparent;
+	/* background-color: #1c4181; */
+	color: #fcff20;
+}
+
+#login-page #header {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+#login-page #content {
+	background: #1c4181;
+}
+
+#login-page #lock {
+	background: url(../images/j_login_lock.png) 50% 0 no-repeat;
+}
+
+#login-page #element-box.login {
+	background: #163365;
+	border: 1px solid #10254a;
+}
+
+#form-login {
+	border: 1px solid #10254a;
+	background: #1c4181;
+}
+
+#form-login label {
+	color: #fcff20;
+}
+
+#form-login div.button1 a {
+	color: #fcff20;
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+}
+
+#form-login div.button1 a:hover,#form-login div.button1 a:focus {
+	text-decoration: none;
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/**
+ * Cpanel Settings
+ */
+.cpanel-page div#element-box {
+	background: #163365;
+	border: 1px solid #10254a;
+}
+
+#cpanel div.icon a, .cpanel div.icon a {
+	border: 1px solid #10254a;
+	background: #1b3f7c;
+	color: #fcff20;
+}
+
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus,
+.cpanel div.icon a:hover,
+.cpanel div.icon a:focus {
+	border-left: 1px solid #000000;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	background: #163365;
+	color: #ffffff;
+}
+
+/**
+ * Form Styles
+ */
+fieldset {
+	border: 3px dotted #1b3f7c;
+}
+
+legend {
+	color: #fcff20;
+}
+
+fieldset ul.checklist input:focus {
+	outline: thin dotted #333333;
+}
+
+fieldset#filter-bar {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+fieldset#filter-bar ol, fieldset#filter-bar ul {
+	border: 0;
+}
+
+fieldset#filter-bar ol li fieldset, fieldset#filter-bar ul li fieldset {
+	border: 0;
+}
+
+input,span.faux-input, select,option {
+	color: #fcff20;
+	background-color: #163365;
+	border: 1px solid #1b3f7c;
+}
+
+/* Note: these visual cues should be augmented by aria */
+.invalid {
+	color: #a20000;
+	background-color: #ffffff;
+}
+
+/* must be augmented by aria at the same time if changed dynamically by js
+	aria-invalid=true or aria-invalid=false */
+input.invalid {
+	border: 1px solid #a20000;
+}
+
+input.required {
+	background-color: #fcff20;
+	color: #163365;
+	border: 1px solid #1b3f7c;
+}
+
+input.disabled {
+	background-color: #eeeeee;
+}
+
+/* Inputs used as buttons */
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+	color: #fcff20;
+}
+
+input[type="button"]:hover, input[type="button"]:focus,
+input[type="submit"]:hover, input[type="submit"]:focus,
+input[type="reset"]:hover, input[type="reset"]:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+textarea {
+	color: #fcff20;
+	background-color: #163365;
+	border: 1px solid #1b3f7c;
+}
+
+input:focus, select:focus, textarea:focus, option:focus,
+input:hover, select:hover, textarea:hover, option:hover
+	{
+	background-color: #10254a;
+	color: #fcff20;
+}
+
+/**
+ * Option or Parameter styles
+ */
+.paramrules {
+	background: #1b3f7c;
+}
+
+span.gi {
+	color: #ffffff;
+}
+
+
+/**
+ * Admintable Styles
+ */
+table.admintable td.key,table.admintable td.paramlist_key {
+	background-color: #1c4181;
+	color: #fcff20;
+	border-bottom: 1px solid #10254a;
+	border-right: 1px solid #10254a;
+}
+
+table.paramlist td.paramlist_description {
+	background-color: #1c4181;
+	color: #fcff20;
+	border-bottom: 1px solid #10254a;
+	border-right: 1px solid #10254a;
+}
+
+/**
+ * Admin Form Styles
+ */
+fieldset.adminform {
+	border: 1px solid #1b3f7c;
+}
+
+	/* Table styles are for use with tabular data */
+table.adminform {
+	background-color: #163365;
+}
+
+table.adminform tr.row0 {
+	background-color: #163365;
+}
+
+table.adminform tr.row1 {
+	background-color: #10254a;
+}
+
+table.adminform th {
+	color: #fcff20;
+	background: #163365;
+}
+
+table.adminform tr {
+	border-bottom: 1px solid #1b3f7c;
+	border-right: 1px solid #1b3f7c;
+}
+
+/**
+ * Adminlist Table layout
+ */
+table.adminlist {
+	background-color: #163365;
+	color: #fcff20;
+}
+
+table.adminlist a {
+	color: #ffffff;
+}
+
+table.adminlist thead th {
+	background: #163365;
+	color: #fcff20;
+}
+
+/* Table row styles */
+table.adminlist tbody tr {
+	background: #163365;
+}
+
+table.adminlist tbody tr.row1 {
+	background: #163365;
+}
+
+table.adminlist tbody tr.row1 td,
+table.adminlist tbody tr.row1 th {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td,
+table.adminlist tbody tr.row0:hover th,
+table.adminlist tbody tr.row1:hover th,
+table.adminlist tbody tr.row0:focus td,
+table.adminlist tbody tr.row1:focus td,
+table.adminlist tbody tr.row0:focus th,
+table.adminlist tbody tr.row1:focus th {
+	background-color: #10254a;
+}
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-right: 1px solid #1b3f7c;
+}
+
+table.adminlist tbody tr td:last-child {
+	border-right: none;
+}
+
+table.adminlist tbody tr.row0:last-child td,
+table.adminlist tbody tr.row0:last-child th {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+table.adminlist tbody tr.row0 td,
+table.adminlist tbody tr.row0 th {
+	background: #1c4181;
+}
+
+table.adminlist tfoot tr {
+	color: #fcff20;
+}
+
+/* Table td/th styles */
+table.adminlist tfoot td,table.adminlist tfoot th {
+	background-color: #163365;
+	border-top: 1px solid #1b3f7c;
+}
+
+/**
+ * Adminlist buttons
+ */
+table.adminlist tr td.btns a {
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+	color: #fcff20;
+}
+
+table.adminlist tr td.btns a:hover, table.adminlist tr td.btns a:active, table.adminlist tr td.btns a:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+fieldset.batch {
+	background: #1c4181;
+}
+
+
+/**
+ * Button styling
+ */
+button {
+	color: #fcff20;
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+}
+
+button:hover, button:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/* Button 1 Type */
+.button1 {
+	border: none;
+	background: #1b3f7c;
+}
+
+	/* Use this if you add images to the buttons such as directional arrows */
+.button1 .next {
+	/* background: transparent url(../images/j_button1_next.png) 100% 0 no-repeat;  */
+}
+
+.button1 a {
+	border: 1px solid #10254a;
+	color: #fcff20;
+}
+
+.button1 a:hover,.button1 a:focus {
+	text-decoration: none;
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/* Button 2 Type */
+.button2-left,.button2-right {
+	border: none;
+	background: #1b3f7c;
+}
+
+.button2-left a,.button2-right a,.button2-left span,.button2-right span
+	{
+	color: #fcff20;
+	border: 1px solid #10254a;
+}
+
+/* these are inactive buttons */
+.button2-left span,.button2-right span {
+	color: #cccccc;
+	border: 1px solid #10254a;
+}
+
+.page span,.blank span {
+	color: #fcff20;
+	border: 1px solid #10254a;
+}
+
+.button2-left a:hover,.button2-right a:hover,.button2-left a:focus,.button2-right a:focus
+	{
+	text-decoration: none;
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/**
+ * Pagination styles
+ */
+
+	/* Grey out the current page number */
+.pagination .page span {
+	color: #cccccc;
+}
+
+/**
+ * Tooltips
+ */
+.tip {
+	background: #000000;
+	border: 1px solid #FFFFFF;
+}
+
+.tip-title {
+	background: url(../images/selector-arrow-std.png) no-repeat;
+}
+
+/**
+ * Calendar
+ */
+a img.calendar {
+	background: url(../images/calendar.png) no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+.jgrid span.publish {
+	background-image: url(../images/admin/tick.png);
+}
+
+.jgrid span.unpublish {
+	background-image: url(../images/admin/publish_x.png);
+}
+
+.jgrid span.archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+
+.jgrid span.trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+
+.jgrid span.default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+
+.jgrid span.notdefault {
+	background-image: url(../images/menu/icon-16-notdefault.png);
+}
+
+.jgrid span.checkedout {
+	background-image: url(../images/admin/checked_out.png);
+}
+
+.jgrid span.downarrow {
+	background-image: url(../images/admin/downarrow.png);
+}
+
+.jgrid span.downarrow_disabled {
+	background-image: url(../images/admin/downarrow0.png);
+}
+
+.jgrid span.uparrow {
+	background-image: url(../images/admin/uparrow.png);
+}
+
+.jgrid span.uparrow_disabled {
+	background-image: url(../images/admin/uparrow0.png);
+}
+
+.jgrid span.published {
+	background-image: url(../images/admin/publish_g.png);
+}
+
+.jgrid span.expired {
+	background-image: url(../images/admin/publish_r.png);
+}
+
+.jgrid span.pending	{
+	background-image: url(../images/admin/publish_y.png);
+}
+
+.jgrid span.warning	{
+	background-image: url(../images/admin/publish_y.png);
+}
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+.icon-16-archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+
+.icon-16-article {
+	background-image: url(../images/menu/icon-16-article.png);
+}
+
+.icon-16-banners {
+	background-image: url(../images/menu/icon-16-banner.png);
+}
+
+.icon-16-banners-clients {
+	background-image: url(../images/menu/icon-16-banner-client.png);
+}
+
+.icon-16-banners-tracks {
+	background-image: url(../images/menu/icon-16-banner-tracks.png);
+}
+
+.icon-16-banners-cat {
+	background-image: url(../images/menu/icon-16-banner-categories.png);
+}
+
+.icon-16-category {
+	background-image: url(../images/menu/icon-16-category.png);
+}
+
+.icon-16-checkin {
+	background-image: url(../images/menu/icon-16-checkin.png);
+}
+
+.icon-16-clear {
+	background-image: url(../images/menu/icon-16-clear.png);
+}
+
+.icon-16-component {
+	background-image: url(../images/menu/icon-16-component.png);
+}
+
+.icon-16-config {
+	background-image: url(../images/menu/icon-16-config.png);
+}
+
+.icon-16-contact {
+	background-image: url(../images/menu/icon-16-contacts.png);
+}
+
+.icon-16-contact-cat {
+	background-image: url(../images/menu/icon-16-contacts-categories.png);
+}
+
+.icon-16-content {
+	background-image: url(../images/menu/icon-16-content.png);
+}
+
+.icon-16-cpanel {
+	background-image: url(../images/menu/icon-16-cpanel.png);
+}
+
+.icon-16-default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+
+.icon-16-featured {
+	background-image: url(../images/menu/icon-16-featured.png);
+}
+
+.icon-16-groups {
+	background-image: url(../images/menu/icon-16-groups.png);
+}
+
+.icon-16-help {
+	background-image: url(../images/menu/icon-16-help.png);
+}
+
+.icon-16-help-this {
+	background-image: url(../images/menu/icon-16-help-this.png);
+}
+
+.icon-16-help-forum {
+	background-image: url(../images/menu/icon-16-help-forum.png);
+}
+
+.icon-16-help-docs {
+	background-image: url(../images/menu/icon-16-help-docs.png);
+}
+
+.icon-16-help-jed {
+	background-image: url(../images/menu/icon-16-help-jed.png);
+}
+
+.icon-16-help-jrd {
+	background-image: url(../images/menu/icon-16-help-jrd.png);
+}
+
+.icon-16-help-community {
+	background-image: url(../images/menu/icon-16-help-community.png);
+}
+
+.icon-16-help-security {
+	background-image: url(../images/menu/icon-16-help-security.png);
+}
+
+.icon-16-help-dev {
+	background-image: url(../images/menu/icon-16-help-dev.png);
+}
+
+.icon-16-help-shop {
+	background-image: url(../images/menu/icon-16-help-shop.png);
+}
+
+.icon-16-info {
+	background-image: url(../images/menu/icon-16-info.png);
+}
+
+.icon-16-install {
+	background-image: url(../images/menu/icon-16-install.png);
+}
+
+.icon-16-joomlaupdate {
+	background-image: url(../images/menu/icon-16-install.png);
+}
+
+.icon-16-language {
+	background-image: url(../images/menu/icon-16-language.png);
+}
+
+.icon-16-levels {
+	background-image: url(../images/menu/icon-16-levels.png);
+}
+
+.icon-16-logout {
+	background-image: url(../images/menu/icon-16-logout.png);
+}
+
+.icon-16-maintenance {
+	background-image: url(../images/menu/icon-16-maintenance.png);
+}
+
+.icon-16-massmail {
+	background-image: url(../images/menu/icon-16-massmail.png);
+}
+
+.icon-16-media {
+	background-image: url(../images/menu/icon-16-media.png);
+}
+
+.icon-16-menu {
+	background-image: url(../images/menu/icon-16-menu.png);
+}
+
+.icon-16-menumgr {
+	background-image: url(../images/menu/icon-16-menumgr.png);
+}
+
+.icon-16-messages {
+	background-image: url(../images/menu/icon-16-messaging.png);
+}
+
+.icon-16-messages-add {
+	background-image: url(../images/menu/icon-16-new-privatemessage.png);
+}
+
+.icon-16-messages-read {
+	background-image: url(../images/menu/icon-16-messages.png);
+}
+
+.icon-16-module {
+	background-image: url(../images/menu/icon-16-module.png);
+}
+
+/* .icon-16-new 		{ background-image: url(../images/menu/icon-16-new.png); } */
+.icon-16-newarticle {
+	background-image: url(../images/menu/icon-16-newarticle.png);
+}
+
+.icon-16-newcategory {
+	background-image: url(../images/menu/icon-16-newcategory.png);
+}
+
+.icon-16-newgroup {
+	background-image: url(../images/menu/icon-16-newgroup.png);
+}
+
+.icon-16-newlevel {
+	background-image: url(../images/menu/icon-16-newlevel.png);
+}
+
+.icon-16-newuser {
+	background-image: url(../images/menu/icon-16-newuser.png);
+}
+
+.icon-16-plugin {
+	background-image: url(../images/menu/icon-16-plugin.png);
+}
+
+.icon-16-profile {
+	background-image: url(../images/menu/icon-16-user.png);
+}
+
+.icon-16-purge {
+	background-image: url(../images/menu/icon-16-purge.png);
+}
+
+.icon-16-readmess {
+	background-image: url(../images/menu/icon-16-readmess.png);
+}
+
+.icon-16-section {
+	background-image: url(../images/menu/icon-16-section.png);
+}
+
+.icon-16-static {
+	background-image: url(../images/menu/icon-16-static.png);
+}
+
+.icon-16-stats {
+	background-image: url(../images/menu/icon-16-stats.png);
+}
+
+.icon-16-themes {
+	background-image: url(../images/menu/icon-16-themes.png);
+}
+
+.icon-16-trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+
+.icon-16-user {
+	background-image: url(../images/menu/icon-16-user.png);
+}
+
+.icon-16-user-note {
+	background-image: url(../images/menu/icon-16-user-note.png);
+}
+
+.icon-16-delete {
+	background-image: url(../images/menu/icon-16-delete.png);
+}
+
+.icon-16-help-trans {
+	background-image: url(../images/menu/icon-16-help-trans.png);
+}
+
+.icon-16-newsfeeds {
+	background-image: url(../images/menu/icon-16-newsfeeds.png);
+}
+
+.icon-16-newsfeeds-cat {
+	background-image: url(../images/menu/icon-16-newsfeeds-cat.png);
+}
+
+.icon-16-redirect {
+	background-image: url(../images/menu/icon-16-redirect.png);
+}
+
+.icon-16-search {
+	background-image: url(../images/menu/icon-16-search.png);
+}
+
+.icon-16-finder {
+	background-image: url(../images/menu/icon-16-search.png);
+}
+
+.icon-16-weblinks {
+	background-image: url(../images/menu/icon-16-links.png);
+}
+
+.icon-16-weblinks-cat {
+	background-image: url(../images/menu/icon-16-links-cat.png);
+}
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+.icon-32-send {
+	background-image: url(../images/toolbar/icon-32-send.png);
+}
+
+.icon-32-delete {
+	background-image: url(../images/toolbar/icon-32-delete.png);
+}
+
+.icon-32-help {
+	background-image: url(../images/toolbar/icon-32-help.png);
+}
+
+.icon-32-cancel {
+	background-image: url(../images/toolbar/icon-32-cancel.png);
+}
+
+.icon-32-checkin {
+	background-image: url(../images/toolbar/icon-32-checkin.png);
+}
+
+.icon-32-options{
+	background-image: url(../images/toolbar/icon-32-config.png);
+}
+
+.icon-32-apply {
+	background-image: url(../images/toolbar/icon-32-apply.png);
+}
+
+.icon-32-back {
+	background-image: url(../images/toolbar/icon-32-back.png);
+}
+
+.icon-32-forward {
+	background-image: url(../images/toolbar/icon-32-forward.png);
+}
+
+.icon-32-save {
+	background-image: url(../images/toolbar/icon-32-save.png);
+}
+
+.icon-32-edit {
+	background-image: url(../images/toolbar/icon-32-edit.png);
+}
+
+.icon-32-copy {
+	background-image: url(../images/toolbar/icon-32-copy.png);
+}
+
+.icon-32-move {
+	background-image: url(../images/toolbar/icon-32-move.png);
+}
+
+.icon-32-new {
+	background-image: url(../images/toolbar/icon-32-new.png);
+}
+
+.icon-32-upload {
+	background-image: url(../images/toolbar/icon-32-upload.png);
+}
+
+.icon-32-assign {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+
+.icon-32-html {
+	background-image: url(../images/toolbar/icon-32-html.png);
+}
+
+.icon-32-css {
+	background-image: url(../images/toolbar/icon-32-css.png);
+}
+
+.icon-32-menus {
+	background-image: url(../images/toolbar/icon-32-menu.png);
+}
+
+.icon-32-publish {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+
+.icon-32-unblock {
+	background-image: url(../images/toolbar/icon-32-unblock.png);
+}
+
+.icon-32-unpublish {
+	background-image: url(../images/toolbar/icon-32-unpublish.png);
+}
+
+.icon-32-restore {
+	background-image: url(../images/toolbar/icon-32-revert.png);
+}
+
+.icon-32-trash {
+	background-image: url(../images/toolbar/icon-32-trash.png);
+}
+
+.icon-32-archive {
+	background-image: url(../images/toolbar/icon-32-archive.png);
+}
+
+.icon-32-unarchive {
+	background-image: url(../images/toolbar/icon-32-unarchive.png);
+}
+
+.icon-32-preview {
+	background-image: url(../images/toolbar/icon-32-preview.png);
+}
+
+.icon-32-default {
+	background-image: url(../images/toolbar/icon-32-default.png);
+}
+
+.icon-32-refresh {
+	background-image: url(../images/toolbar/icon-32-refresh.png);
+}
+
+.icon-32-save-new {
+	background-image: url(../images/toolbar/icon-32-save-new.png);
+}
+
+.icon-32-save-copy {
+	background-image: url(../images/toolbar/icon-32-save-copy.png);
+}
+
+.icon-32-error {
+	background-image: url(../images/toolbar/icon-32-error.png);
+}
+
+.icon-32-new-style {
+	background-image: url(../images/toolbar/icon-32-new-style.png);
+}
+
+.icon-32-delete-style {
+	background-image: url(../images/toolbar/icon-32-delete-style.png);
+}
+
+.icon-32-purge {
+	background-image: url(../images/toolbar/icon-32-purge.png);
+}
+
+.icon-32-remove {
+	background-image: url(../images/toolbar/icon-32-remove.png);
+}
+
+.icon-32-featured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+}
+
+.icon-32-unfeatured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+	background-position: 0% 100%;
+}
+
+.icon-32-export {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+
+.icon-32-stats {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+
+.icon-32-print {
+	background-image: url(../images/toolbar/icon-32-print.png);
+}
+
+.icon-32-batch {
+	background-image: url(../images/toolbar/icon-32-batch.png);
+}
+
+.icon-32-envelope {
+	background-image: url(../images/toolbar/icon-32-messaging.png);
+}
+.icon-32-download {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+
+.icon-32-bars {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+.icon-48-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-generic {
+	background-image: url(../images/header/icon-48-generic.png);
+}
+
+.icon-48-banners {
+	background-image: url(../images/header/icon-48-banner.png);
+}
+
+.icon-48-banners-categories {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+
+.icon-48-banners-category-edit {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+
+.icon-48-banners-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-banners-clients {
+	background-image: url(../images/header/icon-48-banner-client.png);
+}
+
+.icon-48-banners-tracks {
+	background-image: url(../images/header/icon-48-banner-tracks.png);
+}
+
+.icon-48-checkin {
+	background-image: url(../images/header/icon-48-checkin.png);
+}
+
+.icon-48-clear {
+	background-image: url(../images/header/icon-48-clear.png);
+}
+
+.icon-48-contact {
+	background-image: url(../images/header/icon-48-contacts.png);
+}
+
+.icon-48-contact-categories {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+
+.icon-48-contact-category-edit {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+
+.icon-48-contact-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-purge {
+	background-image: url(../images/header/icon-48-purge.png);
+}
+
+.icon-48-cpanel {
+	background-image: url(../images/header/icon-48-cpanel.png);
+}
+
+.icon-48-config {
+	background-image: url(../images/header/icon-48-config.png);
+}
+
+.icon-48-groups {
+	background-image: url(../images/header/icon-48-groups.png);
+}
+
+.icon-48-groups-add {
+	background-image: url(../images/header/icon-48-groups-add.png);
+}
+
+.icon-48-levels {
+	background-image: url(../images/header/icon-48-levels.png);
+}
+
+.icon-48-levels-add {
+	background-image: url(../images/header/icon-48-levels-add.png);
+}
+
+.icon-48-module {
+	background-image: url(../images/header/icon-48-module.png);
+}
+
+.icon-48-menu {
+	background-image: url(../images/header/icon-48-menu.png);
+}
+
+.icon-48-menu-add {
+	background-image: url(../images/header/icon-48-menu-add.png);
+}
+
+.icon-48-menumgr {
+	background-image: url(../images/header/icon-48-menumgr.png);
+}
+
+.icon-48-trash {
+	background-image: url(../images/header/icon-48-trash.png);
+}
+
+.icon-48-user {
+	background-image: url(../images/header/icon-48-user.png);
+}
+
+.icon-48-user-add {
+	background-image: url(../images/header/icon-48-user-add.png);
+}
+
+.icon-48-user-edit {
+	background-image: url(../images/header/icon-48-user-edit.png);
+}
+
+.icon-48-user-profile {
+	background-image: url(../images/header/icon-48-user-profile.png);
+}
+
+.icon-48-inbox {
+	background-image: url(../images/header/icon-48-inbox.png);
+}
+
+.icon-48-new-privatemessage {
+	background-image: url(../images/header/icon-48-new-privatemessage.png);
+}
+
+.icon-48-msgconfig {
+	background-image: url(../images/header/icon-48-message_config.png);
+}
+
+.icon-48-langmanager {
+	background-image: url(../images/header/icon-48-language.png);
+}
+
+.icon-48-mediamanager {
+	background-image: url(../images/header/icon-48-media.png);
+}
+
+.icon-48-plugin {
+	background-image: url(../images/header/icon-48-plugin.png);
+}
+
+.icon-48-help_header {
+	background-image: url(../images/header/icon-48-help_header.png);
+}
+
+.icon-48-impressions {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+
+.icon-48-browser {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+
+.icon-48-searchtext {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+
+.icon-48-thememanager {
+	background-image: url(../images/header/icon-48-themes.png);
+}
+
+.icon-48-assoc {
+	background-image: url(../images/header/icon-48-assoc.png);
+}
+
+.icon-48-writemess {
+	background-image: url(../images/header/icon-48-writemess.png);
+}
+
+.icon-48-featured {
+	background-image: url(../images/header/icon-48-featured.png);
+}
+
+.icon-48-sections {
+	background-image: url(../images/header/icon-48-section.png);
+}
+
+.icon-48-article-add {
+	background-image: url(../images/header/icon-48-article-add.png);
+}
+
+.icon-48-article-edit {
+	background-image: url(../images/header/icon-48-article-edit.png);
+}
+
+.icon-48-article {
+	background-image: url(../images/header/icon-48-article.png);
+}
+
+.icon-48-content-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-content-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-content-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-install {
+	background-image: url(../images/header/icon-48-extension.png);
+}
+
+.icon-48-dbbackup {
+	background-image: url(../images/header/icon-48-backup.png);
+}
+
+.icon-48-dbrestore {
+	background-image: url(../images/header/icon-48-dbrestore.png);
+}
+
+.icon-48-dbquery {
+	background-image: url(../images/header/icon-48-query.png);
+}
+
+.icon-48-systeminfo {
+	background-image: url(../images/header/icon-48-info.png);
+}
+
+.icon-48-massmail {
+	background-image: url(../images/header/icon-48-massmail.png);
+}
+
+.icon-48-redirect {
+	background-image: url(../images/header/icon-48-redirect.png);
+}
+
+.icon-48-search	{
+	background-image: url(../images/header/icon-48-search.png);
+}
+
+.icon-48-finder	{
+	background-image: url(../images/header/icon-48-search.png);
+}
+
+.icon-48-newsfeeds {
+	background-image: url(../images/header/icon-48-newsfeeds.png);
+}
+
+.icon-48-newsfeeds-categories {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+
+.icon-48-newsfeeds-category-edit {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+
+.icon-48-newsfeeds-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-weblinks {
+	background-image: url(../images/header/icon-48-links.png);
+}
+
+.icon-48-weblinks-categories {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+
+.icon-48-weblinks-category-edit {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+
+.icon-48-weblinks-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-tags {
+	background-image: url(../images/header/icon-48-tags.png);
+}
+
+/**
+ * General styles
+ */
+div.message {
+	border: 1px solid #1b3f7c;
+	color: #333;
+}
+
+.helpFrame {
+	border-left: 0 solid #1b3f7c;
+	border-right: none;
+	border-top: none;
+	border-bottom: none;
+}
+
+/**
+ * Override mootree.css styles
+ * media/system/css/mootree.css
+ */
+.mooTree_selected	 {
+	background-color: #10254a;
+}
+
+/**
+ * Modal Styles
+ */
+dl.menu_type dt {
+	border-bottom: 1px solid #1b3f7c;
+}
+
+ul#new-modules-list {
+	border-top: 1px solid #1b3f7c;
+}
+
+/**
+ * Override mediamanager.css styles
+ * administrator/components/com_media/assets/mediamanager.css
+ */
+#folderview input#folderpath {
+	width: 65%;
+	color: #fcff20;
+	background-color: #163365;
+	border: 1px solid #1b3f7c;
+}
+
+.upload-queue .queue-loader {
+	background-color: #fcff20;
+	color: #163365;
+	border: 1px inset #fcff20;
+}
+
+.upload-queue .queue-subloader {
+	background-color: #1b3f7c;
+	color: #fcff20;
+}
+
+/**
+ * User Accessibility
+ */
+
+	/* Skip to Content Visual Styling */
+#skiplinkholder a, #skiplinkholder a:link, #skiplinkholder a:visited {
+	color: #163365;
+	background: #fcff20;
+}
+
+/**
+ * Admin Form Styles
+ */
+fieldset.panelform {
+	border: none 0;
+}
+
+/**
+ * ACL STYLES relocated from com_users/media/grid.css
+ */
+a.move_up {
+	background-image: url('../images/admin/uparrow.png');
+}
+
+span.move_up {
+	background-image: url('../images/admin/uparrow0.png');
+}
+
+a.move_down {
+	background-image: url('../images/admin/downarrow.png');
+}
+
+span.move_down {
+	background-image: url('../images/admin/downarrow0.png');
+}
+
+a.grid_false {
+	background-image: url('../images/admin/publish_x.png');
+}
+
+a.grid_true {
+	background-image: url('../images/admin/tick.png');
+}
+
+a.grid_trash {
+	background-image: url('../images/admin/icon-16-trash.png');
+}
+
+/**
+ * ACL PANEL STYLES
+ */
+
+/* All Tabs */
+
+tr.row1 {
+	background-color: #1c4181;
+}
+
+/* Summary Tab */
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-left: 1px solid #cbcbcb;
+}
+
+/* Icons */
+
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) 0 0 no-repeat;
+}
+
+label.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+
+label.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat ;
+}
+a.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat ;
+}
+a.icon-16-allowinactive {
+	background: url(../images/admin/icon-16-allowinactive.png) no-repeat ;
+}
+a.icon-16-denyinactive {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat ;
+}
+
+/* ACL footer/legend */
+
+ul.acllegend li.acl-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat left;
+}
+
+ul.acllegend li.acl-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat left;
+}
+
+li.acl-editgroups,
+li.acl-resetbtn {
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+}
+
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	color: #fcff20
+}
+
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/* ACL Config --------- */
+table#acl-config {
+	border: 1px solid #10254a;
+	background: #1c4181;
+}
+
+table#acl-config th,
+table#acl-config td {
+	background: #1c4181;
+	border-bottom: 1px solid #10254a;
+	border-top: none;
+	border-left: none;
+	border-right: none;
+}
+
+table#acl-config th.acl-groups {
+	border-right: 1px solid #10254a;
+}
+
+/**
+* Mod_rewrite Warning
+*/
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) right top no-repeat;
+}
+
+/**
+* Options modal- config
+*/
+
+/* *
+* Permission Rules
+*/
+
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+    border:solid 0 #1b3f7c;
+    background:#163365;
+}
+
+ul#rules li .pane-sliders .panel h3.title {
+	border:solid 0 #1b3f7c;
+}
+
+#permissions-sliders ul#rules .pane-slider {
+	border:solid 1px #1b3f7c;
+}
+
+#permissions-sliders ul#rules li h3 {
+	background:#1c4181;
+	border: 1px solid #1b3f7c;
+}
+
+#permissions-sliders ul#rules li h3.pane-toggler-down a {
+	border:solid 0;
+}
+
+#permissions-sliders ul#rules .group-kind {
+	color:#fcff20;
+}
+
+#permissions-sliders ul#rules table.group-rules td {
+    border-right:solid 1px #1b3f7c;
+    border-bottom:solid 1px #1b3f7c;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+    background: #10254a;
+    border-right:solid 1px #1b3f7c;
+    border-bottom:solid 1px #1b3f7c;
+    color:#fcff20;
+}
+
+ul#rules table.aclmodify-table {
+	border:solid 1px #fcff20;
+}
+
+ul#rules table.group-rules td label {
+	border:solid 0 #1b3f7c;
+}
+
+#permissions-sliders ul#rules .mypanel {
+	border:solid 0 #1b3f7c;
+}
+
+#permissions-sliders  ul#rules  table.group-rules td {
+   background: #163365;
+}
+
+#permissions-sliders span.level {
+	color:#ffffff;
+	background-image:none;
+}
+
+/*
+ * Debug styles
+ */
+.check-0,
+table.adminlist tbody td.check-0,
+table.adminlist tbody tr:hover td.check-0 {
+	background-color: #FFFFCF;
+	color: #163365;
+}
+
+.check-a,
+table.adminlist tbody td.check-a,
+table.adminlist tbody tr:hover td.check-a {
+	background-color: #CFFFDA;
+	color: #163365;
+}
+
+.check-d,
+table.adminlist tbody td.check-d,
+table.adminlist tbody tr:hover td.check-d {
+	background-color: #FFCFCF;
+	color: #163365;
+}
+
+/**
+ * System Messages
+ */
+
+#system-message dd ul {
+	color: #fcff20;
+	border-top: 3px solid #84A7DB;
+	border-bottom: 3px solid #84A7DB;
+}
+
+#system-message dd.error ul {
+	color: #fcff20;
+	background: #1c4181 url(../images/notice-alert.png) 4px top no-repeat;
+	border-top: 3px solid #a20000;
+	border-bottom: 3px solid #a20000;
+}
+
+#system-message dd.message ul {
+	color: #fcff20;
+	background: #10254a url(../images/notice-info.png) 4px center no-repeat;
+	border-top: 3px solid #EFE7B8;
+	border-bottom: 3px solid #EFE7B8;
+}
+
+#system-message dd.notice ul {
+	color: #fcff20;
+	background: #10254a url(../images/notice-note.png) 4px top no-repeat;
+	border-top: 3px solid #F0DC7E;
+	border-bottom: 3px solid #F0DC7E;
+}
+
+/** CSS file for Accessible Admin Menu
+ * based on Matt Carrolls' son of suckerfish
+ * with javascript by Bill Tomczak
+ */
+
+	/* Note: set up the font-size on the id and used 100% on the elements.
+	If ul/li/a are different ems, then the shifting back via non-js keyboard
+	doesn't work properly */
+
+/**
+ * Menu Styling
+ */
+#menu { /* this is on the main ul */
+	color: #ffffff;
+}
+
+#menu ul { /* all lists */
+	background-color: #163365;
+	color: #ffffff;
+}
+
+#menu ul li.node {
+	background: #163365 url(../images/j_arrow.png) no-repeat right 50%;
+}
+
+#menu a {
+	color: #ffffff;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+	background-color: #1b3f7c;
+}
+
+#menu li { /* all list items */
+	background-color: #163365;
+	border-right: 1px solid #000000;
+}
+
+#menu li a {
+	border: 1px solid #10254a;
+}
+
+#menu li li a {
+	border: 1px solid #10254a;
+}
+
+#menu li a:hover,
+#menu li a:active,
+#menu li a:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #ffffff;
+}
+
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	color: #feffbf;
+	background-color: #1b3f7c;
+	border-top: 1px solid #163365;
+	border-right: 1px solid #10254a;
+	border-bottom: 1px solid #163365;
+	border-left: 1px solid #10254a;
+}
+
+#menu li ul { /* second-level lists */
+	border-top: 1px solid #10254a;
+	border-bottom: 2px solid #10254a;
+}
+
+#menu li li { /* second-level row */
+	background-color: #163365;
+}
+
+#menu li:hover ul,#menu li.sfhover ul {
+	/* lists nested under hovered list items */
+	margin-left: 0;
+	border-left: 1px solid #122b56;
+	border-right: 1px solid #122b56;
+}
+
+#menu li li:hover ul,#menu li li.sfhover ul {
+	border-left: 1px solid #122b56;
+	border-right: 1px solid #122b56;
+}
+
+/**
+ * Styling parents
+ */
+
+ 	/* 1 level - sfhover */
+#menu li.sfhover a {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+	/* 2 level - normal */
+#menu li.sfhover li a { /* background-color: #f0f0f0; */
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+	color: #ffffff;
+}
+
+	/* 2 level - hover */
+#menu li.sfhover li.sfhover a,#menu li li a:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+	/* 3 level - normal */
+#menu li.sfhover li.sfhover li a {
+	background-color: #1b3f7c;
+	border: 1px solid #10254a;
+	color: #ffffff;
+}
+
+	/* 3 level - hover */
+#menu li.sfhover li.sfhover li.sfhover a {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #fcff20;
+}
+
+/* bring back the focus elements into view */
+#menu li li a:focus, #menu li li li a:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #ffffff;
+}
+
+#menu li li li a:focus {
+	background-color: #163365;
+	border-top: 1px solid #000000;
+	border-right: 1px solid #1b3f7c;
+	border-bottom: 1px solid #1b3f7c;
+	border-left: 1px solid #000000;
+	color: #ffffff;
+}
+
+/**
+ * Submenu styling
+ */
+#submenu {
+	border-bottom: 1px solid #10254a;
+	/* border-bottom plus padding-bottom is the technique */
+	/* This is the background befind the tabs */
+	background: #1c4181;
+}
+
+#submenu a, #submenu span.nolink {
+	background: #1b3f7c;
+	border: 1px solid #10254a;
+	color: #ffffff;
+}
+
+#submenu a:hover, #submenu a:focus {
+	background-color: #10254a;
+}
+
+#submenu a.active, #submenu span.nolink.active {
+	background: #163365;
+	border-bottom: 1px solid #163365;
+	color: #fcff20;
+}
+
+/**
+ * Webkit fixes
+ **/
+input:-webkit-autofill {
+	background-color: #163365 !important;
+}
+
+/* -- Codemirror Editor  ----------- */
+div.editor-border, div.CodeMirror-wrapping {
+	border: 1px solid #163365;
+	background-color: #ffffff;
+}
+
+/* User Notes */
+div.unotes h1 {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(odd) { background-color: #163365; }
+ul.alternating > li:nth-child(even) { background-color: #10254a; }
+ol.alternating > li:nth-child(odd) { background-color: #163365; }
+ol.alternating > li:nth-child(even) { background-color: #10254a;}
+
+/* Installer Database */
+#installer-database, #installer-discover, #installer-update, #installer-warnings {
+	border-top: 1px solid #1b3f7c;
+}
+#installer-database p.warning {
+	background: transparent url(../images/admin/icon-16-deny.png) center left no-repeat;
+}
+
+#installer-database p.nowarning {
+	background: transparent url(../images/admin/icon-16-allow.png) center left no-repeat;
+}
diff --git a/core/administrator/templates/hathor/css/colour_highcontrast_rtl.css b/core/administrator/templates/hathor/css/colour_highcontrast_rtl.css
new file mode 100644
index 00000000..abf3f1c7
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_highcontrast_rtl.css
@@ -0,0 +1,422 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * RTL CSS file for the color standard
+ */
+
+/**
+ * Overall Styles
+ */
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat top right;
+}
+
+#element-box {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #1b3f7c;
+}
+
+/**
+ * Various Styles
+ */
+
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+
+/**
+ * Subheader, toolbar, page title
+ */
+
+div.toolbar-box {
+	border-left: 1px solid #10254a;
+	border-right: 1px solid #10254a;
+}
+
+div.toolbar-list li.divider {
+	border-left:1px dotted #1b3f7c;
+	border-right:none;
+}
+
+div.toolbar-list a:hover {
+	border-right: 1px solid #000000;
+	border-left: 1px solid #1b3f7c;
+}
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+.pane-toggler  span {
+	background: transparent url(../images/j_arrow_left.png) right 50% no-repeat;
+}
+
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) right 50% no-repeat;
+}
+
+/**
+ * Cpanel Settings
+ */
+
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus {
+	border-right: 1px solid #000000;
+	border-left: 1px solid #1b3f7c;
+}
+
+
+fieldset#filter-bar {
+	border-left: none;
+	border-right: none;
+}
+
+/**
+ * Admintable Styles
+ */
+
+table.admintable td.key,table.admintable td.paramlist_key {
+	border-left: 1px solid #10254a;
+	border-right: none;
+}
+
+table.paramlist td.paramlist_description {
+	border-left: 1px solid #10254a;
+	border-right: none;
+}
+
+/**
+ * Admin Form Styles
+ */
+table.adminform tr {
+	border-left: 1px solid #1b3f7c;
+	border-right: none;
+}
+
+/**
+ * Adminlist Table layout
+ */
+
+table.adminlist.modal {
+	border-right: 1px solid #1b3f7c;
+	border-left: 1px solid #1b3f7c;
+}
+
+
+	/* Table row styles */
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-left: 1px solid #1b3f7c;
+	border-right: none;
+}
+
+table.adminlist tbody tr td:last-child {
+	border-left: none;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+
+/**
+ * Button styling
+ */
+
+/* Button 1 Type */
+
+	/* Use this if you add images to the buttons such as directional arrows */
+
+.button1 a {
+	/* add padding if you are using the directional images */
+	/* padding: 0 6px 0 30px; */
+}
+
+	/* Button 2 Type */
+
+.button2-right .prev {
+	background-image: url(../images/j_button2_prev.png);
+	background-position: right center;
+}
+
+.button2-right.off .prev {
+	background: url(../images/j_button2_prev_off.png) no-repeat;
+}
+
+.button2-right .start {
+	background-image: url(../images/j_button2_first.png);
+	background-position: right center;
+}
+
+.button2-left .next {
+	background-image: url(../images/j_button2_next.png);
+	background-position: left center;
+}
+
+.button2-left.off .next { /* @TODO check the x position */
+	background: url(../images/j_button2_next_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .end {
+	background-image: url(../images/j_arrow_left.png);
+	background-position: left center;
+}
+
+.button2-left.off .end { /* @TODO check the x position */
+	background: url(../images/j_button2_last_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .image {
+	background: url(../images/j_button2_image.png) 100% 0 no-repeat;
+}
+
+.button2-left .readmore {
+	background: url(../images/j_button2_readmore.png) 100% 0 no-repeat;
+}
+
+.button2-left .pagebreak {
+	background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat;
+}
+
+/**
+ * Tooltips
+ */
+
+
+/**
+ * System Standard Messages
+ */
+#system-message dd.message ul {
+	background: #10254a url(../images/notice-info.png) 99.5% center no-repeat;
+}
+
+/**
+ * System Error Messages
+ */
+#system-message dd.error ul {
+	background: #1c4181 url(../images/notice-alert.png) 99.5% top no-repeat;
+}
+
+/**
+ * System Notice Messages
+ */
+#system-message dd.notice ul {
+	background: #10254a url(../images/notice-note.png) 99%.5 top no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+
+/**
+ * General styles
+ */
+
+.helpFrame {
+	border-right: 0 solid #1b3f7c;
+	border-left: none;
+	border-top: none;
+}
+
+/* -- ACL STYLES relocated from com_users/media/grid.css ----------- */
+
+/* -- ACL PANEL STYLES  ----------- */
+
+
+/* All Tabs */
+
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-right: 1px solid #cbcbcb;
+	border-left: none;
+}
+
+/* Icons */
+
+ul.acllegend li.acl-allowed {
+	background:url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+ul.acllegend li.acl-denied {
+	background:url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+table#acl-config th.acl-groups {
+	border-left: 1px solid #c7c8b2;
+}
+
+table#acl-config th.acl-groups {
+	text-align: right;
+}
+
+.acl-action {
+	margin: auto 0;
+}
+
+/* Icons */
+
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat right;
+}
+
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) no-repeat right;
+}
+
+/**
+* Mod_rewrite Warning
+*/
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) left top no-repeat;
+}
+
+/**
+* Modal S-Box overrides
+*/
+
+#sbox-window {
+	text-align:right;
+}
+
+/* *
+* Permission Rules
+*/
+
+#permissions-sliders ul#rules table.group-rules td {
+    border-left:solid 1px #1b3f7c;
+    border-right:solid 0 #1b3f7c;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+    border-left:solid 1px #1b3f7c;
+    border-right:solid 0 #1b3f7c;
+}
+
+/**
+ * Menu Styling
+ */
+
+#menu ul li.node {
+	background-image: url(../images/j_arrow_left.png);
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+
+#menu a {
+	background-position: right 50%;
+}
+
+#menu li {
+	border-left: 1px solid #000000;
+}
+
+#menu li a:hover, #menu li a:active, #menu li a:focus {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #000000;
+}
+
+#menu li.disabled a:hover,#menu li.disabled a:focus,#menu li.disabled a
+	{
+	border-right: 1px solid #10254a;
+	border-left: 1px solid #10254a;
+}
+
+#menu li:hover ul,#menu li.sfhover ul {
+	/* lists nested under hovered list items */
+	border-right: 1px solid #122b56;
+	border-left: 1px solid #122b56;
+}
+
+#menu li li:hover ul,#menu li li.sfhover ul {
+	border-right: 1px solid #122b56;
+	border-left: 1px solid #122b56;
+}
+
+/**
+ * Styling parents
+ */
+
+ 	/* 1 level - sfhover */
+#menu li.sfhover a {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #000000;
+}
+
+	/* 2 level - hover */
+#menu li.sfhover li.sfhover a,#menu li li a:focus {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #000000;
+}
+
+	/* 3 level - hover */
+#menu li.sfhover li.sfhover li.sfhover a,#menu li li li a:focus {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #000000;
+}
+
+/* bring back the focus elements into view */
+#menu li li a:focus {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #000000;
+}
+
+#menu li li li a:focus {
+	border-left: 1px solid #1b3f7c;
+	border-right: 1px solid #000000;
+}
+
+/* Installer Database */
+#installer-database p.warning {
+	background-position: center right;
+}
+
+#installer-database p.nowarning {
+	background-position: center right;
+}
diff --git a/core/administrator/templates/hathor/css/colour_standard.css b/core/administrator/templates/hathor/css/colour_standard.css
new file mode 100644
index 00000000..f011a28c
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_standard.css
@@ -0,0 +1,1802 @@
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 25px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+#form-login .btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 14px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 15px;
+	*line-height: 15px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#ffffff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#ffffff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+#form-login .btn:hover,
+#form-login .btn:focus,
+#form-login .btn:active,
+#form-login .btn.active,
+#form-login .btn.disabled,
+#form-login .btn[disabled] {
+	color: #333333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+#form-login .btn:active,
+#form-login .btn.active {
+	background-color: #cccccc \9;
+}
+#form-login .btn:first-child {
+	*margin-left: 0;
+}
+#form-login .btn:hover {
+	color: #333333;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+#form-login .btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+#form-login .btn.active,
+#form-login .btn:active {
+	background-color: #e6e6e6;
+	background-color: #d9d9d9 \9;
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+#form-login .btn.disabled,
+#form-login .btn[disabled] {
+	cursor: default;
+	background-color: #e6e6e6;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 9px 14px;
+	font-size: 15px;
+	line-height: normal;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.btn-large [class^="icon-"] {
+	margin-top: 2px;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+.input-append,
+.input-prepend {
+	margin-bottom: 5px;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	font-size: 13px;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 15px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 15px;
+	text-align: center;
+	text-shadow: 0 1px 0 #ffffff;
+	background-color: #eeeeee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-append .active,
+.input-prepend .active {
+	background-color: #a9dba9;
+	border-color: #46a546;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0 !important;
+	margin: 0 !important;
+	border: 0;
+	height: 1px;
+	width: 1px !important;
+	overflow: hidden;
+}
+#form-login select,
+#form-login input[type="text"],
+#form-login input[type="password"] {
+	display: inline-block;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px;
+	line-height: 15px;
+	color: #555555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	width: 175px;
+}
+.subform-repeatable-wrapper div.btn-toolbar {
+	float: none;
+}
+.subform-repeatable-wrapper .text-right {
+	text-align: right;
+}
+.subform-repeatable-wrapper .ui-sortable-helper {
+	background: #ffffff;
+}
+.subform-repeatable-wrapper tr.ui-sortable-helper {
+	display: table;
+}
+.subform-repeatable-wrapper .subform-repeatable-group {
+	clear: both;
+}
+.label,
+.badge {
+	display: inline-block;
+	padding: 2px 4px;
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #ffffff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999999;
+}
+.label {
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding-left: 9px;
+	padding-right: 9px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+	display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+	color: #ffffff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #a20000;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #6f0000;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #005800;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #002500;
+}
+.label-info,
+.badge-info {
+	background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+body {
+	background-color: #ffffff;
+	color: #2c2c2c;
+}
+h1 {
+	color: #2c2c2c;
+}
+a:link {
+	color: #054993;
+}
+a:visited {
+	color: #054993;
+}
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat;
+}
+#header h1.title {
+	color: #2c2c2c;
+}
+#nav {
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	border: 1px solid #c7c8b2;
+}
+#content {
+	background: #ffffff;
+}
+#no-submenu {
+	border-bottom: 1px solid #c7c8b2;
+}
+#element-box {
+	background: #ffffff;
+	border-right: 1px solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	border-left: 1px solid #c7c8b2;
+}
+#element-box.login {
+	border-top: 1px solid #c7c8b2;
+}
+.enabled,
+.success,
+.allow,
+span.writable {
+	color: #005800;
+}
+.disabled,
+p.error,
+.warning,
+.deny,
+span.unwritable {
+	color: #a20000;
+}
+.nowarning {
+	color: #2c2c2c;
+}
+.none,
+.protected {
+	color: #c7c8b2;
+}
+span.note {
+	background: #ffffff;
+	color: #2c2c2c;
+}
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+.ol-foreground {
+	background-color: #f9fade;
+}
+.ol-background {
+	background-color: #005800;
+}
+.ol-textfont {
+	color: #2c2c2c;
+}
+.ol-captionfont {
+	color: #ffffff;
+}
+.ol-captionfont a {
+	color: #054993;
+}
+div.subheader .padding {
+	background: #ffffff;
+}
+.pagetitle h2 {
+	color: #2c2c2c;
+}
+div.configuration {
+	color: #2c2c2c;
+	background-image: url(../images/menu/icon-16-config.png);
+	background-repeat: no-repeat;
+}
+div.toolbar-box {
+	border-right: 1px solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	border-left: 1px solid #c7c8b2;
+	background: #ffffff;
+}
+div.toolbar-list li {
+	color: #2c2c2c;
+}
+div.toolbar-list li.divider {
+	border-right: 1px dotted #e5d9c3;
+}
+div.toolbar-list a {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	background: #f9fade;
+}
+div.toolbar-list a:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+}
+div.btn-toolbar {
+	margin-left: 5px;
+	padding-top: 3px;
+}
+div.btn-toolbar li.divider {
+	border-right: 1px dotted #e5d9c3;
+}
+div.btn-toolbar div.btn-group button {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	padding: 5px 4px 5px 4px;
+}
+div.btn-toolbar div.btn-group button:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+	cursor: pointer;
+}
+div.btn-toolbar a {
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	padding: 6px 5px;
+	text-align: center;
+	white-space: nowrap;
+	font-size: 1.2em;
+	text-decoration: none;
+}
+div.btn-toolbar a:hover {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	background: #e5d9c3;
+	color: #054993;
+	cursor: pointer;
+}
+div.btn-toolbar div.btn-group button.inactive {
+	background: #f9fade;
+}
+.pane-sliders .title {
+	color: #2c2c2c;
+}
+.pane-sliders .panel {
+	border: 1px solid #c7c8b2;
+}
+.pane-sliders .panel h3 {
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	color: #054993;
+}
+.pane-sliders .panel h3:hover {
+	background: #e5d9c3;
+}
+.pane-sliders .panel h3:hover a {
+	text-decoration: none;
+}
+.pane-sliders .adminlist {
+	border: 0 none;
+}
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+.pane-toggler span {
+	background: transparent url(../images/j_arrow.png) 5px 50% no-repeat;
+}
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) 5px 50% no-repeat;
+}
+.pane-toggler-down {
+	border-bottom: 1px solid #c7c8b2;
+}
+dl.tabs dt {
+	border: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	color: #054993;
+}
+dl.tabs dt:hover {
+	background: #e5d9c3;
+}
+dl.tabs dt.open {
+	background: #ffffff;
+	border-bottom: 1px solid #ffffff;
+	color: #2c2c2c;
+}
+dl.tabs dt.open a:visited {
+	color: #2c2c2c;
+}
+dl.tabs dt a:hover {
+	text-decoration: none;
+}
+dl.tabs dt a:focus {
+	text-decoration: underline;
+}
+div.current {
+	border: 1px solid #c7c8b2;
+	background: #ffffff;
+}
+div.current fieldset {
+	border: none 0;
+}
+div.current fieldset.adminform {
+	border: 1px solid #c7c8b2;
+}
+#login-page .pagetitle h2 {
+	background: transparent;
+}
+#login-page #header {
+	border-bottom: 1px solid #c7c8b2;
+}
+#login-page #lock {
+	background: url(../images/j_login_lock.png) 50% 0 no-repeat;
+}
+#login-page #element-box.login {
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+#form-login {
+	background: #ffffff;
+	border: 1px solid #c7c8b2;
+}
+#form-login label {
+	color: #2c2c2c;
+}
+#form-login div.button1 a {
+	color: #054993;
+}
+#cpanel div.icon a,
+.cpanel div.icon a {
+	color: #054993;
+	border-left: 1px solid #e5d9c3;
+	border-top: 1px solid #e5d9c3;
+	border-right: 1px solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus,
+.cpanel div.icon a:hover,
+.cpanel div.icon a:focus {
+	border-left: 1px solid #868778;
+	border-top: 1px solid #868778;
+	border-right: 1px solid #f6f7db;
+	border-bottom: 1px solid #f6f7db;
+	color: #054993;
+	background: #e5d9c3;
+}
+fieldset {
+	border: 1px #c7c8b2 solid;
+}
+legend {
+	color: #2c2c2c;
+}
+fieldset ul.checklist input:focus {
+	outline: thin dotted #2c2c2c;
+}
+fieldset#filter-bar {
+	border-top: 0 solid #c7c8b2;
+	border-right: 0 solid #c7c8b2;
+	border-bottom: 1px solid #c7c8b2;
+	border-left: 0 solid #c7c8b2;
+}
+fieldset#filter-bar ol,
+fieldset#filter-bar ul {
+	border: 0;
+}
+fieldset#filter-bar ol li fieldset,
+fieldset#filter-bar ul li fieldset {
+	border: 0;
+}
+.invalid {
+	color: #a20000;
+}
+input.invalid {
+	border: 1px solid #a20000;
+}
+input.readonly,
+span.faux-input {
+	border: 0;
+}
+input.required {
+	background-color: #e5f0fa;
+}
+input.disabled {
+	background-color: #eeeeee;
+}
+input,
+select,
+span.faux-input {
+	background-color: #ffffff;
+	border: 1px solid #c7c8b2;
+}
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+	color: #054993;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+input[type="button"]:hover,
+input[type="button"]:focus,
+input[type="submit"]:hover,
+input[type="submit"]:focus,
+input[type="reset"]:hover,
+input[type="reset"]:focus {
+	background: #e5d9c3;
+}
+textarea {
+	background-color: #ffffff;
+	border: 1px solid #c7c8b2;
+}
+input:focus,
+select:focus,
+textarea:focus,
+option:focus,
+input:hover,
+select:hover,
+textarea:hover,
+option:hover {
+	background-color: #e5d9c3;
+	color: #054993;
+}
+.paramrules {
+	background: #f9fade;
+}
+span.gi {
+	color: #c7c8b2;
+}
+table.admintable td.key,
+table.admintable td.paramlist_key {
+	background-color: #f9fade;
+	color: #2c2c2c;
+	border-bottom: 1px solid #c7c8b2;
+	border-right: 1px solid #c7c8b2;
+}
+table.paramlist td.paramlist_description {
+	background-color: #f9fade;
+	color: #2c2c2c;
+	border-bottom: 1px solid #c7c8b2;
+	border-right: 1px solid #c7c8b2;
+}
+fieldset.adminform {
+	border: 1px solid #c7c8b2;
+}
+table.adminform {
+	background-color: #ffffff;
+}
+table.adminform tr.row0 {
+	background-color: #ffffff;
+}
+table.adminform tr.row1 {
+	background-color: #e5d9c3;
+}
+table.adminform th {
+	color: #2c2c2c;
+	background: #ffffff;
+}
+table.adminform tr {
+	border-bottom: 1px solid #c7c8b2;
+	border-right: 1px solid #c7c8b2;
+}
+table.adminlist {
+	border-spacing: 1px;
+	background-color: #ffffff;
+	color: #2c2c2c;
+}
+table.adminlist.modal {
+	border-top: 1px solid #c7c8b2;
+	border-right: 1px solid #c7c8b2;
+	border-left: 1px solid #c7c8b2;
+}
+table.adminlist a {
+	color: #054993;
+}
+table.adminlist thead th {
+	background: #ffffff;
+	color: #2c2c2c;
+	border-bottom: 1px solid #c7c8b2;
+}
+table.adminlist tbody tr {
+	background: #ffffff;
+}
+table.adminlist tbody tr.row1 {
+	background: #ffffff;
+}
+table.adminlist tbody tr.row1:last-child td,
+table.adminlist tbody tr.row1:last-child th {
+	border-bottom: 1px solid #c7c8b2;
+}
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td,
+table.adminlist tbody tr.row0:hover th,
+table.adminlist tbody tr.row1:hover th,
+table.adminlist tbody tr.row0:focus td,
+table.adminlist tbody tr.row1:focus td,
+table.adminlist tbody tr.row0:focus th,
+table.adminlist tbody tr.row1:focus th {
+	background-color: #e5d9c3;
+}
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-right: 1px solid #c7c8b2;
+}
+table.adminlist tbody tr td:last-child {
+	border-right: none;
+}
+table.adminlist tbody tr.row0:last-child td,
+table.adminlist tbody tr.row0:last-child th {
+	border-bottom: 1px solid #c7c8b2;
+}
+table.adminlist tbody tr.row0 td,
+table.adminlist tbody tr.row0 th {
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+table.adminlist {
+	border-bottom: 0 solid #c7c8b2;
+}
+table.adminlist tfoot tr {
+	color: #2c2c2c;
+}
+table.adminlist tfoot td,
+table.adminlist tfoot th {
+	background-color: #ffffff;
+	border-top: 1px solid #c7c8b2;
+}
+table.adminlist tr td.btns a {
+	border: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	color: #054993;
+}
+table.adminlist tr td.btns a:hover,
+table.adminlist tr td.btns a:active,
+table.adminlist tr td.btns a:focus {
+	background-color: #ffffff;
+}
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+fieldset.batch {
+	background: #ffffff;
+}
+button {
+	color: #054993;
+	border: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+button:hover,
+button:focus {
+	background: #e5d9c3;
+}
+.invalid {
+	color: #ff0000;
+}
+.button1 {
+	border: 1px solid #c7c8b2;
+	color: #054993;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+.button1 a {
+	color: #054993;
+}
+.button1 a:hover,
+.button1 a:focus {
+	background: #e5d9c3;
+}
+.button2-left,
+.button2-right {
+	border: 1px solid #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	color: #054993;
+}
+.button2-left span,
+.button2-right span {
+	color: #999999;
+}
+.page span,
+.blank span {
+	color: #054993;
+}
+.button2-left a:hover,
+.button2-right a:hover,
+.button2-left a:focus,
+.button2-right a:focus {
+	background: #e5d9c3;
+}
+.pagination .page span {
+	color: #999999;
+}
+.tip {
+	background: #000000;
+	border: 1px solid #FFFFFF;
+}
+.tip-title {
+	background: url(../images/selector-arrow-std.png) no-repeat;
+}
+a img.calendar {
+	background: url(../images/calendar.png) no-repeat;
+}
+.jgrid span.publish {
+	background-image: url(../images/admin/tick.png);
+}
+.jgrid span.unpublish {
+	background-image: url(../images/admin/publish_x.png);
+}
+.jgrid span.archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+.jgrid span.trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+.jgrid span.default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+.jgrid span.notdefault {
+	background-image: url(../images/menu/icon-16-notdefault.png);
+}
+.jgrid span.checkedout {
+	background-image: url(../images/admin/checked_out.png);
+}
+.jgrid span.downarrow {
+	background-image: url(../images/admin/downarrow.png);
+}
+.jgrid span.downarrow_disabled {
+	background-image: url(../images/admin/downarrow0.png);
+}
+.jgrid span.uparrow {
+	background-image: url(../images/admin/uparrow.png);
+}
+.jgrid span.uparrow_disabled {
+	background-image: url(../images/admin/uparrow0.png);
+}
+.jgrid span.published {
+	background-image: url(../images/admin/publish_g.png);
+}
+.jgrid span.expired {
+	background-image: url(../images/admin/publish_r.png);
+}
+.jgrid span.pending {
+	background-image: url(../images/admin/publish_y.png);
+}
+.jgrid span.warning {
+	background-image: url(../images/admin/publish_y.png);
+}
+.icon-32-send {
+	background-image: url(../images/toolbar/icon-32-send.png);
+}
+.icon-32-delete {
+	background-image: url(../images/toolbar/icon-32-delete.png);
+}
+.icon-32-help {
+	background-image: url(../images/toolbar/icon-32-help.png);
+}
+.icon-32-cancel {
+	background-image: url(../images/toolbar/icon-32-cancel.png);
+}
+.icon-32-checkin {
+	background-image: url(../images/toolbar/icon-32-checkin.png);
+}
+.icon-32-options {
+	background-image: url(../images/toolbar/icon-32-config.png);
+}
+.icon-32-apply {
+	background-image: url(../images/toolbar/icon-32-apply.png);
+}
+.icon-32-back {
+	background-image: url(../images/toolbar/icon-32-back.png);
+}
+.icon-32-forward {
+	background-image: url(../images/toolbar/icon-32-forward.png);
+}
+.icon-32-save {
+	background-image: url(../images/toolbar/icon-32-save.png);
+}
+.icon-32-edit {
+	background-image: url(../images/toolbar/icon-32-edit.png);
+}
+.icon-32-copy {
+	background-image: url(../images/toolbar/icon-32-copy.png);
+}
+.icon-32-move {
+	background-image: url(../images/toolbar/icon-32-move.png);
+}
+.icon-32-new {
+	background-image: url(../images/toolbar/icon-32-new.png);
+}
+.icon-32-upload {
+	background-image: url(../images/toolbar/icon-32-upload.png);
+}
+.icon-32-assign {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+.icon-32-html {
+	background-image: url(../images/toolbar/icon-32-html.png);
+}
+.icon-32-css {
+	background-image: url(../images/toolbar/icon-32-css.png);
+}
+.icon-32-menus {
+	background-image: url(../images/toolbar/icon-32-menu.png);
+}
+.icon-32-publish {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+.icon-32-unblock {
+	background-image: url(../images/toolbar/icon-32-unblock.png);
+}
+.icon-32-unpublish {
+	background-image: url(../images/toolbar/icon-32-unpublish.png);
+}
+.icon-32-restore {
+	background-image: url(../images/toolbar/icon-32-revert.png);
+}
+.icon-32-trash {
+	background-image: url(../images/toolbar/icon-32-trash.png);
+}
+.icon-32-archive {
+	background-image: url(../images/toolbar/icon-32-archive.png);
+}
+.icon-32-unarchive {
+	background-image: url(../images/toolbar/icon-32-unarchive.png);
+}
+.icon-32-preview {
+	background-image: url(../images/toolbar/icon-32-preview.png);
+}
+.icon-32-default {
+	background-image: url(../images/toolbar/icon-32-default.png);
+}
+.icon-32-refresh {
+	background-image: url(../images/toolbar/icon-32-refresh.png);
+}
+.icon-32-save-new {
+	background-image: url(../images/toolbar/icon-32-save-new.png);
+}
+.icon-32-save-copy {
+	background-image: url(../images/toolbar/icon-32-save-copy.png);
+}
+.icon-32-error {
+	background-image: url(../images/toolbar/icon-32-error.png);
+}
+.icon-32-new-style {
+	background-image: url(../images/toolbar/icon-32-new-style.png);
+}
+.icon-32-delete-style {
+	background-image: url(../images/toolbar/icon-32-delete-style.png);
+}
+.icon-32-purge {
+	background-image: url(../images/toolbar/icon-32-purge.png);
+}
+.icon-32-remove {
+	background-image: url(../images/toolbar/icon-32-remove.png);
+}
+.icon-32-featured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+}
+.icon-32-unfeatured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+	background-position: 0% 100%;
+}
+.icon-32-export {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+.icon-32-stats {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+.icon-32-print {
+	background-image: url(../images/toolbar/icon-32-print.png);
+}
+.icon-32-batch {
+	background-image: url(../images/toolbar/icon-32-batch.png);
+}
+.icon-32-envelope {
+	background-image: url(../images/toolbar/icon-32-messaging.png);
+}
+.icon-32-download {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+.icon-32-bars {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+.icon-48-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-generic {
+	background-image: url(../images/header/icon-48-generic.png);
+}
+.icon-48-banners {
+	background-image: url(../images/header/icon-48-banner.png);
+}
+.icon-48-banners-categories {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+.icon-48-banners-category-edit {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+.icon-48-banners-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-banners-clients {
+	background-image: url(../images/header/icon-48-banner-client.png);
+}
+.icon-48-banners-tracks {
+	background-image: url(../images/header/icon-48-banner-tracks.png);
+}
+.icon-48-checkin {
+	background-image: url(../images/header/icon-48-checkin.png);
+}
+.icon-48-clear {
+	background-image: url(../images/header/icon-48-clear.png);
+}
+.icon-48-contact {
+	background-image: url(../images/header/icon-48-contacts.png);
+}
+.icon-48-contact-categories {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+.icon-48-contact-category-edit {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+.icon-48-contact-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-purge {
+	background-image: url(../images/header/icon-48-purge.png);
+}
+.icon-48-cpanel {
+	background-image: url(../images/header/icon-48-cpanel.png);
+}
+.icon-48-config {
+	background-image: url(../images/header/icon-48-config.png);
+}
+.icon-48-groups {
+	background-image: url(../images/header/icon-48-groups.png);
+}
+.icon-48-groups-add {
+	background-image: url(../images/header/icon-48-groups-add.png);
+}
+.icon-48-levels {
+	background-image: url(../images/header/icon-48-levels.png);
+}
+.icon-48-levels-add {
+	background-image: url(../images/header/icon-48-levels-add.png);
+}
+.icon-48-module {
+	background-image: url(../images/header/icon-48-module.png);
+}
+.icon-48-menu {
+	background-image: url(../images/header/icon-48-menu.png);
+}
+.icon-48-menu-add {
+	background-image: url(../images/header/icon-48-menu-add.png);
+}
+.icon-48-menumgr {
+	background-image: url(../images/header/icon-48-menumgr.png);
+}
+.icon-48-trash {
+	background-image: url(../images/header/icon-48-trash.png);
+}
+.icon-48-user {
+	background-image: url(../images/header/icon-48-user.png);
+}
+.icon-48-user-add {
+	background-image: url(../images/header/icon-48-user-add.png);
+}
+.icon-48-user-edit {
+	background-image: url(../images/header/icon-48-user-edit.png);
+}
+.icon-48-user-profile {
+	background-image: url(../images/header/icon-48-user-profile.png);
+}
+.icon-48-inbox {
+	background-image: url(../images/header/icon-48-inbox.png);
+}
+.icon-48-new-privatemessage {
+	background-image: url(../images/header/icon-48-new-privatemessage.png);
+}
+.icon-48-msgconfig {
+	background-image: url(../images/header/icon-48-message_config.png);
+}
+.icon-48-langmanager {
+	background-image: url(../images/header/icon-48-language.png);
+}
+.icon-48-mediamanager {
+	background-image: url(../images/header/icon-48-media.png);
+}
+.icon-48-plugin {
+	background-image: url(../images/header/icon-48-plugin.png);
+}
+.icon-48-help_header {
+	background-image: url(../images/header/icon-48-help_header.png);
+}
+.icon-48-impressions {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-browser {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-searchtext {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+.icon-48-thememanager {
+	background-image: url(../images/header/icon-48-themes.png);
+}
+.icon-48-writemess {
+	background-image: url(../images/header/icon-48-writemess.png);
+}
+.icon-48-featured {
+	background-image: url(../images/header/icon-48-featured.png);
+}
+.icon-48-sections {
+	background-image: url(../images/header/icon-48-section.png);
+}
+.icon-48-article-add {
+	background-image: url(../images/header/icon-48-article-add.png);
+}
+.icon-48-article-edit {
+	background-image: url(../images/header/icon-48-article-edit.png);
+}
+.icon-48-article {
+	background-image: url(../images/header/icon-48-article.png);
+}
+.icon-48-content-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-content-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+.icon-48-content-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-install {
+	background-image: url(../images/header/icon-48-extension.png);
+}
+.icon-48-dbbackup {
+	background-image: url(../images/header/icon-48-backup.png);
+}
+.icon-48-dbrestore {
+	background-image: url(../images/header/icon-48-dbrestore.png);
+}
+.icon-48-dbquery {
+	background-image: url(../images/header/icon-48-query.png);
+}
+.icon-48-systeminfo {
+	background-image: url(../images/header/icon-48-info.png);
+}
+.icon-48-massmail {
+	background-image: url(../images/header/icon-48-massmail.png);
+}
+.icon-48-redirect {
+	background-image: url(../images/header/icon-48-redirect.png);
+}
+.icon-48-search {
+	background-image: url(../images/header/icon-48-search.png);
+}
+.icon-48-finder {
+	background-image: url(../images/header/icon-48-search.png);
+}
+.icon-48-newsfeeds {
+	background-image: url(../images/header/icon-48-newsfeeds.png);
+}
+.icon-48-newsfeeds-categories {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+.icon-48-newsfeeds-category-edit {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+.icon-48-newsfeeds-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-weblinks {
+	background-image: url(../images/header/icon-48-links.png);
+}
+.icon-48-weblinks-categories {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+.icon-48-weblinks-category-edit {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+.icon-48-weblinks-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+.icon-48-tags {
+	background-image: url(../images/header/icon-48-tags.png);
+}
+.icon-48-assoc {
+	background-image: url(../images/header/icon-48-assoc.png);
+}
+.icon-48-puzzle {
+	background-image: url(../images/header/icon-48-puzzle.png);
+}
+div.message {
+	border: 1px solid #c7c8b2;
+	color: #2c2c2c;
+}
+.helpFrame {
+	border-left: 0 solid #c7c8b2;
+	border-right: none;
+	border-top: none;
+	border-bottom: none;
+}
+.outline {
+	border: 1px solid #c7c8b2;
+	background: #ffffff;
+}
+dl.menu_type dt {
+	border-bottom: 1px solid #c7c8b2;
+}
+ul#new-modules-list {
+	border-top: 1px solid #c7c8b2;
+}
+#skiplinkholder a,
+#skiplinkholder a:link,
+#skiplinkholder a:visited {
+	color: #ffffff;
+	background: #054993;
+	border-bottom: solid #336 2px;
+}
+fieldset.panelform {
+	border: none 0;
+}
+a.move_up {
+	background-image: url('../images/admin/uparrow.png');
+}
+span.move_up {
+	background-image: url('../images/admin/uparrow0.png');
+}
+a.move_down {
+	background-image: url('../images/admin/downarrow.png');
+}
+span.move_down {
+	background-image: url('../images/admin/downarrow0.png');
+}
+a.grid_false {
+	background-image: url('../images/admin/publish_x.png');
+}
+a.grid_true {
+	background-image: url('../images/admin/tick.png');
+}
+a.grid_trash {
+	background-image: url('../images/admin/icon-16-trash.png');
+}
+tr.row1 {
+	background-color: #f9fade;
+}
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-left: 1px solid #c7c8b2;
+}
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) 0 0 no-repeat;
+}
+label.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+label.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+a.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+a.icon-16-allowinactive {
+	background: url(../images/admin/icon-16-allowinactive.png) no-repeat;
+}
+a.icon-16-denyinactive {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+ul.acllegend li.acl-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat left;
+}
+ul.acllegend li.acl-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat left;
+}
+li.acl-editgroups,
+li.acl-resetbtn {
+	background-color: #f9fade;
+	border: 1px solid #c7c8b2;
+}
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	color: #054993;
+}
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	background-color: #e5d9c3;
+}
+table#acl-config {
+	border: 1px solid #c7c8b2;
+}
+table#acl-config th,
+table#acl-config td {
+	background: #f9fade;
+	border-bottom: 1px solid #c7c8b2;
+}
+table#acl-config th.acl-groups {
+	border-right: 1px solid #c7c8b2;
+}
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) right top no-repeat;
+}
+#permissions-sliders .tip {
+	background: #ffffff;
+	border: 1px solid #c7c8b2;
+}
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+	border: solid 0 #c7c8b2;
+	background: #ffffff;
+}
+ul#rules li .pane-sliders .panel h3.title {
+	border: solid 0 #c7c8b2;
+}
+#permissions-sliders ul#rules .pane-slider {
+	border: solid 1px #c7c8b2;
+}
+#permissions-sliders ul#rules li h3 {
+	border: solid 1px #c7c8b2;
+}
+#permissions-sliders ul#rules li h3.pane-toggler-down a {
+	border: solid 0;
+}
+#permissions-sliders ul#rules .group-kind {
+	color: #2c2c2c;
+}
+#permissions-sliders ul#rules table.group-rules {
+	border: solid 1px #c7c8b2;
+}
+#permissions-sliders ul#rules table.group-rules td {
+	border-right: solid 1px #c7c8b2;
+	border-bottom: solid 1px #c7c8b2;
+}
+#permissions-sliders ul#rules table.group-rules th {
+	background: #e5d9c3;
+	border-right: solid 1px #c7c8b2;
+	border-bottom: solid 1px #c7c8b2;
+	color: #2c2c2c;
+}
+ul#rules table.aclmodify-table {
+	border: solid 1px #c7c8b2;
+}
+ul#rules table.group-rules td label {
+	border: solid 0 #c7c8b2;
+}
+#permissions-sliders ul#rules .mypanel {
+	border: solid 0 #c7c8b2;
+}
+#permissions-sliders  ul#rules  table.group-rules td {
+	background: #ffffff;
+}
+#permissions-sliders span.level {
+	color: #c7c8b2;
+	background-image: none;
+}
+.check-0,
+table.adminlist tbody td.check-0 {
+	background-color: #ffffcf;
+}
+.check-a,
+table.adminlist tbody td.check-a {
+	background-color: #cfffda;
+}
+.check-d,
+table.adminlist tbody td.check-d {
+	background-color: #ffcfcf;
+}
+#system-message dd ul {
+	color: #2c2c2c;
+}
+#system-message dd.error ul {
+	color: #2c2c2c;
+}
+#system-message dd.message ul {
+	color: #2c2c2c;
+}
+#system-message dd.notice ul {
+	color: #2c2c2c;
+}
+#menu {
+	color: #2c2c2c;
+}
+#menu ul.dropdown-menu {
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	color: #2c2c2c;
+}
+#menu ul.dropdown-menu li.dropdown-submenu {
+	background: url(../images/j_arrow.png) no-repeat right 50%;
+}
+#menu ul.dropdown-menu li.divider {
+	margin-bottom: 0;
+	border-bottom: 1px dotted #c7c8b2;
+}
+#menu a {
+	color: #054993;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+#menu li {
+	border-right: 1px solid #c7c8b2;
+	background-color: transparent;
+}
+#menu li a:hover,
+#menu li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	color: #c7c8b2;
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+}
+#menu li ul {
+	border: 1px solid #c7c8b2;
+}
+#menu li li {
+	background-color: transparent;
+}
+#menu li.sfhover a {
+	background-color: #e5d9c3;
+}
+#menu li.sfhover li a {
+	background-color: transparent;
+}
+#menu li.sfhover li.sfhover a,
+#menu li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li.sfhover li.sfhover li a {
+	background-color: transparent;
+}
+#menu li.sfhover li.sfhover li.sfhover a,
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li li a:focus,
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#menu li li li a:focus {
+	background-color: #e5d9c3;
+}
+#submenu {
+	border-bottom: 1px solid #c7c8b2;
+}
+#submenu li,
+#submenu span.nolink {
+	background-color: #f9fade;
+	background-image: -moz-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f9fade),to(#f9fade));
+	background-image: -webkit-linear-gradient(top,#f9fade,#f9fade);
+	background-image: -o-linear-gradient(top,#f9fade,#f9fade);
+	background-image: linear-gradient(to bottom,#f9fade,#f9fade);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9fade', endColorstr='#fff9fade', GradientType=0);
+	border: 1px solid #c7c8b2;
+	color: #054993;
+}
+#submenu li:hover,
+#submenu li:focus {
+	background: #e5d9c3;
+}
+#submenu li.active,
+#submenu span.nolink.active {
+	background: #ffffff;
+	border-bottom: 1px solid #ffffff;
+}
+#submenu li.active a,
+#submenu span.nolink.active {
+	color: #000;
+}
+.element-invisible {
+	margin: 0;
+	padding: 0;
+}
+div.CodeMirror-wrapping {
+	border: 1px solid #c7c8b2;
+}
+table.adminform tr.row0 {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(odd) {
+	background-color: #ffffff;
+}
+ul.alternating > li:nth-child(even) {
+	background-color: #f9fade;
+}
+ol.alternating > li:nth-child(odd) {
+	background-color: #ffffff;
+}
+ol.alternating > li:nth-child(even) {
+	background-color: #f9fade;
+}
+#installer-database,
+#installer-discover,
+#installer-update,
+#installer-warnings {
+	border-top: 1px solid #c7c8b2;
+}
+#installer-database p.warning {
+	background: transparent url(../images/admin/icon-16-deny.png) center left no-repeat;
+}
+#installer-database p.nowarning {
+	background: transparent url(../images/admin/icon-16-allow.png) center left no-repeat;
+}
+.input-append,
+.input-prepend {
+	font-size: 1.2em;
+}
diff --git a/core/administrator/templates/hathor/css/colour_standard_rtl.css b/core/administrator/templates/hathor/css/colour_standard_rtl.css
new file mode 100644
index 00000000..f76a9eac
--- /dev/null
+++ b/core/administrator/templates/hathor/css/colour_standard_rtl.css
@@ -0,0 +1,370 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * RTL CSS file for the color standard
+ */
+
+/**
+ * Overall Styles
+ */
+#header {
+	background: #ffffff url(../images/j_logo.png) no-repeat top right;
+}
+
+#element-box {
+	border-left: 1px solid #c7c8b2;
+	border-right: 1px solid #c7c8b2;
+}
+
+/**
+ * Various Styles
+ */
+
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+
+/**
+ * Subheader, toolbar, page title
+ */
+div.toolbar-box {
+	border-left: 1px solid #c7c8b2;
+	border-right: 1px solid #c7c8b2;
+}
+
+div.toolbar-list li.divider {
+	border-left:1px dotted #e3e4ca;
+	border-right:none;
+}
+
+div.toolbar-list a:hover {
+	border-right: 1px solid #e3e4ca;
+	border-left: 1px solid #c7c8b2;
+}
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+.pane-toggler  span {
+	background: transparent url(../images/j_arrow_left.png) right 50% no-repeat;
+}
+
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) right 50%
+		no-repeat;
+}
+
+/**
+ * Cpanel Settings
+ */
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus {
+	border-right: 1px solid #e3e4ca;
+	border-left: 1px solid #c7c8b2;
+}
+
+fieldset#filter-bar {
+	border-left: none;
+	border-right: none;
+}
+
+/**
+ * Admintable Styles
+ */
+table.admintable td.key,table.admintable td.paramlist_key {
+	border-left: 1px solid #c7c8b2;
+	border-right: none;
+}
+
+table.paramlist td.paramlist_description {
+	border-left: 1px solid #c7c8b2;
+	border-right: none;
+}
+
+/**
+ * Admin Form Styles
+ */
+table.adminform tr {
+	border-left: 1px solid #c7c8b2;
+	border-right: none;
+}
+
+/**
+ * Adminlist Table layout
+ */
+
+table.adminlist.modal {
+	border-right: 1px solid #c7c8b2;
+	border-left: 1px solid #c7c8b2;
+}
+
+
+/* Table row styles */
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-left: 1px solid #c7c8b2;
+	border-right: none;
+}
+
+table.adminlist tbody tr td:last-child {
+	border-left: none;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+
+/**
+ * Button styling
+ */
+
+/* Button 1 Type */
+
+	/* Use this if you add images to the buttons such as directional arrows */
+
+.button1 a {
+	/* add padding if you are using the directional images */
+	/* padding: 0 6px 0 30px; */
+}
+
+	/* Button 2 Type */
+
+.button2-right .prev {
+	background-image: url(../images/j_button2_prev.png);
+	background-position: right center;
+}
+
+.button2-right.off .prev {
+	background: url(../images/j_button2_prev_off.png) no-repeat;
+}
+
+.button2-right .start {
+	background-image: url(../images/j_button2_first.png);
+	background-position: right center;
+}
+
+.button2-left .next {
+	background-image: url(../images/j_button2_next.png);
+	background-position: left center;
+}
+
+.button2-left.off .next { /* @TODO check the x position */
+	background: url(../images/j_button2_next_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .end {
+	background-image: url(../images/j_arrow_left.png);
+	background-position: left center;
+}
+
+.button2-left.off .end { /* @TODO check the x position */
+	background: url(../images/j_button2_last_off.png) 100% 0 no-repeat;
+}
+
+.button2-left .image {
+	background: url(../images/j_button2_image.png) 100% 0 no-repeat;
+}
+
+.button2-left .readmore {
+	background: url(../images/j_button2_readmore.png) 100% 0 no-repeat;
+}
+
+.button2-left .pagebreak {
+	background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat;
+}
+
+/**
+ * Tooltips
+ */
+
+/**
+ * System Standard Messages
+ */
+#system-message dd.message ul {
+	background: #C3D2E5 url(../images/notice-info.png) 99.5% center no-repeat;
+}
+
+/**
+ * System Error Messages
+ */
+#system-message dd.error ul {
+	background: #E6C0C0 url(../images/notice-alert.png) 99.5% top no-repeat;
+}
+
+/**
+ * System Notice Messages
+ */
+#system-message dd.notice ul {
+	background: #EFE7B8 url(../images/notice-note.png) 99%.5 top no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+
+/**
+ * General styles
+ */
+
+.helpFrame {
+	border-right: 0 solid #c7c8b2;
+	border-left: none;
+	border-top: none;
+}
+
+/* -- ACL STYLES relocated from com_users/media/grid.css ----------- */
+
+/* -- ACL PANEL STYLES  ----------- */
+
+
+/* All Tabs */
+
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-right: 1px solid #c7c8b2;
+	border-left: none;
+}
+
+/* Icons */
+
+ul.acllegend li.acl-allowed {
+	background:url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+ul.acllegend li.acl-denied {
+	background:url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+table#acl-config th.acl-groups {
+	border-left: 1px solid #c7c8b2;
+}
+
+table#acl-config th.acl-groups {
+	text-align: right;
+}
+
+.acl-action {
+	margin: auto 0;
+}
+
+/* Icons */
+
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat right;
+}
+
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat right;
+}
+
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat right;
+}
+
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) no-repeat right;
+}
+
+/**
+* Mod_rewrite Warning
+*/
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) left top no-repeat;
+}
+
+/**
+* Modal S-Box overrides
+*/
+
+#sbox-window {
+	text-align: right;
+}
+
+/**
+* Permission Rules
+*/
+
+#permissions-sliders ul#rules table.group-rules td {
+    border-left: solid 1px #c7c8b2;
+    border-right: solid 0 #c7c8b2;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+    border-left: solid 1px #c7c8b2;
+    border-right: solid 0 #c7c8b2;
+}
+
+/**
+ * Menu Styling
+ */
+
+#menu ul li.node {
+	background-image: url(../images/j_arrow_left.png);
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+
+#menu a {
+	background-position: right 50%;
+}
+
+#menu li {
+	border-left: 1px solid #c7c8b2;
+	border-right: 0 solid #c7c8b2;
+}
+
+#menu li li li a:focus {
+	border-right: 1px solid #fafafa;
+}
+
+/* Installer Database */
+#installer-database p.warning {
+	background-position: center right;
+}
+
+#installer-database p.nowarning {
+	background-position: center right;
+}
diff --git a/core/administrator/templates/hathor/css/error.css b/core/administrator/templates/hathor/css/error.css
new file mode 100644
index 00000000..69877243
--- /dev/null
+++ b/core/administrator/templates/hathor/css/error.css
@@ -0,0 +1,74 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.outline {
+	border: 1px solid #cccccc;
+	background: #ffffff;
+	padding: 2px;
+}
+
+body {
+	height: 100%;
+	padding: 0;
+	font-family: Arial, Helvetica, Sans Serif;
+	font-size: 11px;
+	color: #2c2c2c;
+	background: #ffffff;
+	width: 80%;
+	min-width: 400px;
+	margin: 15px auto;
+}
+
+div {
+	background-color: #f9fade;
+	padding: 8px;
+	border: solid 1px #c7c8b2;
+	margin-top: 13px;
+	margin-bottom: 25px;
+}
+
+.frame {
+	background-color: #f9fade;
+	padding: 8px;
+	border: solid 1px #c7c8b2;
+	margin-top: 13px;
+	margin-bottom: 25px;
+}
+
+.table {
+	border-collapse: collapse;
+	margin-top: 13px;
+}
+
+a {
+	border: 1px solid #c7c8b2;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	background-color: #ffffff;
+	color: #2c2c2c;
+	padding: 3px 20px;
+	text-decoration: none;
+}
+
+a:hover, a:focus, a:active {
+	background-color: #e3e4ca;
+	text-decoration: none;
+}
+
+td {
+	padding: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+	border: solid 1px #c7c8b2;
+	font-size: 10px;
+}
+
+.type {
+	background-color: #cc0000;
+	color: #ffffff;
+	font-weight: bold;
+	padding: 3px;
+}
diff --git a/core/administrator/templates/hathor/css/ie7.css b/core/administrator/templates/hathor/css/ie7.css
new file mode 100644
index 00000000..4d170f7b
--- /dev/null
+++ b/core/administrator/templates/hathor/css/ie7.css
@@ -0,0 +1,121 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * CSS file for IE7
+ */
+
+/**
+ * Special Styles for Internet Explorer 7
+ */
+
+input {
+	border-width: expression(this.type == "radio" ? '0px' : this.type == "checkbox" ? '0px' : '1px');
+}
+
+div.toolbar-box {
+	height: 65px;
+}
+
+div.toolbar-list span {
+	margin: 0;
+	position: relative
+}
+
+div.toolbar-list a {
+	position: relative;
+}
+
+div#subheader {
+	height: 2em;
+}
+
+#login-page .pagetitle h2 {
+	margin: 0px;
+	padding: 0px;
+}
+
+*:first-child+html .clearfix {
+	min-height: 1px;
+}
+
+.menu-links li,
+.menu-links li label {
+	height: 2em;
+}
+
+div.article-edit,
+div.category-edit {
+	zoom: 1;
+}
+
+div.pane-sliders,
+div.panel,
+div.pane-slider,
+div.rules-section,
+div.mypanel,
+div.containerpg,
+div.pagination,
+div.upload-queue {
+	zoom: 1;
+}
+
+div.width-20 fieldset.adminform,
+div.width-30 fieldset.adminform,
+div.width-35 fieldset.adminform,
+div.width-40 fieldset.adminform,
+div.width-45 fieldset.adminform,
+div.width-50 fieldset.adminform,
+div.width-55 fieldset.adminform,
+div.width-60 fieldset.adminform,
+div.width-65 fieldset.adminform,
+div.width-70 fieldset.adminform,
+div.width-80 fieldset.adminform,
+div.width-100 fieldset.adminform {
+	zoom: 1;
+	margin-bottom:10px;
+}
+
+div.toggle-editor {
+	margin-top: -5px;
+	margin-bottom: 5px;
+}
+
+table.adminlist {
+	border-bottom-width: 1px;
+}
+
+div.current dd {
+	width: 100%;
+	position: relative;
+}
+
+#permissions-sliders ul#rules table.group-rules caption span {
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	padding:0;
+	margin:0;
+}
+
+div.current ul.menu-links {
+	zoom: 1;
+	width: 25%;
+	margin: 0;
+	padding:0;
+	list-style-position: inside;
+}
+
+div#position-icon.pane-sliders div.pane-down div.icon-wrapper {
+	margin: 0;
+}
+
+fieldset.panelform fieldset.checkboxes.impunlimited {
+	float: none;
+	width: 170px;
+}
diff --git a/core/administrator/templates/hathor/css/ie8.css b/core/administrator/templates/hathor/css/ie8.css
new file mode 100644
index 00000000..4fdab91d
--- /dev/null
+++ b/core/administrator/templates/hathor/css/ie8.css
@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * CSS file for IE8
+ */
+
+/**
+ * Special Styles for Internet Explorer 8
+ */
+
+/* Accessibility: css in template.css for slider keyboard
+ * has to be reversed here or the mouse does not work for ie */
+.pane-toggler + div.pane-slider {
+	/*display: block;*/
+}
diff --git a/core/administrator/templates/hathor/css/template.css b/core/administrator/templates/hathor/css/template.css
new file mode 100644
index 00000000..8bd16f12
--- /dev/null
+++ b/core/administrator/templates/hathor/css/template.css
@@ -0,0 +1,3949 @@
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 25px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-moz-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear;
+}
+.fade.in {
+	opacity: 1;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+.modal-open .dropdown-menu {
+	z-index: 2050;
+}
+.modal-open .dropdown.open {
+	*z-index: 2050;
+}
+.modal-open .popover {
+	z-index: 2110;
+}
+.modal-open .tooltip {
+	z-index: 2080;
+}
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000000;
+}
+.modal-backdrop.fade {
+	opacity: 0;
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+div.modal {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	z-index: 1050;
+	overflow: auto;
+	width: 80%;
+	margin: -250px 0 0 -40%;
+	background-color: #ffffff;
+	border: 1px solid #999;
+	border: 1px solid rgba(0,0,0,0.3);
+	*border: 1px solid #999;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+}
+div.modal.fade {
+	-webkit-transition: opacity .3s linear, top .3s ease-out;
+	-moz-transition: opacity .3s linear, top .3s ease-out;
+	-o-transition: opacity .3s linear, top .3s ease-out;
+	transition: opacity .3s linear, top .3s ease-out;
+	top: -25%;
+}
+div.modal.fade.in {
+	top: 50%;
+}
+.modal-header {
+	padding: 9px 15px;
+	border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+	float: right;
+	margin-top: 2px;
+}
+.modal-body {
+	overflow-y: auto;
+	max-height: 400px;
+	padding: 15px;
+}
+.modal-form {
+	margin-bottom: 0;
+}
+.modal-footer {
+	padding: 14px 15px 15px;
+	margin-bottom: 0;
+	text-align: right;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: inset 0 1px 0 #ffffff;
+	-moz-box-shadow: inset 0 1px 0 #ffffff;
+	box-shadow: inset 0 1px 0 #ffffff;
+	*zoom: 1;
+}
+.modal-footer:before,
+.modal-footer:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.modal-footer:after {
+	clear: both;
+}
+.modal-footer .btn + .btn {
+	margin-left: 5px;
+	margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+	margin-left: -1px;
+}
+body.modal-open {
+	overflow: hidden;
+	-ms-overflow-style: none;
+}
+.modal-buttons {
+	padding: 15px 0px;
+}
+.modal-buttons button {
+	font-size: 1.2em;
+	line-height: 1.6em;
+}
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1060;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	text-align: left;
+	background-color: #ffffff;
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	white-space: normal;
+}
+.popover.top {
+	margin-top: -10px;
+}
+.popover.right {
+	margin-left: 10px;
+}
+.popover.bottom {
+	margin-top: 10px;
+}
+.popover.left {
+	margin-left: -10px;
+}
+.popover-title {
+	margin: 0;
+	padding: 8px 14px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.popover-title:empty {
+	display: none;
+}
+.popover-content {
+	padding: 9px 14px;
+}
+.popover .arrow,
+.popover .arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.popover .arrow {
+	border-width: 11px;
+}
+.popover .arrow:after {
+	border-width: 10px;
+	content: "";
+}
+.popover.top .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-bottom-width: 0;
+	border-top-color: #999;
+	border-top-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+}
+.popover.top .arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	border-bottom-width: 0;
+	border-top-color: #ffffff;
+}
+.popover.right .arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-left-width: 0;
+	border-right-color: #999;
+	border-right-color: rgba(0,0,0,0.25);
+}
+.popover.right .arrow:after {
+	left: 1px;
+	bottom: -10px;
+	border-left-width: 0;
+	border-right-color: #ffffff;
+}
+.popover.bottom .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0,0,0,0.25);
+	top: -11px;
+}
+.popover.bottom .arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	border-top-width: 0;
+	border-bottom-color: #ffffff;
+}
+.popover.left .arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0,0,0,0.25);
+}
+.popover.left .arrow:after {
+	right: 1px;
+	border-right-width: 0;
+	border-left-color: #ffffff;
+	bottom: -10px;
+}
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), url('../../../../media/jui/fonts/IcoMoon.woff') format('woff'), url('../../../../media/jui/fonts/IcoMoon.ttf') format('truetype'), url('../../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	margin-right: .25em;
+	line-height: 14px;
+}
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+[class^="icon-"].disabled,
+[class*=" icon-"].disabled {
+	font-weight: normal;
+}
+.icon-joomla:before {
+	content: "\e200";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-rightarrow:before,
+.icon-arrow-right:before {
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-leftarrow:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-4:before {
+	content: "\e201";
+}
+.icon-arrow-right-4:before {
+	content: "\e202";
+}
+.icon-arrow-down-4:before {
+	content: "\e203";
+}
+.icon-arrow-left-4:before {
+	content: "\e204";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-forward-2:before {
+	content: "\e205";
+}
+.icon-backward-2:before,
+.icon-reply:before {
+	content: "\e206";
+}
+.icon-unblock:before,
+.icon-refresh:before,
+.icon-redo-2:before {
+	content: "\6c";
+}
+.icon-undo-2:before {
+	content: "\e207";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-play:before {
+	content: "\e208";
+}
+.icon-pause:before {
+	content: "\e209";
+}
+.icon-stop:before {
+	content: "\e210";
+}
+.icon-previous:before,
+.icon-backward:before {
+	content: "\7c";
+}
+.icon-next:before,
+.icon-forward:before {
+	content: "\7b";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-play-circle:before {
+	content: "\e00d";
+}
+.icon-pause-circle:before {
+	content: "\e211";
+}
+.icon-stop-circle:before {
+	content: "\e212";
+}
+.icon-backward-circle:before {
+	content: "\e213";
+}
+.icon-forward-circle:before {
+	content: "\e214";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "\5d";
+}
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-plus-circle:before {
+	content: "\e215";
+}
+.icon-minus:before,
+.icon-not-ok:before {
+	content: "\4b";
+}
+.icon-ban-circle:before,
+.icon-minus-circle:before {
+	content: "\e216";
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+}
+.icon-cancel-circle:before {
+	content: "\e217";
+}
+.icon-checkmark-2:before {
+	content: "\e218";
+}
+.icon-checkmark-circle:before {
+	content: "\e219";
+}
+.icon-info:before {
+	content: "\e220";
+}
+.icon-info-2:before,
+.icon-info-circle:before {
+	content: "\e221";
+}
+.icon-question:before,
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-question-2:before,
+.icon-question-circle:before {
+	content: "\e222";
+}
+.icon-notification:before {
+	content: "\e223";
+}
+.icon-notification-2:before,
+.icon-notification-circle:before {
+	content: "\e224";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+}
+.icon-warning-2:before,
+.icon-warning-circle:before {
+	content: "\e225";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before,
+.icon-checkbox-checked:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-square:before {
+	content: "\e226";
+}
+.icon-radio-unchecked:before {
+	content: "\e227";
+}
+.icon-radio-checked:before,
+.icon-generic:before {
+	content: "\e228";
+}
+.icon-circle:before {
+	content: "\e229";
+}
+.icon-signup:before {
+	content: "\e230";
+}
+.icon-grid:before,
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-2:before,
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-list-2:before {
+	content: "\e231";
+}
+.icon-menu-3:before {
+	content: "\e232";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-folder-plus:before {
+	content: "\e234";
+}
+.icon-folder-minus:before {
+	content: "\e235";
+}
+.icon-folder-3:before {
+	content: "\e236";
+}
+.icon-folder-plus-2:before {
+	content: "\e237";
+}
+.icon-folder-remove:before {
+	content: "\e238";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-2:before {
+	content: "\e239";
+}
+.icon-file-add:before,
+.icon-file-plus:before {
+	content: "\29";
+}
+.icon-file-minus:before {
+	content: "\e017";
+}
+.icon-file-check:before {
+	content: "\e240";
+}
+.icon-file-remove:before {
+	content: "\e241";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+}
+.icon-stack:before {
+	content: "\e242";
+}
+.icon-tree:before {
+	content: "\e243";
+}
+.icon-tree-2:before {
+	content: "\e244";
+}
+.icon-paragraph-left:before {
+	content: "\e246";
+}
+.icon-paragraph-center:before {
+	content: "\e247";
+}
+.icon-paragraph-right:before {
+	content: "\e248";
+}
+.icon-paragraph-justify:before {
+	content: "\e249";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-home:before {
+	content: "\21";
+}
+.icon-home-2:before {
+	content: "\e250";
+}
+.icon-out-2:before,
+.icon-new-tab:before {
+	content: "\e024";
+}
+.icon-out-3:before,
+.icon-new-tab-2:before {
+	content: "\e251";
+}
+.icon-link:before {
+	content: "\e252";
+}
+.icon-picture:before,
+.icon-image:before {
+	content: "\2f";
+}
+.icon-pictures:before,
+.icon-images:before {
+	content: "\30";
+}
+.icon-palette:before,
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-camera-2:before,
+.icon-video:before {
+	content: "\e015";
+}
+.icon-play-2:before,
+.icon-video-2:before,
+.icon-youtube:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-enter:before {
+	content: "\e257";
+}
+.icon-exit:before {
+	content: "\e258";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-quote:before,
+.icon-quotes-left:before {
+	content: "\60";
+}
+.icon-quote-2:before,
+.icon-quotes-right:before {
+	content: "\61";
+}
+.icon-quote-3:before,
+.icon-bubble-quote:before {
+	content: "\e259";
+}
+.icon-phone:before {
+	content: "\e260";
+}
+.icon-phone-2:before {
+	content: "\e261";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-envelope-opened:before,
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-tag:before {
+	content: "\e262";
+}
+.icon-tag-2:before {
+	content: "\e263";
+}
+.icon-tags:before {
+	content: "\e264";
+}
+.icon-tags-2:before {
+	content: "\e265";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-screwdriver:before,
+.icon-tools:before {
+	content: "\36";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-switch:before {
+	content: "\e266";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-unlock:before {
+	content: "\e267";
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-scissors:before {
+	content: "\e268";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-eye-close:before,
+.icon-eye-blocked:before,
+.icon-eye-2:before {
+	content: "\e269";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-broadcast:before,
+.icon-connection:before,
+.icon-wifi:before {
+	content: "\e01b";
+}
+.icon-book:before {
+	content: "\e271";
+}
+.icon-lightning:before,
+.icon-flash:before {
+	content: "\79";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-calendar-3:before {
+	content: "\e273";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-attachment:before,
+.icon-paperclip:before,
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-pin:before,
+.icon-pushpin:before {
+	content: "\73";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-shield:before {
+	content: "\e274";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-flag-3:before {
+	content: "\e275";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-bookmark-2:before {
+	content: "\e276";
+}
+.icon-heart:before {
+	content: "\e277";
+}
+.icon-heart-2:before {
+	content: "\e278";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before {
+	content: "\5c";
+}
+.icon-unfeatured:before,
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-star:before {
+	content: "\42";
+}
+.icon-smiley:before,
+.icon-smiley-happy:before {
+	content: "\e279";
+}
+.icon-smiley-2:before,
+.icon-smiley-happy-2:before {
+	content: "\e280";
+}
+.icon-smiley-sad:before {
+	content: "\e281";
+}
+.icon-smiley-sad-2:before {
+	content: "\e282";
+}
+.icon-smiley-neutral:before {
+	content: "\e283";
+}
+.icon-smiley-neutral-2:before {
+	content: "\e284";
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-credit:before {
+	content: "\e286";
+}
+.icon-credit-2:before {
+	content: "\e287";
+}
+.icon-expired:before {
+	content: "\4b";
+}
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+font,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	background: transparent;
+}
+blockquote,
+q {
+	quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+	content: '';
+	content: none;
+}
+del {
+	text-decoration: line-through;
+}
+html {
+	overflow-y: scroll;
+	height: 100%;
+}
+body {
+	margin: 0;
+	padding: 0;
+	font-size: 62.5%;
+	line-height: 1.5em;
+	height: 100%;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+body,
+td,
+th,
+span,
+a {
+	font-family: Arial, Helvetica, sans-serif;
+}
+html,
+body {
+	height: 100%;
+}
+a,
+img {
+	padding: 0;
+	margin: 0;
+}
+img {
+	border: 0 none;
+}
+form {
+	margin: 0;
+	padding: 0;
+}
+ul {
+	padding: 0;
+	margin: 0;
+}
+h1 {
+	margin: 0;
+	padding-bottom: 8px;
+	font-size: 1.4em;
+	font-weight: bold;
+	line-height: 2em;
+}
+h2 {
+	padding-top: .83em;
+	padding-bottom: .83em;
+}
+h3 {
+	font-size: 1.4em;
+}
+a:link {
+	color: #054993;
+	text-decoration: none;
+}
+a:visited {
+	color: #054993;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+}
+a:focus {
+	text-decoration: underline;
+}
+iframe {
+	border: 0;
+}
+.enabled {
+	color: #005800;
+	font-weight: bold;
+}
+.disabled {
+	color: #a20000;
+	font-weight: bold;
+}
+p.error {
+	color: #a20000;
+	font-weight: bold;
+}
+.warning {
+	color: #a20000;
+	font-weight: bold;
+}
+.nowarning {
+	color: #2c2c2c;
+	font-weight: bold;
+}
+.success {
+	color: #005800;
+	font-weight: bold;
+}
+.allow {
+	color: #005800;
+}
+span.writable {
+	color: #005800;
+}
+.deny {
+	color: #a20000;
+}
+span.unwritable {
+	color: #a20000;
+}
+.none {
+	color: #aaaaaa;
+}
+.pointer {
+	cursor: pointer;
+}
+.nowrap {
+	white-space: nowrap;
+}
+p.nowarning,
+p.warning {
+	margin: 10px;
+}
+#minwidth,
+#minwidth-body {
+	min-width: 980px;
+}
+#containerwrap {
+	position: relative;
+}
+#header {
+	position: relative;
+}
+#header h1.title {
+	font-size: 1.5em;
+	font-weight: normal;
+	line-height: 25px;
+	margin: 0;
+	padding: 0 0 0 120px;
+}
+#footer {
+	padding: 10px 20px;
+}
+#footer .copyright {
+	margin: 0 0 0 0;
+	text-align: center;
+}
+#footer p {
+	font-size: 1.2em;
+}
+#nav .no-nav {
+	line-height: 2em;
+}
+#content {
+	margin: 5px 20px 20px 20px;
+}
+.cpanel-page div#element-box {
+	padding: 15px;
+}
+#module-status {
+	float: right;
+	position: relative;
+	top: -48px;
+}
+#module-status div.btn-group {
+	display: block;
+	float: left;
+	padding: 4px 10px 0 10px;
+	font-size: 1.2em;
+}
+#module-status div.divider {
+	display: none;
+}
+#module-status .unread-messages a {
+	font-weight: bold;
+}
+.title-ua {
+	position: relative;
+	width: 60%;
+}
+.enabled,
+.disabled,
+p.error,
+.warning,
+.nowarning,
+.success {
+	font-weight: bold;
+}
+.pointer {
+	cursor: pointer;
+}
+.nowrap {
+	white-space: nowrap;
+}
+span.note {
+	display: block;
+	padding: 5px;
+}
+div.checkin-tick {
+	text-indent: -9999px;
+}
+.ol-textfont {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.2em;
+}
+.ol-captionfont {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.2em;
+	font-weight: bold;
+}
+.ol-captionfont a {
+	text-decoration: none;
+}
+div.subheader .padding {
+	padding: 0;
+}
+div.pagetitle {
+	padding: 0 0 5px 5px;
+	margin: 0;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+	line-height: 54px;
+	width: 100%;
+	margin-top: -20px;
+	height: 60px;
+}
+.tabs-left > .nav-tabs {
+	float: left;
+	margin-right: 19px;
+	border-right: 1px solid #DDD;
+}
+tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+	border-bottom: 0;
+}
+.tab-content {
+	overflow: visible;
+}
+.tabs-left .tab-content {
+	overflow: auto;
+}
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #ffffff;
+	text-align: center;
+	text-decoration: none;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+.pagetitle h2 {
+	padding: 0 0 0 50px;
+	font-size: 1.3em;
+	font-weight: bold;
+	line-height: 48px;
+	font-style: italic;
+}
+div.configuration {
+	font-size: 1.2em;
+	font-weight: bold;
+	line-height: 2em;
+	padding-left: 30px;
+	margin-left: 10px;
+}
+div.toolbar-box h3 {
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	padding: 0;
+	margin: 0;
+}
+.btn-toolbar {
+	margin-bottom: 3px;
+	margin-top: 14px;
+}
+div.btn-toolbar,
+div.toolbar-list {
+	float: left;
+	text-align: left;
+	padding: 0;
+}
+div.toolbar-list li {
+	padding: 5px 1px 5px 4px;
+	text-align: center;
+	height: 52px;
+	list-style: none;
+	float: left;
+}
+div.toolbar-list li.spacer {
+	width: 10px;
+}
+div.toolbar-list li.divider {
+	width: 10px;
+	margin-right: 10px;
+}
+div.toolbar-list span {
+	float: none;
+	width: 32px;
+	height: 32px;
+	margin: 0 auto;
+	display: block;
+}
+div.toolbar-list a {
+	display: block;
+	float: left;
+	white-space: nowrap;
+	padding: 1px 5px;
+	cursor: pointer;
+	font-weight: bold;
+}
+div.btn-toolbar div.btn-group button {
+	display: block;
+	float: left;
+	white-space: nowrap;
+	padding: 1px 5px;
+	cursor: pointer;
+	text-align: center;
+}
+div.btn-toolbar button:hover,
+div.btn-toolbar button:focus,
+div.toolbar-list a:hover,
+div.toolbar-list a:focus {
+	text-decoration: none;
+}
+td#mm_pane {
+	width: 90%;
+}
+input#mm_subject {
+	width: 200px;
+}
+textarea#mm_message {
+	width: 100%;
+}
+textarea {
+	resize: both;
+}
+textarea.vert {
+	resize: vertical;
+}
+textarea.noResize {
+	resize: none;
+}
+.pane-sliders {
+	margin: 0;
+	position: relative;
+}
+.pane-sliders .title {
+	margin: 0;
+	padding: 2px;
+	cursor: pointer;
+}
+.pane-sliders .panel {
+	margin-bottom: 3px;
+}
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+h3.pane-toggler-down a:focus,
+h3.pane-toggler a:focus {
+	outline: none;
+}
+.pane-toggler span {
+	padding-left: 20px;
+}
+.pane-toggler-down span {
+	padding-left: 20px;
+}
+.pane-slider.pane-hide {
+	display: none;
+}
+div#position-icon.pane-sliders div.pane-down div.quickicon-wrapper {
+	margin: 5px 0 5px 0;
+}
+div#position-icon.pane-sliders div.pane-down .quickicon-wrapper .icon {
+	padding: 5px 0 5px 10px;
+	margin: 0;
+}
+dl.tabs {
+	float: left;
+	margin: 10px 0 -1px 0;
+	z-index: 50;
+}
+dl.tabs dt {
+	float: left;
+	padding: 4px 10px;
+	margin-left: 3px;
+}
+dl.tabs dt.open {
+	z-index: 100;
+}
+div.current {
+	clear: both;
+	padding: 10px 10px;
+}
+div.current dd {
+	padding: 0;
+	margin: 0;
+}
+dl#content-pane.tabs {
+	margin: 1px 0 0 0;
+}
+div.current label,
+div.current span.faux-label {
+	display: block;
+	min-width: 150px;
+	float: left;
+	clear: left;
+	margin-top: 8px;
+}
+div.current fieldset.radio {
+	float: left;
+}
+div.current fieldset.radio input {
+	clear: none;
+	min-width: 15px;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+div.current fieldset.radio label {
+	clear: none;
+	min-width: 45px;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+div.current fieldset.checkboxes {
+	float: left;
+	clear: right;
+}
+div.current fieldset.checkboxes input {
+	clear: left;
+	min-width: 15px;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+div.current fieldset.checkboxes label {
+	clear: right;
+	min-width: 45px;
+	margin: 3px 0 0 2px;
+}
+div.current input,
+div.current span.faux-input,
+div.current textarea,
+div.current select {
+	clear: none;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+div.current select {
+	margin-bottom: 15px;
+}
+div.current table#acl-config th.acl-groups {
+	text-align: left;
+}
+div.current table#filter-config th.acl-groups {
+	text-align: left;
+}
+div.current table#filter-config select {
+	margin-bottom: 0;
+}
+div#menu-assignment {
+	clear: left;
+}
+div#menu-assignment ul.menu-links {
+	float: left;
+	width: 49%;
+}
+div#menu-assignment ul.menu-links label {
+	clear: none;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+div#menu-assignment ul.menu-links input {
+	clear: left;
+	float: left;
+}
+button.jform-rightbtn {
+	float: right;
+	margin-right: 0;
+}
+p.tab-description {
+	font-size: 1.091em;
+	margin-left: 0;
+	margin-top: 5px;
+}
+#login-page input,
+#login-page select {
+	float: right;
+	clear: none;
+}
+#login-page .login {
+	margin: 0 auto;
+	width: 575px;
+	margin-bottom: 100px;
+}
+#login-page .pagetitle h2 {
+	margin: -70px 0 30px 0;
+	font-size: 2em;
+	padding: 0;
+}
+#login-page p {
+	margin: 0;
+	padding: 0;
+	margin-bottom: 1em;
+	font-size: 1.2em;
+}
+#login-page #header {
+	margin-bottom: 100px;
+}
+#login-page .login-inst {
+	float: left;
+	width: 35%;
+}
+#login-page .login-box {
+	float: right;
+	width: 63%;
+}
+#login-page #lock {
+	width: 150px;
+	height: 137px;
+}
+#login-page #element-box.login {
+	padding: 20px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+#login-page .button {
+	text-align: right;
+}
+#login-page .login-text {
+	text-align: left;
+	width: 40%;
+	float: left;
+}
+#form-login {
+	float: left;
+	padding: 1.1em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+#form-login fieldset {
+	border: none;
+}
+#form-login label {
+	display: block;
+	float: left;
+	clear: left;
+	width: 100px;
+	text-align: right;
+	padding: 4px;
+	color: #2c2c2c;
+	font-weight: bold;
+	font-size: 1.4em;
+	margin-bottom: 15px;
+}
+#form-login div.button1 div.next {
+	float: left;
+}
+#form-login div.button1 a {
+	height: 2.2em;
+	line-height: 2.2em;
+	font-size: 1.5em;
+	cursor: default;
+	padding: 0 15px 0 15px;
+}
+.login-submit {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	width: 0;
+	height: 0;
+}
+#cpanel div.icon,
+.cpanel div.icon {
+	text-align: center;
+	margin-right: 5px;
+	float: left;
+	margin-bottom: 5px;
+}
+#cpanel div.icon a,
+.cpanel div.icon a {
+	display: block;
+	float: left;
+	height: auto;
+	min-height: 97px;
+	width: 108px;
+	color: #2c2c2c;
+	vertical-align: middle;
+	text-decoration: none;
+	font-weight: bold;
+}
+#cpanel img,
+.cpanel img {
+	padding: 10px;
+	margin: 0 auto;
+}
+#cpanel span,
+.cpanel span {
+	display: block;
+	text-align: center;
+	padding: 0 0 5px;
+}
+div.cpanel-icons {
+	width: 54%;
+	float: left;
+}
+div.cpanel-component {
+	width: 45%;
+	float: right;
+}
+div.col {
+	float: left;
+}
+div.options-section.col {
+	float: right;
+}
+div.col1 {
+	float: left;
+	width: 45%;
+}
+div.col2 {
+	float: right;
+	width: 45%;
+}
+div.width-1 {
+	width: 1%;
+}
+div.width-3 {
+	width: 3%;
+}
+div.width-5 {
+	width: 5%;
+}
+div.width-10 {
+	width: 10%;
+}
+div.width-20 {
+	width: 20%;
+}
+div.width-30 {
+	width: 30%;
+}
+div.width-35 {
+	width: 35%;
+}
+div.width-40 {
+	width: 40%;
+}
+div.width-45 {
+	width: 45%;
+}
+div.width-50 {
+	width: 50%;
+}
+div.width-55 {
+	width: 55%;
+}
+div.width-60 {
+	width: 60%;
+}
+div.width-65 {
+	width: 65%;
+}
+div.width-70 {
+	width: 70%;
+}
+div.width-80 {
+	width: 80%;
+}
+div.width-100 {
+	width: 100%;
+}
+.clrlft {
+	clear: left;
+}
+.clrrt {
+	clear: right;
+}
+.fltlft {
+	float: left;
+}
+.fltrt {
+	float: right;
+}
+.fltnone {
+	float: none;
+}
+div.main-section {
+	width: 60%;
+}
+div.options-section {
+	width: 38%;
+	margin: 10px 10px 10px 0;
+}
+div.width-40.fltrt {
+	width: 38%;
+	margin: 10px 10px 10px 0;
+}
+div.rules-section {
+	width: 98%;
+	margin: 10px;
+}
+fieldset {
+	margin: 2px 10px 2px 10px;
+	padding: 5px;
+	text-align: left;
+}
+legend {
+	font-size: 1.3em;
+	font-weight: bold;
+	padding-bottom: 5px;
+}
+fieldset p {
+	margin: 10px 0;
+	font-size: 1.2em;
+}
+fieldset ol,
+ol#property-values,
+fieldset ul,
+ul#property-values {
+	margin: 0;
+	padding: 0;
+}
+fieldset li,
+ol#property-values li,
+ul#property-values li {
+	list-style: none;
+	margin: 0;
+	padding: 5px;
+}
+fieldset.adminform fieldset.radio,
+fieldset.panelform fieldset.radio,
+fieldset.adminform-legacy fieldset.radio {
+	border: 0;
+	float: left;
+	padding: 0;
+	margin: 0 0 5px 0;
+	clear: right;
+}
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+	min-width: 40px;
+	float: left;
+	clear: none;
+}
+fieldset.adminform fieldset.checkboxes,
+fieldset.panelform fieldset.checkboxes,
+fieldset.adminform-legacy fieldset.checkboxes {
+	border: 0;
+	float: left;
+	padding: 0;
+	margin: 0 0 5px 0;
+	clear: right;
+}
+fieldset.adminform fieldset.checkboxes input[type="checkbox"],
+fieldset.panelform fieldset.checkboxes input[type="checkbox"] {
+	float: left;
+	clear: left;
+}
+fieldset.adminform fieldset.checkboxes label,
+fieldset.panelform fieldset.checkboxes label,
+fieldset.adminform fieldset.checkboxes span.faux-label,
+fieldset.panelform fieldset.checkboxes span.faux-label {
+	clear: right;
+}
+div.current span.spacer > span.before,
+fieldset.adminform span.spacer > span.before,
+fieldset.panelform span.spacer > span.before {
+	clear: both;
+	overflow: hidden;
+	height: 0;
+	display: block;
+}
+fieldset.panelform-legacy label,
+fieldset.adminform-legacy label,
+fieldset.panelform-legacy span.faux-label,
+fieldset.adminform-legacy span.faux-label {
+	min-width: 150px;
+	float: left;
+}
+fieldset.adminform .input-prepend,
+fieldset.adminform .input-append,
+fieldset.panelform .input-prepend,
+fieldset.panelform .input-append {
+	float: left;
+}
+fieldset.adminform .adminformlist .btn.modal,
+fieldset.adminform .input-prepend > *,
+fieldset.adminform .input-append > *,
+fieldset.panelform .adminformlist .btn.modal,
+fieldset.panelform .input-prepend > *,
+fieldset.panelform .input-append > * {
+	float: none;
+	vertical-align: middle;
+}
+fieldset.panelform-legacy label.radiobtn-jno,
+fieldset.panelform-legacy label.radiobtn-jyes,
+fieldset.panelform-legacy label.radiobtn-show,
+fieldset.panelform-legacy label.radiobtn-hide,
+fieldset.panelform-legacy label.radiobtn-off,
+fieldset.panelform-legacy label.radiobtn-on {
+	min-width: 40px !important;
+	clear: none !important;
+}
+#jform_plugdesc-lbl,
+#jform_description-lbl {
+	font-weight: bold;
+	clear: both;
+	margin-top: 15px;
+}
+p.jform_desc {
+	clear: left;
+}
+div#jform_ordering {
+	font-size: 1.091em;
+	margin-top: 3px;
+}
+fieldset ul.checklist {
+	margin-left: 27px;
+}
+fieldset ul.checklist input,
+fieldset ul.checklist label {
+	float: none;
+}
+fieldset ul.checklist input:focus {
+	outline: thin dotted #333333;
+}
+fieldset#filter-bar {
+	margin: 0;
+	padding: 5px 10px 5px 10px;
+	float: left;
+	width: 98%;
+}
+fieldset#filter-bar ol,
+fieldset#filter-bar ul {
+	list-style: none;
+	margin: 0;
+	padding: 5px 0 0;
+}
+fieldset#filter-bar ol li,
+fieldset#filter-bar ul li {
+	float: left;
+	padding: 0 5px 0 0;
+}
+fieldset#filter-bar ol li fieldset,
+fieldset#filter-bar ul li fieldset {
+	margin: 0;
+	padding: 0;
+}
+fieldset#filter-bar .filter-search {
+	float: left;
+	padding-bottom: 3px;
+}
+fieldset#filter-bar .filter-select {
+	float: right;
+}
+fieldset#filter-bar input#search {
+	width: 10em;
+}
+.invalid {
+	font-weight: bold;
+}
+input.readonly,
+span.faux-input {
+	border: 0;
+}
+.star {
+	color: #cc0000;
+	font-size: 1.2em;
+}
+input,
+select,
+span.faux-input {
+	font-size: 1.2em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+span.readonly {
+	float: left;
+	font-size: 1.2em;
+	line-height: 2em;
+}
+div.readonly {
+	font-size: 1.2em;
+	line-height: 2em;
+}
+div.extdescript {
+	margin-left: 10px;
+}
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+	font-family: Arial, Helvetica, sans-serif;
+	padding: 1px 6px;
+	font-size: 1.2em;
+	line-height: 1.5em;
+}
+textarea {
+	font-size: 1.4em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+input.button {
+	cursor: pointer;
+}
+label {
+	font-weight: bold;
+	font-size: 1.1em;
+}
+span.faux-label {
+	font-weight: bold;
+	font-size: 1.1em;
+}
+label.selectlabel {
+	position: absolute;
+	left: -1000em;
+}
+.paramrules {
+	padding: 10px;
+}
+span.gi {
+	font-weight: bold;
+	margin-right: 5px;
+}
+span.gtr {
+	visibility: hidden;
+	margin-right: 5px;
+}
+table.admintable td {
+	padding: 3px;
+	font-size: 1em;
+}
+table.admintable td.key,
+table.admintable td.paramlist_key {
+	text-align: right;
+	width: 140px;
+	font-weight: bold;
+	font-size: 1em;
+}
+table.admintable td.key label,
+table.admintable td.paramlist_key label {
+	font-size: 1em;
+}
+table.admintable td.paramlist_value label {
+	font-size: 1em;
+}
+table.admintable input,
+table.admintable span.faux-input,
+table.admintable select {
+	font-size: 1em;
+}
+table.paramlist td.paramlist_description {
+	text-align: left;
+	width: 170px;
+	font-weight: normal;
+}
+table.admintable td.key.vtop {
+	vertical-align: top;
+}
+fieldset.adminform {
+	margin: 0 10px 10px 10px;
+	overflow: hidden;
+}
+.adminformlist .btn.modal {
+	float: left;
+	margin-top: 7px;
+}
+ul.adminformlist,
+ul.adminformlist li,
+dl.adminformlist,
+dl.adminformlist li {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+ul.adminformlist pre {
+	font-size: 1.3em;
+}
+ul.adminformlist .button2-left,
+ul.adminformlist .button2-left {
+	margin-top: 5px;
+}
+table.adminform {
+	width: 100%;
+	border-collapse: collapse;
+	margin: 8px 0 10px 0;
+	margin-bottom: 15px;
+}
+table.adminform.nospace {
+	margin-bottom: 0;
+}
+table.adminform th {
+	font-size: 1.4em;
+	padding: 6px 2px 4px 4px;
+	text-align: left;
+	height: 25px;
+}
+table.adminform td {
+	padding: 3px;
+	text-align: left;
+}
+table.adminform td#filter-bar {
+	text-align: left;
+}
+table.adminform td.helpMenu {
+	text-align: right;
+}
+table.adminform tr {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+td.center,
+th.center {
+	text-align: center;
+}
+th.width-1 {
+	width: 1%;
+}
+th.width-3 {
+	width: 3%;
+}
+th.width-5 {
+	width: 5%;
+}
+th.width-10 {
+	width: 10%;
+}
+th.width-12 {
+	width: 12%;
+}
+th.width-15 {
+	width: 15%;
+}
+th.width-20 {
+	width: 20%;
+}
+th.width-25 {
+	width: 25%;
+}
+th.width-30 {
+	width: 30%;
+}
+th.width-40 {
+	width: 40%;
+}
+th.row-number-col {
+	width: 3%;
+}
+th.checkmark-col {
+	width: 1%;
+}
+th.state-col {
+	width: 5%;
+}
+th.ordering-col {
+	width: 10%;
+}
+th.ordering-col a {
+	display: block;
+	float: left;
+	margin-left: 3px;
+}
+th.ordering-col a img {
+	margin-left: 4px;
+	margin-right: 4px;
+}
+.categories th.ordering-col input,
+.categories td.order input {
+	font-size: 1em;
+}
+th.category-col {
+	width: 5%;
+}
+th.access-col {
+	width: 10%;
+}
+.categories th.access-col {
+	width: 5%;
+}
+th.hits-col {
+	width: 5%;
+}
+th.id-col {
+	width: 3%;
+}
+th.featured-col {
+	width: 5%;
+}
+th.created-by-col {
+	width: 15%;
+}
+th.date-col {
+	width: 5%;
+}
+th.language-col {
+	width: 5%;
+}
+th.home-col {
+	width: 5%;
+}
+table.adminlist {
+	width: 100%;
+	float: left;
+}
+table.adminlist td,
+table.adminlist th {
+	padding: 4px;
+	font-size: 1.2em;
+}
+table.adminlist thead th {
+	text-align: center;
+}
+table.adminlist thead a:hover {
+	text-decoration: none;
+}
+table.adminlist thead th img {
+	vertical-align: middle;
+}
+table.adminlist tbody th {
+	font-weight: bold;
+}
+table.adminlist tr {
+	padding-left: 30px;
+	padding-right: 30px;
+}
+table.adminlist tbody tr {
+	text-align: left;
+}
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	height: 25px;
+}
+table.adminlist tfoot tr {
+	text-align: center;
+}
+table.adminlist tfoot td,
+table.adminlist tfoot th {
+	text-align: center;
+}
+table.adminlist td.order {
+	text-align: center;
+	white-space: nowrap;
+}
+table.adminlist td.order span {
+	float: left;
+	width: 20px;
+	text-align: center;
+}
+table.adminlist td.order input {
+	text-align: center;
+	width: 3em;
+	font-size: 100%;
+}
+#media-tree_tree ul {
+	list-style: none outside none;
+	margin: 0 10px;
+}
+table.adminlist td.indent-4 {
+	padding-left: 4px;
+}
+table.adminlist td.indent-19 {
+	padding-left: 19px;
+}
+table.adminlist td.indent-34 {
+	padding-left: 34px;
+}
+table.adminlist td.indent-49 {
+	padding-left: 49px;
+}
+table.adminlist td.indent-64 {
+	padding-left: 64px;
+}
+table.adminlist td.indent-79 {
+	padding-left: 79px;
+}
+table.adminlist td.indent-94 {
+	padding-left: 94px;
+}
+table.adminlist td.indent-109 {
+	padding-left: 109px;
+}
+table.adminlist td.indent-124 {
+	padding-left: 124px;
+}
+table.adminlist td.indent-139 {
+	padding-left: 139px;
+}
+table.adminlist tr td.btns a {
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	padding: 3px 20px;
+}
+table.adminlist tr td.btns a:hover,
+table.adminlist tr td.btns a:active,
+table.adminlist tr td.btns a:focus {
+	text-decoration: none;
+}
+table.adminlist td li {
+	list-style: inside;
+}
+ul#new-modules-list {
+	margin-left: 50px;
+	font-size: 1.4em;
+	line-height: 1.5em;
+}
+.clr {
+	clear: both;
+	overflow: hidden;
+	height: 0;
+}
+.clearfix:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+.menu-module-list {
+	list-style-position: inside;
+	padding-left: 10px;
+	margin-left: 5px;
+}
+.container {
+	clear: both;
+	text-decoration: none;
+}
+* html .container {
+	display: inline-block;
+}
+table.noshow {
+	width: 100%;
+	border-collapse: collapse;
+	padding: 0;
+	margin: 0;
+}
+table.noshow tr {
+	vertical-align: top;
+}
+table.noshow fieldset {
+	margin: 15px 7px 7px 7px;
+}
+a.saveorder {
+	width: 16px;
+	height: 16px;
+	display: block;
+	overflow: hidden;
+	float: right;
+	margin-right: 8px;
+}
+#editor-xtd-buttons {
+	padding: 5px;
+}
+button {
+	font-family: Arial, Helvetica, sans-serif;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	margin-right: 3px;
+	margin-left: 3px;
+}
+.invalid {
+	font-weight: bold;
+}
+.button1,
+.button1 div {
+	height: 1%;
+	float: right;
+}
+.button1 {
+	white-space: nowrap;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+.button1 a {
+	display: block;
+	height: 2.2em;
+	float: left;
+	line-height: 2.2em;
+	font-size: 1.2em;
+	font-weight: bold;
+	cursor: default;
+	padding: 0 6px 0 6px;
+}
+.button1 a:hover,
+.button1 a:focus {
+	text-decoration: none;
+}
+.button2-left,
+.button2-right {
+	float: left;
+	line-height: 1.5em;
+	font-size: 1.2em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+.button2-left.smallsub,
+.button2-right.smallsub {
+	line-height: 1.2em;
+	font-size: .9em;
+}
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	display: block;
+	float: left;
+	cursor: default;
+}
+.button2-left span,
+.button2-right span {
+	cursor: default;
+}
+.button2-left .page a,
+.button2-right .page a,
+.button2-left .page span,
+.button2-right .page span,
+.button2-left .blank a,
+.button2-right .blank a,
+.button2-left .blank span,
+.button2-right .blank span {
+	padding: 0 6px;
+}
+.page span,
+.blank span {
+	font-weight: bold;
+}
+.button2-left a:hover,
+.button2-right a:hover,
+.button2-left a:focus,
+.button2-right a:focus {
+	text-decoration: none;
+}
+.button2-left a,
+.button2-left span {
+	padding: 0 24px 0 6px;
+}
+.button2-right a,
+.button2-right span {
+	padding: 0 6px 0 24px;
+}
+.button2-left {
+	float: left;
+	margin-left: 5px;
+}
+.button2-right {
+	float: left;
+	margin-left: 5px;
+}
+div.containerpg {
+	position: relative;
+	left: 50%;
+	float: left;
+	clear: left;
+}
+div.pagination {
+	position: relative;
+	left: -50%;
+	margin: 0 auto;
+	padding: .5em;
+}
+.pagination div.limit {
+	float: left;
+	margin: 0 10px;
+	font-size: 1.2em;
+	height: 1.8em;
+	line-height: 1.8em;
+}
+.pagination div.limit label {
+	font-size: 100%;
+	height: 1.8em;
+	line-height: 1.8em;
+}
+.pagination div.limit select {
+	font-size: 100%;
+}
+.pagination button {
+	font-size: 100%;
+	height: 2.0em;
+	line-height: 1.8em;
+	margin-right: 20px;
+}
+div.pagination .button2-right,
+div.pagination .button2-left {
+	font-size: 1.2em;
+	height: 1.6em;
+	line-height: 1.6em;
+}
+table.adminlist .pagination {
+	display: table;
+	padding: 0;
+	margin: 0 auto;
+	font-size: .8em;
+}
+table.adminlist .pagination button {
+	font-size: 1.2em;
+	height: 1.6em;
+	line-height: 1.5em;
+	margin-right: 20px;
+}
+div.toggle-editor {
+	margin-top: 9px;
+}
+.tip {
+	float: left;
+	padding: 5px;
+	max-width: 400px;
+	z-index: 50;
+}
+.tip-title {
+	padding: 0;
+	margin: 0;
+	font-size: 120%;
+	margin-top: -15px;
+	padding-top: 15px;
+	padding-bottom: 5px;
+}
+.tip-text {
+	font-size: 100%;
+	text-align: left;
+	margin: 0;
+}
+a img.calendar {
+	width: 16px;
+	height: 16px;
+	margin-left: 3px;
+	cursor: pointer;
+	vertical-align: middle;
+}
+a.jgrid:hover {
+	text-decoration: none;
+}
+.jgrid span.state {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+.jgrid span.text {
+	display: none;
+}
+div.message {
+	text-align: center;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.2em;
+	padding: 3px;
+	margin-bottom: 10px;
+	font-weight: bold;
+}
+.helpIndex {
+	border: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	overflow: auto;
+}
+.helpFrame {
+	width: 100%;
+	height: 800px;
+	padding: 0 5px 0 10px;
+}
+#treecellhelp {
+	width: 25%;
+	display: block;
+	position: relative;
+	float: left;
+	margin: 0;
+	padding: 2px;
+	overflow: hidden;
+}
+#datacellhelp {
+	width: 73%;
+	display: block;
+	float: left;
+	margin: 0;
+	padding: 2px 0 0 0;
+}
+.outline {
+	padding: 2px;
+}
+h2.modal-title {
+	margin-left: 15px;
+	margin-bottom: 0;
+	margin-top: 5px;
+	font-size: 1.8em;
+	padding-bottom: .5em;
+}
+ul.menu_types {
+	padding: 0 0 0 15px;
+	width: 95%;
+	margin: 0;
+}
+ul.menu_types li,
+dl.menu_type dd ul li {
+	width: 240px;
+	list-style: none;
+	display: block;
+	float: left;
+	margin-right: 10px;
+}
+ul.menu_types li {
+	width: 47%;
+}
+dl.menu_type {
+	width: 240px;
+	margin: 0;
+	padding: 0;
+}
+dl.menu_type dt {
+	font-weight: bold;
+	font-size: 1.5em;
+	float: left;
+	margin: 13px 0 5px 0;
+	width: 240px;
+}
+dl.menu_type dd {
+	clear: left;
+	margin: 0;
+}
+dl.menu_type dd a {
+	font-size: 1.2em;
+}
+dl.menu_type dd ul li {
+	margin: 0;
+}
+ul#new-modules-list {
+	padding: 5px 0 0 15px;
+	width: 95%;
+	margin: 0;
+	list-style: none;
+}
+ul#new-modules-list li {
+	list-style: none;
+	display: block;
+	float: left;
+	margin: 0 20px 0 0;
+	width: 47%;
+}
+ul#new-modules-list li a {
+	font-size: 1em;
+	line-height: 1.5em;
+}
+body.contentpane #filter-bar {
+	font-size: 80%;
+}
+body.contentpane input,
+body.contentpane select {
+	font-size: 120%;
+}
+#filter-bar input,
+#filter-bar select,
+#filter-bar button {
+	font-size: 110%;
+}
+#skiplinkholder a,
+#skiplinkholder a:link,
+#skiplinkholder a:visited {
+	display: block;
+	width: 99%;
+	position: absolute;
+	top: 0;
+	left: -200%;
+	z-index: 2;
+}
+#skiplinkholder a:focus,
+#skiplinkholder a:active {
+	left: 0;
+	top: 0;
+	z-index: 100;
+}
+#skiplinkholder p {
+	margin: 0;
+}
+#skiptargetholder {
+	position: absolute;
+	left: -200%;
+}
+#skiplinkholder a,
+#skiplinkholder a:link,
+#skiplinkholder a:visited {
+	text-decoration: underline;
+	padding: 5px;
+	font-size: 1.3em;
+	font-weight: bold;
+	padding-left: 20px;
+	padding-right: 20px;
+}
+.body-overlayed a,
+.body-overlayed input,
+.body-overlayed button {
+	visibility: hidden;
+}
+.body-overlayed #sbox-window a,
+.body-overlayed #sbox-window input,
+.body-overlayed #sbox-window button {
+	visibility: visible;
+}
+.element-hidden,
+.hide {
+	display: none;
+}
+.hidebtn {
+	border: 0 !important;
+	padding: 0 !important;
+	margin: 0;
+	width: 0;
+	height: 0;
+}
+.element-invisible,
+.hidelabeltxt {
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	padding: 0;
+	margin: 0;
+}
+legend.element-invisible {
+	position: absolute !important;
+	margin: 0;
+	padding: 0;
+	border: 0;
+	margin-left: -10000px;
+	font-size: 1px;
+	height: 0;
+}
+fieldset.panelform {
+	overflow: hidden;
+	clear: both;
+}
+fieldset.adminform label,
+fieldset.panelform label,
+fieldset.adminform span.faux-label,
+fieldset.panelform span.faux-label {
+	line-height: 2em;
+	clear: left;
+	min-width: 12em;
+	float: left;
+	margin-left: 10px;
+	margin-right: 5px;
+}
+fieldset.adminform.long label,
+fieldset.panelform.long label,
+fieldset.adminform.long span.faux-label,
+fieldset.panelform.long span.faux-label {
+	min-width: 18em;
+}
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+	margin-left: 0;
+}
+fieldset.adminform input,
+fieldset.adminform span.faux-input,
+fieldset.adminform textarea,
+fieldset.adminform select,
+fieldset.adminform img,
+fieldset.adminform button,
+fieldset.panelform input,
+fieldset.panelform span.faux-input,
+fieldset.panelform textarea,
+fieldset.panelform select,
+fieldset.panelform img,
+fieldset.panelform button {
+	float: left;
+	margin: 5px 5px 5px 0;
+	width: auto;
+}
+fieldset.batch {
+	margin: 20px 10px 10px 10px;
+	padding: 10px;
+}
+fieldset.batch label {
+	margin: 5px;
+	min-width: 40px;
+}
+fieldset.batch button {
+	margin: 3px;
+}
+fieldset#batch-choose-action {
+	clear: left;
+	border: 0 none;
+}
+fieldset.batch label {
+	float: left;
+	clear: none;
+}
+fieldset label#batch-choose-action-lbl {
+	clear: left;
+	margin-top: 15px;
+}
+label#batch-language-lbl,
+label#batch-user-lbl {
+	clear: left;
+	margin-right: 10px;
+	margin-top: 15px;
+}
+select#batch-language-id,
+select#batch-user-id {
+	margin-top: 15px;
+}
+select#batch-category-id,
+select#batch-position-id,
+select#batch-menu-id {
+	margin-right: 30px;
+}
+fieldset.batch select,
+fieldset.batch input,
+fieldset.batch img,
+fieldset.batch button {
+	float: left;
+}
+label#batch-access-lbl,
+label#batch-client-lbl {
+	margin-right: 10px;
+}
+div#jform_ordering {
+	font-size: 1.091em;
+	margin-top: 3px;
+}
+#jform_impmade,
+#jform_clicks {
+	width: 30px;
+}
+fieldset.panelform label#jform-imp {
+	min-width: 3em;
+	font-size: 1.091em;
+}
+fieldset.adminform input#jform_clickurl {
+	width: 20em;
+}
+a.move_up {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+span.move_up {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+a.move_down {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+span.move_down {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+a.grid_trash {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+div.acl-options {
+	width: 100%;
+}
+table.aclsummary-table,
+table.aclmodify-table {
+	border-collapse: collapse;
+	width: 100%;
+	font-size: 1.091em;
+}
+td.col1 {
+	font-size: 1.091em;
+	text-align: left;
+	padding: 4px;
+}
+table.aclsummary-table caption,
+table.aclmodify-table caption {
+	display: none;
+}
+table.aclsummary-table th.col1 {
+	width: 25%;
+}
+table.aclsummary-table th.col2,
+table.aclsummary-table th.col3,
+table.aclsummary-table th.col4,
+table.aclsummary-table th.col5,
+table.aclsummary-table th.col6 {
+	width: 15%;
+	vertical-align: bottom;
+	text-align: center;
+}
+span.icon-16-unset,
+span.icon-16-allowed,
+span.icon-16-denied,
+span.icon-16-locked {
+	padding-left: 18px;
+}
+label.icon-16-allow,
+label.icon-16-deny,
+a.icon-16-allow,
+a.icon-16-deny,
+a.icon-16-allowinactive,
+a.icon-16-denyinactive {
+	display: block;
+	height: 16px;
+	width: 16px;
+	margin: 0 auto;
+}
+label.icon-16-allow {
+	text-indent: -9999em;
+	position: relative;
+	left: 40%;
+}
+label.icon-16-deny {
+	text-indent: -9999em;
+	position: relative;
+	left: 40%;
+}
+table.aclmodify-table th.col2,
+table.aclmodify-table th.col3,
+table.aclmodify-table th.col4 {
+	width: 20%;
+	vertical-align: bottom;
+	text-align: center;
+}
+table.aclmodify-table select {
+	margin: 1px;
+}
+table.aclsummary-table td label,
+table.aclmodify-table td label {
+	min-width: 20px;
+}
+ul.acllegend {
+	list-style: none;
+	font-size: 1.091em;
+	padding-bottom: 10px;
+}
+ul.acllegend li {
+	display: block;
+	float: left;
+	padding-right: 20px;
+	margin: 15px 0 15px 10px;
+}
+ul.acllegend li.acl-allowed {
+	padding-left: 20px;
+	padding-right: 10px;
+}
+ul.acllegend li.acl-denied {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+ul.acllegend li.acl-editgroups {
+	padding-right: 10px;
+}
+ul.acllegend li.acl-resetbtn {
+	padding-right: 0;
+}
+li.acl-editgroups,
+li.acl-resetbtn {
+	display: block;
+	float: left;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	padding: 6px;
+	cursor: default;
+}
+li.acl-editgroups a:hover,
+li.acl-resetbtn a:hover,
+li.acl-editgroups a:focus,
+li.acl-resetbtn a:focus {
+	text-decoration: none;
+	cursor: default;
+}
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	text-decoration: none;
+	cursor: default;
+}
+table#acl-config {
+	width: 100%;
+	margin-top: 15px;
+}
+table#acl-config th,
+table#acl-config td {
+	height: 2em;
+	background: #f9fade;
+	text-align: center;
+	vertical-align: middle;
+}
+table#acl-config th.acl-groups {
+	padding-left: 8px;
+	font-weight: bold;
+	text-align: left;
+}
+table#acl-config th.acl-groups span.gi {
+	margin-right: 2px;
+}
+table#acl-config td {
+	width: 9em;
+}
+table#acl-config td select {
+	float: none;
+}
+.acl-action {
+	font-size: 1.091em;
+	margin: auto 0;
+}
+.acl-groups {
+	font-size: 1.091em;
+	font-weight: normal;
+}
+label#jform_rules-lbl {
+	float: none;
+	white-space: nowrap;
+	display: none;
+	visibility: hidden;
+}
+label#jform_filters-lbl {
+	float: none;
+	white-space: nowrap;
+	display: none;
+	visibility: hidden;
+}
+ul.config-option-list,
+ul.config-option-list li {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+ul.config-option-list fieldset {
+	margin: 0;
+	padding-left: 0;
+	padding-right: 0;
+}
+#permissions-sliders {
+	margin-top: 15px;
+}
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+	margin: 0 !important;
+	padding: 0 !important;
+	list-style-type: none;
+}
+#permissions-sliders ul#rules li {
+	margin: 0;
+	padding: 0;
+}
+#permissions-sliders ul#rules table.group-rules {
+	border-collapse: collapse;
+	margin: 5px;
+	width: 100%;
+}
+#permissions-sliders ul#rules table.group-rules td {
+	padding: 4px;
+	vertical-align: middle;
+	text-align: left;
+	overflow: hidden;
+}
+#permissions-sliders ul#rules table.group-rules th {
+	font-size: 1.2em;
+	overflow: hidden;
+	font-weight: bold;
+}
+#permissions-sliders .panel {
+	margin-bottom: 3px;
+	margin-left: 0;
+	border: 0;
+}
+#permissions-sliders p.rule-desc {
+	font-size: 1.1em;
+}
+#permissions-sliders div.rule-notes {
+	font-size: 1.1em;
+}
+ul#rules table.group-rules td label {
+	margin: 0 !important;
+	line-height: 1.1em;
+}
+ul#rules table.group-rules td span {
+	font-size: 1.1em;
+	padding-bottom: 4px;
+}
+ul#rules table.group-rules td span span {
+	font-size: 100%;
+}
+table.group-rules td select {
+	margin: 0 !important;
+}
+#permissions-sliders ul#rules .mypanel {
+	padding: 0;
+	line-height: 1.3em;
+}
+#permissions-sliders .mypanel table.group-rules caption {
+	font-size: 1.3em;
+}
+#permissions-sliders ul#rules {
+	padding: 5px;
+}
+#permissions-sliders ul#rules table.group-rules th {
+	text-align: left;
+	padding: 4px;
+}
+#permissions-sliders ul#rules table.group-rules td label {
+	min-width: 1em;
+}
+#permissions-sliders .pane-toggler span {
+	padding-left: 20px;
+}
+#permissions-sliders .pane-toggler-down span {
+	padding-left: 20px;
+}
+#permissions-sliders .pane-toggler-down span.level,
+#permissions-sliders .pane-toggler span.level {
+	padding: 0;
+}
+.swatch {
+	text-align: center;
+	padding: 0 15px 0 15px;
+}
+dl.tabs dt h3 {
+	padding: 0;
+	font-size: 100%;
+}
+ul.helpmenu li {
+	float: right;
+	margin: 10px;
+	padding: 0;
+	list-style-type: none;
+	font-weight: bold;
+}
+#menu {
+	position: relative;
+	z-index: 100;
+	padding: 0;
+	margin: 0;
+	width: 100%;
+	list-style: none;
+	font-size: 1.2em;
+	font-weight: bold;
+}
+#menu ul {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	font-size: 100%;
+}
+#menu ul li.separator {
+	margin-bottom: 1em;
+}
+#menu a {
+	padding: 0.35em 2.5em 0.35em 2em;
+	vertical-align: middle;
+	display: block;
+	text-decoration: none;
+	font-size: 100%;
+}
+#menu li {
+	float: left;
+	font-size: 100%;
+}
+#menu li a {
+	white-space: nowrap;
+}
+#menu li li a {
+	margin-bottom: 1px;
+	margin-top: 1px;
+	width: 10em;
+}
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	cursor: default;
+}
+#menu li ul {
+	position: absolute;
+	width: 16em;
+	margin-left: -1000em;
+}
+#menu li li {
+	border: none;
+	width: 16em;
+}
+#menu li ul ul {
+	margin: -2.3em 0 0 -1000em;
+}
+#menu li:hover ul ul,
+#menu li.sfhover ul ul {
+	margin-left: -1000em;
+}
+#menu li:hover ul,
+#menu li.sfhover ul {
+	margin-left: 0;
+}
+#menu li li:hover ul,
+#menu li li.sfhover ul {
+	margin-left: 16em;
+}
+[class^="menu-"],
+[class*=" menu-"] {
+	background-position: 3px 50% !important;
+}
+.menu-archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+.menu-article {
+	background-image: url(../images/menu/icon-16-article.png);
+}
+.menu-associations {
+	background-image: url(../images/menu/icon-16-assoc.png);
+}
+.menu-banners {
+	background-image: url(../images/menu/icon-16-banner.png);
+}
+.menu-banners-clients {
+	background-image: url(../images/menu/icon-16-banner-client.png);
+}
+.menu-banners-tracks {
+	background-image: url(../images/menu/icon-16-banner-tracks.png);
+}
+.menu-banners-cat {
+	background-image: url(../images/menu/icon-16-banner-categories.png);
+}
+.menu-category {
+	background-image: url(../images/menu/icon-16-category.png);
+}
+.menu-checkin {
+	background-image: url(../images/menu/icon-16-checkin.png);
+}
+.menu-clear {
+	background-image: url(../images/menu/icon-16-clear.png);
+}
+.menu-component {
+	background-image: url(../images/menu/icon-16-component.png);
+}
+.menu-config {
+	background-image: url(../images/menu/icon-16-config.png);
+}
+.menu-contact {
+	background-image: url(../images/menu/icon-16-contacts.png);
+}
+.menu-contact-cat {
+	background-image: url(../images/menu/icon-16-contacts-categories.png);
+}
+.menu-content {
+	background-image: url(../images/menu/icon-16-content.png);
+}
+.menu-cpanel {
+	background-image: url(../images/menu/icon-16-cpanel.png);
+}
+.menu-default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+.menu-featured {
+	background-image: url(../images/menu/icon-16-featured.png);
+}
+.menu-fields {
+	background-image: url(../images/menu/icon-16-puzzle.png);
+}
+.menu-groups {
+	background-image: url(../images/menu/icon-16-groups.png);
+}
+.menu-help {
+	background-image: url(../images/menu/icon-16-help.png);
+}
+.menu-help-this {
+	background-image: url(../images/menu/icon-16-help-this.png);
+}
+.menu-help-forum {
+	background-image: url(../images/menu/icon-16-help-forum.png);
+}
+.menu-help-docs {
+	background-image: url(../images/menu/icon-16-help-docs.png);
+}
+.menu-help-jed {
+	background-image: url(../images/menu/icon-16-help-jed.png);
+}
+.menu-help-jrd {
+	background-image: url(../images/menu/icon-16-help-jrd.png);
+}
+.menu-help-community {
+	background-image: url(../images/menu/icon-16-help-community.png);
+}
+.menu-help-security {
+	background-image: url(../images/menu/icon-16-help-security.png);
+}
+.menu-help-dev {
+	background-image: url(../images/menu/icon-16-help-dev.png);
+}
+.menu-help-shop {
+	background-image: url(../images/menu/icon-16-help-shop.png);
+}
+.menu-info {
+	background-image: url(../images/menu/icon-16-info.png);
+}
+.menu-install {
+	background-image: url(../images/menu/icon-16-install.png);
+}
+.menu-joomlaupdate {
+	background-image: url(../images/menu/icon-16-install.png);
+}
+.menu-language {
+	background-image: url(../images/menu/icon-16-language.png);
+}
+.menu-levels {
+	background-image: url(../images/menu/icon-16-levels.png);
+}
+.menu-logout {
+	background-image: url(../images/menu/icon-16-logout.png);
+}
+.menu-maintenance {
+	background-image: url(../images/menu/icon-16-maintenance.png);
+}
+.menu-massmail {
+	background-image: url(../images/menu/icon-16-massmail.png);
+}
+.menu-media {
+	background-image: url(../images/menu/icon-16-media.png);
+}
+.menu-menu {
+	background-image: url(../images/menu/icon-16-menu.png);
+}
+.menu-menumgr {
+	background-image: url(../images/menu/icon-16-menumgr.png);
+}
+.menu-messages {
+	background-image: url(../images/menu/icon-16-messaging.png);
+}
+.menu-messages-add {
+	background-image: url(../images/menu/icon-16-new-privatemessage.png);
+}
+.menu-messages-read {
+	background-image: url(../images/menu/icon-16-messages.png);
+}
+.menu-module {
+	background-image: url(../images/menu/icon-16-module.png);
+}
+.menu-newarticle {
+	background-image: url(../images/menu/icon-16-newarticle.png);
+}
+.menu-newcategory {
+	background-image: url(../images/menu/icon-16-newcategory.png);
+}
+.menu-newgroup {
+	background-image: url(../images/menu/icon-16-newgroup.png);
+}
+.menu-newlevel {
+	background-image: url(../images/menu/icon-16-newlevel.png);
+}
+.menu-newuser {
+	background-image: url(../images/menu/icon-16-newuser.png);
+}
+.menu-plugin {
+	background-image: url(../images/menu/icon-16-plugin.png);
+}
+.menu-profile {
+	background-image: url(../images/menu/icon-16-user.png);
+}
+.menu-purge {
+	background-image: url(../images/menu/icon-16-purge.png);
+}
+.menu-readmess {
+	background-image: url(../images/menu/icon-16-readmess.png);
+}
+.menu-section {
+	background-image: url(../images/menu/icon-16-section.png);
+}
+.menu-static {
+	background-image: url(../images/menu/icon-16-static.png);
+}
+.menu-stats {
+	background-image: url(../images/menu/icon-16-stats.png);
+}
+.menu-themes {
+	background-image: url(../images/menu/icon-16-themes.png);
+}
+.menu-trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+.menu-user {
+	background-image: url(../images/menu/icon-16-user.png);
+}
+.menu-user-note {
+	background-image: url(../images/menu/icon-16-user-note.png);
+}
+.menu-delete {
+	background-image: url(../images/menu/icon-16-delete.png);
+}
+.menu-help-trans {
+	background-image: url(../images/menu/icon-16-help-trans.png);
+}
+.menu-newsfeeds {
+	background-image: url(../images/menu/icon-16-newsfeeds.png);
+}
+.menu-newsfeeds-cat {
+	background-image: url(../images/menu/icon-16-newsfeeds-cat.png);
+}
+.menu-redirect {
+	background-image: url(../images/menu/icon-16-redirect.png);
+}
+.menu-search {
+	background-image: url(../images/menu/icon-16-search.png);
+}
+.menu-finder {
+	background-image: url(../images/menu/icon-16-search.png);
+}
+.menu-weblinks {
+	background-image: url(../images/menu/icon-16-links.png);
+}
+.menu-weblinks-cat {
+	background-image: url(../images/menu/icon-16-links-cat.png);
+}
+.menu-tags {
+	background-image: url(../images/menu/icon-16-tags.png);
+}
+.menu-postinstall {
+	background-image: url(../images/menu/icon-16-generic.png);
+}
+.icon-32-cog {
+	background-image: url(../images/toolbar/icon-32-cog.png);
+}
+#menu li a:focus+ul {
+	margin-left: 0;
+}
+#menu li li a:focus+ul {
+	margin-left: 1016em;
+}
+#menu li li a:focus {
+	margin-left: 1000em;
+	width: 10em;
+}
+#menu li li li a:focus {
+	margin-left: 2016em;
+	width: 10em;
+}
+#menu li:hover a:focus,
+#menu li.sfhover a.sffocus {
+	margin-left: 0;
+}
+#menu li li:hover a:focus+ul,
+#menu li li.sfhover a.sffocus+ul {
+	margin-left: 16em;
+}
+#sidebar {
+	float: left;
+	margin: 15px 5px;
+}
+#submenu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	padding-bottom: 2.5em;
+	line-height: 2em;
+}
+#submenu ul,
+#submenu li {
+	display: inline;
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+#submenu li,
+#submenu span.nolink {
+	float: left;
+	font-weight: bold;
+	margin-right: 8px;
+	padding: 2px 10px 2px 10px;
+	text-decoration: none;
+	cursor: pointer;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+}
+#submenu span.nolink {
+	color: #999;
+}
+#submenu li.active,
+#submenu span.nolink.active {
+	cursor: default;
+}
+#submenu li.active a,
+#submenu span.nolink.active,
+#submenu li a:hover,
+#submenu li a:focus {
+	text-decoration: none;
+}
+.red {
+	font-weight: bold;
+	color: #c00;
+}
+.pre_message {
+	font-size: 1.3em;
+}
+span.update-badge {
+	background-image: -moz-linear-gradient(center bottom,#FF0000 41%,#FC7E7E 79%);
+	background-image: -webkit-gradient(linear,left bottom,left top,color-stop(0.41,#ff0000),color-stop(0.79,#fc7e7e));
+	border: 2px solid white;
+	border-radius: 1.5em 1.5em 1.5em 1.5em;
+	color: white;
+	display: block;
+	float: left;
+	font-size: 1.2em;
+	font-weight: bold;
+	height: 1.2em;
+	left: 60px;
+	min-width: 1em;
+	padding: 0 0.1em 0;
+	position: relative;
+	top: -88px;
+}
+.unotes ul,
+.unotes ol {
+	list-style: none;
+	list-style-position: inside;
+	padding-left: 0;
+	padding-right: 0;
+}
+.unotes div.utitle {
+	padding: 10px;
+	float: left;
+	font-size: 1.2em;
+	line-height: 1.2em;
+}
+.unotes h4 {
+	margin-top: 0;
+	margin-bottom: 0;
+	font-size: 1.3em;
+}
+.unotes .ubody {
+	padding-left: 10px;
+	padding-right: 10px;
+	font-size: 1.2em;
+	line-height: 1.5em;
+}
+.unotes p {
+	padding-bottom: 10px;
+}
+div#database-sliders {
+	margin: 10px;
+}
+fieldset.uploadform {
+	margin-top: 10px;
+	margin-bottom: 10px;
+	min-height: 200px;
+}
+#installer-database,
+#installer-discover,
+#installer-update,
+#installer-warnings {
+	margin-top: 10px;
+}
+#installer-database #sidebar {
+	float: none;
+}
+#installer-database p.warning {
+	padding-left: 20px;
+}
+#installer-database p.nowarning {
+	padding-left: 20px;
+}
+.joomlaupdate_spinner {
+	float: left;
+	margin-right: 15px;
+}
+.btn-group {
+	position: relative;
+	display: inline-block;
+}
+.btn-group + .btn-group {
+	margin-left: 5px;
+}
+.btn-group > .btn {
+	position: relative;
+	float: left;
+	margin-left: -1px;
+}
+.icon-48-cpanel {
+	height: 50px;
+	width: 50%;
+}
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #eee;
+	border: 1px solid rgba(0,0,0,0.05);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+}
+.well blockquote {
+	border-color: #ddd;
+	border-color: rgba(0,0,0,0.15);
+}
+.well-large {
+	padding: 24px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.well-small {
+	padding: 9px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #dddddd;
+	margin-left: 0;
+	font-size: 1.2em;
+	padding: 9px;
+}
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #dddddd;
+	padding: 8px;
+}
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #f5f5f5;
+}
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box;
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.alert {
+	padding: 8px 35px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	background-color: #fcf8e3;
+	border: 1px solid #fbeed5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	color: #c09853;
+	font-size: 120%;
+}
+.alert-heading {
+	color: inherit;
+}
+.alert .close {
+	position: relative;
+	right: -30px;
+	top: -5px;
+	line-height: 18px;
+	float: right;
+	font-size: 20px;
+	font-weight: bold;
+}
+.alert-success {
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
+	color: #468847;
+}
+.alert-danger,
+.alert-error {
+	background-color: #f2dede;
+	border-color: #eed3d7;
+	color: #b94a48;
+}
+.alert-info {
+	background-color: #d9edf7;
+	border-color: #bce8f1;
+	color: #3a87ad;
+}
+.alert-block {
+	padding-top: 14px;
+	padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+	margin-bottom: 0;
+}
+.alert-block p + p {
+	margin-top: 5px;
+}
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+	z-index: 2;
+}
+.btn-group > .btn {
+	position: relative;
+	float: left;
+	margin-left: -1px;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+table {
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+.table {
+	width: 100%;
+	margin-bottom: 18px;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+	display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+	display: block;
+}
+.tabs-below > .nav-tabs {
+	border-top: 1px solid #ddd;
+}
+#status .btn-toolbar,
+#status p {
+	margin: 0px;
+}
+.navbar .btn-group {
+	margin: 0;
+	padding: 5px 5px 6px;
+}
+.media .btn {
+	margin: 10px 20px;
+}
+.thumbnails > li {
+	list-style: none outside none;
+	float: left;
+	margin-bottom: 18px;
+	margin-left: 20px;
+}
+#mediamanager-form {
+	margin: 10px;
+}
+.is-tagbox {
+	float: left;
+}
+.item-associations {
+	margin: 0;
+}
+.item-associations li {
+	list-style: none;
+	display: inline-block;
+	margin: 0 0 3px 0;
+}
+.item-associations li a,
+table.adminlist .item-associations li a {
+	color: #ffffff;
+}
+.hidden {
+	display: none;
+	visibility: hidden;
+}
+.tooltip {
+	position: absolute;
+	z-index: 1030;
+	display: block;
+	visibility: visible;
+	font-size: 11px;
+	line-height: 1.4;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+.tooltip.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top: -3px;
+	padding: 5px 0;
+}
+.tooltip.right {
+	margin-left: 3px;
+	padding: 0 5px;
+}
+.tooltip.bottom {
+	margin-top: 3px;
+	padding: 5px 0;
+}
+.tooltip.left {
+	margin-left: -3px;
+	padding: 0 5px;
+}
+.tooltip-inner {
+	max-width: 200px;
+	padding: 8px;
+	color: #ffffff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000000;
+}
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000000;
+}
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000000;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+fieldset.panelform .tooltip img {
+	float: none;
+	margin: 0;
+}
+div.toggle-editor {
+	float: right;
+}
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+.module-edit {
+	display: inline-block;
+}
+.break-word {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.muted {
+	color: #999;
+}
+.popover-content {
+	min-height: 33px;
+}
diff --git a/core/administrator/templates/hathor/css/template_rtl.css b/core/administrator/templates/hathor/css/template_rtl.css
new file mode 100644
index 00000000..c45d926a
--- /dev/null
+++ b/core/administrator/templates/hathor/css/template_rtl.css
@@ -0,0 +1,1325 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ *
+ * RTL CSS file for the template
+ */
+
+body {
+	direction: rtl;
+}
+
+h1, h2, h3 {
+	text-align: right;
+}
+
+/**
+ * CSS Reset
+ */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	background-position: transparent none repeat scroll top right;
+}
+
+/* new styles */
+
+
+
+/* end new styles */
+
+/**
+ * Overall Styles
+ */
+#header h1.title {
+	padding: 0 120px 0 0;
+}
+
+#footer {
+	padding: 10px 20px;
+}
+
+#content {
+	margin: 5px 20px 20px 20px;
+}
+
+.cpanel-page div#element-box {
+	padding: 15px;
+}
+
+/**
+ * Status layout
+ */
+#module-status {
+	left: 0;
+	right: none;
+	float: left;
+}
+
+#module-status > span {
+	float: right;
+	padding: 4px 22px 0 20px;
+}
+
+/* background images moved to color css file */
+
+/**
+ * Various Styles
+ */
+
+div.checkin-tick {
+	text-indent: -9999px;
+}
+
+/**
+ * Overlib
+ */
+
+/**
+ * Subheader, toolbar, page title
+ */
+
+div.pagetitle {
+	padding: 0 0 5px 0;
+	background-position: right 50%;
+	line-height: 54px;
+}
+
+.pagetitle h2 {
+	padding: 0 50px 0 0;
+}
+
+div.configuration {
+	padding-right: 30px;
+	margin-right: 10px;
+}
+
+div.toolbar-list {
+	float: right;
+	text-align: left;
+}
+
+div.toolbar-list li {
+	padding: 5px 4px 5px 1px;
+	float: right;
+}
+
+div.toolbar-list li.divider {
+	margin-left: 10px;
+	margin-right: 0;
+}
+
+div.toolbar-list span {
+	margin: 0 auto;
+}
+
+div.toolbar-list a {
+	float: right;
+	padding: 1px 5px;
+}
+
+/**
+ * Massmail component
+ */
+
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+div.pane-sliders {
+	margin-left: 10px;
+}
+
+.pane-toggler  span {
+	padding-left: 0;
+	padding-right: 20px;
+}
+
+.pane-toggler-down span {
+	padding-right: 20px;
+	padding-left: 0;
+}
+
+div#position-icon.pane-sliders div.pane-down .icon-wrapper .icon {
+	padding: 5px 10px 5px 0;
+	margin: 0;
+}
+
+/**
+ * Tabs
+ */
+dl.tabs {
+	float: right;
+	margin: 10px 0 -1px 0;
+}
+
+dl.tabs dt {
+	float: right;
+	padding: 4px 10px;
+	margin-right: 3px;
+}
+
+div.current {
+	padding: 10px 10px;
+}
+
+/* New parameter styles (check rtl) */
+
+dl#content-pane.tabs {
+	margin: 1px 0 0 0;
+}
+
+div.current label, div.current span.faux-label {
+	float:right;
+	clear:right;
+}
+
+div.current fieldset.radio {
+	float:right;
+}
+
+div.current fieldset.radio input {
+	float:right;
+	margin: 3px 2px 0 0;
+}
+
+div.current fieldset.radio label {
+	float:right;
+	margin: 3px 2px 0 0;
+}
+
+div.current fieldset.checkboxes {
+	float:right;
+	clear:left;
+}
+
+div.current fieldset.checkboxes input {
+	float:right;
+	clear:right;
+	margin: 3px 2px 0 0;
+}
+
+div.current fieldset.checkboxes label {
+	clear:left;
+	margin: 3px 2px 0 0;
+}
+
+div.current input,
+div.current span.faux-input,
+div.current textarea,
+div.current select {
+	float:right;
+	margin: 3px 2px 0 0;
+}
+
+div.current table#acl-config th.acl-groups {
+	text-align: right;
+}
+
+div.current table#filter-config th.acl-groups {
+	text-align: right;
+}
+
+/* -------- Menu Assigments ---------- */
+div#menu-assignment {
+	clear:right;
+}
+
+div#menu-assignment ul.menu-links {
+	float:right;
+}
+
+div#menu-assignment h3 {
+	clear:right;
+}
+
+div#menu-assignment ul.menu-links li.menu-link label {
+	float: right;
+	margin: 3px 2px 0 0;
+}
+div#menu-assignment ul.menu-links li.menu-link input {
+	clear: right;
+	float: right;
+}
+
+p.tab-description {
+	margin-right: 0;
+}
+/* end new parameter styles */
+
+/**
+ * Login Settings
+ */
+#login-page input, #login-page select {
+	float: left;
+}
+
+#login-page .login {
+	margin: 0 auto;
+}
+
+#login-page .pagetitle h2 {
+	margin: -70px 0 30px 0;
+}
+
+#login-page .login-inst {
+	float: right;
+}
+
+#login-page .login-box {
+	float: left;
+}
+
+#login-page .button {
+	text-align: left;
+}
+
+#login-page .login-text {
+	text-align: right;
+	float: right;
+}
+
+#form-login {
+	float: left;
+}
+
+#form-login label {
+	float: right;
+	clear: right;
+	text-align: left;
+}
+
+#form-login div.button1 div.next {
+	float: right;
+}
+
+#form-login div.button1 a {
+	padding: 0 15px 0 15px;
+	/* padding: 0 6px 0 30px; use this if you use images */
+}
+
+/**
+ * Cpanel Settings
+ */
+.cpanel div.icon ,
+#cpanel div.icon {
+	margin-left: 5px;
+	float: right;
+}
+
+.cpanel div.icon a ,
+#cpanel div.icon a {
+	float: right;
+}
+
+.cpanel img ,
+#cpanel img {
+	padding: 10px 0;
+	margin: 0 auto;
+}
+
+div.cpanel-icons {
+	float: right;
+}
+
+div.cpanel-component {
+	float: left;
+}
+
+/**
+ * Standard Layout Styles
+ */
+div.col {
+	float: right;
+}
+
+div.options-section.col {
+	float: left;
+}
+
+div.col1 {
+	float: right;
+}
+
+div.col2 {
+	float: left;
+}
+
+	/* Avoid using the width divs. They are here for 3PD Extensions if needed
+	 * Use the specific layout divs listed after. See also the th.width entries */
+.clrlft { clear: right; }
+.clrrt { clear: left; }
+.fltlft { float: right; }
+.fltrt { float: left; }
+.fltnone { float: none; }
+
+	/* Layout Divs */
+div.options-section {
+	margin: 10px 0 10px 10px;
+}
+
+/* for bluestork style html */
+div.width-40.fltrt {
+	margin: 10px 0 10px 10px;
+}
+
+/**
+ * Form Styles
+ */
+
+fieldset {
+	margin: 2px 10px 2px 10px;
+	text-align: right;
+}
+
+fieldset p {
+	margin: 10px 0;
+}
+
+/* new form fields (check rtl) */
+
+fieldset.adminform fieldset.radio,
+fieldset.panelform fieldset.radio,
+fieldset.adminform-legacy fieldset.radio  {
+	float:right;
+	margin: 0 0 5px 0;
+	clear:left;
+}
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+	float:right;
+}
+
+fieldset.panelform-legacy label,
+fieldset.adminform-legacy label,
+fieldset.panelform-legacy span.faux-label,
+fieldset.adminform-legacy span.faux-label {
+	float:right;
+
+}
+/* JParameter classes on radio button labels  */
+
+p.jform_desc {
+	clear: right;
+}
+
+fieldset ul.checklist {
+	margin-right: 27px;
+	margin-left: 0;
+}
+
+fieldset#filter-bar {
+	margin: 0;
+	padding: 5px 10px 5px 10px;
+}
+
+fieldset#filter-bar ol, fieldset#filter-bar ul {
+	padding: 5px 0 0;
+}
+
+fieldset#filter-bar ol li, fieldset#filter-bar ul li {
+	float: right;
+	padding: 0 0 0 5px;
+}
+
+fieldset#filter-bar .filter-search {
+	float: right;
+}
+
+fieldset#filter-bar .filter-select {
+	float: left;
+}
+
+
+	/* Note: these visual cues should be augmented by aria */
+
+	/* must be augmented by aria at the same time if changed dynamically by js
+	aria-invalid=true or aria-invalid=false */
+
+
+	/* augmented by aria in template javascript */
+
+span.readonly {
+	float: right;
+}
+
+div.extdescript {
+	margin-right: 10px;
+}
+
+input[type="button"] {
+	padding: 1px 6px;
+}
+
+/**
+ * Option or Parameter styles
+ */
+
+
+/* end from alpha2 */
+
+span.gi {
+	margin-left: 5px;
+}
+
+/**
+ * Admintable Styles
+ */
+
+table.admintable td.key,table.admintable td.paramlist_key {
+	text-align: left;
+}
+
+table.paramlist td.paramlist_description {
+	text-align: right;
+}
+
+/**
+ * Admin Form Styles
+ */
+fieldset.adminform {
+	margin: 0 10px 10px 10px;
+}
+fieldset.adminform .input-prepend,
+fieldset.adminform .input-append,
+fieldset.panelform .input-prepend,
+fieldset.panelform .input-append {
+	float: right;
+}
+fieldset.adminform .adminformlist .btn.modal,
+fieldset.adminform .input-prepend > *,
+fieldset.adminform .input-append > *,
+fieldset.panelform .adminformlist .btn.modal,
+fieldset.panelform .input-prepend > *,
+fieldset.panelform .input-append > * {
+	float: none;
+	vertical-align: middle;
+}
+
+	/* Table styles are for use with tabular data */
+table.adminform {
+	margin: 8px 0 10px 0;
+}
+
+
+table.adminform th {
+	padding: 6px 4px 4px 2px;
+	text-align: right;
+}
+
+table.adminform td {
+	text-align: right;
+}
+
+table.adminform td#filter-bar {
+	text-align: right;
+}
+
+table.adminform td.helpMenu {
+	text-align: left;
+}
+
+table.adminform tr {
+	padding-right: 10px;
+	padding-left: 10px;
+	border-left: 1px solid #c7c8b2;
+	border-right: none;
+}
+
+/**
+ * Table formating styles
+ */
+
+	/* Avoid using the width classes. They are here for 3PD Extensions if needed
+	 * Use the specific layout table headers listed after. See also the div.width entries */
+
+	/* Table header layout classes */
+
+th.ordering-col a {
+	float:right;
+	margin-right: 3px;
+}
+
+th.ordering-col a img {
+	margin-right: 4px;
+	margin-left: 4px;
+}
+
+/**
+ * Adminlist Table layout
+ */
+table.adminlist {
+	float: right;
+}
+	/* Table row styles */
+table.adminlist tr {
+	padding-left: 30px;
+	padding-right: 30px;
+}
+
+table.adminlist tbody tr {
+	text-align: right;
+}
+
+	/* Table td/th styles */
+table.adminlist td.order span {
+	float: right;
+}
+
+/**
+ * Tree indentation & nesting - Up to 10 levels deep so don't go crazy :
+ */
+table.adminlist td.indent-4 	{ padding-right:4px; }
+table.adminlist td.indent-19 	{ padding-right:19px; }
+table.adminlist td.indent-34 	{ padding-right:34px; }
+table.adminlist td.indent-49 	{ padding-right:49px; }
+table.adminlist td.indent-64 	{ padding-right:64px; }
+table.adminlist td.indent-79 	{ padding-right:79px; }
+table.adminlist td.indent-94 	{ padding-right:94px; }
+table.adminlist td.indent-109 	{ padding-right:109px; }
+table.adminlist td.indent-124 	{ padding-right:124px; }
+table.adminlist td.indent-139 	{ padding-right:139px; }
+
+/**
+ * Adminlist buttons
+ */
+table.adminlist tr td.btns a {
+	padding: 3px 20px;
+}
+
+/**
+ * Modal Modules styles
+ */
+ul#new-modules-list {
+	margin-right: 50px;
+	margin-left: 0;
+}
+
+/**
+ * Utility styles
+ */
+	/* General Clearing Class */
+.menu-module-list {
+	padding-right: 10px;
+	margin-right: 5px;
+}
+
+	/* stu nicholls solution for centering divs */
+
+	/* table solution for global config */
+
+table.noshow fieldset {
+	margin: 15px 7px 7px 7px;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	float:left;
+	margin-left: 8px;
+}
+
+/**
+ * Button styling
+ */
+#editor-xtd-buttons {
+	padding: 5px;
+}
+
+/* Button 1 Type */
+.button1,.button1 div {
+	float: left;
+}
+
+	/* Use this if you add images to the buttons such as directional arrows */
+
+.button1 a {
+	float: right;
+	padding: 0 6px 0 6px;
+}
+
+	/* Button 2 Type */
+.button2-left,.button2-right {
+	float: right;
+}
+
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	float: right;
+}
+
+	/* these are inactive buttons */
+
+.button2-left .page a,
+.button2-right .page a,
+.button2-left .page span,
+.button2-right .page span,
+.button2-left .blank a,
+.button2-right .blank a,
+.button2-left .blank span,
+.button2-right .blank span {
+	padding: 0 6px;
+}
+
+.button2-left a,.button2-left span {
+	padding: 0 6px 0 24px;
+}
+
+.button2-right a,.button2-right span {
+	padding: 0 24px 0 6px;
+}
+
+.button2-left {
+	float: right;
+	margin-right: 5px;
+}
+
+.button2-right {
+	float: right;
+	margin-right: 5px;
+}
+
+/* background images moved to the color rtl css file */
+
+/**
+ * Pagination styles
+ */
+
+	/* Normal pagination styles */
+div.containerpg {
+	position: relative;
+	right: 50%;
+	float: right;
+	clear: right;
+}
+
+div.pagination {
+	right: -50%;
+	margin: 0 auto;
+}
+
+.pagination a {
+	line-height: 1.6em;
+}
+
+.pagination div.limit {
+	float: right;
+	margin: 0 10px;
+}
+
+	/* The Go submittal button */
+.pagination button {
+	margin-left: 20px;
+}
+
+	/* Style if pagination is part of the table (old style) */
+table.adminlist .pagination {
+	margin: 0 auto;
+}
+
+table.adminlist .pagination button {
+	margin-left: 20px;
+}
+
+/**
+ * Pagination styles
+ */
+
+	/* Normal pagination styles */
+div.containerpg {
+	right: 50%;
+	float: right;
+	clear: right;
+}
+
+div.pagination {
+	right: -50%;
+	margin: 0 auto;
+}
+
+.pagination div.limit {
+	float: right;
+	margin: 0 10px;
+}
+
+	/* The Go submittal button */
+.pagination button {
+	margin-left: 20px;
+}
+
+
+	/* Grey out the current page number */
+
+
+	/* Style if pagination is part of the table (old style) */
+
+table.adminlist .pagination button {
+	margin-left: 20px;
+}
+
+/**
+ * MCE Editor
+ */
+div.toggle-editor {
+
+}
+
+/**
+ * Tooltips
+ */
+
+.tip-text {
+	text-align: right;
+}
+
+/**
+ * Calendar
+ */
+a img.calendar {
+	margin-right: 3px;
+}
+
+/**
+ * General styles
+ */
+
+.helpFrame {
+	padding: 0 10px 0 5px;
+}
+
+#treecellhelp {
+	float: right;
+}
+
+#datacellhelp {
+	float: right;
+	padding: 2px 0 0 0;
+}
+
+/* -- MODAL STYLES ----------- */
+div#sbox-window {
+	text-align: right;
+}
+
+h2.modal-title {
+	margin: 5px 15px 0 0;
+}
+
+ul.menu_types {
+	padding: 0 15px 0 0;
+}
+ul.menu_types li,
+dl.menu_type dd ul li {
+	float:right;
+	margin-left: 10px;
+	margin-right: 0;
+}
+
+dl.menu_type dt {
+	float:right;
+	margin: 13px 0 5px 0;
+}
+dl.menu_type dd {
+	clear:right;
+}
+
+dl.menu_type dd ul li {
+	margin: 0;
+}
+
+dl.menu_type dd ul {
+	margin: 0;
+}
+
+ul#new-modules-list {
+	padding: 5px 15px 0 0;
+	margin: 0;
+}
+ul#new-modules-list li {
+	float:right;
+	margin: 0 0 0 20px;
+}
+
+/**
+ * User Accessibility
+ */
+
+	/* Skip to Content Structural Styling */
+#skiplinkholder a,
+#skiplinkholder a:link,
+#skiplinkholder a:visited {
+	left: 0;
+	right: -200%;
+}
+
+#skiplinkholder a:focus, #skiplinkholder a:active {
+	right: 0;
+	top: 0;
+}
+
+#skiplinkholder p {
+	margin: 0;
+}
+
+#skiptargetholder {
+	left: 0;
+	right: -200%;
+}
+
+	/* Skip to Content Visual Styling */
+#skiplinkholder a, #skiplinkholder a:link, #skiplinkholder a:visited {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+	/* For elements that aren't to be seen by users unless the user does something
+	 * like clicking on a header to see the collapsed section. */
+
+	/* For elements that aren't to be seen by visual users but do need to be read by screenreaders.
+	 * Cannot be used for elements that can get focus such as links and form elements */
+
+	/* Firefox has issues styling legend so this is a universal fix
+	for making the legend invisible (i.e. visually it's not there, but screen readers see it */
+
+legend.element-invisible {
+	/*margin: 0;
+	margin-right: -10000px; */
+}
+
+fieldset.adminform label,
+fieldset.panelform label,
+fieldset.adminform span.faux-label,
+fieldset.panelform span.faux-label {
+	clear:right;
+	float:right;
+	margin-right: 10px;
+	margin-left: 5px;
+}
+
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+	margin-right: 0;
+}
+
+/* checkboxes */
+fieldset.adminform fieldset.checkboxes,
+fieldset.panelform fieldset.checkboxes,
+fieldset.adminform-legacy fieldset.checkboxes  {
+	float:right;
+	margin: 0 0 5px 0;
+	clear:left;
+}
+
+fieldset.adminform fieldset.checkboxes input[type="checkbox"],
+fieldset.panelform fieldset.checkboxes input[type="checkbox"] {
+	float: right;
+	clear: right;
+}
+
+fieldset.adminform fieldset.checkboxes label,
+fieldset.panelform fieldset.checkboxes label,
+fieldset.adminform fieldset.checkboxes span.faux-label,
+fieldset.panelform fieldset.checkboxes span.faux-label {
+	clear: left;
+}
+/* end checkboxes */
+
+fieldset.adminform input, fieldset.adminform span.faux-input, fieldset.adminform textarea, fieldset.adminform select, fieldset.adminform img, fieldset.adminform button,
+fieldset.panelform input, fieldset.panelform span.faux-input, fieldset.panelform textarea, fieldset.panelform select, fieldset.panelform img, fieldset.panelform button {
+	float:right;
+	margin:5px 0 5px 5px;
+}
+
+/* -------- Batch Section ---------- */
+fieldset#batch-choose-action {
+	clear:none;
+	clear: right;
+}
+fieldset.batch label {
+	float: right;
+	clear: none;
+}
+fieldset label#batch-choose-action-lbl {
+	clear: none;
+	clear: right;
+}
+label#batch-language-lbl,
+label#batch-user-lbl {
+	clear: right;
+	margin-left: 10px;
+	margin-right: 0;
+	margin-top: 15px;
+}
+select#batch-language-id,
+select#batch-user-id {
+	margin-top: 15px;
+}
+select#batch-category-id,
+select#batch-menu-id,
+select#batch-position-id
+{
+	margin-left: 30px;
+	margin-right: 0;
+}
+fieldset.batch select, fieldset.batch input, fieldset.batch img, fieldset.batch button {
+	float: right;
+}
+label#batch-access-lbl,
+label#batch-client-lbl {
+	margin-right: 0;
+	margin-left: 10px;
+}
+
+/* Banner edit */
+
+
+/* -- ACL STYLES relocated from com_users/media/grid.css ----------- */
+
+/* -- ACL PANEL STYLES  ----------- */
+
+
+/* All Tabs */
+
+td.col1 {
+	text-align:right;
+}
+
+/* Icons */
+label.icon-16-allow,
+label.icon-16-deny,
+a.icon-16-allow,
+a.icon-16-deny,
+a.icon-16-allowinactive,
+a.icon-16-denyinactive {
+	margin: 0 auto;
+}
+label.icon-16-allow {
+	right: 40%;
+}
+label.icon-16-deny {
+	right: 40%;
+}
+
+ul.acllegend li {
+	float: right;
+	padding-left: 20px;
+	margin: 15px 10px 15px 0;
+}
+ul.acllegend li.acl-allowed {
+	padding-right: 20px;
+	padding-left: 10px;
+}
+ul.acllegend li.acl-denied {
+	padding-right: 20px;
+	padding-left: 20px;
+}
+ul.acllegend li.acl-editgroups {
+	padding-left: 10px;
+}
+ul.acllegend li.acl-resetbtn {
+	padding-left: 0;
+}
+
+li.acl-editgroups,
+li.acl-resetbtn {
+	float: right;
+}
+
+table#acl-config th.acl-groups {
+	padding-right: 8px;
+}
+
+table#acl-config th.acl-groups {
+	text-align: right;
+}
+
+.acl-action {
+	margin: auto 0;
+}
+
+/* Icons */
+span.icon-16-unset,
+span.icon-16-allowed,
+span.icon-16-denied,
+span.icon-16-locked {
+	padding-left: 0;
+	padding-right: 18px;
+}
+
+/* *
+* Permission Rules
+*/
+
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+    margin: 0 !important;
+    padding: 0 !important;
+}
+
+#permissions-sliders ul#rules li {
+	margin: 0;
+	padding: 0;
+}
+
+#permissions-sliders ul#rules table.group-rules td {
+    padding:4px;
+    vertical-align:middle;
+    text-align:right;
+}
+
+#permissions-sliders .panel {
+    margin-bottom: 3px;
+    margin-right: 0;
+}
+
+ul#rules table.group-rules td label {
+	margin: 0 !important;
+}
+
+table.group-rules td select {
+	margin: 0 !important;
+}
+
+#permissions-sliders ul#rules .mypanel {
+	padding: 0;
+}
+
+#permissions-sliders ul#rules {
+	padding: 5px;
+}
+
+#permissions-sliders  ul#rules  table.group-rules th {
+    text-align: right;
+    padding: 4px;
+}
+
+#permissions-sliders .pane-toggler  span {
+	padding-left: 0;
+	padding-right: 20px;
+}
+
+#permissions-sliders .pane-toggler-down span {
+	padding-left: 0;
+	padding-right: 20px;
+}
+
+/**
+ * Helpmenus
+ */
+ul.helpmenu li {
+	float: left;
+}
+
+/**
+ * Menu Styling
+ */
+#menu a {
+	padding: 0.35em 2em 0.35em 2.5em;
+}
+
+#menu li {
+	float: right;
+}
+
+#menu li ul { /* second-level lists */
+	margin-right: -1000em;
+	/* using right instead of display to hide menus because display: none isn't read by screen readers */
+}
+
+#menu li ul ul { /* third-and-above-level lists */
+	margin: -2.3em -1000em 0 0;
+	/* top margin is equal to parent line height+bottom padding */
+}
+
+#menu li:hover ul ul,#menu li.sfhover ul ul {
+	margin-right: -1000em;
+}
+
+#menu li:hover ul,#menu li.sfhover ul {
+	/* lists nested under hovered list items */
+	margin-right: 0;
+}
+
+#menu li li:hover ul,#menu li li.sfhover ul {
+	margin-right: 16em;
+}
+
+/**
+ * Extra positioning rules for limited noscript keyboard accessibility
+ * need the backgrounds here to keep the background as the nav background
+ * since it is overlaying other content.
+ * Using margin-left instead of left so that can move back without javascript
+ * display downlevel ul
+ */
+#menu li a:focus+ul {
+	margin-right: 0;
+}
+
+#menu li li a:focus+ul {
+	margin-right: 1016em;
+}
+
+/* bring back the focus elements into view */
+#menu li li a:focus {
+	margin-right: 1000em;
+}
+
+#menu li li li a:focus {
+	margin-right: 2016em;
+}
+
+#menu li:hover a:focus,#menu li.sfhover a.sffocus {
+	margin-right: 0;
+}
+
+#menu li li:hover a:focus+ul,#menu li li.sfhover a.sffocus+ul {
+	margin-right: 16em;
+}
+
+/**
+ * Submenu styling
+ */
+
+
+#submenu a, #submenu span.nolink {
+	float: right;
+	margin-left: 8px;
+	padding: 2px 10px 2px 10px;
+	-moz-border-radius-topleft: 3px;
+	-moz-border-radius-topright: 3px;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+}
+
+/* Installer Database */
+#installer-database p.warning {
+	padding-left: 0;
+	padding-right: 20px
+}
+
+#installer-database #sidebar {
+	float: none
+}
+
+#installer-database p.nowarning {
+	padding-left: 0;
+	padding-right: 20px
+}
+
+p.nowarning {
+	float: none;
+	margin-left: 0;
+	margin-right: 15px;
+}
+
+table.adminlist tfoot button {
+	float: right;
+}
+
+/* Spinner */
+.joomlaupdate_spinner {
+	float: right;
+	margin-left: 15px;
+}
+
+/* Various corrections */
+[class*="span"] {
+	float: none;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+#sidebar {
+	float:right;
+	margin: 15px 0;
+}
+
+#submenu li, #submenu span.nolink {
+	float: right;
+}
+
+div.btn-toolbar {
+	float: right;
+	text-align: right;
+}
+
+.btn-group {
+	float: right;
+	margin-right: 10px;
+}
+
+#module-status div.btn-group {
+	float: right;
+}
+
+.nav-tabs > li, .nav-pills > li {
+	float: none;
+}
+
+.tabs-left > .nav-tabs {
+	border-right: 0 solid #DDDDDD;
+	float: right;
+	margin-right: 19px;
+}
+
+.list-striped, .row-striped {
+	text-align: right;
+}
+
+.row-fluid [class*="span"] {
+	float: none;
+}
+.media .btn {
+	float: none;
+}
+
+.media {
+	float:none;
+	margin: 10px 20px;
+}
+
+.alert .close {
+	right: 5px;
+	float: left;
+}
+
+.popover,
+.tooltip-inner {
+	text-align: right;
+}
+div.toggle-editor {
+	float: left;
+}
+#editor-xtd-buttons .btn {
+	float: right;
+}
+div.toggle-editor {
+	margin-top: 14px;
+}
+.modal-footer button {
+	float: left;
+}
+#form-login  {
+	float: right;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/css/theme.css b/core/administrator/templates/hathor/css/theme.css
new file mode 100644
index 00000000..961486e5
--- /dev/null
+++ b/core/administrator/templates/hathor/css/theme.css
@@ -0,0 +1,297 @@
+@charset "UTF-8";
+
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	templates.hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @since		1.6
+ */
+
+/* ThemeOfficeMenu Style Sheet */
+
+.ThemeOfficeMenu,
+.ThemeOfficeSubMenuTable {
+	font-family: Arial, Verdana, sans-serif;
+	font-size: 13px;
+	padding: 0;
+	white-space: nowrap;
+	cursor: default;
+	height: 25px;
+}
+
+.ThemeOfficeSubMenu {
+	position: absolute;
+	visibility:	hidden;
+	/*
+	   Netscape/Mozilla renders borders by increasing
+	   their z-index.  The following line is necessary
+	   to cover any borders underneath
+	*/
+	z-index:	100;
+	border:		0;
+	padding:	0;
+	overflow:	visible;
+	border:		1px solid #8C867B;
+	filter:progid:DXImageTransform.Microsoft.Shadow(color=#BDC3BD, Direction=135, Strength=4);
+}
+
+.ThemeOfficeSubMenuTable {
+	overflow:	visible;
+}
+
+.ThemeOfficeMainItem,
+.ThemeOfficeMainItemHover,
+.ThemeOfficeMainItemActive,
+.ThemeOfficeMenuItem,
+.ThemeOfficeMenuItemHover,
+.ThemeOfficeMenuItemActive {
+	border:	0;
+	cursor: default;
+	white-space: nowrap;
+}
+
+.ThemeOfficeMainItem {
+	/*background-color:	#EFEBDE;*/
+}
+
+.ThemeOfficeMainItemHover,
+.ThemeOfficeMainItemActive {
+	background-color:	#e7eddf;
+}
+
+.ThemeOfficeMenuItem {
+	background-color:	#F1F3F5;
+}
+
+.ThemeOfficeMenuItemHover,
+.ThemeOfficeMenuItemActive {
+	background-color:	#e7eddf;
+}
+
+
+/* horizontal main menu */
+
+.ThemeOfficeMainItem {
+	padding: 4px 1px 4px 1px;
+	border: 0;
+}
+
+td.ThemeOfficeMainItemHover,
+td.ThemeOfficeMainItemActive {
+	padding:	0;
+	border-right:	1px solid #6d9d2e;
+	border-left:	1px solid #6d9d2e;
+}
+
+.ThemeOfficeMainFolderLeft,
+.ThemeOfficeMainItemLeft,
+.ThemeOfficeMainFolderText,
+.ThemeOfficeMainItemText,
+.ThemeOfficeMainFolderRight,
+.ThemeOfficeMainItemRight {
+	background-color: inherit;
+}
+
+/* vertical main menu sub components */
+
+td.ThemeOfficeMainFolderLeft,
+td.ThemeOfficeMainItemLeft {
+	padding-top:	2px;
+	padding-bottom:	2px;
+	padding-left:	0;
+	padding-right:	2px;
+
+	border-top:	1px solid #6d9d2e;
+	border-bottom:	1px solid #6d9d2e;
+	border-left:	1px solid #6d9d2e;
+
+	background-color:	inherit;
+}
+
+td.ThemeOfficeMainFolderText,
+td.ThemeOfficeMainItemText {
+	padding-top:	2px;
+	padding-bottom:	2px;
+	padding-left:	5px;
+	padding-right:	5px;
+
+	border-top:	1px solid #6d9d2e;
+	border-bottom:	1px solid #6d9d2e;
+
+	background-color:	inherit;
+	white-space:	nowrap;
+}
+
+td.ThemeOfficeMainFolderRight,
+td.ThemeOfficeMainItemRight {
+	padding-top:	2px;
+	padding-bottom:	2px;
+	padding-left:	0;
+	padding-right:	0;
+
+	border-top:	1px solid #6d9d2e;
+	border-bottom:	1px solid #6d9d2e;
+	border-right:	1px solid #6d9d2e;
+
+	background-color:	inherit;
+}
+
+tr.ThemeOfficeMainItem td.ThemeOfficeMainFolderLeft,
+tr.ThemeOfficeMainItem td.ThemeOfficeMainItemLeft {
+	padding-top:	3px;
+	padding-bottom:	3px;
+	padding-left:	1px;
+	padding-right:	2px;
+	white-space:	nowrap;
+	border:	0;
+	background-color: inherit;
+}
+
+tr.ThemeOfficeMainItem td.ThemeOfficeMainFolderText,
+tr.ThemeOfficeMainItem td.ThemeOfficeMainItemText {
+	padding-top:	3px;
+	padding-bottom:	3px;
+	padding-left:	5px;
+	padding-right:	5px;
+	border:		0;
+	background-color:	inherit;
+}
+
+tr.ThemeOfficeMainItem td.ThemeOfficeMainItemRight,
+tr.ThemeOfficeMainItem td.ThemeOfficeMainFolderRight {
+	padding-top:	3px;
+	padding-bottom:	3px;
+	padding-left:	0;
+	padding-right:	1px;
+	border:		0;
+	background-color:	inherit;
+}
+
+/* sub menu sub components */
+
+.ThemeOfficeMenuFolderLeft,
+.ThemeOfficeMenuItemLeft {
+	padding-top:	2px;
+	padding-bottom:	2px;
+	padding-left:	1px;
+	padding-right:	3px;
+	border-top:	1px solid #6d9d2e;
+	border-bottom:	1px solid #6d9d2e;
+	border-left:	1px solid #6d9d2e;
+	background-color:	inherit;
+	white-space:	nowrap;
+}
+
+.ThemeOfficeMenuFolderText,
+.ThemeOfficeMenuItemText {
+	padding-top:	2px;
+	padding-bottom:	2px;
+	padding-left:	5px;
+	padding-right:	5px;
+
+	border-top:	1px solid #6d9d2e;
+	border-bottom:	1px solid #6d9d2e;
+
+	background-color:	inherit;
+	white-space:	nowrap;
+}
+
+.ThemeOfficeMenuFolderRight,
+.ThemeOfficeMenuItemRight {
+	padding-top:	2px;
+	padding-bottom:	2px;
+	padding-left:	0;
+	padding-right:	0;
+
+	border-top:	1px solid #6d9d2e;
+	border-bottom:	1px solid #6d9d2e;
+	border-right:	1px solid #6d9d2e;
+	background-color:	inherit;
+	white-space:	nowrap;
+}
+
+.ThemeOfficeMenuItem .ThemeOfficeMenuFolderLeft,
+.ThemeOfficeMenuItem .ThemeOfficeMenuItemLeft {
+	padding-top:	3px;
+	padding-bottom:	3px;
+	padding-left:	2px;
+	padding-right:	3px;
+	white-space:	nowrap;
+	border: 	0;
+	background-color:	#DDE1E6;
+}
+
+.ThemeOfficeMenuItem .ThemeOfficeMenuFolderText,
+.ThemeOfficeMenuItem .ThemeOfficeMenuItemText {
+	padding-top:	3px;
+	padding-bottom:	3px;
+	padding-left:	5px;
+	padding-right:	5px;
+	border:		0;
+	background-color:	inherit;
+}
+
+.ThemeOfficeMenuItem .ThemeOfficeMenuFolderRight,
+.ThemeOfficeMenuItem .ThemeOfficeMenuItemRight {
+	padding-top:	3px;
+	padding-bottom:	3px;
+	padding-left:	0;
+	padding-right:	1px;
+	border:		0;
+	background-color:	inherit;
+}
+
+/* menu splits */
+
+.ThemeOfficeMenuSplit {
+	margin:		2px;
+	height:		1px;
+	overflow:	hidden;
+	background-color:	inherit;
+	border-top:	1px solid #C6C3BD;
+}
+
+/* image shadow animation */
+/*
+	seq1:	image for normal
+	seq2:	image for hover and active
+	To use, in the icon field, input the following:
+	<img class="seq1" src="normal.gif" /><img class="seq2" src="hover.gif" />
+*/
+
+.ThemeOfficeMenuItem img.seq1 {
+	display:	inline;
+}
+
+.ThemeOfficeMenuItemHover seq2,
+.ThemeOfficeMenuItemActive seq2 {
+	display:	inline;
+}
+
+.ThemeOfficeMenuItem .seq2,
+.ThemeOfficeMenuItemHover .seq1,
+.ThemeOfficeMenuItemActive .seq1 {
+	display:	none;
+}
+
+/* inactive settings */
+div.inactive td.ThemeOfficeMainItemHover,
+div.inactive td.ThemeOfficeMainItemActive {
+	border-top: 0;
+	border-right:	1px solid #f1f3f5;
+	border-left:	1px solid #f1f3f5;
+}
+
+div.inactive .ThemeOfficeMainItem {
+	color: #bbb;
+}
+
+div.inactive span.ThemeOfficeMainItemText {
+	color: #aaa;
+}
+
+div.inactive .ThemeOfficeMainItemHover,
+div.inactive .ThemeOfficeMainItemActive {
+	background-color:	#f1f3f5;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/error.php b/core/administrator/templates/hathor/error.php
new file mode 100644
index 00000000..5f86b785
--- /dev/null
+++ b/core/administrator/templates/hathor/error.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentError $this */
+
+$app = JFactory::getApplication();
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $this->title; ?> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></title>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo  $this->template; ?>/css/error.css" rel="stylesheet" />
+	<?php if ($app->get('debug_lang', '0') == '1' || $app->get('debug', '0') == '1') : ?>
+		<!-- Load additional CSS styles for debug mode-->
+		<link href="<?php echo JUri::root(true); ?>/media/cms/css/debug.css" rel="stylesheet" />
+	<?php endif; ?>
+	<!-- Load additional CSS styles for rtl sites -->
+	<?php if ($this->direction == 'rtl') : ?>
+		<link href="<?php echo $this->baseurl; ?>/templates/<?php echo  $this->template; ?>/css/template_rtl.css" rel="stylesheet" />
+	<?php endif; ?>
+	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
+</head>
+<body class="errors">
+	<div>
+		<h1>
+			<?php echo $this->error->getCode(); ?> - <?php echo JText::_('JERROR_AN_ERROR_HAS_OCCURRED'); ?>
+		</h1>
+	</div>
+	<div>
+		<p>
+			<?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+			<?php if ($this->debug) : ?>
+				<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+			<?php endif; ?>
+		</p>
+		<p><a href="index.php"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
+		<?php if ($this->debug) : ?>
+			<div>
+				<?php echo $this->renderBacktrace(); ?>
+				<?php // Check if there are more Exceptions and render their data as well ?>
+				<?php if ($this->error->getPrevious()) : ?>
+					<?php $loop = true; ?>
+					<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+					<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+					<?php $this->setError($this->_error->getPrevious()); ?>
+					<?php while ($loop === true) : ?>
+						<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+						<p>
+							<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+							<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+						</p>
+						<?php echo $this->renderBacktrace(); ?>
+						<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+					<?php endwhile; ?>
+					<?php // Reset the main error object to the base error ?>
+					<?php $this->setError($this->error); ?>
+				<?php endif; ?>
+			</div>
+		<?php endif; ?>
+	</div>
+	<div class="clr"></div>
+	<noscript>
+			<?php echo JText::_('JGLOBAL_WARNJAVASCRIPT'); ?>
+	</noscript>
+</body>
+</html>
diff --git a/core/administrator/templates/hathor/favicon.ico b/core/administrator/templates/hathor/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1a4d7979dcf49a5f677c7e0075781431e23f2c50
GIT binary patch
literal 2019
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z81_l<D%#etZ2wxwo<osN{#FYG`RK1Ga0-$OJ2Ac{iATu|$BvGLvHz%*y
zs=`(YtilS&1_|pcDS(xfWZNo5_y#CA=NF|anChA687SFtDJUq|6s4qD1-ZCEwF7y!
zN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWfdBw^QLty5(q!uR^
zWfqiV=I1GZ%uP(nFD<cEQUX~72M~9bWTqi($}5I?3+O?8kc_^eo`F6#ZK)NRIJALe
zaB53QhWo0Zv?vGcr<7#<)ST4Z)Vz{npgu#a)&av7t`WtN6^R89%fNvM@tY0E<yJwd
z#rZj<pdbj%%Pg@ovH^PtT^JD}5M9psxdlb3#l=8vcBW7*$YSW~BM{cunZxWr7DU(J
zUz7>-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{
zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+7C`G)JGDw(Z{OV
z2AC48eDhN>(<)sOOH%EO3=B=J42-P|O%)7{K@1b1chS@!xd0^NT$Gwvl3x^(pPyp~
z_C+p;t6;2WtOxWrx(cXf8+}kdLdsW=ObZqT=2|;0piWo`V8><WSr*H{z#QS};uvBf
zSUV{;BgR$a`1zSLtIOZ-+U*&e+Zy34mg8+QHON&;<ZQXF>*uQ)x^_R)YBVb+)M-R5
zR64Q9QE&-I(5j51QHz~S%zS4r(^V0@+-9bxE0HZ_Vko_N_U`Y=&nohMJqkX5IOg4%
zpMU=spOazeV@{W{j@y5sr1pM5a`l(`<sbU4Zhifj_xj$&rLuu?@1$2%hk1Q9Rq|B2
zV71`df$7cfxBZFuvtQt=`TeJ7+5I&&_wAkAZN=kb{Z2m1VtG!W^e?smg$WB)6+g%e
ze0V*75?_sx<hsj+l>$7ey^SW%@8t3{=5lk`7%y^otho54iu@4?HZkqw=bI)iTy>7s
zYl6`2CAz@}*n*gTFxKDn$iC-jp~82a|4a7T-3%v1xir6=iSB0czpg(czf9+_S<mSy
z@7Zb>3i%t<^zb$`<grR^JN}*LTlWe-#$V!>8r+(zFE@U#KEBt-oAK2_A<h5Os?XN^
za=-L;=N5%iYx`N1!kJHhylX$dFG5sznqc?7hDcH2o9y9V*z1DwHVPZP-TmwIhJ3wg
z3Ke}?!S~xAdmmn9#rxo(NrH>pGnxD=bM-VLZ}F=Yco%*=ba89MrMw>t_ga2VO3K?d
zyXO0z<m737fA`*<9VK^U%U`w6A{*~ayFKwn$ttH)kB)^DWyRjxsP!wjqA=xkx&59g
zoCT|D9$!12$G2Y7IL_4~lHvcEM-#WFi-{{0g(igO9dTUhFVbZ?d&(^PnI30y3S=Uq
z=d1{{`1?V-^~~Q`@ppHNmKN^Hzqc`U>$H;l52b%To_HXOGpdt^-+d~Be~fhPa`ufs
zKAkFh^Xa|$uJW6GTb+L|-G463Os?cl62G}Y)+1#>nWL*36jzH)h!6MB-uf-*^^K$F
z-PH8=Pvif>EWPF1=kxvYKVN0(S%&v4y;TwAs5njkYPg*+XF~M*2<rvEn%n~f=P!Ct
zZniLN<CHH=LHnvr%D1LITYfy;<&41!rgIbT9L$*ZM_{)^)0_z_d`>Lx;n}R}^>WsQ
z*$+-uZGF03`1Ri>wwVf1=QkW(u=uB#P~f5kGQSVTDJ@<q`uO((e<mwai>tGrXU~&)
zQI{cc{{QcvISF#U602t&-y6*Et1!&aC2GP=>8Xsl?|a|A`H_*dU~Bo7%F@St-uqUr
lx|x59Pegi?_2Mo68Ggz3@0scntO2TdJzf1=);T3K0RSjD{7e7<

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/html/com_admin/help/default.php b/core/administrator/templates/hathor/html/com_admin/help/default.php
new file mode 100644
index 00000000..ce05e3d1
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/help/default.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.language.help');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">
+<div class="width-50 fltrt helplinks">
+	<ul class="helpmenu">
+		<li><?php echo JHtml::_('link', JHelp::createUrl('JHELP_GLOSSARY'), JText::_('COM_ADMIN_GLOSSARY'), array('target' => 'helpFrame')) ?></li>
+		<li><?php echo JHtml::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', JText::_('COM_ADMIN_LICENSE'), array('target' => 'helpFrame')) ?></li>
+		<li><?php echo JHtml::_('link', $this->latest_version_check, JText::_('COM_ADMIN_LATEST_VERSION_CHECK'), array('target' => 'helpFrame')) ?></li>
+		<li><?php echo JHtml::_('link', JHelp::createUrl('JHELP_START_HERE'), JText::_('COM_ADMIN_START_HERE'), array('target' => 'helpFrame')) ?></li>
+	</ul>
+</div>
+<div class="clr"> </div>
+	<div id="treecellhelp" class="width-20 fltleft">
+		<fieldset class="adminform whitebg" title="<?php echo JText::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?>">
+			<legend><?php echo JText::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></legend>
+
+			<div class="helpIndex">
+				<ul class="subext">
+					<?php foreach ($this->toc as $k => $v):?>
+						<li>
+							<?php $url = JHelp::createUrl('JHELP_'.strtoupper($k)); ?>
+							<?php echo JHtml::_('link', $url, $v, array('target' => 'helpFrame'));?>
+						</li>
+					<?php endforeach;?>
+				</ul>
+			</div>
+		</fieldset>
+	</div>
+
+	<div id="datacellhelp" class="width-80 fltrt">
+		<fieldset title="<?php echo JText::_('COM_ADMIN_VIEW'); ?>">
+			<legend>
+				<?php echo JText::_('COM_ADMIN_VIEW'); ?>
+			</legend>
+				<iframe name="helpFrame" src="<?php echo $this->page;?>" class="helpFrame"></iframe>
+		</fieldset>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_admin/profile/edit.php b/core/administrator/templates/hathor/html/com_admin/profile/edit.php
new file mode 100644
index 00000000..e0102350
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/profile/edit.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+// Get the form fieldsets.
+$fieldsets = $this->form->getFieldsets();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'profile.cancel' || document.formvalidator.isValid(document.getElementById('profile-form')))
+		{
+			Joomla.submitform(task, document.getElementById('profile-form'));
+		}
+	}
+");
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id='.$this->item->id); ?>" method="post" name="adminForm" id="profile-form" class="form-validate" enctype="multipart/form-data">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('COM_ADMIN_USER_ACCOUNT_DETAILS'); ?></legend>
+			<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
+				<li><?php echo $field->label; ?>
+				<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+			</ul>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+		<?php
+		echo JHtml::_('sliders.start');
+		foreach ($fieldsets as $fieldset) :
+			if ($fieldset->name == 'user_details') :
+				continue;
+			endif;
+			echo JHtml::_('sliders.panel', JText::_($fieldset->label), $fieldset->name);
+		?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_($fieldset->label); ?></legend>
+		<ul class="adminformlist">
+		<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
+			<?php if ($field->hidden) : ?>
+				<?php echo $field->input; ?>
+			<?php else: ?>
+				<li><?php echo $field->label; ?>
+				<?php echo $field->input; ?></li>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		</ul>
+		</fieldset>
+		<?php endforeach; ?>
+		<?php echo JHtml::_('sliders.end'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_admin/sysinfo/default.php b/core/administrator/templates/hathor/html/com_admin/sysinfo/default.php
new file mode 100644
index 00000000..b9fa4359
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/sysinfo/default.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Add specific helper files for html generation
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+// Load switcher behavior
+JHtml::_('behavior.switcher');
+?>
+
+<form action="<?php echo JRoute::_('index.php'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="config-document">
+		<div id="page-site" class="tab">
+			<div class="noshow">
+				<div class="width-100">
+					<?php echo $this->loadTemplate('system'); ?>
+				</div>
+			</div>
+		</div>
+
+		<div id="page-phpsettings" class="tab">
+			<div class="noshow">
+				<div class="width-60">
+					<?php echo $this->loadTemplate('phpsettings'); ?>
+				</div>
+			</div>
+		</div>
+
+		<div id="page-config" class="tab">
+			<div class="noshow">
+				<div class="width-60">
+					<?php echo $this->loadTemplate('config'); ?>
+				</div>
+			</div>
+		</div>
+
+		<div id="page-directory" class="tab">
+			<div class="noshow">
+				<div class="width-60">
+					<?php echo $this->loadTemplate('directory'); ?>
+				</div>
+			</div>
+		</div>
+
+		<div id="page-phpinfo" class="tab">
+			<div class="noshow">
+				<div class="width-100">
+					<?php echo $this->loadTemplate('phpinfo'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php
new file mode 100644
index 00000000..faa4d681
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_CONFIGURATION_FILE'); ?></legend>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th width="300">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php foreach ($this->config as $key => $value):?>
+			<tr>
+				<td>
+					<?php echo $key;?>
+				</td>
+				<td>
+					<?php echo htmlspecialchars($value, ENT_QUOTES);?>
+				</td>
+			</tr>
+			<?php endforeach;?>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php
new file mode 100644
index 00000000..412f1fa5
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS'); ?></legend>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th width="650">
+					<?php echo JText::_('COM_ADMIN_DIRECTORY'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_STATUS'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php foreach ($this->directory as $dir => $info) : ?>
+			<tr>
+				<td>
+					<?php echo JHtml::_('directory.message', $dir, $info['message']);?>
+				</td>
+				<td>
+					<?php echo JHtml::_('directory.writable', $info['writable']);?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php
new file mode 100644
index 00000000..d7ece87d
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="submenu-box">
+	<div class="submenu-box">
+		<div class="submenu-pad">
+			<ul id="submenu" class="information nav nav-list">
+				<li>
+					<a href="#" onclick="return false;" id="site" class="active">
+						<?php echo JText::_('COM_ADMIN_SYSTEM_INFORMATION'); ?></a>
+				</li>
+				<li>
+					<a href="#" onclick="return false;" id="phpsettings">
+						<?php echo JText::_('COM_ADMIN_PHP_SETTINGS'); ?></a>
+				</li>
+				<li>
+					<a href="#" onclick="return false;" id="config">
+						<?php echo JText::_('COM_ADMIN_CONFIGURATION_FILE'); ?></a>
+				</li>
+				<li>
+					<a href="#" onclick="return false;" id="directory">
+						<?php echo JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS'); ?></a>
+				</li>
+				<li>
+					<a href="#" onclick="return false;" id="phpinfo">
+						<?php echo JText::_('COM_ADMIN_PHP_INFORMATION'); ?></a>
+				</li>
+			</ul>
+			<div class="clr"></div>
+		</div>
+	</div>
+	<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php
new file mode 100644
index 00000000..1750e268
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_RELEVANT_PHP_SETTINGS'); ?></legend>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th width="250">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;
+				</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SAFE_MODE'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['safe_mode']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_OPEN_BASEDIR'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.string', $this->php_settings['open_basedir']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_DISPLAY_ERRORS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['display_errors']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SHORT_OPEN_TAGS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['short_open_tag']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_FILE_UPLOADS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['file_uploads']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_MAGIC_QUOTES'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['magic_quotes_gpc']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_REGISTER_GLOBALS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['register_globals']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_OUTPUT_BUFFERING'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.boolean', $this->php_settings['output_buffering']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SESSION_SAVE_PATH'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.string', $this->php_settings['session.save_path']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_SESSION_AUTO_START'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.integer', $this->php_settings['session.auto_start']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_XML_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['xml']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_ZLIB_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['zlib']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_ZIP_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['zip']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_DISABLED_FUNCTIONS'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.string', $this->php_settings['disable_functions']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_MBSTRING_ENABLED'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['mbstring']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('COM_ADMIN_ICONV_AVAILABLE'); ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('phpsetting.set', $this->php_settings['iconv']); ?>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php
new file mode 100644
index 00000000..4d44486f
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_ADMIN_SYSTEM_INFORMATION'); ?></legend>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th width="250">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;
+				</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_PHP_BUILT_ON'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['php'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_DATABASE_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['dbversion'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_DATABASE_COLLATION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['dbcollation'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_PHP_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['phpversion'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_WEB_SERVER'); ?></strong>
+				</td>
+				<td>
+					<?php echo JHtml::_('system.server', $this->info['server']); ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['sapi_name'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_JOOMLA_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['version'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_PLATFORM_VERSION'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['platform'];?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<strong><?php echo JText::_('COM_ADMIN_USER_AGENT'); ?></strong>
+				</td>
+				<td>
+					<?php echo $this->info['useragent'];?>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_associations/associations/default.php b/core/administrator/templates/hathor/html/com_associations/associations/default.php
new file mode 100644
index 00000000..c24d6311
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_associations/associations/default.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder        = $this->escape($this->state->get('list.ordering'));
+$listDirn         = $this->escape($this->state->get('list.direction'));
+$canManageCheckin = JFactory::getUser()->authorise('core.manage', 'com_checkin');
+$colSpan          = 5;
+
+$iconStates = array(
+	-2 => 'icon-trash',
+	0  => 'icon-unpublish',
+	1  => 'icon-publish',
+	2  => 'icon-archive',
+);
+
+JText::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == "associations.purge")
+		{
+			if (confirm(Joomla.JText._("COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			Joomla.submitform(pressbutton);
+		}
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=associations'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+	<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+	<?php else : ?>
+		<table class="adminlist" id="associationsList">
+			<thead>
+				<tr>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
+					</th>
+					<th width="5%" class="nowrap">
+						<?php echo JText::_('COM_ASSOCIATIONS_HEADING_ASSOCIATION'); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('COM_ASSOCIATIONS_HEADING_NO_ASSOCIATION'); ?>
+					</th>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<?php if (!empty($this->typeFields['access'])) : ?>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$canCheckin = true;
+				$canEdit    = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id);
+				$canCheckin = $canManageCheckin || AssociationsHelper::canCheckinItem($this->extensionName, $this->typeName, $item->id);
+				$isCheckout = AssociationsHelper::isCheckoutItem($this->extensionName, $this->typeName, $item->id);
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<?php if (!empty($this->typeSupports['state'])) : ?>
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+						</td>
+					<?php endif; ?>
+					<td class="nowrap has-context">
+						<?php if (isset($item->level)) : ?>
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+						<?php endif; ?>
+						<?php if ($canCheckin && $isCheckout) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
+						<?php endif; ?>
+						<?php if ($canEdit && !$isCheckout) : ?>
+							<a href="<?php echo JRoute::_($this->editUri . '&id=' . (int) $item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+						<?php else : ?>
+							<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+						<?php endif; ?>
+						<?php if (!empty($this->typeFields['alias'])) : ?>
+							<span class="small">
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							</span>
+						<?php endif; ?>
+						<?php if (!empty($this->typeFields['catid'])) : ?>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
+							</div>
+						<?php endif; ?>
+					</td>
+					<td class="small">
+						<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+					</td>
+					<td>
+						<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, !$isCheckout, false); ?>
+					</td>
+					<td>
+						<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, !$isCheckout, true); ?>
+					</td>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
+						<td class="small">
+							<?php echo $this->escape($item->menutype_title); ?>
+						</td>
+					<?php endif; ?>
+					<?php if (!empty($this->typeFields['access'])) : ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+					<?php endif; ?>
+					<td class="hidden-phone">
+						<?php echo $item->id; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+	<?php endif; ?>
+	<input type="hidden" name="task" value=""/>
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_banners/banner/edit.php b/core/administrator/templates/hathor/html/com_banners/banner/edit.php
new file mode 100644
index 00000000..f1d7f72d
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_banners/banner/edit.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('jquery.framework');
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'banner.cancel' || document.formvalidator.isValid(document.getElementById('banner-form')))
+		{
+			Joomla.submitform(task, document.getElementById('banner-form'));
+		}
+	}
+");
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="banner-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('COM_BANNERS_NEW_BANNER') : JText::sprintf('COM_BANNERS_BANNER_DETAILS', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('name'); ?>
+				<?php echo $this->form->getInput('name'); ?></li>
+
+				<li><?php echo $this->form->getLabel('alias'); ?>
+				<?php echo $this->form->getInput('alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?></li>
+
+				<li><?php echo $this->form->getLabel('catid'); ?>
+				<?php echo $this->form->getInput('catid'); ?></li>
+
+				<li><?php echo $this->form->getLabel('state'); ?>
+				<?php echo $this->form->getInput('state'); ?></li>
+
+				<li><?php echo $this->form->getLabel('type'); ?>
+				<?php echo $this->form->getInput('type'); ?></li>
+			</ul>
+			<ul id="image">
+				<?php foreach ($this->form->getFieldset('image') as $field) : ?>
+					<li><?php echo $field->label; ?>
+						<?php echo $field->input; ?></li>
+				<?php endforeach; ?>
+			</ul>
+			<ul>
+				<li><div id="custom">
+					<?php echo $this->form->getLabel('custombannercode'); ?>
+					<?php echo $this->form->getInput('custombannercode'); ?>
+				</div>
+				</li>
+
+				<li><div id="url">
+				<?php echo $this->form->getLabel('clickurl'); ?>
+				<?php echo $this->form->getInput('clickurl'); ?>
+				</div>
+				</li>
+
+				<li>
+				<?php echo $this->form->getLabel('description'); ?>
+				<div class="clr"></div>
+				<?php echo $this->form->getInput('description'); ?>
+				<div class="clr"></div>
+				</li>
+
+				<li><?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?></li>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+			</ul>
+			<div class="clr"> </div>
+
+		</fieldset>
+	</div>
+
+<div class="col options-section">
+	<?php echo JHtml::_('sliders.start', 'banner-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+	<?php echo JHtml::_('sliders.panel', JText::_('COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS'), 'publishing-details'); ?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('publish') as $field) : ?>
+				<li><?php echo $field->label; ?>
+					<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+	<?php echo JHtml::_('sliders.panel', JText::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS'), 'otherparams'); ?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_('COM_BANNERS_BANNER_DETAILS'); ?></legend>
+
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('otherparams') as $field) : ?>
+				<li><?php echo $field->label; ?>
+					<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+			<?php foreach ($this->form->getFieldset('bannerdetails') as $field) : ?>
+				<li><?php echo $field->label; ?>
+					<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+		</ul>	
+		</fieldset>
+
+	<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'metadata'); ?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+			<ul class="adminformlist">
+				<?php foreach ($this->form->getFieldset('metadata') as $field) : ?>
+					<li><?php echo $field->label; ?>
+						<?php echo $field->input; ?></li>
+				<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+	<?php echo JHtml::_('sliders.end'); ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+
+<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_banners/banners/default.php b/core/administrator/templates/hathor/html/com_banners/banners/default.php
new file mode 100644
index 00000000..fc42789a
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_banners/banners/default.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_banners');
+$saveOrder = $listOrder == 'ordering';
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_client_id">
+				<?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
+			</label>
+			<select name="filter_client_id" id="filter_client_id">
+				<option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+				<?php echo JHtml::_('select.options', BannersHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $this->state->get('filter.category_id'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_language">
+				<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+			</label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_STICKY', 'sticky', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CLIENT', 'client_name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap title category-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'banners.saveorder'); ?>
+					<?php endif;?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_IMPRESSIONS', 'impmade', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CLICKS', 'clicks', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JText::_('COM_BANNERS_HEADING_METAKEYWORDS'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('COM_BANNERS_HEADING_PURCHASETYPE'); ?>
+				</th>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering   = ($listOrder == 'ordering');
+			$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid);
+			$canCreate  = $user->authorise('core.create',     'com_banners.category.' . $item->catid);
+			$canEdit    = $user->authorise('core.edit',       'com_banners.category.' . $item->catid);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_banners&task=banner.edit&id='.(int) $item->id); ?>">
+							<?php echo $this->escape($item->name); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape($item->name); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('banner.pinned', $item->sticky, $i, $canChange);?>
+				</td>
+				<td class="center">
+					<?php echo $item->client_name;?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) : ?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, @$this->items[$i - 1]->catid == $item->catid, 'banners.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, @$this->items[$i + 1]->catid == $item->catid, 'banners.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, @$this->items[$i - 1]->catid == $item->catid, 'banners.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, @$this->items[$i + 1]->catid == $item->catid, 'banners.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering;?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ?: JText::_('COM_BANNERS_UNLIMITED'));?>
+				</td>
+				<td class="center">
+					<?php echo $item->clicks;?> -
+					<?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks / $item->impmade : 0);?>
+				</td>
+				<td>
+					<?php echo $item->metakey; ?>
+				</td>
+				<td class="center">
+					<?php if ($item->purchase_type < 0):?>
+						<?php echo JText::sprintf('COM_BANNERS_DEFAULT', ($item->client_purchase_type > 0) ? JText::_('COM_BANNERS_FIELD_VALUE_'.$item->client_purchase_type) : JText::_('COM_BANNERS_FIELD_VALUE_'.$this->state->params->get('purchase_type')));?>
+					<?php else:?>
+						<?php echo JText::_('COM_BANNERS_FIELD_VALUE_'.$item->purchase_type);?>
+					<?php endif;?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+	<div class="clr"> </div>
+
+	<?php //Load the batch processing form. ?>
+	<?php if ($user->authorise('core.create', 'com_banners')
+		&& $user->authorise('core.edit', 'com_banners')
+		&& $user->authorise('core.edit.state', 'com_banners')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title'  => JText::_('COM_BANNERS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer'),
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_banners/client/edit.php b/core/administrator/templates/hathor/html/com_banners/client/edit.php
new file mode 100644
index 00000000..75d78e77
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_banners/client/edit.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'client.cancel' || document.formvalidator.isValid(document.getElementById('client-form')))
+		{
+			Joomla.submitform(task, document.getElementById('client-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
+
+<div class="col main-section">
+	<fieldset class="adminform">
+		<legend><?php echo empty($this->item->id) ? JText::_('COM_BANNERS_NEW_CLIENT') : JText::sprintf('COM_BANNERS_EDIT_CLIENT', $this->item->id); ?></legend>
+		<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('name'); ?>
+				<?php echo $this->form->getInput('name'); ?></li>
+
+				<li><?php echo $this->form->getLabel('contact'); ?>
+				<?php echo $this->form->getInput('contact'); ?></li>
+
+				<li><?php echo $this->form->getLabel('email'); ?>
+				<?php echo $this->form->getInput('email'); ?></li>
+
+				<?php if ($this->canDo->get('core.edit.state')) : ?>
+					<li><?php echo $this->form->getLabel('state'); ?>
+					<?php echo $this->form->getInput('state'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('purchase_type'); ?>
+				<?php echo $this->form->getInput('purchase_type'); ?></li>
+
+				<li><?php echo $this->form->getLabel('track_impressions'); ?>
+				<?php echo $this->form->getInput('track_impressions'); ?></li>
+
+				<li><?php echo $this->form->getLabel('track_clicks'); ?>
+				<?php echo $this->form->getInput('track_clicks'); ?></li>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+		</ul>
+
+	</fieldset>
+</div>
+
+<div class="col options-section">
+	<?php echo JHtml::_('sliders.start', 'banner-client-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+	<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'metadata'); ?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('metadata') as $field) : ?>
+				<li>
+					<?php if (!$field->hidden) : ?>
+						<?php echo $field->label; ?>
+					<?php endif; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+	<?php echo JHtml::_('sliders.panel', JText::_('COM_BANNERS_EXTRA'), 'extra'); ?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_('COM_BANNERS_EXTRA'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('extra') as $field) : ?>
+				<li><?php if (!$field->hidden) : ?>
+					<?php echo $field->label; ?>
+				<?php endif; ?>
+				<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+	<?php echo JHtml::_('sliders.end'); ?>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+
+<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_banners/clients/default.php b/core/administrator/templates/hathor/html/com_banners/clients/default.php
new file mode 100644
index 00000000..ef5fa7ab
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_banners/clients/default.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_BANNERS_SEARCH_IN_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_state">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true);?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CLIENT', 'name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-30">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CONTACT', 'contact', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_ACTIVE', 'nbanners', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JText::_('COM_BANNERS_HEADING_METAKEYWORDS'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('COM_BANNERS_HEADING_PURCHASETYPE'); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering   = ($listOrder == 'ordering');
+			$canCreate  = $user->authorise('core.create',     'com_banners');
+			$canEdit    = $user->authorise('core.edit',       'com_banners');
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id='.(int) $item->id); ?>">
+							<?php echo $this->escape($item->name); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape($item->name); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $item->contact;?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange);?>
+				</td>
+				<td class="center">
+					<?php echo $item->nbanners; ?>
+				</td>
+				<td>
+					<?php echo $item->metakey; ?>
+				</td>
+				<td class="center">
+					<?php if ($item->purchase_type < 0):?>
+						<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_'.$this->state->params->get('purchase_type')));?>
+					<?php else:?>
+						<?php echo JText::_('COM_BANNERS_FIELD_VALUE_'.$item->purchase_type);?>
+					<?php endif;?>
+				</td>
+				<td class="center">
+					<?php echo $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_banners/download/default.php b/core/administrator/templates/hathor/html/com_banners/download/default.php
new file mode 100644
index 00000000..b1aa20ca
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_banners/download/default.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+?>
+<div class="container-popup">
+	<form
+		class="form-validate"
+		id="download-form"
+		name="adminForm"
+		action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
+		method="post">
+
+		<fieldset class="adminform">
+			<ul class="adminformlist">
+				<?php foreach ($this->form->getFieldset() as $field) : ?>
+					<li>
+						<?php echo $this->form->getLabel($field->fieldname); ?>
+						<?php echo $this->form->getInput($field->fieldname); ?>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+		<button class="hidden"
+			id="closeBtn"
+			type="button"
+			onclick="window.parent.jQuery('#modal-download').modal('hide');">
+		</button>
+		<button class="hidden"
+			id="exportBtn"
+			type="button"
+			onclick="this.form.submit();window.top.setTimeout('window.parent.jQuery(\'#downloadModal\').modal(\'hide\')', 700);">
+		</button>
+	</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_banners/tracks/default.php b/core/administrator/templates/hathor/html/com_banners/tracks/default.php
new file mode 100644
index 00000000..9d6c035f
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_banners/tracks/default.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.multiselect');
+JHtml::_('behavior.modal', 'a.modal');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form id="adminForm" name="adminForm" action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div class="span2" id="j-sidebar-container">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div class="span10" id="j-main-container">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+
+		<fieldset id="filter-bar">
+			<legend class="element-invisible"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></legend>
+			<div class="filter-search">
+				<label class="filter-hide-lbl" for="filter_begin"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></label>
+				<?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10));?>
+
+				<label class="filter-hide-lbl" for="filter_end"><?php echo JText::_('COM_BANNERS_END_LABEL'); ?></label>
+				<?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10));?>
+			</div>
+
+			<div class="filter-select">
+				<label class="selectlabel" for="filter_client_id">
+					<?php echo JText::_('COM_BANNERS_SELECT_CLIENT'); ?>
+				</label>
+				<select id="filter_client_id" name="filter_client_id">
+					<option value=""><?php echo JText::_('COM_BANNERS_SELECT_CLIENT');?></option>
+					<?php echo JHtml::_('select.options', BannersHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+				</select>
+
+				<label class="selectlabel" for="filter_category_id">
+					<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+				</label>
+				<?php $category = $this->state->get('filter.category_id');?>
+				<select id="filter_category_id" name="filter_category_id">
+					<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+					<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $category);?>
+				</select>
+
+				<label class="selectlabel" for="filter_type">
+					<?php echo JText::_('COM_BANNERS_SELECT_TYPE'); ?>
+				</label>
+				<select id="filter_type" name="filter_type">
+					<?php echo JHtml::_('select.options', array(JHtml::_('select.option', '0', JText::_('COM_BANNERS_SELECT_TYPE')), JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), 'value', 'text', $this->state->get('filter.type'));?>
+				</select>
+
+				<button id="filter-go" type="submit"><?php echo JText::_('JSUBMIT'); ?></button>
+			</div>
+		</fieldset>
+
+		<div class="clr"> </div>
+
+		<table class="adminlist">
+			<thead>
+				<tr>
+					<th class="title">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-20">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_CLIENT', 'client_name', $listDirn, $listOrder); ?>
+					</th>
+					<th class="width-20">
+						<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-10">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_TYPE', 'track_type', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-10">
+						<?php echo JHtml::_('grid.sort', 'COM_BANNERS_HEADING_COUNT', 'count', $listDirn, $listOrder); ?>
+					</th>
+					<th class="nowrap width-10">
+						<?php echo JHtml::_('grid.sort', 'JDATE', 'track_date', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td>
+						<?php echo $item->banner_name;?>
+					</td>
+					<td>
+						<?php echo $item->client_name;?>
+					</td>
+					<td>
+						<?php echo $item->category_title;?>
+					</td>
+					<td>
+						<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION'): JText::_('COM_BANNERS_CLICK');?>
+					</td>
+					<td>
+						<?php echo $item->count;?>
+					</td>
+					<td>
+						<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC5'));?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+
+		<?php // Load the export form ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'downloadModal',
+			array(
+				'title'       => JText::_('COM_BANNERS_TRACKS_DOWNLOAD'),
+				'url'         => JRoute::_('index.php?option=com_banners&amp;view=download&amp;tmpl=component'),
+				'width'       => '100%',
+				'height'      => '300px',
+				'footer'      => '<a class="btn" data-dismiss="modal" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#closeBtn\').click();">'
+						. JText::_('COM_BANNERS_CANCEL') . '</a>'
+						. '<button class="btn btn-success" type="button"'
+						. ' onclick="jQuery(\'#downloadModal iframe\').contents().find(\'#exportBtn\').click();">'
+						. JText::_('COM_BANNERS_TRACKS_EXPORT') . '</button>',
+			)
+		); ?>
+
+		<?php echo $this->pagination->getListFooter(); ?>
+
+		<input name="task" type="hidden" value="" />
+		<input name="boxchecked" type="hidden" value="0" />
+		<input name="filter_order" type="hidden" value="<?php echo $listOrder; ?>" />
+		<input name="filter_order_Dir" type="hidden" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_cache/cache/default.php b/core/administrator/templates/hathor/html/com_cache/cache/default.php
new file mode 100644
index 00000000..fc7115bb
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_cache/cache/default.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+		<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-select fltrt">
+			<label class="selectlabel" for="client_id">
+				<?php echo JText::_('COM_CACHE_SELECT_CLIENT'); ?>
+			</label>
+			<select name="client_id" id="client_id">
+				<?php echo JHtml::_('select.options', CacheHelper::getClientOptions(), 'value', 'text', $this->state->get('client_id'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+<table class="adminlist">
+	<thead>
+		<tr>
+			<th class="checkmark-col">
+				<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+			</th>
+			<th class="title nowrap">
+				<?php echo JHtml::_('grid.sort',  'COM_CACHE_GROUP', 'group', $listDirn, $listOrder); ?>
+			</th>
+			<th class="width-5 center nowrap">
+				<?php echo JHtml::_('grid.sort',  'COM_CACHE_NUMBER_OF_FILES', 'count', $listDirn, $listOrder); ?>
+			</th>
+			<th class="width-10 center">
+				<?php echo JHtml::_('grid.sort',  'COM_CACHE_SIZE', 'size', $listDirn, $listOrder); ?>
+			</th>
+		</tr>
+	</thead>
+
+	<tbody>
+		<?php
+		$i = 0;
+		foreach ($this->data as $folder => $item) : ?>
+		<tr class="row<?php echo $i % 2; ?>">
+			<td>
+				<input type="checkbox" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $item->group; ?>" onclick="Joomla.isChecked(this.checked);" />
+			</td>
+			<td>
+				<span class="bold">
+					<?php echo $item->group; ?>
+				</span>
+			</td>
+			<td class="center">
+				<?php echo $item->count; ?>
+			</td>
+			<td class="center">
+				<?php echo JHtml::_('number.bytes', $item->size*1024); ?>
+			</td>
+		</tr>
+		<?php $i++; endforeach; ?>
+	</tbody>
+</table>
+
+<?php echo $this->pagination->getListFooter(); ?>
+
+<input type="hidden" name="task" value="" />
+<input type="hidden" name="boxchecked" value="0" />
+<input type="hidden" name="client" value="<?php echo $this->client->id;?>" />
+<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_cache/purge/default.php b/core/administrator/templates/hathor/html/com_cache/purge/default.php
new file mode 100644
index 00000000..a24c9823
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_cache/purge/default.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+<table class="adminlist">
+	<thead>
+		<tr>
+			<th>
+				<?php echo JText::_('COM_CACHE_PURGE_EXPIRED_ITEMS'); ?>
+			</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+			<p class="mod-purge-instruct"><?php echo JText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
+			<p class="warning"><?php echo JText::_('COM_CACHE_RESOURCE_INTENSIVE_WARNING'); ?></p>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+<div>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_categories/categories/default.php b/core/administrator/templates/hathor/html/com_categories/categories/default.php
new file mode 100644
index 00000000..b06f7b02
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_categories/categories/default.php
@@ -0,0 +1,259 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$extension = $this->escape($this->state->get('filter.extension'));
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$ordering  = ($listOrder == 'a.lft');
+$canOrder  = $user->authorise('core.edit.state', $extension);
+$saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc');
+$jinput    = JFactory::getApplication()->input;
+$component = $jinput->get('extension');
+?>
+
+<div class="categories">
+	<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!empty($this->sidebar)) : ?>
+			<div id="j-sidebar-container" class="span2">
+				<?php echo $this->sidebar; ?>
+			</div>
+		<?php endif; ?>
+		<div id="j-main-container"<?php echo !empty($this->sidebar) ? ' class="span10"' : ''; ?>>
+			<fieldset id="filter-bar">
+				<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+				<div class="filter-search">
+					<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+					<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CATEGORIES_ITEMS_SEARCH_FILTER'); ?>" />
+
+					<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+					<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+				</div>
+
+				<div class="filter-select">
+					<label class="selectlabel" for="filter_level"><?php echo JText::_('JOPTION_SELECT_MAX_LEVELS'); ?></label>
+					<select name="filter_level" id="filter_level">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_MAX_LEVELS'); ?></option>
+						<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level')); ?>
+					</select>
+
+					<label class="selectlabel" for="filter_published"><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></label>
+					<select name="filter_published" id="filter_published">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
+					</select>
+
+					<label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
+					<select name="filter_access" id="filter_access">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+					</select>
+
+					<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+					<select name="filter_language" id="filter_language">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+					</select>
+
+					<label class="selectlabel" for="filter_tag"><?php echo JText::_('JOPTION_SELECT_TAG'); ?></label>
+					<select name="filter_tag" id="filter_tag">
+						<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
+					</select>
+
+					<button type="submit" id="filter-go">
+						<?php echo JText::_('JSUBMIT'); ?></button>
+				</div>
+			</fieldset>
+			<div class="clr"></div>
+
+			<table class="adminlist">
+				<thead>
+					<tr>
+						<th class="checkmark-col">
+							<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						</th>
+						<th class="title">
+							<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap state-col">
+							<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+						</th>
+						<th class="nowrap ordering-col">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.lft', $listDirn, $listOrder); ?>
+							<?php if ($canOrder && $saveOrder) : ?>
+								<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'categories.saveorder'); ?>
+							<?php endif; ?>
+						</th>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-publish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-unpublish hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-archive hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+							<th width="1%" class="nowrap center hidden-phone">
+								<span class="icon-trash hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>"><span class="element-invisible"><?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?></span></span>
+							</th>
+						<?php endif; ?>
+						<th class="access-col">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($this->assoc) : ?>
+							<th width="5%">
+								<?php echo JHtml::_('grid.sort', 'COM_CATEGORY_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+							</th>
+						<?php endif; ?>
+						<th class="language-col">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
+						</th>
+						<th class="nowrap id-col">
+							<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php
+						$orderkey = array_search($item->id, $this->ordering[$item->parent_id]);
+						$canEdit = $user->authorise('core.edit', $extension . '.category.' . $item->id);
+						$canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+						$canEditOwn = $user->authorise('core.edit.own', $extension . '.category.' . $item->id) && $item->created_user_id == $userId;
+						$canChange = $user->authorise('core.edit.state', $extension . '.category.' . $item->id) && $canCheckin;
+						?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td>
+								<?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level - 1) ?>
+								<?php if ($item->checked_out) : ?>
+									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'categories.', $canCheckin); ?>
+								<?php endif; ?>
+								<?php if ($canEdit || $canEditOwn) : ?>
+									<a href="<?php echo JRoute::_('index.php?option=com_categories&task=category.edit&id=' . $item->id . '&extension=' . $extension); ?>">
+										<?php echo $this->escape($item->title); ?></a>
+								<?php else : ?>
+									<?php echo $this->escape($item->title); ?>
+								<?php endif; ?>
+								<p class="smallsub" title="<?php echo $this->escape($item->path); ?>">
+									<?php echo str_repeat('<span class="gtr">|&mdash;</span>', $item->level - 1) ?>
+									<?php if (empty($item->note)) : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+									<?php else : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+									<?php endif; ?></p>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('jgrid.published', $item->published, $i, 'categories.', $canChange); ?>
+							</td>
+							<td class="order">
+								<?php if ($canChange) : ?>
+									<?php if ($saveOrder) : ?>
+										<span><?php echo $this->pagination->orderUpIcon($i, isset($this->ordering[$item->parent_id][$orderkey - 1]), 'categories.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+										<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, isset($this->ordering[$item->parent_id][$orderkey + 1]), 'categories.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+									<?php endif; ?>
+									<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
+									<input type="text" name="order[]" value="<?php echo $orderkey + 1; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+								<?php else : ?>
+									<?php echo $orderkey + 1; ?>
+								<?php endif; ?>
+							</td>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_published')) : ?>
+								<td class="center">
+									<a title="<?php echo JText::_('COM_CATEGORY_COUNT_PUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . '&filter[category_id]=' . (int) $item->id . '&filter[published]=1' . '&filter[level]=' . (int) $item->level); ?>">
+										<?php echo $item->count_published; ?></a>
+								</td>
+							<?php endif; ?>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?>
+								<td class="center">
+									<a title="<?php echo JText::_('COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . '&filter[category_id]=' . (int) $item->id . '&filter[published]=0' . '&filter[level]=' . (int) $item->level); ?>">
+										<?php echo $item->count_unpublished; ?></a>
+								</td>
+							<?php endif; ?>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_archived')) : ?>
+								<td class="center">
+									<a title="<?php echo JText::_('COM_CATEGORY_COUNT_ARCHIVED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . '&filter[category_id]=' . (int) $item->id . '&filter[published]=2' . '&filter[level]=' . (int) $item->level); ?>">
+										<?php echo $item->count_archived; ?></a>
+								</td>
+							<?php endif; ?>
+							<?php if (isset($this->items[0]) && property_exists($this->items[0], 'count_trashed')) : ?>
+								<td class="center">
+									<a title="<?php echo JText::_('COM_CATEGORY_COUNT_TRASHED_ITEMS'); ?>" href="<?php echo JRoute::_('index.php?option=' . $component . '&filter[category_id]=' . (int) $item->id . '&filter[published]=-2' . '&filter[level]=' . (int) $item->level); ?>">
+										<?php echo $item->count_trashed; ?></a>
+								</td>
+							<?php endif; ?>
+							<td class="center">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<?php if ($this->assoc) : ?>
+								<td class="center">
+									<?php if ($item->association): ?>
+										<?php echo JHtml::_('CategoriesAdministrator.association', $item->id, $extension); ?>
+									<?php endif; ?>
+								</td>
+							<?php endif; ?>
+							<td class="center nowrap">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="center">
+						<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+							<?php echo (int) $item->id; ?></span>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+
+			<?php echo $this->pagination->getListFooter(); ?>
+			<div class="clr"></div>
+
+			<?php //Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', $extension)
+				&& $user->authorise('core.edit', $extension)
+				&& $user->authorise('core.edit.state', $extension)) : ?>
+				<?php echo JHtml::_(
+					'bootstrap.renderModal',
+					'collapseModal',
+					array(
+						'title'  => JText::_('COM_CATEGORIES_BATCH_OPTIONS'),
+						'footer' => $this->loadTemplate('batch_footer'),
+					),
+					$this->loadTemplate('batch_body')
+				); ?>
+			<?php endif; ?>
+
+			<input type="hidden" name="extension" value="<?php echo $extension; ?>" />
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="boxchecked" value="0" />
+			<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+			<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_categories/category/edit.php b/core/administrator/templates/hathor/html/com_categories/category/edit.php
new file mode 100644
index 00000000..808ffaed
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_categories/category/edit.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+$input = JFactory::getApplication()->input;
+
+$saveHistory = $this->state->get('params')->get('save_history', 0);
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'category.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) {
+			" . $this->form->getField('description')->save() . "
+			Joomla.submitform(task, document.getElementById('item-form'));
+		}
+	}
+");
+$assoc = JLanguageAssociations::isEnabled();
+
+?>
+
+<div class="category-edit">
+	<form action="<?php echo JRoute::_('index.php?option=com_categories&extension=' . $input->getCmd('extension', 'com_content') . '&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+		<div class="col main-section">
+			<fieldset class="adminform">
+				<legend><?php echo JText::_('COM_CATEGORIES_FIELDSET_DETAILS'); ?></legend>
+				<ul class="adminformlist">
+					<li>
+						<?php echo $this->form->getLabel('title'); ?>
+						<?php echo $this->form->getInput('title'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('alias'); ?>
+						<?php echo $this->form->getInput('alias'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('extension'); ?>
+						<?php echo $this->form->getInput('extension'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('parent_id'); ?>
+						<?php echo $this->form->getInput('parent_id'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('published'); ?>
+						<?php echo $this->form->getInput('published'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('access'); ?>
+						<?php echo $this->form->getInput('access'); ?>
+					</li>
+					<?php if ($this->canDo->get('core.admin')) : ?>
+						<li>
+							<span class="faux-label"><?php echo JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></span>
+							<button type="button" onclick="document.location.href='#access-rules';">
+								<?php echo JText::_('JGLOBAL_PERMISSIONS_ANCHOR'); ?></button>
+
+						</li>
+					<?php endif; ?>
+					<li>
+						<?php echo $this->form->getLabel('language'); ?>
+						<?php echo $this->form->getInput('language'); ?>
+					</li>
+					<!-- Tag field -->
+					<li>
+						<?php if ($this->checkTags) : ?>
+							<?php echo $this->form->getLabel('tags'); ?>
+							<div class="is-tagbox">
+								<?php echo $this->form->getInput('tags'); ?>
+							</div>
+						<?php endif; ?>
+					</li>
+					<?php if ($saveHistory) : ?>
+						<li><?php echo $this->form->getLabel('version_note'); ?>
+						<?php echo $this->form->getInput('version_note'); ?></li>
+					<?php endif; ?>
+					<li>
+						<?php echo $this->form->getLabel('id'); ?>
+						<?php echo $this->form->getInput('id'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('hits'); ?>
+						<?php echo $this->form->getInput('hits'); ?>
+					</li>
+				</ul>
+
+				<div class="clr"></div>
+				<?php echo $this->form->getLabel('description'); ?>
+				<div class="clr"></div>
+				<?php echo $this->form->getInput('description'); ?>
+				<div class="clr"></div>
+			</fieldset>
+		</div>
+
+		<div class="col options-section">
+
+			<?php echo JHtml::_('sliders.start', 'categories-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+			<?php echo $this->loadTemplate('options'); ?>
+			<div class="clr"></div>
+
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
+			<fieldset class="panelform">
+				<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+				<?php echo $this->loadTemplate('metadata'); ?>
+			</fieldset>
+
+			<?php $fieldSets = $this->form->getFieldsets(); ?>
+			<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+				<?php if ($name !== 'basic' && $name !== 'item_associations' && $name !== 'jmetadata') : ?>
+					<?php
+					$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL';
+					echo JHtml::_('sliders.panel', JText::_($label), $name . '-options');
+					if (isset($fieldSet->description) && trim($fieldSet->description))
+					{
+						echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+					}
+					?>
+					<div class="clr"></div>
+					<fieldset class="panelform">
+						<ul class="adminformlist">
+							<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+								<li>
+									<?php echo $field->label; ?>
+									<?php echo $field->input; ?>
+								</li>
+							<?php endforeach; ?>
+						</ul>
+					</fieldset>
+				<?php endif; ?>
+			<?php endforeach; ?>
+
+			<?php if ($assoc) : ?>
+				<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS'), '-options');?>
+				<?php echo $this->loadTemplate('associations'); ?>
+			<?php endif; ?>
+
+			<?php echo JHtml::_('sliders.end'); ?>
+		</div>
+		<div class="clr"></div>
+
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<div class="col rules-section">
+
+				<?php echo JHtml::_('sliders.start', 'permissions-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+				<?php echo JHtml::_('sliders.panel', JText::_('COM_CATEGORIES_FIELDSET_RULES'), 'access-rules'); ?>
+				<fieldset class="panelform">
+					<legend class="element-invisible"><?php echo JText::_('COM_CATEGORIES_FIELDSET_RULES'); ?></legend>
+					<?php echo $this->form->getLabel('rules'); ?>
+					<?php echo $this->form->getInput('rules'); ?>
+				</fieldset>
+
+				<?php echo JHtml::_('sliders.end'); ?>
+			</div>
+		<?php endif; ?>
+		<div>
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+	<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_categories/category/edit_options.php b/core/administrator/templates/hathor/html/com_categories/category/edit_options.php
new file mode 100644
index 00000000..67a095c1
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_categories/category/edit_options.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die; ?>
+
+<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+
+<fieldset class="panelform">
+	<legend class="element-invisible"><?php echo JText::_('COM_CONTENT_FIELDSET_PUBLISHING'); ?></legend>
+	<ul class="adminformlist">
+		<li>
+			<?php echo $this->form->getLabel('created_user_id'); ?>
+			<?php echo $this->form->getInput('created_user_id'); ?>
+		</li>
+		<?php if ((int) $this->item->created_time) : ?>
+			<li>
+				<?php echo $this->form->getLabel('created_time'); ?>
+				<?php echo $this->form->getInput('created_time'); ?>
+			</li>
+		<?php endif; ?>
+		<?php if ($this->item->modified_user_id) : ?>
+			<li>
+				<?php echo $this->form->getLabel('modified_user_id'); ?>
+				<?php echo $this->form->getInput('modified_user_id'); ?>
+			</li>
+			<li>
+				<?php echo $this->form->getLabel('modified_time'); ?>
+				<?php echo $this->form->getInput('modified_time'); ?>
+			</li>
+		<?php endif; ?>
+	</ul>
+</fieldset>
+
+<?php $fieldSets = $this->form->getFieldsets('params'); ?>
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<?php
+	$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL';
+	echo JHtml::_('sliders.panel', JText::_($label), $name . '-options');
+	if (isset($fieldSet->description) && trim($fieldSet->description))
+	{
+		echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	}
+	?>
+	<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_($label); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+			<?php if ($name == 'basic'): ?>
+				<li>
+					<?php echo $this->form->getLabel('note'); ?>
+					<?php echo $this->form->getInput('note'); ?>
+				</li>
+			<?php endif; ?>
+		</ul>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_checkin/checkin/default.php b/core/administrator/templates/hathor/html/com_checkin/checkin/default.php
new file mode 100644
index 00000000..d6ce912a
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_checkin/checkin/default.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_checkin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_checkin'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty($this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+	<?php endif; ?>
+	<div id="j-main-container"<?php echo !empty($this->sidebar) ? ' class="span10"' : ''; ?>>
+		<fieldset id="filter-bar">
+			<div class="filter-search fltlft">
+				<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+				<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CHECKIN_FILTER_SEARCH_DESC'); ?>" />
+
+				<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+				<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+			</div>
+		</fieldset>
+		<div class="clr"></div>
+
+		<table id="global-checkin" class="adminlist">
+			<thead>
+				<tr>
+					<th width="1%">
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+					</th>
+					<th class="left"><?php echo JHtml::_('grid.sort', 'COM_CHECKIN_DATABASE_TABLE', 'table', $listDirn, $listOrder); ?></th>
+					<th><?php echo JHtml::_('grid.sort', 'COM_CHECKIN_ITEMS_TO_CHECK_IN', 'count', $listDirn, $listOrder); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php foreach ($this->items as $table => $count): $i = 0; ?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td class="center"><?php echo JHtml::_('grid.id', $i, $table); ?></td>
+						<td><?php echo JText::sprintf('COM_CHECKIN_TABLE', $table); ?></td>
+						<td width="200" class="center"><?php echo $count; ?></td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+			<tfoot>
+				<tr>
+					<td colspan="15">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+		</table>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default.php b/core/administrator/templates/hathor/html/com_config/application/default.php
new file mode 100644
index 00000000..964167b2
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.switcher');
+
+// Load submenu template, using element id 'submenu' as needed by behavior.switcher
+$this->document->setBuffer($this->loadTemplate('navigation'), 'modules', 'submenu');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'application.cancel' || document.formvalidator.isValid(document.getElementById('application-form'))) {
+			Joomla.submitform(task, document.getElementById('application-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
+	<?php if ($this->ftp) : ?>
+		<?php echo $this->loadTemplate('ftplogin'); ?>
+	<?php endif; ?>
+	<div id="config-document">
+		<div id="page-site" class="tab">
+			<div class="noshow">
+				<div class="width-60 fltlft">
+					<?php echo $this->loadTemplate('site'); ?>
+					<?php echo $this->loadTemplate('metadata'); ?>
+				</div>
+				<div class="width-40 fltrt">
+					<?php echo $this->loadTemplate('seo'); ?>
+					<?php echo $this->loadTemplate('cookie'); ?>
+				</div>
+			</div>
+		</div>
+		<div id="page-system" class="tab">
+			<div class="noshow">
+				<div class="width-60 fltlft">
+					<?php echo $this->loadTemplate('system'); ?>
+				</div>
+				<div class="width-40 fltrt">
+					<?php echo $this->loadTemplate('debug'); ?>
+					<?php echo $this->loadTemplate('cache'); ?>
+					<?php echo $this->loadTemplate('session'); ?>
+				</div>
+			</div>
+		</div>
+		<div id="page-server" class="tab">
+			<div class="noshow">
+				<div class="width-60 fltlft">
+					<?php echo $this->loadTemplate('server'); ?>
+					<?php echo $this->loadTemplate('locale'); ?>
+					<?php echo $this->loadTemplate('ftp'); ?>
+				</div>
+				<div class="width-40 fltrt">
+					<?php echo $this->loadTemplate('database'); ?>
+					<?php echo $this->loadTemplate('mail'); ?>
+				</div>
+			</div>
+		</div>
+		<div id="page-permissions" class="tab">
+			<div class="noshow">
+				<?php echo $this->loadTemplate('permissions'); ?>
+			</div>
+		</div>
+		<div id="page-filters" class="tab">
+			<div class="noshow">
+				<?php echo $this->loadTemplate('filters'); ?>
+			</div>
+		</div>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+	<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_cache.php b/core/administrator/templates/hathor/html/com_config/application/default_cache.php
new file mode 100644
index 00000000..5102ec5c
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_cache.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_CACHE_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('cache') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_cookie.php b/core/administrator/templates/hathor/html/com_config/application/default_cookie.php
new file mode 100644
index 00000000..b775487e
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_cookie.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<div class="width-100">
+
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_COOKIE_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('cookie') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_database.php b/core/administrator/templates/hathor/html/com_config/application/default_database.php
new file mode 100644
index 00000000..1c482780
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_database.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_DATABASE_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('database') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_debug.php b/core/administrator/templates/hathor/html/com_config/application/default_debug.php
new file mode 100644
index 00000000..cb49f3b9
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_debug.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_DEBUG_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('debug') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_filters.php b/core/administrator/templates/hathor/html/com_config/application/default_filters.php
new file mode 100644
index 00000000..4ef2f574
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_filters.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-80">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_TEXT_FILTER_SETTINGS'); ?></legend>
+		<p><?php echo JText::_('COM_CONFIG_TEXT_FILTERS_DESC'); ?></p>
+		<?php foreach ($this->form->getFieldset('filters') as $field) : ?>
+			<?php echo $field->label; ?>
+			<div class="clr"></div>
+			<?php echo $field->input; ?>
+		<?php endforeach; ?>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_ftp.php b/core/administrator/templates/hathor/html/com_config/application/default_ftp.php
new file mode 100644
index 00000000..e22ccc64
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_ftp.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_FTP_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('ftp') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_ftplogin.php b/core/administrator/templates/hathor/html/com_config/application/default_ftplogin.php
new file mode 100644
index 00000000..781ed676
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_ftplogin.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset title="<?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?>" class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
+		<?php echo JText::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
+
+		<?php if ($this->ftp instanceof Exception) : ?>
+			<p><?php echo JText::_($this->ftp->message); ?></p>
+		<?php endif; ?>
+		<ul class="adminformlist">
+			<li>
+				<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+				<input type="text" id="username" name="username" class="input_box" size="70" value="" />
+			</li>
+			<li>
+				<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+				<input type="password" id="password" name="password" class="input_box" size="70" value="" />
+			</li>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_locale.php b/core/administrator/templates/hathor/html/com_config/application/default_locale.php
new file mode 100644
index 00000000..4156ffb0
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_locale.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_LOCATION_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('locale') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_mail.php b/core/administrator/templates/hathor/html/com_config/application/default_mail.php
new file mode 100644
index 00000000..948531a9
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_mail.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('jquery.token');
+JHtml::_('script', 'system/sendtestmail.js', array('version' => 'auto', 'relative' => true));
+
+JFactory::getDocument()->addScriptDeclaration('
+	var sendtestmail_url = "' . addslashes(JUri::base()) . 'index.php?option=com_config&task=config.sendtestmail.application&format=json";
+ ');
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_MAIL_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('mail') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+		<button type="button" class="btn btn-small" id="sendtestmail">
+			<span><?php echo JText::_('COM_CONFIG_SENDMAIL_ACTION_BUTTON'); ?></span>
+		</button>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_metadata.php b/core/administrator/templates/hathor/html/com_config/application/default_metadata.php
new file mode 100644
index 00000000..80599136
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_metadata.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform long">
+		<legend><?php echo JText::_('COM_CONFIG_METADATA_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('metadata') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_navigation.php b/core/administrator/templates/hathor/html/com_config/application/default_navigation.php
new file mode 100644
index 00000000..40b22f10
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_navigation.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="submenu-box">
+	<ul id="submenu" class="configuration">
+		<li><a href="#" onclick="return false;" id="site" class="active"><?php echo JText::_('JSITE'); ?></a></li>
+		<li><a href="#" onclick="return false;" id="system"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></a></li>
+		<li><a href="#" onclick="return false;" id="server"><?php echo JText::_('COM_CONFIG_SERVER'); ?></a></li>
+		<li><a href="#" onclick="return false;" id="permissions"><?php echo JText::_('COM_CONFIG_PERMISSIONS'); ?></a>
+		</li>
+		<li><a href="#" onclick="return false;" id="filters"><?php echo JText::_('COM_CONFIG_TEXT_FILTERS') ?></a></li>
+	</ul>
+	<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_permissions.php b/core/administrator/templates/hathor/html/com_config/application/default_permissions.php
new file mode 100644
index 00000000..3d706590
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_permissions.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_PERMISSION_SETTINGS'); ?></legend>
+		<?php foreach ($this->form->getFieldset('permissions') as $field) : ?>
+			<?php echo $field->label; ?>
+			<div class="clr"></div>
+			<?php echo $field->input; ?>
+		<?php endforeach; ?>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_seo.php b/core/administrator/templates/hathor/html/com_config/application/default_seo.php
new file mode 100644
index 00000000..33422140
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_seo.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform long">
+		<legend><?php echo JText::_('COM_CONFIG_SEO_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('seo') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_server.php b/core/administrator/templates/hathor/html/com_config/application/default_server.php
new file mode 100644
index 00000000..9cda70d0
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_server.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_SERVER_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('server') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_session.php b/core/administrator/templates/hathor/html/com_config/application/default_session.php
new file mode 100644
index 00000000..d202e5bc
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_session.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_SESSION_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('session') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_site.php b/core/administrator/templates/hathor/html/com_config/application/default_site.php
new file mode 100644
index 00000000..dfc8abad
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_site.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_SITE_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('site') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/application/default_system.php b/core/administrator/templates/hathor/html/com_config/application/default_system.php
new file mode 100644
index 00000000..6bfc2501
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/application/default_system.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="width-100">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_CONFIG_SYSTEM_SETTINGS'); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('system') as $field): ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_config/component/default.php b/core/administrator/templates/hathor/html/com_config/component/default.php
new file mode 100644
index 00000000..1142ef54
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_config/component/default.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$template = $app->getTemplate();
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('bootstrap.framework');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (document.formvalidator.isValid(document.getElementById('component-form'))) {
+			Joomla.submitform(task, document.getElementById('component-form'));
+		}
+	}
+");
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate">
+	<?php
+	echo JHtml::_('tabs.start', 'config-tabs-' . $this->component->option . '_configuration', array('useCookie' => 1));
+	$fieldSets = $this->form->getFieldsets();
+	?>
+	<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+		<?php
+		$label = empty($fieldSet->label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label;
+		echo JHtml::_('tabs.panel', JText::_($label), 'publishing-details');
+		if (isset($fieldSet->description) && !empty($fieldSet->description))
+		{
+		echo '<p class="tab-description">' . JText::_($fieldSet->description) . '</p>';
+		}
+		?>
+		<ul class="config-option-list">
+			<?php foreach ($this->form->getFieldset($name) as $field): ?>
+				<li>
+					<?php if (!$field->hidden) : ?>
+						<?php echo $field->label; ?>
+					<?php endif; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+
+		<div class="clr"></div>
+	<?php endforeach; ?>
+	<?php echo JHtml::_('tabs.end'); ?>
+	<div>
+		<input type="hidden" name="id" value="<?php echo $this->component->id; ?>" />
+		<input type="hidden" name="component" value="<?php echo $this->component->option; ?>" />
+		<input type="hidden" name="return" value="<?php echo $this->return; ?>" />
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_contact/contact/edit.php b/core/administrator/templates/hathor/html/com_contact/contact/edit.php
new file mode 100644
index 00000000..3cdbfaac
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_contact/contact/edit.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+$saveHistory = $this->state->get('params')->get('save_history', 0);
+
+$assoc = JLanguageAssociations::isEnabled();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'contact.cancel' || document.formvalidator.isValid(document.getElementById('contact-form')))
+		{
+			" . $this->form->getField('misc')->save() . "
+			Joomla.submitform(task, document.getElementById('contact-form'));
+		}
+	}
+");
+$fieldSets = $this->form->getFieldsets();
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_contact&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="contact-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('COM_CONTACT_NEW_CONTACT') : JText::sprintf('COM_CONTACT_EDIT_CONTACT', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('name'); ?>
+				<?php echo $this->form->getInput('name'); ?></li>
+
+				<li><?php echo $this->form->getLabel('alias'); ?>
+				<?php echo $this->form->getInput('alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('user_id'); ?>
+				<?php echo $this->form->getInput('user_id'); ?></li>
+
+				<li><?php echo $this->form->getLabel('catid'); ?>
+				<?php echo $this->form->getInput('catid'); ?></li>
+
+				<li><?php echo $this->form->getLabel('published'); ?>
+				<?php echo $this->form->getInput('published'); ?></li>
+
+				<li><?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?></li>
+
+				<li><?php echo $this->form->getLabel('ordering'); ?>
+				<?php echo $this->form->getInput('ordering'); ?></li>
+
+				<li><?php echo $this->form->getLabel('featured'); ?>
+				<?php echo $this->form->getInput('featured'); ?></li>
+
+				<li><?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?></li>
+
+				<!-- Tag field -->
+				<li><?php echo $this->form->getLabel('tags'); ?>
+					<div class="is-tagbox">
+						<?php echo $this->form->getInput('tags'); ?>
+					</div>
+				</li>
+
+				<?php if ($saveHistory) : ?>
+					<li><?php echo $this->form->getLabel('version_note'); ?>
+					<?php echo $this->form->getInput('version_note'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+			</ul>
+			<div class="clr"></div>
+			<?php echo $this->form->getLabel('misc'); ?>
+			<div class="clr"></div>
+			<?php echo $this->form->getInput('misc'); ?>
+		</fieldset>
+	</div>
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'contact-slider'); ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+				<ul class="adminformlist">
+
+					<li><?php echo $this->form->getLabel('created_by'); ?>
+					<?php echo $this->form->getInput('created_by'); ?></li>
+
+					<li><?php echo $this->form->getLabel('created_by_alias'); ?>
+					<?php echo $this->form->getInput('created_by_alias'); ?></li>
+
+					<li><?php echo $this->form->getLabel('created'); ?>
+					<?php echo $this->form->getInput('created'); ?></li>
+
+					<li><?php echo $this->form->getLabel('publish_up'); ?>
+					<?php echo $this->form->getInput('publish_up'); ?></li>
+
+					<li><?php echo $this->form->getLabel('publish_down'); ?>
+					<?php echo $this->form->getInput('publish_down'); ?></li>
+
+					<?php if ($this->item->modified_by) : ?>
+						<li><?php echo $this->form->getLabel('modified_by'); ?>
+						<?php echo $this->form->getInput('modified_by'); ?></li>
+
+						<li><?php echo $this->form->getLabel('modified'); ?>
+						<?php echo $this->form->getInput('modified'); ?></li>
+					<?php endif; ?>
+
+				</ul>
+			</fieldset>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_CONTACT_DETAILS'), 'basic-options'); ?>
+
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('COM_CONTACT_CONTACT_DETAILS'); ?></legend>
+				<p><?php echo empty($this->item->id) ? JText::_('COM_CONTACT_DETAILS') : JText::sprintf('COM_CONTACT_EDIT_DETAILS', $this->item->id); ?></p>
+
+				<ul class="adminformlist">
+					<li><?php echo $this->form->getLabel('image'); ?>
+					<?php echo $this->form->getInput('image'); ?></li>
+
+					<li><?php echo $this->form->getLabel('con_position'); ?>
+					<?php echo $this->form->getInput('con_position'); ?></li>
+
+					<li><?php echo $this->form->getLabel('email_to'); ?>
+					<?php echo $this->form->getInput('email_to'); ?></li>
+
+					<li><?php echo $this->form->getLabel('address'); ?>
+					<?php echo $this->form->getInput('address'); ?></li>
+
+					<li><?php echo $this->form->getLabel('suburb'); ?>
+					<?php echo $this->form->getInput('suburb'); ?></li>
+
+					<li><?php echo $this->form->getLabel('state'); ?>
+					<?php echo $this->form->getInput('state'); ?></li>
+
+					<li><?php echo $this->form->getLabel('postcode'); ?>
+					<?php echo $this->form->getInput('postcode'); ?></li>
+
+					<li><?php echo $this->form->getLabel('country'); ?>
+					<?php echo $this->form->getInput('country'); ?></li>
+
+					<li><?php echo $this->form->getLabel('telephone'); ?>
+					<?php echo $this->form->getInput('telephone'); ?></li>
+
+					<li><?php echo $this->form->getLabel('mobile'); ?>
+					<?php echo $this->form->getInput('mobile'); ?></li>
+
+					<li><?php echo $this->form->getLabel('fax'); ?>
+					<?php echo $this->form->getInput('fax'); ?></li>
+
+					<li><?php echo $this->form->getLabel('webpage'); ?>
+					<?php echo $this->form->getInput('webpage'); ?></li>
+
+					<li><?php echo $this->form->getLabel('sortname1'); ?>
+					<?php echo $this->form->getInput('sortname1'); ?></li>
+
+					<li><?php echo $this->form->getLabel('sortname2'); ?>
+					<?php echo $this->form->getInput('sortname2'); ?></li>
+
+					<li><?php echo $this->form->getLabel('sortname3'); ?>
+					<?php echo $this->form->getInput('sortname3'); ?></li>
+				</ul>
+			</fieldset>
+
+			<?php echo $this->loadTemplate('params'); ?>
+
+			<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+				<?php if ($name != 'details' && $name != 'display' && $name != 'item_associations' && $name != 'jmetadata' && $name != 'email') : ?>
+					<?php echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-options'); ?>
+					<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+						<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description));?></p>
+					<?php endif; ?>
+					<fieldset class="panelform">
+						<ul class="adminformlist">
+						<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+							<li>
+								<?php echo $field->label; ?>
+								<?php echo $field->input; ?>
+							</li>
+						<?php endforeach; ?>
+						</ul>
+					</fieldset>
+				<?php endif ?>
+			<?php endforeach; ?>
+
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+				<?php echo $this->loadTemplate('metadata'); ?>
+			</fieldset>
+
+			<?php if ($assoc) : ?>
+				<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS'), '-options');?>
+				<?php echo $this->loadTemplate('associations'); ?>
+			<?php endif; ?>
+
+		<?php echo JHtml::_('sliders.end'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_contact/contact/edit_params.php b/core/administrator/templates/hathor/html/com_contact/contact/edit_params.php
new file mode 100644
index 00000000..ac3da313
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_contact/contact/edit_params.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-params');
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+	endif;
+	?>
+	<fieldset class="panelform" >
+	<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+				<li><?php echo $field->label; ?>
+				<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_contact/contacts/default.php b/core/administrator/templates/hathor/html/com_contact/contacts/default.php
new file mode 100644
index 00000000..a6adbe30
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_contact/contacts/default.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_contact');
+$saveOrder = $listOrder == 'a.ordering';
+$assoc     = JLanguageAssociations::isEnabled();
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_contact'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CONTACT_SEARCH_IN_NAME'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_contact'), 'value', 'text', $this->state->get('filter.category_id'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_language">
+				<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+			</label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_tag">
+				<?php echo JText::_('JOPTION_SELECT_TAG'); ?>
+			</label>
+			<select name="filter_tag" id="filter_tag">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TAG');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap featured-col">
+					<?php echo JHtml::_('grid.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder, null, 'desc'); ?>
+				</th>
+				<th class="title category-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'contacts.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+				</th>
+				<?php if ($assoc) : ?>
+					<th width="5%">
+						<?php echo JHtml::_('grid.sort', 'COM_CONTACT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif;?>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php
+		$n = count($this->items);
+		foreach ($this->items as $i => $item) :
+			$ordering   = $listOrder == 'a.ordering';
+			$canCreate  = $user->authorise('core.create',     'com_contact.category.' . $item->catid);
+			$canEdit    = $user->authorise('core.edit',       'com_contact.category.' . $item->catid);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+			$canEditOwn = $user->authorise('core.edit.own',   'com_contact.category.' . $item->catid) && $item->created_by == $userId;
+			$canChange  = $user->authorise('core.edit.state', 'com_contact.category.' . $item->catid) && $canCheckin;
+
+			$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_contact&task=edit&type=other&id='.$item->catid);
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'contacts.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit || $canEditOwn) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_contact&task=contact.edit&id='.(int) $item->id); ?>">
+						<?php echo $this->escape($item->name); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias));?></p>
+				</td>
+				<td align="center">
+					<?php if (!empty($item->linked_user)) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id='.$item->user_id);?>"><?php echo $item->linked_user;?></a>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('contact.featured', $item->featured, $i, $canChange); ?>
+				</td>
+				<td class="center">
+					<?php echo $item->category_title; ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) : ?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'contacts.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'contacts.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'contacts.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'contacts.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $item->access_level; ?>
+				</td>
+				<?php if ($assoc) : ?>
+					<td class="center">
+						<?php if ($item->association) : ?>
+							<?php echo JHtml::_('contact.association', $item->id); ?>
+						<?php endif; ?>
+					</td>
+				<?php endif;?>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+		<?php //Load the batch processing form. ?>
+		<?php if ($user->authorise('core.create', 'com_contact')
+			&& $user->authorise('core.edit', 'com_contact')
+			&& $user->authorise('core.edit.state', 'com_contact')) : ?>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'collapseModal',
+				array(
+					'title'  => JText::_('COM_CONTACT_BATCH_OPTIONS'),
+					'footer' => $this->loadTemplate('batch_footer'),
+				),
+				$this->loadTemplate('batch_body')
+			); ?>
+		<?php endif; ?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_contact/contacts/modal.php b/core/administrator/templates/hathor/html/com_contact/contacts/modal.php
new file mode 100644
index 00000000..a6d0b273
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_contact/contacts/modal.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd');
+$function  = JFactory::getApplication()->input->getCmd('function', 'jSelectContact');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter-search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('JSEARCH_FILTER'); ?>" />
+
+			<button type="submit">
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_contact'), 'value', 'text', $this->state->get('filter.category_id'));?>
+			</select>
+
+			<?php if ($forcedLanguage) : ?>
+				<input type="hidden" name="forcedLanguage" value="<?php echo $this->escape($forcedLanguage); ?>" />
+				<input type="hidden" name="filter_language" value="<?php echo $this->escape($this->state->get('filter.language')); ?>" />
+			<?php else : ?>
+				<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+				<select name="filter_language" id="filter_language">
+					<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
+					<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
+				</select>
+			<?php endif; ?>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist modal">
+		<thead>
+			<tr>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_CONTACT_FIELD_LINKED_USER_LABEL', 'ul.name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'a.catid', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $this->escape($function);?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->name)); ?>');">
+						<?php echo $this->escape($item->name); ?></a>
+				</th>
+				<td class="center">
+					<?php if (!empty($item->linked_user)) : ?>
+						<?php echo $item->linked_user;?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<input type="hidden" name="forcedLanguage" value="<?php echo $forcedLanguage; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_content/article/edit.php b/core/administrator/templates/hathor/html/com_content/article/edit.php
new file mode 100644
index 00000000..e4d165ac
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_content/article/edit.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+
+// Create shortcut to parameters.
+$params = $this->state->get('params');
+$params = $params->toArray();
+$saveHistory = $this->state->get('params')->get('save_history', 0);
+
+// This checks if the config options have ever been saved. If they haven't they will fall back to the original settings.
+$editoroptions = isset($params['show_publishing_options']);
+
+$input = JFactory::getApplication()->input;
+
+if (!$editoroptions):
+	$params['show_publishing_options'] = '1';
+	$params['show_article_options'] = '1';
+	$params['show_urls_images_backend'] = '0';
+	$params['show_urls_images_frontend'] = '0';
+endif;
+
+// Check if the article uses configuration settings besides global. If so, use them.
+if (!empty($this->item->attribs['show_publishing_options'])):
+		$params['show_publishing_options'] = $this->item->attribs['show_publishing_options'];
+endif;
+if (!empty($this->item->attribs['show_article_options'])):
+		$params['show_article_options'] = $this->item->attribs['show_article_options'];
+endif;
+if (!empty($this->item->attribs['show_urls_images_backend'])):
+		$params['show_urls_images_backend'] = $this->item->attribs['show_urls_images_backend'];
+endif;
+
+$assoc = JLanguageAssociations::isEnabled();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'article.cancel' || document.formvalidator.isValid(document.getElementById('item-form')))
+		{
+			" . $this->form->getField('articletext')->save() . "
+			Joomla.submitform(task, document.getElementById('item-form'));
+		}
+	}
+");
+?>
+<div class="article-edit">
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('COM_CONTENT_NEW_ARTICLE') : JText::sprintf('COM_CONTENT_EDIT_ARTICLE', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('title'); ?>
+				<?php echo $this->form->getInput('title'); ?></li>
+
+				<li><?php echo $this->form->getLabel('alias'); ?>
+				<?php echo $this->form->getInput('alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('catid'); ?>
+				<?php echo $this->form->getInput('catid'); ?></li>
+
+				<li><?php echo $this->form->getLabel('state'); ?>
+				<?php echo $this->form->getInput('state'); ?></li>
+
+				<li><?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?></li>
+
+				<?php if ($this->canDo->get('core.admin')) : ?>
+					<li><span class="faux-label"><?php echo JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></span>
+						<button type="button" onclick="document.location.href='#access-rules';">
+							<?php echo JText::_('JGLOBAL_PERMISSIONS_ANCHOR'); ?>
+						</button>
+					</li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('featured'); ?>
+				<?php echo $this->form->getInput('featured'); ?></li>
+
+				<li><?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?></li>
+
+				<!-- Tag field -->
+				<li><?php echo $this->form->getLabel('tags'); ?>
+					<div class="is-tagbox">
+						<?php echo $this->form->getInput('tags'); ?>
+					</div>
+				</li>
+
+				<?php if ($saveHistory) : ?>
+					<li><?php echo $this->form->getLabel('version_note'); ?>
+					<?php echo $this->form->getInput('version_note'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+
+			</ul>
+
+			<div class="clr"></div>
+			<?php echo $this->form->getLabel('articletext'); ?>
+			<div class="clr"></div>
+			<?php echo $this->form->getInput('articletext'); ?>
+			<div class="clr"></div>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'content-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+		<?php // Do not show the publishing options if the edit form is configured not to. ?>
+		<?php  if ($params['show_publishing_options'] || ( $params['show_publishing_options'] = '' && !empty($editoroptions)) ) : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTENT_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+			<fieldset class="panelform">
+				<ul class="adminformlist">
+					<li><?php echo $this->form->getLabel('created_by'); ?>
+					<?php echo $this->form->getInput('created_by'); ?></li>
+
+					<li><?php echo $this->form->getLabel('created_by_alias'); ?>
+					<?php echo $this->form->getInput('created_by_alias'); ?></li>
+
+					<li><?php echo $this->form->getLabel('created'); ?>
+					<?php echo $this->form->getInput('created'); ?></li>
+
+						<li><?php echo $this->form->getLabel('publish_up'); ?>
+						<?php echo $this->form->getInput('publish_up'); ?></li>
+
+					<li><?php echo $this->form->getLabel('publish_down'); ?>
+					<?php echo $this->form->getInput('publish_down'); ?></li>
+
+					<?php if ($this->item->modified_by) : ?>
+						<li><?php echo $this->form->getLabel('modified_by'); ?>
+						<?php echo $this->form->getInput('modified_by'); ?></li>
+
+						<li><?php echo $this->form->getLabel('modified'); ?>
+						<?php echo $this->form->getInput('modified'); ?></li>
+					<?php endif; ?>
+
+					<?php if ($this->item->version) : ?>
+						<li><?php echo $this->form->getLabel('version'); ?>
+						<?php echo $this->form->getInput('version'); ?></li>
+					<?php endif; ?>
+
+					<?php if ($this->item->hits) : ?>
+						<li><?php echo $this->form->getLabel('hits'); ?>
+						<?php echo $this->form->getInput('hits'); ?></li>
+					<?php endif; ?>
+				</ul>
+			</fieldset>
+		<?php  endif; ?>
+		<?php  $fieldSets = $this->form->getFieldsets(); ?>
+			<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+				<?php
+					// If the parameter says to show the article options or if the parameters have never been set, we will
+					// show the article options.
+
+					if ($params['show_article_options'] || ($params['show_article_options'] == '' && !empty($editoroptions))):
+
+					// Go through all the fieldsets except the configuration and basic-limited, which are
+					// handled separately below.
+					if ($name != 'editorConfig' && $name != 'basic-limited' && $name != 'item_associations' && $name != 'jmetadata') : ?>
+						<?php echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-options'); ?>
+						<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+							<p class="tip"><?php echo $this->escape(JText::_($fieldSet->description));?></p>
+						<?php endif; ?>
+						<fieldset class="panelform">
+							<ul class="adminformlist">
+							<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+								<li><?php echo $field->label; ?>
+								<?php echo $field->input; ?></li>
+							<?php endforeach; ?>
+							</ul>
+						</fieldset>
+					<?php endif ?>
+					<?php // If we are not showing the options we need to use the hidden fields so the values are not lost.  ?>
+				<?php  elseif ($name == 'basic-limited') : ?>
+						<?php foreach ($this->form->getFieldset('basic-limited') as $field) : ?>
+							<?php  echo $field->input; ?>
+						<?php endforeach; ?>
+
+				<?php endif; ?>
+			<?php endforeach; ?>
+			<?php // Not the best place, but here for continuity with 1.5/1/6/1.7 ?>
+				<fieldset class="panelform">
+				</fieldset>
+				<?php
+					// We need to make a separate space for the configuration
+					// so that those fields always show to those wih permissions
+					if ( $this->canDo->get('core.admin')   ):  ?>
+					<?php  echo JHtml::_('sliders.panel', JText::_('COM_CONTENT_SLIDER_EDITOR_CONFIG'), 'configure-sliders'); ?>
+						<fieldset  class="panelform" >
+							<ul class="adminformlist">
+							<?php foreach ($this->form->getFieldset('editorConfig') as $field) : ?>
+								<li><?php echo $field->label; ?>
+								<?php echo $field->input; ?></li>
+							<?php endforeach; ?>
+							</ul>
+						</fieldset>
+				<?php endif ?>
+
+		<?php // The URL and images fields only show if the configuration is set to allow them.  ?>
+		<?php // This is for legacy reasons. ?>
+		<?php if ($params['show_urls_images_backend']) : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTENT_FIELDSET_URLS_AND_IMAGES'), 'urls_and_images-options'); ?>
+				<fieldset class="panelform">
+				<ul class="adminformlist">
+					<li>
+					<?php echo $this->form->getLabel('images'); ?>
+					<?php echo $this->form->getInput('images'); ?></li>
+
+					<?php foreach ($this->form->getGroup('images') as $field) : ?>
+						<li>
+							<?php if (!$field->hidden) : ?>
+								<?php echo $field->label; ?>
+							<?php endif; ?>
+							<?php echo $field->input; ?>
+						</li>
+					<?php endforeach; ?>
+						<?php foreach ($this->form->getGroup('urls') as $field) : ?>
+						<li>
+							<?php if (!$field->hidden) : ?>
+								<?php echo $field->label; ?>
+							<?php endif; ?>
+							<?php echo $field->input; ?>
+						</li>
+					<?php endforeach; ?>
+				</ul>
+				</fieldset>
+		<?php endif; ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+				<?php echo $this->loadTemplate('metadata'); ?>
+			</fieldset>
+
+		<?php if ($assoc) : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS'), '-options');?>
+			<?php echo $this->loadTemplate('associations'); ?>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('sliders.end'); ?>
+	</div>
+
+	<div class="clr"></div>
+	<?php if ($this->canDo->get('core.admin')) : ?>
+		<div  class="col rules-section">
+			<?php echo JHtml::_('sliders.start', 'permissions-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+				<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTENT_FIELDSET_RULES'), 'access-rules'); ?>
+				<fieldset class="panelform">
+					<legend class="element-invisible"><?php echo JText::_('COM_CONTENT_FIELDSET_RULES'); ?></legend>
+					<?php echo $this->form->getLabel('rules'); ?>
+					<?php echo $this->form->getInput('rules'); ?>
+				</fieldset>
+
+			<?php echo JHtml::_('sliders.end'); ?>
+		</div>
+	<?php endif; ?>
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="return" value="<?php echo $input->getCmd('return');?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_content/articles/default.php b/core/administrator/templates/hathor/html/com_content/articles/default.php
new file mode 100644
index 00000000..d1c3e4af
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_content/articles/default.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+$assoc     = JLanguageAssociations::isEnabled();
+$n         = count($this->items);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" />
+			<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published"><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id"><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_content', array('filter.published' => array(-2, 0, 1, 2))), 'value', 'text', $this->state->get('filter.category_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_level"><?php echo JText::_('JOPTION_SELECT_MAX_LEVELS'); ?></label>
+			<select name="filter_level" id="filter_level">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_MAX_LEVELS'); ?></option>
+				<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_author_id"><?php echo JText::_('JOPTION_SELECT_AUTHOR'); ?></label>
+			<select name="filter_author_id"  id="filter_author_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_AUTHOR'); ?></option>
+				<?php echo JHtml::_('select.options', $this->authors, 'value', 'text', $this->state->get('filter.author_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_tag"><?php echo JText::_('JOPTION_SELECT_TAG'); ?></label>
+			<select name="filter_tag" id="filter_tag">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap featured-col">
+					<?php echo JHtml::_('grid.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder, null, 'desc'); ?>
+				</th>
+				<th class="title category-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'articles.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+				</th>
+				<?php if ($assoc) : ?>
+				<th width="5%">
+					<?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif;?>
+				<th class="title created-by-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title date-col">
+					<?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_DATE_CREATED', 'a.created', $listDirn, $listOrder); ?>
+				</th>
+				<th class="hits-col">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+				</th>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$item->max_ordering = 0; //??
+			$ordering   = ($listOrder == 'a.ordering');
+			$canCreate  = $user->authorise('core.create',     'com_content.category.' . $item->catid);
+			$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $item->id);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+			$canEditOwn = $user->authorise('core.edit.own',   'com_content.article.' . $item->id) && $item->created_by == $userId;
+			$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</th>
+				<td class="break-word">
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit || $canEditOwn) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&id='.$item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('contentadministrator.featured', $item->featured, $i, $canChange); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) : ?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'articles.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'articles.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'articles.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'articles.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<?php if ($assoc) : ?>
+				<td class="center">
+					<?php if ($item->association):?>
+						<?php echo JHtml::_('contentadministrator.association', $item->id); ?>
+					<?php endif;?>
+				</td>
+				<?php endif;?>
+				<td class="center">
+					<?php if ($item->created_by_alias) : ?>
+						<?php echo $this->escape($item->author_name); ?>
+						<p class="smallsub"> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></p>
+					<?php else : ?>
+						<?php echo $this->escape($item->author_name); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->hits; ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+		<?php //Load the batch processing form. ?>
+		<?php if ($user->authorise('core.create', 'com_content')
+			&& $user->authorise('core.edit', 'com_content')
+			&& $user->authorise('core.edit.state', 'com_content')) : ?>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'collapseModal',
+				array(
+					'title'  => JText::_('COM_CONTENT_BATCH_OPTIONS'),
+					'footer' => $this->loadTemplate('batch_footer'),
+				),
+				$this->loadTemplate('batch_body')
+			); ?>
+		<?php endif; ?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_content/articles/modal.php b/core/administrator/templates/hathor/html/com_content/articles/modal.php
new file mode 100644
index 00000000..8542c613
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_content/articles/modal.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isClient('site'))
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JLoader::register('ContentHelperRoute', JPATH_ROOT . '/components/com_content/helpers/route.php');
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$function  = $app->input->getCmd('function', 'jSelectArticle');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=articles&layout=modal&tmpl=component&function='.$function.'&'.JSession::getFormToken().'=1');?>" method="post" name="adminForm" id="adminForm">
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search">
+				<?php echo JText::_('JSEARCH_FILTER_LABEL'); ?>
+			</label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" />
+
+			<button type="submit">
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_published"><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id"><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_content'), 'value', 'text', $this->state->get('filter.category_id'));?>
+			</select>
+			<?php if ($this->state->get('filter.forcedLanguage')) : ?>
+			<input type="hidden" name="forcedLanguage" value="<?php echo $this->escape($this->state->get('filter.forcedLanguage')); ?>" />
+			<input type="hidden" name="filter_language" value="<?php echo $this->escape($this->state->get('filter.language')); ?>" />
+			<?php else : ?>
+			<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
+			</select>
+			<?php endif; ?>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+
+	<table class="adminlist modal">
+		<thead>
+			<tr>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'a.catid', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title date-col">
+					<?php echo JHtml::_('grid.sort', 'JDATE', 'a.created', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $this->escape($function);?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->title)); ?>', '<?php echo $this->escape($item->catid); ?>', null, '<?php echo $this->escape(ContentHelperRoute::getArticleRoute($item->id, $item->catid, $item->language)); ?>');">
+						<?php echo $this->escape($item->title); ?></a>
+				</th>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_content/featured/default.php b/core/administrator/templates/hathor/html/com_content/featured/default.php
new file mode 100644
index 00000000..70426027
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_content/featured/default.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+/* add accessibility, labels on input forms */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_content');
+$saveOrder = $listOrder == 'fp.ordering';
+$n         = count($this->items);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&view=featured'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published"><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id"><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_content'), 'value', 'text', $this->state->get('filter.category_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_level"><?php echo JText::_('JOPTION_SELECT_MAX_LEVELS'); ?></label>
+			<select name="filter_level" id="filter_level">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_MAX_LEVELS'); ?></option>
+				<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title category-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'a.catid', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'fp.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'featured.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title created-by-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title date-col">
+					<?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_DATE_CREATED', 'a.created', $listDirn, $listOrder); ?>
+				</th>
+				<th class="hits-col">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+				</th>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php
+		foreach ($this->items as $i => $item) :
+			$item->max_ordering = 0; //??
+			$ordering   = ($listOrder == 'fp.ordering');
+			$assetId    = 'com_content.article.' . $item->id;
+			$canCreate  = $user->authorise('core.create',     'com_content.category.' . $item->catid);
+			$canEdit    = $user->authorise('core.edit',       'com_content.article.' . $item->id);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id')|| $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</th>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'featured.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_content&task=article.edit&return=featured&id='.$item->id);?>">
+						<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) : ?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, true, 'featured.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'featured.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php if ($item->created_by_alias) : ?>
+						<?php echo $this->escape($item->author_name); ?>
+						<p class="smallsub"> <?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></p>
+					<?php else : ?>
+						<?php echo $this->escape($item->author_name); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->hits; ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_contenthistory/history/modal.php b/core/administrator/templates/hathor/html/com_contenthistory/history/modal.php
new file mode 100644
index 00000000..e459baf4
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_contenthistory/history/modal.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
+JHtml::_('behavior.multiselect');
+JHtml::_('jquery.framework');
+
+$input = JFactory::getApplication()->input;
+$field = $input->getCmd('field');
+$function = 'jSelectContenthistory_' . $field;
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+$message = JText::_('COM_CONTENTHISTORY_BUTTON_SELECT_ONE', true);
+$compareMessage = JText::_('COM_CONTENTHISTORY_BUTTON_SELECT_TWO', true);
+JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+$deleteMessage = "alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));";
+$aliasArray = explode('.', $this->state->type_alias);
+$option = (end($aliasArray) == 'category') ? 'com_categories&amp;extension=' . implode('.', array_slice($aliasArray, 0, count($aliasArray) - 1)) : $aliasArray[0];
+$filter = JFilterInput::getInstance();
+$task = $filter->clean(end($aliasArray)) . '.loadhistory';
+$loadUrl = JRoute::_('index.php?option=' . $filter->clean($option) . '&amp;task=' . $task);
+$deleteUrl = JRoute::_('index.php?option=com_contenthistory&task=history.delete');
+$hash = $this->state->get('sha1_hash');
+$formUrl = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&type_id='
+	. $this->state->get('type_id') . '&type_alias=' . $this->state->get('type_alias') . '&' . JSession::getFormToken() . '=1';
+
+JFactory::getDocument()->addScriptDeclaration("
+	(function ($){
+		$(document).ready(function (){
+			$('#toolbar-load').click(function() {
+				var ids = $('input[id*=\'cb\']:checked');
+				if (ids.length == 1) {
+					// Add version item id to URL
+					var url = $('#toolbar-load').attr('data-url') + '&version_id=' + ids[0].value;
+					$('#content-url').attr('data-url', url);
+					if (window.parent) {
+						window.parent.location = url;
+					}
+				} else {
+					alert('" . $message . "');
+				}
+			});
+
+		$('#toolbar-preview').click(function() {
+				var windowSizeArray = ['width=800, height=600, resizable=yes, scrollbars=yes'];
+				var ids = $('input[id*=\'cb\']:checked');
+				if (ids.length == 1) {
+					// Add version item id to URL
+					var url = $('#toolbar-preview').attr('data-url') + '&version_id=' + ids[0].value;
+					$('#content-url').attr('data-url', url);
+					if (window.parent) {
+						window.open(url, '', windowSizeArray);
+						return false;
+					}
+				} else {
+					alert('" . $message . "');
+				}
+			});
+
+			$('#toolbar-compare').click(function() {
+				var windowSizeArray = ['width=1000, height=600, resizable=yes, scrollbars=yes'];
+				var ids = $('input[id*=\'cb\']:checked');
+				if (ids.length == 2) {
+					// Add version item ids to URL
+					var url = $('#toolbar-compare').attr('data-url') + '&id1=' + ids[0].value + '&id2=' + ids[1].value;
+					$('#content-url').attr('data-url', url);
+					if (window.parent) {
+						window.open(url, '', windowSizeArray);
+						return false;
+					}
+				} else {
+					alert('" . $compareMessage . "');
+				}
+			});
+		});
+	})(jQuery);
+	"
+);
+
+?>
+<div class="modal-header">
+	<h3><?php echo JText::_('COM_CONTENTHISTORY_MODAL_TITLE'); ?></h3>
+</div>
+
+<div class="modal-body">
+
+	<div class="modal-buttons">
+		<button id="toolbar-load" type="submit" class="btn pointer hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD_DESC'); ?>" data-url="<?php echo JRoute::_($loadUrl);?>">
+			<span class="icon-upload"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_LOAD'); ?></span></button>
+		<button id="toolbar-preview" type="button" class="btn pointer hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_PREVIEW_DESC'); ?>" data-url="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1');?>">
+			<span class="icon-search"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_PREVIEW'); ?></span></button>
+		<button id="toolbar-compare" type="button" class="btn pointer hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE_DESC'); ?>" data-url="<?php echo JRoute::_('index.php?option=com_contenthistory&view=compare&layout=compare&tmpl=component&' . JSession::getFormToken() . '=1');?>">
+			<span class="icon-zoom-in"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_COMPARE'); ?></span></button>
+		<button onclick="if (document.adminForm.boxchecked.value==0){<?php echo $deleteMessage; ?>}else{ Joomla.submitbutton('history.keep')}" class="btn pointer hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_DESC'); ?>">
+			<span class="icon-lock"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP'); ?></span></button>
+		<button onclick="if (document.adminForm.boxchecked.value==0){<?php echo $deleteMessage; ?>}else{ Joomla.submitbutton('history.delete')}" class="btn pointer hasTooltip" title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_DELETE_DESC'); ?>">
+			<span class="icon-delete"></span><span class="hidden-phone"><?php echo JText::_('COM_CONTENTHISTORY_BUTTON_DELETE'); ?></span></button>
+	</div>
+
+	<form action="<?php echo JRoute::_($formUrl);?>" method="post" name="adminForm" id="adminForm">
+		<table class="adminlist modal">
+			<thead>
+				<tr>
+					<th width="1%" class="title">
+						<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+					</th>
+					<th width="15%" class="title">
+						<?php echo JText::_('JDATE'); ?>
+					</th>
+					<th width="15%" class="title">
+						<?php echo JText::_('COM_CONTENTHISTORY_VERSION_NOTE'); ?>
+					</th>
+					<th width="10%" class="title">
+						<?php echo JText::_('COM_CONTENTHISTORY_KEEP_VERSION'); ?>
+					</th>
+					<th width="15%" class="title">
+						<?php echo JText::_('JAUTHOR'); ?>
+					</th>
+					<th width="10%" class="title">
+						<?php echo JText::_('COM_CONTENTHISTORY_CHARACTER_COUNT'); ?>
+					</th>
+				</tr>
+			</thead>
+
+			<tbody>
+			<?php $i = 0; ?>
+			<?php foreach ($this->items as $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td class="center">
+						<?php echo JHtml::_('grid.id', $i, $item->version_id); ?>
+					</td>
+					<td class="nowrap">
+						<a class="save-date" onclick="window.open(this.href,'win2','width=800,height=600,resizable=yes,scrollbars=yes'); return false;"
+							href="<?php echo JRoute::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . JSession::getFormToken() . '=1&version_id=' . $item->version_id);?>">
+							<?php echo JHtml::_('date', $item->save_date, JText::_('DATE_FORMAT_LC6')); ?>
+						</a>
+						<?php if ($item->sha1_hash == $hash) :?>
+							<span class="icon-featured"></span>&nbsp;
+						<?php endif; ?>
+					</td>
+					<td class="center">
+						<?php echo htmlspecialchars($item->version_note); ?>
+					</td>
+					<td class="center">
+						<?php if ($item->keep_forever) : ?>
+							<a class="btn btn-mini active" rel="tooltip" href="javascript:void(0);"
+								onclick="return listItemTask('cb<?php echo $i; ?>','history.keep')"
+								data-original-title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_TOGGLE_OFF'); ?>">
+								<?php echo JText::_('JYES'); ?>&nbsp;<span class="icon-lock"></span>
+							</a>
+						<?php else : ?>
+							<a class="btn btn-mini active" rel="tooltip" href="javascript:void(0);"
+								onclick="return listItemTask('cb<?php echo $i; ?>','history.keep')"
+								data-original-title="<?php echo JText::_('COM_CONTENTHISTORY_BUTTON_KEEP_TOGGLE_ON'); ?>">
+								<?php echo JText::_('JNO'); ?>
+							</a>
+						<?php endif; ?>
+					</td>
+					<td class="center">
+						<?php echo htmlspecialchars($item->editor); ?>
+					</td>
+					<td class="center">
+						<?php echo number_format((int) $item->character_count, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')); ?>
+					</td>
+				</tr>
+				<?php $i++; ?>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+
+		<?php echo $this->pagination->getListFooter(); ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+
+	</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_cpanel/cpanel/default.php b/core/administrator/templates/hathor/html/com_cpanel/cpanel/default.php
new file mode 100644
index 00000000..37875086
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_cpanel/cpanel/default.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// no direct access
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+echo JHtml::_('sliders.start', 'panel-sliders', array('useCookie' => '1'));
+if (JFactory::getUser()->authorise('core.manage', 'com_postinstall')) :
+	if ($this->postinstall_message_count):
+		echo JHtml::_('sliders.panel', JText::_('COM_CPANEL_MESSAGES_TITLE'), 'cpanel-panel-com-postinstall');
+	?>
+		<div class="modal-body">
+			<p>
+				<?php echo JText::_('COM_CPANEL_MESSAGES_BODY_NOCLOSE'); ?>
+			</p>
+			<p>
+				<?php echo JText::_('COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE'); ?>
+			</p>
+		</div>
+		<div class="modal-footer">
+			<button onclick="window.location='index.php?option=com_postinstall&eid=700'; return false" class="btn btn-primary btn-large" >
+				<?php echo JText::_('COM_CPANEL_MESSAGES_REVIEW'); ?>
+			</button>
+		</div>
+	<?php endif; ?>
+<?php endif;
+
+foreach ($this->modules as $module)
+{
+	$output = JModuleHelper::renderModule($module);
+	echo JHtml::_('sliders.panel', $module->title, 'cpanel-panel-' . $module->name);
+	echo $output;
+}
+
+echo JHtml::_('sliders.end');
diff --git a/core/administrator/templates/hathor/html/com_fields/field/edit.php b/core/administrator/templates/hathor/html/com_fields/field/edit.php
new file mode 100644
index 00000000..9d4f50c9
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_fields/field/edit.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0 ));
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "field.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
+		{
+			Joomla.submitform(task, document.getElementById("item-form"));
+		}
+	};
+	jQuery(document).ready(function() {
+		jQuery("#jform_title").data("dp-old-value", jQuery("#jform_title").val());
+		jQuery("#jform_title").change(function(data, handler) {
+			if(jQuery("#jform_title").data("dp-old-value") == jQuery("#jform_label").val()) {
+				jQuery("#jform_label").val(jQuery("#jform_title").val());
+			}
+
+			jQuery("#jform_title").data("dp-old-value", jQuery("#jform_title").val());
+		});
+	});
+');
+?>
+<div class="fields-edit">
+<form action="<?php echo JRoute::_('index.php?option=com_fields&context=' . $input->getCmd('context', 'com_content') . '&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<ul class="adminformlist">
+				<li>
+					<?php echo $this->form->getLabel('title'); ?>
+					<?php echo $this->form->getInput('title'); ?>
+				</li>
+			</ul>
+			<div class="clr"></div>
+		</fieldset>
+		<fieldset class="adminform">
+			<ul class="adminformlist">
+				<li><?php echo $this->form->renderField('type'); ?></li>
+				<li><?php echo $this->form->renderField('name'); ?></li>
+				<li><?php echo $this->form->renderField('label'); ?></li>
+				<li><?php echo $this->form->renderField('description'); ?></li>
+				<li><?php echo $this->form->renderField('required'); ?></li>
+				<li><?php echo $this->form->renderField('default_value'); ?></li>
+
+				<?php foreach ($this->form->getFieldsets('fieldparams') as $name => $fieldSet) : ?>
+					<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+						<li><?php echo $field->renderField(); ?></li>
+					<?php endforeach; ?>
+				<?php endforeach; ?>
+			</ul>
+		</fieldset>
+
+	</div>
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'groups-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('COM_FIELDS_VIEW_FIELD_FIELDSET_GENERAL'), 'general'); ?>
+				<?php $this->set('fields',
+						array(
+							array(
+								'published',
+								'state',
+								'enabled',
+							),
+							'group_id',
+							'assigned_cat_ids',
+							'access',
+							'language',
+							'note',
+						)
+				); ?>
+				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+				<?php $this->set('fields', null); ?>
+
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_OPTIONS'), '-options'); ?>
+		<?php $this->set('ignore_fieldsets', array('fieldparams')); ?>
+		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+				<ul class="adminformlist">
+
+					<li><?php echo $this->form->getLabel('created_user_id'); ?>
+					<?php echo $this->form->getInput('created_user_id'); ?></li>
+
+					<li><?php echo $this->form->getLabel('created_time'); ?>
+					<?php echo $this->form->getInput('created_time'); ?></li>
+
+					<?php if ($this->item->modified_by) : ?>
+						<li><?php echo $this->form->getLabel('modified_by'); ?>
+						<?php echo $this->form->getInput('modified_by'); ?></li>
+
+						<li><?php echo $this->form->getLabel('modified_time'); ?>
+						<?php echo $this->form->getInput('modified_time'); ?></li>
+					<?php endif; ?>
+
+					<li><?php echo $this->form->getLabel('id'); ?>
+					<?php echo $this->form->getInput('id'); ?></li>
+
+				</ul>
+			</fieldset>
+		<?php echo JHtml::_('sliders.end'); ?>
+		<div class="clr"></div>
+	</div>
+	<div class="clr"></div>
+		<?php if ($this->canDo->get('core.admin')) : ?>
+			<div class="col rules-section">
+				<?php echo JHtml::_('sliders.start', 'permissions-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+				<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'), 'access-rules'); ?>
+				<fieldset class="panelform">
+					<legend class="element-invisible"><?php echo JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></legend>
+						<?php echo $this->form->getLabel('rules'); ?>
+						<?php echo $this->form->getInput('rules'); ?>
+				</fieldset>
+
+				<?php echo JHtml::_('sliders.end'); ?>
+			</div>
+		<?php endif; ?>
+
+		<?php echo $this->form->getInput('context'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_fields/fields/default.php b/core/administrator/templates/hathor/html/com_fields/fields/default.php
new file mode 100644
index 00000000..4cf67e77
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_fields/fields/default.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$context   = $this->escape($this->state->get('filter.context'));
+$component = $this->state->get('filter.component');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$ordering  = ($listOrder == 'a.ordering');
+$saveOrder = ($listOrder == 'a.ordering' && strtolower($listDirn) == 'asc');
+
+// The category object of the component
+$category = JCategories::getInstance(str_replace('com_', '', $component));
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_fields&task=fields.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'fieldList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_fields&view=fields'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<div id="filter-bar" class="js-stools-container-bar pull-left">
+			<div class="btn-group pull-left">
+				<?php echo $this->filterForm->getField('context')->input; ?>
+			</div>&nbsp;
+		</div>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="adminlist" id="fieldList">
+				<thead>
+					<tr>
+						<th class="checkmark-col">
+							<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_FIELDS_FIELD_TYPE_LABEL', 'a.type', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'COM_FIELDS_FIELD_GROUP_LABEL', 'g.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php $ordering   = ($listOrder == 'a.ordering'); ?>
+						<?php $canEdit    = $user->authorise('core.edit', $component . '.field.' . $item->id); ?>
+						<?php $canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; ?>
+						<?php $canEditOwn = $user->authorise('core.edit.own', $component . '.field.' . $item->id) && $item->created_user_id == $userId; ?>
+						<?php $canChange  = $user->authorise('core.edit.state', $component . '.field.' . $item->id) && $canCheckin; ?>
+						<tr class="row<?php echo $i % 2; ?>" item-id="<?php echo $item->id ?>">
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'fields.', $canChange); ?>
+							</td>
+							<td>
+								<div class="pull-left break-word">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'fields.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit || $canEditOwn) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_fields&task=field.edit&id=' . $item->id . '&context=' . $context); ?>">
+											<?php echo $this->escape($item->title); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->title); ?>
+									<?php endif; ?>
+									<span class="small break-word">
+										<?php if (empty($item->note)) : ?>
+											<?php echo JText::sprintf('JGLOBAL_LIST_NAME', $this->escape($item->name)); ?>
+										<?php else : ?>
+											<?php echo JText::sprintf('JGLOBAL_LIST_NAME_NOTE', $this->escape($item->name), $this->escape($item->note)); ?>
+										<?php endif; ?>
+									</span>
+									<div class="small">
+										<?php if ($category) : ?>
+											<?php echo JText::_('JCATEGORY') . ': '; ?>
+											<?php $categories = FieldsHelper::getAssignedCategoriesTitles($item->id); ?>
+											<?php if ($categories) : ?>
+												<?php echo implode(', ', $categories); ?>
+											<?php else : ?>
+												<?php echo JText::_('JALL'); ?>
+											<?php endif; ?>
+										<?php endif; ?>
+									</div>
+								</div>
+							</td>
+							<td class="small">
+								<?php echo $this->escape($item->type); ?>
+							</td>
+							<td>
+								<?php echo $this->escape($item->group_title); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<td class="small nowrap hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="center hidden-phone">
+								<span><?php echo (int) $item->id; ?></span>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php //Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', $component)
+				&& $user->authorise('core.edit', $component)
+				&& $user->authorise('core.edit.state', $component)) : ?>
+				<?php echo JHtml::_(
+						'bootstrap.renderModal',
+						'collapseModal',
+						array(
+							'title' => JText::_('COM_FIELDS_VIEW_FIELDS_BATCH_OPTIONS'),
+							'footer' => $this->loadTemplate('batch_footer')
+						),
+						$this->loadTemplate('batch_body')
+					); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_fields/group/edit.php b/core/administrator/templates/hathor/html/com_fields/group/edit.php
new file mode 100644
index 00000000..031f29f7
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_fields/group/edit.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.tabstate');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "group.cancel" || document.formvalidator.isValid(document.getElementById("item-form")))
+		{
+			Joomla.submitform(task, document.getElementById("item-form"));
+		}
+	};
+');
+?>
+<div class="groups-edit">
+<form action="<?php echo JRoute::_('index.php?option=com_fields&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_FIELDS_VIEW_FIELD_FIELDSET_GENERAL'); ?></legend>
+		<ul class="adminformlist">
+			<li>
+				<?php echo $this->form->getLabel('title'); ?>
+				<?php echo $this->form->getInput('title'); ?>
+			</li>
+			<li>
+				<?php echo $this->form->getLabel('description'); ?>
+				<?php echo $this->form->getInput('description'); ?>
+			</li>
+			<li>
+				<?php echo $this->form->getLabel('published'); ?>
+				<?php echo $this->form->getInput('published'); ?>
+			</li>
+			<li>
+				<?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?>
+			</li>
+			<li>
+				<?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?>
+			</li>
+			<li>
+				<?php echo $this->form->getLabel('note'); ?>
+				<?php echo $this->form->getInput('note'); ?>
+			</li>
+		</ul>
+		<div class="clr"></div>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'groups-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+		<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+			<ul class="adminformlist">
+				<li>
+					<?php echo $this->form->getLabel('created_by'); ?>
+					<?php echo $this->form->getInput('created_by'); ?>
+				</li>
+				<?php if ((int) $this->item->created) : ?>
+					<li>
+						<?php echo $this->form->getLabel('created'); ?>
+						<?php echo $this->form->getInput('created'); ?>
+					</li>
+				<?php endif; ?>
+				<?php if ($this->item->modified_by) : ?>
+					<li>
+						<?php echo $this->form->getLabel('modified_by'); ?>
+						<?php echo $this->form->getInput('modified_by'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('modified'); ?>
+						<?php echo $this->form->getInput('modified'); ?>
+					</li>
+					<li>
+						<?php echo $this->form->getLabel('id'); ?>
+						<?php echo $this->form->getInput('id'); ?>
+					</li>
+				<?php endif; ?>
+			</ul>
+		</fieldset>
+		<?php echo JHtml::_('sliders.end'); ?>
+		<div class="clr"></div>
+
+		<?php $this->set('ignore_fieldsets', array('fieldparams')); ?>
+	</div>
+	<div class="clr"></div>
+
+	<?php if ($this->canDo->get('core.admin')) : ?>
+		<div class="col rules-section">
+			<?php echo JHtml::_('sliders.start', 'permissions-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'), 'access-rules'); ?>
+			<fieldset class="panelform">
+				<legend class="element-invisible"><?php echo JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></legend>
+					<?php echo $this->form->getLabel('rules'); ?>
+					<?php echo $this->form->getInput('rules'); ?>
+			</fieldset>
+
+				<?php echo JHtml::_('sliders.end'); ?>
+		</div>
+	<?php endif; ?>
+
+		<?php echo $this->form->getInput('context'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+<div class="clr"></div>
+</div>
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/html/com_fields/groups/default.php b/core/administrator/templates/hathor/html/com_fields/groups/default.php
new file mode 100644
index 00000000..1eec15eb
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_fields/groups/default.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+
+$component = '';
+$parts     = FieldsHelper::extract($this->state->get('filter.context'));
+
+if ($parts)
+{
+	$component = $this->escape($parts[0]);
+}
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$ordering  = ($listOrder == 'a.ordering');
+$saveOrder = ($listOrder == 'a.ordering' && strtolower($listDirn) == 'asc');
+
+if ($saveOrder)
+{
+	$saveOrderingUrl = 'index.php?option=com_fields&task=groups.saveOrderAjax&tmpl=component';
+	JHtml::_('sortablelist.sortable', 'groupList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true);
+}
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_fields&view=groups'); ?>" method="post" name="adminForm" id="adminForm">
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+		<div id="filter-bar" class="js-stools-container-bar pull-left">
+			<div class="btn-group pull-left">
+				<?php echo $this->filterForm->getField('context')->input; ?>
+			</div>&nbsp;
+		</div>
+		<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+		<?php if (empty($this->items)) : ?>
+			<div class="alert alert-no-items">
+				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+			</div>
+		<?php else : ?>
+			<table class="adminlist" id="groupList">
+				<thead>
+					<tr>
+						<th width="1%" class="center">
+							<?php echo JHtml::_('grid.checkall'); ?>
+						</th>
+						<th width="1%" class="nowrap center">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+						</th>
+						<th>
+							<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+						</th>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+						</th>
+						<th width="1%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+						</th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<td colspan="9">
+							<?php echo $this->pagination->getListFooter(); ?>
+						</td>
+					</tr>
+				</tfoot>
+				<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<?php $ordering   = ($listOrder == 'a.ordering'); ?>
+						<?php $canEdit    = $user->authorise('core.edit', $component . '.fieldgroup.' . $item->id); ?>
+						<?php $canCheckin = $user->authorise('core.admin', 'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0; ?>
+						<?php $canEditOwn = $user->authorise('core.edit.own', $component . '.fieldgroup.' . $item->id) && $item->created_by == $userId; ?>
+						<?php $canChange  = $user->authorise('core.edit.state', $component . '.fieldgroup.' . $item->id) && $canCheckin; ?>
+						<tr class="row<?php echo $i % 2; ?>" item-id="<?php echo $item->id ?>">
+							<td class="center">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'groups.', $canChange); ?>
+							</td>
+							<td>
+								<div class="pull-left break-word">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'groups.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit || $canEditOwn) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_fields&task=group.edit&id=' . $item->id); ?>">
+											<?php echo $this->escape($item->title); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->title); ?>
+									<?php endif; ?>
+									<span class="small break-word">
+										<?php if ($item->note) : ?>
+											<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note)); ?>
+										<?php endif; ?>
+									</span>
+								</div>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $this->escape($item->access_level); ?>
+							</td>
+							<td class="small nowrap hidden-phone">
+								<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+							</td>
+							<td class="center hidden-phone">
+								<span><?php echo (int) $item->id; ?></span>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php //Load the batch processing form. ?>
+			<?php if ($user->authorise('core.create', $component)
+				&& $user->authorise('core.edit', $component)
+				&& $user->authorise('core.edit.state', $component)) : ?>
+				<?php echo JHtml::_(
+						'bootstrap.renderModal',
+						'collapseModal',
+						array(
+							'title' => JText::_('COM_FIELDS_VIEW_GROUPS_BATCH_OPTIONS'),
+							'footer' => $this->loadTemplate('batch_footer')
+						),
+						$this->loadTemplate('batch_body')
+					); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_finder/filters/default.php b/core/administrator/templates/hathor/html/com_finder/filters/default.php
new file mode 100644
index 00000000..475f04f3
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_finder/filters/default.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration("
+Joomla.submitbutton = function(pressbutton)
+{
+	if (pressbutton == 'filters.delete')
+	{
+		if (confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT')))
+		{
+			Joomla.submitform(pressbutton);
+		}
+		else
+		{
+			return false;
+		}
+	}
+	Joomla.submitform(pressbutton);
+}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=filters');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::sprintf('COM_FINDER_SEARCH_LABEL', JText::_('COM_FINDER_FILTERS')); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::sprintf('COM_FINDER_SEARCH_LABEL', JText::_('COM_FINDER_FILTERS')); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_FINDER_FILTER_SEARCH_DESCRIPTION'); ?>" />
+			<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_state"><?php echo JText::_('COM_FINDER_INDEX_FILTER_BY_STATE'); ?></label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('COM_FINDER_INDEX_FILTER_BY_STATE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('finder.statelist'), 'value', 'text', $this->state->get('filter.state'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title created-by-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title date-col">
+					<?php echo JHtml::_('grid.sort', 'COM_FINDER_FILTER_TIMESTAMP', 'a.created', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_FINDER_FILTER_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php if (count($this->items) == 0) : ?>
+			<tr class="row0">
+				<td class="center" colspan="7">
+					<?php
+					if ($this->total == 0):
+						echo JText::_('COM_FINDER_NO_FILTERS');
+						?>
+						<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.add'); ?>" title="<?php echo JText::_('COM_FINDER_CREATE_FILTER'); ?>">
+							<?php echo JText::_('COM_FINDER_CREATE_FILTER'); ?>
+						</a>
+						<?php
+					else:
+						echo JText::_('COM_FINDER_NO_RESULTS');
+					endif;
+					?>
+				</td>
+			</tr>
+		<?php endif; ?>
+
+		<?php foreach ($this->items as $i => $item) :
+			$canCreate  = $user->authorise('core.create',     'com_finder');
+			$canEdit    = $user->authorise('core.edit',       'com_finder');
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $filter->checked_out == $user->get('id') || $filter->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_finder') && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
+				</th>
+				<td>
+					<?php if ($item->checked_out)
+					{
+						echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckin);
+					} ?>
+					<?php if ($canEdit) { ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php } else {
+							echo $this->escape($item->title);
+					} ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo $item->created_by_alias ?: $item->user_name; ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo $item->map_count; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->filter_id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_finder/index/default.php b/core/administrator/templates/hathor/html/com_finder/index/default.php
new file mode 100644
index 00000000..844ca77a
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_finder/index/default.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$lang      = JFactory::getLanguage();
+
+JText::script('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT');
+JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == 'index.purge')
+		{
+			if (confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT')))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		if (pressbutton == 'index.delete')
+		{
+			if (confirm(Joomla.JText._('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT')))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		Joomla.submitform(pressbutton);
+	}
+");
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=index');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::sprintf('COM_FINDER_SEARCH_LABEL', JText::_('COM_FINDER_ITEMS')); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::sprintf('COM_FINDER_SEARCH_LABEL', JText::_('COM_FINDER_ITEMS')); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_FINDER_FILTER_SEARCH_DESCRIPTION'); ?>" />
+			<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_type"><?php echo JText::_('COM_FINDER_INDEX_TYPE_FILTER'); ?></label>
+			<select name="filter_type" id="filter_type">
+				<option value=""><?php echo JText::_('COM_FINDER_INDEX_TYPE_FILTER'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('finder.typeslist'), 'value', 'text', $this->state->get('filter.type'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_state"><?php echo JText::_('COM_FINDER_INDEX_FILTER_BY_STATE'); ?></label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('COM_FINDER_INDEX_FILTER_BY_STATE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('finder.statelist'), 'value', 'text', $this->state->get('filter.state'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'l.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'l.published', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_FINDER_INDEX_HEADING_INDEX_TYPE', 'l.type_id', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-20">
+					<?php echo JHtml::_('grid.sort', 'COM_FINDER_INDEX_HEADING_LINK_URL', 'l.url', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title date-col">
+					<?php echo JHtml::_('grid.sort', 'COM_FINDER_INDEX_HEADING_INDEX_DATE', 'l.indexdate', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php if (count($this->items) == 0) : ?>
+			<tr class="row0">
+				<td align="center" colspan="7">
+					<?php
+					if ($this->total == 0)
+					{
+						echo JText::_('COM_FINDER_INDEX_NO_DATA') . '  ' . JText::_('COM_FINDER_INDEX_TIP');
+					} else {
+						echo JText::_('COM_FINDER_INDEX_NO_CONTENT');
+					}
+					?>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<?php $canChange = JFactory::getUser()->authorise('core.manage', 'com_finder'); ?>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->link_id); ?>
+				</th>
+				<td class="pull-left break-word">
+					<?php if ((int) $item->publish_start_date or (int) $item->publish_end_date or (int) $item->start_date or (int) $item->end_date) : ?>
+					<img src="<?php echo JUri::root();?>/media/system/images/calendar.png" style="border:1px;float:right" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::sprintf('COM_FINDER_INDEX_DATE_INFO', $item->publish_start_date, $item->publish_end_date, $item->start_date, $item->end_date), '', 0); ?>" />
+					<?php endif; ?>
+					<?php echo $this->escape($item->title); ?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'index.', $canChange, 'cb'); ?>
+				</td>
+				<td class="center nowrap">
+					<?php
+					$key = FinderHelperLanguage::branchSingular($item->t_title);
+					echo $lang->hasKey($key) ? JText::_($key) : $item->t_title;
+					?>
+				</td>
+				<td class="nowrap">
+					<?php
+					if (strlen($item->url) > 80)
+					{
+						echo substr($item->url, 0, 70) . '...';
+					} else {
+						echo $item->url;
+					}
+					?>
+				</td>
+				<td class="center nowrap">
+					<?php echo JHtml::_('date', $item->indexdate, JText::_('DATE_FORMAT_LC4')); ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="display" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_finder/maps/default.php b/core/administrator/templates/hathor/html/com_finder/maps/default.php
new file mode 100644
index 00000000..036af6aa
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_finder/maps/default.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$lang      = JFactory::getLanguage();
+
+JText::script('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == 'map.delete')
+		{
+			if (confirm(Joomla.JText._('COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT')))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		Joomla.submitform(pressbutton);
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=maps');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::sprintf('COM_FINDER_SEARCH_LABEL', JText::_('COM_FINDER_MAPS')); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::sprintf('COM_FINDER_SEARCH_LABEL', JText::_('COM_FINDER_MAPS')); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_FINDER_FILTER_SEARCH_DESCRIPTION'); ?>" />
+			<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_branch"><?php echo JText::sprintf('COM_FINDER_FILTER_BY', JText::_('COM_FINDER_MAPS')); ?></label>
+			<select name="filter_branch" id="filter_branch">
+				<?php echo JHtml::_('select.options', JHtml::_('finder.mapslist'), 'value', 'text', $this->state->get('filter.branch'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_state"><?php echo JText::_('COM_FINDER_INDEX_FILTER_BY_STATE'); ?></label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('COM_FINDER_INDEX_FILTER_BY_STATE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('finder.statelist'), 'value', 'text', $this->state->get('filter.state')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?>
+			</button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th width="1%" class="nowrap center">
+					<?php echo JText::_('COM_FINDER_HEADING_NODES'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php if (count($this->items) == 0) : ?>
+			<tr class="row0">
+				<td class="center" colspan="5">
+					<?php echo JText::_('COM_FINDER_MAPS_NO_CONTENT'); ?>
+				</td>
+			</tr>
+		<?php endif; ?>
+		<?php $canChange = JFactory::getUser()->authorise('core.manage', 'com_finder'); ?>
+		<?php foreach ($this->items as $i => $item) :?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</th>
+				<td>
+					<?php if ((int) $item->num_children === 0) : ?>
+						<span class="gi">&mdash;</span>
+					<?php endif; ?>
+					<?php
+					$key = FinderHelperLanguage::branchSingular($item->title);
+					$title = $lang->hasKey($key) ? JText::_($key) : $item->title;
+					echo $this->escape(($title == '*') ? JText::_('JALL_LANGUAGE') : $title);
+					?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'maps.', $canChange, 'cb'); ?>
+				</td>
+				<td class="center btns">
+				<?php if ((int) $item->num_children === 0) : ?>
+					<span class="badge <?php if ($item->num_nodes > 0) echo 'badge-info'; ?>"><?php echo $item->num_nodes; ?></span>
+				<?php else : ?>
+					&nbsp;
+				<?php endif; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_installer/database/default.php b/core/administrator/templates/hathor/html/com_installer/database/default.php
new file mode 100644
index 00000000..76cbd983
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/database/default.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div id="installer-database">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=warnings');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+<?php if ($this->errorCount === 0) : ?>
+	<?php echo JHtml::_('sliders.start', 'database-sliders', array('useCookie' => 1)); ?>
+
+<?php else : ?>
+	<?php echo JHtml::_('sliders.start', 'database-sliders', array('useCookie' => 1)); ?>
+
+	<?php $panelName = JText::plural('COM_INSTALLER_MSG_N_DATABASE_ERROR_PANEL', $this->errorCount); ?>
+	<?php echo JHtml::_('sliders.panel', $panelName, 'error-panel'); ?>
+	<fieldset class="panelform">
+		<ul>
+			<?php if (!$this->filterParams) : ?>
+				<li><?php echo JText::_('COM_INSTALLER_MSG_DATABASE_FILTER_ERROR'); ?>
+			<?php endif; ?>
+
+			<?php if ($this->schemaVersion != $this->changeSet->getSchema()) : ?>
+				<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_ERROR', $this->schemaVersion, $this->changeSet->getSchema()); ?></li>
+			<?php endif; ?>
+
+			<?php if (version_compare($this->updateVersion, JVERSION) != 0) : ?>
+				<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_UPDATEVERSION_ERROR', $this->updateVersion, JVERSION); ?></li>
+			<?php endif; ?>
+
+			<?php foreach ($this->errors as $line => $error) : ?>
+				<?php $key = 'COM_INSTALLER_MSG_DATABASE_' . $error->queryType;
+				$msgs = $error->msgElements;
+				$file = basename($error->file);
+				$msg0 = isset($msgs[0]) ? $msgs[0] : ' ';
+				$msg1 = isset($msgs[1]) ? $msgs[1] : ' ';
+				$msg2 = isset($msgs[2]) ? $msgs[2] : ' ';
+				$message = JText::sprintf($key, $file, $msg0, $msg1, $msg2); ?>
+				<li><?php echo $message; ?></li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+<?php endif; ?>
+
+<?php echo JHtml::_('sliders.panel', JText::_('COM_INSTALLER_MSG_DATABASE_INFO'), 'furtherinfo-pane'); ?>
+	<fieldset class="panelform">
+	<ul>
+		<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION', $this->schemaVersion); ?></li>
+		<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_UPDATE_VERSION', $this->updateVersion); ?></li>
+		<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_DRIVER', JFactory::getDbo()->name); ?></li>
+		<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_CHECKED_OK', count($this->results['ok'])); ?></li>
+		<li><?php echo JText::sprintf('COM_INSTALLER_MSG_DATABASE_SKIPPED', count($this->results['skipped'])); ?></li>
+	</ul>
+	</fieldset>
+<?php echo JHtml::_('sliders.end'); ?>
+
+<div class="clr"> </div>
+<div>
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_installer/default/default_ftp.php b/core/administrator/templates/hathor/html/com_installer/default/default_ftp.php
new file mode 100644
index 00000000..e7d54e5c
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/default/default_ftp.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="adminform" title="<?php echo JText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?>">
+	<legend><?php echo JText::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
+
+	<?php echo JText::_('COM_INSTALLER_MSG_DESCFTP'); ?>
+
+	<?php if ($this->ftp instanceof Exception) : ?>
+		<p><?php echo JText::_($this->ftp->getMessage()); ?></p>
+	<?php endif; ?>
+
+	<ul class="adminformlist">
+		<li><label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+		<input type="text" id="username" name="username" value="" /></li>
+
+		<li><label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+		<input type="password" id="password" name="password" class="input_box" value="" /></li>
+	</ul>
+
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_installer/discover/default.php b/core/administrator/templates/hathor/html/com_installer/discover/default.php
new file mode 100644
index 00000000..cc97757b
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/discover/default.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<div id="installer-discover">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=discover');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<?php if ($this->showMessage) : ?>
+		<?php echo $this->loadTemplate('message'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->ftp) : ?>
+		<?php echo $this->loadTemplate('ftp'); ?>
+	<?php endif; ?>
+
+	<?php if (count($this->items)) : ?>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col"><input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" /></th>
+				<th class="title nowrap"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?></th>
+				<th class="center"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?></th>
+				<th class="width-10 center"><?php echo JText::_('JVERSION'); ?></th>
+				<th class="width-10 center"><?php echo JText::_('JDATE'); ?></th>
+				<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?></th>
+				<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_CLIENT', 'client_id', $listDirn, $listOrder); ?></th>
+				<th class="width-15 center"><?php echo JText::_('JAUTHOR'); ?></th>
+				<th class="nowrap id-col"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?></th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2;?>">
+				<td><?php echo JHtml::_('grid.id', $i, $item->extension_id); ?></td>
+				<td><span class="bold hasTooltip" title="<?php echo JHtml::_('tooltipText', $item->name, $item->description, 0); ?>"><?php echo $item->name; ?></span></td>
+				<td class="center"><?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?></td>
+				<td class="center"><?php echo @$item->version != '' ? $item->version : '&#160;'; ?></td>
+				<td class="center"><?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?></td>
+				<td class="center"><?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
+				<td class="center"><?php echo $item->client; ?></td>
+				<td class="center">
+					<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_INSTALLER_AUTHOR_INFORMATION'), $item->author_info, 0); ?>">
+						<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
+					</span>
+				</td>
+				<td><?php echo $item->extension_id ?></td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+	<?php echo $this->pagination->getListFooter(); ?>
+	<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
+	<?php else : ?>
+		<p class="nowarning">
+			<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'); ?>
+		</p>
+		<p class="nowarning">
+			<?php echo JText::_('COM_INSTALLER_MSG_DISCOVER_NOEXTENSION'); ?>
+		</p>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_installer/install/default.php b/core/administrator/templates/hathor/html/com_installer/install/default.php
new file mode 100644
index 00000000..f1f08d31
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/install/default.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if ($this->showMessage) : ?>
+<?php echo $this->loadTemplate('message'); ?>
+<?php endif; ?>
+<?php echo $this->loadTemplate('form'); ?>
diff --git a/core/administrator/templates/hathor/html/com_installer/install/default_form.php b/core/administrator/templates/hathor/html/com_installer/install/default_form.php
new file mode 100644
index 00000000..358e3d77
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/install/default_form.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// MooTools is loaded for B/C for extensions generating JavaScript in their install scripts, this call will be removed at 4.0
+JHtml::_('behavior.framework', true);
+JHtml::_('bootstrap.tooltip');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function()
+	{
+		var form = document.getElementById('adminForm');
+
+		// do field validation
+		if (form.install_package.value == ''){
+			alert('" . JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true) . "');
+		}
+		else
+		{
+			form.installtype.value = 'upload';
+			form.submit();
+		}
+	};
+
+	Joomla.submitbutton3 = function()
+	{
+		var form = document.getElementById('adminForm');
+
+		// do field validation
+		if (form.install_directory.value == ''){
+			alert('" . JText::_('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_DIRECTORY', true) . "');
+		}
+		else
+		{
+			JoomlaInstaller.showLoading();
+			form.installtype.value = 'folder';
+			form.submit();
+		}
+	};
+
+	Joomla.submitbutton4 = function()
+	{
+		var form = document.getElementById('adminForm');
+
+		// do field validation
+		if (form.install_url.value == '' || form.install_url.value == 'http://' || form.install_url.value == 'https://'){
+			alert('" . JText::_('COM_INSTALLER_MSG_INSTALL_ENTER_A_URL', true) . "');
+		}
+		else
+		{
+			form.installtype.value = 'url';
+			form.submit();
+		}
+	};
+
+	Joomla.submitbuttonInstallWebInstaller = function()
+	{
+		var form = document.getElementById('adminForm');
+
+		form.install_url.value = 'https://appscdn.joomla.org/webapps/jedapps/webinstaller.xml';
+
+		Joomla.submitbutton4();
+	};
+
+	// Add spindle-wheel for installations:
+	jQuery(document).ready(function($) {
+		var outerDiv = $(\"#installer-install\");
+		
+		JoomlaInstaller.getLoadingOverlay()
+			.css(\"top\", outerDiv.position().top - $(window).scrollTop())
+			.css(\"left\", \"0\")
+			.css(\"width\", \"100%\")
+			.css(\"height\", \"100%\")
+			.css(\"display\", \"none\")
+			.css(\"margin-top\", \"-10px\");
+	});
+	
+	var JoomlaInstaller = {
+		getLoadingOverlay: function () {
+			return jQuery(\"#loading\");
+		},
+		showLoading: function () {
+			this.getLoadingOverlay().css(\"display\", \"block\");
+		},
+		hideLoading: function () {
+			this.getLoadingOverlay().css(\"display\", \"none\");
+		}
+	};
+");
+
+JFactory::getDocument()->addStyleDeclaration(
+	'
+	#loading {
+		background: rgba(255, 255, 255, .8) url(\'' . JHtml::_('image', 'jui/ajax-loader.gif', '', null, true, true) . '\') 50% 15% no-repeat;
+		position: fixed;
+		opacity: 0.8;
+		-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 80);
+		filter: alpha(opacity = 80);
+		overflow: hidden;
+	}
+	'
+);
+?>
+<div id="installer-install" class="clearfix">
+	<form enctype="multipart/form-data" action="<?php echo JRoute::_('index.php?option=com_installer&view=install');?>" method="post" name="adminForm" id="adminForm">
+		<?php if (!empty($this->sidebar)) : ?>
+			<div id="j-sidebar-container" class="span2">
+				<?php echo $this->sidebar; ?>
+			</div>
+			<div id="j-main-container" class="span10">
+		<?php else : ?>
+			<div id="j-main-container">
+		<?php endif;?>
+
+		<?php if ($this->showJedAndWebInstaller && !$this->showMessage) : ?>
+			<div class="alert j-jed-message" style="margin-bottom: 20px; line-height: 2em; color:#333333; clear:both;">
+				<a href="index.php?option=com_config&view=component&component=com_installer&path=&return=<?php echo urlencode(base64_encode(JUri::getInstance())); ?>" class="close hasTooltip icon-options" data-dismiss="alert" title="<?php echo str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')); ?>"></a>
+				<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>&nbsp;<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
+				<input class="btn" type="button" value="<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?>" onclick="Joomla.submitbuttonInstallWebInstaller()" />
+			</div>
+		<?php endif; ?>
+
+		<?php if ($this->ftp) : ?>
+			<?php echo $this->loadTemplate('ftp'); ?>
+		<?php endif; ?>
+		<div class="width-70 fltlft">
+
+			<?php $firstTab = JEventDispatcher::getInstance()->trigger('onInstallerViewBeforeFirstTab', array()); ?>
+
+			<?php // Show installation fieldsets ?>
+			<?php $tabs = JEventDispatcher::getInstance()->trigger('onInstallerAddInstallationTab', array()); ?>
+			<?php foreach ($tabs as $tab) : ?>
+				<fieldset class="uploadform">
+					<?php echo $tab['content']; ?>
+				</fieldset>
+			<?php endforeach; ?>
+
+			<?php $lastTab = JEventDispatcher::getInstance()->trigger('onInstallerViewAfterLastTab', array()); ?>
+
+			<?php $tabs = array_merge($firstTab, $tabs, $lastTab); ?>
+			<?php if (!$tabs) : ?>
+				<?php JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_NO_INSTALLATION_PLUGINS_FOUND'), 'warning'); ?>
+			<?php endif; ?>
+
+			<input type="hidden" name="type" value="" />
+			<input type="hidden" name="installtype" value="upload" />
+			<input type="hidden" name="task" value="install.install" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</div>
+	</form>
+</div>
+<div id="loading"></div>
diff --git a/core/administrator/templates/hathor/html/com_installer/languages/default.php b/core/administrator/templates/hathor/html/com_installer/languages/default.php
new file mode 100644
index 00000000..543bb8b0
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/languages/default.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+$version = new JVersion;
+
+// Add spindle-wheel for language installation.
+JFactory::getDocument()->addScriptDeclaration('
+jQuery(document).ready(function($) {
+	Joomla.loadingLayer("load");
+	$("#adminForm").on("submit", function(e) {
+		if (document.getElementsByName("task")[0].value == "languages.install")
+		{
+			Joomla.loadingLayer("show");
+		}
+	});
+});
+');
+?>
+<div id="installer-languages">
+	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=languages');?>" method="post" name="adminForm" id="adminForm">
+	<?php if (!empty( $this->sidebar)) : ?>
+		<div id="j-sidebar-container" class="span2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div id="j-main-container" class="span10">
+	<?php else : ?>
+		<div id="j-main-container">
+	<?php endif;?>
+
+		<?php if (count($this->items) || $this->escape($this->state->get('filter.search'))) : ?>
+			<?php echo $this->loadTemplate('filter'); ?>
+			<table class="adminlist">
+				<thead>
+					<tr>
+						<th width="5%"></th>
+						<th class="nowrap">
+							<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+						</th>
+						<th width="10%" class="center">
+							<?php echo JText::_('JVERSION'); ?>
+						</th>
+						<th class="center nowrap hidden-phone">
+							<?php echo JText::_('COM_INSTALLER_HEADING_TYPE'); ?>
+						</th>
+						<th width="35%" class="nowrap hidden-phone">
+							<?php echo JText::_('COM_INSTALLER_HEADING_DETAILS_URL'); ?>
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($this->items as $i => $language) :
+						preg_match('#^pkg_([a-z]{2,3}-[A-Z]{2})$#', $language->element, $element);
+						$language->code  = $element[1];
+						?>
+					<tr class="row<?php echo $i % 2; ?>">
+						<td>
+							<?php $buttonText = (isset($this->installedLang[0][$language->code]) || isset($this->installedLang[1][$language->code])) ? 'REINSTALL' : 'INSTALL'; ?>
+							<?php $onclick = 'document.getElementById(\'install_url\').value = \'' . $language->detailsurl . '\'; Joomla.submitbutton(\'install.install\');'; ?>
+							<input type="button" class="btn btn-small" value="<?php echo JText::_('COM_INSTALLER_' . $buttonText . '_BUTTON'); ?>" onclick="<?php echo $onclick; ?>" />
+						</td>
+						<td>
+							<?php echo $language->name; ?>
+
+							<?php $minorVersion = $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION; ?>
+							<?php // Display a Note if language pack version is not equal to Joomla version ?>
+							<?php if (substr($language->version, 0, 3) != $minorVersion
+									|| substr($language->version, 0, 5) != $version->getShortVersion()) : ?>
+								<div class="small"><?php echo JText::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?></div>
+							<?php endif; ?>
+						</td>
+						<td class="center">
+							<?php echo $language->version; ?>
+						</td>
+						<td class="center">
+							<?php echo JText::_('COM_INSTALLER_TYPE_' . strtoupper($language->type)); ?>
+						</td>
+						<td>
+							<?php echo $language->detailsurl; ?>
+						</td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+			<?php echo $this->pagination->getListFooter(); ?>
+		<?php else : ?>
+			<div class="alert"><?php echo JText::_('COM_INSTALLER_MSG_LANGUAGES_NOLANGUAGES'); ?></div>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="return" value="<?php echo base64_encode('index.php?option=com_installer&view=languages') ?>" />
+		<input type="hidden" id="install_url" name="install_url" />
+		<input type="hidden" name="installtype" value="url" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_installer/languages/default_filter.php b/core/administrator/templates/hathor/html/com_installer/languages/default_filter.php
new file mode 100644
index 00000000..4fba73a4
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/languages/default_filter.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+	<div class="filter-search">
+		<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+		<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_INSTALLER_LANGUAGES_FILTER_SEARCH_DESC'); ?>" />
+		<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+		<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+	</div>
+</fieldset>
+<div class="clr"></div>
diff --git a/core/administrator/templates/hathor/html/com_installer/manage/default.php b/core/administrator/templates/hathor/html/com_installer/manage/default.php
new file mode 100644
index 00000000..f770d8fc
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/manage/default.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<div id="installer-manage">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=manage');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<?php if ($this->showMessage) : ?>
+		<?php echo $this->loadTemplate('message'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->ftp) : ?>
+		<?php echo $this->loadTemplate('ftp'); ?>
+	<?php endif; ?>
+
+	<?php echo $this->loadTemplate('filter'); ?>
+
+	<?php if (count($this->items)) : ?>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title nowrap">
+					<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_LOCATION', 'client_id', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10 center">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'status', $listDirn, $listOrder); ?>
+				</th>
+				<th class="center">
+					<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10 center">
+					<?php echo JText::_('JVERSION'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('JDATE'); ?>
+				</th>
+				<th class="width-15 center">
+					<?php echo JText::_('JAUTHOR'); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_PACKAGE_ID', 'package_id', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; if ($item->status == 2) echo ' protected';?>">
+				<td>
+					<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
+				</td>
+				<td>
+					<span class="bold hasTooltip" title="<?php echo JHtml::_('tooltipText', $item->name, $item->description, 0); ?>">
+						<?php echo $item->name; ?>
+					</span>
+				</td>
+				<td class="center">
+					<?php echo $item->client; ?>
+				</td>
+				<td class="center">
+					<?php if (!$item->element) : ?>
+					<strong>X</strong>
+					<?php else : ?>
+						<?php echo JHtml::_('InstallerHtml.Manage.state', $item->status, $i, $item->status < 2, 'cb'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type); ?>
+				</td>
+				<td class="center">
+					<?php echo @$item->version != '' ? $item->version : '&#160;'; ?>
+				</td>
+				<td class="center">
+					<?php echo @$item->creationDate != '' ? $item->creationDate : '&#160;'; ?>
+				</td>
+				<td class="center">
+					<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_INSTALLER_AUTHOR_INFORMATION'), $item->author_info, 0); ?>">
+						<?php echo @$item->author != '' ? $item->author : '&#160;'; ?>
+					</span>
+				</td>
+				<td class="center">
+					<?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?>
+				</td>
+				<td class="center">
+					<?php echo $item->package_id ?: JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?>
+				</td>
+				<td>
+					<?php echo $item->extension_id ?>
+				</td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+	<?php echo $this->pagination->getListFooter(); ?>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_installer/manage/default_filter.php b/core/administrator/templates/hathor/html/com_installer/manage/default_filter.php
new file mode 100644
index 00000000..7ae79145
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/manage/default_filter.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<fieldset id="filter-bar">
+<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+	<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_INSTALLER_FILTER_LABEL'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+	</div>
+
+	<div class="filter-select">
+			<label class="selectlabel" for="filter_client_id">
+				<?php echo JText::_('COM_INSTALLER_VALUE_CLIENT_SELECT'); ?>
+			</label>
+			<select name="filter_client_id" id="filter_client_id">
+				<?php echo JHtml::_('select.options', array('0' => JText::_('JSITE'), '1' => JText::_('JADMINISTRATOR')), 'value', 'text', $this->state->get('filter.client_id'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_status">
+				<?php echo JText::_('COM_INSTALLER_VALUE_STATE_SELECT'); ?>
+			</label>
+			<select name="filter_status" id="filter_status">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', InstallerHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.status'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_type">
+				<?php echo JText::_('COM_INSTALLER_VALUE_TYPE_SELECT'); ?>
+			</label>
+			<select name="filter_type" id="filter_type">
+				<option value=""><?php echo JText::_('COM_INSTALLER_VALUE_TYPE_SELECT'); ?></option>
+				<?php echo JHtml::_('select.options', InstallerHelper::getExtensionTypes(), 'value', 'text', $this->state->get('filter.type'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_folder">
+				<?php echo JText::_('COM_INSTALLER_VALUE_FOLDER_SELECT'); ?>
+			</label>
+			<select name="filter_folder" id="filter_folder">
+				<option value=""><?php echo JText::_('COM_INSTALLER_VALUE_FOLDER_SELECT'); ?></option>
+				<?php echo JHtml::_('select.options', array_merge(InstallerHelper::getExtensionGroupes(), array('*' => JText::_('COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE'))), 'value', 'text', $this->state->get('filter.folder'), true); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+
+		</div>
+
+</fieldset>
+<div class="clr"></div>
diff --git a/core/administrator/templates/hathor/html/com_installer/update/default.php b/core/administrator/templates/hathor/html/com_installer/update/default.php
new file mode 100644
index 00000000..e08ce39f
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/update/default.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.multiselect');
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<div id="installer-update">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<?php if ($this->showMessage) : ?>
+		<?php echo $this->loadTemplate('message'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->ftp) : ?>
+		<?php echo $this->loadTemplate('ftp'); ?>
+	<?php endif; ?>
+
+	<?php if (count($this->items)) : ?>
+	<table class="adminlist" cellspacing="1">
+		<thead>
+			<tr>
+				<th class="checkmark-col"><input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" /></th>
+				<th class="nowrap"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_NAME', 'name', $listDirn, $listOrder); ?></th>
+				<th class="nowrap"><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_INSTALLTYPE', 'extension_id', $listDirn, $listOrder); ?></th>
+				<th ><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_TYPE', 'type', $listDirn, $listOrder); ?></th>
+				<th class="width-10" class="center"><?php echo JText::_('JVERSION'); ?></th>
+				<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_FOLDER', 'folder', $listDirn, $listOrder); ?></th>
+				<th><?php echo JHtml::_('grid.sort', 'COM_INSTALLER_HEADING_CLIENT', 'client_id', $listDirn, $listOrder); ?></th>
+				<th class="width-25"><?php echo JText::_('COM_INSTALLER_HEADING_DETAILSURL'); ?></th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<?php $client = $item->client_id ? JText::_('JADMINISTRATOR') : JText::_('JSITE'); ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td><?php echo JHtml::_('grid.id', $i, $item->update_id); ?></td>
+				<td>
+					<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('JGLOBAL_DESCRIPTION'), $item->description ?: JText::_('COM_INSTALLER_MSG_UPDATE_NODESC'), 0); ?>">
+					<?php echo $item->name; ?>
+					</span>
+				</td>
+				<td class="center">
+					<?php echo $item->extension_id ? JText::_('COM_INSTALLER_MSG_UPDATE_UPDATE') : JText::_('COM_INSTALLER_NEW_INSTALL') ?>
+				</td>
+				<td><?php echo JText::_('COM_INSTALLER_TYPE_' . $item->type) ?></td>
+				<td class="center"><?php echo $item->version ?></td>
+				<td class="center"><?php echo @$item->folder != '' ? $item->folder : JText::_('COM_INSTALLER_TYPE_NONAPPLICABLE'); ?></td>
+				<td class="center"><?php echo $client; ?></td>
+				<td><?php echo $item->detailsurl ?>
+					<?php if (isset($item->infourl)) : ?>
+					<br /><a href="<?php echo $item->infourl;?>"><?php echo $item->infourl;?></a>
+					<?php endif; ?>
+				</td>
+			</tr>
+		<?php endforeach;?>
+		</tbody>
+	</table>
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<?php else : ?>
+		<p class="nowarning"><?php echo JText::_('COM_INSTALLER_MSG_UPDATE_NOUPDATES'); ?></p>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_installer/warnings/default.php b/core/administrator/templates/hathor/html/com_installer/warnings/default.php
new file mode 100644
index 00000000..1e8f7313
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_installer/warnings/default.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_installer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div id="installer-warnings">
+<form action="<?php echo JRoute::_('index.php?option=com_installer&view=warnings'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty($this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php
+else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php
+
+if (!count($this->messages))
+{
+	echo '<p class="nowarning">' . JText::_('COM_INSTALLER_MSG_WARNINGS_NONE') . '</p>';
+}
+else
+{
+	echo JHtml::_('sliders.start', 'warning-sliders', array('useCookie' => 1));
+	foreach ($this->messages as $message)
+	{
+		echo JHtml::_('sliders.panel', $message['message'], str_replace(' ', '', $message['message']));
+		echo '<div style="padding: 5px;" >' . $message['description'] . '</div>';
+	}
+	echo JHtml::_('sliders.panel', JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFO'), 'furtherinfo-pane');
+	echo '<div style="padding: 5px;" >' . JText::_('COM_INSTALLER_MSG_WARNINGFURTHERINFODESC') . '</div>';
+	echo JHtml::_('sliders.end');
+}
+?>
+<div class="clr"> </div>
+<div>
+	<input type="hidden" name="boxchecked" value="0" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_joomlaupdate/default/default.php b/core/administrator/templates/hathor/html/com_joomlaupdate/default/default.php
new file mode 100644
index 00000000..4d41b664
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_joomlaupdate/default/default.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JoomlaupdateViewDefault $this */
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::script('com_joomlaupdate/default.js', false, true, false);
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($) {
+	$('#extraction_method').change(function(e){
+		extractionMethodHandler('#extraction_method', 'row_ftp');
+	});
+	$('#upload_method').change(function(e){
+		extractionMethodHandler('#upload_method', 'upload_ftp');
+	});
+
+	$('button.submit').on('click', function() {
+		$('div.download_message').show();
+	});
+});");
+?>
+
+<div id="joomlaupdate-wrapper">
+	<form enctype="multipart/form-data" action="index.php" method="post" id="adminForm" class="form-horizontal">
+		<?php echo  JHtml::_('sliders.start', 'joomlaupdate-slider'); ?>
+		<?php if ($this->showUploadAndUpdate) : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE'), 'online-update'); ?>
+		<?php endif; ?>
+
+		<?php if ($this->selfUpdate) : ?>
+			<?php // If we have a self update notice to install it first! ?>
+			<?php JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALL_SELF_UPDATE_FIRST'), 'error'); ?>
+			<?php echo $this->loadTemplate('updatemefirst'); ?>
+		<?php else : ?>
+			<?php if (!isset($this->updateInfo['object']->downloadurl->_data) && $this->updateInfo['installed'] < $this->updateInfo['latest']) : ?>
+				<?php // If we have no download URL we can't reinstall or update ?>
+				<?php echo $this->loadTemplate('nodownload'); ?>
+			<?php elseif (!$this->updateInfo['hasUpdate']) : ?>
+				<?php // If we have no update we can reinstall the core ?>
+				<?php echo $this->loadTemplate('reinstall'); ?>
+			<?php else : ?>
+				<?php // Ok let's show the update template ?>
+				<?php echo $this->loadTemplate('update'); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<input type="hidden" name="task" value="update.download" />
+		<input type="hidden" name="option" value="com_joomlaupdate" />
+
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+
+	<?php // Only Super Users have access to the Update & Install for obvious security reasons ?>
+	<?php if ($this->showUploadAndUpdate) : ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD'), 'upload-update'); ?>
+		<?php echo $this->loadTemplate('upload'); ?>
+		<?php echo JHtml::_('sliders.end'); ?>
+	<?php endif; ?>
+
+	<div class="download_message" style="display: none">
+		<p></p>
+		<p class="nowarning">
+			<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS'); ?>
+		</p>
+		<div class="joomlaupdate_spinner"></div>
+	</div>
+	<div id="loading"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_languages/installed/default.php b/core/administrator/templates/hathor/html/com_languages/installed/default.php
new file mode 100644
index 00000000..0dc2fbc4
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_languages/installed/default.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtmlBehavior::core();
+// Add specific helper files for html generation
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+$user     = JFactory::getUser();
+$userId   = $user->get('id');
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=installed'); ?>" method="post" id="adminForm" name="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+		<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-select fltrt">
+			<label class="selectlabel" for="client_id">
+				<?php echo JText::_('COM_CACHE_SELECT_CLIENT'); ?>
+			</label>
+			<select name="client_id" id="client_id">
+			<?php
+			$options   = array();
+			$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
+			$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+			echo JHtml::_('select.options', $options, 'value', 'text', $this->state->get('client_id'));
+			?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<?php if ($this->ftp) : ?>
+		<?php echo $this->loadTemplate('ftp');?>
+	<?php endif; ?>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					&#160;
+				</th>
+				<th class="title">
+					<?php echo JText::_('COM_LANGUAGES_HEADING_LANGUAGE'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_LANGUAGES_FIELD_LANG_TAG_LABEL'); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JText::_('COM_LANGUAGES_HEADING_DEFAULT'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('JVERSION'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('JDATE'); ?>
+				</th>
+				<th class="width-20">
+					<?php echo JText::_('JAUTHOR'); ?>
+				</th>
+				<th class="width-25">
+					<?php echo JText::_('COM_LANGUAGES_HEADING_AUTHOR_EMAIL'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->rows as $i => $row) :
+			$canCreate = $user->authorise('core.create',     'com_languages');
+			$canEdit   = $user->authorise('core.edit',       'com_languages');
+			$canChange = $user->authorise('core.edit.state', 'com_languages');
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php echo JHtml::_('languages.id', $i, $row->language);?>
+				</td>
+				<td>
+					<?php echo $this->escape($row->name); ?>
+				</td>
+				<td align="center">
+					<?php echo $this->escape($row->language); ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.isdefault', $row->published, $i, 'installed.', !$row->published && $canChange);?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($row->version); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($row->creationDate); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($row->author); ?>
+				</td>
+				<td class="center">
+					<?php echo JStringPunycode::emailToUTF8($this->escape($row->authorEmail)); ?>
+				</td>
+			</tr>
+		<?php endforeach;?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_languages/installed/default_ftp.php b/core/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
new file mode 100644
index 00000000..2502ac58
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+	<fieldset class="adminform" title="<?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?>">
+		<legend><?php echo JText::_('COM_LANGUAGES_FTP_TITLE'); ?></legend>
+
+		<?php echo JText::_('COM_LANGUAGES_FTP_DESC'); ?>
+
+		<?php if ($ftp instanceof Exception) : ?>
+			<p class="warning"><?php echo JText::_($ftp->message); ?></p>
+		<?php endif; ?>
+
+		<div>
+			<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+			<input type="text" id="username" name="username" value="" />
+		</div>
+		<div>
+			<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+			<input type="password" id="password" name="password" value="" />
+		</div>
+	</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_languages/languages/default.php b/core/administrator/templates/hathor/html/com_languages/languages/default.php
new file mode 100644
index 00000000..41d07121
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_languages/languages/default.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$n         = count($this->items);
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_languages');
+$saveOrder = $listOrder == 'a.ordering';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_LANGUAGES_SEARCH_IN_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('languages.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_HEADING_TITLE_NATIVE', 'a.title_native', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_FIELD_LANG_TAG_LABEL', 'a.lang_code', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_FIELD_LANG_CODE_LABEL', 'a.sef', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_HEADING_LANG_IMAGE', 'a.image', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+				</th>
+				<th width="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'languages.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_HOMEPAGE', '', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.lang_id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php
+		foreach ($this->items as $i => $item) :
+			$ordering  = ($listOrder == 'a.ordering');
+			$canCreate = $user->authorise('core.create',     'com_languages');
+			$canEdit   = $user->authorise('core.edit',       'com_languages');
+			$canChange = $user->authorise('core.edit.state', 'com_languages');
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php echo JHtml::_('grid.id', $i, $item->lang_id); ?>
+				</td>
+				<td>
+					<span class="editlinktip hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('JGLOBAL_EDIT_ITEM'), $item->title, 0); ?>">
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_languages&task=language.edit&lang_id='.(int) $item->lang_id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					</span>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->title_native); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->lang_code); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->sef); ?>
+				</td>
+				<td class="center">
+					<?php if ($item->image) : ?>
+						<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->image, null, true); ?>&nbsp;<?php echo $this->escape($item->image); ?>
+					<?php else : ?>
+						<?php echo JText::_('JNONE'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'languages.', $canChange); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) :?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, true, 'languages.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'languages.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, true, 'languages.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'languages.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php if ($item->home == '1') : ?>
+						<?php echo JText::_('JYES'); ?>
+					<?php else:?>
+						<?php echo JText::_('JNO'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->lang_id); ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_languages/overrides/default.php b/core/administrator/templates/hathor/html/com_languages/overrides/default.php
new file mode 100644
index 00000000..46bc4f6a
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_languages/overrides/default.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+$client    = $this->state->get('filter.client') == 'site' ? JText::_('JSITE') : JText::_('JADMINISTRATOR');
+$language  = $this->state->get('filter.language');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_languages&view=overrides'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+		<div class="filter-search fltlft">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_LANGUAGES_VIEW_OVERRIDES_FILTER_SEARCH_DESC'); ?>" />
+
+			<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+		<div class="filter-select fltrt">
+			<select name="filter_language_client" onchange="this.form.submit()">
+				<?php echo JHtml::_('select.options', $this->languages, null, 'text', $this->state->get('filter.language_client')); ?>
+			</select>
+		</div>
+	</fieldset>
+
+	<div class="clr"></div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th width="1%">
+					<input type="checkbox" name="checkall-toggle" value="" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th width="30%" class="left">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_KEY', 'key', $listDirn, $listOrder); ?>
+				</th>
+				<th class="left">
+					<?php echo JHtml::_('grid.sort', 'COM_LANGUAGES_VIEW_OVERRIDES_TEXT', 'text', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap">
+					<?php echo JText::_('COM_LANGUAGES_FIELD_LANG_TAG_LABEL'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('JCLIENT'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="5">
+					<?php echo $this->pagination->getListFooter(); ?>
+				</td>
+			</tr>
+		</tfoot>
+		<tbody>
+		<?php $canEdit = JFactory::getUser()->authorise('core.edit', 'com_languages');
+		$i = 0;
+		foreach ($this->items as $key => $text) : ?>
+			<tr class="row<?php echo $i % 2; ?>" id="overriderrow<?php echo $i; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $key); ?>
+				</td>
+				<td>
+					<?php if ($canEdit) : ?>
+						<a id="key[<?php	echo $this->escape($key); ?>]" href="<?php echo JRoute::_('index.php?option=com_languages&task=override.edit&id='.$key); ?>"><?php echo $this->escape($key); ?></a>
+					<?php else: ?>
+						<?php echo $this->escape($key); ?>
+					<?php endif; ?>
+				</td>
+				<td>
+					<span id="string[<?php	echo $this->escape($key); ?>]"><?php echo $this->escape($text); ?></span>
+				</td>
+				<td class="center">
+					<?php echo $language; ?>
+				</td>
+				<td class="center">
+					<?php echo $client; ?>
+				</td>
+			</tr>
+			<?php $i++;
+		endforeach; ?>
+		</tbody>
+	</table>
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_menus/item/edit.php b/core/administrator/templates/hathor/html/com_menus/item/edit.php
new file mode 100644
index 00000000..8f95748c
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_menus/item/edit.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.framework');
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.modal');
+
+$assoc = JLanguageAssociations::isEnabled();
+
+// Ajax for parent items
+$script = "
+jQuery(document).ready(function ($){
+	$('#jform_menutype').change(function(){
+		var menutype = $(this).val();
+		$.ajax({
+			url: 'index.php?option=com_menus&task=item.getParentItem&menutype=' + menutype,
+			dataType: 'json'
+		}).done(function(data) {
+			$('#jform_parent_id option').each(function() {
+				if ($(this).val() != '1') {
+					$(this).remove();
+				}
+			});
+			$.each(data, function (i, val) {
+				var option = $('<option>');
+				option.text(val.title).val(val.id);
+				$('#jform_parent_id').append(option);
+			});
+			$('#jform_parent_id').trigger('liszt:updated');
+		});
+	});
+});
+Joomla.submitbutton = function(task, type){
+	if (task == 'item.setType' || task == 'item.setMenuType')
+	{
+		if (task == 'item.setType')
+		{
+			jQuery('#item-form input[name=\"jform[type]\"]').val(type);
+			jQuery('#fieldtype').val('type');
+		} else {
+			jQuery('#item-form input[name=\"jform[menutype]\"]').val(type);
+		}
+		Joomla.submitform('item.setType', document.getElementById('item-form'));
+	} else if (task == 'item.cancel' || document.formvalidator.isValid(document.getElementById('item-form')))
+	{
+		Joomla.submitform(task, document.getElementById('item-form'));
+	}
+	else
+	{
+		// special case for modal popups validation response
+		jQuery('#item-form .modal-value.invalid').each(function(){
+			var field = jQuery(this),
+				idReversed = field.attr('id').split('').reverse().join(''),
+				separatorLocation = idReversed.indexOf('_'),
+				nameId = '#' + idReversed.substr(separatorLocation).split('').reverse().join('') + 'name';
+			jQuery(nameId).addClass('invalid');
+		});
+	}
+};
+";
+// Add the script to the document head.
+JFactory::getDocument()->addScriptDeclaration($script);
+
+// In case of modal
+$input = JFactory::getApplication()->input;
+$isModal  = $input->get('layout') == 'modal' ? true : false;
+$layout   = $isModal ? 'modal' : 'edit';
+$tmpl     = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
+$clientId = $this->state->get('item.client_id', 0);
+?>
+
+<div class="menuitem-edit">
+
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=item&client_id=' . $clientId . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">
+
+<div class="col main-section">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_MENUS_ITEM_DETAILS');?></legend>
+			<ul class="adminformlist">
+
+				<li><?php echo $this->form->getLabel('type'); ?>
+				<?php echo $this->form->getInput('type'); ?></li>
+
+				<li><?php echo $this->form->getLabel('title'); ?>
+				<?php echo $this->form->getInput('title'); ?></li>
+
+				<?php if ($this->item->type == 'url') : ?>
+					<?php $this->form->setFieldAttribute('link', 'readonly', 'false');?>
+					<li><?php echo $this->form->getLabel('link'); ?>
+					<?php echo $this->form->getInput('link'); ?></li>
+				<?php endif; ?>
+
+				<?php if ($this->item->type != 'url') : ?>
+					<li><?php echo $this->form->getLabel('alias'); ?>
+					<?php echo $this->form->getInput('alias'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('note'); ?>
+				<?php echo $this->form->getInput('note'); ?></li>
+
+				<?php if ($this->item->type !== 'url') : ?>
+					<li><?php echo $this->form->getLabel('link'); ?>
+					<?php echo $this->form->getInput('link'); ?></li>
+				<?php endif ?>
+
+				<?php if ($this->canDo->get('core.edit.state')) : ?>
+					<li><?php echo $this->form->getLabel('published'); ?>
+					<?php echo $this->form->getInput('published'); ?></li>
+				<?php endif ?>
+
+				<li><?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?></li>
+
+				<li><?php echo $this->form->getLabel('menutype'); ?>
+				<?php echo $this->form->getInput('menutype'); ?></li>
+
+				<li><?php echo $this->form->getLabel('parent_id'); ?>
+				<?php echo $this->form->getInput('parent_id'); ?></li>
+
+				<li><?php echo $this->form->getLabel('menuordering'); ?>
+				<?php echo $this->form->getInput('menuordering'); ?></li>
+
+				<li><?php echo $this->form->getLabel('browserNav'); ?>
+				<?php echo $this->form->getInput('browserNav'); ?></li>
+
+				<?php if ($this->canDo->get('core.edit.state')) : ?>
+					<?php if ($this->item->type == 'component') : ?>
+					<li><?php echo $this->form->getLabel('home'); ?>
+					<?php echo $this->form->getInput('home'); ?></li>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?></li>
+
+				<li><?php echo $this->form->getLabel('template_style_id'); ?>
+				<?php echo $this->form->getInput('template_style_id'); ?></li>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+
+				<li><?php echo $this->form->getLabel('client_id'); ?>
+					<?php echo $this->form->getInput('client_id'); ?></li>
+			</ul>
+
+	</fieldset>
+</div>
+
+<div class="col options-section">
+	<?php echo JHtml::_('sliders.start', 'menu-sliders-'.$this->item->id); ?>
+	<?php //Load  parameters.
+		echo $this->loadTemplate('options'); ?>
+
+		<div class="clr"></div>
+
+		<?php if (!empty($this->modules)) : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_MENUS_ITEM_MODULE_ASSIGNMENT'), 'module-options'); ?>
+			<fieldset>
+				<?php echo $this->loadTemplate('modules'); ?>
+			</fieldset>
+		<?php endif; ?>
+
+	<?php echo JHtml::_('sliders.end'); ?>
+
+	<input type="hidden" name="task" value="" />
+	<?php echo $this->form->getInput('component_id'); ?>
+	<?php echo JHtml::_('form.token'); ?>
+	<input type="hidden" id="fieldtype" name="fieldtype" value="" />
+</div>
+</form>
+
+<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_menus/item/edit_options.php b/core/administrator/templates/hathor/html/com_menus/item/edit_options.php
new file mode 100644
index 00000000..4f6a054e
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_menus/item/edit_options.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$assoc = JLanguageAssociations::isEnabled();
+
+?>
+<?php
+	$fieldSets = $this->form->getFieldsets('request');
+
+	if (!empty($fieldSets))
+	{
+		$fieldSet = array_shift($fieldSets);
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_'.$fieldSet->name.'_FIELDSET_LABEL';
+		echo JHtml::_('sliders.panel', JText::_($label), 'request-options');
+		if (isset($fieldSet->description) && trim($fieldSet->description)) :
+			echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+		endif;
+	?>
+		<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_($label) ?></legend>
+			<?php $hidden_fields = ''; ?>
+			<ul class="adminformlist">
+				<?php foreach ($this->form->getFieldset('request') as $field) : ?>
+				<?php if (!$field->hidden) : ?>
+				<li>
+					<?php echo $field->label; ?>
+					<?php echo $field->input; ?>
+				</li>
+				<?php else : $hidden_fields .= $field->input; ?>
+				<?php endif; ?>
+				<?php endforeach; ?>
+			</ul>
+			<?php echo $hidden_fields; ?>
+		</fieldset>
+<?php
+	}
+
+	$fieldSets = $this->form->getFieldsets('params');
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_'.$name.'_FIELDSET_LABEL';
+		echo JHtml::_('sliders.panel', JText::_($label), $name.'-options');
+			if (isset($fieldSet->description) && trim($fieldSet->description)) :
+				echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+			endif;
+			?>
+		<div class="clr"></div>
+		<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_($label) ?></legend>
+			<ul class="adminformlist">
+				<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+					<li><?php echo $field->label; ?>
+					<?php echo $field->input; ?></li>
+				<?php endforeach; ?>
+			</ul>
+		</fieldset>
+	<?php endforeach;?>
+
+	<?php if ($assoc && $this->state->get('item.client_id') != 1) : ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS'), '-options');?>
+		<?php echo $this->loadTemplate('associations'); ?>
+	<?php endif; ?>
diff --git a/core/administrator/templates/hathor/html/com_menus/items/default.php b/core/administrator/templates/hathor/html/com_menus/items/default.php
new file mode 100644
index 00000000..9d2bb929
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_menus/items/default.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user       = JFactory::getUser();
+$app        = JFactory::getApplication();
+$userId     = $user->get('id');
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$ordering   = ($listOrder == 'a.lft');
+$canOrder   = $user->authorise('core.edit.state', 'com_menus');
+$saveOrder  = ($listOrder == 'a.lft' && $listDirn == 'asc');
+$menutypeid = (int) $this->state->get('menutypeid');
+$assoc      = JLanguageAssociations::isEnabled() && $this->state->get('filter.client_id') == 0;
+?>
+
+<?php // Set up the filter bar. ?>
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=items'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_MENUS_ITEMS_SEARCH_FILTER'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+		<div class="filter-select">
+			<label class="selectlabel" for="menutype">
+				<?php echo JText::_('TPL_HATHOR_COM_MENUS_MENU'); ?>
+			</label>
+			<select name="menutype" id="menutype">
+				<?php echo JHtml::_('select.options', JHtml::_('menu.menus'), 'value', 'text', $this->state->get('filter.menutype')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_level">
+				<?php echo JText::_('COM_MENUS_OPTION_SELECT_LEVEL'); ?>
+			</label>
+			<select name="filter_level" id="filter_level">
+				<option value=""><?php echo JText::_('COM_MENUS_OPTION_SELECT_LEVEL'); ?></option>
+				<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter[published]" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions', array('archived' => false)), 'value', 'text', $this->state->get('filter.published'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter[access]" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language">
+				<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+			</label>
+			<select name="filter[language]" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+<?php //Set up the grid heading. ?>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.lft', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'items.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+				</th>
+				<th width="10%">
+					<?php echo JText::_('JGRID_HEADING_MENU_ITEM_TYPE'); ?>
+				</th>
+				<?php if ($this->state->get('filter.client_id') == 0): ?>
+				<th class="home-col">
+					<?php echo JHtml::_('grid.sort', 'COM_MENUS_HEADING_HOME', 'a.home', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif; ?>
+				<?php if ($assoc) : ?>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_MENUS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif; ?>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php
+		foreach ($this->items as $i => $item) :
+			$orderkey   = array_search($item->id, $this->ordering[$item->parent_id]);
+			$canCreate  = $user->authorise('core.create',     'com_menus.menu.' . $menutypeid);
+			$canEdit    = $user->authorise('core.edit',       'com_menus.menu.' . $menutypeid);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id')|| $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_menus.menu.' . $menutypeid) && $canCheckin;
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level - 1) ?>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'items.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit && !$item->protected) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_menus&task=item.edit&id='.(int) $item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<p class="smallsub" title="<?php echo $this->escape($item->path); ?>">
+						<?php echo str_repeat('<span class="gtr">|&mdash;</span>', $item->level - 1) ?>
+						<?php if ($item->type != 'url') : ?>
+							<?php if (empty($item->note)) : ?>
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							<?php else : ?>
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+							<?php endif; ?>
+						<?php elseif ($item->type == 'url' && $item->note) : ?>
+							<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note)); ?>
+						<?php endif; ?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('MenusHtml.Menus.state', $item->published, $i, $canChange, 'cb'); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) : ?>
+							<span><?php echo $this->pagination->orderUpIcon($i, isset($this->ordering[$item->parent_id][$orderkey - 1]), 'items.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+							<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, isset($this->ordering[$item->parent_id][$orderkey + 1]), 'items.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $orderkey + 1; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+					<?php else : ?>
+						<?php echo $orderkey + 1; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="nowrap">
+					<span title="<?php echo isset($item->item_type_desc) ? htmlspecialchars($this->escape($item->item_type_desc), ENT_COMPAT, 'UTF-8') : ''; ?>">
+						<?php echo $this->escape($item->item_type); ?></span>
+				</td>
+				<?php if ($this->state->get('filter.client_id') == 0): ?>
+				<td class="center">
+					<?php if ($item->type == 'component') : ?>
+						<?php if ($item->language == '*' || $item->home == '0'):?>
+							<?php echo JHtml::_('jgrid.isdefault', $item->home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange && !$item->protected); ?>
+						<?php elseif ($canChange):?>
+							<a href="<?php echo JRoute::_('index.php?option=com_menus&task=items.unsetDefault&cid[]='.$item->id.'&'.JSession::getFormToken().'=1'); ?>">
+								<?php if ($item->language_image) : ?>
+									<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?>
+								<?php else : ?>
+									<span class="label" title="<?php echo JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+								<?php endif; ?>
+							</a>
+						<?php else:?>
+							<?php if ($item->language_image) : ?>
+								<?php echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
+							<?php else : ?>
+								<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+					<?php endif; ?>
+				</td>
+				<?php endif; ?>
+				<?php if ($assoc) : ?>
+				<td class="center">
+					<?php if ($item->association):?>
+						<?php echo JHtml::_('MenusHtml.Menus.association', $item->id); ?>
+					<?php endif; ?>
+				</td>
+				<?php endif; ?>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+						<?php echo (int) $item->id; ?></span>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+	<div class="clr"> </div>
+
+	<?php //Load the batch processing form.is user is allowed ?>
+	<?php if ($user->authorise('core.create', 'com_menus') || $user->authorise('core.edit', 'com_menus')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title'  => JText::_('COM_MENUS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer'),
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_menus/menu/edit.php b/core/administrator/templates/hathor/html/com_menus/menu/edit.php
new file mode 100644
index 00000000..ae2972da
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_menus/menu/edit.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+JText::script('ERROR');
+
+JFactory::getDocument()->addScriptDeclaration("
+		Joomla.submitbutton = function(task)
+		{
+			var form = document.getElementById('item-form');
+			if (task == 'menu.cancel' || document.formvalidator.isValid(form))
+			{
+				Joomla.submitform(task, form);
+			}
+		};
+");
+?>
+
+<div class="menu-edit">
+
+<form action="<?php echo JRoute::_('index.php?option=com_menus&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="item-form">
+<div class="col main-section">
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_MENUS_MENU_DETAILS');?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('title'); ?>
+				<?php echo $this->form->getInput('title'); ?></li>
+
+				<li><?php echo $this->form->getLabel('menutype'); ?>
+				<?php echo $this->form->getInput('menutype'); ?></li>
+
+				<li><?php echo $this->form->getLabel('description'); ?>
+				<?php echo $this->form->getInput('description'); ?></li>
+
+				<li><?php echo $this->form->getLabel('client_id'); ?>
+				<?php echo $this->form->getInput('client_id'); ?></li>
+			</ul>
+	</fieldset>
+</div>
+	<div class="clr"></div>
+	<?php if ($this->canDo->get('core.admin')) : ?>
+		<div  class="col rules-section">
+			<?php echo JHtml::_('sliders.start', 'permissions-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+				<?php echo JHtml::_('sliders.panel', JText::_('COM_MENUS_FIELDSET_RULES'), 'access-rules'); ?>
+				<fieldset class="panelform">
+					<legend class="element-invisible"><?php echo JText::_('COM_CONTENT_FIELDSET_RULES'); ?></legend>
+					<?php echo $this->form->getLabel('rules'); ?>
+					<?php echo $this->form->getInput('rules'); ?>
+				</fieldset>
+
+			<?php echo JHtml::_('sliders.end'); ?>
+		</div>
+	<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+
+</form>
+<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_menus/menus/default.php b/core/administrator/templates/hathor/html/com_menus/menus/default.php
new file mode 100644
index 00000000..9d1d2c6a
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_menus/menus/default.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$uri       = JUri::getInstance();
+$return    = base64_encode($uri);
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$modMenuId = (int) $this->get('ModMenuId');
+
+$script = array();
+$script[] = 'jQuery(document).ready(function() {';
+
+foreach ($this->items as $item) :
+	if ($user->authorise('core.edit', 'com_menus')) :
+		$script[] = '	function jSelectPosition_' . $item->id . '(name) {';
+		$script[] = '		document.getElementById("' . $item->id . '").value = name;';
+		$script[] = '		jQuery(".modal").modal("hide");';
+		$script[] = '	};';
+	endif;
+endforeach;
+
+$script[] = '	jQuery(".modal").on("hidden", function () {';
+$script[] = '		setTimeout(function(){';
+$script[] = '			window.parent.location.reload();';
+$script[] = '		},1000);';
+$script[] = '	});';
+$script[] = '});';
+
+JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_menus&view=menus');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_MENUS_MENU_SEARCH_FILTER'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_MENUS_ITEMS_SEARCH_FILTER'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clearfix"> </div>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col" rowspan="2">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th rowspan="2">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-30" colspan="3">
+					<?php echo JText::_('COM_MENUS_HEADING_NUMBER_MENU_ITEMS'); ?>
+				</th>
+				<th class="width-20" rowspan="2">
+					<?php echo JText::_('COM_MENUS_HEADING_LINKED_MODULES'); ?>
+				</th>
+				<th class="nowrap id-col" rowspan="2">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+			<tr>
+				<th class="width-10">
+					<?php echo JText::_('COM_MENUS_HEADING_PUBLISHED_ITEMS'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('COM_MENUS_HEADING_UNPUBLISHED_ITEMS'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('COM_MENUS_HEADING_TRASHED_ITEMS'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$canCreate = $user->authorise('core.create',     'com_menus');
+			$canEdit   = $user->authorise('core.edit',       'com_menus');
+			$canChange = $user->authorise('core.edit.state', 'com_menus');
+			$canManageItems = $user->authorise('core.manage', 'com_menus.menu.' . (int) $item->id);
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($canManageItems) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype=' . $item->menutype); ?>">
+						<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<p class="smallsub">(<span><?php echo JText::_('COM_MENUS_MENU_MENUTYPE_LABEL') ?></span>
+						<?php if ($canEdit) : ?>
+							<?php echo '<a href="'.JRoute::_('index.php?option=com_menus&task=menu.edit&id='.$item->id).' title='.$this->escape($item->description).'">'.
+							$this->escape($item->menutype).'</a>'; ?>)
+						<?php else : ?>
+							<?php echo $this->escape($item->menutype)?>)
+						<?php endif; ?>
+					</p>
+				</td>
+				<td class="center btns">
+					<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype.'&filter_published=1');?>">
+						<?php echo $item->count_published; ?></a>
+				</td>
+				<td class="center btns">
+					<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype.'&filter_published=0');?>">
+						<?php echo $item->count_unpublished; ?></a>
+				</td>
+				<td class="center btns">
+					<a href="<?php echo JRoute::_('index.php?option=com_menus&view=items&menutype='.$item->menutype.'&filter_published=-2');?>">
+						<?php echo $item->count_trashed; ?></a>
+				</td>
+				<td class="left">
+				<ul class="menu-module-list">
+					<?php
+					if (isset($this->modules[$item->menutype])) :
+						foreach ($this->modules[$item->menutype] as &$module) :
+						?>
+						<li>
+							<?php if ($canEdit) : ?>
+								<?php $link = JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal'); ?>
+								<a href="#module<?php echo $module->id; ?>Modal" role="button" class="button" data-toggle="modal" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
+									<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?></a>
+							<?php else : ?>
+								<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
+							<?php endif; ?>
+						</li>
+						<?php endforeach; ?>
+				</ul>
+					<?php foreach ($this->modules[$item->menutype] as &$module) : ?>
+						<?php if ($canEdit) : ?>
+							<?php $link = JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal'); ?>
+							<?php echo JHtml::_(
+									'bootstrap.renderModal',
+									'module' . $module->id . 'Modal',
+									array(
+										'url'    => $link,
+										'title'  => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
+										'height' => '300px',
+										'width'  => '800px',
+										'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
+											. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+											. '<button class="btn btn-success" data-dismiss="modal" aria-hidden="true" onclick="jQuery(\'#module'
+											. $module->id . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
+											. JText::_('JSAVE') . '</button>',
+									)
+								); ?>
+						<?php endif; ?>
+					<?php endforeach; ?>
+					<?php elseif ($modMenuId) : ?>
+						<?php $link = JRoute::_('index.php?option=com_modules&task=module.add&eid=' . $modMenuId . '&params[menutype]=' . $item->menutype); ?>
+						<a href="<?php echo $link; ?>"><?php echo JText::_('COM_MENUS_ADD_MENU_MODULE'); ?></a>
+						<?php echo JHtml::_(
+							'bootstrap.renderModal',
+							'moduleModal',
+							array(
+								'url'    => $link,
+								'title'  => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
+								'height' => '500px',
+								'width'  => '800px',
+								'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
+									. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>',
+							)
+						); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_menus/menutypes/default.php b/core/administrator/templates/hathor/html/com_menus/menutypes/default.php
new file mode 100644
index 00000000..5fe8d3e1
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_menus/menutypes/default.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+// Checking if loaded via index.php or component.php
+$tmpl = ($input->getCmd('tmpl') != '') ? '1' : '';
+
+JFactory::getDocument()->addScriptDeclaration(
+		'
+		setmenutype = function(type) {
+			var tmpl = ' . json_encode($tmpl) . ';
+			if (tmpl)
+			{
+				window.parent.Joomla.submitbutton("item.setType", type);
+				window.parent.jQuery("#menuTypeModal").modal("hide");
+			}
+			else
+			{
+				window.location="index.php?option=com_menus&view=item&task=item.setType&layout=edit&type=" + type;
+			}
+		};
+	'
+);
+?>
+
+<h2 class="modal-title"><?php echo JText::_('COM_MENUS_TYPE_CHOOSE'); ?></h2>
+<ul class="menu_types">
+	<?php foreach ($this->types as $name => $list): ?>
+	<li><dl class="menu_type">
+			<dt><?php echo JText::_($name); ?></dt>
+			<dd><ul>
+					<?php foreach ($list as $item): ?>
+					<li><a class="choose_type" href="#" title="<?php echo JText::_($item->description); ?>"
+							onclick="javascript:setmenutype('<?php echo base64_encode(json_encode(array('id' => $this->recordId, 'title' => isset($item->type) ? $item->type : $item->title, 'request' => $item->request))); ?>')">
+							<?php echo JText::_($item->title);?>
+						</a>
+					</li>
+					<?php endforeach; ?>
+				</ul>
+			</dd>
+		</dl>
+	</li>
+	<?php endforeach; ?>
+
+</ul>
diff --git a/core/administrator/templates/hathor/html/com_messages/message/edit.php b/core/administrator/templates/hathor/html/com_messages/message/edit.php
new file mode 100644
index 00000000..1b102249
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_messages/message/edit.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'message.cancel' || document.formvalidator.isValid(document.getElementById('message-form')))
+		{
+			Joomla.submitform(task, document.getElementById('message-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_messages'); ?>" method="post" name="adminForm" id="message-form" class="form-validate form-horizontal">
+	<fieldset class="adminform">
+		<ul class="adminformlist">
+			<li><?php echo $this->form->getLabel('user_id_to'); ?>
+				<?php echo $this->form->getInput('user_id_to'); ?></li>
+
+			<li><?php echo $this->form->getLabel('subject'); ?>
+				<?php echo $this->form->getInput('subject'); ?></li>
+		</ul>
+	</fieldset>
+	<fieldset class="adminform">
+		<legend><?php echo $this->form->getLabel('message'); ?></legend>
+		<ul class="adminformlist">
+			<li><?php echo $this->form->getInput('message'); ?> </li>
+		</ul>
+	</fieldset>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_messages/messages/default.php b/core/administrator/templates/hathor/html/com_messages/messages/default.php
new file mode 100644
index 00000000..52a341fa
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_messages/messages/default.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_messages&view=messages'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_MESSAGES_SEARCH_IN_SUBJECT'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_state">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', MessagesHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_MESSAGES_HEADING_SUBJECT', 'a.subject', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_MESSAGES_HEADING_READ', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-15">
+					<?php echo JHtml::_('grid.sort', 'COM_MESSAGES_HEADING_FROM', 'a.user_id_from', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-20">
+					<?php echo JHtml::_('grid.sort', 'JDATE', 'a.date_time', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$canChange = $user->authorise('core.edit.state', 'com_messages');
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php echo JHtml::_('grid.id', $i, $item->message_id); ?>
+				</td>
+				<td>
+					<a href="<?php echo JRoute::_('index.php?option=com_messages&view=message&message_id='.(int) $item->message_id); ?>">
+						<?php echo $this->escape($item->subject); ?></a>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('messages.state', $item->state, $i, $canChange); ?>
+				</td>
+				<td>
+					<?php echo $item->user_from; ?>
+				</td>
+				<td>
+					<?php echo JHtml::_('date', $item->date_time, JText::_('DATE_FORMAT_LC2')); ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_modules/module/edit.php b/core/administrator/templates/hathor/html/com_modules/module/edit.php
new file mode 100644
index 00000000..18147729
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_modules/module/edit.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.combobox');
+$hasContent = empty($this->item->module) || $this->item->module == 'custom' || $this->item->module == 'mod_custom';
+
+$script = "Joomla.submitbutton = function(task)
+	{
+			if (task == 'module.cancel' || document.formvalidator.isValid(document.getElementById('module-form'))) {";
+if ($hasContent)
+{
+	$script .= $this->form->getField('content')->save();
+}
+$script .= "	Joomla.submitform(task, document.getElementById('module-form'));
+				if (self != top)
+				{
+					window.parent.jQuery('.modal').modal('hide');
+				}
+			}
+	}";
+
+JFactory::getDocument()->addScriptDeclaration($script);
+?>
+<div class="module-edit">
+
+<form action="<?php echo JRoute::_('index.php?option=com_modules&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="module-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('JDETAILS'); ?></legend>
+			<ul class="adminformlist">
+
+			<li><?php echo $this->form->getLabel('title'); ?>
+			<?php echo $this->form->getInput('title'); ?></li>
+
+			<li><?php echo $this->form->getLabel('showtitle'); ?>
+			<?php echo $this->form->getInput('showtitle'); ?></li>
+
+			<li><?php echo $this->form->getLabel('position'); ?>
+			<?php echo $this->form->getInput('custom_position'); ?>
+			<label id="jform_custom_position-lbl" for="jform_custom_position" class="element-invisible"><?php echo JText::_('TPL_HATHOR_COM_MODULES_CUSTOM_POSITION_LABEL');?></label>
+			<?php echo $this->form->getInput('position'); ?></li>
+
+			<?php if ((string) $this->item->xml->name != 'Login Form') : ?>
+			<li><?php echo $this->form->getLabel('published'); ?>
+			<?php echo $this->form->getInput('published'); ?></li>
+			<?php endif; ?>
+
+			<li><?php echo $this->form->getLabel('access'); ?>
+			<?php echo $this->form->getInput('access'); ?></li>
+
+			<li><?php echo $this->form->getLabel('ordering'); ?>
+			<?php echo $this->form->getInput('ordering'); ?></li>
+
+			<?php if ((string) $this->item->xml->name != 'Login Form') : ?>
+			<li><?php echo $this->form->getLabel('publish_up'); ?>
+			<?php echo $this->form->getInput('publish_up'); ?></li>
+
+			<li><?php echo $this->form->getLabel('publish_down'); ?>
+			<?php echo $this->form->getInput('publish_down'); ?></li>
+			<?php endif; ?>
+
+			<li><?php echo $this->form->getLabel('language'); ?>
+			<?php echo $this->form->getInput('language'); ?></li>
+
+			<li><?php echo $this->form->getLabel('note'); ?>
+			<?php echo $this->form->getInput('note'); ?></li>
+
+			<?php if ($this->item->id) : ?>
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+			<?php endif; ?>
+
+			<li><?php echo $this->form->getLabel('module'); ?>
+			<?php echo $this->form->getInput('module'); ?>
+			<span class="faux-input"><?php if ($this->item->xml) echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->module;else echo JText::_(COM_MODULES_ERR_XML);?></span></li>
+
+			<li><?php echo $this->form->getLabel('client_id'); ?>
+			<input type="text" size="35" id="jform_client_id" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>	" class="readonly" readonly="readonly" />
+			<?php echo $this->form->getInput('client_id'); ?></li>
+			</ul>
+			<div class="clr"></div>
+
+			<?php if ($this->item->xml) : ?>
+				<?php if ($text = trim($this->item->xml->description)) : ?>
+					<span class="faux-label">
+						<?php echo JText::_('COM_MODULES_MODULE_DESCRIPTION'); ?>
+					</span>
+					<div class="clr"></div>
+					<div class="readonly mod-desc extdescript">
+						<?php echo JText::_($text); ?>
+					</div>
+				<?php endif; ?>
+			<?php else : ?>
+				<?php echo JText::_('COM_MODULES_ERR_XML'); ?>
+			<?php endif; ?>
+			<div class="clr"></div>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+	<?php echo JHtml::_('sliders.start', 'module-sliders'); ?>
+		<?php echo $this->loadTemplate('options'); ?>
+	<?php echo JHtml::_('sliders.end'); ?>
+	</div>
+
+	<?php if ($hasContent) : ?>
+		<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('COM_MODULES_CUSTOM_OUTPUT'); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('content'); ?>
+			<div class="clr"></div>
+				<?php echo $this->form->getInput('content'); ?></li>
+			</ul>
+		</fieldset>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($this->item->client_id == 0) :?>
+	<div class="col main-section">
+		<?php echo $this->loadTemplate('assignment'); ?>
+	</div>
+	<?php endif; ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_modules/module/edit_assignment.php b/core/administrator/templates/hathor/html/com_modules/module/edit_assignment.php
new file mode 100644
index 00000000..07748d31
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_modules/module/edit_assignment.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Initialise related data.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+$menuTypes = MenusHelper::getMenuLinks();
+
+JFactory::getDocument()->addScriptDeclaration("
+	window.addEvent('domready', function(){
+		validate();
+		document.getElements('select').addEvent('change', function(e){validate();});
+	});
+	function validate(){
+		var value = document.id('jform_assignment').value;
+		var list  = document.id('menu-assignment');
+		if (value == '-' || value == '0'){
+			$$('.jform-assignments-button').each(function(el) {el.setProperty('disabled', true); });
+			list.getElements('input').each(function(el){
+				el.setProperty('disabled', true);
+				if (value == '-'){
+					el.setProperty('checked', false);
+				} else {
+					el.setProperty('checked', true);
+				}
+			});
+		} else {
+			$$('.jform-assignments-button').each(function(el) {el.setProperty('disabled', false); });
+			list.getElements('input').each(function(el){
+				el.setProperty('disabled', false);
+			});
+		}
+	}
+");
+?>
+
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('COM_MODULES_MENU_ASSIGNMENT'); ?></legend>
+			<label id="jform_menus-lbl" for="jform_menus"><?php echo JText::_('COM_MODULES_MODULE_ASSIGN'); ?></label>
+
+			<fieldset id="jform_menus" class="radio">
+				<select name="jform[assignment]" id="jform_assignment">
+					<?php echo JHtml::_('select.options', ModulesHelper::getAssignmentOptions($this->item->client_id), 'value', 'text', $this->item->assignment, true);?>
+				</select>
+
+			</fieldset>
+
+			<label id="jform_menuselect-lbl" for="jform_menuselect"><?php echo JText::_('JGLOBAL_MENU_SELECTION'); ?></label>
+
+			<button type="button" class="jform-assignments-button jform-rightbtn" onclick="$$('.chkbox').each(function(el) { el.checked = !el.checked; });">
+				<?php echo JText::_('JGLOBAL_SELECTION_INVERT_ALL'); ?>
+			</button>
+
+			<button type="button" class="jform-assignments-button jform-rightbtn" onclick="$$('.chkbox').each(function(el) { el.checked = false; });">
+				<?php echo JText::_('JGLOBAL_SELECTION_NONE'); ?>
+			</button>
+
+			<button type="button" class="jform-assignments-button jform-rightbtn" onclick="$$('.chkbox').each(function(el) { el.checked = true; });">
+				<?php echo JText::_('JGLOBAL_SELECTION_ALL'); ?>
+			</button>
+
+			<div class="clr"></div>
+
+			<div id="menu-assignment">
+
+			<?php echo JHtml::_('tabs.start', 'module-menu-assignment-tabs', array('useCookie' => 1));?>
+
+			<?php foreach ($menuTypes as &$type) :
+				echo JHtml::_('tabs.panel', $type->title ?: $type->menutype, $type->menutype.'-details');
+
+				$chkbox_class = 'chk-menulink-' . $type->id; ?>
+
+				<button type="button" class="jform-assignments-button jform-rightbtn" onclick="$$('.<?php echo $chkbox_class; ?>').each(function(el) { el.checked = !el.checked; });">
+					<?php echo JText::_('JGLOBAL_SELECTION_INVERT'); ?>
+				</button>
+
+				<button type="button" class="jform-assignments-button jform-rightbtn" onclick="$$('.<?php echo $chkbox_class; ?>').each(function(el) { el.checked = false; });">
+					<?php echo JText::_('JGLOBAL_SELECTION_NONE'); ?>
+				</button>
+
+				<button type="button" class="jform-assignments-button jform-rightbtn" onclick="$$('.<?php echo $chkbox_class; ?>').each(function(el) { el.checked = true; });">
+					<?php echo JText::_('JGLOBAL_SELECTION_ALL'); ?>
+				</button>
+
+				<div class="clr"></div>
+
+				<?php $count = count($type->links); ?>
+				<?php $i     = 0; ?>
+				<?php if ($count) : ?>
+				<ul class="menu-links">
+					<?php
+					foreach ($type->links as $link) :
+						if (trim($this->item->assignment) == '-') :
+							$checked = '';
+						elseif ($this->item->assignment == 0) :
+							$checked = ' checked="checked"';
+						elseif ($this->item->assignment < 0) :
+							$checked = in_array(-$link->value, $this->item->assigned) ? ' checked="checked"' : '';
+						elseif ($this->item->assignment > 0) :
+							$checked = in_array($link->value, $this->item->assigned) ? ' checked="checked"' : '';
+						endif;
+					?>
+					<li class="menu-link">
+						<input type="checkbox" class="chkbox <?php echo $chkbox_class; ?>" name="jform[assigned][]" value="<?php echo (int) $link->value;?>" id="link<?php echo (int) $link->value;?>"<?php echo $checked;?>/>
+						<label for="link<?php echo (int) $link->value;?>">
+							<?php echo $link->text; ?>
+						</label>
+					</li>
+					<?php if ($count > 20 && ++$i == ceil($count / 2)) :?>
+					</ul><ul class="menu-links">
+					<?php endif; ?>
+					<?php endforeach; ?>
+				</ul>
+				<div class="clr"></div>
+				<?php endif; ?>
+			<?php endforeach; ?>
+
+			<?php echo JHtml::_('tabs.end');?>
+
+			</div>
+		</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_modules/module/edit_options.php b/core/administrator/templates/hathor/html/com_modules/module/edit_options.php
new file mode 100644
index 00000000..74d861a0
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_modules/module/edit_options.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+	$fieldSets = $this->form->getFieldsets('params');
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MODULES_'.$name.'_FIELDSET_LABEL';
+		echo JHtml::_('sliders.panel', JText::_($label), $name.'-options');
+			if (isset($fieldSet->description) && trim($fieldSet->description)) :
+				echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+			endif;
+			?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_($label); ?></legend>
+		<?php $hidden_fields = ''; ?>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<?php if (!$field->hidden) : ?>
+			<li>
+				<?php echo $field->label; ?>
+				<?php echo $field->input; ?>
+			</li>
+			<?php else : $hidden_fields .= $field->input; ?>
+			<?php endif; ?>
+			<?php endforeach; ?>
+		</ul>
+		<?php echo $hidden_fields; ?>
+		</fieldset>
+	<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_modules/modules/default.php b/core/administrator/templates/hathor/html/com_modules/modules/default.php
new file mode 100644
index 00000000..a2249060
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_modules/modules/default.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+JHtml::_('behavior.modal');
+
+$client    = $this->state->get('client_id') ? 'administrator' : 'site';
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_modules');
+$saveOrder = $listOrder == 'ordering';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_modules'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_MODULES_MODULES_FILTER_SEARCH_DESC'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="client_id">
+				<?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?>
+			</label>
+			<select name="client_id" id="client_id">
+				<?php echo JHtml::_('select.options', ModulesHelper::getClientOptions(), 'value', 'text', $this->state->get('client_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_state">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', ModulesHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_position">
+				<?php echo JText::_('COM_MODULES_OPTION_SELECT_POSITION'); ?>
+			</label>
+			<select name="filter_position" id="filter_position">
+				<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_POSITION'); ?></option>
+				<?php echo JHtml::_('select.options', ModulesHelper::getPositions($this->state->get('client_id')), 'value', 'text', $this->state->get('filter.position')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_module">
+				<?php echo JText::_('COM_MODULES_OPTION_SELECT_MODULE'); ?>
+			</label>
+			<select name="filter_module" id="filter_module">
+				<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_MODULE'); ?></option>
+				<?php echo JHtml::_('select.options', ModulesHelper::getModules($this->state->get('client_id')), 'value', 'text', $this->state->get('filter.module')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language">
+				<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+			</label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist" id="modules-mgr">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'published', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-20">
+					<?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_POSITION', 'position', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'modules.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_MODULE', 'name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_PAGES', 'pages', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+				</th>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language_title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering  = ($listOrder == 'ordering');
+			$canCreate  = $user->authorise('core.create',     'com_modules');
+			$canEdit    = $user->authorise('core.edit',       'com_modules');
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_modules') && $canCheckin;
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'modules.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.(int) $item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<?php if (!empty($item->note)) : ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_NOTE', $this->escape($item->note)); ?></p>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php // Check if extension is enabled ?>
+					<?php if ($item->enabled > 0) : ?>
+						<?php echo JHtml::_('modules.state', $item->published, $i, $canChange, 'cb'); ?>
+					<?php else : ?>
+						<?php // Extension is not enabled, show a message that indicates this. ?>
+							<button class="btn btn-micro hasTooltip" title="<?php echo JText::_('COM_MODULES_MSG_MANAGE_EXTENSION_DISABLED'); ?>">
+								<span class="icon-ban-circle" aria-hidden="true"></span>
+							</button>
+					<?php endif; ?>					
+				</td>
+				<td class="center">
+					<?php echo $item->position; ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) :?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, @$this->items[$i - 1]->position == $item->position, 'modules.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, @$this->items[$i + 1]->position == $item->position, 'modules.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, @$this->items[$i - 1]->position == $item->position, 'modules.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, @$this->items[$i + 1]->position == $item->position, 'modules.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="left">
+					<?php echo $item->name; ?>
+				</td>
+				<td class="center">
+					<?php echo $item->pages; ?>
+				</td>
+
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php if ($item->language == ''):?>
+						<?php echo JText::_('JDEFAULT'); ?>
+					<?php elseif ($item->language == '*'):?>
+						<?php echo JText::alt('JALL', 'language'); ?>
+					<?php else:?>
+						<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php // Load the batch processing form. ?>
+	<?php if ($user->authorise('core.create', 'com_modules')
+		&& $user->authorise('core.edit', 'com_modules')
+		&& $user->authorise('core.edit.state', 'com_modules')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_MODULES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
+<script type="text/javascript">
+jQuery("#client_id").on("change", function()
+{
+	jQuery("#filter_position, #filter_module, #filter_language").val("");
+});
+</script>
diff --git a/core/administrator/templates/hathor/html/com_modules/positions/modal.php b/core/administrator/templates/hathor/html/com_modules/positions/modal.php
new file mode 100644
index 00000000..f4c8a9c6
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_modules/positions/modal.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$function  = JFactory::getApplication()->input->getCmd('function', 'jSelectPosition');
+$lang      = JFactory::getLanguage();
+$ordering  = $this->escape($this->state->get('list.ordering'));
+$direction = $this->escape($this->state->get('list.direction'));
+$clientId  = $this->state->get('client_id');
+$state     = $this->state->get('filter.state');
+$template  = $this->state->get('filter.template');
+$type      = $this->state->get('filter.type');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_modules&view=positions&layout=modal&tmpl=component&function='.$function.'&client_id=' .$clientId);?>" method="post" name="adminForm" id="adminForm">
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label for="filter_search">
+				<?php echo JText::_('JSEARCH_FILTER_LABEL'); ?>
+			</label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" size="30" title="<?php echo JText::_('COM_MODULES_FILTER_SEARCH_DESC'); ?>" />
+
+			<button type="submit">
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_state">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_state" id="filter_state">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('modules.templateStates'), 'value', 'text', $state, true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_type">
+				<?php echo JText::_('COM_MODULES_OPTION_SELECT_TYPE'); ?>
+			</label>
+			<select name="filter_type" id="filter_type">
+				<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_TYPE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('modules.types'), 'value', 'text', $type, true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_template">
+				<?php echo JText::_('JOPTION_SELECT_TEMPLATE'); ?>
+			</label>
+			<select name="filter_template" id="filter_template">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TEMPLATE');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('modules.templates', $clientId), 'value', 'text', $template, true);?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="title width-20">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'value', $direction, $ordering); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_MODULES_HEADING_TEMPLATES', 'templates', $direction, $ordering); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php $i = 1; foreach ($this->items as $value => $templates) : ?>
+			<tr class="row<?php echo $i = 1 - $i;?>">
+				<td>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $function;?>('<?php echo $value; ?>');"><?php echo $this->escape($value); ?></a>
+				</td>
+				<td>
+					<?php if (!empty($templates)):?>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $function;?>('<?php echo $value; ?>');">
+						<ul>
+						<?php foreach ($templates as $template => $label):?>
+							<li><?php echo $lang->hasKey($label) ? JText::sprintf('COM_MODULES_MODULE_TEMPLATE_POSITION', JText::_($template), JText::_($label)) : JText::_($template);?></li>
+						<?php endforeach;?>
+						</ul>
+					</a>
+					<?php endif;?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $ordering; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $direction; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
new file mode 100644
index 00000000..378aa976
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+
+$app = JFactory::getApplication();
+$input = $app->input;
+
+$saveHistory = $this->state->get('params')->get('save_history', 0);
+
+$assoc = JLanguageAssociations::isEnabled();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'newsfeed.cancel' || document.formvalidator.isValid(document.getElementById('newsfeed-form')))
+		{
+			Joomla.submitform(task, document.getElementById('newsfeed-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="newsfeed-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('COM_NEWSFEEDS_NEW_NEWSFEED') : JText::sprintf('COM_NEWSFEEDS_EDIT_NEWSFEED', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+			<li><?php echo $this->form->getLabel('name'); ?>
+			<?php echo $this->form->getInput('name'); ?></li>
+
+			<li><?php echo $this->form->getLabel('alias'); ?>
+			<?php echo $this->form->getInput('alias'); ?></li>
+
+			<li><?php echo $this->form->getLabel('link'); ?>
+			<?php echo $this->form->getInput('link'); ?></li>
+
+			<li><?php echo $this->form->getLabel('catid'); ?>
+			<?php echo $this->form->getInput('catid'); ?></li>
+
+			<li><?php echo $this->form->getLabel('published'); ?>
+			<?php echo $this->form->getInput('published'); ?></li>
+
+			<li><?php echo $this->form->getLabel('access'); ?>
+			<?php echo $this->form->getInput('access'); ?></li>
+
+			<li><?php echo $this->form->getLabel('ordering'); ?>
+			<?php echo $this->form->getInput('ordering'); ?></li>
+
+			<li><?php echo $this->form->getLabel('language'); ?>
+			<?php echo $this->form->getInput('language'); ?></li>
+
+			<!-- Tag field -->
+			<li><?php echo $this->form->getLabel('tags'); ?>
+				<div class="is-tagbox">
+					<?php echo $this->form->getInput('tags'); ?>
+				</div>
+			</li>
+
+			<?php if ($saveHistory) : ?>
+				<li><?php echo $this->form->getLabel('version_note'); ?>
+				<?php echo $this->form->getInput('version_note'); ?></li>
+			<?php endif; ?>
+
+			<li><?php echo $this->form->getLabel('id'); ?>
+			<?php echo $this->form->getInput('id'); ?></li>
+			</ul>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'newsfeed-sliders-' . $this->item->id, array('useCookie' => 1)); ?>
+
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('created_by'); ?>
+				<?php echo $this->form->getInput('created_by'); ?></li>
+
+				<li><?php echo $this->form->getLabel('created_by_alias'); ?>
+				<?php echo $this->form->getInput('created_by_alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('created'); ?>
+				<?php echo $this->form->getInput('created'); ?></li>
+
+				<li><?php echo $this->form->getLabel('publish_up'); ?>
+				<?php echo $this->form->getInput('publish_up'); ?></li>
+
+				<li><?php echo $this->form->getLabel('publish_down'); ?>
+				<?php echo $this->form->getInput('publish_down'); ?></li>
+
+				<?php if ($this->item->modified_by) : ?>
+					<li><?php echo $this->form->getLabel('modified_by'); ?>
+					<?php echo $this->form->getInput('modified_by'); ?></li>
+
+					<li><?php echo $this->form->getLabel('modified'); ?>
+					<?php echo $this->form->getInput('modified'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('numarticles'); ?>
+				<?php echo $this->form->getInput('numarticles'); ?></li>
+
+				<li><?php echo $this->form->getLabel('cache_time'); ?>
+				<?php echo $this->form->getInput('cache_time'); ?></li>
+
+				<li><?php echo $this->form->getLabel('rtl'); ?>
+				<?php echo $this->form->getInput('rtl'); ?></li>
+			</ul>
+			</fieldset>
+
+			<?php echo $this->loadTemplate('params'); ?>
+
+			<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
+			<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+				<?php echo $this->loadTemplate('metadata'); ?>
+			</fieldset>
+
+			<?php if ($assoc) : ?>
+				<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS'), '-options');?>
+				<?php echo $this->loadTemplate('associations'); ?>
+			<?php endif; ?>
+
+		<?php echo JHtml::_('sliders.end'); ?>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+
+	<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php
new file mode 100644
index 00000000..e6c14d6c
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-params');
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+	endif;
+	?>
+	<fieldset class="panelform">
+	<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
+	<ul class="adminformlist">
+		<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<li><?php echo $field->label; ?>
+			<?php echo $field->input; ?></li>
+		<?php endforeach; ?>
+	</ul>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
new file mode 100644
index 00000000..478966db
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_newsfeeds');
+$saveOrder = $listOrder == 'a.ordering';
+$assoc     = JLanguageAssociations::isEnabled();
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_NEWSFEEDS_SEARCH_IN_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_newsfeeds'), 'value', 'text', $this->state->get('filter.category_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language">
+				<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+			</label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_tag">
+				<?php echo JText::_('JOPTION_SELECT_TAG'); ?>
+			</label>
+			<select name="filter_tag" id="filter_tag">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap title category-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'newsfeeds.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_NEWSFEEDS_NUM_ARTICLES_HEADING', 'numarticles', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_NEWSFEEDS_CACHE_TIME_HEADING', 'a.cache_time', $listDirn, $listOrder); ?>
+				</th>
+				<?php if ($assoc) : ?>
+					<th class="width-5">
+						<?php echo JHtml::_('grid.sort', 'COM_NEWSFEEDS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering   = ($listOrder == 'a.ordering');
+			$canCreate  = $user->authorise('core.create',     'com_newsfeeds.category.' . $item->catid);
+			$canEdit    = $user->authorise('core.edit',       'com_newsfeeds.category.' . $item->catid);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_newsfeeds.category.' . $item->catid) && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</th>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'newsfeeds.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_newsfeeds&task=newsfeed.edit&id='.(int) $item->id); ?>">
+							<?php echo $this->escape($item->name); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape($item->name); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'newsfeeds.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) :?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'newsfeeds.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'newsfeeds.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'newsfeeds.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->numarticles; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->cache_time; ?>
+				</td>
+				<?php if ($assoc) : ?>
+					<td class="center">
+						<?php if ($item->association) : ?>
+							<?php echo JHtml::_('newsfeed.association', $item->id); ?>
+						<?php endif; ?>
+					</td>
+				<?php endif; ?>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php //Load the batch processing form if user is allowed ?>
+	<?php if ($user->authorise('core.create', 'com_newsfeeds')
+		&& $user->authorise('core.edit', 'com_newsfeeds')
+		&& $user->authorise('core.edit.state', 'com_newsfeeds')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title'  => JText::_('COM_NEWSFEEDS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer'),
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
new file mode 100644
index 00000000..ca59e982
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'cmd');
+
+$function  = JFactory::getApplication()->input->getCmd('function', 'jSelectNewsfeed');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_newsfeeds&view=newsfeeds&layout=modal&tmpl=component');?>" method="post" name="adminForm" id="adminForm">
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search fltlft">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" size="30" title="<?php echo JText::_('COM_NEWSFEEDS_SEARCH_IN_TITLE'); ?>" />
+
+			<button type="submit">
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select fltrt">
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true);?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_newsfeeds'), 'value', 'text', $this->state->get('filter.category_id'));?>
+			</select>
+
+			<?php if ($forcedLanguage) : ?>
+				<input type="hidden" name="forcedLanguage" value="<?php echo $this->escape($forcedLanguage); ?>" />
+				<input type="hidden" name="filter_language" value="<?php echo $this->escape($this->state->get('filter.language')); ?>" />
+			<?php else : ?>
+				<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+				<select name="filter_language" id="filter_language">
+					<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
+					<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
+				</select>
+			<?php endif; ?>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+
+	<table class="adminlist modal">
+		<thead>
+			<tr>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'a.catid', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th>
+					<a class="pointer" onclick="if (window.parent) window.parent.<?php echo $this->escape($function);?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->name)); ?>');">
+						<?php echo $this->escape($item->name); ?></a>
+				</th>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<input type="hidden" name="forcedLanguage" value="<?php echo $forcedLanguage; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_plugins/plugin/edit.php b/core/administrator/templates/hathor/html/com_plugins/plugin/edit.php
new file mode 100644
index 00000000..e3ea8941
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_plugins/plugin/edit.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'plugin.cancel' || document.formvalidator.isValid(document.getElementById('style-form')))
+		{
+			Joomla.submitform(task, document.getElementById('style-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_plugins&layout=edit&extension_id='.(int) $this->item->extension_id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('JDETAILS') ?></legend>
+			<ul class="adminformlist">
+
+			<li><?php echo $this->form->getLabel('name'); ?>
+			<?php echo $this->form->getInput('name'); ?>
+			<span class="readonly plg-name"><?php echo JText::_($this->item->name);?></span></li>
+
+			<li><?php echo $this->form->getLabel('enabled'); ?>
+			<?php echo $this->form->getInput('enabled'); ?></li>
+
+			<li><?php echo $this->form->getLabel('access'); ?>
+			<?php echo $this->form->getInput('access'); ?></li>
+
+			<li><?php echo $this->form->getLabel('ordering'); ?>
+			<?php echo $this->form->getInput('ordering'); ?></li>
+
+			<li><?php echo $this->form->getLabel('folder'); ?>
+			<?php echo $this->form->getInput('folder'); ?></li>
+
+			<li><?php echo $this->form->getLabel('element'); ?>
+			<?php echo $this->form->getInput('element'); ?></li>
+
+			<?php if ($this->item->extension_id) : ?>
+				<li><?php echo $this->form->getLabel('extension_id'); ?>
+				<?php echo $this->form->getInput('extension_id'); ?></li>
+			<?php endif; ?>
+			</ul>
+			<!-- Plugin metadata -->
+			<?php if ($this->item->xml) : ?>
+				<?php if ($text = trim($this->item->xml->description)) : ?>
+
+					<label id="jform_extdescription-lbl">
+						<?php echo JText::_('JGLOBAL_DESCRIPTION'); ?>
+					</label>
+					<div class="clr"></div>
+					<div class="readonly plg-desc extdescript">
+						<?php echo JText::_($text); ?>
+					</div>
+
+				<?php endif; ?>
+			<?php else : ?>
+				<?php echo JText::_('COM_PLUGINS_XML_ERR'); ?>
+			<?php endif; ?>
+
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+	<?php echo JHtml::_('sliders.start', 'plugin-sliders-'.$this->item->extension_id); ?>
+
+		<?php echo $this->loadTemplate('options'); ?>
+
+		<div class="clr"></div>
+
+	<?php echo JHtml::_('sliders.end'); ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+
+	<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php b/core/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
new file mode 100644
index 00000000..41d316b4
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+
+foreach ($fieldSets as $name => $fieldSet) :
+	$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_PLUGINS_'.$name.'_FIELDSET_LABEL';
+	echo JHtml::_('sliders.panel', JText::_($label), $name.'-options');
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+	endif;
+	?>
+	<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_($label) ?></legend>
+		<?php $hidden_fields = ''; ?>
+		<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<?php if (!$field->hidden) : ?>
+			<li>
+				<?php echo $field->label; ?>
+				<?php echo $field->input; ?>
+			</li>
+			<?php else : $hidden_fields .= $field->input; ?>
+			<?php endif; ?>
+			<?php endforeach; ?>
+		</ul>
+		<?php echo $hidden_fields; ?>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_plugins/plugins/default.php b/core/administrator/templates/hathor/html/com_plugins/plugins/default.php
new file mode 100644
index 00000000..d6d548b3
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_plugins/plugins/default.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_plugins');
+$saveOrder = $listOrder == 'ordering';
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_plugins&view=plugins'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_PLUGINS_SEARCH_IN_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_enabled">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_enabled" id="filter_enabled">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', PluginsHelper::publishedOptions(), 'value', 'text', $this->state->get('filter.enabled'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_folder">
+				<?php echo JText::_('COM_PLUGINS_OPTION_FOLDER'); ?>
+			</label>
+			<select name="filter_folder" id="filter_folder">
+				<option value=""><?php echo JText::_('COM_PLUGINS_OPTION_FOLDER'); ?></option>
+				<?php echo JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder')); ?>
+			</select>
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'JENABLED', 'enabled', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'plugins.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+
+				<th class="nowrap width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_FOLDER_HEADING', 'folder', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_ELEMENT_HEADING', 'element', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'extension_id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering   = ($listOrder == 'ordering');
+			$canEdit    = $user->authorise('core.edit',       'com_plugins');
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_plugins') && $canCheckin;
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->extension_id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'plugins.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id='.(int) $item->extension_id); ?>">
+							<?php echo $item->name; ?></a>
+					<?php else : ?>
+							<?php echo $item->name; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->enabled, $i, 'plugins.', $canChange); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) : ?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, @$this->items[$i - 1]->folder == $item->folder, 'plugins.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, @$this->items[$i + 1]->folder == $item->folder, 'plugins.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, @$this->items[$i - 1]->folder == $item->folder, 'plugins.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, @$this->items[$i + 1]->folder == $item->folder, 'plugins.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->name; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+
+				<td class="nowrap center">
+					<?php echo $this->escape($item->folder); ?>
+				</td>
+				<td class="nowrap center">
+					<?php echo $this->escape($item->element); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->extension_id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_postinstall/messages/default.php b/core/administrator/templates/hathor/html/com_postinstall/messages/default.php
new file mode 100644
index 00000000..352495eb
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_postinstall/messages/default.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_postinstall
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$renderer       = JFactory::getDocument()->loadRenderer('module');
+$options        = array('style' => 'raw');
+$mod            = JModuleHelper::getModule('mod_feed');
+$param          = array(
+	'rssurl'          => 'https://www.joomla.org/announcements/release-news.feed?type=rss',
+	'rsstitle'        => 0,
+	'rssdesc'         => 0,
+	'rssimage'        => 1,
+	'rssitems'        => 5,
+	'rssitemdesc'     => 1,
+	'word_count'      => 200,
+	'cache'           => 0,
+	'moduleclass_sfx' => ' list-striped'
+);
+$params         = array('params' => json_encode($param));
+?>
+
+<?php if (empty($this->items)): ?>
+<h2><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_TITLE') ?></h2>
+<p><?php echo JText::_('COM_POSTINSTALL_LBL_NOMESSAGES_DESC') ?></p>
+<div>
+	<button onclick="window.location='index.php?option=com_postinstall&view=messages&task=reset&eid=<?php echo $this->eid; ?>&<?php echo $this->token ?>=1'; return false;" class="btn btn-warning">
+		<span class="icon icon-eye-open"></span>
+		<?php echo JText::_('COM_POSTINSTALL_BTN_RESET') ?>
+	</button>
+</div>
+<?php if ($this->eid == 700): ?>
+	<br/>
+	<div>
+		<h3><?php echo JText::_('COM_POSTINSTALL_LBL_RELEASENEWS'); ?></h3>
+		<?php echo $renderer->render($mod, $params, $options); ?>
+	</div>
+<?php endif; ?>
+<?php else: ?>
+<?php
+	if ($this->eid == 700):
+		echo JHtml::_('sliders.start', 'panel-sliders', array('useCookie' => '1'));
+		echo JHtml::_('sliders.panel', JText::_('COM_POSTINSTALL_LBL_MESSAGES'), 'postinstall-panel-messages');
+	else:
+?>
+	<h2><?php echo JText::_('COM_POSTINSTALL_LBL_MESSAGES') ?></h2>
+<?php endif; ?>
+	<?php foreach ($this->items as $item): ?>
+	<fieldset>
+		<legend><?php echo JText::_($item->title_key) ?></legend>
+		<p class="small">
+			<?php echo JText::sprintf('COM_POSTINSTALL_LBL_SINCEVERSION', $item->version_introduced) ?>
+		</p>
+		<p><?php echo JText::_($item->description_key) ?></p>
+
+		<div>
+			<?php if ($item->type !== 'message'): ?>
+			<button onclick="window.location='index.php?option=com_postinstall&view=messages&task=action&id=<?php echo $item->postinstall_message_id ?>&<?php echo $this->token ?>=1'; return false;" class="btn btn-primary">
+				<?php echo JText::_($item->action_key) ?>
+			</button>
+			<?php endif; ?>
+			<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
+			<button onclick="window.location='index.php?option=com_postinstall&view=message&task=unpublish&id=<?php echo $item->postinstall_message_id ?>&<?php echo $this->token ?>=1'; return false;" class="btn btn-inverse btn-small">
+				<?php echo JText::_('COM_POSTINSTALL_BTN_HIDE') ?>
+			</button>
+			<?php endif; ?>
+		</div>
+	</fieldset>
+	<?php endforeach; ?>
+<?php
+	if ($this->eid == 700):
+		echo JHtml::_('sliders.panel', JText::_('COM_POSTINSTALL_LBL_RELEASENEWS'), 'postinstall-panel-releasenotes');
+?>
+		<?php echo $renderer->render($mod, $params, $options); ?>
+<?php
+	echo JHtml::_('sliders.end');
+	endif;
+?>
+<?php endif; ?>
diff --git a/core/administrator/templates/hathor/html/com_redirect/links/default.php b/core/administrator/templates/hathor/html/com_redirect/links/default.php
new file mode 100644
index 00000000..2eaebe7d
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_redirect/links/default.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_redirect&view=links'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_REDIRECT_SEARCH_LINKS'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_state" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php echo JHtml::_('select.options', RedirectHelper::publishedOptions(), 'value', 'text', $this->state->get('filter.state'), true);?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_REDIRECT_HEADING_OLD_URL', 'a.old_url', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-30">
+					<?php echo JHtml::_('grid.sort', 'COM_REDIRECT_HEADING_NEW_URL', 'a.new_url', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-30">
+					<?php echo JHtml::_('grid.sort', 'COM_REDIRECT_HEADING_REFERRER', 'a.referer', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_REDIRECT_HEADING_CREATED_DATE', 'a.created_date', $listDirn, $listOrder); ?>
+				</th>
+				<th width="1%" class="nowrap">
+					<?php echo JHtml::_('grid.sort', 'COM_REDIRECT_HEADING_HITS', 'a.hits', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$canCreate = $user->authorise('core.create',     'com_redirect');
+			$canEdit   = $user->authorise('core.edit',       'com_redirect');
+			$canChange = $user->authorise('core.edit.state', 'com_redirect');
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_redirect&task=link.edit&id='.$item->id);?>" title="<?php echo $this->escape($item->old_url); ?>">
+							<?php echo $this->escape(str_replace(JUri::root(), '', rawurldecode($item->old_url))); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape(str_replace(JUri::root(), '', rawurldecode($item->old_url))); ?>
+					<?php endif; ?>
+				</td>
+				<td>
+					<?php echo $this->escape(rawurldecode($item->new_url)); ?>
+				</td>
+				<td>
+					<?php echo $this->escape($item->referer); ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('date', $item->created_date, JText::_('DATE_FORMAT_LC4')); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->hits; ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('redirect.published', $item->published, $i); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php //Load the batch processing form if user is allowed ?>
+	<?php if ($user->authorise('core.create', 'com_redirect')
+		&& $user->authorise('core.edit', 'com_redirect')
+		&& $user->authorise('core.edit.state', 'com_redirect')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title'  => JText::_('COM_REDIRECT_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer'),
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif;?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+	<p class="footer-tip">
+		<?php if ($this->enabled && $this->collect_urls_enabled) : ?>
+			<span class="enabled"><?php echo JText::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED')); ?></span>
+		<?php elseif ($this->enabled && !$this->collect_urls_enabled) : ?>
+			<?php $link = JHtml::_(
+				'link',
+				JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId()),
+				JText::_('COM_REDIRECT_SYSTEM_PLUGIN')
+			);
+			?>
+			<span class="enabled"><?php echo JText::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED'), $link); ?></span>
+		<?php elseif (!$this->enabled) : ?>
+			<span class="disabled"><?php echo JText::sprintf('COM_REDIRECT_PLUGIN_DISABLED', 'index.php?option=com_plugins&task=plugin.edit&extension_id=' . RedirectHelper::getRedirectPluginId()); ?></span>
+		<?php endif; ?>
+	</p>
+	<div class="clr"></div>
+
+	<?php if (!empty($this->items)) : ?>
+		<?php echo $this->loadTemplate('addform'); ?>
+	<?php endif; ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_search/searches/default.php b/core/administrator/templates/hathor/html/com_search/searches/default.php
new file mode 100644
index 00000000..0d80564b
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_search/searches/default.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_search&view=searches'); ?>" method="post" name="adminForm" id="adminForm">
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_SEARCH_SEARCH_IN_PHRASE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_SEARCH_HEADING_PHRASE', 'a.search_term', $listDirn, $listOrder); ?>
+				</th>
+				<th class="hits-col">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-15">
+					<?php echo JText::_('COM_SEARCH_HEADING_RESULTS'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+					<td>
+						<?php echo $this->escape($item->search_term); ?>
+					</td>
+					<td class="center">
+						<?php echo (int) $item->hits; ?>
+					</td>
+					<td class="center">
+					<?php if ($this->state->get('show_results')) : ?>
+						<?php echo (int) $item->returns; ?>
+					<?php else: ?>
+						<?php echo JText::_('COM_SEARCH_NO_RESULTS'); ?>
+					<?php endif; ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+
+		<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_tags/tag/edit.php b/core/administrator/templates/hathor/html/com_tags/tag/edit.php
new file mode 100644
index 00000000..1160f217
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_tags/tag/edit.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$saveHistory = $this->state->get('params')->get('save_history', 0);
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'tag.cancel' || document.formvalidator.isValid(document.getElementById('tag-form')))
+		{
+			" . $this->form->getField('description')->save() . "
+			Joomla.submitform(task, document.getElementById('tag-form'));
+		}
+	}
+");
+?>
+
+<div class="weblink-edit">
+
+<form action="<?php echo JRoute::_('index.php?option=com_tags&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="tag-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('JTOOLBAR_NEW') : JText::sprintf('JTOOLBAR_EDIT', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('title'); ?>
+				<?php echo $this->form->getInput('title'); ?></li>
+
+				<li><?php echo $this->form->getLabel('alias'); ?>
+				<?php echo $this->form->getInput('alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('parent_id'); ?>
+				<?php echo $this->form->getInput('parent_id'); ?></li>
+
+				<li><?php echo $this->form->getLabel('published'); ?>
+				<?php echo $this->form->getInput('published'); ?></li>
+
+				<li><?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?></li>
+
+				<li><?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?></li>
+
+				<?php if ($saveHistory) : ?>
+					<li><?php echo $this->form->getLabel('version_note'); ?>
+					<?php echo $this->form->getInput('version_note'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+			</ul>
+
+			<div>
+				<?php echo $this->form->getLabel('description'); ?>
+				<div class="clr"></div>
+				<?php echo $this->form->getInput('description'); ?>
+			</div>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'weblink-sliders-'.$this->item->id, array('useCookie' => 1)); ?>
+
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+
+		<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+			<ul class="adminformlist">
+
+				<li><?php echo $this->form->getLabel('created_by'); ?>
+				<?php echo $this->form->getInput('created_by'); ?></li>
+
+				<li><?php echo $this->form->getLabel('created_by_alias'); ?>
+				<?php echo $this->form->getInput('created_by_alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('created'); ?>
+				<?php echo $this->form->getInput('created'); ?></li>
+
+				<li><?php echo $this->form->getLabel('publish_up'); ?>
+				<?php echo $this->form->getInput('publish_up'); ?></li>
+
+				<li><?php echo $this->form->getLabel('publish_down'); ?>
+				<?php echo $this->form->getInput('publish_down'); ?></li>
+
+				<?php if ($this->item->modified_user_id) : ?>
+					<li><?php echo $this->form->getLabel('modified_user_id'); ?>
+					<?php echo $this->form->getInput('modified_user_id'); ?></li>
+
+					<li><?php echo $this->form->getLabel('modified'); ?>
+					<?php echo $this->form->getInput('modified'); ?></li>
+				<?php endif; ?>
+
+				<?php if ($this->item->hits) : ?>
+					<li><?php echo $this->form->getLabel('hits'); ?>
+					<?php echo $this->form->getInput('hits'); ?></li>
+				<?php endif; ?>
+
+			</ul>
+		</fieldset>
+
+		<?php echo $this->loadTemplate('options'); ?>
+
+		<?php echo $this->loadTemplate('metadata'); ?>
+
+		<?php echo JHtml::_('sliders.end'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+	<div class="clr"></div>
+</form>
+</div>
+
diff --git a/core/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php b/core/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php
new file mode 100644
index 00000000..546d60bf
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('metadata');
+foreach ($fieldSets as $name => $fieldSet) :
+	echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-options');
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+	endif;
+	?>
+	<fieldset class="panelform">
+	<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
+		<ul class="adminformlist">
+			<?php if ($name == 'jmetadata') : // Include the real fields in this panel. ?>
+				<li><?php echo $this->form->getLabel('metadesc'); ?>
+				<?php echo $this->form->getInput('metadesc'); ?></li>
+
+				<li><?php echo $this->form->getLabel('metakey'); ?>
+				<?php echo $this->form->getInput('metakey'); ?></li>
+
+				<li><?php echo $this->form->getLabel('xreference'); ?>
+				<?php echo $this->form->getInput('xreference'); ?></li>
+			<?php endif; ?>
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+				<li><?php echo $field->label; ?>
+				<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_tags/tag/edit_options.php b/core/administrator/templates/hathor/html/com_tags/tag/edit_options.php
new file mode 100644
index 00000000..c61cda76
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_tags/tag/edit_options.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if (isset($fieldSet->description) && trim($fieldSet->description)) :
+	echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+endif;
+?>
+<fieldset class="panelform">
+	<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
+	<ul class="adminformlist">
+			<li><?php echo $this->form->getLabel('created_user_id'); ?>
+			<?php echo $this->form->getInput('created_user_id'); ?></li>
+
+			<li><?php echo $this->form->getLabel('created_by_alias'); ?>
+			<?php echo $this->form->getInput('created_by_alias'); ?></li>
+
+			<li><?php echo $this->form->getLabel('created_time'); ?>
+			<?php echo $this->form->getInput('created_time'); ?></li>
+
+			<li><?php echo $this->form->getLabel('publish_up'); ?>
+			<?php echo $this->form->getInput('publish_up'); ?></li>
+
+			<li><?php echo $this->form->getLabel('publish_down'); ?>
+			<?php echo $this->form->getInput('publish_down'); ?></li>
+
+			<li><?php echo $this->form->getLabel('modified_user_id'); ?>
+			<?php echo $this->form->getInput('modified_user_id'); ?></li>
+
+			<li><?php echo $this->form->getLabel('modified_time'); ?>
+			<?php echo $this->form->getInput('modified_time'); ?></li>
+			<li><?php echo $this->form->getLabel('version'); ?>
+			<?php echo $this->form->getInput('version'); ?></li>
+
+
+			</ul>
+</fieldset>
+
+<?php $fieldSets = $this->form->getFieldsets('params');
+	foreach ($fieldSets as $name => $fieldSet) :
+	echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-params');
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+	endif;
+	?>
+	<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
+		<ul class="adminformlist">
+		<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<li><?php echo $field->label; ?>
+			<?php echo $field->input; ?></li>
+		<?php endforeach; ?>
+		</ul>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_tags/tags/default.php b/core/administrator/templates/hathor/html/com_tags/tags/default.php
new file mode 100644
index 00000000..8e311bd7
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_tags/tags/default.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$app       = JFactory::getApplication();
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$saveOrder = $listOrder == 'a.ordering';
+$n         = count($this->items);
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_tags&view=tags');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" />
+			<button type="submit" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published"><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access"><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_author_id"><?php echo JText::_('JOPTION_SELECT_AUTHOR'); ?></label>
+			<select name="filter_author_id" id="filter_author_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_AUTHOR'); ?></option>
+				<?php echo JHtml::_('select.options', $this->authors, 'value', 'text', $this->state->get('filter.author_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language"><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'access', $listDirn, $listOrder); ?>
+				<th class="language-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$item->max_ordering = 0; //??
+			$canCreate  = $user->authorise('core.create',     'com_tags');
+			$canEdit    = $user->authorise('core.edit',       'com_tags.tag.' . $item->id);
+			$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out_user_id == $userId || $item->checked_out_user_id == 0;
+			$canChange  = $user->authorise('core.edit.state', 'com_tags.tag.' . $item->id) && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<th class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</th>
+				<td>
+					<?php if ($item->level > 0): ?>
+					<?php echo str_repeat('<span class="gi">&mdash;</span>', $item->level - 1) ?>
+					<?php endif; ?>
+
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'tags.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit || $canEditOwn) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_tags&task=tag.edit&id='.$item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'tags.', $canChange, 'cb'); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_title); ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php //Load the batch processing form if user is allowed ?>
+	<?php if ($user->authorise('core.create', 'com_tags')
+		&& $user->authorise('core.edit', 'com_tags')
+		&& $user->authorise('core.edit.state', 'com_tags')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title'  => JText::_('COM_TAGS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer'),
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif;?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_templates/style/edit.php b/core/administrator/templates/hathor/html/com_templates/style/edit.php
new file mode 100644
index 00000000..0219bf13
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/style/edit.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+$user = JFactory::getUser();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'style.cancel' || document.formvalidator.isValid(document.getElementById('style-form')))
+		{
+			Joomla.submitform(task, document.getElementById('style-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_templates&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="style-form" class="form-validate">
+	<div class="width-60 fltlft">
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('JDETAILS');?></legend>
+			<ul class="adminformlist">
+			<li><?php echo $this->form->getLabel('title'); ?>
+			<?php echo $this->form->getInput('title'); ?></li>
+
+			<li><?php echo $this->form->getLabel('template'); ?>
+			<?php echo $this->form->getInput('template'); ?>
+			<?php echo $this->form->getLabel('client_id'); ?>
+			<?php echo $this->form->getInput('client_id'); ?>
+			<input type="text" size="35" value="<?php echo $this->item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>	" class="readonly" readonly="readonly" /></li>
+
+			<li><?php echo $this->form->getLabel('home'); ?>
+			<?php echo $this->form->getInput('home'); ?></li>
+
+			<?php if ($this->item->id) : ?>
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<span class="readonly"><?php echo $this->item->id; ?></span></li>
+			<?php endif; ?>
+			</ul>
+			<div class="clr"></div>
+			<?php if ($this->item->xml) : ?>
+				<?php if ($text = trim($this->item->xml->description)) : ?>
+					<label>
+						<?php echo JText::_('COM_TEMPLATES_TEMPLATE_DESCRIPTION'); ?>
+					</label>
+					<span class="readonly mod-desc"><?php echo JText::_($text); ?></span>
+				<?php endif; ?>
+			<?php else : ?>
+				<p class="error"><?php echo JText::_('COM_TEMPLATES_ERR_XML'); ?></p>
+			<?php endif; ?>
+			<div class="clr"></div>
+		</fieldset>
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+
+	<div class="width-40 fltrt">
+	<?php echo JHtml::_('sliders.start', 'template-sliders-'.$this->item->id); ?>
+
+		<?php //get the menu parameters that are automatically set but may be modified.
+			echo $this->loadTemplate('options'); ?>
+
+		<div class="clr"></div>
+
+	<?php echo JHtml::_('sliders.end'); ?>
+	</div>
+	<?php if ($user->authorise('core.edit', 'com_menu') && $this->item->client_id == 0):?>
+		<?php if ($this->canDo->get('core.edit.state')) : ?>
+			<div class="width-60 fltlft">
+			<?php echo $this->loadTemplate('assignment'); ?>
+			</div>
+			<?php endif; ?>
+		<?php endif;?>
+
+	<div class="clr"></div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_templates/style/edit_assignment.php b/core/administrator/templates/hathor/html/com_templates/style/edit_assignment.php
new file mode 100644
index 00000000..ee87e75f
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/style/edit_assignment.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Initialise related data.
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+$menuTypes = MenusHelper::getMenuLinks();
+$user = JFactory::getUser();
+
+?>
+<fieldset class="adminform">
+	<legend><?php echo JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT'); ?></legend>
+		<label id="jform_menuselect-lbl" for="jform_menuselect"><?php echo JText::_('JGLOBAL_MENU_SELECTION'); ?></label>
+
+		<button type="button" class="jform-rightbtn" onclick="$$('.chk-menulink').each(function(el) { el.checked = !el.checked; });">
+			<?php echo JText::_('JGLOBAL_SELECTION_INVERT_ALL'); ?>
+		</button>
+		<div class="clr"></div>
+		<div id="menu-assignment">
+
+		<?php foreach ($menuTypes as &$type) : ?>
+			<ul class="menu-links">
+				<button type="button" class="jform-rightbtn" onclick="$$('.<?php echo $type->menutype; ?>').each(function(el) { el.checked = !el.checked; });">
+					<?php echo JText::_('JGLOBAL_SELECTION_INVERT'); ?>
+				</button>
+				<div class="clr"></div>
+				<h3><?php echo $type->title ?: $type->menutype; ?></h3>
+
+				<?php foreach ($type->links as $link) : ?>
+					<li class="menu-link">
+						<input type="checkbox" name="jform[assigned][]" value="<?php echo (int) $link->value;?>" id="link<?php echo (int) $link->value;?>"<?php if ($link->template_style_id == $this->item->id):?> checked="checked"<?php endif;?><?php if ($link->checked_out && $link->checked_out != $user->id):?> disabled="disabled"<?php else:?> class="chk-menulink <?php echo $type->menutype; ?>"<?php endif;?> />
+						<label for="link<?php echo (int) $link->value;?>" >
+							<?php echo $link->text; ?>
+						</label>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		<?php endforeach; ?>
+
+		</div>
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/com_templates/style/edit_options.php b/core/administrator/templates/hathor/html/com_templates/style/edit_options.php
new file mode 100644
index 00000000..5b3870b3
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/style/edit_options.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+	$fieldSets = $this->form->getFieldsets('params');
+
+	foreach ($fieldSets as $name => $fieldSet) :
+		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_TEMPLATES_'.$name.'_FIELDSET_LABEL';
+		echo JHtml::_('sliders.panel', JText::_($label), $name.'-options');
+			if (isset($fieldSet->description) && trim($fieldSet->description)) :
+				echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+			endif;
+			?>
+		<fieldset class="panelform">
+			<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+				<li>
+				<?php if (!$field->hidden) : ?>
+					<?php echo $field->label; ?>
+				<?php endif; ?>
+					<?php echo $field->input; ?>
+				</li>
+			<?php endforeach; ?>
+			</ul>
+		</fieldset>
+	<?php endforeach;  ?>
diff --git a/core/administrator/templates/hathor/html/com_templates/styles/default.php b/core/administrator/templates/hathor/html/com_templates/styles/default.php
new file mode 100644
index 00000000..79820c16
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/styles/default.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('script', 'system/multiselect.js', array('version' => 'auto', 'relative' => true));
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_templates&view=styles'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_TEMPLATES_STYLES_FILTER_SEARCH_DESC'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="client_id"><?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?></label>
+			<select name="client_id" id="client_id">
+				<?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('client_id'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_template"><?php echo JText::_('COM_TEMPLATES_FILTER_TEMPLATE'); ?></label>
+			<select name="filter_template" id="filter_template">
+				<option value="0"><?php echo JText::_('COM_TEMPLATES_FILTER_TEMPLATE'); ?></option>
+				<?php echo JHtml::_('select.options', TemplatesHelper::getTemplateOptions($this->state->get('client_id')), 'value', 'text', $this->state->get('filter.template'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					&#160;
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_STYLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'JCLIENT', 'a.client_id', $listDirn, $listOrder); ?>
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.template', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_DEFAULT', 'a.home', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JText::_('COM_TEMPLATES_HEADING_ASSIGNED'); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$canCreate = $user->authorise('core.create',     'com_templates');
+				$canEdit   = $user->authorise('core.edit',       'com_templates');
+				$canChange = $user->authorise('core.edit.state', 'com_templates');
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($this->preview && $item->client_id == '0') : ?>
+						<a target="_blank" href="<?php echo JUri::root().'index.php?tp=1&templateStyle='.(int) $item->id ?>" class="jgrid hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'), $item->title, 0); ?>" ><span class="state icon-16-preview"><span class="text"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></span></span></a>
+					<?php elseif ($item->client_id == '1') : ?>
+						<span class="jgrid hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>"><span class="state icon-16-nopreview"><span class="text"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?></span></span></span>
+					<?php else: ?>
+						<span class="jgrid hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?>"><span class="state icon-16-nopreview"><span class="text"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span></span></span>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_templates&task=style.edit&id='.(int) $item->id); ?>">
+						<?php echo $this->escape($item->title);?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title);?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
+				</td>
+				<td>
+					<label for="cb<?php echo $i;?>">
+						<?php echo $this->escape($item->template);?>
+					</label>
+				</td>
+				<td class="center">
+					<?php if ($item->home == '0' || $item->home == '1'):?>
+						<?php echo JHtml::_('jgrid.isdefault', $item->home != '0', $i, 'styles.', $canChange && $item->home != '1');?>
+					<?php elseif ($canChange):?>
+						<a href="<?php echo JRoute::_('index.php?option=com_templates&task=styles.unsetDefault&cid[]='.$item->id.'&'.JSession::getFormToken().'=1');?>">
+							<?php if ($item->image) : ?>
+								<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true);?>
+							<?php else : ?>
+								<span class="label" title="<?php echo JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title); ?>"><?php echo $item->language_sef; ?></span>
+							<?php endif; ?>
+						</a>
+					<?php else:?>
+						<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
+						<?php if ($item->image) : ?>
+							<?php echo JHtml::_('image', 'mod_languages/' . $item->image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?>
+						<?php else : ?>
+							<span class="label" title="<?php echo $item->language_title; ?>"><?php echo $item->language_sef; ?></span>
+						<?php endif; ?>
+					<?php endif;?>
+				</td>
+				<td class="center">
+					<?php if ($item->assigned > 0) : ?>
+						<?php echo JHtml::_('image', 'admin/tick.png', JText::plural('COM_TEMPLATES_ASSIGNED', $item->assigned), array('title' => JText::plural('COM_TEMPLATES_ASSIGNED', $item->assigned)), true); ?>
+					<?php else : ?>
+						&#160;
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_templates/template/default.php b/core/administrator/templates/hathor/html/com_templates/template/default.php
new file mode 100644
index 00000000..a28f56c7
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/template/default.php
@@ -0,0 +1,508 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+
+$input = JFactory::getApplication()->input;
+if ($this->type == 'image')
+{
+	JHtml::_('script', 'system/jquery.Jcrop.min.js', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', 'system/jquery.Jcrop.min.css', array('version' => 'auto', 'relative' => true));
+}
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function($){
+	// Hide all the folder when the page loads
+	$('.folder ul, .component-folder ul').hide();
+	// Display the tree after loading
+	$('.directory-tree').removeClass('directory-tree');
+	// Show all the lists in the path of an open file
+	$('.show > ul').show();
+	// Stop the default action of anchor tag on a click event
+	$('.folder-url, .component-folder-url').click(function(event){
+		event.preventDefault();
+	});
+	// Prevent the click event from proliferating
+	$('.file, .component-file-url').bind('click',function(e){
+		e.stopPropagation();
+	});
+	// Toggle the child indented list on a click event
+	$('.folder, .component-folder').bind('click',function(e){
+		$(this).children('ul').toggle();
+		e.stopPropagation();
+	});
+	// New file tree
+	$('#fileModal .folder-url').bind('click',function(e){
+		$('.folder-url').removeClass('selected');
+		e.stopPropagation();
+		$('#fileModal input.address').val($(this).attr('data-id'));
+		$(this).addClass('selected');
+	});
+	// Folder manager tree
+	$('#folderModal .folder-url').bind('click',function(e){
+		$('.folder-url').removeClass('selected');
+		e.stopPropagation();
+		$('#folderModal input.address').val($(this).attr('data-id'));
+		$(this).addClass('selected');
+	});
+});");
+if ($this->type == 'image')
+{
+	JFactory::getDocument()->addScriptDeclaration("
+		jQuery(document).ready(function() {
+			var jcrop_api;
+			// Configuration for image cropping
+			$('#image-crop').Jcrop({
+				onChange:   showCoords,
+				onSelect:   showCoords,
+				onRelease:  clearCoords,
+				trueSize:   " . $this->image['width'] . "," . $this->image['height'] . "]
+			},function(){
+				jcrop_api = this;
+			});
+			// Function for calculating the crop coordinates
+			function showCoords(c)
+			{
+				$('#x').val(c.x);
+				$('#y').val(c.y);
+				$('#w').val(c.w);
+				$('#h').val(c.h);
+			};
+			// Function for clearing the coordinates
+			function clearCoords()
+			{
+				$('#adminForm input').val('');
+			};
+		});");
+}
+JFactory::getDocument()->addStyleDeclaration('
+	/* Styles for modals */
+	.selected{
+		background: #08c;
+		color: #fff;
+	}
+	.selected:hover{
+		background: #08c !important;
+		color: #fff;
+	}
+	.modal-body .column {
+		width: 50%; float: left;
+	}
+	#deleteFolder{
+		margin: 0;
+	}
+	#image-crop{
+		max-width: 100% !important;
+		width: auto;
+		height: auto;
+	}
+	.directory-tree{
+		display: none;
+	}
+	.tree-holder{
+		overflow-x: auto;
+	}
+');
+if ($this->type == 'font')
+{
+	JFactory::getDocument()->addStyleDeclaration(
+			"/* Styles for font preview */
+		@font-face
+		{
+			font-family: previewFont;
+			src: url('" . $this->font['address'] . "')
+		}
+		.font-preview{
+			font-family: previewFont !important;
+		}"
+	);
+}
+?>
+<div class="width-60 fltlft">
+
+	<?php if ($this->type != 'home'): ?>
+		<div  id="deleteModal" class="modal hide fade">
+			<fieldset>
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h3><?php echo JText::_('COM_TEMPLATES_ARE_YOU_SURE');?></h3>
+				</div>
+				<div class="modal-body">
+					<p><?php echo JText::sprintf('COM_TEMPLATES_MODAL_FILE_DELETE', $this->fileName); ?></p>
+				</div>
+				<div class="modal-footer">
+					<form method="post" action="">
+						<input type="hidden" name="option" value="com_templates" />
+						<input type="hidden" name="task" value="template.delete" />
+						<input type="hidden" name="id" value="<?php echo $input->getInt('id'); ?>" />
+						<input type="hidden" name="file" value="<?php echo $this->file; ?>" />
+						<?php echo JHtml::_('form.token'); ?>
+						<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+						<button type="submit"><?php echo JText::_('COM_TEMPLATES_BUTTON_DELETE');?></button>
+					</form>
+				</div>
+			</fieldset>
+		</div>
+	<?php endif; ?>
+	<div  id="folderModal" class="modal hide fade">
+		<fieldset>
+			<legend><?php echo JText::_('COM_TEMPLATES_MANAGE_FOLDERS');?></legend>
+			<div class="modal-body">
+				<div class="width-50 fltlft">
+					<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.createFolder&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+						<fieldset>
+							<label><?php echo JText::_('COM_TEMPLATES_FOLDER_NAME');?></label>
+							<input type="text" name="name" required />
+							<input type="hidden" class="address" name="address" />
+
+							<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_CREATE');?>" class="btn btn-primary" />
+						</fieldset>
+					</form>
+				</div>
+				<div class="width-50 fltlft">
+					<?php echo $this->loadTemplate('folders');?>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<form id="deleteFolder" method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.deleteFolder&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+					<fieldset>
+						<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+						<input type="hidden" class="address" name="address" />
+						<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_DELETE');?>" class="btn btn-danger" />
+					</fieldset>
+				</form>
+			</div>
+		</fieldset>
+	</div>
+
+	<div  id="fileModal" class="modal hide fade">
+		<fieldset>
+			<legend><?php echo JText::_('COM_TEMPLATES_BUTTON_FILE');?></legend>
+			<div class="modal-body">
+				<div class="width-50 fltlft">
+					<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.createFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+						<fieldset>
+							<label><?php echo JText::_('COM_TEMPLATES_NEW_FILE_TYPE');?></label>
+							<select name="type" required >
+								<option value="null">- <?php echo JText::_('COM_TEMPLATES_NEW_FILE_SELECT');?> -</option>
+								<option value="css">css</option>
+								<option value="php">php</option>
+								<option value="js">js</option>
+								<option value="xml">xml</option>
+								<option value="ini">ini</option>
+								<option value="less">less</option>
+								<option value="txt">txt</option>
+							</select>
+							<br />
+							<label><?php echo JText::_('COM_TEMPLATES_FILE_NAME');?></label>
+							<input type="text" name="name" required />
+							<input type="hidden" class="address" name="address" />
+
+							<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_CREATE');?>" class="btn btn-primary" />
+						</fieldset>
+					</form>
+					<br />
+					<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.uploadFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>"
+						  enctype="multipart/form-data" >
+						<fieldset>
+							<input type="hidden" class="address" name="address" />
+							<input type="file" name="files" required />
+							<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_UPLOAD');?>" class="btn btn-primary" /><br>
+							<?php $cMax    = $this->state->get('params')->get('upload_limit'); ?>
+							<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize($cMax . 'MB')); ?>
+							<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
+						</fieldset>
+					</form>
+					<br />
+					<?php if ($this->type != 'home'): ?>
+						<form method="post" action="<?php echo JRoute::_('index.php?option=com_templates&task=template.copyFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>"
+							  enctype="multipart/form-data" >
+							<fieldset>
+								<input type="hidden" class="address" name="address" />
+								<div class="control-group">
+									<label for="new_name" class="control-label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_FILE_NEW_NAME_DESC'); ?>"><?php echo JText::_('COM_TEMPLATES_FILE_NEW_NAME_LABEL')?></label>
+									<div class="controls">
+										<input type="text" id="new_name" name="new_name" required />
+									</div>
+								</div>
+								<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_COPY_FILE');?>" class="btn btn-primary" />
+							</fieldset>
+						</form>
+					<?php endif; ?>
+				</div>
+				<div class="width-50 fltlft">
+					<?php echo $this->loadTemplate('folders');?>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+			</div>
+		</fieldset>
+	</div>
+
+	<?php if ($this->type != 'home'): ?>
+		<form action="<?php echo JRoute::_('index.php?option=com_templates&task=template.resizeImage&id=' . $input->getInt('id') . '&file=' . $this->file); ?>"
+			  method="post" >
+			<div  id="resizeModal" class="modal hide fade">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h3><?php echo JText::_('COM_TEMPLATES_RESIZE_IMAGE'); ?></h3>
+				</div>
+				<div class="modal-body">
+					<div id="template-manager-css" class="form-horizontal">
+						<div class="control-group">
+							<label for="height" class="control-label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_IMAGE_HEIGHT'); ?>"><?php echo JText::_('COM_TEMPLATES_IMAGE_HEIGHT')?></label>
+							<div class="controls">
+								<input class="input-xlarge" type="number" name="height" placeholder="<?php echo $this->image['height']; ?> px" required />
+							</div>
+							<br />
+							<label for="width" class="control-label hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_IMAGE_WIDTH'); ?>"><?php echo JText::_('COM_TEMPLATES_IMAGE_WIDTH')?></label>
+							<div class="controls">
+								<input class="input-xlarge" type="number" name="width" placeholder="<?php echo $this->image['width']; ?> px" required />
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="btn" data-dismiss="modal"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></a>
+					<button class="btn btn-primary" type="submit"><?php echo JText::_('COM_TEMPLATES_BUTTON_RESIZE'); ?></button>
+				</div>
+			</div>
+			<?php echo JHtml::_('form.token'); ?>
+		</form>
+	<?php endif; ?>
+
+	<?php if ($this->type == 'home'): ?>
+		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+			<div id="home-box" style="text-align: justify;">
+				<h1><p><?php echo JText::_('COM_TEMPLATES_HOME_HEADING'); ?></p></h1>
+				<p><?php echo JText::_('COM_TEMPLATES_HOME_TEXT'); ?></p>
+				<p>
+					<a href="https://docs.joomla.org/Special:MyLanguage/J3.x:How_to_use_the_Template_Manager" target="_blank">
+						<?php echo JText::_('COM_TEMPLATES_HOME_BUTTON'); ?>
+					</a>
+				</p>
+			</div>
+		</form>
+	<?php endif; ?>
+	<?php if ($this->type == 'file'): ?>
+		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+			<fieldset class="adminform">
+				<legend><?php echo JText::_('COM_TEMPLATES_SOURCE_CODE');?></legend>
+				<p class="label"><?php echo JText::_('COM_TEMPLATES_TOGGLE_FULL_SCREEN'); ?></p>
+				<div class="clr"></div>
+				<div class="editor-border">
+					<?php echo $this->form->getInput('source'); ?>
+				</div>
+				<input type="hidden" name="task" value="" />
+				<?php echo JHtml::_('form.token'); ?>
+
+
+				<?php echo $this->form->getInput('extension_id'); ?>
+				<?php echo $this->form->getInput('filename'); ?>
+			</fieldset>
+		</form>
+	<?php endif; ?>
+	<?php if ($this->type == 'image'): ?>
+		<div id="image-box"><img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>" /></div>
+		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
+			<input type ="hidden" id="x" name="x" />
+			<input type ="hidden" id="y" name="y" />
+			<input type ="hidden" id="h" name="h" />
+			<input type ="hidden" id="w" name="w" />
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</form>
+	<?php endif; ?>
+	<?php if ($this->type == 'archive'): ?>
+		<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
+		<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+			<fieldset>
+				<ul class="nav nav-list">
+					<?php foreach ($this->archive as $file): ?>
+						<li>
+							<?php if (substr($file, -1) === DIRECTORY_SEPARATOR): ?>
+								<span class="icon-folder" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+							<?php endif; ?>
+							<?php if (substr($file, -1) != DIRECTORY_SEPARATOR): ?>
+								<span class="icon-file" aria-hidden="true"></span>&nbsp;<?php echo $file; ?>
+							<?php endif; ?>
+						</li>
+					<?php endforeach; ?>
+				</ul>
+			</fieldset>
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+
+		</form>
+	<?php endif; ?>
+	<?php if ($this->type == 'font'): ?>
+		<div class="font-preview">
+			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm" class="form-horizontal">
+				<fieldset class="adminform">
+					<legend><?php echo JText::_('COM_TEMPLATES_SOURCE_CODE');?></legend>
+					<p class="lead">H1</p><h1>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h1>
+					<p class="lead">H2</p><h2>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h2>
+					<p class="lead">H3</p><h3>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h3>
+					<p class="lead">H4</p><h4>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h4>
+					<p class="lead">H5</p><h5>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h5>
+					<p class="lead">H6</p> <h6>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </h6>
+					<p class="lead">Bold</p><b>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </b>
+					<p class="lead">Italics</p><i>Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML </i>
+					<p class="lead">Unordered List</p>
+					<ul>
+						<li>Item</li>
+						<li>Item</li>
+						<li>Item<br />
+							<ul>
+								<li>Item</li>
+								<li>Item</li>
+								<li>Item<br />
+									<ul>
+										<li>Item</li>
+										<li>Item</li>
+										<li>Item</li>
+									</ul>
+								</li>
+							</ul>
+						</li>
+					</ul>
+					<p class="lead">Ordered List</p>
+					<ol>
+						<li>Item</li>
+						<li>Item</li>
+						<li>Item<br />
+							<ul>
+								<li>Item</li>
+								<li>Item</li>
+								<li>Item<br />
+									<ul>
+										<li>Item</li>
+										<li>Item</li>
+										<li>Item</li>
+									</ul>
+								</li>
+							</ul>
+						</li>
+					</ol>
+					<input type="hidden" name="task" value="" />
+					<?php echo JHtml::_('form.token'); ?>
+				</fieldset>
+			</form>
+		</div>
+	<?php endif; ?>
+
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_TEMPLATES_TEMPLATE_DESCRIPTION');?></legend>
+
+		<?php echo $this->loadTemplate('description');?>
+	</fieldset>
+
+	<div class="clr"></div>
+</div>
+
+<div class="width-40 fltrt">
+
+	<?php if ($this->type != 'home'): ?>
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('COM_TEMPLATES_FILE_INFO');?></legend>
+			<?php if ($this->type == 'file'): ?>
+				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
+			<?php endif; ?>
+			<?php if ($this->type == 'image'): ?>
+				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
+			<?php endif; ?>
+			<?php if ($this->type == 'font'): ?>
+				<p><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
+			<?php endif; ?>
+		</fieldset>
+	<?php endif; ?>
+
+	<fieldset class="adminform">
+		<legend><?php echo JText::_('COM_TEMPLATES_TEMPLATE_FILES');?></legend>
+
+		<?php echo $this->loadTemplate('tree');?>
+	</fieldset>
+
+	<?php echo JHtml::_('sliders.start', 'content-sliders', array('useCookie' => 1)); ?>
+	<?php echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_TEMPLATE_COPY'), 'template-copy'); ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_templates&task=template.copy&id=' . $input->getInt('id') . '&file=' . $this->file); ?>"
+		  method="post" name="adminForm" id="adminForm">
+		<fieldset class="panelform">
+			<label id="new_name" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NEW_NAME_DESC'); ?>"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NEW_NAME_LABEL')?></label>
+			<input type="text" id="new_name" name="new_name"  />
+			<button type="submit"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_COPY'); ?></button>
+		</fieldset>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+	<?php if ($this->type != 'home'): ?>
+		<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_BUTTON_RENAME'), 'file-rename'); ?>
+		<form action="<?php echo JRoute::_('index.php?option=com_templates&task=template.renameFile&id=' . $input->getInt('id') . '&file=' . $this->file); ?>"
+			  method="post" name="adminForm" id="adminForm">
+			<fieldset class="panelform">
+				<label id="new_name" class="hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_TEMPLATES_NEW_FILE_NAME')); ?>"><?php echo JText::_('COM_TEMPLATES_NEW_FILE_NAME')?></label>
+				<input type="text" name="new_name"  />
+				<button type="submit"><?php echo JText::_('COM_TEMPLATES_BUTTON_RENAME'); ?></button>
+			</fieldset>
+			<?php echo JHtml::_('form.token'); ?>
+		</form>
+	<?php endif; ?>
+	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_MODULES'), 'override-module'); ?>
+	<fieldset class="panelform">
+		<ul class="adminformlist">
+			<?php foreach ($this->overridesList['modules'] as $module): ?>
+				<li>
+					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $module->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+						<span class="icon-copy"></span>&nbsp;<?php echo $module->name; ?>
+					</a>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_COMPONENTS'), 'override-component'); ?>
+	<fieldset class="panelform">
+		<ul class="adminformlist">
+			<?php foreach ($this->overridesList['components'] as $key => $value): ?>
+				<li class="component-folder">
+					<a href="#" class="component-folder-url">
+						<span class="icon-folder"></span>&nbsp;<?php echo $key; ?>
+					</a>
+					<ul class="adminformList">
+						<?php foreach ($value as $view): ?>
+							<li>
+								<a class="component-file-url" href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $view->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+									<span class="icon-copy"></span>&nbsp;<?php echo $view->name; ?>
+								</a>
+							</li>
+						<?php endforeach; ?>
+					</ul>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+	<?php  echo JHtml::_('sliders.panel', JText::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'), 'override-layout'); ?>
+	<fieldset class="panelform">
+		<ul class="adminformlist">
+			<?php foreach ($this->overridesList['layouts'] as $layout): ?>
+				<li>
+					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&task=template.overrides&folder=' . $layout->path . '&id=' . $input->getInt('id') . '&file=' . $this->file); ?>">
+						<span class="icon-copy"></span>&nbsp;<?php echo $layout->name; ?>
+					</a>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+	<?php echo JHtml::_('sliders.end'); ?>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_templates/template/default_description.php b/core/administrator/templates/hathor/html/com_templates/template/default_description.php
new file mode 100644
index 00000000..49065c6e
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/template/default_description.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<div class="pull-left">
+	<?php echo JHtml::_('templates.thumb', $this->template->element, $this->template->client_id); ?>
+	<?php echo JHtml::_('templates.thumbModal', $this->template->element, $this->template->client_id); ?>
+</div>
+<h2><?php echo ucfirst($this->template->element); ?></h2>
+<?php $client = JApplicationHelper::getClientInfo($this->template->client_id); ?>
+<p><?php $this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $this->template->element);?></p>
+<p><?php  echo JText::_($this->template->xmldata->description); ?></p>
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/html/com_templates/template/default_folders.php b/core/administrator/templates/hathor/html/com_templates/template/default_folders.php
new file mode 100644
index 00000000..ad09e865
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/template/default_folders.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+ksort($this->files, SORT_STRING);
+?>
+
+<ul class='nav nav-list directory-tree'>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
+			<li class="folder-select">
+				<a class='folder-url nowrap' data-id='<?php echo base64_encode($key); ?>' href=''>
+					<span class='icon-folder-close'>&nbsp;<?php $explodeArray = explode('/', $key); echo end($explodeArray); ?></span>
+				</a>
+				<?php echo $this->folderTree($value); ?>
+			</li>
+		<?php endif; ?>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/templates/hathor/html/com_templates/template/default_tree.php b/core/administrator/templates/hathor/html/com_templates/template/default_tree.php
new file mode 100644
index 00000000..fcb49685
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/template/default_tree.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+ksort($this->files, SORT_STRING);
+?>
+
+<ul class='nav nav-list directory-tree'>
+	<?php foreach ($this->files as $key => $value): ?>
+		<?php if (is_array($value)): ?>
+			<?php
+			$keyArray  = explode('/', $key);
+			$fileArray = explode('/', $this->fileName);
+			$count     = 0;
+
+			$keyArrayCount = count($keyArray);
+
+			if (count($fileArray) >= $keyArrayCount)
+			{
+				for ($i = 0; $i < $keyArrayCount; $i++)
+				{
+					if ($keyArray[$i] === $fileArray[$i])
+					{
+						$count++;
+					}
+				}
+
+				if ($count === $keyArrayCount)
+				{
+					$class = 'folder show';
+				}
+				else
+				{
+					$class = 'folder';
+				}
+			}
+			else
+			{
+				$class = 'folder';
+			}
+
+			?>
+			<li class="<?php echo $class; ?>">
+				<a class='folder-url nowrap' href=''>
+					<span class='icon-folder-close'>&nbsp;<?php $explodeArray = explode('/', $key); echo end($explodeArray); ?></span>
+				</a>
+				<?php echo $this->directoryTree($value); ?>
+			</li>
+		<?php endif; ?>
+		<?php if (is_object($value)): ?>
+			<li>
+				<a class="file nowrap" href='<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $this->id . '&file=' . $value->id) ?>'>
+					<span class='icon-file'>&nbsp;<?php echo $value->name; ?></span>
+				</a>
+			</li>
+		<?php endif; ?>
+	<?php endforeach; ?>
+</ul>
diff --git a/core/administrator/templates/hathor/html/com_templates/templates/default.php b/core/administrator/templates/hathor/html/com_templates/templates/default.php
new file mode 100644
index 00000000..b8939a0b
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_templates/templates/default.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_templates&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+		<div class="filter-select">
+			<label class="selectlabel" for="client_id">
+				<?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?>
+			</label>
+			<select name="client_id" id="client_id">
+				<?php echo JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('client_id'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist" id="template-mgr">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					&#160;
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'JCLIENT', 'a.client_id', $listDirn, $listOrder); ?>
+				</th>
+				<th class="center width-10">
+					<?php echo JText::_('JVERSION'); ?>
+				</th>
+				<th class="width-15">
+					<?php echo JText::_('JDATE'); ?>
+				</th>
+				<th class="width-25">
+					<?php echo JText::_('JAUTHOR'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center">
+					<?php echo JHtml::_('templates.thumb', $item->element, $item->client_id); ?>
+				</td>
+				<td class="template-name">
+					<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&id='.(int) $item->extension_id . '&file=' . $this->file); ?>">
+						<?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_DETAILS', $item->name); ?></a>
+					<p>
+					<?php if ($this->preview && $item->client_id == '0') : ?>
+						<a href="<?php echo JUri::root().'index.php?tp=1&template='.$item->element; ?>" target="_blank">
+							<?php echo JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?></a>
+					<?php elseif ($item->client_id == '1') : ?>
+						<?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>
+					<?php else: ?>
+						<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC'); ?>">
+							<?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
+					<?php endif; ?>
+					</p>
+				</td>
+				<td class="center">
+					<?php echo $item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->xmldata->get('version')); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->xmldata->get('creationDate')); ?>
+				</td>
+				<td>
+					<?php if ($author = $item->xmldata->get('author')) : ?>
+						<p><?php echo $this->escape($author); ?></p>
+					<?php else : ?>
+						&mdash;
+					<?php endif; ?>
+					<?php if ($email = $item->xmldata->get('authorEmail')) : ?>
+						<p><?php echo $this->escape($email); ?></p>
+					<?php endif; ?>
+					<?php if ($url = $item->xmldata->get('authorUrl')) : ?>
+						<p><a href="<?php echo $this->escape($url); ?>">
+							<?php echo $this->escape($url); ?></a></p>
+					<?php endif; ?>
+				</td>
+				<?php echo JHtml::_('templates.thumbModal', $item->element, $item->client_id); ?>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/debuggroup/default.php b/core/administrator/templates/hathor/html/com_users/debuggroup/default.php
new file mode 100644
index 00000000..123fc7e4
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/debuggroup/default.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=debuggroup&group_id='.(int) $this->state->get('group_id'));?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_ASSETS'); ?></legend>
+		<div class="filter-search fltlft">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_ASSETS'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_USERS'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_RESET'); ?></button>
+		</div>
+
+		<div class="filter-select fltrt">
+			<label class="selectlabel" for="filter_component"><?php echo JText::_('COM_USERS_OPTION_SELECT_COMPONENT'); ?></label>
+			<select name="filter_component" id="filter_component">
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_SELECT_COMPONENT');?></option>
+				<?php if (!empty($this->components))
+				{
+					echo JHtml::_('select.options', $this->components, 'value', 'text', $this->state->get('filter.component'));
+				}?>
+			</select>
+
+			<label class="selectlabel" for="filter_level_start"><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_START'); ?></label>
+			<select name="filter_level_start" id="filter_level_start">
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_START');?></option>
+				<?php echo JHtml::_('select.options', $this->levels, 'value', 'text', $this->state->get('filter.level_start'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_level_end"><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_END'); ?></label>
+			<select name="filter_level_end" id="filter_level_end">
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_END');?></option>
+				<?php echo JHtml::_('select.options', $this->levels, 'value', 'text', $this->state->get('filter.level_end'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+
+	</fieldset>
+	<div class="clr"> </div>
+
+	<div>
+		<?php echo JText::_('COM_USERS_DEBUG_LEGEND'); ?>
+		<span class="check-0 swatch"><?php echo JText::sprintf('COM_USERS_DEBUG_IMPLICIT_DENY', '-');?></span>
+		<span class="check-a swatch"><?php echo JText::sprintf('COM_USERS_DEBUG_EXPLICIT_ALLOW', '&#10003;');?></span>
+		<span class="check-d swatch"><?php echo JText::sprintf('COM_USERS_DEBUG_EXPLICIT_DENY', '&#10007;');?></span>
+	</div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="left">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="left">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<?php foreach ($this->actions as $key => $action) : ?>
+				<th class="width-5">
+					<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', $key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
+				</th>
+				<?php endforeach; ?>
+				<th class="width-5 nowrap">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5 nowrap">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row1">
+				<td>
+					<?php echo $this->escape($item->title); ?>
+				</td>
+				<td class="nowrap">
+					<?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level) ?>
+					<?php echo $this->escape($item->name); ?>
+				</td>
+				<?php foreach ($this->actions as $action) : ?>
+					<?php
+					$name  = $action[0];
+					$check = $item->checks[$name];
+					if ($check === true) :
+						$class = 'check-a';
+						$text  = '&#10003;';
+					elseif ($check === false) :
+						$class = 'check-d';
+						$text  = '&#10007;';
+					elseif ($check === null) :
+						$class = 'check-0';
+						$text  = '-';
+					else :
+						$class = '';
+						$text  = '&#160;';
+					endif;
+					?>
+				<td class="center <?php echo $class;?>">
+					<?php echo $text; ?>
+				</td>
+				<?php endforeach; ?>
+				<td class="center">
+					<?php echo (int) $item->lft; ?>
+					- <?php echo (int) $item->rgt; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/debuguser/default.php b/core/administrator/templates/hathor/html/com_users/debuguser/default.php
new file mode 100644
index 00000000..432b3a7f
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/debuguser/default.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=debuguser&user_id=' . (int) $this->state->get('user_id')); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_ASSETS'); ?></legend>
+		<div class="filter-search fltlft">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_ASSETS'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_USERS'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_RESET'); ?></button>
+		</div>
+
+		<div class="filter-select fltrt">
+			<label class="selectlabel" for="filter_component"><?php echo JText::_('COM_USERS_OPTION_SELECT_COMPONENT'); ?></label>
+			<select name="filter_component" id="filter_component">
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_SELECT_COMPONENT');?></option>
+				<?php if (!empty($this->components))
+				{
+					echo JHtml::_('select.options', $this->components, 'value', 'text', $this->state->get('filter.component'));
+				}?>
+			</select>
+
+			<label class="selectlabel" for="filter_level_start"><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_START'); ?></label>
+			<select name="filter_level_start" id="filter_level_start">
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_START');?></option>
+				<?php echo JHtml::_('select.options', $this->levels, 'value', 'text', $this->state->get('filter.level_start'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_level_end"><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_END'); ?></label>
+			<select name="filter_level_end" id="filter_level_end">
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_SELECT_LEVEL_END');?></option>
+				<?php echo JHtml::_('select.options', $this->levels, 'value', 'text', $this->state->get('filter.level_end'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+
+	</fieldset>
+	<div class="clr"> </div>
+
+	<div>
+		<?php echo JText::_('COM_USERS_DEBUG_LEGEND'); ?>
+		<span class="check-0 swatch"><?php echo JText::sprintf('COM_USERS_DEBUG_IMPLICIT_DENY', '-');?></span>
+		<span class="check-a swatch"><?php echo JText::sprintf('COM_USERS_DEBUG_EXPLICIT_ALLOW', '&#10003;');?></span>
+		<span class="check-d swatch"><?php echo JText::sprintf('COM_USERS_DEBUG_EXPLICIT_DENY', '&#10007;');?></span>
+	</div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="left">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="left">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ASSET_NAME', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<?php foreach ($this->actions as $key => $action) : ?>
+				<th class="width-5">
+					<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', $key, $action[1]); ?>"><?php echo JText::_($key); ?></span>
+				</th>
+				<?php endforeach; ?>
+				<th class="width-5 nowrap">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LFT', 'a.lft', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5 nowrap">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<tr class="row1">
+				<th>
+					<?php echo $this->escape($item->title); ?>
+				</th>
+				<td class="nowrap">
+					<?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level) ?>
+					<?php echo $this->escape($item->name); ?>
+				</td>
+				<?php foreach ($this->actions as $action) : ?>
+					<?php
+					$name  = $action[0];
+					$check = $item->checks[$name];
+					if ($check === true) :
+						$class = 'check-a';
+						$text  = '&#10003;';
+					elseif ($check === false) :
+						$class = 'check-d';
+						$text  = '&#10007;';
+					elseif ($check === null) :
+						$class = 'check-0';
+						$text  = '-';
+					else :
+						$class = '';
+						$text  = '&#160;';
+					endif;
+					?>
+				<td class="center <?php echo $class;?>">
+					<?php echo $text; ?>
+				</td>
+				<?php endforeach; ?>
+				<td class="center">
+					<?php echo (int) $item->lft; ?>
+					- <?php echo (int) $item->rgt; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/groups/default.php b/core/administrator/templates/hathor/html/com_users/groups/default.php
new file mode 100644
index 00000000..4b55f176
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/groups/default.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+JText::script('COM_USERS_GROUPS_CONFIRM_DELETE');
+
+$groupsWithUsers = array();
+
+foreach ($this->items as $i => $item)
+{
+	if ($item->user_count > 0)
+	{
+		$groupsWithUsers[] = $i;
+	}
+}
+JFactory::getDocument()->addScriptDeclaration('
+		Joomla.submitbutton = function(task) {
+			if (task == "groups.delete") {
+				var f = document.adminForm;
+				var cb = "";
+				var groupsWithUsers = [' . implode(',', $groupsWithUsers) . '];
+				for (index = 0; index < groupsWithUsers.length; ++index) {
+					cb = f["cb" + groupsWithUsers[index]];
+					if (cb && cb.checked) {
+						if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) {
+							Joomla.submitform(task);
+						}
+						return;
+					}
+				}
+			}
+			Joomla.submitform(task);
+		};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=groups');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_GROUPS_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_GROUPS_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_IN_GROUPS'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JText::_('COM_USERS_HEADING_GROUP_TITLE'); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JText::_('COM_USERS_HEADING_USERS_IN_GROUP'); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JText::_('JGRID_HEADING_ID'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$canCreate = $user->authorise('core.create', 'com_users');
+			$canEdit   = $user->authorise('core.edit',   'com_users');
+			// If this group is super admin and this user is not super admin, $canEdit is false
+			if (!$user->authorise('core.admin') && JAccess::checkGroup($item->id, 'core.admin'))
+			{
+				$canEdit = false;
+			}
+			$canChange = $user->authorise('core.edit.state',	'com_users');
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php if ($canEdit) : ?>
+						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					<?php endif; ?>
+				</td>
+				<td>
+					<?php echo str_repeat('<span class="gi">|&mdash;</span>', $item->level) ?>
+					<?php if ($canEdit) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_users&task=group.edit&id='.$item->id);?>">
+						<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<?php if (JDEBUG) : ?>
+						<div class="fltrt"><div class="button2-left smallsub"><div class="blank"><a href="<?php echo JRoute::_('index.php?option=com_users&view=debuggroup&group_id='.(int) $item->id);?>">
+						<?php echo JText::_('COM_USERS_DEBUG_GROUP');?></a></div></div></div>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $item->user_count ?: ''; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/levels/default.php b/core/administrator/templates/hathor/html/com_users/levels/default.php
new file mode 100644
index 00000000..e902eb66
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/levels/default.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$user      = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_users');
+$saveOrder = $listOrder == 'a.ordering';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=levels'); ?>" method="post" id="adminForm" name="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_ACCESS_LEVELS'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_ACCESS_LEVELS'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_TITLE_LEVELS'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_RESET'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LEVEL_NAME', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'levels.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JText::_('JGRID_HEADING_ID'); ?>
+				</th>
+				<th class="width-40">
+					&#160;
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering  = ($listOrder == 'a.ordering');
+			$canCreate = $user->authorise('core.create',     'com_users');
+			$canEdit   = $user->authorise('core.edit',       'com_users');
+			$canChange = $user->authorise('core.edit.state', 'com_users');
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($canEdit) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_users&task=level.edit&id='.$item->id); ?>">
+						<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) :?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, true, 'levels.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, true, 'levels.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ?  '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+				<td>
+					&#160;
+				</td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/note/edit.php b/core/administrator/templates/hathor/html/com_users/note/edit.php
new file mode 100644
index 00000000..b0a9a342
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/note/edit.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration('
+jQuery(document).ready(function() {
+	Joomla.submitbutton = function(task)
+	{
+		if (task == "note.cancel" || document.formvalidator.isValid(document.getElementById("note-form")))
+		{
+			' . $this->form->getField('body')->save() . '
+			Joomla.submitform(task, document.getElementById("note-form"));
+		}
+	}
+});');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=note&id=' . (int) $this->item->id);?>" method="post" name="adminForm" id="note-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('COM_USERS_NEW_NOTE') : JText::sprintf('COM_USERS_EDIT_NOTE', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+				<li>
+					<?php echo $this->form->getLabel('subject'); ?>
+					<?php echo $this->form->getInput('subject'); ?>
+				</li>
+				<li>
+					<div class="clr"></div>
+					<?php echo $this->form->getLabel('user_id'); ?>
+					<?php echo $this->form->getInput('user_id'); ?>
+				</li>
+				<li>
+					<?php echo $this->form->getLabel('catid'); ?>
+					<?php echo $this->form->getInput('catid'); ?>
+				</li>
+				<li>
+					<?php echo $this->form->getLabel('state'); ?>
+					<?php echo $this->form->getInput('state'); ?>
+				</li>
+				<li>
+					<?php echo $this->form->getLabel('review_time'); ?>
+					<?php echo $this->form->getInput('review_time'); ?>
+				</li>
+				<li>
+					<?php echo $this->form->getLabel('version_note'); ?>
+					<?php echo $this->form->getInput('version_note'); ?>
+				</li>
+			</ul>
+			<div class="clr"></div>
+			<?php echo $this->form->getLabel('body'); ?>
+			<div class="clr"></div>
+			<div class="editor">
+				<?php echo $this->form->getInput('body'); ?>
+			</div>
+
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</fieldset>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/notes/default.php b/core/administrator/templates/hathor/html/com_users/notes/default.php
new file mode 100644
index 00000000..45fc64f7
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/notes/default.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$user = JFactory::getUser();
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+$canEdit = $user->authorise('core.edit', 'com_users');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=notes');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_IN_NOTE_TITLE'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_IN_NOTE_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<span class="faux-label"><?php echo JText::_('COM_USERS_FILTER_LABEL'); ?></span>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id" >
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY');?></option>
+				<?php
+				echo JHtml::_(
+					'select.options', JHtml::_('category.options', 'com_users'),
+					'value', 'text', $this->state->get('filter.category_id')
+				); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
+				<?php
+				echo JHtml::_(
+					'select.options', JHtml::_('jgrid.publishedOptions'),
+					'value', 'text', $this->state->get('filter.published'), true
+				); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="toggle" value="" class="checklist-toggle" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="width-15">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_USER_HEADING', 'u.name', $listDirn, $listOrder); ?>
+				</th>
+				<th  class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_SUBJECT_HEADING', 'a.subject', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-20">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_CATEGORY_HEADING', 'c.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-10">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_REVIEW_HEADING', 'a.review_time', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+		<tbody>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<?php $canChange = $user->authorise('core.edit.state',	'com_users'); ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td class="center checklist">
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_users&task=note.edit&id='.$item->id);?>">
+							<?php echo $this->escape($item->user_name); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->user_name); ?>
+					<?php endif; ?>
+				</td>
+				<td>
+					<?php if ($item->subject) : ?>
+						<?php echo $this->escape($item->subject); ?>
+					<?php else : ?>
+						<?php echo JText::_('COM_USERS_EMPTY_SUBJECT'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php if ($item->catid && $item->cparams->get('image')) : ?>
+					<?php echo JHtml::_('users.image', $item->cparams->get('image')); ?>
+					<?php endif; ?>
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'notes.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php if ($item->review_time !== JFactory::getDbo()->getNullDate()) : ?>
+						<?php echo JHtml::_('date', $item->review_time, JText::_('DATE_FORMAT_LC4')); ?>
+					<?php else : ?>
+						<?php echo JText::_('COM_USERS_EMPTY_REVIEW'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/user/edit.php b/core/administrator/templates/hathor/html/com_users/user/edit.php
new file mode 100644
index 00000000..91bdd990
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/user/edit.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+
+// Get the form fieldsets.
+$fieldsets = $this->form->getFieldsets();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'user.cancel' || document.formvalidator.isValid(document.getElementById('user-form')))
+		{
+			Joomla.submitform(task, document.getElementById('user-form'));
+		}
+	}
+
+	Joomla.twoFactorMethodChange = function(e)
+	{
+		var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val();
+
+		jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) {
+			if (el.id != selectedPane)
+			{
+				jQuery('#' + el.id).hide(0);
+			}
+			else
+			{
+				jQuery('#' + el.id).show(0);
+			}
+		});
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="user-form" class="form-validate" enctype="multipart/form-data">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo JText::_('COM_USERS_USER_ACCOUNT_DETAILS'); ?></legend>
+			<ul class="adminformlist">
+			<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
+				<li><?php echo $field->label; ?>
+				<?php echo $field->input; ?></li>
+			<?php endforeach; ?>
+			</ul>
+		</fieldset>
+	</div>
+	<div class="col options-section">
+		<?php echo  JHtml::_('sliders.start', 'user-slider', array('useCookie' => 1)); ?>
+		<?php if ($this->grouplist) : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_USERS_ASSIGNED_GROUPS'), 'groups'); ?>
+			<fieldset class="panelform">
+				<legend class="element-invisible"><?php echo JText::_('COM_USERS_ASSIGNED_GROUPS'); ?></legend>
+				<?php echo $this->loadTemplate('groups'); ?>
+			</fieldset>
+		<?php endif; ?>
+		<?php
+		foreach ($fieldsets as $fieldset) :
+			if ($fieldset->name == 'user_details') :
+				continue;
+			endif;
+			echo JHtml::_('sliders.panel', JText::_($fieldset->label), $fieldset->name);
+		?>
+		<fieldset class="panelform">
+			<ul class="adminformlist">
+				<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
+					<?php if ($field->hidden) : ?>
+						<?php echo $field->input; ?>
+					<?php else : ?>
+						<li><?php echo $field->label; ?>
+						<?php echo $field->input; ?></li>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</ul>
+		</fieldset>
+		<?php endforeach; ?>
+
+		<?php if (!empty($this->tfaform) && $this->item->id): ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('COM_USERS_USER_TWO_FACTOR_AUTH'), 'twofactorauth'); ?>
+		<div class="control-group">
+			<div class="control-label">
+				<label id="jform_twofactor_method-lbl" for="jform_twofactor_method" class="hasTooltip"
+						title="<?php echo '<strong>' . JText::_('COM_USERS_USER_FIELD_TWOFACTOR_LABEL') . '</strong><br />' . JText::_('COM_USERS_USER_FIELD_TWOFACTOR_DESC'); ?>">
+					<?php echo JText::_('COM_USERS_USER_FIELD_TWOFACTOR_LABEL'); ?>
+				</label>
+			</div>
+			<div class="controls">
+				<?php echo JHtml::_('select.genericlist', Usershelper::getTwoFactorMethods(), 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange()'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false) ?>
+			</div>
+		</div>
+		<div id="com_users_twofactor_forms_container">
+			<?php foreach ($this->tfaform as $form): ?>
+			<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
+			<div id="com_users_twofactor_<?php echo $form['method'] ?>" style="<?php echo $style; ?>">
+				<?php echo $form['form'] ?>
+			</div>
+			<?php endforeach; ?>
+		</div>
+
+		<fieldset>
+			<legend>
+				<?php echo JText::_('COM_USERS_USER_OTEPS') ?>
+			</legend>
+			<div class="alert alert-info">
+				<?php echo JText::_('COM_USERS_USER_OTEPS_DESC') ?>
+			</div>
+			<?php if (empty($this->otpConfig->otep)): ?>
+			<div class="alert alert-warning">
+				<?php echo JText::_('COM_USERS_USER_OTEPS_WAIT_DESC') ?>
+			</div>
+			<?php else: ?>
+			<?php foreach ($this->otpConfig->otep as $otep): ?>
+			<span class="span3">
+				<?php echo substr($otep, 0, 4) ?>-<?php echo substr($otep, 4, 4) ?>-<?php echo substr($otep, 8, 4) ?>-<?php echo substr($otep, 12, 4) ?>
+			</span>
+			<?php endforeach; ?>
+			<div class="clearfix"></div>
+			<?php endif; ?>
+		</fieldset>
+		<?php endif; ?>
+
+		<?php echo JHtml::_('sliders.end'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/users/default.php b/core/administrator/templates/hathor/html/com_users/users/default.php
new file mode 100644
index 00000000..5b96c115
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/users/default.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+$loggeduser = JFactory::getUser();
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=users');?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('COM_USERS_SEARCH_USERS'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('COM_USERS_SEARCH_USERS'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_USERS'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_RESET'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<span class="faux-label"><?php echo JText::_('COM_USERS_FILTER_LABEL'); ?></span>
+
+			<label class="selectlabel" for="filter_state">
+				<?php echo JText::_('COM_USERS_FILTER_LABEL'); ?>
+			</label>
+			<select name="filter_state" id="filter_state">
+				<option value="*"><?php echo JText::_('COM_USERS_FILTER_STATE');?></option>
+				<?php echo JHtml::_('select.options', UsersHelper::getStateOptions(), 'value', 'text', $this->state->get('filter.state'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_active">
+				<?php echo JText::_('COM_USERS_FILTER_ACTIVE'); ?>
+			</label>
+			<select name="filter_active" id="filter_active">
+				<option value="*"><?php echo JText::_('COM_USERS_FILTER_ACTIVE');?></option>
+				<?php echo JHtml::_('select.options', UsersHelper::getActiveOptions(), 'value', 'text', $this->state->get('filter.active'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_group_id">
+				<?php echo JText::_('COM_USERS_FILTER_USERGROUP'); ?>
+			</label>
+			<select name="filter_group_id" id="filter_group_id">
+				<option value=""><?php echo JText::_('COM_USERS_FILTER_USERGROUP');?></option>
+				<?php echo JHtml::_('select.options', UsersHelper::getGroups(), 'value', 'text', $this->state->get('filter.group_id'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_lastvisitrange">
+				<?php echo JText::_('COM_USERS_OPTION_FILTER_LAST_VISIT_DATE'); ?>
+			</label>
+			<select name="filter_lastvisitrange" id="filter_lastvisitrange" >
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_FILTER_LAST_VISIT_DATE');?></option>
+				<?php echo JHtml::_('select.options', Usershelper::getRangeOptions(), 'value', 'text', $this->state->get('filter.lastvisitrange'));?>
+			</select>
+
+			<label class="selectlabel" for="filter_range">
+				<?php echo JText::_('COM_USERS_OPTION_FILTER_DATE'); ?>
+			</label>
+			<select name="filter_range" id="filter_range" >
+				<option value=""><?php echo JText::_('COM_USERS_OPTION_FILTER_DATE');?></option>
+				<?php echo JHtml::_('select.options', Usershelper::getRangeOptions(), 'value', 'text', $this->state->get('filter.range'));?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-10">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ENABLED', 'a.block', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-5">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_ACTIVATED', 'a.activation', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-10">
+					<?php echo JText::_('COM_USERS_HEADING_GROUPS'); ?>
+				</th>
+				<th class="nowrap width-15">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_EMAIL', 'a.email', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-15">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LAST_VISIT_DATE', 'a.lastvisitDate', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width-15">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_REGISTRATION_DATE', 'a.registerDate', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$canEdit   = $this->canDo->get('core.edit');
+			$canChange = $loggeduser->authorise('core.edit.state',	'com_users');
+
+			// If this group is super admin and this user is not super admin, $canEdit is false
+			if ((!$loggeduser->authorise('core.admin')) && JAccess::check($item->id, 'core.admin'))
+			{
+				$canEdit   = false;
+				$canChange = false;
+			}
+		?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php if ($canEdit) : ?>
+						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					<?php endif; ?>
+				</td>
+				<td class="break-word">
+					<div class="fltrt">
+						<?php echo JHtml::_('users.filterNotes', $item->note_count, $item->id); ?>
+						<?php echo JHtml::_('users.notes', $item->note_count, $item->id); ?>
+						<?php echo JHtml::_('users.addNote', $item->id); ?>
+						<?php if ($item->requireReset == '1') : ?>
+						<span class="label label-warning"><?php echo JText::_('COM_USERS_PASSWORD_RESET_REQUIRED'); ?></span>
+						<?php endif; ?>
+						<?php echo JHtml::_('users.notesModal', $item->note_count, $item->id); ?>
+					</div>
+					<?php if ($canEdit) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_users&task=user.edit&id='.(int) $item->id); ?>" title="<?php echo JText::sprintf('COM_USERS_EDIT_USER', $this->escape($item->name)); ?>">
+						<?php echo $this->escape($item->name); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($item->name); ?>
+					<?php endif; ?>
+					<?php if (JDEBUG) : ?>
+						<div class="fltrt"><div class="button2-left smallsub"><div class="blank"><a href="<?php echo JRoute::_('index.php?option=com_users&view=debuguser&user_id='.(int) $item->id);?>">
+						<?php echo JText::_('COM_USERS_DEBUG_USER');?></a></div></div></div>
+					<?php endif; ?>
+				</td>
+				<td class="center break-word">
+					<?php echo $this->escape($item->username); ?>
+				</td>
+				<td class="center">
+					<?php if ($canChange) : ?>
+						<?php if ($loggeduser->id != $item->id) : ?>
+							<?php echo JHtml::_('grid.boolean', $i, !$item->block, 'users.unblock', 'users.block'); ?>
+						<?php else : ?>
+							<?php echo JHtml::_('grid.boolean', $i, !$item->block, 'users.block', null); ?>
+						<?php endif; ?>
+					<?php else : ?>
+						<?php echo JText::_($item->block ? 'JNO' : 'JYES'); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('grid.boolean', $i, !$item->activation, 'users.activate', null); ?>
+				</td>
+				<td class="center">
+					<?php if (substr_count($item->group_names, "\n") > 1) : ?>
+						<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', JText::_('COM_USERS_HEADING_GROUPS'), nl2br($item->group_names), 0); ?>"><?php echo JText::_('COM_USERS_USERS_MULTIPLE_GROUPS'); ?></span>
+					<?php else : ?>
+						<?php echo nl2br($item->group_names); ?>
+					<?php endif; ?>
+				</td>
+				<td class="center break-word">
+					<?php echo $this->escape($item->email); ?>
+				</td>
+				<td class="center">
+					<?php if ($item->lastvisitDate != $this->db->getNullDate()) : ?>
+						<?php echo JHtml::_('date', $item->lastvisitDate, JText::_('DATE_FORMAT_LC6')); ?>
+					<?php else:?>
+						<?php echo JText::_('JNEVER'); ?>
+					<?php endif;?>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('date', $item->registerDate, JText::_('DATE_FORMAT_LC6')); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php // Load the batch processing form if user is allowed ?>
+	<?php if ($loggeduser->authorise('core.create', 'com_users')
+		&& $loggeduser->authorise('core.edit', 'com_users')
+		&& $loggeduser->authorise('core.edit.state', 'com_users')) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title'  => JText::_('COM_USERS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer'),
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif;?>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="boxchecked" value="0" />
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_users/users/modal.php b/core/administrator/templates/hathor/html/com_users/users/modal.php
new file mode 100644
index 00000000..c27d299c
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_users/users/modal.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$input     = JFactory::getApplication()->input;
+$field     = $input->getCmd('field');
+$function  = 'jSelectUser_'.$field;
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_users&view=users&layout=modal&tmpl=component&groups=' . $input->get('groups', '', 'BASE64') . '&excluded=' . $input->get('excluded', '', 'BASE64'));?>" method="post" name="adminForm" id="adminForm">
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_USERS_SEARCH_IN_NAME'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+			<button type="button" data-user-value="" data-user-name="<?php echo $this->escape(JText::_('JLIB_FORM_SELECT_USER')); ?>" data-user-field="<?php echo $this->escape($field);?>"
+				onclick="if (window.parent) window.parent.jSelectUser(this);"><?php echo JText::_('JOPTION_NO_USER')?></button>
+		</div>
+
+		<div class="filter-select">
+			<label for="filter_group_id">
+				<?php echo JText::_('COM_USERS_FILTER_USER_GROUP'); ?>
+			</label>
+			<?php echo JHtml::_('access.usergroup', 'filter_group_id', $this->state->get('filter.group_id')); ?>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+
+	<table class="adminlist modal">
+		<thead>
+			<tr>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_NAME', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width=25">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_USERNAME', 'a.username', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap width=25">
+					<?php echo JText::_('COM_USERS_HEADING_GROUPS'); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php
+			$i = 0;
+			foreach ($this->items as $item) : ?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<a class="pointer"
+						data-user-value="<?php echo $item->id; ?>" data-user-name="<?php echo $this->escape($item->name); ?>" data-user-field="<?php echo $this->escape($field);?>"
+						onclick="if (window.parent) window.parent.jSelectUser(this);">
+						<?php echo $item->name; ?></a>
+				</td>
+				<td class="center">
+					<?php echo $item->username; ?>
+				</td>
+				<td class="title">
+					<?php echo nl2br($item->group_names); ?>
+				</td>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+
+	<?php echo $this->pagination->getListFooter(); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/core/administrator/templates/hathor/html/com_weblinks/weblink/edit.php b/core/administrator/templates/hathor/html/com_weblinks/weblink/edit.php
new file mode 100644
index 00000000..082e0dbb
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_weblinks/weblink/edit.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+$saveHistory = $this->state->get('params')->get('save_history', 0);
+
+JHtml::_('behavior.formvalidator');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'weblink.cancel' || document.formvalidator.isValid(document.id('weblink-form')))
+		{
+			" . $this->form->getField('description')->save() . "
+			Joomla.submitform(task, document.getElementById('weblink-form'));
+		}
+	}
+");
+?>
+<div class="weblink-edit">
+
+<form action="<?php echo JRoute::_('index.php?option=com_weblinks&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="weblink-form" class="form-validate">
+	<div class="col main-section">
+		<fieldset class="adminform">
+			<legend><?php echo empty($this->item->id) ? JText::_('COM_WEBLINKS_NEW_WEBLINK') : JText::sprintf('COM_WEBLINKS_EDIT_WEBLINK', $this->item->id); ?></legend>
+			<ul class="adminformlist">
+				<li><?php echo $this->form->getLabel('title'); ?>
+				<?php echo $this->form->getInput('title'); ?></li>
+
+				<li><?php echo $this->form->getLabel('alias'); ?>
+				<?php echo $this->form->getInput('alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('url'); ?>
+				<?php echo $this->form->getInput('url'); ?></li>
+
+				<li><?php echo $this->form->getLabel('catid'); ?>
+				<?php echo $this->form->getInput('catid'); ?></li>
+
+				<li><?php echo $this->form->getLabel('state'); ?>
+				<?php echo $this->form->getInput('state'); ?></li>
+
+				<li><?php echo $this->form->getLabel('access'); ?>
+				<?php echo $this->form->getInput('access'); ?></li>
+
+				<li><?php echo $this->form->getLabel('ordering'); ?>
+				<?php echo $this->form->getInput('ordering'); ?></li>
+
+				<li><?php echo $this->form->getLabel('language'); ?>
+				<?php echo $this->form->getInput('language'); ?></li>
+
+				<!-- Tag field -->
+				<li><?php echo $this->form->getLabel('tags'); ?>
+					<div class="is-tagbox">
+						<?php echo $this->form->getInput('tags'); ?>
+					</div>
+				</li>
+
+				<?php if ($saveHistory) : ?>
+					<li><?php echo $this->form->getLabel('version_note'); ?>
+					<?php echo $this->form->getInput('version_note'); ?></li>
+				<?php endif; ?>
+
+				<li><?php echo $this->form->getLabel('id'); ?>
+				<?php echo $this->form->getInput('id'); ?></li>
+			</ul>
+
+			<div>
+				<?php echo $this->form->getLabel('description'); ?>
+				<div class="clr"></div>
+				<?php echo $this->form->getInput('description'); ?>
+			</div>
+		</fieldset>
+	</div>
+
+	<div class="col options-section">
+		<?php echo JHtml::_('sliders.start', 'weblink-sliders-'.$this->item->id, array('useCookie' => 1)); ?>
+
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_PUBLISHING'), 'publishing-details'); ?>
+
+		<fieldset class="panelform">
+			<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+			<ul class="adminformlist">
+
+				<li><?php echo $this->form->getLabel('created_by'); ?>
+				<?php echo $this->form->getInput('created_by'); ?></li>
+
+				<li><?php echo $this->form->getLabel('created_by_alias'); ?>
+				<?php echo $this->form->getInput('created_by_alias'); ?></li>
+
+				<li><?php echo $this->form->getLabel('created'); ?>
+				<?php echo $this->form->getInput('created'); ?></li>
+
+				<li><?php echo $this->form->getLabel('publish_up'); ?>
+				<?php echo $this->form->getInput('publish_up'); ?></li>
+
+				<li><?php echo $this->form->getLabel('publish_down'); ?>
+				<?php echo $this->form->getInput('publish_down'); ?></li>
+
+				<?php if ($this->item->modified_by) : ?>
+					<li><?php echo $this->form->getLabel('modified_by'); ?>
+					<?php echo $this->form->getInput('modified_by'); ?></li>
+
+					<li><?php echo $this->form->getLabel('modified'); ?>
+					<?php echo $this->form->getInput('modified'); ?></li>
+				<?php endif; ?>
+
+				<?php if ($this->item->hits) : ?>
+					<li><?php echo $this->form->getLabel('hits'); ?>
+					<?php echo $this->form->getInput('hits'); ?></li>
+				<?php endif; ?>
+
+			</ul>
+		</fieldset>
+
+		<?php echo $this->loadTemplate('params'); ?>
+
+		<?php echo JHtml::_('sliders.panel', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'), 'meta-options'); ?>
+		<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+			<?php echo $this->loadTemplate('metadata'); ?>
+		</fieldset>
+
+		<?php echo JHtml::_('sliders.end'); ?>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+	<div class="clr"></div>
+</form>
+</div>
diff --git a/core/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php b/core/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
new file mode 100644
index 00000000..a3dec185
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+foreach ($fieldSets as $name => $fieldSet) :
+	echo JHtml::_('sliders.panel', JText::_($fieldSet->label), $name.'-params');
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
+	endif;
+	?>
+	<fieldset class="panelform">
+		<legend class="element-invisible"><?php echo JText::_($fieldSet->label); ?></legend>
+		<ul class="adminformlist">
+		<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+			<li><?php echo $field->label; ?>
+			<?php echo $field->input; ?></li>
+		<?php endforeach; ?>
+		</ul>
+	</fieldset>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/hathor/html/com_weblinks/weblinks/default.php b/core/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
new file mode 100644
index 00000000..5948d606
--- /dev/null
+++ b/core/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.multiselect');
+JHtml::_('behavior.modal');
+
+$user      = JFactory::getUser();
+$userId    = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+$canOrder  = $user->authorise('core.edit.state', 'com_weblinks');
+$saveOrder = $listOrder == 'a.ordering';
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=weblinks'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+	<fieldset id="filter-bar">
+	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
+		<div class="filter-search">
+			<label class="filter-search-lbl" for="filter_search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_WEBLINKS_SEARCH_IN_TITLE'); ?>" />
+			<button type="submit"><?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
+			<button type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();"><?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?></button>
+		</div>
+
+		<div class="filter-select">
+			<label class="selectlabel" for="filter_published">
+				<?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?>
+			</label>
+			<select name="filter_published" id="filter_published">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_category_id">
+				<?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?>
+			</label>
+			<select name="filter_category_id" id="filter_category_id">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_CATEGORY'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('category.options', 'com_weblinks'), 'value', 'text', $this->state->get('filter.category_id')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_access">
+				<?php echo JText::_('JOPTION_SELECT_ACCESS'); ?>
+			</label>
+			<select name="filter_access" id="filter_access">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_language">
+				<?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?>
+			</label>
+			<select name="filter_language" id="filter_language">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+			</select>
+
+			<label class="selectlabel" for="filter_tag">
+				<?php echo JText::_('JOPTION_SELECT_TAG'); ?>
+			</label>
+			<select name="filter_tag" id="filter_tag">
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
+			</select>
+
+			<button type="submit" id="filter-go">
+				<?php echo JText::_('JSUBMIT'); ?></button>
+		</div>
+	</fieldset>
+	<div class="clr"> </div>
+
+	<table class="adminlist">
+		<thead>
+			<tr>
+				<th class="checkmark-col">
+					<input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Joomla.checkAll(this)" />
+				</th>
+				<th class="title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap state-col">
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap title category-col">
+					<?php echo JHtml::_('grid.sort', 'JCATEGORY', 'category_title', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap ordering-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'a.ordering', $listDirn, $listOrder); ?>
+					<?php if ($canOrder && $saveOrder) : ?>
+						<?php echo JHtml::_('grid.order', $this->items, 'filesave.png', 'weblinks.saveorder'); ?>
+					<?php endif; ?>
+				</th>
+				<th class="title access-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+				</th>
+				<th class="hits-col">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+				</th>
+				<th class="width-5">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
+				</th>
+				<th class="nowrap id-col">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+
+		<tbody>
+		<?php foreach ($this->items as $i => $item) :
+			$ordering       = ($listOrder == 'a.ordering');
+			$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_weblinks&task=edit&type=other&cid[]=' . $item->catid);
+			$canCreate      = $user->authorise('core.create',     'com_weblinks.category.' . $item->catid);
+			$canEdit        = $user->authorise('core.edit',       'com_weblinks.category.' . $item->catid);
+			$canCheckin     = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+			$canChange      = $user->authorise('core.edit.state', 'com_weblinks.category.' . $item->catid) && $canCheckin;
+			?>
+			<tr class="row<?php echo $i % 2; ?>">
+				<td>
+					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+				</td>
+				<td>
+					<?php if ($item->checked_out) : ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'weblinks.', $canCheckin); ?>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<a href="<?php echo JRoute::_('index.php?option=com_weblinks&task=weblink.edit&id='.(int) $item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+					<?php else : ?>
+							<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+					<p class="smallsub">
+						<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?></p>
+				</td>
+				<td class="center">
+					<?php echo JHtml::_('jgrid.published', $item->state, $i, 'weblinks.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->category_title); ?>
+				</td>
+				<td class="order">
+					<?php if ($canChange) : ?>
+						<?php if ($saveOrder) :?>
+							<?php if ($listDirn == 'asc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'weblinks.orderup', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'weblinks.orderdown', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php elseif ($listDirn == 'desc') : ?>
+								<span><?php echo $this->pagination->orderUpIcon($i, $item->catid == @$this->items[$i - 1]->catid, 'weblinks.orderdown', 'JLIB_HTML_MOVE_UP', $ordering); ?></span>
+								<span><?php echo $this->pagination->orderDownIcon($i, $this->pagination->total, $item->catid == @$this->items[$i + 1]->catid, 'weblinks.orderup', 'JLIB_HTML_MOVE_DOWN', $ordering); ?></span>
+							<?php endif; ?>
+						<?php endif; ?>
+						<?php $disabled = $saveOrder ? '' : 'disabled="disabled"'; ?>
+						<input type="text" name="order[]" value="<?php echo $item->ordering; ?>" <?php echo $disabled; ?> class="text-area-order" title="<?php echo $item->title; ?> order" />
+					<?php else : ?>
+						<?php echo $item->ordering; ?>
+					<?php endif; ?>
+				</td>
+				<td class="center">
+					<?php echo $this->escape($item->access_level); ?>
+				</td>
+				<td class="center">
+					<?php echo $item->hits; ?>
+				</td>
+				<td class="center">
+					<?php echo JLayoutHelper::render('joomla.content.language', $item); ?>
+				</td>
+				<td class="center">
+					<?php echo (int) $item->id; ?>
+				</td>
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+
+<?php echo $this->pagination->getListFooter(); ?>
+	<div class="clr"> </div>
+
+	<?php //Load the batch processing form. ?>
+	<?php echo $this->loadTemplate('batch'); ?>
+
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php b/core/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php
new file mode 100644
index 00000000..20303fee
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('JTOOLBAR_DELETE');
+?>
+<button onclick="MediaManager.submit('folder.delete')" class="toolbar">
+	<span class="icon-32-delete" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+</button>
diff --git a/core/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php b/core/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php
new file mode 100644
index 00000000..debd66de
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('COM_MEDIA_CREATE_NEW_FOLDER');
+?>
+<button data-toggle="collapse" data-target="#collapseFolder" class="toolbar">
+	<span class="icon-folder" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+</button>
diff --git a/core/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php b/core/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php
new file mode 100644
index 00000000..7a5d3258
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('JTOOLBAR_UPLOAD');
+?>
+<button data-toggle="collapse" data-target="#collapseUpload" class="toolbar">
+	<span class="icon-32-upload" title="<?php echo $title; ?>"></span> <?php echo $title; ?>
+</button>
diff --git a/core/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php b/core/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php
new file mode 100644
index 00000000..38a91d79
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_messages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$text = JText::_('COM_MESSAGES_TOOLBAR_MY_SETTINGS');
+?>
+<a rel="{handler:'iframe', size:{x:700,y:300}}" href="index.php?option=com_messages&amp;view=config&amp;tmpl=component" title="<?php echo $text; ?>" class="messagesSettings toolbar">
+	<span class="icon-32-options"></span> <?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php b/core/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php
new file mode 100644
index 00000000..bfc48bbb
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$text = JText::_('JTOOLBAR_CANCEL');
+?>
+<a onclick="location.href='index.php?option=com_modules'" class="toolbar" title="<?php echo $text; ?>">
+	<span class="icon-32-cancel"></span> <?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php b/core/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php
new file mode 100644
index 00000000..a111e737
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$text = JText::_('JTOOLBAR_NEW');
+?>
+<a href="javascript:void(0)" onclick="location.href='index.php?option=com_modules&amp;view=select'" class="toolbar">
+	<span class="icon-32-new"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/edit/details.php b/core/administrator/templates/hathor/html/layouts/joomla/edit/details.php
new file mode 100644
index 00000000..7d6654fe
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/edit/details.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// JLayout for standard handling of the details sidebar in administrator edit screens.
+$title = $displayData->get('form')->getValue('title');
+$published = $displayData->get('form')->getValue('published');
+$saveHistory = $displayData->get('state')->get('params')->get('save_history', 0);
+?>
+<div class="span2">
+<h4><?php echo JText::_('JDETAILS');?></h4>
+			<hr />
+			<fieldset class="form-vertical">
+				<?php if (empty($title)) : ?>
+					<div class="control-group">
+						<div class="controls">
+							<?php echo $displayData->get('form')->getValue('name'); ?>
+						</div>
+					</div>
+				<?php else : ?>
+				<div class="control-group">
+					<div class="controls">
+						<?php echo $displayData->get('form')->getValue('title'); ?>
+					</div>
+				</div>
+				<?php endif; ?>
+
+				<?php if ($published) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $displayData->get('form')->getLabel('published'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $displayData->get('form')->getInput('published'); ?>
+						</div>
+					</div>
+				<?php else : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $displayData->get('form')->getLabel('state'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $displayData->get('form')->getInput('state'); ?>
+						</div>
+					</div>
+				<?php endif; ?>
+
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $displayData->get('form')->getLabel('access'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $displayData->get('form')->getInput('access'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $displayData->get('form')->getLabel('featured'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $displayData->get('form')->getInput('featured'); ?>
+					</div>
+				</div>
+				<?php if (JLanguageMultilang::isEnabled()) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $displayData->get('form')->getLabel('language'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $displayData->get('form')->getInput('language'); ?>
+						</div>
+					</div>
+				<?php else : ?>
+				<input type="hidden" name="language" value="<?php echo $displayData->get('form')->getValue('language'); ?>" />
+				<?php endif; ?>
+				<div class="control-group">
+					<?php foreach ($displayData->get('form')->getFieldset('jmetadata') as $field) : ?>
+						<?php if ($field->name == 'jform[metadata][tags][]') :?>
+						<div class="control-group">
+							<div class="control-label"><?php echo $field->label; ?></div>
+							<div class="controls"><?php echo $field->input; ?></div>
+						</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</div>
+				<?php if ($saveHistory) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $displayData->get('form')->getLabel('version_note'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $displayData->get('form')->getInput('version_note'); ?>
+						</div>
+					</div>
+				<?php endif; ?>
+			</fieldset>
+		</div>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/edit/fieldset.php b/core/administrator/templates/hathor/html/layouts/joomla/edit/fieldset.php
new file mode 100644
index 00000000..3e0c84bd
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/edit/fieldset.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$name = $displayData->get('fieldset');
+$fieldSet = $form->getFieldset($name);
+
+if (empty($fieldSet))
+{
+	return;
+}
+
+$ignoreFields = $displayData->get('ignore_fields') ? : array();
+$extraFields = $displayData->get('extra_fields') ? : array();
+
+if ($displayData->get('show_options', 1))
+{
+	if (isset($extraFields[$name]))
+	{
+		foreach ($extraFields[$name] as $f)
+		{
+			if (in_array($f, $ignoreFields))
+			{
+				continue;
+			}
+			if ($form->getField($f))
+			{
+				$fieldSet[] = $form->getField($f);
+			}
+		}
+	}
+
+	$html = array();
+	$html[] = '<fieldset class="panelform">';
+	$html[] = '<ul class="adminformlist">';
+
+	foreach ($fieldSet as $field)
+	{
+		$html[] = '<li> ' . $field->label . $field->input . '</li>';
+	}
+	$html[] = '</ul>';
+	$html[] = '</fieldset>';
+
+	echo implode('', $html);
+}
+else
+{
+	$html = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->input;
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/edit/global.php b/core/administrator/templates/hathor/html/layouts/joomla/edit/global.php
new file mode 100644
index 00000000..f2e2a839
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/edit/global.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app       = JFactory::getApplication();
+$form      = $displayData->getForm();
+$input     = $app->input;
+$component = $input->getCmd('option', 'com_content');
+
+if ($component === 'com_categories')
+{
+	$extension = $input->getCmd('extension', 'com_content');
+	$parts     = explode('.', $extension);
+	$component = $parts[0];
+}
+
+$saveHistory = JComponentHelper::getParams($component)->get('save_history', 0);
+
+$fields = $displayData->get('fields') ?: array(
+	array('parent', 'parent_id'),
+	array('published', 'state', 'enabled'),
+	array('category', 'catid'),
+	'featured',
+	'sticky',
+	'access',
+	'language',
+	'tags',
+	'note',
+	'version_note',
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+if (!$saveHistory)
+{
+	$hiddenFields[] = 'version_note';
+}
+
+$html   = array();
+$html[] = '<fieldset class="panelform">';
+
+foreach ($fields as $field)
+{
+	foreach ((array) $field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			$html[] = $form->renderField($f);
+			break;
+		}
+	}
+}
+
+$html[] = '</fieldset>';
+
+echo implode('', $html);
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php b/core/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php
new file mode 100644
index 00000000..19f0f065
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// JLayout for standard handling of metadata fields in the administrator content edit screens.
+$form = $displayData->get('form');
+?>
+<fieldset>
+	<div class="control-group">
+		<?php echo $form->getLabel('metadesc'); ?>
+		<div class="controls">
+			<?php echo $form->getInput('metadesc'); ?>
+		</div>
+	</div>
+	<div class="control-group">
+		<?php echo $form->getLabel('metakey'); ?>
+		<div class="controls">
+			<?php echo $form->getInput('metakey'); ?>
+		</div>
+	</div>
+	<?php if ($form->getLabel('xreference')):?>
+		<div class="control-group">
+			<?php echo $form->getLabel('xreference'); ?>
+			<div class="controls">
+				<?php echo $form->getInput('xreference'); ?>
+			</div>
+		</div>
+	<?php endif; ?>
+	<?php foreach ($form->getGroup('metadata') as $field) : ?>
+		<?php if ($field->name != 'jform[metadata][tags][]') :?>
+			<div class="control-group">
+				<?php if (!$field->hidden) : ?>
+					<?php echo $field->label; ?>
+				<?php endif; ?>
+				<div class="controls">
+					<?php echo $field->input; ?>
+				</div>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+</fieldset>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/edit/params.php b/core/administrator/templates/hathor/html/layouts/joomla/edit/params.php
new file mode 100644
index 00000000..48fd67b6
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/edit/params.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app       = JFactory::getApplication();
+$form      = $displayData->getForm();
+$fieldSets = $form->getFieldsets();
+
+if (empty($fieldSets))
+{
+	return;
+}
+
+$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: array();
+$ignoreFields    = $displayData->get('ignore_fields') ?: array();
+$extraFields     = $displayData->get('extra_fields') ?: array();
+$tabName         = $displayData->get('tab_name') ?: 'myTab';
+
+if (!empty($displayData->hiddenFieldsets))
+{
+	// These are required to preserve data on save when fields are not displayed.
+	$hiddenFieldsets = $displayData->hiddenFieldsets ?: array();
+}
+
+if (!empty($displayData->configFieldsets))
+{
+	// These are required to configure showing and hiding fields in the editor.
+	$configFieldsets = $displayData->configFieldsets ?: array();
+}
+
+if ($displayData->get('show_options', 1))
+{
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		// Ensure any fieldsets we don't want to show are skipped (including repeating formfield fieldsets)
+		if ((isset($fieldSet->repeat) && $fieldSet->repeat == true)
+			|| in_array($name, $ignoreFieldsets)
+			|| (!empty($configFieldsets) && in_array($name, $configFieldsets))
+			|| (!empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets))
+		)
+		{
+			continue;
+		}
+
+		if (!empty($fieldSet->label))
+		{
+			$label = JText::_($fieldSet->label);
+		}
+		else
+		{
+			$label = strtoupper('JGLOBAL_FIELDSET_' . $name);
+			if (JText::_($label) === $label)
+			{
+				$label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL');
+			}
+			$label = JText::_($label);
+		}
+
+		if (isset($fieldSet->description) && trim($fieldSet->description))
+		{
+			echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+		}
+
+		$displayData->fieldset = $name;
+		echo JLayoutHelper::render('joomla.edit.fieldset', $displayData);
+	}
+}
+else
+{
+	$html   = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		if (in_array($name, $ignoreFieldsets))
+		{
+			continue;
+		}
+
+		if (in_array($name, $hiddenFieldsets))
+		{
+			foreach ($form->getFieldset($name) as $field)
+			{
+				$html[] = $field->input;
+			}
+		}
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php b/core/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php
new file mode 100644
index 00000000..4527b1e3
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span>' . $displayData['text'] . '</span>')
+
+?>
+<div class="quickicon-wrapper"<?php echo $id; ?>>
+	<div class="icon">
+		<a href="<?php echo $displayData['link']; ?>"<?php echo $target . $onclick . $title; ?>>
+			<?php echo JHtml::_('image', empty($displayData['icon']) ? '' : $displayData['icon'], empty($displayData['alt']) ? null : htmlspecialchars($displayData['alt'], ENT_COMPAT, 'UTF-8'), null, true); ?>
+			<?php echo $text; ?>
+		</a>
+	</div>
+</div>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php b/core/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
new file mode 100644
index 00000000..3aeb5bb8
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<div id="sidebar">
+	<div class="sidebar-nav">
+		<?php if ($displayData->displayMenu) : ?>
+		<ul id="submenu" class="nav nav-list">
+			<?php foreach ($displayData->list as $item) :
+			if (isset ($item[2]) && $item[2] == 1) : ?>
+				<li class="active">
+			<?php else : ?>
+				<li>
+			<?php endif;
+			if ($displayData->hide) : ?>
+				<a class="nolink"><?php echo $item[0]; ?></a>
+			<?php else :
+				if ($item[1] !== '') : ?>
+					<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+				<?php else : ?>
+					<?php echo $item[0]; ?>
+				<?php endif;
+			endif; ?>
+			</li>
+			<?php endforeach; ?>
+		</ul>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php
new file mode 100644
index 00000000..88783a82
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<li class="button" <?php echo $displayData['id']; ?>>
+	<?php echo $displayData['action']; ?>
+</li>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php
new file mode 100644
index 00000000..95183914
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = $displayData['title'];
+
+?>
+<a data-toggle="modal" data-target="#collapseModal" class="btn btn-small">
+	<span class="icon-32-batch" title="<?php echo $title; ?>"></span>
+	<?php echo $title; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php
new file mode 100644
index 00000000..0c4d43c2
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+
+<a href="javascript:void(0)" onclick="<?php echo $doTask; ?>" class="toolbar">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php
new file mode 100644
index 00000000..7268b856
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+	</ul>
+	<div class="clr"></div>
+</div>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php
new file mode 100644
index 00000000..5ac5f72e
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<div class="toolbar-list" id="<?php echo $displayData['id']; ?>">
+	<ul>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php
new file mode 100644
index 00000000..9c1eb0ec
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$text   = $displayData['text'];
+
+?>
+
+<a href="javascript:void(0)" onclick="<?php echo $doTask; ?>" rel="help" class="toolbar">
+	<span class="icon-32-help"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php
new file mode 100644
index 00000000..c9b2f785
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+icon-32-<?php echo $displayData['icon']; ?>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php
new file mode 100644
index 00000000..439a02e9
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+
+<a href="<?php echo $doTask; ?>;" class="toolbar">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php
new file mode 100644
index 00000000..a400f396
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/modal.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+
+$selector = $displayData['selector'];
+$class    = isset($displayData['class']) ? $displayData['class'] : 'toolbar';
+$icon     = isset($displayData['icon']) ? $displayData['icon'] : '';
+$text     = isset($displayData['text']) ? $displayData['text'] : '';
+?>
+<a class="<?php echo $class; ?>" data-toggle="modal" data-target="#<?php echo $selector; ?>">
+	<span class="icon-32-<?php echo $icon; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php
new file mode 100644
index 00000000..03e36cf9
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+$name   = $displayData['name'];
+?>
+
+<a onclick="<?php echo $doTask; ?>" class="modal toolbar" data-toggle="modal" data-target="#modal-<?php echo $name; ?>">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php
new file mode 100644
index 00000000..f971f38c
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = empty($displayData['style']) ? 'spacer' : $displayData['style'];
+$style = $displayData['style'];
+
+?>
+<li class="<?php echo $class; ?>"<?php echo $style; ?>></li>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php
new file mode 100644
index 00000000..3a2ff106
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask  = $displayData['doTask'];
+$class   = $displayData['class'];
+$text    = $displayData['text'];
+$name    = $displayData['name'];
+$onClose = $displayData['onClose'];
+?>
+
+<a onclick="<?php echo $doTask; ?>" data-toggle="collapse" data-target="#collapse-<?php echo $name; ?>"<?php echo $onClose; ?>>
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php
new file mode 100644
index 00000000..42607084
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask   = $displayData['doTask'];
+$class    = $displayData['class'];
+$text     = $displayData['text'];
+$btnClass = $displayData['btnClass'];
+
+?>
+
+<a href="javascript:void(0)" onclick="<?php echo $doTask; ?>" class="toolbar">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php
new file mode 100644
index 00000000..d91fb68d
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = 'pagetitle';
+
+if (!empty($displayData['icon']))
+{
+	// Strip the extension.
+	$icons = explode(' ', $displayData['icon']);
+
+	foreach ($icons as $i => $icon)
+	{
+		$icons[$i] = 'icon-48-' . preg_replace('#\.[^.]*$#', '', $icon);
+	}
+	$class .= ' ' . htmlspecialchars(implode(' ', $icons), ENT_COMPAT, 'UTF-8');
+}
+?>
+<div class="<?php echo $class; ?>">
+	<h2>
+		<?php echo $displayData['title']; ?>
+	</h2>
+</div>
diff --git a/core/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php
new file mode 100644
index 00000000..9e27efa9
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.modal', 'a.modal_jform_contenthistory');
+
+?>
+<a rel="{handler: 'iframe', size: {x: <?php echo $displayData['height']; ?>, y: <?php echo $displayData['width']; ?>}}"
+	href="index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id=<?php echo (int) $displayData['itemId']; ?>&amp;type_id=<?php echo $displayData['typeId']; ?>&amp;type_alias=<?php echo $displayData['typeAlias']; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"
+	title="<?php echo $displayData['title']; ?>" class="toolbar modal_jform_contenthistory">
+	<span class="icon-32-restore"></span> <?php echo $displayData['title']; ?>
+</a>
diff --git a/core/administrator/templates/hathor/html/layouts/plugins/user/profile/fields/dob.php b/core/administrator/templates/hathor/html/layouts/plugins/user/profile/fields/dob.php
new file mode 100644
index 00000000..15540918
--- /dev/null
+++ b/core/administrator/templates/hathor/html/layouts/plugins/user/profile/fields/dob.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * $text  string  infotext to be displayed
+ */
+extract($displayData);
+
+?>
+<div class="clrlft"><?php echo $text; ?></div>
diff --git a/core/administrator/templates/hathor/html/mod_login/default.php b/core/administrator/templates/hathor/html/mod_login/default.php
new file mode 100644
index 00000000..a3459268
--- /dev/null
+++ b/core/administrator/templates/hathor/html/mod_login/default.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+?>
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post" id="form-login">
+	<fieldset class="loginform">
+
+		<label id="mod-login-username-lbl" for="mod-login-username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+		<input name="username" id="mod-login-username" type="text" size="15" autofocus="true" />
+
+		<label id="mod-login-password-lbl" for="mod-login-password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+		<input name="passwd" id="mod-login-password" type="password" size="15" />
+		<?php if (count($twofactormethods) > 1): ?>
+			<div class="control-group">
+				<div class="controls">
+					<label for="mod-login-secretkey">
+						<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>
+					</label>
+					<input name="secretkey" autocomplete="off" tabindex="3" id="mod-login-secretkey" type="text" class="input-medium" size="15"/>
+				</div>
+			</div>
+		<?php endif; ?>
+		<?php if (!empty ($langs)) : ?>
+			<label id="mod-login-language-lbl" for="lang"><?php echo JText::_('MOD_LOGIN_LANGUAGE'); ?></label>
+			<?php echo $langs; ?>
+		<?php endif; ?>
+
+		<div class="clr"></div>
+
+		<div class="button-holder">
+			<div class="button1">
+				<div class="next">
+					<a href="#" onclick="document.getElementById('form-login').submit();">
+						<?php echo JText::_('MOD_LOGIN_LOGIN'); ?></a>
+				</div>
+			</div>
+		</div>
+
+		<div class="clr"></div>
+		<input type="submit" class="hidebtn" value="<?php echo JText::_('MOD_LOGIN_LOGIN'); ?>" />
+		<input type="hidden" name="option" value="com_login" />
+		<input type="hidden" name="task" value="login" />
+		<input type="hidden" name="return" value="<?php echo $return; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+</form>
diff --git a/core/administrator/templates/hathor/html/mod_quickicon/default.php b/core/administrator/templates/hathor/html/mod_quickicon/default.php
new file mode 100644
index 00000000..320ffb21
--- /dev/null
+++ b/core/administrator/templates/hathor/html/mod_quickicon/default.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_quickicon
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$html = JHtml::_('icons.buttons', $buttons);
+?>
+<?php if (!empty($html)): ?>
+	<div class="cpanel clearfix">
+		<?php echo $html;?>
+	</div>
+<?php endif;?>
diff --git a/core/administrator/templates/hathor/html/modules.php b/core/administrator/templates/hathor/html/modules.php
new file mode 100644
index 00000000..fba14ec0
--- /dev/null
+++ b/core/administrator/templates/hathor/html/modules.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This is a file to add template specific chrome to module rendering.  To use it you would
+ * set the style attribute for the given module(s) include in your template to use the style
+ * for each given modChrome function.
+ *
+ * eg.  To render a module mod_test in the submenu style, you would use the following include:
+ * <jdoc:include type="module" name="test" style="submenu" />
+ *
+ * This gives template designers ultimate control over how modules are rendered.
+ *
+ * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same
+ * two arguments.
+ */
+
+/*
+ * Module chrome for rendering the module in a submenu
+ */
+function modChrome_xhtmlid($module, &$params, &$attribs)
+{
+	if ($module->content)
+	{
+		?>
+		<div id="<?php echo (int) $attribs['id'] ?>">
+
+				<?php echo $module->content; ?>
+				<div class="clr"></div>
+
+		</div>
+		<?php
+	} elseif ($attribs['id'] == 'submenu-box')
+	{
+		?>
+		<div id="no-submenu"></div>
+		<?php
+	}
+}
+?>
diff --git a/core/administrator/templates/hathor/html/pagination.php b/core/administrator/templates/hathor/html/pagination.php
new file mode 100644
index 00000000..8eb73910
--- /dev/null
+++ b/core/administrator/templates/hathor/html/pagination.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This is a file to add template specific chrome to pagination rendering.
+ *
+ * pagination_list_footer
+ *	Input variable $list is an array with offsets:
+ *		$list[prefix]		: string
+ *		$list[limit]		: int
+ *		$list[limitstart]	: int
+ *		$list[total]		: int
+ *		$list[limitfield]	: string
+ *		$list[pagescounter]	: string
+ *		$list[pageslinks]	: string
+ *
+ * pagination_list_render
+ *	Input variable $list is an array with offsets:
+ *		$list[all]
+ *			[data]		: string
+ *			[active]	: boolean
+ *		$list[start]
+ *			[data]		: string
+ *			[active]	: boolean
+ *		$list[previous]
+ *			[data]		: string
+ *			[active]	: boolean
+ *		$list[next]
+ *			[data]		: string
+ *			[active]	: boolean
+ *		$list[end]
+ *			[data]		: string
+ *			[active]	: boolean
+ *		$list[pages]
+ *			[{PAGE}][data]		: string
+ *			[{PAGE}][active]	: boolean
+ *
+ * pagination_item_active
+ *	Input variable $item is an object with fields:
+ *		$item->base	: integer
+ *		$item->prefix	: string
+ *		$item->link	: string
+ *		$item->text	: string
+ *
+ * pagination_item_inactive
+ *	Input variable $item is an object with fields:
+ *		$item->base	: integer
+ *		$item->prefix	: string
+ *		$item->link	: string
+ *		$item->text	: string
+ *
+ * This gives template designers ultimate control over how pagination is rendered.
+ *
+ * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both
+ */
+
+function pagination_list_footer($list)
+{
+	/**
+	 * Fix javascript jump menu
+	 *
+	 * Remove the onchange=Joomla.submitform from the select tag
+	 * Add in a button with onclick instead
+	 */
+	$fixlimit = $list['limitfield'];
+	$fixlimit = preg_replace('/onchange="Joomla.submitform\(\);"/', '', $fixlimit);
+
+	$html = '<div class="containerpg"><div class="pagination">';
+
+	$html .= '<div class="limit"><label for="limit">' . JText::_('JGLOBAL_DISPLAY_NUM') . ' </label>';
+	$html .= "\n" . $fixlimit;
+	$html .= "\n" . '<button id="pagination-go" type="button" onclick="Joomla.submitform()">' . JText::_('JSUBMIT') . '</button></div>';
+	$html .= "\n" . $list['pageslinks'];
+	$html .= "\n" . '<div class="limit">' . $list['pagescounter'] . '</div>';
+
+	$html .= "\n" . '<input type="hidden" name="' . $list['prefix'] . 'limitstart" value="' . $list['limitstart'] . '" />';
+	$html .= "\n" . '<div class="clr"></div></div></div>';
+
+	return $html;
+}
+
+function pagination_list_render($list)
+{
+	$html = null;
+
+	if ($list['start']['active'])
+	{
+		$html .= '<div class="button2-right"><div class="start">'. $list['start']['data']. '</div></div>';
+	} else {
+		$html .= '<div class="button2-right off"><div class="start">'. $list['start']['data']. '</div></div>';
+	}
+	if ($list['previous']['active'])
+	{
+		$html .= '<div class="button2-right"><div class="prev">'. $list['previous']['data']. '</div></div>';
+	} else {
+		$html .= '<div class="button2-right off"><div class="prev">'. $list['previous']['data']. '</div></div>';
+	}
+
+	$html .= '<div class="button2-left"><div class="page">';
+	foreach ($list['pages'] as $page)
+	{
+		$html .= $page['data'];
+	}
+	$html .= '</div></div>';
+
+	if ($list['next']['active'])
+	{
+		$html .= '<div class="button2-left"><div class="next">'. $list['next']['data']. '</div></div>';
+	} else {
+		$html .= '<div class="button2-left off"><div class="next">'. $list['next']['data']. '</div></div>';
+	}
+	if ($list['end']['active'])
+	{
+		$html .= '<div class="button2-left"><div class="end">'. $list['end']['data']. '</div></div>';
+	} else {
+		$html .= '<div class="button2-left off"><div class="end">'. $list['end']['data']. '</div></div>';
+	}
+
+	return $html;
+}
+
+function pagination_item_active(&$item)
+{
+	if ($item->base > 0)
+	{
+		return '<a href="#" title="'.$item->text.'" onclick="document.adminForm.' . $item->prefix . 'limitstart.value=' .$item->base.'; Joomla.submitform();return false;">'.$item->text. '</a>';
+	}
+	else
+	{
+		return '<a href="#" title="'.$item->text.'" onclick="document.adminForm.' . $item->prefix . 'limitstart.value=0; Joomla.submitform();return false;">'.$item->text. '</a>';
+	}
+}
+
+function pagination_item_inactive(&$item)
+{
+	if ($item->active)
+	{
+		$class = 'class="active"';
+	}
+	else
+	{
+		$class = '';
+	}
+	return '<span ' . $class . '>' . $item->text . '</span>';
+}
diff --git a/core/administrator/templates/hathor/images/admin/blank.png b/core/administrator/templates/hathor/images/admin/blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..1797bf909a764805b5afdf1fa1dd2167af8af731
GIT binary patch
literal 81
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgbk|4iepwN`R>wr8iPZ!6K3dZCN
YAiIg7(MSCHeISd$)78&qol`;+05^UR%K!iX

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/checked_out.png b/core/administrator/templates/hathor/images/admin/checked_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ad8f25ac9b91450d04d11ddc06e2ac946567beb
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003^Nkl<ZcmZRe
z2}sQ?445!=#{HeU_xxYBa`pf6x~BbZ0igy&YA#BcF?YfLvf4(Fri7T3%z|Yr*Sue{
zV%2*fUxA<j3zx2ZpO~4qA6e|;rOOH{)~tWOeD&J-cr}A;SiEA*e;^%zE>}_CGXMC=
z)B6b-;4pdSy#F8?U9P;Yxq+Yoc22JS{gbEtpE7O6{CV@{H_V(l3ykN_U(hgP_T2po
z7caf<;OH8FRkN19k;C?6mj6eynEs#2WBq@zg!BK6D&GGO8U+78Zxj9hu1Dhk=LypP
zCG~Cg<8=Ox6jp);=sE}DHegRW2SEcW8d`B1P+Z;c9~e;o@87@w|I)=v|4*Mf{r}AA
zGygANy8Qpag9rZ)9yvCw4Ny=~Gl)q_`@dt?p8pqtnvWhi`hVZP{r~p^@v)=F{$Bzb
kvT4iq|50(t`>C390S?GQXGt5v;s5{u07*qoM6N<$f>&I`RsaA1

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/collapseall.png b/core/administrator/templates/hathor/images/admin/collapseall.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d50db82086604c8264ea458f1f2504b843e81c1
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?6o-U3d8t0QEw*5O%pJd3)(_j&9
z|3|%JW7eygo7ysZ7IjKUZ_KLtENg#k)yup5e<W5f>$m@qyk=HJOm;!ioLT$+Dk&?}
z{X5kEaF&C_vX|H8|46LiWJ{R!@6W-0LlePn#@-2vi*GGVjsV)l;OXk;vd$@?2>|pd
BJTw3R

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/disabled.png b/core/administrator/templates/hathor/images/admin/disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..5218081bee8dd7d60976cd48a272f6a4beeb3542
GIT binary patch
literal 263
zcmV+i0r>ujP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002aNkl<Zcma*i
zRbj(W7>40rLL^i|B^(KpFbR_o2bB;BbI>tEnH$Ed!OeL6!c2Xin;c9+d$(qDVJuJJ
zIawa9Im)-}%`nA0FvSE5dDYFH7B*O7k+FjKx`?;T4>T-FM93!;W)4=E1!Vl<9kYmq
z86%<zXJHz6M^rQxq4NF)reP9Dv!WTtf60iA5K4PRG#6~(h6tq%V?6l{P6h~l!f%B^
zEd0@D_KZp=6!#$9qvZ9mLupt1C2|H=UCMXbIq97Y`sm9i$0vuhe=g(-D$X7`Aj|*&
N002ovPDHLkV1k6TXD9#w

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/downarrow-1.png b/core/administrator/templates/hathor/images/admin/downarrow-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c94074e5963e8a96adc0eab4234a91802b60d27a
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3_UF&^$uA7ATVD>Eakt
z!I=ERUr8bI@QSw0ckdpzwra>I_dY#s*|M#?yxm#ZjW15$-fm$k^XZ$LvjgvsIVGEx
zuta|SG)IQ1j^S3Fjwa`#s@xcv3Enp@&yU|{BPY1g+(u^ItOAX_JImkyoviMx`iLQ$
W_flnZ)+~OYjSQZyelF{r5}E*`b3jo5

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/downarrow.png b/core/administrator/templates/hathor/images/admin/downarrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a27a7585f7916880c7cb136b88d280dbe0594ee7
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr*|t5;+MX2I*(Q7$41d
z_#@9hui?7DyFadPfo%3V?jueWyaH=u4l^HF-|)j;Y>wxYaFOV;6sC{$CN**$GdqnO
z@(&57DcJEJ`9E<3uP0-c?ej&v0{`0|T}?UK^}B1gcjFIrfz=aI9UdHee#zmE#SUS4
Z2ABJ()rO~dc!6$U@O1TaS?83{1OWRxK`H<M

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/downarrow0.png b/core/administrator/templates/hathor/images/admin/downarrow0.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd9f310e25124d0d7e1c4f6f4b2d940e6643b1b3
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6;yhg(Ln;`PCHx-jIrVe?^Z$zv
zaAtV<ZJqzCpXL5MA*bMi8P7kgKK%cofpE9!ZsYR*?T0?^p1D!u#*sZQ|1A5TkkNd2
z<?5WUzwC#uR@7`RczI|(cjyO=8M?N+C*E@8V2Eb-jOYsRm<zOt!PC{xWt~$(69D{0
BKaBtY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/expandall.png b/core/administrator/templates/hathor/images/admin/expandall.png
new file mode 100644
index 0000000000000000000000000000000000000000..233cb73562a7ce201a9048e1238ae309b6b590da
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2?|o-U3d6}NiN-{ovj5NS({Ubir6
z;cv4St5&CFv~BB9Xi=y)5aFNS+1~d-sOF2ps>-`fCR6>LcJtM5y=bBP$V+AC#$LYW
zU3DJuM;2TT;tZ8;*7IgeOb+-n(c7Bs?mW5P*#gaS{)~y*0X-8qMFh6>ybvgQ7`)YV
b!WQw>vqkQe&p8+jbOnQ_tDnm{r-UW|v>rm|

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/featured.png b/core/administrator/templates/hathor/images/admin/featured.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e2c15965d89b5d15e1958c0af5f2f09e8cab2d
GIT binary patch
literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004-Nkl<Zcmb`9
zg|Qn!5JWqK3qc_$gbhI<C<8MyGc$@A%*@Q6(ag-u?YUihU1EGyuWoLpdr^^{&m2+x
z)q}dpKK4nW6T6=idtMl2mfaoXpZHOg^uvIJD34HPB4yNb_7UBi%qNhz@1TU(-GCg3
z=v}Mt)N}5*|EXZ-W+Zz81#G{e5WY<WZWegw!w<Un&pa!<nXDg{E!THo^Dwb#m`>mZ
z)t(0&dHy;7(fRVL-g&ckb;iv~rxTX-{lr>hEoNSRu5-Gxy4QhbRS&VETN~(q%}Tua
z`jg)1b(1w61<kTfV(~R=p!a3@a&X{(Zn^F#Xck{3=3TUoJaV`6fiFJ`GFT#=1(zLY
z=AYhyd8dfk$Fw_!p4;M`H(%`R-F(Sp=A0lFo$G{U`W}UOM~UgX#a*0vVu(8ipHOW-
zM`!+i{eR-l3wo9x(RVC7PU-kiz?9?)%soK)5|d-)ohrBa2Z<TE0Ln6P`wGn3A%UzE
z!eYocMdq2Zo0XF}5<pePtW=n|c?TwMC#ENiQ-Z|AEj#qB-TVP#Ro+}36X+TM0000<
KMNUMnLSTZm>fYi2

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/filesave.png b/core/administrator/templates/hathor/images/admin/filesave.png
new file mode 100644
index 0000000000000000000000000000000000000000..65a45b551ed0440cb99e40174b046a8c1872e5d0
GIT binary patch
literal 1043
zcmV+u1nm2XP)<h;3K|Lk000e1NJLTq000mG001Be1^@s68;SVL000BpNkl<ZNXNC6
zOHUhD6vxlp8RKWj<xwNCz*Yn-Pzz(hBD=C+-AJ@_oh({)nb7tlq*YR>75xNJx=2@P
z1Y4vk4eNB|1&O6R#u#uzG0gZePkSck+}NfQXh~Idq~j~!Iro3hJ?Ea^0Q|>CI%~4g
zXsWL3<`qRz(PQrE(-Pdj|6nl;1KoAKYd@}iul0Nt`nj?C^`b1xDq~Xat1nltwk(Tx
zIvubb2kzbb8LnLU2%60%xvG*R{fgsIPk_-6F8-z6_J433_xhiQHEtLN7=|fqZ*LEF
zclSV1WI!MAeUE?k`4@{30o%4T2Y2&47s}-_?$&}<>y0feEZ`y^IOjl7buAw`0y=16
z7z))=sRW5+5^9HsP^;D8=;%nym318>XhS?6C%32oDwa_I$cn`x{Qmec<a0U5<#RCm
z!TT^cI0&k$isRh;=383wVN{^q)<PUdM@C?E^#)`vWS}S5Gtc*6^u1BAEem3?m>S7J
zCkQkOFPTb0Jdwa$_<w8D)6?Y7KmO!X-WT}k?j0lObo3|NPr&!QsNv3@=k*1$V_AwA
z!XQxl0`#;|Kw=F3c=Zay^-s+6MHPC+`H-jtMjRDD)rS}b?Ck7B7Mz$T#<8(6`0n;C
zFb#wEli00<P6>MP{5ecbP4$!a^2JNMNV`zkDZ~DL)!406wCesomOXgT?}e3>70EQ}
zmyT+O&n6~va1k#}-86pFb-nC5PDN(yQ96?;CNpW%!c7=sokpYKW61*{Fh4(!J}hlF
zTbG&4VsnK;iSuE67qB1*By22({UMq4Cb+g0T2{-kZJWdzG6|&9Y0Mvs0h8QRI^!l1
zi6m2$I38;ND-rYkwv1Vq6>J)&$PA-Wurk<Jk_-O}4={OZ_rB9OM|0cT+sK0udEj2d
zBS(3lX<C;DEH^VVa}}p}&*9+U0J7QayYQfmJaDf6bum5EKw>9F5#5M)fp2YXz0Cu=
z%LDJ!aSDZk7~h!($H&JoH1sAy5+xo`?e%}d19Hsg^N>R(jE|2C$H~b_F>Y>dp5_5A
z5Lq2T9?Z_p{$ts!vv?46d5}t_&aFG~0R8#;`uYhEmX?+bY9_4pxdPOUv{~>r4@dy-
z!MOsxYMkN$PCTR+=U!b&g5~99FirCe9@w@h+wk!4sl*Xzs@1AdAs$q#8Xn<<2OAq3
z5-MK8?*Q^(LWGI`1rHqJfh<45jxC~{&4abIHNgY?5?w~;7=8ng2b|vZd4LP0dc97!
z7I|Rxc_5B}yM<W75Enng@d64BVy&r1dI_V?hA1=61tdt-9~c;LUjv|{)fs)EBBB5Q
N002ovPDHLkV1hrD?gRh;

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/filter_16.png b/core/administrator/templates/hathor/images/admin/filter_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbc62b7d30f7892793bc02ad9c9270dc76e40cec
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#fD7Ln;{W_L~MdGcvdo&#yOJ
zv6Dgdo#?#>yzdIj%getD_?x}sDydK3R--NQiKG5QgM#Ufhy5xOf1O+$v{FgL+cEcJ
zqw4ktt*ejz?B=N6uA{T&ULUW*t30NOE^IS%_DNpj$YrtFaK)nPL2}{Sb<D!PSuq_K
zC0%rWHW%33<@q5bS?C>_koi7Q#>Vc*8$NU9DQWt4ENnXR`}-T8b6m7;y0K>okj0%D
u^WtE=zz(ly?Fapb4$8i+XSAIhWvaMr@y$P*b*BS;!r<xZ=d#Wzp$Pz#WMTvW

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-allow.png b/core/administrator/templates/hathor/images/admin/icon-16-allow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d28a18b2f21e3b69dba716afbd6873f2881f09ca
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003XNkl<ZcmdVS
zC2#{l7>42BtMe*etylFXoR}k5R8eJSW@ct)W@eQ2YQ6fx%u($-^DN#T{lA(oO&SM*
zQmN}kQdd4JvG!fVhwd{NB~!<hq%ORdp!vdz&T9o5KTW*h%%~x6eYY8G@II%s=GZ7u
zNNpFAI`>wBhBFIlPYf>Ym$GwCbA8ZrlgZY<oA~5&9!4H)FI9&I-%py)Bz5++7<I=M
zR38}vjgYtbw{qTmCZqDefZm&I4By*cD)#k4)2XD+ycDD6$l|&SFhYS<9awnzo&jDx
z*V$P7sQ#UQuSC^>*>x6RghDIb(Xo;p9d|$+BNVNoZ5=Dz(s2hwF+%am-_)_Z4IOtt
rh!ILO$H%Up#D5(BCo2x6^yjk!W+vjH11!_z00000NkvXXu0mjfRc)Hv

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-allowinactive.png b/core/administrator/templates/hathor/images/admin/icon-16-allowinactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..d20e059da06b9e3e23562893b951f7229fbd7446
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003VNkl<ZcmdVX
zgKoo76bA6djT_&1kMMtlKEkQp#xtY3-)!4nXWO><I;-tyJIU|bm-qjo<x(ne;b%0t
z`$osDd{$xYyVf{-pTp9c+<B$r7Tz6bxlo|%+JKFpW@F=-L=YIzf1AUG?hAyq$C9Yy
zwO{DCxi<$I&*Z2(5qor8>fL#kXF%^wE?fU@Hcma8F#1rIQ++57EYfnO<7Qv&s6UpY
z=13fh0z1sVRTx{&^r$)zqwgjkBll%FmHQ%o^Qn$=zSvQFB=_`%ps*uWAIOardt&(Y
zUgu-+qo!p3y$aO_GEZ9wih3aI5OeI1(FI9R+*h`36SHoS(FJi((yuaa5;JX((FGAG
p<^OgK4lI)P<cLL-E<)a)k6*8LzFCuA^`QU&002ovPDHLkV1hqTqNo4>

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-deny.png b/core/administrator/templates/hathor/images/admin/icon-16-deny.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5b37aa2c36d012a62ff6edfe688d8f823cd989b
GIT binary patch
literal 354
zcmV-o0iFJdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003gNkl<Zcmd6l
z1E|Gd7>1W!%kJ8?ZQC}|Zg$IE-<!ScTIRKFoB!d?S$6MHob!3>8UF3_NBO7BMQMeW
zjylfL*Rttlu$?nEmKPc_HnmhOTP6o#?q~(6s|KmA@;+OpM_}%0<bN|`XjNn4Ha3s;
z;jg?{5z^iS(%r}_8o#AS2a=u^{1oSCLV8;9+fXJi=cl!r`KidmcX=NEM*0=`t}VrT
zZW8_n+Bum6>&yiEo|^#6>LS!6?rh^BH4<;dnVa$wa+BD%tT>pL=Ab60+rf281a8x#
z<qmFABbk?s7@TLsVZWhDk>i{cTqK8kke6_h6i#2IL^zKV!(agAoj6Dc9o$a{g$~P<
zmbT+V2HiN_KmnPtqSoVrX*Y};){E~skn&5p0EUkpqs;oc%m4rY07*qoM6N<$f?FV_
Ak^lez

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-denyinactive.png b/core/administrator/templates/hathor/images/admin/icon-16-denyinactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dc1b43e0fa0810cc031fa152eb93ec994b39d69
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003fNkl<ZcmZP=
zoZy9{slv-}-+-5~!3kiT5Ek$vz)gWD&Ci29Jzi!cG`t88X?W)A)$q*A6U=^@mE7<m
zIw0b)g*FFH&Ch_EU!=q~JaKcvil2oAHav?8h`_4(j+vIgv*_T4M^4sw@w4cVhR6P{
znBI95;$`v3-L~POn{C6B<T$MOp^r<$T^qxOr}1F{7zVs5On10zqu=myVsFF$|NpV#
z4~GsmTr<&VxZ`AzfawJrLx($-x(zS-x^Nos9%#TtWA%p1W?GmATr$zHxMi;0aMoP6
z;i$hSR(#UhxZ#|U8VF;0;gq2o#|2~cijxMa4Mbq<Y2ui^iosERl?DRX18+h)sHbcI
z#1%l?fCYmz69#*Al{kRd0*D<z7|IqHoEZ-Q>2>OY^%K#^00000NkvXXu0mjfG$*4P

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-links.png b/core/administrator/templates/hathor/images/admin/icon-16-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..52b4cb434eb81971cf4e661caf1267a32455ea3e
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005&Nkl<Zcmb`D
z1FRfT7==$<x3N>dwy_%34C=;76&tl}KHIi!t#@a37SFa3JEwP08z=cj=l|~98T>Fs
zQ)>i!4c6helQ(`+2yT>26Qwgc;#xc#K*7X?pUXL;iDHOi5sGUfTSLFj8>8BZ>qcY_
zulZI^A50Vlkv8}Z2Xfr>_YYI*?BTKUZi?B)FXe=uy-4XN5_`X4XSR<s)6>jS23RC_
zQ|aobG5gu)#C8`Vri+OF7I|=zg|03xjq-DQRtLMgyQ$6!$BmDPXd}YD&)C=)T`m{*
zrhA!V@zLSy&^y%$@frUj*h>U@zDrqoIZY-rO_GNl9UVNF;nO?a*$XXi-NY;DBf+LV
zc6M~KxWz%c-Ogv(HB2`7c`DQMY3`lo7z?~|5l?Lz!7V);A0KCYWveFN$*B9-eZgzt
zJa-tM@T{c}Pn)?pu#t<4i#(fQ<Kf6UrWcejwbe^Js{fM5jl@f{8y|D8bT6LP@pM!L
z2L}g<d&S%qSWSnwotLtkwEHi3(Lmvx#22}p6}U-A6B83mt2NQ&l9_LEaoL?T;#RuO
zoh;&66>&d55#P;?gutV5)l6-X`KF|iD<7zGGI2YFc#uat%oo?GiTG(Q2kpg;m_po2
mAns-A+)g5H#1?AZ|IT}Pbj2%|;%Ptt0000<MNUMnLSTXvyaA#B

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-notice-note.png b/core/administrator/templates/hathor/images/admin/icon-16-notice-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..a207d70ae835cc11f68c64b4f1eb94fcd3558b83
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00057Nkl<Zcmbu-
zGrU+y6bImM?tOl1+qP{tYuiSbI{hzI(!@!dCbpZ{8#J-Awk~J8H;eN9%fUD2%uI+e
z8caI;KWqw5sNK^PP8YR#r=3{f*0@p%NEN`EaJ9@RjXSFRY}N7a()_0Ln=v}WFGLen
zK6iio{r|wqa0`}d^|ilIo%6Zw%SV7>+ebS0jF$C-O)7VIB>o8*SR9U5nyS#JM1i^j
z5wZA%8Wk$nVLT+D^{&Dh{z5@0QTz^?miWVF83}2;Y)-f-0fpz4s8AAG+Mjoc2-Q!*
zFT07T(F`C@LkB3GEg}LU;pZJ9V)32q_dn@Jjer2oBLV+Q{_D5e;up<NJLI*rIRj)Q
zpz^cebkbyA@!PEXW%akZ10o_?WZ<Xd)aI*DqbB}Beew;uuNk7_nxU%RQz_8G05*pN
z3|FU1iofFY$8=x(lAg=oRUdx~f1*VTz7)+(!25BJ)<+sNgdQARq}(+{v15|_yR~#8
zA}U3%dOo)Q|H`An7Z@hj6-(+r2_1ACjV`cP?lrH(<p2pt$mMub@Pu5ifXrc;DKZnh
f9)AQRU@-X`j?>QZ7MK*I00000NkvXXu0mjfjr!%3

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/icon-16-protected.png b/core/administrator/templates/hathor/images/admin/icon-16-protected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b72ad93568e405808e7bad47431d415682b0e7fa
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00040Nkl<Zcmdsz
z1E{276oxmgz3GOv?XYHUZQHg7cXHRp*tTsm>!0lY?0N@bHJ*5@^BzCn>6-?iEvs03
z@Z!zsp1~2qVzWaik>S%%n(O503)?HrR#<*}dt{Q0k3XoTrQ6r<KY1;b$Vt9fN*43w
zbpafKguL_QrR&dHCYxI>ma9mSOu?!ND80ZF%Te^F{~i4NtCJOq#9Z|Nhx<pFDEWT}
zKmDXr>H-cPJ<;9WKZJpy5f+olqKuA?m5s$>Q%1%oT^yc(IDF*9>571j+jbs4H#7s+
zm<w==y95u!9eAc(hPQ^b_-xyZpPrqd1@@w2+y1|<`0M=h!!zpwwj4WC9dK!EPF=uf
z3ZpvU-8Tw~9|eLSkj-Qfi^dR-#gWVAkk9Ag@du|gVEO8`+pph!2(#6WOmR8j55Vbk
r!Bw<iAc$-cqSc#l_2#|GfL5&l^NhdhNw<_p00000NkvXXu0mjfj|swH

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/menu_divider.png b/core/administrator/templates/hathor/images/admin/menu_divider.png
new file mode 100644
index 0000000000000000000000000000000000000000..174df4cd75ad2eb3d97e374d73a980e588a8f693
GIT binary patch
literal 75
zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Ed0V0oZ{G0)#ggjjwLpWrUZ3-SVG&M0j4p_!e
X@8mhR|KAHnpe%!@tDnm{r-UW|LfR7<

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/note_add_16.png b/core/administrator/templates/hathor/images/admin/note_add_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..68e7ee66e85b2d64556f47d8dcc2cfce5db2b1bd
GIT binary patch
literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002JP)t-sMvDzu
zj4n%-4^WvEVw5>fq6$*03R|uid8Slay9<oHT8P0^g~mXO##oTZVvfv7k<?YA%!8HG
zV~XA^mDpU4<1g#RMU~%7w9lUF$X1!;TAJlh>(Ddn%Vq1%djHQ(|I$|L(v+p}KdtU#
z{@7=<>xi}QdbRLzw)18G+kUn7O}g)j>)gD_>9GIemjC8>$o*UY>4pFDrvLBA|MRi`
z_PYP}!vFWk|M<@I`0)4l_x}3D|N7kj{q6t%|D5aZX8-^Itw}^dR2Ufrz&%SsVH5!1
z=e->CMuUXtA`MA3Hc8OZ-*0MkaIhh8k`fiOydNjZD*zyTpXg+(GhiN0v$LjYhOOXN
zaQ;G~Q3$SX(1U6#bk&fQN!D9Ik}{<pA*GbLUspN52rXnTM^lbR6*4pb>hb0AXI$?p
z9m#64tF)h!Re<bExo2Th!a$-g>(kSFnf5_nCyV{46*G&_eb8~ZzCGM+j?du%(7t7P
Z3IEUHRJ&+)w~PP)002ovPDHLkV1gNs;z9rb

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/publish_g.png b/core/administrator/templates/hathor/images/admin/publish_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3794988476dd70ef47c86056c0565b2dd60236d
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0QUg*
z0QU#ri8cTL0Z&OpK~#7FWBC64`^Qh8pAiARg8@jx`}gl>o_^GH^a&8v9DW?S`5qjl
z@4Vk~<l(~ePfpx<3N#m?;oiM_*N^~^3pDaQ2Ed}>3>cihcpe!+oP?qQsPrfd?Ay2R
zC@KIN0nu>h(<yWtFag|cmtG!N_^=8^!+YG|*}DfGYlUyTJr2?U6~X}^s)JWc=k9Po
z@ifq_K>q=q3wAUD96P^1Zi9x!42HWeub^lEs-C~EbNA^D$l-JN;*Q`IvYtyA=bfzu
zD#N0|eF^8%L%l##51iWGyd}wZ4O`e2j`AIDz*xhg0f<W0J4f#13EaRBL=k&9(vC|d
zZ&Z5z_6c?k5Y)OWs_TaL#0SAZRCd&K+o@$hS?n<l*VDhgbm_yg6|ahy9h!hGX@CJd
za3Kk4@w%Bk^Xh<_A#n#J5gO1U0b<)dFo35kARCfe0bUSx7PF8}`Tzg`07*qoM6N<$
Eg7ZbQBLDyZ

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/publish_r.png b/core/administrator/templates/hathor/images/admin/publish_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..1405a7900f5ee42a2c2c0d432ce01a84583be2ad
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005jNkl<ZcmcJK
z1MJmt6vc10?V8=Qk!=pyHm8j7KV%Nsc0Jo3vRzZI)BXLPvOC-7i+k@m+ogZ5NE>Ps
z(v;fnmzKH~ke5OZOV~g&xL5Os=Agb@iC<9(K1DeMw51W$l@jqQ%fctCh@iH@wUC)4
z-!`|Yv^_ppf}3mS;>OxJ@S6w$b7=(lPK}mveGaazo`_JJI?uTGd5G6UeIi{NiN<%Y
zUWwd2xE3yBDa6Mp@apkBp(ft`c2yDXRNL}dK(tqrh_`J8_`B7@^SGxF^4N2RP4^4`
z%*xSl7zokc&EPgt8_~>#nvuRu;pB$Uw0CcSXN8a=DK?+iai3>=ovI_)z3yTX#DzA2
zUJb;CRZlptFO4hPmw#q{_2@qA{aWFIu9Pq*5+2YZyM{$iZ5Rk#ViGIId}hw`B<_a2
zOD$n8Pd0!}H81K20`Z0Y3x=1E?!h`#hU@#+7HZEpgy-@sro4DJ3xm67cNWa<(Q2I4
zl@eFFb!bB&#5+O;o)wT#UT3w`hQY;7wGf!nPTZIOpCQ!U!)5uug}&4=HElntCj0`=
zPH3nleM`ILw0NhS@B<=y6eOV^X`6&vZjn&QW(h?$wI(pv_<eY*ghtT+&_|7!n7OcM
R>M#HR002ovPDHLkV1khs|Ahbm

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/publish_x.png b/core/administrator/templates/hathor/images/admin/publish_x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8719043981ae15496d1a8677c2cd0d559acd6f10
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QNkl<ZcmcJ{
z1B@I|9LMorZQG5Vu8rDmV{PNq@x>E6dvVUeDLS)Sdr%v3YKGOnW7Ya5pT~KFf1a=r
z8@a%QwyJZ&qndjHsZx9dXT`hu_)%<lO0w#iK^4ywss$$!8=4@idM8uGHJ#Ytv`1VV
zj&DESIHQe?EudO#k_g`xok`rrMX#zc+fT|d929o0ph^rs#cr8P{Pu+@n7h1xl~CR^
zjfzp|s=MaXjnf<H$}xw2rn!7zjWlnBR4#(~!lBiak3c7gk3PJ6MOsfr+AQ~#?Q@CU
zvzUQYHiC_{{mV$4b<eZCWUq2`z2zJJ=(-f7QekWqk=ZLgMfPe52id+;esC#_`4>YV
zv#WIn$=tiUg6UqzK<j)6DG`~mCpOZ97KU!upQY6H`KCLa16t!jY!uONNWtEKA8q}9
z&@Xs36u^3Xt1dT~4maorgl-QU_))D6tZ#N8+2nxGxB(=3B(8f~97y1Q^aW0AX_Xn3
Ri%$Rm002ovPDHLkV1lxA!o>gp

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/publish_y.png b/core/administrator/templates/hathor/images/admin/publish_y.png
new file mode 100644
index 0000000000000000000000000000000000000000..4652e87c2e5290a98244e7ab2c007a1740da71ca
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003nNkl<ZcmZRe
zI(SvaQt+{f?e@<}Y`_1{WB(7rUprXezpG|h|Du3d9<SyP4Q%INn*Og+|NrkqIT*vl
zeobQk{i2v99INJ!tsJ*OieUKftrh?O{P+RJ|2CMz#sAFU`1c&$kQe1F?I1}M10L)^
z7_iM9Meb`4=X(?bzE9-(Mw|f%{H%nf0Ic~@9<w}L0)at(hZ}%R{#`To0k8p2fhLh-
zz}J2rh&P@PFyQaA6Ic!S)Wr%h;65%dY%qryaAgKo176m$9zaAP&@_-BDfnR_QdB-H
z!t}=9a~+T{cyj}ks8HlU7GfshCRU;n(ytlp|L)|o*kDbKkE&S@AQ=LRe-zChd)dC-
z$OAeZAGnmwV)L+;_1ya&HgMwl49rx|n^~XTEMc9)Knnl>2(HrOHTg~%00000NkvXX
Hu0mjfP*$Rw

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/sort_asc.png b/core/administrator/templates/hathor/images/admin/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..1204f31f50f223a846500bba657e1b01af54fafe
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRV0VEhUS<KuHq?k&A{DK+&M^9AR3gjt!x;TbZ
zFed-_|NsB-ne!V|m^%!GkEAdd9`IpPU_O*GgOizI)hDH*XSqwbL56s``njxgN@xNA
DU`8HY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/sort_desc.png b/core/administrator/templates/hathor/images/admin/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0ca72e6c8f3940a9f55559674377962df8bb9ed
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRV0VEhUS<KuHq?k&A{DK+&M^9AR3goGHx;TbZ
zFecC7WagQ#@MTRu&wu+y$@%|`|F9c5@+fd0`NN^YDBz}4zWfo79>^3=S3j3^P6<r_
D5hEN6

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/tick.png b/core/administrator/templates/hathor/images/admin/tick.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b11164d73a67afc0fcfbc5cd82640de4ea6c213
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004#Nkl<ZcmchU
z1FsxF5P)l2acbMP5!SYC+dA9to^79Pn?K=x!gTgh+nao=@l2clzQW<~5M;`48JEQP
zQv~sc8A0q3RKz6remOEddO34Dx*bl%mO@!Xp#Bx(KC;kL_k+-G*c2R+g&n>r{b>in
zz&-a1{}I^X8Vy@q!{Cy4gPS=0L`fE)sRg0eAoEeEAOGiiUrH&S<FLyz7Pgs3z(xDI
z^cTjYs}%n=IBr@DFMSuG*vs2T{`1|hsT9{yIHI2cJ2j)=q+wB}+#{Ou)dpSAtcKmq
zW8tiJIlOY7f_w)>%6DIald5^y|3j_Qp~+La<ePQYISbD1tr-u5%c|ADa-4vRt;@6T
zBlR;uXu7}ehs~m?&P(@~O$5S;>N)W4F48^t`I*0NJXLuxe=@v--g4oG<7$hvL)s%9
z%F4<HJgq$BIhC^j#4Qgs_}2;Pf^<c?y`}5hf3(5v?V~$F#?v1eAeBm&;yDl*^cHd-
zfb>OrzIEE+;|$27^Sel&MI*|c-s-e}tB-bnVZ8xL3dl7wm#=XE0000<MNUMnLSTYP
C^5U%k

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/trash.png b/core/administrator/templates/hathor/images/admin/trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2d671a41d012d72735ad05502610ddab31ab901
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001%P)t-s_xJa=
zyTzlVsLs*d-QMBv@9?Orw8Y2K*W2ehJ3_Csywup_#mCH=ou<IT$)u*O$II3-GC8%i
zw!6K>+1c5qsj%Ya^U%}Z<>lqQz{{ALqjGh7y}iBN;qA4yyI^5!uCTRTUTMU|#&B_V
z=<NAdSYy7z%u-WZ<>>W}k(KQ5{Yp$#mYAQJo1ch^kbHiJLqtq#ZFa0k$QJ+r00DGT
zPE!Ct=GbNc005dvL_t(|UQN$Mj>Rwl1JH&U%1obe;Qp7JFEts}J3o2jWJ`l_Ly{Ph
z_47Lae$z;IA;iz~dR|R{w@B0UW7k&z;7xx#_Fv@^Am@*pLQK*rfaRxZR6EeB8aZld
zna4#v^4fzPAg&Mt&PC8(A%Bt19U^GtS-u#k!w+jcYbR=8Mm9KD)&f~}-3NjUgQO4+
g&Hr73ivn-;4?pV){vdq}w*UYD07*qoM6N<$f`Tf&v;Y7A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/uparrow-1.png b/core/administrator/templates/hathor/images/admin/uparrow-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..20175936c331c4f2a96114b7f706ddccd9f87dc7
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3_UF&^$uA7ATVA>Eakt
z!I=ERUr8bU@QOC~<^J}2Yi369=F8bwOrBPzV<K`wVa>zWtHaeFKjyEjX1=&>!UX^P
zdjc02Or%$c^o1QcqVOdl%OWm_DY(laI4GzfYsan<O@Y{mJrW&!=Vr6JR6jd+*RuSb
cLcaxr$<oVni@noJf%Y<Zy85}Sb4q9e0N%tuUjP6A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/uparrow.png b/core/administrator/templates/hathor/images/admin/uparrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..def39656bc43d68595f2b348a4b076d382160558
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar*|t5^oYjSaPcZ*^gXG
z$@~^o8qeBM&-5{96VHbDf>Kj~|LsZAlT2p&Sf?@{`9JYPr9zsT*Jiixb!iHA{73#@
zEKmz%J7Jb{j^)w+h!4UF&knART#>U>Kwv-XqyH8K)^W@`K8ckveyq3op)RnRXWbDt
ZhW?uw4|#X&6a+ef!PC{xWt~$(69B{(K)nC}

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/admin/uparrow0.png b/core/administrator/templates/hathor/images/admin/uparrow0.png
new file mode 100644
index 0000000000000000000000000000000000000000..60602b836a59f1cde9472e7754a309dbfc37916e
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6Vm)0PLn;`PCHfM=?&@UPT;dK9
z`xCQ4q`&Fu>goU4oup+hz0SGzm;LbP*E2SH<R{-NtGivVapuUPg!pIs{ulg6k>{WF
zC2-;5{QiILO>Z-}{L1J4>u0K;7q&3$0wcph29JhMR=&r87BP6b`njxgN@xNAO!hlZ

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/arrow.png b/core/administrator/templates/hathor/images/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fe1a536d100711cd50647b4f5a29e1383aa8ece
GIT binary patch
literal 101
zcmeAS@N?(olHy`uVBq!ia0vp^l0YoL2qYLz&wa@Tq?k&A{DK)68K?YR2jt0lx;TbZ
xFed-_|G%EO?2&%Q4`#JjjxDxxSf?Mo!p6`z&-9<$tC*7@{hqFVF6*2UngG=m9w`6-

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/bg-menu.gif b/core/administrator/templates/hathor/images/bg-menu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f36c587265496b3adc50065524f064e8ae9ad840
GIT binary patch
literal 37
pcmZ?wbh9u|6lGv!_`tw$<HijJ1_m7<W&nvWFtN1suViJg1^}E!2YCPh

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/calendar.png b/core/administrator/templates/hathor/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..586bc28ed06b0a6af93f67c5649f1a58ac1a7ad1
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006PNkl<Zcmb`F
zgR>t=5P-kkeYRuUwo9?CVvKTZ>%WNYq!8P-eRr|-+nJs$>Q(IP#Y_*rCVwjyz=GXR
zCmKV4ZKR-xpaqmaYJYA}-uUs;Xl2kMM`rddT{{Xuj2Yg!c5)WKA(NL~tqc$VJX&x$
zan%qo2DAdv;JV>F@*dm>ymy1O*Q2+4gO2?KU<k!P{%jBxent^Oe1P|<2%P^H09R=~
z0<?Tg$v+RlNa%@3=!wo9fjoHth<plAA%G=Crqi=w4$Jr5r(1(OtT^z1uJv+Qb?`o&
z>*itIq5HJ2lZUr2-hJ+Ys|7KJC<j(~mmJ4t^}z>$zV7e?_T8V(?zMsuA^O;4$`wc;
z;)Vb_Hv|LT1&hv}#V8v()y*N=8{5~;!L}UAlqiX9JG82iCoHX!&pj|gaB<_Yha7%1
zk3*Xc#`o&PDDR@hjhnY{Jir<+i~^}PhED-Xg2T}cw5XQNfz437NKvlex*6z>HI}+%
z(h+UAa_>1ADX}ERMtuxHNl0^Si>;>~0dV8iEi5dypMHcZAY!=s&vVj}V#rE~3&Q?b
z1*I^AAvCL$MU*p=rWLc;b@mZWym9rxhg`e&g4DzqvQy&%m}B$N16PM3R4kmtzfay$
zB2PRw{(D7%^cXJPdG5swsh;JWwD{0d$MPZaNh6tkQ<hw*8qt#I*Vq5Fk^ro<;#>0U
e<+~01AMyb~u`?HDzjjFg0000<MNUMnLSTZiIv1k=

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-alert.png b/core/administrator/templates/hathor/images/header/icon-48-alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..297b582682a5b34a93def92459814031d639fa7c
GIT binary patch
literal 2318
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-apply.png b/core/administrator/templates/hathor/images/header/icon-48-apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..179c201726d434bb852f60fb429ee2aa3c1dfe42
GIT binary patch
literal 1382
zcmV-s1)2JZP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000FoNkl<ZcmeH~
z1#Tl-8il`ei(C#lJ<J(=Aj;c8W&uMh7#^`Sy@6q7=9%;kUUrZjJmzNR*ACfbtZ|ip
z$(2%MIh=+g{kpdB`)-|EARh8O5qKi-MBoG``R~(TMp`t=mw**YQL_9DCoaAIBJjMz
zcmdBRPue5xv@RjOVlpOh=2=cs(oS~~xm9oaRBZ^aQBV3^`ptTsG<^=Zbm9ckb|;5-
z19%yH+D!mZ7@J^1+S)h+eEmcTq^-8Wzh}7fX-e97kncJY3L+HOK+xZ~TL<Rt3_N=R
z;9Dbj=YvF=tmV5ci98Z+_Wgk9Z{7jWi8#b*V(?Sh&IceccrbWLAixF4InrLIAn?EA
z6G)rMBCZU-K7emRVdo{|9jz<CS4`k(jwAiX0A3p0ZQeT;zARxsp2KdX8aynH0lt~T
zE1s(<tRg|$9Kd&XhA&ph?mlO*DEZG*M-9J#^rFE7!<{FC$7&*#egkEAi<<xb+);ME
z24p+GsGvHk%>Z5qWYCn>o#9R3U!OgyyUh^3lEKGz`^?~zQqL!bH-UeChH@_6+*}Gh
zeLwKMr7#Mi+p2rgio|K4&Mq?*x)Hn|8~j=kek3tDyb1i{(-iaim5r~(akM-$KTlMt
z;0c@){l-Ri&@RbdrkF6*z~G}Ye6tL1+{G&}7TyH@{wc7$a%FSD^ZbjaKKMZfyN~a{
zbHXWGA#FA3Z9aHO;`2a#a`@Q-{IK)Il)JCV;7#CfpBxEX-TJ}QT<!bu^bG3vXszAD
zqepe{Kc21SB5Auxe*%fh0A3k<Sb%SDgC8TIiQoa$`0GgE)oWX;v+sTXQV>RL)!!v;
zHwZlu3?`nMBAz>i186tsHR>;koh2&1t07ih2JabsXAFF?N|VEzz+V<d0@oX>)tT8P
z&kxyJuS35}=(}7Zn@Y7xJUfq*a=Cskp=}bOue>%c$acO022U?xY<3TC0)PI*NZ>~E
z2f+6!#B(C@g<T0Mah1wUCXs<PhY}h}_>P)TzVpsA`0j-8uv>T&_|wNn0ymQd;3B02
zb_Gm=D3h43;Uvf;lC_td_=@0pFBo=S0NqW}eq)l4@6*5^0QMzd5?=$BDMZ6+n1D%C
zh7!sp8u=4-08h5_0!S0m?gj!7<0S0s3idBBM#3qRa3%qP8%jjg8qNW|KI$>7R+>Nt
zFO9$jI$-#szyuO@9z5k&!*@fGFv=w6aH$8~E@be%3?77RwFq>8@I`@%CCcX^6A7c3
zD4M6=-hgxqXP{CxLQt;K2>vhyOyc*zcd-Zvd=Z&|N#Hr~B%G}hm`JHg27f@&mI;i@
zYd4c+;A`8?LtZ6k=fNaQ#3>sM1-3~T`~gOrfBZO;<n>$IB|KNGQa0e3h*Rk*WOLB)
z7H$0DV@#SiZnw5c_@0PN!p|g}RViBq&SVY+-lDbNo4|y5>&{3*cBt(cVRxqO=fOz^
ze>l;*zcYbd<m}yogdj2rJJ2@Z+#$kSbmuo8WiPpSzikrW6(4eWoxneAc#E$8@+0gu
z*XkX+#pb|7b`=Km2jDbE5MB7`huKf=Zgv-dFH6)yPxZm90GBwT=#3wIki*Ea3;f~6
z7X<`B1XO_-h-?BIuP|bm6zBszpbK<t+BPj90h%`Hz68GWo$s(iLSPnnKQLng0U&mc
zfV3n5pfP{~?f|!d8wV{A0dv3yO(X_<4mc)o^S}ix0z%vUsX~RqLXA8VD_5vz(=F8}
oDNGaCI;;wv{5%nOB5*MIKd*TL0a!iJwg3PC07*qoM6N<$f{3VpZ2$lO

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-archive.png b/core/administrator/templates/hathor/images/header/icon-48-archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..87bbe30229327e6abbdf2af0f7c70788e8e8a7a9
GIT binary patch
literal 1772
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
O0000<MNUMnLSTa9M^SD7

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-article-add.png b/core/administrator/templates/hathor/images/header/icon-48-article-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9249fd45efeee7246bef2b312995590b506c0fa
GIT binary patch
literal 2319
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-article-edit.png b/core/administrator/templates/hathor/images/header/icon-48-article-edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d271335e8697f0a4c0c1ee794026e5104dce6cf
GIT binary patch
literal 2460
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
aKjZ)Gc;}UPAc5ro0000<MNUMnLSTX{$k~7Z

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-article.png b/core/administrator/templates/hathor/images/header/icon-48-article.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f629c9ac824b5363c710dce8a29f60f650ffdcb
GIT binary patch
literal 2051
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-assoc.png b/core/administrator/templates/hathor/images/header/icon-48-assoc.png
new file mode 100644
index 0000000000000000000000000000000000000000..4444f875dba94bcf1e69c0ec6cccf23455712357
GIT binary patch
literal 3506
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-banner-categories.png b/core/administrator/templates/hathor/images/header/icon-48-banner-categories.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf588204dee93b30deee45dabefcca2d2e2dadf8
GIT binary patch
literal 1961
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-banner-client.png b/core/administrator/templates/hathor/images/header/icon-48-banner-client.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a5df6767c306eee37234d3b678b9aa1754b8cde
GIT binary patch
literal 2920
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
S{~Zee0000<MNUMnLSTY$6>Gr&

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-banner-tracks.png b/core/administrator/templates/hathor/images/header/icon-48-banner-tracks.png
new file mode 100644
index 0000000000000000000000000000000000000000..9be1442b4cdc59aa323d7b7f6b9c0f58baed86b5
GIT binary patch
literal 2896
zcmV-W3$OHvP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000XYNkl<ZcwWs}
z3v5&889n#<5!-n=aU4QOhyl{_EGC7r(gFsph_a3*jFwJNlB``dt(qW}s!5YtST(IH
zss>2wUaFdeva+#tgtoK=3M8}*B_xeQc~giXB@HBi6F=g|eeAne_m{kzKnzL8j&$^Y
zLJm6TJKy))zUE|E#{UBr{OB!@5EEQtTy%*s5p+TlB@p~XueY(P9)sYn8CdrGzuY9a
zoP?5a(M=~5;YPCoj{Gc0f{4y@R}cwCk$}x)qzVZz;(v&zUi#232~q_KU&|Rdm$NV%
zxkWh`J>Ch&m@H&C(!dZ2MbWgY6;1E8)rWe+wE*f!ydQ+SVqndypOhMme06$;)m}U$
zALH*UgeB94OXsiR^4TkBJ8%lwqwSdULpM53c4GG%2YkWnp~~j^U+6~XE*N-bQ$vN#
zX0Dz+{~k=AITr1{YiMmagRj5(2H`*iG(spYDZ>1f51`@iN6_-&u^JkwDiY5+e)kOg
z?9ZROdFuS?<uehNWbE8=6z%7`K>}6s1|Ab;<YVEg2XWx-Mx6NUY|W>;ep-nnVc4)?
z1HMaq)Y|#cf|9X$g}Ldd-O++;*Fum%kfFkvmx-lM&&A;n+Hm6Yb2XoATf@ZPeFN*Z
zwN#JJwk>(eQ;h9<PNDloSQRc4p_y2|`g`c^^yAR`UhhY5{`gVcCU|^Dc=6q1)de}J
z70)l3jH4&JaPdl?IxaL$%BgbB-0{fCvSEK+tKVQUl!4)HCh+pUbFO`7uI|iBx0F6R
zZyZit?!~)bTm;nCvjecC81ZCT3HI$hiO$P6UfcQmvN{Zn<d@j??uAlt(gKc?+&m}S
zGfkY^X*T$rDMnw8nfK+IjTaqe-kZvCe!AD~w2*E(AJ4Fv+{M}Hc+i!FBNwk@kM~>Z
zItN+eAsb~nW$?sV)5k!J#&P1rWk02{8H8aQNcl&Ho#W(nBzkSG&18S1AQiJ5R!q%E
z0f~l%hs(mjbtxD{OcW6pC73uM78lXi+lR&-+t7HV5sg+W>SsQLlo?B)j*BARpo&*a
zs0L<F8;v8am&lx<X8S8k{lhk3-rniqIIg-V!{jQTY)6U1g4XU3KED#ew)59u;ADuB
zgd&>}_ok<yIMqa_Suq8HI=uDO*Kyw40-MbSk<4|SY(|d30^5}N;1jw}q`5bv(3ys<
z?ezZ|`C1T$Wx({#l?p}tiiw$6QJjuLmqU2&_&4Z|#6fAO1ShK|z6tX<8;By;Y(Q>`
z0Zw9$$$)Nu9|S>QR891qX@Vuc7<@(^>%Mvx(3RR3h@dYN^=<vtBi>;ffXr1-aipl?
zUpdl)Q#bknRX7JKAQP2JqADOruoyU4d5%sZ&r>bq%Bf@O>zM(@K<gf4E~-o%A+`Ix
z!KgAmJ`5AQs$WLkiJmw@aT!jl0kX^iL>VfX36(Jk2*f4yk&%E#rDll5Vyf_XJg%k?
z3*12b(pQPsCpa?S-qoj!Ps4~90JvHrK5P$R0WB^Q3}!^;Sq+I85@k(1J0&tLt7PI6
z&+wVU;ABBH!3<DZYCR$bgw@VE>bkGKBZ4W}W)!8H6U1`^YSPO(&yoNGnNU+8Dh5=>
z!a>9@wy`%dka~<8ouSl4BVd4m+tMADaI`CmrLHs}VSEOw`$g5nfCLCE1(hs?(AO<&
zgwWL&p)ffm3D?LOkWr%u+uhy|Pk|LSqk$!$a$pSv6H;K^XN*Rp|D8mC2=Q-ElK~Fk
zDNR64V<;?Jw#-#pTIyN8e7XIW285?`{3NVKS>~(M-p43~!Ny0w(1{5of)<z=P|T<l
zf__!>s4N@$<I<2juypCt3QDz|co0DQiWMtLZ)$*z5fMAigq0Kq9Ur}^uqf*i7?=VZ
zB}rCAWBjNLT)G}oZXqvjg2js$R{*FcGT6z;&RZFv6dYa><~`aKgO%c4SYXo$9$1SK
z5TtI(78~@CBuO#Bs2V8DNkdk;1sA#lWX8~jL9l4iBBk@y%HI<cn=<srX&KlOipe<8
z5m8cLVsE+75eev@yHrg;Pc}l7fSTol6P-BO*^5w2^m7KT4m!-6H_uH%H|d3wk>tJ)
zh)+9|W%lpB(2vR4W;m@z0NgDXT9SclbI5=-6%4Ffi6-*WQy@@kN7{Ro@!7JmY`Px_
zm@{XNorG4?{@9uDp-c?EMYPP_VHr&{N>ALArW>Du^#hJn%*c1bxuz;HYE~=VR}C0>
zpwZU@0r382$)pX?fkdt+x)TNK#wh9U16xSgIwge{XJ^1>45-TraF~!`!u-(|%+5){
z)J!w7%sdPLx*~CO75@PL{OVJjK72?&uWAbCd-~vt3BJL;ea)IR%L8B?bzgm#W+%_{
ziUGAI)F+jIxF*{Npze5&fN)&K0@?-77#rSPn1?^i8-?lF7Bu%n@xsxoc=%%<rho7?
z7Vr0={BQ^MFRZxfLWlZ#eRPe^eCZ*V4+Bv>*iA-8SOUtKR03>_Y5|lgDO5~LSB-q^
z3t_h}fRG@vkJx^Wm%Y>-KY%uMq0Oo2pa1wI>z;R3LWeW^cGdpv)tCIx;r{#YcL8uw
zmsOGa6qpf%!O)Pj0kJ%*&am}{@8G4FYif=OZ+LqVR%1mS3Em}xua7=i;KN`j{Uv7X
zd8Z#h1<|iX-#|j>9272HT5N3C$!cFx1{h>YArzO^Z)^(S`wjt~?$7Ai&B3a-|N2KC
zhDH?$uGI{9h~*?=6U};Ab91x)`t-2zVI9{S(BQq@$10m4b9gqR6C1}~$J~iy;LLGU
zAPKa!wfVKVZY6FavfG8~0VvX6za*TI?SXIa-o3YHKq|NU3*_FKhok2Z3il(&k&V1u
zXE~CGpQyhAT{QFVTa6HbrI5(VJ9@D7+tk)yE8+ve5Jkyj!Z?>}^>aT@Dg_eZW5RVt
z>^iY-op^S#?pHQ6G}PabfmKhGDI)3v!65qkBPc2?#OUNx*u@H+5&bCG6O8H&Z*FXC
ztQpp$MU%-`+ZzZX7!D&XEfs}@1)j21<t_|?W5<rwDCQHy`Khk_^2;y%&`?rR;=w>L
z!!=D!O;y8wHu}u!r)uJ{xL+9~K@c&ycp|d1>}x?t!o)%VWyDGnHLkU_Ro_j&M(9$g
zq1&o*#C{(TL~%=BAh<r<-;caexe6-)R3&*M)nO3KoH^6ZahzKzwX1Z!w$NT;)rdZw
zwpc7RK}sMP4AV%NF{yZ>{fY9QRA6}6NvW`_)}<L)sIaA_#Xph;XpC0+V)1xgA1!kv
z8l~H497Z{lT;{>Mub5}^Z`ZotPKG>8{74#LsHHJNh?Y6ao{54n`JTsCu5#hdut2x4
z%!p3>@OFT`jWg8!>8-bYG)Ath%uGzV_a2-$b!IKSrV6(Sx7&Ra<LYOv5i_6%7mLNW
zQVK6C%Un1{{b*4M;AJA0K(JE>nVo_l>@XUQ9^KWs)$8?M8tI>yIL&A(G4qSYPd`w{
zC=`axYQ?=1CuGiF{OAh+CK0C)rxB;$f>Vi;j~_qY9En8!LZSnj_>&zS9lryRO-v`I
z5c!cvz^Kh;E-_>K)@tk2Y4<heIvsQAy#Qki@-LidZ9WSie~9ig$c(2?pWY4NeWIjs
z4ADsp60Z|`h+(2M90LYo1~ErV!Tj;=_x>G=gfAaDxZn5s#@Cug_%~-!OPeExh|yaa
z;3&GGme{BnaA?umh$c-iuOr8pL;{jRt>zN`Ev^Z_t}#LsbgySjDglAmt3_!Vg3OfO
ugsc-U65|?0CPr^YOTwzv0(*S|h5rC7;PW-0ax#(t0000<MNUMnLSTZOxO!#)

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-banner.png b/core/administrator/templates/hathor/images/header/icon-48-banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e36c154dab2314d4c7750eeff99695cab06e819
GIT binary patch
literal 2978
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
YFN%^DI_4-#GXMYp07*qoM6N<$g3=0el>h($

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-calendar.png b/core/administrator/templates/hathor/images/header/icon-48-calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..151a52bf0de4f9fb13817f58a0e5e332842a17c0
GIT binary patch
literal 2071
zcmV+y2<Z2TP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000NxNkl<ZcwW_+
zZ)_W98Nh#MpB*Po()?|kr0vp{vNlcGR&8Po0b8dctuR<OG)l{8$|NKP0tz4afHVf%
z2LvC+_y7_Ttb>U`p<T1Bn&=Sg*1}-xx~yqBXi1wUjq}g39s6SYe0T4Qayt2(xOT4U
znr6S~iFEJzy?cJ|^So!vR-}}Ckn!;WN2LUt|1xx+>Qi>tgaUN{NQnd_4ie{Bf^^4a
z{+x8Cx#RA!EIIDZ2i+8mr}Q30;YXtnuS<9q_~eTtPv5w-y6eLYA^Zy0mC<SQ&J&lW
zx>h~Yf7jsdwLQ$CXb)^TJo;EmZN(2e>w|>+3X6fEw8d)|5{Z;<tv<V}JyEs-l>z^^
zTPpp`i2WyF5Yq+M3%{bUuGUXe(8tQUP~Ev`x(oPuSplD-)cK`gM6(!7nmC<_g2F-~
zr9@E_`b>+?`T%u7AEAK%rg`^(kdk4|Aej?rx}YH(;LhnY985MsZ6nv3pz7n(${>Fq
z)R=BrkEX+L0LIfMA=TIJNuV#P<3PjM8SdTE&U-Jv&07^8<62`yhPm&qdc?)k?AJd8
zz{xQafckI%4+5a+77pZUms3?$g|Dg29>3;PFDDf85o}(Gma!<LWl3m$0ZT}xb0!XC
zurP8t3{%+S3xS@KMR@>(0>1eLa+W~T3k3x6M8X|k0Ce571?Ju_r26L<*t#mr$6Km!
zV2LpW#JR1lh81-!Tn)1Dznn8J3(pVJS`*}J?aSQrKwU+N$5mmZG))!~ot%{K^z_KS
zzCO87oa*hB$BrG7(TNFJ$mrPkt8?@96&o>&;Y*hQh{xkB1c^kP>FH_vety+YBoZlH
z?D;>9$~gu?2o4@N!13e9Sr`-!J^wu2-Q8HGMQdwokwDoNN+wfsu`(PPDQY3Ll+Yr?
zdkf9SNZR6PB*QOHPjR4Mqc5i8m2*=DFI`OYtG+4zHk9U)X5tm$L7?pFkESiY`HxBN
zeR+gOUZ3D+Cu4l$=qPvWA7I_S|Iyu_q7>&-CcBPC+4EYI$4<of>Dw`O{WZdd-}kfU
z$S?^H@A6Uz=HR7;+*SX|s}oG5P11%%W+rkL>6}H*5~Q*w+g}{yw_97;-BCv&?@na-
z{NZ7HZq_JH^qDgW-W!|ZjW2Jw;ucc9R^ZXMVq8dMNoGu@XOcF>WlQ?iS0Zex%CfnA
zIS$<a(hx&QgL1q%DLLHJ&u4C4ODTk>3W(wgoQmo^*B8Td&PkwAkMi9$CMVUE{COZp
zAy2&%W8V$S@~c1KCQpUP@ttK++S=N9qR(L5a8vl>>2bE*w8pD|_ZE6%G-H2G4>-w7
z36HN4Jbcfm0O)!4f}Nxz$I-J9q+Aa`_xTis+!2`Ii5+(X5Uq&v<9|nSaqsP2pxClV
zphD=Z(npZ409BQhdC_(CLB=u`5)cw9RA2tw_d2WCQSaWSvhqe-G@*;4O~2BYejfy6
zvA{zco9wt;wURkOf6}5d=(oj$lvFE5ULX_-v3Bk3w%GQ<C5}ZhNFd->Z0Twv#e*G9
z??(ls9bWm}S&bY}8L$Oxsckn@mAi&rAxGF26%saA=yY`4Qg)u@O~67*;qgt$<mq#1
zsset51c@Z9jk9w@L)mKtRi7)2EkLhq;rp)-^OH}sPzqsL9t14ml&U=aDT}=)G$#>>
z0Q^RlN17*Dy?SHWYy9FSg?K!}Z(@yfU(6z;v}F!PBs&Mk>0Hso<*>X6SYm#G3!2~u
zr?ObgtfWK&70EFk@SW#@ySL`&k7fi%MvPfs8+NS?v1G{-J05R`-nd01Z6TaJb$n=w
zj@E{&Xd%n8O-qrs;K_3)Lh(@*0D&YpHOjYErMY#}mRWPhGJ-!18rbdSta4Zz<NnSS
z08E<_Q&H^w;Jk*5iFAqkd#ykjfs9ai@`8dUW;UU_0c&c)yb^5V$bYT;qxS2~Q*5ZK
zqcP-1Go{n-a8PTeHEI&}!wV4$OPQ%6`8~A8N?o0R=?WAj|LaJQNpoh!<g6!%5oq9|
z&a9Q5oQzRZQ^OZp750z#5V*om^-JtOsT4fDKru3GtfjPoX?m%Ed0Bz|lVRf0ZznG#
zt^jV*?lA~qSCTCaFp^VwGpXj~1Tvqry@4IMTVto_{OD~Z1x!yBFii|&w&|<sFhhol
z>H|>be3RfNBXQ*{!^&Uh!A29+fRkpeo3ty8Pm6O)qL=NrcjV`ksDL*C(=;gLBbh<k
zlS!_G`sU_Y*ZEu%+@2VqH=1G8Q~?ROEX#$)rq%|QuHOXU&hb`(;@=1U`NqFwV?#ZQ
zk#qg$4}EsqJ=@DxAd|_E%T=?Oa67|%cit9Crc(Q=!{IJfRas0-#$s5OwNFu$@&Y+s
z-#a`qa&uE-<ISqy&tf2@X~g64Jzv`K#ep(=z~$LLJXh!Q`JN0_RCM{TvqV<c2Moj5
z`_QhPhX6bY6rw0f0H_0&0<}P;Q#oI8px{iSG|~;koUni#paC%;3Zwx+2~_6C?<C#?
zgn^)&@HN45?xO(HfPS?CCJ=WLt^ulmK#3|SZj_*S^(COVV;D~2NkF&@=Dywy?*da!
zDFbD~l`58ybCS0J!wJhhUnCO-Djg9s|9Uq}6)(6GvVh_yS)u~-BiwLt<o&b4t#l9w
zxO)W?$f{g1&I(=&iWkL^aE^<sXsIkJ+{Ez6{{cxYM`T9+Hb4LX002ovPDHLkV1fY#
B`h@@h

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-category-add.png b/core/administrator/templates/hathor/images/header/icon-48-category-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ee7740a5fa51fd1727b531728337cf9bf4525c1
GIT binary patch
literal 1102
zcmV-U1hM;xP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CPNkl<ZcmeI$
z18^jH7zOZb_rJT(wr$(j$@xkt97<=~Mx3lSwr#tr*0#MH+h@M}{!`PL9)^?asmfRN
z8#Ld`C^KHO<JOs-*_oZ$LD~H;5x+6`8Zr1S<S4;7Z6&7|slZZ#2}(6e_)7>TNu4IQ
zOr?NIU;u-}&yx#i7Ei1|>D?-Up_JTp$@mKt-=-26j5_`Tg*U1M1~Y*I`PZlf1~Y*I
zxtFU11~Y*I*%zq<2IIN_66W|K-fJs?!ENPPt-~j>OOPM}OJ4!Dha20<4?tN7yTwu<
zNmh|{5zzQNP;#fSRd@sW*Mc(pSqdZ{s}gt^o2OCAiSR7PpJH7g^^~Oqp5f%9Ubcg@
z(-tHBba(>FnrdGl<4j*<oCVKt=1cYkGS4{$ndibYoa6XEQ)FFml)&HyUHl7iaVl~y
zhLKUmQWyWkUG@^e|Dh@Ge!NzainFVmAlLRmZWw@E*N-!+j^fpl6uw^D_9N#7@~*su
zV5WUm7!IYX7fNkEl*%5+<=v3Wx*(O4%5F$CePFcwlY(%*y*k!+fkA?qa#z7}C>1?W
ziaMa=wL;dBbXZ|K7!_mrty^6eD7d~9h1X*ye3lnZ!P}u^H;t0Bn(#{HN(5|b#TBJ(
zkmx?k)G2J^*NdGOD7xt*0(WaFcoa$wg-$;_N=`eB+f(X+--p3xS?8~iXc@D`OQjyV
z#BqV*TW=w7x7V@~prjpwlDywUP9nr7p%B_E>-YtXmf524V95uZ{|Y!0{}!K}v;|81
z9uqlk4{nLBgilN!K8y*0HrqOS;FDYopVU&Ek+2Djw$q65dk0<ouyxN;0(Vkkc0-BU
z37I^bn2*1I8-}YH{QYmR$eku)1c}-O=LO2|_aks8C44*NCEH9s&nd=uhArL(ago{L
z?REv`X#OgF&>IyG!JXs<n@3$1u^QzE2eGVW1Y29Xtp4hJ8COQ@#d(|c92OAF#D7Zf
z8T_Z@9=OYy^OiymTW2DLT6oV(fi}yUhrwtWCx%!PLe>sC3NI4IwMSoc$FIrfHvN`-
zHr(OmMShTjmq7|zYQ;M&)>5Ep5R8_Iffj;As%-%+yhLQ8kYjfF33nd|5}w!_AUwI-
zPk4&k@uTqcSon6XEb)K%CCR@Udd#mHr~4OSV5kp#%Jz0aq-A=-k7nPMUusvtCj7DF
zIC4BWft*NAGCO&aPSTUU&W@ITC<4d6FLX$>pwMRD7A)bJCtqM%OQi0QzRdvpCf$yx
zBYdq%+s3mxDj+y|3TZ|3Wu_bZG%AXH83$Y9m$9RSFUV&x;pU8j;{wFywZO?{idM=U
z#23H3nti+=gMGSakbo0EUC0dzA1_E3-VVCloK4Udur0v}I-(6WLqr>bKDa*oe?(4m
UDFX>`BLDyZ07*qoM6N<$f@0YN>;M1&

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-category.png b/core/administrator/templates/hathor/images/header/icon-48-category.png
new file mode 100644
index 0000000000000000000000000000000000000000..354f185329668c94789f0ea933722f1e14237837
GIT binary patch
literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007ANkl<ZcmeI$
z1B_g47{&3c+O}<5?*>)04I36QirDEYPHJmyZ`}4PW7KxP+EI<ubCdfPV=SJV%#-}0
z)%owvtc=t(>7_1psY@N|7ObU=DAFYkpGpr1F}grqB?X)!#3@(G_@RUZsYWt2nE*u)
z;5}vdIY8SMUqI~~MG&QC_R!b^s;4W0Fe>(d%1MeKOdJ8_V--P|I08yXD1tC?1QZWe
z1Ysfv;Gmg~1I7h{a2MRI|BgT848=hkIJF+Qv_rOY8^NvQO#KsZxV1vjVBq*_pk|hA
z4QW96IB;{upMWFn6v1Z#9!5ty!CyLb{Wl=D>nVaiba`L|9`d?xLw*nV0k`G`2Nd*5
zM?r7+L$9^L0fl|LqOc$Qp>OElOi?uO0YSL;5q^ajl8cfdkc=B^Bm5FKd@Vt^&EW&e
zMhzthr=tBW@SY%*5$#Yhp%#@BAk?Yo0acSX6NJi$9#B1PDnTe^#By?fou1J(wt%|1
zrwF3d&beU3dZ=HJL6BvB)c?+z+PB(8X=qpsNxs)DT&4F#3a~u(kJ`EKf7Hx{2;A~G
zcV2gQTVO=sc$*y8(>;S{emv6e;in^g(30E@ul5g_;q9`?(jkEXdVDKtO>L;{)eLLS
z?Hp^_jVx>VwG3;8>+%+BWi<MAW97bo&HZ@Z$DHkM@V2z}wmD$~0>-za_SAtoQYY%{
z>5`z%QFQWjqz>N4Zx;~Zkex(8lSU*JV1;@J>5zb!rqIC^Fq~q42w5Imhv*m`q@$Wp
w8`4?_jE?vu))6{HvjaHI#13F-f!{`d0pks#WAPj?nE(I)07*qoM6N<$g5|(3xc~qF

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-checkin.png b/core/administrator/templates/hathor/images/header/icon-48-checkin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab4cddae23f5fae3b611cca8976c1b27657cc81
GIT binary patch
literal 1491
zcmV;^1uXiBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G=Nkl<Zc-rll
zds7ov7>Chnl`3AV?LW2FR$K4UVVv655z)%DqN0?W3M4=TLIVi_OfcbUQ30Vu61AeK
zMLUj`OVyTw)*BE>NZ1epA%fC=g8c};ZgzIqz-GM-YU<>jd1jN{^Pcm(CudKx3GjzM
z{NWFO_`@Imc!T2PW0f%P--waYk!0lm6OFQwg9fM5Ip=>NU;9WURE&f}JEVkusF0@U
zQ6h3jb`d^bMD0+%Q1Ung`iBKHCx+ysuhqkGpspABto&8i8G(HG8&d1agWjcqdMFNi
zAAf*^M{A*V9iq=^hT}$jQ-1J_AZ=(9S>=*JKd6SrMad5@8b$eVFMa;V!({lJyn9_A
z8jK*052jO+hv7a(x)zN==n^1za3_?5dws6}^*}69?2L!rsY1Ck4Y31D@tyNSuM{~C
z-0>;-<NfIdO@9pZ11e|-6o_}MM3iH(H|T5i162_|BVX;vu9o&~fxce}ZGSdI_H~G|
zf5eO4p*Hx8{HZ>TFwY)N$>-5z_J$&wSi(!OJ;8UDPK)D8h=kY#twRRABNv%OC}ONj
zc*!BcC+-W3>S!@V$cyGT*v|@bdv=i8zAWhba!_cCMvVDmUgXv=aw6pEfz_6n5k=2#
zBwId*#u`Unu$9Z6ce~8B>?F%=DbU#!C?WPEw(ApK(#>Cy?r|q%)@9}}QezjRtUrgQ
z)R6^AcPK6p6|!fQ&ok{J$_cl8Hr&T}<8s7xF7=AYD8NNq^~CHrmEBT<+9t#?2Q_PU
z2?~3~?$<Pu2b*!mS}1&4AEhSIokB|#biHy^5ow6;Sb=@*%e*4$SclWr0%5>JMTuF2
z<9*pE?WG33w-WpAE<;ZD9{OCFT?)m6Z_!B933w;KBsCm1ML=hhp@ztSxILKegAZ+Y
zZgs#!Mwv;B3cDPNu5j$X{plzwa}<642O<?&?OVyl9&Qo8SSn@m&QR!xEE>uEjdU&_
zC%U8)zt<OZ#6sQ~hQz;D<G`)Y#!zZaLS=6jeN?wckJ;{iG8GB4?{A~TGil`Qp>z%(
zB^?Pwz{`k|`w2vR>vDKQ*tQx+x<#n6Wum|o3)S5{bP<i#bAr5kJ5XayhptBoRr?M$
zkIQJ@ODW)2b4`S}H5l<N%e|7^wjPy~Xf+{)+8Bx2PGyt)*4L!gk_MgidlYp<^5xP<
zZ-$VKmUDuDml<b`#fF3%E5Ju;>js>#q@sorR#G!x(Ul0DB?Cu|`|+f_%+@Vr6D|J=
zqWrF;De>A$@R8NF8CpvEq(uT9Ma6>zBwb(2+y3B<4LI9bEPSO89*6&mB!o??z=xuB
zD{8ybp*4wd@LDjQ)b^sWO7>cwo|J#=CWQ^F!ADNZR-`ru<4J9Pye)ryKaHEa&I{zt
z+ep!sHFyy!Z)P+FyzXeTG=!vI-H4>iYn}`B^(f!@Z|B^dQlaGX7f8Ca_L<0U+C%!>
zA5*8=@~e~U1$Y|SSGJSQMuQ;07em{kFr@sv4t!)>{1R>E2KPhIBpxO|2i$y~n8Xja
z!(+`Ug!ue=j7M>4JL+0XL`>Va7^ZkImEvs=rj3C;Kb2t$+YjsDO?ooVpi|jFS?cQQ
z79MR7+r)L0ID?`-45zObr7$AX83HNZp_suilOl*=);NNg>ob^~K&Fqk#}zY~m1m_r
zXJ?w1!Dq6Av;6jFecb8a3(MS4MXh2)W>d^zm`gE_Vm`yW3=3%3_w$){bD8`gwh(Vc
z@XJs4kPh;YnMcEs;IPnx_nyK+I>(~`W~^BrpF|+Lv^bvtyJW@{5a?OJxLI7lBltcG
zk0@7mE+ahKi}ZAkI1O_T@T~nQJcZ0;i(!|A2lG9c=PAbua@RNwSC(ETJkl&|@ZHGV
tU4wITvam7?Y&&*$;T7cWFkIfW_z(FBy`z8@U9JEC002ovPDHLkV1lU%*7^Vd

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-clear.png b/core/administrator/templates/hathor/images/header/icon-48-clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..76dee7ce3657dd26b2adad2c9e5f846ca7afe5ab
GIT binary patch
literal 1614
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
M07*qoM6N<$g0ejV2LJ#7

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-component.png b/core/administrator/templates/hathor/images/header/icon-48-component.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4179a6ea2b1bf56cf84730ec20e4ec215fbc59c
GIT binary patch
literal 1797
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-config.png b/core/administrator/templates/hathor/images/header/icon-48-config.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b895fcb6be4b7af5c201d8259afdef39026d466
GIT binary patch
literal 2319
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-contacts-categories.png b/core/administrator/templates/hathor/images/header/icon-48-contacts-categories.png
new file mode 100644
index 0000000000000000000000000000000000000000..73a689b52646f73aedac713a6a486c2e152ccaab
GIT binary patch
literal 1827
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
RHLL&t002ovPDHLkV1iH2L$Lq=

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-contacts.png b/core/administrator/templates/hathor/images/header/icon-48-contacts.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2128a1c4814a0961ecd1e5769747662df484934
GIT binary patch
literal 2513
zcmV;?2`=`DP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000S?Nkl<ZcmdUz
z1$5iU8il`+Wk?)qut}HO<=x^kGc#}L@q5e6%*@Qp%*@QpSPV2JLu~Q9RA)|(YDG@d
zKD_5#!Pu7Xo%#QnU&H@9bfOUls(>`0^PhtREFcFI0e8>_RC@!vUwtL3thOUkOCu#d
z{F4lxOWHtvmomRm?GbH8&n&)q??OJl@>U=VNFpHUAJuGg_E}>N9Dl^NODC9b0hEY?
zpt!(&$%P#JZ=0)iu72=)<~?=8X8id0yMQy;5vZVT`7MW33a<OvA!|vHQW13yx8a4`
z!uRFdgoL%1uOv}Z0qN%9zz2gdpaC%;h4i%7x(4`DZ^^{sv9Ne0;Pc-Lkaxf_Du6n`
zRO4f-Yd2&-39p$vdGf}VWi9u0ty68gb3p=AIw=+$rnfE&HR;6@D*-S1dm1PMK9Rub
z`+U3i4yUkgEQTipvZuiBn@r?-U>@L<=0L^SXP<r4UVH9&j;`yJ!Zb~Gy6U}-DQj=m
zy7*!v#fJ@Kdw71Ui`Z;cgFZ-y&p!V6l5u;OX8=8=BOq<t&I0sjz_Ki4q9V0qVuJ(`
z2%Ay^9)Rb7XFw3Kx<=@V_ZLF;S!bPf_mnA9rure&wDr;U$TgP%3Edgyv}cSt%dS2o
zLhRrSczwbn49LD7N16m7T~|aUu?uAHy6djzfmSAM|93<kzTk#hsF$h56B}v^iw+1E
zfgC`FM*!Tivyi7~A(4v}8eVymC87iO>a&3icwqw(kV_<X?RvpB!;-9Cr!%wQ@qVYt
z6H}}R1K~vW`V5#QvYbc*Lfxl;YNXWqL|G0#Q;9{2|5Ha+aPa7Q9NYGjUysN6^XL{1
zoS9|67rM#YGGHJ&r10GE2*~IW&^O+A<Ka8*xZ_c_WmWwk^cFMO2}oicGYnz$6dw>H
zDrjp-l?$o$n{*Bv*Mw0l;(8vMrs26R*-VC!Eon|3Tg53K=7M1pHXuL<R1z<`f%yLW
z?|;~Y@#FtS2xC*W<D|Ym<&pMpTbtXWO9=SK>NU8ILp&Zw2ftma^Mdw$SFPpZ&-3Ih
zum40AsC#9=H3=dnJP(ll8E{^H`Q`hXo0~U4%6ONPUf!y%sX#(}-dv-Qn=|)!y`^3W
zjtrkMEol--oj&0uCIHrGNb*rfF>F9Ae2*i+atUJAEWQA&VB80<ldAr2W&CXqvi{nu
z`C@YgD45V#J7E0h4_&oXc<6fH$EWh)%)-KnEFfse$`%;=`)LoXU-!=UnufQ4KTYN5
zJD%ZvpbM}=D=}aw#zA;}p^>hD%G9D%l77OL2oBxHgdkSZ^Zg~Vz0>&prY^HLNzL`y
zfMlD^rX2p#G1uK3HW0?3>K*l`yxU%6lclQ&AY|tIZlk2v!v+MBxbUdeEvjQSH8G1C
z-6qqlj|LJzvAh9EgxIj5pnz|B#cjS^ZCJR%^o&W~bR&B`xGoSdBh>d3*y`)yB-VgR
zpc-gJy0JddopZr<pm_+yw6c}tvp>)0uyuywLkI*5<Kb`Spoy||kh(7wudd6y&?F8z
z=%C$p*nayPbX`y5qZ1#i!`xiaIP}$d%vo-Ds$3=c?$j*ze$~x{kxi81+pYq)e9~FI
z4hj$;C>|(lKwD*%RYq>U#TID@!?x|zInUqSF-NY@DrET{Jn@yO2nqX-Y$PcDFOU69
z&Tt2;gGxp~5oJb38n7RG?6F(&`Ft#qNDTef8Mdw2+}Z#Vy5=#nW1jI{{i;fQgaIWa
zZ@3)#>~CE1&P<lAO^`EPzMG|{&4KEm02P$@fkVi7<Bd0d@8#)0EBo9$nz88yBp}n!
zGAy+yaXYf5k^|OiK>+Vh%P}KsQJc~^dZS@1-D~E`ciL&sm;=^90s=iR`xW2cI$$g2
z5Ska6tO3@gV(h$99XqX5&qm8sQ<ID#gaBawQO%TMpOMXc*VV&E)3QEa`)OXuvjY%H
zd`U<JG0-$x_O<WC4O=;I?G|d2F*R#SJkL`G!jP(zSg9e&%8kuT8r$rD_qumxaMQc(
zr9B)H?n*&1R%rollmSh(CBYM-%nQi=s}JFr^_l^R<2b%qB7{eo5o((G+qy0ErWntB
zH<uuO`MmS}Y-hd$A*2AQA-ktP|IYP*8MUoad%yt)>^Oh^{Q9r!ylOX|M*z(1GR$md
zZhPx$ZCW~s0FD?t#24<lt}mu6$`}(u_$Bu?E7gPy?ECsBORs1DRxdQ9(1a}5-i)iJ
zbZb9HmDA^(bIt+VZL`g}x~}^*O<bLIeR#^U?Y3>td%1n~h_P(~XiT`i0mCqYL%vu@
zB$HT{Nhwwt;w`matppuhz_G=u1*hqd*S^mj1z4dZZf|d&ma42o69U)sD4Hg2PY<r^
zlF4L@Vk}*uLWn|dyC#Hx9#oIhKTN|Q1RZ1?97kaHvey9Ub{vTHyAE7;-E~j&au_f)
zw)ai<Bu0-~RRi4iPDAGM#nkW-Lt;uqPp|M|vFIo5AQ3WA@So*S3QvM*X*jkrVGCS0
zdK&eByrPHDTs2ptx3#1MEvaA<@Ag80;nlEw6;$bv)+NiOg95|n;Po7{mxiF=!1R1C
zbCOaxuD~*V;l2sm5qJ>>LJ&%P)N5bCfp6!*_w!JniO|Yg`nxbB<={GCq6{pcBPiL|
zLMv+^z*s=MMiga4`(nWtYa0G2U@o8$Z6NqcSr0TIJxz&5nl^5aQAWH}R7Oj<xNw{W
z!ZlyKwSbmDdeI@IufP8KBmVTqKi-f`ChNQ1s^w+nJOJ!WfsVO(<Dt&_ls2>}styW;
zjbO>(y7<Dwu^+JxOqw+5kn!WkZ$$q{y?y9Szs()mw8B7@q)=Q^xQ^;|8QfM8F5vZB
zjlS~AEBDma)U2WFdVRN(?j3=2g#gS<fjPM%9hJjZs2F%h?Oz7ZgP?fB^SXXEicbJ$
zxowq7pf$PoO%FAU8M&HJIUpUER613DM~#0Sda?z6ed^|8`0jzH0Sk~ycor}KFKS!G
z1S&;PSTgQ&p!)q^j%0NPm<AX`K#RzWN@*5MHLDCbMGF2+&=NMPrw3yo2E@%T9(^p|
z-evqZ#9O9K=P$p0$*0%82slI|@-3|nSc;)z*QRZqt%)USklw;uHAoQ%zH-%@R2P!)
z(kl^~*GmUYx6tAyTFk*QrtrZfHv`=&q@`jR1L09f0F{ar%2-@c51h*lgj93^ThR-M
zk?OZnwY!QIP*Ab&2I#1>983u>LODD5Dc=jQG=yV820DcjV@_a_aRcK1s|c4|!Fi+H
bC@TCDWiu`m=zn}q00000NkvXXu0mjf6@=1(

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-content.png b/core/administrator/templates/hathor/images/header/icon-48-content.png
new file mode 100644
index 0000000000000000000000000000000000000000..363020bc5c043619a9ba6954e7a15479011bd684
GIT binary patch
literal 1736
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-cpanel.png b/core/administrator/templates/hathor/images/header/icon-48-cpanel.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fa510d20359323caa6798cf054327b1dad81962
GIT binary patch
literal 1431
zcmV;I1!($-P)<h;3K|Lk000e1NJLTq001xm001xu0{{R3VB86{0004QP)t-s_xJaX
zqqb{-mF4gFV0Mk>=H~zZ|L^klgO{s=l%;croJwPSR&a_yTX<u8lcl)L@9*zxgqu=p
zgxlilhMTXdw7=HY)<Ii!zRlX;?De<3#7t?0l%lZS;pL5-tZIIebcvkZ>Gap+?wY5x
z^85eM)Yq@O##?fTi=VUV^!%Q)$epget-Z|U>h5ramz}D%lBm71z|KQqesYYZrnSV@
z*xkg=*UZn>IaPAe-s{EF;H9v<T62rI$=l4#%zcukny<sv;OySs-eY~4`2YX5#@5Bl
z(PVj!;pFGG!Ol`|jFzjv!pF|7xWwk{@p_D%rn0`g#m$GEv(DDtr@PL)$kdagv(DJ#
z!qDE4ps#z5qOio*e3h>E`~Jnn#mU#@&fMo+d6ZXfg}uGKS$32>Saa6g;_&qNJX(3O
zw!rWB{xwo=-{<akk*cz|!=AU$)ZOP*bdyJBhNP;pz0cu|roWf1!@0}dt-aQ@wY4mP
zO6ULp00DGTPE!Ct=GbNc00Y-aL_t(|UftAHv*R`xfMJ;#!_3UgOoy47m$yv+zOu8)
zY<e=ynO^q2aW3@ulQJWN|8?t?DQGmA@f*Mv-puRkT$XZzpUA5~!;vKG&n^hqEJ>2w
z+A6S{fXj-U3`zn;lGMY>33ic$F&5l%0;M4WRz+|-nkXM00_`yYE5naT^2LqfkqBx6
zuICT{p$tR(3wS7kT|p^Y&vH?f+p1e8s%kW%OF<*e1h#j@7l+sj#xNVKTWzd`4cebI
zo`XJ|R^Cnl0LO1eJ1F|{&<VzDKA+F;_uI~@+oaa<{P25T4@G$Pb|FY8SSpozcYzOM
z7&ZkpU#{wc0CdtbkiP!x^}ZuDfX5A|r-rgn3u1Fn^RX;Rrg)Z`flN7tih*)EWLi%v
z$GuYnqi6%>pf=*bVcrR*t+|~niYBdHF~Wo|w%o$OZLir~0C#t4nGJw%x#LzE#Xe$K
z4?QH21}NdYRka2efFIvB+Gl`?+Pr5$o6Yaf?Vg_l7$>~~qUnU40XgIGV3-DO6%}aV
zaXz`Yr5+!4;SZG=iQM~Q8mOl;>>&UlOHrX04_(h!$m?*Pk@Z8f2j0XG0t}(a9t*;P
z(VFFA-vd9Q?(9&c{AAKVqws5&PsU=txay@lrp9x2lpAr#@cS(Zd+(qCyuK--*+hBX
zLn{hRSGM-wcaxHIx%ugMI0afb{`u69x~{80k01aW&pMiCM{c-5%cdkHlP%+?VlZga
zPG-BqxgS}J!{OO*f?47ZU!2Z@G=cp5Ny=W`JG$AbnDfIS^{CK1?L-JyXx~oFLFV2A
z0L_*lkR$M2nap!k8VFnye-IqVZC$9mx|6czC_4mcCIwyi{n6zSVl*OBtJSIx8emx!
zFYN>uIpenWo0H=4%gw@|FdB`{4$@1(hXi@<36SewA^5rxhdp}(+?P?VC8_dK;iUq2
zCv)Q7cbE1C@!uuIqg}y+Q7c*PzXm5X9TBtj7Q&-}I>Y?*TO859edB8OO1Pk2fiZiV
zY+8qy4a=oT65me?8$VC4fGLkwmVSO~MS2LYK+o0*c;O1dlmXLHU}<AiOzOa2<lW#c
zIUPkE_z*YkPOS!s0fK&vX%|3*SJku<5c$hL1|3^0<}cu#z@!9L#yp8QkJCoHGx=a2
zgVo6u*{&QZ`DhL8gEtl~{D~*<%PZ5H07X$-ydwkbDjQmJ=@Bp)_Rp2FOc1Vq-)uJD
z{L*f>AKN#NT7T(1KHl84&E`HabMw`0y&Kqk`BXpxO}peuQPZ73p%dNcXrVSNWH!6t
lh{bJbqjb91w{w91+TS^{!e%kMmkR&@002ovPDHLkV1jcr^@9Ka

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-default.png b/core/administrator/templates/hathor/images/header/icon-48-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..de1b8053665a71216a48c49c8a70732cf969ef32
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0X9iQK~#7FWB5-Zppu4ve?HyVHHj1(o*#U%+U?`p=frCGbD`k>r{?1u
z+KJNe_x0(Y_tO9V>w35=0BQ-QhM$jj{C~FQ_wD|l7c#$J3jg-51c-jV$oX<E^!w%X
zpO2>gf4B7By`u;XFYg|GwoUub+r+Q$vw-N!>of?0aR0vzUfwEm^~wblC%t-d^UhA2
zZ?7UgzCc0$Uj;1dw|?^EF%~}nUHtBx<NIemaP;$~`?mQmKyjR&25NZs#14*rzqa16
zC=S!pi1>PSN&drg!;g2=?;aKdlHXq&?^|PtQ^TLnM}IvKx^_@@)2g}$_pV+(R`%hx
z*n^YoIGyzE_2Q+|9F8A94i~w8^*GRmi|2P^*YNP+Jz!`6%{z1E3{V>|96x;c0OX?D
ffB`<B0yJ3wfAq6N>0S8g00000NkvXXu0mjfHqOAa

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-deny.png b/core/administrator/templates/hathor/images/header/icon-48-deny.png
new file mode 100644
index 0000000000000000000000000000000000000000..291da1926913c18953792aeed43f2b7c5724d915
GIT binary patch
literal 1895
zcmV-t2blPYP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000LrNkl<Zc-rlm
zdr(wm7{=4A%u-mEy|FCI!h$J+T!h_aSJ(>+DxehzqLyjRbhDXlvdh#|(@mSH{>bV-
zZEUhXx;WKDqn21AX&`MzcnixIi>^v(vpMeA)BB$Nrj-ukf!JMYrZe-K@4)%K_j#W8
z`wlbgUIgGj&Hn+ICm(#oweg-iH*8<MyzkITe+bu3$8hj7p2Kr_&A10xf8Tw9_M009
z{xaEk70@&bXqgQxD;`R7KCn11GDpnkwOk|N0oLDhcc6P!?I5nUM$EJn0?X$BD{R0G
zjtgK1t}EsF98_A%HMkbnOh|yYZ(SBdeJ0RAom^T-rb{EnucvW&Nu>LWXVUZOQ5t8E
z;XK|6o<noRnq@`2D^d`y$+hDa;PHDOG9Ox65kkG0k3-b(5;A;EE*Z!IYR$^jTd3=~
z5#vjXqM@lFT$?pmE2aUSzU%Jh<BcU@EVQs#M6_{c#LNQIKc~)2-KQ|k1(9PVc7nB7
zGbRBZU30(r*tJDr)MZk)3#7Aqj_%LRPmdk6Gv{~*n(}FPa-?vq$=YKM(A(?`ovY1|
ziifFqn2Lu<G%hT%BHS>8kE0ZfwZ|0Tja5y-vsCC0dI`^x`7_mN@uxNuXDP%Vbu`X1
zf<64B0MD$xBk(&F472e?IiUN*K_SjuGo5!u`kB3qI>7E`_aJwJ&Hv^%B%TGNU7w9J
zHAb+PQ3ZJF*4qQ8sYr;-pQaAb{kZVk!W@L=rAznhX~Y4xw$u!qUSP(l8WT=c8OD!l
zBTm(2O99x^hypx(+nuhHUY)d%#&KtGekM-&)1><cZeL?o4Djr#8#bJ%q6O9I_}QZ!
z!jEn(zM88+w_S~0r78F@Ms$>=;D9p~1C<)q8H!JjlXMbJPyqI(7~r)fwS6b5P58;9
zmGLE+|8PkK29Nh6)>qF<FCgep<9oMOt}U9$-V_6L)RlyOq5wa*wK6(wYGFP;*RC7u
zc!y=WKl;-thz{&cF~E0~RG`WT8fCQ2Q6ZjJ*YoSpTdtOCdky%W0`R?JfNv}4EYboR
zWxQ9M9M=GQpIeJh?J08Ys3+wB-&APujYkg}Wo$22B_M!$SnY3xC&d8$F0~YZMj2a+
zlHwX*&-%6KE>p?1qn?xl9CN17WCLiFv9&P10rswcf&wHDr_DRSqjG>RX;Ocs4m8SW
zD^9}6<6p-u!0!8R!G60+u1%d6o|FS@_ZNiv-FoynR5H3tlhL+%2|~aA5_9vPZ+RIz
z=!hP+%XN>sH0Yn33ihTLU}L?n@2g536-t(Iz?O`U=OkfU;WWHeFcoj+$A;F~Q?aXf
z8hXlDN6rxnaEx|=y(tEGY;n_uBb9o5;Y!5;yXs#-ANe_4o&xr!7$C6hMpus`6-Q}N
zk3D7lDW~px4AMP&Qw+dtobMbs>@}gsp+?X?zVy0{IOt3Tdm8co18bUF0^Kg!Hg_62
zZ7JhMSGg8Pyy@6SLD<uX128Z8O9p$q8QAaCVvkLoc<ia@t;&@2*~_T^Ck`xb3hZ|1
zaL{i-r$dAGGIc`fcAId>lP=w}mr(~`9<TKVJLb|E^qJ9aOU2Hz#K4+|sQbG}lRb>-
zgRK`mvqBwiGkPgRheM0^%QSIiug8poHQ8t<E!H0MCvz*BTFjd(a>E_oEPPJKX|L0O
zZDkrl8(VBzbb2y{c|A7I%?Y#im;*33H8eDDq7WarE%>a)iXffOoemvZNjMgK;4)%=
zbvE|<v+zEd-$dqFGo~M}FK=uzKVO*_YIT~><+n;=`zXkJb{*a>)#A-j!fSSr@t{9j
zYD%Zqf>xUztif7w`-0=%c@@Deb|cz6+2|tiPpYl>#AlISyd4e$byO!Ae4|u11peK-
zb_3eT^hX}EWIRY~yQvY|oknR6*G|Y+Oe+`F1=f0I4{j+pVVgS}d#bG1SA8B;v^x~)
zJjAmoANjJd)n&r#rFw8Jsu`cJm@ag!ShOJUptoe;l~My<bC}RtVZlxxy@XXc=<w&D
ztD1@2xBINLYgu^5m4R2w(y+Ni2VToHE*ir%+5i)XiNwXkB;pd{(uMQ<-j(yco7VVj
zN7uP#gf^AvF&zAi=kVMrpC^~rUdHQ1ok^nhgxCfUriIWHB8gBFTEal26B&es$R?~r
z4v{+yIpTR1kx7_{G(tzD5-Q?KVzLM{Ar=9++f!Lc7`%$eBW4l#L;*3IC?tvm#TTGR
zP$<?Fa2-)|h6tJ=0$s)-#u|XPS0f7Nv#>By5+{m8bIhV~7mqc-MB)lUD>`EpyD*c;
zlkI{6vd#;H={!-}BJ{2lM|YA4BHj^VlrQl_u@jR;m}!JcY_m=rFO%q+MUeG3EP_nY
z2qU4Fj7HH!N2zv-&`B1%F-7taeeoxbFo5!3B5__P3oaiP@qFlCAAzVNo=*|opC-(!
h&I^(xet!ke{}WG^;ehn;;@|)P002ovPDHLkV1fnrkV60f

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-download.png b/core/administrator/templates/hathor/images/header/icon-48-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbd5d9171a1e8750b64c44c1afc5e6ab1847f87c
GIT binary patch
literal 2009
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-edit.png b/core/administrator/templates/hathor/images/header/icon-48-edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..e24a733cf3b59ec7958816b713375a66e2be4294
GIT binary patch
literal 1857
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-extension.png b/core/administrator/templates/hathor/images/header/icon-48-extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..b26131d15547ffcd37ea14fb2878ef73ade9f723
GIT binary patch
literal 1455
zcmV;g1yK5lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000GcNkl<ZcmeI1
z1CS(J7KXob6Q#C$ZQHhO+YGF2+qP|ccWm3OVcT7m_iRU1WJFCx&b+#{IXmyon=j%-
z1`_ALM>jM1-?+?Wge&4{ue~1^kFCH2=RuYoB!SQi!cVJ>p4ZgTv%p1SX6$s%3xeMj
z7v^69oFV}~$@w6g|8w7sZgKY;-u1p2Ka<UJ5gFOL{fYZl{P})Sap@K{B9bHE1>qO_
zZ+h$J-}GJ&$#5lMd}M$ffBD5W;C9p?!SmimHOorp@Ad3gXZ_IK|J$|&+^#(&i4*e?
ze?HN8Hm>>6mnY|^ChiApJzoUw*WA_n%R4>pIc?z1D{tJy6R%SsiEka4;9G~L5#L9|
z;L4HBt2nxO^}B(0oxcWDQ5(?+H*E4a7k}S%nBt<rZ*Ic`A<n2$R}m{<t)&q(`8q}>
zX4t;(0GXa^V)9Mk`M9F>3P2T&A{wDD=aa;`Lqph7v64C}mHVf(I6et9nnL}BFgbm8
zAHjqfWZ4k6`@5%*DmE&SCV$_1j7)bw7=vwaaa8M$Kw~L%<JK%m{B7q!#CVu62V$J>
z?Vdsk*8L$AJWUp`;}G}(5`-XvZB)R8O`&s(UVCH+33A~1mF`Bm9WJ#Lx<gl<T6Pbe
zWMq7nOmBOfJ~W3OkGer8Kiqo?C)6p0O1P2SS^m0xKX?Z515|{k-K2|`-1b`hb6|{U
zX#p_?#H1SmrLhz$_>wHZ54rPodw9crZ^cbJ3IGg`j#Hc($K(o_AWXRnHCO|&b1_4s
z6AX?|^P#6diYMIeMpUzE$6kullLWpGCglhu7o_{3X~|_-@vfIIA2ZZ)Y-j{a25S|f
zDE%&^r4p`Oqd9lBfP9v7F?eQ-u=|?e@GP|#IEAj+ny+tPzxObzfH7sKl(Yqq?pER_
zD>icN?so2evl~`c|MVCt@vb)lwXQ{+{vf+~Pb<|-&CT=GKd<1&|JlIM=r})n%gc!w
z932NSC|VJ4LADZ(HPGZ4D$Y&tv7i2dKW*H><iaAx50Pwv)}{h6tM?p6#Z(Ho@|=r5
z2L{I`dFq#c!GG3m#4gSwet^j}FI&Fc>u-6jK4Jz=kAeiwk#?E`>L_4fbey9zQ)S0J
z&#w%qY#s?SRjVI&pmBoEzKTOG&vENQk@G%9{Q%S4ju;OKL&Wnz3^(uXAZFFB{iuS9
zpbl?-ZbgiH4S<62kW3ClPy~%EU}+9KVg^p0K>@Y#u(SXdVGcNO^WHXqsun6(k|%I#
z0xF?RhnCPMX64R(Ajahx?pq1s0h1E9yk<8s?|;Elm|86I)s@@%)1G5gNWBK!yHFCJ
ze#XOi+Ffo*HMhS0wfV!Qo&0{o_Hu_3<AKP<??Op@<oExfR=|$K1HAl`Unf$7$u}dJ
zEQm=zg*1f}I(G65KUlGmXWaWv08Gxz@$!#<k%`F(OrZruE2}D+atfss0j%XizxWHW
zfR}yj3v4?yfaIFcFo%kVT9-Deb*GT1wWPto_$=T5=UR>pkMP@78<A`t$rX?wL@Odw
z|1!5VvNoq_bs=MT)AxSE_{k9n!m{&(SyTiZpHYfRlfc$15-=gw{&A^Td~D!(q`~A;
z3CR{HQ=ZfY*9coxq9`f}{E8ZU;cWEiuGcNx;MVt+An5RnNg)az!~%?us)DMM^K(l}
zvkG^r?=R(#KHkjj?t4wS$sK+!#$4MsrkRUGq&jU?i+XzK-oWl;0S|mCXYuzR7l5E_
z_j&wnY43dmsPKP76hT3h;^KCG|BYV*MPRPpAKh8N1AHn+0|+3=*QAD49TkYGtOP99
zJIG3a0@lg-^hMYjqh0|PP(W(TfpkRF81<%5(rRA>0SST<_%Bc!<{;t+2pj+a002ov
JPDHLkV1m`TytDuS

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-featured.png b/core/administrator/templates/hathor/images/header/icon-48-featured.png
new file mode 100644
index 0000000000000000000000000000000000000000..acfe49a7935086d6cb96747342a7d9b7e8a9ff97
GIT binary patch
literal 2508
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
WNVw*8+Uu$S0000<MNUMnLSTZ<%HTNw

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-frontpage.png b/core/administrator/templates/hathor/images/header/icon-48-frontpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..285b65e4c8f52156b8b5c505680a9e8db36f88ae
GIT binary patch
literal 1571
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
VFD>*IIoALH002ovPDHLkV1kP)A|n6*

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-generic.png b/core/administrator/templates/hathor/images/header/icon-48-generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..c50f01e9689063df54fe8f55c72cf9716b119f95
GIT binary patch
literal 1074
zcmV-21kL-2P)<h;3K|Lk000e1NJLTq001xm001xu0{{R3VB86{0004lP)t-s_xJbj
z@9*pC=-%Gm*4Ea=#l`Q{oaW}{%*@Qpu5;zbhQ+39=gW<?l1<;kgsq@~-M)S2&6ND#
zqP)Dk&by7emsIuHob>bZ>&}ke#*^N_g4MWtw5N*i?&{91YR|>5#iV1sn_AAbgVC~c
zx|mn1oP55XV&ut@?a-8>pq#RgO5nzg!J=jV>Z-=8bm89A&AgfU+?=POl(v*n<;aVk
znvce|lhx3{u#HIX)0W7oYS64@)W4I!rEJc$ecaW?!k}NZwY8p`lD(*Vq@kR`wwmAD
z(Bt3O*t&bgy{*yAz5n*KzqFh5-mS;5d%?4mo|1XaypoxjnUj-}xT}rZ$)(o9n!45h
zrj>Hu*vrMjx7D<B|K+8*se`trfuf(6*t>zsxQ(obLHFOL;nK44>)?-%kK4+o+{~`R
zpj*VEUYeGU_ScoTms!%uwWyhP>gVFdyrr|ay8hsw*~+TT$F;Dcgq6SluBDN_t%dXO
z>d3m4!LW<f#iQ1(W7EpD%D|*3`^3Be0004WQchC<K<3zH0007ANkl<ZcwXhxL%ZZa
z6oBEb7){%_v~3J++qUu3=M*}XRMK}b+j*C%e9x&`oX~%7;^VP?76OBtAAVk>F0HRO
zJ$6t)P?`LE`I{tFz{C2}XIQ;w{U9LNUwwD&G4bR<Yq?69rr82_UIhfT(yx`3Dh2;s
zCrVUtKIjR>-tiGf94mrm#TQ6TdP+qZiz!U_f{hV+Jj;ZMJfry^@keux2Z<$zrfJDZ
zG02_GvQv=tNfyLMyeUj&52Ni1!NSS=hpP#}-aPnzh+E>D%~7oD)&MUV`-c$JmK#ha
zlbNB0!6J39aas(_O@>tMcAJHfNCbynG5BrPvA_r{j_wJ;(Gmpxn_-&=NY`~4O^+;7
zEaD9ju}?UGE(2+LqzZx~Fk`>v6ChCZxq&JrB&^AFH$o0sQ55}oqDA$IHr;_?81h^K
z_KOs-l>wJ?2M7n-39@g{5WWZ5S3?{G%60-a5+`hscsYCD709Y;+)l*fkU+!+iIF?V
z;b0&djR!U~S@SHlky3XDtY{H<Bi^hXxC4Dl-7SQzDDX!7MI_)-si8uC*0N|r2y@20
zJFRRDtqz7~0gw0`Y&_=)(AK&1Qa%iL#4m@@fK$(>vw6T8AY4ui^hfEbLBJz2hYw-_
zH*`0-1ZX5&4)X=-*QBOttjYTtYbPX-)5pig#%^Hmu_@|B&ne^txg0{0q<^_kE|)*W
zVzExA^BP?7I-^Sx%Hew<_+1Ckz~(8i8!DE<Q~)0oMV9F=hz|fVP=Mj40NME;0$SjP
sRIKB4LIMczcR)o{faHNFxc)!+3w`PBfIijwr~m)}07*qoM6N<$g3ic8;Q#;t

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-groups-add.png b/core/administrator/templates/hathor/images/header/icon-48-groups-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..411fd886d65fd7dab57aa4c28e3b5d95b1c1b3f0
GIT binary patch
literal 3420
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-groups.png b/core/administrator/templates/hathor/images/header/icon-48-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d52f2464e30cbd1fcd641fe3bbe430136f5149
GIT binary patch
literal 3204
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-help-forum.png b/core/administrator/templates/hathor/images/header/icon-48-help-forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..62133d7ec5dc3f2cf3ec7f96b00444ea636566a1
GIT binary patch
literal 2982
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-help-this.png b/core/administrator/templates/hathor/images/header/icon-48-help-this.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1845f5cacdacddc1ad4b04b920026b62a19f423
GIT binary patch
literal 4103
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
FV1j_$mz)3q

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-help_header.png b/core/administrator/templates/hathor/images/header/icon-48-help_header.png
new file mode 100644
index 0000000000000000000000000000000000000000..559b654bfe558ba8c4cb2f2c560558036bcd70c9
GIT binary patch
literal 2930
zcmV-&3yt)NP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000X)Nkl<Zcmb`M
z1$-Mx(#2m7NU~&y>3Es5@iMQSEHg7HN8f#Px6I7U%*@OjSmwYoGjGg-nd$DUYV~hC
z*@-Q~Ret}JX}aI5YW1{60>cly^WOW50caIMv=Gfgpjkiw!u$_SKx@jnozfhw^(<lz
zfcr7b@Mv-jHT3?=6#?w$y#7F|x9%=*T^Fw7z#+&80l-?&8c<q|QcATdsamCy2u|Cs
zU4Qj9o4A0OgCT@NA}|Ds#Ag7mBU+tzXP~i=Hxw+5hC(Vc1)`y}0Q&29Mgb@iZxJ(y
z=0SG=gNtSsZ8HQ{+w~#de;y5p;59Uw$}@e1*4ohh;q%Dk@{myo6-CfmwOS+R6DJVu
z1L^<<9{bw~npvQi$s$97vxP>=1*o@Y#7n2Y;NSD#MXx;spRUX1o6PmDpMkx0|8zHo
zZ-A?Qp1HvF%*2^|Bm7)LZDQ9&F!vb@G~_SeKz{Rq8OzONXuP}~FAs;tV)52Q>#z-2
z@kIy$m#dyH@I+R)$BrO~VEzo~au)^?Y?e(ka7?E0vTTIlZup=WWla=^W59~HOD316
z++ZpP!NMIQJ~lD$*?}2&^})n-7W;bgvkf#)!59JrZ0DPYVqpKIcvE%CJP`=au>ebD
z)~%=)YQeXV-+jE$b%?WLvYW{v(_p%s?8IV&G0<$C^B`Om&S}vJKqwNX7JP^PqWapy
zixh2%i(}^H*O(VCr|Sl@jb0bOV6!>XP9dDcvf-~2nSencczY)JrlyoKnBbkq?mpog
zkJiL%0cZ_yRtlOgR{$t$yLh<s+K!`@Y_+T6{CXWI##^NopIA0l^sigbIEb`H+w=FM
zr>6(q-QBfJ^w8IwJ3pR_uJ6Bs)QGE{>V|NVonR9Nds{z_7*)@}adzpL3mqPe2ep8R
z4cV_HfbMFDw(cr^`e;5nzWM~+)`St?T{H2+tb4JbyMnf!Dtdwl3QoGCOmZ&QH9B0^
zgB8Dje+G)gVzo7x<t1b*A%H{|l9dXiMrSENdrt)m7!vryt52d-D$OjHD<{+_o!?U`
z&H47#r>ub*U6m>#g=A-Kp@f~oV767Wfz-P2FKZ<I8W0=owI5!82u@Vxi|n8x-2q#z
zKq_>W19TDHm4K=mwue$3(00#-_v4-mQ%3;-v6$nC<0@fP45SaKG?WHL<fz*;9*2eo
z2%$7I|4eH(W>$m@s?fh#dK5PPuk8U`ZwxroF93(0ve{y;>$Vn(XTp2y5#asVW?wh1
zdx=d%8YDV2;ycQ;B&y+@NUEs-+MT|S6Q66Xr<a59hDfRVl+vb>t`KM<6Cxg8Lld0M
z&k7^au-10Ks#~KnZZS|-x9c^q>XzV;QntFh-aHqDmfhiPw70qC^Ifwt^JeJwAArPe
zQ?7<2+E$*#2az=5F|e4)e^1xWa2+v<tMAj?`HX9Y3qy9w#_%UkMQ)uPz!8KYqMj0{
zi`&BnT`Rz$lxSfCjAPsBj{O}PrtNEpK7QTo;o&>aAuM&0fe1YWFB`5rRlOa9i#e50
zp5Rr(^D>@`tj{>`XwK~VyCE~V70#I7A{j2fHeJGTQ4NAtE`%3F684nXoP0C#>+qIZ
z-5^PP$7@eQ&b}9wc`t+4yyLL=!3SM;ekF+hRUMIAOsu>yGMnv(#w8}F=a2usCf;!!
zqn8ahW{nxp?4%8(LTB=Dn>WFTKc9^W2j2jy{`~}o%7i_SI$^>=HzL2o!O-Iuw>Q5&
z!rTlAVKj~+&}#s->=6A0Pavg)R1(gp2{V^JcSbvbp^~4x!AzaWK}rRsB%%A(&xp9d
zEeqcVj1f-t3}|RgaHTY65f}~`Kl6EQOa+_KUs#QnWCyIr`k|rmpAHsY%k{$)I(;YB
z7~lX2vl{wO#IXOxqJ$W**^~ij^9!PX6Al|NFLu+pW&*<@48nNxuqRgZ7gi(lIcJCe
zGeEa1yAEyiy_FHV^Cz@Fa(VOn2Togzz)<<&)>HN?&v_amD987p{+?*CMqA`B7G6Rc
zbCgoaKS%|?=ap|gj`F2{N5?t)p!)KI;Ij>Zp%6$ps{GFL#jg9#rSbMgaNn7bpT5<%
z0lNz_{A4fgfMu4FyhWxBgde?zo?DJZ$4T3ubo+_$e)<eK-$O&jL)LSPQmO3;3>MFE
zuA?zVnQ>$VnEM2}FZ&10vo*?(U2fifCPTA$*4T%EIZ{cx$1BKRzDDWci_muTM(Dht
zi0Ui%LzOxJ%@Ygcv!0=l^Vx)b*fsEwO0)Rw8?!zN8B+{%sDsw#3|4yVQnVej2|6$T
zUsPVY7Zg^T<PLo9c^(6Y|6_dLzh8E>wU=k#h6ShYh@TH#A3YCVV2oIUfJJL%I?$NQ
zpoyS7icHMV8v7IIk5H;nl<zBK{bEytxfTT?=euTH7_@=^1@!vpy6#Z?_<xhpe&s(=
z{cIi^xSs&yC2!r)VXNOC0YyH0^Aj_;t`RO0!l4BO;W`>zJ!O|0pDOua#%G&`$s3$7
zanGY>0{A?!fSW%)eAE5Nc#)S4U(4dzL?P>0(PnA%8mTQ6gX~&>>dafAp1BbeH^7D$
z{r}QP#05lAMG<5eaC;z3TLrWgZU%*bJ<6IlBiwranopHwKU!?m+FM+g&1CG3#?-dQ
zNvltT{O}dCTnbFCCf*UKjZ46yiP)5qMvtOQF~^dAOKE>GlPeH~RrBCgE4}c*TG>Gj
zBphZLjV|O2<Hn7{_%%00q0orN#zLH#No#I`v5h&5p}!kNH0692U<FG%z9H^7qoTm*
zf!3zT^&YDnK)j_$ybP-5S)~wu@A6T$rVbnHePEl<)XwvmvMGEL-Fq-2>>;sf&CO7H
z`eOL5!(B@j!-`KAO34UOwF+JpTwLP%dQT<h5a;u{i-HPKjjO}iPGTpO3;oW4M$;-A
z@#h1H%2O`bJZ>Tyr%dI)v)9R__|zPVcb#g5s~;D4pbxfAAX;gF=BQdWM_4bDv!AtC
z+lmm{R@hcKKf=6|;&5FoGBPV|h+y6`$sNraNE_i55Rw5lX*JCm=%dAUVmfCTh6pQV
z$S~Q7MD;jZ{1sbJFZ`8S0oi+vy*?$LyB}6cW(nEP(vBbO!(Dc}17UW6pj=8Ur^Mt5
zLq1o(PKbskGSSj&LM~JkyXHwe&BvRF)iE7?g!?~Bp}+Xt9-3Ndf*b(~`{)B4b_Ho8
ztZCm<F`x)5sLpxHR^4uu_5~}eWz%u~+KTV@X@`S4vC<Q`A<~$pf%Yg0Q7!i{rW;B{
zgk-3yQ;nE`M0V{RpmT-zS}7y5WP%cnT`8IGHE@4-glRN?2Z6p2NX4Rm_Dl;#jnCp<
z04)##uK9Q<Yo3@n^!4cfyAs(|Ho-unla2?a=kJ8QY4T2EzP3$0amtf8A?|THbYEgc
zos2g&#y>p=#{l4`0!F+)aWRZL=au*~Vm2uH`h?P+DobxXhV~2oOyWb+1=M~wt1HAo
z8_dAml-NG9NQ!3?OH1@+<jj>Za>McXe_!DLATTmJZ8{qFJRyGQ<T#@D>4E5dw^w_^
zWH2Yowtr5BE_Fg`%<c$r%Eq%WyN>V_ixTKqL?Wlm*w9b4V6Tw}-@a9Lu@$%Rcv*R5
zz>0Sq&hgv8SbQYSy8oi*>H{AB@|CA=-Th_Ei^uI>v`U~C5}v?eQbtl;N>A{}V~?*t
za^%RBGrm8<^ZgCjgbl9v7fQ-6=|hkCpMCb({69}Gewm!Njsb-<n(<ICk|yiKR$FZT
z9AK7#t}~uxP$BAlMy3gYbjx&|Np+g~2Krx`sV=D0*fx7ei$_X${SKrC=3J+Wb;hpy
c0tV-Q1AhR5h^@&fv;Y7A07*qoM6N<$f-a(=&Hw-a

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-inbox.png b/core/administrator/templates/hathor/images/header/icon-48-inbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..29f412989ddee1056c78e0585510df0c5504108e
GIT binary patch
literal 2516
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-info.png b/core/administrator/templates/hathor/images/header/icon-48-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d8641d021c76657bbeca9a2e56d9d718e680703
GIT binary patch
literal 2209
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-install.png b/core/administrator/templates/hathor/images/header/icon-48-install.png
new file mode 100644
index 0000000000000000000000000000000000000000..5747c4d7a4bc4a18ae6f865f88c81f3e4f2cf173
GIT binary patch
literal 1470
zcmV;v1ws0WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000GrNkl<ZcmdU!
z1CT9Q5{AEXikHv!+P3YTwQbuBt!>-3jmERh=0kVCHZM+YPu1W?#jT0xdun2PzK9Gp
zGPC~t^AxzDqe$cFZ&JYhSsZjl(FAwCP!eqQ!u+qQv(vXPuUa?CB4B1>%$0g=u2!wQ
z8Tb|rxHRB+{uj05KKphLe`0ajhAjX~0TxLU#nYYt`0Q|B*YoBt?!$o!fQl8k=E@(s
z&vRc>)Y@UOa-!|ebC*sX{T=XR0OdXJ-9#w%-{zrDxc##An_2Aq_uHSItj^Bd7U;TK
z0R@-`zT~ag@Vsq>DAM@Tg;_pwY#duow*PIe|LESg1D|q<xqoTJno%*vYUT@CxGw(P
zHAro$f(}BI#h7|Q7{vZ;FtH$rsbj;9i`QM$pLg!VU$$yKR!2>=iil~xg~S-F5Fw4f
zA3aBPVhp#u9I?$M(xd^gS72?<C5?Z~H=sQq?FT5Wta6FS^`pSLf=?PdyDy^s0?PFf
z0VHDuL<Cc>bA52^{2={f(}ZhRg4Wh~(mh}y>rI!0>GOa149aoQz7JYk<w+l*bOo$e
z=wFYVMR`8BK4JtB%LYtS1?)_m_P71RV;sLUOt5M_%5h@(1%RwQ0AiuQomS>)#`aUa
zDD9yA5R^{OVebLKWUl~!J#-R0KMEoKy^`<n#yfA~6MK4@sMNFcK#f)@xQb@%INOKH
zF9WTk3-rueuH$95-$2QCdCxzOM(QZXvG;&rH$pdGULeU|4jgBEwnnhT=Pv7)^Ok$v
z^qSw>)i*?SWDqA`!U^-B)IvJQehY~RNw%Ntrd%xW-pAaNC)|27jr3d^qB44!zztA-
zxIhKcPGXA@T3-rDvT?;y{{7D9Qw{@?^j;c3YE?w)ab7zU+n>Z6%6XE!@IiMcjn3oe
z;;kesIIkFEZ(>_|FOMQR#E3u^3SeR4TdXRxQ2H*9;jb#Rme-`+%$e2{D0+%Ce*E8E
z{IqR1Z+!g2xYsRj3_!=RGYEocg@{2+CJIQ)3Xu4_@#z`9`ltUy#rF-3MmKVC@iD!F
z!=N;v;&~RypaG#}6W?{?N&t@ZT;MBz_$NR9&rZ-9?fR%(0UZ_+<1>ONji4~GA???w
z(7K5`&-T-H=otUqxd&67Lwf-#2&2MvF3-JgzKurOkDdmtFk%u0wo;(=5$ZhCPkmwp
z<@q>%5EmZi;~O~FML8ag^bU=Ha-h{4$gJ0>hyl+>mzJSiH)`a{qD3hX;qIGP(MZp{
z2i)arFk(=dDPVOkBq%qC0<Eq#XVW{?_QNL;0hDf8bxB{Nb*wQ$l6!1j$JO)<3?Ygu
zBldvE|3LwZ8@=Aa%h%jONZrs9R?oyOaIc$e<Z9Xuos3s#GGF%3#CB|2UXCKk`(N}_
z#^<X1>1Y>UZ9ACVTL}>|Rbb<i0>60WlSy*hZJRjMeV!luXE*h#iB4&hviCsN3bdU#
zNBhYx?tQbZG%_|d%_~3s4Tc9UqjM#6m;>!(-~q_A0mSg(U;d5XyzRv_@`{gri32B2
zp$jFz#8=Z~brKsxb_i`Jx@bFclKb5HW&nKfyFcT%9lN7bTKPF}yw={6HuV4`&jEY1
z=7YcZE5Dy_;J59&c>i~P7TqI}D<DCDQGm(jwMv&U#?4j%Kxx`e_3-)M{*Cv4^M~NL
z5a#1h4q^n5Y#IRO>h*e2D@CSgm$!fSH%P@mE{_Tepxw9#5n7>It&Rb|O5RGmdA3sd
zY|itFWQkJX2PlXYa6GHx>&76^rIgwq|NCdWxlx>dy4tyC;5q?WA_8LKW|RhKx%ioC
zZ5G%93?x5v1NaJl06g5)+EWm)NT`X7iAa~g!>%qq*+3&(fyV<&Sv>p-*iVAEfg3RY
Y1A6!jv<`vPqW}N^07*qoM6N<$g1(&IdH?_b

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-jupdate-updatefound.png b/core/administrator/templates/hathor/images/header/icon-48-jupdate-updatefound.png
new file mode 100644
index 0000000000000000000000000000000000000000..288ab8bd9a00af6ad6a933887ece1dc40ad0a618
GIT binary patch
literal 1617
zcmV-X2Cn&uP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000IUNkl<Zc-qyK
z-%nF#9LAe0*{$bK;9?gPH8zVF6N5IQGe)OeY!_QHJu`7mvlyZmGuhng;(oZW)ND?j
zWK>i)5v2%oun8+z$doz?hyqZk0)-Y!3v^I`v1i}DTha6Ko*&vJ;FElE;Jokm?epn5
zqRCV?lw>dACMF0hB6^66#7h87JSNk%(2GO`fkn;)u}vTlJVf9*VVGE=6eu0+A@CgW
zrc%H;fai=ON`aC9v`DKABDZA(wze_IccPHW2f00|W4#$poX@aS59#gyTq$t14{F%E
zV&D^<o+Xh8TTc~BRS@2hY4C9kO+qRQsLgQ#S9&4Bc7GIFvDStJbH<Ub^}|0t1GRXg
z(`vJvK=A_zVBfS>ywNGaoN;oSBG8NM35#Yqfg(S6tgb;kZCs%^a=pWlN**fCqTdtu
z+4__5|2YG_*jl3y^y36Bb%V$H+W?+1?8)W0gX|o-YCcJQfd~ZsIDsF#AR;<7i&SE}
zJB(B#-wKJkaRL`RAi~xX#<Rv197n40Mkb-sjT5-g4mIp;5hG>w%Janxm6tAes`cUo
z&fkX?Y0kv!^q1g6;*g3u5_{Oy;Ts`g)z^lt)4t@HY@UxlHjSK`KInAf1PWWBhbU=R
zI~02yz9`h<9gah;>sRczl>5MieNhJbZ~|vrpobuebw^i3t9<eal0=`8bM@c^3YwsY
zDAu2SY|YU*tWkbq-s@-c2HBkK?iIX3Q!vnn6ZpOndN?192p_k-H3YS|24ZZFC?w6w
za$%oipbsaIe+PQVwSG{965jCm{DK|f#2mY-gw64S)}K0HpbsZ-rU6D^MGZ*EH9b$x
zk;EfI60U(U80^9coW2DkNCh5E30Ghgva4G->u4X+lyLeZ?0kb=IDu33FpAC73;)=p
zSYmPpmf|MiTux;hoIM)<N3@6V6g@bBZ{0A0qb&#u3B(zy5=D)QIk~zsxkeIUsKwqC
zfWa=Dz&Ewf!&=g;{Bt)NC)6e6s`kVjyYg}MN1>Lq!rL&=hZFeP1wEYIkHEr7c!y$8
zi|w`_Dq-h|;<!Hu1ARDw<JHiCeXD$OYdayGsufDO`XcJ(eM5;kHqV8fWuOlyV7~!9
zL`kkmCtdWxV}{B*?gbQcq8RAI34HYn^bkclQJq{*{LCa=y&8XMS_6tR)ADaZ6a#%Y
zfxHT6VL4Z?Qm9|CFW1!uwRl6L$SG}9?5BCbzpDwz6)n)|#0h+P9cno4_CYKDkqOx9
zJ6S=k^3loZxu5NKdf1%axt6nTwO*XSv2uv8dwP&c`11PUCB`8guM~CT1imN(k7Tbv
zs&PFGv+}7#zV3yfA1ClxDR`_G>X1ro?sj&Ly}|c?oWsKjd|Cny61a(HiL+yX&2ne4
z`%jhTX25Po^eq|KzMbKH<89d9J&aX{zB{QDIC=#<Qr<O0<I~z@+XJwkuT8?{^hoZt
z<X1s1^I%?LF(5Aw*t!+ivIW?@Sqa^bzq&1sO`GJ$0-qE^gst`-v|>4PgY8QN?_d;)
z96ShY+z4c6gHc$Bxg0n!cb^1+_3LFYfg?pw!&cJ@F6_zV6xFfyRFRIAz~v8trJw*<
zw+_h4O2Y2VW&i%i_t&lktX5#nnlzKib_rUf9WRGmdYj4QTyhKcq>kluB_`Hq1FKgn
z$<N1J_U+@=84i=_;~%ilSl>GaWM%>{zpP~UZY0B=4!^!~Wz=N)=wgh(LSlP;FR)?-
zuzb0aUAvGBzecbblj-n<Vgd`v;n((HmI_TRT{@3MW*ZuWYqQIik-&%NGl&?0g(7Ru
zQN*dxnAtp!zsJTfQ&lBgoBCJaTmlQxLSP|S^8Oi&l0eXGRuI{_6R{H~7>_n=P^^VB
zG7!ngaGFdX6ef9rSVg?E5M0iBrK+Dwby2w_!&E$(ev(Pv_a!7q*q5GeW#tzV0F0LO
zbg3&N!|SJFjp^x(*6eI_?%2U-&dg-@TBv-0UY&bpvpq4#h8GLJo6VA!B)UnWnVyD+
za8uzrD(<0cJKgUfJpYwX3M@Km%x3u(iTptVEmW9bGWGP%|7tc{pWOQo&zud-^=NMQ
P00000NkvXXu0mjfYvTx0

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-jupdate-uptodate.png b/core/administrator/templates/hathor/images/header/icon-48-jupdate-uptodate.png
new file mode 100644
index 0000000000000000000000000000000000000000..924b1dbcdd38676fc1d6caeec1947e4e4b573685
GIT binary patch
literal 1648
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-language.png b/core/administrator/templates/hathor/images/header/icon-48-language.png
new file mode 100644
index 0000000000000000000000000000000000000000..902d11c2857991ccccd1193b26c524e656a968d5
GIT binary patch
literal 2956
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
CbgX0m

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-levels-add.png b/core/administrator/templates/hathor/images/header/icon-48-levels-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5458d5abef9e9f59ef3bf7588c108b831d1f292
GIT binary patch
literal 837
zcmV-L1G@Z)P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009FNkl<ZcmeI$
z1B@kI5C!1hwr$(CZAGK#_u95?_Sm*<t&Op5&)KS=-@d!vetmnGe5rI*^-a!1_w@w;
z`n7=-;E(Xy4~QRu2HVIF(gXYwT)B+Ef)r^1zV|Enfj|etr3CoWBX1jl4)UY~_{eEL
z^dcp|Tbs5+FH!=$v^pI+krUvl#qrRIoB$8aiGWVz1h{Kzz%~LM<Vgu|^El5R2y`%A
zN&t542xo=Bf)wd@q09eOejwWjG{_@1gZDN%6d?NZ8;A{=F2N6$4G{Io52TJjqCE0~
z_5k4@{6JukI`V?H0HJT?5f~`$`~w8N@&bX;&Od<va~}{GOhW+g$3Gx2n1%oz4}3si
zFbx4*@A`niU>X8A-uwW8!RpRG08_422n;k`TYxQB+(5Pw7$D9vSBXs*-$165Isysu
z$n=498y)&OeFK?J;$#YmSe92EYuDD3^&ff<ECW}5=Dx5yoZN8I0KW!TzCh{-WU&s;
z!=doM(7kgudaI(*bJPJn`&V-1XYTWy_l|#W8+pMjzz_Z<50E+nnGOWnqI<_|bmdGz
zN644x2>ue?`xUPI%zd8op7?Gaxj_x^l~=w(Ad`c~LUcs^hR%3fw0pe9(6xIb0B}`%
zJf}V07ta{32KdC~U><=?`OcrABl3H+xxRu{rxzHycB}&cu4<3xw8#768F6ZWcen0>
zY%R)@Xmx!OEl%`b-nNFJrz{fyxT-y#(;n}OXP5%Kx-J{CHLt&u+>VZ{6*%1=&uNeM
z#WPF+o?D&_*&3JM!_c($DRiVQVdySO1puyUkLK#GaE2+sV+&#++x~@5qhaB#X4;b%
z0svQW#{1$KrU3WP42>g@Y5pub)X%!!Ok2V{0N^Ulcwan2Q3KpD+0TYRw$v$)qjt&_
zs=7J1qb+6@SF=9v(Z1*dH2}M5tcOA%(*t7_B#eCs<zp{CC7#os`0lck-i59i?lhg$
z5y&)Z*w2Xh?{@6@?_w1{Q(xSzBg4hJkobxH2J!)!-iHh)9}N8-=!=d4xGwO_L2xcE
P00000NkvXXu0mjfCS;1`

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-levels.png b/core/administrator/templates/hathor/images/header/icon-48-levels.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a87ad0f59c39228ad608d319a202c82cd828cc6
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005QNkl<ZcmeI$
zGu&T66olc}wr$(Ct@7W;wr$(CZQJ;4JKI;2X<}dOUKLOOd%HO&9ROQ%R=}_;AKTGs
zf)1~#pY(u17m`;K476KXK;P4G{Rk!)BPF2w(TLXs6GTV}=&(N!W|0!mV*4AIL{311
z4NqVaIRQ0R+<{r71XNgf6=snVP-52E*8~$pNC_x7`B*=K3Fb%%0OcNgU^l@)yQOcT
ztRr^!qt^r-BFN|7HR=W2=$emwG)IDd#s*yP)Q<!~q6n&|Kj2Ecegs7X)zcSnsYL`q
zq1)O6&Nr$@P)>8enL6zV%4rTbQMDaGIn4n_%e5mYr#awIiFO3#GzaV}SdO5W&>le8
zoqIPyp*i{jc4o^*uL%m=HfBm}&zO(qkRV79L35n6M!oNJKAJ<fEouzq`(?o33(56J
z5G?LB)%z}>-<h~_BnUPULHWJ}^f(^5n_x3zz65kS7#u;cncH6iTJL%f8~Pg1c=HR`
z(AR)EYaYOcz6MlTdJ{JEHK6RgOScI&v-?Xxu^Fd*1e<C1B>+@l($U=nn^^tJEtG4_
y{y8KF7A0uRAJ-^f<N2r^&9RU%)XuvHtmqSpjkwTAno6hu0000<MNUMnLSTZ(8Qio0

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-links-cat.png b/core/administrator/templates/hathor/images/header/icon-48-links-cat.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b20b25705f78aee73a978b42587484934a80992
GIT binary patch
literal 2131
zcmV-Z2(0&sP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000OYNkl<ZcmdU!
z1#lZl8b)9D%$Py0c*D$`Ec33j%*@P8$IQ&kx6I7U9ISH%mSc_?BnwB<be~Hz7f-3y
zlqh!HtNLrW=6&7&2>E|UFjhR#wh{=?&l@`y;E6Uy1*K+!xEZKIij@cf0v8RS!O_)j
z5Pc_5J-h&qwXjQZ)J%l<9#UL_Awdd23>Fj|4NAR%)?XMZh~VLE>@t+T1=%NW8Udtm
z<&*}EyCl1r6$lN8{&ST2A?MEgKA=bU8MwdUb_{t5rU8y}>+=+}2CcwJL&}Dv4NeM7
z6Y}#w_LY!N5$e1Y=q3x3KfO=RshD&-a0vj3WVU#=yel4$P!Q?jh*Fznv!@UWhgs7S
zWP=z7#pNea9C)0|7F7Xy*UrFQHMbz;?~nr03K&8@X+t!~^h7&Powkg*lgE>=lW3(7
zLU8YU8~NHN4vF%KVC4M~xEUXUTR$RaNNXmN|6mva(hh^-jXaS)`FIO2pT92?%1enS
z5^Qd4p)%j3qPz@%AH7t~t+DY?QbAvcRsNS;6KUo0rSf|S8Nf~rA+Oy&kA?f>+qTPx
zdc$1%&|5s$0R^cz|2%RI2h5+&Ig2K6>zln$Pzu8Qo<D%#)=zWyaw$cvCpdHfI|iW+
zo<F>j{TI&8$X|Nj8@v`NhJwCIL^-KE%CAq^52X|fANUN$O@_h}P<s0;m^dm|qkl6<
zP>P{&dq2qpyPLh|@0n?v?>_oE!IS_bXuxq;RFRjF@9GJ9`;;4Asf+sqD3z-js6qo;
z4<~F!FkdAxq$Fb7oV;KHw@jYEtsCn3^OiQM#=-gf?U4!ac3lUU`GAD91DaESOT7S^
zoS^ke9B07SdbgBY%6;_-*_xhUh;2>VnAImAi^WjE4vsEO^Q)5&!ZZxFbqD$LhfydD
zcmWg$0%$!Gs55b#T#WuoqyRO5xRZi((tXuYX*WP3LLwYt!^X|bojx@q-`w2H;ftqp
z)9e|Uk>A!8<kIK1(v&{|jQsvKl7QlW0W>>}(gAM?+45-{5>fJFT^u>iVg9s9L?dC=
zeb&z9hfLlszpYPx(ZYpTmX(pOYwP5ym+EOUcZ2*AkR~V%LV?DuoIL}M0;Ie2%cl|$
z?`3MLohL8chxs$7V%s)}c!HYR3Q9{$GV-r%*uuJy!J(;IG=kNw37%_qNEA+RUy)><
zCl8>(bnlhBS0SZ93U>*hmD@7W5L1(_ymaj<CXK5g5{c5-*hDlIB~V_Tkzc*>Lw>q3
zfn8F`GhqjW0Y)*D6o6IWj=a_YzNLGwA!k4@xH$m)4!DGY`91Ij@yQ>&ephbKCnA0F
z?Ywl2D<2Goxb`1UFu$^dOAp_3d)q8uya0RCRw%4+M;ie`xZ()<U)eNxc!L!jP7B@Q
z$q#i-J;`J>mbns@c3USF<Zma>XHumrf62d|=gkh20~S<d<m>AjShj2_sZ<IK!z+`1
ze7)|+G9i@;0@ZE+J!pVK86MxesC-T2uGoH{Y)HqbwA(p!&tr*3V|?YV=XkT*gpyKz
zwWgW-*Vl0R!b<kAtjsgv%BDdj85#j;+xJ;0ogfDUzEJs2;I6GJK`3x+@>LuFr4;XP
zZGoaG8Og8%lL8iJSM8NK_Ub3CAO+wI9l$WaNrFn=*&krAi&To?vNFGss=O_{;Vc0h
zY-Hx4bsUHD_npr#S2sYy;;4xxzdr8>48x$UC&WKCG=fzIVi*Am%OKiY2Rt#n0FKQ_
z_}#>(*?sFYC@Q8iTEvs9H*)fR%em&*16eSk9IZ76EnAQo`IfFAmp`(aI!d8X0uF<=
zb5R-CVbG~B;6w18#~BE{^c$}ORg8e|x31y`T}MLFW=gb?JI^|hnUf}Dq`hKWXE&EW
z{4Na?LqQ2xc_0KJ29PfYfLQMxz@_*QeCxr111$OahywteQg;qd#`lC&lKifEj-MG|
z?}=q7t@yY-#Dg_K?7~vWF9OpVSYAjdssODZ)>92~6%fRS;2ZbgN6)(8K#ZbWvC5`{
z&IchGAqqijx{SE?MppUTLx8|r`lN;6(^xUzZ9jr_$=Q%!>Q*uW@nDv`Kfu>+!;hYG
zRSnZmoJC+EXopcl7!a=G$q(x|rT1HI;CMHr;&*`fLbm+C53yNTMz{vLs{zfZBJ-J3
zm=7&&knBr?{DS`#XLtd$(@yBaaUdBBf{9r+iJo&@@u3lX;n(=l%YXcD5SKG%s5gLB
z3=>l?{}FzW)@z6{450P%41<AxR*}X-AnyVU#sZ-pVgv|%_XM&*SlbX{@)(SM6et<l
z3<!&Ckk)Dhr;UC9J_Ojg76OpwvoHn$gnoGk0vKe2kdK1A6*1~9^vuWu2$O6u@*-&6
zfnYaAj|7N~BcHTKmJjsS{sM@j89lZDOLH>=Zh+Sia`XadXDz@E1dx0#hV=>vMhz`r
z1K8<TA#uw45-_Tk1!`XV$%?Rm($N_H+h6T?@v=XDVgSz0{?VNWQ~=|*{BFUw=Z@EB
z39WaXI<T!b@3Gm}ZTTwD0Ym|3X95%fQ-Ntf$v2KKSaHna)B$CMq9PYLgl{Dj)4^9h
zHdp`nX?s1;4m1GWfSrpOs02!Z5^tXg7+y(0cuN4mz-V7N-V)z-5{Lj@Ud6n9$}8=w
zVFi$Y1>^&HS!MZ_R#q61B~6xi8c2CdomI+rj=xfX<Eyl{)Pn^OStUJD;S<gh9}?v&
ze>mx{tb6e};SzuiI1DlM0vIafj-u&DWVNG_6()NYQ(h@N{tF>H=oc24s%8KH002ov
JPDHLkV1j71+VcPa

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-links.png b/core/administrator/templates/hathor/images/header/icon-48-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..b534e8a37cf70fb37dc02712e13ae8f163b69338
GIT binary patch
literal 2593
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%0A<Yh
zl)$}-*O$su)Gt+ntk8k#s<hi!fE}vRq(Io12ju?+p#TA`(5LhT00000NkvXXu0mjf
DRz<B&

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-massmail.png b/core/administrator/templates/hathor/images/header/icon-48-massmail.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0c8fcd180fce449425ccfc0f568aff8223c7fbe
GIT binary patch
literal 2572
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-media.png b/core/administrator/templates/hathor/images/header/icon-48-media.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fbb51cd05473be202f7eb5c3ca0af08ad4cf799
GIT binary patch
literal 2085
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
P00000NkvXXu0mjf^daF|

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-menu-add.png b/core/administrator/templates/hathor/images/header/icon-48-menu-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c901aa879b7d33ae0e2ec5255219bad319209e3
GIT binary patch
literal 1586
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-menu.png b/core/administrator/templates/hathor/images/header/icon-48-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..26194944d963a164a3cf55cc65615a6f120ca793
GIT binary patch
literal 1280
zcmV+b1^@bqP)<h;3K|Lk000e1NJLTq001xm001xu0{{R3VB86{0005SP)t-s_xJbA
z%*^KI=Eld$@bUET@9+Kj_Ri7P*4Ea=#l^nA!rtEA>F)CX|NrLW;lRSg*VNFar>g(|
z`P$jq*V^CH(9PrD-SYJJxVXE})7ZGXyq&k#t+~grvb8^Pt=8Dy+~4E0w6&zIz24;R
zySlcerKP^Syv4)6vc1h|h_vwR=Q?q&LUgjW&F52lr`X=*BVVL6YpRi^#xi4^rnb(b
zyVRw=+&gWptG31|W2T&@w%ys)d6m0ASbVF#)e=aFOLL;HuClwhwVkcNwXv<Ap`r8e
z?NV=#tE{hJeyJEym35J|DOr}n(B6fg!=a#{i=@OlRe4HrpV{K;jjGLpo4p%ap?js(
zb)L^UV3U}gp_i@6rm3z%X^*YK+mxlXm71V8QFY$i*iUt&WQ4EY=H?_*k(0C3>hJS0
zXQx7IoO+<m&dkU@R(QU}&rEKSbB?khTBFI-;LFCu<LL2)lc}AYpoyl+jG@7(q@PfE
zu3den97~JO$G)De#~)drCsvct*WY-NxF1Z1ik-J}l)VZ}mo8O=X@8c^+2$5fosW{4
zs=3WMV~j3alf=u_n6J({Xqr!Qpsu^mrnAPFvCl(zvgSixC;$Ke0d!JMQvg8b*k%9#
z0_jOaK~#7F?b3sqGf5PH;V!iu+Zx-pJ!{*xZR>iss^Vm~v;6%&m?U$))@k9E|4pWF
zSK*6$sqO81zkU9JH#Z&U__#nh{DZ^)I8FiAgRLiS&prNhEH*V2i^c9ZeAm&$@Fp^X
zYa6yPzmYE$14d9;E9T95@Z2vSt>69n50jG@7r!pWhPO0GG#SEjHk&Qa%w?%~JUf@Y
zAJ&82cfR{LZrJ&NZ36)EVTAmIxRE=T4?cM8u>*$xS$?S=eEQ_{c-#dERh3XQqbka(
z6oO)EWu$+)s-GMAvJs53KvEPSAz4-^N!Q)f%51VR&CGTL5hbcb0Fa}qssddXXfTju
z*f9Is8Awrtkd;BY5ei}Kx22)kWYr%Bh6yO2qNatuzCH~5{14MJv}zC5;c)Iem&?79
z^MA<c-=BE|{o_AXP9{#q#y)xV?uAFFN~QAlkE33}?&TZb{QTa;+}9IhN0$o=`};>P
zJT;p12;zoyPa+Ye(u5G9m@v}xDR~91DFaE805BmfWZ-%R)8jLu9;(tIg|QIv4&tto
zKx|`>BmQ}5s680y2t-K*iUo9vodKGWhkIR;5TXcyI%bKHI`h6H5rkF1-i@$TObN&d
zro7L<-X&F1qU_aM1sLs^{=X7fQ58KZ5GZAKg1rJ!wk#Pa2(iU!iV8i0Bn>p5MiIUT
z9b+TavWEetJ(v+6O{ddPqicq&(A}N^-7X{orc1*t5n0eW-?6x|0WtunYB(HLRcN5s
z=F@!Be7Gx^PL7w|he~qLe&%J{4wOvsp;FK{H2d2?t0x=5TVK7u_xZD@Rf~&@rw=~J
z{_Nd$+lw_L%x8!7;CyOu@V=!kgB>P`(1d#v{tb)?2mb`&TITsEU9*poTlpxBVO2c|
z5jyRY0|5X4LP%*rzXB#8%QV4_fX&Nno=sb=c*YCO<N=4-DOf`*2Gj*Oer5cc+HM*)
q1RG4#Y`t%xRS0vWOJfb!tlt4UOwN=bSWguI0000<MNUMnLSTX@b)pIY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-menumgr.png b/core/administrator/templates/hathor/images/header/icon-48-menumgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..58146f31933d02440235f652c11e62d637ba8c50
GIT binary patch
literal 1180
zcmV;N1Y`S&P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000DINkl<ZcmeI0
z1B@hD9EZQEu4#?6JFBy8+qP}nwr$(CZQJJ9YF5>IH|e}2mA>h!-J0vE-phW;FE8!?
z_ng+Gl+4WN1kWsiSpq>~kjL?_tyxp1bNWd3(4dAAKtg|3aHS=<;=;9F?=L8@(=%(;
z#6sHZhRza`Vlft~-jD(FPg+u+5F{y!n!c=dx+T~gShAo%S4KNMth2-%RS*r$#$<gx
z!urpAFFp%=q8kP@53<C%kFI^j%Ui#C1`6jnz`}R0(>J9`uc?bc%b=t$B`F1}A{tYw
zG`f<Ku7v#K+g)FobJP)NPU<yUSm%>Yfh{yZqa;Ye4+Ai*CPZ^m%u#R(y}tSlGxs(s
zrNp!neBFEt9Rr`{9{)I$=IF26c%y4L_qe|GS*HAaExMU|97voP`2v6RyhKa?JGrd4
z&~3clmEeu;1Vfh1YV~oNe!mldRD5>2Cv8M9xCk^>EJ<(T2P&hp<sQ#l9%iZP=tyF@
z$K6dE5>5U|f9*24$AOZ+3w`*_Pm-B{<rkSxD>wqnE;KKpkWLVM{qrAu{O5(l%ce3%
z-8TNFP$0!CbX{j4{gY#{`Vjcy$KNpmk{C=RS$^6z0R9Aogu3cVM#D5s-u<f=FQ!z4
znRj9>eyFM_$Bj%jOGod3`v}a|)WB#YlS$5bwiz$>UMRxai#JdV28I)~_w>69xFKvC
zFQgO{3n^8Neg*955fGB%;UOSOd<0aD#hOCFkASy;5O^V^C~EQYe?0<Tzis<i16N&r
z4ZS_R9Cp|t)YaAD2e%rH8R@;n>%(}_6f?*_09#vIx&DTmIO@p5iN#|0MXDNoPobCR
zIRG!ZCtm?942o<vOCpiryKlecmRoOQ@4faS9``9R)-^zH6i=q;I59I>l8FQWuf6gr
zmSwU3e*2C{#K->}SflMiyx6XBG6yY$V+1lJlQ{tl!{GJTUSq=zHei7T=4VEcp63AW
z0-v-D;>9X+HsByPg&G?hX>V&o*n(q@ID*+`n}%QVYt(1(D&d*@MK;eo^RU8-E3(L9
zi_zQD%}+o6=zIF$c^4A@{Z(SW{r3alm6u=P#b=-8t1rG7OYghyLbeb^JIIz_VR`Pl
z_Z}*%s_>0eH5L-EEZe_;$5o=TvXW(&TaK|Hk*dZ*0=7jVqR}Wrm+piYp-`xp*9cXk
z%Lw!g3^OK7!EoB781xS%-ABN*Eq?s7h02O@N|C;SAx!rXu)g^9ujVD1CN!$4P$H-;
z{IBL#Y+*m)Higa{8csYu5=xjWNB?V4ap@fo?Oj%8+(L;Vr5vy<`{<+h*zQ(W0Zr2)
zhn#fQ+>>XUeYcQdtRjWf)fT2Pj%a97{cgWyns0ZsG(UOGd8hp<rObE=sHqhO%2Yyt
zt}-476&o;BvVfH@VDN9GitQ*^1SnvsR;u77Ak>E>ARN7~IZ{ldBRL62#PkX{Kdj|t
uJdmS^NEKYyfLaHtP@HWLNM|cYDfS<=;`evIJw!tQ0000<MNUMnLSTYnJ~kWx

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-module.png b/core/administrator/templates/hathor/images/header/icon-48-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a8e444eb7a80ce52e6a4a29320f6ffd0cc5c434
GIT binary patch
literal 1024
zcmV+b1poVqP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BWNkl<ZcmeI1
zMRp`d5QhIO5<iP2gV40q+@R+g#?}Q4C$M(IGe^*@%ya^?y)<kG#SG0*=m=M4*K0Ja
zs{Jzh{qK*=ruZ_el~FSSeI6P>189Jhg$DTOlh4P=)|y@<M4Kxah5_~{iV%h&dy+TJ
zg_Jit&3BpW`dkjc?@hJcx^oXIUU*?)nF{(%2#i;&HGUHuX8@LI!n7<{mPt8#A}-!_
zT^ObT(=Z{71{4ViGzgL&jbJD?a!%N5^&0B6Iy~Qp?|JO-Jj#8K6c9*&d_I34z<LAV
z#;rS0vADRjIXg3xEffnlJv{@j#Msy<7-C?+A(2ZBl6VdfC=`p}+_4?ljtyJFnG8kn
z45XlxIFzd>6bhsg>I71&)d`4Hi=pbYND~v|*xK5{<>loSwG-m{&D&71w6y%~%JNd?
z@aQPD0EI#xj~_p|3g9~ppaC>M2Y{u;h0O8EN#6o&OioOEP^nhZ2tc)r;nAaqs8*{h
z0Jb^-jFWvO1Tyuyo2rAXPB5e#eb@T{?n8#SdHXI}gH|$IDwj6pFlie^yppB_vTYj!
zPP{WVxoiVs1pxw;cbyApF6=nRd7#GZG&egpI{_fqtCjd`2dKzQt(LA<!gW2qbZG3Z
zcin-7g~fjU4W!_&kUj@AfCkV2_ok<&-lIdTZ|}(Xp7>iKu-uRL#Ol6yd}n7ndvbhy
zuep^-+6c>*Z3OMY(BKe;hKDgUGz5+y2w1#((s?Y~h^D;TT=V+_)oxI}`r_)9UjHhg
z+KCOacj*n|v?^RMiy_Dvg2i*O8#K>fOhzFfEnZbba<LO<L3+fGQ064H@&rUuaEa)0
z`kh|4&Jf*NiR|de$fh6osr(J_cRYFWB<FeF3V>Y4zd{QyJfAr|J4@}4`274FJ3Bl2
z9MAw7;QtD+IX^#_&E;~b1voxF#=*fs0uV;gMnr{j{paTwnIC`pWjR7bM|Ob^7d~P6
z)MXKfaxRu~8Vh<<s@0@uiw`-H!G()1g#(c~?>J$nq+BVZQm%4q63cT5#)ap4lzZ|Y
z4Sc-y#_L~0h(8Se%yPLB1<9R1O64;44-Wao4FT+sIR&}Ql7hkrVdM2657m3rT$lH&
zED1%YLdbzbyZq`aFJo|UFkT?jfFRP1FpQpoz#0RD5=IEIM&C0YMj?;m0-OF<rA0`Z
zGF3%$Edt5}MACYQSO&YH#zwq*(uHAg4d1Ct(TsO>3lQ6aueJXYbj>f5Ew}YKs&tt*
ug-~mmbgC>F-{C)m;4kgp&;S}h1N;eL6g4=W&R<6W0000<MNUMnLSTZ!p4Ke@

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-move.png b/core/administrator/templates/hathor/images/header/icon-48-move.png
new file mode 100644
index 0000000000000000000000000000000000000000..70772a3958d884a4a322dc9871de2dc19e60b7ee
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009wNkl<ZcmeI1
zMUWIt5QVdFcXxMp`EhrLEAH-GR!&@ScR1qiI(tT@x!`WU;SST&Mb?rrQCrcwwOu$=
zMtqSqlG*Q7c8@a7IsD3z0e;!A2CM;Vz#6aytO0Al8n6a3fnm7E>(>Kdn{inW7$j!u
zbRi*7{fP#Pfx}c>IsklFrp{sKyG_77RyP57G>o7L4}g1ZAZT!pYOx3Q5<S1U0rzN)
zdhXGhLU=q10Er|614(iZ(Npvm$M_}&+(T8T#&(^%fEh%lbqIn6)=2e~v9}jJlYFdn
zhV~nod$2+|ajqk6KUXjS5I`(v>T#8UL7-4hZV<{mwhke~GWEQ5$9Mvf17)Ui?uL=J
z2qfbPB4Ujs=e=MUqLzAyo(LTSp<{-HhQJeu>?=_Ylf3I{8KsnyptVl6x|Vkxq)?^-
z!!q}IbVqC8!|r0jaXbUaM;bMvDNB!OgR3U|&B!+~J;#)owf{d$d=0$ZR<s;rV%MRq
zESbf0GoSk?8|vrkZ7$!(<@@9aaSp@s4Egs?iZ`;4E}X$sPST(V<v!vm8=gQUP|beE
z<odRlgx2zk0p5;*JOO`^4CIOEP3XldJML>vnE=4BRIh=18;eW@4)M6mm)7a+H!0nv
zz<C-5^q0wVV31g5#D7b)uR=H06fOre4V^d!I`JA4=`$HZhE*E-|D8Z@WS3VKo(e$I
zNL}QXYUBSO1_p6uRbjD7LsJtE^vY9x!v9N*-pE8DUflH&ClUo90B_5*1;Y@vaxdi=
zA*8-4KF|c@IJdA+0!_m&$~T(vSRJpfUp-7=@Q+07m+)0T%!!5(+!4e<Kq2rHM2*^q
zde_&8H~%=@e9mJBsqcD_h=4>N2pCw?M(L3#dLzy^|3cGho|p!&k2nY*7lTiL-$8(S
z)E7O$AnYF;)_^te6Nmj_Ys{E2xiJZHAvuX0L^dKTk_E|3WTd`~Hi#1*5=C4jLVQF%
zAn%E{$UEc>@fvxxcJ10%Mg}mZks$pSTg=khqwM-jJPW~mdNL&gnVxTIU@?+QAnktk
z*zS`UY3DOYa7m=6;F7Qi@gDggPeGo9eIxsM!y2##tbtD&{u#xyIXmb80000<MNUMn
GLSTaTH;c0X

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png b/core/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bab1e70e5bd8833bb0937c36fee68091e51e415
GIT binary patch
literal 2898
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-newcategory.png b/core/administrator/templates/hathor/images/header/icon-48-newcategory.png
new file mode 100644
index 0000000000000000000000000000000000000000..5797c9cee8a1a8fe0ce7b8f50f182b152b3ea3cb
GIT binary patch
literal 1003
zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BBNkl<ZcmeI$
z1CS$G90u?{8+*2G+qP}n_VwD{9nZu@XYK9m*=r-l+QxVPdWWbd+nMT2y{^hv^&33Z
z`v#e0gi6YmN-C+O5(KUk$wY!8mJ<Uxj<?Gj2uiS=oX5-M?;~gdiKibOw2-Kw=g4s_
zFTjuIN-S`NNWc~8^6S(W@LwVl@a1BI`U2kbMFP&q>I=Bf5(zj{LILNgA^~SgDBw6j
zB;ZU51#Cx)1e|HU0P1$!AGJG31UezpozKe@sNdPZe$FQM1!5EUHoXxTeh28zp-h2>
z-DC{D9&nuj`j~6%j>GR}A7=_Q?kN-K%O0Ujfu?;#0)5$A$`ml{e;t9o?Dw9K9heS;
zt{4wEFSmgC5Sc(94qh(g2bRNn!*V!uLM|*|J@P(Sk3wsk?z$fyf5#j&w!M9#($k0i
zVLukFMfSdhH-}8dBf}OeqB*vvnf=NyZeTxtVrx7x>+f&G1B285dwt9z{191%s=t=u
z!6BJ(!q%>Fo|Ch`$kXVP3~-)|a_Z}Cz&-wWj{d(dMsoQYOiiuAtD{l{^PRlT>@$iy
zsdJtB99*ZNT*kQG#vSfZf$l%2kyyTl`D9!|X${*8cFw82i@Xv$<2bm_M7ca={{c7K
z<`iiET^xyJtC@F4MwHgDy<q2@ai35u@SGij_Z(<#qU$kSYn+bTtTXZEu=)6MY?%3M
zObD(iX~gOBv8AhF`YZMS_(!8cxZgR8?IZZ!`2yfMYyaW}eCJ8<oe!-wSli-?`bl`w
zGZXUM#fUFmRUoD?X80q{_7U{6bV;fBm&%3j!G967R%`wi7gha+8=L;b$eC$&*;%RO
z%z{NL*yl<<9Wk5jBWP>rJ8}C3q)X0&bSbn}W%vf?^!b5#Z}2qq49>$R!)D;Ez*M*=
z#t>bylIb;J9$xWIVO}P*{(rC5HU<PW!JsRkwf;?C<FxKFb5_qF&gc=une?7Mhd65H
z{{`+h{>H|XT-Q6$M_qxzSIY!i`o-}SPUtvF(HBFfAhLJ`b6?|6&8{Q&sVs2Kdjwj$
zypt72i$e;$=lcVZMa!8d%|9uwIlrTGt)MnrJm>Gf$$sj@O}3MvCELKqap;%+0=HI;
z#}9Lp@c$LUJ+(o_H8*t_*j*?!Yiss-ZcWu5(wc$0%UXF%{4{mICoW_=_8UJg?LG_-
z*2_4j(_rM!ANHwjsK8V9{lI1*P)Q>D3%q5|cTCTb5P>o__ng3cc73zyJ|gD1PtZv!
Z`5SixV|}GgMcM!W002ovPDHLkV1gwd_EZ1>

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-newsfeeds-cat.png b/core/administrator/templates/hathor/images/header/icon-48-newsfeeds-cat.png
new file mode 100644
index 0000000000000000000000000000000000000000..886b5765f85d32ea8cb7c1c7dc9446339d2e21eb
GIT binary patch
literal 1509
zcmV<B1seK^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000H7Nkl<Zc-rln
zZEO>D9LML_*kJ2+4EKN=*~tP-aM+<lU|~BAfhbC<L<4V3V@!M@LK(147`6-t3|u<P
z(_o{=p4k&!2cW3)R6$52xeyc+qp68%jBolz@D1_n@83$jyLH`NXVa-P`DE?&`}_ZY
zpS%Cvwc8Q^{HytI350uKs7xS4LW+Qm;1Xj0FeX4vISA-PCb&r>K+W(33}Ty10zwo5
zK0=xx9>tQJxIi3{2`+j8&r*RvoN-1kF!-oIAkIk93-p%=1mesD1bT}F0&!*n0zGpC
z0&&K;0FEbcgaEh6hV~r9mA3n3)(c_QC4du&R-Cwx%;y3FrIQD@3DlQN{c({6T9Se5
zuF1zuH{h)R_2-Bz(3%Rg%>@0NR4DoyN8n_d40k%B!P8U*`@Z!mB-didM~XGs=%M~B
zkp;vI5n?6`Ld|YK{@(ZT@S&?Ja_Y{5+vNqf^#m;T?GPJR!{3_6YNEq!;vx&2%Ce#@
z3r0z>bztq8AMwJuU&CS<`Wef`FTo%92+7-eV6EE-xw*v99Mqd{{HsuVHXqI9jtM+J
z{EKc%o3A0Wb_l{Q2Yju?I_Jq2_1y<LX88yhfv<AGeDn+2(?1zvq3d%@ujz-q;Uzuu
zSoH~X7I@HA03*mPOTbsVkg?N)nf9{*X7Bp|^PQieqWx<;JNUzxtUCQ2_=XXfcN~Dv
zT{7kz)EBQ$pu5n9ZXVGfw=RR!{6qlJ^&IR6UuKO3)_nn;<jchyc)I`luoO34qLaOa
zjS*(-Lcjix5<Nv`0{<lb&V?kjj*ikH<kw%s($?!(O?zGoEvcZy$ujL29z!4I&^sTo
zLOlE;6A2uV@>5@7W!E<<9%4sg8%em!|E@bd&t^=ZZ-GQWFaGYuus6O6!CoK2*0711
zT@PQ!vamHQ&(W1=LDOXjZ8ufSYy6Z+C~E~{0s|!u0(!CTtHx~Fql;WuLd>CSe(vt`
zNUiFHd1oWUBO6B5NhjA(qpg_x_QzP^zM<m5h7nd5$Qk}VfWcCMfL_>rU|EYiCMC4C
zvmNKa*BpW5UaP8=+gC9O5*`^<mrHl@*AG<sqWeN~<}v7n2`o8wZCr}zsF-#P!gjDy
zSx*vAF$wm*DsMh~6)D?Kv+;T30-ncZ3@wEo1jl~l(Q;W#6OKpep)1I?4+m=e0~Mh$
zq*Lo)dSd{K-np#G=kIx!2}s5Tyvv>NmO&5x!6#vPtBy?+U@BerXViMYv-6_qQdn~A
zXGx+#HIBV$GiL7cj>@Lj^s{jVV*<nF76Q@W>stfy_$#o~?+M(*avf)}pz#we0ZCh9
zwW^k{If??>>&n~%br+a`Xh`4>?+WftzuAAM?-5LdZ#&9SVc!dG#~IAs{~_izjD%pX
zr&sl1q~)1Vo}RO9svIM+vWrP@hJHK!yE~7&-IC?JeLO?{?N}Nn!fU&&$e=Yor~W+@
z?Y$Txm(GX6?M<QFt!9%iXWP+R1-s9wa;D%ivc~)m95jiU5Ex<JbDFCAQCN3DMS69g
zsyX(Ywy84NwL>i9F(zQVabNP*Zlut<XV7auVbSEIOxm0I_Tjrwa~_tJ6&WsZOQ$L`
z>rHQ9JpBU3oA+nXUdyZXgqT4~CN(HxQDpfkm0hYFgKcB)DMhoWUYSV_X3Vh=@R;a^
zlT8z9$s{Qzr_E<n^{R5ITf4Q($dRTQGbNa@#6kdB)X*5*-E)E>Z<$Kll$q(l=A4l-
z(}EdCOawA%@UckR(y0~T6E!tyK}kuG5vWd;Nu^B81kxjrNU*gVsb(6X6_}#QOeJC^
zASP{Y$Fxmtqe!Oh?CKPzMwLsUoJPP*;@YudCcqK$6xPT_F+>u*{_9d|4kxY5v*+68
zn0V6Yj8(sYaS4%t0*Nq3$V-Z>hv359TND|mcAR_vD{)WY|1R(+5TSf){f(1x00000
LNkvXXu0mjfWB%aI

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-newsfeeds.png b/core/administrator/templates/hathor/images/header/icon-48-newsfeeds.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1bd76d09d6f373d238156f92f9e26e7da3dd864
GIT binary patch
literal 1285
zcmV+g1^W7lP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000EcNkl<ZcmeHL
zW4Byc5PeCWZF_9nw)ORWj%_>)V>@}a9orh)R%Y%`sM)o8ok7p3+owI~yVeeFpE^~$
z+#U8`eL_#@2|W|*%Ye@T(%^MqFHjCV2_*mHj4xTVhwf|nlwKG<`!_t$_8HyP_z_*Y
z`WWTCyn`a9wkT4|fGhtA1U|pF=@WW>@MmM(53*OTJ4wm&dWq$MiNT8u(&X8JpF9O3
z^f{fk^Z*mFfbzf-0fA@we()NPc6>z_EIaf&k$|Sq^_yO&r+UBh2_A0$f=U+cRjGAn
zAPC%<G`E|sSbGx6zoaL+zx4^O-S|4Cmk&^2qJeG#bORPZ3TX@aDZ6SIsd12Q-ugB@
z*7>zt;9@U+ZMW)LK`3%W2Y3=F2lhrxZKiy*(rebAp+^ucQ=GeapQ?=@w_SJ<C<D4<
zX0&r;=%Lonjd1D8qroMiAyW)g$INJ>^U+4{Z~nw3E?#js_#`AEDHv*(tvX8gVrtvr
zqUDGDM8c68<xY6gP?4&a&x>B&MR(VKV2cZv9aJQeeU;a*XIBnUF_ixq>F7f7vpSTr
zZYF7PS9k7<+vxfYXXuWacSRJwvXfY^F9>uOptIbDHYwqzO>fY}2z^$?pxMfR-H6X#
zx%#;6y*X&nycBv%fNq9?rnqk1Dawb36%o6X%)}tOeB}}Gt{XAzlIC=gcM}@~Za}!*
z#no$0sEE7{Tq%*rKpI}L>X>-XxoYk3hQPHj<~pnro}d`H9E+L2#!BgwS>A7Z2R`>=
z<v<Q*!;@F9KISnlz@$x^-%D()RA+WNF2{T@?@B`Fh?(9-8T0#y6*1VemtsA>V#N_7
zT)23@L_+EKya>%glFw9&pO*{WL^T7{au+?lm2#_w=%OY2LFk|@&Re*LQs#E+(+Pzd
zH?v)oy%14!83iwhRRdN!rtQU0WQP)XIeJ<PX$u?oWTB`f+0?l`DuRAn<f`N0#e80|
z;cW?7j-q^Bw{}EKX%gi?-iwZ8PUK0z%0#}Oi#m~zG^<me({Mr>JT1vZP1Q%wA8Cb@
z>Y>t?wrf#@C~0#VQ3yvAB)K%ykebc`A(4r?D8e440iw_$MWH(bQP9ccEa>xMM?wK<
zexdu^roTTKgMuwU&g+otFvikN=(y>vqTI+y4J?=J_D0H=W+H^S$ZrMyKi<pVYq_vz
zwDDOjVnL7%cGd?YMVV-Pb!F$66JX<~wNmz+ZV~w0K|)X7%ADP$l}kp~;*`<I?M<E8
zp_Pe;!_0>o4#t3S2J+Pva88=E)d}#lP9_}$gfuFT6J(MRQ6^~o!&V9yr$NXSlBSDM
zxH23mA<6M)e8#zcA}2Q*=rPzvQ{V|x@Oj}LD_M|<fT3)#^J)QN26_w#B%v=G!j3?9
zEDY7jL^}wSyQAAJ0txVhA?yg0M+q``FA*@%V^9OJ6Y40=05Jfcmk2}(a(FKikaW32
zpgf$78(-rRe9mU5l}Ajd)ym<$M8JyH>oO;x=D?`&wG=hBS_D3~?+oZNBS6qbwoF$y
z;TpY><7zaKHkiaCaaqLJtrR(C%kSX-<GtB0%rIyay!U5${9h3lNr#WC*67m^Hc2P*
vT}X7qGAH?Ne(&lRJtut{<3msA2|d37qF0OT;+cSU00000NkvXXu0mjfc4TXE

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-notice.png b/core/administrator/templates/hathor/images/header/icon-48-notice.png
new file mode 100644
index 0000000000000000000000000000000000000000..16e1b96ea60781a0527f781b933c36b5e6765927
GIT binary patch
literal 1959
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-plugin.png b/core/administrator/templates/hathor/images/header/icon-48-plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..d127b6cdc42d2169d7168fff2f79c8e467b7ebe6
GIT binary patch
literal 2212
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-preview.png b/core/administrator/templates/hathor/images/header/icon-48-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..40dd10be4f235a2ba7462e8dc0ca1c87ca0361eb
GIT binary patch
literal 1037
zcmV+o1oHcdP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000BjNkl<ZcmeI2
z1FY<L9EHD5I~_k<zqM`K_Qq@5X0WzxJ6PLzwrz8G?^OT)&Ts9#NYYO7zN8qRGw0Mb
zwAR!!G3p#c2EYU?AP&R;gJ_}w1$clD1O^ZXGC&_72P7hFKmiU=0t!II0CGUvp%1-$
z>00Zqx0j&;Q)?Yb1BPK}9W#Teqep)5$<=2+4lFW&mW@t2|Byq^zx=t36(cM*?ww-i
zmK=H4=fk;qdCb<08D^FozFb&fpSIqtl}j*US%vQxm-yh}yHA<;!owe0fbE)gtFJT#
zHy|w5%qF;Q_-wXq$dZejY~7GS9v{C>Gh5Z>I|79~zGdq*_<CUx(G1uYU{+k$DtG~5
zV#i`MC*m|DEEZN>M2|ccGn0!QY}=Sc9?SDGh-SdF0HZxn6y0zQyfS?$J2q#j_=>?x
zDwI8iJRY{J!Z!;`fFX~0YvwZ1if9H516XT~W6wG6h;uK#nL6U#NAJIW_N$M*VgVf5
z8?IPANj(wthR1*yb&ka!NTpKPwoTM16bigC?*$xHr8Th%2euskcLQ2$a=9GIWb~?(
z&*vGqq`z#)ST|GQfM)&A36x4D9LFI_D5VfK$!y6IXECcJR{!@3xvnc8AZkb}&fn}3
z1mE{%__G12j|`2Cjp0|Q6Lpe7^iuz8p_K+AWFU-V<Ngc2r5lLWXe2Ol$v~bT|9JgY
z$cmYi{RO-;?X8{}kVwL)P@oiR_g<9=D+clXystW49~mOC8Vz*7g31zlC9-@p>n*;W
z`(=GqND|0bi_9p@!!|A6nEV`H&-uK22EwROpcQ$igd6xQ>nLIvF<zPY3}4OutUlI4
zl0c!_j;|D+3h--#n0S7|lYBAj6FP%Mh$yW@GzyK<8ZYo@N%f;4*?@-V8wh^+=gUr+
zl${n69I)oW?6>AYovKghTVglxSS7tWx9oN=rD~Z#YhIo3a@V)SVTcz_*yJ>B-1QFD
z?Xw=cuCj;JiGo{T#NuI{F%f<OBK%kOUSmJ1o`V8DoB2ui*Fs^jRm(QCrrU6QhhYnc
zc7GWNlgqciinViVal)o2cRB&<uN$&3*`V)+JhK0jU0;Z!PxmVnGM!(I)|~+v1WO*v
zr5k|x^XC(f$B8nY=OKt@KwE%knx+#3fw;nTU80Usikjvs;97w5!w)|UJ^JXQ+gDj-
zm2^FbpH-uO|NcXOssW^czMF2k>H6DlyX|(hh!Ro0N@?46b=a_BL&lCBI~7=A0487q
zX&?c_BYvUV1*$*?;2P3<qXuAf|0;bbSL?N~@@9`7veLkh?AZzm`JdfW00000NkvXX
Hu0mjfiYnwg

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-print.png b/core/administrator/templates/hathor/images/header/icon-48-print.png
new file mode 100644
index 0000000000000000000000000000000000000000..37e11dee49ab6bd1eb1ae7b8be1c2e4c10a75a79
GIT binary patch
literal 2703
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
JPDHLkV1oU50QUd@

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-purge.png b/core/administrator/templates/hathor/images/header/icon-48-purge.png
new file mode 100644
index 0000000000000000000000000000000000000000..97346a974290285045b8af7d26e2fe2d2991bd2b
GIT binary patch
literal 1471
zcmV;w1wi_VP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000GsNkl<ZcmeFx
zg>U3W6vy%RC-_fTVVRj-#w5-$pAY_kGDASRa*r8Y=JuGumx?Mp6vGP2<YG9Qe#dz$
zS=O#0yE)OV^wIq6nfGRFN0H`#=YQva=YOMzmN;<Hg#cknpmQ!9NUJp0;J{*k^x)#{
zqX(Cm(L*@0#EczV3LIBtFsEw{TGUVr$>Afwqi`T;8cN!~=uuQT2#4d)eH`+eg8D#>
zt))kVE=V20=wbTXmvD56U3&tOrlFXTeZD)gkAojrL{pmgEl~(L&=DNQ!9_|Pisx99
zuHj(xvOR5Yi0Yz_2WE}p+OBgUNg4{+<9Chh^*IcUkJA(!Ha-CNOQFWrCi-ZPJ^pg|
zBl}qs+Ijjj7mtVHHC>P-4LNo%3`X`Y<SnxCF>S^*_nTvT9@L&k^dWZZK1aFUZy$<l
za=a(!fFx<iuycVevTuSW;|)i4Eod#<|A5c9fRW5Tqx*Fq#Mj&>hma%<4eXd7#0?J8
zU>^;3ESN;|`2vjlu}80wysy`iq#*^vU(fT0w^Oih{7sN2)yPil!R|V9yTF{yoT~z<
z(U9`hTxa;Jd6E63!!#yOuCM2s;T@{p{C1sV9oH_TMnlS%a|0eEek<g%B7|73LPVK0
zU(E)x*D%hp`B6xXhJ?@ORKQd7<X<q73kq59K^k!F8W<J#2YI$$XV5iR4yn<Q@Y(F3
zRzxl$8vbmK4=KpAH82wtLTWSsL!ZoY5ZR|?EP%D2&b|^-6g5{O8v2wyCW2Z>jRy7c
zOmFC8Jse{JE~K!JW;%>jn5NJNVu=Re!<ow&4Py}jqyz^iZ2uN;>p#E;GeVexDv%PE
z!?cJ8v9!5*f4UiZ4~#iNNJ*xJx*(P|2L|7rW(ET==IDZy!HbDtTI5QIC2>%L!BjK2
z4M8psQqHt4m=*{iH5$}b4!32BVXSZSv|4r{W$|)6bR~^^yR|xc;xkiF07=pS*u!Vq
zG_{tyAgy4G2~qUd1xeBX3~uT)Sq3&tt>pmH3S&Q<31P;*KWi8>@$)kuU|^$Hg=uL0
z)bVkH7eQL2n&_P+f~09s>pQl?H0Gf*&hQ~k@}WIFbYux3X&ThJ_D5l|O#$QD_6QDS
zf*eG)SO2=H+B?&ukTeYd4J!j{Se&VY!*^<KJ29}j&4H9fZAcG#c>p=bm5?+IP&5x=
zvhWoc+d*FS$O$-*f*j}``bEh(PC)9>0M)<p5g#Vgsz>6D`#FH#i~3hS>_c+c-qpB9
z4^J=ZbNP^ZG^DI}xC)akeh5CTXEV6B{NXB=!-uOpEJs!A#{Uf0Pvu~3+AC8P(n$S@
z<qx_2?>uDka3~(4lf#VvNm1K)Epx1i*HS~RuFdB`8qrY4+Yc^>DL}u5{a?-D)_2C4
zw~Y2U$M<xOFRXQiY=>lNJo(mxPXC(^oPa5eHx?f-K6por%-?xiJja?cPS`U*vSd#F
z_r?PiL@?)AgexI=G-P=F{wx1`?fwYn9Et3nkRmkXc=f)@zsv4D@$a&G%%oxu_PP>M
zRN;kx_qxvCJ-09atNS)H8UF6RJ+ON~%Fs|;^wLdk^x_TSA1_>QTBK@wLMB2(dA~h-
zwfo!CS8o6H=_|}cP#e<2gET|K#QpsEC6%8azu5ozv5SJAAHC?rPmf+`>alZnO}v&G
zNGoUn`2F80U7#=!17Q?qU6OT|`=7H9_zP2)z=uRf5+IZau_Q(+$sf{}UhmE1x+g+_
zhY@H)0goCjIt&;w8H3hZY3|h0$g_K9W5Q@m#)uv@GK6>-A#&8(JYvR*4Lc6m?vt=V
zOC|MP0uvT<?|~DC?AT<%j1esy(pL!th)mmZDWo(CWG~tuKhm1+mfYNXuRt#M-zT(R
Z=mKfOn53G|icA0i002ovPDHLkV1i~*!L|SZ

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-puzzle.png b/core/administrator/templates/hathor/images/header/icon-48-puzzle.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0019d8df74e35ddce40b396daad6189dceb707d
GIT binary patch
literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#M@d9MRCwC#nn`FBK@^6&C*zheBvGSD
zj0>oUL`20M#04)R9>kL%DyRp=i#Ly6L{adfxFU*PCEx;zpqC6N7)4YB6N5`46B9GW
zNK8bN@qh5Q#$vj=x_j*I5g&YzFx^%4cURT>>&=+CT+T2}(+D}{gGHbUbb-gjdx(G#
zqZ}Lo-O}|iK7o^9R-6Tl25DvBD$QU)Tm|fQ8N9_=kcgvzw5EW5P_5f&BE<P$;bE$c
zilcxg&FlKWKpdygOz=Z<4J6|zK$6XI4FMbDoCiw5Er-G1^srVU5g@S?bmkfSJ1{No
znb?Xu%HW5<89xmrjA-Jk`W!(+F$ox%XB?ZOFmsY{CW4fQd)9$Wo;C0hto7J`$_!|y
zXMihom$C>yfG<o&84ju!d<WCP60jH4*tGWs90Pa3d#;TUpp4dgDwqt$f+?Ubr~qlW
zgWIDT(s`C*L_i&Ff=;xu-5iseyy0=6migq@S_&$_<d!%gqP5f(bP>xFdSOHtW+8T=
zhY<=W$Tr$s>;gK9UBKsJ7x1mv1w<N2o3ra|e%21&y0kGTQU!_^+6M0NOe&f5IXDeg
zJ2de~v)b@CXd5nI2N<-uFiXE)sZ77~5f1(j0dql*#tmZ74p8j<fSvc!{PhG8V0obv
z_-9{;<rO&>H!_Eak6Hs(x=hu4(Qdtg2O+)ki(rz2vpvYloaZU@B!t1=rnh&Cquf9|
z31|#Kz%tEgF@|eHOMsOJZh#dUi7m}-c95@pkLGc*pQkfJ^V$|3Rkibg9PyqxD3w#y
zelT9SeHA}*dr|{De(J_GKY3stc%|e5c^WUdOW4I#&CZs45YXyJfK~3;1ulULnx&4d
znw?$O9DF@<gf9VpV!MZhyi=pSbAGLa-#Fx<L)l#xI<&Q(_B>PpO&+(?%QpF-jP;;g
zm;y>@^t^Q1N$;h`20vaX=z*rf$30axdwgjWC$f6QVrvznScX)iB~R7bEozbh1$5J(
zrC6`5q*<%ADI-1whna8G5I?pBoMQdcF0y<GV(q)k0{>P*>X+3l<jT(m%8lP&nabR6
zVCPP;7;NG+E8(ux$J~%%CGa)>9x@~PhUR}&;-3-lQ-A>gvsRMfc(@Mu00000NkvXX
Hu0mjfHP)wx

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png b/core/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd255df8d06e43e2d0e9a2cd1d46f6849842241a
GIT binary patch
literal 3398
zcmV-M4Y~4(P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000dQNkl<ZcmdT~
z1#~0Fvc01jSzsAtW?V00$l1Vo%*@Qp?``rh%*@Qp%*>2l2rM~f%a$$1(a^7+?fJi-
zqImIBopUW3xVO5hy1K^_cF!aZ7eVH)%q)V*VF=&tag%qGyiD*A{Dc6Zg1`C*Wr8RP
z|Hn+?1R3GxpZw$}U%uv=YhHi+@yD%apMBQ4^Uga%XPj}yrJw)&=RXdhlTgo(^$-+c
z<aVFPE{2Sod%5b*fBy3~KKHrL9ldDLqH?d-3&&!y7$zqtv32X#=ihnfox4cTy#O+V
z9HBtacz9V1{}Td4^5ul!VTT>|lh1zkvxm)_HxII0IvNXw0>a@iHg4QFy=BXmo9?>n
zuAAO`^UV+!qH-~Ym@9i+fRLzVoP5n`r=51f{`>F$b@Dt)nPt77$Mp0xLZJ|7L>_wY
zz4z`o=bUq%29VvIQIU2cS<85W*3pg6Jn+B+Kh@RM#fk2mX_{t-7m1i292~rnjmoR9
zzB*MjDmua3-l#}BQE4hyty<N6=%I&RyJE$P-p0m8><NoTqnMhSVj=br<;(3fvQP6|
z$#XHfGb%ePK;jj{%gBG>3tw3Ijc<J8T=INRWo0Gyw6RfPxiUz$VZ(;&siNKY{PWL`
z1IP+OERMMa6jz!b{_uwf5&28^-h1zIx7&?9XeC21l}ce`WF-Cc(@&p%?6JpQ4Im-p
zNs)lL%VhBI!w>()!3Q6F<g#VUc8fd_-KFq)^wCFe`Qsn|_;&y?Lbf=Zq`AuE(MKQs
z(~p1r<NsQ)V8MSYQD(`!j)GwlEMy8MG+hIdVYnp==bn4+_inl6mZzMN5Cte7R3^_m
z@4OQ}^q~)Zy}7x0j}nb$3s7~_MuJFdL|8K|$S#TCvR_@637;Cn(q&8R`>bBQ`m-e9
zbs>y&QGi3<!^>pt6<1tw)<Fjy^r@Pfnq4Lu&uPdNblbBIY35;vr1Q$)mjCNJL(Rgg
zrLc6#BKzJ9Jv}|ExMRyWR}>4dYkYryf6tmVYp&mCpM82ODk^q}d^DpXLqua)4T)R<
zIn6*SuNRSYaiTJNE%h5GpFypxqHjJY&rw%b*9gG>K?2<T$C^V9IpkvUe6OM?D7Hvi
zC1M(8iLgyt)tQ$|5>l8)#m_7(ocD8(Zw<(3ZSJ*6i>M_7;1xPt$;ku7@%}&l@sA%;
znOu>`GY{q&Q6in+Mw-aOiM4<8==+G25H!az{QO)rjLy1Bv@|!pk32KhBvL8g_u6Z(
z9T%4XqJYYkD_4H|?V$;5jHt-FyeKx8<Ph5l(xO0#eSZHjS}KMGt#zP$D@mTc`u%=T
z+p>U1i^9Xma0GY=<%<_D?(XR5z`nU0-rhWD3yB*FEJ<eM#i1`vZWl&_k)PjE3!ZN!
z$vbFoZ*OAGE+xQC@H!{>d_L^6VkuVYI^G)|#XD0;L^T<f;+``s6oKrHye21yu%xfs
zCU2UiNW7#ND(Bq*JmS(-tU@v^K%#AJZ8hM=5_$f-9xUjSFflQK!Eh2&nF0*izf1A1
z2;UWAQ&_R6&yH=wFdUR5E=jBaxX{$p)WHR~MFBFQis54)``9P?`ub{6!kCx3n(NV0
zQ3j8xBAd;?Rpw*Wh9HZtB_STe$S>;cv=>0SuG<Tq9EGi_s(5ir2$iy7e|~jn26aCB
z7)Olzkw+eRkQ^Q66Po4}mNr5+wGDs&{qKMOIY%`ES;^OYK9A5$1f#P_=$=YOM)Z2g
zWR*-4sn8IXFImJq>JYcDb;`>j{JgIWhrMlKnKutuz=pJfW0$#b#l{@g^f!UonP;AP
z^mW%=cRPSd-d30jPlm$y`1sV0&bl6t2i@(h=;>&)S6QPoacE@~P!vze@B)!XCW5_J
zE_aCI&7mm_L<=}5ki$KhDnvHSV0}J_EosR<K4-Xa+MBa@ArruNLLs~qbHUxV=tBS=
zB}Dm}K~s2NQJ9&T2}L3iR?c>+acgL309)K75(!L46G#^%xXY_xYAOl@R>6E$0lht4
z4tcv>_G)RIHeHM7#}Z)nu-OX8CgPG8uuLe>@JO}+0c3H;`XpY+dhlCWuLKYz%o0)r
z{XYfVbI&~kM;&z(g25nm#n>XJs;bJ4<u})^L%{Dt4Si-I7mug0e*JpZ5?~~n!7*Dc
ze8h^Qr6A)mZ!f%sJbKepsMa&^ni`npp&$+qMl27W$W@_FrXpgM_cW}z@S^e!&mA`O
z*iDZx-cAT<1T{w1($W&#omCYr4XJX?!?xKUtVFUB$VP~*wlFy|f-1EcCsnLKpe&81
zToeluqe#%Gg{zv8_4vVzi3+Bo=%?Q|Szd$;H*Pdqg0-<tLqtBp_nC5z0G*&xxs1?+
z7Tg{3y}i8%1Okk>BY^#8huh;x9|q-ac=Iy|c(Mp+IrOC_Fx=RUq_4szuev=fHsPUA
zOUgb}Qf~DnL)c<UfQ!OWO)D+GJno+!S$=ouqJJI61eneUkcT$Y0%jg|(wKKgM@O-6
z;X*sX8EMCyQkltQu-co#J&9Vp+eBfb=CL3)Y?F^v)FSOI2UiT}22{%hRVjz2n1HVy
z3#@6pqFWg6ShBn_8=Xwue!-al{Eh%S4`{0+w6pzxI-Lfchb2pvu=2>ri!-V{LD}0V
zu{1VKrzl)f7^@1PF%@QEV|(5vZvk{LpmS(C!9dzl;6@n|E+1Nz45lp^<ujAxfqg!@
ze@${#(hec95>Xo1iOg=!5^yeK+aWAzX#xZ@$Md29X9V&T5_d|ic)hU&x+P)BbR6Me
z<F=SLt!?Brk-W~|8_4Q167Zlw$zo77kZ<qXuaJpXdf#~FIVQkz1l)c1-2=3U$Bv8w
z+hJn@+2)o=zF2^h13pQ|ce3kYL}oG2xD;Mp-4^pMw?J0sB6Lv<R6^D=;bl!FBs3<Y
zq3CVrUK)u^MePtOu0&MV=S<|Gp&`4<R99CQd%dIp7Dj8sd7SD$5VLhbo0x5e$w`+c
zZi9rv;CsRfpu@sMMX<T<7e}8tFEn<d0y41@k!K^c3sF)43kRC9Sy^N~dP%RB3Lz$7
zQI&)>Tb{<llQnp;V>R-M2mWjt9?1*UbTQJR2!aL}IY7_AW9HzOb)@MyHUh1Ysj>Kz
zw_dYh_}$0t5E3g9?N@H5-H3Um$g`NIdBUkQjNqIC9Dyvk83xN5@M3enoddJ}YE<Qt
zh%*5$f05S<ge>#C4ZozLib5@JSldRRuDQK-)rS@(hTnZi0hw5dLS)4`kj-W>J39-u
z;2|R04I9Tqk!f9ms(A6~k*D#lrxg>`9q3Q4L#6D80Ru_X&Add&Ipl5cS3sv@Bvi>h
zY%CaP*YkRA%fJBq<?fdLPt_{)2a~Tn@^6(W9*^5?0ka&NP?AY>c6NenPV%J$I93<%
z;N#vfo-@*TxW3mOg-yXO^u<O2xf-&mAZzGQnE*P5we8IFl`f#e8^9(_M&2?IQhZ9~
zY-o7)h5K#=FsKlDh?R&Q4-L=`G|J1%?Foui8cOON3Yp^Mb#lNd$z^3_7z(uGlUp9f
zjN!&>y&q*Nx3v<Mn*d}{03?lK9;i}0HZ~bvOqm8crZ!J$vFQ<I#X)`17w($@kd}m<
zxe7uPq3{0t@4t@qM6xWiChY@BGdN@!ocH2qRzlebvVBh4K93P{)N*7ue)r67%>q1<
zET>%_bbe4XXL=B@^2q0tngYX&pY(%&0oXzqB1|dZCX~`VZF5JcOa?{I6H1a4zhmu!
zz1RtbX6YJ<;o;#aD!G%a$6B{;-8f$gx|{a;@Iu$i_a)W4&mWObed;SpKBZ51Yn4H(
z0Wj=V!hZD{DwIN8)7`RLyWkHO`9Js5`Q4xRj*pr-cC82@Cr-6qLM@?#t<LCqz?awp
zznG**l%|Xn^+4gVv9W3L>;w^?85kHC;rsddqF0T;%uNUoD(e>aFV=r~*3a~d{&>Ig
z+Y7&j@Ms+VU^z?+QgSwJRW}9oYY)9%`NluL?s?$cQ>O=>d4+kMFhhtFa>XN{5>i)R
zef6!>nC(Lg=~mVTFrrjK6V&XDQr{CL@6OWW)Qti`5h_PPfX)S2d=z|KgsL9@wKcif
zklYd-KOlYWKW}$`{tq8wM`;h9|5V^R$9{8i)9cUsFa6U~WzF4r0Aqw0A<3_6LNJ-<
zK_{V~@D;+(34i4H4dEw*?-IUB_$=XLgo6qD5mpkG5c&vRgf^a2b%bg{rSLGkme5LA
zz|Z{{Rl_v^zSX?X#|~p)@A-EhCG5+u+eoMob|xgL#KUVpzge}gBMfKlEI<>W3otm$
zB3Q!n2$_@c@X_#cak6kf=kaTrkar#c7C*^UiYHv*DM(J(Ooc#97hskkYt8XwQT)v$
z=$w?o!@^Z`Ka&d)og>}@(hmIdhI5Q_q9G9AWOm8K67J%VgzqhmIUOV6|Ax)UWA5j~
c|Ih6|02{;$s`Mi9RsaA107*qoM6N<$f<*6p`~Uy|

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-readmess.png b/core/administrator/templates/hathor/images/header/icon-48-readmess.png
new file mode 100644
index 0000000000000000000000000000000000000000..208b79345f0e09cecfba5b61f653cdc2ad51eac2
GIT binary patch
literal 2477
zcmV;e2~zfnP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000SeNkl<ZcmeI0
z19V*59>(|WjaA#mvuzvK_N{F@sNGjPb{bFAiP<)`Z9ji+f5l#tHLug)AzkavTECwE
zoU_k9-=8NP@eF@H`F!$mcX$83<cb86W{Ist^aW-74;d!eASn(A2tZO&63WWTP*hX|
zUteE3^3}oUfQq)KrzavKBaxSvhpMV7)YQ}{=!~12+f|9^Ez0;Wpcn1r<YZJ<R-(4H
zR#8}13BQCqI)L)>a?rtZ=gy6gh~A)#{~#3pd);Uk6cm7B>+9=5A~MRb-8&sWIU0@6
z?9kv_do@TeC<mS3dS_?n%@WZYlrcakdYWVxqa7R^3`UzJ($LVL$FI&N!FrtrJN<Iu
zm0E?j&LzM_n?na!S}dayA;fe4t4YFWdwF|%BPJ#Wj5b9!Ha0$y{Q=qd$(a<CHg=)8
z^DppDDZ}b3F{r4hU_-;--ycp+PCt~0r=g5Kpcn1CckeQKJ%l$kH7WR=*Xru(SV~CD
zDa8+t#iFC51MxW(I2UveKiJ`gjEoFs0C90~aCLRPCJ|3V8NER_+R@R`$j{GbO;cPC
z@jOSdbgH_#nvILn(o&8}3Pg5xHYTn0z){}>ob-*uANIQ79ot)Q_PWjJBQY@%9v&XO
zYUbWF<k-j24hjlFT3Q-wn~_uk`JJ!?I7y0&i&;v@$;m-hRu=Bxzt1coK0Y3I?%Y9W
zXedrx_rT%HE}Z+E|IlbO3<}pGBqRiWetx}b=BG90PZ<eL1`44#)@Vsd38TpjAU8J`
zjA&+NCirkV$a&6wpeRPv$HzwrWyw(}9pZi5k3nECh|V}=GnWmdnOQd82?+^c+UY=g
zdOG;v)YMdP$}pl@trm=EU|=8^H40^kQ8=C8dOFE6Vp*}g9>MQKWm6a4&;8iU{cU1q
zp@j9wh(<(2FtrrQNa_k@MClNlkY%LT&^qwE;#62Jesnw@^L9mG{&o$%wnu~Tv_kbh
z2n!2S&D^ghzH#HmUZ$UKQ3?$Y59fqnsWA1dd)=ri(fX4}(c}6?&kRi17KsbdW$;X`
z!jBvxl>-b~R8*9DGxw{BPn<Y0TV{fy^-|2VQ@q|3(h=U=+^mPLBOARkaU!Y=<xSnF
zZ0^Rzs3M#SywCj^B$lRnGxw{B<;O@K8@ZXDc)iH$3vX#@(L>h}+rS)LORPdhRT~nD
zny}vao^&9c`!mBV(*eJkhupk*(~~v+#OUjbS7KXRTlLU&#4oK3W4A`aDY**!{d4i9
zT^i*8o1Q(!k<1ciGxxcP>A;mMR~B&`8WK;Gcpc$wZEbq!Izb1<Y>B|HPsiisKgHv{
z3-NH)=5VZX7;yY@`til~#Aa5;qZAoQ%q3P58_BS3+qS(RQ;5RCLN&8>9WW%my}ezR
zf9HfMC+@|)`Htb(<wWDO<K*Kz=GLuSSh#TE1Zt#Ky;6B3e3WFGWR7IPPiKp7zWXKd
zn`6h0aU$>~#g`YSk0A$i#q;kSg^nX!rySrO+>>u^zIWnpUqaH24bYrg1kZE35gp<M
zSqa#@dGkhUq*iKvES}!*#Dps^ijPy5i>Ul{qONqKK>2nfRO~hb?YtdhaPRaVks9_O
z8!V+Kim$9~z-eDCs_Prk+1aU(PUtzn`&pWddis?QQMi2sDs8P$cWN9+m7O)pcbFh|
z%P=Ia9g%zK1+kD?C1#H^VI-qGGhvBvu0Ajnt?moZ75X*&S^J$HbOwI~P1k3jY^xEn
zZ!Q6+1JixRQ^V3?&8q(*?!I;#0WoRVbKM^s&UxVt`|J4ajtfZ3E&#7{9h;Q*@Q*x-
z&pG!3YL1RXmq!2Dgqo<08WWcaCu*j4!RX7VUu!r&34f0I)>G+{j+AdVMqG$HVq;^m
z;@}0?UU0&;Q#Y~D_B<9jT)@F=9yoN(6YEdhz&SU6NdP#CW8#yLl9B?xq@4YN!E#B6
zjzFr*PE;Qn&i#7@wNf*+3u(Mx?O=mHhkqS^j`&8eXuLE9<=c!{T8jKlrpVYm6Ipv_
zA<uRW@@?n#K)Ycgk~fXx+8&f`c^*~!Ez$1z>0UpdTC41>nThvA;d&9<CR5X``PzW!
z3jQ)h7{=$bYW+ZIbDNKXbs|QjEf$^m$ETy<)J%}J+h0I;$d?B#rRV2>I;lDFBhe)S
zUlj0t%|cP{D6<jpg+WXB;^9iG=WhfaIbg1+zcCNpexDtzNC$=~t#m--tP-fbJWJ8(
zF(2LD3kEF>*OgXeuMiNN1YPcP`$WN^i6D*FW+G$HSX7>!%Ja%5v`LQLc(ggq2Cvs%
zoQ~v;qo7?jjOW!}k8E{cZ*@?+xVu;&-+sKJ^~MZzxy&+%cBu_W<*CW=eZ>?JA6tXx
zX=m&jLzErxra8El*F)d41nq(Y<9VG&Wj9`)2JVx*VT8eFmmHa(v?hQ2xCdS~QPiEC
zh^|}H45D3P4N`f0g1WEq!esE6v3(?=&9$_3uk#+YNAkL1pdIjr8RAyjfY)o!7=C{E
z2bNq%bei}j6Gh$0ap<}>$spQAmLQc!#(?)kd|-i`og+XyW9x9D?10xzc~on8)Y*gf
z<Mryh0i**KN~>z(nq#9C9T%kom&Y4KyU+rp^3W*wzG#e`9m5c})DpBaHV-Arj(Fdk
zsI@%m?m@d?&v5Ws@+#}6KD++J7^PJ;ap(CleM0+@IY@>52>D<m@EGu_323Kpv?jE<
zR;|h2YV&xl+9Pg>1!#x7WeR@h^@ii4daXk>ao#p7Mazld=sY{ZAleU2K`Lyes27aD
zW72YS&`w`(NqU?Qc*Pj4Cx`RMYs${vY=wgD*5KNPBf}8#rZLwWe0K3}Yw9FAP5j5_
z6}1l5=sY#lAZaVjKx*t|Gk;(L9xL`)fp)=G3lQ2QX{i}_jrZ|<$Q#DsbK(}7qV<>!
zc%6IkdiKT#_woD_pB?_TvC_&O5CJcUzxw`Rh&=I-+Wj)E$E*e|;cpp%I;q*?*Ww={
zYlTSS|9GnRn1Zw)k|{hgc&XcG2I?%|F0;E(q_c@%ui7>Q9S2RHDJrFAk2l0>A^#Ei
z>%`f*oze*h<7WbDjb0>Ngb>pOKR$1Zk(sN+m8z}Jp=r+$wC#T$9d?5YYN9r3l;YjL
zJ6(KDN*~?hmkHmu#T)lmitxhqqJcAZFhNbJ%f+2jzZJ{*laKmk!oY7sb0zb+c#uFX
r)HF^1w;}b>|8;JVK~3hmzs~&&p)hyGej8&e00000NkvXXu0mjfburU^

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-redirect.png b/core/administrator/templates/hathor/images/header/icon-48-redirect.png
new file mode 100644
index 0000000000000000000000000000000000000000..580a555aee93cae6214f629129ce6621ed94b60f
GIT binary patch
literal 1158
zcmV;11bO?3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000C{Nkl<ZcmeI2
zLzpH>7=*{R+BVm=&GTB9HO97W+cw+g*fvgcTz?z+?0k#L{4=wjsc{{mRTY`>mMi|Q
zK}5H-ZjKP&%?*a`3!ulLFBE#50eF!1&}0{y0EKx3&>Sjj*<&?1)uz`viXE0KNzCsA
zD7bHOHCafQe}~>@ua^)>BMa!=HRrXudt!we;Hf$LwZ>=XALQ^KvF}<yJTYr8y|Mgs
zKxK?8Qv*CUbC1>-IcS?OetM11hskMUis|LW#{w!9%as5RP1~V0-aVm07?(n|uTl63
z;r%z$bMp>rl{h?4<QOHN1CuI^=I{Yqt_cLj8ynJhBRw%=w^7l59|;4U0J)iCORNS6
z#Y7C@RrsLZ>*&GBRrHXBA_i<$0<25It}&TeLA}>|0wKb;>9L0H#>TtHPS}7O)BtgV
zx5);L+V)&?RS@uvYSnEerDDUS8I&|MhvEipCGm4m&$ViR$bOqBVQ?0;?!HQVXR}tV
zx~-BSEW<bNyqw~3P9+T7s#UultHm6bpzSTYuAnxUQwb2-YaL(be}E3R#@4|AMz!d&
z+!li8daYsmMHG(XKB~`pty*<i&fzooKGD3>QZ>MT@38nDCLmgLUS^tv0Zu}}F7`n0
zMt}(Fx{^Y$MOA9naS4Y{b>8fh0FFB>LmX(@VM)MAu#Ce;vd;}fgC7@AON`OF<I?}B
z@lT7S@D7M~8~~0L9T1IvS}09|zZt^YLDc(x9yJ9>vny)w!+bIBc_`JB$7zPBkAZm-
z{A?fI0;0}$bEx6Bv#H*<bF9L%+&;4(sEY|855mh3wZ55c4sQl9LwFtD@lKL-E#Jr(
zBGP}Q^Z|STAHWCj0ek@YCfVd#1Mq`g%r)vq_d-3c834cJKxY`j%kU|qizpWFzHT7g
zhCe1+vGj4J#1I~YZ!5x!PE@piFD^Vv(Sx(BAzXz|9#zOSBc+Zmwudl;j~|x%zXtG`
zc?T$R;8upvo-ej<WXBRl<V#f}wwe*b5Pnz8kZffG_yl@d)Ql1YmjY04C%|gOJ8`54
zA2&27VAY7NCqr0<$5z%hfDcWnCe)1#!QPjlUv#a+NB<3v9@1Df#thD4h+s>A2cgSx
z*!rdh@ZRxdBx*+i!Qr*l;uVPYB0N@fQ!_5&UdR&S5djf3V2iN<Ovkwwj5$QMSZq*j
zwU~xuy&VcJe7CI^4dKlYVSP4OwScLRsaljwhFZ}O-X0<t8^X{4vb5Er!7SB@7UAt7
z+MxI3w$I!I$^f}RJyu%{(6rN1xeN6Oq6Nn0*3ZxeN&p3|J1;ky8@FHVad;U*sv6a`
z;{*wyIl}3TP1`T>KD-Rkss8u#xB*m&t4A52F&5~IbusWY{FIXKu)m0kv5`ioAJqU2
z3`VhBbePxTb7H<p)%j{B)itQj*R#|BVu6j&VR{N7>O`m*s<hN)1~C4wgh65cE9F({
YFV9sJa|qO}yZ`_I07*qoM6N<$g77OMbN~PV

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-revert.png b/core/administrator/templates/hathor/images/header/icon-48-revert.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bf2944a04d0056c9cc15240e24c7dbf2bfd1199
GIT binary patch
literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000ETNkl<ZcmeHK
z1B@(95T5m(@1AYjwr$(CZQHhO+qP}nZ#CV2UAA9kuhWx%PRVYvmHX1Zsjt4Obg$$!
zuX!!XOa}-6Bmg7?1OfDt2bcz60>oc6Bv+qLyDI+rzPBPhF{9u_MkrcM8wKb6Diw^M
z>CT!mn=2QJKi*)__(@=~gG>dWF}f=O4RbEmynZ<wEF6$?Z=yIp`CT`B{BC^!jU3$s
z^bsWOTeWDy)cu>MACw_kKn;md3E*6%PTYI(>ooK%?xuhN5Odz3+zsXp%(Xv5^1vG4
ztkBv_x_$&2o4Y8W1(*SGF03v)DSfhlnlwz*sT0hezx#6m8b>5*fU@%hKqEl__XLgY
zmaSx?3dzO=`x}yj^Da(P{37d0zbvw4N{5V9{mr_+l!g*zi-fWi``5=Y{860OYc*v1
z<<D1lUj6bCR(}BON<=g&q8|IiiZa8qrwwlUFV~$;g#{(xB{$EAs@Ml}g1t}P|2;5r
z$E&{EuYS4D>WQkY0X-miY>(`fULLM-G<&*`rmQ$oU<8_AjC=8b(s|*0^4R7wQ|cz&
zQZ-vhT2_Cmir5H<yMIxs;hh?!T^}4^NRH`(QZq<6Cm@G=a9&K1istb<!M?iWgDWK*
zhnJ!X0zNN~*4$AbTdYo)vjlyWgi0V81a9FS=gD#E3Fni?GL?m%uUZ0*3pYQlwA;yV
z{1_K;4g&ePJ}QNi$^noRQ&XpwfTd=a<4YR$IaU1S+uvs;f*(gETtO*MM$}iXA1Y2U
zo?N&tG8yo5@5wheGF01D>+tz^qpddi53dH2;v<i~E2*MP4$q5<UOfRkVg<af*8Sw9
zQ44QZ`|#OvGYkPDh`6#6sFaHO;npK}6U%__)7CsV38-*jX5l_L(ge3O>a@PD4k6go
z>Dym6RvdV76uX4}&-{)J&N?PbV&5vzSFE4NyoD&cMBbI@d~)c>C3ma8|NQqReuQu-
z1xS^^H$AL;06bHJn=gLt4Ra$);uMSQW6lBiHhul06RGPSsBq@y=UKwkfxoyxrcAKc
zSLOeg4LXfOoL)GLJON&f^1aRsoxSBr-ETi_Pf=weA(8oAGL}&Hm{WPTs3)LajR6bq
z?n+wkQ1Pn|zc1$tJY7Qng6yZJ>ex_mAxGO!N&@%;cwMZ=nVxgDKVxb*Qz67p9~ag%
zs)ZF_gh(n9&uLX^d>yd#{w~0UOEU_LGio(~r|*27qxu&aI;wojM;`%Bja*&Mv|-9x
z)czu)O3}xDv=czHGlbuS3aBY!H!zXIuF>}l0$lp=(RXhGoC?(QQV4+s&A|f*;0u?7
z<OvE$T<Rbhw&eB%z*#Cv86@QiMNFtTjflq-G39{I3s0#5F7FA!ev~{V+O%mC08J?T
z0e%d=3}yxszz8rf=-4+jELfC*0Azr}X0y>x@`LOW{e?<U0Iy1h3>o4UDpcq*%>E2R
z031`xp*wSkH_G?9xDnPm1nL{LTCL8YH5nxGlR3|n;94M19rl+1jE(4HZYqmD0Hg2Y
z5`Ci+7<sJ=C_saRTmS^*>%Zf@ZGO)GXs8;55G%kY%d*vOw_8F1d%nkv`S&gC{~~dw
mK?OY2w30`gmw=amm%x7?XY^%jky2&=0000<MNUMnLSTabUR8$x

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-search.png b/core/administrator/templates/hathor/images/header/icon-48-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..79004021d0396c335ad653c6fdfb9701cec08ccb
GIT binary patch
literal 2213
zcmV;W2wL}vP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000PVNkl<ZcmdRx
z1CTRa7KWeh4murYJZsywZQCp?e%mPg=Gt~)jpEw&?&veZNhh5&_RP&0t&x0N->G`)
zTvokr^B#-iJZz5hNb&E7Be+6N$m(8;?TCax=m~ux6cQ#J*1sv-6KbcOcG|0Jwc3Nq
z<?=mU*PUTUgkk8nTCJZq8jbIN@rz&l;E#X&<0W8S7z)Y%!+@n%eCp(rPk!TVZ+qL<
zZ-}0spJ#S<mP)09<2Xc7WT-b99654?M!inI-}et5Jou&0e)hAM{^&<P`UB7v;$vyR
z7V=Mj`qLly)Tci69U}Zzce~r&xb>}XO%MdEuCCG;K$0X|WRoEU&n52_ICS_BYpW{^
z27~T*zVn?E-~H})e;Q~B(ZmhtSmD*Le)SU{_qfNszgn$&_qoq~jPT#C9bnz9;?3QZ
zlx1P-ZqZL91nmZc150>=4uwLI1N-;U>9qOfFMoN-<(FT670?u-Nq>dh=RD^*4}9{I
zpZxxt-~8s@{qA=^{<yk_pR~Zb<=vTHycw0WO(kRf4YgX8+8ysre4G2QztzRd7buo0
z-1V+^J?qVHe)Fq<f?!S3KuVZ?!3$pSj;X0BPo8^z^4mYsn!X+7=~+r?i&93ATvW8J
zbGFHqVu9*CA4bQ?5k)bnbe6l{{q7e$<tb0OACR4-f&4YsTyu(iX>N79+ufe!y$1+y
zc2^2+hGNR1pyboSMs_T`jVx%UkT#h0(|3IUalTBFh>29nd-S6peIZa5>`54Kgxa0&
zeCOB9&dnj8LmK&cylh$pj>w5<*FmsG*e08C&jHE07PGImVM3o8xvLL)@rz&la3C`Y
z139_+ugc|eUN-A;q#u$lRY!uAtb-ug-T*R=Vr$kl+or(FW+>d^4xn+5d)(u-Kz<Si
zyj$Gj7LRk?9P6D9VQJ2YG>k+F7HJzpO4=z)`Wx6fZkaU##$-l~m(+mXg@@|PY>(SO
zR(?=-kCO!Xev=eyD%c1W!AKtASeAgn*6eJpQFCfkAe+gMsm=nJcj09(d)a*eXYB8Q
z>$+YL42W{YEkTOui!MPkAWg;e1#8=oF}rO(Tblz7c}%B()YuPmwr$h(eafYp5n`!B
z%{n#$ZEI*>v2?8>rgyECW5~_M{|IULeh=HRQ6VbqzX>DSkVMh3s|VyDh6TjQh(w5y
zjF4z%cj%mEg~aR+!y&<Xd)J<3v$+Pu<2De<%j@6nHn$`*^of#0zz~}(f<O;%YHX)y
zHLd8r#GF*EREnT}5Hxzd-ccYNw}C*8!#|g=1OVxv!!S++Ob!zWV?oUrf$TK6JswI9
z%|25nNZ(@EJiJvmeCR_T`VkO~+kh{}<gcSwIn(bDL@<aGfh{9yLPd&TLE8elPWMHT
znfL35OzmJ<7DtaB{T9%j#3R)I)Tci6+2L^L1LXQm2)eWy4gCIqev}Zz2qvp3leaN*
zLNp>A4CyB}{pDX90|HA+OP^E&jQt(>#y7sP{Kr53@sns2+j|L98P+>({6R=BOvDI+
z5vZoN+dZB0B@aVcFXG#O{xvqS5#Q~0fARLWzx@k9FbM;R(2>K|`R#Ul3BZYllso$w
zq;vS)E`C3tD<*tJ1WOho9aG{clsSvm%I~0aWb5jG<Rc%s6c|jpBJ-qpf3g%cA4sRu
z9zf)z=@u7|zB$`Ck{#OyOHl77w7hKh0{qqA5w(vJ$MII(?EC)VZ++`q=iG3^4W9#=
zXu&^j1GZ2&>7<jMD22`Y)P#wiTOrDoa9mGMqn3Fw<HTZ^KtC7|*7uV%4-yXtJH_v6
zFE20urCn=)u_OqhYkiz;+qQkd*|u%1y`RC^R&=&)+qOBl*GX+sNoI~ex9sGldfl%y
zHLrL5>eZ`5j~qF2jbs?bbp#j*M4~ZXEu+n5b3Xn>)x#6D;YTBda6Ig{FK+6$&zgrO
z%Revb;rZ6BTZf~iZl@Q1$yEe62|pmy^5x3|@p{>wM?);({rDwPhadFr-MiaDLqp>N
z0|PA(21@Y5^F5lzA~<Rqe#JAY57kxDq5^yZ9-^>EPntBT=Fy`^LmxkWd_=TbIy5IE
z-r_EtKY!jid-m*x9XodH3N_;B?%lhCsfaZJ$Mk^gvaw>tils<E^KexJ_;P2`Vt}x9
z>eR{HtXZ?t*b6V-#UXBzr1**Kclx<>bLPy6D^#dZ56zljDTOvZWZ}Yv+eJ47WY-bU
z{y7gej>`m9XJpR-xpB9_V92LOKv-x`pP=LgLPMJWyBgB}lGg*E3$<+DzWpj)0&IW!
z^yx4x8-DIJkw|cP{fool*nygGio6#Cqp*7Wa^=cRnL2gqNRfV&x(QA|0p1N9I4}wm
z?_oNyKD0?B_yvaqys+79Ls77Iem4@+rcDzh%yiZSzoGfIXV0FiTefT&k6i!syOHS8
zqeo-9SaDBi0xIy?VzF$8>>j9fV68|rY0|`5y?XUR)X@@-0IP@h<HwJmf9%+?Fn&-y
zp#5gTa5+Lt(F3CdSu*fu*sx(Xr_<?HrAn14^fVW(RC83xl`B^Zm}xXOsR<bYPU5v7
zL6P`rDv2myJSi+X(qBcOfB*g_7y%<-AOsNn2)?8|dlNj_ZKemH5)>jJ$yg}t4_KQT
zG-%LV%lq+rT(}g4IS5F9lR~3(`mw69SJ_@6D{0i9kMJ;VJw4B2J$UfoL+jS9TNtn?
zm3Uf-7ow^#bN;pltbkE~dEcLT-$#IX-h)8}+!-Mb2_$5kS$g&A)x}w}W*uzUuwjb=
z1qxJ#R+~27`^S$Tw`||O-9nMmnS~O5xsy{3fU#GvUWN1J%a<3Pe-RlOxnDfZ6Egwr
n5guSQqquk)P5oz&R02N$$whWt;#3hS00000NkvXXu0mjfFL_HX

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-section.png b/core/administrator/templates/hathor/images/header/icon-48-section.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6e0195ddbdee223dc0c209c87dff6927c1b2980
GIT binary patch
literal 1549
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-send.png b/core/administrator/templates/hathor/images/header/icon-48-send.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca3994a4d916afe6ef32c4abce313d8a3606a87
GIT binary patch
literal 2723
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-static.png b/core/administrator/templates/hathor/images/header/icon-48-static.png
new file mode 100644
index 0000000000000000000000000000000000000000..363020bc5c043619a9ba6954e7a15479011bd684
GIT binary patch
literal 1736
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-stats.png b/core/administrator/templates/hathor/images/header/icon-48-stats.png
new file mode 100644
index 0000000000000000000000000000000000000000..64659fdeb67f260a3c023a841abc80c61f7f69e6
GIT binary patch
literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008QNkl<ZcmeI1
zgO5B$0EO!YwQXa2|4ALxwr$&1@blSR+qP}*mgjq&*|YDWJ<LnKX!Ty^TOYRb!otFG
zB;f?Y1%#^!9702#xPfpj;X>MJrrVl1ig5PHH@*1cId62?F8EYlx#$NQ>dA#)>xO9;
z+KG0nbzCE-oOt`&AD;7-30o1`jdomXz~!gBBPgHti4I#4+KqNxYXIl?_f*)*(2i>j
zXgKx_Ikqyi<C+5we_4zz%=!cF{X>jL_NnpYAwBN=g^#D3O*NirG2_`*3!ZPY;=Vs5
zc(KEdmpUDIxyy-Hx?Om+$Bjq!D)D-s7jN|Y@aBLYZw&_U_D~S-a6@>y$$<Cx;blD2
zq{e%L5`tg}ay;8?sNKh_y>9w=q?2y_0TQVcMzaMjw+BN*T=)Y)1cD)i!VyHGF~s5t
zNM$ml(ivp3Ipp&N6pJO4%M}=mM*Q{H-}vX>fAQb&Fh)j4F+M(y$;nChd_Js{fZq&^
z$bez)Vn#Ixg?tzp89}8|MVdUG+vDB^1H=+Bv^pIuRttXX5unErt<md<q1PEhpEHhb
zu7HdRkOv4N90?;DjgVn6$mL{MDv5L^g={v1Tt16JA&*k20F%i;ij<aNF)LBYNeJA<
z<Q1^ljL7A(h$mtQlE<@J&6_)cj|YwT)i=D14zapkCs2n0^;GDq9x3+OGs|e>3YkJo
zA*K*hh$+MrVhS;Z*Z}q%V9x=j5L1XLv?Ls{L^P++q258r9sU{$X8=l95NdY_{XAYh
z72>Ql;F6Bcw$xVrT}UVtq-e*r2AuTx;}5^2HyF0ufJh_^+KqNx@9(9v=oP!VI|34^
z7!IeShRfxuIq3CziDH@+6|&i^t11)-_*YaY6tu3YP$=X<DxHK>DoV|iKWnBV&6*=l
tBwS3mp3qQdI5XOuG}CPhg@uKM<$wG}hyQdD)?xqv002ovPDHLkV1jfkXRZJM

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-tags.png b/core/administrator/templates/hathor/images/header/icon-48-tags.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ba2124d1f24ee56346033949dfb859d3a7a0e82
GIT binary patch
literal 1622
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
Uk+R?{5dZ)H07*qoM6N<$f|;=oB>(^b

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-themes.png b/core/administrator/templates/hathor/images/header/icon-48-themes.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e31c86fe966b68e64bbca96e742154e34f2f5eb
GIT binary patch
literal 859
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_U=$DV32_B-&ru2N+qdu9wQKk8
z-FyE0`TO_pj~zR<ZQHhW>(+h${{8>||Ns8|n>TOXmoHy_{ra_R*|NWX|Ni{>^Z)mk
zj~_q&^XJd+-@g@_w`ukqFrIpnzj&E=)jE#c1vYapIrVRIU3UAyg9q+Yc0YOY#CPrE
zckkZ$%{=(|^XK5rFTZ{J7P8>@j~_pxm!D5wcWvgCuUT8}7Vdsre&E&r&36B{JOAI~
z@qbU~|NW8w5BmN;68HaT;Qtdz|IeiUztH*ra{2$O)BoRS|Nrep<*|?df4utt<Msca
zAOHV)Uw!o5rDwOF0E0%NB*-tAfsJ2U&cG}ozoMnRciPPPhmT#l{p8iRKVi+UE&zk^
zwx^3@NJZS*sZaav8VI;;zH3y>?mK<j#xrNmeEE0&;!TZBHQS|6UVS_9*gXA{oua?p
zXDz!~{zN9E@ZXD?&4)Qxr0?f!e{icg<Y<Lt-^>Cwx0RDZcO)E&+%a9Qezl@%gWr$Z
z?QKpKWt)LS)m9);v=c~d33OJpiCMo;;NAMG0UX=6XKA#&o^2{}XzE)ju7!OwTaKpm
z91mM;a_-RDqk;1o92#EORItD3ys&UFi(LcvImLr{j#C$PZFA`~>&ocK4N|=rx&L5C
z*xMypsgb#F)}6l3^wYta&7RYs<i%kXB^LQPQ{81BwS2!5*7<gcHTR$Q#R3XqOv^ZU
zJb2bHEMYlvZKHrzp{9VfnqrdbOF3ib8An3I0?pEHU7KNaciypW8@sBxUN|`{Yp`>9
zZ<z4mfz9s*XAU_*n@>{~9KC&6Z`bU?ZMmUKH716-L^_%Xc6PZ+^Ds?&DSCvlI`KV2
zV{C&)het-Ij9~+Fc>N{A_8<wKOQ#MwiG>wU|GiI?ZP~VczOm_>pK3llz5LAje*qlw
z_fqS=v^!P&SNpuzUgXg2=`)uCMc2otOsjI%+*390=Ph}whbDJC=i8^%eQSSbUn?;!
zJV>-zy5Lfa<qCE_lVg8Ac9$Mn8q7Ys{yG1`>rpdyrcA5{CItphS3j3^P6<r_yXM=>

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-trash.png b/core/administrator/templates/hathor/images/header/icon-48-trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a388bbe03ceda9467a724f00e41b09a9b0d14ae
GIT binary patch
literal 1971
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
FV1m@Ti*x`0

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-unarchive.png b/core/administrator/templates/hathor/images/header/icon-48-unarchive.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e3b0581e8c7e1ddb37e4f948283e09883ec2bc4
GIT binary patch
literal 3023
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
RAo&0Q002ovPDHLkV1kDu*GB*V

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-upload.png b/core/administrator/templates/hathor/images/header/icon-48-upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d76ece323eb4a70f6cc75298114a9c2639c04dc
GIT binary patch
literal 2177
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
D<t7-I

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-user-add.png b/core/administrator/templates/hathor/images/header/icon-48-user-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab2112e4b171402f0b21575d2581f808490f77e3
GIT binary patch
literal 1487
zcmV;=1u*)FP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G+Nkl<ZcwX(A
zU1%It6vuzFv$ILNrk&U#)t0!WAQnZZh>yh;ebp`~s6cH6-vrqJf<Pt4s#01=1W_s0
zRMetHaDy-6OOhw4(k2B|)Y`^2Eloet$;WQ?W9A+wT<EZjW+&CMBlN(ZY|gOo|J`%$
z<;+bC5#j$FDH0vG0FtjX(ZDbaRve{i8=;8EjzA7dKq(LbB@>7YqhyesIhPfNh}`4~
z3}149agaU)2T6fpLdpUo4Hyox^i0n1$!RA!Eu_uofDwco$^<fi31R?&QfcVOg0%|3
zM#%^tpUU057FxN65U~*xP@t+1wvPTOXpqh<EX>)63;~a}y8^m(MDi#DM1k@`!y+Ms
zQc$nKVg=F`h~zo=tJ8h}kzJu#FEkxOG|Tq_`JgMatNkq`I1$5fAap(v6>$F1uxidl
zMIr#~SgS5HLuuIw0En7J#c!wf14NCrZl^FmnFN5*>kz8-s)r&m0F!b1KPnOda1s@-
zb)q>LO9H^*(D+I#L8<)!&-J*7lv<ud(Oik*18y>=QQ=*L74*OUPIAWSow?ELr;&<6
z5Y3I!``~DD005Nq#_WF==uO@`@e5lf5E*O@!Qo)_ClUq_4t6bCC!9bN12A;T=Fsm2
zKKgA0k$lTdtR&C=6C><9o^RhP<)@Q*l-i-+#Po_Hp-?R#G-#f8esEEK3Gv4euf%J4
z_vQf{Ia@$qmlRN9UpH;0Aswhvi5hO*PBx-;BYq$?#OvQpAl_)8G2VEx^xpt{F;zfh
zAW#kgFtlOQf^?vI4Ju_&3e-wxA|FJd<paKhEJ+pF^OcKu{k-+;;Ee-(Ikg*+p+NdZ
z!LlG_YP0n!l;^=$5u@=SlomdSPtLkX-<?M&tUHEnEr5xQVxaO(cHe5LAEA`#r%<0H
z8W<uHO&&e(AdDlT?{hG~t3xA@=QUrO=#_8EH9u2Lx$yR4Nj?J`KBRcpFqnWxIC2;Q
zDRkZ!s4>V>jo!GYP#+?Y?$l-$=b^T!%`daMaa%`AF`j#g;)Y?U0<+-F3A0yW<_av%
zf-C@Y=;szij#}gK07MEHhHjbqA}EQwF<YEO+Bhf%)_s7p`ZUY~HC>d;*MxKRhnT+O
zWzNj?P%Z-vfvN@}g~MmoKpX%N1C$TG-?FFU=auex^8&^0VJHKhR--ChzG`v*?r+)p
z#D2OTKZH9c;1jA07!)~d<yrv14bAx~nn#7kwG@3_pF>?6R}H8w3bXTp$_8|-0ifQ1
znK_|S(c4cN8k7d0=xbd81c-O0w+2>PXplnYd#Gt+(^nNgpELROe1^qZcqpdL6c^@i
z<Cn`_oVsYTpsNKnz>~uA$EXr81nRYTl~BuUVpOC8wqFJX<wfDo+7=$(a}2X{4Pn5>
zt=rjnzy+XIcA470p04$V_K?C}7C@WwBF5sbdI%LY4?Z+BsNVo{O-`F%COWb<)vDgm
z02r-DiEaAgRtkY~|E_iXD2O(~DkIR96P*2V80oMv%@mvN+YUfw-evmqNrDt+-DPbW
z@ZydV&u^Xp0?`{xn$8jk$Rp^H*>3sntIdbPZvt@}S!|<BC$QPNhWqu?%v4~il3~-q
zG62(moMiI-$LLwBhk))?ApnRQf0%pm9u1=d-uuZxSH%IjTYn~}bD?<%SDfbG-Lb~K
z)g9*X4TcC=6S7%@?hMo<G+?Hnrwg{MB@AECL1|fl7JvNKKv3dFWA8ILJUK%cWR_s0
zL3QRVowxU3)?6$D@CifEVbI?+3$-QsG6O&n01*UOsKceQQ1xJKhr#;QLT4Hsq0d3~
z`n~N30N9fm2OR#^g8&ip6TIzji)`Yy>CO5!UbS>3A`xL3WM8=QNvJ@mSF9XDA5Z}7
p&^7wz&!C?J{v<%s0B-%S#9#PX^wueQPF?^2002ovPDHLkV1gOHvkU+L

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-user-edit.png b/core/administrator/templates/hathor/images/header/icon-48-user-edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab2112e4b171402f0b21575d2581f808490f77e3
GIT binary patch
literal 1487
zcmV;=1u*)FP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000G+Nkl<ZcwX(A
zU1%It6vuzFv$ILNrk&U#)t0!WAQnZZh>yh;ebp`~s6cH6-vrqJf<Pt4s#01=1W_s0
zRMetHaDy-6OOhw4(k2B|)Y`^2Eloet$;WQ?W9A+wT<EZjW+&CMBlN(ZY|gOo|J`%$
z<;+bC5#j$FDH0vG0FtjX(ZDbaRve{i8=;8EjzA7dKq(LbB@>7YqhyesIhPfNh}`4~
z3}149agaU)2T6fpLdpUo4Hyox^i0n1$!RA!Eu_uofDwco$^<fi31R?&QfcVOg0%|3
zM#%^tpUU057FxN65U~*xP@t+1wvPTOXpqh<EX>)63;~a}y8^m(MDi#DM1k@`!y+Ms
zQc$nKVg=F`h~zo=tJ8h}kzJu#FEkxOG|Tq_`JgMatNkq`I1$5fAap(v6>$F1uxidl
zMIr#~SgS5HLuuIw0En7J#c!wf14NCrZl^FmnFN5*>kz8-s)r&m0F!b1KPnOda1s@-
zb)q>LO9H^*(D+I#L8<)!&-J*7lv<ud(Oik*18y>=QQ=*L74*OUPIAWSow?ELr;&<6
z5Y3I!``~DD005Nq#_WF==uO@`@e5lf5E*O@!Qo)_ClUq_4t6bCC!9bN12A;T=Fsm2
zKKgA0k$lTdtR&C=6C><9o^RhP<)@Q*l-i-+#Po_Hp-?R#G-#f8esEEK3Gv4euf%J4
z_vQf{Ia@$qmlRN9UpH;0Aswhvi5hO*PBx-;BYq$?#OvQpAl_)8G2VEx^xpt{F;zfh
zAW#kgFtlOQf^?vI4Ju_&3e-wxA|FJd<paKhEJ+pF^OcKu{k-+;;Ee-(Ikg*+p+NdZ
z!LlG_YP0n!l;^=$5u@=SlomdSPtLkX-<?M&tUHEnEr5xQVxaO(cHe5LAEA`#r%<0H
z8W<uHO&&e(AdDlT?{hG~t3xA@=QUrO=#_8EH9u2Lx$yR4Nj?J`KBRcpFqnWxIC2;Q
zDRkZ!s4>V>jo!GYP#+?Y?$l-$=b^T!%`daMaa%`AF`j#g;)Y?U0<+-F3A0yW<_av%
zf-C@Y=;szij#}gK07MEHhHjbqA}EQwF<YEO+Bhf%)_s7p`ZUY~HC>d;*MxKRhnT+O
zWzNj?P%Z-vfvN@}g~MmoKpX%N1C$TG-?FFU=auex^8&^0VJHKhR--ChzG`v*?r+)p
z#D2OTKZH9c;1jA07!)~d<yrv14bAx~nn#7kwG@3_pF>?6R}H8w3bXTp$_8|-0ifQ1
znK_|S(c4cN8k7d0=xbd81c-O0w+2>PXplnYd#Gt+(^nNgpELROe1^qZcqpdL6c^@i
z<Cn`_oVsYTpsNKnz>~uA$EXr81nRYTl~BuUVpOC8wqFJX<wfDo+7=$(a}2X{4Pn5>
zt=rjnzy+XIcA470p04$V_K?C}7C@WwBF5sbdI%LY4?Z+BsNVo{O-`F%COWb<)vDgm
z02r-DiEaAgRtkY~|E_iXD2O(~DkIR96P*2V80oMv%@mvN+YUfw-evmqNrDt+-DPbW
z@ZydV&u^Xp0?`{xn$8jk$Rp^H*>3sntIdbPZvt@}S!|<BC$QPNhWqu?%v4~il3~-q
zG62(moMiI-$LLwBhk))?ApnRQf0%pm9u1=d-uuZxSH%IjTYn~}bD?<%SDfbG-Lb~K
z)g9*X4TcC=6S7%@?hMo<G+?Hnrwg{MB@AECL1|fl7JvNKKv3dFWA8ILJUK%cWR_s0
zL3QRVowxU3)?6$D@CifEVbI?+3$-QsG6O&n01*UOsKceQQ1xJKhr#;QLT4Hsq0d3~
z`n~N30N9fm2OR#^g8&ip6TIzji)`Yy>CO5!UbS>3A`xL3WM8=QNvJ@mSF9XDA5Z}7
p&^7wz&!C?J{v<%s0B-%S#9#PX^wueQPF?^2002ovPDHLkV1gOHvkU+L

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-user-profile.png b/core/administrator/templates/hathor/images/header/icon-48-user-profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d8641d021c76657bbeca9a2e56d9d718e680703
GIT binary patch
literal 2209
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-user.png b/core/administrator/templates/hathor/images/header/icon-48-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc6e43a62c6f5e4cfb934fdcfb9cf203ca9dee94
GIT binary patch
literal 2270
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-48-writemess.png b/core/administrator/templates/hathor/images/header/icon-48-writemess.png
new file mode 100644
index 0000000000000000000000000000000000000000..827d99a0697d3a0d4e4d89a7993c5d2cefe610ad
GIT binary patch
literal 2085
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
P00000NkvXXu0mjfRY2={

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/header/icon-messaging.png b/core/administrator/templates/hathor/images/header/icon-messaging.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a377b202a17b0a05769f1df2245c16254ea9ce
GIT binary patch
literal 3024
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
SGOld^0000<MNUMnLSTZ3birT%

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/j_arrow.png b/core/administrator/templates/hathor/images/j_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..772bb4d908aa0b9f1d1cb3c1766604df9172c1cd
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4Re8ENhEy;nGcc~5dp@0MqaL&3
zf{icli7C`^A2F*CUA1n<7S@jc%pc7az8zi}ka_N*uEQVsuKx^$Mq#Z*f1|fCe5^N-
z>021ED)Xe6!oU8O<&1{XZB8FIt&DE?VK4BX<x$F<Jdu+x?=T(lZ@9s;etm0@w01*8
dQ==3E!>qR+&9;^Hn}M!i@O1TaS?83{1OO+}Lva8A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/j_arrow_down.png b/core/administrator/templates/hathor/images/j_arrow_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e7334113d8db416f854013e6d2321b58e5f2f6a
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4#d*3ohEy;nOE@gp`ni%-Apc-<
zI+LMv^RHR2g&h8{bo@^~nBN#7p111J8Rj&HKf)dVl^^Ci<TO8Ic{%OrNryl3UH=(2
z%KLrq67!wGcI1Dfh2;9<EkV*Z8!YB5y1>Zbs^)KH<FGscXcL2{tDnm{r-UW|W}!CC

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/j_arrow_left.png b/core/administrator/templates/hathor/images/j_arrow_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..bee0eb1c0c31ff7018bcd02106ba801ad351318b
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih<F90*h+%@f*JmUpm~IJEl{M&)5S5Q
zf-(6=KkuHJzklvsp6$RU_ELSloX;NVO>Yt{#WEKx+xJ@Wv;OqtiTgghNO<3Bus}v)
zp_lyr&1?Uc*u><Wn`tESGQ0nr**m@#@AEcMT+`hmVzz5aDB0%9M@U`1`89iS<E6>l
sraLS(w7t8{idn6fc~8Yp84o6g8avh}GNQ~9Kvyt$y85}Sb4q9e0IDWPZ2$lO

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/j_arrow_right.png b/core/administrator/templates/hathor/images/j_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed65eeda45ce10e93b321d8000806aae5889d3e6
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4HF>%?hDcmaPGD%N_Rs%U|MS<+
zdN!won}<LB7k=ONr~cEcgY`{Z&*Sy}-!Hd)Vt=A!4wqwB!jA7wH~w??^CgAbJomX-
zpK|o?^2h(>_iyG6{&;5bQVlNYa`u1wzrD~|b|~|=0M~0X*2iVfm%LR?aQ&LS_~UPx
nB^z=}*&c4F`8cT{ftlg;qq0;-g$yI0YZyFT{an^LB{Ts5l5kRE

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/j_login_lock.png b/core/administrator/templates/hathor/images/j_login_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..b14c49b76baa010c1b7b626b81bf4b36f6eb3d65
GIT binary patch
literal 3508
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/j_logo.png b/core/administrator/templates/hathor/images/j_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b1f5dfecfbda609184a685ab17381ea7b960ca5
GIT binary patch
literal 2278
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
A;{X5v

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/logo.png b/core/administrator/templates/hathor/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..00d0220049204bd60691e5ade31691145c1a2f58
GIT binary patch
literal 3126
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
QY5)KL07*qoM6N<$f>zq?O#lD@

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-alert.png b/core/administrator/templates/hathor/images/menu/icon-16-alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1e0ed45691a84a3b6ef51246928f2df6780e63a
GIT binary patch
literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00061Nkl<Zcmbu8
z1I%1O6ord8DV}$0EBO6T+qMxWb!?Pz88)tM+qP}n?$>*ZNzI#lIeYeu=S@D~zxc|~
zs*Fp!ieqVC`IZ13tDwkl<uq+845dZsf<GMKO|uf!XjS?+t;_MeMQN@zD8|{kX;q##
zD}`ieCX+0F-L!b&uLgM0q_`u09(~=c1h1MF=X~81m)9-j;?B*es(;y}IGVi{q}_Ds
zliv*Rq)~eG(?)4TQFbRDUzT{2DbE@g<8i}OD>J}@2B~ZJ>IZygN91tt@&y1@^(Om*
zrDlMeb$xDq!JgRR#Hz(;sjB}nzxk1yW`HZTUA|<0Y_omBD71EnivJ=vJU0WJuVHiU
z3l7B=8wYhmYfZoA92Wm&u3V_;JT(KHOsqF25{u954U00bdI{$AY|4Dmed52&73p)@
z3~(rMcI}I8_Qj6E%4~~+bElwnNOV<>WwO1I&B4S`CYS-XMotI4s?CwhrqE$_rp4XM
z7tuPqV-xeTY|Ypx*;diriThZzf*C+r8+jAACO&IIkJ;HS3kURM{rJ($?c0jEIUXxQ
zpLLPPhc=Pl_q$JdX`WYbNf?Y?7yGYQN#g~%KGS8OInsH#`1P^R+BmqqD9`Wx^T#Ai
z&ke#kdBLPbVQ_3&6x>`I`ZpIvsok^lQo|)H{p;8G54;D-@_NMlA4TN=0000<MNUMn
GLSTXe^B67w

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-apply.png b/core/administrator/templates/hathor/images/menu/icon-16-apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..415fe20597eb65edf367eb6023e4d733472b1fe8
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004JNkl<ZcmdVX
z1CA_F6o>I%LIrKxcCY3xVdAlE+k9^oFV3@VYtZgO@SmINj2+IL<b?P4Rn;xY%^Pms
zMfmkNgxe|btHFgUVRptrae~4q-7th(DO?^;S_!`#1Gf|gJ8cCwYX`UJNnZ+=#>|9U
z2!opsfSoXdow9(P5hFzMvO!_^(Qj?s9I{kw^=X(Bc+^C=*$@Rjltv9;$4y`-#Rw4(
zyzX|Se~yQ+H5<jwnB&P#pO!g-r-Ssc7o}kxN+Wud#>5Db?9Iy#8=lmw@UcUO?U@MD
zG?MPuGKFCiVW;RTPkKa5cP~=LdvmW!_Jl5;)XMRtQ-__YFfyagFNHBbila^x%W!Y^
z@R0zs7kOT<z_(64GUE|s2Cc{sYEc{#VfqL@D{`MkUNtK4y+e)7UJWt>S{l)%X(Vt|
zoD+FaEyLSpC4P3QLH|lRJD@#^FA=%(s78(tEz0!oE;Ys1eRcu+cJ)F*w#X^~0000<
KMNUMnLSTYC)3*cw

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-archive.png b/core/administrator/templates/hathor/images/menu/icon-16-archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a948a56443fbc04b2f1b200a57d0ce5077af5a7
GIT binary patch
literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005hNkl<Zcmaiy
z1FRfD7{~vMXEUf`)nOUizSvIMm~|Wb`9;qc*0yciXPb-Zx09ReX0G@pzrpUOg932c
z$sw|bRPldGWQ@#^=q5KtA`u^}VcU#z@4-WM<oF2|4o8^G<mBWI0G;r9y}K`8zI@ZB
zESV**m)*K`i(R{RjmccOa^;9Kwd(PB4sF@8WxHV*kSQA`-hcUq<ttV~#xzY0fTpI?
znX;lN&@>G)KfixRM{5iGzMpVI13;jD{`~1#mAb2{3Yl0miby0ZlIptA$H&LVM#siB
zJ5xw)Ff=>_UDF%8yHJ;wmL9);_4>8kh4Beu7#JMncUgf>rb40M(`waN)6}F(T^Mv-
z=Xd&*e!n9HDw#ih`t&)&G#a`L4h<s^@H@#|%d%jTCMlZeWMy%2@zd1Qbi;_HViD-;
zLt9%LPv-BOVy+mSWTd5ODi4D5vNr0${rl>{reTOPj}z#wFI{vIpIPie-m15+7tv^x
z-`xdjK~_DOk(NlN!cEQ1=<4o5GLeMur>|iGiZNkStFT3)GYx>2mKI(tm(9WF^YK62
z;NSpa@wf%R691l6pFVxQNiS9c;0dax@!(Ra1TgTkLTZ|$hPk=9oy6=f@aU`#@zd`l
P00000NkvXXu0mjfvfcqf

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-article.png b/core/administrator/templates/hathor/images/menu/icon-16-article.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3a39d4af904fc97cc67b014f425ee830f9a0c98
GIT binary patch
literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005ZNkl<Zcmb7@
zMUop)5Ja=3CNWD}@633DS)1Vkb2R$|-fN{JXz4LCgP?^?&Z-!Fkuf7GK2^P6`J>y$
zvC=es$l*3eYy|*I!m_r48gQ)HOgbTjj00>W{)4KZ>?BEEESF2fag0Ktfd7@fT!vt$
za9tOoZ{NP5(P-eqhYvbZa`t-w4c=cY7Kff!f~ec=>Np;cP13!4_Y_9E`vB4(%x1I0
zmG5)s&Ot0m@JvBRM@R5H527nqu51IcnN08N*Kd6SF0CvCELt1`RuTX^#ryZ~aqZf*
z4GWZX!MC{NIJOqKOs=!#O#nMG7Dl5HN~Mwka8c|9lL-VMiPDAKCUcP#7K=q$8$dpv
zUjx{FpEd@0KUZZkL5}gisZOV(usDu23_uh{Q9ntOgEME&=<Pue;MA#8QlK{%cw@Cz
zLz<*u9^z;R;JFU?QK4F`YEi4z(lO;;A|oRVL(SpCBTRQY2qRJ>N!~7$Q6pu<D3{By
z2w2P)+W<+T4O5t`3gbizQ$V|$&*ymi_AQ3P;Wj{giC0r755>{<eLgbuyLk5WshsIQ
z)1<{MfMeT(AA<ohR>r)v=X?0^W1!weS=)h4T1-1x=7ahP2W~#J@={EY00000NkvXX
Hu0mjfM6%<v

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-assoc.png b/core/administrator/templates/hathor/images/menu/icon-16-assoc.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f8c5a35b7e0e6d37d6d2558f5f4eb96114d1c7
GIT binary patch
literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#P)S5VRCwBqlUr<5MI6SzIp^%zOG|eb
zwlpnWdtoiNXpx7q(Fbd)++O+sAtby&B#I`)kXRl_AV!`DPpAPc@IY#ac!}B&6Y3>m
zV@kP}EhwRMyJEXNWly`ev*&)!FuU8D=#!JoWM-22%{SjSe?lq6|7kAk9AzWn{<Tm3
z3mD5-p}{GAk3+FTvB}Eq@<p_|lBRouzwqf>pOd-CsS1P;w7oe1Vd-EQ)1N4Ay*8tN
z@=B90mN#8^L||2P4FXaD**}N7dB6X#OVH;&x^aP&RT&EY(R1c*u4gD!{LZzlm}XiK
z;oz<HHCVUlb@*3pfWh`G!wJ*yy7RPS^FFS8HB(XnT%S>ccO~WA_7<P-wPqhI+s4Ga
zinEC#%-IA|zh8#UByt`v+ShlXwk7_N8E$NaYgYjS<C#5MTWi`5bS}rX_F6nu46F`%
za3`I|;8&laAWPr`FMKs22+JA}?b^A_3di229A5?GOU90ePnF73T7n`@yxN3#lb=b}
zk<KYlibVt?jcACrgAX;sEy?f;o;S+IRXuR5#^Iz4S+y$5<bsA{KR#xMOR(A7HMIo6
zR|`2K;odhV;a|ZZV!hznW;F%sTDYIi;=`XN&=n2g)9X(#mDNz=6QOG=1VO;+E$>3C
zi(uiw&yZ7pFrO?^POhRrGt4y4Am1jYac(4u5Q}eHY&m#lQnpY4Wo|2Tk3lJi$V<I|
zw+^|Pho-=Ct^j!I{GezWm|i5NWz+|FT-e=-)4dz8wyh1b(i|>*uouJq?^XW{18US6
zB1<tIe7XIyz>!JKFhFe!<J0rVswTEPAHkZ&6;M<ix@jZ7kYNU9aO=vMT*RL1CrdH*
zbTs6<>zxAy!&b|Ga_mV4BPkgdZ>Df*=o)xd2@WfR`Psj5_2Yxk<cUKeGxrxIi!mPQ
z>myf>@Bh^u`EsYODv#>Jb&yIn-v53Kis7(04LFP-%jsM)dH-<1;lG$fgr^|YVtTQ&
zlN(PYyyZYiB-$*#(7h|r+|iRYXwy6H*WyO6<hX&*ZPDi$q?Y*r)X_PfNWDj|s1-mw
z9w(!tqdWr$i<N6G&V{a6ZQ!|;elg(X49j$QkHB#OFVPKES5FQ6W<L{P0Djt$PY*jE
QfdBvi07*qoM6N<$f<JJ)SpWb4

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-back-user.png b/core/administrator/templates/hathor/images/menu/icon-16-back-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..61ae0e0a064767a1e04896186ab20ea0a1b99a89
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00076Nkl<Zcmbu)
z1JE5w6b0bZJw1MYZ*4QSld@vlwrwZH*hV3?*S5X;+vcFBdu{K2rRKfo;{T%fg}c{^
z+Y=+xZ|IFK`f9W5-kp<kceXen^nX;~u2lgGs+>;MAEb2%BxSzC)uIn`x_63~^uS+W
z_<?YJCOrNKu}rYA4R`{s5wc55od@|dyKgUj<rSOR$;|lp)y^L#ASw%p#<F3WfU1HU
zHf{|=KK8}&f$wiz|IWKFzVS-H{n7H|7X1$kWG!I69x~1uH^<8ZMFj~*(Kwo=J^J?M
z2R?i6<5bSaZ^u7<`Pn(Vx}wD&j&R3P?`{cktDX#hQCaCVWVRvhiPrjeR6`*T-@^h4
zm`vR2Raf2qy8?GC=L2|^Go+@-ZO&b8v5*aqY9!waX~Ieo%_&7Kr?8@_BGt5uepkS$
zsNLyTIYuA=$ru!sLIwtTId~H9$J(MUzl35LLHwSFZm5?1>hB5^JBmRR3rr=Tl)!}s
z+Yq=}m&i9Cg6Y2ki^gH5ZYhHNrV>zw9}oa&w<UNsy;w9%D<(ET&^DTdVdisq5NWuX
z=fdzy5r9Fn!o`LadSBO#_jSWOst%g-0s(+cFUf~qPLmB9-%IW<D6XyB>&wmE>-q0!
zHC#cp)ZkMc1QG$~kP@J(hG;DIe0bFIHUz&RU%${;yng+)VwXTt21)=x{uEe3020u3
zy*4^(xyA5XxnF)I%)~z1Kzkv@ol@dgZwTNk3QbcLcJYV(?*)g}#wDeX5JDONxEoTM
s03ZpeCBT;u@*P6Sr?l^kGW=g(0}c`R1&YRK_y7O^07*qoM6N<$g1R^~U;qFB

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-banner-categories.png b/core/administrator/templates/hathor/images/menu/icon-16-banner-categories.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ce715f76e5d88738850033fc8b6efaeea2e99d4
GIT binary patch
literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00064Nkl<Zcmb7>
z18kiE5P)Y}!5GZ89nOqr+qP{4wed96`d@9^wjQeStL;n9zU$IaxNjbG|Fc6};TNxT
zZWssi@Ou;oA2}3OIeQvq4jK0&^ZYuOY~f@`p70<t@7?);j5(FQn^ut%z6x<N&twIs
zKDl!2wZMD#R33bf)S18LV^vI-9){Vn#|dT3cgSLykjC-AENn8>xMwM`ip{|yEQ3q>
zzMS~z!uQBL_CK`U-)Ow<2D#_Yg_Y3TG=;w6IEH_ZW{X=gPeU?!<etP0iwMpc_+b~G
z&22s3`_1<2uAjH&Txco1Ow#CMo<M(TGz;wGxfYbkGv8G1*u`+kEC_i-7W-d04QcU6
zTilA6WRXK}v!seCVi{u*!(OjcUIb_Iz&W00cG0-S<qNG|d9kf3aI1%sUX^Qz;u$21
zX1zR-2Ni2P@k+)np#Wn?7XjJwIV~2LVGt<1OZmf@U^S<M3V9c=LMKIqMP?E5>|#VA
z2^2^-f^<m*E^c1rzTqq3f^7`GhP%OZDlVqG5Q$Il#=!(PhbJgRt1IobxTaAuHain>
z+E0g3ezXwNDckA`X!WPlsM-H~eF5E(f#{8*Q>Z(l{tg&Tc!%)>I*JwXg^h1uHf<Z`
z)9ENy#LF5N5YHWgbRiu^$-?u^-uO?vDDban9v#8|vSoGqmjmLQBAr>#Y<mCz002ov
JPDHLkV1gHw42A#z

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-banner-client.png b/core/administrator/templates/hathor/images/menu/icon-16-banner-client.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e071732d6bd12eab3ebadbe292b7aaeaf20568c
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003UNkl<Zcmd6g
zGjuIc6hL49S$z&-8~sfgl~KRqE^Tbvw#{~`*maB_|JXXYCwOM}X03gX_lWfOyDs3q
zKa6<9!E8_*Myz!bY(=xeQMRFQS!o(~kjBq%$FRL>|8`qrDcrX^i#aN@f$Jv6dCW0l
zEj_=jH0zZXkh?}>xNkGjnwu&^5DTvIIdYoIz-_}HtvSnQB!bI4j!<Afje)~_IxPK*
zz-5yw+)t%o6!&nBd$=zaoMp3w0?1JY1KWvokuGhPxIueUHekdW`}?U3eC&z^M;R=k
zfIQ2o)-agt4cpl^plmJ{>?ARS0=gm=tVI1K6wnp1U@_u1p@6Q41(V^wzK@0c6nX-_
op0xRX2Fz7~bKIkOuShSx7bjzH_B@o{-2eap07*qoM6N<$g2>XBH~;_u

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png b/core/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7f121804d1afcea04539471155d51742d35de1
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005VNkl<Zcmb`F
z18|-}5QeW!ZEMs)ZQHhO+jeZ*wr$(CZFBtgzBu_6Ju~N9FX_*wO`GEA03G+qQ0Nq9
zMjaiC3FXWytNr%`J^AnPd-$DuX63hThwS@-D8QDj+f5`KQsT6u%OK&C2feJuy4ycp
z?+?s_&Y|NTgNNeY(2gv{3%S7cgdO883idyYtI<<0X!7f?;EtdXG<~ul>y#?j%gFgY
zIr@>&hJ67QnD3O0-RH0LQSd<048CcVxF_MWzEk*qulN0g;cap&#+w&nqIEVFX?XTg
z@J!Jfj&UV;p%FTR5ugJs3Qh+%=k4;X!34{EOtQ(unlEDApWYjJ!6CUEcZ3Z0&~qMJ
z1)~kC`QKA7#+eskf>kc2*=1mtpb~D0D&mW_B^)!V>eyHZ>0-1&?TqUYt+)`@0RD_7
zd`zst#ru!DKMDrtF-ha^ry!5?X0}DW-tFKTOw&o^pJ<i4f9buqzc+2)QMU8&G5OBq
z$@Ocpz9rpaU9sQZCm3=nYWF$xNAD7!C+x6wa*eaFwTojTe4dUUbUdSD72$-jh3$QB
zzW_XY_i;Zb>x3H-Q86=|+`a0QHMR9fC;j4=BO}d!67DHP9er(J00000NkvXXu0mjf
DU>yHY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-banner.png b/core/administrator/templates/hathor/images/menu/icon-16-banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b030c9cc023e0ba7dea504c751ee65092f6f42b
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006hNkl<ZcmchW
z1B_j35P)B8D=42DmRD=rwr$(CZQHhO8&_)^(e$KIv5Gpu&u=_`{W0Oy&VI`xlccZi
z-4G{fUQ+jw!q@)7uv^}6o`3ZWc-G({ZQ&SP%clJh1#d3|`;?8@7Y#0gq<uMrG!j8K
ztnFmWH?#0>akX>ycH`^z@q{gXkG^^NqKW0WZqf!AC3Jy9S}(*k;_FU?U*xR#>5uGz
zc-I;*G?2i1VjW87w;^F<5iHBbKtHtyiU$_JII3O#L<N5rY~-o*@4}4?0^H7-g104;
zpwK}E4+L^(m;tl=A&AW^1l5pc`V$pgNnEAZ8#;vRX=J#WH4ArhCjeVB1LpmU;MPS3
zo5~3gk&*{#Ii)FPCYFaMDnXTR<5?Rw5if{vD|;HA7fygcGZ9>o1bVg;K}<#w*jU&=
zN=gRL$-(vMHwBjy*7YsNkKj@E0<bnNgYnQBcu#FW&ipQPZyp1WnDizVg#mGKNe~tm
z-Q?pF_&J<Q@f#1>8um5~hYx_iWxelJ5h3nz!Gt|$BO%XzV9}nDiKPjP!2%02EAaC2
z12-2>-*@n5C7W^XMXeyAr21Qvu(5H}(NNI<7L5gVWPf5Fips0rmRHw7Kv;zRZwgr1
z{Sf#Q7LCEv(b5AYj`HM+Wabss<rEa*PwPw!3T=<TKt)NFcjAZC?0osU#%9noG~qw#
w{r$iHJw%k?QD0D}4^u&D#b#P|&V{D!8@75fD!RnqY5)KL07*qoM6N<$f(x7%8~^|S

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-calendar.png b/core/administrator/templates/hathor/images/menu/icon-16-calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2de0b7ec5d955df3df4736f48264d57279839e7
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005&Nkl<Zcmbu*
z1B_fz7zN-B8`d^sHL4NRMo`;~YTLHfwr$(q9b4<&@#(w&t&K^(%QI)@Jr@A~g@)D1
z`uj%<+Hgd0xS$n>^ILI<!@)f6Kwb;kpUdqN%nVarpn^lfW_zXy>(h+bnErd4GECT;
zW5U*S1E^qXh#VVYB{&*Zg2{oh-+ETA$Kv2d;U6e?LI0QanB!fIJ%NQ_>)$z*BEl?>
z3QX`6@q)$<2g>Do6x1|=t$(C}X}6OKu>#?lg{U%`senOCOAACI5&q<((P)U-Y~ck?
zrxT2+(~K>yshE2w0_P)&*q+WqOGH@lES{7|^>oJc^z`rohr<D8j_^g7-7i1c?V5yU
zT`R47?S4jc-y^P+WxBe$c!AYw1v6srJyIc7Qh4Ig=V;WJa5gL-o|%;xbJClNKIYro
z+j)W6Y{r+)gyvDf+9y%poee(vhP^L3GYK;lu%?e*q?A)|)RC8{sB1z@SrbkL=ODAJ
z1{+=_(4BW`A!W5%EicgP4Pe3xYAL`>I_{2@H+^s=JeT&Pk9(odk$1HAO~|6WR3_sE
zGGW2YzY~h7R{}m+dewu@x4(}2^di?>b45c#Bc0dP*Ykq%@(NT}*Zj4jqGDc<n3Uw2
mk&%g<oSZ+#^3gG|_um6cmLbP!P-BGv0000<MNUMnLSTYo=L#YK

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-category.png b/core/administrator/templates/hathor/images/menu/icon-16-category.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c7a4f8d0eacdb16e0f722bb07a6e004962fd33
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Gdx`!Ln;`PC2Su2XM4@2@UOq+
zx2I`>eT;EpOhe`Ysph{9f98Aakq`as!`A-)^UwGH;}yQlm*5HFzSL}xu>1V~|Lj4Y
zhZJlJm>bmg{on8Kz+O{g347v!q?2F&Pxttz&f5G%fhS^J$cOsYPxV0t9{h(Iu3EAE
zzy1O&wO}dp=l@F*dP+W&uYLK)e)X6C!p)9Zl5PA9404v$N2l1#H3hnn!PC{xWt~$(
F698EAR~G;P

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-checkin.png b/core/administrator/templates/hathor/images/menu/icon-16-checkin.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b11164d73a67afc0fcfbc5cd82640de4ea6c213
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004#Nkl<ZcmchU
z1FsxF5P)l2acbMP5!SYC+dA9to^79Pn?K=x!gTgh+nao=@l2clzQW<~5M;`48JEQP
zQv~sc8A0q3RKz6remOEddO34Dx*bl%mO@!Xp#Bx(KC;kL_k+-G*c2R+g&n>r{b>in
zz&-a1{}I^X8Vy@q!{Cy4gPS=0L`fE)sRg0eAoEeEAOGiiUrH&S<FLyz7Pgs3z(xDI
z^cTjYs}%n=IBr@DFMSuG*vs2T{`1|hsT9{yIHI2cJ2j)=q+wB}+#{Ou)dpSAtcKmq
zW8tiJIlOY7f_w)>%6DIald5^y|3j_Qp~+La<ePQYISbD1tr-u5%c|ADa-4vRt;@6T
zBlR;uXu7}ehs~m?&P(@~O$5S;>N)W4F48^t`I*0NJXLuxe=@v--g4oG<7$hvL)s%9
z%F4<HJgq$BIhC^j#4Qgs_}2;Pf^<c?y`}5hf3(5v?V~$F#?v1eAeBm&;yDl*^cHd-
zfb>OrzIEE+;|$27^Sel&MI*|c-s-e}tB-bnVZ8xL3dl7wm#=XE0000<MNUMnLSTYP
C^5U%k

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-clear.png b/core/administrator/templates/hathor/images/menu/icon-16-clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..b609ada0f9658871f10e4195c6b418271d134d09
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005MNkl<ZcmcJM
zbGF@397fL&GJqljsO^}wZQHi30hIq1&qk7)lV=R!4IxAL`a7%Z`rf*Gt({|iVgH=R
zi6TGkRZqPf(1O>)dhlvc3tsfAFP|ie%7{l?ksfp9lqgv#_Y&>Y(?LCbF>K(;fQ~2q
znkeyXkQ~zSuve>j#HR*Nlks@KXT4;FT#vO|clr$6Omtk&Xl34rHQY&-;31!kyYXz?
z=Q9G9<$S2C7r2QFkzVR(VfzuEi_4LMs~H7%;)P=@%aPEkIUX7~5q$S#V2qv)bU8at
z?HUrLvMjs0EFA1IvyL6<HgW+S=rU#MOAmFMsG!PrbXxMJb{o4oEo|?wL|GKh?oM;p
zZW^oPo=#I{TRSXiGi@MT)8>FS%Wm-Ntfqy+Rjm%zw%O^5R;TPAuW7SuNMz?yeHF{%
zw>a<o78gSC92y*Tn_ZO=PO~d{E$%z<yrnIUm_s`0^1?&RW>+?vJ!BPmP>|S5p$ZR>
z%V=?aj(dxhvbfRPwXo4gR<+3kJq5Hm3i}r|dZVlw3u^sUOFnxkiApZ4@qQk#`_Y!X
u5B9F5@2q#r-dX`!<G;60QNPUo2j2h@fl^qXnJpLq0000<MNUMnLSTa2+U&~!

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-component.png b/core/administrator/templates/hathor/images/menu/icon-16-component.png
new file mode 100644
index 0000000000000000000000000000000000000000..051a57b278407c17bcfba92abd1fe0f10d202bd4
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00054Nkl<Zcmbu8
zC6HV}5Qe{gbj-})V#3T(C&M=01-*CiF7Xw#Ve(O7<}B~l(#)f~+jq?HS2cGJ^|XXx
z$Yx*xB-7dLKr`z=TT9bZ0Qvnlb}Ac7-4Wl#sJAgik#!6J8t7s<R9ie9=<PURWpkzN
z-jmxne?QZ3zKvSrJNIjwC>Z}3D_v(f)K;0t0jyG4;qM+p6>}7&0dceJDK-J%`<msT
zFafYIOkUUa^0R3Rv9ga(h_6DtU_wrjw?MX|xzwwo1&W0NpMwT2jN07%<npQDEm0Um
zzA*B|C#X~?L<^|0BBfO&AyaZ0t~Hp*=WW_0qkQJ>uKfVd4*@8b)zku7^DSB6+N&4|
z6|$|>AqYcKMNLKp1VLD_13;z-fr+|k0j*t3fe&eo2)y|10w7bF=0wm!W_&WGPt?tx
zz&3?y+lY3Mxyis>-^{{uPoOjn)gd)v!kh#_=IDS-Eik3%($oUUOzzvEt{4MVtuQAs
z!W@0h@mqr;#j<(|An|zo_`@f!j>nT}JkP7p!T}SJ3R#wg<2cmS)p6|5-fzQ0{Wmr}
cjRu><I6fctZB(TQG5`Po07*qoM6N<$f|GdO;{X5v

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-config.png b/core/administrator/templates/hathor/images/menu/icon-16-config.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4edc5e3658bd321bbaf4b74080f754f1417a03f
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006>Nkl<Zcmb`<
z18{3=7=__K#?DS^yFIpTTccy!W^LQHZQHhO+xV_+JTq(jF7&^nEn2%}r(I6VL8rnd
zsdrWy*tL&T^p6mTe8MMg7+nbKUbqn21wt>4uc4ngaNxkDvhs=-zv=MJhmXms`nVz%
zhs9XB@%jPRit!6!{jgZs(*b?&<jE6n;A>XaHmc~?cn)2XKN{Exi$6J~Y`4nnIp*5}
zN4*<C;;pqd`kI)i=$WMC)Jba_TMG=sNa)unVzL)DTjx$4_HBp#9`&%tr5biQSHnvE
z_*Ut?rxXG_+*_YLdiW6i32xTrBd?dJ_|+`a3~ODX9@w$dG6l9N`+<8<Bs|iy_CS9F
z8PPETg!79pS}yXo*mKW<y^|R{_AUT%wa78<CwkA(-$1f`B%sslxws!f7cH~}?1A+<
z!62)h407s`z<poy9r_b=`zL~S5WN&2cnK`{$u1n<E3P5-*1la_Ee0f1B0yX*^y?FC
z`QMFg@AKM2s5H!bNdg2(L4|=x7=wr~B(?e)|9g)ifiJ<p|Hh@C|Gn1&=f1WMe(eM0
zyOM&~ws&wl@E3-8S3v+@At=@5ix=e~ve0)h>Z<KeIPW~C@P}qi_#?9x_8Tw2Zz*3v
zUn3q~NxlO9TmX(701pn7YvZvZTm&5b5>DHCOo{p04d|~tf$_ox*!MNgqOVc7F~atQ
zx0D?4qe7)RB~FZ+z(&81L*0DzBki(sCjID*x3sl83Fvz)oQ5{MJVLl3#*NtM&k+b;
c5B*=h0^Y;y<v^lctN;K207*qoM6N<$f+1oy%m4rY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png b/core/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png
new file mode 100644
index 0000000000000000000000000000000000000000..05fee276489976142e5f4e5a3678d1a2fca1e8db
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004MNkl<Zcmd7N
z1I!#j6bJB&ZRhqF7jbfpRoe`zn7ue{Kijr#+bo0Hw$HP3{GV?YReUe`?as{3J}BZN
zXuZ-zYdMJ2h2Dk#m4KA1KuXjyk;H`oNkV)zcTn8H=tX!xT$lTJ9lkHuWaz*ylPH1n
zS|PmmYv3N;2lvpfe+u0j-owTtYXxvko&#U27qNA2!^ayf__dTK`$ii#FUAtsmI~k;
zIu5={C1SeUi_f1w<4b^}#UT1dDpV}NubBeS!Q;V05&C8Ylv40K4@ct`ILg#;l*F(E
zU&r%7`j5d@s$xo1;Ae~ohUeP@SPRusEWwA7JXpJr;a8q2#FVdsWB4MR_q*YGcP;cL
zlSWv|Ho_eE9>Eg49?F5K?HImgs_-K_@NxPI2q7}I2c!6&t%~4Sf@l5N_|bX{pVGLH
z_q~_!{Mj=+efkv77`$C+#>Z4HiY2&RbO!GW40v@_`A;ve#0)CpBK$oo&L*%|LVf@M
N002ovPDHLkV1nE1!_5Ey

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-contacts.png b/core/administrator/templates/hathor/images/menu/icon-16-contacts.png
new file mode 100644
index 0000000000000000000000000000000000000000..24a8e8ee7ab969e7a0fed05fb7f363b9573bd092
GIT binary patch
literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008aNkl<ZcmZvW
z1CTC95XXN#i?eO}V%tV3wr!^ryx2Aiv2EMV*)~4!&dx)Of7>kpyS+XcSFZ0`Mk6Kw
zZIA#^0iuOKG|C4f;KiYNIYd@=3IjikEZ9#xcz4b5<8!W#hFKyLf&jD+o(A8534Zef
zgJ_LdS?s^jtF%^ieslbd8yqc@L%r{H#gev}AMR!E&LS}Sw<Z2>pWtgS0V)Wv1%hZE
z-|loG?X|xk<)dO3Rn~3G{WFGW85r-ki}3(L2^tCvBlA8n&tN$=t`(3#p%b%^SO&m;
z_nF6zxg*lS==>6&xRnrSh<f~VR4KKY29=V@<_~o8<FvPGfx=S?{8{i~0I2GwrlQi4
zQd;xe-`@5NggqLI(^u_D0^euP`gFtx2ZN<NB6E@Vh$g-Puxr}ZyPR8wFC$h6Xb61J
zKDM1fPOc_Ek&zO@R`a+Bsd!w@#oMkM8v?FIef07(#~oHQ%3=8v;Aun$C|me)GJ;q(
zmZiA)lX21=aDWUICso4asSp6FrnOaaGICL3Bc6}MJXF-@fX9C2z214weYuyp!4UC?
zMtd4N0ENL(1^@xzl3$JJ5X$p-_<%<CZOg$?f)Rr<LI8X}9_F;iI~WbQY`EULY*;tQ
z`K>pK{qdWxyxx(Rq+=??2Yw~{wWQ<6BE<Xv1FTwti_n(ua>#~xT>4>{<L-HgmZ72H
z^8vfKyzI$Ge`e=jW;~Xi7_*~&SiTQRAOHjs0(O#3&v+c;IG~cil?ng>NWS=cBg9b{
ztRO)2Dl4mm-}Wd2wm`B2iPRjfec?FjM!MOcZ&K{8pT2#gBV^OpJH}Q0xujZxZNNoP
z0DuS>0|1C-VNtOZwE(cc`tr*&ubyuH$qtfm0mm2|K=CL38U|d^n2PMrQYY1O0P3J4
zkNbHzoEBX$sidla--iDmBH)Lj6zr6F;U*I!R|BjB4<A_gnsBBZ00000NkvXXu0mjf
DV-{)L

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-content.png b/core/administrator/templates/hathor/images/menu/icon-16-content.png
new file mode 100644
index 0000000000000000000000000000000000000000..073aefa14daf439f6ce9ee27203812b02f30554d
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001)P)t-s_xJbV
z<K)-Z*Ui(|@9*#G>g)3J^s2YS=H}+=>+IX+@!sCvg|5ePmaUYgx16rOzQxUZtjwCH
zwWY7R-r?lD%+|NY)UCC?rL@EH^7Np?+JK?9v%AC2*xtR?=eW_~*WBRZ?DmVDuY{Sc
zV~eHD+vl#k$GySEovXNmw9}Nn*s#FR$IsM(q`Jn-(SotiimJY`%GtBR&=uA{fdBvi
z0d!JMQvg8b*k%9#0G&xhK~#8NP0rO0!!Qg$(b(ZK!<d=>|KsL1(X{(`Y)fWLSxQod
zQj9TS!Z1XbPcG;D8T|n3MZS#Q_W=Nq==Pe%yEq;|NS~nm3F0wpGvk2R0M||3ao#(?
zQtNIV>~-ZpX3eMF5FEG%Op3NhuIX&0+zG%;>+LCdC=bRIL5fvn9au{nn-V}+Asm=7
mF(e1*$5)l2F}P3vV(beDVhV9V)1kir0000<MNUMnLSTY264PD)

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-cpanel.png b/core/administrator/templates/hathor/images/menu/icon-16-cpanel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d7761aa18e0b5cb5a625549c90e05b7e530c03
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004FNkl<Zcmb`9
z1J)iv5Jle-W(nUCW(l)|SweOY+vacEwymSzwrw-cOU;K#2665=x4XJuRpI|rw639Y
zrvx>7MBTp6>RqB@yF@be7sG2Q(nyqTQksc^RdJ0dmb!e4-YkFh0bI#hN>Q73_+a>u
zdfOH~r81ngXf=C@C|r|!@d7NQ%xLmSC2O8~(>hz$&nU?KmRhY0q|REEWisP|N%Bky
z5~hgwZ=P#iryr>|EEy7~4MSiOJ5EH6IegHy#Q<vFoF$W)ewc(06QM&6m6#C*NEzF+
z=EjW4>puR-mZf7F?7#cu%uSwk&`o2=j+QwV$opaPsHsGx-H?t&%W(ht5tWy%{=E4C
zOzu~zxK~CuQ~G>M=J!vjJgW-)@8f=z0t>gYAK+FN?JAG*`Ji!tYIxOm|2aBbxt4GN
zS7Z4T_i;Tz$4|Kw>cPd}5L^uE$Hh1F8Pp<w4<u9YzxfK{5wTK7t(_wP0000<MNUMn
GLSTYZLBBNs

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-default.png b/core/administrator/templates/hathor/images/menu/icon-16-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab7702f9391ad10fdb46b0d7c6b712ba307b6a4d
GIT binary patch
literal 348
zcmV-i0i*tjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003aNkl<Zcmbu8
zGeAaR6o%81%{49Ac2jQ4p0kaumh36pm~yS{OSbJgedo9DkKwsG@B3WK0f0=14)h1F
z5_Y8#VA=0)HWq%DGk|O-OCwnQTFZscol+F+OC-Rv|BOe&>t+#+@0nPXWC;^sA(DB&
z1o#;agSV+zcv?uO@iLnPUt`gLGe!op$((}K*MU%Y91MrM!AOx{hGbE6&nd9O1JAv_
zaNXf463k#0J1haG<gv{W&KoQRf-}xCOTa1l>h*$?Dno(bjI)dgdINA&s3MS$P8SsT
z2^HY*y~7y}bCqbE7OTN!r5<blrO6rv$)W_w7&<T4VTSh!t0=v$Gl7SCGdxx$N>GJi
uMlqT5%J3LtHYG}+g<(<u2WA8dq~sqkuhBRRcj>_Z0000<MNUMnLSTZ9c$H-U

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-delete.png b/core/administrator/templates/hathor/images/menu/icon-16-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..a93bed32d135b5c6aa3e65631d8ebe97ebeeede9
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004<Nkl<Zc-qa9
zze_@47=>RVBS}ySqCwOOL&4B83>?(SAdIYNF$5)=8WNgna%ieQ!lkyLmcZ@)34$~<
z1VR#xl~A<A(|7N!zJ3aAo$-a|yyv{%C;wASP34J3YeXUj;jlq4c*5vt1;5|Z9gN34
z%+4C*a<H)h+uN|S1G~FWDxnNpjEuy7hZBhg#UiY&K{5#w6EHSrg7)m-0DQh%1_!^J
zFg;zPP=J*cSYC$3MHnAP#fH^Y*xEu>LBZg5x4w4vkWRz;I!sPNrvqSDP_uWXQYH)o
z1K@P#wLvtRVPOH5mh9Na#~Ql7$5OMY;r@Q;>#J&mNTf=+j7p(n*X!Ek?#}G4VTS{H
zdJJt44(F}@^Yai0z}(#1X05}+k1$UnHEj?K#>i%2a}&H?Xt#Cjqa$rHGh@LIBHV~n
z<f90M4EFZyL+$Uw*_j>N<-(euo|-RU!B-+&ihTZ5YIDZAL9qx!L*~J3*y((a{rC!>
zi&W(&F+5!A2DfdvCf%gqn1WBf!q*~=3z5A1MfCP&o<%Yp-S?Yb0JigcZ$I!rTmS$7
M07*qoM6N<$g5dq!+5i9m

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-deny.png b/core/administrator/templates/hathor/images/menu/icon-16-deny.png
new file mode 100644
index 0000000000000000000000000000000000000000..58d4407667f7acbe2a1f0be59229025ac1a19d33
GIT binary patch
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004vNkl<Zcmbu8
zGjwH97=;J*@N#U{?`mu-XyR1qU*Cmg*rkt~*tTuk)_Bi<AI{kSTHoQ`$7ctC|KjV0
z=O=l%oQr_#g*gInzi5ZbL_c1gwc_cC-9H@Q{o|vT@%%(LUYrIE1Uxy$AQPw$j=uDF
zkB;p9YJk@dk8sr3`R?&iynS@!hrD@c&)*TGizm-cHo(UHLt&fu4`JgE*?Mpo>-Xg6
zY=D)!^3>8D2_~xncd=%5`5`Nw7E|LSlMOI?OT?UmU&Y7u6`N+(&MX^X;sy^Vzl$%l
z+iZa0s|PXU-~-L_vv@Z(%5)>wxJ@=duW{ggk8uEh19|${0Br_W*Q6grlg|B?M(rS4
z4bCK*4N$3ZZuN$Ma*aos%9;5ODW$$j%Igh&o$|9^y~ILIh^aJ06sQ7nRMCN8!s<nu
z0Gmb={l9z4nToJGLzTjcbn#uGCL&jpkU=JsT&frAA_{eBK1~sQfBu<>c#EW_C{k>i
wDs^RP(rl(G&ZcQ{eX=44QQwJQ|Hgmd6K*n#50bb8B>(^b07*qoM6N<$f?8D9+5i9m

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-download.png b/core/administrator/templates/hathor/images/menu/icon-16-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..396357c712d99b77edd2940b9a90b4515ad64fe2
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005=Nkl<Zcmb`C
zgO#K~6op^AhutAe2opkwupw*$W81cE+qP}nW(IfP+c{$#&3DdURsThSewXSq8&$)_
zpswW_RvkC6YJd7H+HRm}xdPQ)Byh$^Us8T#tE)SIuxvPkwtOGToMlkPynIme+PvZb
zR_rONPZy}{=))#O`!>4D;|E>E5vX7n#?)~HcFiNOdF<)qwP?!1U075dLs5FTKyOhO
z?icEc_d$8PeBugBS$+73XyPe2V^+f1{N2Cwj4p2*l)3rzCC$T>+=`EgCZ1%pxm*0i
z%>#Nyo4F23S>*t~J7NT;*gAYfH1Q-OSxp9ap3x+;n6L;6=W<FH9CI7-5z)kxjAZ|J
zo>9khIcg5%*Mo(_D}0A|l98-h4tz!vGYblv00s2J=v0h_-4lF7H1Q-OSxqb-_>4Yg
z?2&@{K!LowcQcF**<3irGqM&<JjrMyhoFcUZhU=0P-~DrY5?Td$X^4<qXI_z6f{gO
zBcWx8%W0yC2US2b^f8icHql%3L3Kmsk)3=>8OW;y<eCq%=b}S8$gMy$sQs&98Px%$
zZ&e_D!XwY9^Dk?%ifDl@xE^ZX65gx`D&Jyg0?J_#-o#%clwO5_^b;z#q(6GU!Y1>8
uVpxXOz%rx~djH}_jaN<~xg^@sZ}Shyl+Doa9C1Pb0000<MNUMnLSTaY%>F+B

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-edit.png b/core/administrator/templates/hathor/images/menu/icon-16-edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..936fe76cf73e699f182e574d47441374be1cdb21
GIT binary patch
literal 531
zcmV+u0_^>XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005nNkl<ZcmaKn
zHINix6ofm&VN;?b!8MO2FWe!zJj0!HcXxMp#ogWY+%3bQdH2w<?W%8grvLtCXJJb9
zpa-?Xd1x4!LenV!N4we~f898ytZy@F2B%OrL>UoP14Ko?qSrOj>DfS+Y}dh*;%)=w
zeMDI=QPSfb*$Go9>RJa)?pqHEyQTyp|D7wLw|n@yqk~WK@@VATpzI$&ll|Hsxo;@n
zu0-Cr&O2RQ?0oQmXG<!$B=auihl#A$zCgx{E~LL8(wxa_+QP5r=kxl#DrQ~1NuT_u
z+N+cC@&b@7MbZ;T@)|dhXTh(vU{Aq9`s6$^ovVv@DdQg6$gAJ@S02or$2Ex+wvD=o
zc|b(oGm%%j!7Rs?YHvkdMBXJrZ~Y~wcIQ7iN93p??H!4_HwA=Udw`%zMBoMG<>eFn
zSTj@Pxm**LrJW<8SBQ`+d4ON5FG8j8Yf;K_4zMVFFV}=5>AfTVtwgx|s9&1_jbHr*
z1h*3>D!Ke%q<*_{vYH4xOL6k>H^+)R@T-=;(k!D=;%J^TC(DSC*6Gaybxb*w;lYvY
zI{3-21U3+-%0wtpaJoV}oGvGhWX9>%HTz=>98Ai?k#zZ$Y)+%s2jb(fKXwr;`3V`#
V4|L-Bna}_L002ovPDHLkV1jE<0onin

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-featured.png b/core/administrator/templates/hathor/images/menu/icon-16-featured.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfd4e1de35bf950472f06865617e4890e1dfe647
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005-Nkl<Zcmbu8
zQ<kJb6og|5wS-<mE#Y56Eur3KUfQ;8yQ@oW+qP}n?&p|0m185%iPVkw@+V0CP-wW+
zi8LrV{ml3MM$MT)0`q9PBATz2WG;LAs5>|Q5`d}`lb9$FqWpj;StE*;2>Y(=of1+L
zPe00!bl(ABKQKvwupKDnEzn>aX8n@Plllqsj@lQGc>BKspk!NvWsfov#hVgdBElNE
ze|gLI&1mT%QbviwHSuiG;Wh0TKLZN4>QNxU^f~HcI;dr|(#_n)k8OVEh+1M5_30f%
z+#r#&Ldnd32IQ;~S)%YR{;q|!&&w@M(vitn)+s>x5|O${gmu$2xbV~P{qrmJ@y$fM
z08~a(faG~1VU~y)C)~?v>Yn&M{PaS7u!RWi6~Hu+;>aif5@v|#2_@eax)rzl@N~Q_
zCL%|bFHthFQ|cBFGgOc0K_WuvUKOmLSpF2;KfC-i*GH5Sp`8NhC*nsxKSYEyYl!Y4
zLYf3%Wmw&SK$fUQ6jS#mkztjc>|fcTliUJ=>WH{LO2+W@hZI<mil}zN&qlcA5iZ$;
zXCdKjB3yIT+NYF=7Efrc>Bpb4Ur8#$>%~w*1Xx67r9hd7$zFJ^%&n$h|4g1~8vF|C
r5l}*elq&_w$$o|PklK%arvK7AimSBkITNev00000NkvXXu0mjfm!t{c

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-frontpage.png b/core/administrator/templates/hathor/images/menu/icon-16-frontpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..675de06a1e49cd3702261bb09433cb9617b46005
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006INkl<ZcmZ{j
z1B@L(0EYjaefE2`ZQE{~l(A}CQKK?yP}?ytMj4l9+r~TJYPK_z+w}2IzTKJG+5aC(
z_%FhcK7al^)$MjqMT}%wHZ7JfU;Z62vJ7ktH^Y^emzNO;1lAKmz>y?LV45Zz4hM8y
ze>ZmQ*h8_YTy{p7F;3GoCrg6OX0w1*@9OG8I2=CM+}!*&*1&qZ7+#h{_zyhYg4Y>5
z9bB;{Hl$GOkFitW@0yw#F%`SrelRmL^L>&5?^Ik|jE;^D!L(`9#83VG{aCSL1?JA3
z3&Su3TqzAEPMip~P+;r9M<VKhiWle%Zby52J0g*Y=$Cd1Jv}{WY-|)iyId~VX&)vu
zWI$@mMCPb#ViaDlH?;wuE89k%DpJ^)Kq%)rh|>ihZO1Hs8w(f@kH?eVfD^8L4^Lkq
zoC8$=u|xLwAe$89N^XMMgD`970h6w#HlUQk)msF&S|@%4ks%}z*aIVB8XAnQJWP$A
zJxx*>M59ss^c+PG4Z%<bktjpeF*Ifysuw+al4QWs$BY?+CCgWVZhit&SK|Y81-f$-
zdgfeAy#|V+^r@;U7SPex0FyW%jFo;!vJLD3N$IpsWz@P%F2+bkAlCHbvB=ups{;2V
zsyo|y=@*}iOm{it@x;_UzLO2ynPONn!#!*ejHUI#glBj62d7x|yxU`TMxRW4WZmR{
X9#zpr^M`GD00000NkvXXu0mjfRDb}B

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-generic.png b/core/administrator/templates/hathor/images/menu/icon-16-generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa1099cb3156cd8cc3b6a7ddb4630e5b36109318
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001%P)t-s%&v3q
z@9*pC=;zCg>&}kVxO>H<W4)VNwv<ut)0W7oYQmsj*t&b=$A-F>RMytk-oS#z#l`RL
z>dvid@70{<=H}6|bL7d9?a-9W%*^G;i?EGIyu7^L-rnECgx$V<)wFZ6k4nzFjn1`$
z{NJLwm{;`k^5fsw=gpM#-mS!<UaW^f_ur=R>)_tTla;^!zO9AIz@+A?nNt7&00DGT
zPE!Ct=GbNc005auL_t(|UX9E}4#O}2MA4Wz%$zdA{V&(puDb4DK4~WSuP03JmkXuz
z_=TAet@Sj;TMuu9aa{``@|}nC?Ux71SjahFy6)<MP^y$-`;addhN#LiDJ`<l0%%TT
zF3Z&<Rc?_~lh%Zk79I2tGmdfW%%5&BLTzhJdwAud#u&9`H14#3L)0XFpES`>z*P<a
fq$ykj00hAY-y93tfAJa+00000NkvXXu0mjfyXeSL

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-groups.png b/core/administrator/templates/hathor/images/menu/icon-16-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..28c67dcc6df96b2bcef2592035bbeb02e75c24f2
GIT binary patch
literal 796
zcmV+%1LOROP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008xNkl<ZcmaKr
z1CZ`k6o9|rM|a<vKWp2zZF5k!gK|{ce70@dwr#Av;Z1UzzM2PvV=DXs%C8K-;K74W
zjzl6y0Y0$%zWeUm%Kv~0=ubX)d*1ACANjF%%oU!y;VxM_;YK-k*!ObMq=|CGh!ML&
zekNp%f61!7{PN2s7oBzDn6o4EFFNj&1~gSgRV<dTJCX9M-bMyKhYlU0s;X)V@K9J$
z%Ws(#Kt1=|b33LI6&Dr6T!Q9Syt)QxYQVQ@Sg?LG3lFuCQ=TB3&E5oj`{&Z>)2Gip
z<>lq~CXPB0N6#QllZY^}>kVcHN7F?=krB}pT~_TTR#-wwNy$@TD|h@JAR3K+o=7A>
zi{a#-j?-wPh<5hWY0QsZiC>sSi{!8=o@B-TT9U~mz=r^8&z?O`%E`&e6wpXyOCNIf
zj{+gUFz{VTyWvo~=Ku%y?5DM<8R7dB7Z($Y#ZC{aNU6T>AFXK`(PeK_aIiPUVkNq7
z5`>P&Myoi-U4m$<$2Cn7PCaKNN&tw*;{ZqNW~lHykCa$L5C(D`i57T=HxT#X<o4x^
zmDkc_<#ATjq_Q9n04XJaukPBlYiAgQ4J|2J8bc?|Kn(=r8c*c;x(6BRTuorK613E?
zwx*R2CM~4j;`QvPZ35V>03CYu>a{eL&ndCC?bPhwM^$SbU(4$_s3ghPT;kX$GC<WM
zs7MeFNzH3n^69IEI^YQ*zL6b{?4CI7VoJ^vESkQ8+C3)4R3UvI!5^R~DpCe)_k;w{
z0rBj!&-UxzzyDp~?cbVCr@7?xW7%kIU`Mr0yXz51`TN=Gn#vIx4g1@Sj=u#60J(16
zx`!1-`OGkk=hLNSym{RPY&=xQuKH%$9D!|F2*<{>tXazrHhk#2?uLJTsP5gnUpHXD
zfK|hX50_)cj5*B1h7FTpg-bei?05qZ`O^#Vua5=jKm72+kzKoXz36BD;)^dbzdCAv
acm4@}HfCJ6M&Z-|0000<MNUMnLSTYR1B4*}

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-community.png b/core/administrator/templates/hathor/images/menu/icon-16-help-community.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b39c5fc16f5c8345985a377cf9e1df0470314f1
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007WNkl<ZcmXBS
zGk`7k9suBP=FGXa72CG0HfG<%Ru`uUs@S&e<mJV-_WG{RVs^*DzxdgR%BD$L+3?|t
zv0aHKsmg|mrlKyWD*<xqGSI51&D`*#X6E{@N6mQWG+BC|rY0XELXlDDAxV{o1aVBB
z5+_Wa$zT^V);}XL*1xUxWG2iaNl2zpri>5JSw(vaGZrvmT1eP5z`E~P`^8qVB8_yG
zQx%#ib7@Mte;^%X)&{gEvF0;|yMleneAa$W+D(&}iF~9{7ep<}lJ;b#%whGXbf$!{
zCeCEW#-e;Y6qvez>MN>A62&N0N!Ahde8-~gnZGUL{h@N4uy{{~SMmAnsF}F|%im(*
zE@DL<jM)GqtN8hO27h7MUeq;Oq&<9iE#KdYh`(NC%{%<@yhJfV_HVVXn6o*{-{reU
zm^6=>8#BC;cP?b`OBNkK9JA&vVpL;dRZ5Xk7gQMo%US**16^c;v?efVJ~h%+L;_T3
z#>Ccr&$@3A^WpWZ`+}`bWV6Hh>_)o3X8$YL?reI0qw_mUk0e7iAhG)Y;aSRz)+Ba4
zi@BTd*{uxx%<w-jYa_NjF8s;J$}rl`uTWGHO-Vh@)OqZ27Gl1=pC2Cze~@<Z{w27Y
zjSfY_PtQ;WHc{r0bVc~O>5CcdX5E);ax}9xrAS%(32Xj=MLPpohZY)QRfoj~Fn2S4
zd@>~3<QVFj&u`|ZJD9yG^S9@>7y0@wHamjp$h4#8^V^T|;RP?5w1hQ35TQmv;87BI
z#6obSvDcMnM0wL_|MKjKx<1%ddupZ5fTjv(tSce7MkItbvF%TLx7hIDm;MIw_C3O;
SaF*}@0000<MNUMnLSTYo=~FKN

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-dev.png b/core/administrator/templates/hathor/images/menu/icon-16-help-dev.png
new file mode 100644
index 0000000000000000000000000000000000000000..3187674abe503b98acf48784dc458a9213762c43
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00056Nkl<ZcmZXQ
z1B@L}7=^#?-fnH%4Qn%IW2Z)3BUWR(G1{PrYMWtgw`;z)*33m;dXl@CNzUm0N52Uz
zHA{g@5M~oRc#DwgSyT*3TlT-Re{snkgLjt*c6I^iAdSNeD1w0_q5zTn|9y4=mkhS8
z@RA{Gc<cgbE=2;V(06XMLF!p@$uPloLefIkM1m%&yGRzs%!c5=B@j&#Jp~9BL(&S7
ztO1HkV90pz9)^sC(x=e;7djfiwrMwJ2uxgpp}RG9ix@Lk?g1D!5vpE6dns~Fz<29e
z|5OR^{SpirtyH!Hyn}Ve;n4}OO~|YRLN|D#fDVEaA?<{px8eIG*nAR3&4881;OPNG
z20ReJ&{7Uw%c8RZnts8=rSSd?wEcz;=V19hn6?VWuZ8M|{RGNipl)fbz@K~2`b|B*
zoPvd0w2KK#q4HrQtAguNd<m%A&kOYK$<Ldxc&BC@8G*Q233X<Al6$Y0)>3eh41mG4
zBlk`S9pHT&hyrFPv{b>Ds}K+X3HbIVe8*^sL{jgklHJ_~p8i*p!8Px}bDF?tM9K<%
exdmj&z|nv79eps~mEnN^0000<MNUMnLSTY_WZaYh

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-docs.png b/core/administrator/templates/hathor/images/menu/icon-16-help-docs.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8f6f4e47ba5331d8ec781741e114ce04086e98d
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00054Nkl<ZcmaLT
zLz^X67y#h6&=;}ob+nD`-w@l$Pw7?m!C1>#k7r`rPTKCOd+OvqPo1b$#(6(wapt$H
zv72~_*w75pS#SIt2Hy$Q!&#jA`CD-?#A!iD3pU2-xt_}6*ymBR60d~+fK}^C)trrS
z4V-f|MUS5jYE2ukOfQ60nG(*p@LD=2A#%ZWy#E>kf>Jg6A6%`-oO8(y6n*OX_WQ*5
ze7uJfPBg4aX?fP_ek-zqOK&6ZP|W~;eq(aSOHPVoiiMi-{i%XxMFm;TWp|R743-i3
z^IKzEpHo!hitZwzhW`eriGi%-(wiuI?RWU&8)I9ZkypPvX=IrWprJJLBTXPwZJ$>@
zK=%}4LyQSOHN?L-xf2y#<cKMN9}l*fV$Br~bJ7JZ788C#vHY8pIusq0i2n@`mfG@1
z`doY?F(&-AvCWSR@%U=otPBt<F1)V|vOLR2dxrxa9pXs|Q>?~N3iHI8{^=ZjMg7hu
zGc%LQjFU#lx(P!-OeY|VqbE;l7ETdr7N`~w=@jT7ht&`;l?&4k5Al?cV24gG;cP|O
cD==RE3nckg?CKS1`2YX_07*qoM6N<$f_>E8RR910

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-forum.png b/core/administrator/templates/hathor/images/menu/icon-16-help-forum.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc0d3837a603c9bfeaa0d99e00598a803762ae6c
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004tNkl<ZcmaKo
z1E?QR6o<d<-PyKn+sa&8?q%1qjV-$trmQJzwr$(~``&XNe)V);uR2|R-$C%dpBDp1
z!6)Me7E#o?-lzDQRILwKI*P|eSRY9G&^6q=pWGNn1Mz?3rZYGfDcb!T9H{=!;m{L$
z4}@;r!HwoWg|AxmuSF<<)l^o`elUC%)b#>f;b<K;2Y$bV4_Bd9ki;W_>OaA~hro!r
z0N{pTNz`){`V4~+^Wf56@B||l5vcrA1!I;96r^w<79mzZX6Qc}CT)Qmd*ItyRiM6m
z$*PjUlHkU*r5ezF&?HEIz-S|gC8+BuL8>U+0P?E-e*}36{C%e^Z!f@vHIS+;09td&
zgF|fu?=Gl<x2NFOE||MB1GD{*8SwR<S|F7*M6bcUeemK0Ox~esHv<Nhe@gJ<E{s|Q
z<JLpr3%t631YQNJNc8tU+`bB8Th^BSmnYzd!2lqT3d(LJ@FJLHP_{Y%NMMEESaGl<
ukVBn=0Ko4+`csc_0B3LxwOPqwV0Qy~Fk>OT>Q^2B0000<MNUMnLSTX`am@z+

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-jed.png b/core/administrator/templates/hathor/images/menu/icon-16-help-jed.png
new file mode 100644
index 0000000000000000000000000000000000000000..498a01ac4d4c9858a21b2cc632cd0401f8338802
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004qNkl<ZcmaKo
zMY7yL5JaCQ%*@QVwAW_d`V9XF_8EKwAH-gp@djpQhS7-C>Ml`5On>Z%)ClHfR#qUR
zABTZ!AiEF;u2Pw~?``z~TTTQr{Q4fL8d(2e^$&BydT)k-{CO$38Q{gMVc|*;2fv>}
zl_@m&fAc8g8IldG*bWPpLNS8;AJaojCp9o&J-C&$vXJ~>98ylMC*1^*2YY`Q%me4(
z&r2A6YxJqnXQ*Nb1~6|iY&gU`ipX1(XEbjSR5@h-;owEMc^TqQAZ<v||NefU6L{db
zYpWdgUH}B5w;+XvrFxHVpq*VKlQ)Xt|A)Rm7HkV;3Ih%hnAh~`AzMQB2ZnE9!72#f
z!}rH<^a_2*|3*$h-{A9O-KZH?DE>hBwC_285&V4tb{eb|Y_8+0f!}k(30SpTcY;FG
z4Ro^#`aNws!D4uG-81lhfk3Wqkv=^GN&B9D()P3P;kE~>^vuI0!zOW6Z^HDR?{Cit
r>KP8O;RMzUvCzrsuP-+<3|y)K*k+TF{aP8=00000NkvXXu0mjf_3O-D

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-jrd.png b/core/administrator/templates/hathor/images/menu/icon-16-help-jrd.png
new file mode 100644
index 0000000000000000000000000000000000000000..79a9d30d03de31ab3e04ac99db0d32924aeb80c8
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005NNkl<ZcmaKo
zwYn5R5QYDpZ+-9L?(P;r#4|vIYe<6RyafsJ03^7CxFk3vxVznTnVGIas;^6M+W%9h
zI-!-XtANv>vrqwvy`tgQE`Ey(cPF&;=?xmsLj42hA0QB<AZnQU!hRi<lEk%HNFUfV
zVJRd60Qhnb!m2@i-;GKV)&{~7S=Ce?R3U7bLGO2#0B;aktd0qg%0c5dH2*4@F*r98
zMoxod7M`E)DWoyU|IW@I<Q74?2)Xfqf{2-noC6X<=^Z>fX{{x5FkvN0+P!*96+j%I
zCI#XK#BBihd>85;LE4}p{J2i=KS5YCmES@0CwzZmsltkf6;xo<bXb21HeQBttHDLS
z1^+3$yl4qJU&Gpi1_7u~G=2#vfLdFhAW7weK`w+f`{2t%7(L%$1A9#B-{98^K;Zci
zaFFD~E&rntupcI`0`-yaAA{UDShNlRDxcu;9uV&<5a3$inx@V-_^LL)JPx%_fH&-z
z2#!8718IV*!^hh|ujmW5!-{P^`*z7d!DfYo9-5+PWG31G5g*S>2h1h_Ac@pVNMn?l
v3=Rzj0sy4|SKf__N;vw&>mwN)1`hlI`NU@>lF+)N00000NkvXXu0mjfIDOgK

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-security.png b/core/administrator/templates/hathor/images/menu/icon-16-help-security.png
new file mode 100644
index 0000000000000000000000000000000000000000..0050ca5d110fe4f730e9359b8e4514243fbf4059
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006xNkl<ZcmaLT
z1FR)y6u|M{+?}<at=ev!x-r_YR@9)j8`f^DhIP9Pimh$i&-S~V`TBAvS?`|A`TYOS
z$%(?u(DB$n=n+!ViY&|fUniA+B&922X|h46^em?AB73lZxVr9H%nh;1+~Q&{a1^n&
zgXL?O{)d@<D*4^t)x=73*+#_58sb$|IJL}wy}kbZ>UGDRe!7~rPD&G0isUC4`i8VD
zR~3|ItCEGV%7>qP<@x7damTH<xaGR54R3hP(tB?*^4R^x-}yw}-=owYuF93?#Z@@T
zDv%_eeB?m{QCLg}skkt!=Eu+Z{$qt>PvVd+{(Fa}<HU-yS#xqZQJPq>ELJQQ2_X|L
z-ba}!`;szAiSaKOeNQYaA1tW}8X6k(_x>visi-v1k{HXk3s<&xF#H|KG^w2gg$c_J
zJlpxL^;T9pULY*@{PcniGxG#UU0YkHzBogIKy0R$G|9@E{9D_>J(_;|f;flB$_ODv
z09~D(3~kvi$m#u%-Vf;ikl(gicFb{-rOS{(+cN~m9Cw12<|h7rl@tj%Nr5Dv<zHJg
zbu^l};0i(@q@s`zg68HH7hQa@=+BKzPmt^^Nb@A~<Og~42F)iQYwEHqmDj9A(Am}L
z`WtW7RiE<ZgWLZu5QV4Pf>6#RVSzNI_5@CSz~E@!!qkN3wsvdsKl08E6cKEXC_K4-
zQo2x+Nn{xiqx&3IwJ`8L{XY@x9#c_x%(+s}2x_*&+eJIg_Jnc$|0DNjaO>G(2LJ#7
M07*qoM6N<$f&%M2#{d8T

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-shop.png b/core/administrator/templates/hathor/images/menu/icon-16-help-shop.png
new file mode 100644
index 0000000000000000000000000000000000000000..e24dc8a539301cbc0c1f7c42ba413a1e53e17a5f
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005ONkl<ZcmaLV
z1FSAb6bJC%huXFo)mBh5wt8bHjd|mSwXJ8yFMRQ{QQN)z?3pQcimf)8GdzD~E2;J4
zRaj3tUy8&@9^?OChsl@1XsVJL-+duX&X@9okRSYib6$@dl{EKJ6929FA3%AO-_?ye
z9DhEC9m97!so;p?Nr4zikreWX#83dt>?4jdz>m8*`V0;~md+2<4*f?{c^>(#Fa4&V
zU3lt$z}Yvk@F~r&Wx2)N{*mUF^yZj!s8p#R!KqiOr2WfNeoXB!&bx!pHgMKWq*yc!
zI*6o%z@9gm+f3{g3jPdgftmfBbUFK%^6h5&Go*1LI}Nk4US9hvz?c;HZVMMb$gsnM
zFGFTdjJmA4k%WjuUF(~i?1=sxjnDXUBX>Q?>W7##i9=G47>P;%mGt`c#ea}x7V8n`
z-p_I8aN@<J{Ceke%xo)x)P+HoU-oHcX92W*8o2aPn!5-}0M!DZPv{bQgbrbmTc>&C
zZH~E^v+m;Ix47Z)KLLWALFi`o{+~V*_PogAC&ho!_>^r=v-g=l*#VXG%yEli@Av{l
weo&h8I*;<#s0z&~VcZau<dsJJ_hvlyGY#v7^v)>bumAu607*qoM6N<$g1{^OR{#J2

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-this.png b/core/administrator/templates/hathor/images/menu/icon-16-help-this.png
new file mode 100644
index 0000000000000000000000000000000000000000..c90eac90e0a6e7de821676da385fb118e89ca71e
GIT binary patch
literal 726
zcmV;{0xA88P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007=Nkl<Zcma))
z18^Nt6oy}I+qP}nwr$((pl*k?&Dge`O?IEc-4|~7*wNp6H+Ig<w><agKeF=1aa?c0
z3qm9T1Y_azZdpynMTWiLLjASu<3kVx0b*7bGDQ&yo)%!gKh<(f6b;t9%EPSH`&`Ak
zR!H2|8My)0Fc=IH=`T(qVQVKSwsr$eP$3BUu$mrLZD@<6o!!Cj>xay@7ogYcp%c>~
z92^9GZ(k(s=nm!f9w=<BVX5q)qI_o`;?NEJ{{G+(4Fz+34HOE6Hpasa%#raB4iA+A
zCvEQv?(HoTt+*)rY|>j!%IotGj*XNYqdq?}#e@b*gCpE#LISm+`^Q2!Gz2L(79-8^
zBdLHj76rJiRH>wLX}@XSmK92*fx?|FwOMS4<fGH+>3<WUwG=?5Ru>P9PM^wFZbqYH
zSvHp{LVaj5(q0a&p8h<oRH{tUzyvjfpN|j|9#VSJbs~ZTUq!fB>r<IPh^ZQAb-JP|
z>qybbKys6BECau%k2HgT-J>Lj=;-K|!G1novB7=@YqLL?wQ>W-F5Q5qj~+lH2*%<P
ziMEmQ)6*oGghCY}4~;`qR1}=Py@9=z85#_njs<hhVfXZtkPTgqJGXD5OplzebFOM*
zJ0$PyQM?DKsi_DE2*AGMCoyE|S>zmO3*47s$BfhHJ9{-MZla4>j&jccvWZ=!P1I;K
z@bU4%$+KtCe&P`@TgM`IZyU^=a{*%(t|=3sE}?<1ukS)OB2;9pK4_D9o=zH0PEH65
z@<;#iGtp+^Vf3AO3C)H~huN<m|H=nwOlU!9>F@7<m|+-;pr9b;ubG+R`Sa&ifquU6
z_wL`rl^ZwU?(CT8;^MkiRtsxD=s*}k7)KaS7*6O)Xhe|x2a~!jQwXvhh5!Hn07*qo
IM6N<$f=lO6YybcN

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help-trans.png b/core/administrator/templates/hathor/images/menu/icon-16-help-trans.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f2264c1ee9d6f4a45d98bbab1b66b3a5a8c1d5e
GIT binary patch
literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006jNkl<ZcmZA0
zHLxT_90%ZU`gV8D-Q5!0A&*GOBb=B#BCjGOy^IXY3zr0U*K>b9yE82;)e*0&er<oZ
zrYu}~0B^|gL_h1r*;I+W(P)FvWT7NY8s?a40z#%FQv6HmpK8kO^M93odZM3phPm*@
zjjhqvt(07mBPG>y`6m4mAd-iLrd<B6^lPi)5N+PEgYlT0C{b0AR0Z{Iw#xDqN>52f
zX=Op0b~f+XM<~RODx{w4?oDCiHWvOtZ<M>mx!aqOhy&H-b?&cwD~u*|w~fq}HQRSE
z*~aoEl>fV&BAfSe_4_Jx<0k?HVkeAc`c7$g5)%c(8lgqQ<!{)yn{JKq4%Tk5=|D~9
z@2?B;l<Be@qhYd>{r6%s+mEyJENMi_(yV6~c;H#K9Ol6nXb%WtS3M}n^3NZOvsFVP
z-nuB=x+HBmB$X_uWDaFRtN-j(&VSABI|Yk>)7=ts)UICE%vMZ){YbOx7`u;|UHw^8
z3T2RUGW_$k(c>?%`y@Y|)09^pDULiwU(1w-D5k+MKS|nvl8pj#rInnF^;~+#h>qKT
zRE?z(#=#_yO(HaeLN3VUU^Iu6x%LqlDKnOSWZQNob2OQd7^#9%Jxd~Fa%Os-mA>ki
zS1Bu;f0wnZl!5#o`g+zosh-v@a_Kt&BYAZ}UfZb*oPUdLce3*gqcL^rkQr9E^$81!
y3}8M?FMC3EPO(!)^_npz4W%%}%=)!}7ykuRmV{|*9G2Sv0000<MNUMnLSTX{i6guK

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-help.png b/core/administrator/templates/hathor/images/menu/icon-16-help.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c3a8ab93b12609d2379e84d94d949f0887f36b1
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00076Nkl<Zcmbu7
z1B_!~6ouEeZJWV5SlhO3Tfr(`+qRAI)OaXHeLLyPw4*XSd;fooaGQM9J@4w=GNLFJ
zrwws|Fc2U@x!;$RqAgSO4}<oCsEP6kXI4W|6nMN|q<K6@{P_aH{c}FiYz(mir6-_=
zg;&=z<>|GNG`|TlqhBK!406;9n~*rKG30s8!3yvs#S%<m58G$fL-L{)a4m0-w5vN2
z2n68ws8CjQhHF_nBrj|M+k%#CEJme*1O|;qTGW;V&EZ<n0j|~EU_LMvvMl>7Ki<K-
zb^w$$-FV{U1<fE{Jsf5o=Oq|Hvt^`S-T`HOFD^9RJ{`7bV)7Pu#2g>v)2!$RWp!7i
z9vlPr$D7oF5Xwt%#Adg%cKN*S-!F@_n9CB~=a)XO5YIJ!e}KiqL>->M?r`KSjBlUW
zR?MzGRzb)lN4SQHvGFok_bj-@X0wO+!W0LTho@oD#TVJMMX$Y}dGo-he!Yi)SA{<i
z$m_B!&rS=;OgT6nuBC1H4x*Rz<^n+wE|_(iAKFhZGh*j=q*zxd>v|#O;&zBuiznX&
z^41`28O&``a$PX2?hi?lVEXbB#)bSpa-jovO1xIog`6%TK4;oz)kn&rmWA(t^LO(=
z{vW#$d0jt<+So+C<Pw+o<ynSpX-B%mrbRFD;%0uG(!OzEH$(bHMJ|zE<%o(A5fP&V
zy~ZQFy5UQ4x!_h+xZNt8+6V}LK4)3tB7WVubEhTK5@m}gs6x~vYDGmwtudR;FKCHI
sE1}oxPri8ZVlaylHHgZE6Z{wd03tTRaNO8_!T<mO07*qoM6N<$g0wa>9smFU

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-inbox.png b/core/administrator/templates/hathor/images/menu/icon-16-inbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..f808d62dcc20a7480d0516dddd60c39798f51017
GIT binary patch
literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007kNkl<ZcmcJO
z1FS7q6hPM=T|HdXwr#iJ3u?uzZN>RU@NL_+ZL7BJ@yzbcJe6_Rv9}KY7Xlcszwt)n
zm@#8sA3tu~w-d&V)kza3=;TQgNAn*TfC<<`h77%J!h{Jk>P6?zo3AU@Z_(E#uGb+8
zw(5+TGjz(-sVCEhMJF<D?AWexl04x!PPq={a)l(0`0cl!xFjE72N9)W5%+huKX5OA
zK^uMh_Pxw;a&OdXwQ_wEzyI#?<B#8i2*=c_oO#w+$T8<rt5i|dI{*_912U{ctebxI
zBdWEdIs4r6xap=F>*Z!Hx#SYgJ?AVoeq$5bB|iKy<o6)51`ZtjAYfW;H|0*=^?G8T
ze+N$G7QDt5_$|PT6hScn^<DOU_#Q3EVt)Gm8?<o7%fNgA?2lh&a`m+G0}%%CPcC2B
zSL2#ZyzL&vPp-#>ryR@i&hH%k&UkXCHIt^0{`5OPd>;&!PhaEV@|nku%wK#y8pi<m
zAAJsyPxQ-ghzN=z`6AA7$6%M60Ywb>cI6J_gO?fj(ND#v&%Wvejy|z~7zScWy%?a`
zQAj~ZNfXWH0N&j59pM+>VId@qMFS`C(BG2m=JiXzCSMf7KxwY#ur082Cf|JNan%hq
zEXSl|#Tbra8G@crODGyX`il>yAaP9W35J3rVfG4Pgd-_t=#u(Mt)%?gpvb4M)9c+&
z<h3(SvpM=GK@fiVP08h?en!bi!LrD(EXn%syq^#RG4lQ^oLnjJiDQFd0tlToAPUf7
z3j|Olj0G>qW--@3$|EN?^Fp=6Ie$9Wxj#DtN(NC(c;p+l%sIp``O`<r0R_PR(;tyP
gmGn=2qpc)=0ES!$yB(K(J^%m!07*qoM6N<$f}sgclK=n!

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-info.png b/core/administrator/templates/hathor/images/menu/icon-16-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..3080bfdf070f8ae6a7625d50caf98deb0193e6dc
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005wNkl<Zcmb`9
z)sY)f6hzzQ1U7^XVM0&{3PCBD?PX?W7A`Y0Gc&_TW@dl4@6%{BX0PE?9l`DHhhK0-
zylN=FFGb6vNOU}zMAuWI{Q<Q;UA!P#14P#oxjo63P6U2PLqJ38qc>=KL^S%TwH?#M
zF`*L;eg?CahnuJmeDjF=B2pfB1D}*UQg)qDYd)|Z7&#-Hr@>6dl-?%3!g=l#iCQVv
zNU`#O$X}w(yGnce4pFit_Y;*Hx};lo=0KRLW1`~7uxy{2XP28#-cgai<R=O@Rc2W!
zRvqaGQ@T$S?->?s(b0EI=bBE1{`wP<y=3L4Y7?elo5<fX%-bN+W|=>8LO~u15Sfcs
zZmKq6ayF&3ZkVx3#7|Iv^??elcupQ%wsO;4*@VfIQR<>$(hTjcWh(TSABd<yB4ysn
zO|#aBFzK^zkT^~xjuA2a%%9w+!a09HTbbPBhE!&mIz^<-bRtZAZvs-K7~4hMYoT-L
zm?oPKUj}cI8OC)J>8jgf!&k(%Od`2o%3k6|4Q)kT)H0ii>(#^^x7>Y1jQmgTBchuU
z@Evz*BM{~3L}Diq-zo!_=p>?CGL&&*huBWsbtd4K+$gZ)UTr6$>WH{TB38yx&NsMI
e>6A>v|K>BP!nb<}itfJv0000<MNUMnLSTa5n)R>%

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-install.png b/core/administrator/templates/hathor/images/menu/icon-16-install.png
new file mode 100644
index 0000000000000000000000000000000000000000..f393945ac7b9d0ee7a0375d97b0edac0734667c8
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002VP)t-s0001D
zq`_jO!D6JrVx+-apS)h7y<w)qOOmckldxH<%s`5#Rj<=lvDFb~f)#Cw8FiB$eVrqQ
zs3?!KEt$SDqR2O@(l~;iJF?t7iKae{sy~&pKe^;Uk*`9&>qC{bM6cCFnz~4zz)GXU
zOs>yOr^!yj>`$xCP?D!mq`^_H(o>kORI}Jxq`q91sa?9-ZKSr0%ixc`&XwErson6b
z(cZe*<i*_N$KK}2<Lu7t_RsD3(C_-!>hat1`sVcc@%H%g`TYO?|3c<(Jpcdz4s=pZ
zQve1~aDdS4?C|jL`1trGJz)?4005RrL_t&-83n+xN&`U@1<*5-$&yr}ppBpk{{JtD
zg^gIK!V;66ccp2)0Z65_WqAbfcK&O-;|*?)K2G>N_4ZIzby)gZRrS<|xgpjKrlAUZ
zmxGnkRg&z|pGT51B+#yXA%=uImrW2ug`e^MlAsI~)>S_TWtf5cLxO2YVD`Ttc5OEJ
oU0z|`THE(40N?Y{=p8_ne@A>(9Fg(Zv;Y7A07*qoM6N<$g1DyQ9smFU

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-language.png b/core/administrator/templates/hathor/images/menu/icon-16-language.png
new file mode 100644
index 0000000000000000000000000000000000000000..76d3364004d78a0117e3224f67a74580234d36b1
GIT binary patch
literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007GNkl<Zcmbu8
z18igg6h+sL8m!Hz(b~3c+qP}gwr$%s$F^tc_TND=f9;!`kB1Y!ZUFv^?+Rx!R2y&S
zsmqV1DqD6YD6lt4L7YriX&)77(#~b7ru<Z}Ek@GoY??ggV4}3sqgD%tN)6(f&7dgT
zVO6e%p^w8!vW~|Es>?qVTuPTjAB-2`aDoW0ixha0FNa9i31glX$gwekZ(@JEkoZ)p
zJo}a4L?VCV>q2R3DoY3dIu#z|h_OAA1FI4lyla)%6voEtU>5FXi4jHB;8~tTb2&{o
zoD`glV^?LewJ@eu+5+1W37pHNSRX{gQeO&I`crW<mW9XJ0@NA$!F38e&lNh8f|WjX
z?Vkz+FsF+k@IIf9mEN_O=T>dvWeyLnWn$#8HE=P!A7yZANWntaa$>btCAjKVh;?mv
zpUc5C`;xDSX^`Po5*?T0sHhg}@GOHRAO(w@3cD;n=3rl7C2l1&!tnhSy8|j<PMuhb
z7wL4|OQP^d!Fu;X#iUoMFfzj`3nxM<;a<$aOzSLDZJ~WG9P(M<s+wVpRSpAJqH9V>
z!Nu?jztNB5VCG3uJ&a+<blBxpNY)=F)SBwoqpM(@O*>Btjs+B1EU-#x8*(=sMy9_@
zM00y5G_4(&Z<PXb{Xu*+{7PB49bG8|(32Dxc^qH0)$(~XVR1bWLvIHopDD#EyHptd
zNk-of!>Pc+=4_gH@(*v}V`}Zn&5o&R%cl`I?3Il{7rjZw-wVOb@Df%zS3cpF$JF<%
zd!G}&IZswtB@`OqFaH$J+3Av&{4}oO*e|Z}-_ZlPB=GdoLFJ+V0000<MNUMnLSTZJ
Ce=~Ie

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-levels.png b/core/administrator/templates/hathor/images/menu/icon-16-levels.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5a808f89bccffda4f3996c5bc82cfbec0f063b0
GIT binary patch
literal 247
zcmV<T00{qyP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002KNkl<Zc-p1X
zAqxUA7{>8|(XwK)9GI0wi?DXVvgk)J8Z5RYvsuAwa^YZ65n;vdCy?P6@GHDNGl|UI
z?hL;-{=>t|i0CixGdn#M6ktCXP_=<+^~iuCL^Lqo-Xu_jj0Ohla|RS4Yd7G_Qh^Q7
zNh8uF7hu3f7!cvWapHgy*l@rMDbbI>p>Kf_m~dd<<)CXUfPV-47kULyLk=>Qmv;fw
xl4hgLRRXo7S#MQ&4yXmiI`f^!K{h0Sy#N+5m558N-EIH?002ovPDHLkV1kJ!V_pCN

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-links-cat.png b/core/administrator/templates/hathor/images/menu/icon-16-links-cat.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc2a50ba7bb08352fbe88d8754184535653618e3
GIT binary patch
literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005NNkl<Zcmb7=
z1B@O(5Ju+|)V6KgLG3nHZ6j)Mwr$(CZQHi(`?@*bkHbsedS-T)c;Z&SgZYvv#(Xk5
zA4fZ`T7dXsU$ugqYgJhQ$ern0H`<TR+4|@{FNCe?g{4aR1jx1`mFy}(*5#A#bu5Br
zY(9R)RA6+U7ebbeB4k=DM&>0T)1pb&S>z(8v=V0NRmdu-z$1@5jGp6(L4GOe<zl*j
z!%7j6U5urMIdF>4#y9^wjGp6(MkYujV}{>+a*&#u3d_($BxL4diy=Fs$>fPj8b~o^
zREdy6xMx+tJ0t>j{*ees%EBRoRIF4>#%A>}-U$R16CofIi(gLhD6MUTe|$QEf<ho5
z9ScFWzD6YhTBiTd<9u}lF6U1WC%1Gg<BsUXp(w>2fAy6iW}$(wa4VeD_P~8zYnU2+
zM7zyN!0sTJH)uNWdtNdU@^Yvz=rx8z-=R17J%&TxFkhjct@Se5J}_a}`&QT;crum1
zcrg~N(c+&|3Cz}}!h9VTq}iIOe}MH4RoLvnd}ZfbX*#e!^aKuvF<;qv*O>{NPOgB<
vS<GAKvp<QGVW)GcLyo5~A4gm-O}_s>)>-wGnW1Tf00000NkvXXu0mjf6V&L5

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-links.png b/core/administrator/templates/hathor/images/menu/icon-16-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..52b4cb434eb81971cf4e661caf1267a32455ea3e
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005&Nkl<Zcmb`D
z1FRfT7==$<x3N>dwy_%34C=;76&tl}KHIi!t#@a37SFa3JEwP08z=cj=l|~98T>Fs
zQ)>i!4c6helQ(`+2yT>26Qwgc;#xc#K*7X?pUXL;iDHOi5sGUfTSLFj8>8BZ>qcY_
zulZI^A50Vlkv8}Z2Xfr>_YYI*?BTKUZi?B)FXe=uy-4XN5_`X4XSR<s)6>jS23RC_
zQ|aobG5gu)#C8`Vri+OF7I|=zg|03xjq-DQRtLMgyQ$6!$BmDPXd}YD&)C=)T`m{*
zrhA!V@zLSy&^y%$@frUj*h>U@zDrqoIZY-rO_GNl9UVNF;nO?a*$XXi-NY;DBf+LV
zc6M~KxWz%c-Ogv(HB2`7c`DQMY3`lo7z?~|5l?Lz!7V);A0KCYWveFN$*B9-eZgzt
zJa-tM@T{c}Pn)?pu#t<4i#(fQ<Kf6UrWcejwbe^Js{fM5jl@f{8y|D8bT6LP@pM!L
z2L}g<d&S%qSWSnwotLtkwEHi3(Lmvx#22}p6}U-A6B83mt2NQ&l9_LEaoL?T;#RuO
zoh;&66>&d55#P;?gutV5)l6-X`KF|iD<7zGGI2YFc#uat%oo?GiTG(Q2kpg;m_po2
mAns-A+)g5H#1?AZ|IT}Pbj2%|;%Ptt0000<MNUMnLSTXvyaA#B

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-logout.png b/core/administrator/templates/hathor/images/menu/icon-16-logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..aab064a4789b9aa0101c84c7f45f03010b4a10b9
GIT binary patch
literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004}Nkl<Zcmbu7
zMRprO5J3Mxn9TNaHkPy#??*R~E)d>@FA&aJIf3B@&IJtXFmocAnHi>2@3pYQNxj$H
z^$RWjQ(S%^Dv|Km+w*03GC+?$>+|PlzXYgcvH`fk(W6&sYJw9dz;z)AV083`+SwTt
z&^2pptOBwP<pDhJD&a5yeEkZqU&GWCq|<QrtWRs}fNE{cngD>jD91Q*1RgztH*X*k
zflLNQMxduh-|g)+u)Eu>PMq*GK*t;tcTdyY49}jy+M160{CT){53#Dx0|Q7XAP^Zh
zsyPUPQ?#|g@Gxv`A&+_}1^OL1n<ERHu>s@|qoV`n=JcZpD4%zCYu_7`<HX7U*uNhZ
z7U}`;D-Yy4XmBe4&}EyM`Jo5q*cRwE6v`evU~&>dp&y4JpH1aOC>*N+^zrc{q*Bn*
zVunzOzpT6fEJJUljMmq$1*yO-hK7)8Q~~)sT)bE=9Xr~x3<~RTAHbqUq{F)9<LMv8
zydz@)SkTJ31Uxf45o>1VjC{_?D45ENz%uk~LtHEWM$~}=G3B~`U|IeW_+!w(59Avh
We<+@ntAio{0000<MNUMnLSTYt4Ak@h

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-maintenance.png b/core/administrator/templates/hathor/images/menu/icon-16-maintenance.png
new file mode 100644
index 0000000000000000000000000000000000000000..642c5552d2a88ed3acd142f673c12cefb4949687
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002gNkl<ZILl*<
z*zt}52e=Q!3Q+a~AXdbth%t2QYZ%)Ai2H$fA`l+{;`eB31%cQBi1UHC5Qr~;4G7%$
z9Hx0c5DOsLsDNewve*Y8b_5y1=(F|_15~pE18D%{N=HWb6?Z|L03cpZq5*+Gyn)ei
z(RBu>)6ZjZHZB12jv>e^jMj55-p8R46iA6s_IzkKVHm_{GVSz#9JUz3LK>?1Jl1H`
zn{b3O1Jt|rQRW53mK~G@qIBIR%A!%Uat&n(iN9nyWl5Pke-UMwi9LHBMcEkuH?vG|
T!k<`I00000NkvXXu0mjfraNgb

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-massmail.png b/core/administrator/templates/hathor/images/menu/icon-16-massmail.png
new file mode 100644
index 0000000000000000000000000000000000000000..d460e1ad2409b136f1810d5a2c9c81526eab9508
GIT binary patch
literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007eNkl<Zcmbu7
z1B@M89L9fV=5lTCUIevcvr*l(H>}&Zj;%K6vk^Sowq5si?b*A!nmg#3WNNqH7{BlQ
z#luQ)7rpxGt6`uU=mP!(9;vUd{}@-EJAj)U$m8*BDk&+UtgMXL+1YS!Z!f?V197|6
za&vRT<>lp6R8(;M2aSBchc#t__~1#B$z-&prR5@k#|75{+uhY1h{D1`gb)BMug+mv
zO(CEE*~e=6eQ0Q?2RI5KBwU~<N-Pu#IUw?$OeRA*okrJnOw+`$A)XOrX9Y3lH2V7c
z`x+V=B7m&`jseawIXOuz7Q^cOlE4>xC{3Lv91c-aQ_JV$0e&16c>F<v!C>fx7hc#3
zpva2$8iw(vs;bo0)lsHQ;QwVGC2IusciYiVzJV&hqd+XKqk4Vh<m4d#?*xPbU|H7l
zGcz;JmCV`q2vn3J=4Z*Ot04XRQ}`skb#Wf`D~c$}&%x*OIrUk8#h|gV@eSFcdE2&8
z3qt6l<Ji*BjLm>;ll<>Bs`LF+=K1h@y=a<7JRW}zkk+nb(Y`bFB<ApMsKEf3CV|od
zik7N~Uk{Kv{Vt{rimEz=J@d{x?;Hb^YYkpb|Mn!liFe3bwFql$40CW0>(sv}SXi?I
zIBk`!#%c9iZ@o1J*dAQTkiJiaR$A(hnqq$ZHSP$Yr!AD_J*Z1NaOxz7C^0oPbrR44
z>x#kf@bJ*ws#O#Dt)G>rPQOh?*DXC2pVx9%_6?bpe`;^MeRgzo^xVaZ7yD%k`vL35
zQ5G+~^is3z#KQmo|9|+*nKJ|b{PWL<Jf;B?FkHxXpVL56aJ_s$4iEr@3z_a=T{*58
aVqOAU*(hs6VUsif0000<MNUMnLSTY_gi}rc

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-media.png b/core/administrator/templates/hathor/images/menu/icon-16-media.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffb9498ee2eaf0aa64f56aa6441ca3951d0da792
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006JNkl<Zcmbu7
zHH;iF6o!9$ym%aDW@bL<u1vbnR^g<t(p`DIf_;_tpia6l!!a}C(%9p?CyiDPRr#e)
z2Kjwszg>m@%)bO8L^^YhB@B-tP|g95knVW<_U(%5>gt0fB_$h+i;LIA<MBO8sS+WC
zB_19<dh}T+K!k|b*Vpf%&FhIoVlN#&<#`^G$t0rDC<EFD?{V7O+bs<&fFxo>+1|Z-
z@9p2eKg9>>i|~D)0TzD%dJbav6?E}2cuUWMvdMh{kI6_RvXQO`o9Rd9+kHgLD2nu0
z_<BJA=|l_U@=900fh5%E=x9$movthu^GGg!3tJ@%#Q=?B0ooYEVlljX_wJAiyBRQ<
zOlHB?8h+_^Anz20Ba_Viz}R9MQc6(DmGjf+c1mSsCCW-m;oH@S<j4LhvH4lP0qBD@
zEC@n$OH0cjH;vEvSVe-#LZK@WGwra69pJ_*aKaljHZ~5_)z!gh10APlOtygYyF|{9
zKo;)?#pyvPnV+BU%49QJJhcMp<USIufFbfFo8i;wmu?2YLN383<@`l8;Zqj0)>znd
zp11&53kw=(L}9ex!4<I1C(;uW6K~h7U3)+X=^ic=Gsb8HfrStPt{_j$8)MqJ2f17p
zfeE-AyatcPuwa(>1fW|=`S5qaTq>1%+T7f{P*G8FiJtNqz%2FUh39#;wzl@U(=W^X
Y1md_Aa6hc1J^%m!07*qoM6N<$g4v%ECjbBd

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-menu.png b/core/administrator/templates/hathor/images/menu/icon-16-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6a0ee429a6f002f9a34dccaf001af09349d17c0
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003~Nkl<Zcmd6k
z18gNx6hQA+oUCn|@w!oM+jblCH?G@QwPH0^5!AMgpx*Jk_jm4EZ`QcU8J)?QH#0`~
z#W7|#_S-xgdYGWs4NUJUFtEu6y>7rp2vAjJf?hX32?e66Owj8F2qi!W8}$FjE2O5T
zN2H{tTa#1L_J0y^Im1EH<wYi*Cud=7Z0x)!iby!6G$J7}dH?%B;K6RN?k{GNV9CS#
z&T||GJjb2i-r924BE@m>iRV!m6?y`A^`R~}+{>2;MqaG1uAV1^R76F`o;UippMoQ;
z?o1pegW<-F8_gW|65e4j7%+yB^F~UE?ngxbb_KYbmn8{AL6|pNERj`}<;~h(An+}4
zE?mCSeDwH<97&Wa*H%|vD6;JS_BZOU06k89T}`t_<<8D_sVvL$b2HNmfPqTyJ9Z;!
qkC~u{k7j&ovR}ilv%9MV&tCz<FTNe9l6N5h0000<MNUMnLSTY6JG0gR

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-menumgr.png b/core/administrator/templates/hathor/images/menu/icon-16-menumgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..88a2d1b3094b2594c42d827aba6cecdef0d69f6b
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005BNkl<Zcmbu;
z1I!&k5Ww;O-rIYwZQHhE^$Xjmc2I_mYX((RJFacpw(UNhrn#%FUovq<JF7&5|Dk%W
z>y%f!V6pjy&B6trSQq&d0zA!fa(b5?ja2tFLv|Dj$2!_}lngKUQ*l%ABqg2nsLI1R
zdw(ALjjr?$U!rtG^SW?T{**RNO~<-}sbhsHYnCL)9*XlLIm_nU-OUtFwB#dgC`G|!
z5efq7bQ+(55DFPYB2m6%YE6j(RY`=SIF3sylZErwZtsu}@|GTvDl-oRF=6K=`IQ&1
z-^#9IXFF<FgpX{?!pd6sT*u*eT-U|$JnyRnxop;tAi>>x_gKGSBR?V{IIj0~f&~rF
zbFR~&Acj=DODdIO;rs<GTDbT}34#u^>j@uq+f$BX4+`NM*0v}E8%Kl1y?y)UN5>R&
zp#5!rRJA}D$By7D84ppue0e5Kp2WR-clnm*36^c6Ht#>aqhYP89r;VoU%lq=>5HAz
zoRzD4CF1e<{3XxxURt(YDfo?}#!hXMO{YuSwx#(ErIf_tiJUgg^HWBTyc8r*N|`_y
jFaY%jpV0v<5pmxEH(2xtLHWYO00000NkvXXu0mjfl4j;p

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-messages.png b/core/administrator/templates/hathor/images/menu/icon-16-messages.png
new file mode 100644
index 0000000000000000000000000000000000000000..56fc7804879a43988079007b055fb329422cf2bd
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006DNkl<Zcmc&y
z1I*NM7=F(9Y}+=5TvJ1KbDXz~x%#qgH{>bXwt4t$9sk$+UiZ6PbI<nt@ml!rkl`P=
zfB$}=TCGmhYPE$5g`xmJpw((!otc?=3<TwOhKT?Y{r&xWE0xLwxm=z|4!u<>73dq+
zKDJ}Wtr}EBYcV3v?;(J%0mw0s@PP~iH5v_MGMU?f-%N(f<wBPv$FZrE*nIXC>x<xl
zytug7LKy?8OyT@nJ~DS=+1U@c{jmjPU-115BHq1wch}F)FZO4r?<<fb$xDmHg1Wl8
zAWGgM2cRK=86I4C`Vp_pjTl^Y2y^zG!?9a0-GSOIHVAOFghDYyskXNEPFPr2xw)ww
zdoMmlR%{rm#t(2;F=f+9yfD-wD##aOd*(twr_=EqE^-CVrluw%2+_fQFi{YGAG!G)
zryst>`iTRP5gSVKHVAM_w4nr1fx~1n8Cb~do12JpkKe;zufa=W1B?x==$n`1mJ1sK
z53*1UF_;+i`Sa(ubS!vX-GmN{9pz~;;Fe-S{JoA&rxSEU=<e=*>To!YWoKv4=L(!e
z$!4>eXgD$HQNcVkHiC~rG8qhpm(=1*+7#2YaN)uy0NRNy-WG_`y?ggI&>*Ah>+8)_
zjcNMy>9<(^8?wEXzeNjLZh@#L;yXhp8~^kc6fzeFP<otIED*}yWOljVKj8~x3;b)w
Siis-#0000<MNUMnLSTY=vk+JS

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-messaging.png b/core/administrator/templates/hathor/images/menu/icon-16-messaging.png
new file mode 100644
index 0000000000000000000000000000000000000000..33ffed14b5853fb694dfafb12cec52ec6a089196
GIT binary patch
literal 755
zcmV<P0u23$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008INkl<ZcmZXT
z1B@(50EWNnv1c{TEt9Nf&$eybwrwLg+qP}<nbEVyTukG-dLQ?7@|S;fK>+sEZ~(5=
zaIPK`fWZ#?#@TY$`&hB$2Ht&Q5-<id07I-t@&G=-%YG;AL?pEhC<+a=N>gNrVB5|p
zo-$Lu-J36;oePWrssI9#WYuTie~l9BJW=-qz1Zv^0FNI^MHp*<(+`?DmoJ|_l)v6v
z3XBS%%_3j*#tQ_ayMhk72_Xe+<4|O+jKlANQtm@;+U;DREPxKKeD7`o&3h(YhV97y
zw$|TQjIngsU`0cc1qiXOwvCH;7R-2L__o7t7eJcL_Z!-?xzY95V~^cYEEciZY{X(Q
z9-3X}k@?1I@_Isc8#qjy(B370og$G)?>q0jbGxdl39r|S-EKz+!3+5SPp)uooI+6;
z3@FSzATc0-gPwl+=_~sB`gU(=X(1E}5eNj(G>uPJHh5-<#-LvibSUf?7C0Ltr2PtR
zw~My6wzRnHvdbPk_uO-@^7(vZG8s9DZf>INPy8yCDt0rzOeqbb(P+PzHf>rBgx4^1
zN~ID50|N{X4^ykvtVMpmUy50C#bSx}_D$rtg+wCJE2d7JYE-LL!r?I4Y?j{MUKB;K
zFfua2vSrIHSNVHVOs>@p15H)w>FMbbpMLu3U!9$u+vf9mTrQUdb5j`|9W`CcB$Em2
zmkg66>-F31?d>T6?0WLaryP3PX{VlN5<D#}&BWsg%H^^dF}^;@ifx`0xm?~vcG5uy
z9kloOJ%GsI;9$SGnU_YQ(e8o%et8n>5ppb9vUJYEg$w_iF>}VxFTeECcR(4a3ZNYb
z0wJK~oO8~-@VMiS-D_1QQ<*tq=D(9BP5S-IFTaq4RX`D_0Hc5gAS4NJ1HRSpudcP#
li}OGUsIGp-Dqyhs`yYL@CRxp6N|yit002ovPDHLkV1h*tWy}Bo

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-module.png b/core/administrator/templates/hathor/images/menu/icon-16-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..55ba9dbd552ef4bad98f135fa89d073028ee1032
GIT binary patch
literal 314
zcmV-A0mc4_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00032Nkl<Zcmd5)
zLt?B!5T2vFqx2DSt+8$Uw>7bC8=E-Uf3bFPUbV_>+y4Q)D5F@ef#W6g^$%inYyuOL
z(^y<u#@hM@Ha52I&-BbJ6wN@n+CZh+$UZwTtsWFgRfv*`vGGaF%`akkWeo?1M>sh>
z!{y}_uCA`Jw|{`ap%G9t2Zj?m&kl6M`kI5=l;}_-j$|r}a-|N26(C3octO5XM4Mt!
zZ?upvlyIl#aCs06$GV;!+|~8L3~mogf4K)=&fv>E_|g=bEvoZ<J-AEtBMw>=`}QYR
z>#cvcht!)CX|@?cG5q~|$GiRFB$F$WL@G<d(FE}aBgE|u5ZiwPHx+&t2~1<)f&c&j
M07*qoM6N<$f^%<(H2?qr

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-move.png b/core/administrator/templates/hathor/images/menu/icon-16-move.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d709fccf108c6d89a0ac281424ca33848b14d61
GIT binary patch
literal 297
zcmV+^0oMMBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002+Nkl<ZcmZQT
z0i%Esh<Sln4v1xdm=j5k6DlSLRl|s`nH7j7qwP5&pDhx8^k}~D6%ZduUJ@h*k^`xM
z%CW*Ed4O1JZ6*JrPb)=#{9Z5i|8R%kS)iCL5UW73El3O`2T}u43(^DDo8-b7baRIA
zonJsn7=F4?<nz_3!Vhjt7rqO^AT~%0Sq(@JNH4>?Wn!;>trP!G4hHFkxL}&donLE#
zf+S#&9*|x{7?cYv`nX*D$FH>#|F_f#9s`QG0kHuTyMe?&av(K8weT=NiG?UT&d8_p
v#2!7GBX$`*7C>SkIiMPNEKrsXh7SM$t^~Sah?{!N00000NkvXXu0mjfT-0!j

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png b/core/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8f1ea8fc972676e38e219a1dfa662d7bab2f95f
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006WNkl<Zcmc(d
zGngH36vp4#;qG0<wyl3`vx{A)4ZBov8J2O<#cX2yW82QmUf(fu=8Mtq`#it%`Dg~!
zF76*|o{$OY+o*gSMZzYkhyoFQe^7%c`F^=WhYt0}k00NyVZ(;an~-YPuHCtQ{ra^l
zDk^IDzK_kDH_u+TZry$W76E}aR?@w$b?erxS6W)yxKX1<N*IRtl_-kX=r|4<H*P!<
zz=<CYh7TXUphk@v>{2YtV*B7YR^9hK<{-XTuU@^T0LqCR5fqV7C=?jBZL^2JKF(&d
zY+YVnj*l4wudSjkZ70p24xk~SaHmh7eol3_B1bHeVHk*OrE-wV<xo;m!Xh8M`3hT}
z=#cab3^#Ci?b+!M=Z`EGG)+_6v}wZ}$g<3`s8gp7Ow)|(Wu@JF{TaI+rx67a-qdS_
z3Oy|+cz;~oArk{ZRn?C{5Wsa^#A8`m8JqJw&z!{$F22no8vxJiw1VMt_>2hsi&79v
zYjhXhym@nlQlAoMAW0JI^!KjQ$ecD*IK(Q?RKairlvo-9&IdeK74F}^|IqV12!a4z
z*OAZX<Jvz`W>uL?=0z%%`tag|>ITh*&1xeS8Z@9Xin$P`@7empYa4`<Cr@4*Fkrwk
zy6D}zckeYd^~JYu?0mx`#3lnjo>O{{Tofj1w8~nB7QVi_?fJ>QM>qfiArTzmeIxqE
lFJ4Sk5DMWEdBQ}s>kB9~8gRJKOmzSN002ovPDHLkV1j^e6@UN$

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-new.png b/core/administrator/templates/hathor/images/menu/icon-16-new.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c4b8ba62b432d4c21920dee38e7058425b1e35d
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003sNkl<Zc-qC2
z4@3iT9L3`X3Is&(1Av$WiUcYH00j{OtOOFI&_IL((5^6rq)aF&L77BKjgSP0d`q_O
zuh+eEm$Tmv6g@sX-}gK=zv}?-EB<aEk#{tvyyJ1pznqcazJ!RYS>cUYTx&nzR7djO
z*@OfyI|!aD@NZT~<auMpPTK){cThQp1@Ui7a8IY;><z)Mmr3N^lSwdRhh1&pYkR<Q
z&!=Hm3kZEgB6?yUjDj6@wSi`(U+n#1G&lQxNR+;@!>%^a*idMc72InRS#s~T*on{v
zKFwYbr?!qPF^hZpz{gsTgdj~U`d0Lx@V?q@g&<8V`d0KmQI@-uEOkl<66_0;(5Df0
zwE^mFF_(W`$Vmt?5Oy+OBK0(HsK+_OsuvA;C>kL2yfM?B^1pwL-_#h#2QRw6iU0rr
M07*qoM6N<$f?O7zwg3PC

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newarticle.png b/core/administrator/templates/hathor/images/menu/icon-16-newarticle.png
new file mode 100644
index 0000000000000000000000000000000000000000..c78257d136e7a2c336b26fe891a074af74f9ebf5
GIT binary patch
literal 563
zcmV-30?hr1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005{Nkl<ZcmaKr
zGn8C$9EHEp!`imDTvSP&Cbn6{=ugm>X=9eLt!{1Gws+sWykD`#J?9SI%>C}4HWp<E
zY~R0skJEKMjwNz99Ok?;Gc$j)MDqYApaWWIY3XYpAD>NjyB)F3W<zY6CW@jkH#hev
zEG+EI(pHfR@CU+YXJ=Kb38&M!;Q8-^gM;|{`=9RW>Uy{mAnzLBX*Jm;Ano&(@0O(<
zU>U^88d@4$It6)eZf=&T;BvW67ZemcUImapRaI5d-`_7LK0aPTjE|3#m6b(WS{jC7
zh!L#`h>D8BS}3gbkderD+-|p+zP>&J0s`cJtUHB~kr6sNIwXvyY4T@ORb^;sNFXu_
zJUu<v2FP5kZIo6CqU$=&(F*)M#_{&=WC}k9`Z_T^wjr{w1rSS<yen2X%J_%pP(CQp
zDE-BRd-kKXzg!<6;dy)Xe#7V}VYcok_V@!B;}gtQzC-K&x;{YW+Sb-aYildBJyqC3
zHlrUaK%{QDi!1vU?#}$R*FaiBLqiD<4@cHO`=v6S`<&UPLOc(@V(RA&=ITD<9-Uho
zFg-mzHZwD`cz|Md<K1u#W1!s{`dem7Uf>>XVKVI)z|j0<(tseqXD#TPqxN0t!M1Zw
zI}xVIh+*<P<+gDNaL)rAfC9Jx8ym}zfdX@Y`5!7%<~Sq319|`e002ovPDHLkV1nlX
B0$Bh6

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newcategory.png b/core/administrator/templates/hathor/images/menu/icon-16-newcategory.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd4318c6b0202de509e7bd36dfcb88223df44a48
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003VNkl<Zcmd7Q
zGk7#X7zgm{Kijr#gzcdZsx)!>Xv^5Pot)ZJ7yGjr8%^}jY|b|3d4B7ic`*#n8Q{G-
zPjCsTLX5Q&Py}>HjkvErLHk3BfQ2aSpNkpiQGKKmb*Eqn`dj)R^#o1VxsZjxDnfs$
zdV;Eb6alML?&GQ_s6D|!-ANepzL||`ZZ^^ct&p{aDW6m72^!AtN7H2(B5sWYhxcDg
zPJ0>s&Re^Xt#=2}b{CqK+g`xG{)@`5nI#1Bekkub+7ob}XM*<vn)+IT@uaYC$GiXY
zSXf@g*U1ItGwoJx@m}6vZ@w+n)LqT$y_zfrja|`&&*O85;SEFa%(9(&JdQg^K*v0B
p-l7S1$JFj8qy!Xx689O78ry@1kxZvwvYG$@002ovPDHLkV1fb?p4|Wd

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newgroup.png b/core/administrator/templates/hathor/images/menu/icon-16-newgroup.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb5b82cf014f20d8396ec744e6fe7f53e11acd9b
GIT binary patch
literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008ZNkl<ZcmZ|O
z1Mu`l06_7#!R74Qwr$(CZ4PSN?q}O(ZQHin<Q(00|Mr{t#fF$Vbt(h2p|XY&D&I{_
z?zsYRn6kPu>*&g}BLR9JAflY5To;eWSBk}ANGbWS7U%h36?!%D<lwb41falEPd$|_
z7K<}hTye$S6q3m#0JT7J*0VMp4c%{fu7CM&ey;`qM`-N_Fw*JtptZ%zyKNr3g=Ot?
zsekwo0AK&-;*?6Q9^QQ!vX;(GJLEf-ZEgVi(@#HrY(8Zkv#S0MRuBaNS@&gJc^NTX
zstp|gu3Pj4_a3k=PrdO|$1+<0*67irzusWY6;@vD_v^{z1-d5r=P!%*R=Nv^I8VI!
zCtv<uqkB<}u+d~~?STg#SWi8ym6L^)sk(Wn)zF;37;10HndNo4EnJC0L1&}9Nu^S0
zmDNM8USH^sZyx%FWm&6P!bN;FgoOAFQ7%(+T^5NQvHXzG_V`lEFz%q$St*~Pqxau`
zAIEXlFkIJ_YyI^oYo&i8bR}UJA_5=N`<I}k2%lutCT=Z9_oS2nq4wElpMAHg`w79{
z6}3YZqgEl_uvxG44mH~*DBG+NmdM7Vbg$890DPwn9Xj-n@9WFfgL;FQSLL^g$z|1Z
zc){3?Na;8H|NiFln&hgvZ}9H-zXD*Z1ACtLKJdE%gwJZHUc1S1-a{)!{^RmbiYzs@
zBwKed<Ua(!znaFgRf|`C_=CZRZi`v@58w_3p(GS@(4avRmS17{{ZC!;1E%JIlmN)~
zfdEhkI%>^4`>d3j1RSqmD83>`jT&|4u_v5($8I_QjMsm!;58)xqT4~%&Lvph2uB0w
z)1FYY_5+zHx88c|E`Bn9->>yxy^`Og3B(PJ<zkV~*Doe7Is3FzpHV-c1n7Pcz5P#&
zDM=-D#T8eqch5cd?DF7)5AJm5op-JZ7#)9acmD(a2R^;eB@5I50000<MNUMnLSTXx
Co_^{8

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newlevel.png b/core/administrator/templates/hathor/images/menu/icon-16-newlevel.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ff0fb9a6bf766111300651e4f6cc0cc3a715826
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004KNkl<ZcmbW#
z1B@ME6o%nbM78ZUu7ldP8Po`B+h$yQZQHiDYuo0`{r1cn*KhL7&zWdQ-5Q-YuM}fn
zeh?$?nF+qfj#B3i+L!EPKbc!6W^5;M4R%|P3jaSsh<Xhn<^#mUFKBQ*{F9`%7^hER
zP~@h8<+6JFov1TeiN>hU5c7jkYp@XY&IeJeJAWrF{1Ud3L6Lu7&R?wlIUPc}3uKkq
zkkwZ}%nd}X(MnW*nemXOKX;tMpvd#r=TBC=AB(C#YtRs_4<SDq)dsu4du-fAk{WVV
ze<yR3;~{aSj|PU7J{o{3y#uIqdkSgJO3R)OnL<)<-Y}P$F*kW+wyV7I9}g)^ztRVi
zj4ORo3vc$FOKrh!St^4X+(=$9n*}u~_<-(sHwHDBk-YGu{}A?2g^O$m$*c7*goaYt
z6xyJlJeNUB4{7#C@0AQ%dPq_uZyBdDXkjNw^*Q@>2wSP4xx_UAvZ5AVe^fGk00000
LNkvXXu0mjf^0l|?

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png b/core/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png
new file mode 100644
index 0000000000000000000000000000000000000000..55ebb428d09174a46d14cd7df8bbd583b3b024ff
GIT binary patch
literal 439
zcmV;o0Z9IdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004gNkl<Zcmbu+
zGjwc00LJnAY}>YN+g9~h#kOtRwqEQ>A1D3UGUfKsm)XhnjZ^&2_`kae2Y^Gxt^HIv
zMR*o$e+Gnr2L%-}iSyb(=|v9;GvuKRBy#(axg{MryD$^%E`1{f3XYef?H^{P>M@Z5
z8S6YK$gQ_d0%wuUymz-nde}3?InvjaOM&bi?~$_;a{KM0u+F7|xscF-eSs~w@9GJC
z<{{yZhZM-$za9mLA*ai{jPBIi%r9SSY;v!}p%8-gHp%Ra-np;*FBG5cM#)(S*4w0D
zwPOhzErKjSQeUz8!Jt;0cMgU2-&lS<92GYpc<<xIe*b!xa_sSKz<HN&kc`hPve~WD
zaP~_P7_GQ@eyH#?QA>&b(ZAX{b!dlYHQsu;4HySl=r+6kHw3yB0X2FdonjZM`^#+d
zvBWwLbbg*6F<k%~?FzBPDi?+TrIXF|!hEVg_agHw@vG9YeBt;vI!_T{K3Ra_KW#lf
hUr(J^&xOFei~&o%mep)LDG>kw002ovPDHLkV1i{i&kX<o

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png b/core/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png
new file mode 100644
index 0000000000000000000000000000000000000000..6639ec840263847affb71b2d7ac3fe7b8016adcd
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003=Nkl<Zcmd6j
z1BgXY5J1<q?Xb4ezTC#2T|awm+qP}nNNYRqX7{secBY-bwqKoIbMKuqkoiYnSmyx(
z%q7x_2p<uEQ^h(2bzVU5;1&2Z9Drf^G|5&GkM{^fNE#<dOfqL7u=yC=tG7WrX_Q3b
zw*)$ffY{s<9@rJGLO|0Im}k$wA;GFTNn@ZA(=XjY8cR#9au>m?W*g|9io7HMi>x`Y
z%U=eM%1toC5vT)}q*3gE-H`kxfxuN;m7;pV6c=ceI(c8RYK3FyzH=WolxUDV26~C3
zz+yoa$1_cvqImSVBryU^8cQT*sS`kdesf@gQhM{80CZyqKtFB}<iopw1*IC%eV`c8
zO|ii7-Th;M7Ct28Z@Tb6L<;zrU_qMlz4)=9R4%jw2wEhcdB}!!03j9fz2s>JoIpHY
gDDmhG#ozN?18(l}r2aaMrvLx|07*qoM6N<$f*NtBivR!s

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-newuser.png b/core/administrator/templates/hathor/images/menu/icon-16-newuser.png
new file mode 100644
index 0000000000000000000000000000000000000000..25d4cfd2cbc89ac7c116d73694db26d3f076f223
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00089Nkl<Zcmb`?
z1GM}`6bA5bX0yrKTidqX9@Mt&9zOfE{oA%}+qP@l4mY#O+@`ks8~YCauJV%0F7Ti4
z(B0qFG~HWw?>+b@#QZDn@m}ab-ZP!Zd#*eAuM8rw?6%<uaD4BD4)I&QSa#ZL*0zh>
z&laEb{IgFcu0+5dbzFv+GTeK91_)`e!nqLJhJmEK#~F9hH3|aHw#L%wy?4JSl}#T+
z640`_BemVN8vt{*ER{~651xT`(ID{L5rCS6dR{MxHPw)&eu9EPIHJZF@vN`g2yTW7
zfzL`@Ik&1ZH}&)9BG;-rP+Hjz>PZiR7mtCvsssG@UIM_r<OtYbnV*O+^%u#uDO9rI
zer3o}{MwVAKjzjM%?Gq}`cP-@m*3b3@yv9TgRh7e7r{4-FQskIU<hogWvNUq-fo|R
z_j)7>FSOk#;0~=noPCZ#ChUP;T>tUtXRdue1^Wa981QB^%&skV@OCKAJ{7t=zh|l@
znTVahZ6^eB@PU0WJ_~6`fATh*PzXZCG8gdnkAK$ri7EIMWzT%9XGT>I7N!qhx*(V+
zxbGwGzYm-3j+jCaUwrbO(7$*azk{o;JlOxzf^S(+T?5Q1VK?y}cGus4WjT<>mk^(S
z{FZ0v@BHosh9!15wu^|cp#<$*^9;1mBlwI*5&r5!xL<q@9*G|w+xNh3$%otC9>1$j
z!_V!gXUDzKjCy(+V+U5B`{tgFBZ)sbmkO<;Y0t*NK^aDSJvo~8Za<0kXc?uaA9|`9
zKf@3xJqh;6dzU7s)A^&ERQ~Few7@`MoB@QONDvs9s=>334?gc*v)9ir_>pqglY`PR
z{vd$?#K0JVzTYGX-}1fk7JcZGr~Y^bKcjkP8`t6=GR`jn*!~PG!h(tbHz*%S=`SJQ
c8;bwa*P@e6A&!5F5C8xG07*qoM6N<$g0*pT1ONa4

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-nopreview.png b/core/administrator/templates/hathor/images/menu/icon-16-nopreview.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc79db627356e7a7da1327c9a44f33fdfc4eed06
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0MkiCK~#7Fl~S`}gh3FV*NeNTiET7--XL}t+qP}{?$*b!PbTbsed`?q
zJ}d$X4;;mZL}xZ!s|o5m^1e^8r?v+-ge~9d&-^`m<)vu3QMi{J5^$Kt>HRTI5JGI5
zL*sT0PT-txn+7t2l+wHaG8?$G%%%=qTmMgFHV{~0)78ht>wM{7z#xW^hrW!Z=!CgQ
z`^)2R42&@yfu8I3oaL1A&BC82G6SVlKhXQ9yO3f3pF1)GA;d5_hid=lg3R#v_-H<@
k$P8y^XBVb{%$D2x6KYUzF?yWx8vp<R07*qoM6N<$f_Q{|UH||9

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-notdefault.png b/core/administrator/templates/hathor/images/menu/icon-16-notdefault.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e5ced866959e3e8f215ddb54e79726d608dde13
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006cNkl<ZcmbVL
z1CZSS6ijVj+i}gYQQK~Z#qfqVsM}FGXWK^3wr$(~wvE@9)HwZ(vHRY>O^Ag+lH^*)
zD94+4x{9y`?y>HV(<;(9WGH!X#bm6$IkhacNFd=uY+-CLu~IlkINxgTZ#9C&0-YnB
zbD#Y_?_W0AA;4jKWKLw1L@EHY*$g772%>T$zC0tJt^Y5fxv%-%*z8zV%Rmc6=0<v?
zl%|w)jdp4DIt}P_IxrfI&^OvEO)E=F#LcsNtQ+X}oBEp`*oWJ%Bm5}8hM|ce;0jp4
z7jZ$Ul7mX6!cEBt==FN|0gKtf+#i@603XUH5WC$#IEFbMi_4EGm}E_WR4&C$0&*pa
zXjDH1jAkQahlU8PQN>iaOOVT+UsDe!?ZPs{3VO$SL4ux@SVe;t7&2NgBAGt21#F1T
zUmz9CdtXp$Q2W^2DA4gS-6*AuB{^;ai2xD{6B9Aw)x<&wNC}7@LVpviF_`7f!W@4N
ztFo9RSbP@vQob*U#gI@G+deuw4AbmMB+mj1$#gfO@3ulSLVXq_({sqF$(cto#xx3*
z?Umw`l9a*L!B!2Oj$W^W+?wnb`X3?w2geY{6D7^Xrj~&wMSMYQf?KrPS^B<fyyqkQ
ztn(-4Cam?H_1Xmm+!EZ*2BrkYy?XQN{J-rHtKWINyGxZ)6=W27l=vU6Ji4;y;<JlK
r7qWQt*3k`Do?SWp-u?Zy-|v3~2&Si4QBm~200000NkvXXu0mjf6G9r{

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-notice.png b/core/administrator/templates/hathor/images/menu/icon-16-notice.png
new file mode 100644
index 0000000000000000000000000000000000000000..59f8b36534c67db73a9169432041ed6b74e8ca7c
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00058Nkl<Zcmbu8
zCD2t-6ovP>5^*w~=tF;GoQ(8F54a`V-QC^Y-QC^c$Ms{)M$UcG-kteoZC%$5sEe}X
z*D-7P>y(ZCb<Uo1-r$0R$LH(@r)&VnEv;>Ez&di&u4sVI`;5oyjaw^R`MlTQh&b-L
zf&JFF++c^bV7FZou*-O`)OdJ#4fn6@aaHbhXScINJ0TiuwvlWxq|U`D(s(Ejsu$QQ
zHioXzU|o33nt&rNPYAqueh0u+x$0GHiU!LAMQ%?F+&r}gz*TwdN1jE4C4nMObjfEn
z4g%opra?TNmcY^~K1YMaDlCe;o0)KKVNU?g%qr0^tJqI*7N;No8>sPvg=#KLoraky
zCq_4C&-fB2rSE5YJ+jETQMiKixEKHOXkyB(BXa?`eRM95CuOP^SnN!Q21~QvEc2ps
zXPmC$#T@`1U)#%riLs|yH2YrKAsQf-XA@bGA?4MqjLXY<ab??Jt}N`#+d01Ey}vX4
zt3TycSt>@dI{W@zLk+srmvb}TOMk4&VXat`zhHIVx9VRgqQOqA%V&toY{;Ln&N(55
gs@J;K-&hyF0cU8%*I%p2tN;K207*qoM6N<$f}qLqLI3~&

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-plugin.png b/core/administrator/templates/hathor/images/menu/icon-16-plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..852c87dd9d76b358eba39a974ba53b46ede7eefb
GIT binary patch
literal 566
zcmV-60?GY}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005~Nkl<ZcmchU
z19T%%7=?4JMa@aFwr$(CZQDFr*S2ljwr#huaclEv@60^S`+kzfDsOM^O~pk;m&Obr
zYP?MM+RNMfQf6i*GBYxup`o#8Ebt-}-J(g-kEVurn>^}<O^l6G#|D=?rJ>*qkbfM^
z*c-@7iRpk{U0h_kBHC0~Sa@l8IOiacNCnf23PIdf)Oejhip8}_-RY#Krz1Bf2b!9i
z{nJ72=}=_s1fpcX^OZx3xe_>5s*pr42g`MRYM_hhqi)#P$Y^jn;>fwKVt+XZyyQ^z
zR|OmkRq$+7z%^5YICvo%oDU&4HK7A`a&(j#WPs<Ua7gIaX24k)Tx-=1kZY_Co>|*x
zNI>W}6Q#!Mk)YF&POpSM@{=T)7ir@74d4gLf?=Zyj(Hnw(gqq4;2RU*S#_QXTq)pM
zsk!#|?5?m#lC~Ad+6i{xT2$#!QTdY!rVas)J^{AAddIrs({9^qPzHB^?Vxr^9IOaw
z^b*urtVH_rsVI6k87)7_Js<5C8LYn@@L)-E@0#*M_ke4s41wo-RA|jd;rq#``9ML_
zCkmRsQNa2=0xZqC1-1!+>Td*%ra^#hF%`}FL}=Y7vP{!g$|vSe$|2Hll4jmaZHFu0
z6SUHo#G=Y~<V*E!o*TXse@J6dTbpDmKN7C(FzJ7*73QsM`R5M=K>z>%07*qoM6N<$
Ef{HT<h5!Hn

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-preview.png b/core/administrator/templates/hathor/images/menu/icon-16-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..e532f7d7b9b8ee8964c459521693b12428e47696
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001lP)t-s|NsAb
z&Eb5`;+NRywd3y3?ew?g@1x!8SHRkI%ixgK=9}5*ea_<H;o;KU(B|gm_xJah$dl#e
z<>%+;|NsB>`}M%&x6bOv!Q{A-(0s(@zp>q`ZNFe;yISD!-sI%uso11(z-fTSdgJ5c
z-0#~@uu9_M;?C&I-rnBz_4U)!)7910ulwtH00001bW%=J06^y0W&i*HTS-JgRCobh
zPQ?KNKn#l=&K~T)7|sWG=;c$36g^1(_hg3UcvV^zAYxs}g>hw=@AdlF==7sM$S2_o
zX#o6t*q*?ee;2K_1Ln$iv9p2v$F2mJ3)V-XZh;;*M(PWy{vFQ^00000NkvXXu0mjf
DGw-PA

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-print.png b/core/administrator/templates/hathor/images/menu/icon-16-print.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1b9f31514e973d1a0a1ae00299f85809307e7f6
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004$Nkl<Zc-qa=
zVJiax9LI4l!7G4PDo-h?5-KVxl~OR+s6Y(V6i6xJIjO4#ZL%9E3X^0sY}Iz!+_5_s
zTkTxT*`~E0TRAaHrAqaA_Ul{y>z@MPPyS(GZAnMcmriikjEu6|u&G~yftc_5HLz}2
zHsA5L;5k+%J_tBDJiyHO=*X`DVs6$P3I_2V<#0e%r~El!Bv(_nw@JciToC&-8k||J
z307BDpl(!xBo}W?CVj(~fG9o?FE0{e)D5*zDQglm)m39~pg+EOetrVa^BHo0<F4WN
zd*i0Y`jeU*ACh<OtIIAqz%Ue8)*YwSv?evI?Ui>Iw$l+gAP7EuP}kQaHPF)y%h3Vs
z=cn*^n9l(BcnjP8IbL5ws4Oc%OTOZZjv@u}a&pnx){evdJy=hUW82Tbo@G~D-qK-b
zX9KRq4)`Y0&|I7jO?eiYOS4f`kO@V424<$GU?TPJyLE6JTOkLc(I^oPhs}XN0A8;T
z9+rj6<%YxQ1VvGxX*zaw_yqxyB;7<J5fVV*|9GZ1h-&tBZ=YUn00000NkvXXu0mjf
DM83)=

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-purge.png b/core/administrator/templates/hathor/images/menu/icon-16-purge.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aa8a5e231f70fd63826246d714488f65e32a247
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004#Nkl<ZcmcJO
z1E?iY7{@oePIlew)=I1AYuh*LrDsfdwr#9!USv*oP1aiD+qd66J6L<CejWTV-t*rM
z^+DExoJ98hdgyMNs1GtsIiKaq#T@A1`lb3Xvxd4wy`M?pI*;?ui<KKmqTWxl>Z1&(
zcT=F;Ms87XjXX?)`XK#MeS{;T+)Xh?SiTY?%FP6;+)99QE&hFOA~%fjs#$O`%3ulL
zXmTmKCSQ&+IF8}^rF=00ABoZt$r}aIxiBZ44S|k)HtaIAogk5RL#(Nrm<5{wkT(4~
z`labwqqK$kH=qV_)w@qz@dAz@F8L}W^V{!STyQ}JVcrA6f;;~$k94(pOuEqt(v1#^
zT$*(mqA=s&5TMLr$+SK7X;_%D?-OR-FNGN=m_8>l4E%&O#gAKoGGRx93rAa?AG0$2
zxNWTx<R=|qdaP?-T_QhR&muq>X`lfkIBEr5LtdgzzAAV>P)pwRRkQDUtKj=obLji=
zzwxr;XzF>(LH1eme$aW|a)5i$euR0|d7S+7zxD$bY?XJ3k8o1}0000<MNUMnLSTYD
C0@nus

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-puzzle.png b/core/administrator/templates/hathor/images/menu/icon-16-puzzle.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcc02d53a26ec9f8c6955bfc5c09cb5746a43648
GIT binary patch
literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzGf6~2RCwBy($6adVI0TtS&a>=a1o;A
z4{#vATIJv-l9LmqDF=Jp|3f)QxpC$q2N$7s<E{wNZgbfdjT~%h)ObJoZhcL=dOY=N
zW}fFepJ%?ikK=isV=<Ocz$RMtf@|?|FLu$5X%w+tTWqoj2=S$!+w`JMz$<cc|Af8&
z2AGkT>ouNjeuH%^po|yH$oxEZaECz*Gzu{Di*@Fc*sy8g-m<l@7SN9=6_~UP`1#aP
z9AXG(*hjWbt?9c5o$(e{<YhBvC16t3RI!W^jN>vMaE?!TKE*0dR80v7Qu7!;2d0H%
z*|`r#a_ZhNCpBqg)Xte-0Z|m0>s74ZVRfIv7A7!;HMQ34{&9RSWOoyABlGXLm9PE4
vL&EocCkTQ@|5689P*HR3=#qfoTYv!o{*XOIn|5`<00000NkvXXu0mjf{{gR6

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png b/core/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee2f44033991ee77b05a8a74fd31576c4d1024ea
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007`Nkl<Zcmb7@
z1Cab?0L6dFW`p%P&DOSUn}fQ8`fsClJF0EB!_%O)ZMSFp)=Zjj=InbjZ<9^(@QGO<
z1Ih>`76}z7zw55ME?T{M_31zb;2SZW7uqq$9JBjJAAR(FUtgco+1crQ{`u!WJo3mR
zHvkq81iTYlNfWNx5l0-c<Nf#FU$fnI+wI5{xMtn|{r6v8eSQ6l&p-eC&p-;W<q@%O
z&6+hQKJ?H-wKItYOw+8|_n<?sUbBAVTld^^&t)S+MFF(+>(?K@Y}vBc0xlfKA(1VR
zblIQGlFHlI4!9Q#*=A2G960vaV=n|=2QmuaKjp0Rp8C2i9*AcK=!s>}RRy1>V5nYv
zE)DlS<gwYs4C6Np%F4>3fOmAc)C2e4-P|`CrbPD;HWb1>jgX-uu7Xt|AA4<8h7cEv
zMGV8(0nmkB0?dYnhR#SNf+R^~^935Z28kCWR5v}~aoBN-Qhw?j=FLAk`K~>VPm$>U
z^^04-eDuZ#B%u7KpMHABvaEfDfh@}iCK3sf>5N-nWjJfI`NKxq2GgjL?Y3~pr;|y!
z?az%KK)v9C3r;F6E!~+Bq|<3MO(PfxpsFhMe{}Ov%P_rVCVyA$NKDePGJ|SX@mexa
z=<V%o7h@BQ#bSu7SdCmRhhW@oq8GCCX<?ipw^=Mp4v%OWl7W1Cd;4cXB$7p<q9}}t
z1*0LIAw7iE)r{2FPcYVkWar4>*otWI_19lFoN>k(LMYP7=kts<N~Ka5iJt$gV$K{W
zD*hdv6af{yMLXg7`-ioo+qm4_^RZ7p`J}6^uI}TPUw-+?`|i7M#T8dvaV8K2s(@|w
z+wjDz``!5R_xo&q;lu4NyYXTmF!2PI0+l1zAfQh<&dP{Dybq7=gZ}{l3n6JDM^E$s
O0000<MNUMnLSTZcG-(_F

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-readmess.png b/core/administrator/templates/hathor/images/menu/icon-16-readmess.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5f30464ab0f2912da6a7f0e0adfaddd9063ad6
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00070Nkl<Zcma)*
z1F$4V7=XXw_U@a9nT>6$6#K4hp6%k<D%aVzS$t(5<CJ0>Yh=eeo!O0@Z}7X_{2$Jq
zJv)$o<2#Z+q4HN0Km&~3yLUfz^ytyUQ502$5C?#2+Q?o1)PM$v2@@t<w|)EerTg~n
z`#3GS=s3=p&l87Br7WqAlyU~YL;qc`na!IwZ#PYITwh-w`FtKt(`dKb+$?<bOq)t2
z0q8U^8<4*rfwp$-+DW!;kLwf~hCv+1T{$o?z=L<+PJG4fTyxvKoe^XXA3nVBms<U2
zMfkpdR}ci;cH3>F4PjXps;Z(WN~egV?(ymOW#U$gG;cJp8Sqp<pZ6@cJyzOv=bhi|
zM|^aOdaX*aSp4-X6bgLz!K+;R&N?3XVl}sv2Jc%rdFT^>rVNhbwuf)fKJK~wMpR)E
zH(Gr2Z7LIqAI7Mvg54ufWla7?Fzi0UQWf{(uh{!aV(a%@$y6`v(07G{=rQ3co7=8-
z`7=t|kZ$DwNE8kCiys*NP-RND14SlC*F&cBbBlEfpEsy{+v-ZM5p-pv=+gMA(#`4Q
zDhf!+b$Y7E;@2+LK%I<Z;*~<a`Jf3vHm6bj3Pe_;`Mt!>n^?NQtAv!kami-Tbxk43
z83|h8A)5hO*v1kGx(<+#6)K(|VWm>KahemQxvAewNF=KA`2wb<bJ}G)2D--oB5p&u
z6!Bi6Jyiktcpkfi!PNiTKorB5HO@S-gINl6F;0!(xqiVDevAPq{0kR9=gqa}c^fDz
mzrPDW4lw_#0U!ZF!2J;jhy`Hr5V;!w0000<MNUMnLSTYD0y-c7

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-redirect.png b/core/administrator/templates/hathor/images/menu/icon-16-redirect.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a30b15b418e9613f5714d9cd0562c13751a0f7b
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003^Nkl<ZcmdUt
z155>A5XZA^n^O(h)@(JTA=|d5rlxG$Hs;*aY~-fvu00!5-}ZaBKOXK=kpJWjc_Y^x
zG>PyQAizNq4TFtp79qI*7EJ1vX&57-Al0IA6~fSKj2TveZp93E^_+uS_W=z*kuX7F
zqpEpu?brdw)-BL3n<8)6Ujed-+!|HRfjKraN?bU?7RZlD<t*ryPLjTcR8p2iQ$&qn
zx>YY2Aw#QxZxBx<jIbtSrp9ZcvMdq*fiElkPfy;EjyOXA{Yiq1II~8ckxE{{9kFAq
z^UbMikG60`B|Lxbvt#=XST(H!YlU=+882Qa?9#ahHq9Gkc%Zd%6euGj#x)DziI>f+
zc8NSc%zF^5Q9KTg7&JozUzoQ9Z>??J5@=$Eb(K}}he4}g6qNCqb}iyRiX^WZg3qi1
k7o?YiN)ZLgNCpRXzc|s}1oDi4egFUf07*qoM6N<$f*pLLvH$=8

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-revert.png b/core/administrator/templates/hathor/images/menu/icon-16-revert.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b6c71f365de5fbf531049326be6aadf02ea151a
GIT binary patch
literal 368
zcmV-$0gwKPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003uNkl<Zcmbu8
z188+|7{;Fu@f)+-vYTz&PA4z7>}5CRG0(PbW%n)f`lgHjyZ4-XIOC~bf4_K6=NA#-
zC;E+7<k_o>a&On{yVt9FzZ}4G(o~1vzy1TrV_f(^f1%2I-4=x)$r&XO5Q5-ZD9eLC
z2x62m5RgY_bmzr`UV-<nL(X;&B8h>Hpl%-b0TTq7d;4H=uh9b07zD+TAV7l%MCz#S
z>FZE%$p{b-@d%1O1~Mdgv<72f%oPx&dk~g7>ExlyvtNHmK{19PMJd6E>LZ)B7of^9
zoGC%b)hboL{0iau^9%eimRTUB8p?%PLGh@!!{`;56;ZY#S5xnrE8%Q{=Z1{71oL_T
zU6Bo2<9H^eDkF&6!dE27YVwx@@MF~*=Ia%xk3$gioeCH-0<nJlJ3j$Iee)h<;^US8
O0000<MNUMnLSTZM5Tw2U

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-search.png b/core/administrator/templates/hathor/images/menu/icon-16-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..04cf3852aee95ea79ffea22d9557b1d364ea73f4
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004iNkl<Zcmb`G
zgV`ft6ot2hl#miqLP|&pDJ31GgYdU)E4FQ87!J<f$-_0r_|AL%>A!9chr@V(e{X+y
zcz8THIk9T*zb$@!eYIz6EhNTE1p0G?S}dME{Mgvou>Vs0^z>vY^jN(0mdJ53s-lbn
zFT>NFVdwM;<cayGfOtH?ytb#P2r{^(ikYlJkW|z~1&>um14MobcnQYf9Y`3=6-Wx8
z0w6uc3l-s!qyg|#z_Z7{0`zAJmR|vUP4?G-NF-8usSHtI=3ps=DTTn(y(UPw3#H(4
zxek8?F!|$Yyj2Fsju)tsu*69S)Q31dzr^0&p7mSRw-7U(OfXYKpwvVlnFW=$a(jEr
zoSmIve}DgRdwW~|D~OIxV>B9FovQ@DyjZBYaDINSL71JL9m5}Y===NoBXuV(E-r9*
zc&I^4e+2OPd^(TE!%)NF>gozdM@I~KqyHmFFc>s=y<X<|`5D*O*El^rwf}J_p-{*`
j-b5%bpyVF@mkIt1coSBj?!!zS00000NkvXXu0mjfxE09k

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-send.png b/core/administrator/templates/hathor/images/menu/icon-16-send.png
new file mode 100644
index 0000000000000000000000000000000000000000..188add672da15acd22822d762157285430caa981
GIT binary patch
literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005;Nkl<Zcmds#
z18f{%6vxM4wrwlc7|dI|MGI%!wr$(Bd$n!1XWPF2zW3D)8)q;1o$vS9<v)#rf`SQ*
zrHu28cZ@^^nh5In;{_dmSX5Mmii!%<)zv{L6yj%k6^{Kb!MnI(5(qmAP+eV(hK2^n
zWHM;AS{Mul7>z~_z5bRX2F3IEs^%&Nv=b<mN@z41==FO3CzHtpv)SCj)1*3Fi>k(z
zpdyr(mV(-AD=3smBrTcg&y_+s6dFBjHXAG!3w_4F)9G}mtgIx#{<eZ3DxbbQ_9h(1
z-$r2f(;#fQ^Ao4uN5N{fBD=gEMvWBClB@8=EQK%o7~J0%C0gIlT}XoSH8nL{aQSO2
z7krG%VS*n_6wGB;zs19ue-Yl~?eME|5pY}Js|$wZ`P8B=)K7VNId9=@R3@%`jl+l7
zY&;H0ZT$21cx=4*0q%&k@D@Hsa|B#wsP0Wf^UnDYe<tSfHXa5g<4;N<@12H9)mefz
z!SQJcY=1YyBh7^F!zxsqAC2ZY80B&~R4Nr;CGDPWfNp_qf)WU0ZzNiuOoZ<CSSYTK
zLG^`E_`Pk&o0dVgxwOQlqdMPojT7iMEV`=iPFNwkJ|?XE+{pCb+lC%upH1(~g?DB2
sWb|bWXG~(u?5v;%qc>v+V+>>RKViV|r%OB`OaK4?07*qoM6N<$f{PXe8~^|S

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-stats.png b/core/administrator/templates/hathor/images/menu/icon-16-stats.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c4c04596354afdda452a37e1b90915f72579db
GIT binary patch
literal 270
zcmV+p0rCEcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002hNkl<ZcmeH_
z18xKX6o!iflm}>U&?C$ddYi^|gW8SLuy)tBZQBTE;(x7hy<2?A7rs1C^o6BUBe8sL
z+~~+N<LX3>#XTjuaeha!Qcf_v#z&VD<pffh1n(d3u-dF(vY7DseGrL+h$muDsg%g)
zvt{+_d*qW081w@8i!od-y^-MHU4UCt9FGi6=Lr-_C3a~VTstYe@MTD)(ok#EAW0H7
zn+-MGwnu<sz~fRNl}`7egVqH932xrm_%H|Y#$<P%K(3JKJAEXd&#Nycn4K6o1x#dG
U7BFs7&;S4c07*qoM6N<$f{%!ERR910

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-tags.png b/core/administrator/templates/hathor/images/menu/icon-16-tags.png
new file mode 100644
index 0000000000000000000000000000000000000000..94411880b986e3f8414051746267f8ca336885e1
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005RNkl<ZcmbV~
z1F%+66h_w$&&alI+jisZM%niGVU&9sW!nwIk8B$+8|So}IX8P<9PRa83jay<>eaIV
zMdUx_zQAxG_*VgCS6(aPgua>lTZ17x7Bw*i$^<3-Ch`Z-yHXW^QXd}haCIV2vlqof
zej;T7MmRAGjsZnO=oIysq?8oa7w=ByBb&gOEApM(1&9ZV@D<j=<Z_{O${)h>=g(<7
zIe}M=`x3c&R<htIv*KzJmcACiSe2|c+PZ%9`<Ik|c9sXeJ)EsQ5EBw{CD($U>ja=!
z>V+hMzQz^XuiDTnK0+=Z;eAAQ-sCB*M;W(HLcz5DPo%)YQ+<IX`!o5@88W6{<yq+#
z=on)ySgru;z@`*iF|>>1j1LCXsNzXRTU?v%<R%^!Z_4|O;g3aF2P8h5S||9`{}3;+
z^A05$WBUH|4xZc~%WeO<yJb4{dp)P&V;oMN0qhfikVyyjT4S16gUUt^^sstWX<Bvf
z*x|rPpU?OBE4c~KS?5LyfQ;ImMTNcI596pxe2bv_=cfZt0DxG4PcneuF>+THzzbQY
za##KW!Qn!R00AIT17`elfD5St4A+2u`~@EY3}yRZKC#{o00000NkvXXu0mjf$F1mI

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-themes.png b/core/administrator/templates/hathor/images/menu/icon-16-themes.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f20de7b9553589e85bd7440ca78c0f00eaed7d4
GIT binary patch
literal 348
zcmV-i0i*tjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003aNkl<Zcmbu8
zH9|u{6h*0MSpjRIWfhdHgN`1D2Cs1F;_mM5?%E*#kvnm>;yj%>k)LdsOs2Ky7H2JJ
zNzS^0Eeuo!3mr<M3nA3onPf;H(OYTf#<>vBa?7|tpf=L>!Pi1O2sGmYwZTMJG8bLS
zoLz={X=f&P6JMbn7g()UDwoStC=_}Wi$yj=&gb)tpPwIGoGid49LnW#luRaBMxV`Q
z*$#cP*_<xG0Z=NHkcTcp)O|NI-vKV;Fb?7(@~C90pjN9<rBZ<emr##=7u9NYvcO@{
z5QQ!oT<np!yo|WuWt+0OokNVt0+(4zoM5+&Vvjh_aleng_G)S|QDCzeDdUkc(q1Jc
u1EyY|2-=W)j0!f<tn+8;O7@q8-Tept5i2DYZRwo=0000<MNUMnLSTYJXOzMK

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-trash.png b/core/administrator/templates/hathor/images/menu/icon-16-trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c100938a66043fcc0778a1e2f9f4f7bd450073c
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005RNkl<Zcmb7@
z1FT#@6hP0+vbJrT@x~kfxN+mgWl%FtYTLH$2DNQ-`So-c`F^{b^du8JoXepAexMc5
z1!xa60=)bO&97g-zUle%=btuh+H`j5(xo#hWC1`?038a2G9R@$a^%Q?NF*YkKYx~+
zH*d<09XmFL!{J^zGif+})%y|a@5`hEk7f4Z2QqE%9htD|r0hL=T@IeTD%%gAmO~eA
zNztlv;wf76fC{QiEjzaC8f@H<i~s(Sh(s_A1F<cRe*OfOfye8kVN-|3t=iLb?9d@E
zkJJ&UpYI;D>d}5^1D_v%lg5ZR)WoY5?SekEln^idx5Sk}uyNC)O<S}W+A!E0+i<9h
zPeF%zn)1>(>hrf46=*6D+r~^EuOcT(fd{Z08|BdtTmp~}re$R!<wT?KD1~9$AVl2)
z;e%mY`7@~aIFqGgm~MfXW;Bz5CvOI1-eog*F>jo^gqN!(J+REQfc!ns3erJb;wlWw
z&PGvrGEmtp^p(5<5qYS|jn0TgC@(M1nSmeZUlNOmMo=nu1|TH={{2~TGkw&#6vmI2
zPY&H{++t`#2XLs3r4@0zEdKTNvkMhB(#)I`SpdXhA%JLc00000NkvXXu0mjf2axG;

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-unarticle.png b/core/administrator/templates/hathor/images/menu/icon-16-unarticle.png
new file mode 100644
index 0000000000000000000000000000000000000000..793ea003e9236f2503c9e0fa7afc4a2934b72c8a
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00074Nkl<ZcmZWo
z1I*q~6g};G?dRFH9cK=PaEpyO`r~A=XWO<NYtd}m#%H#DyZ05-X-;|XxvT`?+VvZg
z4PZ*OT8#rRgcQi-@^D=jwrwLGvmu1k&$U_&o<c)P^YX+A6ArRKvqHWwy?_6HbETAE
zvSFjqfMJ?w*`fs`37T}z?;WD+IJk4~{$v2B<o^Bpo7%K#J(Z1p8c5i2q|<45o`;{=
zEHZR&SyDeUlmes>EdV48$8i*=%Mm3RS$-A~6<Jp*745|LWUp<%egF1t$l$?4&1^PT
zg#jonjmVJ65&6n}5JG^#qKQNT)mlBt&*rmdPj7N<+Ch0fJ;n8Mw16(^^*Rd0q89z}
z^CvYn<_oM_w{ETHQY6oJr2DX0p))-@P;?XvMZA3VN>3t_$v_M2+qdu97lO+I<m5a1
zksIXfUmYzhDE(9_jZ`ujHB=IRe)#<9W42UihX8EQsa*$Zs-;UyB;q>#Pv1Tx#LG8t
zBZ1<}=U1M!Zj%{q7zP-ZZ#=-OcX_N{xQtRw<J5)o*uHlQrcD`x&K=r-?NYWG3DmlE
zZuz}`zn%y&YG_|vA(0(>cVphnS=hF7BX+EwAEwP<kw`#Uwyn5s9$_RhydRF8-iHSd
zA7c2x9^4Dw#%RPLSOArBg}WW8`U|5_DV1qlad^6sjW99`{Vl+L&L0L$4acRK|A3;&
zcsjD?e<grMNNW&$<o7{_u|yL0A3lL4Exo?NFM-AAo$nfiLieXnpIxM%svAF$8cd=8
qK>iO{P~RIwA(#TYcI|2+?ED4YG=GjfjQ~Xe0000<MNUMnLSTa17%->+

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-upload.png b/core/administrator/templates/hathor/images/menu/icon-16-upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..41549c52ebc7190b9eeef4f6b4c20c8b59473a87
GIT binary patch
literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006&Nkl<Zcmb`G
zLvZ6!9LJOCd2R28|G0Lewqb1>x8-eZ+p2BbHqUF@*0;e-Qq7+FnR$Ni=SP}T$Rn$l
z+K(~v!^Zeu6UVHOIIeFA;}-B9=f38TQjU>_R+*4yW8=U^^PmyI>$p)1ME3I#P|t)%
zAr)T5RD`s$5i@Lt_)$wphlycw->UgjHFvLE5;$P`I&y%IpbjS73n;iyw+~uAefxlf
z90h#q=m_a%BYMybqCTQS^M-5?;MmE_4CxWTx0QfAi-PijTukQE*AIxvRKTN}0sjs*
z!h6g?Yomu41o*XEfA(r&Ls7&)#c&>G<D*7MRJs!CN&<du0*G4#qXq%Kjh1k$XTvp@
zfq}c-c>MAqX5-oW$8gPK=<doJEI%6rsH^!<RI%Y&!h*wP3NDwQ!gS1bt%WF=4%cEr
zch|4R{*OU`qLin3%+@tg3IkWF&tN*XXDQlqL-VX~_-zp2QDXm3lFx>=Iox94a@9-$
zR;MW1b3>DrIKDQzP$YdU&Spc~9B(smvhu*R0Dgqcc^Y(gve<CR6~M7TSY{9)$&+nS
z<XA$O#)4B40lQ0dSRSLm{Lm&?XqxqD8XRsiAxvdKoX&wV-{}`8)0Rh?j5<fr;F@U$
zVG;|%+l0O)>6&3JN#VjfR|;O5^^TeU;L>6fb(XrwD@*v-IfV~N5(mN?1jIMlkS1{<
zOErUgw&bg6lI=Fq{}89BWbPTtR*y{itI%xK_kb+rH;+u&V@0|$+xnJ-Ak8%s35~P6
TW@OKw00000NkvXXu0mjfrBN^H

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-user-dd.png b/core/administrator/templates/hathor/images/menu/icon-16-user-dd.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7ab24643df2310b4b86002995ff5765ac7cbd22
GIT binary patch
literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005fNkl<Zcmbu7
z1MJ^G07hRi+qTVkwzqJ$y~UXqbG8=@;TC6RFf*F|w)yL|cenO$^Cfk^?|ScQP!SIk
zmLNHaRK1Zh3?cTjrq2T^z^EYH8fE-L>efgPv;jh-A)GO68W=_yOv<8Jf|7n%fagLe
z7d+3uR#T_|o3bd?8zn)if=z<wZ^3kc>c2p$Fn^<hEv<$H@=K}FRl&JZFKSk>tVdAr
zq99lt-aGP3%^U!D@-|XVDJ&S?Ao|+Z7qj-EbZZ@Q&{Do=u<-4R(#v=^A~3zg4^Kw1
z1R+}EN_ra!ycm2{b=UEx79uD|I|A)`#~ZEudMv--e$+a&c@ooZjpsp5HaLQy;91`b
zOjKXcQen@3jQV{K_46_+Cj_Q3HQ#|@p7giY<YYm%zX`W+?o6_N;x*`rIdB6;qn4QM
z$6^lN6ohfov!|E^E?ejSFtW6Hf0L={7;Q&m4d0qSR;Te;Be$bNf}|{$`~uevf)%X2
zB-Lqv{&s`VrT+PT-=8M;d>=%vLt~3H3xGwteCsOR-@ucB%*J>Mq>CdpGwpAIG!Pl6
z*iXpxND{NWunx`b?FKa<=VHHoNO@FC)mmvydPu!+rC#6XU`!bG<v$1zESe<;iX{L5
N002ovPDHLkV1j3w?*ae-

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-user-note.png b/core/administrator/templates/hathor/images/menu/icon-16-user-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..d634a59c81f47dd9e0e8598858d3bab2d8d65918
GIT binary patch
literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001BP)t-s|LKMQ
z`rPZrMeEX(|I$|f@tgnly8r#{>(Dd*^RfQeXY0sT|M<@9r5*qF!vF7&>&|-r|NrZn
z6YI1x{`$rL=6L__$m`2x|MI5)_sIXxPXFj-|KgVG+`RwWe*ff57)MEz0001pNkl<Z
zcwSx0Hxk1z3`9`?%t<*q-v5>cA-d6a|II9nx54;UN)5xF5|Q_wLE*N&J~3(?V-(ml
z?;+Cy2)tDW6^1eAe4d@PHlToO9l{~7JI=1=VUQRSgS0XIG7EH9_psUu<mzAgX&U_d
z3x&ZuE5O}gafq1D&;zU!L*fz9JeM*}6>j?h5O57sY;yQm00000NkvXXu0mjf8XB1P

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-user.png b/core/administrator/templates/hathor/images/menu/icon-16-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..51f4ba5110f5b15f274d1b26cc37796e40c54b36
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00076Nkl<Zcmbu4
z1MFov6vn^y_Tn*lSliavwiS)-3C9Zm(J&Y@7{nRdwrAG%KEHR_-ga&8{-U<$^aK7c
z6u;nu>E!<W>W2?|7rXG_Y`fs2rT4BmJ%pJ5NZ`X+lxcCRSL}sH+iFBI-C}z7`TP5C
zFQy0JFJM0@nL48edqz1fMAZfi3e&5_QYq_6t<}i;Q;i$Pgq{DWw0ySrhY1uHp$fz&
za9x0NFwe&4Rj4~p^dIu#lxf#qZdU)C#`JOMGr{~rfrsis?$^AX-j~I)7ILU+85heB
z8n3@P>4~RadNzCiv#+L}ZqjNdizS=>VTF(9>ko5J-s|V9?<5jNJz;zDgK~s_5`(7R
z{D5f$a0R{Bh{f+0zZLj+t~QuOjp5O(*@T%aDrz<i8IXI7nn9f$39J+%Ou{MWa@@6Z
zze`{xBWv`yWoZ;3LLlT4MDs`!?IvC<9mjRn1sPI7@q@PxbH_gaJAsT9S}JrPxPp`l
zCIZ+V#g{(8J?>j@^~P{y5pM2_90*AQDB%Y*0BHNDY!4~3nMi0bgg9P)5Ow8l*z9+}
z9r`p#D4@6pW*Cp_rrDgn(xQQSp>bJWKlRaf0x_meN~zATKP4|;{@nU%p*7-}eQ2TO
zX$n#SB&b2~02*Ua!?GSV4Wm&g<kP|BBO3^QOZ~15XoL0_GNuBN;yVH0$2A24`rXy{
zeYdh^ew5+2-1qo<)GchZJ+z^OK1c|DwW9zYhVp$LiakF{{|-86dWuN-j8f_~01tzZ
s2mlbJTm`%fO0FrX-c(x`mGFQ08lI#J9>5bDga7~l07*qoM6N<$g5(`GwEzGB

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-viewsite.png b/core/administrator/templates/hathor/images/menu/icon-16-viewsite.png
new file mode 100644
index 0000000000000000000000000000000000000000..121997e531c4c634118422d5e57cbf6a3e83ed8c
GIT binary patch
literal 288
zcmV+*0pI?KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002zNkl<Zcmdth
zwLvUV6oBD>cSmuT80!LwX=Y;_GPD3HAfyc<qzK$){G5wE+@1GjV|R|`j4^yf9{AY<
zEP#ornJN(}T9(CY1t-D$@KFDf1+clXS<H9z4(BSGd98F|whQR70D|BI%WooI(aLKj
zQFxPrh!V!25wGTn-W;GR#F-&Wxu6Cz1J8B1LFH})Zo%N%TvOmUhP?>nk%MaQN8npf
zaJZw~f#!19k03}P%0LuK9niZG$VCK>&7(>lxxXfII|9YC48Fswsotc(;laVu%G?-M
mX$`MovWWCxYYE^#Sf*2ml5DB2VQo|Z0000<MNUMnLSTZgfPGv5

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/menu/icon-16-writemess.png b/core/administrator/templates/hathor/images/menu/icon-16-writemess.png
new file mode 100644
index 0000000000000000000000000000000000000000..f24cfb3db904113c0a68ba84adf17bed09d6f746
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006xNkl<Zcmb_a
z1I!#j7_Du_wXIl<UE6M>+O~e%J{!Mn+qTZWu&*<l>!$XX?0BALNBoy6a&wze6A@9_
znwlE<y?wD*ypViX$hY%H02_;9V^P@DgzCP&XtFfYb#W*8WOBJ2Sy@>~N=gEmzxp1=
z$cT)Lv$Dc;*fLf@leVHtBocKdCnuw-stVGgRy-0{qPV(=0vPG}Zveu>!}n!GovC)l
zjlhSb5iphRf=;J{Ua!ZylvdE<=QJ@Y_<a8EuRR8+)oSGD=c6m@1wMf|YYxI_G=fvu
ziPwqE$f)W>Wo0FVLZO0HK`w7pDwXK#>qCEkKf1cQ(4Y5~1##4#g~?>1K#Zb+fdSA=
zVq#(zf3BdjrKJVK!^6zi+uMt5@oiXQ$Du0u3e?$!=ouJd>}WI^<mKf-AP_ub0Z3rC
zY07jnv8V=@d_}k(D8c&>AKbWm341Ty!t=N!7J!nGJ6)gKm?4!)sSQTv&Zm($_AU-?
z{A8Sc7Y%=L3b-kS&}y}e!utAp3eZiij`>_gRB34`!w`{Jz<@lDO+;2%En}&trw0`k
z6`)T`LhOl*jC?|_jb#Cdr|k&|2^bt4M0<B1`-H8nt;osA0aX|m7nkVf=60GKpHIH&
zEWl?fx|*At>1)s*h_cbJdc(rP+%I0dxQ!f{OTL-pn@qlO<Qw%hz-{_O^y6?ipR>&-
z-!$?~bg_<N1N^%D{r#8SzI}T=8P55PZ9EN(z4VJ3<&rnymu#dy0%T3Wf#o%gS^xk5
M07*qoM6N<$f{sQnXaE2J

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/mini_icon.png b/core/administrator/templates/hathor/images/mini_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a2a59d2a94050d5e2cc042c4ba5105ce1161b3
GIT binary patch
literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq000jF000gM0ssI2f9TP;0005sNkl<ZcmZR0
z|Neb@d%K*R90P6ulm)5*s$>9C>?{m^IaW0*!v*9yF_l`Y3cXmC+!|vER0-1ORHiWR
zT<!Yn6XPe_$eZ(tsR#fS@o;gO8EE@k$X)Al`hRiq|2<_;`(3JKBbO-#Es&01qgH&#
zHfWKNskg|Au0oKawf_I78vO53{ob#Qu+B75G-;ErcbBrTGlx%-)T6Db|Bn_-4-_u4
zWPQ=14b)KMEQ(MKbaClXhvfQLeJ-{a?Y93nc|Gxz?B<dXWMDa7sq}xQG0<-az$wBQ
z+$}!oRQB3QephOgWAu5_7#RMmDBbh2zgD0*H$oVq8Ugstbz^s0_gxS7PtXDJ*?G&g
z%>KJNe<;l`Rg^(d$|NYm61z?~AvbU;Z_IWnjX+u6=s67KM`EP3-g&zptgYwb=SNa5
zr3sW{Fe?Ju=uxE}xO5j^$6W^ZG6p8DeLS51vr;9vd7vseq|`#17Q0P4#t=DGH?%oy
z;&HkDyUA|pyF~fdN{HQ&mHnBOuq7cJ8ms&{E6lo%YuD}IF5V(qx<x2$F@w5&E;s8_
zMVXfx>L0Z<-+4Ix_jd!T1jRh7fj4{d0<PS(?Dh#j&w&sF0~Z5>Bp7u|hyyj80w)#H
aQWXHKW~)eZf-_M70000<MNUMnLSTX<y7qPe

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/notice-alert.png b/core/administrator/templates/hathor/images/notice-alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..d21ae83486103cb372bdd994682dbe3da605614c
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB0009eNkl<ZcmdUx
zHMAR76h+fF8PR~46^@wE%+`09(^slet4yap%$%5+nVFdxMrQWOozefcm;-)m?e*}U
zE!KMmz`xG_Tsp<Y5LqH$MUHUySDLk_@%r=A@Xo8idp_X9Kqc>afwx`;UUMDAfFn=m
zneL?%O$;X6rpbZtdVn`yqTuI%0cQpDfPlAODV=%aMPQOeq}puf(s2eivd&{9Dg{q4
z1LIB2nP@3JD5++m6_inETY7(t&ir7KReU(bg@@yfcsN$y8T0@jlKde(5XvgFCA~Y|
zyzO4rfqP?g-9z$w15UZWGfJCnD!nyEpT9NPj$5O&JwsWzHA&7AZ;TX}y3%VS1m^k#
zOY!<>9j=cQ`olOAu8%QD<9uCdaX9~RajY5C%UmAD<6MTr=`@E^ZE~78Pc>Jlb|_~s
z^Jrb^r3^du(r^LP%bZSWaQnbcblQruf5sWArHm4z^re0n=dO{SPqX5MG>ajQCN$`_
zNwtr&h6w}@%FoqE&m`3-=Ri!=wN$FD$jk6jpRbXgOsG-L-e~tyskS07%~M}TdNig)
zIlIG(uBBA_BrC4M(IhL4Yo&+jKso!ON}T@uQxrF?gxDrU;_xT$V}G<Pi-d<se7K%;
zUzpjtKduJ#GJA-fAqLxm&$i8WVmH<7l`;m|pJ0c^*&6B2h_bLNC4l<=5mjMVlBco!
zb}=>5%^{_GbDYEGD2q)YWnb8m5U?qtmc~;X{`Rg7sg|xw8L%dz!J3e&C)UO|tV?L+
z@w$*I-B7wbsB$k0vsjrjLF$(U)m^bX!b=&0bJf(Ae{Bncn%u%Lk0lu^7Dfdu2x>ZF
zQCyG3X$uyFSWwo{ML{*w*3Ds7K=bwNuz-1KE9Rywm>tz(R*-E>h{K$i4)Zc}K53Tc
zv@XsLXxts$k){UN+|&Sv=`kZ_rfry&v14Y^D$O4=BW{w`XwQL}DI2Cobf6lEt<!^?
zxvSgYZvo!@i=SIc;J2_2zekPuBVjGWBCq`#)IvH#h`;)|d|&Rp-}^ZC_kO<couA)I
opbC-prqY>@3Fc|O;rE}v0XsaRa7gl4k^lez07*qoM6N<$g1R`U8~^|S

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/notice-info.png b/core/administrator/templates/hathor/images/notice-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..939933a5715d66b5950bb598d682c88670f7567b
GIT binary patch
literal 1110
zcmV-c1gZOpP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB000CXNkl<Zcmd_q
z1#H}Q6vy%J``f<oI%Z~GNie>Mhe<^f7Q{Gao>&@BIA*4jXv~{vaXaQRLl|uT-<zdc
ziFLWVRWSYtgI~R$<M6*B?5;OA?Fm#7nMs*hKkxw%vzx;Fm(i5hY81$ok)tOR2m~+#
zQvfm%5))FjRcbtq*#kg-^Gjdb&?vTN;N+?HP<lcqq-vxJ-e-^|^c++HGd|tv8Fdjs
z5R#}dnp(e^Edmxdj=sFEUT|hh=oYsIazvuWxHpXA!epGj3lCxDzU=_S+eYbrX9I)M
zLR;tvMHtQ$ul4|NRsHCTYiff>wgl2wakA%#H`JJ7N_B?v{>4XA*1h~!J{WKyj!>XI
zbc{3!hj^td!WM_do<kGLG^X^AdurvM0}lvfz)+@iMvh^%E6wb~+Np)7f2Dvky|X=V
zcjWU>ml<RU_s`vnD`y=9z*FCDWznZwA*_H16r4a?Ao<1CkJ(W`|5WsepC<os+9J1V
z!rKfr8b^Hwc^J(=+^$#{fjDYa0znNjwYz{jDTEXS)OyKuhWZ9Y^^hhkJidz~yE*|O
z-af(Nwd3FoM5&edUDsyb7L=l;XX>>lQJ`Malp|Y}H|HJ8%mX?poAvD1#Df{QfO<Rv
z-i`#D3B*OzQ$(vCX?W$r6ZfHiJSE;V$jk%xfI{`)cH*7GU{XJ--~ctN7SZyhwkKG_
zXL;urn;}c+J)(^_FFOMYAFLh#@4&Qv6bPN5YI~OEEkfSYoC6#^$L|Y;RXazCH;+N3
z4a{iB1k?biotLJ}AjvO1aepW*{%#B4Kn<uLmHN>lrb<)l={=^4{Jo;U(<_Q-lb;Qo
z;4`HxM3rLRIC3&GRimyfq35`RDG+ZM$fq5JsI}>|0Yc^tAf7(2PJ9qJmq+XW``a_f
z=so3tsVl!+1LDCFFd9!Q#S#P`lrGJROOvM+xiT~(Q=2~RDf{NrRw%G|<r+v0GzD=W
zLamn2k)#U7VxYft=_rLbNhdz&h+I`o(eh+I<H$WLlwEPw5fFr|*gV8jD>s5T$|5JA
zf_epU4^k3hDU&q0YAmt7_9$R9^;2Q<^pA~Gc4hU{{BsH2kGu_<lrJT8LW>I+PBK6i
z10PT#-1<6Y=){$Q<Nl5)WGwTfUIBwF<<9O?Iscf0^4J6){<4v$`hKH7HE<3P09wO<
zC=iAxG7MP-ZWho_iE#5vOrv8@2ExMjJZxr6cqPp|s0UL(z`4n1DUgR8c@S^LXp&*j
zkGO6iriO6iQ<Rl2#_az57f}fuB7#>VQ>B225Qq>uA&)UWxePJl<^ijyL%9AC8q)EZ
z<YAziUs41d1q|@2q^fu|fPRn%fjenJxaJ}LkR~(17JyZOnUoZv4?vbc>D6c&z3LwR
cYL36b?}x-R`Pgh+#Q*>R07*qoM6N<$f?o~$od5s;

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/notice-note.png b/core/administrator/templates/hathor/images/notice-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa4d3aacd5db189629c3958fae6f4362e60ae352
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB0008YNkl<Zcmd7U
z1(M=G7{&4L2sr{r$PwlU9DyTngq&dAZQLd6?(XjHzMF#JEWCYPq?&0u88@nac-Q~y
zpaNjUt?}qxad1b{y!3E~ZbxoPmfWR{-j*)%83HfSxFM)r6I8DV>eS?QT&Jt@jyzlu
zXW`MCTzpG>0<Tjm5?)Rre40i0!bA8VgW?$ua!G(Iq%JQ?fD4kIfApHT^o~H>MT-h_
zo+>}jp?pffP}_MrE9>VTy&@?J^yJFLmi#e6+$lVwB6Oz1X)~N0y(srcPpq9~^l(D-
zkN~F=oRIX)(X-;w^hw)JF?zs`mcO4vQQdz$Q9w?7^prRhMAJo##R#YDX!vYBDk^$3
z!7)+1_~>!T@Ige(g@;=T6N2jRdqy;WD~p;hz@Zq2wRiE+!{U><=%A@IPVapqnmg5n
ze=2$)axlRmaqZ{<3G_lg#uRrsCdl9Q%;=bd=48T}1I92}JIaNI30r+skUO2$!A2!O
zIM8~`SUWY1uX%QKj2ELbYm6|u-__CbXTEd$1sK!xfc5}!(P6=CnnQy8KGD&_1HN-r
zbi^3Wh!f*UQ68pQ4GJnfg7WijRMajnW>6o9h8meAJ{cG7lY4|2aaVOl!`*@$mALCh
zGz>A`Ie>B4({{95))TZITfLjXp%e-?JcP>G49dK(*`E+LckI~Fz2XwIeI2^Fvz-j*
z-kIM>m$Rt#7%u@?VL$o1cek7)XdOd@+hcy(KAl6EkD=cT8;5yJx{{+i#U)^uW(*K+
zv!kWgKFWLyeTiXz_Mf&Ll2ze|5ic`Z<<5-5do+!DJ4#0M9ivWi)C_lnhmw~R#i>Cm
z9BvWhw+ae;PHm5%sSa<C6%H76=k*_n(JX<CaI|al4cFa{M&WzhX=*|L1{rkeoE6?3
zv7-Tb3;#E0$JaA_uk&?gIAGXkIK!~B_W$9pr2k*@TX>DkiwFP!002ovPDHLkV1kn@
BZ^r-t

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/required.png b/core/administrator/templates/hathor/images/required.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cb1bc128db19cbe2795949505326d1a59432137
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^oFFy_8<4DKZ~;+{o-U3d6^zLa?CWRW_}*;L(ylp^
z;Ru_7Yd{&3nee~G5C7iq;dTfTXz*=h5V+6&=&J%xDtAI~1plOlM^!tHXfQAws<5;_
TF0gA6&@cv1S3j3^P6<r_M5H7@

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/selector-arrow-hc.png b/core/administrator/templates/hathor/images/selector-arrow-hc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a613f31e114eeac44a1ee495b2c8b626e727bad4
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#1|;*}T{!}z+&x_!Ln;`P1vamDJobO#3`Y55
z7hHPWczBss#j%(kk~H9DdbN+mbkS|6DQ+UsET&8x8Aq<PFehiZlu2EbnwYB?rR*c@
bDa9zOwd#4&(Vvb$BN;qh{an^LB{Ts5j@Bjl

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/selector-arrow-rtl.png b/core/administrator/templates/hathor/images/selector-arrow-rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f721c50463ccb2404aaeab3de1c26ed5e738390
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#3?w5ARK5Wz&H$ef*Pp-c{r~^}_=!z<8J(O!
zLB^6GzhDN3XE)M-94${5$B>F!z9%>GG8hOPI&k2h^ZwZ!yB(}P*6A8w;gFdmHHS%L
dLW7k+SBb=XhQc+DCNV%=44$rjF6*2UngIG3DpLRe

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/selector-arrow-std.png b/core/administrator/templates/hathor/images/selector-arrow-std.png
new file mode 100644
index 0000000000000000000000000000000000000000..15e3d8fe83b8611777084244608c54c3ac89b29f
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#3?w5ARK5Wz&H$ef*Pp-cF*7qCKe5Tz$3+7u
z$XF8O7tG-B>_!@pqweYA7*cV|_4r1hW{w7fr~enH8Z3-<Hz?euv*m8r>Sw=K@5oxk
Z%`Q2Up|B@#2P;qugQu&X%Q~loCIEjQC#nDd

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/selector-arrow.png b/core/administrator/templates/hathor/images/selector-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7687e582639071401cbb37959e5ffccf6e7f71
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#3?w5ARK5Wzg8-ip*Z=?jfB*jc{rk&LpKX8h
zcJKfHXa4;8e)rzS`wzA~e{tmJ&*NXeKD>T?&7()Vo;=<6>(~1ynjJHMdKpWC{DK)A
zp4~_Ta-2O~978y+`<^irYB1nA;vlS~XQuY&|8@~Mg;(1q&fI!-n$7J+8<+n-)iFo^
x9m|r%C0rc~t9~*pxc>T;PRJAvU+;s*+4K3B_$PmSZ4NY!!PC{xWt~$(697%*T*v?b

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/system/calendar.png b/core/administrator/templates/hathor/images/system/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..586bc28ed06b0a6af93f67c5649f1a58ac1a7ad1
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006PNkl<Zcmb`F
zgR>t=5P-kkeYRuUwo9?CVvKTZ>%WNYq!8P-eRr|-+nJs$>Q(IP#Y_*rCVwjyz=GXR
zCmKV4ZKR-xpaqmaYJYA}-uUs;Xl2kMM`rddT{{Xuj2Yg!c5)WKA(NL~tqc$VJX&x$
zan%qo2DAdv;JV>F@*dm>ymy1O*Q2+4gO2?KU<k!P{%jBxent^Oe1P|<2%P^H09R=~
z0<?Tg$v+RlNa%@3=!wo9fjoHth<plAA%G=Crqi=w4$Jr5r(1(OtT^z1uJv+Qb?`o&
z>*itIq5HJ2lZUr2-hJ+Ys|7KJC<j(~mmJ4t^}z>$zV7e?_T8V(?zMsuA^O;4$`wc;
z;)Vb_Hv|LT1&hv}#V8v()y*N=8{5~;!L}UAlqiX9JG82iCoHX!&pj|gaB<_Yha7%1
zk3*Xc#`o&PDDR@hjhnY{Jir<+i~^}PhED-Xg2T}cw5XQNfz437NKvlex*6z>HI}+%
z(h+UAa_>1ADX}ERMtuxHNl0^Si>;>~0dV8iEi5dypMHcZAY!=s&vVj}V#rE~3&Q?b
z1*I^AAvCL$MU*p=rWLc;b@mZWym9rxhg`e&g4DzqvQy&%m}B$N16PM3R4kmtzfay$
zB2PRw{(D7%^cXJPdG5swsh;JWwD{0d$MPZaNh6tkQ<hw*8qt#I*Vq5Fk^ro<;#>0U
e<+~01AMyb~u`?HDzjjFg0000<MNUMnLSTZiIv1k=

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/system/selector-arrow.png b/core/administrator/templates/hathor/images/system/selector-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7687e582639071401cbb37959e5ffccf6e7f71
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#3?w5ARK5Wzg8-ip*Z=?jfB*jc{rk&LpKX8h
zcJKfHXa4;8e)rzS`wzA~e{tmJ&*NXeKD>T?&7()Vo;=<6>(~1ynjJHMdKpWC{DK)A
zp4~_Ta-2O~978y+`<^irYB1nA;vlS~XQuY&|8@~Mg;(1q&fI!-n$7J+8<+n-)iFo^
x9m|r%C0rc~t9~*pxc>T;PRJAvU+;s*+4K3B_$PmSZ4NY!!PC{xWt~$(697%*T*v?b

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-adduser.png b/core/administrator/templates/hathor/images/toolbar/icon-32-adduser.png
new file mode 100644
index 0000000000000000000000000000000000000000..a34c2455f3a232811483bb8c9b02da963c91d199
GIT binary patch
literal 1537
zcmV+c2LAbpP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0007%P)t-s|NsBJ
zy}j1f*0r^@#l^*~t*z$f=B1^jgh~>bnVHPY%=h>A_Vn`a@9*B;-h+dKrF&A5SRa&P
zF`8>UvW;ro&AsogQ)_E$^u2Onts|p&O}FfawcnGX>OQmeOKGZ8X0$A*?n8Qddg$NQ
zYqv8|QBevC3TU+{k6I>?R1&L%UG?(t=9M3?jA)2X6p>yl<c|@fYAk55CGoXjs?Ck*
zoiOsaXz}aj5fKqrvkau|Oqa=Qic=ixq&=V5Yr};)>!?YJii))CdxXw9zxq_Kh+~FL
z74N-y%;vX~lanDKA;ybB!KI1tvRsR@Y?s+Wn!bLUVIrj7aiix-<k`-(@N>GjET`ve
z&$gS_#k0=qt&`VegWM*2Rxsh3HpHoqwR9t2QzC)fC2OoVm}oiFzo@~9N08A+fyqF;
zfHZx<M&g$)$+4NG*n5muA<?fizoLa^mLGqvSYTI6-=9g3zG#=;NVW26sNZ{odTVsO
zIlhBEgUdjqViHM7NurDswUTkFs~OO{r5`{Twvk`e!mzc^ppkb~>6<K;&tvT6-nfB6
z-0RT4dLf<NWO`8$a={~dvP|EkR+wTaA5av&%Cy*r60UhZ*xu96kTmeHSd(HJ;*uV%
z$(4IyJ*(_YqIXQ8-fY3GCc)gMr{i>HW@Z2Y0MUgVR;?tGgKTZBSboMt#epboSVd&3
zE7g!K!`!VrKO%H=bnK=>yPJI)8XD5x$gA*0op3_#s!FhOCuyoQp^I$p_UX>=wCSKY
z(Dbizu^cri9KWC~V2E0|z_grhL9NP_(!Z>}j8eIKE{V-k(UnQn?!eENQP}Irp<^3m
zyDOmJN$=_7#eN`iz$SgPPvNCkukupEsE)maK!M6f!tfXb00001bW%=J06^y0W&i*K
z8%ab#RCoc*%;R#MQ4|K?)l9G^`|M-eR%}c>u~pkvYTLH$c52(UZl?QuF)pCb-xu(o
zvXn|!Kp&E1wFH<Z-!&onpeJ5we!f^N16X@lDs>|^LU%;Uyubn(EOxuyw-B8k=w^ai
zC=`lB=(LE{YV{;U91L9%i9|ADS7G5gl!zq~vHwpDItg@9D-wxDDVYy3fk43jE-tPL
zWzfaapCwxpIrGxf3$o;L`3!#(bkVrCT^8b<?2v7w+e7y4Hg8-*9)=9^L06Wi_4Si8
zLSBDb&Drn@x_B^mOL_T^$43(q#*Yk~@-q8f7U-lM{&FRA;O-Ld*x%^d84Ly&pzkZR
zdw(%r+fr0CQ5&yXv<VTb&VMUGMv?@r#-(XA#{sG}nlwlMsY9PES1J=%T^J~wLV$DM
zk<-wy5nxSbW{#u!$meAT%gW@_Z3}IDX!UVS-6P;!uA6`E?cdW^u4e2hF20^@gI4Qv
zXSWrOnR1O*t9AP&@4jTa-F`A0IOO}U)YMr3qbn**n+*oT*=J|&%~2>6Cj<~e2$`wV
z>uUhM==Hj3;o<$5@bKs`ek3JafzsWvro2PV%{6&9W1ok&i)Izd)<BpWs$n`dAE4S1
z7Q$yDDdiDpM`)!nCB;}t2?u)MQU1Sn$|K2PAcUeKd?*;Hbq8;K3NL-#IpNUloVJsn
zvP2NS3z(B=<ejG{bg!i|Uwi*!No{(<+-&I7NG0e|&Lna#&qatRg73dmfrvI8Z~RVm
zmcl)J@qQB#c^d#7W(gD?;&&m;-H8iA-34WO+*HC!ngfXlsjJ=@WN|Wpc5YL!o<M*G
zw@NGmh<3<nfEyu9gh;&mvdbWr>jdBdoFpTp@Sux@A(_pR6TXiK7f2L14O>y>(ygo%
z>id;Ou#h~~F@rP9Kvfx;SUtN=asCS<w!>XxDzH<Pb=_>@RN}=z3B^vtH}6F|EmW%N
z)Yn-d1^NLvo%)U_vkbJ5){gyc*4uj+Yz>;)TAje{M7KE42Rq0tU_0>8$+N;8IzOKe
nZ`;MJb$ZZO^I<NA_ZRR1{W6^6$2kpl00000NkvXXu0mjf{=fgN

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-alert.png b/core/administrator/templates/hathor/images/toolbar/icon-32-alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4bd24ec35122b501441a420845dbc4f796f8f6c
GIT binary patch
literal 2065
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-apply.png b/core/administrator/templates/hathor/images/toolbar/icon-32-apply.png
new file mode 100644
index 0000000000000000000000000000000000000000..423fcacb1bf787859e6b7f6ef3b8b4839fb2c811
GIT binary patch
literal 1278
zcmV<a1OfYrP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000EVNkl<Zc-rll
z*-u<$7{<BKYbVi^y$m~p4IPAmVy)m3YyB&@;@Vr+qNOcXwlY8|Yq4cthJA;DOKbE*
zqqVKAXw_;dFj$r|!_DLKoy>fhoX`ve&P2_;$&+(9VdnQc@B5x}F=3$!Rj7hd?xs|e
zyE(1WbKUB6UwhHvzLs7PG`QNBY;w0AQ+B#fVy8DBJAL`^v}YkG66)0?liHlFc)DJJ
zr!x<pwhVYWax@9|7a0y?;a3t&YNJK*be@EW+H3(w0e6c9J3Xf$#$g=1Hr}K*q$-{p
zd2IK~P@61J8<L?mrf3q}2a2Q_(}C@pIFnkRqIj;Kfak^uPy}jy64a~7dWnL=hgTmp
zZPz6!?zSAb+j2n>a1=Zyg8SenkWy$2yq5458{DlnPz2kx@lfmH^%8;M-=B>reo&U^
zdStg?xx(yRDT}f03Epf21qe>WwmlBpHD;)qL;@ueg+yTZm+u`Zyi;bu!v-53H|4<9
znv2z%RM$#5C7uSin-zCs7F(N5Xd-ycE5OuBiM_S`o8nmKy_ziCE=|JSbJ6&#?l@d6
zIas5_s!n3-vKQWv33sD_CkVJNvI~@u@W29RW1Y7yrQ_!NNATUp5x7?pjpZv=tT(e8
zlvt~X)g(3u->Nn%YQ2?n&GLuqC3Nt>BWPtH@)ae1D2~9-=cDmhNHp2tvZuIQl-Q_>
zb8PXNTAzh2yM*f_;rkIVGcKRR*B^xA$4?@#bRilm9LIV?HrDN_*r>_CW?d#Ws}sOc
zVC#Tzy@b_YLis2hcRr28uNPymQhOYK*XQ7gJrhr=;;~T`i%lUQvOE0X5;qyK4?mrY
z#BZgPxO@z&<z{dcl!&FoQD_o6_@PROec<~6_e-MiducQteI7%J7_3(c3E2e+H$+10
z!>wZO!}%!uL5XEbtd+<5BqZEW3FX6Z+~z*~av=&2KjYI;Mu`d?+(-$r58rYh?s6X<
zT#Uk>m!c&+SP~BJJ}liYiF`Nge_2IEMb9uVFzHM#bBcM5d6PNKyzR|t@3q&NSD8G<
z#-uUN9Yo++CW^`Se)(I>8Rng*<c#-!-eB^Xmzd|nLKUh|h3el@Q&Ur>>FMdp+1Xhq
zj}E3FsPLJY8D(K%0gH=^TIT2H5fq8Z$w_hN8r<o0f*sJ{lo00*L*Ww>6A~`MbFdrY
z=o4@n3MWhvcg;vRBPAGPIxs#y?hn_19ECXQB?=6I6Q+ncGa8895CVFMLc`$#NVtrY
z*bBU;r>A&mXvj4-HinUr5$EvmuysFh0pzva1Omg`+uI8V2M4tea86=d#h1CH#4d0G
zl)1S%f4GQVVsCBl?(TMuj*i0NaG<ZRPx~-mB)dwmLmHftI=IZf;8H+zprfM$JV$?j
zzt#;x#22|Z5~~kRfClH?OZYC)!2^$=l>wtka36dUvJ>o(l>!d_eVA}5U}juCiO$YW
zO=4hRKuQoO_CuaiM&v+ny@b_YqN}S5y}i9+FXT8Vph5M~!w*A3?gN)nNN9J>G05ly
zB>b=?<UR-qz9+z^LN6iVhDdN9qy(Q7O@L2@PeQ_tl#u(trSzAOaKj}y3jd`P5)vLP
o35RzdmN<&g?*pOV2mbr@4^x`x>JASCYXATM07*qoM6N<$f*FBbWdHyG

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-archive.png b/core/administrator/templates/hathor/images/toolbar/icon-32-archive.png
new file mode 100644
index 0000000000000000000000000000000000000000..13a72777ef76df3bc62e13cf452869c5244eb852
GIT binary patch
literal 1208
zcmV;p1V{UcP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000DkNkl<ZcmeHL
zMUW#$5KO@`??}gY0@E=w)7Q-Gdz#^8rmx{=X8UDk`WTLxnHiQrxY9_j43CaS)7n*N
zF(Wd1gq2-Y>KdgD23~#jRi`Y)Pd@qN%et;Rg$|ft-@!vuPMtbE#csD@_KfLo!vZ#&
zEoryg^|rRQP4B+@?$-b!FTVJq4uR7MOqL4WrKP1$!U7*X^DJ(@<rdV|)Zp>QAAjhJ
zFTQ{ZB9X{OS^gBph5rk<?z-#7XqvWIRL+e?qf?-O-8*-{?|BM^c}^TZejKWZ#bSlB
zR0vyzQBZ*2?|;3puyA206oLqV3I-1uirV@H<P{bn6C@G|W||*zz<|A`re?p?2c#;>
zH5Wek=wtl!>u;DiWhzvWOePtGB5Y>`tY5!=qof}xs=%#jm^x)LuJZd44TsSY*!S+;
zdrVT_1VCB9kt2uU^ZBrB=|9-9eOo3OxKx0!`Sj`2+Zep5sp*tj6Yhkr$5ByPiH?E-
zS`HmLw8F@Mjtnqv+=Q$M2&@pu!4r{2Oh5s{M~;LXDp>mO-&qk56gIZBwCrJ-pnyMr
z{|(_#2>0H<M5*ouO$9_*2I+%UswJ2+Z$8}p`s0hwKCud_)P!xqz`=tD*T||=0v^HP
za0ni+_u_zL#wCaegM0Su*&7ar4?_V*<!2a=#o+PypaQEBFzq2>(;t8Q@u5mBZ@T3+
zXl}Pj6K0kXyNt!8(FXwz36)xY_sv(RJ#z+g=PgM0UZvOU#u_(zA*!N$n8ypv<&qQe
zQ0l#w8AvO@$bwF))-o6fm<Ba_E?ovPs%0b`=4b_*u&S!+f&gaZ`!5Hl%D}kzwN)!u
zAcgzxx$A<@m|UBRa9U-+>N(ZmX5Z(`QBbaG0<yVFUdw>vl;!=PdIs7R)a0`T1qG}<
z?>E&2s0K7kF<0)oxVRWx9S#SaPA7%5Ux3O=5)8=T1a}??1kl{vj5BA>SPP)a^t&_<
z%-zZ@J}-HDhhQ+sKO-QRfy&Ctj52W9_2O#=<(ISB*k}z64T#6%XERY=Ue4EeO{NvV
ztw)&wtH7zCT;)~{GR7H{f%rTdkJl;keO&n--IzIv%L#}HTi$&0&D&%hA}mMtz`zZ{
z!^YH&Urs<&SYuot7ZxCU;Euy=4PhfUYnlN=NS@G+>_RtUM9nf_jAY{t*+;^lZq|ej
zMT3GruPM@aQ`lUZrnSqU5Vqf-ShZ>uMvNFiAy~R}=|eZ%a6@hlirU&*OrJg-{9Vf*
zn%o-{JY1v%6wo;a1&`ZJn>JzJzI_-pXi)AA3Jw|u=KUZ~z?>TtoNOE{M~@zbWH9#z
zMO|GTzl>*o=Nc6K`}gl0gTm!<aSE~oonufOIB)=*{bR?D?Hq$**sx(JDJj9$ty??C
zpx_bA3{+H9bc#X2<Cmuz1$2%<F?{%N9!6}!&M_!<@7~QauopVVpx`iK26!S8oncVW
zsLX;vk@??qf&+-Ju?aaDO#@scCVK|O0}nia6h@C8-MtNpK7*pqpy)Fw`V5LbgW^B0
W&$NC1F8zoA0000<MNUMnLSTZ3D>wcC

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-article-add.png b/core/administrator/templates/hathor/images/toolbar/icon-32-article-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..0778bd989368c974c28d5d93e9b486d37ac3020c
GIT binary patch
literal 2099
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-article.png b/core/administrator/templates/hathor/images/toolbar/icon-32-article.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf16fa6aca4ed846c198362598382daf9d61f7ab
GIT binary patch
literal 1715
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
JPDHLkV1f=oFM$96

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-back.png b/core/administrator/templates/hathor/images/toolbar/icon-32-back.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b8d35a0022f1dc182fb7c56daf09263d0efa49e
GIT binary patch
literal 1281
zcmV+c1^)VpP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0005nP)t-s`Th3A
z#l_av*8l(it*x!h%*>^wrM<nqnVFfjwYA>f-tX`4QmYF0_xI-J=B>??yy};M)+e*?
zb55cPqsD}__D!?siK^~I^!V_$&Z4u}mB`(<N}36c&Qr9{p5E}!PLLO%>^rFEb!F5I
zyzY}?lsUEWY+JPwZqXi?={0!KA+_&%h|w>3rc`H_K(6ylS)3wntURsnS!U4>fyFpz
ztTDa8xkr-;bJQg1_29+&Sy;IXS+5V4w|id24A9-hVZamV^5eMggofZgqs)U^y9>4V
zW2WJ3jI?XH_E4|bjZ>2!=kec+tZ}*BoY3gJ+33x$>}-nOEX3=jukc`u$X9^TKwrWS
zo8)2C^1P<TjC9%<jN~lG)x2A-7`*vXQ>hJ5rV6mvk;&<>lH^gi;g+)Jf|tc|r^<`2
z<bzp^E>4~el(%=0*-~4SEUM&5U9lOE(K%9;8?5n2j=O5U=bm1dF`U{zOO_97s5+Ut
ze(&|_uH<}`-Bg+9IAOIJP?;6a>$sD?afsP0kl9J2<!RRN!j9uFtKoX3@IR{MZhhGz
zy6=jz?_r0<OJA5Lq~3Om$X2Q8VQ{NJXxI&wx_L&64VBGhmD@O=#DkFJPMP0Z@%QY=
z{aXz#H7)=E00DGTPE!Ct=GbNc00PxXL_t(|0j$geuk1h+0N|5MoY|Udw%5M7wr$&f
zwr!jL^-bMoH-6uE4&eV<O7Hgc?53BXAVn&|H_qj9*B;;^Nhwg>$mdSus^M0SZ_Mk$
zEF{0GuG8cK0|7HFBg=80<&l;d@JV!D5@<TS$1vGn46_%e>7U8Y1bF77j}C{kgtVB>
z8io(AMCZNu4*uLLy&=*AKu&|ydlT<~BX)AI-%UI{LP+Yi>>r%Oz^3T+FG`8uR}n(b
zj!YjG@6_uGSSIjCBYyS}d7AE)&fy8LjBgHb92ZL<f5I8}YI7Vc+v`)@RICXF5}t6}
z`Zid?7c}kDcL*l1v)cVISR%NFWX%0RKBKHW+Zq8&7k{s&zyIyKQGY_&%M{-QwrW<E
zD=RP8O_Ip%NmHaueq0R>x|PI<x(GtT4~s18G&q#1647)qjs(%hRw>|8d3I>Sa9t2K
zEYrLSK7+VKY&M*KZyw@nJP3ZF@~zrw@h{O#*3k3Xt@02AwKcS7R#uBssp8d@OnXBc
z<msr0_GP{p`l1ybdEpSTHg^1tI38R3*G!!xITpe|0R2id6R@t6)ctQ(Wy=BmiT19?
zw^cF^<KbTGea-|RBA=fmB0%Pxy+3nf*F}iziAVrcVs%uhKDXXqt^Y?8WJZ|ps{^5~
z%BmU|Z(4^dp%8og)C<@N8#&{wr>fvaRP$c%{HkXrWmdwu-vZ_&Rfb4DLCEbsKnRLl
zdl1&VcYr5BYglew4CU&8vb8o*M1*zi##F2NY(IPuOxI?hmSDY|0a5G#AokIYfB|QK
zt|QPxgt1pC4>ryK$zEr7t3*Eo<a;kU=qaAd7_($h#I=Z0iEK^mg-B%whK7_tlO=Rq
z8$6_#EatdwZ1q99+S_>{L)m0A))?1`oSCfzv(uYf%dTA1dA|K0($pW+^7tQaPdhW~
r;;jc>xv}e6b*#t=lu`P&Yrn%cLp+6SxXmkA00000NkvXXu0mjf|ACuv

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-banner-categories.png b/core/administrator/templates/hathor/images/toolbar/icon-32-banner-categories.png
new file mode 100644
index 0000000000000000000000000000000000000000..732c0110aca9f966d2011be2b098248c0a422238
GIT binary patch
literal 2160
zcmV-$2#@!PP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000O#Nkl<ZcwXID
zZETa*6@Kpf+D_~^$(zLa00I~g1kxq-KFTIGMCg#%sH&uE*U^p^Hg#fuM(MOp`%@LP
zNn5*3YP(JACZvT?kR~)ObkYj6TO8UD4X7{)U6Ls&4o%2Mo%kb;KVQFh_XxjH9Fq7W
zj#l+ZkM8Bh_Ve6x&OP^X@c%Z3JlesR{;8<ZcuOo4-xUkR?8S<ui7|$msSrl`$6T>+
z%&n<f2Y}WaT|e~YRlwojcPb@?#&$=;8i%#qim6}>{$LanLzCFDeIrULtQhJUM%%A1
zz&9Rn0yr*2II)-&{Keg5K0A2K^4I?!D{1RH`q{S!o3Mx-J^jAprN4i0{pMttzi|3}
z{=|!K@kgIO#~=IAIez@jKK`34qx`!+eW(3_2Y=g=HU!4gqsOYP?Afo|ElORf5f+KV
zB6AdgV=NT)1*2+fA^5p?C=TIfL}#MSjw<V+opn{pAK&W5(6EozA!!^BKlvrNuDX3!
z{?YT?J8wMIiUrJoIVPW)u-nY+#TT}h;m>_uoa&zhlM)2fl^F5N21R+&UUoFDsz-+d
z5kND;W;O^{$MM?vJ_N*?Y>)_e>WS^>y!@fB=e>d5g4~sH5*kj8dw;j5LivGnbe3Ea
zFv=P>6&bPBYDAsYgmor{;7kl3PlXXndPB!o?yp58qT=m;_3b|U^M{>S!X(Ty4(9qe
zlz_z`1Dp}S1yl|2#}n|2NkG68<Cs=CB!iR!TbTu4tgpelSKP1Y<XH&-SjPvGaokr<
zQD;CBG$%rTTq8hbEJ-S-2x#0`fv)Zm$R_z!kYz1^Gnd<+fL+8KTmnym=HWzAfT|&+
zamcbPAf@0l_HukU7I3yc|DYSXWgCK9Lco0$1?2jaFeC(soJ3GKAhUTPkdXj`XC~SK
zvRnjcPgl4nLYmKJmUY*s2nmt^^=>Z2fE02Xi!CPd400Brhk?9MS!kg7tPny>gPsR>
zlTe-|#}_u)aD8YBl2K|~)?M)UnK#>|O<!&DMB<o=sHn9vtSgcbNvIeIh9QB2b4?sc
z6YN4H7oV#j0c*?Q>N<}@@m~UfOW-@~kxmzuFas8_UD6G_?%9POZ!baTNC@#n0@plY
z)GG#jzPt$Qi)8GuS>TN(5K$8-mL(KQ4DbGD0FT8^14szK0nXb2lw~cT30LtGzlPVk
zCQ$Ev58o)fh^G<6?Wsx(F&jFi^*Cv6#OJE3s3@U?0hY0U<C~s8phiteeuajt1=RCi
zJP;qmFV@JIobJchw07KMG2lk10TzRVQa*#K$N<t<dI9`()&lT@m>zPRWsgJdEdz@M
zfW${w$nM9&>#4tqc7UB^-{-AqlaRl$&WrVrC{TmQs|5yuiLMRodr|k&0!|d&0$|4q
z7<*=hrOyG`=mgjy<lmgY4AKjbOdTsDfV%)>B0zY6NyxwPj*KfIKeN#bFeShIi8A(W
zw=c6gAeo$CtR;Ws+|Bk6`Z6y>GUY)Y1%NxVtAtX4E8p?YMgU`vUcJoQzKncXT-9!5
zBcN2k{*fo#xu(ppY!xvTBj#^i8OZiBVl6-Ge))K_=^={=#hM1jA;7_KkGsHU=Kz<a
z*?;qhiombVt7iZhlRO%&6P7xLL}C&sm;)0bDOR5I9X<yMfvA8=MDy0;$x$UF=UNh+
zW%z26mUuz&6hW!qk!jRL>!it1)dj4mr4#<?YEWFdbV*4h5-kF|R8_SX6cjW8Kr|YK
z-|u&cb+@M7ZBQIIa3H@8imt9M#b`9PS5{U!OePazu^0itU=USRRS;q@H8q8vo*sn5
zVJCp&LWFZs0T(Y`r1lE!0Alo6EEd;}9Xl2*tJkhwbC}KMKdoK6)-gCZ2(Q-*;Q^4X
zTD1z|yBHoGc8-pYzPf+^{<fv+01+P(YM&K5QLI)gBuOHW2)NyDpZMWcF+V5VNhE~k
z($dmHVwXyPe?RS*J`dpy)Ya8tY;4ST^XARxnwy)`zX>l~xIl5cwPni|QcQ7!Zbd~!
zsI9Gq&1QojCpUsjclXH12#vZZY}>XCckbNr3GCjtZ(qg@3KHRMXlPJ`Y9!r1JCZ92
zB&M*ikO&cpL}p2Kuhi7k(1_c&Z|~l-XHQlQ3WAG%SpN?u=Ug9CNQj)~B#fYkiG+#p
zLB#tNojh9s9n;g(C@wBe@c@B{b&%=A1btp!UXJncahm7Ypa5K<PzWNcQ#?S>G;OZC
zb>b8#iUP3#=gyrw-8l=O1k*jBV_p~*^#TA2Pwowhy?gh%Mdk8QcF!SB2}3*{r;*n0
z@d6z`8gmqo8U_-vh!+U+laP)m6(O3pElU6uAQC`fAW&9Q4OqQ;HAK;&OrM*KL`cVz
zK1;QO^5FWwzyQIKlK>*1ibkZAROE?3AV4lhNl6K+tE;hf>sC7NL`s=Y!l>%OV3;kg
z4$gUdPW=J8ILMV$*NK!051k4+`{Wsq$3sPi#L?fVW>7)Wlafx$@){Jh3yQzpZpY;0
zBqbKe=H&#1fQTssa|>4P?}6^_?iK(C=@#UiD<p(=ljV=jPg*B{lZ}my=`W++-d?YW
zu|lMIG(B`1#2vF_gMuClE7qV8<Y^le6iaf~iZm!PN<zk1#|jB>WqJynLIhU8GH+1y
z_4RqvoZnndLYa6W`7#n9-gSQi(1QG#Tf7Z7WEuiJ4_fk_fY}IeA-|SggJSdM&6mY3
zhCCUS>+Bm8;#TVvH{Nm^6!dTzsjsikzCm&L@Zpz_969okxR#4GO=FyM0$U(leC}M5
mB(BfJt158f#EDOSgW`X_Swx;jfycK10000<MNUMnLSTYTVENYo

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png b/core/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ad4ea221f3268368e6f5366846cac601261f819
GIT binary patch
literal 2591
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
B)T;mh

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-banner-tracks.png b/core/administrator/templates/hathor/images/toolbar/icon-32-banner-tracks.png
new file mode 100644
index 0000000000000000000000000000000000000000..d39c1ebe03ed4a8a41603fcec0ca9af556703b93
GIT binary patch
literal 2747
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
B89@L5

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-banner.png b/core/administrator/templates/hathor/images/toolbar/icon-32-banner.png
new file mode 100644
index 0000000000000000000000000000000000000000..e51c03e06b52e3e6fb2cc49546a61626cb3beef5
GIT binary patch
literal 2683
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-batch.png b/core/administrator/templates/hathor/images/toolbar/icon-32-batch.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3cd07e4dde5982f6c3e027828c162c3a9c48bc7
GIT binary patch
literal 1945
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-calendar.png b/core/administrator/templates/hathor/images/toolbar/icon-32-calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a72d6ee5d821cf54bf03d306d2d7ed1828d7f0f
GIT binary patch
literal 2051
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-cancel.png b/core/administrator/templates/hathor/images/toolbar/icon-32-cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..b143e100b9c3055e637f3c8d6ae586478f4e9f3e
GIT binary patch
literal 2228
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
Cs#Hb*

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-checkin.png b/core/administrator/templates/hathor/images/toolbar/icon-32-checkin.png
new file mode 100644
index 0000000000000000000000000000000000000000..04e4e5b349e5305969b8ab14c4cebed205fa3996
GIT binary patch
literal 1654
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
Ah5!Hn

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-cog.png b/core/administrator/templates/hathor/images/toolbar/icon-32-cog.png
new file mode 100644
index 0000000000000000000000000000000000000000..abbff3602148c1a4385504c491767e4d051f8313
GIT binary patch
literal 2600
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
A`2YX_

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-component.png b/core/administrator/templates/hathor/images/toolbar/icon-32-component.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ffc421a88cbf5baf1573eaba7e288bb5148c37e
GIT binary patch
literal 1672
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
SS%S#`0000<MNUMnLSTZCVh17s

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-config.png b/core/administrator/templates/hathor/images/toolbar/icon-32-config.png
new file mode 100644
index 0000000000000000000000000000000000000000..53de9648c9d124d23fd0650f95debd173f089a22
GIT binary patch
literal 1770
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
M07*qoM6N<$f<z-R*Z=?k

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-contacts-categories.png b/core/administrator/templates/hathor/images/toolbar/icon-32-contacts-categories.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ea47e95e6bd3fb12d29d0313a02ddc64d2b460f
GIT binary patch
literal 1427
zcmV;E1#J3>P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000GANkl<ZcwX(8
z-D_M$7{;HOvu8KEX*QeK7%3&SD%G}W*?^$ETM(~A1ZnY7KoAj>77!4`;$IL^6tAQT
zdZSXrUJ2OTl?rHRX#$3()Hc#K=98G+^D*=KI_yBs={eciG*Q4j@Mh+0IA?z6dFOrM
zj36TXmy#U+Z-9cGG(Q<REh~B)0?wjPO!mBfYiwHpWQopFC;{#6oha#g^Wy`J@>@42
z9vDCevIdQ=BuX4UjWfg<ILg3g0gyu1((4jlpQ@7<7eR1R^Rto3@*BU8B>}8TRrvMS
z;O&35J0}XASEpbV(dBW7_*#AaqXUh~+w4Tb0RsG|PQriYG<HIQqd0s5!TDD}e@$hi
zKm#cCo4K0#9yEOpP|fWxyAs&pL+Ah5H@qLtSpaBlTri^9?;tBZpjL#Pkn9<#iDLOx
z02=@lK$;AMzBdIGEW=fC-xKhfcOc?5cZk|ZG6hN#G=atA+C1P1bW(KSMd-125PQAw
zJP-cO3-B(#2N$V7uftCO!~oeoK(H72D)s?SzYCIO2(6)&f`05J=!I+WXTCxw5v9s7
zj@oIk|0HZGsvYKB_CpdGUbIIs@;vCb&HzXQL?NKGMe8gn1Vo{bgdze8UV=Swp#>-p
zAPmVk07nM|0~9QPb%CX$bwrVXTU$>%pa?`9gpLo;^HY#gA}#gD&vyHC37`l{+nzw1
zr-B3!ts<WO7XFb_$#y&S4Jhwk+6+KzXfh5k!2KBz?Z09JSL@;j(9IQi4<7{uD+n%q
z$k(fI5oJ2iCfACC1gxYm1c@7EbwB*0r=VBo5MBQfg4?*a{{+;^ZR13?934;!#swh&
z&okLDAxc#gM^B-2^d!Ia5oD>S@jeuH()iXTw0`*<nt_}hFxJ~W00Uq^tolxVjRG%B
z07EL|>Y*o5;OIU4GFHEQfnB=Y*@0MVD56A3DV?GoJcJ+&;VS7>ARc`V>enw^Qb5q{
z#q(Y+j$?#D;GSRKM=Z)vid@Q2!#Gcrd&BbdPoPJ}kd{D>7H2?rra&sUnI#;Un7;67
zW9acw#44wJe|R(XBcU6m?pQVuM3koL0l;D4Jo|zfqpN5GscuKi(c%aTIgr{!^6N>o
zgB&0zwYU|ffMgaxz!7qYjF4t@0Z2!-M8Uzfosh8O?&tX~z%D?+POe_PdRj_3jxIz*
zlcS@f+jK%A<yj(vYgq~*z)@%L#<63^Ca^^bBC-w;+-0GS3mj+QC<B}2z*ZWP)*7DY
z)rsgL9L0`JGDP+X2|o;b_wL1>J$qo~nvPCVO5yI^yJ)pq^($AdG>#uXK9L5%z`y{8
zhljCKs#GeNot;Iq+00IX{nA-pUdGbWlCgN3W!7Mj^PGw^oQiXqdthZ{#iV1W#LupA
zBu_{-mLOYXa^@;eN@#n(qe`Vxeig)V3>THlWen76Aegr@;0p^2a1n1tGs+Zzojc`{
zE5?ihfL6*>Pj7FpYZtxG0UJ&b#bVK%4<LC$Vj$Mm*1B)SN~zSM&Ic3;=WP1A2GCk>
z9e@aw1lbw@hm-xbQlykwzdw)z&H!w+X;y=SgNb&#xVX4w2NIjnMRRj=287Ge_WG{(
zfb}q40qMxBf}x=yL{VfGW;aX)a6j1I6bK<KlzBK?Zi3$$S=zU6pV<doikP3DM;M0g
z0BQTvFb5AFM5SErctXPN7|8zqe$33wScqHz=iK|g-`xp`l%_KVLEz><V!k~mB-YuE
z08VZA9&a|E?M+K;QmX6g>uvx{I&tI1jYhRvHTlhIPPgag(v_0cArtd-*yhFa-4hZP
hq{y*R{7WY!_!~&lZI(-b!g~M!002ovPDHLkV1f}dlXd_A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-contacts.png b/core/administrator/templates/hathor/images/toolbar/icon-32-contacts.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b7abca4ce33c0c0f250410140e6581cdbe1068d
GIT binary patch
literal 2522
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-copy.png b/core/administrator/templates/hathor/images/toolbar/icon-32-copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc036ec8d141acee0f4f67cf679adeedb1be14cd
GIT binary patch
literal 418
zcmV;T0bTxyP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0000XP)t-s`}_Oz
z^!Cim%<Ajx;^XAr-rn%>^!NAo*4EbV@9*a3<}8VN=>Px#0d!JMQvg8b*k%9#0WV2J
zK~#9!&DGIv!ypWWVLTH%=KUYIBo-JBw5g_D?7y4N*R+;eEqzfgSK0GFW>Caxd}ntI
zz<2N8fXpp=56oN6?0^Bdus1+#ijMLCG5{i)_6?Bs5D}pY7y(I-YIr7H_1S?<0FvBh
z;u|RJd?3(yw+4vJL2caiXnT7?bnp7(_XdFdIQ^go&Kw=J^EB)4m&S}BVFb8a0f4(A
z(5qpmJcH%lTmXza8y{zyqWJZe_|pGHwgw<ht7%OZKtn4K2O{za<d?vfw=ikx{zF>7
zNB3tspbx+hgwQPrp?iQm18RUi0sS7NEzkjgpbKaKNwsk&^EsXn-FssF0P3DH0NlBB
zApPG##D#SN5h+Flpq&%<Ah;S|4`8`h5#T)rVA^Y3(v(^&zVy$%03+NT=#AKn3IG5A
M07*qoM6N<$f`q8Qng9R*

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-css.png b/core/administrator/templates/hathor/images/toolbar/icon-32-css.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b75813bbca44e4a4b0d5e7c7e989b3492272bb8
GIT binary patch
literal 1580
zcmV+{2GjY8P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000H^Nkl<Zcmc&&
z1I#Wt6g~6dx6NnUw#^u8d&9MN<A-3q`~4fQZ9LnyZR69-_9SUCX}-SpSKdi(I_=D~
zXKwG@_SEq_4|fv*++~EI!Pc!??@LQdYsG8FaUe?*qS5H)?%lip&?o{scI=p+o16Pw
zAQ0f7s;OkaX_RF_K>>E|+<AYOE?w#xOh9~juV64}9Gs;}fNeE3H4#AqB+(!O{sC1l
z$ouN^9Q@X;TO^PC{CqPB8v=Kl0@VY&P9zeLZ5bIE1`>w9z&|*zX{u+`Yu9xp0hPpk
z^&wy!NG;`cGMU89n>RriNtg+!rYAv@Q*itCZ5%sx45v<=!uj*(arNp|$iO^s;6N|y
zJfH@hYAWQ{lEC%r*FjRDPzWr;;V^@fWD0D9&_p6-5SEpd@!D^U3t1Xsz(B$f8^%9H
zmR26f-}VR!uKtatMmYp}du9)~F(7$Mv19=-{Ci;RBDm$VSO*3~Scli;4L-w?b++?9
z+f=jjKr#j-l!rt8Ux%9j+*3;s9v(q_?VIoldLh2-d8E%-gye<82=sm((eFl!`}5(o
zz7NUG3rqvr69^aeLh|Sm#MUoB{NQ2)@>?NX+6zv_DBSp{HHh#yAlTzs-2Ux;xMwyu
zd^L3AK;kz1faii9Kr#v-4nd@jM3FJ*S%mvMi)$bE#<ed-BYohr$hvnEZhSQx@!i^0
z+3W$8Ktj0K3+KbB8ink+5#0Fgc?8OO;_@e>QT*y91l!I+T9=u)BI*TCZ-P_YOZ4$W
z!#%(+_2b5(g(!St5i*B7hpRt4kLa$&C>s4b>xk`NjO+g`Kw-z3D0$CA^5S9KSXBo%
z3L{eP3HL0Ruqb@^?@?%ajBc~QTWs{e)d1iI(JW|VGX+IcKR{+?rkd&WnN8Uh>C*AJ
zbLZ?grF@A4%WE~o%KWbmP8ik#BLV-*l7xO>vj?P^2{-~Q_w3mtgOeo8n^Lm}Xxy+k
zIs$TVT7VDw2Ud-p*$_}oj^hdFrhq*LmESX!`&p_3YX_Hz#bN>Zt&&7Y89czYcsw59
z?nZW?cfW+*3x4RQK*5O<Cq8W3w(U@Er3gO}f9V7FgX*B_;8z5WkUP6fMSzVi`<gOk
z$`6k|`e^GhW5)ClvEaZ0hYue<`r?Z(9+RCbeJ0s2jcsZwh8l!ElWh%wr;w255h?*c
z3BnOuYpUaxwyM|{Xj{Y<{6`%b!n7DMWzHA#|C}c9wCY$Ys%zJ-Jy2O$S*HZ4XPpU!
zGVWy)`LeFI6&4nLe)jBHue7w(ULD(R%kT88_<czp>FMdn%gc*!@iCCF7A8umU%(`&
zifl*(>M6~%`cci43W@s~LcmBwB}5N!8VFkwfd)*0juZ(nBT|G?pi-*y(2Dm!5|=Jr
zs-HTRu!sY?pI=J?%mu21XK<2?Ssh!FNU4sqv$M4e5=;9SFq4qiHnCCvJiuRvZfp)z
zR8$x}Ah%C`15sOBi&m{#AtxsXL{(K4>nJHH;WI2*XS-a2RkND{Mzd=2^n(#D78{<3
zf}0ke1(lbVv(A!rwzHnHAFC-y^)Nf-uXX0k87?+F^PzTN;9>jr?T`>&;NF0TmJL?N
zatczlOLB}8mYh?1hv&=Ky?ZykfX<yeWB>mB5dS?4u=fB@zZlV+|2A#f;ONn#^Z*a0
z(XU@W9?x<W#I9Yt(5+iHdW?NE9f6Z4Poitrt`O@y4jnp#%a<>sy1JTmh`k=~bKWs<
z;6NrEh~=1lG)x_D-n@B{nD1s$$HRsVGpl2n)0+!M0<BxOW?t83KAkQwXap`!_NkaJ
zs2%7PkUsa@i&MSI(F+puyDS^FC$t$bl}tCUhGu!rB;#-mw}PI4S~9Th<hhh%dOfIB
z#|HOX%5xG>I%|*@6xhpiA<I4%>2^4`Q4*=XUd<g!n|l9>nA)ROK{#N*fZy)F|Nf3M
zXU?QLb}SS!*MwuQz4qEM$=7GDus9t+vy$h0C=!XB6Sk-U>R2bwX_A!I1D@}}#9fu=
eG&CMYdHz2@rl&?jVQ*^y0000<MNUMnLSTYPr1pXU

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-default.png b/core/administrator/templates/hathor/images/toolbar/icon-32-default.png
new file mode 100644
index 0000000000000000000000000000000000000000..90c8aa95eb1c841e0a0f49ab00a379566a55ce52
GIT binary patch
literal 1072
zcmV-01kd}4P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000B`Nkl<ZcmeI0
z1CTUF7>3VAY}+=^whFOrdt%$1*mi#8kCQ@dTWfpw%llQ$UiD$NZnkIVa_Fk3cF_Gj
zZ+GpWCQqi#xA{g7HeU;tfc>XKzJF@LVU+y%GNLE?2>WYU9pLB0N0(6i+uJDl#)%w2
zwRHB$mk*@a7uN&u=~W!S4VJPhz{k;d&!WgjmyMEm^$-rBSRt=VJ~c$)4-^uKAdn@i
z!2kNlD~C|<%~K~3dwy@zSAm6FfjXdoYhzChlYha{lM;CKi1aEb;CLQq`0CIGE&)FS
zN<7j*@khHT^28v8pById^ZSDXbn!j6ANQr`<NZ92k`K3YDCT4E4Cu=w?~6U$LH@@E
z$ou#Zxt|y@4d3H~6nLzkQV+Ipn5A?tugHUK<b0qjCwL#|M1W@f09pt&d|x9u?y5Hx
z&pizkLES0cwmC%To;}HS^A4uqx@~6)qn^H8FT|a@(m&U1CWZ6HttoWZZpP$dh~RBI
z(qEUYlNI)BHm1<+J7p&qLj-Qwmj1k86~hE?-Cj;EgrMKgS;i2yOV?!i5;Np=k=u8m
z-%hVI3<o#m(Hpp7bNcn<62rvr*<Joc1qBq(mFv;3ClwhceB1WKD=7W+`}e%%CKddC
zY8lxsSV=bk2j>aM25_@TEd0l57395o1LAYw8D47l73)k0;JA1-?xV`cmrCAOFBTQW
z3ZK{dt;Hf<a{EQAjP}LK$z2H;yjAqho$0reN_d9pKb6X2y(@-==^%gOa^%OlQEwqA
z2Bn}ZqBh=$A{4u?>HbeI*?B`gHVNgR0#q`8-Lyw*{Jy5=Qx7zIT({R9rX4TWYG-T(
zTA`)Da$p6plE$*y@fwY44c=aQT>q89iW)0uW4T`mOQsT{P@{+u_6s!f$5D`ZoH%B_
z&9~Xqg2CXmU`Zel*xz!w-|ycaa`O3n6bgm-cP*=D|1(0cn6LtjYU%7*>h*d@K_EAN
zm$D=P<RA0Q#Q?k-IIiSe4sji1qFfB&_INx?<$C#-uneLJARJ@vDxmOIpbk<6#jgcv
zp<W0#P|*K)9tVtF9d5V#c)+v#nG52V;o^o7$Kv;6{62%)eVOEafGl7sy#V`9YXEL8
zmrDhdD|nKE&hij~Tt0+^-1-pNKP{b3rwT{{`A4;ce2KK&;c(Oe$`&&M><>tSwPXV*
zk^$;u11z!I?KBypNUsn62a0R}w@zWk4W0qIA^0lFT8;usaq;nDT-PjC_`KF{Ef(SU
z_#oUj`zyg_vu(vi@tYPCi&(68#jsEa!eivV5B&AlUpI2WfByOB{x{xuV@lr#zWnmb
qR)l^Y<2*n9_~ZQdf&cgSf&Ty^-+S78yLLzb0000<MNUMnLSTX}p%t9~

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png b/core/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png
new file mode 100644
index 0000000000000000000000000000000000000000..247ead53598f1de5151d071d3d3c6283d6d72e8b
GIT binary patch
literal 2302
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
Y4;b~r;zBS*&j0`b07*qoM6N<$g6sTsvH$=8

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-delete.png b/core/administrator/templates/hathor/images/toolbar/icon-32-delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d05ecdb12412752b058e7d369d996bc07adbaf8
GIT binary patch
literal 2091
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
Vdh`VVX^a2>002ovPDHLkV1k?X_*wt}

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-deny.png b/core/administrator/templates/hathor/images/toolbar/icon-32-deny.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ac081c68ac5d60433db8a6a0feb152e4aa28324
GIT binary patch
literal 1677
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
X-;R7oDl1S+00000NkvXXu0mjfO7a}L

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-download.png b/core/administrator/templates/hathor/images/toolbar/icon-32-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..d09df7824f306757aeb2ae83a258fd70d6945438
GIT binary patch
literal 1655
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
B4Hy6b

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-edit.png b/core/administrator/templates/hathor/images/toolbar/icon-32-edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..344b3e79d51de2fcb7cd4210efb6619caf94b443
GIT binary patch
literal 1680
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
anD_@8Z-f5-u);I|0000<MNUMnLSTZ?K|w$O

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-error.png b/core/administrator/templates/hathor/images/toolbar/icon-32-error.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cc0aaa71aae3e0aadda30cbe720246c6fb2e206
GIT binary patch
literal 1285
zcmV+g1^W7lP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000EcNkl<ZcmeHL
z1FSVi6h0TvMs3?RqQ*B?8P$qv+ig@cZcy8H`&-Yp{oY0AOL}hheVKI6fA`h>k}o^E
zGdt(oGdgEuxm-^EO2p+aMp8UjzkdC##l^+9#N%;^#bN^R)rUkPF}}FCc*b6P?X^mb
z@D4#!Q&X;_qy)y4zbhozM^#nT_`tw`UxalC^vjue&I~@EoSYQrx!Ucv+wPN=mX^Z{
z7GN>RZBSlVSP+0k6d-_%aG4B)OG`_V$z%jDh_HFUZ_qC&olXk~*hLtI09T73OvGd|
zDZRbDGCe&lZZ&vB7?&Z>b{~W7bQM6r*w~m14GrbnRa8_+b#-;Eh@>1>83g!^GK0o(
zt*NPzva+(g5IoOjv-vA%^8g7^gowZ<B&DULY82!>!!BUzrJH4@uSrBZ5b=}=FzPAm
z@L+|=6W`hd%(t%>Y5q|dRfnH0VDAgJN}{q>8qYdk7W&&|{L5FlKH6cFaiY^6?so0-
zvcvhe<jYb~D?4BIh?F08I@fy`Q9!->+WEeA0dQY;a!SU2`Bd<%!hJQ@ueg9+F1SVd
z-gz-^K-;01rTWMMvh*UxwRHR4W&i7+7hu;5Zk6=(xMW2jKuWgXjq4+N0L)3A!#{s2
z@1GQtA1*sXfTm|}l}(RcEeAM*=y&5|S93kyW7^|^cg{H`x6nkZAUbYKeVe=0whyEo
z7yiPK?3lY>7LADbKmzp25fQFT-5F<QX6yp=WdI#Oggy@(K3ZlGY+Sij0@SdIP!FgG
zZAYTL<b%lW0W};l1Rf7~y%4?(W50o4)O%3N7P9e}gU<uON)V#h1MGgY2NbTan3~Bs
zumA-bC8#s6`?c(u2RuLYIL3#8Srx$o^y`x&BO~|M)zw|(f{bb*cs)Q~ARs<m>te#U
zRRHgV+A%5<j>V28xZ)mFpxBTLT$M1m1RWrpfoDDsXyY^t;vS0GxK#x8nE_Q4PeOiK
z8>S6kZ}mo2iF<&DfR{;Oh7DqXu+tE6{jF{S-oi7U;7e-9=jZ3obcx6+A;7TtI367x
z%{c+Q^ejS<35~mh=M1-sRz=Q^Eg6zhvtuW`)@4JVxD2WA^xTq+Fab?Y4I)e)@Oy#E
z3f=b=RuS=)NKQe{|NJ8C9<a>?I;apoOifJ*QgftYei8QcoXeph83edxD6_M(`8GvG
zMF{Wg>A7V!0F<61Glnr0LMNjkB(orFU(o*opzpXg3utX^g)7<BWYl&P2fc9Oi6`0w
z;2#gjXlQ7V`uckO$b`FPr=50^xw$!UKPI_8T6(UEnTH&5i0r-h-uW_Ie!u|-z$n*y
z=@(!$j<3b+)_Ql~h>M)?Ox(WD_0a_|_St72>FVn8w4-`E>>hxN%gf8<@WT&RWB4<w
zZSi-E>&+fWS^~`B;bD2>jW;mKFq38T=FQ0U<gmjIgWF}@x^=Q@)v9Ink$%^I{PD**
z{P|w-^gNZarRO+S;o`q6JwNu?V?`q(LsZ1c312~ckX-<G;!nxNBtpvtO+qq8_aVaR
zT2Oj!fJuaw&FQ(veUS)kZF&ya+#lkBDCv3V_^~K%PfOdIp2vOZxl2s$cgton_@@Ig
v9ub}LGqhzQwpi<83{B6M;s5mf|MdJ<5ex~uPNqIY00000NkvXXu0mjfcwTYX

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-export.png b/core/administrator/templates/hathor/images/toolbar/icon-32-export.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9d59835859af14ca48772a652575c595914e20d
GIT binary patch
literal 1104
zcmV-W1h4yvP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0003{P)t-s`}_Om
z=H~D3@9*&U>Fe;`-rnKj=GNBM@$&o3%*@x=->tE)x466B-{!@|#l5|~=I8EJv<ao9
zrA?#=QmhC{oCx*y|4*g}U&snsy$YbAs8_cM&Cb+9iwC{F#7C6}(9+mk!wN=}2dS&G
znVFfcuCBu8rN_w5zTTwb<m;}myvEAQV$BPJgo|)@by%At#_px;_~XaZzO=Nst**7W
zyt!=D8L8xdrm3*k@61z?A$i^_in(QB%MGH*hi7PTxXY?>yEb**B2t_d!{)6_kQJb!
zt7E1uz{kRjjguT49@E><Raac&^57a89JA|&RaRVOl|qw~lO`r8T&f*hlrY@j*<!0E
zetv#;+$W^Wi5?#zb9j4&g@u>VYNNfApvi@Mv`%i3SE|I7n!kQ$d0#z&2BoI0s?v#q
z#Y}sBhOOp>l$D-;-ZVgl2Cm$U<rm<600001bW%=J06^y0W&i*Ju1Q2eRCr#^l|_T%
zFc?55D)r*-jJnIZySuyF|M&gc1X?=7Z4diy@LsG0nEAJCtgp|`&d$%zZ%hg9EO)Eb
zFf0_l9(9CZjQ8rFe>a=$cK$6PgwnK^E`|5@>aj2Cz;#nW;F40Q^rPNv_Iky9{yDrL
zypsxeAfuqFy$%+vRKTbXVqY*bFp>n83EIVCxlqWTmNMD{O#+u5oH+4pw+g--hUE)u
zYloYR2V+kILVhimfyh^Z-Xq31PXbCxx6aq2@dXIFmGa>YZl!`CI>f<ln9pk;UfSeb
zq=E%1fs3a?0DQf7mUC_)G!8hG1o+d9eYgFA0}LgPk_CiDyoT*nD#eeWgMg#)5(FWz
zL4f$TdZm&-i2zD@z>*aZz=6l-!ooX*0ty64;JS<np_J$O_QNYXp4aGD?t<%%1B=JO
zQmf@`+4h#x^5&obun9WXR&N^aYR-Ir`Dt~<p(fb>`QXKM&27WV`zQAnYsdtPj+dpe
z^ycc^Witb|wzs$Y{r*1iC86K<WTYiVh%wPn01Wkg-vNBzQ_4aF0-^(<OyRWvD3$6k
zgyR)V0ZE#U&>oOdH%ugeMOb?iVE~Pw6y$#jVTNft6vLdRag3BeCwG4kqh!Q{kIyY~
z0~3HC7-xMt05F;o)M~Y(0VSD0Km22Z+OYxDa7*kQ_?&^K0|NNN8Zh#M+{7muwb;?)
z4G5!5FhlL!m;uAt0ARzh7Z}I}Qi_pR_(&jQJRK}yL+U~jLNMS*-pBfN65s^br~_I<
z(*Z(=0k93h7)NMg2^wL(8I6VzkW3cHA04n}7&^9X?+9W7<-K~EVFv=CunAz!ESxFE
zl$k*y(TGr4Sn_{{02U(*(JTm01e|Fs0JJ`dx$vgorZGCX5K)13H02k-%#&v3pYazF
WG++tL?}Q@&0000<MNUMnLSTYcq$eW)

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-extension.png b/core/administrator/templates/hathor/images/toolbar/icon-32-extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a45ae77ea68209166c6abcfa0d2f0809d975bc1
GIT binary patch
literal 2126
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
Ef?AOFw*UYD

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-featured.png b/core/administrator/templates/hathor/images/toolbar/icon-32-featured.png
new file mode 100644
index 0000000000000000000000000000000000000000..1662afae2170285d463aade2e5619b6651137dfb
GIT binary patch
literal 2205
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-forward.png b/core/administrator/templates/hathor/images/toolbar/icon-32-forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3ac95d324b9c7a17bc04279f637685f8dae0ae0
GIT binary patch
literal 1277
zcmV<Z1OoesP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0005kP)t-s`Th3A
z#l_av*8l(it*x!h%*>^wrQY7&nVFfry}h-yweRom_xJZws|x1k=Dg~cv*?Mc?nJiE
zqE4a;t<99P?{oC{@U`)5$lbTI*p;>RO=6Tei_cS-=r**^o^H_|-tf<@?^#o+4T07t
zWz-EynhA>DETQc@S)3xH#)NsMRJ`t!TeT9%{ad-+oS?*mTdo+T@IR>Mb+7PXTDuF3
z<Sb5*7iQ59S+5UhtTDy<S<v0ZweNbT%8QZNQc$J}#OtMA#SD1SAxD!5Sh)*;(Lm|-
z;7*<mVZaln#*B-|R@vyyrr~Usw|kQ0QLxvMU&0Srj4rR(jk4#0$?34^^5eSiijd?^
z(CEC>^1PI{cb45$x%N=F?}VewgPY`GQ<EQb+8F2Y-+{$AjI43T)x3<fYq;T-bJQe;
z;67)UK)u1am&I~!tUOzkERoDz&+E9Z<b001YMI|#s^m$Z?mB4L4T;e(tKoXE^hl7=
zIq&uA@%QYLzHxooBCh0vP?;5y*Gi7#FJ6~1U9lOw`BIhJI7W*NuHuAis5+zNX>hAR
zjnhuP=blTJ57zL)oZ3Hv#6Xt1d70-pQk5H#)J2lyGOFcnUzjJP-gbw_O<}benYw<8
zP2z_D0004WQchC<K<3zH0008iNkl<Zcmb@?1Ct{`6ae5?)#XaZwr#C#dpFtGS)Fa$
z){njE>0qYj%J;Pm_`kC8^`oQpcozOiEw$ix=M09&53oh527zo_VK_9)i9ZHKTd<2{
zGyO^4bC}+g0MF!XdCAPNRGys#4(s9<pHiu7NhAk>fTX2UDkJGdEA-8|?v8B-h<Hg#
zitVvWt~u!0#jlIfeU=nf<7`=ciFcvPxNy2tpri=he?=-grwhj34+Mv9lzzToy+;VW
zy*$deI22R^mBGuSxp~xgVVulZ#u=c(_Ept5cLK7$QK?kl?O~ucqAKnLV&0fgsiGS|
z>7Hmb5BU?|{I`VWw+<++-KP0kMI3j2nXbwbgIb{W6rXLp3Du9DSS;pI>_NwwLv~%e
z!n)0juhe9O`wY62gEHAO%7>7)c9RuULYLY*t?%$5^DSC)c-7D&S2*%dS&_&GT5&7n
zz|q9h`eEY76}Hgd!%g54`6mY4`cNn|9Ae}j4NUk&z_&It<*cMk9*-$iaZb&wfxyVI
zE9tyOBwfcNf?*M(QQvyb*s3@FHd7wkjf6lHRTY)tu+&fL|M%`dmq4diV|!+<vfd?!
zwlQb5_O6J?%&!+PGootmweDWaoEgA(02mR6kqy*MOKLq!|BrM8cffw1HViQl5|O}m
zQ#wol4}dKCXO3im2^is;s|e!+i|CwJ8o7e19)?k!1UKL<-9R26U_Lhx*}!9bV-lS!
zz>8AwRHiDL5c4S5ODTHlBy9*?9N}5s^uuuJLqOqGDAkXlVhT8f<mt?-;I%A(GZW@0
znOC8?J8+J(ny*3)*s+{T3JC27ZOi+aM?5ZA0Q`hY(K83(6q*EI6dd0}rd@;fHhg^8
zvLjrEA#j!Vbwh@bbK)fNxh=tn$Pa?Z;AYp72_1-0zr7#S#Wuusz8~hJeeB2WEf4ta
nwaoR%@lq}!8#ufqv+wf-JoJQzYLsRW00000NkvXXu0mjfH#VK3

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-help.png b/core/administrator/templates/hathor/images/toolbar/icon-32-help.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbf408cd9a97ee6a89ff95cc96a023a7a295c77e
GIT binary patch
literal 2707
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
N002ovPDHLkV1js_C>sC(

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-html.png b/core/administrator/templates/hathor/images/toolbar/icon-32-html.png
new file mode 100644
index 0000000000000000000000000000000000000000..1570f323ebab70ad8870c7c56c25573fea775a5c
GIT binary patch
literal 1479
zcmbW0c~Fx_7{<R4F2hkkw4zf%Mbt{cibz4xh)@n0Kv2|LAt+F&a%mA1$}JQK2vmeX
zqo4*k6uA#0LLx^32_b<bgaAn(AwWntO*jJS=S-*5zx&MW?z=nBytD7`-A(s!bJT+E
zh5-Pe<?Lkd39d%qfU85n+12CGUjU$F=HYtD0o?vSRaREEx3{Cw=$e`uDwRs7(`RRA
z1p<LkC?pUFY&N^AtBb{Ab#`_#nM^z$4;pYd92g7@4T0w)BO{<^baZrVY;1gdd~R+|
zEEY>7lKJ_027>{n0{t^HGnR?CGijfkvbsF;2;NV7uRrPh8P)4sOumWg4t!1yM)!nb
zXyF)2L@6<{Vko+-FQ$t2`&&jrB{{K%nNmxCRL4xMXZ`Vxl3q*8sHJ7r4I=A@kPUQX
z(=f7`mDNDcYGh<LGIAQIPq6HKEW4<AptyyK#*IJ2^ImpOV7hsjp2>3J<Xe)Un#8Z8
zOf{0mn@F5yGN-wp+X9NhYoQ5SDZEz7MC-uB`+>>#)JZIfg(Zz(!GOxg()d{V?1v8@
zKvrPwAdT+s?w+0=B9YkJ+uPUIN8-$r$>je2ehP&$Ffag;q)sf-Xtcq>K@ijse-Y#W
z0$~W2hKGkiZY<#vh;C$h8KlRaUj7##hr{7=xjY_kVq#(vltjws^TBoqB+{v=DX=Ni
z)6*bN5UfZf`Y-K;g@wh%#igaC<>loSP^<FKpw{G4sZ=JDt*)-Ft*vcrY{=zug+ifW
zZ1&}~SpMee<^@2Mpvo$$YU<ly8k$-<x_aC7ZEVh-MIaD<e(C9%nMh<-R(5taSolBs
zay{*XuKNK1y4~6S+@)wp<Dg~ioy+=NJjIzP6A5l?tn~akEDhG20ZZFkFdNx&GTJ?@
zO*JYiE&BMM{AX>2%aVgKZXCm{v7OUz@11$}LA>srQ+|O60Ktjhybw-KK&faTl76@!
zp=TYWask&d(98~T*{>E@dhCD-%jSGO0X}jFQrL^hb@4Y6-`>Z|vDc<)6hfN3NsldG
zD7|XCriW*9Vk@?8vPJzHYbvw?zuiTi>dDnRb^~%_|C55eVpC|CImYlrmNRDb2F*$J
zW1)fgd9jZ{Qhw>`W>ajv_^X3n23O6RISQ18p-t%PC?D(1su&7C)na}tRiOE%hkh6R
z_^H`L|J!9{-Wvx*ZA3WoqhhPmtw^RFH(%m(NY8?M@!jdjVAC10=+J2vG@x@?BO|~*
zc=gwXqn&=7kBWMY^_8@IwT6JH7%EgJOO9VU9_Ce63gaVW4i-P@0O^N~v(7LRZmkz9
z)KZKcd}GQXcVRh1_>qfdxe)7}t|oATS1fdwBslmS@T$?+>T-u^3*d-wNl-p^$@g#$
zNz<=Hf17%?Ud_P!c_qDIpu-lo55gVXa~|>XAwEK;U8bB<fNn&ba5uVgg#NYu4pTKF
zzNFGz$M(8aS!;)M@W)$oSo5Rjw75-5w>|}NlisZcV4W*cY(7O9=O!1y0jt;L4nDR>
zfLKzOZ?9c0%@0@J^MXDH-34z5#p>=Tm#U_EOuvclQ?)|pLF^(`k#Pmr*q8GXT|078
zk^>OBH7P*2PBfvzHLB$5H)2h@U&2Ek<gtidd5M}&B1F0Fvh|>iL=5T%!)G*;9Mjh7
zf=WLA?NS#FXa0C_?^Dc9FaHkP?7hgI6Pc&J%eJP*kB2hxSjPv>VS!OwZ`53bLh*fv
zN)#(H@Jj7HVZA(Qg&Zq`hM*q#tl-S!Tz#)5upWB)Kus)aK1Tz6imHeagW=ksEknT3
z>3gW2$-TS?xLpoJ2Ot`GWYn!!jaT6#>(&o=wS~ClFbyGmuJCia09Ni^ml)P7iVrwU
j@R0{>Uh!7+tSi*3PeNBcD)uLS`C!ftZuZr7h@`&(#4|Hb

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-inbox.png b/core/administrator/templates/hathor/images/toolbar/icon-32-inbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..490d275c198fbafc3e01b97bb29c7cf011196f34
GIT binary patch
literal 2461
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
b_Xqw9`C42N7jrlV00000NkvXXu0mjfyMLPb

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-info.png b/core/administrator/templates/hathor/images/toolbar/icon-32-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f6c8ca981ab989ff0b237ebfeb4b80212e51508
GIT binary patch
literal 1843
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-links.png b/core/administrator/templates/hathor/images/toolbar/icon-32-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd867afce4d51a31db78c5cdd3aab696885dc8b3
GIT binary patch
literal 2532
zcmV<A2^;o_P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000TANkl<Zc-rll
zc}!f_6~=E{HFne`sBO9>b&xEzRjWv@@`u%`s?*A;k~FmvDe50pDp^&P)@f~1Qfz~5
zz%kfhb{O_qm|+034%;x8ZP<!kZv(Z#HW&}!1-q6!Zt4GDzw?+pXJFni*sY>SMf&N!
zd2{dizI*O@Gs95;K2|;%22}H6tZG?IRV{b@s_h<B`#+#M?(4{F?Y`?SIM2rUFaK8z
zsD|4ys_}Lz146ZG!n#-}q3_WIxX#P<v5##)oxB;V>Tmf}^Bs!c1xE=A-ZQ3w$UN7g
zn2^^2#@V@U1FB|zi>h4+P>`YwTDJhcHl}6{s%jdl^deNj7*zf!RLMCg$5p=P=bZVS
zQ5#Uz{ut$)6X&uJypBxu4XBDs*p%%?q35r-a%~z5H*ccnZ$7+kYKAJiz&W$TzcV@m
z_8VSifbRX^b!4ipQ(yv{j<@34+&upI@F5l#7jgUcZQQzb3-|8b!#fr2P~{U6FTgdi
z5e+Eo^_|OsXTj^pSZ0`JiXU@n;tvA>%+1f^-Lgi!n%{^v?<i(xXW^Tmc=nJOkagb3
z2F%lbWxEcJYg0ajjp-hYU!Bp#f0ok#b%J8KV|X^X9+Oj3xOVLt)bYM$!&Xu`{c>0X
zs{HDks*;l{t}=KO6kNa?`At|_`q#4fQ7hDuE~uh$sKSeQCeevYmoMYWl`BwbJ+elO
z%V-O4pk&IX%C3N8bY!1FqH7HI@83sT-w;mJwj-;hAL?iiHYU4ZZSU2@$HymluUA{6
z#V?%-gg0Qi>{G>);20fQr?Jc4ja#hvv9Z(e`Ft209K?4LN-5r>iBC>WVo!M^RL01o
zbtRJsZ=moJQ}=hK)_{DbHs?Hder|a@HjI}JSui|2qKlVWs^IMG)5R0Y>Y!4(SrZra
zIMgvPkk3@*jju))XP$;i?#2uIZTL}M7ry^NJvQvIptz<*7jJ24k%9{m-*~8%nK~O1
zk2(eh^5k*37)lm*nl_B*4^+c5d<OqsTEc?|4{+zs9dvhh>*Bl83sLIo!QjX!%&u;{
zomB&MsEesT!x$GrV$y_xfovaldf^cnO!bi=JfC34)XWV80uQtgnF&7EUW$Gw{!Vfp
zR6Nf)iGl|@IeMT{2l?ool{l-(H8PNS9)t_e5fLAzxP#)enz-LThu0Ddk!x{=r2W@?
z6xHEASrZ*u7Yz)gpZ2QEbKtnl{tmbY$AaR1Y&&d*`ePM~ZdenqZ)niYJg4E5>{`~W
z&9O6}hJk^jLvd1U9G8i&lQY-S{_`Xg4Y?@PiEk%V;3vD&;O-yN3hsR~3oWrj)~rb|
zzAwCiBYm+dZGcV(nf_j=y>=-$?Mvkg@8+_oc)kbQvGKhURJC^L)&5GFUGB@8HRz*(
zQMryY{w_#y+tl$vaHIi?W?*4q0dFLmnEq01_(L8n&7HdVzOq_oiUyL~xu!ER8L}}?
zK&5zMj13%aja4b_0d<_2__GCdo_;L@Q~Xk~G`7Lh+pmk~Se<x!Pce_Bo<-OanWIu8
zr+Dp3UHkXI!TLCr+R9zE;<??~=p7uv%*;&4hs@qQGmj!4YM+A!>c~lBQrlR3J#y`f
z{wG<Y!=_T2X`%%icI9CE{!GM|*Wz~tRoD`r3AMX`;#L-)ojAgiR1Nikh<kYL^s7W?
z%=&(m?larep&AD1WI&E_Ce}qEkER5QPXgZ$&wdLFwvH+Ha4j==!0O|@EsyuJJfSpB
z?JEzcRAwX1%_4F^GnHs#U<<K6;-Hho*2H-ovU8b3qa`ktP!{t<|Cp#<X`5Aiu3aS*
zQ=B4V=4jgr+Lz58uA><<IDbO@DPy}*>eJz3hWr^!c#3?LY$h*~m(+_}-%`JNuSoqq
zWnAseTvC52gid@8wEMq#ze#P~{#(x9N`64TM_wQ?<TL9r@GSW;*+JfZLVg)E^ZBTc
zfPYVuO~Ku74Vw8Wd4;@2UMIg;f!uqQY?rw~wviu_?*=#Z#bE5GBqQWg5zjw3X#@Ej
zd4_z2e4TugJg2k#`WxhH<V(wQb-pb3gY&)>92tZ6B`$#fDN=~!vt*+jgJeMnUT^qh
z^auDGAeN+#jEwjRMn^|iA@>E&vymt559q=%B1|OsDlwhV_r!$YC6C`97#bRqUHgb0
z^f3r9&ieZU{K>V23j-ep;&nv4UN3rjdeGY1iu(F`)Ya9Yxw#o0j|T$-17JKu6XC>T
zh&TtwH4y=~+YO7&hQ9s*y+3gF+<BO7RoV~N{{DW=M6?FHWL@GFW;5pI=fd^}oV9gm
zZ*PZeibU=YFqJzcFvqo6DX#yEZgW(_Y_)<FsP_j>o;-<Q+{pa_2K5JnuZf(wt*Q!F
zr>AxCN{dy*wDUI=7wi22r_=e-wPE`MBK{^pv~+fM!ct||`vV0<CREXo6rN<Jps+~q
z53Dc{zCXZ1u@OXzRQv!(=@0Y|c=f8Usi{F_r5SEdx85J%y^pR9-yi7f>+=yrix_Aj
zEBgbPnI|aj(SN|&oi$=EWNlajy}iANgq(R-SC^z-8=IP%kY7+3(jTzccm$_T>Ec$q
zL((sq35m5X10vkf(V?ZWkmo8NG-g(QZf-6b8yk)K0~D`@)n*g35+^zX6bs=LcjI!o
zP*PIDG>;kf2gHoK%cJ!NI^10-H(O-qQj8KKB&MN(prDQj$gYY^CV8F>`vW|47G0&5
zq3Y^t8Rg7n=MrZn#s*eSY-?*nadEMT>-~YOtSs0aj*zr-r*agsCMvkm@CNAED-$>h
zvK#q&)%yb`Q!#6xa8-Z6&6M-YN7k%~WR)7>4Y0c7f>ka^q3QhrIb$&-pK@X%IXOkX
z1*PC*_hLZStVu9_`2GMZJvKN|`|_x$sL=ZZ85tRxPy=_JmzO8SrB}PzY?1r2CL)Y4
z2IShfKfn(cn;77T^73-MKTyEu-Na(d&dz3_PF-9I&SJ4hEy$XPFs{^9fEf1&_{hbQ
zfJ~Oa{r!4>fI-^iwJu)mbV`xR=YklB2t@_CUb{cQRL9YTq?J3)VbQJb4>0Y_N`YiR
zo5wYVFqWiUuA}b{a91{YmZj+A%*BXYJ6MQ0IXNgRE0f1hyT`ePP+WE{CjDf6{Q*|C
zEtp=}sXP^OEb^7Bz2^IdP)vlyfSC00-sANLxXU;a;1`b+l9-X;5>$j_)RFr#Peg;l
zk|h^;vi<<8e=~P&=jTAENGQ5FF~<25JSM$A5P|6X1KYN3dn+j^sfd5$Jc=cU!+{_o
u2)Uo0p5C-$$BxMTfl&V6ANctD1OEY{pxK+8?g&r-0000<MNUMnLSTabbLmU~

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-lock.png b/core/administrator/templates/hathor/images/toolbar/icon-32-lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9180af81e35450e878a54ecddd815433aeabc5c
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0000;P)t-s`}_Oe
z-rn!;@8;&_%*@Q|>+06l*7x`KrKP2<t*z73(!#>Q#l^+DyScQqw7tE(Yinzil$4p7
znTv~yb#!xkdwXVPW`KWw$h4Z600001bW%=J06^y0W&i*I*hxe|RCr#kl-X|MFcd>e
z-c5^_BwgnJ|FnXgrb6U2n3?j$4?Lib0NXEr6@jK&;!$l96onK&?uE26zr9ZlIqEIM
zRoXM>DmwNdQgKCJ(<}o3PJSCZ>3IO0^EZ8&{|rE}&P>x81JJ7@W&LphX`aS~{{&E=
zvIQ+u$~o=^$W|IDD7wxCi6a0s#HTthi%Y%(5FssQC_1ebobMNcXc2?1OG+;3aKX%6
zb*dG%jt&4s2(3%bIyg9qn`8qpO0tt&-3CcoFS%lnBzsAhLDH<3te!@omz@0I7QJM_
zon#adFU1{ePM7m}(PUjq!@T6Q<?Z9+bUMAio?&Es^@36xaoLhmo+pKvkr6vVnh4-!
zJ7tq48Lj^H(4dfbSTllR6nW4`gm_+HJS6x+0UK8o#MlQ3yP~T)2fzZiVP>fZfPd4I
zF9RUG8MNAufN8-Kz<(bwA-Kg_prs50!IlV`04}C+2Sjj-0A5^p543A<eVCwy;p2jt
zku;#F9xQwvu`d{L;9%Srd{`JH3s@c;5&Qcu93;tJ681#$c%hSo=m_+Z5d8;9Y1#i#
zQ*|i6%ZRWxt6P?oQqId-jS;t=CTPI4M~eg2fByUVCfC>|6MO$WpYNR$kq8(4S^xk5
M07*qoM6N<$g3$&Zg8%>k

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-menu.png b/core/administrator/templates/hathor/images/toolbar/icon-32-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc0b5fd498422afd76a272320cf047725f377461
GIT binary patch
literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK0003gP)t-s`}_OM
z%*^HH=J)sa*4EbW@$}x_-tX`4)6mVv$I8XU#lFA7>F)C2;^ofK*6{4-=HubO!o<3|
zx!2Ut|NsBJy}h)wwYa;yowwKH-`&^R-^0Phv9PqJw$A_m`LC|Brl+dj+t~8-_s-17
z(9_tNnVFxVp^>J>p`f7L-{Zx@zpA#zxVXF4*xrkz#A}JOtgNhgmAj>-rDTM!*xu!^
zvb9ogkEOocg`dN9k+qkt$&-_l-PzTGo4u~P&q8UB-{kF$s?DgRpUcL?#LLy5t;dg&
znO%LSg_Egsj<Tw~)Z^&!t+~ha@$5NcjIzDWrm3!AeyNI`w@-4QOm2~9hq2Jt-_OUs
zm71V+p3j)C&X}>!le5%`rpleIz?!GGdZ5k1&fIB#mPBwqlK=n!0d!JMQvg8b*k%9#
z0>?>2K~#8N)sw}p_BIeeJ!5v5K4!Sg3_q8dnfv|^Q9Dr=iEnpRr5-8D=4i$`amc^L
zpD!&pH!nZ^`ujIKi^bmF#YJ2A`S-!#_I5BB{P4$j3qkT7P1-#C^5b;+`t?sA4z4~C
zC<Q}o3m=z7u8Ly4Ugx>iBPnN_jxdAkAc%Fp7Z@{-S4fV#!e%^%STm-zF>x5qe8Ke1
z27vX0Ab>EWo)FvJI_v3>tX7<linx2o2rNreMKnngj>)Jk{EAnv93Q<JeOnX0-4?z&
zJ(-^D?tc0H!};YmmzSrfr|-3eFP@*gc=68kw|A$zchAqy@9*zE=!VKZpG^9eeJLfa
zCgpy&L&_kIV}LZZ27_5gIHcjKAw&!3)JtuywJU@*a`db#khlVqL1=LkqG;o-AZ~$_
z7;>kSUTQcBz_mWgs$;4bLr;jSDmMLoFdk2U>$7y^3H=}*_bVMyiE;02=m{*#7#OWx
zC}Aq}1aT~c7|FUr$a(jWha`%GK!H-C#lKO96gfvpIiloFp&j9~5_$kZkmq?2V5xVW
z?RSLP@_-GC^;<=u4pOo_7!JvQ&Bdc-yWKu+^Qy|S%F-5er7QqY36>#&oRN-@X{C%Y
zN+GXfN!b>l6d-B<7(>oU)DeiVBLo9bjA=n7K~G>zSW;#Yc0%e4P#d7^Brcy2fLVZX
zLM<pnTTmov7N~@Bi<F%SMxt!M2EJ?yd-Du3Td-%2&Mfo!e9;ybl})K3>%q9n^Ssxq
zCfzd>W39o0oO7yliQXY2QIojeUkE>xqz%$x-(G5_nNmwG8xVyTO1aog1BWLx1zjTQ
zloI{aZUh4;ij=SneL-14spe}lll+sw5=x~2gT7F($n9{UkSXa2Si>oAI{2Xy2g<)8
z=@TVo{Yd(hph^KtQU4iA$&%%1S0GqKD1^I~MM97zNd8Cs1(pIvDrubv{{R3007*qo
IM6N<$f|@xz5dZ)H

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-messaging.png b/core/administrator/templates/hathor/images/toolbar/icon-32-messaging.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee6080cd4035a7ee85a0203c2407bb7d20bacab6
GIT binary patch
literal 2175
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
BGY$X%

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-messanging.png b/core/administrator/templates/hathor/images/toolbar/icon-32-messanging.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee6080cd4035a7ee85a0203c2407bb7d20bacab6
GIT binary patch
literal 2175
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
BGY$X%

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-module.png b/core/administrator/templates/hathor/images/toolbar/icon-32-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb21806726580137bfc228a1304ddfc4c40ad60d
GIT binary patch
literal 2853
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
D_`-mB

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-move.png b/core/administrator/templates/hathor/images/toolbar/icon-32-move.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ef3a18968a977c575b3fcf442a516699340da49
GIT binary patch
literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000AANkl<ZcmeI0
zHE{e!6vp3^?$2QE%}iD5OW)Xi5l$2A3q$2H(9bAkx-d53+RV&wo|EoxW`EjQjdyf9
ztwKh9<8R&`e!qPy?f91IiWLLI05L!e5CcR4us<&@H4U;1rle_bHxYGFh!Xc7+r$P&
z;=Lb-0vvr?PGQQt*!mFRop3$?2mr4U(PtWfSpbxZ`7!@WBtA124DekQ1!;5BE=8DS
z81AfzTnhk`%jB1Z06ejX_*Ix>Cmaj|y8(b|@@qYn{t#iE34`+iKnj2x41jPwc=Xf_
zw-f;JcShOW;KT1~$<ylUW<Hx@t=nX~$p;{wOPB<yU(UYAvibnzbB=m#0HBUsEw7{y
z$`;GDb}d3N`1b(hy+?UJx!q_7K!XHWw*ipvzW<T{ApTMXD3u*ZUIKuFfmj9r)RU^U
zwUoF3;rsvq2LOE$0P=~rRXk5w0DTy@dlw=fehUDfHa1e|23ZJ80^lFt1p#gMZ(;!W
zrj~NaPN%yJ=1$)d==XsKavzWYsD1MGLlsg0z6L;uGLGGfa0_mYyc0gaPDn<n1n|w;
z5AanrMbX|)2HhZZL#*GI8h~E0_8d5CKR^{-zG8su4)E@GFTaFR0zZ;|2tR=D!wG2<
z_O`q;_*D8>`UpON_oeq_{h1W;+i$;30cwVe6###@43?4rN<EPPJ_s@XOAl~~iUDGP
z7$63S0b+ni06jfDrKV|GhG8U8_2&bLge`~q^MQkd0}7LE+aDsh6T$hYgsT0o7yz><
zr6NF_4^Zy&fxW#w3ex)ex;kq@B?+MYU2yN-JqzVkx{#Br8@#=}O@6JeuKH&!%*>H~
z89jXX&<(dJTUp)UOeRB~78e)YKnrd|m<aU%)GnaK<QFqjL^;gL`9M0ICRg+G^KCL*
z%vxFx5FD-rl-+3OR4U~G*lsv8tHD8IJwSB0FB$9Y0hG!PBw=Fae*vHgRxV1$x|6Dv
zl@)OT!ubK=4#s`3E<7KlHAhGKP%h2~F!P|hK<$PK@Q?2T&UHR8Gc!ZEgzKY=nLGc@
zJ|Khp;NbItiHQjc6Yi2$w;Kp<WoGS8C;^n6P;)*oIyy>GgbmB<hW2~_0KIakKOYzx
r8lubA^#_OnKK=C5_<Z2*{8M@k-!ewRNw*x*00000NkvXXu0mjfjQo`v

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-new-privatemessage.png b/core/administrator/templates/hathor/images/toolbar/icon-32-new-privatemessage.png
new file mode 100644
index 0000000000000000000000000000000000000000..5546a3162ebe92df607867c55274c01a9195c6da
GIT binary patch
literal 2350
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
U1L~|yBLDyZ07*qoM6N<$f~nnnrvLx|

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-new-style.png b/core/administrator/templates/hathor/images/toolbar/icon-32-new-style.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf23704f31625c03b2c0ac1d0962e5cf8bf5e30f
GIT binary patch
literal 2487
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
Bvn&7r

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-new.png b/core/administrator/templates/hathor/images/toolbar/icon-32-new.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4e1b78a832d6860537d60641532edb3a0f1e611
GIT binary patch
literal 1794
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-notice.png b/core/administrator/templates/hathor/images/toolbar/icon-32-notice.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb6db185bb7db4b24a6460d12c0fe4de078b8b3f
GIT binary patch
literal 1885
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
XFUm#S;53nl00000NkvXXu0mjfr-g}A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-preview.png b/core/administrator/templates/hathor/images/toolbar/icon-32-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..eefa6a51e00b6247d168daa1c351a7dc39d42528
GIT binary patch
literal 1080
zcmV-81jqY{P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000C3Nkl<ZcmeI0
z1CaB07>A#r>3wVSY}>YN+qTEEH#pn2ZQB@p=6bu{x=GVs-<fm|`TQmAVV{{c&WpT%
z{rKObI6oB#0EV+w@rMjxI=?hv=Z#MSs(@Oc3^4GXtYbI~3_9DS4rpR@^D{5qb@$WG
zy-yDqC3ry7qyR$F&QN9O^d-#PIfFTaBLgqp)ON~@SDyS1F!K(SR&KEQen~|uA#LLY
zTh>)0SlKMyF_WE|>Uh6<lpR-Wtbd`dd2QfVK+&B~5DZ1)Mt#D<E5eqIFqBGDW9WPp
zim+D2Bz_%<F%*plomx{AKvKTSaW~)Bw)HN%9R&XK)a|!i|NZ0lJ`Hs1IP6@Zv1hG;
zpR_0D&=_oCN(p=q2s(cv5D3uR+>F;`G8w*@{wWX6y^}Lmxc~>Z1L<^{P$=Y!0}}Zb
z728v;RnFgmY&MIgX*4!A;s?z%v(BpP(9_d{*vg~wCsb9%XIwVaKW9LG%St>QXCb(3
zcpmZ_bDp6q+QDMr&VUzG221#~`z1Of^A^(qj~Pvc8Hf+?_|&^-56=ZR?jrOu3qy%9
zx*`LFVuRfJ%MHvMn^V{th?z+eR*IBup`h_&=sR5a*$S*o8kGR4w8aK>n{dRM$GS4$
zYY`r^)=AvG+aoNemGV*hhlQ_!)v8uU*uHfq!e*3TLO(5j2IS`z2d{n@S8RS2YgDhb
zPzQ9^MUN;q%Gqg!T^741%&4lG0spaW8zAfa&;c==%8i6(G#X{flqvX(%sWzm1!Q$V
zT#9}F{r7LLyY9LN<Sv%rBe@_4IyyS00VyC`^mReeS4I?@2_~3eLLpI{h-*$g_0&C2
zIpvi5yc!EiN=n8@Kf^GH$K%MkfgHEqdh02#zyA7n!05O_vfg^@?I+J!mW3BIG&GDa
zOvQL>Yb&`yh*efurM{-7#;uS<A`wGw^oo2S$z+mXFi3B2FI81l3=R&;i0D>GZn@=_
zww-t0xgZM39e3Pu{bP?k_E&{OmgOs~umXNEHa13SX(_o+uwZ?ly1E*#k$2CUHH+VV
z`;Cn^-gv>2QmNR{(NSL<kjO>;F$`nD4v2Ulh2jU2*_M_ThKGm$+X{&^zv3z+GOZ7X
z!;7C0ALjf_pFUlRxi}7(rit{Zzx?vc!kzGIb(}~fh{a;a@9VF>W@Kcfur(lRtNf%-
zQ51#l?(W6Y2jrwzvaA>u2b!9iSbzQX3oFxYu)zi#aKHgbG0vVnyYMxTA81xuX(cI0
z(S{dZ1AYk<Yp=aF+ikZUwY9YiS4jLYF32Qg<&{@n>`#!%4aLP(NOWB{r44s>cH%dN
yVYn5NZ@&5F?F~2FupkOadwcsoM<JO|NPY+Mwih3s{o~F60000<MNUMnLSTY-5CY)<

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-print.png b/core/administrator/templates/hathor/images/toolbar/icon-32-print.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ed65a3333b0dff1dffc11a9d058d9ad4a4445e8
GIT binary patch
literal 2650
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
IM6N<$g0?{T%>V!Z

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-publish.png b/core/administrator/templates/hathor/images/toolbar/icon-32-publish.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bd38264d6e032fdbd709bd9d163ad8bd0635524
GIT binary patch
literal 1858
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-purge.png b/core/administrator/templates/hathor/images/toolbar/icon-32-purge.png
new file mode 100644
index 0000000000000000000000000000000000000000..c87eebd05c7009f738804b94cda424044128a679
GIT binary patch
literal 1330
zcmV-21<m@2P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000E}Nkl<Zc-rmQ
z$!{A~90zcdu(b#@sEFl+FI?$>pbaWj#vbo2(6Fz?LO?5mz=4!jf`Fk)nkEGUy)(dx
z<zNA6k|rUOIJQC>ssS$9GuaNg`A_)qed@C{nU4KtoD>PkPx|Q1TYmHVjXk!L@zq<s
zd1<|cW(ksz2A$LRSh;42yYh<MT~M;;rULZk<shB^OQrLF1NW5?q|9`HdL|X~OkPQ2
zzr^FD?)-kEr?8hWpR6hQ=?Nv%Jr$%c43$2=tkT&_K{_)T*rNN70QF8^*>etiItu~w
zvk67%%r_amg?p(7y7CX1o)UkY3rOjSfZjE&67y+3Ko|?1o<xCvhOoaGiSMJ%yo}`c
zqkoV*74Ts$prxlm)KLf$jy?G(r%-o(FH4FsikjGmA|7DJ?(UNh#)GL-g%F+01?l9t
zXGpdm@A<=YYCJ$}+>twoxqXE5itmFqJt(z}tHt+nA$or-Sc%p?7EFQyX^c%E=ENAg
z;)B$V-ad!pw6K78bT!pF9;SD7)rpbPRlidl)-piV;M`eZ0mnu|#v7v{dTUg*Gh0Vh
z$tebFekfv{s=*#ZSisSd2)+4x$VtWb4{OFT>~W)N^4CVf%1gr$LVuO&aUpU?P{1q0
zVdc4@2%#@~{>oUd`l=0wHK1yakG0Uzk#O}-!3#qX1<2~ji&0jD>u)h4N`qq)20uF#
zk)F92A*&;UQF<CZ_+5R6Otxwrmrl?p)9qV){m<E~t1Cc46UYk5SuZ@n6N6Ei?SG0F
zZq+gvO}Q%I@L*H}vSRl|3r>1ypz=u)15rQL4R+5w&f;ty8;ts06%ZSU$v{>KcpV=h
zb|umNm>%hmDW&~5mLQ4w;;SQJ_O`JYJKg7{h5BPzAgd_6J*v`i6oQwyJddlU7l*>s
zrmJ|R_`FTHKPG!BK)Dc?nlHqQKz4Ya**Dsj--eg*F;kHU>rT?XTH2$1arr=Bym+85
zLA8r(zU{Q8-xBg8za&f`ubO^MWPCf(ntzT-fgfX;;15x9$y9!d9r5jSi+vyQ$G?lD
z4ryWi@Hb(y!kn4-HmqTNM-n%}4R90O47<5qeC%Ww-*XGM+djv~jiTfYJV=5&;7+)k
z+r#H?<8Ed6@$I(#_rP5YpWDOt-3Y?g0FB)BjAh)wU1!rEj^lglt={TwJ8f-kO@bt(
zLFY6+R<2p%)zwuQ39>-z>+7_!v2hhPk98A!(;)FU2@D`e)|x!S6PJ=W!de+(Oi;jB
zSy>^@^pqF@66mD_>?$x8!ala&am{N1nlPz%?(P%QG*c`9eNFg#UK+E+rE$_tatVrp
zBpM_^fi#%bb*JL_ocQm<<>loRPz46~E5v1h1jPRxEiEk>;1q0vR3W(^ia-K}uz<zI
zMM42ilA@yB5M8}esQ^J7xh1-KWnp1~(3kPCE{M~Bs$p*d`lPS`uouAmH_r!<NCL8&
zpPw%s`(6HEX->Zto12^No(~|Q31r0!$-0P@E&J_KZVS*H3J{(IYkn~JUMKFJ56sQY
z$v{>JW_K{_*;og~vR{HE6ifFEj_tfXA3#7B$PRZhD}*K4QXETcnx=K$PWDv5?Ch)r
zMIbvQWQDMVWhj6pVe3w6dp>|bxm-l;w)cEsW@bhP6Q~9mVFH&$NRaW6*aX49>9rN&
ohZN`)l4?+YK2U!?@c(Q70waYghW}LdSO5S307*qoM6N<$f(DI$+5i9m

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png b/core/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb40ead2cd3415f4757d4333cbd02b31f7651933
GIT binary patch
literal 3054
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-refresh.png b/core/administrator/templates/hathor/images/toolbar/icon-32-refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..e974d56fd3ff9520f0e21fd7eaf084cf7551d173
GIT binary patch
literal 2026
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
IM6N<$f^zxXxc~qF

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-remove.png b/core/administrator/templates/hathor/images/toolbar/icon-32-remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..65ffdb3e859e97669efb654f815a64e11d228cc3
GIT binary patch
literal 1278
zcmV<a1OfYrP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000EVNkl<Zc-rll
zTTfh76vvl%MWZ>U#>?Az_UU|t`3Upk`+NjigI3e%F<w$_EU2|$rR;`Mss%gTYHf)b
ziC7aboT}J%7+|h2&J5)gcqmB7a;=kdaAtEZbK}8;fAY(|ti9IypFOu^;7~OwT2P1x
z3>O59mSQlziZ)5wixE1-HE6oN%PWKqBSjOwzmIU!M3{K6pC8r`#!3iR|Bli55Hv;K
z=0a4=gz*wu%}0ye0BH|laM@;s_Gmp^ux`XUH$w9(%YyP1s9Tq_5g1yro92;<A$*e!
zf=#gjhSvsM&eUO|KON?VR^x#T!liWWT*>iG@!Wu#)VHKUf6BB9TudVLHNZgHx;d)Z
z0aZ&Z2<r(hEFy^i&_=Qt`MHSdV4Bx5R!le6<oMo0P+b)Q)ibYJNxcgQJ&8R+*K+8{
z+}=ekny!e8`Spsp(zjS1=Nmw(Eg(=|-Rpq!38b+C{kK&lRhk$|S}_q{M_Hk<Ol6I)
z<7@z-`>q1M>bhfC31{zA5E@P)OEw|yJwRDT>7kV)W7iFXufF^X;mjPu7yF4!<S<Cw
zTse2wEuWk7sDrOQ{}Z9}4^JXDGw7w{`Zg+EbDp_&?EnL(ZzFu_kC?lUZqje%ee>+v
z0R~RZq92j#DfAP^18M{qI5~q}M6M;V8u2-wIspbg{53|PjCy7kWtk6mFfx{~Mp;_V
z@0{mG2z>SaPi+LswB1PTYp$J};g~hbCPIC;IVNL5px&EMLBD}AYUd<1`3G4%YTdUg
z;=Fd^Mt&WYlRxsljDV{2&Zr<zMm;@&q26Dt(Jiigbe-cocjw)46{^ySs|uVLGzn}T
zLps!?w+A$Ms~?-gr6|;;<01@io;L}spWY}Ozo0<fYVX#dy~}|1vsgRbIy6nMf2PB+
z&LkY`z+gI~bY6o4(a}?3IQoeWZ6C)Z1nsv`T!jYpDDgP)B=HpSv`s6oJ!rMhJj3wZ
zWv|t$9iSFFNg-Y!UL;<&Ib!cWXY(v$&!3mhze2pk*n3Cpb5B4OYGJ1~k1=KI7Mn*T
zS_1Q&vxhp=|5}+$Mj;}EAYugCB<;0MXwYn>(`kj^;wFLFY}O0MP>jxpn$<i+SdGh}
zy$Ynbb4CzKBh4d()HE0=$EeFhDwPU5g=lOPqt@msVRAB!jo=vIc}Fb<gj@5Kl@(lF
zUBz53=h}>8rfGV`85M$*OeR$)f#!SU^Lcc%ySt0a%gYt<&CSj7I6rlH+^Hw3G0;Jv
z3_lr5HsLgv#D+QMh7x4JC{K`XKsMppe0zJFbG!%#8Nj8bC0B~YA_j<?^Yy#t+qHG@
zlay4GiJhGtey#oT8#lmgY;2&L*4Ea7au4(dSR8N6z~bT}dLT9TH{nw!&_K*3iQibR
zpMpZ6V2zUam(j~W2>i6Lu+T=JOsQ0on{yM6@hF?Hz9U@fm_Q0Lpt>aTyW45PBmYQM
z#Ch$+x3;$UwRSTgpc*9-2|=I?n{dA8UE+Mb9Ot<gYPALw!X&VX=unI1=jSy7n?w}q
z5haERv(e^+0`)2$k86ZMU>)etEO9X+S!LrWp&iKo15;B|ug%QNd|(*Hq{Hm&?Bw+H
o^hJujA%uAK@c)6s{|9Q(zaQO%#xMy=L;wH)07*qoM6N<$g0@_1DF6Tf

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-revert.png b/core/administrator/templates/hathor/images/toolbar/icon-32-revert.png
new file mode 100644
index 0000000000000000000000000000000000000000..60b139696fcfcd349832a287c324ab658b8c3d12
GIT binary patch
literal 1388
zcmV-y1(W)TP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000FuNkl<ZcmeI1
z1C%366o#u2bTXc`ZQHxgwr$(CZQHhOD{I?koT+|)^|{IRtIc%!40@jGobTMOM&1A3
z;$#%oz(s9n0eTJI4}kzkfEcLqA_EEtf@UAzG4h&aZ|yYk)7wUzF7A1e0UZ>dabV}c
zr|r}6*2bm2-i({9Nx6R%?%xlh^_2ky1gxm<9edSf$8>+ANqL~R^~7Xs*_z}GN`Jj%
zKm*~OMmFzy&jkY?Yf|b*)Ew?i;oMRXnYI2KTqNsSfCBuW;<+0}9Jb@|W>@$$CB*n<
z$D(YCXI7p6;FP(ztOVSJ9}}cNjI1dMuthz(W!Kxz9dK9cCdP0PwP`sA42DGbG&MZ+
z$*rDIkrVNbC80`K6Tnio%<MDRSR%9Ng&$Vle9H$*exY$=W+P^~sBa#1_>QAmT;bPP
z2n|@y?G2mRYqDF^$ua7=YrB|qibrqzXvuE3e7NL$>b~3{4A1;%&zE=Ks?|+?E9DgK
z7O?zQ7^zNOX1B;33m-JN;(W1|$g@E4sY<cknF*-xscvu3R<}%b7D!?YpV~@fTo$mY
z-F9#6`eS6}J*i|>%;Z_;61mJcT4yoT^|F8zSiarypI`at>$8qrw>~-7E<h55y3HAv
z(r*^3S3eCiVBH0GjeigP{PjayUDdBs$q~YtJPtNS)2pBTbkX(YVc$kY+~nEpaO-(I
zk?{}dP_$pSX2!TY8FE|)IL+0?V@~+uoa;~Q`Til>wZ5?|q_t<11rrn-TIFYdtoq^8
zKUPm9;c_wVJgfuj)-*Uy>JH#;Db9ek7e6@p-M0IDxK(84`lsZ9dGz+JN0Q(~9^ye=
zP0=^<Y$+^2&c@i&zdiT)PZymKjb&Cc649xdF$B+i1=m0O6z1+TAZKIENq0_s{-nDm
z?l5h^#@9qc$yC)m$IU30F%m)bnjT0vh`#;9^2y+MT%QW!AmQLY{{qHqAVAts*0_6J
zirzMxJUJ8Eom1a?EP$EPLM31x3ZPLB=k`o^cr2Iq5S|?i+^aE=XAf~+3F|2fJP)3A
zfgC+ia2+`Q_~Qq{lz|X1KoA57KhO!4P_l^^WHK3ZBb(Ec@ztA;Y7~7H(~aGB+fB6p
zo+SX4d>R7e)DL{*Oe04oIZ9{i^6Xbtm5q<Lj2!!O*`#zjEuv3x&c*wQKp?Q8qM|If
zgDOWHal}9CujBs({4e0N(@s0{)KgEL3yuV=wy17jJpJ_3+rjx4&~OK62gZ7q0nF<&
zVg3N)Y`4eP`)@>=rj?nd`35<b%a`?<0XW|iW^Ogk=YdFF2vC0c<(I#vMAyq;o<QV#
z%IA1-P4#skl6~gJ0wMY;0BiG?OeS-ca5%gtIWLoyN=NE4IWyJ0FMYQs=x>RTyP&A3
zNc6R!Om3vG1Lt=o;aB7x0~EE~po5bdmv(stM5EEI;NUFk-x?Q3k@Vb-YOg@Vop?tG
zi8w{?nEt}go!0?~5YGFDLZK`1;T6?1Fb^EXoXZj5$Qmz1u~_U%!!X_yvjX&!qHAYm
ziMmTs=tO3_#<7f%068=6m*RLl9s&Jn{>lxEb3Z0(xfdi73DF%}QR=BtuQnqpSg^#}
z-yhEJq+9bHUUwY0cJ%B6mzfZKeil(^2mO1Th~(%!7f|y-=#dcB`_y|R08ZWS1@(a}
z#QQ<$?7ZQ-z;PjZ{`u!?_4@$GbnV);?cl+K<-sTxvx?VWe|<En-vFk=S)KnrAecUV
u`ZREg5Cf7RMK)pokBNd`L;l-;oc;-9L3X;K_TbI{0000<MNUMnLSTYKJG>VF

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-save-copy.png b/core/administrator/templates/hathor/images/toolbar/icon-32-save-copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..3885723b13678f9478822a351f65f019ff3d22d2
GIT binary patch
literal 1601
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-save-new.png b/core/administrator/templates/hathor/images/toolbar/icon-32-save-new.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5a115a2a4729ca038c84f3db6e941540ebb2a22
GIT binary patch
literal 1729
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
XxIY0ZQwCv900000NkvXXu0mjfm?#(9

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-save.png b/core/administrator/templates/hathor/images/toolbar/icon-32-save.png
new file mode 100644
index 0000000000000000000000000000000000000000..399dec5c32ed210a3c56ed9da1573896258587f8
GIT binary patch
literal 1225
zcmV;)1UCDLP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000D#Nkl<ZcmeH~
z1&rfH6o&tCCb;A+Gcyaz%#5OPE0)U4-K+R2W;zy@nHi6nnHd7BY&`bNYo3&-Imgb$
zKEBH*jo!k*=QsA)Phv0A5$Fi)y8=%?^ZZEw9tSWTz;6Ja8yI*SM1)odVJ#mRcyBp?
zYXEQ@-BO^s5d0Wp>~uOk&9W@J+TeK}I6964Z4CSjmIhHQ7SY?=i+nzhTrLN#H4=#g
z%H{Hf0G^MO0V2A{bzQsKzz88gM5t68cv{2H)M?Z3_h0|u@+&UGF-ISRQmF)nrIShd
zoKk8=SSF+~Iw%9+#W^<OI0~Nj;D<BBeK|Tx)yHw<Oz;Ja3Kbwipa3^NN-4Nrvw-$A
zxIag?CeSXDt^H8Q1dejxy3PHw*({Dd_E>OK$^}Ic2<RMo1$+<izWO=-gcHDxS-E0G
zv<#Ra0Wt_;)X0(8)ks4-&OjlbM^vPg=<4o{o&mo=F<-!#aib9xeiYw$<E@<+fB>}C
zhzK7>JWq51|5G3!VhJ$RjsWfY3<S*+e+z^Vdsl$b+U&&)V6S9=P{*<ayx0QNjsUeh
z2`wSxXMjw+lhCOQfmt+v9!@*s%-90A-Fgcie)u8WfBysF0=$@?!D4ASe-C6bSqznj
z@Y9b!A`X+rkB1;ae#_Q;s6h3fs54>mL;*l-+O+A(FTeOQKYR8ZTR9FEFIa#$^!N8;
z{(^;g>D5<o!;Lo#>$mLzFaV*3tS*Wg0)PcT&YU^(`!mlvOPz4ii6>gZI&Y{_fib!_
zlgXW9j0X_GP~$uTmf#?eNJx~5#qr5>8eO>@e@Fgv=plz}oiKj<rvM}Xy`2D>5!YXT
z{Tu*G0i<hv1UE#302lx+00%(1VGdE3kRby&DgcR~K|4VB(rjv1?bRZ+$^Ze-4I;Z5
zYPT?<PHEN==m>oK-S<u9`PEln1rVVnLM;FN_dnV%&#MasRmZkW$Z0|dyV_uk0Y}Y6
zC{bX|s2qh<It8cVAel^p3_)0ei`?ktIS3bNqiv(jc4wgH>A-jV`t|FvYUS!`d3GFn
zx_ej#3`<)H>p87;czI4lK^Xuq&XGYacv>Uu6OQ|G<UaLr99dYPMR^WFpg@qA4i%u9
zK(#dp)a3~j?VAuG1GM%6zw?q(qNlfqW9<u?qC5q`TMz`_1H7+(di(mgfhiOUq2nXn
z13}D~J{=L*bpn-21yQjq3#n9U=LPt=zWbiL5EVx${QAqUyC4GsFhqz7A4WtJU%+2x
z$6(h97^1x=AcQ!`Gr*A9;{s^d0>Dt*EkHX00Ruq|0v1f%44{n+1a;D$3uf!)&FDY$
zP*BVaoPOG=IRE_f@!^Lbh70gwew3q@Ypo$=5}xZ}+0tc*!`d~g0Rk%Jq44s&`cKqZ
zvu>>bAYOd&#U~doT$taqag)s=TeoaR95R^<HgDO2OD?+%r<{7qu=j@#Z!XWPi#C<#
z8#iwJ{?J1YQ+>95qJTKh^E?nyZ$ip*Kn4u?%5x$9zh@lfjOQ{vm6Xt0|C7yTx2{>e
ny8ZHe+_-U_^1M@??=k)Zl`2v8IJi`e00000NkvXXu0mjfsu?W=

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-search.png b/core/administrator/templates/hathor/images/toolbar/icon-32-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3be36a395d2f7948071efe4ff04dc57c6ff3dde
GIT binary patch
literal 2241
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
P00000NkvXXu0mjfahEw5

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-send.png b/core/administrator/templates/hathor/images/toolbar/icon-32-send.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ae41456d8db18a02aaadb1e2d7b1ca6fba6121
GIT binary patch
literal 2041
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
XkmSu0FI=-K00000NkvXXu0mjfvUkWD

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-stats.png b/core/administrator/templates/hathor/images/toolbar/icon-32-stats.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3eb1ebe91686b1c61bfbec60462cef178ad1d7a
GIT binary patch
literal 1127
zcmV-t1ep7YP)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000CoNkl<ZcmeI0
z1#sh55QfW)S7z=|nVH+6!Z9;5Gcz+YUl=r%W47a%nc03}#<Fv`U1_dr<lb<il6K}B
zeA@lrt}XxGtHel)YmwWK`;Z5_fP0Z!kZaNlUya;~Jm0Oy?AZ@ZJ)Hm0r2SN9gL(7r
z`fBuOtn&nNV@Clu-uV1G?>)F&RrSag7j!lE&C1ea&Bxh`Uyi$PAG+;Gw>4G}iW}bO
z-W}`S@P~j0ZXC3=@aDyO5Q^)+oHYCL=Yfp}ukN#vx_XWl1mojzbD0l3Ct&R2_0(R8
z71o`W!KsoUoYsdR!x({Va}0JAlt8|N0Ocx&?>&`pKxze9uoe{I22e$t;Dpu-#mP1v
zr;CfBIIQ5v&?!J2YXaI^1=*Gud^2P;U%-Y9>nM}O424u71OfpF1OpHbhann^f>Nmf
zLXuEcRtgoB<)Al|Ky7Ue)YsQRV^ae-9Cm1HYvJK>$)T;`Pke3~nwlG+va*8BId<%*
zGyxmeQ&zhJPD#|TFP7p_qSr%ReLWUyf|k}+aJroE%P+q`DwTqB=gvVS5`pwcM2i7Z
za*ooN49=fF2d!;wc!{cio&atHrzi=W@YnJ9UyMNPfY<@C17Zin5j?PI)5by}J1}9w
znAwaG<~-rrwX2T`<p+YH0E`?td_+fQeB&#xy!^4=U`R<MMG#LUA(13dT2{`e?eq?)
zHL5t)e5T|7gR7Y?psL~9w{JB{iX=%%5ly7BA|hAFNJhqKqEah~Myn>pIxWe|%OThW
zVl)|u*=!;-O%a>T!b3uzBsSAA4k>+<SS;pbc6OHR_19l}pEIOfuxi*3#ly(c$g^Dl
zllKASCic=|h#|&5azQa<$dK7fmMqC%xNsrW*<jwh?%lgzc|q~wi!Z*nckkY+GiS~~
zSF?8Q+P^L+X3m^><oNO9AQYc`@(F)IfdUE-9XbR;(YJ43{(@ra)Tz|IefvNtdiLze
zcSKvaZlxR!2b7eQuzr9c6bi9FwHAv7VzC$`5(!8qli+kZ(HoROMMVYvzE^_J=YyJ>
z8XkCtInUvCyV<jZ5H{z;i4*w(4jec@#p7{65zIlB>gsAV9<^+Ndd3elHbN760wzH#
z`hqt6ZU6DdA6Zf84|qhQQ7#X{K7(i3=b4;1a=w6r2M<!1h!uc}dEmobv7dkb8A?k_
zp}oDGH6s@;TwrgU9?TgO&4Ia@v#hx0=H`E%0B!_UtCg8IkN?F8#14oZ5IZ1tKpepX
z=u!%W?7(ac-hu)R=~1ElKvh*0Oqw)_zo2;Qt+zf727@VdE}UwnAgb;34&a!tyr7so
zdGhd#j0~e*uTLVxU@#Dq$wcIGIWe2f1Ro?en~kW|YJ#02XuF8Z<sv$rj(9vC9?TiE
tcN{8}is0pvG)>FiefQme&VoXW-vKaUcy&9OHBJBk002ovPDHLkV1gWL60HCL

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-trash.png b/core/administrator/templates/hathor/images/toolbar/icon-32-trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..89efa4ac031735a053a430f4b222516d200ea227
GIT binary patch
literal 1762
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
Eg8x4|Bme*a

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png b/core/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png
new file mode 100644
index 0000000000000000000000000000000000000000..32b95072766d03ea0785d34cd1266ba07578cd57
GIT binary patch
literal 2398
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
QNB{r;07*qoM6N<$f|n4SkN^Mx

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-unblock.png b/core/administrator/templates/hathor/images/toolbar/icon-32-unblock.png
new file mode 100644
index 0000000000000000000000000000000000000000..eccc84a45050d1f86bdff386f0b5a02a8621d96d
GIT binary patch
literal 2156
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-unpublish.png b/core/administrator/templates/hathor/images/toolbar/icon-32-unpublish.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cf06556e5110346aad82bdcfb58f492d653dc37
GIT binary patch
literal 1563
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
N002ovPDHLkV1j(w<2V2S

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-upload.png b/core/administrator/templates/hathor/images/toolbar/icon-32-upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..e41e613b80683d364582be7e20c445149f7d102e
GIT binary patch
literal 2004
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-user-add.png b/core/administrator/templates/hathor/images/toolbar/icon-32-user-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bbf9d819b1296b2cd1c5a95812101b38312885a
GIT binary patch
literal 1499
zcmV<11tj{3P)<h;3K|Lk000e1NJLTq001BW002M;1^@s6dyaLk000G|Nkl<ZcwX(9
zU1%It6vuzF*-hG%q#GL>Qi^T_K}6|3wSa)JeQQda2ofof?&7nWf*>f6hWd%XwlDgm
zZU9w8Xi7h*P`gQ?fKW(Yicr&LG!>-wWBZZp$L!2?4(@PSH#5`59s1G(f6fdn`Tx)V
z-h1xuiJ_F@QAUhM9C37D7zTlH{CXNkP2f1gZpO`EJCgG_>L6nSMFK+HUb_QAu2caP
z8-{i;T*Nw{y%S>b431OatA*s+9SBDbCzkxT^0Ka80c{CEnp!0XWLv!lr1}&}4Wfjw
z21-OI$za=1E{Pz)a5S4x$c0eZLgJC@ET~o`C;8&nbn68;D%C*PAVR+jL`2K?fF=qM
zq4ay}1vttSLeK6%5lR&!SORBW6NZR*^Tqkr3mDxxFE03s&`UENT`P8+DZ<zPc!UB}
z-bFD$gvt1}d~^cF227N5)OY<A+30UWN0~myQSy8=0;aAe$zRFv<!?D0<-%#)c=~yf
zPcDx0(J$%$-v_>1O4YC218z=Z#GpL^<+83?HEqHqO6BC4!?Pw%b;iXkjy1#KVe`Qq
z`2JcB)S^q8Be5<`XE(I3lU@(Dvx@av1j+_g6Qodf#>LmD+9L0Lo5Lp>zLFU~{CNn)
z1o3tC3#KA~nym?K$#v8P>1T_iaf{rR&&g~)3jhi*1PUx>sF39~%Us<7r6y?W0ILcs
z_n=w^Tid<L`fD+&=8_jFJoOHl?z31$xPA?;UQt|MQdl>EDucwB<C{d%PXHJOSQRvh
zwmMLRvKjCGk#y`T+=u16aBIV>JoA>t?cOZQ_kk4wLVj#@0Zvnc2^Ha0k5l9A^~b2*
zg}-mY!Zk&)<9PsXtF8R;m!h-`RO(Ln3b1RSnnd_iEwJmTk*qFr_YU0X%dq+NvpoCK
z7=UD+9Q|2@K?NxL9YeWF%cW$~{q6*<zX-0Q0=A2d&keEVg_rSSQ-2CvER+;%Fu?FT
zhGPRgC^h0j`o5_}1XwTCiwHplx?)h8euE1i?_%z!DFDe_{A?Fb#0{td6(0xcM{-)g
zTH*ud)+^Fa$M3Mdc%FO9;sSIo|4#Rf^K9GzSO65G`DJ7?Y19;P8+sG4@xoyi-i%9T
zQv%v-z!Gq@sS&jd?<dAl<nRlFJRe%w=mZGfO$?%#Krx68lNghHYUR<v<6p;*1;lxX
zICJJq8kkT@4eP#v<UDY2XlSSyjRTsz01U@sF+8-jwaH*3qm(L~Jb5zW`2Yw3wr!&w
zz!Q^p94C_bfK;CX27SgXB1pstBAO3qashx}PM$b%A{~W*R1>-X04mu^0ltLI)oUS9
zIAChBP#20(I4~bfs`K8xds{yr*u8tV2rz*#7b2Sv2-#Gq3z5zTAn&cO&oMOj?b{dK
ze8BDVvJsC4EJ5`10l*A6j`NY+hNn)QO4eKKHXsvl92cjjrzhR_nURr^Krx|T$xfd>
zovM=_0Mgzl-*Ft>j{Wz7e9jahZl0AqIy!2G3(({_VBEXqJYw&{0fMq8;J^9E{{8z8
zh6xbzL%@XG@%2gsL8J}O-e)^IJL%}?SZ$xo0NI^8clyi+U_z?)DsCnZ?}S}lT|zEm
zs8*}2tgJ}(1PlUm=gyt;nGfi-_9G3nUdZF|xaS5vJw0-K>Fw>6f~be@d_c$^;^xz0
zJb3PTm3zw|qRQp6=P2MeAJ8Hm*m|HrfK)0KZ{NP1fq?-4$?Vv%LxhF)fud_w@*%Ak
zH0+nYzCQZ<`|+Z?yIT<YUo%;+9$*B>17?WzO#qM+bm`J13WWlfFJA_b%<Swei9{mQ
z0ru?Kv)1{5kj}}sW7)`+N(IZZ03=f?m1u8o2cn!0z@&GQq}rvWC28f78>=V6`G9-I
z$AKLFk#`$WHYx{j|M(H$6=0_MCMD~Udw4t__y_AdG=W*`Mb`iT002ovPDHLkV1h_v
B%?JPh

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/images/toolbar/icon-32-xml.png b/core/administrator/templates/hathor/images/toolbar/icon-32-xml.png
new file mode 100644
index 0000000000000000000000000000000000000000..95831db9fea4add1cd48456ff914e7f5699d2018
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq001BW002M;0{{R3Oi+cK00021P)t-s`}_Ov
z@9*j9?B?d?^78fG-ro23_tw_d*xB36%*?*NzQx7GZk@Y-wAReh*4X9ke5}j1wzg)G
zt*OoB<nQ)ggq&oKsf4Dy|NsA$!QbHP@|m~G-Rba>vBizB$GObdgq^Nph@i>R*uL25
zn!3<+rpB?x)6U%Hag(W?xXFgJ({Y=%ldZpFh@pL{#^dbrrNh>hw#s6Mply_`(BtpW
z;p?Hq+r-x5q`%Nn$jnv%0004WQchC<K<3zH00068Nkl<ZcwT*!<&G;c3`S!LOnDhD
zGc&#alidlqNk-lCBiofv?axtE(_jZ`0faiF;GqiO#W`{FL5MHD>?^OYt3VMi;)U>j
zb9-^VJHNU8b+KRPDToql`M~d+%}ev)&!gYFuj{i$5a(S)9`E;eyKk@lzP-OY`*9Rv
z)o-^hxKHaR|2{swet-4z&DCWUe2#!LvwipZdExSzNgx1H1S?Q5Dnt-Z3*vnW;aon&
z(I7}!a+cDE#R#0ChB8!zLK8p*%>WCShYqI&0-BK)1m;$#0aYOG1Qzm=sy=H=q2PVI
zviKK!fvQjjh$Mkj=pw`q1igSXfZPdICn!;XQvz}V8etqjB#6kJfTTxxJGK?tl=+s?
zTI@Rbyd=#9o9oseg%+(t;37!(Xw!uei3?;3KuYtbta*Up_kp1YD_jMRqmdx3NI_Yx
zs&EVm?1E<jxpBZj1ylfB2xNi>0A5YD=}>MHLI@1r5jvO-w#h)n2&>>%65KS&bkGqg
z0_0B9LD38)CMz~k*M#&>&mf?N$R{H70^k6TBT5Wq%#erb{0g)gY((p0hk<2>#ZM3q
z0>j9n1C}1A1RUW(&=9rBC@gp|<Z=tsYzcYMrGSZ~)z`p{(8Kxh^c@)VD415@aRFvy
z`Vm;}VJ?)q!K2Wkbt|?Cws|g4Ap-phwCJlU)&JL;9xJ$(*M<N9002ovPDHLkV1ie&
BhcN&E

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/index.php b/core/administrator/templates/hathor/index.php
new file mode 100644
index 00000000..a29cb294
--- /dev/null
+++ b/core/administrator/templates/hathor/index.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app  = JFactory::getApplication();
+$lang = JFactory::getLanguage();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// jQuery needed by template.js
+JHtml::_('jquery.framework');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Load system style CSS
+JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto'));
+
+// Load template CSS
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for colors
+if (!$this->params->get('colourChoice'))
+{
+	$colour = 'standard';
+}
+else
+{
+	$colour = htmlspecialchars($this->params->get('colourChoice'));
+}
+
+JHtml::_('stylesheet', 'colour_' . $colour . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for rtl sites
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load additional CSS styles for bold Text
+if ($this->params->get('boldText'))
+{
+	JHtml::_('stylesheet', 'boldtext.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+// IE specific
+JHtml::_('stylesheet', 'ie8.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 8'));
+JHtml::_('stylesheet', 'ie7.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 7'));
+
+// Logo file
+if ($this->params->get('logoFile'))
+{
+	$logo = JUri::root() . $this->params->get('logoFile');
+}
+else
+{
+	$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
+}
+
+$this->addScriptDeclaration("
+	(function($){
+		$(document).ready(function () {
+			// Patches to fix some wrong render of chosen fields
+			$('.chzn-container, .chzn-drop, .chzn-choices .search-field input').each(function (index) {
+				$(this).css({
+					'width': 'auto'
+				});
+			});
+		});
+	})(jQuery);
+");
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<jdoc:include type="head" />
+</head>
+<body id="minwidth-body">
+<div id="containerwrap" data-basepath="<?php echo JURI::root(true); ?>">
+	<!-- Header Logo -->
+	<div id="header">
+		<!-- Site Title and Skip to Content -->
+		<div class="title-ua">
+			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
+			<div id="skiplinkholder"><p><a id="skiplink" href="#skiptarget"><?php echo JText::_('TPL_HATHOR_SKIP_TO_MAIN_CONTENT'); ?></a></p></div>
+		</div>
+	</div><!-- end header -->
+	<!-- Main Menu Navigation -->
+	<div id="nav">
+		<div id="module-menu">
+			<h2 class="element-invisible"><?php echo JText::_('TPL_HATHOR_MAIN_MENU'); ?></h2>
+			<jdoc:include type="modules" name="menu" />
+		</div>
+		<div class="clr"></div>
+	</div><!-- end nav -->
+	<!-- Status Module -->
+	<div id="module-status">
+		<jdoc:include type="modules" name="status"/>
+	</div>
+	<!-- Content Area -->
+	<div id="content">
+		<!-- Component Title -->
+		<jdoc:include type="modules" name="title" />
+		<!-- System Messages -->
+		<jdoc:include type="message" />
+		<!-- Sub Menu Navigation -->
+		<div class="subheader">
+			<?php if (!$app->input->getInt('hidemainmenu')) : ?>
+				<h3 class="element-invisible"><?php echo JText::_('TPL_HATHOR_SUB_MENU'); ?></h3>
+				<jdoc:include type="modules" name="submenu" style="xhtmlid" id="submenu-box" />
+				<?php echo ' ' ?>
+			<?php else : ?>
+				<div id="no-submenu"></div>
+			<?php endif; ?>
+		</div>
+		<!-- Toolbar Icon Buttons -->
+		<div class="toolbar-box">
+			<jdoc:include type="modules" name="toolbar" style="xhtml" />
+			<div class="clr"></div>
+		</div>
+		<!-- Beginning of Actual Content -->
+		<div id="element-box">
+			<div id="container-collapse" class="container-collapse"></div>
+			<p id="skiptargetholder"><a id="skiptarget" class="skip" tabindex="-1"></a></p>
+			<!-- The main component -->
+			<jdoc:include type="component" />
+			<div class="clr"></div>
+		</div><!-- end of element-box -->
+		<noscript>
+			<?php echo JText::_('JGLOBAL_WARNJAVASCRIPT'); ?>
+		</noscript>
+		<div class="clr"></div>
+	</div><!-- end of content -->
+	<div class="clr"></div>
+</div><!-- end of containerwrap -->
+<!-- Footer -->
+<div id="footer">
+	<jdoc:include type="modules" name="footer" style="none" />
+	<p class="copyright">
+		<?php
+		// Fix wrong display of Joomla!® in RTL language
+		if ($lang->isRtl())
+		{
+			$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
+		}
+		else
+		{
+			$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
+		}
+		echo JText::sprintf('JGLOBAL_ISFREESOFTWARE', $joomla);
+		?>
+	</p>
+</div>
+</body>
+</html>
diff --git a/core/administrator/templates/hathor/js/template.js b/core/administrator/templates/hathor/js/template.js
new file mode 100644
index 00000000..c6064489
--- /dev/null
+++ b/core/administrator/templates/hathor/js/template.js
@@ -0,0 +1,124 @@
+/**
+ * @package		Hathor
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Functions
+ */
+
+/**
+ * Change the skip nav target to work with webkit browsers (Safari/Chrome) and
+ * Opera
+ */
+function setSkip() {
+	var $ = jQuery.noConflict();
+	var browser = $.browser;
+	if (browser.chrome || browser.safari || browser.opera) {
+		var $target = $('#skiptarget');
+		$target.attr('href',"#skiptarget");
+		$target.text("Start of main content");
+		$target.attr("tabindex", "0");
+		$('#skiplink').on("click", function(){
+			$('#skiptarget').focus();
+		});
+	}
+}
+
+/**
+ * Set the Aria Role based on the id
+ *
+ * @param id
+ * @param rolevalue
+ * @return
+ */
+function setRoleAttribute(id, rolevalue) {
+	if (jQuery('#' + id).length) {
+		jQuery('#'+ id).attr("role", rolevalue);
+	}
+}
+
+/**
+ * Set the WAI-ARIA Roles Specify the html id then aria role
+ *
+ * @return
+ */
+function setAriaRoleElementsById() {
+	setRoleAttribute("header", "banner");
+	setRoleAttribute("element-box", "main");
+	setRoleAttribute("footer", "contentinfo");
+	setRoleAttribute("nav", "navigation");
+	setRoleAttribute("submenu", "navigation");
+	setRoleAttribute("system-message", "alert");
+}
+
+/**
+ * This sets the given Aria Property state to true for the given element
+ *
+ * @param el
+ *            The element (tag.class)
+ * @param prop
+ *            The property to set to true
+ * @return
+ */
+function setPropertyAttribute(el, prop) {
+	if (jQuery(el).length) {
+		jQuery(el).attr(prop, "true");
+	}
+}
+
+/**
+ * Set the WAI-ARIA Properties Specify the tag.class then the aria property to
+ * set to true If classes are changed on the fly (i.e. aria-invalid) they need
+ * to be changed there instead of here.
+ *
+ * @return
+ */
+function setAriaProperties() {
+	setPropertyAttribute("input.required", "aria-required");
+	setPropertyAttribute("textarea.required", "aria-required");
+	setPropertyAttribute("input.readonly", "aria-readonly");
+	setPropertyAttribute("input.invalid", "aria-invalid");
+	setPropertyAttribute("textarea.invalid", "aria-invalid");
+}
+
+
+/**
+ * Process file
+ */
+
+/** from accessible suckerfish menu by Matt Carroll,
+ * mootooled by Bill Tomczak
+ */
+
+jQuery(function($){
+	var $menu = $('#menu');
+	if ($menu.length && !$menu.hasClass('disabled')) {
+		$menu.find('li').each(function(){
+			$(this).on('mouseenter', function(){
+				$(this).addClass('sfhover');
+			});
+			$(this).on('mouseleave', function() {
+				$(this).removeClass('sfhover');
+			});
+		});
+
+		$menu.find('a').each(function() {
+			$(this).on('focus', function() {
+				$(this).addClass('sffocus');
+				$(this).closest('li').addClass('sfhover');
+			});
+			$(this).on('blur', function() {
+				$(this).removeClass('sffocus');
+				$(this).closest('li').removeClass('sfhover');
+			});
+		});
+	}
+});
+
+jQuery(function() {
+	setSkip();
+	setAriaRoleElementsById();
+	setAriaProperties();
+});
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini b/core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini
new file mode 100644
index 00000000..084cad29
--- /dev/null
+++ b/core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini
@@ -0,0 +1,29 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+HATHOR="Hathor Administrator template"
+TPL_HATHOR_ALTERNATE_MENU_DESC="Use the alternative menu which integrates mouse and keyboard. JavaScript Required. The regular menu for Hathor is accessible with or without Javascript, but leaves the mouse and keyboard independent."
+TPL_HATHOR_ALTERNATE_MENU_LABEL="Alternative Menu"
+TPL_HATHOR_BOLD_TEXT_DESC="Use bold text."
+TPL_HATHOR_BOLD_TEXT_LABEL="Bold Text"
+TPL_HATHOR_CHECKMARK_ALL="Checkmark All"
+TPL_HATHOR_COLOUR_CHOICE_BLUE="Blue"
+TPL_HATHOR_COLOUR_CHOICE_DESC="Select the colour palette to use with the template. You can use this option to select a high contrast version or use it to create custom branding."
+TPL_HATHOR_COLOUR_CHOICE_LABEL="Select Colour"
+TPL_HATHOR_COLOUR_CHOICE_STANDARD="Standard"
+TPL_HATHOR_COLOUR_CHOICE_HIGH_CONTRAST="High Contrast"
+TPL_HATHOR_COLOUR_CHOICE_BROWN="Brown"
+TPL_HATHOR_COM_MENUS_MENU="Menu"
+TPL_HATHOR_COM_MODULES_CUSTOM_POSITION_LABEL="Select"
+TPL_HATHOR_CPANEL_LINK_TEXT="Return to Control Panel"
+TPL_HATHOR_GO="Go"
+TPL_HATHOR_LOGO_DESC="Select or upload a custom logo for the administrator template."
+TPL_HATHOR_LOGO_LABEL="Logo"
+TPL_HATHOR_MAIN_MENU="Main Menu"
+TPL_HATHOR_SHOW_SITE_NAME_DESC="Show the site name in the template header."
+TPL_HATHOR_SHOW_SITE_NAME_LABEL="Show Site Name"
+TPL_HATHOR_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
+TPL_HATHOR_SUB_MENU="Sub Menu"
+TPL_HATHOR_XML_DESCRIPTION="Hathor is an accessible Administrator template for Joomla! The Colour CSS files can also be used for custom colour branding."
diff --git a/core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini b/core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini
new file mode 100644
index 00000000..43cd2991
--- /dev/null
+++ b/core/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+HATHOR="Hathor Administrator template"
+TPL_HATHOR_POSITION_CP_SHELL="Unused"
+TPL_HATHOR_POSITION_CPANEL="Control Panel"
+TPL_HATHOR_POSITION_DEBUG="Debug"
+TPL_HATHOR_POSITION_FOOTER="Footer"
+TPL_HATHOR_POSITION_ICON="Quick Icons"
+TPL_HATHOR_POSITION_LOGIN="Login"
+TPL_HATHOR_POSITION_MENU="Menu"
+TPL_HATHOR_POSITION_POSTINSTALL="Postinstall"
+TPL_HATHOR_POSITION_STATUS="Status"
+TPL_HATHOR_POSITION_SUBMENU="Submenu"
+TPL_HATHOR_POSITION_TITLE="Title"
+TPL_HATHOR_POSITION_TOOLBAR="Toolbar"
+TPL_HATHOR_XML_DESCRIPTION="Hathor is an accessible Administrator template for Joomla! The Colour CSS files can also be used for custom colour branding."
diff --git a/core/administrator/templates/hathor/less/buttons.less b/core/administrator/templates/hathor/less/buttons.less
new file mode 100644
index 00000000..550f8053
--- /dev/null
+++ b/core/administrator/templates/hathor/less/buttons.less
@@ -0,0 +1,82 @@
+//
+// Buttons
+// This is a custom version of Bootstrap's buttons.less file suited for Hathor's needs
+// --------------------------------------------------
+
+
+// Base styles
+// --------------------------------------------------
+
+// Core
+#form-login .btn {
+  display: inline-block;
+  .ie7-inline-block();
+  padding: 4px 14px;
+  margin-bottom: 0; // For input.btn
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  *line-height: @baseLineHeight;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
+  border: 1px solid @btnBorder;
+  *border: 0; // Remove the border to prevent IE7's black border on input:focus
+  border-bottom-color: darken(@btnBorder, 10%);
+  .border-radius(4px);
+  .ie7-restore-left-whitespace(); // Give IE7 some love
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+
+  // Hover state
+  &:hover {
+    color: @grayDark;
+    text-decoration: none;
+    background-color: darken(@white, 10%);
+    *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
+    background-position: 0 -15px;
+
+    // transition is only when going to hover, otherwise the background
+    // behind the gradient (there for IE<=9 fallback) gets mismatched
+    .transition(background-position .1s linear);
+  }
+
+  // Focus state for keyboard and accessibility
+  &:focus {
+    .tab-focus();
+  }
+
+  // Active state
+  &.active,
+  &:active {
+    background-color: darken(@white, 10%);
+    background-color: darken(@white, 15%) e("\9");
+    background-image: none;
+    outline: 0;
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Disabled state
+  &.disabled,
+  &[disabled] {
+    cursor: default;
+    background-color: darken(@white, 10%);
+    background-image: none;
+    .opacity(65);
+    .box-shadow(none);
+  }
+
+}
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+  padding: 9px 14px;
+  font-size: @baseFontSize + 2px;
+  line-height: normal;
+  .border-radius(5px);
+}
+.btn-large [class^="icon-"] {
+  margin-top: 2px;
+}
diff --git a/core/administrator/templates/hathor/less/colour_baseline.less b/core/administrator/templates/hathor/less/colour_baseline.less
new file mode 100644
index 00000000..530da155
--- /dev/null
+++ b/core/administrator/templates/hathor/less/colour_baseline.less
@@ -0,0 +1,1779 @@
+// colour_baseline.less
+//
+// Baseline CSS for the Hathor colours.
+// Compilers should include this in their colour's imports, but not directly
+// compile using this file.
+// -----------------------------------------------------
+
+// Core variables and mixins
+@import "../../../../media/jui/less/mixins.less";
+
+// Bootstrap Buttons
+// Using override for Hathor to target specific instances only
+@import "buttons.less";
+
+// Bootstrap Forms
+// Using override for Hathor since we're not pulling in all Bootstrap form styles
+@import "forms.less";
+
+// Bootstrap Labels and Badges
+@import "../../../../media/jui/less/labels-badges.less";
+
+/*
+ * General styles
+ */
+body {
+	background-color: @bodyBackground;
+	color: @textColor;
+}
+
+h1 {
+	color: @textColor;
+}
+
+a:link {
+	color: @linkColor;
+}
+
+a:visited {
+	color: @linkColor;
+}
+
+/*
+ * Overall Styles
+ */
+#header {
+	background: @bodyBackground url(../images/j_logo.png) no-repeat;
+}
+
+#header h1.title {
+	color: @textColor;
+}
+
+#nav {
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	border: 1px solid @mainBorder;
+}
+
+#content {
+	background: @bodyBackground;
+}
+
+#no-submenu {
+	border-bottom: 1px solid @mainBorder;
+}
+
+#element-box {
+	background: @bodyBackground;
+	border-right: 1px solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	border-left: 1px solid @mainBorder;
+}
+
+#element-box.login {
+	border-top: 1px solid @mainBorder;
+}
+
+/*
+ * Various Styles
+ */
+.enabled,
+.success,
+.allow,
+span.writable {
+	color: @successText;
+}
+
+.disabled,
+p.error,
+.warning,
+.deny,
+span.unwritable {
+	color: @errorText;
+}
+
+.nowarning {
+	color: @textColor;
+}
+
+.none,
+.protected {
+	color: @mainBorder;
+}
+
+span.note {
+	background: @bodyBackground;
+	color: @textColor;
+}
+
+div.checkin-tick {
+	background: url(../images/admin/tick.png) 20px 50% no-repeat;
+}
+
+/*
+ * Overlib
+ */
+.ol-foreground {
+	background-color: @altBackground;
+}
+
+.ol-background {
+	background-color: @successText;
+}
+
+.ol-textfont {
+	color: @textColor;
+}
+
+.ol-captionfont {
+	color: @bodyBackground;
+}
+
+.ol-captionfont a {
+	color: @linkColor;
+}
+
+/*
+ * Subheader, toolbar, page title
+ */
+div.subheader .padding {
+	background: @bodyBackground;
+}
+
+.pagetitle h2 {
+	color: @textColor;
+}
+
+div.configuration {
+	color: @textColor;
+	background-image: url(../images/menu/icon-16-config.png);
+	background-repeat: no-repeat;
+}
+
+div.toolbar-box {
+	border-right: 1px solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	border-left: 1px solid @mainBorder;
+	background: @bodyBackground;
+}
+
+div.toolbar-list li {
+	color: @textColor;
+}
+
+div.toolbar-list li.divider {
+	border-right: 1px dotted @hoverBackground;
+}
+
+div.toolbar-list a {
+	border-left: 1px solid @hoverBackground;
+	border-top: 1px solid @hoverBackground;
+	border-right: 1px solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	background: @altBackground;
+}
+
+div.toolbar-list a:hover {
+	border-left: 1px solid @nwBorder;
+	border-top: 1px solid @nwBorder;
+	border-right: 1px solid @seBorder;
+	border-bottom: 1px solid @seBorder;
+	background: @hoverBackground;
+	color: @toolbarColor;
+}
+
+div.btn-toolbar {
+	margin-left: 5px;
+	padding-top: 3px;
+}
+
+div.btn-toolbar li.divider {
+	border-right: 1px dotted @hoverBackground;
+}
+
+div.btn-toolbar div.btn-group button {
+	border-left: 1px solid @hoverBackground;
+	border-top: 1px solid @hoverBackground;
+	border-right: 1px solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	padding: 5px 4px 5px 4px;
+}
+
+div.btn-toolbar div.btn-group button:hover {
+	border-left: 1px solid @nwBorder;
+	border-top: 1px solid @nwBorder;
+	border-right: 1px solid @seBorder;
+	border-bottom: 1px solid @seBorder;
+	background: @hoverBackground;
+	color: @toolbarColor;
+	cursor: pointer;
+}
+
+div.btn-toolbar a {
+	border-left: 1px solid @hoverBackground;
+	border-top: 1px solid @hoverBackground;
+	border-right: 1px solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	padding: 6px 5px;
+	text-align: center;
+	white-space: nowrap;
+	font-size: 1.2em;
+	text-decoration: none;
+}
+
+div.btn-toolbar a:hover {
+	border-left: 1px solid @nwBorder;
+	border-top: 1px solid @nwBorder;
+	border-right: 1px solid @seBorder;
+	border-bottom: 1px solid @seBorder;
+	background: @hoverBackground;
+	color: @toolbarColor;
+	cursor: pointer;
+}
+
+div.btn-toolbar div.btn-group button.inactive {
+	background: @altBackground;
+}
+
+/*
+ * Pane Slider pane Toggler styles
+ */
+.pane-sliders .title {
+	color: @textColor;
+}
+
+.pane-sliders .panel {
+	border: 1px solid @mainBorder;
+}
+
+.pane-sliders .panel h3 {
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	color: @linkColor;
+}
+
+.pane-sliders .panel h3:hover {
+	background: @hoverBackground;
+}
+
+.pane-sliders .panel h3:hover a {
+	text-decoration: none;
+}
+
+.pane-sliders .adminlist {
+	border: 0 none;
+}
+
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+
+.pane-toggler span {
+	background: transparent url(../images/j_arrow.png) 5px 50% no-repeat;
+}
+
+.pane-toggler-down span {
+	background: transparent url(../images/j_arrow_down.png) 5px 50% no-repeat;
+}
+
+.pane-toggler-down {
+	border-bottom: 1px solid @mainBorder;
+}
+
+/*
+ * Tabs
+ */
+dl.tabs dt {
+	border: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	color: @linkColor;
+}
+
+dl.tabs dt:hover {
+	background: @hoverBackground;
+}
+
+dl.tabs dt.open {
+	background: @bodyBackground;
+	border-bottom: 1px solid @bodyBackground;
+	color: @textColor;
+}
+
+dl.tabs dt.open a:visited {
+	color: @textColor;
+}
+
+dl.tabs dt a:hover {
+	text-decoration: none;
+}
+
+dl.tabs dt a:focus {
+	text-decoration: underline;
+}
+
+div.current {
+	border: 1px solid @mainBorder;
+	background: @bodyBackground;
+}
+
+/*
+ * New parameter styles
+ */
+div.current fieldset {
+	border: none 0;
+}
+
+div.current fieldset.adminform {
+	border: 1px solid @mainBorder;
+}
+
+/*
+ * Login Settings
+ */
+#login-page .pagetitle h2 {
+	background: transparent;
+}
+
+#login-page #header {
+	border-bottom: 1px solid @mainBorder;
+}
+
+#login-page #lock {
+	background: url(../images/j_login_lock.png) 50% 0 no-repeat;
+}
+
+#login-page #element-box.login {
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+#form-login {
+	background: @bodyBackground;
+	border: 1px solid @mainBorder;
+}
+
+#form-login label {
+	color: @textColor;
+}
+
+#form-login div.button1 a {
+	color: @linkColor;
+}
+
+/*
+ * Cpanel Settings
+ */
+#cpanel div.icon a, .cpanel div.icon a {
+	color: @linkColor;
+	border-left: 1px solid @hoverBackground;
+	border-top: 1px solid @hoverBackground;
+	border-right: 1px solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+#cpanel div.icon a:hover,
+#cpanel div.icon a:focus,
+.cpanel div.icon a:hover,
+.cpanel div.icon a:focus {
+	border-left: 1px solid @nwBorder;
+	border-top: 1px solid @nwBorder;
+	border-right: 1px solid @seBorder;
+	border-bottom: 1px solid @seBorder;
+	color: @linkColor;
+	background: @hoverBackground;
+}
+
+/*
+ * Form Styles
+ */
+fieldset {
+	border: 1px @mainBorder solid;
+}
+
+legend {
+	color: @textColor;
+}
+
+fieldset ul.checklist input:focus {
+	outline: thin dotted @textColor;
+}
+
+fieldset#filter-bar {
+	border-top: 0 solid @mainBorder;
+	border-right: 0 solid @mainBorder;
+	border-bottom: 1px solid @mainBorder;
+	border-left: 0 solid @mainBorder;
+}
+
+fieldset#filter-bar ol, fieldset#filter-bar ul {
+	border: 0;
+}
+
+fieldset#filter-bar ol li fieldset, fieldset#filter-bar ul li fieldset {
+	border: 0;
+}
+
+/* Note: these visual cues should be augmented by aria */
+.invalid {
+	color: @errorText;
+}
+
+/* must be augmented by aria at the same time if changed dynamically by js
+aria-invalid=true or aria-invalid=false */
+input.invalid {
+	border: 1px solid @errorText;
+}
+
+/* augmented by aria in template javascript */
+input.readonly, span.faux-input {
+	border: 0;
+}
+
+input.required {
+	background-color: @inputBackground;
+}
+
+input.disabled {
+	background-color: @disabledBackground;
+}
+
+input, select, span.faux-input {
+	background-color: @bodyBackground;
+	border: 1px solid @mainBorder;
+}
+
+/* Inputs used as buttons */
+input[type="button"], input[type="submit"], input[type="reset"] {
+	color: @linkColor;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+input[type="button"]:hover, input[type="button"]:focus,
+input[type="submit"]:hover, input[type="submit"]:focus,
+input[type="reset"]:hover, input[type="reset"]:focus {
+	background: @hoverBackground;
+}
+
+textarea {
+	background-color: @bodyBackground;
+	border: 1px solid @mainBorder;
+}
+
+input:focus, select:focus, textarea:focus, option:focus,
+input:hover, select:hover, textarea:hover, option:hover {
+	background-color: @hoverBackground;
+	color: @linkColor;
+}
+
+/*
+ * Option or Parameter styles
+ */
+.paramrules {
+	background: @altBackground;
+}
+
+span.gi {
+	color: @mainBorder;
+}
+
+/*
+ * Admintable Styles
+ */
+table.admintable td.key, table.admintable td.paramlist_key {
+	background-color: @altBackground;
+	color: @textColor;
+	border-bottom: 1px solid @mainBorder;
+	border-right: 1px solid @mainBorder;
+}
+
+table.paramlist td.paramlist_description {
+	background-color: @altBackground;
+	color: @textColor;
+	border-bottom: 1px solid @mainBorder;
+	border-right: 1px solid @mainBorder;
+}
+
+/*
+ * Admin Form Styles
+ */
+fieldset.adminform {
+	border: 1px solid @mainBorder;
+}
+
+/*
+ * Table styles are for use with tabular data
+ */
+table.adminform {
+	background-color: @bodyBackground;
+}
+
+table.adminform tr.row0 {
+	background-color: @bodyBackground;
+}
+
+table.adminform tr.row1 {
+	background-color: @hoverBackground;
+}
+
+table.adminform th {
+	color: @textColor;
+	background: @bodyBackground;
+}
+
+table.adminform tr {
+	border-bottom: 1px solid @mainBorder;
+	border-right: 1px solid @mainBorder;
+}
+
+/*
+ * Adminlist Table layout
+ */
+table.adminlist {
+	border-spacing: 1px;
+	background-color: @bodyBackground;
+	color: @textColor;
+}
+
+table.adminlist.modal {
+	border-top: 1px solid @mainBorder;
+	border-right: 1px solid @mainBorder;
+	border-left: 1px solid @mainBorder;
+}
+
+table.adminlist a {
+	color: @linkColor;
+}
+
+table.adminlist thead th {
+	background: @bodyBackground;
+	color: @textColor;
+	border-bottom: 1px solid @mainBorder;
+}
+
+/*
+ * Table row styles
+ */
+table.adminlist tbody tr {
+	background: @bodyBackground;
+}
+
+table.adminlist tbody tr.row1 {
+	background: @bodyBackground;
+}
+
+table.adminlist tbody tr.row1:last-child td,
+table.adminlist tbody tr.row1:last-child th {
+	border-bottom: 1px solid @mainBorder;
+}
+
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td,
+table.adminlist tbody tr.row0:hover th,
+table.adminlist tbody tr.row1:hover th,
+table.adminlist tbody tr.row0:focus td,
+table.adminlist tbody tr.row1:focus td,
+table.adminlist tbody tr.row0:focus th,
+table.adminlist tbody tr.row1:focus th {
+	background-color: @hoverBackground;
+}
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	border-right: 1px solid @mainBorder;
+}
+
+table.adminlist tbody tr td:last-child {
+	border-right: none;
+}
+
+table.adminlist tbody tr.row0:last-child td,
+table.adminlist tbody tr.row0:last-child th {
+	border-bottom: 1px solid @mainBorder;
+}
+
+table.adminlist tbody tr.row0 td,
+table.adminlist tbody tr.row0 th {
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+table.adminlist {
+	border-bottom: 0 solid @mainBorder;
+}
+
+table.adminlist tfoot tr {
+	color: @textColor;
+}
+
+/*
+ * Table td/th styles
+ */
+table.adminlist tfoot td,
+table.adminlist tfoot th {
+	background-color: @bodyBackground;
+	border-top: 1px solid @mainBorder;
+}
+
+/*
+ * Adminlist buttons
+ */
+table.adminlist tr td.btns a {
+	border: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	color: @linkColor;
+}
+
+table.adminlist tr td.btns a:hover,
+table.adminlist tr td.btns a:active,
+table.adminlist tr td.btns a:focus {
+	background-color: @bodyBackground;
+}
+
+/*
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	background: url(../images/admin/filesave.png) no-repeat;
+}
+
+a.saveorder.inactive {
+	background-position: 0 -16px;
+}
+
+/*
+ * Saving order icon styling in admin tables
+ */
+fieldset.batch {
+	background: @bodyBackground;
+}
+
+/**
+ * Button styling
+ */
+button {
+	color: @toolbarColor;
+	border: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+button:hover,
+button:focus {
+	background: @hoverBackground;
+}
+
+.invalid {
+	color: #ff0000;
+}
+
+/* Button 1 Type */
+.button1 {
+	border: 1px solid @mainBorder;
+	color: @linkColor;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+/* Use this if you add images to the buttons such as directional arrows */
+.button1 a {
+	color: @linkColor;
+/* add padding if you are using the directional images */
+/* padding: 0 30px 0 6px; */
+}
+
+.button1 a:hover,
+.button1 a:focus {
+	background: @hoverBackground;
+}
+
+/* Button 2 Type */
+.button2-left,
+.button2-right {
+	border: 1px solid @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	color: @linkColor;
+}
+
+/* these are inactive buttons */
+.button2-left span,
+.button2-right span {
+	color: #999999;
+}
+
+.page span,
+.blank span {
+	color: @linkColor;
+}
+
+.button2-left a:hover,
+.button2-right a:hover,
+.button2-left a:focus,
+.button2-right a:focus {
+	background: @hoverBackground;
+}
+
+/**
+ * Pagination styles
+ */
+
+/* Grey out the current page number */
+.pagination .page span {
+	color: #999999;
+}
+
+/**
+ * Tooltips
+ */
+.tip {
+	background: #000000;
+	border: 1px solid #FFFFFF;
+}
+
+.tip-title {
+	background: url(../images/selector-arrow-std.png) no-repeat;
+}
+
+/**
+ * Calendar
+ */
+a img.calendar {
+	background: url(../images/calendar.png) no-repeat;
+}
+
+/**
+ * JGrid styles
+ */
+.jgrid span.publish {
+	background-image: url(../images/admin/tick.png);
+}
+
+.jgrid span.unpublish {
+	background-image: url(../images/admin/publish_x.png);
+}
+
+.jgrid span.archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+
+.jgrid span.trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+
+.jgrid span.default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+
+.jgrid span.notdefault {
+	background-image: url(../images/menu/icon-16-notdefault.png);
+}
+
+.jgrid span.checkedout {
+	background-image: url(../images/admin/checked_out.png);
+}
+
+.jgrid span.downarrow {
+	background-image: url(../images/admin/downarrow.png);
+}
+
+.jgrid span.downarrow_disabled {
+	background-image: url(../images/admin/downarrow0.png);
+}
+
+.jgrid span.uparrow {
+	background-image: url(../images/admin/uparrow.png);
+}
+
+.jgrid span.uparrow_disabled {
+	background-image: url(../images/admin/uparrow0.png);
+}
+
+.jgrid span.published {
+	background-image: url(../images/admin/publish_g.png);
+}
+
+.jgrid span.expired {
+	background-image: url(../images/admin/publish_r.png);
+}
+
+.jgrid span.pending {
+	background-image: url(../images/admin/publish_y.png);
+}
+
+.jgrid span.warning {
+	background-image: url(../images/admin/publish_y.png);
+}
+
+/**
+ * Toolbar icons
+ * These icons are used for the toolbar buttons
+ * The classes are constructed dynamically when the toolbar is created
+ */
+.icon-32-send {
+	background-image: url(../images/toolbar/icon-32-send.png);
+}
+
+.icon-32-delete {
+	background-image: url(../images/toolbar/icon-32-delete.png);
+}
+
+.icon-32-help {
+	background-image: url(../images/toolbar/icon-32-help.png);
+}
+
+.icon-32-cancel {
+	background-image: url(../images/toolbar/icon-32-cancel.png);
+}
+
+.icon-32-checkin {
+	background-image: url(../images/toolbar/icon-32-checkin.png);
+}
+
+.icon-32-options {
+	background-image: url(../images/toolbar/icon-32-config.png);
+}
+
+.icon-32-apply {
+	background-image: url(../images/toolbar/icon-32-apply.png);
+}
+
+.icon-32-back {
+	background-image: url(../images/toolbar/icon-32-back.png);
+}
+
+.icon-32-forward {
+	background-image: url(../images/toolbar/icon-32-forward.png);
+}
+
+.icon-32-save {
+	background-image: url(../images/toolbar/icon-32-save.png);
+}
+
+.icon-32-edit {
+	background-image: url(../images/toolbar/icon-32-edit.png);
+}
+
+.icon-32-copy {
+	background-image: url(../images/toolbar/icon-32-copy.png);
+}
+
+.icon-32-move {
+	background-image: url(../images/toolbar/icon-32-move.png);
+}
+
+.icon-32-new {
+	background-image: url(../images/toolbar/icon-32-new.png);
+}
+
+.icon-32-upload {
+	background-image: url(../images/toolbar/icon-32-upload.png);
+}
+
+.icon-32-assign {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+
+.icon-32-html {
+	background-image: url(../images/toolbar/icon-32-html.png);
+}
+
+.icon-32-css {
+	background-image: url(../images/toolbar/icon-32-css.png);
+}
+
+.icon-32-menus {
+	background-image: url(../images/toolbar/icon-32-menu.png);
+}
+
+.icon-32-publish {
+	background-image: url(../images/toolbar/icon-32-publish.png);
+}
+
+.icon-32-unblock {
+	background-image: url(../images/toolbar/icon-32-unblock.png);
+}
+
+.icon-32-unpublish {
+	background-image: url(../images/toolbar/icon-32-unpublish.png);
+}
+
+.icon-32-restore {
+	background-image: url(../images/toolbar/icon-32-revert.png);
+}
+
+.icon-32-trash {
+	background-image: url(../images/toolbar/icon-32-trash.png);
+}
+
+.icon-32-archive {
+	background-image: url(../images/toolbar/icon-32-archive.png);
+}
+
+.icon-32-unarchive {
+	background-image: url(../images/toolbar/icon-32-unarchive.png);
+}
+
+.icon-32-preview {
+	background-image: url(../images/toolbar/icon-32-preview.png);
+}
+
+.icon-32-default {
+	background-image: url(../images/toolbar/icon-32-default.png);
+}
+
+.icon-32-refresh {
+	background-image: url(../images/toolbar/icon-32-refresh.png);
+}
+
+.icon-32-save-new {
+	background-image: url(../images/toolbar/icon-32-save-new.png);
+}
+
+.icon-32-save-copy {
+	background-image: url(../images/toolbar/icon-32-save-copy.png);
+}
+
+.icon-32-error {
+	background-image: url(../images/toolbar/icon-32-error.png);
+}
+
+.icon-32-new-style {
+	background-image: url(../images/toolbar/icon-32-new-style.png);
+}
+
+.icon-32-delete-style {
+	background-image: url(../images/toolbar/icon-32-delete-style.png);
+}
+
+.icon-32-purge {
+	background-image: url(../images/toolbar/icon-32-purge.png);
+}
+
+.icon-32-remove {
+	background-image: url(../images/toolbar/icon-32-remove.png);
+}
+
+.icon-32-featured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+}
+
+.icon-32-unfeatured {
+	background-image: url(../images/toolbar/icon-32-featured.png);
+	background-position: 0% 100%;
+}
+
+.icon-32-export {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+
+.icon-32-stats {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+
+.icon-32-print {
+	background-image: url(../images/toolbar/icon-32-print.png);
+}
+
+.icon-32-batch {
+	background-image: url(../images/toolbar/icon-32-batch.png);
+}
+
+.icon-32-envelope {
+	background-image: url(../images/toolbar/icon-32-messaging.png);
+}
+
+.icon-32-download {
+	background-image: url(../images/toolbar/icon-32-export.png);
+}
+
+.icon-32-bars {
+	background-image: url(../images/toolbar/icon-32-stats.png);
+}
+
+/**
+ * Quick Icons
+ * Also knows as Header Icons
+ * These are used for the Quick Icons on the Control Panel
+ * The same classes are also assigned the Component Title
+ */
+.icon-48-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-generic {
+	background-image: url(../images/header/icon-48-generic.png);
+}
+
+.icon-48-banners {
+	background-image: url(../images/header/icon-48-banner.png);
+}
+
+.icon-48-banners-categories {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+
+.icon-48-banners-category-edit {
+	background-image: url(../images/header/icon-48-banner-categories.png);
+}
+
+.icon-48-banners-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-banners-clients {
+	background-image: url(../images/header/icon-48-banner-client.png);
+}
+
+.icon-48-banners-tracks {
+	background-image: url(../images/header/icon-48-banner-tracks.png);
+}
+
+.icon-48-checkin {
+	background-image: url(../images/header/icon-48-checkin.png);
+}
+
+.icon-48-clear {
+	background-image: url(../images/header/icon-48-clear.png);
+}
+
+.icon-48-contact {
+	background-image: url(../images/header/icon-48-contacts.png);
+}
+
+.icon-48-contact-categories {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+
+.icon-48-contact-category-edit {
+	background-image: url(../images/header/icon-48-contacts-categories.png);
+}
+
+.icon-48-contact-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-purge {
+	background-image: url(../images/header/icon-48-purge.png);
+}
+
+.icon-48-cpanel {
+	background-image: url(../images/header/icon-48-cpanel.png);
+}
+
+.icon-48-config {
+	background-image: url(../images/header/icon-48-config.png);
+}
+
+.icon-48-groups {
+	background-image: url(../images/header/icon-48-groups.png);
+}
+
+.icon-48-groups-add {
+	background-image: url(../images/header/icon-48-groups-add.png);
+}
+
+.icon-48-levels {
+	background-image: url(../images/header/icon-48-levels.png);
+}
+
+.icon-48-levels-add {
+	background-image: url(../images/header/icon-48-levels-add.png);
+}
+
+.icon-48-module {
+	background-image: url(../images/header/icon-48-module.png);
+}
+
+.icon-48-menu {
+	background-image: url(../images/header/icon-48-menu.png);
+}
+
+.icon-48-menu-add {
+	background-image: url(../images/header/icon-48-menu-add.png);
+}
+
+.icon-48-menumgr {
+	background-image: url(../images/header/icon-48-menumgr.png);
+}
+
+.icon-48-trash {
+	background-image: url(../images/header/icon-48-trash.png);
+}
+
+.icon-48-user {
+	background-image: url(../images/header/icon-48-user.png);
+}
+
+.icon-48-user-add {
+	background-image: url(../images/header/icon-48-user-add.png);
+}
+
+.icon-48-user-edit {
+	background-image: url(../images/header/icon-48-user-edit.png);
+}
+
+.icon-48-user-profile {
+	background-image: url(../images/header/icon-48-user-profile.png);
+}
+
+.icon-48-inbox {
+	background-image: url(../images/header/icon-48-inbox.png);
+}
+
+.icon-48-new-privatemessage {
+	background-image: url(../images/header/icon-48-new-privatemessage.png);
+}
+
+.icon-48-msgconfig {
+	background-image: url(../images/header/icon-48-message_config.png);
+}
+
+.icon-48-langmanager {
+	background-image: url(../images/header/icon-48-language.png);
+}
+
+.icon-48-mediamanager {
+	background-image: url(../images/header/icon-48-media.png);
+}
+
+.icon-48-plugin {
+	background-image: url(../images/header/icon-48-plugin.png);
+}
+
+.icon-48-help_header {
+	background-image: url(../images/header/icon-48-help_header.png);
+}
+
+.icon-48-impressions {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+
+.icon-48-browser {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+
+.icon-48-searchtext {
+	background-image: url(../images/header/icon-48-stats.png);
+}
+
+.icon-48-thememanager {
+	background-image: url(../images/header/icon-48-themes.png);
+}
+
+.icon-48-writemess {
+	background-image: url(../images/header/icon-48-writemess.png);
+}
+
+.icon-48-featured {
+	background-image: url(../images/header/icon-48-featured.png);
+}
+
+.icon-48-sections {
+	background-image: url(../images/header/icon-48-section.png);
+}
+
+.icon-48-article-add {
+	background-image: url(../images/header/icon-48-article-add.png);
+}
+
+.icon-48-article-edit {
+	background-image: url(../images/header/icon-48-article-edit.png);
+}
+
+.icon-48-article {
+	background-image: url(../images/header/icon-48-article.png);
+}
+
+.icon-48-content-categories {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-content-category-edit {
+	background-image: url(../images/header/icon-48-category.png);
+}
+
+.icon-48-content-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-install {
+	background-image: url(../images/header/icon-48-extension.png);
+}
+
+.icon-48-dbbackup {
+	background-image: url(../images/header/icon-48-backup.png);
+}
+
+.icon-48-dbrestore {
+	background-image: url(../images/header/icon-48-dbrestore.png);
+}
+
+.icon-48-dbquery {
+	background-image: url(../images/header/icon-48-query.png);
+}
+
+.icon-48-systeminfo {
+	background-image: url(../images/header/icon-48-info.png);
+}
+
+.icon-48-massmail {
+	background-image: url(../images/header/icon-48-massmail.png);
+}
+
+.icon-48-redirect {
+	background-image: url(../images/header/icon-48-redirect.png);
+}
+
+.icon-48-search {
+	background-image: url(../images/header/icon-48-search.png);
+}
+
+.icon-48-finder {
+	background-image: url(../images/header/icon-48-search.png);
+}
+
+.icon-48-newsfeeds {
+	background-image: url(../images/header/icon-48-newsfeeds.png);
+}
+
+.icon-48-newsfeeds-categories {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+
+.icon-48-newsfeeds-category-edit {
+	background-image: url(../images/header/icon-48-newsfeeds-cat.png);
+}
+
+.icon-48-newsfeeds-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-weblinks {
+	background-image: url(../images/header/icon-48-links.png);
+}
+
+.icon-48-weblinks-categories {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+
+.icon-48-weblinks-category-edit {
+	background-image: url(../images/header/icon-48-links-cat.png);
+}
+
+.icon-48-weblinks-category-add {
+	background-image: url(../images/header/icon-48-category-add.png);
+}
+
+.icon-48-tags {
+	background-image: url(../images/header/icon-48-tags.png);
+}
+
+.icon-48-assoc {
+	background-image: url(../images/header/icon-48-assoc.png);
+}
+
+.icon-48-puzzle {
+ 	background-image: url(../images/header/icon-48-puzzle.png);
+}
+
+/**
+ * General styles
+ */
+div.message {
+	border: 1px solid @mainBorder;
+	color: @textColor;
+}
+
+.helpFrame {
+	border-left: 0 solid @mainBorder;
+	border-right: none;
+	border-top: none;
+	border-bottom: none;
+}
+
+.outline {
+	border: 1px solid @mainBorder;
+	background: @bodyBackground;
+}
+
+/**
+ * Modal Styles
+ */
+dl.menu_type dt {
+	border-bottom: 1px solid @mainBorder;
+}
+
+ul#new-modules-list {
+	border-top: 1px solid @mainBorder;
+}
+
+/**
+ * User Accessibility
+ */
+
+/* Skip to Content Visual Styling */
+#skiplinkholder a, #skiplinkholder a:link, #skiplinkholder a:visited {
+	color: @bodyBackground;
+	background: @linkColor;
+	border-bottom: solid #336 2px;
+}
+
+/**
+ * Admin Form Styles
+ */
+fieldset.panelform {
+	border: none 0;
+}
+
+/**
+ * ACL STYLES relocated from com_users/media/grid.css
+ */
+a.move_up {
+	background-image: url('../images/admin/uparrow.png');
+}
+
+span.move_up {
+	background-image: url('../images/admin/uparrow0.png');
+}
+
+a.move_down {
+	background-image: url('../images/admin/downarrow.png');
+}
+
+span.move_down {
+	background-image: url('../images/admin/downarrow0.png');
+}
+
+a.grid_false {
+	background-image: url('../images/admin/publish_x.png');
+}
+
+a.grid_true {
+	background-image: url('../images/admin/tick.png');
+}
+
+a.grid_trash {
+	background-image: url('../images/admin/icon-16-trash.png');
+}
+
+/**
+ * ACL PANEL STYLES
+ */
+
+/* All Tabs */
+
+tr.row1 {
+	background-color: @altBackground;
+}
+
+/* Summary Tab */
+table.aclsummary-table td.col2,
+table.aclsummary-table th.col2,
+table.aclsummary-table td.col3,
+table.aclsummary-table th.col3,
+table.aclsummary-table td.col4,
+table.aclsummary-table th.col4,
+table.aclsummary-table td.col5,
+table.aclsummary-table th.col5,
+table.aclsummary-table td.col6,
+table.aclsummary-table th.col6,
+table.aclmodify-table td.col2,
+table.aclmodify-table th.col2 {
+	border-left: 1px solid @mainBorder;
+}
+
+/* Icons */
+
+span.icon-16-unset {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+
+span.icon-16-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+
+span.icon-16-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+
+span.icon-16-locked {
+	background: url(../images/admin/checked_out.png) 0 0 no-repeat;
+}
+
+label.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+
+label.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+
+a.icon-16-allow {
+	background: url(../images/admin/icon-16-allow.png) no-repeat;
+}
+
+a.icon-16-deny {
+	background: url(../images/admin/icon-16-deny.png) no-repeat;
+}
+
+a.icon-16-allowinactive {
+	background: url(../images/admin/icon-16-allowinactive.png) no-repeat;
+}
+
+a.icon-16-denyinactive {
+	background: url(../images/admin/icon-16-denyinactive.png) no-repeat;
+}
+
+/* ACL footer/legend */
+
+ul.acllegend li.acl-allowed {
+	background: url(../images/admin/icon-16-allow.png) no-repeat left;
+}
+
+ul.acllegend li.acl-denied {
+	background: url(../images/admin/icon-16-deny.png) no-repeat left;
+}
+
+li.acl-editgroups,
+li.acl-resetbtn {
+	background-color: @altBackground;
+	border: 1px solid @mainBorder;
+}
+
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	color: @linkColor;
+}
+
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	background-color: @hoverBackground;
+}
+
+/* ACL Config --------- */
+table#acl-config {
+	border: 1px solid @mainBorder;
+}
+
+table#acl-config th,
+table#acl-config td {
+	background: @altBackground;
+	border-bottom: 1px solid @mainBorder;
+}
+
+table#acl-config th.acl-groups {
+	border-right: 1px solid @mainBorder;
+}
+
+/**
+* Mod_rewrite Warning
+*/
+#jform_sef_rewrite-lbl {
+	background: url(../images/admin/icon-16-notice-note.png) right top no-repeat;
+}
+
+/**
+* Permission Rules
+*/
+
+#permissions-sliders .tip {
+	background: @bodyBackground;
+	border: 1px solid @mainBorder;
+}
+
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+	border: solid 0 @mainBorder;
+	background: @bodyBackground;
+}
+
+ul#rules li .pane-sliders .panel h3.title {
+	border: solid 0 @mainBorder;
+}
+
+#permissions-sliders ul#rules .pane-slider {
+	border: solid 1px @mainBorder;
+}
+
+#permissions-sliders ul#rules li h3 {
+	border: solid 1px @mainBorder;
+}
+
+#permissions-sliders ul#rules li h3.pane-toggler-down a {
+	border: solid 0;
+}
+
+#permissions-sliders ul#rules .group-kind {
+	color: @textColor;
+}
+
+#permissions-sliders ul#rules table.group-rules {
+	border: solid 1px @mainBorder;
+}
+
+#permissions-sliders ul#rules table.group-rules td {
+	border-right: solid 1px @mainBorder;
+	border-bottom: solid 1px @mainBorder;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+	background: @hoverBackground;
+	border-right: solid 1px @mainBorder;
+	border-bottom: solid 1px @mainBorder;
+	color: @textColor;
+}
+
+ul#rules table.aclmodify-table {
+	border: solid 1px @mainBorder;
+}
+
+ul#rules table.group-rules td label {
+	border: solid 0 @mainBorder;
+}
+
+#permissions-sliders ul#rules .mypanel {
+	border: solid 0 @mainBorder;
+}
+
+#permissions-sliders  ul#rules  table.group-rules td {
+	background: @bodyBackground;
+}
+
+#permissions-sliders span.level {
+	color: @mainBorder;
+	background-image: none;
+}
+
+/*
+ * Debug styles
+ */
+.check-0,
+table.adminlist tbody td.check-0 {
+	background-color: @permissionDefault;
+}
+
+.check-a,
+table.adminlist tbody td.check-a {
+	background-color: @permissionAllowed;
+}
+
+.check-d,
+table.adminlist tbody td.check-d {
+	background-color: @permissionDenied;
+}
+
+/**
+ * System Messages
+ */
+
+#system-message dd ul {
+	color: @textColor;
+}
+
+#system-message dd.error ul {
+	color: @textColor;
+}
+
+#system-message dd.message ul {
+	color: @textColor;
+}
+
+#system-message dd.notice ul {
+	color: @textColor;
+}
+
+/** CSS file for Accessible Admin Menu
+ * based on Matt Carrolls' son of suckerfish
+ * with javascript by Bill Tomczak
+ */
+
+/* Note: set up the font-size on the id and used 100% on the elements.
+	If ul/li/a are different ems, then the shifting back via non-js keyboard
+	doesn't work properly */
+
+/**
+ * Menu Styling
+ */
+#menu {
+/* this is on the main ul */
+	color: @textColor;
+}
+
+#menu ul.dropdown-menu {
+/* all lists */
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	color: @textColor;
+}
+
+#menu ul.dropdown-menu li.dropdown-submenu {
+	background: url(../images/j_arrow.png) no-repeat right 50%;
+}
+
+#menu ul.dropdown-menu li.divider {
+	margin-bottom: 0;
+	border-bottom: 1px dotted @mainBorder;
+}
+
+#menu a {
+	color: @toolbarColor;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+}
+
+#menu li {
+/* all list items */
+	border-right: 1px solid @mainBorder;
+	background-color: transparent;
+}
+
+#menu li a:hover, #menu li a:focus {
+	background-color: @hoverBackground;
+}
+
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	color: @mainBorder;
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+}
+
+#menu li ul {
+/* second-level lists */
+	border: 1px solid @mainBorder;
+}
+
+#menu li li {
+/* second-level row */
+	background-color: transparent;
+}
+
+/**
+ * Styling parents
+ */
+
+/* 1 level - sfhover */
+#menu li.sfhover a {
+	background-color: @hoverBackground;
+}
+
+/* 2 level - normal */
+#menu li.sfhover li a {
+	background-color: transparent;
+}
+
+/* 2 level - hover */
+#menu li.sfhover li.sfhover a, #menu li li a:focus {
+	background-color: @hoverBackground;
+}
+
+/* 3 level - normal */
+#menu li.sfhover li.sfhover li a {
+	background-color: transparent;
+}
+
+/* 3 level - hover */
+#menu li.sfhover li.sfhover li.sfhover a, #menu li li li a:focus {
+	background-color: @hoverBackground;
+}
+
+/* bring back the focus elements into view */
+#menu li li a:focus, #menu li li li a:focus {
+	background-color: @hoverBackground;
+}
+
+#menu li li li a:focus {
+	background-color: @hoverBackground;
+}
+
+/**
+ * Submenu styling
+ */
+#submenu {
+	border-bottom: 1px solid @mainBorder;
+/* border-bottom plus padding-bottom is the technique */
+/* This is the background befind the tabs */
+/*background: @bodyBackground;*/
+}
+
+#submenu li, #submenu span.nolink {
+	#gradient > .vertical(@gradientTop, @gradientBottom);
+	border: 1px solid @mainBorder;
+	color: @linkColor;
+}
+
+#submenu li:hover, #submenu li:focus {
+	background: @hoverBackground;
+}
+
+#submenu li.active, #submenu span.nolink.active {
+	background: @bodyBackground;
+	border-bottom: 1px solid @bodyBackground;
+}
+
+#submenu li.active a,
+#submenu span.nolink.active {
+	color: #000;
+}
+
+.element-invisible {
+	margin: 0;
+	padding: 0;
+}
+
+/* -- Codemirror Editor  ----------- */
+div.CodeMirror-wrapping {
+	border: 1px solid @mainBorder;
+}
+
+/* User Notes */
+table.adminform tr.row0 {
+	background-color: @bodyBackground;
+}
+
+ul.alternating > li:nth-child(odd) {
+	background-color: @bodyBackground;
+}
+
+ul.alternating > li:nth-child(even) {
+	background-color: @altBackground;
+}
+
+ol.alternating > li:nth-child(odd) {
+	background-color: @bodyBackground;
+}
+
+ol.alternating > li:nth-child(even) {
+	background-color: @altBackground;
+}
+
+/* Installer Database */
+#installer-database, #installer-discover, #installer-update, #installer-warnings {
+	border-top: 1px solid @mainBorder;
+}
+
+#installer-database p.warning {
+	background: transparent url(../images/admin/icon-16-deny.png) center left no-repeat;
+}
+
+#installer-database p.nowarning {
+	background: transparent url(../images/admin/icon-16-allow.png) center left no-repeat;
+}
+
+/* Override default bootstrap font-size */
+.input-append,
+.input-prepend {
+	font-size: 1.2em;
+}
diff --git a/core/administrator/templates/hathor/less/colour_blue.less b/core/administrator/templates/hathor/less/colour_blue.less
new file mode 100644
index 00000000..2fca62c9
--- /dev/null
+++ b/core/administrator/templates/hathor/less/colour_blue.less
@@ -0,0 +1,38 @@
+// colour_blue.less
+//
+// Less to compile Hathor in the blue colour scheme
+// -----------------------------------------------------
+
+/**
+ * #2c2c2c	Text
+ * #054993	Links
+ * #ffffff	Background, border, text
+ * #c3d2e5	Background alternate, button/icon/menu background
+ * #a5bbd4-c3d2e5 Gradient Background
+ * #e5f0fa	Background (input required)
+ * #e5d9c3	Background Hover, Top/Left icon borders
+ * #738498	Main borders
+ * #868778	Top/Left hover borders
+ * #f6f7db	Right/Bottom hover borders
+ *
+ * Special Use Colors:
+ * #a20000	Text Error, border invalid
+ * #cccccc	Text (faded)
+ * #005800	Text (success)
+ * #eeeeee	Background (input disabled)
+ * #ffffcf	Background permissions debug
+ * #cfffda	Background permissions debug
+ * #ffcfcf	Background permissions debug
+ */
+
+// Import the variables file first to get common variables loaded
+@import "hathor_variables.less";
+
+// Define variables unique to this colour scheme, as well as override variables already defined in the common file
+@altBackground:      #c3d2e5;
+@gradientTop:        #a5bbd4;
+@gradientBottom:     #c3d2e5;
+@mainBorder:         #738498;
+
+// Import the baseline to compile the CSS
+@import "colour_baseline.less";
diff --git a/core/administrator/templates/hathor/less/colour_brown.less b/core/administrator/templates/hathor/less/colour_brown.less
new file mode 100644
index 00000000..ffa96656
--- /dev/null
+++ b/core/administrator/templates/hathor/less/colour_brown.less
@@ -0,0 +1,42 @@
+// colour_brown.less
+//
+// Less to compile Hathor in the brown colour scheme
+// -----------------------------------------------------
+
+/**
+ * #2c2c2c	Text
+ * #054993	Links
+ * #ffffff	Background, border, text
+ * #d5c1b2	Background alternate, button/icon/menu background
+ * #d5c1b2-d5c1b2 Gradient Background
+ * #e5f0fa	Background (input required)
+ * #e1d3c8	Background Hover, Top/Left icon borders
+ * #000000	Main borders
+ * #000000	Top/Left hover borders
+ * #000000	Right/Bottom hover borders
+ *
+ * Special Use Colors:
+ * #a20000	Text Error, border invalid
+ * #cccccc	Text (faded)
+ * #005800	Text (success)
+ * #eeeeee	Background (input disabled)
+ * #ffffcf	Background permissions debug
+ * #cfffda	Background permissions debug
+ * #ffcfcf	Background permissions debug
+ */
+
+// Import the variables file first to get common variables loaded
+@import "hathor_variables.less";
+
+// Define variables unique to this colour scheme, as well as override variables already defined in the common file
+@altBackground:      #d5c1b2;
+@gradientTop:        #d5c1b2;
+@gradientBottom:     #d5c1b2;
+@mainBorder:         #000000;
+@toolbarColor:       #054993;
+@hoverBackground:    #e5d9c3;
+@nwBorder:           #868778;
+@seBorder:           #f6f7db;
+
+// Import the baseline to compile the CSS
+@import "colour_baseline.less";
diff --git a/core/administrator/templates/hathor/less/colour_standard.less b/core/administrator/templates/hathor/less/colour_standard.less
new file mode 100644
index 00000000..b7de935b
--- /dev/null
+++ b/core/administrator/templates/hathor/less/colour_standard.less
@@ -0,0 +1,38 @@
+// colour_standard.less
+//
+// Less to compile Hathor in the default colour scheme
+// -----------------------------------------------------
+
+/**
+ * Main colors:
+ * #2c2c2c	Text
+ * #054993	Links
+ * #ffffff	Background, border, text
+ * #f9fade	Background alternate, button/icon/menu background
+ * #e5f0fa	Background (input required)
+ * #e3e4ca	Background Hover, Right/Bottom icon borders
+ * #c7c8b2	Main borders
+ * #868778	Top/Left icon hover borders
+ * #f6f7db	Right/Bottom icon hover borders
+ *
+ * Special Use Colors:
+ * #a20000	Text Error, border invalid
+ * #cccccc	Text (faded)
+ * #005800	Text (success)
+ * #eeeeee	Background (input disabled)
+ * #ffffcf	Background‚ permissions debug
+ * #cfffda	Background‚ permissions debug
+ * #ffcfcf	Background‚ permissions debug
+ */
+
+// Import the variables file first to get common variables loaded
+@import "hathor_variables.less";
+
+// Define variables unique to this colour scheme, as well as override variables already defined in the common file
+@altBackground:      #f9fade;
+@gradientTop:        #f9fade;
+@gradientBottom:     #f9fade;
+@mainBorder:         #c7c8b2;
+
+// Import the baseline to compile the CSS
+@import "colour_baseline.less";
diff --git a/core/administrator/templates/hathor/less/forms.less b/core/administrator/templates/hathor/less/forms.less
new file mode 100644
index 00000000..bf43faa9
--- /dev/null
+++ b/core/administrator/templates/hathor/less/forms.less
@@ -0,0 +1,196 @@
+//
+// Forms
+// This is a custom version of Bootstrap's forms.less file suited for Hathor's needs
+// --------------------------------------------------
+
+// Ensure input-prepend/append never wraps
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+// Allow us to put symbols and text within the input field for a cleaner look
+.input-append,
+.input-prepend {
+  margin-bottom: 5px;
+  font-size: 0;
+  white-space: nowrap; // Prevent span and input from separating
+
+  input,
+  select,
+  .uneditable-input {
+    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
+    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
+    *margin-left: 0;
+    font-size: @baseFontSize;
+    vertical-align: top;
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+    // Make input on top when focused so blue border and shadow always show
+    &:focus {
+      z-index: 2;
+    }
+  }
+  .add-on {
+    display: inline-block;
+    width: auto;
+    height: @baseLineHeight;
+    min-width: 16px;
+    padding: 4px 5px;
+    font-size: @baseFontSize;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    text-align: center;
+    text-shadow: 0 1px 0 @white;
+    background-color: @grayLighter;
+    border: 1px solid #ccc;
+  }
+  .add-on,
+  .btn {
+    margin-left: -1px;
+    vertical-align: top;
+    .border-radius(0);
+  }
+  .active {
+    background-color: lighten(@green, 30);
+    border-color: @green;
+  }
+}
+.input-prepend {
+  .add-on,
+  .btn {
+    margin-right: -1px;
+  }
+  .add-on:first-child,
+  .btn:first-child {
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+}
+.input-append {
+  input,
+  select,
+  .uneditable-input {
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+  .add-on:last-child,
+  .btn:last-child {
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+  }
+}
+// Remove all border-radius for inputs with both prepend and append
+.input-prepend.input-append {
+  input,
+  select,
+  .uneditable-input {
+    .border-radius(0);
+  }
+  .add-on:first-child,
+  .btn:first-child {
+    margin-right: -1px;
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+  .add-on:last-child,
+  .btn:last-child {
+    margin-left: -1px;
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+  }
+}
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  .border-radius(0); // Override due to specificity
+}
+.form-search .input-append .search-query {
+  .border-radius(14px 0 0 14px)
+}
+.form-search .input-append .btn {
+  .border-radius(0 14px 14px 0)
+}
+.form-search .input-prepend .search-query {
+  .border-radius(0 14px 14px 0)
+}
+.form-search .input-prepend .btn {
+  .border-radius(14px 0 0 14px)
+}
+.form-search,
+.form-inline,
+.form-horizontal {
+  input,
+  textarea,
+  select,
+  .help-inline,
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
+    display: inline-block;
+    .ie7-inline-block();
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  // Re-hide hidden elements due to specifity
+  .hide {
+    display: none;
+  }
+}
+// Remove margin for input-prepend/-append
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+/* Accessible Hidden Elements (good for hidden labels and such) */
+.element-invisible{
+	position: absolute;
+	padding: 0 !important;
+	margin: 0 !important;
+	border: 0;
+	height: 1px;
+	width: 1px !important;
+	overflow: hidden;
+}
+
+// Login form only
+// Shared size and type resets
+#form-login select,
+#form-login input[type="text"],
+#form-login input[type="password"] {
+  display: inline-block;
+  padding: 4px 6px;
+  margin-bottom: 9px;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @gray;
+  .border-radius(@inputBorderRadius);
+  width: 175px;
+}
+
+/* Field subform repeatable */
+.subform-repeatable-wrapper{
+
+	div.btn-toolbar{
+		float: none;
+	}
+
+	.text-right{
+		text-align: right;
+	}
+
+	.ui-sortable-helper{
+		background: @white;
+	}
+
+	tr.ui-sortable-helper{
+		display: table;
+	}
+
+	.subform-repeatable-group{
+		clear: both;
+	}
+}
diff --git a/core/administrator/templates/hathor/less/hathor_variables.less b/core/administrator/templates/hathor/less/hathor_variables.less
new file mode 100644
index 00000000..36bf2f54
--- /dev/null
+++ b/core/administrator/templates/hathor/less/hathor_variables.less
@@ -0,0 +1,140 @@
+// hathor_variables.less
+//
+// Less file containing Bootstrap variables needed to compile its CSS
+// -----------------------------------------------------
+
+// Grays
+// -------------------------
+@black:                 #000000;
+@grayDarker:            #222222;
+@grayDark:              #333333;
+@gray:                  #555555;
+@grayLight:             #999999;
+@grayLighter:           #eeeeee;
+@white:                 #ffffff;
+
+// Accent colors
+// -------------------------
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             #2c2c2c;
+
+// Links
+// -------------------------
+@linkColor:             #054993;
+@linkColorHover:        darken(@linkColor, 15%);
+
+// Typography
+// -------------------------
+@baseFontSize:          13px;
+@baseLineHeight:        15px;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+// Component sizing
+// -------------------------
+@baseBorderRadius:      4px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+// Buttons
+// -------------------------
+@btnBackground:                     @white;
+@btnBackgroundHighlight:            darken(@white, 10%);
+@btnBorder:                         #bbb;
+
+@btnPrimaryBackground:              @linkColor;
+@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
+
+@btnInfoBackground:                 #5bc0de;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              #62c462;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               #ee5f5b;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              #444;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+// Forms
+// -------------------------
+@inputBackground:               #e5f0fa;
+@inputBorder:                   #ccc;
+@inputBorderRadius:             3px;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         #f5f5f5;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexTooltip:           1030;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+@zindexPopover:           1060;
+
+// Form states and alerts
+// -------------------------
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+
+@errorText:               #a20000;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+
+@successText:             #005800;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+// Tooltips and popovers
+// -------------------------
+@tooltipColor:            @white;
+@tooltipBackground:       @black;
+@tooltipArrowWidth:       5px;
+@tooltipArrowColor:       @tooltipBackground;
+
+@popoverBackground:       @white;
+@popoverArrowWidth:       10px;
+@popoverArrowColor:       @white;
+@popoverTitleBackground:  darken(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterColor:  rgba(0,0,0,.25);
+
+// Variables unique to Hathor
+// -------------------------
+@toolbarColor:          @linkColor;
+@hoverBackground:       #e5d9c3;
+@nwBorder:              #868778;
+@seBorder:              #f6f7db;
+@fadedText:             #cccccc;
+@disabledBackground:    #eeeeee;
+@permissionDefault:     #ffffcf;
+@permissionAllowed:     #cfffda;
+@permissionDenied:      #ffcfcf;
diff --git a/core/administrator/templates/hathor/less/icomoon.less b/core/administrator/templates/hathor/less/icomoon.less
new file mode 100644
index 00000000..f2e9c3a5
--- /dev/null
+++ b/core/administrator/templates/hathor/less/icomoon.less
@@ -0,0 +1,11 @@
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'),
+	url('../../../../media/jui/fonts/IcoMoon.woff') format('woff'),
+	url('../../../../media/jui/fonts/IcoMoon.ttf') format('truetype'),
+	url('../../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+@import "../../../../media/jui/less/icomoon.less";
diff --git a/core/administrator/templates/hathor/less/modals.less b/core/administrator/templates/hathor/less/modals.less
new file mode 100644
index 00000000..64f84116
--- /dev/null
+++ b/core/administrator/templates/hathor/less/modals.less
@@ -0,0 +1,108 @@
+// MODALS
+// ------
+
+// Recalculate z-index where appropriate
+.modal-open {
+  .dropdown-menu {  z-index: @zindexDropdown + @zindexModal; }
+  .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
+  .popover       {  z-index: @zindexPopover  + @zindexModal; }
+  .tooltip       {  z-index: @zindexTooltip  + @zindexModal; }
+}
+
+// Background
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: @zindexModalBackdrop;
+  background-color: @black;
+  // Fade for backdrop
+  &.fade { opacity: 0; }
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  .opacity(80);
+}
+
+// Base modal
+div.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: @zindexModal;
+  overflow: auto;
+  width: 80%;
+  margin: -250px 0 0 -40%;
+  background-color: @white;
+  border: 1px solid #999;
+  border: 1px solid rgba(0,0,0,.3);
+  *border: 1px solid #999; /* IE6-7 */
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  .background-clip(padding-box);
+  &.fade {
+    .transition(e('opacity .3s linear, top .3s ease-out'));
+    top: -25%;
+  }
+  &.fade.in { top: 50%; }
+}
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+  // Close icon
+  .close {
+	float: right;
+	margin-top: 2px;
+  }
+}
+
+// Body (where all modal content resides)
+.modal-body {
+  overflow-y: auto;
+  max-height: 400px;
+  padding: 15px;
+}
+// Remove bottom margin if need be
+.modal-form {
+  margin-bottom: 0;
+}
+
+// Footer (for actions)
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right; // right align buttons
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  .border-radius(0 0 6px 6px);
+  .box-shadow(inset 0 1px 0 @white);
+  .clearfix(); // clear it in case folks use .pull-* classes on buttons
+
+  // Properly space out buttons
+  .btn + .btn {
+    margin-left: 5px;
+    margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
+  }
+  // but override that for button groups
+  .btn-group .btn + .btn {
+    margin-left: -1px;
+  }
+}
+
+/* Prevent scrolling on the parent window of a modal */
+body.modal-open {
+  overflow: hidden;
+  -ms-overflow-style: none;
+}
+
+/* Buttons bar in modal iframe */
+.modal-buttons {
+  padding: 15px 0px;
+}
+.modal-buttons button {
+  font-size: 1.2em;
+  line-height: 1.6em;
+}
diff --git a/core/administrator/templates/hathor/less/template.less b/core/administrator/templates/hathor/less/template.less
new file mode 100644
index 00000000..4c5710af
--- /dev/null
+++ b/core/administrator/templates/hathor/less/template.less
@@ -0,0 +1,3565 @@
+// Import the variables file first to get common variables loaded
+@import "hathor_variables.less";
+
+// Core variables and mixins
+@import "../../../../media/jui/less/mixins.less";
+
+// Bootstrap Component Animations
+@import "../../../../media/jui/less/component-animations.less";
+
+// Bootstrap Modals
+@import "modals.less";
+//@import "../../../../media/jui/less/modals.joomla.less";
+
+// Bootstrap Popovers
+@import "../../../../media/jui/less/popovers.less";
+
+// Icon Font
+@import "icomoon.less";
+
+/**
+ * CSS Reset
+ */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	background: transparent;
+}
+
+blockquote, q {
+	quotes: none;
+}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+del {
+	text-decoration: line-through;
+}
+
+/**
+ * General styles
+ */
+html {
+	overflow-y: scroll;
+	height: 100%;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	font-size: 62.5%;
+	line-height: 1.5em;
+	height: 100%;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+body, td, th, span, a {
+	font-family: Arial, Helvetica, sans-serif;
+}
+
+html, body {
+	height: 100%;
+}
+
+a, img {
+	padding: 0;
+	margin: 0;
+}
+
+img {
+	border: 0 none;
+}
+
+form {
+	margin: 0;
+	padding: 0;
+}
+
+ul {
+	padding: 0;
+	margin: 0;
+}
+
+h1 {
+	margin: 0;
+	padding-bottom: 8px;
+	font-size: 1.4em;
+	font-weight: bold;
+	line-height: 2em;
+}
+
+h2 {
+	padding-top: .83em;
+	padding-bottom: .83em;
+}
+
+h3 {
+	font-size: 1.4em;
+}
+
+a:link {
+	color: #054993;
+	text-decoration: none;
+}
+
+a:visited {
+	color: #054993;
+	text-decoration: none;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+a:focus {
+	text-decoration: underline;
+}
+
+iframe {
+	border: 0;
+}
+
+/* new styles */
+
+.enabled {
+	color: #005800;
+	font-weight: bold;
+}
+
+.disabled {
+	color: #a20000;
+	font-weight: bold;
+}
+
+p.error {
+	color: #a20000;
+	font-weight: bold;
+}
+
+.warning {
+	color: #a20000;
+	font-weight: bold;
+}
+
+.nowarning {
+	color: #2c2c2c;
+	font-weight: bold;
+}
+
+.success {
+	color: #005800;
+	font-weight: bold;
+}
+
+.allow {
+	color: #005800;
+}
+
+span.writable {
+	color: #005800;
+}
+
+.deny {
+	color: #a20000;
+}
+
+span.unwritable {
+	color: #a20000;
+}
+
+.none {
+	color: #aaaaaa;
+}
+
+.pointer {
+	cursor: pointer;
+}
+
+.nowrap {
+	white-space: nowrap;
+}
+
+p.nowarning, p.warning {
+	margin: 10px;
+}
+
+/* end new styles */
+
+/**
+ * Overall Styles
+ */
+#minwidth, #minwidth-body {
+	min-width: 980px;
+}
+
+#containerwrap {
+	position: relative;
+}
+
+#header {
+	position: relative;
+}
+
+#header h1.title {
+	font-size: 1.5em;
+	font-weight: normal;
+	line-height: 25px;
+	margin: 0;
+	padding: 0 0 0 120px;
+}
+
+#footer {
+	padding: 10px 20px;
+}
+
+#footer .copyright {
+	margin: 0 0 0 0;
+	text-align: center;
+}
+
+#footer p {
+	font-size: 1.2em;
+}
+
+#nav .no-nav {
+	line-height: 2em;
+}
+
+#content {
+	margin: 5px 20px 20px 20px;
+}
+
+.cpanel-page div#element-box {
+	padding: 15px;
+}
+
+/**
+ * Status layout
+ */
+#module-status {
+	float: right;
+	position: relative;
+	top: -48px;
+}
+
+#module-status div.btn-group {
+	display: block;
+	float: left;
+	padding: 4px 10px 0 10px;
+	font-size: 1.2em;
+}
+
+#module-status div.divider {
+	display: none;
+}
+
+#module-status .unread-messages a {
+	font-weight: bold;
+}
+
+.title-ua {
+	position: relative;
+	width: 60%;
+}
+
+/**
+ * Various Styles
+ */
+.enabled,
+.disabled,
+p.error,
+.warning,
+.nowarning,
+.success {
+	font-weight: bold;
+}
+
+.pointer {
+	cursor: pointer;
+}
+
+.nowrap {
+	white-space: nowrap;
+}
+
+span.note {
+	display: block;
+	padding: 5px;
+}
+
+div.checkin-tick {
+	text-indent: -9999px;
+}
+
+/**
+ * Overlib
+ */
+.ol-textfont {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.2em;
+}
+
+.ol-captionfont {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.2em;
+	font-weight: bold;
+}
+
+.ol-captionfont a {
+	text-decoration: none;
+}
+
+/**
+ * Subheader, toolbar, page title
+ */
+div.subheader .padding {
+	padding: 0;
+}
+
+div.pagetitle {
+	padding: 0 0 5px 5px;
+	margin: 0;
+	background-repeat: no-repeat;
+	background-position: left 50%;
+	line-height: 54px;
+	width: 100%;
+	margin-top: -20px;
+	height: 60px;
+}
+
+.tabs-left > .nav-tabs {
+	float: left;
+	margin-right: 19px;
+	border-right: 1px solid #DDD;
+}
+
+tabs-below > .nav-tabs, .tabs-right > .nav-tabs, .tabs-left > .nav-tabs {
+	border-bottom: 0;
+}
+
+/* Tabbed Content */
+.tab-content {
+	overflow: visible;
+}
+
+.tabs-left .tab-content {
+	overflow: auto;
+}
+
+/* Non-linkable nav-tabs */
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+
+/* Extended Joomla Button Classes */
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+
+/* Joomla => Bootstrap Tooltip */
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #ffffff;
+	text-align: center;
+	text-decoration: none;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+
+.pagetitle h2 {
+	padding: 0 0 0 50px;
+	font-size: 1.3em;
+	font-weight: bold;
+	line-height: 48px;
+	font-style: italic;
+}
+
+div.configuration {
+	font-size: 1.2em;
+	font-weight: bold;
+	line-height: 2em;
+	padding-left: 30px;
+	margin-left: 10px;
+}
+
+div.toolbar-box h3 {
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	padding: 0;
+	margin: 0;
+}
+
+.btn-toolbar {
+	margin-bottom: 3px;
+	margin-top: 14px;
+}
+
+div.btn-toolbar, div.toolbar-list {
+	float: left;
+	text-align: left;
+	padding: 0;
+}
+
+div.toolbar-list li {
+	padding: 5px 1px 5px 4px;
+	text-align: center;
+	height: 52px;
+	list-style: none;
+	float: left;
+}
+
+div.toolbar-list li.spacer {
+	width: 10px;
+}
+
+div.toolbar-list li.divider {
+	width: 10px;
+	margin-right: 10px;
+}
+
+div.toolbar-list span {
+	float: none;
+	width: 32px;
+	height: 32px;
+	margin: 0 auto;
+	display: block;
+}
+
+div.toolbar-list a {
+	display: block;
+	float: left;
+	white-space: nowrap;
+	padding: 1px 5px;
+	cursor: pointer;
+	font-weight: bold;
+}
+
+div.btn-toolbar div.btn-group button {
+	display: block;
+	float: left;
+	white-space: nowrap;
+	padding: 1px 5px;
+	cursor: pointer;
+	text-align: center;
+}
+
+div.btn-toolbar button:hover, div.btn-toolbar button:focus, div.toolbar-list a:hover, div.toolbar-list a:focus {
+	text-decoration: none;
+}
+
+/**
+ * Massmail component
+ */
+td#mm_pane {
+	width: 90%;
+}
+
+input#mm_subject {
+	width: 200px;
+}
+
+textarea#mm_message {
+	width: 100%;
+}
+textarea {
+	resize:both;
+}
+textarea.vert {
+	resize:vertical;
+}
+textarea.noResize {
+	resize:none;
+}
+
+/**
+ * Pane Slider pane Toggler styles
+ */
+.pane-sliders {
+	margin: 0;
+	position: relative;
+}
+
+.pane-sliders .title {
+	margin: 0;
+	padding: 2px;
+	cursor: pointer;
+}
+
+.pane-sliders .panel {
+	margin-bottom: 3px;
+}
+
+.pane-sliders .adminlist td {
+	border: 0 none;
+}
+
+h3.pane-toggler-down a:focus,
+h3.pane-toggler a:focus {
+	outline: none;
+}
+
+.pane-toggler span {
+	padding-left: 20px;
+}
+
+.pane-toggler-down span {
+	padding-left: 20px;
+}
+
+/* The following line hides the unseen panel (prevents the mouse from activating in IE, so overridden in the ie css files) */
+/*.pane-toggler + div.pane-slider {display: none;}*/
+.pane-slider.pane-hide {
+	display: none;
+}
+
+div#position-icon.pane-sliders div.pane-down div.quickicon-wrapper {
+	margin: 5px 0 5px 0;
+}
+
+div#position-icon.pane-sliders div.pane-down .quickicon-wrapper .icon {
+	padding: 5px 0 5px 10px;
+	margin: 0;
+}
+
+/**
+ * Tabs
+ */
+dl.tabs {
+	float: left;
+	margin: 10px 0 -1px 0;
+	z-index: 50;
+}
+
+dl.tabs dt {
+	float: left;
+	padding: 4px 10px;
+	margin-left: 3px;
+}
+
+dl.tabs dt.open {
+	z-index: 100;
+}
+
+div.current {
+	clear: both;
+	padding: 10px 10px;
+}
+
+div.current dd {
+	padding: 0;
+	margin: 0;
+}
+
+/* New parameter styles */
+
+dl#content-pane.tabs {
+	margin: 1px 0 0 0;
+}
+
+div.current label, div.current span.faux-label {
+	display: block;
+	min-width: 150px;
+	float: left;
+	clear: left;
+	margin-top: 8px;
+}
+
+div.current fieldset.radio {
+	float: left;
+}
+
+div.current fieldset.radio input {
+	clear: none;
+	min-width: 15px;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+
+div.current fieldset.radio label {
+	clear: none;
+	min-width: 45px;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+
+div.current fieldset.checkboxes {
+	float: left;
+	clear: right;
+}
+
+div.current fieldset.checkboxes input {
+	clear: left;
+	min-width: 15px;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+
+div.current fieldset.checkboxes label {
+	clear: right;
+	min-width: 45px;
+	margin: 3px 0 0 2px;
+}
+
+div.current input,
+div.current span.faux-input,
+div.current textarea,
+div.current select {
+	clear: none;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+
+div.current select {
+	margin-bottom: 15px;
+}
+
+div.current table#acl-config th.acl-groups {
+	text-align: left;
+}
+
+div.current table#filter-config th.acl-groups {
+	text-align: left;
+}
+
+div.current table#filter-config select {
+	margin-bottom: 0;
+}
+
+/* -------- Menu Assigments ---------- */
+div#menu-assignment {
+	clear: left;
+}
+
+div#menu-assignment ul.menu-links {
+	float: left;
+	width: 49%;
+}
+
+div#menu-assignment ul.menu-links label {
+	clear: none;
+	float: left;
+	margin: 3px 0 0 2px;
+}
+
+div#menu-assignment ul.menu-links input {
+	clear: left;
+	float: left;
+}
+
+button.jform-rightbtn {
+	float: right;
+	margin-right: 0;
+}
+
+p.tab-description {
+	font-size: 1.091em;
+	margin-left: 0;
+	margin-top: 5px;
+}
+
+/* end new parameter styles */
+
+/**
+ * Login Settings
+ */
+#login-page input, #login-page select {
+	float: right;
+	clear: none;
+}
+
+#login-page .login {
+	margin: 0 auto;
+	width: 575px;
+	margin-bottom: 100px;
+}
+
+#login-page .pagetitle h2 {
+	margin: -70px 0 30px 0;
+	font-size: 2em;
+	padding: 0;
+}
+
+#login-page p {
+	margin: 0;
+	padding: 0;
+	margin-bottom: 1em;
+	font-size: 1.2em;
+}
+
+#login-page #header {
+	margin-bottom: 100px;
+}
+
+#login-page .login-inst {
+	float: left;
+	width: 35%;
+}
+
+#login-page .login-box {
+	float: right;
+	width: 63%;
+}
+
+#login-page #lock {
+	width: 150px;
+	height: 137px;
+}
+
+#login-page #element-box.login {
+	padding: 20px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#login-page .button {
+	text-align: right;
+}
+
+#login-page .login-text {
+	text-align: left;
+	width: 40%;
+	float: left;
+}
+
+#form-login {
+	float: left;
+	padding: 1.1em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#form-login fieldset {
+	border: none;
+}
+
+#form-login label {
+	display: block;
+	float: left;
+	clear: left;
+	width: 100px;
+	text-align: right;
+	padding: 4px;
+	color: #2c2c2c;
+	font-weight: bold;
+	font-size: 1.4em;
+	margin-bottom: 15px;
+}
+
+#form-login div.button1 div.next {
+	float: left;
+}
+
+#form-login div.button1 a {
+	height: 2.2em;
+	line-height: 2.2em;
+	font-size: 1.5em;
+	cursor: default;
+	padding: 0 15px 0 15px;
+}
+
+.login-submit {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	width: 0;
+	height: 0;
+}
+
+/**
+ * Cpanel Settings
+ */
+#cpanel div.icon, .cpanel div.icon {
+	text-align: center;
+	margin-right: 5px;
+	float: left;
+	margin-bottom: 5px;
+}
+
+#cpanel div.icon a, .cpanel div.icon a {
+	display: block;
+	float: left;
+	height: auto;
+	min-height: 97px;
+	width: 108px;
+	color: #2c2c2c;
+	vertical-align: middle;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+#cpanel img, .cpanel img {
+	padding: 10px;
+	margin: 0 auto;
+}
+
+#cpanel span, .cpanel span {
+	display: block;
+	text-align: center;
+	padding: 0 0 5px;
+}
+
+div.cpanel-icons {
+	width: 54%;
+	float: left;
+}
+
+div.cpanel-component {
+	width: 45%;
+	float: right;
+}
+
+/**
+ * Standard Layout Styles
+ */
+
+div.col {
+	float: left;
+}
+
+div.options-section.col {
+	float: right;
+}
+
+div.col1 {
+	float: left;
+	width: 45%;
+}
+
+div.col2 {
+	float: right;
+	width: 45%;
+}
+
+/* Avoid using the width divs. They are here for 3PD Extensions if needed
+	 * Use the specific layout divs listed after. See also the th.width entries */
+div.width-1 {
+	width: 1%;
+}
+
+div.width-3 {
+	width: 3%;
+}
+
+div.width-5 {
+	width: 5%;
+}
+
+div.width-10 {
+	width: 10%;
+}
+
+div.width-20 {
+	width: 20%;
+}
+
+div.width-30 {
+	width: 30%;
+}
+
+div.width-35 {
+	width: 35%;
+}
+
+div.width-40 {
+	width: 40%;
+}
+
+div.width-45 {
+	width: 45%;
+}
+
+div.width-50 {
+	width: 50%;
+}
+
+div.width-55 {
+	width: 55%;
+}
+
+div.width-60 {
+	width: 60%;
+}
+
+div.width-65 {
+	width: 65%;
+}
+
+div.width-70 {
+	width: 70%;
+}
+
+div.width-80 {
+	width: 80%;
+}
+
+div.width-100 {
+	width: 100%;
+}
+
+.clrlft {
+	clear: left;
+}
+
+.clrrt {
+	clear: right;
+}
+
+.fltlft {
+	float: left;
+}
+
+.fltrt {
+	float: right;
+}
+
+.fltnone {
+	float: none;
+}
+
+/* Layout Divs */
+div.main-section {
+	width: 60%;
+}
+
+div.options-section {
+	width: 38%;
+	margin: 10px 10px 10px 0;
+}
+
+/* for bluestork style html */
+div.width-40.fltrt {
+	width: 38%;
+	margin: 10px 10px 10px 0;
+}
+
+div.rules-section {
+	width: 98%;
+	margin: 10px;
+}
+
+/**
+ * Form Styles
+ */
+
+fieldset {
+	margin: 2px 10px 2px 10px;
+	padding: 5px;
+	text-align: left;
+}
+
+legend {
+	font-size: 1.3em;
+	font-weight: bold;
+	padding-bottom: 5px;
+}
+
+fieldset p {
+	margin: 10px 0;
+	font-size: 1.2em;
+}
+
+fieldset ol, ol#property-values, fieldset ul, ul#property-values {
+	margin: 0;
+	padding: 0;
+}
+
+fieldset li, ol#property-values li, ul#property-values li {
+	list-style: none;
+	margin: 0;
+	padding: 5px;
+}
+
+fieldset.adminform fieldset.radio,
+fieldset.panelform fieldset.radio,
+fieldset.adminform-legacy fieldset.radio {
+	border: 0;
+	float: left;
+	padding: 0;
+	margin: 0 0 5px 0;
+	clear: right;
+}
+
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+	min-width: 40px;
+	float: left;
+	clear: none;
+}
+
+/* checkboxes */
+fieldset.adminform fieldset.checkboxes,
+fieldset.panelform fieldset.checkboxes,
+fieldset.adminform-legacy fieldset.checkboxes {
+	border: 0;
+	float: left;
+	padding: 0;
+	margin: 0 0 5px 0;
+	clear: right;
+}
+
+fieldset.adminform fieldset.checkboxes input[type="checkbox"],
+fieldset.panelform fieldset.checkboxes input[type="checkbox"] {
+	float: left;
+	clear: left;
+}
+
+fieldset.adminform fieldset.checkboxes label,
+fieldset.panelform fieldset.checkboxes label,
+fieldset.adminform fieldset.checkboxes span.faux-label,
+fieldset.panelform fieldset.checkboxes span.faux-label {
+	clear: right;
+}
+
+/* end checkboxes */
+
+/* spacer */
+div.current span.spacer > span.before,
+fieldset.adminform span.spacer > span.before,
+fieldset.panelform span.spacer > span.before {
+	clear: both;
+	overflow: hidden;
+	height: 0;
+	display: block;
+}
+
+/* end spacer */
+
+fieldset.panelform-legacy label,
+fieldset.adminform-legacy label,
+fieldset.panelform-legacy span.faux-label,
+fieldset.adminform-legacy span.faux-label {
+	min-width: 150px;
+	float: left;
+
+}
+
+
+fieldset.adminform,
+fieldset.panelform {
+	.input-prepend,
+	.input-append {
+		float: left;
+	}
+	.adminformlist .btn.modal,
+	.input-prepend > *,
+	.input-append > * {
+		float: none;
+		vertical-align: middle;
+	}
+}
+
+/* JParameter classes on radio button labels */
+fieldset.panelform-legacy label.radiobtn-jno,
+fieldset.panelform-legacy label.radiobtn-jyes,
+fieldset.panelform-legacy label.radiobtn-show,
+fieldset.panelform-legacy label.radiobtn-hide,
+fieldset.panelform-legacy label.radiobtn-off,
+fieldset.panelform-legacy label.radiobtn-on {
+	min-width: 40px !important;
+	clear: none !important;
+}
+
+#jform_plugdesc-lbl,
+#jform_description-lbl {
+	font-weight: bold;
+	clear: both;
+	margin-top: 15px;
+}
+
+p.jform_desc {
+	clear: left;
+}
+
+div#jform_ordering {
+	font-size: 1.091em;
+	margin-top: 3px;
+}
+
+fieldset ul.checklist {
+	margin-left: 27px;
+}
+
+fieldset ul.checklist input,
+fieldset ul.checklist label {
+	float: none;
+}
+
+fieldset ul.checklist input:focus {
+	outline: thin dotted #333333;
+}
+
+fieldset#filter-bar {
+	margin: 0;
+	padding: 5px 10px 5px 10px;
+	float: left;
+	width: 98%
+}
+
+fieldset#filter-bar ol, fieldset#filter-bar ul {
+	list-style: none;
+	margin: 0;
+	padding: 5px 0 0;
+}
+
+fieldset#filter-bar ol li, fieldset#filter-bar ul li {
+	float: left;
+	padding: 0 5px 0 0;
+}
+
+fieldset#filter-bar ol li fieldset, fieldset#filter-bar ul li fieldset {
+	margin: 0;
+	padding: 0;
+}
+
+fieldset#filter-bar .filter-search {
+	float: left;
+	padding-bottom: 3px;
+}
+
+fieldset#filter-bar .filter-select {
+	float: right;
+}
+
+fieldset#filter-bar input#search {
+	width: 10em;
+}
+
+/* Note: these visual cues should be augmented by aria */
+.invalid {
+	font-weight: bold;
+}
+
+/* augmented by aria in template javascript */
+input.readonly, span.faux-input {
+	border: 0;
+}
+
+.star {
+	color: #cc0000;
+	font-size: 1.2em;
+}
+
+input, select, span.faux-input {
+	font-size: 1.2em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+span.readonly {
+	float: left;
+	font-size: 1.2em;
+	line-height: 2em;
+}
+
+div.readonly {
+	font-size: 1.2em;
+	line-height: 2em;
+}
+
+div.extdescript {
+	margin-left: 10px;
+}
+
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+	font-family: Arial, Helvetica, sans-serif;
+	padding: 1px 6px;
+	font-size: 1.2em;
+	line-height: 1.5em;
+}
+
+textarea {
+	font-size: 1.4em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+input.button {
+	cursor: pointer;
+}
+
+label {
+	font-weight: bold;
+	font-size: 1.1em;
+}
+
+span.faux-label {
+	font-weight: bold;
+	font-size: 1.1em;
+}
+
+label.selectlabel {
+	position: absolute;
+	left: -1000em;
+}
+
+/**
+ * Option or Parameter styles
+ */
+
+.paramrules {
+	padding: 10px;
+}
+
+span.gi {
+	font-weight: bold;
+	margin-right: 5px;
+}
+
+span.gtr {
+	visibility: hidden;
+	margin-right: 5px;
+}
+
+/**
+ * Admintable Styles
+ */
+table.admintable td {
+	padding: 3px;
+	font-size: 1em;
+}
+
+table.admintable td.key, table.admintable td.paramlist_key {
+	text-align: right;
+	width: 140px;
+	font-weight: bold;
+	font-size: 1em;
+}
+
+table.admintable td.key label, table.admintable td.paramlist_key label {
+	font-size: 1em;
+}
+
+table.admintable td.paramlist_value label {
+	font-size: 1em;
+}
+
+table.admintable input, table.admintable span.faux-input, table.admintable select {
+	font-size: 1em;
+}
+
+table.paramlist td.paramlist_description {
+	text-align: left;
+	width: 170px;
+	font-weight: normal;
+}
+
+table.admintable td.key.vtop {
+	vertical-align: top;
+}
+
+/**
+ * Admin Form Styles
+ */
+fieldset.adminform {
+	margin: 0 10px 10px 10px;
+	overflow: hidden;
+}
+
+.adminformlist .btn.modal{
+	float: left;
+	margin-top: 7px;
+}
+
+ul.adminformlist,
+ul.adminformlist li,
+dl.adminformlist,
+dl.adminformlist li {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+ul.adminformlist pre {
+	font-size: 1.3em;
+}
+
+ul.adminformlist .button2-left, ul.adminformlist .button2-left {
+	margin-top: 5px;
+}
+
+/* Table styles are for use with tabular data */
+table.adminform {
+	width: 100%;
+	border-collapse: collapse;
+	margin: 8px 0 10px 0;
+	margin-bottom: 15px;
+}
+
+table.adminform.nospace {
+	margin-bottom: 0;
+}
+
+table.adminform th {
+	font-size: 1.4em;
+	padding: 6px 2px 4px 4px;
+	text-align: left;
+	height: 25px;
+}
+
+table.adminform td {
+	padding: 3px;
+	text-align: left;
+}
+
+table.adminform td#filter-bar {
+	text-align: left;
+}
+
+table.adminform td.helpMenu {
+	text-align: right;
+}
+
+table.adminform tr {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+/**
+ * Table formating styles
+ */
+td.center, th.center {
+	text-align: center;
+}
+
+/* Avoid using the width classes. They are here for 3PD Extensions if needed
+	 * Use the specific layout table headers listed after. See also the div.width entries */
+th.width-1 {
+	width: 1%;
+}
+
+th.width-3 {
+	width: 3%;
+}
+
+th.width-5 {
+	width: 5%;
+}
+
+th.width-10 {
+	width: 10%;
+}
+
+th.width-12 {
+	width: 12%;
+}
+
+th.width-15 {
+	width: 15%;
+}
+
+th.width-20 {
+	width: 20%;
+}
+
+th.width-25 {
+	width: 25%;
+}
+
+th.width-30 {
+	width: 30%;
+}
+
+th.width-40 {
+	width: 40%;
+}
+
+/* Table header layout classes */
+th.row-number-col {
+	width: 3%;
+}
+
+th.checkmark-col {
+	width: 1%;
+}
+
+th.state-col {
+	width: 5%;
+}
+
+th.ordering-col {
+	width: 10%;
+}
+
+th.ordering-col a {
+	display: block;
+	float: left;
+	margin-left: 3px;
+}
+
+th.ordering-col a img {
+	margin-left: 4px;
+	margin-right: 4px;
+}
+
+.categories th.ordering-col input, .categories td.order input {
+	font-size: 1em;
+}
+
+th.category-col {
+	width: 5%;
+}
+
+th.access-col {
+	width: 10%;
+}
+
+.categories th.access-col {
+	width: 5%;
+}
+
+th.hits-col {
+	width: 5%;
+}
+
+th.id-col {
+	width: 3%;
+}
+
+th.featured-col {
+	width: 5%;
+}
+
+th.created-by-col {
+	width: 15%;
+}
+
+th.date-col {
+	width: 5%;
+}
+
+th.language-col {
+	width: 5%;
+}
+
+th.home-col {
+	width: 5%;
+}
+
+/**
+ * Adminlist Table layout
+ */
+table.adminlist {
+	width: 100%;
+	float: left;
+}
+
+table.adminlist td, table.adminlist th {
+	padding: 4px;
+	font-size: 1.2em;
+}
+
+table.adminlist thead th {
+	text-align: center;
+}
+
+table.adminlist thead a:hover {
+	text-decoration: none;
+}
+
+table.adminlist thead th img {
+	vertical-align: middle;
+}
+
+table.adminlist tbody th {
+	font-weight: bold;
+}
+
+/* Table row styles */
+table.adminlist tr {
+	padding-left: 30px;
+	padding-right: 30px;
+}
+
+table.adminlist tbody tr {
+	text-align: left;
+}
+
+table.adminlist tbody tr td,
+table.adminlist tbody tr th {
+	height: 25px;
+}
+
+table.adminlist tfoot tr {
+	text-align: center;
+}
+
+/* Table td/th styles */
+table.adminlist tfoot td, table.adminlist tfoot th {
+	text-align: center;
+}
+
+table.adminlist td.order {
+	text-align: center;
+	white-space: nowrap;
+}
+
+table.adminlist td.order span {
+	float: left;
+	width: 20px;
+	text-align: center;
+}
+
+table.adminlist td.order input {
+	text-align: center;
+	width: 3em;
+	font-size: 100%;
+}
+
+/**
+ * Tree indentation & nesting - Up to 10 levels deep so don't go crazy :
+ */
+#media-tree_tree ul {
+	list-style: none outside none;
+    margin: 0 10px;
+}
+
+table.adminlist td.indent-4 {
+	padding-left: 4px;
+}
+
+table.adminlist td.indent-19 {
+	padding-left: 19px;
+}
+
+table.adminlist td.indent-34 {
+	padding-left: 34px;
+}
+
+table.adminlist td.indent-49 {
+	padding-left: 49px;
+}
+
+table.adminlist td.indent-64 {
+	padding-left: 64px;
+}
+
+table.adminlist td.indent-79 {
+	padding-left: 79px;
+}
+
+table.adminlist td.indent-94 {
+	padding-left: 94px;
+}
+
+table.adminlist td.indent-109 {
+	padding-left: 109px;
+}
+
+table.adminlist td.indent-124 {
+	padding-left: 124px;
+}
+
+table.adminlist td.indent-139 {
+	padding-left: 139px;
+}
+
+/**
+ * Adminlist buttons
+ */
+table.adminlist tr td.btns a {
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	padding: 3px 20px;
+}
+
+table.adminlist tr td.btns a:hover, table.adminlist tr td.btns a:active, table.adminlist tr td.btns a:focus {
+	text-decoration: none;
+}
+
+/**
+ * Adminlist lists
+ */
+table.adminlist td li {
+	list-style: inside;
+}
+
+/**
+ * Modal Modules styles
+ */
+ul#new-modules-list {
+	margin-left: 50px;
+	font-size: 1.4em;
+	line-height: 1.5em;
+}
+
+/**
+ * Utility styles
+ */
+/* General Clearing Class */
+.clr {
+	clear: both;
+	overflow: hidden;
+	height: 0;
+}
+
+.clearfix:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+
+.menu-module-list {
+	list-style-position: inside;
+	padding-left: 10px;
+	margin-left: 5px;
+}
+
+/* stu nicholls solution for centering divs */
+.container {
+	clear: both;
+	text-decoration: none;
+}
+
+* html .container {
+	display: inline-block;
+}
+
+/* table solution for global config */
+table.noshow {
+	width: 100%;
+	border-collapse: collapse;
+	padding: 0;
+	margin: 0;
+}
+
+table.noshow tr {
+	vertical-align: top;
+}
+
+table.noshow fieldset {
+	margin: 15px 7px 7px 7px;
+}
+
+/**
+ * Saving order icon styling in admin tables
+ */
+a.saveorder {
+	width: 16px;
+	height: 16px;
+	display: block;
+	overflow: hidden;
+	float: right;
+	margin-right: 8px;
+}
+
+/**
+ * Button styling
+ */
+#editor-xtd-buttons {
+	padding: 5px;
+}
+
+button {
+	font-family: Arial, Helvetica, sans-serif;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	margin-right: 3px;
+	margin-left: 3px;
+}
+
+.invalid {
+	font-weight: bold;
+}
+
+/* Button 1 Type */
+.button1, .button1 div {
+	height: 1%;
+	float: right;
+}
+
+.button1 {
+	white-space: nowrap;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.button1 a {
+	display: block;
+	height: 2.2em;
+	float: left;
+	line-height: 2.2em;
+	font-size: 1.2em;
+	font-weight: bold;
+	cursor: default;
+	padding: 0 6px 0 6px;
+	/* add padding if you are using the directional images */
+	/* padding: 0 30px 0 6px; */
+}
+
+.button1 a:hover, .button1 a:focus {
+	text-decoration: none;
+}
+
+/* Button 2 Type */
+.button2-left, .button2-right {
+	float: left;
+	line-height: 1.5em;
+	font-size: 1.2em;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.button2-left.smallsub, .button2-right.smallsub {
+	line-height: 1.2em;
+	font-size: .9em;
+}
+
+.button2-left a, .button2-right a, .button2-left span, .button2-right span {
+	display: block;
+	float: left;
+	cursor: default;
+}
+
+/* these are inactive buttons */
+.button2-left span, .button2-right span {
+	cursor: default;
+}
+
+.button2-left .page a, .button2-right .page a,
+.button2-left .page span, .button2-right .page span,
+.button2-left .blank a, .button2-right .blank a,
+.button2-left .blank span, .button2-right .blank span {
+	padding: 0 6px;
+}
+
+.page span, .blank span {
+	font-weight: bold;
+}
+
+.button2-left a:hover,
+.button2-right a:hover,
+.button2-left a:focus,
+.button2-right a:focus {
+	text-decoration: none;
+}
+
+.button2-left a, .button2-left span {
+	padding: 0 24px 0 6px;
+}
+
+.button2-right a, .button2-right span {
+	padding: 0 6px 0 24px;
+}
+
+.button2-left {
+	float: left;
+	margin-left: 5px;
+}
+
+.button2-right {
+	float: left;
+	margin-left: 5px;
+}
+
+/**
+ * Pagination styles
+ */
+
+/* Normal pagination styles */
+div.containerpg {
+	position: relative;
+	left: 50%;
+	float: left;
+	clear: left;
+}
+
+div.pagination {
+	position: relative;
+	left: -50%;
+	margin: 0 auto;
+	padding: .5em;
+}
+
+.pagination div.limit {
+	float: left;
+	margin: 0 10px;
+	font-size: 1.2em;
+	height: 1.8em;
+	line-height: 1.8em;
+}
+
+.pagination div.limit label {
+	font-size: 100%;
+	height: 1.8em;
+	line-height: 1.8em;
+}
+
+.pagination div.limit select {
+	font-size: 100%;
+}
+
+/* The Go submittal button */
+.pagination button {
+	font-size: 100%;
+	height: 2.0em;
+	line-height: 1.8em;
+	margin-right: 20px;
+}
+
+div.pagination .button2-right, div.pagination .button2-left {
+	font-size: 1.2em;
+	height: 1.6em;
+	line-height: 1.6em;
+}
+
+/* Style if pagination is part of the table (old style) */
+table.adminlist .pagination {
+	display: table;
+	padding: 0;
+	margin: 0 auto;
+	font-size: .8em;
+}
+
+table.adminlist .pagination button {
+	font-size: 1.2em;
+	height: 1.6em;
+	line-height: 1.5em;
+	margin-right: 20px;
+}
+
+/**
+ * MCE Editor
+ */
+div.toggle-editor {
+	margin-top: 9px;
+}
+
+/**
+ * Tooltips
+ */
+.tip {
+	float: left;
+	padding: 5px;
+	max-width: 400px;
+	z-index: 50;
+}
+
+.tip-title {
+	padding: 0;
+	margin: 0;
+	font-size: 120%;
+	margin-top: -15px;
+	padding-top: 15px;
+	padding-bottom: 5px;
+}
+
+.tip-text {
+	font-size: 100%;
+	text-align: left;
+	margin: 0;
+}
+
+/**
+ * Calendar
+ */
+a img.calendar {
+	width: 16px;
+	height: 16px;
+	margin-left: 3px;
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+/**
+ * JGrid styles
+ */
+a.jgrid:hover {
+	text-decoration: none;
+}
+
+.jgrid span.state {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+
+.jgrid span.text {
+	display: none;
+}
+
+/**
+ * Icons
+ * The Background Icons for Menus, Toolbars, Quick Icons
+ * are now in the color css files
+ */
+
+/**
+ * General styles
+ */
+div.message {
+	text-align: center;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 1.2em;
+	padding: 3px;
+	margin-bottom: 10px;
+	font-weight: bold;
+}
+
+.helpIndex {
+	border: 0;
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	overflow: auto;
+}
+
+.helpFrame {
+	width: 100%;
+	height: 800px;
+	padding: 0 5px 0 10px;
+}
+
+#treecellhelp {
+	width: 25%;
+	display: block;
+	position: relative;
+	float: left;
+	margin: 0;
+	padding: 2px;
+	overflow: hidden;
+}
+
+#datacellhelp {
+	width: 73%;
+	display: block;
+	float: left;
+	margin: 0;
+	padding: 2px 0 0 0;
+}
+
+.outline {
+	padding: 2px;
+}
+
+/**
+ * Modal Styles
+ */
+
+h2.modal-title {
+	margin-left: 15px;
+	margin-bottom: 0;
+	margin-top: 5px;
+	font-size: 1.8em;
+	padding-bottom: .5em;
+}
+
+ul.menu_types {
+	padding: 0 0 0 15px;
+	width: 95%;
+	margin: 0;
+}
+
+ul.menu_types li,
+dl.menu_type dd ul li {
+	width: 240px;
+	list-style: none;
+	display: block;
+	float: left;
+	margin-right: 10px;
+}
+
+ul.menu_types li {
+	width: 47%;
+}
+
+dl.menu_type {
+	width: 240px;
+	margin: 0;
+	padding: 0;
+}
+
+dl.menu_type dt {
+	font-weight: bold;
+	font-size: 1.5em;
+	float: left;
+	margin: 13px 0 5px 0;
+	width: 240px;
+}
+
+dl.menu_type dd {
+	clear: left;
+	margin: 0;
+}
+
+dl.menu_type dd a {
+	font-size: 1.2em;
+}
+
+dl.menu_type dd ul li {
+	margin: 0;
+}
+
+ul#new-modules-list {
+	padding: 5px 0 0 15px;
+	width: 95%;
+	margin: 0;
+	list-style: none;
+}
+
+ul#new-modules-list li {
+	list-style: none;
+	display: block;
+	float: left;
+	margin: 0 20px 0 0;
+	width: 47%;
+}
+
+ul#new-modules-list li a {
+	font-size: 1em;
+	line-height: 1.5em;
+}
+
+body.contentpane #filter-bar {
+	font-size: 80%;
+}
+
+body.contentpane input, body.contentpane select {
+	font-size: 120%;
+}
+
+#filter-bar input, #filter-bar select, #filter-bar button {
+	font-size: 110%;
+}
+
+/**
+ * User Accessibility
+ */
+
+/* Skip to Content Structural Styling */
+#skiplinkholder a, #skiplinkholder a:link, #skiplinkholder a:visited {
+	display: block;
+	width: 99%;
+	position: absolute;
+	top: 0;
+	left: -200%;
+	z-index: 2;
+}
+
+#skiplinkholder a:focus, #skiplinkholder a:active {
+	left: 0;
+	top: 0;
+	z-index: 100;
+}
+
+#skiplinkholder p {
+	margin: 0;
+}
+
+#skiptargetholder {
+	position: absolute;
+	left: -200%;
+}
+
+/* Skip to Content Visual Styling */
+#skiplinkholder a, #skiplinkholder a:link, #skiplinkholder a:visited {
+	text-decoration: underline;
+	padding: 5px;
+	font-size: 1.3em;
+	font-weight: bold;
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+/* Hide overlayed controls so that keyboarders can get to the modal */
+.body-overlayed a,
+.body-overlayed input,
+.body-overlayed button {
+	visibility: hidden;
+}
+
+.body-overlayed #sbox-window a,
+.body-overlayed #sbox-window input,
+.body-overlayed #sbox-window button {
+	visibility: visible;
+}
+
+/**
+ * Admin Form Styles
+ */
+
+/* For elements that aren't to be seen by users unless the user does something
+	 * like clicking on a header to see the collapsed section. */
+.element-hidden, .hide {
+	display: none;
+}
+
+.hidebtn {
+	border: 0 !important;
+	padding: 0 !important;
+	margin: 0;
+	width: 0;
+	height: 0;
+}
+
+/* For elements that aren't to be seen by visual users but do need to be read by screenreaders.
+	 * Cannot be used for elements that can get focus such as links and form elements */
+.element-invisible, .hidelabeltxt {
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	padding: 0;
+	margin: 0;
+}
+
+/* Firefox has issues styling legend so this is a universal fix
+	for making the legend invisible (i.e. visually it's not there, but screen readers see it */
+
+legend.element-invisible {
+	position: absolute !important;
+	margin: 0;
+	padding: 0;
+	border: 0;
+	margin-left: -10000px;
+	font-size: 1px;
+	height: 0;
+}
+
+fieldset.panelform {
+	overflow: hidden;
+	clear: both;
+}
+
+fieldset.adminform label,
+fieldset.panelform label,
+fieldset.adminform span.faux-label,
+fieldset.panelform span.faux-label {
+	line-height: 2em;
+	clear: left;
+	min-width: 12em;
+	float: left;
+	margin-left: 10px;
+	margin-right: 5px;
+}
+
+fieldset.adminform.long label,
+fieldset.panelform.long label,
+fieldset.adminform.long span.faux-label,
+fieldset.panelform.long span.faux-label {
+	min-width: 18em;
+}
+
+fieldset.adminform fieldset.radio label,
+fieldset.panelform fieldset.radio label,
+fieldset.adminform fieldset.radio span.faux-label,
+fieldset.panelform fieldset.radio span.faux-label {
+	margin-left: 0;
+}
+
+fieldset.adminform input, fieldset.adminform span.faux-input, fieldset.adminform textarea, fieldset.adminform select, fieldset.adminform img, fieldset.adminform button,
+fieldset.panelform input, fieldset.panelform span.faux-input, fieldset.panelform textarea, fieldset.panelform select, fieldset.panelform img, fieldset.panelform button {
+	float: left;
+	margin: 5px 5px 5px 0;
+	width: auto;
+}
+
+/* -------- Batch Section ---------- */
+fieldset.batch {
+	margin: 20px 10px 10px 10px;
+	padding: 10px;
+}
+
+fieldset.batch label {
+	margin: 5px;
+	min-width: 40px;
+}
+
+fieldset.batch button {
+	margin: 3px;
+}
+
+fieldset#batch-choose-action {
+	clear: left;
+	border: 0 none;
+}
+
+fieldset.batch label {
+	float: left;
+	clear: none;
+}
+
+fieldset label#batch-choose-action-lbl {
+	clear: left;
+	margin-top: 15px;
+}
+
+label#batch-language-lbl,
+label#batch-user-lbl {
+	clear: left;
+	margin-right: 10px;
+	margin-top: 15px;
+}
+
+select#batch-language-id,
+select#batch-user-id {
+	margin-top: 15px;
+}
+
+select#batch-category-id,
+select#batch-position-id,
+select#batch-menu-id {
+	margin-right: 30px;
+}
+
+fieldset.batch select, fieldset.batch input, fieldset.batch img, fieldset.batch button {
+	float: left;
+}
+
+label#batch-access-lbl,
+label#batch-client-lbl {
+	margin-right: 10px;
+}
+
+div#jform_ordering {
+	font-size: 1.091em;
+	margin-top: 3px;
+}
+
+/* Banner edit */
+#jform_impmade, #jform_clicks {
+	width: 30px;
+}
+
+fieldset.panelform label#jform-imp {
+	min-width: 3em;
+	font-size: 1.091em;
+}
+
+fieldset.adminform input#jform_clickurl {
+	width: 20em;
+}
+
+/**
+ * ACL STYLES relocated from com_users/media/grid.css
+ */
+
+a.move_up {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+
+span.move_up {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+
+a.move_down {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+
+span.move_down {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+}
+
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+
+a.grid_trash {
+	display: inline-block;
+	height: 16px;
+	text-indent: -1000em;
+	width: 16px;
+}
+
+/**
+ * ACL PANEL STYLES
+ */
+div.acl-options {
+	width: 100%;
+}
+
+/* All Tabs */
+table.aclsummary-table,
+table.aclmodify-table {
+	border-collapse: collapse;
+	width: 100%;
+	font-size: 1.091em;
+}
+
+td.col1 {
+	font-size: 1.091em;
+	text-align: left;
+	padding: 4px;
+}
+
+table.aclsummary-table caption,
+table.aclmodify-table caption {
+	display: none;
+}
+
+/* Summary Tab */
+table.aclsummary-table th.col1 {
+	width: 25%;
+}
+
+table.aclsummary-table th.col2,
+table.aclsummary-table th.col3,
+table.aclsummary-table th.col4,
+table.aclsummary-table th.col5,
+table.aclsummary-table th.col6 {
+	width: 15%;
+	vertical-align: bottom;
+	text-align: center;
+}
+
+/* Icons (background images moved to color css files */
+span.icon-16-unset,
+span.icon-16-allowed,
+span.icon-16-denied,
+span.icon-16-locked {
+	padding-left: 18px;
+}
+
+label.icon-16-allow,
+label.icon-16-deny,
+a.icon-16-allow,
+a.icon-16-deny,
+a.icon-16-allowinactive,
+a.icon-16-denyinactive {
+	display: block;
+	height: 16px;
+	width: 16px;
+	margin: 0 auto;
+}
+
+label.icon-16-allow {
+	text-indent: -9999em;
+	position: relative;
+	left: 40%;
+}
+
+label.icon-16-deny {
+	text-indent: -9999em;
+	position: relative;
+	left: 40%;
+}
+
+/* Create, Edit, Edit State & Delete Tabs */
+table.aclmodify-table th.col2,
+table.aclmodify-table th.col3,
+table.aclmodify-table th.col4 {
+	width: 20%;
+	vertical-align: bottom;
+	text-align: center;
+}
+
+table.aclmodify-table select {
+	margin: 1px;
+}
+
+table.aclsummary-table td label,
+table.aclmodify-table td label {
+	min-width: 20px;
+}
+
+/* ACL footer/legend */
+ul.acllegend {
+	list-style: none;
+	font-size: 1.091em;
+	padding-bottom: 10px;
+}
+
+ul.acllegend li {
+	display: block;
+	float: left;
+	padding-right: 20px;
+	margin: 15px 0 15px 10px;
+}
+
+ul.acllegend li.acl-allowed {
+	padding-left: 20px;
+	padding-right: 10px;
+}
+
+ul.acllegend li.acl-denied {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+ul.acllegend li.acl-editgroups {
+	padding-right: 10px;
+}
+
+ul.acllegend li.acl-resetbtn {
+	padding-right: 0;
+}
+
+li.acl-editgroups,
+li.acl-resetbtn {
+	display: block;
+	float: left;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+li.acl-editgroups a,
+li.acl-resetbtn a {
+	padding: 6px;
+	cursor: default;
+}
+
+li.acl-editgroups a:hover,
+li.acl-resetbtn a:hover,
+li.acl-editgroups a:focus,
+li.acl-resetbtn a:focus {
+	text-decoration: none;
+	cursor: default;
+}
+
+li.acl-editgroups:hover,
+li.acl-resetbtn:hover,
+li.acl-editgroups:focus,
+li.acl-resetbtn:focus {
+	text-decoration: none;
+	cursor: default;
+}
+
+table#acl-config {
+	width: 100%;
+	margin-top: 15px;
+}
+
+table#acl-config th,
+table#acl-config td {
+	height: 2em;
+	background: #f9fade;
+	text-align: center;
+	vertical-align: middle;
+}
+
+table#acl-config th.acl-groups {
+	padding-left: 8px;
+	font-weight: bold;
+	text-align: left;
+}
+
+table#acl-config th.acl-groups span.gi {
+	margin-right: 2px;
+}
+
+table#acl-config td {
+	width: 9em;
+}
+
+table#acl-config td select {
+	float: none;
+}
+
+.acl-action {
+	font-size: 1.091em;
+	margin: auto 0;
+}
+
+.acl-groups {
+	font-size: 1.091em;
+	font-weight: normal;
+}
+
+label#jform_rules-lbl {
+	float: none;
+	white-space: nowrap;
+	display: none;
+	visibility: hidden;
+}
+
+label#jform_filters-lbl {
+	float: none;
+	white-space: nowrap;
+	display: none;
+	visibility: hidden;
+}
+
+/**
+* Options modal- config
+*/
+ul.config-option-list,
+ul.config-option-list li {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+ul.config-option-list fieldset {
+	margin: 0;
+	padding-left: 0;
+	padding-right: 0;
+}
+
+/* *
+* Permission Rules
+*/
+#permissions-sliders {
+    margin-top: 15px;
+}
+
+#permissions-sliders ul#rules,
+#permissions-sliders ul#rules ul {
+	margin: 0 !important;
+	padding: 0 !important;
+	list-style-type: none;
+}
+
+#permissions-sliders ul#rules li {
+	margin: 0;
+	padding: 0;
+}
+
+#permissions-sliders ul#rules table.group-rules {
+	border-collapse: collapse;
+	margin: 5px;
+	width: 100%;
+}
+
+#permissions-sliders ul#rules table.group-rules td {
+	padding: 4px;
+	vertical-align: middle;
+	text-align: left;
+	overflow: hidden;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+	font-size: 1.2em;
+	overflow: hidden;
+	font-weight: bold;
+}
+
+#permissions-sliders .panel {
+	margin-bottom: 3px;
+	margin-left: 0;
+	border: 0;
+}
+
+#permissions-sliders p.rule-desc {
+	font-size: 1.1em;
+}
+
+#permissions-sliders div.rule-notes {
+	font-size: 1.1em;
+}
+
+ul#rules table.group-rules td label {
+	margin: 0 !important;
+	line-height: 1.1em;
+}
+
+ul#rules table.group-rules td span {
+	font-size: 1.1em;
+	padding-bottom: 4px;
+}
+
+ul#rules table.group-rules td span span {
+	font-size: 100%;
+}
+
+table.group-rules td select {
+	margin: 0 !important;
+}
+
+#permissions-sliders ul#rules .mypanel {
+	padding: 0;
+	line-height: 1.3em;
+}
+
+#permissions-sliders .mypanel table.group-rules caption {
+	font-size: 1.3em;
+}
+
+#permissions-sliders ul#rules {
+	padding: 5px;
+}
+
+#permissions-sliders ul#rules table.group-rules th {
+	text-align: left;
+	padding: 4px;
+}
+
+#permissions-sliders ul#rules table.group-rules td label {
+	min-width: 1em;
+}
+
+#permissions-sliders .pane-toggler span {
+	padding-left: 20px;
+}
+
+#permissions-sliders .pane-toggler-down span {
+	padding-left: 20px;
+}
+
+#permissions-sliders .pane-toggler-down span.level,
+#permissions-sliders .pane-toggler span.level {
+	padding: 0;
+}
+
+/*
+ * Debug styles
+ */
+
+.swatch {
+	text-align: center;
+	padding: 0 15px 0 15px;
+}
+
+/* Tab changes for accessibility */
+dl.tabs dt h3 {
+	padding: 0;
+	font-size: 100%;
+}
+
+/**
+ * Helpmenus
+ */
+ul.helpmenu li {
+	float: right;
+	margin: 10px;
+	padding: 0;
+	list-style-type: none;
+	font-weight: bold;
+}
+
+/* CSS file for Accessible Admin Menu
+ * based on Matt Carrolls' son of suckerfish
+ * with javascript by Bill Tomczak
+ */
+
+/* Note: set up the font-size on the id and used 100% on the elements.
+	If ul/li/a are different ems, then the shifting back via non-js keyboard
+	doesn't work properly */
+
+/**
+ * Menu Styling
+ */
+#menu {
+	/* this is on the main ul */
+	position: relative;
+	z-index: 100;
+	padding: 0;
+	margin: 0;
+	width: 100%;
+	list-style: none;
+	font-size: 1.2em;
+	font-weight: bold;
+}
+
+#menu ul {
+	/* all lists */
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	font-size: 100%;
+}
+
+#menu ul li.separator {
+	margin-bottom: 1em;
+}
+
+#menu a {
+	padding: 0.35em 2.5em 0.35em 2em;
+	vertical-align: middle;
+	display: block;
+	/* width: 10em; */
+	text-decoration: none;
+	font-size: 100%;
+}
+
+#menu li {
+	/* all list items */
+	float: left;
+	/* width: 12em; width needed or else Opera goes nuts */
+	font-size: 100%;
+}
+
+#menu li a {
+	white-space: nowrap;
+}
+
+#menu li li a {
+	margin-bottom: 1px;
+	margin-top: 1px;
+	width: 10em;
+}
+
+#menu li.disabled a:hover,
+#menu li.disabled a:focus,
+#menu li.disabled a {
+	cursor: default;
+}
+
+#menu li ul {
+	/* second-level lists */
+	position: absolute;
+	width: 16em;
+	margin-left: -1000em;
+	/* using left instead of display to hide menus because display: none isn't read by screen readers */
+}
+
+#menu li li {
+	/* second-level row */
+	border: none;
+	width: 16em;
+}
+
+#menu li ul ul {
+	/* third-and-above-level lists */
+	margin: -2.3em 0 0 -1000em;
+	/* top margin is equal to parent line height+bottom padding */
+}
+
+#menu li:hover ul ul, #menu li.sfhover ul ul {
+	margin-left: -1000em;
+}
+
+#menu li:hover ul, #menu li.sfhover ul {
+	/* lists nested under hovered list items */
+	margin-left: 0;
+}
+
+#menu li li:hover ul, #menu li li.sfhover ul {
+	margin-left: 16em;
+}
+
+/**
+ * Menu Icons
+ * These icons are used on the Administrator menu
+ * The classes are constructed dynamically when the menu is generated
+ */
+[class^="menu-"],
+[class*=" menu-"] {
+	background-position: 3px 50% !important;
+}
+.menu-archive {
+	background-image: url(../images/menu/icon-16-archive.png);
+}
+
+.menu-article {
+	background-image: url(../images/menu/icon-16-article.png);
+}
+
+.menu-associations {
+	background-image: url(../images/menu/icon-16-assoc.png);
+}
+
+.menu-banners {
+	background-image: url(../images/menu/icon-16-banner.png);
+}
+
+.menu-banners-clients {
+	background-image: url(../images/menu/icon-16-banner-client.png);
+}
+
+.menu-banners-tracks {
+	background-image: url(../images/menu/icon-16-banner-tracks.png);
+}
+
+.menu-banners-cat {
+	background-image: url(../images/menu/icon-16-banner-categories.png);
+}
+
+.menu-category {
+	background-image: url(../images/menu/icon-16-category.png);
+}
+
+.menu-checkin {
+	background-image: url(../images/menu/icon-16-checkin.png);
+}
+
+.menu-clear {
+	background-image: url(../images/menu/icon-16-clear.png);
+}
+
+.menu-component {
+	background-image: url(../images/menu/icon-16-component.png);
+}
+
+.menu-config {
+	background-image: url(../images/menu/icon-16-config.png);
+}
+
+.menu-contact {
+	background-image: url(../images/menu/icon-16-contacts.png);
+}
+
+.menu-contact-cat {
+	background-image: url(../images/menu/icon-16-contacts-categories.png);
+}
+
+.menu-content {
+	background-image: url(../images/menu/icon-16-content.png);
+}
+
+.menu-cpanel {
+	background-image: url(../images/menu/icon-16-cpanel.png);
+}
+
+.menu-default {
+	background-image: url(../images/menu/icon-16-default.png);
+}
+
+.menu-featured {
+	background-image: url(../images/menu/icon-16-featured.png);
+}
+
+.menu-fields {
+	background-image: url(../images/menu/icon-16-puzzle.png);
+}
+
+.menu-groups {
+	background-image: url(../images/menu/icon-16-groups.png);
+}
+
+.menu-help {
+	background-image: url(../images/menu/icon-16-help.png);
+}
+
+.menu-help-this {
+	background-image: url(../images/menu/icon-16-help-this.png);
+}
+
+.menu-help-forum {
+	background-image: url(../images/menu/icon-16-help-forum.png);
+}
+
+.menu-help-docs {
+	background-image: url(../images/menu/icon-16-help-docs.png);
+}
+
+.menu-help-jed {
+	background-image: url(../images/menu/icon-16-help-jed.png);
+}
+
+.menu-help-jrd {
+	background-image: url(../images/menu/icon-16-help-jrd.png);
+}
+
+.menu-help-community {
+	background-image: url(../images/menu/icon-16-help-community.png);
+}
+
+.menu-help-security {
+	background-image: url(../images/menu/icon-16-help-security.png);
+}
+
+.menu-help-dev {
+	background-image: url(../images/menu/icon-16-help-dev.png);
+}
+
+.menu-help-shop {
+	background-image: url(../images/menu/icon-16-help-shop.png);
+}
+
+.menu-info {
+	background-image: url(../images/menu/icon-16-info.png);
+}
+
+.menu-install {
+	background-image: url(../images/menu/icon-16-install.png);
+}
+
+.menu-joomlaupdate {
+	background-image: url(../images/menu/icon-16-install.png);
+}
+
+.menu-language {
+	background-image: url(../images/menu/icon-16-language.png);
+}
+
+.menu-levels {
+	background-image: url(../images/menu/icon-16-levels.png);
+}
+
+.menu-logout {
+	background-image: url(../images/menu/icon-16-logout.png);
+}
+
+.menu-maintenance {
+	background-image: url(../images/menu/icon-16-maintenance.png);
+}
+
+.menu-massmail {
+	background-image: url(../images/menu/icon-16-massmail.png);
+}
+
+.menu-media {
+	background-image: url(../images/menu/icon-16-media.png);
+}
+
+.menu-menu {
+	background-image: url(../images/menu/icon-16-menu.png);
+}
+
+.menu-menumgr {
+	background-image: url(../images/menu/icon-16-menumgr.png);
+}
+
+.menu-messages {
+	background-image: url(../images/menu/icon-16-messaging.png);
+}
+
+.menu-messages-add {
+	background-image: url(../images/menu/icon-16-new-privatemessage.png);
+}
+
+.menu-messages-read {
+	background-image: url(../images/menu/icon-16-messages.png);
+}
+
+.menu-module {
+	background-image: url(../images/menu/icon-16-module.png);
+}
+
+.menu-newarticle {
+	background-image: url(../images/menu/icon-16-newarticle.png);
+}
+
+.menu-newcategory {
+	background-image: url(../images/menu/icon-16-newcategory.png);
+}
+
+.menu-newgroup {
+	background-image: url(../images/menu/icon-16-newgroup.png);
+}
+
+.menu-newlevel {
+	background-image: url(../images/menu/icon-16-newlevel.png);
+}
+
+.menu-newuser {
+	background-image: url(../images/menu/icon-16-newuser.png);
+}
+
+.menu-plugin {
+	background-image: url(../images/menu/icon-16-plugin.png);
+}
+
+.menu-profile {
+	background-image: url(../images/menu/icon-16-user.png);
+}
+
+.menu-purge {
+	background-image: url(../images/menu/icon-16-purge.png);
+}
+
+.menu-readmess {
+	background-image: url(../images/menu/icon-16-readmess.png);
+}
+
+.menu-section {
+	background-image: url(../images/menu/icon-16-section.png);
+}
+
+.menu-static {
+	background-image: url(../images/menu/icon-16-static.png);
+}
+
+.menu-stats {
+	background-image: url(../images/menu/icon-16-stats.png);
+}
+
+.menu-themes {
+	background-image: url(../images/menu/icon-16-themes.png);
+}
+
+.menu-trash {
+	background-image: url(../images/menu/icon-16-trash.png);
+}
+
+.menu-user {
+	background-image: url(../images/menu/icon-16-user.png);
+}
+
+.menu-user-note {
+	background-image: url(../images/menu/icon-16-user-note.png);
+}
+
+.menu-delete {
+	background-image: url(../images/menu/icon-16-delete.png);
+}
+
+.menu-help-trans {
+	background-image: url(../images/menu/icon-16-help-trans.png);
+}
+
+.menu-newsfeeds {
+	background-image: url(../images/menu/icon-16-newsfeeds.png);
+}
+
+.menu-newsfeeds-cat {
+	background-image: url(../images/menu/icon-16-newsfeeds-cat.png);
+}
+
+.menu-redirect {
+	background-image: url(../images/menu/icon-16-redirect.png);
+}
+
+.menu-search {
+	background-image: url(../images/menu/icon-16-search.png);
+}
+
+.menu-finder {
+	background-image: url(../images/menu/icon-16-search.png);
+}
+
+.menu-weblinks {
+	background-image: url(../images/menu/icon-16-links.png);
+}
+
+.menu-weblinks-cat {
+	background-image: url(../images/menu/icon-16-links-cat.png);
+}
+
+.menu-tags {
+	background-image: url(../images/menu/icon-16-tags.png);
+}
+
+.menu-postinstall {
+	background-image: url(../images/menu/icon-16-generic.png);
+}
+.icon-32-cog {
+	background-image: url(../images/toolbar/icon-32-cog.png);
+}
+
+/**
+ * Extra positioning rules for limited noscript keyboard accessibility
+ * need the backgrounds here to keep the background as the nav background
+ * since it is overlaying other content.
+ * Using margin-left instead of left so that can move back without javascript
+ * display downlevel ul
+ */
+#menu li a:focus+ul {
+	margin-left: 0;
+}
+
+#menu li li a:focus+ul {
+	margin-left: 1016em;
+}
+
+/* bring back the focus elements into view */
+#menu li li a:focus {
+	margin-left: 1000em;
+	width: 10em;
+}
+
+#menu li li li a:focus {
+	margin-left: 2016em;
+	width: 10em;
+}
+
+#menu li:hover a:focus, #menu li.sfhover a.sffocus {
+	margin-left: 0;
+}
+
+#menu li li:hover a:focus+ul, #menu li li.sfhover a.sffocus+ul {
+	margin-left: 16em;
+}
+
+/**
+ * Sidebar styling
+ */
+#sidebar {
+	float:left;
+	margin: 15px 5px;
+}
+
+/**
+ * Submenu styling
+ */
+#submenu {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+	/* border-bottom plus padding-bottom is the technique */
+	padding-bottom: 2.5em;
+	line-height: 2em;
+}
+
+#submenu ul, #submenu li {
+	display: inline;
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+
+#submenu li, #submenu span.nolink {
+	float: left;
+	font-weight: bold;
+	margin-right: 8px;
+	padding: 2px 10px 2px 10px;
+	text-decoration: none;
+	cursor: pointer;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+}
+
+#submenu span.nolink {
+	color: #999;
+}
+
+#submenu li.active, #submenu span.nolink.active {
+	cursor: default;
+}
+
+#submenu li.active a, #submenu span.nolink.active, #submenu li a:hover, #submenu li a:focus {
+	text-decoration: none;
+}
+
+/* -- CUSTOM LANG STRINGS STYLES ----------- */
+
+.red {
+	font-weight: bold;
+	color: #c00;
+}
+
+/* -- OTHER STYLES ----------- */
+
+.pre_message {
+	font-size: 1.3em;
+}
+
+/* -- Update check badges -- */
+span.update-badge {
+	background-image: -moz-linear-gradient(center bottom, #FF0000 41%, #FC7E7E 79%);
+	background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.41, rgb(255, 0, 0)), color-stop(0.79, rgb(252, 126, 126)));
+	border: 2px solid white;
+	border-radius: 1.5em 1.5em 1.5em 1.5em;
+	color: white;
+	display: block;
+	float: left;
+	font-size: 1.2em;
+	font-weight: bold;
+	height: 1.2em;
+	left: 60px;
+	min-width: 1em;
+	padding: 0 0.1em 0;
+	position: relative;
+	top: -88px;
+}
+
+/* User Notes */
+.unotes ul, .unotes ol {
+	list-style: none;
+	list-style-position: inside;
+	padding-left: 0;
+	padding-right: 0;
+
+}
+
+.unotes div.utitle {
+	padding: 10px;
+	float: left;
+	font-size: 1.2em;
+	line-height: 1.2em;
+}
+
+.unotes h4 {
+	margin-top: 0;
+	margin-bottom: 0;
+	font-size: 1.3em;
+}
+
+.unotes .ubody {
+	padding-left: 10px;
+	padding-right: 10px;
+	font-size: 1.2em;
+	line-height: 1.5em;
+}
+
+.unotes p {
+	padding-bottom: 10px;
+}
+
+/* com-install styling */
+div#database-sliders {
+	margin: 10px;
+}
+
+fieldset.uploadform {
+	margin-top: 10px;
+	margin-bottom: 10px;
+	min-height: 200px;
+}
+
+/* Installer Database */
+#installer-database, #installer-discover, #installer-update, #installer-warnings {
+	margin-top: 10px;
+}
+
+#installer-database #sidebar {
+	float: none
+}
+
+#installer-database p.warning {
+	padding-left: 20px;
+}
+
+#installer-database p.nowarning {
+	padding-left: 20px;
+}
+
+/* Spinner */
+.joomlaupdate_spinner {
+	float: left;
+	margin-right: 15px;
+}
+
+.btn-group {
+	position: relative;
+	display: inline-block;
+}
+
+.btn-group + .btn-group {
+	margin-left: 5px;
+}
+
+.btn-group > .btn {
+	position: relative;
+	float: left;
+	margin-left: -1px;
+}
+
+.icon-48-cpanel {
+	height: 50px;
+	width: 50%;
+}
+
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #eee;
+	border: 1px solid rgba(0, 0, 0, 0.05);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+	border-color: #ddd;
+	border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+	padding: 24px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+
+.well-small {
+	padding: 9px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+
+/* Striped */
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #dddddd;
+	margin-left: 0;
+	font-size: 1.2em;
+	padding: 9px;
+}
+
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #dddddd;
+	padding: 8px;
+}
+
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #f5f5f5;
+}
+
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+
+.alert {
+	padding: 8px 35px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+	background-color: #fcf8e3;
+	border: 1px solid #fbeed5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	color: #c09853;
+	font-size: 120%;
+}
+
+.alert-heading {
+	color: inherit;
+}
+
+.alert .close {
+	position: relative;
+	right: -30px;
+	top: -5px;
+	line-height: 18px;
+	float: right;
+	font-size: 20px;
+	font-weight: bold;
+}
+
+.alert-success {
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
+	color: #468847;
+}
+
+.alert-danger,
+.alert-error {
+	background-color: #f2dede;
+	border-color: #eed3d7;
+	color: #b94a48;
+}
+
+.alert-info {
+	background-color: #d9edf7;
+	border-color: #bce8f1;
+	color: #3a87ad;
+}
+
+.alert-block {
+	padding-top: 14px;
+	padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+	margin-bottom: 0;
+}
+
+.alert-block p + p {
+	margin-top: 5px;
+}
+
+.btn-group > .btn:hover, .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active {
+	z-index: 2;
+}
+
+.btn-group > .btn {
+	position: relative;
+	float: left;
+	margin-left: -1px;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+
+table {
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+
+.table {
+	width: 100%;
+	margin-bottom: 18px;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+	display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+	display: block;
+}
+
+.tabs-below > .nav-tabs {
+	border-top: 1px solid #ddd;
+}
+
+#status .btn-toolbar, #status p {
+	margin: 0px;
+}
+
+.navbar .btn-group {
+	margin: 0;
+	padding: 5px 5px 6px;
+}
+
+/**
+ * Media
+ */
+.media .btn {
+	margin: 10px 20px;
+}
+
+.thumbnails > li {
+	list-style: none outside none;
+	float: left;
+	margin-bottom: 18px;
+	margin-left: 20px;
+}
+
+#mediamanager-form {
+	margin: 10px;
+}
+.is-tagbox {
+	float: left;
+}
+
+/* Item associations */
+.item-associations {
+	margin: 0;
+}
+.item-associations li {
+	list-style: none;
+	display: inline-block;
+	margin: 0 0 3px 0;
+}
+.item-associations li a,
+table.adminlist .item-associations li a  {
+	color: #ffffff;
+}
+
+.hidden {
+	display: none;
+	visibility: hidden;
+}
+
+// Bootstrap Tooltips (need to load last, something is overriding these styles in the CSS, debug later ;-) )
+@import "../../../../media/jui/less/tooltip.less";
+
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+fieldset.panelform .tooltip img {
+	float: none;
+	margin: 0;
+}
+//Toggle editor button
+div.toggle-editor {
+	float: right;
+}
+
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+.module-edit {
+	display: inline-block;
+}
+.break-word {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.muted {
+	color: #999;
+}
+/* Popover minimum height - overwrite bootstrap default */
+.popover-content {
+    min-height: 33px;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/less/variables.less b/core/administrator/templates/hathor/less/variables.less
new file mode 100644
index 00000000..11e990a1
--- /dev/null
+++ b/core/administrator/templates/hathor/less/variables.less
@@ -0,0 +1,216 @@
+// Variables.less
+// Variables to customize the look and feel of Bootstrap
+// -----------------------------------------------------
+
+
+
+// GLOBAL VALUES
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black:                 #000;
+@grayDarker:            #222;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+
+// Accent colors
+// -------------------------
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor:             #08c;
+@linkColorHover:        darken(@linkColor, 15%);
+
+
+// Typography
+// -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace;
+
+@baseFontSize:          13px;
+@baseFontFamily:        @sansFontFamily;
+@baseLineHeight:        18px;
+@altFontFamily:         @serifFontFamily;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             #f9f9f9; // for striping
+@tableBackgroundHover:              #f5f5f5; // for hover
+@tableBorder:                       #ddd; // table and cell border
+
+
+// Buttons
+// -------------------------
+@btnBackground:                     @white;
+@btnBackgroundHighlight:            darken(@white, 10%);
+@btnBorder:                         #ccc;
+
+@btnPrimaryBackground:              #2384d3;
+@btnPrimaryBackgroundHighlight:     #15497c;
+
+@btnInfoBackground:                 #5bc0de;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              #62c462;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               #ee5f5b;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              @gray;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground:               @white;
+@inputBorder:                   #ccc;
+@inputBorderRadius:             3px;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         #f5f5f5;
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @white;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkBackgroundHover:   @linkColor;
+@dropdownDividerTop:            #e5e5e5;
+@dropdownDividerBottom:         @white;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexTooltip:           1020;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+@zindexPopover:           1060;
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                @grayLighter;
+
+
+// Navbar
+// -------------------------
+@navbarHeight:                    40px;
+@navbarBackground:                @grayDarker;
+@navbarBackgroundHighlight:       @grayDark;
+
+@navbarText:                      @grayLight;
+@navbarLinkColor:                 @grayLight;
+@navbarLinkColorHover:            @white;
+@navbarLinkColorActive:           @navbarLinkColorHover;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      @navbarBackground;
+
+@navbarSearchBackground:          lighten(@navbarBackground, 25%);
+@navbarSearchBackgroundFocus:     @white;
+@navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
+@navbarSearchPlaceholderColor:    #ccc;
+@navbarBrandColor:                @navbarLinkColor;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              @grayLighter;
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
+
+// Form states and alerts
+// -------------------------
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+
+// GRID
+// --------------------------------------------------
+
+// Default 940px grid
+// -------------------------
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:    6.382978723%;
+@fluidGridGutterWidth:    2.127659574%;
+
+
+// Login
+// -------------------------
+@loginBackground:                 #142849;
+@loginBackgroundHighlight:        #165387;
+
+// Header
+// -------------------------
+@headerBackground:                 #1a3867;
+@headerBackgroundHighlight:        #17568c;
\ No newline at end of file
diff --git a/core/administrator/templates/hathor/login.php b/core/administrator/templates/hathor/login.php
new file mode 100644
index 00000000..74708ece
--- /dev/null
+++ b/core/administrator/templates/hathor/login.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app  = JFactory::getApplication();
+$lang = JFactory::getLanguage();
+
+// Gets the FrontEnd Main page Uri
+$frontEndUri = JUri::getInstance(JUri::root());
+$frontEndUri->setScheme(((int) $app->get('force_ssl', 0) === 2) ? 'https' : 'http');
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// jQuery needed by template.js
+JHtml::_('jquery.framework');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Load system style CSS
+JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto'));
+
+// Loadtemplate CSS
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for colors
+if (!$this->params->get('colourChoice'))
+{
+	$colour = 'standard';
+}
+else
+{
+	$colour = htmlspecialchars($this->params->get('colourChoice'), ENT_COMPAT, 'UTF-8');
+}
+
+JHtml::_('stylesheet', 'colour_' . $colour . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load additional CSS styles for rtl sites
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', 'colour_' . $colour . '_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load additional CSS styles for bold Text
+if ($this->params->get('boldText'))
+{
+	JHtml::_('stylesheet', 'boldtext.css', array('version' => 'auto', 'relative' => true));
+}
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+// IE specific
+JHtml::_('stylesheet', 'ie8.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 8'));
+JHtml::_('stylesheet', 'ie7.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 7'));
+
+// Logo file
+if ($this->params->get('logoFile'))
+{
+	$logo = JUri::root() . $this->params->get('logoFile');
+}
+else
+{
+	$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body id="login-page">
+	<div id="containerwrap">
+		<!-- Header Logo -->
+		<div id="header">
+			<h1 class="title"><?php echo $this->params->get('showSiteName') ? $app->get('sitename') . ' ' . JText::_('JADMINISTRATION') : JText::_('JADMINISTRATION'); ?></h1>
+		</div><!-- end header -->
+		<!-- Content Area -->
+		<div id="content">
+			<!-- Beginning of Actual Content -->
+			<div id="element-box" class="login">
+				<div class="pagetitle"><h2><?php echo JText::_('COM_LOGIN_JOOMLA_ADMINISTRATION_LOGIN'); ?></h2></div>
+					<!-- System Messages -->
+					<jdoc:include type="message" />
+					<div class="login-inst">
+					<p><?php echo JText::_('COM_LOGIN_VALID') ?></p>
+					<div id="lock"></div>
+					<a href="<?php echo $frontEndUri->toString(); ?>" target="_blank"><?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE'); ?></a>
+					</div>
+					<!-- Login Component -->
+					<div class="login-box">
+						<jdoc:include type="component" />
+					</div>
+				<div class="clr"></div>
+			</div><!-- end element-box -->
+		<noscript>
+			<?php echo JText::_('JGLOBAL_WARNJAVASCRIPT'); ?>
+		</noscript>
+		</div><!-- end content -->
+		<div class="clr"></div>
+	</div><!-- end of containerwrap -->
+	<!-- Footer -->
+	<div id="footer">
+		<p class="copyright">
+			<?php
+			// Fix wrong display of Joomla!® in RTL language
+			if ($lang->isRtl())
+			{
+				$joomla = '<a href="https://www.joomla.org" target="_blank" rel="noopener noreferrer">Joomla!</a><sup>&#174;&#x200E;</sup>';
+			}
+			else
+			{
+				$joomla = '<a href="https://www.joomla.org" target="_blank" rel="noopener noreferrer">Joomla!</a><sup>&#174;</sup>';
+			}
+			echo JText::sprintf('JGLOBAL_ISFREESOFTWARE', $joomla);
+			?>
+		</p>
+	</div>
+</body>
+</html>
diff --git a/core/administrator/templates/hathor/postinstall/hathormessage.php b/core/administrator/templates/hathor/postinstall/hathormessage.php
new file mode 100644
index 00000000..bacfbca2
--- /dev/null
+++ b/core/administrator/templates/hathor/postinstall/hathormessage.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.hathor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ */
+
+/**
+ * Checks if hathor is the default backend template or currently used as default style.
+ * If yes we want to show a message and action button.
+ *
+ * @return  boolean
+ *
+ * @since   3.7
+ */
+function hathormessage_postinstall_condition()
+{
+	$db             = JFactory::getDbo();
+	$user           = JFactory::getUser();
+	$globalTemplate = 'n/a';
+	$template       = 'n/a';
+
+	// We can only do that if you have edit permissions in com_templates
+	if ($user->authorise('core.edit.state', 'com_templates'))
+	{
+		$query = $db->getQuery(true)
+			->select('template')
+			->from($db->quoteName('#__template_styles'))
+			->where($db->quoteName('home') . ' = ' . $db->quote('1'))
+			->where($db->quoteName('client_id') . ' = 1');
+
+		// Get the global setting about the default template
+		$globalTemplate = $db->setQuery($query)->loadResult();
+	}
+
+	// Get the current user admin style
+	$adminstyle = $user->getParam('admin_style');
+
+	if ($adminstyle)
+	{
+		$query = $db->getQuery(true)
+			->select('template')
+			->from($db->quoteName('#__template_styles'))
+			->where($db->quoteName('id') . ' = ' . (int) $adminstyle)
+			->where($db->quoteName('client_id') . ' = 1');
+
+		// Get the template name associated to the admin style
+		$template = $db->setquery($query)->loadResult();
+	}
+
+	if (($globalTemplate != 'hathor') && ($template != 'hathor'))
+	{
+		// Hathor is not default not global and not in the user so no message needed
+		return false;
+	}
+
+	// Hathor is default please add the message
+	return true;
+}
+
+/**
+ * Set the default backend template back to isis if you are allowed to do this
+ * This also sets the current user setting to isis if not done yet
+ *
+ * @return  void
+ *
+ * @since   3.7
+ */
+function hathormessage_postinstall_action()
+{
+	$db   = JFactory::getDbo();
+	$user = JFactory::getUser();
+
+	$query = $db->getQuery(true)
+		->select(array('id', 'title'))
+		->from($db->quoteName('#__template_styles'))
+		->where($db->quoteName('template') . ' = "isis"')
+		->where($db->quoteName('client_id') . ' = 1');
+
+	$isisStyleId   = $db->setQuery($query)->loadColumn();
+	$isisStyleName = $db->setQuery($query)->loadColumn(1);
+	$adminstyle    = $user->getParam('admin_style');
+
+	// The user uses the system setting so no need to change that.
+	if ($adminstyle)
+	{
+		$query = $db->getQuery(true)
+			->select('template')
+			->from($db->quoteName('#__template_styles'))
+			->where($db->quoteName('id') . ' = ' . (int) $adminstyle)
+			->where($db->quoteName('client_id') . ' = 1');
+
+		$template = $db->setQuery($query)->loadResult();
+
+		// The current user uses hathor
+		if ($template == 'hathor')
+		{
+			$user->setParam('admin_style', $isisStyleId['0']);
+			$user->save();
+		}
+	}
+
+	// We can only do that if you have edit permissions in com_templates
+	if ($user->authorise('core.edit.state', 'com_templates'))
+	{
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__template_styles'))
+			->set($db->quoteName('home') . ' = ' . $db->quote('0'))
+			->where($db->quoteName('template') . ' = "hathor"')
+			->where($db->quoteName('client_id') . ' = 1');
+
+		// Execute
+		$db->setQuery($query)->execute();
+
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__template_styles'))
+			->set($db->quoteName('home') . ' = ' . $db->quote('1'))
+			->where($db->quoteName('template') . ' = "isis"')
+			->where($db->quoteName('client_id') . ' = 1')
+			->where($db->quoteName('id') . ' = ' . $isisStyleId[0]);
+
+		// Execute
+		$db->setQuery($query)->execute();
+	}
+
+	// The postinstall component load the language to late... so we need to make sure it is loaded here.
+	JFactory::getLanguage()->load('tpl_hathor', JPATH_ADMINISTRATOR, null, false, true);
+
+	// Template was successfully changed to isis
+	JFactory::getApplication()->enqueueMessage(JText::sprintf('TPL_HATHOR_CHANGED_DEFAULT_TEMPLATE_TO_ISIS', $isisStyleName[0]), 'message');
+}
diff --git a/core/administrator/templates/hathor/templateDetails.xml b/core/administrator/templates/hathor/templateDetails.xml
new file mode 100644
index 00000000..1b3b7bba
--- /dev/null
+++ b/core/administrator/templates/hathor/templateDetails.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/1.6/template-install.dtd">
+<extension type="template" version="3.1" client="administrator">
+	<name>hathor</name>
+	<creationDate>May 2010</creationDate>
+	<author>Andrea Tarr</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<version>3.0.0</version>
+	<description>TPL_HATHOR_XML_DESCRIPTION</description>
+	<files>
+		<filename>component.php</filename>
+		<filename>cpanel.php</filename>
+		<filename>error.php</filename>
+		<filename>favicon.ico</filename>
+		<filename>index.php</filename>
+		<filename>login.php</filename>
+		<filename>LICENSE.txt</filename>
+		<filename>templateDetails.xml</filename>
+		<filename>template_preview.png</filename>
+		<filename>template_thumbnail.png</filename>
+		<folder>css</folder>
+		<folder>html</folder>
+		<folder>images</folder>
+		<folder>js</folder>
+		<folder>language</folder>
+	</files>
+
+	<positions>
+		<position>menu</position>
+		<position>submenu</position>
+		<position>toolbar</position>
+		<position>title</position>
+		<position>status</position>
+		<position>icon</position>
+		<position>cp_shell</position>
+		<position>cpanel</position>
+		<position>login</position>
+		<position>debug</position>
+		<position>footer</position>
+	</positions>
+	 <languages>
+		<language tag="en-GB">language/en-GB/en-GB.tpl_hathor.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.tpl_hathor.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="showSiteName"
+					type="radio"
+					label="TPL_HATHOR_SHOW_SITE_NAME_LABEL"
+					description="TPL_HATHOR_SHOW_SITE_NAME_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="logoFile"
+					type="media"
+					label="TPL_HATHOR_LOGO_LABEL"
+					description="TPL_HATHOR_LOGO_DESC" 
+					class=""
+					default=""
+				/>
+
+				<field
+					name="colourChoice"
+					type="list"
+					label="TPL_HATHOR_COLOUR_CHOICE_LABEL"
+					description="TPL_HATHOR_COLOUR_CHOICE_DESC"
+					default="0"
+					filter="word"
+					>
+					<option value="">TPL_HATHOR_COLOUR_CHOICE_STANDARD</option>
+					<option value="highcontrast">TPL_HATHOR_COLOUR_CHOICE_HIGH_CONTRAST</option>
+					<option value="brown">TPL_HATHOR_COLOUR_CHOICE_BROWN</option>
+					<option value="blue">TPL_HATHOR_COLOUR_CHOICE_BLUE</option>
+				</field>
+
+				<field
+					name="boldText"
+					type="radio"
+					label="TPL_HATHOR_BOLD_TEXT_LABEL"
+					description="TPL_HATHOR_BOLD_TEXT_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/templates/hathor/template_preview.png b/core/administrator/templates/hathor/template_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..be57da7cc543364be7878ca6feac05fe4ba455cb
GIT binary patch
literal 23218
zcmZs?1yCG8_b<A;EU-X;#U;o<(1hTwi@OtoCuktJ24`7ZLKX=wK|*j17A&|1f_n(A
zf#AU}-*@kO^}qFA)y(|*bpPg5&*?sAy64nHX=y0p<5J^-Kp=c&B{>}s2m=6tAbc>4
zhnmrh_X`hDs->nUe}8{p9-vy)@q^#~1@Tj(zbC8ofi;EbBq}lY>8o4!5aqj@(`z9?
zkHD&{v#SU4=E|s*quo?ttfZ9DRXP!geY9lROv!+loC<Pme9Wt8j){)e!5Mu%g&^m%
zrjZVovy7S<YV>IoU0GdG3#c!zs;nv0DVsZv@OPvTw7)6kc`W50{2}qj@}IrkjgaiG
z{S#v0z1vq;zo=DBtdw+4&dx+qqz(p>ANsrdj<DhZz#cjpx*){ntPKccSf?x}t>+Ei
zPm6h%AxhjEL!R-BO;KDYj#(QUWwmI6!0s{Hy1yUt!b0s8v<3V*|9F-X!EbS@%zWhu
z_?&DW-AlhTJ=<*d*jOuh#*l*@+Pqm(YS#4c0%N>trlPdsZ3WWAbBYW-y8F~moMnG>
zoDAJxJvz{;l<hIMO>eSf-S_$WvhG#lX@}o^Aggt@+xc>TQ=!PM@Miq|(jTLi#fuxc
z@JIYNZxPh3oqoEkLxlqr_1y!8uf#^?(#qali$Fg#iD(jh9{zmVhnH5Tcfj$tXZ3f+
z*52jm`g!$UYt?XU2JfqQZ@PnD?HB9$r{|f$dEZ~V$I{jY|5Fjf(vl*Mh<`tW>6Nem
zSzKK>Y%#?!?0!-O=F+e1VdmpBIiXV6ZAeV;asKmWra+1SecOI`y6YX}-oAeoTsu0b
zM}O@*VY`}5JKNq)hi2P5=RN#(u8OqM(LZGbv}u1P8voX~TvM$TIU!?5ziYm}Hr4jH
z$PE{s+gg1LrlS7d)l^R#F;JcQ!Mui@O?5IokhRGo9=u?r{Yma-f`If^oW5v11}PW(
z&lS1d+<Yss-EVUy5~NSE<g=%N9Paw&hQ1_*KQ1W#{yL}dx!h+B%ao3pM@p!!Et*Nc
ztaRXyVHWP5r*BTePUjKAX2PZR#8n|Vd0xniZ~%*(NJ(CKFUkA0lc$<F+;>2FvlDAc
z^0PpNwM1GMmc`ZAe3;kQh`FGz-}-{WgoLj1*u<ldlUIhA#YgnMYDdZYm>$5DoI0Pd
z*2G2E1XU)15phhiYd+h{PB43kwGq2$x5^pExC(r~VVJt{jv0ZaL}S5dOIpOk*eXy?
zmZV;fKh_XdyM0!i*Wg?Wl?+CIK*DFSXW2uvLy1xiJB9YnBfzT%9$q=LhkvMmZ&15M
zxL2$tZGEQYceOz*jMg|0{9+nQE>NyFojW^awr-Q-b3x(N7#y_RRntxBD-b*QanlmD
zX8liXFO}P$7(i6nRajm=sR5<GNAZRO?AOE-eU=9Jv&R+`;dn}a@u^?XyjeWfy2>E4
zVp(Z<;+%c^27|FRBO{}Vtwd|L36%}DICpg1tsxARfW0Afq}4r_sj#EAcoZypOaqth
z?MJ7=GU-0RF*x$cOB-L;?KTU%UyvI^2=mrx%E=uuL7}DC6!=yjWEZh4^Lh(h9BQVX
zYCDEnN?gk+^}4*ZK>$2j!k!^}Zjrcnu|+R976~z+D*Xgrt|l_sCpC=fnk5NoCMV%Z
zb|>g#g)I>~Z?ZkNA{C{dO`}{8NZ;a$-I8+0+a^QWo9bl3=LDL_qyXZpKYR$%Y!4_?
zy|;@*rgnHnpvK_wba=xyPD())az<O<V=IOgK`PcMx)Sc&Hs;48VWF<zBKJ1+<L|f@
zYsFNSS&eil8uVlI%W~aIZ!j8|=2xx5ZlJ$^9OW5QjB=3&5w%e-iU3cE-tSoEE5%a2
z?m#-nCK^<EcUzV~=e`=)Eixkzc)<219E^-9ipO&bC9g^aD{|_4w_utyK2qv6z*4Vy
zh^QnTWbZ99;jbtACVLU|*RIIOzj16_VqhK5$3o8&GBWw}=3hY5Yce=9#)l35{;@_B
z_T^^LNYFp6X<#<j_+u_hfpDl#ImQH5AE7gAXdww)hqNxm3-mYS>YuQ{z(?7_8WO;u
zoCU$_!nr_&mX%Mb+oeKJO~e`fvr@b#1FeQleVdoWE+_!?Q(|80IDbPLG};Zz$Z>(j
zODW+y5xpJ$P^-)j9vq>Vh)`QYx!AlAu$)D%Tqv>|6iFFOna`<@Cc;cg#gf5G)rLYh
z0Xs)-3GLkHJ`gz*-!OV)tSw~~)d)DM$&DTy6(kP)@ZJAKMzwDNF5uWQd!g^{^->@D
zI3z_^*UP<A%QYbzOziW*xvSl7v&(CxrHhqjA|en{APP<xC^<3%@n&O;k0Ko~UWsq0
z5ug7BgN}&c(F$A0Nj^Xj=l5l7HfW&WZHqg?MbY?56clg%&*_%n)EtW`vYJX}C61lT
zu669MBZR4An;5`n$P|(dK~_=cc-tUq&TPqu_=(6hFW5}VCvAry3AV@&2KrjO3a+j=
zXn7Ef&4A*ya<JjJLdSfE$1L+aHK-u0%V{9&nB3Z#&s#HMG*%ti*y}2Pb{hGD0e(hY
zZl~2qj}>W9IdfzTzv|>=VQmU;;}anzF`-!fKo$xD)`Qh>jDNwsSVo2F%1oZ$Zz}qz
z21B!ztqDm0Cor@oA%zSYmGBg26s*mexvU3=DlH0Yrmz1MK_HRw5yE-YQ0O#q)MEWV
zL5#GaxV)F({(Koxas+}ZEuATId343ti_I_Q^V+fM)z4vwTz23OF%7Iv=7|Nam$<(n
zyo{~-lxbt~M(kzKw^p+LM-2@v&zhA#D=b_Jm}=q85!fTcZ330IP?%M4UsJ8)n+5|F
z>GWP&e3c*aw$Zzu4CoblSfs6K76TxQ)5E|TtM{45y2tQUGLOe;RoYXfSY%S66*ci{
zjsNd&q8FuvI)TV?`p-!scUQRc2}V0zGd5Uq)EuxtwmwXBv`ky-UN_h!fshs9f|c=#
z<&*fOquci+$}L2>d2=5hV*L+pKZ1llzwa%x(C=9L%Y1z1WJ1wDu%Shh^4T1Y+bXmB
zx&RO@L1;h<mK6s7qy5qz<KB;!QnF{AeeQ;<Wp9Ii(c_v*okR;ok(Be8Ba?+&`g1X!
z(1aAGDWubVLw`3tr0y4;&`KP5UW~J;km){{7b-U7SMOgfcOffLDN6XLC5;uorOzQ5
z-7BM@mmi?FwkwRqPNPHqgvK0AVB;Rkx0l|PBsZ!s_Eo<N>+g5(Uqn_qg5UM;t(r!H
zGMNak{GJy|g;Y7~@ZMhBy7NyOCd=jAjaio8b&X_I^;bM~1x27d&{}N9lrh$}Wk7}s
z=FQ!!KZZ6VneQ(4PSf7oXMMg1N?~d5HM_V9Mi|YNf6O{-eR_e*5VYS~_*$x=9$j)P
z44C$x^6Ukt)9Ysn*hA7D&ZD8S4-Zj4ac`~RE^mV#l(1|xvJvqtH1O{n&zd1Uw|xlN
z;uZ^(zRhV#$};L>Z9wBL*A@AQ*0Y=|fs(2gT^IZu@fasb?8_QN@+%nA3?UY8uo^(p
z5B;B@gr#(@COByhNT0|A!1|M8>)0h8Sz$z;-CN$bkBVYhoxp#zFOb{NC?WMXM;|Zf
z1c<>2iGbVtX)4TwiM>>}RD`d!+<NL-lq;#yef`bACIfI_=n$Bo80_$j;@94&!JW@d
zw=mR7tnqI<^>h^PBdacBcIG=D%g3og7;~S*`Fe6LWV;aJFPlv*jqD&ho?CAT2SKAI
z61uby#&7XITrDj%t@XJ@ZTO(;%5SgVoO!X579v=5O$FRRk%!N_vt`0Cr)X=A!l<%m
zV?nMC9ztVfpkW-5dP?6Ps=gfIsOOh9BX0SkP^R5`cvj<9hFwkZI|o1b%`(+@2P~w?
z@6*lt(aopR4IvD`WbihEutZB(14v_L-t+F*RuQ$Li9~~|ONFuGsNUx@0Bk!WHRh++
zQGT19EPUFSRG=EN9aD>zL)OFz(xtwOwd6S3o;Z-m_8@Uz+tLkr@LzH*kI3iFOMm7Q
z*E*h46(tKpLv>W9DPmcpTXi|VKc54=fMm64DUE`7&BB8lB|e=-L^Dzem_uQG>)O$c
zw6;F;v>BH)>m0+{!Kq?+ZnRhsrRwZP42riAayFzeQp40}#wD%bQ#CPyZrvY^pG2yw
z>UA2mmdPTJCj3hRloB41;}%657DM@%IQ(<ws^?0sE>S(h3hf;wVyA<7>6-im?DZIE
z@`1w9XOr4MhL>FHyJUG11*EX!AH#|$<FC#Ca<Eq|uNBRLy;-84XpUdI!}){J8cdMi
zZ~2m1<3Q%ZR#T43M>pV5bv8B(M1^9&t3d3~*R<Gq!~A>qNDo-pJs}L-0vf}!@{Y3R
zJ2->Ltc$_%QTG_cd@FZ?z#YUwz}z9~^X-6uD_%O56=X#(*euxqYz2*6(<6k`yfgK*
zf>bzF9tdJttu&5@k7+M|M~%4?`RzYJ@T#8CTodm>Eb1BKNMQt=)x6PT9IlU~kbj2`
zMajnBIEv1OkVQJk-xGitNMtad21IS_FuiuK2_~15N;VLMmc-E;SmfI7H3*3-A9m%3
zS#wrj6>v|fO}S&*@IksoH<vQ|XA(Vd^!|wcW0IJV!OBzU!9P9BiX!HnA_BNxZC>0e
zf3ss}yDk1ou?OqTF4)6wdS_+wmFg{4H@)V#z@ds0_WIoVeYHEQXxuyq6fUo4BOLlD
zS242rd9pcy0DNVB^>(=otNx;?c5g2HvVCC3K)d1<)s_+GZUoeAyJhFM>R*a?rip!9
z8!{hyvOZYTau0oXx&1AFwbBsd5oBp5<r04oLwr}i;MCZ-ZBTH}+M=CGF|pv6&&}y?
z0+j*o!!(x7fF`epA|sRJTVlFkIPCu%-K)Bk&TQz1<?7yOhC$l|B7NreSa4aH(DVG;
z&G1ai4ZZHoKH>L63osM{hamt^Fz7#pD&7A}{BQk(#{XbyTS<k+4Xyiq<AMGQPk0dT
zD;@B@Fr1{W%YpUCxKHs2?*-Qv_PHH4s&0CDR!Bz$hR;8z(%gN&tdtPZMxK%{EmV`Q
zuL9xjt(lV7hJkympF1^=*JRGH%^g^gwAcxXj!#=et_Am0(iVp_2DbWirfVYSudj~G
z1Ack`bLG}9-S6@8Iqm7G-*MnNv)Z45%(?=-<O^nddI9lo5|`4-NL1?IS3ddh?fIwe
z=BK6feZBIm&y6qsF8<RgbG9S?eutrbW;pC=J)sk5I=E5wVeQ$Q8htM(zig^3t@?zl
znnZ(awcQfYYdgs7S-ZjV7mK#!bB?^LourX-SD#6G&Em*FrH`%uNV>1<dWk=n=5ZfW
zFASXSVA!8#S;m{$cv_Dh*p}*&EJa!V!Pr?Xa&L<+;rvxOwvir{^Ylx^mh|P@I6-^Q
zX`FqU!w}onNACmQdECvq{iL4{&y+gY$Tz+?6|JGAtuy{|%ZGe74u*hXPyoFIdbq-o
z2+)7Uhk{!JHsTW^eQZe*vBw>Js<9~f$*vQc2l;=7ZISqYkU<bvhEUNpWQy>t{GFfW
z<qCJ37qB|vz9$HxI41V1^c(pWD@8hZoC9G%OHlp5mMvRW1E9ni2v{fr#uT@#|N3EO
z^_V)`nYRD9ipt{q?Wj8gsj5<dM>Pss#aO5$H--~$VCMf@9lF1Nb4b%?tz5(M4Q*EU
zEQhjpmd0eqUlh?0MMI5kT<Bt<d`jQT*3TAs_!F@SH4lY5yd8;J76^3_BQ3jKW6B}g
zwumUF0Q#vpSG|&1Ff&<^&YJ%E3epPF|G?~jj_%lCL(_X_(lHypHJSe^Iuc1x*Ytgc
zzoQJCr}r>VXUB0Ef2*W6_kkR6`Y;dtZw;w1sW1(Jbv?8MlMrd5gL=1b-m46pmAQiO
zT>N33W43-MOExYfQ6wTCgK!$kd4wT;WcP3j73P=~Pa4hdDiWxhnf+17Ym6YX3;~oV
zltc>Isr?DS-p&Q~PT7>e?m9GByBnPi%$Vu#%t^b8REK3Td6Ky}BUuvXY0a;id&xn|
z=_~1;rZY@N*F{7Tvc}SpBvw8xP}G!`70MIeg;dU6xccW|2U}#qOez?)7+F~`b*PHF
zN>cb7=wKQpG(yy7Z+{nTv+ov-;Gvvve22>l<3CUlf3<#Tqux!t%0Y<>VRb9w`;Uee
z1!X=2y7?}x@-|KAAGqM3f8B^VclxA(qzOg{Nkz;V6N={($j%Lde{S&Atg9%XT{GbM
z_q>pt4k7}?$t!N$yaIlOv<?(yWM0zxO)|q87p@4yrx1Hdm$(n8qL)lBCzbfL;LOjn
zfWcrzw;~|jkUv03>)?L<&|*%re!cFpDi&2lBF!W(i-lvco(7a)#7SqHqar`bw!~1q
z8BLSb-WSXReY08bk06mN#*_Yu?!(EO^a;>$iv%3%+{<QVr(A5<Fka(_-o7TK5L!{1
ziKV%;MHSgUFgsAMxdW+8%{fcJsISd&FZ{xPV%(sKhmq5^Kjfa-92cD<l>M(Nsd(sB
z;hu5pCRA^foTW40*=Bqr@22K8LE9S%d?(~P>4^363{`eo#F%Mf$_MfR7)vj=^kgxB
zwJm8ct(o432l>i3PuSHo1}I{$WnLjKhiI62@_|>zaE!+m`0>eodhh{Fx`Uvd3rW;A
z81=7|1iGc-(13}p7{|r-mUKM^m+_KnBsCYsHie_((oClD{>i2U)DRyom*!P>-DYu|
zx$0vKOOh+jMnxLQG5mRLsGK<e^LiVIQ?)%z{N8PdHtU`$NSU;FmBkf8L!tXFVC^73
z1Y?7&HHKg?qiekj57o3+(}>;#|HslG(hy_CBv*_>hW?8ehl(5q#dZubZm#$3(OW^;
zIXMl1&eHx|erYdR_ksrBH{iU{p%&#+8QE8qm^IC7EjzA(52aMEN%Gs+G;e+HW~wL@
zu_miqiLHEOTU%yJIPaV~;uSENqTna;OOyWuZQ=0<?}7*GptHnF!zR4b3va1lb~enu
z`1PUhxy~QQ;Xd;9Xhj%AffV^n>o`;zWm|uBC)oUpz9tjkisISG4WWcX|7{s++4<t+
zwO+OuX5)@Kl%%{rT4mqAi`zQ#${sJU%NzRlr$yXmMx3RiMfr^X&5zt$Dj|w9?2%P*
zIMhwV)`jJlj?i+Rq<#IxlvltX{_Mk?Kw{zR1a;jT^TNk4Ja!57Hxu)vt<H1&ir@o0
z#&nj7{qfEjv+H-4HAI?H6PibnVIugCe?OuEB0FC9bKNJ22`Is<=a+1zMtpHQ-_QPO
z>F)0-u+(nFU41-vLM!L2$|W(>E)k5&_|MDC*M6;BmWx6i=dr|=HC41D?Ji4arsGyO
zj*h6iM$$7e=>(tIkpRLs<51q}2B7ckRui|e{CzfyAx!ogEEx-`?AFdOp*K9l6jHZL
z0ew0)Trp}KPC0sxfJY_={Y~-6XdMi0RfOe{HX=oZwd2Gnnh(YL%a+QWAa~sJ*aqd_
z82YDQCY+Z8KPC!Ae@NBjINbnv09XhsM)}vsns>GtUS~@Vvke8!ZecwN5gxVaB8&DG
zWhI1nS9~x(t3gF#wJ!c(u&}@+GK{~RAl0bx&PcmPanCZVI+Lu{m>jyp7@K4}H{<Al
zerwE~=tvr%fA?DA3XgFv3_w^T;Gei#+bvqH{>(Kaf7C8chvE|B3+>x+?ub|fA_w&0
z_B|P7&^NY)nZU<YUr_`2Y)4^9T7w;TP`P&zhBcQyyfv$E9+&r|ZR)fFs4~`aCgCu}
zwA0xR27bMP7x;;M$M?wuN=`H(vY5GlOr?F>zC1PoaPvkmwH2j9;|p^DJ}wnE_w1lm
zyRPh-9ii3oa-h*?#(7fNMEtp|8i&M>dc*A>4VplIV0uPOl$NRBN3u|L^VyuuRUByA
zOkoOejf9!dCzalQJ>Lx7{jz9#7?Ey+UOS=Q1qEE{cN+41cto>Av~EW-Nd~niD4WwP
zZ<u|SJA>qrin^Rdd4$QX_PRd)m!KggUDc5R&``2O&MuJ@e7?n0{zV$fuI#4|*RQUf
zoM9?JQEJ0=aAc^Q6e#4+GO!0hBO}n*qC6P;vq<#7^4XbQFbSpuvo$vf=h)AQ=Q~d#
ziRHCIU25~vqmaLedR!VcBF&@?2!hFY_`rP8@RDg-X}Mr2dT7Y!gf+#|x$2iN0%@s6
zpxyE{=8h!2rN@^n_n*>!IGqPLH6*v~CxhqDrR#Oh$=5r6H!OVUX@9C`@mOf%&5e9+
z62&0{#<R%XRWozvX<hW(uBn+c$b_6kKDXq?2rZ*>c87}fKYg&cFCn}@xR~~*uvL(>
zt>2f>vQv;WQ#)zsJ5*}r(|$JCJ?#e~Xjf)y?mJXbHtM@-|AAxM#r<CNAP(awltG7d
zVe5?~F0VdXmy%lz9)cnb`?#7y-GylmbUcUBK81}2c_0B3w_qu(+dNb(s*yAtODMFC
zTu=@EtS60noL3FrI=>V;mQ5M=8nc)p=BhsrOQJwN!1`eoKyy&!x&07jOhQv+p}Bw5
zrS#L!<xzNS{h0ZH2kCk$rs=IgxmP*T%ATH~-{+Q+GqRCgNi08r2f2EKFFpK{!m13Y
zeE$Q{`?_KL7Bg1^?yzqjLBj&`OL+;8h@U|jFwtUC(O1VIf#(zH9ks)j&?YQ}VOr^{
z*3h!q*V6x-Z?!_8)$Nbk!&A1fyNJ5A@SbdzxMG}2iq5|Da)XC0ZOlBp1A|ed&bW+z
zc)a$@8)V%Km(1gA){kfz`#CO?$93;`vEFqAQ-@@fu?fn4A9}+-AS23G#UAHZ(nxEU
z!cgDH9PgUwyvS7?BVm%;%3oCdIP4tq4%2M+@w-WR-px_6b((92kJYsNvQHzgtbaW?
z%j&~8(kNt~pzqIFqiXr2^^&%jhfc)bA1fPa>bPn7@QeKXwf!lL?o`l;ai>R}mfv;#
z%>oN?yj`wT7QGxzV!hq@kCp;uk`#H8FlWVQXZ4|icmgF;g02{2k0Ysehq=-@gzo}~
z>cf=0jb%buO4}j<-j4R;nbkM~vI5~?v2fhHg@#+L(~y<sSXC~%awQ{rk0gc9gSq9p
z$q`j!ZB?C-Wkoxx74@IP9h}_g&kcz#hjbDJdGl~Q;j2_ids<ctR|;Rt(pREac%P|c
zggGWn*1rDG`_Jr0jTZb`4%;0Sa!vsGlFG#hy9@hHd#4?ODMC$bFk%(|wE>u9JNHY<
z&5?l*9xKy^=@r-&<!LDr!7RdI5M}x|eliP2SZom7gcrWeeYnIajy6z9|JLpyM&8s5
zGllI8Th>TqlmR>OU%Y%)V`FKQ9yU)XMtA+(;j?r!Q{L+zIc$-u?L6x}7-p2TjFHmP
z6|Sfv22{(BEqH-a7aOKD>MKDVnU(EBM4hq$2kYH2_t$?#Q8IsW_ylO-ce~MR``OZ8
z9Y|S3S=(X;Z)>2LVKN_8+%PcG)XuLHu%ITyL4|<cEddsrs1p1wXx7s&ALJu921flH
z<y1l^+Dhxx7|QkGCJ>S{aiSV$$tO&lw4t|OPgC^a_xJl**dI>V;NjL9WBt|sl=?r+
zm@s|bNRPiJ<&3<)A9aen@I6YYr1<5L;gkAY)7OGNc<}wy?+qg7?k`KQc(JQPTZ}c)
zt!qRR9<LFmf`{5`Y42|VVI3o+A-jVPEP;fmua2aFVCnGoAgi~ACfO83GITOh!<?BW
z8V9#Qr@2~RTbVOYG9#Ka^_e8I-^4$EZ;nWjOHO7S`MnP1(OkKA5e<*R6QpaD5*YSV
zmzkz|TU>Y@U9e{zW2U$1SHBFkL;25)soc(xSg4~}lt`?+?;Y_4r0FytVk*u!)Xomo
z@+uv8{+~8gl67u%bn*k~e>b7{rPG1`-c<0w9J6f8Ipvk+!Zs+_n2`FCdcBcTPWFy^
z{T)d`>}|lt@NX$eaJp!ARngrobgaR>h3n?SML(bE!RdvvwlqsnKnCtbc*IN!N4c9i
znqCK;`-D{&45LOeOHUZ5YlpUkHT)7aS`W=-t5#>L5r|wdg%+=O;IdTAp?+5D*M<)&
zmotinTl|(C9eQ~_a>Rs<GMFIr%uKya;17R4YCW_utzK#(loq-1U1ixNCwE*k`Hjt0
zE+C{WWZqle&xj~9nRo9J>a$QFC8Hqb?c;TKZp1mx!qds@F(LI~<b46Baa2V9YHgeK
zt|TWpt)w9D2IAZ2A6FiHz+~@~$r*W)PO|0=0YLF2-+5Q&J{fj+%U=8w_6a@NP=W`P
zYs?5v>cDaZTYd9RdOoHiU$C|uc>Fdc6wBHju1v9%W^)Qdb`*V2WcaInfbSQ^@`)it
zZqdPdI^2|Gy_wu<8Ey$;6~o0T0W>BqDLzjYJ>lB?8_D{m@)%lgY-Kc*csxjp%e%No
z+@#C|a6<1BMcb<YNcSRpkoz`qX?}M8*P<NpAOj;hn9lBWGwLjQb=vgi<n!_;jycKp
zez40hN58WNF|o<q&K9dDUGNSzI}vo%$60<N@=oxs*gV*&2>(N)9?J(KE0XnV@`BjX
zNuvBS(y?Vssu9g6tBXCi)e)ZoJTTrWKKf_%B4e~a8*GNh=VWBs7*1S-gomhwJ7-KU
zV79)N77cNs!;~9(cAE<fxPO5WwXA5soBGxEyPE=S)5~v3T5%cup*<e-L|uE;fUkLE
zMSi>uy>lqs5Uvp35N`d3ky2Hx)*j`5y#6N!x5oLI?Zb|WzJ_M=drJ95r|2`LH|c!#
zA<`_AA!jTOzXSFOG1LA<C|lIoLwIt&M!U1cezY@Vjjt1;-1My4#)<MDp8rQl05vbU
z(0Ho}c_O4P5MXXUi*FoY^KEH|QE6dM$Tw>a%O`1odE4=4c&4E6=!;tMVe`(`m8dk&
zx%B}&8wFPSfp2x<nRZtzIh*RAlKd*a_+Xb$GF})21)%Tl%+=MsTlT-!iD&Ej(K40q
zT?e`@e%o9gl~lX`*y?BQL^1;rmK1r%bpEk80So`Q>Pe9nJzcEA{L0mJP;Kdxx3Vp{
ztppx>99vSxktBxKML|!v3$L$4Gf#4&7y;uZt=Y7=Z-Ns<=yDLzr2Rt;xU+LgJ60e4
z1GG~?A;Tk!sK*Sg9*c70Au}8Cg~%fWVci%9x@mDoRM?oyjBtnyV%<=Q9AEq`y-aDH
z)k>S4Kp!pM=SR$M>Za!-z7?HvIxs(QMr3&Ze0mR6S>iY9rEQ<VkKvVxM_RovMdLUF
z4o@BkG+R1Z$ZjT*bnH_kuS$giAZ_(A4&gtm0u4p>w}?~%G)We@)5Prxz`t^${(y(X
zF#s1N1~ULMDr78MfWbg6r|{4z=by$=eh3lf%de;#V`P~W&&XxI4PC?D^u@BNG$Kql
zjSe~4sDofT!F^XZ?E@t)PBOZGf`Gw1WoM*2MZo)~m^JK8D!!}w#h*w?Kr&P`b@4D5
zIE^bSS@)qI!&XZhuxQVRl2$EFH5s7C`pDBUFaKTj=3c~)g&>NUJTcrIQJ6de){hdE
zHqDuP1c!7Ml|BJH6dB}mdai;P0n&#a?{kY*zsR<~Qx~cu^b(cP`=aQH@ny+iEkb)u
z{&JqjmD+82@tZb82GNqU=r%NwrL)sz;862Iy6E)NH2x4jo9ESH@)Wg8<)`Vu8jNt`
z7yZ&b+$!vtWY}O_#ZaWf_<p0n3i%TND(B00%kSJV7CfD>;?*ZtED&Mz(nwXiTfKZ`
z?^d_Err652aC1J#>-^NC;+;8f$xq4;;Vz+lBH?qcW|@Z%8axzp`9@#DwfP6%zI3w{
z_>Iy&Hgf-XppwGDJJ`s^q^cS+N?fGyk$OZdN|Q_23bro(G-<vRw|ZrC)nSJ#bIFbn
zfpEfCdbfCZ;pt6+cr<KH4vE(Vnx^Sq{WM5C9N!6vbIq8>CO7?Ev049jhl+;dJ{0nI
z#wQ~8s}>XRA+nP&Mt5Khp7Q0*6EuHw%;R^=aL93U(U#><FwKRgpIQqT`1!Yq+5lRR
z*hI3%pkF?L`kv*kFC>kCu8w0+A|Gj}&>42C&@M<|qwth{!($1(wzT^{n_GZTLrIo6
zkueY3#WmzJMqoJb-;H_ws22me?bm(U{9$tjHpFD4&m0H7!jbVy+xDo=m=XSBw{U!)
z=+(i$dCfrF16Mu4OkO!$5c3BoZ<<}#m$vY!f2T`UdThdwBO)cLK6hw>T}17&A|Po(
z1ioy251S`EDYiy@lYn%b_tha!m#l5(_W}gmhQF*c&2WJ_p$7^;?m9ZIlsep4DibMd
zitr7(FjFm!keXqzInmtVel{8A#3Cl1+xO+9_X&FOOIMke3bcQ(b8Qq@bQc_!yt(Zp
zBZ8kVA5L<Dc{u?)97Aj+Y(dOj-m2mmTpnEj`(}hyq?l*VjLmALdFo2{UojE7?N-B!
z3cUu6G{BAoFJuR#8qA!rlh7}u8sbO3qVE@&D=}Z$l1Fgs&S3w2>hx-a12Qh5ft=g}
zX}_*@1uG-Iodw@SFQe^2IF%Y5nitad*BEC<7)m(Tt-ek2h%4B-J*=AzbfSR#Ed}L&
z2I4`re)}$%4sXEdHu@_jOgCj6A%LX0uzcQUa!-!*zKL+Tf%Km{HGMXAA~Y>Kyi3;h
z5`l{=OI<up*$H5nsU#@4XFyz00mjh>Z2az(I@eVCAjZGE=DU{6@rpMaDPSH!uy*Y;
zr3PZOtSkZ+Df;^DHn*~QOt8lX%{9oez=NHMb?bldUh5c6*Eb?Luu+i=TjN8z{)rDB
zoBP4j?0|cli_hlh<EeE2g!A#DIThS;;hdS#FlNpPAIKRenm+iu=d^}^Db1^7A0KiW
z<3dx=lS?7uJ?2LY)2B36YV6JX@EFbDR4iZdVMYL2kb~`J09k+Mx_EexRS^6_bG-RX
zW4viy)(*2nl|kz$*Ac=1-0}g<FM>T3yItRkW7`olTnTbXy}MEj&CD?(d59%}igaAy
zm74YdKv*$od%5X71_Q85tkg~n50+$Edcg`D=yQ?k-{{>GC=-6%yWT>uK`e}GapB@3
zLBBBQ{axzd{XG$6@qN1p$)>0GJw47@!RwDPWf0ugJTLkx>E@j<fq;f~s9Va(<oL6l
z&DDv6%_N<webX{+jLPHGAgqFUjt8&1&e8PSrwnchk}{QzHNt~shrK2nX}l4IC978u
z5`4^||Jhd>EKc}KTC(2s;kn<b53&M;yV#(n=IioRgM%bPUuKC~KKZB9Ww35ycr21%
zeB&>C?{>?{6VO)7KFJlYq@hWE#g^G>USf=+<mtTyQ;J5evjSPZ-p<n?ogf;Y8`kzR
zx7$B0F#?28lZQD8NpR~TQfr69rY}~H)|O0<wKurdooFMwd}zu6D3f4zNC7!Uhp(mH
zE#*hOOVt-HYX~?rtAGSeCnnXh|0#J%dzQ+&^rmOg5u+mr@#4156@WqsHXqZzCPK>*
z9D4>++AlPT;hL)hWS>6#c^D^3gMa#7L~sYXe)ZcX1A~vRPG?g5%Q}1-$iY0*0nfHm
zFpBT`eq|NaSIfFm_I-nz`ccO5n{KEv$cWH_siPi|k6cU5eQfc_qMm6oUA+lfYNesY
zY7<nhy}1s;N^tksOiJZ5-E2;>r_X`;KBQ<wI;3oPB}C9{<NJHt2a~^R*SW?fHV(<<
z>0zOH?l#%(Y1uTe4HoM7gM+rnCs7j{x9p!c=y^_M7|{MC`57dZfxdvBND5!v+@HR?
z_ra3_TN~kKY*3lY2(w==QwLABOBmq(ID!ZO28F{QU?>U!;v|FygCNqtLyqFVh(y3)
z02~VWuNbA8*BjuTQQEM<ij^>g77v=<2;QHLjxV`AWihKced(0M<0Q0~QM<{7)A9*X
zI2BNMFqP2ulj9fHfK&JvOy1A&_3WeBo<6|BOWCx<^Y$&1Ag7ZrpBt=qa%TEp8XXF5
zRL1Es1{t+#RKDp_#bf$so?y1ufz_TZ7ssNxA5nNR|HUE1?AbEm^abNP(K%p*AXF7-
zBUDW<AYTalR9yMy%w`O)IfJTK;apthmfQ2saT#LYZ)DJqw%746jJn^=K0qv4c5vJz
zg=Md<NL6>{OZCLww^Q~+8l~#J@ITKO&bX@&-#>b?q||;tkuve|l%0N>;!>ElLI`eV
zY=)T}V1J#l&cVexVBgdBhO4noQu$oE-|UP-=;GiDq{%TXpY!kPi$P|zZ}Q>~OM<9?
zd6u<+*X%c<ITT7tYx+)dTOsiS6~(H&++Vno>CRP$rm>#f4v)Lvqa5_xe$*cjt8sag
zgg&``YWV7oNmo*%LGo+whn9AxatV!gGnkx`x!}8B5y1uQ!TlRddyYES?|-{J@e6pI
ztm5>_r`>R3F1SCw?2+%Mo~)VsM|zNA_dW5f%!GZRoiz;4Qa7Q9qhX3_oxZ$gV~tY3
znijl**pr>AQ;T*FT|zq__4-FroB_wL;5ApdH-%;M8DGDeT>NUIPS+@K5DChr8;lP*
zyE>ONo|{rVM!b9!e7e?mo$-RJ39BZl)%k=e!m-_?#o`r);WiKeYxCq)3JL@!?Oyd>
z1v{X12>WWiP7X{>7BO>Txuh@$SRTE>8aI;is6?eO{44PIo4W<?9v<)L|1FF5+)1P^
zmi@U%IKcuPD1olZF8S#?y%a!qo&NAUXNI%i+$Atk$Yce!!j;zCXp{{%d31)O!=6Mt
z@tz5;<>ebV)dpK<Jg;@x!sh)5j+QU%<<0OHFCEdfbjo9&s1Lq<ot8DUg~{8buwiS+
z@vhX!JX6<NJU%8TIj&h&;qfe9o$(ca&oE<YwRWM}NQINh1?NO>??=8UlQtebLTcI`
z|3;=dTEV#AJ@-;dU(WtMyQ7!$S=xMcb`K<)oISZ^RBsr^07E*0NFfg{^gmqZ`^o<h
z{^MT%LtI}rpi5T(+B;8ZZtz&8jA2kvFaU3q`455s_(KZ!A^Qi1J!A{Lv;PYZiQE6T
z%_0fxeL#AjhsbM!fS%r=5EY~k#0SPGGyHa!{P&!9%WzNdc3&yBiw{sq_rBQ+M1k#g
zow_p*7H5Df&R`Tqfr7tt^wCTCZ>P@v{P;FW=ja3WxK#;@Xn)$~4~g&cSH2cW_M*~t
zYcC0%O21|XtpDAhpI@`we@Sv@Ipff{&|S^#-)X_kz(GmPrQ-o9`Q&Z!gtkav=l<UM
z+6=6m$-A8BCHkiv<LX-_bbAFitI)FlPl8&@7Yp)MoxQ^3dq&G1T2Ry7>CVBoEV_c3
zX1B$Lv6#S|$U6PK?Al8+jdvnlI8<D>?lw~v<VGxRgyqH=_huKRGKPWf?un`?)7iHw
z$k{Hx@P(s)z!pmXCcM8mAYO2=DkkPB>eUH;Lzlc|PTB5DqfN=6mCfs}5*g9#kZtAi
zYSsK>H&nkxYRSEP{q^X*q`0`r)LBG?z5K*;DKC#ap-BVA%Z0*^EPLOg!m4l{e?bTt
z-<`5Lzuc#id~8)qY_t|!Ir5Us`sU@o#x#yEu?~UwmpoCw9-)6+=Pc9H(bN5s7{M&O
z!6z~|E6|+Q&B4esaNaTFnO>WH)}vSA%kM$xTCh66AzY<@k<N}uv9ypXpI(9k|B;u5
z@?9kmSgC&Or~3X#(e!j3(^W-hbXz5-bR=(~tznWv!mXmnmnvRI>#EnasjV3c_;P#a
z;i=!hmFJHoCzrk&bxz7j{x04vCqrkxxB3qjmqr#zU;!XJz$_Rd)-<2g5oDzS4WqVu
z$Jc6$4{tMgOyWsiyC9K068H2o{lL%2Qx*r`5`)hawu_DJ`&8&hW|K|zx&))?6>!RV
zA!CcW!v#V@fXVFGGyQyMP~XRK&rnTG0kcG)9}dJ)8(<-RZVLdGF;z%BYRr*Em3!~Q
zm%SGu{op*pw)Rl)Dst0#CF8_VZiV5Q6JF4eHqZ76jq!SN#EVeAx4V`X+cQ6<F7L8u
zi}!<%r8OC3t|ryvo`kAMX>IQb_pknP?q#f68+Z@XU?y#Ilo<i7FJVL04>TAm6^|Y%
zt>Q3*t3?*3SdZHcmY0Qn)yaOd_CCYekR%>Tsz&@?d1&Clbi~D+Wj&5LD)E_@lzH4E
z_LG&Mnpd%)c!6xuQISXz8q@U`Nl!FH3~x$BztqtoYV_W&uH(Rk;)p6dg|>X7B7S{k
zE?LHX80B+@b{}uG95Bz>0Fw+`K^RY-&2Z)W;xJ)`d{87JB(Z476X7QHSEfDcXp7c%
zkltte<*yZCVZ`yDpV_6`5cKzjpGG(<!A1@8WMFjFt`6_hz?Lm2#tYAc?i-|>7P-O9
zhta+~X*{kQ94lI%Br>wYF$!@(+p+xlktfun#%o!*cla5tZNAuI`xnj4V(QEk$kgsQ
z4w`ZF#AGK2^>rOt@*8nW@$xfFpoNwx1&8-F#%Brs7o!{{#XVq8^dewUy$rP?#qeiZ
z1|&ZQjBfz=;y)uPKYrn@t}%&{BbDS|g*kw&NGC8q*X$?LGzmF3b*uc@*;4exG<swI
zuJCoSWhPm+Jce$AUfuydFC)?GFe|-FS4^}!oPM#p+*j>2#KyN)2pW!IwQucnkBbHq
z-~sBQbTBmaixDN&5k>;?&^Q{-h>{G@oYzkNvM}PNMtZRwB`)ql<RbTKQZ#?pPL413
z9t%+s@|p~-l<Y~7?5WJhrq13#F5S`#A`$>6h=UW-sxSZ-`piAbWc8$|Z~Hah6cGqR
zb>WYTffc*1HJE6AXQoxG<?o;4WJv0t|FB_I%`*5>2Z>}t{JtYb7szg{WOI5B#LLu3
z-#vWo2=SuWcRt>N>0}h=ky|{K=^P*E>HuN^=}oc}WNcafju0{MDb)O69GVSU(L}Ca
zd}QMUr`h<*O-=ejtc*W}s*y{U?a}}u;7%O$KVo<^AV^|66s$p584%s}mIp)ThIAs5
z^eP(MFLa0R=ILp={Oi|r1N{^P#_=vDaQcZWwayX=K;87c0@V2kv{R>(D20l|uyVKk
zjV<x{_Z6i#QMSi>_-{rfB_gYROPd)%3_&`28+W8tUdLJ<EP?l#d?GD%(s<;qRWzWz
zxG=?>Jn57CL$$2CLJ>YF01pyFcz+M^y(4Ah6JxN^QFCO^#jTyd0|t~S&B+l)hm5{@
z`sCmMWwpbdXqJOJGJyZu&L{{=iL56g1-Z}6*z>j2Vm?`40k9DlMkv{0qQ_jO^QOq&
z!qBclX95_!A7EQSU|>sAuFr}KJO-Jz9uiVw1;-ARANIX1-%+}3;kcv;sen9t>~@${
zS|-1S<C=#=<zHiUn4djna+K#wvo+1mcG_-}CI$qpDo9xIR@_{So*}nyYy|&6MwFSB
zPK1=?teyPDVml$*4G=j@>F*m~Go~MZsJkeC3e_DZEhiJxJaaT}frNa;9CIP=tXh@B
zmkj*sc+HD~-5b!bM>`CmY#XJLFHTo;z(?3s7>JwWGvb)d-H#up7gngy!5SW4Mudr6
z1q)dCfZx{O^}k=cqX`3BWixSZab-ZESI4DFznm|zASaOukWlWsWXE@pP&kCqfYso*
z>o3RgA#=G6u0Iw$0%_UDW$w5}W6t?HXH0SlO52fwJy1pZr7KSIrrI8sxp+C!y6|t&
zo8}2+Sl^r|hVJGCD+?aANSr1&5%Cy(?npKje9w68Mby2Lp$*;PxyJExbdlt_5JdX0
z^G)_@;W*lVekxsk6f2Q6jwdtd2JmExMM(VNv|?@`-VhmN6SQd_{5q5u|8%vga7Z#q
z-Pmi=_fbaV)AhJSYT7Z_$`cQDEqNJN1BLCHYIF5Yf6~8lqX+Lr+KY=SwHl|6v8J5l
zBpU4)g)*Jz=06zUlgurNd=1i&(PZep17Gm0tNG_X7V1IodsdU0&CXVyy;9%bpu)M{
z!w;IBsX4F8D7&2)?Ywgx-B0rGpolShmIMK>4}mSr@88$OrHJ2hQe8^-y>pPdtIbot
zAFW6$>aBQUo~nRPWHYs-()GSM7AurL{qrX-n_u?>g(@0b`!NaUhT``Tmd{jgpQoIi
zr8gWZfsg<w79#xst|FqK78&$O1EzmOT*wS;+zfVo(&YO14PXiMHe7!{^S8V1NRb+C
zQFWQ1`+Lz$>2-Z}oPR6<wVNKD(Rr0)zNn3^ZwDMR$LRbc@NlJpeu{_X7Zmld@97*~
zHifr!t-fx{0fxnJI|n&YRc_AGfRZ}n=kkqoOG~=lH|o^_DQo(@3lt}*K%$&i&C<E?
z)Nlx@jM4dvT3AkD_r4nqiPg~j*MK-XXMCrDm(gA{#Oo?GJwjfW`hg2g#LjCgbdAsd
z6=&L0w|$Z%%XsCWPrJ{-5UJTDf}?7}%ulh3kZRaiv3hpGz<<c`Bo?+hL9<ZsDrSm{
zdLy4s;5h+Kjf#VE9-gY^rNG8)iNdb;nC@eu(C4bHw@ZVbMw&d%$McS)nWXi_1hCGR
zQNJ3#eJ$VmG3R4E!O?HuSQ~QSQ5CzSEPOKZv^?YGE{-KC^XlgG^eI^enGh@?%~Z)J
zJ%(h^)dY=bs?>ODHxgHq#2{VpPkHsDQXWZOCU2$BAk)zvMTCa6vAG=SQs%&*Ju!}Q
z!cP+gXt7mLo3){j2C)*`eTlND5^*a_3X@@?=5y=85EOUqL{X8%8~ZEKH@@4_r2-wC
z3WdK0g`dJIjYj6xhYoRMQKZxJ?Y?W#iE3Y_J9NvED#yn|ylf57nX1OCQ`6pq;?`!#
z4ARE~#X#vtqev@~P=0qgIIH$WrbcE>T-LTNnU|ce2DKE>?`5RUnrrO)6S1^DraQ9l
zTN%9siEqlK);Tp-gUi>-ua(^#$s}(7wEtNXt=VH-L1MpA1$^|tOWaKCE_g7=aGqML
zYsU|5j3dU@=W!~p^p)j$F^OJqC^qlQv7S>C_d(O5m(rq@ylf093KG_dr0eAa)Wc>t
zBR>nrB>hZTn0=yD)%tXLL-U*Ud(FIfE1%D-x^oG%19ocYDvtQ9Bu8mu{dYa6Ouc6I
zgxN|(I`Z|WMrIBNUnR!h<0P!***Lv-FL1mKq6mFP*1RSl?ZE!%*NQl|rbu_P#=Oem
zcyUv|{U(vLMq&|Qbn53#E(h^@`XnY_N;k>h56VDmXZ7MD0<+0Ft!PIX?o-A;$6MdB
zdNtrQATXOi9~eC~ZWH!pHaVN-xotvGQ<6G-&z_D<?nJNpiz56Dj%B5^!ROTaUJ-L~
zlz}e$R;t^_iAot>Mwl35xsnX&0+Yw?s6B63wIZCgJt3MwM-7f6n#aNKb-0s&PWtmP
z)^XyTx?mP1Ibf#*e?F}9G)k^^%?bsx&Iy$nJxO+mD3fB&*hK>}NvzR3(tb`O8^v5b
zlZs<Y1c_GB`KVLzdP!)sg!zs9)hpw*%<bG2_Gw}n2g!QtF>@N<h0OBg)>_^rW0jya
zD+IiJ?CJAjqpj=u*?#=Cm>x-6Ln#dBj8`7?<f`YsZ)H)lR7*CKzKfMQ$>*6A&a8WD
zH7=e{4lUSY@I+^fM>CQy*eVu^mTDsWUjNwJSXeBN389$mqg%~-QJKd8Unj_Uc7(nB
z2zDGL)7JN;-~Wr|cvGSG&^343;hFL`tk!z$CpfQ4+`}G2JKED9m6_g@;y{CeuK&c4
zwcAB`-moA}Y44QZf<HroA3{t?5JSod;?L_|@8O<hoFB(xZg+<oM=y*oO-b&=ivX?-
zi-l6E50p8BZMxKi?fWD*S=D06SNX@d(*D<lASdjwrrW9(1-PUr2muEH{gnR&7zhpp
z!5|<g7=!|W{u3D^Apf`gzuCl)p!E9gwpX2<^s5w-ydcz9yAj6t<=)K3>XGWhFs7hw
zZ0rA2m%0C5mi6CKbiN!Pr)idtpBO%LCxf}!0!p9L@D&+9Xz(hlotStqSrZSG+nf94
zZ1&vs>$0%#%kefh{S5}gy9c^{B=T#zd!2;b+GcHKZYq)??>ZdZNS6v1l`@CpZEo}T
zOr|g6KRiML?oG7QX`8mF?UI)wEwESe{m>FdcFYQPReg57FP`M-^y4&_+aPfizgaUW
zqiEy=jdA)~om3bx`zW<YZT@y;oo%`*j0i<T1Iv3Fs$4VA{liyJHSexK<)EEGo3{St
zalrj2Db-rT^#UeCrjvLuJoHvhFE#5R;Hl%&eYawE?rXWUm%50H_y+oQ;jGz>BFxLN
zyZzT7n48Cg9shsLJB#^$Z2fhJ0rdTlF;a>i0^&TxIc{ig4<*EGq5*+M&H|+GZi#{Z
z;9#IKC>m2b?!U^=uKypMB8MGuO;X0k8xxZ$ptfS*%ztj>(KkR0nln13f26@zajkYa
z5%@dTKl4P0qT9V$%oOc)@w$Sg|MLO&n(CVr_8=p8tF#o<_Uz^drkx*-TTnLi0cvEq
zBw3Zp#bLG-uw!Ka_V?kn){@#Afq_Dx@2l-uzm>0=fcn~v-UoBl3@<sZkMLOfXH567
zDd{iY|JbCI!N|(8uK(MPi%pDOE_IpL>*@Jsvh)u6STZfvTP;^(6$hQ-VE~ioq!CYc
zI-T;~4!M^RLkD2Ho~AYm=US)<)2RIRf2{WT$iRB(ssH19o+)#YhDPAokr+qY8rv^`
z)B0QVoBMGuKn#xkb#I6)GKA5^3|H9QjDCuHHG_U_EF$m)8y=l-pf%{&pzv?MPpQdA
z*X$USyVKtnqW>D|G3MUEugLPbAu_V;C1@?Dv!)kGtX*u7Avf*r7Y50s;vIFCz>$~{
zBDwUbtQ2z(U%7dr7w~DBbs7@_`QD?muOIxKLWMmxSg%}Vr8+i*j`WXWkL4MUvNo1g
zi#4np&$|UOa7D{R!M|o;Mgz@krp2tc#UAg^nJR-pDH*zr7PxzpbovhkgTJS6af7sr
z-NyzbCh4EG$S|GqHaesi!UiPpaemu{A&#G+3GMD5jq`h&S&MLL!I;dX=rpUO#o$2U
zC?S<|`We!8^@qTu;$*p0fjgHq`|q)#Z!gg53XZVqsWt6s@hD@?Q$$V8f(L|Cv`ttA
zHlX5qF8pE)mkn0jihMpFtaMV_XqSuuh8ywNZ1^E{mW0vs&>TEP`jD3+FX}i5c6oJ-
zuyeXUSltq<BeF<|c?_`)tXIE)!afLrTBO-=pCG4yEe{7(TXFLlfg{_ktPl)%!I9xg
z!`(B&&T431cC?;{BPKNElT$T5+-0KOpIbl6*pn({^y-OVrh4UT|B$^oM^M_50}xnX
z3F-`}eFS@KaymgM4=CoPfG=GxTK6={2%*+R6y!d})%a*-0y>ecjfH<%=gStihlk)*
zR)qN0BL5IFl?N^b?!+KcMf!WweIt1W0hb$C;>5E+<CI%*(buO980BZ4`{wOu_P?5*
zW2^=dK*Kn|dA(wh^vpysLUM9YlV9N8sd<6{2wKM9mgwrR&@$Xq-Oc;_`{x+s?-ilu
z5BT}chxAz8?HCr2KL1)$r64{j<-wmzk8LoBmUDvYCLDm`WVR=xLo+iGv!y8s*v<vk
zDqUEJ^T4h?DZKt>t1`cA{gdGBZ6{o&)0w09NEty8Dj*eaU0EqxDwcQrZ&$Fp9;0&p
zDZzSgaOiK@6sl0ldIIzcJJahsw|88gq7?m0&LEK=zofJKDf>@Cl2~TxH3g+SjI){a
z{~(-5BfEz`K|ZuO<G`g`=#fhHpFa}6!s5EFhaBI}Ap)y96sanGmNoaYKDa;pI^T!=
z)lqoE4gUpaYFwBjk)F#<teO0u`+KQoQ#n|#@=m1RyFleO=BpoXCGs_AqN^sd>^C!N
zI0T^so{fK@R$p5|E>aU$w*ff9`IgP-OW5zvSKm_t>E2=x#%wL65GXZ=;;CuhlOdwt
zAkGQI(lOs`$3{?KE441GeyzH6D+wqjQ2E&Ng==M=5dQn&_cpHAMpiAM4mz(B<zkkp
zQj6t;^n3I_c6mL%hNB4LcFU<s+1+jUga{3mto*5os@najkb!3WKvSaeK+-6-)r<UU
za&fEB$+^Sw2s}*$Bhg|jr<o5%&Co;6-1lUIei@q)kt9kp`Gu=zkPx0>%gl2KHNi5>
zV<1T`nYMvE=AkzR+w-gPd*V<>U=A-nf5M=s!bf8Dzv}qTps0dp-?L{ISn>i2qJ#si
zWRNHsmb^+10+J+26v-e;SXRj*3n)mCtYnm&Gs+qO0Z9TPK_p0!jHJ8&``){Czr0g3
zHB)_hx~ICk`a^fkPZ!8|eE(^3dUWT^(n(Lr5N+q!<KCyOyfwPArj0+14edd>8%W^t
z<AKUDxj94{E%ux){;X+O5o0LL%Kb_?ZuH7EMc7=|e%f%v*7RfHot(b)>k}bI3+>~-
zy;K-b-||lULl=VRx*6RH8PqXo2}dSJv99)BBCpAZEV7GN$#P$cYZ<Dfz)}*rt@NY2
zRj*Ira1&^#B|)0sPU<TY%Jmd}|EtQ4B~>>j6QP^iXgeut8CCpQ8gmOT3>L*q#;cK0
zHl$;kq4THR3G+P#)f%>6)${r@D{gx6k+uels#eizJ1z#J?|MbU_BS*tzYZLQoi~l2
zGC}V<d<XU9#dvh#>X-}K7+HftY(1+@m#V1ui$vH^r`+3eVbzbTP`VGUb}_5cH9`R9
z0A8(fpGwN5d7w=gP=ROhG&?DoWt`Y8heV~RX}uJXYc8N)?z{lu^zSa-xuSf083cJ7
z50S${L6d)w)fyOiog<9Fhn@K$CPItA5y(A!8bvDYo*l8F>bg<_29XW}+(;dM{4#=C
z-Xs3zWgbUa_!9vE;Xp&9Z90^2HXNiwxx}XXUWXR%^c3F6U`C0O;fv}o;<$?<JYI{y
zK#JH=H%ykc1}kjdJ)9ns9p3QGw(tm7D2hk%=?{c8eEzsbTw_CLkUvrR2Q!X5p7O)&
zvqKHzbDt#f{1xOO{yHLtzIlb~K$oRsaMa}vzlWekJ?=Rj0S-#ohMOsBqPkwbqC^6<
zXOuz&IS|dW_5GvdkbHt7?`wGPWma9-FbcYg#$Mzl-L~<8FG=(1F(f!7%|Zyc>C6r(
zU11mcfy+IUz~q+_{lG;RSp+%=_xw0?{Ycm>)%#-S%K3q=d+XCh=QZvaX?d==sBQ(?
zv}T(#nq%oPCd-2F%Rc4eibHfL=f)v3@@JKoT7fx5WkR?(v!2~kK#Fb|eH5YZy$$7!
z8*!iqQJeQbRDYA9ae9<e)9jcxb8PP=7z-`2X$j7lKUvG)j8t3PLnYrQMXyN+qML>A
zPZP7vOaOzN+WA(jy~WwOWb36nWq;$}v)Xv-Iq^ii=6Xq$dv-l<G=}o2VSa?HkxN5&
zzUSsH_~eahQI;NuIZZ{foPXWkNc|~JddiGY9P1{$`80_kyB61Yxjtnm{zu_~PUA)A
zN@Y%zOQ7(0bJ+>NU^Od3yZ}v#4$Aa#&vejWoA=3_LPExKR+9L`OWXcI1wzg8;Py6g
zVA;;eY8OQy=as(}ZQD}0Q72&1?e)@MK=Ol>*j7{K&rJqZ^7rYuaw-ZAhB>L;_nZVx
zF*0JoHArVW06|ozK-O0(!h-4XGN;8ie)J{S-k)mEf@5d238GW<GF&SX+i)~hebAJ7
zWM~x&#BWh_4K#ipmlkZR5(dmy$N)%gRn}69UKKoH_4J2Qn6$&-+&m>xFk6=YUI?s&
zSqVDd*u!ji#c>aM{SbjTaWrB5YyOYWp3X4el%U0?ZxO@p%utyChWQ6hBL>FBu1sn>
zDZE}gpeAY~1oRCkWweV(ajnUj6186?V12BG$_uB&ZY@(|O-14#va-OV*=OYhtXr)x
z$^h%iKL4*kzv)k&ig3c+^B)x{lFC;I{D)Ves%wxd>#e(*VWk6qAMS<0j$)u9`FZ&i
z6@J<!aDE>u(8F%fBTKUAiED8KFx95hiDSefoN(g5#|;HdEi66kkQ)FC6_6kAm{o0&
zqxYxr55VNju@-LOu^k{d81a;9hfGZPX-&JVCwY`yrvf<|jfwNmeH%12#W}9BzXRMx
zLGR0OiVs1FDoV=ybew6+uIZ(<d{@=!Be)vh)MOKf7ot&3<V+{zUE{S*zf_~KSZOiO
z4}$CEu5=swL9|3{pMs*>VO5uUq#VhWEE%?Nr?c_1FXzKieq0SEvjLm17<Q#{gr{HK
zKU+1;Lk*7zo-#S7Muh2BZv^f)&GQW#Q<!d_@Wrp}c1)F@_{z4rpNo~Y(PQp6V2L6Q
zzI|;l)zS4X|Dxyqnazn0TU;)-!5H2$<{vq5K*h_Z6B3-L*ZnBe1MK->hEn0BrXHz^
z9{=0dIEKX%x-t{b9F1W;jOK@qdJZ55@FL;fCA!Z158TqRz02lBHL>rO#l>j9AQ8Q?
zYptH0rDNn%lI3>#H&XJH{+b;?jtp0<3egX;XtCNvx;p=EW1CG<EaY<k&B*_JyuG^7
zG|dGWiR7!K+3(1ST;F>4k)zw+rz7H6C>&!!Ls9WbnDS-G%L``YsbjU>!qwJf-ePva
zPE0oQ*q`5@Z#7G+bEtoiw&1~m1S(?l^>1m<tw)}+Zjmc6W);b~UfyGd32ghZHw2xx
zwv2qfjT3e|=46&ms<IUpWIHSW#ECNA&40Hb0V`pH+JK}+0qCFEpPzG7q*{CpC=ss4
zSdc>gpi@dr4=2WhqKJbmA;=nTLB(~|jy76mauaS0lBpWTzEMW!$E$c_X$-tE1%wtE
zB+@<9B*()%_1FET3^L-U(>69K#=TN`F3!zMgwdQ|f~^9*f}{XqCV15VuxBU~w91AO
zqWb{r*6l%}D#K}G9>re;XzR*RMgz^)=?GseFB(RFP-LJ(otXjYsWpH9%21tq;4J(=
z?1R0n)77cbhEShhK+{#sM#n#RzEq!%-v~(R0XWn;M?HLcNPq0yJ&&bRx5vY6Tn)sd
zY0wpFIKzqq)HlNU`G{HIRVL@=M~Ws{nRVF7yJ@pK3y0o8&&ZLu7IGQPS3+o+h9(n-
zxpDOs=x1(T3KjM#KBk$j*z?LFY;plU{1!%}!(?}aWF8RDPj)^Rx$5&NZVT8J1xa$a
zOw$voz^`G~>l|oOT@Gv2rU8zW+B*iXy$!&CkKz&Rb2Bo3x>qjY>)*9WTWjkH;08wx
zeooX!%9F>Dy;C>?oPh0LaSIh2Dn8$BkIRB*MAk;XUz?s<nDXyi=XLFQ^hK|E(wa7M
z`JK|tZ8!l&<QZ?SJbnTvgwbNOXffna0Xd}L4oHv&z$y)};%G>;|L~CnlPI{Yc&?5*
zd_z4w@yftKb}%0_ZF2pf4Y$Q2cN{?hCDIcSmqfxlzfd*_Gq(L@(Gi_`aPy@{B5{@i
zY2g{1&GMN``(91Fg@xcI95F4Exm%jM@B`)qieyRMp@=$}lyE*zBx#gQT9W85mV4}M
zd*dj7Bul4BB&&BV4wO&3JCHJ=7)}qxKL`k>xI7<BXH!i5wz4V4@qw<rX+!DGUAna<
z3M{v7hI);0t)zK0v!JbrPe4w_@%qquT&yVMI}q|W)lVOPba}$+r}I#V)r81a0bD{K
zg{cBJN`1uN3I-Y(zZQ;OM`8o3sA6Tgg4b_V(PNi8Wt&p?K;Nr8p2$xEZn|rX_jy;b
zi>cU1#qcWxTzTE9KPemgj0bV0N#ZLkyV)x@_J;feR0ylW*)2HYh`V%AgjWQ+3dI<+
zMcLib*oMwTT9QGz`1CTE1ho6gco|gSuk=j46)?nEhSVqd23gfvk%~bux8^P37@?IC
zbpE?rwv@C<rYEm_!Ptsy3th$f{?~A%g;WZ%q_WcY>~Tsr)184234Ojn<E^gk&5veo
z`<)}IQ1K1?@dV04rdbgcH+@h|u!wtOE`dG_PlHM3L!0Ur9t{Jr0_Gb2Jim-(<?>(J
z!Jvd9UKfo&IZ&pk8|;y`J5wY7{FgGmp+zcMLLk*Lnm6v}#5t1?pPH)CO?PC5s%m^z
z1<1PnZF-QZaEC%wb6Z`}sJCze?!@pol_Elz(ujBk8t*J_BBSF?^Bg6a8enj0XG?BT
zwYFv!N-1tEfGlD`M|~=b%8uPZ>;}aK2wDVu6ck7$UNl@~E+eB`|Cy1%L?~ly3N4mw
zq9B@@R4zJwQ&bP;XZ&GyIL}bpG)|Tq+;y}hx`8}pLWsFVMPd1A-FxEi%4*n|*IL6<
zUY8Y}p`deBWpXHF{V={kTHSPN`|iw`w}%2Qq~zF`cwqJHCL(*Ya;AY)#%_LrE5BEu
z5tta<FgxAgLqWK9{mAU6Z*YGNJ+b!0J0ar(MdVf3{_N7a0F&=*8#VE)Hx!edW~8th
z40Kxug55y^2Qwt>u!BGF>JBX>WoV&{*XX?3PewOx{vY^3=NYYPJkviiFFQ%{C^0Ga
zh+%QRj&m6WO4sKr^+nHRJ<`sL>Q%|Ay-ufapYm5tQCSW!!s^K+S%&B)ITE-nO6G4%
z10yJ8s0s!;6B-pDKm%EC;9r$!awYdTQx(AaL!E4V&!~rWhCYXlo_j~XWZ59224GNk
zz=6h-HAjIeJ_L_|5xH^d8@1vWVMOs;^m}Vh2+wD300^A$G!e)%F>}U?i2W!>q)C4;
zaM!$D%@v}b{*Z%lNvD<Tk0|Le0a`-s0^zIAiEdKNW8<W)p4_Yv9>|k`O?;7wr`it!
zp+BDi`*CvavsWId@qmMINO{cU$&y$=XyS3Ur4l<1nfh(QF)ZpVl^&?p7%P*9E>{1j
zhWl1@%&*Fae+(yQWVd<z08jasBW5{bE4q<FZDJ1&HLu)i9_t)G)@lFV8BX5KeI3Xj
zvyN&pDX-5m8K-Ab`Gy(O%RIRS0gF1f(toiW>zuL0d<5*NV`WUeJ9_>0K3yJMqv)2t
z$d)>(M6w2f+?V_H6I33~P^<Rk5BN&>1~UbTJb&ou*HzVUPNl*$qqXzXi}a3uRen~P
zeaEI8C$@a&OmwWe+V;T8Cn2I}<YuDvq}RiWaOM&5J3-+=Vp6ZVDIyR2dM=bgjrLTy
z30jh=5Tsd%7p25?Dy@87+4zqG^%?w~M=$(`fSOJ@GXgZAS9UpQ1k+=sFDWyjjXf2o
z9*@oYfu+$*+WRjZo_5ii{4p%!nP=jB$~0!&rQ53a{{H8iFJDZyTs^g2x|ByT(YCs3
z?sXk7_H?Q7+|$J6noPFwwRJe&Ty|;s6*ihC_2lE97+j*#(57`%;hosixtUj2XBHS$
zVqYbmy!bm1DH}2wzxR0ugo@SpuFxYq`L20+T}u)9M}^5xx!ub5>L}YTM87$6ShAb3
zB(=N3NBuVIc$|LziFe0GN)pVBmG((9{MP)tfiHq9^nD56Cq9>{E3K+m0Qd0$T4N73
zC`FaNB@SHuVHl_nAo|<GhiMWJ_<EK0fYXUE7_>3(pH%l~IGvN?pT0oSy{y84MjG~$
z-ql8tE6v$`ze3)x>1mzF9$0te$d1`p=iyf>WTz^=%=rjNqsVx5If}nJWLXXg^k{hY
zWP{xyN)Lbje#Vp~83~|v*N#2@KC~phO~PdJ%?9daSHSEyt3iZjy!u+@d#>>fr4`zX
z<=;By=<i}L6|wbI@U%&UI1j6P)NQv(EYKIijg?DOP(n2&|HOqtA5_xciSGUL8uz7b
z#o_GJrw1~%(+L~=Byc)q0K2<JuUUZ0U7zA0PJLk{)b3fno%qdWJlGmock>$gJjc;i
z)$?IssLBXqaX}o8UT9Zl5v+QyXT2Kz)Nv1O&Kr}=^$=1tpZX_R9{fx)&(sy&@<NVn
zZyY+cb$_Q}TuZ^d`!#t(>vxl>!aGS2N=#gFQF>E=Gp&IWD68RUeyVkzXFC?Bi+UqO
z<vnYj+qYrd;val{tflB;J^_CTLNA`|@&3%>omlv%Tav2?-HnomXz!k-G)Wm;53u&y
zh52(yw%yznG>tBDZ~u8pc2i>f(GXqC!xt~?CFmQ^dtd(!EGWtvsV4Q|fxKY0as6}`
z`!gT51W-Z_G@gVFZ$vC_Povz*;U!16aE;rPRS1>5+TKf#oDzK0HHO=2>M~WCA21!h
zLJS$mxt2a-obEe+k#5_6H_AHTaGJ+mK)rhQbGR{&QP(d;{!#CTy3g9ecKs8oc!RV6
z^zm8GZQ<&M^F)<r&&apOUgLzx)Rt2tG_*1A+}FQT<S&q_QUWH_`jNJ8W|A3G-{4<s
zcwKeB7V4R|)=*|+qCeu_;NU*WS((GO?@)4Co1S1?NPg?FkrFg3GPnc7%;$SE-`Ia{
zLmlI0tl4}GQ5Ya%`}pOqtn=TnNlym(52w1VDt3($26T_s$4=FEriBM7afL^*tNHI>
zPWukHFVm4>clg!rz_63A?AhTyeQ>#JbMkcdLFtWL5bc@l?UNibXgSz{mtcDQRqdWl
z;hH=r{o{Clcj}l0(R)C;8Os~5{`SEOahWj2-<&Lc&q(lZ!PPlx9Q|J3u@HKzbw;5z
zl8Muo>P3SkgB8Y-%t`4o(o)UEe1?wDYBYLdy!l?(TMoI$x$E)in0?I!T#WzduZz)&
zgI0S(rW1g%W0qf#&G-VYxRe^7+5ktC`8K@m?MO=m^DRpS7B%nEBSrk3w~2Z!H=bC6
z^WNGHeF54b$#e<Jskm?BASs<N^*bVaH#D2u=&5K?K}n8TWt`Jm<{$_oxGSs#EQei!
z?)%qlIy4<KGal3}NdpejKz_&XFl+fkgTEE<F2VGLC^$hK=&eF7P9832u19Dr??=?e
zMc4RxzseZr<^qsFlBPH!*%n!t(MFS5SSi=jJnDf8x|7V}_Jr*ZfVv2LG!GR|E$fRQ
z{4<7}LGk|SN+hMwro($J;(g|iqcv)pBEXzmVQCc;3<cnQ4)^nqnFXOit(dz|%D0pJ
z1h9L#bWrHo_i&V2Nh2Fktl@*F69~z_RJF~?;oR{6(!b>Ym5hPS2fuH5$i0u-V#Coq
z_8`#3oU&@H91fm2X`YwnB^6ox_<5nsh~1{p!~^4$0uodKMBn?J0$OM^(D!GaKR@S?
zQQ++RYQH4We0%Ej1_59QM!*)~ipe(}-=~2L%faVzbLfA?Rw0=|hE|TkRzN=9gE03S
zGQ%MY!v=F2&QB!c+mWchS5QyqE+cTg7JSEBE%Qd_Bjis?-EV7h2CZR+FDa;mg9HVN
z`Nf>2r?BBGs%8<n2Qs=gYnKZXMsma+Pb(0*k7@&jQT8m@%eBwQ^W%bk9nUu|yThH~
zF{>^CzcD~e*hsC??IB|y6O18Y&7?%p^gW-ulddQnpKpKb;*0_c;C6k~jH9B)D5LRT
zH6@V+s;Jt~fp_%=o(7YV7(;&v^ac|WP{n86^kk#g$Zdzw^)GaL5Y+MPG84W6gb^6Q
z;F$B#?=J2R26dm*8{+wbdMOSckPnD4+!H@H&xd>$YWM<J&PQs7rf2kT@9v^@TGkb=
z(Zr}IubinTsx-FloK?(jguO}}r$ED+-ie$=YrnJM*8r1$7yf3AWU&O3acGDV`~P1i
z83_oq73sf|4u+9%?|-vC7Yow#_+hCqW){&P;=a=^dls_!798H#(i)o{>`d}--7sel
zXMyDvSH$easM~lZp1)WTU+ypfR`M8zZt*Jj>=P2AiH5U9^f$NvbB*G%Cq5!h0hS>p
z>!L<{v^@Lm77x9w+fXc(oL~%oV(Mo7g-UHv;a(H2jb=~og_~yPOFB5+3rkjZ4Tbfl
z=hhWh?gb_F?D}Wyiz@4?kS~hXRVezro`~=4rS{qRl|>uiXiIENNd9VQfU&)R;u1xo
z$Pi=+<uj4x7Pxu82mp;rwqh8Lp@%y~9Th^aj1sL$cnisAJ)uZ~(S#=Ef{+fO*ih_m
zp&Iln=cO(Eh#4Nd^d@Hp52?*v$ZL)!E0^ytT&^iVBMFdH>HbLpnvy642d@{%p_eRc
zb3H?4#8`E(A#dyWxt0uO#{#sz{27P2>2VbYt*ovS-$RJ6*ZJppN9*|bYCUkp0yViW
zWOSP0U^>?!?a0^7j1OX`f0%neRrim^Yhk@*_?B_C7f<4oaeNgjLLY;&ajjyI5#la6
zle;QIs?{uQ93y1^jl1izU7M#JV+&QxTX(dU5#QA}#V(bVe6E>@&k0Y-dRx1$fxc7t
z0O$3aS`Y)7WWyuj%{L2Dv><iVN)b*heqZd8pK5{Vf|O)lZVCIUB(}4xx;3qLKiM1H
z?#7iXGQ33)+7e!2M)@iu`M`VjchWIv^it?+Tk>9NJA_9Cznx2EB;}`RDxsJgwIeZ+
zZ(;M1=4CeC4VHnjNV}Yg@cWicNJ{z<de~nMvdrQiFD~rM1@(=EaM|5%xpl`NpjzHX
zNk_uXoaC@$w;v0^nW0kus_GAdRJSaeki-XX+<OzO3wRh>NpPpbbZPyG9s6HvSyaD;
z?y?a~me^?0d3MuQ`xBGD9lSuG?@*+t{u^(ls}>HQTZ7iTPiY7$RcMu3mswXNUiA`r
z|HHVtTaD*O*sG^56E1Hk&N{6;xluG!v{Vc+B)kv|NSgm=Nc_(Zg_R|^$P<j9M<C_N
z{V58@U!%;}NHaD|-&5%b(@tjWV%z3Krn-yIQ6B~Y(jpNEQl^i<VK5McA_-a6{?Cg1
zzhn$NEe;{U?C%|{0Y>QmZ%!n#Q0RZy{`)i`@V`a;zoR$|0#8yP=~_1=rL@3v2Oxbn
MH1#zq)$H*91rPFxBLDyZ

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/hathor/template_thumbnail.png b/core/administrator/templates/hathor/template_thumbnail.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b2b49b88d5112554d092b329d4fd9e9f5d3f5b
GIT binary patch
literal 3828
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/component.php b/core/administrator/templates/isis/component.php
new file mode 100644
index 00000000..863c9b2d
--- /dev/null
+++ b/core/administrator/templates/isis/component.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app  = JFactory::getApplication();
+$lang = JFactory::getLanguage();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add filter polyfill for IE8
+JHtml::_('behavior.polyfill', array('filter'), 'lte IE 9');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add Stylesheets
+JHtml::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+// Link color
+if ($this->params->get('linkColor'))
+{
+	$this->addStyleDeclaration('a { color: ' . $this->params->get('linkColor') . '; }');
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body class="contentpane component">
+	<jdoc:include type="message" />
+	<jdoc:include type="component" />
+</body>
+</html>
diff --git a/core/administrator/templates/isis/cpanel.php b/core/administrator/templates/isis/cpanel.php
new file mode 100644
index 00000000..0560a23f
--- /dev/null
+++ b/core/administrator/templates/isis/cpanel.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+require_once __DIR__ . '/index.php';
diff --git a/core/administrator/templates/isis/css/template-rtl.css b/core/administrator/templates/isis/css/template-rtl.css
new file mode 100644
index 00000000..a664a1f0
--- /dev/null
+++ b/core/administrator/templates/isis/css/template-rtl.css
@@ -0,0 +1,10057 @@
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+	display: block;
+}
+audio,
+canvas,
+video {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+audio:not([controls]) {
+	display: none;
+}
+html {
+	font-size: 100%;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+}
+a:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+a:hover,
+a:active {
+	outline: 0;
+}
+sub,
+sup {
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline;
+}
+sup {
+	top: -0.5em;
+}
+sub {
+	bottom: -0.25em;
+}
+img {
+	max-width: 100%;
+	width: auto \9;
+	height: auto;
+	vertical-align: middle;
+	border: 0;
+	-ms-interpolation-mode: bicubic;
+}
+#map_canvas img,
+.google-maps img,
+.gm-style img {
+	max-width: none;
+}
+button,
+input,
+select,
+textarea {
+	margin: 0;
+	font-size: 100%;
+	vertical-align: middle;
+}
+button,
+input {
+	*overflow: visible;
+	line-height: normal;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+	-webkit-appearance: button;
+	cursor: pointer;
+}
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+	cursor: pointer;
+}
+input[type="search"] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+	-webkit-appearance: none;
+}
+textarea {
+	overflow: auto;
+	vertical-align: top;
+}
+@media print {
+	* {
+		text-shadow: none !important;
+		color: #000 !important;
+		background: transparent !important;
+		box-shadow: none !important;
+	}
+	a,
+	a:visited {
+		text-decoration: underline;
+	}
+	a[href]:after {
+		content: " (" attr(href) ")";
+	}
+	abbr[title]:after {
+		content: " (" attr(title) ")";
+	}
+	.ir a:after,
+	a[href^="javascript:"]:after,
+	a[href^="#"]:after {
+		content: "";
+	}
+	pre,
+	blockquote {
+		border: 1px solid #999;
+		page-break-inside: avoid;
+	}
+	thead {
+		display: table-header-group;
+	}
+	tr,
+	img {
+		page-break-inside: avoid;
+	}
+	img {
+		max-width: 100% !important;
+	}
+	@page {
+		margin: 0.5cm;
+	}
+	p,
+	h2,
+	h3 {
+		orphans: 3;
+		widows: 3;
+	}
+	h2,
+	h3 {
+		page-break-after: avoid;
+	}
+}
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 28px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+body {
+	margin: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	line-height: 18px;
+	color: #333;
+	background-color: #fff;
+}
+a {
+	color: #3071a9;
+	text-decoration: none;
+}
+a:hover,
+a:focus {
+	color: #1f496e;
+	text-decoration: underline;
+}
+.img-rounded {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.img-polaroid {
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+}
+.img-circle {
+	-webkit-border-radius: 500px;
+	-moz-border-radius: 500px;
+	border-radius: 500px;
+}
+.row {
+	margin-left: -20px;
+	*zoom: 1;
+}
+.row:before,
+.row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row:after {
+	clear: both;
+}
+[class*="span"] {
+	float: left;
+	min-height: 1px;
+	margin-left: 20px;
+}
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.span12 {
+	width: 940px;
+}
+.span11 {
+	width: 860px;
+}
+.span10 {
+	width: 780px;
+}
+.span9 {
+	width: 700px;
+}
+.span8 {
+	width: 620px;
+}
+.span7 {
+	width: 540px;
+}
+.span6 {
+	width: 460px;
+}
+.span5 {
+	width: 380px;
+}
+.span4 {
+	width: 300px;
+}
+.span3 {
+	width: 220px;
+}
+.span2 {
+	width: 140px;
+}
+.span1 {
+	width: 60px;
+}
+.offset12 {
+	margin-left: 980px;
+}
+.offset11 {
+	margin-left: 900px;
+}
+.offset10 {
+	margin-left: 820px;
+}
+.offset9 {
+	margin-left: 740px;
+}
+.offset8 {
+	margin-left: 660px;
+}
+.offset7 {
+	margin-left: 580px;
+}
+.offset6 {
+	margin-left: 500px;
+}
+.offset5 {
+	margin-left: 420px;
+}
+.offset4 {
+	margin-left: 340px;
+}
+.offset3 {
+	margin-left: 260px;
+}
+.offset2 {
+	margin-left: 180px;
+}
+.offset1 {
+	margin-left: 100px;
+}
+.row-fluid {
+	width: 100%;
+	*zoom: 1;
+}
+.row-fluid:before,
+.row-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row-fluid:after {
+	clear: both;
+}
+.row-fluid [class*="span"] {
+	display: block;
+	width: 100%;
+	min-height: 28px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+	margin-left: 2.1276595744681%;
+	*margin-left: 2.0744680851064%;
+}
+.row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+	margin-left: 2.1276595744681%;
+}
+.row-fluid .span12 {
+	width: 100%;
+	*width: 99.946808510638%;
+}
+.row-fluid .span11 {
+	width: 91.489361702128%;
+	*width: 91.436170212766%;
+}
+.row-fluid .span10 {
+	width: 82.978723404255%;
+	*width: 82.925531914894%;
+}
+.row-fluid .span9 {
+	width: 74.468085106383%;
+	*width: 74.414893617021%;
+}
+.row-fluid .span8 {
+	width: 65.957446808511%;
+	*width: 65.904255319149%;
+}
+.row-fluid .span7 {
+	width: 57.446808510638%;
+	*width: 57.393617021277%;
+}
+.row-fluid .span6 {
+	width: 48.936170212766%;
+	*width: 48.882978723404%;
+}
+.row-fluid .span5 {
+	width: 40.425531914894%;
+	*width: 40.372340425532%;
+}
+.row-fluid .span4 {
+	width: 31.914893617021%;
+	*width: 31.86170212766%;
+}
+.row-fluid .span3 {
+	width: 23.404255319149%;
+	*width: 23.351063829787%;
+}
+.row-fluid .span2 {
+	width: 14.893617021277%;
+	*width: 14.840425531915%;
+}
+.row-fluid .span1 {
+	width: 6.3829787234043%;
+	*width: 6.3297872340426%;
+}
+.row-fluid .offset12 {
+	margin-left: 104.25531914894%;
+	*margin-left: 104.14893617021%;
+}
+.row-fluid .offset12:first-child {
+	margin-left: 102.12765957447%;
+	*margin-left: 102.02127659574%;
+}
+.row-fluid .offset11 {
+	margin-left: 95.744680851064%;
+	*margin-left: 95.63829787234%;
+}
+.row-fluid .offset11:first-child {
+	margin-left: 93.617021276596%;
+	*margin-left: 93.510638297872%;
+}
+.row-fluid .offset10 {
+	margin-left: 87.234042553191%;
+	*margin-left: 87.127659574468%;
+}
+.row-fluid .offset10:first-child {
+	margin-left: 85.106382978723%;
+	*margin-left: 85%;
+}
+.row-fluid .offset9 {
+	margin-left: 78.723404255319%;
+	*margin-left: 78.617021276596%;
+}
+.row-fluid .offset9:first-child {
+	margin-left: 76.595744680851%;
+	*margin-left: 76.489361702128%;
+}
+.row-fluid .offset8 {
+	margin-left: 70.212765957447%;
+	*margin-left: 70.106382978723%;
+}
+.row-fluid .offset8:first-child {
+	margin-left: 68.085106382979%;
+	*margin-left: 67.978723404255%;
+}
+.row-fluid .offset7 {
+	margin-left: 61.702127659574%;
+	*margin-left: 61.595744680851%;
+}
+.row-fluid .offset7:first-child {
+	margin-left: 59.574468085106%;
+	*margin-left: 59.468085106383%;
+}
+.row-fluid .offset6 {
+	margin-left: 53.191489361702%;
+	*margin-left: 53.085106382979%;
+}
+.row-fluid .offset6:first-child {
+	margin-left: 51.063829787234%;
+	*margin-left: 50.957446808511%;
+}
+.row-fluid .offset5 {
+	margin-left: 44.68085106383%;
+	*margin-left: 44.574468085106%;
+}
+.row-fluid .offset5:first-child {
+	margin-left: 42.553191489362%;
+	*margin-left: 42.446808510638%;
+}
+.row-fluid .offset4 {
+	margin-left: 36.170212765957%;
+	*margin-left: 36.063829787234%;
+}
+.row-fluid .offset4:first-child {
+	margin-left: 34.042553191489%;
+	*margin-left: 33.936170212766%;
+}
+.row-fluid .offset3 {
+	margin-left: 27.659574468085%;
+	*margin-left: 27.553191489362%;
+}
+.row-fluid .offset3:first-child {
+	margin-left: 25.531914893617%;
+	*margin-left: 25.425531914894%;
+}
+.row-fluid .offset2 {
+	margin-left: 19.148936170213%;
+	*margin-left: 19.042553191489%;
+}
+.row-fluid .offset2:first-child {
+	margin-left: 17.021276595745%;
+	*margin-left: 16.914893617021%;
+}
+.row-fluid .offset1 {
+	margin-left: 10.63829787234%;
+	*margin-left: 10.531914893617%;
+}
+.row-fluid .offset1:first-child {
+	margin-left: 8.5106382978723%;
+	*margin-left: 8.4042553191489%;
+}
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+	display: none;
+}
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+	float: right;
+}
+.container {
+	margin-right: auto;
+	margin-left: auto;
+	*zoom: 1;
+}
+.container:before,
+.container:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container:after {
+	clear: both;
+}
+.container-fluid {
+	padding-right: 20px;
+	padding-left: 20px;
+	*zoom: 1;
+}
+.container-fluid:before,
+.container-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container-fluid:after {
+	clear: both;
+}
+p {
+	margin: 0 0 9px;
+}
+.lead {
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	font-weight: 200;
+	line-height: 27px;
+}
+small {
+	font-size: 85%;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+cite {
+	font-style: normal;
+}
+.muted {
+	color: #999;
+}
+a.muted:hover,
+a.muted:focus {
+	color: #808080;
+}
+.text-warning {
+	color: #8a6d3b;
+}
+a.text-warning:hover,
+a.text-warning:focus {
+	color: #66512c;
+}
+.text-error {
+	color: #a94442;
+}
+a.text-error:hover,
+a.text-error:focus {
+	color: #843534;
+}
+.text-info {
+	color: #31708f;
+}
+a.text-info:hover,
+a.text-info:focus {
+	color: #245269;
+}
+.text-success {
+	color: #3c763d;
+}
+a.text-success:hover,
+a.text-success:focus {
+	color: #2b542c;
+}
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 9px 0;
+	font-family: inherit;
+	font-weight: bold;
+	line-height: 18px;
+	color: inherit;
+	text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+	font-weight: normal;
+	line-height: 1;
+	color: #999;
+}
+h1,
+h2,
+h3 {
+	line-height: 36px;
+}
+h1 {
+	font-size: 35.75px;
+}
+h2 {
+	font-size: 29.25px;
+}
+h3 {
+	font-size: 22.75px;
+}
+h4 {
+	font-size: 16.25px;
+}
+h5 {
+	font-size: 13px;
+}
+h6 {
+	font-size: 11.05px;
+}
+h1 small {
+	font-size: 22.75px;
+}
+h2 small {
+	font-size: 16.25px;
+}
+h3 small {
+	font-size: 13px;
+}
+h4 small {
+	font-size: 13px;
+}
+.page-header {
+	padding-bottom: 8px;
+	margin: 18px 0 27px;
+	border-bottom: 1px solid #eee;
+}
+ul,
+ol {
+	padding: 0;
+	margin: 0 0 9px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+	margin-bottom: 0;
+}
+li {
+	line-height: 18px;
+}
+ul.unstyled,
+ol.unstyled {
+	margin-left: 0;
+	list-style: none;
+}
+ul.inline,
+ol.inline {
+	margin-left: 0;
+	list-style: none;
+}
+ul.inline > li,
+ol.inline > li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+dl {
+	margin-bottom: 18px;
+}
+dt,
+dd {
+	line-height: 18px;
+}
+dt {
+	font-weight: bold;
+}
+dd {
+	margin-left: 9px;
+}
+.dl-horizontal {
+	*zoom: 1;
+}
+.dl-horizontal:before,
+.dl-horizontal:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.dl-horizontal:after {
+	clear: both;
+}
+.dl-horizontal dt {
+	float: left;
+	width: 160px;
+	clear: left;
+	text-align: right;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.dl-horizontal dd {
+	margin-left: 180px;
+}
+hr {
+	margin: 18px 0;
+	border: 0;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #fff;
+}
+abbr[title],
+abbr[data-original-title] {
+	cursor: help;
+	border-bottom: 1px dotted #999;
+}
+abbr.initialism {
+	font-size: 90%;
+	text-transform: uppercase;
+}
+blockquote {
+	padding: 0 0 0 15px;
+	margin: 0 0 18px;
+	border-left: 5px solid #eee;
+}
+blockquote p {
+	margin-bottom: 0;
+	font-size: 16.25px;
+	font-weight: 300;
+	line-height: 1.25;
+}
+blockquote small {
+	display: block;
+	line-height: 18px;
+	color: #999;
+}
+blockquote small:before {
+	content: '\2014 \00A0';
+}
+blockquote.pull-right {
+	float: right;
+	padding-right: 15px;
+	padding-left: 0;
+	border-right: 5px solid #eee;
+	border-left: 0;
+}
+blockquote.pull-right p,
+blockquote.pull-right small {
+	text-align: right;
+}
+blockquote.pull-right small:before {
+	content: '';
+}
+blockquote.pull-right small:after {
+	content: '\00A0 \2014';
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+	content: "";
+}
+address {
+	display: block;
+	margin-bottom: 18px;
+	font-style: normal;
+	line-height: 18px;
+}
+code,
+pre {
+	padding: 0 3px 2px;
+	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-size: 11px;
+	color: #333;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+code {
+	padding: 2px 4px;
+	color: #d14;
+	background-color: #f7f7f9;
+	border: 1px solid #e1e1e8;
+	white-space: nowrap;
+}
+pre {
+	display: block;
+	padding: 8.5px;
+	margin: 0 0 9px;
+	font-size: 12px;
+	line-height: 18px;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.15);
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+pre.prettyprint {
+	margin-bottom: 18px;
+}
+pre code {
+	padding: 0;
+	color: inherit;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: transparent;
+	border: 0;
+}
+.pre-scrollable {
+	max-height: 340px;
+	overflow-y: scroll;
+}
+form {
+	margin: 0 0 18px;
+}
+fieldset {
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	line-height: 36px;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5;
+}
+legend small {
+	font-size: 13.5px;
+	color: #999;
+}
+label,
+input,
+button,
+select,
+textarea {
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+}
+input,
+button,
+select,
+textarea {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+label {
+	display: block;
+	margin-bottom: 5px;
+}
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	display: inline-block;
+	height: 18px;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px;
+	line-height: 18px;
+	color: #555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	vertical-align: middle;
+}
+input,
+textarea,
+.uneditable-input {
+	width: 206px;
+}
+textarea {
+	height: auto;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-webkit-transition: border linear .2s, box-shadow linear .2s;
+	-moz-transition: border linear .2s, box-shadow linear .2s;
+	-o-transition: border linear .2s, box-shadow linear .2s;
+	transition: border linear .2s, box-shadow linear .2s;
+}
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+	border-color: rgba(82,168,236,0.8);
+	outline: 0;
+	outline: thin dotted \9;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+input[type="radio"],
+input[type="checkbox"] {
+	margin: 4px 0 0;
+	*margin-top: 0;
+	margin-top: 1px \9;
+	line-height: normal;
+}
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+	width: auto;
+}
+select,
+input[type="file"] {
+	height: 28px;
+	*margin-top: 4px;
+	line-height: 28px;
+}
+select {
+	width: 220px;
+	border: 1px solid #ccc;
+	background-color: #fff;
+}
+select[multiple],
+select[size] {
+	height: auto;
+}
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.uneditable-input,
+.uneditable-textarea {
+	color: #999;
+	background-color: #fcfcfc;
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	cursor: not-allowed;
+}
+.uneditable-input {
+	overflow: hidden;
+	white-space: nowrap;
+}
+.uneditable-textarea {
+	width: auto;
+	height: auto;
+}
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+	color: #999;
+}
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+	color: #999;
+}
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+	color: #999;
+}
+.radio,
+.checkbox {
+	min-height: 18px;
+	padding-left: 20px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+	float: left;
+	margin-left: -20px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.radio.inline,
+.checkbox.inline {
+	display: inline-block;
+	padding-top: 5px;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+	margin-left: 10px;
+}
+.input-mini {
+	width: 60px;
+}
+.input-small {
+	width: 90px;
+}
+.input-medium {
+	width: 150px;
+}
+.input-large {
+	width: 210px;
+}
+.input-xlarge {
+	width: 270px;
+}
+.input-xxlarge {
+	width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+	float: none;
+	margin-left: 0;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+input,
+textarea,
+.uneditable-input {
+	margin-left: 0;
+}
+.controls-row [class*="span"] + [class*="span"] {
+	margin-left: 20px;
+}
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+	width: 926px;
+}
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+	width: 846px;
+}
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+	width: 766px;
+}
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+	width: 686px;
+}
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+	width: 606px;
+}
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+	width: 526px;
+}
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+	width: 446px;
+}
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+	width: 366px;
+}
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+	width: 286px;
+}
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+	width: 206px;
+}
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+	width: 126px;
+}
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+	width: 46px;
+}
+.controls-row {
+	*zoom: 1;
+}
+.controls-row:before,
+.controls-row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.controls-row:after {
+	clear: both;
+}
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+	float: left;
+}
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+	padding-top: 5px;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+	cursor: not-allowed;
+	background-color: #eee;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+	background-color: transparent;
+}
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+	color: #8a6d3b;
+}
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	color: #8a6d3b;
+}
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	border-color: #8a6d3b;
+}
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+	border-color: #66512c;
+}
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #8a6d3b;
+}
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+	color: #a94442;
+}
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	color: #a94442;
+}
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	border-color: #a94442;
+}
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+	border-color: #843534;
+}
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #a94442;
+}
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+	color: #3c763d;
+}
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	color: #3c763d;
+}
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	border-color: #3c763d;
+}
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+	border-color: #2b542c;
+}
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #3c763d;
+}
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+	color: #31708f;
+}
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+	color: #31708f;
+}
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+	border-color: #31708f;
+}
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+	border-color: #245269;
+}
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #31708f;
+}
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+	color: #b94a48;
+	border-color: #ee5f5b;
+}
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+	padding: 17px 20px 18px;
+	margin-top: 18px;
+	margin-bottom: 18px;
+	background-color: #F0F0F0;
+	border-top: 1px solid #e5e5e5;
+	*zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-actions:after {
+	clear: both;
+}
+.help-block,
+.help-inline {
+	color: #595959;
+}
+.help-block {
+	display: block;
+	margin-bottom: 9px;
+}
+.help-inline {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: middle;
+	padding-left: 5px;
+}
+.input-append,
+.input-prepend {
+	display: inline-block;
+	margin-bottom: 9px;
+	vertical-align: middle;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-append .dropdown-menu,
+.input-append .popover,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input,
+.input-prepend .dropdown-menu,
+.input-prepend .popover {
+	font-size: 13px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 18px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	text-align: center;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #eee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .add-on,
+.input-prepend .btn,
+.input-prepend .btn-group > .dropdown-toggle {
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+	margin-left: -1px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append .btn-group:first-child {
+	margin-left: 0;
+}
+input.search-query {
+	padding-right: 14px;
+	padding-right: 4px \9;
+	padding-left: 14px;
+	padding-left: 4px \9;
+	margin-bottom: 0;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.js-stools-field-filter .input-prepend,
+.js-stools-field-filter .input-append {
+	margin-bottom: 0;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+	display: inline-block;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+	padding-left: 0;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+	float: left;
+	margin-right: 3px;
+	margin-left: 0;
+}
+.control-group {
+	margin-bottom: 9px;
+}
+legend + .control-group {
+	margin-top: 18px;
+	-webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+	margin-bottom: 18px;
+	*zoom: 1;
+}
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-horizontal .control-group:after {
+	clear: both;
+}
+.form-horizontal .control-label {
+	float: left;
+	width: 160px;
+	padding-top: 5px;
+	text-align: right;
+}
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-left: 20px;
+	margin-left: 180px;
+	*margin-left: 0;
+}
+.form-horizontal .controls:first-child {
+	*padding-left: 180px;
+}
+.form-horizontal .help-block {
+	margin-bottom: 0;
+}
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+	margin-top: 9px;
+}
+.form-horizontal .form-actions {
+	padding-left: 180px;
+}
+.control-label .hasPopover,
+.control-label .hasTooltip {
+	display: inline-block;
+}
+.subform-repeatable-wrapper .btn-group>.btn.button {
+	min-width: 0;
+}
+.subform-repeatable-wrapper .ui-sortable-helper {
+	background: #fff;
+}
+.subform-repeatable-wrapper tr.ui-sortable-helper {
+	display: table;
+}
+@media (min-width: 980px) and (max-width: 1215px) {
+	.float-cols .control-label {
+		float: none;
+	}
+	.float-cols .controls {
+		margin-left: 0;
+	}
+}
+table {
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+.table {
+	width: 100%;
+	margin-bottom: 18px;
+}
+.table th,
+.table td {
+	padding: 8px;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: top;
+	border-top: 1px solid #ddd;
+}
+.table th {
+	font-weight: bold;
+}
+.table thead th {
+	vertical-align: bottom;
+}
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+	border-top: 0;
+}
+.table tbody + tbody {
+	border-top: 2px solid #ddd;
+}
+.table .table {
+	background-color: #fff;
+}
+.table-condensed th,
+.table-condensed td {
+	padding: 4px 5px;
+}
+.table-bordered {
+	border: 1px solid #ddd;
+	border-collapse: separate;
+	*border-collapse: collapse;
+	border-left: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.table-bordered th,
+.table-bordered td {
+	border-left: 1px solid #ddd;
+}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+	border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+}
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+}
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+	-webkit-border-bottom-left-radius: 0;
+	-moz-border-radius-bottomleft: 0;
+	border-bottom-left-radius: 0;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+	-webkit-border-bottom-right-radius: 0;
+	-moz-border-radius-bottomright: 0;
+	border-bottom-right-radius: 0;
+}
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+}
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+}
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+	background-color: #f9f9f9;
+}
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+	background-color: #F0F0F0;
+}
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+	display: table-cell;
+	float: none;
+	margin-left: 0;
+}
+.table td.span1,
+.table th.span1 {
+	float: none;
+	width: 44px;
+	margin-left: 0;
+}
+.table td.span2,
+.table th.span2 {
+	float: none;
+	width: 124px;
+	margin-left: 0;
+}
+.table td.span3,
+.table th.span3 {
+	float: none;
+	width: 204px;
+	margin-left: 0;
+}
+.table td.span4,
+.table th.span4 {
+	float: none;
+	width: 284px;
+	margin-left: 0;
+}
+.table td.span5,
+.table th.span5 {
+	float: none;
+	width: 364px;
+	margin-left: 0;
+}
+.table td.span6,
+.table th.span6 {
+	float: none;
+	width: 444px;
+	margin-left: 0;
+}
+.table td.span7,
+.table th.span7 {
+	float: none;
+	width: 524px;
+	margin-left: 0;
+}
+.table td.span8,
+.table th.span8 {
+	float: none;
+	width: 604px;
+	margin-left: 0;
+}
+.table td.span9,
+.table th.span9 {
+	float: none;
+	width: 684px;
+	margin-left: 0;
+}
+.table td.span10,
+.table th.span10 {
+	float: none;
+	width: 764px;
+	margin-left: 0;
+}
+.table td.span11,
+.table th.span11 {
+	float: none;
+	width: 844px;
+	margin-left: 0;
+}
+.table td.span12,
+.table th.span12 {
+	float: none;
+	width: 924px;
+	margin-left: 0;
+}
+.table tbody tr.success > td {
+	background-color: #dff0d8;
+}
+.table tbody tr.error > td {
+	background-color: #f2dede;
+}
+.table tbody tr.warning > td {
+	background-color: #fcf8e3;
+}
+.table tbody tr.info > td {
+	background-color: #d9edf7;
+}
+.table-hover tbody tr.success:hover > td {
+	background-color: #d0e9c6;
+}
+.table-hover tbody tr.error:hover > td {
+	background-color: #ebcccc;
+}
+.table-hover tbody tr.warning:hover > td {
+	background-color: #faf2cc;
+}
+.table-hover tbody tr.info:hover > td {
+	background-color: #c4e3f3;
+}
+.table-noheader {
+	border-collapse: collapse;
+}
+.table-noheader thead {
+	display: none;
+}
+.dropup,
+.dropdown {
+	position: relative;
+}
+.dropdown-toggle {
+	*margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+	outline: 0;
+}
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	vertical-align: top;
+	border-top: 4px solid #000;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent;
+	content: "";
+}
+.dropdown .caret {
+	margin-top: 8px;
+	margin-left: 2px;
+}
+.dropdown-menu {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	list-style: none;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+	right: 0;
+	left: auto;
+}
+.dropdown-menu .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #F0F0F0;
+	border-bottom: 1px solid #fff;
+}
+.dropdown-menu .menuitem-group {
+	margin: 4px 1px;
+	overflow: hidden;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #eee;
+	background-color: #eee;
+	color: #555;
+	text-transform: capitalize;
+	font-size: 95%;
+	padding: 3px 20px;
+}
+.dropdown-menu > li > a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: normal;
+	line-height: 18px;
+	color: #333;
+	white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+	background-image: -moz-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#3071a9),to(#2a6496));
+	background-image: -webkit-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -o-linear-gradient(top,#3071a9,#2a6496);
+	background-image: linear-gradient(to bottom,#3071a9,#2a6496);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f70a9', endColorstr='#ff296395', GradientType=0);
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+	color: #333;
+	text-decoration: none;
+	outline: 0;
+	background-color: #2d6ca2;
+	background-image: -moz-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#3071a9),to(#2a6496));
+	background-image: -webkit-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -o-linear-gradient(top,#3071a9,#2a6496);
+	background-image: linear-gradient(to bottom,#3071a9,#2a6496);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f70a9', endColorstr='#ff296395', GradientType=0);
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+	color: #999;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+	text-decoration: none;
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	cursor: default;
+}
+.open {
+	*z-index: 1000;
+}
+.open > .dropdown-menu {
+	display: block;
+}
+.dropdown-backdrop {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	z-index: 990;
+}
+.pull-right > .dropdown-menu {
+	right: 0;
+	left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+	border-top: 0;
+	border-bottom: 4px solid #000;
+	content: "";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 1px;
+}
+.dropdown-submenu {
+	position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: -6px;
+	margin-left: -1px;
+	-webkit-border-radius: 6px 6px 6px 6px;
+	-moz-border-radius: 6px 6px 6px 6px;
+	border-radius: 6px 6px 6px 6px;
+}
+.dropdown-submenu:hover > .dropdown-menu {
+	display: block;
+}
+.dropup .dropdown-submenu > .dropdown-menu {
+	top: auto;
+	bottom: 0;
+	margin-top: 0;
+	margin-bottom: -2px;
+	-webkit-border-radius: 5px 5px 5px 0;
+	-moz-border-radius: 5px 5px 5px 0;
+	border-radius: 5px 5px 5px 0;
+}
+.dropdown-submenu > a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+	border-left-color: #fff;
+}
+.dropdown-submenu.pull-left {
+	float: none;
+}
+.dropdown-submenu.pull-left > .dropdown-menu {
+	left: -100%;
+	margin-left: 10px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.dropdown .dropdown-menu .nav-header {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+.typeahead {
+	z-index: 1051;
+	margin-top: 2px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #F0F0F0;
+	border: 1px solid #F0F0F0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.well blockquote {
+	border-color: #f0f0f0;
+	border-color: rgba(0,0,0,0.15);
+}
+.well-large {
+	padding: 24px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.well-small {
+	padding: 9px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-moz-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear;
+}
+.fade.in {
+	opacity: 1;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+.close {
+	float: right;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.close:hover,
+.close:focus {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+button.close {
+	padding: 3;
+	cursor: pointer;
+	background: transparent;
+	border: 0;
+	-webkit-appearance: none;
+}
+.alert-options {
+	float: right;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.alert-options:hover,
+.alert-options:focus {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+.btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 12px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 18px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	background-color: #f3f3f3;
+	color: #333;
+	border: 1px solid #b3b3b3;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.btn:hover,
+.btn:focus {
+	background-color: #e6e6e6;
+	text-decoration: none;
+	text-shadow: none;
+}
+.btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.btn.active,
+.btn:active {
+	background-image: none;
+	outline: 0;
+}
+.btn.disabled,
+.btn[disabled] {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 11px 19px;
+	font-size: 16.25px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+	margin-top: 4px;
+}
+.btn-small {
+	padding: 2px 10px;
+	font-size: 12px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+	margin-top: 0;
+}
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+	margin-top: -1px;
+}
+.btn-mini {
+	padding: 0 6px;
+	font-size: 9.75px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.btn-block {
+	display: block;
+	width: 100%;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.btn-block + .btn-block {
+	margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+	width: 100%;
+}
+.btn-primary,
+.btn-warning,
+.btn-danger,
+.btn-success,
+.btn-info,
+.btn-inverse {
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.btn-primary {
+	border: 1px solid #15497c;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #2384d3;
+}
+.btn-primary:hover,
+.btn-primary:focus {
+	background-color: #185b91;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-warning {
+	border: 1px solid #f89406;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #f89406;
+}
+.btn-warning:hover,
+.btn-warning:focus {
+	background-color: #ad6704;
+	color: #fff;
+	text-decoration: none;
+	text-shadow: none;
+}
+.btn-danger {
+	border: 1px solid #bd362f;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #bd362f;
+}
+.btn-danger:hover,
+.btn-danger:focus {
+	background-color: #802420;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-success {
+	border: 1px solid #378137;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #46a546;
+}
+.btn-success:hover,
+.btn-success:focus {
+	background-color: #2f6f2f;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-info {
+	border: 1px solid #2f96b4;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #2f96b4;
+}
+.btn-info:hover,
+.btn-info:focus {
+	background-color: #1f6377;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-inverse {
+	border: 1px solid #444;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #444;
+}
+.btn-inverse:hover,
+.btn-inverse:focus {
+	background-color: #1e1e1e;
+	color: #fff;
+	text-decoration: none;
+}
+button.btn,
+input[type="submit"].btn {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+	*padding-top: 1px;
+	*padding-bottom: 1px;
+}
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+	background-color: transparent;
+	background-image: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-link {
+	border-color: transparent;
+	cursor: pointer;
+	color: #3071a9;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-link:hover,
+.btn-link:focus {
+	color: #1f496e;
+	text-decoration: underline;
+	background-color: transparent;
+}
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+	color: #333;
+	text-decoration: none;
+}
+.btn-group {
+	position: relative;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	font-size: 0;
+	vertical-align: middle;
+	white-space: nowrap;
+	*margin-left: .3em;
+}
+.btn-group:first-child {
+	*margin-left: 0;
+}
+.btn-group .btn + .btn {
+	margin-left: -1px;
+}
+.btn-group + .btn-group {
+	margin-left: 5px;
+}
+.btn-toolbar {
+	font-size: 0;
+	margin-top: 9px;
+	margin-bottom: 9px;
+}
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+	margin-left: 5px;
+}
+.btn-group > .btn {
+	position: relative;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group > .btn-micro {
+	margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+	font-size: 13px;
+}
+.btn-group > .btn-mini {
+	font-size: 9.75px;
+}
+.btn-group > .btn-small {
+	font-size: 12px;
+}
+.btn-group > .btn-large {
+	font-size: 16.25px;
+}
+.btn-group > .btn:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.btn-group > .btn.large:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+	z-index: 2;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+	outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.btn-group.open .dropdown-toggle {
+	background-image: none;
+}
+.btn-group.open .btn.dropdown-toggle {
+	background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+	background-color: #15497c;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+	background-color: #c67605;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+	background-color: #942a25;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+	background-color: #378137;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+	background-color: #24748c;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+	background-color: #222;
+}
+.btn .caret {
+	margin-top: 8px;
+	margin-left: 0;
+}
+.btn-large .caret {
+	margin-top: 6px;
+}
+.btn-large .caret {
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+	margin-top: 8px;
+}
+.dropup .btn-large .caret {
+	border-bottom-width: 5px;
+}
+.btn-primary .caret {
+	border-top-color: #1f496e;
+	border-bottom-color: #1f496e;
+}
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.btn-group-vertical {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.btn-group-vertical > .btn {
+	display: block;
+	float: none;
+	max-width: 100%;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group-vertical > .btn + .btn {
+	margin-left: 0;
+	margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+	-webkit-border-radius: 3px 3px 0 0;
+	-moz-border-radius: 3px 3px 0 0;
+	border-radius: 3px 3px 0 0;
+}
+.btn-group-vertical > .btn:last-child {
+	-webkit-border-radius: 0 0 3px 3px;
+	-moz-border-radius: 0 0 3px 3px;
+	border-radius: 0 0 3px 3px;
+}
+.btn-group-vertical > .btn-large:first-child {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+.btn-group-vertical > .btn-large:last-child {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.alert {
+	padding: 8px 35px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	background-color: #fcf8e3;
+	border: 1px solid #faebcc;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.alert,
+.alert h4 {
+	color: #8a6d3b;
+}
+.alert h4 {
+	margin: 0 0 .5em;
+}
+.alert .close {
+	position: relative;
+	top: -2px;
+	right: -21px;
+	line-height: 18px;
+	cursor: pointer;
+}
+.alert-success {
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
+	color: #3c763d;
+}
+.alert-success h4 {
+	color: #3c763d;
+}
+.alert-danger,
+.alert-error {
+	background-color: #f2dede;
+	border-color: #ebccd1;
+	color: #a94442;
+}
+.alert-danger h4,
+.alert-error h4 {
+	color: #a94442;
+}
+.alert-info {
+	background-color: #d9edf7;
+	border-color: #bce8f1;
+	color: #31708f;
+}
+.alert-info h4 {
+	color: #31708f;
+}
+.alert-block {
+	padding-top: 14px;
+	padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+	margin-bottom: 0;
+}
+.alert-block p + p {
+	margin-top: 5px;
+}
+.nav {
+	margin-left: 0;
+	margin-bottom: 18px;
+	list-style: none;
+}
+.nav > li > a {
+	display: block;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+	text-decoration: none;
+	background-color: #eee;
+}
+.nav > li > a > img {
+	max-width: none;
+}
+.nav > .pull-right {
+	float: right;
+}
+.nav-header {
+	display: block;
+	padding: 3px 15px;
+	font-size: 11px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #999;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	text-transform: uppercase;
+}
+.nav li + .nav-header {
+	margin-top: 9px;
+}
+.nav-list {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+	margin-left: -15px;
+	margin-right: -15px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+}
+.nav-list > li > a {
+	padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
+	background-color: #3071a9;
+}
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+	margin-right: 2px;
+}
+.nav-list .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+.nav-tabs,
+.nav-pills {
+	*zoom: 1;
+}
+.nav-tabs:before,
+.nav-tabs:after,
+.nav-pills:before,
+.nav-pills:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.nav-tabs:after,
+.nav-pills:after {
+	clear: both;
+}
+.nav-tabs > li,
+.nav-pills > li {
+	float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+	padding-right: 12px;
+	padding-left: 12px;
+	margin-right: 2px;
+	line-height: 14px;
+}
+.nav-tabs {
+	border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+	margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+	border-color: #eee #eee #ddd;
+}
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+	color: #555;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent;
+	cursor: default;
+}
+.nav-pills > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	margin-top: 2px;
+	margin-bottom: 2px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+	color: #fff;
+	background-color: #3071a9;
+}
+.nav-stacked > li {
+	float: none;
+}
+.nav-stacked > li > a {
+	margin-right: 0;
+}
+.nav-tabs.nav-stacked {
+	border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+	border: 1px solid #ddd;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+	border-color: #ddd;
+	z-index: 2;
+}
+.nav-pills.nav-stacked > li > a {
+	margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+	margin-bottom: 1px;
+}
+.nav-tabs .dropdown-menu {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.nav-pills .dropdown-menu {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.nav .dropdown-toggle .caret {
+	border-top-color: #3071a9;
+	border-bottom-color: #3071a9;
+	margin-top: 6px;
+}
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+	border-top-color: #1f496e;
+	border-bottom-color: #1f496e;
+}
+.nav-tabs .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.nav .active .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+	cursor: pointer;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+	color: #fff;
+	background-color: #999;
+	border-color: #999;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+	opacity: 1;
+	filter: alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+	border-color: #999;
+}
+.tabbable {
+	*zoom: 1;
+}
+.tabbable:before,
+.tabbable:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.tabbable:after {
+	clear: both;
+}
+.tab-content {
+	overflow: auto;
+}
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+	border-bottom: 0;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+	display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+	display: block;
+}
+.tabs-below > .nav-tabs {
+	border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+	margin-top: -1px;
+	margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+	border-bottom-color: transparent;
+	border-top-color: #ddd;
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+	border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+	float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+	min-width: 74px;
+	margin-right: 0;
+	margin-bottom: 3px;
+}
+.tabs-left > .nav-tabs {
+	float: left;
+	margin-right: 19px;
+	border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-right: -1px;
+	-webkit-border-radius: 4px 0 0 4px;
+	-moz-border-radius: 4px 0 0 4px;
+	border-radius: 4px 0 0 4px;
+}
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+	border-color: #eee #ddd #eee #eee;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+	border-color: #ddd transparent #ddd #ddd;
+	*border-right-color: #fff;
+}
+.tabs-right > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+}
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+	border-color: #eee #eee #eee #ddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+	border-color: #ddd #ddd #ddd transparent;
+	*border-left-color: #fff;
+}
+.nav > .disabled > a {
+	color: #999;
+}
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+	text-decoration: none;
+	background-color: transparent;
+	cursor: default;
+}
+.navbar {
+	overflow: visible;
+	margin-bottom: 18px;
+	*position: relative;
+	*z-index: 2;
+}
+.navbar-inner {
+	min-height: 40px;
+	padding-left: 20px;
+	padding-right: 20px;
+	background-color: #fafafa;
+	background-image: -moz-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f2f2f2));
+	background-image: -webkit-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -o-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: linear-gradient(to bottom,#ffffff,#f2f2f2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+	border: 1px solid #d4d4d4;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	-moz-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	*zoom: 1;
+}
+.navbar-inner:before,
+.navbar-inner:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-inner:after {
+	clear: both;
+}
+.navbar .container {
+	width: auto;
+}
+.nav-collapse.collapse {
+	height: auto;
+	overflow: visible;
+}
+.navbar .brand {
+	float: left;
+	display: block;
+	padding: 11px 20px 11px;
+	margin-left: -20px;
+	font-size: 20px;
+	font-weight: 200;
+	color: #555;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .brand:hover,
+.navbar .brand:focus {
+	text-decoration: none;
+}
+.navbar-text {
+	margin-bottom: 0;
+	line-height: 40px;
+	color: #555;
+}
+.navbar-link {
+	color: #555;
+}
+.navbar-link:hover,
+.navbar-link:focus {
+	color: #333;
+}
+.navbar .divider-vertical {
+	height: 40px;
+	margin: 0 9px;
+	border-left: 1px solid #f2f2f2;
+	border-right: 1px solid #ffffff;
+}
+.navbar .btn,
+.navbar .btn-group {
+	margin-top: 5px;
+}
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+	margin-top: 0;
+}
+.navbar-form {
+	margin-bottom: 0;
+	*zoom: 1;
+}
+.navbar-form:before,
+.navbar-form:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-form:after {
+	clear: both;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+	margin-top: 5px;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+	display: inline-block;
+	margin-bottom: 0;
+}
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+	margin-top: 3px;
+}
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+	margin-top: 5px;
+	white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+	margin-top: 0;
+}
+.navbar-search {
+	position: relative;
+	float: left;
+	margin-top: 5px;
+	margin-bottom: 0;
+}
+.navbar-search .search-query {
+	margin-bottom: 0;
+	padding: 4px 14px;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 1;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.navbar-static-top {
+	position: static;
+	margin-bottom: 0;
+}
+.navbar-static-top .navbar-inner {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030;
+	margin-bottom: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	border-width: 0 0 1px;
+}
+.navbar-fixed-bottom .navbar-inner {
+	border-width: 1px 0 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.navbar-fixed-top {
+	top: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+	box-shadow: 0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+	box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+}
+.navbar .nav {
+	position: relative;
+	left: 0;
+	display: block;
+	float: left;
+	margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+	float: right;
+	margin-right: 0;
+}
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav > li > a {
+	float: none;
+	padding: 11px 15px 11px;
+	color: #555;
+	text-decoration: none;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+	background-color: transparent;
+	color: #333;
+	text-decoration: none;
+}
+.navbar .nav > li > a:focus {
+	outline: 2px solid #5e9ed6;
+}
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+	color: #555;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	-webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	-moz-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+}
+.navbar .btn-navbar {
+	display: none;
+	float: right;
+	padding: 7px 10px;
+	margin-left: 5px;
+	margin-right: 5px;
+	background-color: #f2f2f2;
+	*background-color: #f2f2f2;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+}
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #d9d9d9;
+	*background-color: #d9d9d9;
+}
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+	background-color: #f2f2f2;
+}
+.navbar .btn-navbar .icon-bar {
+	display: block;
+	width: 18px;
+	height: 2px;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 1px;
+	-moz-border-radius: 1px;
+	border-radius: 1px;
+	-webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	-moz-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+}
+.btn-navbar .icon-bar + .icon-bar {
+	margin-top: 3px;
+}
+.navbar .nav > li > .dropdown-menu:before {
+	content: '';
+	display: inline-block;
+	border-left: 7px solid transparent;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-bottom-color: rgba(0,0,0,0.2);
+	position: absolute;
+	top: -7px;
+	left: 9px;
+}
+.navbar .nav > li > .dropdown-menu:after {
+	content: '';
+	display: inline-block;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	position: absolute;
+	top: -6px;
+	left: 10px;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+	border-top: 7px solid #ccc;
+	border-top-color: rgba(0,0,0,0.2);
+	border-bottom: 0;
+	bottom: -7px;
+	top: auto;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+	border-top: 6px solid #fff;
+	border-bottom: 0;
+	bottom: -6px;
+	top: auto;
+}
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+	border-top-color: #333;
+	border-bottom-color: #333;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #e6e6e6;
+	color: #555;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+	left: auto;
+	right: 0;
+}
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+	left: auto;
+	right: 12px;
+}
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+	left: auto;
+	right: 13px;
+}
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+	left: auto;
+	right: 100%;
+	margin-left: 0;
+	margin-right: -1px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.navbar-inverse .navbar-inner {
+	background-color: #13294a;
+	background-image: -moz-linear-gradient(top,#152d53,#10223e);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#152d53),to(#10223e));
+	background-image: -webkit-linear-gradient(top,#152d53,#10223e);
+	background-image: -o-linear-gradient(top,#152d53,#10223e);
+	background-image: linear-gradient(to bottom,#152d53,#10223e);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff142c52', endColorstr='#ff0f213e', GradientType=0);
+	border-color: #0b172a;
+}
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+	color: #d9d9d9;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+}
+.navbar-inverse .brand:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .nav > li > a:focus {
+	color: #fff;
+}
+.navbar-inverse .brand {
+	color: #d9d9d9;
+}
+.navbar-inverse .navbar-text {
+	color: #d9d9d9;
+}
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+	background-color: transparent;
+	color: #fff;
+}
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+	color: #fff;
+	background-color: #10223e;
+}
+.navbar-inverse .navbar-link {
+	color: #d9d9d9;
+}
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+	color: #fff;
+}
+.navbar-inverse .divider-vertical {
+	border-left-color: #10223e;
+	border-right-color: #152d53;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #10223e;
+	color: #fff;
+}
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #d9d9d9;
+	border-bottom-color: #d9d9d9;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .navbar-search .search-query {
+	color: #fff;
+	background-color: #2959a4;
+	border-color: #10223e;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-webkit-transition: none;
+	-moz-transition: none;
+	-o-transition: none;
+	transition: none;
+}
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+	padding: 5px 15px;
+	color: #333;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #fff;
+	border: 0;
+	-webkit-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	-moz-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	outline: 0;
+}
+.navbar-inverse .btn-navbar {
+	background-color: #10223e;
+	*background-color: #10223e;
+}
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #050c16;
+	*background-color: #050c16;
+}
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+	background-color: #10223e;
+}
+.breadcrumb {
+	padding: 8px 15px;
+	margin: 0 0 18px;
+	list-style: none;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.breadcrumb > li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	text-shadow: 0 1px 0 #fff;
+}
+.breadcrumb > li > .divider {
+	padding: 0 5px;
+	color: #ccc;
+}
+.breadcrumb > .active {
+	color: #999;
+}
+.pagination {
+	margin: 18px 0;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-left: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination ul > li {
+	display: inline;
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
+	float: left;
+	padding: 4px 12px;
+	line-height: 18px;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-left-width: 0;
+}
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+	background-color: #F0F0F0;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+	color: #999;
+	cursor: default;
+}
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+	color: #999;
+	background-color: transparent;
+	cursor: default;
+}
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+	border-left-width: 1px;
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+	padding: 11px 19px;
+	font-size: 16.25px;
+}
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.pagination-mini ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > a,
+.pagination-small ul > li:first-child > span {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.pagination-mini ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > a,
+.pagination-small ul > li:last-child > span {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+	padding: 2px 10px;
+	font-size: 12px;
+}
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+	padding: 0 6px;
+	font-size: 9.75px;
+}
+.pager {
+	margin: 18px 0;
+	list-style: none;
+	text-align: center;
+	*zoom: 1;
+}
+.pager:before,
+.pager:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.pager:after {
+	clear: both;
+}
+.pager li {
+	display: inline;
+}
+.pager li > a,
+.pager li > span {
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.pager li > a:hover,
+.pager li > a:focus {
+	text-decoration: none;
+	background-color: #f5f5f5;
+}
+.pager .next > a,
+.pager .next > span {
+	float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+	float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+	color: #999;
+	background-color: #fff;
+	cursor: default;
+}
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000;
+}
+.modal-backdrop.fade {
+	opacity: 0;
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.modal-header {
+	padding: 9px 15px;
+	border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+	margin-top: 2px;
+}
+.modal-header h3 {
+	margin: 0;
+	line-height: 30px;
+}
+.modal-body {
+	width: 98%;
+	position: relative;
+	max-height: 400px;
+	padding: 1%;
+}
+.modal-body iframe {
+	width: 100%;
+	max-height: none;
+	border: 0 !important;
+}
+.modal-form {
+	margin-bottom: 0;
+}
+.modal-footer {
+	padding: 14px 15px 15px;
+	margin-bottom: 0;
+	text-align: right;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: inset 0 1px 0 #fff;
+	-moz-box-shadow: inset 0 1px 0 #fff;
+	box-shadow: inset 0 1px 0 #fff;
+	*zoom: 1;
+}
+.modal-footer:before,
+.modal-footer:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.modal-footer:after {
+	clear: both;
+}
+.modal-footer .btn + .btn {
+	margin-left: 5px;
+	margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+	margin-left: -1px;
+}
+.modal-footer .btn-block + .btn-block {
+	margin-left: 0;
+}
+.tooltip {
+	position: absolute;
+	z-index: 1030;
+	display: block;
+	visibility: visible;
+	font-size: 11px;
+	line-height: 1.4;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+.tooltip.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top: -3px;
+	padding: 5px 0;
+}
+.tooltip.right {
+	margin-left: 3px;
+	padding: 0 5px;
+}
+.tooltip.bottom {
+	margin-top: 3px;
+	padding: 5px 0;
+}
+.tooltip.left {
+	margin-left: -3px;
+	padding: 0 5px;
+}
+.tooltip-inner {
+	max-width: 200px;
+	padding: 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
+}
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1060;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	text-align: left;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	white-space: normal;
+}
+.popover.top {
+	margin-top: -10px;
+}
+.popover.right {
+	margin-left: 10px;
+}
+.popover.bottom {
+	margin-top: 10px;
+}
+.popover.left {
+	margin-left: -10px;
+}
+.popover-title {
+	margin: 0;
+	padding: 8px 14px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.popover-title:empty {
+	display: none;
+}
+.popover-content {
+	padding: 9px 14px;
+}
+.popover .arrow,
+.popover .arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.popover .arrow {
+	border-width: 11px;
+}
+.popover .arrow:after {
+	border-width: 10px;
+	content: "";
+}
+.popover.top .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-bottom-width: 0;
+	border-top-color: #999;
+	border-top-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+}
+.popover.top .arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	border-bottom-width: 0;
+	border-top-color: #fff;
+}
+.popover.right .arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-left-width: 0;
+	border-right-color: #999;
+	border-right-color: rgba(0,0,0,0.25);
+}
+.popover.right .arrow:after {
+	left: 1px;
+	bottom: -10px;
+	border-left-width: 0;
+	border-right-color: #fff;
+}
+.popover.bottom .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0,0,0,0.25);
+	top: -11px;
+}
+.popover.bottom .arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	border-top-width: 0;
+	border-bottom-color: #fff;
+}
+.popover.left .arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0,0,0,0.25);
+}
+.popover.left .arrow:after {
+	right: 1px;
+	border-right-width: 0;
+	border-left-color: #fff;
+	bottom: -10px;
+}
+.thumbnails {
+	margin-left: -20px;
+	list-style: none;
+	*zoom: 1;
+}
+.thumbnails:before,
+.thumbnails:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.thumbnails:after {
+	clear: both;
+}
+.row-fluid .thumbnails {
+	margin-left: 0;
+}
+.thumbnails > li {
+	float: left;
+	margin-bottom: 18px;
+	margin-left: 20px;
+}
+.thumbnail {
+	display: block;
+	padding: 4px;
+	line-height: 18px;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-webkit-transition: all .2s ease-in-out;
+	-moz-transition: all .2s ease-in-out;
+	-o-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out;
+}
+a.thumbnail:hover,
+a.thumbnail:focus {
+	border-color: #3071a9;
+	-webkit-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	-moz-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+}
+.thumbnail > img {
+	display: block;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+.thumbnail .caption {
+	padding: 9px;
+	color: #555;
+}
+.media,
+.media-body {
+	overflow: hidden;
+	*overflow: visible;
+	zoom: 1;
+}
+.media,
+.media .media {
+	margin-top: 15px;
+}
+.media:first-child {
+	margin-top: 0;
+}
+.media-object {
+	display: block;
+}
+.media-heading {
+	margin: 0 0 5px;
+}
+.media > .pull-left {
+	margin-right: 10px;
+}
+.media > .pull-right {
+	margin-left: 10px;
+}
+.media-list {
+	margin-left: 0;
+	list-style: none;
+}
+.label,
+.badge {
+	display: inline-block;
+	padding: 2px 4px;
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #fff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999;
+}
+.label {
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding-left: 9px;
+	padding-right: 9px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+	display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #a94442;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #843534;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #3c763d;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #2b542c;
+}
+.label-info,
+.badge-info {
+	background-color: #31708f;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #245269;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+@-webkit-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-moz-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-ms-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-o-keyframes progress-bar-stripes {
+	from {
+		background-position: 0 0;
+	}
+	to {
+		background-position: 40px 0;
+	}
+}
+@keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+.progress {
+	overflow: hidden;
+	height: 18px;
+	margin-bottom: 18px;
+	background-color: #f7f7f7;
+	background-image: -moz-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -o-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: linear-gradient(to bottom,#f5f5f5,#f9f9f9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.progress .bar {
+	width: 0%;
+	height: 100%;
+	color: #fff;
+	float: left;
+	font-size: 12px;
+	text-align: center;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #0e90d2;
+	background-image: -moz-linear-gradient(top,#149bdf,#0480be);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
+	background-image: -webkit-linear-gradient(top,#149bdf,#0480be);
+	background-image: -o-linear-gradient(top,#149bdf,#0480be);
+	background-image: linear-gradient(to bottom,#149bdf,#0480be);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-transition: width .6s ease;
+	-moz-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease;
+}
+.progress .bar + .bar {
+	-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+}
+.progress-striped .bar {
+	background-color: #149bdf;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	-webkit-background-size: 40px 40px;
+	-moz-background-size: 40px 40px;
+	-o-background-size: 40px 40px;
+	background-size: 40px 40px;
+}
+.progress.active .bar {
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	-moz-animation: progress-bar-stripes 2s linear infinite;
+	-ms-animation: progress-bar-stripes 2s linear infinite;
+	-o-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar,
+.progress .bar-danger {
+	background-color: #dd514c;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: linear-gradient(to bottom,#ee5f5b,#c43c35);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+	background-color: #ee5f5b;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-success .bar,
+.progress .bar-success {
+	background-color: #5eb95e;
+	background-image: -moz-linear-gradient(top,#62c462,#57a957);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+	background-image: -webkit-linear-gradient(top,#62c462,#57a957);
+	background-image: -o-linear-gradient(top,#62c462,#57a957);
+	background-image: linear-gradient(to bottom,#62c462,#57a957);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+	background-color: #62c462;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-info .bar,
+.progress .bar-info {
+	background-color: #4bb1cf;
+	background-image: -moz-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -o-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: linear-gradient(to bottom,#5bc0de,#339bb9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+	background-color: #5bc0de;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-warning .bar,
+.progress .bar-warning {
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+	background-color: #fbb450;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.accordion {
+	margin-bottom: 18px;
+}
+.accordion-group {
+	margin-bottom: 2px;
+	border: 1px solid #e5e5e5;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.accordion-heading {
+	border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+	display: block;
+	padding: 8px 15px;
+}
+.accordion-toggle {
+	cursor: pointer;
+}
+.accordion-inner {
+	padding: 9px 15px;
+	border-top: 1px solid #e5e5e5;
+}
+.carousel {
+	position: relative;
+	margin-bottom: 18px;
+	line-height: 1;
+}
+.carousel-inner {
+	overflow: hidden;
+	width: 100%;
+	position: relative;
+}
+.carousel-inner > .item {
+	display: none;
+	position: relative;
+	-webkit-transition: .6s ease-in-out left;
+	-moz-transition: .6s ease-in-out left;
+	-o-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left;
+}
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+	display: block;
+	line-height: 1;
+}
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+	display: block;
+}
+.carousel-inner > .active {
+	left: 0;
+}
+.carousel-inner > .next,
+.carousel-inner > .prev {
+	position: absolute;
+	top: 0;
+	width: 100%;
+}
+.carousel-inner > .next {
+	left: 100%;
+}
+.carousel-inner > .prev {
+	left: -100%;
+}
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+	left: 0;
+}
+.carousel-inner > .active.left {
+	left: -100%;
+}
+.carousel-inner > .active.right {
+	left: 100%;
+}
+.carousel-control {
+	position: absolute;
+	top: 40%;
+	left: 15px;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	font-size: 60px;
+	font-weight: 100;
+	line-height: 30px;
+	color: #fff;
+	text-align: center;
+	background: #222;
+	border: 3px solid #fff;
+	-webkit-border-radius: 23px;
+	-moz-border-radius: 23px;
+	border-radius: 23px;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+.carousel-control.right {
+	left: auto;
+	right: 15px;
+}
+.carousel-control:hover,
+.carousel-control:focus {
+	color: #fff;
+	text-decoration: none;
+	opacity: 0.9;
+	filter: alpha(opacity=90);
+}
+.carousel-indicators {
+	position: absolute;
+	top: 15px;
+	right: 15px;
+	z-index: 5;
+	margin: 0;
+	list-style: none;
+}
+.carousel-indicators li {
+	display: block;
+	float: left;
+	width: 10px;
+	height: 10px;
+	margin-left: 5px;
+	text-indent: -999px;
+	background-color: #ccc;
+	background-color: rgba(255,255,255,0.25);
+	border-radius: 5px;
+}
+.carousel-indicators .active {
+	background-color: #fff;
+}
+.carousel-caption {
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 15px;
+	background: #333;
+	background: rgba(0,0,0,0.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+	color: #fff;
+	line-height: 18px;
+}
+.carousel-caption h4 {
+	margin: 0 0 5px;
+}
+.carousel-caption p {
+	margin-bottom: 0;
+}
+.hero-unit {
+	padding: 60px;
+	margin-bottom: 30px;
+	font-size: 18px;
+	font-weight: 200;
+	line-height: 27px;
+	color: inherit;
+	background-color: #eee;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.hero-unit h1 {
+	margin-bottom: 0;
+	font-size: 60px;
+	line-height: 1;
+	color: inherit;
+	letter-spacing: -1px;
+}
+.hero-unit li {
+	line-height: 27px;
+}
+.pull-right {
+	float: right;
+}
+.pull-left {
+	float: left;
+}
+.hide {
+	display: none;
+}
+.show {
+	display: block;
+}
+.invisible {
+	visibility: hidden;
+}
+.affix {
+	position: fixed;
+}
+@-ms-viewport {
+	width: device-width;
+}
+.hidden {
+	display: none;
+	visibility: hidden;
+}
+.visible-phone {
+	display: none !important;
+}
+.visible-tablet {
+	display: none !important;
+}
+.hidden-desktop {
+	display: none !important;
+}
+.visible-desktop {
+	display: inherit !important;
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-tablet {
+		display: inherit !important;
+	}
+	.hidden-tablet {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-phone {
+		display: inherit !important;
+	}
+	.hidden-phone {
+		display: none !important;
+	}
+}
+.visible-print {
+	display: none !important;
+}
+@media print {
+	.visible-print {
+		display: inherit !important;
+	}
+	.hidden-print {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	body {
+		padding-left: 20px;
+		padding-right: 20px;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom,
+	.navbar-static-top {
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+	.container-fluid {
+		padding: 0;
+	}
+	.dl-horizontal dt {
+		float: none;
+		clear: none;
+		width: auto;
+		text-align: left;
+	}
+	.dl-horizontal dd {
+		margin-left: 0;
+	}
+	.dropdown-menu .menuitem-group {
+		background-color: #10223e;
+		color: #eee;
+	}
+	.container {
+		width: auto;
+	}
+	.row-fluid {
+		width: 100%;
+	}
+	.row,
+	.thumbnails {
+		margin-left: 0;
+	}
+	.thumbnails > li {
+		float: none;
+		margin-left: 0;
+	}
+	[class*="span"],
+	.uneditable-input[class*="span"],
+	.row-fluid [class*="span"] {
+		float: none;
+		display: block;
+		width: 100%;
+		margin-left: 0;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.span12,
+	.row-fluid .span12 {
+		width: 100%;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.row-fluid [class*="offset"]:first-child {
+		margin-left: 0;
+	}
+	.input-large,
+	.input-xlarge,
+	.input-xxlarge,
+	input[class*="span"],
+	select[class*="span"],
+	textarea[class*="span"],
+	.uneditable-input {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.input-prepend input,
+	.input-append input,
+	.input-prepend input[class*="span"],
+	.input-append input[class*="span"] {
+		display: inline-block;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 0;
+	}
+}
+@media (max-width: 480px) {
+	.nav-collapse {
+		-webkit-transform: translate3d(0,0,0);
+	}
+	.page-header h1 small {
+		display: block;
+		line-height: 18px;
+	}
+	input[type="checkbox"],
+	input[type="radio"] {
+		border: 1px solid #ccc;
+	}
+	.form-horizontal .control-label {
+		float: none;
+		width: auto;
+		padding-top: 0;
+		text-align: left;
+	}
+	.form-horizontal .controls {
+		margin-left: 0;
+	}
+	.form-horizontal .control-list {
+		padding-top: 0;
+	}
+	.form-horizontal .form-actions {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+	.tag-category input#filter-search,
+	.newsfeed-category input#filter-search {
+		width: auto;
+		margin-bottom: 9px;
+	}
+	.category-list input#filter-search {
+		width: auto;
+	}
+	.media .pull-left,
+	.media .pull-right {
+		float: none;
+		display: block;
+		margin-bottom: 10px;
+	}
+	.media-object {
+		margin-right: 0;
+		margin-left: 0;
+	}
+	.modal-header .close {
+		padding: 10px;
+		margin: -10px;
+	}
+	.carousel-caption {
+		position: static;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.row {
+		margin-left: -20px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		min-height: 1px;
+		margin-left: 20px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 724px;
+	}
+	.span12 {
+		width: 724px;
+	}
+	.span11 {
+		width: 662px;
+	}
+	.span10 {
+		width: 600px;
+	}
+	.span9 {
+		width: 538px;
+	}
+	.span8 {
+		width: 476px;
+	}
+	.span7 {
+		width: 414px;
+	}
+	.span6 {
+		width: 352px;
+	}
+	.span5 {
+		width: 290px;
+	}
+	.span4 {
+		width: 228px;
+	}
+	.span3 {
+		width: 166px;
+	}
+	.span2 {
+		width: 104px;
+	}
+	.span1 {
+		width: 42px;
+	}
+	.offset12 {
+		margin-left: 764px;
+	}
+	.offset11 {
+		margin-left: 702px;
+	}
+	.offset10 {
+		margin-left: 640px;
+	}
+	.offset9 {
+		margin-left: 578px;
+	}
+	.offset8 {
+		margin-left: 516px;
+	}
+	.offset7 {
+		margin-left: 454px;
+	}
+	.offset6 {
+		margin-left: 392px;
+	}
+	.offset5 {
+		margin-left: 330px;
+	}
+	.offset4 {
+		margin-left: 268px;
+	}
+	.offset3 {
+		margin-left: 206px;
+	}
+	.offset2 {
+		margin-left: 144px;
+	}
+	.offset1 {
+		margin-left: 82px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.76243094%;
+		*margin-left: 2.70923945%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .controls-row [class*="span"] + [class*="span"] {
+		margin-left: 2.76243094%;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.94680851%;
+	}
+	.row-fluid .span11 {
+		width: 91.43646409%;
+		*width: 91.3832726%;
+	}
+	.row-fluid .span10 {
+		width: 82.87292818%;
+		*width: 82.81973669%;
+	}
+	.row-fluid .span9 {
+		width: 74.30939227%;
+		*width: 74.25620078%;
+	}
+	.row-fluid .span8 {
+		width: 65.74585635%;
+		*width: 65.69266486%;
+	}
+	.row-fluid .span7 {
+		width: 57.18232044%;
+		*width: 57.12912895%;
+	}
+	.row-fluid .span6 {
+		width: 48.61878453%;
+		*width: 48.56559304%;
+	}
+	.row-fluid .span5 {
+		width: 40.05524862%;
+		*width: 40.00205713%;
+	}
+	.row-fluid .span4 {
+		width: 31.49171271%;
+		*width: 31.43852122%;
+	}
+	.row-fluid .span3 {
+		width: 22.9281768%;
+		*width: 22.87498531%;
+	}
+	.row-fluid .span2 {
+		width: 14.36464088%;
+		*width: 14.31144939%;
+	}
+	.row-fluid .span1 {
+		width: 5.80110497%;
+		*width: 5.74791348%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 105.52486188%;
+		*margin-left: 105.4184789%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.76243094%;
+		*margin-left: 102.65604796%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 96.96132597%;
+		*margin-left: 96.85494299%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 94.19889503%;
+		*margin-left: 94.09251205%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 88.39779006%;
+		*margin-left: 88.29140708%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.63535912%;
+		*margin-left: 85.52897614%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 79.83425414%;
+		*margin-left: 79.72787116%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 77.0718232%;
+		*margin-left: 76.96544023%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 71.27071823%;
+		*margin-left: 71.16433525%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.50828729%;
+		*margin-left: 68.40190431%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 62.70718232%;
+		*margin-left: 62.60079934%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.94475138%;
+		*margin-left: 59.8383684%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 54.14364641%;
+		*margin-left: 54.03726343%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.38121547%;
+		*margin-left: 51.27483249%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 45.5801105%;
+		*margin-left: 45.47372752%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.81767956%;
+		*margin-left: 42.71129658%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 37.01657459%;
+		*margin-left: 36.91019161%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.25414365%;
+		*margin-left: 34.14776067%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 28.45303867%;
+		*margin-left: 28.3466557%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.69060773%;
+		*margin-left: 25.58422476%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.88950276%;
+		*margin-left: 19.78311978%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.12707182%;
+		*margin-left: 17.02068884%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 11.32596685%;
+		*margin-left: 11.21958387%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.56353591%;
+		*margin-left: 8.45715293%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 20px;
+	}
+	input.span12,
+	textarea.span12,
+	.uneditable-input.span12 {
+		width: 710px;
+	}
+	input.span11,
+	textarea.span11,
+	.uneditable-input.span11 {
+		width: 648px;
+	}
+	input.span10,
+	textarea.span10,
+	.uneditable-input.span10 {
+		width: 586px;
+	}
+	input.span9,
+	textarea.span9,
+	.uneditable-input.span9 {
+		width: 524px;
+	}
+	input.span8,
+	textarea.span8,
+	.uneditable-input.span8 {
+		width: 462px;
+	}
+	input.span7,
+	textarea.span7,
+	.uneditable-input.span7 {
+		width: 400px;
+	}
+	input.span6,
+	textarea.span6,
+	.uneditable-input.span6 {
+		width: 338px;
+	}
+	input.span5,
+	textarea.span5,
+	.uneditable-input.span5 {
+		width: 276px;
+	}
+	input.span4,
+	textarea.span4,
+	.uneditable-input.span4 {
+		width: 214px;
+	}
+	input.span3,
+	textarea.span3,
+	.uneditable-input.span3 {
+		width: 152px;
+	}
+	input.span2,
+	textarea.span2,
+	.uneditable-input.span2 {
+		width: 90px;
+	}
+	input.span1,
+	textarea.span1,
+	.uneditable-input.span1 {
+		width: 28px;
+	}
+}
+@media (min-width: 1200px) {
+	.row {
+		margin-left: -30px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		min-height: 1px;
+		margin-left: 30px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 1170px;
+	}
+	.span12 {
+		width: 1170px;
+	}
+	.span11 {
+		width: 1070px;
+	}
+	.span10 {
+		width: 970px;
+	}
+	.span9 {
+		width: 870px;
+	}
+	.span8 {
+		width: 770px;
+	}
+	.span7 {
+		width: 670px;
+	}
+	.span6 {
+		width: 570px;
+	}
+	.span5 {
+		width: 470px;
+	}
+	.span4 {
+		width: 370px;
+	}
+	.span3 {
+		width: 270px;
+	}
+	.span2 {
+		width: 170px;
+	}
+	.span1 {
+		width: 70px;
+	}
+	.offset12 {
+		margin-left: 1230px;
+	}
+	.offset11 {
+		margin-left: 1130px;
+	}
+	.offset10 {
+		margin-left: 1030px;
+	}
+	.offset9 {
+		margin-left: 930px;
+	}
+	.offset8 {
+		margin-left: 830px;
+	}
+	.offset7 {
+		margin-left: 730px;
+	}
+	.offset6 {
+		margin-left: 630px;
+	}
+	.offset5 {
+		margin-left: 530px;
+	}
+	.offset4 {
+		margin-left: 430px;
+	}
+	.offset3 {
+		margin-left: 330px;
+	}
+	.offset2 {
+		margin-left: 230px;
+	}
+	.offset1 {
+		margin-left: 130px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.76243094%;
+		*margin-left: 2.70923945%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .controls-row [class*="span"] + [class*="span"] {
+		margin-left: 2.76243094%;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.94680851%;
+	}
+	.row-fluid .span11 {
+		width: 91.43646409%;
+		*width: 91.3832726%;
+	}
+	.row-fluid .span10 {
+		width: 82.87292818%;
+		*width: 82.81973669%;
+	}
+	.row-fluid .span9 {
+		width: 74.30939227%;
+		*width: 74.25620078%;
+	}
+	.row-fluid .span8 {
+		width: 65.74585635%;
+		*width: 65.69266486%;
+	}
+	.row-fluid .span7 {
+		width: 57.18232044%;
+		*width: 57.12912895%;
+	}
+	.row-fluid .span6 {
+		width: 48.61878453%;
+		*width: 48.56559304%;
+	}
+	.row-fluid .span5 {
+		width: 40.05524862%;
+		*width: 40.00205713%;
+	}
+	.row-fluid .span4 {
+		width: 31.49171271%;
+		*width: 31.43852122%;
+	}
+	.row-fluid .span3 {
+		width: 22.9281768%;
+		*width: 22.87498531%;
+	}
+	.row-fluid .span2 {
+		width: 14.36464088%;
+		*width: 14.31144939%;
+	}
+	.row-fluid .span1 {
+		width: 5.80110497%;
+		*width: 5.74791348%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 105.52486188%;
+		*margin-left: 105.4184789%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.76243094%;
+		*margin-left: 102.65604796%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 96.96132597%;
+		*margin-left: 96.85494299%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 94.19889503%;
+		*margin-left: 94.09251205%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 88.39779006%;
+		*margin-left: 88.29140708%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.63535912%;
+		*margin-left: 85.52897614%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 79.83425414%;
+		*margin-left: 79.72787116%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 77.0718232%;
+		*margin-left: 76.96544023%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 71.27071823%;
+		*margin-left: 71.16433525%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.50828729%;
+		*margin-left: 68.40190431%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 62.70718232%;
+		*margin-left: 62.60079934%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.94475138%;
+		*margin-left: 59.8383684%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 54.14364641%;
+		*margin-left: 54.03726343%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.38121547%;
+		*margin-left: 51.27483249%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 45.5801105%;
+		*margin-left: 45.47372752%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.81767956%;
+		*margin-left: 42.71129658%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 37.01657459%;
+		*margin-left: 36.91019161%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.25414365%;
+		*margin-left: 34.14776067%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 28.45303867%;
+		*margin-left: 28.3466557%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.69060773%;
+		*margin-left: 25.58422476%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.88950276%;
+		*margin-left: 19.78311978%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.12707182%;
+		*margin-left: 17.02068884%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 11.32596685%;
+		*margin-left: 11.21958387%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.56353591%;
+		*margin-left: 8.45715293%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 30px;
+	}
+	input.span12,
+	textarea.span12,
+	.uneditable-input.span12 {
+		width: 1156px;
+	}
+	input.span11,
+	textarea.span11,
+	.uneditable-input.span11 {
+		width: 1056px;
+	}
+	input.span10,
+	textarea.span10,
+	.uneditable-input.span10 {
+		width: 956px;
+	}
+	input.span9,
+	textarea.span9,
+	.uneditable-input.span9 {
+		width: 856px;
+	}
+	input.span8,
+	textarea.span8,
+	.uneditable-input.span8 {
+		width: 756px;
+	}
+	input.span7,
+	textarea.span7,
+	.uneditable-input.span7 {
+		width: 656px;
+	}
+	input.span6,
+	textarea.span6,
+	.uneditable-input.span6 {
+		width: 556px;
+	}
+	input.span5,
+	textarea.span5,
+	.uneditable-input.span5 {
+		width: 456px;
+	}
+	input.span4,
+	textarea.span4,
+	.uneditable-input.span4 {
+		width: 356px;
+	}
+	input.span3,
+	textarea.span3,
+	.uneditable-input.span3 {
+		width: 256px;
+	}
+	input.span2,
+	textarea.span2,
+	.uneditable-input.span2 {
+		width: 156px;
+	}
+	input.span1,
+	textarea.span1,
+	.uneditable-input.span1 {
+		width: 56px;
+	}
+	.thumbnails {
+		margin-left: -30px;
+	}
+	.thumbnails > li {
+		margin-left: 30px;
+	}
+	.row-fluid .thumbnails {
+		margin-left: 0;
+	}
+}
+@media (max-width: 767px) {
+	body {
+		padding-top: 0;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom {
+		position: static;
+	}
+	.navbar-fixed-top {
+		margin-bottom: 18px;
+	}
+	.navbar-fixed-bottom {
+		margin-top: 18px;
+	}
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-bottom .navbar-inner {
+		padding: 5px;
+	}
+	.navbar .container {
+		width: auto;
+		padding: 0;
+	}
+	.navbar .brand {
+		padding-left: 10px;
+		padding-right: 10px;
+		margin: 0 0 0 -5px;
+	}
+	.nav-collapse {
+		clear: both;
+	}
+	.nav-collapse .nav {
+		float: none;
+		margin: 0 0 9px;
+	}
+	.nav-collapse .nav > li {
+		float: none;
+	}
+	.nav-collapse .nav > li > a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > .divider-vertical {
+		display: none;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #555;
+		text-shadow: none;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		padding: 9px 15px;
+		font-weight: bold;
+		color: #555;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+	}
+	.nav-collapse .btn {
+		padding: 4px 10px 4px;
+		font-weight: normal;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > li > a:hover,
+	.nav-collapse .nav > li > a:focus,
+	.nav-collapse .dropdown-menu a:hover,
+	.nav-collapse .dropdown-menu a:focus {
+		background-color: #f2f2f2;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a,
+	.navbar-inverse .nav-collapse .dropdown-menu a {
+		color: #d9d9d9;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a:hover,
+	.navbar-inverse .nav-collapse .nav > li > a:focus,
+	.navbar-inverse .nav-collapse .dropdown-menu a:hover,
+	.navbar-inverse .nav-collapse .dropdown-menu a:focus {
+		background-color: #10223e;
+	}
+	.nav-collapse.in .btn-group {
+		margin-top: 5px;
+		padding: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		position: static;
+		top: auto;
+		left: auto;
+		float: none;
+		display: none;
+		max-width: none;
+		margin: 0 15px;
+		padding: 0;
+		background-color: transparent;
+		border: none;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+	.nav-collapse .open > .dropdown-menu {
+		display: block;
+	}
+	.nav-collapse .dropdown-menu:before,
+	.nav-collapse .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu .divider {
+		display: none;
+	}
+	.nav-collapse .nav > li > .dropdown-menu:before,
+	.nav-collapse .nav > li > .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		float: none;
+		padding: 9px 15px;
+		margin: 9px 0;
+		border-top: 1px solid #f2f2f2;
+		border-bottom: 1px solid #f2f2f2;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+	}
+	.navbar-inverse .nav-collapse .navbar-form,
+	.navbar-inverse .nav-collapse .navbar-search {
+		border-top-color: #10223e;
+		border-bottom-color: #10223e;
+	}
+	.navbar .nav-collapse .nav.pull-right {
+		float: none;
+		margin-left: 0;
+	}
+	.nav-collapse,
+	.nav-collapse.collapse {
+		overflow: hidden;
+		height: 0;
+	}
+	.navbar .btn-navbar {
+		display: block;
+	}
+	.navbar-static .navbar-inner {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 768px) {
+	.nav-collapse.collapse {
+		height: auto !important;
+		overflow: visible !important;
+	}
+}
+.small {
+	font-size: 11px;
+}
+iframe,
+svg {
+	max-width: 100%;
+}
+.nowrap {
+	white-space: nowrap;
+}
+.center,
+.table td.center,
+.table th.center {
+	text-align: center;
+}
+a.disabled,
+a.disabled:hover {
+	color: #999999;
+	background-color: transparent;
+	cursor: default;
+	text-decoration: none;
+}
+.hero-unit {
+	text-align: center;
+}
+.hero-unit .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+.btn .caret {
+	margin-bottom: 7px;
+}
+.btn.btn-micro .caret {
+	margin: 5px 0;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+body.modal {
+	padding-top: 0;
+}
+.row-even,
+.row-odd {
+	padding: 5px;
+	width: 99%;
+	border-bottom: 1px solid #ddd;
+}
+.row-odd {
+	background-color: transparent;
+}
+.row-even {
+	background-color: #f9f9f9;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .row-reveal {
+	visibility: hidden;
+}
+.row-fluid:hover .row-reveal {
+	visibility: visible;
+}
+.btn-wide {
+	width: 80%;
+}
+.nav-list > li.offset > a {
+	padding-left: 30px;
+	font-size: 12px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .offset1 {
+	margin-left: 8.382978723%;
+}
+.row-fluid .offset2 {
+	margin-left: 16.89361702%;
+}
+.row-fluid .offset3 {
+	margin-left: 25.404255317%;
+}
+.row-fluid .offset4 {
+	margin-left: 33.914893614%;
+}
+.row-fluid .offset5 {
+	margin-left: 42.425531911%;
+}
+.row-fluid .offset6 {
+	margin-left: 50.93617020799999%;
+}
+.row-fluid .offset7 {
+	margin-left: 59.446808505%;
+}
+.row-fluid .offset8 {
+	margin-left: 67.95744680199999%;
+}
+.row-fluid .offset9 {
+	margin-left: 76.468085099%;
+}
+.row-fluid .offset10 {
+	margin-left: 84.97872339599999%;
+}
+.row-fluid .offset11 {
+	margin-left: 91.489361693%;
+}
+.navbar .nav > li > a.btn {
+	padding: 4px 10px;
+	line-height: 18px;
+}
+.nav-tabs.nav-dark {
+	border-bottom: 1px solid #333;
+	text-shadow: 1px 1px 1px #000;
+}
+.nav-tabs.nav-dark > li > a {
+	color: #F8F8F8;
+}
+.nav-tabs.nav-dark > li > a:hover {
+	border-color: #333 #333 #111;
+	background-color: #777777;
+}
+.nav-tabs.nav-dark > .active > a,
+.nav-tabs.nav-dark > .active > a:hover {
+	color: #ffffff;
+	background-color: #555555;
+	border: 1px solid #222;
+	border-bottom-color: transparent;
+}
+.thumbnail.pull-left {
+	margin: 0 10px 10px 0;
+}
+.thumbnail.pull-right {
+	margin: 0 0 10px 10px;
+}
+.width-10 {
+	width: 10px;
+}
+.width-20 {
+	width: 20px;
+}
+.width-30 {
+	width: 30px;
+}
+.width-40 {
+	width: 40px;
+}
+.width-50 {
+	width: 50px;
+}
+.width-60 {
+	width: 60px;
+}
+.width-70 {
+	width: 70px;
+}
+.width-80 {
+	width: 80px;
+}
+.width-90 {
+	width: 90px;
+}
+.width-100 {
+	width: 100px;
+}
+.height-10 {
+	height: 10px;
+}
+.height-20 {
+	height: 20px;
+}
+.height-30 {
+	height: 30px;
+}
+.height-40 {
+	height: 40px;
+}
+.height-50 {
+	height: 50px;
+}
+.height-60 {
+	height: 60px;
+}
+.height-70 {
+	height: 70px;
+}
+.height-80 {
+	height: 80px;
+}
+.height-90 {
+	height: 90px;
+}
+.height-100 {
+	height: 100px;
+}
+hr.hr-condensed {
+	margin: 10px 0;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #ddd;
+	margin-left: 0;
+}
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #ddd;
+	padding: 8px;
+}
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #F0F0F0;
+}
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box;
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.row-striped .row-fluid [class*="span"] {
+	margin-left: 8px;
+}
+.row-striped .row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.list-condensed li {
+	padding: 4px 5px;
+}
+.row-condensed .row,
+.row-condensed .row-fluid {
+	padding: 4px 5px;
+}
+.list-bordered,
+.row-bordered {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	margin-left: 0;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.radio.btn-group input[type=radio] {
+	display: none;
+}
+.radio.btn-group > label {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.radio.btn-group {
+	padding-left: 0;
+}
+.iframe-bordered {
+	border: 1px solid #ddd;
+}
+.tab-content {
+	overflow: visible;
+}
+.tabs-left .tab-content {
+	overflow: auto;
+}
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+.btn-group > .btn-micro {
+	font-size: 10px;
+}
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+.page-header {
+	margin: 2px 0px 10px 0px;
+	padding-bottom: 5px;
+}
+.input-prepend > .add-on,
+.input-append > .add-on {
+	vertical-align: top;
+}
+.input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0 3px 0 0;
+	-moz-border-radius: 0 3px 0 0;
+	border-radius: 0 3px 0 0;
+}
+.input-append .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 3px 0 0 0;
+	-moz-border-radius: 3px 0 0 0;
+	border-radius: 3px 0 0 0;
+}
+.input-prepend.input-append .chzn-container-single .chzn-single,
+.input-prepend.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
+.form-vertical .control-label {
+	float: none;
+	width: auto;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: left;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+.width-auto {
+	width: auto;
+}
+.btn-group .chzn-results {
+	white-space: normal;
+}
+.accordion-body.in:hover {
+	overflow: visible;
+}
+.invalid {
+	color: #9d261d;
+	font-weight: bold;
+}
+input.invalid {
+	border: 1px solid #9d261d;
+	background: #f2dede;
+}
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: #9d261d;
+	color: #9d261d;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+.tip-text {
+	text-align: left;
+}
+.btn-group > .btn + .dropdown-backdrop + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-backdrop + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.dropdown-menu {
+	text-align: left;
+}
+.alert-link {
+	font-weight: bold;
+}
+.alert .alert-link {
+	color: #66512c;
+}
+.alert-success .alert-link {
+	color: #2b542c;
+}
+.alert-danger .alert-link,
+.alert-error .alert-link {
+	color: #843534;
+}
+.alert-info .alert-link {
+	color: #245269;
+}
+div.modal {
+	position: fixed;
+	top: 5%;
+	left: 50%;
+	z-index: 1050;
+	width: 80%;
+	margin-left: -40%;
+	background-color: #fff;
+	border: 1px solid #999;
+	border: 1px solid rgba(0,0,0,0.3);
+	*border: 1px solid #999;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+	outline: none;
+}
+div.modal.fade {
+	-webkit-transition: opacity .3s linear, top .3s ease-out;
+	-moz-transition: opacity .3s linear, top .3s ease-out;
+	-o-transition: opacity .3s linear, top .3s ease-out;
+	transition: opacity .3s linear, top .3s ease-out;
+	top: -25%;
+}
+div.modal.fade.in {
+	top: 5%;
+}
+.modal-batch {
+	overflow-y: visible;
+}
+.modal-body[class^="jviewport-height"],
+.modal-body[class*="jviewport-height"] {
+	max-height: none;
+}
+.jviewport-height10 {
+	height: 10vh;
+}
+.jviewport-height20 {
+	height: 20vh;
+}
+.jviewport-height30 {
+	height: 30vh;
+}
+.jviewport-height40 {
+	height: 40vh;
+}
+.jviewport-height50 {
+	height: 50vh;
+}
+.jviewport-height60 {
+	height: 60vh;
+}
+.jviewport-height70 {
+	height: 70vh;
+}
+.jviewport-height80 {
+	height: 80vh;
+}
+.jviewport-height90 {
+	height: 90vh;
+}
+.jviewport-height100 {
+	height: 100vh;
+}
+div.modal.jviewport-width10 {
+	width: 10vw;
+	margin-left: -5vw;
+}
+div.modal.jviewport-width20 {
+	width: 20vw;
+	margin-left: -10vw;
+}
+div.modal.jviewport-width30 {
+	width: 30vw;
+	margin-left: -15vw;
+}
+div.modal.jviewport-width40 {
+	width: 40vw;
+	margin-left: -20vw;
+}
+div.modal.jviewport-width50 {
+	width: 50vw;
+	margin-left: -25vw;
+}
+div.modal.jviewport-width60 {
+	width: 60vw;
+	margin-left: -30vw;
+}
+div.modal.jviewport-width70 {
+	width: 70vw;
+	margin-left: -35vw;
+}
+div.modal.jviewport-width80 {
+	width: 80vw;
+	margin-left: -40vw;
+}
+div.modal.jviewport-width90 {
+	width: 90vw;
+	margin-left: -45vw;
+}
+div.modal.jviewport-width100 {
+	width: 100vw;
+	margin-left: -50vw;
+}
+@media (max-width: 767px) {
+	div.modal {
+		position: fixed;
+		top: 20px;
+		left: 20px;
+		right: 20px;
+		width: auto;
+		margin: 0;
+	}
+	div.modal.fade {
+		top: -100px;
+	}
+	div.modal.fade.in {
+		top: 20px;
+	}
+	div.modal[class*="jviewport-width"] {
+		width: auto;
+		margin: 0;
+	}
+}
+@media (max-width: 480px) {
+	div.modal {
+		top: 10px;
+		left: 10px;
+		right: 10px;
+	}
+}
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), url('../../../../media/jui/fonts/IcoMoon.woff') format('woff'), url('../../../../media/jui/fonts/IcoMoon.ttf') format('truetype'), url('../../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	margin-right: .25em;
+	line-height: 14px;
+}
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+[class^="icon-"].disabled,
+[class*=" icon-"].disabled {
+	font-weight: normal;
+}
+.icon-joomla:before {
+	content: "\e200";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-rightarrow:before,
+.icon-arrow-right:before {
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-leftarrow:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-4:before {
+	content: "\e201";
+}
+.icon-arrow-right-4:before {
+	content: "\e202";
+}
+.icon-arrow-down-4:before {
+	content: "\e203";
+}
+.icon-arrow-left-4:before {
+	content: "\e204";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-forward-2:before {
+	content: "\e205";
+}
+.icon-backward-2:before,
+.icon-reply:before {
+	content: "\e206";
+}
+.icon-unblock:before,
+.icon-refresh:before,
+.icon-redo-2:before {
+	content: "\6c";
+}
+.icon-undo-2:before {
+	content: "\e207";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-play:before {
+	content: "\e208";
+}
+.icon-pause:before {
+	content: "\e209";
+}
+.icon-stop:before {
+	content: "\e210";
+}
+.icon-previous:before,
+.icon-backward:before {
+	content: "\7c";
+}
+.icon-next:before,
+.icon-forward:before {
+	content: "\7b";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-play-circle:before {
+	content: "\e00d";
+}
+.icon-pause-circle:before {
+	content: "\e211";
+}
+.icon-stop-circle:before {
+	content: "\e212";
+}
+.icon-backward-circle:before {
+	content: "\e213";
+}
+.icon-forward-circle:before {
+	content: "\e214";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "\5d";
+}
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-plus-circle:before {
+	content: "\e215";
+}
+.icon-minus:before,
+.icon-not-ok:before {
+	content: "\4b";
+}
+.icon-ban-circle:before,
+.icon-minus-circle:before {
+	content: "\e216";
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+}
+.icon-cancel-circle:before {
+	content: "\e217";
+}
+.icon-checkmark-2:before {
+	content: "\e218";
+}
+.icon-checkmark-circle:before {
+	content: "\e219";
+}
+.icon-info:before {
+	content: "\e220";
+}
+.icon-info-2:before,
+.icon-info-circle:before {
+	content: "\e221";
+}
+.icon-question:before,
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-question-2:before,
+.icon-question-circle:before {
+	content: "\e222";
+}
+.icon-notification:before {
+	content: "\e223";
+}
+.icon-notification-2:before,
+.icon-notification-circle:before {
+	content: "\e224";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+}
+.icon-warning-2:before,
+.icon-warning-circle:before {
+	content: "\e225";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before,
+.icon-checkbox-checked:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-square:before {
+	content: "\e226";
+}
+.icon-radio-unchecked:before {
+	content: "\e227";
+}
+.icon-radio-checked:before,
+.icon-generic:before {
+	content: "\e228";
+}
+.icon-circle:before {
+	content: "\e229";
+}
+.icon-signup:before {
+	content: "\e230";
+}
+.icon-grid:before,
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-2:before,
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-list-2:before {
+	content: "\e231";
+}
+.icon-menu-3:before {
+	content: "\e232";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-folder-plus:before {
+	content: "\e234";
+}
+.icon-folder-minus:before {
+	content: "\e235";
+}
+.icon-folder-3:before {
+	content: "\e236";
+}
+.icon-folder-plus-2:before {
+	content: "\e237";
+}
+.icon-folder-remove:before {
+	content: "\e238";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-2:before {
+	content: "\e239";
+}
+.icon-file-add:before,
+.icon-file-plus:before {
+	content: "\29";
+}
+.icon-file-minus:before {
+	content: "\e017";
+}
+.icon-file-check:before {
+	content: "\e240";
+}
+.icon-file-remove:before {
+	content: "\e241";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+}
+.icon-stack:before {
+	content: "\e242";
+}
+.icon-tree:before {
+	content: "\e243";
+}
+.icon-tree-2:before {
+	content: "\e244";
+}
+.icon-paragraph-left:before {
+	content: "\e246";
+}
+.icon-paragraph-center:before {
+	content: "\e247";
+}
+.icon-paragraph-right:before {
+	content: "\e248";
+}
+.icon-paragraph-justify:before {
+	content: "\e249";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-home:before {
+	content: "\21";
+}
+.icon-home-2:before {
+	content: "\e250";
+}
+.icon-out-2:before,
+.icon-new-tab:before {
+	content: "\e024";
+}
+.icon-out-3:before,
+.icon-new-tab-2:before {
+	content: "\e251";
+}
+.icon-link:before {
+	content: "\e252";
+}
+.icon-picture:before,
+.icon-image:before {
+	content: "\2f";
+}
+.icon-pictures:before,
+.icon-images:before {
+	content: "\30";
+}
+.icon-palette:before,
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-camera-2:before,
+.icon-video:before {
+	content: "\e015";
+}
+.icon-play-2:before,
+.icon-video-2:before,
+.icon-youtube:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-enter:before {
+	content: "\e257";
+}
+.icon-exit:before {
+	content: "\e258";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-quote:before,
+.icon-quotes-left:before {
+	content: "\60";
+}
+.icon-quote-2:before,
+.icon-quotes-right:before {
+	content: "\61";
+}
+.icon-quote-3:before,
+.icon-bubble-quote:before {
+	content: "\e259";
+}
+.icon-phone:before {
+	content: "\e260";
+}
+.icon-phone-2:before {
+	content: "\e261";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-envelope-opened:before,
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-tag:before {
+	content: "\e262";
+}
+.icon-tag-2:before {
+	content: "\e263";
+}
+.icon-tags:before {
+	content: "\e264";
+}
+.icon-tags-2:before {
+	content: "\e265";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-screwdriver:before,
+.icon-tools:before {
+	content: "\36";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-switch:before {
+	content: "\e266";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-unlock:before {
+	content: "\e267";
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-scissors:before {
+	content: "\e268";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-eye-close:before,
+.icon-eye-blocked:before,
+.icon-eye-2:before {
+	content: "\e269";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-broadcast:before,
+.icon-connection:before,
+.icon-wifi:before {
+	content: "\e01b";
+}
+.icon-book:before {
+	content: "\e271";
+}
+.icon-lightning:before,
+.icon-flash:before {
+	content: "\79";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-calendar-3:before {
+	content: "\e273";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-attachment:before,
+.icon-paperclip:before,
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-pin:before,
+.icon-pushpin:before {
+	content: "\73";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-shield:before {
+	content: "\e274";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-flag-3:before {
+	content: "\e275";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-bookmark-2:before {
+	content: "\e276";
+}
+.icon-heart:before {
+	content: "\e277";
+}
+.icon-heart-2:before {
+	content: "\e278";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before {
+	content: "\5c";
+}
+.icon-unfeatured:before,
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-star:before {
+	content: "\42";
+}
+.icon-smiley:before,
+.icon-smiley-happy:before {
+	content: "\e279";
+}
+.icon-smiley-2:before,
+.icon-smiley-happy-2:before {
+	content: "\e280";
+}
+.icon-smiley-sad:before {
+	content: "\e281";
+}
+.icon-smiley-sad-2:before {
+	content: "\e282";
+}
+.icon-smiley-neutral:before {
+	content: "\e283";
+}
+.icon-smiley-neutral-2:before {
+	content: "\e284";
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-credit:before {
+	content: "\e286";
+}
+.icon-credit-2:before {
+	content: "\e287";
+}
+.icon-expired:before {
+	content: "\4b";
+}
+.icon-edit:before {
+	color: #24748c;
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-save-new:before,
+.icon-save-copy:before,
+.btn-toolbar .icon-copy:before {
+	color: #378137;
+}
+.icon-unpublish:before,
+.icon-not-ok:before,
+.icon-eye-close:before,
+.icon-ban-circle:before,
+.icon-minus-sign:before,
+.btn-toolbar .icon-cancel:before {
+	color: #942a25;
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-expired:before,
+.icon-pending:before {
+	color: #c67605;
+}
+.icon-back:before {
+	content: "\e008";
+}
+html {
+	height: 100%;
+}
+body {
+	height: 100%;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	box-sizing: border-box;
+}
+a:hover,
+a:active,
+a:focus {
+	outline: none;
+}
+.small {
+	font-size: 11px;
+}
+.row-even .small,
+.row-odd .small,
+.row-even .small a,
+.row-odd .small a {
+	color: #888;
+}
+.content-title {
+	font-size: 24px;
+	font-weight: normal;
+	line-height: 26px;
+	margin-top: 0;
+}
+.well .page-header {
+	margin: -10px 0 18px 0;
+	padding-bottom: 5px;
+}
+.well .module-title.nav-header {
+	padding: 0 0 7px;
+	margin: 0;
+	font-size: 13px;
+}
+.well .row-even p,
+.well .row-odd p {
+	margin-bottom: 0;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 12px 0;
+}
+h1 {
+	font-size: 26px;
+	line-height: 28px;
+}
+h2 {
+	font-size: 22px;
+	line-height: 24px;
+}
+h3 {
+	font-size: 18px;
+	line-height: 20px;
+}
+h4 {
+	font-size: 14px;
+	line-height: 16px;
+}
+h5 {
+	font-size: 13px;
+	line-height: 15px;
+}
+h6 {
+	font-size: 12px;
+	line-height: 14px;
+}
+.truncate {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.chzn-container .chzn-drop {
+	border-radius: 0 0 3px 3px;
+}
+.control-group .chzn-container {
+	max-width: 100%;
+}
+.control-group .chzn-container .chzn-choices li.search-field,
+.control-group .chzn-container .chzn-choices li.search-field input {
+	width: 100% !important;
+}
+.chzn-container-single .chzn-single {
+	background-color: #fff;
+	background-clip: inherit;
+	background-image: none;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	border-radius: 3px;
+	box-shadow: 0 1px 0 rgba(255,255,255,0.2) inset, 0 1px 2px rgba(0,0,0,0.05);
+	height: auto;
+	line-height: 26px;
+}
+.chzn-container-single .chzn-single div {
+	background-color: #f3f3f3;
+	border-left: 1px solid #ccc;
+	bottom: 0;
+	height: auto;
+	text-align: center;
+	width: 28px;
+}
+.chzn-container-single .chzn-single div b {
+	background-image: none;
+	display: inline-block;
+}
+.chzn-container-single .chzn-single div b:after {
+	content: '\E011';
+	font-family: IcoMoon;
+}
+.chzn-container-single .chzn-single abbr {
+	background: none;
+	right: 36px;
+	top: 0;
+}
+.chzn-container-single .chzn-single abbr:before {
+	font-family: IcoMoon;
+	content: '\0049';
+	font-size: 10px;
+	line-height: 26px;
+}
+.chzn-container-single .chzn-single abbr:hover {
+	color: #000;
+}
+.chzn-container-single .chzn-search:after {
+	content: '\0053';
+	font-family: IcoMoon;
+	position: relative;
+	right: 20px;
+	top: 2px;
+}
+.chzn-container-single .chzn-search input[type="text"] {
+	background: none;
+	border-radius: 3px;
+	border: 1px solid #ccc;
+	box-shadow: none;
+	height: 25px;
+}
+.chzn-container-single .chzn-search input[type="text"]:focus {
+	border-color: #3071A9;
+}
+.chzn-container-single .chzn-drop {
+	background-clip: padding-box;
+	border-color: #3071A9;
+	border-radius: 0 0 3px 3px;
+}
+.chzn-container-active .chzn-single {
+	color: #3071A9;
+}
+.chzn-container-active.chzn-with-drop .chzn-single {
+	background-image: none;
+	border: 1px solid #3071A9;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+.chzn-container-active.chzn-with-drop .chzn-single div {
+	background-color: #f3f3f3;
+	border-bottom: 1px solid #ccc;
+	border-bottom-left-radius: 3px;
+	border-left: 1px solid #ccc;
+}
+.chzn-container-active.chzn-with-drop .chzn-single div b:after {
+	content: '\E00F';
+	font-family: IcoMoon;
+}
+.chzn-container-active.chzn-container-multi .chzn-choices {
+	border: 1px solid #3071A9;
+	box-shadow: none;
+}
+.chzn-container .chzn-results {
+	background-color: #fff;
+	border-radius: 0 0 3px 3px;
+	margin: 0;
+	padding: 0;
+}
+.chzn-container .chzn-results li.highlighted {
+	background-color: #3071A9;
+	background-image: none;
+}
+.chzn-color[rel="value_"] div {
+	background-color: #f3f3f3;
+	border-left: 1px solid #ccc;
+}
+.chzn-color-state.chzn-single div,
+.chzn-color.chzn-single[rel="value_0"] div,
+.chzn-color.chzn-single[rel="value_1"] div,
+.chzn-color-state.chzn-single[rel="value_-1"] div,
+.chzn-color-state.chzn-single[rel="value_-2"] div,
+.chzn-color.chzn-single[rel="value_hide"] div,
+.chzn-color.chzn-single[rel="value_show_no_link"] div,
+.chzn-color.chzn-single[rel="value_show_with_link"] div {
+	background-color: transparent !important;
+	border: none !important;
+}
+.chzn-container-active .chzn-choices {
+	border: 1px solid #3071A9;
+}
+.chzn-container-multi .chzn-choices {
+	background-image: none;
+	border-radius: 3px;
+	border: 1px solid #ccc;
+}
+.chzn-container-multi .chzn-choices li.search-choice {
+	background-color: #3071A9;
+	background-image: none;
+	border: 0;
+	box-shadow: none;
+	color: #fff;
+	line-height: 20px;
+	padding: 0 7px;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close {
+	color: #f5f5f5;
+	display: inline-block;
+	margin-left: 5px;
+	position: relative;
+	top: 0;
+	left: 0;
+	background-image: none;
+	font-size: inherit;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close:hover {
+	text-decoration: none;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close:before {
+	font-family: IcoMoon;
+	content: '\004A';
+	position: relative;
+	right: 1px;
+	top: 0;
+}
+.js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container {
+	margin: 1px 0;
+	padding: 0 !important;
+}
+.chzn-color.chzn-single[rel="value_1"],
+.chzn-color-reverse.chzn-single[rel="value_0"],
+.chzn-color-state.chzn-single[rel="value_1"],
+.chzn-color.chzn-single[rel="value_show_no_link"],
+.chzn-color.chzn-single[rel="value_show_with_link"] {
+	background-color: #46a546;
+	*background-color: #46a546;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	color: #ffffff;
+}
+.chzn-color.chzn-single[rel="value_1"]:hover,
+.chzn-color.chzn-single[rel="value_1"]:focus,
+.chzn-color.chzn-single[rel="value_1"]:active,
+.chzn-color.chzn-single[rel="value_1"].active,
+.chzn-color.chzn-single[rel="value_1"].disabled,
+.chzn-color.chzn-single[rel="value_1"][disabled],
+.chzn-color-reverse.chzn-single[rel="value_0"]:hover,
+.chzn-color-reverse.chzn-single[rel="value_0"]:focus,
+.chzn-color-reverse.chzn-single[rel="value_0"]:active,
+.chzn-color-reverse.chzn-single[rel="value_0"].active,
+.chzn-color-reverse.chzn-single[rel="value_0"].disabled,
+.chzn-color-reverse.chzn-single[rel="value_0"][disabled],
+.chzn-color-state.chzn-single[rel="value_1"]:hover,
+.chzn-color-state.chzn-single[rel="value_1"]:focus,
+.chzn-color-state.chzn-single[rel="value_1"]:active,
+.chzn-color-state.chzn-single[rel="value_1"].active,
+.chzn-color-state.chzn-single[rel="value_1"].disabled,
+.chzn-color-state.chzn-single[rel="value_1"][disabled],
+.chzn-color.chzn-single[rel="value_show_no_link"]:hover,
+.chzn-color.chzn-single[rel="value_show_no_link"]:focus,
+.chzn-color.chzn-single[rel="value_show_no_link"]:active,
+.chzn-color.chzn-single[rel="value_show_no_link"].active,
+.chzn-color.chzn-single[rel="value_show_no_link"].disabled,
+.chzn-color.chzn-single[rel="value_show_no_link"][disabled],
+.chzn-color.chzn-single[rel="value_show_with_link"]:hover,
+.chzn-color.chzn-single[rel="value_show_with_link"]:focus,
+.chzn-color.chzn-single[rel="value_show_with_link"]:active,
+.chzn-color.chzn-single[rel="value_show_with_link"].active,
+.chzn-color.chzn-single[rel="value_show_with_link"].disabled,
+.chzn-color.chzn-single[rel="value_show_with_link"][disabled] {
+	color: #fff;
+	background-color: #2f6f2f;
+	*background-color: #2f6f2f;
+}
+.chzn-color.chzn-single[rel="value_1"]:active,
+.chzn-color.chzn-single[rel="value_1"].active,
+.chzn-color-reverse.chzn-single[rel="value_0"]:active,
+.chzn-color-reverse.chzn-single[rel="value_0"].active,
+.chzn-color-state.chzn-single[rel="value_1"]:active,
+.chzn-color-state.chzn-single[rel="value_1"].active,
+.chzn-color.chzn-single[rel="value_show_no_link"]:active,
+.chzn-color.chzn-single[rel="value_show_no_link"].active,
+.chzn-color.chzn-single[rel="value_show_with_link"]:active,
+.chzn-color.chzn-single[rel="value_show_with_link"].active {
+	background-color: #46a546;
+}
+.chzn-color-state.chzn-single[rel="value_0"],
+.chzn-color-state.chzn-single[rel="value_-2"] {
+	background-color: #bd362f;
+	*background-color: #bd362f;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	color: #ffffff;
+}
+.chzn-color-state.chzn-single[rel="value_0"]:hover,
+.chzn-color-state.chzn-single[rel="value_0"]:focus,
+.chzn-color-state.chzn-single[rel="value_0"]:active,
+.chzn-color-state.chzn-single[rel="value_0"].active,
+.chzn-color-state.chzn-single[rel="value_0"].disabled,
+.chzn-color-state.chzn-single[rel="value_0"][disabled],
+.chzn-color-state.chzn-single[rel="value_-2"]:hover,
+.chzn-color-state.chzn-single[rel="value_-2"]:focus,
+.chzn-color-state.chzn-single[rel="value_-2"]:active,
+.chzn-color-state.chzn-single[rel="value_-2"].active,
+.chzn-color-state.chzn-single[rel="value_-2"].disabled,
+.chzn-color-state.chzn-single[rel="value_-2"][disabled] {
+	color: #fff;
+	background-color: #802420;
+	*background-color: #802420;
+}
+.chzn-color-state.chzn-single[rel="value_0"]:active,
+.chzn-color-state.chzn-single[rel="value_0"].active,
+.chzn-color-state.chzn-single[rel="value_-2"]:active,
+.chzn-color-state.chzn-single[rel="value_-2"].active {
+	background-color: #bd362f;
+}
+.CodeMirror {
+	height: calc(100vh - 400px);
+	min-height: 400px;
+	max-height: 800px;
+}
+.form-horizontal .control-label {
+	padding-right: 5px;
+	text-align: left;
+}
+.form-horizontal .control-label .spacer hr {
+	width: 380px;
+}
+@media (max-width: 420px) {
+	.form-horizontal .control-label .spacer hr {
+		width: 220px;
+	}
+}
+.form-horizontal .field-spacer>.control-label {
+	width: auto;
+}
+.form-horizontal #jform_catid_chzn {
+	vertical-align: middle;
+}
+.form-vertical .control-label > label {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+@media (max-width: 979px) {
+	.form-horizontal-desktop .control-label {
+		float: none;
+		width: auto;
+		padding-right: 0;
+		padding-top: 0;
+		text-align: left;
+	}
+	.form-horizontal-desktop .control-label > label {
+		display: inline-block;
+		*display: inline;
+		*zoom: 1;
+	}
+	.form-horizontal-desktop .controls {
+		margin-left: 0;
+	}
+}
+@media (max-width: 1199px) {
+	.row-fluid .row-fluid .form-horizontal-desktop .control-label {
+		float: none;
+		width: auto;
+		padding-right: 0;
+		padding-top: 0;
+		text-align: left;
+	}
+	.row-fluid .row-fluid .form-horizontal-desktop .control-label > label {
+		display: inline-block;
+		*display: inline;
+		*zoom: 1;
+	}
+	.row-fluid .row-fluid .form-horizontal-desktop .controls {
+		margin-left: 0;
+	}
+}
+.form-inline-header {
+	margin: 5px 0;
+}
+.form-inline-header .control-group,
+.form-inline-header .control-label,
+.form-inline-header .controls {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.form-inline-header .control-label {
+	width: auto;
+	padding-right: 10px;
+}
+.form-inline-header .controls {
+	padding-right: 20px;
+}
+fieldset[class^="form-"] {
+	min-width: 100%;
+}
+@-moz-document url-prefix() {
+	fieldset[class^="form-"] {
+		display: table-cell;
+	}
+}
+fieldset.checkboxes input {
+	float: left;
+}
+fieldset.checkboxes li {
+	list-style: none;
+}
+.control-group,
+.controls,
+.controls input[type="text"],
+.controls input[type="number"],
+.controls input[type="email"],
+.controls select,
+.controls textarea {
+	max-width: 100%;
+}
+.controls .btn-group > .btn {
+	min-width: 50px;
+	margin-left: -1px;
+}
+.controls .btn-group.btn-group-yesno {
+	width: 220px;
+	max-width: 100%;
+}
+.controls .btn-group.btn-group-yesno > .btn {
+	width: 50%;
+	min-width: 40px;
+	padding: 2px 0;
+}
+input.input-large-text {
+	font-size: 18px;
+	line-height: 22px;
+	height: auto;
+}
+textarea {
+	resize: both;
+}
+textarea.vert {
+	resize: vertical;
+}
+textarea.noResize {
+	resize: none;
+}
+.subform-repeatable {
+	padding-right: 10px;
+}
+.subform-repeatable > .btn-toolbar {
+	margin: 0;
+}
+.subform-repeatable > .btn-toolbar .group-add {
+	line-height: 26px;
+	width: 56px;
+	font-size: 13px;
+	margin-left: 28px;
+}
+.subform-repeatable-group {
+	margin-top: 20px;
+	margin-left: 28px;
+	border: 1px solid #ccc;
+	padding: 8px 25px 15px;
+	position: relative;
+	border-radius: 3px;
+}
+.subform-repeatable-group > .btn-toolbar {
+	margin: 0;
+}
+.subform-repeatable-group > .btn-toolbar .btn-group {
+	margin-right: 0px;
+	margin-top: -1px;
+	position: static;
+}
+.subform-repeatable-group > .btn-toolbar .btn {
+	font-size: 13px;
+	line-height: 26px;
+	background-color: #F3F3F3;
+	position: absolute;
+}
+.subform-repeatable-group > .btn-toolbar .btn span {
+	vertical-align: middle;
+	line-height: 11px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-success {
+	color: #378137;
+	bottom: 0;
+	right: 0;
+	border-radius: 3px 0 0 0;
+	border-width: 1px 0 0 1px;
+	padding-top: 1px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-success .icon-plus:before {
+	content: "]";
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-danger {
+	color: #942a25;
+	top: 0;
+	right: 0;
+	border-radius: 0 0 0 3px;
+	border-width: 0 0 1px 1px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-danger .icon-minus:before {
+	content: "I";
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-primary {
+	color: #24748c;
+	color: #333;
+	right: 100%;
+	top: 50%;
+	margin-top: -27px;
+	margin-right: 1px;
+	border-radius: 3px 0 0 3px;
+	border-width: 1px 0 1px 1px;
+	line-height: 52px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-primary .icon-move:before {
+	content: "Z";
+}
+.subform-repeatable-group > .btn-toolbar .btn [class^="icon-"],
+.subform-repeatable-group > .btn-toolbar .btn [class*=" icon-"] {
+	margin: 0;
+}
+.subform-repeatable-group > .btn-toolbar .btn:hover {
+	background-color: #E6E6E6;
+}
+.subform-repeatable-group .control-group:last-of-type {
+	margin-bottom: 10px;
+}
+@media (max-width: 979px) {
+	.subform-repeatable-group > .btn-toolbar .btn-group {
+		margin-bottom: 10px;
+	}
+}
+.subform-table-layout .control-group {
+	margin-bottom: 10px;
+}
+.subform-table-layout .control-group:last-of-type {
+	margin-bottom: 0;
+}
+.subform-table-layout .controls {
+	padding-right: 20px;
+}
+.subform-table-layout input {
+	width: 100%;
+	max-width: 206px;
+}
+.subform-table-layout table .btn-group {
+	margin: 0 7px;
+}
+@media (max-width: 1024px) {
+	.subform-table-layout .subform-repeatable {
+		padding-right: 0;
+	}
+	.subform-table-layout .subform-repeatable tbody td:last-of-type {
+		text-align: right;
+		padding-bottom: 15px;
+	}
+	.subform-table-layout table,
+	.subform-table-layout thead,
+	.subform-table-layout tbody,
+	.subform-table-layout th,
+	.subform-table-layout td,
+	.subform-table-layout tr {
+		display: block;
+	}
+	.subform-table-layout table {
+		border: 1px solid #ddd;
+	}
+	.subform-table-layout thead th {
+		position: absolute;
+		top: -9999px;
+		left: -9999px;
+	}
+	.subform-table-layout thead th:last-of-type {
+		position: static;
+		width: 100% !important;
+		text-align: right;
+		box-sizing: border-box;
+		border-left: 0;
+	}
+	.subform-table-layout tr {
+		margin: 0;
+		padding: 0;
+		border: 0;
+	}
+	.subform-table-layout td {
+		border: none;
+		position: relative;
+		padding-left: 50%;
+	}
+	.subform-table-layout tbody td:first-of-type {
+		padding-top: 15px;
+		border-top: 1px solid #ddd;
+	}
+	.subform-table-layout tbody td:first-of-type:before {
+		top: 18px;
+	}
+	.subform-table-layout td:before {
+		content: attr(data-column);
+		position: absolute;
+		top: 13px;
+		left: 10px;
+		padding-right: 10px;
+	}
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0;
+}
+.form-horizontal .controls > .radio:first-child,
+.form-horizontal .controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.form-horizontal .controls > .radio.btn-group:first-child {
+	padding-top: 0;
+}
+.form-horizontal .controls > .radio.btn-group-yesno:first-child {
+	padding-top: 2px;
+}
+.header {
+	background-color: #1a3867;
+	border-top: 1px solid rgba(255,255,255,0.2);
+	padding: 8px 25px;
+}
+@media (max-width: 767px) {
+	.header {
+		padding: 4px 18px;
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+}
+.header .navbar-search {
+	margin-top: 0;
+}
+@media (max-width: 979px) {
+	.header .navbar-search {
+		border-top: 0;
+		border-bottom: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+}
+.container-logo {
+	float: right;
+	text-align: right;
+}
+.logo {
+	width: auto;
+	max-width: 100%;
+	max-height: 36px;
+	height: auto;
+}
+.page-title {
+	color: white;
+	font-weight: normal;
+	font-size: 20px;
+	line-height: 36px;
+	margin: 0;
+}
+.page-title [class^="icon-"],
+.page-title [class*=" icon-"] {
+	margin-right: 16px;
+}
+@media (max-width: 767px) {
+	.container-logo {
+		display: none;
+	}
+	.page-title {
+		font-size: 18px;
+		line-height: 28px;
+	}
+	.page-title [class^="icon-"],
+	.page-title [class*=" icon-"] {
+		margin-right: 10px;
+	}
+}
+.view-login {
+	background-color: #17568c;
+	padding-top: 0;
+}
+.view-login .container {
+	width: 300px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -206px;
+	margin-left: -150px;
+}
+.view-login .navbar-fixed-bottom {
+	padding-left: 20px;
+	padding-right: 20px;
+	text-align: center;
+}
+.view-login .navbar-fixed-bottom,
+.view-login .navbar-fixed-bottom a {
+	color: #FCFCFC;
+}
+.view-login .navbar-inverse.navbar-fixed-bottom,
+.view-login .navbar-inverse.navbar-fixed-bottom a {
+	color: #555;
+}
+.view-login .well {
+	padding-bottom: 0;
+}
+.view-login .login-joomla {
+	position: absolute;
+	left: 50%;
+	height: 24px;
+	width: 24px;
+	margin-left: -12px;
+	font-size: 22px;
+}
+.view-login .navbar-fixed-bottom {
+	position: absolute;
+}
+.view-login .input-medium {
+	width: 176px;
+}
+.view-login #lang_chzn {
+	width: 233px !important;
+	max-width: none;
+}
+.view-login #lang_chzn .chzn-single div {
+	width: 43px;
+}
+.view-login .input-prepend .add-on,
+.view-login .controls .btn-group > .btn {
+	margin-left: 0;
+}
+.navbar-inverse {
+	color: #333;
+}
+.login .btn-large {
+	margin-top: 15px;
+}
+.login .form-inline .btn-group {
+	display: block;
+}
+@media (max-width: 479px) {
+	.login .chzn-single {
+		width: 222px !important;
+	}
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+}
+@media (max-width: 319px) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+}
+ul.manager .height-50 .icon-folder-2 {
+	height: 35px;
+	width: 35px;
+	line-height: 35px;
+	font-size: 30px;
+}
+#imageForm {
+	margin: -25px 0 0;
+}
+#imageForm .well {
+	margin-bottom: 5px;
+}
+.thumbnails-media {
+	margin-left: 0;
+}
+.thumbnails-media .thumbnail {
+	background-color: #f4f4f4;
+	border-radius: 3px;
+	border: 0;
+	box-shadow: 0 0 0 1px rgba(0,0,0,0.05) inset;
+	padding: 0px;
+	height: 100px;
+	width: 100px;
+	margin: 8px 16px;
+	margin-left: 0 !important;
+	position: relative;
+	text-align: center;
+	overflow: hidden;
+}
+.thumbnails-media .thumbnail .close {
+	background-color: #ccc;
+	border-left: 1px solid rgba(0,0,0,0.1);
+	height: 22px;
+	line-height: 22px;
+	opacity: 0.3;
+	text-align: center;
+	width: 22px;
+	top: 0;
+	right: 0;
+}
+.thumbnails-media .thumbnail .close:hover {
+	background-color: #bbb;
+}
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
+	-webkit-transition: all 0.2s ease;
+	transition: all 0.2s ease;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
+	margin: 0;
+	opacity: 0.55;
+	position: absolute;
+	top: 5px;
+	left: 5px;
+}
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
+	display: none;
+}
+.thumbnails-media .imgThumb {
+	position: relative;
+	z-index: 1;
+	width: 100%;
+	display: inline-block;
+}
+.thumbnails-media .imgThumb input {
+	display: none;
+}
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
+	display: block;
+	line-height: 100px;
+	position: relative;
+	width: 100%;
+	border-radius: 3px;
+	overflow: hidden;
+}
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
+	font-family: "IcoMoon";
+	font-style: normal;
+	content: 'G';
+	position: absolute;
+	top: 0;
+	right: 0;
+	background-color: #46a546;
+	color: #fff;
+	line-height: 26px;
+	width: 26px;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	opacity: 0;
+	border-color: rgba(0,0,0,0.2);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	border-radius: 0 3px;
+}
+.thumbnails-media .imgThumb img {
+	width: auto;
+}
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
+	background-color: #ddd;
+}
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
+	-webkit-transform: scale(1);
+	transform: scale(1);
+	opacity: 1;
+}
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	content: '';
+	border: 3px solid #46a546;
+	border-radius: 5px;
+}
+.thumbnails-media .imgDelete a.close,
+.thumbnails-media .imgPreview a {
+	padding: 0;
+	position: absolute;
+	left: 0;
+	z-index: 1;
+	height: 26px;
+	width: 26px;
+}
+.thumbnails-media .imgPreview a {
+	width: 100%;
+}
+.thumbnails-media .imgDelete a.close {
+	background-color: #bd362f;
+	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
+	top: 0;
+	line-height: 28px;
+	font-size: 12px;
+	padding-left: 1px;
+	color: #fff;
+	border-bottom-right-radius: 3px;
+	border-top-left-radius: 3px;
+	z-index: 10;
+	opacity: 0;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+}
+.thumbnails-media .imgDelete a.close:hover {
+	background-color: #802420;
+}
+.thumbnails-media .thumbnail:hover .imgDelete a.close {
+	opacity: 1;
+	-webkit-transform: scale(1);
+	transform: scale(1);
+}
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
+	position: absolute;
+	left: 0;
+	text-align: left;
+	background-color: #fff;
+	border-color: rgba(0,0,0,0.2);
+	bottom: 0;
+	line-height: 26px;
+	border: 1px solid rgba(0,0,0,0.1);
+	border-width: 1px;
+	border-radius: 0 3px 0 0;
+	z-index: 1;
+}
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
+	background-color: #eee;
+}
+.thumbnails-media .imgDetails {
+	padding: 0 5px;
+	line-height: 20px;
+	color: #555;
+}
+.thumbnails-media .imgFolder span {
+	line-height: 90px;
+	font-size: 38px;
+	margin: 0;
+	width: auto;
+}
+.thumbnails-media .imgFolder + .imgDetails {
+	color: inherit;
+}
+.com_media .media a + a {
+	margin-left: -1px;
+}
+.com_media .tree-holder {
+	padding: 0 15px;
+}
+#folderframe.thumbnail {
+	border: 0;
+	box-shadow: none;
+	padding: 0;
+}
+#mediamanager-form {
+	margin: 0 -10px;
+}
+#mediamanager-form > .muted {
+	padding: 0px;
+}
+#mediamanager-form .checkbox {
+	padding-left: 30px;
+	margin-bottom: 15px;
+}
+#mediamanager-form .checkbox input {
+	margin-top: 3px;
+}
+#mediamanager-form .thumbnails .thumbnail {
+	height: 120px;
+	width: 120px;
+	margin: 0 18px 18px 0;
+}
+#mediamanager-form .thumbnails .imgThumb label,
+#mediamanager-form .thumbnails .imgTotal {
+	line-height: 120px;
+}
+#mediamanager-form .icon-search::before {
+	padding-right: 5px;
+	padding-left: 1px;
+}
+#mediamanager-form .height-50 {
+	background-color: #fafafa;
+	height: 77px;
+	position: relative;
+	z-index: 1;
+	width: 100%;
+	display: inline-block;
+}
+#mediamanager-form .height-50 a,
+#mediamanager-form .height-50 .icon-folder-2 {
+	display: inline-block;
+	line-height: 75px;
+	margin-top: -1px;
+}
+#mediamanager-form .height-50 a:after {
+	bottom: 0;
+	box-shadow: 0 0 0 1px rgba(0,0,0,0.08) inset;
+	content: "";
+	display: block;
+	left: 0;
+	overflow: hidden;
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+#mediamanager-form .height-50 .icon-folder-2 {
+	font-size: 40px;
+}
+.uploadform {
+	margin-top: 20px;
+}
+body.modal-open {
+	-ms-overflow-style: none;
+}
+.modal-header {
+	padding: 0 20px;
+	text-align: left;
+}
+.modal-header h3 {
+	font-weight: normal;
+	line-height: 50px;
+}
+.modal-header .close {
+	width: 50px;
+	margin-top: 0;
+	margin-right: -15px;
+	font-size: 2rem;
+	line-height: 50px;
+	border-left: 1px solid #ccc;
+}
+.modal-body {
+	padding: 0;
+	width: 100%;
+	height: auto;
+}
+.modal-body .container-fluid {
+	padding-top: 15px;
+	padding-bottom: 15px;
+}
+.modal-footer {
+	clear: both;
+}
+.contentpane {
+	padding: 10px;
+	height: auto;
+}
+@media (min-width: 768px) {
+	.row-fluid .modal-batch [class*="span"] {
+		margin-left: 0;
+	}
+}
+.container-popup {
+	padding: 28px 10px 10px 10px;
+}
+body .navbar,
+body .navbar-fixed-top {
+	margin-bottom: 0;
+}
+.navbar-inner {
+	min-height: 0;
+	background: #f2f2f2;
+	background-image: none;
+	filter: none;
+}
+.navbar-inner .container-fluid {
+	padding-left: 10px;
+	padding-right: 10px;
+	font-size: 15px;
+}
+.navbar-inverse .navbar-inner {
+	background: #10223e;
+	background-image: none;
+	filter: none;
+}
+.navbar .navbar-text {
+	line-height: 30px;
+}
+.navbar .admin-logo {
+	float: left;
+	padding: 7px 12px 0px 15px;
+	font-size: 16px;
+	color: #555;
+}
+.navbar .admin-logo:hover {
+	color: #333;
+}
+.navbar-inverse.navbar .admin-logo {
+	color: #d9d9d9;
+}
+.navbar-inverse.navbar .admin-logo:hover {
+	color: #ffffff;
+}
+.navbar .brand {
+	float: right;
+	display: block;
+	padding: 6px 10px;
+	margin-left: -20px;
+	font-size: inherit;
+	font-weight: normal;
+}
+.navbar .brand:hover,
+.navbar .brand:focus {
+	text-decoration: none;
+}
+.navbar .nav > li > a {
+	padding: 6px 10px;
+}
+.navbar .nav > li > a:hover {
+	color: white;
+}
+.navbar .nav > li > a:hover span.carot {
+	border-bottom-color: #fff;
+	border-top-color: #fff;
+}
+.navbar .dropdown-menu,
+.navbar .nav-user {
+	font-size: 13px;
+}
+.navbar .nav-user .dropdown-menu li span {
+	padding-left: 10px;
+}
+.navbar .nav > li ul {
+	overflow-y: auto;
+	overflow-x: hidden;
+	-webkit-overflow-scrolling: touch;
+	-moz-overflow-scrolling: touch;
+	-ms-overflow-scrolling: touch;
+	-o-overflow-scrolling: touch;
+	overflow-scrolling: touch;
+	height: auto;
+	max-height: 500px;
+	margin: 0;
+}
+.navbar .nav > li ul::-webkit-scrollbar {
+	-webkit-appearance: none;
+	width: 7px;
+}
+.navbar .nav > li ul::-webkit-scrollbar-thumb {
+	border-radius: 4px;
+	background-color: rgba(0,0,0,0.5);
+	-webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5);
+}
+.navbar .nav > li > .dropdown-menu:after {
+	display: none;
+}
+.navbar .nav > .dropdown.open:after {
+	content: '';
+	display: inline-block;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	position: absolute;
+	top: 25px;
+	left: 10px;
+	z-index: 1001;
+}
+.navbar .empty-nav {
+	display: none;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+	background-image: none;
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.navbar .btn-navbar {
+	background: #17568c;
+	border: 1px solid #0D2242;
+	margin-bottom: 2px;
+}
+@media (max-width: 767px) {
+	.navbar .admin-logo {
+		margin-left: 10px;
+		padding: 9px 9px 0 9px;
+	}
+}
+.navbar-search .search-query {
+	background: rgba(255,255,255,0.3);
+}
+@media (max-width: 979px) {
+	.navbar .nav {
+		font-size: 13px;
+		margin: 0 2px 0 0;
+	}
+	.navbar .nav > li > a {
+		padding: 6px;
+	}
+}
+@media (max-width: 767px) {
+	.navbar-search.pull-right {
+		float: none;
+		text-align: center;
+	}
+}
+@media (max-width: 738px) {
+	.navbar .brand {
+		font-size: 16px;
+	}
+}
+.nav-collapse .nav li a,
+.dropdown-menu a {
+	background-image: none;
+}
+.nav-collapse .dropdown-menu > li img {
+	max-width: none;
+}
+@media (max-width: 767px) {
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-top .navbar-inner .container-fluid {
+		padding: 0;
+	}
+	.navbar .brand {
+		margin-top: 2px;
+		float: none;
+		text-align: center;
+	}
+	.navbar .btn-navbar {
+		margin-top: 3px;
+		margin-right: 3px;
+		margin-bottom: 3px;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #fff;
+	}
+	.nav-collapse .nav,
+	.navbar .nav-collapse .nav.pull-right {
+		margin: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		margin: 0;
+	}
+	.nav-collapse .dropdown-menu > li > span {
+		display: block;
+		padding: 4px 15px;
+	}
+	.navbar-inverse .nav-collapse .dropdown-menu > li > span {
+		color: #d9d9d9;
+	}
+	.nav-collapse .nav > li > a.dropdown-toggle {
+		background-color: rgba(255,255,255,0.07);
+		font-size: 12px;
+		font-weight: bold;
+		color: #eee;
+		text-transform: uppercase;
+		padding-left: 15px;
+	}
+	.nav-collapse .nav li a {
+		margin-bottom: 0;
+		border-top: 1px solid rgba(255,255,255,0.25);
+		border-bottom: 1px solid rgba(0,0,0,0.5);
+	}
+	.nav-collapse .nav li ul li ul.dropdown-menu,
+	.nav-collapse .nav li ul li:hover ul.dropdown-menu,
+	.nav-collapse .caret {
+		display: none !important;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		font-size: 15px;
+		font-weight: normal;
+		color: #fff;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+	}
+	.navbar .nav-collapse .nav > li > .dropdown-menu::before,
+	.navbar .nav-collapse .nav > li > .dropdown-menu::after,
+	.navbar .nav-collapse .dropdown-submenu > a::after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 0;
+	}
+}
+.quick-icons {
+	font-size: 14px;
+	margin-bottom: 20px;
+}
+.quick-icons .nav-header {
+	margin: 12px 0 5px;
+	font-size: 13px;
+}
+.quick-icons .nav-header:first-child {
+	margin: 0 0 5px;
+}
+.quick-icons [class^="icon-"],
+.quick-icons [class*=" icon-"] {
+	margin-right: 9px;
+}
+.quick-icons [class^="icon-"]:before,
+.quick-icons [class*=" icon-"]:before {
+	font-size: 16px;
+	margin-bottom: 20px;
+	line-height: 18px;
+}
+html[dir=rtl] .quick-icons .nav-list [class^="icon-"],
+html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
+	margin-left: 9px;
+	margin-right: 0;
+}
+.sidebar-nav .nav-list {
+	padding-left: 25px;
+	padding-right: 25px;
+}
+.sidebar-nav .nav-list > li > a {
+	color: #555;
+	padding: 3px 25px;
+	margin-left: -26px;
+	margin-right: -26px;
+}
+.sidebar-nav .nav-list > li.active > a {
+	color: #fff;
+	margin-right: -26px;
+}
+.sidebar-nav .nav-list > li > a:focus,
+.sidebar-nav .nav-list > li > a:hover {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+	text-shadow: none;
+}
+.j-sidebar-container {
+	position: absolute;
+	display: block;
+	left: -16.5%;
+	width: 16.5%;
+	margin: -18px 0 0 -1px;
+	padding-top: 28px;
+	padding-bottom: 40px;
+	clear: both;
+	background-color: #F0F0F0;
+	border-bottom: 1px solid #dedede;
+	border-right: 1px solid #dedede;
+	-webkit-border-radius: 0 0 3px 0;
+	-moz-border-radius: 0 0 3px 0;
+	border-radius: 0 0 3px 0;
+}
+.j-sidebar-container.j-sidebar-hidden {
+	left: -16.5%;
+}
+.j-sidebar-container.j-sidebar-visible {
+	left: 0;
+}
+.j-sidebar-container .filter-select {
+	padding: 0 14px;
+}
+.j-toggle-sidebar-header h3 {
+	font-weight: normal;
+	padding: 0 15px;
+}
+.j-toggle-button-wrapper {
+	position: absolute;
+	display: block;
+	top: 7px;
+	padding: 0;
+}
+.j-toggle-button-wrapper.j-toggle-hidden {
+	right: -24px;
+}
+.j-toggle-button-wrapper.j-toggle-visible {
+	right: 7px;
+}
+.j-toggle-sidebar-button {
+	font-size: 16px;
+	color: #3071a9;
+	text-decoration: none;
+	cursor: pointer;
+}
+.j-toggle-sidebar-button:hover {
+	color: #1f496e;
+}
+#system-message-container,
+#j-main-container {
+	padding: 0 0 0 5px;
+	min-height: 0;
+}
+#system-message-container.j-toggle-main,
+#j-main-container.j-toggle-main,
+#system-debug.j-toggle-main {
+	float: right;
+}
+@media (min-width: 768px) {
+	.j-toggle-transition {
+		-webkit-transition: all 0.3s ease;
+		-moz-transition: all 0.3s ease;
+		-o-transition: all 0.3s ease;
+		transition: all 0.3s ease;
+	}
+}
+@media (max-width: 979px) {
+	.j-toggle-button-wrapper.j-toggle-hidden {
+		right: -20px;
+	}
+}
+@media (max-width: 767px) {
+	.j-sidebar-container {
+		position: relative;
+		width: 100%;
+		margin: 0 0 20px 0;
+		padding: 0;
+		background: transparent;
+		border-right: 0;
+		border-bottom: 0;
+	}
+	.j-sidebar-container.j-sidebar-hidden {
+		margin-left: 16.5%;
+	}
+	.j-sidebar-container.j-sidebar-visible {
+		margin-left: 0;
+	}
+	.j-toggle-sidebar-header,
+	.j-toggle-button-wrapper {
+		display: none;
+	}
+	.view-login select {
+		width: 232px;
+	}
+}
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+	.view-login .input-medium {
+		width: 180px;
+	}
+	.view-login select {
+		width: 232px;
+	}
+}
+#status {
+	background: #ebebeb;
+	border-top: 1px solid #dedede;
+	padding: 4px 10px;
+	-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
+	-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
+	box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
+	color: #626262;
+}
+#status .btn-group {
+	margin: 0;
+}
+#status .btn-group.separator:after {
+	content: ' ';
+	display: block;
+	float: left;
+	background: #ADADAD;
+	margin: 0 10px;
+	height: 15px;
+	width: 1px;
+}
+#status .btn-toolbar,
+#status p {
+	margin: 0px;
+}
+#status .btn-toolbar,
+#status .btn-group {
+	font-size: 12px;
+}
+#status a {
+	color: #626262;
+}
+#status .badge {
+	margin-right: .25em;
+}
+#status.status-top {
+	background: #1a3867;
+	-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	border-top: 0;
+	color: #d9d9d9;
+	padding: 2px 20px 6px 20px;
+}
+#status.status-top a {
+	color: #d9d9d9;
+}
+@media (max-width: 479px) {
+	.pagination a {
+		padding: 5px;
+	}
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7 {
+		display: none;
+	}
+	.navbar .btn {
+		margin: 0;
+	}
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+	.subhead-collapse.collapse {
+		height: 0;
+		overflow: hidden;
+	}
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0px 10px 5px 10px;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+	}
+	.subhead {
+		background: none repeat scroll 0 0 transparent;
+		border-bottom: 0 solid #dedede;
+	}
+	.btn-group + .btn-group {
+		margin-left: 10px;
+	}
+	.login .chzn-single {
+		width: 222px !important;
+	}
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+	#toolbar [class^="icon-"],
+	#toolbar [class*=" icon-"] {
+		background-color: transparent;
+		border-right: medium none;
+		width: 10px;
+	}
+}
+table label {
+	margin: 0;
+}
+td.has-context {
+	height: 23px;
+}
+td.nowrap.has-context {
+	width: 45%;
+}
+.subhead {
+	background: #F0F0F0;
+	border-bottom: 1px solid #dedede;
+	color: #0C192E;
+	text-shadow: 0 1px 0 #FFF;
+	margin-bottom: 10px;
+	min-height: 51px;
+}
+.subhead-collapse {
+	margin-bottom: 19px;
+}
+.subhead-collapse.collapse {
+	height: auto;
+	overflow: visible;
+}
+.btn-toolbar {
+	margin-bottom: 5px;
+}
+.btn-toolbar .btn-wrapper {
+	display: inline-block;
+	margin: 0 0 8px 5px;
+}
+.subhead-fixed {
+	position: fixed;
+	width: 100%;
+	top: 30px;
+	z-index: 100;
+}
+@media (max-width: 767px) {
+	body {
+		-webkit-overflow-scrolling: touch;
+	}
+	.subhead {
+		margin-left: -20px;
+		margin-right: -20px;
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+.subhead h1 {
+	font-size: 17px;
+	font-weight: normal;
+	margin-left: 10px;
+	margin-top: 6px;
+}
+#toolbar {
+	margin-bottom: 2px;
+	margin-top: 12px;
+}
+#toolbar .btn {
+	line-height: 24px;
+	margin-right: 4px;
+	padding: 0 10px;
+}
+#toolbar .btn-success {
+	min-width: 148px;
+}
+#toolbar .btn-primary [class^="icon-"],
+#toolbar .btn-primary [class*=" icon-"],
+#toolbar .btn-warning [class^="icon-"],
+#toolbar .btn-warning [class*=" icon-"],
+#toolbar .btn-danger [class^="icon-"],
+#toolbar .btn-danger [class*=" icon-"],
+#toolbar .btn-success [class^="icon-"],
+#toolbar .btn-success [class*=" icon-"],
+#toolbar .btn-info [class^="icon-"],
+#toolbar .btn-info [class*=" icon-"],
+#toolbar .btn-inverse [class^="icon-"],
+#toolbar .btn-inverse [class*=" icon-"] {
+	background-color: transparent;
+	border-right: 0;
+	border-left: 0;
+	width: 16px;
+	margin-left: 0;
+	margin-right: 0;
+}
+#toolbar #toolbar-options,
+#toolbar #toolbar-help {
+	float: right;
+}
+#toolbar [class^="icon-"],
+#toolbar [class*=" icon-"] {
+	background-color: #e6e6e6;
+	border-radius: 3px 0 0 3px;
+	border-right: 1px solid #b3b3b3;
+	height: auto;
+	line-height: inherit;
+	margin: 0 6px 0 -10px;
+	opacity: 1;
+	text-shadow: none;
+	width: 28px;
+	z-index: -1;
+}
+#toolbar iframe .btn-group .btn {
+	margin-left: -1px !important;
+}
+html[dir=rtl] #toolbar #toolbar-options,
+html[dir=rtl] #toolbar #toolbar-help {
+	float: left;
+}
+@media (max-width: 767px) {
+	.subhead-fixed {
+		position: static;
+		width: auto;
+	}
+}
+.btn-subhead {
+	display: none;
+}
+@media (min-width: 480px) {
+	#filter-bar {
+		height: 29px;
+	}
+}
+@media (max-width: 479px) {
+	.navbar .btn {
+		margin: 0;
+	}
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+	.subhead-collapse.collapse {
+		height: 0;
+		overflow: hidden;
+	}
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0px 10px 5px 10px;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+	}
+	.subhead {
+		background: none repeat scroll 0 0 transparent;
+		border-bottom: 0 solid #dedede;
+	}
+	#toolbar [class^="icon-"],
+	#toolbar [class*=" icon-"] {
+		background-color: transparent;
+		border-right: medium none;
+		width: 10px;
+	}
+}
+@media (max-width: 319px) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+}
+ul.treeselect,
+ul.treeselect li {
+	margin: 0;
+	padding: 0;
+}
+ul.treeselect {
+	margin-top: 8px;
+}
+ul.treeselect li {
+	padding: 2px 10px 2px;
+	list-style: none;
+}
+ul.treeselect i.treeselect-toggle {
+	line-height: 18px;
+}
+ul.treeselect label {
+	font-size: 1em;
+	margin-left: 8px;
+}
+ul.treeselect label.nav-header {
+	padding: 0;
+}
+ul.treeselect input {
+	margin: 2px 0 0 8px;
+}
+ul.treeselect .treeselect-menu {
+	margin: 0 6px;
+}
+ul.treeselect ul.dropdown-menu {
+	margin: 0;
+}
+ul.treeselect ul.dropdown-menu li {
+	padding: 0 5px;
+	border: none;
+}
+.tree-holder .folder-url,
+.tree-holder .file {
+	position: relative;
+	background-color: #fefefe;
+	margin-bottom: 4px;
+	padding: 0 10px;
+	line-height: 32px;
+	border: 1px solid rgba(0,0,0,0.08);
+}
+.tree-holder .folder-url,
+.tree-holder .folder-url:hover,
+.tree-holder .folder-url:focus {
+	font-weight: bold;
+	background-color: #f5f5f5;
+	color: #3071a9;
+}
+.tree-holder .active {
+	background-color: #3071a9;
+	color: #fff;
+	box-shadow: -3px 0 0 #36a2ff !important;
+}
+.tree-holder .active.folder-url {
+	background-color: #f5f5f5;
+	color: #3071a9;
+}
+.tree-holder .active.file:hover {
+	background-color: #3071a9;
+}
+.tree-holder ul ul {
+	box-shadow: -3px 0 0 rgba(0,0,0,0.08);
+	padding-right: 0;
+}
+.tree-holder ul ul .folder-url,
+.tree-holder ul ul .file {
+	box-shadow: -3px 0 0 #3071a9;
+	border-left: 0;
+}
+.break-word {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.disabled {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.j-links-separator {
+	margin: 20px 0px;
+	width: 100%;
+	height: 0px;
+	border-top: 2px solid #DDDDDD;
+}
+.container-main,
+#system-debug {
+	padding-bottom: 50px;
+}
+.pagination-toolbar {
+	margin: 0;
+}
+.pagination-toolbar a {
+	line-height: 26px;
+}
+.pull-right > .dropdown-menu {
+	left: auto;
+	right: 0;
+}
+.nav-filters hr {
+	margin: 5px 0;
+}
+#assignment.tab-pane {
+	min-height: 500px;
+}
+@media (max-width: 979px) {
+	.container-fluid {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 768px) {
+	body {
+		padding-top: 30px;
+	}
+	.nav-collapse.collapse.in {
+		height: auto !important;
+	}
+}
+@media (max-width: 767px) {
+	.container-fluid {
+		padding-left: 0;
+		padding-right: 0;
+	}
+}
+@media (max-width: 479px) {
+	.pagination a {
+		padding: 5px;
+	}
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7 {
+		display: none;
+	}
+	.btn-group + .btn-group {
+		margin-left: 10px;
+	}
+}
+.info-labels {
+	margin-top: -5px;
+	margin-bottom: 10px;
+}
+.sortable-handler.inactive {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+.alert-joomlaupdate {
+	text-align: center;
+}
+.alert-joomlaupdate button {
+	vertical-align: baseline;
+}
+.j-jed-message {
+	line-height: 2em;
+	color: #333333;
+}
+.upload-queue > li > span,
+.upload-queue > li > a {
+	margin: 0 2px;
+}
+.upload-queue .file-remove {
+	float: right;
+}
+.moor-box {
+	z-index: 3;
+}
+.admin .chzn-container .chzn-drop {
+	z-index: 1060;
+}
+.item-associations {
+	margin: 0;
+}
+.item-associations li {
+	list-style: none;
+	display: inline-block;
+	margin: 0 0 3px 0;
+}
+.item-associations li a {
+	color: #ffffff;
+}
+#flag img {
+	padding-top: 6px;
+	vertical-align: top;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+#permissions-sliders .chzn-container {
+	margin-top: -5px;
+	position: absolute;
+}
+#permissions-sliders .table td {
+	padding: 8px 8px 9px;
+}
+.img-preview > img {
+	max-height: 100%;
+}
+#helpsite-refresh {
+	padding: 4px 12px;
+	vertical-align: top;
+}
+.alert-no-items {
+	margin-top: 20px;
+}
+@media (max-width: 767px) {
+	html[dir=rtl] #toolbar #toolbar-options,
+	html[dir=rtl] #toolbar #toolbar-help,
+	#toolbar #toolbar-options,
+	#toolbar #toolbar-help {
+		float: none;
+	}
+}
+#permissions-sliders .input-small {
+	width: 120px;
+}
+.editor {
+	overflow: hidden;
+	position: relative;
+}
+.editor textarea.mce_editable {
+	box-sizing: border-box;
+}
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/publish_r.png');
+}
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/icon-16-allow.png');
+}
+textarea,
+input,
+.uneditable-input {
+	box-shadow: none !important;
+}
+textarea:focus,
+input:focus,
+.uneditable-input:focus {
+	box-shadow: none;
+	border: 1px solid #3071A9;
+}
+.js-pstats-data-details dd {
+	margin-left: 240px;
+}
+.js-pstats-data-details dt {
+	width: 220px;
+}
+#permissions table td,
+#page-permissions table td {
+	vertical-align: middle;
+}
+#permissions table select,
+#page-permissions table select {
+	margin-bottom: 0;
+}
+.js-stools-container-bar .btn-primary .caret {
+	border-bottom: 4px solid #fff;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .add-on,
+.input-prepend .btn,
+.input-prepend .btn-group > .dropdown-toggle {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.alert,
+.alert-options,
+.badge,
+.breadcrumb > li,
+.close,
+.input-append .add-on,
+.input-prepend .add-on,
+.label,
+.nav-header,
+.nav-list .nav-header,
+.nav-list > .active > a,
+.nav-list > .active > a:focus,
+.nav-list > .active > a:hover,
+.nav-list > li > a,
+.nav-tabs.nav-dark,
+.navbar .brand,
+.navbar .nav > li > a,
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a,
+.navbar-inverse .navbar-search .search-query.focused,
+.navbar-inverse .navbar-search .search-query:focus,
+.progress .bar,
+.subhead {
+	text-shadow: none;
+}
+.popover-content {
+	min-height: 33px;
+}
+.lead,
+.navbar .brand,
+.hero-unit,
+.hero-unit .lead {
+	font-weight: 400;
+}
+.com_cpanel .well {
+	padding: 8px 14px;
+	border: 1px solid rgba(0,0,0,0.05);
+}
+.com_cpanel .well .module-title.nav-header {
+	color: #555;
+}
+.com_cpanel .well > .row-striped,
+.com_cpanel .well > .list-striped {
+	margin: 0 -14px;
+}
+.com_cpanel .well > .row-striped > .row-fluid,
+.com_cpanel .well > .list-striped > .row-fluid {
+	padding: 8px 14px;
+}
+.com_cpanel .well > .row-striped > .row-fluid [class*="span"],
+.com_cpanel .well > .list-striped > .row-fluid [class*="span"] {
+	margin-left: 0;
+}
+.com_cpanel .well > .row-striped > li,
+.com_cpanel .well > .list-striped > li {
+	padding-left: 15px;
+	padding-right: 15px;
+}
+.com_postinstall fieldset {
+	background-color: #fafafa;
+	border: 1px solid #ccc;
+	border-radius: 5px;
+	margin: 0 0 18px;
+	padding: 4px 18px 18px;
+}
+.com_postinstall fieldset .btn {
+	margin-top: 10px;
+}
+.com_postinstall legend {
+	border: 0 none;
+	display: inline-block;
+	padding: 0 5px;
+	margin-bottom: 0;
+	width: auto;
+}
+#menu-assignment {
+	position: relative;
+}
+#menu-assignment .menu-links {
+	margin-top: 15px;
+	margin-left: 0;
+	-webkit-column-count: 3;
+	-moz-column-count: 3;
+	column-count: 3;
+	-moz-column-gap: 15px;
+	-webkit-column-gap: 15px;
+	column-gap: 15px;
+}
+#menu-assignment .menu-links > li {
+	display: inline-block;
+	vertical-align: top;
+	margin-bottom: 15px;
+	width: 100%;
+	list-style: none;
+}
+#menu-assignment .menu-links-block {
+	background-color: #fafafa;
+	border: 1px solid #ddd;
+	border-radius: 3px;
+	padding: 15px;
+}
+@media (max-width: 767px) {
+	#menu-assignment .menu-links {
+		-webkit-column-count: auto;
+		-moz-column-count: auto;
+		column-count: auto;
+	}
+}
+.pull-right {
+	float: left;
+}
+.pull-left {
+	float: right;
+}
+.table th,
+.table td {
+	text-align: right;
+}
+.navbar .brand {
+	float: right;
+	padding: 8px 20px 8px 12px;
+	margin-right: -20px;
+	margin-left: 0;
+}
+.navbar .nav,
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav.pull-right {
+	margin-right: 10px;
+	margin-left: 0px;
+}
+.pull-right > .dropdown-menu {
+	left: 0;
+	right: auto;
+}
+[class*="span"] {
+	float: right;
+	margin-right: 20px;
+	margin-left: 0px;
+}
+.row-fluid [class*="span"] {
+	float: right;
+	margin-right: 2.127659574%;
+	*margin-right: 2.0744680846382977%;
+	margin-left: 0px !important;
+	*margin-left: 0px !important;
+}
+.row-fluid [class*="span"]:first-child {
+	margin-right: 0;
+}
+.form-horizontal .control-label {
+	float: right;
+	width: auto;
+	padding-left: 5px;
+	padding-right: 0;
+	text-align: right;
+}
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-right: 20px;
+	margin-right: 160px;
+	*margin-right: 0;
+	margin-left: 0;
+	text-align: right;
+	margin-top: 6px;
+}
+.form-horizontal .controls:first-child {
+	*padding-right: 160px;
+}
+.form-vertical .controls {
+	*display: inline-block;
+	*padding-right: 20px;
+	margin-right: 0;
+	*margin-right: 0;
+	margin-left: 0;
+	text-align: right;
+	margin-top: 6px;
+}
+.form-vertical .control-label {
+	float: none;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: right;
+	width: auto;
+}
+.chzn-container-single-nosearch .chzn-search input {
+	position: absolute;
+	left: -9000px;
+	display: none;
+}
+.nav-tabs > li,
+.nav-pills > li {
+	float: right;
+}
+.nav-stacked > li {
+	float: none;
+}
+.btn-group > .btn {
+	float: right;
+	margin-right: -1px;
+	margin-left: 0;
+}
+.btn-group > .btn:first-child {
+	margin-right: 0;
+}
+.btn-group > .btn:first-child,
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-topright: 4px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+}
+.btn-group > .btn.large:first-child {
+	-webkit-border-bottom-left-radius: 0px;
+	border-bottom-left-radius: 0px;
+	-webkit-border-top-left-radius: 0px;
+	border-top-left-radius: 0px;
+	-moz-border-radius-bottomleft: 0px;
+	-moz-border-radius-topleft: 0px;
+	margin-right: 0;
+	-webkit-border-bottom-right-radius: 6px;
+	border-bottom-right-radius: 6px;
+	-webkit-border-top-right-radius: 6px;
+	border-top-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	-moz-border-radius-topright: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-top-left-radius: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	border-bottom-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	-moz-border-radius-bottomleft: 6px;
+}
+.btn-group > .btn:first-child:last-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-topright: 4px;
+}
+.input-prepend .add-on {
+	float: right;
+}
+.input-append .add-on {
+	float: none;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	margin-right: 0;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append .uneditable-input {
+	border-left-color: #ccc;
+	border-right-color: #eee;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-left: -1px;
+	margin-right: 0px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+	float: right;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-right: -1px;
+	margin-left: 0px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+body {
+	direction: rtl;
+}
+.pager .next a {
+	float: left;
+}
+.pager .previous a {
+	float: right;
+}
+.icon-arrow-right {
+	background-position: -241px -94px;
+	float: left;
+	padding-right: 3px;
+}
+.icon-arrow-left {
+	background-position: -264px -95px;
+}
+.icon-refresh {
+	background-position: -240px -23px;
+}
+#refresh-status {
+	background-position: right center;
+	padding-left: 0;
+	padding-right: 25px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+	float: right;
+	margin-right: 2px;
+	margin-left: 5px;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: right;
+}
+.btn-group + .btn-group {
+	margin-right: 5px;
+	margin-left: 0px;
+}
+.tabs-left > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #DDD;
+	margin-right: 0px;
+	border-right: 0px;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover {
+	border-color: #DDD #DDD #DDD transparent;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+	margin-right: 0px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0px;
+}
+.btn-toolbar {
+	margin-top: 14px;
+	margin-bottom: 3px;
+}
+.navbar .nav > li {
+	float: right;
+}
+.icon-folder-2 {
+	line-height: 25px;
+	padding-left: 5px;
+}
+.navbar .nav > li > a {
+	padding: 8px 10px;
+	color: #FFFFFF;
+}
+.navigation .nav li li .nav-child {
+	left: auto;
+	right: 100%;
+}
+.navigation .nav li li .nav-child:before {
+	left: auto;
+	right: -7px;
+	border-left: 7px solid rgba(0,0,0,0.2);
+	border-right-width: 0;
+}
+.navigation .nav li li .nav-child:after {
+	left: auto;
+	right: -6px;
+	border-left: 6px solid #ffffff;
+	border-right-width: 0;
+}
+.container-logo {
+	padding-top: 6px;
+	float: left;
+	text-align: left;
+}
+.modal-header .close {
+	float: left;
+}
+.pagination a {
+	float: right;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-right: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination a {
+	float: right;
+	padding: 0 14px;
+	line-height: 34px;
+	text-decoration: none;
+	border: 1px solid #ddd;
+	border-right-width: 0;
+}
+.pagination li:first-child a {
+	border-right-width: 1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.pagination li:last-child a {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.icon-first:before {
+	content: "\e000";
+}
+.icon-previous:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\7b";
+}
+.icon-next:before {
+	content: "\7c";
+}
+.dl-horizontal dt {
+	float: right;
+	text-align: left;
+	clear: right;
+}
+.dl-horizontal dd {
+	margin-left: 0;
+	margin-right: 180px;
+}
+.dl-horizontal dt,
+.profile> ul {
+	margin: 9px 25px 0 0;
+}
+.dropdown-submenu > a:after {
+	float: left;
+	border-width: 5px 5px 5px 0;
+	margin-left: -10px;
+	border-left-color: transparent;
+	border-right-color: #CCC;
+}
+.badge {
+	margin-left: 10px;
+}
+.tip-text {
+	text-align: right;
+}
+.icon-file-add:before {
+	content: "(";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: ">";
+}
+.icon-checkin:before,
+.icon-checkbox:before {
+	content: "<";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "[";
+}
+.btn-toolbar .btn + .btn,
+.btn-toolbar .btn-group + .btn,
+.btn-toolbar .btn + .btn-group {
+	margin-left: 0;
+	margin-right: 5px;
+}
+.btn-toolbar .btn-wrapper {
+	display: inline-block;
+	margin: 0 5px 5px 0;
+}
+.btn-group > .btn + .btn {
+	margin-left: 0;
+	margin-right: -1px;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: 0;
+	margin-right: -1px;
+}
+.table-bordered {
+	border-right-width: 0;
+	border-left-width: 1px;
+	border-right-style: none;
+	border-left-style: solid;
+	border-right-color: -moz-use-text-color;
+	border-left-color: #DDDDDD;
+}
+.chzn-container-single .chzn-single {
+	padding-right: 8px;
+	padding-left: 0;
+}
+.chzn-container-single .chzn-single span {
+	margin-left: 26px;
+	margin-right: 0;
+}
+.chzn-container-single .chzn-single abbr {
+	left: 26px;
+	right: auto;
+}
+.chzn-container-single .chzn-single div {
+	left: 0;
+	right: auto;
+}
+.chzn-container-multi .chzn-choices li {
+	float: right;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+	margin-right: 5px;
+	margin-left: 0;
+	padding-right: 5px;
+	padding-left: 20px;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+	left: 3px;
+	right: auto;
+}
+.chzn-container.chzn-with-drop .chzn-drop {
+	right: 0;
+	left: auto;
+}
+.chzn-container-single.chzn-container-single-nosearch .chzn-search {
+	position: absolute;
+	right: -9999px;
+	left: auto;
+}
+.chzn-container .chzn-drop {
+	right: -9999px;
+	left: auto;
+}
+.alert {
+	padding-right: 14px;
+	padding-left: 35px;
+}
+.alert .close {
+	left: -21px;
+	right: auto;
+}
+.close {
+	float: left;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+	margin-bottom: 9px;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+	float: right;
+	margin-left: 3px;
+	margin-right: 0;
+}
+.com_media .container-main .media {
+	display: inline-block;
+}
+.thumbnails > li {
+	float: right;
+	margin-bottom: 18px;
+	margin-right: 20px;
+}
+#mediamanager-form .description,
+#mediamanager-form .filesize,
+#mediamanager-form .dimensions {
+	direction: ltr;
+}
+.popover,
+.tooltip-inner {
+	text-align: right;
+}
+.popover.top .arrow,
+.popover.bottom .arrow {
+	margin-right: -11px;
+}
+.popover.top .arrow:after,
+.popover.bottom .arrow:after {
+	margin-right: -10px;
+}
+@media (max-width: 480px) {
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0 0 5px 0;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		margin-left: 0px;
+		margin-right: 10px;
+	}
+}
+#pop-print {
+	float: left;
+	margin: 10px;
+}
+#install_url,
+#install_directory,
+#jform_customurl,
+#jform_link,
+#jform_params_url,
+input[type="url"] {
+	text-align: left;
+	direction: ltr;
+}
+#aside .nav .nav-child {
+	border-left: 0;
+	border-right: 2px solid #ddd;
+	padding-left: 0;
+	padding-right: 5px;
+}
+.dropdown-menu {
+	text-align: right;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	margin-left: .25em;
+}
+.navbar .admin-logo {
+	float: right;
+	padding: 7px 15px 0px 12px;
+}
+.navbar .brand {
+	float: left;
+	padding: 6px 10px;
+}
+.navbar .nav {
+	margin: 0 0 0 10px;
+}
+.navbar .nav > li > a {
+	padding: 6px 10px;
+}
+.navbar .nav > li ul {
+	overflow-y: auto;
+	overflow-x: hidden;
+	-webkit-overflow-scrolling: touch;
+	-moz-overflow-scrolling: touch;
+	-ms-overflow-scrolling: touch;
+	-o-overflow-scrolling: touch;
+	overflow-scrolling: touch;
+	height: auto;
+	max-height: 500px;
+	margin: 0;
+}
+.navbar .nav > li ul::-webkit-scrollbar {
+	-webkit-appearance: none;
+	width: 7px;
+}
+.navbar .nav > li ul::-webkit-scrollbar-thumb {
+	border-radius: 4px;
+	background-color: rgba(0,0,0,0.5);
+	-webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5);
+}
+.navbar .nav-user .dropdown-menu li span {
+	padding-left: 0;
+	padding-right: 10px;
+}
+.navbar .nav > .dropdown.open:after {
+	right: 10px;
+	width: 0;
+}
+.navbar .empty-nav {
+	display: none;
+}
+#toolbar .btn {
+	padding: 0 10px;
+}
+#toolbar [class^="icon-"],
+#toolbar [class*=" icon-"] {
+	border-radius: 0 3px 3px 0;
+	border-right: 0;
+	border-left: 1px solid #b3b3b3;
+	margin: 0 -10px 0 6px;
+}
+.chzn-container-single .chzn-single {
+	padding-left: 8px;
+}
+.chzn-container-single .chzn-single div {
+	border-left: 0;
+	border-right: 1px solid #cccccc;
+}
+.chzn-container-single .chzn-single abbr {
+	left: 36px;
+}
+.chzn-container-active.chzn-with-drop .chzn-single div {
+	background-color: #f3f3f3;
+	border-bottom: 1px solid #cccccc;
+	border-bottom-left-radius: 0px;
+	border-bottom-right-radius: 3px;
+	border-left: 1px solid #cccccc;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+	padding-left: 7px;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+	margin-left: 0;
+	margin-right: 3px;
+}
+.chzn-container .chzn-single.chzn-color[rel="value_0"] div,
+.chzn-container .chzn-single.chzn-color[rel="value_1"] div {
+	border-right: none;
+}
+.chzn-container-single .chzn-search::after {
+	left: 20px;
+	right: auto;
+}
+.container-logo {
+	padding-top: 0;
+	float: left;
+	text-align: left;
+}
+.page-title [class^="icon-"],
+.page-title [class*=" icon-"] {
+	margin-right: 0;
+	margin-left: 16px;
+}
+@media (max-width: 767px) {
+	.navbar .admin-logo {
+		margin-right: 10px;
+		padding: 9px 9px 0 9px;
+	}
+	.navbar .btn-navbar {
+		float: left;
+		margin-right: 5px;
+		margin-left: 3px;
+	}
+	.navbar .nav-collapse .nav.pull-left {
+		float: none;
+		margin-left: 0;
+		margin-right: 0;
+	}
+	.nav-collapse .nav > li {
+		float: none;
+	}
+	.page-title [class^="icon-"],
+	.page-title [class*=" icon-"] {
+		margin-left: 10px;
+	}
+}
+#status {
+	padding: 4px 10px;
+}
+#status .btn-group {
+	margin: 0;
+}
+#status .btn-group.separator:after {
+	content: ' ';
+	display: block;
+	float: left;
+	background: #ADADAD;
+	margin: 0 10px;
+	height: 15px;
+	width: 1px;
+}
+#status .badge {
+	margin-left: .25em;
+	margin-right: 0;
+}
+.dropdown-menu > li > a {
+	text-align: right;
+}
+.btn-group.btn-group-yesno > .btn,
+.btn-group > .btn,
+.btn-group > .btn + .dropdown-toggle {
+	float: none;
+}
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/publish_r.png');
+}
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/icon-16-allow.png');
+}
+.view-login .login-joomla {
+	position: absolute;
+	right: 50%;
+	height: 24px;
+	width: 24px;
+	margin-right: -12px;
+	font-size: 22px;
+}
+.view-login .input-medium {
+	width: 169px;
+}
+.login .chzn-single {
+	width: 219px !important;
+}
+.login .chzn-container,
+.login .chzn-drop {
+	width: 227px !important;
+	max-width: 227px !important;
+}
+.login .input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+	border-right: 0px;
+}
+.j-sidebar-container {
+	position: absolute;
+	display: block;
+	left: auto;
+	right: -16.5%;
+	padding-top: 28px;
+	padding-bottom: 40px;
+	clear: both;
+	margin: -10px -1px 0 0;
+	border-right: 0;
+	border-left: 1px solid #d3d3d3;
+}
+.j-sidebar-container.j-sidebar-hidden {
+	left: auto;
+	right: -16.5%;
+}
+.j-sidebar-container.j-sidebar-visible {
+	left: auto;
+	right: 0;
+}
+.j-toggle-sidebar-header {
+	padding: 10px 19px 10px 0;
+}
+.sidebar {
+	padding: 3px 4px 3px 3px;
+}
+.j-toggle-button-wrapper.j-toggle-hidden {
+	right: auto;
+	left: -24px;
+}
+.j-toggle-button-wrapper.j-toggle-visible {
+	right: auto;
+	left: 10px;
+}
+.j-sidebar-container .icon-folder-2 {
+	line-height: 15px;
+	padding-left: 0;
+}
+#system-message-container,
+#j-main-container {
+	padding: 0 5px 0 0;
+}
+#system-message-container.j-toggle-main,
+#j-main-container.j-toggle-main,
+#system-debug.j-toggle-main {
+	float: left;
+}
+@media (max-width: 979px) {
+	.j-toggle-button-wrapper.j-toggle-hidden {
+		right: auto;
+		left: -20px;
+	}
+}
+@media (max-width: 767px) {
+	.j-sidebar-container {
+		position: relative;
+		padding: 0;
+		border-right: 0;
+		border-left: 0;
+	}
+	.j-sidebar-container.j-sidebar-hidden {
+		margin-left: auto;
+		margin-right: 16.5%;
+	}
+	.j-sidebar-container.j-sidebar-visible {
+		margin-left: auto;
+		margin-right: 0;
+	}
+	.view-login select {
+		width: 229px;
+	}
+}
+#j-main-container.expanded {
+	margin-right: 0;
+}
+@media (min-width: 768px) {
+	.row-fluid [class*="span"] {
+		margin-right: 15px;
+		margin-left: 0;
+	}
+	.row-fluid .modal-batch [class*="span"] {
+		margin-right: 0;
+	}
+}
+.row-fluid .modal-batch [class*="span"] {
+	margin-right: 0;
+}
+@media (max-width: 479px) {
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+		margin-right: 0px;
+	}
+	.btn-toolbar .btn-wrapper {
+		margin: 0 10px 5px 10px;
+	}
+}
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+	.view-login .input-medium {
+		width: 173px;
+	}
+	.view-login select {
+		width: 229px;
+	}
+}
+.js-pstats-data-details dd {
+	margin-right: 240px;
+}
+.modal-footer button {
+	float: left;
+}
+.modal-header {
+	text-align: right;
+}
+#mediamanager-form .thumbnails-media .thumbnail {
+	margin-left: 18px !important;
+	margin-right: 0;
+	direction: ltr;
+	text-align: center;
+}
+.thumbnails-media .imgThumb label::before,
+.thumbnails-media .imgThumb .imgThumbInside::before {
+	left: 0;
+	right: auto;
+	border-radius: 3px 0;
+}
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
+	left: auto;
+	right: 5px;
+}
+.thumbnails-media .imgDelete a.close {
+	border-radius: 0 3px;
+}
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
+	border-radius: 3px 0;
+	border-width: 1px;
+	left: 0;
+	right: 0;
+	text-align: left;
+	direction: ltr;
+}
+.thumbnails-media .imgPreview a {
+	width: 100%;
+}
+.subform-table-layout td {
+	padding-left: 10px;
+}
+.subform-table-layout td::before {
+	content: attr(data-column);
+	left: auto;
+	right: 10px;
+	padding-left: 10px;
+	padding-right: 0;
+}
+.subform-table-layout .subform-repeatable tbody td:last-of-type {
+	text-align: left;
+}
+.subform-table-layout .form-horizontal .controls {
+	margin-top: 0;
+}
+.tree-holder ul ul {
+	padding-right: 15px;
+	box-shadow: 3px 0 0 rgba(0,0,0,0.08);
+	padding-left: 0;
+}
+.tree-holder ul ul .folder-url,
+.tree-holder ul ul .file {
+	box-shadow: 3px 0 0 #3071a9;
+	border-right: 0;
+	border-left: 1px solid rgba(0,0,0,0.08);
+}
diff --git a/core/administrator/templates/isis/css/template.css b/core/administrator/templates/isis/css/template.css
new file mode 100644
index 00000000..5cce4e7b
--- /dev/null
+++ b/core/administrator/templates/isis/css/template.css
@@ -0,0 +1,9105 @@
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+	display: block;
+}
+audio,
+canvas,
+video {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+audio:not([controls]) {
+	display: none;
+}
+html {
+	font-size: 100%;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+}
+a:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+a:hover,
+a:active {
+	outline: 0;
+}
+sub,
+sup {
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline;
+}
+sup {
+	top: -0.5em;
+}
+sub {
+	bottom: -0.25em;
+}
+img {
+	max-width: 100%;
+	width: auto \9;
+	height: auto;
+	vertical-align: middle;
+	border: 0;
+	-ms-interpolation-mode: bicubic;
+}
+#map_canvas img,
+.google-maps img,
+.gm-style img {
+	max-width: none;
+}
+button,
+input,
+select,
+textarea {
+	margin: 0;
+	font-size: 100%;
+	vertical-align: middle;
+}
+button,
+input {
+	*overflow: visible;
+	line-height: normal;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+	-webkit-appearance: button;
+	cursor: pointer;
+}
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+	cursor: pointer;
+}
+input[type="search"] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+	-webkit-appearance: none;
+}
+textarea {
+	overflow: auto;
+	vertical-align: top;
+}
+@media print {
+	* {
+		text-shadow: none !important;
+		color: #000 !important;
+		background: transparent !important;
+		box-shadow: none !important;
+	}
+	a,
+	a:visited {
+		text-decoration: underline;
+	}
+	a[href]:after {
+		content: " (" attr(href) ")";
+	}
+	abbr[title]:after {
+		content: " (" attr(title) ")";
+	}
+	.ir a:after,
+	a[href^="javascript:"]:after,
+	a[href^="#"]:after {
+		content: "";
+	}
+	pre,
+	blockquote {
+		border: 1px solid #999;
+		page-break-inside: avoid;
+	}
+	thead {
+		display: table-header-group;
+	}
+	tr,
+	img {
+		page-break-inside: avoid;
+	}
+	img {
+		max-width: 100% !important;
+	}
+	@page {
+		margin: 0.5cm;
+	}
+	p,
+	h2,
+	h3 {
+		orphans: 3;
+		widows: 3;
+	}
+	h2,
+	h3 {
+		page-break-after: avoid;
+	}
+}
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 28px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+body {
+	margin: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	line-height: 18px;
+	color: #333;
+	background-color: #fff;
+}
+a {
+	color: #3071a9;
+	text-decoration: none;
+}
+a:hover,
+a:focus {
+	color: #1f496e;
+	text-decoration: underline;
+}
+.img-rounded {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.img-polaroid {
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+}
+.img-circle {
+	-webkit-border-radius: 500px;
+	-moz-border-radius: 500px;
+	border-radius: 500px;
+}
+.row {
+	margin-left: -20px;
+	*zoom: 1;
+}
+.row:before,
+.row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row:after {
+	clear: both;
+}
+[class*="span"] {
+	float: left;
+	min-height: 1px;
+	margin-left: 20px;
+}
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.span12 {
+	width: 940px;
+}
+.span11 {
+	width: 860px;
+}
+.span10 {
+	width: 780px;
+}
+.span9 {
+	width: 700px;
+}
+.span8 {
+	width: 620px;
+}
+.span7 {
+	width: 540px;
+}
+.span6 {
+	width: 460px;
+}
+.span5 {
+	width: 380px;
+}
+.span4 {
+	width: 300px;
+}
+.span3 {
+	width: 220px;
+}
+.span2 {
+	width: 140px;
+}
+.span1 {
+	width: 60px;
+}
+.offset12 {
+	margin-left: 980px;
+}
+.offset11 {
+	margin-left: 900px;
+}
+.offset10 {
+	margin-left: 820px;
+}
+.offset9 {
+	margin-left: 740px;
+}
+.offset8 {
+	margin-left: 660px;
+}
+.offset7 {
+	margin-left: 580px;
+}
+.offset6 {
+	margin-left: 500px;
+}
+.offset5 {
+	margin-left: 420px;
+}
+.offset4 {
+	margin-left: 340px;
+}
+.offset3 {
+	margin-left: 260px;
+}
+.offset2 {
+	margin-left: 180px;
+}
+.offset1 {
+	margin-left: 100px;
+}
+.row-fluid {
+	width: 100%;
+	*zoom: 1;
+}
+.row-fluid:before,
+.row-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row-fluid:after {
+	clear: both;
+}
+.row-fluid [class*="span"] {
+	display: block;
+	width: 100%;
+	min-height: 28px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+	margin-left: 2.1276595744681%;
+	*margin-left: 2.0744680851064%;
+}
+.row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+	margin-left: 2.1276595744681%;
+}
+.row-fluid .span12 {
+	width: 100%;
+	*width: 99.946808510638%;
+}
+.row-fluid .span11 {
+	width: 91.489361702128%;
+	*width: 91.436170212766%;
+}
+.row-fluid .span10 {
+	width: 82.978723404255%;
+	*width: 82.925531914894%;
+}
+.row-fluid .span9 {
+	width: 74.468085106383%;
+	*width: 74.414893617021%;
+}
+.row-fluid .span8 {
+	width: 65.957446808511%;
+	*width: 65.904255319149%;
+}
+.row-fluid .span7 {
+	width: 57.446808510638%;
+	*width: 57.393617021277%;
+}
+.row-fluid .span6 {
+	width: 48.936170212766%;
+	*width: 48.882978723404%;
+}
+.row-fluid .span5 {
+	width: 40.425531914894%;
+	*width: 40.372340425532%;
+}
+.row-fluid .span4 {
+	width: 31.914893617021%;
+	*width: 31.86170212766%;
+}
+.row-fluid .span3 {
+	width: 23.404255319149%;
+	*width: 23.351063829787%;
+}
+.row-fluid .span2 {
+	width: 14.893617021277%;
+	*width: 14.840425531915%;
+}
+.row-fluid .span1 {
+	width: 6.3829787234043%;
+	*width: 6.3297872340426%;
+}
+.row-fluid .offset12 {
+	margin-left: 104.25531914894%;
+	*margin-left: 104.14893617021%;
+}
+.row-fluid .offset12:first-child {
+	margin-left: 102.12765957447%;
+	*margin-left: 102.02127659574%;
+}
+.row-fluid .offset11 {
+	margin-left: 95.744680851064%;
+	*margin-left: 95.63829787234%;
+}
+.row-fluid .offset11:first-child {
+	margin-left: 93.617021276596%;
+	*margin-left: 93.510638297872%;
+}
+.row-fluid .offset10 {
+	margin-left: 87.234042553191%;
+	*margin-left: 87.127659574468%;
+}
+.row-fluid .offset10:first-child {
+	margin-left: 85.106382978723%;
+	*margin-left: 85%;
+}
+.row-fluid .offset9 {
+	margin-left: 78.723404255319%;
+	*margin-left: 78.617021276596%;
+}
+.row-fluid .offset9:first-child {
+	margin-left: 76.595744680851%;
+	*margin-left: 76.489361702128%;
+}
+.row-fluid .offset8 {
+	margin-left: 70.212765957447%;
+	*margin-left: 70.106382978723%;
+}
+.row-fluid .offset8:first-child {
+	margin-left: 68.085106382979%;
+	*margin-left: 67.978723404255%;
+}
+.row-fluid .offset7 {
+	margin-left: 61.702127659574%;
+	*margin-left: 61.595744680851%;
+}
+.row-fluid .offset7:first-child {
+	margin-left: 59.574468085106%;
+	*margin-left: 59.468085106383%;
+}
+.row-fluid .offset6 {
+	margin-left: 53.191489361702%;
+	*margin-left: 53.085106382979%;
+}
+.row-fluid .offset6:first-child {
+	margin-left: 51.063829787234%;
+	*margin-left: 50.957446808511%;
+}
+.row-fluid .offset5 {
+	margin-left: 44.68085106383%;
+	*margin-left: 44.574468085106%;
+}
+.row-fluid .offset5:first-child {
+	margin-left: 42.553191489362%;
+	*margin-left: 42.446808510638%;
+}
+.row-fluid .offset4 {
+	margin-left: 36.170212765957%;
+	*margin-left: 36.063829787234%;
+}
+.row-fluid .offset4:first-child {
+	margin-left: 34.042553191489%;
+	*margin-left: 33.936170212766%;
+}
+.row-fluid .offset3 {
+	margin-left: 27.659574468085%;
+	*margin-left: 27.553191489362%;
+}
+.row-fluid .offset3:first-child {
+	margin-left: 25.531914893617%;
+	*margin-left: 25.425531914894%;
+}
+.row-fluid .offset2 {
+	margin-left: 19.148936170213%;
+	*margin-left: 19.042553191489%;
+}
+.row-fluid .offset2:first-child {
+	margin-left: 17.021276595745%;
+	*margin-left: 16.914893617021%;
+}
+.row-fluid .offset1 {
+	margin-left: 10.63829787234%;
+	*margin-left: 10.531914893617%;
+}
+.row-fluid .offset1:first-child {
+	margin-left: 8.5106382978723%;
+	*margin-left: 8.4042553191489%;
+}
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+	display: none;
+}
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+	float: right;
+}
+.container {
+	margin-right: auto;
+	margin-left: auto;
+	*zoom: 1;
+}
+.container:before,
+.container:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container:after {
+	clear: both;
+}
+.container-fluid {
+	padding-right: 20px;
+	padding-left: 20px;
+	*zoom: 1;
+}
+.container-fluid:before,
+.container-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container-fluid:after {
+	clear: both;
+}
+p {
+	margin: 0 0 9px;
+}
+.lead {
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	font-weight: 200;
+	line-height: 27px;
+}
+small {
+	font-size: 85%;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+cite {
+	font-style: normal;
+}
+.muted {
+	color: #999;
+}
+a.muted:hover,
+a.muted:focus {
+	color: #808080;
+}
+.text-warning {
+	color: #8a6d3b;
+}
+a.text-warning:hover,
+a.text-warning:focus {
+	color: #66512c;
+}
+.text-error {
+	color: #a94442;
+}
+a.text-error:hover,
+a.text-error:focus {
+	color: #843534;
+}
+.text-info {
+	color: #31708f;
+}
+a.text-info:hover,
+a.text-info:focus {
+	color: #245269;
+}
+.text-success {
+	color: #3c763d;
+}
+a.text-success:hover,
+a.text-success:focus {
+	color: #2b542c;
+}
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 9px 0;
+	font-family: inherit;
+	font-weight: bold;
+	line-height: 18px;
+	color: inherit;
+	text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+	font-weight: normal;
+	line-height: 1;
+	color: #999;
+}
+h1,
+h2,
+h3 {
+	line-height: 36px;
+}
+h1 {
+	font-size: 35.75px;
+}
+h2 {
+	font-size: 29.25px;
+}
+h3 {
+	font-size: 22.75px;
+}
+h4 {
+	font-size: 16.25px;
+}
+h5 {
+	font-size: 13px;
+}
+h6 {
+	font-size: 11.05px;
+}
+h1 small {
+	font-size: 22.75px;
+}
+h2 small {
+	font-size: 16.25px;
+}
+h3 small {
+	font-size: 13px;
+}
+h4 small {
+	font-size: 13px;
+}
+.page-header {
+	padding-bottom: 8px;
+	margin: 18px 0 27px;
+	border-bottom: 1px solid #eee;
+}
+ul,
+ol {
+	padding: 0;
+	margin: 0 0 9px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+	margin-bottom: 0;
+}
+li {
+	line-height: 18px;
+}
+ul.unstyled,
+ol.unstyled {
+	margin-left: 0;
+	list-style: none;
+}
+ul.inline,
+ol.inline {
+	margin-left: 0;
+	list-style: none;
+}
+ul.inline > li,
+ol.inline > li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+dl {
+	margin-bottom: 18px;
+}
+dt,
+dd {
+	line-height: 18px;
+}
+dt {
+	font-weight: bold;
+}
+dd {
+	margin-left: 9px;
+}
+.dl-horizontal {
+	*zoom: 1;
+}
+.dl-horizontal:before,
+.dl-horizontal:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.dl-horizontal:after {
+	clear: both;
+}
+.dl-horizontal dt {
+	float: left;
+	width: 160px;
+	clear: left;
+	text-align: right;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.dl-horizontal dd {
+	margin-left: 180px;
+}
+hr {
+	margin: 18px 0;
+	border: 0;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #fff;
+}
+abbr[title],
+abbr[data-original-title] {
+	cursor: help;
+	border-bottom: 1px dotted #999;
+}
+abbr.initialism {
+	font-size: 90%;
+	text-transform: uppercase;
+}
+blockquote {
+	padding: 0 0 0 15px;
+	margin: 0 0 18px;
+	border-left: 5px solid #eee;
+}
+blockquote p {
+	margin-bottom: 0;
+	font-size: 16.25px;
+	font-weight: 300;
+	line-height: 1.25;
+}
+blockquote small {
+	display: block;
+	line-height: 18px;
+	color: #999;
+}
+blockquote small:before {
+	content: '\2014 \00A0';
+}
+blockquote.pull-right {
+	float: right;
+	padding-right: 15px;
+	padding-left: 0;
+	border-right: 5px solid #eee;
+	border-left: 0;
+}
+blockquote.pull-right p,
+blockquote.pull-right small {
+	text-align: right;
+}
+blockquote.pull-right small:before {
+	content: '';
+}
+blockquote.pull-right small:after {
+	content: '\00A0 \2014';
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+	content: "";
+}
+address {
+	display: block;
+	margin-bottom: 18px;
+	font-style: normal;
+	line-height: 18px;
+}
+code,
+pre {
+	padding: 0 3px 2px;
+	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-size: 11px;
+	color: #333;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+code {
+	padding: 2px 4px;
+	color: #d14;
+	background-color: #f7f7f9;
+	border: 1px solid #e1e1e8;
+	white-space: nowrap;
+}
+pre {
+	display: block;
+	padding: 8.5px;
+	margin: 0 0 9px;
+	font-size: 12px;
+	line-height: 18px;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.15);
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+pre.prettyprint {
+	margin-bottom: 18px;
+}
+pre code {
+	padding: 0;
+	color: inherit;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: transparent;
+	border: 0;
+}
+.pre-scrollable {
+	max-height: 340px;
+	overflow-y: scroll;
+}
+form {
+	margin: 0 0 18px;
+}
+fieldset {
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	line-height: 36px;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5;
+}
+legend small {
+	font-size: 13.5px;
+	color: #999;
+}
+label,
+input,
+button,
+select,
+textarea {
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+}
+input,
+button,
+select,
+textarea {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+label {
+	display: block;
+	margin-bottom: 5px;
+}
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	display: inline-block;
+	height: 18px;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px;
+	line-height: 18px;
+	color: #555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	vertical-align: middle;
+}
+input,
+textarea,
+.uneditable-input {
+	width: 206px;
+}
+textarea {
+	height: auto;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-webkit-transition: border linear .2s, box-shadow linear .2s;
+	-moz-transition: border linear .2s, box-shadow linear .2s;
+	-o-transition: border linear .2s, box-shadow linear .2s;
+	transition: border linear .2s, box-shadow linear .2s;
+}
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+	border-color: rgba(82,168,236,0.8);
+	outline: 0;
+	outline: thin dotted \9;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+input[type="radio"],
+input[type="checkbox"] {
+	margin: 4px 0 0;
+	*margin-top: 0;
+	margin-top: 1px \9;
+	line-height: normal;
+}
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+	width: auto;
+}
+select,
+input[type="file"] {
+	height: 28px;
+	*margin-top: 4px;
+	line-height: 28px;
+}
+select {
+	width: 220px;
+	border: 1px solid #ccc;
+	background-color: #fff;
+}
+select[multiple],
+select[size] {
+	height: auto;
+}
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.uneditable-input,
+.uneditable-textarea {
+	color: #999;
+	background-color: #fcfcfc;
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	cursor: not-allowed;
+}
+.uneditable-input {
+	overflow: hidden;
+	white-space: nowrap;
+}
+.uneditable-textarea {
+	width: auto;
+	height: auto;
+}
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+	color: #999;
+}
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+	color: #999;
+}
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+	color: #999;
+}
+.radio,
+.checkbox {
+	min-height: 18px;
+	padding-left: 20px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+	float: left;
+	margin-left: -20px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.radio.inline,
+.checkbox.inline {
+	display: inline-block;
+	padding-top: 5px;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+	margin-left: 10px;
+}
+.input-mini {
+	width: 60px;
+}
+.input-small {
+	width: 90px;
+}
+.input-medium {
+	width: 150px;
+}
+.input-large {
+	width: 210px;
+}
+.input-xlarge {
+	width: 270px;
+}
+.input-xxlarge {
+	width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+	float: none;
+	margin-left: 0;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+input,
+textarea,
+.uneditable-input {
+	margin-left: 0;
+}
+.controls-row [class*="span"] + [class*="span"] {
+	margin-left: 20px;
+}
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+	width: 926px;
+}
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+	width: 846px;
+}
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+	width: 766px;
+}
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+	width: 686px;
+}
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+	width: 606px;
+}
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+	width: 526px;
+}
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+	width: 446px;
+}
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+	width: 366px;
+}
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+	width: 286px;
+}
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+	width: 206px;
+}
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+	width: 126px;
+}
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+	width: 46px;
+}
+.controls-row {
+	*zoom: 1;
+}
+.controls-row:before,
+.controls-row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.controls-row:after {
+	clear: both;
+}
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+	float: left;
+}
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+	padding-top: 5px;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+	cursor: not-allowed;
+	background-color: #eee;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+	background-color: transparent;
+}
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+	color: #8a6d3b;
+}
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	color: #8a6d3b;
+}
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	border-color: #8a6d3b;
+}
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+	border-color: #66512c;
+}
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #8a6d3b;
+}
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+	color: #a94442;
+}
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	color: #a94442;
+}
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	border-color: #a94442;
+}
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+	border-color: #843534;
+}
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #a94442;
+}
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+	color: #3c763d;
+}
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	color: #3c763d;
+}
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	border-color: #3c763d;
+}
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+	border-color: #2b542c;
+}
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #3c763d;
+}
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+	color: #31708f;
+}
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+	color: #31708f;
+}
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+	border-color: #31708f;
+}
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+	border-color: #245269;
+}
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #31708f;
+}
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+	color: #b94a48;
+	border-color: #ee5f5b;
+}
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+	padding: 17px 20px 18px;
+	margin-top: 18px;
+	margin-bottom: 18px;
+	background-color: #F0F0F0;
+	border-top: 1px solid #e5e5e5;
+	*zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-actions:after {
+	clear: both;
+}
+.help-block,
+.help-inline {
+	color: #595959;
+}
+.help-block {
+	display: block;
+	margin-bottom: 9px;
+}
+.help-inline {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: middle;
+	padding-left: 5px;
+}
+.input-append,
+.input-prepend {
+	display: inline-block;
+	margin-bottom: 9px;
+	vertical-align: middle;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-append .dropdown-menu,
+.input-append .popover,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input,
+.input-prepend .dropdown-menu,
+.input-prepend .popover {
+	font-size: 13px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 18px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	text-align: center;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #eee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .add-on,
+.input-prepend .btn,
+.input-prepend .btn-group > .dropdown-toggle {
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+	margin-left: -1px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append .btn-group:first-child {
+	margin-left: 0;
+}
+input.search-query {
+	padding-right: 14px;
+	padding-right: 4px \9;
+	padding-left: 14px;
+	padding-left: 4px \9;
+	margin-bottom: 0;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.js-stools-field-filter .input-prepend,
+.js-stools-field-filter .input-append {
+	margin-bottom: 0;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+	display: inline-block;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+	padding-left: 0;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+	float: left;
+	margin-right: 3px;
+	margin-left: 0;
+}
+.control-group {
+	margin-bottom: 9px;
+}
+legend + .control-group {
+	margin-top: 18px;
+	-webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+	margin-bottom: 18px;
+	*zoom: 1;
+}
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-horizontal .control-group:after {
+	clear: both;
+}
+.form-horizontal .control-label {
+	float: left;
+	width: 160px;
+	padding-top: 5px;
+	text-align: right;
+}
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-left: 20px;
+	margin-left: 180px;
+	*margin-left: 0;
+}
+.form-horizontal .controls:first-child {
+	*padding-left: 180px;
+}
+.form-horizontal .help-block {
+	margin-bottom: 0;
+}
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+	margin-top: 9px;
+}
+.form-horizontal .form-actions {
+	padding-left: 180px;
+}
+.control-label .hasPopover,
+.control-label .hasTooltip {
+	display: inline-block;
+}
+.subform-repeatable-wrapper .btn-group>.btn.button {
+	min-width: 0;
+}
+.subform-repeatable-wrapper .ui-sortable-helper {
+	background: #fff;
+}
+.subform-repeatable-wrapper tr.ui-sortable-helper {
+	display: table;
+}
+@media (min-width: 980px) and (max-width: 1215px) {
+	.float-cols .control-label {
+		float: none;
+	}
+	.float-cols .controls {
+		margin-left: 0;
+	}
+}
+table {
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+.table {
+	width: 100%;
+	margin-bottom: 18px;
+}
+.table th,
+.table td {
+	padding: 8px;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: top;
+	border-top: 1px solid #ddd;
+}
+.table th {
+	font-weight: bold;
+}
+.table thead th {
+	vertical-align: bottom;
+}
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+	border-top: 0;
+}
+.table tbody + tbody {
+	border-top: 2px solid #ddd;
+}
+.table .table {
+	background-color: #fff;
+}
+.table-condensed th,
+.table-condensed td {
+	padding: 4px 5px;
+}
+.table-bordered {
+	border: 1px solid #ddd;
+	border-collapse: separate;
+	*border-collapse: collapse;
+	border-left: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.table-bordered th,
+.table-bordered td {
+	border-left: 1px solid #ddd;
+}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+	border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+}
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+}
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+	-webkit-border-bottom-left-radius: 0;
+	-moz-border-radius-bottomleft: 0;
+	border-bottom-left-radius: 0;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+	-webkit-border-bottom-right-radius: 0;
+	-moz-border-radius-bottomright: 0;
+	border-bottom-right-radius: 0;
+}
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+}
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+}
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+	background-color: #f9f9f9;
+}
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+	background-color: #F0F0F0;
+}
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+	display: table-cell;
+	float: none;
+	margin-left: 0;
+}
+.table td.span1,
+.table th.span1 {
+	float: none;
+	width: 44px;
+	margin-left: 0;
+}
+.table td.span2,
+.table th.span2 {
+	float: none;
+	width: 124px;
+	margin-left: 0;
+}
+.table td.span3,
+.table th.span3 {
+	float: none;
+	width: 204px;
+	margin-left: 0;
+}
+.table td.span4,
+.table th.span4 {
+	float: none;
+	width: 284px;
+	margin-left: 0;
+}
+.table td.span5,
+.table th.span5 {
+	float: none;
+	width: 364px;
+	margin-left: 0;
+}
+.table td.span6,
+.table th.span6 {
+	float: none;
+	width: 444px;
+	margin-left: 0;
+}
+.table td.span7,
+.table th.span7 {
+	float: none;
+	width: 524px;
+	margin-left: 0;
+}
+.table td.span8,
+.table th.span8 {
+	float: none;
+	width: 604px;
+	margin-left: 0;
+}
+.table td.span9,
+.table th.span9 {
+	float: none;
+	width: 684px;
+	margin-left: 0;
+}
+.table td.span10,
+.table th.span10 {
+	float: none;
+	width: 764px;
+	margin-left: 0;
+}
+.table td.span11,
+.table th.span11 {
+	float: none;
+	width: 844px;
+	margin-left: 0;
+}
+.table td.span12,
+.table th.span12 {
+	float: none;
+	width: 924px;
+	margin-left: 0;
+}
+.table tbody tr.success > td {
+	background-color: #dff0d8;
+}
+.table tbody tr.error > td {
+	background-color: #f2dede;
+}
+.table tbody tr.warning > td {
+	background-color: #fcf8e3;
+}
+.table tbody tr.info > td {
+	background-color: #d9edf7;
+}
+.table-hover tbody tr.success:hover > td {
+	background-color: #d0e9c6;
+}
+.table-hover tbody tr.error:hover > td {
+	background-color: #ebcccc;
+}
+.table-hover tbody tr.warning:hover > td {
+	background-color: #faf2cc;
+}
+.table-hover tbody tr.info:hover > td {
+	background-color: #c4e3f3;
+}
+.table-noheader {
+	border-collapse: collapse;
+}
+.table-noheader thead {
+	display: none;
+}
+.dropup,
+.dropdown {
+	position: relative;
+}
+.dropdown-toggle {
+	*margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+	outline: 0;
+}
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	vertical-align: top;
+	border-top: 4px solid #000;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent;
+	content: "";
+}
+.dropdown .caret {
+	margin-top: 8px;
+	margin-left: 2px;
+}
+.dropdown-menu {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	list-style: none;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+	right: 0;
+	left: auto;
+}
+.dropdown-menu .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #F0F0F0;
+	border-bottom: 1px solid #fff;
+}
+.dropdown-menu .menuitem-group {
+	margin: 4px 1px;
+	overflow: hidden;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #eee;
+	background-color: #eee;
+	color: #555;
+	text-transform: capitalize;
+	font-size: 95%;
+	padding: 3px 20px;
+}
+.dropdown-menu > li > a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: normal;
+	line-height: 18px;
+	color: #333;
+	white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+	background-image: -moz-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#3071a9),to(#2a6496));
+	background-image: -webkit-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -o-linear-gradient(top,#3071a9,#2a6496);
+	background-image: linear-gradient(to bottom,#3071a9,#2a6496);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f70a9', endColorstr='#ff296395', GradientType=0);
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+	color: #333;
+	text-decoration: none;
+	outline: 0;
+	background-color: #2d6ca2;
+	background-image: -moz-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#3071a9),to(#2a6496));
+	background-image: -webkit-linear-gradient(top,#3071a9,#2a6496);
+	background-image: -o-linear-gradient(top,#3071a9,#2a6496);
+	background-image: linear-gradient(to bottom,#3071a9,#2a6496);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f70a9', endColorstr='#ff296395', GradientType=0);
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+	color: #999;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+	text-decoration: none;
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	cursor: default;
+}
+.open {
+	*z-index: 1000;
+}
+.open > .dropdown-menu {
+	display: block;
+}
+.dropdown-backdrop {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	z-index: 990;
+}
+.pull-right > .dropdown-menu {
+	right: 0;
+	left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+	border-top: 0;
+	border-bottom: 4px solid #000;
+	content: "";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 1px;
+}
+.dropdown-submenu {
+	position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: -6px;
+	margin-left: -1px;
+	-webkit-border-radius: 6px 6px 6px 6px;
+	-moz-border-radius: 6px 6px 6px 6px;
+	border-radius: 6px 6px 6px 6px;
+}
+.dropdown-submenu:hover > .dropdown-menu {
+	display: block;
+}
+.dropup .dropdown-submenu > .dropdown-menu {
+	top: auto;
+	bottom: 0;
+	margin-top: 0;
+	margin-bottom: -2px;
+	-webkit-border-radius: 5px 5px 5px 0;
+	-moz-border-radius: 5px 5px 5px 0;
+	border-radius: 5px 5px 5px 0;
+}
+.dropdown-submenu > a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+	border-left-color: #fff;
+}
+.dropdown-submenu.pull-left {
+	float: none;
+}
+.dropdown-submenu.pull-left > .dropdown-menu {
+	left: -100%;
+	margin-left: 10px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.dropdown .dropdown-menu .nav-header {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+.typeahead {
+	z-index: 1051;
+	margin-top: 2px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #F0F0F0;
+	border: 1px solid #F0F0F0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.well blockquote {
+	border-color: #f0f0f0;
+	border-color: rgba(0,0,0,0.15);
+}
+.well-large {
+	padding: 24px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.well-small {
+	padding: 9px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-moz-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear;
+}
+.fade.in {
+	opacity: 1;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+.close {
+	float: right;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.close:hover,
+.close:focus {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+button.close {
+	padding: 3;
+	cursor: pointer;
+	background: transparent;
+	border: 0;
+	-webkit-appearance: none;
+}
+.alert-options {
+	float: right;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.alert-options:hover,
+.alert-options:focus {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+.btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 12px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 18px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	background-color: #f3f3f3;
+	color: #333;
+	border: 1px solid #b3b3b3;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.btn:hover,
+.btn:focus {
+	background-color: #e6e6e6;
+	text-decoration: none;
+	text-shadow: none;
+}
+.btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.btn.active,
+.btn:active {
+	background-image: none;
+	outline: 0;
+}
+.btn.disabled,
+.btn[disabled] {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 11px 19px;
+	font-size: 16.25px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+	margin-top: 4px;
+}
+.btn-small {
+	padding: 2px 10px;
+	font-size: 12px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+	margin-top: 0;
+}
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+	margin-top: -1px;
+}
+.btn-mini {
+	padding: 0 6px;
+	font-size: 9.75px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.btn-block {
+	display: block;
+	width: 100%;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.btn-block + .btn-block {
+	margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+	width: 100%;
+}
+.btn-primary,
+.btn-warning,
+.btn-danger,
+.btn-success,
+.btn-info,
+.btn-inverse {
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.btn-primary {
+	border: 1px solid #15497c;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #2384d3;
+}
+.btn-primary:hover,
+.btn-primary:focus {
+	background-color: #185b91;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-warning {
+	border: 1px solid #f89406;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #f89406;
+}
+.btn-warning:hover,
+.btn-warning:focus {
+	background-color: #ad6704;
+	color: #fff;
+	text-decoration: none;
+	text-shadow: none;
+}
+.btn-danger {
+	border: 1px solid #bd362f;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #bd362f;
+}
+.btn-danger:hover,
+.btn-danger:focus {
+	background-color: #802420;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-success {
+	border: 1px solid #378137;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #46a546;
+}
+.btn-success:hover,
+.btn-success:focus {
+	background-color: #2f6f2f;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-info {
+	border: 1px solid #2f96b4;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #2f96b4;
+}
+.btn-info:hover,
+.btn-info:focus {
+	background-color: #1f6377;
+	color: #fff;
+	text-decoration: none;
+}
+.btn-inverse {
+	border: 1px solid #444;
+	border: 1px solid rgba(0,0,0,0.2);
+	color: #fff;
+	background-color: #444;
+}
+.btn-inverse:hover,
+.btn-inverse:focus {
+	background-color: #1e1e1e;
+	color: #fff;
+	text-decoration: none;
+}
+button.btn,
+input[type="submit"].btn {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+	*padding-top: 1px;
+	*padding-bottom: 1px;
+}
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+	background-color: transparent;
+	background-image: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-link {
+	border-color: transparent;
+	cursor: pointer;
+	color: #3071a9;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-link:hover,
+.btn-link:focus {
+	color: #1f496e;
+	text-decoration: underline;
+	background-color: transparent;
+}
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+	color: #333;
+	text-decoration: none;
+}
+.btn-group {
+	position: relative;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	font-size: 0;
+	vertical-align: middle;
+	white-space: nowrap;
+	*margin-left: .3em;
+}
+.btn-group:first-child {
+	*margin-left: 0;
+}
+.btn-group .btn + .btn {
+	margin-left: -1px;
+}
+.btn-group + .btn-group {
+	margin-left: 5px;
+}
+.btn-toolbar {
+	font-size: 0;
+	margin-top: 9px;
+	margin-bottom: 9px;
+}
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+	margin-left: 5px;
+}
+.btn-group > .btn {
+	position: relative;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group > .btn-micro {
+	margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+	font-size: 13px;
+}
+.btn-group > .btn-mini {
+	font-size: 9.75px;
+}
+.btn-group > .btn-small {
+	font-size: 12px;
+}
+.btn-group > .btn-large {
+	font-size: 16.25px;
+}
+.btn-group > .btn:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.btn-group > .btn.large:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+	z-index: 2;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+	outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.btn-group.open .dropdown-toggle {
+	background-image: none;
+}
+.btn-group.open .btn.dropdown-toggle {
+	background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+	background-color: #15497c;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+	background-color: #c67605;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+	background-color: #942a25;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+	background-color: #378137;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+	background-color: #24748c;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+	background-color: #222;
+}
+.btn .caret {
+	margin-top: 8px;
+	margin-left: 0;
+}
+.btn-large .caret {
+	margin-top: 6px;
+}
+.btn-large .caret {
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+	margin-top: 8px;
+}
+.dropup .btn-large .caret {
+	border-bottom-width: 5px;
+}
+.btn-primary .caret {
+	border-top-color: #1f496e;
+	border-bottom-color: #1f496e;
+}
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.btn-group-vertical {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.btn-group-vertical > .btn {
+	display: block;
+	float: none;
+	max-width: 100%;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group-vertical > .btn + .btn {
+	margin-left: 0;
+	margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+	-webkit-border-radius: 3px 3px 0 0;
+	-moz-border-radius: 3px 3px 0 0;
+	border-radius: 3px 3px 0 0;
+}
+.btn-group-vertical > .btn:last-child {
+	-webkit-border-radius: 0 0 3px 3px;
+	-moz-border-radius: 0 0 3px 3px;
+	border-radius: 0 0 3px 3px;
+}
+.btn-group-vertical > .btn-large:first-child {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+.btn-group-vertical > .btn-large:last-child {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.alert {
+	padding: 8px 35px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	background-color: #fcf8e3;
+	border: 1px solid #faebcc;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.alert,
+.alert h4 {
+	color: #8a6d3b;
+}
+.alert h4 {
+	margin: 0 0 .5em;
+}
+.alert .close {
+	position: relative;
+	top: -2px;
+	right: -21px;
+	line-height: 18px;
+	cursor: pointer;
+}
+.alert-success {
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
+	color: #3c763d;
+}
+.alert-success h4 {
+	color: #3c763d;
+}
+.alert-danger,
+.alert-error {
+	background-color: #f2dede;
+	border-color: #ebccd1;
+	color: #a94442;
+}
+.alert-danger h4,
+.alert-error h4 {
+	color: #a94442;
+}
+.alert-info {
+	background-color: #d9edf7;
+	border-color: #bce8f1;
+	color: #31708f;
+}
+.alert-info h4 {
+	color: #31708f;
+}
+.alert-block {
+	padding-top: 14px;
+	padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+	margin-bottom: 0;
+}
+.alert-block p + p {
+	margin-top: 5px;
+}
+.nav {
+	margin-left: 0;
+	margin-bottom: 18px;
+	list-style: none;
+}
+.nav > li > a {
+	display: block;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+	text-decoration: none;
+	background-color: #eee;
+}
+.nav > li > a > img {
+	max-width: none;
+}
+.nav > .pull-right {
+	float: right;
+}
+.nav-header {
+	display: block;
+	padding: 3px 15px;
+	font-size: 11px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #999;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	text-transform: uppercase;
+}
+.nav li + .nav-header {
+	margin-top: 9px;
+}
+.nav-list {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+	margin-left: -15px;
+	margin-right: -15px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+}
+.nav-list > li > a {
+	padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
+	background-color: #3071a9;
+}
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+	margin-right: 2px;
+}
+.nav-list .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+.nav-tabs,
+.nav-pills {
+	*zoom: 1;
+}
+.nav-tabs:before,
+.nav-tabs:after,
+.nav-pills:before,
+.nav-pills:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.nav-tabs:after,
+.nav-pills:after {
+	clear: both;
+}
+.nav-tabs > li,
+.nav-pills > li {
+	float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+	padding-right: 12px;
+	padding-left: 12px;
+	margin-right: 2px;
+	line-height: 14px;
+}
+.nav-tabs {
+	border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+	margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+	border-color: #eee #eee #ddd;
+}
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+	color: #555;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent;
+	cursor: default;
+}
+.nav-pills > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	margin-top: 2px;
+	margin-bottom: 2px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+	color: #fff;
+	background-color: #3071a9;
+}
+.nav-stacked > li {
+	float: none;
+}
+.nav-stacked > li > a {
+	margin-right: 0;
+}
+.nav-tabs.nav-stacked {
+	border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+	border: 1px solid #ddd;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+	border-color: #ddd;
+	z-index: 2;
+}
+.nav-pills.nav-stacked > li > a {
+	margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+	margin-bottom: 1px;
+}
+.nav-tabs .dropdown-menu {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.nav-pills .dropdown-menu {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.nav .dropdown-toggle .caret {
+	border-top-color: #3071a9;
+	border-bottom-color: #3071a9;
+	margin-top: 6px;
+}
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+	border-top-color: #1f496e;
+	border-bottom-color: #1f496e;
+}
+.nav-tabs .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.nav .active .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+	cursor: pointer;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+	color: #fff;
+	background-color: #999;
+	border-color: #999;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+	opacity: 1;
+	filter: alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+	border-color: #999;
+}
+.tabbable {
+	*zoom: 1;
+}
+.tabbable:before,
+.tabbable:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.tabbable:after {
+	clear: both;
+}
+.tab-content {
+	overflow: auto;
+}
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+	border-bottom: 0;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+	display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+	display: block;
+}
+.tabs-below > .nav-tabs {
+	border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+	margin-top: -1px;
+	margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+	border-bottom-color: transparent;
+	border-top-color: #ddd;
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+	border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+	float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+	min-width: 74px;
+	margin-right: 0;
+	margin-bottom: 3px;
+}
+.tabs-left > .nav-tabs {
+	float: left;
+	margin-right: 19px;
+	border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-right: -1px;
+	-webkit-border-radius: 4px 0 0 4px;
+	-moz-border-radius: 4px 0 0 4px;
+	border-radius: 4px 0 0 4px;
+}
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+	border-color: #eee #ddd #eee #eee;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+	border-color: #ddd transparent #ddd #ddd;
+	*border-right-color: #fff;
+}
+.tabs-right > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+}
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+	border-color: #eee #eee #eee #ddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+	border-color: #ddd #ddd #ddd transparent;
+	*border-left-color: #fff;
+}
+.nav > .disabled > a {
+	color: #999;
+}
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+	text-decoration: none;
+	background-color: transparent;
+	cursor: default;
+}
+.navbar {
+	overflow: visible;
+	margin-bottom: 18px;
+	*position: relative;
+	*z-index: 2;
+}
+.navbar-inner {
+	min-height: 40px;
+	padding-left: 20px;
+	padding-right: 20px;
+	background-color: #fafafa;
+	background-image: -moz-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f2f2f2));
+	background-image: -webkit-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -o-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: linear-gradient(to bottom,#ffffff,#f2f2f2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+	border: 1px solid #d4d4d4;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	-moz-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	*zoom: 1;
+}
+.navbar-inner:before,
+.navbar-inner:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-inner:after {
+	clear: both;
+}
+.navbar .container {
+	width: auto;
+}
+.nav-collapse.collapse {
+	height: auto;
+	overflow: visible;
+}
+.navbar .brand {
+	float: left;
+	display: block;
+	padding: 11px 20px 11px;
+	margin-left: -20px;
+	font-size: 20px;
+	font-weight: 200;
+	color: #555;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .brand:hover,
+.navbar .brand:focus {
+	text-decoration: none;
+}
+.navbar-text {
+	margin-bottom: 0;
+	line-height: 40px;
+	color: #555;
+}
+.navbar-link {
+	color: #555;
+}
+.navbar-link:hover,
+.navbar-link:focus {
+	color: #333;
+}
+.navbar .divider-vertical {
+	height: 40px;
+	margin: 0 9px;
+	border-left: 1px solid #f2f2f2;
+	border-right: 1px solid #ffffff;
+}
+.navbar .btn,
+.navbar .btn-group {
+	margin-top: 5px;
+}
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+	margin-top: 0;
+}
+.navbar-form {
+	margin-bottom: 0;
+	*zoom: 1;
+}
+.navbar-form:before,
+.navbar-form:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-form:after {
+	clear: both;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+	margin-top: 5px;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+	display: inline-block;
+	margin-bottom: 0;
+}
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+	margin-top: 3px;
+}
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+	margin-top: 5px;
+	white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+	margin-top: 0;
+}
+.navbar-search {
+	position: relative;
+	float: left;
+	margin-top: 5px;
+	margin-bottom: 0;
+}
+.navbar-search .search-query {
+	margin-bottom: 0;
+	padding: 4px 14px;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 1;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.navbar-static-top {
+	position: static;
+	margin-bottom: 0;
+}
+.navbar-static-top .navbar-inner {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030;
+	margin-bottom: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	border-width: 0 0 1px;
+}
+.navbar-fixed-bottom .navbar-inner {
+	border-width: 1px 0 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.navbar-fixed-top {
+	top: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+	box-shadow: 0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+	box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+}
+.navbar .nav {
+	position: relative;
+	left: 0;
+	display: block;
+	float: left;
+	margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+	float: right;
+	margin-right: 0;
+}
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav > li > a {
+	float: none;
+	padding: 11px 15px 11px;
+	color: #555;
+	text-decoration: none;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+	background-color: transparent;
+	color: #333;
+	text-decoration: none;
+}
+.navbar .nav > li > a:focus {
+	outline: 2px solid #5e9ed6;
+}
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+	color: #555;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	-webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	-moz-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+}
+.navbar .btn-navbar {
+	display: none;
+	float: right;
+	padding: 7px 10px;
+	margin-left: 5px;
+	margin-right: 5px;
+	background-color: #f2f2f2;
+	*background-color: #f2f2f2;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+}
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #d9d9d9;
+	*background-color: #d9d9d9;
+}
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+	background-color: #f2f2f2;
+}
+.navbar .btn-navbar .icon-bar {
+	display: block;
+	width: 18px;
+	height: 2px;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 1px;
+	-moz-border-radius: 1px;
+	border-radius: 1px;
+	-webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	-moz-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+}
+.btn-navbar .icon-bar + .icon-bar {
+	margin-top: 3px;
+}
+.navbar .nav > li > .dropdown-menu:before {
+	content: '';
+	display: inline-block;
+	border-left: 7px solid transparent;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-bottom-color: rgba(0,0,0,0.2);
+	position: absolute;
+	top: -7px;
+	left: 9px;
+}
+.navbar .nav > li > .dropdown-menu:after {
+	content: '';
+	display: inline-block;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	position: absolute;
+	top: -6px;
+	left: 10px;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+	border-top: 7px solid #ccc;
+	border-top-color: rgba(0,0,0,0.2);
+	border-bottom: 0;
+	bottom: -7px;
+	top: auto;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+	border-top: 6px solid #fff;
+	border-bottom: 0;
+	bottom: -6px;
+	top: auto;
+}
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+	border-top-color: #333;
+	border-bottom-color: #333;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #e6e6e6;
+	color: #555;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+	left: auto;
+	right: 0;
+}
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+	left: auto;
+	right: 12px;
+}
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+	left: auto;
+	right: 13px;
+}
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+	left: auto;
+	right: 100%;
+	margin-left: 0;
+	margin-right: -1px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.navbar-inverse .navbar-inner {
+	background-color: #13294a;
+	background-image: -moz-linear-gradient(top,#152d53,#10223e);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#152d53),to(#10223e));
+	background-image: -webkit-linear-gradient(top,#152d53,#10223e);
+	background-image: -o-linear-gradient(top,#152d53,#10223e);
+	background-image: linear-gradient(to bottom,#152d53,#10223e);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff142c52', endColorstr='#ff0f213e', GradientType=0);
+	border-color: #0b172a;
+}
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+	color: #d9d9d9;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+}
+.navbar-inverse .brand:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .nav > li > a:focus {
+	color: #fff;
+}
+.navbar-inverse .brand {
+	color: #d9d9d9;
+}
+.navbar-inverse .navbar-text {
+	color: #d9d9d9;
+}
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+	background-color: transparent;
+	color: #fff;
+}
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+	color: #fff;
+	background-color: #10223e;
+}
+.navbar-inverse .navbar-link {
+	color: #d9d9d9;
+}
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+	color: #fff;
+}
+.navbar-inverse .divider-vertical {
+	border-left-color: #10223e;
+	border-right-color: #152d53;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #10223e;
+	color: #fff;
+}
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #d9d9d9;
+	border-bottom-color: #d9d9d9;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .navbar-search .search-query {
+	color: #fff;
+	background-color: #2959a4;
+	border-color: #10223e;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-webkit-transition: none;
+	-moz-transition: none;
+	-o-transition: none;
+	transition: none;
+}
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+	padding: 5px 15px;
+	color: #333;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #fff;
+	border: 0;
+	-webkit-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	-moz-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	outline: 0;
+}
+.navbar-inverse .btn-navbar {
+	background-color: #10223e;
+	*background-color: #10223e;
+}
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #050c16;
+	*background-color: #050c16;
+}
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+	background-color: #10223e;
+}
+.breadcrumb {
+	padding: 8px 15px;
+	margin: 0 0 18px;
+	list-style: none;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.breadcrumb > li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	text-shadow: 0 1px 0 #fff;
+}
+.breadcrumb > li > .divider {
+	padding: 0 5px;
+	color: #ccc;
+}
+.breadcrumb > .active {
+	color: #999;
+}
+.pagination {
+	margin: 18px 0;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-left: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination ul > li {
+	display: inline;
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
+	float: left;
+	padding: 4px 12px;
+	line-height: 18px;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-left-width: 0;
+}
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+	background-color: #F0F0F0;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+	color: #999;
+	cursor: default;
+}
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+	color: #999;
+	background-color: transparent;
+	cursor: default;
+}
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+	border-left-width: 1px;
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+	padding: 11px 19px;
+	font-size: 16.25px;
+}
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.pagination-mini ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > a,
+.pagination-small ul > li:first-child > span {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.pagination-mini ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > a,
+.pagination-small ul > li:last-child > span {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+	padding: 2px 10px;
+	font-size: 12px;
+}
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+	padding: 0 6px;
+	font-size: 9.75px;
+}
+.pager {
+	margin: 18px 0;
+	list-style: none;
+	text-align: center;
+	*zoom: 1;
+}
+.pager:before,
+.pager:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.pager:after {
+	clear: both;
+}
+.pager li {
+	display: inline;
+}
+.pager li > a,
+.pager li > span {
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.pager li > a:hover,
+.pager li > a:focus {
+	text-decoration: none;
+	background-color: #f5f5f5;
+}
+.pager .next > a,
+.pager .next > span {
+	float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+	float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+	color: #999;
+	background-color: #fff;
+	cursor: default;
+}
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000;
+}
+.modal-backdrop.fade {
+	opacity: 0;
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.modal-header {
+	padding: 9px 15px;
+	border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+	margin-top: 2px;
+}
+.modal-header h3 {
+	margin: 0;
+	line-height: 30px;
+}
+.modal-body {
+	width: 98%;
+	position: relative;
+	max-height: 400px;
+	padding: 1%;
+}
+.modal-body iframe {
+	width: 100%;
+	max-height: none;
+	border: 0 !important;
+}
+.modal-form {
+	margin-bottom: 0;
+}
+.modal-footer {
+	padding: 14px 15px 15px;
+	margin-bottom: 0;
+	text-align: right;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: inset 0 1px 0 #fff;
+	-moz-box-shadow: inset 0 1px 0 #fff;
+	box-shadow: inset 0 1px 0 #fff;
+	*zoom: 1;
+}
+.modal-footer:before,
+.modal-footer:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.modal-footer:after {
+	clear: both;
+}
+.modal-footer .btn + .btn {
+	margin-left: 5px;
+	margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+	margin-left: -1px;
+}
+.modal-footer .btn-block + .btn-block {
+	margin-left: 0;
+}
+.tooltip {
+	position: absolute;
+	z-index: 1030;
+	display: block;
+	visibility: visible;
+	font-size: 11px;
+	line-height: 1.4;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+.tooltip.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top: -3px;
+	padding: 5px 0;
+}
+.tooltip.right {
+	margin-left: 3px;
+	padding: 0 5px;
+}
+.tooltip.bottom {
+	margin-top: 3px;
+	padding: 5px 0;
+}
+.tooltip.left {
+	margin-left: -3px;
+	padding: 0 5px;
+}
+.tooltip-inner {
+	max-width: 200px;
+	padding: 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
+}
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1060;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	text-align: left;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	white-space: normal;
+}
+.popover.top {
+	margin-top: -10px;
+}
+.popover.right {
+	margin-left: 10px;
+}
+.popover.bottom {
+	margin-top: 10px;
+}
+.popover.left {
+	margin-left: -10px;
+}
+.popover-title {
+	margin: 0;
+	padding: 8px 14px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.popover-title:empty {
+	display: none;
+}
+.popover-content {
+	padding: 9px 14px;
+}
+.popover .arrow,
+.popover .arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.popover .arrow {
+	border-width: 11px;
+}
+.popover .arrow:after {
+	border-width: 10px;
+	content: "";
+}
+.popover.top .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-bottom-width: 0;
+	border-top-color: #999;
+	border-top-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+}
+.popover.top .arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	border-bottom-width: 0;
+	border-top-color: #fff;
+}
+.popover.right .arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-left-width: 0;
+	border-right-color: #999;
+	border-right-color: rgba(0,0,0,0.25);
+}
+.popover.right .arrow:after {
+	left: 1px;
+	bottom: -10px;
+	border-left-width: 0;
+	border-right-color: #fff;
+}
+.popover.bottom .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0,0,0,0.25);
+	top: -11px;
+}
+.popover.bottom .arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	border-top-width: 0;
+	border-bottom-color: #fff;
+}
+.popover.left .arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0,0,0,0.25);
+}
+.popover.left .arrow:after {
+	right: 1px;
+	border-right-width: 0;
+	border-left-color: #fff;
+	bottom: -10px;
+}
+.thumbnails {
+	margin-left: -20px;
+	list-style: none;
+	*zoom: 1;
+}
+.thumbnails:before,
+.thumbnails:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.thumbnails:after {
+	clear: both;
+}
+.row-fluid .thumbnails {
+	margin-left: 0;
+}
+.thumbnails > li {
+	float: left;
+	margin-bottom: 18px;
+	margin-left: 20px;
+}
+.thumbnail {
+	display: block;
+	padding: 4px;
+	line-height: 18px;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-webkit-transition: all .2s ease-in-out;
+	-moz-transition: all .2s ease-in-out;
+	-o-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out;
+}
+a.thumbnail:hover,
+a.thumbnail:focus {
+	border-color: #3071a9;
+	-webkit-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	-moz-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+}
+.thumbnail > img {
+	display: block;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+.thumbnail .caption {
+	padding: 9px;
+	color: #555;
+}
+.media,
+.media-body {
+	overflow: hidden;
+	*overflow: visible;
+	zoom: 1;
+}
+.media,
+.media .media {
+	margin-top: 15px;
+}
+.media:first-child {
+	margin-top: 0;
+}
+.media-object {
+	display: block;
+}
+.media-heading {
+	margin: 0 0 5px;
+}
+.media > .pull-left {
+	margin-right: 10px;
+}
+.media > .pull-right {
+	margin-left: 10px;
+}
+.media-list {
+	margin-left: 0;
+	list-style: none;
+}
+.label,
+.badge {
+	display: inline-block;
+	padding: 2px 4px;
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #fff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999;
+}
+.label {
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding-left: 9px;
+	padding-right: 9px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+	display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #a94442;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #843534;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #3c763d;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #2b542c;
+}
+.label-info,
+.badge-info {
+	background-color: #31708f;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #245269;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+@-webkit-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-moz-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-ms-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-o-keyframes progress-bar-stripes {
+	from {
+		background-position: 0 0;
+	}
+	to {
+		background-position: 40px 0;
+	}
+}
+@keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+.progress {
+	overflow: hidden;
+	height: 18px;
+	margin-bottom: 18px;
+	background-color: #f7f7f7;
+	background-image: -moz-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -o-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: linear-gradient(to bottom,#f5f5f5,#f9f9f9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.progress .bar {
+	width: 0%;
+	height: 100%;
+	color: #fff;
+	float: left;
+	font-size: 12px;
+	text-align: center;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #0e90d2;
+	background-image: -moz-linear-gradient(top,#149bdf,#0480be);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
+	background-image: -webkit-linear-gradient(top,#149bdf,#0480be);
+	background-image: -o-linear-gradient(top,#149bdf,#0480be);
+	background-image: linear-gradient(to bottom,#149bdf,#0480be);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-transition: width .6s ease;
+	-moz-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease;
+}
+.progress .bar + .bar {
+	-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+}
+.progress-striped .bar {
+	background-color: #149bdf;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	-webkit-background-size: 40px 40px;
+	-moz-background-size: 40px 40px;
+	-o-background-size: 40px 40px;
+	background-size: 40px 40px;
+}
+.progress.active .bar {
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	-moz-animation: progress-bar-stripes 2s linear infinite;
+	-ms-animation: progress-bar-stripes 2s linear infinite;
+	-o-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar,
+.progress .bar-danger {
+	background-color: #dd514c;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: linear-gradient(to bottom,#ee5f5b,#c43c35);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+	background-color: #ee5f5b;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-success .bar,
+.progress .bar-success {
+	background-color: #5eb95e;
+	background-image: -moz-linear-gradient(top,#62c462,#57a957);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+	background-image: -webkit-linear-gradient(top,#62c462,#57a957);
+	background-image: -o-linear-gradient(top,#62c462,#57a957);
+	background-image: linear-gradient(to bottom,#62c462,#57a957);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+	background-color: #62c462;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-info .bar,
+.progress .bar-info {
+	background-color: #4bb1cf;
+	background-image: -moz-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -o-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: linear-gradient(to bottom,#5bc0de,#339bb9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+	background-color: #5bc0de;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-warning .bar,
+.progress .bar-warning {
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+	background-color: #fbb450;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.accordion {
+	margin-bottom: 18px;
+}
+.accordion-group {
+	margin-bottom: 2px;
+	border: 1px solid #e5e5e5;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.accordion-heading {
+	border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+	display: block;
+	padding: 8px 15px;
+}
+.accordion-toggle {
+	cursor: pointer;
+}
+.accordion-inner {
+	padding: 9px 15px;
+	border-top: 1px solid #e5e5e5;
+}
+.carousel {
+	position: relative;
+	margin-bottom: 18px;
+	line-height: 1;
+}
+.carousel-inner {
+	overflow: hidden;
+	width: 100%;
+	position: relative;
+}
+.carousel-inner > .item {
+	display: none;
+	position: relative;
+	-webkit-transition: .6s ease-in-out left;
+	-moz-transition: .6s ease-in-out left;
+	-o-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left;
+}
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+	display: block;
+	line-height: 1;
+}
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+	display: block;
+}
+.carousel-inner > .active {
+	left: 0;
+}
+.carousel-inner > .next,
+.carousel-inner > .prev {
+	position: absolute;
+	top: 0;
+	width: 100%;
+}
+.carousel-inner > .next {
+	left: 100%;
+}
+.carousel-inner > .prev {
+	left: -100%;
+}
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+	left: 0;
+}
+.carousel-inner > .active.left {
+	left: -100%;
+}
+.carousel-inner > .active.right {
+	left: 100%;
+}
+.carousel-control {
+	position: absolute;
+	top: 40%;
+	left: 15px;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	font-size: 60px;
+	font-weight: 100;
+	line-height: 30px;
+	color: #fff;
+	text-align: center;
+	background: #222;
+	border: 3px solid #fff;
+	-webkit-border-radius: 23px;
+	-moz-border-radius: 23px;
+	border-radius: 23px;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+.carousel-control.right {
+	left: auto;
+	right: 15px;
+}
+.carousel-control:hover,
+.carousel-control:focus {
+	color: #fff;
+	text-decoration: none;
+	opacity: 0.9;
+	filter: alpha(opacity=90);
+}
+.carousel-indicators {
+	position: absolute;
+	top: 15px;
+	right: 15px;
+	z-index: 5;
+	margin: 0;
+	list-style: none;
+}
+.carousel-indicators li {
+	display: block;
+	float: left;
+	width: 10px;
+	height: 10px;
+	margin-left: 5px;
+	text-indent: -999px;
+	background-color: #ccc;
+	background-color: rgba(255,255,255,0.25);
+	border-radius: 5px;
+}
+.carousel-indicators .active {
+	background-color: #fff;
+}
+.carousel-caption {
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 15px;
+	background: #333;
+	background: rgba(0,0,0,0.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+	color: #fff;
+	line-height: 18px;
+}
+.carousel-caption h4 {
+	margin: 0 0 5px;
+}
+.carousel-caption p {
+	margin-bottom: 0;
+}
+.hero-unit {
+	padding: 60px;
+	margin-bottom: 30px;
+	font-size: 18px;
+	font-weight: 200;
+	line-height: 27px;
+	color: inherit;
+	background-color: #eee;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.hero-unit h1 {
+	margin-bottom: 0;
+	font-size: 60px;
+	line-height: 1;
+	color: inherit;
+	letter-spacing: -1px;
+}
+.hero-unit li {
+	line-height: 27px;
+}
+.pull-right {
+	float: right;
+}
+.pull-left {
+	float: left;
+}
+.hide {
+	display: none;
+}
+.show {
+	display: block;
+}
+.invisible {
+	visibility: hidden;
+}
+.affix {
+	position: fixed;
+}
+@-ms-viewport {
+	width: device-width;
+}
+.hidden {
+	display: none;
+	visibility: hidden;
+}
+.visible-phone {
+	display: none !important;
+}
+.visible-tablet {
+	display: none !important;
+}
+.hidden-desktop {
+	display: none !important;
+}
+.visible-desktop {
+	display: inherit !important;
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-tablet {
+		display: inherit !important;
+	}
+	.hidden-tablet {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-phone {
+		display: inherit !important;
+	}
+	.hidden-phone {
+		display: none !important;
+	}
+}
+.visible-print {
+	display: none !important;
+}
+@media print {
+	.visible-print {
+		display: inherit !important;
+	}
+	.hidden-print {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	body {
+		padding-left: 20px;
+		padding-right: 20px;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom,
+	.navbar-static-top {
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+	.container-fluid {
+		padding: 0;
+	}
+	.dl-horizontal dt {
+		float: none;
+		clear: none;
+		width: auto;
+		text-align: left;
+	}
+	.dl-horizontal dd {
+		margin-left: 0;
+	}
+	.dropdown-menu .menuitem-group {
+		background-color: #10223e;
+		color: #eee;
+	}
+	.container {
+		width: auto;
+	}
+	.row-fluid {
+		width: 100%;
+	}
+	.row,
+	.thumbnails {
+		margin-left: 0;
+	}
+	.thumbnails > li {
+		float: none;
+		margin-left: 0;
+	}
+	[class*="span"],
+	.uneditable-input[class*="span"],
+	.row-fluid [class*="span"] {
+		float: none;
+		display: block;
+		width: 100%;
+		margin-left: 0;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.span12,
+	.row-fluid .span12 {
+		width: 100%;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.row-fluid [class*="offset"]:first-child {
+		margin-left: 0;
+	}
+	.input-large,
+	.input-xlarge,
+	.input-xxlarge,
+	input[class*="span"],
+	select[class*="span"],
+	textarea[class*="span"],
+	.uneditable-input {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.input-prepend input,
+	.input-append input,
+	.input-prepend input[class*="span"],
+	.input-append input[class*="span"] {
+		display: inline-block;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 0;
+	}
+}
+@media (max-width: 480px) {
+	.nav-collapse {
+		-webkit-transform: translate3d(0,0,0);
+	}
+	.page-header h1 small {
+		display: block;
+		line-height: 18px;
+	}
+	input[type="checkbox"],
+	input[type="radio"] {
+		border: 1px solid #ccc;
+	}
+	.form-horizontal .control-label {
+		float: none;
+		width: auto;
+		padding-top: 0;
+		text-align: left;
+	}
+	.form-horizontal .controls {
+		margin-left: 0;
+	}
+	.form-horizontal .control-list {
+		padding-top: 0;
+	}
+	.form-horizontal .form-actions {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+	.tag-category input#filter-search,
+	.newsfeed-category input#filter-search {
+		width: auto;
+		margin-bottom: 9px;
+	}
+	.category-list input#filter-search {
+		width: auto;
+	}
+	.media .pull-left,
+	.media .pull-right {
+		float: none;
+		display: block;
+		margin-bottom: 10px;
+	}
+	.media-object {
+		margin-right: 0;
+		margin-left: 0;
+	}
+	.modal-header .close {
+		padding: 10px;
+		margin: -10px;
+	}
+	.carousel-caption {
+		position: static;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.row {
+		margin-left: -20px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		min-height: 1px;
+		margin-left: 20px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 724px;
+	}
+	.span12 {
+		width: 724px;
+	}
+	.span11 {
+		width: 662px;
+	}
+	.span10 {
+		width: 600px;
+	}
+	.span9 {
+		width: 538px;
+	}
+	.span8 {
+		width: 476px;
+	}
+	.span7 {
+		width: 414px;
+	}
+	.span6 {
+		width: 352px;
+	}
+	.span5 {
+		width: 290px;
+	}
+	.span4 {
+		width: 228px;
+	}
+	.span3 {
+		width: 166px;
+	}
+	.span2 {
+		width: 104px;
+	}
+	.span1 {
+		width: 42px;
+	}
+	.offset12 {
+		margin-left: 764px;
+	}
+	.offset11 {
+		margin-left: 702px;
+	}
+	.offset10 {
+		margin-left: 640px;
+	}
+	.offset9 {
+		margin-left: 578px;
+	}
+	.offset8 {
+		margin-left: 516px;
+	}
+	.offset7 {
+		margin-left: 454px;
+	}
+	.offset6 {
+		margin-left: 392px;
+	}
+	.offset5 {
+		margin-left: 330px;
+	}
+	.offset4 {
+		margin-left: 268px;
+	}
+	.offset3 {
+		margin-left: 206px;
+	}
+	.offset2 {
+		margin-left: 144px;
+	}
+	.offset1 {
+		margin-left: 82px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.76243094%;
+		*margin-left: 2.70923945%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .controls-row [class*="span"] + [class*="span"] {
+		margin-left: 2.76243094%;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.94680851%;
+	}
+	.row-fluid .span11 {
+		width: 91.43646409%;
+		*width: 91.3832726%;
+	}
+	.row-fluid .span10 {
+		width: 82.87292818%;
+		*width: 82.81973669%;
+	}
+	.row-fluid .span9 {
+		width: 74.30939227%;
+		*width: 74.25620078%;
+	}
+	.row-fluid .span8 {
+		width: 65.74585635%;
+		*width: 65.69266486%;
+	}
+	.row-fluid .span7 {
+		width: 57.18232044%;
+		*width: 57.12912895%;
+	}
+	.row-fluid .span6 {
+		width: 48.61878453%;
+		*width: 48.56559304%;
+	}
+	.row-fluid .span5 {
+		width: 40.05524862%;
+		*width: 40.00205713%;
+	}
+	.row-fluid .span4 {
+		width: 31.49171271%;
+		*width: 31.43852122%;
+	}
+	.row-fluid .span3 {
+		width: 22.9281768%;
+		*width: 22.87498531%;
+	}
+	.row-fluid .span2 {
+		width: 14.36464088%;
+		*width: 14.31144939%;
+	}
+	.row-fluid .span1 {
+		width: 5.80110497%;
+		*width: 5.74791348%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 105.52486188%;
+		*margin-left: 105.4184789%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.76243094%;
+		*margin-left: 102.65604796%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 96.96132597%;
+		*margin-left: 96.85494299%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 94.19889503%;
+		*margin-left: 94.09251205%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 88.39779006%;
+		*margin-left: 88.29140708%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.63535912%;
+		*margin-left: 85.52897614%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 79.83425414%;
+		*margin-left: 79.72787116%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 77.0718232%;
+		*margin-left: 76.96544023%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 71.27071823%;
+		*margin-left: 71.16433525%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.50828729%;
+		*margin-left: 68.40190431%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 62.70718232%;
+		*margin-left: 62.60079934%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.94475138%;
+		*margin-left: 59.8383684%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 54.14364641%;
+		*margin-left: 54.03726343%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.38121547%;
+		*margin-left: 51.27483249%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 45.5801105%;
+		*margin-left: 45.47372752%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.81767956%;
+		*margin-left: 42.71129658%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 37.01657459%;
+		*margin-left: 36.91019161%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.25414365%;
+		*margin-left: 34.14776067%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 28.45303867%;
+		*margin-left: 28.3466557%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.69060773%;
+		*margin-left: 25.58422476%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.88950276%;
+		*margin-left: 19.78311978%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.12707182%;
+		*margin-left: 17.02068884%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 11.32596685%;
+		*margin-left: 11.21958387%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.56353591%;
+		*margin-left: 8.45715293%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 20px;
+	}
+	input.span12,
+	textarea.span12,
+	.uneditable-input.span12 {
+		width: 710px;
+	}
+	input.span11,
+	textarea.span11,
+	.uneditable-input.span11 {
+		width: 648px;
+	}
+	input.span10,
+	textarea.span10,
+	.uneditable-input.span10 {
+		width: 586px;
+	}
+	input.span9,
+	textarea.span9,
+	.uneditable-input.span9 {
+		width: 524px;
+	}
+	input.span8,
+	textarea.span8,
+	.uneditable-input.span8 {
+		width: 462px;
+	}
+	input.span7,
+	textarea.span7,
+	.uneditable-input.span7 {
+		width: 400px;
+	}
+	input.span6,
+	textarea.span6,
+	.uneditable-input.span6 {
+		width: 338px;
+	}
+	input.span5,
+	textarea.span5,
+	.uneditable-input.span5 {
+		width: 276px;
+	}
+	input.span4,
+	textarea.span4,
+	.uneditable-input.span4 {
+		width: 214px;
+	}
+	input.span3,
+	textarea.span3,
+	.uneditable-input.span3 {
+		width: 152px;
+	}
+	input.span2,
+	textarea.span2,
+	.uneditable-input.span2 {
+		width: 90px;
+	}
+	input.span1,
+	textarea.span1,
+	.uneditable-input.span1 {
+		width: 28px;
+	}
+}
+@media (min-width: 1200px) {
+	.row {
+		margin-left: -30px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		min-height: 1px;
+		margin-left: 30px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 1170px;
+	}
+	.span12 {
+		width: 1170px;
+	}
+	.span11 {
+		width: 1070px;
+	}
+	.span10 {
+		width: 970px;
+	}
+	.span9 {
+		width: 870px;
+	}
+	.span8 {
+		width: 770px;
+	}
+	.span7 {
+		width: 670px;
+	}
+	.span6 {
+		width: 570px;
+	}
+	.span5 {
+		width: 470px;
+	}
+	.span4 {
+		width: 370px;
+	}
+	.span3 {
+		width: 270px;
+	}
+	.span2 {
+		width: 170px;
+	}
+	.span1 {
+		width: 70px;
+	}
+	.offset12 {
+		margin-left: 1230px;
+	}
+	.offset11 {
+		margin-left: 1130px;
+	}
+	.offset10 {
+		margin-left: 1030px;
+	}
+	.offset9 {
+		margin-left: 930px;
+	}
+	.offset8 {
+		margin-left: 830px;
+	}
+	.offset7 {
+		margin-left: 730px;
+	}
+	.offset6 {
+		margin-left: 630px;
+	}
+	.offset5 {
+		margin-left: 530px;
+	}
+	.offset4 {
+		margin-left: 430px;
+	}
+	.offset3 {
+		margin-left: 330px;
+	}
+	.offset2 {
+		margin-left: 230px;
+	}
+	.offset1 {
+		margin-left: 130px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.76243094%;
+		*margin-left: 2.70923945%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .controls-row [class*="span"] + [class*="span"] {
+		margin-left: 2.76243094%;
+	}
+	.row-fluid .span12 {
+		width: 100%;
+		*width: 99.94680851%;
+	}
+	.row-fluid .span11 {
+		width: 91.43646409%;
+		*width: 91.3832726%;
+	}
+	.row-fluid .span10 {
+		width: 82.87292818%;
+		*width: 82.81973669%;
+	}
+	.row-fluid .span9 {
+		width: 74.30939227%;
+		*width: 74.25620078%;
+	}
+	.row-fluid .span8 {
+		width: 65.74585635%;
+		*width: 65.69266486%;
+	}
+	.row-fluid .span7 {
+		width: 57.18232044%;
+		*width: 57.12912895%;
+	}
+	.row-fluid .span6 {
+		width: 48.61878453%;
+		*width: 48.56559304%;
+	}
+	.row-fluid .span5 {
+		width: 40.05524862%;
+		*width: 40.00205713%;
+	}
+	.row-fluid .span4 {
+		width: 31.49171271%;
+		*width: 31.43852122%;
+	}
+	.row-fluid .span3 {
+		width: 22.9281768%;
+		*width: 22.87498531%;
+	}
+	.row-fluid .span2 {
+		width: 14.36464088%;
+		*width: 14.31144939%;
+	}
+	.row-fluid .span1 {
+		width: 5.80110497%;
+		*width: 5.74791348%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 105.52486188%;
+		*margin-left: 105.4184789%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.76243094%;
+		*margin-left: 102.65604796%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 96.96132597%;
+		*margin-left: 96.85494299%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 94.19889503%;
+		*margin-left: 94.09251205%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 88.39779006%;
+		*margin-left: 88.29140708%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.63535912%;
+		*margin-left: 85.52897614%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 79.83425414%;
+		*margin-left: 79.72787116%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 77.0718232%;
+		*margin-left: 76.96544023%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 71.27071823%;
+		*margin-left: 71.16433525%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.50828729%;
+		*margin-left: 68.40190431%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 62.70718232%;
+		*margin-left: 62.60079934%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.94475138%;
+		*margin-left: 59.8383684%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 54.14364641%;
+		*margin-left: 54.03726343%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.38121547%;
+		*margin-left: 51.27483249%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 45.5801105%;
+		*margin-left: 45.47372752%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.81767956%;
+		*margin-left: 42.71129658%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 37.01657459%;
+		*margin-left: 36.91019161%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.25414365%;
+		*margin-left: 34.14776067%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 28.45303867%;
+		*margin-left: 28.3466557%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.69060773%;
+		*margin-left: 25.58422476%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.88950276%;
+		*margin-left: 19.78311978%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.12707182%;
+		*margin-left: 17.02068884%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 11.32596685%;
+		*margin-left: 11.21958387%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.56353591%;
+		*margin-left: 8.45715293%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 30px;
+	}
+	input.span12,
+	textarea.span12,
+	.uneditable-input.span12 {
+		width: 1156px;
+	}
+	input.span11,
+	textarea.span11,
+	.uneditable-input.span11 {
+		width: 1056px;
+	}
+	input.span10,
+	textarea.span10,
+	.uneditable-input.span10 {
+		width: 956px;
+	}
+	input.span9,
+	textarea.span9,
+	.uneditable-input.span9 {
+		width: 856px;
+	}
+	input.span8,
+	textarea.span8,
+	.uneditable-input.span8 {
+		width: 756px;
+	}
+	input.span7,
+	textarea.span7,
+	.uneditable-input.span7 {
+		width: 656px;
+	}
+	input.span6,
+	textarea.span6,
+	.uneditable-input.span6 {
+		width: 556px;
+	}
+	input.span5,
+	textarea.span5,
+	.uneditable-input.span5 {
+		width: 456px;
+	}
+	input.span4,
+	textarea.span4,
+	.uneditable-input.span4 {
+		width: 356px;
+	}
+	input.span3,
+	textarea.span3,
+	.uneditable-input.span3 {
+		width: 256px;
+	}
+	input.span2,
+	textarea.span2,
+	.uneditable-input.span2 {
+		width: 156px;
+	}
+	input.span1,
+	textarea.span1,
+	.uneditable-input.span1 {
+		width: 56px;
+	}
+	.thumbnails {
+		margin-left: -30px;
+	}
+	.thumbnails > li {
+		margin-left: 30px;
+	}
+	.row-fluid .thumbnails {
+		margin-left: 0;
+	}
+}
+@media (max-width: 767px) {
+	body {
+		padding-top: 0;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom {
+		position: static;
+	}
+	.navbar-fixed-top {
+		margin-bottom: 18px;
+	}
+	.navbar-fixed-bottom {
+		margin-top: 18px;
+	}
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-bottom .navbar-inner {
+		padding: 5px;
+	}
+	.navbar .container {
+		width: auto;
+		padding: 0;
+	}
+	.navbar .brand {
+		padding-left: 10px;
+		padding-right: 10px;
+		margin: 0 0 0 -5px;
+	}
+	.nav-collapse {
+		clear: both;
+	}
+	.nav-collapse .nav {
+		float: none;
+		margin: 0 0 9px;
+	}
+	.nav-collapse .nav > li {
+		float: none;
+	}
+	.nav-collapse .nav > li > a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > .divider-vertical {
+		display: none;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #555;
+		text-shadow: none;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		padding: 9px 15px;
+		font-weight: bold;
+		color: #555;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+	}
+	.nav-collapse .btn {
+		padding: 4px 10px 4px;
+		font-weight: normal;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > li > a:hover,
+	.nav-collapse .nav > li > a:focus,
+	.nav-collapse .dropdown-menu a:hover,
+	.nav-collapse .dropdown-menu a:focus {
+		background-color: #f2f2f2;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a,
+	.navbar-inverse .nav-collapse .dropdown-menu a {
+		color: #d9d9d9;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a:hover,
+	.navbar-inverse .nav-collapse .nav > li > a:focus,
+	.navbar-inverse .nav-collapse .dropdown-menu a:hover,
+	.navbar-inverse .nav-collapse .dropdown-menu a:focus {
+		background-color: #10223e;
+	}
+	.nav-collapse.in .btn-group {
+		margin-top: 5px;
+		padding: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		position: static;
+		top: auto;
+		left: auto;
+		float: none;
+		display: none;
+		max-width: none;
+		margin: 0 15px;
+		padding: 0;
+		background-color: transparent;
+		border: none;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+	.nav-collapse .open > .dropdown-menu {
+		display: block;
+	}
+	.nav-collapse .dropdown-menu:before,
+	.nav-collapse .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu .divider {
+		display: none;
+	}
+	.nav-collapse .nav > li > .dropdown-menu:before,
+	.nav-collapse .nav > li > .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		float: none;
+		padding: 9px 15px;
+		margin: 9px 0;
+		border-top: 1px solid #f2f2f2;
+		border-bottom: 1px solid #f2f2f2;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+	}
+	.navbar-inverse .nav-collapse .navbar-form,
+	.navbar-inverse .nav-collapse .navbar-search {
+		border-top-color: #10223e;
+		border-bottom-color: #10223e;
+	}
+	.navbar .nav-collapse .nav.pull-right {
+		float: none;
+		margin-left: 0;
+	}
+	.nav-collapse,
+	.nav-collapse.collapse {
+		overflow: hidden;
+		height: 0;
+	}
+	.navbar .btn-navbar {
+		display: block;
+	}
+	.navbar-static .navbar-inner {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 768px) {
+	.nav-collapse.collapse {
+		height: auto !important;
+		overflow: visible !important;
+	}
+}
+.small {
+	font-size: 11px;
+}
+iframe,
+svg {
+	max-width: 100%;
+}
+.nowrap {
+	white-space: nowrap;
+}
+.center,
+.table td.center,
+.table th.center {
+	text-align: center;
+}
+a.disabled,
+a.disabled:hover {
+	color: #999999;
+	background-color: transparent;
+	cursor: default;
+	text-decoration: none;
+}
+.hero-unit {
+	text-align: center;
+}
+.hero-unit .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+.btn .caret {
+	margin-bottom: 7px;
+}
+.btn.btn-micro .caret {
+	margin: 5px 0;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+body.modal {
+	padding-top: 0;
+}
+.row-even,
+.row-odd {
+	padding: 5px;
+	width: 99%;
+	border-bottom: 1px solid #ddd;
+}
+.row-odd {
+	background-color: transparent;
+}
+.row-even {
+	background-color: #f9f9f9;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .row-reveal {
+	visibility: hidden;
+}
+.row-fluid:hover .row-reveal {
+	visibility: visible;
+}
+.btn-wide {
+	width: 80%;
+}
+.nav-list > li.offset > a {
+	padding-left: 30px;
+	font-size: 12px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .offset1 {
+	margin-left: 8.382978723%;
+}
+.row-fluid .offset2 {
+	margin-left: 16.89361702%;
+}
+.row-fluid .offset3 {
+	margin-left: 25.404255317%;
+}
+.row-fluid .offset4 {
+	margin-left: 33.914893614%;
+}
+.row-fluid .offset5 {
+	margin-left: 42.425531911%;
+}
+.row-fluid .offset6 {
+	margin-left: 50.93617020799999%;
+}
+.row-fluid .offset7 {
+	margin-left: 59.446808505%;
+}
+.row-fluid .offset8 {
+	margin-left: 67.95744680199999%;
+}
+.row-fluid .offset9 {
+	margin-left: 76.468085099%;
+}
+.row-fluid .offset10 {
+	margin-left: 84.97872339599999%;
+}
+.row-fluid .offset11 {
+	margin-left: 91.489361693%;
+}
+.navbar .nav > li > a.btn {
+	padding: 4px 10px;
+	line-height: 18px;
+}
+.nav-tabs.nav-dark {
+	border-bottom: 1px solid #333;
+	text-shadow: 1px 1px 1px #000;
+}
+.nav-tabs.nav-dark > li > a {
+	color: #F8F8F8;
+}
+.nav-tabs.nav-dark > li > a:hover {
+	border-color: #333 #333 #111;
+	background-color: #777777;
+}
+.nav-tabs.nav-dark > .active > a,
+.nav-tabs.nav-dark > .active > a:hover {
+	color: #ffffff;
+	background-color: #555555;
+	border: 1px solid #222;
+	border-bottom-color: transparent;
+}
+.thumbnail.pull-left {
+	margin: 0 10px 10px 0;
+}
+.thumbnail.pull-right {
+	margin: 0 0 10px 10px;
+}
+.width-10 {
+	width: 10px;
+}
+.width-20 {
+	width: 20px;
+}
+.width-30 {
+	width: 30px;
+}
+.width-40 {
+	width: 40px;
+}
+.width-50 {
+	width: 50px;
+}
+.width-60 {
+	width: 60px;
+}
+.width-70 {
+	width: 70px;
+}
+.width-80 {
+	width: 80px;
+}
+.width-90 {
+	width: 90px;
+}
+.width-100 {
+	width: 100px;
+}
+.height-10 {
+	height: 10px;
+}
+.height-20 {
+	height: 20px;
+}
+.height-30 {
+	height: 30px;
+}
+.height-40 {
+	height: 40px;
+}
+.height-50 {
+	height: 50px;
+}
+.height-60 {
+	height: 60px;
+}
+.height-70 {
+	height: 70px;
+}
+.height-80 {
+	height: 80px;
+}
+.height-90 {
+	height: 90px;
+}
+.height-100 {
+	height: 100px;
+}
+hr.hr-condensed {
+	margin: 10px 0;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #ddd;
+	margin-left: 0;
+}
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #ddd;
+	padding: 8px;
+}
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #F0F0F0;
+}
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box;
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.row-striped .row-fluid [class*="span"] {
+	margin-left: 8px;
+}
+.row-striped .row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.list-condensed li {
+	padding: 4px 5px;
+}
+.row-condensed .row,
+.row-condensed .row-fluid {
+	padding: 4px 5px;
+}
+.list-bordered,
+.row-bordered {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	margin-left: 0;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.radio.btn-group input[type=radio] {
+	display: none;
+}
+.radio.btn-group > label {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.radio.btn-group {
+	padding-left: 0;
+}
+.iframe-bordered {
+	border: 1px solid #ddd;
+}
+.tab-content {
+	overflow: visible;
+}
+.tabs-left .tab-content {
+	overflow: auto;
+}
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+.btn-group > .btn-micro {
+	font-size: 10px;
+}
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+.page-header {
+	margin: 2px 0px 10px 0px;
+	padding-bottom: 5px;
+}
+.input-prepend > .add-on,
+.input-append > .add-on {
+	vertical-align: top;
+}
+.input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0 3px 0 0;
+	-moz-border-radius: 0 3px 0 0;
+	border-radius: 0 3px 0 0;
+}
+.input-append .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 3px 0 0 0;
+	-moz-border-radius: 3px 0 0 0;
+	border-radius: 3px 0 0 0;
+}
+.input-prepend.input-append .chzn-container-single .chzn-single,
+.input-prepend.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
+.form-vertical .control-label {
+	float: none;
+	width: auto;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: left;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+.width-auto {
+	width: auto;
+}
+.btn-group .chzn-results {
+	white-space: normal;
+}
+.accordion-body.in:hover {
+	overflow: visible;
+}
+.invalid {
+	color: #9d261d;
+	font-weight: bold;
+}
+input.invalid {
+	border: 1px solid #9d261d;
+	background: #f2dede;
+}
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: #9d261d;
+	color: #9d261d;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+.tip-text {
+	text-align: left;
+}
+.btn-group > .btn + .dropdown-backdrop + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-backdrop + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.dropdown-menu {
+	text-align: left;
+}
+.alert-link {
+	font-weight: bold;
+}
+.alert .alert-link {
+	color: #66512c;
+}
+.alert-success .alert-link {
+	color: #2b542c;
+}
+.alert-danger .alert-link,
+.alert-error .alert-link {
+	color: #843534;
+}
+.alert-info .alert-link {
+	color: #245269;
+}
+div.modal {
+	position: fixed;
+	top: 5%;
+	left: 50%;
+	z-index: 1050;
+	width: 80%;
+	margin-left: -40%;
+	background-color: #fff;
+	border: 1px solid #999;
+	border: 1px solid rgba(0,0,0,0.3);
+	*border: 1px solid #999;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+	outline: none;
+}
+div.modal.fade {
+	-webkit-transition: opacity .3s linear, top .3s ease-out;
+	-moz-transition: opacity .3s linear, top .3s ease-out;
+	-o-transition: opacity .3s linear, top .3s ease-out;
+	transition: opacity .3s linear, top .3s ease-out;
+	top: -25%;
+}
+div.modal.fade.in {
+	top: 5%;
+}
+.modal-batch {
+	overflow-y: visible;
+}
+.modal-body[class^="jviewport-height"],
+.modal-body[class*="jviewport-height"] {
+	max-height: none;
+}
+.jviewport-height10 {
+	height: 10vh;
+}
+.jviewport-height20 {
+	height: 20vh;
+}
+.jviewport-height30 {
+	height: 30vh;
+}
+.jviewport-height40 {
+	height: 40vh;
+}
+.jviewport-height50 {
+	height: 50vh;
+}
+.jviewport-height60 {
+	height: 60vh;
+}
+.jviewport-height70 {
+	height: 70vh;
+}
+.jviewport-height80 {
+	height: 80vh;
+}
+.jviewport-height90 {
+	height: 90vh;
+}
+.jviewport-height100 {
+	height: 100vh;
+}
+div.modal.jviewport-width10 {
+	width: 10vw;
+	margin-left: -5vw;
+}
+div.modal.jviewport-width20 {
+	width: 20vw;
+	margin-left: -10vw;
+}
+div.modal.jviewport-width30 {
+	width: 30vw;
+	margin-left: -15vw;
+}
+div.modal.jviewport-width40 {
+	width: 40vw;
+	margin-left: -20vw;
+}
+div.modal.jviewport-width50 {
+	width: 50vw;
+	margin-left: -25vw;
+}
+div.modal.jviewport-width60 {
+	width: 60vw;
+	margin-left: -30vw;
+}
+div.modal.jviewport-width70 {
+	width: 70vw;
+	margin-left: -35vw;
+}
+div.modal.jviewport-width80 {
+	width: 80vw;
+	margin-left: -40vw;
+}
+div.modal.jviewport-width90 {
+	width: 90vw;
+	margin-left: -45vw;
+}
+div.modal.jviewport-width100 {
+	width: 100vw;
+	margin-left: -50vw;
+}
+@media (max-width: 767px) {
+	div.modal {
+		position: fixed;
+		top: 20px;
+		left: 20px;
+		right: 20px;
+		width: auto;
+		margin: 0;
+	}
+	div.modal.fade {
+		top: -100px;
+	}
+	div.modal.fade.in {
+		top: 20px;
+	}
+	div.modal[class*="jviewport-width"] {
+		width: auto;
+		margin: 0;
+	}
+}
+@media (max-width: 480px) {
+	div.modal {
+		top: 10px;
+		left: 10px;
+		right: 10px;
+	}
+}
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), url('../../../../media/jui/fonts/IcoMoon.woff') format('woff'), url('../../../../media/jui/fonts/IcoMoon.ttf') format('truetype'), url('../../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	margin-right: .25em;
+	line-height: 14px;
+}
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+[class^="icon-"].disabled,
+[class*=" icon-"].disabled {
+	font-weight: normal;
+}
+.icon-joomla:before {
+	content: "\e200";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-rightarrow:before,
+.icon-arrow-right:before {
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-leftarrow:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-4:before {
+	content: "\e201";
+}
+.icon-arrow-right-4:before {
+	content: "\e202";
+}
+.icon-arrow-down-4:before {
+	content: "\e203";
+}
+.icon-arrow-left-4:before {
+	content: "\e204";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-forward-2:before {
+	content: "\e205";
+}
+.icon-backward-2:before,
+.icon-reply:before {
+	content: "\e206";
+}
+.icon-unblock:before,
+.icon-refresh:before,
+.icon-redo-2:before {
+	content: "\6c";
+}
+.icon-undo-2:before {
+	content: "\e207";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-play:before {
+	content: "\e208";
+}
+.icon-pause:before {
+	content: "\e209";
+}
+.icon-stop:before {
+	content: "\e210";
+}
+.icon-previous:before,
+.icon-backward:before {
+	content: "\7c";
+}
+.icon-next:before,
+.icon-forward:before {
+	content: "\7b";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-play-circle:before {
+	content: "\e00d";
+}
+.icon-pause-circle:before {
+	content: "\e211";
+}
+.icon-stop-circle:before {
+	content: "\e212";
+}
+.icon-backward-circle:before {
+	content: "\e213";
+}
+.icon-forward-circle:before {
+	content: "\e214";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "\5d";
+}
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-plus-circle:before {
+	content: "\e215";
+}
+.icon-minus:before,
+.icon-not-ok:before {
+	content: "\4b";
+}
+.icon-ban-circle:before,
+.icon-minus-circle:before {
+	content: "\e216";
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+}
+.icon-cancel-circle:before {
+	content: "\e217";
+}
+.icon-checkmark-2:before {
+	content: "\e218";
+}
+.icon-checkmark-circle:before {
+	content: "\e219";
+}
+.icon-info:before {
+	content: "\e220";
+}
+.icon-info-2:before,
+.icon-info-circle:before {
+	content: "\e221";
+}
+.icon-question:before,
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-question-2:before,
+.icon-question-circle:before {
+	content: "\e222";
+}
+.icon-notification:before {
+	content: "\e223";
+}
+.icon-notification-2:before,
+.icon-notification-circle:before {
+	content: "\e224";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+}
+.icon-warning-2:before,
+.icon-warning-circle:before {
+	content: "\e225";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before,
+.icon-checkbox-checked:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-square:before {
+	content: "\e226";
+}
+.icon-radio-unchecked:before {
+	content: "\e227";
+}
+.icon-radio-checked:before,
+.icon-generic:before {
+	content: "\e228";
+}
+.icon-circle:before {
+	content: "\e229";
+}
+.icon-signup:before {
+	content: "\e230";
+}
+.icon-grid:before,
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-2:before,
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-list-2:before {
+	content: "\e231";
+}
+.icon-menu-3:before {
+	content: "\e232";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-folder-plus:before {
+	content: "\e234";
+}
+.icon-folder-minus:before {
+	content: "\e235";
+}
+.icon-folder-3:before {
+	content: "\e236";
+}
+.icon-folder-plus-2:before {
+	content: "\e237";
+}
+.icon-folder-remove:before {
+	content: "\e238";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-2:before {
+	content: "\e239";
+}
+.icon-file-add:before,
+.icon-file-plus:before {
+	content: "\29";
+}
+.icon-file-minus:before {
+	content: "\e017";
+}
+.icon-file-check:before {
+	content: "\e240";
+}
+.icon-file-remove:before {
+	content: "\e241";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+}
+.icon-stack:before {
+	content: "\e242";
+}
+.icon-tree:before {
+	content: "\e243";
+}
+.icon-tree-2:before {
+	content: "\e244";
+}
+.icon-paragraph-left:before {
+	content: "\e246";
+}
+.icon-paragraph-center:before {
+	content: "\e247";
+}
+.icon-paragraph-right:before {
+	content: "\e248";
+}
+.icon-paragraph-justify:before {
+	content: "\e249";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-home:before {
+	content: "\21";
+}
+.icon-home-2:before {
+	content: "\e250";
+}
+.icon-out-2:before,
+.icon-new-tab:before {
+	content: "\e024";
+}
+.icon-out-3:before,
+.icon-new-tab-2:before {
+	content: "\e251";
+}
+.icon-link:before {
+	content: "\e252";
+}
+.icon-picture:before,
+.icon-image:before {
+	content: "\2f";
+}
+.icon-pictures:before,
+.icon-images:before {
+	content: "\30";
+}
+.icon-palette:before,
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-camera-2:before,
+.icon-video:before {
+	content: "\e015";
+}
+.icon-play-2:before,
+.icon-video-2:before,
+.icon-youtube:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-enter:before {
+	content: "\e257";
+}
+.icon-exit:before {
+	content: "\e258";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-quote:before,
+.icon-quotes-left:before {
+	content: "\60";
+}
+.icon-quote-2:before,
+.icon-quotes-right:before {
+	content: "\61";
+}
+.icon-quote-3:before,
+.icon-bubble-quote:before {
+	content: "\e259";
+}
+.icon-phone:before {
+	content: "\e260";
+}
+.icon-phone-2:before {
+	content: "\e261";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-envelope-opened:before,
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-tag:before {
+	content: "\e262";
+}
+.icon-tag-2:before {
+	content: "\e263";
+}
+.icon-tags:before {
+	content: "\e264";
+}
+.icon-tags-2:before {
+	content: "\e265";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-screwdriver:before,
+.icon-tools:before {
+	content: "\36";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-switch:before {
+	content: "\e266";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-unlock:before {
+	content: "\e267";
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-scissors:before {
+	content: "\e268";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-eye-close:before,
+.icon-eye-blocked:before,
+.icon-eye-2:before {
+	content: "\e269";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-broadcast:before,
+.icon-connection:before,
+.icon-wifi:before {
+	content: "\e01b";
+}
+.icon-book:before {
+	content: "\e271";
+}
+.icon-lightning:before,
+.icon-flash:before {
+	content: "\79";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-calendar-3:before {
+	content: "\e273";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-attachment:before,
+.icon-paperclip:before,
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-pin:before,
+.icon-pushpin:before {
+	content: "\73";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-shield:before {
+	content: "\e274";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-flag-3:before {
+	content: "\e275";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-bookmark-2:before {
+	content: "\e276";
+}
+.icon-heart:before {
+	content: "\e277";
+}
+.icon-heart-2:before {
+	content: "\e278";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before {
+	content: "\5c";
+}
+.icon-unfeatured:before,
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-star:before {
+	content: "\42";
+}
+.icon-smiley:before,
+.icon-smiley-happy:before {
+	content: "\e279";
+}
+.icon-smiley-2:before,
+.icon-smiley-happy-2:before {
+	content: "\e280";
+}
+.icon-smiley-sad:before {
+	content: "\e281";
+}
+.icon-smiley-sad-2:before {
+	content: "\e282";
+}
+.icon-smiley-neutral:before {
+	content: "\e283";
+}
+.icon-smiley-neutral-2:before {
+	content: "\e284";
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-credit:before {
+	content: "\e286";
+}
+.icon-credit-2:before {
+	content: "\e287";
+}
+.icon-expired:before {
+	content: "\4b";
+}
+.icon-edit:before {
+	color: #24748c;
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-save-new:before,
+.icon-save-copy:before,
+.btn-toolbar .icon-copy:before {
+	color: #378137;
+}
+.icon-unpublish:before,
+.icon-not-ok:before,
+.icon-eye-close:before,
+.icon-ban-circle:before,
+.icon-minus-sign:before,
+.btn-toolbar .icon-cancel:before {
+	color: #942a25;
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-expired:before,
+.icon-pending:before {
+	color: #c67605;
+}
+.icon-back:before {
+	content: "\e008";
+}
+html {
+	height: 100%;
+}
+body {
+	height: 100%;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	box-sizing: border-box;
+}
+a:hover,
+a:active,
+a:focus {
+	outline: none;
+}
+.small {
+	font-size: 11px;
+}
+.row-even .small,
+.row-odd .small,
+.row-even .small a,
+.row-odd .small a {
+	color: #888;
+}
+.content-title {
+	font-size: 24px;
+	font-weight: normal;
+	line-height: 26px;
+	margin-top: 0;
+}
+.well .page-header {
+	margin: -10px 0 18px 0;
+	padding-bottom: 5px;
+}
+.well .module-title.nav-header {
+	padding: 0 0 7px;
+	margin: 0;
+	font-size: 13px;
+}
+.well .row-even p,
+.well .row-odd p {
+	margin-bottom: 0;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 12px 0;
+}
+h1 {
+	font-size: 26px;
+	line-height: 28px;
+}
+h2 {
+	font-size: 22px;
+	line-height: 24px;
+}
+h3 {
+	font-size: 18px;
+	line-height: 20px;
+}
+h4 {
+	font-size: 14px;
+	line-height: 16px;
+}
+h5 {
+	font-size: 13px;
+	line-height: 15px;
+}
+h6 {
+	font-size: 12px;
+	line-height: 14px;
+}
+.truncate {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.chzn-container .chzn-drop {
+	border-radius: 0 0 3px 3px;
+}
+.control-group .chzn-container {
+	max-width: 100%;
+}
+.control-group .chzn-container .chzn-choices li.search-field,
+.control-group .chzn-container .chzn-choices li.search-field input {
+	width: 100% !important;
+}
+.chzn-container-single .chzn-single {
+	background-color: #fff;
+	background-clip: inherit;
+	background-image: none;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	border-radius: 3px;
+	box-shadow: 0 1px 0 rgba(255,255,255,0.2) inset, 0 1px 2px rgba(0,0,0,0.05);
+	height: auto;
+	line-height: 26px;
+}
+.chzn-container-single .chzn-single div {
+	background-color: #f3f3f3;
+	border-left: 1px solid #ccc;
+	bottom: 0;
+	height: auto;
+	text-align: center;
+	width: 28px;
+}
+.chzn-container-single .chzn-single div b {
+	background-image: none;
+	display: inline-block;
+}
+.chzn-container-single .chzn-single div b:after {
+	content: '\E011';
+	font-family: IcoMoon;
+}
+.chzn-container-single .chzn-single abbr {
+	background: none;
+	right: 36px;
+	top: 0;
+}
+.chzn-container-single .chzn-single abbr:before {
+	font-family: IcoMoon;
+	content: '\0049';
+	font-size: 10px;
+	line-height: 26px;
+}
+.chzn-container-single .chzn-single abbr:hover {
+	color: #000;
+}
+.chzn-container-single .chzn-search:after {
+	content: '\0053';
+	font-family: IcoMoon;
+	position: relative;
+	right: 20px;
+	top: 2px;
+}
+.chzn-container-single .chzn-search input[type="text"] {
+	background: none;
+	border-radius: 3px;
+	border: 1px solid #ccc;
+	box-shadow: none;
+	height: 25px;
+}
+.chzn-container-single .chzn-search input[type="text"]:focus {
+	border-color: #3071A9;
+}
+.chzn-container-single .chzn-drop {
+	background-clip: padding-box;
+	border-color: #3071A9;
+	border-radius: 0 0 3px 3px;
+}
+.chzn-container-active .chzn-single {
+	color: #3071A9;
+}
+.chzn-container-active.chzn-with-drop .chzn-single {
+	background-image: none;
+	border: 1px solid #3071A9;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+.chzn-container-active.chzn-with-drop .chzn-single div {
+	background-color: #f3f3f3;
+	border-bottom: 1px solid #ccc;
+	border-bottom-left-radius: 3px;
+	border-left: 1px solid #ccc;
+}
+.chzn-container-active.chzn-with-drop .chzn-single div b:after {
+	content: '\E00F';
+	font-family: IcoMoon;
+}
+.chzn-container-active.chzn-container-multi .chzn-choices {
+	border: 1px solid #3071A9;
+	box-shadow: none;
+}
+.chzn-container .chzn-results {
+	background-color: #fff;
+	border-radius: 0 0 3px 3px;
+	margin: 0;
+	padding: 0;
+}
+.chzn-container .chzn-results li.highlighted {
+	background-color: #3071A9;
+	background-image: none;
+}
+.chzn-color[rel="value_"] div {
+	background-color: #f3f3f3;
+	border-left: 1px solid #ccc;
+}
+.chzn-color-state.chzn-single div,
+.chzn-color.chzn-single[rel="value_0"] div,
+.chzn-color.chzn-single[rel="value_1"] div,
+.chzn-color-state.chzn-single[rel="value_-1"] div,
+.chzn-color-state.chzn-single[rel="value_-2"] div,
+.chzn-color.chzn-single[rel="value_hide"] div,
+.chzn-color.chzn-single[rel="value_show_no_link"] div,
+.chzn-color.chzn-single[rel="value_show_with_link"] div {
+	background-color: transparent !important;
+	border: none !important;
+}
+.chzn-container-active .chzn-choices {
+	border: 1px solid #3071A9;
+}
+.chzn-container-multi .chzn-choices {
+	background-image: none;
+	border-radius: 3px;
+	border: 1px solid #ccc;
+}
+.chzn-container-multi .chzn-choices li.search-choice {
+	background-color: #3071A9;
+	background-image: none;
+	border: 0;
+	box-shadow: none;
+	color: #fff;
+	line-height: 20px;
+	padding: 0 7px;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close {
+	color: #f5f5f5;
+	display: inline-block;
+	margin-left: 5px;
+	position: relative;
+	top: 0;
+	left: 0;
+	background-image: none;
+	font-size: inherit;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close:hover {
+	text-decoration: none;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close:before {
+	font-family: IcoMoon;
+	content: '\004A';
+	position: relative;
+	right: 1px;
+	top: 0;
+}
+.js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container {
+	margin: 1px 0;
+	padding: 0 !important;
+}
+.chzn-color.chzn-single[rel="value_1"],
+.chzn-color-reverse.chzn-single[rel="value_0"],
+.chzn-color-state.chzn-single[rel="value_1"],
+.chzn-color.chzn-single[rel="value_show_no_link"],
+.chzn-color.chzn-single[rel="value_show_with_link"] {
+	background-color: #46a546;
+	*background-color: #46a546;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	color: #ffffff;
+}
+.chzn-color.chzn-single[rel="value_1"]:hover,
+.chzn-color.chzn-single[rel="value_1"]:focus,
+.chzn-color.chzn-single[rel="value_1"]:active,
+.chzn-color.chzn-single[rel="value_1"].active,
+.chzn-color.chzn-single[rel="value_1"].disabled,
+.chzn-color.chzn-single[rel="value_1"][disabled],
+.chzn-color-reverse.chzn-single[rel="value_0"]:hover,
+.chzn-color-reverse.chzn-single[rel="value_0"]:focus,
+.chzn-color-reverse.chzn-single[rel="value_0"]:active,
+.chzn-color-reverse.chzn-single[rel="value_0"].active,
+.chzn-color-reverse.chzn-single[rel="value_0"].disabled,
+.chzn-color-reverse.chzn-single[rel="value_0"][disabled],
+.chzn-color-state.chzn-single[rel="value_1"]:hover,
+.chzn-color-state.chzn-single[rel="value_1"]:focus,
+.chzn-color-state.chzn-single[rel="value_1"]:active,
+.chzn-color-state.chzn-single[rel="value_1"].active,
+.chzn-color-state.chzn-single[rel="value_1"].disabled,
+.chzn-color-state.chzn-single[rel="value_1"][disabled],
+.chzn-color.chzn-single[rel="value_show_no_link"]:hover,
+.chzn-color.chzn-single[rel="value_show_no_link"]:focus,
+.chzn-color.chzn-single[rel="value_show_no_link"]:active,
+.chzn-color.chzn-single[rel="value_show_no_link"].active,
+.chzn-color.chzn-single[rel="value_show_no_link"].disabled,
+.chzn-color.chzn-single[rel="value_show_no_link"][disabled],
+.chzn-color.chzn-single[rel="value_show_with_link"]:hover,
+.chzn-color.chzn-single[rel="value_show_with_link"]:focus,
+.chzn-color.chzn-single[rel="value_show_with_link"]:active,
+.chzn-color.chzn-single[rel="value_show_with_link"].active,
+.chzn-color.chzn-single[rel="value_show_with_link"].disabled,
+.chzn-color.chzn-single[rel="value_show_with_link"][disabled] {
+	color: #fff;
+	background-color: #2f6f2f;
+	*background-color: #2f6f2f;
+}
+.chzn-color.chzn-single[rel="value_1"]:active,
+.chzn-color.chzn-single[rel="value_1"].active,
+.chzn-color-reverse.chzn-single[rel="value_0"]:active,
+.chzn-color-reverse.chzn-single[rel="value_0"].active,
+.chzn-color-state.chzn-single[rel="value_1"]:active,
+.chzn-color-state.chzn-single[rel="value_1"].active,
+.chzn-color.chzn-single[rel="value_show_no_link"]:active,
+.chzn-color.chzn-single[rel="value_show_no_link"].active,
+.chzn-color.chzn-single[rel="value_show_with_link"]:active,
+.chzn-color.chzn-single[rel="value_show_with_link"].active {
+	background-color: #46a546;
+}
+.chzn-color-state.chzn-single[rel="value_0"],
+.chzn-color-state.chzn-single[rel="value_-2"] {
+	background-color: #bd362f;
+	*background-color: #bd362f;
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	color: #ffffff;
+}
+.chzn-color-state.chzn-single[rel="value_0"]:hover,
+.chzn-color-state.chzn-single[rel="value_0"]:focus,
+.chzn-color-state.chzn-single[rel="value_0"]:active,
+.chzn-color-state.chzn-single[rel="value_0"].active,
+.chzn-color-state.chzn-single[rel="value_0"].disabled,
+.chzn-color-state.chzn-single[rel="value_0"][disabled],
+.chzn-color-state.chzn-single[rel="value_-2"]:hover,
+.chzn-color-state.chzn-single[rel="value_-2"]:focus,
+.chzn-color-state.chzn-single[rel="value_-2"]:active,
+.chzn-color-state.chzn-single[rel="value_-2"].active,
+.chzn-color-state.chzn-single[rel="value_-2"].disabled,
+.chzn-color-state.chzn-single[rel="value_-2"][disabled] {
+	color: #fff;
+	background-color: #802420;
+	*background-color: #802420;
+}
+.chzn-color-state.chzn-single[rel="value_0"]:active,
+.chzn-color-state.chzn-single[rel="value_0"].active,
+.chzn-color-state.chzn-single[rel="value_-2"]:active,
+.chzn-color-state.chzn-single[rel="value_-2"].active {
+	background-color: #bd362f;
+}
+.CodeMirror {
+	height: calc(100vh - 400px);
+	min-height: 400px;
+	max-height: 800px;
+}
+.form-horizontal .control-label {
+	padding-right: 5px;
+	text-align: left;
+}
+.form-horizontal .control-label .spacer hr {
+	width: 380px;
+}
+@media (max-width: 420px) {
+	.form-horizontal .control-label .spacer hr {
+		width: 220px;
+	}
+}
+.form-horizontal .field-spacer>.control-label {
+	width: auto;
+}
+.form-horizontal #jform_catid_chzn {
+	vertical-align: middle;
+}
+.form-vertical .control-label > label {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+@media (max-width: 979px) {
+	.form-horizontal-desktop .control-label {
+		float: none;
+		width: auto;
+		padding-right: 0;
+		padding-top: 0;
+		text-align: left;
+	}
+	.form-horizontal-desktop .control-label > label {
+		display: inline-block;
+		*display: inline;
+		*zoom: 1;
+	}
+	.form-horizontal-desktop .controls {
+		margin-left: 0;
+	}
+}
+@media (max-width: 1199px) {
+	.row-fluid .row-fluid .form-horizontal-desktop .control-label {
+		float: none;
+		width: auto;
+		padding-right: 0;
+		padding-top: 0;
+		text-align: left;
+	}
+	.row-fluid .row-fluid .form-horizontal-desktop .control-label > label {
+		display: inline-block;
+		*display: inline;
+		*zoom: 1;
+	}
+	.row-fluid .row-fluid .form-horizontal-desktop .controls {
+		margin-left: 0;
+	}
+}
+.form-inline-header {
+	margin: 5px 0;
+}
+.form-inline-header .control-group,
+.form-inline-header .control-label,
+.form-inline-header .controls {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.form-inline-header .control-label {
+	width: auto;
+	padding-right: 10px;
+}
+.form-inline-header .controls {
+	padding-right: 20px;
+}
+fieldset[class^="form-"] {
+	min-width: 100%;
+}
+@-moz-document url-prefix() {
+	fieldset[class^="form-"] {
+		display: table-cell;
+	}
+}
+fieldset.checkboxes input {
+	float: left;
+}
+fieldset.checkboxes li {
+	list-style: none;
+}
+.control-group,
+.controls,
+.controls input[type="text"],
+.controls input[type="number"],
+.controls input[type="email"],
+.controls select,
+.controls textarea {
+	max-width: 100%;
+}
+.controls .btn-group > .btn {
+	min-width: 50px;
+	margin-left: -1px;
+}
+.controls .btn-group.btn-group-yesno {
+	width: 220px;
+	max-width: 100%;
+}
+.controls .btn-group.btn-group-yesno > .btn {
+	width: 50%;
+	min-width: 40px;
+	padding: 2px 0;
+}
+input.input-large-text {
+	font-size: 18px;
+	line-height: 22px;
+	height: auto;
+}
+textarea {
+	resize: both;
+}
+textarea.vert {
+	resize: vertical;
+}
+textarea.noResize {
+	resize: none;
+}
+.subform-repeatable {
+	padding-right: 10px;
+}
+.subform-repeatable > .btn-toolbar {
+	margin: 0;
+}
+.subform-repeatable > .btn-toolbar .group-add {
+	line-height: 26px;
+	width: 56px;
+	font-size: 13px;
+	margin-left: 28px;
+}
+.subform-repeatable-group {
+	margin-top: 20px;
+	margin-left: 28px;
+	border: 1px solid #ccc;
+	padding: 8px 25px 15px;
+	position: relative;
+	border-radius: 3px;
+}
+.subform-repeatable-group > .btn-toolbar {
+	margin: 0;
+}
+.subform-repeatable-group > .btn-toolbar .btn-group {
+	margin-right: 0px;
+	margin-top: -1px;
+	position: static;
+}
+.subform-repeatable-group > .btn-toolbar .btn {
+	font-size: 13px;
+	line-height: 26px;
+	background-color: #F3F3F3;
+	position: absolute;
+}
+.subform-repeatable-group > .btn-toolbar .btn span {
+	vertical-align: middle;
+	line-height: 11px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-success {
+	color: #378137;
+	bottom: 0;
+	right: 0;
+	border-radius: 3px 0 0 0;
+	border-width: 1px 0 0 1px;
+	padding-top: 1px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-success .icon-plus:before {
+	content: "]";
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-danger {
+	color: #942a25;
+	top: 0;
+	right: 0;
+	border-radius: 0 0 0 3px;
+	border-width: 0 0 1px 1px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-danger .icon-minus:before {
+	content: "I";
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-primary {
+	color: #24748c;
+	color: #333;
+	right: 100%;
+	top: 50%;
+	margin-top: -27px;
+	margin-right: 1px;
+	border-radius: 3px 0 0 3px;
+	border-width: 1px 0 1px 1px;
+	line-height: 52px;
+}
+.subform-repeatable-group > .btn-toolbar .btn.btn-primary .icon-move:before {
+	content: "Z";
+}
+.subform-repeatable-group > .btn-toolbar .btn [class^="icon-"],
+.subform-repeatable-group > .btn-toolbar .btn [class*=" icon-"] {
+	margin: 0;
+}
+.subform-repeatable-group > .btn-toolbar .btn:hover {
+	background-color: #E6E6E6;
+}
+.subform-repeatable-group .control-group:last-of-type {
+	margin-bottom: 10px;
+}
+@media (max-width: 979px) {
+	.subform-repeatable-group > .btn-toolbar .btn-group {
+		margin-bottom: 10px;
+	}
+}
+.subform-table-layout .control-group {
+	margin-bottom: 10px;
+}
+.subform-table-layout .control-group:last-of-type {
+	margin-bottom: 0;
+}
+.subform-table-layout .controls {
+	padding-right: 20px;
+}
+.subform-table-layout input {
+	width: 100%;
+	max-width: 206px;
+}
+.subform-table-layout table .btn-group {
+	margin: 0 7px;
+}
+@media (max-width: 1024px) {
+	.subform-table-layout .subform-repeatable {
+		padding-right: 0;
+	}
+	.subform-table-layout .subform-repeatable tbody td:last-of-type {
+		text-align: right;
+		padding-bottom: 15px;
+	}
+	.subform-table-layout table,
+	.subform-table-layout thead,
+	.subform-table-layout tbody,
+	.subform-table-layout th,
+	.subform-table-layout td,
+	.subform-table-layout tr {
+		display: block;
+	}
+	.subform-table-layout table {
+		border: 1px solid #ddd;
+	}
+	.subform-table-layout thead th {
+		position: absolute;
+		top: -9999px;
+		left: -9999px;
+	}
+	.subform-table-layout thead th:last-of-type {
+		position: static;
+		width: 100% !important;
+		text-align: right;
+		box-sizing: border-box;
+		border-left: 0;
+	}
+	.subform-table-layout tr {
+		margin: 0;
+		padding: 0;
+		border: 0;
+	}
+	.subform-table-layout td {
+		border: none;
+		position: relative;
+		padding-left: 50%;
+	}
+	.subform-table-layout tbody td:first-of-type {
+		padding-top: 15px;
+		border-top: 1px solid #ddd;
+	}
+	.subform-table-layout tbody td:first-of-type:before {
+		top: 18px;
+	}
+	.subform-table-layout td:before {
+		content: attr(data-column);
+		position: absolute;
+		top: 13px;
+		left: 10px;
+		padding-right: 10px;
+	}
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0;
+}
+.form-horizontal .controls > .radio:first-child,
+.form-horizontal .controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.form-horizontal .controls > .radio.btn-group:first-child {
+	padding-top: 0;
+}
+.form-horizontal .controls > .radio.btn-group-yesno:first-child {
+	padding-top: 2px;
+}
+.header {
+	background-color: #1a3867;
+	border-top: 1px solid rgba(255,255,255,0.2);
+	padding: 8px 25px;
+}
+@media (max-width: 767px) {
+	.header {
+		padding: 4px 18px;
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+}
+.header .navbar-search {
+	margin-top: 0;
+}
+@media (max-width: 979px) {
+	.header .navbar-search {
+		border-top: 0;
+		border-bottom: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+}
+.container-logo {
+	float: right;
+	text-align: right;
+}
+.logo {
+	width: auto;
+	max-width: 100%;
+	max-height: 36px;
+	height: auto;
+}
+.page-title {
+	color: white;
+	font-weight: normal;
+	font-size: 20px;
+	line-height: 36px;
+	margin: 0;
+}
+.page-title [class^="icon-"],
+.page-title [class*=" icon-"] {
+	margin-right: 16px;
+}
+@media (max-width: 767px) {
+	.container-logo {
+		display: none;
+	}
+	.page-title {
+		font-size: 18px;
+		line-height: 28px;
+	}
+	.page-title [class^="icon-"],
+	.page-title [class*=" icon-"] {
+		margin-right: 10px;
+	}
+}
+.view-login {
+	background-color: #17568c;
+	padding-top: 0;
+}
+.view-login .container {
+	width: 300px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	margin-top: -206px;
+	margin-left: -150px;
+}
+.view-login .navbar-fixed-bottom {
+	padding-left: 20px;
+	padding-right: 20px;
+	text-align: center;
+}
+.view-login .navbar-fixed-bottom,
+.view-login .navbar-fixed-bottom a {
+	color: #FCFCFC;
+}
+.view-login .navbar-inverse.navbar-fixed-bottom,
+.view-login .navbar-inverse.navbar-fixed-bottom a {
+	color: #555;
+}
+.view-login .well {
+	padding-bottom: 0;
+}
+.view-login .login-joomla {
+	position: absolute;
+	left: 50%;
+	height: 24px;
+	width: 24px;
+	margin-left: -12px;
+	font-size: 22px;
+}
+.view-login .navbar-fixed-bottom {
+	position: absolute;
+}
+.view-login .input-medium {
+	width: 176px;
+}
+.view-login #lang_chzn {
+	width: 233px !important;
+	max-width: none;
+}
+.view-login #lang_chzn .chzn-single div {
+	width: 43px;
+}
+.view-login .input-prepend .add-on,
+.view-login .controls .btn-group > .btn {
+	margin-left: 0;
+}
+.navbar-inverse {
+	color: #333;
+}
+.login .btn-large {
+	margin-top: 15px;
+}
+.login .form-inline .btn-group {
+	display: block;
+}
+@media (max-width: 479px) {
+	.login .chzn-single {
+		width: 222px !important;
+	}
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+}
+@media (max-width: 319px) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+}
+ul.manager .height-50 .icon-folder-2 {
+	height: 35px;
+	width: 35px;
+	line-height: 35px;
+	font-size: 30px;
+}
+#imageForm {
+	margin: -25px 0 0;
+}
+#imageForm .well {
+	margin-bottom: 5px;
+}
+.thumbnails-media {
+	margin-left: 0;
+}
+.thumbnails-media .thumbnail {
+	background-color: #f4f4f4;
+	border-radius: 3px;
+	border: 0;
+	box-shadow: 0 0 0 1px rgba(0,0,0,0.05) inset;
+	padding: 0px;
+	height: 100px;
+	width: 100px;
+	margin: 8px 16px;
+	margin-left: 0 !important;
+	position: relative;
+	text-align: center;
+	overflow: hidden;
+}
+.thumbnails-media .thumbnail .close {
+	background-color: #ccc;
+	border-left: 1px solid rgba(0,0,0,0.1);
+	height: 22px;
+	line-height: 22px;
+	opacity: 0.3;
+	text-align: center;
+	width: 22px;
+	top: 0;
+	right: 0;
+}
+.thumbnails-media .thumbnail .close:hover {
+	background-color: #bbb;
+}
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
+	-webkit-transition: all 0.2s ease;
+	transition: all 0.2s ease;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
+	margin: 0;
+	opacity: 0.55;
+	position: absolute;
+	top: 5px;
+	left: 5px;
+}
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
+	display: none;
+}
+.thumbnails-media .imgThumb {
+	position: relative;
+	z-index: 1;
+	width: 100%;
+	display: inline-block;
+}
+.thumbnails-media .imgThumb input {
+	display: none;
+}
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
+	display: block;
+	line-height: 100px;
+	position: relative;
+	width: 100%;
+	border-radius: 3px;
+	overflow: hidden;
+}
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
+	font-family: "IcoMoon";
+	font-style: normal;
+	content: 'G';
+	position: absolute;
+	top: 0;
+	right: 0;
+	background-color: #46a546;
+	color: #fff;
+	line-height: 26px;
+	width: 26px;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	opacity: 0;
+	border-color: rgba(0,0,0,0.2);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	border-radius: 0 3px;
+}
+.thumbnails-media .imgThumb img {
+	width: auto;
+}
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
+	background-color: #ddd;
+}
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
+	-webkit-transform: scale(1);
+	transform: scale(1);
+	opacity: 1;
+}
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	content: '';
+	border: 3px solid #46a546;
+	border-radius: 5px;
+}
+.thumbnails-media .imgDelete a.close,
+.thumbnails-media .imgPreview a {
+	padding: 0;
+	position: absolute;
+	left: 0;
+	z-index: 1;
+	height: 26px;
+	width: 26px;
+}
+.thumbnails-media .imgPreview a {
+	width: 100%;
+}
+.thumbnails-media .imgDelete a.close {
+	background-color: #bd362f;
+	border-color: #bd362f rgba(0,0,0,0.2) rgba(0,0,0,0.2) #bd362f;
+	top: 0;
+	line-height: 28px;
+	font-size: 12px;
+	padding-left: 1px;
+	color: #fff;
+	border-bottom-right-radius: 3px;
+	border-top-left-radius: 3px;
+	z-index: 10;
+	opacity: 0;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+}
+.thumbnails-media .imgDelete a.close:hover {
+	background-color: #802420;
+}
+.thumbnails-media .thumbnail:hover .imgDelete a.close {
+	opacity: 1;
+	-webkit-transform: scale(1);
+	transform: scale(1);
+}
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
+	position: absolute;
+	left: 0;
+	text-align: left;
+	background-color: #fff;
+	border-color: rgba(0,0,0,0.2);
+	bottom: 0;
+	line-height: 26px;
+	border: 1px solid rgba(0,0,0,0.1);
+	border-width: 1px;
+	border-radius: 0 3px 0 0;
+	z-index: 1;
+}
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
+	background-color: #eee;
+}
+.thumbnails-media .imgDetails {
+	padding: 0 5px;
+	line-height: 20px;
+	color: #555;
+}
+.thumbnails-media .imgFolder span {
+	line-height: 90px;
+	font-size: 38px;
+	margin: 0;
+	width: auto;
+}
+.thumbnails-media .imgFolder + .imgDetails {
+	color: inherit;
+}
+.com_media .media a + a {
+	margin-left: -1px;
+}
+.com_media .tree-holder {
+	padding: 0 15px;
+}
+#folderframe.thumbnail {
+	border: 0;
+	box-shadow: none;
+	padding: 0;
+}
+#mediamanager-form {
+	margin: 0 -10px;
+}
+#mediamanager-form > .muted {
+	padding: 0px;
+}
+#mediamanager-form .checkbox {
+	padding-left: 30px;
+	margin-bottom: 15px;
+}
+#mediamanager-form .checkbox input {
+	margin-top: 3px;
+}
+#mediamanager-form .thumbnails .thumbnail {
+	height: 120px;
+	width: 120px;
+	margin: 0 18px 18px 0;
+}
+#mediamanager-form .thumbnails .imgThumb label,
+#mediamanager-form .thumbnails .imgTotal {
+	line-height: 120px;
+}
+#mediamanager-form .icon-search::before {
+	padding-right: 5px;
+	padding-left: 1px;
+}
+#mediamanager-form .height-50 {
+	background-color: #fafafa;
+	height: 77px;
+	position: relative;
+	z-index: 1;
+	width: 100%;
+	display: inline-block;
+}
+#mediamanager-form .height-50 a,
+#mediamanager-form .height-50 .icon-folder-2 {
+	display: inline-block;
+	line-height: 75px;
+	margin-top: -1px;
+}
+#mediamanager-form .height-50 a:after {
+	bottom: 0;
+	box-shadow: 0 0 0 1px rgba(0,0,0,0.08) inset;
+	content: "";
+	display: block;
+	left: 0;
+	overflow: hidden;
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+#mediamanager-form .height-50 .icon-folder-2 {
+	font-size: 40px;
+}
+.uploadform {
+	margin-top: 20px;
+}
+body.modal-open {
+	-ms-overflow-style: none;
+}
+.modal-header {
+	padding: 0 20px;
+	text-align: left;
+}
+.modal-header h3 {
+	font-weight: normal;
+	line-height: 50px;
+}
+.modal-header .close {
+	width: 50px;
+	margin-top: 0;
+	margin-right: -15px;
+	font-size: 2rem;
+	line-height: 50px;
+	border-left: 1px solid #ccc;
+}
+.modal-body {
+	padding: 0;
+	width: 100%;
+	height: auto;
+}
+.modal-body .container-fluid {
+	padding-top: 15px;
+	padding-bottom: 15px;
+}
+.modal-footer {
+	clear: both;
+}
+.contentpane {
+	padding: 10px;
+	height: auto;
+}
+@media (min-width: 768px) {
+	.row-fluid .modal-batch [class*="span"] {
+		margin-left: 0;
+	}
+}
+.container-popup {
+	padding: 28px 10px 10px 10px;
+}
+body .navbar,
+body .navbar-fixed-top {
+	margin-bottom: 0;
+}
+.navbar-inner {
+	min-height: 0;
+	background: #f2f2f2;
+	background-image: none;
+	filter: none;
+}
+.navbar-inner .container-fluid {
+	padding-left: 10px;
+	padding-right: 10px;
+	font-size: 15px;
+}
+.navbar-inverse .navbar-inner {
+	background: #10223e;
+	background-image: none;
+	filter: none;
+}
+.navbar .navbar-text {
+	line-height: 30px;
+}
+.navbar .admin-logo {
+	float: left;
+	padding: 7px 12px 0px 15px;
+	font-size: 16px;
+	color: #555;
+}
+.navbar .admin-logo:hover {
+	color: #333;
+}
+.navbar-inverse.navbar .admin-logo {
+	color: #d9d9d9;
+}
+.navbar-inverse.navbar .admin-logo:hover {
+	color: #ffffff;
+}
+.navbar .brand {
+	float: right;
+	display: block;
+	padding: 6px 10px;
+	margin-left: -20px;
+	font-size: inherit;
+	font-weight: normal;
+}
+.navbar .brand:hover,
+.navbar .brand:focus {
+	text-decoration: none;
+}
+.navbar .nav > li > a {
+	padding: 6px 10px;
+}
+.navbar .nav > li > a:hover {
+	color: white;
+}
+.navbar .nav > li > a:hover span.carot {
+	border-bottom-color: #fff;
+	border-top-color: #fff;
+}
+.navbar .dropdown-menu,
+.navbar .nav-user {
+	font-size: 13px;
+}
+.navbar .nav-user .dropdown-menu li span {
+	padding-left: 10px;
+}
+.navbar .nav > li ul {
+	overflow-y: auto;
+	overflow-x: hidden;
+	-webkit-overflow-scrolling: touch;
+	-moz-overflow-scrolling: touch;
+	-ms-overflow-scrolling: touch;
+	-o-overflow-scrolling: touch;
+	overflow-scrolling: touch;
+	height: auto;
+	max-height: 500px;
+	margin: 0;
+}
+.navbar .nav > li ul::-webkit-scrollbar {
+	-webkit-appearance: none;
+	width: 7px;
+}
+.navbar .nav > li ul::-webkit-scrollbar-thumb {
+	border-radius: 4px;
+	background-color: rgba(0,0,0,0.5);
+	-webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5);
+}
+.navbar .nav > li > .dropdown-menu:after {
+	display: none;
+}
+.navbar .nav > .dropdown.open:after {
+	content: '';
+	display: inline-block;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	position: absolute;
+	top: 25px;
+	left: 10px;
+	z-index: 1001;
+}
+.navbar .empty-nav {
+	display: none;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+	background-image: none;
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.navbar .btn-navbar {
+	background: #17568c;
+	border: 1px solid #0D2242;
+	margin-bottom: 2px;
+}
+@media (max-width: 767px) {
+	.navbar .admin-logo {
+		margin-left: 10px;
+		padding: 9px 9px 0 9px;
+	}
+}
+.navbar-search .search-query {
+	background: rgba(255,255,255,0.3);
+}
+@media (max-width: 979px) {
+	.navbar .nav {
+		font-size: 13px;
+		margin: 0 2px 0 0;
+	}
+	.navbar .nav > li > a {
+		padding: 6px;
+	}
+}
+@media (max-width: 767px) {
+	.navbar-search.pull-right {
+		float: none;
+		text-align: center;
+	}
+}
+@media (max-width: 738px) {
+	.navbar .brand {
+		font-size: 16px;
+	}
+}
+.nav-collapse .nav li a,
+.dropdown-menu a {
+	background-image: none;
+}
+.nav-collapse .dropdown-menu > li img {
+	max-width: none;
+}
+@media (max-width: 767px) {
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-top .navbar-inner .container-fluid {
+		padding: 0;
+	}
+	.navbar .brand {
+		margin-top: 2px;
+		float: none;
+		text-align: center;
+	}
+	.navbar .btn-navbar {
+		margin-top: 3px;
+		margin-right: 3px;
+		margin-bottom: 3px;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #fff;
+	}
+	.nav-collapse .nav,
+	.navbar .nav-collapse .nav.pull-right {
+		margin: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		margin: 0;
+	}
+	.nav-collapse .dropdown-menu > li > span {
+		display: block;
+		padding: 4px 15px;
+	}
+	.navbar-inverse .nav-collapse .dropdown-menu > li > span {
+		color: #d9d9d9;
+	}
+	.nav-collapse .nav > li > a.dropdown-toggle {
+		background-color: rgba(255,255,255,0.07);
+		font-size: 12px;
+		font-weight: bold;
+		color: #eee;
+		text-transform: uppercase;
+		padding-left: 15px;
+	}
+	.nav-collapse .nav li a {
+		margin-bottom: 0;
+		border-top: 1px solid rgba(255,255,255,0.25);
+		border-bottom: 1px solid rgba(0,0,0,0.5);
+	}
+	.nav-collapse .nav li ul li ul.dropdown-menu,
+	.nav-collapse .nav li ul li:hover ul.dropdown-menu,
+	.nav-collapse .caret {
+		display: none !important;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		font-size: 15px;
+		font-weight: normal;
+		color: #fff;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+	}
+	.navbar .nav-collapse .nav > li > .dropdown-menu::before,
+	.navbar .nav-collapse .nav > li > .dropdown-menu::after,
+	.navbar .nav-collapse .dropdown-submenu > a::after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 0;
+	}
+}
+.quick-icons {
+	font-size: 14px;
+	margin-bottom: 20px;
+}
+.quick-icons .nav-header {
+	margin: 12px 0 5px;
+	font-size: 13px;
+}
+.quick-icons .nav-header:first-child {
+	margin: 0 0 5px;
+}
+.quick-icons [class^="icon-"],
+.quick-icons [class*=" icon-"] {
+	margin-right: 9px;
+}
+.quick-icons [class^="icon-"]:before,
+.quick-icons [class*=" icon-"]:before {
+	font-size: 16px;
+	margin-bottom: 20px;
+	line-height: 18px;
+}
+html[dir=rtl] .quick-icons .nav-list [class^="icon-"],
+html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
+	margin-left: 9px;
+	margin-right: 0;
+}
+.sidebar-nav .nav-list {
+	padding-left: 25px;
+	padding-right: 25px;
+}
+.sidebar-nav .nav-list > li > a {
+	color: #555;
+	padding: 3px 25px;
+	margin-left: -26px;
+	margin-right: -26px;
+}
+.sidebar-nav .nav-list > li.active > a {
+	color: #fff;
+	margin-right: -26px;
+}
+.sidebar-nav .nav-list > li > a:focus,
+.sidebar-nav .nav-list > li > a:hover {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+	text-shadow: none;
+}
+.j-sidebar-container {
+	position: absolute;
+	display: block;
+	left: -16.5%;
+	width: 16.5%;
+	margin: -18px 0 0 -1px;
+	padding-top: 28px;
+	padding-bottom: 40px;
+	clear: both;
+	background-color: #F0F0F0;
+	border-bottom: 1px solid #dedede;
+	border-right: 1px solid #dedede;
+	-webkit-border-radius: 0 0 3px 0;
+	-moz-border-radius: 0 0 3px 0;
+	border-radius: 0 0 3px 0;
+}
+.j-sidebar-container.j-sidebar-hidden {
+	left: -16.5%;
+}
+.j-sidebar-container.j-sidebar-visible {
+	left: 0;
+}
+.j-sidebar-container .filter-select {
+	padding: 0 14px;
+}
+.j-toggle-sidebar-header h3 {
+	font-weight: normal;
+	padding: 0 15px;
+}
+.j-toggle-button-wrapper {
+	position: absolute;
+	display: block;
+	top: 7px;
+	padding: 0;
+}
+.j-toggle-button-wrapper.j-toggle-hidden {
+	right: -24px;
+}
+.j-toggle-button-wrapper.j-toggle-visible {
+	right: 7px;
+}
+.j-toggle-sidebar-button {
+	font-size: 16px;
+	color: #3071a9;
+	text-decoration: none;
+	cursor: pointer;
+}
+.j-toggle-sidebar-button:hover {
+	color: #1f496e;
+}
+#system-message-container,
+#j-main-container {
+	padding: 0 0 0 5px;
+	min-height: 0;
+}
+#system-message-container.j-toggle-main,
+#j-main-container.j-toggle-main,
+#system-debug.j-toggle-main {
+	float: right;
+}
+@media (min-width: 768px) {
+	.j-toggle-transition {
+		-webkit-transition: all 0.3s ease;
+		-moz-transition: all 0.3s ease;
+		-o-transition: all 0.3s ease;
+		transition: all 0.3s ease;
+	}
+}
+@media (max-width: 979px) {
+	.j-toggle-button-wrapper.j-toggle-hidden {
+		right: -20px;
+	}
+}
+@media (max-width: 767px) {
+	.j-sidebar-container {
+		position: relative;
+		width: 100%;
+		margin: 0 0 20px 0;
+		padding: 0;
+		background: transparent;
+		border-right: 0;
+		border-bottom: 0;
+	}
+	.j-sidebar-container.j-sidebar-hidden {
+		margin-left: 16.5%;
+	}
+	.j-sidebar-container.j-sidebar-visible {
+		margin-left: 0;
+	}
+	.j-toggle-sidebar-header,
+	.j-toggle-button-wrapper {
+		display: none;
+	}
+	.view-login select {
+		width: 232px;
+	}
+}
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+	.view-login .input-medium {
+		width: 180px;
+	}
+	.view-login select {
+		width: 232px;
+	}
+}
+#status {
+	background: #ebebeb;
+	border-top: 1px solid #dedede;
+	padding: 4px 10px;
+	-webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
+	-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
+	box-shadow: 0 0 3px rgba(0, 0, 0, 0.08);
+	color: #626262;
+}
+#status .btn-group {
+	margin: 0;
+}
+#status .btn-group.separator:after {
+	content: ' ';
+	display: block;
+	float: left;
+	background: #ADADAD;
+	margin: 0 10px;
+	height: 15px;
+	width: 1px;
+}
+#status .btn-toolbar,
+#status p {
+	margin: 0px;
+}
+#status .btn-toolbar,
+#status .btn-group {
+	font-size: 12px;
+}
+#status a {
+	color: #626262;
+}
+#status .badge {
+	margin-right: .25em;
+}
+#status.status-top {
+	background: #1a3867;
+	-webkit-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3);
+	border-top: 0;
+	color: #d9d9d9;
+	padding: 2px 20px 6px 20px;
+}
+#status.status-top a {
+	color: #d9d9d9;
+}
+@media (max-width: 479px) {
+	.pagination a {
+		padding: 5px;
+	}
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7 {
+		display: none;
+	}
+	.navbar .btn {
+		margin: 0;
+	}
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+	.subhead-collapse.collapse {
+		height: 0;
+		overflow: hidden;
+	}
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0px 10px 5px 10px;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+	}
+	.subhead {
+		background: none repeat scroll 0 0 transparent;
+		border-bottom: 0 solid #dedede;
+	}
+	.btn-group + .btn-group {
+		margin-left: 10px;
+	}
+	.login .chzn-single {
+		width: 222px !important;
+	}
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+	#toolbar [class^="icon-"],
+	#toolbar [class*=" icon-"] {
+		background-color: transparent;
+		border-right: medium none;
+		width: 10px;
+	}
+}
+table label {
+	margin: 0;
+}
+td.has-context {
+	height: 23px;
+}
+td.nowrap.has-context {
+	width: 45%;
+}
+.subhead {
+	background: #F0F0F0;
+	border-bottom: 1px solid #dedede;
+	color: #0C192E;
+	text-shadow: 0 1px 0 #FFF;
+	margin-bottom: 10px;
+	min-height: 51px;
+}
+.subhead-collapse {
+	margin-bottom: 19px;
+}
+.subhead-collapse.collapse {
+	height: auto;
+	overflow: visible;
+}
+.btn-toolbar {
+	margin-bottom: 5px;
+}
+.btn-toolbar .btn-wrapper {
+	display: inline-block;
+	margin: 0 0 8px 5px;
+}
+.subhead-fixed {
+	position: fixed;
+	width: 100%;
+	top: 30px;
+	z-index: 100;
+}
+@media (max-width: 767px) {
+	body {
+		-webkit-overflow-scrolling: touch;
+	}
+	.subhead {
+		margin-left: -20px;
+		margin-right: -20px;
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+.subhead h1 {
+	font-size: 17px;
+	font-weight: normal;
+	margin-left: 10px;
+	margin-top: 6px;
+}
+#toolbar {
+	margin-bottom: 2px;
+	margin-top: 12px;
+}
+#toolbar .btn {
+	line-height: 24px;
+	margin-right: 4px;
+	padding: 0 10px;
+}
+#toolbar .btn-success {
+	min-width: 148px;
+}
+#toolbar .btn-primary [class^="icon-"],
+#toolbar .btn-primary [class*=" icon-"],
+#toolbar .btn-warning [class^="icon-"],
+#toolbar .btn-warning [class*=" icon-"],
+#toolbar .btn-danger [class^="icon-"],
+#toolbar .btn-danger [class*=" icon-"],
+#toolbar .btn-success [class^="icon-"],
+#toolbar .btn-success [class*=" icon-"],
+#toolbar .btn-info [class^="icon-"],
+#toolbar .btn-info [class*=" icon-"],
+#toolbar .btn-inverse [class^="icon-"],
+#toolbar .btn-inverse [class*=" icon-"] {
+	background-color: transparent;
+	border-right: 0;
+	border-left: 0;
+	width: 16px;
+	margin-left: 0;
+	margin-right: 0;
+}
+#toolbar #toolbar-options,
+#toolbar #toolbar-help {
+	float: right;
+}
+#toolbar [class^="icon-"],
+#toolbar [class*=" icon-"] {
+	background-color: #e6e6e6;
+	border-radius: 3px 0 0 3px;
+	border-right: 1px solid #b3b3b3;
+	height: auto;
+	line-height: inherit;
+	margin: 0 6px 0 -10px;
+	opacity: 1;
+	text-shadow: none;
+	width: 28px;
+	z-index: -1;
+}
+#toolbar iframe .btn-group .btn {
+	margin-left: -1px !important;
+}
+html[dir=rtl] #toolbar #toolbar-options,
+html[dir=rtl] #toolbar #toolbar-help {
+	float: left;
+}
+@media (max-width: 767px) {
+	.subhead-fixed {
+		position: static;
+		width: auto;
+	}
+}
+.btn-subhead {
+	display: none;
+}
+@media (min-width: 480px) {
+	#filter-bar {
+		height: 29px;
+	}
+}
+@media (max-width: 479px) {
+	.navbar .btn {
+		margin: 0;
+	}
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+	.subhead-collapse.collapse {
+		height: 0;
+		overflow: hidden;
+	}
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0px 10px 5px 10px;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+	}
+	.subhead {
+		background: none repeat scroll 0 0 transparent;
+		border-bottom: 0 solid #dedede;
+	}
+	#toolbar [class^="icon-"],
+	#toolbar [class*=" icon-"] {
+		background-color: transparent;
+		border-right: medium none;
+		width: 10px;
+	}
+}
+@media (max-width: 319px) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+}
+ul.treeselect,
+ul.treeselect li {
+	margin: 0;
+	padding: 0;
+}
+ul.treeselect {
+	margin-top: 8px;
+}
+ul.treeselect li {
+	padding: 2px 10px 2px;
+	list-style: none;
+}
+ul.treeselect i.treeselect-toggle {
+	line-height: 18px;
+}
+ul.treeselect label {
+	font-size: 1em;
+	margin-left: 8px;
+}
+ul.treeselect label.nav-header {
+	padding: 0;
+}
+ul.treeselect input {
+	margin: 2px 0 0 8px;
+}
+ul.treeselect .treeselect-menu {
+	margin: 0 6px;
+}
+ul.treeselect ul.dropdown-menu {
+	margin: 0;
+}
+ul.treeselect ul.dropdown-menu li {
+	padding: 0 5px;
+	border: none;
+}
+.tree-holder .folder-url,
+.tree-holder .file {
+	position: relative;
+	background-color: #fefefe;
+	margin-bottom: 4px;
+	padding: 0 10px;
+	line-height: 32px;
+	border: 1px solid rgba(0,0,0,0.08);
+}
+.tree-holder .folder-url,
+.tree-holder .folder-url:hover,
+.tree-holder .folder-url:focus {
+	font-weight: bold;
+	background-color: #f5f5f5;
+	color: #3071a9;
+}
+.tree-holder .active {
+	background-color: #3071a9;
+	color: #fff;
+	box-shadow: -3px 0 0 #36a2ff !important;
+}
+.tree-holder .active.folder-url {
+	background-color: #f5f5f5;
+	color: #3071a9;
+}
+.tree-holder .active.file:hover {
+	background-color: #3071a9;
+}
+.tree-holder ul ul {
+	box-shadow: -3px 0 0 rgba(0,0,0,0.08);
+	padding-right: 0;
+}
+.tree-holder ul ul .folder-url,
+.tree-holder ul ul .file {
+	box-shadow: -3px 0 0 #3071a9;
+	border-left: 0;
+}
+.break-word {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+.disabled {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.j-links-separator {
+	margin: 20px 0px;
+	width: 100%;
+	height: 0px;
+	border-top: 2px solid #DDDDDD;
+}
+.container-main,
+#system-debug {
+	padding-bottom: 50px;
+}
+.pagination-toolbar {
+	margin: 0;
+}
+.pagination-toolbar a {
+	line-height: 26px;
+}
+.pull-right > .dropdown-menu {
+	left: auto;
+	right: 0;
+}
+.nav-filters hr {
+	margin: 5px 0;
+}
+#assignment.tab-pane {
+	min-height: 500px;
+}
+@media (max-width: 979px) {
+	.container-fluid {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 768px) {
+	body {
+		padding-top: 30px;
+	}
+	.nav-collapse.collapse.in {
+		height: auto !important;
+	}
+}
+@media (max-width: 767px) {
+	.container-fluid {
+		padding-left: 0;
+		padding-right: 0;
+	}
+}
+@media (max-width: 479px) {
+	.pagination a {
+		padding: 5px;
+	}
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7 {
+		display: none;
+	}
+	.btn-group + .btn-group {
+		margin-left: 10px;
+	}
+}
+.info-labels {
+	margin-top: -5px;
+	margin-bottom: 10px;
+}
+.sortable-handler.inactive {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+.alert-joomlaupdate {
+	text-align: center;
+}
+.alert-joomlaupdate button {
+	vertical-align: baseline;
+}
+.j-jed-message {
+	line-height: 2em;
+	color: #333333;
+}
+.upload-queue > li > span,
+.upload-queue > li > a {
+	margin: 0 2px;
+}
+.upload-queue .file-remove {
+	float: right;
+}
+.moor-box {
+	z-index: 3;
+}
+.admin .chzn-container .chzn-drop {
+	z-index: 1060;
+}
+.item-associations {
+	margin: 0;
+}
+.item-associations li {
+	list-style: none;
+	display: inline-block;
+	margin: 0 0 3px 0;
+}
+.item-associations li a {
+	color: #ffffff;
+}
+#flag img {
+	padding-top: 6px;
+	vertical-align: top;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+#permissions-sliders .chzn-container {
+	margin-top: -5px;
+	position: absolute;
+}
+#permissions-sliders .table td {
+	padding: 8px 8px 9px;
+}
+.img-preview > img {
+	max-height: 100%;
+}
+#helpsite-refresh {
+	padding: 4px 12px;
+	vertical-align: top;
+}
+.alert-no-items {
+	margin-top: 20px;
+}
+@media (max-width: 767px) {
+	html[dir=rtl] #toolbar #toolbar-options,
+	html[dir=rtl] #toolbar #toolbar-help,
+	#toolbar #toolbar-options,
+	#toolbar #toolbar-help {
+		float: none;
+	}
+}
+#permissions-sliders .input-small {
+	width: 120px;
+}
+.editor {
+	overflow: hidden;
+	position: relative;
+}
+.editor textarea.mce_editable {
+	box-sizing: border-box;
+}
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/publish_r.png');
+}
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/icon-16-allow.png');
+}
+textarea,
+input,
+.uneditable-input {
+	box-shadow: none !important;
+}
+textarea:focus,
+input:focus,
+.uneditable-input:focus {
+	box-shadow: none;
+	border: 1px solid #3071A9;
+}
+.js-pstats-data-details dd {
+	margin-left: 240px;
+}
+.js-pstats-data-details dt {
+	width: 220px;
+}
+#permissions table td,
+#page-permissions table td {
+	vertical-align: middle;
+}
+#permissions table select,
+#page-permissions table select {
+	margin-bottom: 0;
+}
+.js-stools-container-bar .btn-primary .caret {
+	border-bottom: 4px solid #fff;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .add-on,
+.input-prepend .btn,
+.input-prepend .btn-group > .dropdown-toggle {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.alert,
+.alert-options,
+.badge,
+.breadcrumb > li,
+.close,
+.input-append .add-on,
+.input-prepend .add-on,
+.label,
+.nav-header,
+.nav-list .nav-header,
+.nav-list > .active > a,
+.nav-list > .active > a:focus,
+.nav-list > .active > a:hover,
+.nav-list > li > a,
+.nav-tabs.nav-dark,
+.navbar .brand,
+.navbar .nav > li > a,
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a,
+.navbar-inverse .navbar-search .search-query.focused,
+.navbar-inverse .navbar-search .search-query:focus,
+.progress .bar,
+.subhead {
+	text-shadow: none;
+}
+.popover-content {
+	min-height: 33px;
+}
+.lead,
+.navbar .brand,
+.hero-unit,
+.hero-unit .lead {
+	font-weight: 400;
+}
+.com_cpanel .well {
+	padding: 8px 14px;
+	border: 1px solid rgba(0,0,0,0.05);
+}
+.com_cpanel .well .module-title.nav-header {
+	color: #555;
+}
+.com_cpanel .well > .row-striped,
+.com_cpanel .well > .list-striped {
+	margin: 0 -14px;
+}
+.com_cpanel .well > .row-striped > .row-fluid,
+.com_cpanel .well > .list-striped > .row-fluid {
+	padding: 8px 14px;
+}
+.com_cpanel .well > .row-striped > .row-fluid [class*="span"],
+.com_cpanel .well > .list-striped > .row-fluid [class*="span"] {
+	margin-left: 0;
+}
+.com_cpanel .well > .row-striped > li,
+.com_cpanel .well > .list-striped > li {
+	padding-left: 15px;
+	padding-right: 15px;
+}
+.com_postinstall fieldset {
+	background-color: #fafafa;
+	border: 1px solid #ccc;
+	border-radius: 5px;
+	margin: 0 0 18px;
+	padding: 4px 18px 18px;
+}
+.com_postinstall fieldset .btn {
+	margin-top: 10px;
+}
+.com_postinstall legend {
+	border: 0 none;
+	display: inline-block;
+	padding: 0 5px;
+	margin-bottom: 0;
+	width: auto;
+}
+#menu-assignment {
+	position: relative;
+}
+#menu-assignment .menu-links {
+	margin-top: 15px;
+	margin-left: 0;
+	-webkit-column-count: 3;
+	-moz-column-count: 3;
+	column-count: 3;
+	-moz-column-gap: 15px;
+	-webkit-column-gap: 15px;
+	column-gap: 15px;
+}
+#menu-assignment .menu-links > li {
+	display: inline-block;
+	vertical-align: top;
+	margin-bottom: 15px;
+	width: 100%;
+	list-style: none;
+}
+#menu-assignment .menu-links-block {
+	background-color: #fafafa;
+	border: 1px solid #ddd;
+	border-radius: 3px;
+	padding: 15px;
+}
+@media (max-width: 767px) {
+	#menu-assignment .menu-links {
+		-webkit-column-count: auto;
+		-moz-column-count: auto;
+		column-count: auto;
+	}
+}
diff --git a/core/administrator/templates/isis/error.php b/core/administrator/templates/isis/error.php
new file mode 100644
index 00000000..cdd951fe
--- /dev/null
+++ b/core/administrator/templates/isis/error.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/** @var JDocumentError $this */
+
+// Getting params from template
+$params = JFactory::getApplication()->getTemplate(true)->params;
+
+$app   = JFactory::getApplication();
+$lang  = JFactory::getLanguage();
+$input = $app->input;
+$user  = JFactory::getUser();
+
+// Gets the FrontEnd Main page Uri
+$frontEndUri = JUri::getInstance(JUri::root());
+$frontEndUri->setScheme(((int) $app->get('force_ssl', 0) === 2) ? 'https' : 'http');
+$mainPageUri = $frontEndUri->toString();
+
+// Detecting Active Variables
+$option   = $input->get('option', '');
+$view     = $input->get('view', '');
+$layout   = $input->get('layout', '');
+$task     = $input->get('task', '');
+$itemid   = $input->get('Itemid', 0, 'int');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
+
+$cpanel = ($option === 'com_cpanel');
+
+$showSubmenu = false;
+$this->submenumodules = JModuleHelper::getModules('submenu');
+foreach ($this->submenumodules as $submenumodule)
+{
+	$output = JModuleHelper::renderModule($submenumodule);
+	if ($output !== '')
+	{
+		$showSubmenu = true;
+		break;
+	}
+}
+
+// Logo file
+if ($params->get('logoFile'))
+{
+	$logo = JUri::root() . $params->get('logoFile');
+}
+else
+{
+	$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
+}
+
+// Template Parameters
+$displayHeader = $params->get('displayHeader', '1');
+$statusFixed   = $params->get('statusFixed', '1');
+$stickyToolbar = $params->get('stickyToolbar', '1');
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<title><?php echo $this->title; ?> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></title>
+	<?php if ($app->get('debug_lang', '0') == '1' || $app->get('debug', '0') == '1') : ?>
+		<!-- Load additional CSS styles for debug mode-->
+		<link href="<?php echo JUri::root(true); ?>/media/cms/css/debug.css" rel="stylesheet" />
+	<?php endif; ?>
+	<?php // If Right-to-Left ?>
+	<?php if ($this->direction == 'rtl') : ?>
+		<link href="<?php echo JUri::root(true); ?>/media/jui/css/bootstrap-rtl.css" rel="stylesheet" />
+	<?php endif; ?>
+	<?php // Load specific language related CSS ?>
+	<?php $file = '/administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css'; ?>
+	<?php if (is_file(JPATH_ROOT . $file)) : ?>
+		<link href="<?php echo JUri::root(true) . $file; ?>" rel="stylesheet" />
+	<?php endif; ?>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/template<?php echo ($this->direction == 'rtl' ? '-rtl' : ''); ?>.css" rel="stylesheet" />
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+	<?php // Template color ?>
+	<?php if ($params->get('templateColor')) : ?>
+	<style>
+		.navbar-inner, .navbar-inverse .navbar-inner, .nav-list > .active > a, .nav-list > .active > a:hover, .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover, .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle
+		{
+			background: <?php echo $params->get('templateColor');?>;
+		}
+		.navbar-inner, .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle{
+			-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
+			-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
+			box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
+		}
+	</style>
+	<?php endif; ?>
+	<?php // Template header color ?>
+	<?php if ($params->get('headerColor')) : ?>
+	<style>
+		.header
+		{
+			background: <?php echo $params->get('headerColor');?>;
+		}
+	</style>
+	<?php endif; ?>
+	<?php // Sidebar background color ?>
+	<?php if ($params->get('sidebarColor')) : ?>
+		<style>
+			.nav-list > .active > a, .nav-list > .active > a:hover {
+				background: <?php echo $params->get('sidebarColor'); ?>;
+			}
+		</style>
+	<?php endif; ?>
+	<script src="<?php echo JUri::root(true); ?>/media/jui/js/jquery.js"></script>
+	<script src="<?php echo JUri::root(true); ?>/media/jui/js/jquery-noconflict.js"></script>
+	<script src="<?php echo JUri::root(true); ?>/media/jui/js/bootstrap.js"></script>
+	<script src="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/js/template.js"></script>
+	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
+</head>
+<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task;?>" data-spy="scroll" data-target=".subhead" data-offset="87">
+	<!-- Top Navigation -->
+	<nav class="navbar navbar-inverse navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container-fluid">
+				<?php if ($params->get('admin_menus') != '0') : ?>
+					<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+						<span class="element-invisible"><?php echo JTEXT::_('TPL_ISIS_TOGGLE_MENU'); ?></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+					</a>
+				<?php endif; ?>
+				<a class="admin-logo" href="<?php echo $this->baseurl; ?>"><span class="icon-joomla"></span></a>
+
+				<a class="brand hidden-desktop hidden-tablet" href="<?php echo $mainPageUri; ?>" title="<?php echo JText::sprintf('TPL_ISIS_PREVIEW', $sitename); ?>" target="_blank"><?php echo JHtml::_('string.truncate', $sitename, 14, false, false); ?>
+					<span class="icon-out-2 small"></span></a>
+
+				<?php if ($params->get('admin_menus') != '0') : ?>
+				<div class="nav-collapse">
+				<?php else : ?>
+				<div>
+				<?php endif; ?>
+					<?php // Display menu modules ?>
+					<?php $this->menumodules = JModuleHelper::getModules('menu'); ?>
+					<?php foreach ($this->menumodules as $menumodule) : ?>
+						<?php $output = JModuleHelper::renderModule($menumodule, array('style' => 'none')); ?>
+						<?php $params = new Registry($menumodule->params); ?>
+						<?php echo $output; ?>
+					<?php endforeach; ?>
+					<ul class="nav nav-user<?php echo ($this->direction == 'rtl') ? ' pull-left' : ' pull-right'; ?>">
+						<li class="dropdown">
+							<a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-cog"></span>
+								<span class="caret"></span></a>
+							<ul class="dropdown-menu">
+								<li>
+									<span>
+										<span class="icon-user"></span>
+										<strong><?php echo $user->name; ?></strong>
+									</span>
+								</li>
+								<li class="divider"></li>
+								<li class="">
+									<a href="index.php?option=com_admin&amp;task=profile.edit&amp;id=<?php echo $user->id; ?>"><?php echo JText::_('TPL_ISIS_EDIT_ACCOUNT'); ?></a>
+								</li>
+								<li class="divider"></li>
+								<li class="">
+									<a href="<?php echo JRoute::_('index.php?option=com_login&task=logout&' . JSession::getFormToken() . '=1'); ?>"><?php echo JText::_('TPL_ISIS_LOGOUT'); ?></a>
+								</li>
+							</ul>
+						</li>
+					</ul>
+					<a class="brand visible-desktop visible-tablet" href="<?php echo $mainPageUri; ?>" title="<?php echo JText::sprintf('TPL_ISIS_PREVIEW', $sitename); ?>" target="_blank"><?php echo JHtml::_('string.truncate', $sitename, 14, false, false); ?>
+						<span class="icon-out-2 small"></span></a>
+				</div>
+				<!--/.nav-collapse -->
+			</div>
+		</div>
+	</nav>
+	<!-- Header -->
+	<header class="header">
+		<?php if ($displayHeader) : ?>
+		<div class="container-logo">
+			<img src="<?php echo $logo; ?>" class="logo" />
+		</div>
+		<?php endif; ?>
+		<div class="container-title">
+			<h1 class="page-title"><?php echo JText::_('ERROR'); ?></h1>
+		</div>
+	</header>
+	<?php if (!$statusFixed && $this->getInstance()->countModules('status')) : ?>
+		<!-- Begin Status Module -->
+		<div id="status" class="navbar status-top hidden-phone">
+			<div class="btn-toolbar">
+				<div class="btn-group pull-right">
+					<p>
+						&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+					</p>
+				</div>
+				<?php // Display status modules ?>
+				<?php $this->statusmodules = JModuleHelper::getModules('status'); ?>
+				<?php foreach ($this->statusmodules as $statusmodule) : ?>
+					<?php $output = JModuleHelper::renderModule($statusmodule, array('style' => 'no')); ?>
+					<?php $params = new Registry($statusmodule->params); ?>
+					<?php echo $output; ?>
+				<?php endforeach; ?>
+			</div>
+			<div class="clearfix"></div>
+		</div>
+		<!-- End Status Module -->
+	<?php endif; ?>
+	<div class="subhead-spacer" style="margin-bottom: 20px"></div>
+	<!-- container-fluid -->
+	<div class="container-fluid container-main">
+		<section id="content">
+			<!-- Begin Content -->
+			<div class="row-fluid">
+				<div class="span12">
+					<!-- Begin Content -->
+					<h1 class="page-header"><?php echo JText::_('JERROR_AN_ERROR_HAS_OCCURRED'); ?></h1>
+					<blockquote>
+						<span class="label label-inverse"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8');?>
+						<?php if ($this->debug) : ?>
+							<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+						<?php endif; ?>
+					</blockquote>
+					<?php if ($this->debug) : ?>
+						<div>
+							<?php echo $this->renderBacktrace(); ?>
+							<?php // Check if there are more Exceptions and render their data as well ?>
+							<?php if ($this->error->getPrevious()) : ?>
+								<?php $loop = true; ?>
+								<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+								<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+								<?php $this->setError($this->_error->getPrevious()); ?>
+								<?php while ($loop === true) : ?>
+									<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+									<p>
+										<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+										<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+									</p>
+									<?php echo $this->renderBacktrace(); ?>
+									<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+								<?php endwhile; ?>
+								<?php // Reset the main error object to the base error ?>
+								<?php $this->setError($this->error); ?>
+							<?php endif; ?>
+						</div>
+					<?php endif; ?>
+					<p><a href="<?php echo $this->baseurl; ?>" class="btn"><span class="icon-dashboard"></span> <?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
+					<!-- End Content -->
+				</div>
+			</div>
+			<!-- End Content -->
+		</section>
+		<hr />
+	</div>
+	<script>
+		(function($){
+			// fix sub nav on scroll
+			var $win    = $(window)
+			  , $nav    = $('.subhead')
+			  , navTop  = $('.subhead').length && $('.subhead').offset().top - 40
+			  , isFixed = 0
+
+			processScroll()
+
+			// hack sad times - holdover until rewrite for 2.1
+			$nav.on('click', function ()
+			{
+				if (!isFixed) setTimeout(function () {  $win.scrollTop($win.scrollTop() - 47) }, 10)
+			})
+
+			$win.on('scroll', processScroll)
+
+			function processScroll()
+			{
+				var i, scrollTop = $win.scrollTop()
+				if (scrollTop >= navTop && !isFixed)
+				{
+					isFixed = 1
+					$nav.addClass('subhead-fixed')
+				} else if (scrollTop <= navTop && isFixed)
+				{
+					isFixed = 0
+					$nav.removeClass('subhead-fixed')
+				}
+			}
+		})(jQuery);
+	</script>
+</body>
+</html>
diff --git a/core/administrator/templates/isis/favicon.ico b/core/administrator/templates/isis/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1a4d7979dcf49a5f677c7e0075781431e23f2c50
GIT binary patch
literal 2019
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z81_l<D%#etZ2wxwo<osN{#FYG`RK1Ga0-$OJ2Ac{iATu|$BvGLvHz%*y
zs=`(YtilS&1_|pcDS(xfWZNo5_y#CA=NF|anChA687SFtDJUq|6s4qD1-ZCEwF7y!
zN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWfdBw^QLty5(q!uR^
zWfqiV=I1GZ%uP(nFD<cEQUX~72M~9bWTqi($}5I?3+O?8kc_^eo`F6#ZK)NRIJALe
zaB53QhWo0Zv?vGcr<7#<)ST4Z)Vz{npgu#a)&av7t`WtN6^R89%fNvM@tY0E<yJwd
z#rZj<pdbj%%Pg@ovH^PtT^JD}5M9psxdlb3#l=8vcBW7*$YSW~BM{cunZxWr7DU(J
zUz7>-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{
zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+7C`G)JGDw(Z{OV
z2AC48eDhN>(<)sOOH%EO3=B=J42-P|O%)7{K@1b1chS@!xd0^NT$Gwvl3x^(pPyp~
z_C+p;t6;2WtOxWrx(cXf8+}kdLdsW=ObZqT=2|;0piWo`V8><WSr*H{z#QS};uvBf
zSUV{;BgR$a`1zSLtIOZ-+U*&e+Zy34mg8+QHON&;<ZQXF>*uQ)x^_R)YBVb+)M-R5
zR64Q9QE&-I(5j51QHz~S%zS4r(^V0@+-9bxE0HZ_Vko_N_U`Y=&nohMJqkX5IOg4%
zpMU=spOazeV@{W{j@y5sr1pM5a`l(`<sbU4Zhifj_xj$&rLuu?@1$2%hk1Q9Rq|B2
zV71`df$7cfxBZFuvtQt=`TeJ7+5I&&_wAkAZN=kb{Z2m1VtG!W^e?smg$WB)6+g%e
ze0V*75?_sx<hsj+l>$7ey^SW%@8t3{=5lk`7%y^otho54iu@4?HZkqw=bI)iTy>7s
zYl6`2CAz@}*n*gTFxKDn$iC-jp~82a|4a7T-3%v1xir6=iSB0czpg(czf9+_S<mSy
z@7Zb>3i%t<^zb$`<grR^JN}*LTlWe-#$V!>8r+(zFE@U#KEBt-oAK2_A<h5Os?XN^
za=-L;=N5%iYx`N1!kJHhylX$dFG5sznqc?7hDcH2o9y9V*z1DwHVPZP-TmwIhJ3wg
z3Ke}?!S~xAdmmn9#rxo(NrH>pGnxD=bM-VLZ}F=Yco%*=ba89MrMw>t_ga2VO3K?d
zyXO0z<m737fA`*<9VK^U%U`w6A{*~ayFKwn$ttH)kB)^DWyRjxsP!wjqA=xkx&59g
zoCT|D9$!12$G2Y7IL_4~lHvcEM-#WFi-{{0g(igO9dTUhFVbZ?d&(^PnI30y3S=Uq
z=d1{{`1?V-^~~Q`@ppHNmKN^Hzqc`U>$H;l52b%To_HXOGpdt^-+d~Be~fhPa`ufs
zKAkFh^Xa|$uJW6GTb+L|-G463Os?cl62G}Y)+1#>nWL*36jzH)h!6MB-uf-*^^K$F
z-PH8=Pvif>EWPF1=kxvYKVN0(S%&v4y;TwAs5njkYPg*+XF~M*2<rvEn%n~f=P!Ct
zZniLN<CHH=LHnvr%D1LITYfy;<&41!rgIbT9L$*ZM_{)^)0_z_d`>Lx;n}R}^>WsQ
z*$+-uZGF03`1Ri>wwVf1=QkW(u=uB#P~f5kGQSVTDJ@<q`uO((e<mwai>tGrXU~&)
zQI{cc{{QcvISF#U602t&-y6*Et1!&aC2GP=>8Xsl?|a|A`H_*dU~Bo7%F@St-uqUr
lx|x59Pegi?_2Mo68Ggz3@0scntO2TdJzf1=);T3K0RSjD{7e7<

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/html/com_media/imageslist/default_folder.php b/core/administrator/templates/isis/html/com_media/imageslist/default_folder.php
new file mode 100644
index 00000000..501d8c77
--- /dev/null
+++ b/core/administrator/templates/isis/html/com_media/imageslist/default_folder.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<a href="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->_tmp_folder->path_relative); ?>&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>" target="imageframe">
+		<div class="imgFolder">
+			<span class="icon-folder-2"></span>
+		</div>
+		<div class="small">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_folder->name), 10, false); ?>
+		</div>
+	</a>
+</li>
diff --git a/core/administrator/templates/isis/html/com_media/imageslist/default_image.php b/core/administrator/templates/isis/html/com_media/imageslist/default_image.php
new file mode 100644
index 00000000..5f1597b3
--- /dev/null
+++ b/core/administrator/templates/isis/html/com_media/imageslist/default_image.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+$dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_img, &$params));
+?>
+
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<a class="img-preview" href="javascript:ImageManager.populateFields('<?php echo $this->escape($this->_tmp_img->path_relative); ?>')" title="<?php echo $this->escape($this->_tmp_img->name); ?>" >
+		<div class="imgThumb">
+			<div class="imgThumbInside">
+			<?php echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
+			</div>
+		</div>
+		<div class="imgDetails small">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_img->name), 10, false); ?>
+		</div>
+	</a>
+</li>
+<?php
+$dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_img, &$params));
diff --git a/core/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php b/core/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php
new file mode 100644
index 00000000..192c4f14
--- /dev/null
+++ b/core/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php foreach ($this->folders as $i => $folder) : ?>
+	<li class="imgOutline thumbnail height-80 width-80 center">
+		<?php if ($this->canDelete):?>
+			<a class="close delete-item" target="_top" href="index.php?option=com_media&amp;task=folder.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($folder->name); ?>" rel="<?php echo $this->escape($folder->name); ?> :: <?php echo $this->escape($folder->files) + $this->escape($folder->folders); ?>" title="<?php echo JText::_('JACTION_DELETE');?>">&#215;</a>
+			<div class="pull-left">
+				<?php echo JHtml::_('grid.id', $i, $this->escape($folder->name), false, 'rm', 'cb-folder'); ?>
+			</div>
+			<div class="clearfix"></div>
+		<?php endif;?>
+
+		<div class="height-50">
+			<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($folder->path_relative); ?>" target="folderframe">
+				<span class="icon-folder-2"></span>
+			</a>
+		</div>
+
+		<div class="small">
+			<a href="index.php?option=com_media&amp;view=mediaList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($folder->path_relative); ?>" target="folderframe">
+				<?php echo JHtml::_('string.truncate', $this->escape($folder->name), 10, false); ?>
+			</a>
+		</div>
+	</li>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php b/core/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
new file mode 100644
index 00000000..4b082a87
--- /dev/null
+++ b/core/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+?>
+
+<?php foreach ($this->images as $i => $img) : ?>
+	<?php $dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$img, &$params)); ?>
+	<li class="imgOutline thumbnail center">
+
+		<?php if ($this->canDelete):?>
+		<div class="imgDelete">
+			<a class="close delete-item" target="_top"
+			href="index.php?option=com_media&amp;task=file.delete&amp;tmpl=index&amp;<?php echo JSession::getFormToken(); ?>=1&amp;folder=<?php echo rawurlencode($this->state->folder); ?>&amp;rm[]=<?php echo $this->escape($img->name); ?>"
+			rel="<?php echo $this->escape($img->name); ?>" title="<?php echo JText::_('JACTION_DELETE'); ?>"><span class="icon-delete"> </span></a>
+		</div>
+		<?php endif; ?>
+
+		<div class="imgThumb imgInput">
+			<?php if ($this->canDelete):?>
+			<?php echo JHtml::_('grid.id', $i, $this->escape($img->name), false, 'rm', 'cb-image'); ?>
+			<?php endif; ?>
+			<label for="cb-image<?php echo $i ?>">
+				<?php echo JHtml::_('image', COM_MEDIA_BASEURL . '/' . $this->escape($img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->escape($img->title), JHtml::_('number.bytes', $img->size)), array('width' => $img->width_60, 'height' => $img->height_60)); ?>
+			</label>
+		</div>
+
+		<div class="imgPreview nowrap small">
+			<a href="<?php echo COM_MEDIA_BASEURL . '/' . str_replace('%2F', '/', rawurlencode($img->path_relative)); ?>" title="<?php echo $this->escape($img->name); ?>" class="preview truncate">
+				<span class="icon-search" aria-hidden="true"></span><?php echo $this->escape($img->name); ?>
+			</a>
+		</div>
+	</li>
+	<?php $dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$img, &$params)); ?>
+<?php endforeach; ?>
diff --git a/core/administrator/templates/isis/html/editor_content.css b/core/administrator/templates/isis/html/editor_content.css
new file mode 100644
index 00000000..fb191b6b
--- /dev/null
+++ b/core/administrator/templates/isis/html/editor_content.css
@@ -0,0 +1,50 @@
+body {
+        background: #000;
+        font-family: Arial,sans-serif;
+        line-height: 1.3em;
+        font-size: 96%;
+        color: #333;
+}
+
+h1 {
+        font-family:Helvetica ,Arial,sans-serif;
+        font-size: 16px;
+        font-weight: bold;
+        color: #ff0000;
+}
+
+h2 {
+        font-family: Arial, Helvetica,sans-serif;
+        font-size: 14px;
+        font-weight: normal;
+        color: #333;
+}
+
+h3 {
+  font-weight: bold;
+  font-family: Helvetica,Arial,sans-serif;
+  font-size: 19px;
+  color: #135cae;
+}
+
+h4 {
+        font-weight: bold;
+        font-family: Arial, Helvetica, sans-serif;
+        color: #333;
+}
+
+a:link, a:visited {
+        color: #1B57B1; text-decoration: none;
+        font-weight: normal;
+}
+
+a:hover {
+        color: #00c;        text-decoration: underline;
+        font-weight: normal;
+}
+
+div.caption       { padding: 0 10px 0 10px; }
+div.caption img   { border: 1px solid #CCC; }
+div.caption p     { font-size: .90em; color: #666; text-align: center; }
+
+div.teaser { background:#ccc; }
diff --git a/core/administrator/templates/isis/html/layouts/joomla/form/field/media.php b/core/administrator/templates/isis/html/layouts/joomla/form/field/media.php
new file mode 100644
index 00000000..50e38e19
--- /dev/null
+++ b/core/administrator/templates/isis/html/layouts/joomla/form/field/media.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Admin
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $asset The asset text
+ * @var  string   $authorField The label text
+ * @var  integer  $authorId The author id
+ * @var  string   $class The class text
+ * @var  boolean  $disabled True if field is disabled
+ * @var  string   $folder The folder text
+ * @var  string   $id The label text
+ * @var  string   $link The link text
+ * @var  string   $name The name text
+ * @var  string   $preview The preview image relative path
+ * @var  integer  $previewHeight The image preview height
+ * @var  integer  $previewWidth The image preview width
+ * @var  string   $onchange  The onchange text
+ * @var  boolean  $readonly True if field is readonly
+ * @var  integer  $size The size text
+ * @var  string   $value The value text
+ * @var  string   $src The path and filename of the image
+ */
+extract($displayData);
+
+// The button.
+if ($disabled != true)
+{
+	JHtml::_('bootstrap.tooltip');
+}
+
+$attr = '';
+
+// Initialize some field attributes.
+$attr .= !empty($class) ? ' class="input-small hasTooltip field-media-input ' . $class . '"' : ' class="input-small hasTooltip field-media-input"';
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+
+// Initialize JavaScript field attributes.
+$attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+
+switch ($preview)
+{
+	case 'no': // Deprecated parameter value
+	case 'false':
+	case 'none':
+		$showPreview = false;
+		$showAsTooltip = false;
+		break;
+	case 'yes': // Deprecated parameter value
+	case 'true':
+	case 'show':
+		$showPreview = true;
+		$showAsTooltip = false;
+		break;
+	case 'tooltip':
+	default:
+		$showPreview = true;
+		$showAsTooltip = true;
+		break;
+}
+
+// Pre fill the contents of the popover
+if ($showPreview)
+{
+	if ($value && file_exists(JPATH_ROOT . '/' . $value))
+	{
+		$src = JUri::root() . $value;
+	}
+	else
+	{
+		$src = JText::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY');
+	}
+}
+
+// The URL for the modal
+$url    = ($readonly ? ''
+	: ($link ?: 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;asset='
+		. $asset . '&amp;author=' . $authorId)
+	. '&amp;fieldid={field-media-id}&amp;ismoo=0&amp;folder=' . $folder);
+?>
+<div class="field-media-wrapper"
+	data-basepath="<?php echo JUri::root(); ?>"
+	data-url="<?php echo $url; ?>"
+	data-modal=".modal"
+	data-modal-width="100%"
+	data-modal-height="400px"
+	data-input=".field-media-input"
+	data-button-select=".button-select"
+	data-button-clear=".button-clear"
+	data-button-save-selected=".button-save-selected"
+	data-preview="<?php echo $showPreview ? 'true' : 'false'; ?>"
+	data-preview-as-tooltip="<?php echo $showAsTooltip ? 'true' : 'false'; ?>"
+	data-preview-container=".field-media-preview"
+	data-preview-width="<?php echo $previewWidth; ?>"
+	data-preview-height="<?php echo $previewHeight; ?>"
+>
+	<?php
+	// Render the modal
+	echo JHtml::_(
+		'bootstrap.renderModal',
+		'imageModal_' . $id,
+		array(
+			'title'       => JText::_('JLIB_FORM_CHANGE_IMAGE'),
+			'closeButton' => true,
+			'footer'      => '<a class="btn" data-dismiss="modal">' . JText::_('JCANCEL') . '</a>',
+		)
+	);
+
+	JHtml::_('script', 'media/mediafield.min.js', array('version' => 'auto', 'relative' => true));
+	?>
+	<?php if ($showPreview && $showAsTooltip) : ?>
+	<div class="input-prepend input-append">
+		<span rel="popover" class="add-on pop-helper field-media-preview"
+			title="<?php echo	JText::_('JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE'); ?>" data-content="<?php echo JText::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY'); ?>"
+			data-original-title="<?php echo JText::_('JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE'); ?>" data-trigger="hover">
+			<span class="icon-eye" aria-hidden="true"></span>
+		</span>
+	<?php else: ?>
+	<div class="input-append">
+		<?php endif; ?>
+		<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" readonly="readonly"<?php echo $attr; ?>/>
+		<?php if ($disabled != true) : ?>
+			<a class="btn add-on button-select"><?php echo JText::_('JLIB_FORM_BUTTON_SELECT'); ?></a>
+			<a class="btn icon-remove hasTooltip add-on button-clear" title="<?php echo JText::_('JLIB_FORM_BUTTON_CLEAR'); ?>"></a>
+		<?php endif; ?>
+	</div>
+	<?php if ($showPreview && !$showAsTooltip) : ?>
+		<div class="field-media-preview" style="width: <?php echo $previewWidth; ?>px; max-height: <?php echo $previewHeight; ?>px;margin-top:10px;"></div>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/templates/isis/html/layouts/joomla/form/field/user.php b/core/administrator/templates/isis/html/layouts/joomla/form/field/user.php
new file mode 100644
index 00000000..7a33b470
--- /dev/null
+++ b/core/administrator/templates/isis/html/layouts/joomla/form/field/user.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ *
+ * @var   string   $userName        The user name
+ * @var   mixed    $groups          The filtering groups (null means no filtering)
+ * @var   mixed    $excluded        The users to exclude from the list of users
+ */
+
+if (!$readonly)
+{
+	JHtml::_('script', 'jui/fielduser.min.js', array('version' => 'auto', 'relative' => true));
+}
+
+$uri = new JUri('index.php?option=com_users&view=users&layout=modal&tmpl=component&required=0&field={field-user-id}&ismoo=0');
+
+if ($required)
+{
+	$uri->setVar('required', 1);
+}
+
+if (!empty($groups))
+{
+	$uri->setVar('groups', base64_encode(json_encode($groups)));
+}
+
+if (!empty($excluded))
+{
+	$uri->setVar('excluded', base64_encode(json_encode($excluded)));
+}
+
+// Invalidate the input value if no user selected
+if ($this->escape($userName) === JText::_('JLIB_FORM_SELECT_USER'))
+{
+	$userName = '';
+}
+
+$inputAttributes = array(
+	'type' => 'text', 'id' => $id, 'class' => 'field-user-input-name', 'value' => $this->escape($userName)
+);
+
+if ($class)
+{
+	$inputAttributes['class'] .= ' ' . $class;
+}
+
+if ($size)
+{
+	$inputAttributes['size'] = (int) $size;
+}
+
+if ($required)
+{
+	$inputAttributes['required'] = 'required';
+}
+
+if (!$readonly)
+{
+	$inputAttributes['placeholder'] = JText::_('JLIB_FORM_SELECT_USER');
+}
+
+?>
+<div class="field-user-wrapper"
+	 data-url="<?php echo (string) $uri; ?>"
+	 data-modal=".modal"
+	 data-modal-width="100%"
+	 data-modal-height="400px"
+	 data-input=".field-user-input"
+	 data-input-name=".field-user-input-name"
+	 data-button-select=".button-select">
+	<div class="input-append">
+		<input <?php echo ArrayHelper::toString($inputAttributes); ?> readonly />
+		<?php if (!$readonly) : ?>
+			<a class="btn btn-primary button-select" title="<?php echo JText::_('JLIB_FORM_CHANGE_USER') ?>"><span class="icon-user"></span></a>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'userModal_' . $id,
+				array(
+					'title'       => JText::_('JLIB_FORM_CHANGE_USER'),
+					'closeButton' => true,
+					'footer'      => '<a class="btn" data-dismiss="modal">' . JText::_('JCANCEL') . '</a>',
+				)
+			); ?>
+		<?php endif; ?>
+	</div>
+	<?php if (!$readonly) : ?>
+		<input type="hidden" id="<?php echo $id; ?>_id" name="<?php echo $name; ?>" value="<?php echo (int) $value; ?>" class="field-user-input<?php echo $class ? ' ' . $class : ''; ?>" data-onchange="<?php echo $this->escape($onchange); ?>" />
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/templates/isis/html/layouts/joomla/pagination/link.php b/core/administrator/templates/isis/html/layouts/joomla/pagination/link.php
new file mode 100644
index 00000000..5c7b861a
--- /dev/null
+++ b/core/administrator/templates/isis/html/layouts/joomla/pagination/link.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/** @var JPaginationObject $item */
+$item = $displayData['data'];
+
+if (!empty($displayData['pagOptions']))
+{
+	$options = new Joomla\Registry\Registry($displayData['pagOptions']);
+	$liClass = $options->get('liClass', '');
+	$addText = $options->get('addText', '');
+}
+else
+{
+	$liClass = $addText = '';
+}
+
+$display = $item->text;
+
+switch ((string) $item->text)
+{
+	// Check for "Start" item
+	case JText::_('JLIB_HTML_START') :
+		$icon = 'icon-backward icon-first';
+		$aria = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+		break;
+
+	// Check for "Prev" item
+	case JText::_('JPREV') :
+		$item->text = JText::_('JPREVIOUS');
+		$icon = 'icon-step-backward icon-previous';
+		$aria = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+		break;
+
+	// Check for "Next" item
+	case JText::_('JNEXT') :
+		$icon = 'icon-step-forward icon-next';
+		$aria = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+		break;
+
+	// Check for "End" item
+	case JText::_('JLIB_HTML_END') :
+		$icon = 'icon-forward icon-last';
+		$aria = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+		break;
+
+	default:
+		$icon = null;
+		$aria = JText::sprintf('JLIB_HTML_GOTO_PAGE', $item->text);
+		break;
+}
+
+$item->text .= $addText ?: '';
+
+if ($icon !== null)
+{
+	$display = '<span class="' . $icon . '" aria-hidden="true"></span>';
+}
+
+if ($displayData['active'])
+{
+	if ($item->base > 0)
+	{
+		$limit = 'limitstart.value=' . $item->base;
+	}
+	else
+	{
+		$limit = 'limitstart.value=0';
+	}
+
+	$cssClasses = array();
+
+	$title = '';
+
+	if (!is_numeric($item->text))
+	{
+		JHtml::_('bootstrap.tooltip');
+		$cssClasses[] = 'hasTooltip';
+		$title = ' title="' . $item->text . '" ';
+	}
+
+	$onClick = 'document.adminForm.' . $item->prefix . 'limitstart.value=' . ($item->base > 0 ? $item->base : '0') . '; Joomla.submitform();return false;';
+}
+else
+{
+	$class = (property_exists($item, 'active') && $item->active) ? 'active' : 'disabled';
+	if ($class != 'active')
+	{
+		$class .= $liClass ? ($class ? ' ' : '') . $liClass : '';
+	}
+}
+?>
+<?php if ($displayData['active']) : ?>
+	<li<?php echo $liClass ? ' class="' . $liClass . '"' : ''; ?>>
+		<a aria-label="<?php echo $aria; ?>" <?php echo $cssClasses ? 'class="' . implode(' ', $cssClasses) . '"' : ''; ?> <?php echo $title; ?> href="#" onclick="<?php echo $onClick; ?>">
+			<?php echo $display; ?>
+		</a>
+	</li>
+<?php else : ?>
+	<li class="<?php echo $class; ?>">
+	<span <?php echo $class == 'active' ? 'aria-current="true" aria-label="' . JText::sprintf('JLIB_HTML_PAGE_CURRENT', $item->text) . '"' : ''; ?>>
+		<?php echo $display; ?>
+	</span>
+	</li>
+<?php endif;
diff --git a/core/administrator/templates/isis/html/layouts/joomla/pagination/links.php b/core/administrator/templates/isis/html/layouts/joomla/pagination/links.php
new file mode 100644
index 00000000..10250914
--- /dev/null
+++ b/core/administrator/templates/isis/html/layouts/joomla/pagination/links.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Registry\Registry;
+
+$list = $displayData['list'];
+$pages = $list['pages'];
+$pagesTotal = $list['pagesTotal'];
+
+$options = new Registry($displayData['options']);
+
+$showLimitBox   = $options->get('showLimitBox', 0);
+$showPagesLinks = $options->get('showPagesLinks', true);
+$showLimitStart = $options->get('showLimitStart', true);
+?>
+
+<div class="pagination pagination-toolbar clearfix">
+
+	<?php if ($showLimitBox) : ?>
+		<div class="limit pull-right">
+			<?php echo $list['limitfield']; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($showPagesLinks && (!empty($pages))) : ?>
+		<nav role="navigation" aria-label="<?php echo JText::_('JLIB_HTML_PAGINATION'); ?>">
+			<ul class="pagination-list">
+				<?php
+					$pages['start']['pagOptions'] = array('addText' => ' (' . JText::sprintf('JLIB_HTML_PAGE_CURRENT_OF_TOTAL', 1, $pagesTotal) . ')');
+					echo JLayoutHelper::render('joomla.pagination.link', $pages['start']);
+					echo JLayoutHelper::render('joomla.pagination.link', $pages['previous']); ?>
+				<?php foreach ($pages['pages'] as $page) :
+					$page['pagOptions'] = array('liClass' => 'hidden-phone');
+				?>
+					<?php echo JLayoutHelper::render('joomla.pagination.link', $page); ?>
+				<?php endforeach; ?>
+				<?php
+					echo JLayoutHelper::render('joomla.pagination.link', $pages['next']);
+					$pages['end']['pagOptions'] = array('addText' => ' (' . JText::sprintf('JLIB_HTML_PAGE_CURRENT_OF_TOTAL', $pagesTotal, $pagesTotal) . ')');
+					echo JLayoutHelper::render('joomla.pagination.link', $pages['end']); ?>
+			</ul>
+		</nav>
+	<?php endif; ?>
+
+	<?php if ($showLimitStart) : ?>
+		<input type="hidden" name="<?php echo $list['prefix']; ?>limitstart" value="<?php echo $list['limitstart']; ?>" />
+	<?php endif; ?>
+
+</div>
diff --git a/core/administrator/templates/isis/html/layouts/joomla/system/message.php b/core/administrator/templates/isis/html/layouts/joomla/system/message.php
new file mode 100644
index 00000000..aa5c91fb
--- /dev/null
+++ b/core/administrator/templates/isis/html/layouts/joomla/system/message.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.Isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$msgList = $displayData['msgList'];
+
+$alert = array('error' => 'alert-error', 'warning' => '', 'notice' => 'alert-info', 'message' => 'alert-success');
+?>
+<div id="system-message-container">
+	<?php if (is_array($msgList) && $msgList) : ?>
+		<?php foreach ($msgList as $type => $msgs) : ?>
+			<div class="alert <?php echo isset($alert[$type]) ? $alert[$type] : 'alert-' . $type; ?>">
+				<button type="button" class="close" data-dismiss="alert">&times;</button>
+				<?php if (!empty($msgs)) : ?>
+					<h4 class="alert-heading"><?php echo JText::_($type); ?></h4>
+					<?php foreach ($msgs as $msg) : ?>
+						<div class="alert-message"><?php echo $msg; ?></div>
+					<?php endforeach; ?>
+				<?php endif; ?>
+			</div>
+		<?php endforeach; ?>
+	<?php endif; ?>
+</div>
diff --git a/core/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php b/core/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php
new file mode 100644
index 00000000..a00f330f
--- /dev/null
+++ b/core/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $itemId The item id number
+ * @var  string   $typeId The type id number
+ * @var  string   $title The link text
+ * @var  string   $typeAlias The component type
+ */
+extract($displayData);
+
+$link = 'index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id='
+	. (int) $itemId . '&amp;type_id=' . $typeId . '&amp;type_alias='
+	. $typeAlias . '&amp;' . JSession::getFormToken() . '=1';
+
+echo JHtml::_(
+	'bootstrap.renderModal',
+	'versionsModal',
+	array(
+		'url'    => $link,
+		'title'  => JText::_('COM_CONTENTHISTORY_MODAL_TITLE'),
+		'height' => '300px',
+		'width'  => '800px',
+		'footer' => '<a class="btn" type="button" data-dismiss="modal" aria-hidden="true">'
+			. JText::_('JTOOLBAR_CLOSE') . '</a>'
+	)
+);
+?>
+<button onclick="jQuery('#versionsModal').modal('show')" class="btn btn-small" data-toggle="modal">
+	<span class="icon-archive" aria-hidden="true"></span><?php echo $title; ?>
+</button>
+
diff --git a/core/administrator/templates/isis/html/mod_version/default.php b/core/administrator/templates/isis/html/mod_version/default.php
new file mode 100644
index 00000000..b9faf4f1
--- /dev/null
+++ b/core/administrator/templates/isis/html/mod_version/default.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_version
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (!empty($version)) : ?>
+	<?php echo $version; ?>
+	<?php echo '&nbsp;&mdash;&nbsp;'; ?>
+<?php endif; ?>
diff --git a/core/administrator/templates/isis/html/modules.php b/core/administrator/templates/isis/html/modules.php
new file mode 100644
index 00000000..efe75c23
--- /dev/null
+++ b/core/administrator/templates/isis/html/modules.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This is a file to add template specific chrome to module rendering.  To use it you would
+ * set the style attribute for the given module(s) include in your template to use the style
+ * for each given modChrome function.
+ *
+ * eg.  To render a module mod_test in the submenu style, you would use the following include:
+ * <jdoc:include type="module" name="test" style="submenu" />
+ *
+ * This gives template designers ultimate control over how modules are rendered.
+ *
+ * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same
+ * two arguments.
+ */
+
+/*
+ * Module chrome for rendering the module in a submenu
+ */
+function modChrome_title($module, &$params, &$attribs)
+{
+	if ($module->content)
+	{
+		echo '<div class="module-title"><h6>' . $module->title . '</h6></div>';
+		echo $module->content;
+	}
+}
+
+function modChrome_no($module, &$params, &$attribs)
+{
+	if ($module->content)
+	{
+		echo $module->content;
+	}
+}
+
+function modChrome_well($module, &$params, &$attribs)
+{
+	if ($module->content)
+	{
+		$moduleTag     = $params->get('module_tag', 'div');
+		$bootstrapSize = (int) $params->get('bootstrap_size');
+		$moduleClass   = $bootstrapSize ? ' span' . $bootstrapSize : '';
+		$headerTag     = htmlspecialchars($params->get('header_tag', 'h2'), ENT_COMPAT, 'UTF-8');
+
+		// Temporarily store header class in variable
+		$headerClass   = $params->get('header_class');
+		$headerClass   = $headerClass ? ' ' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') : '';
+
+		echo '<' . $moduleTag . ' class="well well-small' . $moduleClass . '">';
+
+			if ($module->showtitle)
+			{
+				echo '<' . $headerTag . ' class="module-title nav-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
+			}
+
+			echo $module->content;
+		echo '</' . $moduleTag . '>';
+	}
+}
diff --git a/core/administrator/templates/isis/html/pagination.php b/core/administrator/templates/isis/html/pagination.php
new file mode 100644
index 00000000..dbf4a203
--- /dev/null
+++ b/core/administrator/templates/isis/html/pagination.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.Isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This is a file to add template specific chrome to pagination rendering.
+ *
+ * pagination_list_footer
+ * 	Input variable $list is an array with offsets:
+ * 		$list[limit]		: int
+ * 		$list[limitstart]	: int
+ * 		$list[total]		: int
+ * 		$list[limitfield]	: string
+ * 		$list[pagescounter]	: string
+ * 		$list[pageslinks]	: string
+ *
+ * pagination_list_render
+ * 	Input variable $list is an array with offsets:
+ * 		$list[all]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[start]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[previous]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[next]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[end]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[pages]
+ * 			[{PAGE}][data]		: string
+ * 			[{PAGE}][active]	: boolean
+ *
+ * pagination_item_active
+ * 	Input variable $item is an object with fields:
+ * 		$item->base	: integer
+ * 		$item->link	: string
+ * 		$item->text	: string
+ *
+ * pagination_item_inactive
+ * 	Input variable $item is an object with fields:
+ * 		$item->base	: integer
+ * 		$item->link	: string
+ * 		$item->text	: string
+ *
+ * This gives template designers ultimate control over how pagination is rendered.
+ *
+ * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both
+ */
+
+
+/**
+ * Renders the pagination list
+ *
+ * @param   array  $list  Array containing pagination information
+ *
+ * @return  string  HTML markup for the full pagination object
+ *
+ * @since   3.0
+ */
+function pagination_list_render($list)
+{
+	// Calculate to display range of pages
+	$currentPage = 1;
+	$range = 1;
+	$step = 5;
+	foreach ($list['pages'] as $k => $page)
+	{
+		if (!$page['active'])
+		{
+			$currentPage = $k;
+		}
+	}
+	if ($currentPage >= $step)
+	{
+		if ($currentPage % $step == 0)
+		{
+			$range = ceil($currentPage / $step) + 1;
+		}
+		else
+		{
+			$range = ceil($currentPage / $step);
+		}
+	}
+
+	$html = '<ul class="pagination-list">';
+	$html .= $list['start']['data'];
+	$html .= $list['previous']['data'];
+
+	foreach ($list['pages'] as $k => $page)
+	{
+		$html .= $page['data'];
+	}
+
+	$html .= $list['next']['data'];
+	$html .= $list['end']['data'];
+
+	$html .= '</ul>';
+	return $html;
+}
+
+/**
+ * Renders an active item in the pagination block
+ *
+ * @param   JPaginationObject  $item  The current pagination object
+ *
+ * @return  string  HTML markup for active item
+ *
+ * @since   3.0
+ */
+function pagination_item_active(&$item)
+{
+	$class = '';
+
+	// Check for "Start" item
+	if ($item->text == JText::_('JLIB_HTML_START'))
+	{
+		$display = '<span class="icon-first"></span>';
+	}
+
+	// Check for "Prev" item
+	if ($item->text == JText::_('JPREV'))
+	{
+		$item->text = JText::_('JPREVIOUS');
+		$display = '<span class="icon-previous"></span>';
+	}
+
+	// Check for "Next" item
+	if ($item->text == JText::_('JNEXT'))
+	{
+		$display = '<span class="icon-next"></span>';
+	}
+
+	// Check for "End" item
+	if ($item->text == JText::_('JLIB_HTML_END'))
+	{
+		$display = '<span class="icon-last"></span>';
+	}
+
+	// If the display object isn't set already, just render the item with its text
+	if (!isset($display))
+	{
+		$display = $item->text;
+		$class   = ' class="hidden-phone"';
+	}
+
+	if ($item->base > 0)
+	{
+		$limit = 'limitstart.value=' . $item->base;
+	}
+	else
+	{
+		$limit = 'limitstart.value=0';
+	}
+
+	$title = '';
+	if (!is_numeric($item->text))
+	{
+		JHtml::_('bootstrap.tooltip');
+		$title = ' class="hasTooltip" title="' . $item->text . '"';
+	}
+
+	return '<li' . $class . '><a' . $title . ' href="#" onclick="document.adminForm.' . $item->prefix . $limit . '; Joomla.submitform();return false;">' . $display . '</a></li>';
+}
+
+/**
+ * Renders an inactive item in the pagination block
+ *
+ * @param   JPaginationObject  $item  The current pagination object
+ *
+ * @return  string  HTML markup for inactive item
+ *
+ * @since   3.0
+ */
+function pagination_item_inactive(&$item)
+{
+	// Check for "Start" item
+	if ($item->text == JText::_('JLIB_HTML_START'))
+	{
+		return '<li class="disabled"><a><span class="icon-first"></span></a></li>';
+	}
+
+	// Check for "Prev" item
+	if ($item->text == JText::_('JPREV'))
+	{
+		return '<li class="disabled"><a><span class="icon-previous"></span></a></li>';
+	}
+
+	// Check for "Next" item
+	if ($item->text == JText::_('JNEXT'))
+	{
+		return '<li class="disabled"><a><span class="icon-next"></span></a></li>';
+	}
+
+	// Check for "End" item
+	if ($item->text == JText::_('JLIB_HTML_END'))
+	{
+		return '<li class="disabled"><a><span class="icon-last"></span></a></li>';
+	}
+
+	// Check if the item is the active page
+	if (isset($item->active) && $item->active)
+	{
+		return '<li class="active hidden-phone"><a>' . $item->text . '</a></li>';
+	}
+
+	// Doesn't match any other condition, render a normal item
+	return '<li class="disabled hidden-phone"><a>' . $item->text . '</a></li>';
+}
diff --git a/core/administrator/templates/isis/images/admin/blank.png b/core/administrator/templates/isis/images/admin/blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..1797bf909a764805b5afdf1fa1dd2167af8af731
GIT binary patch
literal 81
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgbk|4iepwN`R>wr8iPZ!6K3dZCN
YAiIg7(MSCHeISd$)78&qol`;+05^UR%K!iX

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/checked_out.png b/core/administrator/templates/isis/images/admin/checked_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ad8f25ac9b91450d04d11ddc06e2ac946567beb
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003^Nkl<ZcmZRe
z2}sQ?445!=#{HeU_xxYBa`pf6x~BbZ0igy&YA#BcF?YfLvf4(Fri7T3%z|Yr*Sue{
zV%2*fUxA<j3zx2ZpO~4qA6e|;rOOH{)~tWOeD&J-cr}A;SiEA*e;^%zE>}_CGXMC=
z)B6b-;4pdSy#F8?U9P;Yxq+Yoc22JS{gbEtpE7O6{CV@{H_V(l3ykN_U(hgP_T2po
z7caf<;OH8FRkN19k;C?6mj6eynEs#2WBq@zg!BK6D&GGO8U+78Zxj9hu1Dhk=LypP
zCG~Cg<8=Ox6jp);=sE}DHegRW2SEcW8d`B1P+Z;c9~e;o@87@w|I)=v|4*Mf{r}AA
zGygANy8Qpag9rZ)9yvCw4Ny=~Gl)q_`@dt?p8pqtnvWhi`hVZP{r~p^@v)=F{$Bzb
kvT4iq|50(t`>C390S?GQXGt5v;s5{u07*qoM6N<$f>&I`RsaA1

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/collapseall.png b/core/administrator/templates/isis/images/admin/collapseall.png
new file mode 100644
index 0000000000000000000000000000000000000000..a986d3b4fbfc50a12f57852afe7edeb6b0a4327b
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uGBwbBK{D727fKQ0)o0m6OTx)u!tXa1H$kh-3
z-+cf7?#KU+KmLFF_5bIu|G)nH|MTa+!sbtNf$AAcg8YIR9G=}s19EIUT^vIyZiSxl
z6gr^5!|ZreEamtAdd~?O;<d9+D{wbFS=9AOTs+h`)ck7ZD(9H%Wjo)l=CKoFXj*?(
ai}~SPrVED}60ZTxVeoYIb6Mw<&;$VWfJ<fo

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/disabled.png b/core/administrator/templates/isis/images/admin/disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c1f7c3b218f5ee2df0a9d4ee6469d4c229cbe6c
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6>O5T>Ln;`TPGn^~YQW>Nzu8mL
z#&Kc<=fnWcsRHcDJI<Tj<7=A!@bJ%WhQpdHeYPAcPViioJo4#W$o8h0Wv_HEDNRgh
zt(kl+x`%P{0m&7v!riK#0!Mgb^&=)O5ZJ!O$1BmiWN-LVCH9NEpRPMAyD09(pUVqO
iUM-klu<-eIOD5+pKP+c)Y;gp-gu&C*&t;ucLK6V6@<pTo

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/downarrow-1.png b/core/administrator/templates/isis/images/admin/downarrow-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c94074e5963e8a96adc0eab4234a91802b60d27a
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3_UF&^$uA7ATVD>Eakt
z!I=ERUr8bI@QSw0ckdpzwra>I_dY#s*|M#?yxm#ZjW15$-fm$k^XZ$LvjgvsIVGEx
zuta|SG)IQ1j^S3Fjwa`#s@xcv3Enp@&yU|{BPY1g+(u^ItOAX_JImkyoviMx`iLQ$
W_flnZ)+~OYjSQZyelF{r5}E*`b3jo5

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/downarrow.png b/core/administrator/templates/isis/images/admin/downarrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..69950e19d656c81fd02732f5c1ea96ba9c778e0f
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000aC000;W1^@s6&N3Wo0004yNkl<Zcmb`_
z1B{$;6a?^dP%G9(7nU*FI2Wg}YTJrx+lo;$sBPccXRp0`oX%T*%km|^)%@SLnzDbJ
zi<m$=>3Px~d9C2t^7H+5<RIj5)6DF{XCo>KPP!Vw^xNSqqc2Cmte2*x7b;G9uMv#h
zK}4g`EGwV;AsO9IFH|1wbP#4-b;u#e3=R&W!xO~V(_LUDf|-T=_FjTG^sWcJy}gLV
zVwioeLtaZ6$Smy8)Dy(m{W=&se0XGX%5x<{W?|d=1%wpUfv-XyD{ad9r7G4vc}OVY
z71d-fthir8hsZ}r3epK0URG+#7vHEAW&eG?efu_ncGB~tJyf_$-@kvaBL^Xeo3gv~
z<Hrvb1q}uR%w}^IwOS2ky_D%veSQ5kg4gTK>rzuw6PSrimv|Ki!D6vwbtw=CK&#b)
znFuNudI_Svy*=Hf#>Pf@EoDIY9qI`}LiuP8heMt#8I-@!0z#5}3?Yw|vb*&4>(_^b
zB3@B;mp*^~TtkP*M@S0N2`b&Cj~_qQibB~>c{CZx_<4SZ00000NkvXXu0mjfs{zmV

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/downarrow0.png b/core/administrator/templates/isis/images/admin/downarrow0.png
new file mode 100644
index 0000000000000000000000000000000000000000..69950e19d656c81fd02732f5c1ea96ba9c778e0f
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000aC000;W1^@s6&N3Wo0004yNkl<Zcmb`_
z1B{$;6a?^dP%G9(7nU*FI2Wg}YTJrx+lo;$sBPccXRp0`oX%T*%km|^)%@SLnzDbJ
zi<m$=>3Px~d9C2t^7H+5<RIj5)6DF{XCo>KPP!Vw^xNSqqc2Cmte2*x7b;G9uMv#h
zK}4g`EGwV;AsO9IFH|1wbP#4-b;u#e3=R&W!xO~V(_LUDf|-T=_FjTG^sWcJy}gLV
zVwioeLtaZ6$Smy8)Dy(m{W=&se0XGX%5x<{W?|d=1%wpUfv-XyD{ad9r7G4vc}OVY
z71d-fthir8hsZ}r3epK0URG+#7vHEAW&eG?efu_ncGB~tJyf_$-@kvaBL^Xeo3gv~
z<Hrvb1q}uR%w}^IwOS2ky_D%veSQ5kg4gTK>rzuw6PSrimv|Ki!D6vwbtw=CK&#b)
znFuNudI_Svy*=Hf#>Pf@EoDIY9qI`}LiuP8heMt#8I-@!0z#5}3?Yw|vb*&4>(_^b
zB3@B;mp*^~TtkP*M@S0N2`b&Cj~_qQibB~>c{CZx_<4SZ00000NkvXXu0mjfs{zmV

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/expandall.png b/core/administrator/templates/isis/images/admin/expandall.png
new file mode 100644
index 0000000000000000000000000000000000000000..64b8c4b56915c6eed7546df5495c2fa93ba08e9c
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uGBwbBK{D72tfKQ0)o0m5j-Kx5$tzNqE@YT=%
z-~9Uj?)U$XzyE*!^Z(o5|3Cl!|Mma>pa1_mZ^hOCwJ??h`2{mLJiCzw<al|yIEGZ*
zay{e7cR+!M+0k0%g46&1_k?t&*hb9izNp1;Hh)s6=6+AXgEu_)mOt}I=6U83(*I@G
s=D25b&fLs;maY3tg5h)i^x}}e*X5X2&lc&30h-F->FVdQ&MBb@0DO&B*8l(j

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/featured.png b/core/administrator/templates/isis/images/admin/featured.png
new file mode 100644
index 0000000000000000000000000000000000000000..e03064c7cf33e3d7d8af5354def7161d6e78f763
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6ialK%Ln;`PfA}*@T6dtrHjee!
zuVepv|9;eb!LBu<-~V9kf~N1s{$z0VJZ^0Ie^D_&M=q~v<DQR|A(;yC@+!?~_A=iN
zyIibcXyurnFpHr`ZIl0n+5r9~pB?#HI+Y?BLKg6+&o}>eJmf%sij=*N;nR(r4Dow@
Vt=xMl%nxWigQu&X%Q~loCIHSULh}Fs

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/filesave.png b/core/administrator/templates/isis/images/admin/filesave.png
new file mode 100644
index 0000000000000000000000000000000000000000..65a45b551ed0440cb99e40174b046a8c1872e5d0
GIT binary patch
literal 1043
zcmV+u1nm2XP)<h;3K|Lk000e1NJLTq000mG001Be1^@s68;SVL000BpNkl<ZNXNC6
zOHUhD6vxlp8RKWj<xwNCz*Yn-Pzz(hBD=C+-AJ@_oh({)nb7tlq*YR>75xNJx=2@P
z1Y4vk4eNB|1&O6R#u#uzG0gZePkSck+}NfQXh~Idq~j~!Iro3hJ?Ea^0Q|>CI%~4g
zXsWL3<`qRz(PQrE(-Pdj|6nl;1KoAKYd@}iul0Nt`nj?C^`b1xDq~Xat1nltwk(Tx
zIvubb2kzbb8LnLU2%60%xvG*R{fgsIPk_-6F8-z6_J433_xhiQHEtLN7=|fqZ*LEF
zclSV1WI!MAeUE?k`4@{30o%4T2Y2&47s}-_?$&}<>y0feEZ`y^IOjl7buAw`0y=16
z7z))=sRW5+5^9HsP^;D8=;%nym318>XhS?6C%32oDwa_I$cn`x{Qmec<a0U5<#RCm
z!TT^cI0&k$isRh;=383wVN{^q)<PUdM@C?E^#)`vWS}S5Gtc*6^u1BAEem3?m>S7J
zCkQkOFPTb0Jdwa$_<w8D)6?Y7KmO!X-WT}k?j0lObo3|NPr&!QsNv3@=k*1$V_AwA
z!XQxl0`#;|Kw=F3c=Zay^-s+6MHPC+`H-jtMjRDD)rS}b?Ck7B7Mz$T#<8(6`0n;C
zFb#wEli00<P6>MP{5ecbP4$!a^2JNMNV`zkDZ~DL)!406wCesomOXgT?}e3>70EQ}
zmyT+O&n6~va1k#}-86pFb-nC5PDN(yQ96?;CNpW%!c7=sokpYKW61*{Fh4(!J}hlF
zTbG&4VsnK;iSuE67qB1*By22({UMq4Cb+g0T2{-kZJWdzG6|&9Y0Mvs0h8QRI^!l1
zi6m2$I38;ND-rYkwv1Vq6>J)&$PA-Wurk<Jk_-O}4={OZ_rB9OM|0cT+sK0udEj2d
zBS(3lX<C;DEH^VVa}}p}&*9+U0J7QayYQfmJaDf6bum5EKw>9F5#5M)fp2YXz0Cu=
z%LDJ!aSDZk7~h!($H&JoH1sAy5+xo`?e%}d19Hsg^N>R(jE|2C$H~b_F>Y>dp5_5A
z5Lq2T9?Z_p{$ts!vv?46d5}t_&aFG~0R8#;`uYhEmX?+bY9_4pxdPOUv{~>r4@dy-
z!MOsxYMkN$PCTR+=U!b&g5~99FirCe9@w@h+wk!4sl*Xzs@1AdAs$q#8Xn<<2OAq3
z5-MK8?*Q^(LWGI`1rHqJfh<45jxC~{&4abIHNgY?5?w~;7=8ng2b|vZd4LP0dc97!
z7I|Rxc_5B}yM<W75Enng@d64BVy&r1dI_V?hA1=61tdt-9~c;LUjv|{)fs)EBBB5Q
N002ovPDHLkV1hrD?gRh;

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/filter_16.png b/core/administrator/templates/isis/images/admin/filter_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbc62b7d30f7892793bc02ad9c9270dc76e40cec
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#fD7Ln;{W_L~MdGcvdo&#yOJ
zv6Dgdo#?#>yzdIj%getD_?x}sDydK3R--NQiKG5QgM#Ufhy5xOf1O+$v{FgL+cEcJ
zqw4ktt*ejz?B=N6uA{T&ULUW*t30NOE^IS%_DNpj$YrtFaK)nPL2}{Sb<D!PSuq_K
zC0%rWHW%33<@q5bS?C>_koi7Q#>Vc*8$NU9DQWt4ENnXR`}-T8b6m7;y0K>okj0%D
u^WtE=zz(ly?Fapb4$8i+XSAIhWvaMr@y$P*b*BS;!r<xZ=d#Wzp$Pz#WMTvW

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-add.png b/core/administrator/templates/isis/images/admin/icon-16-add.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e7aa02ab332c84ada899dd5227f7e3b66f445d3
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006xNkl<Zcmaiz
z1F-!@6o<dv?0v3n+qP|uI;d@XSX+Y{<J#@twpH8qWs*I=hs<O$YQJcaJw8qnRpRJ_
z&iJ`&wX4_UuWgY~o<kmy*(98MJ{&XkIVzL_;(PmV=(@XK^ZmU$TDyZfDT)SGJR?G~
z3_@7s5`R)SVdht*fc%~PHuSwc3td-jMf<0YVgv!G@)a_nRvWzkYv|vdYNyQkDgd}z
zcn$AYjKBX`9+2xJ+4&Y+&kDpP52C+50g0i5SfjZjF}?=u<kDC7I3rnc`Df#wf0r7O
zNVYx~zx8<l#P^@TmOYLt7FoTC@9RA?482abzy5(3K>|R9xs;fp%03dVR>PXD(}S|?
zK<jis(6%1>cQ_pce)U}_D8_7iK1jqb-bDX=3j#A8=(1P$(2yjM$o9C8{>={Ozfk>q
z(iaZ_L9>++h5}Ng3z76J&;KG&9!pmOrqX{u?=JFR3+aCC-SKPf0f7B5d*lIO-_NG_
zA1sf!_H$cLRGJ-F4G@B`>t!PkKtA_jvN;cx`vB3zzis;}sFObLlH@?8DTp#vm{B5u
z8CCvlMtZyaV&8M#r_U|+n}GL4s*3U@|L`U3w-3-i-x0r?NtH%wNRZ|>$w}h2CvMpH
z68HAlp1j$kJW@qeEr)u?h6F?s@4s7pAla^Lrq-hyY)A;NIoQ!+L?%qChK5#dWD$aA
zRwvh~8{YK&SA~EI^+z{2!@=ohIxu*LfL3PYkx89s&#!;O_s>yb5aV@qLh>C_`Tzg`
M07*qoM6N<$f^sJ<v;Y7A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-allow.png b/core/administrator/templates/isis/images/admin/icon-16-allow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d28a18b2f21e3b69dba716afbd6873f2881f09ca
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003XNkl<ZcmdVS
zC2#{l7>42BtMe*etylFXoR}k5R8eJSW@ct)W@eQ2YQ6fx%u($-^DN#T{lA(oO&SM*
zQmN}kQdd4JvG!fVhwd{NB~!<hq%ORdp!vdz&T9o5KTW*h%%~x6eYY8G@II%s=GZ7u
zNNpFAI`>wBhBFIlPYf>Ym$GwCbA8ZrlgZY<oA~5&9!4H)FI9&I-%py)Bz5++7<I=M
zR38}vjgYtbw{qTmCZqDefZm&I4By*cD)#k4)2XD+ycDD6$l|&SFhYS<9awnzo&jDx
z*V$P7sQ#UQuSC^>*>x6RghDIb(Xo;p9d|$+BNVNoZ5=Dz(s2hwF+%am-_)_Z4IOtt
rh!ILO$H%Up#D5(BCo2x6^yjk!W+vjH11!_z00000NkvXXu0mjfRc)Hv

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-allowinactive.png b/core/administrator/templates/isis/images/admin/icon-16-allowinactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..d20e059da06b9e3e23562893b951f7229fbd7446
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003VNkl<ZcmdVX
zgKoo76bA6djT_&1kMMtlKEkQp#xtY3-)!4nXWO><I;-tyJIU|bm-qjo<x(ne;b%0t
z`$osDd{$xYyVf{-pTp9c+<B$r7Tz6bxlo|%+JKFpW@F=-L=YIzf1AUG?hAyq$C9Yy
zwO{DCxi<$I&*Z2(5qor8>fL#kXF%^wE?fU@Hcma8F#1rIQ++57EYfnO<7Qv&s6UpY
z=13fh0z1sVRTx{&^r$)zqwgjkBll%FmHQ%o^Qn$=zSvQFB=_`%ps*uWAIOardt&(Y
zUgu-+qo!p3y$aO_GEZ9wih3aI5OeI1(FI9R+*h`36SHoS(FJi((yuaa5;JX((FGAG
p<^OgK4lI)P<cLL-E<)a)k6*8LzFCuA^`QU&002ovPDHLkV1hqTqNo4>

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-deny.png b/core/administrator/templates/isis/images/admin/icon-16-deny.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebeb69cdf1c9a3164ed57fc2449ff303a3b9c2f8
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003nNkl<Zcmc(e
z1Be7+6vr>SCcCq3+qP|_x$Gu)zRRBM+RU?Uo8Nk8v->a8_&oKS&(F^Tz_<7v0lMt?
zEPZ1+t8cGea?;hn>Z%H|R0+`57SHI1x}a;U11T>7DJgc&^&`E|wN`1~l0qp-0mS}T
z*Vm5sf*esuLp4ZCl}1#+eL{#AX|2U;PO2=VwGMBU`B?%1uXQE#YhgNG3exf3+abzJ
zSsotJqVdt$zzPHyMhBUPv`FaZrXclMS66Tu7liwqq$QyXY0=DmayWF;<B|e6yMU9}
zK%6Cn2nC$R1<|*Op*Tnk$3|tbC_AaKIE)E!Aar3jI)FNk4diyB{Goy@(KK#G`gLtY
z`ayvi*+N>0@a?k0*?|Z%s!Dkw+=sG5+hH8I=U!rW|Gyh;y)&^L#CHaM00000NkvXX
Hu0mjfHaMc4

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-denyinactive.png b/core/administrator/templates/isis/images/admin/icon-16-denyinactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dc1b43e0fa0810cc031fa152eb93ec994b39d69
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003fNkl<ZcmZP=
zoZy9{slv-}-+-5~!3kiT5Ek$vz)gWD&Ci29Jzi!cG`t88X?W)A)$q*A6U=^@mE7<m
zIw0b)g*FFH&Ch_EU!=q~JaKcvil2oAHav?8h`_4(j+vIgv*_T4M^4sw@w4cVhR6P{
znBI95;$`v3-L~POn{C6B<T$MOp^r<$T^qxOr}1F{7zVs5On10zqu=myVsFF$|NpV#
z4~GsmTr<&VxZ`AzfawJrLx($-x(zS-x^Nos9%#TtWA%p1W?GmATr$zHxMi;0aMoP6
z;i$hSR(#UhxZ#|U8VF;0;gq2o#|2~cijxMa4Mbq<Y2ui^iosERl?DRX18+h)sHbcI
z#1%l?fCYmz69#*Al{kRd0*D<z7|IqHoEZ-Q>2>OY^%K#^00000NkvXXu0mjfG$*4P

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-links.png b/core/administrator/templates/isis/images/admin/icon-16-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..52b4cb434eb81971cf4e661caf1267a32455ea3e
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005&Nkl<Zcmb`D
z1FRfT7==$<x3N>dwy_%34C=;76&tl}KHIi!t#@a37SFa3JEwP08z=cj=l|~98T>Fs
zQ)>i!4c6helQ(`+2yT>26Qwgc;#xc#K*7X?pUXL;iDHOi5sGUfTSLFj8>8BZ>qcY_
zulZI^A50Vlkv8}Z2Xfr>_YYI*?BTKUZi?B)FXe=uy-4XN5_`X4XSR<s)6>jS23RC_
zQ|aobG5gu)#C8`Vri+OF7I|=zg|03xjq-DQRtLMgyQ$6!$BmDPXd}YD&)C=)T`m{*
zrhA!V@zLSy&^y%$@frUj*h>U@zDrqoIZY-rO_GNl9UVNF;nO?a*$XXi-NY;DBf+LV
zc6M~KxWz%c-Ogv(HB2`7c`DQMY3`lo7z?~|5l?Lz!7V);A0KCYWveFN$*B9-eZgzt
zJa-tM@T{c}Pn)?pu#t<4i#(fQ<Kf6UrWcejwbe^Js{fM5jl@f{8y|D8bT6LP@pM!L
z2L}g<d&S%qSWSnwotLtkwEHi3(Lmvx#22}p6}U-A6B83mt2NQ&l9_LEaoL?T;#RuO
zoh;&66>&d55#P;?gutV5)l6-X`KF|iD<7zGGI2YFc#uat%oo?GiTG(Q2kpg;m_po2
mAns-A+)g5H#1?AZ|IT}Pbj2%|;%Ptt0000<MNUMnLSTXvyaA#B

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-notice-note.png b/core/administrator/templates/isis/images/admin/icon-16-notice-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..a207d70ae835cc11f68c64b4f1eb94fcd3558b83
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00057Nkl<Zcmbu-
zGrU+y6bImM?tOl1+qP{tYuiSbI{hzI(!@!dCbpZ{8#J-Awk~J8H;eN9%fUD2%uI+e
z8caI;KWqw5sNK^PP8YR#r=3{f*0@p%NEN`EaJ9@RjXSFRY}N7a()_0Ln=v}WFGLen
zK6iio{r|wqa0`}d^|ilIo%6Zw%SV7>+ebS0jF$C-O)7VIB>o8*SR9U5nyS#JM1i^j
z5wZA%8Wk$nVLT+D^{&Dh{z5@0QTz^?miWVF83}2;Y)-f-0fpz4s8AAG+Mjoc2-Q!*
zFT07T(F`C@LkB3GEg}LU;pZJ9V)32q_dn@Jjer2oBLV+Q{_D5e;up<NJLI*rIRj)Q
zpz^cebkbyA@!PEXW%akZ10o_?WZ<Xd)aI*DqbB}Beew;uuNk7_nxU%RQz_8G05*pN
z3|FU1iofFY$8=x(lAg=oRUdx~f1*VTz7)+(!25BJ)<+sNgdQARq}(+{v15|_yR~#8
zA}U3%dOo)Q|H`An7Z@hj6-(+r2_1ACjV`cP?lrH(<p2pt$mMub@Pu5ifXrc;DKZnh
f9)AQRU@-X`j?>QZ7MK*I00000NkvXXu0mjfjr!%3

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/icon-16-protected.png b/core/administrator/templates/isis/images/admin/icon-16-protected.png
new file mode 100644
index 0000000000000000000000000000000000000000..b72ad93568e405808e7bad47431d415682b0e7fa
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00040Nkl<Zcmdsz
z1E{276oxmgz3GOv?XYHUZQHg7cXHRp*tTsm>!0lY?0N@bHJ*5@^BzCn>6-?iEvs03
z@Z!zsp1~2qVzWaik>S%%n(O503)?HrR#<*}dt{Q0k3XoTrQ6r<KY1;b$Vt9fN*43w
zbpafKguL_QrR&dHCYxI>ma9mSOu?!ND80ZF%Te^F{~i4NtCJOq#9Z|Nhx<pFDEWT}
zKmDXr>H-cPJ<;9WKZJpy5f+olqKuA?m5s$>Q%1%oT^yc(IDF*9>571j+jbs4H#7s+
zm<w==y95u!9eAc(hPQ^b_-xyZpPrqd1@@w2+y1|<`0M=h!!zpwwj4WC9dK!EPF=uf
z3ZpvU-8Tw~9|eLSkj-Qfi^dR-#gWVAkk9Ag@du|gVEO8`+pph!2(#6WOmR8j55Vbk
r!Bw<iAc$-cqSc#l_2#|GfL5&l^NhdhNw<_p00000NkvXXu0mjfj|swH

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/menu_divider.png b/core/administrator/templates/isis/images/admin/menu_divider.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4706b18b39f97d44de285721604055dbd92acb1
GIT binary patch
literal 75
zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Ed0V0oZ{G0)#ggjjwLpY+7Z3-SVG&M0j4p_!e
X@8mhRw8!c%P?o{d)z4*}Q$iB}MbZ-)

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/note_add_16.png b/core/administrator/templates/isis/images/admin/note_add_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..0acd4a592806b74f363d17e5d254c2fac52218bb
GIT binary patch
literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0004INkl<Zcmb7=
zGnm{_97VT{o2YN&q)HRpcC)UxTHCg5+qP|FZQFW#-}lCz-*-lL?s@pD5G98S3xh=q
z9bOz-3@DA73w1vzHP0z+_ZS=jJ+ePYR_Z9@KIFg2ai2CI9X|m34uk|$@gJYo4<aBG
z+hNX{&$ONh2nB=|1A^IY;jmLj*{&el1spcgv7)eWv?RHWDp-#Z78*4n2vh;BW-Zvg
z^|_$tb^nw9C49%@;s|(r!UApoDLj+a8X^c1Awh8M`nj~oCd+~q2k$O*6x{06@Er+q
zDqt@Ng6IB{cshH<z<=_Oci%r0oQnTA*8D<(TvT9J{F`z$dsT-BPx7)law_2Z5YXlc
zA0kfYY-k2deRA*mj)GnJH|v^5(W?)UbA;plYB+dyjLqHE?Ctl!d*mGoE={l5Pvo3S
z^Qn2x(2x1%Fnqo4=r6-%;uaFlQ<642J3GIfZoY6lhj)Bu;R%x4Y4H|>RwMub002ov
JPDHLkV1iGfx-S3#

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/publish_g.png b/core/administrator/templates/isis/images/admin/publish_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3794988476dd70ef47c86056c0565b2dd60236d
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0QUg*
z0QU#ri8cTL0Z&OpK~#7FWBC64`^Qh8pAiARg8@jx`}gl>o_^GH^a&8v9DW?S`5qjl
z@4Vk~<l(~ePfpx<3N#m?;oiM_*N^~^3pDaQ2Ed}>3>cihcpe!+oP?qQsPrfd?Ay2R
zC@KIN0nu>h(<yWtFag|cmtG!N_^=8^!+YG|*}DfGYlUyTJr2?U6~X}^s)JWc=k9Po
z@ifq_K>q=q3wAUD96P^1Zi9x!42HWeub^lEs-C~EbNA^D$l-JN;*Q`IvYtyA=bfzu
zD#N0|eF^8%L%l##51iWGyd}wZ4O`e2j`AIDz*xhg0f<W0J4f#13EaRBL=k&9(vC|d
zZ&Z5z_6c?k5Y)OWs_TaL#0SAZRCd&K+o@$hS?n<l*VDhgbm_yg6|ahy9h!hGX@CJd
za3Kk4@w%Bk^Xh<_A#n#J5gO1U0b<)dFo35kARCfe0bUSx7PF8}`Tzg`07*qoM6N<$
Eg7ZbQBLDyZ

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/publish_r.png b/core/administrator/templates/isis/images/admin/publish_r.png
new file mode 100644
index 0000000000000000000000000000000000000000..1405a7900f5ee42a2c2c0d432ce01a84583be2ad
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005jNkl<ZcmcJK
z1MJmt6vc10?V8=Qk!=pyHm8j7KV%Nsc0Jo3vRzZI)BXLPvOC-7i+k@m+ogZ5NE>Ps
z(v;fnmzKH~ke5OZOV~g&xL5Os=Agb@iC<9(K1DeMw51W$l@jqQ%fctCh@iH@wUC)4
z-!`|Yv^_ppf}3mS;>OxJ@S6w$b7=(lPK}mveGaazo`_JJI?uTGd5G6UeIi{NiN<%Y
zUWwd2xE3yBDa6Mp@apkBp(ft`c2yDXRNL}dK(tqrh_`J8_`B7@^SGxF^4N2RP4^4`
z%*xSl7zokc&EPgt8_~>#nvuRu;pB$Uw0CcSXN8a=DK?+iai3>=ovI_)z3yTX#DzA2
zUJb;CRZlptFO4hPmw#q{_2@qA{aWFIu9Pq*5+2YZyM{$iZ5Rk#ViGIId}hw`B<_a2
zOD$n8Pd0!}H81K20`Z0Y3x=1E?!h`#hU@#+7HZEpgy-@sro4DJ3xm67cNWa<(Q2I4
zl@eFFb!bB&#5+O;o)wT#UT3w`hQY;7wGf!nPTZIOpCQ!U!)5uug}&4=HElntCj0`=
zPH3nleM`ILw0NhS@B<=y6eOV^X`6&vZjn&QW(h?$wI(pv_<eY*ghtT+&_|7!n7OcM
R>M#HR002ovPDHLkV1khs|Ahbm

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/publish_x.png b/core/administrator/templates/isis/images/admin/publish_x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8719043981ae15496d1a8677c2cd0d559acd6f10
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QNkl<ZcmcJ{
z1B@I|9LMorZQG5Vu8rDmV{PNq@x>E6dvVUeDLS)Sdr%v3YKGOnW7Ya5pT~KFf1a=r
z8@a%QwyJZ&qndjHsZx9dXT`hu_)%<lO0w#iK^4ywss$$!8=4@idM8uGHJ#Ytv`1VV
zj&DESIHQe?EudO#k_g`xok`rrMX#zc+fT|d929o0ph^rs#cr8P{Pu+@n7h1xl~CR^
zjfzp|s=MaXjnf<H$}xw2rn!7zjWlnBR4#(~!lBiak3c7gk3PJ6MOsfr+AQ~#?Q@CU
zvzUQYHiC_{{mV$4b<eZCWUq2`z2zJJ=(-f7QekWqk=ZLgMfPe52id+;esC#_`4>YV
zv#WIn$=tiUg6UqzK<j)6DG`~mCpOZ97KU!upQY6H`KCLa16t!jY!uONNWtEKA8q}9
z&@Xs36u^3Xt1dT~4maorgl-QU_))D6tZ#N8+2nxGxB(=3B(8f~97y1Q^aW0AX_Xn3
Ri%$Rm002ovPDHLkV1lxA!o>gp

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/publish_y.png b/core/administrator/templates/isis/images/admin/publish_y.png
new file mode 100644
index 0000000000000000000000000000000000000000..75b0ddf9d75bb199f10d09c635edb3ef43d88aea
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003#Nkl<ZcmZSh
z|NlQl7(?Jy8B4*(Cbru@C$athKac%C2!HKhegCeSW&Mi+W_i2@d}v@h2h;R_mHPjG
zC(6MXCiZI*`|lUUEa6xU_}I#E8>9$^|K3{h|Id#fVEk``Ib8hD432-#kqiM7FUnck
zL6Rs2JlKISV4FLN+}9q?_b3K@pUCx%I0F#)SqV!4*nmfQ%<^yv1P1vXZU8p<cg@@f
zzy>@8nnaEPU;BC9gAI5>z<|HcPGB|QQx_}5fcv<-u)!Q+z?B(T4R~403ibjd3W279
z1WCaU3t7V920Sdn^v2(F9gr}1a|4v9P~<=sVkD$jO{_#Eq+c`G|J})FvB8>@A62s+
zKr#dr|0tS2_OgAuk%yU-QShZ~7Mq8)tmoeMuz?fTXJDp!-pu;!W(n&YT)B}V3;<QC
V%K5e^a`6BF002ovPDHLkV1fb9r`iAj

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/sort_asc.png b/core/administrator/templates/isis/images/admin/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..1204f31f50f223a846500bba657e1b01af54fafe
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRV0VEhUS<KuHq?k&A{DK+&M^9AR3gjt!x;TbZ
zFed-_|NsB-ne!V|m^%!GkEAdd9`IpPU_O*GgOizI)hDH*XSqwbL56s``njxgN@xNA
DU`8HY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/sort_desc.png b/core/administrator/templates/isis/images/admin/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0ca72e6c8f3940a9f55559674377962df8bb9ed
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRV0VEhUS<KuHq?k&A{DK+&M^9AR3goGHx;TbZ
zFecC7WagQ#@MTRu&wu+y$@%|`|F9c5@+fd0`NN^YDBz}4zWfo79>^3=S3j3^P6<r_
D5hEN6

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/tick.png b/core/administrator/templates/isis/images/admin/tick.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cf3ad3ab29db8e48e01b10b011355950ced6ee4
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6Iz3$+Ln;`TPGo01tRUd}nt^lb
zg^w(X3nwWta;gK-Lm8FE`+LLLUfbvCEi->_&LDZ1v!{lA!U`WBmW4Yftz$TO%<Hx2
zwTavfcb<BmcY5+-Pwd<|yeeTnQ;Y>#p2>P!N|!uKKfrnNvZX`puCj$beV@DnW7#Xe
s)boAvofR+oD(2Mz&FM@3?VoKdTKMVk_QO5KKu0lny85}Sb4q9e0P)vJTL1t6

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/trash.png b/core/administrator/templates/isis/images/admin/trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c100938a66043fcc0778a1e2f9f4f7bd450073c
GIT binary patch
literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005RNkl<Zcmb7@
z1FT#@6hP0+vbJrT@x~kfxN+mgWl%FtYTLH$2DNQ-`So-c`F^{b^du8JoXepAexMc5
z1!xa60=)bO&97g-zUle%=btuh+H`j5(xo#hWC1`?038a2G9R@$a^%Q?NF*YkKYx~+
zH*d<09XmFL!{J^zGif+})%y|a@5`hEk7f4Z2QqE%9htD|r0hL=T@IeTD%%gAmO~eA
zNztlv;wf76fC{QiEjzaC8f@H<i~s(Sh(s_A1F<cRe*OfOfye8kVN-|3t=iLb?9d@E
zkJJ&UpYI;D>d}5^1D_v%lg5ZR)WoY5?SekEln^idx5Sk}uyNC)O<S}W+A!E0+i<9h
zPeF%zn)1>(>hrf46=*6D+r~^EuOcT(fd{Z08|BdtTmp~}re$R!<wT?KD1~9$AVl2)
z;e%mY`7@~aIFqGgm~MfXW;Bz5CvOI1-eog*F>jo^gqN!(J+REQfc!ns3erJb;wlWw
z&PGvrGEmtp^p(5<5qYS|jn0TgC@(M1nSmeZUlNOmMo=nu1|TH={{2~TGkw&#6vmI2
zPY&H{++t`#2XLs3r4@0zEdKTNvkMhB(#)I`SpdXhA%JLc00000NkvXXu0mjf2axG;

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/uparrow-1.png b/core/administrator/templates/isis/images/admin/uparrow-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..20175936c331c4f2a96114b7f706ddccd9f87dc7
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3_UF&^$uA7ATVA>Eakt
z!I=ERUr8bU@QOC~<^J}2Yi369=F8bwOrBPzV<K`wVa>zWtHaeFKjyEjX1=&>!UX^P
zdjc02Or%$c^o1QcqVOdl%OWm_DY(laI4GzfYsan<O@Y{mJrW&!=Vr6JR6jd+*RuSb
cLcaxr$<oVni@noJf%Y<Zy85}Sb4q9e0N%tuUjP6A

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/uparrow.png b/core/administrator/templates/isis/images/admin/uparrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5b5beddd63b14ef8a0e0f09a423d0d83fb1d36a
GIT binary patch
literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq000aC000;W1^@s6&N3Wo0004!Nkl<Zcmb`_
z1FRiE7zN-us1>J(UR=d`abBFps%<N(ZMSh76j5#4*VeOr&C~NItGP8M`4;1yJ$?SI
zoX1$&PLDOar0%<Y`<~5LQ7fTL2TfNypH5ArI6;iRK%~D@mZlj4`km;yOwip8#o=v^
zW8^t`H(WOc^grC#N)R(|wIP$qAe+tNz}rr#)5XmJd&616s3TD{bo8QFEJ8{;okr!w
zTChzN%mLdRHo}UV)zV4fZRm!yk;fdc<@G$msO|4idCsAjeC!LPjW#GJ)o;y%yM!Nj
zMuXG=%dQWi1Jq5>#OW9f`RNbuyYOm-==0ypr%#{8(sp{R*+t*a(&x{gtEiPwri0Wh
zefjcbBE<>9<#Gw=@02AoOE#PBGC|kY)`qUGE;t+xdDod)vfJ&g1QCr!jV#sI*Gru)
zZXJ*%IGs-P_NrM51Oobig7q70gjg&lofO=f{v96c3C$zOUVT2F!tHkJr=@1;<HwJ8
z2|w_R)GWP!|9%i1pl*UDPRHoyS$g~SZH4$=+gFPC8sm;)+P?q*002ovPDHLkV1n@g
B;F16U

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/admin/uparrow0.png b/core/administrator/templates/isis/images/admin/uparrow0.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5b5beddd63b14ef8a0e0f09a423d0d83fb1d36a
GIT binary patch
literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq000aC000;W1^@s6&N3Wo0004!Nkl<Zcmb`_
z1FRiE7zN-us1>J(UR=d`abBFps%<N(ZMSh76j5#4*VeOr&C~NItGP8M`4;1yJ$?SI
zoX1$&PLDOar0%<Y`<~5LQ7fTL2TfNypH5ArI6;iRK%~D@mZlj4`km;yOwip8#o=v^
zW8^t`H(WOc^grC#N)R(|wIP$qAe+tNz}rr#)5XmJd&616s3TD{bo8QFEJ8{;okr!w
zTChzN%mLdRHo}UV)zV4fZRm!yk;fdc<@G$msO|4idCsAjeC!LPjW#GJ)o;y%yM!Nj
zMuXG=%dQWi1Jq5>#OW9f`RNbuyYOm-==0ypr%#{8(sp{R*+t*a(&x{gtEiPwri0Wh
zefjcbBE<>9<#Gw=@02AoOE#PBGC|kY)`qUGE;t+xdDod)vfJ&g1QCr!jV#sI*Gru)
zZXJ*%IGs-P_NrM51Oobig7q70gjg&lofO=f{v96c3C$zOUVT2F!tHkJr=@1;<HwJ8
z2|w_R)GWP!|9%i1pl*UDPRHoyS$g~SZH4$=+gFPC8sm;)+P?q*002ovPDHLkV1n@g
B;F16U

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/emailButton.png b/core/administrator/templates/isis/images/emailButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd7ff64b8ac675a7eca349ea0190da3f6157e4ab
GIT binary patch
literal 559
zcmV+~0?_@5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005@Nkl<ZcmdUt
zCDc_*07m!Bx&B}M-CZNS(F2j5X!J#2WFifhggcMt{_=D5y1N`5&fw4&ve(+<-<O6@
zjyQ7sm#-tS#J*bB9_x)9=_&9~xc<UZ{_N{{dhh8otwOlAJ!sdmfB*k~U@DVZI&@$=
zY1&Fe!UpdmK3t2J^U!pRq3O;aJZg?)rQ@tyjwjAMD3YyN^i9Rnx<|I*k!yJr+a8s!
zqSjZ~F68PK$F3D=_Dz|XTHcU-(-q;MWMMwZoj)qHdNwmjLC}DZAqWMukd6xK9gB<K
zmr0K&nMj8LgdB_<G#j&V7H5;(`n^K4Ycm;_I_Q@`Dk5lfb-2RhM3VKzI6|R8_D3$7
zfB_rxai%gcE_|KU0UadaTld!|?`BD*VyrL3i3R{(7YuDQLV#mCM1mg63u&(ZS|L{(
zp}qWbg(d$i5pt2rA@sUHKwx0HD8RBDN{uedGYLYWAcaPR@BZo_f$ilCvlCJJBa1?<
z%VZ{j(jg^ufumeciE`Z!PbG*(f}mi1I>w5x0K}`m5r~BdOee@!I}FoNP@W3(8~G=u
z<*e*2Mnya-g^(^15JD@^2<__y0ah{z?@6g^b*kAy!0J_>?mv7h6Hbhc1;U011Pr7h
xFeFGRkbzeP0*ziP*RiZ&yIHS3%s%7G=Q&Kp^IvjPrRD$t002ovPDHLkV1fh+{>=aY

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/joomla.png b/core/administrator/templates/isis/images/joomla.png
new file mode 100644
index 0000000000000000000000000000000000000000..239f577864f24f07eab98ee4818af702a314cb34
GIT binary patch
literal 14980
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/login-joomla-inverse.png b/core/administrator/templates/isis/images/login-joomla-inverse.png
new file mode 100644
index 0000000000000000000000000000000000000000..04050ad37e237135952c00763900dac31b6c803c
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0005iNkl<ZcmZ{j
z1FT(95JlIwYTIVi26cnlR-DvkSld=q+qP}nw#~_8GI{uKU+z8YT+RVVW)R<*L?$9B
zlT^P8l?;%?R{rU7nyjQENlzQGRcN~L&zCV2r2sKtN<$F}G6E-r=30RL%{M-Ak`4+F
z<Cgf(e8&l)>F*|R>BP2F^Zt;A{Q<#Wd)70l;`>Phke;y?tfC?<SjaK++o()!uITwk
z`U`2Qr_l?t0BPB6_z5}z&`{kQGU95X(R0$1je~|CV<&$Z;{)E48&?^AYB-bGhHqr0
zosD3H9?uhpE1He|)Ti{Nlc~UC%hq#Q_FV}S`MF?UX&Vzr2S9mlY4(dvj3S;uk&$u!
z3#SqVKwhSC*Df=J5Y3lxB{yuyTw(=3&o7qpz_R89s4!o&F-CFG%6&O*%`%ibdUk{u
zTun84OI`|dQ(w~tvW{e0TQvu+MjAaP1t`WmZ|5Z>05$de9htq~{p*h<2W2^A?f`?x
zLvi-0`@%3Gfed~<Z2)iPz1o!T`5aI^Ei~g(?aO5>Of{bX-@?LY3@464tl(2<O=$WB
z*s;{12HC(=M10M_DJnEcZ1(Aqj?|RSr`TqpfkZlUp5CM(lF~@^yikeoAN9XcsBWVH
QZ2$lO07*qoM6N<$g8S|6NdN!<

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/login-joomla.png b/core/administrator/templates/isis/images/login-joomla.png
new file mode 100644
index 0000000000000000000000000000000000000000..edd17ca9f7e402d7bf70e6856876e664bc95c601
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0005SNkl<ZcmZ|N
zGn6KF96-_ESg~!hN}4!LY_96H*{yA>THChmtZkcdZk+$*oNsRbx)%|OHSvQkZizCu
zMHfG4qBtTHnGRU%_Q=5P)&iz03N<9{JnkVm@ekK|%)?qqYJ}~QUwrSf)hb1}P7Awz
z?}{HJ+e1T{R53#)4a0R7N`3>=t&_<@*F}UIwFivxvabxb0x-j?-nA86($J0ZHy?nL
zZi{fexqwxw#2<VN&bm4N<tuQ)jqb1*u)=J=Y4=}n!M!PX&QGAXzJSR_16mmcHp)vu
zw#k4Q)?m6~FF693XbY-GX&$r*{APwuZiqj4(QfdwDcZ=7(%h_r?SSsG;t%fE!#?nv
zX7PUp`psxN0sZB=-$p+h?jYdHNIdE)e$mEvfcjQ~Uo^KDEK84t&%rtOd(<vW^c`S=
zV&8&u?n=QY;E0k4PZ(e=V3>jkZ-eu0O~3aAw0D>1Edeaj#C@K$09@6=?GfQ7Yb9s>
z0GMwfF1R9D>!#3ACL;`%NvH5VAUUq3JdYUVG9dXrG?29Sp10f)|L~aiysed_K`1g6
zu+R;Wfg3CYOjQ&S3RSgHUDrh!T&J#$sw#~59T)u={mhYFQvd(}07*qoM6N<$f_rxC
Au>b%7

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/logo-inverse.png b/core/administrator/templates/isis/images/logo-inverse.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e60f8676d2f3c381e84abcc6c2acb22de79d735
GIT binary patch
literal 3840
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
C=})=<

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/logo.png b/core/administrator/templates/isis/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c1c265a194ab62104455a1b453cbc436c400995
GIT binary patch
literal 4644
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
aVEX?@E}4Sg?QOCE0000<MNUMnLSTYV!Fu-q

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/pdf_button.png b/core/administrator/templates/isis/images/pdf_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4a1d044e2f1d5d571bef630e0e1a93107ae6f84
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005QNkl<Zcma)*
z1I!#z6h_;Iwar+K%CKRBT48P5b{nU*t*ADG+BRpFW6x~A|J|3YImwwFedi+CY5+Lw
zXv65t=vIafj2fw2hM=?KIEwH4i69722=*RZw{G2>lH>@wQP@ybsB0HOzkL;^X+mZ9
zvMeJU4s(epirBVoTS}4)S0@2|VCx#x6?0&|d<xsPq3b#nML{GI;R4IDU>F8=?b^j9
zc>>pUA<drz?f8BY@PMXih(@D%BT*(#z{Y^IVlMP^$LX5pPK^?a#ds%zAQTr6k%_|)
zn?IFbXG*9O+DAMdFD`Jte}yo75JHnj!hZiYQ$pj=PDoT-AkLeH_}(3`zkR{KNlfzf
zGymB0JlYRQh{6IlEaJzI-f;f?h4uL({!Sl{&)qxXNB^GqJ#HBOEt-w^nG@7aVZq;J
z3-E8%V#rr6AbR8g)cbc}yn6#-!z%omIu3uA&PVv*o_xWB7L6M2YFuySmm&S&N_;`7
z*$HZ&u)`s^y3Vgtf@jSe_F!zh)3m`0?a8B5I7gC4O7OTzy}gWUTkF?a$sYb^ph6PK
y5t4i8!nSPEi%P=mTb=%ZnS!<?A!~(nrc4!ofU}Mr;}9eO0000<MNUMnLSTY=FYl)S

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/printButton.png b/core/administrator/templates/isis/images/printButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..e56670c172f9621fa12a254eec280d7899b247a3
GIT binary patch
literal 637
zcmV-@0)qXCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006+Nkl<Zcma)&
z1B_ll6ot>7ng8GSXKUNG-JrG`)V87qwW3DLpf=-FQSGS4+O~J!d((GcwrhRK@Xk3o
zcL-IOdGy65UkhWcAj||nAQVFrEUU~fD?^9AJ3oCNYCx#MymPNhZ|)!G5rUvKTzE~(
zFU76T*+`5kE(-hmr}gX5#U&_5pbAn7(<23<vJ|4TCBiZYKT?6-?ftQQd>8cYZ}?OT
z|0{5*!$1S{|56ZDjHJvW^lVm!9aGvudgSUl4Njgs=>xRj$V&1cNI~#Oa+7?BHR0!x
zAVv1ZjT?Pc3|#S60I39cH2_6|3$9oZ!OtsUI735lB5z4aN$QFfD_8^Jh-Y{1-1*|7
zMT?pVAz=d`f*YN*n*d%V;FWF-LMZInv!_|_-n}o*nKNfLIR;-Hx8WT+bU<)$Fq*=?
zeftm=7KXsUzz79k;E*9hz${(56axniL_>W0_6_aYwR6YAhY$NG%d))A0237z<rdP@
z(@_^(i-?H8xN+ma<mBX#GEEbak&$3n=zI|J^72p@&6+hsT3TAgdtOypSsCKu;=mLZ
z7J>~+OG{A~Tq`IjsCdt2Y)~OE41@auQ(Rokk2wuTb%)j(!-fs3c+Xnp9PHfOT+yOM
z3%7;ALr0)(yAG&}wA5srJ$(Xm=gvi9Vj^tYhH`qo`1tYT$&TA_-}FN`yl4yxO92hQ
z)*6<jQD#}NoX1lpPr$R(t~hvb9jEyU;2xn0n}R=BN(upu3Urm3h+vwweRcmNiE{n{
XIx-1AV-Flc00000NkvXXu0mjf7j_+!

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/system/sort_asc.png b/core/administrator/templates/isis/images/system/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..677424496d7d35d1f4f1efd6d6d8a8d91b4c7879
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRK?w&4=Ar*{M``sBG6nT!mS`hb(
zC0t0T;LyDf>eeSYKbe2_X6SC}XJ~8e-@PpK_e3+>ON);7nPh)exg`{O;+B8N!k3Q!
b>*W|K_IEXV{GD_aXe5KDtDnm{r-UW|p{Xt_

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/images/system/sort_desc.png b/core/administrator/templates/isis/images/system/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c38b9803d21e13797940889b600f9c54a643a24a
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRKex5FlAr*{M`&k(o40)IzC&Wn|
zoNB_U|Mcg)!adqcv+|#9Rx}bikYBT-w7YYDOw8RRsSg&bZ>?R)xO>IjnFm%x`6Ten
jI3Qu*+GP0W<sN3?%&z8BA@5~@CNp@t`njxgN@xNAk|Qr}

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/img/glyphicons-halflings-white.png b/core/administrator/templates/isis/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1ab58151c4724dce6d08146d2c965e98098471b
GIT binary patch
literal 8743
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
G)Bgdmuun4p

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/img/glyphicons-halflings.png b/core/administrator/templates/isis/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f241c76f9adb78aba434bf3c7500fb894c12081a
GIT binary patch
literal 12600
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
ONUDmO3UzXpq5lK$2nJaI

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/index.php b/core/administrator/templates/isis/index.php
new file mode 100644
index 00000000..a5f4f18a
--- /dev/null
+++ b/core/administrator/templates/isis/index.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       3.0
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app   = JFactory::getApplication();
+$lang  = JFactory::getLanguage();
+$input = $app->input;
+$user  = JFactory::getUser();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Gets the FrontEnd Main page Uri
+$frontEndUri = JUri::getInstance(JUri::root());
+$frontEndUri->setScheme(((int) $app->get('force_ssl', 0) === 2) ? 'https' : 'http');
+$mainPageUri = $frontEndUri->toString();
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add filter polyfill for IE8
+JHtml::_('behavior.polyfill', array('filter'), 'lte IE 9');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add Stylesheets
+JHtml::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+JHtml::_('stylesheet', 'responsive.css', array('version' => 'auto', 'relative' => true));
+
+
+// Detecting Active Variables
+$option   = $input->get('option', '');
+$view     = $input->get('view', '');
+$layout   = $input->get('layout', '');
+$task     = $input->get('task', '');
+$itemid   = $input->get('Itemid', 0, 'int');
+$sitename = htmlspecialchars($app->get('sitename', ''), ENT_QUOTES, 'UTF-8');
+$cpanel   = $option === 'com_cpanel';
+
+$hidden = $app->input->get('hidemainmenu');
+
+$showSubmenu          = false;
+$this->submenumodules = JModuleHelper::getModules('submenu');
+
+foreach ($this->submenumodules as $submenumodule)
+{
+	$output = JModuleHelper::renderModule($submenumodule);
+
+	if ($output !== '')
+	{
+		$showSubmenu = true;
+		break;
+	}
+}
+
+// Template Parameters
+$displayHeader = $this->params->get('displayHeader', '1');
+$statusFixed   = $this->params->get('statusFixed', '1');
+$stickyToolbar = $this->params->get('stickyToolbar', '1');
+
+// Header classes
+$navbar_color    = $this->params->get('templateColor') ?: '';
+$header_color    = $displayHeader && $this->params->get('headerColor') ? $this->params->get('headerColor') : '';
+$navbar_is_light = $navbar_color && colorIsLight($navbar_color);
+$header_is_light = $header_color && colorIsLight($header_color);
+
+if ($displayHeader)
+{
+	// Logo file
+	if ($this->params->get('logoFile'))
+	{
+		$logo = JUri::root() . $this->params->get('logoFile');
+	}
+	else
+	{
+		$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo' . ($header_is_light ? '-inverse' : '') . '.png';
+	}
+}
+
+function colorIsLight($color)
+{
+	$r = hexdec(substr($color, 1, 2));
+	$g = hexdec(substr($color, 3, 2));
+	$b = hexdec(substr($color, 5, 2));
+
+	$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+
+	return $yiq >= 200;
+}
+
+// Pass some values to javascript
+$offset = 20;
+
+if ($displayHeader || !$statusFixed)
+{
+	$offset = 30;
+}
+
+$stickyBar = 0;
+
+if ($stickyToolbar)
+{
+	$stickyBar = 'true';
+}
+
+// Template color
+if ($navbar_color)
+{
+	$this->addStyleDeclaration('
+	.navbar-inner,
+	.navbar-inverse .navbar-inner,
+	.dropdown-menu li > a:hover,
+	.dropdown-menu .active > a,
+	.dropdown-menu .active > a:hover,
+	.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+	.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+	.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle,
+	#status.status-top {
+		background: ' . $navbar_color . ';
+	}');
+}
+
+// Template header color
+if ($header_color)
+{
+	$this->addStyleDeclaration('
+	.header {
+		background: ' . $header_color . ';
+	}');
+}
+
+// Sidebar background color
+if ($this->params->get('sidebarColor'))
+{
+	$this->addStyleDeclaration('
+	.nav-list > .active > a,
+	.nav-list > .active > a:hover {
+		background: ' . $this->params->get('sidebarColor') . ';
+	}');
+}
+
+// Link color
+if ($this->params->get('linkColor'))
+{
+	$this->addStyleDeclaration('
+	a,
+	.j-toggle-sidebar-button {
+		color: ' . $this->params->get('linkColor') . ';
+	}');
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<jdoc:include type="head" />
+</head>
+<body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task . ' itemid-' . $itemid; ?>" data-basepath="<?php echo JURI::root(true); ?>">
+<!-- Top Navigation -->
+<nav class="navbar<?php echo $navbar_is_light ? '' : ' navbar-inverse'; ?> navbar-fixed-top">
+	<div class="navbar-inner">
+		<div class="container-fluid">
+			<?php if ($this->params->get('admin_menus') != '0') : ?>
+				<a href="#" class="btn btn-navbar collapsed" data-toggle="collapse" data-target=".nav-collapse">
+					<span class="element-invisible"><?php echo JTEXT::_('TPL_ISIS_TOGGLE_MENU'); ?></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+				</a>
+			<?php endif; ?>
+
+			<!-- skip to content -->
+			<a class="element-invisible" href="#skiptarget"><?php echo JText::_('TPL_ISIS_SKIP_TO_MAIN_CONTENT'); ?></a>
+
+			<a class="admin-logo <?php echo ($hidden ? 'disabled' : ''); ?>" <?php echo ($hidden ? '' : 'href="' . $this->baseurl . '/index.php"'); ?>>
+				<span class="icon-joomla"></span>
+				<div class="element-invisible">
+					<?php echo JText::_('TPL_ISIS_CONTROL_PANEL'); ?>
+				</div>
+			</a>
+
+			<a class="brand hidden-desktop hidden-tablet" href="<?php echo $mainPageUri; ?>" title="<?php echo JText::sprintf('TPL_ISIS_PREVIEW', $sitename); ?>" target="_blank"><?php echo JHtml::_('string.truncate', $sitename, 14, false, false); ?>
+				<span class="icon-out-2 small"></span></a>
+
+			<div<?php echo ($this->params->get('admin_menus') != '0') ? ' class="nav-collapse collapse"' : ''; ?>>
+				<jdoc:include type="modules" name="menu" style="none" />
+				<ul class="nav nav-user<?php echo ($this->direction == 'rtl') ? ' pull-left' : ' pull-right'; ?>">
+					<li class="dropdown">
+						<a class="<?php echo ($hidden ? ' disabled' : 'dropdown-toggle'); ?>" data-toggle="<?php echo ($hidden ? '' : 'dropdown'); ?>" <?php echo ($hidden ? '' : 'href="#"'); ?>><span class="icon-user"></span>
+							<span class="caret"></span>
+							<div class="element-invisible">
+								<?php echo JText::_('TPL_ISIS_USERMENU'); ?>
+							</div>
+						</a>
+						<ul class="dropdown-menu">
+							<?php if (!$hidden) : ?>
+								<li>
+									<span>
+										<span class="icon-user"></span>
+										<strong><?php echo $user->name; ?></strong>
+									</span>
+								</li>
+								<li class="divider"></li>
+								<li>
+									<a href="index.php?option=com_admin&amp;task=profile.edit&amp;id=<?php echo $user->id; ?>"><?php echo JText::_('TPL_ISIS_EDIT_ACCOUNT'); ?></a>
+								</li>
+								<li class="divider"></li>
+								<li class="">
+									<a href="<?php echo JRoute::_('index.php?option=com_login&task=logout&' . JSession::getFormToken() . '=1'); ?>"><?php echo JText::_('TPL_ISIS_LOGOUT'); ?></a>
+								</li>
+							<?php endif; ?>
+						</ul>
+					</li>
+				</ul>
+				<a class="brand visible-desktop visible-tablet" href="<?php echo $mainPageUri; ?>" title="<?php echo JText::sprintf('TPL_ISIS_PREVIEW', $sitename); ?>" target="_blank"><?php echo JHtml::_('string.truncate', $sitename, 14, false, false); ?>
+					<span class="icon-out-2 small"></span></a>
+			</div>
+			<!--/.nav-collapse -->
+		</div>
+	</div>
+</nav>
+<!-- Header -->
+<?php if ($displayHeader) : ?>
+	<header class="header<?php echo $header_is_light ? ' header-inverse' : ''; ?>">
+		<div class="container-logo">
+			<img src="<?php echo $logo; ?>" class="logo" alt="<?php echo $sitename;?>" />
+		</div>
+		<div class="container-title">
+			<jdoc:include type="modules" name="title" />
+		</div>
+	</header>
+<?php endif; ?>
+<?php if (!$statusFixed && $this->countModules('status')) : ?>
+	<!-- Begin Status Module -->
+	<div id="status" class="navbar status-top hidden-phone">
+		<div class="btn-toolbar">
+			<jdoc:include type="modules" name="status" style="no" />
+		</div>
+		<div class="clearfix"></div>
+	</div>
+	<!-- End Status Module -->
+<?php endif; ?>
+<?php if (!$cpanel) : ?>
+	<!-- Subheader -->
+	<a class="btn btn-subhead" data-toggle="collapse" data-target=".subhead-collapse"><?php echo JText::_('TPL_ISIS_TOOLBAR'); ?>
+		<span class="icon-wrench"></span></a>
+	<div class="subhead-collapse collapse" id="isisJsData" data-tmpl-sticky="<?php echo $stickyBar; ?>" data-tmpl-offset="<?php echo $offset; ?>">
+		<div class="subhead">
+			<div class="container-fluid">
+				<div id="container-collapse" class="container-collapse"></div>
+				<div class="row-fluid">
+					<div class="span12">
+						<!-- target for skip to content link -->
+						<a id="skiptarget" class="element-invisible"><?php echo JText::_('TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE'); ?></a>
+						<jdoc:include type="modules" name="toolbar" style="no" />
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+<?php else : ?>
+	<div style="margin-bottom: 20px">
+		<!-- target for skip to content link -->
+		<a id="skiptarget" class="element-invisible"><?php echo JText::_('TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE'); ?></a>
+	</div>
+<?php endif; ?>
+<!-- container-fluid -->
+<div class="container-fluid container-main">
+	<section id="content">
+		<!-- Begin Content -->
+		<jdoc:include type="modules" name="top" style="xhtml" />
+		<div class="row-fluid">
+			<?php if ($showSubmenu) : ?>
+			<div class="span2">
+				<jdoc:include type="modules" name="submenu" style="none" />
+			</div>
+			<div class="span10">
+				<?php else : ?>
+				<div class="span12">
+					<?php endif; ?>
+					<jdoc:include type="message" />
+					<jdoc:include type="component" />
+				</div>
+			</div>
+			<?php if ($this->countModules('bottom')) : ?>
+				<jdoc:include type="modules" name="bottom" style="xhtml" />
+			<?php endif; ?>
+			<!-- End Content -->
+	</section>
+
+	<?php if (!$this->countModules('status') || (!$statusFixed && $this->countModules('status'))) : ?>
+		<footer class="footer">
+			<p class="text-center">
+				<jdoc:include type="modules" name="footer" style="no" />
+				&copy; <?php echo $sitename; ?> <?php echo date('Y'); ?></p>
+		</footer>
+	<?php endif; ?>
+</div>
+<?php if ($statusFixed && $this->countModules('status')) : ?>
+	<!-- Begin Status Module -->
+	<div id="status" class="navbar navbar-fixed-bottom hidden-phone">
+		<div class="btn-toolbar">
+			<div class="btn-group pull-right">
+				<p>
+					<jdoc:include type="modules" name="footer" style="no" />
+					&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+				</p>
+
+			</div>
+			<jdoc:include type="modules" name="status" style="no" />
+		</div>
+	</div>
+	<!-- End Status Module -->
+<?php endif; ?>
+<jdoc:include type="modules" name="debug" style="none" />
+</body>
+</html>
diff --git a/core/administrator/templates/isis/js/application.js b/core/administrator/templates/isis/js/application.js
new file mode 100644
index 00000000..783c73ed
--- /dev/null
+++ b/core/administrator/templates/isis/js/application.js
@@ -0,0 +1,7 @@
+$('.dropdown-toggle').dropdown()
+$('.collapse').collapse('show')
+$('#myModal').modal('hide')
+$('.typeahead').typeahead()
+$('.tabs').button()
+$('.tip').tooltip()
+$(".alert-message").alert()
\ No newline at end of file
diff --git a/core/administrator/templates/isis/js/classes.js b/core/administrator/templates/isis/js/classes.js
new file mode 100644
index 00000000..2f467730
--- /dev/null
+++ b/core/administrator/templates/isis/js/classes.js
@@ -0,0 +1,45 @@
+// Add classes
+
+window.onload=function() {
+var input = document.getElementsByTagName("input");
+for (var i = 0; i < input.length; i++) {
+    if (input[i].className == 'button') {
+        input[i].className = 'btn btn-primary';
+    }
+}
+
+var button = document.getElementsByTagName("button");
+for (var i = 0; i < input.length; i++) {
+    if (button[i].className == 'button') {
+        button[i].className = 'btn btn-primary';
+    }
+}
+
+var p = document.getElementsByTagName("p");
+for (var i = 0; i < p.length; i++) {
+    if (p[i].className == 'readmore') {
+        p[i].className = 'btn';
+    }
+}
+
+var table = document.getElementsByTagName("table");
+for (var i = 0; i < table.length; i++) {
+    if (table[i].className == 'category') {
+        table[i].className = 'table table-striped';
+    }
+}
+
+var ul = document.getElementsByTagName("ul");
+for (var i = 0; i < ul.length; i++) {
+    if (ul[i].className == 'actions') {
+        ul[i].className = 'nav nav-pills';
+    }
+}
+
+var ul = document.getElementsByTagName("ul");
+for (var i = 0; i < ul.length; i++) {
+    if (ul[i].className == 'pagenav') {
+        ul[i].className = 'pagination';
+    }
+}
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/js/template.js b/core/administrator/templates/isis/js/template.js
new file mode 100644
index 00000000..d42adc59
--- /dev/null
+++ b/core/administrator/templates/isis/js/template.js
@@ -0,0 +1,419 @@
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       3.0
+ */
+
+jQuery(function($)
+{
+	'use strict';
+
+	var $w = $(window);
+
+	$('*[rel=tooltip]').tooltip();
+
+	// Turn radios into btn-group
+	$('.radio.btn-group label').addClass('btn');
+
+	$('fieldset.btn-group').each(function() {
+		// Handle disabled, prevent clicks on the container, and add disabled style to each button
+		if ($(this).prop('disabled')) {
+			$(this).css('pointer-events', 'none').off('click');
+			$(this).find('.btn').addClass('disabled');
+		}
+	});
+
+	$('.btn-group label:not(.active)').click(function()
+	{
+		var label = $(this);
+		var input = $('#' + label.attr('for'));
+
+		if (!input.prop('checked'))
+		{
+			label.closest('.btn-group').find('label').removeClass('active btn-success btn-danger btn-primary');
+
+			if (label.closest('.btn-group').hasClass('btn-group-reversed'))
+			{
+				if (input.val() == '')
+				{
+					label.addClass('active btn-primary');
+				}
+				else if (input.val() == 0)
+				{
+					label.addClass('active btn-success');
+				}
+				else
+				{
+					label.addClass('active btn-danger');
+				}
+			}
+			else
+			{
+				if (input.val() == '')
+				{
+					label.addClass('active btn-primary');
+				}
+				else if (input.val() == 0)
+				{
+					label.addClass('active btn-danger');
+				}
+				else
+				{
+					label.addClass('active btn-success');
+				}
+
+			}
+			input.prop('checked', true);
+			input.trigger('change');
+		}
+	});
+	$('.btn-group input[checked=checked]').each(function()
+	{
+		var $self  = $(this);
+		var attrId = $self.attr('id');
+
+		if ($self.parent().hasClass('btn-group-reversed'))
+		{
+			if ($self.val() == '')
+			{
+				$('label[for=' + attrId + ']').addClass('active btn-primary');
+			}
+			else if ($self.val() == 0)
+			{
+				$('label[for=' + attrId + ']').addClass('active btn-success');
+			}
+			else
+			{
+				$('label[for=' + attrId + ']').addClass('active btn-danger');
+			}
+		}
+		else
+		{
+			if ($self.val() == '')
+			{
+				$('label[for=' + attrId + ']').addClass('active btn-primary');
+			}
+			else if ($self.val() == 0)
+			{
+				$('label[for=' + attrId + ']').addClass('active btn-danger');
+			}
+			else
+			{
+				$('label[for=' + attrId + ']').addClass('active btn-success');
+			}
+		}
+	});
+
+	// add color classes to chosen field based on value
+	$('select[class^="chzn-color"], select[class*=" chzn-color"]').on('liszt:ready', function(){
+		var select = $(this);
+		var cls = this.className.replace(/^.(chzn-color[a-z0-9-_]*)$.*/, '$1');
+		var container = select.next('.chzn-container').find('.chzn-single');
+		container.addClass(cls).attr('rel', 'value_' + select.val());
+		select.on('change click', function()
+		{
+			container.attr('rel', 'value_' + select.val());
+		});
+
+	});
+
+	/**
+	 * Append submenu items to empty UL on hover allowing a scrollable dropdown
+	 */
+	if ($w.width() > 767)
+	{
+		var menuScroll = $('#menu > li > ul'),
+			emptyMenu  = $('#nav-empty'),
+			linkWidth,
+			menuWidth,
+			offsetLeft;
+
+		$('#menu > li').on('click mouseenter', function() {
+
+			// Set max-height (and width if scroll) for dropdown menu, depending of window height
+			var $self            = $(this),
+				$dropdownMenu    = $self.children('ul'),
+				windowHeight     = $w.height(),
+				linkHeight       = $self.outerHeight(true),
+				statusHeight     = $('#status').outerHeight(true),
+				menuHeight       = $dropdownMenu.height(),
+				menuOuterHeight  = $dropdownMenu.outerHeight(true),
+				scrollMenuWidth  = $dropdownMenu.width() + 15,
+				maxHeight        = windowHeight - (linkHeight + statusHeight + (menuOuterHeight - menuHeight) + 20),
+				linkPaddingLeft  = $self.children('a').css('padding-left');
+
+			if (maxHeight < menuHeight)
+			{
+				$dropdownMenu.css('width', scrollMenuWidth);
+			}
+			else if (maxHeight > menuHeight)
+			{
+				$dropdownMenu.css('width', 'auto');
+			}
+
+			$dropdownMenu.css('max-height', maxHeight);
+
+			// Get the submenu position
+			linkWidth   = $self.outerWidth(true);
+			menuWidth   = $dropdownMenu.width();
+			offsetLeft  = Math.round($self.offset().left) - parseInt(linkPaddingLeft);
+
+			emptyMenu.empty().hide();
+
+		});
+
+		menuScroll.find('.dropdown-submenu > a').on('mouseover', function() {
+
+			var $self           = $(this),
+				dropdown        = $self.next('ul'),
+				submenuWidth    = dropdown.outerWidth(),
+				offsetTop       = $self.offset().top,
+				linkPaddingTop  = parseInt(dropdown.css('padding-top')) + parseInt($self.css('padding-top')),
+				scroll          = $w.scrollTop() + linkPaddingTop;
+
+			// Set the submenu position
+			if ($('html').attr('dir') == 'rtl')
+			{
+				emptyMenu.css({
+					top : offsetTop - scroll,
+					left: offsetLeft - (menuWidth - linkWidth) - submenuWidth
+				});
+			}
+			else
+			{
+				emptyMenu.css({
+					top : offsetTop - scroll,
+					left: offsetLeft + menuWidth
+				});
+			}
+
+			// Append items to empty <ul> and show it
+			dropdown.hide();
+			emptyMenu.show().html(dropdown.html());
+
+			// Check if the full element is visible. If not, adjust the position
+			if (emptyMenu.Jvisible() !== true)
+			{
+				emptyMenu.css({
+					top : ($w.height() - emptyMenu.outerHeight()) - $('#status').height()
+				});
+			}
+
+		});
+
+		menuScroll.find('a.no-dropdown').on('mouseenter', function() {
+
+			emptyMenu.empty().hide();
+
+		});
+
+		// obtain a reference to the original handler
+		var _clearMenus = $._data(document, 'events').click.filter(function (el) {
+			return el.namespace === 'data-api.dropdown' && el.selector === undefined
+		})[0].handler;
+
+		// disable the old listener
+		$(document)
+			.off('click.data-api.dropdown', _clearMenus)
+			.on('click.data-api.dropdown', function(e) {
+				e.button === 2 || _clearMenus();
+
+				if (!$('#menu').find('> li').hasClass('open'))
+				{
+					emptyMenu.empty().hide();
+				}
+			});
+
+		$.fn.Jvisible = function(partial,hidden)
+		{
+			if (this.length < 1)
+			{
+				return;
+			}
+
+			var $t = this.length > 1 ? this.eq(0) : this,
+				t  = $t.get(0)
+
+			var viewTop         = $w.scrollTop(),
+				viewBottom      = (viewTop + $w.height()) - $('#status').height(),
+				offset          = $t.offset(),
+				_top            = offset.top,
+				_bottom         = _top + $t.height(),
+				compareTop      = partial === true ? _bottom : _top,
+				compareBottom   = partial === true ? _top : _bottom;
+
+			return !!t.offsetWidth * t.offsetHeight && ((compareBottom <= viewBottom) && (compareTop >= viewTop));
+		};
+
+	}
+
+
+	/**
+	 * USED IN: All views with toolbar and sticky bar enabled
+	 */
+	var navTop;
+	var isFixed = false;
+
+
+	if (document.getElementById('isisJsData') && document.getElementById('isisJsData').getAttribute('data-tmpl-sticky') == "true") {
+		processScrollInit();
+		processScroll();
+
+		$(window).on('resize', processScrollInit);
+		$(window).on('scroll', processScroll);
+	}
+
+	function processScrollInit() {
+		if ($('.subhead').length) {
+			navTop = $('.subhead').length && $('.subhead').offset().top - parseInt(document.getElementById('isisJsData').getAttribute('data-tmpl-offset'));
+
+			// Fix the container top
+			$(".container-main").css("top", $('.subhead').height() + $('nav.navbar').height());
+
+			// Only apply the scrollspy when the toolbar is not collapsed
+			if (document.body.clientWidth > 480) {
+				$('.subhead-collapse').height($('.subhead').height());
+				$('.subhead').scrollspy({offset: {top: $('.subhead').offset().top - $('nav.navbar').height()}});
+			}
+		}
+	}
+
+	function processScroll() {
+		if ($('.subhead').length) {
+			var scrollTop = $(window).scrollTop();
+			if (scrollTop >= navTop && !isFixed) {
+				isFixed = true;
+				$('.subhead').addClass('subhead-fixed');
+
+				// Fix the container top
+				$(".container-main").css("top", $('.subhead').height() + $('nav.navbar').height());
+			} else if (scrollTop <= navTop && isFixed) {
+				isFixed = false;
+				$('.subhead').removeClass('subhead-fixed');
+			}
+		}
+	}
+
+	/**
+	 * USED IN: All list views to hide/show the sidebar
+	 */
+	window.toggleSidebar = function(force)
+	{
+		var context = 'jsidebar';
+
+		var $sidebar = $('#j-sidebar-container'),
+			$main = $('#j-main-container'),
+			$message = $('#system-message-container'),
+			$debug = $('#system-debug'),
+			$toggleSidebarIcon = $('#j-toggle-sidebar-icon'),
+			$toggleButtonWrapper = $('#j-toggle-button-wrapper'),
+			$toggleButton = $('#j-toggle-sidebar-button'),
+			$sidebarToggle = $('#j-toggle-sidebar');
+
+		var openIcon = 'icon-arrow-left-2',
+			closedIcon = 'icon-arrow-right-2';
+
+		var $visible = $sidebarToggle.is(":visible");
+
+		if (jQuery(document.querySelector("html")).attr('dir') == 'rtl')
+		{
+			openIcon = 'icon-arrow-right-2';
+			closedIcon = 'icon-arrow-left-2';
+		}
+
+		var isComponent = $('body').hasClass('component');
+
+		$sidebar.removeClass('span2').addClass('j-sidebar-container');
+		$message.addClass('j-toggle-main');
+		$main.addClass('j-toggle-main');
+		if (!isComponent) {
+			$debug.addClass('j-toggle-main');
+		}
+
+		var mainHeight = $main.outerHeight()+30,
+			sidebarHeight = $sidebar.outerHeight(),
+			bodyWidth = $('body').outerWidth(),
+			sidebarWidth = $sidebar.outerWidth(),
+			contentWidth = $('#content').outerWidth(),
+			contentWidthRelative = contentWidth / bodyWidth * 100,
+			mainWidthRelative = (contentWidth - sidebarWidth) / bodyWidth * 100;
+
+		if (force)
+		{
+			// Load the value from localStorage
+			if (typeof(Storage) !== "undefined")
+			{
+				$visible = localStorage.getItem(context);
+			}
+
+			// Need to convert the value to a boolean
+			$visible = ($visible == 'true');
+		}
+		else
+		{
+			$message.addClass('j-toggle-transition');
+			$sidebar.addClass('j-toggle-transition');
+			$toggleButtonWrapper.addClass('j-toggle-transition');
+			$main.addClass('j-toggle-transition');
+			if (!isComponent) {
+				$debug.addClass('j-toggle-transition');
+			}
+		}
+
+		if ($visible)
+		{
+			$sidebarToggle.hide();
+			$sidebar.removeClass('j-sidebar-visible').addClass('j-sidebar-hidden');
+			$toggleButtonWrapper.removeClass('j-toggle-visible').addClass('j-toggle-hidden');
+			$toggleSidebarIcon.removeClass('j-toggle-visible').addClass('j-toggle-hidden');
+			$message.removeClass('span10').addClass('span12');
+			$main.removeClass('span10').addClass('span12 expanded');
+			$toggleSidebarIcon.removeClass(openIcon).addClass(closedIcon);
+			$toggleButton.attr( 'data-original-title', Joomla.JText._('JTOGGLE_SHOW_SIDEBAR') );
+			$sidebar.attr('aria-hidden', true);
+			$sidebar.find('a').attr('tabindex', '-1');
+			$sidebar.find(':input').attr('tabindex', '-1');
+
+			if (!isComponent) {
+				$debug.css( 'width', contentWidthRelative + '%' );
+			}
+
+			if (typeof(Storage) !== "undefined")
+			{
+				// Set the last selection in localStorage
+				localStorage.setItem(context, true);
+			}
+		}
+		else
+		{
+			$sidebarToggle.show();
+			$sidebar.removeClass('j-sidebar-hidden').addClass('j-sidebar-visible');
+			$toggleButtonWrapper.removeClass('j-toggle-hidden').addClass('j-toggle-visible');
+			$toggleSidebarIcon.removeClass('j-toggle-hidden').addClass('j-toggle-visible');
+			$message.removeClass('span12').addClass('span10');
+			$main.removeClass('span12 expanded').addClass('span10');
+			$toggleSidebarIcon.removeClass(closedIcon).addClass(openIcon);
+			$toggleButton.attr( 'data-original-title', Joomla.JText._('JTOGGLE_HIDE_SIDEBAR') );
+			$sidebar.removeAttr('aria-hidden');
+			$sidebar.find('a').removeAttr('tabindex');
+			$sidebar.find(':input').removeAttr('tabindex');
+
+			if (!isComponent && bodyWidth > 768 && mainHeight < sidebarHeight)
+			{
+				$debug.css( 'width', mainWidthRelative + '%' );
+			}
+			else if (!isComponent)
+			{
+				$debug.css( 'width', contentWidthRelative + '%' );
+			}
+
+			if (typeof(Storage) !== "undefined")
+			{
+				// Set the last selection in localStorage
+				localStorage.setItem( context, false );
+			}
+		}
+	}
+});
diff --git a/core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini b/core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
new file mode 100644
index 00000000..b41aba55
--- /dev/null
+++ b/core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
@@ -0,0 +1,43 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+ISIS="Isis Administrator template"
+TPL_ISIS_CLEAR_CACHE="Clear Cache"
+TPL_ISIS_COLOR_DESC="Choose a colour for the navigation bar."
+TPL_ISIS_COLOR_HEADER_DESC="Choose a colour for the header."
+TPL_ISIS_COLOR_HEADER_LABEL="Header Colour"
+TPL_ISIS_COLOR_LABEL="Nav Bar Colour"
+TPL_ISIS_COLOR_LOGIN_BACKGROUND_DESC="Choose a colour for the background of the login screen."
+TPL_ISIS_COLOR_LOGIN_BACKGROUND_LABEL="Login Background Colour"
+TPL_ISIS_COLOR_SIDEBAR_DESC="Choose a colour for the Sidebar Background."
+TPL_ISIS_COLOR_SIDEBAR_LABEL="Sidebar Colour"
+TPL_ISIS_COLOR_LINK_DESC="Choose a colour for the Link."
+TPL_ISIS_COLOR_LINK_LABEL="Link Colour"
+TPL_ISIS_CONTROL_PANEL="Control Panel"
+TPL_ISIS_EDIT_ACCOUNT="Edit Account"
+TPL_ISIS_FIELD_ADMIN_MENUS_DESC="If you intend to use Joomla Administrator on a monitor, set this to 'No'. It will prevent the collapse of the Administrator menus when reducing the width of the window. Default is 'Yes'."
+TPL_ISIS_FIELD_ADMIN_MENUS_LABEL="Collapse Administrator Menu"
+TPL_ISIS_HEADER_DESC="Optional display of header."
+TPL_ISIS_HEADER_LABEL="Display Header"
+TPL_ISIS_INSTALLER="Installer"
+TPL_ISIS_ISFREESOFTWARE="Joomla is free software released under the GNU General Public License."
+TPL_ISIS_LOGIN_LOGO_DESC="Select or upload a custom logo for the login area of administrator template."
+TPL_ISIS_LOGIN_LOGO_LABEL="Login Logo"
+TPL_ISIS_LOGO_DESC="Upload a custom logo for the administrator template."
+TPL_ISIS_LOGO_LABEL="Logo"
+TPL_ISIS_LOGOUT="Logout"
+TPL_ISIS_PREVIEW="Preview %s"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
+TPL_ISIS_SKIP_TO_MAIN_CONTENT_HERE="Main content begins here"
+TPL_ISIS_STATUS_BOTTOM="Fixed bottom"
+TPL_ISIS_STATUS_DESC="Choose the location of the status module."
+TPL_ISIS_STATUS_LABEL="Status Module Position"
+TPL_ISIS_STATUS_TOP="Top"
+TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location."
+TPL_ISIS_STICKY_LABEL="Pinned Toolbar"
+TPL_ISIS_TOGGLE_MENU="Toggle Navigation"
+TPL_ISIS_TOOLBAR="Toolbar"
+TPL_ISIS_USERMENU="User Menu"
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini b/core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
new file mode 100644
index 00000000..fdc72b89
--- /dev/null
+++ b/core/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+ISIS="Isis Administrator template"
+TPL_ISIS_POSITION_BOTTOM="Bottom"
+TPL_ISIS_POSITION_CPANEL="Cpanel"
+TPL_ISIS_POSITION_CP_SHELL="Unused"
+TPL_ISIS_POSITION_DEBUG="Debug"
+TPL_ISIS_POSITION_FOOTER="Footer"
+TPL_ISIS_POSITION_ICON="Quick Icons"
+TPL_ISIS_POSITION_LOGIN="Login"
+TPL_ISIS_POSITION_MENU="Menu"
+TPL_ISIS_POSITION_POSTINSTALL="Postinstall"
+TPL_ISIS_POSITION_STATUS="Status"
+TPL_ISIS_POSITION_SUBMENU="Submenu"
+TPL_ISIS_POSITION_TITLE="Title"
+TPL_ISIS_POSITION_TOOLBAR="Toolbar"
+TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/administrator/templates/isis/less/blocks/_chzn-override.less b/core/administrator/templates/isis/less/blocks/_chzn-override.less
new file mode 100644
index 00000000..485771e9
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_chzn-override.less
@@ -0,0 +1,201 @@
+.chzn-container {
+    .chzn-drop {
+        border-radius: 0 0 3px 3px;
+    }
+}
+
+// Fluid width
+.control-group .chzn-container {
+    max-width: 100%;
+    .chzn-choices li.search-field,
+    .chzn-choices li.search-field input { // Fix for #13594
+        width: 100% !important; 
+    }
+}
+
+.chzn-container-single {
+    .chzn-single {
+        background-color: @white;
+        background-clip: inherit;
+        background-image: none;
+        border: 1px solid @inputBorder;
+        border: 1px solid rgba(0, 0, 0, 0.2);
+        border-radius: 3px;
+        box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+        height: auto;
+        line-height: 26px;
+        div {
+            background-color: @btnBackground;
+            border-left: 1px solid @inputBorder;
+            bottom: 0;
+            height: auto;
+            text-align: center;
+            width: 28px;
+            b {
+                background-image: none;
+                display: inline-block;
+                &:after {
+                    content: '\E011';
+                    font-family: IcoMoon;
+                }
+            }
+        }       
+        abbr {
+            background: none;
+            right: 36px;
+            top: 0;
+            &:before {
+                font-family: IcoMoon;
+                content: '\0049';
+                font-size: 10px;
+                line-height: 26px;
+            }
+            &:hover {
+                color: #000;
+            }
+        }
+    }
+    .chzn-search {
+        &:after {
+            content: '\0053';
+            font-family: IcoMoon;
+            position: relative;
+            right: 20px;
+            top: 2px;
+        }
+        input[type="text"] {
+            background: none;
+            border-radius: @inputBorderRadius;
+            border: 1px solid @inputBorder;
+            box-shadow: none;
+            height: 25px;
+            &:focus {
+                border-color: @inputBorderHighlight;
+            }
+        }
+    } 
+    .chzn-drop {
+        background-clip: padding-box;
+        border-color: @inputBorderHighlight;
+        border-radius: 0 0 3px 3px;
+    }
+}
+.chzn-container-active {
+    .chzn-single {
+        color: @inputBorderHighlight;
+    }
+    &.chzn-with-drop {
+        .chzn-single {
+            background-image: none;
+            border: 1px solid @inputBorderHighlight;
+            border-bottom-left-radius: 0;
+            border-bottom-right-radius: 0;
+            div {
+                background-color: @btnBackground;
+                border-bottom: 1px solid @inputBorder;
+                border-bottom-left-radius: @inputBorderRadius;
+                border-left: 1px solid @inputBorder;
+                b {
+                    &:after {
+                        content: '\E00F';
+                        font-family: IcoMoon;
+                    }
+                }
+            }
+        }
+    }
+    &.chzn-container-multi {
+        .chzn-choices {
+            border: 1px solid @inputBorderHighlight;
+            box-shadow: none;
+        }
+    }
+}
+.chzn-container .chzn-results {
+    background-color: @white;
+    border-radius: 0 0 @inputBorderRadius @inputBorderRadius;
+    margin: 0;
+    padding: 0;
+    li.highlighted {
+        background-color: @inputBorderHighlight;
+        background-image: none;
+    }
+}
+.chzn-color[rel="value_"] div {
+    background-color: @btnBackground;
+    border-left: 1px solid @inputBorder;
+}
+.chzn-color-state.chzn-single,
+.chzn-color.chzn-single[rel="value_0"],
+.chzn-color.chzn-single[rel="value_1"],
+.chzn-color-state.chzn-single[rel="value_-1"],
+.chzn-color-state.chzn-single[rel="value_-2"],
+.chzn-color.chzn-single[rel="value_hide"],
+.chzn-color.chzn-single[rel="value_show_no_link"],
+.chzn-color.chzn-single[rel="value_show_with_link"] {
+    div {
+        background-color: transparent !important;
+        border: none !important;
+    }
+} 
+.chzn-container-active .chzn-choices {
+    border: 1px solid @inputBorderHighlight;
+}
+.chzn-container-multi {
+    .chzn-choices {
+        background-image: none;
+        border-radius: @inputBorderRadius;
+        border: 1px solid @inputBorder;
+        li.search-choice {
+            background-color: @inputBorderHighlight;
+            background-image: none;
+            border: 0;
+            box-shadow: none;
+            color: #fff;
+            line-height: 20px;
+            padding: 0 7px;
+            .search-choice-close {
+                color: #f5f5f5;
+                display: inline-block;
+                margin-left: 5px;
+                position: relative;
+                top: 0;
+                left: 0;
+                background-image: none;
+                font-size: inherit;
+                &:hover {
+                    text-decoration: none;
+                }
+                &:before {
+                    font-family: IcoMoon;
+                    content: '\004A';
+                    position: relative;
+                    right: 1px;
+                    top: 0;
+                }
+            }
+        }
+    }
+}
+.js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container {
+    margin: 1px 0;
+    padding: 0 !important;
+}
+
+/* Chosen color styles */
+.chzn-color.chzn-single[rel="value_1"],
+.chzn-color-reverse.chzn-single[rel="value_0"],
+.chzn-color-state.chzn-single[rel="value_1"],
+.chzn-color.chzn-single[rel="value_show_no_link"],
+.chzn-color.chzn-single[rel="value_show_with_link"] {
+	.buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	color: #ffffff;
+}
+
+.chzn-color-state.chzn-single[rel="value_0"],
+.chzn-color-state.chzn-single[rel="value_-2"] {
+    .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	color: #ffffff;
+}
diff --git a/core/administrator/templates/isis/less/blocks/_custom.less b/core/administrator/templates/isis/less/blocks/_custom.less
new file mode 100644
index 00000000..3b0a369d
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_custom.less
@@ -0,0 +1,294 @@
+// Custom
+
+/* Links */
+.j-links-separator {
+	margin: 20px 0px;
+	width: 100%;
+	height: 0px;
+	border-top: 2px solid #DDDDDD;
+}
+/* Main Container & System Debug Padding */
+.container-main,
+#system-debug {
+	padding-bottom: 50px;
+}
+
+/* Pagination in toolbar */
+.pagination-toolbar {
+	margin: 0;
+}
+
+.pagination-toolbar a {
+	line-height: 26px;
+}
+/* Toolbar dropdown */
+.pull-right > .dropdown-menu {
+	left: auto;
+	right: 0;
+}
+
+/* Nav list filters */
+.nav-filters hr {
+	margin: 5px 0;
+}
+/* Module Assignment Tab */
+#assignment.tab-pane {
+	min-height: 500px;
+}
+
+@media (max-width: @lg-max) {
+	.container-fluid {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+
+@media (min-width: @md) {
+	body {
+		padding-top: 30px;
+	}
+
+	.nav-collapse.collapse.in {
+		height: auto !important;
+	}
+}
+
+@media (max-width: @md-max) {
+	.container-fluid {
+		padding-left: 0;
+		padding-right: 0;
+	}
+}
+
+@media (max-width: @sm-max) {
+
+	.pagination a {
+		padding: 5px;
+	}
+
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7 {
+		display: none;
+	}
+
+	.btn-group + .btn-group {
+		margin-left: 10px;
+	}
+}
+
+/* Extension type labels */
+.info-labels {
+	margin-top: -5px;
+	margin-bottom: 10px;
+}
+
+/* Sortable list*/
+.sortable-handler.inactive {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+/* Joomla and Extension update message */
+.alert-joomlaupdate {
+	text-align: center;
+	button {
+		vertical-align: baseline;
+	}
+}
+.j-jed-message {
+	line-height: 2em;
+	color:#333333;
+}
+
+/* Flash uploader */
+.upload-queue > li > span,
+.upload-queue > li > a {
+	margin: 0 2px;
+}
+
+.upload-queue .file-remove {
+	float: right;
+}
+/* z-index issues */
+.moor-box {
+	z-index: 3;
+}
+
+.admin .chzn-container .chzn-drop {
+	z-index: 1060;
+}
+
+/* Item associations */
+.item-associations {
+	margin: 0;
+}
+
+.item-associations li {
+	list-style: none;
+	display: inline-block;
+	margin: 0 0 3px 0;
+}
+
+.item-associations li a {
+	color: #ffffff;
+}
+
+/* Content Languages flag */
+#flag img {
+	padding-top: 6px;
+	vertical-align: top;
+}
+/* Tweaking of tooltips */
+.tooltip {
+	max-width: 400px;
+}
+
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+
+th .tooltip-inner {
+	font-weight: normal;
+}
+
+.tooltip.hasimage {
+	opacity: 1;
+}
+
+/* Permissions dropdown display */
+#permissions-sliders {
+	.chzn-container {
+		margin-top: -5px;
+		position: absolute;
+	}
+	.table td {
+		padding: 8px 8px 9px;
+	}
+}
+
+.img-preview > img {
+	max-height: 100%;
+}
+
+/* Help site refresh button*/
+#helpsite-refresh {
+	padding: 4px 12px;
+	vertical-align: top;
+}
+.alert-no-items {
+	margin-top: 20px;
+}
+@media (max-width: @md-max) {
+	html[dir=rtl] #toolbar #toolbar-options,
+	html[dir=rtl] #toolbar #toolbar-help,
+	#toolbar #toolbar-options,
+	#toolbar #toolbar-help {
+		float: none;
+	}
+}
+
+/* Widen the drop downs for the Permissions Field */
+#permissions-sliders .input-small {
+	width: 120px;
+}
+.editor {
+	overflow: hidden;
+	position: relative
+}
+
+.editor textarea.mce_editable {
+	box-sizing: border-box;
+}
+/* For grid.boolean */
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/publish_r.png');
+}
+
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/icon-16-allow.png');
+}
+
+/* Box-shadow from focused fields */
+textarea, input, .uneditable-input {
+	box-shadow: none !important;
+}
+textarea:focus, input:focus, .uneditable-input:focus {
+	box-shadow: none;
+	border: 1px solid @inputBorderHighlight;
+}
+
+/* Stats plugin */
+.js-pstats-data-details dd {
+	margin-left: 240px;
+}
+.js-pstats-data-details dt {
+	width: 220px;
+}
+
+/* ACL Permission page */
+#permissions,
+#page-permissions {
+	table {
+		td {
+			vertical-align: middle;
+		}
+		select {
+			margin-bottom: 0;
+		}
+	}
+}
+
+.js-stools-container-bar .btn-primary .caret {
+  border-bottom: 4px solid @white;
+}
+
+.input-append .add-on, .input-append .btn, .input-append .btn-group > .dropdown-toggle, .input-prepend .add-on, .input-prepend .btn, .input-prepend .btn-group > .dropdown-toggle {
+  -webkit-border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
+  -moz-border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
+  border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
+}
+
+/* Removes Text Shadows */
+.alert,
+.alert-options,
+.badge,
+.breadcrumb > li,
+.close,
+.input-append .add-on,
+.input-prepend .add-on,
+.label,
+.nav-header,
+.nav-list .nav-header,
+.nav-list > .active > a,
+.nav-list > .active > a:focus,
+.nav-list > .active > a:hover,
+.nav-list > li > a,
+.nav-tabs.nav-dark,
+.navbar .brand,
+.navbar .nav > li > a,
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a,
+.navbar-inverse .navbar-search .search-query.focused,
+.navbar-inverse .navbar-search .search-query:focus,
+.progress .bar,
+.subhead {
+  text-shadow: none;
+}
+
+/* Popover minimum height - overwrite bootstrap default */
+.popover-content {
+    min-height: 33px;
+}
+
+/* Overrid font-weight 200 */
+.lead, .navbar .brand, .hero-unit, .hero-unit .lead {
+	font-weight: 400;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_editors.less b/core/administrator/templates/isis/less/blocks/_editors.less
new file mode 100644
index 00000000..12877e14
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_editors.less
@@ -0,0 +1,7 @@
+// Editors
+
+.CodeMirror {
+	height: calc(~"100vh - 400px");
+	min-height: 400px;
+	max-height: 800px;
+}
diff --git a/core/administrator/templates/isis/less/blocks/_forms.less b/core/administrator/templates/isis/less/blocks/_forms.less
new file mode 100644
index 00000000..ff35a3e5
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_forms.less
@@ -0,0 +1,352 @@
+// Forms
+
+
+// Normalize LTR Label (JBS request)
+// --------------------------
+
+.form-horizontal {
+	// Float the labels left
+	.control-label {
+		padding-right: 5px;
+		text-align: left;
+		// Set a width for the spacer hr so it shows
+		.spacer hr {
+			width: 380px;
+			@media (max-width: 420px) {
+				width: 220px;
+			}
+		}
+	}
+	.field-spacer>.control-label{
+		width: auto;
+	}
+	#jform_catid_chzn {
+		vertical-align: middle;
+	}
+}
+
+.form-vertical {
+	.control-label {
+		> label {
+			display: inline-block;
+			.ie7-inline-block();
+		}
+	}
+	.controls {
+		margin-left: 0;
+	}
+}
+@media (max-width: @lg-max) {
+	.form-horizontal-desktop {
+		.control-label {
+			float: none;
+			width: auto;
+			padding-right: 0;
+			padding-top: 0;
+			text-align: left;
+			> label {
+				display: inline-block;
+				.ie7-inline-block();
+			}
+		}
+		.controls {
+			margin-left: 0;
+		}
+	}
+}
+
+@media (max-width: @xl-max) {
+	.row-fluid .row-fluid .form-horizontal-desktop {
+		.control-label {
+			float: none;
+			width: auto;
+			padding-right: 0;
+			padding-top: 0;
+			text-align: left;
+			> label {
+				display: inline-block;
+				.ie7-inline-block();
+			}
+		}
+		.controls {
+			margin-left: 0;
+		}
+	}
+}
+
+.form-inline-header {
+	margin: 5px 0;
+	.control-group,
+	.control-label,
+	.controls {
+		display: inline-block;
+		.ie7-inline-block();
+	}
+	.control-label {
+		width: auto;
+		padding-right: 10px;
+	}
+	.controls {
+		padding-right: 20px;
+	}
+}
+/* Make fieldsets responsive */
+fieldset[class^="form-"] {
+	min-width: 100%;
+}
+/* Make fieldsets responsive in Firefox. See http://getbootstrap.com/css/#tables-responsive */
+@-moz-document url-prefix() {
+  fieldset[class^="form-"] { display: table-cell; }
+}
+
+/* Display checkboxes without bullets in list */
+fieldset.checkboxes input {
+	float: left;
+}
+
+fieldset.checkboxes li {
+	list-style: none;
+}
+
+/* Make form elements responsive */
+.control-group,
+.controls,
+.controls input[type="text"],
+.controls input[type="number"],
+.controls input[type="email"],
+.controls select,
+.controls textarea
+{
+	max-width: 100%;
+}
+
+/* Min-width on buttons */
+.controls .btn-group > .btn {
+	min-width: 50px;
+	margin-left: -1px;
+}
+
+.controls .btn-group.btn-group-yesno {
+	width: 220px;
+	max-width: 100%;
+	> .btn {
+		width: 50%;
+		min-width: 40px;
+		padding: 2px 0;
+	}
+}
+
+/* Title field */
+input.input-large-text {
+	font-size: 18px;
+	line-height: 22px;
+	height: auto;
+}
+
+/* Customize Textarea Resizing */
+textarea {
+	resize: both;
+}
+
+textarea.vert {
+	resize: vertical;
+}
+
+textarea.noResize {
+	resize: none;
+}
+
+/* Repeatable SubForm */
+.subform-repeatable {
+	padding-right: 10px;
+	> .btn-toolbar {
+		margin: 0;
+		.group-add {
+			line-height: 26px;
+			width: 56px;
+			font-size: 13px;
+			margin-left: 28px;
+		}
+	}
+}
+.subform-repeatable-group {
+	margin-top: 20px;
+	margin-left: 28px;
+	border: 1px solid @inputBorder;
+	padding: 8px 25px 15px;
+	position: relative;
+	border-radius: @inputBorderRadius;
+	> .btn-toolbar {
+		margin: 0;
+		.btn-group {
+			margin-right: 0px;
+			margin-top: -1px;
+			position: static;
+		}
+		.btn {
+			font-size: 13px;
+			line-height: 26px;
+			background-color: #F3F3F3;
+			position: absolute;
+			span {
+				vertical-align: middle;
+				line-height: 11px;
+			}
+			&.btn-success {
+				color: #378137;
+				bottom: 0;
+				right: 0;
+				border-radius: @inputBorderRadius 0 0 0;
+				border-width: 1px 0 0 1px;
+				padding-top: 1px;
+				.icon-plus:before {
+					content: "]";
+				}
+			}
+			&.btn-danger {
+				color: #942a25;
+				top: 0;
+				right: 0;
+				border-radius: 0 0 0 @inputBorderRadius;
+				border-width: 0 0 1px 1px;
+				.icon-minus:before {
+					content: "I";
+
+				}
+			}
+			&.btn-primary {
+				color: #24748c;
+				color: #333;
+				right: 100%;
+				top: 50%;
+				margin-top: -27px;
+				margin-right: 1px;
+				border-radius: @inputBorderRadius 0 0 @inputBorderRadius;
+				border-width: 1px 0 1px 1px;
+				line-height: 52px;
+				.icon-move:before {
+					content: "Z";
+				}
+			}
+			[class^="icon-"], [class*=" icon-"] {
+				margin: 0;
+			}
+			&:hover {
+				background-color: #E6E6E6;
+			}
+		}
+	}
+	&:nth-child(odd) {
+	}
+	&:nth-child(even) {
+	}
+	&:last-of-type {
+	}
+	.control-group:last-of-type {
+		margin-bottom: 10px;
+	}
+}
+@media (max-width: @lg-max) {
+	.subform-repeatable-group > .btn-toolbar .btn-group {
+		margin-bottom: 10px;
+	}
+}
+
+.subform-table-layout {
+	.control-group {
+		margin-bottom: 10px;
+		&:last-of-type {
+			margin-bottom: 0;
+		}
+	}
+	.controls {
+		padding-right: 20px;
+	}
+	.btn-group {
+
+	}
+	input {
+		width: 100%;
+		max-width: 206px;
+	}
+	table .btn-group {
+		margin: 0 7px;
+	}
+}
+@media (max-width: 1024px) {
+	.subform-table-layout {
+		.subform-repeatable {
+			padding-right: 0;
+			tbody td:last-of-type {
+				text-align: right;
+				padding-bottom: 15px;
+			}
+		}
+		table, thead, tbody, th, td, tr {
+			display: block;
+		}
+		table {
+			border: 1px solid #ddd;
+		}
+		thead {
+
+			th {
+				position: absolute;
+				top: -9999px;
+				left: -9999px;
+				&:last-of-type {
+					position: static;
+					width: 100% !important;
+					text-align: right;
+					box-sizing: border-box;
+					border-left: 0;
+				}
+			}
+		}
+		tr {
+			margin: 0;
+    		padding: 0;
+			border: 0;
+		}
+		td {
+			border: none;
+			position: relative;
+			padding-left: 50%;
+		}
+		tbody {
+			td:first-of-type {
+				padding-top: 15px;
+				border-top: 1px solid #ddd;
+				&:before {top:18px;}
+			}
+		}
+
+		td:before {
+			content: attr(data-column);
+			position: absolute;
+			top: 13px;
+			left: 10px;
+			padding-right: 10px;
+		}
+	}
+}
+
+/* Remove unneeded space between label and field in vertical forms */
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0;
+
+	.form-horizontal & {
+		padding-top: 5px;
+	}
+}
+
+/* Align btn-group to label */
+.form-horizontal .controls > .radio.btn-group:first-child {
+	padding-top: 0;
+}
+
+/* Align btn-group-yesno to label */
+.form-horizontal .controls > .radio.btn-group-yesno:first-child {
+	padding-top: 2px;
+}
diff --git a/core/administrator/templates/isis/less/blocks/_global.less b/core/administrator/templates/isis/less/blocks/_global.less
new file mode 100644
index 00000000..614f734b
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_global.less
@@ -0,0 +1,98 @@
+// Global
+
+/* Body */
+html {
+	height: 100%;
+}
+
+body {
+	height: 100%;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	box-sizing: border-box;
+}
+
+a:hover,
+a:active,
+a:focus {
+	outline: none;
+}
+
+/* Typography */
+.small {
+	font-size: 11px;
+}
+
+.row-even .small,
+.row-odd .small,
+.row-even .small a,
+.row-odd .small a {
+	color: #888;
+}
+
+/* Page Title in Content */
+.content-title {
+	font-size: 24px;
+	font-weight: normal;
+	line-height: 26px;
+	margin-top: 0;
+}
+
+/* Content */
+.well .page-header {
+	margin: -10px 0 18px 0;
+	padding-bottom: 5px;
+}
+
+.well .module-title.nav-header {
+	padding: 0 0 7px;
+	margin: 0;
+	font-size: 13px;
+}
+
+.well .row-even p,
+.well .row-odd p {
+	margin-bottom: 0;
+}
+
+/* Headings */
+
+h1, h2, h3, h4, h5, h6 {
+	margin: (@baseLineHeight / 1.5) 0;
+}
+
+h1 {
+	font-size: 26px;
+	line-height: 28px;
+}
+
+h2 {
+	font-size: 22px;
+	line-height: 24px;
+}
+
+h3 {
+	font-size: 18px;
+	line-height: 20px;
+}
+
+h4 {
+	font-size: 14px;
+	line-height: 16px;
+}
+
+h5 {
+	font-size: 13px;
+	line-height: 15px;
+}
+
+h6 {
+	font-size: 12px;
+	line-height: 14px;
+}
+
+.truncate {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
diff --git a/core/administrator/templates/isis/less/blocks/_header.less b/core/administrator/templates/isis/less/blocks/_header.less
new file mode 100644
index 00000000..6d604a1a
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_header.less
@@ -0,0 +1,68 @@
+// header
+
+.header {
+	background-color: @headerBackground;
+	border-top: 1px solid rgba(255, 255, 255, 0.2);
+	padding: 8px 25px;
+}
+
+@media (max-width: @md-max) {
+	.header {
+		padding: 4px 18px;
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+}
+
+.header .navbar-search {
+	margin-top: 0;
+}
+
+@media (max-width: @lg-max) {
+	.header .navbar-search {
+		border-top: 0;
+		border-bottom: 0;
+		.box-shadow(none);
+	}
+}
+
+/* Logo */
+.container-logo {
+	float: right;
+	text-align: right;
+}
+
+.logo {
+    width: auto;
+    max-width: 100%;
+    max-height: 36px;
+    height: auto;
+}
+
+/* Page Title */
+.page-title {
+	color: white;
+	font-weight: normal;
+	font-size: 20px;
+	line-height: 36px;
+	margin: 0;
+	[class^="icon-"],
+	[class*=" icon-"] {
+		margin-right: 16px;
+	}
+}
+
+@media (max-width: @md-max) {
+	.container-logo {
+		display: none;
+	}
+
+	.page-title {
+		font-size: 18px;
+		line-height: 28px;
+		[class^="icon-"],
+		[class*=" icon-"] {
+			margin-right: 10px;
+		}
+	}
+}
diff --git a/core/administrator/templates/isis/less/blocks/_login.less b/core/administrator/templates/isis/less/blocks/_login.less
new file mode 100644
index 00000000..7f0c02aa
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_login.less
@@ -0,0 +1,87 @@
+// Login
+
+.view-login {
+	background-color: @loginBackground;
+	padding-top: 0;
+
+	.container {
+		width: 300px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-top: -206px;
+		margin-left: -150px;
+	}
+	.navbar-fixed-bottom {
+		padding-left: 20px;
+		padding-right: 20px;
+		text-align: center;
+	}
+	.navbar-fixed-bottom,
+	.navbar-fixed-bottom a {
+		color: #FCFCFC;
+	}
+	.navbar-inverse.navbar-fixed-bottom,
+	.navbar-inverse.navbar-fixed-bottom a {
+		color: @gray;
+	}
+	.well {
+		padding-bottom: 0;
+	}
+	.login-joomla {
+		position: absolute;
+		left: 50%;
+		height: 24px;
+		width: 24px;
+		margin-left: -12px;
+		font-size: 22px;
+	}
+	.navbar-fixed-bottom {
+		position: absolute;
+	}
+	.input-medium {
+		width: 176px;
+	}
+	#lang_chzn {
+		width: 233px !important;
+		max-width: none;
+		.chzn-single div {
+			width:43px;
+		}
+	}
+	.input-prepend .add-on, .controls .btn-group > .btn {
+		margin-left:0;
+	}
+}
+
+.navbar-inverse {
+	color: @textColor;
+}
+
+.login {
+	.btn-large {
+		margin-top: 15px;
+	}
+	.form-inline .btn-group {
+		display:block;
+	}
+}
+
+@media (max-width: @sm-max) {
+	.login .chzn-single {
+		width: 222px !important;
+	}
+
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+}
+
+
+@media (max-width: @xs-max) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_media.less b/core/administrator/templates/isis/less/blocks/_media.less
new file mode 100644
index 00000000..8154a7c5
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_media.less
@@ -0,0 +1,263 @@
+// Media 
+
+/* Media Manager folder icon override */
+ul.manager .height-50 .icon-folder-2 {
+	height: 35px;
+	width: 35px;
+	line-height: 35px;
+	font-size: 30px;
+}
+
+#imageForm {
+	margin: -25px 0 0;
+	.well {
+		margin-bottom: 5px;
+	}
+}
+.thumbnails-media {
+	@thumbSize:100px;
+	margin-left: 0;
+	.thumbnail {
+		background-color: #f4f4f4;
+		border-radius: @inputBorderRadius;
+		border: 0;
+		box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05) inset;
+		padding: 0px;
+		height: @thumbSize;
+		width: @thumbSize;
+		margin: 8px 16px;
+		margin-left: 0 !important;
+		position: relative;
+		text-align: center;
+		overflow: hidden;
+		.close {
+			background-color: #ccc;
+			border-left: 1px solid rgba(0, 0, 0, 0.1);
+		    height: 22px;
+		    line-height: 22px;
+		    opacity: 0.3;
+		    text-align: center;
+		    width: 22px;
+		    top: 0;
+		    right: 0;
+		    &:hover {
+		    	background-color: #bbb;
+		    }
+		}
+		*, *:before {
+			-webkit-transition: all 0.2s ease;
+			transition: all 0.2s ease;
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+	    }
+	    input[type="radio"], input[type="checkbox"] {
+			margin: 0;
+			opacity: 0.55;
+			position: absolute;
+			top: 5px;
+			left: 5px;
+		}
+		.controls, .imginfoBorder {
+			display: none;
+		}
+	}
+	.imgThumb {
+	    position: relative;
+	    z-index: 1;
+	    width:100%;
+	    display: inline-block;
+	    input {
+	    	display: none;
+	    }
+	    label, .imgThumbInside {
+	    	display: block;
+	    	line-height: @thumbSize;
+	    	position: relative;
+	    	width: 100%;
+	    	border-radius: @inputBorderRadius;
+	    	overflow: hidden;
+	    	&:before {
+		  		font-family: "IcoMoon";
+    			font-style: normal;
+    			content: 'G';
+    			position: absolute;
+    			top: 0;
+    			right: 0;
+    			background-color: @btnSuccessBackground;
+    			color: #fff;
+    			line-height: 26px;
+    			width: 26px;
+				-webkit-transform: scale(0.5);
+				transform: scale(0.5);
+				opacity: 0;
+				border-color: rgba(0, 0, 0, 0.2);
+				box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+				border-radius: 0 @inputBorderRadius;
+	    	}
+	    }
+	    img {
+	    	width: auto;
+	    }
+	}
+	.selected, .imgInput {
+		:checked + label, .imgThumbInside {
+		    background-color: #ddd;
+			&:before {
+				-webkit-transform: scale(1);
+				transform: scale(1);
+				opacity: 1;
+			}
+			&:after {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				content: '';
+				border: 3px solid @btnSuccessBackground;
+				border-radius: 5px;
+			}
+		}
+	}
+	.imgDelete a.close, .imgPreview a {
+	    padding: 0;
+	    position: absolute;
+	    left: 0;
+	    z-index: 1;
+	    height: 26px;
+	    width: 26px;
+	}
+	.imgPreview a {
+		width: 100%;
+	}
+	.imgDelete a.close {
+	    background-color: @btnDangerBackground;
+	    border-color: @btnDangerBackground rgba(0, 0, 0, 0.2) rgba(0, 0, 0, 0.2) @btnDangerBackground;
+	    top: 0;
+	    line-height: 28px;
+	    font-size: 12px;
+	    padding-left: 1px;
+	    color: #fff;
+		border-bottom-right-radius: @inputBorderRadius;
+		border-top-left-radius: @inputBorderRadius;
+		z-index: 10;
+		opacity: 0;
+		-webkit-transform: scale(0.5);
+		transform: scale(0.5);
+		&:hover {
+			background-color: darken(@btnDangerBackground, 15%);
+		}
+	}
+	.thumbnail:hover .imgDelete a.close {
+		opacity: 1;
+		-webkit-transform: scale(1);
+		transform: scale(1);
+	}
+	.imgPreview a, .imgDetails {
+		position: absolute;
+		left:0;
+		text-align: left;
+	    background-color: #fff;
+	    border-color: rgba(0, 0, 0, 0.2);
+	    bottom: 0;
+	    line-height: 26px;
+		border: 1px solid rgba(0, 0, 0, 0.1);
+		border-width: 1px; 
+		border-radius: 0 @inputBorderRadius 0 0;
+		z-index: 1;
+		&:hover {
+			background-color: #eee;
+		}
+	}
+	.imgDetails {
+		padding: 0 5px;
+		line-height: 20px;
+		color: #555;
+	}
+	.imgFolder {
+		span {
+			line-height: 90px;
+			font-size: 38px;
+			margin: 0;
+			width: auto;
+		}
+	}
+	.imgFolder + .imgDetails {
+		color: inherit;
+	}
+}
+
+// Media Manager
+.com_media {
+	.media a + a {
+		margin-left: -1px;
+	}
+	.tree-holder {
+		padding: 0 15px;
+	}
+}
+#folderframe.thumbnail {
+	border: 0;
+	box-shadow: none;
+	padding: 0;
+}
+#mediamanager-form {
+	margin: 0 -10px;
+	> .muted {
+		padding: 0px;
+	}
+	.checkbox {
+		padding-left: 30px;
+		margin-bottom: 15px;
+		input {
+			margin-top: 3px;
+		}
+	}
+	.thumbnails {
+		.thumbnail {
+			height: 120px;
+			width: 120px;
+			margin: 0 18px 18px 0;
+		}
+		.imgThumb label, .imgTotal {
+			line-height: 120px;
+		}
+	}
+	.icon-search::before {
+		padding-right: 5px;
+		padding-left: 1px;
+	}
+	.height-50 {
+	    background-color: #fafafa;
+	    height: 77px;
+	    position: relative;
+	    z-index: 1;
+	    width:100%;
+	    display: inline-block;
+	    a, .icon-folder-2 {
+	    	display: inline-block;
+	    	line-height: 75px;
+	    	margin-top: -1px;
+	    }
+	    a {
+	    	&:after {
+			    bottom: 0;
+			    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.08) inset;
+			    content: "";
+			    display: block;
+			    left: 0;
+			    overflow: hidden;
+			    position: absolute;
+			    right: 0;
+			    top: 0;
+			}
+	    }
+	    .icon-folder-2 {
+	    	font-size: 40px;
+	    }
+	}
+}
+
+.uploadform {
+	margin-top: 20px;
+}
diff --git a/core/administrator/templates/isis/less/blocks/_modals.less b/core/administrator/templates/isis/less/blocks/_modals.less
new file mode 100644
index 00000000..18c3e3ea
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_modals.less
@@ -0,0 +1,52 @@
+// Modals
+
+body.modal-open {
+	-ms-overflow-style: none;
+}
+
+.modal-header {
+  padding: 0 20px;
+  text-align: left;
+  h3 {
+  	font-weight: normal;
+  	line-height: 50px;
+  }
+  .close {
+    width: 50px;
+    margin-top: 0;
+    margin-right: -15px;
+    font-size: 2rem;
+    line-height: 50px;
+    border-left: 1px solid #ccc;
+  }
+}
+
+.modal-body {
+  padding: 0;
+  width: 100%;
+  height: auto;
+  .container-fluid {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+}
+
+.modal-footer {
+	clear: both;
+}
+
+.contentpane {
+  padding: 10px;
+  height: auto
+}
+
+@media (min-width: @md) {
+	.row-fluid .modal-batch [class*="span"] {
+		margin-left: 0;
+	}
+}
+
+/* Component pop-up */
+.container-popup {
+	padding: 28px 10px 10px 10px;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_navbar.less b/core/administrator/templates/isis/less/blocks/_navbar.less
new file mode 100644
index 00000000..e6eece66
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_navbar.less
@@ -0,0 +1,272 @@
+// Navbar
+
+body .navbar,
+body .navbar-fixed-top {
+	margin-bottom: 0;
+}
+
+.navbar-inner {
+	min-height: 0;
+	background: @navbarBackground;
+	background-image: none;
+	filter: none;
+	.container-fluid {
+		padding-left: 10px;
+		padding-right: 10px;
+		font-size: 15px;
+	}
+}
+
+.navbar-inverse {
+	.navbar-inner {
+		background: @navbarInverseBackground;
+		background-image: none;
+		filter: none;
+	}
+}
+
+.navbar {
+	.navbar-text {
+		line-height: 30px;
+	}
+	.admin-logo {
+		float: left;
+		padding: 7px 12px 0px 15px;
+		font-size: 16px;
+		color: @gray;
+		&:hover {
+			color: @grayDark;
+		}
+		.navbar-inverse& {
+			color: #d9d9d9;
+			&:hover {
+				color: #ffffff;
+			}
+		}
+	}
+	.brand {
+		float: right;
+		display: block;
+		padding: 6px 10px;
+		margin-left: -20px;
+		font-size: inherit;
+		font-weight: normal;
+		&:hover,
+		&:focus {
+			text-decoration: none;
+		}
+	}
+	.nav > li > a {
+		padding: 6px 10px;
+		&:hover {
+			color: white;
+		}
+		&:hover span.carot {
+			border-bottom-color: #fff;
+    		border-top-color: #fff;
+		}
+	}
+	.dropdown-menu,
+	.nav-user {
+		font-size: 13px;
+	}
+	.nav-user .dropdown-menu li span {
+		padding-left: 10px;
+	}
+	.nav > li ul {
+		overflow-y: auto;
+		overflow-x: hidden;
+		-webkit-overflow-scrolling: touch;
+		-moz-overflow-scrolling: touch;
+		-ms-overflow-scrolling: touch;
+		-o-overflow-scrolling: touch;
+		overflow-scrolling: touch;
+		height: auto;
+		max-height: 500px;
+		margin: 0;
+		&::-webkit-scrollbar {
+			-webkit-appearance: none;
+			width: 7px;
+		}
+		&::-webkit-scrollbar-thumb {
+			border-radius: 4px;
+			background-color: rgba(0,0,0,.5);
+			-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+		}
+	}
+	.nav > li > .dropdown-menu:after {
+		display: none;
+	}
+	.nav > .dropdown.open:after {
+		content: '';
+		display: inline-block;
+		border-left: 6px solid transparent;
+		border-right: 6px solid transparent;
+		border-bottom: 6px solid #fff;
+		position: absolute;
+		top: 25px;
+		left: 10px;
+		z-index: 1001;
+	}
+	.empty-nav {
+		display: none;
+	}
+}
+
+.navbar-fixed-top,
+.navbar-static-top {
+	.navbar-inner {
+		.box-shadow(none);
+	}
+}
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
+	background-image: none;
+}
+
+// Fixed to bottom
+.navbar-fixed-bottom {
+	bottom: 0;
+	.navbar-inner {
+		.box-shadow(none);
+	}
+}
+
+.navbar .btn-navbar {
+	background: #17568c;
+	border: 1px solid #0D2242;
+	margin-bottom: 2px;
+}
+
+@media (max-width: @md-max) {
+	.navbar .admin-logo {
+		margin-left: 10px;
+		padding: 9px 9px 0 9px;
+	}
+}
+
+/* Search Module */
+.navbar-search .search-query {
+	background: rgba(255, 255, 255, 0.3);
+}
+
+@media (max-width: @lg-max) {
+	.navbar {
+		.nav {
+			font-size: 13px;
+			margin: 0 2px 0 0;
+			> li {
+				> a {
+					padding: 6px;
+				}
+			}
+		}
+	}
+}
+
+@media (max-width: @md-max) {
+	.navbar-search.pull-right {
+		float: none;
+		text-align: center;
+	}
+}
+
+@media (max-width: 738px) {
+	.navbar {
+		.brand {
+			font-size: 16px;
+
+		}
+	}
+}
+
+// Navbar
+.nav-collapse .nav li a,
+.dropdown-menu a {
+	background-image: none;
+}
+
+.nav-collapse .dropdown-menu > li {
+	img {
+		max-width: none;
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-top .navbar-inner .container-fluid {
+		padding: 0;
+	}
+
+	.navbar .brand {
+		margin-top: 2px;
+		float: none;
+		text-align: center;
+	}
+
+	.navbar .btn-navbar {
+		margin-top: 3px;
+		margin-right: 3px;
+		margin-bottom: 3px;
+	}
+
+	.nav-collapse .nav .nav-header {
+		color: @white;
+	}
+
+	.nav-collapse .nav,
+	.navbar .nav-collapse .nav.pull-right {
+		margin: 0;
+	}
+
+	.nav-collapse .dropdown-menu {
+		margin: 0;
+	}
+
+	.nav-collapse .dropdown-menu > li > span {
+		display: block;
+		padding: 4px 15px;
+	}
+
+	.navbar-inverse .nav-collapse .dropdown-menu > li > span {
+		color: @navbarInverseLinkColor;
+	}
+
+	.nav-collapse .nav > li > a.dropdown-toggle {
+		background-color: rgba(255, 255, 255, 0.07);
+		font-size: 12px;
+		font-weight: bold;
+		color: @grayLighter;
+		text-transform: uppercase;
+		padding-left: 15px;
+	}
+
+	.nav-collapse .nav li a {
+		margin-bottom: 0;
+		border-top: 1px solid rgba(255, 255, 255, 0.25);
+		border-bottom: 1px solid rgba(0, 0, 0, 0.5);
+	}
+
+	.nav-collapse .nav li ul li ul.dropdown-menu,
+	.nav-collapse .nav li ul li:hover ul.dropdown-menu,
+	.nav-collapse .caret {
+		display: none !important;
+	}
+
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		font-size: 15px;
+		font-weight: normal;
+		color: @white;
+		.border-radius(0);
+	}
+
+	.navbar .nav-collapse .nav > li > .dropdown-menu::before,
+	.navbar .nav-collapse .nav > li > .dropdown-menu::after,
+	.navbar .nav-collapse .dropdown-submenu > a::after {
+		display: none;
+	}
+
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 0;
+	}
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_quickicons.less b/core/administrator/templates/isis/less/blocks/_quickicons.less
new file mode 100644
index 00000000..9843de84
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_quickicons.less
@@ -0,0 +1,27 @@
+// Quick-icons
+
+.quick-icons {
+	font-size: 14px;
+	margin-bottom: 20px;
+	.nav-header {
+		margin: 12px 0 5px;
+		font-size: 13px;
+		&:first-child {
+			margin: 0 0 5px;
+		}
+	}
+	[class^="icon-"],
+	[class*=" icon-"] {
+		margin-right: 9px;
+		&:before {
+			font-size: 16px;
+			margin-bottom: 20px;
+			line-height: 18px;
+		}
+	}
+}
+
+html[dir=rtl] .quick-icons .nav-list [class^="icon-"], html[dir=rtl] .quick-icons .nav-list [class*=" icon-"] {
+	margin-left: 9px;
+	margin-right: 0;
+}
diff --git a/core/administrator/templates/isis/less/blocks/_sidebar.less b/core/administrator/templates/isis/less/blocks/_sidebar.less
new file mode 100644
index 00000000..d5fc72de
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_sidebar.less
@@ -0,0 +1,150 @@
+// Sidebar
+
+.sidebar-nav .nav-list {
+	padding-left: 25px;
+	padding-right: 25px;
+}
+
+.sidebar-nav .nav-list > li > a {
+	color: #555;
+	padding: 3px 25px;
+	margin-left: -26px;
+	margin-right: -26px;
+}
+
+.sidebar-nav .nav-list > li.active > a {
+	color: #fff;
+	margin-right: -26px;
+}
+.sidebar-nav .nav-list > li > a:focus,
+.sidebar-nav .nav-list > li > a:hover {
+	text-decoration: none;
+	color: #fff;
+	background-color: #2d6ca2;
+    text-shadow: none;
+}
+
+/* For collapsible sidebar */
+.j-sidebar-container {
+	position: absolute;
+	display: block;
+	left: -16.5%;
+	width: 16.5%;
+	margin: -18px 0 0 -1px;
+	padding-top: 28px;
+	padding-bottom: 40px;
+	clear: both;
+	background-color: @wellBackground;
+	border-bottom: 1px solid darken(@wellBackground, 7%);
+	border-right: 1px solid darken(@wellBackground, 7%);
+	.border-radius(0 0 @baseBorderRadius 0);
+	&.j-sidebar-hidden {
+		left: -16.5%;
+	}
+	&.j-sidebar-visible {
+		left: 0;
+	}
+	.filter-select {
+		padding: 0 14px;
+	}
+}
+
+.j-toggle-sidebar-header {
+	h3 {
+		font-weight: normal;
+		padding: 0 15px;
+	}
+}
+
+.j-toggle-button-wrapper {
+	position: absolute;
+	display: block;
+	top: 7px;
+	padding: 0;
+	&.j-toggle-hidden {
+		right: -24px;
+	}
+	&.j-toggle-visible {
+		right: 7px;
+	}
+}
+
+.j-toggle-sidebar-button {
+	font-size: 16px;
+	color: @linkColor;
+	text-decoration: none;
+	cursor: pointer;
+	&:hover {
+		color: @linkColorHover;
+	}
+}
+
+#system-message-container,
+#j-main-container {
+	padding: 0 0 0 5px;
+	min-height: 0;
+}
+
+#system-message-container.j-toggle-main,
+#j-main-container.j-toggle-main,
+#system-debug.j-toggle-main {
+	float: right;
+}
+
+@media (min-width: @md) {
+	.j-toggle-transition {
+		.transition(all 0.3s ease);
+	}
+}
+
+@media (max-width: @lg-max) {
+	.j-toggle-button-wrapper.j-toggle-hidden {
+		right: -20px;
+	}
+}
+
+@media (max-width: @md-max) {
+	.j-sidebar-container {
+		position: relative;
+		width: 100%;
+		margin: 0 0 20px 0;
+		padding: 0;
+		background: transparent;
+		border-right: 0;
+		border-bottom: 0;
+	}
+
+	.j-sidebar-container.j-sidebar-hidden {
+		margin-left: 16.5%;
+	}
+
+	.j-sidebar-container.j-sidebar-visible {
+		margin-left: 0;
+	}
+
+	.j-toggle-sidebar-header,
+	.j-toggle-button-wrapper {
+		display: none;
+	}
+
+	.view-login {
+		select {
+			width: 232px;
+		}
+	}
+}
+
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+
+	.view-login {
+		.input-medium {
+			width: 180px;
+		}
+		select {
+			width: 232px
+		}
+	}
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_status.less b/core/administrator/templates/isis/less/blocks/_status.less
new file mode 100644
index 00000000..11945092
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_status.less
@@ -0,0 +1,46 @@
+// Status
+
+#status {
+	background: #ebebeb;
+	border-top: 1px solid #dedede;
+	padding: 4px 10px;
+	.box-shadow(~"0 0 3px rgba(0, 0, 0, 0.08)");
+	color: #626262;
+
+	.btn-group {
+		margin: 0;
+	}
+	.btn-group.separator:after {
+		content: ' ';
+		display: block;
+		float: left;
+		background: #ADADAD;
+		margin: 0 10px;
+		height: 15px;
+		width: 1px;
+	}
+	.btn-toolbar, p {
+		margin: 0px;
+	}
+	.btn-toolbar, .btn-group {
+		font-size: 12px;
+	}
+	a {
+		color: #626262;
+	}
+	.badge {
+		margin-right: .25em;
+	}
+}
+/* Status Module in top position */
+#status.status-top {
+	background: @headerBackground;
+	.box-shadow(~"0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px rgba(0, 0, 0, 0.3) inset, 0px -1px 0px rgba(0, 0, 0, 0.3)");
+	border-top: 0;
+	color: @navbarInverseText;
+	padding: 2px 20px 6px 20px;
+
+	a {
+		color: @navbarInverseLinkColor;
+	}
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_tables.less b/core/administrator/templates/isis/less/blocks/_tables.less
new file mode 100644
index 00000000..7ca893a5
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_tables.less
@@ -0,0 +1,74 @@
+// Tables
+
+@media (max-width: @sm-max) {
+
+	.pagination a {
+		padding: 5px;
+	}
+
+	.btn-group.divider,
+	.header .row-fluid .span3,
+	.header .row-fluid .span7 {
+		display: none;
+	}
+
+	.navbar .btn {
+		margin: 0;
+	}
+
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+
+	.subhead-collapse.collapse {
+		height: 0;
+		overflow: hidden;
+	}
+
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin:0px 10px 5px 10px;
+	}
+
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+	}
+
+	.subhead {
+		background: none repeat scroll 0 0 transparent;
+		border-bottom: 0 solid darken(@wellBackground, 7%);
+	}
+
+	.btn-group + .btn-group {
+		margin-left: 10px;
+	}
+
+	.login .chzn-single {
+		width: 222px !important;
+	}
+
+	.login .chzn-container,
+	.login .chzn-drop {
+		width: 230px !important;
+	}
+	#toolbar [class^="icon-"], #toolbar [class*=" icon-"] {
+	    background-color: transparent;
+	    border-right: medium none;
+	    width: 10px;
+	}
+}
+
+/* Tables */
+table label {
+	margin: 0;
+}
+
+td.has-context {
+	// Fixes difference in height between normal and hover on cell with context
+	height: 23px;
+}
+
+td.nowrap.has-context {
+	width: 45%;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/blocks/_toolbar.less b/core/administrator/templates/isis/less/blocks/_toolbar.less
new file mode 100644
index 00000000..8d1f3617
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_toolbar.less
@@ -0,0 +1,165 @@
+// Toolbar
+
+/* Subhead */
+.subhead {
+	background: @wellBackground;
+	border-bottom: 1px solid darken(@wellBackground, 7%);
+	color: #0C192E;
+	text-shadow: 0 1px 0 #FFF;
+	margin-bottom: 10px;
+	min-height: 51px;
+}
+
+.subhead-collapse {
+	margin-bottom: 19px;
+}
+
+.subhead-collapse.collapse {
+	height: auto;
+	overflow: visible;
+}
+
+.btn-toolbar {
+	margin-bottom: 5px;
+	.btn-wrapper {
+		display: inline-block;
+		margin: 0 0 8px 5px;
+	}
+}
+
+.subhead-fixed {
+	position: fixed;
+	width: 100%;
+	top: 30px;
+	z-index: 100;
+}
+@media (max-width: @md-max) {
+	/* Fix ios scrolling inside bootstrap modals */
+	body {
+		-webkit-overflow-scrolling: touch;
+	}
+	.subhead {
+		margin-left: -20px;
+		margin-right: -20px;
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+
+.subhead h1 {
+	font-size: 17px;
+	font-weight: normal;
+	margin-left: 10px;
+	margin-top: 6px;
+}
+
+/* Toolbar */
+#toolbar {
+	margin-bottom: 2px;
+    margin-top: 12px;
+	.btn {
+	    line-height: 24px;
+	    margin-right: 4px;
+	    padding: 0 10px;
+	}
+	.btn-success {
+		min-width: 148px;
+	}
+	.btn-primary,
+	.btn-warning,
+	.btn-danger,
+	.btn-success,
+	.btn-info,
+	.btn-inverse {
+		[class^="icon-"], [class*=" icon-"] {
+			background-color: transparent;
+			border-right: 0;
+			border-left: 0;
+			width: 16px;
+			margin-left: 0;
+			margin-right: 0;
+		}
+	}
+	#toolbar-options, #toolbar-help {
+		float: right;
+	}
+	[class^="icon-"], [class*=" icon-"] {
+		background-color: @btnBackgroundHighlight;
+	    border-radius: 3px 0 0 3px;
+	    border-right: 1px solid @btnBorder;
+	    height: auto;
+	    line-height: inherit;
+	    margin: 0 6px 0 -10px;
+	    opacity: 1;
+	    text-shadow: none;
+	    width: 28px;
+	    z-index: -1;
+	}
+	iframe .btn-group .btn {
+		margin-left: -1px !important;
+	}
+} 
+html[dir=rtl] #toolbar #toolbar-options,
+html[dir=rtl] #toolbar #toolbar-help {
+	float: left;
+}
+
+@media (max-width: @md-max) {
+	.subhead-fixed {
+		position: static;
+		width: auto;
+	}
+}
+
+/* Subhead (toolbar) Collapse Button */
+.btn-subhead {
+	display: none;
+}
+@media (min-width: @sm) {
+	#filter-bar {
+		// Fix for Firefox
+		height: 29px;
+	}
+}
+
+@media (max-width: @sm-max) {
+	.navbar .btn {
+		margin: 0;
+	}
+
+	.btn-subhead {
+		display: block;
+		margin: 10px 0;
+	}
+
+	.subhead-collapse.collapse {
+		height: 0;
+		overflow: hidden;
+	}
+
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin:0px 10px 5px 10px;
+	}
+
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+	}
+
+	.subhead {
+		background: none repeat scroll 0 0 transparent;
+		border-bottom: 0 solid darken(@wellBackground, 7%);
+	}
+
+	#toolbar [class^="icon-"], #toolbar [class*=" icon-"] {
+	    background-color: transparent;
+	    border-right: medium none;
+	    width: 10px;
+	}
+}
+
+@media (max-width: @xs-max) {
+	.view-login .navbar-fixed-bottom {
+		display: none;
+	}
+}
diff --git a/core/administrator/templates/isis/less/blocks/_treeselect.less b/core/administrator/templates/isis/less/blocks/_treeselect.less
new file mode 100644
index 00000000..c3ee4b36
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_treeselect.less
@@ -0,0 +1,85 @@
+// Tree Select 
+
+ul.treeselect,
+ul.treeselect li {
+	margin: 0;
+	padding: 0;
+}
+
+ul.treeselect {
+	margin-top: 8px;
+}
+
+ul.treeselect li {
+	padding: 2px 10px 2px;
+	list-style: none;
+}
+
+ul.treeselect i.treeselect-toggle {
+	line-height: 18px;
+}
+
+ul.treeselect label {
+	font-size: 1em;
+	margin-left: 8px;
+}
+
+ul.treeselect label.nav-header {
+	padding: 0;
+}
+
+ul.treeselect input {
+	margin: 2px 0 0 8px;
+}
+
+ul.treeselect .treeselect-menu {
+	margin: 0 6px;
+}
+
+ul.treeselect ul.dropdown-menu {
+	margin: 0;
+}
+
+ul.treeselect ul.dropdown-menu li {
+	padding: 0 5px;
+	border: none;
+}
+
+.tree-holder {
+	.folder-url, .file {
+		position: relative;
+		background-color: #fefefe;
+		margin-bottom: 4px;
+    	padding: 0 10px;
+		line-height: 32px;
+		border: 1px solid rgba(0, 0, 0, 0.08);
+		
+	}
+	.folder-url, .folder-url:hover, .folder-url:focus {
+		font-weight: bold;
+		background-color: #f5f5f5;
+		color: @linkColor;
+	}
+	.active {
+		background-color: @linkColor;
+		color: #fff;
+		box-shadow: -3px 0 0 #36a2ff !important;
+		&.folder-url {
+			background-color: #f5f5f5;
+			color: @linkColor;
+		}
+		&.file:hover {
+			background-color: #3071a9;
+		}
+	}
+	ul {
+		ul {
+			box-shadow: -3px 0 0 rgba(0, 0, 0, 0.08);
+			padding-right: 0;
+			.folder-url, .file {
+				box-shadow: -3px 0 0 @linkColor;
+				border-left: 0;
+			}
+		}
+	}
+}
diff --git a/core/administrator/templates/isis/less/blocks/_utility-classes.less b/core/administrator/templates/isis/less/blocks/_utility-classes.less
new file mode 100644
index 00000000..72eb5dff
--- /dev/null
+++ b/core/administrator/templates/isis/less/blocks/_utility-classes.less
@@ -0,0 +1,13 @@
+// Utility Classes
+
+.break-word {
+	word-break: break-all;
+	word-wrap: break-word;
+}
+
+.disabled {
+	cursor: default;
+	background-image: none;
+	.opacity(65);
+	.box-shadow(none);
+}
diff --git a/core/administrator/templates/isis/less/bootstrap/button-groups.less b/core/administrator/templates/isis/less/bootstrap/button-groups.less
new file mode 100644
index 00000000..c861628c
--- /dev/null
+++ b/core/administrator/templates/isis/less/bootstrap/button-groups.less
@@ -0,0 +1,239 @@
+//
+// Button groups
+// --------------------------------------------------
+
+
+// Make the div behave like a button
+.btn-group {
+  position: relative;
+  display: inline-block;
+  .ie7-inline-block();
+  font-size: 0; // remove as part 1 of font-size inline-block hack
+  vertical-align: middle; // match .btn alignment given font-size hack above
+  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
+  .ie7-restore-left-whitespace();
+  .btn + .btn {
+    margin-left: -1px;
+  }
+}
+
+// Space out series of button groups
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+  font-size: 0; // Hack to remove whitespace that results from using inline-block
+  margin-top: @baseLineHeight / 2;
+  margin-bottom: @baseLineHeight / 2;
+  > .btn + .btn,
+  > .btn-group + .btn,
+  > .btn + .btn-group {
+    margin-left: 5px;
+  }
+}
+
+// Float them, remove border radius, then re-add to first and last elements
+.btn-group > .btn {
+  position: relative;
+  .border-radius(0);
+}
+.btn-group > .btn + .btn {
+  // margin-left: -1px;
+}
+.btn-group > .btn-micro {
+  margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
+}
+
+// Reset fonts for other sizes
+.btn-group > .btn-mini {
+  font-size: @fontSizeMini;
+}
+.btn-group > .btn-small {
+  font-size: @fontSizeSmall;
+}
+.btn-group > .btn-large {
+  font-size: @fontSizeLarge;
+}
+
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  .border-top-left-radius(@baseBorderRadius);
+  .border-bottom-left-radius(@baseBorderRadius);
+}
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  .border-top-right-radius(@baseBorderRadius);
+  .border-bottom-right-radius(@baseBorderRadius);
+}
+// Reset corners for large buttons
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  .border-top-left-radius(@borderRadiusLarge);
+  .border-bottom-left-radius(@borderRadiusLarge);
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  .border-top-right-radius(@borderRadiusLarge);
+  .border-bottom-right-radius(@borderRadiusLarge);
+}
+
+// On hover/focus/active, bring the proper btn to front
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+
+
+// Split button dropdowns
+// ----------------------
+
+// Give the line between buttons some depth
+.btn-group > .btn + .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+.btn-group.open {
+
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
+  .dropdown-toggle {
+    background-image: none;
+  }
+
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle {
+    background-color: @btnBackgroundHighlight;
+  }
+  .btn-primary.dropdown-toggle {
+    background-color: @btnPrimaryBackgroundHighlight;
+  }
+  .btn-warning.dropdown-toggle {
+    background-color: @btnWarningBackgroundHighlight;
+  }
+  .btn-danger.dropdown-toggle {
+    background-color: @btnDangerBackgroundHighlight;
+  }
+  .btn-success.dropdown-toggle {
+    background-color: @btnSuccessBackgroundHighlight;
+  }
+  .btn-info.dropdown-toggle {
+    background-color: @btnInfoBackgroundHighlight;
+  }
+  .btn-inverse.dropdown-toggle {
+    background-color: @btnInverseBackgroundHighlight;
+  }
+}
+
+
+// Reposition the caret
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+// Carets in other button sizes
+.btn-large .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  border-left-width:  5px;
+  border-right-width: 5px;
+  border-top-width:   5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+// Upside down carets for .dropup
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+
+
+// Account for other colors
+.btn-primary {
+  .caret {
+    border-top-color: @linkColorHover;
+    border-bottom-color: @linkColorHover;
+  }
+}
+.btn-warning,
+.btn-danger,
+.btn-info,
+.btn-success,
+.btn-inverse {
+  .caret {
+    border-top-color: @white;
+    border-bottom-color: @white;
+  }
+}
+
+
+
+// Vertical button groups
+// ----------------------
+
+.btn-group-vertical {
+  display: inline-block; // makes buttons only take up the width they need
+  .ie7-inline-block();
+}
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  .border-radius(0);
+}
+.btn-group-vertical > .btn + .btn {
+  margin-left: 0;
+  margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
+}
+.btn-group-vertical > .btn:last-child {
+  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
+}
+.btn-group-vertical > .btn-large:first-child {
+  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
+}
+.btn-group-vertical > .btn-large:last-child {
+  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
+}
+
diff --git a/core/administrator/templates/isis/less/bootstrap/buttons.less b/core/administrator/templates/isis/less/bootstrap/buttons.less
new file mode 100644
index 00000000..6ee0c6db
--- /dev/null
+++ b/core/administrator/templates/isis/less/bootstrap/buttons.less
@@ -0,0 +1,285 @@
+//
+// Buttons
+// --------------------------------------------------
+
+
+// Base styles
+// --------------------------------------------------
+
+// Core
+.btn {
+  display: inline-block;
+  .ie7-inline-block();
+  padding: 4px 12px;
+  margin-bottom: 0; // For input.btn
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: @btnBackground;
+  color: #333;
+  //  .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
+  border: 1px solid @btnBorder;
+  .border-radius(@baseBorderRadius);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  &:hover,
+  &:focus {
+    background-color: @btnBackgroundHighlight;
+    text-decoration: none;
+    text-shadow: none;
+  }
+
+  // Focus state for keyboard and accessibility
+  &:focus {
+    .tab-focus();
+  }
+
+  // Active state
+  &.active,
+  &:active {
+    background-image: none;
+    outline: 0;
+    //    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Disabled state
+  &.disabled,
+  &[disabled] {
+    cursor: default;
+    background-image: none;
+    .opacity(65);
+    .box-shadow(none);
+  }
+
+}
+
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+  padding: @paddingLarge;
+  font-size: @fontSizeLarge;
+  .border-radius(@borderRadiusLarge);
+}
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+// Small
+.btn-small {
+  padding: @paddingSmall;
+  font-size: @fontSizeSmall;
+  .border-radius(@borderRadiusSmall);
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+// Mini
+.btn-mini {
+  padding: @paddingMini;
+  font-size: @fontSizeMini;
+  .border-radius(@borderRadiusSmall);
+}
+
+
+// Block button
+// -------------------------
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-left: 0;
+  padding-right: 0;
+  .box-sizing(border-box);
+}
+
+// Vertically space out multiple block buttons
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+// Specificity overrides
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+  &.btn-block {
+    width: 100%;
+  }
+}
+
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+.btn-primary,
+.btn-warning,
+.btn-danger,
+.btn-success,
+.btn-info,
+.btn-inverse {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+// Provide *some* extra contrast for those who can get it
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  //  color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn-primary {
+  border: 1px solid @btnPrimaryBackgroundHighlight;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  color: #fff;
+  background-color: @btnPrimaryBackground;
+  &:hover,
+  &:focus {
+    background-color: darken(@btnPrimaryBackground, 15%);
+    color: #fff;
+    text-decoration: none;
+  }
+}
+// Warning appears are orange
+.btn-warning {
+  border: 1px solid @btnWarningBackground;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  color: #fff;
+  background-color: @btnWarningBackground;
+  &:hover,
+  &:focus {
+    background-color: darken(@btnWarningBackground, 15%);
+    color: #fff;
+    text-decoration: none;
+    text-shadow: none;
+  }
+}
+// Danger and error appear as red
+.btn-danger {
+  border: 1px solid @btnDangerBackground;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  color: #fff;
+  background-color: @btnDangerBackground;
+  &:hover,
+  &:focus {
+    background-color: darken(@btnDangerBackground, 15%);
+    color: #fff;
+    text-decoration: none;
+  }
+}
+// Success appears as green
+.btn-success {
+  border: 1px solid @btnSuccessBackgroundHighlight;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  color: #fff;
+  background-color: @btnSuccessBackground;
+  &:hover,
+  &:focus {
+    background-color: darken(@btnSuccessBackground, 15%);
+    color: #fff;
+    text-decoration: none;
+  }
+}
+// Info appears as a neutral blue
+.btn-info {
+  border: 1px solid @btnInfoBackground;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  color: #fff;
+  background-color: @btnInfoBackground;
+  &:hover,
+  &:focus {
+    background-color: darken(@btnInfoBackground, 15%);
+    color: #fff;
+    text-decoration: none;
+  }
+}
+// Inverse appears as dark gray
+.btn-inverse {
+  border: 1px solid @btnInverseBackground;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  color: #fff;
+  background-color: @btnInverseBackground;
+  &:hover,
+  &:focus {
+    background-color: darken(@btnInverseBackground, 15%);
+    color: #fff;
+    text-decoration: none;
+  }
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
+
+button.btn,
+input[type="submit"].btn {
+
+  // Firefox 3.6 only I believe
+  &::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+  }
+
+  // IE7 has some default padding on button controls
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+
+  &.btn-large {
+    *padding-top: 7px;
+    *padding-bottom: 7px;
+  }
+  &.btn-small {
+    *padding-top: 3px;
+    *padding-bottom: 3px;
+  }
+  &.btn-mini {
+    *padding-top: 1px;
+    *padding-bottom: 1px;
+  }
+}
+
+
+// Link buttons
+// --------------------------------------------------
+
+// Make a button look and behave like a link
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  .box-shadow(none);
+}
+.btn-link {
+  border-color: transparent;
+  cursor: pointer;
+  color: @linkColor;
+  .border-radius(0);
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: @linkColorHover;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: @grayDark;
+  text-decoration: none;
+}
diff --git a/core/administrator/templates/isis/less/bootstrap/mixins.less b/core/administrator/templates/isis/less/bootstrap/mixins.less
new file mode 100644
index 00000000..5ecf2cea
--- /dev/null
+++ b/core/administrator/templates/isis/less/bootstrap/mixins.less
@@ -0,0 +1,708 @@
+//
+// Mixins
+// --------------------------------------------------
+
+
+// UTILITY MIXINS
+// --------------------------------------------------
+
+// Clearfix
+// --------
+// For clearing floats like a boss h5bp.com/q
+.clearfix {
+  *zoom: 1;
+  &:before,
+  &:after {
+    display: table;
+    content: "";
+    // Fixes Opera/contenteditable bug:
+    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
+    line-height: 0;
+  }
+  &:after {
+    clear: both;
+  }
+}
+
+// Webkit-style focus
+// ------------------
+.tab-focus() {
+  // Default
+  outline: thin dotted #333;
+  // Webkit
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+// Center-align a block level element
+// ----------------------------------
+.center-block() {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+// IE7 inline-block
+// ----------------
+.ie7-inline-block() {
+  *display: inline; /* IE7 inline-block hack */
+  *zoom: 1;
+}
+
+// IE7 likes to collapse whitespace on either side of the inline-block elements.
+// Ems because we're attempting to match the width of a space character. Left
+// version is for form buttons, which typically come after other elements, and
+// right version is for icons, which come before. Applying both is ok, but it will
+// mean that space between those elements will be .6em (~2 space characters) in IE7,
+// instead of the 1 space in other browsers.
+.ie7-restore-left-whitespace() {
+  *margin-left: .3em;
+
+  &:first-child {
+    *margin-left: 0;
+  }
+}
+
+.ie7-restore-right-whitespace() {
+  *margin-right: .3em;
+}
+
+// Sizing shortcuts
+// -------------------------
+.size(@height, @width) {
+  width: @width;
+  height: @height;
+}
+.square(@size) {
+  .size(@size, @size);
+}
+
+// Placeholder text
+// -------------------------
+.placeholder(@color: @placeholderText) {
+  &:-moz-placeholder {
+    color: @color;
+  }
+  &:-ms-input-placeholder {
+    color: @color;
+  }
+  &::-webkit-input-placeholder {
+    color: @color;
+  }
+}
+
+// Text overflow
+// -------------------------
+// Requires inline-block or block for proper styling
+.text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+// CSS image replacement
+// -------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+
+// FONTS
+// --------------------------------------------------
+
+#font {
+  #family {
+    .serif() {
+      font-family: @serifFontFamily;
+    }
+    .sans-serif() {
+      font-family: @sansFontFamily;
+    }
+    .monospace() {
+      font-family: @monoFontFamily;
+    }
+  }
+  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .sans-serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .monospace;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+}
+
+
+// FORMS
+// --------------------------------------------------
+
+// Block level inputs
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
+  .box-sizing(border-box); // Makes inputs behave like true block-level elements
+}
+
+
+
+// Mixin for form field states
+.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+  // Set the text color
+  .control-label,
+  .help-block,
+  .help-inline {
+    color: @textColor;
+  }
+  // Style inputs accordingly
+  .checkbox,
+  .radio,
+  input,
+  select,
+  textarea {
+    color: @textColor;
+  }
+  input,
+  select,
+  textarea {
+    border-color: @borderColor;
+    //.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    &:focus {
+      border-color: darken(@borderColor, 10%);
+      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+      //.box-shadow(@shadow);
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: @textColor;
+    background-color: @backgroundColor;
+    border-color: @textColor;
+  }
+}
+
+
+
+// CSS3 PROPERTIES
+// --------------------------------------------------
+
+// Border Radius
+.border-radius(@radius) {
+  -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
+}
+
+// Single Corner Border Radius
+.border-top-left-radius(@radius) {
+  -webkit-border-top-left-radius: @radius;
+      -moz-border-radius-topleft: @radius;
+          border-top-left-radius: @radius;
+}
+.border-top-right-radius(@radius) {
+  -webkit-border-top-right-radius: @radius;
+      -moz-border-radius-topright: @radius;
+          border-top-right-radius: @radius;
+}
+.border-bottom-right-radius(@radius) {
+  -webkit-border-bottom-right-radius: @radius;
+      -moz-border-radius-bottomright: @radius;
+          border-bottom-right-radius: @radius;
+}
+.border-bottom-left-radius(@radius) {
+  -webkit-border-bottom-left-radius: @radius;
+      -moz-border-radius-bottomleft: @radius;
+          border-bottom-left-radius: @radius;
+}
+
+// Single Side Border Radius
+.border-top-radius(@radius) {
+  .border-top-right-radius(@radius);
+  .border-top-left-radius(@radius);
+}
+.border-right-radius(@radius) {
+  .border-top-right-radius(@radius);
+  .border-bottom-right-radius(@radius);
+}
+.border-bottom-radius(@radius) {
+  .border-bottom-right-radius(@radius);
+  .border-bottom-left-radius(@radius);
+}
+.border-left-radius(@radius) {
+  .border-top-left-radius(@radius);
+  .border-bottom-left-radius(@radius);
+}
+
+// Drop shadows
+.box-shadow(@shadow) {
+  -webkit-box-shadow: @shadow;
+     -moz-box-shadow: @shadow;
+          box-shadow: @shadow;
+}
+
+// Transitions
+.transition(@transition) {
+  -webkit-transition: @transition;
+     -moz-transition: @transition;
+       -o-transition: @transition;
+          transition: @transition;
+}
+.transition-delay(@transition-delay) {
+  -webkit-transition-delay: @transition-delay;
+     -moz-transition-delay: @transition-delay;
+       -o-transition-delay: @transition-delay;
+          transition-delay: @transition-delay;
+}
+.transition-duration(@transition-duration) {
+  -webkit-transition-duration: @transition-duration;
+     -moz-transition-duration: @transition-duration;
+       -o-transition-duration: @transition-duration;
+          transition-duration: @transition-duration;
+}
+
+// Transformations
+.rotate(@degrees) {
+  -webkit-transform: rotate(@degrees);
+     -moz-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+       -o-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+.scale(@ratio) {
+  -webkit-transform: scale(@ratio);
+     -moz-transform: scale(@ratio);
+      -ms-transform: scale(@ratio);
+       -o-transform: scale(@ratio);
+          transform: scale(@ratio);
+}
+.translate(@x, @y) {
+  -webkit-transform: translate(@x, @y);
+     -moz-transform: translate(@x, @y);
+      -ms-transform: translate(@x, @y);
+       -o-transform: translate(@x, @y);
+          transform: translate(@x, @y);
+}
+.skew(@x, @y) {
+  -webkit-transform: skew(@x, @y);
+     -moz-transform: skew(@x, @y);
+      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
+       -o-transform: skew(@x, @y);
+          transform: skew(@x, @y);
+  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
+}
+.translate3d(@x, @y, @z) {
+  -webkit-transform: translate3d(@x, @y, @z);
+     -moz-transform: translate3d(@x, @y, @z);
+       -o-transform: translate3d(@x, @y, @z);
+          transform: translate3d(@x, @y, @z);
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden
+// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
+.backface-visibility(@visibility){
+	-webkit-backface-visibility: @visibility;
+	   -moz-backface-visibility: @visibility;
+	        backface-visibility: @visibility;
+}
+
+// Background clipping
+// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
+.background-clip(@clip) {
+  -webkit-background-clip: @clip;
+     -moz-background-clip: @clip;
+          background-clip: @clip;
+}
+
+// Background sizing
+.background-size(@size) {
+  -webkit-background-size: @size;
+     -moz-background-size: @size;
+       -o-background-size: @size;
+          background-size: @size;
+}
+
+
+// Box sizing
+.box-sizing(@boxmodel) {
+  -webkit-box-sizing: @boxmodel;
+     -moz-box-sizing: @boxmodel;
+          box-sizing: @boxmodel;
+}
+
+// User select
+// For selecting text on the page
+.user-select(@select) {
+  -webkit-user-select: @select;
+     -moz-user-select: @select;
+      -ms-user-select: @select;
+       -o-user-select: @select;
+          user-select: @select;
+}
+
+// Resize anything
+.resizable(@direction) {
+  resize: @direction; // Options: horizontal, vertical, both
+  overflow: auto; // Safari fix
+}
+
+// CSS3 Content Columns
+.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
+  -webkit-column-count: @columnCount;
+     -moz-column-count: @columnCount;
+          column-count: @columnCount;
+  -webkit-column-gap: @columnGap;
+     -moz-column-gap: @columnGap;
+          column-gap: @columnGap;
+}
+
+// Optional hyphenation
+.hyphens(@mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: @mode;
+     -moz-hyphens: @mode;
+      -ms-hyphens: @mode;
+       -o-hyphens: @mode;
+          hyphens: @mode;
+}
+
+// Opacity
+.opacity(@opacity) {
+  opacity: @opacity / 100;
+  filter: ~"alpha(opacity=@{opacity})";
+}
+
+
+
+// BACKGROUNDS
+// --------------------------------------------------
+
+// Add an alphatransparency value to any background or border color (via Elyse Holladay)
+#translucent {
+  .background(@color: @white, @alpha: 1) {
+    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+  }
+  .border(@color: @white, @alpha: 1) {
+    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+    .background-clip(padding-box);
+  }
+}
+
+// Gradient Bar Colors for buttons and alerts
+.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
+  color: @textColor;
+  text-shadow: @textShadow;
+  #gradient > .vertical(@primaryColor, @secondaryColor);
+  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
+  // No idea why this is here, as it makes the border grey instead of the given colors
+  // border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+}
+
+// Gradients
+#gradient {
+  .horizontal(@startColor: #555, @endColor: #333) {
+    background-color: @endColor;
+    background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down
+  }
+  .vertical(@startColor: #555, @endColor: #333) {
+    background-color: mix(@startColor, @endColor, 60%);
+    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
+  }
+  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
+    background-color: @endColor;
+    background-repeat: repeat-x;
+    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
+  }
+  .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
+    background-color: mix(@midColor, @endColor, 80%);
+    background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
+    background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
+    background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
+    background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor);
+    background-repeat: no-repeat;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
+  }
+
+  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
+    background-color: mix(@midColor, @endColor, 80%);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
+    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
+    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-repeat: no-repeat;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
+  }
+  .radial(@innerColor: #555, @outerColor: #333) {
+    background-color: @outerColor;
+    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
+    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
+    // > Joomla JUI
+    /* Joomla JUI NOTE: makes radial gradient IE 10+, also confirmed in Bootstrap, https://github.com/twbs/bootstrap/issues/7462 */
+    background-image: radial-gradient(circle, @innerColor, @outerColor);
+    // < Joomla JUI
+    background-repeat: no-repeat;
+  }
+  .striped(@color: #555, @angle: 45deg) {
+    background-color: @color;
+    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
+    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+  }
+}
+// Reset filters for IE
+.reset-filter() {
+  filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
+}
+
+
+
+// COMPONENT MIXINS
+// --------------------------------------------------
+
+// Horizontal dividers
+// -------------------------
+// Dividers (basically an hr) within dropdowns and nav lists
+.nav-divider(@top: #e5e5e5, @bottom: @white) {
+  // IE7 needs a set width since we gave a height. Restricting just
+  // to IE7 to keep the 1px left/right space in other browsers.
+  // It is unclear where IE is getting the extra space that we need
+  // to negative-margin away, but so it goes.
+  *width: 100%;
+  height: 1px;
+  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: @top;
+  border-bottom: 1px solid @bottom;
+}
+
+// Button backgrounds
+// ------------------
+.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
+  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+  //.gradientBar(@startColor, @endColor, @textColor, @textShadow);
+  background-color: @startColor;
+  *background-color: @startColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+  //.reset-filter();
+
+  // in these cases the gradient won't cover the background, so we override
+  &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
+    color: @textColor;
+    background-color: darken(@endColor, 5%);
+    *background-color: darken(@endColor, 5%);
+  }
+
+  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+  &:active,
+  &.active {
+    background-color: @startColor;
+  }
+}
+
+// Navbar vertical align
+// -------------------------
+// Vertically center elements in the navbar.
+// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
+.navbarVerticalAlign(@elementHeight) {
+  margin-top: (@navbarHeight - @elementHeight) / 2;
+}
+
+
+
+// Grid System
+// -----------
+
+// Centered container element
+.container-fixed() {
+  margin-right: auto;
+  margin-left: auto;
+  .clearfix();
+}
+
+// Table columns
+.tableColumns(@columnSpan: 1) {
+  float: none; // undo default grid column styles
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
+  margin-left: 0; // undo default grid column styles
+}
+
+// Make a Grid
+// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
+.makeRow() {
+  margin-left: @gridGutterWidth * -1;
+  .clearfix();
+}
+.makeColumn(@columns: 1, @offset: 0) {
+  float: left;
+  margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2);
+  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+}
+
+// The Grid
+#grid {
+
+  .core (@gridColumnWidth, @gridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      .span@{index} { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .offsetX (@index) when (@index > 0) {
+      .offset@{index} { .offset(@index); }
+      .offsetX(@index - 1);
+    }
+    .offsetX (0) {}
+
+    .offset (@columns) {
+      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
+    }
+
+    .span (@columns) {
+      width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+    }
+
+    .row {
+      margin-left: @gridGutterWidth * -1;
+      .clearfix();
+    }
+
+    [class*="span"] {
+      float: left;
+      min-height: 1px; // prevent collapsing columns
+      margin-left: @gridGutterWidth;
+    }
+
+    // Set the container width, and override it for fixed navbars in media queries
+    .container,
+    .navbar-static-top .container,
+    .navbar-fixed-top .container,
+    .navbar-fixed-bottom .container { .span(@gridColumns); }
+
+    // generate .spanX and .offsetX
+    .spanX (@gridColumns);
+    .offsetX (@gridColumns);
+
+  }
+
+  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      .span@{index} { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .offsetX (@index) when (@index > 0) {
+      .offset@{index} { .offset(@index); }
+      .offset@{index}:first-child { .offsetFirstChild(@index); }
+      .offsetX(@index - 1);
+    }
+    .offsetX (0) {}
+
+    .offset (@columns) {
+      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
+  	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .offsetFirstChild (@columns) {
+      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth);
+      *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .span (@columns) {
+      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
+      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .row-fluid {
+      width: 100%;
+      .clearfix();
+      [class*="span"] {
+        .input-block-level();
+        float: left;
+        margin-left: @fluidGridGutterWidth;
+        *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+      }
+      [class*="span"]:first-child {
+        margin-left: 0;
+      }
+
+      // Space grid-sized controls properly if multiple per line
+      .controls-row [class*="span"] + [class*="span"] {
+        margin-left: @fluidGridGutterWidth;
+      }
+
+      // generate .spanX and .offsetX
+      .spanX (@gridColumns);
+      .offsetX (@gridColumns);
+    }
+
+  }
+
+  .input(@gridColumnWidth, @gridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .span(@columns) {
+      width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14;
+    }
+
+    input,
+    textarea,
+    .uneditable-input {
+      margin-left: 0; // override margin-left from core grid system
+    }
+
+    // Space grid-sized controls properly if multiple per line
+    .controls-row [class*="span"] + [class*="span"] {
+      margin-left: @gridGutterWidth;
+    }
+
+    // generate .spanX
+    .spanX (@gridColumns);
+
+  }
+}
diff --git a/core/administrator/templates/isis/less/bootstrap/responsive-1200px-min.less b/core/administrator/templates/isis/less/bootstrap/responsive-1200px-min.less
new file mode 100644
index 00000000..cd7d2812
--- /dev/null
+++ b/core/administrator/templates/isis/less/bootstrap/responsive-1200px-min.less
@@ -0,0 +1,201 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px) {
+
+  // Fixed grid
+  #grid > .core(@gridColumnWidth1200, @gridGutterWidth1200);
+
+  // Fluid grid
+   .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+    line-height: 0;
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    width: 100%;
+    min-height: 28px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    float: left;
+    margin-left: 2.76243094%;
+    *margin-left: 2.70923945%;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.76243094%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646409%;
+    *width: 91.3832726%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292818%;
+    *width: 82.81973669%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939227%;
+    *width: 74.25620078%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635%;
+    *width: 65.69266486%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044%;
+    *width: 57.12912895%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453%;
+    *width: 48.56559304%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524862%;
+    *width: 40.00205713%;
+  }
+  .row-fluid .span4 {
+    width: 31.49171271%;
+    *width: 31.43852122%;
+  }
+  .row-fluid .span3 {
+    width: 22.9281768%;
+    *width: 22.87498531%;
+  }
+  .row-fluid .span2 {
+    width: 14.36464088%;
+    *width: 14.31144939%;
+  }
+  .row-fluid .span1 {
+    width: 5.80110497%;
+    *width: 5.74791348%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486188%;
+    *margin-left: 105.4184789%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243094%;
+    *margin-left: 102.65604796%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132597%;
+    *margin-left: 96.85494299%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.19889503%;
+    *margin-left: 94.09251205%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779006%;
+    *margin-left: 88.29140708%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.63535912%;
+    *margin-left: 85.52897614%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.83425414%;
+    *margin-left: 79.72787116%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.0718232%;
+    *margin-left: 76.96544023%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.27071823%;
+    *margin-left: 71.16433525%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729%;
+    *margin-left: 68.40190431%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232%;
+    *margin-left: 62.60079934%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138%;
+    *margin-left: 59.8383684%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364641%;
+    *margin-left: 54.03726343%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121547%;
+    *margin-left: 51.27483249%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.5801105%;
+    *margin-left: 45.47372752%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767956%;
+    *margin-left: 42.71129658%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657459%;
+    *margin-left: 36.91019161%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414365%;
+    *margin-left: 34.14776067%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867%;
+    *margin-left: 28.3466557%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773%;
+    *margin-left: 25.58422476%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276%;
+    *margin-left: 19.78311978%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182%;
+    *margin-left: 17.02068884%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685%;
+    *margin-left: 11.21958387%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591%;
+    *margin-left: 8.45715293%;
+  }
+
+  // Input grid
+  #grid > .input(@gridColumnWidth1200, @gridGutterWidth1200);
+
+  // Thumbnails
+  .thumbnails {
+    margin-left: -@gridGutterWidth1200;
+  }
+  .thumbnails > li {
+    margin-left: @gridGutterWidth1200;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+
+}
diff --git a/core/administrator/templates/isis/less/bootstrap/responsive-768px-979px.less b/core/administrator/templates/isis/less/bootstrap/responsive-768px-979px.less
new file mode 100644
index 00000000..805e65a4
--- /dev/null
+++ b/core/administrator/templates/isis/less/bootstrap/responsive-768px-979px.less
@@ -0,0 +1,192 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 979px) {
+
+  // Fixed grid
+  #grid > .core(@gridColumnWidth768, @gridGutterWidth768);
+
+  // Fluid grid
+   .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+    line-height: 0;
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    width: 100%;
+    min-height: 28px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    float: left;
+    margin-left: 2.76243094%;
+    *margin-left: 2.70923945%;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.76243094%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646409%;
+    *width: 91.3832726%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292818%;
+    *width: 82.81973669%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939227%;
+    *width: 74.25620078%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635%;
+    *width: 65.69266486%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044%;
+    *width: 57.12912895%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453%;
+    *width: 48.56559304%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524862%;
+    *width: 40.00205713%;
+  }
+  .row-fluid .span4 {
+    width: 31.49171271%;
+    *width: 31.43852122%;
+  }
+  .row-fluid .span3 {
+    width: 22.9281768%;
+    *width: 22.87498531%;
+  }
+  .row-fluid .span2 {
+    width: 14.36464088%;
+    *width: 14.31144939%;
+  }
+  .row-fluid .span1 {
+    width: 5.80110497%;
+    *width: 5.74791348%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486188%;
+    *margin-left: 105.4184789%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243094%;
+    *margin-left: 102.65604796%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132597%;
+    *margin-left: 96.85494299%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.19889503%;
+    *margin-left: 94.09251205%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779006%;
+    *margin-left: 88.29140708%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.63535912%;
+    *margin-left: 85.52897614%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.83425414%;
+    *margin-left: 79.72787116%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.0718232%;
+    *margin-left: 76.96544023%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.27071823%;
+    *margin-left: 71.16433525%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729%;
+    *margin-left: 68.40190431%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232%;
+    *margin-left: 62.60079934%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138%;
+    *margin-left: 59.8383684%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364641%;
+    *margin-left: 54.03726343%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121547%;
+    *margin-left: 51.27483249%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.5801105%;
+    *margin-left: 45.47372752%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767956%;
+    *margin-left: 42.71129658%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657459%;
+    *margin-left: 36.91019161%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414365%;
+    *margin-left: 34.14776067%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867%;
+    *margin-left: 28.3466557%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773%;
+    *margin-left: 25.58422476%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276%;
+    *margin-left: 19.78311978%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182%;
+    *margin-left: 17.02068884%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685%;
+    *margin-left: 11.21958387%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591%;
+    *margin-left: 8.45715293%;
+  }
+
+  // Input grid
+  #grid > .input(@gridColumnWidth768, @gridGutterWidth768);
+
+  // No need to reset .thumbnails here since it's the same @gridGutterWidth
+
+}
diff --git a/core/administrator/templates/isis/less/bootstrap/wells.less b/core/administrator/templates/isis/less/bootstrap/wells.less
new file mode 100644
index 00000000..41aea380
--- /dev/null
+++ b/core/administrator/templates/isis/less/bootstrap/wells.less
@@ -0,0 +1,29 @@
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @wellBackground;
+  border: 1px solid @wellBackground;
+  .border-radius(@baseBorderRadius);
+  //.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #f0f0f0;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-large {
+  padding: 24px;
+  .border-radius(@borderRadiusLarge);
+}
+.well-small {
+  padding: 9px;
+  .border-radius(@borderRadiusSmall);
+}
diff --git a/core/administrator/templates/isis/less/icomoon.less b/core/administrator/templates/isis/less/icomoon.less
new file mode 100644
index 00000000..46f801b4
--- /dev/null
+++ b/core/administrator/templates/isis/less/icomoon.less
@@ -0,0 +1,39 @@
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'),
+	url('../../../../media/jui/fonts/IcoMoon.woff') format('woff'),
+	url('../../../../media/jui/fonts/IcoMoon.ttf') format('truetype'),
+	url('../../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+@import "../../../../media/jui/less/icomoon.less";
+.icon-edit:before {
+	color: @btnInfoBackgroundHighlight;
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-save-new:before,
+.icon-save-copy:before,
+.btn-toolbar .icon-copy:before {
+	color: @btnSuccessBackgroundHighlight;
+}
+.icon-unpublish:before,
+.icon-not-ok:before,
+.icon-eye-close:before,
+.icon-ban-circle:before,
+.icon-minus-sign:before,
+.btn-toolbar .icon-cancel:before {
+	color: @btnDangerBackgroundHighlight;
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-expired:before,
+.icon-pending:before {
+	color: @btnWarningBackgroundHighlight;
+}
+.icon-back:before {
+	content: "\e008";
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/pages/_com_cpanel.less b/core/administrator/templates/isis/less/pages/_com_cpanel.less
new file mode 100644
index 00000000..18d8a44c
--- /dev/null
+++ b/core/administrator/templates/isis/less/pages/_com_cpanel.less
@@ -0,0 +1,24 @@
+// com_cpanel
+
+.com_cpanel {
+	.well {
+		padding: 8px 14px;
+		border: 1px solid rgba(0,0,0,0.05);
+		.module-title.nav-header {
+			color: #555;
+		}
+		> .row-striped, > .list-striped {
+			margin: 0 -14px;
+			> .row-fluid {
+				padding: 8px 14px;
+				[class*="span"] {
+					margin-left: 0;
+				}
+			}
+			> li {
+				padding-left: 15px;
+				padding-right: 15px;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/core/administrator/templates/isis/less/pages/_com_postinstall.less b/core/administrator/templates/isis/less/pages/_com_postinstall.less
new file mode 100644
index 00000000..2c80f6f5
--- /dev/null
+++ b/core/administrator/templates/isis/less/pages/_com_postinstall.less
@@ -0,0 +1,21 @@
+// com_postinstall
+
+.com_postinstall {
+	fieldset {
+		background-color: #fafafa;
+		border: 1px solid #ccc;
+		border-radius: 5px;
+		margin: 0 0 18px;
+		padding: 4px 18px 18px;
+		.btn {
+			margin-top: 10px;
+		}
+	}
+	legend {
+		border: 0 none;
+		display: inline-block;
+		padding: 0 5px;
+		margin-bottom: 0;
+		width: auto;
+	}
+}
diff --git a/core/administrator/templates/isis/less/pages/_com_templates.less b/core/administrator/templates/isis/less/pages/_com_templates.less
new file mode 100644
index 00000000..7f8d76e7
--- /dev/null
+++ b/core/administrator/templates/isis/less/pages/_com_templates.less
@@ -0,0 +1,35 @@
+// Template Menu Assignment
+
+#menu-assignment {
+	position: relative;
+	.menu-links {
+		margin-top: 15px;
+		margin-left: 0;
+		-webkit-column-count: 3;
+		-moz-column-count: 3;
+		column-count: 3;
+		-moz-column-gap: 15px;
+		-webkit-column-gap: 15px;
+		column-gap: 15px;
+		> li {
+			display: inline-block;
+			vertical-align: top;
+			margin-bottom: 15px;
+			width: 100%;
+			list-style: none;
+		}
+	}
+	.menu-links-block {
+		background-color: #fafafa;
+	    border: 1px solid #ddd;
+	    border-radius: 3px;
+	    padding: 15px;
+	}
+}
+@media (max-width: @md-max) {
+	#menu-assignment .menu-links {
+		-webkit-column-count: auto;
+		-moz-column-count: auto;
+		column-count: auto;
+	}
+}
diff --git a/core/administrator/templates/isis/less/template-rtl.less b/core/administrator/templates/isis/less/template-rtl.less
new file mode 100644
index 00000000..57331b61
--- /dev/null
+++ b/core/administrator/templates/isis/less/template-rtl.less
@@ -0,0 +1,436 @@
+@import "template.less";
+@import "../../../../media/jui/less/bootstrap-rtl.less";
+
+.navbar {
+	.admin-logo {
+		float: right;
+		padding: 7px 15px 0px 12px;
+	}
+	.brand {
+		float: left;
+		padding: 6px 10px;
+	}
+	.nav {
+		margin: 0 0 0 10px;
+		> li > a {
+			padding: 6px 10px;
+		}
+		> li ul {
+			overflow-y: auto;
+			overflow-x: hidden;
+			-webkit-overflow-scrolling: touch;
+			-moz-overflow-scrolling: touch;
+			-ms-overflow-scrolling: touch;
+			-o-overflow-scrolling: touch;
+			overflow-scrolling: touch;
+			height: auto;
+			max-height: 500px;
+			margin: 0;
+			&::-webkit-scrollbar {
+				-webkit-appearance: none;
+				width: 7px;
+			}
+			&::-webkit-scrollbar-thumb {
+				border-radius: 4px;
+				background-color: rgba(0,0,0,.5);
+				-webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+			}
+		}
+	}
+	.nav-user .dropdown-menu li span {
+	padding-left: 0;
+	padding-right: 10px;
+	}
+	.nav > .dropdown.open:after {
+		right: 10px;
+		width: 0;
+	}
+	.empty-nav {
+		display: none;
+	}
+}
+
+#toolbar {
+	.btn {
+	    padding: 0 10px;
+	}
+	[class^="icon-"], [class*=" icon-"] {
+	    border-radius: 0 3px 3px 0;
+	    border-right: 0;
+	    border-left: 1px solid #b3b3b3;
+	    margin: 0 -10px 0 6px;
+	}
+}
+.chzn-container-single .chzn-single {
+    padding-left: 8px;
+    div {
+	    border-left: 0;
+	    border-right: 1px solid #cccccc;
+	}
+	abbr {
+    	left: 36px;
+	}
+}
+.chzn-container-active.chzn-with-drop .chzn-single div {
+    background-color: #f3f3f3;
+    border-bottom: 1px solid #cccccc;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 3px;
+    border-left: 1px solid #cccccc;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+    padding-left: 7px;
+    .search-choice-close {
+	    margin-left: 0;
+	    margin-right: 3px;
+	}
+}
+.chzn-container .chzn-single.chzn-color[rel="value_0"] div,
+.chzn-container .chzn-single.chzn-color[rel="value_1"] div {
+  border-right: none;
+}
+.chzn-container-single .chzn-search::after {
+    left: 20px;
+    right: auto;
+}
+
+.container-logo {
+	padding-top: 0;
+	float: left;
+	text-align: left;
+}
+
+.page-title {
+	[class^="icon-"],
+	[class*=" icon-"] {
+		margin-right: 0;
+		margin-left: 16px;
+	}
+}
+
+@media (max-width: @md-max) {
+	.navbar {
+		.admin-logo {
+			margin-right: 10px;
+			padding: 9px 9px 0 9px;
+		}
+		.btn-navbar {
+			float: left;
+			margin-right: 5px;
+			margin-left: 3px;
+		}
+		.nav-collapse .nav.pull-left {
+			float: none;
+			margin-left: 0;
+			margin-right: 0;
+		}
+	}
+
+	.nav-collapse .nav > li {
+		float: none;
+	}
+
+	.page-title {
+		[class^="icon-"],
+		[class*=" icon-"] {
+			margin-left: 10px;
+		}
+	}
+}
+
+/* Status module */
+#status {
+	padding: 4px 10px;
+
+	.btn-group {
+		margin: 0;
+	}
+	.btn-group.separator:after {
+		content: ' ';
+		display: block;
+		float: left;
+		background: #ADADAD;
+		margin: 0 10px;
+		height: 15px;
+		width: 1px;
+	}
+	.badge {
+		margin-left: .25em;
+		margin-right: 0;
+	}
+}
+
+/* Menus */
+.dropdown-menu > li > a {
+	text-align: right;
+}
+
+/* btn-group */
+.btn-group.btn-group-yesno > .btn, .btn-group > .btn, .btn-group > .btn + .dropdown-toggle {
+	float: none;
+}
+
+/* For grid.boolean */
+a.grid_false {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/publish_r.png');
+}
+
+a.grid_true {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	background-image: url('../images/admin/icon-16-allow.png');
+}
+
+/* Login */
+.view-login {
+	.login-joomla {
+		position: absolute;
+		right: 50%;
+		height: 24px;
+		width: 24px;
+		margin-right: -12px;
+		font-size: 22px;
+	}
+	.input-medium {
+		width: 169px;
+	}
+}
+.login {
+	.chzn-single {
+		width: 219px !important;
+	}
+	.chzn-container,
+	.chzn-drop {
+		width: 227px !important;
+		max-width: 227px !important;
+	}
+	.input-prepend .chzn-container-single .chzn-single {
+		.border-radius(3px 0 0 3px);
+		border-right:0px;
+	}
+}
+
+/* For collapsible sidebar */
+.j-sidebar-container {
+	position: absolute;
+	display: block;
+	left: auto;
+	right: -16.5%;
+	padding-top: 28px;
+	padding-bottom: 40px;
+	clear: both;
+	margin: -10px -1px 0 0;
+	border-right: 0;
+	border-left: 1px solid #d3d3d3;
+}
+
+.j-sidebar-container.j-sidebar-hidden {
+	left: auto;
+	right: -16.5%;
+}
+
+.j-sidebar-container.j-sidebar-visible {
+	left: auto;
+	right: 0;
+}
+
+.j-toggle-sidebar-header {
+	padding: 10px 19px 10px 0;
+}
+
+.sidebar {
+	padding: 3px 4px 3px 3px;
+}
+
+.j-toggle-button-wrapper {
+	&.j-toggle-hidden {
+		right: auto;
+		left: -24px;
+	}
+	&.j-toggle-visible {
+		right: auto;
+		left: 10px;
+	}
+}
+
+.j-sidebar-container .icon-folder-2 {
+    line-height: 15px;
+    padding-left: 0;
+}
+
+#system-message-container,
+#j-main-container {
+	padding: 0 5px 0 0;
+}
+
+#system-message-container.j-toggle-main,
+#j-main-container.j-toggle-main,
+#system-debug.j-toggle-main {
+	float: left;
+}
+
+@media (max-width: @lg-max) {
+	.j-toggle-button-wrapper.j-toggle-hidden {
+		right: auto;
+		left: -20px;
+	}
+}
+
+@media (max-width: @md-max) {
+	.j-sidebar-container {
+		position: relative;
+		padding: 0;
+		border-right: 0;
+		border-left: 0;
+	}
+
+	.j-sidebar-container.j-sidebar-hidden {
+		margin-left: auto;
+		margin-right: 16.5%;
+	}
+
+	.j-sidebar-container.j-sidebar-visible {
+		margin-left: auto;
+		margin-right: 0;
+	}
+
+	/* login */
+	.view-login {
+		select {
+			width: 229px
+		}
+	}
+}
+
+#j-main-container.expanded {
+	margin-right: 0;
+}
+
+/* Modal batch */
+@media (min-width: @md) {
+	.row-fluid [class*="span"] {
+		margin-right: 15px;
+		margin-left: 0;
+	}
+
+	.row-fluid .modal-batch [class*="span"] {
+		margin-right: 0;
+	}
+}
+
+.row-fluid .modal-batch [class*="span"] {
+	margin-right: 0;
+}
+
+/* Extended Responsive Styles */
+@media (max-width: @sm-max) {
+	.btn-toolbar .btn-wrapper .btn {
+		width: 100% !important;
+		margin-right:0px;
+	}
+	.btn-toolbar .btn-wrapper {
+		margin:0 10px 5px 10px;
+	}
+}
+
+@media (max-width: 420px) {
+	.j-sidebar-container {
+		margin: 0;
+	}
+	/* login */
+	.view-login {
+		.input-medium {
+			width: 173px;
+		}
+		select {
+			width: 229px
+		}
+	}
+}
+
+/* Stats plugin */
+.js-pstats-data-details dd {
+	margin-right: 240px;
+}
+
+/* Modal footer */
+.modal-footer button {
+	float: left;
+}
+
+/* Modal Header text align right even if parent container centered */
+.modal-header {
+	text-align: right;
+}
+
+
+/* Media Manager */
+#mediamanager-form .thumbnails-media .thumbnail {
+    margin-left: 18px !important;
+    margin-right: 0;
+    direction: ltr;
+    text-align: center;
+}
+.thumbnails-media .imgThumb label::before, .thumbnails-media .imgThumb .imgThumbInside::before {
+	left: 0;
+	right: auto;
+	border-radius: 3px 0;
+}
+.thumbnails-media .thumbnail input[type="radio"], .thumbnails-media .thumbnail input[type="checkbox"] {
+    left: auto;
+    right: 5px;
+}
+.thumbnails-media .imgDelete a.close {
+	border-radius: 0 3px;
+}
+.thumbnails-media .imgPreview a, .thumbnails-media .imgDetails {
+    border-radius: 3px 0;
+    border-width: 1px;
+    left: 0;
+    right: 0;
+    text-align: left;
+    direction: ltr;
+}
+.thumbnails-media .imgPreview a {
+	width: 100%;
+}
+
+/* SubForms (Table) */
+.subform-table-layout {
+	td {
+		padding-left: 10px;
+		&::before {
+			content: attr(data-column);
+			left: auto;
+			right: 10px;
+			padding-left: 10px;
+			padding-right: 0;
+		}
+	}
+	.subform-repeatable tbody td:last-of-type {
+		text-align: left;
+	}
+	.form-horizontal .controls {
+		margin-top: 0;
+	}
+}
+
+/* com_templates */
+.tree-holder {
+	ul {
+		ul {
+			padding-right: 15px;
+			box-shadow: 3px 0 0 rgba(0, 0, 0, 0.08);
+			padding-left: 0;
+			.folder-url, .file {
+				box-shadow: 3px 0 0 @linkColor;
+				border-right: 0;
+				border-left: 1px solid rgba(0, 0, 0, 0.08);
+			}
+		}
+	}
+}
diff --git a/core/administrator/templates/isis/less/template.less b/core/administrator/templates/isis/less/template.less
new file mode 100644
index 00000000..ce927e39
--- /dev/null
+++ b/core/administrator/templates/isis/less/template.less
@@ -0,0 +1,93 @@
+// CSS Reset
+@import "../../../../media/jui/less/reset.less";
+// Core variables and mixins
+@import "variables.less";
+// Custom for this template
+@import "bootstrap/mixins.less";
+// Grid system and page structure
+@import "../../../../media/jui/less/scaffolding.less";
+@import "../../../../media/jui/less/grid.less";
+@import "../../../../media/jui/less/layouts.less";
+// Base CSS
+@import "../../../../media/jui/less/type.less";
+@import "../../../../media/jui/less/code.less";
+@import "../../../../media/jui/less/forms.less";
+@import "../../../../media/jui/less/tables.less";
+// Components: common
+// @import "../../../../media/jui/less/sprites.less";
+@import "../../../../media/jui/less/dropdowns.less";
+@import "bootstrap/wells.less";
+@import "../../../../media/jui/less/component-animations.less";
+@import "../../../../media/jui/less/close.less";
+// Components: Buttons & Alerts
+@import "bootstrap/buttons.less";
+@import "bootstrap/button-groups.less";
+@import "../../../../media/jui/less/alerts.less";
+// Note: alerts share common CSS with buttons and thus have styles in buttons.less
+// Components: Nav
+@import "../../../../media/jui/less/navs.less";
+@import "../../../../media/jui/less/navbar.less";
+@import "../../../../media/jui/less/breadcrumbs.less";
+@import "../../../../media/jui/less/pagination.less";
+@import "../../../../media/jui/less/pager.less";
+// Components: Popovers
+@import "../../../../media/jui/less/modals.less";
+@import "../../../../media/jui/less/tooltip.less";
+@import "../../../../media/jui/less/popovers.less";
+// Components: Misc
+@import "../../../../media/jui/less/thumbnails.less";
+@import "../../../../media/jui/less/media.less";
+@import "../../../../media/jui/less/labels-badges.less";
+@import "../../../../media/jui/less/progress-bars.less";
+@import "../../../../media/jui/less/accordion.less";
+@import "../../../../media/jui/less/carousel.less";
+@import "../../../../media/jui/less/hero-unit.less";
+// Utility classes
+@import "../../../../media/jui/less/utilities.less";
+// RESPONSIVE CLASSES
+// ------------------
+@import "../../../../media/jui/less/responsive-utilities.less";
+// MEDIA QUERIES
+// ------------------
+// Phones to portrait tablets and narrow desktops
+@import "../../../../media/jui/less/responsive-767px-max.less";
+// Tablets to regular desktops
+@import "bootstrap/responsive-768px-979px.less";
+// Large desktops
+@import "bootstrap/responsive-1200px-min.less";
+// RESPONSIVE NAVBAR
+// ------------------
+// From 979px and below, show a button to toggle navbar contents
+@import "../../../../media/jui/less/responsive-navbar.less";
+// Extended for JUI
+@import "../../../../media/jui/less/bootstrap-extended.less";
+// Has to be last to override when necessary
+// div.modal (instead of .modal)
+@import "../../../../media/jui/less/modals.joomla.less";
+@import "../../../../media/jui/less/responsive-767px-max.joomla.less";
+// Icon Font
+@import "icomoon.less";
+
+// Blocks
+@import "blocks/_global.less";
+@import "blocks/_chzn-override.less";
+@import "blocks/_editors.less";
+@import "blocks/_forms.less";
+@import "blocks/_header.less";
+@import "blocks/_login.less";
+@import "blocks/_media.less";
+@import "blocks/_modals.less";
+@import "blocks/_navbar.less";
+@import "blocks/_quickicons.less";
+@import "blocks/_sidebar.less";
+@import "blocks/_status.less";
+@import "blocks/_tables.less";
+@import "blocks/_toolbar.less";
+@import "blocks/_treeselect.less";
+@import "blocks/_utility-classes.less";
+@import "blocks/_custom.less";
+
+// Pages
+@import "pages/_com_cpanel.less";
+@import "pages/_com_postinstall.less";
+@import "pages/_com_templates.less";
diff --git a/core/administrator/templates/isis/less/variables.less b/core/administrator/templates/isis/less/variables.less
new file mode 100644
index 00000000..6d6a804f
--- /dev/null
+++ b/core/administrator/templates/isis/less/variables.less
@@ -0,0 +1,340 @@
+//
+// Variables
+// --------------------------------------------------
+
+// > Joomla JUI
+// Responsive Breakpoints
+// -------------------------
+@xs:                    320px;
+@sm:                    480px;
+@md:                    768px;
+@lg:                    980px;
+@xl:                    1200px;
+
+@xs-max:                @xs - 1;
+@sm-max:                @sm - 1;
+@md-max:                @md - 1;
+@lg-max:                @lg - 1;
+@xl-max:                @xl - 1;
+// < Joomla JUI
+
+// Global values
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black:                 #000;
+@grayDarker:            #222;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+
+// Accent colors
+// -------------------------
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor:             darken(#428bca, 10%);
+@linkColorHover:        darken(@linkColor, 15%);
+
+
+// Typography
+// -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
+// > Joomla JUI
+@baseFontSize:          13px;
+// < Joomla JUI
+@baseFontFamily:        @sansFontFamily;
+// > Joomla JUI
+@baseLineHeight:        18px;
+// < Joomla JUI
+@altFontFamily:         @serifFontFamily;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+// > Joomla JUI
+@fontSizeSmall:         ceil(@baseFontSize * 0.85); // ~12px
+// < Joomla JUI
+@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+@paddingLarge:          11px 19px; // 44px
+@paddingSmall:          2px 10px;  // 26px
+@paddingMini:           0 6px;   // 22px
+
+@baseBorderRadius:      3px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             #f9f9f9; // for striping
+@tableBackgroundHover:              #F0F0F0; // for hover
+@tableBorder:                       #ddd; // table and cell border
+
+// Buttons
+// -------------------------
+@btnBackground:                     #f3f3f3;
+@btnBackgroundHighlight:            darken(@grayLighter, 3%);
+@btnBorder:                         lighten(@grayLight, 10%);
+
+// > Joomla JUI
+@btnPrimaryBackground:              #2384d3;
+@btnPrimaryBackgroundHighlight:     #15497c;
+// < Joomla JUI
+
+@btnInfoBackground:                 #2f96b4;
+@btnInfoBackgroundHighlight:        darken(@btnInfoBackground, 10%);
+
+@btnSuccessBackground:              #46a546;
+@btnSuccessBackgroundHighlight:     darken(@btnSuccessBackground, 10%);
+
+@btnWarningBackground:              @orange;
+@btnWarningBackgroundHighlight:     darken(@btnWarningBackground, 10%);
+
+@btnDangerBackground:               #bd362f;
+@btnDangerBackgroundHighlight:      darken(@btnDangerBackground, 10%);
+
+@btnInverseBackground:              #444;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground:               @white;
+@inputBorder:                   #ccc;
+@inputBorderHighlight:			#3071A9;
+@inputBorderRadius:             3px;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         #F0F0F0;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @white;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownDividerTop:            #F0F0F0;
+@dropdownDividerBottom:         @white;
+
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkColorActive:       @dropdownLinkColor;
+
+@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
+@dropdownLinkBackgroundActive:  @linkColor;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexTooltip:           1030;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+@zindexPopover:           1060;
+
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                @grayLighter;
+
+
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
+// Wells
+// -------------------------
+@wellBackground:                  #F0F0F0;
+
+
+// Navbar
+// -------------------------
+// > Joomla JUI
+@navbarCollapseWidth:             @md-max;
+// < Joomla JUI
+@navbarCollapseDesktopWidth:      (@navbarCollapseWidth + 1);
+
+@navbarHeight:                    40px;
+@navbarBackgroundHighlight:       #ffffff;
+@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
+@navbarBorder:                    darken(@navbarBackground, 12%);
+
+@navbarText:                      @gray;
+@navbarLinkColor:                 @gray;
+@navbarLinkColorHover:            @grayDark;
+@navbarLinkColorActive:           @gray;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      darken(@navbarBackground, 5%);
+
+@navbarBrandColor:                @navbarLinkColor;
+
+// Inverted navbar
+// > Joomla JUI
+@navbarInverseBackground:                darken(@headerBackground, 10%);
+@navbarInverseBackgroundHighlight:       darken(@headerBackground, 5%);
+@navbarInverseBorder:                    darken(@headerBackground, 15%);
+
+@navbarInverseText:                      lighten(@grayLight, 25%);
+@navbarInverseLinkColor:                 lighten(@grayLight, 25%);
+// < Joomla JUI
+@navbarInverseLinkColorHover:            @white;
+@navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
+@navbarInverseLinkBackgroundHover:       transparent;
+@navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
+
+@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus:     @white;
+@navbarInverseSearchBorder:              @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor:    #ccc;
+
+@navbarInverseBrandColor:                @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground:                #fff;
+@paginationBorder:                    #ddd;
+@paginationActiveBackground:          #F0F0F0;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              @grayLighter;
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
+
+// Form states and alerts
+// -------------------------
+@warningText:             #8a6d3b;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 5%);
+
+@errorText:               #a94442;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 5%);
+
+@successText:             #3c763d;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #31708f;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+// Tooltips and popovers
+// -------------------------
+@tooltipColor:            #fff;
+@tooltipBackground:       #000;
+@tooltipArrowWidth:       5px;
+@tooltipArrowColor:       @tooltipBackground;
+
+@popoverBackground:       #fff;
+@popoverArrowWidth:       10px;
+@popoverArrowColor:       #fff;
+@popoverTitleBackground:  darken(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterColor:  rgba(0,0,0,.25);
+
+
+
+// GRID
+// --------------------------------------------------
+
+
+// Default 940px grid
+// -------------------------
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// 1200px min
+@gridColumnWidth1200:     70px;
+@gridGutterWidth1200:     30px;
+@gridRowWidth1200:        (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768:      42px;
+@gridGutterWidth768:      20px;
+@gridRowWidth768:         (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:         percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth:         percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200:     percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);
+
+
+// > Joomla JUI
+// Login
+// -------------------------
+@loginBackground:                  #17568c;
+
+// Header
+// -------------------------
+@headerBackground:                 #1a3867;
+@headerBackgroundHighlight:        #17568c;
+// < Joomla JUI
\ No newline at end of file
diff --git a/core/administrator/templates/isis/login.php b/core/administrator/templates/isis/login.php
new file mode 100644
index 00000000..4b7d39bc
--- /dev/null
+++ b/core/administrator/templates/isis/login.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Templates.isis
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app  = JFactory::getApplication();
+$lang = JFactory::getLanguage();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Gets the FrontEnd Main page Uri
+$frontEndUri = JUri::getInstance(JUri::root());
+$frontEndUri->setScheme(((int) $app->get('force_ssl', 0) === 2) ? 'https' : 'http');
+
+// Color Params
+$background_color = $this->params->get('loginBackgroundColor') ?: '';
+$color_is_light   = $background_color && colorIsLight($background_color);
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+JHtml::_('bootstrap.tooltip');
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add Stylesheets
+JHtml::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', array('version' => 'auto', 'relative' => true));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Load specific language related CSS
+JHtml::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+
+// Load custom.css
+JHtml::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
+
+// Detecting Active Variables
+$option   = $app->input->getCmd('option', '');
+$view     = $app->input->getCmd('view', '');
+$layout   = $app->input->getCmd('layout', '');
+$task     = $app->input->getCmd('task', '');
+$itemid   = $app->input->getCmd('Itemid', '');
+$sitename = htmlspecialchars($app->get('sitename', ''), ENT_QUOTES, 'UTF-8');
+
+function colorIsLight($color)
+{
+	$r = hexdec(substr($color, 1, 2));
+	$g = hexdec(substr($color, 3, 2));
+	$b = hexdec(substr($color, 5, 2));
+
+	$yiq = (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
+
+	return $yiq >= 200;
+}
+
+// Background color
+if ($background_color)
+{
+	$this->addStyleDeclaration('
+	.view-login {
+		background-color: ' . $background_color . ';
+	}');
+}
+
+// Responsive Styles
+$this->addStyleDeclaration('
+	@media (max-width: 480px) {
+		.view-login .container {
+			margin-top: -170px;
+		}
+		.btn {
+			font-size: 13px;
+			padding: 4px 10px 4px;
+		}
+	}');
+
+// Check if debug is on
+if (JPluginHelper::isEnabled('system', 'debug') && ($app->get('debug_lang', 0) || $app->get('debug', 0)))
+{
+	$this->addStyleDeclaration('
+	.view-login .container {
+		position: static;
+		margin-top: 20px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+	.view-login .navbar-fixed-bottom {
+		position: relative;
+	}');
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<jdoc:include type="head" />
+</head>
+<body class="site <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task . ' itemid-' . $itemid . ' '; ?>">
+	<!-- Container -->
+	<div class="container">
+		<div id="content">
+			<!-- Begin Content -->
+			<div id="element-box" class="login well">
+				<?php if ($loginLogoFile = $this->params->get('loginLogoFile')) : ?>
+					<img src="<?php echo JUri::root() . $loginLogoFile; ?>" alt="<?php echo $sitename; ?>" />
+				<?php else: ?>
+					<img src="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/images/joomla.png" alt="<?php echo $sitename; ?>" />
+				<?php endif; ?>
+				<hr />
+				<jdoc:include type="message" />
+				<jdoc:include type="component" />
+			</div>
+			<noscript>
+				<?php echo JText::_('JGLOBAL_WARNJAVASCRIPT'); ?>
+			</noscript>
+			<!-- End Content -->
+		</div>
+	</div>
+	<div class="navbar<?php echo $color_is_light ? ' navbar-inverse' : ''; ?> navbar-fixed-bottom hidden-phone">
+		<p class="pull-right">
+			&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+		</p>
+		<a class="login-joomla hasTooltip" href="https://www.joomla.org" target="_blank"  rel="noopener noreferrer" title="<?php echo JHtml::_('tooltipText', 'TPL_ISIS_ISFREESOFTWARE'); ?>"><span class="icon-joomla"></span></a>
+		<a href="<?php echo $frontEndUri->toString(); ?>" target="_blank" class="pull-left"><span class="icon-out-2"></span><?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE'); ?></a>
+	</div>
+	<jdoc:include type="modules" name="debug" style="none" />
+</body>
+</html>
diff --git a/core/administrator/templates/isis/templateDetails.xml b/core/administrator/templates/isis/templateDetails.xml
new file mode 100644
index 00000000..e7c0ba65
--- /dev/null
+++ b/core/administrator/templates/isis/templateDetails.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/2.5/template-install.dtd">
+<extension version="3.1" type="template" client="administrator">
+	<name>isis</name>
+	<version>1.0</version>
+	<creationDate>3/30/2012</creationDate>
+	<author>Kyle Ledbetter</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<description>TPL_ISIS_XML_DESCRIPTION</description>
+	<files>
+		<filename>component.php</filename>
+		<filename>cpanel.php</filename>
+		<filename>favicon.ico</filename>
+		<filename>index.php</filename>
+		<filename>login.php</filename>
+		<filename>templateDetails.xml</filename>
+		<filename>template_preview.png</filename>
+		<filename>template_thumbnail.png</filename>
+		<folder>css</folder>
+		<folder>html</folder>
+		<folder>images</folder>
+		<folder>img</folder>
+		<folder>js</folder>
+		<folder>language</folder>
+	<folder>less</folder>
+	</files>
+	<positions>
+		<position>menu</position>
+		<position>submenu</position>
+		<position>toolbar</position>
+		<position>title</position>
+		<position>status</position>
+		<position>icon</position>
+		<position>cp_shell</position>
+		<position>cpanel</position>
+		<position>bottom</position>
+		<position>footer</position>
+		<position>login</position>
+		<position>debug</position>
+	</positions>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.tpl_isis.ini</language>
+		<language tag="en-GB">en-GB/en-GB.tpl_isis.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+
+				<field 
+					name="templateColor" 
+					type="color" 
+					label="TPL_ISIS_COLOR_LABEL"
+					description="TPL_ISIS_COLOR_DESC" 
+					class="" 
+					default="#10223E"
+					validate="color"
+				/>
+
+				<field 
+					name="headerColor" 
+					type="color" 
+					label="TPL_ISIS_COLOR_HEADER_LABEL"
+					description="TPL_ISIS_COLOR_HEADER_DESC" 
+					class="" 
+					default="#1A3867"
+					validate="color"
+				/>
+
+				<field 
+					name="sidebarColor" 
+					type="color" 
+					label="TPL_ISIS_COLOR_SIDEBAR_LABEL"
+					description="TPL_ISIS_COLOR_SIDEBAR_DESC" 
+					class="" 
+					default="#3071a9"
+					validate="color"
+				/>
+
+				<field 
+					name="linkColor" 
+					type="color" 
+					label="TPL_ISIS_COLOR_LINK_LABEL"
+					description="TPL_ISIS_COLOR_LINK_DESC" 
+					class="" 
+					default="#3071a9"
+					validate="color"
+				/>
+
+				<field 
+					name="loginBackgroundColor" 
+					type="color" 
+					label="TPL_ISIS_COLOR_LOGIN_BACKGROUND_LABEL"
+					description="TPL_ISIS_COLOR_LOGIN_BACKGROUND_DESC"
+					class="" 
+					default="#17568C"
+					validate="color"
+				/>
+
+				<field 
+					name="logoFile" 
+					type="media" 
+					label="TPL_ISIS_LOGO_LABEL"
+					description="TPL_ISIS_LOGO_DESC"
+					class="" 
+					default=""
+				 />
+
+				<field 
+					name="loginLogoFile" 
+					type="media" 
+					label="TPL_ISIS_LOGIN_LOGO_LABEL"
+					description="TPL_ISIS_LOGIN_LOGO_DESC"
+					class="" 
+					default=""
+				 />
+
+				<field 
+					name="admin_menus"
+					type="radio"
+					label="TPL_ISIS_FIELD_ADMIN_MENUS_LABEL"
+					description="TPL_ISIS_FIELD_ADMIN_MENUS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field 
+					name="displayHeader" 
+					type="radio"
+					label="TPL_ISIS_HEADER_LABEL"
+					description="TPL_ISIS_HEADER_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field 
+					name="statusFixed" 
+					type="list"
+					label="TPL_ISIS_STATUS_LABEL"
+					description="TPL_ISIS_STATUS_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">TPL_ISIS_STATUS_BOTTOM</option>
+					<option value="0">TPL_ISIS_STATUS_TOP</option>
+				</field>
+
+				<field 
+					name="stickyToolbar" 
+					type="radio"
+					label="TPL_ISIS_STICKY_LABEL"
+					description="TPL_ISIS_STICKY_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/administrator/templates/isis/template_preview.png b/core/administrator/templates/isis/template_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5eb718d38234f8cbdf1a79c81067fab4f5f8152
GIT binary patch
literal 28475
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/isis/template_thumbnail.png b/core/administrator/templates/isis/template_thumbnail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea155b07cdfcdcf8353faaaece77bcfafbde1d4f
GIT binary patch
literal 7936
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

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/system/component.php b/core/administrator/templates/system/component.php
new file mode 100644
index 00000000..26fa7cae
--- /dev/null
+++ b/core/administrator/templates/system/component.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body class="contentpane">
+	<jdoc:include type="message" />
+	<jdoc:include type="component" />
+</body>
+</html>
diff --git a/core/administrator/templates/system/css/error.css b/core/administrator/templates/system/css/error.css
new file mode 100644
index 00000000..60fede38
--- /dev/null
+++ b/core/administrator/templates/system/css/error.css
@@ -0,0 +1,53 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.outline {
+	border: 1px solid #cccccc;
+	background: #ffffff;
+	padding: 2px;
+}
+
+body {
+	margin: 15px;
+	height: 100%;
+	padding: 0;
+	font-family: Arial, Helvetica, Sans Serif;
+	font-size: 11px;
+	color: #333333;
+	background: #ffffff;
+}
+
+.frame {
+	background-color: #FEFCF3;
+	padding: 8px;
+	border: solid 1px #000000;
+	margin-top: 13px;
+	margin-bottom: 25px;
+}
+
+h1 {
+	color: #cc3333;
+	font-size: 18px;
+}
+
+.table {
+	border-collapse: collapse;
+	margin-top: 13px;
+}
+
+td {
+	padding: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+	border: solid 1px #bbbbbb;
+	font-size: 10px;
+}
+
+.type {
+	background-color: #cc0000;
+	color: #ffffff;
+	font-weight: bold;
+	padding: 3px;
+}
\ No newline at end of file
diff --git a/core/administrator/templates/system/css/system.css b/core/administrator/templates/system/css/system.css
new file mode 100644
index 00000000..68d90eb2
--- /dev/null
+++ b/core/administrator/templates/system/css/system.css
@@ -0,0 +1,7 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Import project-level system CSS */
+@import url(../../../../media/system/css/system.css);
\ No newline at end of file
diff --git a/core/administrator/templates/system/error.php b/core/administrator/templates/system/error.php
new file mode 100644
index 00000000..c9722305
--- /dev/null
+++ b/core/administrator/templates/system/error.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentError $this */
+
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $this->error->getCode(); ?> - <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></title>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/error.css" rel="stylesheet" />
+	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
+</head>
+<body>
+	<table class="outline" style="margin: 0 auto; width: 550px;">
+		<tr>
+			<td style="text-align: center;">
+				<h1><?php echo $this->error->getCode() ?> - <?php echo JText::_('JERROR_AN_ERROR_HAS_OCCURRED'); ?></h1>
+			</td>
+		</tr>
+		<tr>
+			<td style="text-align: center;">
+				<p>
+					<?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+					<?php if ($this->debug) : ?>
+						<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+					<?php endif; ?>
+				</p>
+				<p><a href="<?php echo JRoute::_('index.php'); ?>"><?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
+				<?php if ($this->debug) : ?>
+					<div>
+						<?php echo $this->renderBacktrace(); ?>
+						<?php // Check if there are more Exceptions and render their data as well ?>
+						<?php if ($this->error->getPrevious()) : ?>
+							<?php $loop = true; ?>
+							<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+							<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+							<?php $this->setError($this->_error->getPrevious()); ?>
+							<?php while ($loop === true) : ?>
+								<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+								<p>
+									<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+									<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+								</p>
+								<?php echo $this->renderBacktrace(); ?>
+								<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+							<?php endwhile; ?>
+							<?php // Reset the main error object to the base error ?>
+							<?php $this->setError($this->error); ?>
+						<?php endif; ?>
+					</div>
+				<?php endif; ?>
+			</td>
+		</tr>
+	</table>
+</body>
+</html>
diff --git a/core/administrator/templates/system/html/modules.php b/core/administrator/templates/system/html/modules.php
new file mode 100644
index 00000000..d88c9b9c
--- /dev/null
+++ b/core/administrator/templates/system/html/modules.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/*
+ * none (output raw module content)
+ */
+function modChrome_none($module, &$params, &$attribs)
+{
+	echo $module->content;
+}
+
+/*
+ * html5 (chosen html5 tag and font header tags)
+ */
+function modChrome_html5($module, &$params, &$attribs)
+{
+	$moduleTag      = $params->get('module_tag');
+	$headerTag      = htmlspecialchars($params->get('header_tag'), ENT_COMPAT, 'UTF-8');
+	$headerClass    = $params->get('header_class');
+	$bootstrapSize  = $params->get('bootstrap_size');
+	$moduleClass    = !empty($bootstrapSize) ? ' span' . (int) $bootstrapSize . '' : '';
+	$moduleClassSfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+	if (!empty ($module->content))
+	{
+		$html  = "<{$moduleTag} class=\"moduletable{$moduleClassSfx} {$moduleClass}\">";
+
+		if ((bool) $module->showtitle)
+		{
+			$html .= "<{$headerTag} class=\"{$headerClass}\">{$module->title}</{$headerTag}>";
+		}
+
+		$html .= $module->content;
+		$html .= "</{$moduleTag}>";
+
+		echo $html;
+	}
+}
+
+/*
+ * xhtml (divs and font header tags)
+ * With the new advanced parameter it does the same as the html5 chrome
+ */
+function modChrome_xhtml($module, &$params, &$attribs)
+{
+	$moduleTag      = $params->get('module_tag', 'div');
+	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_COMPAT, 'UTF-8');
+	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
+	$moduleClass    = $bootstrapSize != 0 ? ' span' . $bootstrapSize : '';
+
+	// Temporarily store header class in variable
+	$headerClass    = $params->get('header_class');
+	$headerClass    = $headerClass ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
+
+	$content = trim($module->content);
+
+	if (!empty ($content)) : ?>
+		<<?php echo $moduleTag; ?> class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+			<?php if ($module->showtitle != 0) : ?>
+				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
+			<?php endif; ?>
+			<?php echo $content; ?>
+		</<?php echo $moduleTag; ?>>
+	<?php endif;
+}
+
+/*
+ * allows sliders
+ */
+function modChrome_sliders($module, &$params, &$attribs)
+{
+	$content = trim($module->content);
+
+	if (!empty($content))
+	{
+		echo JHtml::_('sliders.panel', $module->title, 'module' . $module->id);
+		echo $content;
+	}
+}
+
+/*
+ * allows tabs
+ */
+function modChrome_tabs($module, &$params, &$attribs)
+{
+	$content = trim($module->content);
+
+	if (!empty($content))
+	{
+		echo JHtml::_('tabs.panel', $module->title, 'module' . $module->id);
+		echo $content;
+	}
+}
diff --git a/core/administrator/templates/system/images/calendar.png b/core/administrator/templates/system/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..586bc28ed06b0a6af93f67c5649f1a58ac1a7ad1
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006PNkl<Zcmb`F
zgR>t=5P-kkeYRuUwo9?CVvKTZ>%WNYq!8P-eRr|-+nJs$>Q(IP#Y_*rCVwjyz=GXR
zCmKV4ZKR-xpaqmaYJYA}-uUs;Xl2kMM`rddT{{Xuj2Yg!c5)WKA(NL~tqc$VJX&x$
zan%qo2DAdv;JV>F@*dm>ymy1O*Q2+4gO2?KU<k!P{%jBxent^Oe1P|<2%P^H09R=~
z0<?Tg$v+RlNa%@3=!wo9fjoHth<plAA%G=Crqi=w4$Jr5r(1(OtT^z1uJv+Qb?`o&
z>*itIq5HJ2lZUr2-hJ+Ys|7KJC<j(~mmJ4t^}z>$zV7e?_T8V(?zMsuA^O;4$`wc;
z;)Vb_Hv|LT1&hv}#V8v()y*N=8{5~;!L}UAlqiX9JG82iCoHX!&pj|gaB<_Yha7%1
zk3*Xc#`o&PDDR@hjhnY{Jir<+i~^}PhED-Xg2T}cw5XQNfz437NKvlex*6z>HI}+%
z(h+UAa_>1ADX}ERMtuxHNl0^Si>;>~0dV8iEi5dypMHcZAY!=s&vVj}V#rE~3&Q?b
z1*I^AAvCL$MU*p=rWLc;b@mZWym9rxhg`e&g4DzqvQy&%m}B$N16PM3R4kmtzfay$
zB2PRw{(D7%^cXJPdG5swsh;JWwD{0d$MPZaNh6tkQ<hw*8qt#I*Vq5Fk^ro<;#>0U
e<+~01AMyb~u`?HDzjjFg0000<MNUMnLSTZiIv1k=

literal 0
HcmV?d00001

diff --git a/core/administrator/templates/system/index.php b/core/administrator/templates/system/index.php
new file mode 100644
index 00000000..21b4c9f9
--- /dev/null
+++ b/core/administrator/templates/system/index.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+include __DIR__ . '/component.php';
diff --git a/core/bin/index.html b/core/bin/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/bin/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/bin/keychain.php b/core/bin/keychain.php
new file mode 100644
index 00000000..3398ab15
--- /dev/null
+++ b/core/bin/keychain.php
@@ -0,0 +1,415 @@
+#!/usr/bin/env php
+<?php
+/**
+ * @package    Joomla.Platform
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ */
+
+// @deprecated  4.0  Deprecated without replacement
+
+// We are a valid entry point.
+define('_JEXEC', 1);
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+// Get the framework.
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+// Import the configuration.
+require_once JPATH_CONFIGURATION . '/configuration.php';
+
+// System configuration.
+$config = new JConfig;
+
+// Configure error reporting to maximum for CLI output.
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+/**
+ * Keychain Manager.
+ *
+ * @since  12.3
+ */
+class KeychainManager extends JApplicationCli
+{
+	/**
+	 * @var    boolean  A flag if the keychain has been updated to trigger saving the keychain
+	 * @since  12.3
+	 */
+	protected $updated = false;
+
+	/**
+	 * @var    JKeychain  The keychain object being manipulated.
+	 * @since  12.3
+	 */
+	protected $keychain = null;
+
+	/**
+	 * Execute the application
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function execute( )
+	{
+		if (!count($this->input->args))
+		{
+			// Check if they passed --help in otherwise display short usage summary
+			if ($this->input->get('help', false) === false)
+			{
+				$this->out("usage: {$this->input->executable} [options] [command] [<args>]");
+				exit(1);
+			}
+			else
+			{
+				$this->displayHelp();
+				exit(0);
+			}
+		}
+
+		// For all tasks but help and init we use the keychain
+		if (!in_array($this->input->args[0], array('help', 'init')))
+		{
+			$this->loadKeychain();
+		}
+
+		switch ($this->input->args[0])
+		{
+			case 'init':
+				$this->initPassphraseFile();
+				break;
+			case 'list':
+				$this->listEntries();
+				break;
+			case 'create':
+				$this->create();
+				break;
+			case 'change':
+				$this->change();
+				break;
+			case 'delete':
+				$this->delete();
+				break;
+			case 'read':
+				$this->read();
+				break;
+			case 'help':
+				$this->displayHelp();
+				break;
+			default:
+				$this->out('Invalid command.');
+				break;
+		}
+
+		if ($this->updated)
+		{
+			$this->saveKeychain();
+		}
+
+		exit(0);
+	}
+
+	/**
+	 * Load the keychain from a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function loadKeychain()
+	{
+		$keychain = $this->input->get('keychain', '', 'raw');
+		$publicKeyFile = $this->input->get('public-key', '', 'raw');
+		$passphraseFile = $this->input->get('passphrase', '', 'raw');
+
+		$this->keychain = new JKeychain;
+
+		if (file_exists($keychain))
+		{
+			if (file_exists($publicKeyFile))
+			{
+				$this->keychain->loadKeychain($keychain, $passphraseFile, $publicKeyFile);
+			}
+			else
+			{
+				$this->out('Public key not specified or missing!');
+				exit(1);
+			}
+		}
+	}
+
+	/**
+	 * Save this keychain to a file.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function saveKeychain()
+	{
+		$keychain = $this->input->get('keychain', '', 'raw');
+		$publicKeyFile = $this->input->get('public-key', '', 'raw');
+		$passphraseFile = $this->input->get('passphrase', '', 'raw');
+
+		if (!file_exists($publicKeyFile))
+		{
+			$this->out("Public key file specified doesn't exist: $publicKeyFile");
+			exit(1);
+		}
+
+		$this->keychain->saveKeychain($keychain, $passphraseFile, $publicKeyFile);
+	}
+
+	/**
+	 * Initialise a new passphrase file.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function initPassphraseFile()
+	{
+		$keychain = new JKeychain;
+
+		$passphraseFile = $this->input->get('passphrase', '', 'raw');
+		$privateKeyFile = $this->input->get('private-key', '', 'raw');
+
+		if (!strlen($passphraseFile))
+		{
+			$this->out('A passphrase file must be specified with --passphrase');
+			exit(1);
+		}
+
+		if (!file_exists($privateKeyFile))
+		{
+			$this->out("protected key file specified doesn't exist: $privateKeyFile");
+			exit(1);
+		}
+
+		$this->out('Please enter the new passphrase:');
+		$passphrase = $this->in();
+
+		$this->out('Please enter the passphrase for the protected key:');
+		$privateKeyPassphrase = $this->in();
+
+		$keychain->createPassphraseFile($passphrase, $passphraseFile, $privateKeyFile, $privateKeyPassphrase);
+	}
+
+	/**
+	 * Create a new entry
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function create()
+	{
+		if (count($this->input->args) != 3)
+		{
+			$this->out("usage: {$this->input->executable} [options] create entry_name entry_value");
+			exit(1);
+		}
+
+		if ($this->keychain->exists($this->input->args[1]))
+		{
+			$this->out('error: entry already exists. To change this entry, use "change"');
+			exit(1);
+		}
+
+		$this->change();
+	}
+
+	/**
+	 * Change an existing entry to a new value or create an entry if missing.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function change()
+	{
+		if (count($this->input->args) != 3)
+		{
+			$this->out("usage: {$this->input->executable} [options] change entry_name entry_value");
+			exit(1);
+		}
+
+		$this->updated = true;
+		$this->keychain->setValue($this->input->args[1], $this->input->args[2]);
+	}
+
+	/**
+	 * Read an entry from the keychain
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function read()
+	{
+		if (count($this->input->args) != 2)
+		{
+			$this->out("usage: {$this->input->executable} [options] read entry_name");
+			exit(1);
+		}
+
+		$key = $this->input->args[1];
+		$this->out($key . ': ' . $this->dumpVar($this->keychain->get($key)));
+	}
+
+	/**
+	 * Get the string from var_dump
+	 *
+	 * @param   mixed  $var  The variable you want to have dumped.
+	 *
+	 * @return  string  The result of var_dump
+	 *
+	 * @since   12.3
+	 */
+	private function dumpVar($var)
+	{
+		ob_start();
+		var_dump($var);
+		$result = trim(ob_get_contents());
+		ob_end_clean();
+
+		return $result;
+	}
+
+	/**
+	 * Delete an entry from the keychain
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function delete()
+	{
+		if (count($this->input->args) != 2)
+		{
+			$this->out("usage: {$this->input->executable} [options] delete entry_name");
+			exit(1);
+		}
+
+		$this->updated = true;
+		$this->keychain->deleteValue($this->input->args[1]);
+	}
+
+	/**
+	 * List entries in the keychain
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function listEntries()
+	{
+		foreach ($this->keychain->toArray() as $key => $value)
+		{
+			$line = $key;
+
+			if ($this->input->get('print-values'))
+			{
+				$line .= ': ' . $this->dumpVar($value);
+			}
+
+			$this->out($line);
+		}
+	}
+
+	/**
+	 * Display the help information
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function displayHelp()
+	{
+/*
+COMMANDS
+
+ - list
+ - create entry_name entry_value
+ - change entry_name entry_value
+ - delete entry_name
+ - read   entry_name
+*/
+
+		$help = <<<HELP
+Keychain Management Utility
+
+usage: {$this->input->executable} [--keychain=/path/to/keychain]
+	[--passphrase=/path/to/passphrase.dat] [--public-key=/path/to/public.pem]
+	[command] [<args>]
+
+OPTIONS
+
+  --keychain=/path/to/keychain
+    Path to a keychain file to manipulate.
+
+  --passphrase=/path/to/passphrase.dat
+    Path to a passphrase file containing the encryption/decryption key.
+
+  --public-key=/path/to/public.pem
+    Path to a public key file to decrypt the passphrase file.
+
+
+COMMANDS
+
+  list:
+    Usage: list [--print-values]
+    Lists all entries in the keychain. Optionally pass --print-values to print the values as well.
+
+  create:
+    Usage: create entry_name entry_value
+    Creates a new entry in the keychain called "entry_name" with the plaintext value "entry_value".
+    NOTE: This is an alias for change.
+
+  change:
+    Usage: change entry_name entry_value
+    Updates the keychain entry called "entry_name" with the value "entry_value".
+
+  delete:
+    Usage: delete entry_name
+    Removes an entry called "entry_name" from the keychain.
+
+  read:
+    Usage: read entry_name
+    Outputs the plaintext value of "entry_name" from the keychain.
+
+  init:
+    Usage: init
+    Creates a new passphrase file and prompts for a new passphrase.
+
+HELP;
+		$this->out($help);
+	}
+}
+
+try
+{
+	JApplicationCli::getInstance('KeychainManager')->execute();
+}
+catch (Exception $e)
+{
+	echo $e->getMessage() . "\n";
+	exit(1);
+}
diff --git a/core/cache/index.html b/core/cache/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/cache/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/cli/deletefiles.php b/core/cli/deletefiles.php
new file mode 100644
index 00000000..b3824fc4
--- /dev/null
+++ b/core/cli/deletefiles.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package    Joomla.Cli
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * A command line cron job to attempt to remove files that should have been deleted at update.
+ */
+
+// We are a valid entry point.
+const _JEXEC = 1;
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+// Get the framework.
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+// Configure error reporting to maximum for CLI output.
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+// Load Library language
+$lang = JFactory::getLanguage();
+
+// Try the files_joomla file in the current language (without allowing the loading of the file in the default language)
+$lang->load('files_joomla.sys', JPATH_SITE, null, false, false)
+// Fallback to the files_joomla file in the default language
+|| $lang->load('files_joomla.sys', JPATH_SITE, null, true);
+
+/**
+ * A command line cron job to attempt to remove files that should have been deleted at update.
+ *
+ * @since  3.0
+ */
+class DeletefilesCli extends JApplicationCli
+{
+	/**
+	 * Entry point for CLI script
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function doExecute()
+	{
+		// Import the dependencies
+		jimport('joomla.filesystem.file');
+		jimport('joomla.filesystem.folder');
+
+		// We need the update script
+		JLoader::register('JoomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php');
+
+		// Instantiate the class
+		$class = new JoomlaInstallerScript;
+
+		// Run the delete method
+		$class->deleteUnexistingFiles();
+	}
+}
+
+// Instantiate the application object, passing the class name to JCli::getInstance
+// and use chaining to execute the application.
+JApplicationCli::getInstance('DeletefilesCli')->execute();
diff --git a/core/cli/finder_indexer.php b/core/cli/finder_indexer.php
new file mode 100644
index 00000000..be0746f5
--- /dev/null
+++ b/core/cli/finder_indexer.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * @package    Joomla.Cli
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Smart Search CLI.
+ *
+ * This is a command-line script to help with management of Smart Search.
+ *
+ * Called with no arguments: php finder_indexer.php
+ *                           Performs an incremental update of the index.
+ *
+ * Called with --purge:      php finder_indexer.php --purge
+ *                           Purges and rebuilds the index (search filters are preserved).
+ */
+
+// We are a valid entry point.
+const _JEXEC = 1;
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+define('JPATH_COMPONENT_ADMINISTRATOR', JPATH_ADMINISTRATOR . '/components/com_finder');
+
+// Get the framework.
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+// Import the configuration.
+require_once JPATH_CONFIGURATION . '/configuration.php';
+
+// System configuration.
+$config = new JConfig;
+define('JDEBUG', $config->debug);
+
+// Configure error reporting to maximum for CLI output.
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+// Load Library language
+$lang = JFactory::getLanguage();
+
+// Try the finder_cli file in the current language (without allowing the loading of the file in the default language)
+$lang->load('finder_cli', JPATH_SITE, null, false, false)
+// Fallback to the finder_cli file in the default language
+|| $lang->load('finder_cli', JPATH_SITE, null, true);
+
+/**
+ * A command line cron job to run the Smart Search indexer.
+ *
+ * @since  2.5
+ */
+class FinderCli extends JApplicationCli
+{
+	/**
+	 * Start time for the index process
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	private $time = null;
+
+	/**
+	 * Start time for each batch
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	private $qtime = null;
+
+	/**
+	 * Static filters information.
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	private $filters = array();
+
+	/**
+	 * Entry point for Smart Search CLI script
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function doExecute()
+	{
+		// Print a blank line.
+		$this->out(JText::_('FINDER_CLI'));
+		$this->out('============================');
+
+		// Initialize the time value.
+		$this->time = microtime(true);
+
+		// Remove the script time limit.
+		@set_time_limit(0);
+
+		// Fool the system into thinking we are running as JSite with Smart Search as the active component.
+		$_SERVER['HTTP_HOST'] = 'domain.com';
+		JFactory::getApplication('site');
+
+		// Purge before indexing if --purge on the command line.
+		if ($this->input->getString('purge', false))
+		{
+			// Taxonomy ids will change following a purge/index, so save filter information first.
+			$this->getFilters();
+
+			// Purge the index.
+			$this->purge();
+
+			// Run the indexer.
+			$this->index();
+
+			// Restore the filters again.
+			$this->putFilters();
+		}
+		else
+		{
+			// Run the indexer.
+			$this->index();
+		}
+
+		// Total reporting.
+		$this->out(JText::sprintf('FINDER_CLI_PROCESS_COMPLETE', round(microtime(true) - $this->time, 3)), true);
+		$this->out(JText::sprintf('FINDER_CLI_PEAK_MEMORY_USAGE', number_format(memory_get_peak_usage(true))));
+
+		// Print a blank line at the end.
+		$this->out();
+	}
+
+	/**
+	 * Run the indexer.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	private function index()
+	{
+		JLoader::register('FinderIndexer', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/indexer.php');
+
+		// Disable caching.
+		$config = JFactory::getConfig();
+		$config->set('caching', 0);
+		$config->set('cache_handler', 'file');
+
+		// Reset the indexer state.
+		FinderIndexer::resetState();
+
+		// Import the plugins.
+		JPluginHelper::importPlugin('system');
+		JPluginHelper::importPlugin('finder');
+
+		// Starting Indexer.
+		$this->out(JText::_('FINDER_CLI_STARTING_INDEXER'), true);
+
+		// Trigger the onStartIndex event.
+		JEventDispatcher::getInstance()->trigger('onStartIndex');
+
+		// Remove the script time limit.
+		@set_time_limit(0);
+
+		// Get the indexer state.
+		$state = FinderIndexer::getState();
+
+		// Setting up plugins.
+		$this->out(JText::_('FINDER_CLI_SETTING_UP_PLUGINS'), true);
+
+		// Trigger the onBeforeIndex event.
+		JEventDispatcher::getInstance()->trigger('onBeforeIndex');
+
+		// Startup reporting.
+		$this->out(JText::sprintf('FINDER_CLI_SETUP_ITEMS', $state->totalItems, round(microtime(true) - $this->time, 3)), true);
+
+		// Get the number of batches.
+		$t = (int) $state->totalItems;
+		$c = (int) ceil($t / $state->batchSize);
+		$c = $c === 0 ? 1 : $c;
+
+		try
+		{
+			// Process the batches.
+			for ($i = 0; $i < $c; $i++)
+			{
+				// Set the batch start time.
+				$this->qtime = microtime(true);
+
+				// Reset the batch offset.
+				$state->batchOffset = 0;
+
+				// Trigger the onBuildIndex event.
+				JEventDispatcher::getInstance()->trigger('onBuildIndex');
+
+				// Batch reporting.
+				$this->out(JText::sprintf('FINDER_CLI_BATCH_COMPLETE', ($i + 1), round(microtime(true) - $this->qtime, 3)), true);
+			}
+		}
+		catch (Exception $e)
+		{
+			// Display the error
+			$this->out($e->getMessage(), true);
+
+			// Reset the indexer state.
+			FinderIndexer::resetState();
+
+			// Close the app
+			$this->close($e->getCode());
+		}
+
+		// Reset the indexer state.
+		FinderIndexer::resetState();
+	}
+
+	/**
+	 * Purge the index.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.3
+	 */
+	private function purge()
+	{
+		$this->out(JText::_('FINDER_CLI_INDEX_PURGE'));
+
+		// Load the model.
+		JModelLegacy::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/models', 'FinderModel');
+		$model = JModelLegacy::getInstance('Index', 'FinderModel');
+
+		// Attempt to purge the index.
+		$return = $model->purge();
+
+		// If unsuccessful then abort.
+		if (!$return)
+		{
+			$message = JText::_('FINDER_CLI_INDEX_PURGE_FAILED', $model->getError());
+			$this->out($message);
+			exit();
+		}
+
+		$this->out(JText::_('FINDER_CLI_INDEX_PURGE_SUCCESS'));
+	}
+
+	/**
+	 * Restore static filters.
+	 *
+	 * Using the saved filter information, update the filter records
+	 * with the new taxonomy ids.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.3
+	 */
+	private function putFilters()
+	{
+		$this->out(JText::_('FINDER_CLI_RESTORE_FILTERS'));
+
+		$db = JFactory::getDbo();
+
+		// Use the temporary filter information to update the filter taxonomy ids.
+		foreach ($this->filters as $filter_id => $filter)
+		{
+			$tids = array();
+
+			foreach ($filter as $element)
+			{
+				// Look for the old taxonomy in the new taxonomy table.
+				$query = $db->getQuery(true);
+				$query
+					->select('t.id')
+					->from($db->qn('#__finder_taxonomy') . ' AS t')
+					->leftJoin($db->qn('#__finder_taxonomy') . ' AS p ON p.id = t.parent_id')
+					->where($db->qn('t.title') . ' = ' . $db->q($element['title']))
+					->where($db->qn('p.title') . ' = ' . $db->q($element['parent']));
+				$taxonomy = $db->setQuery($query)->loadResult();
+
+				// If we found it then add it to the list.
+				if ($taxonomy)
+				{
+					$tids[] = $taxonomy;
+				}
+				else
+				{
+					$this->out(JText::sprintf('FINDER_CLI_FILTER_RESTORE_WARNING', $element['parent'], $element['title'], $element['filter']));
+				}
+			}
+
+			// Construct a comma-separated string from the taxonomy ids.
+			$taxonomyIds = empty($tids) ? '' : implode(',', $tids);
+
+			// Update the filter with the new taxonomy ids.
+			$query = $db->getQuery(true);
+			$query
+				->update($db->qn('#__finder_filters'))
+				->set($db->qn('data') . ' = ' . $db->q($taxonomyIds))
+				->where($db->qn('filter_id') . ' = ' . (int) $filter_id);
+			$db->setQuery($query)->execute();
+		}
+
+		$this->out(JText::sprintf('FINDER_CLI_RESTORE_FILTER_COMPLETED', count($this->filters)));
+	}
+
+	/**
+	 * Save static filters.
+	 *
+	 * Since a purge/index cycle will cause all the taxonomy ids to change,
+	 * the static filters need to be updated with the new taxonomy ids.
+	 * The static filter information is saved prior to the purge/index
+	 * so that it can later be used to update the filters with new ids.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.3
+	 */
+	private function getFilters()
+	{
+		$this->out(JText::_('FINDER_CLI_SAVE_FILTERS'));
+
+		// Get the taxonomy ids used by the filters.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query
+			->select('filter_id, title, data')
+			->from($db->qn('#__finder_filters'));
+		$filters = $db->setQuery($query)->loadObjectList();
+
+		// Get the name of each taxonomy and the name of its parent.
+		foreach ($filters as $filter)
+		{
+			// Skip empty filters.
+			if ($filter->data == '')
+			{
+				continue;
+			}
+
+			// Get taxonomy records.
+			$query = $db->getQuery(true);
+			$query
+				->select('t.title, p.title AS parent')
+				->from($db->qn('#__finder_taxonomy') . ' AS t')
+				->leftJoin($db->qn('#__finder_taxonomy') . ' AS p ON p.id = t.parent_id')
+				->where($db->qn('t.id') . ' IN (' . $filter->data . ')');
+			$taxonomies = $db->setQuery($query)->loadObjectList();
+
+			// Construct a temporary data structure to hold the filter information.
+			foreach ($taxonomies as $taxonomy)
+			{
+				$this->filters[$filter->filter_id][] = array(
+					'filter' => $filter->title,
+					'title'  => $taxonomy->title,
+					'parent' => $taxonomy->parent,
+				);
+			}
+		}
+
+		$this->out(JText::sprintf('FINDER_CLI_SAVE_FILTER_COMPLETED', count($filters)));
+	}
+}
+
+// Instantiate the application object, passing the class name to JCli::getInstance
+// and use chaining to execute the application.
+JApplicationCli::getInstance('FinderCli')->execute();
diff --git a/core/cli/garbagecron.php b/core/cli/garbagecron.php
new file mode 100644
index 00000000..4244dbae
--- /dev/null
+++ b/core/cli/garbagecron.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package    Joomla.Cli
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * A command line cron job to trash expired cache data.
+ */
+
+// Initialize Joomla framework
+const _JEXEC = 1;
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+// Get the framework.
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+/**
+ * Cron job to trash expired cache data.
+ *
+ * @since  2.5
+ */
+class GarbageCron extends JApplicationCli
+{
+	/**
+	 * Entry point for the script
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function doExecute()
+	{
+		$cache = JFactory::getCache();
+		$cache->gc();
+	}
+}
+
+JApplicationCli::getInstance('GarbageCron')->execute();
diff --git a/core/cli/index.html b/core/cli/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/cli/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/cli/sessionGc.php b/core/cli/sessionGc.php
new file mode 100644
index 00000000..46fa26bb
--- /dev/null
+++ b/core/cli/sessionGc.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package    Joomla.Cli
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * This is a CRON script to delete expired session data which should be called from the command-line, not the
+ * web. For example something like:
+ * /usr/bin/php /path/to/site/cli/sessionGc.php
+ */
+
+// Initialize Joomla framework
+const _JEXEC = 1;
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+// Get the framework.
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+/**
+ * Cron job to trash expired session data.
+ *
+ * @since  3.8.6
+ */
+class SessionGc extends JApplicationCli
+{
+	/**
+	 * Entry point for the script
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.6
+	 */
+	public function doExecute()
+	{
+		JFactory::getSession()->gc();
+	}
+}
+
+JApplicationCli::getInstance('SessionGc')->execute();
diff --git a/core/cli/sessionMetadataGc.php b/core/cli/sessionMetadataGc.php
new file mode 100644
index 00000000..e5b03f6d
--- /dev/null
+++ b/core/cli/sessionMetadataGc.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package    Joomla.Cli
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * This is a CRON script to delete expired optional session metadata which should be called from the command-line, not the
+ * web. For example something like:
+ * /usr/bin/php /path/to/site/cli/sessionMetadataGc.php
+ */
+
+// Initialize Joomla framework
+const _JEXEC = 1;
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+// Get the framework.
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+/**
+ * Cron job to trash expired session metadata.
+ *
+ * @since  3.8.6
+ */
+class SessionMetadataGc extends JApplicationCli
+{
+	/**
+	 * Entry point for the script
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.6
+	 */
+	public function doExecute()
+	{
+		$metadataManager = new \Joomla\CMS\Session\MetadataManager($this, \Joomla\CMS\Factory::getDbo());
+		$sessionExpire   = \Joomla\CMS\Factory::getSession()->getExpire();
+
+		$metadataManager->deletePriorTo(time() - $sessionExpire);
+	}
+}
+
+JApplicationCli::getInstance('SessionMetadataGc')->execute();
diff --git a/core/cli/update_cron.php b/core/cli/update_cron.php
new file mode 100644
index 00000000..30c80efe
--- /dev/null
+++ b/core/cli/update_cron.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package    Joomla.Cli
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * This is a CRON script which should be called from the command-line, not the
+ * web. For example something like:
+ * /usr/bin/php /path/to/site/cli/update_cron.php
+ */
+
+// Set flag that this is a parent file.
+const _JEXEC = 1;
+
+error_reporting(E_ALL | E_NOTICE);
+ini_set('display_errors', 1);
+
+// Load system defines
+if (file_exists(dirname(__DIR__) . '/defines.php'))
+{
+	require_once dirname(__DIR__) . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', dirname(__DIR__));
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+require_once JPATH_LIBRARIES . '/cms.php';
+
+// Load the configuration
+require_once JPATH_CONFIGURATION . '/configuration.php';
+
+/**
+ * This script will fetch the update information for all extensions and store
+ * them in the database, speeding up your administrator.
+ *
+ * @since  2.5
+ */
+class Updatecron extends JApplicationCli
+{
+	/**
+	 * Entry point for the script
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function doExecute()
+	{
+		// Get the update cache time
+		$component = JComponentHelper::getComponent('com_installer');
+
+		$params = $component->params;
+		$cache_timeout = $params->get('cachetimeout', 6, 'int');
+		$cache_timeout = 3600 * $cache_timeout;
+
+		// Find all updates
+		$this->out('Fetching updates...');
+		$updater = JUpdater::getInstance();
+		$updater->findUpdates(0, $cache_timeout);
+		$this->out('Finished fetching updates');
+	}
+}
+
+JApplicationCli::getInstance('Updatecron')->execute();
diff --git a/core/components/com_ajax/ajax.php b/core/components/com_ajax/ajax.php
new file mode 100644
index 00000000..97de5f91
--- /dev/null
+++ b/core/components/com_ajax/ajax.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_ajax
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/*
+ * References
+ *  Support plugins in your component
+ * - https://docs.joomla.org/Special:MyLanguage/Supporting_plugins_in_your_component
+ *
+ * Best way for JSON output
+ * - https://groups.google.com/d/msg/joomla-dev-cms/WsC0nA9Fixo/Ur-gPqpqh-EJ
+ */
+
+// Reference global application object
+$app = JFactory::getApplication();
+
+// JInput object
+$input = $app->input;
+
+// Requested format passed via URL
+$format = strtolower($input->getWord('format'));
+
+// Initialize default response and module name
+$results = null;
+$parts   = null;
+
+// Check for valid format
+if (!$format)
+{
+	$results = new InvalidArgumentException(JText::_('COM_AJAX_SPECIFY_FORMAT'), 404);
+}
+/*
+ * Module support.
+ *
+ * modFooHelper::getAjax() is called where 'foo' is the value
+ * of the 'module' variable passed via the URL
+ * (i.e. index.php?option=com_ajax&module=foo).
+ *
+ */
+elseif ($input->get('module'))
+{
+	$module   = $input->get('module');
+	$table    = JTable::getInstance('extension');
+	$moduleId = $table->find(array('type' => 'module', 'element' => 'mod_' . $module));
+
+	if ($moduleId && $table->load($moduleId) && $table->enabled)
+	{
+		$helperFile = JPATH_BASE . '/modules/mod_' . $module . '/helper.php';
+
+		if (strpos($module, '_'))
+		{
+			$parts = explode('_', $module);
+		}
+		elseif (strpos($module, '-'))
+		{
+			$parts = explode('-', $module);
+		}
+
+		if ($parts)
+		{
+			$class = 'Mod';
+
+			foreach ($parts as $part)
+			{
+				$class .= ucfirst($part);
+			}
+
+			$class .= 'Helper';
+		}
+		else
+		{
+			$class = 'Mod' . ucfirst($module) . 'Helper';
+		}
+
+		$method = $input->get('method') ?: 'get';
+
+		if (is_file($helperFile))
+		{
+			JLoader::register($class, $helperFile);
+
+			if (method_exists($class, $method . 'Ajax'))
+			{
+				// Load language file for module
+				$basePath = JPATH_BASE;
+				$lang     = JFactory::getLanguage();
+				$lang->load('mod_' . $module, $basePath, null, false, true)
+				||  $lang->load('mod_' . $module, $basePath . '/modules/mod_' . $module, null, false, true);
+
+				try
+				{
+					$results = call_user_func($class . '::' . $method . 'Ajax');
+				}
+				catch (Exception $e)
+				{
+					$results = $e;
+				}
+			}
+			// Method does not exist
+			else
+			{
+				$results = new LogicException(JText::sprintf('COM_AJAX_METHOD_NOT_EXISTS', $method . 'Ajax'), 404);
+			}
+		}
+		// The helper file does not exist
+		else
+		{
+			$results = new RuntimeException(JText::sprintf('COM_AJAX_FILE_NOT_EXISTS', 'mod_' . $module . '/helper.php'), 404);
+		}
+	}
+	// Module is not published, you do not have access to it, or it is not assigned to the current menu item
+	else
+	{
+		$results = new LogicException(JText::sprintf('COM_AJAX_MODULE_NOT_ACCESSIBLE', 'mod_' . $module), 404);
+	}
+}
+/*
+ * Plugin support by default is based on the "Ajax" plugin group.
+ * An optional 'group' variable can be passed via the URL.
+ *
+ * The plugin event triggered is onAjaxFoo, where 'foo' is
+ * the value of the 'plugin' variable passed via the URL
+ * (i.e. index.php?option=com_ajax&plugin=foo)
+ *
+ */
+elseif ($input->get('plugin'))
+{
+	$group      = $input->get('group', 'ajax');
+	JPluginHelper::importPlugin($group);
+	$plugin     = ucfirst($input->get('plugin'));
+	$dispatcher = JEventDispatcher::getInstance();
+
+	try
+	{
+		$results = $dispatcher->trigger('onAjax' . $plugin);
+	}
+	catch (Exception $e)
+	{
+		$results = $e;
+	}
+}
+/*
+ * Template support.
+ *
+ * tplFooHelper::getAjax() is called where 'foo' is the value
+ * of the 'template' variable passed via the URL
+ * (i.e. index.php?option=com_ajax&template=foo).
+ *
+ */
+elseif ($input->get('template'))
+{
+	$template   = $input->get('template');
+	$table      = JTable::getInstance('extension');
+	$templateId = $table->find(array('type' => 'template', 'element' => $template));
+
+	if ($templateId && $table->load($templateId) && $table->enabled)
+	{
+		$basePath   = ($table->client_id) ? JPATH_ADMINISTRATOR : JPATH_SITE;
+		$helperFile = $basePath . '/templates/' . $template . '/helper.php';
+
+		if (strpos($template, '_'))
+		{
+			$parts = explode('_', $template);
+		}
+		elseif (strpos($template, '-'))
+		{
+			$parts = explode('-', $template);
+		}
+
+		if ($parts)
+		{
+			$class = 'Tpl';
+
+			foreach ($parts as $part)
+			{
+				$class .= ucfirst($part);
+			}
+
+			$class .= 'Helper';
+		}
+		else
+		{
+			$class = 'Tpl' . ucfirst($template) . 'Helper';
+		}
+
+		$method = $input->get('method') ?: 'get';
+
+		if (is_file($helperFile))
+		{
+			JLoader::register($class, $helperFile);
+
+			if (method_exists($class, $method . 'Ajax'))
+			{
+				// Load language file for template
+				$lang = JFactory::getLanguage();
+				$lang->load('tpl_' . $template, $basePath, null, false, true)
+				||  $lang->load('tpl_' . $template, $basePath . '/templates/' . $template, null, false, true);
+
+				try
+				{
+					$results = call_user_func($class . '::' . $method . 'Ajax');
+				}
+				catch (Exception $e)
+				{
+					$results = $e;
+				}
+			}
+			// Method does not exist
+			else
+			{
+				$results = new LogicException(JText::sprintf('COM_AJAX_METHOD_NOT_EXISTS', $method . 'Ajax'), 404);
+			}
+		}
+		// The helper file does not exist
+		else
+		{
+			$results = new RuntimeException(JText::sprintf('COM_AJAX_FILE_NOT_EXISTS', 'tpl_' . $template . '/helper.php'), 404);
+		}
+	}
+	// Template is not assigned to the current menu item
+	else
+	{
+		$results = new LogicException(JText::sprintf('COM_AJAX_TEMPLATE_NOT_ACCESSIBLE', 'tpl_' . $template), 404);
+	}
+}
+
+// Return the results in the desired format
+switch ($format)
+{
+	// JSONinzed
+	case 'json' :
+		echo new JResponseJson($results, null, false, $input->get('ignoreMessages', true, 'bool'));
+
+		break;
+
+	// Handle as raw format
+	default :
+		// Output exception
+		if ($results instanceof Exception)
+		{
+			// Log an error
+			JLog::add($results->getMessage(), JLog::ERROR);
+
+			// Set status header code
+			$app->setHeader('status', $results->getCode(), true);
+
+			// Echo exception type and message
+			$out = get_class($results) . ': ' . $results->getMessage();
+		}
+		// Output string/ null
+		elseif (is_scalar($results))
+		{
+			$out = (string) $results;
+		}
+		// Output array/ object
+		else
+		{
+			$out = implode((array) $results);
+		}
+
+		echo $out;
+
+		break;
+}
diff --git a/core/components/com_banners/banners.php b/core/components/com_banners/banners.php
new file mode 100644
index 00000000..43840356
--- /dev/null
+++ b/core/components/com_banners/banners.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$controller = JControllerLegacy::getInstance('Banners');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_banners/controller.php b/core/components/com_banners/controller.php
new file mode 100644
index 00000000..c539c788
--- /dev/null
+++ b/core/components/com_banners/controller.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Banners Controller
+ *
+ * @since  1.5
+ */
+class BannersController extends JControllerLegacy
+{
+	/**
+	 * Method when a banner is clicked on.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function click()
+	{
+		$id = $this->input->getInt('id', 0);
+
+		if ($id)
+		{
+			$model = $this->getModel('Banner', 'BannersModel', array('ignore_request' => true));
+			$model->setState('banner.id', $id);
+			$model->click();
+			$this->setRedirect($model->getUrl());
+		}
+	}
+}
diff --git a/core/components/com_banners/helpers/banner.php b/core/components/com_banners/helpers/banner.php
new file mode 100644
index 00000000..b62b6691
--- /dev/null
+++ b/core/components/com_banners/helpers/banner.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Banner Helper Class
+ *
+ * @since  1.6
+ */
+abstract class BannerHelper
+{
+	/**
+	 * Checks if a URL is an image
+	 *
+	 * @param   string  $url  The URL path to the potential image
+	 *
+	 * @return  boolean  True if an image of type bmp, gif, jp(e)g or png, false otherwise
+	 *
+	 * @since   1.6
+	 */
+	public static function isImage($url)
+	{
+		return preg_match('#\.(?:bmp|gif|jpe?g|png)$#i', $url);
+	}
+
+	/**
+	 * Checks if a URL is a Flash file
+	 *
+	 * @param   string  $url  The URL path to the potential flash file
+	 *
+	 * @return  boolean  True if an image of type bmp, gif, jp(e)g or png, false otherwise
+	 *
+	 * @since   1.6
+	 */
+	public static function isFlash($url)
+	{
+		return preg_match('#\.swf$#i', $url);
+	}
+}
diff --git a/core/components/com_banners/helpers/category.php b/core/components/com_banners/helpers/category.php
new file mode 100644
index 00000000..99a7dd4b
--- /dev/null
+++ b/core/components/com_banners/helpers/category.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Banners Component Category Tree
+ *
+ * @since  1.6
+ */
+class BannersCategories extends JCategories
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($options = array())
+	{
+		$options['table']     = '#__banners';
+		$options['extension'] = 'com_banners';
+
+		parent::__construct($options);
+	}
+}
diff --git a/core/components/com_banners/models/banner.php b/core/components/com_banners/models/banner.php
new file mode 100644
index 00000000..8685433e
--- /dev/null
+++ b/core/components/com_banners/models/banner.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
+
+/**
+ * Banner model for the Joomla Banners component.
+ *
+ * @since  1.5
+ */
+class BannersModelBanner extends JModelLegacy
+{
+	/**
+	 * Cached item object
+	 *
+	 * @var    object
+	 * @since  1.6
+	 */
+	protected $_item;
+
+	/**
+	 * Clicks the URL, incrementing the counter
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function click()
+	{
+		$item = $this->getItem();
+
+		if (empty($item))
+		{
+			throw new Exception(JText::_('JERROR_PAGE_NOT_FOUND'), 404);
+		}
+
+		$id = $this->getState('banner.id');
+
+		// Update click count
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->update('#__banners')
+			->set('clicks = (clicks + 1)')
+			->where('id = ' . (int) $id);
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseError(500, $e->getMessage());
+		}
+
+		// Track clicks
+		$trackClicks = $item->track_clicks;
+
+		if ($trackClicks < 0 && $item->cid)
+		{
+			$trackClicks = $item->client_track_clicks;
+		}
+
+		if ($trackClicks < 0)
+		{
+			$config = JComponentHelper::getParams('com_banners');
+			$trackClicks = $config->get('track_clicks');
+		}
+
+		if ($trackClicks > 0)
+		{
+			$trackDate = JFactory::getDate()->format('Y-m-d H');
+
+			$query->clear()
+				->select($db->quoteName('count'))
+				->from('#__banner_tracks')
+				->where('track_type=2')
+				->where('banner_id=' . (int) $id)
+				->where('track_date=' . $db->quote($trackDate));
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseError(500, $e->getMessage());
+			}
+
+			$count = $db->loadResult();
+
+			$query->clear();
+
+			if ($count)
+			{
+				// Update count
+				$query->update('#__banner_tracks')
+					->set($db->quoteName('count') . ' = (' . $db->quoteName('count') . ' + 1)')
+					->where('track_type=2')
+					->where('banner_id=' . (int) $id)
+					->where('track_date=' . $db->quote($trackDate));
+			}
+			else
+			{
+				// Insert new count
+				$query->insert('#__banner_tracks')
+					->columns(
+						array(
+							$db->quoteName('count'), $db->quoteName('track_type'),
+							$db->quoteName('banner_id'), $db->quoteName('track_date')
+						)
+					)
+					->values('1, 2,' . (int) $id . ',' . $db->quote($trackDate));
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseError(500, $e->getMessage());
+			}
+		}
+	}
+
+	/**
+	 * Get the data for a banner.
+	 *
+	 * @return  object
+	 *
+	 * @since   1.6
+	 */
+	public function &getItem()
+	{
+		if (!isset($this->_item))
+		{
+			/** @var JCacheControllerCallback $cache */
+			$cache = JFactory::getCache('com_banners', 'callback');
+
+			$id = $this->getState('banner.id');
+
+			// For PHP 5.3 compat we can't use $this in the lambda function below, so grab the database driver now to use it
+			$db = $this->getDbo();
+
+			$loader = function ($id) use ($db)
+			{
+				$query = $db->getQuery(true)
+					->select(
+						array(
+							$db->quoteName('a.clickurl', 'clickurl'),
+							$db->quoteName('a.cid', 'cid'),
+							$db->quoteName('a.track_clicks', 'track_clicks'),
+							$db->quoteName('cl.track_clicks', 'client_track_clicks'),
+						)
+					)
+					->from($db->quoteName('#__banners', 'a'))
+					->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid')
+					->where('a.id = ' . (int) $id);
+
+				$db->setQuery($query);
+
+				return $db->loadObject();
+			};
+
+			try
+			{
+				$this->_item = $cache->get($loader, array($id), md5(__METHOD__ . $id));
+			}
+			catch (JCacheException $e)
+			{
+				$this->_item = $loader($id);
+			}
+		}
+
+		return $this->_item;
+	}
+
+	/**
+	 * Get the URL for a banner
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public function getUrl()
+	{
+		$item = $this->getItem();
+		$url = $item->clickurl;
+
+		// Check for links
+		if (!preg_match('#http[s]?://|index[2]?\.php#', $url))
+		{
+			$url = "http://$url";
+		}
+
+		return $url;
+	}
+}
diff --git a/core/components/com_banners/models/banners.php b/core/components/com_banners/models/banners.php
new file mode 100644
index 00000000..de87e23c
--- /dev/null
+++ b/core/components/com_banners/models/banners.php
@@ -0,0 +1,322 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
+
+/**
+ * Banners model for the Joomla Banners component.
+ *
+ * @since  1.6
+ */
+class BannersModelBanners extends JModelList
+{
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.tag_search');
+		$id .= ':' . $this->getState('filter.client_id');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+		$id .= ':' . serialize($this->getState('filter.keywords'));
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to get a JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  JDatabaseQuery   A JDatabaseQuery object to retrieve the data set.
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$db         = $this->getDbo();
+		$query      = $db->getQuery(true);
+		$ordering   = $this->getState('filter.ordering');
+		$tagSearch  = $this->getState('filter.tag_search');
+		$cid        = $this->getState('filter.client_id');
+		$categoryId = $this->getState('filter.category_id');
+		$keywords   = $this->getState('filter.keywords');
+		$randomise  = ($ordering === 'random');
+		$nullDate   = $db->quote($db->getNullDate());
+		$nowDate    = $db->quote(JFactory::getDate()->toSql());
+
+		$query->select(
+			'a.id as id,'
+				. 'a.type as type,'
+				. 'a.name as name,'
+				. 'a.clickurl as clickurl,'
+				. 'a.cid as cid,'
+				. 'a.description as description,'
+				. 'a.params as params,'
+				. 'a.custombannercode as custombannercode,'
+				. 'a.track_impressions as track_impressions,'
+				. 'cl.track_impressions as client_track_impressions'
+		)
+			->from('#__banners as a')
+			->join('LEFT', '#__banner_clients AS cl ON cl.id = a.cid')
+			->where('a.state=1')
+			->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+			->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')')
+			->where('(a.imptotal = 0 OR a.impmade <= a.imptotal)');
+
+		if ($cid)
+		{
+			$query->where('a.cid = ' . (int) $cid)
+				->where('cl.state = 1');
+		}
+
+		// Filter by a single or group of categories
+		if (is_numeric($categoryId))
+		{
+			$type = $this->getState('filter.category_id.include', true) ? '= ' : '<> ';
+
+			// Add subcategory check
+			$includeSubcategories = $this->getState('filter.subcategories', false);
+			$categoryEquals = 'a.catid ' . $type . (int) $categoryId;
+
+			if ($includeSubcategories)
+			{
+				$levels = (int) $this->getState('filter.max_category_levels', '1');
+
+				// Create a subquery for the subcategory list
+				$subQuery = $db->getQuery(true);
+				$subQuery->select('sub.id')
+					->from('#__categories as sub')
+					->join('INNER', '#__categories as this ON sub.lft > this.lft AND sub.rgt < this.rgt')
+					->where('this.id = ' . (int) $categoryId)
+					->where('sub.level <= this.level + ' . $levels);
+
+				// Add the subquery to the main query
+				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . (string) $subQuery . '))');
+			}
+			else
+			{
+				$query->where($categoryEquals);
+			}
+		}
+		elseif (is_array($categoryId) && (count($categoryId) > 0))
+		{
+			$categoryId = ArrayHelper::toInteger($categoryId);
+			$categoryId = implode(',', $categoryId);
+
+			if ($categoryId != '0')
+			{
+				$type = $this->getState('filter.category_id.include', true) ? 'IN' : 'NOT IN';
+				$query->where('a.catid ' . $type . ' (' . $categoryId . ')');
+			}
+		}
+
+		if ($tagSearch)
+		{
+			if (count($keywords) === 0)
+			{
+				$query->where('0');
+			}
+			else
+			{
+				$temp   = array();
+				$config = JComponentHelper::getParams('com_banners');
+				$prefix = $config->get('metakey_prefix');
+
+				if ($categoryId)
+				{
+					$query->join('LEFT', '#__categories as cat ON a.catid = cat.id');
+				}
+
+				foreach ($keywords as $keyword)
+				{
+					$keyword = trim($keyword);
+					$condition1 = 'a.own_prefix=1 '
+						. ' AND a.metakey_prefix=SUBSTRING(' . $db->quote($keyword) . ',1,LENGTH( a.metakey_prefix)) '
+						. ' OR a.own_prefix=0 '
+						. ' AND cl.own_prefix=1 '
+						. ' AND cl.metakey_prefix=SUBSTRING(' . $db->quote($keyword) . ',1,LENGTH(cl.metakey_prefix)) '
+						. ' OR a.own_prefix=0 '
+						. ' AND cl.own_prefix=0 '
+						. ' AND ' . ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0');
+
+					$condition2 = "a.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
+
+					if ($cid)
+					{
+						$condition2 .= " OR cl.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
+					}
+
+					if ($categoryId)
+					{
+						$condition2 .= " OR cat.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
+					}
+
+					$temp[] = "($condition1) AND ($condition2)";
+				}
+
+				$query->where('(' . implode(' OR ', $temp) . ')');
+			}
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		$query->order('a.sticky DESC,' . ($randomise ? $query->Rand() : 'a.ordering'));
+
+		return $query;
+	}
+
+	/**
+	 * Get a list of banners.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		if (!isset($this->cache['items']))
+		{
+			$this->cache['items'] = parent::getItems();
+
+			foreach ($this->cache['items'] as &$item)
+			{
+				$item->params = new Registry($item->params);
+			}
+		}
+
+		return $this->cache['items'];
+	}
+
+	/**
+	 * Makes impressions on a list of banners
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function impress()
+	{
+		$trackDate = JFactory::getDate()->format('Y-m-d H');
+		$items     = $this->getItems();
+		$db        = $this->getDbo();
+		$query     = $db->getQuery(true);
+
+		if (!count($items))
+		{
+			return;
+		}
+
+		foreach ($items as $item)
+		{
+			$bid[] = (int) $item->id;
+		}
+
+		// Increment impression made
+		$query->clear()
+			->update('#__banners')
+			->set('impmade = (impmade + 1)')
+			->where('id IN (' . implode(',', $bid) . ')');
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			JError::raiseError(500, $e->getMessage());
+		}
+
+		foreach ($items as $item)
+		{
+			// Track impressions
+			$trackImpressions = $item->track_impressions;
+
+			if ($trackImpressions < 0 && $item->cid)
+			{
+				$trackImpressions = $item->client_track_impressions;
+			}
+
+			if ($trackImpressions < 0)
+			{
+				$config           = JComponentHelper::getParams('com_banners');
+				$trackImpressions = $config->get('track_impressions');
+			}
+
+			if ($trackImpressions > 0)
+			{
+				// Is track already created?
+				// Update count
+				$query->clear();
+				$query->update('#__banner_tracks')
+					->set($db->quoteName('count') . ' = (' . $db->quoteName('count') . ' + 1)')
+					->where('track_type=1')
+					->where('banner_id=' . (int) $item->id)
+					->where('track_date=' . $db->quote($trackDate));
+
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (JDatabaseExceptionExecuting $e)
+				{
+					JError::raiseError(500, $e->getMessage());
+				}
+
+				if ($db->getAffectedRows() === 0)
+				{
+					// Insert new count
+					$query->clear();
+
+					$query->insert('#__banner_tracks')
+						->columns(
+							array(
+								$db->quoteName('count'), $db->quoteName('track_type'),
+								$db->quoteName('banner_id'), $db->quoteName('track_date')
+							)
+						)
+						->values('1, 1, ' . (int) $item->id . ', ' . $db->quote($trackDate));
+
+					$db->setQuery($query);
+
+					try
+					{
+						$db->execute();
+					}
+					catch (JDatabaseExceptionExecuting $e)
+					{
+						JError::raiseError(500, $e->getMessage());
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/core/components/com_banners/router.php b/core/components/com_banners/router.php
new file mode 100644
index 00000000..69b900c5
--- /dev/null
+++ b/core/components/com_banners/router.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_banners
+ *
+ * @since  3.3
+ */
+class BannersRouter extends JComponentRouterBase
+{
+	/**
+	 * Build the route for the com_banners component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query)
+	{
+		$segments = array();
+
+		if (isset($query['task']))
+		{
+			$segments[] = $query['task'];
+			unset($query['task']);
+		}
+
+		if (isset($query['id']))
+		{
+			$segments[] = $query['id'];
+			unset($query['id']);
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments)
+	{
+		$total = count($segments);
+		$vars = array();
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// View is always the first element of the array
+		$count = count($segments);
+
+		if ($count)
+		{
+			$count--;
+			$segment = array_shift($segments);
+
+			if (is_numeric($segment))
+			{
+				$vars['id'] = $segment;
+			}
+			else
+			{
+				$vars['task'] = $segment;
+			}
+		}
+
+		if ($count)
+		{
+			$segment = array_shift($segments);
+
+			if (is_numeric($segment))
+			{
+				$vars['id'] = $segment;
+			}
+		}
+
+		return $vars;
+	}
+}
+
+/**
+ * Build the route for the com_banners component
+ *
+ * This function is a proxy for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
+ * @since   3.3
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function bannersBuildRoute(&$query)
+{
+	$router = new BannersRouter;
+
+	return $router->build($query);
+}
+
+/**
+ * Parse the segments of a URL.
+ *
+ * This function is a proxy for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @since   3.3
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function bannersParseRoute($segments)
+{
+	$router = new BannersRouter;
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_config/config.php b/core/components/com_config/config.php
new file mode 100644
index 00000000..ed695f77
--- /dev/null
+++ b/core/components/com_config/config.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load classes
+JLoader::registerPrefix('Config', JPATH_COMPONENT);
+
+// Application
+$app = JFactory::getApplication();
+
+// Tell the browser not to cache this page.
+$app->setHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT', true);
+
+$controllerHelper = new ConfigControllerHelper;
+$controller = $controllerHelper->parseController($app);
+
+$controller->prefix = 'Config';
+
+// Perform the Request task
+$controller->execute();
diff --git a/core/components/com_config/controller/cancel.php b/core/components/com_config/controller/cancel.php
new file mode 100644
index 00000000..31cc8b9e
--- /dev/null
+++ b/core/components/com_config/controller/cancel.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cancel Controller
+ *
+ * @since  3.2
+ */
+class ConfigControllerCancel extends JControllerBase
+{
+	/**
+	 * Application object - Redeclared for proper typehinting
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Method to handle cancel
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Redirect back to home(base) page
+		$this->app->redirect(JUri::base());
+	}
+}
diff --git a/core/components/com_config/controller/canceladmin.php b/core/components/com_config/controller/canceladmin.php
new file mode 100644
index 00000000..96a34896
--- /dev/null
+++ b/core/components/com_config/controller/canceladmin.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cancel Controller for Admin
+ *
+ * @since  3.2
+ */
+class ConfigControllerCanceladmin extends ConfigControllerCancel
+{
+	/**
+	 * The context for storing internal data, e.g. record.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $context;
+
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $option;
+
+	/**
+	 * URL for redirection.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 * @note   Replaces _redirect.
+	 */
+	protected $redirect;
+
+	/**
+	 * Method to handle admin cancel
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken())
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'));
+			$this->app->redirect('index.php');
+		}
+
+		if (empty($this->context))
+		{
+			$this->context = $this->option . '.edit' . $this->context;
+		}
+
+		// Redirect.
+		$this->app->setUserState($this->context . '.data', null);
+
+		if (!empty($this->redirect))
+		{
+			// Don't redirect to an external URL.
+			if (!JUri::isInternal($this->redirect))
+			{
+				$this->redirect = JUri::base();
+			}
+
+			$this->app->redirect($this->redirect);
+		}
+		else
+		{
+			parent::execute();
+		}
+	}
+}
diff --git a/core/components/com_config/controller/cmsbase.php b/core/components/com_config/controller/cmsbase.php
new file mode 100644
index 00000000..b4675968
--- /dev/null
+++ b/core/components/com_config/controller/cmsbase.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base Display Controller
+ *
+ * @since  3.2
+ */
+class ConfigControllerCmsbase extends JControllerBase
+{
+	/**
+	 * Prefix for the view and model classes
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $prefix;
+
+	/**
+	 * Execute the controller.
+	 *
+	 * @return  mixed  A rendered view or true
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		// Get the application
+		$this->app = $this->getApplication();
+		$this->app->redirect('index.php?option=' . $this->input->get('option'));
+
+		$this->componentFolder = $this->input->getWord('option', 'com_content');
+		$this->viewName        = $this->input->getWord('view');
+
+		return $this;
+	}
+}
diff --git a/core/components/com_config/controller/config/display.php b/core/components/com_config/controller/config/display.php
new file mode 100644
index 00000000..523a1297
--- /dev/null
+++ b/core/components/com_config/controller/config/display.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Display Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerConfigDisplay extends ConfigControllerDisplay
+{
+	/**
+	 * Method to display global configuration.
+	 *
+	 * @return  boolean	True on success, false on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Get the application
+		$app = $this->getApplication();
+
+		// Get the document object.
+		$document     = JFactory::getDocument();
+
+		$viewName     = $this->input->getWord('view', 'config');
+		$viewFormat   = $document->getType();
+		$layoutName   = $this->input->getWord('layout', 'default');
+
+		// Access backend com_config
+		JLoader::registerPrefix(ucfirst($viewName), JPATH_ADMINISTRATOR . '/components/com_config');
+		$displayClass = new ConfigControllerApplicationDisplay;
+
+		// Set backend required params
+		$document->setType('json');
+		$app->input->set('view', 'application');
+
+		// Execute backend controller
+		$serviceData = json_decode($displayClass->execute(), true);
+
+		// Reset params back after requesting from service
+		$document->setType('html');
+		$app->input->set('view', $viewName);
+
+		// Register the layout paths for the view
+		$paths = new SplPriorityQueue;
+		$paths->insert(JPATH_COMPONENT . '/view/' . $viewName . '/tmpl', 'normal');
+
+		$viewClass  = 'ConfigView' . ucfirst($viewName) . ucfirst($viewFormat);
+		$modelClass = 'ConfigModel' . ucfirst($viewName);
+
+		if (class_exists($viewClass))
+		{
+			if ($viewName !== 'close')
+			{
+				$model = new $modelClass;
+
+				// Access check.
+				if (!JFactory::getUser()->authorise('core.admin', $model->getState('component.option')))
+				{
+					return;
+				}
+			}
+
+			$view = new $viewClass($model, $paths);
+
+			$view->setLayout($layoutName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load form and bind data
+			$form = $model->getForm();
+
+			if ($form)
+			{
+				$form->bind($serviceData);
+			}
+
+			// Set form and data to the view
+			$view->form = &$form;
+			$view->data = &$serviceData;
+
+			// Render view.
+			echo $view->render();
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_config/controller/config/save.php b/core/components/com_config/controller/config/save.php
new file mode 100644
index 00000000..8ec367f3
--- /dev/null
+++ b/core/components/com_config/controller/config/save.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Save Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerConfigSave extends JControllerBase
+{
+	/**
+	 * Application object - Redeclared for proper typehinting
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Method to save global configuration.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken())
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'));
+			$this->app->redirect('index.php');
+		}
+
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->redirect('index.php');
+		}
+
+		// Set FTP credentials, if given.
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		$model = new ConfigModelConfig;
+		$form  = $model->getForm();
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Validate the posted data.
+		$return = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($return === false)
+		{
+			/*
+			 * The validate method enqueued all messages for us, so we just need to redirect back.
+			 */
+
+			// Save the data in the session.
+			$this->app->setUserState('com_config.config.global.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.config', false));
+		}
+
+		// Attempt to save the configuration.
+		$data = $return;
+
+		// Access backend com_config
+		JLoader::registerPrefix('Config', JPATH_ADMINISTRATOR . '/components/com_config');
+		$saveClass = new ConfigControllerApplicationSave;
+
+		// Get a document object
+		$document = JFactory::getDocument();
+
+		// Set backend required params
+		$document->setType('json');
+
+		// Execute backend controller
+		$return = $saveClass->execute();
+
+		// Reset params back after requesting from service
+		$document->setType('html');
+
+		// Check the return value.
+		if ($return === false)
+		{
+			/*
+			 * The save method enqueued all messages for us, so we just need to redirect back.
+			 */
+
+			// Save the data in the session.
+			$this->app->setUserState('com_config.config.global.data', $data);
+
+			// Save failed, go back to the screen and display a notice.
+			$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.config', false));
+		}
+
+		// Redirect back to com_config display
+		$this->app->enqueueMessage(JText::_('COM_CONFIG_SAVE_SUCCESS'));
+		$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.config', false));
+
+		return true;
+	}
+}
diff --git a/core/components/com_config/controller/display.php b/core/components/com_config/controller/display.php
new file mode 100644
index 00000000..3999e6a1
--- /dev/null
+++ b/core/components/com_config/controller/display.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base Display Controller
+ *
+ * @since  3.2
+ */
+class ConfigControllerDisplay extends JControllerBase
+{
+	/**
+	 * Application object - Redeclared for proper typehinting
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Prefix for the view and model classes
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $prefix = 'Config';
+
+	/**
+	 * Execute the controller.
+	 *
+	 * @return  mixed  A rendered view or true
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		$componentFolder = $this->input->getWord('option', 'com_config');
+
+		if ($this->app->isClient('administrator'))
+		{
+			$viewName = $this->input->getWord('view', 'application');
+		}
+		else
+		{
+			$viewName = $this->input->getWord('view', 'config');
+		}
+
+		$viewFormat = $document->getType();
+		$layoutName = $this->input->getWord('layout', 'default');
+
+		// Register the layout paths for the view
+		$paths = new SplPriorityQueue;
+
+		if ($this->app->isClient('administrator'))
+		{
+			$paths->insert(JPATH_ADMINISTRATOR . '/components/' . $componentFolder . '/view/' . $viewName . '/tmpl', 1);
+		}
+		else
+		{
+			$paths->insert(JPATH_BASE . '/components/' . $componentFolder . '/view/' . $viewName . '/tmpl', 1);
+		}
+
+		$viewClass  = $this->prefix . 'View' . ucfirst($viewName) . ucfirst($viewFormat);
+		$modelClass = $this->prefix . 'Model' . ucfirst($viewName);
+
+		if (class_exists($viewClass))
+		{
+			$model     = new $modelClass;
+			$component = $model->getState()->get('component.option');
+
+			// Access check.
+			if (!JFactory::getUser()->authorise('core.admin', $component)
+				&& !JFactory::getUser()->authorise('core.options', $component))
+			{
+				$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+
+				return;
+			}
+
+			$view = new $viewClass($model, $paths);
+
+			$view->setLayout($layoutName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Reply for service requests
+			if ($viewFormat === 'json')
+			{
+				return $view->render();
+			}
+
+			// Render view.
+			echo $view->render();
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_config/controller/helper.php b/core/components/com_config/controller/helper.php
new file mode 100644
index 00000000..7d428f44
--- /dev/null
+++ b/core/components/com_config/controller/helper.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper class for controllers
+ *
+ * @since  3.2
+ */
+class ConfigControllerHelper
+{
+	/**
+	 * Method to parse a controller from a url
+	 * Defaults to the base controllers and passes an array of options.
+	 * $options[0] is the location of the controller which defaults to the core libraries (referenced as 'j'
+	 * and then the named folder within the component entry point file.
+	 * $options[1] is the name of the controller file,
+	 * $options[2] is the name of the folder found in the component controller folder for controllers
+	 * not prefixed with Config.
+	 * Additional options maybe added to parameterise the controller.
+	 *
+	 * @param   JApplicationBase  $app  An application object
+	 *
+	 * @return  JController  A JController object
+	 *
+	 * @since   3.2
+	 */
+	public function parseController($app)
+	{
+		$tasks = array();
+
+		if ($task = $app->input->get('task'))
+		{
+			// Toolbar expects old style but we are using new style
+			// Remove when toolbar can handle either directly
+			if (strpos($task, '/') !== false)
+			{
+				$tasks = explode('/', $task);
+			}
+			else
+			{
+				$tasks = explode('.', $task);
+			}
+		}
+		elseif ($controllerTask = $app->input->get('controller'))
+		{
+			// Temporary solution
+			if (strpos($controllerTask, '/') !== false)
+			{
+				$tasks = explode('/', $controllerTask);
+			}
+			else
+			{
+				$tasks = explode('.', $controllerTask);
+			}
+		}
+
+		if (empty($tasks[0]) || $tasks[0] === 'Config')
+		{
+			$location = 'Config';
+		}
+		else
+		{
+			$location = ucfirst(strtolower($tasks[0]));
+		}
+
+		if (empty($tasks[1]))
+		{
+			$activity = 'Display';
+		}
+		else
+		{
+			$activity = ucfirst(strtolower($tasks[1]));
+		}
+
+		$view = '';
+
+		if (!empty($tasks[2]))
+		{
+			$view = ucfirst(strtolower($tasks[2]));
+		}
+
+		// Some special handling for com_config administrator
+		$option = $app->input->get('option');
+
+		if ($option === 'com_config' && $app->isClient('administrator'))
+		{
+			$component = $app->input->get('component');
+
+			if (!empty($component))
+			{
+				$view = 'Component';
+			}
+			elseif ($option === 'com_config')
+			{
+				$view = 'Application';
+			}
+		}
+
+		$controllerName = $location . 'Controller' . $view . $activity;
+
+		if (!class_exists($controllerName))
+		{
+			return false;
+		}
+
+		$controller = new $controllerName;
+		$controller->options = array();
+		$controller->options = $tasks;
+
+		return $controller;
+	}
+}
diff --git a/core/components/com_config/controller/modules/cancel.php b/core/components/com_config/controller/modules/cancel.php
new file mode 100644
index 00000000..7d9b929a
--- /dev/null
+++ b/core/components/com_config/controller/modules/cancel.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Cancel Controller for module editing
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ * @since       3.2
+ */
+class ConfigControllerModulesCancel extends ConfigControllerCanceladmin
+{
+	/**
+	 * Method to cancel module editing.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check if the user is authorized to do this.
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('module.edit.frontend', 'com_modules.module.' . $this->input->get('id')))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->redirect('index.php');
+		}
+
+		$this->context = 'com_config.config.global';
+
+		// Get returnUri
+		$returnUri = $this->input->post->get('return', null, 'base64');
+
+		if (!empty($returnUri))
+		{
+			$this->redirect = base64_decode(urldecode($returnUri));
+		}
+		else
+		{
+			$this->redirect = JUri::base();
+		}
+
+		$id = $this->input->getInt('id');
+
+		// Access backend com_module
+		JLoader::register('ModulesControllerModule', JPATH_ADMINISTRATOR . '/components/com_modules/controllers/module.php');
+		JLoader::register('ModulesViewModule', JPATH_ADMINISTRATOR . '/components/com_modules/views/module/view.json.php');
+		JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php');
+
+		$cancelClass = new ModulesControllerModule;
+
+		$cancelClass->cancel($id);
+
+		parent::execute();
+	}
+}
diff --git a/core/components/com_config/controller/modules/display.php b/core/components/com_config/controller/modules/display.php
new file mode 100644
index 00000000..e0a789e2
--- /dev/null
+++ b/core/components/com_config/controller/modules/display.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Display Controller for module editing
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ * @since       3.2
+ */
+class ConfigControllerModulesDisplay extends ConfigControllerDisplay
+{
+	/**
+	 * Method to display module editing.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+
+		// Get the application
+		$app = $this->getApplication();
+
+		// Get the document object.
+		$document     = JFactory::getDocument();
+
+		$viewName     = $this->input->getWord('view', 'modules');
+		$viewFormat   = $document->getType();
+		$layoutName   = $this->input->getWord('layout', 'default');
+		$returnUri    = $this->input->get->get('return', null, 'base64');
+
+		// Construct redirect URI
+		if (!empty($returnUri))
+		{
+			$redirect = base64_decode(urldecode($returnUri));
+
+			// Don't redirect to an external URL.
+			if (!JUri::isInternal($redirect))
+			{
+				$redirect = JUri::base();
+			}
+		}
+		else
+		{
+			$redirect = JUri::base();
+		}
+
+		// Access backend com_module
+		JLoader::register('ModulesController', JPATH_ADMINISTRATOR . '/components/com_modules/controller.php');
+		JLoader::register('ModulesViewModule', JPATH_ADMINISTRATOR . '/components/com_modules/views/module/view.json.php');
+		JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php');
+
+		$displayClass = new ModulesController;
+
+		// Get the parameters of the module with Id
+		$document->setType('json');
+
+		// Execute backend controller
+		if (!($serviceData = json_decode($displayClass->display(), true)))
+		{
+			$app->redirect($redirect);
+		}
+
+		// Reset params back after requesting from service
+		$document->setType('html');
+		$app->input->set('view', $viewName);
+
+		// Register the layout paths for the view
+		$paths = new SplPriorityQueue;
+		$paths->insert(JPATH_COMPONENT . '/view/' . $viewName . '/tmpl', 'normal');
+
+		$viewClass  = 'ConfigView' . ucfirst($viewName) . ucfirst($viewFormat);
+		$modelClass = 'ConfigModel' . ucfirst($viewName);
+
+		if (class_exists($viewClass))
+		{
+			$model = new $modelClass;
+
+			// Access check.
+			$user = JFactory::getUser();
+
+			if (!$user->authorise('module.edit.frontend', 'com_modules.module.' . $serviceData['id'])
+				&& !$user->authorise('module.edit.frontend', 'com_modules'))
+			{
+				$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+				$app->redirect($redirect);
+			}
+
+			// Need to add module name to the state of model
+			$model->getState()->set('module.name', $serviceData['module']);
+
+			$view = new $viewClass($model, $paths);
+
+			$view->setLayout($layoutName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load form and bind data
+			$form = $model->getForm();
+
+			if ($form)
+			{
+				$form->bind($serviceData);
+			}
+
+			// Set form and data to the view
+			$view->form = &$form;
+			$view->item = &$serviceData;
+
+			// Render view.
+			echo $view->render();
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_config/controller/modules/save.php b/core/components/com_config/controller/modules/save.php
new file mode 100644
index 00000000..f059a3a1
--- /dev/null
+++ b/core/components/com_config/controller/modules/save.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Save Controller for module editing
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ * @since       3.2
+ */
+class ConfigControllerModulesSave extends JControllerBase
+{
+	/**
+	 * Method to save module editing.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken())
+		{
+			$this->app->enqueueMessage(JText::_('JINVALID_TOKEN'));
+			$this->app->redirect('index.php');
+		}
+
+		// Check if the user is authorized to do this.
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('module.edit.frontend', 'com_modules.module.' . $this->input->get('id'))
+			&& !$user->authorise('module.edit.frontend', 'com_modules'))
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'));
+			$this->app->redirect('index.php');
+		}
+
+		// Set FTP credentials, if given.
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		// Get sumitted module id
+		$moduleId = '&id=' . $this->input->get('id');
+
+		// Get returnUri
+		$returnUri = $this->input->post->get('return', null, 'base64');
+		$redirect = '';
+
+		if (!empty($returnUri))
+		{
+			$redirect = '&return=' . $returnUri;
+		}
+
+		// Access backend com_modules to be done
+		JLoader::register('ModulesControllerModule', JPATH_ADMINISTRATOR . '/components/com_modules/controllers/module.php');
+		JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php');
+
+		$controllerClass = new ModulesControllerModule;
+
+		// Get a document object
+		$document = JFactory::getDocument();
+
+		// Set backend required params
+		$document->setType('json');
+
+		// Execute backend controller
+		$return = $controllerClass->save();
+
+		// Reset params back after requesting from service
+		$document->setType('html');
+
+		// Check the return value.
+		if ($return === false)
+		{
+			// Save the data in the session.
+			$data = $this->input->post->get('jform', array(), 'array');
+
+			$this->app->setUserState('com_config.modules.global.data', $data);
+
+			// Save failed, go back to the screen and display a notice.
+			$this->app->enqueueMessage(JText::_('JERROR_SAVE_FAILED'));
+			$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.modules' . $moduleId . $redirect, false));
+		}
+
+		// Redirect back to com_config display
+		$this->app->enqueueMessage(JText::_('COM_CONFIG_MODULES_SAVE_SUCCESS'));
+
+		// Set the redirect based on the task.
+		switch ($this->options[3])
+		{
+			case 'apply':
+				$this->app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.modules' . $moduleId . $redirect, false));
+				break;
+
+			case 'save':
+			default:
+
+				if (!empty($returnUri))
+				{
+					$redirect = base64_decode(urldecode($returnUri));
+
+					// Don't redirect to an external URL.
+					if (!JUri::isInternal($redirect))
+					{
+						$redirect = JUri::base();
+					}
+				}
+				else
+				{
+					$redirect = JUri::base();
+				}
+
+				$this->app->redirect($redirect);
+				break;
+		}
+	}
+}
diff --git a/core/components/com_config/controller/templates/display.php b/core/components/com_config/controller/templates/display.php
new file mode 100644
index 00000000..7c5ef48c
--- /dev/null
+++ b/core/components/com_config/controller/templates/display.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Display Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerTemplatesDisplay extends ConfigControllerDisplay
+{
+	/**
+	 * Method to display global configuration.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Get the application
+		$app = $this->getApplication();
+
+		// Get the document object.
+		$document     = JFactory::getDocument();
+
+		$viewName     = $this->input->getWord('view', 'templates');
+		$viewFormat   = $document->getType();
+		$layoutName   = $this->input->getWord('layout', 'default');
+
+		// Access backend com_config
+		JLoader::register('TemplatesController', JPATH_ADMINISTRATOR . '/components/com_templates/controller.php');
+		JLoader::register('TemplatesViewStyle', JPATH_ADMINISTRATOR . '/components/com_templates/views/style/view.json.php');
+		JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php');
+
+		$displayClass = new TemplatesController;
+
+		// Set backend required params
+		$document->setType('json');
+		$this->input->set('id', $app->getTemplate(true)->id);
+
+		// Execute backend controller
+		$serviceData = json_decode($displayClass->display(), true);
+
+		// Reset params back after requesting from service
+		$document->setType('html');
+		$this->input->set('view', $viewName);
+
+		// Register the layout paths for the view
+		$paths = new SplPriorityQueue;
+		$paths->insert(JPATH_COMPONENT . '/view/' . $viewName . '/tmpl', 'normal');
+
+		$viewClass  = 'ConfigView' . ucfirst($viewName) . ucfirst($viewFormat);
+		$modelClass = 'ConfigModel' . ucfirst($viewName);
+
+		if (class_exists($viewClass))
+		{
+			if ($viewName !== 'close')
+			{
+				$model = new $modelClass;
+
+				// Access check.
+				if (!JFactory::getUser()->authorise('core.admin', $model->getState('component.option')))
+				{
+					$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+
+					return;
+				}
+			}
+
+			$view = new $viewClass($model, $paths);
+
+			$view->setLayout($layoutName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			// Load form and bind data
+			$form = $model->getForm();
+
+			if ($form)
+			{
+				$form->bind($serviceData);
+			}
+
+			// Set form and data to the view
+			$view->form = &$form;
+
+			// Render view.
+			echo $view->render();
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_config/controller/templates/save.php b/core/components/com_config/controller/templates/save.php
new file mode 100644
index 00000000..1d417313
--- /dev/null
+++ b/core/components/com_config/controller/templates/save.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Save Controller for global configuration
+ *
+ * @since  3.2
+ */
+class ConfigControllerTemplatesSave extends JControllerBase
+{
+	/**
+	 * Method to save global configuration.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Check for request forgeries.
+		if (!JSession::checkToken())
+		{
+			JFactory::getApplication()->redirect('index.php', JText::_('JINVALID_TOKEN'));
+		}
+
+		// Check if the user is authorized to do this.
+		if (!JFactory::getUser()->authorise('core.admin'))
+		{
+			JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR'));
+
+			return;
+		}
+
+		// Set FTP credentials, if given.
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		$app = JFactory::getApplication();
+
+		// Access backend com_templates
+		JLoader::register('TemplatesControllerStyle', JPATH_ADMINISTRATOR . '/components/com_templates/controllers/style.php');
+		JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php');
+		JLoader::register('TemplatesTableStyle', JPATH_ADMINISTRATOR . '/components/com_templates/tables/style.php');
+		$controllerClass = new TemplatesControllerStyle;
+
+		// Get a document object
+		$document = JFactory::getDocument();
+
+		// Set backend required params
+		$document->setType('json');
+		$this->input->set('id', $app->getTemplate(true)->id);
+
+		// Execute backend controller
+		$return = $controllerClass->save();
+
+		// Reset params back after requesting from service
+		$document->setType('html');
+
+		// Check the return value.
+		if ($return === false)
+		{
+			// Save the data in the session.
+			$app->setUserState('com_config.config.global.data', $data);
+
+			// Save failed, go back to the screen and display a notice.
+			$message = JText::sprintf('JERROR_SAVE_FAILED');
+
+			$app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.templates', false), $message, 'error');
+
+			return false;
+		}
+
+		// Set the success message.
+		$message = JText::_('COM_CONFIG_SAVE_SUCCESS');
+
+		// Redirect back to com_config display
+		$app->redirect(JRoute::_('index.php?option=com_config&controller=config.display.templates', false), $message);
+
+		return true;
+	}
+}
diff --git a/core/components/com_config/model/cms.php b/core/components/com_config/model/cms.php
new file mode 100644
index 00000000..7d2bce2b
--- /dev/null
+++ b/core/components/com_config/model/cms.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Prototype admin model.
+ *
+ * @since  3.2
+ */
+abstract class ConfigModelCms extends JModelDatabase
+{
+	/**
+	 * The model (base) name
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $name;
+
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $option = null;
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $text_prefix = null;
+
+	/**
+	 * Indicates if the internal state has been set
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $__state_set = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  An array of configuration options (name, state, dbo, table_path, ignore_request).
+	 *
+	 * @since   3.2
+	 * @throws  Exception
+	 */
+	public function __construct($config = array())
+	{
+		// Guess the option from the class name (Option)Model(View).
+		if (empty($this->option))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Model/i', get_class($this), $r))
+			{
+				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_MODEL_GET_NAME'), 500);
+			}
+
+			$this->option = 'com_' . strtolower($r[1]);
+		}
+
+		// Set the view name
+		if (empty($this->name))
+		{
+			if (array_key_exists('name', $config))
+			{
+				$this->name = $config['name'];
+			}
+			else
+			{
+				$this->name = $this->getName();
+			}
+		}
+
+		// Set the model state
+		if (array_key_exists('state', $config))
+		{
+			$this->state = $config['state'];
+		}
+		else
+		{
+			$this->state = new Registry;
+		}
+
+		// Set the model dbo
+		if (array_key_exists('dbo', $config))
+		{
+			$this->db = $config['dbo'];
+		}
+
+		// Register the paths for the form
+		$paths = $this->registerTablePaths($config);
+
+		// Set the internal state marker - used to ignore setting state from the request
+		if (!empty($config['ignore_request']))
+		{
+			$this->__state_set = true;
+		}
+
+		// Set the clean cache event
+		if (isset($config['event_clean_cache']))
+		{
+			$this->event_clean_cache = $config['event_clean_cache'];
+		}
+		elseif (empty($this->event_clean_cache))
+		{
+			$this->event_clean_cache = 'onContentCleanCache';
+		}
+
+		$state = new Registry($config);
+
+		parent::__construct($state);
+	}
+
+	/**
+	 * Method to get the model name
+	 *
+	 * The model name. By default parsed using the classname or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the model
+	 *
+	 * @since   3.2
+	 * @throws  Exception
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$r = null;
+
+			if (!preg_match('/Model(.*)/i', get_class($this), $r))
+			{
+				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_MODEL_GET_NAME'), 500);
+			}
+
+			$this->name = strtolower($r[1]);
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Method to get model state variables
+	 *
+	 * @return  object  The property where specified, the state object where omitted
+	 *
+	 * @since   3.2
+	 */
+	public function getState()
+	{
+		if (!$this->__state_set)
+		{
+			// Protected method to auto-populate the model state.
+			$this->populateState();
+
+			// Set the model state set flag to true.
+			$this->__state_set = true;
+		}
+
+		return $this->state;
+	}
+
+	/**
+	 * Method to register paths for tables
+	 *
+	 * @param   array  $config  Configuration array
+	 *
+	 * @return  object  The property where specified, the state object where omitted
+	 *
+	 * @since   3.2
+	 */
+	public function registerTablePaths($config = array())
+	{
+		// Set the default view search path
+		if (array_key_exists('table_path', $config))
+		{
+			$this->addTablePath($config['table_path']);
+		}
+		elseif (defined('JPATH_COMPONENT_ADMINISTRATOR'))
+		{
+			// Register the paths for the form
+			$paths = new SplPriorityQueue;
+			$paths->insert(JPATH_COMPONENT_ADMINISTRATOR . '/table', 'normal');
+
+			// For legacy purposes. Remove for 4.0
+			$paths->insert(JPATH_COMPONENT_ADMINISTRATOR . '/tables', 'normal');
+		}
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		$conf = JFactory::getConfig();
+		$dispatcher = JEventDispatcher::getInstance();
+
+		$options = array(
+			'defaultgroup' => $group ?: (isset($this->option) ? $this->option : JFactory::getApplication()->input->get('option')),
+			'cachebase' => $client_id ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache'));
+
+		$cache = JCache::getInstance('callback', $options);
+		$cache->clean();
+
+		// Trigger the onContentCleanCache event.
+		$dispatcher->trigger($this->event_clean_cache, $options);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * @return  void
+	 *
+	 * @note    Calling getState in this method will result in recursion.
+	 * @since   3.2
+	 */
+	protected function populateState()
+	{
+		$this->loadState();
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.2
+	 */
+	protected function canDelete($record)
+	{
+		if (!empty($record->id))
+		{
+			if ($record->published != -2)
+			{
+				return false;
+			}
+
+			$user = JFactory::getUser();
+
+			return $user->authorise('core.delete', $this->option);
+		}
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission set in the component.
+	 *
+	 * @since   3.2
+	 */
+	protected function canEditState($record)
+	{
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.edit.state', $this->option);
+	}
+}
diff --git a/core/components/com_config/model/config.php b/core/components/com_config/model/config.php
new file mode 100644
index 00000000..a12afc2d
--- /dev/null
+++ b/core/components/com_config/model/config.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Model for the global configuration
+ *
+ * @since  3.2
+ */
+class ConfigModelConfig extends ConfigModelForm
+{
+	/**
+	 * Method to get a form object.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed	A JForm object on success, false on failure
+	 *
+	 * @since	3.2
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_config.config', 'config', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+}
diff --git a/core/components/com_config/model/form.php b/core/components/com_config/model/form.php
new file mode 100644
index 00000000..14208bc4
--- /dev/null
+++ b/core/components/com_config/model/form.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Prototype form model.
+ *
+ * @see    JForm
+ * @see    JFormField
+ * @see    JFormRule
+ * @since  3.2
+ */
+abstract class ConfigModelForm extends ConfigModelCms
+{
+	/**
+	 * Array of form objects.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $forms = array();
+
+	/**
+	 * Method to checkin a row.
+	 *
+	 * @param   integer  $pk  The numeric id of the primary key.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   3.2
+	 * @throws  RuntimeException
+	 */
+	public function checkin($pk = null)
+	{
+		// Only attempt to check the row in if it exists.
+		if ($pk)
+		{
+			$user = JFactory::getUser();
+
+			// Get an instance of the row to checkin.
+			$table = $this->getTable();
+
+			if (!$table->load($pk))
+			{
+				throw new RuntimeException($table->getError());
+			}
+
+			// Check if this is the user has previously checked out the row.
+			if ($table->checked_out > 0 && $table->checked_out != $user->get('id') && !$user->authorise('core.admin', 'com_checkin'))
+			{
+				throw new RuntimeException($table->getError());
+			}
+
+			// Attempt to check the row in.
+			if (!$table->checkin($pk))
+			{
+				throw new RuntimeException($table->getError());
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to check-out a row for editing.
+	 *
+	 * @param   integer  $pk  The numeric id of the primary key.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function checkout($pk = null)
+	{
+		// Only attempt to check the row in if it exists.
+		if ($pk)
+		{
+			$user = JFactory::getUser();
+
+			// Get an instance of the row to checkout.
+			$table = $this->getTable();
+
+			if (!$table->load($pk))
+			{
+				throw new RuntimeException($table->getError());
+			}
+
+			// Check if this is the user having previously checked out the row.
+			if ($table->checked_out > 0 && $table->checked_out != $user->get('id'))
+			{
+				throw new RuntimeException(JText::_('JLIB_APPLICATION_ERROR_CHECKOUT_USER_MISMATCH'));
+			}
+
+			// Attempt to check the row out.
+			if (!$table->checkout($user->get('id'), $pk))
+			{
+				throw new RuntimeException($table->getError());
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Abstract method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   3.2
+	 */
+	abstract public function getForm($data = array(), $loadData = true);
+
+	/**
+	 * Method to get a form object.
+	 *
+	 * @param   string   $name     The name of the form.
+	 * @param   string   $source   The form source. Can be XML string if file flag is set to false.
+	 * @param   array    $options  Optional array of options for the form creation.
+	 * @param   boolean  $clear    Optional argument to force load a new form.
+	 * @param   string   $xpath    An optional xpath to search for the fields.
+	 *
+	 * @return  mixed  JForm object on success, False on error.
+	 *
+	 * @see     JForm
+	 * @since   3.2
+	 */
+	protected function loadForm($name, $source = null, $options = array(), $clear = false, $xpath = false)
+	{
+		// Handle the optional arguments.
+		$options['control'] = ArrayHelper::getValue($options, 'control', false);
+
+		// Create a signature hash.
+		$hash = sha1($source . serialize($options));
+
+		// Check if we can use a previously loaded form.
+		if (isset($this->_forms[$hash]) && !$clear)
+		{
+			return $this->_forms[$hash];
+		}
+
+		// Get the form.
+		// Register the paths for the form -- failing here
+		$paths = new SplPriorityQueue;
+		$paths->insert(JPATH_COMPONENT . '/model/form', 'normal');
+		$paths->insert(JPATH_COMPONENT . '/model/field', 'normal');
+		$paths->insert(JPATH_COMPONENT . '/model/rule', 'normal');
+
+		// Legacy support to be removed in 4.0.  -- failing here
+		$paths->insert(JPATH_COMPONENT . '/models/forms', 'normal');
+		$paths->insert(JPATH_COMPONENT . '/models/fields', 'normal');
+		$paths->insert(JPATH_COMPONENT . '/models/rules', 'normal');
+
+		// Solution until JForm supports splqueue
+		JForm::addFormPath(JPATH_COMPONENT . '/models/forms');
+		JForm::addFieldPath(JPATH_COMPONENT . '/models/fields');
+		JForm::addFormPath(JPATH_COMPONENT . '/model/form');
+		JForm::addFieldPath(JPATH_COMPONENT . '/model/field');
+
+		try
+		{
+			$form = JForm::getInstance($name, $source, $options, false, $xpath);
+
+			if (isset($options['load_data']) && $options['load_data'])
+			{
+				// Get the data for the form.
+				$data = $this->loadFormData();
+			}
+			else
+			{
+				$data = array();
+			}
+
+			// Allow for additional modification of the form, and events to be triggered.
+			// We pass the data because plugins may require it.
+			$this->preprocessForm($form, $data);
+
+			// Load the data into the form after the plugins have operated.
+			$form->bind($data);
+		}
+		catch (Exception $e)
+		{
+			JFactory::getApplication()->enqueueMessage($e->getMessage());
+
+			return false;
+		}
+
+		// Store the form for later.
+		$this->_forms[$hash] = $form;
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array    The default data is an empty array.
+	 *
+	 * @since   3.2
+	 */
+	protected function loadFormData()
+	{
+		return array();
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the data.
+	 *
+	 * @param   string  $context  The context identifier.
+	 * @param   mixed   &$data    The data to be processed. It gets altered directly.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function preprocessData($context, &$data)
+	{
+		// Get the dispatcher and load the users plugins.
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('content');
+
+		// Trigger the data preparation event.
+		$results = $dispatcher->trigger('onContentPrepareData', array($context, $data));
+
+		// Check for errors encountered while preparing the data.
+		if (count($results) > 0 && in_array(false, $results, true))
+		{
+			JFactory::getApplication()->enqueueMessage($dispatcher->getError(), 'error');
+		}
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @see     JFormField
+	 * @since   3.2
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		// Import the appropriate plugin group.
+		JPluginHelper::importPlugin($group);
+
+		// Get the dispatcher.
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Trigger the form preparation event.
+		$results = $dispatcher->trigger('onContentPrepareForm', array($form, $data));
+
+		// Check for errors encountered while preparing the form.
+		if (count($results) && in_array(false, $results, true))
+		{
+			// Get the last error.
+			$error = $dispatcher->getError();
+
+			if (!($error instanceof Exception))
+			{
+				throw new Exception($error);
+			}
+		}
+	}
+
+	/**
+	 * Method to validate the form data.
+	 *
+	 * @param   JForm   $form   The form to validate against.
+	 * @param   array   $data   The data to validate.
+	 * @param   string  $group  The name of the field group to validate.
+	 *
+	 * @return  mixed  Array of filtered data if valid, false otherwise.
+	 *
+	 * @see     JFormRule
+	 * @see     JFilterInput
+	 * @since   3.2
+	 */
+	public function validate($form, $data, $group = null)
+	{
+		// Filter and validate the form data.
+		$data   = $form->filter($data);
+		$return = $form->validate($data, $group);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			JFactory::getApplication()->enqueueMessage($return->getMessage(), 'error');
+
+			return false;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $message)
+			{
+				if ($message instanceof Exception)
+				{
+					$message = $message->getMessage();
+				}
+
+				JFactory::getApplication()->enqueueMessage($message, 'error');
+			}
+
+			return false;
+		}
+
+		return $data;
+	}
+}
diff --git a/core/components/com_config/model/form/config.xml b/core/components/com_config/model/form/config.xml
new file mode 100644
index 00000000..d8c54e3d
--- /dev/null
+++ b/core/components/com_config/model/form/config.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset
+		name="metadata"
+		label="COM_CONFIG_METADATA_SETTINGS">
+		<field
+			name="MetaDesc"
+			type="textarea"
+			label="COM_CONFIG_FIELD_METADESC_LABEL"
+			description="COM_CONFIG_FIELD_METADESC_DESC"
+			filter="string"
+			cols="60"
+			rows="3" 
+		/>
+
+		<field
+			name="MetaKeys"
+			type="textarea"
+			label="COM_CONFIG_FIELD_METAKEYS_LABEL"
+			description="COM_CONFIG_FIELD_METAKEYS_DESC"
+			filter="string"
+			cols="60"
+			rows="3" 
+		/>
+
+		<field
+			name="MetaRights"
+			type="textarea"
+			label="JFIELD_META_RIGHTS_LABEL"
+			description="JFIELD_META_RIGHTS_DESC"
+			filter="string"
+			cols="60"
+			rows="2"
+		/>
+
+	</fieldset>
+
+	<fieldset
+		name="seo"
+		label="CONFIG_SEO_SETTINGS_LABEL">
+		<field
+			name="sef"
+			type="radio"
+			label="COM_CONFIG_FIELD_SEF_URL_LABEL"
+			description="COM_CONFIG_FIELD_SEF_URL_DESC"
+			default="1"
+			class="btn-group"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="sitename_pagetitles"
+			type="list"
+			label="COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL"
+			description="COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC"
+			default="0"
+			filter="integer"
+			>
+			<option value="2">COM_CONFIG_FIELD_VALUE_AFTER</option>
+			<option value="1">COM_CONFIG_FIELD_VALUE_BEFORE</option>
+			<option value="0">JNO</option>
+		</field>
+
+	</fieldset>	
+
+	<fieldset
+		name="site"
+		label="CONFIG_SITE_SETTINGS_LABEL">
+
+		<field
+			name="sitename"
+			type="text"
+			label="COM_CONFIG_FIELD_SITE_NAME_LABEL"
+			description="COM_CONFIG_FIELD_SITE_NAME_DESC"
+			required="true"
+			filter="string"
+			size="50" 
+		/>
+
+		<field
+			name="offline"
+			type="radio"
+			label="COM_CONFIG_FIELD_SITE_OFFLINE_LABEL"
+			description="COM_CONFIG_FIELD_SITE_OFFLINE_DESC"
+			default="0"
+			class="btn-group"
+			filter="integer"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC"
+			default="1"
+			filter="integer" 
+		/>
+
+		<field
+			name="list_limit"
+			type="list"
+			label="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL"
+			description="COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC"
+			default="20"
+			filter="integer"
+			>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="100">J100</option>
+		</field>
+		
+	</fieldset>
+
+	<fieldset>
+		<field
+			name="asset_id"
+			type="hidden" 
+		/>
+	</fieldset>
+</form>
diff --git a/core/components/com_config/model/form/modules.xml b/core/components/com_config/model/form/modules.xml
new file mode 100644
index 00000000..f8dab88a
--- /dev/null
+++ b/core/components/com_config/model/form/modules.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field 
+			name="id" 
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
+			readonly="true"
+		/>
+
+		<field
+			name="title" 
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="COM_MODULES_FIELD_TITLE_DESC"
+			maxlength="100"
+			required="true"
+			size="35"
+		/>
+
+		<field 
+			name="note" 
+			type="text"
+			label="COM_MODULES_FIELD_NOTE_LABEL"
+			description="COM_MODULES_FIELD_NOTE_DESC"
+			maxlength="255"
+			size="35"
+		/>
+
+		<field 
+			name="module" 
+			type="hidden"
+			label="COM_MODULES_FIELD_MODULE_LABEL"
+			description="COM_MODULES_FIELD_MODULE_DESC"
+			readonly="readonly"
+			size="20"
+		/>
+
+		<field 
+			name="showtitle" 
+			type="radio"
+			label="COM_MODULES_FIELD_SHOWTITLE_LABEL"
+			description="COM_MODULES_FIELD_SHOWTITLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			size="1"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field 
+			name="published" 
+			type="radio"
+			label="JSTATUS"
+			description="COM_MODULES_FIELD_PUBLISHED_DESC"
+			class="btn-group"
+			default="1"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="COM_MODULES_FIELD_PUBLISH_UP_LABEL"
+			description="COM_MODULES_FIELD_PUBLISH_UP_DESC"
+			filter="user_utc"
+			class="input-medium"
+			translateformat="true"
+			showtime="true"
+			size="22"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="COM_MODULES_FIELD_PUBLISH_DOWN_LABEL"
+			description="COM_MODULES_FIELD_PUBLISH_DOWN_DESC"
+			filter="user_utc"
+			class="input-medium"
+			translateformat="true"
+			showtime="true"
+			size="22"
+		/>
+
+		<field 
+			name="client_id" 
+			type="hidden"
+			label="COM_MODULES_FIELD_CLIENT_ID_LABEL"
+			description="COM_MODULES_FIELD_CLIENT_ID_DESC"
+			readonly="true"
+			size="1"
+		/>
+
+		<field 
+			name="position" 
+			type="moduleposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			description="COM_MODULES_FIELD_POSITION_DESC"
+			default=""
+			maxlength="50"
+		/>
+
+		<field 
+			name="access" 
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+
+		<field 
+			name="ordering" 
+			type="moduleorder"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+		/>
+
+		<field 
+			name="content" 
+			type="editor"
+			label="COM_MODULES_FIELD_CONTENT_LABEL"
+			description="COM_MODULES_FIELD_CONTENT_DESC"
+			buttons="true"
+			class="inputbox"
+			filter="JComponentHelper::filterText"
+			hide="readmore,pagebreak"
+		/>
+
+		<field 
+			name="language" 
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_MODULE_LANGUAGE_DESC"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field name="assignment" type="hidden" />
+
+		<field name="assigned" type="hidden" />
+	</fieldset>
+</form>
diff --git a/core/components/com_config/model/form/modules_advanced.xml b/core/components/com_config/model/form/modules_advanced.xml
new file mode 100644
index 00000000..3914d565
--- /dev/null
+++ b/core/components/com_config/model/form/modules_advanced.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset
+			name="advanced">
+
+			<field
+				name="module_tag"
+				type="moduletag"
+				label="COM_MODULES_FIELD_MODULE_TAG_LABEL"
+				description="COM_MODULES_FIELD_MODULE_TAG_DESC"
+				default="div"
+			/>
+
+			<field
+				name="bootstrap_size"
+				type="integer"
+				label="COM_MODULES_FIELD_BOOTSTRAP_SIZE_LABEL"
+				description="COM_MODULES_FIELD_BOOTSTRAP_SIZE_DESC"
+				first="0"
+				last="12"
+				step="1"
+			/>
+
+			<field
+				name="header_tag"
+				type="headertag"
+				label="COM_MODULES_FIELD_HEADER_TAG_LABEL"
+				description="COM_MODULES_FIELD_HEADER_TAG_DESC"
+				default="h3"
+			/>
+
+			<field
+				name="header_class"
+				type="text"
+				label="COM_MODULES_FIELD_HEADER_CLASS_LABEL"
+				description="COM_MODULES_FIELD_HEADER_CLASS_DESC"
+			/>
+
+			<field
+				name="style"
+				type="chromestyle"
+				label="COM_MODULES_FIELD_MODULE_STYLE_LABEL"
+				description="COM_MODULES_FIELD_MODULE_STYLE_DESC"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/components/com_config/model/form/templates.xml b/core/components/com_config/model/form/templates.xml
new file mode 100644
index 00000000..67b25eee
--- /dev/null
+++ b/core/components/com_config/model/form/templates.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="id"
+			type="number"
+			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
+			id="id"
+			default="0"
+			readonly="true"
+			class="readonly"
+		/>
+
+		<field
+			name="template"
+			type="text"
+			label="COM_TEMPLATES_FIELD_TEMPLATE_LABEL"
+			description="COM_TEMPLATES_FIELD_TEMPLATE_DESC"
+			class="readonly"
+			size="30"
+			readonly="true" 
+		/>
+
+		<field
+			name="client_id"
+			type="hidden"
+			label="COM_TEMPLATES_FIELD_CLIENT_LABEL"
+			description="COM_TEMPLATES_FIELD_CLIENT_DESC"
+			class="readonly"
+			default="0"
+			readonly="true" 
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="COM_TEMPLATES_FIELD_TITLE_LABEL"
+			description="COM_TEMPLATES_FIELD_TITLE_DESC"
+			class="inputbox"
+			size="50"
+			required="true" 
+		/>
+
+		<field name="assigned" type="hidden" />
+
+	</fieldset>
+</form>
diff --git a/core/components/com_config/model/modules.php b/core/components/com_config/model/modules.php
new file mode 100644
index 00000000..941e8d0d
--- /dev/null
+++ b/core/components/com_config/model/modules.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Config Module model.
+ *
+ * @since  3.2
+ */
+class ConfigModelModules extends ConfigModelForm
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		// Load the User state.
+		$pk = $app->input->getInt('id');
+
+		$state = $this->loadState();
+
+		$state->set('module.id', $pk);
+
+		$this->setState($state);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   3.2
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_config.modules', 'modules', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$form->setFieldAttribute('position', 'client',  'site');
+
+		return $form;
+	}
+
+	/**
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @throws  Exception if there is an error loading the form.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		jimport('joomla.filesystem.path');
+
+		$lang     = JFactory::getLanguage();
+
+		$module = $this->getState()->get('module.name');
+		$basePath = JPATH_BASE;
+
+		$formFile = JPath::clean($basePath . '/modules/' . $module . '/' . $module . '.xml');
+
+		// Load the core and/or local language file(s).
+		$lang->load($module, $basePath, null, false, true)
+			||	 $lang->load($module, $basePath . '/modules/' . $module, null, false, true);
+
+		if (file_exists($formFile))
+		{
+			// Get the module form.
+			if (!$form->loadFile($formFile, false, '//config'))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+
+			// Attempt to load the xml file.
+			if (!$xml = simplexml_load_file($formFile))
+			{
+				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+			}
+		}
+
+		// Load the default advanced params
+		JForm::addFormPath(JPATH_BASE . '/components/com_config/model/form');
+		$form->loadFile('modules_advanced', false);
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to get list of module positions in current template
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public function getPositions()
+	{
+		$lang         = JFactory::getLanguage();
+		$templateName = JFactory::getApplication()->getTemplate();
+
+		// Load templateDetails.xml file
+		$path = JPath::clean(JPATH_BASE . '/templates/' . $templateName . '/templateDetails.xml');
+		$currentTemplatePositions = array();
+
+		if (file_exists($path))
+		{
+			$xml = simplexml_load_file($path);
+
+			if (isset($xml->positions[0]))
+			{
+				// Load language files
+				$lang->load('tpl_' . $templateName . '.sys', JPATH_BASE, null, false, true)
+				||	$lang->load('tpl_' . $templateName . '.sys', JPATH_BASE . '/templates/' . $templateName, null, false, true);
+
+				foreach ($xml->positions[0] as $position)
+				{
+					$value = (string) $position;
+					$text = preg_replace('/[^a-zA-Z0-9_\-]/', '_', 'TPL_' . strtoupper($templateName) . '_POSITION_' . strtoupper($value));
+
+					// Construct list of positions
+					$currentTemplatePositions[] = self::createOption($value, JText::_($text) . ' [' . $value . ']');
+				}
+			}
+		}
+
+		$templateGroups = array();
+
+		// Add an empty value to be able to deselect a module position
+		$option = self::createOption();
+		$templateGroups[''] = self::createOptionGroup('', array($option));
+
+		$templateGroups[$templateName] = self::createOptionGroup($templateName, $currentTemplatePositions);
+
+		// Add custom position to options
+		$customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION');
+
+		$editPositions   = true;
+		$customPositions = self::getActivePositions(0, $editPositions);
+		$templateGroups[$customGroupText] = self::createOptionGroup($customGroupText, $customPositions);
+
+		return $templateGroups;
+	}
+
+	/**
+	 * Get a list of modules positions
+	 *
+	 * @param   integer  $clientId       Client ID
+	 * @param   boolean  $editPositions  Allow to edit the positions
+	 *
+	 * @return  array  A list of positions
+	 *
+	 * @since   3.6.3
+	 */
+	public static function getActivePositions($clientId, $editPositions = false)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT position')
+			->from($db->quoteName('#__modules'))
+			->where($db->quoteName('client_id') . ' = ' . (int) $clientId)
+			->order($db->quoteName('position'));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$positions = $db->loadColumn();
+			$positions = is_array($positions) ? $positions : array();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return;
+		}
+
+		// Build the list
+		$options = array();
+
+		foreach ($positions as $position)
+		{
+			if (!$position && !$editPositions)
+			{
+				$options[] = JHtml::_('select.option', 'none', ':: ' . JText::_('JNONE') . ' ::');
+			}
+			else
+			{
+				$options[] = JHtml::_('select.option', $position, $position);
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Create and return a new Option
+	 *
+	 * @param   string  $value  The option value [optional]
+	 * @param   string  $text   The option text [optional]
+	 *
+	 * @return  object  The option as an object (stdClass instance)
+	 *
+	 * @since   3.6.3
+	 */
+	private static function createOption($value = '', $text = '')
+	{
+		if (empty($text))
+		{
+			$text = $value;
+		}
+
+		$option = new stdClass;
+		$option->value = $value;
+		$option->text  = $text;
+
+		return $option;
+	}
+
+	/**
+	 * Create and return a new Option Group
+	 *
+	 * @param   string  $label    Value and label for group [optional]
+	 * @param   array   $options  Array of options to insert into group [optional]
+	 *
+	 * @return  array  Return the new group as an array
+	 *
+	 * @since   3.6.3
+	 */
+	private static function createOptionGroup($label = '', $options = array())
+	{
+		$group = array();
+		$group['value'] = $label;
+		$group['text']  = $label;
+		$group['items'] = $options;
+
+		return $group;
+	}
+}
diff --git a/core/components/com_config/model/templates.php b/core/components/com_config/model/templates.php
new file mode 100644
index 00000000..85b2bef3
--- /dev/null
+++ b/core/components/com_config/model/templates.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Template style model.
+ *
+ * @since  3.2
+ */
+class ConfigModelTemplates extends ConfigModelForm
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  null
+	 *
+	 * @since   3.2
+	 */
+	protected function populateState()
+	{
+		$state = $this->loadState();
+
+		// Load the parameters.
+		$params = JComponentHelper::getParams('com_templates');
+		$state->set('params', $params);
+
+		$this->setState($state);
+	}
+
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure
+	 *
+	 * @since   3.2
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_config.templates', 'templates', array('control' => 'jform', 'load_data' => $loadData));
+
+		try
+		{
+			$form = new JForm('com_config.templates');
+			$data = array();
+			$this->preprocessForm($form, $data);
+
+			// Load the data into the form
+			$form->bind($data);
+		}
+		catch (Exception $e)
+		{
+			JFactory::getApplication()->enqueueMessage($e->getMessage());
+
+			return false;
+		}
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to preprocess the form
+	 *
+	 * @param   JForm   $form   A form object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  Plugin group to load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @throws	Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		$lang = JFactory::getLanguage();
+
+		$template = JFactory::getApplication()->getTemplate();
+
+		jimport('joomla.filesystem.path');
+
+		// Load the core and/or local language file(s).
+		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+		|| $lang->load('tpl_' . $template, JPATH_BASE . '/templates/' . $template, null, false, true);
+
+		// Look for com_config.xml, which contains fileds to display
+		$formFile = JPath::clean(JPATH_BASE . '/templates/' . $template . '/com_config.xml');
+
+		if (!file_exists($formFile))
+		{
+			// If com_config.xml not found, fall back to templateDetails.xml
+			$formFile = JPath::clean(JPATH_BASE . '/templates/' . $template . '/templateDetails.xml');
+		}
+
+		// Get the template form.
+		if (file_exists($formFile) && !$form->loadFile($formFile, false, '//config'))
+		{
+			throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+		}
+
+		// Attempt to load the xml file.
+		if (!$xml = simplexml_load_file($formFile))
+		{
+			throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
+		}
+
+		// Trigger the default form events.
+		parent::preprocessForm($form, $data, $group);
+	}
+}
diff --git a/core/components/com_config/view/cms/html.php b/core/components/com_config/view/cms/html.php
new file mode 100644
index 00000000..a6859bc7
--- /dev/null
+++ b/core/components/com_config/view/cms/html.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Prototype admin view.
+ *
+ * @since  3.2
+ */
+abstract class ConfigViewCmsHtml extends JViewHtml
+{
+	/**
+	 * The output of the template script.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $_output = null;
+
+	/**
+	 * The name of the default template source file.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $_template = null;
+
+	/**
+	 * The set of search directories for resources (templates)
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $_path = array('template' => array(), 'helper' => array());
+
+	/**
+	 * Layout extension
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $_layoutExt = 'php';
+
+	/**
+	 * Method to instantiate the view.
+	 *
+	 * @param   JModel            $model  The model object.
+	 * @param   SplPriorityQueue  $paths  The paths queue.
+	 *
+	 * @since   3.2
+	 */
+	public function __construct(JModel $model, SplPriorityQueue $paths = null)
+	{
+		$app = JFactory::getApplication();
+		$component = JApplicationHelper::getComponentName();
+		$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $component);
+
+		if (isset($paths))
+		{
+			$paths->insert(JPATH_THEMES . '/' . $app->getTemplate() . '/html/' . $component . '/' . $this->getName(), 2);
+		}
+
+		parent::__construct($model, $paths);
+	}
+
+	/**
+	 * Load a template file -- first look in the templates folder for an override
+	 *
+	 * @param   string  $tpl  The name of the template source file; automatically searches the template paths and compiles as needed.
+	 *
+	 * @return  string  The output of the the template script.
+	 *
+	 * @since   3.2
+	 * @throws  Exception
+	 */
+	public function loadTemplate($tpl = null)
+	{
+		// Clear prior output
+		$this->_output = null;
+
+		$template = JFactory::getApplication()->getTemplate();
+		$layout = $this->getLayout();
+
+		// Create the template file name based on the layout
+		$file = isset($tpl) ? $layout . '_' . $tpl : $layout;
+
+		// Clean the file name
+		$file = preg_replace('/[^A-Z0-9_\.-]/i', '', $file);
+		$tpl = isset($tpl) ? preg_replace('/[^A-Z0-9_\.-]/i', '', $tpl) : $tpl;
+
+		// Load the language file for the template
+		$lang = JFactory::getLanguage();
+		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+		|| $lang->load('tpl_' . $template, JPATH_THEMES . "/$template", null, false, true);
+
+		// Prevents adding path twise
+		if (empty($this->_path['template']))
+		{
+			// Adding template paths
+			$this->paths->top();
+			$defaultPath = $this->paths->current();
+			$this->paths->next();
+			$templatePath = $this->paths->current();
+			$this->_path['template'] = array($defaultPath, $templatePath);
+		}
+
+		// Load the template script
+		jimport('joomla.filesystem.path');
+		$filetofind = $this->_createFileName('template', array('name' => $file));
+		$this->_template = JPath::find($this->_path['template'], $filetofind);
+
+		// If alternate layout can't be found, fall back to default layout
+		if ($this->_template == false)
+		{
+			$filetofind = $this->_createFileName('', array('name' => 'default' . (isset($tpl) ? '_' . $tpl : $tpl)));
+			$this->_template = JPath::find($this->_path['template'], $filetofind);
+		}
+
+		if ($this->_template != false)
+		{
+			// Unset so as not to introduce into template scope
+			unset($tpl, $file);
+
+			// Never allow a 'this' property
+			if (isset($this->this))
+			{
+				unset($this->this);
+			}
+
+			// Start capturing output into a buffer
+			ob_start();
+
+			// Include the requested template filename in the local scope
+			// (this will execute the view logic).
+			include $this->_template;
+
+			// Done with the requested template; get the buffer and
+			// clear it.
+			$this->_output = ob_get_contents();
+			ob_end_clean();
+
+			return $this->_output;
+		}
+		else
+		{
+			throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_LAYOUTFILE_NOT_FOUND', $file), 500);
+		}
+	}
+
+	/**
+	 * Create the filename for a resource
+	 *
+	 * @param   string  $type   The resource type to create the filename for
+	 * @param   array   $parts  An associative array of filename information
+	 *
+	 * @return  string  The filename
+	 *
+	 * @since   3.2
+	 */
+	protected function _createFileName($type, $parts = array())
+	{
+		switch ($type)
+		{
+			case 'template':
+				$filename = strtolower($parts['name']) . '.' . $this->_layoutExt;
+				break;
+
+			default:
+				$filename = strtolower($parts['name']) . '.php';
+				break;
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Method to get the view name
+	 *
+	 * The model name by default parsed using the classname, or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the model
+	 *
+	 * @since   3.2
+	 * @throws  Exception
+	 */
+	public function getName()
+	{
+		if (empty($this->_name))
+		{
+			$classname = get_class($this);
+			$viewpos = strpos($classname, 'View');
+
+			if ($viewpos === false)
+			{
+				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_VIEW_GET_NAME'), 500);
+			}
+
+			$lastPart = substr($classname, $viewpos + 4);
+			$pathParts = explode(' ', JStringNormalise::fromCamelCase($lastPart));
+
+			if (!empty($pathParts[1]))
+			{
+				$this->_name = strtolower($pathParts[0]);
+			}
+			else
+			{
+				$this->_name = strtolower($lastPart);
+			}
+		}
+
+		return $this->_name;
+	}
+}
diff --git a/core/components/com_config/view/cms/json.php b/core/components/com_config/view/cms/json.php
new file mode 100644
index 00000000..d5056c14
--- /dev/null
+++ b/core/components/com_config/view/cms/json.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Prototype admin view.
+ *
+ * @since  3.2
+ */
+abstract class ConfigViewCmsJson extends ConfigViewCmsHtml
+{
+	public $state;
+
+	public $data;
+
+	/**
+	 * Method to render the view.
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 */
+	public function render()
+	{
+		$this->data = $this->model->getData();
+
+		return json_encode($this->data);
+	}
+}
diff --git a/core/components/com_config/view/config/html.php b/core/components/com_config/view/config/html.php
new file mode 100644
index 00000000..a0493107
--- /dev/null
+++ b/core/components/com_config/view/config/html.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View for the global configuration
+ *
+ * @since  3.2
+ */
+class ConfigViewConfigHtml extends ConfigViewCmsHtml
+{
+	public $form;
+
+	public $data;
+
+	/**
+	 * Method to render the view.
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 */
+	public function render()
+	{
+		$user = JFactory::getUser();
+		$this->userIsSuperAdmin = $user->authorise('core.admin');
+
+		return parent::render();
+	}
+}
diff --git a/core/components/com_config/view/config/tmpl/default.php b/core/components/com_config/view/config/tmpl/default.php
new file mode 100644
index 00000000..ffab0802
--- /dev/null
+++ b/core/components/com_config/view/config/tmpl/default.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load tooltips behavior
+JHtml::_('behavior.formvalidator');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('formbehavior.chosen', 'select');
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('application-form'))) {
+			Joomla.submitform(task, document.getElementById('application-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
+
+	<div class="row-fluid">
+		<!-- Begin Content -->
+
+		<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+			<div class="btn-group">
+				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.save.config.apply')">
+					<span class="icon-ok"></span> <?php echo JText::_('JSAVE') ?>
+				</button>
+			</div>
+			<div class="btn-group">
+				<button type="button" class="btn" onclick="Joomla.submitbutton('config.cancel')">
+					<span class="icon-cancel"></span> <?php echo JText::_('JCANCEL') ?>
+				</button>
+			</div>
+		</div>
+
+		<hr class="hr-condensed" />
+
+		<div id="page-site" class="tab-pane active">
+			<div class="row-fluid">
+				<?php echo $this->loadTemplate('site'); ?>
+				<?php echo $this->loadTemplate('metadata'); ?>
+				<?php echo $this->loadTemplate('seo'); ?>
+			</div>
+		</div>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+
+		<!-- End Content -->
+	</div>
+
+</form>
diff --git a/core/components/com_config/view/config/tmpl/default.xml b/core/components/com_config/view/config/tmpl/default.xml
new file mode 100644
index 00000000..ba08bfc1
--- /dev/null
+++ b/core/components/com_config/view/config/tmpl/default.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE" option="COM_CONFIG_CONFIG_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_DISPLAY_SITE_CONFIGURATION"
+		/>
+		<message>
+			<![CDATA[COM_CONFIG_CONFIG_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fields name="request">
+		<fieldset name="request">
+			<field 
+				name="controller" 
+				type="hidden"
+				default="config.display.config"
+			/>
+		</fieldset>
+	</fields>
+</metadata>
\ No newline at end of file
diff --git a/core/components/com_config/view/config/tmpl/default_metadata.php b/core/components/com_config/view/config/tmpl/default_metadata.php
new file mode 100644
index 00000000..e5c3a3de
--- /dev/null
+++ b/core/components/com_config/view/config/tmpl/default_metadata.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="form-horizontal">
+	<legend><?php echo JText::_('COM_CONFIG_METADATA_SETTINGS'); ?></legend>
+	<?php
+	foreach ($this->form->getFieldset('metadata') as $field) :
+	?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php
+	endforeach;
+	?>
+</fieldset>
diff --git a/core/components/com_config/view/config/tmpl/default_seo.php b/core/components/com_config/view/config/tmpl/default_seo.php
new file mode 100644
index 00000000..f5b7d564
--- /dev/null
+++ b/core/components/com_config/view/config/tmpl/default_seo.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="form-horizontal">
+	<legend><?php echo JText::_('COM_CONFIG_SEO_SETTINGS'); ?></legend>
+	<?php
+	foreach ($this->form->getFieldset('seo') as $field) :
+	?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php
+	endforeach;
+	?>
+</fieldset>
diff --git a/core/components/com_config/view/config/tmpl/default_site.php b/core/components/com_config/view/config/tmpl/default_site.php
new file mode 100644
index 00000000..f25cb706
--- /dev/null
+++ b/core/components/com_config/view/config/tmpl/default_site.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<fieldset class="form-horizontal">
+	<legend><?php echo JText::_('COM_CONFIG_SITE_SETTINGS'); ?></legend>
+	<?php
+	foreach ($this->form->getFieldset('site') as $field) :
+	?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php
+	endforeach;
+	?>
+</fieldset>
diff --git a/core/components/com_config/view/modules/html.php b/core/components/com_config/view/modules/html.php
new file mode 100644
index 00000000..8f6c6e4d
--- /dev/null
+++ b/core/components/com_config/view/modules/html.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a module.
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ * @since       3.2
+ */
+class ConfigViewModulesHtml extends ConfigViewCmsHtml
+{
+	public $item;
+
+	public $form;
+
+	/**
+	 * Display the view
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 */
+	public function render()
+	{
+		$lang = JFactory::getApplication()->getLanguage();
+		$lang->load('', JPATH_ADMINISTRATOR, $lang->getTag());
+		$lang->load('com_modules', JPATH_ADMINISTRATOR, $lang->getTag());
+
+		return parent::render();
+	}
+}
diff --git a/core/components/com_config/view/modules/tmpl/default.php b/core/components/com_config/view/modules/tmpl/default.php
new file mode 100644
index 00000000..87ea1ab0
--- /dev/null
+++ b/core/components/com_config/view/modules/tmpl/default.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.combobox');
+JHtml::_('formbehavior.chosen', 'select');
+
+$hasContent = empty($this->item['module']) || $this->item['module'] === 'custom' || $this->item['module'] === 'mod_custom';
+
+// If multi-language site, make language read-only
+if (JLanguageMultilang::isEnabled())
+{
+	$this->form->setFieldAttribute('language', 'readonly', 'true');
+}
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'config.cancel.modules' || document.formvalidator.isValid(document.getElementById('modules-form')))
+		{
+			Joomla.submitform(task, document.getElementById('modules-form'));
+		}
+	}
+");
+?>
+
+<form
+	action="<?php echo JRoute::_('index.php?option=com_config'); ?>"
+	method="post" name="adminForm" id="modules-form"
+	class="form-validate">
+
+	<div class="row-fluid">
+
+		<!-- Begin Content -->
+		<div class="span12">
+
+			<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+				<div class="btn-group">
+					<button type="button" class="btn btn-primary"
+						onclick="Joomla.submitbutton('config.save.modules.apply')">
+						<span class="icon-apply" aria-hidden="true"></span>
+						<?php echo JText::_('JAPPLY'); ?>
+					</button>
+				</div>
+				<div class="btn-group">
+					<button type="button" class="btn"
+						onclick="Joomla.submitbutton('config.save.modules.save')">
+						<span class="icon-save" aria-hidden="true"></span>
+						<?php echo JText::_('JSAVE'); ?>
+					</button>
+				</div>
+				<div class="btn-group">
+					<button type="button" class="btn"
+						onclick="Joomla.submitbutton('config.cancel.modules')">
+						<span class="icon-cancel" aria-hidden="true"></span>
+						<?php echo JText::_('JCANCEL'); ?>
+					</button>
+				</div>
+			</div>
+
+			<hr class="hr-condensed" />
+
+			<legend><?php echo JText::_('COM_CONFIG_MODULES_SETTINGS_TITLE'); ?></legend>
+
+			<div>
+				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_NAME'); ?>
+				<span class="label label-default"><?php echo $this->item['title']; ?></span>
+				&nbsp;&nbsp;
+				<?php echo JText::_('COM_CONFIG_MODULES_MODULE_TYPE'); ?>
+				<span class="label label-default"><?php echo $this->item['module']; ?></span>
+			</div>
+			<hr />
+
+			<div class="row-fluid">
+				<div class="span12">
+					<fieldset class="form-horizontal">
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('title'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('title'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('showtitle'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('showtitle'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('position'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->loadTemplate('positions'); ?>
+							</div>
+						</div>
+
+						<hr />
+
+						<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('published'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('published'); ?>
+							</div>
+						</div>
+						<?php endif ?>
+
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('publish_up'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('publish_up'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('publish_down'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('publish_down'); ?>
+							</div>
+						</div>
+
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('access'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('access'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('ordering'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('ordering'); ?>
+							</div>
+						</div>
+
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('language'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('language'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('note'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('note'); ?>
+							</div>
+						</div>
+
+						<hr />
+
+						<div id="options">
+							<?php echo $this->loadTemplate('options'); ?>
+						</div>
+
+						<?php if ($hasContent) : ?>
+							<div class="tab-pane" id="custom">
+								<?php echo $this->form->getInput('content'); ?>
+							</div>
+						<?php endif; ?>
+					</fieldset>
+				</div>
+
+				<input type="hidden" name="id" value="<?php echo $this->item['id']; ?>" />
+				<input type="hidden" name="return" value="<?php echo JFactory::getApplication()->input->get('return', null, 'base64'); ?>" />
+				<input type="hidden" name="task" value="" />
+				<?php echo JHtml::_('form.token'); ?>
+
+			</div>
+
+		</div>
+		<!-- End Content -->
+	</div>
+
+</form>
diff --git a/core/components/com_config/view/modules/tmpl/default_options.php b/core/components/com_config/view/modules/tmpl/default_options.php
new file mode 100644
index 00000000..49be55d6
--- /dev/null
+++ b/core/components/com_config/view/modules/tmpl/default_options.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$fieldSets = $this->form->getFieldsets('params');
+
+echo JHtml::_('bootstrap.startAccordion', 'collapseTypes');
+$i = 0;
+
+foreach ($fieldSets as $name => $fieldSet) :
+
+$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MODULES_' . $name . '_FIELDSET_LABEL';
+$class = isset($fieldSet->class) && !empty($fieldSet->class) ? $fieldSet->class : '';
+
+
+if (isset($fieldSet->description) && trim($fieldSet->description)) :
+echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+endif;
+?>
+<?php echo JHtml::_('bootstrap.addSlide', 'collapseTypes', JText::_($label), 'collapse' . ($i++)); ?>
+
+<ul class="nav nav-tabs nav-stacked">
+<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+
+	<li>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $field->label; ?>
+			</div>
+			<div class="controls">
+				<?php
+				// If multi-language site, make menu-type selection read-only
+				if (JLanguageMultilang::isEnabled() && $this->item['module'] === 'mod_menu' && $field->getAttribute('name') === 'menutype')
+				{
+					$field->__set('readonly', true);
+				}
+				echo $field->input;
+				?>
+			</div>
+		</div>
+	</li>
+
+<?php endforeach; ?>
+</ul>
+
+<?php echo JHtml::_('bootstrap.endSlide'); ?>
+<?php endforeach; ?>
+<?php echo JHtml::_('bootstrap.endAccordion'); ?>
diff --git a/core/components/com_config/view/modules/tmpl/default_positions.php b/core/components/com_config/view/modules/tmpl/default_positions.php
new file mode 100644
index 00000000..ebf57c5a
--- /dev/null
+++ b/core/components/com_config/view/modules/tmpl/default_positions.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$positions = $this->model->getPositions();
+
+// Add custom position to options
+$customGroupText = JText::_('COM_MODULES_CUSTOM_POSITION');
+
+// Build field
+$attr = array(
+	'id'          => 'jform_position',
+	'list.select' => $this->item['position'],
+	'list.attr'   => 'class="chzn-custom-value" '
+		. 'data-custom_group_text="' . $customGroupText . '" '
+		. 'data-no_results_text="' . JText::_('COM_MODULES_ADD_CUSTOM_POSITION') . '" '
+		. 'data-placeholder="' . JText::_('COM_MODULES_TYPE_OR_SELECT_POSITION') . '" '
+);
+
+echo JHtml::_('select.groupedlist', $positions, 'jform[position]', $attr);
diff --git a/core/components/com_config/view/templates/html.php b/core/components/com_config/view/templates/html.php
new file mode 100644
index 00000000..644986e4
--- /dev/null
+++ b/core/components/com_config/view/templates/html.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to edit a template style.
+ *
+ * @since  3.2
+ */
+class ConfigViewTemplatesHtml extends ConfigViewCmsHtml
+{
+	public $item;
+
+	public $form;
+
+	/**
+	 * Method to render the view.
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   3.2
+	 */
+	public function render()
+	{
+		$user = JFactory::getUser();
+		$this->userIsSuperAdmin = $user->authorise('core.admin');
+
+		return parent::render();
+	}
+}
diff --git a/core/components/com_config/view/templates/tmpl/default.php b/core/components/com_config/view/templates/tmpl/default.php
new file mode 100644
index 00000000..2a5f4675
--- /dev/null
+++ b/core/components/com_config/view/templates/tmpl/default.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.formvalidator');
+JHtml::_('behavior.keepalive');
+$user = JFactory::getUser();
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('templates-form')))
+		{
+			Joomla.submitform(task, document.getElementById('templates-form'));
+		}
+	}
+");
+?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">
+
+	<div class="row-fluid">
+		<!-- Begin Content -->
+
+		<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+			<div class="btn-group">
+				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('config.save.templates.apply')">
+					<span class="icon-ok"></span> <?php echo JText::_('JSAVE') ?>
+				</button>
+			</div>
+			<div class="btn-group">
+				<button type="button" class="btn" onclick="Joomla.submitbutton('config.cancel')">
+					<span class="icon-cancel"></span> <?php echo JText::_('JCANCEL') ?>
+				</button>
+			</div>
+		</div>
+
+		<hr class="hr-condensed" />
+
+		<div id="page-site" class="tab-pane active">
+			<div class="row-fluid">
+				<?php // Get the menu parameters that are automatically set but may be modified.
+				echo $this->loadTemplate('options'); ?>
+			</div>
+		</div>
+
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+
+		<!-- End Content -->
+	</div>
+
+</form>
diff --git a/core/components/com_config/view/templates/tmpl/default.xml b/core/components/com_config/view/templates/tmpl/default.xml
new file mode 100644
index 00000000..7409a844
--- /dev/null
+++ b/core/components/com_config/view/templates/tmpl/default.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONFIG_TEMPLATES_VIEW_DEFAULT_TITLE" option="COM_CONFIG_TEMPLATES_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_DISPLAY_TEMPLATE_OPTIONS"
+		/>
+		<message>
+			<![CDATA[COM_CONFIG_TEMPLATES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fields name="request">
+		<fieldset name="request" >
+			<field 
+				name="controller" 
+				type="hidden"
+				default="config.display.templates"
+			/>
+		</fieldset>
+	</fields>
+</metadata>
\ No newline at end of file
diff --git a/core/components/com_config/view/templates/tmpl/default_options.php b/core/components/com_config/view/templates/tmpl/default_options.php
new file mode 100644
index 00000000..9314e3c8
--- /dev/null
+++ b/core/components/com_config/view/templates/tmpl/default_options.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_config
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load chosen.css
+JHtml::_('formbehavior.chosen', 'select');
+
+?>
+<?php
+
+	$fieldSets = $this->form->getFieldsets('params');
+?>
+
+<legend><?php echo JText::_('COM_CONFIG_TEMPLATE_SETTINGS'); ?></legend>
+
+<?php
+
+	// Search for com_config field set
+	if (!empty($fieldSets['com_config'])) : ?>
+
+	<fieldset class="form-horizontal">
+		<?php echo $this->form->renderFieldset('com_config'); ?>
+	</fieldset>
+
+<?php else :
+
+	// Fall-back to display all in params
+	foreach ($fieldSets as $name => $fieldSet) :
+	$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CONFIG_' . $name . '_FIELDSET_LABEL';
+
+	if (isset($fieldSet->description) && trim($fieldSet->description)) :
+		echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	endif;
+	?>
+
+<fieldset class="form-horizontal">
+	<?php echo $this->form->renderFieldset($name); ?>
+</fieldset>
+	<?php endforeach;
+	endif;
diff --git a/core/components/com_contact/contact.php b/core/components/com_contact/contact.php
new file mode 100644
index 00000000..6e5cc714
--- /dev/null
+++ b/core/components/com_contact/contact.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContactHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
+
+$input = JFactory::getApplication()->input;
+
+if ($input->get('view') === 'contacts' && $input->get('layout') === 'modal')
+{
+	if (!JFactory::getUser()->authorise('core.create', 'com_contact'))
+	{
+		JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+
+		return;
+	}
+
+	JFactory::getLanguage()->load('com_contact', JPATH_ADMINISTRATOR);
+}
+
+$controller = JControllerLegacy::getInstance('Contact');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_contact/controller.php b/core/components/com_contact/controller.php
new file mode 100644
index 00000000..47d90af9
--- /dev/null
+++ b/core/components/com_contact/controller.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contact Component Controller
+ *
+ * @since  1.5
+ */
+class ContactController extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *                          Recognized key values include 'name', 'default_task', 'model_path', and
+	 *                          'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		$this->input = JFactory::getApplication()->input;
+
+		// Contact frontpage Editor contacts proxying:
+		if ($this->input->get('view') === 'contacts' && $this->input->get('layout') === 'modal')
+		{
+			JHtml::_('stylesheet', 'system/adminlist.css', array(), true);
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		if (JFactory::getApplication()->getUserState('com_contact.contact.data') === null)
+		{
+			$cachable = true;
+		}
+
+		// Set the default view name and format from the Request.
+		$vName = $this->input->get('view', 'categories');
+		$this->input->set('view', $vName);
+
+		$safeurlparams = array('catid' => 'INT', 'id' => 'INT', 'cid' => 'ARRAY', 'year' => 'INT', 'month' => 'INT',
+			'limit' => 'UINT', 'limitstart' => 'UINT', 'showall' => 'INT', 'return' => 'BASE64', 'filter' => 'STRING',
+			'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'filter-search' => 'STRING', 'print' => 'BOOLEAN',
+			'lang' => 'CMD');
+
+		parent::display($cachable, $safeurlparams);
+
+		return $this;
+	}
+}
diff --git a/core/components/com_contact/controllers/contact.php b/core/components/com_contact/controllers/contact.php
new file mode 100644
index 00000000..00943099
--- /dev/null
+++ b/core/components/com_contact/controllers/contact.php
@@ -0,0 +1,242 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Controller for single contact view
+ *
+ * @since  1.5.19
+ */
+class ContactControllerContact extends JControllerForm
+{
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6.4
+	 */
+	public function getModel($name = '', $prefix = '', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, array('ignore_request' => false));
+	}
+
+	/**
+	 * Method to submit the contact form and send an email.
+	 *
+	 * @return  boolean  True on success sending the email. False on failure.
+	 *
+	 * @since   1.5.19
+	 */
+	public function submit()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$app    = JFactory::getApplication();
+		$model  = $this->getModel('contact');
+		$params = JComponentHelper::getParams('com_contact');
+		$stub   = $this->input->getString('id');
+		$id     = (int) $stub;
+
+		// Get the data from POST
+		$data    = $this->input->post->get('jform', array(), 'array');
+		$contact = $model->getItem($id);
+
+		$params->merge($contact->params);
+
+		// Check for a valid session cookie
+		if ($params->get('validate_session', 0))
+		{
+			if (JFactory::getSession()->getState() !== 'active')
+			{
+				JError::raiseWarning(403, JText::_('JLIB_ENVIRONMENT_SESSION_INVALID'));
+
+				// Save the data in the session.
+				$app->setUserState('com_contact.contact.data', $data);
+
+				// Redirect back to the contact form.
+				$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contact&id=' . $stub, false));
+
+				return false;
+			}
+		}
+
+		// Contact plugins
+		JPluginHelper::importPlugin('contact');
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		if (!$model->validate($form, $data))
+		{
+			$errors = $model->getErrors();
+
+			foreach ($errors as $error)
+			{
+				$errorMessage = $error;
+
+				if ($error instanceof Exception)
+				{
+					$errorMessage = $error->getMessage();
+				}
+
+				$app->enqueueMessage($errorMessage, 'error');
+			}
+
+			$app->setUserState('com_contact.contact.data', $data);
+
+			$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contact&id=' . $stub, false));
+
+			return false;
+		}
+
+		// Validation succeeded, continue with custom handlers
+		$results = $dispatcher->trigger('onValidateContact', array(&$contact, &$data));
+
+		foreach ($results as $result)
+		{
+			if ($result instanceof Exception)
+			{
+				return false;
+			}
+		}
+
+		// Passed Validation: Process the contact plugins to integrate with other applications
+		$dispatcher->trigger('onSubmitContact', array(&$contact, &$data));
+
+		// Send the email
+		$sent = false;
+
+		if (!$params->get('custom_reply'))
+		{
+			$sent = $this->_sendEmail($data, $contact, $params->get('show_email_copy', 0));
+		}
+
+		// Set the success message if it was a success
+		if (!($sent instanceof Exception))
+		{
+			$msg = JText::_('COM_CONTACT_EMAIL_THANKS');
+		}
+		else
+		{
+			$msg = '';
+		}
+
+		// Flush the data from the session
+		$app->setUserState('com_contact.contact.data', null);
+
+		// Redirect if it is set in the parameters, otherwise redirect back to where we came from
+		if ($contact->params->get('redirect'))
+		{
+			$this->setRedirect($contact->params->get('redirect'), $msg);
+		}
+		else
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_contact&view=contact&id=' . $stub, false), $msg);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   array     $data                  The data to send in the email.
+	 * @param   stdClass  $contact               The user information to send the email to
+	 * @param   boolean   $copy_email_activated  True to send a copy of the email to the user.
+	 *
+	 * @return  boolean  True on success sending the email, false on failure.
+	 *
+	 * @since   1.6.4
+	 */
+	private function _sendEmail($data, $contact, $copy_email_activated)
+	{
+		$app = JFactory::getApplication();
+
+		if ($contact->email_to == '' && $contact->user_id != 0)
+		{
+			$contact_user      = JUser::getInstance($contact->user_id);
+			$contact->email_to = $contact_user->get('email');
+		}
+
+		$mailfrom = $app->get('mailfrom');
+		$fromname = $app->get('fromname');
+		$sitename = $app->get('sitename');
+
+		$name    = $data['contact_name'];
+		$email   = JStringPunycode::emailToPunycode($data['contact_email']);
+		$subject = $data['contact_subject'];
+		$body    = $data['contact_message'];
+
+		// Prepare email body
+		$prefix = JText::sprintf('COM_CONTACT_ENQUIRY_TEXT', JUri::base());
+		$body   = $prefix . "\n" . $name . ' <' . $email . '>' . "\r\n\r\n" . stripslashes($body);
+
+		// Load the custom fields
+		if (!empty($data['com_fields']) && $fields = FieldsHelper::getFields('com_contact.mail', $contact, true, $data['com_fields']))
+		{
+			$output = FieldsHelper::render(
+				'com_contact.mail',
+				'fields.render',
+				array(
+					'context' => 'com_contact.mail',
+					'item'    => $contact,
+					'fields'  => $fields,
+				)
+			);
+
+			if ($output)
+			{
+				$body .= "\r\n\r\n" . $output;
+			}
+		}
+
+		$mail = JFactory::getMailer();
+		$mail->addRecipient($contact->email_to);
+		$mail->addReplyTo($email, $name);
+		$mail->setSender(array($mailfrom, $fromname));
+		$mail->setSubject($sitename . ': ' . $subject);
+		$mail->setBody($body);
+		$sent = $mail->Send();
+
+		// If we are supposed to copy the sender, do so.
+
+		// Check whether email copy function activated
+		if ($copy_email_activated == true && !empty($data['contact_email_copy']))
+		{
+			$copytext    = JText::sprintf('COM_CONTACT_COPYTEXT_OF', $contact->name, $sitename);
+			$copytext    .= "\r\n\r\n" . $body;
+			$copysubject = JText::sprintf('COM_CONTACT_COPYSUBJECT_OF', $subject);
+
+			$mail = JFactory::getMailer();
+			$mail->addRecipient($email);
+			$mail->addReplyTo($email, $name);
+			$mail->setSender(array($mailfrom, $fromname));
+			$mail->setSubject($copysubject);
+			$mail->setBody($copytext);
+			$sent = $mail->Send();
+		}
+
+		return $sent;
+	}
+}
diff --git a/core/components/com_contact/helpers/association.php b/core/components/com_contact/helpers/association.php
new file mode 100644
index 00000000..91ed9d05
--- /dev/null
+++ b/core/components/com_contact/helpers/association.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContactHelper', JPATH_ADMINISTRATOR . '/components/com_contact/helpers/contact.php');
+JLoader::register('ContactHelperRoute', JPATH_SITE . '/components/com_contact/helpers/route.php');
+JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php');
+
+/**
+ * Contact Component Association Helper
+ *
+ * @since  3.0
+ */
+abstract class ContactHelperAssociation extends CategoryHelperAssociation
+{
+	/**
+	 * Method to get the associations for a given item
+	 *
+	 * @param   integer  $id    Id of the item
+	 * @param   string   $view  Name of the view
+	 *
+	 * @return  array   Array of associations for the item
+	 *
+	 * @since  3.0
+	 */
+	public static function getAssociations($id = 0, $view = null)
+	{
+		$jinput = JFactory::getApplication()->input;
+		$view   = $view === null ? $jinput->get('view') : $view;
+		$id     = empty($id) ? $jinput->getInt('id') : $id;
+
+		if ($view === 'contact')
+		{
+			if ($id)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_contact', '#__contact_details', 'com_contact.item', $id);
+
+				$return = array();
+
+				foreach ($associations as $tag => $item)
+				{
+					$return[$tag] = ContactHelperRoute::getContactRoute($item->id, (int) $item->catid, $item->language);
+				}
+
+				return $return;
+			}
+		}
+
+		if ($view === 'category' || $view === 'categories')
+		{
+			return self::getCategoryAssociations($id, 'com_contact');
+		}
+
+		return array();
+
+	}
+}
diff --git a/core/components/com_contact/helpers/category.php b/core/components/com_contact/helpers/category.php
new file mode 100644
index 00000000..cfc2dccc
--- /dev/null
+++ b/core/components/com_contact/helpers/category.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contact Component Category Tree
+ *
+ * @since  1.6
+ */
+class ContactCategories extends JCategories
+{
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__contact_details';
+		$options['extension'] = 'com_contact';
+		$options['statefield'] = 'published';
+		parent::__construct($options);
+	}
+}
diff --git a/core/components/com_contact/helpers/legacyrouter.php b/core/components/com_contact/helpers/legacyrouter.php
new file mode 100644
index 00000000..46bb1651
--- /dev/null
+++ b/core/components/com_contact/helpers/legacyrouter.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Legacy routing rules class from com_contact
+ *
+ * @since       3.6
+ * @deprecated  4.0
+ */
+class ContactRouterRulesLegacy implements JComponentRouterRulesInterface
+{
+	/**
+	 * Constructor for this legacy router
+	 *
+	 * @param   JComponentRouterAdvanced  $router  The router this rule belongs to
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function __construct($router)
+	{
+		$this->router = $router;
+	}
+
+	/**
+	 * Preprocess the route for the com_contact component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function preprocess(&$query)
+	{
+	}
+
+	/**
+	 * Build the route for the com_contact component
+	 *
+	 * @param   array  &$query     An array of URL arguments
+	 * @param   array  &$segments  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function build(&$query, &$segments)
+	{
+		// Get a menu item based on Itemid or currently active
+		$params = JComponentHelper::getParams('com_contact');
+		$advanced = $params->get('sef_advanced_link', 0);
+
+		if (empty($query['Itemid']))
+		{
+			$menuItem = $this->router->menu->getActive();
+		}
+		else
+		{
+			$menuItem = $this->router->menu->getItem($query['Itemid']);
+		}
+
+		$mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+		$mId = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
+
+		if (isset($query['view']))
+		{
+			$view = $query['view'];
+
+			if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component != 'com_contact')
+			{
+				$segments[] = $query['view'];
+			}
+
+			unset($query['view']);
+		}
+
+		// Are we dealing with a contact that is attached to a menu item?
+		if (isset($view) && ($mView == $view) && isset($query['id']) && ($mId == (int) $query['id']))
+		{
+			unset($query['view'], $query['catid'], $query['id']);
+
+			return;
+		}
+
+		if (isset($view) && ($view == 'category' || $view == 'contact'))
+		{
+			if ($mId != (int) $query['id'] || $mView != $view)
+			{
+				if ($view == 'contact' && isset($query['catid']))
+				{
+					$catid = $query['catid'];
+				}
+				elseif (isset($query['id']))
+				{
+					$catid = $query['id'];
+				}
+
+				$menuCatid = $mId;
+				$categories = JCategories::getInstance('Contact');
+				$category = $categories->get($catid);
+
+				if ($category)
+				{
+					// TODO Throw error that the category either not exists or is unpublished
+					$path = array_reverse($category->getPath());
+
+					$array = array();
+
+					foreach ($path as $id)
+					{
+						if ((int) $id == (int) $menuCatid)
+						{
+							break;
+						}
+
+						if ($advanced)
+						{
+							list($tmp, $id) = explode(':', $id, 2);
+						}
+
+						$array[] = $id;
+					}
+
+					$segments = array_merge($segments, array_reverse($array));
+				}
+
+				if ($view == 'contact')
+				{
+					if ($advanced)
+					{
+						list($tmp, $id) = explode(':', $query['id'], 2);
+					}
+					else
+					{
+						$id = $query['id'];
+					}
+
+					$segments[] = $id;
+				}
+			}
+
+			unset($query['id'], $query['catid']);
+		}
+
+		if (isset($query['layout']))
+		{
+			if (!empty($query['Itemid']) && isset($menuItem->query['layout']))
+			{
+				if ($query['layout'] == $menuItem->query['layout'])
+				{
+					unset($query['layout']);
+				}
+			}
+			else
+			{
+				if ($query['layout'] == 'default')
+				{
+					unset($query['layout']);
+				}
+			}
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 * @param   array  &$vars      The URL attributes to be used by the application.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function parse(&$segments, &$vars)
+	{
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// Get the active menu item.
+		$item = $this->router->menu->getActive();
+		$params = JComponentHelper::getParams('com_contact');
+		$advanced = $params->get('sef_advanced_link', 0);
+
+		// Count route segments
+		$count = count($segments);
+
+		// Standard routing for newsfeeds.
+		if (!isset($item))
+		{
+			$vars['view'] = $segments[0];
+			$vars['id'] = $segments[$count - 1];
+
+			return;
+		}
+
+		// From the categories view, we can only jump to a category.
+		$id = (isset($item->query['id']) && $item->query['id'] > 1) ? $item->query['id'] : 'root';
+
+		$contactCategory = JCategories::getInstance('Contact')->get($id);
+
+		$categories = $contactCategory ? $contactCategory->getChildren() : array();
+		$vars['catid'] = $id;
+		$vars['id'] = $id;
+		$found = 0;
+
+		foreach ($segments as $segment)
+		{
+			$segment = $advanced ? str_replace(':', '-', $segment) : $segment;
+
+			foreach ($categories as $category)
+			{
+				if ($category->slug == $segment || $category->alias == $segment)
+				{
+					$vars['id'] = $category->id;
+					$vars['catid'] = $category->id;
+					$vars['view'] = 'category';
+					$categories = $category->getChildren();
+					$found = 1;
+					break;
+				}
+			}
+
+			if ($found == 0)
+			{
+				if ($advanced)
+				{
+					$db = JFactory::getDbo();
+					$query = $db->getQuery(true)
+						->select($db->quoteName('id'))
+						->from('#__contact_details')
+						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
+						->where($db->quoteName('alias') . ' = ' . $db->quote($segment));
+					$db->setQuery($query);
+					$nid = $db->loadResult();
+				}
+				else
+				{
+					$nid = $segment;
+				}
+
+				$vars['id'] = $nid;
+				$vars['view'] = 'contact';
+			}
+
+			$found = 0;
+		}
+	}
+}
diff --git a/core/components/com_contact/helpers/route.php b/core/components/com_contact/helpers/route.php
new file mode 100644
index 00000000..adca8f7d
--- /dev/null
+++ b/core/components/com_contact/helpers/route.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contact Component Route Helper
+ *
+ * @static
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ * @since       1.5
+ */
+abstract class ContactHelperRoute
+{
+	/**
+	 * Get the URL route for a contact from a contact ID, contact category ID and language
+	 *
+	 * @param   integer  $id        The id of the contact
+	 * @param   integer  $catid     The id of the contact's category
+	 * @param   mixed    $language  The id of the language being used.
+	 *
+	 * @return  string  The link to the contact
+	 *
+	 * @since   1.5
+	 */
+	public static function getContactRoute($id, $catid, $language = 0)
+	{
+		// Create the link
+		$link = 'index.php?option=com_contact&view=contact&id=' . $id;
+
+		if ($catid > 1)
+		{
+			$link .= '&catid=' . $catid;
+		}
+
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
+		{
+			$link .= '&lang=' . $language;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Get the URL route for a contact category from a contact category ID and language
+	 *
+	 * @param   mixed  $catid     The id of the contact's category either an integer id or an instance of JCategoryNode
+	 * @param   mixed  $language  The id of the language being used.
+	 *
+	 * @return  string  The link to the contact
+	 *
+	 * @since   1.5
+	 */
+	public static function getCategoryRoute($catid, $language = 0)
+	{
+		if ($catid instanceof JCategoryNode)
+		{
+			$id = $catid->id;
+		}
+		else
+		{
+			$id       = (int) $catid;
+		}
+
+		if ($id < 1)
+		{
+			$link = '';
+		}
+		else
+		{
+			// Create the link
+			$link = 'index.php?option=com_contact&view=category&id=' . $id;
+
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
+			{
+				$link .= '&lang=' . $language;
+			}
+		}
+
+		return $link;
+	}
+}
diff --git a/core/components/com_contact/layouts/field/render.php b/core/components/com_contact/layouts/field/render.php
new file mode 100644
index 00000000..65baec53
--- /dev/null
+++ b/core/components/com_contact/layouts/field/render.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+if (!key_exists('field', $displayData))
+{
+	return;
+}
+
+$field     = $displayData['field'];
+$label     = JText::_($field->label);
+$value     = $field->value;
+$class     = $field->params->get('render_class');
+$showLabel = $field->params->get('showlabel');
+
+if ($field->context == 'com_contact.mail')
+{
+	// Prepare the value for the contact form mail
+	$value = html_entity_decode($value);
+
+	echo ($showLabel ? $label . ': ' : '') . $value . "\r\n";
+	return;
+}
+
+if (!strlen($value))
+{
+	return;
+}
+
+?>
+<dt class="contact-field-entry <?php echo $class; ?>">
+	<?php if ($showLabel == 1) : ?>
+		<span class="field-label"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
+	<?php endif; ?>
+</dt>
+<dd class="contact-field-entry <?php echo $class; ?>">
+	<span class="field-value"><?php echo $value; ?></span>
+</dd>
diff --git a/core/components/com_contact/layouts/fields/render.php b/core/components/com_contact/layouts/fields/render.php
new file mode 100644
index 00000000..20255030
--- /dev/null
+++ b/core/components/com_contact/layouts/fields/render.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Check if we have all the data
+if (!key_exists('item', $displayData) || !key_exists('context', $displayData))
+{
+	return;
+}
+
+// Setting up for display
+$item = $displayData['item'];
+
+if (!$item)
+{
+	return;
+}
+
+$context = $displayData['context'];
+
+if (!$context)
+{
+	return;
+}
+
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+$parts     = explode('.', $context);
+$component = $parts[0];
+$fields    = null;
+
+if (key_exists('fields', $displayData))
+{
+	$fields = $displayData['fields'];
+}
+else
+{
+	$fields = $item->jcfields ?: FieldsHelper::getFields($context, $item, true);
+}
+
+if (!$fields)
+{
+	return;
+}
+
+// Check if we have mail context in first element
+$isMail = (reset($fields)->context == 'com_contact.mail');
+
+if (!$isMail)
+{
+	// Print the container tag
+	echo '<dl class="fields-container contact-fields dl-horizontal">';
+}
+
+// Loop through the fields and print them
+foreach ($fields as $field)
+{
+	// If the value is empty do nothing
+	if (!strlen($field->value) && !$isMail)
+	{
+		continue;
+	}
+
+	echo FieldsHelper::render($context, 'field.render', array('field' => $field));
+}
+
+if (!$isMail)
+{
+	// Close the container
+	echo '</dl>';
+}
+
diff --git a/core/components/com_contact/layouts/joomla/form/renderfield.php b/core/components/com_contact/layouts/joomla/form/renderfield.php
new file mode 100644
index 00000000..3b31c40b
--- /dev/null
+++ b/core/components/com_contact/layouts/joomla/form/renderfield.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ---------------------
+ * 	$options         : (array)  Optional parameters
+ * 	$label           : (string) The html code for the label (not required if $options['hiddenLabel'] is true)
+ * 	$input           : (string) The input field html code
+ */
+
+if (!empty($options['showonEnabled']))
+{
+	JHtml::_('jquery.framework');
+	JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true));
+}
+
+$class = empty($options['class']) ? '' : ' ' . $options['class'];
+$rel   = empty($options['rel']) ? '' : ' ' . $options['rel'];
+
+/**
+ * @TODO:
+ *
+ * As mentioned in #8473 (https://github.com/joomla/joomla-cms/pull/8473), ...
+ * as long as we cannot access the field properties properly, this seems to
+ * be the way to go for now.
+ *
+ * On a side note: Parsing html is seldom a good idea.
+ * https://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
+ */
+preg_match('/class=\"([^\"]+)\"/i', $input, $match);
+
+$required      = (strpos($input, 'aria-required="true"') !== false || (!empty($match[1]) && strpos($match[1], 'required') !== false));
+$typeOfSpacer  = (strpos($label, 'spacer-lbl') !== false);
+
+?>
+<div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
+	<?php if (empty($options['hiddenLabel'])) : ?>
+		<div class="control-label">
+			<?php echo $label; ?>
+			<?php if (!$required && !$typeOfSpacer) : ?>
+				<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL'); ?></span>
+			<?php endif; ?>
+		</div>
+	<?php endif; ?>
+	<div class="controls"><?php echo $input; ?></div>
+</div>
diff --git a/core/components/com_contact/models/categories.php b/core/components/com_contact/models/categories.php
new file mode 100644
index 00000000..fac76e91
--- /dev/null
+++ b/core/components/com_contact/models/categories.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * This models supports retrieving lists of contact categories.
+ *
+ * @since  1.6
+ */
+class ContactModelCategories extends JModelList
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_contact.categories';
+
+	/**
+	 * The category context (allows other extensions to derived from this model).
+	 *
+	 * @var		string
+	 */
+	protected $_extension = 'com_contact';
+
+	private $_parent = null;
+
+	private $_items = null;
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$this->setState('filter.extension', $this->_extension);
+
+		// Get the parent id if defined.
+		$parentId = $app->input->getInt('id');
+		$this->setState('filter.parentId', $parentId);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('filter.published',	1);
+		$this->setState('filter.access',	true);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id	.= ':' . $this->getState('filter.extension');
+		$id	.= ':' . $this->getState('filter.published');
+		$id	.= ':' . $this->getState('filter.access');
+		$id	.= ':' . $this->getState('filter.parentId');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Redefine the function an add some properties to make the styling more easy
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 */
+	public function getItems()
+	{
+		if ($this->_items === null)
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_items_cat', 1) || !$params->get('show_empty_categories_cat', 0);
+			$categories = JCategories::getInstance('Contact', $options);
+			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
+			if (is_object($this->_parent))
+			{
+				$this->_items = $this->_parent->getChildren();
+			}
+			else
+			{
+				$this->_items = false;
+			}
+		}
+
+		return $this->_items;
+	}
+
+	/**
+	 * Gets the id of the parent category for the selected list of categories
+	 *
+	 * @return   integer  The id of the parent category
+	 *
+	 * @since    1.6.0
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_parent))
+		{
+			$this->getItems();
+		}
+
+		return $this->_parent;
+	}
+}
diff --git a/core/components/com_contact/models/category.php b/core/components/com_contact/models/category.php
new file mode 100644
index 00000000..0082ffda
--- /dev/null
+++ b/core/components/com_contact/models/category.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Single item model for a contact
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ * @since       1.5
+ */
+class ContactModelCategory extends JModelList
+{
+	/**
+	 * Category items data
+	 *
+	 * @var array
+	 */
+	protected $_item = null;
+
+	protected $_articles = null;
+
+	protected $_siblings = null;
+
+	protected $_children = null;
+
+	protected $_parent = null;
+
+	/**
+	 * The category that applies.
+	 *
+	 * @access    protected
+	 * @var        object
+	 */
+	protected $_category = null;
+
+	/**
+	 * The list of other contact categories.
+	 *
+	 * @access    protected
+	 * @var       array
+	 */
+	protected $_categories = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'con_position', 'a.con_position',
+				'suburb', 'a.suburb',
+				'state', 'a.state',
+				'country', 'a.country',
+				'ordering', 'a.ordering',
+				'sortname',
+				'sortname1', 'a.sortname1',
+				'sortname2', 'a.sortname2',
+				'sortname3', 'a.sortname3'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get a list of items.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		// Invoke the parent getItems method to get the main list
+		$items = parent::getItems();
+
+		// Convert the params field into an object, saving original in _params
+		for ($i = 0, $n = count($items); $i < $n; $i++)
+		{
+			$item = &$items[$i];
+
+			if (!isset($this->_params))
+			{
+				$item->params = new Registry($item->params);
+			}
+
+			// Some contexts may not use tags data at all, so we allow callers to disable loading tag data
+			if ($this->getState('load_tags', true))
+			{
+				$this->tags = new JHelperTags;
+				$this->tags->getItemTags('com_contact.contact', $item->id);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return  string    An SQL query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$user = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select required fields from the categories.
+		// Changes for sqlsrv
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('a.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $a_id . ' END as slug';
+
+		$case_when1 = ' CASE WHEN ';
+		$case_when1 .= $query->charLength('c.alias', '!=', '0');
+		$case_when1 .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when1 .= ' ELSE ';
+		$case_when1 .= $c_id . ' END as catslug';
+		$query->select($this->getState('list.select', 'a.*') . ',' . $case_when . ',' . $case_when1)
+		/**
+		 * TODO: we actually should be doing it but it's wrong this way
+		 *	. ' CASE WHEN CHAR_LENGTH(a.alias) THEN CONCAT_WS(\':\', a.id, a.alias) ELSE a.id END as slug, '
+		 *	. ' CASE WHEN CHAR_LENGTH(c.alias) THEN CONCAT_WS(\':\', c.id, c.alias) ELSE c.id END AS catslug ');
+		 */
+			->from($db->quoteName('#__contact_details') . ' AS a')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid')
+			->where('a.access IN (' . $groups . ')');
+
+		// Filter by category.
+		if ($categoryId = $this->getState('category.id'))
+		{
+			$query->where('a.catid = ' . (int) $categoryId)
+				->where('c.access IN (' . $groups . ')');
+		}
+
+		// Join over the users for the author and modified_by names.
+		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
+			->select('ua.email AS author_email')
+
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
+			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
+
+		// Filter by state
+		$state = $this->getState('filter.published');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.published = ' . (int) $state);
+		}
+		else
+		{
+			$query->where('(a.published IN (0,1,2))');
+		}
+
+		// Filter by start and end dates.
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate = $db->quote(JFactory::getDate()->toSql());
+
+		if ($this->getState('filter.publish_date'))
+		{
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('list.filter');
+
+		if (!empty($search))
+		{
+			$search = $db->quote('%' . $db->escape($search, true) . '%');
+			$query->where('(a.name LIKE ' . $search . ')');
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		// Set sortname ordering if selected
+		if ($this->getState('list.ordering') === 'sortname')
+		{
+			$query->order($db->escape('a.sortname1') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
+				->order($db->escape('a.sortname2') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
+				->order($db->escape('a.sortname3') . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+		}
+		else
+		{
+			$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$params = JComponentHelper::getParams('com_contact');
+
+		// List state information
+		$format = $app->input->getWord('format');
+
+		if ($format === 'feed')
+		{
+			$limit = $app->get('feed_limit');
+		}
+		else
+		{
+			$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
+		}
+
+		$this->setState('list.limit', $limit);
+
+		$limitstart = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $limitstart);
+
+		// Optional filter text
+		$itemid = $app->input->get('Itemid', 0, 'int');
+		$search = $app->getUserStateFromRequest('com_contact.category.list.' . $itemid . '.filter-search', 'filter-search', '', 'string');
+		$this->setState('list.filter', $search);
+
+		// Get list ordering default from the parameters
+		$menuParams = new Registry;
+
+		if ($menu = $app->getMenu()->getActive())
+		{
+			$menuParams->loadString($menu->params);
+		}
+
+		$mergedParams = clone $params;
+		$mergedParams->merge($menuParams);
+
+		$orderCol = $app->input->get('filter_order', $mergedParams->get('initial_sort', 'ordering'));
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'ordering';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$id = $app->input->get('id', 0, 'int');
+		$this->setState('category.id', $id);
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_contact')) && (!$user->authorise('core.edit', 'com_contact')))
+		{
+			// Limit to published for people who can't edit or edit.state.
+			$this->setState('filter.published', 1);
+
+			// Filter by start and end dates.
+			$this->setState('filter.publish_date', true);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get category data for the current category
+	 *
+	 * @return  object  The category object
+	 *
+	 * @since   1.5
+	 */
+	public function getCategory()
+	{
+		if (!is_object($this->_item))
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_items', 1) || $params->get('show_empty_categories', 0);
+			$categories = JCategories::getInstance('Contact', $options);
+			$this->_item = $categories->get($this->getState('category.id', 'root'));
+
+			if (is_object($this->_item))
+			{
+				$this->_children = $this->_item->getChildren();
+				$this->_parent = false;
+
+				if ($this->_item->getParent())
+				{
+					$this->_parent = $this->_item->getParent();
+				}
+
+				$this->_rightsibling = $this->_item->getSibling();
+				$this->_leftsibling = $this->_item->getSibling(false);
+			}
+			else
+			{
+				$this->_children = false;
+				$this->_parent = false;
+			}
+		}
+
+		return $this->_item;
+	}
+
+	/**
+	 * Get the parent category.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_parent;
+	}
+
+	/**
+	 * Get the sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getLeftSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_leftsibling;
+	}
+
+	/**
+	 * Get the sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getRightSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_rightsibling;
+	}
+
+	/**
+	 * Get the child categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getChildren()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Increment the hit counter for the category.
+	 *
+	 * @param   integer  $pk  Optional primary key of the category to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 *
+	 * @since   3.2
+	 */
+	public function hit($pk = 0)
+	{
+		$input = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
+
+			$table = JTable::getInstance('Category', 'JTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_contact/models/contact.php b/core/components/com_contact/models/contact.php
new file mode 100644
index 00000000..ef833642
--- /dev/null
+++ b/core/components/com_contact/models/contact.php
@@ -0,0 +1,634 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Single item model for a contact
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ * @since       1.5
+ */
+class ContactModelContact extends JModelForm
+{
+	/**
+	 * The name of the view for a single item
+	 *
+	 * @since   1.6
+	 */
+	protected $view_item = 'contact';
+
+	/**
+	 * A loaded item
+	 *
+	 * @since   1.6
+	 */
+	protected $_item = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	protected $_context = 'com_contact.contact';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication();
+
+		$this->setState('contact.id', $app->input->getInt('id'));
+		$this->setState('params', $app->getParams());
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_contact')) &&  (!$user->authorise('core.edit', 'com_contact')))
+		{
+			$this->setState('filter.published', 1);
+			$this->setState('filter.archived', 2);
+		}
+	}
+
+	/**
+	 * Method to get the contact form.
+	 * The base form is loaded from XML and then an event is fired
+	 *
+	 * @param   array    $data      An optional array of data for the form to interrogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		$form = $this->loadForm('com_contact.contact', 'contact', array('control' => 'jform', 'load_data' => true));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		$temp = clone $this->getState('params');
+
+		$contact = $this->_item[$this->getState('contact.id')];
+
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if ($active)
+		{
+			// If the current view is the active item and a contact view for this contact, then the menu item params take priority
+			if (strpos($active->link, 'view=contact') && strpos($active->link, '&id=' . (int) $contact->id))
+			{
+				// $contact->params are the contact params, $temp are the menu item params
+				// Merge so that the menu item params take priority
+				$contact->params->merge($temp);
+			}
+			else
+			{
+				// Current view is not a single contact, so the contact params take priority here
+				// Merge the menu item params with the contact params so that the contact params take priority
+				$temp->merge($contact->params);
+				$contact->params = $temp;
+			}
+		}
+		else
+		{
+			// Merge so that contact params take priority
+			$temp->merge($contact->params);
+			$contact->params = $temp;
+		}
+
+		if (!$contact->params->get('show_email_copy', 0))
+		{
+			$form->removeField('contact_email_copy');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array    The default data is an empty array.
+	 *
+	 * @since   1.6.2
+	 */
+	protected function loadFormData()
+	{
+		$data = (array) JFactory::getApplication()->getUserState('com_contact.contact.data', array());
+
+		if (empty($data['language']) && JLanguageMultilang::isEnabled())
+		{
+			$data['language'] = JFactory::getLanguage()->getTag();
+		}
+
+		// Add contact id to contact form data, so fields plugin can work properly
+		if (empty($data['catid']))
+		{
+			$data['catid'] = $this->getItem()->catid;
+		}
+
+		$this->preprocessData('com_contact.contact', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Gets a contact
+	 *
+	 * @param   integer  $pk  Id for the contact
+	 *
+	 * @return  mixed Object or null
+	 *
+	 * @since   1.6.0
+	 */
+	public function &getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('contact.id');
+
+		if ($this->_item === null)
+		{
+			$this->_item = array();
+		}
+
+		if (!isset($this->_item[$pk]))
+		{
+			try
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true);
+
+				// Changes for sqlsrv
+				$case_when = ' CASE WHEN ';
+				$case_when .= $query->charLength('a.alias', '!=', '0');
+				$case_when .= ' THEN ';
+				$a_id = $query->castAsChar('a.id');
+				$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+				$case_when .= ' ELSE ';
+				$case_when .= $a_id . ' END as slug';
+
+				$case_when1 = ' CASE WHEN ';
+				$case_when1 .= $query->charLength('c.alias', '!=', '0');
+				$case_when1 .= ' THEN ';
+				$c_id = $query->castAsChar('c.id');
+				$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+				$case_when1 .= ' ELSE ';
+				$case_when1 .= $c_id . ' END as catslug';
+
+				$query->select($this->getState('item.select', 'a.*') . ',' . $case_when . ',' . $case_when1)
+					->from('#__contact_details AS a')
+
+					// Join on category table.
+					->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access')
+					->join('LEFT', '#__categories AS c on c.id = a.catid')
+
+					// Join over the categories to get parent category titles
+					->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
+					->join('LEFT', '#__categories as parent ON parent.id = c.parent_id')
+
+					->where('a.id = ' . (int) $pk);
+
+				// Filter by start and end dates.
+				$nullDate = $db->quote($db->getNullDate());
+				$nowDate = $db->quote(JFactory::getDate()->toSql());
+
+				// Filter by published state.
+				$published = $this->getState('filter.published');
+				$archived = $this->getState('filter.archived');
+
+				if (is_numeric($published))
+				{
+					$query->where('(a.published = ' . (int) $published . ' OR a.published =' . (int) $archived . ')')
+						->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+						->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+				}
+
+				$db->setQuery($query);
+				$data = $db->loadObject();
+
+				if (empty($data))
+				{
+					JError::raiseError(404, JText::_('COM_CONTACT_ERROR_CONTACT_NOT_FOUND'));
+				}
+
+				// Check for published state if filter set.
+				if ((is_numeric($published) || is_numeric($archived)) && (($data->published != $published) && ($data->published != $archived)))
+				{
+					JError::raiseError(404, JText::_('COM_CONTACT_ERROR_CONTACT_NOT_FOUND'));
+				}
+
+				/**
+				 * In case some entity params have been set to "use global", those are
+				 * represented as an empty string and must be "overridden" by merging
+				 * the component and / or menu params here.
+				 */
+				$registry = new Registry($data->params);
+
+				$data->params = clone $this->getState('params');
+				$data->params->merge($registry);
+
+				$registry = new Registry($data->metadata);
+				$data->metadata = $registry;
+
+				// Some contexts may not use tags data at all, so we allow callers to disable loading tag data
+				if ($this->getState('load_tags', true))
+				{
+					$data->tags = new JHelperTags;
+					$data->tags->getItemTags('com_contact.contact', $data->id);
+				}
+
+				// Compute access permissions.
+				if (($access = $this->getState('filter.access')))
+				{
+					// If the access filter has been set, we already know this user can view.
+					$data->params->set('access-view', true);
+				}
+				else
+				{
+					// If no access filter is set, the layout takes some responsibility for display of limited information.
+					$user = JFactory::getUser();
+					$groups = $user->getAuthorisedViewLevels();
+
+					if ($data->catid == 0 || $data->category_access === null)
+					{
+						$data->params->set('access-view', in_array($data->access, $groups));
+					}
+					else
+					{
+						$data->params->set('access-view', in_array($data->access, $groups) && in_array($data->category_access, $groups));
+					}
+				}
+
+				$this->_item[$pk] = $data;
+			}
+			catch (Exception $e)
+			{
+				$this->setError($e);
+				$this->_item[$pk] = false;
+			}
+		}
+
+		if ($this->_item[$pk])
+		{
+			$this->buildContactExtendedData($this->_item[$pk]);
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Load extended data (profile, articles) for a contact
+	 *
+	 * @param   object  $contact  The contact object
+	 *
+	 * @return  void
+	 */
+	protected function buildContactExtendedData($contact)
+	{
+		$db        = $this->getDbo();
+		$nullDate  = $db->quote($db->getNullDate());
+		$nowDate   = $db->quote(JFactory::getDate()->toSql());
+		$user      = JFactory::getUser();
+		$groups    = implode(',', $user->getAuthorisedViewLevels());
+		$published = $this->getState('filter.published');
+
+		// If we are showing a contact list, then the contact parameters take priority
+		// So merge the contact parameters with the merged parameters
+		if ($this->getState('params')->get('show_contact_list'))
+		{
+			$this->getState('params')->merge($contact->params);
+		}
+
+		// Get the com_content articles by the linked user
+		if ((int) $contact->user_id && $this->getState('params')->get('show_articles'))
+		{
+			$query = $db->getQuery(true)
+				->select('a.id')
+				->select('a.title')
+				->select('a.state')
+				->select('a.access')
+				->select('a.catid')
+				->select('a.created')
+				->select('a.language')
+				->select('a.publish_up');
+
+			// SQL Server changes
+			$case_when = ' CASE WHEN ';
+			$case_when .= $query->charLength('a.alias', '!=', '0');
+			$case_when .= ' THEN ';
+			$a_id = $query->castAsChar('a.id');
+			$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+			$case_when .= ' ELSE ';
+			$case_when .= $a_id . ' END as slug';
+			$case_when1 = ' CASE WHEN ';
+			$case_when1 .= $query->charLength('c.alias', '!=', '0');
+			$case_when1 .= ' THEN ';
+			$c_id = $query->castAsChar('c.id');
+			$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+			$case_when1 .= ' ELSE ';
+			$case_when1 .= $c_id . ' END as catslug';
+			$query->select($case_when1 . ',' . $case_when)
+				->from('#__content as a')
+				->join('LEFT', '#__categories as c on a.catid=c.id')
+				->where('a.created_by = ' . (int) $contact->user_id)
+				->where('a.access IN (' . $groups . ')')
+				->order('a.publish_up DESC');
+
+			// Filter per language if plugin published
+			if (JLanguageMultilang::isEnabled())
+			{
+				$query->where('a.language IN (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+			}
+
+			if (is_numeric($published))
+			{
+				$query->where('a.state IN (1,2)')
+					->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+					->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+			}
+
+			// Number of articles to display from config/menu params
+			$articles_display_num = $this->getState('params')->get('articles_display_num', 10);
+
+			// Use contact setting?
+			if ($articles_display_num === 'use_contact')
+			{
+				$articles_display_num = $contact->params->get('articles_display_num', 10);
+
+				// Use global?
+				if ((string) $articles_display_num === '')
+				{
+					$articles_display_num = JComponentHelper::getParams('com_contact')->get('articles_display_num', 10);
+				}
+			}
+
+			$db->setQuery($query, 0, (int) $articles_display_num);
+			$articles = $db->loadObjectList();
+			$contact->articles = $articles;
+		}
+		else
+		{
+			$contact->articles = null;
+		}
+
+		// Get the profile information for the linked user
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_users/models', 'UsersModel');
+		$userModel = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
+		$data = $userModel->getItem((int) $contact->user_id);
+
+		JPluginHelper::importPlugin('user');
+
+		// Get the form.
+		JForm::addFormPath(JPATH_SITE . '/components/com_users/models/forms');
+		JForm::addFieldPath(JPATH_SITE . '/components/com_users/models/fields');
+		JForm::addFormPath(JPATH_SITE . '/components/com_users/model/form');
+		JForm::addFieldPath(JPATH_SITE . '/components/com_users/model/field');
+
+		$form = JForm::getInstance('com_users.profile', 'profile');
+
+		// Get the dispatcher.
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// Trigger the form preparation event.
+		$dispatcher->trigger('onContentPrepareForm', array($form, $data));
+
+		// Trigger the data preparation event.
+		$dispatcher->trigger('onContentPrepareData', array('com_users.profile', $data));
+
+		// Load the data into the form after the plugins have operated.
+		$form->bind($data);
+		$contact->profile = $form;
+	}
+
+	/**
+	 * Gets the query to load a contact item
+	 *
+	 * @param   integer  $pk  The item to be loaded
+	 *
+	 * @return  mixed    The contact object on success, false on failure
+	 *
+	 * @throws  Exception  On database failure
+	 */
+	protected function getContactQuery($pk = null)
+	{
+		// @todo Cache on the fingerprint of the arguments
+		$db       = $this->getDbo();
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate  = $db->quote(JFactory::getDate()->toSql());
+		$user     = JFactory::getUser();
+		$pk       = (!empty($pk)) ? $pk : (int) $this->getState('contact.id');
+		$query    = $db->getQuery(true);
+
+		if ($pk)
+		{
+			// Sqlsrv changes
+			$case_when  = ' CASE WHEN ';
+			$case_when .= $query->charLength('a.alias', '!=', '0');
+			$case_when .= ' THEN ';
+
+			$a_id       = $query->castAsChar('a.id');
+			$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+			$case_when .= ' ELSE ';
+			$case_when .= $a_id . ' END as slug';
+
+			$case_when1  = ' CASE WHEN ';
+			$case_when1 .= $query->charLength('cc.alias', '!=', '0');
+			$case_when1 .= ' THEN ';
+
+			$c_id        = $query->castAsChar('cc.id');
+			$case_when1 .= $query->concatenate(array($c_id, 'cc.alias'), ':');
+			$case_when1 .= ' ELSE ';
+			$case_when1 .= $c_id . ' END as catslug';
+
+			$query->select(
+				'a.*, cc.access as category_access, cc.title as category_name, '
+				. $case_when . ',' . $case_when1
+			)
+				->from('#__contact_details AS a')
+				->join('INNER', '#__categories AS cc on cc.id = a.catid')
+				->where('a.id = ' . (int) $pk);
+
+			$published = $this->getState('filter.published');
+
+			if (is_numeric($published))
+			{
+				$query->where('a.published IN (1,2)')
+					->where('cc.published IN (1,2)');
+			}
+
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+
+			try
+			{
+				$db->setQuery($query);
+				$result = $db->loadObject();
+
+				if (empty($result))
+				{
+					return false;
+				}
+			}
+			catch (Exception $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			if ($result)
+			{
+				$contactParams = new Registry($result->params);
+
+				// If we are showing a contact list, then the contact parameters take priority
+				// So merge the contact parameters with the merged parameters
+				if ($this->getState('params')->get('show_contact_list'))
+				{
+					$this->getState('params')->merge($contactParams);
+				}
+
+				// Get the com_content articles by the linked user
+				if ((int) $result->user_id && $this->getState('params')->get('show_articles'))
+				{
+					$query = $db->getQuery(true)
+						->select('a.id')
+						->select('a.title')
+						->select('a.state')
+						->select('a.access')
+						->select('a.catid')
+						->select('a.created')
+						->select('a.language')
+						->select('a.publish_up');
+
+					// SQL Server changes
+					$case_when = ' CASE WHEN ';
+					$case_when .= $query->charLength('a.alias', '!=', '0');
+					$case_when .= ' THEN ';
+					$a_id = $query->castAsChar('a.id');
+					$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+					$case_when .= ' ELSE ';
+					$case_when .= $a_id . ' END as slug';
+					$case_when1 = ' CASE WHEN ';
+					$case_when1 .= $query->charLength('c.alias', '!=', '0');
+					$case_when1 .= ' THEN ';
+					$c_id = $query->castAsChar('c.id');
+					$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+					$case_when1 .= ' ELSE ';
+					$case_when1 .= $c_id . ' END as catslug';
+					$query->select($case_when1 . ',' . $case_when)
+						->from('#__content as a')
+						->join('LEFT', '#__categories as c on a.catid=c.id')
+						->where('a.created_by = ' . (int) $result->user_id)
+						->where('a.access IN (' . $groups . ')')
+						->order('a.publish_up DESC');
+
+					// Filter per language if plugin published
+					if (JLanguageMultilang::isEnabled())
+					{
+						$query->where('a.language IN (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+					}
+
+					if (is_numeric($published))
+					{
+						$query->where('a.state IN (1,2)')
+							->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+							->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+					}
+
+					// Number of articles to display from config/menu params
+					$articles_display_num = $this->getState('params')->get('articles_display_num', 10);
+
+					// Use contact setting?
+					if ($articles_display_num === 'use_contact')
+					{
+						$articles_display_num = $contactParams->get('articles_display_num', 10);
+
+						// Use global?
+						if ((string) $articles_display_num === '')
+						{
+							$articles_display_num = JComponentHelper::getParams('com_contact')->get('articles_display_num', 10);
+						}
+					}
+
+					$db->setQuery($query, 0, (int) $articles_display_num);
+					$articles = $db->loadObjectList();
+					$result->articles = $articles;
+				}
+				else
+				{
+					$result->articles = null;
+				}
+
+				// Get the profile information for the linked user
+				JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_users/models', 'UsersModel');
+				$userModel = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
+				$data = $userModel->getItem((int) $result->user_id);
+
+				JPluginHelper::importPlugin('user');
+				$form = new JForm('com_users.profile');
+
+				// Get the dispatcher.
+				$dispatcher = JEventDispatcher::getInstance();
+
+				// Trigger the form preparation event.
+				$dispatcher->trigger('onContentPrepareForm', array($form, $data));
+
+				// Trigger the data preparation event.
+				$dispatcher->trigger('onContentPrepareData', array('com_users.profile', $data));
+
+				// Load the data into the form after the plugins have operated.
+				$form->bind($data);
+				$result->profile = $form;
+				$this->contact = $result;
+
+				return $result;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Increment the hit counter for the contact.
+	 *
+	 * @param   integer  $pk  Optional primary key of the contact to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 *
+	 * @since   3.0
+	 */
+	public function hit($pk = 0)
+	{
+		$input = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('contact.id');
+
+			$table = JTable::getInstance('Contact', 'ContactTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_contact/models/featured.php b/core/components/com_contact/models/featured.php
new file mode 100644
index 00000000..74ececbe
--- /dev/null
+++ b/core/components/com_contact/models/featured.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Featured contact model class.
+ *
+ * @since  1.6.0
+ */
+class ContactModelFeatured extends JModelList
+{
+	/**
+	 * Category items data
+	 *
+	 * @var         array
+	 * @since       1.6.0-beta1
+	 * @deprecated  4.0  Variable not used since 1.6.0-beta8
+	 */
+	protected $_item = null;
+
+	/**
+	 * Who knows what this was for? It has never been used
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used ever
+	 */
+	protected $_articles = null;
+
+	/**
+	 * Get the siblings of the category
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used since 1.6.0-beta8
+	 */
+	protected $_siblings = null;
+
+	/**
+	 * Get the children of the category
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used since 1.6.0-beta8
+	 */
+	protected $_children = null;
+
+	/**
+	 * Get the parent of the category
+	 *
+	 * @var          array
+	 * @since        1.6.0-beta1
+	 * @deprecated   4.0  Variable not used since 1.6.0-beta8
+	 */
+	protected $_parent = null;
+
+	/**
+	 * The category that applies.
+	 *
+	 * @access      protected
+	 * @var         object
+	 * @deprecated   4.0  Variable not used ever
+	 */
+	protected $_category = null;
+
+	/**
+	 * The list of other contact categories.
+	 *
+	 * @access    protected
+	 * @var       array
+	 * @deprecated   4.0  Variable not used ever
+	 */
+	protected $_categories = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'con_position', 'a.con_position',
+				'suburb', 'a.suburb',
+				'state', 'a.state',
+				'country', 'a.country',
+				'ordering', 'a.ordering',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get a list of items.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		// Invoke the parent getItems method to get the main list
+		$items = parent::getItems();
+
+		// Convert the params field into an object, saving original in _params
+		for ($i = 0, $n = count($items); $i < $n; $i++)
+		{
+			$item = &$items[$i];
+
+			if (!isset($this->_params))
+			{
+				$item->params = new Registry($item->params);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return  string    An SQL query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$user = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select required fields from the categories.
+		$query->select($this->getState('list.select', 'a.*'))
+			->from($db->quoteName('#__contact_details') . ' AS a')
+			->where('a.access IN (' . $groups . ')')
+			->where('a.featured=1')
+			->join('INNER', '#__categories AS c ON c.id = a.catid')
+			->where('c.access IN (' . $groups . ')');
+
+		// Filter by category.
+		if ($categoryId = $this->getState('category.id'))
+		{
+			$query->where('a.catid = ' . (int) $categoryId);
+		}
+
+		// Change for sqlsrv... aliased c.published to cat_published
+		$query->select('c.published as cat_published, c.published AS parents_published')
+			->where('c.published = 1');
+
+		// Filter by state
+		$state = $this->getState('filter.published');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.published = ' . (int) $state);
+
+			// Filter by start and end dates.
+			$nullDate = $db->quote($db->getNullDate());
+			$date = JFactory::getDate();
+			$nowDate = $db->quote($date->toSql());
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$params = JComponentHelper::getParams('com_contact');
+
+		// List state information
+		$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
+		$this->setState('list.limit', $limit);
+
+		$limitstart = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $limitstart);
+
+		$orderCol = $app->input->get('filter_order', 'ordering');
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'ordering';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_contact')) && (!$user->authorise('core.edit', 'com_contact')))
+		{
+			// Limit to published for people who can't edit or edit.state.
+			$this->setState('filter.published', 1);
+
+			// Filter by start and end dates.
+			$this->setState('filter.publish_date', true);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+}
diff --git a/core/components/com_contact/models/forms/contact.xml b/core/components/com_contact/models/forms/contact.xml
new file mode 100644
index 00000000..8e641c2b
--- /dev/null
+++ b/core/components/com_contact/models/forms/contact.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fieldset name="contact" addrulepath="components/com_contact/models/rules" label="COM_CONTACT_CONTACT_DEFAULT_LABEL">
+		<field
+			name="spacer"
+			type="spacer"
+			label="COM_CONTACT_CONTACT_REQUIRED"
+			class="text"
+		/>
+
+		<field
+			name="contact_name"
+			type="text"
+			label="COM_CONTACT_CONTACT_EMAIL_NAME_LABEL"
+			description="COM_CONTACT_CONTACT_EMAIL_NAME_DESC"
+			id="contact-name"
+			size="30"
+			filter="string"
+			required="true"
+		/>
+
+		<field
+			name="contact_email"
+			type="email"
+			label="COM_CONTACT_EMAIL_LABEL"
+			description="COM_CONTACT_EMAIL_DESC"
+			id="contact-email"
+			size="30"
+			filter="string"
+			validate="contactemail"
+			autocomplete="email"
+			required="true"
+		/>
+
+		<field
+			name="contact_subject"
+			type="text"
+			label="COM_CONTACT_CONTACT_MESSAGE_SUBJECT_LABEL"
+			description="COM_CONTACT_CONTACT_MESSAGE_SUBJECT_DESC"
+			id="contact-emailmsg"
+			size="60"
+			filter="string"
+			validate="contactemailsubject"
+			required="true"
+		/>
+
+		<field
+			name="contact_message"
+			type="textarea"
+			label="COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL"
+			description="COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC"
+			cols="50"
+			rows="10"
+			id="contact-message"
+			filter="safehtml"
+			validate="contactemailmessage"
+			required="true"
+		/>
+
+		<field
+			name="contact_email_copy"
+			type="checkbox"
+			label="COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL"
+			description="COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC"
+			id="contact-email-copy"
+			default="0"
+		/>
+	</fieldset>
+
+	<fieldset name="captcha">
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_CONTACT_CAPTCHA_LABEL"
+			description="COM_CONTACT_CAPTCHA_DESC"
+			validate="captcha"
+			namespace="contact"
+		/>
+	</fieldset>
+</form>
diff --git a/core/components/com_contact/models/forms/filter_contacts.xml b/core/components/com_contact/models/forms/filter_contacts.xml
new file mode 100644
index 00000000..6272238f
--- /dev/null
+++ b/core/components/com_contact/models/forms/filter_contacts.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+<fieldset addfieldpath="/administrator/components/com_contacts/models/fields" />
+	<fields name="filter">
+
+		<field
+			name="search"
+			type="text"
+			label="COM_CONTACT_FILTER_SEARCH_LABEL"
+			description="COM_CONTACT_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="JOPTION_SELECT_PUBLISHED"
+			description="JOPTION_SELECT_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			extension="com_contact"
+			published="0,1,2"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			mode="nested"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_TAG</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTACT_LIST_FULL_ORDERING"
+			description="COM_CONTACT_LIST_FULL_ORDERING_DESC"
+			default="a.name ASC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.featured ASC">JFEATURED_ASC</option>
+			<option value="a.featured DESC">JFEATURED_DESC</option>
+			<option value="a.name ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.name DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="ul.name ASC">COM_CONTACT_FIELD_LINKED_USER_LABEL_ASC</option>
+			<option value="ul.name DESC">COM_CONTACT_FIELD_LINKED_USER_LABEL_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option
+				value="association ASC"
+				requires="associations"
+				>
+				JASSOCIATIONS_ASC
+			</option>
+			<option
+				value="association DESC"
+				requires="associations"
+				>
+				JASSOCIATIONS_DESC
+			</option>
+			<option value="language_title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language_title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTACT_LIST_LIMIT"
+			description="COM_CONTACT_LIST_LIMIT_DESC"
+			default="25"
+			class="input-mini"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/components/com_contact/models/forms/form.xml b/core/components/com_contact/models/forms/form.xml
new file mode 100644
index 00000000..3bd4fdbe
--- /dev/null
+++ b/core/components/com_contact/models/forms/form.xml
@@ -0,0 +1,772 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- @deprecated  4.0  Not used since 1.6 No replacement. -->
+<form>
+	<fieldset>
+		<field 
+			name="id" 
+			type="hidden"
+			label="COM_CONTACT_ID_LABEL"
+			default="0"
+			readonly="true"
+			required="true"
+			size="10"
+		/>
+
+		<field 
+			name="name" 
+			type="text"
+			label="CONTACT_NAME_LABEL"
+			description="CONTACT_NAME_DESC"
+			required="true"
+			size="30"
+		/>
+
+		<field 
+			name="alias" 
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+			size="30"
+		/>
+
+		<field 
+			name="user_id" 
+			type="user"
+			label="CONTACT_LINKED_USER_LABEL"
+			description="CONTACT_LINKED_USER_DESC"
+		/>
+
+		<field 
+			name="published" 
+			type="list"
+			label="JFIELD_PUBLISHED_LABEL"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
+			size="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="-1">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field 
+			name="catid" 
+			type="category"
+			label="JCATEGORY"
+			description="JFIELD_CATEGORY_DESC"
+			extension="com_contact"
+			required="true"
+		/>
+
+		<field 
+			name="access" 
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			size="1"
+		/>
+
+		<field 
+			name="sortname1" 
+			type="text"
+			label="CONTACT_SORTNAME1_LABEL"
+			description="CONTACT_SORTNAME1_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="sortname2" 
+			type="text"
+			label="CONTACT_SORTNAME2_LABEL"
+			description="CONTACT_SORTNAME3_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="sortname3" 
+			type="text"
+			label="CONTACT_SORTNAME3_LABEL"
+			description="CONTACT_SORTNAME3_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="language" 
+			type="text"
+			label="CONTACT_LANGUAGE_LABEL"
+			description="CONTACT_LANGUAGE_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="con_position" 
+			type="text"
+			label="CONTACT_INFORMATION_POSITION_LABEL"
+			description="CONTACT_INFORMATION_POSITION_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="email_to" 
+			type="email"
+			label="CONTACT_INFORMATION_EMAIL_LABEL"
+			description="CONTACT_INFORMATION_EMAIL_DESC"
+			size="30" 
+			validate="email" 
+			filter="string" 
+			autocomplete="email"
+		/>
+
+		<field 
+			name="address" 
+			type="textarea"
+			label="CONTACT_INFORMATION_ADDRESS_LABEL"
+			description="CONTACT_INFORMATION_ADDRESS_DESC"
+			cols="30"
+			rows="3"
+		/>
+
+		<field 
+			name="suburb" 
+			type="text"
+			label="CONTACT_INFORMATION_SUBURB_LABEL"
+			description="CONTACT_INFORMATION_SUBURB_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="state" 
+			type="text"
+			label="CONTACT_INFORMATION_STATE_LABEL"
+			description="CONTACT_INFORMATION_STATE_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="postcode" 
+			type="text"
+			label="CONTACT_INFORMATION_POSTCODE_LABEL"
+			description="CONTACT_INFORMATION_POSTCODE_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="country" 
+			type="text"
+			label="CONTACT_INFORMATION_COUNTRY_LABEL"
+			description="CONTACT_INFORMATION_COUNTRY_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="telephone" 
+			type="text"
+			label="CONTACT_INFORMATION_TELEPHONE_LABEL"
+			description="CONTACT_INFORMATION_TELEPHONE_DESC"
+			size="30"
+		/>
+
+		<field
+			name="mobile" 
+			type="text"
+			label="CONTACT_INFORMATION_MOBILE_LABEL"
+			description="CONTACT_INFORMATION_MOBILE_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="webpage" 
+			type="text"
+			label="CONTACT_INFORMATION_WEBPAGE_LABEL"
+			description="CONTACT_INFORMATION_WEBPAGE_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="misc" 
+			type="editor"
+			label="CONTACT_INFORMATION_MISC_LABEL"
+			description="CONTACT_INFORMATION_MISC_DESC"
+			buttons="true"
+			hide="pagebreak,readmore"
+			filter="safehtml"
+			size="30"
+		/>
+
+		<field 
+			name="checked_out" 
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field 
+			name="checked_out_time" 
+			type="hidden"
+			filter="unset"
+		/>
+
+		<field 
+			name="ordering" 
+			type="ordering"
+			label="JFIELD_ORDERING_LABEL"
+			description="JFIELD_ORDERING_DESC"
+			content_type="com_contact.contact"
+		/>
+
+		<field 
+			name="metakey" 
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
+			cols="30"
+			rows="3"
+		/>
+
+		<field 
+			name="metadesc" 
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
+			cols="30"
+			rows="3"
+		/>
+
+		<field 
+			name="language" 
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_CONTACT_LANGUAGE_DESC"
+			>
+			<option value="">JALL</option>
+		</field>
+
+		<field 
+			name="contact_icons" 
+			type="list"
+			label="Icons/text"
+			description="PARAMCONTACTICONS"
+			default="0"
+			>
+			<option value="0">CONTACT_ICONS_OPTIONS_NONE</option>
+			<option value="1">CONTACT_ICONS_OPTIONS_TEXT</option>
+			<option value="2">CONTACT_ICONS_OPTIONS_TEXT</option>
+		</field>
+
+		<field 
+			name="icon_address" 
+			type="imagelist"
+			label="CONTACT_ICONS_ADDRESS_LABEL"
+			description="CONTACT_ICONS_ADDRESS_DESC"
+			directory="/images"
+			hide_none="1"
+		/>
+
+		<field 
+			name="icon_email" 
+			type="imagelist"
+			label="CONTACT_ICONS_EMAIL_LABEL"
+			description="CONTACT_ICONS_EMAIL_DESC"
+			directory="/images"
+			hide_none="1"
+		/>
+
+		<field 
+			name="icon_telephone" 
+			type="imagelist"
+			label="CONTACT_ICONS_TELEPHONE_LABEL"
+			description="CONTACT_ICONS_TELEPHONE_DESC"
+			directory="/images"
+			hide_none="1"
+		/>
+
+		<field 
+			name="icon_mobile" 
+			type="imagelist"
+			label="CONTACT_ICONS_MOBILE_LABEL"
+			description="CONTACT_ICONS_MOBILE_DESC"
+			directory="/images"
+			hide_none="1"
+		/>
+
+		<field 
+			name="icon_fax" 
+			type="imagelist"
+			label="CONTACT_ICONS_FAX_LABEL"
+			description="CONTACT_ICONS_FAX_DESC"
+			directory="/images"
+			hide_none="1"
+		/>
+
+		<field 
+			name="icon_misc" 
+			type="imagelist"
+			label="CONTACT_ICONS_MISC_LABEL"
+			description="CONTACT_ICONS_MISC_DESC"
+			directory="/images"
+			hide_none="1"
+		/>
+
+	</fieldset>
+
+	<fields name="metadata">
+		<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+			<field 
+				name="robots"
+				type="list"
+				label="JFIELD_METADATA_ROBOTS_LABEL"
+				description="JFIELD_METADATA_ROBOTS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+				<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+				<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+				<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+			</field>
+
+			<field 
+				name="rights" 
+				type="text"
+				label="JFIELD_METADATA_RIGHTS_LABEL"
+				description="JFIELD_METADATA_RIGHTS_DESC"
+				size="20"
+			/>
+
+		</fieldset>
+	</fields>
+
+	<fields name="params">
+		<fieldset name="options" label="CONTACT_PARAMETERS">
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		<field 
+			name="show_name" 
+			type="list"
+			label="CONTACT_PARAMS_NAME_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_position" 
+			type="list"
+			label="CONTACT_PARAMS_CONTACT_POSITION_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_email" 
+			type="list"
+			label="CONTACT_PARAMS_CONTACT_POSITION_E_MAIL_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_street_address" 
+			type="list"
+			label="CONTACT_PARAMS_STREET_ADDRESS_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_suburb" 
+			type="list"
+			label="CONTACT_PARAMS_TOWN_SUBURB_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_state" 
+			type="list"
+			label="CONTACT_PARAMS_STATE_COUNTY_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_postcode" 
+			type="list"
+			label="CONTACT_PARAMS_POST_ZIP_CODE_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_country" 
+			type="list"
+			label="CONTACT_PARAMS_COUNTRY_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_telephone" 
+			type="list"
+			label="CONTACT_PARAMS_TELEPHONE_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_mobile" 
+			type="list"
+			label="CONTACT_PARAMS_MOBILE_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_fax" 
+			type="list"
+			label="CONTACT_PARAMS_FAX_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_webpage" 
+			type="list"
+			label="CONTACT_PARAMS_WEBPAGE_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_image" 
+			type="list"
+			label="CONTACT_PARAMS_IMAGE_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="allow_vcard" 
+			type="list"
+			label="CONTACT_PARAMS_VCARD_LABEL"
+			description="CONTACT_PARAMS_VCARD_LABEL"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_misc"
+			type="list"
+			label="CONTACT_PARAMS_MISC_INFO_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_articles" 
+			type="list"
+			label="CONTACT_SHOW_ARTICLES_LABEL"
+			description="CONTACT_SHOW_ARTICLES_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="articles_display_num" 
+			type="list" 
+			label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+			description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+			default=""
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="5">J5</option>
+			<option value="10">J10</option>
+			<option value="15">J15</option>
+			<option value="20">J20</option>
+			<option value="25">J25</option>
+			<option value="30">J30</option>
+			<option value="50">J50</option>
+			<option value="75">J75</option>
+			<option value="100">J100</option>
+			<option value="150">J150</option>
+			<option value="200">J200</option>
+			<option value="250">J250</option>
+			<option value="300">J300</option>
+			<option value="0">JALL</option>
+		</field>
+
+		<field 
+			name="show_profile" 
+			type="list"
+			label="CONTACT_PROFILE_SHOW_LABEL"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+			
+		<field
+			name="show_user_custom_fields"
+			type="fieldgroups"
+			label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
+			description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
+			multiple="true"
+			context="com_users.user"
+			>
+			<option value="-1">JALL</option>
+		</field>
+
+		<field 
+			name="show_links" 
+			type="list"
+			label="CONTACT_SHOW_LINKS_LABEL"
+			description="CONTACT_SHOW_LINKS_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="linka_name" 
+			type="text"
+			label="CONTACT_LINKA_NAME_LABEL"
+			description="CONTACT_LINKA_NAME_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linka" 
+			type="text"
+			label="CONTACT_LINKA_LABEL"
+			description="CONTACT_LINKA_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linkb_name" 
+			type="text"
+			label="CONTACT_LINKB_NAME_LABEL"
+			description="CONTACT_LINKB_NAME_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linkb" 
+			type="text"
+			label="CONTACT_LINKB_LABEL"
+			description="CONTACT_LINKB_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linkc_name" 
+			type="text"
+			label="CONTACT_LINKC_NAME_LABEL"
+			description="CONTACT_LINKC_NAME_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linkc" 
+			type="text"
+			label="CONTACT_LINKC_LABEL"
+			description="CONTACT_LINKC_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linkd_name" 
+			type="text"
+			label="CONTACT_LINKD_NAME_LABEL"
+			description="CONTACT_LINKD_NAME_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linkd" 
+			type="text"
+			label="CONTACT_LINKD_LABEL"
+			description="CONTACT_LINKD_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linke_name" 
+			type="text"
+			label="CONTACT_LINKE_NAME_LABEL"
+			description="CONTACT_LINKE_NAME_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="linke" 
+			type="text"
+			label="CONTACT_LINKE_LABEL"
+			description="CONTACT_LINKE_DESC"
+			size="30"
+		/>
+
+		</fieldset>
+	</fields>
+
+	<fields name="email_form">
+		<fieldset name="email_form" label="CONTACT_EMAIL_FORM_LABEL">
+
+		<field 
+			name="show_email_form" 
+			type="list"
+			label="CONTACT_EMAIL_SHOW_FORM_LABEL"
+			description="CONTACT_EMAIL_SHOW_FORM_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="email_description" 
+			type="text"
+			label="CONTACT_EMAIL_DESCRIPTION_TEXT_LABEL"
+			description="CONTACT_EMAIL_DESCRIPTION_TEXT_DESC"
+			size="30"
+		/>
+
+		<field 
+			name="show_email_copy" 
+			type="list"
+			label="CONTACT_EMAIL_EMAIL_COPY_LABEL"
+			description="CONTACT_EMAIL_EMAIL_COPY_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="banned_email" 
+			type="textarea"
+			label="CONTACT_EMAIL_BANNED_EMAIL_LABEL"
+			description="CONTACT_EMAIL_BANNED_EMAIL_DESC"
+			cols="30"
+			rows="3"
+		/>
+
+		<field 
+			name="banned_subject" 
+			type="textarea"
+			label="Contact_Email_BANNED_SUBJECT_LABEL"
+			description="Contact_Email_BANNED_SUBJECT_DESC"
+			cols="30"
+			rows="3"
+		/>
+
+		<field 
+			name="banned_text" 
+			type="textarea"
+			label="CONTACT_EMAIL_BANNED_TEXT_LABEL"
+			description="CONTACT_EMAIL_BANNED_TEXT_DESC"
+			cols="30"
+			rows="3"
+		/>
+
+		<field 
+			name="validate_session" 
+			type="list"
+			label="CONTACT_CONFIG_SESSION_CHECK_LABEL"
+			description="CONTACT_CONFIG_SESSION_CHECK_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field 
+			name="custom_reply" 
+			type="list"
+			label="CONTACT_CONFIG_CUSTOM_REPLY"
+			description="CONTACT_CONFIG_CUSTOM_REPLY_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field 
+			name="redirect" 
+			type="text"
+			label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+			size="30"
+		/>
+
+		</fieldset>
+	</fields>
+</form>
+
diff --git a/core/components/com_contact/models/rules/contactemail.php b/core/components/com_contact/models/rules/contactemail.php
new file mode 100644
index 00000000..3403ab42
--- /dev/null
+++ b/core/components/com_contact/models/rules/contactemail.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+JFormHelper::loadRuleClass('email');
+
+/**
+ * JFormRule for com_contact to make sure the email address is not blocked.
+ *
+ * @since  1.6
+ */
+class JFormRuleContactEmail extends JFormRuleEmail
+{
+	/**
+	 * Method to test for banned email addresses
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the <field /> tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   JForm             $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 */
+	public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
+	{
+		if (!parent::test($element, $value, $group, $input, $form))
+		{
+			return false;
+		}
+
+		$params = JComponentHelper::getParams('com_contact');
+		$banned = $params->get('banned_email');
+
+		if ($banned)
+		{
+			foreach (explode(';', $banned) as $item)
+			{
+				if ($item != '' && StringHelper::stristr($value, $item) !== false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_contact/models/rules/contactemailmessage.php b/core/components/com_contact/models/rules/contactemailmessage.php
new file mode 100644
index 00000000..d18e7eb7
--- /dev/null
+++ b/core/components/com_contact/models/rules/contactemailmessage.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * JFormRule for com_contact to make sure the message body contains no banned word.
+ *
+ * @since  1.6
+ */
+class JFormRuleContactEmailMessage extends JFormRule
+{
+	/**
+	 * Method to test a message for banned words
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the <field /> tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   JForm             $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 */
+	public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
+	{
+		$params = JComponentHelper::getParams('com_contact');
+		$banned = $params->get('banned_text');
+
+		if ($banned)
+		{
+			foreach (explode(';', $banned) as $item)
+			{
+				if ($item != '' && StringHelper::stristr($value, $item) !== false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_contact/models/rules/contactemailsubject.php b/core/components/com_contact/models/rules/contactemailsubject.php
new file mode 100644
index 00000000..9737cb11
--- /dev/null
+++ b/core/components/com_contact/models/rules/contactemailsubject.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * JFormRule for com_contact to make sure the subject contains no banned word.
+ *
+ * @since  1.6
+ */
+class JFormRuleContactEmailSubject extends JFormRule
+{
+	/**
+	 * Method to test for a banned subject
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the <field /> tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   JForm             $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise
+	 */
+	public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
+	{
+		$params = JComponentHelper::getParams('com_contact');
+		$banned = $params->get('banned_subject');
+
+		if ($banned)
+		{
+			foreach (explode(';', $banned) as $item)
+			{
+				if ($item != '' && StringHelper::stristr($value, $item) !== false)
+				{
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_contact/router.php b/core/components/com_contact/router.php
new file mode 100644
index 00000000..1bdbabde
--- /dev/null
+++ b/core/components/com_contact/router.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_contact
+ *
+ * @since  3.3
+ */
+class ContactRouter extends JComponentRouterView
+{
+	protected $noIDs = false;
+
+	/**
+	 * Search Component router constructor
+	 *
+	 * @param   JApplicationCms  $app   The application object
+	 * @param   JMenu            $menu  The menu object to work with
+	 */
+	public function __construct($app = null, $menu = null)
+	{
+		$params = JComponentHelper::getParams('com_contact');
+		$this->noIDs = (bool) $params->get('sef_ids');
+		$categories = new JComponentRouterViewconfiguration('categories');
+		$categories->setKey('id');
+		$this->registerView($categories);
+		$category = new JComponentRouterViewconfiguration('category');
+		$category->setKey('id')->setParent($categories, 'catid')->setNestable();
+		$this->registerView($category);
+		$contact = new JComponentRouterViewconfiguration('contact');
+		$contact->setKey('id')->setParent($category, 'catid');
+		$this->registerView($contact);
+		$this->registerView(new JComponentRouterViewconfiguration('featured'));
+
+		parent::__construct($app, $menu);
+
+		$this->attachRule(new JComponentRouterRulesMenu($this));
+
+		if ($params->get('sef_advanced', 0))
+		{
+			$this->attachRule(new JComponentRouterRulesStandard($this));
+			$this->attachRule(new JComponentRouterRulesNomenu($this));
+		}
+		else
+		{
+			JLoader::register('ContactRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
+			$this->attachRule(new ContactRouterRulesLegacy($this));
+		}
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $id     ID of the category to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getCategorySegment($id, $query)
+	{
+		$category = JCategories::getInstance($this->getName())->get($id);
+
+		if ($category)
+		{
+			$path = array_reverse($category->getPath(), true);
+			$path[0] = '1:root';
+
+			if ($this->noIDs)
+			{
+				foreach ($path as &$segment)
+				{
+					list($id, $segment) = explode(':', $segment, 2);
+				}
+			}
+
+			return $path;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $id     ID of the category to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getCategoriesSegment($id, $query)
+	{
+		return $this->getCategorySegment($id, $query);
+	}
+
+	/**
+	 * Method to get the segment(s) for a contact
+	 *
+	 * @param   string  $id     ID of the contact to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getContactSegment($id, $query)
+	{
+		if (!strpos($id, ':'))
+		{
+			$db = JFactory::getDbo();
+			$dbquery = $db->getQuery(true);
+			$dbquery->select($dbquery->qn('alias'))
+				->from($dbquery->qn('#__contact_details'))
+				->where('id = ' . $dbquery->q((int) $id));
+			$db->setQuery($dbquery);
+
+			$id .= ':' . $db->loadResult();
+		}
+
+		if ($this->noIDs)
+		{
+			list($void, $segment) = explode(':', $id, 2);
+
+			return array($void => $segment);
+		}
+
+		return array((int) $id => $id);
+	}
+
+	/**
+	 * Method to get the id for a category
+	 *
+	 * @param   string  $segment  Segment to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getCategoryId($segment, $query)
+	{
+		if (isset($query['id']))
+		{
+			$category = JCategories::getInstance($this->getName(), array('access' => false))->get($query['id']);
+
+			if ($category)
+			{
+				foreach ($category->getChildren() as $child)
+				{
+					if ($this->noIDs)
+					{
+						if ($child->alias == $segment)
+						{
+							return $child->id;
+						}
+					}
+					else
+					{
+						if ($child->id == (int) $segment)
+						{
+							return $child->id;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $segment  Segment to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getCategoriesId($segment, $query)
+	{
+		return $this->getCategoryId($segment, $query);
+	}
+
+	/**
+	 * Method to get the segment(s) for a contact
+	 *
+	 * @param   string  $segment  Segment of the contact to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getContactId($segment, $query)
+	{
+		if ($this->noIDs)
+		{
+			$db = JFactory::getDbo();
+			$dbquery = $db->getQuery(true);
+			$dbquery->select($dbquery->qn('id'))
+				->from($dbquery->qn('#__contact_details'))
+				->where('alias = ' . $dbquery->q($segment))
+				->where('catid = ' . $dbquery->q($query['id']));
+			$db->setQuery($dbquery);
+
+			return (int) $db->loadResult();
+		}
+
+		return (int) $segment;
+	}
+}
+
+/**
+ * Contact router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function ContactBuildRoute(&$query)
+{
+	$app = JFactory::getApplication();
+	$router = new ContactRouter($app, $app->getMenu());
+
+	return $router->build($query);
+}
+
+/**
+ * Contact router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function ContactParseRoute($segments)
+{
+	$app = JFactory::getApplication();
+	$router = new ContactRouter($app, $app->getMenu());
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_contact/views/categories/tmpl/default.php b/core/components/com_contact/views/categories/tmpl/default.php
new file mode 100644
index 00000000..b2bd5f38
--- /dev/null
+++ b/core/components/com_contact/views/categories/tmpl/default.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+JHtml::_('behavior.core');
+
+// Add strings for translations in Javascript.
+JText::script('JGLOBAL_EXPAND_CATEGORIES');
+JText::script('JGLOBAL_COLLAPSE_CATEGORIES');
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(function($) {
+	$('.categories-list').find('[id^=category-btn-]').each(function(index, btn) {
+		var btn = $(btn);
+		btn.on('click', function() {
+			btn.find('span').toggleClass('icon-plus');
+			btn.find('span').toggleClass('icon-minus');
+			if (btn.attr('aria-label') === Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES'))
+			{
+				btn.attr('aria-label', Joomla.JText._('JGLOBAL_COLLAPSE_CATEGORIES'));
+			} else {
+				btn.attr('aria-label', Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES'));
+			}
+		});
+	});
+});");
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx; ?>">
+	<?php
+		echo JLayoutHelper::render('joomla.content.categories_default', $this);
+		echo $this->loadTemplate('items');
+	?>
+</div>
diff --git a/core/components/com_contact/views/categories/tmpl/default.xml b/core/components/com_contact/views/categories/tmpl/default.xml
new file mode 100644
index 00000000..3af8a8f3
--- /dev/null
+++ b/core/components/com_contact/views/categories/tmpl/default.xml
@@ -0,0 +1,816 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTACT_CATEGORIES_VIEW_DEFAULT_TITLE" option="COM_CONTACT_CATEGORIES_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORIES"
+		/>
+		<message>
+			<![CDATA[COM_CONTACT_CATEGORIES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+		>
+			<field 
+				name="id" 
+				type="category"
+				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
+				description="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC"
+				extension="com_contact"
+				show_root="true"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+			<field 
+				name="show_base_description" 
+				type="list"
+				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+				description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="categories_description" 
+				type="textarea"
+				label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+				description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
+				cols="25"
+				rows="5"
+			/>
+
+			<field 
+				name="maxLevelcat" 
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories_cat" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc_cat" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_items_cat" 
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+		<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
+			<field 
+				name="spacer1" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="show_category_title" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description_image" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="maxLevel" 
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_items" 
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_headings" 
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_position_headings" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_headings" 
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_CONFIG_EMAIL_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_telephone_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_mobile_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_fax_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_suburb_headings" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_state_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_country_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="contact" label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL">
+			<field 
+				name="presentation_style"
+				type="list"
+				label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
+				description="COM_CONTACT_FIELD_PRESENTATION_DESC"
+				useglobal="true"
+				>
+				<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
+				<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
+				<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
+			</field>
+
+			<field 
+				name="show_contact_category"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
+				<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
+			</field>
+
+			<field 
+				name="show_contact_list"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_name"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_position"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email"
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_street_address"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_suburb"
+				type="list"
+				description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
+				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_state"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_postcode"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_country"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_telephone"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_mobile"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_fax"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_webpage"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_image"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="allow_vcard"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_articles"
+				type="list"
+				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="articles_display_num" 
+				type="list" 
+				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="75">J75</option>
+				<option value="100">J100</option>
+				<option value="150">J150</option>
+				<option value="200">J200</option>
+				<option value="250">J250</option>
+				<option value="300">J300</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field 
+				name="show_links"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="linka_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkb_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkc_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkd_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linke_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+		</fieldset>
+		<!-- Form options. -->
+		<fieldset name="Contact_Form" label="COM_CONTACT_MAIL_FIELDSET_LABEL">
+			<field 
+				name="show_email_form" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_copy" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="banned_email" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_subject" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_text" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="validate_session" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="custom_reply" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="redirect" 
+				type="text"
+				label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+				size="30"
+				useglobal="true"
+			/>
+		</fieldset>
+
+		<fieldset name="integration">
+
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_contact/views/categories/tmpl/default_items.php b/core/components/com_contact/views/categories/tmpl/default_items.php
new file mode 100644
index 00000000..12a916b9
--- /dev/null
+++ b/core/components/com_contact/views/categories/tmpl/default_items.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$class = ' class="first"';
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
+?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+		<?php
+		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+			if (!isset($this->items[$this->parent->id][$id + 1]))
+			{
+				$class = ' class="last"';
+			}
+			?>
+			<div <?php echo $class; ?> >
+			<?php $class = ''; ?>
+				<h3 class="page-header item-title">
+					<a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
+					<?php echo $this->escape($item->title); ?></a>
+					<?php if ($this->params->get('show_cat_items_cat') == 1) :?>
+						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_CONTACT_NUM_ITEMS'); ?>">
+							<?php echo JText::_('COM_CONTACT_NUM_ITEMS'); ?>&nbsp;
+							<?php echo $item->numitems; ?>
+						</span>
+					<?php endif; ?>
+					<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
+						<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
+							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+					<?php endif; ?>
+				</h3>
+				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
+					<?php if ($item->description) : ?>
+						<div class="category-desc">
+							<?php echo JHtml::_('content.prepare', $item->description, '', 'com_contact.categories'); ?>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
+					<div class="collapse fade" id="category-<?php echo $item->id; ?>">
+						<?php
+						$this->items[$item->id] = $item->getChildren();
+						$this->parent = $item;
+						$this->maxLevelcat--;
+						echo $this->loadTemplate('items');
+						$this->parent = $item->getParent();
+						$this->maxLevelcat++;
+						?>
+					</div>
+				<?php endif; ?>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?><?php endif; ?>
diff --git a/core/components/com_contact/views/categories/view.html.php b/core/components/com_contact/views/categories/view.html.php
new file mode 100644
index 00000000..b0f4e037
--- /dev/null
+++ b/core/components/com_contact/views/categories/view.html.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content categories view.
+ *
+ * @since  1.6
+ */
+class ContactViewCategories extends JViewCategories
+{
+	/**
+	 * Language key for default page heading
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $pageHeading = 'COM_CONTACT_DEFAULT_PAGE_TITLE';
+
+	/**
+	 * @var    string  The name of the extension for the category
+	 * @since  3.2
+	 */
+	protected $extension = 'com_contact';
+}
diff --git a/core/components/com_contact/views/category/tmpl/default.php b/core/components/com_contact/views/category/tmpl/default.php
new file mode 100644
index 00000000..2f5d2cf1
--- /dev/null
+++ b/core/components/com_contact/views/category/tmpl/default.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$this->subtemplatename = 'items';
+echo JLayoutHelper::render('joomla.content.category_default', $this);
diff --git a/core/components/com_contact/views/category/tmpl/default.xml b/core/components/com_contact/views/category/tmpl/default.xml
new file mode 100644
index 00000000..9e1b2443
--- /dev/null
+++ b/core/components/com_contact/views/category/tmpl/default.xml
@@ -0,0 +1,794 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTACT_CATEGORY_VIEW_DEFAULT_TITLE" option="COM_CONTACT_CATEGORY_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_CONTACT_CATEGORY"
+		/>
+		<message>
+			<![CDATA[COM_CONTACT_CATEGORY_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request"
+		addfieldpath="/administrator/components/com_categories/models/fields"
+	>
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_contact/models/fields"
+		>
+			<field
+				name="id"
+				type="modal_category"
+				label="COM_CONTACT_FIELD_CATEGORY_LABEL"
+				description="COM_CONTACT_FIELD_CATEGORY_DESC"
+				extension="com_contact"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+	</fields>
+
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+
+			<field 
+				name="spacer1" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="show_category_title" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description_image" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="maxLevel" 
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+
+			<field 
+				name="show_subcat_desc" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_items" 
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_headings" 
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_image_heading" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL" 
+				description="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_position_headings" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_headings" 
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_CONFIG_EMAIL_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_telephone_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_mobile_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_fax_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_suburb_headings" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_state_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_country_headings"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+
+			</field>
+
+			<field 
+				name="initial_sort" 
+				type="list"
+				label="COM_CONTACT_FIELD_INITIAL_SORT_LABEL"
+				description="COM_CONTACT_FIELD_INITIAL_SORT_DESC"
+				useglobal="true"
+				>
+				<option value="name">COM_CONTACT_FIELD_VALUE_NAME</option>
+				<option value="sortname">COM_CONTACT_FIELD_VALUE_SORT_NAME</option>
+				<option value="ordering">COM_CONTACT_FIELD_VALUE_ORDERING</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="contact" label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
+			addfieldpath="/administrator/components/com_fields/models/fields">
+			<field 
+				name="presentation_style"
+				type="list"
+				label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
+				description="COM_CONTACT_FIELD_PRESENTATION_DESC"
+				useglobal="true"
+				>
+				<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
+				<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
+				<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
+			</field>
+
+			<field 
+				name="show_contact_category"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
+				<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
+			</field>
+
+			<field 
+				name="show_contact_list"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_name"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_position"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+
+			</field>
+
+			<field 
+				name="show_email"
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_street_address"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_suburb"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_state"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_postcode"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_country"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_telephone"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_mobile"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_fax"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_webpage"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_image"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="allow_vcard"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_articles"
+				type="list"
+				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="articles_display_num" 
+				type="list" 
+				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="75">J75</option>
+				<option value="100">J100</option>
+				<option value="150">J150</option>
+				<option value="200">J200</option>
+				<option value="250">J250</option>
+				<option value="300">J300</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field 
+				name="show_links"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			
+			<field
+				name="show_user_custom_fields"
+				type="fieldgroups"
+				label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
+				multiple="true"
+				context="com_users.user"
+				>
+				<option value="-1">JALL</option>
+			</field>
+
+			<field 
+				name="linka_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkb_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkc_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkd_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linke_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+		</fieldset>
+		<!-- Form options. -->
+		<fieldset name="Contact_Form" label="COM_CONTACT_MAIL_FIELDSET_LABEL">
+
+			<field 
+				name="show_email_form" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_copy" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="banned_email" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_subject" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_text" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="validate_session" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="custom_reply" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="redirect" 
+				type="text"
+				label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+				size="30"
+				useglobal="true"
+			/>
+		</fieldset>
+
+		<fieldset name="integration">
+
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_Show_Feed_Link_Label"
+				description="JGLOBAL_Show_Feed_Link_Desc"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_contact/views/category/tmpl/default_children.php b/core/components/com_contact/views/category/tmpl/default_children.php
new file mode 100644
index 00000000..1278bc66
--- /dev/null
+++ b/core/components/com_contact/views/category/tmpl/default_children.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$class = ' class="first"';
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
+?>
+<ul class="list-striped list-condensed">
+<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+	<?php
+	if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+		if (!isset($this->children[$this->category->id][$id + 1]))
+		{
+			$class = ' class="last"';
+		}
+	?>
+	<li<?php echo $class; ?>>
+		<?php $class = ''; ?>
+			<h4 class="item-title">
+				<a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($child->id)); ?>">
+				<?php echo $this->escape($child->title); ?>
+				</a>
+
+				<?php if ($this->params->get('show_cat_items') == 1) : ?>
+					<span class="badge badge-info pull-right" title="<?php echo JText::_('COM_CONTACT_CAT_NUM'); ?>"><?php echo $child->numitems; ?></span>
+				<?php endif; ?>
+			</h4>
+
+			<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+				<?php if ($child->description) : ?>
+					<div class="category-desc">
+						<?php echo JHtml::_('content.prepare', $child->description, '', 'com_contact.category'); ?>
+					</div>
+				<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if (count($child->getChildren()) > 0 ) :
+				$this->children[$child->id] = $child->getChildren();
+				$this->category = $child;
+				$this->maxLevel--;
+				echo $this->loadTemplate('children');
+				$this->category = $child->getParent();
+				$this->maxLevel++;
+			endif; ?>
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
diff --git a/core/components/com_contact/views/category/tmpl/default_items.php b/core/components/com_contact/views/category/tmpl/default_items.php
new file mode 100644
index 00000000..3da52d52
--- /dev/null
+++ b/core/components/com_contact/views/category/tmpl/default_items.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+
+?>
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if ($this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?>
+		<fieldset class="filters btn-toolbar">
+			<?php if ($this->params->get('filter_field')) : ?>
+				<div class="btn-group">
+					<label class="filter-search-lbl element-invisible" for="filter-search">
+						<span class="label label-warning">
+							<?php echo JText::_('JUNPUBLISHED'); ?>
+						</span>
+							<?php echo JText::_('COM_CONTACT_FILTER_LABEL') . '&#160;'; ?>
+					</label>
+					<input
+						type="text"
+						name="filter-search"
+						id="filter-search"
+						value="<?php echo $this->escape($this->state->get('list.filter')); ?>"
+						class="inputbox"
+						onchange="document.adminForm.submit();"
+						title="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>"
+						placeholder="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>"
+					/>
+				</div>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_pagination_limit')) : ?>
+				<div class="btn-group pull-right">
+					<label for="limit" class="element-invisible">
+						<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+					</label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			<?php endif; ?>
+		</fieldset>
+	<?php endif; ?>
+	<?php if (empty($this->items)) : ?>
+		<p>
+			<?php echo JText::_('COM_CONTACT_NO_CONTACTS'); ?>
+		</p>
+	<?php else : ?>
+		<ul class="category row-striped">
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php if (in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>
+					<?php if ($this->items[$i]->published == 0) : ?>
+						<li class="row-fluid system-unpublished cat-list-row<?php echo $i % 2; ?>">
+					<?php else : ?>
+						<li class="row-fluid cat-list-row<?php echo $i % 2; ?>" >
+					<?php endif; ?>
+					<?php if ($this->params->get('show_image_heading')) : ?>
+						<?php $contactWidth = 7; ?>
+						<div class="span2 col-md-2">
+							<?php if ($this->items[$i]->image) : ?>
+								<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
+									<?php echo JHtml::_(
+										'image',
+										$this->items[$i]->image,
+										JText::_('COM_CONTACT_IMAGE_DETAILS'),
+										array('class' => 'contact-thumbnail img-thumbnail')
+									); ?>
+								</a>
+							<?php endif; ?>
+						</div>
+					<?php else : ?>
+						<?php $contactWidth = 9; ?>
+					<?php endif; ?>
+					<div class="list-title span<?php echo $contactWidth; ?> col-md-<?php echo $contactWidth; ?>">
+						<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
+							<?php echo $item->name; ?>
+						</a>
+						<?php if ($this->items[$i]->published == 0) : ?>
+							<span class="label label-warning">
+								<?php echo JText::_('JUNPUBLISHED'); ?>
+							</span>
+						<?php endif; ?>
+						<?php echo $item->event->afterDisplayTitle; ?>
+						<?php echo $item->event->beforeDisplayContent; ?>
+						<?php if ($this->params->get('show_position_headings')) : ?>
+							<?php echo $item->con_position; ?><br />
+						<?php endif; ?>
+						<?php if ($this->params->get('show_email_headings')) : ?>
+							<?php echo $item->email_to; ?><br />
+						<?php endif; ?>
+						<?php $location = array(); ?>
+						<?php if ($this->params->get('show_suburb_headings') && !empty($item->suburb)) : ?>
+							<?php $location[] = $item->suburb; ?>
+						<?php endif; ?>
+						<?php if ($this->params->get('show_state_headings') && !empty($item->state)) : ?>
+							<?php $location[] = $item->state; ?>
+						<?php endif; ?>
+						<?php if ($this->params->get('show_country_headings') && !empty($item->country)) : ?>
+							<?php $location[] = $item->country; ?>
+						<?php endif; ?>
+						<?php echo implode(', ', $location); ?>
+					</div>
+					<div class="span3 col-md-3">
+						<?php if ($this->params->get('show_telephone_headings') && !empty($item->telephone)) : ?>
+							<?php echo JText::sprintf('COM_CONTACT_TELEPHONE_NUMBER', $item->telephone); ?><br />
+						<?php endif; ?>
+						<?php if ($this->params->get('show_mobile_headings') && !empty ($item->mobile)) : ?>
+							<?php echo JText::sprintf('COM_CONTACT_MOBILE_NUMBER', $item->mobile); ?><br />
+						<?php endif; ?>
+						<?php if ($this->params->get('show_fax_headings') && !empty($item->fax)) : ?>
+							<?php echo JText::sprintf('COM_CONTACT_FAX_NUMBER', $item->fax); ?><br />
+						<?php endif; ?>
+					</div>
+					<?php echo $item->event->afterDisplayContent; ?>
+				</li>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		</ul>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_pagination', 2)) : ?>
+		<div class="pagination">
+			<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+				<p class="counter">
+					<?php echo $this->pagination->getPagesCounter(); ?>
+				</p>
+			<?php endif; ?>
+			<?php echo $this->pagination->getPagesLinks(); ?>
+		</div>
+	<?php endif; ?>
+	<div>
+		<input type="hidden" name="filter_order" value="<?php echo $this->escape($this->state->get('list.ordering')); ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->escape($this->state->get('list.direction')); ?>" />
+	</div>
+</form>
diff --git a/core/components/com_contact/views/category/view.feed.php b/core/components/com_contact/views/category/view.feed.php
new file mode 100644
index 00000000..e04fc540
--- /dev/null
+++ b/core/components/com_contact/views/category/view.feed.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Contact component
+ *
+ * @since  1.5
+ */
+class ContactViewCategory extends JViewCategoryfeed
+{
+	/**
+	 * @var    string  The name of the view to link individual items to
+	 * @since  3.2
+	 */
+	protected $viewName = 'contact';
+
+	/**
+	 * Method to reconcile non standard names from components to usage in this class.
+	 * Typically overriden in the component feed view class.
+	 *
+	 * @param   object  $item  The item for a feed, an element of the $items array.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function reconcileNames($item)
+	{
+		parent::reconcileNames($item);
+
+		$item->description = $item->address;
+	}
+}
diff --git a/core/components/com_contact/views/category/view.html.php b/core/components/com_contact/views/category/view.html.php
new file mode 100644
index 00000000..0ccc6563
--- /dev/null
+++ b/core/components/com_contact/views/category/view.html.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Contacts component
+ *
+ * @since  1.5
+ */
+class ContactViewCategory extends JViewCategory
+{
+	/**
+	 * @var    string  The name of the extension for the category
+	 * @since  3.2
+	 */
+	protected  $extension = 'com_contact';
+
+	/**
+	 * @var    string  Default title to use for page title
+	 * @since  3.2
+	 */
+	protected  $defaultPageTitle = 'COM_CONTACT_DEFAULT_PAGE_TITLE';
+
+	/**
+	 * @var    string  The name of the view to link individual items to
+	 * @since  3.2
+	 */
+	protected $viewName = 'contact';
+
+	/**
+	 * Run the standard Joomla plugins
+	 *
+	 * @var    bool
+	 * @since  3.5
+	 */
+	protected $runPlugins = true;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		parent::commonCategoryDisplay();
+
+		// Prepare the data.
+		// Compute the contact slug.
+		foreach ($this->items as $item)
+		{
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$temp       = $item->params;
+			$item->params = clone $this->params;
+			$item->params->merge($temp);
+
+			if ($item->params->get('show_email_headings', 0) == 1)
+			{
+				$item->email_to = trim($item->email_to);
+
+				if (!empty($item->email_to) && JMailHelper::isEmailAddress($item->email_to))
+				{
+					$item->email_to = JHtml::_('email.cloak', $item->email_to);
+				}
+				else
+				{
+					$item->email_to = '';
+				}
+			}
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 */
+	protected function prepareDocument()
+	{
+		parent::prepareDocument();
+
+		$menu = $this->menu;
+		$id = (int) @$menu->query['id'];
+
+		if ($menu && ($menu->query['option'] != $this->extension || $menu->query['view'] == $this->viewName || $id != $this->category->id))
+		{
+			$path = array(array('title' => $this->category->title, 'link' => ''));
+			$category = $this->category->getParent();
+
+			while (($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$this->pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		parent::addFeed();
+	}
+}
diff --git a/core/components/com_contact/views/contact/tmpl/default.php b/core/components/com_contact/views/contact/tmpl/default.php
new file mode 100644
index 00000000..4e1fec50
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.html.html.bootstrap');
+
+$cparams = JComponentHelper::getParams('com_media');
+$tparams = $this->item->params;
+
+?>
+
+<div class="contact<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Person">
+	<?php if ($tparams->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($tparams->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+
+	<?php if ($this->contact->name && $tparams->get('show_name')) : ?>
+		<div class="page-header">
+			<h2>
+				<?php if ($this->item->published == 0) : ?>
+					<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+				<?php endif; ?>
+				<span class="contact-name" itemprop="name"><?php echo $this->contact->name; ?></span>
+			</h2>
+		</div>
+	<?php endif; ?>
+
+	<?php $show_contact_category = $tparams->get('show_contact_category'); ?>
+
+	<?php if ($show_contact_category === 'show_no_link') : ?>
+		<h3>
+			<span class="contact-category"><?php echo $this->contact->category_title; ?></span>
+		</h3>
+	<?php elseif ($show_contact_category === 'show_with_link') : ?>
+		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid); ?>
+		<h3>
+			<span class="contact-category"><a href="<?php echo $contactLink; ?>">
+				<?php echo $this->escape($this->contact->category_title); ?></a>
+			</span>
+		</h3>
+	<?php endif; ?>
+
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
+	<?php if ($tparams->get('show_contact_list') && count($this->contacts) > 1) : ?>
+		<form action="#" method="get" name="selectForm" id="selectForm">
+			<label for="select_contact"><?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?></label>
+			<?php echo JHtml::_('select.genericlist', $this->contacts, 'select_contact', 'class="inputbox" onchange="document.location.href = this.value"', 'link', 'name', $this->contact->link); ?>
+		</form>
+	<?php endif; ?>
+
+	<?php if ($tparams->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+	<?php endif; ?>
+
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
+	<?php $presentation_style = $tparams->get('presentation_style'); ?>
+	<?php $accordionStarted = false; ?>
+	<?php $tabSetStarted = false; ?>
+
+	<?php if ($this->params->get('show_info', 1)) : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'basic-details')); ?>
+			<?php $accordionStarted = true; ?>
+			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'basic-details')); ?>
+			<?php $tabSetStarted = true; ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic-details', JText::_('COM_CONTACT_DETAILS')); ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>'; ?>
+		<?php endif; ?>
+
+		<?php if ($this->contact->image && $tparams->get('show_image')) : ?>
+			<div class="thumbnail pull-right">
+				<?php echo JHtml::_('image', $this->contact->image, $this->contact->name, array('itemprop' => 'image')); ?>
+			</div>
+		<?php endif; ?>
+
+		<?php if ($this->contact->con_position && $tparams->get('show_position')) : ?>
+			<dl class="contact-position dl-horizontal">
+				<dt><?php echo JText::_('COM_CONTACT_POSITION'); ?>:</dt>
+				<dd itemprop="jobTitle">
+					<?php echo $this->contact->con_position; ?>
+				</dd>
+			</dl>
+		<?php endif; ?>
+
+		<?php echo $this->loadTemplate('address'); ?>
+
+		<?php if ($tparams->get('allow_vcard')) : ?>
+			<?php echo JText::_('COM_CONTACT_DOWNLOAD_INFORMATION_AS'); ?>
+			<a href="<?php echo JRoute::_('index.php?option=com_contact&amp;view=contact&amp;id=' . $this->contact->id . '&amp;format=vcf'); ?>">
+			<?php echo JText::_('COM_CONTACT_VCARD'); ?></a>
+		<?php endif; ?>
+
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php echo JHtml::_('bootstrap.endSlide'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php if ($tparams->get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php if (!$accordionStarted)
+			{
+				echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'display-form'));
+				$accordionStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php if (!$tabSetStarted)
+			{
+				echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'display-form'));
+				$tabSetStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-form', JText::_('COM_CONTACT_EMAIL_FORM')); ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_EMAIL_FORM') . '</h3>'; ?>
+		<?php endif; ?>
+
+		<?php echo $this->loadTemplate('form'); ?>
+
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php echo JHtml::_('bootstrap.endSlide'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php if ($tparams->get('show_links')) : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php if (!$accordionStarted) : ?>
+				<?php echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'display-links')); ?>
+				<?php $accordionStarted = true; ?>
+			<?php endif; ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php if (!$tabSetStarted) : ?>
+				<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'display-links')); ?>
+				<?php $tabSetStarted = true; ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+
+	<?php if ($tparams->get('show_articles') && $this->contact->user_id && $this->contact->articles) : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php if (!$accordionStarted)
+			{
+				echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'display-articles'));
+				$accordionStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php if (!$tabSetStarted)
+			{
+				echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'display-articles'));
+				$tabSetStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-articles', JText::_('JGLOBAL_ARTICLES')); ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
+			<?php echo '<h3>' . JText::_('JGLOBAL_ARTICLES') . '</h3>'; ?>
+		<?php endif; ?>
+
+		<?php echo $this->loadTemplate('articles'); ?>
+
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php echo JHtml::_('bootstrap.endSlide'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php if ($tparams->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php if (!$accordionStarted)
+			{
+				echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'display-profile'));
+				$accordionStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php if (!$tabSetStarted)
+			{
+				echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'display-profile'));
+				$tabSetStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', JText::_('COM_CONTACT_PROFILE')); ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_PROFILE') . '</h3>'; ?>
+		<?php endif; ?>
+
+		<?php echo $this->loadTemplate('profile'); ?>
+
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php echo JHtml::_('bootstrap.endSlide'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php if ($tparams->get('show_user_custom_fields') && $this->contactUser) : ?>
+		<?php echo $this->loadTemplate('user_custom_fields'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->contact->misc && $tparams->get('show_misc')) : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php if (!$accordionStarted)
+			{
+				echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'display-misc'));
+				$accordionStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php if (!$tabSetStarted)
+			{
+				echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'display-misc'));
+				$tabSetStarted = true;
+			}
+			?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-misc', JText::_('COM_CONTACT_OTHER_INFORMATION')); ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
+			<?php echo '<h3>' . JText::_('COM_CONTACT_OTHER_INFORMATION') . '</h3>'; ?>
+		<?php endif; ?>
+
+		<div class="contact-miscinfo">
+			<dl class="dl-horizontal">
+				<dt>
+					<span class="<?php echo $tparams->get('marker_class'); ?>">
+					<?php echo $tparams->get('marker_misc'); ?>
+					</span>
+				</dt>
+				<dd>
+					<span class="contact-misc">
+						<?php echo $this->contact->misc; ?>
+					</span>
+				</dd>
+			</dl>
+		</div>
+
+		<?php if ($presentation_style === 'sliders') : ?>
+			<?php echo JHtml::_('bootstrap.endSlide'); ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php if ($accordionStarted) : ?>
+		<?php echo JHtml::_('bootstrap.endAccordion'); ?>
+	<?php elseif ($tabSetStarted) : ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+	<?php endif; ?>
+
+	<?php echo $this->item->event->afterDisplayContent; ?>
+</div>
diff --git a/core/components/com_contact/views/contact/tmpl/default.xml b/core/components/com_contact/views/contact/tmpl/default.xml
new file mode 100644
index 00000000..27315d4c
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default.xml
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTACT_CONTACT_VIEW_DEFAULT_TITLE" option="COM_CONTACT_CONTACT_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_CONTACT_SINGLE_CONTACT"
+		/>
+		<message>
+			<![CDATA[COM_CONTACT_CONTACT_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_contact/models/fields"
+		>
+			<field 
+				name="id"
+				type="modal_contact"
+				label="COM_CONTACT_SELECT_CONTACT_LABEL"
+				description="COM_CONTACT_SELECT_CONTACT_DESC"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="params"
+			label="COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL"
+			addfieldpath="/administrator/components/com_fields/models/fields"
+		>
+			<field 
+				name="presentation_style"
+				type="list"
+				label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
+				description="COM_CONTACT_FIELD_PRESENTATION_DESC"
+				useglobal="true"
+				>
+				<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
+				<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
+				<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
+			</field>
+
+			<field 
+				name="show_contact_category"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
+				<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
+			</field>
+
+			<field 
+				name="show_contact_list"
+				type="list"
+				label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"
+				description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_name"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_position"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email"
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="add_mailto_link"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_ADD_MAILTO_LINK_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field 
+				name="show_street_address"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_suburb"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_state"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_postcode"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_country"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_telephone"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_mobile"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_fax"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_webpage"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_image"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="allow_vcard"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_articles"
+				type="list"
+				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="articles_display_num" 
+				type="list" 
+				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="75">J75</option>
+				<option value="100">J100</option>
+				<option value="150">J150</option>
+				<option value="200">J200</option>
+				<option value="250">J250</option>
+				<option value="300">J300</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field
+				name="show_user_custom_fields"
+				type="fieldgroups"
+				label="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_USER_CUSTOM_FIELDS_SHOW_DESC"
+				multiple="true"
+				context="com_users.user"
+				>
+				<option value="-1">JALL</option>
+			</field>
+
+			<field 
+				name="show_links"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="linka_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkb_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKB_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkc_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkd_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linke_name"
+				type="text"
+				label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+		</fieldset>
+
+		<!-- Form options. -->
+		<fieldset name="Contact_Form"
+			label="COM_CONTACT_MAIL_FIELDSET_LABEL"
+		>
+
+			<field 
+				name="show_email_form" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_copy"
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="banned_email"
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_subject"
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_text"
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="validate_session"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="custom_reply"
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="redirect"
+				type="text"
+				label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+				size="30"
+				useglobal="true"
+			/>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_contact/views/contact/tmpl/default_address.php b/core/components/com_contact/views/contact/tmpl/default_address.php
new file mode 100644
index 00000000..66a41433
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default_address.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Marker_class: Class based on the selection of text, none, or icons
+ * jicon-text, jicon-none, jicon-icon
+ */
+?>
+<dl class="contact-address dl-horizontal" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+	<?php if (($this->params->get('address_check') > 0) &&
+		($this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode)) : ?>
+		<dt>
+			<span class="<?php echo $this->params->get('marker_class'); ?>">
+				<?php echo $this->params->get('marker_address'); ?>
+			</span>
+		</dt>
+
+		<?php if ($this->contact->address && $this->params->get('show_street_address')) : ?>
+			<dd>
+				<span class="contact-street" itemprop="streetAddress">
+					<?php echo nl2br($this->contact->address); ?>
+					<br />
+				</span>
+			</dd>
+		<?php endif; ?>
+
+		<?php if ($this->contact->suburb && $this->params->get('show_suburb')) : ?>
+			<dd>
+				<span class="contact-suburb" itemprop="addressLocality">
+					<?php echo $this->contact->suburb; ?>
+					<br />
+				</span>
+			</dd>
+		<?php endif; ?>
+		<?php if ($this->contact->state && $this->params->get('show_state')) : ?>
+			<dd>
+				<span class="contact-state" itemprop="addressRegion">
+					<?php echo $this->contact->state; ?>
+					<br />
+				</span>
+			</dd>
+		<?php endif; ?>
+		<?php if ($this->contact->postcode && $this->params->get('show_postcode')) : ?>
+			<dd>
+				<span class="contact-postcode" itemprop="postalCode">
+					<?php echo $this->contact->postcode; ?>
+					<br />
+				</span>
+			</dd>
+		<?php endif; ?>
+		<?php if ($this->contact->country && $this->params->get('show_country')) : ?>
+		<dd>
+			<span class="contact-country" itemprop="addressCountry">
+				<?php echo $this->contact->country; ?>
+				<br />
+			</span>
+		</dd>
+		<?php endif; ?>
+	<?php endif; ?>
+
+<?php if ($this->contact->email_to && $this->params->get('show_email')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" itemprop="email">
+			<?php echo nl2br($this->params->get('marker_email')); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-emailto">
+			<?php echo $this->contact->email_to; ?>
+		</span>
+	</dd>
+<?php endif; ?>
+
+<?php if ($this->contact->telephone && $this->params->get('show_telephone')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>">
+			<?php echo $this->params->get('marker_telephone'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-telephone" itemprop="telephone">
+			<?php echo $this->contact->telephone; ?>
+		</span>
+	</dd>
+<?php endif; ?>
+<?php if ($this->contact->fax && $this->params->get('show_fax')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>">
+			<?php echo $this->params->get('marker_fax'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-fax" itemprop="faxNumber">
+		<?php echo $this->contact->fax; ?>
+		</span>
+	</dd>
+<?php endif; ?>
+<?php if ($this->contact->mobile && $this->params->get('show_mobile')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>">
+			<?php echo $this->params->get('marker_mobile'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-mobile" itemprop="telephone">
+			<?php echo $this->contact->mobile; ?>
+		</span>
+	</dd>
+<?php endif; ?>
+<?php if ($this->contact->webpage && $this->params->get('show_webpage')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>">
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-webpage">
+			<a href="<?php echo $this->contact->webpage; ?>" target="_blank" rel="noopener noreferrer" itemprop="url">
+			<?php echo JStringPunycode::urlToUTF8($this->contact->webpage); ?></a>
+		</span>
+	</dd>
+<?php endif; ?>
+</dl>
diff --git a/core/components/com_contact/views/contact/tmpl/default_articles.php b/core/components/com_contact/views/contact/tmpl/default_articles.php
new file mode 100644
index 00000000..20d6e678
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default_articles.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+?>
+<?php if ($this->params->get('show_articles')) : ?>
+<div class="contact-articles">
+	<ul class="nav nav-tabs nav-stacked">
+		<?php foreach ($this->item->articles as $article) : ?>
+			<li>
+				<?php echo JHtml::_('link', JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)), htmlspecialchars($article->title, ENT_COMPAT, 'UTF-8')); ?>
+			</li>
+		<?php endforeach; ?>
+	</ul>
+</div>
+<?php endif; ?>
diff --git a/core/components/com_contact/views/contact/tmpl/default_form.php b/core/components/com_contact/views/contact/tmpl/default_form.php
new file mode 100644
index 00000000..59497509
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default_form.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="contact-form">
+	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<?php if ($fieldset->name === 'captcha' && !$this->captchaEnabled) : ?>
+				<?php continue; ?>
+			<?php endif; ?>
+			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
+			<?php if (count($fields)) : ?>
+				<fieldset>
+					<?php if (isset($fieldset->label) && ($legend = trim(JText::_($fieldset->label))) !== '') : ?>
+						<legend><?php echo $legend; ?></legend>
+					<?php endif; ?>
+					<?php foreach ($fields as $field) : ?>
+						<?php echo $field->renderField(); ?>
+					<?php endforeach; ?>
+				</fieldset>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button class="btn btn-primary validate" type="submit"><?php echo JText::_('COM_CONTACT_CONTACT_SEND'); ?></button>
+				<input type="hidden" name="option" value="com_contact" />
+				<input type="hidden" name="task" value="contact.submit" />
+				<input type="hidden" name="return" value="<?php echo $this->return_page; ?>" />
+				<input type="hidden" name="id" value="<?php echo $this->contact->slug; ?>" />
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/core/components/com_contact/views/contact/tmpl/default_links.php b/core/components/com_contact/views/contact/tmpl/default_links.php
new file mode 100644
index 00000000..a757434f
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default_links.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
+	<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
+<?php endif; ?>
+<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-links', JText::_('COM_CONTACT_LINKS')); ?>
+<?php endif; ?>
+<?php if ($this->params->get('presentation_style') === 'plain') : ?>
+	<?php echo '<h3>' . JText::_('COM_CONTACT_LINKS') . '</h3>'; ?>
+<?php endif; ?>
+
+<div class="contact-links">
+	<ul class="nav nav-tabs nav-stacked">
+		<?php
+		// Letters 'a' to 'e'
+		foreach (range('a', 'e') as $char) :
+			$link = $this->contact->params->get('link' . $char);
+			$label = $this->contact->params->get('link' . $char . '_name');
+
+			if (!$link) :
+				continue;
+			endif;
+
+			// Add 'http://' if not present
+			$link = (0 === strpos($link, 'http')) ? $link : 'http://' . $link;
+
+			// If no label is present, take the link
+			$label = $label ?: $link;
+			?>
+			<li>
+				<a href="<?php echo $link; ?>" itemprop="url">
+					<?php echo $label; ?>
+				</a>
+			</li>
+		<?php endforeach; ?>
+	</ul>
+</div>
+
+<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
+	<?php echo JHtml::_('bootstrap.endSlide'); ?>
+<?php endif; ?>
+<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+<?php endif; ?>
diff --git a/core/components/com_contact/views/contact/tmpl/default_profile.php b/core/components/com_contact/views/contact/tmpl/default_profile.php
new file mode 100644
index 00000000..b67c4607
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default_profile.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (JPluginHelper::isEnabled('user', 'profile')) :
+	$fields = $this->item->profile->getFieldset('profile'); ?>
+	<div class="contact-profile" id="users-profile-custom">
+		<dl class="dl-horizontal">
+			<?php foreach ($fields as $profile) :
+				if ($profile->value) :
+					echo '<dt>' . $profile->label . '</dt>';
+					$profile->text = htmlspecialchars($profile->value, ENT_COMPAT, 'UTF-8');
+
+					switch ($profile->id) :
+						case 'profile_website':
+							$v_http = substr($profile->value, 0, 4);
+
+							if ($v_http === 'http') :
+								echo '<dd><a href="' . $profile->text . '">' . JStringPunycode::urlToUTF8($profile->text) . '</a></dd>';
+							else :
+								echo '<dd><a href="http://' . $profile->text . '">' . JStringPunycode::urlToUTF8($profile->text) . '</a></dd>';
+							endif;
+							break;
+
+						case 'profile_dob':
+							echo '<dd>' . JHtml::_('date', $profile->text, JText::_('DATE_FORMAT_LC4'), false) . '</dd>';
+						break;
+
+						default:
+							echo '<dd>' . $profile->text . '</dd>';
+							break;
+					endswitch;
+				endif;
+			endforeach; ?>
+		</dl>
+	</div>
+<?php endif; ?>
diff --git a/core/components/com_contact/views/contact/tmpl/default_user_custom_fields.php b/core/components/com_contact/views/contact/tmpl/default_user_custom_fields.php
new file mode 100644
index 00000000..eb7b4aa0
--- /dev/null
+++ b/core/components/com_contact/views/contact/tmpl/default_user_custom_fields.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$params             = $this->item->params;
+$presentation_style = $params->get('presentation_style');
+
+$displayGroups      = $params->get('show_user_custom_fields');
+$userFieldGroups    = array();
+?>
+
+<?php if (!$displayGroups || !$this->contactUser) : ?>
+	<?php return; ?>
+<?php endif; ?>
+
+<?php foreach ($this->contactUser->jcfields as $field) : ?>
+	<?php if (!in_array('-1', $displayGroups) && (!$field->group_id || !in_array($field->group_id, $displayGroups))) : ?>
+		<?php continue; ?>
+	<?php endif; ?>
+	<?php if (!key_exists($field->group_title, $userFieldGroups)) : ?>
+		<?php $userFieldGroups[$field->group_title] = array(); ?>
+	<?php endif; ?>
+	<?php $userFieldGroups[$field->group_title][] = $field; ?>
+<?php endforeach; ?>
+
+<?php foreach ($userFieldGroups as $groupTitle => $fields) : ?>
+	<?php $id = JApplicationHelper::stringURLSafe($groupTitle); ?>
+	<?php if ($presentation_style == 'sliders') : ?>
+		<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+	<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-' . $id, $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')); ?>
+	<?php elseif ($presentation_style == 'plain') : ?>
+		<?php echo '<h3>' . ($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
+	<?php endif; ?>
+
+	<div class="contact-profile" id="user-custom-fields-<?php echo $id; ?>">
+		<dl class="dl-horizontal">
+		<?php foreach ($fields as $field) : ?>
+			<?php if (!$field->value) : ?>
+				<?php continue; ?>
+			<?php endif; ?>
+
+			<?php if ($field->params->get('showlabel')) : ?>
+				<?php echo '<dt>' . JText::_($field->label) . '</dt>'; ?>
+			<?php endif; ?>
+
+			<?php echo '<dd>' . $field->value . '</dd>'; ?>
+		<?php endforeach; ?>
+		</dl>
+	</div>
+
+	<?php if ($presentation_style == 'sliders') : ?>
+		<?php echo JHtml::_('bootstrap.endSlide'); ?>
+	<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php endif; ?>
+<?php endforeach; ?>
diff --git a/core/components/com_contact/views/contact/view.html.php b/core/components/com_contact/views/contact/view.html.php
new file mode 100644
index 00000000..eeb64f1f
--- /dev/null
+++ b/core/components/com_contact/views/contact/view.html.php
@@ -0,0 +1,496 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML Contact View class for the Contact component
+ *
+ * @since  1.5
+ */
+class ContactViewContact extends JViewLegacy
+{
+	/**
+	 * The item model state
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  1.6
+	 */
+	protected $state;
+
+	/**
+	 * The form object for the contact item
+	 *
+	 * @var    JForm
+	 * @since  1.6
+	 */
+	protected $form;
+
+	/**
+	 * The item object details
+	 *
+	 * @var    JObject
+	 * @since  1.6
+	 */
+	protected $item;
+
+	/**
+	 * The page to return to on sumission
+	 *
+	 * @var         string
+	 * @since       1.6
+	 * @deprecated  4.0  Variable not used
+	 */
+	protected $return_page;
+
+	/**
+	 * Should we show a captcha form for the submission of the contact request?
+	 *
+	 * @var   bool
+	 * @since 3.6.3
+	 */
+	protected $captchaEnabled = false;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		$item = $this->get('Item');
+		$state = $this->get('State');
+
+		// Get submitted values
+		$data = $app->getUserState('com_contact.contact.data', array());
+
+		// Add catid for selecting custom fields
+		$data['catid'] = $item->catid;
+
+		$app->setUserState('com_contact.contact.data', $data);
+
+		$this->form = $this->get('Form');
+
+		$params = $state->get('params');
+
+		$temp = clone $params;
+
+		$active = $app->getMenu()->getActive();
+
+		if ($active)
+		{
+			// If the current view is the active item and a contact view for this contact, then the menu item params take priority
+			if (strpos($active->link, 'view=contact') && strpos($active->link, '&id=' . (int) $item->id))
+			{
+				// $item->params are the contact params, $temp are the menu item params
+				// Merge so that the menu item params take priority
+				$item->params->merge($temp);
+			}
+			else
+			{
+				// Current view is not a single contact, so the contact params take priority here
+				// Merge the menu item params with the contact params so that the contact params take priority
+				$temp->merge($item->params);
+				$item->params = $temp;
+			}
+		}
+		else
+		{
+			// Merge so that contact params take priority
+			$temp->merge($item->params);
+			$item->params = $temp;
+		}
+
+		if ($item)
+		{
+			// Get Category Model data
+			$categoryModel = JModelLegacy::getInstance('Category', 'ContactModel', array('ignore_request' => true));
+
+			$categoryModel->setState('category.id', $item->catid);
+			$categoryModel->setState('list.ordering', 'a.name');
+			$categoryModel->setState('list.direction', 'asc');
+			$categoryModel->setState('filter.published', 1);
+
+			$contacts = $categoryModel->getItems();
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Check if access is not public
+		$groups = $user->getAuthorisedViewLevels();
+
+		$return = '';
+
+		if ((!in_array($item->access, $groups)) || (!in_array($item->category_access, $groups)))
+		{
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->setHeader('status', 403, true);
+
+			return false;
+		}
+
+		$options['category_id'] = $item->catid;
+		$options['order by']    = 'a.default_con DESC, a.ordering ASC';
+
+		/**
+		 * Handle email cloaking
+		 *
+		 * Keep a copy of the raw email address so it can
+		 * still be accessed in the layout if needed.
+		 */
+		$item->email_raw = $item->email_to;
+
+		if ($item->email_to && $item->params->get('show_email'))
+		{
+			$item->email_to = JHtml::_('email.cloak', $item->email_to, (bool) $item->params->get('add_mailto_link', true));
+		}
+
+		if ($item->params->get('show_street_address') || $item->params->get('show_suburb') || $item->params->get('show_state')
+			|| $item->params->get('show_postcode') || $item->params->get('show_country'))
+		{
+			if (!empty($item->address) || !empty($item->suburb) || !empty($item->state) || !empty($item->country) || !empty($item->postcode))
+			{
+				$item->params->set('address_check', 1);
+			}
+		}
+		else
+		{
+			$item->params->set('address_check', 0);
+		}
+
+		// Manage the display mode for contact detail groups
+		switch ($item->params->get('contact_icons'))
+		{
+			case 1 :
+				// Text
+				$item->params->set('marker_address',   JText::_('COM_CONTACT_ADDRESS') . ': ');
+				$item->params->set('marker_email',     JText::_('JGLOBAL_EMAIL') . ': ');
+				$item->params->set('marker_telephone', JText::_('COM_CONTACT_TELEPHONE') . ': ');
+				$item->params->set('marker_fax',       JText::_('COM_CONTACT_FAX') . ': ');
+				$item->params->set('marker_mobile',    JText::_('COM_CONTACT_MOBILE') . ': ');
+				$item->params->set('marker_misc',      JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ');
+				$item->params->set('marker_class',     'jicons-text');
+				break;
+
+			case 2 :
+				// None
+				$item->params->set('marker_address',   '');
+				$item->params->set('marker_email',     '');
+				$item->params->set('marker_telephone', '');
+				$item->params->set('marker_mobile',    '');
+				$item->params->set('marker_fax',       '');
+				$item->params->set('marker_misc',      '');
+				$item->params->set('marker_class',     'jicons-none');
+				break;
+
+			default :
+				if ($item->params->get('icon_address'))
+				{
+					$image1 = JHtml::_('image', $item->params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ': ', null, false);
+				}
+				else
+				{
+					$image1 = JHtml::_(
+						'image', 'contacts/' . $item->params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ': ', null, true
+					);
+				}
+
+				if ($item->params->get('icon_email'))
+				{
+					$image2 = JHtml::_('image', $item->params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ': ', null, false);
+				}
+				else
+				{
+					$image2 = JHtml::_('image', 'contacts/' . $item->params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ': ', null, true);
+				}
+
+				if ($item->params->get('icon_telephone'))
+				{
+					$image3 = JHtml::_('image', $item->params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ': ', null, false);
+				}
+				else
+				{
+					$image3 = JHtml::_(
+						'image', 'contacts/' . $item->params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ': ', null, true
+					);
+				}
+
+				if ($item->params->get('icon_fax'))
+				{
+					$image4 = JHtml::_('image', $item->params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ': ', null, false);
+				}
+				else
+				{
+					$image4 = JHtml::_('image', 'contacts/' . $item->params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ': ', null, true);
+				}
+
+				if ($item->params->get('icon_misc'))
+				{
+					$image5 = JHtml::_('image', $item->params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ', null, false);
+				}
+				else
+				{
+					$image5 = JHtml::_(
+						'image',
+						'contacts/' . $item->params->get('icon_misc', 'con_info.png'),
+						JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ', null, true
+					);
+				}
+
+				if ($item->params->get('icon_mobile'))
+				{
+					$image6 = JHtml::_('image', $item->params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ': ', null, false);
+				}
+				else
+				{
+					$image6 = JHtml::_(
+						'image', 'contacts/' . $item->params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ': ', null, true
+					);
+				}
+
+				$item->params->set('marker_address',   $image1);
+				$item->params->set('marker_email',     $image2);
+				$item->params->set('marker_telephone', $image3);
+				$item->params->set('marker_fax',       $image4);
+				$item->params->set('marker_misc',      $image5);
+				$item->params->set('marker_mobile',    $image6);
+				$item->params->set('marker_class',     'jicons-icons');
+				break;
+		}
+
+		// Add links to contacts
+		if ($item->params->get('show_contact_list') && count($contacts) > 1)
+		{
+			foreach ($contacts as &$contact)
+			{
+				$contact->link = JRoute::_(ContactHelperRoute::getContactRoute($contact->slug, $contact->catid), false);
+			}
+
+			$item->link = JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid), false);
+		}
+
+		// Process the content plugins
+		JPluginHelper::importPlugin('content');
+
+		$dispatcher	= JEventDispatcher::getInstance();
+
+		$offset = $state->get('list.offset');
+
+		// Fix for where some plugins require a text attribute
+		$item->text = null;
+
+		if (!empty($item->misc))
+		{
+			$item->text = $item->misc;
+		}
+
+		$dispatcher->trigger('onContentPrepare', array('com_contact.contact', &$item, &$item->params, $offset));
+
+		// Store the events for later
+		$item->event = new stdClass;
+
+		$results = $dispatcher->trigger('onContentAfterTitle', array('com_contact.contact', &$item, &$item->params, $offset));
+		$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_contact.contact', &$item, &$item->params, $offset));
+		$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentAfterDisplay', array('com_contact.contact', &$item, &$item->params, $offset));
+		$item->event->afterDisplayContent = trim(implode("\n", $results));
+
+		if (!empty($item->text))
+		{
+			$item->misc = $item->text;
+		}
+
+		$contactUser = null;
+
+		if ($item->params->get('show_user_custom_fields') && $item->user_id && $contactUser = JFactory::getUser($item->user_id))
+		{
+			$contactUser->text = '';
+
+			JEventDispatcher::getInstance()->trigger('onContentPrepare', array ('com_users.user', &$contactUser, &$item->params, 0));
+
+			if (!isset($contactUser->jcfields))
+			{
+				$contactUser->jcfields = array();
+			}
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($item->params->get('pageclass_sfx'));
+
+		$this->contact     = &$item;
+		$this->params      = &$item->params;
+		$this->return      = &$return;
+		$this->state       = &$state;
+		$this->item        = &$item;
+		$this->user        = &$user;
+		$this->contacts    = &$contacts;
+		$this->contactUser = $contactUser;
+
+		$item->tags = new JHelperTags;
+		$item->tags->getItemTags('com_contact.contact', $this->item->id);
+
+		// Override the layout only if this is not the active menu item
+		// If it is the active menu item, then the view and item id will match
+		if ((!$active) || ((strpos($active->link, 'view=contact') === false) || (strpos($active->link, '&id=' . (string) $this->item->id) === false)))
+		{
+			if (($layout = $item->params->get('contact_layout')))
+			{
+				$this->setLayout($layout);
+			}
+		}
+		elseif (isset($active->query['layout']))
+		{
+			// We need to set the layout in case this is an alternative menu item (with an alternative layout)
+			$this->setLayout($active->query['layout']);
+		}
+
+		$model = $this->getModel();
+		$model->hit();
+
+		$captchaSet = $item->params->get('captcha', JFactory::getApplication()->get('captcha', '0'));
+
+		foreach (JPluginHelper::getPlugin('captcha') as $plugin)
+		{
+			if ($captchaSet === $plugin->name)
+			{
+				$this->captchaEnabled = true;
+				break;
+			}
+		}
+
+		$this->_prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function _prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_CONTACT_DEFAULT_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		$id = (int) @$menu->query['id'];
+
+		// If the menu item does not concern this contact
+		if ($menu && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] !== 'contact' || $id != $this->item->id))
+		{
+			// If this is not a single contact menu item, set the page title to the contact title
+			if ($this->item->name)
+			{
+				$title = $this->item->name;
+			}
+
+			$path = array(array('title' => $this->contact->name, 'link' => ''));
+			$category = JCategories::getInstance('Contact')->get($this->contact->catid);
+
+			while ($category && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($this->contact->catid));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		if (empty($title))
+		{
+			$title = $this->item->name;
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->item->metadesc)
+		{
+			$this->document->setDescription($this->item->metadesc);
+		}
+		elseif ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->item->metakey)
+		{
+			$this->document->setMetadata('keywords', $this->item->metakey);
+		}
+		elseif ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		$mdata = $this->item->metadata->toArray();
+
+		foreach ($mdata as $k => $v)
+		{
+			if ($v)
+			{
+				$this->document->setMetadata($k, $v);
+			}
+		}
+	}
+}
diff --git a/core/components/com_contact/views/contact/view.vcf.php b/core/components/com_contact/views/contact/view.vcf.php
new file mode 100644
index 00000000..f34cb396
--- /dev/null
+++ b/core/components/com_contact/views/contact/view.vcf.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View to create a VCF for a contact item
+ *
+ * @since  1.6
+ */
+class ContactViewContact extends JViewLegacy
+{
+	/**
+	 * The item model state
+	 *
+	 * @var         \Joomla\Registry\Registry
+	 * @deprecated  4.0  Variable not used
+	 */
+	protected $state;
+
+	/**
+	 * The contact item
+	 *
+	 * @var   JObject
+	 */
+	protected $item;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		// Get model data.
+		$item = $this->get('Item');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		JFactory::getDocument()->setMimeEncoding('text/directory', true);
+
+		// Compute lastname, firstname and middlename
+		$item->name = trim($item->name);
+
+		// "Lastname, Firstname Midlename" format support
+		// e.g. "de Gaulle, Charles"
+		$namearray = explode(',', $item->name);
+
+		if (count($namearray) > 1)
+		{
+			$lastname = $namearray[0];
+			$card_name = $lastname;
+			$name_and_midname = trim($namearray[1]);
+
+			$firstname = '';
+
+			if (!empty($name_and_midname))
+			{
+				$namearray = explode(' ', $name_and_midname);
+
+				$firstname = $namearray[0];
+				$middlename = (count($namearray) > 1) ? $namearray[1] : '';
+				$card_name = $firstname . ' ' . ($middlename ? $middlename . ' ' : '') . $card_name;
+			}
+		}
+		// "Firstname Middlename Lastname" format support
+		else
+		{
+			$namearray = explode(' ', $item->name);
+
+			$middlename = (count($namearray) > 2) ? $namearray[1] : '';
+			$firstname = array_shift($namearray);
+			$lastname = count($namearray) ? end($namearray) : '';
+			$card_name = $firstname . ($middlename ? ' ' . $middlename : '') . ($lastname ? ' ' . $lastname : '');
+		}
+
+		$rev = date('c', strtotime($item->modified));
+
+		JFactory::getApplication()->setHeader('Content-disposition', 'attachment; filename="' . $card_name . '.vcf"', true);
+
+		$vcard = array();
+		$vcard[] .= 'BEGIN:VCARD';
+		$vcard[] .= 'VERSION:3.0';
+		$vcard[]  = 'N:' . $lastname . ';' . $firstname . ';' . $middlename;
+		$vcard[]  = 'FN:' . $item->name;
+		$vcard[]  = 'TITLE:' . $item->con_position;
+		$vcard[]  = 'TEL;TYPE=WORK,VOICE:' . $item->telephone;
+		$vcard[]  = 'TEL;TYPE=WORK,FAX:' . $item->fax;
+		$vcard[]  = 'TEL;TYPE=WORK,MOBILE:' . $item->mobile;
+		$vcard[]  = 'ADR;TYPE=WORK:;;' . $item->address . ';' . $item->suburb . ';' . $item->state . ';' . $item->postcode . ';' . $item->country;
+		$vcard[]  = 'LABEL;TYPE=WORK:' . $item->address . "\n" . $item->suburb . "\n" . $item->state . "\n" . $item->postcode . "\n" . $item->country;
+		$vcard[]  = 'EMAIL;TYPE=PREF,INTERNET:' . $item->email_to;
+		$vcard[]  = 'URL:' . $item->webpage;
+		$vcard[]  = 'REV:' . $rev . 'Z';
+		$vcard[]  = 'END:VCARD';
+
+		echo implode("\n", $vcard);
+	}
+}
diff --git a/core/components/com_contact/views/featured/tmpl/default.php b/core/components/com_contact/views/featured/tmpl/default.php
new file mode 100644
index 00000000..786be2a6
--- /dev/null
+++ b/core/components/com_contact/views/featured/tmpl/default.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+// If the page class is defined, add to class as suffix.
+// It will be a separate class if the user starts it with a space
+?>
+<div class="blog-featured<?php echo $this->pageclass_sfx; ?>">
+<?php if ($this->params->get('show_page_heading') != 0 ) : ?>
+	<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>
+<?php endif; ?>
+
+<?php echo $this->loadTemplate('items'); ?>
+
+<?php if ($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?>
+	<div class="pagination">
+
+		<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+			<p class="counter">
+				<?php echo $this->pagination->getPagesCounter(); ?>
+			</p>
+		<?php endif; ?>
+
+		<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+<?php endif; ?>
+</div>
diff --git a/core/components/com_contact/views/featured/tmpl/default.xml b/core/components/com_contact/views/featured/tmpl/default.xml
new file mode 100644
index 00000000..e8b64a58
--- /dev/null
+++ b/core/components/com_contact/views/featured/tmpl/default.xml
@@ -0,0 +1,579 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<metadata>
+	<layout title="com_contact_featured_view_default_title" option="com_contact_featured_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_CONTACT_FEATURED"
+		/>
+		<message>
+			<![CDATA[COM_CONTACT_FEATURED_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+
+
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+	<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+
+			<field 
+				name="spacer" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_headings" 
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		<field 
+			name="show_position_headings" 
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_POSITION_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_email_headings" 
+			type="list"
+			label="JGLOBAL_EMAIL"
+			description="COM_CONTACT_FIELD_CONFIG_EMAIL_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_telephone_headings"
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_PHONE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_mobile_headings"
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_fax_headings"
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_FAX_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_suburb_headings" 
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_SUBURB_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_state_headings"
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_STATE_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_country_headings"
+			type="list"
+			label="COM_CONTACT_FIELD_CONFIG_COUNTRY_LABEL"
+			description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_pagination" 
+			type="list"
+			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="2">JGLOBAL_AUTO</option>
+		</field>
+
+		<field
+			name="show_pagination_results"
+			type="list"
+			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset name="contact" label="COM_CONTACT_FIELDSET_CONTACT_LABEL">
+
+			<field 
+				name="presentation_style" 
+				type="list"
+				label="COM_CONTACT_FIELD_PRESENTATION_LABEL"
+				description="COM_CONTACT_FIELD_PRESENTATION_DESC"
+				useglobal="true"
+				>
+				<option value="sliders">COM_CONTACT_FIELD_VALUE_SLIDERS</option>
+				<option value="tabs">COM_CONTACT_FIELD_VALUE_TABS</option>
+				<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
+			</field>
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_name" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_position" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+
+			</field>
+
+			<field 
+				name="show_email" 
+				type="list"
+				label="JGLOBAL_EMAIL"
+				description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_street_address" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_suburb" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_state" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_postcode" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_country" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_COUNTRY_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_telephone" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_mobile" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_fax" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_FAX_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_webpage" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_image" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
+				useglobal="true"
+				showon="show_info:1"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="allow_vcard" 
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_VCARD_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_articles" 
+				type="list"
+				label="COM_CONTACT_FIELD_ARTICLES_SHOW_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="articles_display_num" 
+				type="list" 
+				label="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_LABEL"
+				description="COM_CONTACT_FIELD_ARTICLES_DISPLAY_NUM_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="use_contact">COM_CONTACT_FIELD_VALUE_USE_CONTACT_SETTINGS</option>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="75">J75</option>
+				<option value="100">J100</option>
+				<option value="150">J150</option>
+				<option value="200">J200</option>
+				<option value="250">J250</option>
+				<option value="300">J300</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field 
+				name="show_links" 
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="linka_name" 
+				type="text"
+				label="COM_CONTACT_FIELD_LINKA_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkb_name" 
+				type="text"
+				label="COM_CONTACT_FIELD_LINKB_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkc_name" 
+				type="text"
+				label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linkd_name" 
+				type="text"
+				label="COM_CONTACT_FIELD_LINKD_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+
+			<field 
+				name="linke_name" 
+				type="text"
+				label="COM_CONTACT_FIELD_LINKE_NAME_LABEL"
+				description="COM_CONTACT_FIELD_LINK_NAME_DESC"
+				size="30"
+				useglobal="true"
+			/>
+	</fieldset>
+
+	<fieldset name="Contact_Form" label="COM_CONTACT_FIELDSET_CONTACTFORM_LABEL">
+
+			<field 
+				name="show_email_form" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_copy" 
+				type="list"
+				label="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL"
+				description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="banned_email" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_subject" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="banned_text" 
+				type="textarea"
+				label="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC"
+				cols="30"
+				rows="3"
+			/>
+
+			<field 
+				name="validate_session" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="custom_reply" 
+				type="list"
+				label="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="redirect"
+				type="text"
+				label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
+				description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
+				size="30"
+				useglobal="true"
+			/>
+	</fieldset>
+
+</fields>
+</metadata>
diff --git a/core/components/com_contact/views/featured/tmpl/default_items.php b/core/components/com_contact/views/featured/tmpl/default_items.php
new file mode 100644
index 00000000..73201c9d
--- /dev/null
+++ b/core/components/com_contact/views/featured/tmpl/default_items.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::_('behavior.core');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+// Create a shortcut for params.
+$params = &$this->item->params;
+?>
+
+<?php if (empty($this->items)) : ?>
+	<p> <?php echo JText::_('COM_CONTACT_NO_CONTACTS'); ?>	 </p>
+<?php else : ?>
+
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+	<fieldset class="filters">
+	<legend class="hidelabeltxt"><?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?></legend>
+	<?php if ($this->params->get('show_pagination_limit')) : ?>
+		<div class="display-limit">
+			<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	</fieldset>
+
+	<table class="category">
+		<?php if ($this->params->get('show_headings')) : ?>
+		<thead><tr>
+			<th class="item-num">
+				<?php echo JText::_('JGLOBAL_NUM'); ?>
+			</th>
+			<th class="item-title">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_CONTACT_EMAIL_NAME_LABEL', 'a.name', $listDirn, $listOrder); ?>
+			</th>
+			<?php if ($this->params->get('show_position_headings')) : ?>
+			<th class="item-position">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_POSITION', 'a.con_position', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_email_headings')) : ?>
+			<th class="item-email">
+				<?php echo JText::_('JGLOBAL_EMAIL'); ?>
+			</th>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_telephone_headings')) : ?>
+			<th class="item-phone">
+				<?php echo JText::_('COM_CONTACT_TELEPHONE'); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_mobile_headings')) : ?>
+			<th class="item-phone">
+				<?php echo JText::_('COM_CONTACT_MOBILE'); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_fax_headings')) : ?>
+			<th class="item-phone">
+				<?php echo JText::_('COM_CONTACT_FAX'); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_suburb_headings')) : ?>
+			<th class="item-suburb">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_SUBURB', 'a.suburb', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_state_headings')) : ?>
+			<th class="item-state">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_STATE', 'a.state', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_country_headings')) : ?>
+			<th class="item-state">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_COUNTRY', 'a.country', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+
+			</tr>
+		</thead>
+		<?php endif; ?>
+
+		<tbody>
+			<?php foreach ($this->items as $i => $item) : ?>
+				<tr class="<?php echo ($i % 2) ? 'odd' : 'even'; ?>" itemscope itemtype="https://schema.org/Person">
+					<td class="item-num">
+						<?php echo $i; ?>
+					</td>
+
+					<td class="item-title">
+						<?php if ($this->items[$i]->published == 0) : ?>
+							<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+						<?php endif; ?>
+						<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>" itemprop="url">
+							<span itemprop="name"><?php echo $item->name; ?></span>
+						</a>
+					</td>
+
+					<?php if ($this->params->get('show_position_headings')) : ?>
+						<td class="item-position" itemprop="jobTitle">
+							<?php echo $item->con_position; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_email_headings')) : ?>
+						<td class="item-email" itemprop="email">
+							<?php echo $item->email_to; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_telephone_headings')) : ?>
+						<td class="item-phone" itemprop="telephone">
+							<?php echo $item->telephone; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_mobile_headings')) : ?>
+						<td class="item-phone" itemprop="telephone">
+							<?php echo $item->mobile; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_fax_headings')) : ?>
+						<td class="item-phone" itemprop="faxNumber">
+							<?php echo $item->fax; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_suburb_headings')) : ?>
+						<td class="item-suburb" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+							<span itemprop="addressLocality"><?php echo $item->suburb; ?></span>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_state_headings')) : ?>
+						<td class="item-state" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+							<span itemprop="addressRegion"><?php echo $item->state; ?></span>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_country_headings')) : ?>
+						<td class="item-state" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
+							<span itemprop="addressCountry"><?php echo $item->country; ?></span>
+						</td>
+					<?php endif; ?>
+				</tr>
+			<?php endforeach; ?>
+
+		</tbody>
+	</table>
+
+</form>
+<?php endif; ?>
diff --git a/core/components/com_contact/views/featured/view.html.php b/core/components/com_contact/views/featured/view.html.php
new file mode 100644
index 00000000..33903ddf
--- /dev/null
+++ b/core/components/com_contact/views/featured/view.html.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Featured View class
+ *
+ * @since  1.6
+ */
+class ContactViewFeatured extends JViewLegacy
+{
+	/**
+	 * The item model state
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  1.6.0
+	 */
+	protected $state;
+
+	/**
+	 * The item details
+	 *
+	 * @var    JObject
+	 * @since  1.6.0
+	 */
+	protected $items;
+
+	/**
+	 * Who knows what this variable was intended for - but it's never been used
+	 *
+	 * @var         array
+	 * @since       1.6.0
+	 * @deprecated  4.0  This variable has been null since 1.6.0-beta8
+	 */
+	protected $category;
+
+	/**
+	 * Who knows what this variable was intended for - but it's never been used
+	 *
+	 * @var         JObject  Maybe.
+	 * @since       1.6.0
+	 * @deprecated  4.0  This variable has never been used ever
+	 */
+	protected $categories;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 * @since  1.6.0
+	 */
+	protected $pagination;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  Exception on failure, void on success.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
+
+		// Get some data from the models
+		$state      = $this->get('State');
+		$items      = $this->get('Items');
+		$category   = $this->get('Category');
+		$children   = $this->get('Children');
+		$parent     = $this->get('Parent');
+		$pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Prepare the data.
+		// Compute the contact slug.
+		for ($i = 0, $n = count($items); $i < $n; $i++)
+		{
+			$item       = &$items[$i];
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$temp       = $item->params;
+			$item->params = clone $params;
+			$item->params->merge($temp);
+
+			if ($item->params->get('show_email', 0) == 1)
+			{
+				$item->email_to = trim($item->email_to);
+
+				if (!empty($item->email_to) && JMailHelper::isEmailAddress($item->email_to))
+				{
+					$item->email_to = JHtml::_('email.cloak', $item->email_to);
+				}
+				else
+				{
+					$item->email_to = '';
+				}
+			}
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$maxLevel         = $params->get('maxLevel', -1);
+		$this->maxLevel   = &$maxLevel;
+		$this->state      = &$state;
+		$this->items      = &$items;
+		$this->category   = &$category;
+		$this->children   = &$children;
+		$this->params     = &$params;
+		$this->parent     = &$parent;
+		$this->pagination = &$pagination;
+
+		$this->_prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function _prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_CONTACT_DEFAULT_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_content/content.php b/core/components/com_content/content.php
new file mode 100644
index 00000000..187de0a8
--- /dev/null
+++ b/core/components/com_content/content.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+JLoader::register('ContentHelperQuery', JPATH_SITE . '/components/com_content/helpers/query.php');
+JLoader::register('ContentHelperAssociation', JPATH_SITE . '/components/com_content/helpers/association.php');
+
+$input = JFactory::getApplication()->input;
+$user  = JFactory::getUser();
+
+$checkCreateEdit = ($input->get('view') === 'articles' && $input->get('layout') === 'modal')
+	|| ($input->get('view') === 'article' && $input->get('layout') === 'pagebreak');
+
+if ($checkCreateEdit)
+{
+	// Can create in any category (component permission) or at least in one category
+	$canCreateRecords = $user->authorise('core.create', 'com_content')
+		|| count($user->getAuthorisedCategories('com_content', 'core.create')) > 0;
+
+	// Instead of checking edit on all records, we can use **same** check as the form editing view
+	$values = (array) JFactory::getApplication()->getUserState('com_content.edit.article.id');
+	$isEditingRecords = count($values);
+
+	$hasAccess = $canCreateRecords || $isEditingRecords;
+
+	if (!$hasAccess)
+	{
+		JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+
+		return;
+	}
+}
+
+$controller = JControllerLegacy::getInstance('Content');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_content/controller.php b/core/components/com_content/controller.php
new file mode 100644
index 00000000..71480a76
--- /dev/null
+++ b/core/components/com_content/controller.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Controller
+ *
+ * @since  1.5
+ */
+class ContentController extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   12.2
+	 */
+	public function __construct($config = array())
+	{
+		$this->input = JFactory::getApplication()->input;
+
+		// Article frontpage Editor pagebreak proxying:
+		if ($this->input->get('view') === 'article' && $this->input->get('layout') === 'pagebreak')
+		{
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+		// Article frontpage Editor article proxying:
+		elseif ($this->input->get('view') === 'articles' && $this->input->get('layout') === 'modal')
+		{
+			JHtml::_('stylesheet', 'system/adminlist.css', array('version' => 'auto', 'relative' => true));
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$cachable = true;
+
+		/**
+		 * Set the default view name and format from the Request.
+		 * Note we are using a_id to avoid collisions with the router and the return page.
+		 * Frontend is a bit messier than the backend.
+		 */
+		$id    = $this->input->getInt('a_id');
+		$vName = $this->input->getCmd('view', 'categories');
+		$this->input->set('view', $vName);
+
+		$user = JFactory::getUser();
+
+		if ($user->get('id')
+			|| ($this->input->getMethod() === 'POST'
+			&& (($vName === 'category' && $this->input->get('layout') !== 'blog') || $vName === 'archive' )))
+		{
+			$cachable = false;
+		}
+
+		$safeurlparams = array(
+			'catid' => 'INT',
+			'id' => 'INT',
+			'cid' => 'ARRAY',
+			'year' => 'INT',
+			'month' => 'INT',
+			'limit' => 'UINT',
+			'limitstart' => 'UINT',
+			'showall' => 'INT',
+			'return' => 'BASE64',
+			'filter' => 'STRING',
+			'filter_order' => 'CMD',
+			'filter_order_Dir' => 'CMD',
+			'filter-search' => 'STRING',
+			'print' => 'BOOLEAN',
+			'lang' => 'CMD',
+			'Itemid' => 'INT');
+
+		// Check for edit form.
+		if ($vName === 'form' && !$this->checkEditId('com_content.edit.article', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+		}
+
+		if ($vName === 'article')
+		{
+			// Get/Create the model
+			if ($model = $this->getModel($vName))
+			{
+				$model->hit();
+			}
+		}
+
+		parent::display($cachable, $safeurlparams);
+
+		return $this;
+	}
+}
diff --git a/core/components/com_content/controllers/article.php b/core/components/com_content/controllers/article.php
new file mode 100644
index 00000000..1f415a9e
--- /dev/null
+++ b/core/components/com_content/controllers/article.php
@@ -0,0 +1,438 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Content article class.
+ *
+ * @since  1.6.0
+ */
+class ContentControllerArticle extends JControllerForm
+{
+	/**
+	 * The URL view item variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_item = 'form';
+
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_list = 'categories';
+
+	/**
+	 * The URL edit variable.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $urlVar = 'a.id';
+
+	/**
+	 * Method to add a new record.
+	 *
+	 * @return  mixed  True if the record can be added, an error object if not.
+	 *
+	 * @since   1.6
+	 */
+	public function add()
+	{
+		if (!parent::add())
+		{
+			// Redirect to the return page.
+			$this->setRedirect($this->getReturnPage());
+
+			return;
+		}
+
+		// Redirect to the edit screen.
+		$this->setRedirect(
+			JRoute::_(
+				'index.php?option=' . $this->option . '&view=' . $this->view_item . '&a_id=0'
+				. $this->getRedirectToItemAppend(), false
+			)
+		);
+
+		return true;
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user       = JFactory::getUser();
+		$categoryId = ArrayHelper::getValue($data, 'catid', $this->input->getInt('catid'), 'int');
+		$allow      = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the data or URL check it.
+			$allow = $user->authorise('core.create', 'com_content.category.' . $categoryId);
+		}
+
+		if ($allow === null)
+		{
+			// In the absense of better information, revert to the component permissions.
+			return parent::allowAdd();
+		}
+		else
+		{
+			return $allow;
+		}
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key; default is id.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user = JFactory::getUser();
+
+		// Zero record (id:0), return component edit permission by calling parent controller method
+		if (!$recordId)
+		{
+			return parent::allowEdit($data, $key);
+		}
+
+		// Check edit on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit', 'com_content.article.' . $recordId))
+		{
+			return true;
+		}
+
+		// Check edit own on the record asset (explicit or inherited)
+		if ($user->authorise('core.edit.own', 'com_content.article.' . $recordId))
+		{
+			// Existing record already has an owner, get it
+			$record = $this->getModel()->getItem($recordId);
+
+			if (empty($record))
+			{
+				return false;
+			}
+
+			// Grant if current user is owner of the record
+			return $user->get('id') == $record->created_by;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = 'a_id')
+	{
+		parent::cancel($key);
+
+		$app = JFactory::getApplication();
+
+		// Load the parameters.
+		$params = $app->getParams();
+
+		$customCancelRedir = (bool) $params->get('custom_cancel_redirect');
+
+		if ($customCancelRedir)
+		{
+			$cancelMenuitemId = (int) $params->get('cancel_redirect_menuitem');
+
+			if ($cancelMenuitemId > 0)
+			{
+				$item = $app->getMenu()->getItem($cancelMenuitemId);
+				$lang = '';
+
+				if (JLanguageMultilang::isEnabled())
+				{
+					$lang = !is_null($item) && $item->language != '*' ? '&lang=' . $item->language : '';
+				}
+
+				// Redirect to the user specified return page.
+				$redirlink = $item->link . $lang . '&Itemid=' . $cancelMenuitemId;
+			}
+			else
+			{
+				// Redirect to the same article submission form (clean form).
+				$redirlink = $app->getMenu()->getActive()->link . '&Itemid=' . $app->getMenu()->getActive()->id;
+			}
+		}
+		else
+		{
+			$menuitemId = (int) $params->get('redirect_menuitem');
+			$lang = '';
+
+			if ($menuitemId > 0)
+			{
+				$lang = '';
+				$item = $app->getMenu()->getItem($menuitemId);
+
+				if (JLanguageMultilang::isEnabled())
+				{
+					$lang = !is_null($item) && $item->language != '*' ? '&lang=' . $item->language : '';
+				}
+
+				// Redirect to the general (redirect_menuitem) user specified return page.
+				$redirlink = $item->link . $lang . '&Itemid=' . $menuitemId;
+			}
+			else
+			{
+				// Redirect to the return page.
+				$redirlink = $this->getReturnPage();
+			}
+		}
+
+		$this->setRedirect(JRoute::_($redirlink, false));
+	}
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 * (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = 'a_id')
+	{
+		$result = parent::edit($key, $urlVar);
+
+		if (!$result)
+		{
+			$this->setRedirect(JRoute::_($this->getReturnPage(), false));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.5
+	 */
+	public function getModel($name = 'form', $prefix = '', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string	The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'a_id')
+	{
+		// Need to override the parent method completely.
+		$tmpl   = $this->input->get('tmpl');
+
+		$append = '';
+
+		// Setup redirect info.
+		if ($tmpl)
+		{
+			$append .= '&tmpl=' . $tmpl;
+		}
+
+		// TODO This is a bandaid, not a long term solution.
+		/**
+		 * if ($layout)
+		 * {
+		 *	$append .= '&layout=' . $layout;
+		 * }
+		 */
+
+		$append .= '&layout=edit';
+
+		if ($recordId)
+		{
+			$append .= '&' . $urlVar . '=' . $recordId;
+		}
+
+		$itemId = $this->input->getInt('Itemid');
+		$return = $this->getReturnPage();
+		$catId  = $this->input->getInt('catid');
+
+		if ($itemId)
+		{
+			$append .= '&Itemid=' . $itemId;
+		}
+
+		if ($catId)
+		{
+			$append .= '&catid=' . $catId;
+		}
+
+		if ($return)
+		{
+			$append .= '&return=' . base64_encode($return);
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Get the return URL.
+	 *
+	 * If a "return" variable has been passed in the request
+	 *
+	 * @return  string	The return URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReturnPage()
+	{
+		$return = $this->input->get('return', null, 'base64');
+
+		if (empty($return) || !JUri::isInternal(base64_decode($return)))
+		{
+			return JUri::base();
+		}
+		else
+		{
+			return base64_decode($return);
+		}
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = 'a_id')
+	{
+		$result    = parent::save($key, $urlVar);
+		$app       = JFactory::getApplication();
+		$articleId = $app->input->getInt('a_id');
+
+		// Load the parameters.
+		$params   = $app->getParams();
+		$menuitem = (int) $params->get('redirect_menuitem');
+
+		// Check for redirection after submission when creating a new article only
+		if ($menuitem > 0 && $articleId == 0)
+		{
+			$lang = '';
+
+			if (JLanguageMultilang::isEnabled())
+			{
+				$item = $app->getMenu()->getItem($menuitem);
+				$lang = !is_null($item) && $item->language != '*' ? '&lang=' . $item->language : '';
+			}
+
+			// If ok, redirect to the return page.
+			if ($result)
+			{
+				$this->setRedirect(JRoute::_('index.php?Itemid=' . $menuitem . $lang, false));
+			}
+		}
+		else
+		{
+			// If ok, redirect to the return page.
+			if ($result)
+			{
+				$this->setRedirect(JRoute::_($this->getReturnPage(), false));
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to reload a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function reload($key = null, $urlVar = 'a_id')
+	{
+		return parent::reload($key, $urlVar);
+	}
+
+	/**
+	 * Method to save a vote.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function vote()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$user_rating = $this->input->getInt('user_rating', -1);
+
+		if ($user_rating > -1)
+		{
+			$url = $this->input->getString('url', '');
+			$id = $this->input->getInt('id', 0);
+			$viewName = $this->input->getString('view', $this->default_view);
+			$model = $this->getModel($viewName);
+
+			if ($model->storeVote($id, $user_rating))
+			{
+				$this->setRedirect($url, JText::_('COM_CONTENT_ARTICLE_VOTE_SUCCESS'));
+			}
+			else
+			{
+				$this->setRedirect($url, JText::_('COM_CONTENT_ARTICLE_VOTE_FAILURE'));
+			}
+		}
+	}
+}
diff --git a/core/components/com_content/helpers/association.php b/core/components/com_content/helpers/association.php
new file mode 100644
index 00000000..e6df33f2
--- /dev/null
+++ b/core/components/com_content/helpers/association.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php');
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php');
+
+/**
+ * Content Component Association Helper
+ *
+ * @since  3.0
+ */
+abstract class ContentHelperAssociation extends CategoryHelperAssociation
+{
+	/**
+	 * Method to get the associations for a given item
+	 *
+	 * @param   integer  $id      Id of the item
+	 * @param   string   $view    Name of the view
+	 * @param   string   $layout  View layout
+	 *
+	 * @return  array   Array of associations for the item
+	 *
+	 * @since  3.0
+	 */
+	public static function getAssociations($id = 0, $view = null, $layout = null)
+	{
+		$jinput    = JFactory::getApplication()->input;
+		$view      = $view === null ? $jinput->get('view') : $view;
+		$component = $jinput->getCmd('option');
+		$id        = empty($id) ? $jinput->getInt('id') : $id;
+
+		if ($layout === null && $jinput->get('view') == $view && $component == 'com_content')
+		{
+			$layout = $jinput->get('layout', '', 'string');
+		}
+
+		if ($view === 'article')
+		{
+			if ($id)
+			{
+				$user      = JFactory::getUser();
+				$groups    = implode(',', $user->getAuthorisedViewLevels());
+				$db        = JFactory::getDbo();
+				$advClause = array();
+
+				// Filter by user groups
+				$advClause[] = 'c2.access IN (' . $groups . ')';
+
+				// Filter by current language
+				$advClause[] = 'c2.language != ' . $db->quote(JFactory::getLanguage()->getTag());
+
+				if (!$user->authorise('core.edit.state', 'com_content') && !$user->authorise('core.edit', 'com_content'))
+				{
+					// Filter by start and end dates.
+					$nullDate = $db->quote($db->getNullDate());
+					$date = JFactory::getDate();
+
+					$nowDate = $db->quote($date->toSql());
+
+					$advClause[] = '(c2.publish_up = ' . $nullDate . ' OR c2.publish_up <= ' . $nowDate . ')';
+					$advClause[] = '(c2.publish_down = ' . $nullDate . ' OR c2.publish_down >= ' . $nowDate . ')';
+
+					// Filter by published
+					$advClause[] = 'c2.state = 1';
+				}
+
+				$associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $id, 'id', 'alias', 'catid', $advClause);
+
+				$return = array();
+
+				foreach ($associations as $tag => $item)
+				{
+					$return[$tag] = ContentHelperRoute::getArticleRoute($item->id, (int) $item->catid, $item->language, $layout);
+				}
+
+				return $return;
+			}
+		}
+
+		if ($view === 'category' || $view === 'categories')
+		{
+			return self::getCategoryAssociations($id, 'com_content', $layout);
+		}
+
+		return array();
+	}
+
+	/**
+	 * Method to display in frontend the associations for a given article
+	 *
+	 * @param   integer  $id  Id of the article
+	 *
+	 * @return  array  An array containing the association URL and the related language object
+	 *
+	 * @since  3.7.0
+	 */
+	public static function displayAssociations($id)
+	{
+		$return = array();
+
+		if ($associations = self::getAssociations($id, 'article'))
+		{
+			$levels    = JFactory::getUser()->getAuthorisedViewLevels();
+			$languages = JLanguageHelper::getLanguages();
+
+			foreach ($languages as $language)
+			{
+				// Do not display language when no association
+				if (empty($associations[$language->lang_code]))
+				{
+					continue;
+				}
+
+				// Do not display language without frontend UI
+				if (!array_key_exists($language->lang_code, JLanguageHelper::getInstalledLanguages(0)))
+				{
+					continue;
+				}
+
+				// Do not display language without specific home menu
+				if (!array_key_exists($language->lang_code, JLanguageMultilang::getSiteHomePages()))
+				{
+					continue;
+				}
+
+				// Do not display language without authorized access level
+				if (isset($language->access) && $language->access && !in_array($language->access, $levels))
+				{
+					continue;
+				}
+
+				$return[$language->lang_code] = array('item' => $associations[$language->lang_code], 'language' => $language);
+			}
+		}
+
+		return $return;
+	}
+}
diff --git a/core/components/com_content/helpers/category.php b/core/components/com_content/helpers/category.php
new file mode 100644
index 00000000..cbd05b12
--- /dev/null
+++ b/core/components/com_content/helpers/category.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Category Tree
+ *
+ * @since  1.6
+ */
+class ContentCategories extends JCategories
+{
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__content';
+		$options['extension'] = 'com_content';
+
+		parent::__construct($options);
+	}
+}
diff --git a/core/components/com_content/helpers/icon.php b/core/components/com_content/helpers/icon.php
new file mode 100644
index 00000000..4e570c32
--- /dev/null
+++ b/core/components/com_content/helpers/icon.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Content Component HTML Helper
+ *
+ * @since  1.5
+ */
+abstract class JHtmlIcon
+{
+	/**
+	 * Method to generate a link to the create item page for the given category
+	 *
+	 * @param   object    $category  The category information
+	 * @param   Registry  $params    The item parameters
+	 * @param   array     $attribs   Optional attributes for the link
+	 * @param   boolean   $legacy    True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the create item link
+	 */
+	public static function create($category, $params, $attribs = array(), $legacy = false)
+	{
+		$uri = JUri::getInstance();
+
+		$url = 'index.php?option=com_content&task=article.add&return=' . base64_encode($uri) . '&a_id=0&catid=' . $category->id;
+
+		$text = JLayoutHelper::render('joomla.content.icons.create', array('params' => $params, 'legacy' => $legacy));
+
+		// Add the button classes to the attribs array
+		if (isset($attribs['class']))
+		{
+			$attribs['class'] .= ' btn btn-primary';
+		}
+		else
+		{
+			$attribs['class'] = 'btn btn-primary';
+		}
+
+		$button = JHtml::_('link', JRoute::_($url), $text, $attribs);
+
+		$output = '<span class="hasTooltip" title="' . JHtml::_('tooltipText', 'COM_CONTENT_CREATE_ARTICLE') . '">' . $button . '</span>';
+
+		return $output;
+	}
+
+	/**
+	 * Method to generate a link to the email item page for the given article
+	 *
+	 * @param   object    $article  The article information
+	 * @param   Registry  $params   The item parameters
+	 * @param   array     $attribs  Optional attributes for the link
+	 * @param   boolean   $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the email item link
+	 */
+	public static function email($article, $params, $attribs = array(), $legacy = false)
+	{
+		JLoader::register('MailtoHelper', JPATH_SITE . '/components/com_mailto/helpers/mailto.php');
+
+		$uri      = JUri::getInstance();
+		$base     = $uri->toString(array('scheme', 'host', 'port'));
+		$template = JFactory::getApplication()->getTemplate();
+		$link     = $base . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language), false);
+		$url      = 'index.php?option=com_mailto&tmpl=component&template=' . $template . '&link=' . MailtoHelper::addLink($link);
+
+		$height = JFactory::getApplication()->get('captcha', '0') === '0' ? 450 : 550;
+		$status = 'width=400,height=' . $height . ',menubar=yes,resizable=yes';
+
+		$text = JLayoutHelper::render('joomla.content.icons.email', array('params' => $params, 'legacy' => $legacy));
+
+		$attribs['title']   = JText::_('JGLOBAL_EMAIL_TITLE');
+		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
+		$attribs['rel']     = 'nofollow';
+
+		return JHtml::_('link', JRoute::_($url), $text, $attribs);
+	}
+
+	/**
+	 * Display an edit icon for the article.
+	 *
+	 * This icon will not display in a popup window, nor if the article is trashed.
+	 * Edit access checks must be performed in the calling code.
+	 *
+	 * @param   object    $article  The article information
+	 * @param   Registry  $params   The item parameters
+	 * @param   array     $attribs  Optional attributes for the link
+	 * @param   boolean   $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string	The HTML for the article edit icon.
+	 *
+	 * @since   1.6
+	 */
+	public static function edit($article, $params, $attribs = array(), $legacy = false)
+	{
+		$user = JFactory::getUser();
+		$uri  = JUri::getInstance();
+
+		// Ignore if in a popup window.
+		if ($params && $params->get('popup'))
+		{
+			return;
+		}
+
+		// Ignore if the state is negative (trashed).
+		if ($article->state < 0)
+		{
+			return;
+		}
+
+		// Show checked_out icon if the article is checked out by a different user
+		if (property_exists($article, 'checked_out')
+			&& property_exists($article, 'checked_out_time')
+			&& $article->checked_out > 0
+			&& $article->checked_out != $user->get('id'))
+		{
+			$checkoutUser = JFactory::getUser($article->checked_out);
+			$date         = JHtml::_('date', $article->checked_out_time);
+			$tooltip      = JText::_('JLIB_HTML_CHECKED_OUT') . ' :: ' . JText::sprintf('COM_CONTENT_CHECKED_OUT_BY', $checkoutUser->name)
+				. ' <br /> ' . $date;
+
+			$text = JLayoutHelper::render('joomla.content.icons.edit_lock', array('tooltip' => $tooltip, 'legacy' => $legacy));
+
+			$output = JHtml::_('link', '#', $text, $attribs);
+
+			return $output;
+		}
+
+		$contentUrl = ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language);
+		$url        = $contentUrl . '&task=article.edit&a_id=' . $article->id . '&return=' . base64_encode($uri);
+
+		if ($article->state == 0)
+		{
+			$overlib = JText::_('JUNPUBLISHED');
+		}
+		else
+		{
+			$overlib = JText::_('JPUBLISHED');
+		}
+
+		$date   = JHtml::_('date', $article->created);
+		$author = $article->created_by_alias ?: $article->author;
+
+		$overlib .= '&lt;br /&gt;';
+		$overlib .= $date;
+		$overlib .= '&lt;br /&gt;';
+		$overlib .= JText::sprintf('COM_CONTENT_WRITTEN_BY', htmlspecialchars($author, ENT_COMPAT, 'UTF-8'));
+
+		$text = JLayoutHelper::render('joomla.content.icons.edit', array('article' => $article, 'overlib' => $overlib, 'legacy' => $legacy));
+
+		$attribs['title']   = JText::_('JGLOBAL_EDIT_TITLE');
+		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
+
+		return $output;
+	}
+
+	/**
+	 * Method to generate a popup link to print an article
+	 *
+	 * @param   object    $article  The article information
+	 * @param   Registry  $params   The item parameters
+	 * @param   array     $attribs  Optional attributes for the link
+	 * @param   boolean   $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the popup link
+	 */
+	public static function print_popup($article, $params, $attribs = array(), $legacy = false)
+	{
+		$url  = ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language);
+		$url .= '&tmpl=component&print=1&layout=default';
+
+		$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
+
+		$text = JLayoutHelper::render('joomla.content.icons.print_popup', array('params' => $params, 'legacy' => $legacy));
+
+		$attribs['title']   = JText::sprintf('JGLOBAL_PRINT_TITLE', htmlspecialchars($article->title, ENT_QUOTES, 'UTF-8'));
+		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
+		$attribs['rel']     = 'nofollow';
+
+		return JHtml::_('link', JRoute::_($url), $text, $attribs);
+	}
+
+	/**
+	 * Method to generate a link to print an article
+	 *
+	 * @param   object    $article  Not used, @deprecated for 4.0
+	 * @param   Registry  $params   The item parameters
+	 * @param   array     $attribs  Not used, @deprecated for 4.0
+	 * @param   boolean   $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the popup link
+	 */
+	public static function print_screen($article, $params, $attribs = array(), $legacy = false)
+	{
+		$text = JLayoutHelper::render('joomla.content.icons.print_screen', array('params' => $params, 'legacy' => $legacy));
+
+		return '<a href="#" onclick="window.print();return false;">' . $text . '</a>';
+	}
+}
diff --git a/core/components/com_content/helpers/legacyrouter.php b/core/components/com_content/helpers/legacyrouter.php
new file mode 100644
index 00000000..ac1d9b76
--- /dev/null
+++ b/core/components/com_content/helpers/legacyrouter.php
@@ -0,0 +1,476 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Legacy routing rules class from com_content
+ *
+ * @since       3.6
+ * @deprecated  4.0
+ */
+class ContentRouterRulesLegacy implements JComponentRouterRulesInterface
+{
+	/**
+	 * Constructor for this legacy router
+	 *
+	 * @param   JComponentRouterView  $router  The router this rule belongs to
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function __construct($router)
+	{
+		$this->router = $router;
+	}
+
+	/**
+	 * Preprocess the route for the com_content component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function preprocess(&$query)
+	{
+	}
+
+	/**
+	 * Build the route for the com_content component
+	 *
+	 * @param   array  &$query     An array of URL arguments
+	 * @param   array  &$segments  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function build(&$query, &$segments)
+	{
+		// Get a menu item based on Itemid or currently active
+		$params = JComponentHelper::getParams('com_content');
+		$advanced = $params->get('sef_advanced_link', 0);
+
+		// We need a menu item.  Either the one specified in the query, or the current active one if none specified
+		if (empty($query['Itemid']))
+		{
+			$menuItem = $this->router->menu->getActive();
+			$menuItemGiven = false;
+		}
+		else
+		{
+			$menuItem = $this->router->menu->getItem($query['Itemid']);
+			$menuItemGiven = true;
+		}
+
+		// Check again
+		if ($menuItemGiven && isset($menuItem) && $menuItem->component != 'com_content')
+		{
+			$menuItemGiven = false;
+			unset($query['Itemid']);
+		}
+
+		if (isset($query['view']))
+		{
+			$view = $query['view'];
+		}
+		else
+		{
+			// We need to have a view in the query or it is an invalid URL
+			return;
+		}
+
+		// Are we dealing with an article or category that is attached to a menu item?
+		if ($menuItem !== null
+			&& isset($menuItem->query['view'], $query['view'], $menuItem->query['id'], $query['id'])
+			&& $menuItem->query['view'] == $query['view']
+			&& $menuItem->query['id'] == (int) $query['id'])
+		{
+			unset($query['view']);
+
+			if (isset($query['catid']))
+			{
+				unset($query['catid']);
+			}
+
+			if (isset($query['layout']))
+			{
+				unset($query['layout']);
+			}
+
+			unset($query['id']);
+
+			return;
+		}
+
+		if ($view == 'category' || $view == 'article')
+		{
+			if (!$menuItemGiven)
+			{
+				$segments[] = $view;
+			}
+
+			unset($query['view']);
+
+			if ($view == 'article')
+			{
+				if (isset($query['id']) && isset($query['catid']) && $query['catid'])
+				{
+					$catid = $query['catid'];
+
+					// Make sure we have the id and the alias
+					if (strpos($query['id'], ':') === false)
+					{
+						$db = JFactory::getDbo();
+						$dbQuery = $db->getQuery(true)
+							->select('alias')
+							->from('#__content')
+							->where('id=' . (int) $query['id']);
+						$db->setQuery($dbQuery);
+						$alias = $db->loadResult();
+						$query['id'] = $query['id'] . ':' . $alias;
+					}
+				}
+				else
+				{
+					// We should have these two set for this view.  If we don't, it is an error
+					return;
+				}
+			}
+			else
+			{
+				if (isset($query['id']))
+				{
+					$catid = $query['id'];
+				}
+				else
+				{
+					// We should have id set for this view.  If we don't, it is an error
+					return;
+				}
+			}
+
+			if ($menuItemGiven && isset($menuItem->query['id']))
+			{
+				$mCatid = $menuItem->query['id'];
+			}
+			else
+			{
+				$mCatid = 0;
+			}
+
+			$categories = JCategories::getInstance('Content');
+			$category = $categories->get($catid);
+
+			if (!$category)
+			{
+				// We couldn't find the category we were given.  Bail.
+				return;
+			}
+
+			$path = array_reverse($category->getPath());
+
+			$array = array();
+
+			foreach ($path as $id)
+			{
+				if ((int) $id == (int) $mCatid)
+				{
+					break;
+				}
+
+				list($tmp, $id) = explode(':', $id, 2);
+
+				$array[] = $id;
+			}
+
+			$array = array_reverse($array);
+
+			if (!$advanced && count($array))
+			{
+				$array[0] = (int) $catid . ':' . $array[0];
+			}
+
+			$segments = array_merge($segments, $array);
+
+			if ($view == 'article')
+			{
+				if ($advanced)
+				{
+					list($tmp, $id) = explode(':', $query['id'], 2);
+				}
+				else
+				{
+					$id = $query['id'];
+				}
+
+				$segments[] = $id;
+			}
+
+			unset($query['id'], $query['catid']);
+		}
+
+		if ($view == 'archive')
+		{
+			if (!$menuItemGiven)
+			{
+				$segments[] = $view;
+				unset($query['view']);
+			}
+
+			if (isset($query['year']))
+			{
+				if ($menuItemGiven)
+				{
+					$segments[] = $query['year'];
+					unset($query['year']);
+				}
+			}
+
+			if (isset($query['year']) && isset($query['month']))
+			{
+				if ($menuItemGiven)
+				{
+					$segments[] = $query['month'];
+					unset($query['month']);
+				}
+			}
+		}
+
+		if ($view == 'featured')
+		{
+			if (!$menuItemGiven)
+			{
+				$segments[] = $view;
+			}
+
+			unset($query['view']);
+		}
+
+		/*
+		 * If the layout is specified and it is the same as the layout in the menu item, we
+		 * unset it so it doesn't go into the query string.
+		 */
+		if (isset($query['layout']))
+		{
+			if ($menuItemGiven && isset($menuItem->query['layout']))
+			{
+				if ($query['layout'] == $menuItem->query['layout'])
+				{
+					unset($query['layout']);
+				}
+			}
+			else
+			{
+				if ($query['layout'] == 'default')
+				{
+					unset($query['layout']);
+				}
+			}
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 * @param   array  &$vars      The URL attributes to be used by the application.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function parse(&$segments, &$vars)
+	{
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// Get the active menu item.
+		$item = $this->router->menu->getActive();
+		$params = JComponentHelper::getParams('com_content');
+		$advanced = $params->get('sef_advanced_link', 0);
+		$db = JFactory::getDbo();
+
+		// Count route segments
+		$count = count($segments);
+
+		/*
+		 * Standard routing for articles.  If we don't pick up an Itemid then we get the view from the segments
+		 * the first segment is the view and the last segment is the id of the article or category.
+		 */
+		if (!isset($item))
+		{
+			$vars['view'] = $segments[0];
+			$vars['id'] = $segments[$count - 1];
+
+			return;
+		}
+
+		/*
+		 * If there is only one segment, then it points to either an article or a category.
+		 * We test it first to see if it is a category.  If the id and alias match a category,
+		 * then we assume it is a category.  If they don't we assume it is an article
+		 */
+		if ($count == 1)
+		{
+			// We check to see if an alias is given.  If not, we assume it is an article
+			if (strpos($segments[0], ':') === false)
+			{
+				$vars['view'] = 'article';
+				$vars['id'] = (int) $segments[0];
+
+				return;
+			}
+
+			list($id, $alias) = explode(':', $segments[0], 2);
+
+			// First we check if it is a category
+			$category = JCategories::getInstance('Content')->get($id);
+
+			if ($category && $category->alias == $alias)
+			{
+				$vars['view'] = 'category';
+				$vars['id'] = $id;
+
+				return;
+			}
+			else
+			{
+				$query = $db->getQuery(true)
+					->select($db->quoteName(array('alias', 'catid')))
+					->from($db->quoteName('#__content'))
+					->where($db->quoteName('id') . ' = ' . (int) $id);
+				$db->setQuery($query);
+				$article = $db->loadObject();
+
+				if ($article)
+				{
+					if ($article->alias == $alias)
+					{
+						$vars['view'] = 'article';
+						$vars['catid'] = (int) $article->catid;
+						$vars['id'] = (int) $id;
+
+						return;
+					}
+				}
+			}
+		}
+
+		/*
+		 * If there was more than one segment, then we can determine where the URL points to
+		 * because the first segment will have the target category id prepended to it.  If the
+		 * last segment has a number prepended, it is an article, otherwise, it is a category.
+		 */
+		if (!$advanced)
+		{
+			$cat_id = (int) $segments[0];
+
+			$article_id = (int) $segments[$count - 1];
+
+			if ($article_id > 0)
+			{
+				$vars['view'] = 'article';
+				$vars['catid'] = $cat_id;
+				$vars['id'] = $article_id;
+			}
+			else
+			{
+				$vars['view'] = 'category';
+				$vars['id'] = $cat_id;
+			}
+
+			return;
+		}
+
+		// We get the category id from the menu item and search from there
+		$id = $item->query['id'];
+		$category = JCategories::getInstance('Content')->get($id);
+
+		if (!$category)
+		{
+			JError::raiseError(404, JText::_('COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND'));
+
+			return;
+		}
+
+		$categories = $category->getChildren();
+		$vars['catid'] = $id;
+		$vars['id'] = $id;
+		$found = 0;
+
+		foreach ($segments as $segment)
+		{
+			$segment = str_replace(':', '-', $segment);
+
+			foreach ($categories as $category)
+			{
+				if ($category->alias == $segment)
+				{
+					$vars['id'] = $category->id;
+					$vars['catid'] = $category->id;
+					$vars['view'] = 'category';
+					$categories = $category->getChildren();
+					$found = 1;
+					break;
+				}
+			}
+
+			if ($found == 0)
+			{
+				if ($advanced)
+				{
+					$db = JFactory::getDbo();
+					$query = $db->getQuery(true)
+						->select($db->quoteName('id'))
+						->from('#__content')
+						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
+						->where($db->quoteName('alias') . ' = ' . $db->quote($segment));
+					$db->setQuery($query);
+					$cid = $db->loadResult();
+				}
+				else
+				{
+					$cid = $segment;
+				}
+
+				$vars['id'] = $cid;
+
+				if ($item->query['view'] == 'archive' && $count != 1)
+				{
+					$vars['year'] = $count >= 2 ? $segments[$count - 2] : null;
+					$vars['month'] = $segments[$count - 1];
+					$vars['view'] = 'archive';
+				}
+				else
+				{
+					$vars['view'] = 'article';
+				}
+			}
+
+			$found = 0;
+		}
+	}
+}
diff --git a/core/components/com_content/helpers/query.php b/core/components/com_content/helpers/query.php
new file mode 100644
index 00000000..7b44c48c
--- /dev/null
+++ b/core/components/com_content/helpers/query.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Query Helper
+ *
+ * @since  1.5
+ */
+class ContentHelperQuery
+{
+	/**
+	 * Translate an order code to a field for primary category ordering.
+	 *
+	 * @param   string  $orderby  The ordering code.
+	 *
+	 * @return  string  The SQL field(s) to order by.
+	 *
+	 * @since   1.5
+	 */
+	public static function orderbyPrimary($orderby)
+	{
+		switch ($orderby)
+		{
+			case 'alpha' :
+				$orderby = 'c.path, ';
+				break;
+
+			case 'ralpha' :
+				$orderby = 'c.path DESC, ';
+				break;
+
+			case 'order' :
+				$orderby = 'c.lft, ';
+				break;
+
+			default :
+				$orderby = '';
+				break;
+		}
+
+		return $orderby;
+	}
+
+	/**
+	 * Translate an order code to a field for secondary category ordering.
+	 *
+	 * @param   string  $orderby    The ordering code.
+	 * @param   string  $orderDate  The ordering code for the date.
+	 *
+	 * @return  string  The SQL field(s) to order by.
+	 *
+	 * @since   1.5
+	 */
+	public static function orderbySecondary($orderby, $orderDate = 'created')
+	{
+		$queryDate = self::getQueryDate($orderDate);
+
+		switch ($orderby)
+		{
+			case 'date' :
+				$orderby = $queryDate;
+				break;
+
+			case 'rdate' :
+				$orderby = $queryDate . ' DESC ';
+				break;
+
+			case 'alpha' :
+				$orderby = 'a.title';
+				break;
+
+			case 'ralpha' :
+				$orderby = 'a.title DESC';
+				break;
+
+			case 'hits' :
+				$orderby = 'a.hits DESC';
+				break;
+
+			case 'rhits' :
+				$orderby = 'a.hits';
+				break;
+
+			case 'order' :
+				$orderby = 'a.ordering';
+				break;
+
+			case 'rorder' :
+				$orderby = 'a.ordering DESC';
+				break;
+
+			case 'author' :
+				$orderby = 'author';
+				break;
+
+			case 'rauthor' :
+				$orderby = 'author DESC';
+				break;
+
+			case 'front' :
+				$orderby = 'a.featured DESC, fp.ordering, ' . $queryDate . ' DESC ';
+				break;
+
+			case 'random' :
+				$orderby = JFactory::getDbo()->getQuery(true)->Rand();
+				break;
+
+			case 'vote' :
+				$orderby = 'a.id DESC ';
+
+				if (JPluginHelper::isEnabled('content', 'vote'))
+				{
+					$orderby = 'rating_count DESC ';
+				}
+				break;
+
+			case 'rvote' :
+				$orderby = 'a.id ASC ';
+
+				if (JPluginHelper::isEnabled('content', 'vote'))
+				{
+					$orderby = 'rating_count ASC ';
+				}
+				break;
+
+			case 'rank' :
+				$orderby = 'a.id DESC ';
+
+				if (JPluginHelper::isEnabled('content', 'vote'))
+				{
+					$orderby = 'rating DESC ';
+				}
+				break;
+
+			case 'rrank' :
+				$orderby = 'a.id ASC ';
+
+				if (JPluginHelper::isEnabled('content', 'vote'))
+				{
+					$orderby = 'rating ASC ';
+				}
+				break;
+
+			default :
+				$orderby = 'a.ordering';
+				break;
+		}
+
+		return $orderby;
+	}
+
+	/**
+	 * Translate an order code to a field for primary category ordering.
+	 *
+	 * @param   string  $orderDate  The ordering code.
+	 *
+	 * @return  string  The SQL field(s) to order by.
+	 *
+	 * @since   1.6
+	 */
+	public static function getQueryDate($orderDate)
+	{
+		$db = JFactory::getDbo();
+
+		switch ($orderDate)
+		{
+			case 'modified' :
+				$queryDate = ' CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END';
+				break;
+
+			// Use created if publish_up is not set
+			case 'published' :
+				$queryDate = ' CASE WHEN a.publish_up = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END ';
+				break;
+
+			case 'unpublished' :
+				$queryDate = ' CASE WHEN a.publish_down = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_down END ';
+				break;
+			case 'created' :
+			default :
+				$queryDate = ' a.created ';
+				break;
+		}
+
+		return $queryDate;
+	}
+
+	/**
+	 * Get join information for the voting query.
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  An options object for the article.
+	 *
+	 * @return  array  A named array with "select" and "join" keys.
+	 *
+	 * @since   1.5
+	 */
+	public static function buildVotingQuery($params = null)
+	{
+		if (!$params)
+		{
+			$params = JComponentHelper::getParams('com_content');
+		}
+
+		$voting = $params->get('show_vote');
+
+		if ($voting)
+		{
+			// Calculate voting count
+			$select = ' , ROUND(v.rating_sum / v.rating_count) AS rating, v.rating_count';
+			$join = ' LEFT JOIN #__content_rating AS v ON a.id = v.content_id';
+		}
+		else
+		{
+			$select = '';
+			$join = '';
+		}
+
+		return array('select' => $select, 'join' => $join);
+	}
+
+	/**
+	 * Method to order the intro articles array for ordering
+	 * down the columns instead of across.
+	 * The layout always lays the introtext articles out across columns.
+	 * Array is reordered so that, when articles are displayed in index order
+	 * across columns in the layout, the result is that the
+	 * desired article ordering is achieved down the columns.
+	 *
+	 * @param   array    &$articles   Array of intro text articles
+	 * @param   integer  $numColumns  Number of columns in the layout
+	 *
+	 * @return  array  Reordered array to achieve desired ordering down columns
+	 *
+	 * @since   1.6
+	 */
+	public static function orderDownColumns(&$articles, $numColumns = 1)
+	{
+		$count = count($articles);
+
+		// Just return the same array if there is nothing to change
+		if ($numColumns == 1 || !is_array($articles) || $count <= $numColumns)
+		{
+			$return = $articles;
+		}
+		// We need to re-order the intro articles array
+		else
+		{
+			// We need to preserve the original array keys
+			$keys = array_keys($articles);
+
+			$maxRows = ceil($count / $numColumns);
+			$numCells = $maxRows * $numColumns;
+			$numEmpty = $numCells - $count;
+			$index = array();
+
+			// Calculate number of empty cells in the array
+
+			// Fill in all cells of the array
+			// Put -1 in empty cells so we can skip later
+			for ($row = 1, $i = 1; $row <= $maxRows; $row++)
+			{
+				for ($col = 1; $col <= $numColumns; $col++)
+				{
+					if ($numEmpty > ($numCells - $i))
+					{
+						// Put -1 in empty cells
+						$index[$row][$col] = -1;
+					}
+					else
+					{
+						// Put in zero as placeholder
+						$index[$row][$col] = 0;
+					}
+
+					$i++;
+				}
+			}
+
+			// Layout the articles in column order, skipping empty cells
+			$i = 0;
+
+			for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
+			{
+				for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
+				{
+					if ($index[$row][$col] != - 1)
+					{
+						$index[$row][$col] = $keys[$i];
+						$i++;
+					}
+				}
+			}
+
+			// Now read the $index back row by row to get articles in right row/col
+			// so that they will actually be ordered down the columns (when read by row in the layout)
+			$return = array();
+			$i = 0;
+
+			for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
+			{
+				for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
+				{
+					$return[$keys[$i]] = $articles[$index[$row][$col]];
+					$i++;
+				}
+			}
+		}
+
+		return $return;
+	}
+}
diff --git a/core/components/com_content/helpers/route.php b/core/components/com_content/helpers/route.php
new file mode 100644
index 00000000..2a12b2c0
--- /dev/null
+++ b/core/components/com_content/helpers/route.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Route Helper.
+ *
+ * @since  1.5
+ */
+abstract class ContentHelperRoute
+{
+	/**
+	 * Get the article route.
+	 *
+	 * @param   integer  $id        The route of the content item.
+	 * @param   integer  $catid     The category ID.
+	 * @param   integer  $language  The language code.
+	 * @param   string   $layout    The layout value.
+	 *
+	 * @return  string  The article route.
+	 *
+	 * @since   1.5
+	 */
+	public static function getArticleRoute($id, $catid = 0, $language = 0, $layout = null)
+	{
+		// Create the link
+		$link = 'index.php?option=com_content&view=article&id=' . $id;
+
+		if ((int) $catid > 1)
+		{
+			$link .= '&catid=' . $catid;
+		}
+
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
+		{
+			$link .= '&lang=' . $language;
+		}
+
+		if ($layout)
+		{
+			$link .= '&layout=' . $layout;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Get the category route.
+	 *
+	 * @param   integer  $catid     The category ID.
+	 * @param   integer  $language  The language code.
+	 * @param   string   $layout    The layout value.
+	 *
+	 * @return  string  The article route.
+	 *
+	 * @since   1.5
+	 */
+	public static function getCategoryRoute($catid, $language = 0, $layout = null)
+	{
+		if ($catid instanceof JCategoryNode)
+		{
+			$id = $catid->id;
+		}
+		else
+		{
+			$id = (int) $catid;
+		}
+
+		if ($id < 1)
+		{
+			return '';
+		}
+
+		$link = 'index.php?option=com_content&view=category&id=' . $id;
+
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
+		{
+			$link .= '&lang=' . $language;
+		}
+
+		if ($layout)
+		{
+			$link .= '&layout=' . $layout;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Get the form route.
+	 *
+	 * @param   integer  $id  The form ID.
+	 *
+	 * @return  string  The article route.
+	 *
+	 * @since   1.5
+	 */
+	public static function getFormRoute($id)
+	{
+		return 'index.php?option=com_content&task=article.edit&a_id=' . (int) $id;
+	}
+}
diff --git a/core/components/com_content/models/archive.php b/core/components/com_content/models/archive.php
new file mode 100644
index 00000000..bb4431ca
--- /dev/null
+++ b/core/components/com_content/models/archive.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('ContentModelArticles', __DIR__ . '/articles.php');
+
+/**
+ * Content Component Archive Model
+ *
+ * @since  1.5
+ */
+class ContentModelArchive extends ContentModelArticles
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_content.archive';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		parent::populateState();
+
+		$app = JFactory::getApplication();
+
+		// Add archive properties
+		$params = $this->state->params;
+
+		// Filter on archived articles
+		$this->setState('filter.published', 2);
+
+		// Filter on month, year
+		$this->setState('filter.month', $app->input->getInt('month'));
+		$this->setState('filter.year', $app->input->getInt('year'));
+
+		// Optional filter text
+		$this->setState('list.filter', $app->input->getString('filter-search'));
+
+		// Get list limit
+		$itemid = $app->input->get('Itemid', 0, 'int');
+		$limit = $app->getUserStateFromRequest('com_content.archive.list' . $itemid . '.limit', 'limit', $params->get('display_num'), 'uint');
+		$this->setState('list.limit', $limit);
+
+		// Set the archive ordering
+		$articleOrderby   = $params->get('orderby_sec', 'rdate');
+		$articleOrderDate = $params->get('order_date');
+
+		// No category ordering
+		$secondary = ContentHelperQuery::orderbySecondary($articleOrderby, $articleOrderDate);
+
+		$this->setState('list.ordering', $secondary . ', a.created DESC');
+		$this->setState('list.direction', '');
+	}
+
+	/**
+	 * Get the master query for retrieving a list of articles subject to the model state.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$params           = $this->state->params;
+		$app              = JFactory::getApplication('site');
+		$catids           = ArrayHelper::toInteger($app->input->get('catid', array(), 'array'));
+		$catids           = array_values(array_diff($catids, array(0)));
+		$articleOrderDate = $params->get('order_date');
+
+		// Create a new query object.
+		$query = parent::getListQuery();
+
+			// Add routing for archive
+			// Sqlsrv changes
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('a.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $a_id . ' END as slug';
+
+		$query->select($case_when);
+
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('c.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $c_id . ' END as catslug';
+		$query->select($case_when);
+
+		// Filter on month, year
+		// First, get the date field
+		$queryDate = ContentHelperQuery::getQueryDate($articleOrderDate);
+
+		if ($month = $this->getState('filter.month'))
+		{
+			$query->where($query->month($queryDate) . ' = ' . $month);
+		}
+
+		if ($year = $this->getState('filter.year'))
+		{
+			$query->where($query->year($queryDate) . ' = ' . $year);
+		}
+
+		if (count($catids) > 0)
+		{
+			$query->where('c.id IN (' . implode(', ', $catids) . ')');
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the archived article list
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public function getData()
+	{
+		$app = JFactory::getApplication();
+
+		// Lets load the content if it doesn't already exist
+		if (empty($this->_data))
+		{
+			// Get the page/component configuration
+			$params = $app->getParams();
+
+			// Get the pagination request variables
+			$limit      = $app->input->get('limit', $params->get('display_num', 20), 'uint');
+			$limitstart = $app->input->get('limitstart', 0, 'uint');
+
+			$query = $this->_buildQuery();
+
+			$this->_data = $this->_getList($query, $limitstart, $limit);
+		}
+
+		return $this->_data;
+	}
+
+	/**
+	 * JModelLegacy override to add alternating value for $odd
+	 *
+	 * @param   string   $query       The query.
+	 * @param   integer  $limitstart  Offset.
+	 * @param   integer  $limit       The number of records.
+	 *
+	 * @return  array  An array of results.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	protected function _getList($query, $limitstart=0, $limit=0)
+	{
+		$result = parent::_getList($query, $limitstart, $limit);
+
+		$odd = 1;
+
+		foreach ($result as $k => $row)
+		{
+			$result[$k]->odd = $odd;
+			$odd = 1 - $odd;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets the archived articles years
+	 *
+	 * @return   array
+	 *
+	 * @since    3.6.0
+	 */
+	public function getYears()
+	{
+		$db = $this->getDbo();
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate  = $db->quote(JFactory::getDate()->toSql());
+
+		$query = $db->getQuery(true);
+		$years = $query->year($db->qn('created'));
+		$query->select('DISTINCT (' . $years . ')')
+			->from($db->qn('#__content'))
+			->where($db->qn('state') . '= 2')
+			->where('(publish_up = ' . $nullDate . ' OR publish_up <= ' . $nowDate . ')')
+			->where('(publish_down = ' . $nullDate . ' OR publish_down >= ' . $nowDate . ')')
+			->order('1 ASC');
+
+		$db->setQuery($query);
+
+		return $db->loadColumn();
+	}
+}
diff --git a/core/components/com_content/models/article.php b/core/components/com_content/models/article.php
new file mode 100644
index 00000000..5d2895ed
--- /dev/null
+++ b/core/components/com_content/models/article.php
@@ -0,0 +1,360 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Content Component Article Model
+ *
+ * @since  1.5
+ */
+class ContentModelArticle extends JModelItem
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var        string
+	 */
+	protected $_context = 'com_content.article';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   1.6
+	 *
+	 * @return void
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('site');
+
+		// Load state from the request.
+		$pk = $app->input->getInt('id');
+		$this->setState('article.id', $pk);
+
+		$offset = $app->input->getUInt('limitstart');
+		$this->setState('list.offset', $offset);
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		// TODO: Tune these values based on other permissions.
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+		{
+			$this->setState('filter.published', 1);
+			$this->setState('filter.archived', 2);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+	}
+
+	/**
+	 * Method to get article data.
+	 *
+	 * @param   integer  $pk  The id of the article.
+	 *
+	 * @return  object|boolean|JException  Menu item data object on success, boolean false or JException instance on error
+	 */
+	public function getItem($pk = null)
+	{
+		$user = JFactory::getUser();
+
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
+
+		if ($this->_item === null)
+		{
+			$this->_item = array();
+		}
+
+		if (!isset($this->_item[$pk]))
+		{
+			try
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select(
+						$this->getState(
+							'item.select', 'a.id, a.asset_id, a.title, a.alias, a.introtext, a.fulltext, ' .
+							'a.state, a.catid, a.created, a.created_by, a.created_by_alias, ' .
+							// Use created if modified is 0
+							'CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END as modified, ' .
+							'a.modified_by, a.checked_out, a.checked_out_time, a.publish_up, a.publish_down, ' .
+							'a.images, a.urls, a.attribs, a.version, a.ordering, ' .
+							'a.metakey, a.metadesc, a.access, a.hits, a.metadata, a.featured, a.language, a.xreference'
+						)
+					);
+				$query->from('#__content AS a')
+					->where('a.id = ' . (int) $pk);
+
+				// Join on category table.
+				$query->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access')
+					->innerJoin('#__categories AS c on c.id = a.catid')
+					->where('c.published > 0');
+
+				// Join on user table.
+				$query->select('u.name AS author')
+					->join('LEFT', '#__users AS u on u.id = a.created_by');
+
+				// Filter by language
+				if ($this->getState('filter.language'))
+				{
+					$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+				}
+
+				// Join over the categories to get parent category titles
+				$query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
+					->join('LEFT', '#__categories as parent ON parent.id = c.parent_id');
+
+				// Join on voting table
+				$query->select('ROUND(v.rating_sum / v.rating_count, 0) AS rating, v.rating_count as rating_count')
+					->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
+
+				if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+				{
+					// Filter by start and end dates.
+					$nullDate = $db->quote($db->getNullDate());
+					$date = JFactory::getDate();
+
+					$nowDate = $db->quote($date->toSql());
+
+					$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+						->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+				}
+
+				// Filter by published state.
+				$published = $this->getState('filter.published');
+				$archived = $this->getState('filter.archived');
+
+				if (is_numeric($published))
+				{
+					$query->where('(a.state = ' . (int) $published . ' OR a.state =' . (int) $archived . ')');
+				}
+
+				$db->setQuery($query);
+
+				$data = $db->loadObject();
+
+				if (empty($data))
+				{
+					return JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
+				}
+
+				// Check for published state if filter set.
+				if ((is_numeric($published) || is_numeric($archived)) && (($data->state != $published) && ($data->state != $archived)))
+				{
+					return JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
+				}
+
+				// Convert parameter fields to objects.
+				$registry = new Registry($data->attribs);
+
+				$data->params = clone $this->getState('params');
+				$data->params->merge($registry);
+
+				$data->metadata = new Registry($data->metadata);
+
+				// Technically guest could edit an article, but lets not check that to improve performance a little.
+				if (!$user->get('guest'))
+				{
+					$userId = $user->get('id');
+					$asset = 'com_content.article.' . $data->id;
+
+					// Check general edit permission first.
+					if ($user->authorise('core.edit', $asset))
+					{
+						$data->params->set('access-edit', true);
+					}
+
+					// Now check if edit.own is available.
+					elseif (!empty($userId) && $user->authorise('core.edit.own', $asset))
+					{
+						// Check for a valid user and that they are the owner.
+						if ($userId == $data->created_by)
+						{
+							$data->params->set('access-edit', true);
+						}
+					}
+				}
+
+				// Compute view access permissions.
+				if ($access = $this->getState('filter.access'))
+				{
+					// If the access filter has been set, we already know this user can view.
+					$data->params->set('access-view', true);
+				}
+				else
+				{
+					// If no access filter is set, the layout takes some responsibility for display of limited information.
+					$user = JFactory::getUser();
+					$groups = $user->getAuthorisedViewLevels();
+
+					if ($data->catid == 0 || $data->category_access === null)
+					{
+						$data->params->set('access-view', in_array($data->access, $groups));
+					}
+					else
+					{
+						$data->params->set('access-view', in_array($data->access, $groups) && in_array($data->category_access, $groups));
+					}
+				}
+
+				$this->_item[$pk] = $data;
+			}
+			catch (Exception $e)
+			{
+				if ($e->getCode() == 404)
+				{
+					// Need to go thru the error handler to allow Redirect to work.
+					JError::raiseError(404, $e->getMessage());
+				}
+				else
+				{
+					$this->setError($e);
+					$this->_item[$pk] = false;
+				}
+			}
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Increment the hit counter for the article.
+	 *
+	 * @param   integer  $pk  Optional primary key of the article to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 */
+	public function hit($pk = 0)
+	{
+		$input = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
+
+			$table = JTable::getInstance('Content', 'JTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Save user vote on article
+	 *
+	 * @param   integer  $pk    Joomla Article Id
+	 * @param   integer  $rate  Voting rate
+	 *
+	 * @return  boolean          Return true on success
+	 */
+	public function storeVote($pk = 0, $rate = 0)
+	{
+		if ($rate >= 1 && $rate <= 5 && $pk > 0)
+		{
+			$userIP = $_SERVER['REMOTE_ADDR'];
+
+			// Initialize variables.
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true);
+
+			// Create the base select statement.
+			$query->select('*')
+				->from($db->quoteName('#__content_rating'))
+				->where($db->quoteName('content_id') . ' = ' . (int) $pk);
+
+			// Set the query and load the result.
+			$db->setQuery($query);
+
+			// Check for a database error.
+			try
+			{
+				$rating = $db->loadObject();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+
+				return false;
+			}
+
+			// There are no ratings yet, so lets insert our rating
+			if (!$rating)
+			{
+				$query = $db->getQuery(true);
+
+				// Create the base insert statement.
+				$query->insert($db->quoteName('#__content_rating'))
+					->columns(array($db->quoteName('content_id'), $db->quoteName('lastip'), $db->quoteName('rating_sum'), $db->quoteName('rating_count')))
+					->values((int) $pk . ', ' . $db->quote($userIP) . ',' . (int) $rate . ', 1');
+
+				// Set the query and execute the insert.
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					JError::raiseWarning(500, $e->getMessage());
+
+					return false;
+				}
+			}
+			else
+			{
+				if ($userIP != $rating->lastip)
+				{
+					$query = $db->getQuery(true);
+
+					// Create the base update statement.
+					$query->update($db->quoteName('#__content_rating'))
+						->set($db->quoteName('rating_count') . ' = rating_count + 1')
+						->set($db->quoteName('rating_sum') . ' = rating_sum + ' . (int) $rate)
+						->set($db->quoteName('lastip') . ' = ' . $db->quote($userIP))
+						->where($db->quoteName('content_id') . ' = ' . (int) $pk);
+
+					// Set the query and execute the update.
+					$db->setQuery($query);
+
+					try
+					{
+						$db->execute();
+					}
+					catch (RuntimeException $e)
+					{
+						JError::raiseWarning(500, $e->getMessage());
+
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		JError::raiseWarning(500, JText::sprintf('COM_CONTENT_INVALID_RATING', $rate), "JModelArticle::storeVote($rate)");
+
+		return false;
+	}
+}
diff --git a/core/components/com_content/models/articles.php b/core/components/com_content/models/articles.php
new file mode 100644
index 00000000..a3afe075
--- /dev/null
+++ b/core/components/com_content/models/articles.php
@@ -0,0 +1,712 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * This models supports retrieving lists of articles.
+ *
+ * @since  1.6
+ */
+class ContentModelArticles extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_title',
+				'state', 'a.state',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'images', 'a.images',
+				'urls', 'a.urls',
+				'filter_tag',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	protected function populateState($ordering = 'ordering', $direction = 'ASC')
+	{
+		$app = JFactory::getApplication();
+
+		// List state information
+		$value = $app->input->get('limit', $app->get('list_limit', 0), 'uint');
+		$this->setState('list.limit', $value);
+
+		$value = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $value);
+
+		$value = $app->input->get('filter_tag', 0, 'uint');
+		$this->setState('filter.tag', $value);
+
+		$orderCol = $app->input->get('filter_order', 'a.ordering');
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'a.ordering';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+		{
+			// Filter on published for those who do not have edit or edit.state rights.
+			$this->setState('filter.published', 1);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// Process show_noauth parameter
+		if ((!$params->get('show_noauth')) || (!JComponentHelper::getParams('com_content')->get('show_noauth')))
+		{
+			$this->setState('filter.access', true);
+		}
+		else
+		{
+			$this->setState('filter.access', false);
+		}
+
+		$this->setState('layout', $app->input->getString('layout'));
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . serialize($this->getState('filter.published'));
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.featured');
+		$id .= ':' . serialize($this->getState('filter.article_id'));
+		$id .= ':' . $this->getState('filter.article_id.include');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+		$id .= ':' . $this->getState('filter.category_id.include');
+		$id .= ':' . serialize($this->getState('filter.author_id'));
+		$id .= ':' . $this->getState('filter.author_id.include');
+		$id .= ':' . serialize($this->getState('filter.author_alias'));
+		$id .= ':' . $this->getState('filter.author_alias.include');
+		$id .= ':' . $this->getState('filter.date_filtering');
+		$id .= ':' . $this->getState('filter.date_field');
+		$id .= ':' . $this->getState('filter.start_date_range');
+		$id .= ':' . $this->getState('filter.end_date_range');
+		$id .= ':' . $this->getState('filter.relative_date');
+		$id .= ':' . serialize($this->getState('filter.tag'));
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Get the master query for retrieving a list of articles subject to the model state.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Get the current user for authorisation checks
+		$user = JFactory::getUser();
+
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.alias, a.introtext, a.fulltext, ' .
+				'a.checked_out, a.checked_out_time, ' .
+				'a.catid, a.created, a.created_by, a.created_by_alias, ' .
+				// Published/archived article in archive category is treats as archive article
+				// If category is not published then force 0
+				'CASE WHEN c.published = 2 AND a.state > 0 THEN 2 WHEN c.published != 1 THEN 0 ELSE a.state END as state,' .
+				// Use created if modified is 0
+				'CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END as modified, ' .
+				'a.modified_by, uam.name as modified_by_name,' .
+				// Use created if publish_up is 0
+				'CASE WHEN a.publish_up = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END as publish_up,' .
+				'a.publish_down, a.images, a.urls, a.attribs, a.metadata, a.metakey, a.metadesc, a.access, ' .
+				'a.hits, a.xreference, a.featured, a.language, ' . ' ' . $query->length('a.fulltext') . ' AS readmore, a.ordering'
+			)
+		);
+
+		$query->from('#__content AS a');
+
+		$params      = $this->getState('params');
+		$orderby_sec = $params->get('orderby_sec');
+
+		// Join over the frontpage articles if required.
+		if ($this->getState('filter.frontpage'))
+		{
+			if ($orderby_sec === 'front')
+			{
+				$query->select('fp.ordering');
+				$query->join('INNER', '#__content_frontpage AS fp ON fp.content_id = a.id');
+			}
+			else
+			{
+				$query->where('a.featured = 1');
+			}
+		}
+		elseif ($orderby_sec === 'front' || $this->getState('list.ordering') === 'fp.ordering')
+		{
+			$query->select('fp.ordering');
+			$query->join('LEFT', '#__content_frontpage AS fp ON fp.content_id = a.id');
+		}
+
+		// Join over the categories.
+		$query->select('c.title AS category_title, c.path AS category_route, c.access AS category_access, c.alias AS category_alias')
+			->select('c.published, c.published AS parents_published, c.lft')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		// Join over the users for the author and modified_by names.
+		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
+			->select('ua.email AS author_email')
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
+			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
+
+		// Join over the categories to get parent category titles
+		$query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
+			->join('LEFT', '#__categories as parent ON parent.id = c.parent_id');
+
+		if (JPluginHelper::isEnabled('content', 'vote'))
+		{
+			// Join on voting table
+			$query->select('COALESCE(NULLIF(ROUND(v.rating_sum  / v.rating_count, 0), 0), 0) AS rating, 
+							COALESCE(NULLIF(v.rating_count, 0), 0) as rating_count')
+				->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
+		}
+
+		// Filter by access level.
+		if ($this->getState('filter.access', true))	
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')')
+				->where('c.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published) && $published == 2)
+		{
+			/**
+			 * If category is archived then article has to be published or archived.
+			 * Or categogy is published then article has to be archived.
+			 */
+			$query->where('((c.published = 2 AND a.state > 0) OR (c.published = 1 AND a.state = 2))');
+		}
+		elseif (is_numeric($published))
+		{
+			// Category has to be published
+			$query->where('c.published = 1 AND a.state = ' . (int) $published);
+		}
+		elseif (is_array($published))
+		{
+			$published = ArrayHelper::toInteger($published);
+			$published = implode(',', $published);
+
+			// Category has to be published
+			$query->where('c.published = 1 AND a.state IN (' . $published . ')');
+		}
+
+		// Filter by featured state
+		$featured = $this->getState('filter.featured');
+
+		switch ($featured)
+		{
+			case 'hide':
+				$query->where('a.featured = 0');
+				break;
+
+			case 'only':
+				$query->where('a.featured = 1');
+				break;
+
+			case 'show':
+			default:
+				// Normally we do not discriminate between featured/unfeatured items.
+				break;
+		}
+
+		// Filter by a single or group of articles.
+		$articleId = $this->getState('filter.article_id');
+
+		if (is_numeric($articleId))
+		{
+			$type = $this->getState('filter.article_id.include', true) ? '= ' : '<> ';
+			$query->where('a.id ' . $type . (int) $articleId);
+		}
+		elseif (is_array($articleId))
+		{
+			$articleId = ArrayHelper::toInteger($articleId);
+			$articleId = implode(',', $articleId);
+			$type      = $this->getState('filter.article_id.include', true) ? 'IN' : 'NOT IN';
+			$query->where('a.id ' . $type . ' (' . $articleId . ')');
+		}
+
+		// Filter by a single or group of categories
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$type = $this->getState('filter.category_id.include', true) ? '= ' : '<> ';
+
+			// Add subcategory check
+			$includeSubcategories = $this->getState('filter.subcategories', false);
+			$categoryEquals       = 'a.catid ' . $type . (int) $categoryId;
+
+			if ($includeSubcategories)
+			{
+				$levels = (int) $this->getState('filter.max_category_levels', '1');
+
+				// Create a subquery for the subcategory list
+				$subQuery = $db->getQuery(true)
+					->select('sub.id')
+					->from('#__categories as sub')
+					->join('INNER', '#__categories as this ON sub.lft > this.lft AND sub.rgt < this.rgt')
+					->where('this.id = ' . (int) $categoryId);
+
+				if ($levels >= 0)
+				{
+					$subQuery->where('sub.level <= this.level + ' . $levels);
+				}
+
+				// Add the subquery to the main query
+				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . (string) $subQuery . '))');
+			}
+			else
+			{
+				$query->where($categoryEquals);
+			}
+		}
+		elseif (is_array($categoryId) && (count($categoryId) > 0))
+		{
+			$categoryId = ArrayHelper::toInteger($categoryId);
+			$categoryId = implode(',', $categoryId);
+
+			if (!empty($categoryId))
+			{
+				$type = $this->getState('filter.category_id.include', true) ? 'IN' : 'NOT IN';
+				$query->where('a.catid ' . $type . ' (' . $categoryId . ')');
+			}
+		}
+
+		// Filter by author
+		$authorId    = $this->getState('filter.author_id');
+		$authorWhere = '';
+
+		if (is_numeric($authorId))
+		{
+			$type        = $this->getState('filter.author_id.include', true) ? '= ' : '<> ';
+			$authorWhere = 'a.created_by ' . $type . (int) $authorId;
+		}
+		elseif (is_array($authorId))
+		{
+			$authorId = array_filter($authorId, 'is_numeric');
+
+			if ($authorId)
+			{
+				$authorId    = implode(',', $authorId);
+				$type        = $this->getState('filter.author_id.include', true) ? 'IN' : 'NOT IN';
+				$authorWhere = 'a.created_by ' . $type . ' (' . $authorId . ')';
+			}
+		}
+
+		// Filter by author alias
+		$authorAlias      = $this->getState('filter.author_alias');
+		$authorAliasWhere = '';
+
+		if (is_string($authorAlias))
+		{
+			$type             = $this->getState('filter.author_alias.include', true) ? '= ' : '<> ';
+			$authorAliasWhere = 'a.created_by_alias ' . $type . $db->quote($authorAlias);
+		}
+		elseif (is_array($authorAlias))
+		{
+			$first = current($authorAlias);
+
+			if (!empty($first))
+			{
+				foreach ($authorAlias as $key => $alias)
+				{
+					$authorAlias[$key] = $db->quote($alias);
+				}
+
+				$authorAlias = implode(',', $authorAlias);
+
+				if ($authorAlias)
+				{
+					$type             = $this->getState('filter.author_alias.include', true) ? 'IN' : 'NOT IN';
+					$authorAliasWhere = 'a.created_by_alias ' . $type . ' (' . $authorAlias .
+						')';
+				}
+			}
+		}
+
+		if (!empty($authorWhere) && !empty($authorAliasWhere))
+		{
+			$query->where('(' . $authorWhere . ' OR ' . $authorAliasWhere . ')');
+		}
+		elseif (empty($authorWhere) && empty($authorAliasWhere))
+		{
+			// If both are empty we don't want to add to the query
+		}
+		else
+		{
+			// One of these is empty, the other is not so we just add both
+			$query->where($authorWhere . $authorAliasWhere);
+		}
+
+		// Define null and now dates
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate  = $db->quote(JFactory::getDate()->toSql());
+
+		// Filter by start and end dates.
+		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+		{
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+		}
+
+		// Filter by Date Range or Relative Date
+		$dateFiltering = $this->getState('filter.date_filtering', 'off');
+		$dateField     = $this->getState('filter.date_field', 'a.created');
+
+		switch ($dateFiltering)
+		{
+			case 'range':
+				$startDateRange = $db->quote($this->getState('filter.start_date_range', $nullDate));
+				$endDateRange   = $db->quote($this->getState('filter.end_date_range', $nullDate));
+				$query->where(
+					'(' . $dateField . ' >= ' . $startDateRange . ' AND ' . $dateField .
+					' <= ' . $endDateRange . ')'
+				);
+				break;
+
+			case 'relative':
+				$relativeDate = (int) $this->getState('filter.relative_date', 0);
+				$query->where(
+					$dateField . ' >= DATE_SUB(' . $nowDate . ', INTERVAL ' .
+					$relativeDate . ' DAY)'
+				);
+				break;
+
+			case 'off':
+			default:
+				break;
+		}
+
+		// Process the filter for list views with user-entered filters
+		if (is_object($params) && ($params->get('filter_field') !== 'hide') && ($filter = $this->getState('list.filter')))
+		{
+			// Clean filter variable
+			$filter     = StringHelper::strtolower($filter);
+			$hitsFilter = (int) $filter;
+			$filter     = $db->quote('%' . $db->escape($filter, true) . '%', false);
+
+			switch ($params->get('filter_field'))
+			{
+				case 'author':
+					$query->where(
+						'LOWER( CASE WHEN a.created_by_alias > ' . $db->quote(' ') .
+						' THEN a.created_by_alias ELSE ua.name END ) LIKE ' . $filter . ' '
+					);
+					break;
+
+				case 'hits':
+					$query->where('a.hits >= ' . $hitsFilter . ' ');
+					break;
+
+				case 'title':
+				default:
+					// Default to 'title' if parameter is not valid
+					$query->where('LOWER( a.title ) LIKE ' . $filter);
+					break;
+			}
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language IN (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		// Filter by a single or group of tags.
+		$tagId = $this->getState('filter.tag');
+
+		if (is_array($tagId) && count($tagId) === 1)
+		{
+			$tagId = current($tagId);
+		}
+
+		if (is_array($tagId))
+		{
+			$tagId = implode(',', ArrayHelper::toInteger($tagId));
+
+			if ($tagId)
+			{
+				$subQuery = $db->getQuery(true)
+					->select('DISTINCT content_item_id')
+					->from($db->quoteName('#__contentitem_tag_map'))
+					->where('tag_id IN (' . $tagId . ')')
+					->where('type_alias = ' . $db->quote('com_content.article'));
+
+				$query->innerJoin('(' . (string) $subQuery . ') AS tagmap ON tagmap.content_item_id = a.id');
+			}
+		}
+		elseif ($tagId)
+		{
+			$query->innerJoin(
+				$db->quoteName('#__contentitem_tag_map', 'tagmap')
+				. ' ON tagmap.tag_id = ' . (int) $tagId
+				. ' AND tagmap.content_item_id = a.id'
+				. ' AND tagmap.type_alias = ' . $db->quote('com_content.article')
+			);
+		}
+
+		// Add the list ordering clause.
+		$query->order($this->getState('list.ordering', 'a.ordering') . ' ' . $this->getState('list.direction', 'ASC'));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a list of articles.
+	 *
+	 * Overriden to inject convert the attribs field into a JParameter object.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		$items  = parent::getItems();
+		$user   = JFactory::getUser();
+		$userId = $user->get('id');
+		$guest  = $user->get('guest');
+		$groups = $user->getAuthorisedViewLevels();
+		$input  = JFactory::getApplication()->input;
+
+		// Get the global params
+		$globalParams = JComponentHelper::getParams('com_content', true);
+
+		// Convert the parameter fields into objects.
+		foreach ($items as &$item)
+		{
+			$articleParams = new Registry($item->attribs);
+
+			// Unpack readmore and layout params
+			$item->alternative_readmore = $articleParams->get('alternative_readmore');
+			$item->layout               = $articleParams->get('layout');
+
+			$item->params = clone $this->getState('params');
+
+			/**
+			 * For blogs, article params override menu item params only if menu param = 'use_article'
+			 * Otherwise, menu item params control the layout
+			 * If menu item is 'use_article' and there is no article param, use global
+			 */
+			if (($input->getString('layout') === 'blog') || ($input->getString('view') === 'featured')
+				|| ($this->getState('params')->get('layout_type') === 'blog'))
+			{
+				// Create an array of just the params set to 'use_article'
+				$menuParamsArray = $this->getState('params')->toArray();
+				$articleArray    = array();
+
+				foreach ($menuParamsArray as $key => $value)
+				{
+					if ($value === 'use_article')
+					{
+						// If the article has a value, use it
+						if ($articleParams->get($key) != '')
+						{
+							// Get the value from the article
+							$articleArray[$key] = $articleParams->get($key);
+						}
+						else
+						{
+							// Otherwise, use the global value
+							$articleArray[$key] = $globalParams->get($key);
+						}
+					}
+				}
+
+				// Merge the selected article params
+				if (count($articleArray) > 0)
+				{
+					$articleParams = new Registry($articleArray);
+					$item->params->merge($articleParams);
+				}
+			}
+			else
+			{
+				// For non-blog layouts, merge all of the article params
+				$item->params->merge($articleParams);
+			}
+
+			// Get display date
+			switch ($item->params->get('list_show_date'))
+			{
+				case 'modified':
+					$item->displayDate = $item->modified;
+					break;
+
+				case 'published':
+					$item->displayDate = ($item->publish_up == 0) ? $item->created : $item->publish_up;
+					break;
+
+				default:
+				case 'created':
+					$item->displayDate = $item->created;
+					break;
+			}
+
+			/**
+			 * Compute the asset access permissions.
+			 * Technically guest could edit an article, but lets not check that to improve performance a little.
+			 */
+			if (!$guest)
+			{
+				$asset = 'com_content.article.' . $item->id;
+
+				// Check general edit permission first.
+				if ($user->authorise('core.edit', $asset))
+				{
+					$item->params->set('access-edit', true);
+				}
+
+				// Now check if edit.own is available.
+				elseif (!empty($userId) && $user->authorise('core.edit.own', $asset))
+				{
+					// Check for a valid user and that they are the owner.
+					if ($userId == $item->created_by)
+					{
+						$item->params->set('access-edit', true);
+					}
+				}
+			}
+
+			$access = $this->getState('filter.access');
+
+			if ($access)
+			{
+				// If the access filter has been set, we already have only the articles this user can view.
+				$item->params->set('access-view', true);
+			}
+			else
+			{
+				// If no access filter is set, the layout takes some responsibility for display of limited information.
+				if ($item->catid == 0 || $item->category_access === null)
+				{
+					$item->params->set('access-view', in_array($item->access, $groups));
+				}
+				else
+				{
+					$item->params->set('access-view', in_array($item->access, $groups) && in_array($item->category_access, $groups));
+				}
+			}
+
+			// Some contexts may not use tags data at all, so we allow callers to disable loading tag data
+			if ($this->getState('load_tags', $item->params->get('show_tags', '1')))
+			{
+				$item->tags = new JHelperTags;
+				$item->tags->getItemTags('com_content.article', $item->id);
+			}
+
+			if ($item->params->get('show_associations'))
+			{
+				$item->associations = ContentHelperAssociation::displayAssociations($item->id);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to get the starting number of items for the data set.
+	 *
+	 * @return  integer  The starting number of items available in the data set.
+	 *
+	 * @since   12.2
+	 */
+	public function getStart()
+	{
+		return $this->getState('list.start');
+	}
+}
diff --git a/core/components/com_content/models/categories.php b/core/components/com_content/models/categories.php
new file mode 100644
index 00000000..ab222cd3
--- /dev/null
+++ b/core/components/com_content/models/categories.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * This models supports retrieving lists of article categories.
+ *
+ * @since  1.6
+ */
+class ContentModelCategories extends JModelList
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_content.categories';
+
+	/**
+	 * The category context (allows other extensions to derived from this model).
+	 *
+	 * @var		string
+	 */
+	protected $_extension = 'com_content';
+
+	private $_parent = null;
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$this->setState('filter.extension', $this->_extension);
+
+		// Get the parent id if defined.
+		$parentId = $app->input->getInt('id');
+		$this->setState('filter.parentId', $parentId);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('filter.published',	1);
+		$this->setState('filter.access',	true);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id	.= ':' . $this->getState('filter.extension');
+		$id	.= ':' . $this->getState('filter.published');
+		$id	.= ':' . $this->getState('filter.access');
+		$id	.= ':' . $this->getState('filter.parentId');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Redefine the function an add some properties to make the styling more easy
+	 *
+	 * @param   bool  $recursive  True if you want to return children recursively.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems($recursive = false)
+	{
+		$store = $this->getStoreId();
+
+		if (!isset($this->cache[$store]))
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_num_articles_cat', 1) || !$params->get('show_empty_categories_cat', 0);
+			$categories = JCategories::getInstance('Content', $options);
+			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
+			if (is_object($this->_parent))
+			{
+				$this->cache[$store] = $this->_parent->getChildren($recursive);
+			}
+			else
+			{
+				$this->cache[$store] = false;
+			}
+		}
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Get the parent.
+	 *
+	 * @return  object  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_parent))
+		{
+			$this->getItems();
+		}
+
+		return $this->_parent;
+	}
+}
diff --git a/core/components/com_content/models/category.php b/core/components/com_content/models/category.php
new file mode 100644
index 00000000..78b83cdb
--- /dev/null
+++ b/core/components/com_content/models/category.php
@@ -0,0 +1,495 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * This models supports retrieving a category, the articles associated with the category,
+ * sibling, child and parent categories.
+ *
+ * @since  1.5
+ */
+class ContentModelCategory extends JModelList
+{
+	/**
+	 * Category items data
+	 *
+	 * @var array
+	 */
+	protected $_item = null;
+
+	protected $_articles = null;
+
+	protected $_siblings = null;
+
+	protected $_children = null;
+
+	protected $_parent = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	protected $_context = 'com_content.category';
+
+	/**
+	 * The category that applies.
+	 *
+	 * @access	protected
+	 * @var		object
+	 */
+	protected $_category = null;
+
+	/**
+	 * The list of other newfeed categories.
+	 *
+	 * @access	protected
+	 * @var		array
+	 */
+	protected $_categories = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_title',
+				'state', 'a.state',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'modified', 'a.modified',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'author', 'a.author',
+				'filter_tag'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication('site');
+		$pk  = $app->input->getInt('id');
+
+		$this->setState('category.id', $pk);
+
+		// Load the parameters. Merge Global and Menu Item params into new object
+		$params = $app->getParams();
+		$menuParams = new Registry;
+
+		if ($menu = $app->getMenu()->getActive())
+		{
+			$menuParams->loadString($menu->params);
+		}
+
+		$mergedParams = clone $menuParams;
+		$mergedParams->merge($params);
+
+		$this->setState('params', $mergedParams);
+		$user  = JFactory::getUser();
+
+		$asset = 'com_content';
+
+		if ($pk)
+		{
+			$asset .= '.category.' . $pk;
+		}
+
+		if ((!$user->authorise('core.edit.state', $asset)) &&  (!$user->authorise('core.edit', $asset)))
+		{
+			// Limit to published for people who can't edit or edit.state.
+			$this->setState('filter.published', 1);
+		}
+		else
+		{
+			$this->setState('filter.published', array(0, 1, 2));
+		}
+
+		// Process show_noauth parameter
+		if (!$params->get('show_noauth'))
+		{
+			$this->setState('filter.access', true);
+		}
+		else
+		{
+			$this->setState('filter.access', false);
+		}
+
+		$itemid = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
+
+		$value = $this->getUserStateFromRequest('com_content.category.filter.' . $itemid . '.tag', 'filter_tag', 0, 'int', false);
+		$this->setState('filter.tag', $value);
+
+		// Optional filter text
+		$search = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter-search', 'filter-search', '', 'string');
+		$this->setState('list.filter', $search);
+
+		// Filter.order
+		$orderCol = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'a.ordering';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir', 'filter_order_Dir', '', 'cmd');
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$this->setState('list.start', $app->input->get('limitstart', 0, 'uint'));
+
+		// Set limit for query. If list, use parameter. If blog, add blog parameters for limit.
+		if (($app->input->get('layout') === 'blog') || $params->get('layout_type') === 'blog')
+		{
+			$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+			$this->setState('list.links', $params->get('num_links'));
+		}
+		else
+		{
+			$limit = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.limit', 'limit', $params->get('display_num'), 'uint');
+		}
+
+		$this->setState('list.limit', $limit);
+
+		// Set the depth of the category query based on parameter
+		$showSubcategories = $params->get('show_subcategory_content', '0');
+
+		if ($showSubcategories)
+		{
+			$this->setState('filter.max_category_levels', $params->get('show_subcategory_content', '1'));
+			$this->setState('filter.subcategories', true);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		$this->setState('layout', $app->input->getString('layout'));
+
+		// Set the featured articles state
+		$this->setState('filter.featured', $params->get('show_featured'));
+	}
+
+	/**
+	 * Get the articles in the category
+	 *
+	 * @return  mixed  An array of articles or false if an error occurs.
+	 *
+	 * @since   1.5
+	 */
+	public function getItems()
+	{
+		$limit = $this->getState('list.limit');
+
+		if ($this->_articles === null && $category = $this->getCategory())
+		{
+			$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+			$model->setState('params', JFactory::getApplication()->getParams());
+			$model->setState('filter.category_id', $category->id);
+			$model->setState('filter.published', $this->getState('filter.published'));
+			$model->setState('filter.access', $this->getState('filter.access'));
+			$model->setState('filter.language', $this->getState('filter.language'));
+			$model->setState('filter.featured', $this->getState('filter.featured'));
+			$model->setState('list.ordering', $this->_buildContentOrderBy());
+			$model->setState('list.start', $this->getState('list.start'));
+			$model->setState('list.limit', $limit);
+			$model->setState('list.direction', $this->getState('list.direction'));
+			$model->setState('list.filter', $this->getState('list.filter'));
+			$model->setState('filter.tag', $this->getState('filter.tag'));
+
+			// Filter.subcategories indicates whether to include articles from subcategories in the list or blog
+			$model->setState('filter.subcategories', $this->getState('filter.subcategories'));
+			$model->setState('filter.max_category_levels', $this->getState('filter.max_category_levels'));
+			$model->setState('list.links', $this->getState('list.links'));
+
+			if ($limit >= 0)
+			{
+				$this->_articles = $model->getItems();
+
+				if ($this->_articles === false)
+				{
+					$this->setError($model->getError());
+				}
+			}
+			else
+			{
+				$this->_articles = array();
+			}
+
+			$this->_pagination = $model->getPagination();
+		}
+
+		return $this->_articles;
+	}
+
+	/**
+	 * Build the orderby for the query
+	 *
+	 * @return  string	$orderby portion of query
+	 *
+	 * @since   1.5
+	 */
+	protected function _buildContentOrderBy()
+	{
+		$app       = JFactory::getApplication('site');
+		$db        = $this->getDbo();
+		$params    = $this->state->params;
+		$itemid    = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
+		$orderCol  = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
+		$orderDirn = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir', 'filter_order_Dir', '', 'cmd');
+		$orderby   = ' ';
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = null;
+		}
+
+		if (!in_array(strtoupper($orderDirn), array('ASC', 'DESC', '')))
+		{
+			$orderDirn = 'ASC';
+		}
+
+		if ($orderCol && $orderDirn)
+		{
+			$orderby .= $db->escape($orderCol) . ' ' . $db->escape($orderDirn) . ', ';
+		}
+
+		$articleOrderby   = $params->get('orderby_sec', 'rdate');
+		$articleOrderDate = $params->get('order_date');
+		$categoryOrderby  = $params->def('orderby_pri', '');
+		$secondary        = ContentHelperQuery::orderbySecondary($articleOrderby, $articleOrderDate) . ', ';
+		$primary          = ContentHelperQuery::orderbyPrimary($categoryOrderby);
+
+		$orderby .= $primary . ' ' . $secondary . ' a.created ';
+
+		return $orderby;
+	}
+
+	/**
+	 * Method to get a JPagination object for the data set.
+	 *
+	 * @return  JPagination  A JPagination object for the data set.
+	 *
+	 * @since   12.2
+	 */
+	public function getPagination()
+	{
+		if (empty($this->_pagination))
+		{
+			return null;
+		}
+
+		return $this->_pagination;
+	}
+
+	/**
+	 * Method to get category data for the current category
+	 *
+	 * @return  object
+	 *
+	 * @since   1.5
+	 */
+	public function getCategory()
+	{
+		if (!is_object($this->_item))
+		{
+			if (isset($this->state->params))
+			{
+				$params = $this->state->params;
+				$options = array();
+				$options['countItems'] = $params->get('show_cat_num_articles', 1) || !$params->get('show_empty_categories_cat', 0);
+				$options['access']     = $params->get('check_access_rights', 1);
+			}
+			else
+			{
+				$options['countItems'] = 0;
+			}
+
+			$categories = JCategories::getInstance('Content', $options);
+			$this->_item = $categories->get($this->getState('category.id', 'root'));
+
+			// Compute selected asset permissions.
+			if (is_object($this->_item))
+			{
+				$user  = JFactory::getUser();
+				$asset = 'com_content.category.' . $this->_item->id;
+
+				// Check general create permission.
+				if ($user->authorise('core.create', $asset))
+				{
+					$this->_item->getParams()->set('access-create', true);
+				}
+
+				// TODO: Why aren't we lazy loading the children and siblings?
+				$this->_children = $this->_item->getChildren();
+				$this->_parent = false;
+
+				if ($this->_item->getParent())
+				{
+					$this->_parent = $this->_item->getParent();
+				}
+
+				$this->_rightsibling = $this->_item->getSibling();
+				$this->_leftsibling = $this->_item->getSibling(false);
+			}
+			else
+			{
+				$this->_children = false;
+				$this->_parent = false;
+			}
+		}
+
+		return $this->_item;
+	}
+
+	/**
+	 * Get the parent category.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
+	 * @since   1.6
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_parent;
+	}
+
+	/**
+	 * Get the left sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
+	 * @since   1.6
+	 */
+	public function &getLeftSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_leftsibling;
+	}
+
+	/**
+	 * Get the right sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
+	 * @since   1.6
+	 */
+	public function &getRightSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_rightsibling;
+	}
+
+	/**
+	 * Get the child categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 *
+	 * @since   1.6
+	 */
+	public function &getChildren()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		// Order subcategories
+		if ($this->_children)
+		{
+			$params = $this->getState()->get('params');
+
+			$orderByPri = $params->get('orderby_pri');
+
+			if ($orderByPri === 'alpha' || $orderByPri === 'ralpha')
+			{
+				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($orderByPri === 'alpha') ? 1 : (-1));
+			}
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Increment the hit counter for the category.
+	 *
+	 * @param   int  $pk  Optional primary key of the category to increment.
+	 *
+	 * @return  boolean True if successful; false otherwise and internal error set.
+	 */
+	public function hit($pk = 0)
+	{
+		$input = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
+
+			$table = JTable::getInstance('Category', 'JTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_content/models/featured.php b/core/components/com_content/models/featured.php
new file mode 100644
index 00000000..46e1104a
--- /dev/null
+++ b/core/components/com_content/models/featured.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('ContentModelArticles', __DIR__ . '/articles.php');
+
+/**
+ * Frontpage Component Model
+ *
+ * @since  1.5
+ */
+class ContentModelFeatured extends ContentModelArticles
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_content.frontpage';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   The field to order on.
+	 * @param   string  $direction  The direction to order on.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		parent::populateState($ordering, $direction);
+
+		$input = JFactory::getApplication()->input;
+		$user  = JFactory::getUser();
+		$app   = JFactory::getApplication('site');
+
+		// List state information
+		$limitstart = $input->getUInt('limitstart', 0);
+		$this->setState('list.start', $limitstart);
+
+		$params = $this->state->params;
+		$menuParams = new Registry;
+
+		if ($menu = $app->getMenu()->getActive())
+		{
+			$menuParams->loadString($menu->params);
+		}
+
+		$mergedParams = clone $menuParams;
+		$mergedParams->merge($params);
+
+		$this->setState('params', $mergedParams);
+
+		$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+		$this->setState('list.limit', $limit);
+		$this->setState('list.links', $params->get('num_links'));
+
+		$this->setState('filter.frontpage', true);
+
+		if ((!$user->authorise('core.edit.state', 'com_content')) &&  (!$user->authorise('core.edit', 'com_content')))
+		{
+			// Filter on published for those who do not have edit or edit.state rights.
+			$this->setState('filter.published', 1);
+		}
+		else
+		{
+			$this->setState('filter.published', array(0, 1, 2));
+		}
+
+		// Process show_noauth parameter
+		if (!$params->get('show_noauth'))
+		{
+			$this->setState('filter.access', true);
+		}
+		else
+		{
+			$this->setState('filter.access', false);
+		}
+
+		// Check for category selection
+		if ($params->get('featured_categories') && implode(',', $params->get('featured_categories')) == true)
+		{
+			$featuredCategories = $params->get('featured_categories');
+			$this->setState('filter.frontpage.categories', $featuredCategories);
+		}
+
+		$articleOrderby   = $params->get('orderby_sec', 'rdate');
+		$articleOrderDate = $params->get('order_date');
+		$categoryOrderby  = $params->def('orderby_pri', '');
+
+		$secondary = ContentHelperQuery::orderbySecondary($articleOrderby, $articleOrderDate);
+		$primary   = ContentHelperQuery::orderbyPrimary($categoryOrderby);
+
+		$this->setState('list.ordering', $primary . $secondary . ', a.created DESC');
+		$this->setState('list.direction', '');
+	}
+
+	/**
+	 * Method to get a list of articles.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		$params = clone $this->getState('params');
+		$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+
+		if ($limit > 0)
+		{
+			$this->setState('list.limit', $limit);
+
+			return parent::getItems();
+		}
+
+		return array();
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= $this->getState('filter.frontpage');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Get the list of items.
+	 *
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$query = parent::getListQuery();
+
+		// Filter by categories
+		$featuredCategories = $this->getState('filter.frontpage.categories');
+
+		if (is_array($featuredCategories) && !in_array('', $featuredCategories))
+		{
+			$query->where('a.catid IN (' . implode(',', $featuredCategories) . ')');
+		}
+
+		return $query;
+	}
+}
diff --git a/core/components/com_content/models/form.php b/core/components/com_content/models/form.php
new file mode 100644
index 00000000..bbe4a911
--- /dev/null
+++ b/core/components/com_content/models/form.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+// Base this model on the backend version.
+JLoader::register('ContentModelArticle', JPATH_ADMINISTRATOR . '/components/com_content/models/article.php');
+
+/**
+ * Content Component Article Model
+ *
+ * @since  1.5
+ */
+class ContentModelForm extends ContentModelArticle
+{
+	/**
+	 * Model typeAlias string. Used for version history.
+	 *
+	 * @var        string
+	 */
+	public $typeAlias = 'com_content.article';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication();
+
+		// Load state from the request.
+		$pk = $app->input->getInt('a_id');
+		$this->setState('article.id', $pk);
+
+		$this->setState('article.catid', $app->input->getInt('catid'));
+
+		$return = $app->input->get('return', null, 'base64');
+		$this->setState('return_page', base64_decode($return));
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('layout', $app->input->getString('layout'));
+	}
+
+	/**
+	 * Method to get article data.
+	 *
+	 * @param   integer  $itemId  The id of the article.
+	 *
+	 * @return  mixed  Content item data object on success, false on failure.
+	 */
+	public function getItem($itemId = null)
+	{
+		$itemId = (int) (!empty($itemId)) ? $itemId : $this->getState('article.id');
+
+		// Get a row instance.
+		$table = $this->getTable();
+
+		// Attempt to load the row.
+		$return = $table->load($itemId);
+
+		// Check for a table object error.
+		if ($return === false && $table->getError())
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$properties = $table->getProperties(1);
+		$value = ArrayHelper::toObject($properties, 'JObject');
+
+		// Convert attrib field to Registry.
+		$value->params = new Registry($value->attribs);
+
+		// Compute selected asset permissions.
+		$user   = JFactory::getUser();
+		$userId = $user->get('id');
+		$asset  = 'com_content.article.' . $value->id;
+
+		// Check general edit permission first.
+		if ($user->authorise('core.edit', $asset))
+		{
+			$value->params->set('access-edit', true);
+		}
+
+		// Now check if edit.own is available.
+		elseif (!empty($userId) && $user->authorise('core.edit.own', $asset))
+		{
+			// Check for a valid user and that they are the owner.
+			if ($userId == $value->created_by)
+			{
+				$value->params->set('access-edit', true);
+			}
+		}
+
+		// Check edit state permission.
+		if ($itemId)
+		{
+			// Existing item
+			$value->params->set('access-change', $user->authorise('core.edit.state', $asset));
+		}
+		else
+		{
+			// New item.
+			$catId = (int) $this->getState('article.catid');
+
+			if ($catId)
+			{
+				$value->params->set('access-change', $user->authorise('core.edit.state', 'com_content.category.' . $catId));
+				$value->catid = $catId;
+			}
+			else
+			{
+				$value->params->set('access-change', $user->authorise('core.edit.state', 'com_content'));
+			}
+		}
+
+		$value->articletext = $value->introtext;
+
+		if (!empty($value->fulltext))
+		{
+			$value->articletext .= '<hr id="system-readmore" />' . $value->fulltext;
+		}
+
+		// Convert the metadata field to an array.
+		$registry = new Registry($value->metadata);
+		$value->metadata = $registry->toArray();
+
+		if ($itemId)
+		{
+			$value->tags = new JHelperTags;
+			$value->tags->getTagIds($value->id, 'com_content.article');
+			$value->metadata['tags'] = $value->tags;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Get the return URL.
+	 *
+	 * @return  string	The return URL.
+	 *
+	 * @since   1.6
+	 */
+	public function getReturnPage()
+	{
+		return base64_encode($this->getState('return_page'));
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function save($data)
+	{
+		// Associations are not edited in frontend ATM so we have to inherit them
+		if (JLanguageAssociations::isEnabled() && !empty($data['id'])
+			&& $associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $data['id']))
+		{
+			foreach ($associations as $tag => $associated)
+			{
+				$associations[$tag] = (int) $associated->id;
+			}
+
+			$data['associations'] = $associations;
+		}
+
+		return parent::save($data);
+	}
+
+	/**
+	 * Allows preprocessing of the JForm object.
+	 *
+	 * @param   JForm   $form   The form object
+	 * @param   array   $data   The data to be merged into the form object
+	 * @param   string  $group  The plugin group to be executed
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'content')
+	{
+		$params = $this->getState()->get('params');
+
+		if ($params && $params->get('enable_category') == 1)
+		{
+			$form->setFieldAttribute('catid', 'default', $params->get('catid', 1));
+			$form->setFieldAttribute('catid', 'readonly', 'true');
+		}
+
+		return parent::preprocessForm($form, $data, $group);
+	}
+}
diff --git a/core/components/com_content/models/forms/article.xml b/core/components/com_content/models/forms/article.xml
new file mode 100644
index 00000000..cd35169c
--- /dev/null
+++ b/core/components/com_content/models/forms/article.xml
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_categories/models/fields">
+		<field
+			name="id"
+			type="hidden"
+			label="COM_CONTENT_ID_LABEL"
+			class="inputbox"
+			id="id"
+			size="10"
+			default="0"
+			readonly="true" 
+		/>
+
+		<field
+			name="contenthistory"
+			type="contenthistory"
+			label="JTOOLBAR_VERSIONS"
+			id="contenthistory"
+			data-typeAlias="com_content.article"
+		/>
+
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset" 
+		/>
+
+		<field
+			name="title"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="JFIELD_TITLE_DESC"
+			id="title"
+			class="inputbox"
+			size="30"
+			required="true" 
+		/>
+
+		<field
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			id="alias"
+			hint="JFIELD_ALIAS_PLACEHOLDER"
+			class="inputbox"
+			size="45" 
+		/>
+
+		<field
+			name="articletext"
+			type="editor"
+			label="CONTENT_TEXT_LABEL"
+			description="CONTENT_TEXT_DESC"
+			buttons="true"
+			class="inputbox"
+			filter="JComponentHelper::filterText"
+			asset_id="com_content"
+		/>
+
+		<field
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			id="state"
+			class="inputbox"
+			size="1"
+			default="1"
+			>
+			<option value="1">JPUBLISHED</option>
+			<option value="0">JUNPUBLISHED</option>
+			<option value="2">JARCHIVED</option>
+			<option value="-2">JTRASHED</option>
+		</field>
+
+		<field
+			name="featured"
+			type="list"
+			label="JGLOBAL_FIELD_FEATURED_LABEL"
+			description="JGLOBAL_FIELD_FEATURED_DESC"
+			id="featured"
+			class="inputbox"
+			default="0"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			name="catid"
+			type="categoryedit"
+			label="JCATEGORY"
+			description="JFIELD_CATEGORY_DESC"
+			id="catid"
+			extension="com_content"
+			class="inputbox"
+			required="true"
+		/>
+
+		<field
+			name="created"
+			type="calendar"
+			translateformat="true"
+			id="created"
+			filter="unset" 
+		/>
+
+		<field
+			name="created_by"
+			type="text"
+			id="created_by"
+			filter="unset" 
+		/>
+
+		<field
+			name="created_by_alias"
+			type="text"
+			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			id="created_by_alias"
+			class="inputbox"
+			size="20" 
+		/>
+
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
+			class="inputbox"
+			maxlength="255"
+			size="45"
+			labelclass="control-label" 
+		/>
+
+		<field
+			name="publish_up"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_UP_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
+			id="publish_up"
+			class="inputbox"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="publish_down"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
+			id="publish_down"
+			class="inputbox"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc"
+		/>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_LANGUAGE_DESC"
+			class="inputbox"
+			>
+			<option value="*">JALL</option>
+		</field>
+
+		<field 
+			name="tags"
+			type="tag"
+			label="JTAG"
+			description="JTAG_DESC"
+			class="inputbox"
+			multiple="true"
+			size="45"
+		/>
+
+		<field
+			name="metakey"
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
+			id="metakey"
+			class="inputbox"
+			rows="5"
+			cols="50"
+		/>
+
+		<field
+			name="metadesc"
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
+			id="metadesc"
+			class="inputbox"
+			rows="5"
+			cols="50" 
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			id="access"
+			class="inputbox"
+			size="1" 
+		/>
+
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_CONTENT_CAPTCHA_LABEL"
+			description="COM_CONTENT_CAPTCHA_DESC"
+			validate="captcha"
+			namespace="article" 
+		/>
+	</fieldset>
+		<fields name="images">
+		<fieldset name="image-intro">
+			<field
+				name="image_intro"
+				type="media"
+				label="COM_CONTENT_FIELD_INTRO_LABEL"
+				description="COM_CONTENT_FIELD_INTRO_DESC" 
+			/>
+			
+			<field 
+				name="image_intro_alt"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
+				class="inputbox"
+				size="20" 
+			/>
+			
+			<field 
+				name="image_intro_caption"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
+				class="inputbox"
+				size="20" 
+			/>
+			
+			<field
+				name="float_intro"
+				type="list"
+				label="COM_CONTENT_FLOAT_INTRO_LABEL"
+				description="COM_CONTENT_FLOAT_DESC"
+				useglobal="true"
+				>
+				<option value="right">COM_CONTENT_RIGHT</option>
+				<option value="left">COM_CONTENT_LEFT</option>
+				<option value="none">COM_CONTENT_NONE</option>
+			</field>
+		</fieldset>
+		<fieldset name="image-full">
+			<field
+				name="image_fulltext"
+				type="media"
+				label="COM_CONTENT_FIELD_FULL_LABEL"
+				description="COM_CONTENT_FIELD_FULL_DESC" 
+			/>
+			
+			<field 
+				name="image_fulltext_alt"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
+				class="inputbox"
+				size="20" 
+			/>
+			
+			<field 
+				name="image_fulltext_caption"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
+				class="inputbox"
+				size="20" 
+			/>
+			
+			<field
+				name="float_fulltext"
+				type="list"
+				label="COM_CONTENT_FLOAT_FULLTEXT_LABEL"
+				description="COM_CONTENT_FLOAT_DESC"
+				useglobal="true"
+				>
+				<option value="right">COM_CONTENT_RIGHT</option>
+				<option value="left">COM_CONTENT_LEFT</option>
+				<option value="none">COM_CONTENT_NONE</option>
+			</field>
+		</fieldset>
+	</fields>
+	<fields name="urls">
+		<field
+			name="urla"
+			type="url"
+			label="COM_CONTENT_FIELD_URLA_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
+			validate="url"
+			filter="url"
+			relative="true"
+		/>
+
+		<field 
+			name="urlatext"
+			type="text"
+			label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
+			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+			class="inputbox"
+			size="20" 
+		/>
+		
+		<field
+			name="targeta"
+			type="hidden"
+		/>
+
+		<field
+			name="urlb"
+			type="url"
+			label="COM_CONTENT_FIELD_URLB_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
+			validate="url"
+			filter="url"
+			relative="true"
+		/>
+
+		<field 
+			name="urlbtext"
+			type="text"
+			label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
+			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+			class="inputbox"
+			size="20" 
+		/>
+		
+		<field
+			name="targetb"
+			type="hidden"
+		/>
+		
+		<field
+			name="urlc"
+			type="url"
+			label="COM_CONTENT_FIELD_URLC_LABEL"
+			description="COM_CONTENT_FIELD_URL_DESC"
+ 			validate="url"
+			filter="url"
+			relative="true"
+		/>
+
+		<field
+			name="urlctext"
+			type="text"
+			label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
+			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+			class="inputbox"
+			size="20" 
+		/>
+		
+		<field
+			name="targetc"
+			type="hidden"
+		/>
+	</fields>
+	<fields name="metadata">
+		<fieldset 
+			name="jmetadata"
+			label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+
+				<field 
+					name="robots"
+					type="hidden"
+					label="JFIELD_METADATA_ROBOTS_LABEL"
+					description="JFIELD_METADATA_ROBOTS_DESC"
+					filter="unset"
+					labelclass="control-label"
+					>
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+					<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+					<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+					<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+				</field>
+
+				<field 
+					name="author"
+					type="hidden"
+					label="JAUTHOR"
+					description="JFIELD_METADATA_AUTHOR_DESC"
+					filter="unset"
+					size="20"
+					labelclass="control-label"
+				/>
+
+				<field 
+					name="rights"
+					type="hidden"
+					label="JFIELD_META_RIGHTS_LABEL"
+					description="JFIELD_META_RIGHTS_DESC"
+					filter="unset"
+					labelclass="control-label"
+				/>
+
+				<field 
+					name="xreference"
+					type="hidden"
+					label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
+					description="COM_CONTENT_FIELD_XREFERENCE_DESC"
+					filter="unset"
+					class="inputbox"
+					size="20"
+					labelclass="control-label" 
+				/>
+
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/components/com_content/models/forms/filter_articles.xml b/core/components/com_content/models/forms/filter_articles.xml
new file mode 100644
index 00000000..0879221d
--- /dev/null
+++ b/core/components/com_content/models/forms/filter_articles.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_CONTENT_MODAL_FILTER_SEARCH_LABEL"
+			description="COM_CONTENT_MODAL_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+
+		<field
+			name="published"
+			type="status"
+			label="COM_CONTENT_FILTER_PUBLISHED"
+			description="COM_CONTENT_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_content"
+			onchange="this.form.submit();"
+			published="0,1,2"
+		/>
+
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+
+		<field
+			name="author_id"
+			type="author"
+			label="COM_CONTENT_FILTER_AUTHOR"
+			description="COM_CONTENT_FILTER_AUTHOR_DESC"
+			multiple="true"
+			class="multipleAuthors"
+			onchange="this.form.submit();"
+			>
+			<option value="0">JNONE</option>
+		</field>
+
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+			<option value="*">JALL</option>
+		</field>
+
+		<field
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			multiple="true"
+			class="multipleTags"
+			mode="nested"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.title ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="category_title ASC">JCATEGORY_ASC</option>
+			<option value="category_title DESC">JCATEGORY_DESC</option>
+			<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
+			<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="a.created_by ASC">JAUTHOR_ASC</option>
+			<option value="a.created_by DESC">JAUTHOR_DESC</option>
+			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.created ASC">JDATE_ASC</option>
+			<option value="a.created DESC">JDATE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+			<option value="a.featured ASC">JFEATURED_ASC</option>
+			<option value="a.featured DESC">JFEATURED_DESC</option>
+			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
+			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="inputbox input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
\ No newline at end of file
diff --git a/core/components/com_content/router.php b/core/components/com_content/router.php
new file mode 100644
index 00000000..840486e5
--- /dev/null
+++ b/core/components/com_content/router.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class of com_content
+ *
+ * @since  3.3
+ */
+class ContentRouter extends JComponentRouterView
+{
+	protected $noIDs = false;
+
+	/**
+	 * Content Component router constructor
+	 *
+	 * @param   JApplicationCms  $app   The application object
+	 * @param   JMenu            $menu  The menu object to work with
+	 */
+	public function __construct($app = null, $menu = null)
+	{
+		$params = JComponentHelper::getParams('com_content');
+		$this->noIDs = (bool) $params->get('sef_ids');
+		$categories = new JComponentRouterViewconfiguration('categories');
+		$categories->setKey('id');
+		$this->registerView($categories);
+		$category = new JComponentRouterViewconfiguration('category');
+		$category->setKey('id')->setParent($categories, 'catid')->setNestable()->addLayout('blog');
+		$this->registerView($category);
+		$article = new JComponentRouterViewconfiguration('article');
+		$article->setKey('id')->setParent($category, 'catid');
+		$this->registerView($article);
+		$this->registerView(new JComponentRouterViewconfiguration('archive'));
+		$this->registerView(new JComponentRouterViewconfiguration('featured'));
+		$form = new JComponentRouterViewconfiguration('form');
+		$form->setKey('a_id');
+		$this->registerView($form);
+
+		parent::__construct($app, $menu);
+
+		$this->attachRule(new JComponentRouterRulesMenu($this));
+
+		if ($params->get('sef_advanced', 0))
+		{
+			$this->attachRule(new JComponentRouterRulesStandard($this));
+			$this->attachRule(new JComponentRouterRulesNomenu($this));
+		}
+		else
+		{
+			JLoader::register('ContentRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
+			$this->attachRule(new ContentRouterRulesLegacy($this));
+		}
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $id     ID of the category to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getCategorySegment($id, $query)
+	{
+		$category = JCategories::getInstance($this->getName())->get($id);
+
+		if ($category)
+		{
+			$path = array_reverse($category->getPath(), true);
+			$path[0] = '1:root';
+
+			if ($this->noIDs)
+			{
+				foreach ($path as &$segment)
+				{
+					list($id, $segment) = explode(':', $segment, 2);
+				}
+			}
+
+			return $path;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $id     ID of the category to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getCategoriesSegment($id, $query)
+	{
+		return $this->getCategorySegment($id, $query);
+	}
+
+	/**
+	 * Method to get the segment(s) for an article
+	 *
+	 * @param   string  $id     ID of the article to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getArticleSegment($id, $query)
+	{
+		if (!strpos($id, ':'))
+		{
+			$db = JFactory::getDbo();
+			$dbquery = $db->getQuery(true);
+			$dbquery->select($dbquery->qn('alias'))
+				->from($dbquery->qn('#__content'))
+				->where('id = ' . $dbquery->q($id));
+			$db->setQuery($dbquery);
+
+			$id .= ':' . $db->loadResult();
+		}
+
+		if ($this->noIDs)
+		{
+			list($void, $segment) = explode(':', $id, 2);
+
+			return array($void => $segment);
+		}
+
+		return array((int) $id => $id);
+	}
+
+	/**
+	 * Method to get the segment(s) for a form
+	 *
+	 * @param   string  $id     ID of the article form to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 *
+	 * @since   3.7.3
+	 */
+	public function getFormSegment($id, $query)
+	{
+		return $this->getArticleSegment($id, $query);
+	}
+
+	/**
+	 * Method to get the id for a category
+	 *
+	 * @param   string  $segment  Segment to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getCategoryId($segment, $query)
+	{
+		if (isset($query['id']))
+		{
+			$category = JCategories::getInstance($this->getName(), array('access' => false))->get($query['id']);
+
+			if ($category)
+			{
+				foreach ($category->getChildren() as $child)
+				{
+					if ($this->noIDs)
+					{
+						if ($child->alias == $segment)
+						{
+							return $child->id;
+						}
+					}
+					else
+					{
+						if ($child->id == (int) $segment)
+						{
+							return $child->id;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $segment  Segment to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getCategoriesId($segment, $query)
+	{
+		return $this->getCategoryId($segment, $query);
+	}
+
+	/**
+	 * Method to get the segment(s) for an article
+	 *
+	 * @param   string  $segment  Segment of the article to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getArticleId($segment, $query)
+	{
+		if ($this->noIDs)
+		{
+			$db = JFactory::getDbo();
+			$dbquery = $db->getQuery(true);
+			$dbquery->select($dbquery->qn('id'))
+				->from($dbquery->qn('#__content'))
+				->where('alias = ' . $dbquery->q($segment))
+				->where('catid = ' . $dbquery->q($query['id']));
+			$db->setQuery($dbquery);
+
+			return (int) $db->loadResult();
+		}
+
+		return (int) $segment;
+	}
+}
+
+/**
+ * Content router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function contentBuildRoute(&$query)
+{
+	$app = JFactory::getApplication();
+	$router = new ContentRouter($app, $app->getMenu());
+
+	return $router->build($query);
+}
+
+/**
+ * Parse the segments of a URL.
+ *
+ * This function is a proxy for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @since   3.3
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function contentParseRoute($segments)
+{
+	$app = JFactory::getApplication();
+	$router = new ContentRouter($app, $app->getMenu());
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_content/views/archive/tmpl/default.php b/core/components/com_content/views/archive/tmpl/default.php
new file mode 100644
index 00000000..e46eae1b
--- /dev/null
+++ b/core/components/com_content/views/archive/tmpl/default.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('behavior.caption');
+?>
+<div class="archive<?php echo $this->pageclass_sfx; ?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<div class="page-header">
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+</div>
+<?php endif; ?>
+<form id="adminForm" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-inline">
+	<fieldset class="filters">
+	<div class="filter-search">
+		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
+		<label class="filter-search-lbl element-invisible" for="filter-search"><?php echo JText::_('COM_CONTENT_TITLE_FILTER_LABEL') . '&#160;'; ?></label>
+		<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->filter); ?>" class="inputbox span2" onchange="document.getElementById('adminForm').submit();" placeholder="<?php echo JText::_('COM_CONTENT_TITLE_FILTER_LABEL'); ?>" />
+		<?php endif; ?>
+
+		<?php echo $this->form->monthField; ?>
+		<?php echo $this->form->yearField; ?>
+		<?php echo $this->form->limitField; ?>
+
+		<button type="submit" class="btn btn-primary" style="vertical-align: top;"><?php echo JText::_('JGLOBAL_FILTER_BUTTON'); ?></button>
+		<input type="hidden" name="view" value="archive" />
+		<input type="hidden" name="option" value="com_content" />
+		<input type="hidden" name="limitstart" value="0" />
+	</div>
+	<br />
+	</fieldset>
+
+	<?php echo $this->loadTemplate('items'); ?>
+</form>
+</div>
diff --git a/core/components/com_content/views/archive/tmpl/default.xml b/core/components/com_content/views/archive/tmpl/default.xml
new file mode 100644
index 00000000..2a46dd43
--- /dev/null
+++ b/core/components/com_content/views/archive/tmpl/default.xml
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_content_archive_view_default_title" option="com_content_archive_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED"
+		/>
+		<message>
+			<![CDATA[com_content_archive_view_default_desc]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_categories/models/fields"
+		>
+			<field
+				name="catid"
+				type="category"
+				extension="com_content"
+				multiple="true"
+				size="5"
+				label="JCATEGORY"
+				description="JFIELD_CATEGORY_DESC"
+			>
+				<option value="">JOPTION_ALL_CATEGORIES</option>
+			</field>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic" label="JGLOBAL_ARCHIVE_OPTIONS"
+		>
+
+			<field 
+				name="orderby_sec" 
+				type="list"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				default="alpha"
+				>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
+				<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+				<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+				<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+				<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			</field>
+
+			<field 
+				name="order_date" 
+				type="list"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				default="created"
+				>
+				<option value="created">JGLOBAL_Created</option>
+				<option value="modified">JGLOBAL_Modified</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field 
+				name="display_num" 
+				type="list"
+				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
+				description="JGLOBAL_NUMBER_ITEMS_LIST_DESC"
+				default="5"
+				>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="introtext_limit" 
+				type="number" 
+				label="JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_LABEL"
+				description="JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_DESC" 
+				default="100"
+			/>
+
+		</fieldset>
+
+		<!-- Articles options. -->
+		<fieldset name="articles"
+			label="COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL"
+		>
+
+			<field 
+				name="show_intro" 
+				type="list"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field
+				name="info_block_show_title"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_category" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_category" 
+				type="list"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_parent_category"
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_parent_category"
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field 
+				name="link_titles" 
+				type="list"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_author" 
+				type="list"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_author"
+				type="list"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				useglobal="true"
+				>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_create_date" 
+				type="list"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_modify_date" 
+				type="list"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_publish_date" 
+				type="list"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_navigation" 
+				type="list"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_hits" 
+				type="list"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+	</fields>
+</metadata>
diff --git a/core/components/com_content/views/archive/tmpl/default_items.php b/core/components/com_content/views/archive/tmpl/default_items.php
new file mode 100644
index 00000000..12579f8b
--- /dev/null
+++ b/core/components/com_content/views/archive/tmpl/default_items.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+$params = $this->params;
+?>
+
+<div id="archive-items">
+	<?php foreach ($this->items as $i => $item) : ?>
+		<?php $info = $item->params->get('info_block_position', 0); ?>
+		<div class="row<?php echo $i % 2; ?>" itemscope itemtype="https://schema.org/Article">
+			<div class="page-header">
+				<h2 itemprop="headline">
+					<?php if ($params->get('link_titles')) : ?>
+						<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)); ?>" itemprop="url">
+							<?php echo $this->escape($item->title); ?>
+						</a>
+					<?php else : ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+				</h2>
+
+				<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+				<?php echo $item->event->afterDisplayTitle; ?>
+
+				<?php if ($params->get('show_author') && !empty($item->author )) : ?>
+					<div class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
+					<?php $author = $item->created_by_alias ?: $item->author; ?>
+					<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
+						<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author, array('itemprop' => 'url'))); ?>
+						<?php else : ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+						<?php endif; ?>
+					</div>
+				<?php endif; ?>
+			</div>
+		<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+			|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category')); ?>
+		<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
+			<div class="article-info muted">
+				<dl class="article-info">
+				<dt class="article-info-term">
+					<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+				</dt>
+
+				<?php if ($params->get('show_parent_category') && !empty($item->parent_slug)) : ?>
+					<dd>
+						<div class="parent-category-name">
+							<?php $title = $this->escape($item->parent_title); ?>
+							<?php if ($params->get('link_parent_category') && !empty($item->parent_slug)) : ?>
+								<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->parent_slug)) . '" itemprop="genre">' . $title . '</a>'; ?>
+								<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+							<?php else : ?>
+								<?php echo JText::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
+							<?php endif; ?>
+						</div>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_category')) : ?>
+					<dd>
+						<div class="category-name">
+							<?php $title = $this->escape($item->category_title); ?>
+							<?php if ($params->get('link_category') && $item->catslug) : ?>
+								<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug)) . '" itemprop="genre">' . $title . '</a>'; ?>
+								<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+							<?php else : ?>
+								<?php echo JText::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
+							<?php endif; ?>
+						</div>
+					</dd>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_publish_date')) : ?>
+					<dd>
+						<div class="published">
+							<span class="icon-calendar" aria-hidden="true"></span>
+							<time datetime="<?php echo JHtml::_('date', $item->publish_up, 'c'); ?>" itemprop="datePublished">
+								<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+							</time>
+						</div>
+					</dd>
+				<?php endif; ?>
+
+				<?php if ($info == 0) : ?>
+					<?php if ($params->get('show_modify_date')) : ?>
+						<dd>
+							<div class="modified">
+								<span class="icon-calendar" aria-hidden="true"></span>
+								<time datetime="<?php echo JHtml::_('date', $item->modified, 'c'); ?>" itemprop="dateModified">
+									<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+								</time>
+							</div>
+						</dd>
+					<?php endif; ?>
+					<?php if ($params->get('show_create_date')) : ?>
+						<dd>
+							<div class="create">
+								<span class="icon-calendar" aria-hidden="true"></span>
+								<time datetime="<?php echo JHtml::_('date', $item->created, 'c'); ?>" itemprop="dateCreated">
+									<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC3'))); ?>
+								</time>
+							</div>
+						</dd>
+					<?php endif; ?>
+
+					<?php if ($params->get('show_hits')) : ?>
+						<dd>
+							<div class="hits">
+								<span class="icon-eye-open"></span>
+								<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $item->hits; ?>" />
+								<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+				<?php endif; ?>
+				</dl>
+			</div>
+		<?php endif; ?>
+
+		<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+		<?php echo $item->event->beforeDisplayContent; ?>
+		<?php if ($params->get('show_intro')) : ?>
+			<div class="intro" itemprop="articleBody"> <?php echo JHtml::_('string.truncateComplex', $item->introtext, $params->get('introtext_limit')); ?> </div>
+		<?php endif; ?>
+
+		<?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
+			<div class="article-info muted">
+				<dl class="article-info">
+				<dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+
+				<?php if ($info == 1) : ?>
+					<?php if ($params->get('show_parent_category') && !empty($item->parent_slug)) : ?>
+						<dd>
+							<div class="parent-category-name">
+								<?php $title = $this->escape($item->parent_title); ?>
+								<?php if ($params->get('link_parent_category') && $item->parent_slug) : ?>
+									<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->parent_slug)) . '" itemprop="genre">' . $title . '</a>'; ?>
+									<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+								<?php else : ?>
+									<?php echo JText::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
+								<?php endif; ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+					<?php if ($params->get('show_category')) : ?>
+						<dd>
+							<div class="category-name">
+								<?php $title = $this->escape($item->category_title); ?>
+								<?php if ($params->get('link_category') && $item->catslug) : ?>
+									<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug)) . '" itemprop="genre">' . $title . '</a>'; ?>
+									<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+								<?php else : ?>
+									<?php echo JText::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
+								<?php endif; ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+					<?php if ($params->get('show_publish_date')) : ?>
+						<dd>
+							<div class="published">
+								<span class="icon-calendar" aria-hidden="true"></span>
+								<time datetime="<?php echo JHtml::_('date', $item->publish_up, 'c'); ?>" itemprop="datePublished">
+									<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+								</time>
+							</div>
+						</dd>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_create_date')) : ?>
+					<dd>
+						<div class="create">
+							<span class="icon-calendar" aria-hidden="true"></span>
+							<time datetime="<?php echo JHtml::_('date', $item->created, 'c'); ?>" itemprop="dateCreated">
+								<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+							</time>
+						</div>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_modify_date')) : ?>
+					<dd>
+						<div class="modified">
+							<span class="icon-calendar" aria-hidden="true"></span>
+							<time datetime="<?php echo JHtml::_('date', $item->modified, 'c'); ?>" itemprop="dateModified">
+								<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+							</time>
+						</div>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_hits')) : ?>
+					<dd>
+						<div class="hits">
+							<span class="icon-eye-open"></span>
+							<meta content="UserPageVisits:<?php echo $item->hits; ?>" itemprop="interactionCount" />
+							<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
+						</div>
+					</dd>
+				<?php endif; ?>
+			</dl>
+		</div>
+		<?php endif; ?>
+		<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
+		<?php echo $item->event->afterDisplayContent; ?>
+	</div>
+	<?php endforeach; ?>
+</div>
+<div class="pagination">
+	<p class="counter"> <?php echo $this->pagination->getPagesCounter(); ?> </p>
+	<?php echo $this->pagination->getPagesLinks(); ?>
+</div>
diff --git a/core/components/com_content/views/archive/view.html.php b/core/components/com_content/views/archive/view.html.php
new file mode 100644
index 00000000..0171db6e
--- /dev/null
+++ b/core/components/com_content/views/archive/view.html.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Content component
+ *
+ * @since  1.5
+ */
+class ContentViewArchive extends JViewLegacy
+{
+	protected $state = null;
+
+	protected $item = null;
+
+	protected $items = null;
+
+	protected $pagination = null;
+
+	protected $years = null;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$user       = JFactory::getUser();
+		$state      = $this->get('State');
+		$items      = $this->get('Items');
+		$pagination = $this->get('Pagination');
+
+		// Get the page/component configuration
+		$params = &$state->params;
+
+		JPluginHelper::importPlugin('content');
+
+		foreach ($items as $item)
+		{
+			$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+			// No link for ROOT category
+			if ($item->parent_alias === 'root')
+			{
+				$item->parent_slug = null;
+			}
+
+			$item->event = new stdClass;
+
+			$dispatcher = JEventDispatcher::getInstance();
+
+			// Old plugins: Ensure that text property is available
+			if (!isset($item->text))
+			{
+				$item->text = $item->introtext;
+			}
+
+			$dispatcher->trigger('onContentPrepare', array ('com_content.archive', &$item, &$item->params, 0));
+
+			// Old plugins: Use processed text as introtext
+			$item->introtext = $item->text;
+
+			$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.archive', &$item, &$item->params, 0));
+			$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.archive', &$item, &$item->params, 0));
+			$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.archive', &$item, &$item->params, 0));
+			$item->event->afterDisplayContent = trim(implode("\n", $results));
+		}
+
+		$form = new stdClass;
+
+		// Month Field
+		$months = array(
+			'' => JText::_('COM_CONTENT_MONTH'),
+			'1' => JText::_('JANUARY_SHORT'),
+			'2' => JText::_('FEBRUARY_SHORT'),
+			'3' => JText::_('MARCH_SHORT'),
+			'4' => JText::_('APRIL_SHORT'),
+			'5' => JText::_('MAY_SHORT'),
+			'6' => JText::_('JUNE_SHORT'),
+			'7' => JText::_('JULY_SHORT'),
+			'8' => JText::_('AUGUST_SHORT'),
+			'9' => JText::_('SEPTEMBER_SHORT'),
+			'10' => JText::_('OCTOBER_SHORT'),
+			'11' => JText::_('NOVEMBER_SHORT'),
+			'12' => JText::_('DECEMBER_SHORT')
+		);
+		$form->monthField = JHtml::_(
+			'select.genericlist',
+			$months,
+			'month',
+			array(
+				'list.attr' => 'size="1" class="inputbox"',
+				'list.select' => $state->get('filter.month'),
+				'option.key' => null
+			)
+		);
+
+		// Year Field
+		$this->years = $this->getModel()->getYears();
+		$years = array();
+		$years[] = JHtml::_('select.option', null, JText::_('JYEAR'));
+
+		for ($i = 0, $iMax = count($this->years); $i < $iMax; $i++)
+		{
+			$years[] = JHtml::_('select.option', $this->years[$i], $this->years[$i]);
+		}
+
+		$form->yearField = JHtml::_(
+			'select.genericlist',
+			$years,
+			'year',
+			array('list.attr' => 'size="1" class="inputbox"', 'list.select' => $state->get('filter.year'))
+		);
+		$form->limitField = $pagination->getLimitBox();
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->filter     = $state->get('list.filter');
+		$this->form       = &$form;
+		$this->items      = &$items;
+		$this->params     = &$params;
+		$this->user       = &$user;
+		$this->pagination = &$pagination;
+		$this->pagination->setAdditionalUrlParam('month', $state->get('filter.month'));
+		$this->pagination->setAdditionalUrlParam('year', $state->get('filter.year'));
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 */
+	protected function _prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_content/views/article/tmpl/default.php b/core/components/com_content/views/article/tmpl/default.php
new file mode 100644
index 00000000..7ec0ee41
--- /dev/null
+++ b/core/components/com_content/views/article/tmpl/default.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+// Create shortcuts to some parameters.
+$params  = $this->item->params;
+$images  = json_decode($this->item->images);
+$urls    = json_decode($this->item->urls);
+$canEdit = $params->get('access-edit');
+$user    = JFactory::getUser();
+$info    = $params->get('info_block_position', 0);
+
+// Check if associations are implemented. If they are, define the parameter.
+$assocParam = (JLanguageAssociations::isEnabled() && $params->get('show_associations'));
+JHtml::_('behavior.caption');
+
+?>
+<div class="item-page<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Article">
+	<meta itemprop="inLanguage" content="<?php echo ($this->item->language === '*') ? JFactory::getConfig()->get('language') : $this->item->language; ?>" />
+	<?php if ($this->params->get('show_page_heading')) : ?>
+	<div class="page-header">
+		<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
+	</div>
+	<?php endif;
+	if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative)
+	{
+		echo $this->item->pagination;
+	}
+	?>
+
+	<?php // Todo Not that elegant would be nice to group the params ?>
+	<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') || $assocParam); ?>
+
+	<?php if (!$useDefList && $this->print) : ?>
+		<div id="pop-print" class="btn hidden-print">
+			<?php echo JHtml::_('icon.print_screen', $this->item, $params); ?>
+		</div>
+		<div class="clearfix"> </div>
+	<?php endif; ?>
+	<?php if ($params->get('show_title') || $params->get('show_author')) : ?>
+	<div class="page-header">
+		<?php if ($params->get('show_title')) : ?>
+			<h2 itemprop="headline">
+				<?php echo $this->escape($this->item->title); ?>
+			</h2>
+		<?php endif; ?>
+		<?php if ($this->item->state == 0) : ?>
+			<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+		<?php endif; ?>
+		<?php if (strtotime($this->item->publish_up) > strtotime(JFactory::getDate())) : ?>
+			<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+		<?php endif; ?>
+		<?php if ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?>
+			<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<?php endif; ?>
+	</div>
+	<?php endif; ?>
+	<?php if (!$this->print) : ?>
+		<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+			<?php echo JLayoutHelper::render('joomla.content.icons', array('params' => $params, 'item' => $this->item, 'print' => false)); ?>
+		<?php endif; ?>
+	<?php else : ?>
+		<?php if ($useDefList) : ?>
+			<div id="pop-print" class="btn hidden-print">
+				<?php echo JHtml::_('icon.print_screen', $this->item, $params); ?>
+			</div>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
+	<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
+		<?php // Todo: for Joomla4 joomla.content.info_block.block can be changed to joomla.content.info_block ?>
+		<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
+	<?php endif; ?>
+
+	<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+
+		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+	<?php endif; ?>
+
+	<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
+	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position)))
+		|| (empty($urls->urls_position) && (!$params->get('urls_position')))) : ?>
+	<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+	<?php if ($params->get('access-view')) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.full_image', $this->item); ?>
+	<?php
+	if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative) :
+		echo $this->item->pagination;
+	endif;
+	?>
+	<?php if (isset ($this->item->toc)) :
+		echo $this->item->toc;
+	endif; ?>
+	<div itemprop="articleBody">
+		<?php echo $this->item->text; ?>
+	</div>
+
+	<?php if ($info == 1 || $info == 2) : ?>
+		<?php if ($useDefList) : ?>
+				<?php // Todo: for Joomla4 joomla.content.info_block.block can be changed to joomla.content.info_block ?>
+			<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+		<?php endif; ?>
+		<?php if ($params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+			<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+			<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php
+	if (!empty($this->item->pagination) && $this->item->pagination && $this->item->paginationposition && !$this->item->paginationrelative) :
+		echo $this->item->pagination;
+	?>
+	<?php endif; ?>
+	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '1')) || ($params->get('urls_position') == '1'))) : ?>
+	<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+	<?php // Optional teaser intro text for guests ?>
+	<?php elseif ($params->get('show_noauth') == true && $user->get('guest')) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
+	<?php echo JHtml::_('content.prepare', $this->item->introtext); ?>
+	<?php // Optional link to let them register to see the whole article. ?>
+	<?php if ($params->get('show_readmore') && $this->item->fulltext != null) : ?>
+	<?php $menu = JFactory::getApplication()->getMenu(); ?>
+	<?php $active = $menu->getActive(); ?>
+	<?php $itemId = $active->id; ?>
+	<?php $link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false)); ?>
+	<?php $link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language))); ?>
+	<p class="readmore">
+		<a href="<?php echo $link; ?>" class="register">
+		<?php $attribs = json_decode($this->item->attribs); ?>
+		<?php
+		if ($attribs->alternative_readmore == null) :
+			echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE');
+		elseif ($readmore = $attribs->alternative_readmore) :
+			echo $readmore;
+			if ($params->get('show_readmore_title', 0) != 0) :
+				echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
+			endif;
+		elseif ($params->get('show_readmore_title', 0) == 0) :
+			echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
+		else :
+			echo JText::_('COM_CONTENT_READ_MORE');
+			echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
+		endif; ?>
+		</a>
+	</p>
+	<?php endif; ?>
+	<?php endif; ?>
+	<?php
+	if (!empty($this->item->pagination) && $this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative) :
+		echo $this->item->pagination;
+	?>
+	<?php endif; ?>
+	<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
+	<?php echo $this->item->event->afterDisplayContent; ?>
+</div>
diff --git a/core/components/com_content/views/article/tmpl/default.xml b/core/components/com_content/views/article/tmpl/default.xml
new file mode 100644
index 00000000..82fa1144
--- /dev/null
+++ b/core/components/com_content/views/article/tmpl/default.xml
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_content_article_view_default_title" option="com_content_article_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE"
+		/>
+		<message>
+			<![CDATA[com_content_article_view_default_desc]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_content/models/fields">
+
+			<field 
+				name="id" 
+				type="modal_article"
+				label="COM_CONTENT_FIELD_SELECT_ARTICLE_LABEL"
+				description="COM_CONTENT_FIELD_SELECT_ARTICLE_DESC"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic"
+			label="COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL">
+
+		<field
+			name="show_title"
+			type="list"
+			label="JGLOBAL_SHOW_TITLE_LABEL"
+			description="JGLOBAL_SHOW_TITLE_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_titles"
+			type="list"
+			label="JGLOBAL_LINKED_TITLES_LABEL"
+			description="JGLOBAL_LINKED_TITLES_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field 
+			name="show_intro" 
+			type="list"
+			label="JGLOBAL_SHOW_INTRO_LABEL"
+			description="JGLOBAL_SHOW_INTRO_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="info_block_position"
+			type="list"
+			label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+			description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+			useglobal="true"
+			>
+			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+			<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+		</field>
+
+		<field
+			name="info_block_show_title"
+			type="list"
+			label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
+			description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option	value="1">JSHOW</option>
+			<option	value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_category"
+			type="list"
+			label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_category"
+			type="list"
+			label="JGLOBAL_LINK_CATEGORY_LABEL"
+			description="JGLOBAL_LINK_CATEGORY_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_parent_category"
+			type="list"
+			label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_parent_category"
+			type="list"
+			label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_associations"
+			type="list"
+			label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
+			description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_author"
+			type="list"
+			label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			description="JGLOBAL_SHOW_AUTHOR_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="link_author"
+			type="list"
+			label="JGLOBAL_LINK_AUTHOR_LABEL"
+			description="JGLOBAL_LINK_AUTHOR_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+
+		<field
+			name="show_create_date"
+			type="list"
+			label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_modify_date"
+			type="list"
+			label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_publish_date"
+			type="list"
+			label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_item_navigation"
+			type="list"
+			label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			description="JGLOBAL_SHOW_NAVIGATION_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_vote"
+			type="list"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_icons"
+			type="list"
+			label="JGLOBAL_SHOW_ICONS_LABEL"
+			description="JGLOBAL_SHOW_ICONS_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_print_icon"
+			type="list"
+			label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_email_icon"
+			type="list"
+			label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+			description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_hits"
+			type="list"
+			label="JGLOBAL_SHOW_HITS_LABEL"
+			description="JGLOBAL_SHOW_HITS_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_tags"
+			type="list"
+			label="JGLOBAL_SHOW_TAGS_LABEL"
+			description="JGLOBAL_SHOW_TAGS_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_noauth"
+			type="list"
+			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+			useglobal="true"
+			class="chzn-color"
+			>
+			<option value="1">JYES</option>
+			<option value="0">JNO</option>
+		</field>
+		<field
+			name="urls_position"
+			type="list"
+			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
+			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
+			useglobal="true"
+			>
+			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+		</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_content/views/article/tmpl/default_links.php b/core/components/com_content/views/article/tmpl/default_links.php
new file mode 100644
index 00000000..484613ed
--- /dev/null
+++ b/core/components/com_content/views/article/tmpl/default_links.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create shortcut
+$urls = json_decode($this->item->urls);
+
+// Create shortcuts to some parameters.
+$params = $this->item->params;
+if ($urls && (!empty($urls->urla) || !empty($urls->urlb) || !empty($urls->urlc))) :
+?>
+<div class="content-links">
+	<ul class="nav nav-tabs nav-stacked">
+		<?php
+			$urlarray = array(
+			array($urls->urla, $urls->urlatext, $urls->targeta, 'a'),
+			array($urls->urlb, $urls->urlbtext, $urls->targetb, 'b'),
+			array($urls->urlc, $urls->urlctext, $urls->targetc, 'c')
+			);
+			foreach ($urlarray as $url) :
+				$link = $url[0];
+				$label = $url[1];
+				$target = $url[2];
+				$id = $url[3];
+
+				if ( ! $link) :
+					continue;
+				endif;
+
+				// If no label is present, take the link
+				$label = $label ?: $link;
+
+				// If no target is present, use the default
+				$target = $target ?: $params->get('target' . $id);
+				?>
+			<li class="content-links-<?php echo $id; ?>">
+				<?php
+					// Compute the correct link
+
+					switch ($target)
+					{
+						case 1:
+							// Open in a new window
+							echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" target="_blank" rel="nofollow noopener noreferrer">' .
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . '</a>';
+							break;
+
+						case 2:
+							// Open in a popup window
+							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=600,height=600';
+							echo "<a href=\"" . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . "\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\" rel=\"noopener noreferrer\">" .
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . '</a>';
+							break;
+						case 3:
+							// Open in a modal window
+							JHtml::_('behavior.modal', 'a.modal');
+							echo '<a class="modal" href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '"  rel="{handler: \'iframe\', size: {x:600, y:600}} noopener noreferrer">' .
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
+							break;
+
+						default:
+							// Open in parent window
+							echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="nofollow">' .
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
+							break;
+					}
+				?>
+				</li>
+		<?php endforeach; ?>
+	</ul>
+</div>
+<?php endif; ?>
diff --git a/core/components/com_content/views/article/view.html.php b/core/components/com_content/views/article/view.html.php
new file mode 100644
index 00000000..ed202f73
--- /dev/null
+++ b/core/components/com_content/views/article/view.html.php
@@ -0,0 +1,341 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML Article View class for the Content component
+ *
+ * @since  1.5
+ */
+class ContentViewArticle extends JViewLegacy
+{
+	protected $item;
+
+	protected $params;
+
+	protected $print;
+
+	protected $state;
+
+	protected $user;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app        = JFactory::getApplication();
+		$user       = JFactory::getUser();
+		$dispatcher = JEventDispatcher::getInstance();
+
+		$this->item  = $this->get('Item');
+		$this->print = $app->input->getBool('print');
+		$this->state = $this->get('State');
+		$this->user  = $user;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Create a shortcut for $item.
+		$item            = $this->item;
+		$item->tagLayout = new JLayoutFile('joomla.content.tags');
+
+		// Add router helpers.
+		$item->slug        = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+		$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+		$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+		// No link for ROOT category
+		if ($item->parent_alias === 'root')
+		{
+			$item->parent_slug = null;
+		}
+
+		// TODO: Change based on shownoauth
+		$item->readmore_link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+
+		// Merge article params. If this is single-article view, menu params override article params
+		// Otherwise, article params override menu item params
+		$this->params = $this->state->get('params');
+		$active       = $app->getMenu()->getActive();
+		$temp         = clone $this->params;
+
+		// Check to see which parameters should take priority
+		if ($active)
+		{
+			$currentLink = $active->link;
+
+			// If the current view is the active item and an article view for this article, then the menu item params take priority
+			if (strpos($currentLink, 'view=article') && strpos($currentLink, '&id=' . (string) $item->id))
+			{
+				// Load layout from active query (in case it is an alternative menu item)
+				if (isset($active->query['layout']))
+				{
+					$this->setLayout($active->query['layout']);
+				}
+				// Check for alternative layout of article
+				elseif ($layout = $item->params->get('article_layout'))
+				{
+					$this->setLayout($layout);
+				}
+
+				// $item->params are the article params, $temp are the menu item params
+				// Merge so that the menu item params take priority
+				$item->params->merge($temp);
+			}
+			else
+			{
+				// Current view is not a single article, so the article params take priority here
+				// Merge the menu item params with the article params so that the article params take priority
+				$temp->merge($item->params);
+				$item->params = $temp;
+
+				// Check for alternative layouts (since we are not in a single-article menu item)
+				// Single-article menu item layout takes priority over alt layout for an article
+				if ($layout = $item->params->get('article_layout'))
+				{
+					$this->setLayout($layout);
+				}
+			}
+		}
+		else
+		{
+			// Merge so that article params take priority
+			$temp->merge($item->params);
+			$item->params = $temp;
+
+			// Check for alternative layouts (since we are not in a single-article menu item)
+			// Single-article menu item layout takes priority over alt layout for an article
+			if ($layout = $item->params->get('article_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+
+		$offset = $this->state->get('list.offset');
+
+		// Check the view access to the article (the model has already computed the values).
+		if ($item->params->get('access-view') == false && ($item->params->get('show_noauth', '0') == '0'))
+		{
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->setHeader('status', 403, true);
+
+			return;
+		}
+
+		/**
+		 * Check for no 'access-view' and empty fulltext,
+		 * - Redirect guest users to login
+		 * - Deny access to logged users with 403 code
+		 * NOTE: we do not recheck for no access-view + show_noauth disabled ... since it was checked above
+		 */
+		if ($item->params->get('access-view') == false && !strlen($item->fulltext))
+		{
+			if ($this->user->get('guest'))
+			{
+				$return = base64_encode(JUri::getInstance());
+				$login_url_with_return = JRoute::_('index.php?option=com_users&view=login&return=' . $return);
+				$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'notice');
+				$app->redirect($login_url_with_return, 403);
+			}
+			else
+			{
+				$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+				$app->setHeader('status', 403, true);
+
+				return;
+			}
+		}
+
+		/**
+		 * NOTE: The following code (usually) sets the text to contain the fulltext, but it is the
+		 * responsibility of the layout to check 'access-view' and only use "introtext" for guests
+		 */
+		if ($item->params->get('show_intro', '1') == '1')
+		{
+			$item->text = $item->introtext . ' ' . $item->fulltext;
+		}
+		elseif ($item->fulltext)
+		{
+			$item->text = $item->fulltext;
+		}
+		else
+		{
+			$item->text = $item->introtext;
+		}
+
+		$item->tags = new JHelperTags;
+		$item->tags->getItemTags('com_content.article', $this->item->id);
+
+		if ($item->params->get('show_associations'))
+		{
+			$item->associations = ContentHelperAssociation::displayAssociations($item->id);
+		}
+
+		// Process the content plugins.
+		JPluginHelper::importPlugin('content');
+		$dispatcher->trigger('onContentPrepare', array ('com_content.article', &$item, &$item->params, $offset));
+
+		$item->event = new stdClass;
+		$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.article', &$item, &$item->params, $offset));
+		$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.article', &$item, &$item->params, $offset));
+		$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.article', &$item, &$item->params, $offset));
+		$item->event->afterDisplayContent = trim(implode("\n", $results));
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->item->params->get('pageclass_sfx'));
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 */
+	protected function _prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+
+		/**
+		 * Because the application sets a default page title,
+		 * we need to get it from the menu item itself
+		 */
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		$id = (int) @$menu->query['id'];
+
+		// If the menu item does not concern this article
+		if ($menu && ($menu->query['option'] !== 'com_content' || $menu->query['view'] !== 'article' || $id != $this->item->id))
+		{
+			// If a browser page title is defined, use that, then fall back to the article title if set, then fall back to the page_title option
+			$title = $this->item->params->get('article_page_title', $this->item->title ?: $title);
+
+			$path     = array(array('title' => $this->item->title, 'link' => ''));
+			$category = JCategories::getInstance('Content')->get($this->item->catid);
+
+			while ($category && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1)
+			{
+				$path[]   = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		// Check for empty title and add site name if param is set
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		if (empty($title))
+		{
+			$title = $this->item->title;
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->item->metadesc)
+		{
+			$this->document->setDescription($this->item->metadesc);
+		}
+		elseif ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->item->metakey)
+		{
+			$this->document->setMetadata('keywords', $this->item->metakey);
+		}
+		elseif ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		if ($app->get('MetaAuthor') == '1')
+		{
+			$author = $this->item->created_by_alias ?: $this->item->author;
+			$this->document->setMetaData('author', $author);
+		}
+
+		$mdata = $this->item->metadata->toArray();
+
+		foreach ($mdata as $k => $v)
+		{
+			if ($v)
+			{
+				$this->document->setMetadata($k, $v);
+			}
+		}
+
+		// If there is a pagebreak heading or title, add it to the page title
+		if (!empty($this->item->page_title))
+		{
+			$this->item->title = $this->item->title . ' - ' . $this->item->page_title;
+			$this->document->setTitle(
+				$this->item->page_title . ' - ' . JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $this->state->get('list.offset') + 1)
+			);
+		}
+
+		if ($this->print)
+		{
+			$this->document->setMetaData('robots', 'noindex, nofollow');
+		}
+	}
+}
diff --git a/core/components/com_content/views/categories/tmpl/default.php b/core/components/com_content/views/categories/tmpl/default.php
new file mode 100644
index 00000000..2a7555b2
--- /dev/null
+++ b/core/components/com_content/views/categories/tmpl/default.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+JHtml::_('behavior.core');
+
+// Add strings for translations in Javascript.
+JText::script('JGLOBAL_EXPAND_CATEGORIES');
+JText::script('JGLOBAL_COLLAPSE_CATEGORIES');
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(function($) {
+	$('.categories-list').find('[id^=category-btn-]').each(function(index, btn) {
+		var btn = $(btn);
+		btn.on('click', function() {
+			btn.find('span').toggleClass('icon-plus');
+			btn.find('span').toggleClass('icon-minus');
+			if (btn.attr('aria-label') === Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES'))
+			{
+				btn.attr('aria-label', Joomla.JText._('JGLOBAL_COLLAPSE_CATEGORIES'));
+			} else {
+				btn.attr('aria-label', Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES'));
+			}		
+		});
+	});
+});");
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx; ?>">
+	<?php
+		echo JLayoutHelper::render('joomla.content.categories_default', $this);
+		echo $this->loadTemplate('items');
+	?>
+</div>
diff --git a/core/components/com_content/views/categories/tmpl/default.xml b/core/components/com_content/views/categories/tmpl/default.xml
new file mode 100644
index 00000000..4d86270f
--- /dev/null
+++ b/core/components/com_content/views/categories/tmpl/default.xml
@@ -0,0 +1,770 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_CATEGORIES_VIEW_DEFAULT_TITLE" option="COM_CONTENT_CATEGORIES_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORIES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+		 >
+			<field 
+				name="id" 
+				type="category"
+				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
+				description="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				show_root="true"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+	<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+
+			<field 
+				name="show_base_description" 
+				type="list"
+				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+				description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="categories_description" 
+				type="textarea"
+				label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+				description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
+				cols="25"
+				rows="5"
+			/>
+
+			<field 
+				name="maxLevelcat" 
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories_cat" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc_cat" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_num_articles_cat" 
+				type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+	</fieldset>
+
+	<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
+			<field 
+				name="spacer3" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="show_category_title" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description_image" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="maxLevel" 
+				type="list"
+				label="JGLOBAL_MAXLEVEL_LABEL"
+				description="JGLOBAL_MAXLEVEL_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_no_articles" 
+				type="list"
+				label="COM_CONTENT_NO_ARTICLES_LABEL"
+				description="COM_CONTENT_NO_ARTICLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc"
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_num_articles" 
+				type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+	</fieldset>
+	<fieldset name="blog" label="JGLOBAL_BLOG_LAYOUT_OPTIONS">
+			<field 
+				name="spacer4" 
+				type="spacer"
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="num_leading_articles" 
+				type="number"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+				size="3"
+				useglobal="true"
+			/>
+
+			<field 
+				name="num_intro_articles" 
+				type="number"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+				size="3"
+				useglobal="true"
+			/>
+
+			<field 
+				name="num_columns" 
+				type="number"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				description="JGLOBAL_NUM_COLUMNS_DESC"
+				size="3"
+				useglobal="true"
+			/>
+
+			<field 
+				name="num_links" 
+				type="number"
+				label="JGLOBAL_NUM_LINKS_LABEL"
+				description="JGLOBAL_NUM_LINKS_DESC"
+				size="3"
+				useglobal="true"
+			/>
+
+			<field 
+				name="multi_column_order" 
+				type="list"
+				description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_DOWN</option>
+				<option value="1">JGLOBAL_ACROSS</option>
+			</field>
+
+			<field 
+				name="show_subcategory_content" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+				useglobal="true"
+				>
+				<option value="0">JNONE</option>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field
+				name="spacer5"
+				type="spacer"
+				hr="true"
+			/>
+
+			<field 
+				name="orderby_pri" 
+				type="list"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="none">JGLOBAL_NO_ORDER</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field 
+				name="orderby_sec" 
+				type="list"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+				<option	value="rorder">JGLOBAL_REVERSE_ORDERING</option>
+				<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+				<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+				<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+				<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			</field>
+
+			<field 
+				name="order_date" 
+				type="list"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				useglobal="true"
+				>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+	</fieldset>
+
+	<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS" >
+			<field 
+				name="spacer6" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="filter_field" 
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				useglobal="true"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="title">JGLOBAL_TITLE</option>
+				<option value="author">JAUTHOR</option>
+				<option value="hits">JGLOBAL_HITS</option>
+			</field>
+
+			<field 
+				name="show_headings" 
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="list_show_date" 
+				type="list"
+				label="JGLOBAL_SHOW_DATE_LABEL"
+				description="JGLOBAL_SHOW_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field 
+				name="date_format" 
+				type="text"
+				label="JGLOBAL_DATE_FORMAT_LABEL"
+				description="JGLOBAL_DATE_FORMAT_DESC"
+				size="15"
+				useglobal="true"
+			/>
+
+			<field 
+				name="list_show_hits" 
+				type="list"
+				label="JGLOBAL_LIST_HITS_LABEL"
+				description="JGLOBAL_LIST_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="list_show_author" 
+				type="list"
+				label="JGLOBAL_LIST_AUTHOR_LABEL"
+				description="JGLOBAL_LIST_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="display_num" 
+				type="list"
+				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
+				description="JGLOBAL_NUMBER_ITEMS_LIST_DESC"
+				default="10"
+				>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+			</field>
+
+	</fieldset>
+
+		<fieldset name="shared" label="COM_CONTENT_SHARED_LABEL" description="COM_CONTENT_SHARED_DESC">
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+	<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+
+			<field
+				name="article_layout" 
+				type="componentlayout"
+				label="JGLOBAL_FIELD_LAYOUT_LABEL"
+				description="JGLOBAL_FIELD_LAYOUT_DESC"
+				menuitems="true"
+				extension="com_content"
+				view="article"
+			/>
+
+			<field 
+				name="show_title" 
+				type="list"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_titles" 
+				type="list"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_intro" 
+				type="list"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_category" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_category" 
+				type="list"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_parent_category" 
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_parent_category" 
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_author" 
+				type="list"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_author" 
+				type="list"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_create_date" 
+				type="list"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_modify_date" 
+				type="list"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_publish_date" 
+				type="list"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_navigation" 
+				type="list"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_vote"
+				type="list"
+				label="JGLOBAL_SHOW_VOTE_LABEL"
+				description="JGLOBAL_SHOW_VOTE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_icons" 
+				type="list"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_print_icon" 
+				type="list"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_icon" 
+				type="list"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_hits" 
+				type="list"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_noauth"
+				type="list"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+		</field>
+	</fieldset>
+	<fieldset name="integration">
+
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="feed_summary" 
+				type="list"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+</fields>
+</metadata>
diff --git a/core/components/com_content/views/categories/tmpl/default_items.php b/core/components/com_content/views/categories/tmpl/default_items.php
new file mode 100644
index 00000000..e7b71f84
--- /dev/null
+++ b/core/components/com_content/views/categories/tmpl/default_items.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$class = ' class="first"';
+$lang  = JFactory::getLanguage();
+
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
+?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+		<?php
+		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+		if (!isset($this->items[$this->parent->id][$id + 1]))
+		{
+			$class = ' class="last"';
+		}
+		?>
+		<div <?php echo $class; ?> >
+		<?php $class = ''; ?>
+			<h3 class="page-header item-title">
+				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
+				<?php echo $this->escape($item->title); ?></a>
+				<?php if ($this->params->get('show_cat_num_articles_cat') == 1) :?>
+					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+						<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>&nbsp;
+						<?php echo $item->numitems; ?>
+					</span>
+				<?php endif; ?>
+				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+					<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
+						data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+				<?php endif; ?>
+			</h3>
+			<?php if ($this->params->get('show_description_image') && $item->getParams()->get('image')) : ?>
+				<img src="<?php echo $item->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($item->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?>" />
+			<?php endif; ?>
+			<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
+				<?php if ($item->description) : ?>
+					<div class="category-desc">
+						<?php echo JHtml::_('content.prepare', $item->description, '', 'com_content.categories'); ?>
+					</div>
+				<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+				<div class="collapse fade" id="category-<?php echo $item->id; ?>">
+				<?php
+				$this->items[$item->id] = $item->getChildren();
+				$this->parent = $item;
+				$this->maxLevelcat--;
+				echo $this->loadTemplate('items');
+				$this->parent = $item->getParent();
+				$this->maxLevelcat++;
+				?>
+				</div>
+			<?php endif; ?>
+		</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>
diff --git a/core/components/com_content/views/categories/view.html.php b/core/components/com_content/views/categories/view.html.php
new file mode 100644
index 00000000..4818815d
--- /dev/null
+++ b/core/components/com_content/views/categories/view.html.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content categories view.
+ *
+ * @since  1.5
+ */
+class ContentViewCategories extends JViewCategories
+{
+	/**
+	 * Language key for default page heading
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $pageHeading = 'JGLOBAL_ARTICLES';
+
+	/**
+	 * @var    string  The name of the extension for the category
+	 * @since  3.2
+	 */
+	protected $extension = 'com_content';
+}
diff --git a/core/components/com_content/views/category/tmpl/blog.php b/core/components/com_content/views/category/tmpl/blog.php
new file mode 100644
index 00000000..afd37278
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/blog.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+
+$dispatcher = JEventDispatcher::getInstance();
+
+$this->category->text = $this->category->description;
+$dispatcher->trigger('onContentPrepare', array($this->category->extension . '.categories', &$this->category, &$this->params, 0));
+$this->category->description = $this->category->text;
+
+$results = $dispatcher->trigger('onContentAfterTitle', array($this->category->extension . '.categories', &$this->category, &$this->params, 0));
+$afterDisplayTitle = trim(implode("\n", $results));
+
+$results = $dispatcher->trigger('onContentBeforeDisplay', array($this->category->extension . '.categories', &$this->category, &$this->params, 0));
+$beforeDisplayContent = trim(implode("\n", $results));
+
+$results = $dispatcher->trigger('onContentAfterDisplay', array($this->category->extension . '.categories', &$this->category, &$this->params, 0));
+$afterDisplayContent = trim(implode("\n", $results));
+
+?>
+<div class="blog<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Blog">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($this->params->get('show_category_title', 1) or $this->params->get('page_subheading')) : ?>
+		<h2> <?php echo $this->escape($this->params->get('page_subheading')); ?>
+			<?php if ($this->params->get('show_category_title')) : ?>
+				<span class="subheading-category"><?php echo $this->category->title; ?></span>
+			<?php endif; ?>
+		</h2>
+	<?php endif; ?>
+	<?php echo $afterDisplayTitle; ?>
+
+	<?php if ($this->params->get('show_cat_tags', 1) && !empty($this->category->tags->itemTags)) : ?>
+		<?php $this->category->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+		<?php echo $this->category->tagLayout->render($this->category->tags->itemTags); ?>
+	<?php endif; ?>
+
+	<?php if ($beforeDisplayContent || $afterDisplayContent || $this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+		<div class="category-desc clearfix">
+			<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+				<img src="<?php echo $this->category->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($this->category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?>"/>
+			<?php endif; ?>
+			<?php echo $beforeDisplayContent; ?>
+			<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+				<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
+			<?php endif; ?>
+			<?php echo $afterDisplayContent; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if (empty($this->lead_items) && empty($this->link_items) && empty($this->intro_items)) : ?>
+		<?php if ($this->params->get('show_no_articles', 1)) : ?>
+			<p><?php echo JText::_('COM_CONTENT_NO_ARTICLES'); ?></p>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php $leadingcount = 0; ?>
+	<?php if (!empty($this->lead_items)) : ?>
+		<div class="items-leading clearfix">
+			<?php foreach ($this->lead_items as &$item) : ?>
+				<div class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>"
+					itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+					<?php
+					$this->item = &$item;
+					echo $this->loadTemplate('item');
+					?>
+				</div>
+				<?php $leadingcount++; ?>
+			<?php endforeach; ?>
+		</div><!-- end items-leading -->
+	<?php endif; ?>
+
+	<?php
+	$introcount = count($this->intro_items);
+	$counter = 0;
+	?>
+
+	<?php if (!empty($this->intro_items)) : ?>
+		<?php foreach ($this->intro_items as $key => &$item) : ?>
+			<?php $rowcount = ((int) $key % (int) $this->columns) + 1; ?>
+			<?php if ($rowcount === 1) : ?>
+				<?php $row = $counter / $this->columns; ?>
+				<div class="items-row cols-<?php echo (int) $this->columns; ?> <?php echo 'row-' . $row; ?> row-fluid clearfix">
+			<?php endif; ?>
+			<div class="span<?php echo round(12 / $this->columns); ?>">
+				<div class="item column-<?php echo $rowcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>"
+					itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+					<?php
+					$this->item = &$item;
+					echo $this->loadTemplate('item');
+					?>
+				</div>
+				<!-- end item -->
+				<?php $counter++; ?>
+			</div><!-- end span -->
+			<?php if (($rowcount == $this->columns) or ($counter == $introcount)) : ?>
+				</div><!-- end row -->
+			<?php endif; ?>
+		<?php endforeach; ?>
+	<?php endif; ?>
+
+	<?php if (!empty($this->link_items)) : ?>
+		<div class="items-more">
+			<?php echo $this->loadTemplate('links'); ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
+		<div class="cat-children">
+			<?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
+				<h3> <?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?> </h3>
+			<?php endif; ?>
+			<?php echo $this->loadTemplate('children'); ?> </div>
+	<?php endif; ?>
+	<?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
+		<div class="pagination">
+			<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+				<p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> </p>
+			<?php endif; ?>
+			<?php echo $this->pagination->getPagesLinks(); ?> </div>
+	<?php endif; ?>
+</div>
diff --git a/core/components/com_content/views/category/tmpl/blog.xml b/core/components/com_content/views/category/tmpl/blog.xml
new file mode 100644
index 00000000..0abf7f69
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/blog.xml
@@ -0,0 +1,710 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_CATEGORY_VIEW_BLOG_TITLE" option="COM_CONTENT_CATEGORY_VIEW_BLOG_OPTION">
+		<help key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG" />
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORY_VIEW_BLOG_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_categories/models/fields"
+		>
+			<field
+				name="id"
+				type="modal_category"
+				label="JGLOBAL_CHOOSE_CATEGORY_LABEL"
+				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+
+			<field
+				name="filter_tag"
+				type="tag"
+				label="JTAG"
+				description="JTAG_FIELD_SELECT_DESC"
+				multiple="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+				<field
+					name="layout_type"
+					type="hidden"
+					default="blog"
+				/>
+
+				<field
+					name="show_category_heading_title_text"
+					type="list"
+	 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
+					description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_category_title"
+					type="list"
+					label="JGLOBAL_SHOW_CATEGORY_TITLE"
+					description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_description"
+					type="list"
+					label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+					description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_description_image"
+					type="list"
+					label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+					description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="maxLevel"
+					type="list"
+					label="JGLOBAL_MAXLEVEL_LABEL"
+					description="JGLOBAL_MAXLEVEL_DESC"
+					useglobal="true"
+					>
+					<option value="-1">JALL</option>
+					<option value="0">JNONE</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+				</field>
+
+				<field
+					name="show_empty_categories"
+					type="list"
+					label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+					description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_no_articles"
+					type="list"
+					label="COM_CONTENT_NO_ARTICLES_LABEL"
+					description="COM_CONTENT_NO_ARTICLES_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_subcat_desc"
+					type="list"
+					label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+					description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_cat_num_articles"
+					type="list"
+					label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+					description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field 
+					name="show_cat_tags"
+					type="list"
+					label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
+					description="COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="page_subheading"
+					type="text"
+					label="JGLOBAL_SUBHEADING_LABEL"
+					description="JGLOBAL_SUBHEADING_DESC"
+					size="20"
+				/>
+		</fieldset>
+
+		<fieldset name="advanced" label="JGLOBAL_BLOG_LAYOUT_OPTIONS">
+				<field 
+					name="bloglayout"
+					type="spacer"
+					label="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL"
+					class="text"
+				/>
+
+				<field
+					name="num_leading_articles"
+					type="number"
+					label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+					description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+					useglobal="true"
+					size="3"
+				/>
+
+				<field
+					name="num_intro_articles"
+					type="number"
+					label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+					description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+					useglobal="true"
+					size="3"
+				/>
+
+				<field
+					name="num_columns"
+					type="number"
+					label="JGLOBAL_NUM_COLUMNS_LABEL"
+					description="JGLOBAL_NUM_COLUMNS_DESC"
+					useglobal="true"
+					size="3"
+				/>
+
+				<field
+					name="num_links"
+					type="number"
+					label="JGLOBAL_NUM_LINKS_LABEL"
+					description="JGLOBAL_NUM_LINKS_DESC"
+					useglobal="true"
+					size="3"
+				/>
+
+				<field
+					name="multi_column_order"
+					type="list"
+					label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+					description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+					useglobal="true"
+					>
+					<option value="0">JGLOBAL_DOWN</option>
+					<option value="1">JGLOBAL_ACROSS</option>
+				</field>
+
+				<field
+					name="show_subcategory_content"
+					type="list"
+					label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
+					description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+					useglobal="true"
+					>
+					<option value="0">JNONE</option>
+					<option value="-1">JALL</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+				</field>
+
+				<field
+					name="spacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="orderby_pri"
+					type="list"
+					label="JGLOBAL_CATEGORY_ORDER_LABEL"
+					description="JGLOBAL_CATEGORY_ORDER_DESC"
+					useglobal="true"
+					>
+					<option value="none">JGLOBAL_NO_ORDER</option>
+					<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+					<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+					<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+				</field>
+
+				<field
+					name="orderby_sec"
+					type="list"
+					label="JGLOBAL_ARTICLE_ORDER_LABEL"
+					description="JGLOBAL_ARTICLE_ORDER_DESC"
+					useglobal="true"
+					>
+					<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+					<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+					<option value="date">JGLOBAL_OLDEST_FIRST</option>
+					<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+					<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+					<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+					<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+					<option value="hits">JGLOBAL_MOST_HITS</option>
+					<option value="rhits">JGLOBAL_LEAST_HITS</option>
+					<option value="random">JGLOBAL_RANDOM_ORDER</option>
+					<option value="order">JGLOBAL_ORDERING</option>
+					<option	value="rorder">JGLOBAL_REVERSE_ORDERING</option>
+					<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+					<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+					<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+					<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+				</field>
+
+				<field
+					name="order_date"
+					type="list"
+					label="JGLOBAL_ORDERING_DATE_LABEL"
+					description="JGLOBAL_ORDERING_DATE_DESC"
+					useglobal="true"
+					>
+					<option value="created">JGLOBAL_CREATED</option>
+					<option value="modified">JGLOBAL_MODIFIED</option>
+					<option value="published">JPUBLISHED</option>
+					<option value="unpublished">JUNPUBLISHED</option>
+				</field>
+
+				<field
+					name="show_pagination"
+					type="list"
+					label="JGLOBAL_PAGINATION_LABEL"
+					description="JGLOBAL_PAGINATION_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+					<option value="2">JGLOBAL_AUTO</option>
+				</field>
+
+				<field
+					name="show_pagination_results"
+					type="list"
+					label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+					description="JGLOBAL_PAGINATION_RESULTS_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="show_featured"
+					type="list"
+					default=""
+					label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
+					description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC"
+					useglobal="true"
+					class="chzn-color"
+					>
+					<option value="show">JSHOW</option>
+					<option value="hide">JHIDE</option>
+					<option value="only">JONLY</option>
+				</field>
+		</fieldset>
+
+		<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+
+			<field
+				name="article_layout" type="componentlayout"
+				label="JGLOBAL_FIELD_LAYOUT_LABEL"
+				description="JGLOBAL_FIELD_LAYOUT_DESC"
+				menuitems="true"
+				extension="com_content"
+				view="article"
+			/>
+
+			<field
+				name="show_title"
+				type="list"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_titles"
+				type="list"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_intro"
+				type="list"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field
+				name="info_block_show_title"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_category"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_category"
+				type="list"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_parent_category"
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_parent_category"
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_associations"
+				type="list"
+				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
+				description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_author"
+				type="list"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_author"
+				type="list"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_create_date"
+				type="list"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_modify_date"
+				type="list"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_publish_date"
+				type="list"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_item_navigation"
+				type="list"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_vote"
+				type="list"
+				label="JGLOBAL_SHOW_VOTE_LABEL"
+				description="JGLOBAL_SHOW_VOTE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_icons"
+				type="list"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_print_icon"
+				type="list"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_email_icon"
+				type="list"
+				label="JGLOBAL_Show_Email_Icon_Label"
+				description="JGLOBAL_Show_Email_Icon_Desc"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_hits"
+				type="list"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_noauth"
+				type="list"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="integration" label="COM_MENUS_INTEGRATION_FIELDSET_LABEL">
+			<field
+				name="show_feed_link"
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="feed_summary"
+				type="list"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_content/views/category/tmpl/blog_children.php b/core/components/com_content/views/category/tmpl/blog_children.php
new file mode 100644
index 00000000..972b5315
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/blog_children.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$class  = ' class="first"';
+$lang   = JFactory::getLanguage();
+$user   = JFactory::getUser();
+$groups = $user->getAuthorisedViewLevels();
+
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?>
+
+	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+		<?php // Check whether category access level allows access to subcategories. ?>
+		<?php if (in_array($child->access, $groups)) : ?>
+			<?php if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+				if (!isset($this->children[$this->category->id][$id + 1])) :
+					$class = ' class="last"';
+				endif;
+			?>
+			<div<?php echo $class; ?>>
+				<?php $class = ''; ?>
+				<?php if ($lang->isRtl()) : ?>
+				<h3 class="page-header item-title">
+					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+							<?php echo $child->getNumItems(true); ?>
+						</span>
+					<?php endif; ?>
+					<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
+					<?php echo $this->escape($child->title); ?></a>
+
+					<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+					<?php endif; ?>
+				</h3>
+				<?php else : ?>
+				<h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
+					<?php echo $this->escape($child->title); ?></a>
+					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+							<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>&nbsp;
+							<?php echo $child->getNumItems(true); ?>
+						</span>
+					<?php endif; ?>
+
+					<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+					<?php endif; ?>
+				</h3>
+				<?php endif; ?>
+
+				<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+					<?php if ($child->description) : ?>
+						<div class="category-desc">
+							<?php echo JHtml::_('content.prepare', $child->description, '', 'com_content.category'); ?>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
+					<div class="collapse fade" id="category-<?php echo $child->id; ?>">
+						<?php
+						$this->children[$child->id] = $child->getChildren();
+						$this->category = $child;
+						$this->maxLevel--;
+						echo $this->loadTemplate('children');
+						$this->category = $child->getParent();
+						$this->maxLevel++;
+						?>
+					</div>
+				<?php endif; ?>
+			</div>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
+
+<?php endif;
diff --git a/core/components/com_content/views/category/tmpl/blog_item.php b/core/components/com_content/views/category/tmpl/blog_item.php
new file mode 100644
index 00000000..d63b2d93
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/blog_item.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create a shortcut for params.
+$params = $this->item->params;
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+$canEdit = $this->item->params->get('access-edit');
+$info    = $params->get('info_block_position', 0);
+
+// Check if associations are implemented. If they are, define the parameter.
+$assocParam = (JLanguageAssociations::isEnabled() && $params->get('show_associations'));
+
+?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+	<div class="system-unpublished">
+<?php endif; ?>
+
+<?php echo JLayoutHelper::render('joomla.content.blog_style_default_item_title', $this->item); ?>
+
+<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.icons', array('params' => $params, 'item' => $this->item, 'print' => false)); ?>
+<?php endif; ?>
+
+<?php // Todo Not that elegant would be nice to group the params ?>
+<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') || $assocParam); ?>
+
+<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
+  <?php // Todo: for Joomla4 joomla.content.info_block.block can be changed to joomla.content.info_block ?>
+	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
+	<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php echo JLayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
+	<?php endif; ?>
+<?php endif; ?>
+
+<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
+
+<?php if (!$params->get('show_intro')) : ?>
+	<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php echo $this->item->introtext; ?>
+
+<?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
+	<?php // Todo: for Joomla4 joomla.content.info_block.block can be changed to joomla.content.info_block ?>
+	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+	<?php if ($params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php echo JLayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
+	<?php endif; ?>
+<?php endif; ?>
+
+<?php if ($params->get('show_readmore') && $this->item->readmore) :
+	if ($params->get('access-view')) :
+		$link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language));
+	else :
+		$menu = JFactory::getApplication()->getMenu();
+		$active = $menu->getActive();
+		$itemId = $active->id;
+		$link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false));
+		$link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)));
+	endif; ?>
+
+	<?php echo JLayoutHelper::render('joomla.content.readmore', array('item' => $this->item, 'params' => $params, 'link' => $link)); ?>
+
+<?php endif; ?>
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+</div>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
+<?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/core/components/com_content/views/category/tmpl/blog_links.php b/core/components/com_content/views/category/tmpl/blog_links.php
new file mode 100644
index 00000000..3b7eb27a
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/blog_links.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<ol class="nav nav-tabs nav-stacked">
+	<?php foreach ($this->link_items as &$item) : ?>
+		<li>
+			<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)); ?>">
+				<?php echo $item->title; ?></a>
+		</li>
+	<?php endforeach; ?>
+</ol>
diff --git a/core/components/com_content/views/category/tmpl/default.php b/core/components/com_content/views/category/tmpl/default.php
new file mode 100644
index 00000000..5aff5371
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/default.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<div class="category-list<?php echo $this->pageclass_sfx; ?>">
+
+<?php
+$this->subtemplatename = 'articles';
+echo JLayoutHelper::render('joomla.content.category_default', $this);
+?>
+
+</div>
diff --git a/core/components/com_content/views/category/tmpl/default.xml b/core/components/com_content/views/category/tmpl/default.xml
new file mode 100644
index 00000000..24773671
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/default.xml
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_CATEGORY_VIEW_DEFAULT_TITLE" option="COM_CONTENT_CATEGORY_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORY_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_categories/models/fields"
+		>
+			<field 
+				name="id"
+				type="modal_category"
+				label="JGLOBAL_CHOOSE_CATEGORY_LABEL"
+				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+
+			<field 
+				name="show_category_title" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description_image" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="maxLevel" 
+				type="list"
+				label="JGLOBAL_MAXLEVEL_LABEL"
+				description="JGLOBAL_MAXLEVEL_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_no_articles" 
+				type="list"
+				label="COM_CONTENT_NO_ARTICLES_LABEL"
+				description="COM_CONTENT_NO_ARTICLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_category_heading_title_text"
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_num_articles" 
+				type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_tags" 
+				type="list"
+				label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
+				description="COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="page_subheading" 
+				type="text"
+				label="JGLOBAL_SUBHEADING_LABEL"
+				description="JGLOBAL_SUBHEADING_DESC"
+				size="20"
+			/>
+
+		</fieldset>
+
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+			<field 
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="filter_field" 
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				useglobal="true"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="title">JGLOBAL_TITLE</option>
+				<option value="author">JAUTHOR</option>
+				<option value="hits">JGLOBAL_HITS</option>
+	 			<option value="tag">JTAG</option>
+			</field>
+
+			<field 
+				name="show_headings" 
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="list_show_date" 
+				type="list"
+				label="JGLOBAL_SHOW_DATE_LABEL"
+				description="JGLOBAL_SHOW_DATE_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field 
+				name="date_format" 
+				type="text"
+				label="JGLOBAL_DATE_FORMAT_LABEL"
+				description="JGLOBAL_DATE_FORMAT_DESC"
+				size="15"
+				useglobal="true"
+			/>
+
+			<field 
+				name="list_show_hits" 
+				type="list"
+				label="JGLOBAL_LIST_HITS_LABEL"
+				description="JGLOBAL_LIST_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="list_show_author" 
+				type="list"
+				label="JGLOBAL_LIST_AUTHOR_LABEL"
+				description="JGLOBAL_LIST_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="list_show_votes"
+				type="list"
+				label="JGLOBAL_LIST_VOTES_LABEL"
+				description="JGLOBAL_LIST_VOTES_DESC"
+				class="btn-group btn-group-yesno"
+				useglobal="true"
+				>
+				<option value="1" requires="vote">JSHOW</option>
+				<option value="0" requires="vote">JHIDE</option>
+			</field>
+
+			<field 
+				name="list_show_ratings"
+				type="list"
+				label="JGLOBAL_LIST_RATINGS_LABEL"
+				description="JGLOBAL_LIST_RATINGS_DESC"
+				class="btn-group btn-group-yesno"
+				useglobal="true"
+				>
+				<option value="1" requires="vote">JSHOW</option>
+				<option value="0" requires="vote">JHIDE</option>
+			</field>
+
+			<field
+				name="spacer1"
+				type="spacer"
+				hr="true"
+			/>
+
+			<field 
+				name="orderby_pri" 
+				type="list"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="none">JGLOBAL_NO_ORDER</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field 
+				name="orderby_sec" 
+				type="list"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="random">JGLOBAL_RANDOM_ORDER</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+				<option	value="rorder">JGLOBAL_REVERSE_ORDERING</option>
+				<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+				<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+				<option value="rank" requires="vote"> JGLOBAL_RATINGS_DESC</option>
+				<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			</field>
+
+			<field 
+				name="order_date" 
+				type="list"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				useglobal="true"
+				>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="display_num" 
+				type="list"
+				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
+				description="JGLOBAL_NUMBER_ITEMS_LIST_DESC"
+				default="10"
+				>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field 
+				name="show_featured" 
+				type="list" 
+				label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
+				description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC"
+				useglobal="true"
+				default=""
+				>
+				<option value="show">JSHOW</option>
+				<option value="hide">JHIDE</option>
+				<option value="only">JONLY</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+
+			<field
+				name="article_layout" type="componentlayout"
+				label="JGLOBAL_FIELD_LAYOUT_LABEL"
+				description="JGLOBAL_FIELD_LAYOUT_DESC"
+				menuitems="true"
+				extension="com_content"
+				view="article"
+			/>
+
+			<field 
+				name="show_title" 
+				type="list"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_titles" 
+				type="list"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_intro" 
+				type="list"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_category" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_category" 
+				type="list"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"				
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_parent_category" 
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_parent_category" 
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+			
+			<field
+				name="show_associations"
+				type="list"
+				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
+				description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field 
+				name="show_author" 
+				type="list"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_author" 
+				type="list"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_create_date" 
+				type="list"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_modify_date" 
+				type="list"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_publish_date" 
+				type="list"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_navigation" 
+				type="list"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_vote" 
+				type="list"
+				label="JGLOBAL_SHOW_VOTE_LABEL"
+				description="JGLOBAL_SHOW_VOTE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_icons" 
+				type="list"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_print_icon" 
+				type="list"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_icon" 
+				type="list"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_hits" 
+				type="list"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_noauth" 
+				type="list"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+		</fieldset>
+		<fieldset name="integration" label="COM_MENUS_INTEGRATION_FIELDSET_LABEL">
+
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="feed_summary" 
+				type="list"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_content/views/category/tmpl/default_articles.php b/core/components/com_content/views/category/tmpl/default_articles.php
new file mode 100644
index 00000000..be0222ed
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/default_articles.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+// Create some shortcuts.
+$params    = &$this->item->params;
+$n         = count($this->items);
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+// Check for at least one editable article
+$isEditable = false;
+
+if (!empty($this->items))
+{
+	foreach ($this->items as $article)
+	{
+		if ($article->params->get('access-edit'))
+		{
+			$isEditable = true;
+			break;
+		}
+	}
+}
+
+// For B/C we also add the css classes inline. This will be removed in 4.0.
+JFactory::getDocument()->addStyleDeclaration('
+.hide { display: none; }
+.table-noheader { border-collapse: collapse; }
+.table-noheader thead { display: none; }
+');
+
+$tableClass = $this->params->get('show_headings') != 1 ? ' table-noheader' : '';
+?>
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+<?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
+	<fieldset class="filters btn-toolbar clearfix">
+		<legend class="hide"><?php echo JText::_('COM_CONTENT_FORM_FILTER_LEGEND'); ?></legend>
+		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
+			<div class="btn-group">
+				<?php if ($this->params->get('filter_field') !== 'tag') : ?>
+					<label class="filter-search-lbl element-invisible" for="filter-search">
+						<?php echo JText::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL') . '&#160;'; ?>
+					</label>
+					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL'); ?>" />
+				<?php else : ?>
+					<select name="filter_tag" id="filter_tag" onchange="document.adminForm.submit();" >
+						<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
+					</select>
+				<?php endif; ?>
+			</div>
+		<?php endif; ?>
+		<?php if ($this->params->get('show_pagination_limit')) : ?>
+			<div class="btn-group pull-right">
+				<label for="limit" class="element-invisible">
+					<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+				</label>
+				<?php echo $this->pagination->getLimitBox(); ?>
+			</div>
+		<?php endif; ?>
+
+		<input type="hidden" name="filter_order" value="" />
+		<input type="hidden" name="filter_order_Dir" value="" />
+		<input type="hidden" name="limitstart" value="" />
+		<input type="hidden" name="task" value="" />
+	</fieldset>
+
+	<div class="control-group hide pull-right">
+		<div class="controls">
+			<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo JText::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
+		</div>
+	</div>
+
+<?php endif; ?>
+
+<?php if (empty($this->items)) : ?>
+	<?php if ($this->params->get('show_no_articles', 1)) : ?>
+		<p><?php echo JText::_('COM_CONTENT_NO_ARTICLES'); ?></p>
+	<?php endif; ?>
+<?php else : ?>
+	<table class="category table table-striped table-bordered table-hover<?php echo $tableClass; ?>">
+		<caption class="hide"><?php echo JText::sprintf('COM_CONTENT_CATEGORY_LIST_TABLE_CAPTION', $this->category->title); ?></caption>
+		<thead>
+			<tr>
+				<th scope="col" id="categorylist_header_title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder, null, 'asc', '', 'adminForm'); ?>
+				</th>
+				<?php if ($date = $this->params->get('list_show_date')) : ?>
+					<th scope="col" id="categorylist_header_date">
+						<?php if ($date === 'created') : ?>
+							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
+						<?php elseif ($date === 'modified') : ?>
+							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.modified', $listDirn, $listOrder); ?>
+						<?php elseif ($date === 'published') : ?>
+							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
+						<?php endif; ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_author')) : ?>
+					<th scope="col" id="categorylist_header_author">
+						<?php echo JHtml::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_hits')) : ?>
+					<th scope="col" id="categorylist_header_hits">
+						<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_votes', 0) && $this->vote) : ?>
+					<th scope="col" id="categorylist_header_votes">
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_VOTES', 'rating_count', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_ratings', 0) && $this->vote) : ?>
+					<th scope="col" id="categorylist_header_ratings">
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_RATINGS', 'rating', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($isEditable) : ?>
+					<th scope="col" id="categorylist_header_edit"><?php echo JText::_('COM_CONTENT_EDIT_ITEM'); ?></th>
+				<?php endif; ?>
+			</tr>
+		</thead>
+		<tbody>
+		<?php foreach ($this->items as $i => $article) : ?>
+			<?php if ($this->items[$i]->state == 0) : ?>
+				<tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+			<?php else : ?>
+				<tr class="cat-list-row<?php echo $i % 2; ?>" >
+			<?php endif; ?>
+			<td headers="categorylist_header_title" class="list-title">
+				<?php if (in_array($article->access, $this->user->getAuthorisedViewLevels())) : ?>
+					<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)); ?>">
+						<?php echo $this->escape($article->title); ?>
+					</a>
+					<?php if (JLanguageAssociations::isEnabled() && $this->params->get('show_associations')) : ?>
+						<?php $associations = ContentHelperAssociation::displayAssociations($article->id); ?>
+						<?php foreach ($associations as $association) : ?>
+							<?php if ($this->params->get('flags', 1) && $association['language']->image) : ?>
+								<?php $flag = JHtml::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>
+								&nbsp;<a href="<?php echo JRoute::_($association['item']); ?>"><?php echo $flag; ?></a>&nbsp;
+							<?php else : ?>
+								<?php $class = 'label label-association label-' . $association['language']->sef; ?>
+								&nbsp;<a class="<?php echo $class; ?>" href="<?php echo JRoute::_($association['item']); ?>"><?php echo strtoupper($association['language']->sef); ?></a>&nbsp;
+							<?php endif; ?>
+						<?php endforeach; ?>
+					<?php endif; ?>
+				<?php else : ?>
+					<?php
+					echo $this->escape($article->title) . ' : ';
+					$menu   = JFactory::getApplication()->getMenu();
+					$active = $menu->getActive();
+					$itemId = $active->id;
+					$link   = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false));
+					$link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)));
+					?>
+					<a href="<?php echo $link; ?>" class="register">
+						<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
+					</a>
+					<?php if (JLanguageAssociations::isEnabled() && $this->params->get('show_associations')) : ?>
+						<?php $associations = ContentHelperAssociation::displayAssociations($article->id); ?>
+						<?php foreach ($associations as $association) : ?>
+							<?php if ($this->params->get('flags', 1)) : ?>
+								<?php $flag = JHtml::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>
+								&nbsp;<a href="<?php echo JRoute::_($association['item']); ?>"><?php echo $flag; ?></a>&nbsp;
+							<?php else : ?>
+								<?php $class = 'label label-association label-' . $association['language']->sef; ?>
+								&nbsp;<a class="' . <?php echo $class; ?> . '" href="<?php echo JRoute::_($association['item']); ?>"><?php echo strtoupper($association['language']->sef); ?></a>&nbsp;
+							<?php endif; ?>
+						<?php endforeach; ?>
+					<?php endif; ?>
+				<?php endif; ?>
+				<?php if ($article->state == 0) : ?>
+					<span class="list-published label label-warning">
+								<?php echo JText::_('JUNPUBLISHED'); ?>
+							</span>
+				<?php endif; ?>
+				<?php if (strtotime($article->publish_up) > strtotime(JFactory::getDate())) : ?>
+					<span class="list-published label label-warning">
+								<?php echo JText::_('JNOTPUBLISHEDYET'); ?>
+							</span>
+				<?php endif; ?>
+				<?php if ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != JFactory::getDbo()->getNullDate()) : ?>
+					<span class="list-published label label-warning">
+								<?php echo JText::_('JEXPIRED'); ?>
+							</span>
+				<?php endif; ?>
+			</td>
+			<?php if ($this->params->get('list_show_date')) : ?>
+				<td headers="categorylist_header_date" class="list-date small">
+					<?php
+					echo JHtml::_(
+						'date', $article->displayDate,
+						$this->escape($this->params->get('date_format', JText::_('DATE_FORMAT_LC3')))
+					); ?>
+				</td>
+			<?php endif; ?>
+			<?php if ($this->params->get('list_show_author', 1)) : ?>
+				<td headers="categorylist_header_author" class="list-author">
+					<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
+						<?php $author = $article->author ?>
+						<?php $author = $article->created_by_alias ?: $author; ?>
+						<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
+						<?php else : ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+						<?php endif; ?>
+					<?php endif; ?>
+				</td>
+			<?php endif; ?>
+			<?php if ($this->params->get('list_show_hits', 1)) : ?>
+				<td headers="categorylist_header_hits" class="list-hits">
+							<span class="badge badge-info">
+								<?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $article->hits); ?>
+							</span>
+						</td>
+			<?php endif; ?>
+			<?php if ($this->params->get('list_show_votes', 0) && $this->vote) : ?>
+				<td headers="categorylist_header_votes" class="list-votes">
+					<span class="badge badge-success">
+						<?php echo JText::sprintf('COM_CONTENT_VOTES_COUNT', $article->rating_count); ?>
+					</span>
+				</td>
+			<?php endif; ?>
+			<?php if ($this->params->get('list_show_ratings', 0) && $this->vote) : ?>
+				<td headers="categorylist_header_ratings" class="list-ratings">
+					<span class="badge badge-warning">
+						<?php echo JText::sprintf('COM_CONTENT_RATINGS_COUNT', $article->rating); ?>
+					</span>
+				</td>
+			<?php endif; ?>
+			<?php if ($isEditable) : ?>
+				<td headers="categorylist_header_edit" class="list-edit">
+					<?php if ($article->params->get('access-edit')) : ?>
+						<?php echo JHtml::_('icon.edit', $article, $params); ?>
+					<?php endif; ?>
+				</td>
+			<?php endif; ?>
+			</tr>
+		<?php endforeach; ?>
+		</tbody>
+	</table>
+<?php endif; ?>
+
+<?php // Code to add a link to submit an article. ?>
+<?php if ($this->category->getParams()->get('access-create')) : ?>
+	<?php echo JHtml::_('icon.create', $this->category, $this->category->params); ?>
+<?php endif; ?>
+
+<?php // Add pagination links ?>
+<?php if (!empty($this->items)) : ?>
+	<?php if (($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+		<div class="pagination">
+
+			<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+				<p class="counter pull-right">
+					<?php echo $this->pagination->getPagesCounter(); ?>
+				</p>
+			<?php endif; ?>
+
+			<?php echo $this->pagination->getPagesLinks(); ?>
+		</div>
+	<?php endif; ?>
+<?php endif; ?>
+</form>
diff --git a/core/components/com_content/views/category/tmpl/default_children.php b/core/components/com_content/views/category/tmpl/default_children.php
new file mode 100644
index 00000000..b7aaf2dd
--- /dev/null
+++ b/core/components/com_content/views/category/tmpl/default_children.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$class  = ' class="first"';
+$lang   = JFactory::getLanguage();
+$user   = JFactory::getUser();
+$groups = $user->getAuthorisedViewLevels();
+?>
+
+<?php if (count($this->children[$this->category->id]) > 0) : ?>
+
+	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+		<?php // Check whether category access level allows access to subcategories. ?>
+		<?php if (in_array($child->access, $groups)) : ?>
+			<?php
+			if ($this->params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) :
+				if (!isset($this->children[$this->category->id][$id + 1])) :
+					$class = ' class="last"';
+				endif;
+			?>
+
+			<div<?php echo $class; ?>>
+				<?php $class = ''; ?>
+				<?php if ($lang->isRtl()) : ?>
+				<h3 class="page-header item-title">
+					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+							<?php echo $child->getNumItems(true); ?>
+						</span>
+					<?php endif; ?>
+					<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
+					<?php echo $this->escape($child->title); ?></a>
+
+					<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+					<?php endif; ?>
+				</h3>
+				<?php else : ?>
+				<h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
+					<?php echo $this->escape($child->title); ?></a>
+					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_CONTENT_NUM_ITEMS_TIP'); ?>">
+							<?php echo $child->getNumItems(true); ?>
+						</span>
+					<?php endif; ?>
+
+					<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+						<a href="#category-<?php echo $child->id; ?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>"><span class="icon-plus" aria-hidden="true"></span></a>
+					<?php endif; ?>
+				</h3>
+				<?php endif; ?>
+
+				<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+					<?php if ($child->description) : ?>
+						<div class="category-desc">
+							<?php echo JHtml::_('content.prepare', $child->description, '', 'com_content.category'); ?>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+					<div class="collapse fade" id="category-<?php echo $child->id; ?>">
+						<?php
+							$this->children[$child->id] = $child->getChildren();
+						$this->category = $child;
+						$this->maxLevel--;
+						echo $this->loadTemplate('children');
+						$this->category = $child->getParent();
+						$this->maxLevel++;
+						?>
+					</div>
+				<?php endif; ?>
+			</div>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
+
+<?php endif; ?>
diff --git a/core/components/com_content/views/category/view.feed.php b/core/components/com_content/views/category/view.feed.php
new file mode 100644
index 00000000..60eb8eec
--- /dev/null
+++ b/core/components/com_content/views/category/view.feed.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Content component
+ *
+ * @since  1.5
+ */
+class ContentViewCategory extends JViewCategoryfeed
+{
+	/**
+	 * @var    string  The name of the view to link individual items to
+	 * @since  3.2
+	 */
+	protected $viewName = 'article';
+
+	/**
+	 * Method to reconcile non standard names from components to usage in this class.
+	 * Typically overriden in the component feed view class.
+	 *
+	 * @param   object  $item  The item for a feed, an element of the $items array.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function reconcileNames($item)
+	{
+		// Get description, intro_image, author and date
+		$app               = JFactory::getApplication();
+		$params            = $app->getParams();
+		$item->description = '';
+		$obj = json_decode($item->images);
+		$introImage = isset($obj->{'image_intro'}) ? $obj->{'image_intro'} : '';
+
+		if (isset($introImage) && ($introImage != ''))
+		{
+			$image = preg_match('/http/', $introImage) ? $introImage : JURI::root() . $introImage;
+			$item->description = '<p><img src="' . $image . '" /></p>';
+		}
+
+		$item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext);
+
+		// Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
+		if (!$item->params->get('feed_summary', 0) && $item->params->get('feed_show_readmore', 0) && $item->fulltext)
+		{
+			// Compute the article slug
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+
+			// URL link to article
+			$link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+
+			$item->description .= '<p class="feed-readmore"><a target="_blank" href ="' . $link . '">' . JText::_('COM_CONTENT_FEED_READMORE') . '</a></p>';
+		}
+
+		$item->author = $item->created_by_alias ?: $item->author;
+	}
+}
diff --git a/core/components/com_content/views/category/view.html.php b/core/components/com_content/views/category/view.html.php
new file mode 100644
index 00000000..7a2beb94
--- /dev/null
+++ b/core/components/com_content/views/category/view.html.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTML View class for the Content component
+ *
+ * @since  1.5
+ */
+class ContentViewCategory extends JViewCategory
+{
+	/**
+	 * @var    array  Array of leading items for blog display
+	 * @since  3.2
+	 */
+	protected $lead_items = array();
+
+	/**
+	 * @var    array  Array of intro (multicolumn display) items for blog display
+	 * @since  3.2
+	 */
+	protected $intro_items = array();
+
+	/**
+	 * @var    array  Array of links in blog display
+	 * @since  3.2
+	 */
+	protected $link_items = array();
+
+	/**
+	 * @var    integer  Number of columns in a multi column display
+	 * @since  3.2
+	 */
+	protected $columns = 1;
+
+	/**
+	 * @var    string  The name of the extension for the category
+	 * @since  3.2
+	 */
+	protected $extension = 'com_content';
+
+	/**
+	 * @var    string  Default title to use for page title
+	 * @since  3.2
+	 */
+	protected $defaultPageTitle = 'JGLOBAL_ARTICLES';
+
+	/**
+	 * @var    string  The name of the view to link individual items to
+	 * @since  3.2
+	 */
+	protected $viewName = 'article';
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		parent::commonCategoryDisplay();
+
+		// Prepare the data
+		// Get the metrics for the structural page layout.
+		$params     = $this->params;
+		$numLeading = $params->def('num_leading_articles', 1);
+		$numIntro   = $params->def('num_intro_articles', 4);
+		$numLinks   = $params->def('num_links', 4);
+		$this->vote = JPluginHelper::isEnabled('content', 'vote');
+
+		JPluginHelper::importPlugin('content');
+
+		// Compute the article slugs and prepare introtext (runs content plugins).
+		foreach ($this->items as $item)
+		{
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+			// No link for ROOT category
+			if ($item->parent_alias === 'root')
+			{
+				$item->parent_slug = null;
+			}
+
+			$item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->event   = new stdClass;
+
+			$dispatcher = JEventDispatcher::getInstance();
+
+			// Old plugins: Ensure that text property is available
+			if (!isset($item->text))
+			{
+				$item->text = $item->introtext;
+			}
+
+			$dispatcher->trigger('onContentPrepare', array ('com_content.category', &$item, &$item->params, 0));
+
+			// Old plugins: Use processed text as introtext
+			$item->introtext = $item->text;
+
+			$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.category', &$item, &$item->params, 0));
+			$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.category', &$item, &$item->params, 0));
+			$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.category', &$item, &$item->params, 0));
+			$item->event->afterDisplayContent = trim(implode("\n", $results));
+		}
+
+		// Check for layout override only if this is not the active menu item
+		// If it is the active menu item, then the view and category id will match
+		$app     = JFactory::getApplication();
+		$active  = $app->getMenu()->getActive();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+
+		if ((!$active) || ((strpos($active->link, 'view=category') === false) || (strpos($active->link, '&id=' . (string) $this->category->id) === false)))
+		{
+			// Get the layout from the merged category params
+			if ($layout = $this->category->params->get('category_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+		// At this point, we are in a menu item, so we don't override the layout
+		elseif (isset($active->query['layout']))
+		{
+			// We need to set the layout from the query in case this is an alternative menu item (with an alternative layout)
+			$this->setLayout($active->query['layout']);
+		}
+
+		// For blog layouts, preprocess the breakdown of leading, intro and linked articles.
+		// This makes it much easier for the designer to just interrogate the arrays.
+		if ($params->get('layout_type') === 'blog' || $this->getLayout() === 'blog')
+		{
+			foreach ($this->items as $i => $item)
+			{
+				if ($i < $numLeading)
+				{
+					$this->lead_items[] = $item;
+				}
+
+				elseif ($i >= $numLeading && $i < $numLeading + $numIntro)
+				{
+					$this->intro_items[] = $item;
+				}
+
+				elseif ($i < $numLeading + $numIntro + $numLinks)
+				{
+					$this->link_items[] = $item;
+				}
+				else
+				{
+					continue;
+				}
+			}
+
+			$this->columns = max(1, $params->def('num_columns', 1));
+
+			$order = $params->def('multi_column_order', 1);
+
+			if ($order == 0 && $this->columns > 1)
+			{
+				// Call order down helper
+				$this->intro_items = ContentHelperQuery::orderDownColumns($this->intro_items, $this->columns);
+			}
+		}
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu
+			&& $menu->component == 'com_content'
+			&& isset($menu->query['view'], $menu->query['id'])
+			&& $menu->query['view'] == 'category'
+			&& $menu->query['id'] == $this->category->id)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+			$title = $this->params->get('page_title', $menu->title);
+		}
+		else
+		{
+			$this->params->def('page_heading', $this->category->title);
+			$title = $this->category->title;
+			$this->params->set('page_title', $title);
+		}
+
+		$id = (int) @$menu->query['id'];
+
+		// Check for empty title and add site name if param is set
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		if (empty($title))
+		{
+			$title = $this->category->title;
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->category->metadesc)
+		{
+			$this->document->setDescription($this->category->metadesc);
+		}
+		elseif ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->category->metakey)
+		{
+			$this->document->setMetadata('keywords', $this->category->metakey);
+		}
+		elseif ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		if (!is_object($this->category->metadata))
+		{
+			$this->category->metadata = new Registry($this->category->metadata);
+		}
+
+		if (($app->get('MetaAuthor') == '1') && $this->category->get('author', ''))
+		{
+			$this->document->setMetaData('author', $this->category->get('author', ''));
+		}
+
+		$mdata = $this->category->metadata->toArray();
+
+		foreach ($mdata as $k => $v)
+		{
+			if ($v)
+			{
+				$this->document->setMetadata($k, $v);
+			}
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 */
+	protected function prepareDocument()
+	{
+		parent::prepareDocument();
+		$menu = $this->menu;
+		$id = (int) @$menu->query['id'];
+
+		if ($menu && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $this->category->id))
+		{
+			$path = array(array('title' => $this->category->title, 'link' => ''));
+			$category = $this->category->getParent();
+
+			while (($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$this->pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		parent::addFeed();
+	}
+}
diff --git a/core/components/com_content/views/featured/tmpl/default.php b/core/components/com_content/views/featured/tmpl/default.php
new file mode 100644
index 00000000..7be0cb5a
--- /dev/null
+++ b/core/components/com_content/views/featured/tmpl/default.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+
+// If the page class is defined, add to class as suffix.
+// It will be a separate class if the user starts it with a space
+?>
+<div class="blog-featured<?php echo $this->pageclass_sfx; ?>" itemscope itemtype="https://schema.org/Blog">
+<?php if ($this->params->get('show_page_heading') != 0) : ?>
+<div class="page-header">
+	<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>
+</div>
+<?php endif; ?>
+
+<?php $leadingcount = 0; ?>
+<?php if (!empty($this->lead_items)) : ?>
+<div class="items-leading clearfix">
+	<?php foreach ($this->lead_items as &$item) : ?>
+		<div class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> clearfix"
+			itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+			<?php
+				$this->item = &$item;
+				echo $this->loadTemplate('item');
+			?>
+		</div>
+		<?php
+			$leadingcount++;
+		?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>
+<?php
+	$introcount = count($this->intro_items);
+	$counter = 0;
+?>
+<?php if (!empty($this->intro_items)) : ?>
+	<?php foreach ($this->intro_items as $key => &$item) : ?>
+
+		<?php
+		$key = ($key - $leadingcount) + 1;
+		$rowcount = (((int) $key - 1) % (int) $this->columns) + 1;
+		$row = $counter / $this->columns;
+
+		if ($rowcount === 1) : ?>
+
+		<div class="items-row cols-<?php echo (int) $this->columns; ?> <?php echo 'row-' . $row; ?> row-fluid">
+		<?php endif; ?>
+			<div class="item column-<?php echo $rowcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round(12 / $this->columns); ?>"
+				itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
+			<?php
+					$this->item = &$item;
+					echo $this->loadTemplate('item');
+			?>
+			</div>
+			<?php $counter++; ?>
+
+			<?php if (($rowcount == $this->columns) or ($counter == $introcount)) : ?>
+
+		</div>
+		<?php endif; ?>
+
+	<?php endforeach; ?>
+<?php endif; ?>
+
+<?php if (!empty($this->link_items)) : ?>
+	<div class="items-more">
+	<?php echo $this->loadTemplate('links'); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?>
+	<div class="pagination">
+
+		<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+			<p class="counter pull-right">
+				<?php echo $this->pagination->getPagesCounter(); ?>
+			</p>
+		<?php endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+<?php endif; ?>
+
+</div>
diff --git a/core/components/com_content/views/featured/tmpl/default.xml b/core/components/com_content/views/featured/tmpl/default.xml
new file mode 100644
index 00000000..ba25f440
--- /dev/null
+++ b/core/components/com_content/views/featured/tmpl/default.xml
@@ -0,0 +1,514 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE" option="COM_CONTENT_FEATURED_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORY_VIEW_FEATURED_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="advanced" label="COM_MENUS_LAYOUT_FEATURED_OPTIONS">
+			<field
+				name="featured_categories"
+				type="category"
+				label="COM_CONTENT_FEATURED_CATEGORIES_LABEL"
+				description="COM_CONTENT_FEATURED_CATEGORIES_DESC"
+				extension="com_content"
+				multiple="true"
+				size="10"
+				default=""
+		 		>
+				<option value="">JOPTION_ALL_CATEGORIES</option>
+			</field>
+
+			<field 
+				name="layout_type"
+				type="hidden"
+				default="blog"
+			/>
+
+			<field 
+				name="bloglayout" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="num_leading_articles" 
+				type="number"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+				useglobal="true"
+				size="3"
+			/>
+
+			<field 
+				name="num_intro_articles" 
+				type="number"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+				useglobal="true"
+				size="3"
+			/>
+
+			<field 
+				name="num_columns" 
+				type="number"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				description="JGLOBAL_NUM_COLUMNS_DESC"
+				useglobal="true"
+				size="3"
+			/>
+
+			<field 
+				name="num_links" 
+				type="number"
+				label="JGLOBAL_NUM_LINKS_LABEL"
+				description="JGLOBAL_NUM_LINKS_DESC"
+				useglobal="true"
+				size="3"
+			/>
+
+			<field 
+				name="multi_column_order" 
+				type="list"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+				description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_Down</option>
+				<option value="1">JGLOBAL_Across</option>
+			</field>
+
+			<field 
+				name="orderby_pri" 
+				type="list"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="none">JGLOBAL_No_Order</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field 
+				name="orderby_sec" 
+				type="list"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="random">JGLOBAL_RANDOM_ORDER</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+				<option	value="rorder">JGLOBAL_REVERSE_ORDERING</option>
+				<option value="vote" requires="vote">JGLOBAL_VOTES_DESC</option>
+				<option value="rvote" requires="vote">JGLOBAL_VOTES_ASC</option>
+				<option value="rank" requires="vote">JGLOBAL_RATINGS_DESC</option>
+				<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
+			</field>
+
+			<field 
+				name="order_date" 
+				type="list"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				useglobal="true"
+				>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+	</fieldset>
+
+	<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+			<field 
+				name="show_title" 
+				type="list"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_titles" 
+				type="list"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_intro" 
+				type="list"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field
+				name="info_block_show_title"
+				type="list"
+				label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_category" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_category" 
+				type="list"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_parent_category" 
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_parent_category" 
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_associations"
+				type="list"
+				label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL"
+				description="JGLOBAL_SHOW_ASSOCIATIONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field 
+				name="show_author" 
+				type="list"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="link_author" 
+				type="list"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field 
+				name="show_create_date" 
+				type="list"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_modify_date" 
+				type="list"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_publish_date" 
+				type="list"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_navigation" 
+				type="list"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_vote" 
+				type="list"
+				label="JGLOBAL_SHOW_VOTE_LABEL"
+				description="JGLOBAL_SHOW_VOTE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_icons" 
+				type="list"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_print_icon" 
+				type="list"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_email_icon" 
+				type="list"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_hits" 
+				type="list"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_tags"
+				type="list"
+				label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_noauth" 
+				type="list"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="integration" label="COM_MENUS_INTEGRATION_FIELDSET_LABEL">
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="feed_summary" 
+				type="list"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				useglobal="true"
+				>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_content/views/featured/tmpl/default_item.php b/core/components/com_content/views/featured/tmpl/default_item.php
new file mode 100644
index 00000000..b5642c87
--- /dev/null
+++ b/core/components/com_content/views/featured/tmpl/default_item.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create a shortcut for params.
+$params  = &$this->item->params;
+$images  = json_decode($this->item->images);
+$canEdit = $this->item->params->get('access-edit');
+$info    = $this->item->params->get('info_block_position', 0);
+
+// Check if associations are implemented. If they are, define the parameter.
+$assocParam = (JLanguageAssociations::isEnabled() && $params->get('show_associations'));
+?>
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate())) : ?>
+	<div class="system-unpublished">
+<?php endif; ?>
+
+<?php if ($params->get('show_title')) : ?>
+	<h2 class="item-title" itemprop="headline">
+	<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); ?>" itemprop="url">
+			<?php echo $this->escape($this->item->title); ?>
+		</a>
+	<?php else : ?>
+		<?php echo $this->escape($this->item->title); ?>
+	<?php endif; ?>
+	</h2>
+<?php endif; ?>
+
+<?php if ($this->item->state == 0) : ?>
+	<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+<?php endif; ?>
+<?php if (strtotime($this->item->publish_up) > strtotime(JFactory::getDate())) : ?>
+	<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+<?php endif; ?>
+<?php if ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?>
+	<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+<?php endif; ?>
+
+<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.icons', array('params' => $params, 'item' => $this->item, 'print' => false)); ?>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+<?php echo $this->item->event->afterDisplayTitle; ?>
+
+<?php // Todo Not that elegant would be nice to group the params ?>
+<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') || $assocParam); ?>
+
+<?php if ($useDefList && ($info == 0 || $info == 2)) : ?>
+	<?php // Todo: for Joomla4 joomla.content.info_block.block can be changed to joomla.content.info_block ?>
+	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
+	<?php if ($info == 0 && $params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php echo JLayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
+	<?php endif; ?>
+<?php endif; ?>
+
+<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php echo $this->item->introtext; ?>
+
+<?php if ($useDefList && ($info == 1 || $info == 2)) : ?>
+	<?php // Todo: for Joomla4 joomla.content.info_block.block can be changed to joomla.content.info_block ?>
+	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+	<?php if ($params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+		<?php echo JLayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
+	<?php endif; ?>
+<?php endif; ?>
+
+<?php if ($params->get('show_readmore') && $this->item->readmore) :
+	if ($params->get('access-view')) :
+		$link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language));
+	else :
+		$menu = JFactory::getApplication()->getMenu();
+		$active = $menu->getActive();
+		$itemId = $active->id;
+		$link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false));
+		$link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)));
+	endif; ?>
+
+	<?php echo JLayoutHelper::render('joomla.content.readmore', array('item' => $this->item, 'params' => $params, 'link' => $link)); ?>
+
+<?php endif; ?>
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != $this->db->getNullDate() )) : ?>
+	</div>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
+<?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/core/components/com_content/views/featured/tmpl/default_links.php b/core/components/com_content/views/featured/tmpl/default_links.php
new file mode 100644
index 00000000..129437c0
--- /dev/null
+++ b/core/components/com_content/views/featured/tmpl/default_links.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ol class="nav nav-tabs nav-stacked">
+<?php foreach ($this->link_items as &$item) : ?>
+	<li>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)); ?>">
+			<?php echo $item->title; ?></a>
+	</li>
+<?php endforeach; ?>
+</ol>
diff --git a/core/components/com_content/views/featured/view.feed.php b/core/components/com_content/views/featured/view.feed.php
new file mode 100644
index 00000000..61373014
--- /dev/null
+++ b/core/components/com_content/views/featured/view.feed.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Frontpage View class
+ *
+ * @since  1.5
+ */
+class ContentViewFeatured extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		// Parameters
+		$app       = JFactory::getApplication();
+		$doc       = JFactory::getDocument();
+		$params    = $app->getParams();
+		$feedEmail = $app->get('feed_email', 'none');
+		$siteEmail = $app->get('mailfrom');
+		$doc->link = JRoute::_('index.php?option=com_content&view=featured');
+
+		// Get some data from the model
+		$app->input->set('limit', $app->get('feed_limit'));
+		$categories = JCategories::getInstance('Content');
+		$rows       = $this->get('Items');
+
+		foreach ($rows as $row)
+		{
+			// Strip html from feed item title
+			$title = $this->escape($row->title);
+			$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+
+			// Compute the article slug
+			$row->slug = $row->alias ? ($row->id . ':' . $row->alias) : $row->id;
+
+			// URL link to article
+			$link = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language));
+
+			// Get row fulltext
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('fulltext'))
+				->from($db->quoteName('#__content'))
+				->where($db->quoteName('id') . ' = ' . $row->id);
+			$db->setQuery($query);
+			$row->fulltext = $db->loadResult();
+
+			$description = '';
+			$obj = json_decode($row->images);
+			$introImage = isset($obj->{'image_intro'}) ? $obj->{'image_intro'} : '';
+
+			if (isset($introImage) && ($introImage != ''))
+			{
+				$image = preg_match('/http/', $introImage) ? $introImage : JURI::root() . $introImage;
+				$description = '<p><img src="' . $image . '" /></p>';
+			}
+
+			$description .= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
+			$author      = $row->created_by_alias ?: $row->author;
+
+			// Load individual item creator class
+			$item           = new JFeedItem;
+			$item->title    = $title;
+			$item->link     = $link;
+			$item->date     = $row->publish_up;
+			$item->category = array();
+
+			// All featured articles are categorized as "Featured"
+			$item->category[] = JText::_('JFEATURED');
+
+			for ($item_category = $categories->get($row->catid); $item_category !== null; $item_category = $item_category->getParent())
+			{
+				// Only add non-root categories
+				if ($item_category->id > 1)
+				{
+					$item->category[] = $item_category->title;
+				}
+			}
+
+			$item->author = $author;
+
+			if ($feedEmail === 'site')
+			{
+				$item->authorEmail = $siteEmail;
+			}
+			elseif ($feedEmail === 'author')
+			{
+				$item->authorEmail = $row->author_email;
+			}
+
+			// Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
+			if (!$params->get('feed_summary', 0) && $params->get('feed_show_readmore', 0) && $row->fulltext)
+			{
+				$description .= '<p class="feed-readmore"><a target="_blank" href ="' . $item->link . '">' . JText::_('COM_CONTENT_FEED_READMORE') . '</a></p>';
+			}
+
+			// Load item description and add div
+			$item->description = '<div class="feed-description">' . $description . '</div>';
+
+			// Loads item info into rss array
+			$doc->addItem($item);
+		}
+	}
+}
diff --git a/core/components/com_content/views/featured/view.html.php b/core/components/com_content/views/featured/view.html.php
new file mode 100644
index 00000000..ac82b66d
--- /dev/null
+++ b/core/components/com_content/views/featured/view.html.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Frontpage View class
+ *
+ * @since  1.5
+ */
+class ContentViewFeatured extends JViewLegacy
+{
+	protected $state = null;
+
+	protected $item = null;
+
+	protected $items = null;
+
+	protected $pagination = null;
+
+	protected $lead_items = array();
+
+	protected $intro_items = array();
+
+	protected $link_items = array();
+
+	protected $columns = 1;
+
+	/**
+	 * An instance of JDatabaseDriver.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.6.3
+	 */
+	protected $db;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$user = JFactory::getUser();
+
+		$state      = $this->get('State');
+		$items      = $this->get('Items');
+		$pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		$params = &$state->params;
+
+		// PREPARE THE DATA
+
+		// Get the metrics for the structural page layout.
+		$numLeading = (int) $params->def('num_leading_articles', 1);
+		$numIntro   = (int) $params->def('num_intro_articles', 4);
+
+		JPluginHelper::importPlugin('content');
+
+		// Compute the article slugs and prepare introtext (runs content plugins).
+		foreach ($items as &$item)
+		{
+			$item->slug        = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+			// No link for ROOT category
+			if ($item->parent_alias === 'root')
+			{
+				$item->parent_slug = null;
+			}
+
+			$item->event = new stdClass;
+			$dispatcher  = JEventDispatcher::getInstance();
+
+			// Old plugins: Ensure that text property is available
+			if (!isset($item->text))
+			{
+				$item->text = $item->introtext;
+			}
+
+			$dispatcher->trigger('onContentPrepare', array ('com_content.featured', &$item, &$item->params, 0));
+
+			// Old plugins: Use processed text as introtext
+			$item->introtext = $item->text;
+
+			$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.featured', &$item, &$item->params, 0));
+			$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.featured', &$item, &$item->params, 0));
+			$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.featured', &$item, &$item->params, 0));
+			$item->event->afterDisplayContent = trim(implode("\n", $results));
+		}
+
+		// Preprocess the breakdown of leading, intro and linked articles.
+		// This makes it much easier for the designer to just interogate the arrays.
+		$max = count($items);
+
+		// The first group is the leading articles.
+		$limit = $numLeading;
+
+		for ($i = 0; $i < $limit && $i < $max; $i++)
+		{
+			$this->lead_items[$i] = &$items[$i];
+		}
+
+		// The second group is the intro articles.
+		$limit = $numLeading + $numIntro;
+
+		// Order articles across, then down (or single column mode)
+		for ($i = $numLeading; $i < $limit && $i < $max; $i++)
+		{
+			$this->intro_items[$i] = &$items[$i];
+		}
+
+		$this->columns = max(1, $params->def('num_columns', 1));
+		$order = $params->def('multi_column_order', 1);
+
+		if ($order == 0 && $this->columns > 1)
+		{
+			// Call order down helper
+			$this->intro_items = ContentHelperQuery::orderDownColumns($this->intro_items, $this->columns);
+		}
+
+		// The remainder are the links.
+		for ($i = $numLeading + $numIntro; $i < $max; $i++)
+		{
+			$this->link_items[$i] = &$items[$i];
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->params     = &$params;
+		$this->items      = &$items;
+		$this->pagination = &$pagination;
+		$this->user       = &$user;
+		$this->db         = JFactory::getDbo();
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 */
+	protected function _prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		// Add feed links
+		if ($this->params->get('show_feed_link', 1))
+		{
+			$link    = '&format=feed&limitstart=';
+			$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+			$attribs = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+		}
+	}
+}
diff --git a/core/components/com_content/views/form/tmpl/edit.php b/core/components/com_content/views/form/tmpl/edit.php
new file mode 100644
index 00000000..485dc82a
--- /dev/null
+++ b/core/components/com_content/views/form/tmpl/edit.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.tabstate');
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0));
+JHtml::_('formbehavior.chosen', 'select');
+$this->tab_name = 'com-content-form';
+$this->ignore_fieldsets = array('image-intro', 'image-full', 'jmetadata', 'item_associations');
+
+// Create shortcut to parameters.
+$params = $this->state->get('params');
+
+// This checks if the editor config options have ever been saved. If they haven't they will fall back to the original settings.
+$editoroptions = isset($params->show_publishing_options);
+
+if (!$editoroptions)
+{
+	$params->show_urls_images_frontend = '0';
+}
+
+JFactory::getDocument()->addScriptDeclaration("
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'article.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
+		{
+			" . $this->form->getField('articletext')->save() . "
+			Joomla.submitform(task);
+		}
+	}
+");
+?>
+<div class="edit item-page<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($params->get('show_page_heading')) : ?>
+	<div class="page-header">
+		<h1>
+			<?php echo $this->escape($params->get('page_heading')); ?>
+		</h1>
+	</div>
+	<?php endif; ?>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_content&a_id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
+		<fieldset>
+			<?php echo JHtml::_('bootstrap.startTabSet', $this->tab_name, array('active' => 'editor')); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', $this->tab_name, 'editor', JText::_('COM_CONTENT_ARTICLE_CONTENT')); ?>
+				<?php echo $this->form->renderField('title'); ?>
+
+				<?php if (is_null($this->item->id)) : ?>
+					<?php echo $this->form->renderField('alias'); ?>
+				<?php endif; ?>
+
+				<?php echo $this->form->getInput('articletext'); ?>
+
+				<?php if ($this->captchaEnabled) : ?>
+					<?php echo $this->form->renderField('captcha'); ?>
+				<?php endif; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php if ($params->get('show_urls_images_frontend')) : ?>
+			<?php echo JHtml::_('bootstrap.addTab', $this->tab_name, 'images', JText::_('COM_CONTENT_IMAGES_AND_URLS')); ?>
+				<?php echo $this->form->renderField('image_intro', 'images'); ?>
+				<?php echo $this->form->renderField('image_intro_alt', 'images'); ?>
+				<?php echo $this->form->renderField('image_intro_caption', 'images'); ?>
+				<?php echo $this->form->renderField('float_intro', 'images'); ?>
+				<?php echo $this->form->renderField('image_fulltext', 'images'); ?>
+				<?php echo $this->form->renderField('image_fulltext_alt', 'images'); ?>
+				<?php echo $this->form->renderField('image_fulltext_caption', 'images'); ?>
+				<?php echo $this->form->renderField('float_fulltext', 'images'); ?>
+				<?php echo $this->form->renderField('urla', 'urls'); ?>
+				<?php echo $this->form->renderField('urlatext', 'urls'); ?>
+				<div class="control-group">
+					<div class="controls">
+						<?php echo $this->form->getInput('targeta', 'urls'); ?>
+					</div>
+				</div>
+				<?php echo $this->form->renderField('urlb', 'urls'); ?>
+				<?php echo $this->form->renderField('urlbtext', 'urls'); ?>
+				<div class="control-group">
+					<div class="controls">
+						<?php echo $this->form->getInput('targetb', 'urls'); ?>
+					</div>
+				</div>
+				<?php echo $this->form->renderField('urlc', 'urls'); ?>
+				<?php echo $this->form->renderField('urlctext', 'urls'); ?>
+				<div class="control-group">
+					<div class="controls">
+						<?php echo $this->form->getInput('targetc', 'urls'); ?>
+					</div>
+				</div>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
+
+			<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', $this->tab_name, 'publishing', JText::_('COM_CONTENT_PUBLISHING')); ?>
+				<?php echo $this->form->renderField('catid'); ?>
+				<?php echo $this->form->renderField('tags'); ?>
+				<?php if ($params->get('save_history', 0)) : ?>
+					<?php echo $this->form->renderField('version_note'); ?>
+				<?php endif; ?>
+				<?php if ($params->get('show_publishing_options', 1) == 1) : ?>
+					<?php echo $this->form->renderField('created_by_alias'); ?>
+				<?php endif; ?>
+				<?php if ($this->item->params->get('access-change')) : ?>
+					<?php echo $this->form->renderField('state'); ?>
+					<?php echo $this->form->renderField('featured'); ?>
+					<?php if ($params->get('show_publishing_options', 1) == 1) : ?>					
+						<?php echo $this->form->renderField('publish_up'); ?>
+						<?php echo $this->form->renderField('publish_down'); ?>
+					<?php endif; ?>
+				<?php endif; ?>
+				<?php echo $this->form->renderField('access'); ?>
+				<?php if (is_null($this->item->id)) : ?>
+					<div class="control-group">
+						<div class="control-label">
+						</div>
+						<div class="controls">
+							<?php echo JText::_('COM_CONTENT_ORDERING'); ?>
+						</div>
+					</div>
+				<?php endif; ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php echo JHtml::_('bootstrap.addTab', $this->tab_name, 'language', JText::_('JFIELD_LANGUAGE_LABEL')); ?>
+				<?php echo $this->form->renderField('language'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+			<?php if ($params->get('show_publishing_options', 1) == 1) : ?>	
+				<?php echo JHtml::_('bootstrap.addTab', $this->tab_name, 'metadata', JText::_('COM_CONTENT_METADATA')); ?>
+					<?php echo $this->form->renderField('metadesc'); ?>
+					<?php echo $this->form->renderField('metakey'); ?>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
+
+			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+
+			<input type="hidden" name="task" value="" />
+			<input type="hidden" name="return" value="<?php echo $this->return_page; ?>" />
+			<?php echo JHtml::_('form.token'); ?>
+		</fieldset>
+		<div class="btn-toolbar">
+			<div class="btn-group">
+				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('article.save')">
+					<span class="icon-ok"></span><?php echo JText::_('JSAVE') ?>
+				</button>
+			</div>
+			<div class="btn-group">
+				<button type="button" class="btn" onclick="Joomla.submitbutton('article.cancel')">
+					<span class="icon-cancel"></span><?php echo JText::_('JCANCEL') ?>
+				</button>
+			</div>
+			<?php if ($params->get('save_history', 0) && $this->item->id) : ?>
+			<div class="btn-group">
+				<?php echo $this->form->getInput('contenthistory'); ?>
+			</div>
+			<?php endif; ?>
+		</div>
+	</form>
+</div>
diff --git a/core/components/com_content/views/form/tmpl/edit.xml b/core/components/com_content/views/form/tmpl/edit.xml
new file mode 100644
index 00000000..cf67295e
--- /dev/null
+++ b/core/components/com_content/views/form/tmpl/edit.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_FORM_VIEW_DEFAULT_TITLE" option="COM_CONTENT_FORM_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_FORM_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fields name="params">
+		<fieldset name="basic"
+			addfieldpath="/administrator/components/com_categories/models/fields"
+		>
+			<field 
+				name="enable_category"
+				type="radio"
+				label="COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL"
+				description="COM_CONTENT_CREATE_ARTICLE_CATEGORY_DESC"
+				class="btn-group btn-group-yesno"
+				default="0"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="catid"
+				type="modal_category"
+				label="JGLOBAL_CHOOSE_CATEGORY_LABEL"
+				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+				showon="enable_category:1"
+			/>
+
+			<field
+				name="redirect_menuitem"
+				type="modal_menu"
+				label="COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_LABEL"
+				description="COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_DESC"
+				>
+				<option value="">JDEFAULT</option>
+			</field>
+
+			<field
+				name="custom_cancel_redirect"
+				type="radio"
+				label="COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_LABEL"
+				description="COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC"
+				class="btn-group btn-group-yesno"
+				default="0"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="cancel_redirect_menuitem"
+				type="modal_menu"
+				label="COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_LABEL"
+				description="COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_DESC"
+				showon="custom_cancel_redirect:1"
+				>
+				<option value="">JDEFAULT</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_content/views/form/view.html.php b/core/components/com_content/views/form/view.html.php
new file mode 100644
index 00000000..a5d5ae02
--- /dev/null
+++ b/core/components/com_content/views/form/view.html.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML Article View class for the Content component
+ *
+ * @since  1.5
+ */
+class ContentViewForm extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $return_page;
+
+	protected $state;
+
+	/**
+	 * Should we show a captcha form for the submission of the article?
+	 *
+	 * @var   bool
+	 * @since 3.7.0
+	 */
+	protected $captchaEnabled = false;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$user = JFactory::getUser();
+		$app  = JFactory::getApplication();
+
+		// Get model data.
+		$this->state       = $this->get('State');
+		$this->item        = $this->get('Item');
+		$this->form        = $this->get('Form');
+		$this->return_page = $this->get('ReturnPage');
+
+		if (empty($this->item->id))
+		{
+			$authorised = $user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create'));
+		}
+		else
+		{
+			$authorised = $this->item->params->get('access-edit');
+		}
+
+		if ($authorised !== true)
+		{
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->setHeader('status', 403, true);
+
+			return false;
+		}
+
+		$this->item->tags = new JHelperTags;
+
+		if (!empty($this->item->id))
+		{
+			$this->item->tags->getItemTags('com_content.article', $this->item->id);
+
+			$this->item->images = json_decode($this->item->images);
+			$this->item->urls = json_decode($this->item->urls);
+
+			$tmp = new stdClass;
+			$tmp->images = $this->item->images;
+			$tmp->urls = $this->item->urls;
+			$this->form->bind($tmp);
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Create a shortcut to the parameters.
+		$params = &$this->state->params;
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->params = $params;
+
+		// Override global params with article specific params
+		$this->params->merge($this->item->params);
+		$this->user   = $user;
+
+		// Propose current language as default when creating new article
+		if (empty($this->item->id) && JLanguageMultilang::isEnabled())
+		{
+			$lang = JFactory::getLanguage()->getTag();
+			$this->form->setFieldAttribute('language', 'default', $lang);
+		}
+
+		$captchaSet = $params->get('captcha', JFactory::getApplication()->get('captcha', '0'));
+
+		foreach (JPluginHelper::getPlugin('captcha') as $plugin)
+		{
+			if ($captchaSet === $plugin->name)
+			{
+				$this->captchaEnabled = true;
+				break;
+			}
+		}
+
+		$this->_prepareDocument();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 */
+	protected function _prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_CONTENT_FORM_EDIT_ARTICLE'));
+		}
+
+		$title = $this->params->def('page_title', JText::_('COM_CONTENT_FORM_EDIT_ARTICLE'));
+
+		if ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		$pathway = $app->getPathWay();
+		$pathway->addItem($title, '');
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_contenthistory/contenthistory.php b/core/components/com_contenthistory/contenthistory.php
new file mode 100644
index 00000000..7f167cc2
--- /dev/null
+++ b/core/components/com_contenthistory/contenthistory.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contenthistory
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load the com_contenthistory language files, default to the admin file and fall back to site if one isn't found
+$lang = JFactory::getLanguage();
+$lang->load('com_contenthistory', JPATH_ADMINISTRATOR, null, false, true)
+||	$lang->load('com_contenthistory', JPATH_SITE, null, false, true);
+
+// Hand processing over to the admin base file
+require_once JPATH_COMPONENT_ADMINISTRATOR . '/contenthistory.php';
diff --git a/core/components/com_fields/controller.php b/core/components/com_fields/controller.php
new file mode 100644
index 00000000..fc1caa8d
--- /dev/null
+++ b/core/components/com_fields/controller.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Base controller class for Fields Component.
+ *
+ * @since  3.7.0
+ */
+class FieldsController extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *                          Recognized key values include 'name', 'default_task', 'model_path', and
+	 *                          'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		$this->input = JFactory::getApplication()->input;
+
+		// Frontpage Editor Fields Button proxying:
+		if ($this->input->get('view') === 'fields' && $this->input->get('layout') === 'modal')
+		{
+			// Load the backend language file.
+			$lang = JFactory::getLanguage();
+			$lang->load('com_fields', JPATH_ADMINISTRATOR);
+
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+
+		parent::__construct($config);
+	}
+}
diff --git a/core/components/com_fields/fields.php b/core/components/com_fields/fields.php
new file mode 100644
index 00000000..ae431965
--- /dev/null
+++ b/core/components/com_fields/fields.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+$input   = JFactory::getApplication()->input;
+$context = JFactory::getApplication()->getUserStateFromRequest('com_fields.fields.context', 'context', 'com_content.article', 'CMD');
+$parts   = FieldsHelper::extract($context);
+
+if ($input->get('view') === 'fields' && $input->get('layout') === 'modal')
+{
+	if (!JFactory::getUser()->authorise('core.create', $parts[0])
+		|| !JFactory::getUser()->authorise('core.edit', $parts[0]))
+	{
+		JFactory::getApplication()->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+
+		return;
+	}
+}
+
+$controller = JControllerLegacy::getInstance('Fields');
+$controller->execute($input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_fields/layouts/field/render.php b/core/components/com_fields/layouts/field/render.php
new file mode 100644
index 00000000..9c8d9117
--- /dev/null
+++ b/core/components/com_fields/layouts/field/render.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+if (!key_exists('field', $displayData))
+{
+	return;
+}
+
+$field = $displayData['field'];
+$label = JText::_($field->label);
+$value = $field->value;
+$showLabel = $field->params->get('showlabel');
+
+if ($value == '')
+{
+	return;
+}
+
+?>
+<?php if ($showLabel == 1) : ?>
+	<span class="field-label"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
+<?php endif; ?>
+<span class="field-value"><?php echo $value; ?></span>
diff --git a/core/components/com_fields/layouts/fields/render.php b/core/components/com_fields/layouts/fields/render.php
new file mode 100644
index 00000000..37c4153e
--- /dev/null
+++ b/core/components/com_fields/layouts/fields/render.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+// Check if we have all the data
+if (!key_exists('item', $displayData) || !key_exists('context', $displayData))
+{
+	return;
+}
+
+// Setting up for display
+$item = $displayData['item'];
+
+if (!$item)
+{
+	return;
+}
+
+$context = $displayData['context'];
+
+if (!$context)
+{
+	return;
+}
+
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+$parts     = explode('.', $context);
+$component = $parts[0];
+$fields    = null;
+
+if (key_exists('fields', $displayData))
+{
+	$fields = $displayData['fields'];
+}
+else
+{
+	$fields = $item->jcfields ?: FieldsHelper::getFields($context, $item, true);
+}
+
+if (!$fields)
+{
+	return;
+}
+
+?>
+<dl class="fields-container">
+	<?php foreach ($fields as $field) : ?>
+		<?php // If the value is empty do nothing ?>
+		<?php if (!isset($field->value) || $field->value == '') : ?>
+			<?php continue; ?>
+		<?php endif; ?>
+		<?php $class = $field->params->get('render_class'); ?>
+		<dd class="field-entry <?php echo $class; ?>">
+			<?php echo FieldsHelper::render($context, 'field.render', array('field' => $field)); ?>
+		</dd>
+	<?php endforeach; ?>
+</dl>
diff --git a/core/components/com_fields/models/forms/filter_fields.xml b/core/components/com_fields/models/forms/filter_fields.xml
new file mode 100644
index 00000000..4ee66ee5
--- /dev/null
+++ b/core/components/com_fields/models/forms/filter_fields.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="group"
+		addfieldpath="/administrator/components/com_fields/models/fields">
+		<field
+			name="context"
+			type="fieldcontexts"
+			onchange="this.form.submit();"
+		/>
+	</fieldset>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label=""
+			hint="JSEARCH_FILTER"
+			class="js-stools-search-string"
+		/>
+
+		<field
+			name="state"
+			type="status"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+
+		<field
+			name="group_id"
+			type="fieldgroups"
+			state="0,1,2"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FIELDS_VIEW_FIELDS_SELECT_GROUP</option>
+		</field>
+
+		<field
+			name="assigned_cat_ids"
+			type="category"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_FIELDS_VIEW_FIELDS_SELECT_CATEGORY</option>
+		</field>
+
+		<field
+			name="access"
+			type="accesslevel"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+
+		<field
+			name="language"
+			type="contentlanguage"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_LANGUAGE</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,2,-2"
+			onchange="this.form.submit();"
+			default="a.ordering ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.state ASC">JSTATUS_ASC</option>
+			<option value="a.state DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.type ASC">COM_FIELDS_VIEW_FIELDS_SORT_TYPE_ASC</option>
+			<option value="a.type DESC">COM_FIELDS_VIEW_FIELDS_SORT_TYPE_DESC</option>
+			<option value="category_title ASC">COM_FIELDS_FIELD_GROUP_LABEL</option>
+			<option value="category_title DESC">COM_FIELDS_FIELD_GROUP_LABEL</option>
+			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_FIELDS_LIST_LIMIT"
+			description="COM_FIELDS_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/components/com_finder/controller.php b/core/components/com_finder/controller.php
new file mode 100644
index 00000000..d8b483fc
--- /dev/null
+++ b/core/components/com_finder/controller.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+/**
+ * Finder Component Controller.
+ *
+ * @since  2.5
+ */
+class FinderController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached. [optional]
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types,
+	 *                               for valid values see {@link JFilterInput::clean()}. [optional]
+	 *
+	 * @return  JControllerLegacy  This object is to support chaining.
+	 *
+	 * @since   2.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		$input = JFactory::getApplication()->input;
+		$cachable = true;
+
+		// Load plugin language files.
+		FinderHelperLanguage::loadPluginLanguage();
+
+		// Set the default view name and format from the Request.
+		$viewName = $input->get('view', 'search', 'word');
+		$input->set('view', $viewName);
+
+		// Don't cache view for search queries
+		if ($input->get('q', null, 'string') || $input->get('f', null, 'int') || $input->get('t', null, 'array'))
+		{
+			$cachable = false;
+		}
+
+		$safeurlparams = array(
+			'f'    => 'INT',
+			'lang' => 'CMD'
+		);
+
+		return parent::display($cachable, $safeurlparams);
+	}
+}
diff --git a/core/components/com_finder/controllers/suggestions.json.php b/core/components/com_finder/controllers/suggestions.json.php
new file mode 100644
index 00000000..69a2e759
--- /dev/null
+++ b/core/components/com_finder/controllers/suggestions.json.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Suggestions JSON controller for Finder.
+ *
+ * @since  2.5
+ */
+class FinderControllerSuggestions extends JControllerLegacy
+{
+	/**
+	 * Method to find search query suggestions. Uses jQuery and autocopleter.js
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function suggest()
+	{
+		$app = JFactory::getApplication();
+		$app->mimeType = 'application/json';
+
+		$suggestions = $this->getSuggestions();
+
+		// Send the response.
+		$app->setHeader('Content-Type', $app->mimeType . '; charset=' . $app->charSet);
+		$app->sendHeaders();
+		echo '{ "suggestions": ' . json_encode($suggestions) . ' }';
+		$app->close();
+	}
+
+	/**
+	 * Method to find search query suggestions. Uses Mootools and autocompleter.js
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 * @deprecated 3.4
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$app = JFactory::getApplication();
+		$app->mimeType = 'application/json';
+
+		$suggestions = $this->getSuggestions();
+
+		// Send the response.
+		$app->setHeader('Content-Type', $app->mimeType . '; charset=' . $app->charSet);
+		$app->sendHeaders();
+		echo json_encode($suggestions);
+		$app->close();
+	}
+
+	/**
+	 * Method to retrieve the data from the database
+	 *
+	 * @return  array  The suggested words
+	 *
+	 * @since   3.4
+	 */
+	protected function getSuggestions()
+	{
+		$return = array();
+
+		$params = JComponentHelper::getParams('com_finder');
+
+		if ($params->get('show_autosuggest', 1))
+		{
+			// Get the suggestions.
+			$model = $this->getModel('Suggestions', 'FinderModel');
+			$return = $model->getItems();
+		}
+
+		// Check the data.
+		if (empty($return))
+		{
+			$return = array();
+		}
+
+		return $return;
+	}
+}
diff --git a/core/components/com_finder/finder.php b/core/components/com_finder/finder.php
new file mode 100644
index 00000000..5c91779b
--- /dev/null
+++ b/core/components/com_finder/finder.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
+
+$controller = JControllerLegacy::getInstance('Finder');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_finder/helpers/html/filter.php b/core/components/com_finder/helpers/html/filter.php
new file mode 100644
index 00000000..74eba096
--- /dev/null
+++ b/core/components/com_finder/helpers/html/filter.php
@@ -0,0 +1,490 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+/**
+ * Filter HTML Behaviors for Finder.
+ *
+ * @since  2.5
+ */
+abstract class JHtmlFilter
+{
+	/**
+	 * Method to generate filters using the slider widget and decorated
+	 * with the FinderFilter JavaScript behaviors.
+	 *
+	 * @param   array  $options  An array of configuration options. [optional]
+	 *
+	 * @return  mixed  A rendered HTML widget on success, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function slider($options = array())
+	{
+		$db     = JFactory::getDbo();
+		$query  = $db->getQuery(true);
+		$user   = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+		$html   = '';
+		$filter = null;
+
+		// Get the configuration options.
+		$filterId    = array_key_exists('filter_id', $options) ? $options['filter_id'] : null;
+		$activeNodes = array_key_exists('selected_nodes', $options) ? $options['selected_nodes'] : array();
+		$classSuffix = array_key_exists('class_suffix', $options) ? $options['class_suffix'] : '';
+
+		// Load the predefined filter if specified.
+		if (!empty($filterId))
+		{
+			$query->select('f.data, f.params')
+				->from($db->quoteName('#__finder_filters') . ' AS f')
+				->where('f.filter_id = ' . (int) $filterId);
+
+			// Load the filter data.
+			$db->setQuery($query);
+
+			try
+			{
+				$filter = $db->loadObject();
+			}
+			catch (RuntimeException $e)
+			{
+				return null;
+			}
+
+			// Initialize the filter parameters.
+			if ($filter)
+			{
+				$filter->params = new Registry($filter->params);
+			}
+		}
+
+		// Build the query to get the branch data and the number of child nodes.
+		$query->clear()
+			->select('t.*, count(c.id) AS children')
+			->from($db->quoteName('#__finder_taxonomy') . ' AS t')
+			->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS c ON c.parent_id = t.id')
+			->where('t.parent_id = 1')
+			->where('t.state = 1')
+			->where('t.access IN (' . $groups . ')')
+			->group('t.id, t.parent_id, t.state, t.access, t.ordering, t.title, c.parent_id')
+			->order('t.ordering, t.title');
+
+		// Limit the branch children to a predefined filter.
+		if ($filter)
+		{
+			$query->where('c.id IN(' . $filter->data . ')');
+		}
+
+		// Load the branches.
+		$db->setQuery($query);
+
+		try
+		{
+			$branches = $db->loadObjectList('id');
+		}
+		catch (RuntimeException $e)
+		{
+			return null;
+		}
+
+		// Check that we have at least one branch.
+		if (count($branches) === 0)
+		{
+			return null;
+		}
+
+		$branch_keys = array_keys($branches);
+		$html .= JHtml::_('bootstrap.startAccordion', 'accordion', array('parent' => true, 'active' => 'accordion-' . $branch_keys[0])
+		);
+
+		// Load plugin language files.
+		FinderHelperLanguage::loadPluginLanguage();
+
+		// Iterate through the branches and build the branch groups.
+		foreach ($branches as $bk => $bv)
+		{
+			// If the multi-lang plugin is enabled then drop the language branch.
+			if ($bv->title === 'Language' && JLanguageMultilang::isEnabled())
+			{
+				continue;
+			}
+
+			// Build the query to get the child nodes for this branch.
+			$query->clear()
+				->select('t.*')
+				->from($db->quoteName('#__finder_taxonomy') . ' AS t')
+				->where('t.parent_id = ' . (int) $bk)
+				->where('t.state = 1')
+				->where('t.access IN (' . $groups . ')')
+				->order('t.ordering, t.title');
+
+			// Self-join to get the parent title.
+			$query->select('e.title AS parent_title')
+				->join('LEFT', $db->quoteName('#__finder_taxonomy', 'e') . ' ON ' . $db->quoteName('e.id') . ' = ' . $db->quoteName('t.parent_id'));
+
+			// Load the branches.
+			$db->setQuery($query);
+
+			try
+			{
+				$nodes = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				return null;
+			}
+
+			// Translate node titles if possible.
+			$lang = JFactory::getLanguage();
+
+			foreach ($nodes as $nk => $nv)
+			{
+				if (trim($nv->parent_title, '**') === 'Language')
+				{
+					$title = FinderHelperLanguage::branchLanguageTitle($nv->title);
+				}
+				else
+				{
+					$key = FinderHelperLanguage::branchPlural($nv->title);
+					$title = $lang->hasKey($key) ? JText::_($key) : $nv->title;
+				}
+
+				$nodes[$nk]->title = $title;
+			}
+
+			// Adding slides
+			$html .= JHtml::_('bootstrap.addSlide',
+				'accordion',
+				JText::sprintf('COM_FINDER_FILTER_BRANCH_LABEL',
+					JText::_(FinderHelperLanguage::branchSingular($bv->title)) . ' - ' . count($nodes)
+				),
+				'accordion-' . $bk
+			);
+
+			// Populate the toggle button.
+			$html .= '<button class="btn jform-rightbtn" type="button" onclick="jQuery(\'[id=&quot;tax-'
+				. $bk . '&quot;]\').each(function(){this.click();});"><span class="icon-checkbox-partial"></span> '
+				. JText::_('JGLOBAL_SELECTION_INVERT') . '</button><hr/>';
+
+			// Populate the group with nodes.
+			foreach ($nodes as $nk => $nv)
+			{
+				// Determine if the node should be checked.
+				$checked = in_array($nk, $activeNodes) ? ' checked="checked"' : '';
+
+				// Build a node.
+				$html .= '<div class="control-group">';
+				$html .= '<div class="controls">';
+				$html .= '<label class="checkbox">';
+				$html .= '<input type="checkbox" class="selector filter-node' . $classSuffix . '" value="' . $nk . '" name="t[]" id="tax-'
+					. $bk . '"' . $checked . ' />';
+				$html .= $nv->title;
+				$html .= '</label>';
+				$html .= '</div>';
+				$html .= '</div>';
+			}
+
+			$html .= JHtml::_('bootstrap.endSlide');
+		}
+
+		$html .= JHtml::_('bootstrap.endAccordion');
+
+		return $html;
+	}
+
+	/**
+	 * Method to generate filters using select box dropdown controls.
+	 *
+	 * @param   FinderIndexerQuery  $idxQuery  A FinderIndexerQuery object.
+	 * @param   array               $options   An array of options.
+	 *
+	 * @return  mixed  A rendered HTML widget on success, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function select($idxQuery, $options)
+	{
+		$user   = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+		$filter = null;
+
+		// Get the configuration options.
+		$classSuffix = $options->get('class_suffix', null);
+		$showDates   = $options->get('show_date_filters', false);
+
+		// Try to load the results from cache.
+		$cache   = JFactory::getCache('com_finder', '');
+		$cacheId = 'filter_select_' . serialize(array($idxQuery->filter, $options, $groups, JFactory::getLanguage()->getTag()));
+
+		// Check the cached results.
+		if ($cache->contains($cacheId))
+		{
+			$branches = $cache->get($cacheId);
+		}
+		else
+		{
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			// Load the predefined filter if specified.
+			if (!empty($idxQuery->filter))
+			{
+				$query->select('f.data, ' . $db->quoteName('f.params'))
+					->from($db->quoteName('#__finder_filters') . ' AS f')
+					->where('f.filter_id = ' . (int) $idxQuery->filter);
+
+				// Load the filter data.
+				$db->setQuery($query);
+
+				try
+				{
+					$filter = $db->loadObject();
+				}
+				catch (RuntimeException $e)
+				{
+					return null;
+				}
+
+				// Initialize the filter parameters.
+				if ($filter)
+				{
+					$filter->params = new Registry($filter->params);
+				}
+			}
+
+			// Build the query to get the branch data and the number of child nodes.
+			$query->clear()
+				->select('t.*, count(c.id) AS children')
+				->from($db->quoteName('#__finder_taxonomy') . ' AS t')
+				->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS c ON c.parent_id = t.id')
+				->where('t.parent_id = 1')
+				->where('t.state = 1')
+				->where('t.access IN (' . $groups . ')')
+				->where('c.state = 1')
+				->where('c.access IN (' . $groups . ')')
+				->group($db->quoteName('t.id'))
+				->order('t.ordering, t.title');
+
+			// Limit the branch children to a predefined filter.
+			if (!empty($filter->data))
+			{
+				$query->where('c.id IN(' . $filter->data . ')');
+			}
+
+			// Load the branches.
+			$db->setQuery($query);
+
+			try
+			{
+				$branches = $db->loadObjectList('id');
+			}
+			catch (RuntimeException $e)
+			{
+				return null;
+			}
+
+			// Check that we have at least one branch.
+			if (count($branches) === 0)
+			{
+				return null;
+			}
+
+			// Iterate through the branches and build the branch groups.
+			foreach ($branches as $bk => $bv)
+			{
+				// If the multi-lang plugin is enabled then drop the language branch.
+				if ($bv->title === 'Language' && JLanguageMultilang::isEnabled())
+				{
+					continue;
+				}
+
+				// Build the query to get the child nodes for this branch.
+				$query->clear()
+					->select('t.*')
+					->from($db->quoteName('#__finder_taxonomy') . ' AS t')
+					->where('t.parent_id = ' . (int) $bk)
+					->where('t.state = 1')
+					->where('t.access IN (' . $groups . ')')
+					->order('t.ordering, t.title');
+
+				// Self-join to get the parent title.
+				$query->select('e.title AS parent_title')
+					->join('LEFT', $db->quoteName('#__finder_taxonomy', 'e') . ' ON ' . $db->quoteName('e.id') . ' = ' . $db->quoteName('t.parent_id'));
+
+				// Limit the nodes to a predefined filter.
+				if (!empty($filter->data))
+				{
+					$query->where('t.id IN(' . $filter->data . ')');
+				}
+
+				// Load the branches.
+				$db->setQuery($query);
+
+				try
+				{
+					$branches[$bk]->nodes = $db->loadObjectList('id');
+				}
+				catch (RuntimeException $e)
+				{
+					return null;
+				}
+
+				// Translate branch nodes if possible.
+				$language = JFactory::getLanguage();
+
+				foreach ($branches[$bk]->nodes as $node_id => $node)
+				{
+					if (trim($node->parent_title, '**') === 'Language')
+					{
+						$title = FinderHelperLanguage::branchLanguageTitle($node->title);
+					}
+					else
+					{
+						$key = FinderHelperLanguage::branchPlural($node->title);
+						$title = $language->hasKey($key) ? JText::_($key) : $node->title;
+					}
+
+					$branches[$bk]->nodes[$node_id]->title = $title;
+				}
+
+				// Add the Search All option to the branch.
+				array_unshift($branches[$bk]->nodes, array('id' => null, 'title' => JText::_('COM_FINDER_FILTER_SELECT_ALL_LABEL')));
+			}
+
+			// Store the data in cache.
+			$cache->store($branches, $cacheId);
+		}
+
+		$html = '';
+
+		// Add the dates if enabled.
+		if ($showDates)
+		{
+			$html .= JHtml::_('filter.dates', $idxQuery, $options);
+		}
+
+		$html .= '<div class="filter-branch' . $classSuffix . ' control-group clearfix">';
+
+		// Iterate through all branches and build code.
+		foreach ($branches as $bk => $bv)
+		{
+			// If the multi-lang plugin is enabled then drop the language branch.
+			if ($bv->title === 'Language' && JLanguageMultilang::isEnabled())
+			{
+				continue;
+			}
+
+			$active = null;
+
+			// Check if the branch is in the filter.
+			if (array_key_exists($bv->title, $idxQuery->filters))
+			{
+				// Get the request filters.
+				$temp   = JFactory::getApplication()->input->request->get('t', array(), 'array');
+
+				// Search for active nodes in the branch and get the active node.
+				$active = array_intersect($temp, $idxQuery->filters[$bv->title]);
+				$active = count($active) === 1 ? array_shift($active) : null;
+			}
+
+			// Build a node.
+			$html .= '<div class="controls finder-selects">';
+			$html .= '<label for="tax-' . JFilterOutput::stringURLSafe($bv->title) . '" class="control-label">';
+			$html .= JText::sprintf('COM_FINDER_FILTER_BRANCH_LABEL', JText::_(FinderHelperLanguage::branchSingular($bv->title)));
+			$html .= '</label>';
+			$html .= '<br />';
+			$html .= JHtml::_(
+				'select.genericlist',
+				$branches[$bk]->nodes, 't[]', 'class="inputbox advancedSelect"', 'id', 'title', $active,
+				'tax-' . JFilterOutput::stringURLSafe($bv->title)
+			);
+			$html .= '</div>';
+		}
+
+		$html .= '</div>';
+
+		return $html;
+	}
+
+	/**
+	 * Method to generate fields for filtering dates
+	 *
+	 * @param   FinderIndexerQuery  $idxQuery  A FinderIndexerQuery object.
+	 * @param   array               $options   An array of options.
+	 *
+	 * @return  mixed  A rendered HTML widget on success, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function dates($idxQuery, $options)
+	{
+		$html = '';
+
+		// Get the configuration options.
+		$classSuffix = $options->get('class_suffix', null);
+		$loadMedia   = $options->get('load_media', true);
+		$showDates   = $options->get('show_date_filters', false);
+
+		if (!empty($showDates))
+		{
+			// Build the date operators options.
+			$operators   = array();
+			$operators[] = JHtml::_('select.option', 'before', JText::_('COM_FINDER_FILTER_DATE_BEFORE'));
+			$operators[] = JHtml::_('select.option', 'exact', JText::_('COM_FINDER_FILTER_DATE_EXACTLY'));
+			$operators[] = JHtml::_('select.option', 'after', JText::_('COM_FINDER_FILTER_DATE_AFTER'));
+
+			// Load the CSS/JS resources.
+			if ($loadMedia)
+			{
+				JHtml::_('stylesheet', 'com_finder/dates.css', array('version' => 'auto', 'relative' => true));
+			}
+
+			// Open the widget.
+			$html .= '<ul id="finder-filter-select-dates">';
+
+			// Start date filter.
+			$attribs['class'] = 'input-medium';
+			$html .= '<li class="filter-date' . $classSuffix . '">';
+			$html .= '<label for="filter_date1" class="hasTooltip" title ="' . JText::_('COM_FINDER_FILTER_DATE1_DESC') . '">';
+			$html .= JText::_('COM_FINDER_FILTER_DATE1');
+			$html .= '</label>';
+			$html .= '<br />';
+			$html .= JHtml::_(
+				'select.genericlist',
+				$operators, 'w1', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when1, 'finder-filter-w1'
+			);
+			$html .= JHtml::_('calendar', $idxQuery->date1, 'd1', 'filter_date1', '%Y-%m-%d', $attribs);
+			$html .= '</li>';
+
+			// End date filter.
+			$html .= '<li class="filter-date' . $classSuffix . '">';
+			$html .= '<label for="filter_date2" class="hasTooltip" title ="' . JText::_('COM_FINDER_FILTER_DATE2_DESC') . '">';
+			$html .= JText::_('COM_FINDER_FILTER_DATE2');
+			$html .= '</label>';
+			$html .= '<br />';
+			$html .= JHtml::_(
+				'select.genericlist',
+				$operators, 'w2', 'class="inputbox filter-date-operator advancedSelect"', 'value', 'text', $idxQuery->when2, 'finder-filter-w2'
+			);
+			$html .= JHtml::_('calendar', $idxQuery->date2, 'd2', 'filter_date2', '%Y-%m-%d', $attribs);
+			$html .= '</li>';
+
+			// Close the widget.
+			$html .= '</ul>';
+		}
+
+		return $html;
+	}
+}
diff --git a/core/components/com_finder/helpers/html/query.php b/core/components/com_finder/helpers/html/query.php
new file mode 100644
index 00000000..831b4f0c
--- /dev/null
+++ b/core/components/com_finder/helpers/html/query.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Query HTML behavior class for Finder.
+ *
+ * @since  2.5
+ */
+abstract class JHtmlQuery
+{
+	/**
+	 * Method to get the explained (human-readable) search query.
+	 *
+	 * @param   FinderIndexerQuery  $query  A FinderIndexerQuery object to explain.
+	 *
+	 * @return  mixed  String if there is data to explain, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function explained(FinderIndexerQuery $query)
+	{
+		$parts = array();
+
+		// Process the required tokens.
+		foreach ($query->included as $token)
+		{
+			if ($token->required && (!isset($token->derived) || $token->derived == false))
+			{
+				$parts[] = '<span class="query-required">' . JText::sprintf('COM_FINDER_QUERY_TOKEN_REQUIRED', $token->term) . '</span>';
+			}
+		}
+
+		// Process the optional tokens.
+		foreach ($query->included as $token)
+		{
+			if (!$token->required && (!isset($token->derived) || $token->derived == false))
+			{
+				$parts[] = '<span class="query-optional">' . JText::sprintf('COM_FINDER_QUERY_TOKEN_OPTIONAL', $token->term) . '</span>';
+			}
+		}
+
+		// Process the excluded tokens.
+		foreach ($query->excluded as $token)
+		{
+			if (!isset($token->derived) || $token->derived === false)
+			{
+				$parts[] = '<span class="query-excluded">' . JText::sprintf('COM_FINDER_QUERY_TOKEN_EXCLUDED', $token->term) . '</span>';
+			}
+		}
+
+		// Process the start date.
+		if ($query->date1)
+		{
+			$date = JFactory::getDate($query->date1)->format(JText::_('DATE_FORMAT_LC'));
+			$datecondition = JText::_('COM_FINDER_QUERY_DATE_CONDITION_' . strtoupper($query->when1));
+			$parts[] = '<span class="query-start-date">' . JText::sprintf('COM_FINDER_QUERY_START_DATE', $datecondition, $date) . '</span>';
+		}
+
+		// Process the end date.
+		if ($query->date2)
+		{
+			$date = JFactory::getDate($query->date2)->format(JText::_('DATE_FORMAT_LC'));
+			$datecondition = JText::_('COM_FINDER_QUERY_DATE_CONDITION_' . strtoupper($query->when2));
+			$parts[] = '<span class="query-end-date">' . JText::sprintf('COM_FINDER_QUERY_END_DATE', $datecondition, $date) . '</span>';
+		}
+
+		// Process the taxonomy filters.
+		if (!empty($query->filters))
+		{
+			// Get the filters in the request.
+			$t = JFactory::getApplication()->input->request->get('t', array(), 'array');
+
+			// Process the taxonomy branches.
+			foreach ($query->filters as $branch => $nodes)
+			{
+				// Process the taxonomy nodes.
+				$lang = JFactory::getLanguage();
+
+				foreach ($nodes as $title => $id)
+				{
+					// Translate the title for Types
+					$key = FinderHelperLanguage::branchPlural($title);
+
+					if ($lang->hasKey($key))
+					{
+						$title = JText::_($key);
+					}
+
+					// Don't include the node if it is not in the request.
+					if (!in_array($id, $t))
+					{
+						continue;
+					}
+
+					// Add the node to the explanation.
+					$parts[] = '<span class="query-taxonomy">'
+						. JText::sprintf('COM_FINDER_QUERY_TAXONOMY_NODE', $title, JText::_(FinderHelperLanguage::branchSingular($branch)))
+						. '</span>';
+				}
+			}
+		}
+
+		// Build the interpreted query.
+		return count($parts) ? JText::sprintf('COM_FINDER_QUERY_TOKEN_INTERPRETED', implode(JText::_('COM_FINDER_QUERY_TOKEN_GLUE'), $parts)) : null;
+	}
+
+	/**
+	 * Method to get the suggested search query.
+	 *
+	 * @param   FinderIndexerQuery  $query  A FinderIndexerQuery object.
+	 *
+	 * @return  mixed  String if there is a suggestion, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function suggested(FinderIndexerQuery $query)
+	{
+		$suggested = false;
+
+		// Check if the query input is empty.
+		if (empty($query->input))
+		{
+			return $suggested;
+		}
+
+		// Check if there were any ignored or included keywords.
+		if (count($query->ignored) || count($query->included))
+		{
+			$suggested = $query->input;
+
+			// Replace the ignored keyword suggestions.
+			foreach (array_reverse($query->ignored) as $token)
+			{
+				if (isset($token->suggestion))
+				{
+					$suggested = str_ireplace($token->term, $token->suggestion, $suggested);
+				}
+			}
+
+			// Replace the included keyword suggestions.
+			foreach (array_reverse($query->included) as $token)
+			{
+				if (isset($token->suggestion))
+				{
+					$suggested = str_ireplace($token->term, $token->suggestion, $suggested);
+				}
+			}
+
+			// Check if we made any changes.
+			if ($suggested == $query->input)
+			{
+				$suggested = false;
+			}
+		}
+
+		return $suggested;
+	}
+}
diff --git a/core/components/com_finder/helpers/route.php b/core/components/com_finder/helpers/route.php
new file mode 100644
index 00000000..ab5a2297
--- /dev/null
+++ b/core/components/com_finder/helpers/route.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Finder route helper class.
+ *
+ * @since  2.5
+ */
+class FinderHelperRoute
+{
+	/**
+	 * Method to get the route for a search page.
+	 *
+	 * @param   integer  $f  The search filter id. [optional]
+	 * @param   string   $q  The search query string. [optional]
+	 *
+	 * @return  string  The search route.
+	 *
+	 * @since   2.5
+	 */
+	public static function getSearchRoute($f = null, $q = null)
+	{
+		// Get the menu item id.
+		$query = array('view' => 'search', 'q' => $q, 'f' => $f);
+		$item = self::getItemid($query);
+
+		// Get the base route.
+		$uri = clone JUri::getInstance('index.php?option=com_finder&view=search');
+
+		// Add the pre-defined search filter if present.
+		if ($f !== null)
+		{
+			$uri->setVar('f', $f);
+		}
+
+		// Add the search query string if present.
+		if ($q !== null)
+		{
+			$uri->setVar('q', $q);
+		}
+
+		// Add the menu item id if present.
+		if ($item !== null)
+		{
+			$uri->setVar('Itemid', $item);
+		}
+
+		return $uri->toString(array('path', 'query'));
+	}
+
+	/**
+	 * Method to get the route for an advanced search page.
+	 *
+	 * @param   integer  $f  The search filter id. [optional]
+	 * @param   string   $q  The search query string. [optional]
+	 *
+	 * @return  string  The advanced search route.
+	 *
+	 * @since   2.5
+	 */
+	public static function getAdvancedRoute($f = null, $q = null)
+	{
+		// Get the menu item id.
+		$query = array('view' => 'advanced', 'q' => $q, 'f' => $f);
+		$item = self::getItemid($query);
+
+		// Get the base route.
+		$uri = clone JUri::getInstance('index.php?option=com_finder&view=advanced');
+
+		// Add the pre-defined search filter if present.
+		if ($q !== null)
+		{
+			$uri->setVar('f', $f);
+		}
+
+		// Add the search query string if present.
+		if ($q !== null)
+		{
+			$uri->setVar('q', $q);
+		}
+
+		// Add the menu item id if present.
+		if ($item !== null)
+		{
+			$uri->setVar('Itemid', $item);
+		}
+
+		return $uri->toString(array('path', 'query'));
+	}
+
+	/**
+	 * Method to get the most appropriate menu item for the route based on the
+	 * supplied query needles.
+	 *
+	 * @param   array  $query  An array of URL parameters.
+	 *
+	 * @return  mixed  An integer on success, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public static function getItemid($query)
+	{
+		static $items, $active;
+
+		// Get the menu items for com_finder.
+		if (!$items || !$active)
+		{
+			$app = JFactory::getApplication('site');
+			$com = JComponentHelper::getComponent('com_finder');
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$items = $menu->getItems('component_id', $com->id);
+			$items = is_array($items) ? $items : array();
+		}
+
+		// Try to match the active view and filter.
+		if ($active && @$active->query['view'] == @$query['view'] && @$active->query['f'] == @$query['f'])
+		{
+			return $active->id;
+		}
+
+		// Try to match the view, query, and filter.
+		foreach ($items as $item)
+		{
+			if (@$item->query['view'] == @$query['view'] && @$item->query['q'] == @$query['q'] && @$item->query['f'] == @$query['f'])
+			{
+				return $item->id;
+			}
+		}
+
+		// Try to match the view and filter.
+		foreach ($items as $item)
+		{
+			if (@$item->query['view'] == @$query['view'] && @$item->query['f'] == @$query['f'])
+			{
+				return $item->id;
+			}
+		}
+
+		// Try to match the view.
+		foreach ($items as $item)
+		{
+			if (@$item->query['view'] == @$query['view'])
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/core/components/com_finder/models/search.php b/core/components/com_finder/models/search.php
new file mode 100644
index 00000000..67eb9351
--- /dev/null
+++ b/core/components/com_finder/models/search.php
@@ -0,0 +1,1231 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+// Register dependent classes.
+define('FINDER_PATH_INDEXER', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer');
+JLoader::register('FinderIndexerHelper', FINDER_PATH_INDEXER . '/helper.php');
+JLoader::register('FinderIndexerQuery', FINDER_PATH_INDEXER . '/query.php');
+JLoader::register('FinderIndexerResult', FINDER_PATH_INDEXER . '/result.php');
+JLoader::register('FinderIndexerStemmer', FINDER_PATH_INDEXER . '/stemmer.php');
+
+/**
+ * Search model class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderModelSearch extends JModelList
+{
+	/**
+	 * Context string for the model type
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'com_finder.search';
+
+	/**
+	 * The query object is an instance of FinderIndexerQuery which contains and
+	 * models the entire search query including the text input; static and
+	 * dynamic taxonomy filters; date filters; etc.
+	 *
+	 * @var    FinderIndexerQuery
+	 * @since  2.5
+	 */
+	protected $query;
+
+	/**
+	 * An array of all excluded terms ids.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $excludedTerms = array();
+
+	/**
+	 * An array of all included terms ids.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $includedTerms = array();
+
+	/**
+	 * An array of all required terms ids.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $requiredTerms = array();
+
+	/**
+	 * Method to get the results of the query.
+	 *
+	 * @return  array  An array of FinderIndexerResult objects.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function getResults()
+	{
+		// Check if the search query is valid.
+		if (empty($this->query->search))
+		{
+			return null;
+		}
+
+		// Check if we should return results.
+		if (empty($this->includedTerms) && (empty($this->query->filters) || !$this->query->empty))
+		{
+			return null;
+		}
+
+		// Get the store id.
+		$store = $this->getStoreId('getResults');
+
+		// Use the cached data if possible.
+		if ($this->retrieve($store))
+		{
+			return $this->retrieve($store);
+		}
+
+		// Get the row data.
+		$items = $this->getResultsData();
+
+		// Check the data.
+		if (empty($items))
+		{
+			return null;
+		}
+
+		// Create the query to get the search results.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('link_id') . ', ' . $db->quoteName('object'))
+			->from($db->quoteName('#__finder_links'))
+			->where($db->quoteName('link_id') . ' IN (' . implode(',', array_keys($items)) . ')');
+
+		// Load the results from the database.
+		$db->setQuery($query);
+		$rows = $db->loadObjectList('link_id');
+
+		// Set up our results container.
+		$results = $items;
+
+		// Convert the rows to result objects.
+		foreach ($rows as $rk => $row)
+		{
+			// Build the result object.
+			$result = unserialize($row->object);
+			$result->weight = $results[$rk];
+			$result->link_id = $rk;
+
+			// Add the result back to the stack.
+			$results[$rk] = $result;
+		}
+
+		// Switch to a non-associative array.
+		$results = array_values($results);
+
+		// Push the results into cache.
+		$this->store($store, $results);
+
+		// Return the results.
+		return $this->retrieve($store);
+	}
+
+	/**
+	 * Method to get the total number of results.
+	 *
+	 * @return  integer  The total number of results.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function getTotal()
+	{
+		// Check if the search query is valid.
+		if (empty($this->query->search))
+		{
+			return null;
+		}
+
+		// Check if we should return results.
+		if (empty($this->includedTerms) && (empty($this->query->filters) || !$this->query->empty))
+		{
+			return null;
+		}
+
+		// Get the store id.
+		$store = $this->getStoreId('getTotal');
+
+		// Use the cached data if possible.
+		if ($this->retrieve($store))
+		{
+			return $this->retrieve($store);
+		}
+
+		// Get the results total.
+		$total = $this->getResultsTotal();
+
+		// Push the total into cache.
+		$this->store($store, $total);
+
+		// Return the total.
+		return $this->retrieve($store);
+	}
+
+	/**
+	 * Method to get the query object.
+	 *
+	 * @return  FinderIndexerQuery  A query object.
+	 *
+	 * @since   2.5
+	 */
+	public function getQuery()
+	{
+		// Return the query object.
+		return $this->query;
+	}
+
+	/**
+	 * Method to build a database query to load the list data.
+	 *
+	 * @return  JDatabaseQuery  A database query.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery()
+	{
+		// Get the store id.
+		$store = $this->getStoreId('getListQuery');
+
+		// Use the cached data if possible.
+		if ($this->retrieve($store, false))
+		{
+			return clone $this->retrieve($store, false);
+		}
+
+		// Set variables
+		$user = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('l.link_id')
+			->from($db->quoteName('#__finder_links') . ' AS l')
+			->where('l.access IN (' . $groups . ')')
+			->where('l.state = 1')
+			->where('l.published = 1');
+
+		// Get the null date and the current date, minus seconds.
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate = $db->quote(substr_replace(JFactory::getDate()->toSql(), '00', -2));
+
+		// Add the publish up and publish down filters.
+		$query->where('(l.publish_start_date = ' . $nullDate . ' OR l.publish_start_date <= ' . $nowDate . ')')
+			->where('(l.publish_end_date = ' . $nullDate . ' OR l.publish_end_date >= ' . $nowDate . ')');
+
+		/*
+		 * Add the taxonomy filters to the query. We have to join the taxonomy
+		 * map table for each group so that we can use AND clauses across
+		 * groups. Within each group there can be an array of values that will
+		 * use OR clauses.
+		 */
+		if (!empty($this->query->filters))
+		{
+			// Convert the associative array to a numerically indexed array.
+			$groups = array_values($this->query->filters);
+
+			// Iterate through each taxonomy group and add the join and where.
+			for ($i = 0, $c = count($groups); $i < $c; $i++)
+			{
+				// We use the offset because each join needs a unique alias.
+				$query->join('INNER', $db->quoteName('#__finder_taxonomy_map') . ' AS t' . $i . ' ON t' . $i . '.link_id = l.link_id')
+					->where('t' . $i . '.node_id IN (' . implode(',', $groups[$i]) . ')');
+			}
+		}
+
+		// Add the start date filter to the query.
+		if (!empty($this->query->date1))
+		{
+			// Escape the date.
+			$date1 = $db->quote($this->query->date1);
+
+			// Add the appropriate WHERE condition.
+			if ($this->query->when1 === 'before')
+			{
+				$query->where($db->quoteName('l.start_date') . ' <= ' . $date1);
+			}
+			elseif ($this->query->when1 === 'after')
+			{
+				$query->where($db->quoteName('l.start_date') . ' >= ' . $date1);
+			}
+			else
+			{
+				$query->where($db->quoteName('l.start_date') . ' = ' . $date1);
+			}
+		}
+
+		// Add the end date filter to the query.
+		if (!empty($this->query->date2))
+		{
+			// Escape the date.
+			$date2 = $db->quote($this->query->date2);
+
+			// Add the appropriate WHERE condition.
+			if ($this->query->when2 === 'before')
+			{
+				$query->where($db->quoteName('l.start_date') . ' <= ' . $date2);
+			}
+			elseif ($this->query->when2 === 'after')
+			{
+				$query->where($db->quoteName('l.start_date') . ' >= ' . $date2);
+			}
+			else
+			{
+				$query->where($db->quoteName('l.start_date') . ' = ' . $date2);
+			}
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('l.language IN (' . $db->quote(JFactory::getLanguage()->getTag()) . ', ' . $db->quote('*') . ')');
+		}
+
+		// Push the data into cache.
+		$this->store($store, $query, false);
+
+		// Return a copy of the query object.
+		return clone $this->retrieve($store, false);
+	}
+
+	/**
+	 * Method to get the total number of results for the search query.
+	 *
+	 * @return  integer  The results total.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getResultsTotal()
+	{
+		// Get the store id.
+		$store = $this->getStoreId('getResultsTotal', false);
+
+		// Use the cached data if possible.
+		if ($this->retrieve($store))
+		{
+			return $this->retrieve($store);
+		}
+
+		// Get the base query and add the ordering information.
+		$base = $this->getListQuery();
+		$base->select('0 AS ordering');
+
+		// Get the maximum number of results.
+		$limit = (int) $this->getState('match.limit');
+
+		/*
+		 * If there are no optional or required search terms in the query,
+		 * we can get the result total in one relatively simple database query.
+		 */
+		if (empty($this->includedTerms))
+		{
+			// Adjust the query to join on the appropriate mapping table.
+			$query = clone $base;
+			$query->clear('select')
+				->select('COUNT(DISTINCT l.link_id)');
+
+			// Get the total from the database.
+			$this->_db->setQuery($query);
+			$total = $this->_db->loadResult();
+
+			// Push the total into cache.
+			$this->store($store, min($total, $limit));
+
+			// Return the total.
+			return $this->retrieve($store);
+		}
+
+		/*
+		 * If there are optional or required search terms in the query, the
+		 * process of getting the result total is more complicated.
+		 */
+		$start = 0;
+		$items = array();
+		$sorted = array();
+		$maps = array();
+		$excluded = $this->getExcludedLinkIds();
+
+		/*
+		 * Iterate through the included search terms and group them by mapping
+		 * table suffix. This ensures that we never have to do more than 16
+		 * queries to get a batch. This may seem like a lot but it is rarely
+		 * anywhere near 16 because of the improved mapping algorithm.
+		 */
+		foreach ($this->includedTerms as $token => $ids)
+		{
+			// Get the mapping table suffix.
+			$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
+
+			// Initialize the mapping group.
+			if (!array_key_exists($suffix, $maps))
+			{
+				$maps[$suffix] = array();
+			}
+
+			// Add the terms to the mapping group.
+			$maps[$suffix] = array_merge($maps[$suffix], $ids);
+		}
+
+		/*
+		 * When the query contains search terms we need to find and process the
+		 * result total iteratively using a do-while loop.
+		 */
+		do
+		{
+			// Create a container for the fetched results.
+			$results = array();
+			$more = false;
+
+			/*
+			 * Iterate through the mapping groups and load the total from each
+			 * mapping table.
+			 */
+			foreach ($maps as $suffix => $ids)
+			{
+				// Create a storage key for this set.
+				$setId = $this->getStoreId('getResultsTotal:' . serialize(array_values($ids)) . ':' . $start . ':' . $limit);
+
+				// Use the cached data if possible.
+				if ($this->retrieve($setId))
+				{
+					$temp = $this->retrieve($setId);
+				}
+				// Load the data from the database.
+				else
+				{
+					// Adjust the query to join on the appropriate mapping table.
+					$query = clone $base;
+					$query->join('INNER', '#__finder_links_terms' . $suffix . ' AS m ON m.link_id = l.link_id')
+						->where('m.term_id IN (' . implode(',', $ids) . ')');
+
+					// Load the results from the database.
+					$this->_db->setQuery($query, $start, $limit);
+					$temp = $this->_db->loadObjectList();
+
+					// Set the more flag to true if any of the sets equal the limit.
+					$more = count($temp) === $limit;
+
+					// We loaded the data unkeyed but we need it to be keyed for later.
+					$junk = $temp;
+					$temp = array();
+
+					// Convert to an associative array.
+					for ($i = 0, $c = count($junk); $i < $c; $i++)
+					{
+						$temp[$junk[$i]->link_id] = $junk[$i];
+					}
+
+					// Store this set in cache.
+					$this->store($setId, $temp);
+				}
+
+				// Merge the results.
+				$results = array_merge($results, $temp);
+			}
+
+			// Check if there are any excluded terms to deal with.
+			if (count($excluded))
+			{
+				// Remove any results that match excluded terms.
+				for ($i = 0, $c = count($results); $i < $c; $i++)
+				{
+					if (in_array($results[$i]->link_id, $excluded))
+					{
+						unset($results[$i]);
+					}
+				}
+
+				// Reset the array keys.
+				$results = array_values($results);
+			}
+
+			// Iterate through the set to extract the unique items.
+			for ($i = 0, $c = count($results); $i < $c; $i++)
+			{
+				if (!isset($sorted[$results[$i]->link_id]))
+				{
+					$sorted[$results[$i]->link_id] = $results[$i]->ordering;
+				}
+			}
+
+			/*
+			 * If the query contains just optional search terms and we have
+			 * enough items for the page, we can stop here.
+			 */
+			if (empty($this->requiredTerms))
+			{
+				// If we need more items and they're available, make another pass.
+				if ($more && count($sorted) < $limit)
+				{
+					// Increment the batch starting point and continue.
+					$start += $limit;
+					continue;
+				}
+
+				// Push the total into cache.
+				$this->store($store, min(count($sorted), $limit));
+
+				// Return the total.
+				return $this->retrieve($store);
+			}
+
+			/*
+			 * The query contains required search terms so we have to iterate
+			 * over the items and remove any items that do not match all of the
+			 * required search terms. This is one of the most expensive steps
+			 * because a required token could theoretically eliminate all of
+			 * current terms which means we would have to loop through all of
+			 * the possibilities.
+			 */
+			foreach ($this->requiredTerms as $token => $required)
+			{
+				// Create a storage key for this set.
+				$setId = $this->getStoreId('getResultsTotal:required:' . serialize(array_values($required)) . ':' . $start . ':' . $limit);
+
+				// Use the cached data if possible.
+				if ($this->retrieve($setId))
+				{
+					$reqTemp = $this->retrieve($setId);
+				}
+					// Check if the token was matched.
+				elseif (empty($required))
+				{
+					return null;
+				}
+					// Load the data from the database.
+				else
+				{
+					// Setup containers in case we have to make multiple passes.
+					$reqStart = 0;
+					$reqTemp = array();
+
+					do
+					{
+						// Get the map table suffix.
+						$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
+
+						// Adjust the query to join on the appropriate mapping table.
+						$query = clone $base;
+						$query->join('INNER', '#__finder_links_terms' . $suffix . ' AS m ON m.link_id = l.link_id')
+							->where('m.term_id IN (' . implode(',', $required) . ')');
+
+						// Load the results from the database.
+						$this->_db->setQuery($query, $reqStart, $limit);
+						$temp = $this->_db->loadObjectList('link_id');
+
+						// Set the required token more flag to true if the set equal the limit.
+						$reqMore = count($temp) === $limit;
+
+						// Merge the matching set for this token.
+						$reqTemp += $temp;
+
+						// Increment the term offset.
+						$reqStart += $limit;
+					}
+					while ($reqMore === true);
+
+					// Store this set in cache.
+					$this->store($setId, $reqTemp);
+				}
+
+				// Remove any items that do not match the required term.
+				$sorted = array_intersect_key($sorted, $reqTemp);
+			}
+
+			// If we need more items and they're available, make another pass.
+			if ($more && count($sorted) < $limit)
+			{
+				// Increment the batch starting point.
+				$start += $limit;
+
+				// Merge the found items.
+				$items += $sorted;
+
+				continue;
+			}
+
+			// Otherwise, end the loop.
+			{
+				// Merge the found items.
+				$items += $sorted;
+
+				$more = false;
+			}
+			// End do-while loop.
+		}
+		while ($more === true);
+
+		// Set the total.
+		$total = count($items);
+		$total = min($total, $limit);
+
+		// Push the total into cache.
+		$this->store($store, $total);
+
+		// Return the total.
+		return $this->retrieve($store);
+	}
+
+	/**
+	 * Method to get the results for the search query.
+	 *
+	 * @return  array  An array of result data objects.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getResultsData()
+	{
+		// Get the store id.
+		$store = $this->getStoreId('getResultsData', false);
+
+		// Use the cached data if possible.
+		if ($this->retrieve($store))
+		{
+			return $this->retrieve($store);
+		}
+
+		// Get the result ordering and direction.
+		$ordering = $this->getState('list.ordering', 'l.start_date');
+		$direction = $this->getState('list.direction', 'DESC');
+
+		// Get the base query and add the ordering information.
+		$base = $this->getListQuery();
+		$base->select($this->_db->escape($ordering) . ' AS ordering');
+		$base->order($this->_db->escape($ordering) . ' ' . $this->_db->escape($direction));
+
+		/*
+		 * If there are no optional or required search terms in the query, we
+		 * can get the results in one relatively simple database query.
+		 */
+		if (empty($this->includedTerms))
+		{
+			// Get the results from the database.
+			$this->_db->setQuery($base, (int) $this->getState('list.start'), (int) $this->getState('list.limit'));
+			$return = $this->_db->loadObjectList('link_id');
+
+			// Get a new store id because this data is page specific.
+			$store = $this->getStoreId('getResultsData', true);
+
+			// Push the results into cache.
+			$this->store($store, $return);
+
+			// Return the results.
+			return $this->retrieve($store);
+		}
+
+		/*
+		 * If there are optional or required search terms in the query, the
+		 * process of getting the results is more complicated.
+		 */
+		$start = 0;
+		$limit = (int) $this->getState('match.limit');
+		$items = array();
+		$sorted = array();
+		$maps = array();
+		$excluded = $this->getExcludedLinkIds();
+
+		/*
+		 * Iterate through the included search terms and group them by mapping
+		 * table suffix. This ensures that we never have to do more than 16
+		 * queries to get a batch. This may seem like a lot but it is rarely
+		 * anywhere near 16 because of the improved mapping algorithm.
+		 */
+		foreach ($this->includedTerms as $token => $ids)
+		{
+			// Get the mapping table suffix.
+			$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
+
+			// Initialize the mapping group.
+			if (!array_key_exists($suffix, $maps))
+			{
+				$maps[$suffix] = array();
+			}
+
+			// Add the terms to the mapping group.
+			$maps[$suffix] = array_merge($maps[$suffix], $ids);
+		}
+
+		/*
+		 * When the query contains search terms we need to find and process the
+		 * results iteratively using a do-while loop.
+		 */
+		do
+		{
+			// Create a container for the fetched results.
+			$results = array();
+			$more = false;
+
+			/*
+			 * Iterate through the mapping groups and load the results from each
+			 * mapping table.
+			 */
+			foreach ($maps as $suffix => $ids)
+			{
+				// Create a storage key for this set.
+				$setId = $this->getStoreId('getResultsData:' . serialize(array_values($ids)) . ':' . $start . ':' . $limit);
+
+				// Use the cached data if possible.
+				if ($this->retrieve($setId))
+				{
+					$temp = $this->retrieve($setId);
+				}
+				// Load the data from the database.
+				else
+				{
+					// Adjust the query to join on the appropriate mapping table.
+					$query = clone $base;
+					$query->join('INNER', $this->_db->quoteName('#__finder_links_terms' . $suffix) . ' AS m ON m.link_id = l.link_id')
+						->where('m.term_id IN (' . implode(',', $ids) . ')');
+
+					// Load the results from the database.
+					$this->_db->setQuery($query, $start, $limit);
+					$temp = $this->_db->loadObjectList('link_id');
+
+					// Store this set in cache.
+					$this->store($setId, $temp);
+
+					// The data is keyed by link_id to ease caching, we don't need it till later.
+					$temp = array_values($temp);
+				}
+
+				// Set the more flag to true if any of the sets equal the limit.
+				$more = count($temp) === $limit;
+
+				// Merge the results.
+				$results = array_merge($results, $temp);
+			}
+
+			// Check if there are any excluded terms to deal with.
+			if (count($excluded))
+			{
+				// Remove any results that match excluded terms.
+				for ($i = 0, $c = count($results); $i < $c; $i++)
+				{
+					if (in_array($results[$i]->link_id, $excluded))
+					{
+						unset($results[$i]);
+					}
+				}
+
+				// Reset the array keys.
+				$results = array_values($results);
+			}
+
+			/*
+			 * If we are ordering by relevance we have to add up the relevance
+			 * scores that are contained in the ordering field.
+			 */
+			if ($ordering === 'm.weight')
+			{
+				// Iterate through the set to extract the unique items.
+				for ($i = 0, $c = count($results); $i < $c; $i++)
+				{
+					// Add the total weights for all included search terms.
+					if (isset($sorted[$results[$i]->link_id]))
+					{
+						$sorted[$results[$i]->link_id] += (float) $results[$i]->ordering;
+					}
+					else
+					{
+						$sorted[$results[$i]->link_id] = (float) $results[$i]->ordering;
+					}
+				}
+			}
+			/*
+			 * If we are ordering by start date we have to add convert the
+			 * dates to unix timestamps.
+			 */
+			elseif ($ordering === 'l.start_date')
+			{
+				// Iterate through the set to extract the unique items.
+				for ($i = 0, $c = count($results); $i < $c; $i++)
+				{
+					if (!isset($sorted[$results[$i]->link_id]))
+					{
+						$sorted[$results[$i]->link_id] = strtotime($results[$i]->ordering);
+					}
+				}
+			}
+			/*
+			 * If we are not ordering by relevance or date, we just have to add
+			 * the unique items to the set.
+			 */
+			else
+			{
+				// Iterate through the set to extract the unique items.
+				for ($i = 0, $c = count($results); $i < $c; $i++)
+				{
+					if (!isset($sorted[$results[$i]->link_id]))
+					{
+						$sorted[$results[$i]->link_id] = $results[$i]->ordering;
+					}
+				}
+			}
+
+			// Sort the results.
+			natcasesort($items);
+
+			if ($direction === 'DESC')
+			{
+				$items = array_reverse($items, true);
+			}
+
+			/*
+			 * If the query contains just optional search terms and we have
+			 * enough items for the page, we can stop here.
+			 */
+			if (empty($this->requiredTerms))
+			{
+				// If we need more items and they're available, make another pass.
+				if ($more && count($sorted) < ($this->getState('list.start') + $this->getState('list.limit')))
+				{
+					// Increment the batch starting point and continue.
+					$start += $limit;
+					continue;
+				}
+
+				// Push the results into cache.
+				$this->store($store, $sorted);
+
+				// Return the requested set.
+				return array_slice($this->retrieve($store), (int) $this->getState('list.start'), (int) $this->getState('list.limit'), true);
+			}
+
+			/*
+			 * The query contains required search terms so we have to iterate
+			 * over the items and remove any items that do not match all of the
+			 * required search terms. This is one of the most expensive steps
+			 * because a required token could theoretically eliminate all of
+			 * current terms which means we would have to loop through all of
+			 * the possibilities.
+			 */
+			foreach ($this->requiredTerms as $token => $required)
+			{
+				// Create a storage key for this set.
+				$setId = $this->getStoreId('getResultsData:required:' . serialize(array_values($required)) . ':' . $start . ':' . $limit);
+
+				// Use the cached data if possible.
+				if ($this->retrieve($setId))
+				{
+					$reqTemp = $this->retrieve($setId);
+				}
+				// Check if the token was matched.
+				elseif (empty($required))
+				{
+					return null;
+				}
+				// Load the data from the database.
+				else
+				{
+					// Setup containers in case we have to make multiple passes.
+					$reqStart = 0;
+					$reqTemp = array();
+
+					do
+					{
+						// Get the map table suffix.
+						$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
+
+						// Adjust the query to join on the appropriate mapping table.
+						$query = clone $base;
+						$query->join('INNER', $this->_db->quoteName('#__finder_links_terms' . $suffix) . ' AS m ON m.link_id = l.link_id')
+							->where('m.term_id IN (' . implode(',', $required) . ')');
+
+						// Load the results from the database.
+						$this->_db->setQuery($query, $reqStart, $limit);
+						$temp = $this->_db->loadObjectList('link_id');
+
+						// Set the required token more flag to true if the set equal the limit.
+						$reqMore = count($temp) === $limit;
+
+						// Merge the matching set for this token.
+						$reqTemp += $temp;
+
+						// Increment the term offset.
+						$reqStart += $limit;
+					}
+					while ($reqMore === true);
+
+					// Store this set in cache.
+					$this->store($setId, $reqTemp);
+				}
+
+				// Remove any items that do not match the required term.
+				$sorted = array_intersect_key($sorted, $reqTemp);
+			}
+
+			// If we need more items and they're available, make another pass.
+			if ($more && count($sorted) < ($this->getState('list.start') + $this->getState('list.limit')))
+			{
+				// Increment the batch starting point.
+				$start += $limit;
+
+				// Merge the found items.
+				$items = array_merge($items, $sorted);
+
+				continue;
+			}
+			// Otherwise, end the loop.
+			else
+			{
+				// Set the found items.
+				$items = $sorted;
+
+				$more = false;
+			}
+
+			// End do-while loop.
+		}
+		while ($more === true);
+
+		// Push the results into cache.
+		$this->store($store, $items);
+
+		// Return the requested set.
+		return array_slice($this->retrieve($store), (int) $this->getState('list.start'), (int) $this->getState('list.limit'), true);
+	}
+
+	/**
+	 * Method to get an array of link ids that match excluded terms.
+	 *
+	 * @return  array  An array of links ids.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function getExcludedLinkIds()
+	{
+		// Check if the search query has excluded terms.
+		if (empty($this->excludedTerms))
+		{
+			return array();
+		}
+
+		// Get the store id.
+		$store = $this->getStoreId('getExcludedLinkIds', false);
+
+		// Use the cached data if possible.
+		if ($this->retrieve($store))
+		{
+			return $this->retrieve($store);
+		}
+
+		// Initialize containers.
+		$links = array();
+		$maps = array();
+
+		/*
+		 * Iterate through the excluded search terms and group them by mapping
+		 * table suffix. This ensures that we never have to do more than 16
+		 * queries to get a batch. This may seem like a lot but it is rarely
+		 * anywhere near 16 because of the improved mapping algorithm.
+		 */
+		foreach ($this->excludedTerms as $token => $id)
+		{
+			// Get the mapping table suffix.
+			$suffix = StringHelper::substr(md5(StringHelper::substr($token, 0, 1)), 0, 1);
+
+			// Initialize the mapping group.
+			if (!array_key_exists($suffix, $maps))
+			{
+				$maps[$suffix] = array();
+			}
+
+			// Add the terms to the mapping group.
+			$maps[$suffix][] = (int) $id;
+		}
+
+		/*
+		 * Iterate through the mapping groups and load the excluded links ids
+		 * from each mapping table.
+		 */
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		foreach ($maps as $suffix => $ids)
+		{
+			// Create the query to get the links ids.
+			$query->clear()
+				->select('link_id')
+				->from($db->quoteName('#__finder_links_terms' . $suffix))
+				->where($db->quoteName('term_id') . ' IN (' . implode(',', $ids) . ')')
+				->group($db->quoteName('link_id'));
+
+			// Load the link ids from the database.
+			$db->setQuery($query);
+			$temp = $db->loadColumn();
+
+			// Merge the link ids.
+			$links = array_merge($links, $temp);
+		}
+
+		// Sanitize the link ids.
+		$links = array_unique($links);
+		$links = ArrayHelper::toInteger($links);
+
+		// Push the link ids into cache.
+		$this->store($store, $links);
+
+		return $links;
+	}
+
+	/**
+	 * Method to get a store id based on model the configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string   $id    An identifier string to generate the store id. [optional]
+	 * @param   boolean  $page  True to store the data paged, false to store all data. [optional]
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStoreId($id = '', $page = true)
+	{
+		// Get the query object.
+		$query = $this->getQuery();
+
+		// Add the search query state.
+		$id .= ':' . $query->input;
+		$id .= ':' . $query->language;
+		$id .= ':' . $query->filter;
+		$id .= ':' . serialize($query->filters);
+		$id .= ':' . $query->date1;
+		$id .= ':' . $query->date2;
+		$id .= ':' . $query->when1;
+		$id .= ':' . $query->when2;
+
+		if ($page)
+		{
+			// Add the list state for page specific data.
+			$id .= ':' . $this->getState('list.start');
+			$id .= ':' . $this->getState('list.limit');
+			$id .= ':' . $this->getState('list.ordering');
+			$id .= ':' . $this->getState('list.direction');
+		}
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.  Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field. [optional]
+	 * @param   string  $direction  An optional direction. [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Get the configuration options.
+		$app = JFactory::getApplication();
+		$input = $app->input;
+		$params = $app->getParams();
+		$user = JFactory::getUser();
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// Setup the stemmer.
+		if ($params->get('stem', 1) && $params->get('stemmer', 'porter_en'))
+		{
+			FinderIndexerHelper::$stemmer = FinderIndexerStemmer::getInstance($params->get('stemmer', 'porter_en'));
+		}
+
+		$request = $input->request;
+		$options = array();
+
+		// Get the empty query setting.
+		$options['empty'] = $params->get('allow_empty_query', 0);
+
+		// Get the static taxonomy filters.
+		$options['filter'] = $request->getInt('f', $params->get('f', ''));
+
+		// Get the dynamic taxonomy filters.
+		$options['filters'] = $request->get('t', $params->get('t', array()), '', 'array');
+
+		// Get the query string.
+		$options['input'] = $request->getString('q', $params->get('q', ''));
+
+		// Get the query language.
+		$options['language'] = $request->getCmd('l', $params->get('l', ''));
+
+		// Get the start date and start date modifier filters.
+		$options['date1'] = $request->getString('d1', $params->get('d1', ''));
+		$options['when1'] = $request->getString('w1', $params->get('w1', ''));
+
+		// Get the end date and end date modifier filters.
+		$options['date2'] = $request->getString('d2', $params->get('d2', ''));
+		$options['when2'] = $request->getString('w2', $params->get('w2', ''));
+
+		// Load the query object.
+		$this->query = new FinderIndexerQuery($options);
+
+		// Load the query token data.
+		$this->excludedTerms = $this->query->getExcludedTermIds();
+		$this->includedTerms = $this->query->getIncludedTermIds();
+		$this->requiredTerms = $this->query->getRequiredTermIds();
+
+		// Load the list state.
+		$this->setState('list.start', $input->get('limitstart', 0, 'uint'));
+		$this->setState('list.limit', $input->get('limit', $app->get('list_limit', 20), 'uint'));
+
+		/**
+		 * Load the sort ordering.
+		 * Currently this is 'hard' coded via menu item parameter but may not satisfy a users need.
+		 * More flexibility was way more user friendly. So we allow the user to pass a custom value
+		 * from the pool of fields that are indexed like the 'title' field.
+		 * Also, we allow this parameter to be passed in either case (lower/upper).
+		 */
+		$order = $input->getWord('filter_order', $params->get('sort_order', 'relevance'));
+		$order = StringHelper::strtolower($order);
+
+		switch ($order)
+		{
+			case 'date':
+				$this->setState('list.ordering', 'l.start_date');
+				break;
+
+			case 'price':
+				$this->setState('list.ordering', 'l.list_price');
+				break;
+
+			case ($order === 'relevance' && !empty($this->includedTerms)) :
+				$this->setState('list.ordering', 'm.weight');
+				break;
+
+			// Custom field that is indexed and might be required for ordering
+			case 'title':
+				$this->setState('list.ordering', 'l.title');
+				break;
+
+			default:
+				$this->setState('list.ordering', 'l.link_id');
+				break;
+		}
+
+		/**
+		 * Load the sort direction.
+		 * Currently this is 'hard' coded via menu item parameter but may not satisfy a users need.
+		 * More flexibility was way more user friendly. So we allow to be inverted.
+		 * Also, we allow this parameter to be passed in either case (lower/upper).
+		 */
+		$dirn = $input->getWord('filter_order_Dir', $params->get('sort_direction', 'desc'));
+		$dirn = StringHelper::strtolower($dirn);
+
+		switch ($dirn)
+		{
+			case 'asc':
+				$this->setState('list.direction', 'ASC');
+				break;
+
+			default:
+			case 'desc':
+				$this->setState('list.direction', 'DESC');
+				break;
+		}
+
+		// Set the match limit.
+		$this->setState('match.limit', 1000);
+
+		// Load the parameters.
+		$this->setState('params', $params);
+
+		// Load the user state.
+		$this->setState('user.id', (int) $user->get('id'));
+		$this->setState('user.groups', $user->getAuthorisedViewLevels());
+	}
+
+	/**
+	 * Method to retrieve data from cache.
+	 *
+	 * @param   string   $id          The cache store id.
+	 * @param   boolean  $persistent  Flag to enable the use of external cache. [optional]
+	 *
+	 * @return  mixed  The cached data if found, null otherwise.
+	 *
+	 * @since   2.5
+	 */
+	protected function retrieve($id, $persistent = true)
+	{
+		$data = null;
+
+		// Use the internal cache if possible.
+		if (isset($this->cache[$id]))
+		{
+			return $this->cache[$id];
+		}
+
+		// Use the external cache if data is persistent.
+		if ($persistent)
+		{
+			$data = JFactory::getCache($this->context, 'output')->get($id);
+			$data = $data ? unserialize($data) : null;
+		}
+
+		// Store the data in internal cache.
+		if ($data)
+		{
+			$this->cache[$id] = $data;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to store data in cache.
+	 *
+	 * @param   string   $id          The cache store id.
+	 * @param   mixed    $data        The data to cache.
+	 * @param   boolean  $persistent  Flag to enable the use of external cache. [optional]
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   2.5
+	 */
+	protected function store($id, $data, $persistent = true)
+	{
+		// Store the data in internal cache.
+		$this->cache[$id] = $data;
+
+		// Store the data in external cache if data is persistent.
+		if ($persistent)
+		{
+			return JFactory::getCache($this->context, 'output')->store(serialize($data), $id);
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_finder/models/suggestions.php b/core/components/com_finder/models/suggestions.php
new file mode 100644
index 00000000..0f85d99c
--- /dev/null
+++ b/core/components/com_finder/models/suggestions.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+define('FINDER_PATH_INDEXER', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer');
+JLoader::register('FinderIndexerHelper', FINDER_PATH_INDEXER . '/helper.php');
+
+/**
+ * Suggestions model class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderModelSuggestions extends JModelList
+{
+	/**
+	 * Context string for the model type.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'com_finder.suggestions';
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  array  An array of data items.
+	 *
+	 * @since   2.5
+	 */
+	public function getItems()
+	{
+		// Get the items.
+		$items = parent::getItems();
+
+		// Convert them to a simple array.
+		foreach ($items as $k => $v)
+		{
+			$items[$k] = $v->term;
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to build a database query to load the list data.
+	 *
+	 * @return  JDatabaseQuery  A database query
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select required fields
+		$query->select('t.term')
+			->from($db->quoteName('#__finder_terms') . ' AS t')
+			->where('t.term LIKE ' . $db->quote($db->escape($this->getState('input'), true) . '%'))
+			->where('t.common = 0')
+			->where('t.language IN (' . $db->quote($db->escape($this->getState('language'), true)) . ', ' . $db->quote('*') . ')')
+			->order('t.links DESC')
+			->order('t.weight DESC');
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a store id based on model the configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  An identifier string to generate the store id. [optional]
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Add the search query state.
+		$id .= ':' . $this->getState('input');
+		$id .= ':' . $this->getState('language');
+
+		// Add the list state.
+		$id .= ':' . $this->getState('list.start');
+		$id .= ':' . $this->getState('list.limit');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Method to auto-populate the model state.  Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// Get the configuration options.
+		$app = JFactory::getApplication();
+		$input = $app->input;
+		$params = JComponentHelper::getParams('com_finder');
+		$user = JFactory::getUser();
+
+		// Get the query input.
+		$this->setState('input', $input->request->get('q', '', 'string'));
+
+		// Set the query language
+		if (JLanguageMultilang::isEnabled())
+		{
+			$lang = JFactory::getLanguage()->getTag();
+		}
+		else
+		{
+			$lang = FinderIndexerHelper::getDefaultLanguage();
+		}
+
+		$lang = FinderIndexerHelper::getPrimaryLanguage($lang);
+		$this->setState('language', $lang);
+
+		// Load the list state.
+		$this->setState('list.start', 0);
+		$this->setState('list.limit', 10);
+
+		// Load the parameters.
+		$this->setState('params', $params);
+
+		// Load the user state.
+		$this->setState('user.id', (int) $user->get('id'));
+	}
+}
diff --git a/core/components/com_finder/router.php b/core/components/com_finder/router.php
new file mode 100644
index 00000000..712dd11a
--- /dev/null
+++ b/core/components/com_finder/router.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_finder
+ *
+ * @since  3.3
+ */
+class FinderRouter extends JComponentRouterBase
+{
+	/**
+	 * Build the route for the com_finder component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query)
+	{
+		$segments = array();
+
+		/*
+		 * First, handle menu item routes first. When the menu system builds a
+		 * route, it only provides the option and the menu item id. We don't have
+		 * to do anything to these routes.
+		 */
+		if (count($query) === 2 && isset($query['Itemid'], $query['option']))
+		{
+			return $segments;
+		}
+
+		/*
+		 * Next, handle a route with a supplied menu item id. All system generated
+		 * routes should fall into this group. We can assume that the menu item id
+		 * is the best possible match for the query but we need to go through and
+		 * see which variables we can eliminate from the route query string because
+		 * they are present in the menu item route already.
+		 */
+		if (!empty($query['Itemid']))
+		{
+			// Get the menu item.
+			$item = $this->menu->getItem($query['Itemid']);
+
+			// Check if the view matches.
+			if ($item && isset($item->query['view']) && isset($query['view']) && $item->query['view'] === $query['view'])
+			{
+				unset($query['view']);
+			}
+
+			// Check if the search query filter matches.
+			if ($item && isset($item->query['f']) && isset($query['f']) && $item->query['f'] === $query['f'])
+			{
+				unset($query['f']);
+			}
+
+			// Check if the search query string matches.
+			if ($item && isset($item->query['q']) && isset($query['q']) && $item->query['q'] === $query['q'])
+			{
+				unset($query['q']);
+			}
+
+			return $segments;
+		}
+
+		/*
+		 * Lastly, handle a route with no menu item id. Fortunately, we only need
+		 * to deal with the view as the other route variables are supposed to stay
+		 * in the query string.
+		 */
+		if (isset($query['view']))
+		{
+			// Add the view to the segments.
+			$segments[] = $query['view'];
+			unset($query['view']);
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments)
+	{
+		$total = count($segments);
+		$vars = array();
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// Check if the view segment is set and it equals search or advanced.
+		if (isset($segments[0]) && ($segments[0] === 'search' || $segments[0] === 'advanced'))
+		{
+			$vars['view'] = $segments[0];
+		}
+
+		return $vars;
+	}
+}
+
+/**
+ * Finder router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function FinderBuildRoute(&$query)
+{
+	$router = new FinderRouter;
+
+	return $router->build($query);
+}
+
+/**
+ * Finder router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function FinderParseRoute($segments)
+{
+	$router = new FinderRouter;
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_finder/views/search/tmpl/default.php b/core/components/com_finder/views/search/tmpl/default.php
new file mode 100644
index 00000000..90edaa96
--- /dev/null
+++ b/core/components/com_finder/views/search/tmpl/default.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+JHtml::_('formbehavior.chosen');
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::_('stylesheet', 'com_finder/finder.css', array('version' => 'auto', 'relative' => true));
+
+?>
+<div class="finder<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php if ($this->escape($this->params->get('page_heading'))) : ?>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			<?php else : ?>
+				<?php echo $this->escape($this->params->get('page_title')); ?>
+			<?php endif; ?>
+		</h1>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_search_form', 1)) : ?>
+		<div id="search-form">
+			<?php echo $this->loadTemplate('form'); ?>
+		</div>
+	<?php endif; ?>
+	<?php // Load the search results layout if we are performing a search. ?>
+	<?php if ($this->query->search === true) : ?>
+		<div id="search-results">
+			<?php echo $this->loadTemplate('results'); ?>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/components/com_finder/views/search/tmpl/default.xml b/core/components/com_finder/views/search/tmpl/default.xml
new file mode 100644
index 00000000..7e13ae76
--- /dev/null
+++ b/core/components/com_finder/views/search/tmpl/default.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TITLE">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_FINDER_SEARCH"
+		/>
+		<message>
+			<![CDATA[COM_FINDER_MENU_SEARCH_VIEW_DEFAULT_TEXT]]>
+		</message>
+	</layout>
+
+	<fields name="request" addfieldpath="/administrator/components/com_finder/models/fields">
+		<fieldset name="request">
+			<field
+				name="q"
+				type="text"
+				label="COM_FINDER_SEARCH_SEARCH_QUERY_LABEL"
+				description="COM_FINDER_SEARCH_SEARCH_QUERY_DESC"
+				size="30"
+			/>
+			<field
+				name="f"
+				type="searchfilter"
+				label="COM_FINDER_SEARCH_FILTER_SEARCH_LABEL"
+				description="COM_FINDER_SEARCH_FILTER_SEARCH_DESC"
+				default=""
+			/>
+		</fieldset>
+	</fields>
+	<fields name="params" addfieldpath="/administrator/components/com_finder/models/fields">
+		<fieldset name="basic">
+			<field
+				name="show_date_filters"
+				type="list"
+				label="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+			<field
+				name="show_advanced"
+				type="list"
+				label="COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_ADVANCED_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+			<field
+				name="expand_advanced"
+				type="list"
+				label="COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL"
+				description="COM_FINDER_CONFIG_EXPAND_ADVANCED_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+			<field type="spacer" />
+			<field
+				name="show_description"
+				type="list"
+				label="COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+			<field
+				name="description_length"
+				type="number"
+				label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
+				description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESC"
+				default=""
+				size="5"
+				useglobal="true"
+			/>
+			<field
+				name="show_url"
+				type="list"
+				label="COM_FINDER_CONFIG_SHOW_URL_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_URL_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+			<field type="spacer" />
+		</fieldset>
+		<fieldset name="advanced">
+			<field
+				name="show_pagination_limit"
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				validate="options"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="show_pagination"
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				validate="options"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				validate="options"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+				name="allow_empty_query"
+				type="list"
+				label="COM_FINDER_ALLOW_EMPTY_QUERY_LABEL"
+				description="COM_FINDER_ALLOW_EMPTY_QUERY_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+			<field
+				name="show_suggested_query"
+				type="list"
+				label="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_SUGGESTED_QUERY_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+			<field
+				name="show_explained_query"
+				type="list"
+				label="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL"
+				description="COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+			<field
+				name="sort_order"
+				type="list"
+				label="COM_FINDER_CONFIG_SORT_ORDER_LABEL"
+				description="COM_FINDER_CONFIG_SORT_ORDER_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="relevance">COM_FINDER_CONFIG_SORT_OPTION_RELEVANCE</option>
+				<option value="date">COM_FINDER_CONFIG_SORT_OPTION_START_DATE</option>
+				<option value="price">COM_FINDER_CONFIG_SORT_OPTION_LIST_PRICE</option>
+			</field>
+			<field
+				name="sort_direction"
+				type="list"
+				label="COM_FINDER_CONFIG_SORT_DIRECTION_LABEL"
+				description="COM_FINDER_CONFIG_SORT_DIRECTION_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="desc">COM_FINDER_CONFIG_SORT_OPTION_DESCENDING</option>
+				<option value="asc">COM_FINDER_CONFIG_SORT_OPTION_ASCENDING</option>
+			</field>
+		</fieldset>
+		<fieldset name="integration">
+			<field
+				name="show_feed_link"
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				validate="options"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_finder/views/search/tmpl/default_form.php b/core/components/com_finder/views/search/tmpl/default_form.php
new file mode 100644
index 00000000..ba307c39
--- /dev/null
+++ b/core/components/com_finder/views/search/tmpl/default_form.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if ($this->params->get('show_advanced', 1) || $this->params->get('show_autosuggest', 1))
+{
+	JHtml::_('jquery.framework');
+
+	$script = "
+jQuery(function() {";
+
+	if ($this->params->get('show_advanced', 1))
+	{
+		/*
+		* This segment of code disables select boxes that have no value when the
+		* form is submitted so that the URL doesn't get blown up with null values.
+		*/
+		$script .= "
+	jQuery('#finder-search').on('submit', function(e){
+		e.stopPropagation();
+		// Disable select boxes with no value selected.
+		jQuery('#advancedSearch').find('select').each(function(index, el) {
+			var el = jQuery(el);
+			if(!el.val()){
+				el.attr('disabled', 'disabled');
+			}
+		});
+	});";
+	}
+
+	/*
+	* This segment of code sets up the autocompleter.
+	*/
+	if ($this->params->get('show_autosuggest', 1))
+	{
+		JHtml::_('script', 'jui/jquery.autocomplete.min.js', array('version' => 'auto', 'relative' => true));
+
+		$script .= "
+	var suggest = jQuery('#q').autocomplete({
+		serviceUrl: '" . JRoute::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component') . "',
+		paramName: 'q',
+		minChars: 1,
+		maxHeight: 400,
+		width: 300,
+		zIndex: 9999,
+		deferRequestBy: 500
+	});";
+	}
+
+	$script .= "
+});";
+
+	JFactory::getDocument()->addScriptDeclaration($script);
+}
+
+?>
+<form id="finder-search" action="<?php echo JRoute::_($this->query->toUri()); ?>" method="get" class="form-inline">
+	<?php echo $this->getFields(); ?>
+	<?php // DISABLED UNTIL WEIRD VALUES CAN BE TRACKED DOWN. ?>
+	<?php if (false && $this->state->get('list.ordering') !== 'relevance_dsc') : ?>
+		<input type="hidden" name="o" value="<?php echo $this->escape($this->state->get('list.ordering')); ?>" />
+	<?php endif; ?>
+	<fieldset class="word">
+		<label for="q">
+			<?php echo JText::_('COM_FINDER_SEARCH_TERMS'); ?>
+		</label>
+		<input type="text" name="q" id="q" size="30" value="<?php echo $this->escape($this->query->input); ?>" class="inputbox" />
+		<?php if ($this->escape($this->query->input) != '' || $this->params->get('allow_empty_query')) : ?>
+			<button name="Search" type="submit" class="btn btn-primary">
+				<span class="icon-search icon-white"></span>
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>
+			</button>
+		<?php else : ?>
+			<button name="Search" type="submit" class="btn btn-primary disabled">
+				<span class="icon-search icon-white"></span>
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>
+			</button>
+		<?php endif; ?>
+		<?php if ($this->params->get('show_advanced', 1)) : ?>
+			<a href="#advancedSearch" data-toggle="collapse" class="btn">
+				<span class="icon-list" aria-hidden="true"></span>
+				<?php echo JText::_('COM_FINDER_ADVANCED_SEARCH_TOGGLE'); ?>
+			</a>
+		<?php endif; ?>
+	</fieldset>
+	<?php if ($this->params->get('show_advanced', 1)) : ?>
+		<div id="advancedSearch" class="collapse<?php if ($this->params->get('expand_advanced', 0)) echo ' in'; ?>">
+			<hr />
+			<?php if ($this->params->get('show_advanced_tips', 1)) : ?>
+				<div id="search-query-explained">
+					<div class="advanced-search-tip">
+						<?php echo JText::_('COM_FINDER_ADVANCED_TIPS'); ?>
+					</div>
+					<hr />
+				</div>
+			<?php endif; ?>
+			<div id="finder-filter-window">
+				<?php echo JHtml::_('filter.select', $this->query, $this->params); ?>
+			</div>
+		</div>
+	<?php endif; ?>
+</form>
diff --git a/core/components/com_finder/views/search/tmpl/default_result.php b/core/components/com_finder/views/search/tmpl/default_result.php
new file mode 100644
index 00000000..06d462d8
--- /dev/null
+++ b/core/components/com_finder/views/search/tmpl/default_result.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+// Get the mime type class.
+$mime = !empty($this->result->mime) ? 'mime-' . $this->result->mime : null;
+
+$show_description = $this->params->get('show_description', 1);
+
+if ($show_description)
+{
+	// Calculate number of characters to display around the result
+	$term_length = StringHelper::strlen($this->query->input);
+	$desc_length = $this->params->get('description_length', 255);
+	$pad_length  = $term_length < $desc_length ? (int) floor(($desc_length - $term_length) / 2) : 0;
+
+	// Make sure we highlight term both in introtext and fulltext
+	if (!empty($this->result->summary) && !empty($this->result->body))
+	{
+		$full_description = FinderIndexerHelper::parse($this->result->summary . $this->result->body);
+	}
+	else
+	{
+		$full_description = $this->result->description;
+	}
+
+	// Find the position of the search term
+	$pos = $term_length ? StringHelper::strpos(StringHelper::strtolower($full_description), StringHelper::strtolower($this->query->input)) : false;
+
+	// Find a potential start point
+	$start = ($pos && $pos > $pad_length) ? $pos - $pad_length : 0;
+
+	// Find a space between $start and $pos, start right after it.
+	$space = StringHelper::strpos($full_description, ' ', $start > 0 ? $start - 1 : 0);
+	$start = ($space && $space < $pos) ? $space + 1 : $start;
+
+	$description = JHtml::_('string.truncate', StringHelper::substr($full_description, $start), $desc_length, true);
+}
+
+$route = $this->result->route;
+
+// Get the route with highlighting information.
+if (!empty($this->query->highlight)
+	&& empty($this->result->mime)
+	&& $this->params->get('highlight_terms', 1)
+	&& JPluginHelper::isEnabled('system', 'highlight'))
+{
+	$route .= '&highlight=' . base64_encode(json_encode($this->query->highlight));
+}
+
+?>
+<li>
+	<h4 class="result-title <?php echo $mime; ?>">
+		<a href="<?php echo JRoute::_($route); ?>">
+			<?php echo $this->result->title; ?>
+		</a>
+	</h4>
+	<?php if ($show_description && $description !== '') : ?>
+		<p class="result-text<?php echo $this->pageclass_sfx; ?>">
+			<?php echo $description; ?>
+		</p>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_url', 1)) : ?>
+		<div class="small result-url<?php echo $this->pageclass_sfx; ?>">
+			<?php echo $this->baseUrl, JRoute::_($this->result->route); ?>
+		</div>
+	<?php endif; ?>
+</li>
diff --git a/core/components/com_finder/views/search/tmpl/default_results.php b/core/components/com_finder/views/search/tmpl/default_results.php
new file mode 100644
index 00000000..0b97f5d2
--- /dev/null
+++ b/core/components/com_finder/views/search/tmpl/default_results.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php // Display the suggested search if it is different from the current search. ?>
+<?php if (($this->suggested && $this->params->get('show_suggested_query', 1)) || ($this->explained && $this->params->get('show_explained_query', 1))) : ?>
+	<div id="search-query-explained">
+		<?php // Display the suggested search query. ?>
+		<?php if ($this->suggested && $this->params->get('show_suggested_query', 1)) : ?>
+			<?php // Replace the base query string with the suggested query string. ?>
+			<?php $uri = JUri::getInstance($this->query->toUri()); ?>
+			<?php $uri->setVar('q', $this->suggested); ?>
+			<?php // Compile the suggested query link. ?>
+			<?php $linkUrl = JRoute::_($uri->toString(array('path', 'query'))); ?>
+			<?php $link = '<a href="' . $linkUrl . '">' . $this->escape($this->suggested) . '</a>'; ?>
+			<?php echo JText::sprintf('COM_FINDER_SEARCH_SIMILAR', $link); ?>
+		<?php elseif ($this->explained && $this->params->get('show_explained_query', 1)) : ?>
+			<?php // Display the explained search query. ?>
+			<?php echo $this->explained; ?>
+		<?php endif; ?>
+	</div>
+<?php endif; ?>
+<?php // Display the 'no results' message and exit the template. ?>
+<?php if (($this->total === 0) || ($this->total === null)) : ?>
+	<div id="search-result-empty">
+		<h2><?php echo JText::_('COM_FINDER_SEARCH_NO_RESULTS_HEADING'); ?></h2>
+		<?php $multilang = JFactory::getApplication()->getLanguageFilter() ? '_MULTILANG' : ''; ?>
+		<p><?php echo JText::sprintf('COM_FINDER_SEARCH_NO_RESULTS_BODY' . $multilang, $this->escape($this->query->input)); ?></p>
+	</div>
+	<?php // Exit this template. ?>
+	<?php return; ?>
+<?php endif; ?>
+<?php // Activate the highlighter if enabled. ?>
+<?php if (!empty($this->query->highlight) && $this->params->get('highlight_terms', 1)) : ?>
+	<?php JHtml::_('behavior.highlighter', $this->query->highlight); ?>
+<?php endif; ?>
+<?php // Display a list of results ?>
+<br id="highlighter-start" />
+<ul class="search-results<?php echo $this->pageclass_sfx; ?> list-striped">
+	<?php $this->baseUrl = JUri::getInstance()->toString(array('scheme', 'host', 'port')); ?>
+	<?php foreach ($this->results as $result) : ?>
+		<?php $this->result = &$result; ?>
+		<?php $layout = $this->getLayoutFile($this->result->layout); ?>
+		<?php echo $this->loadTemplate($layout); ?>
+	<?php endforeach; ?>
+</ul>
+<br id="highlighter-end" />
+<?php // Display the pagination ?>
+<div class="search-pagination">
+	<div class="pagination">
+		<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+	<div class="search-pages-counter">
+		<?php // Prepare the pagination string.  Results X - Y of Z ?>
+		<?php $start = (int) $this->pagination->get('limitstart') + 1; ?>
+		<?php $total = (int) $this->pagination->get('total'); ?>
+		<?php $limit = (int) $this->pagination->get('limit') * $this->pagination->get('pages.current'); ?>
+		<?php $limit = (int) ($limit > $total ? $total : $limit); ?>
+		<?php echo JText::sprintf('COM_FINDER_SEARCH_RESULTS_OF', $start, $limit, $total); ?>
+	</div>
+</div>
diff --git a/core/components/com_finder/views/search/view.feed.php b/core/components/com_finder/views/search/view.feed.php
new file mode 100644
index 00000000..cbf91e33
--- /dev/null
+++ b/core/components/com_finder/views/search/view.feed.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Search feed view class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderViewSearch extends JViewLegacy
+{
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  JError object on failure, void on success.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		// Get the application
+		$app = JFactory::getApplication();
+
+		// Adjust the list limit to the feed limit.
+		$app->input->set('limit', $app->get('feed_limit'));
+
+		// Get view data.
+		$state = $this->get('State');
+		$params = $state->get('params');
+		$query = $this->get('Query');
+		$results = $this->get('Results');
+
+		// Push out the query data.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		$explained = JHtml::_('query.explained', $query);
+
+		// Set the document title.
+		$title = $params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		// Configure the document description.
+		if (!empty($explained))
+		{
+			$this->document->setDescription(html_entity_decode(strip_tags($explained), ENT_QUOTES, 'UTF-8'));
+		}
+
+		// Set the document link.
+		$this->document->link = JRoute::_($query->toUri());
+
+		// If we don't have any results, we are done.
+		if (empty($results))
+		{
+			return;
+		}
+
+		// Convert the results to feed entries.
+		foreach ($results as $result)
+		{
+			// Convert the result to a feed entry.
+			$item              = new JFeedItem;
+			$item->title       = $result->title;
+			$item->link        = JRoute::_($result->route);
+			$item->description = $result->description;
+
+			// Use Unix date to cope for non-english languages
+			$item->date        = (int) $result->start_date ? JHtml::_('date', $result->start_date, 'U') : $result->indexdate;
+
+			// Get the taxonomy data.
+			$taxonomy = $result->getTaxonomy();
+
+			// Add the category to the feed if available.
+			if (isset($taxonomy['Category']))
+			{
+				$node           = array_pop($taxonomy['Category']);
+				$item->category = $node->title;
+			}
+
+			// Loads item info into RSS array
+			$this->document->addItem($item);
+		}
+	}
+}
diff --git a/core/components/com_finder/views/search/view.html.php b/core/components/com_finder/views/search/view.html.php
new file mode 100644
index 00000000..5e59683f
--- /dev/null
+++ b/core/components/com_finder/views/search/view.html.php
@@ -0,0 +1,308 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Helper\SearchHelper;
+
+/**
+ * Search HTML view class for the Finder package.
+ *
+ * @since  2.5
+ */
+class FinderViewSearch extends JViewLegacy
+{
+	/**
+	 * The query object
+	 *
+	 * @var  FinderIndexerQuery
+	 */
+	protected $query;
+
+	/**
+	 * The application parameters
+	 *
+	 * @var  Registry  The parameters object
+	 */
+	protected $params;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 */
+	protected $state;
+
+	protected $user;
+
+	/**
+	 * An array of results
+	 *
+	 * @var    array
+	 *
+	 * @since  3.8.0
+	 */
+	protected $results;
+
+	/**
+	 * The total number of items
+	 *
+	 * @var    integer
+	 *
+	 * @since  3.8.0
+	 */
+	protected $total;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    JPagination
+	 *
+	 * @since  3.8.0
+	 */
+	protected $pagination;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  JError object on failure, void on success.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
+
+		// Get view data.
+		$state = $this->get('State');
+		$query = $this->get('Query');
+		JDEBUG ? JProfiler::getInstance('Application')->mark('afterFinderQuery') : null;
+		$results = $this->get('Results');
+		JDEBUG ? JProfiler::getInstance('Application')->mark('afterFinderResults') : null;
+		$total = $this->get('Total');
+		JDEBUG ? JProfiler::getInstance('Application')->mark('afterFinderTotal') : null;
+		$pagination = $this->get('Pagination');
+		JDEBUG ? JProfiler::getInstance('Application')->mark('afterFinderPagination') : null;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Configure the pathway.
+		if (!empty($query->input))
+		{
+			$app->getPathway()->addItem($this->escape($query->input));
+		}
+
+		// Push out the view data.
+		$this->state      = &$state;
+		$this->params     = &$params;
+		$this->query      = &$query;
+		$this->results    = &$results;
+		$this->total      = &$total;
+		$this->pagination = &$pagination;
+
+		// Check for a double quote in the query string.
+		if (strpos($this->query->input, '"'))
+		{
+			// Get the application router.
+			$router = &$app::getRouter();
+
+			// Fix the q variable in the URL.
+			if ($router->getVar('q') !== $this->query->input)
+			{
+				$router->setVar('q', $this->query->input);
+			}
+		}
+
+		// Log the search
+		SearchHelper::logSearch($this->query->input, 'com_finder');
+
+		// Push out the query data.
+		JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+		$this->suggested = JHtml::_('query.suggested', $query);
+		$this->explained = JHtml::_('query.explained', $query);
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		// Check for layout override only if this is not the active menu item
+		// If it is the active menu item, then the view and category id will match
+		$active = $app->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			// We need to set the layout in case this is an alternative menu item (with an alternative layout)
+			$this->setLayout($active->query['layout']);
+		}
+
+		$this->prepareDocument($query);
+
+		JDEBUG ? JProfiler::getInstance('Application')->mark('beforeFinderLayout') : null;
+
+		parent::display($tpl);
+
+		JDEBUG ? JProfiler::getInstance('Application')->mark('afterFinderLayout') : null;
+	}
+
+	/**
+	 * Method to get hidden input fields for a get form so that control variables
+	 * are not lost upon form submission
+	 *
+	 * @return  string  A string of hidden input form fields
+	 *
+	 * @since   2.5
+	 */
+	protected function getFields()
+	{
+		$fields = null;
+
+		// Get the URI.
+		$uri = JUri::getInstance(JRoute::_($this->query->toUri()));
+		$uri->delVar('q');
+		$uri->delVar('o');
+		$uri->delVar('t');
+		$uri->delVar('d1');
+		$uri->delVar('d2');
+		$uri->delVar('w1');
+		$uri->delVar('w2');
+		$elements = $uri->getQuery(true);
+
+		// Create hidden input elements for each part of the URI.
+		foreach ($elements as $n => $v)
+		{
+			if (is_scalar($v))
+			{
+				$fields .= '<input type="hidden" name="' . $n . '" value="' . $v . '" />';
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get the layout file for a search result object.
+	 *
+	 * @param   string  $layout  The layout file to check. [optional]
+	 *
+	 * @return  string  The layout file to use.
+	 *
+	 * @since   2.5
+	 */
+	protected function getLayoutFile($layout = null)
+	{
+		// Create and sanitize the file name.
+		$file = $this->_layout . '_' . preg_replace('/[^A-Z0-9_\.-]/i', '', $layout);
+
+		// Check if the file exists.
+		jimport('joomla.filesystem.path');
+		$filetofind = $this->_createFileName('template', array('name' => $file));
+		$exists     = JPath::find($this->_path['template'], $filetofind);
+
+		return ($exists ? $layout : 'result');
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @param   FinderIndexerQuery  $query  The search query
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	protected function prepareDocument($query)
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_FINDER_DEFAULT_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($layout = $this->params->get('article_layout'))
+		{
+			$this->setLayout($layout);
+		}
+
+		// Configure the document meta-description.
+		if (!empty($this->explained))
+		{
+			$explained = $this->escape(html_entity_decode(strip_tags($this->explained), ENT_QUOTES, 'UTF-8'));
+			$this->document->setDescription($explained);
+		}
+		elseif ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		// Configure the document meta-keywords.
+		if (!empty($query->highlight))
+		{
+			$this->document->setMetaData('keywords', implode(', ', $query->highlight));
+		}
+		elseif ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		// Add feed link to the document head.
+		if ($this->params->get('show_feed_link', 1) == 1)
+		{
+			// Add the RSS link.
+			$props = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$route = JRoute::_($this->query->toUri() . '&format=feed&type=rss');
+			$this->document->addHeadLink($route, 'alternate', 'rel', $props);
+
+			// Add the ATOM link.
+			$props = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$route = JRoute::_($this->query->toUri() . '&format=feed&type=atom');
+			$this->document->addHeadLink($route, 'alternate', 'rel', $props);
+		}
+	}
+}
diff --git a/core/components/com_finder/views/search/view.opensearch.php b/core/components/com_finder/views/search/view.opensearch.php
new file mode 100644
index 00000000..f3efa365
--- /dev/null
+++ b/core/components/com_finder/views/search/view.opensearch.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * OpenSearch View class for Finder
+ *
+ * @since  2.5
+ */
+class FinderViewSearch extends JViewLegacy
+{
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  A template file to load. [optional]
+	 *
+	 * @return  mixed  JError object on failure, void on success.
+	 *
+	 * @since   2.5
+	 */
+	public function display($tpl = null)
+	{
+		$doc = JFactory::getDocument();
+		$app = JFactory::getApplication();
+
+		$params = JComponentHelper::getParams('com_finder');
+		$doc->setShortName($params->get('opensearch_name', $app->get('sitename')));
+		$doc->setDescription($params->get('opensearch_description', $app->get('MetaDesc')));
+
+		// Add the URL for the search
+		$searchUri = JUri::base() . 'index.php?option=com_finder&q={searchTerms}';
+
+		// Find the menu item for the search
+		$menu  = $app->getMenu();
+		$items = $menu->getItems('link', 'index.php?option=com_finder&view=search');
+
+		if (isset($items[0]))
+		{
+			$searchUri .= '&Itemid=' . $items[0]->id;
+		}
+
+		$htmlSearch           = new JOpenSearchUrl;
+		$htmlSearch->template = JRoute::_($searchUri);
+		$doc->addUrl($htmlSearch);
+	}
+}
diff --git a/core/components/com_mailto/controller.php b/core/components/com_mailto/controller.php
new file mode 100644
index 00000000..9d82d9ce
--- /dev/null
+++ b/core/components/com_mailto/controller.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Mailer Component Controller.
+ *
+ * @since  1.5
+ */
+class MailtoController extends JControllerLegacy
+{
+	/**
+	 * Show the form so that the user can send the link to someone.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function mailto()
+	{
+		$this->input->set('view', 'mailto');
+		$this->display();
+	}
+
+	/**
+	 * Send the message and display a notice
+	 *
+	 * @return  void
+	 *
+	 * @since  1.5
+	 */
+	public function send()
+	{
+		// Check for request forgeries
+		$this->checkToken();
+
+		$app     = JFactory::getApplication();
+		$model   = $this->getModel('mailto');
+		$data    = $model->getData();
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		if (!$model->validate($form, $data))
+		{
+			$errors = $model->getErrors();
+
+			foreach ($errors as $error)
+			{
+				$errorMessage = $error;
+
+				if ($error instanceof Exception)
+				{
+					$errorMessage = $error->getMessage();
+				}
+
+				$app->enqueueMessage($errorMessage, 'error');
+			}
+
+			return $this->mailto();
+		}
+
+		// An array of email headers we do not want to allow as input
+		$headers = array (
+			'Content-Type:',
+			'MIME-Version:',
+			'Content-Transfer-Encoding:',
+			'bcc:',
+			'cc:'
+		);
+
+		/*
+		 * Here is the meat and potatoes of the header injection test.  We
+		 * iterate over the array of form input and check for header strings.
+		 * If we find one, send an unauthorized header and die.
+		 */
+		foreach ($data as $key => $value)
+		{
+			foreach ($headers as $header)
+			{
+				if (strpos($value, $header) !== false)
+				{
+					JError::raiseError(403, '');
+				}
+			}
+		}
+
+		/*
+		 * Free up memory
+		 */
+		unset($headers, $fields);
+
+		$siteName = $app->get('sitename');
+		$link     = MailtoHelper::validateHash($this->input->post->get('link', '', 'post'));
+
+		// Verify that this is a local link
+		if (!$link || !JUri::isInternal($link))
+		{
+			// Non-local url...
+			JError::raiseNotice(500, JText::_('COM_MAILTO_EMAIL_NOT_SENT'));
+
+			return $this->mailto();
+		}
+
+		$subject_default = JText::sprintf('COM_MAILTO_SENT_BY', $data['sender']);
+		$subject         = $data['subject'] !== '' ? $data['subject'] : $subject_default;
+
+		// Check for a valid to address
+		$error = false;
+
+		if (!$data['emailto'] || !JMailHelper::isEmailAddress($data['emailto']))
+		{
+			$error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $data['emailto']);
+
+			JError::raiseWarning(0, $error);
+		}
+
+		// Check for a valid from address
+		if (!$data['emailfrom'] || !JMailHelper::isEmailAddress($data['emailfrom']))
+		{
+			$error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $data['emailfrom']);
+
+			JError::raiseWarning(0, $error);
+		}
+
+		if ($error)
+		{
+			return $this->mailto();
+		}
+
+		// Build the message to send
+		$msg  = JText::_('COM_MAILTO_EMAIL_MSG');
+		$body = sprintf($msg, $siteName, $data['sender'], $data['emailfrom'], $link);
+
+		// Clean the email data
+		$subject = JMailHelper::cleanSubject($subject);
+		$body    = JMailHelper::cleanBody($body);
+
+		// To send we need to use punycode.
+		$data['emailfrom'] = JStringPunycode::emailToPunycode($data['emailfrom']);
+		$data['emailfrom'] = JMailHelper::cleanAddress($data['emailfrom']);
+		$data['emailto']   = JStringPunycode::emailToPunycode($data['emailto']);
+
+		// Send the email
+		if (JFactory::getMailer()->sendMail($data['emailfrom'], $data['sender'], $data['emailto'], $subject, $body) !== true)
+		{
+			JError::raiseNotice(500, JText::_('COM_MAILTO_EMAIL_NOT_SENT'));
+
+			return $this->mailto();
+		}
+
+		$this->input->set('view', 'sent');
+		$this->display();
+	}
+}
diff --git a/core/components/com_mailto/helpers/mailto.php b/core/components/com_mailto/helpers/mailto.php
new file mode 100644
index 00000000..d511dbe5
--- /dev/null
+++ b/core/components/com_mailto/helpers/mailto.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Mailto route helper class.
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ * @since       1.6.1
+ */
+abstract class MailtoHelper
+{
+	/**
+	 * Adds a URL to the mailto system and returns the hash
+	 *
+	 * @param   string  $url  Url
+	 *
+	 * @return  string  URL hash
+	 */
+	public static function addLink($url)
+	{
+		$hash = sha1($url);
+		self::cleanHashes();
+
+		$session      = JFactory::getSession();
+		$mailto_links = $session->get('com_mailto.links', array());
+
+		if (!isset($mailto_links[$hash]))
+		{
+			$mailto_links[$hash] = new stdClass;
+		}
+
+		$mailto_links[$hash]->link   = $url;
+		$mailto_links[$hash]->expiry = time();
+		$session->set('com_mailto.links', $mailto_links);
+
+		return $hash;
+	}
+
+	/**
+	 * Checks if a URL is a Flash file
+	 *
+	 * @param   string  $hash  File hash
+	 *
+	 * @return URL
+	 */
+	public static function validateHash($hash)
+	{
+		$retval  = false;
+		$session = JFactory::getSession();
+
+		self::cleanHashes();
+		$mailto_links = $session->get('com_mailto.links', array());
+
+		if (isset($mailto_links[$hash]))
+		{
+			$retval = $mailto_links[$hash]->link;
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Cleans out old hashes
+	 *
+	 * @param   integer  $lifetime  How old are the hashes we want to remove
+	 *
+	 * @return  void
+	 *
+	 * @since 1.6.1
+	 */
+	public static function cleanHashes($lifetime = 1440)
+	{
+		// Flag for if we've cleaned on this cycle
+		static $cleaned = false;
+
+		if (!$cleaned)
+		{
+			$past         = time() - $lifetime;
+			$session      = JFactory::getSession();
+			$mailto_links = $session->get('com_mailto.links', array());
+
+			foreach ($mailto_links as $index => $link)
+			{
+				if ($link->expiry < $past)
+				{
+					unset($mailto_links[$index]);
+				}
+			}
+
+			$session->set('com_mailto.links', $mailto_links);
+			$cleaned = true;
+		}
+	}
+}
diff --git a/core/components/com_mailto/mailto.php b/core/components/com_mailto/mailto.php
new file mode 100644
index 00000000..ab3ba02d
--- /dev/null
+++ b/core/components/com_mailto/mailto.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('MailtoHelper', JPATH_COMPONENT . '/helpers/mailto.php');
+
+$controller = JControllerLegacy::getInstance('Mailto');
+$controller->registerDefaultTask('mailto');
+$controller->execute(JFactory::getApplication()->input->get('task'));
diff --git a/core/components/com_mailto/mailto.xml b/core/components/com_mailto/mailto.xml
new file mode 100644
index 00000000..65bddce1
--- /dev/null
+++ b/core/components/com_mailto/mailto.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_mailto</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.	</copyright>
+	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_MAILTO_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>index.html</filename>
+		<filename>mailto.php</filename>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_mailto.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>index.html</filename>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_mailto.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/components/com_mailto/models/forms/mailto.xml b/core/components/com_mailto/models/forms/mailto.xml
new file mode 100644
index 00000000..0469129f
--- /dev/null
+++ b/core/components/com_mailto/models/forms/mailto.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<form>
+	<fieldset name="default">
+		<field
+			name="emailto"
+			type="email"
+			label="COM_MAILTO_EMAIL_TO"
+			filter="string"
+			required="true"
+			size="30"
+			validate="email"
+			autocomplete="email"
+		/>
+
+		<field
+			name="sender"
+			type="text"
+			label="COM_MAILTO_SENDER"
+			filter="string"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="emailfrom"
+			type="email"
+			label="COM_MAILTO_YOUR_EMAIL"
+			filter="string"
+			required="true"
+			size="30"
+			validate="email"
+			autocomplete="email"
+		/>
+
+		<field
+			name="subject"
+			type="text"
+			label="COM_MAILTO_SUBJECT"
+			filter="string"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_MAILTO_CAPTCHA"
+			validate="captcha"
+		/>
+	</fieldset>
+</form>
diff --git a/core/components/com_mailto/models/mailto.php b/core/components/com_mailto/models/mailto.php
new file mode 100644
index 00000000..3e0fac51
--- /dev/null
+++ b/core/components/com_mailto/models/mailto.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Mailto model class.
+ *
+ * @since  3.8.9
+ */
+class MailtoModelMailto extends JModelForm
+{
+	/**
+	 * Method to get the mailto form.
+	 *
+	 * The base form is loaded from XML and then an event is fired
+	 * for users plugins to extend the form with extra fields.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interrogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm	A JForm object on success, false on failure
+	 *
+	 * @since   3.8.9
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_mailto.mailto', 'mailto', array('load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array  The default data is an empty array.
+	 *
+	 * @since   3.8.9
+	 */
+	protected function loadFormData()
+	{
+		$user = JFactory::getUser();
+		$app  = JFactory::getApplication();
+		$data = $app->getUserState('mailto.mailto.form.data', array());
+
+		$data['link'] = urldecode($app->input->get('link', '', 'BASE64'));
+
+		if ($data['link'] == '')
+		{
+			JError::raiseError(403, JText::_('COM_MAILTO_LINK_IS_MISSING'));
+
+			return false;
+		}
+
+		// Load with previous data, if it exists
+		$data['sender']    = $app->input->post->getString('sender', '');
+		$data['subject']   = $app->input->post->getString('subject', '');
+		$data['emailfrom'] = JStringPunycode::emailToPunycode($app->input->post->getString('emailfrom', ''));
+		$data['emailto']   = JStringPunycode::emailToPunycode($app->input->post->getString('emailto', ''));
+
+		if (!$user->guest)
+		{
+			$data['sender']    = $user->name;
+			$data['emailfrom'] = $user->email;
+		}
+
+		$app->setUserState('mailto.mailto.form.data', $data);
+
+		$this->preprocessData('com_mailto.mailto', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Get the request data
+	 *
+	 * @return  array  The requested data
+	 *
+	 * @since   3.8.9
+	 */
+	public function getData()
+	{
+		$input = JFactory::getApplication()->input;
+
+		$data['emailto']   = $input->get('emailto', '', 'string');
+		$data['sender']    = $input->get('sender', '', 'string');
+		$data['emailfrom'] = $input->get('emailfrom', '', 'string');
+		$data['subject']   = $input->get('subject', '', 'string');
+
+		return $data;
+	}
+}
diff --git a/core/components/com_mailto/views/mailto/tmpl/default.php b/core/components/com_mailto/views/mailto/tmpl/default.php
new file mode 100644
index 00000000..5a828e75
--- /dev/null
+++ b/core/components/com_mailto/views/mailto/tmpl/default.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+JHtml::_('behavior.keepalive');
+
+?>
+<div id="mailto-window">
+	<h2>
+		<?php echo JText::_('COM_MAILTO_EMAIL_TO_A_FRIEND'); ?>
+	</h2>
+	<div class="mailto-close">
+		<a href="javascript: void window.close()" title="<?php echo JText::_('COM_MAILTO_CLOSE_WINDOW'); ?>">
+			<span>
+				<?php echo JText::_('COM_MAILTO_CLOSE_WINDOW'); ?>
+			</span>
+		</a>
+	</div>
+	<form action="<?php echo JRoute::_('index.php?option=com_mailto&task=send'); ?>" method="post" class="form-validate form-horizontal well">
+		<fieldset>
+			<?php foreach ($this->form->getFieldset('') as $field) : ?>
+				<?php if (!$field->hidden) : ?>
+					<?php echo $field->renderField(); ?>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			<div class="control-group">
+				<div class="controls">
+					<button type="submit" class="btn btn-primary validate">
+						<?php echo JText::_('COM_MAILTO_SEND'); ?>
+					</button>
+					<button type="button" class="button" onclick="window.close();return false;">
+						<?php echo JText::_('COM_MAILTO_CANCEL'); ?>
+					</button>
+				</div>
+			</div>
+		</fieldset>
+		<input type="hidden" name="layout" value="<?php echo htmlspecialchars($this->getLayout(), ENT_COMPAT, 'UTF-8'); ?>" />
+		<input type="hidden" name="option" value="com_mailto" />
+		<input type="hidden" name="task" value="send" />
+		<input type="hidden" name="tmpl" value="component" />
+		<input type="hidden" name="link" value="<?php echo $this->link; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_mailto/views/mailto/view.html.php b/core/components/com_mailto/views/mailto/view.html.php
new file mode 100644
index 00000000..0514789e
--- /dev/null
+++ b/core/components/com_mailto/views/mailto/view.html.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Class for Mail.
+ *
+ * @since  1.5
+ */
+class MailtoViewMailto extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		$this->form = $this->get('Form');
+		$this->link = urldecode(JFactory::getApplication()->input->get('link', '', 'BASE64'));
+
+		return parent::display($tpl);
+	}
+}
diff --git a/core/components/com_mailto/views/sent/tmpl/default.php b/core/components/com_mailto/views/sent/tmpl/default.php
new file mode 100644
index 00000000..54ed86d0
--- /dev/null
+++ b/core/components/com_mailto/views/sent/tmpl/default.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div style="padding: 10px;">
+	<div style="text-align:right">
+		<a href="javascript: void window.close()">
+			<?php echo JText::_('COM_MAILTO_CLOSE_WINDOW'); ?> <?php echo JHtml::_('image', 'mailto/close-x.png', null, null, true); ?>
+		</a>
+	</div>
+	<h2>
+		<?php echo JText::_('COM_MAILTO_EMAIL_SENT'); ?>
+	</h2>
+</div>
diff --git a/core/components/com_mailto/views/sent/view.html.php b/core/components/com_mailto/views/sent/view.html.php
new file mode 100644
index 00000000..f9742086
--- /dev/null
+++ b/core/components/com_mailto/views/sent/view.html.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_mailto
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Class for email sent view.
+ *
+ * @since  1.5
+ */
+class MailtoViewSent extends JViewLegacy
+{
+}
diff --git a/core/components/com_media/media.php b/core/components/com_media/media.php
new file mode 100644
index 00000000..a1d4840b
--- /dev/null
+++ b/core/components/com_media/media.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load the com_media language files, default to the admin file and fall back to site if one isn't found
+$lang = JFactory::getLanguage();
+$lang->load('com_media', JPATH_ADMINISTRATOR, null, false, true)
+||	$lang->load('com_media', JPATH_SITE, null, false, true);
+
+// Hand processing over to the admin base file
+require_once JPATH_COMPONENT_ADMINISTRATOR . '/media.php';
diff --git a/core/components/com_menus/controller.php b/core/components/com_menus/controller.php
new file mode 100644
index 00000000..75cc962c
--- /dev/null
+++ b/core/components/com_menus/controller.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Menus manager master display controller.
+ *
+ * @since  3.7.0
+ */
+class MenusController extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *                          Recognized key values include 'name', 'default_task', 'model_path', and
+	 *                          'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($config = array())
+	{
+		$this->input = JFactory::getApplication()->input;
+
+		// Menus frontpage Editor Menu proxying:
+		if ($this->input->get('view') === 'items' && $this->input->get('layout') === 'modal')
+		{
+			JHtml::_('stylesheet', 'system/adminlist.css', array(), true);
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+
+		parent::__construct($config);
+	}
+}
diff --git a/core/components/com_menus/menus.php b/core/components/com_menus/menus.php
new file mode 100644
index 00000000..ce21b691
--- /dev/null
+++ b/core/components/com_menus/menus.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load the required admin language files
+$lang   = JFactory::getLanguage();
+$app    = JFactory::getApplication();
+
+if ($app->input->get('view') === 'items' && $app->input->get('layout') === 'modal')
+{
+	if (!JFactory::getUser()->authorise('core.create', 'com_menus'))
+	{
+		$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+
+		return;
+	}
+}
+
+$lang->load('joomla', JPATH_ADMINISTRATOR);
+$lang->load('com_menus', JPATH_ADMINISTRATOR);
+
+// Trigger the controller
+$controller = JControllerLegacy::getInstance('Menus');
+$controller->execute($app->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_menus/models/forms/filter_items.xml b/core/components/com_menus/models/forms/filter_items.xml
new file mode 100644
index 00000000..f6179f04
--- /dev/null
+++ b/core/components/com_menus/models/forms/filter_items.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_menus/models/fields" />
+		<fields name="filter">
+			<field
+				name="search"
+				type="text"
+				label="COM_MENUS_ITEMS_SEARCH_FILTER_LABEL"
+				description="COM_MENUS_ITEMS_SEARCH_FILTER"
+				hint="JSEARCH_FILTER"
+			/>
+			<field
+				name="published"
+				type="status"
+				label="COM_MENUS_FILTER_PUBLISHED"
+				description="COM_MENUS_FILTER_PUBLISHED_DESC"
+				filter="*,0,1,-2"
+				onchange="this.form.submit();"
+				>
+				<option value="">JOPTION_SELECT_PUBLISHED</option>
+			</field>
+			<field
+				name="access"
+				type="accesslevel"
+				label="JOPTION_FILTER_ACCESS"
+				description="JOPTION_FILTER_ACCESS_DESC"
+				onchange="this.form.submit();"
+				>
+				<option value="">JOPTION_SELECT_ACCESS</option>
+			</field>
+			<field
+				name="language"
+				type="contentlanguage"
+				label="JOPTION_FILTER_LANGUAGE"
+				description="JOPTION_FILTER_LANGUAGE_DESC"
+				onchange="this.form.submit();"
+				>
+				<option value="">JOPTION_SELECT_LANGUAGE</option>
+				<option value="*">JALL</option>
+			</field>
+			<field
+				name="level"
+				type="integer"
+				label="JOPTION_FILTER_LEVEL"
+				description="JOPTION_FILTER_LEVEL_DESC"
+				first="1"
+				last="10"
+				step="1"
+				languages="*"
+				onchange="this.form.submit();"
+				>
+				<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+			</field>
+		</fields>
+		<fields name="list">
+			<field
+				name="fullordering"
+				type="list"
+				label="JGLOBAL_SORT_BY"
+				description="JGLOBAL_SORT_BY"
+				statuses="*,0,1,2,-2"
+				onchange="this.form.submit();"
+				default="a.lft ASC"
+				>
+				<option value="">JGLOBAL_SORT_BY</option>
+				<option value="a.lft ASC">JGRID_HEADING_ORDERING_ASC</option>
+				<option value="a.lft DESC">JGRID_HEADING_ORDERING_DESC</option>
+				<option value="a.published ASC">JSTATUS_ASC</option>
+				<option value="a.published DESC">JSTATUS_DESC</option>
+				<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+				<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+				<option value="menutype_title ASC">COM_MENUS_HEADING_MENU_ASC</option>
+				<option value="menutype_title DESC">COM_MENUS_HEADING_MENU_DESC</option>
+				<option value="a.home ASC">COM_MENUS_HEADING_HOME_ASC</option>
+				<option value="a.home DESC">COM_MENUS_HEADING_HOME_DESC</option>
+				<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
+				<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
+				<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
+				<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
+				<option value="language ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+				<option value="language DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+				<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+				<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+			</field>
+			<field
+				name="limit"
+				type="limitbox"
+				label="COM_MENUS_LIST_LIMIT"
+				description="COM_MENUS_LIST_LIMIT_DESC"
+				class="input-mini"
+				default="25"
+				onchange="this.form.submit();"
+			/>
+		</fields>
+</form>
diff --git a/core/components/com_modules/controller.php b/core/components/com_modules/controller.php
new file mode 100644
index 00000000..f4f3fd49
--- /dev/null
+++ b/core/components/com_modules/controller.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Modules manager master display controller.
+ *
+ * @since  3.5
+ */
+class ModulesController extends JControllerLegacy
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *                          Recognized key values include 'name', 'default_task', 'model_path', and
+	 *                          'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.5
+	 */
+	public function __construct($config = array())
+	{
+		$this->input = JFactory::getApplication()->input;
+
+		// Modules frontpage Editor Module proxying:
+		if ($this->input->get('view') === 'modules' && $this->input->get('layout') === 'modal')
+		{
+			JHtml::_('stylesheet', 'system/adminlist.css', array('version' => 'auto', 'relative' => true));
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+
+		parent::__construct($config);
+	}
+}
diff --git a/core/components/com_modules/models/forms/filter_modules.xml b/core/components/com_modules/models/forms/filter_modules.xml
new file mode 100644
index 00000000..0d25444b
--- /dev/null
+++ b/core/components/com_modules/models/forms/filter_modules.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_modules/models/fields" />
+
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_MODULES_MODULES_FILTER_SEARCH_LABEL"
+			description="COM_MODULES_MODULES_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+			noresults="COM_MODULES_MSG_MANAGE_NO_MODULES"
+		/>
+		<field
+			name="position"
+			type="modulesposition"
+			label="COM_MODULES_FIELD_POSITION_LABEL"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_POSITION</option>
+		</field>
+		<field
+			name="module"
+			type="ModulesModule"
+			label="COM_MODULES_OPTION_SELECT_MODULE"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_MODULES_OPTION_SELECT_MODULE</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="JGLOBAL_SORT_BY"
+			description="JGLOBAL_SORT_BY"
+			statuses="*,0,1,-2"
+			onchange="this.form.submit();"
+			default="a.position ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="a.position ASC">COM_MODULES_HEADING_POSITION_ASC</option>
+			<option value="a.position DESC">COM_MODULES_HEADING_POSITION_DESC</option>
+			<option value="name ASC">COM_MODULES_HEADING_MODULE_ASC</option>
+			<option value="name DESC">COM_MODULES_HEADING_MODULE_DESC</option>
+			<option value="pages ASC">COM_MODULES_HEADING_PAGES_ASC</option>
+			<option value="pages DESC">COM_MODULES_HEADING_PAGES_DESC</option>
+			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="l.title ASC">JGRID_HEADING_LANGUAGE_ASC</option>
+			<option value="l.title DESC">JGRID_HEADING_LANGUAGE_DESC</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_MODULES_LIST_LIMIT"
+			description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/core/components/com_modules/modules.php b/core/components/com_modules/modules.php
new file mode 100644
index 00000000..f5dc59a3
--- /dev/null
+++ b/core/components/com_modules/modules.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_modules
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Load the required admin language files
+$lang   = JFactory::getLanguage();
+$app    = JFactory::getApplication();
+$config = array();
+$lang->load('joomla', JPATH_ADMINISTRATOR);
+$lang->load('com_modules', JPATH_ADMINISTRATOR);
+
+if ($app->input->get('view') === 'modules' && $app->input->get('layout') === 'modal')
+{
+	if (!JFactory::getUser()->authorise('core.create', 'com_modules'))
+	{
+		$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'warning');
+
+		return;
+	}
+}
+
+if ($app->input->get('task') === 'module.orderPosition')
+{
+	$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+}
+
+// Trigger the controller
+$controller = JControllerLegacy::getInstance('Modules', $config);
+$controller->execute($app->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_newsfeeds/controller.php b/core/components/com_newsfeeds/controller.php
new file mode 100644
index 00000000..5623a971
--- /dev/null
+++ b/core/components/com_newsfeeds/controller.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Newsfeeds Component Controller
+ *
+ * @since  1.5
+ */
+class NewsfeedsController extends JControllerLegacy
+{
+	/**
+	 * Method to show a newsfeeds view
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$cachable = true;
+
+		// Set the default view name and format from the Request.
+		$vName = $this->input->get('view', 'categories');
+		$this->input->set('view', $vName);
+
+		$user = JFactory::getUser();
+
+		if ($user->get('id') || ($this->input->getMethod() === 'POST' && $vName === 'category'))
+		{
+			$cachable = false;
+		}
+
+		$safeurlparams = array('id' => 'INT', 'limit' => 'UINT', 'limitstart' => 'UINT',
+								'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'lang' => 'CMD');
+
+		parent::display($cachable, $safeurlparams);
+	}
+}
diff --git a/core/components/com_newsfeeds/helpers/association.php b/core/components/com_newsfeeds/helpers/association.php
new file mode 100644
index 00000000..4f9197b7
--- /dev/null
+++ b/core/components/com_newsfeeds/helpers/association.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('NewsfeedsHelper', JPATH_ADMINISTRATOR . '/components/com_newsfeeds/helpers/newsfeeds.php');
+JLoader::register('NewsfeedsHelperRoute', JPATH_SITE . '/components/com_newsfeeds/helpers/route.php');
+JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php');
+
+/**
+ * Newsfeeds Component Association Helper
+ *
+ * @since  3.0
+ */
+abstract class NewsfeedsHelperAssociation extends CategoryHelperAssociation
+{
+	/**
+	 * Method to get the associations for a given item
+	 *
+	 * @param   integer  $id    Id of the item
+	 * @param   string   $view  Name of the view
+	 *
+	 * @return  array   Array of associations for the item
+	 *
+	 * @since  3.0
+	 */
+	public static function getAssociations($id = 0, $view = null)
+	{
+		$jinput = JFactory::getApplication()->input;
+		$view   = $view === null ? $jinput->get('view') : $view;
+		$id     = empty($id) ? $jinput->getInt('id') : $id;
+
+		if ($view === 'newsfeed')
+		{
+			if ($id)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_newsfeeds', '#__newsfeeds', 'com_newsfeeds.item', $id);
+
+				$return = array();
+
+				foreach ($associations as $tag => $item)
+				{
+					$return[$tag] = NewsfeedsHelperRoute::getNewsfeedRoute($item->id, (int) $item->catid, $item->language);
+				}
+
+				return $return;
+			}
+		}
+
+		if ($view === 'category' || $view === 'categories')
+		{
+			return self::getCategoryAssociations($id, 'com_newsfeeds');
+		}
+
+		return array();
+	}
+}
diff --git a/core/components/com_newsfeeds/helpers/category.php b/core/components/com_newsfeeds/helpers/category.php
new file mode 100644
index 00000000..2ab8ba3e
--- /dev/null
+++ b/core/components/com_newsfeeds/helpers/category.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Category Tree
+ *
+ * @since  1.6
+ */
+class NewsfeedsCategories extends JCategories
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  options
+	 */
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__newsfeeds';
+		$options['extension'] = 'com_newsfeeds';
+		$options['statefield'] = 'published';
+		parent::__construct($options);
+	}
+}
diff --git a/core/components/com_newsfeeds/helpers/legacyrouter.php b/core/components/com_newsfeeds/helpers/legacyrouter.php
new file mode 100644
index 00000000..d649f133
--- /dev/null
+++ b/core/components/com_newsfeeds/helpers/legacyrouter.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Legacy routing rules class from com_newsfeeds
+ *
+ * @since       3.6
+ * @deprecated  4.0
+ */
+class NewsfeedsRouterRulesLegacy implements JComponentRouterRulesInterface
+{
+	/**
+	 * Constructor for this legacy router
+	 *
+	 * @param   JComponentRouterAdvanced  $router  The router this rule belongs to
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function __construct($router)
+	{
+		$this->router = $router;
+	}
+
+	/**
+	 * Preprocess the route for the com_newsfeeds component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function preprocess(&$query)
+	{
+	}
+
+	/**
+	 * Build the route for the com_newsfeeds component
+	 *
+	 * @param   array  &$query     An array of URL arguments
+	 * @param   array  &$segments  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function build(&$query, &$segments)
+	{
+		// Get a menu item based on Itemid or currently active
+		$params = JComponentHelper::getParams('com_newsfeeds');
+		$advanced = $params->get('sef_advanced_link', 0);
+
+		if (empty($query['Itemid']))
+		{
+			$menuItem = $this->router->menu->getActive();
+		}
+		else
+		{
+			$menuItem = $this->router->menu->getItem($query['Itemid']);
+		}
+
+		$mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+		$mId   = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
+
+		if (isset($query['view']))
+		{
+			$view = $query['view'];
+
+			if (empty($menuItem) || $menuItem->component !== 'com_newsfeeds' || empty($query['Itemid']))
+			{
+				$segments[] = $query['view'];
+			}
+
+			unset($query['view']);
+		}
+
+		// Are we dealing with a newsfeed that is attached to a menu item?
+		if (isset($query['view'], $query['id']) && $mView == $query['view'] && $mId == (int) $query['id'])
+		{
+			unset($query['view'], $query['catid'], $query['id']);
+
+			return;
+		}
+
+		if (isset($view) && ($view === 'category' || $view === 'newsfeed'))
+		{
+			if ($mId != (int) $query['id'] || $mView != $view)
+			{
+				if ($view === 'newsfeed' && isset($query['catid']))
+				{
+					$catid = $query['catid'];
+				}
+				elseif (isset($query['id']))
+				{
+					$catid = $query['id'];
+				}
+
+				$menuCatid = $mId;
+				$categories = JCategories::getInstance('Newsfeeds');
+				$category = $categories->get($catid);
+
+				if ($category)
+				{
+					$path = $category->getPath();
+					$path = array_reverse($path);
+
+					$array = array();
+
+					foreach ($path as $id)
+					{
+						if ((int) $id === (int) $menuCatid)
+						{
+							break;
+						}
+
+						if ($advanced)
+						{
+							list($tmp, $id) = explode(':', $id, 2);
+						}
+
+						$array[] = $id;
+					}
+
+					$segments = array_merge($segments, array_reverse($array));
+				}
+
+				if ($view === 'newsfeed')
+				{
+					if ($advanced)
+					{
+						list($tmp, $id) = explode(':', $query['id'], 2);
+					}
+					else
+					{
+						$id = $query['id'];
+					}
+
+					$segments[] = $id;
+				}
+			}
+
+			unset($query['id'], $query['catid']);
+		}
+
+		if (isset($query['layout']))
+		{
+			if (!empty($query['Itemid']) && isset($menuItem->query['layout']))
+			{
+				if ($query['layout'] == $menuItem->query['layout'])
+				{
+					unset($query['layout']);
+				}
+			}
+			else
+			{
+				if ($query['layout'] === 'default')
+				{
+					unset($query['layout']);
+				}
+			}
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 * @param   array  &$vars      The URL attributes to be used by the application.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function parse(&$segments, &$vars)
+	{
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// Get the active menu item.
+		$item	= $this->router->menu->getActive();
+		$params = JComponentHelper::getParams('com_newsfeeds');
+		$advanced = $params->get('sef_advanced_link', 0);
+
+		// Count route segments
+		$count = count($segments);
+
+		// Standard routing for newsfeeds.
+		if (!isset($item))
+		{
+			$vars['view'] = $segments[0];
+			$vars['id']   = $segments[$count - 1];
+
+			return;
+		}
+
+		// From the categories view, we can only jump to a category.
+		$id = (isset($item->query['id']) && $item->query['id'] > 1) ? $item->query['id'] : 'root';
+		$categories = JCategories::getInstance('Newsfeeds')->get($id)->getChildren();
+		$vars['catid'] = $id;
+		$vars['id'] = $id;
+		$found = 0;
+
+		foreach ($segments as $segment)
+		{
+			$segment = $advanced ? str_replace(':', '-', $segment) : $segment;
+
+			foreach ($categories as $category)
+			{
+				if ($category->slug == $segment || $category->alias == $segment)
+				{
+					$vars['id'] = $category->id;
+					$vars['catid'] = $category->id;
+					$vars['view'] = 'category';
+					$categories = $category->getChildren();
+					$found = 1;
+					break;
+				}
+			}
+
+			if ($found == 0)
+			{
+				if ($advanced)
+				{
+					$db = JFactory::getDbo();
+					$query = $db->getQuery(true)
+						->select($db->quoteName('id'))
+						->from('#__newsfeeds')
+						->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
+						->where($db->quoteName('alias') . ' = ' . $db->quote($segment));
+					$db->setQuery($query);
+					$nid = $db->loadResult();
+				}
+				else
+				{
+					$nid = $segment;
+				}
+
+				$vars['id'] = $nid;
+				$vars['view'] = 'newsfeed';
+			}
+
+			$found = 0;
+		}
+	}
+}
diff --git a/core/components/com_newsfeeds/helpers/route.php b/core/components/com_newsfeeds/helpers/route.php
new file mode 100644
index 00000000..854fdbd6
--- /dev/null
+++ b/core/components/com_newsfeeds/helpers/route.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Newsfeeds Component Route Helper
+ *
+ * @since  1.5
+ */
+abstract class NewsfeedsHelperRoute
+{
+	/**
+	 * getNewsfeedRoute
+	 *
+	 * @param   int  $id        menu itemid
+	 * @param   int  $catid     category id
+	 * @param   int  $language  language
+	 *
+	 * @return string
+	 */
+	public static function getNewsfeedRoute($id, $catid, $language = 0)
+	{
+		// Create the link
+		$link = 'index.php?option=com_newsfeeds&view=newsfeed&id=' . $id;
+
+		if ((int) $catid > 1)
+		{
+			$link .= '&catid=' . $catid;
+		}
+
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
+		{
+			$link .= '&lang=' . $language;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * getCategoryRoute
+	 *
+	 * @param   int  $catid     category id
+	 * @param   int  $language  language
+	 *
+	 * @return string
+	 */
+	public static function getCategoryRoute($catid, $language = 0)
+	{
+		if ($catid instanceof JCategoryNode)
+		{
+			$id = $catid->id;
+		}
+		else
+		{
+			$id = (int) $catid;
+		}
+
+		if ($id < 1)
+		{
+			$link = '';
+		}
+		else
+		{
+			// Create the link
+			$link = 'index.php?option=com_newsfeeds&view=category&id=' . $id;
+
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
+			{
+				$link .= '&lang=' . $language;
+			}
+		}
+
+		return $link;
+	}
+}
diff --git a/core/components/com_newsfeeds/models/categories.php b/core/components/com_newsfeeds/models/categories.php
new file mode 100644
index 00000000..eb7043cf
--- /dev/null
+++ b/core/components/com_newsfeeds/models/categories.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * This models supports retrieving lists of newsfeed categories.
+ *
+ * @since  1.6
+ */
+class NewsfeedsModelCategories extends JModelList
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_newsfeeds.categories';
+
+	/**
+	 * The category context (allows other extensions to derived from this model).
+	 *
+	 * @var		string
+	 */
+	protected $_extension = 'com_newsfeeds';
+
+	private $_parent = null;
+
+	private $_items = null;
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field
+	 * @param   string  $direction  An optional direction [asc|desc]
+	 *
+	 * @return void
+	 *
+	 * @throws Exception
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$this->setState('filter.extension', $this->_extension);
+
+		// Get the parent id if defined.
+		$parentId = $app->input->getInt('id');
+		$this->setState('filter.parentId', $parentId);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('filter.published',	1);
+		$this->setState('filter.access',	true);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('filter.extension');
+		$id .= ':' . $this->getState('filter.published');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.parentId');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * redefine the function an add some properties to make the styling more easy
+	 *
+	 * @return mixed An array of data items on success, false on failure.
+	 */
+	public function getItems()
+	{
+		if ($this->_items === null)
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_items_cat', 1) || !$params->get('show_empty_categories_cat', 0);
+			$categories = JCategories::getInstance('Newsfeeds', $options);
+			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
+			if (is_object($this->_parent))
+			{
+				$this->_items = $this->_parent->getChildren();
+			}
+			else
+			{
+				$this->_items = false;
+			}
+		}
+
+		return $this->_items;
+	}
+
+	/**
+	 * get the Parent
+	 *
+	 * @return null
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_parent))
+		{
+			$this->getItems();
+		}
+
+		return $this->_parent;
+	}
+}
diff --git a/core/components/com_newsfeeds/models/category.php b/core/components/com_newsfeeds/models/category.php
new file mode 100644
index 00000000..5b11a33d
--- /dev/null
+++ b/core/components/com_newsfeeds/models/category.php
@@ -0,0 +1,378 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Newsfeeds Component Category Model
+ *
+ * @since  1.5
+ */
+class NewsfeedsModelCategory extends JModelList
+{
+	/**
+	 * Category items data
+	 *
+	 * @var array
+	 */
+	protected $_item = null;
+
+	protected $_articles = null;
+
+	protected $_siblings = null;
+
+	protected $_children = null;
+
+	protected $_parent = null;
+
+	/**
+	 * The category that applies.
+	 *
+	 * @access    protected
+	 * @var        object
+	 */
+	protected $_category = null;
+
+	/**
+	 * The list of other newfeed categories.
+	 *
+	 * @access    protected
+	 * @var        array
+	 */
+	protected $_categories = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'name', 'a.name',
+				'numarticles', 'a.numarticles',
+				'link', 'a.link',
+				'ordering', 'a.ordering',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get a list of items.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		// Invoke the parent getItems method to get the main list
+		$items = parent::getItems();
+
+		// Convert the params field into an object, saving original in _params
+		foreach ($items as $item)
+		{
+			if (!isset($this->_params))
+			{
+				$params = new Registry;
+				$item->params = $params;
+				$params->loadString($item->params);
+			}
+
+			// Some contexts may not use tags data at all, so we allow callers to disable loading tag data
+			if ($this->getState('load_tags', true))
+			{
+				$item->tags = new JHelperTags;
+				$item->tags->getItemTags('com_newsfeeds.newsfeed', $item->id);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return  string    An SQL query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$user = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select required fields from the categories.
+		$query->select($this->getState('list.select', 'a.*'))
+			->from($db->quoteName('#__newsfeeds') . ' AS a')
+			->where('a.access IN (' . $groups . ')');
+
+		// Filter by category.
+		if ($categoryId = $this->getState('category.id'))
+		{
+			$query->where('a.catid = ' . (int) $categoryId)
+				->join('LEFT', '#__categories AS c ON c.id = a.catid')
+				->where('c.access IN (' . $groups . ')');
+		}
+
+		// Filter by state
+		$state = $this->getState('filter.published');
+
+		if (is_numeric($state))
+		{
+			$query->where('a.published = ' . (int) $state);
+		}
+		else
+		{
+			$query->where('(a.published IN (0,1,2))');
+		}
+
+		// Filter by start and end dates.
+		$nullDate = $db->quote($db->getNullDate());
+		$date = JFactory::getDate();
+		$nowDate = $db->quote($date->format($db->getDateFormat()));
+
+		if ($this->getState('filter.publish_date'))
+		{
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+		}
+
+		// Filter by search in title
+		$search = $this->getState('list.filter');
+
+		if (!empty($search))
+		{
+			$search = $db->quote('%' . $db->escape($search, true) . '%');
+			$query->where('(a.name LIKE ' . $search . ')');
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field
+	 * @param   string  $direction  An optional direction [asc|desc]
+	 *
+	 * @return void
+	 *
+	 * @since   1.6
+	 *
+	 * @throws Exception
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$params = JComponentHelper::getParams('com_newsfeeds');
+
+		// List state information
+		$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
+		$this->setState('list.limit', $limit);
+
+		$limitstart = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $limitstart);
+
+		// Optional filter text
+		$this->setState('list.filter', $app->input->getString('filter-search'));
+
+		$orderCol = $app->input->get('filter_order', 'ordering');
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'ordering';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$id = $app->input->get('id', 0, 'int');
+		$this->setState('category.id', $id);
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_newsfeeds')) && (!$user->authorise('core.edit', 'com_newsfeeds')))
+		{
+			// Limit to published for people who can't edit or edit.state.
+			$this->setState('filter.published', 1);
+
+			// Filter by start and end dates.
+			$this->setState('filter.publish_date', true);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to get category data for the current category
+	 *
+	 * @return  object
+	 *
+	 * @since   1.5
+	 */
+	public function getCategory()
+	{
+		if (!is_object($this->_item))
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_items', 1) || $params->get('show_empty_categories', 0);
+			$categories = JCategories::getInstance('Newsfeeds', $options);
+			$this->_item = $categories->get($this->getState('category.id', 'root'));
+
+			if (is_object($this->_item))
+			{
+				$this->_children = $this->_item->getChildren();
+				$this->_parent = false;
+
+				if ($this->_item->getParent())
+				{
+					$this->_parent = $this->_item->getParent();
+				}
+
+				$this->_rightsibling = $this->_item->getSibling();
+				$this->_leftsibling = $this->_item->getSibling(false);
+			}
+			else
+			{
+				$this->_children = false;
+				$this->_parent = false;
+			}
+		}
+
+		return $this->_item;
+	}
+
+	/**
+	 * Get the parent category.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_parent;
+	}
+
+	/**
+	 * Get the sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getLeftSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_leftsibling;
+	}
+
+	/**
+	 * Get the sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getRightSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_rightsibling;
+	}
+
+	/**
+	 * Get the child categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 */
+	public function &getChildren()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Increment the hit counter for the category.
+	 *
+	 * @param   int  $pk  Optional primary key of the category to increment.
+	 *
+	 * @return  boolean True if successful; false otherwise and internal error set.
+	 */
+	public function hit($pk = 0)
+	{
+		$input    = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk    = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
+			$table = JTable::getInstance('Category', 'JTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_newsfeeds/models/newsfeed.php b/core/components/com_newsfeeds/models/newsfeed.php
new file mode 100644
index 00000000..0c469ac1
--- /dev/null
+++ b/core/components/com_newsfeeds/models/newsfeed.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Newsfeeds Component Newsfeed Model
+ *
+ * @since  1.5
+ */
+class NewsfeedsModelNewsfeed extends JModelItem
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 * @since   1.6
+	 */
+	protected $_context = 'com_newsfeeds.newsfeed';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('site');
+
+		// Load state from the request.
+		$pk = $app->input->getInt('id');
+		$this->setState('newsfeed.id', $pk);
+
+		$offset = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.offset', $offset);
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_newsfeeds')) && (!$user->authorise('core.edit', 'com_newsfeeds')))
+		{
+			$this->setState('filter.published', 1);
+			$this->setState('filter.archived', 2);
+		}
+	}
+
+	/**
+	 * Method to get newsfeed data.
+	 *
+	 * @param   integer  $pk  The id of the newsfeed.
+	 *
+	 * @return  mixed  Menu item data object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function &getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('newsfeed.id');
+
+		if ($this->_item === null)
+		{
+			$this->_item = array();
+		}
+
+		if (!isset($this->_item[$pk]))
+		{
+			try
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select($this->getState('item.select', 'a.*'))
+					->from('#__newsfeeds AS a');
+
+				// Join on category table.
+				$query->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access')
+					->join('LEFT', '#__categories AS c on c.id = a.catid');
+
+				// Join on user table.
+				$query->select('u.name AS author')
+					->join('LEFT', '#__users AS u on u.id = a.created_by');
+
+				// Join over the categories to get parent category titles
+				$query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
+					->join('LEFT', '#__categories as parent ON parent.id = c.parent_id')
+
+					->where('a.id = ' . (int) $pk);
+
+				// Filter by start and end dates.
+				$nullDate = $db->quote($db->getNullDate());
+				$nowDate = $db->quote(JFactory::getDate()->toSql());
+
+				// Filter by published state.
+				$published = $this->getState('filter.published');
+				$archived = $this->getState('filter.archived');
+
+				if (is_numeric($published))
+				{
+					$query->where('(a.published = ' . (int) $published . ' OR a.published =' . (int) $archived . ')')
+						->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+						->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')')
+						->where('(c.published = ' . (int) $published . ' OR c.published =' . (int) $archived . ')');
+				}
+
+				$db->setQuery($query);
+
+				$data = $db->loadObject();
+
+				if (empty($data))
+				{
+					JError::raiseError(404, JText::_('COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND'));
+				}
+
+				// Check for published state if filter set.
+
+				if ((is_numeric($published) || is_numeric($archived)) && $data->published != $published && $data->published != $archived)
+				{
+					JError::raiseError(404, JText::_('COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND'));
+				}
+
+				// Convert parameter fields to objects.
+				$registry = new Registry($data->params);
+				$data->params = clone $this->getState('params');
+				$data->params->merge($registry);
+
+				$data->metadata = new Registry($data->metadata);
+
+				// Compute access permissions.
+
+				if ($access = $this->getState('filter.access'))
+				{
+					// If the access filter has been set, we already know this user can view.
+					$data->params->set('access-view', true);
+				}
+				else
+				{
+					// If no access filter is set, the layout takes some responsibility for display of limited information.
+					$user   = JFactory::getUser();
+					$groups = $user->getAuthorisedViewLevels();
+					$data->params->set('access-view', in_array($data->access, $groups) && in_array($data->category_access, $groups));
+				}
+
+				$this->_item[$pk] = $data;
+			}
+			catch (Exception $e)
+			{
+				$this->setError($e);
+				$this->_item[$pk] = false;
+			}
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Increment the hit counter for the newsfeed.
+	 *
+	 * @param   int  $pk  Optional primary key of the item to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 *
+	 * @since   3.0
+	 */
+	public function hit($pk = 0)
+	{
+		$input = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('newsfeed.id');
+
+			$table = JTable::getInstance('Newsfeed', 'NewsfeedsTable');
+			$table->load($pk);
+			$table->hit($pk);
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_newsfeeds/newsfeeds.php b/core/components/com_newsfeeds/newsfeeds.php
new file mode 100644
index 00000000..d9a18893
--- /dev/null
+++ b/core/components/com_newsfeeds/newsfeeds.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('NewsfeedsHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
+JTable::addIncludePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
+
+$controller = JControllerLegacy::getInstance('Newsfeeds');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_newsfeeds/router.php b/core/components/com_newsfeeds/router.php
new file mode 100644
index 00000000..fb310db6
--- /dev/null
+++ b/core/components/com_newsfeeds/router.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_newsfeeds
+ *
+ * @since  3.3
+ */
+class NewsfeedsRouter extends JComponentRouterView
+{
+	protected $noIDs = false;
+
+	/**
+	 * Newsfeeds Component router constructor
+	 *
+	 * @param   JApplicationCms  $app   The application object
+	 * @param   JMenu            $menu  The menu object to work with
+	 */
+	public function __construct($app = null, $menu = null)
+	{
+		$params = JComponentHelper::getParams('com_newsfeeds');
+		$this->noIDs = (bool) $params->get('sef_ids');
+		$categories = new JComponentRouterViewconfiguration('categories');
+		$categories->setKey('id');
+		$this->registerView($categories);
+		$category = new JComponentRouterViewconfiguration('category');
+		$category->setKey('id')->setParent($categories, 'catid')->setNestable();
+		$this->registerView($category);
+		$newsfeed = new JComponentRouterViewconfiguration('newsfeed');
+		$newsfeed->setKey('id')->setParent($category, 'catid');
+		$this->registerView($newsfeed);
+
+		parent::__construct($app, $menu);
+
+		$this->attachRule(new JComponentRouterRulesMenu($this));
+
+		if ($params->get('sef_advanced', 0))
+		{
+			$this->attachRule(new JComponentRouterRulesStandard($this));
+			$this->attachRule(new JComponentRouterRulesNomenu($this));
+		}
+		else
+		{
+			JLoader::register('NewsfeedsRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
+			$this->attachRule(new NewsfeedsRouterRulesLegacy($this));
+		}
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $id     ID of the category to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getCategorySegment($id, $query)
+	{
+		$category = JCategories::getInstance($this->getName())->get($id);
+
+		if ($category)
+		{
+			$path = array_reverse($category->getPath(), true);
+			$path[0] = '1:root';
+
+			if ($this->noIDs)
+			{
+				foreach ($path as &$segment)
+				{
+					list($id, $segment) = explode(':', $segment, 2);
+				}
+			}
+
+			return $path;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $id     ID of the category to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getCategoriesSegment($id, $query)
+	{
+		return $this->getCategorySegment($id, $query);
+	}
+
+	/**
+	 * Method to get the segment(s) for a newsfeed
+	 *
+	 * @param   string  $id     ID of the newsfeed to retrieve the segments for
+	 * @param   array   $query  The request that is built right now
+	 *
+	 * @return  array|string  The segments of this item
+	 */
+	public function getNewsfeedSegment($id, $query)
+	{
+		if (!strpos($id, ':'))
+		{
+			$db = JFactory::getDbo();
+			$dbquery = $db->getQuery(true);
+			$dbquery->select($dbquery->qn('alias'))
+				->from($dbquery->qn('#__newsfeeds'))
+				->where('id = ' . $dbquery->q((int) $id));
+			$db->setQuery($dbquery);
+
+			$id .= ':' . $db->loadResult();
+		}
+
+		if ($this->noIDs)
+		{
+			list($void, $segment) = explode(':', $id, 2);
+
+			return array($void => $segment);
+		}
+
+		return array((int) $id => $id);
+	}
+
+	/**
+	 * Method to get the id for a category
+	 *
+	 * @param   string  $segment  Segment to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getCategoryId($segment, $query)
+	{
+		if (isset($query['id']))
+		{
+			$category = JCategories::getInstance($this->getName(), array('access' => false))->get($query['id']);
+
+			if ($category)
+			{
+				foreach ($category->getChildren() as $child)
+				{
+					if ($this->noIDs)
+					{
+						if ($child->alias === $segment)
+						{
+							return $child->id;
+						}
+					}
+					else
+					{
+						if ($child->id == (int) $segment)
+						{
+							return $child->id;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get the segment(s) for a category
+	 *
+	 * @param   string  $segment  Segment to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getCategoriesId($segment, $query)
+	{
+		return $this->getCategoryId($segment, $query);
+	}
+
+	/**
+	 * Method to get the segment(s) for a newsfeed
+	 *
+	 * @param   string  $segment  Segment of the newsfeed to retrieve the ID for
+	 * @param   array   $query    The request that is parsed right now
+	 *
+	 * @return  mixed   The id of this item or false
+	 */
+	public function getNewsfeedId($segment, $query)
+	{
+		if ($this->noIDs)
+		{
+			$db = JFactory::getDbo();
+			$dbquery = $db->getQuery(true);
+			$dbquery->select($dbquery->qn('id'))
+				->from($dbquery->qn('#__newsfeeds'))
+				->where('alias = ' . $dbquery->q($segment))
+				->where('catid = ' . $dbquery->q($query['id']));
+			$db->setQuery($dbquery);
+
+			return (int) $db->loadResult();
+		}
+
+		return (int) $segment;
+	}
+}
+
+/**
+ * newsfeedsBuildRoute
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  The segments of the URL to parse.
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function newsfeedsBuildRoute(&$query)
+{
+	$app = JFactory::getApplication();
+	$router = new NewsfeedsRouter($app, $app->getMenu());
+
+	return $router->build($query);
+}
+
+/**
+ * newsfeedsParseRoute
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function newsfeedsParseRoute($segments)
+{
+	$app = JFactory::getApplication();
+	$router = new NewsfeedsRouter($app, $app->getMenu());
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_newsfeeds/views/categories/tmpl/default.php b/core/components/com_newsfeeds/views/categories/tmpl/default.php
new file mode 100644
index 00000000..76b142fe
--- /dev/null
+++ b/core/components/com_newsfeeds/views/categories/tmpl/default.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+JHtml::_('behavior.core');
+
+// Add strings for translations in Javascript.
+JText::script('JGLOBAL_EXPAND_CATEGORIES');
+JText::script('JGLOBAL_COLLAPSE_CATEGORIES');
+
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(function($) {
+	$('.categories-list').find('[id^=category-btn-]').each(function(index, btn) {
+		var btn = $(btn);
+		btn.on('click', function() {
+			btn.find('span').toggleClass('icon-plus');
+			btn.find('span').toggleClass('icon-minus');
+			if (btn.attr('aria-label') === Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES'))
+			{
+				btn.attr('aria-label', Joomla.JText._('JGLOBAL_COLLAPSE_CATEGORIES'));
+			} else {
+				btn.attr('aria-label', Joomla.JText._('JGLOBAL_EXPAND_CATEGORIES'));
+			}			
+		});
+	});
+});");
+
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx; ?>">
+	<?php echo JLayoutHelper::render('joomla.content.categories_default', $this); ?>
+	<?php echo $this->loadTemplate('items'); ?>
+</div>
diff --git a/core/components/com_newsfeeds/views/categories/tmpl/default.xml b/core/components/com_newsfeeds/views/categories/tmpl/default.xml
new file mode 100644
index 00000000..90b6712b
--- /dev/null
+++ b/core/components/com_newsfeeds/views/categories/tmpl/default.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_NEWSFEEDS_CATEGORIES_VIEW_DEFAULT_TITLE" option="COM_NEWSFEEDS_CATEGORIES_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORIES"
+		/>
+		<message>
+			<![CDATA[COM_NEWSFEEDS_CATEGORIES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+		>
+			<field 
+				name="id" 
+				type="category"
+				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
+				description="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC"
+				extension="com_newsfeeds"
+				show_root="true"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+			<field 
+				name="show_base_description" 
+				type="list"
+				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+				description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="categories_description" 
+				type="textarea"
+				label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+				description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
+				cols="25"
+				rows="5"
+			/>
+
+			<field 
+				name="maxLevelcat" 
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories_cat" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc_cat" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_items_cat" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="show_category_title" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description_image" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="maxLevel" 
+				type="list"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_items"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
+				id="show_cat_items"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+			<field 
+				name="spacer1" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="hide">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination_limit"
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_headings"
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				id="show_headings"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_articles"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL"
+				description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC"
+				id="show_articles"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_link"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC"
+				id="show_link"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination"
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+		<fieldset name="newsfeed" label="COM_NEWSFEEDS_FIELDSET_MORE_OPTIONS_LABEL">
+
+			<field 
+				name="show_feed_image" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_feed_description" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_description" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="feed_character_count" 
+				type="number"
+				label="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_LABEL"
+				description="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC"
+				size="6"
+				useglobal="true"
+			/>
+		</fieldset>
+
+	</fields>
+</metadata>
diff --git a/core/components/com_newsfeeds/views/categories/tmpl/default_items.php b/core/components/com_newsfeeds/views/categories/tmpl/default_items.php
new file mode 100644
index 00000000..7e53aadf
--- /dev/null
+++ b/core/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+?>
+<?php $class = ' class="first"'; ?>
+<?php if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) : ?>
+	<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+		<?php if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) : ?>
+			<?php if (!isset($this->items[$this->parent->id][$id + 1])) : ?>
+				<?php $class = ' class="last"'; ?>
+			<?php endif; ?>
+			<div<?php echo $class; ?>>
+				<?php $class = ''; ?>
+				<h3 class="page-header item-title">
+					<a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($item->id, $item->language)); ?>">
+						<?php echo $this->escape($item->title); ?>
+					</a>
+					<?php if ($this->params->get('show_cat_items_cat') == 1) : ?>
+						<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_NEWSFEEDS_NUM_ITEMS'); ?>">
+							<?php echo JText::_('COM_NEWSFEEDS_NUM_ITEMS'); ?>&nbsp;
+							<?php echo $item->numitems; ?>
+						</span>
+					<?php endif; ?>
+					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+						<a id="category-btn-<?php echo $item->id; ?>" href="#category-<?php echo $item->id; ?>"
+							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right" aria-label="<?php echo JText::_('JGLOBAL_EXPAND_CATEGORIES'); ?>">
+							<span class="icon-plus" aria-hidden="true"></span>
+						</a>
+					<?php endif; ?>
+				</h3>
+				<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
+					<?php if ($item->description) : ?>
+						<div class="category-desc">
+							<?php echo JHtml::_('content.prepare', $item->description, '', 'com_newsfeeds.categories'); ?>
+						</div>
+					<?php endif; ?>
+				<?php endif; ?>
+				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+					<div class="collapse fade" id="category-<?php echo $item->id; ?>">
+						<?php $this->items[$item->id] = $item->getChildren(); ?>
+						<?php $this->parent = $item; ?>
+						<?php $this->maxLevelcat--; ?>
+						<?php echo $this->loadTemplate('items'); ?>
+						<?php $this->parent = $item->getParent(); ?>
+						<?php $this->maxLevelcat++; ?>
+					</div>
+				<?php endif; ?>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>
diff --git a/core/components/com_newsfeeds/views/categories/view.html.php b/core/components/com_newsfeeds/views/categories/view.html.php
new file mode 100644
index 00000000..d7430860
--- /dev/null
+++ b/core/components/com_newsfeeds/views/categories/view.html.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content categories view.
+ *
+ * @since  1.5
+ */
+class NewsfeedsViewCategories extends JViewCategories
+{
+	/**
+	 * Language key for default page heading
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $pageHeading = 'COM_NEWSFEEDS_DEFAULT_PAGE_TITLE';
+
+	/**
+	 * @var    string  The name of the extension for the category
+	 * @since  3.2
+	 */
+	protected $extension = 'com_newsfeeds';
+}
diff --git a/core/components/com_newsfeeds/views/category/tmpl/default.php b/core/components/com_newsfeeds/views/category/tmpl/default.php
new file mode 100644
index 00000000..679246c1
--- /dev/null
+++ b/core/components/com_newsfeeds/views/category/tmpl/default.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+JHtml::_('formbehavior.chosen', 'select');
+
+$pageClass = $this->params->get('pageclass_sfx');
+
+?>
+<div class="newsfeed-category<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_category_title', 1)) : ?>
+		<h2>
+			<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_newsfeeds.category.title'); ?>
+		</h2>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_tags', 1) && !empty($this->category->tags->itemTags)) : ?>
+		<?php $this->category->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+		<?php echo $this->category->tagLayout->render($this->category->tags->itemTags); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+		<div class="category-desc">
+			<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+				<img src="<?php echo $this->category->getParams()->get('image'); ?>" />
+			<?php endif; ?>
+			<?php if ($this->params->get('show_description') && $this->category->description) : ?>
+				<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_newsfeeds.category'); ?>
+			<?php endif; ?>
+			<div class="clr"></div>
+		</div>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('items'); ?>
+	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
+		<div class="cat-children">
+			<h3>
+				<?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
+			</h3>
+			<?php echo $this->loadTemplate('children'); ?>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/components/com_newsfeeds/views/category/tmpl/default.xml b/core/components/com_newsfeeds/views/category/tmpl/default.xml
new file mode 100644
index 00000000..617a5789
--- /dev/null
+++ b/core/components/com_newsfeeds/views/category/tmpl/default.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_NEWSFEEDS_CATEGORY_VIEW_DEFAULT_TITLE" option="COM_NEWSFEEDS_CATEGORY_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_NEWSFEED_CATEGORY"
+		/>
+		<message>
+			<![CDATA[COM_NEWSFEEDS_CATEGORY_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request"
+		addfieldpath="/administrator/components/com_categories/models/fields"
+	>
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_newsfeeds/models/fields"
+		 >
+			<field
+				name="id"
+				type="modal_category"
+				label="JCATEGORY"
+				description="COM_NEWSFEEDS_FIELD_SELECT_CATEGORY_DESC"
+				extension="com_newsfeeds"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+	<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+		<field 
+			name="spacer1" 
+			type="spacer" 
+			label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+			class="text"
+			/>
+
+			<field 
+				name="show_category_title" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_description_image" 
+				type="list"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="maxLevel" 
+				type="list"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				useglobal="true"
+				>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field 
+				name="show_empty_categories" 
+				type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_subcat_desc" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_cat_items"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"
+				id="show_cat_items"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"				
+				>
+				<option value="hide">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination_limit"
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_headings"
+				type="list"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				id="show_headings"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_articles"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_LABEL"
+				description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC"
+				id="show_articles"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_link"
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_LINKS_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC"
+				id="show_link"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination"
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field
+				name="show_pagination_results"
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="newsfeed" label="COM_NEWSFEEDS_FIELDSET_MORE_OPTIONS_LABEL">
+
+			<field 
+				name="show_feed_image" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_feed_description" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_description" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="feed_character_count" 
+				type="number"
+				description="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC"
+				label="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_LABEL"
+				size="6"
+				useglobal="true"
+			/>
+			
+			<field 
+				name="feed_display_order" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
+				description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="asc">JGLOBAL_OLDEST_FIRST</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_newsfeeds/views/category/tmpl/default_children.php b/core/components/com_newsfeeds/views/category/tmpl/default_children.php
new file mode 100644
index 00000000..0b4bfcda
--- /dev/null
+++ b/core/components/com_newsfeeds/views/category/tmpl/default_children.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php $class = ' class="first"'; ?>
+<?php if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?>
+	<ul>
+		<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+			<?php if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) : ?>
+				<?php if (!isset($this->children[$this->category->id][$id + 1])) : ?>
+					<?php $class = ' class="last"'; ?>
+				<?php endif; ?>
+				<li<?php echo $class; ?>>
+					<?php $class = ''; ?>
+					<span class="item-title">
+						<a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($child->id)); ?>">
+							<?php echo $this->escape($child->title); ?>
+						</a>
+					</span>
+					<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+						<?php if ($child->description) : ?>
+							<div class="category-desc">
+								<?php echo JHtml::_('content.prepare', $child->description, '', 'com_newsfeeds.category'); ?>
+							</div>
+						<?php endif; ?>
+					<?php endif; ?>
+					<?php if ($this->params->get('show_cat_items') == 1) : ?>
+						<dl class="newsfeed-count">
+							<dt>
+								<?php echo JText::_('COM_NEWSFEEDS_CAT_NUM'); ?>
+							</dt>
+							<dd>
+								<?php echo $child->numitems; ?>
+							</dd>
+						</dl>
+					<?php endif; ?>
+					<?php if (count($child->getChildren()) > 0) : ?>
+						<?php $this->children[$child->id] = $child->getChildren(); ?>
+						<?php $this->category = $child; ?>
+						<?php $this->maxLevel--; ?>
+						<?php echo $this->loadTemplate('children'); ?>
+						<?php $this->category = $child->getParent(); ?>
+						<?php $this->maxLevel++; ?>
+					<?php endif; ?>
+				</li>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/core/components/com_newsfeeds/views/category/tmpl/default_items.php b/core/components/com_newsfeeds/views/category/tmpl/default_items.php
new file mode 100644
index 00000000..a67accdb
--- /dev/null
+++ b/core/components/com_newsfeeds/views/category/tmpl/default_items.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$n         = count($this->items);
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+?>
+<?php if (empty($this->items)) : ?>
+	<p><?php echo JText::_('COM_NEWSFEEDS_NO_ARTICLES'); ?></p>
+<?php else : ?>
+	<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
+		<?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
+			<fieldset class="filters btn-toolbar">
+				<?php if ($this->params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
+					<div class="btn-group">
+						<label class="filter-search-lbl element-invisible" for="filter-search">
+							<span class="label label-warning">
+								<?php echo JText::_('JUNPUBLISHED'); ?>
+							</span>
+							<?php echo JText::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?>
+						</label>
+						<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" />
+					</div>
+				<?php endif; ?>
+				<?php if ($this->params->get('show_pagination_limit')) : ?>
+					<div class="btn-group pull-right">
+						<label for="limit" class="element-invisible">
+							<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+						</label>
+						<?php echo $this->pagination->getLimitBox(); ?>
+					</div>
+				<?php endif; ?>
+			</fieldset>
+		<?php endif; ?>
+		<ul class="category list-striped list-condensed">
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php if ($this->items[$i]->published == 0) : ?>
+					<li class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+				<?php else : ?>
+					<li class="cat-list-row<?php echo $i % 2; ?>">
+				<?php endif; ?>
+				<?php if ($this->params->get('show_articles')) : ?>
+					<span class="list-hits badge badge-info pull-right">
+						<?php echo JText::sprintf('COM_NEWSFEEDS_NUM_ARTICLES_COUNT', $item->numarticles); ?>
+					</span>
+				<?php endif; ?>
+				<span class="list pull-left">
+					<div class="list-title">
+						<a href="<?php echo JRoute::_(NewsFeedsHelperRoute::getNewsfeedRoute($item->slug, $item->catid)); ?>">
+							<?php echo $item->name; ?>
+						</a>
+					</div>
+				</span>
+				<?php if ($this->items[$i]->published == 0) : ?>
+					<span class="label label-warning">
+						<?php echo JText::_('JUNPUBLISHED'); ?>
+					</span>
+				<?php endif; ?>
+				<br />
+				<?php if ($this->params->get('show_link')) : ?>
+					<?php $link = JStringPunycode::urlToUTF8($item->link); ?>
+					<span class="list pull-left">
+						<a href="<?php echo $item->link; ?>">
+							<?php echo $link; ?>
+						</a>
+					</span>
+					<br />
+				<?php endif; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+		<?php // Add pagination links ?>
+		<?php if (!empty($this->items)) : ?>
+			<?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+				<div class="pagination">
+					<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+						<p class="counter pull-right">
+							<?php echo $this->pagination->getPagesCounter(); ?>
+						</p>
+					<?php endif; ?>
+					<?php echo $this->pagination->getPagesLinks(); ?>
+				</div>
+			<?php endif; ?>
+		<?php endif; ?>
+	</form>
+<?php endif; ?>
diff --git a/core/components/com_newsfeeds/views/category/view.html.php b/core/components/com_newsfeeds/views/category/view.html.php
new file mode 100644
index 00000000..c5299e0f
--- /dev/null
+++ b/core/components/com_newsfeeds/views/category/view.html.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTML View class for the Newsfeeds component
+ *
+ * @since  1.0
+ */
+class NewsfeedsViewCategory extends JViewCategory
+{
+	/**
+	 * @var    string  Default title to use for page title
+	 * @since  3.2
+	 */
+	protected $defaultPageTitle = 'COM_NEWSFEEDS_DEFAULT_PAGE_TITLE';
+
+	/**
+	 * @var    string  The name of the extension for the category
+	 * @since  3.2
+	 */
+	protected $extension = 'com_newsfeeds';
+
+	/**
+	 * @var    string  The name of the view to link individual items to
+	 * @since  3.2
+	 */
+	protected $viewName = 'newsfeed';
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$this->commonCategoryDisplay();
+
+		// Prepare the data.
+		// Compute the newsfeed slug.
+		foreach ($this->items as $item)
+		{
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$temp       = $item->params;
+			$item->params = clone $this->params;
+			$item->params->merge($temp);
+		}
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 */
+	protected function prepareDocument()
+	{
+		parent::prepareDocument();
+
+		$menu = $this->menu;
+		$id = (int) @$menu->query['id'];
+
+		if ($menu && ($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $this->category->id))
+		{
+			$path = array(array('title' => $this->category->title, 'link' => ''));
+			$category = $this->category->getParent();
+
+			while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$this->pathway->addItem($item['title'], $item['link']);
+			}
+		}
+	}
+}
diff --git a/core/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/core/components/com_newsfeeds/views/newsfeed/tmpl/default.php
new file mode 100644
index 00000000..4d472560
--- /dev/null
+++ b/core/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php if (!empty($this->msg)) : ?>
+	<?php echo $this->msg; ?>
+<?php else : ?>
+	<?php $lang      = JFactory::getLanguage(); ?>
+	<?php $myrtl     = $this->newsfeed->rtl; ?>
+	<?php $direction = ' '; ?>
+	<?php $isRtl     = $lang->isRtl(); ?>
+	<?php if ($isRtl && $myrtl == 0) : ?>
+		<?php $direction = ' redirect-rtl'; ?>
+	<?php elseif ($isRtl && $myrtl == 1) : ?>
+		<?php $direction = ' redirect-ltr'; ?>
+	<?php elseif ($isRtl && $myrtl == 2) : ?>
+		<?php $direction = ' redirect-rtl'; ?>
+	<?php elseif ($myrtl == 0) : ?>
+		<?php $direction = ' redirect-ltr'; ?>
+	<?php elseif ($myrtl == 1) : ?>
+		<?php $direction = ' redirect-ltr'; ?>
+	<?php elseif ($myrtl == 2) : ?>
+		<?php $direction = ' redirect-rtl'; ?>
+	<?php endif; ?>
+	<?php $images = json_decode($this->item->images); ?>
+	<div class="newsfeed<?php echo $this->pageclass_sfx; ?><?php echo $direction; ?>">
+		<?php if ($this->params->get('display_num')) : ?>
+			<h1 class="<?php echo $direction; ?>">
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		<?php endif; ?>
+		<h2 class="<?php echo $direction; ?>">
+			<?php if ($this->item->published == 0) : ?>
+				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+			<?php endif; ?>
+			<a href="<?php echo $this->item->link; ?>" target="_blank">
+				<?php echo str_replace('&apos;', "'", $this->item->name); ?>
+			</a>
+		</h2>
+		<?php if ($this->params->get('show_tags', 1)) : ?>
+			<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+			<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+		<?php endif; ?>
+		<!-- Show Images from Component -->
+		<?php if (isset($images->image_first) && !empty($images->image_first)) : ?>
+			<?php $imgfloat = empty($images->float_first) ? $this->params->get('float_first') : $images->float_first; ?>
+			<div class="img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>">
+				<img
+				<?php if ($images->image_first_caption) : ?>
+					<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') . '"'; ?>
+				<?php endif; ?>
+				src="<?php echo htmlspecialchars($images->image_first, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8'); ?>" />
+			</div>
+		<?php endif; ?>
+		<?php if (isset($images->image_second) && !empty($images->image_second)) : ?>
+			<?php $imgfloat = empty($images->float_second) ? $this->params->get('float_second') : $images->float_second; ?>
+			<div class="pull-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image">
+				<img
+				<?php if ($images->image_second_caption) : ?>
+					<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_second_caption) . '"'; ?>
+				<?php endif; ?>
+				src="<?php echo htmlspecialchars($images->image_second, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8'); ?>" />
+			</div>
+		<?php endif; ?>
+		<!-- Show Description from Component -->
+		<?php echo $this->item->description; ?>
+		<!-- Show Feed's Description -->
+		<?php if ($this->params->get('show_feed_description')) : ?>
+			<div class="feed-description">
+				<?php echo str_replace('&apos;', "'", $this->rssDoc->description); ?>
+			</div>
+		<?php endif; ?>
+		<!-- Show Image -->
+		<?php if (isset($this->rssDoc->image, $this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
+			<div>
+				<img src="<?php echo $this->rssDoc->image; ?>" alt="<?php echo $this->rssDoc->image->decription; ?>" />
+			</div>
+		<?php endif; ?>
+		<!-- Show items -->
+		<?php if (!empty($this->rssDoc[0])) : ?>
+			<ol>
+				<?php for ($i = 0; $i < $this->item->numarticles; $i++) : ?>
+					<?php if (empty($this->rssDoc[$i])) : ?>
+						<?php break; ?>
+					<?php endif; ?>
+					<?php $uri  = $this->rssDoc[$i]->uri || !$this->rssDoc[$i]->isPermaLink ? trim($this->rssDoc[$i]->uri) : trim($this->rssDoc[$i]->guid); ?>
+					<?php $uri  = !$uri || stripos($uri, 'http') !== 0 ? $this->item->link : $uri; ?>
+					<?php $text = $this->rssDoc[$i]->content !== '' ? trim($this->rssDoc[$i]->content) : ''; ?>
+					<li>
+						<?php if (!empty($uri)) : ?>
+							<h3 class="feed-link">
+								<a href="<?php echo htmlspecialchars($uri); ?>" target="_blank">
+									<?php echo trim($this->rssDoc[$i]->title); ?>
+								</a>
+							</h3>
+						<?php else : ?>
+							<h3 class="feed-link"><?php echo trim($this->rssDoc[$i]->title); ?></h3>
+						<?php endif; ?>
+						<?php if ($this->params->get('show_item_description') && $text !== '') : ?>
+							<div class="feed-item-description">
+								<?php if ($this->params->get('show_feed_image', 0) == 0) : ?>
+									<?php $text = JFilterOutput::stripImages($text); ?>
+								<?php endif; ?>
+								<?php $text = JHtml::_('string.truncate', $text, $this->params->get('feed_character_count')); ?>
+								<?php echo str_replace('&apos;', "'", $text); ?>
+							</div>
+						<?php endif; ?>
+					</li>
+				<?php endfor; ?>
+			</ol>
+		<?php endif; ?>
+	</div>
+<?php endif; ?>
diff --git a/core/components/com_newsfeeds/views/newsfeed/tmpl/default.xml b/core/components/com_newsfeeds/views/newsfeed/tmpl/default.xml
new file mode 100644
index 00000000..f741e8c0
--- /dev/null
+++ b/core/components/com_newsfeeds/views/newsfeed/tmpl/default.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_NEWSFEEDS_NEWSFEED_VIEW_DEFAULT_TITLE" option="COM_NEWSFEEDS_NEWSFEED_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_NEWSFEED_SINGLE_NEWSFEED"
+		/>
+		<message>
+			<![CDATA[COM_NEWSFEEDS_NEWSFEED_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_newsfeeds/models/fields"
+		 >
+
+			<field 
+				name="id" 
+				type="modal_newsfeed"
+				label="COM_NEWSFEEDS_FIELD_SELECT_FEED_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SELECT_FEED_DESC"
+				required="true"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic" label="COM_NEWSFEEDS_FIELDSET_MORE_OPTIONS_LABEL">
+			<field 
+				name="show_feed_image" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_feed_description" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_item_description" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_tags" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_SHOW_TAGS_LABEL"
+				description="COM_NEWSFEEDS_FIELD_SHOW_TAGS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="feed_character_count" 
+				type="number"
+				label="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_LABEL"
+				description="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC"
+				size="6"
+				useglobal="true"
+			/>
+
+			<field 
+				name="feed_display_order" 
+				type="list"
+				label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
+				description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"
+				useglobal="true"
+				>
+				<option value="des">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="asc">JGLOBAL_OLDEST_FIRST</option>
+			</field>
+		
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_newsfeeds/views/newsfeed/view.html.php b/core/components/com_newsfeeds/views/newsfeed/view.html.php
new file mode 100644
index 00000000..c926736d
--- /dev/null
+++ b/core/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTML View class for the Newsfeeds component
+ *
+ * @since  1.0
+ */
+class NewsfeedsViewNewsfeed extends JViewLegacy
+{
+	/**
+	 * @var     object
+	 * @since   1.6
+	 */
+	protected $state;
+
+	/**
+	 * @var     object
+	 * @since   1.6
+	 */
+	protected $item;
+
+	/**
+	 * @var     boolean
+	 * @since   1.6
+	 */
+	protected $print;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$app  = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		// Get view related request variables.
+		$print = $app->input->getBool('print');
+
+		// Get model data.
+		$state = $this->get('State');
+		$item  = $this->get('Item');
+
+		if ($item)
+		{
+			// Get Category Model data
+			$categoryModel = JModelLegacy::getInstance('Category', 'NewsfeedsModel', array('ignore_request' => true));
+			$categoryModel->setState('category.id', $item->catid);
+			$categoryModel->setState('list.ordering', 'a.name');
+			$categoryModel->setState('list.direction', 'asc');
+
+			// @TODO: $items is not used. Remove this line?
+			$items = $categoryModel->getItems();
+		}
+
+		// Check for errors.
+		// @TODO: Maybe this could go into JComponentHelper::raiseErrors($this->get('Errors'))
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Add router helpers.
+		$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+		$item->catslug = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+		$item->parent_slug = $item->category_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+		// Merge newsfeed params. If this is single-newsfeed view, menu params override newsfeed params
+		// Otherwise, newsfeed params override menu item params
+		$params = $state->get('params');
+		$newsfeed_params = clone $item->params;
+		$active = $app->getMenu()->getActive();
+		$temp = clone $params;
+
+		// Check to see which parameters should take priority
+		if ($active)
+		{
+			$currentLink = $active->link;
+
+			// If the current view is the active item and a newsfeed view for this feed, then the menu item params take priority
+			if (strpos($currentLink, 'view=newsfeed') && strpos($currentLink, '&id=' . (string) $item->id))
+			{
+				// $item->params are the newsfeed params, $temp are the menu item params
+				// Merge so that the menu item params take priority
+				$newsfeed_params->merge($temp);
+				$item->params = $newsfeed_params;
+
+				// Load layout from active query (in case it is an alternative menu item)
+				if (isset($active->query['layout']))
+				{
+					$this->setLayout($active->query['layout']);
+				}
+			}
+			else
+			{
+				// Current view is not a single newsfeed, so the newsfeed params take priority here
+				// Merge the menu item params with the newsfeed params so that the newsfeed params take priority
+				$temp->merge($newsfeed_params);
+				$item->params = $temp;
+
+				// Check for alternative layouts (since we are not in a single-newsfeed menu item)
+				if ($layout = $item->params->get('newsfeed_layout'))
+				{
+					$this->setLayout($layout);
+				}
+			}
+		}
+		else
+		{
+			// Merge so that newsfeed params take priority
+			$temp->merge($newsfeed_params);
+			$item->params = $temp;
+
+			// Check for alternative layouts (since we are not in a single-newsfeed menu item)
+			if ($layout = $item->params->get('newsfeed_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+
+		// Check the access to the newsfeed
+		$levels = $user->getAuthorisedViewLevels();
+
+		if (!in_array($item->access, $levels) || (in_array($item->access, $levels) && (!in_array($item->category_access, $levels))))
+		{
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->setHeader('status', 403, true);
+
+			return;
+		}
+
+		// Get the current menu item
+		$params = $app->getParams();
+
+		// Get the newsfeed
+		$newsfeed = $item;
+
+		$params->merge($item->params);
+
+		try
+		{
+			$feed = new JFeedFactory;
+			$this->rssDoc = $feed->getFeed($newsfeed->link);
+		}
+		catch (InvalidArgumentException $e)
+		{
+			$msg = JText::_('COM_NEWSFEEDS_ERRORS_FEED_NOT_RETRIEVED');
+		}
+		catch (RunTimeException $e)
+		{
+			$msg = JText::_('COM_NEWSFEEDS_ERRORS_FEED_NOT_RETRIEVED');
+		}
+
+		if (empty($this->rssDoc))
+		{
+			$msg = JText::_('COM_NEWSFEEDS_ERRORS_FEED_NOT_RETRIEVED');
+		}
+
+		$feed_display_order = $params->get('feed_display_order', 'des');
+
+		if ($feed_display_order === 'asc')
+		{
+			$this->rssDoc->reverseItems();
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->params = $params;
+		$this->newsfeed = $newsfeed;
+		$this->state = $state;
+		$this->item = $item;
+		$this->user = $user;
+
+		if (!empty($msg))
+		{
+			$this->msg = $msg;
+		}
+
+		$this->print = $print;
+
+		$item->tags = new JHelperTags;
+		$item->tags->getItemTags('com_newsfeeds.newsfeed', $item->id);
+
+		// Increment the hit counter of the newsfeed.
+		$model = $this->getModel();
+		$model->hit();
+
+		$this->_prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function _prepareDocument()
+	{
+		$app     = JFactory::getApplication();
+		$menus   = $app->getMenu();
+		$pathway = $app->getPathway();
+		$title   = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_NEWSFEEDS_DEFAULT_PAGE_TITLE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		$id = (int) @$menu->query['id'];
+
+		// If the menu item does not concern this newsfeed
+		if ($menu && ($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] !== 'newsfeed' || $id != $this->item->id))
+		{
+			// If this is not a single newsfeed menu item, set the page title to the newsfeed title
+			if ($this->item->name)
+			{
+				$title = $this->item->name;
+			}
+
+			$path = array(array('title' => $this->item->name, 'link' => ''));
+			$category = JCategories::getInstance('Newsfeeds')->get($this->item->catid);
+
+			while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		if (empty($title))
+		{
+			$title = $this->item->name;
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->item->metadesc)
+		{
+			$this->document->setDescription($this->item->metadesc);
+		}
+		elseif ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->item->metakey)
+		{
+			$this->document->setMetadata('keywords', $this->item->metakey);
+		}
+		elseif ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		if ($app->get('MetaTitle') == '1')
+		{
+			$this->document->setMetaData('title', $this->item->name);
+		}
+
+		if ($app->get('MetaAuthor') == '1')
+		{
+			$this->document->setMetaData('author', $this->item->author);
+		}
+
+		$mdata = $this->item->metadata->toArray();
+
+		foreach ($mdata as $k => $v)
+		{
+			if ($v)
+			{
+				$this->document->setMetadata($k, $v);
+			}
+		}
+	}
+}
diff --git a/core/components/com_search/controller.php b/core/components/com_search/controller.php
new file mode 100644
index 00000000..c441014c
--- /dev/null
+++ b/core/components/com_search/controller.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Search Component Controller
+ *
+ * @since  1.5
+ */
+class SearchController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   bool  $cachable   If true, the view output will be cached
+	 * @param   bool  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		// Force it to be the search view
+		$this->input->set('view', 'search');
+
+		return parent::display($cachable, $urlparams);
+	}
+
+	/**
+	 * Search
+	 *
+	 * @return void
+	 *
+	 * @throws Exception
+	 */
+	public function search()
+	{
+		// Slashes cause errors, <> get stripped anyway later on. # causes problems.
+		$badchars = array('#', '>', '<', '\\');
+		$searchword = trim(str_replace($badchars, '', $this->input->post->getString('searchword')));
+
+		// If searchword enclosed in double quotes, strip quotes and do exact match
+		if (substr($searchword, 0, 1) === '"' && substr($searchword, -1) === '"')
+		{
+			$post['searchword'] = substr($searchword, 1, -1);
+			$this->input->set('searchphrase', 'exact');
+		}
+		else
+		{
+			$post['searchword'] = $searchword;
+		}
+
+		$post['ordering']     = $this->input->post->getWord('ordering');
+		$post['searchphrase'] = $this->input->post->getWord('searchphrase', 'all');
+		$post['limit']        = $this->input->post->getUInt('limit');
+
+		if ($post['limit'] === null)
+		{
+			unset($post['limit']);
+		}
+
+		$areas = $this->input->post->get('areas', null, 'array');
+
+		if ($areas)
+		{
+			foreach ($areas as $area)
+			{
+				$post['areas'][] = JFilterInput::getInstance()->clean($area, 'cmd');
+			}
+		}
+
+		// The Itemid from the request, we will use this if it's a search page or if there is no search page available
+		$post['Itemid'] = $this->input->getInt('Itemid');
+
+		// Set Itemid id for links from menu
+		$app  = JFactory::getApplication();
+		$menu = $app->getMenu();
+		$item = $menu->getItem($post['Itemid']);
+
+		// The requested Item is not a search page so we need to find one
+		if ($item && ($item->component !== 'com_search' || $item->query['view'] !== 'search'))
+		{
+			// Get item based on component, not link. link is not reliable.
+			$item = $menu->getItems('component', 'com_search', true);
+
+			// If we found a search page, use that.
+			if (!empty($item))
+			{
+				$post['Itemid'] = $item->id;
+			}
+		}
+
+		unset($post['task'], $post['submit']);
+
+		$uri = JUri::getInstance();
+		$uri->setQuery($post);
+		$uri->setVar('option', 'com_search');
+
+		$this->setRedirect(JRoute::_('index.php' . $uri->toString(array('query', 'fragment')), false));
+	}
+}
diff --git a/core/components/com_search/models/search.php b/core/components/com_search/models/search.php
new file mode 100644
index 00000000..d80f35d9
--- /dev/null
+++ b/core/components/com_search/models/search.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Search Component Search Model
+ *
+ * @since  1.5
+ */
+class SearchModelSearch extends JModelLegacy
+{
+	/**
+	 * Search data array
+	 *
+	 * @var   array
+	 */
+	protected $_data = null;
+
+	/**
+	 * Search total
+	 *
+	 * @var   integer
+	 */
+	protected $_total = null;
+
+	/**
+	 * Search areas
+	 *
+	 * @var   integer
+	 */
+	protected $_areas = null;
+
+	/**
+	 * Pagination object
+	 *
+	 * @var   object
+	 */
+	protected $_pagination = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @since  1.5
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Get configuration
+		$app    = JFactory::getApplication();
+		$config = JFactory::getConfig();
+
+		// Get the pagination request variables
+		$this->setState('limit', $app->getUserStateFromRequest('com_search.limit', 'limit', $config->get('list_limit'), 'uint'));
+		$this->setState('limitstart', $app->input->get('limitstart', 0, 'uint'));
+
+		// Get parameters.
+		$params = $app->getParams();
+
+		if ($params->get('searchphrase') == 1)
+		{
+			$searchphrase = 'any';
+		}
+		elseif ($params->get('searchphrase') == 2)
+		{
+			$searchphrase = 'exact';
+		}
+		else
+		{
+			$searchphrase = 'all';
+		}
+
+		// Set the search parameters
+		$keyword  = urldecode($app->input->getString('searchword'));
+		$match    = $app->input->get('searchphrase', $searchphrase, 'word');
+		$ordering = $app->input->get('ordering', $params->get('ordering', 'newest'), 'word');
+		$this->setSearch($keyword, $match, $ordering);
+
+		// Set the search areas
+		$areas = $app->input->get('areas', null, 'array');
+		$this->setAreas($areas);
+	}
+
+	/**
+	 * Method to set the search parameters
+	 *
+	 * @param   string  $keyword   string search string
+	 * @param   string  $match     matching option, exact|any|all
+	 * @param   string  $ordering  option, newest|oldest|popular|alpha|category
+	 *
+	 * @access  public
+	 *
+	 * @return  void
+	 */
+	public function setSearch($keyword, $match = 'all', $ordering = 'newest')
+	{
+		if (isset($keyword))
+		{
+			$this->setState('origkeyword', $keyword);
+
+			if ($match !== 'exact')
+			{
+				$keyword = preg_replace('#\xE3\x80\x80#', ' ', $keyword);
+			}
+
+			$this->setState('keyword', $keyword);
+		}
+
+		if (isset($match))
+		{
+			$this->setState('match', $match);
+		}
+
+		if (isset($ordering))
+		{
+			$this->setState('ordering', $ordering);
+		}
+	}
+
+	/**
+	 * Method to get weblink item data for the category
+	 *
+	 * @access  public
+	 * @return  array
+	 */
+	public function getData()
+	{
+		// Lets load the content if it doesn't already exist
+		if (empty($this->_data))
+		{
+			$areas = $this->getAreas();
+
+			JPluginHelper::importPlugin('search');
+			$dispatcher = JEventDispatcher::getInstance();
+			$results = $dispatcher->trigger('onContentSearch', array(
+				$this->getState('keyword'),
+				$this->getState('match'),
+				$this->getState('ordering'),
+				$areas['active'])
+			);
+
+			$rows = array();
+
+			foreach ($results as $result)
+			{
+				$rows = array_merge((array) $rows, (array) $result);
+			}
+
+			$this->_total = count($rows);
+
+			if ($this->getState('limit') > 0)
+			{
+				$this->_data = array_splice($rows, $this->getState('limitstart'), $this->getState('limit'));
+			}
+			else
+			{
+				$this->_data = $rows;
+			}
+		}
+
+		return $this->_data;
+	}
+
+	/**
+	 * Method to get the total number of weblink items for the category
+	 *
+	 * @access  public
+	 *
+	 * @return  integer
+	 */
+	public function getTotal()
+	{
+		return $this->_total;
+	}
+
+	/**
+	 * Method to set the search areas
+	 *
+	 * @param   array  $active  areas
+	 * @param   array  $search  areas
+	 *
+	 * @return  void
+	 *
+	 * @access  public
+	 */
+	public function setAreas($active = array(), $search = array())
+	{
+		$this->_areas['active'] = $active;
+		$this->_areas['search'] = $search;
+	}
+
+	/**
+	 * Method to get a pagination object of the weblink items for the category
+	 *
+	 * @access  public
+	 * @return  integer
+	 */
+	public function getPagination()
+	{
+		// Lets load the content if it doesn't already exist
+		if (empty($this->_pagination))
+		{
+			$this->_pagination = new JPagination($this->getTotal(), $this->getState('limitstart'), $this->getState('limit'));
+		}
+
+		return $this->_pagination;
+	}
+
+	/**
+	 * Method to get the search areas
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.5
+	 */
+	public function getAreas()
+	{
+		// Load the Category data
+		if (empty($this->_areas['search']))
+		{
+			$areas = array();
+
+			JPluginHelper::importPlugin('search');
+			$dispatcher  = JEventDispatcher::getInstance();
+			$searchareas = $dispatcher->trigger('onContentSearchAreas');
+
+			foreach ($searchareas as $area)
+			{
+				if (is_array($area))
+				{
+					$areas = array_merge($areas, $area);
+				}
+			}
+
+			$this->_areas['search'] = $areas;
+		}
+
+		return $this->_areas;
+	}
+}
diff --git a/core/components/com_search/router.php b/core/components/com_search/router.php
new file mode 100644
index 00000000..b3860af7
--- /dev/null
+++ b/core/components/com_search/router.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_search
+ *
+ * @since  3.3
+ */
+class SearchRouter extends JComponentRouterBase
+{
+	/**
+	 * Build the route for the com_search component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query)
+	{
+		$segments = array();
+
+		if (isset($query['view']))
+		{
+			unset($query['view']);
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments)
+	{
+		$vars = array();
+
+		// Fix up search for URL
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			// Urldecode twice because it is encoded twice
+			$segments[$i] = urldecode(urldecode(stripcslashes($segments[$i])));
+		}
+
+		$searchword         = array_shift($segments);
+		$vars['searchword'] = $searchword;
+		$vars['view']       = 'search';
+
+		return $vars;
+	}
+}
+
+
+/**
+ * searchBuildRoute
+ *
+ * These functions are proxies for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function searchBuildRoute(&$query)
+{
+	$router = new SearchRouter;
+
+	return $router->build($query);
+}
+
+/**
+ * searchParseRoute
+ *
+ * These functions are proxies for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function searchParseRoute($segments)
+{
+	$router = new SearchRouter;
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_search/search.php b/core/components/com_search/search.php
new file mode 100644
index 00000000..7e638a20
--- /dev/null
+++ b/core/components/com_search/search.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$controller = JControllerLegacy::getInstance('Search');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_search/views/search/tmpl/default.php b/core/components/com_search/views/search/tmpl/default.php
new file mode 100644
index 00000000..8ebdd06c
--- /dev/null
+++ b/core/components/com_search/views/search/tmpl/default.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('formbehavior.chosen', 'select');
+
+?>
+<div class="search<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1 class="page-title">
+			<?php if ($this->escape($this->params->get('page_heading'))) : ?>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			<?php else : ?>
+				<?php echo $this->escape($this->params->get('page_title')); ?>
+			<?php endif; ?>
+		</h1>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('form'); ?>
+	<?php if ($this->error == null && count($this->results) > 0) : ?>
+		<?php echo $this->loadTemplate('results'); ?>
+	<?php else : ?>
+		<?php echo $this->loadTemplate('error'); ?>
+	<?php endif; ?>
+</div>
diff --git a/core/components/com_search/views/search/tmpl/default.xml b/core/components/com_search/views/search/tmpl/default.xml
new file mode 100644
index 00000000..53c0af65
--- /dev/null
+++ b/core/components/com_search/views/search/tmpl/default.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_SEARCH_SEARCH_VIEW_DEFAULT_TITLE" option="COM_SEARCH_SEARCH_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_SEARCH_RESULTS"
+		/>
+		<message>
+			<![CDATA[COM_SEARCH_SEARCH_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request" label="COM_SEARCH_FIELDSET_OPTIONAL_LABEL">
+
+			<field
+				name="searchword"
+				type="text"
+				label="COM_SEARCH_FIELD_LABEL"
+				description="COM_SEARCH_FIELD_DESC"
+			/>
+		</fieldset>
+	</fields>
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic" label="COM_MENUS_BASIC_FIELDSET_LABEL">
+
+			<field
+				name="search_phrases"
+				type="list"
+				label="COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL"
+				description="COM_SEARCH_FIELD_SEARCH_PHRASES_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="search_areas"
+				type="list"
+				label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"
+				description="COM_SEARCH_FIELD_SEARCH_AREAS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="show_date"
+				type="list"
+				label="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_LABEL"
+				description="COM_SEARCH_CONFIG_FIELD_CREATED_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="spacer1"
+				type="spacer"
+				label="COM_SEARCH_SAVED_SEARCH_OPTIONS"
+				class="text"
+			/>
+
+			<!-- Add fields to define saved search. -->
+
+			<field
+				name="searchphrase"
+				type="list"
+				label="COM_SEARCH_FOR_LABEL"
+				description="COM_SEARCH_FOR_DESC"
+				default="0"
+				>
+				<option value="0">COM_SEARCH_ALL_WORDS</option>
+				<option value="1">COM_SEARCH_ANY_WORDS</option>
+				<option value="2">COM_SEARCH_EXACT_PHRASE</option>
+			</field>
+
+			<field
+				name="ordering"
+				type="list"
+				label="COM_SEARCH_ORDERING_LABEL"
+				description="COM_SEARCH_ORDERING_DESC"
+				default="newest"
+				>
+				<option value="newest">COM_SEARCH_NEWEST_FIRST</option>
+				<option value="oldest">COM_SEARCH_OLDEST_FIRST</option>
+				<option value="popular">COM_SEARCH_MOST_POPULAR</option>
+				<option value="alpha">COM_SEARCH_ALPHABETICAL</option>
+				<option value="category">JCATEGORY</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_search/views/search/tmpl/default_error.php b/core/components/com_search/views/search/tmpl/default_error.php
new file mode 100644
index 00000000..f082aabe
--- /dev/null
+++ b/core/components/com_search/views/search/tmpl/default_error.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php if ($this->error) : ?>
+	<div class="error">
+		<?php echo $this->escape($this->error); ?>
+	</div>
+<?php endif; ?>
diff --git a/core/components/com_search/views/search/tmpl/default_form.php b/core/components/com_search/views/search/tmpl/default_form.php
new file mode 100644
index 00000000..b43c5cf5
--- /dev/null
+++ b/core/components/com_search/views/search/tmpl/default_form.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$lang = JFactory::getLanguage();
+$upper_limit = $lang->getUpperLimitSearchWord();
+
+?>
+<form id="searchForm" action="<?php echo JRoute::_('index.php?option=com_search'); ?>" method="post">
+	<div class="btn-toolbar">
+		<div class="btn-group pull-left">
+			<input type="text" name="searchword" title="<?php echo JText::_('COM_SEARCH_SEARCH_KEYWORD'); ?>" placeholder="<?php echo JText::_('COM_SEARCH_SEARCH_KEYWORD'); ?>" id="search-searchword" size="30" maxlength="<?php echo $upper_limit; ?>" value="<?php echo $this->escape($this->origkeyword); ?>" class="inputbox" />
+		</div>
+		<div class="btn-group pull-left">
+			<button name="Search" onclick="this.form.submit()" class="btn hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_SEARCH_SEARCH');?>">
+				<span class="icon-search"></span>
+				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>
+			</button>
+		</div>
+		<input type="hidden" name="task" value="search" />
+		<div class="clearfix"></div>
+	</div>
+	<div class="searchintro<?php echo $this->params->get('pageclass_sfx'); ?>">
+		<?php if (!empty($this->searchword)) : ?>
+			<p>
+				<?php echo JText::plural('COM_SEARCH_SEARCH_KEYWORD_N_RESULTS', '<span class="badge badge-info">' . $this->total . '</span>'); ?>
+			</p>
+		<?php endif; ?>
+	</div>
+	<?php if ($this->params->get('search_phrases', 1)) : ?>
+		<fieldset class="phrases">
+			<legend>
+				<?php echo JText::_('COM_SEARCH_FOR'); ?>
+			</legend>
+			<div class="phrases-box">
+				<?php echo $this->lists['searchphrase']; ?>
+			</div>
+			<div class="ordering-box">
+				<label for="ordering" class="ordering">
+					<?php echo JText::_('COM_SEARCH_ORDERING'); ?>
+				</label>
+				<?php echo $this->lists['ordering']; ?>
+			</div>
+		</fieldset>
+	<?php endif; ?>
+	<?php if ($this->params->get('search_areas', 1)) : ?>
+		<fieldset class="only">
+			<legend>
+				<?php echo JText::_('COM_SEARCH_SEARCH_ONLY'); ?>
+			</legend>
+			<?php foreach ($this->searchareas['search'] as $val => $txt) : ?>
+				<?php $checked = is_array($this->searchareas['active']) && in_array($val, $this->searchareas['active']) ? 'checked="checked"' : ''; ?>
+				<label for="area-<?php echo $val; ?>" class="checkbox">
+					<input type="checkbox" name="areas[]" value="<?php echo $val; ?>" id="area-<?php echo $val; ?>" <?php echo $checked; ?> />
+					<?php echo JText::_($txt); ?>
+				</label>
+			<?php endforeach; ?>
+		</fieldset>
+	<?php endif; ?>
+	<?php if ($this->total > 0) : ?>
+		<div class="form-limit">
+			<label for="limit">
+				<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+			</label>
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+		<p class="counter">
+			<?php echo $this->pagination->getPagesCounter(); ?>
+		</p>
+	<?php endif; ?>
+</form>
diff --git a/core/components/com_search/views/search/tmpl/default_results.php b/core/components/com_search/views/search/tmpl/default_results.php
new file mode 100644
index 00000000..57749cae
--- /dev/null
+++ b/core/components/com_search/views/search/tmpl/default_results.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<dl class="search-results<?php echo $this->pageclass_sfx; ?>">
+<?php foreach ($this->results as $result) : ?>
+	<dt class="result-title">
+		<?php echo $this->pagination->limitstart + $result->count . '. '; ?>
+		<?php if ($result->href) : ?>
+			<a href="<?php echo JRoute::_($result->href); ?>"<?php if ($result->browsernav == 1) : ?> target="_blank"<?php endif; ?>>
+				<?php // $result->title should not be escaped in this case, as it may ?>
+				<?php // contain span HTML tags wrapping the searched terms, if present ?>
+				<?php // in the title. ?>
+				<?php echo $result->title; ?>
+			</a>
+		<?php else : ?>
+			<?php // see above comment: do not escape $result->title ?>
+			<?php echo $result->title; ?>
+		<?php endif; ?>
+	</dt>
+	<?php if ($result->section) : ?>
+		<dd class="result-category">
+			<span class="small<?php echo $this->pageclass_sfx; ?>">
+				(<?php echo $this->escape($result->section); ?>)
+			</span>
+		</dd>
+	<?php endif; ?>
+	<dd class="result-text">
+		<?php echo $result->text; ?>
+	</dd>
+	<?php if ($this->params->get('show_date')) : ?>
+		<dd class="result-created<?php echo $this->pageclass_sfx; ?>">
+			<?php echo JText::sprintf('JGLOBAL_CREATED_DATE_ON', $result->created); ?>
+		</dd>
+	<?php endif; ?>
+<?php endforeach; ?>
+</dl>
+<div class="pagination">
+	<?php echo $this->pagination->getPagesLinks(); ?>
+</div>
diff --git a/core/components/com_search/views/search/view.html.php b/core/components/com_search/views/search/view.html.php
new file mode 100644
index 00000000..649017a1
--- /dev/null
+++ b/core/components/com_search/views/search/view.html.php
@@ -0,0 +1,311 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * HTML View class for the search component
+ *
+ * @since  1.0
+ */
+class SearchViewSearch extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since 1.0
+	 */
+	public function display($tpl = null)
+	{
+		JLoader::register('SearchHelper', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/search.php');
+
+		$app     = JFactory::getApplication();
+		$uri     = JUri::getInstance();
+		$error   = null;
+		$results = null;
+		$total   = 0;
+
+		// Get some data from the model
+		$areas      = $this->get('areas');
+		$state      = $this->get('state');
+		$searchWord = $state->get('keyword');
+		$params     = $app->getParams();
+
+		if (!$app->getMenu()->getActive())
+		{
+			$params->set('page_title', JText::_('COM_SEARCH_SEARCH'));
+		}
+
+		$title = $params->get('page_title');
+
+		if ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($params->get('menu-meta_description'));
+		}
+
+		if ($params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $params->get('menu-meta_keywords'));
+		}
+
+		if ($params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $params->get('robots'));
+		}
+
+		// Built select lists
+		$orders   = array();
+		$orders[] = JHtml::_('select.option', 'newest', JText::_('COM_SEARCH_NEWEST_FIRST'));
+		$orders[] = JHtml::_('select.option', 'oldest', JText::_('COM_SEARCH_OLDEST_FIRST'));
+		$orders[] = JHtml::_('select.option', 'popular', JText::_('COM_SEARCH_MOST_POPULAR'));
+		$orders[] = JHtml::_('select.option', 'alpha', JText::_('COM_SEARCH_ALPHABETICAL'));
+		$orders[] = JHtml::_('select.option', 'category', JText::_('JCATEGORY'));
+
+		$lists             = array();
+		$lists['ordering'] = JHtml::_('select.genericlist', $orders, 'ordering', 'class="inputbox"', 'value', 'text', $state->get('ordering'));
+
+		$searchphrases         = array();
+		$searchphrases[]       = JHtml::_('select.option', 'all', JText::_('COM_SEARCH_ALL_WORDS'));
+		$searchphrases[]       = JHtml::_('select.option', 'any', JText::_('COM_SEARCH_ANY_WORDS'));
+		$searchphrases[]       = JHtml::_('select.option', 'exact', JText::_('COM_SEARCH_EXACT_PHRASE'));
+		$lists['searchphrase'] = JHtml::_('select.radiolist', $searchphrases, 'searchphrase', '', 'value', 'text', $state->get('match'));
+
+		// Log the search
+		\Joomla\CMS\Helper\SearchHelper::logSearch($searchWord, 'com_search');
+
+		// Limit search-word
+		$lang        = JFactory::getLanguage();
+		$upper_limit = $lang->getUpperLimitSearchWord();
+		$lower_limit = $lang->getLowerLimitSearchWord();
+
+		if (SearchHelper::limitSearchWord($searchWord))
+		{
+			$error = JText::sprintf('COM_SEARCH_ERROR_SEARCH_MESSAGE', $lower_limit, $upper_limit);
+		}
+
+		// Sanitise search-word
+		if (SearchHelper::santiseSearchWord($searchWord, $state->get('match')))
+		{
+			$error = JText::_('COM_SEARCH_ERROR_IGNOREKEYWORD');
+		}
+
+		if (!$searchWord && !empty($this->input) && count($this->input->post))
+		{
+			// $error = JText::_('COM_SEARCH_ERROR_ENTERKEYWORD');
+		}
+
+		// Put the filtered results back into the model
+		// for next release, the checks should be done in the model perhaps...
+		$state->set('keyword', $searchWord);
+
+		if ($error === null)
+		{
+			$results    = $this->get('data');
+			$total      = $this->get('total');
+			$pagination = $this->get('pagination');
+
+			if ($state->get('match') === 'exact')
+			{
+				$searchWords = array($searchWord);
+				$needle      = $searchWord;
+			}
+			else
+			{
+				$searchWordA = preg_replace('#\xE3\x80\x80#', ' ', $searchWord);
+				$searchWords = preg_split("/\s+/u", $searchWordA);
+				$needle      = $searchWords[0];
+			}
+
+			JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+			// Make sure there are no slashes in the needle
+			$needle = str_replace('/', '\/', $needle);
+
+			for ($i = 0, $count = count($results); $i < $count; ++$i)
+			{
+				$rowTitle = &$results[$i]->title;
+				$rowTitleHighLighted = $this->highLight($rowTitle, $needle, $searchWords);
+				$rowText = &$results[$i]->text;
+				$rowTextHighLighted = $this->highLight($rowText, $needle, $searchWords);
+
+				$result = &$results[$i];
+				$created = '';
+
+				if ($result->created)
+				{
+					$created = JHtml::_('date', $result->created, JText::_('DATE_FORMAT_LC3'));
+				}
+
+				$result->title   = $rowTitleHighLighted;
+				$result->text    = JHtml::_('content.prepare', $rowTextHighLighted, '', 'com_search.search');
+				$result->created = $created;
+				$result->count   = $i + 1;
+			}
+		}
+
+		// Check for layout override
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			$this->setLayout($active->query['layout']);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+		$this->pagination    = &$pagination;
+		$this->results       = &$results;
+		$this->lists         = &$lists;
+		$this->params        = &$params;
+		$this->ordering      = $state->get('ordering');
+		$this->searchword    = $searchWord;
+		$this->origkeyword   = $state->get('origkeyword');
+		$this->searchphrase  = $state->get('match');
+		$this->searchareas   = $areas;
+		$this->total         = $total;
+		$this->error         = $error;
+		$this->action        = $uri;
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Method to control the highlighting of keywords
+	 *
+	 * @param   string  $string       text to be searched
+	 * @param   string  $needle       text to search for
+	 * @param   string  $searchWords  words to be searched  
+	 *
+	 * @return  mixed  A string.
+	 *
+	 * @since   3.8.4
+	 */
+	public function highLight($string, $needle, $searchWords)
+	{
+		$hl1            = '<span class="highlight">';
+		$hl2            = '</span>';
+		$mbString       = extension_loaded('mbstring');
+		$highlighterLen = strlen($hl1 . $hl2);
+
+		// Doing HTML entity decoding here, just in case we get any HTML entities here.
+		$quoteStyle   = version_compare(PHP_VERSION, '5.4', '>=') ? ENT_NOQUOTES | ENT_HTML401 : ENT_NOQUOTES;
+		$row          = html_entity_decode($string, $quoteStyle, 'UTF-8');
+		$row          = SearchHelper::prepareSearchContent($row, $needle);
+		$searchWords  = array_values(array_unique($searchWords));
+		$lowerCaseRow = $mbString ? mb_strtolower($row) : StringHelper::strtolower($row);
+
+		$transliteratedLowerCaseRow = SearchHelper::remove_accents($lowerCaseRow);
+
+		$posCollector = array();
+
+		foreach ($searchWords as $highlightWord)
+		{
+			$found = false;
+
+			if ($mbString)
+			{
+				$lowerCaseHighlightWord = mb_strtolower($highlightWord);
+
+				if (($pos = mb_strpos($lowerCaseRow, $lowerCaseHighlightWord)) !== false)
+				{
+					$found = true;
+				}
+				elseif (($pos = mb_strpos($transliteratedLowerCaseRow, $lowerCaseHighlightWord)) !== false)
+				{
+					$found = true;
+				}
+			}
+			else
+			{
+				$lowerCaseHighlightWord = StringHelper::strtolower($highlightWord);
+
+				if (($pos = StringHelper::strpos($lowerCaseRow, $lowerCaseHighlightWord)) !== false)
+				{
+					$found = true;
+				}
+				elseif (($pos = StringHelper::strpos($transliteratedLowerCaseRow, $lowerCaseHighlightWord)) !== false)
+				{
+					$found = true;
+				}
+			}
+
+			if ($found === true)
+			{
+				// Iconv transliterates '€' to 'EUR'
+				// TODO: add other expanding translations?
+				$eur_compensation = $pos > 0 ? substr_count($row, "\xE2\x82\xAC", 0, $pos) * 2 : 0;
+				$pos -= $eur_compensation;
+
+				// Collect pos and search-word
+				$posCollector[$pos] = $highlightWord;
+			}
+		}
+
+		if (count($posCollector))
+		{
+			// Sort by pos. Easier to handle overlapping highlighter-spans
+			ksort($posCollector);
+			$cnt                = 0;
+			$lastHighlighterEnd = -1;
+
+			foreach ($posCollector as $pos => $highlightWord)
+			{
+				$pos += $cnt * $highlighterLen;
+
+				/*
+				 * Avoid overlapping/corrupted highlighter-spans
+				 * TODO $chkOverlap could be used to highlight remaining part
+				 * of search-word outside last highlighter-span.
+				 * At the moment no additional highlighter is set.
+				 */
+				$chkOverlap = $pos - $lastHighlighterEnd;
+
+				if ($chkOverlap >= 0)
+				{
+					// Set highlighter around search-word
+					if ($mbString)
+					{
+						$highlightWordLen = mb_strlen($highlightWord);
+						$row              = mb_substr($row, 0, $pos) . $hl1 . mb_substr($row, $pos, $highlightWordLen)
+							. $hl2 . mb_substr($row, $pos + $highlightWordLen);
+					}
+					else
+					{
+						$highlightWordLen = StringHelper::strlen($highlightWord);
+						$row              = StringHelper::substr($row, 0, $pos)
+							. $hl1 . StringHelper::substr($row, $pos, StringHelper::strlen($highlightWord))
+							. $hl2 . StringHelper::substr($row, $pos + StringHelper::strlen($highlightWord));
+					}
+
+					$cnt++;
+					$lastHighlighterEnd = $pos + $highlightWordLen + $highlighterLen;
+				}
+			}
+		}
+
+		return $row;
+	}
+}
diff --git a/core/components/com_search/views/search/view.opensearch.php b/core/components/com_search/views/search/view.opensearch.php
new file mode 100644
index 00000000..45431ab7
--- /dev/null
+++ b/core/components/com_search/views/search/view.opensearch.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * OpenSearch View class for the Search component
+ *
+ * @since  1.7
+ */
+class SearchViewSearch extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  name of the template
+	 *
+	 * @throws Exception
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$doc = JFactory::getDocument();
+		$app = JFactory::getApplication();
+
+		$params = JComponentHelper::getParams('com_search');
+		$doc->setShortName($params->get('opensearch_name', $app->get('sitename')));
+		$doc->setDescription($params->get('opensearch_description', $app->get('MetaDesc')));
+
+		// Add the URL for the search
+		$searchUri = JUri::base() . 'index.php?option=com_search&searchword={searchTerms}';
+
+		// Find the menu item for the search
+		$menu  = $app->getMenu();
+		$items = $menu->getItems('link', 'index.php?option=com_search&view=search');
+
+		if (isset($items[0]))
+		{
+			$searchUri .= '&Itemid=' . $items[0]->id;
+		}
+
+		$htmlSearch           = new JOpenSearchUrl;
+		$htmlSearch->template = JRoute::_($searchUri);
+		$doc->addUrl($htmlSearch);
+	}
+}
diff --git a/core/components/com_tags/controller.php b/core/components/com_tags/controller.php
new file mode 100644
index 00000000..7ae24747
--- /dev/null
+++ b/core/components/com_tags/controller.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tags Component Controller
+ *
+ * @since  3.1
+ */
+class TagsController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean        $cachable   If true, the view output will be cached
+	 * @param   mixed|boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   3.1
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$user = JFactory::getUser();
+
+		// Set the default view name and format from the Request.
+		$vName = $this->input->get('view', 'tags');
+		$this->input->set('view', $vName);
+
+		if ($user->get('id') || ($this->input->getMethod() === 'POST' && $vName === 'tags'))
+		{
+			$cachable = false;
+		}
+
+		$safeurlparams = array(
+			'id'               => 'ARRAY',
+			'type'             => 'ARRAY',
+			'limit'            => 'UINT',
+			'limitstart'       => 'UINT',
+			'filter_order'     => 'CMD',
+			'filter_order_Dir' => 'CMD',
+			'lang'             => 'CMD'
+		);
+
+		return parent::display($cachable, $safeurlparams);
+	}
+}
diff --git a/core/components/com_tags/controllers/tags.php b/core/components/com_tags/controllers/tags.php
new file mode 100644
index 00000000..397a05cf
--- /dev/null
+++ b/core/components/com_tags/controllers/tags.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * The Tags List Controller
+ *
+ * @since  3.1
+ */
+class TagsControllerTags extends JControllerLegacy
+{
+	/**
+	 * Method to search tags with AJAX
+	 *
+	 * @return  void
+	 */
+	public function searchAjax()
+	{
+		// Required objects
+		$app = JFactory::getApplication();
+		$user = JFactory::getUser();
+
+		// Receive request data
+		$filters = array(
+			'like'      => trim($app->input->get('like', null, 'string')),
+			'title'     => trim($app->input->get('title', null, 'string')),
+			'flanguage' => $app->input->get('flanguage', null, 'word'),
+			'published' => $app->input->get('published', 1, 'int'),
+			'parent_id' => $app->input->get('parent_id', 0, 'int'),
+		);
+
+		if ((!$user->authorise('core.edit.state', 'com_tags')) && (!$user->authorise('core.edit', 'com_tags')))
+		{
+			// Filter on published for those who do not have edit or edit.state rights.
+			$filters['published'] = 1;
+		}
+
+		$results = JHelperTags::searchTags($filters);
+
+		if ($results)
+		{
+			// Output a JSON object
+			echo json_encode($results);
+		}
+
+		$app->close();
+	}
+}
diff --git a/core/components/com_tags/helpers/route.php b/core/components/com_tags/helpers/route.php
new file mode 100644
index 00000000..6ccda760
--- /dev/null
+++ b/core/components/com_tags/helpers/route.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Tags Component Route Helper.
+ *
+ * @since  3.1
+ */
+class TagsHelperRoute extends JHelperRoute
+{
+	protected static $lookup;
+
+	/**
+	 * Tries to load the router for the component and calls it. Otherwise uses getTagRoute.
+	 *
+	 * @param   integer  $contentItemId     Component item id
+	 * @param   string   $contentItemAlias  Component item alias
+	 * @param   integer  $contentCatId      Component item category id
+	 * @param   string   $language          Component item language
+	 * @param   string   $typeAlias         Component type alias
+	 * @param   string   $routerName        Component router
+	 *
+	 * @return  string  URL link to pass to JRoute
+	 *
+	 * @since   3.1
+	 */
+	public static function getItemRoute($contentItemId, $contentItemAlias, $contentCatId, $language, $typeAlias, $routerName)
+	{
+		$link = '';
+		$explodedAlias = explode('.', $typeAlias);
+		$explodedRouter = explode('::', $routerName);
+
+		if (file_exists($routerFile = JPATH_BASE . '/components/' . $explodedAlias[0] . '/helpers/route.php'))
+		{
+			JLoader::register($explodedRouter[0], $routerFile);
+			$routerClass = $explodedRouter[0];
+			$routerMethod = $explodedRouter[1];
+
+			if (class_exists($routerClass) && method_exists($routerClass, $routerMethod))
+			{
+				if ($routerMethod === 'getCategoryRoute')
+				{
+					$link = $routerClass::$routerMethod($contentItemId, $language);
+				}
+				else
+				{
+					$link = $routerClass::$routerMethod($contentItemId . ':' . $contentItemAlias, $contentCatId, $language);
+				}
+			}
+		}
+
+		if ($link === '')
+		{
+			// Create a fallback link in case we can't find the component router
+			$router = new JHelperRoute;
+			$link = $router->getRoute($contentItemId, $typeAlias, $link, $language, $contentCatId);
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Tries to load the router for the component and calls it. Otherwise calls getRoute.
+	 *
+	 * @param   integer  $id  The ID of the tag
+	 *
+	 * @return  string  URL link to pass to JRoute
+	 *
+	 * @since   3.1
+	 */
+	public static function getTagRoute($id)
+	{
+		$needles = array(
+			'tag'  => array((int) $id)
+		);
+
+		if ($id < 1)
+		{
+			$link = '';
+		}
+		else
+		{
+			$link = 'index.php?option=com_tags&view=tag&id=' . $id;
+
+			if ($item = self::_findItem($needles))
+			{
+				$link .= '&Itemid=' . $item;
+			}
+			else
+			{
+				$needles = array('tags' => array(1, 0));
+
+				if ($item = self::_findItem($needles))
+				{
+					$link .= '&Itemid=' . $item;
+				}
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Tries to load the router for the tags view.
+	 *
+	 * @return  string  URL link to pass to JRoute
+	 *
+	 * @since   3.7
+	 */
+	public static function getTagsRoute()
+	{
+		$needles = array(
+			'tags'  => array(0)
+		);
+
+		$link = 'index.php?option=com_tags&view=tags';
+
+		if ($item = self::_findItem($needles))
+		{
+			$link .= '&Itemid=' . $item;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Find Item static function
+	 *
+	 * @param   array  $needles  Array used to get the language value
+	 *
+	 * @return null
+	 *
+	 * @throws Exception
+	 */
+	protected static function _findItem($needles = null)
+	{
+		$app      = JFactory::getApplication();
+		$menus    = $app->getMenu('site');
+		$language = isset($needles['language']) ? $needles['language'] : '*';
+
+		// Prepare the reverse lookup array.
+		if (self::$lookup === null)
+		{
+			self::$lookup = array();
+
+			$component = JComponentHelper::getComponent('com_tags');
+			$items     = $menus->getItems('component_id', $component->id);
+
+			if ($items)
+			{
+				foreach ($items as $item)
+				{
+					if (isset($item->query, $item->query['view']))
+					{
+						$lang = ($item->language != '' ? $item->language : '*');
+
+						if (!isset(self::$lookup[$lang]))
+						{
+							self::$lookup[$lang] = array();
+						}
+
+						$view = $item->query['view'];
+
+						if (!isset(self::$lookup[$lang][$view]))
+						{
+							self::$lookup[$lang][$view] = array();
+						}
+
+						// Only match menu items that list one tag
+						if (isset($item->query['id']) && is_array($item->query['id']))
+						{
+							foreach ($item->query['id'] as $position => $tagId)
+							{
+								if (!isset(self::$lookup[$lang][$view][$item->query['id'][$position]]) || count($item->query['id']) == 1)
+								{
+									self::$lookup[$lang][$view][$item->query['id'][$position]] = $item->id;
+								}
+							}
+						}
+						elseif ($view == 'tags')
+						{
+							self::$lookup[$lang]['tags'][] = $item->id;
+						}
+					}
+				}
+			}
+		}
+
+		if ($needles)
+		{
+			foreach ($needles as $view => $ids)
+			{
+				if (isset(self::$lookup[$language][$view]))
+				{
+					foreach ($ids as $id)
+					{
+						if (isset(self::$lookup[$language][$view][(int) $id]))
+						{
+							return self::$lookup[$language][$view][(int) $id];
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			$active = $menus->getActive();
+
+			if ($active)
+			{
+				return $active->id;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/core/components/com_tags/models/tag.php b/core/components/com_tags/models/tag.php
new file mode 100644
index 00000000..eb7d8ee5
--- /dev/null
+++ b/core/components/com_tags/models/tag.php
@@ -0,0 +1,347 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Tags Component Tag Model
+ *
+ * @since  3.1
+ */
+class TagsModelTag extends JModelList
+{
+	/**
+	 * The tags that apply.
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	protected $tag = null;
+
+	/**
+	 * The list of items associated with the tags.
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $items = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     JController
+	 * @since   3.1
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'core_content_id', 'c.core_content_id',
+				'core_title', 'c.core_title',
+				'core_type_alias', 'c.core_type_alias',
+				'core_checked_out_user_id', 'c.core_checked_out_user_id',
+				'core_checked_out_time', 'c.core_checked_out_time',
+				'core_catid', 'c.core_catid',
+				'core_state', 'c.core_state',
+				'core_access', 'c.core_access',
+				'core_created_user_id', 'c.core_created_user_id',
+				'core_created_time', 'c.core_created_time',
+				'core_modified_time', 'c.core_modified_time',
+				'core_ordering', 'c.core_ordering',
+				'core_featured', 'c.core_featured',
+				'core_language', 'c.core_language',
+				'core_hits', 'c.core_hits',
+				'core_publish_up', 'c.core_publish_up',
+				'core_publish_down', 'c.core_publish_down',
+				'core_images', 'c.core_images',
+				'core_urls', 'c.core_urls',
+				'match_count',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to get a list of items for a list of tags.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 *
+	 * @since   3.1
+	 */
+	public function getItems()
+	{
+		// Invoke the parent getItems method to get the main list
+		$items = parent::getItems();
+
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				$item->link = TagsHelperRoute::getItemRoute(
+					$item->content_item_id,
+					$item->core_alias,
+					$item->core_catid,
+					$item->core_language,
+					$item->type_alias,
+					$item->router
+				);
+
+				// Get display date
+				switch ($this->state->params->get('tag_list_show_date'))
+				{
+					case 'modified':
+						$item->displayDate = $item->core_modified_time;
+						break;
+
+					case 'created':
+						$item->displayDate = $item->core_created_time;
+						break;
+
+					default:
+					case 'published':
+						$item->displayDate = ($item->core_publish_up == 0) ? $item->core_created_time : $item->core_publish_up;
+						break;
+				}
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data of all items with a given tag.
+	 *
+	 * @return  string  An SQL query
+	 *
+	 * @since   3.1
+	 */
+	protected function getListQuery()
+	{
+		$tagId  = $this->getState('tag.id') ? : '';
+
+		$typesr = $this->getState('tag.typesr');
+		$orderByOption = $this->getState('list.ordering', 'c.core_title');
+		$includeChildren = $this->state->params->get('include_children', 0);
+		$orderDir = $this->getState('list.direction', 'ASC');
+		$matchAll = $this->getState('params')->get('return_any_or_all', 1);
+		$language = $this->getState('tag.language');
+		$stateFilter = $this->getState('tag.state');
+
+		// Optionally filter on language
+		if (empty($language))
+		{
+			$language = JComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
+		}
+
+		$tagsHelper = new JHelperTags;
+		$query = $tagsHelper->getTagItemsQuery($tagId, $typesr, $includeChildren, $orderByOption, $orderDir, $matchAll, $language, $stateFilter);
+
+		if ($this->state->get('list.filter'))
+		{
+			$query->where($this->_db->quoteName('c.core_title') . ' LIKE ' . $this->_db->quote('%' . $this->state->get('list.filter') . '%'));
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
+	{
+		$app = JFactory::getApplication();
+
+		// Load the parameters.
+		$params = $app->isClient('administrator') ? JComponentHelper::getParams('com_tags') : $app->getParams();
+
+		$this->setState('params', $params);
+
+		// Load state from the request.
+		$ids = ArrayHelper::toInteger($app->input->get('id', array(), 'array'));
+
+		$pkString = implode(',', $ids);
+
+		$this->setState('tag.id', $pkString);
+
+		// Get the selected list of types from the request. If none are specified all are used.
+		$typesr = $app->input->get('types', array(), 'array');
+
+		if ($typesr)
+		{
+			// Implode is needed because the array can contain a string with a coma separated list of ids
+			$typesr = implode(',', $typesr);
+
+			// Sanitise
+			$typesr = explode(',', $typesr);
+			$typesr = ArrayHelper::toInteger($typesr);
+
+			$this->setState('tag.typesr', $typesr);
+		}
+
+		$language = $app->input->getString('tag_list_language_filter');
+		$this->setState('tag.language', $language);
+
+		// List state information
+		$format = $app->input->getWord('format');
+
+		if ($format === 'feed')
+		{
+			$limit = $app->get('feed_limit');
+		}
+		else
+		{
+			$limit = $params->get('display_num', $app->get('list_limit', 20));
+			$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $limit, 'uint');
+		}
+
+		$this->setState('list.limit', $limit);
+
+		$offset = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $offset);
+
+		$itemid = $pkString . ':' . $app->input->get('Itemid', 0, 'int');
+		$orderCol = $app->getUserStateFromRequest('com_tags.tag.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
+		$orderCol = !$orderCol ? $this->state->params->get('tag_list_orderby', 'c.core_title') : $orderCol;
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'c.core_title';
+		}
+
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->getUserStateFromRequest('com_tags.tag.list.' . $itemid . '.filter_order_direction', 'filter_order_Dir', '', 'string');
+		$listOrder = !$listOrder ? $this->state->params->get('tag_list_orderby_direction', 'ASC') : $listOrder;
+
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+
+		$this->setState('list.direction', $listOrder);
+
+		$this->setState('tag.state', 1);
+
+		// Optional filter text
+		$filterSearch = $app->getUserStateFromRequest('com_tags.tag.list.' . $itemid . '.filter_search', 'filter-search', '', 'string');
+		$this->setState('list.filter', $filterSearch);
+	}
+
+	/**
+	 * Method to get tag data for the current tag or tags
+	 *
+	 * @param   integer  $pk  An optional ID
+	 *
+	 * @return  object
+	 *
+	 * @since   3.1
+	 */
+	public function getItem($pk = null)
+	{
+		if (!isset($this->item))
+		{
+			$this->item = false;
+
+			if (empty($pk))
+			{
+				$pk = $this->getState('tag.id');
+			}
+
+			// Get a level row instance.
+			$table = JTable::getInstance('Tag', 'TagsTable');
+
+			$idsArray = explode(',', $pk);
+
+			// Attempt to load the rows into an array.
+			foreach ($idsArray as $id)
+			{
+				try
+				{
+					$table->load($id);
+
+					// Check published state.
+					if ($published = $this->getState('tag.state'))
+					{
+						if ($table->published != $published)
+						{
+							continue;
+						}
+					}
+
+					if (!in_array($table->access, JFactory::getUser()->getAuthorisedViewLevels()))
+					{
+						continue;
+					}
+
+					// Convert the JTable to a clean JObject.
+					$properties = $table->getProperties(1);
+					$this->item[] = ArrayHelper::toObject($properties, 'JObject');
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage());
+
+					return false;
+				}
+			}
+		}
+
+		if (!$this->item)
+		{
+			return JError::raiseError(404, JText::_('COM_TAGS_TAG_NOT_FOUND'));
+		}
+
+		return $this->item;
+	}
+
+	/**
+	 * Increment the hit counter.
+	 *
+	 * @param   integer  $pk  Optional primary key of the article to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 *
+	 * @since   3.2
+	 */
+	public function hit($pk = 0)
+	{
+		$input    = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk    = (!empty($pk)) ? $pk : (int) $this->getState('tag.id');
+			$table = JTable::getInstance('Tag', 'TagsTable');
+			$table->load($pk);
+			$table->hit($pk);
+
+			if (!$table->hasPrimaryKey())
+			{
+				JError::raiseError(404, JText::_('COM_TAGS_TAG_NOT_FOUND'));
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_tags/models/tags.php b/core/components/com_tags/models/tags.php
new file mode 100644
index 00000000..21a43aeb
--- /dev/null
+++ b/core/components/com_tags/models/tags.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * This models supports retrieving a list of tags.
+ *
+ * @since  3.1
+ */
+class TagsModelTags extends JModelList
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $_context = 'com_tags.tags';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @note Calling getState in this method will result in recursion.
+	 *
+	 * @since   3.1
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication('site');
+
+		// Load state from the request.
+		$pid = $app->input->getInt('parent_id');
+		$this->setState('tag.parent_id', $pid);
+
+		$language = $app->input->getString('tag_list_language_filter');
+		$this->setState('tag.language', $language);
+
+		$offset = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.offset', $offset);
+		$app = JFactory::getApplication();
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('list.limit', $params->get('maximum', 200));
+
+		$this->setState('filter.published', 1);
+		$this->setState('filter.access', true);
+
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_tags')) &&  (!$user->authorise('core.edit', 'com_tags')))
+		{
+			$this->setState('filter.published', 1);
+		}
+
+		// Optional filter text
+		$itemid = $pid . ':' . $app->input->getInt('Itemid', 0);
+		$filterSearch = $app->getUserStateFromRequest('com_tags.tags.list.' . $itemid . '.filter_search', 'filter-search', '', 'string');
+		$this->setState('list.filter', $filterSearch);
+	}
+
+	/**
+	 * Redefine the function and add some properties to make the styling more easy
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   3.1
+	 */
+	public function getItems()
+	{
+		// Invoke the parent getItems method to get the main list
+		$items = parent::getItems();
+
+		if (!count($items))
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new Registry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to build an SQL query to load the list data.
+	 *
+	 * @return  string  An SQL query
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$app            = JFactory::getApplication('site');
+		$user           = JFactory::getUser();
+		$groups         = implode(',', $user->getAuthorisedViewLevels());
+		$pid            = $this->getState('tag.parent_id');
+		$orderby        = $this->state->params->get('all_tags_orderby', 'title');
+		$published      = $this->state->params->get('published', 1);
+		$orderDirection = $this->state->params->get('all_tags_orderby_direction', 'ASC');
+		$language       = $this->getState('tag.language');
+
+		// Create a new query object.
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select required fields from the tags.
+		$query->select('a.*, u.name as created_by_user_name, u.email')
+			->from($db->quoteName('#__tags') . ' AS a')
+			->join('LEFT', '#__users AS u ON a.created_user_id = u.id')
+			->where($db->quoteName('a.access') . ' IN (' . $groups . ')');
+
+		if (!empty($pid))
+		{
+			$query->where($db->quoteName('a.parent_id') . ' = ' . $pid);
+		}
+
+		// Exclude the root.
+		$query->where($db->quoteName('a.parent_id') . ' <> 0');
+
+		// Optionally filter on language
+		if (empty($language))
+		{
+			$language = JComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
+		}
+
+		if ($language !== 'all')
+		{
+			if ($language === 'current_language')
+			{
+				$language = JHelperContent::getCurrentLanguage();
+			}
+
+			$query->where($db->quoteName('language') . ' IN (' . $db->quote($language) . ', ' . $db->quote('*') . ')');
+		}
+
+		// List state information
+		$format = $app->input->getWord('format');
+
+		if ($format === 'feed')
+		{
+			$limit = $app->get('feed_limit');
+		}
+		else
+		{
+			if ($this->state->params->get('show_pagination_limit'))
+			{
+				$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
+			}
+			else
+			{
+				$limit = $this->state->params->get('maximum', 20);
+			}
+		}
+
+		$this->setState('list.limit', $limit);
+
+		$offset = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $offset);
+
+		// Optionally filter on entered value
+		if ($this->state->get('list.filter'))
+		{
+			$query->where($db->quoteName('a.title') . ' LIKE ' . $db->quote('%' . $this->state->get('list.filter') . '%'));
+		}
+
+		$query->where($db->quoteName('a.published') . ' = ' . $published);
+
+		$query->order($db->quoteName($orderby) . ' ' . $orderDirection . ', a.title ASC');
+
+		return $query;
+	}
+}
diff --git a/core/components/com_tags/router.php b/core/components/com_tags/router.php
new file mode 100644
index 00000000..02557a70
--- /dev/null
+++ b/core/components/com_tags/router.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Routing class from com_tags
+ *
+ * @since  3.3
+ */
+class TagsRouter extends JComponentRouterBase
+{
+	/**
+	 * Build the route for the com_tags component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query)
+	{
+		$segments = array();
+
+		// Get a menu item based on Itemid or currently active
+		$params = JComponentHelper::getParams('com_tags');
+
+		// We need a menu item.  Either the one specified in the query, or the current active one if none specified
+		if (empty($query['Itemid']))
+		{
+			$menuItem = $this->menu->getActive();
+		}
+		else
+		{
+			$menuItem = $this->menu->getItem($query['Itemid']);
+		}
+
+		$mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+		$mId   = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
+
+		if (is_array($mId))
+		{
+			$mId = ArrayHelper::toInteger($mId);
+		}
+
+		$view = '';
+
+		if (isset($query['view']))
+		{
+			$view = $query['view'];
+
+			if (empty($query['Itemid']))
+			{
+				$segments[] = $view;
+			}
+
+			unset($query['view']);
+		}
+
+		// Are we dealing with a tag that is attached to a menu item?
+		if ($mView == $view && isset($query['id']) && $mId == $query['id'])
+		{
+			unset($query['id']);
+
+			return $segments;
+		}
+
+		if ($view === 'tag')
+		{
+			$notActiveTag = is_array($mId) ? (count($mId) > 1 || $mId[0] != (int) $query['id']) : ($mId != (int) $query['id']);
+
+			if ($notActiveTag || $mView != $view)
+			{
+				// ID in com_tags can be either an integer, a string or an array of IDs
+				$id = is_array($query['id']) ? implode(',', $query['id']) : $query['id'];
+				$segments[] = $id;
+			}
+
+			unset($query['id']);
+		}
+
+		if (isset($query['layout']))
+		{
+			if ((!empty($query['Itemid']) && isset($menuItem->query['layout'])
+				&& $query['layout'] == $menuItem->query['layout'])
+				|| $query['layout'] === 'default')
+			{
+				unset($query['layout']);
+			}
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+			$position     = strpos($segments[$i], '-');
+
+			if ($position)
+			{
+				// Remove id from segment
+				$segments[$i] = substr($segments[$i], $position + 1);
+			}
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments)
+	{
+		$total = count($segments);
+		$vars = array();
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// Get the active menu item.
+		$item = $this->menu->getActive();
+
+		// Count route segments
+		$count = count($segments);
+
+		// Standard routing for tags.
+		if (!isset($item))
+		{
+			$vars['view'] = $segments[0];
+			$vars['id']   = $this->fixSegment($segments[$count - 1]);
+
+			return $vars;
+		}
+
+		$vars['id'] = $this->fixSegment($segments[0]);
+		$vars['view'] = 'tag';
+
+		return $vars;
+	}
+
+	/**
+	 * Try to add missing id to segment
+	 *
+	 * @param   string  $segment  One piece of segment of the URL to parse
+	 *
+	 * @return  string  The segment with founded id
+	 *
+	 * @since   3.7
+	 */
+	protected function fixSegment($segment)
+	{
+		$db = JFactory::getDbo();
+
+		// Try to find tag id
+		$alias = str_replace(':', '-', $segment);
+
+		$query = $db->getQuery(true)
+			->select('id')
+			->from($db->quoteName('#__tags'))
+			->where($db->quoteName('alias') . " = " . $db->quote($alias));
+
+		$id = $db->setQuery($query)->loadResult();
+
+		if ($id)
+		{
+			$segment = "$id:$alias";
+		}
+
+		return $segment;
+	}
+}
+
+/**
+ * Tags router functions. These functions are proxys for the new router interface or old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments.
+ *
+ * @return array
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function tagsBuildRoute(&$query)
+{
+	$router = new TagsRouter;
+
+	return $router->build($query);
+}
+
+/**
+ * Parse the segments of a URL. These functions are proxys for the new router interface or old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function tagsParseRoute($segments)
+{
+	$router = new TagsRouter;
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_tags/tags.php b/core/components/com_tags/tags.php
new file mode 100644
index 00000000..40603dc4
--- /dev/null
+++ b/core/components/com_tags/tags.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('TagsHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
+
+$controller = JControllerLegacy::getInstance('Tags');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_tags/views/tag/tmpl/default.php b/core/components/com_tags/views/tag/tmpl/default.php
new file mode 100644
index 00000000..3030f65d
--- /dev/null
+++ b/core/components/com_tags/views/tag/tmpl/default.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Note that there are certain parts of this layout used only when there is exactly one tag.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+$isSingleTag = count($this->item) === 1;
+
+?>
+<div class="tag-category<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_tag_title', 1)) : ?>
+		<h2>
+			<?php echo JHtml::_('content.prepare', $this->tags_title, '', 'com_tag.tag'); ?>
+		</h2>
+	<?php endif; ?>
+	<?php // We only show a tag description if there is a single tag. ?>
+	<?php if (count($this->item) === 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+		<div class="category-desc">
+			<?php $images = json_decode($this->item[0]->images); ?>
+			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
+				<img src="<?php echo htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>" />
+			<?php endif; ?>
+			<?php if ($this->params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?>
+				<?php echo JHtml::_('content.prepare', $this->item[0]->description, '', 'com_tags.tag'); ?>
+			<?php endif; ?>
+			<div class="clr"></div>
+		</div>
+	<?php endif; ?>
+	<?php // If there are multiple tags and a description or image has been supplied use that. ?>
+	<?php if ($this->params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?>
+		<?php if ($this->params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?>
+			<img src="<?php echo $this->params->get('tag_list_image'); ?>" />
+		<?php endif; ?>
+		<?php if ($this->params->get('tag_list_description', '') > '') : ?>
+			<?php echo JHtml::_('content.prepare', $this->params->get('tag_list_description'), '', 'com_tags.tag'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('items'); ?>
+	<?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
+		<div class="pagination">
+			<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+				<p class="counter pull-right">
+					<?php echo $this->pagination->getPagesCounter(); ?>
+				</p>
+			<?php endif; ?>
+			<?php echo $this->pagination->getPagesLinks(); ?>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/components/com_tags/views/tag/tmpl/default.xml b/core/components/com_tags/views/tag/tmpl/default.xml
new file mode 100644
index 00000000..4ad4318c
--- /dev/null
+++ b/core/components/com_tags/views/tag/tmpl/default.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_tags_tag_view_default_title" option="com_tags_tag_view_default_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST"
+		/>
+		<message>
+			<![CDATA[com_tags_tag_view_default_desc]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request">
+
+			<field 
+				name="id" 
+				type="tag"
+				label="COM_TAGS_FIELD_TAG_LABEL"
+				description="COM_TAGS_FIELD_SELECT_TAG_DESC"
+				custom="deny"
+				required="true"
+				multiple="true"
+			/>
+
+			<field 
+				name="types" 
+				type="contenttype"
+				label="COM_TAGS_FIELD_TYPE_LABEL"
+				description="COM_TAGS_FIELD_TYPE_DESC"
+				multiple="true"
+			/>
+
+			<field 
+				name="tag_list_language_filter"
+				type="contentlanguage"
+				label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
+				description="COM_TAGS_FIELD_LANGUAGE_FILTER_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="all">JALL</option>
+				<option value="current_language">JCURRENT</option>
+			</field>
+
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+	<fieldset name="basic" label="COM_TAGS_OPTIONS">
+
+			<field 
+				name="show_tag_title" 
+				type="list"
+				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
+				description="COM_TAGS_SHOW_TAG_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_tag_image" 
+				type="list"
+				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
+				description="COM_TAGS_SHOW_TAG_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_tag_description" 
+				type="list"
+				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
+				description="COM_TAGS_SHOW_TAG_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_image" 
+				type="media"
+				label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
+				description="COM_TAGS_TAG_LIST_MEDIA_DESC"
+			/>
+
+			<field 
+				name="tag_list_description" 
+				type="textarea"
+				class="inputbox"
+				label="COM_TAGS_SHOW_TAG_LIST_DESCRIPTION_LABEL"
+				description="COM_TAGS_TAG_LIST_DESCRIPTION_DESC"
+				rows="3" 
+				cols="30" 
+				filter="safehtml"
+			/>
+
+			<field 
+				name="tag_list_orderby"
+				type="list"
+				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
+				description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="c.core_title">JGLOBAL_TITLE</option>
+				<option value="match_count">COM_TAGS_MATCH_COUNT</option>
+				<option value="c.core_created_time">JGLOBAL_CREATED_DATE</option>
+				<option value="c.core_modified_time">JGLOBAL_MODIFIED_DATE</option>
+				<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
+			</field>
+
+			<field 
+				name="tag_list_orderby_direction" 
+				type="list"
+				label="JGLOBAL_ORDER_DIRECTION_LABEL"
+				description="JGLOBAL_ORDER_DIRECTION_DESC"
+				useglobal="true"
+				>
+				<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
+				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
+			</field>
+
+		</fieldset>
+
+		<fieldset name="advanced" label="COM_TAGS_ITEM_OPTIONS">
+
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="COM_TAGS_SUBSLIDER_DRILL_TAG_LIST_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="tag_list_show_item_image" 
+				type="list"
+				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
+				description="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_item_description" 
+				type="list"
+				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="tag_list_item_maximum_characters"
+				type="number"
+				label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
+				description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+				filter="integer"
+				useglobal="true"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+		<fieldset name="pagination" label="COM_TAGS_PAGINATION_OPTIONS">
+
+			<field
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+
+		<fieldset name="selection" label="COM_TAGS_LIST_SELECTION_OPTIONS">
+
+			<field
+				name="return_any_or_all" 
+				type="list"
+				label="COM_TAGS_SEARCH_TYPE_LABEL"
+				description="COM_TAGS_SEARCH_TYPE_DESC"
+				useglobal="true"
+				>
+				<option value="0">COM_TAGS_ALL</option>
+				<option value="1">COM_TAGS_ANY</option>
+			</field>
+
+			<field 
+				name="include_children" 
+				type="list"
+				label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
+				description="COM_TAGS_INCLUDE_CHILDREN_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="0">COM_TAGS_EXCLUDE</option>
+				<option value="1">COM_TAGS_INCLUDE</option>
+			</field>
+
+		</fieldset>
+
+		<fieldset name="integration">
+
+			<field
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_tags/views/tag/tmpl/default_items.php b/core/components/com_tags/views/tag/tmpl/default_items.php
new file mode 100644
index 00000000..b5fb3edb
--- /dev/null
+++ b/core/components/com_tags/views/tag/tmpl/default_items.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+JHtml::_('formbehavior.chosen', 'select');
+
+// Get the user object.
+$user = JFactory::getUser();
+
+// Check if user is allowed to add/edit based on tags permissions.
+// Do we really have to make it so people can see unpublished tags???
+$canEdit      = $user->authorise('core.edit', 'com_tags');
+$canCreate    = $user->authorise('core.create', 'com_tags');
+$canEditState = $user->authorise('core.edit.state', 'com_tags');
+
+JFactory::getDocument()->addScriptDeclaration("
+		var resetFilter = function() {
+		document.getElementById('filter-search').value = '';
+	}
+");
+
+?>
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+	<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?>
+		<fieldset class="filters btn-toolbar">
+			<?php if ($this->params->get('filter_field')) : ?>
+				<div class="btn-group">
+					<label class="filter-search-lbl element-invisible" for="filter-search">
+						<?php echo JText::_('COM_TAGS_TITLE_FILTER_LABEL') . '&#160;'; ?>
+					</label>
+					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_TAGS_TITLE_FILTER_LABEL'); ?>" />
+					<button type="button" name="filter-search-button" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>" onclick="document.adminForm.submit();" class="btn">
+						<span class="icon-search"></span>
+					</button>
+					<button type="reset" name="filter-clear-button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>" class="btn" onclick="resetFilter(); document.adminForm.submit();">
+						<span class="icon-remove"></span>
+					</button>
+				</div>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_pagination_limit')) : ?>
+				<div class="btn-group pull-right">
+					<label for="limit" class="element-invisible">
+						<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+					</label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			<?php endif; ?>
+			<input type="hidden" name="filter_order" value="" />
+			<input type="hidden" name="filter_order_Dir" value="" />
+			<input type="hidden" name="limitstart" value="" />
+			<input type="hidden" name="task" value="" />
+			<div class="clearfix"></div>
+		</fieldset>
+	<?php endif; ?>
+	<?php if (empty($this->items)) : ?>
+		<p><?php echo JText::_('COM_TAGS_NO_ITEMS'); ?></p>
+	<?php else : ?>
+		<ul class="category list-striped" itemscope itemtype="http://schema.org/ItemList">
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php if ($item->core_state == 0) : ?>
+					<li class="system-unpublished cat-list-row<?php echo $i % 2; ?>" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+				<?php else : ?>
+					<li class="cat-list-row<?php echo $i % 2; ?> clearfix" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+				<?php endif; ?>
+				<?php if (($item->type_alias === 'com_users.category') || ($item->type_alias === 'com_banners.category')) : ?>
+					<h3 itemprop="name">
+						<?php echo $this->escape($item->core_title); ?>
+					</h3>
+				<?php else : ?>
+					<h3 itemprop="name">
+						<a href="<?php echo JRoute::_($item->link); ?>" itemprop="url">
+							<?php echo $this->escape($item->core_title); ?>
+						</a>
+					</h3>
+				<?php endif; ?>
+				<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+				<?php echo $item->event->afterDisplayTitle; ?>
+				<?php $images = json_decode($item->core_images); ?>
+				<?php if ($this->params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) : ?>
+					<a href="<?php echo JRoute::_($item->link); ?>" itemprop="url">
+						<img src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>" itemprop="image">
+					</a>
+				<?php endif; ?>
+				<?php if ($this->params->get('tag_list_show_item_description', 1)) : ?>
+					<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
+					<?php echo $item->event->beforeDisplayContent; ?>
+					<span class="tag-body" itemprop="description">
+						<?php echo JHtml::_('string.truncate', $item->core_body, $this->params->get('tag_list_item_maximum_characters')); ?>
+					</span>
+					<?php // Content is generated by content plugin event "onContentAfterDisplay" ?>
+					<?php echo $item->event->afterDisplayContent; ?>
+				<?php endif; ?>
+				</li>
+			<?php endforeach; ?>
+		</ul>
+	<?php endif; ?>
+</form>
diff --git a/core/components/com_tags/views/tag/tmpl/list.php b/core/components/com_tags/views/tag/tmpl/list.php
new file mode 100644
index 00000000..98354b84
--- /dev/null
+++ b/core/components/com_tags/views/tag/tmpl/list.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Note that there are certain parts of this layout used only when there is exactly one tag.
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+$n = count($this->items);
+
+?>
+<div class="tag-category<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_tag_title', 1)) : ?>
+		<h2>
+			<?php echo JHtml::_('content.prepare', $this->tags_title, '', 'com_tag.tag'); ?>
+		</h2>
+	<?php endif; ?>
+	<?php // We only show a tag description if there is a single tag. ?>
+	<?php if (count($this->item) === 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+		<div class="category-desc">
+			<?php $images = json_decode($this->item[0]->images); ?>
+			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
+				<img src="<?php echo htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8'); ?>">
+			<?php endif; ?>
+			<?php if ($this->params->get('tag_list_show_tag_description') == 1 && $this->item[0]->description) : ?>
+				<?php echo JHtml::_('content.prepare', $this->item[0]->description, '', 'com_tags.tag'); ?>
+			<?php endif; ?>
+			<div class="clr"></div>
+		</div>
+	<?php endif; ?>
+	<?php // If there are multiple tags and a description or image has been supplied use that. ?>
+	<?php if ($this->params->get('tag_list_show_tag_description', 1) || $this->params->get('show_description_image', 1)) : ?>
+		<?php if ($this->params->get('show_description_image', 1) == 1 && $this->params->get('tag_list_image')) : ?>
+			<img src="<?php echo $this->params->get('tag_list_image'); ?>">
+		<?php endif; ?>
+		<?php if ($this->params->get('tag_list_description', '') > '') : ?>
+			<?php echo JHtml::_('content.prepare', $this->params->get('tag_list_description'), '', 'com_tags.tag'); ?>
+		<?php endif; ?>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('items'); ?>
+</div>
diff --git a/core/components/com_tags/views/tag/tmpl/list.xml b/core/components/com_tags/views/tag/tmpl/list.xml
new file mode 100644
index 00000000..04f00537
--- /dev/null
+++ b/core/components/com_tags/views/tag/tmpl/list.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_tags_tag_view_list_compact_title" option="com_tags_tag_view_list_compact_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_COMPACT_LIST"
+		/>
+		<message>
+			<![CDATA[com_tags_tag_view_list_desc]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request">
+
+			<field 
+				name="id" 
+				type="tag" 
+				label="COM_TAGS_FIELD_TAG_LABEL"
+				description="COM_TAGS_FIELD_SELECT_TAG_DESC"
+				custom="deny"
+				required="true"
+				multiple="true"
+			/>
+
+			<field 
+				name="types" 
+				type="contenttype"
+				label="COM_TAGS_FIELD_TYPE_LABEL"
+				description="COM_TAGS_FIELD_TYPE_DESC"
+				multiple="true"
+			/>
+
+			<field 
+				name="tag_list_language_filter"
+				type="contentlanguage"
+				label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
+				description="COM_TAGS_FIELD_LANGUAGE_FILTER_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="all">JALL</option>
+				<option value="current_language">JCURRENT</option>
+			</field>
+
+		</fieldset>
+	</fields>
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic" label="COM_TAGS_OPTIONS">
+
+			<field 
+				name="show_tag_title" 
+				type="list"
+				label="COM_TAGS_SHOW_TAG_TITLE_LABEL"
+				description="COM_TAGS_SHOW_TAG_TITLE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_tag_image" 
+				type="list"
+				label="COM_TAGS_SHOW_TAG_IMAGE_LABEL"
+				description="COM_TAGS_SHOW_TAG_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_tag_description" 
+				type="list"
+				label="COM_TAGS_SHOW_TAG_DESCRIPTION_LABEL"
+				description="COM_TAGS_SHOW_TAG_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_image" 
+				type="media"
+				label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
+				description="COM_TAGS_TAG_LIST_MEDIA_DESC"
+			/>
+
+			<field 
+				name="tag_list_description" 
+				type="textarea"
+				label="COM_TAGS_SHOW_TAG_LIST_DESCRIPTION_LABEL"
+				description="COM_TAGS_TAG_LIST_DESCRIPTION_DESC"
+				class="inputbox"
+				rows="3" 
+				cols="30" 
+				filter="safehtml"
+			/>
+
+			<field 
+				name="tag_list_orderby"
+				type="list"
+				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
+				description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="c.core_title">JGLOBAL_TITLE</option>
+				<option value="match_count">COM_TAGS_MATCH_COUNT</option>
+				<option value="c.core_created_time">JGLOBAL_CREATED_DATE</option>
+				<option value="c.core_modified_time">JGLOBAL_MODIFIED_DATE</option>
+				<option value="c.core_publish_up">JGLOBAL_PUBLISHED_DATE</option>
+			</field>
+
+			<field 
+				name="tag_list_orderby_direction" 
+				type="list"
+				label="JGLOBAL_ORDER_DIRECTION_LABEL"
+				description="JGLOBAL_ORDER_DIRECTION_DESC"
+				useglobal="true"
+				>
+				<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
+				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
+			</field>
+
+		</fieldset>
+
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="COM_TAGS_SUBSLIDER_DRILL_TAG_LIST_LABEL"
+				class="text"
+			/>
+
+			<field 
+				name="tag_list_show_item_image" 
+				type="list"
+				label="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL"
+				description="COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_item_description" 
+				type="list"
+				label="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="tag_list_item_maximum_characters"
+				type="number"
+				label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
+				description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+				filter="integer"
+				useglobal="true"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field	
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="display_num" 
+				type="list"
+				label="COM_TAGS_FIELD_NUMBER_ITEMS_LIST_LABEL"
+				description="COM_TAGS_FIELD_NUMBER_ITEMS_LIST_DESC"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="tag_list_show_date" 
+				type="list"
+				label="JGLOBAL_SHOW_DATE_LABEL"
+				description="JGLOBAL_SHOW_DATE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field 
+				name="date_format" 
+				type="text"
+				label="JGLOBAL_DATE_FORMAT_LABEL"
+				description="JGLOBAL_DATE_FORMAT_DESC"
+				size="15"
+			/>
+
+		</fieldset>
+
+		<fieldset name="selection" label="COM_TAGS_LIST_SELECTION_OPTIONS">
+
+			<field 
+				name="return_any_or_all" 
+				type="list"
+				label="COM_TAGS_SEARCH_TYPE_LABEL"
+				description="COM_TAGS_SEARCH_TYPE_DESC"
+				useglobal="true"
+				>
+				<option value="0">COM_TAGS_ALL</option>
+				<option value="1">COM_TAGS_ANY</option>
+			</field>
+
+			<field 
+				name="include_children" 
+				type="list"
+				label="COM_TAGS_INCLUDE_CHILDREN_LABEL"
+				description="COM_TAGS_INCLUDE_CHILDREN_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="0">COM_TAGS_EXCLUDE</option>
+				<option value="1">COM_TAGS_INCLUDE</option>
+			</field>
+
+		</fieldset>
+
+		<fieldset name="integration">
+
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_tags/views/tag/tmpl/list_items.php b/core/components/com_tags/views/tag/tmpl/list_items.php
new file mode 100644
index 00000000..0729a797
--- /dev/null
+++ b/core/components/com_tags/views/tag/tmpl/list_items.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.core');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+JFactory::getDocument()->addScriptDeclaration("
+		var resetFilter = function() {
+		document.getElementById('filter-search').value = '';
+	}
+");
+
+?>
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if ($this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?>
+		<fieldset class="filters btn-toolbar">
+			<?php if ($this->params->get('filter_field')) : ?>
+				<div class="btn-group">
+					<label class="filter-search-lbl element-invisible" for="filter-search">
+						<?php echo JText::_('COM_TAGS_TITLE_FILTER_LABEL') . '&#160;'; ?>
+					</label>
+					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_TAGS_TITLE_FILTER_LABEL'); ?>" />
+					<button type="button" name="filter-search-button" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>" onclick="document.adminForm.submit();" class="btn">
+						<span class="icon-search"></span>
+					</button>
+					<button type="reset" name="filter-clear-button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>" class="btn" onclick="resetFilter(); document.adminForm.submit();">
+						<span class="icon-remove"></span>
+					</button>
+				</div>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_pagination_limit')) : ?>
+				<div class="btn-group pull-right">
+					<label for="limit" class="element-invisible">
+						<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+					</label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			<?php endif; ?>
+			<input type="hidden" name="filter_order" value="" />
+			<input type="hidden" name="filter_order_Dir" value="" />
+			<input type="hidden" name="limitstart" value="" />
+			<input type="hidden" name="task" value="" />
+			<div class="clearfix"></div>
+		</fieldset>
+	<?php endif; ?>
+	<?php if (empty($this->items)) : ?>
+		<p><?php echo JText::_('COM_TAGS_NO_ITEMS'); ?></p>
+	<?php else : ?>
+		<table class="category table table-striped table-bordered table-hover">
+			<?php if ($this->params->get('show_headings')) : ?>
+				<thead>
+					<tr>
+						<th id="categorylist_header_title">
+							<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'c.core_title', $listDirn, $listOrder); ?>
+						</th>
+						<?php if ($date = $this->params->get('tag_list_show_date')) : ?>
+							<th id="categorylist_header_date">
+								<?php if ($date === 'created') : ?>
+									<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_created_time', $listDirn, $listOrder); ?>
+								<?php elseif ($date === 'modified') : ?>
+									<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_modified_time', $listDirn, $listOrder); ?>
+								<?php elseif ($date === 'published') : ?>
+									<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_publish_up', $listDirn, $listOrder); ?>
+								<?php endif; ?>
+							</th>
+						<?php endif; ?>
+					</tr>
+				</thead>
+			<?php endif; ?>
+			<tbody>
+				<?php foreach ($this->items as $i => $item) : ?>
+					<?php if ($item->core_state == 0) : ?>
+						<tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+					<?php else : ?>
+						<tr class="cat-list-row<?php echo $i % 2; ?>">
+					<?php endif; ?>
+						<td <?php if ($this->params->get('show_headings')) echo "headers=\"categorylist_header_title\""; ?> class="list-title">
+							<a href="<?php echo JRoute::_($item->link); ?>">
+								<?php echo $this->escape($item->core_title); ?>
+							</a>
+							<?php if ($item->core_state == 0) : ?>
+								<span class="list-published label label-warning">
+									<?php echo JText::_('JUNPUBLISHED'); ?>
+								</span>
+							<?php endif; ?>
+						</td>
+						<?php if ($this->params->get('tag_list_show_date')) : ?>
+							<td headers="categorylist_header_date" class="list-date small">
+								<?php
+								echo JHtml::_(
+									'date', $item->displayDate,
+									$this->escape($this->params->get('date_format', JText::_('DATE_FORMAT_LC3')))
+								); ?>
+							</td>
+						<?php endif; ?>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php // Add pagination links ?>
+		<?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+			<div class="pagination">
+				<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+					<p class="counter pull-right">
+						<?php echo $this->pagination->getPagesCounter(); ?>
+					</p>
+				<?php endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
+			</div>
+		<?php endif; ?>
+	<?php endif; ?>
+</form>
diff --git a/core/components/com_tags/views/tag/view.feed.php b/core/components/com_tags/views/tag/view.feed.php
new file mode 100644
index 00000000..b7a7cd94
--- /dev/null
+++ b/core/components/com_tags/views/tag/view.feed.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Tags component
+ *
+ * @since  3.1
+ */
+class TagsViewTag extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app            = JFactory::getApplication();
+		$document       = JFactory::getDocument();
+		$document->link = JRoute::_(TagsHelperRoute::getTagRoute($app->input->getInt('id')));
+
+		$app->input->set('limit', $app->get('feed_limit'));
+		$siteEmail        = $app->get('mailfrom');
+		$fromName         = $app->get('fromname');
+		$feedEmail        = $app->get('feed_email', 'none');
+		$document->editor = $fromName;
+
+		if ($feedEmail !== 'none')
+		{
+			$document->editorEmail = $siteEmail;
+		}
+
+		// Get some data from the model
+		$items    = $this->get('Items');
+
+		if ($items !== false)
+		{
+			foreach ($items as $item)
+			{
+				// Strip HTML from feed item title
+				$title = $this->escape($item->core_title);
+				$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+
+				// Strip HTML from feed item description text
+				$description = $item->core_body;
+				$author      = $item->core_created_by_alias ?: $item->author;
+				$date        = ($item->displayDate ? date('r', strtotime($item->displayDate)) : '');
+
+				// Load individual item creator class
+				$feeditem              = new JFeedItem;
+				$feeditem->title       = $title;
+				$feeditem->link        = JRoute::_($item->link);
+				$feeditem->description = $description;
+				$feeditem->date        = $date;
+				$feeditem->category    = $title;
+				$feeditem->author      = $author;
+
+				if ($feedEmail === 'site')
+				{
+					$item->authorEmail = $siteEmail;
+				}
+				elseif ($feedEmail === 'author')
+				{
+					$item->authorEmail = $item->author_email;
+				}
+
+				// Loads item info into RSS array
+				$document->addItem($feeditem);
+			}
+		}
+	}
+}
diff --git a/core/components/com_tags/views/tag/view.html.php b/core/components/com_tags/views/tag/view.html.php
new file mode 100644
index 00000000..6746f7fa
--- /dev/null
+++ b/core/components/com_tags/views/tag/view.html.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTML View class for the Tags component
+ *
+ * @since  3.1
+ */
+class TagsViewTag extends JViewLegacy
+{
+	/**
+	 * The model state
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  3.1
+	 */
+	protected $state;
+
+	/**
+	 * An array of items.
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $items;
+
+	/**
+	 * The active JObject (on success, false on failure)
+	 *
+	 * @var    JObject|boolean
+	 * @since  3.1
+	 */
+	protected $item;
+
+	/**
+	 * Array of Children objects
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $children;
+
+	/**
+	 * The pagination object.
+	 *
+	 * @var    JPagination
+	 * @since  3.1
+	 */
+	protected $pagination;
+
+	/**
+	 * The application parameters
+	 *
+	 * @var    \Joomla\Registry\Registry  The parameters object
+	 * @since  3.1
+	 */
+	protected $params;
+
+	/**
+	 * Array of tags title
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $tags_title;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.1
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
+
+		// Get some data from the models
+		$state      = $this->get('State');
+		$items      = $this->get('Items');
+		$item       = $this->get('Item');
+		$children   = $this->get('Children');
+		$parent     = $this->get('Parent');
+		$pagination = $this->get('Pagination');
+
+		/*
+		 * // Change to catch
+		 * if (count($errors = $this->get('Errors'))) {
+		 * JError::raiseError(500, implode("\n", $errors));
+		 * return false;
+		 */
+
+		// Check whether access level allows access.
+		// @TODO: Should already be computed in $item->params->get('access-view')
+		$user   = JFactory::getUser();
+		$groups = $user->getAuthorisedViewLevels();
+
+		foreach ($item as $itemElement)
+		{
+			if (!in_array($itemElement->access, $groups))
+			{
+				unset($itemElement);
+			}
+
+			// Prepare the data.
+			if (!empty($itemElement))
+			{
+				$temp = new Registry($itemElement->params);
+				$itemElement->params = clone $params;
+				$itemElement->params->merge($temp);
+				$itemElement->params = (array) json_decode($itemElement->params);
+			}
+		}
+
+		if ($items !== false)
+		{
+			JPluginHelper::importPlugin('content');
+
+			foreach ($items as $itemElement)
+			{
+				$itemElement->event = new stdClass;
+
+				// For some plugins.
+				!empty($itemElement->core_body) ? $itemElement->text = $itemElement->core_body : $itemElement->text = null;
+
+				$dispatcher = JEventDispatcher::getInstance();
+
+				$dispatcher->trigger('onContentPrepare', array ('com_tags.tag', &$itemElement, &$itemElement->core_params, 0));
+
+				$results = $dispatcher->trigger('onContentAfterTitle', array('com_tags.tag', &$itemElement, &$itemElement->core_params, 0));
+				$itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
+
+				$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_tags.tag', &$itemElement, &$itemElement->core_params, 0));
+				$itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
+
+				$results = $dispatcher->trigger('onContentAfterDisplay', array('com_tags.tag', &$itemElement, &$itemElement->core_params, 0));
+				$itemElement->event->afterDisplayContent = trim(implode("\n", $results));
+
+				// Write the results back into the body
+				if (!empty($itemElement->core_body))
+				{
+					$itemElement->core_body = $itemElement->text;
+				}
+
+				// Categories store the images differently so lets re-map it so the display is correct
+				if ($itemElement->type_alias === 'com_content.category')
+				{
+					$coreParams = json_decode($itemElement->core_params);
+					$itemElement->core_images = json_encode(array('image_intro' => $coreParams->image, 'image_intro_alt' => $coreParams->image_alt));
+				}
+			}
+		}
+
+		$this->state      = $state;
+		$this->items      = $items;
+		$this->children   = $children;
+		$this->parent     = $parent;
+		$this->pagination = $pagination;
+		$this->user       = $user;
+		$this->item       = $item;
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		// Merge tag params. If this is single-tag view, menu params override tag params
+		// Otherwise, article params override menu item params
+		$this->params = $this->state->get('params');
+		$active       = $app->getMenu()->getActive();
+		$temp         = clone $this->params;
+
+		// Convert item params to a Registry object
+		$item[0]->params = new Registry($item[0]->params);
+
+		// Check to see which parameters should take priority
+		if ($active)
+		{
+			$currentLink = $active->link;
+
+			// If the current view is the active item and a tag view for one tag, then the menu item params take priority
+			if (strpos($currentLink, 'view=tag') && strpos($currentLink, '&id[0]=' . (string) $item[0]->id))
+			{
+				// $item[0]->params are the tag params, $temp are the menu item params
+				// Merge so that the menu item params take priority
+				$item[0]->params->merge($temp);
+
+				// Load layout from active query (in case it is an alternative menu item)
+				if (isset($active->query['layout']))
+				{
+					$this->setLayout($active->query['layout']);
+				}
+			}
+			else
+			{
+				// Current menuitem is not a single tag view, so the tag params take priority.
+				// Merge the menu item params with the tag params so that the tag params take priority
+				$temp->merge($item[0]->params);
+				$item[0]->params = $temp;
+
+				// Check for alternative layouts (since we are not in a single-article menu item)
+				// Single-article menu item layout takes priority over alt layout for an article
+				if ($layout = $item[0]->params->get('tag_layout'))
+				{
+					$this->setLayout($layout);
+				}
+			}
+		}
+		else
+		{
+			// Merge so that item params take priority
+			$temp->merge($item[0]->params);
+			$item[0]->params = $temp;
+
+			// Check for alternative layouts (since we are not in a single-tag menu item)
+			// Single-tag menu item layout takes priority over alt layout for an article
+			if ($layout = $item[0]->params->get('tag_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+
+		// Increment the hit counter
+		$model = $this->getModel();
+		$model->hit();
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 */
+	protected function _prepareDocument()
+	{
+		$app              = JFactory::getApplication();
+		$menu             = $app->getMenu()->getActive();
+		$this->tags_title = $this->getTagsTitle();
+		$title            = '';
+
+		// Highest priority for "Browser Page Title".
+		if ($menu)
+		{
+			$title = $menu->params->get('page_title', '');
+		}
+
+		if ($this->tags_title)
+		{
+			$this->params->def('page_heading', $this->tags_title);
+			$title = $title ?: $this->tags_title;
+		}
+		elseif ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+			$title = $title ?: $this->params->get('page_title', $menu->title);
+
+			if ($menu->query['option'] !== 'com_tags')
+			{
+				$this->params->set('page_subheading', $menu->title);
+			}
+		}
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		foreach ($this->item as $itemElement)
+		{
+			if ($itemElement->metadesc)
+			{
+				$this->document->setDescription($itemElement->metadesc);
+			}
+			elseif ($this->params->get('menu-meta_description'))
+			{
+				$this->document->setDescription($this->params->get('menu-meta_description'));
+			}
+
+			if ($itemElement->metakey)
+			{
+				$this->document->setMetadata('keywords', $itemElement->metakey);
+			}
+			elseif ($this->params->get('menu-meta_keywords'))
+			{
+				$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+			}
+
+			if ($this->params->get('robots'))
+			{
+				$this->document->setMetadata('robots', $this->params->get('robots'));
+			}
+		}
+
+		// @TODO: create tag feed document
+		// Add alternative feed link
+
+		if ($this->params->get('show_feed_link', 1) == 1)
+		{
+			$link    = '&format=feed&limitstart=';
+			$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+			$attribs = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+		}
+	}
+
+	/**
+	 * Creates the tags title for the output
+	 *
+	 * @return  boolean
+	 */
+	protected function getTagsTitle()
+	{
+		$tags_title = array();
+
+		if (!empty($this->item))
+		{
+			$user   = JFactory::getUser();
+			$groups = $user->getAuthorisedViewLevels();
+
+			foreach ($this->item as $item)
+			{
+				if (in_array($item->access, $groups))
+				{
+					$tags_title[] = $item->title;
+				}
+			}
+		}
+
+		return implode(' ', $tags_title);
+	}
+}
diff --git a/core/components/com_tags/views/tags/tmpl/default.php b/core/components/com_tags/views/tags/tmpl/default.php
new file mode 100644
index 00000000..bb0a47da
--- /dev/null
+++ b/core/components/com_tags/views/tags/tmpl/default.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Note that there are certain parts of this layout used only when there is exactly one tag.
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+$description      = $this->params->get('all_tags_description');
+$descriptionImage = $this->params->get('all_tags_description_image');
+
+?>
+<div class="tag-category<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+	<?php if ($this->params->get('all_tags_show_description_image') && !empty($descriptionImage)) : ?>
+		<div>
+			<img src="<?php echo $descriptionImage; ?>" />
+		</div>
+	<?php endif; ?>
+	<?php if (!empty($description)) : ?>
+		<div>
+			<?php echo $description; ?>
+		</div>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('items'); ?>
+</div>
diff --git a/core/components/com_tags/views/tags/tmpl/default.xml b/core/components/com_tags/views/tags/tmpl/default.xml
new file mode 100644
index 00000000..209ad1ad
--- /dev/null
+++ b/core/components/com_tags/views/tags/tmpl/default.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_tags_tags_view_default_title" option="com_tags_tag_view_default_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_TAGS_ITEMS_LIST_ALL"
+		/>
+		<message>
+			<![CDATA[com_tags_tags_view_default_desc]]>
+		</message>
+	</layout>
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request">
+		
+			<field 
+				name="parent_id" 
+				type="tag" 
+				label="COM_TAGS_FIELD_PARENT_TAG_LABEL"
+				description="COM_TAGS_FIELD_PARENT_TAG_DESC"
+				mode="nested"
+				>
+				<option value="">JNONE</option>
+				<option value="1">JGLOBAL_ROOT</option>
+			</field>
+			
+			<field 
+				name="tag_list_language_filter"
+				type="contentlanguage"
+				label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
+				description="COM_TAGS_FIELD_LANGUAGE_FILTER_DESC"
+				default=""
+				useglobal="true"
+				>
+				<option value="all">JALL</option>
+				<option value="current_language">JCURRENT</option>
+			</field>
+			
+		</fieldset>
+	</fields>
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic">
+			
+			<field
+				name="tag_columns"
+				type="number"
+				label="COM_TAGS_COMPACT_COLUMNS_LABEL"
+				description="COM_TAGS_NUMBER_COLUMNS_DESC"
+				default="4"
+				filter="integer"
+			/>
+
+			<field 
+				name="all_tags_description" 
+				type="textarea"
+				label="COM_TAGS_SHOW_ALL_TAGS_DESCRIPTION_LABEL"
+				description="COM_TAGS_ALL_TAGS_DESCRIPTION_DESC"
+				class="inputbox"
+				rows="3" 
+				cols="30" 
+				filter="safehtml"
+			/>
+
+			<field 
+				name="all_tags_show_description_image" 
+				type="list"
+				label="COM_TAGS_SHOW_ALL_TAGS_IMAGE_LABEL"
+				description="COM_TAGS_SHOW_ALL_TAGS_IMAGE_DESC"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="all_tags_description_image" 
+				type="media"
+				label="COM_TAGS_ALL_TAGS_MEDIA_LABEL"
+				description="COM_TAGS_ALL_TAGS_MEDIA_DESC"
+			/>
+
+			<field 
+				name="all_tags_orderby"
+				type="list"
+				label="JGLOBAL_FIELD_FIELD_ORDERING_LABEL"
+				description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"
+				useglobal="true"
+				>
+				<option value="title">JGLOBAL_TITLE</option>
+				<option value="hits">JGLOBAL_HITS</option>
+				<option value="created_time">JGLOBAL_CREATED_DATE</option>
+				<option value="modified_time">JGLOBAL_MODIFIED_DATE</option>
+				<option value="publish_up">JGLOBAL_PUBLISHED_DATE</option>
+			</field>
+
+			<field 
+				name="all_tags_orderby_direction" 
+				type="list"
+				label="JGLOBAL_ORDER_DIRECTION_LABEL"
+				description="JGLOBAL_ORDER_DIRECTION_DESC"
+				useglobal="true"
+				>
+				<option value="ASC">JGLOBAL_ORDER_ASCENDING</option>
+				<option value="DESC">JGLOBAL_ORDER_DESCENDING</option>
+			</field>
+
+			<field 
+				name="all_tags_show_tag_image" 
+				type="list"
+				label="COM_TAGS_SHOW_ITEM_IMAGE_LABEL"
+				description="COM_TAGS_SHOW_ITEM_IMAGE_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field 
+				name="all_tags_show_tag_description" 
+				type="list"
+				label="COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL"
+				description="COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="all_tags_tag_maximum_characters"
+				type="number"
+				label="COM_TAGS_LIST_MAX_CHARACTERS_LABEL"
+				description="COM_TAGS_LIST_MAX_CHARACTERS_DESC"
+				filter="integer"
+			/>
+
+			<field 
+				name="all_tags_show_tag_hits" 
+				type="list"
+				label="JGLOBAL_HITS"
+				description="COM_TAGS_FIELD_CONFIG_HITS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			
+		</fieldset>
+		<fieldset 
+			name="selection" 
+			label="COM_TAGS_LIST_ALL_SELECTION_OPTIONS"> 
+			
+			<field
+				name="maximum"
+				type="number"
+				label="COM_TAGS_LIST_MAX_LABEL"
+				description="COM_TAGS_LIST_MAX_DESC"
+				default="200"
+				filter="integer"
+			/>
+
+			<field
+				name="filter_field"
+				type="list"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		
+			<field	
+				name="show_pagination_limit" 
+				type="list"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			
+			<field 
+				name="show_pagination" 
+				type="list"
+				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			
+		</fieldset>
+		<fieldset name="integration">
+			<field
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				class="chzn-color"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
\ No newline at end of file
diff --git a/core/components/com_tags/views/tags/tmpl/default_items.php b/core/components/com_tags/views/tags/tmpl/default_items.php
new file mode 100644
index 00000000..05e3cc12
--- /dev/null
+++ b/core/components/com_tags/views/tags/tmpl/default_items.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+JHtml::_('behavior.core');
+JHtml::_('formbehavior.chosen', 'select');
+
+// Get the user object.
+$user = JFactory::getUser();
+
+// Check if user is allowed to add/edit based on tags permissions.
+$canEdit      = $user->authorise('core.edit', 'com_tags');
+$canCreate    = $user->authorise('core.create', 'com_tags');
+$canEditState = $user->authorise('core.edit.state', 'com_tags');
+
+$columns = $this->params->get('tag_columns', 1);
+
+// Avoid division by 0 and negative columns.
+if ($columns < 1)
+{
+	$columns = 1;
+}
+
+$bsspans = floor(12 / $columns);
+
+if ($bsspans < 1)
+{
+	$bsspans = 1;
+}
+
+$bscolumns = min($columns, floor(12 / $bsspans));
+$n         = count($this->items);
+
+JFactory::getDocument()->addScriptDeclaration("
+		var resetFilter = function() {
+		document.getElementById('filter-search').value = '';
+	}
+");
+
+?>
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if ($this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?>
+		<fieldset class="filters btn-toolbar">
+			<?php if ($this->params->get('filter_field')) : ?>
+				<div class="btn-group">
+					<label class="filter-search-lbl element-invisible" for="filter-search">
+						<?php echo JText::_('COM_TAGS_TITLE_FILTER_LABEL') . '&#160;'; ?>
+					</label>
+					<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_TAGS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_TAGS_TITLE_FILTER_LABEL'); ?>" />
+					<button type="button" name="filter-search-button" title="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>" onclick="document.adminForm.submit();" class="btn">
+						<span class="icon-search"></span>
+					</button>
+					<button type="reset" name="filter-clear-button" title="<?php echo JText::_('JSEARCH_FILTER_CLEAR'); ?>" class="btn" onclick="resetFilter(); document.adminForm.submit();">
+						<span class="icon-remove"></span>
+					</button>
+				</div>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_pagination_limit')) : ?>
+				<div class="btn-group pull-right">
+					<label for="limit" class="element-invisible">
+						<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+					</label>
+					<?php echo $this->pagination->getLimitBox(); ?>
+				</div>
+			<?php endif; ?>
+			<input type="hidden" name="filter_order" value="" />
+			<input type="hidden" name="filter_order_Dir" value="" />
+			<input type="hidden" name="limitstart" value="" />
+			<input type="hidden" name="task" value="" />
+			<div class="clearfix"></div>
+		</fieldset>
+	<?php endif; ?>
+	<?php if ($this->items == false || $n === 0) : ?>
+		<p><?php echo JText::_('COM_TAGS_NO_TAGS'); ?></p>
+	<?php else : ?>
+		<?php foreach ($this->items as $i => $item) : ?>
+			<?php if ($n === 1 || $i === 0 || $bscolumns === 1 || $i % $bscolumns === 0) : ?>
+				<ul class="thumbnails">
+			<?php endif; ?>
+			<?php if ((!empty($item->access)) && in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>
+				<li class="cat-list-row<?php echo $i % 2; ?>">
+					<h3>
+						<a href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($item->id . ':' . $item->alias)); ?>">
+							<?php echo $this->escape($item->title); ?>
+						</a>
+					</h3>
+			<?php endif; ?>
+			<?php if ($this->params->get('all_tags_show_tag_image') && !empty($item->images)) : ?>
+				<?php $images  = json_decode($item->images); ?>
+				<span class="tag-body">
+					<?php if (!empty($images->image_intro)) : ?>
+						<?php $imgfloat = empty($images->float_intro) ? $this->params->get('float_intro') : $images->float_intro; ?>
+						<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image">
+							<img
+								<?php if ($images->image_intro_caption) : ?>
+									<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_intro_caption) . '"'; ?>
+								<?php endif; ?>
+								src="<?php echo $images->image_intro; ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>" />
+						</div>
+					<?php endif; ?>
+				</span>
+			<?php endif; ?>
+			<div class="caption">
+				<?php if ($this->params->get('all_tags_show_tag_description', 1)) : ?>
+					<span class="tag-body">
+						<?php echo JHtml::_('string.truncate', $item->description, $this->params->get('all_tags_tag_maximum_characters')); ?>
+					</span>
+				<?php endif; ?>
+				<?php if ($this->params->get('all_tags_show_tag_hits')) : ?>
+					<span class="list-hits badge badge-info">
+						<?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $item->hits); ?>
+					</span>
+				<?php endif; ?>
+			</div>
+			</li>
+			<?php if (($i === 0 && $n === 1) || $i === $n - 1 || $bscolumns === 1 || (($i + 1) % $bscolumns === 0)) : ?>
+				</ul>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	<?php endif; ?>
+	<?php // Add pagination links ?>
+	<?php if (!empty($this->items)) : ?>
+		<?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+			<div class="pagination">
+				<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+					<p class="counter pull-right">
+						<?php echo $this->pagination->getPagesCounter(); ?>
+					</p>
+				<?php endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
+			</div>
+		<?php endif; ?>
+	<?php endif; ?>
+</form>
+
diff --git a/core/components/com_tags/views/tags/view.feed.php b/core/components/com_tags/views/tags/view.feed.php
new file mode 100644
index 00000000..5001b61e
--- /dev/null
+++ b/core/components/com_tags/views/tags/view.feed.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Tags component all tags view
+ *
+ * @since  3.1
+ */
+class TagsViewTags extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app            = JFactory::getApplication();
+		$document       = JFactory::getDocument();
+		$document->link = JRoute::_('index.php?option=com_tags&view=tags');
+
+		$app->input->set('limit', $app->get('feed_limit'));
+		$siteEmail        = $app->get('mailfrom');
+		$fromName         = $app->get('fromname');
+		$feedEmail        = $app->get('feed_email', 'none');
+		$document->editor = $fromName;
+
+		if ($feedEmail !== 'none')
+		{
+			$document->editorEmail = $siteEmail;
+		}
+
+		// Get some data from the model
+		$items = $this->get('Items');
+
+		foreach ($items as $item)
+		{
+			// Strip HTML from feed item title
+			$title = $this->escape($item->title);
+			$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+
+			// Strip HTML from feed item description text
+			$description = $item->description;
+			$author      = $item->created_by_alias ?: $item->created_by_user_name;
+			$date        = $item->created_time ? date('r', strtotime($item->created_time)) : '';
+
+			// Load individual item creator class
+			$feeditem = new JFeedItem;
+			$feeditem->title       = $title;
+			$feeditem->link        = '/index.php?option=com_tags&view=tag&id=' . (int) $item->id;
+			$feeditem->description = $description;
+			$feeditem->date        = $date;
+			$feeditem->category    = 'All Tags';
+			$feeditem->author      = $author;
+
+			if ($feedEmail === 'site')
+			{
+				$feeditem->authorEmail = $siteEmail;
+			}
+
+			if ($feedEmail === 'author')
+			{
+				$feeditem->authorEmail = $item->email;
+			}
+
+			// Loads item info into RSS array
+			$document->addItem($feeditem);
+		}
+	}
+}
diff --git a/core/components/com_tags/views/tags/view.html.php b/core/components/com_tags/views/tags/view.html.php
new file mode 100644
index 00000000..4d89eac1
--- /dev/null
+++ b/core/components/com_tags/views/tags/view.html.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTML View class for the Tags component
+ *
+ * @since  3.1
+ */
+class TagsViewTags extends JViewLegacy
+{
+	protected $state;
+
+	protected $items;
+
+	protected $item;
+
+	protected $pagination;
+
+	protected $params;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed   A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
+
+		// Get some data from the models
+		$state      = $this->get('State');
+		$items      = $this->get('Items');
+		$item       = $this->get('Item');
+		$pagination = $this->get('Pagination');
+
+		/*
+		 * // Change to catch
+		 * if (count($errors = $this->get('Errors'))) {
+		 * JError::raiseError(500, implode("\n", $errors));
+		 * return false;
+		 */
+
+		// Check whether access level allows access.
+		// @todo: Should already be computed in $item->params->get('access-view')
+		$user   = JFactory::getUser();
+		$groups = $user->getAuthorisedViewLevels();
+
+		if (!empty($items))
+		{
+			foreach ($items as $itemElement)
+			{
+				if (!in_array($itemElement->access, $groups))
+				{
+					unset($itemElement);
+				}
+
+				// Prepare the data.
+				$temp = new Registry($itemElement->params);
+				$itemElement->params = clone $params;
+				$itemElement->params->merge($temp);
+				$itemElement->params = (array) json_decode($itemElement->params);
+			}
+		}
+
+		$this->state      = &$state;
+		$this->items      = &$items;
+		$this->pagination = &$pagination;
+		$this->user       = &$user;
+		$this->item       = &$item;
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		// Merge tag params. If this is single-tag view, menu params override tag params
+		// Otherwise, article params override menu item params
+		$this->params = $this->state->get('params');
+		$active       = $app->getMenu()->getActive();
+		$temp         = clone $this->params;
+
+		// Check to see which parameters should take priority
+		if ($active)
+		{
+			$currentLink = $active->link;
+
+			// If the current view is the active item and the tags view, then the menu item params take priority
+			if (strpos($currentLink, 'view=tags'))
+			{
+				$this->params = $active->params;
+				$this->params->merge($temp);
+
+				// Load layout from active query (in case it is an alternative menu item)
+				if (isset($active->query['layout']))
+				{
+					$this->setLayout($active->query['layout']);
+				}
+			}
+			else
+			{
+				// Current view is not a single tag, so the tag params take priority here
+				// Merge the menu item params with the tag params so that the tag params take priority
+				$temp->merge($item->params);
+				$item->params = $temp;
+
+				// Check for alternative layouts (since we are not in a single-article menu item)
+				// Single tag menu item layout takes priority over alt layout for a tag
+				if ($layout = $item->params->get('tag_layout'))
+				{
+					$this->setLayout($layout);
+				}
+			}
+		}
+		elseif (!empty($items[0]))
+		{
+			// Merge so that tag params take priority
+			$temp->merge($items[0]->params);
+			$items[0]->params = $temp;
+
+			// Check for alternative layouts (since we are not in a single-tag menu item)
+			// Single-tag menu item layout takes priority over alt layout for a tag
+			if ($layout = $items[0]->params->get('tag_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return void
+	 */
+	protected function _prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_TAGS_DEFAULT_PAGE_TITLE'));
+		}
+
+		if ($menu && $menu->query['option'] !== 'com_tags')
+		{
+			$this->params->set('page_subheading', $menu->title);
+		}
+
+		// Set metadata for all tags menu item
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		// If this is not a single tag menu item, set the page title to the tag titles
+		$title = '';
+
+		if (!empty($this->item))
+		{
+			foreach ($this->item as $i => $itemElement)
+			{
+				if ($itemElement->title)
+				{
+					if ($i != 0)
+					{
+						$title .= ', ';
+					}
+
+					$title .= $itemElement->title;
+				}
+			}
+
+			if (empty($title))
+			{
+				$title = $app->get('sitename');
+			}
+			elseif ($app->get('sitename_pagetitles', 0) == 1)
+			{
+				$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+			}
+			elseif ($app->get('sitename_pagetitles', 0) == 2)
+			{
+				$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+			}
+
+			$this->document->setTitle($title);
+
+			foreach ($this->item as $itemElement)
+			{
+				if ($itemElement->metadesc)
+				{
+					$this->document->setDescription($this->item->metadesc);
+				}
+				elseif ($this->params->get('menu-meta_description'))
+				{
+					$this->document->setDescription($this->params->get('menu-meta_description'));
+				}
+
+				if ($itemElement->metakey)
+				{
+					$this->document->setMetadata('keywords', $this->tag->metakey);
+				}
+				elseif ($this->params->get('menu-meta_keywords'))
+				{
+					$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+				}
+
+				if ($this->params->get('robots'))
+				{
+					$this->document->setMetadata('robots', $this->params->get('robots'));
+				}
+
+				if ($app->get('MetaAuthor') == '1')
+				{
+					$this->document->setMetaData('author', $itemElement->created_user_id);
+				}
+
+				$mdata = $this->item->metadata->toArray();
+
+				foreach ($mdata as $k => $v)
+				{
+					if ($v)
+					{
+						$this->document->setMetadata($k, $v);
+					}
+				}
+			}
+		}
+
+		// Respect configuration Sitename Before/After for TITLE in views All Tags.
+		if (!$title && ($pos = $app->get('sitename_pagetitles', 0)))
+		{
+			$title = $this->document->getTitle();
+
+			if ($pos == 1)
+			{
+				$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+			}
+			else
+			{
+				$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+			}
+
+			$this->document->setTitle($title);
+		}
+
+		// Add alternative feed link
+		if ($this->params->get('show_feed_link', 1) == 1)
+		{
+			$link    = '&format=feed&limitstart=';
+			$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+			$attribs = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+		}
+	}
+}
diff --git a/core/components/com_users/controller.php b/core/components/com_users/controller.php
new file mode 100644
index 00000000..efd7965f
--- /dev/null
+++ b/core/components/com_users/controller.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Base controller class for Users.
+ *
+ * @since  1.5
+ */
+class UsersController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		// Get the document object.
+		$document = JFactory::getDocument();
+
+		// Set the default view name and format from the Request.
+		$vName   = $this->input->getCmd('view', 'login');
+		$vFormat = $document->getType();
+		$lName   = $this->input->getCmd('layout', 'default');
+
+		if ($view = $this->getView($vName, $vFormat))
+		{
+			// Do any specific processing by view.
+			switch ($vName)
+			{
+				case 'registration':
+					// If the user is already logged in, redirect to the profile page.
+					$user = JFactory::getUser();
+
+					if ($user->get('guest') != 1)
+					{
+						// Redirect to profile page.
+						$this->setRedirect(JRoute::_('index.php?option=com_users&view=profile', false));
+
+						return;
+					}
+
+					// Check if user registration is enabled
+					if (JComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0)
+					{
+						// Registration is disabled - Redirect to login page.
+						$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+						return;
+					}
+
+					// The user is a guest, load the registration model and show the registration page.
+					$model = $this->getModel('Registration');
+					break;
+
+				// Handle view specific models.
+				case 'profile':
+
+					// If the user is a guest, redirect to the login page.
+					$user = JFactory::getUser();
+
+					if ($user->get('guest') == 1)
+					{
+						// Redirect to login page.
+						$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+						return;
+					}
+
+					$model = $this->getModel($vName);
+					break;
+
+				// Handle the default views.
+				case 'login':
+					$model = $this->getModel($vName);
+					break;
+
+				case 'reset':
+					// If the user is already logged in, redirect to the profile page.
+					$user = JFactory::getUser();
+
+					if ($user->get('guest') != 1)
+					{
+						// Redirect to profile page.
+						$this->setRedirect(JRoute::_('index.php?option=com_users&view=profile', false));
+
+						return;
+					}
+
+					$model = $this->getModel($vName);
+					break;
+
+				case 'remind':
+					// If the user is already logged in, redirect to the profile page.
+					$user = JFactory::getUser();
+
+					if ($user->get('guest') != 1)
+					{
+						// Redirect to profile page.
+						$this->setRedirect(JRoute::_('index.php?option=com_users&view=profile', false));
+
+						return;
+					}
+
+					$model = $this->getModel($vName);
+					break;
+
+				default:
+					$model = $this->getModel('Login');
+					break;
+			}
+
+			// Push the model into the view (as default).
+			$view->setModel($model, true);
+			$view->setLayout($lName);
+
+			// Push document object into the view.
+			$view->document = $document;
+
+			$view->display();
+		}
+	}
+}
diff --git a/core/components/com_users/controllers/profile.json.php b/core/components/com_users/controllers/profile.json.php
new file mode 100644
index 00000000..fc29aa1f
--- /dev/null
+++ b/core/components/com_users/controllers/profile.json.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersControllerProfile_Base_Json', __DIR__ . '/profile_base_json.php');
+
+/**
+ * Profile controller class for Users.
+ *
+ * @since  1.6
+ */
+class UsersControllerProfile extends UsersControllerProfile_Base_Json
+{
+}
diff --git a/core/components/com_users/controllers/profile.php b/core/components/com_users/controllers/profile.php
new file mode 100644
index 00000000..3175402a
--- /dev/null
+++ b/core/components/com_users/controllers/profile.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
+
+/**
+ * Profile controller class for Users.
+ *
+ * @since  1.6
+ */
+class UsersControllerProfile extends UsersController
+{
+	/**
+	 * Method to check out a user for editing and redirect to the edit form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function edit()
+	{
+		$app         = JFactory::getApplication();
+		$user        = JFactory::getUser();
+		$loginUserId = (int) $user->get('id');
+
+		// Get the previous user id (if any) and the current user id.
+		$previousId = (int) $app->getUserState('com_users.edit.profile.id');
+		$userId     = $this->input->getInt('user_id');
+
+		// Check if the user is trying to edit another users profile.
+		if ($userId != $loginUserId)
+		{
+			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+			$app->setHeader('status', 403, true);
+
+			return false;
+		}
+
+		$cookieLogin = $user->get('cookieLogin');
+
+		// Check if the user logged in with a cookie
+		if (!empty($cookieLogin))
+		{
+			// If so, the user must login to edit the password and other data.
+			$app->enqueueMessage(JText::_('JGLOBAL_REMEMBER_MUST_LOGIN'), 'message');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+			return false;
+		}
+
+		// Set the user id for the user to edit in the session.
+		$app->setUserState('com_users.edit.profile.id', $userId);
+
+		// Get the model.
+		$model = $this->getModel('Profile', 'UsersModel');
+
+		// Check out the user.
+		if ($userId)
+		{
+			$model->checkout($userId);
+		}
+
+		// Check in the previous user.
+		if ($previousId)
+		{
+			$model->checkin($previousId);
+		}
+
+		// Redirect to the edit screen.
+		$this->setRedirect(JRoute::_('index.php?option=com_users&view=profile&layout=edit', false));
+
+		return true;
+	}
+
+	/**
+	 * Method to save a user's profile data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function save()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		$app    = JFactory::getApplication();
+		$model  = $this->getModel('Profile', 'UsersModel');
+		$user   = JFactory::getUser();
+		$userId = (int) $user->get('id');
+
+		// Get the user data.
+		$requestData = $app->input->post->get('jform', array(), 'array');
+
+		// Force the ID to this user.
+		$requestData['id'] = $userId;
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		// Send an object which can be modified through the plugin event
+		$objData = (object) $requestData;
+		$app->triggerEvent(
+			'onContentNormaliseRequestData',
+			array('com_users.user', $objData, $form)
+		);
+		$requestData = (array) $objData;
+
+		// Validate the posted data.
+		$data = $model->validate($form, $requestData);
+
+		// Check for errors.
+		if ($data === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Unset the passwords.
+			unset($requestData['password1'], $requestData['password2']);
+
+			// Save the data in the session.
+			$app->setUserState('com_users.edit.profile.data', $requestData);
+
+			// Redirect back to the edit screen.
+			$userId = (int) $app->getUserState('com_users.edit.profile.id');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=profile&layout=edit&user_id=' . $userId, false));
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		$return = $model->save($data);
+
+		// Check for errors.
+		if ($return === false)
+		{
+			// Save the data in the session.
+			$app->setUserState('com_users.edit.profile.data', $data);
+
+			// Redirect back to the edit screen.
+			$userId = (int) $app->getUserState('com_users.edit.profile.id');
+			$this->setMessage(JText::sprintf('COM_USERS_PROFILE_SAVE_FAILED', $model->getError()), 'warning');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=profile&layout=edit&user_id=' . $userId, false));
+
+			return false;
+		}
+
+		// Redirect the user and adjust session state based on the chosen task.
+		switch ($this->getTask())
+		{
+			case 'apply':
+				// Check out the profile.
+				$app->setUserState('com_users.edit.profile.id', $return);
+				$model->checkout($return);
+
+				// Redirect back to the edit screen.
+				$this->setMessage(JText::_('COM_USERS_PROFILE_SAVE_SUCCESS'));
+
+				$redirect = $app->getUserState('com_users.edit.profile.redirect');
+
+				// Don't redirect to an external URL.
+				if (!JUri::isInternal($redirect))
+				{
+					$redirect = null;
+				}
+
+				if (!$redirect)
+				{
+					$redirect = 'index.php?option=com_users&view=profile&layout=edit&hidemainmenu=1';
+				}
+
+				$this->setRedirect(JRoute::_($redirect, false));
+				break;
+
+			default:
+				// Check in the profile.
+				$userId = (int) $app->getUserState('com_users.edit.profile.id');
+
+				if ($userId)
+				{
+					$model->checkin($userId);
+				}
+
+				// Clear the profile id from the session.
+				$app->setUserState('com_users.edit.profile.id', null);
+
+				$redirect = $app->getUserState('com_users.edit.profile.redirect');
+
+				// Don't redirect to an external URL.
+				if (!JUri::isInternal($redirect))
+				{
+					$redirect = null;
+				}
+
+				if (!$redirect)
+				{
+					$redirect = 'index.php?option=com_users&view=profile&user_id=' . $return;
+				}
+
+				// Redirect to the list screen.
+				$this->setMessage(JText::_('COM_USERS_PROFILE_SAVE_SUCCESS'));
+				$this->setRedirect(JRoute::_($redirect, false));
+				break;
+		}
+
+		// Flush the data from the session.
+		$app->setUserState('com_users.edit.profile.data', null);
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model      The data model object.
+	 * @param   array         $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		$item = $model->getData();
+		$tags = $validData['tags'];
+
+		if ($tags)
+		{
+			$item->tags = new JHelperTags;
+			$item->tags->getTagIds($item->id, 'com_users.user');
+			$item->metadata['tags'] = $item->tags;
+		}
+	}
+}
diff --git a/core/components/com_users/controllers/profile_base_json.php b/core/components/com_users/controllers/profile_base_json.php
new file mode 100644
index 00000000..f1b5f9ad
--- /dev/null
+++ b/core/components/com_users/controllers/profile_base_json.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Profile controller class for Users.
+ *
+ * @since  3.5
+ */
+class UsersControllerProfile_Base_Json extends JControllerLegacy
+{
+	/**
+	 * Returns the updated options for help site selector
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 * @throws  Exception
+	 */
+	public function gethelpsites()
+	{
+		jimport('joomla.filesystem.file');
+
+		// Set FTP credentials, if given
+		JClientHelper::setCredentialsFromRequest('ftp');
+
+		if (($data = file_get_contents('https://update.joomla.org/helpsites/helpsites.xml')) === false)
+		{
+			throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 500);
+		}
+		elseif (!JFile::write(JPATH_ADMINISTRATOR . '/help/helpsites.xml', $data))
+		{
+			throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 500);
+		}
+
+		$options = array_merge(
+			array(
+				JHtml::_('select.option', '', JText::_('JOPTION_USE_DEFAULT'))
+			),
+			JHelp::createSiteList(JPATH_ADMINISTRATOR . '/help/helpsites.xml')
+		);
+
+		echo json_encode($options);
+		JFactory::getApplication()->close();
+	}
+}
diff --git a/core/components/com_users/controllers/registration.php b/core/components/com_users/controllers/registration.php
new file mode 100644
index 00000000..e3c94933
--- /dev/null
+++ b/core/components/com_users/controllers/registration.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
+
+/**
+ * Registration controller class for Users.
+ *
+ * @since  1.6
+ */
+class UsersControllerRegistration extends UsersController
+{
+	/**
+	 * Method to activate a user.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function activate()
+	{
+		$user  	 = JFactory::getUser();
+		$input 	 = JFactory::getApplication()->input;
+		$uParams = JComponentHelper::getParams('com_users');
+
+		// Check for admin activation. Don't allow non-super-admin to delete a super admin
+		if ($uParams->get('useractivation') != 2 && $user->get('id'))
+		{
+			$this->setRedirect('index.php');
+
+			return true;
+		}
+
+		// If user registration or account activation is disabled, throw a 403.
+		if ($uParams->get('useractivation') == 0 || $uParams->get('allowUserRegistration') == 0)
+		{
+			JError::raiseError(403, JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
+
+			return false;
+		}
+
+		$model = $this->getModel('Registration', 'UsersModel');
+		$token = $input->getAlnum('token');
+
+		// Check that the token is in a valid format.
+		if ($token === null || strlen($token) !== 32)
+		{
+			JError::raiseError(403, JText::_('JINVALID_TOKEN'));
+
+			return false;
+		}
+
+		// Attempt to activate the user.
+		$return = $model->activate($token);
+
+		// Check for errors.
+		if ($return === false)
+		{
+			// Redirect back to the home page.
+			$this->setMessage(JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $model->getError()), 'error');
+			$this->setRedirect('index.php');
+
+			return false;
+		}
+
+		$useractivation = $uParams->get('useractivation');
+
+		// Redirect to the login screen.
+		if ($useractivation == 0)
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_SAVE_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+		}
+		elseif ($useractivation == 1)
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_ACTIVATE_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+		}
+		elseif ($return->getParam('activate'))
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_VERIFY_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration&layout=complete', false));
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_ADMINACTIVATE_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration&layout=complete', false));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to register a user.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function register()
+	{
+		// Check for request forgeries.
+		$this->checkToken();
+
+		// If registration is disabled - Redirect to login page.
+		if (JComponentHelper::getParams('com_users')->get('allowUserRegistration') == 0)
+		{
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+			return false;
+		}
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel('Registration', 'UsersModel');
+
+		// Get the user data.
+		$requestData = $this->input->post->get('jform', array(), 'array');
+
+		// Validate the posted data.
+		$form = $model->getForm();
+
+		if (!$form)
+		{
+			JError::raiseError(500, $model->getError());
+
+			return false;
+		}
+
+		$data = $model->validate($form, $requestData);
+
+		// Check for validation errors.
+		if ($data === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'error');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'error');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState('com_users.registration.data', $requestData);
+
+			// Redirect back to the registration screen.
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration', false));
+
+			return false;
+		}
+
+		// Attempt to save the data.
+		$return = $model->register($data);
+
+		// Check for errors.
+		if ($return === false)
+		{
+			// Save the data in the session.
+			$app->setUserState('com_users.registration.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->setMessage($model->getError(), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration', false));
+
+			return false;
+		}
+
+		// Flush the data from the session.
+		$app->setUserState('com_users.registration.data', null);
+
+		// Redirect to the profile screen.
+		if ($return === 'adminactivate')
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_COMPLETE_VERIFY'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration&layout=complete', false));
+		}
+		elseif ($return === 'useractivate')
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_COMPLETE_ACTIVATE'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=registration&layout=complete', false));
+		}
+		else
+		{
+			$this->setMessage(JText::_('COM_USERS_REGISTRATION_SAVE_SUCCESS'));
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false));
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_users/controllers/remind.php b/core/components/com_users/controllers/remind.php
new file mode 100644
index 00000000..740c468a
--- /dev/null
+++ b/core/components/com_users/controllers/remind.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
+
+/**
+ * Reset controller class for Users.
+ *
+ * @since  1.6
+ */
+class UsersControllerRemind extends UsersController
+{
+	/**
+	 * Method to request a username reminder.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function remind()
+	{
+		// Check the request token.
+		$this->checkToken('post');
+
+		$model = $this->getModel('Remind', 'UsersModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Submit the password reset request.
+		$return	= $model->processRemindRequest($data);
+
+		// Check for a hard error.
+		if ($return == false)
+		{
+			// The request failed.
+			// Go back to the request form.
+			$message = JText::sprintf('COM_USERS_REMIND_REQUEST_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=remind', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// The request succeeded.
+			// Proceed to step two.
+			$message = JText::_('COM_USERS_REMIND_REQUEST_SUCCESS');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false), $message);
+
+			return true;
+		}
+	}
+}
diff --git a/core/components/com_users/controllers/reset.php b/core/components/com_users/controllers/reset.php
new file mode 100644
index 00000000..081be666
--- /dev/null
+++ b/core/components/com_users/controllers/reset.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
+
+/**
+ * Reset controller class for Users.
+ *
+ * @since  1.6
+ */
+class UsersControllerReset extends UsersController
+{
+	/**
+	 * Method to request a password reset.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function request()
+	{
+		// Check the request token.
+		$this->checkToken('post');
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel('Reset', 'UsersModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Submit the password reset request.
+		$return	= $model->processResetRequest($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			if ($app->get('error_reporting'))
+			{
+				$message = $return->getMessage();
+			}
+			else
+			{
+				$message = JText::_('COM_USERS_RESET_REQUEST_ERROR');
+			}
+
+			// Go back to the request form.
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset', false), $message, 'error');
+
+			return false;
+		}
+		elseif ($return === false)
+		{
+			// The request failed.
+			// Go back to the request form.
+			$message = JText::sprintf('COM_USERS_RESET_REQUEST_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// The request succeeded.
+			// Proceed to step two.
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset&layout=confirm', false));
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to confirm the password request.
+	 *
+	 * @return  boolean
+	 *
+	 * @access	public
+	 * @since   1.6
+	 */
+	public function confirm()
+	{
+		// Check the request token.
+		$this->checkToken('request');
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel('Reset', 'UsersModel');
+		$data  = $this->input->get('jform', array(), 'array');
+
+		// Confirm the password reset request.
+		$return	= $model->processResetConfirm($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			if ($app->get('error_reporting'))
+			{
+				$message = $return->getMessage();
+			}
+			else
+			{
+				$message = JText::_('COM_USERS_RESET_CONFIRM_ERROR');
+			}
+
+			// Go back to the confirm form.
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset&layout=confirm', false), $message, 'error');
+
+			return false;
+		}
+		elseif ($return === false)
+		{
+			// Confirm failed.
+			// Go back to the confirm form.
+			$message = JText::sprintf('COM_USERS_RESET_CONFIRM_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset&layout=confirm', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// Confirm succeeded.
+			// Proceed to step three.
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset&layout=complete', false));
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to complete the password reset process.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function complete()
+	{
+		// Check for request forgeries
+		$this->checkToken('post');
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel('Reset', 'UsersModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Complete the password reset request.
+		$return	= $model->processResetComplete($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			if ($app->get('error_reporting'))
+			{
+				$message = $return->getMessage();
+			}
+			else
+			{
+				$message = JText::_('COM_USERS_RESET_COMPLETE_ERROR');
+			}
+
+			// Go back to the complete form.
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset&layout=complete', false), $message, 'error');
+
+			return false;
+		}
+		elseif ($return === false)
+		{
+			// Complete failed.
+			// Go back to the complete form.
+			$message = JText::sprintf('COM_USERS_RESET_COMPLETE_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=reset&layout=complete', false), $message, 'notice');
+
+			return false;
+		}
+		else
+		{
+			// Complete succeeded.
+			// Proceed to the login form.
+			$message = JText::_('COM_USERS_RESET_COMPLETE_SUCCESS');
+			$this->setRedirect(JRoute::_('index.php?option=com_users&view=login', false), $message);
+
+			return true;
+		}
+	}
+}
diff --git a/core/components/com_users/controllers/user.php b/core/components/com_users/controllers/user.php
new file mode 100644
index 00000000..b3964680
--- /dev/null
+++ b/core/components/com_users/controllers/user.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersController', JPATH_COMPONENT . '/controller.php');
+
+/**
+ * Registration controller class for Users.
+ *
+ * @since  1.6
+ */
+class UsersControllerUser extends UsersController
+{
+	/**
+	 * Method to log in a user.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function login()
+	{
+		$this->checkToken('post');
+
+		$app   = JFactory::getApplication();
+		$input = $app->input->getInputForRequestMethod();
+
+		// Populate the data array:
+		$data = array();
+
+		$data['return']    = base64_decode($input->get('return', '', 'BASE64'));
+		$data['username']  = $input->get('username', '', 'USERNAME');
+		$data['password']  = $input->get('password', '', 'RAW');
+		$data['secretkey'] = $input->get('secretkey', '', 'RAW');
+
+		// Check for a simple menu item id
+		if (is_numeric($data['return']))
+		{
+			if (JLanguageMultilang::isEnabled())
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('language')
+					->from($db->quoteName('#__menu'))
+					->where('client_id = 0')
+					->where('id =' . $data['return']);
+
+				$db->setQuery($query);
+
+				try
+				{
+					$language = $db->loadResult();
+				}
+				catch (RuntimeException $e)
+				{
+					return;
+				}
+
+				if ($language !== '*')
+				{
+					$lang = '&lang=' . $language;
+				}
+				else
+				{
+					$lang = '';
+				}
+			}
+			else
+			{
+				$lang = '';
+			}
+
+			$data['return'] = 'index.php?Itemid=' . $data['return'] . $lang;
+		}
+		else
+		{
+			// Don't redirect to an external URL.
+			if (!JUri::isInternal($data['return']))
+			{
+				$data['return'] = '';
+			}
+		}
+
+		// Set the return URL if empty.
+		if (empty($data['return']))
+		{
+			$data['return'] = 'index.php?option=com_users&view=profile';
+		}
+
+		// Set the return URL in the user state to allow modification by plugins
+		$app->setUserState('users.login.form.return', $data['return']);
+
+		// Get the log in options.
+		$options = array();
+		$options['remember'] = $this->input->getBool('remember', false);
+		$options['return']   = $data['return'];
+
+		// Get the log in credentials.
+		$credentials = array();
+		$credentials['username']  = $data['username'];
+		$credentials['password']  = $data['password'];
+		$credentials['secretkey'] = $data['secretkey'];
+
+		// Perform the log in.
+		if (true !== $app->login($credentials, $options))
+		{
+			// Login failed !
+			// Clear user name, password and secret key before sending the login form back to the user.
+			$data['remember'] = (int) $options['remember'];
+			$data['username'] = '';
+			$data['password'] = '';
+			$data['secretkey'] = '';
+			$app->setUserState('users.login.form.data', $data);
+			$app->redirect(JRoute::_('index.php?option=com_users&view=login', false));
+		}
+
+		// Success
+		if ($options['remember'] == true)
+		{
+			$app->setUserState('rememberLogin', true);
+		}
+
+		$app->setUserState('users.login.form.data', array());
+		$app->redirect(JRoute::_($app->getUserState('users.login.form.return'), false));
+	}
+
+	/**
+	 * Method to log out a user.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function logout()
+	{
+		$this->checkToken('request');
+
+		$app = JFactory::getApplication();
+
+		// Prepare the logout options.
+		$options = array(
+			'clientid' => $app->get('shared_session', '0') ? null : 0,
+		);
+
+		// Perform the log out.
+		$error = $app->logout(null, $options);
+		$input = $app->input->getInputForRequestMethod();
+
+		// Check if the log out succeeded.
+		if ($error instanceof Exception)
+		{
+			$app->redirect(JRoute::_('index.php?option=com_users&view=login', false));
+		}
+
+		// Get the return URL from the request and validate that it is internal.
+		$return = $input->get('return', '', 'BASE64');
+		$return = base64_decode($return);
+
+		// Check for a simple menu item id
+		if (is_numeric($return))
+		{
+			if (JLanguageMultilang::isEnabled())
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('language')
+					->from($db->quoteName('#__menu'))
+					->where('client_id = 0')
+					->where('id =' . $return);
+
+				$db->setQuery($query);
+
+				try
+				{
+					$language = $db->loadResult();
+				}
+				catch (RuntimeException $e)
+				{
+					return;
+				}
+
+				if ($language !== '*')
+				{
+					$lang = '&lang=' . $language;
+				}
+				else
+				{
+					$lang = '';
+				}
+			}
+			else
+			{
+				$lang = '';
+			}
+
+			$return = 'index.php?Itemid=' . $return . $lang;
+		}
+		else
+		{
+			// Don't redirect to an external URL.
+			if (!JUri::isInternal($return))
+			{
+				$return = '';
+			}
+		}
+
+		// In case redirect url is not set, redirect user to homepage
+		if (empty($return))
+		{
+			$return = JUri::root();
+		}
+
+		// Redirect the user.
+		$app->redirect(JRoute::_($return, false));
+	}
+
+	/**
+	 * Method to logout directly and redirect to page.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function menulogout()
+	{
+		// Get the ItemID of the page to redirect after logout
+		$app    = JFactory::getApplication();
+		$itemid = $app->getMenu()->getActive()->params->get('logout');
+
+		// Get the language of the page when multilang is on
+		if (JLanguageMultilang::isEnabled())
+		{
+			if ($itemid)
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select('language')
+					->from($db->quoteName('#__menu'))
+					->where('client_id = 0')
+					->where('id =' . $itemid);
+
+				$db->setQuery($query);
+
+				try
+				{
+					$language = $db->loadResult();
+				}
+				catch (RuntimeException $e)
+				{
+					return;
+				}
+
+				if ($language !== '*')
+				{
+					$lang = '&lang=' . $language;
+				}
+				else
+				{
+					$lang = '';
+				}
+
+				// URL to redirect after logout
+				$url = 'index.php?Itemid=' . $itemid . $lang;
+			}
+			else
+			{
+				// Logout is set to default. Get the home page ItemID
+				$lang_code = $app->input->cookie->getString(JApplicationHelper::getHash('language'));
+				$item      = $app->getMenu()->getDefault($lang_code);
+				$itemid    = $item->id;
+
+				// Redirect to Home page after logout
+				$url = 'index.php?Itemid=' . $itemid;
+			}
+		}
+		else
+		{
+			// URL to redirect after logout, default page if no ItemID is set
+			$url = $itemid ? 'index.php?Itemid=' . $itemid : JUri::root();
+		}
+
+		// Logout and redirect
+		$this->setRedirect('index.php?option=com_users&task=user.logout&' . JSession::getFormToken() . '=1&return=' . base64_encode($url));
+	}
+
+	/**
+	 * Method to request a username reminder.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function remind()
+	{
+		// Check the request token.
+		$this->checkToken('post');
+
+		$app   = JFactory::getApplication();
+		$model = $this->getModel('User', 'UsersModel');
+		$data  = $this->input->post->get('jform', array(), 'array');
+
+		// Submit the username remind request.
+		$return = $model->processRemindRequest($data);
+
+		// Check for a hard error.
+		if ($return instanceof Exception)
+		{
+			// Get the error message to display.
+			$message = $app->get('error_reporting')
+				? $return->getMessage()
+				: JText::_('COM_USERS_REMIND_REQUEST_ERROR');
+
+			// Get the route to the next page.
+			$itemid = UsersHelperRoute::getRemindRoute();
+			$itemid = $itemid !== null ? '&Itemid=' . $itemid : '';
+			$route  = 'index.php?option=com_users&view=remind' . $itemid;
+
+			// Go back to the complete form.
+			$this->setRedirect(JRoute::_($route, false), $message, 'error');
+
+			return false;
+		}
+
+		if ($return === false)
+		{
+			// Complete failed.
+			// Get the route to the next page.
+			$itemid = UsersHelperRoute::getRemindRoute();
+			$itemid = $itemid !== null ? '&Itemid=' . $itemid : '';
+			$route  = 'index.php?option=com_users&view=remind' . $itemid;
+
+			// Go back to the complete form.
+			$message = JText::sprintf('COM_USERS_REMIND_REQUEST_FAILED', $model->getError());
+			$this->setRedirect(JRoute::_($route, false), $message, 'notice');
+
+			return false;
+		}
+
+		// Complete succeeded.
+		// Get the route to the next page.
+		$itemid = UsersHelperRoute::getLoginRoute();
+		$itemid = $itemid !== null ? '&Itemid=' . $itemid : '';
+		$route	= 'index.php?option=com_users&view=login' . $itemid;
+
+		// Proceed to the login form.
+		$message = JText::_('COM_USERS_REMIND_REQUEST_SUCCESS');
+		$this->setRedirect(JRoute::_($route, false), $message);
+
+		return true;
+	}
+
+	/**
+	 * Method to resend a user.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function resend()
+	{
+		// Check for request forgeries
+		// $this->checkToken('post');
+	}
+}
diff --git a/core/components/com_users/helpers/html/users.php b/core/components/com_users/helpers/html/users.php
new file mode 100644
index 00000000..6dbe4773
--- /dev/null
+++ b/core/components/com_users/helpers/html/users.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users Html Helper
+ *
+ * @since  1.6
+ */
+abstract class JHtmlUsers
+{
+	/**
+	 * Get the sanitized value
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  mixed  String/void
+	 *
+	 * @since   1.6
+	 */
+	public static function value($value)
+	{
+		if (is_string($value))
+		{
+			$value = trim($value);
+		}
+
+		if (empty($value))
+		{
+			return JText::_('COM_USERS_PROFILE_VALUE_NOT_FOUND');
+		}
+
+		elseif (!is_array($value))
+		{
+			return htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+		}
+	}
+
+	/**
+	 * Get the space symbol
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 */
+	public static function spacer($value)
+	{
+		return '';
+	}
+
+	/**
+	 * Get the sanitized helpsite link
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  mixed  String/void
+	 *
+	 * @since   1.6
+	 */
+	public static function helpsite($value)
+	{
+		if (empty($value))
+		{
+			return static::value($value);
+		}
+
+		$text = $value;
+
+		if ($xml = simplexml_load_file(JPATH_ADMINISTRATOR . '/help/helpsites.xml'))
+		{
+			foreach ($xml->sites->site as $site)
+			{
+				if ((string) $site->attributes()->url == $value)
+				{
+					$text = (string) $site;
+					break;
+				}
+			}
+		}
+
+		$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+
+		if (strpos($value, 'http') === 0)
+		{
+			return '<a href="' . $value . '">' . $text . '</a>';
+		}
+
+		return '<a href="http://' . $value . '">' . $text . '</a>';
+	}
+
+	/**
+	 * Get the sanitized template style
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  mixed  String/void
+	 *
+	 * @since   1.6
+	 */
+	public static function templatestyle($value)
+	{
+		if (empty($value))
+		{
+			return static::value($value);
+		}
+		else
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('title')
+				->from('#__template_styles')
+				->where('id = ' . $db->quote($value));
+			$db->setQuery($query);
+			$title = $db->loadResult();
+
+			if ($title)
+			{
+				return htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
+			}
+			else
+			{
+				return static::value('');
+			}
+		}
+	}
+
+	/**
+	 * Get the sanitized language
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  mixed  String/void
+	 *
+	 * @since   1.6
+	 */
+	public static function admin_language($value)
+	{
+		if (empty($value))
+		{
+			return static::value($value);
+		}
+		else
+		{
+			$file = JLanguageHelper::getLanguagePath(JPATH_ADMINISTRATOR, $value) . '/' . $value . '.xml';
+
+			$result = null;
+
+			if (is_file($file))
+			{
+				$result = JLanguageHelper::parseXMLLanguageFile($file);
+			}
+
+			if ($result)
+			{
+				return htmlspecialchars($result['name'], ENT_COMPAT, 'UTF-8');
+			}
+			else
+			{
+				return static::value('');
+			}
+		}
+	}
+
+	/**
+	 * Get the sanitized language
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  mixed  String/void
+	 *
+	 * @since   1.6
+	 */
+	public static function language($value)
+	{
+		if (empty($value))
+		{
+			return static::value($value);
+		}
+		else
+		{
+			$file = JLanguageHelper::getLanguagePath(JPATH_SITE, $value) . '/' . $value . '.xml';
+
+			$result = null;
+
+			if (is_file($file))
+			{
+				$result = JLanguageHelper::parseXMLLanguageFile($file);
+			}
+
+			if ($result)
+			{
+				return htmlspecialchars($result['name'], ENT_COMPAT, 'UTF-8');
+			}
+			else
+			{
+				return static::value('');
+			}
+		}
+	}
+
+	/**
+	 * Get the sanitized editor name
+	 *
+	 * @param   mixed  $value  Value of the field
+	 *
+	 * @return  mixed  String/void
+	 *
+	 * @since   1.6
+	 */
+	public static function editor($value)
+	{
+		if (empty($value))
+		{
+			return static::value($value);
+		}
+		else
+		{
+			$db = JFactory::getDbo();
+			$lang = JFactory::getLanguage();
+			$query = $db->getQuery(true)
+				->select('name')
+				->from('#__extensions')
+				->where('element = ' . $db->quote($value))
+				->where('folder = ' . $db->quote('editors'));
+			$db->setQuery($query);
+			$title = $db->loadResult();
+
+			if ($title)
+			{
+				$lang->load("plg_editors_$value.sys", JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load("plg_editors_$value.sys", JPATH_PLUGINS . '/editors/' . $value, null, false, true);
+				$lang->load($title . '.sys');
+
+				return JText::_($title);
+			}
+			else
+			{
+				return static::value('');
+			}
+		}
+	}
+}
diff --git a/core/components/com_users/helpers/legacyrouter.php b/core/components/com_users/helpers/legacyrouter.php
new file mode 100644
index 00000000..18f89b30
--- /dev/null
+++ b/core/components/com_users/helpers/legacyrouter.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Legacy routing rules class from com_users
+ *
+ * @since       3.6
+ * @deprecated  4.0
+ */
+class UsersRouterRulesLegacy implements JComponentRouterRulesInterface
+{
+	/**
+	 * Constructor for this legacy router
+	 *
+	 * @param   JComponentRouterAdvanced  $router  The router this rule belongs to
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function __construct($router)
+	{
+		$this->router = $router;
+	}
+
+	/**
+	 * Preprocess the route for the com_users component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function preprocess(&$query)
+	{
+	}
+
+	/**
+	 * Build the route for the com_users component
+	 *
+	 * @param   array  &$query     An array of URL arguments
+	 * @param   array  &$segments  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function build(&$query, &$segments)
+	{
+		// Declare static variables.
+		static $items;
+		static $default;
+		static $registration;
+		static $profile;
+		static $login;
+		static $remind;
+		static $resend;
+		static $reset;
+
+		// Get the relevant menu items if not loaded.
+		if (empty($items))
+		{
+			// Get all relevant menu items.
+			$items = $this->router->menu->getItems('component', 'com_users');
+
+			// Build an array of serialized query strings to menu item id mappings.
+			foreach ($items as $item)
+			{
+				if (empty($item->query['view']))
+				{
+					continue;
+				}
+
+				// Check to see if we have found the resend menu item.
+				if (empty($resend) && $item->query['view'] === 'resend')
+				{
+					$resend = $item->id;
+
+					continue;
+				}
+
+				// Check to see if we have found the reset menu item.
+				if (empty($reset) && $item->query['view'] === 'reset')
+				{
+					$reset = $item->id;
+
+					continue;
+				}
+
+				// Check to see if we have found the remind menu item.
+				if (empty($remind) && $item->query['view'] === 'remind')
+				{
+					$remind = $item->id;
+
+					continue;
+				}
+
+				// Check to see if we have found the login menu item.
+				if (empty($login) && $item->query['view'] === 'login')
+				{
+					$login = $item->id;
+
+					continue;
+				}
+
+				// Check to see if we have found the registration menu item.
+				if (empty($registration) && $item->query['view'] === 'registration')
+				{
+					$registration = $item->id;
+
+					continue;
+				}
+
+				// Check to see if we have found the profile menu item.
+				if (empty($profile) && $item->query['view'] === 'profile')
+				{
+					$profile = $item->id;
+				}
+			}
+
+			// Set the default menu item to use for com_users if possible.
+			if ($profile)
+			{
+				$default = $profile;
+			}
+			elseif ($registration)
+			{
+				$default = $registration;
+			}
+			elseif ($login)
+			{
+				$default = $login;
+			}
+		}
+
+		if (!empty($query['view']))
+		{
+			switch ($query['view'])
+			{
+				case 'reset':
+					if ($query['Itemid'] = $reset)
+					{
+						unset($query['view']);
+					}
+					else
+					{
+						$query['Itemid'] = $default;
+					}
+					break;
+
+				case 'resend':
+					if ($query['Itemid'] = $resend)
+					{
+						unset($query['view']);
+					}
+					else
+					{
+						$query['Itemid'] = $default;
+					}
+					break;
+
+				case 'remind':
+					if ($query['Itemid'] = $remind)
+					{
+						unset($query['view']);
+					}
+					else
+					{
+						$query['Itemid'] = $default;
+					}
+					break;
+
+				case 'login':
+					if ($query['Itemid'] = $login)
+					{
+						unset($query['view']);
+					}
+					else
+					{
+						$query['Itemid'] = $default;
+					}
+					break;
+
+				case 'registration':
+					if ($query['Itemid'] = $registration)
+					{
+						unset($query['view']);
+					}
+					else
+					{
+						$query['Itemid'] = $default;
+					}
+					break;
+
+				default:
+				case 'profile':
+					if (!empty($query['view']))
+					{
+						$segments[] = $query['view'];
+					}
+
+					unset($query['view']);
+
+					if ($query['Itemid'] = $profile)
+					{
+						unset($query['view']);
+					}
+					else
+					{
+						$query['Itemid'] = $default;
+					}
+
+					// Only append the user id if not "me".
+					$user = JFactory::getUser();
+
+					if (!empty($query['user_id']) && ($query['user_id'] != $user->id))
+					{
+						$segments[] = $query['user_id'];
+					}
+
+					unset($query['user_id']);
+
+					break;
+			}
+		}
+
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 * @param   array  &$vars      The URL attributes to be used by the application.
+	 *
+	 * @return  void
+	 *
+	 * @since       3.6
+	 * @deprecated  4.0
+	 */
+	public function parse(&$segments, &$vars)
+	{
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		// Only run routine if there are segments to parse.
+		if (count($segments) < 1)
+		{
+			return;
+		}
+
+		// Get the package from the route segments.
+		$userId = array_pop($segments);
+
+		if (!is_numeric($userId))
+		{
+			$vars['view'] = 'profile';
+
+			return;
+		}
+
+		if (is_numeric($userId))
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('id'))
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('id') . ' = ' . (int) $userId);
+			$db->setQuery($query);
+			$userId = $db->loadResult();
+		}
+
+		// Set the package id if present.
+		if ($userId)
+		{
+			// Set the package id.
+			$vars['user_id'] = (int) $userId;
+
+			// Set the view to package if not already set.
+			if (empty($vars['view']))
+			{
+				$vars['view'] = 'profile';
+			}
+		}
+		else
+		{
+			JError::raiseError(404, JText::_('JGLOBAL_RESOURCE_NOT_FOUND'));
+		}
+	}
+}
diff --git a/core/components/com_users/helpers/route.php b/core/components/com_users/helpers/route.php
new file mode 100644
index 00000000..3fe03220
--- /dev/null
+++ b/core/components/com_users/helpers/route.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Users Route Helper
+ *
+ * @since       1.6
+ * @deprecated  4.0
+ */
+class UsersHelperRoute
+{
+	/**
+	 * Method to get the menu items for the component.
+	 *
+	 * @return  array  	An array of menu items.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function &getItems()
+	{
+		static $items;
+
+		// Get the menu items for this component.
+		if (!isset($items))
+		{
+			$component = JComponentHelper::getComponent('com_users');
+			$items     = JFactory::getApplication()->getMenu()->getItems('component_id', $component->id);
+
+			// If no items found, set to empty array.
+			if (!$items)
+			{
+				$items = array();
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to get a route configuration for the login view.
+	 *
+	 * @return  mixed  	Integer menu id on success, null on failure.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function getLoginRoute()
+	{
+		// Get the items.
+		$items  = self::getItems();
+
+		// Search for a suitable menu id.
+		foreach ($items as $item)
+		{
+			if (isset($item->query['view']) && $item->query['view'] === 'login')
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to get a route configuration for the profile view.
+	 *
+	 * @return  mixed  	Integer menu id on success, null on failure.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function getProfileRoute()
+	{
+		// Get the items.
+		$items  = self::getItems();
+
+		// Search for a suitable menu id.
+		// Menu link can only go to users own profile.
+
+		foreach ($items as $item)
+		{
+			if (isset($item->query['view']) && $item->query['view'] === 'profile')
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to get a route configuration for the registration view.
+	 *
+	 * @return  mixed  	Integer menu id on success, null on failure.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function getRegistrationRoute()
+	{
+		// Get the items.
+		$items  = self::getItems();
+
+		// Search for a suitable menu id.
+		foreach ($items as $item)
+		{
+			if (isset($item->query['view']) && $item->query['view'] === 'registration')
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to get a route configuration for the remind view.
+	 *
+	 * @return  mixed  	Integer menu id on success, null on failure.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function getRemindRoute()
+	{
+		// Get the items.
+		$items  = self::getItems();
+
+		// Search for a suitable menu id.
+		foreach ($items as $item)
+		{
+			if (isset($item->query['view']) && $item->query['view'] === 'remind')
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to get a route configuration for the resend view.
+	 *
+	 * @return  mixed  	Integer menu id on success, null on failure.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function getResendRoute()
+	{
+		// Get the items.
+		$items  = self::getItems();
+
+		// Search for a suitable menu id.
+		foreach ($items as $item)
+		{
+			if (isset($item->query['view']) && $item->query['view'] === 'resend')
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to get a route configuration for the reset view.
+	 *
+	 * @return  mixed  	Integer menu id on success, null on failure.
+	 *
+	 * @since       1.6
+	 * @deprecated  4.0
+	 */
+	public static function getResetRoute()
+	{
+		// Get the items.
+		$items  = self::getItems();
+
+		// Search for a suitable menu id.
+		foreach ($items as $item)
+		{
+			if (isset($item->query['view']) && $item->query['view'] === 'reset')
+			{
+				return $item->id;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/core/components/com_users/models/forms/frontend.xml b/core/components/com_users/models/forms/frontend.xml
new file mode 100644
index 00000000..2976f671
--- /dev/null
+++ b/core/components/com_users/models/forms/frontend.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<!--  Basic user account settings. -->
+		<fieldset name="params" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
+			<field
+				name="editor"
+				type="plugins"
+				label="COM_USERS_USER_FIELD_EDITOR_LABEL"
+				description="COM_USERS_USER_FIELD_EDITOR_DESC"
+				folder="editors"
+				useaccess="true"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field
+				name="timezone"
+				type="timezone"
+				label="COM_USERS_USER_FIELD_TIMEZONE_LABEL"
+				description="COM_USERS_USER_FIELD_TIMEZONE_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field
+				name="language"
+				type="language"
+				label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
+				description="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				filter="cmd"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/components/com_users/models/forms/frontend_admin.xml b/core/components/com_users/models/forms/frontend_admin.xml
new file mode 100644
index 00000000..99b59489
--- /dev/null
+++ b/core/components/com_users/models/forms/frontend_admin.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<!--  Backend user account settings. -->
+		<fieldset name="params" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
+			<field
+				name="admin_style"
+				type="templatestyle"
+				label="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL"
+				description="COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC"
+				client="administrator"
+				filter="uint"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field
+				name="admin_language"
+				type="language"
+				label="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL"
+				description="COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC"
+				client="administrator"
+				filter="cmd"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+			<field 
+				name="helpsite"
+				type="helpsite"
+				label="COM_USERS_USER_FIELD_HELPSITE_LABEL"
+				description="COM_USERS_USER_FIELD_HELPSITE_DESC"
+				>
+				<option value="">JOPTION_USE_DEFAULT</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/components/com_users/models/forms/login.xml b/core/components/com_users/models/forms/login.xml
new file mode 100644
index 00000000..376e76b5
--- /dev/null
+++ b/core/components/com_users/models/forms/login.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="credentials" label="COM_USERS_LOGIN_DEFAULT_LABEL">
+		<field
+			name="username"
+			type="text"
+			label="COM_USERS_LOGIN_USERNAME_LABEL"
+			class="validate-username"
+			filter="username"
+			size="25"
+			required="true"
+			validate="username"
+			autofocus="true"
+		/>
+
+		<field
+			name="password"
+			type="password"
+			label="JGLOBAL_PASSWORD"
+			class="validate-password"
+			required="true"
+			filter="raw"
+			size="25"
+		/>
+	</fieldset>
+
+		<field
+			name="secretkey"
+			type="text"
+			label="JGLOBAL_SECRETKEY"
+			class=""
+			filter="int"
+			size="25"
+		/>
+
+	<fieldset>
+		<field
+			name="return"
+			type="hidden"
+		/>
+	</fieldset>
+</form>
diff --git a/core/components/com_users/models/forms/profile.xml b/core/components/com_users/models/forms/profile.xml
new file mode 100644
index 00000000..eae3bb7b
--- /dev/null
+++ b/core/components/com_users/models/forms/profile.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="core" label="COM_USERS_PROFILE_DEFAULT_LABEL">
+		<field
+			name="id"
+			type="hidden"
+			filter="integer"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="COM_USERS_PROFILE_NAME_LABEL"
+			description="COM_USERS_PROFILE_NAME_DESC"
+			filter="string"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="username"
+			type="text"
+			label="COM_USERS_PROFILE_USERNAME_LABEL"
+			description="COM_USERS_DESIRED_USERNAME"
+			class="validate-username"
+			filter="username"
+			message="COM_USERS_PROFILE_USERNAME_MESSAGE"
+			required="true"
+			size="30"
+			validate="username"
+		/>
+
+		<field
+			name="password1"
+			type="password"
+			label="COM_USERS_PROFILE_PASSWORD1_LABEL"
+			description="COM_USERS_DESIRED_PASSWORD"
+			autocomplete="off"
+			class="validate-password"
+			filter="raw"
+			size="30"
+			validate="password"
+		/>
+
+		<field
+			name="password2"
+			type="password"
+			label="COM_USERS_PROFILE_PASSWORD2_LABEL"
+			description="COM_USERS_PROFILE_PASSWORD2_DESC"
+			autocomplete="off"
+			class="validate-password"
+			field="password1"
+			filter="raw"
+			message="COM_USERS_PROFILE_PASSWORD1_MESSAGE"
+			size="30"
+			validate="equals"
+		/>
+
+		<field
+			name="email1"
+			type="email"
+			label="COM_USERS_PROFILE_EMAIL1_LABEL"
+			description="COM_USERS_PROFILE_EMAIL1_DESC"
+			filter="string"
+			message="COM_USERS_PROFILE_EMAIL1_MESSAGE"
+			required="true"
+			size="30"
+			unique="true"
+			validate="email"
+			autocomplete="email"
+		/>
+
+		<field
+			name="email2"
+			type="email"
+			label="COM_USERS_PROFILE_EMAIL2_LABEL"
+			description="COM_USERS_PROFILE_EMAIL2_DESC"
+			field="email1"
+			filter="string"
+			message="COM_USERS_PROFILE_EMAIL2_MESSAGE"
+			required="true"
+			size="30"
+			validate="equals"
+		/>
+	</fieldset>
+	
+	<!-- Used to get the two factor authentication configuration -->
+	<field
+		name="twofactor"
+		type="hidden"
+	/>
+</form>
\ No newline at end of file
diff --git a/core/components/com_users/models/forms/registration.xml b/core/components/com_users/models/forms/registration.xml
new file mode 100644
index 00000000..8cf8c2a6
--- /dev/null
+++ b/core/components/com_users/models/forms/registration.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_USERS_REGISTRATION_DEFAULT_LABEL">
+		<field
+			name="spacer"
+			type="spacer"
+			label="COM_USERS_REGISTER_REQUIRED"
+			class="text"
+		/>
+
+		<field
+			name="name"
+			type="text"
+			label="COM_USERS_REGISTER_NAME_LABEL"
+			description="COM_USERS_REGISTER_NAME_DESC"
+			filter="string"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="username"
+			type="text"
+			label="COM_USERS_REGISTER_USERNAME_LABEL"
+			description="COM_USERS_DESIRED_USERNAME"
+			class="validate-username"
+			filter="username"
+			message="COM_USERS_REGISTER_USERNAME_MESSAGE"
+			required="true"
+			size="30"
+			validate="username"
+		/>
+
+		<field
+			name="password1" 
+			type="password"
+			label="COM_USERS_PROFILE_PASSWORD1_LABEL"
+			description="COM_USERS_DESIRED_PASSWORD"
+			autocomplete="off"
+			class="validate-password"
+			field="password1"
+			filter="raw"
+			size="30"
+			validate="password"
+			required="true"
+		/>
+
+		<field
+			name="password2"
+			type="password"
+			label="COM_USERS_PROFILE_PASSWORD2_LABEL"
+			description="COM_USERS_PROFILE_PASSWORD2_DESC"
+			autocomplete="off"
+			class="validate-password"
+			field="password1"
+			filter="raw"
+			message="COM_USERS_PROFILE_PASSWORD1_MESSAGE"
+			size="30"
+			validate="equals"
+			required="true"
+		/>
+
+		<field
+			name="email1"
+			type="email"
+			label="COM_USERS_REGISTER_EMAIL1_LABEL"
+			description="COM_USERS_REGISTER_EMAIL1_DESC"
+			field="id"
+			filter="string"
+			message="COM_USERS_REGISTER_EMAIL1_MESSAGE"
+			required="true"
+			size="30"
+			unique="true"
+			validate="email"
+			autocomplete="email"
+		/>
+
+		<field
+			name="email2"
+			type="email"
+			label="COM_USERS_REGISTER_EMAIL2_LABEL"
+			description="COM_USERS_REGISTER_EMAIL2_DESC"
+			field="email1"
+			filter="string"
+			message="COM_USERS_REGISTER_EMAIL2_MESSAGE"
+			required="true"
+			size="30"
+			validate="equals"
+		/>
+
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_USERS_CAPTCHA_LABEL"
+			description="COM_USERS_CAPTCHA_DESC"
+			validate="captcha"
+		/>
+	</fieldset>
+</form>
diff --git a/core/components/com_users/models/forms/remind.xml b/core/components/com_users/models/forms/remind.xml
new file mode 100644
index 00000000..6ca81396
--- /dev/null
+++ b/core/components/com_users/models/forms/remind.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_USERS_REMIND_DEFAULT_LABEL">
+		<field
+			name="email"
+			type="email"
+			label="COM_USERS_FIELD_REMIND_EMAIL_LABEL"
+			description="COM_USERS_FIELD_REMIND_EMAIL_DESC"
+			required="true"
+			size="30"
+			validate="email"
+			autocomplete="email"
+		/>
+		
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_USERS_CAPTCHA_LABEL"
+			description="COM_USERS_CAPTCHA_DESC"
+			validate="captcha"
+		/>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/core/components/com_users/models/forms/reset_complete.xml b/core/components/com_users/models/forms/reset_complete.xml
new file mode 100644
index 00000000..d33bbaaf
--- /dev/null
+++ b/core/components/com_users/models/forms/reset_complete.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_USERS_RESET_COMPLETE_LABEL">
+		<field
+			name="password1"
+			type="password"
+			label="COM_USERS_FIELD_RESET_PASSWORD1_LABEL"
+			description="COM_USERS_FIELD_RESET_PASSWORD1_DESC"
+			autocomplete="off"
+			class="validate-password"
+			field="password2"
+			filter="raw"
+			message="COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE"
+			required="true"
+			size="30"
+			validate="equals"
+		/>
+		<field
+			name="password2"
+			type="password"
+			label="COM_USERS_FIELD_RESET_PASSWORD2_LABEL"
+			description="COM_USERS_FIELD_RESET_PASSWORD2_DESC"
+			autocomplete="off"
+			class="validate-password"
+			filter="raw"
+			required="true"
+			size="30"
+			validate="password"
+		/>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/core/components/com_users/models/forms/reset_confirm.xml b/core/components/com_users/models/forms/reset_confirm.xml
new file mode 100644
index 00000000..2be151e2
--- /dev/null
+++ b/core/components/com_users/models/forms/reset_confirm.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_USERS_RESET_CONFIRM_LABEL">
+		<field
+			name="username"
+			type="text"
+			label="COM_USERS_FIELD_RESET_CONFIRM_USERNAME_LABEL"
+			description="COM_USERS_FIELD_RESET_CONFIRM_USERNAME_DESC"
+			filter="username"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="token"
+			type="text"
+			label="COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL"
+			description="COM_USERS_FIELD_RESET_CONFIRM_TOKEN_DESC"
+			filter="alnum"
+			required="true"
+			size="32"
+		/>
+	</fieldset>
+</form>
diff --git a/core/components/com_users/models/forms/reset_request.xml b/core/components/com_users/models/forms/reset_request.xml
new file mode 100644
index 00000000..df9297e3
--- /dev/null
+++ b/core/components/com_users/models/forms/reset_request.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset name="default" label="COM_USERS_RESET_REQUEST_LABEL">
+		<field 
+			name="email"
+			type="text"
+			label="COM_USERS_FIELD_PASSWORD_RESET_LABEL"
+			description="COM_USERS_FIELD_PASSWORD_RESET_DESC"
+			class="validate-username"
+			filter="email"
+			required="true"
+			size="30"
+		/>
+
+		<field
+			name="captcha"
+			type="captcha"
+			label="COM_USERS_CAPTCHA_LABEL"
+			description="COM_USERS_CAPTCHA_DESC"
+			validate="captcha"
+		/>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/core/components/com_users/models/forms/sitelang.xml b/core/components/com_users/models/forms/sitelang.xml
new file mode 100644
index 00000000..9db913f9
--- /dev/null
+++ b/core/components/com_users/models/forms/sitelang.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="params">
+		<fieldset name="params" label="COM_USERS_SETTINGS_FIELDSET_LABEL">
+			<field
+				name="language"
+				type="language"
+				label="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL"
+				description="COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC"
+				client="site"
+				filter="cmd"
+				default="active"
+			/>
+		</fieldset>
+	</fields>
+</form>
\ No newline at end of file
diff --git a/core/components/com_users/models/login.php b/core/components/com_users/models/login.php
new file mode 100644
index 00000000..a916e4bf
--- /dev/null
+++ b/core/components/com_users/models/login.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Rest model class for Users.
+ *
+ * @since  1.6
+ */
+class UsersModelLogin extends JModelForm
+{
+	/**
+	 * Method to get the login form.
+	 *
+	 * The base form is loaded from XML and then an event is fired
+	 * for users plugins to extend the form with extra fields.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm	A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.login', 'login', array('load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array  The default data is an empty array.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered login form data.
+		$app  = JFactory::getApplication();
+		$data = $app->getUserState('users.login.form.data', array());
+
+		$input = $app->input->getInputForRequestMethod();
+
+		// Check for return URL from the request first
+		if ($return = $input->get('return', '', 'BASE64'))
+		{
+			$data['return'] = base64_decode($return);
+
+			if (!JUri::isInternal($data['return']))
+			{
+				$data['return'] = '';
+			}
+		}
+
+		$app->setUserState('users.login.form.data', $data);
+
+		$this->preprocessData('com_users.login', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$params = JFactory::getApplication()->getParams('com_users');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Override JModelAdmin::preprocessForm to ensure the correct plugin group is loaded.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		parent::preprocessForm($form, $data, $group);
+	}
+}
diff --git a/core/components/com_users/models/profile.php b/core/components/com_users/models/profile.php
new file mode 100644
index 00000000..a987b61e
--- /dev/null
+++ b/core/components/com_users/models/profile.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Profile model class for Users.
+ *
+ * @since  1.6
+ */
+class UsersModelProfile extends JModelForm
+{
+	/**
+	 * @var		object	The user profile data.
+	 * @since   1.6
+	 */
+	protected $data;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  An array of configuration options (name, state, dbo, table_path, ignore_request).
+	 *
+	 * @since   3.2
+	 *
+	 * @throws  Exception
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'events_map' => array('validate' => 'user')
+			), $config
+		);
+
+		parent::__construct($config);
+
+		// Load the helper and model used for two factor authentication
+		JLoader::register('UsersModelUser', JPATH_ADMINISTRATOR . '/components/com_users/models/user.php');
+		JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php');
+	}
+
+	/**
+	 * Method to check in a user.
+	 *
+	 * @param   integer  $userId  The id of the row to check out.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function checkin($userId = null)
+	{
+		// Get the user id.
+		$userId = (!empty($userId)) ? $userId : (int) $this->getState('user.id');
+
+		if ($userId)
+		{
+			// Initialise the table with JUser.
+			$table = JTable::getInstance('User');
+
+			// Attempt to check the row in.
+			if (!$table->checkin($userId))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to check out a user for editing.
+	 *
+	 * @param   integer  $userId  The id of the row to check out.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function checkout($userId = null)
+	{
+		// Get the user id.
+		$userId = (!empty($userId)) ? $userId : (int) $this->getState('user.id');
+
+		if ($userId)
+		{
+			// Initialise the table with JUser.
+			$table = JTable::getInstance('User');
+
+			// Get the current user object.
+			$user = JFactory::getUser();
+
+			// Attempt to check the row out.
+			if (!$table->checkout($user->get('id'), $userId))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the profile form data.
+	 *
+	 * The base form data is loaded and then an event is fired
+	 * for users plugins to extend the data.
+	 *
+	 * @return  mixed  	Data object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getData()
+	{
+		if ($this->data === null)
+		{
+			$userId = $this->getState('user.id');
+
+			// Initialise the table with JUser.
+			$this->data = new JUser($userId);
+
+			// Set the base user data.
+			$this->data->email1 = $this->data->get('email');
+			$this->data->email2 = $this->data->get('email');
+
+			// Override the base user data with any data in the session.
+			$temp = (array) JFactory::getApplication()->getUserState('com_users.edit.profile.data', array());
+
+			foreach ($temp as $k => $v)
+			{
+				$this->data->$k = $v;
+			}
+
+			// Unset the passwords.
+			unset($this->data->password1, $this->data->password2);
+
+			$registry           = new Registry($this->data->params);
+			$this->data->params = $registry->toArray();
+		}
+
+		return $this->data;
+	}
+
+	/**
+	 * Method to get the profile form.
+	 *
+	 * The base form is loaded from XML and then an event is fired
+	 * for users plugins to extend the form with extra fields.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.profile', 'profile', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Check for username compliance and parameter set
+		$isUsernameCompliant = true;
+		$username = $loadData ? $form->getValue('username') : $this->loadFormData()->username;
+
+		if ($username)
+		{
+			$isUsernameCompliant  = !(preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $username) || strlen(utf8_decode($username)) < 2
+				|| trim($username) !== $username);
+		}
+
+		$this->setState('user.username.compliant', $isUsernameCompliant);
+
+		if ($isUsernameCompliant && !JComponentHelper::getParams('com_users')->get('change_login_name'))
+		{
+			$form->setFieldAttribute('username', 'class', '');
+			$form->setFieldAttribute('username', 'filter', '');
+			$form->setFieldAttribute('username', 'description', 'COM_USERS_PROFILE_NOCHANGE_USERNAME_DESC');
+			$form->setFieldAttribute('username', 'validate', '');
+			$form->setFieldAttribute('username', 'message', '');
+			$form->setFieldAttribute('username', 'readonly', 'true');
+			$form->setFieldAttribute('username', 'required', 'false');
+		}
+
+		// When multilanguage is set, a user's default site language should also be a Content Language
+		if (JLanguageMultilang::isEnabled())
+		{
+			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
+		}
+
+		// If the user needs to change their password, mark the password fields as required
+		if (JFactory::getUser()->requireReset)
+		{
+			$form->setFieldAttribute('password1', 'required', 'true');
+			$form->setFieldAttribute('password2', 'required', 'true');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		$data = $this->getData();
+
+		$this->preprocessData('com_users.profile', $data, 'user');
+
+		return $data;
+	}
+
+	/**
+	 * Override preprocessForm to load the user plugin group instead of content.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @throws	Exception if there is an error in the form event.
+	 *
+	 * @since   1.6
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		if (JComponentHelper::getParams('com_users')->get('frontend_userparams'))
+		{
+			$form->loadFile('frontend', false);
+
+			if (JFactory::getUser()->authorise('core.login.admin'))
+			{
+				$form->loadFile('frontend_admin', false);
+			}
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$params = JFactory::getApplication()->getParams('com_users');
+
+		// Get the user id.
+		$userId = JFactory::getApplication()->getUserState('com_users.edit.profile.id');
+		$userId = !empty($userId) ? $userId : (int) JFactory::getUser()->get('id');
+
+		// Set the user id.
+		$this->setState('user.id', $userId);
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  mixed  The user id on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$userId = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
+
+		$user = new JUser($userId);
+
+		// Prepare the data for the user object.
+		$data['email']    = JStringPunycode::emailToPunycode($data['email1']);
+		$data['password'] = $data['password1'];
+
+		// Unset the username if it should not be overwritten
+		$isUsernameCompliant = $this->getState('user.username.compliant');
+
+		if ($isUsernameCompliant && !JComponentHelper::getParams('com_users')->get('change_login_name'))
+		{
+			unset($data['username']);
+		}
+
+		// Unset block and sendEmail so they do not get overwritten
+		unset($data['block'], $data['sendEmail']);
+
+		// Handle the two factor authentication setup
+		if (array_key_exists('twofactor', $data))
+		{
+			$model = new UsersModelUser;
+
+			$twoFactorMethod = $data['twofactor']['method'];
+
+			// Get the current One Time Password (two factor auth) configuration
+			$otpConfig = $model->getOtpConfig($userId);
+
+			if ($twoFactorMethod !== 'none')
+			{
+				// Run the plugins
+				FOFPlatform::getInstance()->importPlugin('twofactorauth');
+				$otpConfigReplies = FOFPlatform::getInstance()->runPlugins('onUserTwofactorApplyConfiguration', array($twoFactorMethod));
+
+				// Look for a valid reply
+				foreach ($otpConfigReplies as $reply)
+				{
+					if (!is_object($reply) || empty($reply->method) || ($reply->method != $twoFactorMethod))
+					{
+						continue;
+					}
+
+					$otpConfig->method = $reply->method;
+					$otpConfig->config = $reply->config;
+
+					break;
+				}
+
+				// Save OTP configuration.
+				$model->setOtpConfig($userId, $otpConfig);
+
+				// Generate one time emergency passwords if required (depleted or not set)
+				if (empty($otpConfig->otep))
+				{
+					$model->generateOteps($userId);
+				}
+			}
+			else
+			{
+				$otpConfig->method = 'none';
+				$otpConfig->config = array();
+				$model->setOtpConfig($userId, $otpConfig);
+			}
+
+			// Unset the raw data
+			unset($data['twofactor']);
+
+			// Reload the user record with the updated OTP configuration
+			$user->load($userId);
+		}
+
+		// Bind the data.
+		if (!$user->bind($data))
+		{
+			$this->setError(JText::sprintf('COM_USERS_PROFILE_BIND_FAILED', $user->getError()));
+
+			return false;
+		}
+
+		// Load the users plugin group.
+		JPluginHelper::importPlugin('user');
+
+		// Retrieve the user groups so they don't get overwritten
+		unset($user->groups);
+		$user->groups = JAccess::getGroupsByUser($user->id, false);
+
+		// Store the data.
+		if (!$user->save())
+		{
+			$this->setError($user->getError());
+
+			return false;
+		}
+
+		// Some contexts may not use tags data at all, so we allow callers to disable loading tag data
+		if ($this->getState('load_tags', true))
+		{
+			$user->tags = new JHelperTags;
+			$user->tags->getTagIds($user->id, 'com_users.user');
+		}
+
+		return $user->id;
+	}
+
+	/**
+	 * Gets the configuration forms for all two-factor authentication methods
+	 * in an array.
+	 *
+	 * @param   integer  $user_id  The user ID to load the forms for (optional)
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public function getTwofactorform($user_id = null)
+	{
+		$user_id = (!empty($user_id)) ? $user_id : (int) $this->getState('user.id');
+
+		$model = new UsersModelUser;
+
+		$otpConfig = $model->getOtpConfig($user_id);
+
+		FOFPlatform::getInstance()->importPlugin('twofactorauth');
+
+		return FOFPlatform::getInstance()->runPlugins('onUserTwofactorShowConfiguration', array($otpConfig, $user_id));
+	}
+
+	/**
+	 * Returns the one time password (OTP) – a.k.a. two factor authentication –
+	 * configuration for a particular user.
+	 *
+	 * @param   integer  $user_id  The numeric ID of the user
+	 *
+	 * @return  stdClass  An object holding the OTP configuration for this user
+	 *
+	 * @since   3.2
+	 */
+	public function getOtpConfig($user_id = null)
+	{
+		$user_id = (!empty($user_id)) ? $user_id : (int) $this->getState('user.id');
+
+		$model = new UsersModelUser;
+
+		return $model->getOtpConfig($user_id);
+	}
+}
diff --git a/core/components/com_users/models/registration.php b/core/components/com_users/models/registration.php
new file mode 100644
index 00000000..69ee8503
--- /dev/null
+++ b/core/components/com_users/models/registration.php
@@ -0,0 +1,710 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Registration model class for Users.
+ *
+ * @since  1.6
+ */
+class UsersModelRegistration extends JModelForm
+{
+	/**
+	 * @var    object  The user registration data.
+	 * @since  1.6
+	 */
+	protected $data;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  An array of configuration options (name, state, dbo, table_path, ignore_request).
+	 *
+	 * @since   3.6
+	 *
+	 * @throws  Exception
+	 */
+	public function __construct($config = array())
+	{
+		$config = array_merge(
+			array(
+				'events_map' => array('validate' => 'user')
+			), $config
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to activate a user account.
+	 *
+	 * @param   string  $token  The activation token.
+	 *
+	 * @return  mixed    False on failure, user object on success.
+	 *
+	 * @since   1.6
+	 */
+	public function activate($token)
+	{
+		$config = JFactory::getConfig();
+		$userParams = JComponentHelper::getParams('com_users');
+		$db = $this->getDbo();
+
+		// Get the user id based on the token.
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('id'))
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('activation') . ' = ' . $db->quote($token))
+			->where($db->quoteName('block') . ' = ' . 1)
+			->where($db->quoteName('lastvisitDate') . ' = ' . $db->quote($db->getNullDate()));
+		$db->setQuery($query);
+
+		try
+		{
+			$userId = (int) $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+			return false;
+		}
+
+		// Check for a valid user id.
+		if (!$userId)
+		{
+			$this->setError(JText::_('COM_USERS_ACTIVATION_TOKEN_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Load the users plugin group.
+		JPluginHelper::importPlugin('user');
+
+		// Activate the user.
+		$user = JFactory::getUser($userId);
+
+		// Admin activation is on and user is verifying their email
+		if (($userParams->get('useractivation') == 2) && !$user->getParam('activate', 0))
+		{
+			$uri = JUri::getInstance();
+
+			// Compile the admin notification mail values.
+			$data = $user->getProperties();
+			$data['activation'] = JApplicationHelper::getHash(JUserHelper::genRandomPassword());
+			$user->set('activation', $data['activation']);
+			$data['siteurl'] = JUri::base();
+			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
+
+			// Remove administrator/ from activate URL in case this method is called from admin
+			if (JFactory::getApplication()->isClient('administrator'))
+			{
+				$adminPos         = strrpos($data['activate'], 'administrator/');
+				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
+			}
+
+			$data['fromname'] = $config->get('fromname');
+			$data['mailfrom'] = $config->get('mailfrom');
+			$data['sitename'] = $config->get('sitename');
+			$user->setParam('activate', 1);
+			$emailSubject = JText::sprintf(
+				'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT',
+				$data['name'],
+				$data['sitename']
+			);
+
+			$emailBody = JText::sprintf(
+				'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY',
+				$data['sitename'],
+				$data['name'],
+				$data['email'],
+				$data['username'],
+				$data['activate']
+			);
+
+			// Get all admin users
+			$query->clear()
+				->select($db->quoteName(array('name', 'email', 'sendEmail', 'id')))
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('sendEmail') . ' = 1')
+				->where($db->quoteName('block') . ' = 0');
+
+			$db->setQuery($query);
+
+			try
+			{
+				$rows = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+				return false;
+			}
+
+			// Send mail to all users with users creating permissions and receiving system emails
+			foreach ($rows as $row)
+			{
+				$usercreator = JFactory::getUser($row->id);
+
+				if ($usercreator->authorise('core.create', 'com_users'))
+				{
+					$return = JFactory::getMailer()->sendMail($data['mailfrom'], $data['fromname'], $row->email, $emailSubject, $emailBody);
+
+					// Check for an error.
+					if ($return !== true)
+					{
+						$this->setError(JText::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED'));
+
+						return false;
+					}
+				}
+			}
+		}
+		// Admin activation is on and admin is activating the account
+		elseif (($userParams->get('useractivation') == 2) && $user->getParam('activate', 0))
+		{
+			$user->set('activation', '');
+			$user->set('block', '0');
+
+			// Compile the user activated notification mail values.
+			$data = $user->getProperties();
+			$user->setParam('activate', 0);
+			$data['fromname'] = $config->get('fromname');
+			$data['mailfrom'] = $config->get('mailfrom');
+			$data['sitename'] = $config->get('sitename');
+			$data['siteurl'] = JUri::base();
+			$emailSubject = JText::sprintf(
+				'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT',
+				$data['name'],
+				$data['sitename']
+			);
+
+			$emailBody = JText::sprintf(
+				'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY',
+				$data['name'],
+				$data['siteurl'],
+				$data['username']
+			);
+
+			$return = JFactory::getMailer()->sendMail($data['mailfrom'], $data['fromname'], $data['email'], $emailSubject, $emailBody);
+
+			// Check for an error.
+			if ($return !== true)
+			{
+				$this->setError(JText::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED'));
+
+				return false;
+			}
+		}
+		else
+		{
+			$user->set('activation', '');
+			$user->set('block', '0');
+		}
+
+		// Store the user object.
+		if (!$user->save())
+		{
+			$this->setError(JText::sprintf('COM_USERS_REGISTRATION_ACTIVATION_SAVE_FAILED', $user->getError()));
+
+			return false;
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Method to get the registration form data.
+	 *
+	 * The base form data is loaded and then an event is fired
+	 * for users plugins to extend the data.
+	 *
+	 * @return  mixed  Data object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getData()
+	{
+		if ($this->data === null)
+		{
+			$this->data = new stdClass;
+			$app = JFactory::getApplication();
+			$params = JComponentHelper::getParams('com_users');
+
+			// Override the base user data with any data in the session.
+			$temp = (array) $app->getUserState('com_users.registration.data', array());
+
+			// Don't load the data in this getForm call, or we'll call ourself
+			$form = $this->getForm(array(), false);
+
+			foreach ($temp as $k => $v)
+			{
+				// Here we could have a grouped field, let's check it
+				if (is_array($v))
+				{
+					$this->data->$k = new stdClass;
+
+					foreach ($v as $key => $val)
+					{
+						if ($form->getField($key, $k) !== false)
+						{
+							$this->data->$k->$key = $val;
+						}
+					}
+				}
+				// Only merge the field if it exists in the form.
+				elseif ($form->getField($k) !== false)
+				{
+					$this->data->$k = $v;
+				}
+			}
+
+			// Get the groups the user should be added to after registration.
+			$this->data->groups = array();
+
+			// Get the default new user group, Registered if not specified.
+			$system = $params->get('new_usertype', 2);
+
+			$this->data->groups[] = $system;
+
+			// Unset the passwords.
+			unset($this->data->password1, $this->data->password2);
+
+			// Get the dispatcher and load the users plugins.
+			$dispatcher = JEventDispatcher::getInstance();
+			JPluginHelper::importPlugin('user');
+
+			// Trigger the data preparation event.
+			$results = $dispatcher->trigger('onContentPrepareData', array('com_users.registration', $this->data));
+
+			// Check for errors encountered while preparing the data.
+			if (count($results) && in_array(false, $results, true))
+			{
+				$this->setError($dispatcher->getError());
+				$this->data = false;
+			}
+		}
+
+		return $this->data;
+	}
+
+	/**
+	 * Method to get the registration form.
+	 *
+	 * The base form is loaded from XML and then an event is fired
+	 * for users plugins to extend the form with extra fields.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.registration', 'registration', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// When multilanguage is set, a user's default site language should also be a Content Language
+		if (JLanguageMultilang::isEnabled())
+		{
+			$form->setFieldAttribute('language', 'type', 'frontend_language', 'params');
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  mixed  The data for the form.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		$data = $this->getData();
+
+		if (JLanguageMultilang::isEnabled() && empty($data->language))
+		{
+			$data->language = JFactory::getLanguage()->getTag();
+		}
+
+		$this->preprocessData('com_users.registration', $data);
+
+		return $data;
+	}
+
+	/**
+	 * Override preprocessForm to load the user plugin group instead of content.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		$userParams = JComponentHelper::getParams('com_users');
+
+		// Add the choice for site language at registration time
+		if ($userParams->get('site_language') == 1 && $userParams->get('frontend_userparams') == 1)
+		{
+			$form->loadFile('sitelang', false);
+		}
+
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$app = JFactory::getApplication();
+		$params = $app->getParams('com_users');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $temp  The form data.
+	 *
+	 * @return  mixed  The user id on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function register($temp)
+	{
+		$params = JComponentHelper::getParams('com_users');
+
+		// Initialise the table with JUser.
+		$user = new JUser;
+		$data = (array) $this->getData();
+
+		// Merge in the registration data.
+		foreach ($temp as $k => $v)
+		{
+			$data[$k] = $v;
+		}
+
+		// Prepare the data for the user object.
+		$data['email'] = JStringPunycode::emailToPunycode($data['email1']);
+		$data['password'] = $data['password1'];
+		$useractivation = $params->get('useractivation');
+		$sendpassword = $params->get('sendpassword', 1);
+
+		// Check if the user needs to activate their account.
+		if (($useractivation == 1) || ($useractivation == 2))
+		{
+			$data['activation'] = JApplicationHelper::getHash(JUserHelper::genRandomPassword());
+			$data['block'] = 1;
+		}
+
+		// Bind the data.
+		if (!$user->bind($data))
+		{
+			$this->setError(JText::sprintf('COM_USERS_REGISTRATION_BIND_FAILED', $user->getError()));
+
+			return false;
+		}
+
+		// Load the users plugin group.
+		JPluginHelper::importPlugin('user');
+
+		// Store the data.
+		if (!$user->save())
+		{
+			$this->setError(JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $user->getError()));
+
+			return false;
+		}
+
+		$config = JFactory::getConfig();
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Compile the notification mail values.
+		$data = $user->getProperties();
+		$data['fromname'] = $config->get('fromname');
+		$data['mailfrom'] = $config->get('mailfrom');
+		$data['sitename'] = $config->get('sitename');
+		$data['siteurl'] = JUri::root();
+
+		// Handle account activation/confirmation emails.
+		if ($useractivation == 2)
+		{
+			// Set the link to confirm the user email.
+			$uri = JUri::getInstance();
+			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
+
+			// Remove administrator/ from activate URL in case this method is called from admin
+			if (JFactory::getApplication()->isClient('administrator'))
+			{
+				$adminPos         = strrpos($data['activate'], 'administrator/');
+				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
+			}
+
+			$emailSubject = JText::sprintf(
+				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
+				$data['name'],
+				$data['sitename']
+			);
+
+			if ($sendpassword)
+			{
+				$emailBody = JText::sprintf(
+					'COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY',
+					$data['name'],
+					$data['sitename'],
+					$data['activate'],
+					$data['siteurl'],
+					$data['username'],
+					$data['password_clear']
+				);
+			}
+			else
+			{
+				$emailBody = JText::sprintf(
+					'COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY_NOPW',
+					$data['name'],
+					$data['sitename'],
+					$data['activate'],
+					$data['siteurl'],
+					$data['username']
+				);
+			}
+		}
+		elseif ($useractivation == 1)
+		{
+			// Set the link to activate the user account.
+			$uri = JUri::getInstance();
+			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
+
+			// Remove administrator/ from activate URL in case this method is called from admin
+			if (JFactory::getApplication()->isClient('administrator'))
+			{
+				$adminPos         = strrpos($data['activate'], 'administrator/');
+				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
+			}
+
+			$emailSubject = JText::sprintf(
+				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
+				$data['name'],
+				$data['sitename']
+			);
+
+			if ($sendpassword)
+			{
+				$emailBody = JText::sprintf(
+					'COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY',
+					$data['name'],
+					$data['sitename'],
+					$data['activate'],
+					$data['siteurl'],
+					$data['username'],
+					$data['password_clear']
+				);
+			}
+			else
+			{
+				$emailBody = JText::sprintf(
+					'COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY_NOPW',
+					$data['name'],
+					$data['sitename'],
+					$data['activate'],
+					$data['siteurl'],
+					$data['username']
+				);
+			}
+		}
+		else
+		{
+			$emailSubject = JText::sprintf(
+				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
+				$data['name'],
+				$data['sitename']
+			);
+
+			if ($sendpassword)
+			{
+				$emailBody = JText::sprintf(
+					'COM_USERS_EMAIL_REGISTERED_BODY',
+					$data['name'],
+					$data['sitename'],
+					$data['siteurl'],
+					$data['username'],
+					$data['password_clear']
+				);
+			}
+			else
+			{
+				$emailBody = JText::sprintf(
+					'COM_USERS_EMAIL_REGISTERED_BODY_NOPW',
+					$data['name'],
+					$data['sitename'],
+					$data['siteurl']
+				);
+			}
+		}
+
+		// Send the registration email.
+		$return = JFactory::getMailer()->sendMail($data['mailfrom'], $data['fromname'], $data['email'], $emailSubject, $emailBody);
+
+		// Send Notification mail to administrators
+		if (($params->get('useractivation') < 2) && ($params->get('mail_to_admin') == 1))
+		{
+			$emailSubject = JText::sprintf(
+				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
+				$data['name'],
+				$data['sitename']
+			);
+
+			$emailBodyAdmin = JText::sprintf(
+				'COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY',
+				$data['name'],
+				$data['username'],
+				$data['siteurl']
+			);
+
+			// Get all admin users
+			$query->clear()
+				->select($db->quoteName(array('name', 'email', 'sendEmail')))
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('sendEmail') . ' = 1')
+				->where($db->quoteName('block') . ' = 0');
+
+			$db->setQuery($query);
+
+			try
+			{
+				$rows = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+				return false;
+			}
+
+			// Send mail to all superadministrators id
+			foreach ($rows as $row)
+			{
+				$return = JFactory::getMailer()->sendMail($data['mailfrom'], $data['fromname'], $row->email, $emailSubject, $emailBodyAdmin);
+
+				// Check for an error.
+				if ($return !== true)
+				{
+					$this->setError(JText::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED'));
+
+					return false;
+				}
+			}
+		}
+
+		// Check for an error.
+		if ($return !== true)
+		{
+			$this->setError(JText::_('COM_USERS_REGISTRATION_SEND_MAIL_FAILED'));
+
+			// Send a system message to administrators receiving system mails
+			$db = $this->getDbo();
+			$query->clear()
+				->select($db->quoteName('id'))
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('block') . ' = ' . (int) 0)
+				->where($db->quoteName('sendEmail') . ' = ' . (int) 1);
+			$db->setQuery($query);
+
+			try
+			{
+				$userids = $db->loadColumn();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+				return false;
+			}
+
+			if (count($userids) > 0)
+			{
+				$jdate = new JDate;
+
+				// Build the query to add the messages
+				foreach ($userids as $userid)
+				{
+					$values = array(
+						$db->quote($userid),
+						$db->quote($userid),
+						$db->quote($jdate->toSql()),
+						$db->quote(JText::_('COM_USERS_MAIL_SEND_FAILURE_SUBJECT')),
+						$db->quote(JText::sprintf('COM_USERS_MAIL_SEND_FAILURE_BODY', $return, $data['username']))
+					);
+					$query->clear()
+						->insert($db->quoteName('#__messages'))
+						->columns($db->quoteName(array('user_id_from', 'user_id_to', 'date_time', 'subject', 'message')))
+						->values(implode(',', $values));
+					$db->setQuery($query);
+
+					try
+					{
+						$db->execute();
+					}
+					catch (RuntimeException $e)
+					{
+						$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+						return false;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		if ($useractivation == 1)
+		{
+			return 'useractivate';
+		}
+		elseif ($useractivation == 2)
+		{
+			return 'adminactivate';
+		}
+		else
+		{
+			return $user->id;
+		}
+	}
+}
diff --git a/core/components/com_users/models/remind.php b/core/components/com_users/models/remind.php
new file mode 100644
index 00000000..b0dfe861
--- /dev/null
+++ b/core/components/com_users/models/remind.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Remind model class for Users.
+ *
+ * @since  1.5
+ */
+class UsersModelRemind extends JModelForm
+{
+	/**
+	 * Method to get the username remind request form.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JFor     A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.remind', 'remind', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Override preprocessForm to load the user plugin group instead of content.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @throws	Exception if there is an error in the form event.
+	 *
+	 * @since   1.6
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		parent::preprocessForm($form, $data, 'user');
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$app = JFactory::getApplication();
+		$params = $app->getParams('com_users');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Send the remind username email
+	 *
+	 * @param   array  $data  Array with the data received from the form
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function processRemindRequest($data)
+	{
+		// Get the form.
+		$form = $this->getForm();
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if (empty($form))
+		{
+			return false;
+		}
+
+		// Validate the data.
+		$data = $this->validate($form, $data);
+
+		// Check for an error.
+		if ($data instanceof Exception)
+		{
+			return false;
+		}
+
+		// Check the validation results.
+		if ($data === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		// Find the user id for the given email address.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('email') . ' = ' . $db->quote($data['email']));
+
+		// Get the user id.
+		$db->setQuery($query);
+
+		try
+		{
+			$user = $db->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+			return false;
+		}
+
+		// Check for a user.
+		if (empty($user))
+		{
+			$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Make sure the user isn't blocked.
+		if ($user->block)
+		{
+			$this->setError(JText::_('COM_USERS_USER_BLOCKED'));
+
+			return false;
+		}
+
+		$config = JFactory::getConfig();
+
+		// Assemble the login link.
+		$link = 'index.php?option=com_users&view=login';
+		$mode = $config->get('force_ssl', 0) == 2 ? 1 : (-1);
+
+		// Put together the email template data.
+		$data = ArrayHelper::fromObject($user);
+		$data['fromname'] = $config->get('fromname');
+		$data['mailfrom'] = $config->get('mailfrom');
+		$data['sitename'] = $config->get('sitename');
+		$data['link_text'] = JRoute::_($link, false, $mode);
+		$data['link_html'] = JRoute::_($link, true, $mode);
+
+		$subject = JText::sprintf(
+			'COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT',
+			$data['sitename']
+		);
+		$body = JText::sprintf(
+			'COM_USERS_EMAIL_USERNAME_REMINDER_BODY',
+			$data['sitename'],
+			$data['username'],
+			$data['link_text']
+		);
+
+		// Send the password reset request email.
+		$return = JFactory::getMailer()->sendMail($data['mailfrom'], $data['fromname'], $user->email, $subject, $body);
+
+		// Check for an error.
+		if ($return !== true)
+		{
+			$this->setError(JText::_('COM_USERS_MAIL_FAILED'), 500);
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_users/models/reset.php b/core/components/com_users/models/reset.php
new file mode 100644
index 00000000..a67ab66e
--- /dev/null
+++ b/core/components/com_users/models/reset.php
@@ -0,0 +1,523 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Rest model class for Users.
+ *
+ * @since  1.5
+ */
+class UsersModelReset extends JModelForm
+{
+	/**
+	 * Method to get the password reset request form.
+	 *
+	 * The base form is loaded from XML and then an event is fired
+	 * for users plugins to extend the form with extra fields.
+	 *
+	 * @param   array    $data      An optional array of data for the form to interogate.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.reset_request', 'reset_request', array('control' => 'jform', 'load_data' => $loadData));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the password reset complete form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm    A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getResetCompleteForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.reset_complete', 'reset_complete', $options = array('control' => 'jform'));
+
+		if (empty($form))
+		{
+			return false;
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the password reset confirm form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  JForm  A JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	public function getResetConfirmForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_users.reset_confirm', 'reset_confirm', $options = array('control' => 'jform'));
+
+		if (empty($form))
+		{
+			return false;
+		}
+		else
+		{
+			$form->setValue('token', '', JFactory::getApplication()->input->get('token'));
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Override preprocessForm to load the user plugin group instead of content.
+	 *
+	 * @param   JForm   $form   A JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @throws	Exception if there is an error in the form event.
+	 *
+	 * @since   1.6
+	 */
+	protected function preprocessForm(JForm $form, $data, $group = 'user')
+	{
+		parent::preprocessForm($form, $data, $group);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		// Get the application object.
+		$params = JFactory::getApplication()->getParams('com_users');
+
+		// Load the parameters.
+		$this->setState('params', $params);
+	}
+
+	/**
+	 * Save the new password after reset is done
+	 *
+	 * @param   array  $data  The data expected for the form.
+	 *
+	 * @return  mixed  Exception | JException | boolean
+	 *
+	 * @since   1.6
+	 */
+	public function processResetComplete($data)
+	{
+		// Get the form.
+		$form = $this->getResetCompleteForm();
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if ($form instanceof Exception)
+		{
+			return $form;
+		}
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			return $return;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		// Get the token and user id from the confirmation process.
+		$app = JFactory::getApplication();
+		$token = $app->getUserState('com_users.reset.token', null);
+		$userId = $app->getUserState('com_users.reset.user', null);
+
+		// Check the token and user id.
+		if (empty($token) || empty($userId))
+		{
+			return new JException(JText::_('COM_USERS_RESET_COMPLETE_TOKENS_MISSING'), 403);
+		}
+
+		// Get the user object.
+		$user = JUser::getInstance($userId);
+
+		// Check for a user and that the tokens match.
+		if (empty($user) || $user->activation !== $token)
+		{
+			$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Make sure the user isn't blocked.
+		if ($user->block)
+		{
+			$this->setError(JText::_('COM_USERS_USER_BLOCKED'));
+
+			return false;
+		}
+
+		// Check if the user is reusing the current password if required to reset their password
+		if ($user->requireReset == 1 && JUserHelper::verifyPassword($data['password1'], $user->password))
+		{
+			$this->setError(JText::_('JLIB_USER_ERROR_CANNOT_REUSE_PASSWORD'));
+
+			return false;
+		}
+
+		// Update the user object.
+		$user->password = JUserHelper::hashPassword($data['password1']);
+		$user->activation = '';
+		$user->password_clear = $data['password1'];
+
+		// Save the user to the database.
+		if (!$user->save(true))
+		{
+			return new JException(JText::sprintf('COM_USERS_USER_SAVE_FAILED', $user->getError()), 500);
+		}
+
+		// Flush the user data from the session.
+		$app->setUserState('com_users.reset.token', null);
+		$app->setUserState('com_users.reset.user', null);
+
+		return true;
+	}
+
+	/**
+	 * Receive the reset password request
+	 *
+	 * @param   array  $data  The data expected for the form.
+	 *
+	 * @return  mixed  Exception | JException | boolean
+	 *
+	 * @since   1.6
+	 */
+	public function processResetConfirm($data)
+	{
+		// Get the form.
+		$form = $this->getResetConfirmForm();
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if ($form instanceof Exception)
+		{
+			return $form;
+		}
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			return $return;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		// Find the user id for the given token.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('activation')
+			->select('id')
+			->select('block')
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('username') . ' = ' . $db->quote($data['username']));
+
+		// Get the user id.
+		$db->setQuery($query);
+
+		try
+		{
+			$user = $db->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			return new JException(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+		}
+
+		// Check for a user.
+		if (empty($user))
+		{
+			$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
+
+			return false;
+		}
+
+		if (!$user->activation)
+		{
+			$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Verify the token
+		if (!JUserHelper::verifyPassword($data['token'], $user->activation))
+		{
+			$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Make sure the user isn't blocked.
+		if ($user->block)
+		{
+			$this->setError(JText::_('COM_USERS_USER_BLOCKED'));
+
+			return false;
+		}
+
+		// Push the user data into the session.
+		$app = JFactory::getApplication();
+		$app->setUserState('com_users.reset.token', $user->activation);
+		$app->setUserState('com_users.reset.user', $user->id);
+
+		return true;
+	}
+
+	/**
+	 * Method to start the password reset process.
+	 *
+	 * @param   array  $data  The data expected for the form.
+	 *
+	 * @return  mixed  Exception | JException | boolean
+	 *
+	 * @since   1.6
+	 */
+	public function processResetRequest($data)
+	{
+		$config = JFactory::getConfig();
+
+		// Get the form.
+		$form = $this->getForm();
+
+		$data['email'] = JStringPunycode::emailToPunycode($data['email']);
+
+		// Check for an error.
+		if ($form instanceof Exception)
+		{
+			return $form;
+		}
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			return $return;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $formError)
+			{
+				$this->setError($formError->getMessage());
+			}
+
+			return false;
+		}
+
+		// Find the user id for the given email address.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select('id')
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('email') . ' = ' . $db->quote($data['email']));
+
+		// Get the user object.
+		$db->setQuery($query);
+
+		try
+		{
+			$userId = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError(JText::sprintf('COM_USERS_DATABASE_ERROR', $e->getMessage()), 500);
+
+			return false;
+		}
+
+		// Check for a user.
+		if (empty($userId))
+		{
+			$this->setError(JText::_('COM_USERS_INVALID_EMAIL'));
+
+			return false;
+		}
+
+		// Get the user object.
+		$user = JUser::getInstance($userId);
+
+		// Make sure the user isn't blocked.
+		if ($user->block)
+		{
+			$this->setError(JText::_('COM_USERS_USER_BLOCKED'));
+
+			return false;
+		}
+
+		// Make sure the user isn't a Super Admin.
+		if ($user->authorise('core.admin'))
+		{
+			$this->setError(JText::_('COM_USERS_REMIND_SUPERADMIN_ERROR'));
+
+			return false;
+		}
+
+		// Make sure the user has not exceeded the reset limit
+		if (!$this->checkResetLimit($user))
+		{
+			$resetLimit = (int) JFactory::getApplication()->getParams()->get('reset_time');
+			$this->setError(JText::plural('COM_USERS_REMIND_LIMIT_ERROR_N_HOURS', $resetLimit));
+
+			return false;
+		}
+
+		// Set the confirmation token.
+		$token = JApplicationHelper::getHash(JUserHelper::genRandomPassword());
+		$hashedToken = JUserHelper::hashPassword($token);
+
+		$user->activation = $hashedToken;
+
+		// Save the user to the database.
+		if (!$user->save(true))
+		{
+			return new JException(JText::sprintf('COM_USERS_USER_SAVE_FAILED', $user->getError()), 500);
+		}
+
+		// Assemble the password reset confirmation link.
+		$mode = $config->get('force_ssl', 0) == 2 ? 1 : (-1);
+		$link = 'index.php?option=com_users&view=reset&layout=confirm&token=' . $token;
+
+		// Put together the email template data.
+		$data = $user->getProperties();
+		$data['fromname'] = $config->get('fromname');
+		$data['mailfrom'] = $config->get('mailfrom');
+		$data['sitename'] = $config->get('sitename');
+		$data['link_text'] = JRoute::_($link, false, $mode);
+		$data['link_html'] = JRoute::_($link, true, $mode);
+		$data['token'] = $token;
+
+		$subject = JText::sprintf(
+			'COM_USERS_EMAIL_PASSWORD_RESET_SUBJECT',
+			$data['sitename']
+		);
+
+		$body = JText::sprintf(
+			'COM_USERS_EMAIL_PASSWORD_RESET_BODY',
+			$data['sitename'],
+			$data['token'],
+			$data['link_text']
+		);
+
+		// Send the password reset request email.
+		$return = JFactory::getMailer()->sendMail($data['mailfrom'], $data['fromname'], $user->email, $subject, $body);
+
+		// Check for an error.
+		if ($return !== true)
+		{
+			return new JException(JText::_('COM_USERS_MAIL_FAILED'), 500);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to check if user reset limit has been exceeded within the allowed time period.
+	 *
+	 * @param   JUser  $user  User doing the password reset
+	 *
+	 * @return  boolean true if user can do the reset, false if limit exceeded
+	 *
+	 * @since    2.5
+	 */
+	public function checkResetLimit($user)
+	{
+		$params = JFactory::getApplication()->getParams();
+		$maxCount = (int) $params->get('reset_count');
+		$resetHours = (int) $params->get('reset_time');
+		$result = true;
+
+		$lastResetTime = strtotime($user->lastResetTime) ?: 0;
+		$hoursSinceLastReset = (strtotime(JFactory::getDate()->toSql()) - $lastResetTime) / 3600;
+
+		if ($hoursSinceLastReset > $resetHours)
+		{
+			// If it's been long enough, start a new reset count
+			$user->lastResetTime = JFactory::getDate()->toSql();
+			$user->resetCount = 1;
+		}
+		elseif ($user->resetCount < $maxCount)
+		{
+			// If we are under the max count, just increment the counter
+			++$user->resetCount;
+		}
+		else
+		{
+			// At this point, we know we have exceeded the maximum resets for the time period
+			$result = false;
+		}
+
+		return $result;
+	}
+}
diff --git a/core/components/com_users/models/rules/loginuniquefield.php b/core/components/com_users/models/rules/loginuniquefield.php
new file mode 100644
index 00000000..45b6b21a
--- /dev/null
+++ b/core/components/com_users/models/rules/loginuniquefield.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * JFormRule for com_users to be sure only one redirect login field has a value
+ *
+ * @since  3.6
+ */
+class JFormRuleLoginUniqueField extends JFormRule
+{
+	/**
+	 * Method to test if two fields have a value in order to use only one field.
+	 * To use this rule, the form
+	 * XML needs a validate attribute of loginuniquefield and a field attribute
+	 * that is equal to the field to test against.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   JForm             $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   3.6
+	 */
+	public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
+	{
+		$loginRedirectUrl       = $input['params']->login_redirect_url;
+		$loginRedirectMenuitem  = $input['params']->login_redirect_menuitem;
+
+		if ($form === null)
+		{
+			throw new InvalidArgumentException(sprintf('The value for $form must not be null in %s', get_class($this)));
+		}
+
+		if ($input === null)
+		{
+			throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_users/models/rules/logoutuniquefield.php b/core/components/com_users/models/rules/logoutuniquefield.php
new file mode 100644
index 00000000..6a9eaf44
--- /dev/null
+++ b/core/components/com_users/models/rules/logoutuniquefield.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * JFormRule for com_users to be sure only one redirect logout field has a value
+ *
+ * @since  3.6
+ */
+class JFormRuleLogoutUniqueField extends JFormRule
+{
+	/**
+	 * Method to test if two fields have a value in order to use only one field.
+	 * To use this rule, the form
+	 * XML needs a validate attribute of logoutuniquefield and a field attribute
+	 * that is equal to the field to test against.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 * @param   Registry          $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   JForm             $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   3.6
+	 */
+	public function test(SimpleXMLElement $element, $value, $group = null, Registry $input = null, JForm $form = null)
+	{
+		$logoutRedirectUrl      = $input['params']->logout_redirect_url;
+		$logoutRedirectMenuitem = $input['params']->logout_redirect_menuitem;
+
+		if ($form === null)
+		{
+			throw new InvalidArgumentException(sprintf('The value for $form must not be null in %s', get_class($this)));
+		}
+
+		if ($input === null)
+		{
+			throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
+		}
+
+		return true;
+	}
+}
diff --git a/core/components/com_users/router.php b/core/components/com_users/router.php
new file mode 100644
index 00000000..7e9e02d1
--- /dev/null
+++ b/core/components/com_users/router.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_users
+ *
+ * @since  3.2
+ */
+class UsersRouter extends JComponentRouterView
+{
+	/**
+	 * Users Component router constructor
+	 *
+	 * @param   JApplicationCms  $app   The application object
+	 * @param   JMenu            $menu  The menu object to work with
+	 */
+	public function __construct($app = null, $menu = null)
+	{
+		$this->registerView(new JComponentRouterViewconfiguration('login'));
+		$profile = new JComponentRouterViewconfiguration('profile');
+		$profile->addLayout('edit');
+		$this->registerView($profile);
+		$this->registerView(new JComponentRouterViewconfiguration('registration'));
+		$this->registerView(new JComponentRouterViewconfiguration('remind'));
+		$this->registerView(new JComponentRouterViewconfiguration('reset'));
+
+		parent::__construct($app, $menu);
+
+		$this->attachRule(new JComponentRouterRulesMenu($this));
+
+		$params = JComponentHelper::getParams('com_users');
+
+		if ($params->get('sef_advanced', 0))
+		{
+			$this->attachRule(new JComponentRouterRulesStandard($this));
+			$this->attachRule(new JComponentRouterRulesNomenu($this));
+		}
+		else
+		{
+			JLoader::register('UsersRouterRulesLegacy', __DIR__ . '/helpers/legacyrouter.php');
+			$this->attachRule(new UsersRouterRulesLegacy($this));
+		}
+	}
+}
+
+/**
+ * Users router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  REQUEST query
+ *
+ * @return  array  Segments of the SEF url
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function usersBuildRoute(&$query)
+{
+	$app = JFactory::getApplication();
+	$router = new UsersRouter($app, $app->getMenu());
+
+	return $router->build($query);
+}
+
+/**
+ * Convert SEF URL segments into query variables
+ *
+ * @param   array  $segments  Segments in the current URL
+ *
+ * @return  array  Query variables
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function usersParseRoute($segments)
+{
+	$app = JFactory::getApplication();
+	$router = new UsersRouter($app, $app->getMenu());
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_users/users.php b/core/components/com_users/users.php
new file mode 100644
index 00000000..1213c3a4
--- /dev/null
+++ b/core/components/com_users/users.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersHelperRoute', JPATH_COMPONENT . '/helpers/route.php');
+
+$controller = JControllerLegacy::getInstance('Users');
+$controller->execute(JFactory::getApplication()->input->get('task', 'display'));
+$controller->redirect();
diff --git a/core/components/com_users/views/login/tmpl/default.php b/core/components/com_users/views/login/tmpl/default.php
new file mode 100644
index 00000000..7db00b2d
--- /dev/null
+++ b/core/components/com_users/views/login/tmpl/default.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$cookieLogin = $this->user->get('cookieLogin');
+
+if (!empty($cookieLogin) || $this->user->get('guest'))
+{
+	// The user is not logged in or needs to provide a password.
+	echo $this->loadTemplate('login');
+}
+else
+{
+	// The user is already logged in.
+	echo $this->loadTemplate('logout');
+}
diff --git a/core/components/com_users/views/login/tmpl/default.xml b/core/components/com_users/views/login/tmpl/default.xml
new file mode 100644
index 00000000..92ca4b40
--- /dev/null
+++ b/core/components/com_users/views/login/tmpl/default.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_user_login_view_default_title" option="com_user_login_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_USER_LOGIN"
+		/>
+		<message>
+			<![CDATA[COM_USER_LOGIN_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic" addrulepath="components/com_users/models/rules" label="COM_MENUS_BASIC_FIELDSET_LABEL">
+
+		<field
+			name="loginredirectchoice"
+			type="radio"
+			label="COM_USERS_FIELD_LOGIN_REDIRECT_CHOICE_LABEL"
+			description="COM_USERS_FIELD_LOGIN_REDIRECT_CHOICE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">COM_USERS_FIELD_LOGIN_MENUITEM</option>
+			<option value="0">COM_USERS_FIELD_LOGIN_URL</option>
+		</field>
+
+		<field
+			name="login_redirect_url"
+			type="text"
+			label="JFIELD_LOGIN_REDIRECT_URL_LABEL"
+			description="JFIELD_LOGIN_REDIRECT_URL_DESC"
+			class="inputbox"
+			validate="loginuniquefield"
+			field="login_redirect_menuitem"
+			hint="COM_USERS_FIELD_LOGIN_REDIRECT_PLACEHOLDER"
+			message="COM_USERS_FIELD_LOGIN_REDIRECT_ERROR"
+			showon="loginredirectchoice:0"
+		/>
+
+		<field
+			name="login_redirect_menuitem"
+			type="modal_menu"
+			label="COM_USERS_FIELD_LOGIN_REDIRECTMENU_LABEL"
+			description="COM_USERS_FIELD_LOGIN_REDIRECTMENU_DESC"
+			disable="separator,alias,heading,url"
+			showon="loginredirectchoice:1"
+			select="true"
+			new="true"
+			edit="true"
+			clear="true"
+			>
+			<option value="">JDEFAULT</option>
+		</field>
+
+		<field
+			name="logindescription_show"
+			type="list"
+			label="JFIELD_BASIS_LOGIN_DESCRIPTION_SHOW_LABEL"
+			description="JFIELD_BASIS_LOGIN_DESCRIPTION_SHOW_DESC"
+			default="1"
+			class="chzn-color"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="login_description"
+			type="textarea"
+			label="JFIELD_BASIS_LOGIN_DESCRIPTION_LABEL"
+			description="JFIELD_BASIS_LOGIN_DESCRIPTION_DESC"
+			rows="3"
+			cols="40"
+			filter="safehtml"
+			showon="logindescription_show:1"
+		/>
+
+		<field
+			name="login_image"
+			type="media"
+			label="JFIELD_LOGIN_IMAGE_LABEL"
+			description="JFIELD_LOGIN_IMAGE_DESC"
+		/>
+
+		<field 
+			name="spacer1" 
+			type="spacer"
+			hr="true"
+		/>
+
+		<field
+			name="logoutredirectchoice"
+			type="radio"
+			label="COM_USERS_FIELD_LOGOUT_REDIRECT_CHOICE_LABEL"
+			description="COM_USERS_FIELD_LOGIN_REDIRECT_CHOICE_DESC"
+			class="btn-group btn-group-yesno"
+			default="1"
+			>
+			<option value="1">COM_USERS_FIELD_LOGIN_MENUITEM</option>
+			<option value="0">COM_USERS_FIELD_LOGIN_URL</option>
+		</field>
+
+		<field
+			name="logout_redirect_url"
+			type="text"
+			label="JFIELD_LOGOUT_REDIRECT_URL_LABEL"
+			description="JFIELD_LOGOUT_REDIRECT_URL_DESC"
+			class="inputbox"
+			field="logout_redirect_menuitem"
+			validate="logoutuniquefield"
+			hint="COM_USERS_FIELD_LOGIN_REDIRECT_PLACEHOLDER"
+			message="COM_USERS_FIELD_LOGOUT_REDIRECT_ERROR"
+			showon="logoutredirectchoice:0"
+		/>
+		
+		<field
+			name="logout_redirect_menuitem"
+			type="modal_menu"
+			label="COM_USERS_FIELD_LOGOUT_REDIRECTMENU_LABEL"
+			description="COM_USERS_FIELD_LOGOUT_REDIRECTMENU_DESC"
+			disable="separator,alias,heading,url"
+			showon="logoutredirectchoice:1"
+			select="true"
+			new="true"
+			edit="true"
+			clear="true"
+			>
+			<option value="">JDEFAULT</option>
+		</field>
+
+		<field
+			name="logoutdescription_show"
+			type="list"
+			label="JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_LABEL"
+			description="JFIELD_BASIS_LOGOUT_DESCRIPTION_SHOW_DESC"
+			default="1"
+			class="chzn-color"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="logout_description"
+			type="textarea"
+			label="JFIELD_BASIS_LOGOUT_DESCRIPTION_LABEL"
+			description="JFIELD_BASIS_LOGOUT_DESCRIPTION_DESC"
+			rows="3"
+			cols="40"
+			filter="safehtml"
+			showon="logoutdescription_show:1"
+		/>
+
+		<field
+			name="logout_image"
+			type="media"
+			label="JFIELD_LOGOUT_IMAGE_LABEL"
+			description="JFIELD_LOGOUT_IMAGE_DESC"
+		/>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_users/views/login/tmpl/default_login.php b/core/components/com_users/views/login/tmpl/default_login.php
new file mode 100644
index 00000000..d80a49f0
--- /dev/null
+++ b/core/components/com_users/views/login/tmpl/default_login.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="login<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<?php if (($this->params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>
+		<div class="login-description">
+	<?php endif; ?>
+	<?php if ($this->params->get('logindescription_show') == 1) : ?>
+		<?php echo $this->params->get('login_description'); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('login_image') != '') : ?>
+		<img src="<?php echo $this->escape($this->params->get('login_image')); ?>" class="login-image" alt="<?php echo JText::_('COM_USERS_LOGIN_IMAGE_ALT'); ?>" />
+	<?php endif; ?>
+	<?php if (($this->params->get('logindescription_show') == 1 && str_replace(' ', '', $this->params->get('login_description')) != '') || $this->params->get('login_image') != '') : ?>
+		</div>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="form-validate form-horizontal well">
+		<fieldset>
+			<?php foreach ($this->form->getFieldset('credentials') as $field) : ?>
+				<?php if (!$field->hidden) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php echo $field->input; ?>
+						</div>
+					</div>
+				<?php endif; ?>
+			<?php endforeach; ?>
+			<?php if ($this->tfa) : ?>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getField('secretkey')->label; ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getField('secretkey')->input; ?>
+					</div>
+				</div>
+			<?php endif; ?>
+			<?php if (JPluginHelper::isEnabled('system', 'remember')) : ?>
+				<div class="control-group">
+					<div class="control-label">
+						<label for="remember">
+							<?php echo JText::_('COM_USERS_LOGIN_REMEMBER_ME'); ?>
+						</label>
+					</div>
+					<div class="controls">
+						<input id="remember" type="checkbox" name="remember" class="inputbox" value="yes" />
+					</div>
+				</div>
+			<?php endif; ?>
+			<div class="control-group">
+				<div class="controls">
+					<button type="submit" class="btn btn-primary">
+						<?php echo JText::_('JLOGIN'); ?>
+					</button>
+				</div>
+			</div>
+			<?php $return = $this->form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem'))); ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($return); ?>" />
+			<?php echo JHtml::_('form.token'); ?>
+		</fieldset>
+	</form>
+</div>
+<div>
+	<ul class="nav nav-tabs nav-stacked">
+		<li>
+			<a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
+				<?php echo JText::_('COM_USERS_LOGIN_RESET'); ?>
+			</a>
+		</li>
+		<li>
+			<a href="<?php echo JRoute::_('index.php?option=com_users&view=remind'); ?>">
+				<?php echo JText::_('COM_USERS_LOGIN_REMIND'); ?>
+			</a>
+		</li>
+		<?php $usersConfig = JComponentHelper::getParams('com_users'); ?>
+		<?php if ($usersConfig->get('allowUserRegistration')) : ?>
+			<li>
+				<a href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
+					<?php echo JText::_('COM_USERS_LOGIN_REGISTER'); ?>
+				</a>
+			</li>
+		<?php endif; ?>
+	</ul>
+</div>
diff --git a/core/components/com_users/views/login/tmpl/default_logout.php b/core/components/com_users/views/login/tmpl/default_logout.php
new file mode 100644
index 00000000..afec2b4e
--- /dev/null
+++ b/core/components/com_users/views/login/tmpl/default_logout.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="logout<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<?php if (($this->params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?>
+		<div class="logout-description">
+	<?php endif; ?>
+	<?php if ($this->params->get('logoutdescription_show') == 1) : ?>
+		<?php echo $this->params->get('logout_description'); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('logout_image') != '') : ?>
+		<img src="<?php echo $this->escape($this->params->get('logout_image')); ?>" class="thumbnail pull-right logout-image" alt="<?php echo JText::_('COM_USER_LOGOUT_IMAGE_ALT'); ?>" />
+	<?php endif; ?>
+	<?php if (($this->params->get('logoutdescription_show') == 1 && str_replace(' ', '', $this->params->get('logout_description')) != '')|| $this->params->get('logout_image') != '') : ?>
+		</div>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.logout'); ?>" method="post" class="form-horizontal well">
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary">
+					<span class="icon-arrow-left icon-white"></span>
+					<?php echo JText::_('JLOGOUT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php if ($this->params->get('logout_redirect_url')) : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_url', $this->form->getValue('return'))); ?>" />
+		<?php else : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_menuitem', $this->form->getValue('return'))); ?>" />
+		<?php endif; ?>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/login/tmpl/logout.xml b/core/components/com_users/views/login/tmpl/logout.xml
new file mode 100644
index 00000000..8dab8b30
--- /dev/null
+++ b/core/components/com_users/views/login/tmpl/logout.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USER_LOGOUT_VIEW_DEFAULT_TITLE" option="COM_USER_LOGOUT_VIEW_DEFAULT_OPTION">
+		<help key = "JHELP_MENUS_MENU_ITEM_USER_LOGOUT"/>
+		<message>
+			<![CDATA[COM_USER_LOGOUT_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request">
+			<field
+				name="task"
+				type="hidden"
+				default="user.menulogout"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+		<fieldset name="basic" label="COM_MENUS_BASIC_FIELDSET_LABEL">
+			<field
+				name="logout"
+				type="modal_menu"
+				label="JFIELD_LOGOUT_REDIRECT_PAGE_LABEL"
+				description="JFIELD_LOGOUT_REDIRECT_PAGE_DESC"
+				disable="separator,alias,heading,url"
+				select="true"
+				new="true"
+				edit="true"
+				clear="true"
+				>
+				<option value="">JDEFAULT</option>
+			</field>
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_users/views/login/view.html.php b/core/components/com_users/views/login/view.html.php
new file mode 100644
index 00000000..c7d071e2
--- /dev/null
+++ b/core/components/com_users/views/login/view.html.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Login view class for Users.
+ *
+ * @since  1.5
+ */
+class UsersViewLogin extends JViewLegacy
+{
+	protected $form;
+
+	protected $params;
+
+	protected $state;
+
+	protected $user;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		// Get the view data.
+		$this->user   = JFactory::getUser();
+		$this->form   = $this->get('Form');
+		$this->state  = $this->get('State');
+		$this->params = $this->state->get('params');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode('<br />', $errors));
+
+			return false;
+		}
+
+		// Check for layout override
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			$this->setLayout($active->query['layout']);
+		}
+
+		$tfa = JAuthenticationHelper::getTwoFactorMethods();
+		$this->tfa = is_array($tfa) && count($tfa) > 1;
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$user  = JFactory::getUser();
+		$login = $user->get('guest') ? true : false;
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', $login ? JText::_('JLOGIN') : JText::_('JLOGOUT'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_users/views/profile/tmpl/default.php b/core/components/com_users/views/profile/tmpl/default.php
new file mode 100644
index 00000000..75321514
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/default.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="profile<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<?php if (JFactory::getUser()->id == $this->data->id) : ?>
+		<ul class="btn-toolbar pull-right">
+			<li class="btn-group">
+				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&task=profile.edit&user_id=' . (int) $this->data->id); ?>">
+					<span class="icon-user"></span>
+					<?php echo JText::_('COM_USERS_EDIT_PROFILE'); ?>
+				</a>
+			</li>
+		</ul>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('core'); ?>
+	<?php echo $this->loadTemplate('params'); ?>
+	<?php echo $this->loadTemplate('custom'); ?>
+</div>
diff --git a/core/components/com_users/views/profile/tmpl/default.xml b/core/components/com_users/views/profile/tmpl/default.xml
new file mode 100644
index 00000000..3bd6de7c
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_user_profile_view_default_title" option="com_user_profile_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_USER_PROFILE"
+		/>
+		<message>
+			<![CDATA[com_user_profile_view_default_desc]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/components/com_users/views/profile/tmpl/default_core.php b/core/components/com_users/views/profile/tmpl/default_core.php
new file mode 100644
index 00000000..a5bbd198
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/default_core.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<fieldset id="users-profile-core">
+	<legend>
+		<?php echo JText::_('COM_USERS_PROFILE_CORE_LEGEND'); ?>
+	</legend>
+	<dl class="dl-horizontal">
+		<dt>
+			<?php echo JText::_('COM_USERS_PROFILE_NAME_LABEL'); ?>
+		</dt>
+		<dd>
+			<?php echo $this->data->name; ?>
+		</dd>
+		<dt>
+			<?php echo JText::_('COM_USERS_PROFILE_USERNAME_LABEL'); ?>
+		</dt>
+		<dd>
+			<?php echo htmlspecialchars($this->data->username, ENT_COMPAT, 'UTF-8'); ?>
+		</dd>
+		<dt>
+			<?php echo JText::_('COM_USERS_PROFILE_REGISTERED_DATE_LABEL'); ?>
+		</dt>
+		<dd>
+			<?php echo JHtml::_('date', $this->data->registerDate, JText::_('DATE_FORMAT_LC1')); ?>
+		</dd>
+		<dt>
+			<?php echo JText::_('COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL'); ?>
+		</dt>
+		<?php if ($this->data->lastvisitDate != $this->db->getNullDate()) : ?>
+			<dd>
+				<?php echo JHtml::_('date', $this->data->lastvisitDate, JText::_('DATE_FORMAT_LC1')); ?>
+			</dd>
+		<?php else : ?>
+			<dd>
+				<?php echo JText::_('COM_USERS_PROFILE_NEVER_VISITED'); ?>
+			</dd>
+		<?php endif; ?>
+	</dl>
+</fieldset>
diff --git a/core/components/com_users/views/profile/tmpl/default_custom.php b/core/components/com_users/views/profile/tmpl/default_custom.php
new file mode 100644
index 00000000..92d1a542
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/default_custom.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::register('users.spacer', array('JHtmlUsers', 'spacer'));
+
+$fieldsets = $this->form->getFieldsets();
+
+if (isset($fieldsets['core']))
+{
+	unset($fieldsets['core']);
+}
+
+if (isset($fieldsets['params']))
+{
+	unset($fieldsets['params']);
+}
+
+$tmp          = isset($this->data->jcfields) ? $this->data->jcfields : array();
+$customFields = array();
+
+foreach ($tmp as $customField)
+{
+	$customFields[$customField->name] = $customField;
+}
+
+?>
+<?php foreach ($fieldsets as $group => $fieldset) : ?>
+	<?php $fields = $this->form->getFieldset($group); ?>
+	<?php if (count($fields)) : ?>
+		<fieldset id="users-profile-custom-<?php echo $group; ?>" class="users-profile-custom-<?php echo $group; ?>">
+			<?php if (isset($fieldset->label) && ($legend = trim(JText::_($fieldset->label))) !== '') : ?>
+				<legend><?php echo $legend; ?></legend>
+			<?php endif; ?>
+			<?php if (isset($fieldset->description) && trim($fieldset->description)) : ?>
+				<p><?php echo $this->escape(JText::_($fieldset->description)); ?></p>
+			<?php endif; ?>
+			<dl class="dl-horizontal">
+				<?php foreach ($fields as $field) : ?>
+					<?php if (!$field->hidden && $field->type !== 'Spacer') : ?>
+						<dt>
+							<?php echo $field->title; ?>
+						</dt>
+						<dd>
+							<?php if (key_exists($field->fieldname, $customFields)) : ?>
+								<?php echo strlen($customFields[$field->fieldname]->value) ? $customFields[$field->fieldname]->value : JText::_('COM_USERS_PROFILE_VALUE_NOT_FOUND'); ?>
+							<?php elseif (JHtml::isRegistered('users.' . $field->id)) : ?>
+								<?php echo JHtml::_('users.' . $field->id, $field->value); ?>
+							<?php elseif (JHtml::isRegistered('users.' . $field->fieldname)) : ?>
+								<?php echo JHtml::_('users.' . $field->fieldname, $field->value); ?>
+							<?php elseif (JHtml::isRegistered('users.' . $field->type)) : ?>
+								<?php echo JHtml::_('users.' . $field->type, $field->value); ?>
+							<?php else : ?>
+								<?php echo JHtml::_('users.value', $field->value); ?>
+							<?php endif; ?>
+						</dd>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</dl>
+		</fieldset>
+	<?php endif; ?>
+<?php endforeach; ?>
diff --git a/core/components/com_users/views/profile/tmpl/default_params.php b/core/components/com_users/views/profile/tmpl/default_params.php
new file mode 100644
index 00000000..cf11a1fe
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/default_params.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+?>
+<?php $fields = $this->form->getFieldset('params'); ?>
+<?php if (count($fields)) : ?>
+	<fieldset id="users-profile-custom">
+		<legend><?php echo JText::_('COM_USERS_SETTINGS_FIELDSET_LABEL'); ?></legend>
+		<dl class="dl-horizontal">
+			<?php foreach ($fields as $field) : ?>
+				<?php if (!$field->hidden) : ?>
+					<dt>
+						<?php echo $field->title; ?>
+					</dt>
+					<dd>
+						<?php if (JHtml::isRegistered('users.' . $field->id)) : ?>
+							<?php echo JHtml::_('users.' . $field->id, $field->value); ?>
+						<?php elseif (JHtml::isRegistered('users.' . $field->fieldname)) : ?>
+							<?php echo JHtml::_('users.' . $field->fieldname, $field->value); ?>
+						<?php elseif (JHtml::isRegistered('users.' . $field->type)) : ?>
+							<?php echo JHtml::_('users.' . $field->type, $field->value); ?>
+						<?php else : ?>
+							<?php echo JHtml::_('users.value', $field->value); ?>
+						<?php endif; ?>
+					</dd>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		</dl>
+	</fieldset>
+<?php endif; ?>
diff --git a/core/components/com_users/views/profile/tmpl/edit.php b/core/components/com_users/views/profile/tmpl/edit.php
new file mode 100644
index 00000000..9239108d
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/edit.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+JHtml::_('formbehavior.chosen', 'select');
+JHtml::_('bootstrap.tooltip');
+
+
+// Load user_profile plugin language
+$lang = JFactory::getLanguage();
+$lang->load('plg_user_profile', JPATH_ADMINISTRATOR);
+
+?>
+<div class="profile-edit<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<script type="text/javascript">
+		Joomla.twoFactorMethodChange = function(e)
+		{
+			var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val();
+
+			jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el)
+			{
+				if (el.id != selectedPane)
+				{
+					jQuery('#' + el.id).hide(0);
+				}
+				else
+				{
+					jQuery('#' + el.id).show(0);
+				}
+			});
+		}
+	</script>
+	<form id="member-profile" action="<?php echo JRoute::_('index.php?option=com_users&task=profile.save'); ?>" method="post" class="form-validate form-horizontal well" enctype="multipart/form-data">
+		<?php // Iterate through the form fieldsets and display each one. ?>
+		<?php foreach ($this->form->getFieldsets() as $group => $fieldset) : ?>
+			<?php $fields = $this->form->getFieldset($group); ?>
+			<?php if (count($fields)) : ?>
+				<fieldset>
+					<?php // If the fieldset has a label set, display it as the legend. ?>
+					<?php if (isset($fieldset->label)) : ?>
+						<legend>
+							<?php echo JText::_($fieldset->label); ?>
+						</legend>
+					<?php endif; ?>
+					<?php if (isset($fieldset->description) && trim($fieldset->description)) : ?>
+						<p>
+							<?php echo $this->escape(JText::_($fieldset->description)); ?>
+						</p>
+					<?php endif; ?>
+					<?php // Iterate through the fields in the set and display them. ?>
+					<?php foreach ($fields as $field) : ?>
+						<?php // If the field is hidden, just display the input. ?>
+						<?php if ($field->hidden) : ?>
+							<?php echo $field->input; ?>
+						<?php else : ?>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $field->label; ?>
+									<?php if (!$field->required && $field->type !== 'Spacer') : ?>
+										<span class="optional">
+											<?php echo JText::_('COM_USERS_OPTIONAL'); ?>
+										</span>
+									<?php endif; ?>
+								</div>
+								<div class="controls">
+									<?php if ($field->fieldname === 'password1') : ?>
+										<?php // Disables autocomplete ?>
+										<input type="password" style="display:none">
+									<?php endif; ?>
+									<?php echo $field->input; ?>
+								</div>
+							</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</fieldset>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<?php if (count($this->twofactormethods) > 1) : ?>
+			<fieldset>
+				<legend><?php echo JText::_('COM_USERS_PROFILE_TWO_FACTOR_AUTH'); ?></legend>
+				<div class="control-group">
+					<div class="control-label">
+						<label id="jform_twofactor_method-lbl" for="jform_twofactor_method" class="hasTooltip"
+							title="<?php echo '<strong>' . JText::_('COM_USERS_PROFILE_TWOFACTOR_LABEL') . '</strong><br />' . JText::_('COM_USERS_PROFILE_TWOFACTOR_DESC'); ?>">
+							<?php echo JText::_('COM_USERS_PROFILE_TWOFACTOR_LABEL'); ?>
+						</label>
+					</div>
+					<div class="controls">
+						<?php echo JHtml::_('select.genericlist', $this->twofactormethods, 'jform[twofactor][method]', array('onchange' => 'Joomla.twoFactorMethodChange()'), 'value', 'text', $this->otpConfig->method, 'jform_twofactor_method', false); ?>
+					</div>
+				</div>
+				<div id="com_users_twofactor_forms_container">
+					<?php foreach ($this->twofactorform as $form) : ?>
+						<?php $style = $form['method'] == $this->otpConfig->method ? 'display: block' : 'display: none'; ?>
+						<div id="com_users_twofactor_<?php echo $form['method']; ?>" style="<?php echo $style; ?>">
+							<?php echo $form['form']; ?>
+						</div>
+					<?php endforeach; ?>
+				</div>
+			</fieldset>
+			<fieldset>
+				<legend>
+					<?php echo JText::_('COM_USERS_PROFILE_OTEPS'); ?>
+				</legend>
+				<div class="alert alert-info">
+					<?php echo JText::_('COM_USERS_PROFILE_OTEPS_DESC'); ?>
+				</div>
+				<?php if (empty($this->otpConfig->otep)) : ?>
+					<div class="alert alert-warning">
+						<?php echo JText::_('COM_USERS_PROFILE_OTEPS_WAIT_DESC'); ?>
+					</div>
+				<?php else : ?>
+					<?php foreach ($this->otpConfig->otep as $otep) : ?>
+						<span class="span3">
+							<?php echo substr($otep, 0, 4); ?>-<?php echo substr($otep, 4, 4); ?>-<?php echo substr($otep, 8, 4); ?>-<?php echo substr($otep, 12, 4); ?>
+						</span>
+					<?php endforeach; ?>
+					<div class="clearfix"></div>
+				<?php endif; ?>
+			</fieldset>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+				<a class="btn" href="<?php echo JRoute::_('index.php?option=com_users&view=profile'); ?>" title="<?php echo JText::_('JCANCEL'); ?>">
+					<?php echo JText::_('JCANCEL'); ?>
+				</a>
+				<input type="hidden" name="option" value="com_users" />
+				<input type="hidden" name="task" value="profile.save" />
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/profile/tmpl/edit.xml b/core/components/com_users/views/profile/tmpl/edit.xml
new file mode 100644
index 00000000..e922e6f8
--- /dev/null
+++ b/core/components/com_users/views/profile/tmpl/edit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_user_profile_edit_default_title" option="com_user_profile_edit_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_USER_PROFILE_EDIT"
+		/>
+		<message>
+			<![CDATA[com_user_profile_edit_default_desc]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/components/com_users/views/profile/view.html.php b/core/components/com_users/views/profile/view.html.php
new file mode 100644
index 00000000..c8e71055
--- /dev/null
+++ b/core/components/com_users/views/profile/view.html.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Profile view class for Users.
+ *
+ * @since  1.6
+ */
+class UsersViewProfile extends JViewLegacy
+{
+	protected $data;
+
+	protected $form;
+
+	protected $params;
+
+	protected $state;
+
+	/**
+	 * An instance of JDatabaseDriver.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.6.3
+	 */
+	protected $db;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed   A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		$user = JFactory::getUser();
+
+		// Get the view data.
+		$this->data	        = $this->get('Data');
+		$this->form	        = $this->getModel()->getForm(new JObject(array('id' => $user->id)));
+		$this->state            = $this->get('State');
+		$this->params           = $this->state->get('params');
+		$this->twofactorform    = $this->get('Twofactorform');
+		$this->twofactormethods = UsersHelper::getTwoFactorMethods();
+		$this->otpConfig        = $this->get('OtpConfig');
+		$this->db               = JFactory::getDbo();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode('<br />', $errors));
+
+			return false;
+		}
+
+		// View also takes responsibility for checking if the user logged in with remember me.
+		$cookieLogin = $user->get('cookieLogin');
+
+		if (!empty($cookieLogin))
+		{
+			// If so, the user must login to edit the password and other data.
+			// What should happen here? Should we force a logout which destroys the cookies?
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('JGLOBAL_REMEMBER_MUST_LOGIN'), 'message');
+			$app->redirect(JRoute::_('index.php?option=com_users&view=login', false));
+
+			return false;
+		}
+
+		// Check if a user was found.
+		if (!$this->data->id)
+		{
+			JError::raiseError(404, JText::_('JERROR_USERS_PROFILE_NOT_FOUND'));
+
+			return false;
+		}
+
+		$this->data->tags = new JHelperTags;
+		$this->data->tags->getItemTags('com_users.user', $this->data->id);
+
+		JPluginHelper::importPlugin('content');
+		$this->data->text = '';
+		JEventDispatcher::getInstance()->trigger('onContentPrepare', array ('com_users.user', &$this->data, &$this->data->params, 0));
+		unset($this->data->text);
+
+		// Check for layout override
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			$this->setLayout($active->query['layout']);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'));
+
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$user  = JFactory::getUser();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $user->name));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_USERS_PROFILE'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_users/views/registration/tmpl/complete.php b/core/components/com_users/views/registration/tmpl/complete.php
new file mode 100644
index 00000000..b1a761f4
--- /dev/null
+++ b/core/components/com_users/views/registration/tmpl/complete.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="registration-complete<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+</div>
diff --git a/core/components/com_users/views/registration/tmpl/default.php b/core/components/com_users/views/registration/tmpl/default.php
new file mode 100644
index 00000000..12ce2c87
--- /dev/null
+++ b/core/components/com_users/views/registration/tmpl/default.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="registration<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1><?php echo $this->escape($this->params->get('page_heading')); ?></h1>
+		</div>
+	<?php endif; ?>
+	<form id="member-registration" action="<?php echo JRoute::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="form-validate form-horizontal well" enctype="multipart/form-data">
+		<?php // Iterate through the form fieldsets and display each one. ?>
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
+			<?php if (count($fields)) : ?>
+				<fieldset>
+					<?php // If the fieldset has a label set, display it as the legend. ?>
+					<?php if (isset($fieldset->label)) : ?>
+						<legend><?php echo JText::_($fieldset->label); ?></legend>
+					<?php endif; ?>
+					<?php // Iterate through the fields in the set and display them. ?>
+					<?php foreach ($fields as $field) : ?>
+						<?php // If the field is hidden, just display the input. ?>
+						<?php if ($field->hidden) : ?>
+							<?php echo $field->input; ?>
+						<?php else : ?>
+							<div class="control-group">
+								<div class="control-label">
+									<?php echo $field->label; ?>
+									<?php if (!$field->required && $field->type !== 'Spacer') : ?>
+										<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL'); ?></span>
+									<?php endif; ?>
+								</div>
+								<div class="controls">
+									<?php echo $field->input; ?>
+								</div>
+							</div>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				</fieldset>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JREGISTER'); ?>
+				</button>
+				<a class="btn" href="<?php echo JRoute::_(''); ?>" title="<?php echo JText::_('JCANCEL'); ?>">
+					<?php echo JText::_('JCANCEL'); ?>
+				</a>
+				<input type="hidden" name="option" value="com_users" />
+				<input type="hidden" name="task" value="registration.register" />
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/registration/tmpl/default.xml b/core/components/com_users/views/registration/tmpl/default.xml
new file mode 100644
index 00000000..35e0551e
--- /dev/null
+++ b/core/components/com_users/views/registration/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USER_REGISTRATION_VIEW_DEFAULT_TITLE" option="COM_USER_REGISTRATION_VIEW_DEFAULT_OPTION">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_USER_REGISTRATION"
+		/>
+		<message>
+			<![CDATA[COM_USER_REGISTRATION_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/components/com_users/views/registration/view.html.php b/core/components/com_users/views/registration/view.html.php
new file mode 100644
index 00000000..42c4ac73
--- /dev/null
+++ b/core/components/com_users/views/registration/view.html.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Registration view class for Users.
+ *
+ * @since  1.6
+ */
+class UsersViewRegistration extends JViewLegacy
+{
+	protected $data;
+
+	protected $form;
+
+	protected $params;
+
+	protected $state;
+
+	public $document;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  The template file to include
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.6
+	 */
+	public function display($tpl = null)
+	{
+		// Get the view data.
+		$this->form   = $this->get('Form');
+		$this->data   = $this->get('Data');
+		$this->state  = $this->get('State');
+		$this->params = $this->state->get('params');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode('<br />', $errors));
+
+			return false;
+		}
+
+		// Check for layout override
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			$this->setLayout($active->query['layout']);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_USERS_REGISTRATION'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_users/views/remind/tmpl/default.php b/core/components/com_users/views/remind/tmpl/default.php
new file mode 100644
index 00000000..7a988145
--- /dev/null
+++ b/core/components/com_users/views/remind/tmpl/default.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="remind<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<form id="user-registration" action="<?php echo JRoute::_('index.php?option=com_users&task=remind.remind'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<fieldset>
+				<p><?php echo JText::_($fieldset->label); ?></p>
+				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
+					<?php if ($field->hidden === false) : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $field->label; ?>
+							</div>
+							<div class="controls">
+								<?php echo $field->input; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</fieldset>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/remind/tmpl/default.xml b/core/components/com_users/views/remind/tmpl/default.xml
new file mode 100644
index 00000000..65832a03
--- /dev/null
+++ b/core/components/com_users/views/remind/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_USER_REMIND_VIEW_DEFAULT_TITLE" option="COM_USER_REMIND_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_USER_REMINDER"
+		/>
+		<message>
+			<![CDATA[COM_USER_REMIND_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/components/com_users/views/remind/view.html.php b/core/components/com_users/views/remind/view.html.php
new file mode 100644
index 00000000..1bc19924
--- /dev/null
+++ b/core/components/com_users/views/remind/view.html.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Registration view class for Users.
+ *
+ * @since  1.5
+ */
+class UsersViewRemind extends JViewLegacy
+{
+	protected $form;
+
+	protected $params;
+
+	protected $state;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  The template file to include
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		// Get the view data.
+		$this->form   = $this->get('Form');
+		$this->state  = $this->get('State');
+		$this->params = $this->state->params;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode('<br />', $errors));
+
+			return false;
+		}
+
+		// Check for layout override
+		$active = JFactory::getApplication()->getMenu()->getActive();
+
+		if (isset($active->query['layout']))
+		{
+			$this->setLayout($active->query['layout']);
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_USERS_REMIND'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_users/views/reset/tmpl/complete.php b/core/components/com_users/views/reset/tmpl/complete.php
new file mode 100644
index 00000000..57729e88
--- /dev/null
+++ b/core/components/com_users/views/reset/tmpl/complete.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="reset-complete<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_users&task=reset.complete'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<fieldset>
+				<p><?php echo JText::_($fieldset->label); ?></p>
+				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php echo $field->input; ?>
+						</div>
+					</div>
+				<?php endforeach; ?>
+			</fieldset>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/reset/tmpl/confirm.php b/core/components/com_users/views/reset/tmpl/confirm.php
new file mode 100644
index 00000000..14abd9de
--- /dev/null
+++ b/core/components/com_users/views/reset/tmpl/confirm.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="reset-confirm<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_users&task=reset.confirm'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<fieldset>
+				<p><?php echo JText::_($fieldset->label); ?></p>
+				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $field->label; ?>
+						</div>
+						<div class="controls">
+							<?php echo $field->input; ?>
+							</div>
+						</div>
+				<?php endforeach; ?>
+			</fieldset>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/reset/tmpl/default.php b/core/components/com_users/views/reset/tmpl/default.php
new file mode 100644
index 00000000..895f50ea
--- /dev/null
+++ b/core/components/com_users/views/reset/tmpl/default.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
+
+?>
+<div class="reset<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php echo $this->escape($this->params->get('page_heading')); ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<form id="user-registration" action="<?php echo JRoute::_('index.php?option=com_users&task=reset.request'); ?>" method="post" class="form-validate form-horizontal well">
+		<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+			<fieldset>
+				<p><?php echo JText::_($fieldset->label); ?></p>
+				<?php foreach ($this->form->getFieldset($fieldset->name) as $name => $field) : ?>
+					<?php if ($field->hidden === false) : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $field->label; ?>
+							</div>
+							<div class="controls">
+								<?php echo $field->input; ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				<?php endforeach; ?>
+			</fieldset>
+		<?php endforeach; ?>
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn btn-primary validate">
+					<?php echo JText::_('JSUBMIT'); ?>
+				</button>
+			</div>
+		</div>
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/components/com_users/views/reset/tmpl/default.xml b/core/components/com_users/views/reset/tmpl/default.xml
new file mode 100644
index 00000000..ae60feb1
--- /dev/null
+++ b/core/components/com_users/views/reset/tmpl/default.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_user_reset_view_default_title" option="com_user_reset_view_default_option">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_USER_PASSWORD_RESET"
+		/>
+		<message>
+			<![CDATA[COM_USER_RESET_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+</metadata>
diff --git a/core/components/com_users/views/reset/view.html.php b/core/components/com_users/views/reset/view.html.php
new file mode 100644
index 00000000..9b08990c
--- /dev/null
+++ b/core/components/com_users/views/reset/view.html.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_users
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Reset view class for Users.
+ *
+ * @since  1.5
+ */
+class UsersViewReset extends JViewLegacy
+{
+	protected $form;
+
+	protected $params;
+
+	protected $state;
+
+	/**
+	 * Method to display the view.
+	 *
+	 * @param   string  $tpl  The template file to include
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		// This name will be used to get the model
+		$name = $this->getLayout();
+
+		// Check that the name is valid - has an associated model.
+		if (!in_array($name, array('confirm', 'complete')))
+		{
+			$name = 'default';
+		}
+
+		if ('default' === $name)
+		{
+			$formname = 'Form';
+		}
+		else
+		{
+			$formname = ucfirst($this->_name) . ucfirst($name) . 'Form';
+		}
+
+		// Get the view data.
+		$this->form   = $this->get($formname);
+		$this->state  = $this->get('State');
+		$this->params = $this->state->params;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode('<br />', $errors));
+
+			return false;
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareDocument()
+	{
+		$app   = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$title = null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_USERS_RESET'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/components/com_wrapper/controller.php b/core/components/com_wrapper/controller.php
new file mode 100644
index 00000000..02c6b39b
--- /dev/null
+++ b/core/components/com_wrapper/controller.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Controller
+ *
+ * @since  1.5
+ */
+class WrapperController extends JControllerLegacy
+{
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		$cachable = true;
+
+		// Set the default view name and format from the Request.
+		$vName = $this->input->get('view', 'wrapper');
+		$this->input->set('view', $vName);
+
+		return parent::display($cachable, array('Itemid' => 'INT'));
+	}
+}
diff --git a/core/components/com_wrapper/router.php b/core/components/com_wrapper/router.php
new file mode 100644
index 00000000..51c26fe3
--- /dev/null
+++ b/core/components/com_wrapper/router.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Routing class from com_wrapper
+ *
+ * @since  3.3
+ */
+class WrapperRouter extends JComponentRouterBase
+{
+	/**
+	 * Build the route for the com_wrapper component
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query)
+	{
+		if (isset($query['view']))
+		{
+			unset($query['view']);
+		}
+
+		return array();
+	}
+
+	/**
+	 * Parse the segments of a URL.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments)
+	{
+		return array('view' => 'wrapper');
+	}
+}
+
+/**
+ * Wrapper router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  &$query  An array of URL arguments
+ *
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function wrapperBuildRoute(&$query)
+{
+	$router = new WrapperRouter;
+
+	return $router->build($query);
+}
+
+/**
+ * Wrapper router functions
+ *
+ * These functions are proxys for the new router interface
+ * for old SEF extensions.
+ *
+ * @param   array  $segments  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ *
+ * @deprecated  4.0  Use Class based routers instead
+ */
+function wrapperParseRoute($segments)
+{
+	$router = new WrapperRouter;
+
+	return $router->parse($segments);
+}
diff --git a/core/components/com_wrapper/views/wrapper/tmpl/default.php b/core/components/com_wrapper/views/wrapper/tmpl/default.php
new file mode 100644
index 00000000..e6703af1
--- /dev/null
+++ b/core/components/com_wrapper/views/wrapper/tmpl/default.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('script', 'com_wrapper/iframe-height.min.js', array('version' => 'auto', 'relative' => true));
+
+?>
+<div class="contentpane<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<div class="page-header">
+			<h1>
+				<?php if ($this->escape($this->params->get('page_heading'))) : ?>
+					<?php echo $this->escape($this->params->get('page_heading')); ?>
+				<?php else : ?>
+					<?php echo $this->escape($this->params->get('page_title')); ?>
+				<?php endif; ?>
+			</h1>
+		</div>
+	<?php endif; ?>
+	<iframe <?php echo $this->wrapper->load; ?>
+		id="blockrandom"
+		name="iframe"
+		src="<?php echo $this->escape($this->wrapper->url); ?>"
+		width="<?php echo $this->escape($this->params->get('width')); ?>"
+		height="<?php echo $this->escape($this->params->get('height')); ?>"
+		scrolling="<?php echo $this->escape($this->params->get('scrolling')); ?>"
+		frameborder="<?php echo $this->escape($this->params->get('frameborder', 1)); ?>"
+		<?php if ($this->escape($this->params->get('page_heading'))) : ?>
+			title="<?php echo $this->escape($this->params->get('page_heading')); ?>"
+		<?php else : ?>
+			title="<?php echo $this->escape($this->params->get('page_title')); ?>"
+		<?php endif; ?>
+		class="wrapper<?php echo $this->pageclass_sfx; ?>">
+		<?php echo JText::_('COM_WRAPPER_NO_IFRAMES'); ?>
+	</iframe>
+</div>
diff --git a/core/components/com_wrapper/views/wrapper/tmpl/default.xml b/core/components/com_wrapper/views/wrapper/tmpl/default.xml
new file mode 100644
index 00000000..f0c1e350
--- /dev/null
+++ b/core/components/com_wrapper/views/wrapper/tmpl/default.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_WRAPPER_WRAPPER_VIEW_DEFAULT_TITLE" option="COM_WRAPPER_WRAPPER_VIEW_DEFAULT_OPTION">
+		<help
+			key="JHELP_MENUS_MENU_ITEM_WRAPPER"
+		/>
+		<message>
+			<![CDATA[COM_WRAPPER_WRAPPER_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the parameters object for the layout. -->
+		<fields name="params">
+		<fieldset name="request" label="COM_MENUS_BASIC_FIELDSET_LABEL">
+
+			<field 
+				name="url" 
+				type="text"
+				label="COM_WRAPPER_FIELD_URL_LABEL"
+				description="COM_WRAPPER_FIELD_URL_DESC"
+				size="30"
+				required="true"
+			/>
+		</fieldset>
+
+		<!-- Add fields to the parameters object for the layout. -->
+
+		<!-- Scroll. -->
+		<fieldset name="basic" label="COM_WRAPPER_FIELD_LABEL_SCROLLBARSPARAMS">
+
+			<field 
+				name="scrolling" 
+				type="list"
+				label="COM_WRAPPER_FIELD_SCROLLBARS_LABEL"
+				description="COM_WRAPPER_FIELD_SCROLLBARS_DESC"
+				default="auto"
+				>
+				<option value="no">JNO</option>
+				<option value="yes">JYES</option>
+				<option value="auto">COM_WRAPPER_FIELD_VALUE_AUTO</option>
+			</field>
+
+			<field 
+				name="width" 
+				type="text"
+				label="JGLOBAL_WIDTH"
+				description="COM_WRAPPER_FIELD_WIDTH_DESC"
+				default="100%"
+				size="5"
+			/>
+
+			<field 
+				name="height" 
+				type="number"
+				label="COM_WRAPPER_FIELD_HEIGHT_LABEL"
+				description="COM_WRAPPER_FIELD_HEIGHT_DESC"
+				default="500"
+				size="5"
+			/>
+
+		</fieldset>
+
+		<!-- Advanced options. -->
+		<fieldset name="advanced">
+
+			<field 
+				name="height_auto" 
+				type="radio"
+				label="COM_WRAPPER_FIELD_HEIGHTAUTO_LABEL"
+				description="COM_WRAPPER_FIELD_HEIGHTAUTO_DESC"
+				default="0"
+				class="btn-group btn-group-yesno"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field 
+				name="add_scheme"
+				type="radio"
+				label="COM_WRAPPER_FIELD_ADD_LABEL"
+				description="COM_WRAPPER_FIELD_ADD_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field 
+				name="frameborder"
+				type="radio"
+				label="COM_WRAPPER_FIELD_FRAME_LABEL"
+				description="COM_WRAPPER_FIELD_FRAME_DESC"
+				class="btn-group btn-group-yesno"
+				default="1"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+		</fieldset>
+	</fields>
+</metadata>
diff --git a/core/components/com_wrapper/views/wrapper/view.html.php b/core/components/com_wrapper/views/wrapper/view.html.php
new file mode 100644
index 00000000..52b577d9
--- /dev/null
+++ b/core/components/com_wrapper/views/wrapper/view.html.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Wrapper view class.
+ *
+ * @since  1.5
+ */
+class WrapperViewWrapper extends JViewLegacy
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   1.5
+	 */
+	public function display($tpl = null)
+	{
+		$app    = JFactory::getApplication();
+		$params = $app->getParams();
+
+		// Because the application sets a default page title, we need to get it
+		// right from the menu item itself
+		$title = $params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($params->get('menu-meta_description'));
+		}
+
+		if ($params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $params->get('menu-meta_keywords'));
+		}
+
+		if ($params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $params->get('robots'));
+		}
+
+		$wrapper = new stdClass;
+
+		// Auto height control
+		if ($params->def('height_auto'))
+		{
+			$wrapper->load = 'onload="iFrameHeight()"';
+		}
+		else
+		{
+			$wrapper->load = '';
+		}
+
+		$url = $params->def('url', '');
+
+		if ($params->def('add_scheme', 1))
+		{
+			// Adds 'http://' or 'https://' if none is set
+			if (strpos($url, '//') === 0)
+			{
+				// URL without scheme in component. Prepend current scheme.
+				$wrapper->url = JUri::getInstance()->toString(array('scheme')) . substr($url, 2);
+			}
+			elseif (strpos($url, '/') === 0)
+			{
+				// Relative URL in component. Use scheme + host + port.
+				$wrapper->url = JUri::getInstance()->toString(array('scheme', 'host', 'port')) . $url;
+			}
+			elseif (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0)
+			{
+				// URL doesn't start with either 'http://' or 'https://'. Add current scheme.
+				$wrapper->url = JUri::getInstance()->toString(array('scheme')) . $url;
+			}
+			else
+			{
+				// URL starts with either 'http://' or 'https://'. Do not change it.
+				$wrapper->url = $url;
+			}
+		}
+		else
+		{
+			$wrapper->url = $url;
+		}
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+		$this->params        = &$params;
+		$this->wrapper       = &$wrapper;
+
+		parent::display($tpl);
+	}
+}
diff --git a/core/components/com_wrapper/wrapper.php b/core/components/com_wrapper/wrapper.php
new file mode 100644
index 00000000..a30f1cd4
--- /dev/null
+++ b/core/components/com_wrapper/wrapper.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$controller = JControllerLegacy::getInstance('Wrapper');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/core/components/com_wrapper/wrapper.xml b/core/components/com_wrapper/wrapper.xml
new file mode 100644
index 00000000..61bbe987
--- /dev/null
+++ b/core/components/com_wrapper/wrapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.1" method="upgrade">
+	<name>com_wrapper</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.
+	</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>COM_WRAPPER_XML_DESCRIPTION</description>
+	<files folder="site">
+		<filename>controller.php</filename>
+		<filename>index.html</filename>
+		<filename>metadata.xml</filename>
+		<filename>router.php</filename>
+		<filename>wrapper.php</filename>
+		<folder>views</folder>
+	</files>
+	<languages folder="site">
+		<language tag="en-GB">language/en-GB.com_wrapper.ini</language>
+	</languages>
+	<administration>
+		<files folder="admin">
+			<filename>index.html</filename>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_wrapper.ini</language>
+			<language tag="en-GB">language/en-GB.com_wrapper.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/core/components/index.html b/core/components/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/components/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/htaccess.txt b/core/htaccess.txt
new file mode 100644
index 00000000..1b078ee2
--- /dev/null
+++ b/core/htaccess.txt
@@ -0,0 +1,80 @@
+##
+# @package    Joomla
+# @copyright  Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+# @license    GNU General Public License version 2 or later; see LICENSE.txt
+##
+
+##
+# READ THIS COMPLETELY IF YOU CHOOSE TO USE THIS FILE!
+#
+# The line 'Options +FollowSymLinks' may cause problems with some server configurations.
+# It is required for the use of mod_rewrite, but it may have already been set by your 
+# server administrator in a way that disallows changing it in this .htaccess file.
+# If using it causes your site to produce an error, comment it out (add # to the 
+# beginning of the line), reload your site in your browser and test your sef urls. If 
+# they work, then it has been set by your server administrator and you do not need to 
+# set it here.
+##
+
+## No directory listings
+<IfModule autoindex>
+  IndexIgnore *
+</IfModule>
+
+## Can be commented out if causes errors, see notes above.
+Options +FollowSymlinks
+Options -Indexes
+
+## Mod_rewrite in use.
+
+RewriteEngine On
+
+## Begin - Rewrite rules to block out some common exploits.
+# If you experience problems on your site then comment out the operations listed 
+# below by adding a # to the beginning of the line.
+# This attempts to block the most common type of exploit `attempts` on Joomla!
+#
+# Block any script trying to base64_encode data within the URL.
+RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
+# Block any script that includes a <script> tag in URL.
+RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
+# Block any script trying to set a PHP GLOBALS variable via URL.
+RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
+# Block any script trying to modify a _REQUEST variable via URL.
+RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
+# Return 403 Forbidden header and show the content of the root home page
+RewriteRule .* index.php [F]
+#
+## End - Rewrite rules to block out some common exploits.
+
+## Begin - Custom redirects
+#
+# If you need to redirect some pages, or set a canonical non-www to
+# www redirect (or vice versa), place that code here. Ensure those
+# redirects use the correct RewriteRule syntax and the [R=301,L] flags.
+#
+## End - Custom redirects
+
+##
+# Uncomment the following line if your webserver's URL
+# is not directly related to physical file paths.
+# Update Your Joomla! Directory (just / for root).
+##
+
+# RewriteBase /
+
+## Begin - Joomla! core SEF Section.
+#
+RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+#
+# If the requested path and file is not /index.php and the request
+# has not already been internally rewritten to the index.php script
+RewriteCond %{REQUEST_URI} !^/index\.php
+# and the requested path and file doesn't directly match a physical file
+RewriteCond %{REQUEST_FILENAME} !-f
+# and the requested path and file doesn't directly match a physical folder
+RewriteCond %{REQUEST_FILENAME} !-d
+# internally rewrite the request to the index.php script
+RewriteRule .* index.php [L]
+#
+## End - Joomla! core SEF Section.
diff --git a/core/images/banners/osmbanner1.png b/core/images/banners/osmbanner1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7398134716ce74d6e91ea441f373c82b5cbe265
GIT binary patch
literal 3447
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
Z9XrT{pB`So4e0;?002ovPDHLkV1gs9$a??)

literal 0
HcmV?d00001

diff --git a/core/images/banners/osmbanner2.png b/core/images/banners/osmbanner2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b69b6746deb62a449bcfe384eb789704339674e5
GIT binary patch
literal 3483
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
JPDHLkV1m_BxX}Or

literal 0
HcmV?d00001

diff --git a/core/images/banners/shop-ad-books.jpg b/core/images/banners/shop-ad-books.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d1588cea14c8377c6b499ead6cbe057de4bb4220
GIT binary patch
literal 10920
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

literal 0
HcmV?d00001

diff --git a/core/images/banners/shop-ad.jpg b/core/images/banners/shop-ad.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0b94e4857c23691d06a07068a4732a833adace12
GIT binary patch
literal 10119
zcmch7cT^P5v+rymEopbjAhP6~gG5=DoO4oCauRgO2%=<`oU>$*jDUcEfUpF~8AL!O
zM<s}$g5jax-~HYD$9?IXcV2a$nVR0NI-i>E>Dun9-wVH20JxT#rWybO0RZT-0Kb=j
zZ~zSYLw~N|KLmyRxe`F25GWx5At50F0RbTq2{9oNF%ba)F)1-I2?-1aBP1dvBZZOu
zVgC`klz<SxE+sBo{x9h_9zYNS@}OA=hz$TEKoA7zcOP)|5+f80xkUMIf?gsaCILfW
zpx=uC@gFMy;N3;t)jQMW4N~A$>T3H3T%iRe_xOMOOT=x?ij+gFeGA~d5M;@=GT#>W
z@hRG(DUIUTXROWjxVg%6;aqNIBLgmf3QXKRSv9eu=_JXbum+4DSu}hX%f9~ZYsCtI
zf|UIUrz%NX`xEvc;h{R$n|un=j4$x|ae<z5Po#E2${P2x<@9=*Sp(<WjthdMrjy_g
z40^BGV1A@7-G0+uU1l&L;*mg1E3iGCTh`LQ>${vV5EI?ImMyQ@ZjAJ?7~+T@w=ik0
zlXc4LzRNOxM?0lI^K9x^c&e3V|CD=+yKP8(z|NHZ8BM{^#~Z~&d!e6MCEL?{g~V_C
zV7^gEt9l%3^giR!y~aiU_Cfc-()T`+&Bp<!u~Hry0nlbVax<aJpWXGQy-a-kDTZ)=
zcfQ#DR7sJi#wSZ;``(qo8wF*}7_ykx2UnKcG6&>IioXAv*g7GRHK{auCAj{!pk0-n
z?v{2DOfoMh>8oZNb~l%lt*dxrO=7(8&s!$1(`|>nu^iL4d%5^kVBnoX#{2Z=G_Hr`
zuAB<|-{h}-Wt*7$*J#-3N%;j`jAU{$$CO)Uj$Dp0<K-AaE+^i<I{dkTz>v#f{yV;4
z_~o;U>mnNu01%mmUB?2jhlkS%ZQI8R7fv_;Qk~{bH!cx}29Qygx|sf@>%S=bM;Fmw
zWspD0>}bawuO$Hhc9y#x4LI$84~vu+p6lY5I|Be-j|c<VVBpWx)4uFWaQO`oz(_Br
z{~uKUz(OFY2w6o9Q;4Y9l#JmtbnIeACN>_^9O4ofThEZ>qMj*QWfi;729zXv^*Agw
z4S)2nc?wd5*ktIYF*Fu%bU6<tE|iCxOT1FApy6^!y}2v5$;&hQp^2+V$<kJ5F!FXe
zlF?M=FnY**t|2b#XN<p^&ZB;LR^2{~?p=4NYSU<hd73W#X?DxhN&0~eop6WNrrYsD
zir^l)6Vt~ZQJyczCdjoyQ{F$-|17FH9mMc#FZkp^UTieJD3zr_pV$)PT(`%lKaae-
zC``3ULm#o%r$(v&g>6sEu}tmuU7}}4jB>Y1T;#=b^_+~%T#U@(?d`Y}ZSxU-rT=2L
zfBn%IFJ^bfyUHMXL4EX}Ald(acZ_<FN}l^HRYTL=sK$)(&M-C1%jK^6gQh65AGY<&
zNxV<0XJp!q%}TF2wBL2$v?KFOFM7rtPr*LlqNt=->%3|5Nk5}EYU`t7>;J|k1s?5r
zEz+T7dPQVn6-N85F5^JXs&7Zzw}X47&G%XgZ}cSlxGL<5evmCDEiq5Ja~j94DUn#!
zDf}Bi^_~CpEn~{jt(IL6ayAUJf$<Y=ykKT<F6&i%x<>BwEerqdjAjCRmq|_A!S{MK
zbeA@H>9zT0LBk0}XUsvzb92j_Ic&O+(T^~;WsDIegH(P(b%m#KsRtX+7oS<AxOsH?
zq1ifpB&*Uh^=AW~CcbH*?xzy=uMBu~m^zm8^%TWv8^*K7w!ROIo`~M1c4v#WbX6WJ
zUE=vXi+?WI6cNx#r@p&wkQO0as;TV$$tckVb~WvqdD>5fZxns0j05Y!_pZN8QW+d)
zmqfx{PNJ2>7%VH2KI;=@I=GP!C+v~W7igv2G)Z@5HK;?E8(*oGK9kB3bevj4?2iqn
zGe@$?Iwv#92>+NqWvOAa@~PBR-Vs;NP^k?O%QE_$@>$ocGy0YiGRvdafwFYAfS04z
zo`>e!xw8IYxNlnc7B8*WtW58X4p*O#^W3I0<Xen7PR!$epvv0#^I7JZVJ(}gySnX-
zD!-hI=N{ht8PZ19`LNumnmG|xCrYLa@B4e<Z{E3~sBen#Jf%xXSu9zWNY$zeQ0Lju
z_8t7W#1W8$`3YAOCA@Qk#?!PjOtnoT6F!4%DS40=emJhb#~ActkvrRxmyf?p<*zpG
zAAVmV_4~Q^qMuqVA4p`|`!r{KLJ#6jAuvHD@{FkvcCb?E3&_3wS!Hp~TN1wkL$DXT
zC7|91qAB$*cL8HWeQ-^rK>3)F2orDlB>H~mq>X)vl22Bjkc>k0^g1RPrm7h(-=3Sr
zc(YGSZgDX}KKt+%S8=F*5Z&$P`#)Fr<&uAa8t-=MnAGH-Url<e{d4>I0<X4_L~y3L
z8lThS+bx|czX3Dh-eX3;_fb5RwoNY#mQs*uvTqJDXP;TuzTqD=cFmDGwJMhyAvSWn
z)-uqPL3Ppph|v~ZMP*c&%%o!%3#5m)t2*4Bt2e8h9i#~uQ-~TS^D$;>Pe~Q)lK8~-
z;d_Kmm`=1&`K<F;YPLYi#Rqm$q4d*0MUmEup=mXiM0n#{2bX)?{j6r+Up@Xxr}7{v
zQyp(MRj%7naDDhUu(&Qn?ce0*qNyZ%Dx@zjbynT~<2TT<mPt!4ImS>SGC<Hivd!xL
zUAyt|h5_}|E&<G5I(fZiuK=&%#WZkd?0UmcUZR>#;&k4x^;N{1F{(i4{eA4K!;+tU
zQkvgp9~^T3z_+iDa0ZNjNRn>anB1(7T;lvSZ7orL?~eJ~CWANHQ=NQu=~J}qnu*o6
z#@@f4GEc+gWWF~;>7+Pve*>5cNRFzilekoI=n%&2a7y!|NR-hYNgv;agQuv6hX;0l
z(BZjHzXh(&(N0&Q=p9E@&UDGvr!N-zTa@kS2-<kQilu{wYSs>OvDrsOL+Kv+BJFY`
zpJm-HWcx3v??b$B6_X<E?H*$<GGiLalbGu9$07`n1_E~y`iP#zg*ZCp8y#gn_fWnJ
zDsPfc&O0%3oM9H)vAS>lK2o<=S&t=b3=Z88ecNaI{i)f~T$6L4DCexxJgS7u>4T7)
z1$K{P!OE7TaMIwrmMW4}TB}cw+WY;*0Ya^$`C6CY^aA(9Z5IiP5W|X1xh_?0yC?4B
z!vf~8(rMb^5~0j1OE<IT-!_^Vy(p;BNMyW8L~G(Lz1ULZ(nj1Apu$B*%PAVU<h2gZ
z7#==5BsXx@88DHmL`0Y6&A->Qygj)A^BNa?V=Y!D9Y?{do1Bx{+H1l{g~%kyQSoj%
z96;p=Wj2YcmkeNX6SWdTZ(wUuhG^NA1AD34txQ=xDr=<NOQ+u!r3i4gh6m74u+6v5
z;s&q5#u+UI?Wy#hmh+PlYO{T(b?&$`w@hDTuqLgqcByN~B3jeFPK{kHnxrGkBiH3x
z7wt@V$n>sbxtaI8(09v|Az_Bo7YSdDu@VW^V_9<bmJVwZI|s0msrhEvDjhqcxp+r6
zZp%Z88D3BFnMXPJlTUf^De@z3{aroY!#A_D)8;9qarrMfXIe%MVP!^7UMJ-AY;mM)
zz7<NQ#fv=Q(PSmC6%7Ap!ATo_i!brwN}o>hzdruz2+oSGQZLiKX5Y_k(6p*(V3arP
zR$0NxITY?};;z{fWyY%Va3?@zbo4f--Y3Bfg_1w37Us@CPzceau=O*=P}YdnU7o`Z
zM0{afog~DO979FuR#q+HpT~KV;8k06M}I{tySi9=?TlPOll(<nUpU*@dn#U)YK_jH
zHvIPqJ-&0Ww=`e1%b5*ylMT;Y=FB&`=kN_|*|IBtPBy;buWw!WJe7b+KEDWOO9Kn@
z{<ge|7k^{RahkZuMI!8^=0Vusz;U+RW1bp;_hqW|d3me$MXOm-(-Nih7l$$(p6EW;
zeZ+Q^ig8+29bHZYO<ccJ*FIcJ=f^hrwp;GaBMS2&CRDp)Wb}R7(fYGwu?PlnhSvf^
za^ByI1$`=w3|Vre<7RE$wf3o8J>S--;g-}x{Q95Y`9VzcHCMft(Zk+Tm*Hht4tn^i
z*w+5AcAINpHN1~?{)u~(IX6|+_R|?2)(iBw;d|K=&E=Z>4)mAkH1T+kCw=;xyj?FN
zT*TlJmDsBSWtJa`DXP{bc`aj%a@<RE3{qe<f(xH>291RqhpJvbtH7k3?-Hj3T@&*N
z)G;g@%~-!rW04W?y_drE#T<3a#qzt*oSB$0FG4@l*PkFVWk)`nOl>M(%}@avLk!t{
zeu9(^wd2L2I9^}=1f$K`^J@1GMuzVM^YBm}Ngj9;w*2}k)3KGI)HGfA_{CQoZ?+i+
zpI5ZbLkrD7*_*HrKW$WUqSH16NjYtHm=kLvS#h>V`B(KE=j<B4G;9l>h%KM@uuERW
zD($~nPVufVOlHX|n;za}CF!#Hg$W!JWLOxvSIqWeft2CPn<hc%s>Pt1%Mz_Z^z~@c
z6s<k}fI;a-j7K&0t~gA;cBb!9j|@Q=?W&gPZVk)l)SnUk14-pqNVhn-GD$RFH?F#A
zRdvb^>M7Ft8@<eITs3gqkgvds3Ar>-<w?@rei<>%^~43|NJ}>3wxra03$rFD=H+1{
z)#B6my>dL+l~qb$Lp!7O_&MyRw8qeF&BdN}lY#h+mCh9hj$?Pza0}#8I!S+XWd^yB
zcME-fUrA+uR<HC>he}s^OTwAnp|6_0cK+5)gd6j25YjB{Y1yc!2i5TH8n(hsrH&V@
z><q{bSJ}}}-sh8ej*TzFHXZJ^dqjHq_ww{}z1yZ_Qe$t!tK7cEZJY!$ZgY;(#~Nv^
znM!%Z%_1WoDY!_Tt3I>HB&^KiT`04=$-}|Ge+b|G%;;+z0ZeAnH^R$>9BpM;R3!z9
zIF`caa4oAMSw1Aj?D8MM4g=|a`J8n62Z-I&WI`%Fr_$M)y8@~ebyRu<X*o_(J5S9V
zeFZI)-9~e1bqLvS@#pw?(e_}^I}GDx+h(Vq6<fcIe!I*LwUNkqs18%<=XJLk)fyZg
zxFdP}xu|T-#z3xpdSw%%uHzG~M)A&?Tgpmb@?uPPPkf}BZ}Fe#aQ4+oPZo<QL}J!f
z#|je-YD&a-V@BvX)<0C>)!x~3Ttm!|YuqT6d$z^Ve3x*Hl}<dzmrcCw{<~jmAEi5H
zZ5tj)zl@P1{1l|ZWM&s(SD#UQV_0fr-)lkqxz(}r!YxM*ROY1Q>5@UXrN_<to*EJT
z`01s}?ls~OkH{s5@D+#B!WSGhLjN5xDeK<hZPXp#4v*+<UlJ|Xv9#aX^wVySur?FC
z@gm7%n?vTw=epXJII4^Vi9qeAQ;9r3>=fJ!Hh9x<lD^_aFN1a!N`<HcE)q(gsL_xt
zGH5?}B)L6uXUy<Xh}9EAaz*~kfdX&;YsCR3T@n{X^0|{UKTPT*E=qd(siw<3%HI(U
zHIt~RREo9E93&DpG1+V*FS&3}4;A6H&ExWSS1Fuxx@h>#XY|`CQ>%o8(?{0z+ZiVr
zW%W(6<z0Rfg;fcTS?!rUKe-h89HjOdx1p)HufIbzG)Jc>y{RSMKi_mwB%6Bwv{{h8
z+*EixZF|At9I`PS@;L2}CV6@T1))2PK~pREkX_Gje=ta}X#a&QT6k`C3Av;vooM<m
z5_0F;>B8~XcaGeZzqCDc`Klfkz+Lu732AB$>th=J%by~O>Rq0tWqECuseYL`2ftmu
z+>!FaFOO*;5GeTaK;)kdE(igziYgh}c)&xFkBg2_4Lwt<BItkbH^m$%(6!vp&<j4O
z@P$EM{6H~{>S;!Pr$PV;OZ_047NPk(PhOek;9~&@q=r@B9qkY33yQzcza1+w3#2s$
z=pC`WSn{>DAyT(~T*$jW^QQcn{_Q{F0bfpc|BoNZ8?%W#;y;|7kP^&8JHJz_3h2R7
ze?A@0=%||bPi>P}k#54LL3Z$$_BV1peo`cjf&Ac@56)Vxtfw6&!0V_jbKQ2twxwkz
za!yt2@-^$2e_Onz>_~%LTU76~iQf_p<qFZyGFYSO1<M;CFja>|dc~$10=Z+N7Fr1m
zfZmMbc+|jgxI*FlU~M&^r6OkoZAa)?)3L!E;DgMoQyjtSuQVOvq7Trc&a5po9Z#3~
zgmVO(loif(n1>aHEnkd2fTEbDDVp3tN-_EOI5YO6zJ#L4H7NNAX`ZUcKJJ4MO$6iV
zCMg#aA7Jpr$jOImgyFT<MwBPYw-f^-LKWe%*Xx`jF;WIzD!_Wy4>+hI+dv(H3R83b
z9Cdrr(BPA*v&Euu`qP)go<LtC5EsPCYsyu7L@{YNW01hRqAc)SfCtm#(|$)<U%u3`
z<^${oXB8=7@Olz(PM@S2Fl$!`eK;a0QyHRGa=U%FQn|nr7HhF}rC7PEA~ocxF^w3d
zQhH~;floK-&^<DedD3C#jKZ?q+_v($<7XLLsXOcS61;*+G&@mx#c%whz@#Cg;4zKw
zzX8He^yY@(lNaOsDF&kCatiAQ3UZLg8FaArvCIhpoxWMD<p|t2RUq*-p7pbZl8~wF
zWAUFZ<kK#b^d73KiaI;@d-QHvSH@k{P?%WXUeRZXd#M^?v*%k1t`U)OccDj9utv_H
zgmkDd5vO~0JgV&aySJh5>t7zN_UJ(OhMABW48c>cn6<Ev(%;3lT02SFq@1QpBo0yD
z+6IL<*~h1crQtj-=wT(w*xx`JGS>v#$XD6LFhrBwG=Nel@yus6pKbCY0f#sU6dE8k
z56MK=%&izLb_IUzb$)#1?8-=)><KHayUFdVg)B`Vr<h0sD6d{GV<9Fn=0q$ESCYN)
zN5ikBC<Swu%KJ#0Ht6EG#r6B&!h%EBh>K+zgCC(D<-L6MjpBIvK0y>(HJcB8?LN<|
z>d2_PdYb`CQX90KBCa5qFTiK<h|9-Uul{SWl>_w02nrdCwv=B~-@NX9Mo&z8Me|LQ
zu7#^@Csnxp3Z}^-W{HB0T9({nbTK=t4pr3p#_)v*KVaj^jM+2wWyetx4EI`q(Aosl
z76|J2s9p9VxWj-Sa9D#Zi~b>U4=Mwi+Y-GG!)#li3}tyn#Wi-wq<<D^np%)*#98EP
z;(ro~BnLYVKH5Z+nYLNpr@3N1MS7|>qx9g1IN!IfSibkx11BPxVR}<dRDH@zvyPL&
zn8aorp(}B>v*)tVi!2?`9$2h;@SgrRStjLR8zYXHSA1@iVu30S-qn-WVqf7$WqyFP
za&h)08s;=-qYwL-*qj|j%llfVtilL-x|tuP5nGRZW5gtr^K6T4Y;ys*k{Z78H|WV#
z_dLQeep5WnhdwqmhIl~=Y8J+B<u4<FU+3#F{g5Qt>>&OWo<T1%s5LNq1#H&HL|jQ2
z-XQwe8kgtvZnbu$+fyqLObS13o$KbJNstbEsNljfAX3y-|E0Qwu;PvXNjW*V=GXdb
zcm*d1qa!~8AKKUPy8Sj^jF+OOf65%sOhA#`z_D%QYK^y3ZI<`(v|%r^EQ^SUO%_T4
z0MC|I`?M)l@CK)bOJKBGXW^wNJ1sl+v3S%G*<jIr=D<Uqs3xJPCbr2+i!p@S?iET6
z+8(q_vseW+sAJc<T11~9HXd!^1$t-1xl|3axTE1l&BtP%Bh5C8*`n~;%aYyVl8X=H
z5BDfw`TpuR@QYexTKt)2QIpu=YG#d5LMd^m;}c5fM*~9B-B>UVK8x;&-TO2_bs*;E
zGhjm=Mh4NE`Z+Y%na$HR8w`G)B{D!mMr9ZP;z7HB=XjSLz#r+8_P`L+^uhaqtkjk%
zDKY4{0XxyGQAcrx|CSM1WPo)_7!qwN^}Z15;8X?^r;ITq-HlmdV4wPzPx|YW{+!_c
zbxQyCNj*oGUa1JxFtvL8UwjfPmkWIcOy0QZI`;kHn?@0cxgdg@{S$pQQ@@-(^(W#*
zKqM|j7epGZMz>M6CmudZRS4O799GfE$4viC%ibx*_X$|$N4A#ZqmhYO2ii7|DooH?
z-pyZX-8S$LLjQ7?wY>5e-+bQ1|3_?DQfieCm~m2<PzMdpSSJNHXuc=nvmV8auUzjx
z1rl4&X|JdLg??$%vEIyI7P+sbv;$p$vIe)zUjY)6!4d@4spq(QwflvgO)*G9WSr5@
z8Pqu~73j!IPV=KSu?O8GIgm!SVT>VuAx1q7UW}{P)A-Cq442ewQ@?XHcnmbY-WGYk
z_r5U`<BEoz8!OGe=)GIj1;u^$1C)1Fwa3V^UdCujTrJcDJ=vxrejRWl96ZW)U)LQ+
zy-tUY{@CUd2b!(SARr*&?HBV_Tfl-XT`UBnKw^AF0oEVq0V<^3d&aFGk}hh2z}~T`
zBpX|56un_>zu+XG%_RAt#DWFt|4!)Z#4MOTjXcFd@mnxT>cmZ9_>7L2OxL%Y+>a((
z+piGIG$1TCtqesFHw!0EDCp;-h>}0oz}0>OIK`(?VJ;Fx#FkN}udt+%D$68;RHf7G
zA(MK_GAwBOWaCQ3!4X?p|E)j>{l={^F+o`Vp=E{dy$#Up!|Y=D;YMnR@%=;tsFQY#
ziZz(lF}PEO{Y?@wlbwf_KR07~(2igLea%Eg_6q#zcwKLf5}+Az^EF7olcaU92KTgR
zQ}ekMVX7U)V-p<|4nYUz$?cUW!X~W^^wif=kc)H>PwM3Wp=HOgvpXGLI-E@I#7TpJ
z2VjdE-oaeAl8EpUzvczPdL^y|f}a^3L8@5c2pm!v>m+r%+txkFl3KYAhjjz;n^A69
zdjDD!0=n{sFd<FX%u+f!W)d+LjIzE+>?4lTK+$T-5%*Q~+#d7~{{nj5E{w)fSa6mW
zBqYH^{fxQS0Yx~|hGjl!>0XM70OAu1OE8q}O7x%yeEkmkWtM4C#nSP%%?=3x;X8q2
ze<nP+)nUUZM4;&o9#x{fIA~0+k`-}M_@D<`v=;_u6G>rP5m>^$C}ni)Zz<=ZA$Q60
zc-086jd8F)gLSXL--Zf+Ikn*Fz#Uc&K9g$|2TkHd&i+qggl?hshl{VAYklJ9x+)Q>
zQ~$(<z}f{$09R$MM^oz{0t&s)7qb|GCD5T!&UETf27w<Tq6kw-0)eq2P@WE(Fd8m!
zeFx~!Bm+kcV@^n-kS;Mw79rys#Ux+h0<1KSI~EkvJYv%xie5_rJQ64X2&DmlZWf%y
zHe>Z!qJg5_tSItZbOSiDk&`qdUssDG2`Gd%k~-)QDE(ylI1&7)lNh6LU_0_9Mw+XT
zD$)Cbm1+esDB*-s3vp=%C`8DwWd|ehgo|*4^K~brPyAlx{LyDer5<4lAiqaxB#NXk
zmcG@i4`bcuprVV$RCYUr6^bb6_V?-ptMREZR^RF-^TWQS{@{}Q@U&u*KAcca4Q<rg
z+Eb+?T1Yx3xJoOA)CGm2Z@@KYlh6%W=uZI360I~zOO1K#?`N;g__C0?p71lcKfP9k
zJ0X1DT9SVf`Y2kr9U!vfxhgi+P5zk`;%*)SO_C!+HxP8E;Bsiasg&fjh0J`=#7lN?
z6&$~c#`fl8-O(byuv!8igOF|}34Fvwg(BMeQx_EM!MKOsOx|&55wWSuRy4XELD>zE
zAqSQ<;F<(zkSUYo7SCtTVwL*4oUI>&Ip*H1T)ish)ZGaP0G%su?uh@OLMKq}xiTg0
z#_^t9v6Tr^H-$MZGW5_H#HO>r{R-~S>F&@+z8#0hS;*<P;tW7kQ!FKX5<i)G*X+5X
z%+IWIW0TIaXg7H_i^7QOUg-6A7cANn4CaMk=~Sv%u^N5a*-HXH&INArb@o&Ts*qg0
za?#I^16MNckl3C|{%J-RPc#+jktN>X+Vh7$FkTV~D?xTSTzKXXU(-J0a~7P1G9f*2
z8mV-G+5*yjWxR%Ifl4^#X1<|Ya3*#jsJe!M)g?saq@e}cEJ9*{B)3?l@C$~CcEhn^
zTCg=L<}?Yc5K7s#sog1qx(K8}9cLaKI}5=?j2G+$5|wbjngvAmBn@y6>VJ+o5@~D&
zI}S;#Ob;B9PLyyMZ;)wI2LrO9;(Jmi>}J+s!$hqak~myDN{-^hAeo&^5JAdpa1U`v
zEMo#<4wJ^Om+EzZ$<R+g*0V<pX;|8;Q6dn2XhMTgUxjrGuu-n0{I1e2t?8Lz!O;_a
zV_-9(o-sQ%{MK~AkM7HeA~clrJ7<dDDSTF!(uQT@y8=3t9s{kqXQEEX`T!h)4yL{g
zLV|XfNNZ3HgEF#-B_gmTx_f5|WM_KL@_y7TV?7teY{eE*it&m#D(0~s7ksR;&S90f
z6r4gZtme*{@~BHS4EylwQKQY8EPa%Rn|0Ew@3uQAZ<DPjGdW&*E@Lv~69047s?S(W
z`6~hB1{39ogWTDU;cEOS{8wmrgO@`{L)HpD3$I;p`6qw}ei<6QOcwYrfqD=Eei<aS
zK`D8NgcKe1OraZAlmERhg@=H~M^g$;R!(%gqbxW)cAhddBRR6l6;bFq-}!0{lh;Si
zPK-BoVw#dc{u5aD#aNH`S$UVyn%5_*Kr)+3G?GK(zquU+^rh_PZ$CAc77Bl(hYTUb
z$^Rt$+p|pGg}|I49EAw@vX13pT@dsMV^q?3wZeIF3I$Ch#}ik~1;0ZkQ^G)y5PXE9
zb7^7l%QTX19#=`UN0%G&Q|nS}3PDLb2UL}#tZp!y$(2!xdN_7I5>*x26;FZX>61kV
zTLkH;g5r{_khzD_11gO1A(cJE`Z)T>fgmD|m6PtbP$tF6Z-m@Z8g>Kqg~o$2B8^n{
zq}KnV{)GDmv-XWv5jON6U9%|!Nqu&t_@xLe#kXG8{XJ_|Ylc>WC;rP_#0L4lc*_s5
zPoUY2(@c*LXHNd|lTL|VoC1xpCZaY39F5kZ*CV+f-Lu=M7QFf!@K*1~&i4myfkt$c
zF)ExHg|9j~cKBD>gg+6T$jtE0F#WPWiAklR+K65#%ucQbkHpf+5_8;eoV#9ujBhKG
z(Hd;Ap*apMS4(A6{giD*p9ORMSiy3Ls0w+GBUlKsSFrEf`oQxN!e4EG@IG?E;hG#~
zsTzn2l0y!h+VZyo^Mer^lOTeH-u07_1J>evfseJ;v{o9=mM6RvM!$;A)v0k$i=$96
zep7Z5AW+D+xSb%J>Ng^Po)2F6BqV6rgOjA&*Z0fjb-hE17dNkc%rl-JT|KxvSfh*f
z9tc4Z#vOyhZZ2NUHl(oG2Q+C*oWqnTEZ(t!n;^~uo(g2u-O4`m+r&H0*w6R?o;?te
z{b(>lhHO@4>p<d^clx@e@GF=}_AThQmr`vU>|0I<icC5xN)U_BKLuwsO{hop4ZSQV
z{|O4`P1XlN+7NPu$w!p!iGNBhA3a<Virl|LWJ61n1Gm*(@)ysPEmjv|C0*Uu36|=^
zcbgNFuGHDiZ*g1|q!b}~r~b~Gt@zl=%613eD)y)-3E`X5^U7M87YzYE9f#wTfJ|Jy
z5<SHr1dFvff@7==H3&o1+cuH_>YvV32b~Bk<kTSYwyh8?WU)vC^&9Aefwld1LPi~t
z)YZsI0<dlgE2Q)_iq?v;$djtmNWZ;LK<*@_6P}9;i-WU8=qDjJlF*P9UKmh#QSqmI
z4+;+-b8eNljf+J@r9mn=y@Tib4OZyST*3kq(WreOvs2jt1z90jAL$wC1E7pGE0oJ&
zaANQm+oLU5v(Omu`51w1NSd~l31P!?gyOvC=&EG^YL_82DqltIbX9{b<Y@^0V65n&
zL<VTsjw_4JO95)Lcyht|o>^YYKMZ^Op)I2!)$4E-3L)nTgAECSLJnd7;LUXvyiCbq
zh^Gqerb^_dZIi_WC~A=Gv=PHfK+G7_{lH(wAEAnU4|b$e;kTew=-|?;U8S0hI!%$M
zh$LJQ#K4^&<C_IS9D@&?LHhN?_=qh>HAg5JZDPf03Pent{eMx#K@L6v+Tw*GnQz-*
zWn-Jz<PQRvZXjq4OfbtEK~3@?vR~%DqZ&<6{lus8n=)d#13YG8Ez^4kZf(U9-mX{F
zc_!5@XddA!EQ?d9si*tZw|BWSzp!!_Y1=ID7M}*txz;OW+S!q8KHfz~aQF+}Fu)k<
zQk_UGxwrgNhfQMywU;AQ@GQ418ARZQ8j;JVyDVt$4J~2Wk<f=LYq#zd$0S}Zy#fdT
z1OY?-BSYm+lFDWF)MfSzQj`kCidM2AgtM_Hiy3-^g#KNAFEhLp0p0Q}*OpsTr7JBS
z?`V-N4z%hb@2=(TQVp2|X5m*j5@HFv`s)tsSUi`TNWht&6+8nbz>0QVJ7V&6KjZ=v
zZ?w(7Ab(M*Md3#u*C)}J#X*A2MlOVjJXDCfY_HZZ^)Ygl&Qz4h1I}A_i1gF5$L1vE
zG&c@h8#kMJvlJS7PrfQbd~-`eUDQei%k8%{)A>qDJ+1Lv4}SxfCUGJD9CLyR!H`R9
z{t^g`03b-HD8XNo2o2f9Fn^7?+;b`dPhUpkiu{@Ty)q*3esvyKtMe6Lbe3@jV)DLX
z?=;G<zpnt~nZ|eB8iiB>N~ag*j!fouvv1An&XEhGJVxT>D7Sp`*2@{ecVjxMZ+v3j
zZh50+HA3KM6|Q77(lq#?VWFEdYC>>n=2-hmno5&9J7397H_sH4=0;PT3j@WdT=#-4
zJ(wrEOgii0=nIiyZ^UT>HsaL<r~z!vQcuENR@?KwzJ{EdD-@xX<QUO<d}-s`{{b0K
Btxx~}

literal 0
HcmV?d00001

diff --git a/core/images/banners/white.png b/core/images/banners/white.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa8d9aae7fae28cba5431059c2d716e363f51544
GIT binary patch
literal 3558
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

literal 0
HcmV?d00001

diff --git a/core/images/headers/blue-flower.jpg b/core/images/headers/blue-flower.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f8340a48707d54ff2518a1f53d86834e06daa9a6
GIT binary patch
literal 37020
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
A_5c6?

literal 0
HcmV?d00001

diff --git a/core/images/headers/maple.jpg b/core/images/headers/maple.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c22b520cf8aa5681a8118985c8e0b53019f9e993
GIT binary patch
literal 33870
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

literal 0
HcmV?d00001

diff --git a/core/images/headers/raindrops.jpg b/core/images/headers/raindrops.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f220b8dc27d20b8216a45885a3f59f8912b97c9c
GIT binary patch
literal 23682
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
E+07KArT_o{

literal 0
HcmV?d00001

diff --git a/core/images/headers/walden-pond.jpg b/core/images/headers/walden-pond.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4ceecd7cbb216412992fd9937852bce620dee933
GIT binary patch
literal 22716
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
Dmh0w@

literal 0
HcmV?d00001

diff --git a/core/images/headers/windows.jpg b/core/images/headers/windows.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c5113b138aeae5aabb2cad247a999d585bd4ac9b
GIT binary patch
literal 34690
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
KF$?`RME}{_L^M?Z

literal 0
HcmV?d00001

diff --git a/core/images/index.html b/core/images/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/images/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/images/joomla_black.png b/core/images/joomla_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..785fd2a2dc81dfd345621f1a923f2d3b31ada774
GIT binary patch
literal 4979
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

literal 0
HcmV?d00001

diff --git a/core/images/powered_by.png b/core/images/powered_by.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd6456929b9045a3e4498bf02ee83634ba772abc
GIT binary patch
literal 3197
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/fruitshop/apple.jpg b/core/images/sampledata/fruitshop/apple.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9b05376b5b9aded2fedfb234350d8f3b61e688b0
GIT binary patch
literal 15637
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
Ov4fQNoc!lLR{jsalf-@i

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/fruitshop/bananas_2.jpg b/core/images/sampledata/fruitshop/bananas_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a3960a017ee5de40f1df16384226779ca17f8db9
GIT binary patch
literal 17127
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
E*_~tQTmS$7

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/fruitshop/fruits.gif b/core/images/sampledata/fruitshop/fruits.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e5b3e485164616251148f408ba6d3ca4f671b1fe
GIT binary patch
literal 2057
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/fruitshop/tamarind.jpg b/core/images/sampledata/fruitshop/tamarind.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..34898750e2ad179eb7062fb8875994c5f0bfb134
GIT binary patch
literal 31463
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
AaR2}S

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/180px_koala_ag1.jpg b/core/images/sampledata/parks/animals/180px_koala_ag1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e86a370feb309ba035b360612f3eb5f37ced2b78
GIT binary patch
literal 4047
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
POa`FcAx$JGUrqlXuK<Fa

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/180px_wobbegong.jpg b/core/images/sampledata/parks/animals/180px_wobbegong.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f96f5960711e2778d16224a3fe29287a468dff31
GIT binary patch
literal 4576
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
Hu{Zi3*E;bh

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg b/core/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4a534dd9b7653e9d2c1aeaf8c98eab2e10450e4f
GIT binary patch
literal 5067
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg b/core/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0d1c13855a249fb12268e95c203cc490161e65e3
GIT binary patch
literal 4380
zcmb7`X*kpk_s4%@7!fieno)zXbIUemD}ykWER%gHSu<H;YDANrn=!-8NNP}GFk|1B
zw2&n#)L3pJJP3&-d&1Lw{a-w<|DSVR=f(M+>zwm_cMeAnrvYJ0GYc~S1Ofq=KLH$$
z1BrmRFjN#OBrYl<3X>3r%jn9<AP_QUnkXe*EXLW<9%E<Y?w=6qevRmDV;7!-C;pvA
zzfX4w&M$wGUYd|Wr+_42FqzXbCUSBnlq+^uDF1H`+W_bhAQh+wgP;Hx6a<EX4m*K3
z0N?`uIrM*kxj|e!07Mwz0)hX)1wO*X1^y$0{$y^bh_nWek^OO*YnoxAT5(8Y+S8i$
zk3Y1-QU8I+uKjWRuj&5*`ZJsx`fu&ej(_<-2?XVm)(|ne2DT47`~(Pq|Fl8DP{0r<
zRZBC+AIwvhRfM+s4+K$abQRCa$I~B-o6U~bET2>8vKQYR78*0G5KnyBr0W9r2#{i}
z+jd@cxa;2hAKeXP=BeC(s9K{&Mo500fQ5kM%AQ68%s2M=iR_Ruit`r&Dnyl&x#6Gj
zmndT>dKFStaaF1DYpOQv1AW%tR`g!XU<!$IKIqh)<r^;jDP^$ZMWVuyU9J$$xpaYD
z&&CQP^l&zKo&j6@<%7U2c#8PzMF)~v*SM9wUs9#OaTx;V<|~Zb8w=NrjROOCN%X>_
z<q>^KP?q9_vuvbPp_$FNBe})4BvdB-2%E=Gl0E^k!<<%Dxgz(L?u!-veF!M0zs9@2
z6TS8sE!bYx>1;nR5WHjp4;&F$fpf1mSUIGdDFn1DNYR{-PCvgB`X6INUHq<h5QSqC
zq1_rZQa7s9Qr!N|J~^^|KEsl<w3-%ca#QxrW=V4&<75)YTD`{r+FtRld{%h@ks3rm
zv3kQhF~>-3y=<OjEs{pXDVzE>{SS$bu&~L(`0g(jf|s>jJYx;DOB5AN2z_W>ze8X-
zuMu@IrT+x;?~_?$HbZe}`LXnI27S%*s3^ChLiKL>yK&c#`jsVrbqIO^$3z!9JvI?n
zpokK(KoG9UNyL~tmX_6zDV6^`g^hJhneBbMvgTHgY1>~W!L)+qC6c+*cM4d6A<_yz
zH)!qPlL!>KBIxvumP&iB*M)GLXWe#L)$k#ZR;u4r?4y8;*I=AG5OXl#Ufe!&D<m-C
zWRp|>Pwi@o3H?P^h*MBN-c*$FZ?&NWCu<{A9`3X)KGev=hgVzq%TR5+j&=gwd{5YB
zjD5TXCWlpudpr5D!Qy=)(wnMr>1_UVo;erk+R+EdPXykC`S|lCR^q}@$<}v1H6*xl
zI=yMM6gfgqc@~kAoi5Knr%{&D+N*-Po)n`3oV8ONBm)o?+}pNvY57OO$M;I~!Rw}G
zN4b5N)G1!v!nbHOk9a<{3;4-$6>T;%u=o5XOhejDejCD1WY0XpHM^}BKYDfJbY8Ss
z`^(K1mzsx*_Vt?6>87_vZo1@PMni6B=QYVnD=_+SXOudxqKq6Nm(U9hftjJ<t0HR3
zrg9OR4%O3~zc=6J3M<>({{oMmTHRzRur8z&B%ZntcGSpLp@$P!jr4gPHQaxh>dZz(
zJWaG=pUmZoSTnNAjc$<b(CU!7Gtgoay(ul<a)Uk8f3sz3hWe;5<-LdiZ9cJ<n$Ln$
zQbn=n8|s@RKJZ;I*T#Ohl3QfXR`U4HOB^AfVqfIi(~8FGT9Bld4`dV{sOAZn-E|CM
ze@tpNRtJs#jLiT0e7&=|&_kWExZ>~=TCc!z&qp(FcXu~Ed!G<17ExaR=p+o%HsMr=
z`Y8FDZ_P@64lp^cxN83wp}7SRnDftv3!3W<1~=jCGAnZ&kxM>U{>=tWdPG~FBQ(Tf
zzScp?zhG<;2UC)mCQp-w*3!NyuU(9wv*3{OdLi|5Y}t@ENTg`d7)<1xE>enw{_#xx
zh`Wu=+)jSO#op_2-fyV0Pf-0^|0GRrnGspM!QFd~X{K1epcaq3jev~xL!i{)`t^<J
zZ`K3}opH$#wF9wE#RcyOT^+GtnKUKz=mOFS{{n&5mAT1~Gbz#E6>I5rdA9_$5Y@Xc
z@~AssC5)71W@U#N9T{~*Nz`C<k{H9Hly<gCm?-`2OGYM*iD1yUYaV!6+qK4GWQ8^g
z>&}#tnA1sYsBB*9Q^}CW8QyYOlQ>3c7JVX1N`UC(c7n6J{6(#mJxX4|ykOLRyf@@J
zDxm)Pk~((Zc<RTtO`)HD++#(VF<04<pBQ(eD@r_54&}E)aEg?Ab%k&oJF>`UWA2QX
zt*G}<`-;FqSjMcW`g?Js5~CGm8vvYs2+Y*@qm;5c>R1=PwD0|cn4GMv?n>&=iW2Cu
z_!WJiLeLp`NL~~<AxkJbIi%#OnR2U9Q|l#Ba;KoHEDBoVg&BF54ETmxH(*yek4@Wd
z@r~oY>4sJkz~{*XrjJvS$MbSCz8}20#Xo5lII4%A%|jUtN_q|J$=WYx_(7v{<bg*J
z*Vc`T|J+oQ`|XjyClZ&^9p<_7nX&$Jc0DXN&vI8-dE#y9SwL6?J>CkXZK}m2@rwin
zQ(CbZ4IOTueyM4?1e+F{S>?T%B9CB%v|ehY<IMCN4w9BKH}YN%wVN-|Z#*~bK*<%h
zx-7r9yw^AW0_EkjE^8qlU8_%e0FZwAeGn0y8%n&MVj3P@*ku%I|3C!7*RQkU`m+9<
zMMEI-0YO*zDZVNEZ28Y0Yg_XFd22%^Yf%(<X)d#<sl2vNktVo{dU0Sw)ZmwnuXVwZ
z5eBA3M1i>^#3ypsGn_6*$Lj3Pc+C1#rb~6&w^XYmHW6*zzgU?^w5BYAIM=L}jWcKW
z53<<Wnjujcvz|sU;poNL^L>W$;U4wmw@9pveP)Is>h0X-Vvcw1#_s$x*Q2H)Suode
z35fv&yUJXs`T47_5m~Zzrou{^+T>$HOb}@t;?h(e*3Ja$1?oz|-kD5b>c(C>e9815
zkRd(A`{<igAjf+q$t9Nc#ANu+Q_x0rH!-xQNY(w!_ticn<U-@7?A-pE-SuXQo_DoG
zz?^@BYvNoGB|+FAcXrpwO?Pm`k=iSzf9g5R#9#VU75bq<!xIHqDldFLdH7v+@Y>Sz
zm6vR}kv6K<uaUW)mheIA>D=XLjo;s_Rh#5|+Ps;FRj0pPm~<7dxrKzDsox_odw~bb
zT)9~n@Qizo{;h!^)o|hh<K}gU@HiR5>Nv6f<%K}**>^vpZ)9IEto*I(t1wh@x9klp
zjTzl}8u-*|F*p$N86-fXNMA;%Fm56QzYma%m%=U8R~fzd?wX1FUfPx|9)$eHa{h*D
z_^GCfXh^7Y%@J!h8QLt?|GwBsb}d%3b(>YpnV7I*N`m{8%NyVSBPila#ckdx@A-&v
z*u%_IWw#-IrfvL%qzJo{{o(rIiY7*QS>?-4Vl9v&%8izZjc+_x{p-CPb=DXIU!~Mb
zxt4kN_RE4;>%VZQ_)pCfj&dxQB0x1Cf@o#kG`-q+o*9aadP=H{*)M1SH=CvI+X?Za
zOpQmL-fqk~)ytHVbM|tWgF&0`>C8N99Uo2wkqJXKTKkI~FEodetnXBkOZ|gZ$d2qn
z8IW}M=OzAX&KM-|kvvvRBCNf<o>P-OXs1<E;OL!a94P4}DX`jvs|tJ+CREgOdg_a-
zdPq7~eM<P<HMhq{zoutPL_bv_^p>O)J=+MYcwPI`Owdg0@*ww;@vcNW(QB8juS6N{
zHjq37a3lvVG*1Tg5?|TU(G;&#q{?El=T@5m{-Q$-CE3JBYSvpYnEumjE}0zLChXWc
zsHSp);#te5`rh0i(^<JNMDY+f7IaOgUyG`X8t{~rj)Y5$`r_#=#r($DHZ@@#@Yie9
zm~HpjFvdf%4WNw;sdJFbMZfErj<XlI*ly(OfYpRus@wV=V`-99?Z+)kK6VQpW7&YJ
zs<5<d?%~C`$`#c-%Y~)bXky-oF|K_xzNL1TJiT3>sa9axE_)0G&>Vcl<ZOA;@wWLn
z$6gOqL}!{)q9T~JziKlZZHy|y))-cm7};jWQQBl7zc#M1bgV;Th8fjSB>RC+l1y8`
znZ@A)c3j&WGkD|2N8A#+^PA7eEWCcoMRBQbJfP1K_sh^_g8lfGH4KU)!1d#i4TOGN
z-><P?=UQ)QIkm^rFRS<UFQVeXhK=55PK3DAI`u<2$&OO=ra5BfNiKp@r<|HXp1T8g
zfWjmf5IB)RwODbT-hQR{2lwl02;Q~?pUmGk&@z{&e={;a+&<09w&7CC;?-R@hN$$=
zZkokd-uA*yy1(K}*ebMO*%{gj<vu-d%$W&qzO!hdAjL({-!HvbX`vbWxutk3KUnJ%
z<`kTJeVSB)$sI&>7WH=*<m)1X*Ym#Gnhwe%5&^31lsuys-jdiP;aPpx2_BzP-2y=N
zyc3`M*7D4y&yB?5U)#LJKQ>NRI+Cp9Bb|M6!gp(2Oy*sMFuUhXs91>JTFwco0WGlm
zlKaatO{9^4Hkj0qpl1Y|qmuEZwJ8H<SntsQ;Z4+6Bv8F|r$}W5?qx?dhg(S5Pt4T1
zr+q|T7ne=epU;JPzS{YnE|jW~A(JLV;mVOayDbYi`^;CpFZ<<$+{3oWf*X8`z0ulj
z$M43<m)?JMiQpF7>vkD+Az`^^{e`I#T<?TEwH{j0S%U4f3U1TqZ}6hAH`RChiD9lB
zP8uw%WK*}42gAQ3HN8^-a`5qaLxN^pvLwb>jud1X_cam_Vjeh;D~dY9=|u1Jtd-+t
zHG<}V(4?~8BYe1DkmBn@z-=f#3we(sO}rcSI}qJ86v;+KUFT(8JkrCfu;U~cwWXBA
z+jU(^6BIYeyv!a;D<j6DikHGnlbv(Sd=*s4rw%p~oM;VZw;$^df~>}1I{CLkx?Eyx
zzqlQ358GkERQJ|s3}|IusAy@g=H7GS<ur7bQ~!($`mN@CEoc9NL%i<MW!+s=wDd~;
zro@1}aVAwTK(LrU;n~Ve{(MR`;=7Vn%0opKQzU`tUB{~5_SV`+zF>+AbK_eQ5aNn+
z+l5_;e2l#<Ig`tSnQCDoi3_C55BDs@q+V+YREf$DSdm{W?ueRPc}SMTTPZ47%rKk7
z$Gw^D-_*6mxlBD&TM;jOGQ+ZNexeHY{7_6`?$U>ic<p4GPO83kx7h9Q(Pf{j@JpXZ
z(Gb?9=i6XaYane^PTd8I*{Fqz0u?-x3YlSkh_e7hqKB_*iXS!NtF(t(R-%hkP>ZQT
zZKsEAI`rJLbH7gu9Rgy{LABGlmI%s_u;IfBbY*UpfkSTi9Wglx-#ct>t21E33X34Z
z=sY#Q+raKhLSeV*$36anDzx+YQlX9NKTkoMqdq@1g20Xhn@WxTAfE0{J1eo4ttpEU
zSG{_ArA%TZbMr^XIQ!W5$K6eUIEb9HG#l)ZLCUhXQs7|r9N_2G7T@!~{K;CKa0*iI
z4DxOsBJ^=jc;S3%bXQzetUJ+d_%3zqnMC7v4-BRwOZ(p|+_HF-uz=!N`?C>4;@HZ&
z4C>$GHOfS2m$dSE$`)H9q2%+#I3MSDJl|YED9PT;bDJ9hNj&L>eabf)u)&rh!!kLy
zs&=my@xK7(W9N%>@L0F_wa?}U9#3M{9ppk{v=4z{WuwVxuYH_HYEw)D`i<ow(39~C
z#=dc>ZO`e*+C511<#S(9IDVd{`I5<;ufOGnU(G$KuBc5j?6a+5|ApWEds#U}V}o<L
pj2Sa~`Cw`$aou@pef|(=IjApqv&2R{Go0%+Rm%CcuXyHg?7xzf1Xch5

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg b/core/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..83842ce275edbc8f0eec77ab863388cec243ed23
GIT binary patch
literal 10301
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
MyzS9`509t+7xG{%>i_@%

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/800px_koala_ag1.jpg b/core/images/sampledata/parks/animals/800px_koala_ag1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2bb1c4113d7b85bfb798e7f74db5562749bde9db
GIT binary patch
literal 11163
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
DOp@Jd

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg b/core/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..201800d91c7413008c1b1ba5a639ee8164b0a1a5
GIT binary patch
literal 12388
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
JzExa~|1bNOtbqUk

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/animals/800px_wobbegong.jpg b/core/images/sampledata/parks/animals/800px_wobbegong.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eff08080a04ce972cc666a455dd2ae0d8787e902
GIT binary patch
literal 17040
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
Sg3sOzT?l8+Y324IWB=J8V>d(q

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/banner_cradle.jpg b/core/images/sampledata/parks/banner_cradle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6fada18903891fc157ad1f2e66432f50ab0b9d5b
GIT binary patch
literal 28065
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg b/core/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..90a7d36ef8c40d04668789015ba36d9303a5bdcc
GIT binary patch
literal 1315
zcmV+;1>E}o*#F=F5K2Z#MgRc;0RTt<NB{u;+W<oV5)2Ix4GR(w4iFR*5)~UP9UB-J
z8#X5?AS^&RL_<G0K0QZJW>-f`VNE?gS$SGvX>D?Iaz#~rhJ0^@W^i(D|G)qX2mo3D
zcmV+s0RO}QPXGV{0|5a600000000000003300RXC1_uxT0RsXB0s{pH1Oos700001
z00IL95fT$2F+l}!QDK21GD32p6jFkbvBA*>6(ciq;qd?300;pA002J#@qvkhQ-&rC
zOc<CkHUw}ZfgA{6Qv#R}z=j1#VsOO4iNh0!(+JZD(+JVaQ!PxjGSJIIEeyR?0g1$F
z!5VPH!ZhME!ZgA(L}=xymZn+;KP09!GSvb!;y)$WC>++zABDL@dqnS`Kgywv4#l>H
z+AE`h(mM+pTzmk!A~fP9bQF?K{4uuY@<v)y3(H9ajzTd}$u;uWNF1x@>5r$SY_9}3
zy2Ne=s^rQ*#FWH_QsxX-K?Y>4XNg_CRNJOX;4TA*xIB$NORP?jB(lBYZ5ZK*IPbUp
zEqEs}iQLwJ$b+!D+PcE#{;8>;bc_M5xeWw?!e+1%K()sHOSX{YvBV8rY^>@`U@dX?
z@ZHCNJpPH;MLj4Y+BXpgvUj|@r@7dLuxrRGG)Hg>hBT%$xobWeaLZm<AEzZV1n|t+
zBX%aV-wpR#5}fKN7|;dDacMWUhxuM|nUY6SEi|_dk7kbxY4lXm)j73QhDVeBCxNb)
zIxkWEJy#rE4S<ISJY2l{#NUOJ(`#D~S*wCsFvRP;W8i^%fA0n8=^QG>Bbw3}_G35j
zT=jLCwNHd<*~4OQk;QBMZ|J%zi4=2THZFD%*<K>ING&H3%eB^JA5)-_q)RAihyf+d
ztaj0LkkhLOb9f_^a@t~XIyfKAQ-ob*T|*!nlvyYw7M*-T?23t#2_GwiT;>}*_P6E2
z#i6|N7)x44BHMwc`>pBarHWQWBxo%dL~XV0ZS1`N09)x(#P?Ug*1i(kJez23ZI%5V
zyQx7lq@9vvz97Ifvp^bHU37G+=$~H{c%7Y@cQx&@+pHk9tpdO}AEN3Ym_s9PvRQXK
z_Fq5y3u=0WV=h~P#=v)8kEBgCFHdxGxvwp4p>P+t*MFkYiTRX;*7mUe%aPSB02}VJ
zT1V`;x|1B}1d$R9XAuLChfSQ+yfwN!9YNDY(bRg2sj2X`<dKAq`>ei~1#I<2)Q${e
z4zF<2x0=_FrZy_aRXyfO$tL!&*U4%cmdiygG{B5;mV>yu;-H5jiIL4Al1<4b{)*Pb
z86c7)h2vtc6Fv6Ld$-+cQp(4hFtmUG^IkfR2Y+<0E^C8c<AnYt-_xn`87rOdO7iP?
z4i>dGAG5q3O^uc%6fTAg4{>o0BU64=LEaqbKa@f6+SWmlwT};LKp<(R%1cQNLz-n}
z@SU%s>xJ1dhC~BeH~~Imj^#{5@St*F;F}VG);9*n#3cc(adSWp*IRg~T&!hTggLeZ
zJC#GF1;pEOO3n`UONYwUWx#P9HK~EqUgym?+~0$$akY;DHS|5dRNoQrWWgIK1^a|_
z+hsc-l%*gQoCpIA^akLk9?-WhH$Fi)b-{OwfF6m#_qnsL-8glx<Oxm)7aR}JroHq#
zk*{!wH}weL&vb64B{3n10#cW1vmLkNR*&{SvUdB!<V@d(<te@s{{R|)i2RAZ@5~YV
Z-!M!)@5G4Xxd?DO6+93?@931T|JhgfO(_5X

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg b/core/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6393613b154dec114557891ba403f897308ed73b
GIT binary patch
literal 4506
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
EA5ACAGXMYp

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/180px_ormiston_pound.jpg b/core/images/sampledata/parks/landscape/180px_ormiston_pound.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6a9ff33a7dfb77ac4925a62eb1943cef3d44fefc
GIT binary patch
literal 988
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZp@l(+hgX1?TS$OUKtxzbR9Z(?T0%nFOkGn!
z$HCIY+1}F5);%CC+}%6T*VZnwGAc1Mx2U+tHMF*^CcibUpeT<~SVTlxT-rod)+Eo<
z&NGi>@c#gVAO}MfLj^OV5(ASUBeNjm|04_~3=GUbhcYrC03$OK3oDxd0}~SiD>D--
z3o}%Tkx7tQNYT)dg*7m-P}!();zD6jr6i}IjUfF%fG~l9k%^gwRS+VKBreD(#KbK8
z{}uxeGb7Lm%z_N|47)l$&0ethrA<$&sK~;AkQX6gtqy*zt{NJg0fAnkj8+g)KUIwo
zM{@yl2li5f#U&z=NkA1LTFadlO%c(U%heUIg7ZS4moQjkh{jybMN_mC<}z+;2)sMR
zXwJuXe`U5GSzocy?&C%EC7-L+ie9dZwRCma@O!>z*DH$+{=YN-GkCj;^9%VI9BG+#
z*L7LkB;zSYQx*nRDV69f%?Mpv{2)ku%IVINcXrRQ@;-Dp^5dRD`Qn4qW3T!PTOU8-
ze<>ur_SoiQuU|=t%G>_#4>sAH?78%@_ixby?<#J1Zu`9c&B<R$AJ-QyG$~9hpEs-U
zM^{8qOz50i|C%FbKPXBZ&YraG^gVT{ZyNlwkG+faGxDm~RT0HF_m}B>ldn&5GZ*_T
zst*WRH|cuue7}hn$9&Dx7S9vaxD$1A?O9c+@}+IAW%KquUfSip^XrD}$B*LIEiK%A
zKH7A;Rnv1FzuaWm)cmu;Er!Nv4@!!z{F=8ovTmPR`tmd1)QieBPwuqM-85-Ra^$o-
zGq<X)`_C{bNM-KXy)VLUuRoaHHfhT&gAaE?H-)x5pBlQ*Epm&x+MTU3ajUv!t?rrD
zG3~9&7U`okLPh0OH`#9gtGd^aWVAhp;obiD6S=42-kjaNitAI-wo8-t9=3kSX&N%i
zu`qhKi2SLT3o4g>PO#M7=5$_UXHu_eZq8vXzxVNK#ml#3WR+}l>b+ZZ=8>;P*!zPv
z-;T|SR#14T7q;g5i+xernJ*pvtaG9!nl|idYU*0EYiiNQxMz8B`7bmDDnh=lUm%)m
zC)==+-}oW#_4PL{d23zJ)a|*pSaIs?2WPdC*64;e{OawpW@4{@>n8m$_17!&PyPG}
zZppJR-1R>GByB#^M3Y&c+NSR?G1GF&)K^;apW#U0-C6w#THdYS7(MsvFvkDC2>`{t
Bj|cz&

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg b/core/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2a3f050be5099230a0d0b0da276a2adec45d820d
GIT binary patch
literal 4826
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
QlJ6u%BhDLm{4VGI10~|RLjV8(

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg b/core/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3aa43e94991c2ccdae51c37451f68f7de6cabba1
GIT binary patch
literal 10813
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg b/core/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..721167516257b35c1f6bbbde08ca2eb289f7a710
GIT binary patch
literal 10654
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
PN-11mi}oLGA58uaJk1L}

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/800px_ormiston_pound.jpg b/core/images/sampledata/parks/landscape/800px_ormiston_pound.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a7ebb0edbf3b0813d2dd4ee8da397b8f78d8dea9
GIT binary patch
literal 9029
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg b/core/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e13fec777edec634ed70d914ec9c35d7ee89485f
GIT binary patch
literal 15411
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

literal 0
HcmV?d00001

diff --git a/core/images/sampledata/parks/parks.gif b/core/images/sampledata/parks/parks.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0feb445d3e0c97db4f7c444078d4d5d63c6a68a3
GIT binary patch
literal 2069
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

literal 0
HcmV?d00001

diff --git a/core/includes/defines.php b/core/includes/defines.php
new file mode 100644
index 00000000..98348005
--- /dev/null
+++ b/core/includes/defines.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package    Joomla.Site
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Global definitions
+$parts = explode(DIRECTORY_SEPARATOR, JPATH_BASE);
+
+// Defines.
+define('JPATH_ROOT',          implode(DIRECTORY_SEPARATOR, $parts));
+define('JPATH_SITE',          JPATH_ROOT);
+define('JPATH_CONFIGURATION', JPATH_ROOT);
+define('JPATH_ADMINISTRATOR', JPATH_ROOT . DIRECTORY_SEPARATOR . 'administrator');
+define('JPATH_LIBRARIES',     JPATH_ROOT . DIRECTORY_SEPARATOR . 'libraries');
+define('JPATH_PLUGINS',       JPATH_ROOT . DIRECTORY_SEPARATOR . 'plugins');
+define('JPATH_INSTALLATION',  JPATH_ROOT . DIRECTORY_SEPARATOR . 'installation');
+define('JPATH_THEMES',        JPATH_BASE . DIRECTORY_SEPARATOR . 'templates');
+define('JPATH_CACHE',         JPATH_BASE . DIRECTORY_SEPARATOR . 'cache');
+define('JPATH_MANIFESTS',     JPATH_ADMINISTRATOR . DIRECTORY_SEPARATOR . 'manifests');
diff --git a/core/includes/framework.php b/core/includes/framework.php
new file mode 100644
index 00000000..2d594d58
--- /dev/null
+++ b/core/includes/framework.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    Joomla.Site
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Joomla system checks.
+@ini_set('magic_quotes_runtime', 0);
+
+// System includes
+require_once JPATH_LIBRARIES . '/import.legacy.php';
+
+// Bootstrap the CMS libraries.
+require_once JPATH_LIBRARIES . '/cms.php';
+
+// Set system error handling
+JError::setErrorHandling(E_NOTICE, 'message');
+JError::setErrorHandling(E_WARNING, 'message');
+JError::setErrorHandling(E_ERROR, 'callback', array('JError', 'customErrorPage'));
+
+$version = new JVersion;
+
+// Installation check, and check on removal of the install directory.
+if (!file_exists(JPATH_CONFIGURATION . '/configuration.php')
+	|| (filesize(JPATH_CONFIGURATION . '/configuration.php') < 10)
+	|| (file_exists(JPATH_INSTALLATION . '/index.php') && (false === $version->isInDevelopmentState())))
+{
+	if (file_exists(JPATH_INSTALLATION . '/index.php'))
+	{
+		header('Location: ' . substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php')) . 'installation/index.php');
+
+		exit;
+	}
+	else
+	{
+		echo 'No configuration file found and no installation code available. Exiting...';
+
+		exit;
+	}
+}
+
+// Pre-Load configuration. Don't remove the Output Buffering due to BOM issues, see JCode 26026
+ob_start();
+require_once JPATH_CONFIGURATION . '/configuration.php';
+ob_end_clean();
+
+// System configuration.
+$config = new JConfig;
+
+// Set the error_reporting
+switch ($config->error_reporting)
+{
+	case 'default':
+	case '-1':
+		break;
+
+	case 'none':
+	case '0':
+		error_reporting(0);
+
+		break;
+
+	case 'simple':
+		error_reporting(E_ERROR | E_WARNING | E_PARSE);
+		ini_set('display_errors', 1);
+
+		break;
+
+	case 'maximum':
+		error_reporting(E_ALL);
+		ini_set('display_errors', 1);
+
+		break;
+
+	case 'development':
+		error_reporting(-1);
+		ini_set('display_errors', 1);
+
+		break;
+
+	default:
+		error_reporting($config->error_reporting);
+		ini_set('display_errors', 1);
+
+		break;
+}
+
+define('JDEBUG', $config->debug);
+
+unset($config);
+
+// System profiler
+if (JDEBUG)
+{
+	// @deprecated 4.0 - The $_PROFILER global will be removed
+	$_PROFILER = JProfiler::getInstance('Application');
+}
diff --git a/core/includes/index.html b/core/includes/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/includes/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/index.php b/core/index.php
new file mode 100644
index 00000000..89839322
--- /dev/null
+++ b/core/index.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package    Joomla.Site
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
+ */
+define('JOOMLA_MINIMUM_PHP', '5.3.10');
+
+if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<'))
+{
+	die('Your host needs to use PHP ' . JOOMLA_MINIMUM_PHP . ' or higher to run this version of Joomla!');
+}
+
+// Saves the start time and memory usage.
+$startTime = microtime(1);
+$startMem  = memory_get_usage();
+
+/**
+ * Constant that is checked in included files to prevent direct access.
+ * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower
+ */
+define('_JEXEC', 1);
+
+if (file_exists(__DIR__ . '/defines.php'))
+{
+	include_once __DIR__ . '/defines.php';
+}
+
+if (!defined('_JDEFINES'))
+{
+	define('JPATH_BASE', __DIR__);
+	require_once JPATH_BASE . '/includes/defines.php';
+}
+
+require_once JPATH_BASE . '/includes/framework.php';
+
+// Set profiler start time and memory usage and mark afterLoad in the profiler.
+JDEBUG ? JProfiler::getInstance('Application')->setStart($startTime, $startMem)->mark('afterLoad') : null;
+
+// Instantiate the application.
+$app = JFactory::getApplication('site');
+
+// Execute the application.
+$app->execute();
diff --git a/core/language/en-GB/en-GB.com_ajax.ini b/core/language/en-GB/en-GB.com_ajax.ini
new file mode 100644
index 00000000..cef5ced3
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_ajax.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+
+COM_AJAX="Ajax Interface"
+COM_AJAX_XML_DESCRIPTION="An extendable Ajax interface for Joomla."
+COM_AJAX_SPECIFY_FORMAT="Please specify a valid response format, other than that of HTML, such as json, raw, debug, etc."
+COM_AJAX_METHOD_NOT_EXISTS="Method %s does not exist."
+COM_AJAX_FILE_NOT_EXISTS="The file at %s does not exist."
+COM_AJAX_MODULE_NOT_ACCESSIBLE="Module %s is not published, you do not have access to it, or it's not assigned to the current menu item."
+COM_AJAX_TEMPLATE_NOT_ACCESSIBLE="Template %s is not assigned to the current menu item."
diff --git a/core/language/en-GB/en-GB.com_config.ini b/core/language/en-GB/en-GB.com_config.ini
new file mode 100644
index 00000000..ba1e1323
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_config.ini
@@ -0,0 +1,36 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONFIG="Administrator Services"
+COM_CONFIG_CONFIGURATION="Administrator Services Configuration"
+COM_CONFIG_ERROR_CONTROLLER_NOT_FOUND="Controller Not found!"
+COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Select the default access level for new content, menu items and other items created on your site."
+COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
+COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_DESC="Sets the default length of lists in the Control Panel for all users."
+COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
+COM_CONFIG_FIELD_METADESC_DESC="Enter a description of the overall website that is to be used by search engines. Generally, a maximum of 20 words is best."
+COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description"
+COM_CONFIG_FIELD_METAKEYS_DESC="Enter the keywords and phrases that best describe your website. Separate keywords and phrases with a comma."
+COM_CONFIG_FIELD_METAKEYS_LABEL="Site Meta Keywords"
+COM_CONFIG_FIELD_SEF_URL_DESC="Select if the URLs are optimised for Search Engines."
+COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
+COM_CONFIG_FIELD_SITE_NAME_DESC="Enter the name of your website. This will be used in various locations (eg the Backend browser title bar and <em>Site Offline</em> pages)."
+COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
+COM_CONFIG_FIELD_VALUE_AFTER="After"
+COM_CONFIG_FIELD_VALUE_BEFORE="Before"
+COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select if access to the Site Frontend is available. If Yes, the Frontend will display a message if set such in Backend."
+COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
+COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC="Begin or end all Page Titles with the site name (for example, My Site Name - My Article Name)."
+COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Site Name in Page Titles"
+COM_CONFIG_METADATA_SETTINGS="Metadata Settings"
+COM_CONFIG_MODULES_MODULE_NAME="Module Name"
+COM_CONFIG_MODULES_MODULE_TYPE="Module Type"
+COM_CONFIG_MODULES_SETTINGS_TITLE="Module Settings"
+COM_CONFIG_MODULES_SAVE_SUCCESS="Module saved."
+COM_CONFIG_SAVE_SUCCESS="Configuration saved."
+COM_CONFIG_SEO_SETTINGS="SEO Settings"
+COM_CONFIG_SITE_SETTINGS="Site Settings"
+COM_CONFIG_TEMPLATE_SETTINGS="Template Settings"
+COM_CONFIG_XML_DESCRIPTION="Frontend Administrator Services Configuration Manager."
diff --git a/core/language/en-GB/en-GB.com_contact.ini b/core/language/en-GB/en-GB.com_contact.ini
new file mode 100644
index 00000000..955ffce6
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_contact.ini
@@ -0,0 +1,65 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTACT_ADDRESS="Address"
+COM_CONTACT_ARTICLES_HEADING="Contact's articles"
+COM_CONTACT_CAPTCHA_LABEL="Captcha"
+COM_CONTACT_CAPTCHA_DESC="Please complete the security check."
+COM_CONTACT_CAT_NUM="# of Contacts :"
+COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email"
+COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC="Sends a copy of the message to the address you have supplied."
+COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send a copy to yourself"
+COM_CONTACT_CONTACT_EMAIL_NAME_DESC="Your name."
+COM_CONTACT_CONTACT_EMAIL_NAME_LABEL="Name"
+COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC="Enter your message here."
+COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL="Message"
+COM_CONTACT_CONTACT_ENTER_VALID_EMAIL="Please enter a valid email address."
+COM_CONTACT_CONTACT_REQUIRED="<strong class="_QQ_"red"_QQ_">*</strong> Required field"
+COM_CONTACT_CONTENT_TYPE_CONTACT="Contact"
+COM_CONTACT_CONTENT_TYPE_CATEGORY="Contact Category"
+COM_CONTACT_FILTER_LABEL="Filter Field"
+COM_CONTACT_FILTER_SEARCH_DESC="Contact Filter Search"
+COM_CONTACT_CONTACT_MESSAGE_SUBJECT_DESC="Enter the subject of your message here."
+COM_CONTACT_CONTACT_MESSAGE_SUBJECT_LABEL="Subject"
+COM_CONTACT_CONTACT_SEND="Send Email"
+COM_CONTACT_COPYSUBJECT_OF="Copy of: %s"
+COM_CONTACT_COPYTEXT_OF="This is a copy of the following message you sent to %s via %s"
+COM_CONTACT_COUNT="Contact count:"
+COM_CONTACT_COUNTRY="Country"
+COM_CONTACT_DEFAULT_PAGE_TITLE="Contacts"
+COM_CONTACT_DETAILS="Contact"
+COM_CONTACT_DOWNLOAD_INFORMATION_AS="Download information as:"
+COM_CONTACT_EMAIL_BANNEDTEXT="The %s of your email has banned text."
+COM_CONTACT_EMAIL_DESC="Email Address for contact."
+COM_CONTACT_EMAIL_FORM="Contact Form"
+COM_CONTACT_EMAIL_LABEL="Email"
+COM_CONTACT_EMAIL_THANKS="Thank you for your email."
+COM_CONTACT_ENQUIRY_TEXT="This is an enquiry email via %s from:"
+COM_CONTACT_ERROR_CONTACT_NOT_FOUND="Contact not found"
+COM_CONTACT_FAX="Fax"
+COM_CONTACT_FAX_NUMBER="Fax: %s"
+COM_CONTACT_FORM_LABEL="Send an Email. All fields with an asterisk (*) are required."
+COM_CONTACT_FORM_NC="Please make sure the form is complete and valid."
+COM_CONTACT_IMAGE_DETAILS="Contact image"
+COM_CONTACT_LINKS="Links"
+COM_CONTACT_MAILENQUIRY="%s Enquiry"
+COM_CONTACT_MOBILE="Mobile"
+COM_CONTACT_MOBILE_NUMBER="Mobile: %s"
+COM_CONTACT_NO_CONTACTS="There are no Contacts to display"
+COM_CONTACT_NOT_MORE_THAN_ONE_EMAIL_ADDRESS="You can't enter more than one email address."
+COM_CONTACT_NUM_ITEMS="Contact Count:"
+COM_CONTACT_OPTIONAL="(optional)"
+COM_CONTACT_OTHER_INFORMATION="Miscellaneous Information"
+COM_CONTACT_POSITION="Position"
+COM_CONTACT_PROFILE="Profile"
+COM_CONTACT_PROFILE_HEADING="Contact profile"
+COM_CONTACT_SELECT_CONTACT="Select a contact:"
+COM_CONTACT_SESSION_INVALID="Invalid session cookie. Please check that you have cookies enabled in your web browser."
+COM_CONTACT_STATE="State"
+COM_CONTACT_SUBURB="Suburb"
+COM_CONTACT_TELEPHONE="Phone"
+COM_CONTACT_TELEPHONE_NUMBER="Phone: %s"
+COM_CONTACT_USER_FIELDS="Fields"
+COM_CONTACT_VCARD="vCard"
diff --git a/core/language/en-GB/en-GB.com_content.ini b/core/language/en-GB/en-GB.com_content.ini
new file mode 100644
index 00000000..81be2483
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_content.ini
@@ -0,0 +1,97 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_CONTENT_ACCESS_DELETE_DESC="Inherited state for <strong>delete actions</strong> on this article and the calculated state based on the menu selection."
+COM_CONTENT_ACCESS_EDIT_DESC="Inherited state for <strong>edit actions</strong> on this article and the calculated state based on the menu selection."
+COM_CONTENT_ACCESS_EDITSTATE_DESC="Inherited state for <strong>edit state actions</strong> on this article and the calculated state based on the menu selection."
+COM_CONTENT_ARTICLE_CONTENT="Content"
+COM_CONTENT_ARTICLE_HITS="Hits: %s"
+COM_CONTENT_ARTICLE_INFO="Details"
+COM_CONTENT_ARTICLE_VOTE_FAILURE="You already rated this Article today!"
+COM_CONTENT_ARTICLE_VOTE_SUCCESS="Thank You for rating this Article."
+COM_CONTENT_AUTHOR_FILTER_LABEL="Author Filter"
+COM_CONTENT_CAPTCHA_DESC="Please complete the security check."
+COM_CONTENT_CAPTCHA_LABEL="Captcha"
+COM_CONTENT_CATEGORY="Category: %s"
+COM_CONTENT_CATEGORY_LIST_TABLE_CAPTION="List of articles in category %s"
+COM_CONTENT_CHECKED_OUT_BY="Checked out by %s"
+COM_CONTENT_CONTENT_TYPE_ARTICLE="Article"
+COM_CONTENT_CONTENT_TYPE_CATEGORY="Article Category"
+COM_CONTENT_CREATE_ARTICLE="Submit new article"
+COM_CONTENT_CREATED_DATE="Created Date"
+COM_CONTENT_CREATED_DATE_ON="Created: %s"
+COM_CONTENT_EDIT_ITEM="Edit Article"
+COM_CONTENT_ERROR_ARTICLE_NOT_FOUND="Article not found"
+COM_CONTENT_ERROR_LOGIN_TO_VIEW_ARTICLE="Please login to view the article"
+COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND="Parent category not found"
+COM_CONTENT_FEED_READMORE="Read More ..."
+COM_CONTENT_FIELD_FULL_DESC="Select or upload an image for the single article display."
+COM_CONTENT_FIELD_FULL_LABEL="Full Article Image"
+COM_CONTENT_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images."
+COM_CONTENT_FIELD_IMAGE_ALT_LABEL="Alt Text"
+COM_CONTENT_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image."
+COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL="Caption"
+COM_CONTENT_FIELD_IMAGE_DESC="The image to be displayed."
+COM_CONTENT_FIELD_INTRO_DESC="Select or upload an image for the intro text layouts such as blogs and featured."
+COM_CONTENT_FIELD_INTRO_LABEL="Intro Image"
+COM_CONTENT_FIELD_URL_DESC="Link for display."
+COM_CONTENT_FIELD_URL_LINK_TEXT_DESC="Text to display for the link."
+COM_CONTENT_FIELD_URL_LINK_TEXT_LABEL="Link Text"
+COM_CONTENT_FIELD_URLA_LABEL="Link A"
+COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL="Link A Text"
+COM_CONTENT_FIELD_URLB_LABEL="Link B"
+COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL="Link B Text"
+COM_CONTENT_FIELD_URLC_LABEL="Link C"
+COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL="Link C Text"
+COM_CONTENT_FILTER_SEARCH_DESC="Content Filter Search"
+COM_CONTENT_FLOAT_DESC="Controls placement of the image."
+COM_CONTENT_FLOAT_FULLTEXT_LABEL="Full text image float."
+COM_CONTENT_FLOAT_INTRO_LABEL="Intro Image float"
+COM_CONTENT_FLOAT_LABEL="Image Float"
+COM_CONTENT_FORM_EDIT_ARTICLE="Edit an article"
+COM_CONTENT_FORM_FILTER_LEGEND="Filters"
+COM_CONTENT_FORM_FILTER_SUBMIT="Filter"
+COM_CONTENT_HEADING_TITLE="Title"
+COM_CONTENT_HITS_FILTER_LABEL="Hits Filter"
+COM_CONTENT_IMAGES_AND_URLS="Images and Links"
+COM_CONTENT_INTROTEXT="Article must have some content."
+COM_CONTENT_INVALID_RATING="Article Rating: Invalid Rating: %s"
+COM_CONTENT_LAST_UPDATED="Last Updated: %s"
+COM_CONTENT_LEFT="Left"
+COM_CONTENT_METADATA="Metadata"
+COM_CONTENT_MODAL_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author."
+COM_CONTENT_MODAL_FILTER_SEARCH_LABEL="Search Articles"
+COM_CONTENT_MODIFIED_DATE="Modified Date"
+COM_CONTENT_MONTH="Month"
+COM_CONTENT_MORE_ARTICLES="More Articles ..."
+COM_CONTENT_NEW_ARTICLE="New Article"
+COM_CONTENT_NO_ARTICLES="There are no articles in this category. If subcategories display on this page, they may have articles."
+COM_CONTENT_NONE="None"
+COM_CONTENT_NUM_ITEMS="Article Count:"
+COM_CONTENT_NUM_ITEMS_TIP="Article Count"
+COM_CONTENT_ON_NEW_CONTENT="A new Article has been submitted by '%1$s' entitled '%2$s'."
+COM_CONTENT_ORDERING="Ordering:<br />New articles default to the first position in the Category. The ordering can be changed in Backend."
+COM_CONTENT_PAGEBREAK_DOC_TITLE="Page Break"
+COM_CONTENT_PAGEBREAK_INSERT_BUTTON="Insert Page Break"
+COM_CONTENT_PAGEBREAK_TITLE="Page Title:"
+COM_CONTENT_PAGEBREAK_TOC="Table of Contents Alias:"
+COM_CONTENT_PARENT="Parent Category: %s"
+COM_CONTENT_PUBLISHED_DATE="Published Date"
+COM_CONTENT_PUBLISHED_DATE_ON="Published: %s"
+COM_CONTENT_PUBLISHING="Publishing"
+COM_CONTENT_RATINGS="Rating"
+COM_CONTENT_RATINGS_COUNT="Rating: %s"
+COM_CONTENT_READ_MORE="Read more: "
+COM_CONTENT_READ_MORE_TITLE="Read more ..."
+COM_CONTENT_REGISTER_TO_READ_MORE="Register to read more ..."
+COM_CONTENT_RIGHT="Right"
+COM_CONTENT_SAVE_SUCCESS="Article saved."
+COM_CONTENT_SAVE_WARNING="Alias already existed so a number was added at the end. If you want to change the alias, please contact a site administrator"
+COM_CONTENT_SELECT_AN_ARTICLE="Select an Article"
+COM_CONTENT_SUBMIT_SAVE_SUCCESS="Article submitted."
+COM_CONTENT_TITLE_FILTER_LABEL="Title Filter"
+COM_CONTENT_VOTES="Vote"
+COM_CONTENT_VOTES_COUNT="Vote: %s"
+COM_CONTENT_WRITTEN_BY="Written by %s"
diff --git a/core/language/en-GB/en-GB.com_finder.ini b/core/language/en-GB/en-GB.com_finder.ini
new file mode 100644
index 00000000..aece658c
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_finder.ini
@@ -0,0 +1,41 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_FINDER="Smart Search"
+COM_FINDER_ADVANCED_SEARCH_TOGGLE="Advanced Search"
+COM_FINDER_ADVANCED_TIPS="<p>Here are a few examples of how you can use the search feature:</p><p>Entering <span class="_QQ_"term"_QQ_">this and that</span> into the search form will return results with both &quot;this&quot; and &quot;that&quot;.</p><p>Entering <span class="_QQ_"term"_QQ_">this not that</span> into the search form will return results with &quot;this&quot; and not &quot;that&quot;.</p><p>Entering <span class="_QQ_"term"_QQ_">this or that</span> into the search form will return results with either &quot;this&quot; or &quot;that&quot;.</p><p>Entering <span class="_QQ_"term"_QQ_">&quot;this and that&quot;</span> (with quotes) into the search form will return results with the exact phrase &quot;this and that&quot;.</p><p>Search results can also be filtered using a variety of criteria. Select one or more filters below to get started.</p>"
+COM_FINDER_DEFAULT_PAGE_TITLE="Search Results"
+COM_FINDER_FILTER_BRANCH_LABEL="Search by %s"
+COM_FINDER_FILTER_DATE_BEFORE="Before"
+COM_FINDER_FILTER_DATE_EXACTLY="Exactly"
+COM_FINDER_FILTER_DATE_AFTER="After"
+COM_FINDER_FILTER_DATE1="Start Date"
+COM_FINDER_FILTER_DATE1_DESC="Enter a date in YYYY-MM-DD format."
+COM_FINDER_FILTER_DATE2="End Date"
+COM_FINDER_FILTER_DATE2_DESC="Enter a date in YYYY-MM-DD format."
+COM_FINDER_FILTER_SELECT_ALL_LABEL="Search All"
+COM_FINDER_FILTER_WHEN_AFTER="After"
+COM_FINDER_FILTER_WHEN_BEFORE="Before"
+COM_FINDER_QUERY_DATE_CONDITION_AFTER="after"
+COM_FINDER_QUERY_DATE_CONDITION_BEFORE="before"
+COM_FINDER_QUERY_DATE_CONDITION_EXACT="exactly on"
+COM_FINDER_QUERY_END_DATE="ending date <span class="_QQ_"when"_QQ_">%s</span> <span class="_QQ_"date"_QQ_">%s</span>"
+COM_FINDER_QUERY_OPERATOR_AND="and"
+COM_FINDER_QUERY_OPERATOR_OR="or"
+COM_FINDER_QUERY_OPERATOR_NOT="not"
+COM_FINDER_QUERY_FILTER_BRANCH_VENUE="venue"
+COM_FINDER_QUERY_START_DATE="beginning date <span class="_QQ_"when"_QQ_">%s</span> <span class="_QQ_"date"_QQ_">%s</span>"
+COM_FINDER_QUERY_TAXONOMY_NODE="with <span class="_QQ_"node"_QQ_">%s</span> as <span class="_QQ_"branch"_QQ_">%s</span> "
+COM_FINDER_QUERY_TOKEN_EXCLUDED="<span class="_QQ_"term"_QQ_">%s</span> should be excluded"
+COM_FINDER_QUERY_TOKEN_GLUE=", and "
+COM_FINDER_QUERY_TOKEN_INTERPRETED="Assuming %s, the following results were found."
+COM_FINDER_QUERY_TOKEN_OPTIONAL="<span class="_QQ_"term"_QQ_">%s</span> is optional"
+COM_FINDER_QUERY_TOKEN_REQUIRED="<span class="_QQ_"term"_QQ_">%s</span> is required"
+COM_FINDER_SEARCH_NO_RESULTS_BODY="No search results could be found for query: %s."
+COM_FINDER_SEARCH_NO_RESULTS_BODY_MULTILANG="No search results in English (en-GB) could be found for query: %s."
+COM_FINDER_SEARCH_NO_RESULTS_HEADING="No Results Found"
+COM_FINDER_SEARCH_RESULTS_OF="Results <strong>%s</strong> - <strong>%s</strong> of <strong>%s</strong>"
+COM_FINDER_SEARCH_SIMILAR="Did you mean: %s?"
+COM_FINDER_SEARCH_TERMS="Search Terms:"
diff --git a/core/language/en-GB/en-GB.com_mailto.ini b/core/language/en-GB/en-GB.com_mailto.ini
new file mode 100644
index 00000000..16c6fd1f
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_mailto.ini
@@ -0,0 +1,22 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MAILTO="Mailto"
+COM_MAILTO_CANCEL="Cancel"
+COM_MAILTO_CAPTCHA="Captcha"
+COM_MAILTO_CLOSE_WINDOW="Close Window"
+COM_MAILTO_EMAIL_ERR_NOINFO="Please provide a valid email address."
+COM_MAILTO_EMAIL_INVALID="The address '%s' does not appear to be a valid email address."
+COM_MAILTO_EMAIL_MSG="This is an email from (%s) sent by %s (%s). You may also find the following link interesting: %s"
+COM_MAILTO_EMAIL_NOT_SENT="Email could not be sent."
+COM_MAILTO_EMAIL_SENT="Email was sent."
+COM_MAILTO_EMAIL_TO="Email to"
+COM_MAILTO_EMAIL_TO_A_FRIEND="Email this link to a friend."
+COM_MAILTO_LINK_IS_MISSING="Link is missing"
+COM_MAILTO_SEND="Send"
+COM_MAILTO_SENDER="Sender"
+COM_MAILTO_SENT_BY="Item sent by %s"
+COM_MAILTO_SUBJECT="Subject"
+COM_MAILTO_YOUR_EMAIL="Your Email"
diff --git a/core/language/en-GB/en-GB.com_media.ini b/core/language/en-GB/en-GB.com_media.ini
new file mode 100644
index 00000000..ed4ca690
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_media.ini
@@ -0,0 +1,77 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MEDIA_ALIGN="Image Float"
+COM_MEDIA_ALIGN_DESC="This will apply the classes 'pull-left', 'pull-center' or 'pull-right' to the '<figure>' or '<img>' element."
+COM_MEDIA_BROWSE_FILES="Browse Files"
+COM_MEDIA_CAPTION="Caption"
+COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
+COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'."
+COM_MEDIA_CLEAR_LIST="Clear List"
+COM_MEDIA_CONFIGURATION="Media: Options"
+COM_MEDIA_CREATE_FOLDER="Create Folder"
+COM_MEDIA_CURRENT_PROGRESS="Current progress"
+COM_MEDIA_DESCFTP="To upload, change and delete media files, Joomla! will most likely need your FTP account details. Please enter them in the form fields below."
+COM_MEDIA_DESCFTPTITLE="FTP Login Details"
+COM_MEDIA_DETAIL_VIEW="Detail View"
+COM_MEDIA_DIRECTORY="Folder"
+COM_MEDIA_DIRECTORY_UP="Folder Up"
+COM_MEDIA_ERROR_BAD_REQUEST="Bad Request"
+COM_MEDIA_ERROR_FILE_EXISTS="File already exists."
+COM_MEDIA_ERROR_UNABLE_TO_CREATE_FOLDER_WARNDIRNAME="Unable to create folder. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_BROWSE_FOLDER_WARNDIRNAME="Unable to browse:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE="Unable to delete:&#160;"
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FILE_WARNFILENAME="Unable to delete:&#160;%s. File name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_NOT_EMPTY="Unable to delete:&#160;%s. Folder is not empty!"
+COM_MEDIA_ERROR_UNABLE_TO_DELETE_FOLDER_WARNDIRNAME="Unable to delete:&#160;%s. Folder name must only have alphanumeric characters and no spaces."
+COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE="Unable to upload file."
+COM_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
+COM_MEDIA_ERROR_WARNUPLOADTOOLARGE="Total size of upload exceeds the limit."
+COM_MEDIA_FIELD_CHECK_MIME_DESC="Use MIME Magic or Fileinfo to try to verify files. Try disabling this if you get invalid mime type errors."
+COM_MEDIA_FIELD_CHECK_MIME_LABEL="Check MIME Types"
+COM_MEDIA_FIELD_IGNORED_EXTENSIONS_DESC="Ignored file extensions for MIME type checking and restricted uploads."
+COM_MEDIA_FIELD_IGNORED_EXTENSIONS_LABEL="Ignored Extensions"
+COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_DESC="A comma separated list of illegal MIME types to upload (blacklist)."
+COM_MEDIA_FIELD_ILLEGAL_MIME_TYPES_LABEL="Illegal MIME Types"
+COM_MEDIA_FIELD_LEGAL_EXTENSIONS_DESC="Extensions (file types) you are allowed to upload (comma separated)."
+COM_MEDIA_FIELD_LEGAL_EXTENSIONS_LABEL="Legal Extensions (File Types)"
+COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_DESC="Image extensions (file types) you are allowed to upload (comma separated). These are used to check for valid image headers."
+COM_MEDIA_FIELD_LEGAL_IMAGE_EXTENSIONS_LABEL="Legal Image Extensions (File Types)"
+COM_MEDIA_FIELD_LEGAL_MIME_TYPES_DESC="A comma separated list of legal MIME types to upload."
+COM_MEDIA_FIELD_LEGAL_MIME_TYPES_LABEL="Legal MIME Types"
+COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC="The maximum size for an upload (in megabytes). Use zero for no limit. Note: your server has a maximum limit."
+COM_MEDIA_FIELD_MAXIMUM_SIZE_LABEL="Maximum Size (in MB)"
+COM_MEDIA_FIELD_PATH_FILE_FOLDER_DESC="Enter the path to the file folder relative to root."
+COM_MEDIA_FIELD_PATH_FILE_FOLDER_LABEL="Path to File Folder"
+COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_DESC="Enter the path to the image folder relative to root."
+COM_MEDIA_FIELD_PATH_IMAGE_FOLDER_LABEL="Path to Image Folder"
+COM_MEDIA_FIELD_RESTRICT_UPLOADS_DESC="Restrict uploads for lower than manager users to images if Fileinfo or MIME Magic isn't installed."
+COM_MEDIA_FIELD_RESTRICT_UPLOADS_LABEL="Restrict Uploads"
+COM_MEDIA_FILES="Files"
+COM_MEDIA_FILESIZE="File size"
+COM_MEDIA_FOLDER="Folder"
+COM_MEDIA_FOLDERS="Folders"
+COM_MEDIA_IMAGE_DESCRIPTION="Image Description"
+COM_MEDIA_IMAGE_URL="Image URL"
+COM_MEDIA_INSERT="Insert"
+COM_MEDIA_INSERT_IMAGE="Insert Image"
+COM_MEDIA_MAXIMUM_SIZE="Maximum Size"
+COM_MEDIA_MEDIA="Media"
+COM_MEDIA_NAME="Image Name"
+COM_MEDIA_NO_IMAGES_FOUND="No Images Found"
+COM_MEDIA_NOT_SET="Not Set"
+COM_MEDIA_OVERALL_PROGRESS="Overall Progress"
+COM_MEDIA_PIXEL_DIMENSIONS="Pixel Dimensions (w x h)"
+COM_MEDIA_START_UPLOAD="Start Upload"
+COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
+COM_MEDIA_TITLE="Image Title"
+COM_MEDIA_UP="Up"
+COM_MEDIA_UPLOAD="Upload"
+; The following two strings are deprecated with 3.7.0 and will be removed in 4.0
+COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)"
+COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)"
+COM_MEDIA_UPLOAD_COMPLETE="Upload Complete"
+COM_MEDIA_UPLOAD_FILE="Upload file"
+COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
diff --git a/core/language/en-GB/en-GB.com_messages.ini b/core/language/en-GB/en-GB.com_messages.ini
new file mode 100644
index 00000000..f59d5fea
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_messages.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_MESSAGES_ERR_SEND_FAILED="The user has locked their mailbox. Message failed."
+COM_MESSAGES_NEW_MESSAGE="New Message from %1$s at %2$s"
+; The following string is deprecated and will be removed in Joomla 4.0
+COM_MESSAGES_NEW_MESSAGE_ARRIVED="A new private message has arrived from %s"
+COM_MESSAGES_PLEASE_LOGIN="Please log in to %s to read your message."
diff --git a/core/language/en-GB/en-GB.com_newsfeeds.ini b/core/language/en-GB/en-GB.com_newsfeeds.ini
new file mode 100644
index 00000000..b9c5648f
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_newsfeeds.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_NEWSFEEDS_CACHE_DIRECTORY_UNWRITABLE="The cache folder is unwritable. The news feed can't be displayed. Please contact a site administrator."
+COM_NEWSFEEDS_CAT_NUM="# of News feeds :"
+COM_NEWSFEEDS_CONTENT_TYPE_NEWSFEED="News Feed"
+COM_NEWSFEEDS_CONTENT_TYPE_CATEGORY="News Feed Category"
+COM_NEWSFEEDS_DEFAULT_PAGE_TITLE="News Feeds"
+COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND="Error. Feed not found."
+COM_NEWSFEEDS_ERRORS_FEED_NOT_RETRIEVED="Error. Feed could not be retrieved."
+COM_NEWSFEEDS_FEED_LINK="Feed Link"
+COM_NEWSFEEDS_FEED_NAME="Feed Name"
+COM_NEWSFEEDS_FILTER_LABEL="Filter Field"
+COM_NEWSFEEDS_FILTER_SEARCH_DESC="News Feed Filter Search"
+COM_NEWSFEEDS_NO_ARTICLES="No Articles for this News Feed."
+COM_NEWSFEEDS_NUM_ARTICLES="# Articles"
+COM_NEWSFEEDS_NUM_ARTICLES_COUNT="# Articles: %s"
+COM_NEWSFEEDS_NUM_ITEMS="# News feeds"
diff --git a/core/language/en-GB/en-GB.com_search.ini b/core/language/en-GB/en-GB.com_search.ini
new file mode 100644
index 00000000..19e0f6a4
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_search.ini
@@ -0,0 +1,28 @@
+; author Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; license GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_SEARCH_ALL_WORDS="All words"
+COM_SEARCH_ALPHABETICAL="Alphabetical"
+COM_SEARCH_ANY_WORDS="Any words"
+COM_SEARCH_ERROR_ENTERKEYWORD="Enter a search keyword"
+COM_SEARCH_ERROR_IGNOREKEYWORD="One or more common words were ignored in the search."
+COM_SEARCH_ERROR_SEARCH_MESSAGE="Search term must be a minimum of %1$s characters and a maximum of %2$s characters."
+COM_SEARCH_EXACT_PHRASE="Exact Phrase"
+COM_SEARCH_FIELD_SEARCH_PHRASES_DESC="Show the search options."
+COM_SEARCH_FIELD_SEARCH_PHRASES_LABEL="Use Search Options"
+COM_SEARCH_FIELD_SEARCH_AREAS_DESC="Show the search areas checkboxes."
+COM_SEARCH_FIELD_SEARCH_AREAS_LABEL="Use Search Areas"
+COM_SEARCH_FOR="Search for:"
+COM_SEARCH_MOST_POPULAR="Most Popular"
+COM_SEARCH_NEWEST_FIRST="Newest First"
+COM_SEARCH_OLDEST_FIRST="Oldest First"
+COM_SEARCH_ORDERING="Ordering:"
+COM_SEARCH_SEARCH="Search"
+COM_SEARCH_SEARCH_AGAIN="Search Again"
+COM_SEARCH_SEARCH_KEYWORD="Search Keyword:"
+COM_SEARCH_SEARCH_KEYWORD_N_RESULTS_1="<strong>Total: One result found.</strong>"
+COM_SEARCH_SEARCH_KEYWORD_N_RESULTS="<strong>Total: %s results found.</strong>"
+COM_SEARCH_SEARCH_ONLY="Search Only:"
+COM_SEARCH_SEARCH_RESULT="Search Result"
diff --git a/core/language/en-GB/en-GB.com_tags.ini b/core/language/en-GB/en-GB.com_tags.ini
new file mode 100644
index 00000000..991ec971
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_tags.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_TAGS_CREATED_DATE="Created Date"
+COM_TAGS_DEFAULT_PAGE_TITLE="Tags"
+COM_TAGS_FILTER_SEARCH_DESC="Enter all or part of the title to search for."
+COM_TAGS_MODIFIED_DATE="Modified Date"
+COM_TAGS_NO_ITEMS="No matching items were found."
+COM_TAGS_NO_TAGS="There are no tags."
+COM_TAGS_PUBLISHED_DATE="Published Date"
+COM_TAGS_TAG_NOT_FOUND="Tag not found."
+COM_TAGS_TITLE_FILTER_LABEL="Enter Part of Title"
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.com_users.ini b/core/language/en-GB/en-GB.com_users.ini
new file mode 100644
index 00000000..0fed2660
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_users.ini
@@ -0,0 +1,165 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_USERS_ACTIVATION_TOKEN_NOT_FOUND="Verification code not found."
+COM_USERS_CAPTCHA_LABEL="Captcha"
+COM_USERS_CAPTCHA_DESC="Please complete the security check."
+COM_USERS_DATABASE_ERROR="Error getting the user from the database: %s"
+COM_USERS_DESIRED_PASSWORD="Enter your desired password."
+COM_USERS_DESIRED_USERNAME="Enter your desired username."
+COM_USERS_EDIT_PROFILE="Edit Profile"
+COM_USERS_EMAIL_ACCOUNT_DETAILS="Account Details for %s at %s"
+COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY="Hello administrator,\n\nA new user has registered at %s.\nThe user has verified their email address and requests that you approve their account.\nThis email has their details:\n\n  Name :  %s \n  email:  %s \n Username:  %s \n\nYou can activate the user by selecting on the link below:\n %s \n"
+COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT="Registration approval required for account of %s at %s"
+COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY="Hello %s,\n\nYour account has been activated by an administrator. You can now login at %s using the username %s and the password you chose while registering."
+COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT="Account activated for %s at %s"
+COM_USERS_EMAIL_PASSWORD_RESET_BODY="Hello,\n\nA request has been made to reset your %s account password. To reset your password, you will need to submit this verification code to verify that the request was legitimate.\n\nThe verification code is %s\n\nSelect the URL below and proceed with resetting your password.\n\n %s \n\nThank you."
+COM_USERS_EMAIL_PASSWORD_RESET_SUBJECT="Your %s password reset request"
+COM_USERS_EMAIL_REGISTERED_BODY="Hello %s,\n\nThank you for registering at %s.\n\nYou may now log in to %s using the following username and password:\n\nUsername: %s\nPassword: %s"
+COM_USERS_EMAIL_REGISTERED_BODY_NOPW="Hello %s,\n\nThank you for registering at %s.\n\nYou may now log in to %s using the username and password you registered with."
+COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY="Hello administrator, \n\nA new user '%s', username '%s', has registered at %s."
+COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY="Hello %s,\n\nThank you for registering at %s. Your account is created and must be activated before you can use it.\nTo activate the account select the following link or copy-paste it in your browser:\n%s \n\nAfter activation you may login to %s using the following username and password:\n\nUsername: %s\nPassword: %s"
+COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY_NOPW="Hello %s,\n\nThank you for registering at %s. Your account is created and must be activated before you can use it.\nTo activate the account select the following link or copy-paste it in your browser:\n%s \n\nAfter activation you may login to %s using the following username and the password you entered during registration:\n\nUsername: %s"
+COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY="Hello %s,\n\nThank you for registering at %s. Your account is created and must be verified before you can use it.\nTo verify the account select the following link or copy-paste it in your browser:\n %s \n\nAfter verification an administrator will be notified to activate your account. You'll receive a confirmation when it's done.\nOnce that account has been activated you may login to %s using the following username and password:\n\nUsername: %s\nPassword: %s"
+COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY_NOPW="Hello %s,\n\nThank you for registering at %s. Your account is created and must be verified before you can use it.\nTo verify the account select the following link or copy-paste it in your browser:\n %s \n\nAfter verification an administrator will be notified to activate your account. You'll receive a confirmation when it's done.\nOnce that account has been activated you may login to %s using the following username and the password you entered during registration:\n\nUsername: %s"
+COM_USERS_EMAIL_USERNAME_REMINDER_BODY="Hello,\n\nA username reminder has been requested for your %s account.\n\nYour username is %s.\n\nTo login to your account, select the link below.\n\n%s \n\nThank you."
+COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT="Your %s username"
+COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA="You have entered a Secret Code but two factor authentication is not enabled in your user account. If you want to use a secret code to secure your login please edit your user profile and enable two factor authentication."
+COM_USERS_FIELD_PASSWORD_RESET_DESC="Please enter the email address associated with your User account.<br />A verification code will be sent to you. Once you have received the verification code, you will be able to choose a new password for your account."
+COM_USERS_FIELD_PASSWORD_RESET_LABEL="Email Address"
+COM_USERS_FIELD_REMIND_EMAIL_DESC="Please enter the email address associated with your User account.<br />Your username will be emailed to the email address on file."
+COM_USERS_FIELD_REMIND_EMAIL_LABEL="Email Address"
+COM_USERS_FIELD_RESET_CONFIRM_TOKEN_DESC="Enter the password reset verification code you received by email."
+COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL="Verification Code"
+COM_USERS_FIELD_RESET_CONFIRM_USERNAME_DESC="Enter your username."
+COM_USERS_FIELD_RESET_CONFIRM_USERNAME_LABEL="Username"
+COM_USERS_FIELD_RESET_PASSWORD1_DESC="Enter your new password."
+COM_USERS_FIELD_RESET_PASSWORD1_LABEL="Password"
+COM_USERS_FIELD_RESET_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
+COM_USERS_FIELD_RESET_PASSWORD2_DESC="Confirm your new password."
+COM_USERS_FIELD_RESET_PASSWORD2_LABEL="Confirm Password"
+COM_USERS_INVALID_EMAIL="Invalid email address"
+COM_USERS_LOGIN_IMAGE_ALT="Login image"
+COM_USERS_LOGIN_REGISTER="Don't have an account?"
+COM_USERS_LOGIN_REMEMBER_ME="Remember me"
+COM_USERS_LOGIN_REMIND="Forgot your username?"
+COM_USERS_LOGIN_RESET="Forgot your password?"
+COM_USERS_LOGIN_USERNAME_LABEL="Username"
+COM_USERS_MAIL_FAILED="Failed sending email."
+COM_USERS_MAIL_SEND_FAILURE_BODY="An error was encountered when sending the user registration email. The error is: %s The user who tried to register is: %s"
+COM_USERS_MAIL_SEND_FAILURE_SUBJECT="Error sending email"
+COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N="Password does not have enough digits. At least %s digits are required."
+COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N_1="Password does not have enough digits. At least 1 digit is required."
+COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N="Password does not have enough symbols. At least %s symbols are required."
+COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N_1="Password does not have enough symbols. At least 1 symbol is required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N="Password does not have enough uppercase characters. At least %s upper case characters are required."
+COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N_1="Password does not have enough uppercase characters. At least 1 upper case character is required."
+COM_USERS_MSG_PASSWORD_TOO_LONG="Password is too long. Passwords must be less than 100 characters."
+COM_USERS_MSG_PASSWORD_TOO_SHORT_N="Password is too short. Passwords must have at least %s characters."
+COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not have spaces."
+COM_USERS_OPTIONAL="(optional)"
+COM_USERS_OR="or"
+COM_USERS_PROFILE="User Profile"
+COM_USERS_PROFILE_BIND_FAILED="Could not bind profile data: %s"
+COM_USERS_PROFILE_CORE_LEGEND="Profile"
+COM_USERS_PROFILE_CUSTOM_LEGEND="Custom Profile"
+COM_USERS_PROFILE_DEFAULT_LABEL="Edit Your Profile"
+COM_USERS_PROFILE_EMAIL1_DESC="Enter your email address."
+COM_USERS_PROFILE_EMAIL1_LABEL="Email Address"
+COM_USERS_PROFILE_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address."
+COM_USERS_PROFILE_EMAIL2_DESC="Confirm your email address."
+COM_USERS_PROFILE_EMAIL2_LABEL="Confirm Email Address"
+COM_USERS_PROFILE_EMAIL2_MESSAGE="The email addresses you entered do not match. Please enter your email address in the email address field and confirm your entry by entering it in the confirm email address field."
+COM_USERS_PROFILE_LAST_VISITED_DATE_LABEL="Last Visited Date"
+COM_USERS_PROFILE_MY_PROFILE="My Profile"
+COM_USERS_PROFILE_NAME_DESC="Enter your full name."
+COM_USERS_PROFILE_NAME_LABEL="Name"
+COM_USERS_PROFILE_NEVER_VISITED="This is the first time you visit this site"
+COM_USERS_PROFILE_NOCHANGE_USERNAME_DESC="If you want to change your username, please contact a site administrator."
+COM_USERS_PROFILE_OTEPS="One time emergency passwords"
+COM_USERS_PROFILE_OTEPS_DESC="If you do not have access to your two factor authentication device you can use any of the following passwords instead of a regular security code. Each one of these emergency passwords is immediately destroyed upon use. We recommend printing these passwords out and keeping the printout in a safe and accessible location, eg your wallet or a safety deposit box."
+COM_USERS_PROFILE_OTEPS_WAIT_DESC="There are no emergency one time passwords generated in your account. The passwords will be generated automatically and displayed here as soon as you activate two factor authentication."
+COM_USERS_PROFILE_PASSWORD1_LABEL="Password"
+COM_USERS_PROFILE_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
+COM_USERS_PROFILE_PASSWORD2_DESC="Confirm your password."
+COM_USERS_PROFILE_PASSWORD2_LABEL="Confirm Password"
+COM_USERS_PROFILE_REGISTERED_DATE_LABEL="Registered Date"
+COM_USERS_PROFILE_SAVE_FAILED="Profile could not be saved: %s"
+COM_USERS_PROFILE_SAVE_SUCCESS="Profile saved."
+COM_USERS_PROFILE_TWO_FACTOR_AUTH="Two Factor Authentication"
+COM_USERS_PROFILE_TWOFACTOR_LABEL="Authentication Method"
+COM_USERS_PROFILE_TWOFACTOR_DESC="Which two factor authentication method you want to activate on the user account."
+COM_USERS_PROFILE_USERNAME_DESC="Enter your desired username."
+COM_USERS_PROFILE_USERNAME_LABEL="Username"
+COM_USERS_PROFILE_USERNAME_MESSAGE="The username you entered is not available. Please pick another username."
+COM_USERS_PROFILE_VALUE_NOT_FOUND="No Information Entered"
+COM_USERS_PROFILE_WELCOME="Welcome, %s"
+COM_USERS_REGISTER_DEFAULT_LABEL="Create An Account"
+COM_USERS_REGISTER_EMAIL1_DESC="Enter your email address."
+COM_USERS_REGISTER_EMAIL1_LABEL="Email Address"
+COM_USERS_REGISTER_EMAIL1_MESSAGE="The email address you entered is already in use or invalid. Please enter another email address."
+COM_USERS_REGISTER_EMAIL2_DESC="Confirm your email address."
+COM_USERS_REGISTER_EMAIL2_LABEL="Confirm Email Address"
+COM_USERS_REGISTER_EMAIL2_MESSAGE="The email addresses you entered do not match. Please enter your email address in the email address field and confirm your entry by entering it in the confirm email address field."
+COM_USERS_REGISTER_NAME_DESC="Enter your full name."
+COM_USERS_REGISTER_NAME_LABEL="Name"
+COM_USERS_REGISTER_PASSWORD1_LABEL="Password"
+COM_USERS_REGISTER_PASSWORD1_MESSAGE="The passwords you entered do not match. Please enter your desired password in the password field and confirm your entry by entering it in the confirm password field."
+COM_USERS_REGISTER_PASSWORD2_DESC="Confirm your password."
+COM_USERS_REGISTER_PASSWORD2_LABEL="Confirm Password"
+COM_USERS_REGISTER_REQUIRED="<strong class="_QQ_"red"_QQ_">*</strong> Required field"
+COM_USERS_REGISTER_USERNAME_DESC="Enter your desired username."
+COM_USERS_REGISTER_USERNAME_LABEL="Username"
+COM_USERS_REGISTER_USERNAME_MESSAGE="The username you entered is not available. Please pick another username."
+COM_USERS_REGISTRATION="User Registration"
+COM_USERS_REGISTRATION_ACTIVATE_SUCCESS="Your Account has been activated. You can now log in using the username and password you chose during the registration."
+COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED="An error was encountered while sending activation notification email"
+COM_USERS_REGISTRATION_ACTIVATION_SAVE_FAILED="Failed to save activation data: %s"
+COM_USERS_REGISTRATION_ADMINACTIVATE_SUCCESS="The user's account has been activated and the user has been notified about it."
+COM_USERS_REGISTRATION_BIND_FAILED="Failed to bind registration data: %s"
+COM_USERS_REGISTRATION_COMPLETE_ACTIVATE="Your account has been created and an activation link has been sent to the email address you entered. Note that you must activate the account by selecting the activation link when you get the email before you can login."
+COM_USERS_REGISTRATION_COMPLETE_VERIFY="Your account has been created and a verification link has been sent to the email address you entered. Note that you must verify the account by selecting the verification link when you get the email and then an administrator will activate your account before you can login."
+COM_USERS_REGISTRATION_DEFAULT_LABEL="User Registration"
+COM_USERS_REGISTRATION_SAVE_FAILED="Registration failed: %s"
+COM_USERS_REGISTRATION_SAVE_SUCCESS="Thank you for registering. You may now log in using the username and password you registered with."
+COM_USERS_REGISTRATION_SEND_MAIL_FAILED="An error was encountered while sending the registration email. A message has been sent to the administrator of this site."
+COM_USERS_REGISTRATION_VERIFY_SUCCESS="Your email address has been verified. Once an administrator approves your account you will be notified by email and you can login to the site."
+COM_USERS_REMIND="Reminder"
+COM_USERS_REMIND_DEFAULT_LABEL="Please enter the email address associated with your User account. Your username will be emailed to the email address on file."
+COM_USERS_REMIND_EMAIL_LABEL="Your Email"
+COM_USERS_REMIND_LIMIT_ERROR_N_HOURS="You have exceeded the maximum number of password resets allowed. Please try again in %s hours."
+COM_USERS_REMIND_LIMIT_ERROR_N_HOURS_1="You have exceeded the maximum number of password resets allowed. Please try again in one hour."
+COM_USERS_REMIND_REQUEST_ERROR="Error requesting password reminder."
+COM_USERS_REMIND_REQUEST_FAILED="Reminder failed: %s"
+COM_USERS_REMIND_REQUEST_SUCCESS="Reminder sent. Please check your mail."
+COM_USERS_REMIND_SUPERADMIN_ERROR="A Super User can't request a password reminder. Please contact another Super User or use an alternative method."
+COM_USERS_RESET="Password Reset"
+COM_USERS_RESET_COMPLETE_ERROR="Error completing password reset."
+COM_USERS_RESET_COMPLETE_FAILED="Completing reset password failed: %s"
+COM_USERS_RESET_COMPLETE_LABEL="To complete the password reset process, please enter a new password."
+COM_USERS_RESET_COMPLETE_SUCCESS="Reset password successful. You may now login to the site."
+COM_USERS_RESET_CONFIRM_ERROR="Error while confirming the password."
+COM_USERS_RESET_CONFIRM_FAILED="Your password reset confirmation failed because the verification code was invalid. %s"
+COM_USERS_RESET_CONFIRM_LABEL="An email has been sent to your email address. The email has a verification code, please paste the verification code in the field below to prove that you are the owner of this account."
+COM_USERS_RESET_COMPLETE_TOKENS_MISSING="Your password reset confirmation failed because the verification code was missing."
+COM_USERS_RESET_REQUEST_ERROR="Error requesting password reset."
+COM_USERS_RESET_REQUEST_FAILED="Reset password failed: %s"
+COM_USERS_RESET_REQUEST_LABEL="Please enter the email address for your account. A verification code will be sent to you. Once you have received the verification code, you will be able to choose a new password for your account."
+COM_USERS_SETTINGS_FIELDSET_LABEL="Basic Settings"
+COM_USERS_USER_BLOCKED="This user is blocked. If this is an error, please contact an administrator."
+COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC="Choose your default language for the Backend."
+COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language"
+COM_USERS_USER_FIELD_BACKEND_TEMPLATE_DESC="Select the template style for the Administrator Backend interface. This will only affect this User."
+COM_USERS_USER_FIELD_BACKEND_TEMPLATE_LABEL="Backend Template Style"
+COM_USERS_USER_FIELD_EDITOR_DESC="Choose your text editor."
+COM_USERS_USER_FIELD_EDITOR_LABEL="Editor"
+COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_DESC="Choose your default language for the Frontend."
+COM_USERS_USER_FIELD_FRONTEND_LANGUAGE_LABEL="Frontend Language"
+COM_USERS_USER_FIELD_HELPSITE_DESC="Help site for the Backend."
+COM_USERS_USER_FIELD_HELPSITE_LABEL="Help Site"
+COM_USERS_USER_FIELD_TIMEZONE_DESC="Choose your time zone."
+COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone"
+COM_USERS_USER_NOT_FOUND="User not found."
+COM_USERS_USER_SAVE_FAILED="Failed to save user: %s"
diff --git a/core/language/en-GB/en-GB.com_weblinks.ini b/core/language/en-GB/en-GB.com_weblinks.ini
new file mode 100644
index 00000000..95e7c35a
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_weblinks.ini
@@ -0,0 +1,39 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WEBLINKS_CAPTCHA_LABEL="Captcha"
+COM_WEBLINKS_CAPTCHA_DESC="Please complete the security check."
+COM_WEBLINKS_CONTENT_TYPE_WEBLINK="Web Link"
+COM_WEBLINKS_CONTENT_TYPE_CATEGORY="Web Links Category"
+COM_WEBLINKS_DEFAULT_PAGE_TITLE="Web Links"
+COM_WEBLINKS_EDIT="Edit Web link"
+COM_WEBLINKS_ERR_TABLES_NAME="There is already a Web Link with that name in this category. Please try again."
+COM_WEBLINKS_ERR_TABLES_PROVIDE_URL="Please provide a valid URL"
+COM_WEBLINKS_ERR_TABLES_TITLE="Your Web Link must have a title."
+COM_WEBLINKS_ERROR_CATEGORY_NOT_FOUND="Web Link category not found."
+COM_WEBLINKS_ERROR_UNIQUE_ALIAS="Another Web Link from this category has the same alias (remember it may be a trashed item)."
+COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND="Web Link not found."
+COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID="Invalid Web link URL."
+COM_WEBLINKS_FIELD_ALIAS_DESC="The alias is for internal use only. Leave this blank and Joomla will fill in a default value from the title. It has to be unique for each web link in the same category."
+COM_WEBLINKS_FIELD_CATEGORY_DESC="You must select a Category."
+COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for your Web link."
+COM_WEBLINKS_FILTER_LABEL="Filter Field"
+COM_WEBLINKS_FILTER_SEARCH_DESC="Web Links filter search"
+COM_WEBLINKS_FIELD_TITLE_DESC="Your Web Link must have a Title."
+COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL."
+COM_WEBLINKS_FIELD_URL_LABEL="URL"
+COM_WEBLINKS_FORM_CREATE_WEBLINK="Submit a Web Link"
+COM_WEBLINKS_GRID_TITLE="Title"
+COM_WEBLINKS_LINK="Web Link"
+COM_WEBLINKS_NAME="Name"
+COM_WEBLINKS_NO_WEBLINKS="There are no Web Links in this category."
+COM_WEBLINKS_NUM="# of links:"
+COM_WEBLINKS_NUM_ITEMS="Links in categories"
+COM_WEBLINKS_FORM_EDIT_WEBLINK="Edit a Web Link"
+COM_WEBLINKS_FORM_SUBMIT_WEBLINK="Submit a Web Link"
+COM_WEBLINKS_SAVE_SUCCESS="Web link saved."
+COM_WEBLINKS_SUBMIT_SAVE_SUCCESS="Web Link submitted."
+COM_WEBLINKS_WEB_LINKS="Web Links"
+JGLOBAL_NEWITEMSLAST_DESC="New Web Links default to the last position. Ordering can be changed after this Web Link has been saved."
diff --git a/core/language/en-GB/en-GB.com_wrapper.ini b/core/language/en-GB/en-GB.com_wrapper.ini
new file mode 100644
index 00000000..ed97c10a
--- /dev/null
+++ b/core/language/en-GB/en-GB.com_wrapper.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_WRAPPER_NO_IFRAMES="This option will not work correctly. Unfortunately, your browser does not support inline frames."
+
diff --git a/core/language/en-GB/en-GB.files_joomla.sys.ini b/core/language/en-GB/en-GB.files_joomla.sys.ini
new file mode 100644
index 00000000..6b7e2df7
--- /dev/null
+++ b/core/language/en-GB/en-GB.files_joomla.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+FILES_JOOMLA="Joomla CMS"
+FILES_JOOMLA_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
+FILES_JOOMLA_ERROR_MANIFEST="Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)"
+FILES_JOOMLA_XML_DESCRIPTION="Joomla! 3 Content Management System."
+
diff --git a/core/language/en-GB/en-GB.finder_cli.ini b/core/language/en-GB/en-GB.finder_cli.ini
new file mode 100644
index 00000000..8d632a9e
--- /dev/null
+++ b/core/language/en-GB/en-GB.finder_cli.ini
@@ -0,0 +1,21 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+FINDER_CLI="Smart Search INDEXER"
+FINDER_CLI_BATCH_COMPLETE=" * Processed batch %s in %s seconds."
+FINDER_CLI_FILTER_RESTORE_WARNING="Warning: Did not find taxonomy %s/%s in filter %s"
+FINDER_CLI_INDEX_PURGE="Clear index"
+FINDER_CLI_INDEX_PURGE_FAILED="- index clear failed."
+FINDER_CLI_INDEX_PURGE_SUCCESS="- index clear successful"
+FINDER_CLI_PEAK_MEMORY_USAGE="Peak memory usage: %s bytes"
+FINDER_CLI_PROCESS_COMPLETE="Total Processing Time: %s seconds."
+FINDER_CLI_RESTORE_FILTER_COMPLETED="- number of filters restored: %s"
+FINDER_CLI_RESTORE_FILTERS="Restoring filters"
+FINDER_CLI_SAVE_FILTER_COMPLETED="- number of saved filters: %s"
+FINDER_CLI_SAVE_FILTERS="Saving filters"
+FINDER_CLI_SETTING_UP_PLUGINS="Setting up Smart Search plugins"
+FINDER_CLI_SETUP_ITEMS="Setup %s items in %s seconds."
+FINDER_CLI_STARTING_INDEXER="Starting Indexer"
+
diff --git a/core/language/en-GB/en-GB.ini b/core/language/en-GB/en-GB.ini
new file mode 100644
index 00000000..ed15ed34
--- /dev/null
+++ b/core/language/en-GB/en-GB.ini
@@ -0,0 +1,414 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+; Common boolean values
+; Note: YES, NO, TRUE, FALSE are reserved words in INI format.
+
+; Keep this string on top
+JERROR_PARSING_LANGUAGE_FILE="&#160;: error(s) in line(s) %s"
+
+
+ERROR="Error"
+MESSAGE="Message"
+NOTICE="Notice"
+WARNING="Warning"
+
+J1="1"
+J2="2"
+J3="3"
+J4="4"
+J5="5"
+J6="6"
+J7="7"
+J8="8"
+J9="9"
+J10="10"
+J15="15"
+J20="20"
+J25="25"
+J30="30"
+J50="50"
+J100="100"
+J200="200"
+J500="500"
+
+JACTION_ADMIN="Configure"
+JACTION_ADMIN_GLOBAL="Super User"
+JACTION_COMPONENT_SETTINGS="Component Settings"
+JACTION_CREATE="Create"
+JACTION_DELETE="Delete"
+JACTION_EDIT="Edit"
+JACTION_EDITOWN="Edit Own"
+JACTION_EDITSTATE="Edit State"
+JACTION_LOGIN_ADMIN="Administrator Login"
+JACTION_LOGIN_SITE="Site Login"
+JACTION_MANAGE="Access Administration Interface"
+
+JADMINISTRATOR="Administrator"
+JALL="All"
+JALL_LANGUAGE="All"
+JAPPLY="Save"
+JARCHIVED="Archived"
+JASSOCIATIONS="Also available:"
+JAUTHOR="Author"
+JCANCEL="Cancel"
+JCATEGORY="Category"
+JCLEAR="Clear"
+JDATE="Date"
+JDAY="Day"
+JDEFAULT="Default"
+JDETAILS="Details"
+JDISABLED="Disabled"
+JEDITOR="Editor"
+JENABLED="Enabled"
+JEXPIRED="Expired"
+JFALSE="False"
+JFEATURED="Featured"
+JHIDE="Hide"
+JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
+JLOGIN="Log in"
+JLOGOUT="Log out"
+JMONTH="Month"
+JNEW="New"
+JNEXT="Next"
+JNEXT_TITLE="Next article: %s"
+JNO="No"
+JNONE="None"
+JNOTPUBLISHEDYET="Not published yet"
+JNOTICE="Notice"
+JOFF="Off"
+JOFFLINE_MESSAGE="This site is down for maintenance.<br />Please check back again soon."
+JON="On"
+JOPTIONS="Options"
+JPAGETITLE="%1$s - %2$s"
+JPREV="Prev"
+JPREVIOUS="Previous"
+JPREVIOUS_TITLE="Previous article: %s"
+JPUBLISHED="Published"
+JREGISTER="Register"
+JREQUIRED="Required"
+JSAVE="Save"
+JSELECT="Select"
+JSHOW="Show"
+JSITE="Site"
+JSTATUS="Status"
+JSUBMIT="Submit"
+JTAG="Tags"
+JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
+JTAG_FIELD_SELECT_DESC="Select the tag to use."
+JTOOLBAR="Toolbar"
+JTOOLBAR_VERSIONS="Versions"
+JTRASH="Trash"
+JTRASHED="Trashed"
+JTRUE="True"
+JUNPUBLISHED="Unpublished"
+JUSER_TOOLS="User tools"
+JYEAR="Year"
+JYES="Yes"
+
+JBROWSERTARGET_MODAL="Modal"
+JBROWSERTARGET_NEW="Open in new window"
+JBROWSERTARGET_PARENT="Open in parent window"
+JBROWSERTARGET_POPUP="Open in popup"
+
+JERROR_ALERTNOAUTHOR="You are not authorised to view this resource."
+JERROR_ALERTNOTEMPLATE="<strong>The template for this display is not available. Please contact a Site administrator.</strong>"
+JERROR_AN_ERROR_HAS_OCCURRED="An error has occurred."
+JERROR_COULD_NOT_FIND_TEMPLATE="Could not find template "_QQ_"%s"_QQ_"."
+JERROR_ERROR="Error"
+JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE="an <strong>out-of-date bookmark/favourite</strong>"
+JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="An error has occurred while processing your request."
+JERROR_LAYOUT_GO_TO_THE_HOME_PAGE="Go to the Home Page"
+JERROR_LAYOUT_HOME_PAGE="Home Page"
+JERROR_LAYOUT_MIS_TYPED_ADDRESS="a <strong>mistyped address</strong>"
+JERROR_LAYOUT_NOT_ABLE_TO_VISIT="You may not be able to visit this page because of:"
+JERROR_LAYOUT_PAGE_NOT_FOUND="The requested page can't be found."
+JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR="If difficulties persist, please contact the System Administrator of this site and report the error below."
+JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES="Please try one of the following pages:"
+JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
+JERROR_LAYOUT_REQUESTED_RESOURCE_WAS_NOT_FOUND="The requested resource was not found."
+JERROR_LAYOUT_SEARCH="You may wish to search the site or visit the home page."
+JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING="a search engine that has an <strong>out-of-date listing for this site</strong>"
+JERROR_LAYOUT_SEARCH_PAGE="Search this site"
+JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE="you have <strong>no access</strong> to this page"
+JERROR_LOADING_MENUS="Error loading Menus: %s"
+JERROR_LOGIN_DENIED="You can't access the private section of this site."
+JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet."
+JERROR_PAGE_NOT_FOUND="Page not found"
+JERROR_SESSION_STARTUP="Error starting the session."
+JERROR_TABLE_BIND_FAILED="hmm %s ..."
+JERROR_USERS_PROFILE_NOT_FOUND="User profile not found"
+
+JFIELD_ACCESS_DESC="Access level for this content."
+JFIELD_ACCESS_LABEL="Access"
+JFIELD_ALIAS_DESC="The Alias will be used in the SEF URL. Leave this blank and Joomla! will fill in a default value from the title. This value will depend on the SEO settings (Global Configuration->Site). <br />Using Unicode will produce UTF-8 aliases. You may also enter manually any UTF-8 character. Spaces and some forbidden characters will be changed to hyphens.<br />When using default transliteration it will produce an alias in lower case and with dashes instead of spaces. You may enter the Alias manually. Use lowercase letters and hyphens (-). No spaces or underscores are allowed. Default value will be a date and time if the title is typed in non-latin letters ."
+JFIELD_ALIAS_LABEL="Alias"
+JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title"
+JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title"
+JFIELD_CATEGORY_DESC="Category"
+JFIELD_FIELDS_CATEGORY_DESC="Select the category that this field is assigned to."
+JFIELD_LANGUAGE_DESC="Assign a language to this article."
+JFIELD_LANGUAGE_LABEL="Language"
+JFIELD_META_DESCRIPTION_DESC="Metadata description."
+JFIELD_META_DESCRIPTION_LABEL="Meta Description"
+JFIELD_META_KEYWORDS_DESC="Keywords describing the content."
+JFIELD_META_KEYWORDS_LABEL="Keywords"
+JFIELD_META_RIGHTS_DESC="Describe what rights others have to use this content."
+JFIELD_META_RIGHTS_LABEL="Content Rights"
+JFIELD_ORDERING_DESC="Ordering of the article within the category."
+JFIELD_ORDERING_LABEL="Ordering"
+JFIELD_PUBLISHED_DESC="Set publication status."
+JFIELD_TITLE_DESC="Title for the article."
+
+JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category"
+JGLOBAL_ARTICLES="Articles"
+JGLOBAL_FIELDS="Fields"
+JGLOBAL_AUTH_ACCESS_DENIED="Access Denied"
+JGLOBAL_AUTH_ACCESS_GRANTED="Access Granted"
+JGLOBAL_AUTH_BIND_FAILED="Failed binding to LDAP server"
+JGLOBAL_AUTH_CANCEL="Authentication cancelled"
+JGLOBAL_AUTH_CURL_NOT_INSTALLED="Curl isn't installed."
+JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED="Empty password not allowed."
+JGLOBAL_AUTH_FAIL="Authentication failed"
+JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
+JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
+JGLOBAL_AUTH_INVALID_PASS="Username and password do not match or you do not have an account yet."
+JGLOBAL_AUTH_INVALID_SECRETKEY="The two factor authentication Secret Key is invalid."
+; The following 2 strings are deprecated and will be removed with 4.0.
+JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
+JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
+JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
+JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
+JGLOBAL_AUTH_NOT_CONNECT="Unable to connect to authentication service."
+JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore folder %s. Please check the effective permissions."
+JGLOBAL_AUTH_PASS_BLANK="LDAP can't have blank password"
+JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
+JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted."
+JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user"
+JGLOBAL_AUTO="Auto"
+JGLOBAL_CATEGORY_NOT_FOUND="Category not found"
+JGLOBAL_CENTER="Center"
+JGLOBAL_CHECK_ALL="Check All Items"
+JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Select to sort by this column"
+JGLOBAL_COLLAPSE_CATEGORIES="Show less categories"
+JGLOBAL_CREATED_DATE_ON="Created on %s"
+JGLOBAL_CUSTOM_CATEGORY="New Categories"
+JGLOBAL_DESCRIPTION="Description"
+JGLOBAL_DISPLAY_NUM="Display #"
+JGLOBAL_EDIT="Edit"
+JGLOBAL_EDIT_TITLE="Edit article"
+JGLOBAL_EMAIL="Email"
+JGLOBAL_EMAIL_TITLE="Email this link to a friend"
+JGLOBAL_EXPAND_CATEGORIES="Show more categories"
+JGLOBAL_FIELD_ADD="Add"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed."
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category"
+JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will replace the Top Level Category Description, if it has one."
+JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Alternative Description"
+JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display."
+JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
+JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this."
+JGLOBAL_FIELD_CREATED_BY_LABEL="Created By"
+JGLOBAL_FIELD_CREATED_DESC="Created Date."
+JGLOBAL_FIELD_CREATED_LABEL="Created Date"
+JGLOBAL_FIELD_FEATURED_DESC="Assign the article to the featured blog layout."
+JGLOBAL_FIELD_FEATURED_LABEL="Featured"
+JGLOBAL_FIELD_FIELD_CACHETIME_DESC="The number of minutes before the cache is refreshed."
+JGLOBAL_FIELD_FIELD_ORDERING_LABEL="Order"
+JGLOBAL_FIELD_FIELD_ORDERING_DESC="Order items will be displayed in."
+JGLOBAL_FIELD_ID_DESC="Record number in the database."
+JGLOBAL_FIELD_ID_LABEL="ID"
+JGLOBAL_FIELD_LAYOUT_DESC="Default layout to use for items."
+JGLOBAL_FIELD_LAYOUT_LABEL="Choose a Layout"
+JGLOBAL_FIELD_MODIFIED_LABEL="Modified Date"
+JGLOBAL_FIELD_MODIFIED_BY_DESC="The user who did the last modification."
+JGLOBAL_FIELD_MODIFIED_BY_LABEL="Modified By"
+JGLOBAL_FIELD_MOVE="Move"
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level."
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of Categories"
+JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to stop publishing."
+JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to start publishing."
+JGLOBAL_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+JGLOBAL_FIELD_REMOVE="Remove"
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or alternatively replace with the text from the description field found in the menu item. If using Root as a top level category, the description field has to be filled."
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Top Level Category Description"
+JGLOBAL_FIELD_VERSION_NOTE_DESC="Enter an optional note for this version of the item."
+JGLOBAL_FIELD_VERSION_NOTE_LABEL="Version Note"
+JGLOBAL_FILTER_BUTTON="Filter"
+JGLOBAL_FILTER_LABEL="Filter"
+JGLOBAL_FULL_TEXT="Full Text"
+JGLOBAL_GT="&gt;"
+JGLOBAL_HELPREFRESH_BUTTON="Refresh"
+JGLOBAL_HITS="Hits"
+JGLOBAL_HITS_COUNT="Hits: %s"
+JGLOBAL_ICON_SEP="|"
+JGLOBAL_INHERIT="Inherit"
+JGLOBAL_INTRO_TEXT="Intro Text"
+JGLOBAL_KEEP_TYPING="Keep typing ..."
+JGLOBAL_LEFT="Left"
+JGLOBAL_LOOKING_FOR="Looking for"
+JGLOBAL_LT="&lt;"
+JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: <strong>%s</strong>"
+JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. Ordering can be changed after this item has been saved."
+JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
+JGLOBAL_NUM="#"
+JGLOBAL_OTPMETHOD_NONE="Disable Two Factor Authentication"
+JGLOBAL_PASSWORD="Password"
+JGLOBAL_PASSWORD_RESET_REQUIRED="You are required to reset your password before proceeding."
+JGLOBAL_PRINT="Print"
+JGLOBAL_PRINT_TITLE="Print article < %s >"
+JGLOBAL_RECORD_NUMBER="Record ID: %d"
+JGLOBAL_REMEMBER_ME="Remember me"
+JGLOBAL_REMEMBER_MUST_LOGIN="For security reasons you must login before editing your personal information."
+JGLOBAL_RESOURCE_NOT_FOUND="Resource not found"
+JGLOBAL_RIGHT="Right"
+JGLOBAL_ROOT="Root"
+JGLOBAL_SECRETKEY="Secret Key"
+JGLOBAL_SECRETKEY_HELP="If you have enabled two factor authentication in your user account please enter your secret key. If you do not know what this means, you can leave this field blank."
+JGLOBAL_SELECT_AN_OPTION="Select an option"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"
+JGLOBAL_SELECT_SOME_OPTIONS="Select some options"
+JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before finish publishing date"
+JGLOBAL_SUBCATEGORIES="Subcategories"
+JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
+JGLOBAL_TITLE="Title"
+JGLOBAL_TYPE_OR_SELECT_CATEGORY="Type or Select a Category"
+JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
+JGLOBAL_USE_GLOBAL="Use Global"
+JGLOBAL_USE_GLOBAL_VALUE="Use Global (%s)"
+JGLOBAL_USERNAME="Username"
+JGLOBAL_VALIDATION_FORM_FAILED="Invalid form"
+JGLOBAL_YOU_MUST_LOGIN_FIRST="Please login first"
+
+JGRID_HEADING_ACCESS="Access"
+JGRID_HEADING_ID="ID"
+JGRID_HEADING_LANGUAGE="Language"
+
+; if there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded
+; we therefore have to load the strings from en-GB.ini
+
+JLIB_DATABASE_ERROR_ADAPTER_MYSQL="The MySQL adapter 'mysql' is not available."
+JLIB_DATABASE_ERROR_ADAPTER_MYSQLI="The MySQL adapter 'mysqli' is not available."
+JLIB_DATABASE_ERROR_CONNECT_DATABASE="Unable to connect to the Database: %s"
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL."
+JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database"
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
+JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError"
+
+JOPTION_DO_NOT_USE="- None Selected -"
+JOPTION_SELECT_ACCESS="- Select Access -"
+JOPTION_SELECT_AUTHOR="- Select Author -"
+JOPTION_SELECT_CATEGORY="- Select Category -"
+JOPTION_SELECT_LANGUAGE="- Select Language -"
+JOPTION_SELECT_PUBLISHED="- Select Status -"
+JOPTION_SELECT_MAX_LEVELS="- Select Max Levels -"
+JOPTION_SELECT_TAG="- Select Tag -"
+JOPTION_USE_DEFAULT="- Use Default -"
+
+JSEARCH_FILTER_CLEAR="Clear"
+JSEARCH_FILTER_LABEL="Filter"
+JSEARCH_FILTER_SUBMIT="Search"
+JSEARCH_FILTER="Search"
+
+DATE_FORMAT_LC="l, d F Y"
+DATE_FORMAT_LC1="l, d F Y"
+DATE_FORMAT_LC2="l, d F Y H:i"
+DATE_FORMAT_LC3="d F Y"
+DATE_FORMAT_LC4="Y-m-d"
+DATE_FORMAT_LC5="Y-m-d H:i"
+DATE_FORMAT_LC6="Y-m-d H:i:s"
+DATE_FORMAT_JS1="y-m-d"
+DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
+DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
+DATE_FORMAT_FILTER_DATE="Y-m-d"
+DATE_FORMAT_FILTER_DATETIME="Y-m-d H:i:s"
+
+; Months
+
+JANUARY_SHORT="Jan"
+JANUARY="January"
+FEBRUARY_SHORT="Feb"
+FEBRUARY="February"
+MARCH_SHORT="Mar"
+MARCH="March"
+APRIL_SHORT="Apr"
+APRIL="April"
+MAY_SHORT="May"
+MAY="May"
+JUNE_SHORT="Jun"
+JUNE="June"
+JULY_SHORT="Jul"
+JULY="July"
+AUGUST_SHORT="Aug"
+AUGUST="August"
+SEPTEMBER_SHORT="Sep"
+SEPTEMBER="September"
+OCTOBER_SHORT="Oct"
+OCTOBER="October"
+NOVEMBER_SHORT="Nov"
+NOVEMBER="November"
+DECEMBER_SHORT="Dec"
+DECEMBER="December"
+
+;Days of the Week
+SAT="Sat"
+SATURDAY="Saturday"
+SUN="Sun"
+SUNDAY="Sunday"
+MON="Mon"
+MONDAY="Monday"
+TUE="Tue"
+TUESDAY="Tuesday"
+WED="Wed"
+WEDNESDAY="Wednesday"
+THU="Thu"
+THURSDAY="Thursday"
+FRI="Fri"
+FRIDAY="Friday"
+
+; Localised number format
+
+DECIMALS_SEPARATOR="."
+THOUSANDS_SEPARATOR=","
+
+; Time Zones - this data has been removed as it is no longer used by Joomla 3.x
+
+PHPMAILER_PROVIDE_ADDRESS="You must provide at least one recipient email address."
+PHPMAILER_MAILER_IS_NOT_SUPPORTED="Mailer is not supported."
+PHPMAILER_EXECUTE="Could not execute: "
+PHPMAILER_EXTENSION_MISSING="Extension missing: "
+PHPMAILER_INSTANTIATE="Could not start mail function."
+PHPMAILER_AUTHENTICATE="SMTP Error! Could not authenticate."
+PHPMAILER_FROM_FAILED="The following from address failed: "
+PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
+PHPMAILER_DATA_NOT_ACCEPTED="SMTP Error! Data not accepted."
+PHPMAILER_CONNECT_HOST="SMTP Error! Could not connect to SMTP host."
+PHPMAILER_FILE_ACCESS="Could not access file: "
+PHPMAILER_FILE_OPEN="File Error: Could not open file: "
+PHPMAILER_ENCODING="Unknown encoding: "
+PHPMAILER_SIGNING_ERROR="Signing error: "
+PHPMAILER_SMTP_ERROR="SMTP server error: "
+PHPMAILER_EMPTY_MESSAGE="Empty message body"
+PHPMAILER_INVALID_ADDRESS="Invalid address"
+PHPMAILER_VARIABLE_SET="Can't set or reset variable: "
+PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
+PHPMAILER_TLS="Could not start TLS"
+
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+PDOMYSQL="MySQL (PDO)"
+POSTGRESQL="PostgreSQL"
+SQLAZURE="Microsoft SQL Azure"
+SQLITE="SQLite"
+SQLSRV="Microsoft SQL Server"
+
+; Search tools
+JSEARCH_TOOLS="Search Tools"
+JSEARCH_TOOLS_DESC="Filter the list items."
+JSEARCH_TOOLS_ORDERING="Order by:"
diff --git a/core/language/en-GB/en-GB.lib_fof.ini b/core/language/en-GB/en-GB.lib_fof.ini
new file mode 100644
index 00000000..1a87982a
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_fof.ini
@@ -0,0 +1,8 @@
+; @package     FrameworkOnFramework
+; @copyright   Copyright (C) 2010 - 2015 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+; @license     GNU General Public License version 2, or later
+
+LIB_FOF_DOWNLOAD_ERR_COULDNOTDOWNLOADFROMURL="Could not download from %s"
+LIB_FOF_DOWNLOAD_ERR_COULDNOTWRITELOCALFILE="Local file %s is not writeable"
+LIB_FOF_DOWNLOAD_ERR_CURL_ERROR="The download failed: cURL error %s: %s"
+LIB_FOF_DOWNLOAD_ERR_HTTPERROR="Unexpected HTTP status %s"
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.lib_fof.sys.ini b/core/language/en-GB/en-GB.lib_fof.sys.ini
new file mode 100644
index 00000000..e9316410
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_fof.sys.ini
@@ -0,0 +1,6 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+LIB_FOF_XML_DESCRIPTION="Framework-on-Framework (FOF) - A rapid component development framework for Joomla!"
diff --git a/core/language/en-GB/en-GB.lib_idna_convert.sys.ini b/core/language/en-GB/en-GB.lib_idna_convert.sys.ini
new file mode 100644
index 00000000..47393806
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_idna_convert.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+LIB_IDNA="IDNA Convert"
+LIB_IDNA_XML_DESCRIPTION="The class idna_convert allows to convert internationalised domain names (see RFC 3490, 3491, 3492 and 3454 for details) as they can be used with various registries worldwide to be translated between their original (localised) form and their encoded form as it will be used in the DNS (Domain Name System)."
+
diff --git a/core/language/en-GB/en-GB.lib_joomla.ini b/core/language/en-GB/en-GB.lib_joomla.ini
new file mode 100644
index 00000000..6ccd43d9
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_joomla.ini
@@ -0,0 +1,747 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+; Common boolean values
+; Note: YES, NO, TRUE, FALSE are reserved words in INI format.
+
+; Keep this string on top
+JERROR_PARSING_LANGUAGE_FILE="&#160;: error(s) in line(s) %s"
+
+JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN="Access forbidden."
+JLIB_APPLICATION_ERROR_APPLICATION_GET_NAME="JApplication: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_APPLICATION_LOAD="Unable to load application: %s"
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new items in this category."
+JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these items."
+JLIB_APPLICATION_ERROR_BATCH_FAILED="Batch process failed with following error: %s"
+JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND="Can't find the destination category for this move."
+JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND="Can't find the item being moved."
+JLIB_APPLICATION_ERROR_CHECKIN_FAILED="Check-in failed with the following error: %s"
+JLIB_APPLICATION_ERROR_CHECKIN_NOT_CHECKED="Item is not checked out."
+JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH="The user checking in does not match the user who checked out the item."
+JLIB_APPLICATION_ERROR_CHECKOUT_FAILED="Check-out failed with the following error: %s"
+JLIB_APPLICATION_ERROR_CHECKOUT_USER_MISMATCH="The user checking out does not match the user who checked out the item."
+JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND="Component not found."
+JLIB_APPLICATION_ERROR_COMPONENT_NOT_LOADING="Error loading component: %1$s, %2$s"
+JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME="JController: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED="Create record not permitted."
+JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED="Delete not permitted."
+JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED="Edit state is not permitted."
+JLIB_APPLICATION_ERROR_EDIT_ITEM_NOT_PERMITTED="Edit is not permitted."
+JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED="Edit not permitted."
+JLIB_APPLICATION_ERROR_HISTORY_ID_MISMATCH="Error restoring item version from history."
+JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION="Insufficient information to perform the batch operation."
+JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS="Invalid controller class: %s"
+JLIB_APPLICATION_ERROR_INVALID_CONTROLLER="Invalid controller: name='%s', format='%s'"
+JLIB_APPLICATION_ERROR_LAYOUTFILE_NOT_FOUND="Layout %s not found."
+JLIB_APPLICATION_ERROR_LIBRARY_NOT_FOUND="Library not found."
+JLIB_APPLICATION_ERROR_LIBRARY_NOT_LOADING="Error loading library: %1$s, %2$s"
+JLIB_APPLICATION_ERROR_MENU_LOAD="Error loading menu: %s"
+JLIB_APPLICATION_ERROR_MODEL_GET_NAME="JModel: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_MODULE_LOAD="Error loading module %s"
+JLIB_APPLICATION_ERROR_PATHWAY_LOAD="Unable to load pathway: %s"
+JLIB_APPLICATION_ERROR_REORDER_FAILED="Reorder failed. Error: %s"
+JLIB_APPLICATION_ERROR_ROUTER_LOAD="Unable to load router: %s"
+JLIB_APPLICATION_ERROR_MODELCLASS_NOT_FOUND="Model class %s not found in file."
+JLIB_APPLICATION_ERROR_SAVE_FAILED="Save failed with the following error: %s"
+JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED="Save not permitted."
+JLIB_APPLICATION_ERROR_TABLE_NAME_NOT_SUPPORTED="Table %s not supported. File not found."
+JLIB_APPLICATION_ERROR_TASK_NOT_FOUND="Task [%s] not found."
+JLIB_APPLICATION_ERROR_UNHELD_ID="You are not permitted to use that link to directly access that page (#%d)."
+JLIB_APPLICATION_ERROR_VIEW_CLASS_NOT_FOUND="View class not found [class, file]: %1$s, %2$s"
+JLIB_APPLICATION_ERROR_VIEW_GET_NAME_SUBSTRING="JView: :getName() : Your classname has the substring 'view'. This causes problems when extracting the classname from the name of your objects view. Avoid Object names with the substring 'view'."
+JLIB_APPLICATION_ERROR_VIEW_GET_NAME="JView: :getName() : Can't get or parse class name."
+JLIB_APPLICATION_ERROR_VIEW_NOT_FOUND="View not found [name, type, prefix]: %1$s, %2$s, %3$s"
+JLIB_APPLICATION_SAVE_SUCCESS="Item saved."
+JLIB_APPLICATION_SUBMIT_SAVE_SUCCESS="Item submitted."
+JLIB_APPLICATION_SUCCESS_BATCH="Batch process completed."
+JLIB_APPLICATION_SUCCESS_ITEM_REORDERED="Ordering saved."
+JLIB_APPLICATION_SUCCESS_ORDERING_SAVED="Ordering saved."
+JLIB_APPLICATION_SUCCESS_LOAD_HISTORY="Prior version restored. Saved on %s %s."
+
+JLIB_LOGIN_AUTHENTICATE="Username and password do not match or you do not have an account yet."
+
+JLIB_CACHE_ERROR_CACHE_HANDLER_LOAD="Unable to load Cache Handler: %s"
+JLIB_CACHE_ERROR_CACHE_STORAGE_LOAD="Unable to load Cache Storage: %s"
+
+JLIB_CAPTCHA_ERROR_PLUGIN_NOT_FOUND="Captcha plugin not set or not found. Please contact a site administrator."
+
+JLIB_CLIENT_ERROR_JFTP_NO_CONNECT="JFTP: :connect: Could not connect to host ' %1$s ' on port ' %2$s '"
+JLIB_CLIENT_ERROR_JFTP_NO_CONNECT_SOCKET="JFTP: :connect: Could not connect to host ' %1$s ' on port ' %2$s '. Socket error number: %3$s and error message: %4$s"
+JLIB_CLIENT_ERROR_JFTP_BAD_RESPONSE="JFTP: :connect: Bad response. Server response: %s [Expected: 220]"
+JLIB_CLIENT_ERROR_JFTP_BAD_USERNAME="JFTP: :login: Bad Username. Server response: %1$s [Expected: 331]. Username sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_BAD_PASSWORD="JFTP: :login: Bad Password. Server response: %1$s [Expected: 230]. Password sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_PWD_BAD_RESPONSE_NATIVE="FTP: :pwd: Bad response."
+JLIB_CLIENT_ERROR_JFTP_PWD_BAD_RESPONSE="JFTP: :pwd: Bad response. Server response: %s [Expected: 257]"
+JLIB_CLIENT_ERROR_JFTP_SYST_BAD_RESPONSE_NATIVE="JFTP: :syst: Bad response."
+JLIB_CLIENT_ERROR_JFTP_SYST_BAD_RESPONSE="JFTP: :syst: Bad response. Server response: %s [Expected: 215]"
+JLIB_CLIENT_ERROR_JFTP_CHDIR_BAD_RESPONSE_NATIVE="JFTP: :chdir: Bad response."
+JLIB_CLIENT_ERROR_JFTP_CHDIR_BAD_RESPONSE="JFTP: :chdir: Bad response. Server response: %1$s [Expected: 250]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_REINIT_BAD_RESPONSE_NATIVE="JFTP: :reinit: Bad response."
+JLIB_CLIENT_ERROR_JFTP_REINIT_BAD_RESPONSE="JFTP: :reinit: Bad response. Server response: %s [Expected: 220]"
+JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_NATIVE="JFTP: :rename: Bad response."
+JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_FROM="JFTP: :rename: Bad response. Server response: %1$s [Expected: 350]. From path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_TO="JFTP: :rename: Bad response. Server response: %1$s [Expected: 250]. To path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE_NATIVE="JFTP: :chmod: Bad response."
+JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE="JFTP: :chmod: Bad response. Server response: %1$s [Expected: 250]. Path sent: %2$s. Mode sent: %3$s"
+JLIB_CLIENT_ERROR_JFTP_DELETE_BAD_RESPONSE_NATIVE="JFTP: :delete: Bad response."
+JLIB_CLIENT_ERROR_JFTP_DELETE_BAD_RESPONSE="JFTP: :delete: Bad response. Server response: %1$s [Expected: 250]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_MKDIR_BAD_RESPONSE_NATIVE="JFTP: :mkdir: Bad response."
+JLIB_CLIENT_ERROR_JFTP_MKDIR_BAD_RESPONSE="JFTP: :mkdir: Bad response. Server response: %1$s [Expected: 257]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_RESTART_BAD_RESPONSE_NATIVE="JFTP: :restart: Bad response."
+JLIB_CLIENT_ERROR_JFTP_RESTART_BAD_RESPONSE="JFTP: :restart: Bad response. Server response: %1$s [Expected: 350]. Restart point sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_BUFFER="JFTP: :create: Bad response."
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_PASSIVE="JFTP: :create: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE="JFTP: :create: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_TRANSFER="JFTP: :create: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_BUFFER="JFTP: :read: Bad response."
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_PASSIVE="JFTP: :read: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE="JFTP: :read: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_TRANSFER="JFTP: :read: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE="JFTP: :get: Bad response."
+JLIB_CLIENT_ERROR_JFTP_GET_PASSIVE="JFTP: :get: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_GET_WRITING_LOCAL="JFTP: :get: Unable to open local file for writing. Local path: %s"
+JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE_RETR="JFTP: :get: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE_TRANSFER="JFTP: :get: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_STORE_PASSIVE="JFTP: :store: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE="JFTP: :store: Bad response."
+JLIB_CLIENT_ERROR_JFTP_STORE_READING_LOCAL="JFTP: :store: Unable to open local file for reading. Local path: %s"
+JLIB_CLIENT_ERROR_JFTP_STORE_FIND_LOCAL="JFTP: :store: Unable to find local file. Local path: %s"
+JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE_STOR="JFTP: :store: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_STORE_DATA_PORT="JFTP: :store: Unable to write to data port socket."
+JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE_TRANSFER="JFTP: :store: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_WRITE_PASSIVE="JFTP: :write: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE="JFTP: :write: Bad response."
+JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE_STOR="JFTP: :write: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_WRITE_DATA_PORT="JFTP: :write: Unable to write to data port socket."
+JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE_TRANSFER="JFTP: :write: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_APPEND_PASSIVE="JFTP: :append: Unable to use passive mode"
+JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE="JFTP: :append: Bad response"
+JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE_APPE="JFTP: :append: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_APPEND_DATA_PORT="JFTP: :append: Unable to write to data port socket"
+JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE_TRANSFER="JFTP: :append: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_SIZE_BAD_RESPONSE="JFTP: :size: Bad response"
+JLIB_CLIENT_ERROR_JFTP_SIZE_PASSIVE="JFTP: :size: Unable to use passive mode"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_PASSIVE="JFTP: :listNames: Unable to use passive mode"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE="JFTP: :listNames: Bad response"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_NLST="JFTP: :listNames: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_TRANSFER="JFTP: :listNames: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE="JFTP: :listDetails: Bad response."
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_PASSIVE="JFTP: :listDetails: Unable to use passive mode."
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE_LIST="JFTP: :listDetails: Bad response. Server response: %1$s [Expected: 150 or 125]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE_TRANSFER="JFTP: :listDetails: Transfer Failed. Server response: %1$s [Expected: 226]. Path sent: %2$s"
+JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_UNRECOGNISED="JFTP: :listDetails: Unrecognised folder listing format."
+JLIB_CLIENT_ERROR_JFTP_PUTCMD_UNCONNECTED="JFTP: :_putCmd: Not connected to the control port."
+JLIB_CLIENT_ERROR_JFTP_PUTCMD_SEND="JFTP: :_putCmd: Unable to send command: %s"
+JLIB_CLIENT_ERROR_JFTP_VERIFYRESPONSE="JFTP: :_verifyResponse: Timeout or unrecognised response while waiting for a response from the server. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_CONNECT_PORT="JFTP: :_passive: Not connected to the control port."
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_RESPONSE="JFTP: :_passive: Timeout or unrecognised response while waiting for a response from the server. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_IP_OBTAIN="JFTP: :_passive: Unable to obtain IP and port for data transfer. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_IP_VALID="JFTP: :_passive: IP and port for data transfer not valid. Server response: %s"
+JLIB_CLIENT_ERROR_JFTP_PASSIVE_CONNECT="JFTP: :_passive: Could not connect to host %1$s on port %2$s. Socket error number: %3$s and error message: %4$s"
+JLIB_CLIENT_ERROR_JFTP_MODE_BINARY="JFTP: :_mode: Bad response. Server response: %s [Expected: 200]. Mode sent: Binary."
+JLIB_CLIENT_ERROR_JFTP_MODE_ASCII="JFTP: :_mode: Bad response. Server response: %s [Expected: 200]. Mode sent: Ascii."
+JLIB_CLIENT_ERROR_HELPER_SETCREDENTIALSFROMREQUEST_FAILED="Looks like User's credentials are no good."
+JLIB_CLIENT_ERROR_LDAP_ADDRESS_NOT_AVAILABLE="Address not available."
+
+JLIB_CMS_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank title."
+
+JLIB_DATABASE_ERROR_ADAPTER_MYSQL="The MySQL adapter 'mysql' is not available."
+JLIB_DATABASE_ERROR_ADAPTER_MYSQLI="The MySQL adapter 'mysqli' is not available."
+JLIB_DATABASE_ERROR_BIND_FAILED_INVALID_SOURCE_ARGUMENT="%s: :bind failed. Invalid source argument."
+JLIB_DATABASE_ERROR_ARTICLE_UNIQUE_ALIAS="Another article from this category has the same alias (remember it may be a trashed item)."
+JLIB_DATABASE_ERROR_CATEGORY_UNIQUE_ALIAS="Another category with the same parent category has the same alias (remember it may be a trashed item)."
+JLIB_DATABASE_ERROR_CHECK_FAILED="%s: :check Failed - %s"
+JLIB_DATABASE_ERROR_CHECKIN_FAILED="%s: :check-in failed - %s"
+JLIB_DATABASE_ERROR_CHECKOUT_FAILED="%s: :check-out failed - %s"
+JLIB_DATABASE_ERROR_CHILD_ROWS_CHECKED_OUT="Child rows checked out."
+JLIB_DATABASE_ERROR_CLASS_DOES_NOT_SUPPORT_ORDERING="%s does not support ordering."
+JLIB_DATABASE_ERROR_CLASS_IS_MISSING_FIELD="Missing field in the database: %s &#160; %s."
+JLIB_DATABASE_ERROR_CLASS_NOT_FOUND_IN_FILE="Table class %s not found in file."
+JLIB_DATABASE_ERROR_CONNECT_DATABASE="Unable to connect to the Database: %s"
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL."
+JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database."
+JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED="MySQL Database Upgrade failed. Please check the <a href="_QQ_"index.php?option=com_installer&view=database"_QQ_">Database Fixer</a>."
+JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Can't delete category."
+JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s"
+JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories can't be deleted."
+JLIB_DATABASE_ERROR_EMAIL_INUSE="This email address is already registered."
+JLIB_DATABASE_ERROR_EMPTY_ROW_RETURNED="The database row is empty."
+JLIB_DATABASE_ERROR_FUNCTION_FAILED="DB function failed with error number %s <br /><span style="_QQ_"color: red;"_QQ_">%s</span>"
+JLIB_DATABASE_ERROR_GET_NEXT_ORDER_FAILED="%s: :getNextOrder failed - %s"
+JLIB_DATABASE_ERROR_GET_TREE_FAILED="%s: :getTree Failed - %s"
+JLIB_DATABASE_ERROR_GETNODE_FAILED="%s: :_getNode Failed - %s"
+JLIB_DATABASE_ERROR_GETROOTID_FAILED="%s: :getRootId Failed - %s"
+JLIB_DATABASE_ERROR_HIT_FAILED="%s: :hit failed - %s"
+JLIB_DATABASE_ERROR_INVALID_LOCATION="%s: :setLocation - Invalid location."
+JLIB_DATABASE_ERROR_INVALID_NODE_RECURSION="%s: :move Failed - Can't move the node to be a child of itself."
+JLIB_DATABASE_ERROR_INVALID_PARENT_ID="Invalid parent ID."
+JLIB_DATABASE_ERROR_LANGUAGE_NO_TITLE="The language should have a title."
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE="A content language already exists with this Image."
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_LANG_CODE="A content language already exists with this Language Tag."
+JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_SEF="A content language already exists with this URL Language Code."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
+JLIB_DATABASE_ERROR_MENUTYPE="Some menu items or some menu modules related to this menutype are checked out by another user or the default menu item is in this menu."
+JLIB_DATABASE_ERROR_MENUTYPE_CHECKOUT="The user checking out does not match the user who checked out this menu and/or its linked menu module."
+JLIB_DATABASE_ERROR_MENUTYPE_EMPTY="Menu type empty."
+JLIB_DATABASE_ERROR_MENUTYPE_EXISTS="Menu type exists: %s"
+JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT="The Language parameter for this menu item must be set to 'All'. At least one Default menu item must have Language set to All, even if the site is multilingual."
+JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT_DEFAULT="At least one menu item has to be set as Default."
+JLIB_DATABASE_ERROR_MENU_UNPUBLISH_DEFAULT_HOME="Can't unpublish default home."
+JLIB_DATABASE_ERROR_MENU_DEFAULT_CHECKIN_USER_MISMATCH="The current home menu for this language is checked out."
+JLIB_DATABASE_ERROR_MENU_UNIQUE_ALIAS="The alias <strong>%1$s</strong> is already being used by <strong>%2$s</strong> menu item in the <strong>%3$s</strong> menu (remember it may be a trashed item)."
+JLIB_DATABASE_ERROR_MENU_UNIQUE_ALIAS_ROOT="Another menu item has the same alias in Root (remember it may be a trashed item). Root is the top level parent."
+JLIB_DATABASE_ERROR_MENU_HOME_NOT_COMPONENT="The home menu item must be a component."
+JLIB_DATABASE_ERROR_MENU_HOME_NOT_UNIQUE_IN_MENU="A menu should have only one Default home."
+JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_COMPONENT="A first level menu item alias can't be 'component'."
+JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_FOLDER="A first level menu item alias can't be '%s' because '%s' is a sub-folder of your joomla installation folder."
+JLIB_DATABASE_ERROR_MOVE_FAILED="%s: :move failed - %s"
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_CATEGORY="Category must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_EXTENSION="Extension must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MENUITEM="Menu Item must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MODULE="Module must have a title."
+JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_UPDATESITE="Update site must have a title."
+JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED="%s can't be negative."
+JLIB_DATABASE_ERROR_NO_ROWS_SELECTED="No rows selected."
+JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND="Table %s not supported. File not found."
+JLIB_DATABASE_ERROR_NULL_PRIMARY_KEY="Null primary key not allowed."
+JLIB_DATABASE_ERROR_ORDERDOWN_FAILED="%s: :orderDown Failed - %s"
+JLIB_DATABASE_ERROR_ORDERUP_FAILED="%s: :orderUp Failed - %s"
+JLIB_DATABASE_ERROR_PLEASE_ENTER_A_USER_NAME="Please enter a username."
+JLIB_DATABASE_ERROR_PLEASE_ENTER_YOUR_NAME="Please enter your name."
+JLIB_DATABASE_ERROR_PUBLISH_FAILED="%s: :publish failed - %s"
+JLIB_DATABASE_ERROR_REBUILD_FAILED="%s: :rebuild Failed - %s"
+JLIB_DATABASE_ERROR_REBUILDPATH_FAILED="%s: :rebuildPath Failed - %s"
+JLIB_DATABASE_ERROR_REORDER_FAILED="%s: :reorder failed - %s"
+JLIB_DATABASE_ERROR_REORDER_UPDATE_ROW_FAILED="%s: :reorder update the row %s failed - %s"
+JLIB_DATABASE_ERROR_ROOT_NODE_NOT_FOUND="Root node not found."
+JLIB_DATABASE_ERROR_STORE_FAILED_UPDATE_ASSET_ID="The asset_id field could not be updated."
+JLIB_DATABASE_ERROR_STORE_FAILED="%1$s: :store failed<br />%2$s"
+JLIB_DATABASE_ERROR_USERGROUP_TITLE="User group must have a title."
+JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS="User group title already exists. Title must be unique with the same parent."
+JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS="Level with the name &quot;%s&quot; already exists."
+JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE="Can't use this username."
+JLIB_DATABASE_ERROR_USERNAME_INUSE="Username in use."
+JLIB_DATABASE_ERROR_VALID_AZ09="Please enter a valid username. No space at beginning or end, at least %d characters and must <strong>not</strong> have the following characters: < > \ &quot; ' &#37; ; ( ) &."
+JLIB_DATABASE_ERROR_VALID_MAIL="Please enter a valid email address."
+JLIB_DATABASE_ERROR_VIEWLEVEL="Viewlevel must have a title."
+JLIB_DATABASE_FUNCTION_NOERROR="DB function reports no errors."
+JLIB_DATABASE_QUERY_FAILED="Database query failed (error # %s): %s"
+
+JLIB_DOCUMENT_ERROR_UNABLE_LOAD_DOC_CLASS="Unable to load document class."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Your session has expired. Please log in again."
+JLIB_ENVIRONMENT_SESSION_INVALID="Invalid session cookie. Please check that you have cookies enabled in your web browser."
+JLIB_ERROR_COMPONENTS_ACL_CONFIGURATION_FILE_MISSING_OR_IMPROPERLY_STRUCTURED="The %s component's ACL configuration file is either missing or improperly structured."
+JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError."
+JLIB_EVENT_ERROR_DISPATCHER="JEventDispatcher: :register: Event handler not recognised. Handler: %s"
+JLIB_FILESYSTEM_BZIP_NOT_SUPPORTED="BZip2 Not Supported."
+JLIB_FILESYSTEM_BZIP_UNABLE_TO_READ="Unable to read archive (bz2)."
+JLIB_FILESYSTEM_BZIP_UNABLE_TO_WRITE="Unable to write archive (bz2)."
+JLIB_FILESYSTEM_BZIP_UNABLE_TO_WRITE_FILE="Unable to write file (bz2)."
+JLIB_FILESYSTEM_GZIP_NOT_SUPPORTED="GZlib Not Supported."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_READ="Unable to read archive (gz)."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_WRITE="Unable to write archive (gz)."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_WRITE_FILE="Unable to write file (gz)."
+JLIB_FILESYSTEM_GZIP_UNABLE_TO_DECOMPRESS="Unable to decompress data."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_READ="Unable to read archive (tar)."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_DECOMPRESS="Unable to decompress data."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_CREATE_DESTINATION="Unable to create destination."
+JLIB_FILESYSTEM_TAR_UNABLE_TO_WRITE_ENTRY="Unable to write entry."
+JLIB_FILESYSTEM_ZIP_NOT_SUPPORTED="Zlib Not Supported."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_READ="Unable to read archive (zip)."
+JLIB_FILESYSTEM_ZIP_INFO_FAILED="Get ZIP Information failed."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_CREATE_DESTINATION="Unable to create destination."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_WRITE_ENTRY="Unable to write entry."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_READ_ENTRY="Unable to read entry."
+JLIB_FILESYSTEM_ZIP_UNABLE_TO_OPEN_ARCHIVE="Unable to open archive."
+JLIB_FILESYSTEM_ZIP_INVALID_ZIP_DATA="Invalid ZIP data."
+JLIB_FILESYSTEM_STREAM_FAILED="Failed to register string stream."
+JLIB_FILESYSTEM_UNKNOWNARCHIVETYPE="Unknown Archive type."
+JLIB_FILESYSTEM_UNABLE_TO_LOAD_ARCHIVE="Unable to load archive."
+JLIB_FILESYSTEM_ERROR_JFILE_FIND_COPY="JFile: :copy: Can't find or read file: %s"
+JLIB_FILESYSTEM_ERROR_JFILE_STREAMS="JFile: :copy(%1$s, %2$s): %3$s"
+JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed."
+JLIB_FILESYSTEM_ERROR_COPY_FAILED_ERR01="Copy failed: %1$s to %2$s"
+JLIB_FILESYSTEM_DELETE_FAILED="Failed deleting %s"
+JLIB_FILESYSTEM_CANNOT_FIND_SOURCE_FILE="Can't find source file."
+JLIB_FILESYSTEM_ERROR_JFILE_MOVE_STREAMS="JFile: :move: %s"
+JLIB_FILESYSTEM_ERROR_RENAME_FILE="Rename failed."
+JLIB_FILESYSTEM_ERROR_READ_UNABLE_TO_OPEN_FILE="JFile: :read: Unable to open file: %s"
+JLIB_FILESYSTEM_ERROR_WRITE_STREAMS="JFile: :write(%1$s): %2$s"
+JLIB_FILESYSTEM_ERROR_UPLOAD="JFile: :upload: %s"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR01="Warning: Failed to change file permissions!"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR02="Warning: Failed to move file!"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR03="Warning: File %s not uploaded for security reasons!"
+JLIB_FILESYSTEM_ERROR_WARNFS_ERR04="Warning: Failed to move file: %1$s to %2$s"
+JLIB_FILESYSTEM_ERROR_FIND_SOURCE_FOLDER="Can't find source folder."
+JLIB_FILESYSTEM_ERROR_FOLDER_EXISTS="Folder already exists."
+JLIB_FILESYSTEM_ERROR_FOLDER_CREATE="Unable to create target folder."
+JLIB_FILESYSTEM_ERROR_FOLDER_OPEN="Unable to open source folder."
+JLIB_FILESYSTEM_ERROR_FOLDER_LOOP="Infinite loop detected."
+JLIB_FILESYSTEM_ERROR_FOLDER_PATH="Path not in open_basedir paths."
+JLIB_FILESYSTEM_ERROR_COULD_NOT_CREATE_DIRECTORY="Could not create folder."
+JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY="You can't delete a base folder."
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :delete: Path is not a folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_FOLDER_DELETE="JFolder: :delete: Could not delete folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_FOLDER_RENAME="Rename failed: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Path is not a folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FOLDER="JFolder: :folder: Path is not a folder. Path: %s"
+JLIB_FILESYSTEM_ERROR_STREAMS_FILE_SIZE="Failed to get file size. This may not work for all streams!"
+JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN="File not open."
+JLIB_FILESYSTEM_ERROR_STREAMS_FILENAME="File name not set."
+JLIB_FILESYSTEM_ERROR_NO_DATA_WRITTEN="Warning: No data written."
+JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_WRITER="Failed to open writer: %s"
+JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_READER="Failed to open reader: %s"
+JLIB_FILESYSTEM_ERROR_STREAMS_NOT_UPLOADED_FILE="Not an uploaded file!"
+
+JLIB_FILTER_PARAMS_ALNUM="Alpha Numeric"
+JLIB_FILTER_PARAMS_FLOAT="Float"
+JLIB_FILTER_PARAMS_INTEGER="Integer"
+JLIB_FILTER_PARAMS_RAW="Raw"
+JLIB_FILTER_PARAMS_SAFEHTML="Safe HTML"
+JLIB_FILTER_PARAMS_TEL="Telephone"
+JLIB_FILTER_PARAMS_TEXT="Text"
+
+JLIB_FORM_BUTTON_CLEAR="Clear"
+JLIB_FORM_BUTTON_SELECT="Select"
+JLIB_FORM_CHANGE_IMAGE="Change Image"
+JLIB_FORM_CHANGE_IMAGE_BUTTON="Change Image Button"
+JLIB_FORM_CHANGE_USER="Select User"
+JLIB_FORM_ERROR_FIELDS_CATEGORY_ERROR_EXTENSION_EMPTY="Extension attribute is empty in the category field."
+JLIB_FORM_ERROR_FIELDS_GROUPEDLIST_ELEMENT_NAME="Unknown element type: %s"
+JLIB_FORM_ERROR_NO_DATA="No data."
+JLIB_FORM_ERROR_VALIDATE_FIELD="Invalid xml field."
+JLIB_FORM_ERROR_XML_FILE_DID_NOT_LOAD="XML file did not load."
+JLIB_FORM_FIELD_INVALID="Invalid field:&#160"
+JLIB_FORM_INPUTMODE="latin"
+JLIB_FORM_INVALID_FORM_OBJECT="Invalid Form Object: :%s"
+JLIB_FORM_INVALID_FORM_RULE="Invalid Form Rule: :%s"
+JLIB_FORM_MEDIA_PREVIEW_ALT="Selected image."
+JLIB_FORM_MEDIA_PREVIEW_EMPTY="No image selected."
+JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE="Selected image."
+JLIB_FORM_MEDIA_PREVIEW_TIP_TITLE="Preview"
+JLIB_FORM_SELECT_USER="Select a User"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
+JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s"
+JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING="Invalid URL: URL schema is missing in %1$s. Please add one of the following at the beginning: %2$s."
+JLIB_FORM_VALUE_CACHE_APC="Alternative PHP Cache"
+JLIB_FORM_VALUE_CACHE_APCU="APC User Cache"
+JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite"
+JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator"
+JLIB_FORM_VALUE_CACHE_FILE="File"
+JLIB_FORM_VALUE_CACHE_MEMCACHE="Memcache"
+JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)"
+JLIB_FORM_VALUE_CACHE_REDIS="Redis"
+JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache"
+JLIB_FORM_VALUE_CACHE_XCACHE="XCache"
+JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache"
+JLIB_FORM_VALUE_SESSION_DATABASE="Database"
+JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator"
+JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache"
+JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)"
+JLIB_FORM_VALUE_SESSION_NONE="PHP"
+JLIB_FORM_VALUE_SESSION_REDIS="Redis"
+JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache"
+JLIB_FORM_VALUE_SESSION_XCACHE="XCache"
+JLIB_FORM_VALUE_TIMEZONE_UTC="Universal Time, Coordinated (UTC)"
+JLIB_FORM_VALUE_FROM_TEMPLATE="From Template"
+JLIB_FORM_VALUE_INHERITED="Inherited"
+
+JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_ACL="ACL"
+JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_TABLE="Table"
+JLIB_HTML_ACCESS_SUMMARY_DESC_CAPTION="ACL Summary Table"
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this article. Select the tabs above to customise these settings by action."
+JLIB_HTML_ACCESS_SUMMARY="Summary."
+JLIB_HTML_ADD_TO_ROOT="Add to root."
+JLIB_HTML_ADD_TO_THIS_MENU="Add to this menu."
+JLIB_HTML_BATCH_ACCESS_LABEL="Set Access Level"
+JLIB_HTML_BATCH_ACCESS_LABEL_DESC="Not making a selection will keep the original access levels when processing."
+JLIB_HTML_BATCH_COPY="Copy"
+JLIB_HTML_BATCH_FLIPORDERING_LABEL="Reverse the ordering of all articles in the selected categories"
+JLIB_HTML_BATCH_LANGUAGE_LABEL="Set Language"
+JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC="Not making a selection will keep the original language when processing."
+JLIB_HTML_BATCH_LANGUAGE_NOCHANGE="- Keep original Language -"
+JLIB_HTML_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category."
+JLIB_HTML_BATCH_MOVE="Move"
+JLIB_HTML_BATCH_MOVE_QUESTION="Do you want to move the items or make a copy of them?"
+JLIB_HTML_BATCH_NO_CATEGORY="- Don't move or copy -"
+JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -"
+JLIB_HTML_BATCH_TAG_LABEL="Add Tag"
+JLIB_HTML_BATCH_TAG_LABEL_DESC="Add a tag to selected items."
+JLIB_HTML_BATCH_TAG_NOCHANGE="- Keep original Tags -"
+JLIB_HTML_BATCH_USER_LABEL="Set User."
+JLIB_HTML_BATCH_USER_LABEL_DESC="Not making a selection will keep the original user when processing."
+JLIB_HTML_BATCH_USER_NOCHANGE="- Keep original User -"
+JLIB_HTML_BATCH_USER_NOUSER="No User."
+JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar"
+JLIB_HTML_BEHAVIOR_CLOSE="Close"
+JLIB_HTML_BEHAVIOR_DATE_SELECTION="Date selection:\n"
+JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST="Display %s first"
+JLIB_HTML_BEHAVIOR_DRAG_TO_MOVE="Drag to move."
+JLIB_HTML_BEHAVIOR_GO_TODAY="Go to today"
+JLIB_HTML_BEHAVIOR_GREEN="Green"
+JLIB_HTML_BEHAVIOR_HOLD_MOUSE="- Hold mouse button on any of the buttons above for faster selection."
+JLIB_HTML_BEHAVIOR_MONTH_SELECT="- Use the < and > buttons to select month\n"
+JLIB_HTML_BEHAVIOR_NEXT_MONTH_HOLD_FOR_MENU="Select to move to the next month. Select and hold for a list of the months."
+JLIB_HTML_BEHAVIOR_NEXT_YEAR_HOLD_FOR_MENU="Select to move to the next year. Select and hold for a list of years."
+JLIB_HTML_BEHAVIOR_OPEN_CALENDAR="Open the calendar"
+JLIB_HTML_BEHAVIOR_PREV_MONTH_HOLD_FOR_MENU="Select to move to the previous month. Select and hold for a list of the months."
+JLIB_HTML_BEHAVIOR_PREV_YEAR_HOLD_FOR_MENU="Select to move to the previous year. Select and hold for a list of years."
+JLIB_HTML_BEHAVIOR_SELECT_DATE="Select a date."
+JLIB_HTML_BEHAVIOR_SHIFT_CLICK_OR_DRAG_TO_CHANGE_VALUE="(Shift-)Select or Drag to change the value."
+JLIB_HTML_BEHAVIOR_TIME="Time:"
+JLIB_HTML_BEHAVIOR_TODAY="Today"
+JLIB_HTML_BEHAVIOR_TT_DATE_FORMAT="%a, %b %e"
+JLIB_HTML_BEHAVIOR_WK="wk"
+JLIB_HTML_BEHAVIOR_YEAR_SELECT="- Use the « and » buttons to select year\n"
+JLIB_HTML_BUTTON_BASE_CLASS="Could not load button base class."
+JLIB_HTML_BUTTON_NO_LOAD="Could not load button %s (%s);"
+JLIB_HTML_BUTTON_NOT_DEFINED="Button not defined for type = %s"
+JLIB_HTML_CALENDAR="Calendar"
+JLIB_HTML_CHECKED_OUT="Checked out"
+JLIB_HTML_CHECKIN="Check-in"
+JLIB_HTML_CLOAKING="This email address is being protected from spambots. You need JavaScript enabled to view it."
+JLIB_HTML_DATE_RELATIVE_DAYS="%s days ago."
+JLIB_HTML_DATE_RELATIVE_DAYS_1="%s day ago."
+JLIB_HTML_DATE_RELATIVE_DAYS_0="%s days ago."
+JLIB_HTML_DATE_RELATIVE_HOURS="%s hours ago."
+JLIB_HTML_DATE_RELATIVE_HOURS_1="%s hour ago."
+JLIB_HTML_DATE_RELATIVE_HOURS_0="%s hours ago."
+JLIB_HTML_DATE_RELATIVE_LESSTHANAMINUTE="Less than a minute ago."
+JLIB_HTML_DATE_RELATIVE_MINUTES="%s minutes ago."
+JLIB_HTML_DATE_RELATIVE_MINUTES_1="%s minute ago."
+JLIB_HTML_DATE_RELATIVE_MINUTES_0="%s minutes ago."
+JLIB_HTML_DATE_RELATIVE_WEEKS="%s weeks ago."
+JLIB_HTML_DATE_RELATIVE_WEEKS_1="%s week ago."
+JLIB_HTML_DATE_RELATIVE_WEEKS_0="%s weeks ago."
+JLIB_HTML_EDIT_MENU_ITEM="Edit menu item."
+JLIB_HTML_EDIT_MENU_ITEM_ID="Item ID: %s"
+JLIB_HTML_EDIT_MODULE="Edit module"
+JLIB_HTML_EDIT_MODULE_IN_POSITION="Position: %s"
+JLIB_HTML_EDITOR_CANNOT_LOAD="Can't load the editor."
+JLIB_HTML_END="End"
+JLIB_HTML_ERROR_FUNCTION_NOT_SUPPORTED="Function not supported."
+JLIB_HTML_ERROR_NOTFOUNDINFILE="%s: :%s not found in file."
+JLIB_HTML_ERROR_NOTSUPPORTED_NOFILE="%s: :%s not supported. File not found."
+JLIB_HTML_ERROR_NOTSUPPORTED="%s: :%s not supported."
+JLIB_HTML_GOTO_PAGE="Go to page %s"
+JLIB_HTML_GOTO_POSITION="Go to %s page"
+JLIB_HTML_MOVE_DOWN="Move Down"
+JLIB_HTML_MOVE_UP="Move Up"
+JLIB_HTML_NO_PARAMETERS_FOR_THIS_ITEM="There are no parameters for this item."
+JLIB_HTML_NO_RECORDS_FOUND="No records found."
+JLIB_HTML_PAGE_CURRENT="Page %s"
+JLIB_HTML_PAGE_CURRENT_OF_TOTAL="Page %s of %s"
+JLIB_HTML_PAGINATION="Pagination"
+JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST="Please first make a selection from the list."
+JLIB_HTML_PUBLISH_ITEM="Publish Item"
+JLIB_HTML_PUBLISHED_EXPIRED_ITEM="Published, but has Expired."
+JLIB_HTML_PUBLISHED_FINISHED="Finish: %s"
+JLIB_HTML_PUBLISHED_ITEM="Published and is Current."
+JLIB_HTML_PUBLISHED_PENDING_ITEM="Published, but is Pending."
+JLIB_HTML_PUBLISHED_START="Start: %s"
+JLIB_HTML_RESULTS_OF="Results %s - %s of %s"
+JLIB_HTML_SAVE_ORDER="Save Order"
+JLIB_HTML_SELECT_STATE="Select State"
+JLIB_HTML_START="Start"
+JLIB_HTML_UNPUBLISH_ITEM="Unpublish Item"
+JLIB_HTML_VIEW_ALL="View All"
+JLIB_HTML_SETDEFAULT_ITEM="Set default"
+JLIB_HTML_UNSETDEFAULT_ITEM="Unset default"
+
+JLIB_INSTALLER_ABORT="Aborting language installation: %s"
+JLIB_INSTALLER_ABORT_ALREADYINSTALLED="Extension is already installed."
+JLIB_INSTALLER_ABORT_ALREADY_EXISTS="Extension %1$s: Extension %2$s already exists."
+JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED="Error building Administrator Menus."
+JLIB_INSTALLER_ABORT_COMP_COPY_MANIFEST="Component %1$s: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_COMP_COPY_SETUP="Component %1$s: Could not copy setup file."
+JLIB_INSTALLER_ABORT_COMP_FAIL_ADMIN_FILES="Component %s: Failed to copy administrator files."
+JLIB_INSTALLER_ABORT_COMP_FAIL_SITE_FILES="Component %s: Failed to copy site files."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_COPY_SETUP="Component Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_CUSTOM_INSTALL_FAILURE="Component Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_MANIFEST="Component Install: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_PHP_INSTALL="Component Install: Could not copy PHP install file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_PHP_UNINSTALL="Component Install: Could not copy PHP uninstall file."
+JLIB_INSTALLER_ABORT_COMP_INSTALL_ROLLBACK="Component Install: %s"
+JLIB_INSTALLER_ABORT_COMP_INSTALL_SQL_ERROR="Component Install: SQL error file %s"
+JLIB_INSTALLER_ABORT_COMP_UPDATESITEMENUS_FAILED="Component Install: Failed to update menu items."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_ADMIN_ELEMENT="Component Update: The XML file did not have an administration element."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_COPY_SETUP="Component Update: Could not copy setup file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_MANIFEST="Component Update: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_PHP_INSTALL="Component Update: Could not copy PHP install file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_PHP_UNINSTALL="Component Update: Could not copy PHP uninstall file."
+JLIB_INSTALLER_ABORT_COMP_UPDATE_ROLLBACK="Component Update: %s"
+JLIB_INSTALLER_ABORT_COMP_UPDATE_SQL_ERROR="Component Update: SQL error file %s"
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder: %2$s"
+JLIB_INSTALLER_ABORT_DEBUG="Installation unexpectedly stopped:"
+JLIB_INSTALLER_ABORT_DETECTMANIFEST="Unable to detect manifest file."
+JLIB_INSTALLER_ABORT_DIRECTORY="Extension %1$s: Another %2$s is already using the named folder: %3$s. Are you trying to install the same extension again?"
+JLIB_INSTALLER_ABORT_ERROR_DELETING_EXTENSIONS_RECORD="Could not delete the extension's record from the database."
+JLIB_INSTALLER_ABORT_EXTENSIONNOTVALID="Extension is not valid."
+JLIB_INSTALLER_ABORT_FILE_INSTALL_COPY_SETUP="Files Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_FILE_INSTALL_CUSTOM_INSTALL_FAILURE="Files Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_FILE_INSTALL_FAIL_SOURCE_DIRECTORY="Files Install: Failed to find source folder: %s"
+JLIB_INSTALLER_ABORT_FILE_INSTALL_ROLLBACK="Files Install: %s"
+JLIB_INSTALLER_ABORT_FILE_INSTALL_SQL_ERROR="Files %1$s: SQL error file %2$s"
+JLIB_INSTALLER_ABORT_FILE_ROLLBACK="Files Install: %s"
+JLIB_INSTALLER_ABORT_FILE_SAME_NAME="Files Install: Another extension with same name already exists."
+JLIB_INSTALLER_ABORT_FILE_UPDATE_SQL_ERROR="Files Update: SQL error file %s"
+JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE="Extension %s: Custom install routine failure."
+JLIB_INSTALLER_ABORT_LIB_COPY_FILES="Library %s: Could not copy files from the source."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED="Library Install: Library already installed."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_COPY_SETUP="Library Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_FAILED_TO_CREATE_DIRECTORY="Library Install: Failed to create folder: %s"
+JLIB_INSTALLER_ABORT_LIB_INSTALL_NOFILE="Library Install: No library file specified."
+JLIB_INSTALLER_ABORT_LIB_INSTALL_ROLLBACK="Library Install: %s"
+JLIB_INSTALLER_ABORT_LOAD_DETAILS="Failed to load extension details."
+JLIB_INSTALLER_ABORT_MANIFEST="Extension %1$s: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_METHODNOTSUPPORTED="Method not supported for this extension type."
+JLIB_INSTALLER_ABORT_METHODNOTSUPPORTED_TYPE="Method not supported for this extension type: %s"
+JLIB_INSTALLER_ABORT_MOD_COPY_FILES="Module %s: Could not copy files from the source."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_COPY_SETUP="Module Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_CREATE_DIRECTORY="Module %1$s: Failed to create folder: %2$s"
+JLIB_INSTALLER_ABORT_MOD_INSTALL_CUSTOM_INSTALL_FAILURE="Module Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_DIRECTORY="Module %1$s: Another module is already using folder: %2$s"
+JLIB_INSTALLER_ABORT_MOD_INSTALL_MANIFEST="Module Install: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_NOFILE="Module %s: No module file specified."
+JLIB_INSTALLER_ABORT_MOD_INSTALL_SQL_ERROR="Module %1$s: SQL error file %2$s"
+JLIB_INSTALLER_ABORT_MOD_ROLLBACK="Module %1$s: %2$s"
+JLIB_INSTALLER_ABORT_MOD_UNINSTALL_UNKNOWN_CLIENT="Module Uninstall: Unknown client type [%s]"
+JLIB_INSTALLER_ABORT_MOD_UNKNOWN_CLIENT="Module %1$s: Unknown client type [%2$s]"
+JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist."
+JLIB_INSTALLER_ABORT_NOUPDATEPATH="Update path does not exist."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_COPY_SETUP="Package Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_CREATE_DIRECTORY="Package Install: Failed to create folder: %s."
+JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_CUSTOM_INSTALL_FAILURE="Package Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_MANIFEST="Installation failed: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Package %s: There were no files to install!"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_PACK="Package %s: No package file specified."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ROLLBACK="Package Install: %s"
+JLIB_INSTALLER_ABORT_PLG_COPY_FILES="Plugin %s: Could not copy files from the source."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_ALLREADY_EXISTS="Plugin %1$s: Plugin %2$s already exists."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_COPY_SETUP="Plugin %s: Could not copy setup file."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_CREATE_DIRECTORY="Plugin %1$s: Failed to create folder: %2$s"
+JLIB_INSTALLER_ABORT_PLG_INSTALL_CUSTOM_INSTALL_FAILURE="Plugin Install: Custom install routine failure."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_DIRECTORY="Plugin %1$s: Another plugin is already using folder: %2$s"
+JLIB_INSTALLER_ABORT_PLG_INSTALL_MANIFEST="Plugin %s: Could not copy PHP manifest file."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_NO_FILE="Plugin %s: No plugin file specified."
+JLIB_INSTALLER_ABORT_PLG_INSTALL_ROLLBACK="Plugin %1$s: %2$s"
+JLIB_INSTALLER_ABORT_PLG_INSTALL_SQL_ERROR="Plugin %1$s: SQL error file %2$s"
+JLIB_INSTALLER_ABORT_PLG_UNINSTALL_SQL_ERROR="Plugin Uninstall: SQL error file %s"
+JLIB_INSTALLER_ABORT_REFRESH_MANIFEST_CACHE="Refresh Manifest Cache failed: %s Extension is not currently installed."
+JLIB_INSTALLER_ABORT_REFRESH_MANIFEST_CACHE_VALID="Refresh Manifest Cache failed: Extension is not valid."
+JLIB_INSTALLER_ABORT_ROLLBACK="Extension %1$s: %2$s"
+JLIB_INSTALLER_ABORT_SQL_ERROR="Extension %1$s: SQL error processing query: %2$s"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_ALREADY_INSTALLED="Template Install: Template already installed."
+JLIB_INSTALLER_ABORT_TPL_INSTALL_ANOTHER_TEMPLATE_USING_DIRECTORY="Template Install: There is already a Template using the named folder: %s. Are you trying to install the same template again?"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_FILES="Template Install: Could not copy files from the %s source."
+JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_SETUP="Template Install: Could not copy setup file."
+JLIB_INSTALLER_ABORT_TPL_INSTALL_FAILED_CREATE_DIRECTORY="Template Install: Failed to create folder: %s"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK="Template Install: %s"
+JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT="Template Install: Unknown client type [%s]"
+JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION="For the extension %1$s version %2$s is available, but it requires at least PHP version %3$s while your system only has %4$s"
+JLIB_INSTALLER_AVAILABLE_UPDATE_DB_MINIMUM="For the extension %1$s version %2$s is available, but your current database %3$s is version %4$s and is not supported. Please contact your web host to update your Database version to at least version %5$s."
+JLIB_INSTALLER_AVAILABLE_UPDATE_DB_TYPE="For the extension %1$s version %2$s is available, but your current database %3$s is not supported anymore."
+JLIB_INSTALLER_PURGED_UPDATES="Cleared updates"
+JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES="Failed to clear updates."
+JLIB_INSTALLER_DEFAULT_STYLE="%s - Default"
+JLIB_INSTALLER_DISCOVER="Discover"
+JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE="The %s extension is part of a package which does not allow individual extensions to be uninstalled."
+JLIB_INSTALLER_ERROR_COMP_DISCOVER_STORE_DETAILS="Component Discover install: Failed to store component details."
+JLIB_INSTALLER_ERROR_COMP_FAILED_TO_CREATE_DIRECTORY="Component %1$s: Failed to create folder: %2$s."
+JLIB_INSTALLER_ERROR_COMP_INSTALL_ADMIN_ELEMENT="Component Install: The XML file did not have an administration element."
+JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_ADMIN="Component Install: Another component is already using folder: %s"
+JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_SITE="Component Install: Another component is already using folder: %s"
+JLIB_INSTALLER_ERROR_COMP_INSTALL_FAILED_TO_CREATE_DIRECTORY_ADMIN="Component Install: Failed to create administrator folder: %s"
+JLIB_INSTALLER_ERROR_COMP_INSTALL_FAILED_TO_CREATE_DIRECTORY_SITE="Component Install: Failed to create site folder: %s"
+JLIB_INSTALLER_ERROR_COMP_REFRESH_MANIFEST_CACHE="Component Refresh manifest cache: Failed to store component details."
+JLIB_INSTALLER_ERROR_COMP_REMOVING_ADMIN_MENUS_FAILED="Could not delete the Administrator menus."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_CUSTOM="Component Uninstall: Custom Uninstall script unsuccessful."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_DELETE_CATEGORIES="Component Uninstall: Unable to delete the component categories."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_ERRORREMOVEMANUALLY="Component Uninstall: Can't uninstall. Please remove manually."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_ERRORUNKOWNEXTENSION="Component Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_ADMIN="Component Uninstall: Unable to remove the component administrator folder."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_SITE="Component Uninstall: Unable to remove the component site folder."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_NO_OPTION="Component Uninstall: Option field empty, can't remove files."
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_SQL_ERROR="Component Uninstall: SQL error file %s"
+JLIB_INSTALLER_ERROR_COMP_UNINSTALL_WARNCORECOMPONENT="Component Uninstall: Trying to uninstall a core component."
+JLIB_INSTALLER_ERROR_COMP_UPDATE_FAILED_TO_CREATE_DIRECTORY_ADMIN="Component Update: Failed to create administrator folder: %s"
+JLIB_INSTALLER_ERROR_COMP_UPDATE_FAILED_TO_CREATE_DIRECTORY_SITE="Component Update: Failed to create site folder: %s"
+JLIB_INSTALLER_ERROR_CREATE_DIRECTORY="JInstaller: :Install: Failed to create folder: %s"
+JLIB_INSTALLER_ERROR_CREATE_FOLDER_FAILED="Failed to create folder [%s]"
+JLIB_INSTALLER_ERROR_DEPRECATED_FORMAT="Deprecated install format (client="_QQ_"both"_QQ_"), use package installer in future."
+JLIB_INSTALLER_ERROR_DISCOVER_INSTALL_UNSUPPORTED="A %s extension can not be installed using the discover method. Please install this extension from Extension Manager: Install."
+JLIB_INSTALLER_ERROR_DOWNGRADE="Sorry! You cannot downgrade from version %s to %s"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connecting to the server: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FOLDER="JInstaller: :Install: Failed to copy folder %1$s to %2$s"
+JLIB_INSTALLER_ERROR_FAILED_READING_NETWORK_RESOURCES="Failed reading network resource: %s"
+JLIB_INSTALLER_ERROR_FILE_EXISTS="JInstaller: :Install: File already exists %s"
+JLIB_INSTALLER_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_MANIFEST="Files Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Files Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_ENTRY="Files Uninstall: Could not load extension entry."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_MANIFEST="Files Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_SQL_ERROR="Files Uninstall: SQL error file %s"
+JLIB_INSTALLER_ERROR_FILE_UNINSTALL_WARNCOREFILE="File Uninstall: Trying to uninstall core files."
+JLIB_INSTALLER_ERROR_FOLDER_IN_USE="Another extension is already using folder [%s]"
+JLIB_INSTALLER_ERROR_LANG_DISCOVER_STORE_DETAILS="Language Discover install: Failed to store language details."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_DEFAULT="This language can't be uninstalled as long as it is defined as a default language."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_DIRECTORY="Language Uninstall: Unable to remove the specified Language folder."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_ELEMENT_EMPTY="Language Uninstall: Element is empty, can't uninstall files."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_PATH_EMPTY="Language Uninstall: Language path is empty, can't uninstall files."
+JLIB_INSTALLER_ERROR_LANG_UNINSTALL_PROTECTED="This language can't be uninstalled. It is protected in the database (usually en-GB)."
+JLIB_INSTALLER_ERROR_LIB_DISCOVER_STORE_DETAILS="Library Discover install: Failed to store library details."
+JLIB_INSTALLER_ERROR_LIB_REFRESH_MANIFEST_CACHE="Library Refresh manifest cache: Failed to store library details."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_MANIFEST="Library Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Library Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_LOAD_MANIFEST="Library Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_LIB_UNINSTALL_WARNCORELIBRARY="Library Uninstall: Trying to uninstall a core library."
+JLIB_INSTALLER_ERROR_LOAD_XML="JInstaller: :Install: Failed to load XML File: %s"
+JLIB_INSTALLER_ERROR_MOD_DISCOVER_STORE_DETAILS="Module Discover install: Failed to store module details."
+JLIB_INSTALLER_ERROR_MOD_REFRESH_MANIFEST_CACHE="Module Refresh manifest cache: Failed to store module details."
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_ERRORUNKOWNEXTENSION="Module Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_EXCEPTION="Module Uninstall: %s"
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Module Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_SQL_ERROR="Module Uninstall: SQL error file %s"
+JLIB_INSTALLER_ERROR_MOD_UNINSTALL_WARNCOREMODULE="Module Uninstall: Trying to uninstall a core module: %s"
+JLIB_INSTALLER_ERROR_NO_CORE_LANGUAGE="No core pack exists for the language [%s]"
+JLIB_INSTALLER_ERROR_NO_FILE="JInstaller: :Install: File does not exist %s"
+JLIB_INSTALLER_ERROR_NO_LANGUAGE_TAG="The package did not specify a language tag. Are you trying to install an old language package?"
+JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE="JInstaller: :Install: Can't find Joomla XML setup file."
+JLIB_INSTALLER_ERROR_NOTFINDXMLSETUPFILE="JInstaller: :Install: Can't find XML setup file."
+JLIB_INSTALLER_ERROR_PACK_REFRESH_MANIFEST_CACHE="Package Refresh manifest cache: Failed to store package details."
+JLIB_INSTALLER_ERROR_PACK_SETTING_PACKAGE_ID="Could not record the package ID for this package's extensions."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_MANIFEST="Package Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Package Uninstall: Manifest file invalid or not found: %s"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_LOAD_MANIFEST="Package Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Errors were detected, manifest file not removed!"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstall properly: %s"
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
+JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."
+JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE="Plugin Refresh manifest cache: Failed to store plugin details."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_ERRORUNKOWNEXTENSION="Plugin Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_FOLDER_FIELD_EMPTY="Plugin Uninstall: Folder field empty, can't remove files."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_INVALID_MANIFEST="Plugin Uninstall: Invalid manifest file."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Plugin Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_LOAD_MANIFEST="Plugin Uninstall: Could not load manifest file."
+JLIB_INSTALLER_ERROR_PLG_UNINSTALL_WARNCOREPLUGIN="Plugin Uninstall: Trying to uninstall a core plugin: %s"
+JLIB_INSTALLER_ERROR_SQL_ERROR="JInstaller: :Install: Error SQL %s"
+JLIB_INSTALLER_ERROR_SQL_FILENOTFOUND="JInstaller: :Install: SQL File not found %s"
+JLIB_INSTALLER_ERROR_SQL_READBUFFER="JInstaller: :Install: SQL File Buffer Read Error."
+JLIB_INSTALLER_ERROR_TPL_DISCOVER_STORE_DETAILS="Template Discover install: Failed to store template details."
+JLIB_INSTALLER_ERROR_TPL_REFRESH_MANIFEST_CACHE="Template Refresh manifest cache: Failed to store template details."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_ERRORUNKOWNEXTENSION="Template Uninstall: Unknown Extension."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_INVALID_CLIENT="Template Uninstall: Invalid client."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Template Uninstall: Manifest file invalid or not found."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DEFAULT="Template Uninstall: Can't remove default template."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DIRECTORY="Template Uninstall: Folder does not exist, can't remove files."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_ID_EMPTY="Template Uninstall: Template ID is empty, can't uninstall files."
+JLIB_INSTALLER_ERROR_TPL_UNINSTALL_WARNCORETEMPLATE="Template Uninstall: Trying to uninstall a core template: %s"
+JLIB_INSTALLER_ERROR_UNKNOWN_CLIENT_TYPE="Unknown Client Type [%s]"
+JLIB_INSTALLER_FILE_ERROR_MOVE="Error on moving file %s"
+JLIB_INSTALLER_INCORRECT_SEQUENCE="Downgrading from version %1$s to version %2$s is not allowed."
+JLIB_INSTALLER_INSTALL="Install"
+JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum Joomla version requirement of J%s"
+JLIB_INSTALLER_MINIMUM_PHP="Your server doesn't meet the minimum PHP version requirement of %s"
+JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users."
+JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for %d user."
+JLIB_INSTALLER_UNINSTALL="Uninstall"
+JLIB_INSTALLER_UPDATE="Update"
+JLIB_INSTALLER_ERROR_EXTENSION_INVALID_CLIENT_IDENTIFIER="Invalid client identifier specified in extension manifest."
+JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
+JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed."
+JLIB_INSTALLER_UPDATE_LOG_QUERY="Ran query from file %1$s. Query text: %2$s."
+JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Unable to create a content language for %s language: %s"
+
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
+JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %s status code."
+JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br/><code style="_QQ_"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
+
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE="Could not load %s language XML file from %s."
+JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA="Could not load %s metadata from %s."
+
+JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail can't be sent."
+JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
+JLIB_MAIL_INVALID_EMAIL_SENDER="JMail: : Invalid email Sender: %s, JMail: :setSender(%s)."
+
+JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
+JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
+JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
+JLIB_MEDIA_ERROR_WARNFILETYPE="This file type is not supported."
+JLIB_MEDIA_ERROR_WARNIEXSS="Possible IE XSS Attack found."
+JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image."
+JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
+JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
+JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
+
+JLIB_MENUS_PRESET_JOOMLA="Preset - Joomla"
+JLIB_MENUS_PRESET_MODERN="Preset - Modern"
+
+JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
+
+JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
+JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class."
+
+JLIB_RULES_ACTION="Action"
+JLIB_RULES_ALLOWED="Allowed"
+JLIB_RULES_ALLOWED_ADMIN="Allowed (Super User)"
+JLIB_RULES_ALLOWED_INHERITED="Allowed (Inherited)"
+JLIB_RULES_CALCULATED_SETTING="Calculated Setting"
+JLIB_RULES_CONFLICT="Conflict"
+JLIB_RULES_DATABASE_FAILURE="Failed storing the data to the database."
+JLIB_RULES_DENIED="Denied"
+JLIB_RULES_GROUP="%s"
+JLIB_RULES_GROUPS="Groups"
+JLIB_RULES_INHERIT="Inherit"
+JLIB_RULES_INHERITED="Inherited"
+JLIB_RULES_NOT_ALLOWED="Not Allowed"
+JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT="Conflict"
+JLIB_RULES_NOT_ALLOWED_DEFAULT="Not Allowed (Default)"
+JLIB_RULES_NOT_ALLOWED_INHERITED="Not Allowed (Inherited)"
+JLIB_RULES_NOT_ALLOWED_LOCKED="Not Allowed (Locked)"
+JLIB_RULES_NOT_SET="Not Set"
+JLIB_RULES_NOTICE_RECALCULATE_GROUP_PERMISSIONS="Super User permissions changed. Save or reload to recalculate this group permissions."
+JLIB_RULES_NOTICE_RECALCULATE_GROUP_CHILDS_PERMISSIONS="Permissions changed in a group with child groups. Save or reload to recalculate the child groups permissions."
+JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server."
+JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions."
+JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group."
+JLIB_RULES_SELECT_SETTING="Select New Setting"
+JLIB_RULES_SETTING_NOTES="If you change the setting, it will apply to this and all child groups, components and content. Note that <em><strong>Denied</strong></em> will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, <em><strong>Deny</strong></em> will take precedence. <em><strong>Not Set</strong></em> is equivalent to <em><strong>Denied</strong></em> but can be changed in child groups, components and content."
+JLIB_RULES_SETTING_NOTES_ITEM="If you change the setting, it will apply to this item. Note that:<br /><em><strong>Inherited</strong></em> means that the permissions from global configuration, parent group and category will be used.<br /><em><strong>Denied</strong></em> means that no matter what the global configuration, parent group or category settings are, the group being edited can't take this action on this item.<br /><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action for this item (but if this is in conflict with the global configuration, parent group or category it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Inherited)</strong></em> under Calculated Settings)."
+JLIB_RULES_SETTINGS_DESC="Manage the permission settings for the user groups below. See notes at the bottom."
+
+JLIB_STEMMER_INVALID_STEMMER="Invalid stemmer type %s"
+
+JLIB_UNKNOWN="Unknown"
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="The PHP allow_url_fopen setting is disabled. This setting must be enabled for the updater to work."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Could not open %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: Could not parse %s"
+JLIB_UPDATER_ERROR_EXTENSION_OPEN_URL="Update: :Extension: Could not open %s"
+JLIB_UPDATER_ERROR_EXTENSION_PARSE_URL="Update: :Extension: Could not parse %s"
+JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: Could not open update site #%d &quot;%s&quot;, URL: %s"
+JLIB_USER_ERROR_AUTHENTICATION_FAILED_LOAD_PLUGIN="JAuthentication: :authenticate: Failed to load plugin: %s"
+JLIB_USER_ERROR_AUTHENTICATION_LIBRARIES="JAuthentication: :__construct: Could not load authentication libraries."
+JLIB_USER_ERROR_BIND_ARRAY="Unable to bind array to user object."
+JLIB_USER_ERROR_CANNOT_CHANGE_SUPER_USER="A user is not allowed to change permissions of a Super User group."
+JLIB_USER_ERROR_CANNOT_CHANGE_OWN_GROUPS="A user is not allowed to change permissions of their own group(s)."
+JLIB_USER_ERROR_CANNOT_CHANGE_OWN_PARENT_GROUPS="A user is not allowed to change permissions of their own group(s) parent group(s)."
+JLIB_USER_ERROR_CANNOT_DEMOTE_SELF="You can't remove your own Super User permissions."
+JLIB_USER_ERROR_CANNOT_REUSE_PASSWORD="You can't reuse your current password, please enter a new password."
+JLIB_USER_ERROR_ID_NOT_EXISTS="JUser: :_load: User %s does not exist."
+JLIB_USER_ERROR_NOT_SUPERADMIN="Only users with Super User permissions can change other Super User user accounts."
+JLIB_USER_ERROR_PASSWORD_NOT_MATCH="Passwords do not match. Please re-enter password."
+JLIB_USER_ERROR_UNABLE_TO_FIND_USER="Unable to find a user with given activation string."
+JLIB_USER_ERROR_UNABLE_TO_LOAD_USER="JUser: :_load: Unable to load user with ID: %s"
+JLIB_USER_EXCEPTION_ACCESS_USERGROUP_INVALID="User group does not exist."
+JLIB_UTIL_ERROR_APP_INSTANTIATION="Application Startup Error."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database <br />joomla.library: %1$s - %2$s"
+JLIB_UTIL_ERROR_DOMIT="DommitDocument is deprecated. Use DomDocument instead."
+JLIB_UTIL_ERROR_LOADING_FEED_DATA="Error loading feed data."
+JLIB_UTIL_ERROR_XML_LOAD="Failed loading XML file."
diff --git a/core/language/en-GB/en-GB.lib_joomla.sys.ini b/core/language/en-GB/en-GB.lib_joomla.sys.ini
new file mode 100644
index 00000000..3d7e4b36
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_joomla.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+LIB_JOOMLA="Joomla! Platform"
+LIB_JOOMLA_XML_DESCRIPTION="The Joomla! Platform is the Core of the Joomla! Content Management System."
+
diff --git a/core/language/en-GB/en-GB.lib_phpass.sys.ini b/core/language/en-GB/en-GB.lib_phpass.sys.ini
new file mode 100644
index 00000000..bdf731fd
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_phpass.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+LIB_PHPASS="phpass"
+LIB_PHPASS_XML_DESCRIPTION="phpass is a portable password hashing framework for use in PHP applications. The preferred (most secure) hashing method supported by phpass is the OpenBSD-style bcrypt (known in PHP as CRYPT_BLOWFISH), with a fallback to BSDI-style extended DES-based hashes (known in PHP as CRYPT_EXT_DES) and a last resort fallback to an MD5-based variable iteration count password hashing method implemented in phpass itself."
diff --git a/core/language/en-GB/en-GB.lib_phputf8.sys.ini b/core/language/en-GB/en-GB.lib_phputf8.sys.ini
new file mode 100644
index 00000000..dab39643
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_phputf8.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+LIB_PHPUTF8="phputf8"
+LIB_PHPUTF8_XML_DESCRIPTION="Classes for UTF-8."
+
diff --git a/core/language/en-GB/en-GB.lib_simplepie.sys.ini b/core/language/en-GB/en-GB.lib_simplepie.sys.ini
new file mode 100644
index 00000000..fc43f3e2
--- /dev/null
+++ b/core/language/en-GB/en-GB.lib_simplepie.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+LIB_SIMPLEPIE_XML_DESCRIPTION="PHP based RSS and Atom Feed Framework."
+
diff --git a/core/language/en-GB/en-GB.localise.php b/core/language/en-GB/en-GB.localise.php
new file mode 100644
index 00000000..db62e563
--- /dev/null
+++ b/core/language/en-GB/en-GB.localise.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package    Joomla.Language
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * en-GB localise class.
+ *
+ * @since  1.6
+ */
+abstract class En_GBLocalise
+{
+	/**
+	 * Returns the potential suffixes for a specific number of items
+	 *
+	 * @param   integer  $count  The number of items.
+	 *
+	 * @return  array  An array of potential suffixes.
+	 *
+	 * @since   1.6
+	 */
+	public static function getPluralSuffixes($count)
+	{
+		if ($count == 0)
+		{
+			return array('0');
+		}
+		elseif ($count == 1)
+		{
+			return array('1');
+		}
+		else
+		{
+			return array('MORE');
+		}
+	}
+
+	/**
+	 * Returns the ignored search words
+	 *
+	 * @return  array  An array of ignored search words.
+	 *
+	 * @since   1.6
+	 */
+	public static function getIgnoredSearchWords()
+	{
+		return array('and', 'in', 'on');
+	}
+
+	/**
+	 * Returns the lower length limit of search words
+	 *
+	 * @return  integer  The lower length limit of search words.
+	 *
+	 * @since   1.6
+	 */
+	public static function getLowerLimitSearchWord()
+	{
+		return 3;
+	}
+
+	/**
+	 * Returns the upper length limit of search words
+	 *
+	 * @return  integer  The upper length limit of search words.
+	 *
+	 * @since   1.6
+	 */
+	public static function getUpperLimitSearchWord()
+	{
+		return 20;
+	}
+
+	/**
+	 * Returns the number of chars to display when searching
+	 *
+	 * @return  integer  The number of chars to display when searching.
+	 *
+	 * @since   1.6
+	 */
+	public static function getSearchDisplayedCharactersNumber()
+	{
+		return 200;
+	}
+}
diff --git a/core/language/en-GB/en-GB.mod_articles_archive.ini b/core/language/en-GB/en-GB.mod_articles_archive.ini
new file mode 100644
index 00000000..18f22eaf
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_archive.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_ARCHIVE="Articles - Archived"
+MOD_ARTICLES_ARCHIVE_FIELD_COUNT_LABEL="# of Months"
+MOD_ARTICLES_ARCHIVE_FIELD_COUNT_DESC="The number of months to display (the default is 10)."
+MOD_ARTICLES_ARCHIVE_XML_DESCRIPTION="This module shows a list of the calendar months with archived articles. After you have changed the status of an article to archived, this list will be automatically generated."
+MOD_ARTICLES_ARCHIVE_DATE="%1$s, %2$s"
+
diff --git a/core/language/en-GB/en-GB.mod_articles_archive.sys.ini b/core/language/en-GB/en-GB.mod_articles_archive.sys.ini
new file mode 100644
index 00000000..08b9c233
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_archive.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_ARCHIVE="Articles - Archived"
+MOD_ARTICLES_ARCHIVE_XML_DESCRIPTION="This module shows a list of the calendar months with Archived Articles. After you have changed the status of an Article to Archived, this list will be automatically generated."
+MOD_ARTICLES_ARCHIVE_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_articles_categories.ini b/core/language/en-GB/en-GB.mod_articles_categories.ini
new file mode 100644
index 00000000..4c5074c8
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_categories.ini
@@ -0,0 +1,21 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_CATEGORIES="Articles - Categories"
+MOD_ARTICLES_CATEGORIES_FIELD_COUNT_DESC="Select the number of first level subcategories to display. Default is all."
+MOD_ARTICLES_CATEGORIES_FIELD_COUNT_LABEL="# First Subcategories"
+MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_DESC="Select the maximum level depth for each subcategory. Default is all."
+MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_LABEL="Maximum Level Depth"
+MOD_ARTICLES_CATEGORIES_FIELD_PARENT_DESC="Choose a parent category."
+MOD_ARTICLES_CATEGORIES_FIELD_PARENT_LABEL="Parent Category"
+MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_DESC="Show or hide subcategories."
+MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_LABEL="Show Subcategories"
+MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_DESC="Show or hide number of articles."
+MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_LABEL="Show Number of Articles"
+MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_DESC="Show or hide category descriptions."
+MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_LABEL="Category Descriptions"
+MOD_ARTICLES_CATEGORIES_XML_DESCRIPTION="This module displays a list of categories from one parent category."
+MOD_ARTICLES_CATEGORIES_TITLE_HEADING_LABEL="Heading Style"
+MOD_ARTICLES_CATEGORIES_TITLE_HEADING_DESC="Set the heading style to use."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_articles_categories.sys.ini b/core/language/en-GB/en-GB.mod_articles_categories.sys.ini
new file mode 100644
index 00000000..bd7f4d69
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_categories.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_CATEGORIES="Articles - Categories"
+MOD_ARTICLES_CATEGORIES_XML_DESCRIPTION="This module displays a list of categories from one parent category."
+MOD_ARTICLES_CATEGORIES_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_articles_category.ini b/core/language/en-GB/en-GB.mod_articles_category.ini
new file mode 100644
index 00000000..018eb4e2
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_category.ini
@@ -0,0 +1,101 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_CATEGORY="Articles - Category"
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_DESC="Select how you would like the articles to be grouped."
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_LABEL="Article Grouping"
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_DESC="Select the direction you would like the Article Groupings to be ordered by."
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_LABEL="Grouping Direction"
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_DESC="Select which field you would like Articles to be ordered by. Featured Ordering should only be used when Filtering Option for Featured Articles is set to 'Only'."
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_LABEL="Article Field to Order By"
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_DESC="Select the direction you would like Articles to be ordered by."
+MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_LABEL="Ordering Direction"
+MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_DESC="Select one or more authors from the list below."
+MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_LABEL="Authors"
+MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_DESC="Select one or more author aliases from the list below."
+MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_LABEL="Author Aliases"
+MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_DESC="Select Inclusive to Include the Selected Author Aliases, Exclusive to Exclude the Selected Author Aliases."
+MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_LABEL="Author Alias Filtering Type"
+MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_DESC="Select Inclusive to Include the Selected Authors, Exclusive to Exclude the Selected Authors."
+MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_LABEL="Author Filtering Type"
+MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_DESC="The number of child category levels to return."
+MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_LABEL="Category Depth"
+MOD_ARTICLES_CATEGORY_FIELD_CATEGORY_DESC="Please select one or more categories."
+MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_DESC="Select Inclusive to Include the Selected Categories, Exclusive to Exclude the Selected Categories."
+MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_LABEL="Category Filtering Type"
+MOD_ARTICLES_CATEGORY_FIELD_COUNT_DESC="The number of items to display. The default value of 0 will display all articles."
+MOD_ARTICLES_CATEGORY_FIELD_COUNT_LABEL="Count"
+MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_DESC="Select which date field you want the date range to be applied to."
+MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_LABEL="Date Range Field"
+MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC="Select which date field you want to display."
+MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL="Date Field"
+MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC="Please enter in a valid date format. See: http://php.net/date for formatting information."
+MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL="Date Format"
+MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_DESC="Select Date Filtering Type."
+MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_LABEL="Date Filtering"
+MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_DESC="Please enter an End Date."
+MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_LABEL="To Date"
+MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_DESC="Please enter each Article ID on a new line."
+MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_LABEL="Article IDs to Exclude"
+MOD_ARTICLES_CATEGORY_FIELD_GROUP_DISPLAY_LABEL="Display Options"
+; The following string is deprecated and will be removed with 4.0
+MOD_ARTICLES_CATEGORY_FIELD_GROUP_DYNAMIC_LABEL="Dynamic Mode Options"
+MOD_ARTICLES_CATEGORY_FIELD_GROUP_FILTERING_LABEL="Filtering Options"
+MOD_ARTICLES_CATEGORY_FIELD_GROUP_GROUPING_LABEL="Grouping Options"
+MOD_ARTICLES_CATEGORY_FIELD_GROUP_ORDERING_LABEL="Ordering Options"
+MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_DESC="Please enter in a numeric character limit value. The introtext will be trimmed to the number of characters you enter."
+MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL="Introtext Limit"
+MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_LABEL="Linked Titles"
+MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC="Linked titles."
+MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC="Please select the mode you would like to use. If Normal Mode is chosen, then configure the module and it will display a static list of Articles on the menu items you assign the module to. If Dynamic Mode is chosen, then you can still configure the module normally, however now the Category option will no longer be used. Instead, the module will dynamically detect if you are on a Category view and will display the list of articles within that Category. When Dynamic Mode is chosen, it is best to leave the module set to display on all pages, as it will decide to display anything dynamically."
+MOD_ARTICLES_CATEGORY_FIELD_MODE_LABEL="Mode"
+MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_DESC="Please enter in a valid date format. See: http://php.net/date for formatting information."
+MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_LABEL="Month and Year Display Format"
+MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_DESC="Please enter a numeric value. Results will be retrieved relative to the current date and the value you enter."
+MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_LABEL="Relative Date"
+MOD_ARTICLES_CATEGORY_FIELD_SHOWAUTHOR_DESC="Select Show if you would like the author (or author alias instead, if available) to be displayed."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWCATEGORY_DESC="Select Show if you would like the category name displayed."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_DESC="Include or Exclude Articles from Child Categories."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_LABEL="Child Category Articles"
+MOD_ARTICLES_CATEGORY_FIELD_SHOWDATE_DESC="Select Show if you would like the date displayed."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_DESC="Select to Show, Hide, or Only display Featured Articles."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_LABEL="Featured Articles"
+MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_DESC="Select Show if you would like the hits for each article to be displayed."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_LABEL="Hits"
+MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_DESC="Select Show if you would like the introtext to be displayed."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_LABEL="Introtext"
+MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_DESC="Select to Show or hide Article List from Article Pages. This means that the module will only display itself dynamically on Category Pages."
+MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_LABEL="Show on Article Page"
+MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_DESC="Please enter a Starting Date."
+MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_LABEL="Start Date Range"
+MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE="Ascending"
+MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE="Created Date"
+MOD_ARTICLES_CATEGORY_OPTION_DATERANGE_VALUE="Date Range"
+MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE="Descending"
+MOD_ARTICLES_CATEGORY_OPTION_DYNAMIC_VALUE="Dynamic"
+MOD_ARTICLES_CATEGORY_OPTION_EXCLUDE_VALUE="Exclude"
+MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE="Exclusive"
+MOD_ARTICLES_CATEGORY_OPTION_HITS_VALUE="Hits"
+MOD_ARTICLES_CATEGORY_OPTION_ID_VALUE="ID"
+MOD_ARTICLES_CATEGORY_OPTION_INCLUDE_VALUE="Include"
+MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE="Inclusive"
+MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE="Modified Date"
+MOD_ARTICLES_CATEGORY_OPTION_MONTHYEAR_VALUE="Month and Year"
+MOD_ARTICLES_CATEGORY_OPTION_NORMAL_VALUE="Normal"
+MOD_ARTICLES_CATEGORY_OPTION_OFF_VALUE="Off"
+MOD_ARTICLES_CATEGORY_OPTION_ONLYFEATURED_VALUE="Only"
+MOD_ARTICLES_CATEGORY_OPTION_ORDERING_VALUE="Article Order"
+MOD_ARTICLES_CATEGORY_OPTION_ORDERINGFEATURED_VALUE="Featured Articles Order"
+MOD_ARTICLES_CATEGORY_OPTION_RANDOM_VALUE="Random"
+MOD_ARTICLES_CATEGORY_OPTION_RATING_VALUE="Rating"
+MOD_ARTICLES_CATEGORY_OPTION_RELATIVEDAY_VALUE="Relative Date"
+MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE="Start Publishing Date"
+MOD_ARTICLES_CATEGORY_OPTION_FINISHPUBLISHING_VALUE="Finish Publishing Date"
+MOD_ARTICLES_CATEGORY_OPTION_VOTE_VALUE="Vote"
+MOD_ARTICLES_CATEGORY_OPTION_YEAR_VALUE="Year"
+MOD_ARTICLES_CATEGORY_READ_MORE="Read more: "
+MOD_ARTICLES_CATEGORY_READ_MORE_TITLE="Read More ..."
+MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE="Register to read more"
+MOD_ARTICLES_CATEGORY_XML_DESCRIPTION="This module displays a list of articles from one or more categories."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_articles_category.sys.ini b/core/language/en-GB/en-GB.mod_articles_category.sys.ini
new file mode 100644
index 00000000..76eafefd
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_category.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_CATEGORY="Articles - Category"
+MOD_ARTICLES_CATEGORY_XML_DESCRIPTION="This module displays a list of articles from one or more categories."
+MOD_ARTICLES_CATEGORY_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_articles_latest.ini b/core/language/en-GB/en-GB.mod_articles_latest.ini
new file mode 100644
index 00000000..c38b97e5
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_latest.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_LATEST="Articles - Latest"
+MOD_LATEST_NEWS_FIELD_CATEGORY_DESC="Selects Articles from one or more Categories. If no selection will show all categories as default."
+MOD_LATEST_NEWS_FIELD_COUNT_DESC="The number of Articles to display (the default is 5)."
+MOD_LATEST_NEWS_FIELD_COUNT_LABEL="Count"
+MOD_LATEST_NEWS_FIELD_FEATURED_DESC="Show or hide articles marked as featured."
+MOD_LATEST_NEWS_FIELD_FEATURED_LABEL="Featured Articles"
+MOD_LATEST_NEWS_FIELD_ORDERING_DESC="Recently Added First: order the articles using their creation date<br />Recently Modified First: order the articles using their modification date<br />Recently Published First: order the articles using their publication date.<br />Recently Touched First: order the articles using their modification or creation dates."
+MOD_LATEST_NEWS_FIELD_ORDERING_LABEL="Order"
+MOD_LATEST_NEWS_FIELD_USER_DESC="Filter by author."
+MOD_LATEST_NEWS_FIELD_USER_LABEL="Authors"
+MOD_LATEST_NEWS_VALUE_ADDED_BY_ME="Added or modified by me"
+MOD_LATEST_NEWS_VALUE_ANYONE="Anyone"
+MOD_LATEST_NEWS_VALUE_NOTADDED_BY_ME="Not added or modified by me"
+MOD_LATEST_NEWS_VALUE_ONLY_SHOW_FEATURED="Only show Featured Articles"
+MOD_LATEST_NEWS_VALUE_RECENT_ADDED="Recently Added First"
+MOD_LATEST_NEWS_VALUE_RECENT_MODIFIED="Recently Modified First"
+MOD_LATEST_NEWS_VALUE_RECENT_RAND="Random Articles"
+MOD_LATEST_NEWS_VALUE_RECENT_PUBLISHED="Recently Published First"
+MOD_LATEST_NEWS_VALUE_RECENT_TOUCHED="Recently Touched First"
+MOD_LATEST_NEWS_XML_DESCRIPTION="This module shows a list of the most recently published and current Articles."
diff --git a/core/language/en-GB/en-GB.mod_articles_latest.sys.ini b/core/language/en-GB/en-GB.mod_articles_latest.sys.ini
new file mode 100644
index 00000000..720ec645
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_latest.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_LATEST="Articles - Latest"
+MOD_LATEST_NEWS_XML_DESCRIPTION="This module shows a list of the most recently published and current Articles."
+MOD_ARTICLES_LATEST_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_articles_news.ini b/core/language/en-GB/en-GB.mod_articles_news.ini
new file mode 100644
index 00000000..5c311cb9
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_news.ini
@@ -0,0 +1,38 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_NEWS="Articles - Newsflash"
+MOD_ARTICLES_NEWS_FIELD_FEATURED_DESC="Show or hide articles marked as featured."
+MOD_ARTICLES_NEWS_FIELD_FEATURED_LABEL="Featured Articles"
+MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC="Select Articles from a specific Category or a set of Categories. If no selection will show all categories as default."
+MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC="Display Article images."
+MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL="Show Images"
+MOD_ARTICLES_NEWS_FIELD_ITEMS_DESC="The number of Articles to display within this module."
+MOD_ARTICLES_NEWS_FIELD_ITEMS_LABEL="Number of Articles"
+MOD_ARTICLES_NEWS_FIELD_LINKTITLE_DESC="Link the Article titles to Articles."
+MOD_ARTICLES_NEWS_FIELD_LINKTITLE_LABEL="Linked Titles"
+MOD_ARTICLES_NEWS_FIELD_ORDERING_DESC="Select the order in which you want query results presented."
+MOD_ARTICLES_NEWS_FIELD_ORDERING_LABEL="Order Results"
+MOD_ARTICLES_NEWS_FIELD_ORDERING_CREATED_DATE="Created Date"
+MOD_ARTICLES_NEWS_FIELD_ORDERING_MODIFIED_DATE="Modified Date"
+MOD_ARTICLES_NEWS_FIELD_ORDERING_PUBLISHED_DATE="Published Date"
+MOD_ARTICLES_NEWS_FIELD_ORDERING_ORDERING="Ordering"
+MOD_ARTICLES_NEWS_FIELD_ORDERING_RANDOM="Random"
+MOD_ARTICLES_NEWS_FIELD_READMORE_DESC="If set to Show, the 'Read more ...' link will show if Main text has been provided for an Article."
+MOD_ARTICLES_NEWS_FIELD_READMORE_LABEL="'Read more ...' Link"
+MOD_ARTICLES_NEWS_FIELD_SEPARATOR_DESC="Show separator after last Article."
+MOD_ARTICLES_NEWS_FIELD_SEPARATOR_LABEL="Show Last Separator"
+MOD_ARTICLES_NEWS_FIELD_TITLE_DESC="Show or hide the Article title."
+MOD_ARTICLES_NEWS_FIELD_TITLE_LABEL="Show Article Title"
+MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_DESC="Triggers additional plugin events to display additional content like custom fields or voting information."
+MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_LABEL="Trigger Plugin Events"
+MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_DESC="Show or hide the article intro text."
+MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_LABEL="Show Intro Text"
+MOD_ARTICLES_NEWS_READMORE="Read more ..."
+MOD_ARTICLES_NEWS_READMORE_REGISTER="Register to Read More"
+MOD_ARTICLES_NEWS_TITLE_HEADING="Header Level"
+MOD_ARTICLES_NEWS_TITLE_HEADING_DESCRIPTION="Select the desired HTML header level for the Article titles."
+MOD_ARTICLES_NEWS_VALUE_ONLY_SHOW_FEATURED="Only show Featured Articles"
+MOD_ARTICLES_NEWS_XML_DESCRIPTION="The Article Newsflash Module will display a fixed number of Articles from a specific Category or a set of Categories."
diff --git a/core/language/en-GB/en-GB.mod_articles_news.sys.ini b/core/language/en-GB/en-GB.mod_articles_news.sys.ini
new file mode 100644
index 00000000..a45c494a
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_news.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_NEWS="Articles - Newsflash"
+MOD_ARTICLES_NEWS_XML_DESCRIPTION="The Newsflash Module will display a fixed number of articles from a specific category."
+MOD_ARTICLES_NEWS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_articles_popular.ini b/core/language/en-GB/en-GB.mod_articles_popular.ini
new file mode 100644
index 00000000..8e6e02c5
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_popular.ini
@@ -0,0 +1,28 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_POPULAR="Articles - Most Read"
+MOD_POPULAR_FIELD_CATEGORY_DESC="Select Articles from a specific Category or a set of Categories. If no selection will show all categories as default."
+MOD_POPULAR_FIELD_COUNT_DESC="The number of Articles to display (the default is 5)."
+MOD_POPULAR_FIELD_COUNT_LABEL="Count"
+MOD_POPULAR_FIELD_FEATURED_DESC="Show or hide Articles marked as Featured."
+MOD_POPULAR_FIELD_FEATURED_LABEL="Featured Articles"
+MOD_POPULAR_XML_DESCRIPTION="This module shows a list of the published Articles which have the highest number of page views."
+MOD_POPULAR_FIELD_DATEFIELD_DESC="Select which date field you want the date filter to be applied to."
+MOD_POPULAR_FIELD_DATEFIELD_LABEL="Date Field"
+MOD_POPULAR_FIELD_DATEFILTERING_DESC="Select Date Filtering Type."
+MOD_POPULAR_FIELD_DATEFILTERING_LABEL="Date Filtering"
+MOD_POPULAR_FIELD_ENDDATE_DESC="If Date Range is selected above, please enter an End Date."
+MOD_POPULAR_FIELD_ENDDATE_LABEL="End Date"
+MOD_POPULAR_FIELD_STARTDATE_DESC="If Date Range is selected above, please enter a Starting Date."
+MOD_POPULAR_FIELD_STARTDATE_LABEL="Start Date Range"
+MOD_POPULAR_FIELD_RELATIVEDATE_DESC="If Relative Date is selected above, please enter a numeric day value. Results will be retrieved relative to the current date and the value you enter."
+MOD_POPULAR_FIELD_RELATIVEDATE_LABEL="Relative Date"
+MOD_POPULAR_OPTION_CREATED_VALUE="Created Date"
+MOD_POPULAR_OPTION_DATERANGE_VALUE="Date Range"
+MOD_POPULAR_OPTION_MODIFIED_VALUE="Modified Date"
+MOD_POPULAR_OPTION_OFF_VALUE="Off"
+MOD_POPULAR_OPTION_RELATIVEDAY_VALUE="Relative Date"
+MOD_POPULAR_OPTION_STARTPUBLISHING_VALUE="Start Publishing Date"
diff --git a/core/language/en-GB/en-GB.mod_articles_popular.sys.ini b/core/language/en-GB/en-GB.mod_articles_popular.sys.ini
new file mode 100644
index 00000000..29a69288
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_articles_popular.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_ARTICLES_POPULAR="Articles - Most Read"
+MOD_POPULAR_XML_DESCRIPTION="This module shows a list of the published Articles which have the highest number of page views."
+MOD_ARTICLES_POPULAR_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_banners.ini b/core/language/en-GB/en-GB.mod_banners.ini
new file mode 100644
index 00000000..cede78b9
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_banners.ini
@@ -0,0 +1,28 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_BANNERS_NO_CLIENT="- No client -"
+MOD_BANNERS="Banners"
+MOD_BANNERS_BANNER="Banner"
+MOD_BANNERS_FIELD_BANNERCLIENT_DESC="Select banners only from a single client."
+MOD_BANNERS_FIELD_BANNERCLIENT_LABEL="Client"
+MOD_BANNERS_FIELD_CACHETIME_DESC="The time before the module is recached."
+MOD_BANNERS_FIELD_CACHETIME_LABEL="Cache Time"
+MOD_BANNERS_FIELD_CATEGORY_DESC="Select banners from a specific Category or a set of Categories. If no selection then it will show all categories as default."
+MOD_BANNERS_FIELD_COUNT_DESC="The number of banners to display (default 5)."
+MOD_BANNERS_FIELD_COUNT_LABEL="Count"
+MOD_BANNERS_FIELD_FOOTER_DESC="Text or HTML to display after the group of banners."
+MOD_BANNERS_FIELD_FOOTER_LABEL="Footer Text"
+MOD_BANNERS_FIELD_HEADER_DESC="Text or HTML to display before the group of banners."
+MOD_BANNERS_FIELD_HEADER_LABEL="Header Text"
+MOD_BANNERS_FIELD_RANDOMISE_DESC="Randomise the ordering of the banners."
+MOD_BANNERS_FIELD_RANDOMISE_LABEL="Randomise"
+MOD_BANNERS_FIELD_TAG_DESC="Banner is selected by matching the banner tags to the current document meta keywords."
+MOD_BANNERS_FIELD_TAG_LABEL="Search by Meta Keyword"
+MOD_BANNERS_FIELD_TARGET_DESC="Target window when the link is selected."
+MOD_BANNERS_FIELD_TARGET_LABEL="Target"
+MOD_BANNERS_VALUE_STICKYORDERING="Pinned, Ordering"
+MOD_BANNERS_VALUE_STICKYRANDOMISE="Pinned, Randomise"
+MOD_BANNERS_XML_DESCRIPTION="The Banner Module displays the active Banners from the Component."
diff --git a/core/language/en-GB/en-GB.mod_banners.sys.ini b/core/language/en-GB/en-GB.mod_banners.sys.ini
new file mode 100644
index 00000000..25962c84
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_banners.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_BANNERS="Banners"
+MOD_BANNERS_XML_DESCRIPTION="The Banner Module displays the active Banners from the Component."
+MOD_BANNERS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_breadcrumbs.ini b/core/language/en-GB/en-GB.mod_breadcrumbs.ini
new file mode 100644
index 00000000..c1bc261b
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_breadcrumbs.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_BREADCRUMBS="Breadcrumbs"
+MOD_BREADCRUMBS_FIELD_HOMETEXT_DESC="This text will be shown as Home entry. If the field is left empty, it will use the default value from the mod_breadcrumbs.ini language file."
+MOD_BREADCRUMBS_FIELD_HOMETEXT_LABEL="Text for Home Entry"
+MOD_BREADCRUMBS_FIELD_SEPARATOR_DESC="A text separator."
+MOD_BREADCRUMBS_FIELD_SEPARATOR_LABEL="Text Separator"
+MOD_BREADCRUMBS_FIELD_SHOWHERE_DESC="Show or hide &quot;You are here&quot; text in the pathway."
+MOD_BREADCRUMBS_FIELD_SHOWHERE_LABEL="Show &quot;You are here&quot;"
+MOD_BREADCRUMBS_FIELD_SHOWHOME_DESC="Show or hide the Home element in the pathway."
+MOD_BREADCRUMBS_FIELD_SHOWHOME_LABEL="Show Home"
+MOD_BREADCRUMBS_FIELD_SHOWLAST_DESC="Show or hide the last element in the pathway."
+MOD_BREADCRUMBS_FIELD_SHOWLAST_LABEL="Show Last"
+MOD_BREADCRUMBS_HERE="You are here: "
+MOD_BREADCRUMBS_HOME="Home"
+MOD_BREADCRUMBS_XML_DESCRIPTION="This module displays the Breadcrumbs."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_breadcrumbs.sys.ini b/core/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
new file mode 100644
index 00000000..5020bc62
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_BREADCRUMBS="Breadcrumbs"
+MOD_BREADCRUMBS_XML_DESCRIPTION="This module displays the Breadcrumbs."
+MOD_BREADCRUMBS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_custom.ini b/core/language/en-GB/en-GB.mod_custom.ini
new file mode 100644
index 00000000..b66148d6
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_custom.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_CUSTOM="Custom"
+MOD_CUSTOM_FIELD_PREPARE_CONTENT_DESC="Optionally prepare the content with the Joomla Content Plugins."
+MOD_CUSTOM_FIELD_PREPARE_CONTENT_LABEL="Prepare Content"
+MOD_CUSTOM_XML_DESCRIPTION="This module allows you to create your own Module using a WYSIWYG editor."
+MOD_CUSTOM_FIELD_BACKGROUNDIMAGE_LABEL="Select a Background Image"
+MOD_BACKGROUNDIMAGE_FIELD_LOGO_DESC="Select or upload an image that will automatically be inserted as an inline style for the wrapping div element."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_custom.sys.ini b/core/language/en-GB/en-GB.mod_custom.sys.ini
new file mode 100644
index 00000000..311fe1dc
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_custom.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_CUSTOM="Custom"
+MOD_CUSTOM_XML_DESCRIPTION="This module allows you to create your own Module using a WYSIWYG editor."
+MOD_CUSTOM_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_feed.ini b/core/language/en-GB/en-GB.mod_feed.ini
new file mode 100644
index 00000000..0d1daf0e
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_feed.ini
@@ -0,0 +1,26 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_FEED="Feed Display"
+MOD_FEED_ERR_CACHE="Please make cache folder writeable."
+MOD_FEED_ERR_FEED_NOT_RETRIEVED="Feed not found."
+MOD_FEED_ERR_NO_URL="No feed URL specified."
+MOD_FEED_FIELD_DESCRIPTION_DESC="Show the description text for the entire feed."
+MOD_FEED_FIELD_DESCRIPTION_LABEL="Feed Description"
+MOD_FEED_FIELD_IMAGE_DESC="Show the image associated with the entire feed."
+MOD_FEED_FIELD_IMAGE_LABEL="Feed Image"
+MOD_FEED_FIELD_ITEMDESCRIPTION_DESC="Show the description or intro text of individual RSS items."
+MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL="Item Description"
+MOD_FEED_FIELD_ITEMS_DESC="Enter number of RSS items to display."
+MOD_FEED_FIELD_ITEMS_LABEL="Feed Items"
+MOD_FEED_FIELD_RSSTITLE_DESC="Display news feed title."
+MOD_FEED_FIELD_RSSTITLE_LABEL="Feed Title"
+MOD_FEED_FIELD_RSSURL_DESC="Enter the URL of the RSS/RDF/ATOM feed."
+MOD_FEED_FIELD_RSSURL_LABEL="Feed URL"
+MOD_FEED_FIELD_RTL_DESC="Display feed in RTL direction."
+MOD_FEED_FIELD_RTL_LABEL="RTL Feed"
+MOD_FEED_FIELD_WORDCOUNT_DESC="Allows you to limit the amount of visible Item description text. 0 will show all the text."
+MOD_FEED_FIELD_WORDCOUNT_LABEL="Word Count"
+MOD_FEED_XML_DESCRIPTION="This module allows the displaying of a syndicated feed."
diff --git a/core/language/en-GB/en-GB.mod_feed.sys.ini b/core/language/en-GB/en-GB.mod_feed.sys.ini
new file mode 100644
index 00000000..56b6f497
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_feed.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_FEED="Feed Display"
+MOD_FEED_XML_DESCRIPTION="This module allows the displaying of a syndicated feed."
+MOD_FEED_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_finder.ini b/core/language/en-GB/en-GB.mod_finder.ini
new file mode 100644
index 00000000..4f01c256
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_finder.ini
@@ -0,0 +1,45 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+; Strings going to the component
+COM_FINDER_FILTER_BRANCH_LABEL="Search by %s"
+COM_FINDER_FILTER_SELECT_ALL_LABEL="Search All"
+COM_FINDER_ADVANCED_SEARCH="Advanced Search"
+COM_FINDER_SELECT_SEARCH_FILTER="- No Filter -"
+
+; Module strings
+MOD_FINDER="Smart Search"
+MOD_FINDER_CONFIG_OPTION_BOTTOM="Bottom"
+MOD_FINDER_CONFIG_OPTION_TOP="Top"
+MOD_FINDER_FIELDSET_ADVANCED_ALT_DESCRIPTION="An alternative label for the search field."
+MOD_FINDER_FIELDSET_ADVANCED_ALT_LABEL="Alternative Label"
+MOD_FINDER_FIELDSET_ADVANCED_BUTTON_POS_DESCRIPTION="The position of the search button relative to the search field."
+MOD_FINDER_FIELDSET_ADVANCED_BUTTON_POS_LABEL="Button Position"
+MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_DESCRIPTION="The width of the search field by character length."
+MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_LABEL="Search Field Size"
+MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_DESCRIPTION="The position of the search label relative to the search field."
+MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_LABEL="Label Position"
+MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION="Assign an ItemID by selecting a menu item in the list for the display of the search results if there is no com_finder menu item and a specific display is desired. If you do not know what this means, you may not need it."
+MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_LABEL="Set ItemID"
+MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_DESCRIPTION="Show or hide a button for the search form."
+MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_LABEL="Search Button"
+MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_DESCRIPTION="Show or hide a label for the search field."
+MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_LABEL="Search Field Label"
+MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_DESCRIPTION="Show or hide automatic search suggestions."
+MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_LABEL="Search Suggestions"
+MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_DESCRIPTION="Selecting a Search Filter will limit any searches submitted through this module to use the selected filter."
+MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_LABEL="Search Filter"
+MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_DESCRIPTION="Show or hide advanced search options. If set to Link to Component option creates a Smart Search link which redirects to the smart search view. If set to show, the advanced search options will be displayed inline."
+MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_LABEL="Advanced Search"
+MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_OPTION_LINK="Link to Component"
+MOD_FINDER_FIELD_OPENSEARCH_DESCRIPTION="Some browsers can add support for your site's search if this option is enabled."
+MOD_FINDER_FIELD_OPENSEARCH_LABEL="OpenSearch Autodiscovery"
+MOD_FINDER_FIELD_OPENSEARCH_TEXT_DESCRIPTION="Text displayed in supported browsers when adding your site as a search provider."
+MOD_FINDER_FIELD_OPENSEARCH_TEXT_LABEL="OpenSearch title"
+MOD_FINDER_SEARCHBUTTON_TEXT="Search"
+MOD_FINDER_SEARCH_BUTTON="Go"
+MOD_FINDER_SEARCH_VALUE="Search ..."
+MOD_FINDER_SELECT_MENU_ITEMID="Select a menu item"
+MOD_FINDER_XML_DESCRIPTION="This is a Smart Search module."
diff --git a/core/language/en-GB/en-GB.mod_finder.sys.ini b/core/language/en-GB/en-GB.mod_finder.sys.ini
new file mode 100644
index 00000000..67a48ebb
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_finder.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_FINDER="Smart Search"
+MOD_FINDER_XML_DESCRIPTION="This is a search module for the Smart Search system."
+MOD_FINDER_LAYOUT_DEFAULT="Default"
diff --git a/core/language/en-GB/en-GB.mod_footer.ini b/core/language/en-GB/en-GB.mod_footer.ini
new file mode 100644
index 00000000..5bd6ccc3
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_footer.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+; Note : %date% will be auto replaced by current year !Don't translate
+
+MOD_FOOTER="Footer"
+MOD_FOOTER_LINE1="Copyright &#169; %date% %sitename%. All Rights Reserved."
+MOD_FOOTER_LINE2="<a href="_QQ_"https://www.joomla.org"_QQ_">Joomla!</a> is Free Software released under the <a href="_QQ_"https://www.gnu.org/licenses/gpl-2.0.html"_QQ_">GNU General Public License.</a>"
+MOD_FOOTER_XML_DESCRIPTION="This module shows the Joomla! copyright information."
diff --git a/core/language/en-GB/en-GB.mod_footer.sys.ini b/core/language/en-GB/en-GB.mod_footer.sys.ini
new file mode 100644
index 00000000..e28e2c8c
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_footer.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+; Note : %date% will be auto replaced by current year !Don't translate
+
+MOD_FOOTER="Footer"
+MOD_FOOTER_XML_DESCRIPTION="This module shows the Joomla! copyright information."
+MOD_FOOTER_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_languages.ini b/core/language/en-GB/en-GB.mod_languages.ini
new file mode 100644
index 00000000..7d39b9f0
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_languages.ini
@@ -0,0 +1,31 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LANGUAGES="Language Switcher"
+MOD_LANGUAGES_FIELD_ACTIVE_DESC="Display or not the active language. If displayed, the class 'lang-active' will be added to the element."
+MOD_LANGUAGES_FIELD_ACTIVE_LABEL="Active Language"
+MOD_LANGUAGES_FIELD_CACHING_DESC="Use the global cache setting to cache the content of this module or disable caching for this module.<br />This should be set to 'No caching' when using Associations."
+MOD_LANGUAGES_FIELD_DROPDOWN_DESC="If set to 'Yes', the content languages native names will display in a dropdown."
+MOD_LANGUAGES_FIELD_DROPDOWN_LABEL="Use Dropdown"
+MOD_LANGUAGES_FIELD_DROPDOWN_IMAGE_DESC="Add image flags to the dropdown."
+MOD_LANGUAGES_FIELD_DROPDOWN_IMAGE_LABEL="Use Flags For Dropdown"
+MOD_LANGUAGES_FIELD_FOOTER_DESC="This is the text or HTML that is displayed below the language switcher."
+MOD_LANGUAGES_FIELD_FOOTER_LABEL="Post-text"
+MOD_LANGUAGES_FIELD_FULL_NAME_DESC="If set to 'Yes', full content language native names are displayed. If set to 'No', upper case abbreviations from the content languages URL Language Code are used. Example: EN for English, FR for French."
+MOD_LANGUAGES_FIELD_FULL_NAME_LABEL="Languages Full Names"
+MOD_LANGUAGES_FIELD_HEADER_DESC="This is the text or HTML that is displayed above the language switcher."
+MOD_LANGUAGES_FIELD_HEADER_LABEL="Pre-text"
+MOD_LANGUAGES_FIELD_INLINE_DESC="Default is set to 'Yes', ie to horizontal display."
+MOD_LANGUAGES_FIELD_INLINE_LABEL="Horizontal Display"
+MOD_LANGUAGES_FIELD_LINEHEIGHT_DESC="If set to 'Yes', will decrease the line height when using flags."
+MOD_LANGUAGES_FIELD_LINEHEIGHT_LABEL="Line Height"
+MOD_LANGUAGES_FIELD_MODULE_LAYOUT_DESC="Use a different layout from the supplied module or overrides in the default template."
+MOD_LANGUAGES_FIELD_USEIMAGE_DESC="If set to 'Yes', will display language choice as image flags. Otherwise will use the content language native names."
+MOD_LANGUAGES_FIELD_USEIMAGE_LABEL="Use Image Flags"
+MOD_LANGUAGES_OPTION_DEFAULT_LANGUAGE="Default"
+MOD_LANGUAGES_SPACERDROP_LABEL="<u>If Use Dropdown is set to 'Yes', <br />the display options below will be ignored</u>"
+MOD_LANGUAGES_SPACERNAME_LABEL="<u>If Use Image Flags is set to 'Yes', <br />the display options below will be ignored</u>"
+MOD_LANGUAGES_SPACER_USENAME_LABEL="<u>As 'Use Dropdown' and 'Use Image Flags' have been set to 'No',<br /> the switcher will display language names.</u>"
+MOD_LANGUAGES_XML_DESCRIPTION="This module displays a list of available Content Languages (as defined and published in Language Manager Content tab) for switching between them when you want to use Joomla! as a multilingual site. <br />--The plugin 'System - Language Filter' has to be enabled.--<br />When switching languages and if the item displayed in the page is not associated to another item, the module redirects to the Home page defined for the chosen language.<br />Otherwise, if the parameter is set for the Language filter plugin, it will redirect to the associated item in the language chosen. Thereafter, the navigation will be the one defined for that language. <br />If the plugin <strong>'System - Language Filter'</strong> is disabled, this may have unwanted results.<br /><strong>Method:</strong><br />1. Open Language Manager Content tab and make sure the Languages you want to use in contents are published and have a Language Code for the URL as well as prefix for the image used in the module display.<br />2. Create a Home page by assigning a language to a menu item and defining it as Default Home page for each published content language. <br />3. Thereafter, you can assign a language to any Article, Category, Module, News Feed, Web Links in Joomla.<br />4. Make sure the module is published and the plugin is enabled. <br />5. When using associated items, make sure the module is displayed on the relevant pages. <br />6. The way the flags or names of the languages are displayed is defined by the ordering in the Language Manager - Content Languages.<br ><br >If this module is published, it is suggested to publish the Administrator multilingual status module."
diff --git a/core/language/en-GB/en-GB.mod_languages.sys.ini b/core/language/en-GB/en-GB.mod_languages.sys.ini
new file mode 100644
index 00000000..a3b8ed2d
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_languages.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LANGUAGES="Language Switcher"
+MOD_LANGUAGES_XML_DESCRIPTION="This module displays a list of available Content Languages (as defined and published in Language Manager Content tab) for switching between them when you want to use Joomla! as a multilingual site. <br />--The plugin 'System - Language Filter' has to be enabled.--<br />When switching languages and if the item displayed in the page is not associated to another item, the module redirects to the Home page defined for the chosen language.<br />Otherwise, if the parameter is set for the Language filter plugin, it will redirect to the associated item in the language chosen. Thereafter, the navigation will be the one defined for that language. <br />If the plugin <strong>'System - Language Filter'</strong> is disabled, this may have unwanted results.<br /><strong>Method:</strong><br />1. Open Language Manager Content tab and make sure the Languages you want to use in contents are published and have a Language Code for the URL as well as prefix for the image used in the module display.<br />2. Create a Home page by assigning a language to a menu item and defining it as Default Home page for each published content language. <br />3. Thereafter, you can assign a language to any Article, Category, Module, News Feed, Web Links in Joomla.<br />4. Make sure the module is published and the plugin is enabled. <br />5. When using associated items, make sure the module is displayed on the relevant pages. <br />6. The way the flags or names of the languages are displayed is defined by the ordering in the Language Manager - Content Languages.<br ><br >If this module is published, it is suggested to publish the Administrator multilingual status module."
+MOD_LANGUAGES_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_login.ini b/core/language/en-GB/en-GB.mod_login.ini
new file mode 100644
index 00000000..c675d432
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_login.ini
@@ -0,0 +1,35 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LOGIN="Login"
+MOD_LOGIN_FIELD_GREETING_DESC="Show or hide the simple greeting text."
+MOD_LOGIN_FIELD_GREETING_LABEL="Show Greeting"
+MOD_LOGIN_FIELD_LOGIN_REDIRECTURL_DESC="Select or create the page the user will be redirected to after a successful login. The default is to stay on the same page."
+MOD_LOGIN_FIELD_LOGIN_REDIRECTURL_LABEL="Login Redirection Page"
+MOD_LOGIN_FIELD_LOGOUT_REDIRECTURL_DESC="Select or create the page the user will be redirected to after ending their current session by logging out. The default is to stay on the same page."
+MOD_LOGIN_FIELD_LOGOUT_REDIRECTURL_LABEL="Logout Redirection Page"
+MOD_LOGIN_FIELD_NAME_DESC="Displays name or username after logging in."
+MOD_LOGIN_FIELD_NAME_LABEL="Show Name/Username"
+MOD_LOGIN_FIELD_POST_TEXT_DESC="This is the text or HTML that is displayed below the login form."
+MOD_LOGIN_FIELD_POST_TEXT_LABEL="Post-text"
+MOD_LOGIN_FIELD_PRE_TEXT_DESC="This is the text or HTML that is displayed above the login form."
+MOD_LOGIN_FIELD_PRE_TEXT_LABEL="Pre-text"
+MOD_LOGIN_FIELD_PROFILE_LABEL="Show Profile Link"
+MOD_LOGIN_FIELD_PROFILE_DESC="Show a link to the User Profile page after logging in."
+MOD_LOGIN_FIELD_USESECURE_DESC="Submit encrypted login data using HTTPS (encrypted HTTP connections with the https:// protocol prefix). Note, you must have HTTPS enabled on your server to utilise this option."
+MOD_LOGIN_FIELD_USESECURE_LABEL="Encrypt Login Form"
+MOD_LOGIN_FIELD_USETEXT_DESC="Choose text or icons to display the field labels. Default is icons."
+MOD_LOGIN_FIELD_USETEXT_LABEL="Display Labels"
+MOD_LOGIN_FORGOT_YOUR_PASSWORD="Forgot your password?"
+MOD_LOGIN_FORGOT_YOUR_USERNAME="Forgot your username?"
+MOD_LOGIN_HINAME="Hi %s,"
+MOD_LOGIN_PROFILE="View Profile"
+MOD_LOGIN_REGISTER="Create an account"
+MOD_LOGIN_REMEMBER_ME="Remember Me"
+MOD_LOGIN_VALUE_ICONS="Icons"
+MOD_LOGIN_VALUE_NAME="Name"
+MOD_LOGIN_VALUE_TEXT="Text"
+MOD_LOGIN_VALUE_USERNAME="Username"
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users."
diff --git a/core/language/en-GB/en-GB.mod_login.sys.ini b/core/language/en-GB/en-GB.mod_login.sys.ini
new file mode 100644
index 00000000..8e346b3c
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_login.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_LOGIN="Login"
+MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Manage > Options), another link will be shown to enable self-registration for users."
+MOD_LOGIN_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_menu.ini b/core/language/en-GB/en-GB.mod_menu.ini
new file mode 100644
index 00000000..856efd90
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_menu.ini
@@ -0,0 +1,23 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MENU="Menu"
+MOD_MENU_FIELD_ACTIVE_DESC="Select a menu item to always be used as the base for the menu display. You must set the Start Level to the same level or higher than the level of the base item. This will cause the module to be displayed on all assigned pages. If Current is selected the active item is used as the base. This causes the module to only display when the parent menu item is active."
+MOD_MENU_FIELD_ACTIVE_LABEL="Base Item"
+MOD_MENU_FIELD_ALLCHILDREN_DESC="Expand the menu and make its sub-menu items always visible."
+MOD_MENU_FIELD_ALLCHILDREN_LABEL="Show Sub-menu Items"
+MOD_MENU_FIELD_CLASS_DESC="A suffix to be applied to the CSS class of the menu items."
+MOD_MENU_FIELD_CLASS_LABEL="Menu Class Suffix"
+MOD_MENU_FIELD_ENDLEVEL_DESC="Level to stop rendering the menu at. If you choose 'All', all levels will be shown depending on 'Show Sub-menu Items' setting."
+MOD_MENU_FIELD_ENDLEVEL_LABEL="End Level"
+MOD_MENU_FIELD_MENUTYPE_DESC="Select a menu in the list."
+MOD_MENU_FIELD_MENUTYPE_LABEL="Select Menu"
+MOD_MENU_FIELD_STARTLEVEL_DESC="Level to start rendering the menu at. Setting the start and end levels to the same # and setting 'Show Sub-menu Items' to yes will only display that single level."
+MOD_MENU_FIELD_STARTLEVEL_LABEL="Start Level"
+MOD_MENU_FIELD_TAG_ID_DESC="An ID attribute to assign to the root ul tag of the menu (optional)."
+MOD_MENU_FIELD_TAG_ID_LABEL="Menu Tag ID"
+MOD_MENU_FIELD_TARGET_DESC="JavaScript values to position a popup window, eg top=50, left=50, width=200, height=300."
+MOD_MENU_FIELD_TARGET_LABEL="Target Position"
+MOD_MENU_XML_DESCRIPTION="This module displays a menu on the Frontend."
diff --git a/core/language/en-GB/en-GB.mod_menu.sys.ini b/core/language/en-GB/en-GB.mod_menu.sys.ini
new file mode 100644
index 00000000..95c8f32b
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_menu.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_MENU="Menu"
+MOD_MENU_XML_DESCRIPTION="This module displays a menu on the Frontend."
+MOD_MENU_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_random_image.ini b/core/language/en-GB/en-GB.mod_random_image.ini
new file mode 100644
index 00000000..3854cd86
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_random_image.ini
@@ -0,0 +1,18 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_RANDOM_IMAGE="Random Image"
+MOD_RANDOM_IMAGE_FIELD_FOLDER_DESC="Path to the image folder relative to the site URL (eg images)."
+MOD_RANDOM_IMAGE_FIELD_FOLDER_LABEL="Image Folder"
+MOD_RANDOM_IMAGE_FIELD_HEIGHT_DESC="Image height forces all images to be displayed with the height in pixels."
+MOD_RANDOM_IMAGE_FIELD_HEIGHT_LABEL="Height (px)"
+MOD_RANDOM_IMAGE_FIELD_LINK_DESC="A URL to redirect to if the image is selected (eg https://www.joomla.org)."
+MOD_RANDOM_IMAGE_FIELD_LINK_LABEL="Link"
+MOD_RANDOM_IMAGE_FIELD_TYPE_DESC="Type of image PNG/GIF/JPG etc (the default is JPG)."
+MOD_RANDOM_IMAGE_FIELD_TYPE_LABEL="Image Type"
+MOD_RANDOM_IMAGE_FIELD_WIDTH_DESC="Image width forces all images to be displayed with this width in pixels."
+MOD_RANDOM_IMAGE_FIELD_WIDTH_LABEL="Width (px)"
+MOD_RANDOM_IMAGE_NO_IMAGES="No Images"
+MOD_RANDOM_IMAGE_XML_DESCRIPTION="This module displays a random image from your chosen folder."
diff --git a/core/language/en-GB/en-GB.mod_random_image.sys.ini b/core/language/en-GB/en-GB.mod_random_image.sys.ini
new file mode 100644
index 00000000..e8214ed8
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_random_image.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_RANDOM_IMAGE="Random Image"
+MOD_RANDOM_IMAGE_XML_DESCRIPTION="This module displays a random image from your chosen folder."
+MOD_RANDOM_IMAGE_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_related_items.ini b/core/language/en-GB/en-GB.mod_related_items.ini
new file mode 100644
index 00000000..6d7b0e7c
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_related_items.ini
@@ -0,0 +1,11 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_RELATED_FIELD_MAX_DESC="The maximum number of related articles to display (default is 5)."
+MOD_RELATED_FIELD_MAX_LABEL="Maximum Articles"
+MOD_RELATED_FIELD_SHOWDATE_DESC="Show or hide date."
+MOD_RELATED_FIELD_SHOWDATE_LABEL="Show Date"
+MOD_RELATED_ITEMS="Articles - Related"
+MOD_RELATED_XML_DESCRIPTION="This module displays other Articles that are related to the one being viewed. These relations are established by the Meta keywords. <br />All the keywords of the current Article are searched against all the keywords of all other published Articles. For example, you may have an Article on &quot;Breeding Parrots&quot; and another on &quot;Hand Raising Black Cockatoos&quot;. If you include the keyword &quot;parrot&quot; in both Articles, then the Related Items Module will list the &quot;Breeding Parrots&quot; Article when viewing &quot;Hand Raising Black Cockatoos&quot; and vice-versa."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_related_items.sys.ini b/core/language/en-GB/en-GB.mod_related_items.sys.ini
new file mode 100644
index 00000000..d5120731
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_related_items.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_RELATED_ITEMS="Articles - Related"
+MOD_RELATED_XML_DESCRIPTION="This module displays other Articles that are related to the one being viewed. These relations are established by the Meta keywords. <br />All the keywords of the current Article are searched against all the keywords of all other published Articles. For example, you may have an Article on &quot;Breeding Parrots&quot; and another on &quot;Hand Raising Black Cockatoos&quot;. If you include the keyword &quot;parrot&quot; in both Articles, then the Related Items Module will list the &quot;Breeding Parrots&quot; Article when viewing &quot;Hand Raising Black Cockatoos&quot; and vice-versa."
+MOD_RELATED_ITEMS_LAYOUT_DEFAULT="Default"
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_search.ini b/core/language/en-GB/en-GB.mod_search.ini
new file mode 100644
index 00000000..cecc71c8
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_search.ini
@@ -0,0 +1,35 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SEARCH="Search"
+MOD_SEARCH_FIELD_BOXWIDTH_DESC="Size of the search text box in characters."
+MOD_SEARCH_FIELD_BOXWIDTH_LABEL="Box Width"
+MOD_SEARCH_FIELD_BUTTON_DESC="Display a search button."
+MOD_SEARCH_FIELD_BUTTON_LABEL="Search Button"
+MOD_SEARCH_FIELD_BUTTONPOS_DESC="Position of the button relative to the search box."
+MOD_SEARCH_FIELD_BUTTONPOS_LABEL="Button Position"
+MOD_SEARCH_FIELD_BUTTONTEXT_DESC="The text that appears in the search button. If left blank, it will load the 'searchbutton' string from your language file."
+MOD_SEARCH_FIELD_BUTTONTEXT_LABEL="Button Text"
+MOD_SEARCH_FIELD_IMAGEBUTTON_DESC="Use an image as button. This image has to be named searchButton.gif and must be located in templates/*your template name*/images/."
+MOD_SEARCH_FIELD_IMAGEBUTTON_LABEL="Search Button Image"
+MOD_SEARCH_FIELD_SETITEMID_DESC="Assign an ItemID by selecting a menu item in the list for the display of the search results if there is no com_search menu and a specific display is desired. If you do not know what this means, you may not need it."
+MOD_SEARCH_FIELD_SETITEMID_LABEL="Set ItemID"
+MOD_SEARCH_FIELD_LABEL_TEXT_DESC="The text that appears in the label of search box. If left blank, it will load 'label' string from your language file."
+MOD_SEARCH_FIELD_LABEL_TEXT_LABEL="Box Label"
+MOD_SEARCH_FIELD_OPENSEARCH_LABEL="OpenSearch Autodiscovery"
+MOD_SEARCH_FIELD_OPENSEARCH_TEXT_LABEL="OpenSearch Title"
+MOD_SEARCH_FIELD_OPENSEARCH_TEXT_DESC="Text displayed in supported browsers when adding your site as a search provider."
+MOD_SEARCH_FIELD_OPENSEARCH_DESC="Some browsers can add support for your site's search if this option is enabled."
+MOD_SEARCH_FIELD_TEXT_DESC="The text that appears in the search text box. If left blank, it will load the 'searchbox' string from your language file."
+MOD_SEARCH_FIELD_TEXT_LABEL="Box Text"
+MOD_SEARCH_FIELD_VALUE_BOTTOM="Bottom"
+MOD_SEARCH_FIELD_VALUE_LEFT="Left"
+MOD_SEARCH_FIELD_VALUE_RIGHT="Right"
+MOD_SEARCH_FIELD_VALUE_TOP="Top"
+MOD_SEARCH_LABEL_TEXT="Search ..."
+MOD_SEARCH_SEARCHBOX_TEXT="Search ..."
+MOD_SEARCH_SEARCHBUTTON_TEXT="Search"
+MOD_SEARCH_SELECT_MENU_ITEMID="Select a menu item"
+MOD_SEARCH_XML_DESCRIPTION="This module will display a search box."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_search.sys.ini b/core/language/en-GB/en-GB.mod_search.sys.ini
new file mode 100644
index 00000000..8fd6ad7a
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_search.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SEARCH="Search"
+MOD_SEARCH_XML_DESCRIPTION="This module will display a search box."
+MOD_SEARCH_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_stats.ini b/core/language/en-GB/en-GB.mod_stats.ini
new file mode 100644
index 00000000..b349f804
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_stats.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATS="Statistics"
+MOD_STATS_ARTICLES="Articles"
+MOD_STATS_ARTICLES_VIEW_HITS="Articles View Hits"
+MOD_STATS_CACHING="Caching"
+MOD_STATS_FIELD_COUNTER_DESC="Display hit counter."
+MOD_STATS_FIELD_COUNTER_LABEL="Hit Counter"
+MOD_STATS_FIELD_INCREASECOUNTER_DESC="Enter the number of hits to increase the counter by."
+MOD_STATS_FIELD_INCREASECOUNTER_LABEL="Increase Counter"
+MOD_STATS_FIELD_SERVERINFO_DESC="Display server information."
+MOD_STATS_FIELD_SERVERINFO_LABEL="Server Information"
+MOD_STATS_FIELD_SITEINFO_DESC="Display site information."
+MOD_STATS_FIELD_SITEINFO_LABEL="Site Information"
+MOD_STATS_GZIP="Gzip"
+MOD_STATS_MYSQL="MySQL"
+MOD_STATS_OS="OS"
+MOD_STATS_PHP="PHP"
+MOD_STATS_TIME="Time"
+MOD_STATS_USERS="Users"
+MOD_STATS_WEBLINKS="Web Links"
+MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
diff --git a/core/language/en-GB/en-GB.mod_stats.sys.ini b/core/language/en-GB/en-GB.mod_stats.sys.ini
new file mode 100644
index 00000000..48954c3b
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_stats.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_STATS="Statistics"
+MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
+MOD_STATS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_syndicate.ini b/core/language/en-GB/en-GB.mod_syndicate.ini
new file mode 100644
index 00000000..9906943d
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_syndicate.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SYNDICATE="Syndication Feeds"
+MOD_SYNDICATE_DEFAULT_FEED_ENTRIES="Feed Entries"
+MOD_SYNDICATE_FIELD_DISPLAYTEXT_DESC="If set to 'Yes', text will be displayed next to the icon."
+MOD_SYNDICATE_FIELD_DISPLAYTEXT_LABEL="Display Text"
+MOD_SYNDICATE_FIELD_FORMAT_DESC="Select the format for the Syndication Feed."
+MOD_SYNDICATE_FIELD_FORMAT_LABEL="Feed Format"
+MOD_SYNDICATE_FIELD_TEXT_DESC="If 'Display Text' is activated, the text entered will be displayed next to the icon along with the RSS Link. If this field is left empty, the default text displayed will be picked from the site language ini file."
+MOD_SYNDICATE_FIELD_TEXT_LABEL="Text"
+MOD_SYNDICATE_FIELD_VALUE_ATOM="Atom 1.0"
+MOD_SYNDICATE_FIELD_VALUE_RSS="RSS 2.0"
+MOD_SYNDICATE_XML_DESCRIPTION="Smart Syndication Module that creates a Syndicated Feed for the page where the Module is displayed."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_syndicate.sys.ini b/core/language/en-GB/en-GB.mod_syndicate.sys.ini
new file mode 100644
index 00000000..e9b935b9
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_syndicate.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_SYNDICATE="Syndication Feeds"
+MOD_SYNDICATE_XML_DESCRIPTION="Smart Syndication Module that creates a Syndicated Feed for the page where the Module is displayed."
+MOD_SYNDICATE_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_tags_popular.ini b/core/language/en-GB/en-GB.mod_tags_popular.ini
new file mode 100644
index 00000000..82cf303c
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_tags_popular.ini
@@ -0,0 +1,36 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TAGS_POPULAR="Tags - Popular"
+MOD_TAGS_POPULAR_FIELD_ALL_TIME="All time"
+MOD_TAGS_POPULAR_FIELD_DISPLAY_COUNT_DESC="Choose if the number of tagged items should be displayed next to each tag."
+MOD_TAGS_POPULAR_FIELD_DISPLAY_COUNT_LABEL="Display Number of Items"
+MOD_TAGS_POPULAR_FIELD_LAST_DAY="Last day"
+MOD_TAGS_POPULAR_FIELD_LAST_HOUR="Last hour"
+MOD_TAGS_POPULAR_FIELD_LAST_MONTH="Last month"
+MOD_TAGS_POPULAR_FIELD_LAST_WEEK="Last week"
+MOD_TAGS_POPULAR_FIELD_LAST_YEAR="Last year"
+MOD_TAGS_POPULAR_FIELD_MAX_DESC="Sets the maximum number of tags to display in the module. Enter &quot;0&quot; to display all tags."
+MOD_TAGS_POPULAR_FIELD_MAX_LABEL="Maximum Tags"
+MOD_TAGS_POPULAR_FIELD_MAXSIZE_DESC="The maximum font size used for the tags, proportional to the site's default font size (eg &quot;2&quot; means 200% of the default size)."
+MOD_TAGS_POPULAR_FIELD_MAXSIZE_LABEL="Maximum Font Size"
+MOD_TAGS_POPULAR_FIELD_MINSIZE_DESC="The minimum font size used for the tags, proportional to the site's default font size (eg &quot;2&quot; means 200% of the default size)."
+MOD_TAGS_POPULAR_FIELD_MINSIZE_LABEL="Minimum Font Size"
+MOD_TAGS_POPULAR_FIELD_NO_RESULTS_DESC="Will show a message if no matching tags are found instead of hiding the module."
+MOD_TAGS_POPULAR_FIELD_NO_RESULTS_LABEL="Show &quot;No results&quot; text"
+MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_COUNT="Number of Items"
+MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_DESC="The order that tags will show in."
+MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_LABEL="Order"
+MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_RANDOM="Random"
+MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_TITLE="Title"
+MOD_TAGS_POPULAR_FIELD_TIMEFRAME_DESC="Sets the time period for which to calculate popularity."
+MOD_TAGS_POPULAR_FIELD_TIMEFRAME_LABEL="Time Period"
+MOD_TAGS_POPULAR_FIELDSET_CLOUD_LABEL="Cloud Layout"
+MOD_TAGS_POPULAR_MAX_DESC="Sets the maximum number of tags to display in the module."
+MOD_TAGS_POPULAR_MAX_LABEL="Maximum Tags"
+MOD_TAGS_POPULAR_NO_ITEMS_FOUND="No Tags found."
+MOD_TAGS_POPULAR_PARENT_TAG_DESC="Limit tags shown to the children of this Parent Tag."
+MOD_TAGS_POPULAR_PARENT_TAG_LABEL="Parent Tag"
+MOD_TAGS_POPULAR_XML_DESCRIPTION="This module displays tags used on the site in a list or a cloud layout. Tags can be ordered by title or by the number of tagged items and limited to a specific time period."
diff --git a/core/language/en-GB/en-GB.mod_tags_popular.sys.ini b/core/language/en-GB/en-GB.mod_tags_popular.sys.ini
new file mode 100644
index 00000000..587e31b0
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_tags_popular.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TAGS_POPULAR="Tags - Popular"
+MOD_TAGS_POPULAR_LAYOUT_CLOUD="Cloud"
+MOD_TAGS_POPULAR_LAYOUT_DEFAULT="Default"
+MOD_TAGS_POPULAR_XML_DESCRIPTION="This module displays tags used on the site in a list or a cloud layout. Tags can be ordered by title or by the number of tagged items and limited to a specific time period."
diff --git a/core/language/en-GB/en-GB.mod_tags_similar.ini b/core/language/en-GB/en-GB.mod_tags_similar.ini
new file mode 100644
index 00000000..2d4e04ce
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_tags_similar.ini
@@ -0,0 +1,21 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TAGS_SIMILAR="Tags - Similar"
+MOD_TAGS_SIMILAR_FIELD_ALL="All"
+MOD_TAGS_SIMILAR_FIELD_HALF="Half"
+MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_DESC="How closely an item's tags need to match. All - requires that all tags in the displayed item be matched. Any - requires that at least one tag match. Half - requires that at least half of the tags match (rounded up in the case of decimals)."
+MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_LABEL="Match Type"
+MOD_TAGS_SIMILAR_FIELD_ONE="Any"
+MOD_TAGS_SIMILAR_LAYOUT_DEFAULT="Default"
+MOD_TAGS_SIMILAR_MAX_DESC="Maximum number of items to display."
+MOD_TAGS_SIMILAR_MAX_LABEL="Maximum Items"
+MOD_TAGS_SIMILAR_NO_MATCHING_TAGS="No matching tags."
+MOD_TAGS_SIMILAR_XML_DESCRIPTION="The Similar Tags Module displays links to other items with similar tags. The closeness of the match can be specified."
+MOD_TAGS_SIMILAR_FIELD_ORDERING_LABEL="Order Results"
+MOD_TAGS_SIMILAR_FIELD_ORDERING_DESC="Select the order in which you want query results presented."
+MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT="Number of matching tags"
+MOD_TAGS_SIMILAR_FIELD_ORDERING_RANDOM="Random"
+MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT_AND_RANDOM="Number of matching tags & Random"
diff --git a/core/language/en-GB/en-GB.mod_tags_similar.sys.ini b/core/language/en-GB/en-GB.mod_tags_similar.sys.ini
new file mode 100644
index 00000000..8500b87f
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_tags_similar.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_TAGS_SIMILAR="Tags - Similar"
+MOD_TAGS_SIMILAR_LAYOUT_DEFAULT="Default"
+MOD_TAGS_SIMILAR_XML_DESCRIPTION="The Similar Tags Module displays links to other items with similar tags. The closeness of the match can be specified."
+
diff --git a/core/language/en-GB/en-GB.mod_users_latest.ini b/core/language/en-GB/en-GB.mod_users_latest.ini
new file mode 100644
index 00000000..a36b3db9
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_users_latest.ini
@@ -0,0 +1,15 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_USERS_LATEST="Latest Users"
+MOD_USERS_LATEST_FIELD_FILTER_GROUPS_DESC="Choose to filter by groups of the connected user."
+MOD_USERS_LATEST_FIELD_FILTER_GROUPS_LABEL="Filter Groups"
+MOD_USERS_LATEST_FIELD_LINKTOWHAT_DESC="Choose the type of information to display."
+MOD_USERS_LATEST_FIELD_LINKTOWHAT_LABEL="User Information"
+MOD_USERS_LATEST_FIELD_NUMBER_DESC="Number of latest registered users to display."
+MOD_USERS_LATEST_FIELD_NUMBER_LABEL="Number of Users"
+MOD_USERS_LATEST_FIELD_VALUE_CONTACT="Contact"
+MOD_USERS_LATEST_FIELD_VALUE_PROFILE="Profile"
+MOD_USERS_LATEST_XML_DESCRIPTION="This module displays the latest registered users."
diff --git a/core/language/en-GB/en-GB.mod_users_latest.sys.ini b/core/language/en-GB/en-GB.mod_users_latest.sys.ini
new file mode 100644
index 00000000..9546568b
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_users_latest.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_USERS_LATEST="Latest Users"
+MOD_USERS_LATEST_XML_DESCRIPTION="This module displays the latest registered users."
+MOD_USERS_LATEST_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_weblinks.ini b/core/language/en-GB/en-GB.mod_weblinks.ini
new file mode 100644
index 00000000..6690d7e4
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_weblinks.ini
@@ -0,0 +1,41 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_WEBLINKS="Web Links"
+MOD_WEBLINKS_FIELD_CATEGORY_DESC="Choose the Web Links category to display."
+MOD_WEBLINKS_FIELD_GROUPBY_DESC="If set to yes, web links will be grouped by subcategories."
+MOD_WEBLINKS_FIELD_GROUPBY_LABEL="Group By Subcategories"
+MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC="If set to yes, will show groups titles (valid only if grouping)."
+MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL="Show Group Title"
+MOD_WEBLINKS_FIELD_GROUPBYORDERING_DESC="Ordering for the subcategories (valid only if grouping)."
+MOD_WEBLINKS_FIELD_GROUPBYORDERING_LABEL="Group Ordering"
+MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC="Direction for the subcategories (valid only if grouping)."
+MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL="Group Ordering Direction"
+MOD_WEBLINKS_FIELD_COLUMNS_DESC="When grouping by subcategories, split into # columns."
+MOD_WEBLINKS_FIELD_COLUMNS_LABEL="Columns"
+MOD_WEBLINKS_FIELD_COUNT_DESC="Number of Web Links to display."
+MOD_WEBLINKS_FIELD_COUNT_LABEL="Count"
+MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC="If set to yes, the number of times the link has been clicked will be recorded."
+MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL="Count Clicks"
+MOD_WEBLINKS_FIELD_DESCRIPTION_DESC="Display Web Link description."
+MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL="Description"
+MOD_WEBLINKS_FIELD_FOLLOW_DESC="Robots index - allow to follow or not."
+MOD_WEBLINKS_FIELD_FOLLOW_LABEL="Follow/No Follow"
+MOD_WEBLINKS_FIELD_HITS_DESC="Show hits."
+MOD_WEBLINKS_FIELD_HITS_LABEL="Hits"
+MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC="Set the ordering direction."
+MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL="Direction"
+MOD_WEBLINKS_FIELD_ORDERING_DESC="Ordering for the Web Links."
+MOD_WEBLINKS_FIELD_ORDERING_LABEL="Ordering"
+MOD_WEBLINKS_FIELD_TARGET_DESC="Target browser window when the link is selected."
+MOD_WEBLINKS_FIELD_TARGET_LABEL="Target Window"
+MOD_WEBLINKS_FIELD_VALUE_ASCENDING="Ascending"
+MOD_WEBLINKS_FIELD_VALUE_DESCENDING="Descending"
+MOD_WEBLINKS_FIELD_VALUE_FOLLOW="Follow"
+MOD_WEBLINKS_FIELD_VALUE_HITS="Hits"
+MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW="No follow"
+MOD_WEBLINKS_FIELD_VALUE_ORDER="Order"
+MOD_WEBLINKS_HITS="Hits"
+MOD_WEBLINKS_XML_DESCRIPTION="This modules displays web links from a category defined in the Web Links component."
diff --git a/core/language/en-GB/en-GB.mod_weblinks.sys.ini b/core/language/en-GB/en-GB.mod_weblinks.sys.ini
new file mode 100644
index 00000000..b4bb589b
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_weblinks.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_WEBLINKS="Web Links"
+MOD_WEBLINKS_XML_DESCRIPTION="This modules displays Web Links from a category defined in the Web Links component."
+MOD_WEBLINKS_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_whosonline.ini b/core/language/en-GB/en-GB.mod_whosonline.ini
new file mode 100644
index 00000000..6ab575cb
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_whosonline.ini
@@ -0,0 +1,29 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_WHOSONLINE="Who's Online"
+MOD_WHOSONLINE_FIELD_FILTER_GROUPS_DESC="Choose to filter by groups of the connected user"
+MOD_WHOSONLINE_FIELD_FILTER_GROUPS_LABEL="Filter Groups"
+MOD_WHOSONLINE_FIELD_LINKTOWHAT_DESC="Choose the type of information to display"
+MOD_WHOSONLINE_FIELD_LINKTOWHAT_LABEL="Information"
+MOD_WHOSONLINE_FIELD_VALUE_BOTH="Both"
+MOD_WHOSONLINE_FIELD_VALUE_CONTACT="Contact"
+MOD_WHOSONLINE_FIELD_VALUE_NAMES="Usernames"
+MOD_WHOSONLINE_FIELD_VALUE_NUMBER="# of Guests / Users"
+MOD_WHOSONLINE_FIELD_VALUE_PROFILE="Profile"
+MOD_WHOSONLINE_GUESTS="%s&#160;guests"
+MOD_WHOSONLINE_GUESTS_1="one guest"
+MOD_WHOSONLINE_GUESTS_0="no guests"
+MOD_WHOSONLINE_MEMBERS="%s&#160;members"
+MOD_WHOSONLINE_MEMBERS_1="one member"
+MOD_WHOSONLINE_MEMBERS_0="no members"
+MOD_WHOSONLINE_SAME_GROUP_MESSAGE="List of Users who belong to your user groups or your user groups' child groups"
+MOD_WHOSONLINE_SHOWMODE_DESC="Select what will be shown"
+MOD_WHOSONLINE_SHOWMODE_LABEL="Display"
+MOD_WHOSONLINE_XML_DESCRIPTION="The Who's Online Module displays the number of Anonymous Users (e.g. Guests) and Registered Users (ones logged-in) that are currently accessing the website."
+; frontend display
+; in the following string
+; %1$s is for guests and %2$s for members
+MOD_WHOSONLINE_WE_HAVE="We have %1$s and %2$s online"
diff --git a/core/language/en-GB/en-GB.mod_whosonline.sys.ini b/core/language/en-GB/en-GB.mod_whosonline.sys.ini
new file mode 100644
index 00000000..f205a3b7
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_whosonline.sys.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_WHOSONLINE="Who's Online"
+MOD_WHOSONLINE_XML_DESCRIPTION="The Who's Online Module displays the number of Anonymous Users (Guests) and Registered Users (users logged-in) that are currently accessing the website."
+MOD_WHOSONLINE_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.mod_wrapper.ini b/core/language/en-GB/en-GB.mod_wrapper.ini
new file mode 100644
index 00000000..103d9cb8
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_wrapper.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_WRAPPER="Wrapper"
+MOD_WRAPPER_FIELD_ADD_DESC="By default, http:// will be added unless it detects http:// or https:// in the URL you provide. This allows you to switch this ability off."
+MOD_WRAPPER_FIELD_ADD_LABEL="Auto Add"
+MOD_WRAPPER_FIELD_AUTOHEIGHT_DESC="The height will automatically be set to the size of the external page. This will only work for pages on your own domain."
+MOD_WRAPPER_FIELD_AUTOHEIGHT_LABEL="Auto Height"
+MOD_WRAPPER_FIELD_HEIGHT_DESC="Height of the iframe window."
+MOD_WRAPPER_FIELD_HEIGHT_LABEL="Height"
+MOD_WRAPPER_FIELD_SCROLL_DESC="Show or hide horizontal &amp; vertical scroll bars."
+MOD_WRAPPER_FIELD_SCROLL_LABEL="Scroll Bars"
+MOD_WRAPPER_FIELD_TARGET_DESC="Name of the iframe when used as target."
+MOD_WRAPPER_FIELD_TARGET_LABEL="Target Name"
+MOD_WRAPPER_FIELD_URL_DESC="URL to site/file you wish to display within the iframe."
+MOD_WRAPPER_FIELD_URL_LABEL="URL"
+MOD_WRAPPER_FIELD_VALUE_AUTO="Auto"
+MOD_WRAPPER_FIELD_WIDTH_DESC="Width of the iframe window. You can enter an absolute figure in pixels or a relative figure by adding a %."
+MOD_WRAPPER_FIELD_WIDTH_LABEL="Width"
+MOD_WRAPPER_NO_IFRAMES="No iframes"
+MOD_WRAPPER_XML_DESCRIPTION="This module shows an iframe window to specified location."
+MOD_WRAPPER_FIELD_FRAME_LABEL="Frame Border"
+MOD_WRAPPER_FIELD_FRAME_DESC="Show frame border which wraps the iframe."
\ No newline at end of file
diff --git a/core/language/en-GB/en-GB.mod_wrapper.sys.ini b/core/language/en-GB/en-GB.mod_wrapper.sys.ini
new file mode 100644
index 00000000..1e293bf2
--- /dev/null
+++ b/core/language/en-GB/en-GB.mod_wrapper.sys.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+MOD_WRAPPER="Wrapper"
+MOD_WRAPPER_NO_IFRAMES="No iframes"
+MOD_WRAPPER_XML_DESCRIPTION="This module shows an iframe window to specified location."
+MOD_WRAPPER_LAYOUT_DEFAULT="Default"
+
diff --git a/core/language/en-GB/en-GB.tpl_beez3.ini b/core/language/en-GB/en-GB.tpl_beez3.ini
new file mode 100644
index 00000000..6791e034
--- /dev/null
+++ b/core/language/en-GB/en-GB.tpl_beez3.ini
@@ -0,0 +1,60 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_BEEZ3_ADDITIONAL_INFORMATION="Additional information"
+TPL_BEEZ3_ALTCLOSE="is closed"
+TPL_BEEZ3_ALTOPEN="is open"
+TPL_BEEZ3_BIGGER="Bigger"
+TPL_BEEZ3_CLICK="select"
+TPL_BEEZ3_CLOSEMENU="Close Menu"
+TPL_BEEZ3_DECREASE_SIZE="Decrease size"
+TPL_BEEZ3_ERROR_JUMP_TO_NAV="Jump to navigation"
+TPL_BEEZ3_FIELD_BOOTSTRAP_DESC="Create a comma separated list of any components for which Bootstrap is needed, for example com_name, com_anothername."
+TPL_BEEZ3_FIELD_BOOTSTRAP_LABEL="Components Requiring<br /> Bootstrap"
+TPL_BEEZ3_FIELD_DESCRIPTION_DESC="Please add your site description here."
+TPL_BEEZ3_FIELD_DESCRIPTION_LABEL="Site Description"
+TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_DESC="Choose a colour for the Background when Custom is selected as the Template Colour. If left blank the Default (#eeeeee) is used."
+TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_LABEL="Background Colour"
+TPL_BEEZ3_FIELD_HEADER_IMAGE_DESC="Select or upload an image to be used as a header image when the custom colour option is selected."
+TPL_BEEZ3_FIELD_HEADER_IMAGE_LABEL="Header Image"
+TPL_BEEZ3_FIELD_LOGO_DESC="Select or upload an image. If you do not want to display a logo, select Clear and leave the field blank."
+TPL_BEEZ3_FIELD_LOGO_LABEL="Logo"
+TPL_BEEZ3_FIELD_NAVPOSITION_DESC="Navigation before or after content."
+TPL_BEEZ3_FIELD_NAVPOSITION_LABEL="Position of Navigation"
+TPL_BEEZ3_FIELD_SITETITLE_DESC="Please add your site title here, it's only displayed if you don't use a logo."
+TPL_BEEZ3_FIELD_SITETITLE_LABEL="Site Title"
+TPL_BEEZ3_FIELD_TEMPLATECOLOR_DESC="Colour of the template."
+TPL_BEEZ3_FIELD_TEMPLATECOLOR_LABEL="Template Colour"
+TPL_BEEZ3_FIELD_WRAPPERLARGE_DESC="Wrapper width with closed additional columns in percent."
+TPL_BEEZ3_FIELD_WRAPPERLARGE_LABEL="Wrapper Large (%)"
+TPL_BEEZ3_FIELD_WRAPPERSMALL_DESC="Wrapper width with opened additional columns in percent."
+TPL_BEEZ3_FIELD_WRAPPERSMALL_LABEL="Wrapper Small (%)"
+TPL_BEEZ3_FONTSIZE="Font Size"
+TPL_BEEZ3_INCREASE_SIZE="Increase size"
+TPL_BEEZ3_JUMP_TO_INFO="Jump to additional information"
+TPL_BEEZ3_JUMP_TO_NAV="Jump to main navigation and login"
+TPL_BEEZ3_NAVIGATION="Navigation"
+TPL_BEEZ3_NAV_VIEW_SEARCH="Nav view search"
+TPL_BEEZ3_NEXTTAB="Next Tab"
+TPL_BEEZ3_OPENMENU="Open Menu"
+TPL_BEEZ3_OPTION_AFTER_CONTENT="after content"
+TPL_BEEZ3_OPTION_BEFORE_CONTENT="before content"
+TPL_BEEZ3_OPTION_IMAGE="Custom"
+TPL_BEEZ3_OPTION_NATURE="Nature"
+TPL_BEEZ3_OPTION_PERSONAL="Personal"
+TPL_BEEZ3_OPTION_RED="Red"
+TPL_BEEZ3_OPTION_TURQ="Turquoise"
+TPL_BEEZ3_POWERED_BY="Powered by"
+TPL_BEEZ3_RESET="Reset"
+TPL_BEEZ3_REVERT_STYLES_TO_DEFAULT="Revert styles to default"
+TPL_BEEZ3_SEARCH="Search"
+TPL_BEEZ3_SKIP_TO_CONTENT="Skip to content"
+TPL_BEEZ3_SKIP_TO_ERROR_CONTENT="Jump to error message and search"
+TPL_BEEZ3_SMALLER="Smaller"
+TPL_BEEZ3_SYSTEM_MESSAGE="Error"
+TPL_BEEZ3_TEXTRIGHTCLOSE="Close info"
+TPL_BEEZ3_TEXTRIGHTOPEN="Open info"
+TPL_BEEZ3_XML_DESCRIPTION="Accessible site template for Joomla! 3.x. Beez3, the HTML5 version."
+TPL_BEEZ3_YOUR_SITE_DESCRIPTION="Your site description"
diff --git a/core/language/en-GB/en-GB.tpl_beez3.sys.ini b/core/language/en-GB/en-GB.tpl_beez3.sys.ini
new file mode 100644
index 00000000..2df22d39
--- /dev/null
+++ b/core/language/en-GB/en-GB.tpl_beez3.sys.ini
@@ -0,0 +1,23 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_BEEZ3_POSITION_DEBUG="Debug"
+TPL_BEEZ3_POSITION_POSITION-0="Search"
+TPL_BEEZ3_POSITION_POSITION-10="Footer middle"
+TPL_BEEZ3_POSITION_POSITION-11="Footer bottom"
+TPL_BEEZ3_POSITION_POSITION-12="Middle top"
+TPL_BEEZ3_POSITION_POSITION-13="Unused"
+TPL_BEEZ3_POSITION_POSITION-14="Footer last"
+TPL_BEEZ3_POSITION_POSITION-15="Header"
+TPL_BEEZ3_POSITION_POSITION-1="Top"
+TPL_BEEZ3_POSITION_POSITION-2="Breadcrumbs"
+TPL_BEEZ3_POSITION_POSITION-3="Right bottom"
+TPL_BEEZ3_POSITION_POSITION-4="Left middle"
+TPL_BEEZ3_POSITION_POSITION-5="Left bottom"
+TPL_BEEZ3_POSITION_POSITION-6="Right top"
+TPL_BEEZ3_POSITION_POSITION-7="Left top"
+TPL_BEEZ3_POSITION_POSITION-8="Right middle"
+TPL_BEEZ3_POSITION_POSITION-9="Footer top"
+TPL_BEEZ3_XML_DESCRIPTION="Accessible site template for Joomla! 3.x. Beez3, the HTML5 version."
diff --git a/core/language/en-GB/en-GB.tpl_protostar.ini b/core/language/en-GB/en-GB.tpl_protostar.ini
new file mode 100644
index 00000000..8aafa52f
--- /dev/null
+++ b/core/language/en-GB/en-GB.tpl_protostar.ini
@@ -0,0 +1,22 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_PROTOSTAR_BACKGROUND_COLOR_DESC="Choose a background colour for static layouts. If left blank the Default (#f4f6f7) is used."
+TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL="Background Colour"
+TPL_PROTOSTAR_BACKTOTOP="Back to Top"
+TPL_PROTOSTAR_COLOR_DESC="Choose an overall colour for the site template. If left blank the Default (#0088cc) is used."
+TPL_PROTOSTAR_COLOR_LABEL="Template Colour"
+TPL_PROTOSTAR_FLUID_DESC="Use Bootstrap's Fluid or Static Container (both are Responsive)."
+TPL_PROTOSTAR_FLUID_LABEL="Fluid Layout"
+TPL_PROTOSTAR_FLUID="Fluid"
+TPL_PROTOSTAR_FONT_DESC="Load a Google font for the headings (H1, H2, H3, etc)."
+TPL_PROTOSTAR_FONT_LABEL="Google Font for Headings"
+TPL_PROTOSTAR_FONT_NAME_DESC="Example: Open+Sans or Source+Sans+Pro."
+TPL_PROTOSTAR_FONT_NAME_LABEL="Google Font Name"
+TPL_PROTOSTAR_LOGO_DESC="Select or upload a custom logo for the site template."
+TPL_PROTOSTAR_LOGO_LABEL="Logo"
+TPL_PROTOSTAR_STATIC="Static"
+TPL_PROTOSTAR_TOGGLE_MENU="Toggle Navigation"
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/language/en-GB/en-GB.tpl_protostar.sys.ini b/core/language/en-GB/en-GB.tpl_protostar.sys.ini
new file mode 100644
index 00000000..767ee109
--- /dev/null
+++ b/core/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_PROTOSTAR_POSITION_BANNER="Banner"
+TPL_PROTOSTAR_POSITION_DEBUG="Debug"
+TPL_PROTOSTAR_POSITION_POSITION-0="Search"
+TPL_PROTOSTAR_POSITION_POSITION-10="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-11="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-12="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-13="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-14="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-15="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-1="Navigation"
+TPL_PROTOSTAR_POSITION_POSITION-2="Breadcrumbs"
+TPL_PROTOSTAR_POSITION_POSITION-3="Top centre"
+TPL_PROTOSTAR_POSITION_POSITION-4="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-5="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-6="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-7="Right"
+TPL_PROTOSTAR_POSITION_POSITION-8="Left"
+TPL_PROTOSTAR_POSITION_POSITION-9="Unused"
+TPL_PROTOSTAR_POSITION_FOOTER="Footer"
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/language/en-GB/en-GB.xml b/core/language/en-GB/en-GB.xml
new file mode 100644
index 00000000..bdc368b2
--- /dev/null
+++ b/core/language/en-GB/en-GB.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metafile version="3.8" client="site">
+	<name>English (en-GB)</name>
+	<version>3.8.11</version>
+	<creationDate>July 2018</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description><![CDATA[en-GB site language]]></description>
+	<metadata>
+		<name>English (en-GB)</name>
+		<nativeName>English (United Kingdom)</nativeName>
+		<tag>en-GB</tag>
+		<rtl>0</rtl>
+		<locale>en_GB.utf8, en_GB.UTF-8, en_GB, eng_GB, en, english, english-uk, uk, gbr, britain, england, great britain, uk, united kingdom, united-kingdom</locale>
+		<firstDay>0</firstDay>
+		<weekEnd>0,6</weekEnd>
+		<calendar>gregorian</calendar>
+	</metadata>
+	<params />
+</metafile>
diff --git a/core/language/en-GB/install.xml b/core/language/en-GB/install.xml
new file mode 100644
index 00000000..28347966
--- /dev/null
+++ b/core/language/en-GB/install.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.8" client="site" type="language" method="upgrade">
+	<name>English (en-GB)</name>
+	<tag>en-GB</tag>
+	<version>3.8.11</version>
+	<creationDate>July 2018</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>en-GB site language</description>
+	<files>
+		<folder>/</folder>
+		<filename file="meta">install.xml</filename>
+	</files>
+	<params />
+</extension>
diff --git a/core/language/index.html b/core/language/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/language/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/language/overrides/index.html b/core/language/overrides/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/language/overrides/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/layouts/index.html b/core/layouts/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/layouts/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/layouts/joomla/content/associations.php b/core/layouts/joomla/content/associations.php
new file mode 100644
index 00000000..37e6278f
--- /dev/null
+++ b/core/layouts/joomla/content/associations.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$items = $displayData;
+
+if (!empty($items)) : ?>
+	<ul class="item-associations">
+		<?php foreach ($items as $id => $item) : ?>
+			<li>
+				<?php echo is_array($item) ? $item['link'] : $item->link; ?>
+			</li>
+		<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/blog_style_default_item_title.php b/core/layouts/joomla/content/blog_style_default_item_title.php
new file mode 100644
index 00000000..80a9e7c6
--- /dev/null
+++ b/core/layouts/joomla/content/blog_style_default_item_title.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+// Create a shortcut for params.
+$params = $displayData->params;
+$canEdit = $displayData->params->get('access-edit');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+?>
+
+<?php if ($displayData->state == 0 || $params->get('show_title') || ($params->get('show_author') && !empty($displayData->author ))) : ?>
+	<div class="page-header">
+		<?php if ($params->get('show_title')) : ?>
+			<h2 itemprop="name">
+				<?php if ($params->get('link_titles') && ($params->get('access-view') || $params->get('show_noauth', '0') == '1')) : ?>
+					<a href="<?php echo JRoute::_(
+						ContentHelperRoute::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language)
+					); ?>" itemprop="url">
+						<?php echo $this->escape($displayData->title); ?>
+					</a>
+				<?php else : ?>
+					<?php echo $this->escape($displayData->title); ?>
+				<?php endif; ?>
+			</h2>
+		<?php endif; ?>
+		
+		<?php if ($displayData->state == 0) : ?>
+			<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+		<?php endif; ?>
+
+		<?php if (strtotime($displayData->publish_up) > strtotime(JFactory::getDate())) : ?>
+			<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+		<?php endif; ?>
+		
+		<?php if ($displayData->publish_down != JFactory::getDbo()->getNullDate()
+			&& (strtotime($displayData->publish_down) < strtotime(JFactory::getDate()))
+		) : ?>
+			<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<?php endif; ?>
+	</div>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/blog_style_default_links.php b/core/layouts/joomla/content/blog_style_default_links.php
new file mode 100644
index 00000000..249ca028
--- /dev/null
+++ b/core/layouts/joomla/content/blog_style_default_links.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<ol class="nav nav-tabs nav-stacked">
+<?php foreach ($displayData->get('link_items') as $item) : ?>
+	<li>
+		<?php echo JHtml::_('link', JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)), $item->title); ?>
+	</li>
+<?php endforeach; ?>
+</ol>
diff --git a/core/layouts/joomla/content/categories_default.php b/core/layouts/joomla/content/categories_default.php
new file mode 100644
index 00000000..7a6e1dab
--- /dev/null
+++ b/core/layouts/joomla/content/categories_default.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<?php if ($displayData->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $displayData->escape($displayData->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<?php if ($displayData->params->get('show_base_description')) : ?>
+	<?php // If there is a description in the menu parameters use that; ?>
+	<?php if ($displayData->params->get('categories_description')) : ?>
+		<div class="category-desc base-desc">
+			<?php echo JHtml::_('content.prepare', $displayData->params->get('categories_description'), '',  $displayData->get('extension') . '.categories'); ?>
+		</div>
+	<?php else : ?>
+		<?php // Otherwise get one from the database if it exists. ?>
+		<?php if ($displayData->parent->description) : ?>
+			<div class="category-desc base-desc">
+				<?php echo JHtml::_('content.prepare', $displayData->parent->description, '', $displayData->parent->extension . '.categories'); ?>
+			</div>
+		<?php endif; ?>
+	<?php endif; ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/categories_default_items.php b/core/layouts/joomla/content/categories_default_items.php
new file mode 100644
index 00000000..cede03f5
--- /dev/null
+++ b/core/layouts/joomla/content/categories_default_items.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$class = ' class="first"';
+JHtml::_('bootstrap.tooltip');
+
+$item = $displayData->item;
+$items = $displayData->get('items');
+$params = $displayData->params;
+$extension = $displayData->get('extension');
+$className = substr($extension, 4);
+// This will work for the core components but not necessarily for other components
+// that may have different pluralisation rules.
+if (substr($className, -1) === 's')
+{
+	$className = rtrim($className, 's');
+}
diff --git a/core/layouts/joomla/content/category_default.php b/core/layouts/joomla/content/category_default.php
new file mode 100644
index 00000000..c4c0ca05
--- /dev/null
+++ b/core/layouts/joomla/content/category_default.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Note that this layout opens a div with the page class suffix. If you do not use the category children
+ * layout you need to close this div either by overriding this file or in your main layout.
+ */
+$params    = $displayData->params;
+$category  = $displayData->get('category');
+$extension = $category->extension;
+$canEdit   = $params->get('access-edit');
+$className = substr($extension, 4);
+
+$dispatcher = JEventDispatcher::getInstance();
+
+$category->text = $category->description;
+$dispatcher->trigger('onContentPrepare', array($extension . '.categories', &$category, &$params, 0));
+$category->description = $category->text;
+
+$results = $dispatcher->trigger('onContentAfterTitle', array($extension . '.categories', &$category, &$params, 0));
+$afterDisplayTitle = trim(implode("\n", $results));
+
+$results = $dispatcher->trigger('onContentBeforeDisplay', array($extension . '.categories', &$category, &$params, 0));
+$beforeDisplayContent = trim(implode("\n", $results));
+
+$results = $dispatcher->trigger('onContentAfterDisplay', array($extension . '.categories', &$category, &$params, 0));
+$afterDisplayContent = trim(implode("\n", $results));
+
+/**
+ * This will work for the core components but not necessarily for other components
+ * that may have different pluralisation rules.
+ */
+if (substr($className, -1) === 's')
+{
+	$className = rtrim($className, 's');
+}
+$tagsData = $category->tags->itemTags;
+?>
+<div>
+	<div class="<?php echo $className .'-category' . $displayData->pageclass_sfx; ?>">
+		<?php if ($params->get('show_page_heading')) : ?>
+			<h1>
+				<?php echo $displayData->escape($params->get('page_heading')); ?>
+			</h1>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_category_title', 1)) : ?>
+			<h2>
+				<?php echo JHtml::_('content.prepare', $category->title, '', $extension . '.category.title'); ?>
+			</h2>
+		<?php endif; ?>
+		<?php echo $afterDisplayTitle; ?>
+
+		<?php if ($params->get('show_cat_tags', 1)) : ?>
+			<?php echo JLayoutHelper::render('joomla.content.tags', $tagsData); ?>
+		<?php endif; ?>
+
+		<?php if ($beforeDisplayContent || $afterDisplayContent || $params->get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
+			<div class="category-desc">
+				<?php if ($params->get('show_description_image') && $category->getParams()->get('image')) : ?>
+					<img src="<?php echo $category->getParams()->get('image'); ?>" alt="<?php echo htmlspecialchars($category->getParams()->get('image_alt'), ENT_COMPAT, 'UTF-8'); ?>"/>
+				<?php endif; ?>
+				<?php echo $beforeDisplayContent; ?>
+				<?php if ($params->get('show_description') && $category->description) : ?>
+					<?php echo JHtml::_('content.prepare', $category->description, '', $extension . '.category.description'); ?>
+				<?php endif; ?>
+				<?php echo $afterDisplayContent; ?>
+				<div class="clr"></div>
+			</div>
+		<?php endif; ?>
+		<?php echo $displayData->loadTemplate($displayData->subtemplatename); ?>
+
+		<?php if ($displayData->maxLevel != 0 && $displayData->get('children')) : ?>
+			<div class="cat-children">
+				<?php if ($params->get('show_category_heading_title_text', 1) == 1) : ?>
+					<h3>
+						<?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
+					</h3>
+				<?php endif; ?>
+				<?php echo $displayData->loadTemplate('children'); ?>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>
+
diff --git a/core/layouts/joomla/content/full_image.php b/core/layouts/joomla/content/full_image.php
new file mode 100644
index 00000000..58f436db
--- /dev/null
+++ b/core/layouts/joomla/content/full_image.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+$params = $displayData->params;
+?>
+<?php $images = json_decode($displayData->images); ?>
+	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
+		<?php $imgfloat = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
+		<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
+		<?php if ($images->image_fulltext_caption) :
+			echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
+		endif; ?>
+		src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>" itemprop="image"/> </div>
+	<?php endif; ?>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/icons.php b/core/layouts/joomla/content/icons.php
new file mode 100644
index 00000000..a7e5d0dd
--- /dev/null
+++ b/core/layouts/joomla/content/icons.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('bootstrap.framework');
+
+$canEdit = $displayData['params']->get('access-edit');
+$articleId = $displayData['item']->id;
+
+?>
+
+<div class="icons">
+	<?php if (empty($displayData['print'])) : ?>
+
+		<?php if ($canEdit || $displayData['params']->get('show_print_icon') || $displayData['params']->get('show_email_icon')) : ?>
+			<div class="btn-group pull-right">
+				<button class="btn dropdown-toggle" type="button" id="dropdownMenuButton-<?php echo $articleId; ?>" aria-label="<?php echo JText::_('JUSER_TOOLS'); ?>"
+				data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<span class="icon-cog" aria-hidden="true"></span>
+					<span class="caret" aria-hidden="true"></span>
+				</button>
+				<?php // Note the actions class is deprecated. Use dropdown-menu instead. ?>
+				<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton-<?php echo $articleId; ?>">
+					<?php if ($displayData['params']->get('show_print_icon')) : ?>
+						<li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+					<?php if ($displayData['params']->get('show_email_icon')) : ?>
+						<li class="email-icon"> <?php echo JHtml::_('icon.email', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<li class="edit-icon"> <?php echo JHtml::_('icon.edit', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+				</ul>
+			</div>
+		<?php endif; ?>
+
+	<?php else : ?>
+
+		<div class="pull-right">
+			<?php echo JHtml::_('icon.print_screen', $displayData['item'], $displayData['params']); ?>
+		</div>
+
+	<?php endif; ?>
+</div>
diff --git a/core/layouts/joomla/content/icons/create.php b/core/layouts/joomla/content/icons/create.php
new file mode 100644
index 00000000..81b84551
--- /dev/null
+++ b/core/layouts/joomla/content/icons/create.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$params = $displayData['params'];
+$legacy = $displayData['legacy'];
+
+?>
+<?php if ($params->get('show_icons')) : ?>
+	<?php if ($legacy) : ?>
+		<?php echo JHtml::_('image', 'system/new.png', JText::_('JNEW'), null, true); ?>
+	<?php else : ?>
+		<span class="icon-plus" aria-hidden="true"></span>
+		<?php echo JText::_('JNEW'); ?>
+	<?php endif; ?>
+<?php else : ?>
+	<?php echo JText::_('JNEW') . '&#160;'; ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/icons/edit.php b/core/layouts/joomla/content/icons/edit.php
new file mode 100644
index 00000000..2258f754
--- /dev/null
+++ b/core/layouts/joomla/content/icons/edit.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$article = $displayData['article'];
+$overlib = $displayData['overlib'];
+$legacy  = $displayData['legacy'];
+
+if ($legacy)
+{
+	$icon = $article->state ? 'edit.png' : 'edit_unpublished.png';
+
+	if (strtotime($article->publish_up) > strtotime(JFactory::getDate())
+		|| ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != JFactory::getDbo()->getNullDate()))
+	{
+		$icon = 'edit_unpublished.png';
+	}
+}
+else
+{
+	$icon = $article->state ? 'edit' : 'eye-close';
+
+	if (strtotime($article->publish_up) > strtotime(JFactory::getDate())
+		|| ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != JFactory::getDbo()->getNullDate()))
+	{
+		$icon = 'eye-close';
+	}
+}
+
+?>
+<?php if ($legacy) : ?>
+	<?php echo JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true); ?>
+<?php else : ?>
+	<span class="hasTooltip icon-<?php echo $icon; ?> tip" title="<?php echo JHtml::tooltipText(JText::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
+	<?php echo JText::_('JGLOBAL_EDIT'); ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/icons/edit_lock.php b/core/layouts/joomla/content/icons/edit_lock.php
new file mode 100644
index 00000000..8dcd8666
--- /dev/null
+++ b/core/layouts/joomla/content/icons/edit_lock.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$tooltip = $displayData['tooltip'];
+$legacy  = $displayData['legacy'];
+
+?>
+<?php if ($legacy) : ?>
+	<span class="hasTooltip" title="<?php echo JHtml::tooltipText($tooltip . '', 0); ?>">
+		<?php echo JHtml::_('image', 'system/checked_out.png', null, null, true); ?>
+	</span>
+	<?php echo JText::_('JLIB_HTML_CHECKED_OUT'); ?>
+<?php else : ?>
+	<span class="hasTooltip icon-lock" title="<?php echo JHtml::tooltipText($tooltip . '', 0); ?>"></span>
+	<?php echo JText::_('JLIB_HTML_CHECKED_OUT'); ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/icons/email.php b/core/layouts/joomla/content/icons/email.php
new file mode 100644
index 00000000..4190b0c2
--- /dev/null
+++ b/core/layouts/joomla/content/icons/email.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$params = $displayData['params'];
+$legacy = $displayData['legacy'];
+
+?>
+<?php if ($params->get('show_icons')) : ?>
+	<?php if ($legacy) : ?>
+		<?php echo JHtml::_('image', 'system/emailButton.png', JText::_('JGLOBAL_EMAIL'), null, true); ?>
+	<?php else : ?>
+		<span class="icon-envelope" aria-hidden="true"></span>
+		<?php echo JText::_('JGLOBAL_EMAIL'); ?>
+	<?php endif; ?>
+<?php else : ?>
+	<?php echo JText::_('JGLOBAL_EMAIL'); ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/icons/print_popup.php b/core/layouts/joomla/content/icons/print_popup.php
new file mode 100644
index 00000000..36edc29f
--- /dev/null
+++ b/core/layouts/joomla/content/icons/print_popup.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$params = $displayData['params'];
+$legacy = $displayData['legacy'];
+
+?>
+<?php if ($params->get('show_icons')) : ?>
+	<?php if ($legacy) : ?>
+		<?php // Checks template image directory for image, if none found default are loaded ?>
+		<?php echo JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true); ?>
+	<?php else : ?>
+		<span class="icon-print" aria-hidden="true"></span>
+		<?php echo JText::_('JGLOBAL_PRINT'); ?>
+	<?php endif; ?>
+<?php else : ?>
+	<?php echo JText::_('JGLOBAL_PRINT'); ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/icons/print_screen.php b/core/layouts/joomla/content/icons/print_screen.php
new file mode 100644
index 00000000..36edc29f
--- /dev/null
+++ b/core/layouts/joomla/content/icons/print_screen.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$params = $displayData['params'];
+$legacy = $displayData['legacy'];
+
+?>
+<?php if ($params->get('show_icons')) : ?>
+	<?php if ($legacy) : ?>
+		<?php // Checks template image directory for image, if none found default are loaded ?>
+		<?php echo JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true); ?>
+	<?php else : ?>
+		<span class="icon-print" aria-hidden="true"></span>
+		<?php echo JText::_('JGLOBAL_PRINT'); ?>
+	<?php endif; ?>
+<?php else : ?>
+	<?php echo JText::_('JGLOBAL_PRINT'); ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/info_block.php b/core/layouts/joomla/content/info_block.php
new file mode 100644
index 00000000..57c2d94b
--- /dev/null
+++ b/core/layouts/joomla/content/info_block.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$blockPosition = $displayData['params']->get('info_block_position', 0);
+
+?>
+	<dl class="article-info muted">
+
+		<?php if ($displayData['position'] === 'above' && ($blockPosition == 0 || $blockPosition == 2)
+				|| $displayData['position'] === 'below' && ($blockPosition == 1)
+				) : ?>
+
+			<dt class="article-info-term">
+				<?php if ($displayData['params']->get('info_block_show_title', 1)) : ?>
+					<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+				<?php endif; ?>
+			</dt>
+
+			<?php if ($displayData['params']->get('show_author') && !empty($displayData['item']->author )) : ?>
+				<?php echo $this->sublayout('author', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
+				<?php echo $this->sublayout('parent_category', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_category')) : ?>
+				<?php echo $this->sublayout('category', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_associations')) : ?>
+				<?php echo $this->sublayout('associations', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_publish_date')) : ?>
+				<?php echo $this->sublayout('publish_date', $displayData); ?>
+			<?php endif; ?>
+
+		<?php endif; ?>
+
+		<?php if ($displayData['position'] === 'above' && ($blockPosition == 0)
+				|| $displayData['position'] === 'below' && ($blockPosition == 1 || $blockPosition == 2)
+				) : ?>
+			<?php if ($displayData['params']->get('show_create_date')) : ?>
+				<?php echo $this->sublayout('create_date', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_modify_date')) : ?>
+				<?php echo $this->sublayout('modify_date', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_hits')) : ?>
+				<?php echo $this->sublayout('hits', $displayData); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+	</dl>
diff --git a/core/layouts/joomla/content/info_block/associations.php b/core/layouts/joomla/content/info_block/associations.php
new file mode 100644
index 00000000..6bef59dd
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/associations.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<?php if (!empty($displayData['item']->associations)) : ?>
+<?php $associations = $displayData['item']->associations; ?>
+
+<dd class="association">
+	<?php echo JText::_('JASSOCIATIONS'); ?>
+	<?php foreach ($associations as $association) : ?>
+		<?php if ($displayData['item']->params->get('flags', 1) && $association['language']->image) : ?>
+			<?php $flag = JHtml::_('image', 'mod_languages/' . $association['language']->image . '.gif', $association['language']->title_native, array('title' => $association['language']->title_native), true); ?>
+			&nbsp;<a href="<?php echo JRoute::_($association['item']); ?>"><?php echo $flag; ?></a>&nbsp;
+		<?php else : ?>
+			<?php $class = 'label label-association label-' . $association['language']->sef; ?>
+			&nbsp;<a class="<?php echo $class; ?>" href="<?php echo JRoute::_($association['item']); ?>"><?php echo strtoupper($association['language']->sef); ?></a>&nbsp;
+		<?php endif; ?>
+	<?php endforeach; ?>
+</dd>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/info_block/author.php b/core/layouts/joomla/content/info_block/author.php
new file mode 100644
index 00000000..195688b4
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/author.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<dd class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
+	<?php $author = ($displayData['item']->created_by_alias ?: $displayData['item']->author); ?>
+	<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
+	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $displayData['item']->contact_link, $author, array('itemprop' => 'url'))); ?>
+	<?php else : ?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+	<?php endif; ?>
+</dd>
diff --git a/core/layouts/joomla/content/info_block/block.php b/core/layouts/joomla/content/info_block/block.php
new file mode 100644
index 00000000..ec3f1c40
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/block.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLog::add('The layout joomla.content.info_block.block is deprecated, use joomla.content.info_block instead.', JLog::WARNING, 'deprecated');
+echo JLayoutHelper::render('joomla.content.info_block', $displayData);
diff --git a/core/layouts/joomla/content/info_block/category.php b/core/layouts/joomla/content/info_block/category.php
new file mode 100644
index 00000000..2e9c05fa
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/category.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="category-name">
+				<?php $title = $this->escape($displayData['item']->category_title); ?>
+				<?php if ($displayData['params']->get('link_category') && $displayData['item']->catslug) : ?>
+					<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->catslug)) . '" itemprop="genre">' . $title . '</a>'; ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
+				<?php endif; ?>
+			</dd>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/info_block/create_date.php b/core/layouts/joomla/content/info_block/create_date.php
new file mode 100644
index 00000000..906f7448
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/create_date.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="create">
+					<span class="icon-calendar" aria-hidden="true"></span>
+					<time datetime="<?php echo JHtml::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
+						<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $displayData['item']->created, JText::_('DATE_FORMAT_LC3'))); ?>
+					</time>
+			</dd>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/info_block/hits.php b/core/layouts/joomla/content/info_block/hits.php
new file mode 100644
index 00000000..475ddfee
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/hits.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="hits">
+					<span class="icon-eye-open" aria-hidden="true"></span>
+					<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>" />
+					<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
+			</dd>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/info_block/modify_date.php b/core/layouts/joomla/content/info_block/modify_date.php
new file mode 100644
index 00000000..d16fb021
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/modify_date.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="modified">
+				<span class="icon-calendar" aria-hidden="true"></span>
+				<time datetime="<?php echo JHtml::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
+					<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $displayData['item']->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+				</time>
+			</dd>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/info_block/parent_category.php b/core/layouts/joomla/content/info_block/parent_category.php
new file mode 100644
index 00000000..c9fe8462
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/parent_category.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="parent-category-name">
+				<?php $title = $this->escape($displayData['item']->parent_title); ?>
+				<?php if ($displayData['params']->get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
+					<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->parent_slug)) . '" itemprop="genre">' . $title . '</a>'; ?>
+					<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
+				<?php endif; ?>
+			</dd>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/info_block/publish_date.php b/core/layouts/joomla/content/info_block/publish_date.php
new file mode 100644
index 00000000..d8598f4d
--- /dev/null
+++ b/core/layouts/joomla/content/info_block/publish_date.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+			<dd class="published">
+				<span class="icon-calendar" aria-hidden="true"></span>
+				<time datetime="<?php echo JHtml::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
+					<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $displayData['item']->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+				</time>
+			</dd>
\ No newline at end of file
diff --git a/core/layouts/joomla/content/intro_image.php b/core/layouts/joomla/content/intro_image.php
new file mode 100644
index 00000000..97b4279e
--- /dev/null
+++ b/core/layouts/joomla/content/intro_image.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+$params = $displayData->params;
+?>
+<?php $images = json_decode($displayData->images); ?>
+<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
+	<?php $imgfloat = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro; ?>
+	<div class="pull-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image">
+	<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language)); ?>"><img
+		<?php if ($images->image_intro_caption) : ?>
+			<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_intro_caption) . '"'; ?>
+		<?php endif; ?>
+		src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="thumbnailUrl"/></a>
+	<?php else : ?><img
+		<?php if ($images->image_intro_caption) : ?>
+			<?php echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8') . '"'; ?>
+		<?php endif; ?>
+		src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="thumbnailUrl"/>
+	<?php endif; ?>
+	</div>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/language.php b/core/layouts/joomla/content/language.php
new file mode 100644
index 00000000..4035b44f
--- /dev/null
+++ b/core/layouts/joomla/content/language.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$item = $displayData;
+
+if ($item->language === '*')
+{
+	echo JText::alt('JALL', 'language');
+}
+elseif ($item->language_image)
+{
+	echo JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', '', null, true) . '&nbsp;' . htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8');
+}
+elseif ($item->language_title)
+{
+	echo htmlspecialchars($item->language_title, ENT_COMPAT, 'UTF-8');
+}
+else
+{
+	echo JText::_('JUNDEFINED');
+}
diff --git a/core/layouts/joomla/content/options_default.php b/core/layouts/joomla/content/options_default.php
new file mode 100644
index 00000000..1abefa57
--- /dev/null
+++ b/core/layouts/joomla/content/options_default.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+
+<fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
+	<legend><?php echo $displayData->name; ?></legend>
+	<?php if (!empty($displayData->description)) : ?>
+		<p><?php echo $displayData->description; ?></p>
+	<?php endif; ?>
+	<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
+	<?php foreach ($fieldsnames as $fieldname) : ?>
+		<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
+			<?php $datashowon = ''; ?>
+			<?php $groupClass = $field->type === 'Spacer' ? ' field-spacer' : ''; ?>
+			<?php if ($field->showon) : ?>
+				<?php JHtml::_('jquery.framework'); ?>
+				<?php JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); ?>
+				<?php $datashowon = ' data-showon=\'' . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\''; ?>
+			<?php endif; ?>
+			<div class="control-group<?php echo $groupClass; ?>"<?php echo $datashowon; ?>>
+				<?php if (!isset($displayData->showlabel) || $displayData->showlabel) : ?>
+					<div class="control-label"><?php echo $field->label; ?></div>
+				<?php endif; ?>
+				<div class="controls"><?php echo $field->input; ?></div>
+			</div>
+		<?php endforeach; ?>
+	<?php endforeach; ?>
+</fieldset>
diff --git a/core/layouts/joomla/content/readmore.php b/core/layouts/joomla/content/readmore.php
new file mode 100644
index 00000000..14c606f2
--- /dev/null
+++ b/core/layouts/joomla/content/readmore.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$params = $displayData['params'];
+$item = $displayData['item'];
+$direction = JFactory::getLanguage()->isRtl() ? 'left' : 'right';
+?>
+
+<p class="readmore">
+	<?php if (!$params->get('access-view')) : ?>
+		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?> 
+			<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
+			<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
+		</a>
+	<?php elseif ($readmore = $item->alternative_readmore) : ?>
+		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
+			<?php echo $readmore; ?>
+			<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
+				<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+			<?php endif; ?>
+		</a>
+	<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
+			<?php echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); ?>
+		</a>
+	<?php else : ?>
+		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
+			<?php echo JText::_('COM_CONTENT_READ_MORE'); ?>
+			<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+		</a>
+	<?php endif; ?>
+</p>
diff --git a/core/layouts/joomla/content/tags.php b/core/layouts/joomla/content/tags.php
new file mode 100644
index 00000000..94a1053d
--- /dev/null
+++ b/core/layouts/joomla/content/tags.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
+
+$authorised = JFactory::getUser()->getAuthorisedViewLevels();
+
+?>
+<?php if (!empty($displayData)) : ?>
+	<ul class="tags inline">
+		<?php foreach ($displayData as $i => $tag) : ?>
+			<?php if (in_array($tag->access, $authorised)) : ?>
+				<?php $tagParams = new Registry($tag->params); ?>
+				<?php $link_class = $tagParams->get('tag_link_class', 'label label-info'); ?>
+				<li class="tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>" itemprop="keywords">
+					<a href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($tag->tag_id . ':' . $tag->alias)); ?>" class="<?php echo $link_class; ?>">
+						<?php echo $this->escape($tag->title); ?>
+					</a>
+				</li>
+			<?php endif; ?>
+		<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
diff --git a/core/layouts/joomla/content/text_filters.php b/core/layouts/joomla/content/text_filters.php
new file mode 100644
index 00000000..7a475507
--- /dev/null
+++ b/core/layouts/joomla/content/text_filters.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+
+<fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
+	<legend><?php echo $displayData->name; ?></legend>
+	<?php if (!empty($displayData->description)) : ?>
+		<p><?php echo $displayData->description; ?></p>
+	<?php endif; ?>
+	<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
+	<?php foreach ($fieldsnames as $fieldname) : ?>
+		<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
+			<div><?php echo $field->input; ?></div>
+		<?php endforeach; ?>
+	<?php endforeach; ?>
+</fieldset>
diff --git a/core/layouts/joomla/edit/associations.php b/core/layouts/joomla/edit/associations.php
new file mode 100644
index 00000000..e3c9f500
--- /dev/null
+++ b/core/layouts/joomla/edit/associations.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$form     = $displayData->getForm();
+$options  = array(
+	'formControl' => $form->getFormControl(),
+	'hidden'      => (int) ($form->getValue('language', null, '*') === '*'),
+);
+
+JHtml::_('behavior.core');
+JHtml::_('jquery.framework');
+JText::script('JGLOBAL_ASSOC_NOT_POSSIBLE');
+JText::script('JGLOBAL_ASSOCIATIONS_RESET_WARNING');
+JFactory::getDocument()->addScriptOptions('system.associations.edit', $options);
+JHtml::_('script', 'system/associations-edit.js', array('version' => 'auto', 'relative' => true));
+
+// JLayout for standard handling of associations fields in the administrator items edit screens.
+echo $form->renderFieldset('item_associations');
diff --git a/core/layouts/joomla/edit/details.php b/core/layouts/joomla/edit/details.php
new file mode 100644
index 00000000..0b5da7b2
--- /dev/null
+++ b/core/layouts/joomla/edit/details.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  3.2 removed without replacement in 4.0 see global.php for an alternative
+ */
+
+defined('JPATH_BASE') or die;
+
+$app = JFactory::getApplication();
+
+// JLayout for standard handling of the details sidebar in administrator edit screens.
+$title = $displayData->getForm()->getValue('title');
+$published = $displayData->getForm()->getField('published');
+$saveHistory = $displayData->get('state')->get('params')->get('save_history', 0);
+?>
+<div class="span2">
+	<h4><?php echo JText::_('JDETAILS'); ?></h4>
+	<hr />
+	<fieldset class="form-vertical">
+		<?php if (empty($title)) : ?>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $displayData->getForm()->getValue('name'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $displayData->getForm()->getValue('title'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+
+		<?php if ($published) : ?>
+			<?php echo $displayData->getForm()->renderField('published'); ?>
+		<?php else : ?>
+			<?php echo $displayData->getForm()->renderField('state'); ?>
+		<?php endif; ?>
+
+		<?php echo $displayData->getForm()->renderField('access'); ?>
+		<?php echo $displayData->getForm()->renderField('featured'); ?>
+		<?php if (JLanguageMultilang::isEnabled()) : ?>
+			<?php echo $displayData->getForm()->renderField('language'); ?>
+		<?php else : ?>
+			<input type="hidden" id="jform_language" name="jform[language]" value="<?php echo $displayData->getForm()->getValue('language'); ?>" />
+		<?php endif; ?>
+		
+		<?php echo $displayData->getForm()->renderField('tags'); ?>
+		<?php if ($saveHistory) : ?>
+			<?php echo $displayData->getForm()->renderField('version_note'); ?>
+		<?php endif; ?>
+	</fieldset>
+</div>
diff --git a/core/layouts/joomla/edit/fieldset.php b/core/layouts/joomla/edit/fieldset.php
new file mode 100644
index 00000000..be7ff371
--- /dev/null
+++ b/core/layouts/joomla/edit/fieldset.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$name = $displayData->get('fieldset');
+$fieldSet = $form->getFieldset($name);
+
+if (empty($fieldSet))
+{
+	return;
+}
+
+$ignoreFields = $displayData->get('ignore_fields') ? : array();
+$extraFields = $displayData->get('extra_fields') ? : array();
+
+if (!empty($displayData->showOptions) || $displayData->get('show_options', 1))
+{
+	if (isset($extraFields[$name]))
+	{
+		foreach ($extraFields[$name] as $f)
+		{
+			if (in_array($f, $ignoreFields))
+			{
+				continue;
+			}
+			if ($form->getField($f))
+			{
+				$fieldSet[] = $form->getField($f);
+			}
+		}
+	}
+
+	$html = array();
+
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->renderField();
+	}
+
+	echo implode('', $html);
+}
+else
+{
+	$html = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->input;
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/core/layouts/joomla/edit/frontediting_modules.php b/core/layouts/joomla/edit/frontediting_modules.php
new file mode 100644
index 00000000..83b554e0
--- /dev/null
+++ b/core/layouts/joomla/edit/frontediting_modules.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+// JLayout for standard handling of the edit modules:
+
+$moduleHtml   = &$displayData['moduleHtml'];
+$mod          = $displayData['module'];
+$position     = $displayData['position'];
+$menusEditing = $displayData['menusediting'];
+$parameters   = JComponentHelper::getParams('com_modules');
+$redirectUri  = '&return=' . urlencode(base64_encode(JUri::getInstance()->toString()));
+$target       = '_blank';
+$itemid       = JFactory::getApplication()->input->get('Itemid', '0', 'int');
+
+if (preg_match('/<(?:div|span|nav|ul|ol|h\d) [^>]*class="[^"]* jmoddiv"/', $moduleHtml))
+{
+	// Module has already module edit button:
+	return;
+}
+
+// Add css class jmoddiv and data attributes for module-editing URL and for the tooltip:
+$editUrl = JUri::base() . 'administrator/index.php?option=com_modules&task=module.edit&id=' . (int) $mod->id;
+
+if ($parameters->get('redirect_edit', 'site') === 'site')
+{
+	$editUrl = JUri::base() . 'index.php?option=com_config&controller=config.display.modules&id=' . (int) $mod->id . '&Itemid=' . $itemid . $redirectUri;
+	$target  = '_self';
+}
+
+// Add class, editing URL and tooltip, and if module of type menu, also the tooltip for editing the menu item:
+$count = 0;
+$moduleHtml = preg_replace(
+	// Replace first tag of module with a class
+	'/^(\s*<(?:div|span|nav|ul|ol|h\d|section|aside|nav|address|article) [^>]*class="[^"]*)"/',
+	// By itself, adding class jmoddiv and data attributes for the URL and tooltip:
+	'\\1 jmoddiv" data-jmodediturl="' . $editUrl . '" data-target="' . $target . '" data-jmodtip="'
+	.	JHtml::_('tooltipText', 
+			JText::_('JLIB_HTML_EDIT_MODULE'),
+			htmlspecialchars($mod->title, ENT_COMPAT, 'UTF-8') . '<br />' . sprintf(JText::_('JLIB_HTML_EDIT_MODULE_IN_POSITION'), htmlspecialchars($position, ENT_COMPAT, 'UTF-8')),
+			0
+		)
+	. '"'
+	// And if menu editing is enabled and allowed and it's a menu module, add data attributes for menu editing:
+	.	($menusEditing && $mod->module === 'mod_menu' ?
+			'" data-jmenuedittip="' . JHtml::_('tooltipText', 'JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"'
+			:
+			''
+		),
+	$moduleHtml,
+	1,
+	$count
+);
+
+if ($count)
+{
+	// Load once booststrap tooltip and add stylesheet and javascript to head:
+	JHtml::_('bootstrap.tooltip');
+	JHtml::_('bootstrap.popover');
+
+	JHtml::_('stylesheet', 'system/frontediting.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('script', 'system/frontediting.js', array('version' => 'auto', 'relative' => true));
+}
diff --git a/core/layouts/joomla/edit/global.php b/core/layouts/joomla/edit/global.php
new file mode 100644
index 00000000..7670550a
--- /dev/null
+++ b/core/layouts/joomla/edit/global.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app       = JFactory::getApplication();
+$form      = $displayData->getForm();
+$input     = $app->input;
+$component = $input->getCmd('option', 'com_content');
+
+if ($component === 'com_categories')
+{
+	$extension = $input->getCmd('extension', 'com_content');
+	$parts     = explode('.', $extension);
+	$component = $parts[0];
+}
+
+$saveHistory = JComponentHelper::getParams($component)->get('save_history', 0);
+
+$fields = $displayData->get('fields') ?: array(
+	array('parent', 'parent_id'),
+	array('published', 'state', 'enabled'),
+	array('category', 'catid'),
+	'featured',
+	'sticky',
+	'access',
+	'language',
+	'tags',
+	'note',
+	'version_note',
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+if (!$saveHistory)
+{
+	$hiddenFields[] = 'version_note';
+}
+
+$html   = array();
+$html[] = '<fieldset class="form-vertical">';
+
+foreach ($fields as $field)
+{
+	foreach ((array) $field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			$html[] = $form->renderField($f);
+			break;
+		}
+	}
+}
+
+$html[] = '</fieldset>';
+
+echo implode('', $html);
diff --git a/core/layouts/joomla/edit/item_title.php b/core/layouts/joomla/edit/item_title.php
new file mode 100644
index 00000000..562f3d65
--- /dev/null
+++ b/core/layouts/joomla/edit/item_title.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  3.2
+ */
+
+defined('JPATH_BASE') or die;
+$title = $displayData->getForm()->getValue('title');
+$name = $displayData->getForm()->getValue('name');
+
+?>
+
+<?php if ($title) : ?>
+	<h2><?php echo $title; ?></h2>
+<?php endif; ?>
+
+<?php if ($name) : ?>
+	<h2><?php echo $name; ?></h2>
+<?php endif;
diff --git a/core/layouts/joomla/edit/metadata.php b/core/layouts/joomla/edit/metadata.php
new file mode 100644
index 00000000..5115d7c5
--- /dev/null
+++ b/core/layouts/joomla/edit/metadata.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$form = $displayData->getForm();
+
+// JLayout for standard handling of metadata fields in the administrator content edit screens.
+$fieldSets = $form->getFieldsets('metadata');
+?>
+
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+	<?php endif; ?>
+
+	<?php
+	// Include the real fields in this panel.
+	if ($name === 'jmetadata')
+	{
+		echo $form->renderField('metadesc');
+		echo $form->renderField('metakey');
+		echo $form->renderField('xreference');
+	}
+
+	foreach ($form->getFieldset($name) as $field)
+	{
+		if ($field->name !== 'jform[metadata][tags][]')
+		{
+			echo $field->renderField();
+		}
+	} ?>
+<?php endforeach; ?>
diff --git a/core/layouts/joomla/edit/params.php b/core/layouts/joomla/edit/params.php
new file mode 100644
index 00000000..d93b0864
--- /dev/null
+++ b/core/layouts/joomla/edit/params.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app       = JFactory::getApplication();
+$form      = $displayData->getForm();
+$fieldSets = $form->getFieldsets();
+
+if (empty($fieldSets))
+{
+	return;
+}
+
+$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: array();
+$ignoreFields    = $displayData->get('ignore_fields') ?: array();
+$extraFields     = $displayData->get('extra_fields') ?: array();
+$tabName         = $displayData->get('tab_name') ?: 'myTab';
+
+// These are required to preserve data on save when fields are not displayed.
+$hiddenFieldsets = $displayData->get('hiddenFieldsets') ?: array();
+
+// These are required to configure showing and hiding fields in the editor.
+$configFieldsets = $displayData->get('configFieldsets') ?: array();
+
+// Handle the hidden fieldsets when show_options is set false
+if (!$displayData->get('show_options', 1))
+{
+	// The HTML buffer
+	$html   = array();
+
+	// Hide the whole buffer
+	$html[] = '<div style="display:none;">';
+
+	// Loop over the fieldsets
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		// Check if the fieldset should be ignored
+		if (in_array($name, $ignoreFieldsets, true))
+		{
+			continue;
+		}
+
+		// If it is a hidden fieldset, render the inputs
+		if (in_array($name, $hiddenFieldsets))
+		{
+			// Loop over the fields
+			foreach ($form->getFieldset($name) as $field)
+			{
+				// Add only the input on the buffer
+				$html[] = $field->input;
+			}
+
+			// Make sure the fieldset is not rendered twice
+			$ignoreFieldsets[] = $name;
+		}
+
+		// Check if it is the correct fieldset to ignore
+		if (strpos($name, 'basic') === 0)
+		{
+			// Ignore only the fieldsets which are defined by the options not the custom fields ones
+			$ignoreFieldsets[] = $name;
+		}
+	}
+
+	// Close the container
+	$html[] = '</div>';
+
+	// Echo the hidden fieldsets
+	echo implode('', $html);
+}
+
+// Loop again over the fieldsets
+foreach ($fieldSets as $name => $fieldSet)
+{
+	// Ensure any fieldsets we don't want to show are skipped (including repeating formfield fieldsets)
+	if ((isset($fieldSet->repeat) && $fieldSet->repeat === true)
+		|| in_array($name, $ignoreFieldsets)
+		|| (!empty($configFieldsets) && in_array($name, $configFieldsets, true))
+		|| (!empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets, true))
+	)
+	{
+		continue;
+	}
+
+	// Determine the label
+	if (!empty($fieldSet->label))
+	{
+		$label = JText::_($fieldSet->label);
+	}
+	else
+	{
+		$label = strtoupper('JGLOBAL_FIELDSET_' . $name);
+		if (JText::_($label) === $label)
+		{
+			$label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL');
+		}
+		$label = JText::_($label);
+	}
+
+	// Start the tab
+	echo JHtml::_('bootstrap.addTab', $tabName, 'attrib-' . $name, $label);
+
+	// Include the description when available
+	if (isset($fieldSet->description) && trim($fieldSet->description))
+	{
+		echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	}
+
+	// The name of the fieldset to render
+	$displayData->fieldset = $name;
+
+	// Force to show the options
+	$displayData->showOptions = true;
+
+	// Render the fieldset
+	echo JLayoutHelper::render('joomla.edit.fieldset', $displayData);
+
+	// End the tab
+	echo JHtml::_('bootstrap.endTab');
+}
diff --git a/core/layouts/joomla/edit/publishingdata.php b/core/layouts/joomla/edit/publishingdata.php
new file mode 100644
index 00000000..c64bcb3b
--- /dev/null
+++ b/core/layouts/joomla/edit/publishingdata.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'publish_up',
+	'publish_down',
+	array('created', 'created_time'),
+	array('created_by', 'created_user_id'),
+	'created_by_alias',
+	array('modified', 'modified_time'),
+	array('modified_by', 'modified_user_id'),
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+	foreach ((array) $field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			echo $form->renderField($f);
+			break;
+		}
+	}
+}
diff --git a/core/layouts/joomla/edit/title_alias.php b/core/layouts/joomla/edit/title_alias.php
new file mode 100644
index 00000000..703b6291
--- /dev/null
+++ b/core/layouts/joomla/edit/title_alias.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$form = $displayData->getForm();
+
+$title = $form->getField('title') ? 'title' : ($form->getField('name') ? 'name' : '');
+
+?>
+<div class="form-inline form-inline-header">
+	<?php
+	echo $title ? $form->renderField($title) : '';
+	echo $form->renderField('alias');
+	?>
+</div>
diff --git a/core/layouts/joomla/editors/buttons.php b/core/layouts/joomla/editors/buttons.php
new file mode 100644
index 00000000..e8ca66de
--- /dev/null
+++ b/core/layouts/joomla/editors/buttons.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$buttons = $displayData;
+
+?>
+<div id="editor-xtd-buttons" class="btn-toolbar pull-left" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>">
+	<?php if ($buttons) : ?>
+		<?php foreach ($buttons as $button) : ?>
+			<?php echo $this->sublayout('button', $button); ?>
+		<?php endforeach; ?>
+	<?php endif; ?>
+</div>
diff --git a/core/layouts/joomla/editors/buttons/button.php b/core/layouts/joomla/editors/buttons/button.php
new file mode 100644
index 00000000..3d7d6d06
--- /dev/null
+++ b/core/layouts/joomla/editors/buttons/button.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$button = $displayData;
+
+?>
+<?php if ($button->get('name')) : ?>
+	<?php
+		$class    = $button->get('class') ?: null;
+		$class	 .= $button->get('modal') ? ' modal-button' : null;
+		$href     = $button->get('link') ? ' href="' . JUri::base() . $button->get('link') . '"' : null;
+		$onclick  = $button->get('onclick') ? ' onclick="' . $button->get('onclick') . '"' : '';
+		$title    = $button->get('title') ?: $button->get('text');
+
+	// Load modal popup behavior
+	if ($button->get('modal'))
+	{
+		JHtml::_('behavior.modal', 'a.modal-button');
+	}
+	?>
+	<a class="<?php echo $class; ?>" title="<?php echo $title; ?>" <?php echo $href, $onclick; ?> rel="<?php echo $button->get('options'); ?>">
+		<span class="icon-<?php echo $button->get('name'); ?>" aria-hidden="true"></span> <?php echo $button->get('text'); ?>
+	</a>
+<?php endif;
diff --git a/core/layouts/joomla/error/backtrace.php b/core/layouts/joomla/error/backtrace.php
new file mode 100644
index 00000000..53dda9ec
--- /dev/null
+++ b/core/layouts/joomla/error/backtrace.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var $displayData array */
+$backtraceList = $displayData['backtrace'];
+
+if (!$backtraceList)
+{
+	return;
+}
+
+$class = isset($displayData['class']) ? $displayData['class'] : 'table table-striped table-bordered';
+?>
+<table cellpadding="0" cellspacing="0" class="Table <?php echo $class ?>">
+	<tr>
+		<td colspan="3" class="TD">
+			<strong>Call stack</strong>
+		</td>
+	</tr>
+
+	<tr>
+		<td class="TD">
+			<strong>#</strong>
+		</td>
+		<td class="TD">
+			<strong>Function</strong>
+		</td>
+		<td class="TD">
+			<strong>Location</strong>
+		</td>
+	</tr>
+
+	<?php foreach ($backtraceList as $k => $backtrace): ?>
+	<tr>
+		<td class="TD">
+			<?php echo $k + 1; ?>
+		</td>
+
+		<?php if (isset($backtrace['class'])): ?>
+		<td class="TD">
+			<?php echo $backtrace['class'] . $backtrace['type'] . $backtrace['function'] . '()'; ?>
+		</td>
+		<?php else: ?>
+		<td class="TD">
+			<?php echo $backtrace['function'] . '()'; ?>
+		</td>
+		<?php endif; ?>
+
+		<?php if (isset($backtrace['file'])): ?>
+		<td class="TD">
+			<?php echo JHtml::_('debug.xdebuglink', $backtrace['file'], $backtrace['line']); ?>
+		</td>
+		<?php else: ?>
+		<td class="TD">
+			&#160;
+		</td>
+		<?php endif; ?>
+	</tr>
+	<?php endforeach; ?>
+</table>
diff --git a/core/layouts/joomla/error/index.html b/core/layouts/joomla/error/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/layouts/joomla/error/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/layouts/joomla/form/field/calendar.php b/core/layouts/joomla/form/field/calendar.php
new file mode 100644
index 00000000..50623445
--- /dev/null
+++ b/core/layouts/joomla/form/field/calendar.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+extract($displayData);
+
+// Get some system objects.
+$document = JFactory::getDocument();
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ *
+ * Calendar Specific
+ * @var   string   $localesPath     The relative path for the locale file
+ * @var   string   $helperPath      The relative path for the helper file
+ * @var   string   $minYear         The minimum year, that will be subtracted/added to current year
+ * @var   string   $maxYear         The maximum year, that will be subtracted/added to current year
+ * @var   integer  $todaybutton     The today button
+ * @var   integer  $weeknumbers     The week numbers display
+ * @var   integer  $showtime        The time selector display
+ * @var   integer  $filltable       The previous/next month filling
+ * @var   integer  $timeformat      The time format
+ * @var   integer  $singleheader    Display different header row for month/year
+ * @var   integer  $direction       The document direction
+ */
+
+$inputvalue = '';
+
+// Build the attributes array.
+$attributes = array();
+
+empty($size)      ? null : $attributes['size'] = $size;
+empty($maxlength) ? null : $attributes['maxlength'] = ' maxlength="' . $maxLength . '"';
+empty($class)     ? null : $attributes['class'] = $class;
+!$readonly        ? null : $attributes['readonly'] = 'readonly';
+!$disabled        ? null : $attributes['disabled'] = 'disabled';
+empty($onchange)  ? null : $attributes['onchange'] = $onchange;
+
+if ($required)
+{
+	$attributes['required'] = '';
+	$attributes['aria-required'] = 'true';
+}
+
+// Handle the special case for "now".
+if (strtoupper($value) == 'NOW')
+{
+	$value = JFactory::getDate()->format('Y-m-d H:i:s');
+}
+
+$readonly = isset($attributes['readonly']) && $attributes['readonly'] == 'readonly';
+$disabled = isset($attributes['disabled']) && $attributes['disabled'] == 'disabled';
+
+if (is_array($attributes))
+{
+	$attributes = ArrayHelper::toString($attributes);
+}
+
+$cssFileExt = ($direction === 'rtl') ? '-rtl.css' : '.css';
+
+// Load polyfills for older IE
+JHtml::_('behavior.polyfill', array('event', 'classlist', 'map'), 'lte IE 11');
+
+// The static assets for the calendar
+JHtml::_('script', $localesPath, false, true, false, false, true);
+JHtml::_('script', $helperPath, false, true, false, false, true);
+JHtml::_('script', 'system/fields/calendar.min.js', false, true, false, false, true);
+JHtml::_('stylesheet', 'system/fields/calendar' . $cssFileExt, array(), true);
+?>
+<div class="field-calendar">
+	<?php if (!$readonly && !$disabled) : ?>
+	<div class="input-append">
+		<?php endif; ?>
+		<input type="text" id="<?php echo $id; ?>" name="<?php
+		echo $name; ?>" value="<?php
+		echo htmlspecialchars(($value !== '0000-00-00 00:00:00') ? $value : '', ENT_COMPAT, 'UTF-8'); ?>" <?php echo $attributes; ?>
+		<?php echo !empty($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : ''; ?> data-alt-value="<?php
+		echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" autocomplete="off"/>
+		<button type="button" class="<?php echo ($readonly || $disabled) ? 'hidden ' : ''; ?>btn btn-secondary"
+			id="<?php echo  $id; ?>_btn"
+			data-inputfield="<?php echo $id; ?>"
+			data-dayformat="<?php echo $format; ?>"
+			data-button="<?php echo $id; ?>_btn"
+			data-firstday="<?php echo JFactory::getLanguage()->getFirstDay(); ?>"
+			data-weekend="<?php echo JFactory::getLanguage()->getWeekEnd(); ?>"
+			data-today-btn="<?php echo $todaybutton; ?>"
+			data-week-numbers="<?php echo $weeknumbers; ?>"
+			data-show-time="<?php echo $showtime; ?>"
+			data-show-others="<?php echo $filltable; ?>"
+			data-time-24="<?php echo $timeformat; ?>"
+			data-only-months-nav="<?php echo $singleheader; ?>"
+			<?php echo isset($minYear) && strlen($minYear) ? 'data-min-year="' . $minYear . '"' : ''; ?>
+			<?php echo isset($maxYear) && strlen($maxYear) ? 'data-max-year="' . $maxYear . '"' : ''; ?>
+			title="<?php echo JText::_('JLIB_HTML_BEHAVIOR_OPEN_CALENDAR'); ?>"
+		><span class="icon-calendar" aria-hidden="true"></span></button>
+		<?php if (!$readonly && !$disabled) : ?>
+	</div>
+<?php endif; ?>
+</div>
diff --git a/core/layouts/joomla/form/field/checkboxes.php b/core/layouts/joomla/form/field/checkboxes.php
new file mode 100644
index 00000000..4d562166
--- /dev/null
+++ b/core/layouts/joomla/form/field/checkboxes.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+/**
+ * The format of the input tag to be filled in using sprintf.
+ *     %1 - id
+ *     %2 - name
+ *     %3 - value
+ *     %4 = any other attributes
+ */
+$format = '<input type="checkbox" id="%1$s" name="%2$s" value="%3$s" %4$s />';
+
+// The alt option for JText::alt
+$alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
+?>
+
+<fieldset id="<?php echo $id; ?>" class="<?php echo trim($class . ' checkboxes'); ?>"
+	<?php echo $required ? 'required aria-required="true"' : ''; ?>
+	<?php echo $autofocus ? 'autofocus' : ''; ?>>
+
+	<?php foreach ($options as $i => $option) : ?>
+		<?php
+			// Initialize some option attributes.
+			$checked = in_array((string) $option->value, $checkedOptions, true) ? 'checked' : '';
+
+			// In case there is no stored value, use the option's default state.
+			$checked        = (!$hasValue && $option->checked) ? 'checked' : $checked;
+			$optionClass    = !empty($option->class) ? 'class="' . $option->class . '"' : '';
+			$optionDisabled = !empty($option->disable) || $disabled ? 'disabled' : '';
+
+			// Initialize some JavaScript option attributes.
+			$onclick  = !empty($option->onclick) ? 'onclick="' . $option->onclick . '"' : '';
+			$onchange = !empty($option->onchange) ? 'onchange="' . $option->onchange . '"' : '';
+
+			$oid        = $id . $i;
+			$value      = htmlspecialchars($option->value, ENT_COMPAT, 'UTF-8');
+			$attributes = array_filter(array($checked, $optionClass, $optionDisabled, $onchange, $onclick));
+		?>
+
+		<label for="<?php echo $oid; ?>" class="checkbox">
+			<?php echo sprintf($format, $oid, $name, $value, implode(' ', $attributes)); ?>
+		<?php echo $option->text; ?></label>
+	<?php endforeach; ?>
+</fieldset>
diff --git a/core/layouts/joomla/form/field/color/advanced.php b/core/layouts/joomla/form/field/color/advanced.php
new file mode 100644
index 00000000..4be8a9d1
--- /dev/null
+++ b/core/layouts/joomla/form/field/color/advanced.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellchec       Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $checked         Is this field checked?
+ * @var   array    $position        Is this field checked?
+ * @var   array    $control         Is this field checked?
+ */
+
+if ($validate !== 'color' && in_array($format, array('rgb', 'rgba'), true))
+{
+	$alpha = ($format === 'rgba');
+	$placeholder = $alpha ? 'rgba(0, 0, 0, 0.5)' : 'rgb(0, 0, 0)';
+}
+else
+{
+	$placeholder = '#rrggbb';
+}
+
+$inputclass   = ($keywords && ! in_array($format, array('rgb', 'rgba'), true)) ? ' keywords' : ' ' . $format;
+$class        = ' class="' . trim('minicolors ' . $class) . ($validate === 'color' ? '' : $inputclass) . '"';
+$control      = $control ? ' data-control="' . $control . '"' : '';
+$format       = $format ? ' data-format="' . $format . '"' : '';
+$keywords     = $keywords ? ' data-keywords="' . $keywords . '"' : '';
+$validate     = $validate ? ' data-validate="' . $validate . '"' : '';
+$disabled     = $disabled ? ' disabled' : '';
+$readonly     = $readonly ? ' readonly' : '';
+$hint         = strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : ' placeholder="' . $placeholder . '"';
+$autocomplete = ! $autocomplete ? ' autocomplete="off"' : '';
+
+// Force LTR input value in RTL, due to display issues with rgba/hex colors
+$direction    = $lang->isRtl() ? ' dir="ltr" style="text-align:right"' : '';
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+JHtml::_('script', 'jui/jquery.minicolors.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'jui/jquery.minicolors.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'system/color-field-adv-init.min.js', array('version' => 'auto', 'relative' => true));
+?>
+<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($color, ENT_COMPAT, 'UTF-8'); ?>" <?php
+echo $hint . $class . $position . $control . $readonly . $disabled . $onchange . $autocomplete . $autofocus . $format . $keywords . $direction . $validate; ?>/>
diff --git a/core/layouts/joomla/form/field/color/simple.php b/core/layouts/joomla/form/field/color/simple.php
new file mode 100644
index 00000000..7af694b4
--- /dev/null
+++ b/core/layouts/joomla/form/field/color/simple.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellchec       Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $checked         Is this field checked?
+ * @var   array    $position        Is this field checked?
+ * @var   array    $control         Is this field checked?
+ */
+
+$class    = ' class="' . trim('simplecolors chzn-done ' . $class) . '"';
+$disabled = $disabled ? ' disabled' : '';
+$readonly = $readonly ? ' readonly' : '';
+
+// Include jQuery
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+JHtml::_('script', 'jui/jquery.simplecolors.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'jui/jquery.simplecolors.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'system/color-field-init.min.js', array('version' => 'auto', 'relative' => true));
+?>
+<select data-chosen="true" name="<?php echo $name; ?>" id="<?php echo $id; ?>"<?php
+echo $disabled; ?><?php echo $readonly; ?><?php echo $required; ?><?php echo $class; ?><?php echo $position; ?><?php
+echo $onchange; ?><?php echo $autofocus; ?> style="visibility:hidden;width:22px;height:1px">
+	<?php foreach ($colors as $i => $c) : ?>
+		<option<?php echo ($c == $color ? ' selected="selected"' : ''); ?>><?php echo $c; ?></option>
+		<?php if (($i + 1) % $split == 0) : ?>
+			<option>-</option>
+		<?php endif; ?>
+	<?php endforeach; ?>
+</select>
diff --git a/core/layouts/joomla/form/field/combo.php b/core/layouts/joomla/form/field/combo.php
new file mode 100644
index 00000000..f409cbcc
--- /dev/null
+++ b/core/layouts/joomla/form/field/combo.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $options         Options available for this field.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+JHtml::_('behavior.combobox');
+
+$attr  = !empty($class) ? ' class="combobox ' . $class . '"' : ' class="combobox"';
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+$attr .= !empty($readonly) ? ' readonly' : '';
+$attr .= !empty($disabled) ? ' disabled' : '';
+$attr .= !empty($required) ? ' required aria-required="true"' : '';
+
+// Initialize JavaScript field attributes.
+$attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+
+?>
+<div class="combobox input-append">
+	<input
+		type="text"
+		name="<?php echo $name; ?>"
+		id="<?php echo $id; ?>"
+		value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>"
+		<?php echo $attr; ?>
+		autocomplete="off"
+	/>
+	<div class="btn-group">
+		<button type="button" class="btn dropdown-toggle">
+			<span class="caret"></span>
+		</button>
+		<ul class="dropdown-menu">
+			<?php foreach ($options as $option) : ?>
+				<li><a href="#"><?php echo $option->text; ?></a></li>
+			<?php endforeach; ?>
+		</ul>
+	</div>
+</div>
diff --git a/core/layouts/joomla/form/field/contenthistory.php b/core/layouts/joomla/form/field/contenthistory.php
new file mode 100644
index 00000000..395b731d
--- /dev/null
+++ b/core/layouts/joomla/form/field/contenthistory.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $item The item id number
+ * @var  string   $link The link text
+ * @var  string   $label The label text
+ */
+extract($displayData);
+
+JHtml::_('behavior.modal', 'button.modal_' . $item);
+?>
+<button class="btn modal_<?php echo $item; ?>" title="<?php echo $label; ?>" href="<?php echo $link; ?>" rel="{handler: 'iframe', size: {x: 800, y: 500}}">
+	<span class="icon-archive" aria-hidden="true"></span><?php echo $label; ?>
+</button>
diff --git a/core/layouts/joomla/form/field/email.php b/core/layouts/joomla/form/field/email.php
new file mode 100644
index 00000000..381c8245
--- /dev/null
+++ b/core/layouts/joomla/form/field/email.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   array    $spellcheck      Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+$autocomplete = !$autocomplete ? 'autocomplete="off"' : 'autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete == 'autocomplete="on"' ? '' : $autocomplete;
+
+$attributes = array(
+	$spellcheck ? '' : 'spellcheck="false"',
+	!empty($size) ? 'size="' . $size . '"' : '',
+	$disabled ? 'disabled' : '',
+	$readonly ? 'readonly' : '',
+	$onchange ? 'onchange="' . $onchange . '"' : '',
+	$autocomplete,
+	$multiple ? 'multiple' : '',
+	!empty($maxLength) ? 'maxlength="' . $maxLength . '"' : '',
+	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	$required ? 'required aria-required="true"' : '',
+	$autofocus ? 'autofocus' : '',
+);
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+?>
+<input type="email" name="<?php
+echo $name; ?>"<?php
+echo !empty($class) ? ' class="validate-email ' . $class . '"' : ' class="validate-email"'; ?> id="<?php
+echo $id; ?>" value="<?php
+echo htmlspecialchars(JStringPunycode::emailToUTF8($value), ENT_COMPAT, 'UTF-8'); ?>"
+<?php echo implode(' ', $attributes); ?> />
diff --git a/core/layouts/joomla/form/field/file.php b/core/layouts/joomla/form/field/file.php
new file mode 100644
index 00000000..ffa525a0
--- /dev/null
+++ b/core/layouts/joomla/form/field/file.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   array    $spellcheck      Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+$maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize());
+?>
+<input type="file"
+	name="<?php echo $name; ?>"
+	id="<?php echo $id; ?>"
+	<?php echo !empty($size) ? ' size="' . $size . '"' : ''; ?>
+	<?php echo !empty($accept) ? ' accept="' . $accept . '"' : ''; ?>
+	<?php echo !empty($class) ? ' class="' . $class . '"' : ''; ?>
+	<?php echo !empty($multiple) ? ' multiple' : ''; ?>
+	<?php echo $disabled ? ' disabled' : ''; ?>
+	<?php echo $autofocus ? ' autofocus' : ''; ?>
+	<?php echo !empty($onchange) ? ' onchange="' . $onchange . '"' : ''; ?>
+	<?php echo $required ? ' required aria-required="true"' : ''; ?> /><br>
+	<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
diff --git a/core/layouts/joomla/form/field/hidden.php b/core/layouts/joomla/form/field/hidden.php
new file mode 100644
index 00000000..81f96854
--- /dev/null
+++ b/core/layouts/joomla/form/field/hidden.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ */
+
+// Initialize some field attributes.
+$class    = !empty($class) ? ' class="' . $class . '"' : '';
+$disabled = $disabled ? ' disabled' : '';
+$onchange = $onchange ? ' onchange="' . $onchange . '"' : '';
+?>
+<input type="hidden" name="<?php
+echo $name; ?>" id="<?php
+echo $id; ?>" value="<?php
+echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>"<?php echo $class, $disabled, $onchange; ?> />
diff --git a/core/layouts/joomla/form/field/media.php b/core/layouts/joomla/form/field/media.php
new file mode 100644
index 00000000..2d4f0bd5
--- /dev/null
+++ b/core/layouts/joomla/form/field/media.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ *
+ * @var   string   $preview         The preview image relative path
+ * @var   integer  $previewHeight   The image preview height
+ * @var   integer  $previewWidth    The image preview width
+ * @var   string   $asset           The asset text
+ * @var   string   $authorField     The label text
+ * @var   string   $folder          The folder text
+ * @var   string   $link            The link text
+ */
+extract($displayData);
+
+// Load the modal behavior script.
+JHtml::_('behavior.modal');
+
+// Include jQuery
+JHtml::_('jquery.framework');
+JHtml::_('script', 'media/mediafield-mootools.min.js', array('version' => 'auto', 'relative' => true, 'framework' => true));
+
+// Tooltip for INPUT showing whole image path
+$options = array(
+	'onShow' => 'jMediaRefreshImgpathTip',
+);
+
+JHtml::_('behavior.tooltip', '.hasTipImgpath', $options);
+
+if (!empty($class))
+{
+	$class .= ' hasTipImgpath';
+}
+else
+{
+	$class = 'hasTipImgpath';
+}
+
+$attr = '';
+
+$attr .= ' title="' . htmlspecialchars('<span id="TipImgpath"></span>', ENT_COMPAT, 'UTF-8') . '"';
+
+// Initialize some field attributes.
+$attr .= !empty($class) ? ' class="input-small field-media-input ' . $class . '"' : ' class="input-small"';
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+
+// Initialize JavaScript field attributes.
+$attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+
+// The text field.
+echo '<div class="input-prepend input-append">';
+
+// The Preview.
+$showPreview = true;
+$showAsTooltip = false;
+
+switch ($preview)
+{
+	case 'no': // Deprecated parameter value
+	case 'false':
+	case 'none':
+		$showPreview = false;
+		break;
+
+	case 'yes': // Deprecated parameter value
+	case 'true':
+	case 'show':
+		break;
+	case 'tooltip':
+	default:
+		$showAsTooltip = true;
+		$options = array(
+				'onShow' => 'jMediaRefreshPreviewTip',
+		);
+		JHtml::_('behavior.tooltip', '.hasTipPreview', $options);
+		break;
+}
+
+// Pre fill the contents of the popover
+if ($showPreview)
+{
+	if ($value && file_exists(JPATH_ROOT . '/' . $value))
+	{
+		$src = JUri::root() . $value;
+	}
+	else
+	{
+		$src = '';
+	}
+
+	$width = $previewWidth;
+	$height = $previewHeight;
+	$style = '';
+	$style .= ($width > 0) ? 'max-width:' . $width . 'px;' : '';
+	$style .= ($height > 0) ? 'max-height:' . $height . 'px;' : '';
+
+	$imgattr = array(
+		'id' => $id . '_preview',
+		'class' => 'media-preview',
+		'style' => $style,
+	);
+
+	$img = JHtml::_('image', $src, JText::_('JLIB_FORM_MEDIA_PREVIEW_ALT'), $imgattr);
+	$previewImg = '<div id="' . $id . '_preview_img"' . ($src ? '' : ' style="display:none"') . '>' . $img . '</div>';
+	$previewImgEmpty = '<div id="' . $id . '_preview_empty"' . ($src ? ' style="display:none"' : '') . '>'
+		. JText::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY') . '</div>';
+
+	if ($showAsTooltip)
+	{
+		echo '<div class="media-preview add-on">';
+		$tooltip = $previewImgEmpty . $previewImg;
+		$options = array(
+			'title' => JText::_('JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE'),
+					'text' => '<span class="icon-eye" aria-hidden="true"></span>',
+					'class' => 'hasTipPreview'
+					);
+
+		echo JHtml::_('tooltip', $tooltip, $options);
+		echo '</div>';
+	}
+	else
+	{
+		echo '<div class="media-preview add-on" style="height:auto">';
+		echo ' ' . $previewImgEmpty;
+		echo ' ' . $previewImg;
+		echo '</div>';
+	}
+}
+
+echo '	<input type="text" name="' . $name . '" id="' . $id . '" value="'
+	. htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly"' . $attr . ' data-basepath="'
+	. JUri::root() . '"/>';
+
+?>
+<a class="modal btn" title="<?php echo JText::_('JLIB_FORM_BUTTON_SELECT'); ?>" href="
+<?php echo ($readonly ? ''
+		: ($link ?: 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;asset=' . $asset . '&amp;author='
+	. $authorField) . '&amp;fieldid=' . $id . '&amp;folder=' . $folder) . '"'
+	. ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}"'; ?>>
+ <?php echo JText::_('JLIB_FORM_BUTTON_SELECT'); ?></a><a class="btn hasTooltip" title="<?php echo JText::_('JLIB_FORM_BUTTON_CLEAR'); ?>" href="#" onclick="jInsertFieldValue('', '<?php echo $id; ?>'); return false;">
+	<span class="icon-remove" aria-hidden="true"></span></a>
+
+
+</div>
\ No newline at end of file
diff --git a/core/layouts/joomla/form/field/meter.php b/core/layouts/joomla/form/field/meter.php
new file mode 100644
index 00000000..2892dd43
--- /dev/null
+++ b/core/layouts/joomla/form/field/meter.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ * @var   string   $animated        Is it animated.
+ * @var   string   $active          Is it active.
+ * @var   string   $min             The minimum value.
+ * @var   string   $max             The maximum value.
+ * @var   string   $step            The step value.
+ */
+
+// Initialize some field attributes.
+$class = 'progress ' . $class;
+$class .= $animated ? ' progress-striped' : '';
+$class .= $active ? ' active' : '';
+$class = 'class="' . $class . '"';
+
+$value = (float) $value;
+$value = $value < $min ? $min : $value;
+$value = $value > $max ? $max : $value;
+
+$data = '';
+$data .= 'data-max="' . $max . '"';
+$data .= ' data-min="' . $min . '"';
+$data .= ' data-step="' . $step . '"';
+$data .= ' data-value="' . $value . '"';
+
+$attributes = array(
+	$class,
+	!empty($width) ? ' style="width:' . $width . ';"' : '',
+	$data
+);
+
+$value = ((float) ($value - $min) * 100) / ($max - $min);
+?>
+<div <?php echo implode(' ', $attributes); ?> >
+	<div class="bar" style="width: <?php
+	echo (string) $value; ?>%;<?php
+	echo !empty($color) ? ' background-color:' . $color . ';' : ''; ?>"></div>
+</div>
diff --git a/core/layouts/joomla/form/field/moduleorder.php b/core/layouts/joomla/form/field/moduleorder.php
new file mode 100644
index 00000000..f113ba09
--- /dev/null
+++ b/core/layouts/joomla/form/field/moduleorder.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   array    $spellcheck      Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+$attr  = '';
+
+// Initialize some field attributes.
+$attr .= !empty($class) ? ' class="module-ajax-ordering ' . $class . '"' : 'class="module-ajax-ordering"';
+$attr .= $disabled ? ' disabled' : '';
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+
+// Initialize JavaScript field attributes.
+$attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('behavior.core');
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/moduleorder.js', array('version' => 'auto', 'relative' => true));
+?>
+<div id="parent_<?php echo $id; ?>" <?php echo $attr; ?> data-url="<?php echo 'index.php?option=com_modules&task=module.orderPosition&'
+. $token; ?>" data-element="<?php echo 'parent_' . $id; ?>" data-ordering="<?php echo $ordering; ?>" data-position-element="<?php
+echo $element; ?>" data-client-id="<?php echo $clientId; ?>" data-name="<?php echo $name; ?>"></div>
diff --git a/core/layouts/joomla/form/field/number.php b/core/layouts/joomla/form/field/number.php
new file mode 100644
index 00000000..b9e41d72
--- /dev/null
+++ b/core/layouts/joomla/form/field/number.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   array    $spellcheck      Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete == ' autocomplete="on"' ? '' : $autocomplete;
+
+$attributes = array(
+	!empty($class) ? 'class="' . $class . '"' : '',
+	!empty($size) ? 'size="' . $size . '"' : '',
+	$disabled ? 'disabled' : '',
+	$readonly ? 'readonly' : '',
+	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	!empty($onchange) ? 'onchange="' . $onchange . '"' : '',
+	isset($max) ? 'max="' . $max . '"' : '',
+	!empty($step) ? 'step="' . $step . '"' : '',
+	isset($min) ? 'min="' . $min . '"' : '',
+	$required ? 'required aria-required="true"' : '',
+	$autocomplete,
+	$autofocus ? 'autofocus' : ''
+);
+
+if (is_numeric($value))
+{
+	$value = (float) $value;
+}
+else
+{
+	$value = '';
+	$value = ($required && isset($min)) ? $min : $value;
+}
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+?>
+<input type="number" name="<?php
+echo $name; ?>" id="<?php
+echo $id; ?>" value="<?php echo
+htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" <?php echo implode(' ', $attributes); ?> />
diff --git a/core/layouts/joomla/form/field/password.php b/core/layouts/joomla/form/field/password.php
new file mode 100644
index 00000000..f6489e40
--- /dev/null
+++ b/core/layouts/joomla/form/field/password.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+if ($meter)
+{
+	JHtml::_('script', 'system/passwordstrength.js', array('version' => 'auto', 'relative' => true, 'framework' => true));
+
+	// Load script on document load.
+	JFactory::getDocument()->addScriptDeclaration(
+		"
+		jQuery(document).ready(function() {
+			new Form.PasswordStrength('" . $id . "',
+				{
+					threshold: " . $threshold . ",
+					onUpdate: function(element, strength, threshold) {
+						element.set('data-passwordstrength', strength);
+					}
+				});
+		});"
+	);
+}
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+$attributes = array(
+	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	!$autocomplete ? 'autocomplete="off"' : '',
+	!empty($class) ? 'class="' . $class . '"' : '',
+	$readonly ? 'readonly' : '',
+	$disabled ? 'disabled' : '',
+	!empty($size) ? 'size="' . $size . '"' : '',
+	!empty($maxLength) ? 'maxlength="' . $maxLength . '"' : '',
+	$required ? 'required aria-required="true"' : '',
+	$autofocus ? 'autofocus' : '',
+);
+
+?>
+<input type="password" name="<?php
+echo $name; ?>" id="<?php
+echo $id; ?>" value="<?php
+echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" <?php
+echo implode(' ', $attributes); ?> />
diff --git a/core/layouts/joomla/form/field/radio.php b/core/layouts/joomla/form/field/radio.php
new file mode 100644
index 00000000..c6b28d96
--- /dev/null
+++ b/core/layouts/joomla/form/field/radio.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $options         Options available for this field.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+/**
+ * The format of the input tag to be filled in using sprintf.
+ *     %1 - id
+ *     %2 - name
+ *     %3 - value
+ *     %4 = any other attributes
+ */
+$format = '<input type="radio" id="%1$s" name="%2$s" value="%3$s" %4$s />';
+$alt    = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
+?>
+<fieldset id="<?php echo $id; ?>" class="<?php echo trim($class . ' radio' . ($readonly || $disabled ? ' disabled' : '') . ($readonly ? ' readonly' : '')); ?>"
+	<?php echo $disabled ? 'disabled' : ''; ?>
+	<?php echo $readonly || $disabled ? 'style="pointer-events: none"' : '' ?>
+	<?php echo $required ? 'required aria-required="true"' : ''; ?>
+	<?php echo $autofocus ? 'autofocus' : ''; ?>>
+
+	<?php if (!empty($options)) : ?>
+		<?php foreach ($options as $i => $option) : ?>
+			<?php
+				// Initialize some option attributes.
+				$checked        = ((string) $option->value === $value) ? 'checked="checked"' : '';
+				$disabled       = !empty($option->disable) ? 'disabled' : '';
+				$style          = $disabled ? 'style="pointer-events: none"' : '';
+				$option->class  = !empty($option->class) ? $option->class : '';
+				$option->class  = trim($option->class . ' ' . $disabled);
+				$optionClass    = !empty($option->class) ? 'class="' . $option->class . '"' : '';
+
+				// Initialize some JavaScript option attributes.
+				$onclick    = !empty($option->onclick) ? 'onclick="' . $option->onclick . '"' : '';
+				$onchange   = !empty($option->onchange) ? 'onchange="' . $option->onchange . '"' : '';
+				$oid        = $id . $i;
+				$ovalue     = htmlspecialchars($option->value, ENT_COMPAT, 'UTF-8');
+				$attributes = array_filter(array($checked, $optionClass, $disabled, $style, $onchange, $onclick));
+			?>
+
+			<?php if ($required) : ?>
+				<?php $attributes[] = 'required aria-required="true"'; ?>
+			<?php endif; ?>
+			<?php echo sprintf($format, $oid, $name, $ovalue, implode(' ', $attributes)); ?>
+			<label for="<?php echo $oid; ?>" <?php echo trim($optionClass . ' ' . $style); ?>>
+				<?php echo $option->text; ?>
+			</label>
+		<?php endforeach; ?>
+	<?php endif; ?>
+</fieldset>
diff --git a/core/layouts/joomla/form/field/range.php b/core/layouts/joomla/form/field/range.php
new file mode 100644
index 00000000..e8781448
--- /dev/null
+++ b/core/layouts/joomla/form/field/range.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Initialize some field attributes.
+$attributes = array(
+	$class ? 'class="' . $class . '"' : '',
+	$disabled ? 'disabled' : '',
+	$readonly ? 'readonly' : '',
+	!empty($onchange) ? 'onchange="' . $onchange . '"' : '',
+	!empty($max) ? 'max="' . $max . '"' : '',
+	!empty($step) ? 'step="' . $step . '"' : '',
+	!empty($min) ? 'min="' . $min . '"' : '',
+	$autofocus ? 'autofocus' : '',
+);
+
+$value = (float) $value;
+$value = empty($value) ? $min : $value;
+
+?>
+<input type="range" name="<?php
+echo $name; ?>" id="<?php
+echo $id; ?>" value="<?php
+echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" <?php
+echo implode(' ', $attributes); ?> />
diff --git a/core/layouts/joomla/form/field/subform/default.php b/core/layouts/joomla/form/field/subform/default.php
new file mode 100644
index 00000000..797e0144
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/default.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $tmpl             The Empty form for template
+ * @var array   $forms            Array of JForm instances for render the rows
+ * @var bool    $multiple         The multiple state for the form field
+ * @var int     $min              Count of minimum repeating in multiple mode
+ * @var int     $max              Count of maximum repeating in multiple mode
+ * @var string  $fieldname        The field name
+ * @var string  $control          The forms control
+ * @var string  $label            The field label
+ * @var string  $description      The field description
+ * @var array   $buttons          Array of the buttons that will be rendered
+ * @var bool    $groupByFieldset  Whether group the subform fields by it`s fieldset
+ */
+extract($displayData);
+
+$form = $forms[0];
+?>
+
+<div class="subform-wrapper">
+<?php foreach ($form->getGroup('') as $field) : ?>
+	<?php echo $field->renderField(); ?>
+<?php endforeach; ?>
+</div>
+
diff --git a/core/layouts/joomla/form/field/subform/repeatable-table.php b/core/layouts/joomla/form/field/subform/repeatable-table.php
new file mode 100644
index 00000000..10c09330
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/repeatable-table.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $tmpl             The Empty form for template
+ * @var array   $forms            Array of JForm instances for render the rows
+ * @var bool    $multiple         The multiple state for the form field
+ * @var int     $min              Count of minimum repeating in multiple mode
+ * @var int     $max              Count of maximum repeating in multiple mode
+ * @var string  $fieldname        The field name
+ * @var string  $control          The forms control
+ * @var string  $label            The field label
+ * @var string  $description      The field description
+ * @var array   $buttons          Array of the buttons that will be rendered
+ * @var bool    $groupByFieldset  Whether group the subform fields by it`s fieldset
+ */
+extract($displayData);
+
+// Add script
+if ($multiple)
+{
+	JHtml::_('jquery.ui', array('core', 'sortable'));
+	JHtml::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
+}
+
+// Build heading
+$table_head = '';
+
+if (!empty($groupByFieldset))
+{
+	foreach ($tmpl->getFieldsets() as $fieldset) {
+		$table_head .= '<th>' . JText::_($fieldset->label);
+
+		if (!empty($fieldset->description))
+		{
+			$table_head .= '<br /><small style="font-weight:normal">' . JText::_($fieldset->description) . '</small>';
+		}
+
+		$table_head .= '</th>';
+	}
+
+	$sublayout = 'section-byfieldsets';
+}
+else
+{
+	foreach ($tmpl->getGroup('') as $field) {
+		$table_head .= '<th>' . strip_tags($field->label);
+		$table_head .= '<br /><small style="font-weight:normal">' . JText::_($field->description) . '</small>';
+		$table_head .= '</th>';
+	}
+
+	$sublayout = 'section';
+
+	// Label will not be shown for sections layout, so reset the margin left
+	JFactory::getDocument()->addStyleDeclaration(
+		'.subform-table-sublayout-section .controls { margin-left: 0px }'
+	);
+}
+?>
+
+<div class="row-fluid">
+	<div class="subform-repeatable-wrapper subform-table-layout subform-table-sublayout-<?php echo $sublayout; ?>">
+		<div class="subform-repeatable"
+			data-bt-add="a.group-add" data-bt-remove="a.group-remove" data-bt-move="a.group-move"
+			data-repeatable-element="tr.subform-repeatable-group"
+			data-rows-container="tbody.subform-repeatable-container" data-minimum="<?php echo $min; ?>" data-maximum="<?php echo $max; ?>">
+
+		<table class="adminlist table table-striped table-bordered">
+			<thead>
+				<tr>
+					<?php echo $table_head; ?>
+					<?php if (!empty($buttons)) : ?>
+					<th style="width:8%;">
+					<?php if (!empty($buttons['add'])) : ?>
+						<div class="btn-group">
+							<a class="group-add btn btn-mini button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus" aria-hidden="true"></span> </a>
+						</div>
+					<?php endif; ?>
+					</th>
+					<?php endif; ?>
+				</tr>
+			</thead>
+			<tbody class="subform-repeatable-container">
+			<?php
+			foreach ($forms as $k => $form) :
+				echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
+			endforeach;
+			?>
+			</tbody>
+		</table>
+		<?php if ($multiple) : ?>
+		<script type="text/subform-repeatable-template-section" class="subform-repeatable-template-section">
+		<?php echo $this->sublayout($sublayout, array('form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons)); ?>
+		</script>
+		<?php endif; ?>
+		</div>
+	</div>
+</div>
diff --git a/core/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/core/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
new file mode 100644
index 00000000..717e7c88
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $form       The form instance for render the section
+ * @var string  $basegroup  The base group name
+ * @var string  $group      Current group name
+ * @var array   $buttons    Array of the buttons that will be rendered
+ */
+extract($displayData);
+
+?>
+
+<tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
+	<?php foreach ($form->getFieldsets() as $fieldset) : ?>
+	<td class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
+		<?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
+			<?php echo $field->renderField(); ?>
+		<?php endforeach; ?>
+	</td>
+	<?php endforeach; ?>
+	<?php if (!empty($buttons)) : ?>
+	<td>
+		<div class="btn-group">
+			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-mini button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-mini button btn-danger" aria-label="<?php echo JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-minus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-mini button btn-primary" aria-label="<?php echo JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move" aria-hidden="true"></span> </a><?php endif; ?>
+		</div>
+	</td>
+	<?php endif; ?>
+</tr>
diff --git a/core/layouts/joomla/form/field/subform/repeatable-table/section.php b/core/layouts/joomla/form/field/subform/repeatable-table/section.php
new file mode 100644
index 00000000..2b0a3a02
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/repeatable-table/section.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $form       The form instance for render the section
+ * @var string  $basegroup  The base group name
+ * @var string  $group      Current group name
+ * @var array   $buttons    Array of the buttons that will be rendered
+ */
+extract($displayData);
+
+?>
+
+<tr class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
+	<?php foreach ($form->getGroup('') as $field) : ?>
+	<td data-column="<?php echo strip_tags($field->label); ?>">
+		<?php echo $field->renderField(array('hiddenLabel' => true)); ?>
+	</td>
+	<?php endforeach; ?>
+	<?php if (!empty($buttons)) : ?>
+	<td>
+		<div class="btn-group">
+			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-mini button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-mini button btn-danger" aria-label="<?php echo JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-minus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-mini button btn-primary" aria-label="<?php echo JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move" aria-hidden="true"></span> </a><?php endif; ?>
+		</div>
+	</td>
+	<?php endif; ?>
+</tr>
diff --git a/core/layouts/joomla/form/field/subform/repeatable.php b/core/layouts/joomla/form/field/subform/repeatable.php
new file mode 100644
index 00000000..72f5344f
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/repeatable.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $tmpl             The Empty form for template
+ * @var array   $forms            Array of JForm instances for render the rows
+ * @var bool    $multiple         The multiple state for the form field
+ * @var int     $min              Count of minimum repeating in multiple mode
+ * @var int     $max              Count of maximum repeating in multiple mode
+ * @var string  $fieldname        The field name
+ * @var string  $control          The forms control
+ * @var string  $label            The field label
+ * @var string  $description      The field description
+ * @var array   $buttons          Array of the buttons that will be rendered
+ * @var bool    $groupByFieldset  Whether group the subform fields by it`s fieldset
+ */
+extract($displayData);
+
+// Add script
+if ($multiple)
+{
+	JHtml::_('jquery.ui', array('core', 'sortable'));
+	JHtml::_('script', 'system/subform-repeatable.js', array('version' => 'auto', 'relative' => true));
+}
+
+$sublayout = empty($groupByFieldset) ? 'section' : 'section-byfieldsets';
+?>
+
+<div class="row-fluid">
+	<div class="subform-repeatable-wrapper subform-layout">
+		<div class="subform-repeatable"
+			data-bt-add="a.group-add" data-bt-remove="a.group-remove" data-bt-move="a.group-move"
+			data-repeatable-element="div.subform-repeatable-group" data-minimum="<?php echo $min; ?>" data-maximum="<?php echo $max; ?>">
+			<?php if (!empty($buttons['add'])) : ?>
+			<div class="btn-toolbar">
+				<div class="btn-group">
+					<a class="group-add btn btn-mini button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus" aria-hidden="true"></span> </a>
+				</div>
+			</div>
+			<?php endif; ?>
+		<?php
+		foreach ($forms as $k => $form) :
+			echo $this->sublayout($sublayout, array('form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons));
+		endforeach;
+		?>
+		<?php if ($multiple) : ?>
+		<script type="text/subform-repeatable-template-section" class="subform-repeatable-template-section">
+		<?php echo $this->sublayout($sublayout, array('form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons)); ?>
+		</script>
+		<?php endif; ?>
+		</div>
+	</div>
+</div>
diff --git a/core/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/core/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
new file mode 100644
index 00000000..01b5d93e
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $form       The form instance for render the section
+ * @var string  $basegroup  The base group name
+ * @var string  $group      Current group name
+ * @var array   $buttons    Array of the buttons that will be rendered
+ */
+extract($displayData);
+?>
+
+<div class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
+	<?php if (!empty($buttons)) : ?>
+	<div class="btn-toolbar text-right">
+		<div class="btn-group">
+			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-mini button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-mini button btn-danger" aria-label="<?php echo JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-minus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-mini button btn-primary" aria-label="<?php echo JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move" aria-hidden="true"></span> </a><?php endif; ?>
+		</div>
+	</div>
+	<?php endif; ?>
+	<div class="row-fluid">
+<?php foreach ($form->getFieldsets() as $fieldset) : ?>
+<fieldset class="<?php if (!empty($fieldset->class)){ echo $fieldset->class; } ?>">
+	<?php if (!empty($fieldset->label)) : ?>
+	<legend><?php echo JText::_($fieldset->label); ?></legend>
+	<?php endif; ?>
+<?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
+	<?php echo $field->renderField(); ?>
+<?php endforeach; ?>
+</fieldset>
+<?php endforeach; ?>
+	</div>
+</div>
diff --git a/core/layouts/joomla/form/field/subform/repeatable/section.php b/core/layouts/joomla/form/field/subform/repeatable/section.php
new file mode 100644
index 00000000..2fb6e67b
--- /dev/null
+++ b/core/layouts/joomla/form/field/subform/repeatable/section.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Make thing clear
+ *
+ * @var JForm   $form       The form instance for render the section
+ * @var string  $basegroup  The base group name
+ * @var string  $group      Current group name
+ * @var array   $buttons    Array of the buttons that will be rendered
+ */
+extract($displayData);
+
+?>
+
+<div class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
+	<?php if (!empty($buttons)) : ?>
+	<div class="btn-toolbar text-right">
+		<div class="btn-group">
+			<?php if (!empty($buttons['add'])) : ?><a class="group-add btn btn-mini button btn-success" aria-label="<?php echo JText::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['remove'])) : ?><a class="group-remove btn btn-mini button btn-danger" aria-label="<?php echo JText::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-minus" aria-hidden="true"></span> </a><?php endif; ?>
+			<?php if (!empty($buttons['move'])) : ?><a class="group-move btn btn-mini button btn-primary" aria-label="<?php echo JText::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-move" aria-hidden="true"></span> </a><?php endif; ?>
+		</div>
+	</div>
+	<?php endif; ?>
+
+<?php foreach ($form->getGroup('') as $field) : ?>
+	<?php echo $field->renderField(); ?>
+<?php endforeach; ?>
+</div>
diff --git a/core/layouts/joomla/form/field/tel.php b/core/layouts/joomla/form/field/tel.php
new file mode 100644
index 00000000..3da061ac
--- /dev/null
+++ b/core/layouts/joomla/form/field/tel.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ * @var   integer  $maxLength       The maximum length that the field shall accept.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete == ' autocomplete="on"' ? '' : $autocomplete;
+
+$attributes = array(
+	!empty($size) ? 'size="' . $size . '"' : '',
+	$disabled ? 'disabled' : '',
+	$readonly ? 'readonly' : '',
+	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	$autocomplete,
+	$autofocus ? ' autofocus' : '',
+	$spellcheck ? '' : 'spellcheck="false"',
+	$onchange ? ' onchange="' . $onchange . '"' : '',
+	!empty($maxLength) ? $maxLength : '',
+	$required ? 'required aria-required="true"' : '',
+);
+?>
+<input type="tel" name="<?php
+echo $name; ?>" <?php
+echo !empty($class) ? ' class="' . $class . '"' : ''; ?> id="<?php
+echo $id; ?>" value="<?php
+echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" <?php echo implode(' ', $attributes); ?> />
diff --git a/core/layouts/joomla/form/field/text.php b/core/layouts/joomla/form/field/text.php
new file mode 100644
index 00000000..38f01408
--- /dev/null
+++ b/core/layouts/joomla/form/field/text.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+$list = '';
+
+if ($options)
+{
+	$list = 'list="' . $id . '_datalist"';
+}
+
+$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete === ' autocomplete="on"' ? '' : $autocomplete;
+
+$attributes = array(
+	!empty($class) ? 'class="' . $class . '"' : '',
+	!empty($size) ? 'size="' . $size . '"' : '',
+	$disabled ? 'disabled' : '',
+	$readonly ? 'readonly' : '',
+	$list,
+	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	$onchange ? ' onchange="' . $onchange . '"' : '',
+	!empty($maxLength) ? $maxLength : '',
+	$required ? 'required aria-required="true"' : '',
+	$autocomplete,
+	$autofocus ? ' autofocus' : '',
+	$spellcheck ? '' : 'spellcheck="false"',
+	!empty($inputmode) ? $inputmode : '',
+	!empty($pattern) ? 'pattern="' . $pattern . '"' : '',
+);
+?>
+<input type="text" name="<?php
+echo $name; ?>" id="<?php
+echo $id; ?>" <?php
+echo $dirname; ?> value="<?php
+echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" <?php echo implode(' ', $attributes); ?> />
+<?php if ($options) : ?>
+	<datalist id="<?php echo $id; ?>_datalist">
+		<?php foreach ($options as $option) : ?>
+			<?php if (!$option->value) : ?>
+			<?php continue; ?>
+			<?php endif; ?>
+			<option value="<?php echo $option->value; ?>"><?php echo $option->text; ?></option>
+		<?php endforeach; ?>
+	</datalist>
+<?php endif; ?>
diff --git a/core/layouts/joomla/form/field/textarea.php b/core/layouts/joomla/form/field/textarea.php
new file mode 100644
index 00000000..6073424b
--- /dev/null
+++ b/core/layouts/joomla/form/field/textarea.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Initialize some field attributes.
+$autocomplete = !$autocomplete ? 'autocomplete="off"' : 'autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete == 'autocomplete="on"' ? '' : $autocomplete;
+
+$attributes = array(
+	$columns ?: '',
+	$rows ?: '',
+	!empty($class) ? 'class="' . $class . '"' : '',
+	strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	$disabled ? 'disabled' : '',
+	$readonly ? 'readonly' : '',
+	$onchange ? 'onchange="' . $onchange . '"' : '',
+	$onclick ? 'onclick="' . $onclick . '"' : '',
+	$required ? 'required aria-required="true"' : '',
+	$autocomplete,
+	$autofocus ? 'autofocus' : '',
+	$spellcheck ? '' : 'spellcheck="false"',
+	$maxlength ? $maxlength: ''
+
+);
+?>
+<textarea name="<?php
+echo $name; ?>" id="<?php
+echo $id; ?>" <?php
+echo implode(' ', $attributes); ?> ><?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?></textarea>
+
diff --git a/core/layouts/joomla/form/field/url.php b/core/layouts/joomla/form/field/url.php
new file mode 100644
index 00000000..7771efcf
--- /dev/null
+++ b/core/layouts/joomla/form/field/url.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ * @var   array    $inputType       Options available for this field.
+ * @var   string   $accept          File types that are accepted.
+ */
+
+// Including fallback code for HTML5 non supported browsers.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete === ' autocomplete="on"' ? '' : $autocomplete;
+
+$attributes = array(
+	!empty($size) ? ' size="' . $size . '"' : '',
+	$disabled ? ' disabled' : '',
+	$readonly ? ' readonly' : '',
+	strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+	$autocomplete,
+	$autofocus ? ' autofocus' : '',
+	$spellcheck ? '' : ' spellcheck="false"',
+	$onchange ? ' onchange="' . $onchange . '"' : '',
+	!empty($maxLength) ? $maxLength : '',
+	$required ? ' required aria-required="true"' : '',
+);
+?>
+<input <?php
+echo $inputType; ?> name="<?php
+echo $name; ?>" <?php
+echo !empty($class) ? ' class="' . $class . '"' : ''; ?> id="<?php
+echo $id; ?>" value="<?php
+echo htmlspecialchars(JStringPunycode::urlToUTF8($value), ENT_COMPAT, 'UTF-8'); ?>" <?php
+echo implode(' ', $attributes); ?> />
diff --git a/core/layouts/joomla/form/field/user.php b/core/layouts/joomla/form/field/user.php
new file mode 100644
index 00000000..23f7504e
--- /dev/null
+++ b/core/layouts/joomla/form/field/user.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ *
+ * @var   string   $userName        The user name
+ * @var   mixed    $groups          The filtering groups (null means no filtering)
+ * @var   mixed    $excluded        The users to exclude from the list of users
+ */
+
+if (!$readonly)
+{
+	JHtml::_('behavior.modal', 'a.modal_' . $id);
+	JHtml::_('script', 'jui/fielduser.min.js', array('version' => 'auto', 'relative' => true));
+}
+
+$uri = new JUri('index.php?option=com_users&view=users&layout=modal&tmpl=component&required=0');
+
+$uri->setVar('field', $this->escape($id));
+
+if ($required)
+{
+	$uri->setVar('required', 1);
+}
+
+if (!empty($groups))
+{
+	$uri->setVar('groups', base64_encode(json_encode($groups)));
+}
+
+if (!empty($excluded))
+{
+	$uri->setVar('excluded', base64_encode(json_encode($excluded)));
+}
+
+// Invalidate the input value if no user selected
+if ($this->escape($userName) === JText::_('JLIB_FORM_SELECT_USER'))
+{
+	$userName = '';
+}
+
+$inputAttributes = array(
+	'type' => 'text', 'id' => $id, 'value' => $this->escape($userName)
+);
+
+if ($size)
+{
+	$inputAttributes['size'] = (int) $size;
+}
+
+if ($required)
+{
+	$inputAttributes['required'] = 'required';
+}
+
+if (!$readonly)
+{
+	$inputAttributes['placeholder'] = JText::_('JLIB_FORM_SELECT_USER');
+}
+
+$anchorAttributes = array(
+	'class' => 'btn btn-primary modal_' . $id, 'title' => JText::_('JLIB_FORM_CHANGE_USER'), 'rel' => '{handler: \'iframe\', size: {x: 800, y: 500}}'
+);
+
+?>
+<div class="input-append">
+	<input <?php echo ArrayHelper::toString($inputAttributes); ?> readonly />
+	<?php if (!$readonly) : ?>
+		<?php echo JHtml::_('link', (string) $uri, '<span class="icon-user"></span>', $anchorAttributes); ?>
+	<?php endif; ?>
+</div>
+<?php if (!$readonly) : ?>
+	<input type="hidden" id="<?php echo $id; ?>_id" name="<?php echo $name; ?>" value="<?php echo (int) $value; ?>" data-onchange="<?php echo $this->escape($onchange); ?>" />
+<?php endif; ?>
\ No newline at end of file
diff --git a/core/layouts/joomla/form/renderfield.php b/core/layouts/joomla/form/renderfield.php
new file mode 100644
index 00000000..96e8c58d
--- /dev/null
+++ b/core/layouts/joomla/form/renderfield.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ---------------------
+ * 	$options         : (array)  Optional parameters
+ * 	$label           : (string) The html code for the label (not required if $options['hiddenLabel'] is true)
+ * 	$input           : (string) The input field html code
+ */
+
+if (!empty($options['showonEnabled']))
+{
+	JHtml::_('jquery.framework');
+	JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true));
+}
+
+$class = empty($options['class']) ? '' : ' ' . $options['class'];
+$rel   = empty($options['rel']) ? '' : ' ' . $options['rel'];
+?>
+<div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
+	<?php if (empty($options['hiddenLabel'])) : ?>
+		<div class="control-label"><?php echo $label; ?></div>
+	<?php endif; ?>
+	<div class="controls"><?php echo $input; ?></div>
+</div>
diff --git a/core/layouts/joomla/form/renderlabel.php b/core/layouts/joomla/form/renderlabel.php
new file mode 100644
index 00000000..c5fb3636
--- /dev/null
+++ b/core/layouts/joomla/form/renderlabel.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ---------------------
+ * 	$text         : (string)  The label text
+ * 	$description  : (string)  An optional description to use in a tooltip
+ * 	$for          : (string)  The id of the input this label is for
+ * 	$required     : (boolean) True if a required field
+ * 	$classes      : (array)   A list of classes
+ * 	$position     : (string)  The tooltip position. Bottom for alias
+ */
+
+$classes = array_filter((array) $classes);
+
+$id = $for . '-lbl';
+$title = '';
+
+if (!empty($description))
+{
+	if ($text && $text !== $description)
+	{
+		JHtml::_('bootstrap.popover');
+		$classes[] = 'hasPopover';
+		$title     = ' title="' . htmlspecialchars(trim($text, ':')) . '"'
+			. ' data-content="'. htmlspecialchars($description) . '"';
+
+		if (!$position && JFactory::getLanguage()->isRtl())
+		{
+			$position = ' data-placement="left" ';
+		}
+	}
+	else
+	{
+		JHtml::_('bootstrap.tooltip');
+		$classes[] = 'hasTooltip';
+		$title     = ' title="' . JHtml::_('tooltipText', trim($text, ':'), $description, 0) . '"';
+	}
+}
+
+if ($required)
+{
+	$classes[] = 'required';
+}
+
+?>
+<label id="<?php echo $id; ?>" for="<?php echo $for; ?>"<?php if (!empty($classes)) echo ' class="' . implode(' ', $classes) . '"'; ?><?php echo $title; ?><?php echo $position; ?>>
+	<?php echo $text; ?><?php if ($required) : ?><span class="star">&#160;*</span><?php endif; ?>
+</label>
diff --git a/core/layouts/joomla/html/batch/access.php b/core/layouts/joomla/html/batch/access.php
new file mode 100644
index 00000000..47b4bff9
--- /dev/null
+++ b/core/layouts/joomla/html/batch/access.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ * None
+ */
+
+?>
+<label id="batch-access-lbl" for="batch-access" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_ACCESS_LABEL', 'JLIB_HTML_BATCH_ACCESS_LABEL_DESC'); ?>">
+	<?php echo JText::_('JLIB_HTML_BATCH_ACCESS_LABEL'); ?></label>
+	<?php echo JHtml::_(
+		'access.assetgrouplist',
+		'batch[assetgroup_id]', '',
+		'class="inputbox"',
+		array(
+			'title' => JText::_('JLIB_HTML_BATCH_NOCHANGE'),
+			'id' => 'batch-access'
+		)
+	); ?>
diff --git a/core/layouts/joomla/html/batch/adminlanguage.php b/core/layouts/joomla/html/batch/adminlanguage.php
new file mode 100644
index 00000000..2c8c70fd
--- /dev/null
+++ b/core/layouts/joomla/html/batch/adminlanguage.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ * None
+ */
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+		jQuery(document).ready(function($){
+			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
+			if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
+			if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");}
+			if ($("#batch-copy-move").length && batchSelector) {
+				$("#batch-copy-move").hide();
+				batchSelector.on("change", function(){
+					if (batchSelector.val() != 0 || batchSelector.val() != "") {
+						$("#batch-copy-move").show();
+					} else {
+						$("#batch-copy-move").hide();
+					}
+				});
+			}
+		});
+			'
+);
+?>
+<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
+	<?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
+</label>
+<select name="batch[language_id]" class="inputbox" id="batch-language-id">
+	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
+	<?php echo JHtml::_('select.options', JHtml::_('adminlanguage.existing', true, true), 'value', 'text'); ?>
+</select>
diff --git a/core/layouts/joomla/html/batch/item.php b/core/layouts/joomla/html/batch/item.php
new file mode 100644
index 00000000..fe7b4d8f
--- /dev/null
+++ b/core/layouts/joomla/html/batch/item.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $extension The extension name
+ */
+
+extract($displayData);
+
+// Create the copy/move options.
+$options = array(
+	JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')),
+	JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE'))
+);
+?>
+<label id="batch-choose-action-lbl" for="batch-choose-action"><?php echo JText::_('JLIB_HTML_BATCH_MENU_LABEL'); ?></label>
+<div id="batch-choose-action" class="control-group">
+	<select name="batch[category_id]" class="inputbox" id="batch-category-id">
+		<option value=""><?php echo JText::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+		<?php echo JHtml::_('select.options', JHtml::_('category.options', $extension)); ?>
+	</select>
+</div>
+<div id="batch-copy-move" class="control-group radio">
+	<?php echo JText::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
+	<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+</div>
diff --git a/core/layouts/joomla/html/batch/language.php b/core/layouts/joomla/html/batch/language.php
new file mode 100644
index 00000000..c4c237fd
--- /dev/null
+++ b/core/layouts/joomla/html/batch/language.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ * None
+ */
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+		jQuery(document).ready(function($){
+			if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");}
+			if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");}
+			if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");}
+			if ($("#batch-copy-move").length && batchSelector) {
+				$("#batch-copy-move").hide();
+				batchSelector.on("change", function(){
+					if (batchSelector.val() != 0 || batchSelector.val() != "") {
+						$("#batch-copy-move").show();
+					} else {
+						$("#batch-copy-move").hide();
+					}
+				});
+			}
+		});
+			'
+);
+?>
+<label id="batch-language-lbl" for="batch-language-id" class="modalTooltip" title="<?php echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_LANGUAGE_LABEL', 'JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC'); ?>">
+	<?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_LABEL'); ?>
+</label>
+<select name="batch[language_id]" class="inputbox" id="batch-language-id">
+	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_LANGUAGE_NOCHANGE'); ?></option>
+	<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text'); ?>
+</select>
diff --git a/core/layouts/joomla/html/batch/tag.php b/core/layouts/joomla/html/batch/tag.php
new file mode 100644
index 00000000..ab304173
--- /dev/null
+++ b/core/layouts/joomla/html/batch/tag.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ * None
+ */
+
+?>
+<label id="batch-tag-lbl" for="batch-tag-id" class="modalTooltip" title="<?php
+echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_TAG_LABEL', 'JLIB_HTML_BATCH_TAG_LABEL_DESC'); ?>">
+<?php echo JText::_('JLIB_HTML_BATCH_TAG_LABEL'); ?>
+</label>
+<select name="batch[tag]" class="inputbox" id="batch-tag-id">
+	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_TAG_NOCHANGE'); ?></option>
+	<?php echo JHtml::_('select.options', JHtml::_('tag.tags', array('filter.published' => array(1))), 'value', 'text'); ?>
+</select>
diff --git a/core/layouts/joomla/html/batch/user.php b/core/layouts/joomla/html/batch/user.php
new file mode 100644
index 00000000..4ecaf0f6
--- /dev/null
+++ b/core/layouts/joomla/html/batch/user.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  boolean   $noUser Inject an option for no user?
+ */
+
+extract($displayData);
+
+$optionNo = '';
+
+if ($noUser)
+{
+	$optionNo = '<option value="0">' . JText::_('JLIB_HTML_BATCH_USER_NOUSER') . '</option>';
+}
+?>
+<label id="batch-user-lbl" for="batch-user" class="modalTooltip" title="<?php
+echo JHtml::_('tooltipText', 'JLIB_HTML_BATCH_USER_LABEL', 'JLIB_HTML_BATCH_USER_LABEL_DESC'); ?>">
+	<?php echo JText::_('JLIB_HTML_BATCH_USER_LABEL'); ?>
+</label>
+<select name="batch[user_id]" class="inputbox" id="batch-user-id">
+	<option value=""><?php echo JText::_('JLIB_HTML_BATCH_USER_NOCHANGE'); ?></option>
+	<?php echo $optionNo; ?>
+	<?php echo JHtml::_('select.options', JHtml::_('user.userlist'), 'value', 'text'); ?>
+</select>
diff --git a/core/layouts/joomla/html/formbehavior/ajaxchosen.php b/core/layouts/joomla/html/formbehavior/ajaxchosen.php
new file mode 100644
index 00000000..0bc50513
--- /dev/null
+++ b/core/layouts/joomla/html/formbehavior/ajaxchosen.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $selector        The id of the field
+ * @var  array    $options         The options array
+ * @var  boolean  $debug           Are we in debug mode?
+ * @var  string   $type            Get or Post
+ * @var  string   $url             The URL
+ * @var  string   $dataType        Data type returned
+ * @var  string   $jsonTermKey     Extra JSON terminator key
+ * @var  integer  $afterTypeDelay  Delay for the execution
+ * @var  integer  $minTermLength   The minimum characters required
+ */
+
+extract($displayData);
+
+JText::script('JGLOBAL_KEEP_TYPING');
+JText::script('JGLOBAL_LOOKING_FOR');
+
+// Include jQuery
+JHtml::_('jquery.framework');
+JHtml::_('script', 'jui/ajax-chosen.min.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+
+JFactory::getDocument()->addScriptDeclaration(
+	"
+		jQuery(document).ready(function ($) {
+			$('" . $selector . "').ajaxChosen({
+				type: '" . $type . "',
+				url: '" . $url . "',
+				dataType: '" . $dataType . "',
+				jsonTermKey: '" . $jsonTermKey . "',
+				afterTypeDelay: '" . $afterTypeDelay . "',
+				minTermLength: '" . $minTermLength . "'
+			}, function (data) {
+				var results = [];
+
+				$.each(data, function (i, val) {
+					results.push({ value: val.value, text: val.text });
+				});
+
+				return results;
+			});
+		});
+	"
+);
\ No newline at end of file
diff --git a/core/layouts/joomla/html/formbehavior/chosen.php b/core/layouts/joomla/html/formbehavior/chosen.php
new file mode 100644
index 00000000..ed17e942
--- /dev/null
+++ b/core/layouts/joomla/html/formbehavior/chosen.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $selector       The id of the field
+ * @var  array    $options        The options array
+ * @var  boolean  $debug          Are we in debug mode?
+ */
+
+extract($displayData);
+
+// Include jQuery
+JHtml::_('jquery.framework');
+JHtml::_('script', 'jui/chosen.jquery.min.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+JHtml::_('stylesheet', 'jui/chosen.css', array('version' => 'auto', 'relative' => true));
+
+// Options array to json options string
+$options_str = json_encode($options, ($debug && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false));
+
+JFactory::getDocument()->addScriptDeclaration(
+	'
+	jQuery(function ($) {
+		initChosen();
+		$("body").on("subform-row-add", initChosen);
+
+		function initChosen(event, container)
+		{
+			container = container || document;
+			$(container).find(' . json_encode($selector) . ').chosen(' . $options_str . ');
+		}
+	});
+	'
+);
diff --git a/core/layouts/joomla/html/sortablelist.php b/core/layouts/joomla/html/sortablelist.php
new file mode 100644
index 00000000..2cd4ca00
--- /dev/null
+++ b/core/layouts/joomla/html/sortablelist.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $tableId                 The id of the table
+ * @var  string   $formId                  The id of the form
+ * @var  string   $saveOrderingUrl         Save the ordering URL?
+ * @var  string   $sortDir                 The direction of the order (asc/desc)
+ * @var  string   $nestedList              Is it nested list?
+ * @var  string   $proceedSaveOrderButton  Is there a button to initiate the ordering?
+ */
+
+extract($displayData);
+
+// Depends on jQuery UI
+JHtml::_('jquery.ui', array('core', 'sortable'));
+
+JHtml::_('script', 'jui/sortablelist.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'jui/sortablelist.css', array('version' => 'auto', 'relative' => true));
+
+// Attach sortable to document
+JFactory::getDocument()->addScriptDeclaration(
+	"
+		jQuery(document).ready(function ($){
+			var sortableList = new $.JSortableList('#"
+	. $tableId . " tbody','" . $formId . "','" . $sortDir . "' , '" . $saveOrderingUrl . "','','" . $nestedList . "');
+		});
+	"
+);
+
+if ($proceedSaveOrderButton)
+{
+	JFactory::getDocument()->addScriptDeclaration(
+		"
+		jQuery(document).ready(function ($){
+			var saveOrderButton = $('.saveorder');
+			saveOrderButton.css({'opacity':'0.2', 'cursor':'default'}).attr('onclick','return false;');
+			var oldOrderingValue = '';
+			$('.text-area-order').focus(function ()
+			{
+				oldOrderingValue = $(this).attr('value');
+			})
+			.keyup(function (){
+				var newOrderingValue = $(this).attr('value');
+				if (oldOrderingValue != newOrderingValue)
+				{
+					saveOrderButton.css({'opacity':'1', 'cursor':'pointer'}).removeAttr('onclick')
+				}
+			});
+		});
+		"
+	);
+}
diff --git a/core/layouts/joomla/html/tag.php b/core/layouts/joomla/html/tag.php
new file mode 100644
index 00000000..3c2a6d77
--- /dev/null
+++ b/core/layouts/joomla/html/tag.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $selector       The id of the field
+ * @var  string   $minTermLength  The minimum number of characters for the tag
+ * @var  boolean  $allowCustom    Can we insert custom tags?
+ */
+
+extract($displayData);
+
+
+// Tags field ajax
+$chosenAjaxSettings = new Registry(
+	array(
+		'selector'      => $selector,
+		'type'          => 'GET',
+		'url'           => JUri::root() . 'index.php?option=com_tags&task=tags.searchAjax',
+		'dataType'      => 'json',
+		'jsonTermKey'   => 'like',
+		'minTermLength' => $minTermLength
+	)
+);
+
+JHtml::_('formbehavior.ajaxchosen', $chosenAjaxSettings);
+
+// Allow custom values?
+if ($allowCustom)
+{
+	JFactory::getDocument()->addScriptDeclaration(
+		"
+		jQuery(document).ready(function ($) {
+			var customTagPrefix = '#new#';
+
+			function tagHandler(event,element) {
+				// Search a highlighted result
+
+				var highlighted = $('" . $selector . "_chzn').find('li.active-result.highlighted').first();
+
+				// Add the highlighted option
+				if (event.which === 13 && highlighted.text() !== '')
+				{
+					// Extra check. If we have added a custom tag with element text remove it
+					var customOptionValue = customTagPrefix + highlighted.text();
+					$('" . $selector . " option').filter(function () { return $(element).val() == customOptionValue; }).remove();
+
+					// Select the highlighted result
+					var tagOption = $('" . $selector . " option').filter(function () { return $(element).html() == highlighted.text(); });
+					tagOption.attr('selected', 'selected');
+				}
+				// Add the custom tag option
+				else
+				{
+					var customTag = element.value;
+
+					// Extra check. Search if the custom tag already exists (typed faster than AJAX ready)
+					var tagOption = $('" . $selector . " option').filter(function () { return $(element).html() == customTag; });
+					if (tagOption.text() !== '')
+					{
+						tagOption.attr('selected', 'selected');
+					}
+					else
+					{
+						var option = $('<option>');
+						option.text(element.value).val(customTagPrefix + element.value);
+						option.attr('selected','selected');
+
+						// Append the option and repopulate the chosen field
+						$('" . $selector . "').append(option);
+					}
+				}
+
+				element.value = '';
+				$('" . $selector . "').trigger('liszt:updated');
+			}
+
+			// Method to add tags pressing comma
+			$('" . $selector . "_chzn input').keypress(function(event) {
+				if (event.charCode === 44)
+				{
+					// Tag is greater than the minimum required chars
+					if (this.value && this.value.length >= " . $minTermLength . ")
+					{
+						tagHandler(event, this);
+					}
+
+					// Do not add comma to tag at all
+					event.preventDefault();
+				}
+			});
+
+			// Method to add tags pressing enter
+			$('" . $selector . "_chzn input').keyup(function(event) {
+				// Tag is greater than the minimum required chars and enter pressed
+				if (event.which === 13 && this.value && this.value.length >= " . $minTermLength . ")
+				{
+					tagHandler(event,this);
+					event.preventDefault();
+				}
+			});
+		});
+		"
+	);
+}
diff --git a/core/layouts/joomla/html/treeprefix.php b/core/layouts/joomla/html/treeprefix.php
new file mode 100644
index 00000000..80d97252
--- /dev/null
+++ b/core/layouts/joomla/html/treeprefix.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  integer  $level  The level of the item in the tree like structure.
+ *
+ * @since  3.6.0
+ */
+
+extract($displayData);
+
+if ($level > 1)
+{
+	echo '<span class="muted">' . str_repeat('&#9482;&nbsp;&nbsp;&nbsp;', (int) $level - 2) . '</span>&ndash;&nbsp;';
+}
diff --git a/core/layouts/joomla/links/groupclose.php b/core/layouts/joomla/links/groupclose.php
new file mode 100644
index 00000000..2490cda3
--- /dev/null
+++ b/core/layouts/joomla/links/groupclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+	</ul>
diff --git a/core/layouts/joomla/links/groupopen.php b/core/layouts/joomla/links/groupopen.php
new file mode 100644
index 00000000..12ec4a47
--- /dev/null
+++ b/core/layouts/joomla/links/groupopen.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<h2 class="nav-header"><?php echo JFilterOutput::ampReplace(JText::_($displayData)); ?></h2>
+<ul class="j-links-group nav nav-list">
diff --git a/core/layouts/joomla/links/groupsclose.php b/core/layouts/joomla/links/groupsclose.php
new file mode 100644
index 00000000..5e84c660
--- /dev/null
+++ b/core/layouts/joomla/links/groupsclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+</div>
diff --git a/core/layouts/joomla/links/groupseparator.php b/core/layouts/joomla/links/groupseparator.php
new file mode 100644
index 00000000..1b6df93d
--- /dev/null
+++ b/core/layouts/joomla/links/groupseparator.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<div class="j-links-separator"></div>
diff --git a/core/layouts/joomla/links/groupsopen.php b/core/layouts/joomla/links/groupsopen.php
new file mode 100644
index 00000000..8aa83951
--- /dev/null
+++ b/core/layouts/joomla/links/groupsopen.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<div class="j-links-groups">
\ No newline at end of file
diff --git a/core/layouts/joomla/links/link.php b/core/layouts/joomla/links/link.php
new file mode 100644
index 00000000..29f7717d
--- /dev/null
+++ b/core/layouts/joomla/links/link.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span class="j-links-link">' . $displayData['text'] . '</span>')
+
+?>
+<li<?php echo $id; ?>>
+	<a href="<?php echo JFilterOutput::ampReplace($displayData['link']); ?>"<?php echo $target . $onclick . $title; ?>>
+		<span class="icon-<?php echo $displayData['image']; ?>" aria-hidden="true"></span> <?php echo $text; ?>
+	</a>
+</li>
diff --git a/core/layouts/joomla/modal/body.php b/core/layouts/joomla/modal/body.php
new file mode 100644
index 00000000..df7af5d8
--- /dev/null
+++ b/core/layouts/joomla/modal/body.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ *                             - bodyHeight   int      Optional height of the modal body in viewport units (vh)
+ *                             - modalWidth   int      Optional width of the modal in viewport units (vh)
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the URL option is set
+ *
+ */
+
+$bodyClass = 'modal-body';
+
+$bodyHeight = isset($params['bodyHeight']) ? round((int) $params['bodyHeight'], -1) : '';
+
+if ($bodyHeight && $bodyHeight >= 20 && $bodyHeight < 90)
+{
+	$bodyClass .= ' jviewport-height' . $bodyHeight;
+}
+?>
+<div class="<?php echo $bodyClass; ?>">
+	<?php echo $body; ?>
+</div>
diff --git a/core/layouts/joomla/modal/footer.php b/core/layouts/joomla/modal/footer.php
new file mode 100644
index 00000000..e1a9af02
--- /dev/null
+++ b/core/layouts/joomla/modal/footer.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ *                             - bodyHeight   int      Optional height of the modal body in viewport units (vh)
+ *                             - modalWidth   int      Optional width of the modal in viewport units (vh)
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the URL option is set
+ *
+ */
+?>
+<div class="modal-footer">
+	<?php echo $params['footer']; ?>
+</div>
diff --git a/core/layouts/joomla/modal/header.php b/core/layouts/joomla/modal/header.php
new file mode 100644
index 00000000..5cc8f024
--- /dev/null
+++ b/core/layouts/joomla/modal/header.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ *                             - bodyHeight   int      Optional height of the modal body in viewport units (vh)
+ *                             - modalWidth   int      Optional width of the modal in viewport units (vh)
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the URL option is set
+ *
+ */
+?>
+<div class="modal-header">
+	<?php if (!isset($params['closeButton']) || $params['closeButton']) : ?>
+		<button type="button" class="close novalidate" data-dismiss="modal">×</button>
+	<?php endif; ?>
+	<?php if (isset($params['title'])) : ?>
+		<h3><?php echo $params['title']; ?></h3>
+	<?php endif; ?>
+</div>
diff --git a/core/layouts/joomla/modal/iframe.php b/core/layouts/joomla/modal/iframe.php
new file mode 100644
index 00000000..fc953050
--- /dev/null
+++ b/core/layouts/joomla/modal/iframe.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - footer       string   Optional markup for the modal footer
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ *                             - bodyHeight   int      Optional height of the modal body in viewport units (vh)
+ *                             - modalWidth   int      Optional width of the modal in viewport units (vh)
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the URL option is set
+ *
+ */
+
+$iframeClass = 'iframe';
+
+$bodyHeight = isset($params['bodyHeight']) ? round((int) $params['bodyHeight'], -1) : '';
+
+if ($bodyHeight && $bodyHeight >= 20 && $bodyHeight < 90)
+{
+	$iframeClass .= ' jviewport-height' . $bodyHeight;
+}
+
+$iframeAttributes = array(
+	'class' => $iframeClass,
+	'src'   => $params['url']
+);
+
+if (isset($params['title']))
+{
+	$iframeAttributes['name'] = addslashes($params['title']);
+}
+
+if (isset($params['height']))
+{
+	$iframeAttributes['height'] = $params['height'];
+}
+
+if (isset($params['width']))
+{
+	$iframeAttributes['width'] = $params['width'];
+}
+?>
+<iframe <?php echo ArrayHelper::toString($iframeAttributes); ?>></iframe>
diff --git a/core/layouts/joomla/modal/main.php b/core/layouts/joomla/modal/main.php
new file mode 100644
index 00000000..9b38f01a
--- /dev/null
+++ b/core/layouts/joomla/modal/main.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+// Load bootstrap-tooltip-extended plugin for additional tooltip positions in modal
+JHtml::_('bootstrap.tooltipExtended');
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * ------------------
+ * @param   string  $selector  Unique DOM identifier for the modal. CSS id without #
+ * @param   array   $params    Modal parameters. Default supported parameters:
+ *                             - title        string   The modal title
+ *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+ *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+ *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+ *                             - closeButton  boolean  Display modal close button (default = true)
+ *                             - animation    boolean  Fade in from the top of the page (default = true)
+ *                             - url          string   URL of a resource to be inserted as an <iframe> inside the modal body
+ *                             - height       string   height of the <iframe> containing the remote resource
+ *                             - width        string   width of the <iframe> containing the remote resource
+ *                             - bodyHeight   int      Optional height of the modal body in viewport units (vh)
+ *                             - modalWidth   int      Optional width of the modal in viewport units (vh)
+ *                             - footer       string   Optional markup for the modal footer
+ * @param   string  $body      Markup for the modal body. Appended after the <iframe> if the URL option is set
+ *
+ */
+
+$modalClasses = array('modal', 'hide');
+
+if (!isset($params['animation']) || $params['animation'])
+{
+	$modalClasses[] = 'fade';
+}
+
+$modalWidth = isset($params['modalWidth']) ? round((int) $params['modalWidth'], -1) : '';
+
+if ($modalWidth && $modalWidth > 0 && $modalWidth <= 100)
+{
+	$modalClasses[] = 'jviewport-width' . $modalWidth;
+}
+
+$modalAttributes = array(
+	'tabindex' => '-1',
+	'class'    => implode(' ', $modalClasses)
+);
+
+if (isset($params['backdrop']))
+{
+	$modalAttributes['data-backdrop'] = (is_bool($params['backdrop']) ? ($params['backdrop'] ? 'true' : 'false') : $params['backdrop']);
+}
+
+if (isset($params['keyboard']))
+{
+	$modalAttributes['data-keyboard'] = (is_bool($params['keyboard']) ? ($params['keyboard'] ? 'true' : 'false') : 'true');
+}
+
+/**
+ * These lines below are for disabling scrolling of parent window.
+ * $('body').addClass('modal-open');
+ * $('body').removeClass('modal-open')
+ *
+ * Scrolling inside bootstrap modals on small screens (adapt to window viewport and avoid modal off screen).
+ *      - max-height    .modal-body     Max-height for the modal body
+ *                                      When height of the modal is too high for the window viewport height.
+ *      - max-height    .iframe         Max-height for the iframe (Deducting the padding of the modal-body)
+ *                                      When URL option is set and height of the iframe is higher than max-height of the modal body.
+ *
+ * Fix iOS scrolling inside bootstrap modals
+ *      - overflow-y    .modal-body     When max-height is set for modal-body
+ *
+ * Specific hack for Bootstrap 2.3.x
+ */
+$script[] = "jQuery(document).ready(function($) {";
+$script[] = "   $('#" . $selector . "').on('show.bs.modal', function() {";
+
+$script[] = "       $('body').addClass('modal-open');";
+
+if (isset($params['url']))
+{
+	$iframeHtml = JLayoutHelper::render('joomla.modal.iframe', $displayData);
+
+	// Script for destroying and reloading the iframe
+	$script[] = "       var modalBody = $(this).find('.modal-body');";
+	$script[] = "       modalBody.find('iframe').remove();";
+	$script[] = "       modalBody.prepend('" . trim($iframeHtml) . "');";
+}
+else
+{
+	// Set modalTooltip container to modal ID (selector), and placement to top-left if no data attribute (bootstrap-tooltip-extended.js)
+	$script[] = "       $('.modalTooltip').each(function(){;";
+	$script[] = "           var attr = $(this).attr('data-placement');";
+	$script[] = "           if ( attr === undefined || attr === false ) $(this).attr('data-placement', 'auto-dir top-left')";
+	$script[] = "       });";
+	$script[] = "       $('.modalTooltip').tooltip({'html': true, 'container': '#" . $selector . "'});";
+}
+
+// Adapt modal body max-height to window viewport if needed, when the modal has been made visible to the user.
+$script[] = "   }).on('shown.bs.modal', function() {";
+
+// Get height of the modal elements.
+$script[] = "       var modalHeight = $('div.modal:visible').outerHeight(true),";
+$script[] = "           modalHeaderHeight = $('div.modal-header:visible').outerHeight(true),";
+$script[] = "           modalBodyHeightOuter = $('div.modal-body:visible').outerHeight(true),";
+$script[] = "           modalBodyHeight = $('div.modal-body:visible').height(),";
+$script[] = "           modalFooterHeight = $('div.modal-footer:visible').outerHeight(true),";
+
+// Get padding top (jQuery position().top not working on iOS devices and webkit browsers, so use of Javascript instead)
+$script[] = "           padding = document.getElementById('" . $selector . "').offsetTop,";
+
+// Calculate max-height of the modal, adapted to window viewport height.
+$script[] = "           maxModalHeight = ($(window).height()-(padding*2)),";
+
+// Calculate max-height for modal-body.
+$script[] = "           modalBodyPadding = (modalBodyHeightOuter-modalBodyHeight),";
+$script[] = "           maxModalBodyHeight = maxModalHeight-(modalHeaderHeight+modalFooterHeight+modalBodyPadding);";
+
+if (isset($params['url']))
+{
+	// Set max-height for iframe if needed, to adapt to viewport height.
+	$script[] = "       var iframeHeight = $('.iframe').height();";
+	$script[] = "       if (iframeHeight > maxModalBodyHeight){;";
+	$script[] = "           $('.modal-body').css({'max-height': maxModalBodyHeight, 'overflow-y': 'auto'});";
+	$script[] = "           $('.iframe').css('max-height', maxModalBodyHeight-modalBodyPadding);";
+	$script[] = "       }";
+}
+else
+{
+	// Set max-height for modal-body if needed, to adapt to viewport height.
+	$script[] = "       if (modalHeight > maxModalHeight){;";
+	$script[] = "           $('.modal-body').css({'max-height': maxModalBodyHeight, 'overflow-y': 'auto'});";
+	$script[] = "       }";
+}
+
+$script[] = "   }).on('hide.bs.modal', function () {";
+$script[] = "       $('body').removeClass('modal-open');";
+$script[] = "       $('.modal-body').css({'max-height': 'initial', 'overflow-y': 'initial'});";
+$script[] = "       $('.modalTooltip').tooltip('destroy');";
+$script[] = "   });";
+$script[] = "});";
+
+JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+?>
+<div id="<?php echo $selector; ?>" <?php echo ArrayHelper::toString($modalAttributes); ?>>
+	<?php
+	// Header
+	if (!isset($params['closeButton']) || isset($params['title']) || $params['closeButton'])
+	{
+		echo JLayoutHelper::render('joomla.modal.header', $displayData);
+	}
+
+	// Body
+	echo JLayoutHelper::render('joomla.modal.body', $displayData);
+
+	// Footer
+	if (isset($params['footer']))
+	{
+		echo JLayoutHelper::render('joomla.modal.footer', $displayData);
+	}
+	?>
+</div>
diff --git a/core/layouts/joomla/pagination/link.php b/core/layouts/joomla/pagination/link.php
new file mode 100644
index 00000000..52956965
--- /dev/null
+++ b/core/layouts/joomla/pagination/link.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/** @var JPaginationObject $item */
+$item = $displayData['data'];
+
+$display = $item->text;
+
+switch ((string) $item->text)
+{
+	// Check for "Start" item
+	case JText::_('JLIB_HTML_START') :
+		$icon = 'icon-backward icon-first';
+		break;
+
+	// Check for "Prev" item
+	case $item->text === JText::_('JPREV') :
+		$item->text = JText::_('JPREVIOUS');
+		$icon = 'icon-step-backward icon-previous';
+		break;
+
+	// Check for "Next" item
+	case JText::_('JNEXT') :
+		$icon = 'icon-step-forward icon-next';
+		break;
+
+	// Check for "End" item
+	case JText::_('JLIB_HTML_END') :
+		$icon = 'icon-forward icon-last';
+		break;
+
+	default:
+		$icon = null;
+		break;
+}
+
+if ($icon !== null)
+{
+	$display = '<span class="' . $icon . '"></span>';
+}
+
+if ($displayData['active'])
+{
+	if ($item->base > 0)
+	{
+		$limit = 'limitstart.value=' . $item->base;
+	}
+	else
+	{
+		$limit = 'limitstart.value=0';
+	}
+
+	$cssClasses = array();
+
+	$title = '';
+
+	if (!is_numeric($item->text))
+	{
+		JHtml::_('bootstrap.tooltip');
+		$cssClasses[] = 'hasTooltip';
+		$title = ' title="' . $item->text . '" ';
+	}
+
+	$onClick = 'document.adminForm.' . $item->prefix . 'limitstart.value=' . ($item->base > 0 ? $item->base : '0') . '; Joomla.submitform();return false;';
+}
+else
+{
+	$class = (property_exists($item, 'active') && $item->active) ? 'active' : 'disabled';
+}
+?>
+<?php if ($displayData['active']) : ?>
+	<li>
+		<a <?php echo $cssClasses ? 'class="' . implode(' ', $cssClasses) . '"' : ''; ?> <?php echo $title; ?> href="#" onclick="<?php echo $onClick; ?>">
+			<?php echo $display; ?>
+		</a>
+	</li>
+<?php else : ?>
+	<li class="<?php echo $class; ?>">
+		<span><?php echo $display; ?></span>
+	</li>
+<?php endif;
diff --git a/core/layouts/joomla/pagination/links.php b/core/layouts/joomla/pagination/links.php
new file mode 100644
index 00000000..06a6cd30
--- /dev/null
+++ b/core/layouts/joomla/pagination/links.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Registry\Registry;
+
+$list = $displayData['list'];
+$pages = $list['pages'];
+
+$options = new Registry($displayData['options']);
+
+$showLimitBox   = $options->get('showLimitBox', true);
+$showPagesLinks = $options->get('showPagesLinks', true);
+$showLimitStart = $options->get('showLimitStart', true);
+
+// Calculate to display range of pages
+$currentPage = 1;
+$range = 1;
+$step = 5;
+
+if (!empty($pages['pages']))
+{
+	foreach ($pages['pages'] as $k => $page)
+	{
+		if (!$page['active'])
+		{
+			$currentPage = $k;
+		}
+	}
+}
+
+if ($currentPage >= $step)
+{
+	if ($currentPage % $step === 0)
+	{
+		$range = ceil($currentPage / $step) + 1;
+	}
+	else
+	{
+		$range = ceil($currentPage / $step);
+	}
+}
+?>
+
+<div class="pagination pagination-toolbar clearfix" style="text-align: center;">
+
+	<?php if ($showLimitBox) : ?>
+		<div class="limit pull-right">
+			<?php echo JText::_('JGLOBAL_DISPLAY_NUM') . $list['limitfield']; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($showPagesLinks && (!empty($pages))) : ?>
+		<ul class="pagination-list">
+			<?php
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['start']);
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['previous']); ?>
+			<?php foreach ($pages['pages'] as $k => $page) : ?>
+
+				<?php $output = JLayoutHelper::render('joomla.pagination.link', $page); ?>
+				<?php if (in_array($k, range($range * $step - ($step + 1), $range * $step), true)) : ?>
+					<?php if (($k % $step === 0 || $k === $range * $step - ($step + 1)) && $k !== $currentPage && $k !== $range * $step - $step) : ?>
+						<?php $output = preg_replace('#(<a.*?>).*?(</a>)#', '$1...$2', $output); ?>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php echo $output; ?>
+			<?php endforeach; ?>
+			<?php
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['next']);
+				echo JLayoutHelper::render('joomla.pagination.link', $pages['end']); ?>
+		</ul>
+	<?php endif; ?>
+
+	<?php if ($showLimitStart) : ?>
+		<input type="hidden" name="<?php echo $list['prefix']; ?>limitstart" value="<?php echo $list['limitstart']; ?>" />
+	<?php endif; ?>
+
+</div>
diff --git a/core/layouts/joomla/pagination/list.php b/core/layouts/joomla/pagination/list.php
new file mode 100644
index 00000000..b5691402
--- /dev/null
+++ b/core/layouts/joomla/pagination/list.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$list = $displayData['list'];
+?>
+<ul>
+	<li class="pagination-start"><?php echo $list['start']['data']; ?></li>
+	<li class="pagination-prev"><?php echo $list['previous']['data']; ?></li>
+	<?php foreach ($list['pages'] as $page) : ?>
+		<?php echo '<li>' . $page['data'] . '</li>'; ?>
+	<?php endforeach; ?>
+	<li class="pagination-next"><?php echo $list['next']['data']; ?></li>
+	<li class="pagination-end"><?php echo $list['end']['data']; ?></li>
+</ul>
diff --git a/core/layouts/joomla/quickicons/icon.php b/core/layouts/joomla/quickicons/icon.php
new file mode 100644
index 00000000..db9ce4b3
--- /dev/null
+++ b/core/layouts/joomla/quickicons/icon.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span>' . $displayData['text'] . '</span>')
+
+?>
+<div class="row-fluid"<?php echo $id; ?>>
+	<div class="span12">
+		<a href="<?php echo $displayData['link']; ?>"<?php echo $target . $onclick . $title; ?>>
+			<span class="icon-<?php echo $displayData['image']; ?>" aria-hidden="true"></span> <?php echo $text; ?>
+		</a>
+	</div>
+</div>
diff --git a/core/layouts/joomla/searchtools/default.php b/core/layouts/joomla/searchtools/default.php
new file mode 100644
index 00000000..0ba7bea4
--- /dev/null
+++ b/core/layouts/joomla/searchtools/default.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+$noResultsText     = '';
+$hideActiveFilters = false;
+$showFilterButton  = false;
+$showSelector      = false;
+$selectorFieldName = isset($data['options']['selectorFieldName']) ? $data['options']['selectorFieldName'] : 'client_id';
+
+// If a filter form exists.
+if (isset($data['view']->filterForm) && !empty($data['view']->filterForm))
+{
+	// Checks if a selector (e.g. client_id) exists.
+	if ($selectorField = $data['view']->filterForm->getField($selectorFieldName))
+	{
+		$showSelector = $selectorField->getAttribute('filtermode', '') == 'selector' ? true : $showSelector;
+
+		// Checks if a selector should be shown in the current layout.
+		if (isset($data['view']->layout))
+		{
+			$showSelector = $selectorField->getAttribute('layout', 'default') != $data['view']->layout ? false : $showSelector;
+		}
+
+		// Unset the selector field from active filters group.
+		unset($data['view']->activeFilters[$selectorFieldName]);
+	}
+
+	// Checks if the filters button should exist.
+	$filters = $data['view']->filterForm->getGroup('filter');
+	$showFilterButton = isset($filters['filter_search']) && count($filters) === 1 ? false : true;
+
+	// Checks if it should show the be hidden.
+	$hideActiveFilters = empty($data['view']->activeFilters);
+
+	// Check if the no results message should appear.
+	if (isset($data['view']->total) && (int) $data['view']->total === 0)
+	{
+		$noResults = $data['view']->filterForm->getFieldAttribute('search', 'noresults', '', 'filter');
+		if (!empty($noResults))
+		{
+			$noResultsText = JText::_($noResults);
+		}
+	}
+}
+
+// Set some basic options.
+$customOptions = array(
+	'filtersHidden'       => isset($data['options']['filtersHidden']) && $data['options']['filtersHidden'] ? $data['options']['filtersHidden'] : $hideActiveFilters,
+	'filterButton'        => isset($data['options']['filterButton']) && $data['options']['filterButton'] ? $data['options']['filterButton'] : $showFilterButton,
+	'defaultLimit'        => isset($data['options']['defaultLimit']) ? $data['options']['defaultLimit'] : JFactory::getApplication()->get('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'selectorFieldName'   => $selectorFieldName,
+	'showSelector'        => $showSelector,
+	'orderFieldSelector'  => '#list_fullordering',
+	'showNoResults'       => !empty($noResultsText) ? true : false,
+	'noResultsText'       => !empty($noResultsText) ? $noResultsText : '',
+	'formSelector'        => !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm',
+);
+
+// Merge custom options in the options array.
+$data['options'] = array_merge($customOptions, $data['options']);
+
+// Add class to hide the active filters if needed.
+$filtersActiveClass = $hideActiveFilters ? '' : ' js-stools-container-filters-visible';
+
+// Load search tools
+JHtml::_('searchtools.form', $data['options']['formSelector'], $data['options']);
+?>
+<div class="js-stools clearfix">
+	<div class="clearfix">
+		<?php if ($data['options']['showSelector']) : ?>
+		<div class="js-stools-container-selector">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.selector', $data); ?>
+		</div>
+		<?php endif; ?>
+		<div class="js-stools-container-bar">
+			<?php echo $this->sublayout('bar', $data); ?>
+		</div>
+		<div class="js-stools-container-list hidden-phone hidden-tablet">
+			<?php echo $this->sublayout('list', $data); ?>
+		</div>
+	</div>
+	<!-- Filters div -->
+	<?php if ($data['options']['filterButton']) : ?>
+	<div class="js-stools-container-filters hidden-phone clearfix<?php echo $filtersActiveClass; ?>">
+		<?php echo $this->sublayout('filters', $data); ?>
+	</div>
+	<?php endif; ?>
+</div>
+<?php if ($data['options']['showNoResults']) : ?>
+	<?php echo $this->sublayout('noitems', $data); ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/searchtools/default/bar.php b/core/layouts/joomla/searchtools/default/bar.php
new file mode 100644
index 00000000..4855e401
--- /dev/null
+++ b/core/layouts/joomla/searchtools/default/bar.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Registry\Registry;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if (is_array($data['options']))
+{
+	$data['options'] = new Registry($data['options']);
+}
+
+// Options
+$filterButton = $data['options']->get('filterButton', true);
+$searchButton = $data['options']->get('searchButton', true);
+
+$filters = $data['view']->filterForm->getGroup('filter');
+?>
+
+<?php if (!empty($filters['filter_search'])) : ?>
+	<?php if ($searchButton) : ?>
+		<label for="filter_search" class="element-invisible">
+			<?php if (isset($filters['filter_search']->label)) : ?>
+				<?php echo JText::_($filters['filter_search']->label); ?>
+			<?php else : ?>
+				<?php echo JText::_('JSEARCH_FILTER'); ?>
+			<?php endif; ?>
+		</label>
+		<div class="btn-wrapper input-append">
+			<?php echo $filters['filter_search']->input; ?>
+			<?php if ($filters['filter_search']->description) : ?>
+				<?php JHtmlBootstrap::tooltip('#filter_search', array('title' => JText::_($filters['filter_search']->description))); ?>
+			<?php endif; ?>
+			<button type="submit" class="btn hasTooltip" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_FILTER_SUBMIT'); ?>" aria-label="<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?>">
+				<span class="icon-search" aria-hidden="true"></span>
+			</button>
+		</div>
+		<?php if ($filterButton) : ?>
+			<div class="btn-wrapper hidden-phone">
+				<button type="button" class="btn hasTooltip js-stools-btn-filter" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_TOOLS_DESC'); ?>">
+					<?php echo JText::_('JSEARCH_TOOLS');?> <span class="caret"></span>
+				</button>
+			</div>
+		<?php endif; ?>
+		<div class="btn-wrapper">
+			<button type="button" class="btn hasTooltip js-stools-btn-clear" title="<?php echo JHtml::_('tooltipText', 'JSEARCH_FILTER_CLEAR'); ?>">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR');?>
+			</button>
+		</div>
+	<?php endif; ?>
+<?php endif;
diff --git a/core/layouts/joomla/searchtools/default/filters.php b/core/layouts/joomla/searchtools/default/filters.php
new file mode 100644
index 00000000..918f0471
--- /dev/null
+++ b/core/layouts/joomla/searchtools/default/filters.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Load the form filters
+$filters = $data['view']->filterForm->getGroup('filter');
+?>
+<?php if ($filters) : ?>
+	<?php foreach ($filters as $fieldName => $field) : ?>
+		<?php if ($fieldName !== 'filter_search') : ?>
+			<?php $dataShowOn = ''; ?>
+			<?php if ($field->showon) : ?>
+				<?php JHtml::_('jquery.framework'); ?>
+				<?php JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true)); ?>
+				<?php $dataShowOn = " data-showon='" . json_encode(JFormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . "'"; ?>
+			<?php endif; ?>
+			<div class="js-stools-field-filter"<?php echo $dataShowOn; ?>>
+				<?php echo $field->input; ?>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>
diff --git a/core/layouts/joomla/searchtools/default/list.php b/core/layouts/joomla/searchtools/default/list.php
new file mode 100644
index 00000000..d188e1ce
--- /dev/null
+++ b/core/layouts/joomla/searchtools/default/list.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Load the form list fields
+$list = $data['view']->filterForm->getGroup('list');
+?>
+<?php if ($list) : ?>
+	<div class="ordering-select hidden-phone">
+		<?php foreach ($list as $fieldName => $field) : ?>
+			<div class="js-stools-field-list">
+				<?php echo $field->input; ?>
+			</div>
+		<?php endforeach; ?>
+	</div>
+<?php endif; ?>
diff --git a/core/layouts/joomla/searchtools/default/noitems.php b/core/layouts/joomla/searchtools/default/noitems.php
new file mode 100644
index 00000000..ea52dde1
--- /dev/null
+++ b/core/layouts/joomla/searchtools/default/noitems.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+?>
+<div class="alert alert-info alert-no-items">
+	<?php echo $data['options']['noResultsText']; ?>
+</div>
diff --git a/core/layouts/joomla/searchtools/default/selector.php b/core/layouts/joomla/searchtools/default/selector.php
new file mode 100644
index 00000000..8ff36d1d
--- /dev/null
+++ b/core/layouts/joomla/searchtools/default/selector.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+?>
+<div class="js-stools-field-selector">
+	<?php echo $data['view']->filterForm->getField($data['options']['selectorFieldName'])->input; ?>
+</div>
diff --git a/core/layouts/joomla/searchtools/grid/sort.php b/core/layouts/joomla/searchtools/grid/sort.php
new file mode 100644
index 00000000..b427302b
--- /dev/null
+++ b/core/layouts/joomla/searchtools/grid/sort.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+$title = htmlspecialchars(JText::_($data->tip ?: $data->title));
+JHtml::_('bootstrap.popover');
+?>
+<a href="#" onclick="return false;" class="js-stools-column-order hasPopover"
+   data-order="<?php echo $data->order; ?>" data-direction="<?php echo strtoupper($data->direction); ?>" data-name="<?php echo JText::_($data->title); ?>"
+   title="<?php echo $title; ?>" data-content="<?php echo htmlspecialchars(JText::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN')); ?>" data-placement="top">
+<?php if (!empty($data->icon)) : ?><span class="<?php echo $data->icon; ?>"></span><?php endif; ?>
+<?php if (!empty($data->title)) : ?><?php echo JText::_($data->title); ?><?php endif; ?>
+<?php if ($data->order == $data->selected) : ?><span class="<?php echo $data->orderIcon; ?>"></span><?php endif; ?>
+</a>
diff --git a/core/layouts/joomla/sidebars/submenu.php b/core/layouts/joomla/sidebars/submenu.php
new file mode 100644
index 00000000..e9a4f5bc
--- /dev/null
+++ b/core/layouts/joomla/sidebars/submenu.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('jquery.framework');
+JHtmlBehavior::core();
+
+JFactory::getDocument()->addScriptDeclaration('
+	jQuery(document).ready(function($)
+	{
+		if (window.toggleSidebar)
+		{
+			toggleSidebar(true);
+		}
+		else
+		{
+			$("#j-toggle-sidebar-header").css("display", "none");
+			$("#j-toggle-button-wrapper").css("display", "none");
+		}
+	});
+');
+?>
+
+<div id="j-toggle-sidebar-wrapper">
+	<div id="j-toggle-button-wrapper" class="j-toggle-button-wrapper">
+		<?php echo JLayoutHelper::render('joomla.sidebars.toggle'); ?>
+	</div>
+	<div id="sidebar" class="sidebar">
+		<div class="sidebar-nav">
+			<?php if ($displayData->displayMenu) : ?>
+			<ul id="submenu" class="nav nav-list">
+				<?php foreach ($displayData->list as $item) :
+				if (isset ($item[2]) && $item[2] == 1) : ?>
+					<li class="active">
+				<?php else : ?>
+					<li>
+				<?php endif;
+				if ($displayData->hide) : ?>
+					<a class="nolink"><?php echo $item[0]; ?></a>
+				<?php else :
+					if ($item[1] !== '') : ?>
+						<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+					<?php else : ?>
+						<?php echo $item[0]; ?>
+					<?php endif;
+				endif; ?>
+				</li>
+				<?php endforeach; ?>
+			</ul>
+			<?php endif; ?>
+			<?php if ($displayData->displayMenu && $displayData->displayFilters) : ?>
+			<hr />
+			<?php endif; ?>
+			<?php if ($displayData->displayFilters) : ?>
+			<div class="filter-select hidden-phone">
+				<h4 class="page-header"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></h4>
+				<?php foreach ($displayData->filters as $filter) : ?>
+					<label for="<?php echo $filter['name']; ?>" class="element-invisible"><?php echo $filter['label']; ?></label>
+					<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="span12 small" onchange="this.form.submit()">
+						<?php if (!$filter['noDefault']) : ?>
+							<option value=""><?php echo $filter['label']; ?></option>
+						<?php endif; ?>
+						<?php echo $filter['options']; ?>
+					</select>
+					<hr class="hr-condensed" />
+				<?php endforeach; ?>
+			</div>
+			<?php endif; ?>
+		</div>
+	</div>
+	<div id="j-toggle-sidebar"></div>
+</div>
diff --git a/core/layouts/joomla/sidebars/toggle.php b/core/layouts/joomla/sidebars/toggle.php
new file mode 100644
index 00000000..4a7b64f7
--- /dev/null
+++ b/core/layouts/joomla/sidebars/toggle.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+// Set the tooltips
+JText::script('JTOGGLE_HIDE_SIDEBAR');
+JText::script('JTOGGLE_SHOW_SIDEBAR');
+?>
+<div
+	id="j-toggle-sidebar-button"
+	class="j-toggle-sidebar-button hidden-phone hasTooltip"
+	onclick="toggleSidebar(false); return false;"
+	>
+		<span id="j-toggle-sidebar-icon" class="icon-arrow-left-2" aria-hidden="true"></span>
+</div>
diff --git a/core/layouts/joomla/system/message.php b/core/layouts/joomla/system/message.php
new file mode 100644
index 00000000..74feabf1
--- /dev/null
+++ b/core/layouts/joomla/system/message.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$msgList = $displayData['msgList'];
+
+?>
+<div id="system-message-container">
+	<?php if (is_array($msgList) && !empty($msgList)) : ?>
+		<div id="system-message">
+			<?php foreach ($msgList as $type => $msgs) : ?>
+				<div class="alert alert-<?php echo $type; ?>">
+					<?php // This requires JS so we should add it through JS. Progressive enhancement and stuff. ?>
+					<a class="close" data-dismiss="alert">×</a>
+
+					<?php if (!empty($msgs)) : ?>
+						<h4 class="alert-heading"><?php echo JText::_($type); ?></h4>
+						<div>
+							<?php foreach ($msgs as $msg) : ?>
+								<div class="alert-message"><?php echo $msg; ?></div>
+							<?php endforeach; ?>
+						</div>
+					<?php endif; ?>
+				</div>
+			<?php endforeach; ?>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/layouts/joomla/tinymce/buttons.php b/core/layouts/joomla/tinymce/buttons.php
new file mode 100644
index 00000000..3ffbaf9c
--- /dev/null
+++ b/core/layouts/joomla/tinymce/buttons.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLog::add('The layout joomla.tinymce.buttons is deprecated, use joomla.editors.buttons instead.', JLog::WARNING, 'deprecated');
+echo JLayoutHelper::render('joomla.editors.buttons', $displayData);
diff --git a/core/layouts/joomla/tinymce/buttons/button.php b/core/layouts/joomla/tinymce/buttons/button.php
new file mode 100644
index 00000000..0de6f43f
--- /dev/null
+++ b/core/layouts/joomla/tinymce/buttons/button.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLog::add('The layout joomla.tinymce.buttons.button is deprecated, use joomla.editors.buttons.button instead.', JLog::WARNING, 'deprecated');
+echo JLayoutHelper::render('joomla.editors.buttons.button', $displayData);
diff --git a/core/layouts/joomla/tinymce/textarea.php b/core/layouts/joomla/tinymce/textarea.php
new file mode 100644
index 00000000..d150cef0
--- /dev/null
+++ b/core/layouts/joomla/tinymce/textarea.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+?>
+<textarea
+	name="<?php echo $data->name; ?>"
+	id="<?php echo $data->id; ?>"
+	cols="<?php echo $data->cols; ?>"
+	rows="<?php echo $data->rows; ?>"
+	style="width: <?php echo $data->width; ?>; height: <?php echo $data->height; ?>;"
+	class="<?php echo empty($data->class) ? 'mce_editable' : $data->class; ?>"
+	<?php echo $data->readonly ? ' readonly disabled' : ''; ?>
+>
+	<?php echo $data->content; ?>
+</textarea>
\ No newline at end of file
diff --git a/core/layouts/joomla/tinymce/togglebutton.php b/core/layouts/joomla/tinymce/togglebutton.php
new file mode 100644
index 00000000..3a339bf3
--- /dev/null
+++ b/core/layouts/joomla/tinymce/togglebutton.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$name = $displayData;
+
+?>
+<div class="toggle-editor btn-toolbar pull-right clearfix">
+	<div class="btn-group">
+		<a class="btn" href="#"
+			onclick="tinyMCE.execCommand('mceToggleEditor', false, '<?php echo $name; ?>');return false;"
+			title="<?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>"
+		>
+			<span class="icon-eye" aria-hidden="true"></span> <?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>
+		</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/core/layouts/joomla/toolbar/base.php b/core/layouts/joomla/toolbar/base.php
new file mode 100644
index 00000000..2158b360
--- /dev/null
+++ b/core/layouts/joomla/toolbar/base.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<div class="btn-wrapper" <?php echo $displayData['id']; ?>>
+	<?php echo $displayData['action']; ?>
+</div>
diff --git a/core/layouts/joomla/toolbar/batch.php b/core/layouts/joomla/toolbar/batch.php
new file mode 100644
index 00000000..c239d91f
--- /dev/null
+++ b/core/layouts/joomla/toolbar/batch.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$title = $displayData['title'];
+JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+$message = "alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));";
+?>
+<button data-toggle="modal" onclick="if (document.adminForm.boxchecked.value==0){<?php echo $message; ?>}else{jQuery( '#collapseModal' ).modal('show'); return true;}" class="btn btn-small">
+	<span class="icon-checkbox-partial" aria-hidden="true"></span>
+	<?php echo $title; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/confirm.php b/core/layouts/joomla/toolbar/confirm.php
new file mode 100644
index 00000000..71e70d64
--- /dev/null
+++ b/core/layouts/joomla/toolbar/confirm.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small">
+	<span class="<?php echo $class; ?>" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/containerclose.php b/core/layouts/joomla/toolbar/containerclose.php
new file mode 100644
index 00000000..5e84c660
--- /dev/null
+++ b/core/layouts/joomla/toolbar/containerclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+</div>
diff --git a/core/layouts/joomla/toolbar/containeropen.php b/core/layouts/joomla/toolbar/containeropen.php
new file mode 100644
index 00000000..99277147
--- /dev/null
+++ b/core/layouts/joomla/toolbar/containeropen.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+<div class="btn-toolbar" role="toolbar" aria-label="<?php echo JText::_('JTOOLBAR'); ?>" id="<?php echo $displayData['id']; ?>">
diff --git a/core/layouts/joomla/toolbar/help.php b/core/layouts/joomla/toolbar/help.php
new file mode 100644
index 00000000..7f79f636
--- /dev/null
+++ b/core/layouts/joomla/toolbar/help.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$doTask = $displayData['doTask'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" rel="help" class="btn btn-small">
+	<span class="icon-question-sign" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/iconclass.php b/core/layouts/joomla/toolbar/iconclass.php
new file mode 100644
index 00000000..aef3b443
--- /dev/null
+++ b/core/layouts/joomla/toolbar/iconclass.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+icon-<?php echo $displayData['icon']; ?>
diff --git a/core/layouts/joomla/toolbar/link.php b/core/layouts/joomla/toolbar/link.php
new file mode 100644
index 00000000..a766647b
--- /dev/null
+++ b/core/layouts/joomla/toolbar/link.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="location.href='<?php echo $doTask; ?>';" class="btn btn-small">
+	<span class="<?php echo $class; ?>" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/modal.php b/core/layouts/joomla/toolbar/modal.php
new file mode 100644
index 00000000..96841ddc
--- /dev/null
+++ b/core/layouts/joomla/toolbar/modal.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+/**
+ * Generic toolbar button layout to open a modal
+ * -----------------------------------------------
+ * @param   array   $displayData    Button parameters. Default supported parameters:
+ *                                  - selector  string  Unique DOM identifier for the modal. CSS id without #
+ *                                  - class     string  Button class
+ *                                  - icon      string  Button icon
+ *                                  - text      string  Button text
+ */
+
+$selector = $displayData['selector'];
+$class    = isset($displayData['class']) ? $displayData['class'] : 'btn btn-small';
+$icon     = isset($displayData['icon']) ? $displayData['icon'] : 'out-3';
+$text     = isset($displayData['text']) ? $displayData['text'] : '';
+?>
+<button class="<?php echo $class; ?>" data-toggle="modal" data-target="#<?php echo $selector; ?>">
+	<span class="icon-<?php echo $icon; ?>" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/popup.php b/core/layouts/joomla/toolbar/popup.php
new file mode 100644
index 00000000..a3e654e8
--- /dev/null
+++ b/core/layouts/joomla/toolbar/popup.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+$name   = $displayData['name'];
+?>
+<button value="<?php echo $doTask; ?>" class="btn btn-small modal" data-toggle="modal" data-target="#modal-<?php echo $name; ?>">
+	<span class="<?php echo $class; ?>" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/separator.php b/core/layouts/joomla/toolbar/separator.php
new file mode 100644
index 00000000..8d99a63e
--- /dev/null
+++ b/core/layouts/joomla/toolbar/separator.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
diff --git a/core/layouts/joomla/toolbar/slider.php b/core/layouts/joomla/toolbar/slider.php
new file mode 100644
index 00000000..4189fbcb
--- /dev/null
+++ b/core/layouts/joomla/toolbar/slider.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$doTask  = $displayData['doTask'];
+$class   = $displayData['class'];
+$text    = $displayData['text'];
+$name    = $displayData['name'];
+$onClose = $displayData['onClose'];
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small" data-toggle="collapse" data-target="#collapse-<?php echo $name; ?>"<?php echo $onClose; ?>>
+	<span class="icon-cog" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/standard.php b/core/layouts/joomla/toolbar/standard.php
new file mode 100644
index 00000000..3a267940
--- /dev/null
+++ b/core/layouts/joomla/toolbar/standard.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.core');
+
+$doTask   = $displayData['doTask'];
+$class    = $displayData['class'];
+$text     = $displayData['text'];
+$btnClass = $displayData['btnClass'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" class="<?php echo $btnClass; ?>">
+	<span class="<?php echo trim($class); ?>" aria-hidden="true"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/core/layouts/joomla/toolbar/title.php b/core/layouts/joomla/toolbar/title.php
new file mode 100644
index 00000000..283934c3
--- /dev/null
+++ b/core/layouts/joomla/toolbar/title.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$icon = empty($displayData['icon']) ? 'generic' : preg_replace('#\.[^ .]*$#', '', $displayData['icon']);
+?>
+<h1 class="page-title">
+	<span class="icon-<?php echo $icon; ?>" aria-hidden="true"></span>
+	<?php echo $displayData['title']; ?>
+</h1>
diff --git a/core/layouts/joomla/toolbar/versions.php b/core/layouts/joomla/toolbar/versions.php
new file mode 100644
index 00000000..4590cd81
--- /dev/null
+++ b/core/layouts/joomla/toolbar/versions.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JHtml::_('behavior.framework');
+
+?>
+<a rel="{handler: 'iframe', size: {x: <?php echo $displayData['height']; ?>, y: <?php echo $displayData['width']; ?>}}"
+	href="index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id=<?php echo (int) $displayData['itemId']; ?>&amp;type_id=<?php echo $displayData['typeId']; ?>&amp;type_alias=<?php echo $displayData['typeAlias']; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"
+	title="<?php echo $displayData['title']; ?>" class="btn btn-small modal_jform_contenthistory">
+	<span class="icon-archive" aria-hidden="true"></span> <?php echo $displayData['title']; ?>
+</a>
diff --git a/core/layouts/libraries/cms/html/bootstrap/addtab.php b/core/layouts/libraries/cms/html/bootstrap/addtab.php
new file mode 100644
index 00000000..a7c5cd3e
--- /dev/null
+++ b/core/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$id = empty($displayData['id']) ? '' : $displayData['id'];
+$active = empty($displayData['active']) ? '' : $displayData['active'];
+
+?>
+
+<div id="<?php echo $id; ?>" class="tab-pane<?php echo $active; ?>">
diff --git a/core/layouts/libraries/cms/html/bootstrap/addtabscript.php b/core/layouts/libraries/cms/html/bootstrap/addtabscript.php
new file mode 100644
index 00000000..4166d3a3
--- /dev/null
+++ b/core/layouts/libraries/cms/html/bootstrap/addtabscript.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+$id = empty($displayData['id']) ? '' : $displayData['id'];
+$active = empty($displayData['active']) ? '' : $displayData['active'];
+$title = empty($displayData['title']) ? '' : $displayData['title'];
+
+$li = '<li class="' . $active . '"><a href="#' . $id . '" data-toggle="tab">' . $title . '</a></li>';
+
+echo 'jQuery(function($){ $(', json_encode('#' . $selector . 'Tabs'), ').append($(', json_encode($li), ')); });';
diff --git a/core/layouts/libraries/cms/html/bootstrap/endtab.php b/core/layouts/libraries/cms/html/bootstrap/endtab.php
new file mode 100644
index 00000000..6e0d076a
--- /dev/null
+++ b/core/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/core/layouts/libraries/cms/html/bootstrap/endtabset.php b/core/layouts/libraries/cms/html/bootstrap/endtabset.php
new file mode 100644
index 00000000..6e0d076a
--- /dev/null
+++ b/core/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/core/layouts/libraries/cms/html/bootstrap/starttabset.php b/core/layouts/libraries/cms/html/bootstrap/starttabset.php
new file mode 100644
index 00000000..1a36ce20
--- /dev/null
+++ b/core/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+
+?>
+
+<ul class="nav nav-tabs" id="<?php echo $selector; ?>Tabs"></ul>
+<div class="tab-content" id="<?php echo $selector; ?>Content">
\ No newline at end of file
diff --git a/core/layouts/libraries/cms/html/bootstrap/starttabsetscript.php b/core/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
new file mode 100644
index 00000000..109632f9
--- /dev/null
+++ b/core/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+
+echo
+	'jQuery(function($){ ',
+		'$(', json_encode('#' . $selector . ' a'), ')',
+			'.click(function (e) {',
+				'e.preventDefault();',
+				'$(this).tab("show");',
+			'});',
+	'});';
diff --git a/core/layouts/plugins/editors/tinymce/field/tinymcebuilder.php b/core/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
new file mode 100644
index 00000000..25b76995
--- /dev/null
+++ b/core/layouts/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string  $autocomplete   Autocomplete attribute for the field.
+ * @var   boolean $autofocus      Is autofocus enabled?
+ * @var   string  $class          Classes for the input.
+ * @var   string  $description    Description of the field.
+ * @var   boolean $disabled       Is this field disabled?
+ * @var   string  $group          Group the field belongs to. <fields> section in form XML.
+ * @var   boolean $hidden         Is this field hidden in the form?
+ * @var   string  $hint           Placeholder for the field.
+ * @var   string  $id             DOM id of the field.
+ * @var   string  $label          Label of the field.
+ * @var   string  $labelclass     Classes to apply to the label.
+ * @var   boolean $multiple       Does this field support multiple values?
+ * @var   string  $name           Name of the input field.
+ * @var   string  $onchange       Onchange attribute for the field.
+ * @var   string  $onclick        Onclick attribute for the field.
+ * @var   string  $pattern        Pattern (Reg Ex) of value of the form field.
+ * @var   boolean $readonly       Is this field read only?
+ * @var   boolean $repeat         Allows extensions to duplicate elements.
+ * @var   boolean $required       Is this field required?
+ * @var   integer $size           Size attribute of the input.
+ * @var   boolean $spellcheck     Spellcheck state for the form field.
+ * @var   string  $validate       Validation rules to apply.
+ * @var   array   $value          Value of the field.
+  *
+ * @var   array   $menus           List of the menu items
+ * @var   array   $menubarSource   Menu items for builder
+ * @var   array   $buttons         List of the buttons
+ * @var   array   $buttonsSource   Buttons by group, for the builder
+ * @var   array   $toolbarPreset   Toolbar presset (default values)
+ * @var   int     $setsAmount      Amount of sets
+ * @var   array   $setsNames       List of Sets names
+ * @var   JForm[] $setsForms       Form with extra options for an each set
+ * @var   string   $languageFile   TinyMCE language file to translate the buttons
+ *
+ * @var   JLayoutFile  $this       Context
+ */
+
+JHtml::_('behavior.core');
+JHtml::_('stylesheet', 'media/editors/tinymce/skins/lightgray/skin.min.css', array('version' => 'auto', 'relative' => false));
+JHtml::_('jquery.ui', array('core', 'sortable'));
+JHtml::_('script', 'editors/tinymce/tinymce-builder.js', array('version' => 'auto', 'relative' => true));
+
+if ($languageFile)
+{
+	JHtml::_('script', $languageFile, array('version' => 'auto', 'relative' => false));
+}
+
+
+$doc = JFactory::getDocument();
+$doc->addScriptOptions('plg_editors_tinymce_builder', array(
+		'menus'         => $menus,
+		'buttons'       => $buttons,
+		'toolbarPreset' => $toolbarPreset,
+		'formControl'   => $name . '[toolbars]',
+	)
+);
+$doc->addStyleDeclaration('
+    #joomla-tinymce-builder{
+		margin-left: -180px;
+	}
+	.mce-menubar,
+	.mce-panel {
+		min-height: 18px;
+		border-bottom: 1px solid rgba(217,217,217,0.52);
+		white-space: normal;
+	}
+	.mce-tinymce {
+		margin-bottom: 20px;
+	}
+	.mce-panel .drop-area-highlight{
+		background-color: #d0d0d0;
+	}
+	.mce-panel .mce-btn.ui-state-highlight{
+		height: 28px;
+		width: 40px;
+		background-color: #409740;
+		border: 1px solid #f0f0f0;
+	}
+	.timymce-builder-toolbar .mce-btn.ui-state-highlight{
+		height: 22px;
+		width: 28px;
+	}
+');
+
+?>
+<div id="joomla-tinymce-builder">
+
+	<p><?php echo JText::_('PLG_TINY_SET_SOURCE_PANEL_DESCRIPTION'); ?></p>
+
+	<div class="mce-tinymce mce-container mce-panel">
+		<div class="mce-container-body mce-stack-layout">
+
+			<div class="mce-container mce-menubar mce-toolbar mce-stack-layout-item">
+				<div class="mce-container-body mce-flow-layout timymce-builder-menu source" data-group="menu"
+					data-value="<?php echo $this->escape(json_encode($menubarSource)); ?>">
+				</div>
+			</div>
+
+			<div class="mce-toolbar-grp mce-container mce-panel mce-stack-layout-item">
+				<div class="mce-container-body mce-flow-layout timymce-builder-toolbar source" data-group="toolbar"
+					data-value="<?php echo $this->escape(json_encode($buttonsSource)); ?>">
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<hr />
+	<p><?php echo JText::_('PLG_TINY_SET_TARGET_PANEL_DESCRIPTION'); ?></p>
+
+	<!-- Render tabs for each set -->
+	<ul class="nav nav-tabs" id="set-tabs">
+		<?php foreach ( $setsNames as $num => $title ) : ?>
+		<li class="<?php echo $num === $setsAmount - 1 ? 'active' : ''; ?>">
+			<a href="#set-<?php echo $num; ?>"><?php echo $title; ?></a>
+		</li>
+		<?php endforeach; ?>
+	</ul>
+
+	<!-- Render tab content for each set -->
+	<div class="tab-content">
+		<?php
+		$presetButtonClases = array(
+			'simple'   => 'btn-success',
+			'medium'   => 'btn-info',
+			'advanced' => 'btn-warning',
+		);
+		foreach ( $setsNames as $num => $title ) :
+
+			// Check whether the values exists, and if empty then use from preset
+			if (empty($value['toolbars'][$num]['menu'])
+				&& empty($value['toolbars'][$num]['toolbar1'])
+				&& empty($value['toolbars'][$num]['toolbar2']))
+			{
+				// Take the preset for default value
+				switch ($num) {
+					case 0:
+						$preset = $toolbarPreset['advanced'];
+						break;
+					case 1:
+						$preset = $toolbarPreset['medium'];
+						break;
+					default:
+						$preset = $toolbarPreset['simple'];
+				}
+
+				$value['toolbars'][$num] = $preset;
+			}
+
+			// Take existing values
+			$valMenu = empty($value['toolbars'][$num]['menu'])     ? array() : $value['toolbars'][$num]['menu'];
+			$valBar1 = empty($value['toolbars'][$num]['toolbar1']) ? array() : $value['toolbars'][$num]['toolbar1'];
+			$valBar2 = empty($value['toolbars'][$num]['toolbar2']) ? array() : $value['toolbars'][$num]['toolbar2'];
+		?>
+			<div class="tab-pane <?php echo $num === $setsAmount - 1 ? 'active' : ''; ?>" id="set-<?php echo $num; ?>">
+				<div class="btn-toolbar clearfix">
+					<div class="btn-group pull-right">
+
+					<?php foreach(array_keys($toolbarPreset) as $presetName) :
+						$btnClass = empty($presetButtonClases[$presetName]) ? 'btn-primary' : $presetButtonClases[$presetName];
+						?>
+						<button type="button" class="btn btn-mini <?php echo $btnClass; ?> button-action"
+						    data-action="setPreset" data-preset="<?php echo $presetName; ?>" data-set="<?php echo $num; ?>">
+							<?php echo JText::_('PLG_TINY_SET_PRESET_BUTTON_' . $presetName); ?>
+						</button>
+					<?php endforeach; ?>
+
+						<button type="button" class="btn btn-mini btn-danger button-action"
+						     data-action="clearPane" data-set="<?php echo $num; ?>">
+							<?php echo JText::_('JCLEAR'); ?></button>
+					</div>
+				</div>
+
+				<div class="mce-tinymce mce-container mce-panel">
+					<div class="mce-container-body mce-stack-layout">
+						<div class="mce-container mce-menubar mce-toolbar timymce-builder-menu target"
+							data-group="menu" data-set="<?php echo $num; ?>"
+							data-value="<?php echo $this->escape(json_encode($valMenu)); ?>">
+						</div>
+						<div class="mce-toolbar-grp mce-container mce-panel timymce-builder-toolbar target"
+						    data-group="toolbar1" data-set="<?php echo $num; ?>"
+						    data-value="<?php echo $this->escape(json_encode($valBar1)); ?>">
+						</div>
+						<div class="mce-toolbar-grp mce-container mce-panel timymce-builder-toolbar target"
+						    data-group="toolbar2" data-set="<?php echo $num; ?>"
+						    data-value="<?php echo $this->escape(json_encode($valBar2)); ?>">
+						</div>
+					</div>
+				</div>
+
+				<!-- Render the form for extra options -->
+				<?php echo $this->sublayout('setoptions', array('form' => $setsForms[$num])); ?>
+			</div>
+		<?php endforeach; ?>
+	</div>
+</div>
diff --git a/core/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php b/core/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
new file mode 100644
index 00000000..e3d28115
--- /dev/null
+++ b/core/layouts/plugins/editors/tinymce/field/tinymcebuilder/setoptions.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   JForm        $form    Form with extra options for the set
+ * @var   JLayoutFile  $this    Context
+ */
+
+?>
+<div class="setoptions-form-wrapper">
+<?php foreach ($form->getGroup(null) as $field) : ?>
+	<?php echo $field->renderField(); ?>
+<?php endforeach; ?>
+</div>
diff --git a/core/layouts/plugins/user/profile/fields/dob.php b/core/layouts/plugins/user/profile/fields/dob.php
new file mode 100644
index 00000000..0c8eb147
--- /dev/null
+++ b/core/layouts/plugins/user/profile/fields/dob.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * $text  string  infotext to be displayed
+ */
+extract($displayData);
+
+// Closing the opening .control-group and .control-label div so we can add our info text on own line ?>
+</div></div>
+<div class="controls"><?php echo $text; ?></div>
+<?php // Creating new .control-group and .control-label for the actual field ?>
+<div class="control-group"><div class="control-label">
diff --git a/core/libraries/classmap.php b/core/libraries/classmap.php
new file mode 100644
index 00000000..a21e22ef
--- /dev/null
+++ b/core/libraries/classmap.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * @package    Joomla.Libraries
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access.
+defined('_JEXEC') or die;
+
+JLoader::registerAlias('JRegistry',                         '\\Joomla\\Registry\\Registry', '5.0');
+JLoader::registerAlias('JRegistryFormat',                   '\\Joomla\\Registry\\AbstractRegistryFormat', '4.0');
+JLoader::registerAlias('JRegistryFormatIni',                '\\Joomla\\Registry\\Format\\Ini', '5.0');
+JLoader::registerAlias('JRegistryFormatJson',               '\\Joomla\\Registry\\Format\\Json', '5.0');
+JLoader::registerAlias('JRegistryFormatPhp',                '\\Joomla\\Registry\\Format\\Php', '5.0');
+JLoader::registerAlias('JRegistryFormatXml',                '\\Joomla\\Registry\\Format\\Xml', '5.0');
+JLoader::registerAlias('JStringInflector',                  '\\Joomla\\String\\Inflector', '5.0');
+JLoader::registerAlias('JStringNormalise',                  '\\Joomla\\String\\Normalise', '5.0');
+JLoader::registerAlias('JData',                             '\\Joomla\\Data\\DataObject', '5.0');
+JLoader::registerAlias('JDataSet',                          '\\Joomla\\Data\\DataSet', '5.0');
+JLoader::registerAlias('JDataDumpable',                     '\\Joomla\\Data\\DumpableInterface', '5.0');
+
+JLoader::registerAlias('JApplicationAdministrator',         '\\Joomla\\CMS\\Application\\AdministratorApplication', '5.0');
+JLoader::registerAlias('JApplicationHelper',                '\\Joomla\\CMS\\Application\\ApplicationHelper', '5.0');
+JLoader::registerAlias('JApplicationBase',                  '\\Joomla\\CMS\\Application\\BaseApplication', '5.0');
+JLoader::registerAlias('JApplicationCli',                   '\\Joomla\\CMS\\Application\\CliApplication', '5.0');
+JLoader::registerAlias('JApplicationCms',                   '\\Joomla\\CMS\\Application\\CMSApplication', '5.0');
+JLoader::registerAlias('JApplicationDaemon',                '\\Joomla\\CMS\\Application\\DaemonApplication', '5.0');
+JLoader::registerAlias('JApplicationSite',                  '\\Joomla\\CMS\\Application\\SiteApplication', '5.0');
+JLoader::registerAlias('JApplicationWeb',                   '\\Joomla\\CMS\\Application\\WebApplication', '5.0');
+JLoader::registerAlias('JApplicationWebClient',             '\\Joomla\\Application\\Web\\WebClient', '5.0');
+JLoader::registerAlias('JDaemon',                           '\\Joomla\\CMS\\Application\\DaemonApplication', '5.0');
+JLoader::registerAlias('JCli',                              '\\Joomla\\CMS\\Application\\CliApplication', '5.0');
+JLoader::registerAlias('JWeb',                              '\\Joomla\\CMS\\Application\\WebApplication', '4.0');
+JLoader::registerAlias('JWebClient',                        '\\Joomla\\Application\\Web\\WebClient', '4.0');
+
+JLoader::registerAlias('JModelAdmin',                       '\\Joomla\\CMS\\MVC\\Model\\AdminModel', '5.0');
+JLoader::registerAlias('JModelForm',                        '\\Joomla\\CMS\\MVC\\Model\\FormModel', '5.0');
+JLoader::registerAlias('JModelItem',                        '\\Joomla\\CMS\\MVC\\Model\\ItemModel', '5.0');
+JLoader::registerAlias('JModelList',                        '\\Joomla\\CMS\\MVC\\Model\\ListModel', '5.0');
+JLoader::registerAlias('JModelLegacy',                      '\\Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel', '5.0');
+JLoader::registerAlias('JViewCategories',                   '\\Joomla\\CMS\\MVC\\View\\CategoriesView', '5.0');
+JLoader::registerAlias('JViewCategory',                     '\\Joomla\\CMS\\MVC\\View\\CategoryView', '5.0');
+JLoader::registerAlias('JViewCategoryfeed',                 '\\Joomla\\CMS\\MVC\\View\\CategoryFeedView', '5.0');
+JLoader::registerAlias('JViewLegacy',                       '\\Joomla\\CMS\\MVC\\View\\HtmlView', '5.0');
+JLoader::registerAlias('JControllerAdmin',                  '\\Joomla\\CMS\\MVC\\Controller\\AdminController', '5.0');
+JLoader::registerAlias('JControllerLegacy',                 '\\Joomla\\CMS\\MVC\\Controller\\BaseController', '5.0');
+JLoader::registerAlias('JControllerForm',                   '\\Joomla\\CMS\\MVC\\Controller\\FormController', '5.0');
+JLoader::registerAlias('JTableInterface',                   '\\Joomla\\CMS\\Table\\TableInterface', '5.0');
+JLoader::registerAlias('JTable',                            '\\Joomla\\CMS\\Table\\Table', '5.0');
+JLoader::registerAlias('JTableNested',                      '\\Joomla\\CMS\\Table\\Nested', '5.0');
+JLoader::registerAlias('JTableAsset',                       '\\Joomla\\CMS\\Table\\Asset', '5.0');
+JLoader::registerAlias('JTableExtension',                   '\\Joomla\\CMS\\Table\\Extension', '5.0');
+JLoader::registerAlias('JTableLanguage',                    '\\Joomla\\CMS\\Table\\Language', '5.0');
+JLoader::registerAlias('JTableUpdate',                      '\\Joomla\\CMS\\Table\\Update', '5.0');
+JLoader::registerAlias('JTableUpdatesite',                  '\\Joomla\\CMS\\Table\\UpdateSite', '5.0');
+JLoader::registerAlias('JTableUser',                        '\\Joomla\\CMS\\Table\\User', '5.0');
+JLoader::registerAlias('JTableUsergroup',                   '\\Joomla\\CMS\\Table\\Usergroup', '5.0');
+JLoader::registerAlias('JTableViewlevel',                   '\\Joomla\\CMS\\Table\\ViewLevel', '5.0');
+JLoader::registerAlias('JTableContenthistory',              '\\Joomla\\CMS\\Table\\ContentHistory', '5.0');
+JLoader::registerAlias('JTableContenttype',                 '\\Joomla\\CMS\\Table\\ContentType', '5.0');
+JLoader::registerAlias('JTableCorecontent',                 '\\Joomla\\CMS\\Table\\CoreContent', '5.0');
+JLoader::registerAlias('JTableUcm',                         '\\Joomla\\CMS\\Table\\Ucm', '5.0');
+JLoader::registerAlias('JTableCategory',                    '\\Joomla\\CMS\\Table\\Category', '5.0');
+JLoader::registerAlias('JTableContent',                     '\\Joomla\\CMS\\Table\\Content', '5.0');
+JLoader::registerAlias('JTableMenu',                        '\\Joomla\\CMS\\Table\\Menu', '5.0');
+JLoader::registerAlias('JTableMenuType',                    '\\Joomla\\CMS\\Table\\MenuType', '5.0');
+JLoader::registerAlias('JTableModule',                      '\\Joomla\\CMS\\Table\\Module', '5.0');
+JLoader::registerAlias('JTableObserver',                    '\\Joomla\\CMS\\Table\\Observer\\AbstractObserver', '5.0');
+JLoader::registerAlias('JTableObserverContenthistory',      '\\Joomla\\CMS\\Table\\Observer\\ContentHistory', '5.0');
+JLoader::registerAlias('JTableObserverTags',                '\\Joomla\\CMS\\Table\\Observer\\Tags', '5.0');
+
+JLoader::registerAlias('JAccess',                           '\\Joomla\\CMS\\Access\\Access', '5.0');
+JLoader::registerAlias('JAccessRule',                       '\\Joomla\\CMS\\Access\\Rule', '5.0');
+JLoader::registerAlias('JAccessRules',                      '\\Joomla\\CMS\\Access\\Rules', '5.0');
+JLoader::registerAlias('JAccessWrapperAccess',              '\\Joomla\\CMS\\Access\\Wrapper\\Access', '4.0');
+JLoader::registerAlias('JAccessExceptionNotallowed',        '\\Joomla\\CMS\\Access\\Exception\\NotAllowed', '5.0');
+JLoader::registerAlias('JRule',                             '\\Joomla\\CMS\\Access\\Rule', '5.0');
+JLoader::registerAlias('JRules',                            '\\Joomla\\CMS\\Access\\Rules', '5.0');
+
+JLoader::registerAlias('JHelp',                             '\\Joomla\\CMS\\Help\\Help', '5.0');
+JLoader::registerAlias('JCaptcha',                          '\\Joomla\\CMS\\Captcha\\Captcha', '5.0');
+
+JLoader::registerAlias('JLanguageAssociations',             '\\Joomla\\CMS\\Language\\Associations', '5.0');
+JLoader::registerAlias('JLanguage',                         '\\Joomla\\CMS\\Language\\Language', '5.0');
+JLoader::registerAlias('JLanguageHelper',                   '\\Joomla\\CMS\\Language\\LanguageHelper', '5.0');
+JLoader::registerAlias('JLanguageStemmer',                  '\\Joomla\\CMS\\Language\\LanguageStemmer', '5.0');
+JLoader::registerAlias('JLanguageMultilang',                '\\Joomla\\CMS\\Language\\Multilanguage', '5.0');
+JLoader::registerAlias('JText',                             '\\Joomla\\CMS\\Language\\Text', '5.0');
+JLoader::registerAlias('JLanguageTransliterate',            '\\Joomla\\CMS\\Language\\Transliterate', '5.0');
+JLoader::registerAlias('JLanguageStemmerPorteren',          '\\Joomla\\CMS\\Language\\Stemmer\\Porteren', '5.0');
+JLoader::registerAlias('JLanguageWrapperText',              '\\Joomla\\CMS\\Language\\Wrapper\\JTextWrapper', '4.0');
+JLoader::registerAlias('JLanguageWrapperHelper',            '\\Joomla\\CMS\\Language\\Wrapper\\LanguageHelperWrapper', '4.0');
+JLoader::registerAlias('JLanguageWrapperTransliterate',     '\\Joomla\\CMS\\Language\\Wrapper\\TransliterateWrapper', '4.0');
+
+JLoader::registerAlias('JComponentHelper',                  '\\Joomla\\CMS\\Component\\ComponentHelper', '5.0');
+JLoader::registerAlias('JComponentRecord',                  '\\Joomla\\CMS\\Component\\ComponentRecord', '5.0');
+JLoader::registerAlias('JComponentExceptionMissing',        '\\Joomla\\CMS\\Component\\Exception\\MissingComponentException', '5.0');
+JLoader::registerAlias('JComponentRouterBase',              '\\Joomla\\CMS\\Component\\Router\\RouterBase', '5.0');
+JLoader::registerAlias('JComponentRouterInterface',         '\\Joomla\\CMS\\Component\\Router\\RouterInterface', '5.0');
+JLoader::registerAlias('JComponentRouterLegacy',            '\\Joomla\\CMS\\Component\\Router\\RouterLegacy', '5.0');
+JLoader::registerAlias('JComponentRouterView',              '\\Joomla\\CMS\\Component\\Router\\RouterView', '5.0');
+JLoader::registerAlias('JComponentRouterViewconfiguration', '\\Joomla\\CMS\\Component\\Router\\RouterViewConfiguration', '5.0');
+JLoader::registerAlias('JComponentRouterRulesMenu',         '\\Joomla\\CMS\\Component\\Router\\Rules\\MenuRules', '5.0');
+JLoader::registerAlias('JComponentRouterRulesNomenu',       '\\Joomla\\CMS\\Component\\Router\\Rules\\NomenuRules', '5.0');
+JLoader::registerAlias('JComponentRouterRulesInterface',    '\\Joomla\\CMS\\Component\\Router\\Rules\\RulesInterface', '5.0');
+JLoader::registerAlias('JComponentRouterRulesStandard',     '\\Joomla\\CMS\\Component\\Router\\Rules\\StandardRules', '5.0');
+
+JLoader::registerAlias('JEditor',                           '\\Joomla\\CMS\\Editor\\Editor', '5.0');
+
+JLoader::registerAlias('JErrorPage',                        '\\Joomla\\CMS\\Exception\\ExceptionHandler', '5.0');
+
+JLoader::registerAlias('JAuthenticationHelper',             '\\Joomla\\CMS\\Helper\\AuthenticationHelper', '5.0');
+JLoader::registerAlias('JHelper',                           '\\Joomla\\CMS\\Helper\\CMSHelper', '5.0');
+JLoader::registerAlias('JHelperContent',                    '\\Joomla\\CMS\\Helper\\ContentHelper', '5.0');
+JLoader::registerAlias('JHelperContenthistory',             '\\Joomla\\CMS\\Helper\\ContentHistoryHelper', '5.0');
+JLoader::registerAlias('JLibraryHelper',                    '\\Joomla\\CMS\\Helper\\LibraryHelper', '5.0');
+JLoader::registerAlias('JHelperMedia',                      '\\Joomla\\CMS\\Helper\\MediaHelper', '5.0');
+JLoader::registerAlias('JModuleHelper',                     '\\Joomla\\CMS\\Helper\\ModuleHelper', '5.0');
+JLoader::registerAlias('JHelperRoute',                      '\\Joomla\\CMS\\Helper\\RouteHelper', '5.0');
+JLoader::registerAlias('JSearchHelper',                     '\\Joomla\\CMS\\Helper\\SearchHelper', '5.0');
+JLoader::registerAlias('JHelperTags',                       '\\Joomla\\CMS\\Helper\\TagsHelper', '5.0');
+JLoader::registerAlias('JHelperUsergroups',                 '\\Joomla\\CMS\\Helper\\UserGroupsHelper', '5.0');
+
+JLoader::registerAlias('JLayoutBase',                       '\\Joomla\\CMS\\Layout\\BaseLayout', '5.0');
+JLoader::registerAlias('JLayoutFile',                       '\\Joomla\\CMS\\Layout\\FileLayout', '5.0');
+JLoader::registerAlias('JLayoutHelper',                     '\\Joomla\\CMS\\Layout\\LayoutHelper', '5.0');
+JLoader::registerAlias('JLayout',                           '\\Joomla\\CMS\\Layout\\LayoutInterface', '5.0');
+
+JLoader::registerAlias('JResponseJson',                     '\\Joomla\\CMS\\Response\\JsonResponse', '5.0');
+
+JLoader::registerAlias('JPlugin',                           '\\Joomla\\CMS\\Plugin\\CMSPlugin', '5.0');
+JLoader::registerAlias('JPluginHelper',                     '\\Joomla\\CMS\\Plugin\\PluginHelper', '5.0');
+
+JLoader::registerAlias('JMenu',                             '\\Joomla\\CMS\\Menu\\AbstractMenu', '5.0');
+JLoader::registerAlias('JMenuAdministrator',                '\\Joomla\\CMS\\Menu\\AdministratorMenu', '5.0');
+JLoader::registerAlias('JMenuItem',                         '\\Joomla\\CMS\\Menu\\MenuItem', '5.0');
+JLoader::registerAlias('JMenuSite',                         '\\Joomla\\CMS\\Menu\\SiteMenu', '5.0');
+
+JLoader::registerAlias('JPagination',                       '\\Joomla\\CMS\\Pagination\\Pagination', '5.0');
+JLoader::registerAlias('JPaginationObject',                 '\\Joomla\\CMS\\Pagination\\PaginationObject', '5.0');
+
+JLoader::registerAlias('JPathway',                          '\\Joomla\\CMS\\Pathway\\Pathway', '5.0');
+JLoader::registerAlias('JPathwaySite',                      '\\Joomla\\CMS\\Pathway\\SitePathway', '5.0');
+
+JLoader::registerAlias('JSchemaChangeitem',                 '\\Joomla\\CMS\\Schema\\ChangeItem', '5.0');
+JLoader::registerAlias('JSchemaChangeset',                  '\\Joomla\\CMS\\Schema\\ChangeSet', '5.0');
+JLoader::registerAlias('JSchemaChangeitemMysql',            '\\Joomla\\CMS\\Schema\\ChangeItem\\MysqlChangeItem', '5.0');
+JLoader::registerAlias('JSchemaChangeitemPostgresql',       '\\Joomla\\CMS\\Schema\\ChangeItem\\PostgresqlChangeItem', '5.0');
+JLoader::registerAlias('JSchemaChangeitemSqlsrv',           '\\Joomla\\CMS\\Schema\\ChangeItem\\SqlsrvChangeItem', '5.0');
+
+JLoader::registerAlias('JUcm',                              '\\Joomla\\CMS\\UCM\\UCM', '5.0');
+JLoader::registerAlias('JUcmBase',                          '\\Joomla\\CMS\\UCM\\UCMBase', '5.0');
+JLoader::registerAlias('JUcmContent',                       '\\Joomla\\CMS\\UCM\\UCMContent', '5.0');
+JLoader::registerAlias('JUcmType',                          '\\Joomla\\CMS\\UCM\\UCMType', '5.0');
+
+JLoader::registerAlias('JToolbar',                          '\\Joomla\\CMS\\Toolbar\\Toolbar', '5.0');
+JLoader::registerAlias('JToolbarButton',                    '\\Joomla\\CMS\\Toolbar\\ToolbarButton', '5.0');
+JLoader::registerAlias('JToolbarButtonConfirm',             '\\Joomla\\CMS\\Toolbar\\Button\\ConfirmButton', '5.0');
+JLoader::registerAlias('JToolbarButtonCustom',              '\\Joomla\\CMS\\Toolbar\\Button\\CustomButton', '5.0');
+JLoader::registerAlias('JToolbarButtonHelp',                '\\Joomla\\CMS\\Toolbar\\Button\\HelpButton', '5.0');
+JLoader::registerAlias('JToolbarButtonLink',                '\\Joomla\\CMS\\Toolbar\\Button\\LinkButton', '5.0');
+JLoader::registerAlias('JToolbarButtonPopup',               '\\Joomla\\CMS\\Toolbar\\Button\\PopupButton', '5.0');
+JLoader::registerAlias('JToolbarButtonSeparator',           '\\Joomla\\CMS\\Toolbar\\Button\\SeparatorButton', '5.0');
+JLoader::registerAlias('JToolbarButtonSlider',              '\\Joomla\\CMS\\Toolbar\\Button\\SliderButton', '5.0');
+JLoader::registerAlias('JToolbarButtonStandard',            '\\Joomla\\CMS\\Toolbar\\Button\\StandardButton', '5.0');
+JLoader::registerAlias('JButton',                           '\\Joomla\\CMS\\Toolbar\\ToolbarButton', '5.0');
+
+JLoader::registerAlias('JVersion',                          '\\Joomla\\CMS\\Version', '5.0');
+
+JLoader::registerAlias('JAuthentication',                   '\\Joomla\\CMS\\Authentication\\Authentication', '5.0');
+JLoader::registerAlias('JAuthenticationResponse',           '\\Joomla\\CMS\\Authentication\\AuthenticationResponse', '5.0');
+
+JLoader::registerAlias('JBrowser',                          '\\Joomla\\CMS\\Environment\\Browser', '5.0');
+
+JLoader::registerAlias('JAssociationExtensionInterface',    '\\Joomla\\CMS\\Association\\AssociationExtensionInterface', '5.0');
+JLoader::registerAlias('JAssociationExtensionHelper',       '\\Joomla\\CMS\\Association\\AssociationExtensionHelper', '5.0');
+
+JLoader::registerAlias('JDocument',                         '\\Joomla\\CMS\\Document\\Document', '5.0');
+JLoader::registerAlias('JDocumentError',                    '\\Joomla\\CMS\\Document\\ErrorDocument', '5.0');
+JLoader::registerAlias('JDocumentFeed',                     '\\Joomla\\CMS\\Document\\FeedDocument', '5.0');
+JLoader::registerAlias('JDocumentHtml',                     '\\Joomla\\CMS\\Document\\HtmlDocument', '5.0');
+JLoader::registerAlias('JDocumentImage',                    '\\Joomla\\CMS\\Document\\ImageDocument', '5.0');
+JLoader::registerAlias('JDocumentJson',                     '\\Joomla\\CMS\\Document\\JsonDocument', '5.0');
+JLoader::registerAlias('JDocumentOpensearch',               '\\Joomla\\CMS\\Document\\OpensearchDocument', '5.0');
+JLoader::registerAlias('JDocumentRaw',                      '\\Joomla\\CMS\\Document\\RawDocument', '5.0');
+JLoader::registerAlias('JDocumentRenderer',                 '\\Joomla\\CMS\\Document\\DocumentRenderer', '5.0');
+JLoader::registerAlias('JDocumentXml',                      '\\Joomla\\CMS\\Document\\XmlDocument', '5.0');
+JLoader::registerAlias('JDocumentRendererFeedAtom',         '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererFeedRss',          '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlComponent',    '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlHead',         '\\Joomla\\CMS\\Document\\Renderer\\Html\\HeadRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlMessage',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlModule',       '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererHtmlModules',      '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '5.0');
+JLoader::registerAlias('JDocumentRendererAtom',             '\\Joomla\\CMS\\Document\\Renderer\\Feed\\AtomRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererRSS',              '\\Joomla\\CMS\\Document\\Renderer\\Feed\\RssRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererComponent',        '\\Joomla\\CMS\\Document\\Renderer\\Html\\ComponentRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererHead',             '\\Joomla\\CMS\\Document\\Renderer\\Html\\HeadRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererMessage',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\MessageRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererModule',           '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModuleRenderer', '4.0');
+JLoader::registerAlias('JDocumentRendererModules',          '\\Joomla\\CMS\\Document\\Renderer\\Html\\ModulesRenderer', '4.0');
+JLoader::registerAlias('JFeedEnclosure',                    '\\Joomla\\CMS\\Document\\Feed\\FeedEnclosure', '5.0');
+JLoader::registerAlias('JFeedImage',                        '\\Joomla\\CMS\\Document\\Feed\\FeedImage', '5.0');
+JLoader::registerAlias('JFeedItem',                         '\\Joomla\\CMS\\Document\\Feed\\FeedItem', '5.0');
+JLoader::registerAlias('JOpenSearchImage',                  '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchImage', '5.0');
+JLoader::registerAlias('JOpenSearchUrl',                    '\\Joomla\\CMS\\Document\\Opensearch\\OpensearchUrl', '5.0');
+
+JLoader::registerAlias('JFilterInput',                      '\\Joomla\\CMS\\Filter\\InputFilter', '5.0');
+JLoader::registerAlias('JFilterOutput',                     '\\Joomla\\CMS\\Filter\\OutputFilter', '5.0');
+JLoader::registerAlias('JFilterWrapperOutput',              '\\Joomla\\CMS\\Filter\\Wrapper\\OutputFilterWrapper', '4.0');
+
+JLoader::registerAlias('JHttp',                             '\\Joomla\\CMS\\Http\\Http', '5.0');
+JLoader::registerAlias('JHttpFactory',                      '\\Joomla\\CMS\\Http\\HttpFactory', '5.0');
+JLoader::registerAlias('JHttpResponse',                     '\\Joomla\\CMS\\Http\\Response', '5.0');
+JLoader::registerAlias('JHttpTransport',                    '\\Joomla\\CMS\\Http\\TransportInterface', '5.0');
+JLoader::registerAlias('JHttpTransportCurl',                '\\Joomla\\CMS\\Http\\Transport\\CurlTransport', '5.0');
+JLoader::registerAlias('JHttpTransportSocket',              '\\Joomla\\CMS\\Http\\Transport\\SocketTransport', '5.0');
+JLoader::registerAlias('JHttpTransportStream',              '\\Joomla\\CMS\\Http\\Transport\\StreamTransport', '5.0');
+JLoader::registerAlias('JHttpWrapperFactory',               '\\Joomla\\CMS\\Http\\Wrapper\\FactoryWrapper', '4.0');
+
+JLoader::registerAlias('JInstaller',                        '\\Joomla\\CMS\\Installer\\Installer', '5.0');
+JLoader::registerAlias('JInstallerAdapter',                 '\\Joomla\\CMS\\Installer\\InstallerAdapter', '5.0');
+JLoader::registerAlias('JInstallerExtension',               '\\Joomla\\CMS\\Installer\\InstallerExtension', '5.0');
+JLoader::registerAlias('JExtension',                        '\\Joomla\\CMS\\Installer\\InstallerExtension', '5.0');
+JLoader::registerAlias('JInstallerHelper',                  '\\Joomla\\CMS\\Installer\\InstallerHelper', '5.0');
+JLoader::registerAlias('JInstallerScript',                  '\\Joomla\\CMS\\Installer\\InstallerScript', '5.0');
+JLoader::registerAlias('JInstallerManifest',                '\\Joomla\\CMS\\Installer\\Manifest', '5.0');
+JLoader::registerAlias('JInstallerAdapterComponent',        '\\Joomla\\CMS\\Installer\\Adapter\\ComponentAdapter', '5.0');
+JLoader::registerAlias('JInstallerComponent',               '\\Joomla\\CMS\\Installer\\Adapter\\ComponentAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterFile',             '\\Joomla\\CMS\\Installer\\Adapter\\FileAdapter', '5.0');
+JLoader::registerAlias('JInstallerFile',                    '\\Joomla\\CMS\\Installer\\Adapter\\FileAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterLanguage',         '\\Joomla\\CMS\\Installer\\Adapter\\LanguageAdapter', '5.0');
+JLoader::registerAlias('JInstallerLanguage',                '\\Joomla\\CMS\\Installer\\Adapter\\LanguageAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterLibrary',          '\\Joomla\\CMS\\Installer\\Adapter\\LibraryAdapter', '5.0');
+JLoader::registerAlias('JInstallerLibrary',                 '\\Joomla\\CMS\\Installer\\Adapter\\LibraryAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterModule',           '\\Joomla\\CMS\\Installer\\Adapter\\ModuleAdapter', '5.0');
+JLoader::registerAlias('JInstallerModule',                  '\\Joomla\\CMS\\Installer\\Adapter\\ModuleAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterPackage',          '\\Joomla\\CMS\\Installer\\Adapter\\PackageAdapter', '5.0');
+JLoader::registerAlias('JInstallerPackage',                 '\\Joomla\\CMS\\Installer\\Adapter\\PackageAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterPlugin',           '\\Joomla\\CMS\\Installer\\Adapter\\PluginAdapter', '5.0');
+JLoader::registerAlias('JInstallerPlugin',                  '\\Joomla\\CMS\\Installer\\Adapter\\PluginAdapter', '5.0');
+JLoader::registerAlias('JInstallerAdapterTemplate',         '\\Joomla\\CMS\\Installer\\Adapter\\TemplateAdapter', '5.0');
+JLoader::registerAlias('JInstallerTemplate',                '\\Joomla\\CMS\\Installer\\Adapter\\TemplateAdapter', '5.0');
+JLoader::registerAlias('JInstallerManifestLibrary',         '\\Joomla\\CMS\\Installer\\Manifest\\LibraryManifest', '5.0');
+JLoader::registerAlias('JInstallerManifestPackage',         '\\Joomla\\CMS\\Installer\\Manifest\\PackageManifest', '5.0');
+
+JLoader::registerAlias('JRouterAdministrator',              '\\Joomla\\CMS\\Router\\AdministratorRouter', '5.0');
+JLoader::registerAlias('JRoute',                            '\\Joomla\\CMS\\Router\\Route', '5.0');
+JLoader::registerAlias('JRouter',                           '\\Joomla\\CMS\\Router\\Router', '5.0');
+JLoader::registerAlias('JRouterSite',                       '\\Joomla\\CMS\\Router\\SiteRouter', '5.0');
+
+JLoader::registerAlias('JCategories',                       '\\Joomla\\CMS\\Categories\\Categories', '5.0');
+JLoader::registerAlias('JCategoryNode',                     '\\Joomla\\CMS\\Categories\\CategoryNode', '5.0');
+
+JLoader::registerAlias('JDate',                             '\\Joomla\\CMS\\Date\\Date', '5.0');
+
+JLoader::registerAlias('JLog',                              '\\Joomla\\CMS\\Log\\Log', '5.0');
+JLoader::registerAlias('JLogEntry',                         '\\Joomla\\CMS\\Log\\LogEntry', '5.0');
+JLoader::registerAlias('JLogLogger',                        '\\Joomla\\CMS\\Log\\Logger', '5.0');
+JLoader::registerAlias('JLogger',                           '\\Joomla\\CMS\\Log\\Logger', '5.0');
+JLoader::registerAlias('JLogLoggerCallback',                '\\Joomla\\CMS\\Log\\Logger\\CallbackLogger', '5.0');
+JLoader::registerAlias('JLogLoggerDatabase',                '\\Joomla\\CMS\\Log\\Logger\\DatabaseLogger', '5.0');
+JLoader::registerAlias('JLogLoggerEcho',                    '\\Joomla\\CMS\\Log\\Logger\\EchoLogger', '5.0');
+JLoader::registerAlias('JLogLoggerFormattedtext',           '\\Joomla\\CMS\\Log\\Logger\\FormattedtextLogger', '5.0');
+JLoader::registerAlias('JLogLoggerMessagequeue',            '\\Joomla\\CMS\\Log\\Logger\\MessagequeueLogger', '5.0');
+JLoader::registerAlias('JLogLoggerSyslog',                  '\\Joomla\\CMS\\Log\\Logger\\SyslogLogger', '5.0');
+JLoader::registerAlias('JLogLoggerW3c',                     '\\Joomla\\CMS\\Log\\Logger\\W3cLogger', '5.0');
+
+JLoader::registerAlias('JProfiler',                         '\\Joomla\\CMS\\Profiler\\Profiler', '5.0');
+
+JLoader::registerAlias('JUri',                              '\\Joomla\\CMS\\Uri\\Uri', '5.0');
+
+JLoader::registerAlias('JCache',                            '\\Joomla\\CMS\\Cache\\Cache', '5.0');
+JLoader::registerAlias('JCacheController',                  '\\Joomla\\CMS\\Cache\\CacheController', '5.0');
+JLoader::registerAlias('JCacheStorage',                     '\\Joomla\\CMS\\Cache\\CacheStorage', '5.0');
+JLoader::registerAlias('JCacheControllerCallback',          '\\Joomla\\CMS\\Cache\\Controller\\CallbackController', '5.0');
+JLoader::registerAlias('JCacheControllerOutput',            '\\Joomla\\CMS\\Cache\\Controller\\OutputController', '5.0');
+JLoader::registerAlias('JCacheControllerPage',              '\\Joomla\\CMS\\Cache\\Controller\\PageController', '5.0');
+JLoader::registerAlias('JCacheControllerView',              '\\Joomla\\CMS\\Cache\\Controller\\ViewController', '5.0');
+JLoader::registerAlias('JCacheStorageApc',                  '\\Joomla\\CMS\\Cache\\Storage\\ApcStorage', '5.0');
+JLoader::registerAlias('JCacheStorageApcu',                 '\\Joomla\\CMS\\Cache\\Storage\\ApcuStorage', '5.0');
+JLoader::registerAlias('JCacheStorageHelper',               '\\Joomla\\CMS\\Cache\\Storage\\CacheStorageHelper', '5.0');
+JLoader::registerAlias('JCacheStorageCachelite',            '\\Joomla\\CMS\\Cache\\Storage\\CacheliteStorage', '4.0');
+JLoader::registerAlias('JCacheStorageFile',                 '\\Joomla\\CMS\\Cache\\Storage\\FileStorage', '5.0');
+JLoader::registerAlias('JCacheStorageMemcached',            '\\Joomla\\CMS\\Cache\\Storage\\MemcachedStorage', '5.0');
+JLoader::registerAlias('JCacheStorageMemcache',             '\\Joomla\\CMS\\Cache\\Storage\\MemcacheStorage', '5.0');
+JLoader::registerAlias('JCacheStorageRedis',                '\\Joomla\\CMS\\Cache\\Storage\\RedisStorage', '5.0');
+JLoader::registerAlias('JCacheStorageWincache',             '\\Joomla\\CMS\\Cache\\Storage\\WincacheStorage', '5.0');
+JLoader::registerAlias('JCacheStorageXcache',               '\\Joomla\\CMS\\Cache\\Storage\\XcacheStorage', '5.0');
+JLoader::registerAlias('JCacheException',                   '\\Joomla\\CMS\\Cache\\Exception\\CacheExceptionInterface', '5.0');
+JLoader::registerAlias('JCacheExceptionConnecting',         '\\Joomla\\CMS\\Cache\\Exception\\CacheConnectingException', '5.0');
+JLoader::registerAlias('JCacheExceptionUnsupported',        '\\Joomla\\CMS\\Cache\\Exception\\UnsupportedCacheException', '5.0');
+
+JLoader::registerAlias('JSession',                          '\\Joomla\\CMS\\Session\\Session', '5.0');
+JLoader::registerAlias('JSessionExceptionUnsupported',      '\\Joomla\\CMS\\Session\\Exception\\UnsupportedStorageException', '5.0');
+
+JLoader::registerAlias('JUser',                             '\\Joomla\\CMS\\User\\User', '5.0');
+JLoader::registerAlias('JUserHelper',                       '\\Joomla\\CMS\\User\\UserHelper', '5.0');
+JLoader::registerAlias('JUserWrapperHelper',                '\\Joomla\\CMS\\User\\UserWrapper', '4.0');
+
+JLoader::registerAlias('JForm',                             '\\Joomla\\CMS\\Form\\Form', '5.0');
+JLoader::registerAlias('JFormField',                        '\\Joomla\\CMS\\Form\\FormField', '5.0');
+JLoader::registerAlias('JFormHelper',                       '\\Joomla\\CMS\\Form\\FormHelper', '5.0');
+JLoader::registerAlias('JFormRule',                         '\\Joomla\\CMS\\Form\\FormRule', '5.0');
+JLoader::registerAlias('JFormWrapper',                      '\\Joomla\\CMS\\Form\\FormWrapper', '4.0');
+JLoader::registerAlias('JFormFieldAuthor',                  '\\Joomla\\CMS\\Form\\Field\\AuthorField', '5.0');
+JLoader::registerAlias('JFormFieldCaptcha',                 '\\Joomla\\CMS\\Form\\Field\\CaptchaField', '5.0');
+JLoader::registerAlias('JFormFieldChromeStyle',             '\\Joomla\\CMS\\Form\\Field\\ChromestyleField', '5.0');
+JLoader::registerAlias('JFormFieldContenthistory',          '\\Joomla\\CMS\\Form\\Field\\ContenthistoryField', '5.0');
+JLoader::registerAlias('JFormFieldContentlanguage',         '\\Joomla\\CMS\\Form\\Field\\ContentlanguageField', '5.0');
+JLoader::registerAlias('JFormFieldContenttype',             '\\Joomla\\CMS\\Form\\Field\\ContenttypeField', '5.0');
+JLoader::registerAlias('JFormFieldEditor',                  '\\Joomla\\CMS\\Form\\Field\\EditorField', '5.0');
+JLoader::registerAlias('JFormFieldFrontend_Language',       '\\Joomla\\CMS\\Form\\Field\\FrontendlanguageField', '5.0');
+JLoader::registerAlias('JFormFieldHeadertag',               '\\Joomla\\CMS\\Form\\Field\\HeadertagField', '5.0');
+JLoader::registerAlias('JFormFieldHelpsite',                '\\Joomla\\CMS\\Form\\Field\\HelpsiteField', '5.0');
+JLoader::registerAlias('JFormFieldLastvisitDateRange',      '\\Joomla\\CMS\\Form\\Field\\LastvisitdaterangeField', '5.0');
+JLoader::registerAlias('JFormFieldLimitbox',                '\\Joomla\\CMS\\Form\\Field\\LimitboxField', '5.0');
+JLoader::registerAlias('JFormFieldMedia',                   '\\Joomla\\CMS\\Form\\Field\\MediaField', '5.0');
+JLoader::registerAlias('JFormFieldMenu',                    '\\Joomla\\CMS\\Form\\Field\\MenuField', '5.0');
+JLoader::registerAlias('JFormFieldMenuitem',                '\\Joomla\\CMS\\Form\\Field\\MenuitemField', '5.0');
+JLoader::registerAlias('JFormFieldModuleOrder',             '\\Joomla\\CMS\\Form\\Field\\ModuleorderField', '5.0');
+JLoader::registerAlias('JFormFieldModulePosition',          '\\Joomla\\CMS\\Form\\Field\\ModulepositionField', '5.0');
+JLoader::registerAlias('JFormFieldModuletag',               '\\Joomla\\CMS\\Form\\Field\\ModuletagField', '5.0');
+JLoader::registerAlias('JFormFieldOrdering',                '\\Joomla\\CMS\\Form\\Field\\OrderingField', '5.0');
+JLoader::registerAlias('JFormFieldPlugin_Status',           '\\Joomla\\CMS\\Form\\Field\\PluginstatusField', '5.0');
+JLoader::registerAlias('JFormFieldRedirect_Status',         '\\Joomla\\CMS\\Form\\Field\\RedirectStatusField', '5.0');
+JLoader::registerAlias('JFormFieldRegistrationDateRange',   '\\Joomla\\CMS\\Form\\Field\\RegistrationdaterangeField', '5.0');
+JLoader::registerAlias('JFormFieldStatus',                  '\\Joomla\\CMS\\Form\\Field\\StatusField', '5.0');
+JLoader::registerAlias('JFormFieldTag',                     '\\Joomla\\CMS\\Form\\Field\\TagField', '5.0');
+JLoader::registerAlias('JFormFieldTemplatestyle',           '\\Joomla\\CMS\\Form\\Field\\TemplatestyleField', '5.0');
+JLoader::registerAlias('JFormFieldUserActive',              '\\Joomla\\CMS\\Form\\Field\\UseractiveField', '5.0');
+JLoader::registerAlias('JFormFieldUserGroupList',           '\\Joomla\\CMS\\Form\\Field\\UsergrouplistField', '5.0');
+JLoader::registerAlias('JFormFieldUserState',               '\\Joomla\\CMS\\Form\\Field\\UserstateField', '5.0');
+JLoader::registerAlias('JFormFieldUser',                    '\\Joomla\\CMS\\Form\\Field\\UserField', '5.0');
+JLoader::registerAlias('JFormRuleBoolean',                  '\\Joomla\\CMS\\Form\\Rule\\BooleanRule', '5.0');
+JLoader::registerAlias('JFormRuleCalendar',                 '\\Joomla\\CMS\\Form\\Rule\\CalendarRule', '5.0');
+JLoader::registerAlias('JFormRuleCaptcha',                  '\\Joomla\\CMS\\Form\\Rule\\CaptchaRule', '5.0');
+JLoader::registerAlias('JFormRuleColor',                    '\\Joomla\\CMS\\Form\\Rule\\ColorRule', '5.0');
+JLoader::registerAlias('JFormRuleEmail',                    '\\Joomla\\CMS\\Form\\Rule\\EmailRule', '5.0');
+JLoader::registerAlias('JFormRuleEquals',                   '\\Joomla\\CMS\\Form\\Rule\\EqualsRule', '5.0');
+JLoader::registerAlias('JFormRuleNotequals',                '\\Joomla\\CMS\\Form\\Rule\\NotequalsRule', '5.0');
+JLoader::registerAlias('JFormRuleNumber',                   '\\Joomla\\CMS\\Form\\Rule\\NumberRule', '5.0');
+JLoader::registerAlias('JFormRuleOptions',                  '\\Joomla\\CMS\\Form\\Rule\\OptionsRule', '5.0');
+JLoader::registerAlias('JFormRulePassword',                 '\\Joomla\\CMS\\Form\\Rule\\PasswordRule', '5.0');
+JLoader::registerAlias('JFormRuleRules',                    '\\Joomla\\CMS\\Form\\Rule\\RulesRule', '5.0');
+JLoader::registerAlias('JFormRuleTel',                      '\\Joomla\\CMS\\Form\\Rule\\TelRule', '5.0');
+JLoader::registerAlias('JFormRuleUrl',                      '\\Joomla\\CMS\\Form\\Rule\\UrlRule', '5.0');
+JLoader::registerAlias('JFormRuleUsername',                 '\\Joomla\\CMS\\Form\\Rule\\UsernameRule', '5.0');
+
+JLoader::registerAlias('JMicrodata',                        '\\Joomla\\CMS\\Microdata\\Microdata', '5.0');
+
+JLoader::registerAlias('JFactory',                          '\\Joomla\\CMS\\Factory', '5.0');
+
+JLoader::registerAlias('JMail',                             '\\Joomla\\CMS\\Mail\\Mail', '5.0');
+JLoader::registerAlias('JMailHelper',                       '\\Joomla\\CMS\\Mail\\MailHelper', '5.0');
+JLoader::registerAlias('JMailWrapperHelper',                '\\Joomla\\CMS\\Mail\\MailWrapper', '4.0');
+
+JLoader::registerAlias('JClientHelper',                     '\\Joomla\\CMS\\Client\\ClientHelper', '5.0');
+JLoader::registerAlias('JClientWrapperHelper',              '\\Joomla\\CMS\\Client\\ClientWrapper', '5.0');
+JLoader::registerAlias('JClientFtp',                        '\\Joomla\\CMS\\Client\\FtpClient', '5.0');
+JLoader::registerAlias('JFTP',                              '\\Joomla\\CMS\\Client\\FtpClient', '4.0');
+JLoader::registerAlias('JClientLdap',                       '\\Joomla\\Ldap\\LdapClient', '5.0');
+JLoader::registerAlias('JLDAP',                             '\\Joomla\\Ldap\\LdapClient', '4.0');
+
+JLoader::registerAlias('JUpdate',                           '\\Joomla\\CMS\\Updater\\Update', '5.0');
+JLoader::registerAlias('JUpdateAdapter',                    '\\Joomla\\CMS\\Updater\\UpdateAdapter', '5.0');
+JLoader::registerAlias('JUpdater',                          '\\Joomla\\CMS\\Updater\\Updater', '5.0');
+JLoader::registerAlias('JUpdaterCollection',                '\\Joomla\\CMS\\Updater\\Adapter\\CollectionAdapter', '5.0');
+JLoader::registerAlias('JUpdaterExtension',                 '\\Joomla\\CMS\\Updater\\Adapter\\ExtensionAdapter', '5.0');
+
+JLoader::registerAlias('JCrypt',                            '\\Joomla\\CMS\\Crypt\\Crypt', '5.0');
+JLoader::registerAlias('JCryptCipher',                      '\\Joomla\\CMS\\Crypt\\CipherInterface', '5.0');
+JLoader::registerAlias('JCryptKey',                         '\\Joomla\\CMS\\Crypt\\Key', '5.0');
+JLoader::registerAlias('JCryptPassword',                    '\\Joomla\\CMS\\Crypt\\CryptPassword', '4.0');
+JLoader::registerAlias('JCryptCipherBlowfish',              '\\Joomla\\CMS\\Crypt\\Cipher\\BlowfishCipher', '4.0');
+JLoader::registerAlias('JCryptCipherCrypto',                '\\Joomla\\CMS\\Crypt\\Cipher\\CryptoCipher', '5.0');
+JLoader::registerAlias('JCryptCipherMcrypt',                '\\Joomla\\CMS\\Crypt\\Cipher\\McryptCipher', '4.0');
+JLoader::registerAlias('JCryptCipherRijndael256',           '\\Joomla\\CMS\\Crypt\\Cipher\\Rijndael256Cipher', '4.0');
+JLoader::registerAlias('JCryptCipherSimple',                '\\Joomla\\CMS\\Crypt\\Cipher\\SimpleCipher', '4.0');
+JLoader::registerAlias('JCryptCipherSodium',                '\\Joomla\\CMS\\Crypt\\Cipher\\SodiumCipher', '5.0');
+JLoader::registerAlias('JCryptCipher3Des',                  '\\Joomla\\CMS\\Crypt\\Cipher\\TripleDesCipher', '4.0');
+JLoader::registerAlias('JCryptPasswordSimple',              '\\Joomla\\CMS\\Crypt\\Password\\SimpleCryptPassword', '4.0');
+
+JLoader::registerAlias('JStringPunycode',                   '\\Joomla\\CMS\\String\\PunycodeHelper', '5.0');
+
+JLoader::registerAlias('JBuffer',                           '\\Joomla\\CMS\\Utility\\BufferStreamHandler', '5.0');
+JLoader::registerAlias('JUtility',                          '\\Joomla\\CMS\\Utility\\Utility', '5.0');
+
+JLoader::registerAlias('JInputCli',                         '\\Joomla\\CMS\\Input\\Cli', '5.0');
+JLoader::registerAlias('JInputCookie',                      '\\Joomla\\CMS\\Input\\Cookie', '5.0');
+JLoader::registerAlias('JInputFiles',                       '\\Joomla\\CMS\\Input\\Files', '5.0');
+JLoader::registerAlias('JInput',                            '\\Joomla\\CMS\\Input\\Input', '5.0');
+JLoader::registerAlias('JInputJSON',                        '\\Joomla\\CMS\\Input\\Json', '5.0');
+
+JLoader::registerAlias('JFeed',                             '\\Joomla\\CMS\\Feed\\Feed', '5.0');
+JLoader::registerAlias('JFeedEntry',                        '\\Joomla\\CMS\\Feed\\FeedEntry', '5.0');
+JLoader::registerAlias('JFeedFactory',                      '\\Joomla\\CMS\\Feed\\FeedFactory', '5.0');
+JLoader::registerAlias('JFeedLink',                         '\\Joomla\\CMS\\Feed\\FeedLink', '5.0');
+JLoader::registerAlias('JFeedParser',                       '\\Joomla\\CMS\\Feed\\FeedParser', '5.0');
+JLoader::registerAlias('JFeedPerson',                       '\\Joomla\\CMS\\Feed\\FeedPerson', '5.0');
+JLoader::registerAlias('JFeedParserAtom',                   '\\Joomla\\CMS\\Feed\\Parser\\AtomParser', '5.0');
+JLoader::registerAlias('JFeedParserNamespace',              '\\Joomla\\CMS\\Feed\\Parser\\NamespaceParserInterface', '5.0');
+JLoader::registerAlias('JFeedParserRss',                    '\\Joomla\\CMS\\Feed\\Parser\\RssParser', '5.0');
+JLoader::registerAlias('JFeedParserRssItunes',              '\\Joomla\\CMS\\Feed\\Parser\\Rss\\ItunesRssParser', '5.0');
+JLoader::registerAlias('JFeedParserRssMedia',               '\\Joomla\\CMS\\Feed\\Parser\\Rss\\MediaRssParser', '5.0');
+
+JLoader::registerAlias('JImage',                            '\\Joomla\\CMS\\Image\\Image', '5.0');
+JLoader::registerAlias('JImageFilter',                      '\\Joomla\\CMS\\Image\\ImageFilter', '5.0');
+JLoader::registerAlias('JImageFilterBackgroundfill',        '\\Joomla\\Image\\Filter\\Backgroundfill', '5.0');
+JLoader::registerAlias('JImageFilterBrightness',            '\\Joomla\\Image\\Filter\\Brightness', '5.0');
+JLoader::registerAlias('JImageFilterContrast',              '\\Joomla\\Image\\Filter\\Contrast', '5.0');
+JLoader::registerAlias('JImageFilterEdgedetect',            '\\Joomla\\Image\\Filter\\Edgedetect', '5.0');
+JLoader::registerAlias('JImageFilterEmboss',                '\\Joomla\\Image\\Filter\\Emboss', '5.0');
+JLoader::registerAlias('JImageFilterNegate',                '\\Joomla\\Image\\Filter\\Negate', '5.0');
+JLoader::registerAlias('JImageFilterSketchy',               '\\Joomla\\Image\\Filter\\Sketchy', '5.0');
+JLoader::registerAlias('JImageFilterSmooth',                '\\Joomla\\Image\\Filter\\Smooth', '5.0');
+
+JLoader::registerAlias('JObject',                           '\\Joomla\\CMS\\Object\\CMSObject', '5.0');
+
+JLoader::registerAlias('JExtensionHelper',                  '\\Joomla\\CMS\\Extension\\ExtensionHelper', '5.0');
+
+JLoader::registerAlias('JHtml',                             '\\Joomla\\CMS\\HTML\\HTMLHelper', '5.0');
diff --git a/core/libraries/cms.php b/core/libraries/cms.php
new file mode 100644
index 00000000..1aaf563b
--- /dev/null
+++ b/core/libraries/cms.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package    Joomla.Libraries
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Set the platform root path as a constant if necessary.
+if (!defined('JPATH_PLATFORM'))
+{
+	define('JPATH_PLATFORM', __DIR__);
+}
+
+// Import the library loader if necessary.
+if (!class_exists('JLoader'))
+{
+	require_once JPATH_PLATFORM . '/loader.php';
+}
+
+// Make sure that the Joomla Platform has been successfully loaded.
+if (!class_exists('JLoader'))
+{
+	throw new RuntimeException('Joomla Platform not loaded.');
+}
+
+// Register the library base path for CMS libraries.
+JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
+
+/** @note This will be loaded through composer in Joomla 4 */
+JLoader::registerNamespace('Joomla\\CMS', JPATH_PLATFORM . '/src', false, false, 'psr4');
+
+// Create the Composer autoloader
+$loader = require JPATH_LIBRARIES . '/vendor/autoload.php';
+$loader->unregister();
+
+// Decorate Composer autoloader
+spl_autoload_register(array(new JClassLoader($loader), 'loadClass'), true, true);
+
+// Register the class aliases for Framework classes that have replaced their Platform equivilents
+require_once JPATH_LIBRARIES . '/classmap.php';
+
+// Ensure FOF autoloader included - needed for things like content versioning where we need to get an FOFTable Instance
+if (!class_exists('FOFAutoloaderFof'))
+{
+	include_once JPATH_LIBRARIES . '/fof/include.php';
+}
+
+// Register a handler for uncaught exceptions that shows a pretty error page when possible
+set_exception_handler(array('JErrorPage', 'render'));
+
+// Define the Joomla version if not already defined.
+if (!defined('JVERSION'))
+{
+	$jversion = new JVersion;
+	define('JVERSION', $jversion->getShortVersion());
+}
+
+// Set up the message queue logger for web requests
+if (array_key_exists('REQUEST_METHOD', $_SERVER))
+{
+	JLog::addLogger(array('logger' => 'messagequeue'), JLog::ALL, array('jerror'));
+}
+
+// Register JArrayHelper due to JRegistry moved to composer's vendor folder
+JLoader::register('JArrayHelper', JPATH_PLATFORM . '/joomla/utilities/arrayhelper.php');
+
+// Register the Crypto lib
+JLoader::register('Crypto', JPATH_PLATFORM . '/php-encryption/Crypto.php');
+
+// Register classes where the names have been changed to fit the autoloader rules
+// @deprecated  4.0
+JLoader::register('JInstallerComponent',  JPATH_PLATFORM . '/cms/installer/adapter/component.php');
+JLoader::register('JInstallerFile',  JPATH_PLATFORM . '/cms/installer/adapter/file.php');
+JLoader::register('JInstallerLanguage',  JPATH_PLATFORM . '/cms/installer/adapter/language.php');
+JLoader::register('JInstallerLibrary',  JPATH_PLATFORM . '/cms/installer/adapter/library.php');
+JLoader::register('JInstallerModule',  JPATH_PLATFORM . '/cms/installer/adapter/module.php');
+JLoader::register('JInstallerPackage',  JPATH_PLATFORM . '/cms/installer/adapter/package.php');
+JLoader::register('JInstallerPlugin',  JPATH_PLATFORM . '/cms/installer/adapter/plugin.php');
+JLoader::register('JInstallerTemplate',  JPATH_PLATFORM . '/cms/installer/adapter/template.php');
+JLoader::register('JExtension',  JPATH_PLATFORM . '/cms/installer/extension.php');
+JLoader::registerAlias('JAdministrator',  'JApplicationAdministrator');
+JLoader::registerAlias('JSite',  'JApplicationSite');
+
+// Can be removed when the move of all core fields to namespace is finished
+\Joomla\CMS\Form\FormHelper::addFieldPath(JPATH_LIBRARIES . '/joomla/form/fields');
+\Joomla\CMS\Form\FormHelper::addRulePath(JPATH_LIBRARIES . '/joomla/form/rule');
+\Joomla\CMS\Form\FormHelper::addRulePath(JPATH_LIBRARIES . '/joomla/form/rules');
+\Joomla\CMS\Form\FormHelper::addFormPath(JPATH_LIBRARIES . '/joomla/form/forms');
+\Joomla\CMS\Form\FormHelper::addFieldPath(JPATH_LIBRARIES . '/cms/form/field');
+\Joomla\CMS\Form\FormHelper::addRulePath(JPATH_LIBRARIES . '/cms/form/rule');
diff --git a/core/libraries/cms/class/loader.php b/core/libraries/cms/class/loader.php
new file mode 100644
index 00000000..e91ef975
--- /dev/null
+++ b/core/libraries/cms/class/loader.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Class
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Composer\Autoload\ClassLoader;
+
+/**
+ * Decorate Composer ClassLoader for Joomla!
+ *
+ * For backward compatibility due to class aliasing in the CMS, the loadClass() method was modified to call
+ * the JLoader::applyAliasFor() method.
+ *
+ * @since  3.4
+ */
+class JClassLoader
+{
+	/**
+	 * The composer class loader
+	 *
+	 * @var    ClassLoader
+	 * @since  3.4
+	 */
+	private $loader;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   ClassLoader  $loader  Composer autoloader
+	 *
+	 * @since   3.4
+	 */
+	public function __construct(ClassLoader $loader)
+	{
+		$this->loader = $loader;
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param   string  $class  The name of the class
+	 *
+	 * @return  boolean|null  True if loaded, null otherwise
+	 *
+	 * @since   3.4
+	 */
+	public function loadClass($class)
+	{
+		if ($result = $this->loader->loadClass($class))
+		{
+			JLoader::applyAliasFor($class);
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/cms/html/access.php b/core/libraries/cms/html/access.php
new file mode 100644
index 00000000..751ba4f1
--- /dev/null
+++ b/core/libraries/cms/html/access.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Extended Utility class for all HTML drawing classes.
+ *
+ * @since  1.6
+ */
+abstract class JHtmlAccess
+{
+	/**
+	 * A cached array of the asset groups
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected static $asset_groups = null;
+
+	/**
+	 * Displays a list of the available access view levels
+	 *
+	 * @param   string  $name      The form field name.
+	 * @param   string  $selected  The name of the selected section.
+	 * @param   string  $attribs   Additional attributes to add to the select field.
+	 * @param   mixed   $params    True to add "All Sections" option or an array of options
+	 * @param   mixed   $id        The form field id or false if not used
+	 *
+	 * @return  string  The required HTML for the SELECT tag.
+	 *
+	 * @see    JFormFieldAccessLevel
+	 * @since  1.6
+	 */
+	public static function level($name, $selected, $attribs = '', $params = true, $id = false)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('a.id', 'value') . ', ' . $db->quoteName('a.title', 'text'))
+			->from($db->quoteName('#__viewlevels', 'a'))
+			->group($db->quoteName(array('a.id', 'a.title', 'a.ordering')))
+			->order($db->quoteName('a.ordering') . ' ASC')
+			->order($db->quoteName('title') . ' ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		// If params is an array, push these options to the array
+		if (is_array($params))
+		{
+			$options = array_merge($params, $options);
+		}
+
+		// If all levels is allowed, push it into the array.
+		elseif ($params)
+		{
+			array_unshift($options, JHtml::_('select.option', '', JText::_('JOPTION_ACCESS_SHOW_ALL_LEVELS')));
+		}
+
+		return JHtml::_(
+			'select.genericlist',
+			$options,
+			$name,
+			array(
+				'list.attr' => $attribs,
+				'list.select' => $selected,
+				'id' => $id,
+			)
+		);
+	}
+
+	/**
+	 * Displays a list of the available user groups.
+	 *
+	 * @param   string   $name      The form field name.
+	 * @param   string   $selected  The name of the selected section.
+	 * @param   string   $attribs   Additional attributes to add to the select field.
+	 * @param   boolean  $allowAll  True to add "All Groups" option.
+	 * @param   mixed    $id        The form field id
+	 *
+	 * @return  string   The required HTML for the SELECT tag.
+	 *
+	 * @see     JFormFieldUsergroup
+	 * @since   1.6
+	 */
+	public static function usergroup($name, $selected, $attribs = '', $allowAll = true, $id = false)
+	{
+		$options = array_values(JHelperUsergroups::getInstance()->getAll());
+
+		for ($i = 0, $n = count($options); $i < $n; $i++)
+		{
+			$options[$i]->value = $options[$i]->id;
+			$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->title;
+		}
+
+		// If all usergroups is allowed, push it into the array.
+		if ($allowAll)
+		{
+			array_unshift($options, JHtml::_('select.option', '', JText::_('JOPTION_ACCESS_SHOW_ALL_GROUPS')));
+		}
+
+		return JHtml::_('select.genericlist', $options, $name, array('list.attr' => $attribs, 'list.select' => $selected, 'id' => $id));
+	}
+
+	/**
+	 * Returns a UL list of user groups with checkboxes
+	 *
+	 * @param   string   $name             The name of the checkbox controls array
+	 * @param   array    $selected         An array of the checked boxes
+	 * @param   boolean  $checkSuperAdmin  If false only super admins can add to super admin groups
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 */
+	public static function usergroups($name, $selected, $checkSuperAdmin = false)
+	{
+		static $count;
+
+		$count++;
+
+		$isSuperAdmin = JFactory::getUser()->authorise('core.admin');
+
+		$groups = array_values(JHelperUsergroups::getInstance()->getAll());
+
+		$html = array();
+
+		for ($i = 0, $n = count($groups); $i < $n; $i++)
+		{
+			$item = &$groups[$i];
+
+			// If checkSuperAdmin is true, only add item if the user is superadmin or the group is not super admin
+			if ((!$checkSuperAdmin) || $isSuperAdmin || (!JAccess::checkGroup($item->id, 'core.admin')))
+			{
+				// Setup  the variable attributes.
+				$eid = $count . 'group_' . $item->id;
+
+				// Don't call in_array unless something is selected
+				$checked = '';
+
+				if ($selected)
+				{
+					$checked = in_array($item->id, $selected) ? ' checked="checked"' : '';
+				}
+
+				$rel = ($item->parent_id > 0) ? ' rel="' . $count . 'group_' . $item->parent_id . '"' : '';
+
+				// Build the HTML for the item.
+				$html[] = '	<div class="control-group">';
+				$html[] = '		<div class="controls">';
+				$html[] = '			<label class="checkbox" for="' . $eid . '">';
+				$html[] = '			<input type="checkbox" name="' . $name . '[]" value="' . $item->id . '" id="' . $eid . '"';
+				$html[] = '					' . $checked . $rel . ' />';
+				$html[] = '			' . JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level + 1)) . $item->title;
+				$html[] = '			</label>';
+				$html[] = '		</div>';
+				$html[] = '	</div>';
+			}
+		}
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Returns a UL list of actions with checkboxes
+	 *
+	 * @param   string  $name       The name of the checkbox controls array
+	 * @param   array   $selected   An array of the checked boxes
+	 * @param   string  $component  The component the permissions apply to
+	 * @param   string  $section    The section (within a component) the permissions apply to
+	 *
+	 * @return  string
+	 *
+	 * @see     JAccess
+	 * @since   1.6
+	 */
+	public static function actions($name, $selected, $component, $section = 'global')
+	{
+		static $count;
+
+		$count++;
+
+		$actions = JAccess::getActionsFromFile(
+			JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml',
+			"/access/section[@name='" . $section . "']/"
+		);
+
+		$html = array();
+		$html[] = '<ul class="checklist access-actions">';
+
+		for ($i = 0, $n = count($actions); $i < $n; $i++)
+		{
+			$item = &$actions[$i];
+
+			// Setup  the variable attributes.
+			$eid = $count . 'action_' . $item->id;
+			$checked = in_array($item->id, $selected) ? ' checked="checked"' : '';
+
+			// Build the HTML for the item.
+			$html[] = '	<li>';
+			$html[] = '		<input type="checkbox" name="' . $name . '[]" value="' . $item->id . '" id="' . $eid . '"';
+			$html[] = '			' . $checked . ' />';
+			$html[] = '		<label for="' . $eid . '">';
+			$html[] = '			' . JText::_($item->title);
+			$html[] = '		</label>';
+			$html[] = '	</li>';
+		}
+
+		$html[] = '</ul>';
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Gets a list of the asset groups as an array of JHtml compatible options.
+	 *
+	 * @return  mixed  An array or false if an error occurs
+	 *
+	 * @since   1.6
+	 */
+	public static function assetgroups()
+	{
+		if (empty(static::$asset_groups))
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('a.id AS value, a.title AS text')
+				->from($db->quoteName('#__viewlevels') . ' AS a')
+				->group('a.id, a.title, a.ordering')
+				->order('a.ordering ASC');
+
+			$db->setQuery($query);
+			static::$asset_groups = $db->loadObjectList();
+		}
+
+		return static::$asset_groups;
+	}
+
+	/**
+	 * Displays a Select list of the available asset groups
+	 *
+	 * @param   string  $name      The name of the select element
+	 * @param   mixed   $selected  The selected asset group id
+	 * @param   string  $attribs   Optional attributes for the select field
+	 * @param   array   $config    An array of options for the control
+	 *
+	 * @return  mixed  An HTML string or null if an error occurs
+	 *
+	 * @since   1.6
+	 */
+	public static function assetgrouplist($name, $selected, $attribs = null, $config = array())
+	{
+		static $count;
+
+		$options = static::assetgroups();
+
+		if (isset($config['title']))
+		{
+			array_unshift($options, JHtml::_('select.option', '', $config['title']));
+		}
+
+		return JHtml::_(
+			'select.genericlist',
+			$options,
+			$name,
+			array(
+				'id' => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
+				'list.attr' => $attribs === null ? 'class="inputbox" size="3"' : $attribs,
+				'list.select' => (int) $selected,
+			)
+		);
+	}
+}
diff --git a/core/libraries/cms/html/actionsdropdown.php b/core/libraries/cms/html/actionsdropdown.php
new file mode 100644
index 00000000..4c142f42
--- /dev/null
+++ b/core/libraries/cms/html/actionsdropdown.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTML utility class for building a dropdown menu
+ *
+ * @since  3.2
+ */
+abstract class JHtmlActionsDropdown
+{
+	/**
+	 * @var    string  HTML markup for the dropdown list
+	 * @since  3.2
+	 */
+	protected static $dropDownList = array();
+
+	/**
+	 * Method to render current dropdown menu
+	 *
+	 * @param   string  $item  An item to render.
+	 *
+	 * @return  string  HTML markup for the dropdown list
+	 *
+	 * @since   3.2
+	 */
+	public static function render($item = '')
+	{
+		$html = array();
+
+		$html[] = '<button data-toggle="dropdown" class="dropdown-toggle btn btn-micro">';
+		$html[] = '<span class="caret"></span>';
+
+		if ($item)
+		{
+			$html[] = '<span class="element-invisible">' . JText::sprintf('JACTIONS', $item) . '</span>';
+		}
+
+		$html[] = '</button>';
+		$html[] = '<ul class="dropdown-menu">';
+		$html[] = implode('', static::$dropDownList);
+		$html[] = '</ul>';
+
+		static::$dropDownList = null;
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Append a publish item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function publish($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'publish';
+		static::addCustomItem(JText::_('JTOOLBAR_PUBLISH'), 'publish', $id, $task);
+	}
+
+	/**
+	 * Append an unpublish item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function unpublish($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'unpublish';
+		static::addCustomItem(JText::_('JTOOLBAR_UNPUBLISH'), 'unpublish', $id, $task);
+	}
+
+	/**
+	 * Append a feature item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function feature($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'featured';
+		static::addCustomItem(JText::_('JFEATURE'), 'featured', $id, $task);
+	}
+
+	/**
+	 * Append an unfeature item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function unfeature($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'unfeatured';
+		static::addCustomItem(JText::_('JUNFEATURE'), 'unfeatured', $id, $task);
+	}
+
+	/**
+	 * Append an archive item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function archive($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'archive';
+		static::addCustomItem(JText::_('JTOOLBAR_ARCHIVE'), 'archive', $id, $task);
+	}
+
+	/**
+	 * Append an unarchive item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function unarchive($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'unpublish';
+		static::addCustomItem(JText::_('JTOOLBAR_UNARCHIVE'), 'unarchive', $id, $task);
+	}
+
+	/**
+	 * Append a duplicate item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function duplicate($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'duplicate';
+		static::addCustomItem(JText::_('JTOOLBAR_DUPLICATE'), 'copy', $id, $task);
+	}
+
+	/**
+	 * Append a trash item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function trash($id, $prefix = '')
+	{
+		$task = ($prefix ? $prefix . '.' : '') . 'trash';
+		static::addCustomItem(JText::_('JTOOLBAR_TRASH'), 'trash', $id, $task);
+	}
+
+	/**
+	 * Append an untrash item to the current dropdown menu
+	 *
+	 * @param   string  $id      ID of corresponding checkbox of the record
+	 * @param   string  $prefix  The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function untrash($id, $prefix = '')
+	{
+		self::publish($id, $prefix);
+	}
+
+	/**
+	 * Writes a divider between dropdown items
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function divider()
+	{
+		static::$dropDownList[] = '<li class="divider"></li>';
+	}
+
+	/**
+	 * Append a custom item to current dropdown menu.
+	 *
+	 * @param   string  $label  The label of the item.
+	 * @param   string  $icon   The icon classname.
+	 * @param   string  $id     The item id.
+	 * @param   string  $task   The task.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function addCustomItem($label, $icon = '', $id = '', $task = '')
+	{
+		static::$dropDownList[] = '<li>'
+			. '<a href = "javascript://" onclick="listItemTask(\'' . $id . '\', \'' . $task . '\')">'
+			. ($icon ? '<span class="icon-' . $icon . '" aria-hidden="true"></span> ' : '')
+			. $label
+			. '</a>'
+			. '</li>';
+	}
+}
diff --git a/core/libraries/cms/html/adminlanguage.php b/core/libraries/cms/html/adminlanguage.php
new file mode 100644
index 00000000..2d50612d
--- /dev/null
+++ b/core/libraries/cms/html/adminlanguage.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class working with administrator language select lists
+ *
+ * @since  3.8.0
+ */
+abstract class JHtmlAdminLanguage
+{
+	/**
+	 * Cached array of the administrator language items.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	protected static $items = null;
+
+	/**
+	 * Get a list of the available administrator language items.
+	 *
+	 * @param   boolean  $all        True to include All (*)
+	 * @param   boolean  $translate  True to translate All
+	 *
+	 * @return  string
+	 *
+	 * @since   3.8.0
+	 */
+	public static function existing($all = false, $translate = false)
+	{
+		if (empty(static::$items))
+		{
+			$languages       = array();
+			$admin_languages = JLanguageHelper::getKnownLanguages(JPATH_ADMINISTRATOR);
+
+			foreach ($admin_languages as $tag => $language)
+			{
+				$languages[$tag] = $language['nativeName'];
+			}
+
+			ksort($languages);
+
+			static::$items = $languages;
+		}
+
+		if ($all)
+		{
+			$all_option = array(new JObject(array('value' => '*', 'text' => $translate ? JText::alt('JALL', 'language') : 'JALL_LANGUAGE')));
+
+			return array_merge($all_option, static::$items);
+		}
+		else
+		{
+			return static::$items;
+		}
+	}
+}
diff --git a/core/libraries/cms/html/batch.php b/core/libraries/cms/html/batch.php
new file mode 100644
index 00000000..14e92966
--- /dev/null
+++ b/core/libraries/cms/html/batch.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Extended Utility class for batch processing widgets.
+ *
+ * @since       1.7
+ *
+ * @deprecated  4.0 Use JLayout directly
+ */
+abstract class JHtmlBatch
+{
+	/**
+	 * Display a batch widget for the access level selector.
+	 *
+	 * @return  string  The necessary HTML for the widget.
+	 *
+	 * @since       1.7
+	 *
+	 * @deprecated  4.0 instead of JHtml::_('batch.access'); use JLayoutHelper::render('joomla.html.batch.access', array());
+	 */
+	public static function access()
+	{
+		JLog::add('The use of JHtml::_("batch.access") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated');
+
+		return JLayoutHelper::render('joomla.html.batch.access', array());
+	}
+
+	/**
+	 * Displays a batch widget for moving or copying items.
+	 *
+	 * @param   string  $extension  The extension that owns the category.
+	 *
+	 * @return  string  The necessary HTML for the widget.
+	 *
+	 * @since       1.7
+	 *
+	 * @deprecated  4.0 instead of JHtml::_('batch.item'); use JLayoutHelper::render('joomla.html.batch.item', array('extension' => 'com_XXX'));
+	 */
+	public static function item($extension)
+	{
+		$displayData = array('extension' => $extension);
+
+		JLog::add('The use of JHtml::_("batch.item") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated');
+
+		return JLayoutHelper::render('joomla.html.batch.item', $displayData);
+	}
+
+	/**
+	 * Display a batch widget for the language selector.
+	 *
+	 * @return  string  The necessary HTML for the widget.
+	 *
+	 * @since       2.5
+	 *
+	 * @deprecated  4.0 instead of JHtml::_('batch.language'); use JLayoutHelper::render('joomla.html.batch.language', array());
+	 */
+	public static function language()
+	{
+		JLog::add('The use of JHtml::_("batch.language") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated');
+
+		return JLayoutHelper::render('joomla.html.batch.language', array());
+	}
+
+	/**
+	 * Display a batch widget for the user selector.
+	 *
+	 * @param   boolean  $noUser  Choose to display a "no user" option
+	 *
+	 * @return  string  The necessary HTML for the widget.
+	 *
+	 * @since       2.5
+	 *
+	 * @deprecated  4.0 instead of JHtml::_('batch.user'); use JLayoutHelper::render('joomla.html.batch.user', array());
+	 */
+	public static function user($noUser = true)
+	{
+		$displayData = array('noUser' => $noUser);
+
+		JLog::add('The use of JHtml::_("batch.user") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated');
+
+		return JLayoutHelper::render('joomla.html.batch.user', $displayData);
+	}
+
+	/**
+	 * Display a batch widget for the tag selector.
+	 *
+	 * @return  string  The necessary HTML for the widget.
+	 *
+	 * @since       3.1
+	 *
+	 * @deprecated  4.0 instead of JHtml::_('batch.tag'); use JLayoutHelper::render('joomla.html.batch.tag', array());
+	 */
+	public static function tag()
+	{
+		JLog::add('The use of JHtml::_("batch.tag") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated');
+
+		return JLayoutHelper::render('joomla.html.batch.tag', array());
+	}
+}
diff --git a/core/libraries/cms/html/behavior.php b/core/libraries/cms/html/behavior.php
new file mode 100644
index 00000000..c987151a
--- /dev/null
+++ b/core/libraries/cms/html/behavior.php
@@ -0,0 +1,1016 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for JavaScript behaviors
+ *
+ * @since  1.5
+ */
+abstract class JHtmlBehavior
+{
+	/**
+	 * Array containing information for loaded files
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Method to load the MooTools framework into the document head
+	 *
+	 * If debugging mode is on an uncompressed version of MooTools is included for easier debugging.
+	 *
+	 * @param   boolean  $extras  Flag to determine whether to load MooTools More in addition to Core
+	 * @param   mixed    $debug   Is debugging mode on? [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecated 4.0 Update scripts to jquery
+	 */
+	public static function framework($extras = false, $debug = null)
+	{
+		$type = $extras ? 'more' : 'core';
+
+		// Only load once
+		if (!empty(static::$loaded[__METHOD__][$type]))
+		{
+			return;
+		}
+
+		JLog::add('JHtmlBehavior::framework is deprecated. Update to jquery scripts.', JLog::WARNING, 'deprecated');
+
+		// If no debugging value is set, use the configuration setting
+		if ($debug === null)
+		{
+			$debug = JDEBUG;
+		}
+
+		if ($type !== 'core' && empty(static::$loaded[__METHOD__]['core']))
+		{
+			static::framework(false, $debug);
+		}
+
+		JHtml::_('script', 'system/mootools-' . $type . '.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+
+		// Keep loading core.js for BC reasons
+		static::core();
+
+		static::$loaded[__METHOD__][$type] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to load core.js into the document head.
+	 *
+	 * Core.js defines the 'Joomla' namespace and contains functions which are used across extensions
+	 *
+	 * @return  void
+	 *
+	 * @since   3.3
+	 */
+	public static function core()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		JHtml::_('form.csrf');
+		JHtml::_('script', 'system/core.js', array('version' => 'auto', 'relative' => true));
+
+		// Add core and base uri paths so javascript scripts can use them.
+		JFactory::getDocument()->addScriptOptions('system.paths', array('root' => JUri::root(true), 'base' => JUri::base(true)));
+
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for image captions.
+	 *
+	 * @param   string  $selector  The selector for which a caption behaviour is to be applied.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function caption($selector = 'img.caption')
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__][$selector]))
+		{
+			return;
+		}
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		JHtml::_('script', 'system/caption.js', array('version' => 'auto', 'relative' => true));
+
+		// Attach caption to document
+		JFactory::getDocument()->addScriptDeclaration(
+			"jQuery(window).on('load',  function() {
+				new JCaption('" . $selector . "');
+			});"
+		);
+
+		// Set static array
+		static::$loaded[__METHOD__][$selector] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for form validation.
+	 *
+	 * To enable form validation the form tag must have class="form-validate".
+	 * Each field that needs to be validated needs to have class="validate".
+	 * Additional handlers can be added to the handler for username, password,
+	 * numeric and email. To use these add class="validate-email" and so on.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 *
+	 * @Deprecated 3.4 Use formvalidator instead
+	 */
+	public static function formvalidation()
+	{
+		JLog::add('The use of formvalidation is deprecated use formvalidator instead.', JLog::WARNING, 'deprecated');
+
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include MooTools framework
+		static::framework();
+
+		// Load the new jQuery code
+		static::formvalidator();
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for form validation.
+	 *
+	 * To enable form validation the form tag must have class="form-validate".
+	 * Each field that needs to be validated needs to have class="validate".
+	 * Additional handlers can be added to the handler for username, password,
+	 * numeric and email. To use these add class="validate-email" and so on.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public static function formvalidator()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include core
+		static::core();
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		// Add validate.js language strings
+		JText::script('JLIB_FORM_FIELD_INVALID');
+
+		JHtml::_('script', 'system/punycode.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('script', 'system/validate.js', array('version' => 'auto', 'relative' => true));
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for submenu switcher support
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function switcher()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		JHtml::_('script', 'system/switcher.js', array('framework' => true, 'version' => 'auto', 'relative' => true));
+
+		$script = "
+			document.switcher = null;
+			jQuery(function($){
+				var toggler = document.getElementById('submenu');
+				var element = document.getElementById('config-document');
+				if (element) {
+					document.switcher = new JSwitcher(toggler, element);
+				}
+			});";
+
+		JFactory::getDocument()->addScriptDeclaration($script);
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for a combobox effect.
+	 *
+	 * Note that this control is only reliable in absolutely positioned elements.
+	 * Avoid using a combobox in a slider or dynamic pane.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function combobox()
+	{
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+		// Include core
+		static::core();
+
+		JHtml::_('script', 'system/combobox.js', array('version' => 'auto', 'relative' => true));
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for a hover tooltips.
+	 *
+	 * Add a title attribute to any element in the form
+	 * title="title::text"
+	 *
+	 * Uses the core Tips class in MooTools.
+	 *
+	 * @param   string  $selector  The class selector for the tooltip.
+	 * @param   array   $params    An array of options for the tooltip.
+	 *                             Options for the tooltip can be:
+	 *                             - maxTitleChars  integer   The maximum number of characters in the tooltip title (defaults to 50).
+	 *                             - offsets        object    The distance of your tooltip from the mouse (defaults to {'x': 16, 'y': 16}).
+	 *                             - showDelay      integer   The millisecond delay the show event is fired (defaults to 100).
+	 *                             - hideDelay      integer   The millisecond delay the hide hide is fired (defaults to 100).
+	 *                             - className      string    The className your tooltip container will get.
+	 *                             - fixed          boolean   If set to true, the toolTip will not follow the mouse.
+	 *                             - onShow         function  The default function for the show event, passes the tip element
+	 *                               and the currently hovered element.
+	 *                             - onHide         function  The default function for the hide event, passes the currently
+	 *                               hovered element.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function tooltip($selector = '.hasTip', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (isset(static::$loaded[__METHOD__][$sig]))
+		{
+			return;
+		}
+
+		// Include MooTools framework
+		static::framework(true);
+
+		// Setup options object
+		$opt['maxTitleChars'] = isset($params['maxTitleChars']) && $params['maxTitleChars'] ? (int) $params['maxTitleChars'] : 50;
+
+		// Offsets needs an array in the format: array('x'=>20, 'y'=>30)
+		$opt['offset']    = isset($params['offset']) && is_array($params['offset']) ? $params['offset'] : null;
+		$opt['showDelay'] = isset($params['showDelay']) ? (int) $params['showDelay'] : null;
+		$opt['hideDelay'] = isset($params['hideDelay']) ? (int) $params['hideDelay'] : null;
+		$opt['className'] = isset($params['className']) ? $params['className'] : null;
+		$opt['fixed']     = isset($params['fixed']) && $params['fixed'];
+		$opt['onShow']    = isset($params['onShow']) ? '\\' . $params['onShow'] : null;
+		$opt['onHide']    = isset($params['onHide']) ? '\\' . $params['onHide'] : null;
+
+		$options = JHtml::getJSObject($opt);
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		// Attach tooltips to document
+		JFactory::getDocument()->addScriptDeclaration(
+			"jQuery(function($) {
+			 $('$selector').each(function() {
+				var title = $(this).attr('title');
+				if (title) {
+					var parts = title.split('::', 2);
+					var mtelement = document.id(this);
+					mtelement.store('tip:title', parts[0]);
+					mtelement.store('tip:text', parts[1]);
+				}
+			});
+			var JTooltips = new Tips($('$selector').get(), $options);
+		});"
+		);
+
+		// Set static array
+		static::$loaded[__METHOD__][$sig] = true;
+
+		return;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for modal links.
+	 *
+	 * @param   string  $selector  The selector for which a modal behaviour is to be applied.
+	 * @param   array   $params    An array of parameters for the modal behaviour.
+	 *                             Options for the modal behaviour can be:
+	 *                            - ajaxOptions
+	 *                            - size
+	 *                            - shadow
+	 *                            - overlay
+	 *                            - onOpen
+	 *                            - onClose
+	 *                            - onUpdate
+	 *                            - onResize
+	 *                            - onShow
+	 *                            - onHide
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated 4.0  Use the modal equivalent from bootstrap
+	 */
+	public static function modal($selector = 'a.modal', $params = array())
+	{
+		$document = JFactory::getDocument();
+
+		// Load the necessary files if they haven't yet been loaded
+		if (!isset(static::$loaded[__METHOD__]))
+		{
+			// Include MooTools framework
+			static::framework(true);
+
+			// Load the JavaScript and css
+			JHtml::_('script', 'system/modal.js', array('framework' => true, 'version' => 'auto', 'relative' => true));
+			JHtml::_('stylesheet', 'system/modal.css', array('version' => 'auto', 'relative' => true));
+		}
+
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (isset(static::$loaded[__METHOD__][$sig]))
+		{
+			return;
+		}
+
+		JLog::add('JHtmlBehavior::modal is deprecated. Use the modal equivalent from bootstrap.', JLog::WARNING, 'deprecated');
+
+		// Setup options object
+		$opt['ajaxOptions']   = isset($params['ajaxOptions']) && is_array($params['ajaxOptions']) ? $params['ajaxOptions'] : null;
+		$opt['handler']       = isset($params['handler']) ? $params['handler'] : null;
+		$opt['parseSecure']   = isset($params['parseSecure']) ? (bool) $params['parseSecure'] : null;
+		$opt['closable']      = isset($params['closable']) ? (bool) $params['closable'] : null;
+		$opt['closeBtn']      = isset($params['closeBtn']) ? (bool) $params['closeBtn'] : null;
+		$opt['iframePreload'] = isset($params['iframePreload']) ? (bool) $params['iframePreload'] : null;
+		$opt['iframeOptions'] = isset($params['iframeOptions']) && is_array($params['iframeOptions']) ? $params['iframeOptions'] : null;
+		$opt['size']          = isset($params['size']) && is_array($params['size']) ? $params['size'] : null;
+		$opt['shadow']        = isset($params['shadow']) ? $params['shadow'] : null;
+		$opt['overlay']       = isset($params['overlay']) ? $params['overlay'] : null;
+		$opt['onOpen']        = isset($params['onOpen']) ? $params['onOpen'] : null;
+		$opt['onClose']       = isset($params['onClose']) ? $params['onClose'] : null;
+		$opt['onUpdate']      = isset($params['onUpdate']) ? $params['onUpdate'] : null;
+		$opt['onResize']      = isset($params['onResize']) ? $params['onResize'] : null;
+		$opt['onMove']        = isset($params['onMove']) ? $params['onMove'] : null;
+		$opt['onShow']        = isset($params['onShow']) ? $params['onShow'] : null;
+		$opt['onHide']        = isset($params['onHide']) ? $params['onHide'] : null;
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		if (isset($params['fullScreen']) && (bool) $params['fullScreen'])
+		{
+			$opt['size']      = array('x' => '\\jQuery(window).width() - 80', 'y' => '\\jQuery(window).height() - 80');
+		}
+
+		$options = JHtml::getJSObject($opt);
+
+		// Attach modal behavior to document
+		$document
+			->addScriptDeclaration(
+			"
+		jQuery(function($) {
+			SqueezeBox.initialize(" . $options . ");
+			SqueezeBox.assign($('" . $selector . "').get(), {
+				parse: 'rel'
+			});
+		});
+
+		window.jModalClose = function () {
+			SqueezeBox.close();
+		};
+		
+		// Add extra modal close functionality for tinyMCE-based editors
+		document.onreadystatechange = function () {
+			if (document.readyState == 'interactive' && typeof tinyMCE != 'undefined' && tinyMCE)
+			{
+				if (typeof window.jModalClose_no_tinyMCE === 'undefined')
+				{	
+					window.jModalClose_no_tinyMCE = typeof(jModalClose) == 'function'  ?  jModalClose  :  false;
+					
+					jModalClose = function () {
+						if (window.jModalClose_no_tinyMCE) window.jModalClose_no_tinyMCE.apply(this, arguments);
+						tinyMCE.activeEditor.windowManager.close();
+					};
+				}
+		
+				if (typeof window.SqueezeBoxClose_no_tinyMCE === 'undefined')
+				{
+					if (typeof(SqueezeBox) == 'undefined')  SqueezeBox = {};
+					window.SqueezeBoxClose_no_tinyMCE = typeof(SqueezeBox.close) == 'function'  ?  SqueezeBox.close  :  false;
+		
+					SqueezeBox.close = function () {
+						if (window.SqueezeBoxClose_no_tinyMCE)  window.SqueezeBoxClose_no_tinyMCE.apply(this, arguments);
+						tinyMCE.activeEditor.windowManager.close();
+					};
+				}
+			}
+		};
+		"
+		);
+
+		// Set static array
+		static::$loaded[__METHOD__][$sig] = true;
+
+		return;
+	}
+
+	/**
+	 * JavaScript behavior to allow shift select in grids
+	 *
+	 * @param   string  $id  The id of the form for which a multiselect behaviour is to be applied.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7
+	 */
+	public static function multiselect($id = 'adminForm')
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__][$id]))
+		{
+			return;
+		}
+
+		// Include core
+		static::core();
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		JHtml::_('script', 'system/multiselect.js', array('version' => 'auto', 'relative' => true));
+
+		// Attach multiselect to document
+		JFactory::getDocument()->addScriptDeclaration(
+			"jQuery(document).ready(function() {
+				Joomla.JMultiSelect('" . $id . "');
+			});"
+		);
+
+		// Set static array
+		static::$loaded[__METHOD__][$id] = true;
+
+		return;
+	}
+
+	/**
+	 * Add unobtrusive javascript support for a collapsible tree.
+	 *
+	 * @param   string  $id      An index
+	 * @param   array   $params  An array of options.
+	 * @param   array   $root    The root node
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function tree($id, $params = array(), $root = array())
+	{
+		// Include MooTools framework
+		static::framework();
+
+		JHtml::_('script', 'system/mootree.js', array('framework' => true, 'version' => 'auto', 'relative' => true));
+		JHtml::_('stylesheet', 'system/mootree.css', array('version' => 'auto', 'relative' => true));
+
+		if (isset(static::$loaded[__METHOD__][$id]))
+		{
+			return;
+		}
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		// Setup options object
+		$opt['div']   = array_key_exists('div', $params) ? $params['div'] : $id . '_tree';
+		$opt['mode']  = array_key_exists('mode', $params) ? $params['mode'] : 'folders';
+		$opt['grid']  = array_key_exists('grid', $params) ? '\\' . $params['grid'] : true;
+		$opt['theme'] = array_key_exists('theme', $params) ? $params['theme'] : JHtml::_('image', 'system/mootree.gif', '', array(), true, true);
+
+		// Event handlers
+		$opt['onExpand'] = array_key_exists('onExpand', $params) ? '\\' . $params['onExpand'] : null;
+		$opt['onSelect'] = array_key_exists('onSelect', $params) ? '\\' . $params['onSelect'] : null;
+		$opt['onClick']  = array_key_exists('onClick', $params) ? '\\' . $params['onClick']
+		: '\\function(node){  window.open(node.data.url, node.data.target != null ? node.data.target : \'_self\'); }';
+
+		$options = JHtml::getJSObject($opt);
+
+		// Setup root node
+		$rt['text']     = array_key_exists('text', $root) ? $root['text'] : 'Root';
+		$rt['id']       = array_key_exists('id', $root) ? $root['id'] : null;
+		$rt['color']    = array_key_exists('color', $root) ? $root['color'] : null;
+		$rt['open']     = array_key_exists('open', $root) ? '\\' . $root['open'] : true;
+		$rt['icon']     = array_key_exists('icon', $root) ? $root['icon'] : null;
+		$rt['openicon'] = array_key_exists('openicon', $root) ? $root['openicon'] : null;
+		$rt['data']     = array_key_exists('data', $root) ? $root['data'] : null;
+		$rootNode = JHtml::getJSObject($rt);
+
+		$treeName = array_key_exists('treeName', $params) ? $params['treeName'] : '';
+
+		$js = '		jQuery(function(){
+			tree' . $treeName . ' = new MooTreeControl(' . $options . ',' . $rootNode . ');
+			tree' . $treeName . '.adopt(\'' . $id . '\');})';
+
+		// Attach tooltips to document
+		$document = JFactory::getDocument();
+		$document->addScriptDeclaration($js);
+
+		// Set static array
+		static::$loaded[__METHOD__][$id] = true;
+
+		return;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for a calendar control.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 *
+	 * @deprecated 4.0
+	 */
+	public static function calendar()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		JLog::add('JHtmlBehavior::calendar is deprecated as the static assets are being loaded in the relative layout.', JLog::WARNING, 'deprecated');
+
+		$document = JFactory::getDocument();
+		$tag      = JFactory::getLanguage()->getTag();
+		$attribs  = array('title' => JText::_('JLIB_HTML_BEHAVIOR_GREEN'), 'media' => 'all');
+
+		JHtml::_('stylesheet', 'system/calendar-jos.css', array('version' => 'auto', 'relative' => true), $attribs);
+		JHtml::_('script', $tag . '/calendar.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('script', $tag . '/calendar-setup.js', array('version' => 'auto', 'relative' => true));
+
+		$translation = static::calendartranslation();
+
+		if ($translation)
+		{
+			$document->addScriptDeclaration($translation);
+		}
+
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for a color picker.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7
+	 *
+	 * @deprecated 4.0 Use directly the field or the layout
+	 */
+	public static function colorpicker()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		JHtml::_('script', 'jui/jquery.minicolors.min.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('stylesheet', 'jui/jquery.minicolors.css', array('version' => 'auto', 'relative' => true));
+		JFactory::getDocument()->addScriptDeclaration("
+				jQuery(document).ready(function (){
+					jQuery('.minicolors').each(function() {
+						jQuery(this).minicolors({
+							control: jQuery(this).attr('data-control') || 'hue',
+							format: jQuery(this).attr('data-validate') === 'color'
+								? 'hex'
+								: (jQuery(this).attr('data-format') === 'rgba'
+									? 'rgb'
+									: jQuery(this).attr('data-format'))
+								|| 'hex',
+							keywords: jQuery(this).attr('data-keywords') || '',
+							opacity: jQuery(this).attr('data-format') === 'rgba' ? true : false || false,
+							position: jQuery(this).attr('data-position') || 'default',
+							theme: 'bootstrap'
+						});
+					});
+				});
+			"
+		);
+
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support for a simple color picker.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 *
+	 * @deprecated 4.0 Use directly the field or the layout
+	 */
+	public static function simplecolorpicker()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		JHtml::_('script', 'jui/jquery.simplecolors.min.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('stylesheet', 'jui/jquery.simplecolors.css', array('version' => 'auto', 'relative' => true));
+		JFactory::getDocument()->addScriptDeclaration("
+				jQuery(document).ready(function (){
+					jQuery('select.simplecolors').simplecolors();
+				});
+			"
+		);
+
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Keep session alive, for example, while editing or creating an article.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public static function keepalive()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		$session = JFactory::getSession();
+
+		// If the handler is not 'Database', we set a fixed, small refresh value (here: 5 min)
+		$refreshTime = 300;
+
+		if ($session->storeName === 'database')
+		{
+			$lifeTime    = $session->getExpire();
+			$refreshTime = $lifeTime <= 60 ? 45 : $lifeTime - 60;
+
+			// The longest refresh period is one hour to prevent integer overflow.
+			if ($refreshTime > 3600 || $refreshTime <= 0)
+			{
+				$refreshTime = 3600;
+			}
+		}
+
+		// If we are in the frontend or logged in as a user, we can use the ajax component to reduce the load
+		$uri = 'index.php' . (JFactory::getApplication()->isClient('site') || !JFactory::getUser()->guest ? '?option=com_ajax&format=json' : '');
+
+		// Include core and polyfill for browsers lower than IE 9.
+		static::core();
+		static::polyfill('event', 'lt IE 9');
+
+		// Add keepalive script options.
+		JFactory::getDocument()->addScriptOptions('system.keepalive', array('interval' => $refreshTime * 1000, 'uri' => JRoute::_($uri)));
+
+		// Add script.
+		JHtml::_('script', 'system/keepalive.js', array('version' => 'auto', 'relative' => true));
+
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+
+	/**
+	 * Highlight some words via Javascript.
+	 *
+	 * @param   array   $terms      Array of words that should be highlighted.
+	 * @param   string  $start      ID of the element that marks the begin of the section in which words
+	 *                              should be highlighted. Note this element will be removed from the DOM.
+	 * @param   string  $end        ID of the element that end this section.
+	 *                              Note this element will be removed from the DOM.
+	 * @param   string  $className  Class name of the element highlights are wrapped in.
+	 * @param   string  $tag        Tag that will be used to wrap the highlighted words.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public static function highlighter(array $terms, $start = 'highlighter-start', $end = 'highlighter-end', $className = 'highlight', $tag = 'span')
+	{
+		$sig = md5(serialize(array($terms, $start, $end)));
+
+		if (isset(static::$loaded[__METHOD__][$sig]))
+		{
+			return;
+		}
+
+		$terms = array_filter($terms, 'strlen');
+
+		// Nothing to Highlight
+		if (empty($terms))
+		{
+			static::$loaded[__METHOD__][$sig] = true;
+
+			return;
+		}
+
+		// Include core
+		static::core();
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		JHtml::_('script', 'system/highlighter.js', array('version' => 'auto', 'relative' => true));
+
+		foreach ($terms as $i => $term)
+		{
+			$terms[$i] = JFilterOutput::stringJSSafe($term);
+		}
+
+		$document = JFactory::getDocument();
+		$document->addScriptDeclaration("
+			jQuery(function ($) {
+				var start = document.getElementById('" . $start . "');
+				var end = document.getElementById('" . $end . "');
+				if (!start || !end || !Joomla.Highlighter) {
+					return true;
+				}
+				highlighter = new Joomla.Highlighter({
+					startElement: start,
+					endElement: end,
+					className: '" . $className . "',
+					onlyWords: false,
+					tag: '" . $tag . "'
+				}).highlight([\"" . implode('","', $terms) . "\"]);
+				$(start).remove();
+				$(end).remove();
+			});
+		");
+
+		static::$loaded[__METHOD__][$sig] = true;
+
+		return;
+	}
+
+	/**
+	 * Break us out of any containing iframes
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 *
+	 * @deprecated  4.0  Add a X-Frame-Options HTTP Header with the SAMEORIGIN value instead.
+	 */
+	public static function noframes()
+	{
+		JLog::add(__METHOD__ . ' is deprecated, add a X-Frame-Options HTTP Header with the SAMEORIGIN value instead.', JLog::WARNING, 'deprecated');
+
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Include core
+		static::core();
+
+		// Include jQuery
+		JHtml::_('jquery.framework');
+
+		$js = 'jQuery(function () {
+			if (top == self) {
+				document.documentElement.style.display = "block";
+			}
+			else
+			{
+				top.location = self.location;
+			}
+
+			// Firefox fix
+			jQuery("input[autofocus]").focus();
+		})';
+		$document = JFactory::getDocument();
+		$document->addStyleDeclaration('html { display:none }');
+		$document->addScriptDeclaration($js);
+
+		JFactory::getApplication()->setHeader('X-Frame-Options', 'SAMEORIGIN');
+
+		static::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Internal method to get a JavaScript object notation string from an array
+	 *
+	 * @param   array  $array  The array to convert to JavaScript object notation
+	 *
+	 * @return  string  JavaScript object notation representation of the array
+	 *
+	 * @since       1.5
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use JHtml::getJSObject() instead.
+	 */
+	protected static function _getJSObject($array = array())
+	{
+		JLog::add('JHtmlBehavior::_getJSObject() is deprecated. JHtml::getJSObject() instead..', JLog::WARNING, 'deprecated');
+
+		return JHtml::getJSObject($array);
+	}
+
+	/**
+	 * Add unobtrusive JavaScript support to keep a tab state.
+	 *
+	 * Note that keeping tab state only works for inner tabs if in accordance with the following example:
+	 *
+	 * ```
+	 * parent tab = permissions
+	 * child tab = permission-<identifier>
+	 * ```
+	 *
+	 * Each tab header `<a>` tag also should have a unique href attribute
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function tabstate()
+	{
+		if (isset(self::$loaded[__METHOD__]))
+		{
+			return;
+		}
+		// Include jQuery
+		JHtml::_('jquery.framework');
+		JHtml::_('behavior.polyfill', array('filter','xpath'));
+		JHtml::_('script', 'system/tabs-state.js', array('version' => 'auto', 'relative' => true));
+		self::$loaded[__METHOD__] = true;
+	}
+
+	/**
+	 * Add javascript polyfills.
+	 *
+	 * @param   string|array  $polyfillTypes       The polyfill type(s). Examples: event, array('event', 'classlist').
+	 * @param   string        $conditionalBrowser  An IE conditional expression. Example: lt IE 9 (lower than IE 9).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public static function polyfill($polyfillTypes = null, $conditionalBrowser = null)
+	{
+		if ($polyfillTypes === null)
+		{
+			return;
+		}
+
+		foreach ((array) $polyfillTypes as $polyfillType)
+		{
+			$sig = md5(serialize(array($polyfillType, $conditionalBrowser)));
+
+			// Only load once
+			if (isset(static::$loaded[__METHOD__][$sig]))
+			{
+				continue;
+			}
+
+			// If include according to browser.
+			$scriptOptions = array('version' => 'auto', 'relative' => true);
+			$scriptOptions = $conditionalBrowser !== null ? array_replace($scriptOptions, array('conditional' => $conditionalBrowser)) : $scriptOptions;
+
+			JHtml::_('script', 'system/polyfill.' . $polyfillType . '.js', $scriptOptions);
+
+			// Set static array
+			static::$loaded[__METHOD__][$sig] = true;
+		}
+	}
+
+	/**
+	 * Internal method to translate the JavaScript Calendar
+	 *
+	 * @return  string  JavaScript that translates the object
+	 *
+	 * @since   1.5
+	 */
+	protected static function calendartranslation()
+	{
+		static $jsscript = 0;
+
+		// Guard clause, avoids unnecessary nesting
+		if ($jsscript)
+		{
+			return false;
+		}
+
+		$jsscript = 1;
+
+		// To keep the code simple here, run strings through JText::_() using array_map()
+		$callback = array('JText', '_');
+		$weekdays_full = array_map(
+			$callback, array(
+				'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY', 'SUNDAY',
+			)
+		);
+		$weekdays_short = array_map(
+			$callback,
+			array(
+				'SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT', 'SUN',
+			)
+		);
+		$months_long = array_map(
+			$callback, array(
+				'JANUARY', 'FEBRUARY', 'MARCH', 'APRIL', 'MAY', 'JUNE',
+				'JULY', 'AUGUST', 'SEPTEMBER', 'OCTOBER', 'NOVEMBER', 'DECEMBER',
+			)
+		);
+		$months_short = array_map(
+			$callback, array(
+				'JANUARY_SHORT', 'FEBRUARY_SHORT', 'MARCH_SHORT', 'APRIL_SHORT', 'MAY_SHORT', 'JUNE_SHORT',
+				'JULY_SHORT', 'AUGUST_SHORT', 'SEPTEMBER_SHORT', 'OCTOBER_SHORT', 'NOVEMBER_SHORT', 'DECEMBER_SHORT',
+			)
+		);
+
+		// This will become an object in Javascript but define it first in PHP for readability
+		$today = " " . JText::_('JLIB_HTML_BEHAVIOR_TODAY') . " ";
+		$text = array(
+			'INFO'           => JText::_('JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR'),
+			'ABOUT'          => "DHTML Date/Time Selector\n"
+				. "(c) dynarch.com 20022005 / Author: Mihai Bazon\n"
+				. "For latest version visit: http://www.dynarch.com/projects/calendar/\n"
+				. "Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details."
+				. "\n\n"
+				. JText::_('JLIB_HTML_BEHAVIOR_DATE_SELECTION')
+				. JText::_('JLIB_HTML_BEHAVIOR_YEAR_SELECT')
+				. JText::_('JLIB_HTML_BEHAVIOR_MONTH_SELECT')
+				. JText::_('JLIB_HTML_BEHAVIOR_HOLD_MOUSE'),
+			'ABOUT_TIME'      => "\n\n"
+				. "Time selection:\n"
+				. " Click on any of the time parts to increase it\n"
+				. " or Shiftclick to decrease it\n"
+				. " or click and drag for faster selection.",
+			'PREV_YEAR'       => JText::_('JLIB_HTML_BEHAVIOR_PREV_YEAR_HOLD_FOR_MENU'),
+			'PREV_MONTH'      => JText::_('JLIB_HTML_BEHAVIOR_PREV_MONTH_HOLD_FOR_MENU'),
+			'GO_TODAY'        => JText::_('JLIB_HTML_BEHAVIOR_GO_TODAY'),
+			'NEXT_MONTH'      => JText::_('JLIB_HTML_BEHAVIOR_NEXT_MONTH_HOLD_FOR_MENU'),
+			'SEL_DATE'        => JText::_('JLIB_HTML_BEHAVIOR_SELECT_DATE'),
+			'DRAG_TO_MOVE'    => JText::_('JLIB_HTML_BEHAVIOR_DRAG_TO_MOVE'),
+			'PART_TODAY'      => $today,
+			'DAY_FIRST'       => JText::_('JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST'),
+			'WEEKEND'         => JFactory::getLanguage()->getWeekEnd(),
+			'CLOSE'           => JText::_('JLIB_HTML_BEHAVIOR_CLOSE'),
+			'TODAY'           => JText::_('JLIB_HTML_BEHAVIOR_TODAY'),
+			'TIME_PART'       => JText::_('JLIB_HTML_BEHAVIOR_SHIFT_CLICK_OR_DRAG_TO_CHANGE_VALUE'),
+			'DEF_DATE_FORMAT' => "%Y%m%d",
+			'TT_DATE_FORMAT'  => JText::_('JLIB_HTML_BEHAVIOR_TT_DATE_FORMAT'),
+			'WK'              => JText::_('JLIB_HTML_BEHAVIOR_WK'),
+			'TIME'            => JText::_('JLIB_HTML_BEHAVIOR_TIME'),
+		);
+
+		return 'Calendar._DN = ' . json_encode($weekdays_full) . ';'
+			. ' Calendar._SDN = ' . json_encode($weekdays_short) . ';'
+			. ' Calendar._FD = 0;'
+			. ' Calendar._MN = ' . json_encode($months_long) . ';'
+			. ' Calendar._SMN = ' . json_encode($months_short) . ';'
+			. ' Calendar._TT = ' . json_encode($text) . ';';
+	}
+}
diff --git a/core/libraries/cms/html/bootstrap.php b/core/libraries/cms/html/bootstrap.php
new file mode 100644
index 00000000..36619880
--- /dev/null
+++ b/core/libraries/cms/html/bootstrap.php
@@ -0,0 +1,931 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for Bootstrap elements.
+ *
+ * @since  3.0
+ */
+abstract class JHtmlBootstrap
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.0
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Add javascript support for the Bootstrap affix plugin
+	 *
+	 * @param   string  $selector  Unique selector for the element to be affixed.
+	 * @param   array   $params    An array of options.
+	 *                             Options for the affix plugin can be:
+	 *                             - offset  number|function|object  Pixels to offset from screen when calculating position of scroll.
+	 *                                                               If a single number is provided, the offset will be applied in both top
+	 *                                                               and left directions. To listen for a single direction, or multiple
+	 *                                                               unique offsets, just provide an object offset: { x: 10 }.
+	 *                                                               Use a function when you need to dynamically provide an offset
+	 *                                                               (useful for some responsive designs).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 *
+	 * @deprecated  4.0  Bootstrap 4.0 dropped this so will Joomla.
+	 */
+	public static function affix($selector = 'affix', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (!isset(static::$loaded[__METHOD__][$sig]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['offset'] = isset($params['offset']) ? $params['offset'] : 10;
+
+			$options = JHtml::getJSObject($opt);
+
+			// Attach affix to document
+			JFactory::getDocument()->addScriptDeclaration(
+				'jQuery(function($){ $(' . json_encode('#' . $selector) . ').affix(' . $options . '); });'
+			);
+
+			// Set static array
+			static::$loaded[__METHOD__][$sig] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap alerts
+	 *
+	 * @param   string  $selector  Common class for the alerts
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function alert($selector = 'alert')
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__][$selector]))
+		{
+			return;
+		}
+
+		// Include Bootstrap framework
+		JHtml::_('bootstrap.framework');
+
+		// Attach the alerts to the document
+		JFactory::getDocument()->addScriptDeclaration(
+			'jQuery(function($){ $(' . json_encode('.' . $selector) . ').alert(); });'
+		);
+
+		static::$loaded[__METHOD__][$selector] = true;
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap buttons
+	 *
+	 * @param   string  $selector  Common class for the buttons
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public static function button($selector = 'button')
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__][$selector]))
+		{
+			return;
+		}
+
+		// Include Bootstrap framework
+		JHtml::_('bootstrap.framework');
+
+		// Attach the button to the document
+		JFactory::getDocument()->addScriptDeclaration(
+			'jQuery(function($){ $(' . json_encode('.' . $selector) . ').button(); });'
+		);
+
+		static::$loaded[__METHOD__][$selector] = true;
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap carousels
+	 *
+	 * @param   string  $selector  Common class for the carousels.
+	 * @param   array   $params    An array of options for the carousel.
+	 *                             Options for the carousel can be:
+	 *                             - interval  number  The amount of time to delay between automatically cycling an item.
+	 *                                                 If false, carousel will not automatically cycle.
+	 *                             - pause     string  Pauses the cycling of the carousel on mouseenter and resumes the cycling
+	 *                                                 of the carousel on mouseleave.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function carousel($selector = 'carousel', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (!isset(static::$loaded[__METHOD__][$sig]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['interval'] = isset($params['interval']) ? (int) $params['interval'] : 5000;
+			$opt['pause']    = isset($params['pause']) ? $params['pause'] : 'hover';
+
+			$options = JHtml::getJSObject($opt);
+
+			// Attach the carousel to document
+			JFactory::getDocument()->addScriptDeclaration(
+				'jQuery(function($){ $(' . json_encode('.' . $selector) . ').carousel(' . $options . '); });'
+			);
+
+			// Set static array
+			static::$loaded[__METHOD__][$sig] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap dropdowns
+	 *
+	 * @param   string  $selector  Common class for the dropdowns
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function dropdown($selector = 'dropdown-toggle')
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__][$selector]))
+		{
+			return;
+		}
+
+		// Include Bootstrap framework
+		JHtml::_('bootstrap.framework');
+
+		// Attach the dropdown to the document
+		JFactory::getDocument()->addScriptDeclaration(
+			'jQuery(function($){ $(' . json_encode('.' . $selector) . ').dropdown(); });'
+		);
+
+		static::$loaded[__METHOD__][$selector] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to load the Bootstrap JavaScript framework into the document head
+	 *
+	 * If debugging mode is on an uncompressed version of Bootstrap is included for easier debugging.
+	 *
+	 * @param   mixed  $debug  Is debugging mode on? [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function framework($debug = null)
+	{
+		// Only load once
+		if (!empty(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Load jQuery
+		JHtml::_('jquery.framework');
+
+		// If no debugging value is set, use the configuration setting
+		if ($debug === null)
+		{
+			$debug = JDEBUG;
+		}
+
+		JHtml::_('script', 'jui/bootstrap.min.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap modals
+	 *
+	 * @param   string  $selector  The ID selector for the modal.
+	 * @param   array   $params    An array of options for the modal.
+	 *                             Options for the modal can be:
+	 *                             - backdrop  boolean  Includes a modal-backdrop element.
+	 *                             - keyboard  boolean  Closes the modal when escape key is pressed.
+	 *                             - show      boolean  Shows the modal when initialized.
+	 *                             - remote    string   An optional remote URL to load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  This method was used by the old renderModal() implementation.
+	 *                   Since the new implementation it is unneeded and the broken JS it was injecting could create issues
+	 *                   As a case, please see: https://github.com/joomla/joomla-cms/pull/6918
+	 */
+	public static function modal($selector = 'modal', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (!isset(static::$loaded[__METHOD__][$sig]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['backdrop'] = isset($params['backdrop']) ? (boolean) $params['backdrop'] : true;
+			$opt['keyboard'] = isset($params['keyboard']) ? (boolean) $params['keyboard'] : true;
+			$opt['show']     = isset($params['show']) ? (boolean) $params['show'] : false;
+			$opt['remote']   = isset($params['remote']) ? $params['remote'] : '';
+
+			$options = JHtml::getJSObject($opt);
+
+			// Attach the modal to document
+			JFactory::getDocument()->addScriptDeclaration(
+				'jQuery(function($){ $(' . json_encode('#' . $selector) . ').modal(' . $options . '); });'
+			);
+
+			// Set static array
+			static::$loaded[__METHOD__][$sig] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Method to render a Bootstrap modal
+	 *
+	 * @param   string  $selector  The ID selector for the modal.
+	 * @param   array   $params    An array of options for the modal.
+	 *                             Options for the modal can be:
+	 *                             - title        string   The modal title
+	 *                             - backdrop     mixed    A boolean select if a modal-backdrop element should be included (default = true)
+	 *                                                     The string 'static' includes a backdrop which doesn't close the modal on click.
+	 *                             - keyboard     boolean  Closes the modal when escape key is pressed (default = true)
+	 *                             - closeButton  boolean  Display modal close button (default = true)
+	 *                             - animation    boolean  Fade in from the top of the page (default = true)
+	 *                             - footer       string   Optional markup for the modal footer
+	 *                             - url          string   URL of a resource to be inserted as an `<iframe>` inside the modal body
+	 *                             - height       string   height of the `<iframe>` containing the remote resource
+	 *                             - width        string   width of the `<iframe>` containing the remote resource
+	 * @param   string  $body      Markup for the modal body. Appended after the `<iframe>` if the URL option is set
+	 *
+	 * @return  string  HTML markup for a modal
+	 *
+	 * @since   3.0
+	 */
+	public static function renderModal($selector = 'modal', $params = array(), $body = '')
+	{
+		// Include Bootstrap framework
+		JHtml::_('bootstrap.framework');
+
+		$layoutData = array(
+			'selector' => $selector,
+			'params'   => $params,
+			'body'     => $body,
+		);
+
+		return JLayoutHelper::render('joomla.modal.main', $layoutData);
+	}
+
+	/**
+	 * Add javascript support for Bootstrap popovers
+	 *
+	 * Use element's Title as popover content
+	 *
+	 * @param   string  $selector  Selector for the popover
+	 * @param   array   $params    An array of options for the popover.
+	 *                  Options for the popover can be:
+	 *                      animation  boolean          apply a css fade transition to the popover
+	 *                      html       boolean          Insert HTML into the popover. If false, jQuery's text method will be used to insert
+	 *                                                  content into the dom.
+	 *                      placement  string|function  how to position the popover - top | bottom | left | right
+	 *                      selector   string           If a selector is provided, popover objects will be delegated to the specified targets.
+	 *                      trigger    string           how popover is triggered - hover | focus | manual
+	 *                      title      string|function  default title value if `title` tag isn't present
+	 *                      content    string|function  default content value if `data-content` attribute isn't present
+	 *                      delay      number|object    delay showing and hiding the popover (ms) - does not apply to manual trigger type
+	 *                                                  If a number is supplied, delay is applied to both hide/show
+	 *                                                  Object structure is: delay: { show: 500, hide: 100 }
+	 *                      container  string|boolean   Appends the popover to a specific element: { container: 'body' }
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function popover($selector = '.hasPopover', $params = array())
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__][$selector]))
+		{
+			return;
+		}
+
+		// Include Bootstrap framework
+		JHtml::_('bootstrap.framework');
+
+		$opt['animation'] = isset($params['animation']) ? $params['animation'] : null;
+		$opt['html']      = isset($params['html']) ? $params['html'] : true;
+		$opt['placement'] = isset($params['placement']) ? $params['placement'] : null;
+		$opt['selector']  = isset($params['selector']) ? $params['selector'] : null;
+		$opt['title']     = isset($params['title']) ? $params['title'] : null;
+		$opt['trigger']   = isset($params['trigger']) ? $params['trigger'] : 'hover focus';
+		$opt['content']   = isset($params['content']) ? $params['content'] : null;
+		$opt['delay']     = isset($params['delay']) ? $params['delay'] : null;
+		$opt['container'] = isset($params['container']) ? $params['container'] : 'body';
+
+		$options = JHtml::getJSObject($opt);
+
+		$initFunction = 'function initPopovers (event, container) { ' .
+				'$(container || document).find(' . json_encode($selector) . ').popover(' . $options . ');' .
+			'}';
+
+		// Attach the popover to the document
+		JFactory::getDocument()->addScriptDeclaration(
+			'jQuery(function($){ initPopovers(); $("body").on("subform-row-add", initPopovers); ' . $initFunction . ' });'
+		);
+
+		static::$loaded[__METHOD__][$selector] = true;
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap ScrollSpy
+	 *
+	 * @param   string  $selector  The ID selector for the ScrollSpy element.
+	 * @param   array   $params    An array of options for the ScrollSpy.
+	 *                             Options for the ScrollSpy can be:
+	 *                             - offset  number  Pixels to offset from top when calculating position of scroll.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function scrollspy($selector = 'navbar', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (!isset(static::$loaded[__METHOD__][$sig]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['offset'] = isset($params['offset']) ? (int) $params['offset'] : 10;
+
+			$options = JHtml::getJSObject($opt);
+
+			// Attach ScrollSpy to document
+			JFactory::getDocument()->addScriptDeclaration(
+				'jQuery(function($){ $(' . json_encode('#' . $selector) . ').scrollspy(' . $options . '); });'
+			);
+
+			// Set static array
+			static::$loaded[__METHOD__][$sig] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap tooltips
+	 *
+	 * Add a title attribute to any element in the form
+	 * title="title::text"
+	 *
+	 * @param   string  $selector  The ID selector for the tooltip.
+	 * @param   array   $params    An array of options for the tooltip.
+	 *                             Options for the tooltip can be:
+	 *                             - animation  boolean          Apply a CSS fade transition to the tooltip
+	 *                             - html       boolean          Insert HTML into the tooltip. If false, jQuery's text method will be used to insert
+	 *                                                           content into the dom.
+	 *                             - placement  string|function  How to position the tooltip - top | bottom | left | right
+	 *                             - selector   string           If a selector is provided, tooltip objects will be delegated to the specified targets.
+	 *                             - title      string|function  Default title value if `title` tag isn't present
+	 *                             - trigger    string           How tooltip is triggered - hover | focus | manual
+	 *                             - delay      integer          Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type
+	 *                                                           If a number is supplied, delay is applied to both hide/show
+	 *                                                           Object structure is: delay: { show: 500, hide: 100 }
+	 *                             - container  string|boolean   Appends the popover to a specific element: { container: 'body' }
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function tooltip($selector = '.hasTooltip', $params = array())
+	{
+		if (!isset(static::$loaded[__METHOD__][$selector]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['animation'] = isset($params['animation']) ? (boolean) $params['animation'] : null;
+			$opt['html']      = isset($params['html']) ? (boolean) $params['html'] : true;
+			$opt['placement'] = isset($params['placement']) ? (string) $params['placement'] : null;
+			$opt['selector']  = isset($params['selector']) ? (string) $params['selector'] : null;
+			$opt['title']     = isset($params['title']) ? (string) $params['title'] : null;
+			$opt['trigger']   = isset($params['trigger']) ? (string) $params['trigger'] : null;
+			$opt['delay']     = isset($params['delay']) ? (is_array($params['delay']) ? $params['delay'] : (int) $params['delay']) : null;
+			$opt['container'] = isset($params['container']) ? $params['container'] : 'body';
+			$opt['template']  = isset($params['template']) ? (string) $params['template'] : null;
+			$onShow           = isset($params['onShow']) ? (string) $params['onShow'] : null;
+			$onShown          = isset($params['onShown']) ? (string) $params['onShown'] : null;
+			$onHide           = isset($params['onHide']) ? (string) $params['onHide'] : null;
+			$onHidden         = isset($params['onHidden']) ? (string) $params['onHidden'] : null;
+
+			$options = JHtml::getJSObject($opt);
+
+			// Build the script.
+			$script = array('$(container).find(' . json_encode($selector) . ').tooltip(' . $options . ')');
+
+			if ($onShow)
+			{
+				$script[] = 'on("show.bs.tooltip", ' . $onShow . ')';
+			}
+
+			if ($onShown)
+			{
+				$script[] = 'on("shown.bs.tooltip", ' . $onShown . ')';
+			}
+
+			if ($onHide)
+			{
+				$script[] = 'on("hide.bs.tooltip", ' . $onHide . ')';
+			}
+
+			if ($onHidden)
+			{
+				$script[] = 'on("hidden.bs.tooltip", ' . $onHidden . ')';
+			}
+
+			$initFunction = 'function initTooltips (event, container) { ' .
+				'container = container || document;' .
+				implode('.', $script) . ';' .
+				'}';
+
+			// Attach tooltips to document
+			JFactory::getDocument()
+				->addScriptDeclaration('jQuery(function($){ initTooltips(); $("body").on("subform-row-add", initTooltips); ' . $initFunction . ' });');
+
+			// Set static array
+			static::$loaded[__METHOD__][$selector] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Loads js and css files needed by Bootstrap Tooltip Extended plugin
+	 *
+	 * @param   boolean  $extended  If true, bootstrap-tooltip-extended.js and .css files are loaded
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 *
+	 * @deprecated  4.0 No replacement, use Bootstrap tooltips.
+	 */
+	public static function tooltipExtended($extended = true)
+	{
+		if ($extended)
+		{
+			JHtml::_('script', 'jui/bootstrap-tooltip-extended.min.js', array('version' => 'auto', 'relative' => true));
+			JHtml::_('stylesheet', 'jui/bootstrap-tooltip-extended.css', array('version' => 'auto', 'relative' => true));
+		}
+	}
+
+	/**
+	 * Add javascript support for Bootstrap typeahead
+	 *
+	 * @param   string  $selector  The selector for the typeahead element.
+	 * @param   array   $params    An array of options for the typeahead element.
+	 *                             Options for the tooltip can be:
+	 *                             - source       array, function  The data source to query against. May be an array of strings or a function.
+	 *                                                             The function is passed two arguments, the query value in the input field and the
+	 *                                                             process callback. The function may be used synchronously by returning the data
+	 *                                                             source directly or asynchronously via the process callback's single argument.
+	 *                             - items        number           The max number of items to display in the dropdown.
+	 *                             - minLength    number           The minimum character length needed before triggering autocomplete suggestions
+	 *                             - matcher      function         The method used to determine if a query matches an item. Accepts a single argument,
+	 *                                                             the item against which to test the query. Access the current query with this.query.
+	 *                                                             Return a boolean true if query is a match.
+	 *                             - sorter       function         Method used to sort autocomplete results. Accepts a single argument items and has
+	 *                                                             the scope of the typeahead instance. Reference the current query with this.query.
+	 *                             - updater      function         The method used to return selected item. Accepts a single argument, the item and
+	 *                                                             has the scope of the typeahead instance.
+	 *                             - highlighter  function         Method used to highlight autocomplete results. Accepts a single argument item and
+	 *                                                             has the scope of the typeahead instance. Should return html.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 *
+	 * @deprecated  4.0  Bootstrap 4.0 dropped this so will Joomla.
+	 */
+	public static function typeahead($selector = '.typeahead', $params = array())
+	{
+		if (!isset(static::$loaded[__METHOD__][$selector]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['source']      = isset($params['source']) ? $params['source'] : null;
+			$opt['items']       = isset($params['items']) ? (int) $params['items'] : 8;
+			$opt['minLength']   = isset($params['minLength']) ? (int) $params['minLength'] : 1;
+			$opt['matcher']     = isset($params['matcher']) ? (string) $params['matcher'] : null;
+			$opt['sorter']      = isset($params['sorter']) ? (string) $params['sorter'] : null;
+			$opt['updater']     = isset($params['updater']) ? (string) $params['updater'] : null;
+			$opt['highlighter'] = isset($params['highlighter']) ? (int) $params['highlighter'] : null;
+
+			$options = JHtml::getJSObject($opt);
+
+			// Attach typehead to document
+			JFactory::getDocument()->addScriptDeclaration(
+				'jQuery(function($){ $(' . json_encode($selector) . ').typeahead(' . $options . '); });'
+			);
+
+			// Set static array
+			static::$loaded[__METHOD__][$selector] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Add javascript support for Bootstrap accordians and insert the accordian
+	 *
+	 * @param   string  $selector  The ID selector for the tooltip.
+	 * @param   array   $params    An array of options for the tooltip.
+	 *                             Options for the tooltip can be:
+	 *                             - parent  selector  If selector then all collapsible elements under the specified parent will be closed when this
+	 *                                                 collapsible item is shown. (similar to traditional accordion behavior)
+	 *                             - toggle  boolean   Toggles the collapsible element on invocation
+	 *                             - active  string    Sets the active slide during load
+	 *
+	 *                             - onShow    function  This event fires immediately when the show instance method is called.
+	 *                             - onShown   function  This event is fired when a collapse element has been made visible to the user
+	 *                                                   (will wait for css transitions to complete).
+	 *                             - onHide    function  This event is fired immediately when the hide method has been called.
+	 *                             - onHidden  function  This event is fired when a collapse element has been hidden from the user
+	 *                                                   (will wait for css transitions to complete).
+	 *
+	 * @return  string  HTML for the accordian
+	 *
+	 * @since   3.0
+	 */
+	public static function startAccordion($selector = 'myAccordian', $params = array())
+	{
+		if (!isset(static::$loaded[__METHOD__][$selector]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['parent'] = isset($params['parent']) ? ($params['parent'] == true ? '#' . $selector : $params['parent']) : false;
+			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : !($opt['parent'] === false || isset($params['active']));
+			$onShow = isset($params['onShow']) ? (string) $params['onShow'] : null;
+			$onShown = isset($params['onShown']) ? (string) $params['onShown'] : null;
+			$onHide = isset($params['onHide']) ? (string) $params['onHide'] : null;
+			$onHidden = isset($params['onHidden']) ? (string) $params['onHidden'] : null;
+
+			$options = JHtml::getJSObject($opt);
+
+			$opt['active'] = isset($params['active']) ? (string) $params['active'] : '';
+
+			// Build the script.
+			$script = array();
+			$script[] = "jQuery(function($){";
+			$script[] = "\t$('#" . $selector . "').collapse(" . $options . ")";
+
+			if ($onShow)
+			{
+				$script[] = "\t.on('show', " . $onShow . ")";
+			}
+
+			if ($onShown)
+			{
+				$script[] = "\t.on('shown', " . $onShown . ")";
+			}
+
+			if ($onHide)
+			{
+				$script[] = "\t.on('hideme', " . $onHide . ")";
+			}
+
+			if ($onHidden)
+			{
+				$script[] = "\t.on('hidden', " . $onHidden . ")";
+			}
+
+			$parents = array_key_exists(__METHOD__, static::$loaded) ? array_filter(array_column(static::$loaded[__METHOD__], 'parent')) : array();
+
+			if ($opt['parent'] && empty($parents))
+			{
+				$script[] = "
+					$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+						var \$this   = $(this), href
+						var parent  = \$this.attr('data-parent')
+						var \$parent = parent && $(parent)
+
+						if (\$parent) \$parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not(\$this).addClass('collapsed')
+					})";
+			}
+
+			$script[] = "});";
+
+			// Attach accordion to document
+			JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+			// Set static array
+			static::$loaded[__METHOD__][$selector] = $opt;
+
+			return '<div id="' . $selector . '" class="accordion">';
+		}
+	}
+
+	/**
+	 * Close the current accordion
+	 *
+	 * @return  string  HTML to close the accordian
+	 *
+	 * @since   3.0
+	 */
+	public static function endAccordion()
+	{
+		return '</div>';
+	}
+
+	/**
+	 * Begins the display of a new accordion slide.
+	 *
+	 * @param   string  $selector  Identifier of the accordion group.
+	 * @param   string  $text      Text to display.
+	 * @param   string  $id        Identifier of the slide.
+	 * @param   string  $class     Class of the accordion group.
+	 *
+	 * @return  string  HTML to add the slide
+	 *
+	 * @since   3.0
+	 */
+	public static function addSlide($selector, $text, $id, $class = '')
+	{
+		$in = (static::$loaded[__CLASS__ . '::startAccordion'][$selector]['active'] == $id) ? ' in' : '';
+		$collapsed = (static::$loaded[__CLASS__ . '::startAccordion'][$selector]['active'] == $id) ? '' : ' collapsed';
+		$parent = static::$loaded[__CLASS__ . '::startAccordion'][$selector]['parent'] ?
+			' data-parent="' . static::$loaded[__CLASS__ . '::startAccordion'][$selector]['parent'] . '"' : '';
+		$class = (!empty($class)) ? ' ' . $class : '';
+
+		$html = '<div class="accordion-group' . $class . '">'
+			. '<div class="accordion-heading">'
+			. '<strong><a href="#' . $id . '" data-toggle="collapse"' . $parent . ' class="accordion-toggle' . $collapsed . '">'
+			. $text
+			. '</a></strong>'
+			. '</div>'
+			. '<div class="accordion-body collapse' . $in . '" id="' . $id . '">'
+			. '<div class="accordion-inner">';
+
+		return $html;
+	}
+
+	/**
+	 * Close the current slide
+	 *
+	 * @return  string  HTML to close the slide
+	 *
+	 * @since   3.0
+	 */
+	public static function endSlide()
+	{
+		return '</div></div></div>';
+	}
+
+	/**
+	 * Creates a tab pane
+	 *
+	 * @param   string  $selector  The pane identifier.
+	 * @param   array   $params    The parameters for the pane
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1
+	 */
+	public static function startTabSet($selector = 'myTab', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (!isset(static::$loaded[__METHOD__][$sig]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['active'] = (isset($params['active']) && $params['active']) ? (string) $params['active'] : '';
+
+			// Attach tabs to document
+			JFactory::getDocument()
+				->addScriptDeclaration(JLayoutHelper::render('libraries.cms.html.bootstrap.starttabsetscript', array('selector' => $selector)));
+
+			// Set static array
+			static::$loaded[__METHOD__][$sig] = true;
+			static::$loaded[__METHOD__][$selector]['active'] = $opt['active'];
+		}
+
+		return JLayoutHelper::render('libraries.cms.html.bootstrap.starttabset', array('selector' => $selector));
+	}
+
+	/**
+	 * Close the current tab pane
+	 *
+	 * @return  string  HTML to close the pane
+	 *
+	 * @since   3.1
+	 */
+	public static function endTabSet()
+	{
+		return JLayoutHelper::render('libraries.cms.html.bootstrap.endtabset');
+	}
+
+	/**
+	 * Begins the display of a new tab content panel.
+	 *
+	 * @param   string  $selector  Identifier of the panel.
+	 * @param   string  $id        The ID of the div element
+	 * @param   string  $title     The title text for the new UL tab
+	 *
+	 * @return  string  HTML to start a new panel
+	 *
+	 * @since   3.1
+	 */
+	public static function addTab($selector, $id, $title)
+	{
+		static $tabScriptLayout = null;
+		static $tabLayout = null;
+
+		$tabScriptLayout = $tabScriptLayout === null ? new JLayoutFile('libraries.cms.html.bootstrap.addtabscript') : $tabScriptLayout;
+		$tabLayout = $tabLayout === null ? new JLayoutFile('libraries.cms.html.bootstrap.addtab') : $tabLayout;
+
+		$active = (static::$loaded['JHtmlBootstrap::startTabSet'][$selector]['active'] == $id) ? ' active' : '';
+
+		// Inject tab into UL
+		JFactory::getDocument()
+			->addScriptDeclaration($tabScriptLayout->render(array('selector' => $selector, 'id' => $id, 'active' => $active, 'title' => $title)));
+
+		return $tabLayout->render(array('id' => $id, 'active' => $active));
+	}
+
+	/**
+	 * Close the current tab content panel
+	 *
+	 * @return  string  HTML to close the pane
+	 *
+	 * @since   3.1
+	 */
+	public static function endTab()
+	{
+		return JLayoutHelper::render('libraries.cms.html.bootstrap.endtab');
+	}
+
+	/**
+	 * Creates a tab pane
+	 *
+	 * @param   string  $selector  The pane identifier.
+	 * @param   array   $params    The parameters for the pane
+	 *
+	 * @return  string
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0	Use JHtml::_('bootstrap.startTabSet') instead.
+	 */
+	public static function startPane($selector = 'myTab', $params = array())
+	{
+		$sig = md5(serialize(array($selector, $params)));
+
+		if (!isset(static::$loaded['JHtmlBootstrap::startTabSet'][$sig]))
+		{
+			// Include Bootstrap framework
+			JHtml::_('bootstrap.framework');
+
+			// Setup options object
+			$opt['active'] = isset($params['active']) ? (string) $params['active'] : '';
+
+			// Attach tab to document
+			JFactory::getDocument()->addScriptDeclaration(
+				'jQuery(function($){
+					$(' . json_encode('#' . $selector . ' a') . ').click(function (e) {
+						e.preventDefault();
+						$(this).tab("show");
+					});
+				});'
+			);
+
+			// Set static array
+			static::$loaded['JHtmlBootstrap::startTabSet'][$sig] = true;
+			static::$loaded['JHtmlBootstrap::startTabSet'][$selector]['active'] = $opt['active'];
+		}
+
+		return '<div class="tab-content" id="' . $selector . 'Content">';
+	}
+
+	/**
+	 * Close the current tab pane
+	 *
+	 * @return  string  HTML to close the pane
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0	Use JHtml::_('bootstrap.endTabSet') instead.
+	 */
+	public static function endPane()
+	{
+		return '</div>';
+	}
+
+	/**
+	 * Begins the display of a new tab content panel.
+	 *
+	 * @param   string  $selector  Identifier of the panel.
+	 * @param   string  $id        The ID of the div element
+	 *
+	 * @return  string  HTML to start a new panel
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0 Use JHtml::_('bootstrap.addTab') instead.
+	 */
+	public static function addPanel($selector, $id)
+	{
+		$active = (static::$loaded['JHtmlBootstrap::startTabSet'][$selector]['active'] == $id) ? ' active' : '';
+
+		return '<div id="' . $id . '" class="tab-pane' . $active . '">';
+	}
+
+	/**
+	 * Close the current tab content panel
+	 *
+	 * @return  string  HTML to close the pane
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0 Use JHtml::_('bootstrap.endTab') instead.
+	 */
+	public static function endPanel()
+	{
+		return '</div>';
+	}
+
+	/**
+	 * Loads CSS files needed by Bootstrap
+	 *
+	 * @param   boolean  $includeMainCss  If true, main bootstrap.css files are loaded
+	 * @param   string   $direction       rtl or ltr direction. If empty, ltr is assumed
+	 * @param   array    $attribs         Optional array of attributes to be passed to JHtml::_('stylesheet')
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function loadCss($includeMainCss = true, $direction = 'ltr', $attribs = array())
+	{
+		// Load Bootstrap main CSS
+		if ($includeMainCss)
+		{
+			JHtml::_('stylesheet', 'jui/bootstrap.min.css', array('version' => 'auto', 'relative' => true), $attribs);
+			JHtml::_('stylesheet', 'jui/bootstrap-responsive.min.css', array('version' => 'auto', 'relative' => true), $attribs);
+			JHtml::_('stylesheet', 'jui/bootstrap-extended.css', array('version' => 'auto', 'relative' => true), $attribs);
+		}
+
+		// Load Bootstrap RTL CSS
+		if ($direction === 'rtl')
+		{
+			JHtml::_('stylesheet', 'jui/bootstrap-rtl.css', array('version' => 'auto', 'relative' => true), $attribs);
+		}
+	}
+}
diff --git a/core/libraries/cms/html/category.php b/core/libraries/cms/html/category.php
new file mode 100644
index 00000000..99c6e773
--- /dev/null
+++ b/core/libraries/cms/html/category.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Utility class for categories
+ *
+ * @since  1.5
+ */
+abstract class JHtmlCategory
+{
+	/**
+	 * Cached array of the category items.
+	 *
+	 * @var    array
+	 * @since  1.5
+	 */
+	protected static $items = array();
+
+	/**
+	 * Returns an array of categories for the given extension.
+	 *
+	 * @param   string  $extension  The extension option e.g. com_something.
+	 * @param   array   $config     An array of configuration options. By default, only
+	 *                              published and unpublished categories are returned.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public static function options($extension, $config = array('filter.published' => array(0, 1)))
+	{
+		$hash = md5($extension . '.' . serialize($config));
+
+		if (!isset(static::$items[$hash]))
+		{
+			$config = (array) $config;
+			$db     = JFactory::getDbo();
+			$user   = JFactory::getUser();
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+
+			$query = $db->getQuery(true)
+				->select('a.id, a.title, a.level, a.language')
+				->from('#__categories AS a')
+				->where('a.parent_id > 0');
+
+			// Filter on extension.
+			$query->where('extension = ' . $db->quote($extension));
+
+			// Filter on user access level
+			$query->where('a.access IN (' . $groups . ')');
+
+			// Filter on the published state
+			if (isset($config['filter.published']))
+			{
+				if (is_numeric($config['filter.published']))
+				{
+					$query->where('a.published = ' . (int) $config['filter.published']);
+				}
+				elseif (is_array($config['filter.published']))
+				{
+					$config['filter.published'] = ArrayHelper::toInteger($config['filter.published']);
+					$query->where('a.published IN (' . implode(',', $config['filter.published']) . ')');
+				}
+			}
+
+			// Filter on the language
+			if (isset($config['filter.language']))
+			{
+				if (is_string($config['filter.language']))
+				{
+					$query->where('a.language = ' . $db->quote($config['filter.language']));
+				}
+				elseif (is_array($config['filter.language']))
+				{
+					foreach ($config['filter.language'] as &$language)
+					{
+						$language = $db->quote($language);
+					}
+
+					$query->where('a.language IN (' . implode(',', $config['filter.language']) . ')');
+				}
+			}
+
+			// Filter on the access
+			if (isset($config['filter.access']))
+			{
+				if (is_string($config['filter.access']))
+				{
+					$query->where('a.access = ' . $db->quote($config['filter.access']));
+				}
+				elseif (is_array($config['filter.access']))
+				{
+					foreach ($config['filter.access'] as &$access)
+					{
+						$access = $db->quote($access);
+					}
+
+					$query->where('a.access IN (' . implode(',', $config['filter.access']) . ')');
+				}
+			}
+
+			$query->order('a.lft');
+
+			$db->setQuery($query);
+			$items = $db->loadObjectList();
+
+			// Assemble the list options.
+			static::$items[$hash] = array();
+
+			foreach ($items as &$item)
+			{
+				$repeat = ($item->level - 1 >= 0) ? $item->level - 1 : 0;
+				$item->title = str_repeat('- ', $repeat) . $item->title;
+
+				if ($item->language !== '*')
+				{
+					$item->title .= ' (' . $item->language . ')';
+				}
+
+				static::$items[$hash][] = JHtml::_('select.option', $item->id, $item->title);
+			}
+		}
+
+		return static::$items[$hash];
+	}
+
+	/**
+	 * Returns an array of categories for the given extension.
+	 *
+	 * @param   string  $extension  The extension option.
+	 * @param   array   $config     An array of configuration options. By default, only published and unpublished categories are returned.
+	 *
+	 * @return  array   Categories for the extension
+	 *
+	 * @since   1.6
+	 */
+	public static function categories($extension, $config = array('filter.published' => array(0, 1)))
+	{
+		$hash = md5($extension . '.' . serialize($config));
+
+		if (!isset(static::$items[$hash]))
+		{
+			$config = (array) $config;
+			$user = JFactory::getUser();
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('a.id, a.title, a.level, a.parent_id')
+				->from('#__categories AS a')
+				->where('a.parent_id > 0');
+
+			// Filter on extension.
+			$query->where('extension = ' . $db->quote($extension));
+
+			// Filter on user level.
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+
+			// Filter on the published state
+			if (isset($config['filter.published']))
+			{
+				if (is_numeric($config['filter.published']))
+				{
+					$query->where('a.published = ' . (int) $config['filter.published']);
+				}
+				elseif (is_array($config['filter.published']))
+				{
+					$config['filter.published'] = ArrayHelper::toInteger($config['filter.published']);
+					$query->where('a.published IN (' . implode(',', $config['filter.published']) . ')');
+				}
+			}
+
+			$query->order('a.lft');
+
+			$db->setQuery($query);
+			$items = $db->loadObjectList();
+
+			// Assemble the list options.
+			static::$items[$hash] = array();
+
+			foreach ($items as &$item)
+			{
+				$repeat = ($item->level - 1 >= 0) ? $item->level - 1 : 0;
+				$item->title = str_repeat('- ', $repeat) . $item->title;
+				static::$items[$hash][] = JHtml::_('select.option', $item->id, $item->title);
+			}
+			// Special "Add to root" option:
+			static::$items[$hash][] = JHtml::_('select.option', '1', JText::_('JLIB_HTML_ADD_TO_ROOT'));
+		}
+
+		return static::$items[$hash];
+	}
+}
diff --git a/core/libraries/cms/html/content.php b/core/libraries/cms/html/content.php
new file mode 100644
index 00000000..f3917aa1
--- /dev/null
+++ b/core/libraries/cms/html/content.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class to fire onContentPrepare for non-article based content.
+ *
+ * @since  1.5
+ */
+abstract class JHtmlContent
+{
+	/**
+	 * Fire onContentPrepare for content that isn't part of an article.
+	 *
+	 * @param   string  $text     The content to be transformed.
+	 * @param   array   $params   The content params.
+	 * @param   string  $context  The context of the content to be transformed.
+	 *
+	 * @return  string   The content after transformation.
+	 *
+	 * @since   1.5
+	 */
+	public static function prepare($text, $params = null, $context = 'text')
+	{
+		if ($params === null)
+		{
+			$params = new JObject;
+		}
+
+		$article = new stdClass;
+		$article->text = $text;
+		JPluginHelper::importPlugin('content');
+		$dispatcher = JEventDispatcher::getInstance();
+		$dispatcher->trigger('onContentPrepare', array($context, &$article, &$params, 0));
+
+		return $article->text;
+	}
+}
diff --git a/core/libraries/cms/html/contentlanguage.php b/core/libraries/cms/html/contentlanguage.php
new file mode 100644
index 00000000..5e629a26
--- /dev/null
+++ b/core/libraries/cms/html/contentlanguage.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class working with content language select lists
+ *
+ * @since  1.6
+ */
+abstract class JHtmlContentLanguage
+{
+	/**
+	 * Cached array of the content language items.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected static $items = null;
+
+	/**
+	 * Get a list of the available content language items.
+	 *
+	 * @param   boolean  $all        True to include All (*)
+	 * @param   boolean  $translate  True to translate All
+	 *
+	 * @return  string
+	 *
+	 * @see     JFormFieldContentLanguage
+	 * @since   1.6
+	 */
+	public static function existing($all = false, $translate = false)
+	{
+		if (empty(static::$items))
+		{
+			// Get the database object and a new query object.
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			// Build the query.
+			$query->select('a.lang_code AS value, a.title AS text, a.title_native')
+				->from('#__languages AS a')
+				->where('a.published >= 0')
+				->order('a.title');
+
+			// Set the query and load the options.
+			$db->setQuery($query);
+			static::$items = $db->loadObjectList();
+		}
+
+		if ($all)
+		{
+			$all_option = array(new JObject(array('value' => '*', 'text' => $translate ? JText::alt('JALL', 'language') : 'JALL_LANGUAGE')));
+
+			return array_merge($all_option, static::$items);
+		}
+		else
+		{
+			return static::$items;
+		}
+	}
+}
diff --git a/core/libraries/cms/html/date.php b/core/libraries/cms/html/date.php
new file mode 100644
index 00000000..b16ce8e1
--- /dev/null
+++ b/core/libraries/cms/html/date.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Extended Utility class for handling date display.
+ *
+ * @since  2.5
+ */
+abstract class JHtmlDate
+{
+	/**
+	 * Function to convert a static time into a relative measurement
+	 *
+	 * @param   string  $date    The date to convert
+	 * @param   string  $unit    The optional unit of measurement to return
+	 *                           if the value of the diff is greater than one
+	 * @param   string  $time    An optional time to compare to, defaults to now
+	 * @param   string  $format  An optional format for the JHtml::date output
+	 *
+	 * @return  string  The converted time string
+	 *
+	 * @since   2.5
+	 */
+	public static function relative($date, $unit = null, $time = null, $format = null)
+	{
+		if ($time === null)
+		{
+			// Get now
+			$time = new JDate('now');
+		}
+
+		// Get the difference in seconds between now and the time
+		$diff = strtotime($time) - strtotime($date);
+
+		// Less than a minute
+		if ($diff < 60)
+		{
+			return JText::_('JLIB_HTML_DATE_RELATIVE_LESSTHANAMINUTE');
+		}
+
+		// Round to minutes
+		$diff = round($diff / 60);
+
+		// 1 to 59 minutes
+		if ($diff < 60 || $unit === 'minute')
+		{
+			return JText::plural('JLIB_HTML_DATE_RELATIVE_MINUTES', $diff);
+		}
+
+		// Round to hours
+		$diff = round($diff / 60);
+
+		// 1 to 23 hours
+		if ($diff < 24 || $unit === 'hour')
+		{
+			return JText::plural('JLIB_HTML_DATE_RELATIVE_HOURS', $diff);
+		}
+
+		// Round to days
+		$diff = round($diff / 24);
+
+		// 1 to 6 days
+		if ($diff < 7 || $unit === 'day')
+		{
+			return JText::plural('JLIB_HTML_DATE_RELATIVE_DAYS', $diff);
+		}
+
+		// Round to weeks
+		$diff = round($diff / 7);
+
+		// 1 to 4 weeks
+		if ($diff <= 4 || $unit === 'week')
+		{
+			return JText::plural('JLIB_HTML_DATE_RELATIVE_WEEKS', $diff);
+		}
+
+		// Over a month, return the absolute time
+		return JHtml::_('date', $date, $format);
+	}
+}
diff --git a/core/libraries/cms/html/debug.php b/core/libraries/cms/html/debug.php
new file mode 100644
index 00000000..72cdb2e2
--- /dev/null
+++ b/core/libraries/cms/html/debug.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Extended Utility class for render debug information.
+ *
+ * @since  3.7.0
+ */
+abstract class JHtmlDebug
+{
+	/**
+	 * xdebug.file_link_format from the php.ini.
+	 *
+	 * Make this property public to support test.
+	 *
+	 * @var    string
+	 *
+	 * @since  3.7.0
+	 */
+	public static $xdebugLinkFormat;
+
+	/**
+	 * Replaces the Joomla! root with "JROOT" to improve readability.
+	 * Formats a link with a special value xdebug.file_link_format
+	 * from the php.ini file.
+	 *
+	 * @param   string  $file  The full path to the file.
+	 * @param   string  $line  The line number.
+	 *
+	 * @return  string
+	 *
+	 * @throws  \InvalidArgumentException
+	 *
+	 * @since   3.7.0
+	 */
+	public static function xdebuglink($file, $line = '')
+	{
+		if (static::$xdebugLinkFormat === null)
+		{
+			static::$xdebugLinkFormat = ini_get('xdebug.file_link_format');
+		}
+
+		$link = str_replace(JPATH_ROOT, 'JROOT', JPath::clean($file));
+		$link .= $line ? ':' . $line : '';
+
+		if (static::$xdebugLinkFormat)
+		{
+			$href = static::$xdebugLinkFormat;
+			$href = str_replace('%f', $file, $href);
+			$href = str_replace('%l', $line, $href);
+
+			$html = JHtml::_('link', $href, $link);
+		}
+		else
+		{
+			$html = $link;
+		}
+
+		return $html;
+	}
+}
diff --git a/core/libraries/cms/html/dropdown.php b/core/libraries/cms/html/dropdown.php
new file mode 100644
index 00000000..79db3678
--- /dev/null
+++ b/core/libraries/cms/html/dropdown.php
@@ -0,0 +1,367 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTML utility class for building a dropdown menu
+ *
+ * @since  3.0
+ */
+abstract class JHtmlDropdown
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.0
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * @var    string  HTML markup for the dropdown list
+	 * @since  3.0
+	 */
+	protected static $dropDownList = null;
+
+	/**
+	 * Method to inject needed script
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function init()
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Depends on Bootstrap
+		JHtml::_('bootstrap.framework');
+
+		JFactory::getDocument()->addScriptDeclaration("
+			(function($){
+				$(document).ready(function (){
+					$('.has-context')
+					.mouseenter(function (){
+						$('.btn-group',$(this)).show();
+					})
+					.mouseleave(function (){
+						$('.btn-group',$(this)).hide();
+						$('.btn-group',$(this)).removeClass('open');
+					});
+
+					contextAction =function (cbId, task)
+					{
+						$('input[name=\"cid[]\"]').removeAttr('checked');
+						$('#' + cbId).attr('checked','checked');
+						Joomla.submitbutton(task);
+					}
+				});
+			})(jQuery);
+			"
+		);
+
+		// Set static array
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to start a new dropdown menu
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function start()
+	{
+		// Only start once
+		if (isset(static::$loaded[__METHOD__]) && static::$loaded[__METHOD__] == true)
+		{
+			return;
+		}
+
+		$dropDownList = '<div class="btn-group" style="margin-left:6px;display:none">
+							<a href="#" data-toggle="dropdown" class="dropdown-toggle btn btn-mini">
+								<span class="caret"></span>
+							</a>
+							<ul class="dropdown-menu">';
+		static::$dropDownList = $dropDownList;
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to render current dropdown menu
+	 *
+	 * @return  string  HTML markup for the dropdown list
+	 *
+	 * @since   3.0
+	 */
+	public static function render()
+	{
+		$dropDownList  = static::$dropDownList;
+		$dropDownList .= '</ul></div>';
+
+		static::$dropDownList = null;
+		static::$loaded['JHtmlDropdown::start'] = false;
+
+		return $dropDownList;
+	}
+
+	/**
+	 * Append an edit item to the current dropdown menu
+	 *
+	 * @param   integer  $id          Record ID
+	 * @param   string   $prefix      Task prefix
+	 * @param   string   $customLink  The custom link if dont use default Joomla action format
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function edit($id, $prefix = '', $customLink = '')
+	{
+		static::start();
+
+		if (!$customLink)
+		{
+			$option = JFactory::getApplication()->input->getCmd('option');
+			$link = 'index.php?option=' . $option;
+		}
+		else
+		{
+			$link = $customLink;
+		}
+
+		$link .= '&task=' . $prefix . 'edit&id=' . $id;
+		$link = JRoute::_($link);
+
+		static::addCustomItem(JText::_('JACTION_EDIT'), $link);
+
+		return;
+	}
+
+	/**
+	 * Append a publish item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function publish($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'publish';
+		static::addCustomItem(JText::_('JTOOLBAR_PUBLISH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append an unpublish item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function unpublish($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'unpublish';
+		static::addCustomItem(JText::_('JTOOLBAR_UNPUBLISH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append a featured item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function featured($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'featured';
+		static::addCustomItem(JText::_('JFEATURED'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append an unfeatured item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function unfeatured($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'unfeatured';
+		static::addCustomItem(JText::_('JUNFEATURED'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append an archive item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function archive($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'archive';
+		static::addCustomItem(JText::_('JTOOLBAR_ARCHIVE'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append an unarchive item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function unarchive($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'unpublish';
+		static::addCustomItem(JText::_('JTOOLBAR_UNARCHIVE'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append a trash item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function trash($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'trash';
+		static::addCustomItem(JText::_('JTOOLBAR_TRASH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append an untrash item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function untrash($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'publish';
+		static::addCustomItem(JText::_('JTOOLBAR_UNTRASH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Append a checkin item to the current dropdown menu
+	 *
+	 * @param   string  $checkboxId  ID of corresponding checkbox of the record
+	 * @param   string  $prefix      The task prefix
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function checkin($checkboxId, $prefix = '')
+	{
+		$task = $prefix . 'checkin';
+		static::addCustomItem(JText::_('JTOOLBAR_CHECKIN'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
+		return;
+	}
+
+	/**
+	 * Writes a divider between dropdown items
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function divider()
+	{
+		static::$dropDownList .= '<li class="divider"></li>';
+
+		return;
+	}
+
+	/**
+	 * Append a custom item to current dropdown menu
+	 *
+	 * @param   string   $label           The label of item
+	 * @param   string   $link            The link of item
+	 * @param   string   $linkAttributes  Custom link attributes
+	 * @param   string   $className       Class name of item
+	 * @param   boolean  $ajaxLoad        True if using ajax load when item clicked
+	 * @param   string   $jsCallBackFunc  Javascript function name, called when ajax load successfully
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function addCustomItem($label, $link = 'javascript:void(0)', $linkAttributes = '', $className = '', $ajaxLoad = false,
+		$jsCallBackFunc = null)
+	{
+		static::start();
+
+		if ($ajaxLoad)
+		{
+			$href = ' href = "javascript:void(0)" onclick="loadAjax(\'' . $link . '\', \'' . $jsCallBackFunc . '\')"';
+		}
+		else
+		{
+			$href = ' href = "' . $link . '" ';
+		}
+
+		$dropDownList = static::$dropDownList;
+		$dropDownList .= '<li class="' . $className . '"><a ' . $linkAttributes . $href . ' >';
+		$dropDownList .= $label;
+		$dropDownList .= '</a></li>';
+		static::$dropDownList = $dropDownList;
+
+		return;
+	}
+}
diff --git a/core/libraries/cms/html/email.php b/core/libraries/cms/html/email.php
new file mode 100644
index 00000000..dfbb76be
--- /dev/null
+++ b/core/libraries/cms/html/email.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for cloaking email addresses
+ *
+ * @since  1.5
+ */
+abstract class JHtmlEmail
+{
+	/**
+	 * Simple JavaScript email cloaker
+	 *
+	 * By default replaces an email with a mailto link with email cloaked
+	 *
+	 * @param   string   $mail    The -mail address to cloak.
+	 * @param   boolean  $mailto  True if text and mailing address differ
+	 * @param   string   $text    Text for the link
+	 * @param   boolean  $email   True if text is an email address
+	 *
+	 * @return  string  The cloaked email.
+	 *
+	 * @since   1.5
+	 */
+	public static function cloak($mail, $mailto = true, $text = '', $email = true)
+	{
+		// Handle IDN addresses: punycode for href but utf-8 for text displayed.
+		if ($mailto && (empty($text) || $email))
+		{
+			// Use dedicated $text whereas $mail is used as href and must be punycoded.
+			$text = JStringPunycode::emailToUTF8($text ?: $mail);
+		}
+		elseif (!$mailto)
+		{
+			// In that case we don't use link - so convert $mail back to utf-8.
+			$mail = JStringPunycode::emailToUTF8($mail);
+		}
+
+		// Convert mail
+		$mail = static::convertEncoding($mail);
+
+		// Random hash
+		$rand = md5($mail . mt_rand(1, 100000));
+
+		// Split email by @ symbol
+		$mail       = explode('@', $mail);
+		$mail_parts = explode('.', $mail[1]);
+
+		if ($mailto)
+		{
+			// Special handling when mail text is different from mail address
+			if ($text)
+			{
+				// Convert text - here is the right place
+				$text = static::convertEncoding($text);
+
+				if ($email)
+				{
+					// Split email by @ symbol
+					$text = explode('@', $text);
+					$text_parts = explode('.', $text[1]);
+					$tmpScript = "var addy_text" . $rand . " = '" . @$text[0] . "' + '&#64;' + '" . implode("' + '&#46;' + '", @$text_parts)
+						. "';";
+				}
+				else
+				{
+					$tmpScript = "var addy_text" . $rand . " = '" . $text . "';";
+				}
+
+				$tmpScript .= "document.getElementById('cloak" . $rand . "').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy"
+					. $rand . " + '\'>'+addy_text" . $rand . "+'<\/a>';";
+			}
+			else
+			{
+				$tmpScript = "document.getElementById('cloak" . $rand . "').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy"
+					. $rand . " + '\'>' +addy" . $rand . "+'<\/a>';";
+			}
+		}
+		else
+		{
+			$tmpScript = "document.getElementById('cloak" . $rand . "').innerHTML += addy" . $rand . ";";
+		}
+
+		$script       = "
+				document.getElementById('cloak" . $rand . "').innerHTML = '';
+				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
+				var path = 'hr' + 'ef' + '=';
+				var addy" . $rand . " = '" . @$mail[0] . "' + '&#64;';
+				addy" . $rand . " = addy" . $rand . " + '" . implode("' + '&#46;' + '", $mail_parts) . "';
+				$tmpScript
+		";
+
+		// TODO: Use inline script for now
+		$inlineScript = "<script type='text/javascript'>" . $script . "</script>";
+
+		return '<span id="cloak' . $rand . '">' . JText::_('JLIB_HTML_CLOAKING') . '</span>' . $inlineScript;
+	}
+
+	/**
+	 * Convert encoded text
+	 *
+	 * @param   string  $text  Text to convert
+	 *
+	 * @return  string  The converted text.
+	 *
+	 * @since   1.5
+	 */
+	protected static function convertEncoding($text)
+	{
+		$text = html_entity_decode($text);
+
+		// Replace vowels with character encoding
+		$text = str_replace('a', '&#97;', $text);
+		$text = str_replace('e', '&#101;', $text);
+		$text = str_replace('i', '&#105;', $text);
+		$text = str_replace('o', '&#111;', $text);
+		$text = str_replace('u', '&#117;', $text);
+		$text = htmlentities($text, ENT_QUOTES, 'UTF-8', false);
+
+		return $text;
+	}
+}
diff --git a/core/libraries/cms/html/form.php b/core/libraries/cms/html/form.php
new file mode 100644
index 00000000..cf40e583
--- /dev/null
+++ b/core/libraries/cms/html/form.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Utility class for form elements
+ *
+ * @since  1.5
+ */
+abstract class JHtmlForm
+{
+	/**
+	 * Array containing information for loaded files.
+	 *
+	 * @var    array
+	 *
+	 * @since  3.8.0
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Displays a hidden token field to reduce the risk of CSRF exploits
+	 *
+	 * Use in conjunction with JSession::checkToken()
+	 *
+	 * @param   array  $attribs  Input element attributes.
+	 *
+	 * @return  string  A hidden input field with a token
+	 *
+	 * @see     JSession::checkToken()
+	 * @since   1.5
+	 */
+	public static function token(array $attribs = array())
+	{
+		$attributes = '';
+
+		if ($attribs !== array())
+		{
+			$attributes .= ' ' . ArrayHelper::toString($attribs);
+		}
+
+		return '<input type="hidden" name="' . JSession::getFormToken() . '" value="1"' . $attributes . ' />';
+	}
+
+	/**
+	 * Add CSRF form token to Joomla script options that developers can get it by Javascript.
+	 *
+	 * @param   string  $name  The script option key name.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public static function csrf($name = 'csrf.token')
+	{
+		if (isset(static::$loaded[__METHOD__][$name]))
+		{
+			return;
+		}
+
+		/** @var JDocumentHtml $doc */
+		$doc = JFactory::getDocument();
+
+		if (!$doc instanceof JDocumentHtml || $doc->getType() !== 'html')
+		{
+			return;
+		}
+
+		$doc->addScriptOptions($name, JSession::getFormToken());
+
+		static::$loaded[__METHOD__][$name] = true;
+	}
+}
diff --git a/core/libraries/cms/html/formbehavior.php b/core/libraries/cms/html/formbehavior.php
new file mode 100644
index 00000000..86d13cc6
--- /dev/null
+++ b/core/libraries/cms/html/formbehavior.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Utility class for form related behaviors
+ *
+ * @since  3.0
+ */
+abstract class JHtmlFormbehavior
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.0
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Method to load the Chosen JavaScript framework and supporting CSS into the document head
+	 *
+	 * If debugging mode is on an uncompressed version of Chosen is included for easier debugging.
+	 *
+	 * @param   string  $selector  Class for Chosen elements.
+	 * @param   mixed   $debug     Is debugging mode on? [optional]
+	 * @param   array   $options   the possible Chosen options as name => value [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function chosen($selector = '.advancedSelect', $debug = null, $options = array())
+	{
+		if (isset(static::$loaded[__METHOD__][$selector]))
+		{
+			return;
+		}
+
+		// If no debugging value is set, use the configuration setting
+		if ($debug === null)
+		{
+			$debug = JDEBUG;
+		}
+
+		// Default settings
+		if (!isset($options['disable_search_threshold']))
+		{
+			$options['disable_search_threshold'] = 10;
+		}
+
+		// Allow searching contains space in query
+		if (!isset($options['search_contains']))
+		{
+			$options['search_contains'] = true;
+		}
+
+		if (!isset($options['allow_single_deselect']))
+		{
+			$options['allow_single_deselect'] = true;
+		}
+
+		if (!isset($options['placeholder_text_multiple']))
+		{
+			$options['placeholder_text_multiple'] = JText::_('JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS');
+		}
+
+		if (!isset($options['placeholder_text_single']))
+		{
+			$options['placeholder_text_single'] = JText::_('JGLOBAL_SELECT_AN_OPTION');
+		}
+
+		if (!isset($options['no_results_text']))
+		{
+			$options['no_results_text'] = JText::_('JGLOBAL_SELECT_NO_RESULTS_MATCH');
+		}
+
+		$displayData = array(
+			'debug'     => $debug,
+			'options'  => $options,
+			'selector' => $selector,
+		);
+
+		JLayoutHelper::render('joomla.html.formbehavior.chosen', $displayData);
+
+		static::$loaded[__METHOD__][$selector] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to load the AJAX Chosen library
+	 *
+	 * If debugging mode is on an uncompressed version of AJAX Chosen is included for easier debugging.
+	 *
+	 * @param   Registry  $options  Options in a Registry object
+	 * @param   mixed     $debug    Is debugging mode on? [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function ajaxchosen(Registry $options, $debug = null)
+	{
+		// Retrieve options/defaults
+		$selector       = $options->get('selector', '.tagfield');
+		$type           = $options->get('type', 'GET');
+		$url            = $options->get('url', null);
+		$dataType       = $options->get('dataType', 'json');
+		$jsonTermKey    = $options->get('jsonTermKey', 'term');
+		$afterTypeDelay = $options->get('afterTypeDelay', '500');
+		$minTermLength  = $options->get('minTermLength', '3');
+
+		// Ajax URL is mandatory
+		if (!empty($url))
+		{
+			if (isset(static::$loaded[__METHOD__][$selector]))
+			{
+				return;
+			}
+
+			// Requires chosen to work
+			static::chosen($selector, $debug);
+
+			$displayData = array(
+				'url'            => $url,
+				'debug'          => $debug,
+				'options'        => $options,
+				'selector'       => $selector,
+				'type'           => $type,
+				'dataType'       => $dataType,
+				'jsonTermKey'    => $jsonTermKey,
+				'afterTypeDelay' => $afterTypeDelay,
+				'minTermLength'  => $minTermLength,
+			);
+
+			JLayoutHelper::render('joomla.html.formbehavior.ajaxchosen', $displayData);
+
+			static::$loaded[__METHOD__][$selector] = true;
+		}
+
+		return;
+	}
+}
diff --git a/core/libraries/cms/html/grid.php b/core/libraries/cms/html/grid.php
new file mode 100644
index 00000000..0702cd19
--- /dev/null
+++ b/core/libraries/cms/html/grid.php
@@ -0,0 +1,364 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for creating HTML Grids
+ *
+ * @since  1.5
+ */
+abstract class JHtmlGrid
+{
+	/**
+	 * Display a boolean setting widget.
+	 *
+	 * @param   integer  $i        The row index.
+	 * @param   integer  $value    The value of the boolean field.
+	 * @param   string   $taskOn   Task to turn the boolean setting on.
+	 * @param   string   $taskOff  Task to turn the boolean setting off.
+	 *
+	 * @return  string   The boolean setting widget.
+	 *
+	 * @since   1.6
+	 */
+	public static function boolean($i, $value, $taskOn = null, $taskOff = null)
+	{
+		// Load the behavior.
+		static::behavior();
+		JHtml::_('bootstrap.tooltip');
+
+		// Build the title.
+		$title = $value ? JText::_('JYES') : JText::_('JNO');
+		$title = JHtml::_('tooltipText', $title, JText::_('JGLOBAL_CLICK_TO_TOGGLE_STATE'), 0);
+
+		// Build the <a> tag.
+		$bool = $value ? 'true' : 'false';
+		$task = $value ? $taskOff : $taskOn;
+		$toggle = (!$task) ? false : true;
+
+		if ($toggle)
+		{
+			return '<a class="grid_' . $bool . ' hasTooltip" title="' . $title . '" rel="{id:\'cb' . $i . '\', task:\'' . $task
+				. '\'}" href="#toggle"></a>';
+		}
+		else
+		{
+			return '<a class="grid_' . $bool . '"></a>';
+		}
+	}
+
+	/**
+	 * Method to sort a column in a grid
+	 *
+	 * @param   string  $title          The link title
+	 * @param   string  $order          The order field for the column
+	 * @param   string  $direction      The current direction
+	 * @param   string  $selected       The selected ordering
+	 * @param   string  $task           An optional task override
+	 * @param   string  $new_direction  An optional direction for the new column
+	 * @param   string  $tip            An optional text shown as tooltip title instead of $title
+	 * @param   string  $form           An optional form selector
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function sort($title, $order, $direction = 'asc', $selected = '', $task = null, $new_direction = 'asc', $tip = '', $form = null)
+	{
+		JHtml::_('behavior.core');
+		JHtml::_('bootstrap.popover');
+
+		$direction = strtolower($direction);
+		$icon = array('arrow-up-3', 'arrow-down-3');
+		$index = (int) ($direction === 'desc');
+
+		if ($order != $selected)
+		{
+			$direction = $new_direction;
+		}
+		else
+		{
+			$direction = $direction === 'desc' ? 'asc' : 'desc';
+		}
+
+		if ($form)
+		{
+			$form = ', document.getElementById(\'' . $form . '\')';
+		}
+
+		$html = '<a href="#" onclick="Joomla.tableOrdering(\'' . $order . '\',\'' . $direction . '\',\'' . $task . '\'' . $form . ');return false;"'
+			. ' class="hasPopover" title="' . htmlspecialchars(JText::_($tip ?: $title)) . '"'
+			. ' data-content="' . htmlspecialchars(JText::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN')) . '" data-placement="top">';
+
+		if (isset($title['0']) && $title['0'] === '<')
+		{
+			$html .= $title;
+		}
+		else
+		{
+			$html .= JText::_($title);
+		}
+
+		if ($order == $selected)
+		{
+			$html .= '<span class="icon-' . $icon[$index] . '"></span>';
+		}
+
+		$html .= '</a>';
+
+		return $html;
+	}
+
+	/**
+	 * Method to check all checkboxes in a grid
+	 *
+	 * @param   string  $name    The name of the form element
+	 * @param   string  $tip     The text shown as tooltip title instead of $tip
+	 * @param   string  $action  The action to perform on clicking the checkbox
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1.2
+	 */
+	public static function checkall($name = 'checkall-toggle', $tip = 'JGLOBAL_CHECK_ALL', $action = 'Joomla.checkAll(this)')
+	{
+		JHtml::_('behavior.core');
+		JHtml::_('bootstrap.tooltip');
+
+		return '<input type="checkbox" name="' . $name . '" value="" class="hasTooltip" title="' . JHtml::_('tooltipText', $tip)
+			. '" onclick="' . $action . '" />';
+	}
+
+	/**
+	 * Method to create a checkbox for a grid row.
+	 *
+	 * @param   integer  $rowNum      The row index
+	 * @param   integer  $recId       The record id
+	 * @param   boolean  $checkedOut  True if item is checked out
+	 * @param   string   $name        The name of the form element
+	 * @param   string   $stub        The name of stub identifier
+	 *
+	 * @return  mixed    String of html with a checkbox if item is not checked out, null if checked out.
+	 *
+	 * @since   1.5
+	 */
+	public static function id($rowNum, $recId, $checkedOut = false, $name = 'cid', $stub = 'cb')
+	{
+		return $checkedOut ? '' : '<input type="checkbox" id="' . $stub . $rowNum . '" name="' . $name . '[]" value="' . $recId
+			. '" onclick="Joomla.isChecked(this.checked);" />';
+	}
+
+	/**
+	 * Displays a checked out icon.
+	 *
+	 * @param   object   &$row        A data object (must contain checkedout as a property).
+	 * @param   integer  $i           The index of the row.
+	 * @param   string   $identifier  The property name of the primary key or index of the row.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function checkedOut(&$row, $i, $identifier = 'id')
+	{
+		$user = JFactory::getUser();
+		$userid = $user->get('id');
+
+		if ($row instanceof JTable)
+		{
+			$result = $row->isCheckedOut($userid);
+		}
+		else
+		{
+			$result = false;
+		}
+
+		if ($result)
+		{
+			return static::_checkedOut($row);
+		}
+		else
+		{
+			if ($identifier === 'id')
+			{
+				return JHtml::_('grid.id', $i, $row->$identifier);
+			}
+			else
+			{
+				return JHtml::_('grid.id', $i, $row->$identifier, $result, $identifier);
+			}
+		}
+	}
+
+	/**
+	 * Method to create a clickable icon to change the state of an item
+	 *
+	 * @param   mixed    $value   Either the scalar value or an object (for backward compatibility, deprecated)
+	 * @param   integer  $i       The index
+	 * @param   string   $img1    Image for a positive or on value
+	 * @param   string   $img0    Image for the empty or off value
+	 * @param   string   $prefix  An optional prefix for the task
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function published($value, $i, $img1 = 'tick.png', $img0 = 'publish_x.png', $prefix = '')
+	{
+		if (is_object($value))
+		{
+			$value = $value->published;
+		}
+
+		$img = $value ? $img1 : $img0;
+		$task = $value ? 'unpublish' : 'publish';
+		$alt = $value ? JText::_('JPUBLISHED') : JText::_('JUNPUBLISHED');
+		$action = $value ? JText::_('JLIB_HTML_UNPUBLISH_ITEM') : JText::_('JLIB_HTML_PUBLISH_ITEM');
+
+		return '<a href="#" onclick="return listItemTask(\'cb' . $i . '\',\'' . $prefix . $task . '\')" title="' . $action . '">'
+			. JHtml::_('image', 'admin/' . $img, $alt, null, true) . '</a>';
+	}
+
+	/**
+	 * Method to create a select list of states for filtering
+	 * By default the filter shows only published and unpublished items
+	 *
+	 * @param   string  $filter_state  The initial filter state
+	 * @param   string  $published     The JText string for published
+	 * @param   string  $unpublished   The JText string for Unpublished
+	 * @param   string  $archived      The JText string for Archived
+	 * @param   string  $trashed       The JText string for Trashed
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function state($filter_state = '*', $published = 'JPUBLISHED', $unpublished = 'JUNPUBLISHED', $archived = null, $trashed = null)
+	{
+		$state = array('' => '- ' . JText::_('JLIB_HTML_SELECT_STATE') . ' -', 'P' => JText::_($published), 'U' => JText::_($unpublished));
+
+		if ($archived)
+		{
+			$state['A'] = JText::_($archived);
+		}
+
+		if ($trashed)
+		{
+			$state['T'] = JText::_($trashed);
+		}
+
+		return JHtml::_(
+			'select.genericlist',
+			$state,
+			'filter_state',
+			array(
+				'list.attr' => 'class="inputbox" size="1" onchange="Joomla.submitform();"',
+				'list.select' => $filter_state,
+				'option.key' => null,
+			)
+		);
+	}
+
+	/**
+	 * Method to create an icon for saving a new ordering in a grid
+	 *
+	 * @param   array   $rows   The array of rows of rows
+	 * @param   string  $image  The image [UNUSED]
+	 * @param   string  $task   The task to use, defaults to save order
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function order($rows, $image = 'filesave.png', $task = 'saveorder')
+	{
+		return '<a href="javascript:saveorder('
+			. (count($rows) - 1) . ', \'' . $task . '\')" rel="tooltip" class="saveorder btn btn-micro pull-right" title="'
+			. JText::_('JLIB_HTML_SAVE_ORDER') . '"><span class="icon-menu-2"></span></a>';
+	}
+
+	/**
+	 * Method to create a checked out icon with optional overlib in a grid.
+	 *
+	 * @param   object   &$row     The row object
+	 * @param   boolean  $overlib  True if an overlib with checkout information should be created.
+	 *
+	 * @return  string   HTMl for the icon and overlib
+	 *
+	 * @since   1.5
+	 */
+	protected static function _checkedOut(&$row, $overlib = true)
+	{
+		$hover = '';
+
+		if ($overlib)
+		{
+			JHtml::_('bootstrap.tooltip');
+
+			$date = JHtml::_('date', $row->checked_out_time, JText::_('DATE_FORMAT_LC1'));
+			$time = JHtml::_('date', $row->checked_out_time, 'H:i');
+
+			$hover = '<span class="editlinktip hasTooltip" title="' . JHtml::_('tooltipText', 'JLIB_HTML_CHECKED_OUT', $row->editor)
+				. '<br />' . $date . '<br />' . $time . '">';
+		}
+
+		return $hover . JHtml::_('image', 'admin/checked_out.png', null, null, true) . '</span>';
+	}
+
+	/**
+	 * Method to build the behavior script and add it to the document head.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function behavior()
+	{
+		static $loaded;
+
+		if (!$loaded)
+		{
+			// Include jQuery
+			JHtml::_('jquery.framework');
+
+			// Build the behavior script.
+			$js = '
+		jQuery(function($){
+			$actions = $(\'a.move_up, a.move_down, a.grid_true, a.grid_false, a.grid_trash\');
+			$actions.each(function(){
+				$(this).on(\'click\', function(){
+					args = JSON.decode(this.rel);
+					listItemTask(args.id, args.task);
+				});
+			});
+			$(\'input.check-all-toggle\').each(function(){
+				$(this).on(\'click\', function(){
+					if (this.checked) {
+						$(this).closest(\'form\').find(\'input[type="checkbox"]\').each(function(){
+							this.checked = true;
+						})
+					}
+					else {
+						$(this).closest(\'form\').find(\'input[type="checkbox"]\').each(function(){
+							this.checked = false;
+						})
+					}
+				});
+			});
+		});';
+
+			// Add the behavior to the document head.
+			$document = JFactory::getDocument();
+			$document->addScriptDeclaration($js);
+
+			$loaded = true;
+		}
+	}
+}
diff --git a/core/libraries/cms/html/icons.php b/core/libraries/cms/html/icons.php
new file mode 100644
index 00000000..6cee1d29
--- /dev/null
+++ b/core/libraries/cms/html/icons.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for icons.
+ *
+ * @since  2.5
+ */
+abstract class JHtmlIcons
+{
+	/**
+	 * Method to generate html code for a list of buttons
+	 *
+	 * @param   array  $buttons  Array of buttons
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	public static function buttons($buttons)
+	{
+		$html = array();
+
+		foreach ($buttons as $button)
+		{
+			$html[] = JHtml::_('icons.button', $button);
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Method to generate html code for a list of buttons
+	 *
+	 * @param   array  $button  Button properties
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	public static function button($button)
+	{
+		if (isset($button['access']))
+		{
+			if (is_bool($button['access']))
+			{
+				if ($button['access'] == false)
+				{
+					return '';
+				}
+			}
+			else
+			{
+				// Get the user object to verify permissions
+				$user = JFactory::getUser();
+
+				// Take each pair of permission, context values.
+				for ($i = 0, $n = count($button['access']); $i < $n; $i += 2)
+				{
+					if (!$user->authorise($button['access'][$i], $button['access'][$i + 1]))
+					{
+						return '';
+					}
+				}
+			}
+		}
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new JLayoutFile('joomla.quickicons.icon');
+
+		return $layout->render($button);
+	}
+}
diff --git a/core/libraries/cms/html/jgrid.php b/core/libraries/cms/html/jgrid.php
new file mode 100644
index 00000000..bf8ae118
--- /dev/null
+++ b/core/libraries/cms/html/jgrid.php
@@ -0,0 +1,406 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Utility class for creating HTML Grids
+ *
+ * @since  1.6
+ */
+abstract class JHtmlJGrid
+{
+	/**
+	 * Returns an action on a grid
+	 *
+	 * @param   integer       $i               The row index
+	 * @param   string        $task            The task to fire
+	 * @param   string|array  $prefix          An optional task prefix or an array of options
+	 * @param   string        $text            An optional text to display [unused - @deprecated 4.0]
+	 * @param   string        $active_title    An optional active tooltip to display if $enable is true
+	 * @param   string        $inactive_title  An optional inactive tooltip to display if $enable is true
+	 * @param   boolean       $tip             An optional setting for tooltip
+	 * @param   string        $active_class    An optional active HTML class
+	 * @param   string        $inactive_class  An optional inactive HTML class
+	 * @param   boolean       $enabled         An optional setting for access control on the action.
+	 * @param   boolean       $translate       An optional setting for translation.
+	 * @param   string        $checkbox	       An optional prefix for checkboxes.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @since   1.6
+	 */
+	public static function action($i, $task, $prefix = '', $text = '', $active_title = '', $inactive_title = '', $tip = false, $active_class = '',
+		$inactive_class = '', $enabled = true, $translate = true, $checkbox = 'cb')
+	{
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$active_title = array_key_exists('active_title', $options) ? $options['active_title'] : $active_title;
+			$inactive_title = array_key_exists('inactive_title', $options) ? $options['inactive_title'] : $inactive_title;
+			$tip = array_key_exists('tip', $options) ? $options['tip'] : $tip;
+			$active_class = array_key_exists('active_class', $options) ? $options['active_class'] : $active_class;
+			$inactive_class = array_key_exists('inactive_class', $options) ? $options['inactive_class'] : $inactive_class;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$translate = array_key_exists('translate', $options) ? $options['translate'] : $translate;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		if ($tip)
+		{
+			JHtml::_('bootstrap.tooltip');
+
+			$title = $enabled ? $active_title : $inactive_title;
+			$title = $translate ? JText::_($title) : $title;
+			$title = JHtml::_('tooltipText', $title, '', 0);
+		}
+
+		if ($enabled)
+		{
+			$html[] = '<a class="btn btn-micro' . ($active_class === 'publish' ? ' active' : '') . ($tip ? ' hasTooltip' : '') . '"';
+			$html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
+			$html[] = $tip ? ' title="' . $title . '"' : '';
+			$html[] = '>';
+			$html[] = '<span class="icon-' . $active_class . '" aria-hidden="true"></span>';
+			$html[] = '</a>';
+		}
+		else
+		{
+			$html[] = '<a class="btn btn-micro disabled jgrid' . ($tip ? ' hasTooltip' : '') . '"';
+			$html[] = $tip ? ' title="' . $title . '"' : '';
+			$html[] = '>';
+
+			if ($active_class === 'protected')
+			{
+				$html[] = '<span class="icon-lock"></span>';
+			}
+			else
+			{
+				$html[] = '<span class="icon-' . $inactive_class . '"></span>';
+			}
+
+			$html[] = '</a>';
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Returns a state on a grid
+	 *
+	 * @param   array         $states     array of value/state. Each state is an array of the form
+	 *                                    (task, text, active title, inactive title, tip (boolean), HTML active class, HTML inactive class)
+	 *                                    or ('task'=>task, 'text'=>text, 'active_title'=>active title,
+	 *                                    'inactive_title'=>inactive title, 'tip'=>boolean, 'active_class'=>html active class,
+	 *                                    'inactive_class'=>html inactive class)
+	 * @param   integer       $value      The state value.
+	 * @param   integer       $i          The row index
+	 * @param   string|array  $prefix     An optional task prefix or an array of options
+	 * @param   boolean       $enabled    An optional setting for access control on the action.
+	 * @param   boolean       $translate  An optional setting for translation.
+	 * @param   string        $checkbox   An optional prefix for checkboxes.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @since   1.6
+	 */
+	public static function state($states, $value, $i, $prefix = '', $enabled = true, $translate = true, $checkbox = 'cb')
+	{
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$translate = array_key_exists('translate', $options) ? $options['translate'] : $translate;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		$state = ArrayHelper::getValue($states, (int) $value, $states[0]);
+		$task = array_key_exists('task', $state) ? $state['task'] : $state[0];
+		$text = array_key_exists('text', $state) ? $state['text'] : (array_key_exists(1, $state) ? $state[1] : '');
+		$active_title = array_key_exists('active_title', $state) ? $state['active_title'] : (array_key_exists(2, $state) ? $state[2] : '');
+		$inactive_title = array_key_exists('inactive_title', $state) ? $state['inactive_title'] : (array_key_exists(3, $state) ? $state[3] : '');
+		$tip = array_key_exists('tip', $state) ? $state['tip'] : (array_key_exists(4, $state) ? $state[4] : false);
+		$active_class = array_key_exists('active_class', $state) ? $state['active_class'] : (array_key_exists(5, $state) ? $state[5] : '');
+		$inactive_class = array_key_exists('inactive_class', $state) ? $state['inactive_class'] : (array_key_exists(6, $state) ? $state[6] : '');
+
+		return static::action(
+			$i, $task, $prefix, $text, $active_title, $inactive_title, $tip,
+			$active_class, $inactive_class, $enabled, $translate, $checkbox
+		);
+	}
+
+	/**
+	 * Returns a published state on a grid
+	 *
+	 * @param   integer       $value         The state value.
+	 * @param   integer       $i             The row index
+	 * @param   string|array  $prefix        An optional task prefix or an array of options
+	 * @param   boolean       $enabled       An optional setting for access control on the action.
+	 * @param   string        $checkbox      An optional prefix for checkboxes.
+	 * @param   string        $publish_up    An optional start publishing date.
+	 * @param   string        $publish_down  An optional finish publishing date.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @see     JHtmlJGrid::state()
+	 * @since   1.6
+	 */
+	public static function published($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb', $publish_up = null, $publish_down = null)
+	{
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		$states = array(
+			1 => array('unpublish', 'JPUBLISHED', 'JLIB_HTML_UNPUBLISH_ITEM', 'JPUBLISHED', true, 'publish', 'publish'),
+			0 => array('publish', 'JUNPUBLISHED', 'JLIB_HTML_PUBLISH_ITEM', 'JUNPUBLISHED', true, 'unpublish', 'unpublish'),
+			2 => array('unpublish', 'JARCHIVED', 'JLIB_HTML_UNPUBLISH_ITEM', 'JARCHIVED', true, 'archive', 'archive'),
+			-2 => array('publish', 'JTRASHED', 'JLIB_HTML_PUBLISH_ITEM', 'JTRASHED', true, 'trash', 'trash'),
+		);
+
+		// Special state for dates
+		if ($publish_up || $publish_down)
+		{
+			$nullDate = JFactory::getDbo()->getNullDate();
+			$nowDate = JFactory::getDate()->toUnix();
+
+			$tz = JFactory::getUser()->getTimezone();
+
+			$publish_up = ($publish_up != $nullDate) ? JFactory::getDate($publish_up, 'UTC')->setTimeZone($tz) : false;
+			$publish_down = ($publish_down != $nullDate) ? JFactory::getDate($publish_down, 'UTC')->setTimeZone($tz) : false;
+
+			// Create tip text, only we have publish up or down settings
+			$tips = array();
+
+			if ($publish_up)
+			{
+				$tips[] = JText::sprintf('JLIB_HTML_PUBLISHED_START', JHtml::_('date', $publish_up, JText::_('DATE_FORMAT_LC5'), 'UTC'));
+			}
+
+			if ($publish_down)
+			{
+				$tips[] = JText::sprintf('JLIB_HTML_PUBLISHED_FINISHED', JHtml::_('date', $publish_down, JText::_('DATE_FORMAT_LC5'), 'UTC'));
+			}
+
+			$tip = empty($tips) ? false : implode('<br />', $tips);
+
+			// Add tips and special titles
+			foreach ($states as $key => $state)
+			{
+				// Create special titles for published items
+				if ($key == 1)
+				{
+					$states[$key][2] = $states[$key][3] = 'JLIB_HTML_PUBLISHED_ITEM';
+
+					if ($publish_up > $nullDate && $nowDate < $publish_up->toUnix())
+					{
+						$states[$key][2] = $states[$key][3] = 'JLIB_HTML_PUBLISHED_PENDING_ITEM';
+						$states[$key][5] = $states[$key][6] = 'pending';
+					}
+
+					if ($publish_down > $nullDate && $nowDate > $publish_down->toUnix())
+					{
+						$states[$key][2] = $states[$key][3] = 'JLIB_HTML_PUBLISHED_EXPIRED_ITEM';
+						$states[$key][5] = $states[$key][6] = 'expired';
+					}
+				}
+
+				// Add tips to titles
+				if ($tip)
+				{
+					$states[$key][1] = JText::_($states[$key][1]);
+					$states[$key][2] = JText::_($states[$key][2]) . '<br />' . $tip;
+					$states[$key][3] = JText::_($states[$key][3]) . '<br />' . $tip;
+					$states[$key][4] = true;
+				}
+			}
+
+			return static::state($states, $value, $i, array('prefix' => $prefix, 'translate' => !$tip), $enabled, true, $checkbox);
+		}
+
+		return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox);
+	}
+
+	/**
+	 * Returns an isDefault state on a grid
+	 *
+	 * @param   integer       $value     The state value.
+	 * @param   integer       $i         The row index
+	 * @param   string|array  $prefix    An optional task prefix or an array of options
+	 * @param   boolean       $enabled   An optional setting for access control on the action.
+	 * @param   string        $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @see     JHtmlJGrid::state()
+	 * @since   1.6
+	 */
+	public static function isdefault($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb')
+	{
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		$states = array(
+			0 => array('setDefault', '', 'JLIB_HTML_SETDEFAULT_ITEM', '', 1, 'unfeatured', 'unfeatured'),
+			1 => array('unsetDefault', 'JDEFAULT', 'JLIB_HTML_UNSETDEFAULT_ITEM', 'JDEFAULT', 1, 'featured', 'featured'),
+		);
+
+		return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox);
+	}
+
+	/**
+	 * Returns an array of standard published state filter options.
+	 *
+	 * @param   array  $config  An array of configuration options.
+	 *                          This array can contain a list of key/value pairs where values are boolean
+	 *                          and keys can be taken from 'published', 'unpublished', 'archived', 'trash', 'all'.
+	 *                          These pairs determine which values are displayed.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @since   1.6
+	 */
+	public static function publishedOptions($config = array())
+	{
+		// Build the active state filter options.
+		$options = array();
+
+		if (!array_key_exists('published', $config) || $config['published'])
+		{
+			$options[] = JHtml::_('select.option', '1', 'JPUBLISHED');
+		}
+
+		if (!array_key_exists('unpublished', $config) || $config['unpublished'])
+		{
+			$options[] = JHtml::_('select.option', '0', 'JUNPUBLISHED');
+		}
+
+		if (!array_key_exists('archived', $config) || $config['archived'])
+		{
+			$options[] = JHtml::_('select.option', '2', 'JARCHIVED');
+		}
+
+		if (!array_key_exists('trash', $config) || $config['trash'])
+		{
+			$options[] = JHtml::_('select.option', '-2', 'JTRASHED');
+		}
+
+		if (!array_key_exists('all', $config) || $config['all'])
+		{
+			$options[] = JHtml::_('select.option', '*', 'JALL');
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Returns a checked-out icon
+	 *
+	 * @param   integer       $i           The row index.
+	 * @param   string        $editorName  The name of the editor.
+	 * @param   string        $time        The time that the object was checked out.
+	 * @param   string|array  $prefix      An optional task prefix or an array of options
+	 * @param   boolean       $enabled     True to enable the action.
+	 * @param   string        $checkbox    An optional prefix for checkboxes.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @since   1.6
+	 */
+	public static function checkedout($i, $editorName, $time, $prefix = '', $enabled = false, $checkbox = 'cb')
+	{
+		JHtml::_('bootstrap.tooltip');
+
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		$text = $editorName . '<br />' . JHtml::_('date', $time, JText::_('DATE_FORMAT_LC')) . '<br />' . JHtml::_('date', $time, 'H:i');
+		$active_title = JHtml::_('tooltipText', JText::_('JLIB_HTML_CHECKIN'), $text, 0);
+		$inactive_title = JHtml::_('tooltipText', JText::_('JLIB_HTML_CHECKED_OUT'), $text, 0);
+
+		return static::action(
+			$i, 'checkin', $prefix, JText::_('JLIB_HTML_CHECKED_OUT'), html_entity_decode($active_title, ENT_QUOTES, 'UTF-8'),
+			html_entity_decode($inactive_title, ENT_QUOTES, 'UTF-8'), true, 'checkedout', 'checkedout', $enabled, false, $checkbox
+		);
+	}
+
+	/**
+	 * Creates an order-up action icon.
+	 *
+	 * @param   integer       $i         The row index.
+	 * @param   string        $task      An optional task to fire.
+	 * @param   string|array  $prefix    An optional task prefix or an array of options
+	 * @param   string        $text      An optional text to display
+	 * @param   boolean       $enabled   An optional setting for access control on the action.
+	 * @param   string        $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @since   1.6
+	 */
+	public static function orderUp($i, $task = 'orderup', $prefix = '', $text = 'JLIB_HTML_MOVE_UP', $enabled = true, $checkbox = 'cb')
+	{
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$text = array_key_exists('text', $options) ? $options['text'] : $text;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		return static::action($i, $task, $prefix, $text, $text, $text, false, 'uparrow', 'uparrow_disabled', $enabled, true, $checkbox);
+	}
+
+	/**
+	 * Creates an order-down action icon.
+	 *
+	 * @param   integer       $i         The row index.
+	 * @param   string        $task      An optional task to fire.
+	 * @param   string|array  $prefix    An optional task prefix or an array of options
+	 * @param   string        $text      An optional text to display
+	 * @param   boolean       $enabled   An optional setting for access control on the action.
+	 * @param   string        $checkbox  An optional prefix for checkboxes.
+	 *
+	 * @return  string  The HTML markup
+	 *
+	 * @since   1.6
+	 */
+	public static function orderDown($i, $task = 'orderdown', $prefix = '', $text = 'JLIB_HTML_MOVE_DOWN', $enabled = true, $checkbox = 'cb')
+	{
+		if (is_array($prefix))
+		{
+			$options = $prefix;
+			$text = array_key_exists('text', $options) ? $options['text'] : $text;
+			$enabled = array_key_exists('enabled', $options) ? $options['enabled'] : $enabled;
+			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
+			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
+		}
+
+		return static::action($i, $task, $prefix, $text, $text, $text, false, 'downarrow', 'downarrow_disabled', $enabled, true, $checkbox);
+	}
+}
diff --git a/core/libraries/cms/html/jquery.php b/core/libraries/cms/html/jquery.php
new file mode 100644
index 00000000..a8333f8d
--- /dev/null
+++ b/core/libraries/cms/html/jquery.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for jQuery JavaScript behaviors
+ *
+ * @since  3.0
+ */
+abstract class JHtmlJquery
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.0
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Method to load the jQuery JavaScript framework into the document head
+	 *
+	 * If debugging mode is on an uncompressed version of jQuery is included for easier debugging.
+	 *
+	 * @param   boolean  $noConflict  True to load jQuery in noConflict mode [optional]
+	 * @param   mixed    $debug       Is debugging mode on? [optional]
+	 * @param   boolean  $migrate     True to enable the jQuery Migrate plugin
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function framework($noConflict = true, $debug = null, $migrate = true)
+	{
+		// Only load once
+		if (!empty(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// If no debugging value is set, use the configuration setting
+		if ($debug === null)
+		{
+			$debug = (boolean) JFactory::getConfig()->get('debug');
+		}
+
+		JHtml::_('script', 'jui/jquery.min.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+
+		// Check if we are loading in noConflict
+		if ($noConflict)
+		{
+			JHtml::_('script', 'jui/jquery-noconflict.js', array('version' => 'auto', 'relative' => true));
+		}
+
+		// Check if we are loading Migrate
+		if ($migrate)
+		{
+			JHtml::_('script', 'jui/jquery-migrate.min.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+		}
+
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to load the jQuery UI JavaScript framework into the document head
+	 *
+	 * If debugging mode is on an uncompressed version of jQuery UI is included for easier debugging.
+	 *
+	 * @param   array  $components  The jQuery UI components to load [optional]
+	 * @param   mixed  $debug       Is debugging mode on? [optional]
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function ui(array $components = array('core'), $debug = null)
+	{
+		// Set an array containing the supported jQuery UI components handled by this method
+		$supported = array('core', 'sortable');
+
+		// Include jQuery
+		static::framework();
+
+		// If no debugging value is set, use the configuration setting
+		if ($debug === null)
+		{
+			$debug = JDEBUG;
+		}
+
+		// Load each of the requested components
+		foreach ($components as $component)
+		{
+			// Only attempt to load the component if it's supported in core and hasn't already been loaded
+			if (in_array($component, $supported) && empty(static::$loaded[__METHOD__][$component]))
+			{
+				JHtml::_('script', 'jui/jquery.ui.' . $component . '.min.js', array('version' => 'auto', 'relative' => true, 'detectDebug' => $debug));
+				static::$loaded[__METHOD__][$component] = true;
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * Auto set CSRF token to ajaxSetup so all jQuery ajax call will contains CSRF token.
+	 *
+	 * @param   string  $name  The CSRF meta tag name.
+	 *
+	 * @return  void
+	 *
+	 * @throws  \InvalidArgumentException
+	 *
+	 * @since   3.8.0
+	 */
+	public static function token($name = 'csrf.token')
+	{
+		// Only load once
+		if (!empty(static::$loaded[__METHOD__][$name]))
+		{
+			return;
+		}
+
+		static::framework();
+		JHtml::_('form.csrf', $name);
+
+		$doc = JFactory::getDocument();
+
+		$doc->addScriptDeclaration(
+<<<JS
+;(function ($) {
+	$.ajaxSetup({
+		headers: {
+			'X-CSRF-Token': Joomla.getOptions('$name')
+		}
+	});
+})(jQuery);
+JS
+		);
+
+		static::$loaded[__METHOD__][$name] = true;
+	}
+}
diff --git a/core/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini b/core/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini
new file mode 100644
index 00000000..6254ee9d
--- /dev/null
+++ b/core/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini
@@ -0,0 +1,18 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+JLIB_HTML_DATE_RELATIVE_DAYS="%s days ago"
+JLIB_HTML_DATE_RELATIVE_DAYS_1="%s day ago"
+JLIB_HTML_DATE_RELATIVE_DAYS_0="%s days ago"
+JLIB_HTML_DATE_RELATIVE_HOURS="%s hours ago"
+JLIB_HTML_DATE_RELATIVE_HOURS_1="%s hour ago"
+JLIB_HTML_DATE_RELATIVE_HOURS_0="%s hours ago"
+JLIB_HTML_DATE_RELATIVE_LESSTHANAMINUTE="Less than a minute ago"
+JLIB_HTML_DATE_RELATIVE_MINUTES="%s minutes ago"
+JLIB_HTML_DATE_RELATIVE_MINUTES_1="%s minute ago"
+JLIB_HTML_DATE_RELATIVE_MINUTES_0="%s minutes ago"
+JLIB_HTML_DATE_RELATIVE_WEEKS="%s weeks ago"
+JLIB_HTML_DATE_RELATIVE_WEEKS_1="%s week ago"
+JLIB_HTML_DATE_RELATIVE_WEEKS_0="%s weeks ago"
diff --git a/core/libraries/cms/html/links.php b/core/libraries/cms/html/links.php
new file mode 100644
index 00000000..77ac9663
--- /dev/null
+++ b/core/libraries/cms/html/links.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for icons.
+ *
+ * @since  3.2
+ */
+abstract class JHtmlLinks
+{
+	/**
+	 * Method to generate html code for groups of lists of links
+	 *
+	 * @param   array  $groupsOfLinks  Array of links
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function linksgroups($groupsOfLinks)
+	{
+		$html = array();
+
+		if (count($groupsOfLinks) > 0)
+		{
+			$layout = new JLayoutFile('joomla.links.groupsopen');
+			$html[] = $layout->render('');
+
+			foreach ($groupsOfLinks as $title => $links)
+			{
+				if (isset($links[0]['separategroup']))
+				{
+					$layout = new JLayoutFile('joomla.links.groupseparator');
+					$html[] = $layout->render($title);
+				}
+
+				$layout = new JLayoutFile('joomla.links.groupopen');
+				$htmlHeader = $layout->render($title);
+
+				$htmlLinks  = JHtml::_('links.links', $links);
+
+				if ($htmlLinks != '')
+				{
+					$html[] = $htmlHeader;
+					$html[] = $htmlLinks;
+
+					$layout = new JLayoutFile('joomla.links.groupclose');
+					$html[] = $layout->render('');
+				}
+			}
+
+			$layout = new JLayoutFile('joomla.links.groupsclose');
+			$html[] = $layout->render('');
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Method to generate html code for a list of links
+	 *
+	 * @param   array  $links  Array of links
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function links($links)
+	{
+		$html = array();
+
+		foreach ($links as $link)
+		{
+			$html[] = JHtml::_('links.link', $link);
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Method to generate html code for a single link
+	 *
+	 * @param   array  $link  link properties
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function link($link)
+	{
+		if (isset($link['access']))
+		{
+			if (is_bool($link['access']))
+			{
+				if ($link['access'] == false)
+				{
+					return '';
+				}
+			}
+			else
+			{
+				// Get the user object to verify permissions
+				$user = JFactory::getUser();
+
+				// Take each pair of permission, context values.
+				for ($i = 0, $n = count($link['access']); $i < $n; $i += 2)
+				{
+					if (!$user->authorise($link['access'][$i], $link['access'][$i + 1]))
+					{
+						return '';
+					}
+				}
+			}
+		}
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new JLayoutFile('joomla.links.link');
+
+		return $layout->render($link);
+	}
+}
diff --git a/core/libraries/cms/html/list.php b/core/libraries/cms/html/list.php
new file mode 100644
index 00000000..6c4a2ed1
--- /dev/null
+++ b/core/libraries/cms/html/list.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Utility class for creating different select lists
+ *
+ * @since  1.5
+ */
+abstract class JHtmlList
+{
+	/**
+	 * Build the select list to choose an image
+	 *
+	 * @param   string  $name        The name of the field
+	 * @param   string  $active      The selected item
+	 * @param   string  $javascript  Alternative javascript
+	 * @param   string  $directory   Directory the images are stored in
+	 * @param   string  $extensions  Allowed extensions
+	 *
+	 * @return  array  Image names
+	 *
+	 * @since   1.5
+	 */
+	public static function images($name, $active = null, $javascript = null, $directory = null, $extensions = 'bmp|gif|jpg|png')
+	{
+		if (!$directory)
+		{
+			$directory = '/images/';
+		}
+
+		if (!$javascript)
+		{
+			$javascript = "onchange=\"if (document.forms.adminForm." . $name
+				. ".options[selectedIndex].value!='') {document.imagelib.src='..$directory' + document.forms.adminForm." . $name
+				. ".options[selectedIndex].value} else {document.imagelib.src='media/system/images/blank.png'}\"";
+		}
+
+		$imageFiles = new DirectoryIterator(JPATH_SITE . '/' . $directory);
+		$images = array(JHtml::_('select.option', '', JText::_('JOPTION_SELECT_IMAGE')));
+
+		foreach ($imageFiles as $file)
+		{
+			$fileName = $file->getFilename();
+
+			if (!$file->isFile())
+			{
+				continue;
+			}
+
+			if (preg_match('#(' . $extensions . ')$#', $fileName))
+			{
+				$images[] = JHtml::_('select.option', $fileName);
+			}
+		}
+
+		$images = JHtml::_(
+			'select.genericlist',
+			$images,
+			$name,
+			array(
+				'list.attr' => 'class="inputbox" size="1" ' . $javascript,
+				'list.select' => $active,
+			)
+		);
+
+		return $images;
+	}
+
+	/**
+	 * Returns an array of options
+	 *
+	 * @param   string   $query  SQL with 'ordering' AS value and 'name field' AS text
+	 * @param   integer  $chop   The length of the truncated headline
+	 *
+	 * @return  array  An array of objects formatted for JHtml list processing
+	 *
+	 * @since   1.5
+	 */
+	public static function genericordering($query, $chop = 30)
+	{
+		$db = JFactory::getDbo();
+		$options = array();
+		$db->setQuery($query);
+
+		$items = $db->loadObjectList();
+
+		if (empty($items))
+		{
+			$options[] = JHtml::_('select.option', 1, JText::_('JOPTION_ORDER_FIRST'));
+
+			return $options;
+		}
+
+		$options[] = JHtml::_('select.option', 0, '0 ' . JText::_('JOPTION_ORDER_FIRST'));
+
+		for ($i = 0, $n = count($items); $i < $n; $i++)
+		{
+			$items[$i]->text = JText::_($items[$i]->text);
+
+			if (StringHelper::strlen($items[$i]->text) > $chop)
+			{
+				$text = StringHelper::substr($items[$i]->text, 0, $chop) . '...';
+			}
+			else
+			{
+				$text = $items[$i]->text;
+			}
+
+			$options[] = JHtml::_('select.option', $items[$i]->value, $items[$i]->value . '. ' . $text);
+		}
+
+		$options[] = JHtml::_('select.option', $items[$i - 1]->value + 1, ($items[$i - 1]->value + 1) . ' ' . JText::_('JOPTION_ORDER_LAST'));
+
+		return $options;
+	}
+
+	/**
+	 * Build the select list for Ordering derived from a query
+	 *
+	 * @param   integer  $name      The scalar value
+	 * @param   string   $query     The query
+	 * @param   string   $attribs   HTML tag attributes
+	 * @param   string   $selected  The selected item
+	 * @param   integer  $neworder  1 if new and first, -1 if new and last, 0  or null if existing item
+	 *
+	 * @return  string   HTML markup for the select list
+	 *
+	 * @since   1.6
+	 */
+	public static function ordering($name, $query, $attribs = null, $selected = null, $neworder = null)
+	{
+		if (empty($attribs))
+		{
+			$attribs = 'class="inputbox" size="1"';
+		}
+
+		if (empty($neworder))
+		{
+			$orders = JHtml::_('list.genericordering', $query);
+			$html = JHtml::_('select.genericlist', $orders, $name, array('list.attr' => $attribs, 'list.select' => (int) $selected));
+		}
+		else
+		{
+			if ($neworder > 0)
+			{
+				$text = JText::_('JGLOBAL_NEWITEMSLAST_DESC');
+			}
+			elseif ($neworder <= 0)
+			{
+				$text = JText::_('JGLOBAL_NEWITEMSFIRST_DESC');
+			}
+
+			$html = '<input type="hidden" name="' . $name . '" value="' . (int) $selected . '" /><span class="readonly">' . $text . '</span>';
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Select list of active users
+	 *
+	 * @param   string   $name        The name of the field
+	 * @param   string   $active      The active user
+	 * @param   integer  $nouser      If set include an option to select no user
+	 * @param   string   $javascript  Custom javascript
+	 * @param   string   $order       Specify a field to order by
+	 *
+	 * @return  string   The HTML for a list of users list of users
+	 *
+	 * @since   1.5
+	 */
+	public static function users($name, $active, $nouser = 0, $javascript = null, $order = 'name')
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('u.id AS value, u.name AS text')
+			->from('#__users AS u')
+			->join('LEFT', '#__user_usergroup_map AS m ON m.user_id = u.id')
+			->where('u.block = 0')
+			->order($order)
+			->group('u.id');
+		$db->setQuery($query);
+
+		if ($nouser)
+		{
+			$users[] = JHtml::_('select.option', '0', JText::_('JOPTION_NO_USER'));
+			$users = array_merge($users, $db->loadObjectList());
+		}
+		else
+		{
+			$users = $db->loadObjectList();
+		}
+
+		$users = JHtml::_(
+			'select.genericlist',
+			$users,
+			$name,
+			array(
+				'list.attr' => 'class="inputbox" size="1" ' . $javascript,
+				'list.select' => $active,
+			)
+		);
+
+		return $users;
+	}
+
+	/**
+	 * Select list of positions - generally used for location of images
+	 *
+	 * @param   string   $name        Name of the field
+	 * @param   string   $active      The active value
+	 * @param   string   $javascript  Alternative javascript
+	 * @param   boolean  $none        Null if not assigned
+	 * @param   boolean  $center      Null if not assigned
+	 * @param   boolean  $left        Null if not assigned
+	 * @param   boolean  $right       Null if not assigned
+	 * @param   boolean  $id          Null if not assigned
+	 *
+	 * @return  array  The positions
+	 *
+	 * @since   1.5
+	 */
+	public static function positions($name, $active = null, $javascript = null, $none = true, $center = true, $left = true, $right = true,
+		$id = false)
+	{
+		$pos = array();
+
+		if ($none)
+		{
+			$pos[''] = JText::_('JNONE');
+		}
+
+		if ($center)
+		{
+			$pos['center'] = JText::_('JGLOBAL_CENTER');
+		}
+
+		if ($left)
+		{
+			$pos['left'] = JText::_('JGLOBAL_LEFT');
+		}
+
+		if ($right)
+		{
+			$pos['right'] = JText::_('JGLOBAL_RIGHT');
+		}
+
+		$positions = JHtml::_(
+			'select.genericlist', $pos, $name,
+			array(
+				'id' => $id,
+				'list.attr' => 'class="inputbox" size="1"' . $javascript,
+				'list.select' => $active,
+				'option.key' => null,
+			)
+		);
+
+		return $positions;
+	}
+}
diff --git a/core/libraries/cms/html/menu.php b/core/libraries/cms/html/menu.php
new file mode 100644
index 00000000..4a98c647
--- /dev/null
+++ b/core/libraries/cms/html/menu.php
@@ -0,0 +1,397 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class working with menu select lists
+ *
+ * @since  1.5
+ */
+abstract class JHtmlMenu
+{
+	/**
+	 * Cached array of the menus.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected static $menus = array();
+
+	/**
+	 * Cached array of the menus items.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected static $items = array();
+
+	/**
+	 * Get a list of the available menus.
+	 *
+	 * @param   int  $clientId  The client id
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function menus($clientId = 0)
+	{
+		$key = serialize($clientId);
+
+		if (!isset(static::$menus[$key]))
+		{
+			$db = JFactory::getDbo();
+
+			$query = $db->getQuery(true)
+				->select($db->qn(array('id', 'menutype', 'title', 'client_id'), array('id', 'value', 'text', 'client_id')))
+				->from($db->quoteName('#__menu_types'))
+				->order('client_id, title');
+
+			if (isset($clientId))
+			{
+				$query->where('client_id = ' . (int) $clientId);
+			}
+
+			static::$menus[$key] = $db->setQuery($query)->loadObjectList();
+		}
+
+		return static::$menus[$key];
+	}
+
+	/**
+	 * Returns an array of menu items grouped by menu.
+	 *
+	 * @param   array  $config  An array of configuration options [published, checkacl, clientid].
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function menuItems($config = array())
+	{
+		$key = serialize($config);
+
+		if (empty(static::$items[$key]))
+		{
+			// B/C - not passed  = 0, null can be passed for both clients
+			$clientId = array_key_exists('clientid', $config) ? $config['clientid'] : 0;
+			$menus    = static::menus($clientId);
+
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('a.id AS value, a.title AS text, a.level, a.menutype, a.client_id')
+				->from('#__menu AS a')
+				->where('a.parent_id > 0');
+
+			// Filter on the client id
+			if (isset($clientId))
+			{
+				$query->where('a.client_id = ' . (int) $clientId);
+			}
+
+			// Filter on the published state
+			if (isset($config['published']))
+			{
+				if (is_numeric($config['published']))
+				{
+					$query->where('a.published = ' . (int) $config['published']);
+				}
+				elseif ($config['published'] === '')
+				{
+					$query->where('a.published IN (0,1)');
+				}
+			}
+
+			$query->order('a.lft');
+
+			$db->setQuery($query);
+			$items = $db->loadObjectList();
+
+			// Collate menu items based on menutype
+			$lookup = array();
+
+			foreach ($items as &$item)
+			{
+				if (!isset($lookup[$item->menutype]))
+				{
+					$lookup[$item->menutype] = array();
+				}
+
+				$lookup[$item->menutype][] = &$item;
+
+				$item->text = str_repeat('- ', $item->level) . $item->text;
+			}
+
+			static::$items[$key] = array();
+
+			$user = JFactory::getUser();
+
+			$aclcheck = !empty($config['checkacl']) ? (int) $config['checkacl'] : 0;
+
+			foreach ($menus as &$menu)
+			{
+				if ($aclcheck)
+				{
+					$action = $aclcheck == $menu->id ? 'edit' : 'create';
+
+					if (!$user->authorise('core.' . $action, 'com_menus.menu.' . $menu->id))
+					{
+						continue;
+					}
+				}
+
+				// Start group:
+				static::$items[$key][] = JHtml::_('select.optgroup', $menu->text);
+
+				// Special "Add to this Menu" option:
+				static::$items[$key][] = JHtml::_('select.option', $menu->value . '.1', JText::_('JLIB_HTML_ADD_TO_THIS_MENU'));
+
+				// Menu items:
+				if (isset($lookup[$menu->value]))
+				{
+					foreach ($lookup[$menu->value] as &$item)
+					{
+						static::$items[$key][] = JHtml::_('select.option', $menu->value . '.' . $item->value, $item->text);
+					}
+				}
+
+				// Finish group:
+				static::$items[$key][] = JHtml::_('select.optgroup', $menu->text);
+			}
+		}
+
+		return static::$items[$key];
+	}
+
+	/**
+	 * Displays an HTML select list of menu items.
+	 *
+	 * @param   string  $name      The name of the control.
+	 * @param   string  $selected  The value of the selected option.
+	 * @param   string  $attribs   Attributes for the control.
+	 * @param   array   $config    An array of options for the control [id, published, checkacl, clientid].
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 */
+	public static function menuItemList($name, $selected = null, $attribs = null, $config = array())
+	{
+		static $count;
+
+		$options = static::menuItems($config);
+
+		return JHtml::_(
+			'select.genericlist', $options, $name,
+			array(
+				'id'             => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
+				'list.attr'      => $attribs === null ? 'class="inputbox" size="1"' : $attribs,
+				'list.select'    => (int) $selected,
+				'list.translate' => false,
+			)
+		);
+	}
+
+	/**
+	 * Build the select list for Menu Ordering
+	 *
+	 * @param   object   &$row  The row object
+	 * @param   integer  $id    The id for the row. Must exist to enable menu ordering
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function ordering(&$row, $id)
+	{
+		if ($id)
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('ordering AS value, title AS text')
+				->from($db->quoteName('#__menu'))
+				->where($db->quoteName('menutype') . ' = ' . $db->quote($row->menutype))
+				->where($db->quoteName('parent_id') . ' = ' . (int) $row->parent_id)
+				->where($db->quoteName('published') . ' != -2')
+				->order('ordering');
+			$order = JHtml::_('list.genericordering', $query);
+			$ordering = JHtml::_(
+				'select.genericlist', $order, 'ordering',
+				array('list.attr' => 'class="inputbox" size="1"', 'list.select' => (int) $row->ordering)
+			);
+		}
+		else
+		{
+			$ordering = '<input type="hidden" name="ordering" value="' . $row->ordering . '" />' . JText::_('JGLOBAL_NEWITEMSLAST_DESC');
+		}
+
+		return $ordering;
+	}
+
+	/**
+	 * Build the multiple select list for Menu Links/Pages
+	 *
+	 * @param   boolean  $all         True if all can be selected
+	 * @param   boolean  $unassigned  True if unassigned can be selected
+	 * @param   int      $clientId    The client id
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function linkOptions($all = false, $unassigned = false, $clientId = 0)
+	{
+		$db = JFactory::getDbo();
+
+		// Get a list of the menu items
+		$query = $db->getQuery(true)
+			->select('m.id, m.parent_id, m.title, m.menutype, m.client_id')
+			->from($db->quoteName('#__menu') . ' AS m')
+			->where($db->quoteName('m.published') . ' = 1')
+			->order('m.client_id, m.menutype, m.parent_id');
+
+		if (isset($clientId))
+		{
+			$query->where('m.client_id = ' . (int) $clientId);
+		}
+
+		$db->setQuery($query);
+
+		$mitems = $db->loadObjectList();
+
+		if (!$mitems)
+		{
+			$mitems = array();
+		}
+
+		// Establish the hierarchy of the menu
+		$children = array();
+
+		// First pass - collect children
+		foreach ($mitems as $v)
+		{
+			$pt            = $v->parent_id;
+			$list          = @$children[$pt] ? $children[$pt] : array();
+			$list[]        = $v;
+			$children[$pt] = $list;
+		}
+
+		// Second pass - get an indent list of the items
+		$list = static::treerecurse((int) $mitems[0]->parent_id, '', array(), $children, 9999, 0, 0);
+
+		// Code that adds menu name to Display of Page(s)
+		$mitems = array();
+
+		if ($all | $unassigned)
+		{
+			$mitems[] = JHtml::_('select.option', '<OPTGROUP>', JText::_('JOPTION_MENUS'));
+
+			if ($all)
+			{
+				$mitems[] = JHtml::_('select.option', 0, JText::_('JALL'));
+			}
+
+			if ($unassigned)
+			{
+				$mitems[] = JHtml::_('select.option', -1, JText::_('JOPTION_UNASSIGNED'));
+			}
+
+			$mitems[] = JHtml::_('select.option', '</OPTGROUP>');
+		}
+
+		$lastMenuType = null;
+		$tmpMenuType  = null;
+
+		foreach ($list as $list_a)
+		{
+			if ($list_a->menutype != $lastMenuType)
+			{
+				if ($tmpMenuType)
+				{
+					$mitems[] = JHtml::_('select.option', '</OPTGROUP>');
+				}
+
+				$mitems[]     = JHtml::_('select.option', '<OPTGROUP>', $list_a->menutype);
+				$lastMenuType = $list_a->menutype;
+				$tmpMenuType  = $list_a->menutype;
+			}
+
+			$mitems[] = JHtml::_('select.option', $list_a->id, $list_a->title);
+		}
+
+		if ($lastMenuType !== null)
+		{
+			$mitems[] = JHtml::_('select.option', '</OPTGROUP>');
+		}
+
+		return $mitems;
+	}
+
+	/**
+	 * Build the list representing the menu tree
+	 *
+	 * @param   integer  $id         Id of the menu item
+	 * @param   string   $indent     The indentation string
+	 * @param   array    $list       The list to process
+	 * @param   array    &$children  The children of the current item
+	 * @param   integer  $maxlevel   The maximum number of levels in the tree
+	 * @param   integer  $level      The starting level
+	 * @param   int      $type       Set the type of spacer to use. Use 1 for |_ or 0 for -
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public static function treerecurse($id, $indent, $list, &$children, $maxlevel = 9999, $level = 0, $type = 1)
+	{
+		if ($level <= $maxlevel && isset($children[$id]) && is_array($children[$id]))
+		{
+			if ($type)
+			{
+				$pre    = '<sup>|_</sup>&#160;';
+				$spacer = '.&#160;&#160;&#160;&#160;&#160;&#160;';
+			}
+			else
+			{
+				$pre    = '- ';
+				$spacer = '&#160;&#160;';
+			}
+
+			foreach ($children[$id] as $v)
+			{
+				$id = $v->id;
+
+				if ($v->parent_id == 0)
+				{
+					$txt = $v->title;
+				}
+				else
+				{
+					$txt = $pre . $v->title;
+				}
+
+				$list[$id]           = $v;
+				$list[$id]->treename = $indent . $txt;
+
+				if (isset($children[$id]) && is_array($children[$id]))
+				{
+					$list[$id]->children = count($children[$id]);
+					$list                = static::treerecurse($id, $indent . $spacer, $list, $children, $maxlevel, $level + 1, $type);
+				}
+				else
+				{
+					$list[$id]->children = 0;
+				}
+			}
+		}
+
+		return $list;
+	}
+}
diff --git a/core/libraries/cms/html/number.php b/core/libraries/cms/html/number.php
new file mode 100644
index 00000000..fb00b3ef
--- /dev/null
+++ b/core/libraries/cms/html/number.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTML helper class for rendering numbers.
+ *
+ * @since  1.6
+ */
+abstract class JHtmlNumber
+{
+	/**
+	 * Converts bytes to more distinguishable formats such as:
+	 * kilobytes, megabytes, etc.
+	 *
+	 * By default, the proper format will automatically be chosen.
+	 * However, one of the allowed unit types (viz. 'b', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB') may also be used instead.
+	 * IEC standard unit types ('KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB') can be used as well.
+	 *
+	 * @param   string   $bytes      The number of bytes. Can be either numeric or suffixed format: 32M, 60K, 12G or 812b
+	 * @param   string   $unit       The type of unit to return, few special values are:
+	 *                               Blank string '' for no unit,
+	 *                               'auto' to choose automatically (default)
+	 *                               'binary' to choose automatically but use binary unit prefix
+	 * @param   integer  $precision  The number of digits to be used after the decimal place.
+	 * @param   bool     $iec        Whether to be aware of IEC standards. IEC prefixes are always acceptable in input.
+	 *                               When IEC is ON:  KiB = 1024 B, KB = 1000 B
+	 *                               When IEC is OFF: KiB = 1024 B, KB = 1024 B
+	 *
+	 * @return  string   The number of bytes in the proper units.
+	 *
+	 * @since   1.6
+	 * @link    https://en.wikipedia.org/wiki/Binary_prefix
+	 */
+	public static function bytes($bytes, $unit = 'auto', $precision = 2, $iec = false)
+	{
+		/*
+		 * Allowed 123.45, 123.45 M, 123.45 Mi, 123.45 MB, 123.45 MiB, 1.2345E+12MB, 1.2345E+12 MB , 1.2345E+12 MiB etc.
+		 * i.e. – Any number in decimal digits or in sci. notation, optional space, optional 1-3 letter unit suffix
+		 */
+		if (is_numeric($bytes))
+		{
+			$oBytes = $bytes;
+		}
+		else
+		{
+			preg_match('/(.*?)\s?((?:[KMGTPEZY]i?)?B?)$/i', trim($bytes), $matches);
+			list(, $oBytes, $oUnit) = $matches;
+
+			if ($oUnit && is_numeric($oBytes))
+			{
+				$oBase  = $iec && strpos($oUnit, 'i') === false ? 1000 : 1024;
+				$factor = pow($oBase, stripos('BKMGTPEZY', $oUnit[0]));
+				$oBytes *= $factor;
+			}
+		}
+
+		if (empty($oBytes) || !is_numeric($oBytes))
+		{
+			return 0;
+		}
+
+		$oBytes = round($oBytes);
+
+		// If no unit is requested return early
+		if ($unit === '')
+		{
+			return (string) $oBytes;
+		}
+
+		$stdSuffixes = array('b', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+		$iecSuffixes = array('b', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
+
+		// User supplied method
+		if (in_array($unit, $iecSuffixes))
+		{
+			$base   = 1024;
+			$i      = array_search($unit, $iecSuffixes, true);
+			$suffix = $unit;
+		}
+		elseif (in_array($unit, $stdSuffixes))
+		{
+			$base   = $iec ? 1000 : 1024;
+			$i      = array_search($unit, $stdSuffixes, true);
+			$suffix = $unit;
+		}
+		elseif ($unit === 'binary')
+		{
+			$base   = 1024;
+			$i      = (int) floor(log($oBytes, $base));
+			$suffix = $iecSuffixes[$i];
+		}
+		else
+		{
+			// Default method
+			$base   = $iec ? 1000 : 1024;
+			$i      = (int) floor(log($oBytes, $base));
+			$suffix = $stdSuffixes[$i];
+		}
+
+		return number_format(
+			round($oBytes / pow($base, $i), (int) $precision), (int) $precision, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR')
+		) . ' ' . $suffix;
+	}
+}
diff --git a/core/libraries/cms/html/rules.php b/core/libraries/cms/html/rules.php
new file mode 100644
index 00000000..971ac4c7
--- /dev/null
+++ b/core/libraries/cms/html/rules.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JHtmlRules is deprecated.', JLog::WARNING, 'deprecated');
+
+/**
+ * Extended Utility class for all HTML drawing classes.
+ *
+ * @since       1.6
+ * @deprecated  4.0
+ */
+abstract class JHtmlRules
+{
+	/**
+	 * Creates the HTML for the permissions widget
+	 *
+	 * @param   array    $actions   Array of action objects
+	 * @param   integer  $assetId   Id of a specific asset to  create a widget for.
+	 * @param   integer  $parent    Id of the parent of the asset
+	 * @param   string   $control   The form control
+	 * @param   string   $idPrefix  Prefix for the ids assigned to specific action-group pairs
+	 *
+	 * @return  string   HTML for the permissions widget
+	 *
+	 * @see     JAccess
+	 * @see     JFormFieldRules
+	 * @since   1.6
+	 * @deprecated  4.0
+	 */
+	public static function assetFormWidget($actions, $assetId = null, $parent = null, $control = 'jform[rules]', $idPrefix = 'jform_rules')
+	{
+		$images = static::_getImagesArray();
+
+		// Get the user groups.
+		$groups = static::_getUserGroups();
+
+		// Get the incoming inherited rules as well as the asset specific rules.
+		$inheriting = JAccess::getAssetRules($parent ?: static::_getParentAssetId($assetId), true);
+		$inherited = JAccess::getAssetRules($assetId, true);
+		$rules = JAccess::getAssetRules($assetId);
+
+		$html = array();
+
+		$html[] = '<div class="acl-options">';
+		$html[] = JHtml::_('tabs.start', 'acl-rules-' . $assetId, array('useCookie' => 1));
+		$html[] = JHtml::_('tabs.panel', JText::_('JLIB_HTML_ACCESS_SUMMARY'), 'summary');
+		$html[] = '			<p>' . JText::_('JLIB_HTML_ACCESS_SUMMARY_DESC') . '</p>';
+		$html[] = '			<table class="aclsummary-table" summary="' . JText::_('JLIB_HTML_ACCESS_SUMMARY_DESC') . '">';
+		$html[] = '			<caption>' . JText::_('JLIB_HTML_ACCESS_SUMMARY_DESC_CAPTION') . '</caption>';
+		$html[] = '			<tr>';
+		$html[] = '				<th class="col1 hidelabeltxt">' . JText::_('JLIB_RULES_GROUPS') . '</th>';
+
+		foreach ($actions as $i => $action)
+		{
+			$html[] = '				<th class="col' . ($i + 2) . '">' . JText::_($action->title) . '</th>';
+		}
+
+		$html[] = '			</tr>';
+
+		foreach ($groups as $i => $group)
+		{
+			$html[] = '			<tr class="row' . ($i % 2) . '">';
+			$html[] = '				<td class="col1">' . $group->text . '</td>';
+
+			foreach ($actions as $j => $action)
+			{
+				$html[] = '				<td class="col' . ($j + 2) . '">'
+					. ($assetId ? ($inherited->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])
+					: ($inheriting->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])) . '</td>';
+			}
+
+			$html[] = '			</tr>';
+		}
+
+		$html[] = ' 		</table>';
+
+		foreach ($actions as $action)
+		{
+			$actionTitle = JText::_($action->title);
+			$actionDesc = JText::_($action->description);
+			$html[] = JHtml::_('tabs.panel', $actionTitle, $action->name);
+			$html[] = '			<p>' . $actionDesc . '</p>';
+			$html[] = '			<table class="aclmodify-table" summary="' . strip_tags($actionDesc) . '">';
+			$html[] = '			<caption>' . JText::_('JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_ACL') . ' ' . $actionTitle . ' '
+				. JText::_('JLIB_HTML_ACCESS_MODIFY_DESC_CAPTION_TABLE') . '</caption>';
+			$html[] = '			<tr>';
+			$html[] = '				<th class="col1 hidelabeltxt">' . JText::_('JLIB_RULES_GROUP') . '</th>';
+			$html[] = '				<th class="col2">' . JText::_('JLIB_RULES_INHERIT') . '</th>';
+			$html[] = '				<th class="col3 hidelabeltxt">' . JText::_('JMODIFY') . '</th>';
+			$html[] = '				<th class="col4">' . JText::_('JCURRENT') . '</th>';
+			$html[] = '			</tr>';
+
+			foreach ($groups as $i => $group)
+			{
+				$selected = $rules->allow($action->name, $group->value);
+
+				$html[] = '			<tr class="row' . ($i % 2) . '">';
+				$html[] = '				<td class="col1">' . $group->text . '</td>';
+				$html[] = '				<td class="col2">'
+					. ($inheriting->allow($action->name, $group->identities) ? $images['allow-i'] : $images['deny-i']) . '</td>';
+				$html[] = '				<td class="col3">';
+				$html[] = '					<select id="' . $idPrefix . '_' . $action->name . '_' . $group->value
+					. '" class="inputbox" size="1" name="' . $control . '[' . $action->name . '][' . $group->value . ']" title="'
+					. JText::sprintf('JLIB_RULES_SELECT_ALLOW_DENY_GROUP', $actionTitle, $group->text) . '">';
+				$html[] = '						<option value=""' . ($selected === null ? ' selected="selected"' : '') . '>'
+					. JText::_('JLIB_RULES_INHERIT') . '</option>';
+				$html[] = '						<option value="1"' . ($selected === true ? ' selected="selected"' : '') . '>'
+					. JText::_('JLIB_RULES_ALLOWED') . '</option>';
+				$html[] = '						<option value="0"' . ($selected === false ? ' selected="selected"' : '') . '>'
+					. JText::_('JLIB_RULES_DENIED') . '</option>';
+				$html[] = '					</select>';
+				$html[] = '				</td>';
+				$html[] = '				<td class="col4">'
+					. ($assetId ? ($inherited->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])
+					: ($inheriting->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])) . '</td>';
+				$html[] = '			</tr>';
+			}
+
+			$html[] = '			</table>';
+		}
+
+		$html[] = JHtml::_('tabs.end');
+
+		// Build the footer with legend and special purpose buttons.
+		$html[] = '	<div class="clr"></div>';
+		$html[] = '	<ul class="acllegend fltlft">';
+		$html[] = '		<li class="acl-allowed">' . JText::_('JLIB_RULES_ALLOWED') . '</li>';
+		$html[] = '		<li class="acl-denied">' . JText::_('JLIB_RULES_DENIED') . '</li>';
+		$html[] = '	</ul>';
+		$html[] = '</div>';
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Get the id of the parent asset
+	 *
+	 * @param   integer  $assetId  The asset for which the parentid will be returned
+	 *
+	 * @return  integer  The id of the parent asset
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0
+	 */
+	protected static function _getParentAssetId($assetId)
+	{
+		// Get a database object.
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Get the user groups from the database.
+		$query->select($db->quoteName('parent_id'))
+			->from($db->quoteName('#__assets'))
+			->where($db->quoteName('id') . ' = ' . (int) $assetId);
+		$db->setQuery($query);
+
+		return (int) $db->loadResult();
+	}
+
+	/**
+	 * Get the user groups
+	 *
+	 * @return  array  Array of user groups
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0
+	 */
+	protected static function _getUserGroups()
+	{
+		// Get a database object.
+		$db = JFactory::getDbo();
+
+		// Get the user groups from the database.
+		$db->setQuery(
+			'SELECT a.id AS value, a.title AS text, b.id as parent'
+			. ' FROM #__usergroups AS a LEFT JOIN #__usergroups AS b ON a.lft >= b.lft AND a.rgt <= b.rgt'
+			. ' ORDER BY a.lft ASC, b.lft ASC'
+		);
+		$result = $db->loadObjectList();
+		$options = array();
+
+		// Pre-compute additional values.
+		foreach ($result as $option)
+		{
+			$end = end($options);
+
+			if ($end === false || $end->value != $option->value)
+			{
+				$end = $option;
+				$end->level = 0;
+				$options[] = $end;
+			}
+			else
+			{
+				$end->level++;
+			}
+
+			$end->identities[] = $option->parent;
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get the array of images associate with specific permissions
+	 *
+	 * @return  array  An associative  array of permissions and images
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0
+	 */
+	protected static function _getImagesArray()
+	{
+		$images['allow-l'] = '<label class="icon-16-allow" title="' . JText::_('JLIB_RULES_ALLOWED') . '">' . JText::_('JLIB_RULES_ALLOWED')
+			. '</label>';
+		$images['deny-l'] = '<label class="icon-16-deny" title="' . JText::_('JLIB_RULES_DENIED') . '">' . JText::_('JLIB_RULES_DENIED') . '</label>';
+		$images['allow'] = '<a class="icon-16-allow" title="' . JText::_('JLIB_RULES_ALLOWED') . '"> </a>';
+		$images['deny'] = '<a class="icon-16-deny" title="' . JText::_('JLIB_RULES_DENIED') . '"> </a>';
+		$images['allow-i'] = '<a class="icon-16-allowinactive" title="' . JText::_('JRULE_ALLOWED_INHERITED') . '"> </a>';
+		$images['deny-i'] = '<a class="icon-16-denyinactive" title="' . JText::_('JRULE_DENIED_INHERITED') . '"> </a>';
+
+		return $images;
+	}
+}
diff --git a/core/libraries/cms/html/searchtools.php b/core/libraries/cms/html/searchtools.php
new file mode 100644
index 00000000..cc272d6a
--- /dev/null
+++ b/core/libraries/cms/html/searchtools.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Searchtools elements.
+ *
+ * @since  3.2
+ */
+abstract class JHtmlSearchtools
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.2
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Load the main Searchtools libraries
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function main()
+	{
+		// Only load once
+		if (empty(static::$loaded[__METHOD__]))
+		{
+			// Requires jQuery but allows to skip its loading
+			if ($loadJquery = (!isset($options['loadJquery']) || $options['loadJquery'] != 0))
+			{
+				JHtml::_('jquery.framework');
+			}
+
+			// Load the jQuery plugin && CSS
+			JHtml::_('script', 'jui/jquery.searchtools.min.js', array('version' => 'auto', 'relative' => true));
+			JHtml::_('stylesheet', 'jui/jquery.searchtools.css', array('version' => 'auto', 'relative' => true));
+
+			static::$loaded[__METHOD__] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Load searchtools for a specific form
+	 *
+	 * @param   mixed  $selector  Is debugging mode on? [optional]
+	 * @param   array  $options   Optional array of parameters for search tools
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function form($selector = '.js-stools-form', $options = array())
+	{
+		$sig = md5(serialize(array($selector, $options)));
+
+		// Only load once
+		if (!isset(static::$loaded[__METHOD__][$sig]))
+		{
+			// Include Bootstrap framework
+			static::main();
+
+			// Add the form selector to the search tools options
+			$options['formSelector'] = $selector;
+
+			// Generate options with default values
+			$options = static::optionsToRegistry($options);
+
+			$doc = JFactory::getDocument();
+			$script = "
+				(function($){
+					$(document).ready(function() {
+						$('" . $selector . "').searchtools(
+							" . $options->toString() . "
+						);
+					});
+				})(jQuery);
+			";
+			$doc->addScriptDeclaration($script);
+
+			static::$loaded[__METHOD__][$sig] = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Function to receive & pre-process javascript options
+	 *
+	 * @param   mixed  $options  Associative array/Registry object with options
+	 *
+	 * @return  Registry         Options converted to Registry object
+	 */
+	private static function optionsToRegistry($options)
+	{
+		// Support options array
+		if (is_array($options))
+		{
+			$options = new Registry($options);
+		}
+
+		if (!($options instanceof Registry))
+		{
+			$options = new Registry;
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Method to sort a column in a grid
+	 *
+	 * @param   string  $title          The link title
+	 * @param   string  $order          The order field for the column
+	 * @param   string  $direction      The current direction
+	 * @param   mixed   $selected       The selected ordering
+	 * @param   string  $task           An optional task override
+	 * @param   string  $new_direction  An optional direction for the new column
+	 * @param   string  $tip            An optional text shown as tooltip title instead of $title
+	 * @param   string  $icon           Icon to show
+	 * @param   string  $formName       Name of the form to submit
+	 *
+	 * @return  string
+	 */
+	public static function sort($title, $order, $direction = 'asc', $selected = 0, $task = null, $new_direction = 'asc', $tip = '', $icon = null,
+		$formName = 'adminForm')
+	{
+		$direction = strtolower($direction);
+		$orderIcons = array('icon-arrow-up-3', 'icon-arrow-down-3');
+		$index = (int) ($direction === 'desc');
+
+		if ($order !== $selected)
+		{
+			$direction = $new_direction;
+		}
+		else
+		{
+			$direction = $direction === 'desc' ? 'asc' : 'desc';
+		}
+
+		// Create an object to pass it to the layouts
+		$data            = new stdClass;
+		$data->order     = $order;
+		$data->direction = $direction;
+		$data->selected  = $selected;
+		$data->task      = $task;
+		$data->tip       = $tip;
+		$data->title     = $title;
+		$data->orderIcon = $orderIcons[$index];
+		$data->icon      = $icon;
+		$data->formName  = $formName;
+
+		return JLayoutHelper::render('joomla.searchtools.grid.sort', $data);
+	}
+}
diff --git a/core/libraries/cms/html/select.php b/core/libraries/cms/html/select.php
new file mode 100644
index 00000000..82799b1c
--- /dev/null
+++ b/core/libraries/cms/html/select.php
@@ -0,0 +1,820 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Utility class for creating HTML select lists
+ *
+ * @since  1.5
+ */
+abstract class JHtmlSelect
+{
+	/**
+	 * Default values for options. Organized by option group.
+	 *
+	 * @var     array
+	 * @since   1.5
+	 */
+	protected static $optionDefaults = array(
+		'option' => array(
+			'option.attr' => null,
+			'option.disable' => 'disable',
+			'option.id' => null,
+			'option.key' => 'value',
+			'option.key.toHtml' => true,
+			'option.label' => null,
+			'option.label.toHtml' => true,
+			'option.text' => 'text',
+			'option.text.toHtml' => true,
+			'option.class' => 'class',
+			'option.onclick' => 'onclick',
+		),
+	);
+
+	/**
+	 * Generates a yes/no radio list.
+	 *
+	 * @param   string  $name      The value of the HTML name attribute
+	 * @param   array   $attribs   Additional HTML attributes for the `<select>` tag
+	 * @param   string  $selected  The key that is selected
+	 * @param   string  $yes       Language key for Yes
+	 * @param   string  $no        Language key for no
+	 * @param   mixed   $id        The id for the field or false for no id
+	 *
+	 * @return  string  HTML for the radio list
+	 *
+	 * @since   1.5
+	 * @see     JFormFieldRadio
+	 */
+	public static function booleanlist($name, $attribs = array(), $selected = null, $yes = 'JYES', $no = 'JNO', $id = false)
+	{
+		$arr = array(JHtml::_('select.option', '0', JText::_($no)), JHtml::_('select.option', '1', JText::_($yes)));
+
+		return JHtml::_('select.radiolist', $arr, $name, $attribs, 'value', 'text', (int) $selected, $id);
+	}
+
+	/**
+	 * Generates an HTML selection list.
+	 *
+	 * @param   array    $data       An array of objects, arrays, or scalars.
+	 * @param   string   $name       The value of the HTML name attribute.
+	 * @param   mixed    $attribs    Additional HTML attributes for the `<select>` tag. This
+	 *                               can be an array of attributes, or an array of options. Treated as options
+	 *                               if it is the last argument passed. Valid options are:
+	 *                               Format options, see {@see JHtml::$formatOptions}.
+	 *                               Selection options, see {@see JHtmlSelect::options()}.
+	 *                               list.attr, string|array: Additional attributes for the select
+	 *                               element.
+	 *                               id, string: Value to use as the select element id attribute.
+	 *                               Defaults to the same as the name.
+	 *                               list.select, string|array: Identifies one or more option elements
+	 *                               to be selected, based on the option key values.
+	 * @param   string   $optKey     The name of the object variable for the option value. If
+	 *                               set to null, the index of the value array is used.
+	 * @param   string   $optText    The name of the object variable for the option text.
+	 * @param   mixed    $selected   The key that is selected (accepts an array or a string).
+	 * @param   mixed    $idtag      Value of the field id or null by default
+	 * @param   boolean  $translate  True to translate
+	 *
+	 * @return  string  HTML for the select list.
+	 *
+	 * @since   1.5
+	 */
+	public static function genericlist($data, $name, $attribs = null, $optKey = 'value', $optText = 'text', $selected = null, $idtag = false,
+		$translate = false)
+	{
+		// Set default options
+		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false));
+
+		if (is_array($attribs) && func_num_args() === 3)
+		{
+			// Assume we have an options array
+			$options = array_merge($options, $attribs);
+		}
+		else
+		{
+			// Get options from the parameters
+			$options['id'] = $idtag;
+			$options['list.attr'] = $attribs;
+			$options['list.translate'] = $translate;
+			$options['option.key'] = $optKey;
+			$options['option.text'] = $optText;
+			$options['list.select'] = $selected;
+		}
+
+		$attribs = '';
+
+		if (isset($options['list.attr']))
+		{
+			if (is_array($options['list.attr']))
+			{
+				$attribs = ArrayHelper::toString($options['list.attr']);
+			}
+			else
+			{
+				$attribs = $options['list.attr'];
+			}
+
+			if ($attribs !== '')
+			{
+				$attribs = ' ' . $attribs;
+			}
+		}
+
+		$id = $options['id'] !== false ? $options['id'] : $name;
+		$id = str_replace(array('[', ']', ' '), '', $id);
+
+		$baseIndent = str_repeat($options['format.indent'], $options['format.depth']++);
+		$html = $baseIndent . '<select' . ($id !== '' ? ' id="' . $id . '"' : '') . ' name="' . $name . '"' . $attribs . '>' . $options['format.eol']
+			. static::options($data, $options) . $baseIndent . '</select>' . $options['format.eol'];
+
+		return $html;
+	}
+
+	/**
+	 * Method to build a list with suggestions
+	 *
+	 * @param   array    $data       An array of objects, arrays, or values.
+	 * @param   string   $optKey     The name of the object variable for the option value. If
+	 *                               set to null, the index of the value array is used.
+	 * @param   string   $optText    The name of the object variable for the option text.
+	 * @param   mixed    $idtag      Value of the field id or null by default
+	 * @param   boolean  $translate  True to translate
+	 *
+	 * @return  string  HTML for the select list
+	 *
+	 * @since       3.2
+	 * @deprecated  4.0  Just create the `<datalist>` directly instead
+	 */
+	public static function suggestionlist($data, $optKey = 'value', $optText = 'text', $idtag = null, $translate = false)
+	{
+		// Log deprecated message
+		JLog::add(
+			sprintf(
+				'%s() is deprecated. Create the <datalist> tag directly instead.',
+				__METHOD__
+			),
+			JLog::WARNING,
+			'deprecated'
+		);
+
+		// Note: $idtag is requried but has to be an optional argument in the funtion call due to argument order
+		if (!$idtag)
+		{
+			throw new InvalidArgumentException('$idtag is a required argument in deprecated JHtmlSelect::suggestionlist');
+		}
+
+		// Set default options
+		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false));
+
+		// Get options from the parameters
+		$options['id'] = $idtag;
+		$options['list.attr'] = null;
+		$options['list.translate'] = $translate;
+		$options['option.key'] = $optKey;
+		$options['option.text'] = $optText;
+		$options['list.select'] = null;
+
+		$id = ' id="' . $idtag . '"';
+
+		$baseIndent = str_repeat($options['format.indent'], $options['format.depth']++);
+		$html = $baseIndent . '<datalist' . $id . '>' . $options['format.eol']
+			. static::options($data, $options) . $baseIndent . '</datalist>' . $options['format.eol'];
+
+		return $html;
+	}
+
+	/**
+	 * Generates a grouped HTML selection list from nested arrays.
+	 *
+	 * @param   array   $data     An array of groups, each of which is an array of options.
+	 * @param   string  $name     The value of the HTML name attribute
+	 * @param   array   $options  Options, an array of key/value pairs. Valid options are:
+	 *                            Format options, {@see JHtml::$formatOptions}.
+	 *                            Selection options. See {@see JHtmlSelect::options()}.
+	 *                            group.id: The property in each group to use as the group id
+	 *                            attribute. Defaults to none.
+	 *                            group.label: The property in each group to use as the group
+	 *                            label. Defaults to "text". If set to null, the data array index key is
+	 *                            used.
+	 *                            group.items: The property in each group to use as the array of
+	 *                            items in the group. Defaults to "items". If set to null, group.id and
+	 *                            group. label are forced to null and the data element is assumed to be a
+	 *                            list of selections.
+	 *                            id: Value to use as the select element id attribute. Defaults to
+	 *                            the same as the name.
+	 *                            list.attr: Attributes for the select element. Can be a string or
+	 *                            an array of key/value pairs. Defaults to none.
+	 *                            list.select: either the value of one selected option or an array
+	 *                            of selected options. Default: none.
+	 *                            list.translate: Boolean. If set, text and labels are translated via
+	 *                            JText::_().
+	 *
+	 * @return  string  HTML for the select list
+	 *
+	 * @since   1.5
+	 * @throws  RuntimeException If a group has contents that cannot be processed.
+	 */
+	public static function groupedlist($data, $name, $options = array())
+	{
+		// Set default options and overwrite with anything passed in
+		$options = array_merge(
+			JHtml::$formatOptions,
+			array('format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.label.toHtml' => true, 'id' => false),
+			$options
+		);
+
+		// Apply option rules
+		if ($options['group.items'] === null)
+		{
+			$options['group.label'] = null;
+		}
+
+		$attribs = '';
+
+		if (isset($options['list.attr']))
+		{
+			if (is_array($options['list.attr']))
+			{
+				$attribs = ArrayHelper::toString($options['list.attr']);
+			}
+			else
+			{
+				$attribs = $options['list.attr'];
+			}
+
+			if ($attribs !== '')
+			{
+				$attribs = ' ' . $attribs;
+			}
+		}
+
+		$id = $options['id'] !== false ? $options['id'] : $name;
+		$id = str_replace(array('[', ']', ' '), '', $id);
+
+		// Disable groups in the options.
+		$options['groups'] = false;
+
+		$baseIndent = str_repeat($options['format.indent'], $options['format.depth']++);
+		$html = $baseIndent . '<select' . ($id !== '' ? ' id="' . $id . '"' : '') . ' name="' . $name . '"' . $attribs . '>' . $options['format.eol'];
+		$groupIndent = str_repeat($options['format.indent'], $options['format.depth']++);
+
+		foreach ($data as $dataKey => $group)
+		{
+			$label = $dataKey;
+			$id = '';
+			$noGroup = is_int($dataKey);
+
+			if ($options['group.items'] == null)
+			{
+				// Sub-list is an associative array
+				$subList = $group;
+			}
+			elseif (is_array($group))
+			{
+				// Sub-list is in an element of an array.
+				$subList = $group[$options['group.items']];
+
+				if (isset($group[$options['group.label']]))
+				{
+					$label = $group[$options['group.label']];
+					$noGroup = false;
+				}
+
+				if (isset($options['group.id']) && isset($group[$options['group.id']]))
+				{
+					$id = $group[$options['group.id']];
+					$noGroup = false;
+				}
+			}
+			elseif (is_object($group))
+			{
+				// Sub-list is in a property of an object
+				$subList = $group->{$options['group.items']};
+
+				if (isset($group->{$options['group.label']}))
+				{
+					$label = $group->{$options['group.label']};
+					$noGroup = false;
+				}
+
+				if (isset($options['group.id']) && isset($group->{$options['group.id']}))
+				{
+					$id = $group->{$options['group.id']};
+					$noGroup = false;
+				}
+			}
+			else
+			{
+				throw new RuntimeException('Invalid group contents.', 1);
+			}
+
+			if ($noGroup)
+			{
+				$html .= static::options($subList, $options);
+			}
+			else
+			{
+				$html .= $groupIndent . '<optgroup' . (empty($id) ? '' : ' id="' . $id . '"') . ' label="'
+					. ($options['group.label.toHtml'] ? htmlspecialchars($label, ENT_COMPAT, 'UTF-8') : $label) . '">' . $options['format.eol']
+					. static::options($subList, $options) . $groupIndent . '</optgroup>' . $options['format.eol'];
+			}
+		}
+
+		$html .= $baseIndent . '</select>' . $options['format.eol'];
+
+		return $html;
+	}
+
+	/**
+	 * Generates a selection list of integers.
+	 *
+	 * @param   integer  $start     The start integer
+	 * @param   integer  $end       The end integer
+	 * @param   integer  $inc       The increment
+	 * @param   string   $name      The value of the HTML name attribute
+	 * @param   mixed    $attribs   Additional HTML attributes for the `<select>` tag, an array of
+	 *                              attributes, or an array of options. Treated as options if it is the last
+	 *                              argument passed.
+	 * @param   mixed    $selected  The key that is selected
+	 * @param   string   $format    The printf format to be applied to the number
+	 *
+	 * @return  string   HTML for the select list
+	 *
+	 * @since   1.5
+	 */
+	public static function integerlist($start, $end, $inc, $name, $attribs = null, $selected = null, $format = '')
+	{
+		// Set default options
+		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null));
+
+		if (is_array($attribs) && func_num_args() === 5)
+		{
+			// Assume we have an options array
+			$options = array_merge($options, $attribs);
+
+			// Extract the format and remove it from downstream options
+			$format = $options['option.format'];
+			unset($options['option.format']);
+		}
+		else
+		{
+			// Get options from the parameters
+			$options['list.attr'] = $attribs;
+			$options['list.select'] = $selected;
+		}
+
+		$start = (int) $start;
+		$end   = (int) $end;
+		$inc   = (int) $inc;
+
+		$data = array();
+
+		for ($i = $start; $i <= $end; $i += $inc)
+		{
+			$data[$i] = $format ? sprintf($format, $i) : $i;
+		}
+
+		// Tell genericlist() to use array keys
+		$options['option.key'] = null;
+
+		return JHtml::_('select.genericlist', $data, $name, $options);
+	}
+
+	/**
+	 * Create a placeholder for an option group.
+	 *
+	 * @param   string  $text     The text for the option
+	 * @param   string  $optKey   The returned object property name for the value
+	 * @param   string  $optText  The returned object property name for the text
+	 *
+	 * @return  stdClass
+	 *
+	 * @deprecated  4.0  Use JHtmlSelect::groupedList()
+	 * @see     JHtmlSelect::groupedList()
+	 * @since   1.5
+	 */
+	public static function optgroup($text, $optKey = 'value', $optText = 'text')
+	{
+		JLog::add('JHtmlSelect::optgroup() is deprecated, use JHtmlSelect::groupedList() instead.', JLog::WARNING, 'deprecated');
+
+		// Set initial state
+		static $state = 'open';
+
+		// Toggle between open and close states:
+		switch ($state)
+		{
+			case 'open':
+				$obj = new stdClass;
+				$obj->$optKey = '<OPTGROUP>';
+				$obj->$optText = $text;
+				$state = 'close';
+				break;
+			case 'close':
+				$obj = new stdClass;
+				$obj->$optKey = '</OPTGROUP>';
+				$obj->$optText = $text;
+				$state = 'open';
+				break;
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * Create an object that represents an option in an option list.
+	 *
+	 * @param   string   $value    The value of the option
+	 * @param   string   $text     The text for the option
+	 * @param   mixed    $optKey   If a string, the returned object property name for
+	 *                             the value. If an array, options. Valid options are:
+	 *                             attr: String|array. Additional attributes for this option.
+	 *                             Defaults to none.
+	 *                             disable: Boolean. If set, this option is disabled.
+	 *                             label: String. The value for the option label.
+	 *                             option.attr: The property in each option array to use for
+	 *                             additional selection attributes. Defaults to none.
+	 *                             option.disable: The property that will hold the disabled state.
+	 *                             Defaults to "disable".
+	 *                             option.key: The property that will hold the selection value.
+	 *                             Defaults to "value".
+	 *                             option.label: The property in each option array to use as the
+	 *                             selection label attribute. If a "label" option is provided, defaults to
+	 *                             "label", if no label is given, defaults to null (none).
+	 *                             option.text: The property that will hold the the displayed text.
+	 *                             Defaults to "text". If set to null, the option array is assumed to be a
+	 *                             list of displayable scalars.
+	 * @param   string   $optText  The property that will hold the the displayed text. This
+	 *                             parameter is ignored if an options array is passed.
+	 * @param   boolean  $disable  Not used.
+	 *
+	 * @return  stdClass
+	 *
+	 * @since   1.5
+	 */
+	public static function option($value, $text = '', $optKey = 'value', $optText = 'text', $disable = false)
+	{
+		$options = array(
+			'attr' => null,
+			'disable' => false,
+			'option.attr' => null,
+			'option.disable' => 'disable',
+			'option.key' => 'value',
+			'option.label' => null,
+			'option.text' => 'text',
+		);
+
+		if (is_array($optKey))
+		{
+			// Merge in caller's options
+			$options = array_merge($options, $optKey);
+		}
+		else
+		{
+			// Get options from the parameters
+			$options['option.key'] = $optKey;
+			$options['option.text'] = $optText;
+			$options['disable'] = $disable;
+		}
+
+		$obj = new stdClass;
+		$obj->{$options['option.key']}  = $value;
+		$obj->{$options['option.text']} = trim($text) ? $text : $value;
+
+		/*
+		 * If a label is provided, save it. If no label is provided and there is
+		 * a label name, initialise to an empty string.
+		 */
+		$hasProperty = $options['option.label'] !== null;
+
+		if (isset($options['label']))
+		{
+			$labelProperty = $hasProperty ? $options['option.label'] : 'label';
+			$obj->$labelProperty = $options['label'];
+		}
+		elseif ($hasProperty)
+		{
+			$obj->{$options['option.label']} = '';
+		}
+
+		// Set attributes only if there is a property and a value
+		if ($options['attr'] !== null)
+		{
+			$obj->{$options['option.attr']} = $options['attr'];
+		}
+
+		// Set disable only if it has a property and a value
+		if ($options['disable'] !== null)
+		{
+			$obj->{$options['option.disable']} = $options['disable'];
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * Generates the option tags for an HTML select list (with no select tag
+	 * surrounding the options).
+	 *
+	 * @param   array    $arr        An array of objects, arrays, or values.
+	 * @param   mixed    $optKey     If a string, this is the name of the object variable for
+	 *                               the option value. If null, the index of the array of objects is used. If
+	 *                               an array, this is a set of options, as key/value pairs. Valid options are:
+	 *                               -Format options, {@see JHtml::$formatOptions}.
+	 *                               -groups: Boolean. If set, looks for keys with the value
+	 *                                "&lt;optgroup>" and synthesizes groups from them. Deprecated. Defaults
+	 *                                true for backwards compatibility.
+	 *                               -list.select: either the value of one selected option or an array
+	 *                                of selected options. Default: none.
+	 *                               -list.translate: Boolean. If set, text and labels are translated via
+	 *                                JText::_(). Default is false.
+	 *                               -option.id: The property in each option array to use as the
+	 *                                selection id attribute. Defaults to none.
+	 *                               -option.key: The property in each option array to use as the
+	 *                                selection value. Defaults to "value". If set to null, the index of the
+	 *                                option array is used.
+	 *                               -option.label: The property in each option array to use as the
+	 *                                selection label attribute. Defaults to null (none).
+	 *                               -option.text: The property in each option array to use as the
+	 *                               displayed text. Defaults to "text". If set to null, the option array is
+	 *                               assumed to be a list of displayable scalars.
+	 *                               -option.attr: The property in each option array to use for
+	 *                                additional selection attributes. Defaults to none.
+	 *                               -option.disable: The property that will hold the disabled state.
+	 *                                Defaults to "disable".
+	 *                               -option.key: The property that will hold the selection value.
+	 *                                Defaults to "value".
+	 *                               -option.text: The property that will hold the the displayed text.
+	 *                               Defaults to "text". If set to null, the option array is assumed to be a
+	 *                               list of displayable scalars.
+	 * @param   string   $optText    The name of the object variable for the option text.
+	 * @param   mixed    $selected   The key that is selected (accepts an array or a string)
+	 * @param   boolean  $translate  Translate the option values.
+	 *
+	 * @return  string  HTML for the select list
+	 *
+	 * @since   1.5
+	 */
+	public static function options($arr, $optKey = 'value', $optText = 'text', $selected = null, $translate = false)
+	{
+		$options = array_merge(
+			JHtml::$formatOptions,
+			static::$optionDefaults['option'],
+			array('format.depth' => 0, 'groups' => true, 'list.select' => null, 'list.translate' => false)
+		);
+
+		if (is_array($optKey))
+		{
+			// Set default options and overwrite with anything passed in
+			$options = array_merge($options, $optKey);
+		}
+		else
+		{
+			// Get options from the parameters
+			$options['option.key'] = $optKey;
+			$options['option.text'] = $optText;
+			$options['list.select'] = $selected;
+			$options['list.translate'] = $translate;
+		}
+
+		$html = '';
+		$baseIndent = str_repeat($options['format.indent'], $options['format.depth']);
+
+		foreach ($arr as $elementKey => &$element)
+		{
+			$attr = '';
+			$extra = '';
+			$label = '';
+			$id = '';
+
+			if (is_array($element))
+			{
+				$key = $options['option.key'] === null ? $elementKey : $element[$options['option.key']];
+				$text = $element[$options['option.text']];
+
+				if (isset($element[$options['option.attr']]))
+				{
+					$attr = $element[$options['option.attr']];
+				}
+
+				if (isset($element[$options['option.id']]))
+				{
+					$id = $element[$options['option.id']];
+				}
+
+				if (isset($element[$options['option.label']]))
+				{
+					$label = $element[$options['option.label']];
+				}
+
+				if (isset($element[$options['option.disable']]) && $element[$options['option.disable']])
+				{
+					$extra .= ' disabled="disabled"';
+				}
+			}
+			elseif (is_object($element))
+			{
+				$key = $options['option.key'] === null ? $elementKey : $element->{$options['option.key']};
+				$text = $element->{$options['option.text']};
+
+				if (isset($element->{$options['option.attr']}))
+				{
+					$attr = $element->{$options['option.attr']};
+				}
+
+				if (isset($element->{$options['option.id']}))
+				{
+					$id = $element->{$options['option.id']};
+				}
+
+				if (isset($element->{$options['option.label']}))
+				{
+					$label = $element->{$options['option.label']};
+				}
+
+				if (isset($element->{$options['option.disable']}) && $element->{$options['option.disable']})
+				{
+					$extra .= ' disabled="disabled"';
+				}
+
+				if (isset($element->{$options['option.class']}) && $element->{$options['option.class']})
+				{
+					$extra .= ' class="' . $element->{$options['option.class']} . '"';
+				}
+
+				if (isset($element->{$options['option.onclick']}) && $element->{$options['option.onclick']})
+				{
+					$extra .= ' onclick="' . $element->{$options['option.onclick']} . '"';
+				}
+			}
+			else
+			{
+				// This is a simple associative array
+				$key = $elementKey;
+				$text = $element;
+			}
+
+			/*
+			 * The use of options that contain optgroup HTML elements was
+			 * somewhat hacked for J1.5. J1.6 introduces the grouplist() method
+			 * to handle this better. The old solution is retained through the
+			 * "groups" option, which defaults true in J1.6, but should be
+			 * deprecated at some point in the future.
+			 */
+
+			$key = (string) $key;
+
+			if ($key === '<OPTGROUP>' && $options['groups'])
+			{
+				$html .= $baseIndent . '<optgroup label="' . ($options['list.translate'] ? JText::_($text) : $text) . '">' . $options['format.eol'];
+				$baseIndent = str_repeat($options['format.indent'], ++$options['format.depth']);
+			}
+			elseif ($key === '</OPTGROUP>' && $options['groups'])
+			{
+				$baseIndent = str_repeat($options['format.indent'], --$options['format.depth']);
+				$html .= $baseIndent . '</optgroup>' . $options['format.eol'];
+			}
+			else
+			{
+				// If no string after hyphen - take hyphen out
+				$splitText = explode(' - ', $text, 2);
+				$text = $splitText[0];
+
+				if (isset($splitText[1]) && $splitText[1] !== '' && !preg_match('/^[\s]+$/', $splitText[1]))
+				{
+					$text .= ' - ' . $splitText[1];
+				}
+
+				if (!empty($label) && $options['list.translate'])
+				{
+					$label = JText::_($label);
+				}
+
+				if ($options['option.label.toHtml'])
+				{
+					$label = htmlentities($label);
+				}
+
+				if (is_array($attr))
+				{
+					$attr = ArrayHelper::toString($attr);
+				}
+				else
+				{
+					$attr = trim($attr);
+				}
+
+				$extra = ($id ? ' id="' . $id . '"' : '') . ($label ? ' label="' . $label . '"' : '') . ($attr ? ' ' . $attr : '') . $extra;
+
+				if (is_array($options['list.select']))
+				{
+					foreach ($options['list.select'] as $val)
+					{
+						$key2 = is_object($val) ? $val->{$options['option.key']} : $val;
+
+						if ($key == $key2)
+						{
+							$extra .= ' selected="selected"';
+							break;
+						}
+					}
+				}
+				elseif ((string) $key === (string) $options['list.select'])
+				{
+					$extra .= ' selected="selected"';
+				}
+
+				if ($options['list.translate'])
+				{
+					$text = JText::_($text);
+				}
+
+				// Generate the option, encoding as required
+				$html .= $baseIndent . '<option value="' . ($options['option.key.toHtml'] ? htmlspecialchars($key, ENT_COMPAT, 'UTF-8') : $key) . '"'
+					. $extra . '>';
+				$html .= $options['option.text.toHtml'] ? htmlentities(html_entity_decode($text, ENT_COMPAT, 'UTF-8'), ENT_COMPAT, 'UTF-8') : $text;
+				$html .= '</option>' . $options['format.eol'];
+			}
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Generates an HTML radio list.
+	 *
+	 * @param   array    $data       An array of objects
+	 * @param   string   $name       The value of the HTML name attribute
+	 * @param   string   $attribs    Additional HTML attributes for the `<select>` tag
+	 * @param   mixed    $optKey     The key that is selected
+	 * @param   string   $optText    The name of the object variable for the option value
+	 * @param   string   $selected   The name of the object variable for the option text
+	 * @param   boolean  $idtag      Value of the field id or null by default
+	 * @param   boolean  $translate  True if options will be translated
+	 *
+	 * @return  string  HTML for the select list
+	 *
+	 * @since   1.5
+	 */
+	public static function radiolist($data, $name, $attribs = null, $optKey = 'value', $optText = 'text', $selected = null, $idtag = false,
+		$translate = false)
+	{
+
+		if (is_array($attribs))
+		{
+			$attribs = ArrayHelper::toString($attribs);
+		}
+
+		$id_text = $idtag ?: $name;
+
+		$html = '<div class="controls">';
+
+		foreach ($data as $obj)
+		{
+			$k = $obj->$optKey;
+			$t = $translate ? JText::_($obj->$optText) : $obj->$optText;
+			$id = (isset($obj->id) ? $obj->id : null);
+
+			$extra = '';
+			$id = $id ? $obj->id : $id_text . $k;
+
+			if (is_array($selected))
+			{
+				foreach ($selected as $val)
+				{
+					$k2 = is_object($val) ? $val->$optKey : $val;
+
+					if ($k == $k2)
+					{
+						$extra .= ' selected="selected" ';
+						break;
+					}
+				}
+			}
+			else
+			{
+				$extra .= ((string) $k === (string) $selected ? ' checked="checked" ' : '');
+			}
+
+			$html .= "\n\t" . '<label for="' . $id . '" id="' . $id . '-lbl" class="radio">';
+			$html .= "\n\t\n\t" . '<input type="radio" name="' . $name . '" id="' . $id . '" value="' . $k . '" ' . $extra
+				. $attribs . ' />' . $t;
+			$html .= "\n\t" . '</label>';
+		}
+
+		$html .= "\n";
+		$html .= '</div>';
+		$html .= "\n";
+
+		return $html;
+	}
+}
diff --git a/core/libraries/cms/html/sidebar.php b/core/libraries/cms/html/sidebar.php
new file mode 100644
index 00000000..e03d420f
--- /dev/null
+++ b/core/libraries/cms/html/sidebar.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class to render a list view sidebar
+ *
+ * @since  3.0
+ */
+abstract class JHtmlSidebar
+{
+	/**
+	 * Menu entries
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected static $entries = array();
+
+	/**
+	 * Filters
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected static $filters = array();
+
+	/**
+	 * Value for the action attribute of the form.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected static $action = '';
+
+	/**
+	 * Render the sidebar.
+	 *
+	 * @return  string  The necessary HTML to display the sidebar
+	 *
+	 * @since   3.0
+	 */
+	public static function render()
+	{
+		// Collect display data
+		$data                 = new stdClass;
+		$data->list           = static::getEntries();
+		$data->filters        = static::getFilters();
+		$data->action         = static::getAction();
+		$data->displayMenu    = count($data->list);
+		$data->displayFilters = count($data->filters);
+		$data->hide           = JFactory::getApplication()->input->getBool('hidemainmenu');
+
+		// Create a layout object and ask it to render the sidebar
+		$layout      = new JLayoutFile('joomla.sidebars.submenu');
+
+		return $layout->render($data);
+	}
+
+	/**
+	 * Method to add a menu item to submenu.
+	 *
+	 * @param   string  $name    Name of the menu item.
+	 * @param   string  $link    URL of the menu item.
+	 * @param   bool    $active  True if the item is active, false otherwise.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function addEntry($name, $link = '', $active = false)
+	{
+		static::$entries[] = array($name, $link, $active);
+	}
+
+	/**
+	 * Returns an array of all submenu entries
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 */
+	public static function getEntries()
+	{
+		return static::$entries;
+	}
+
+	/**
+	 * Method to add a filter to the submenu
+	 *
+	 * @param   string  $label      Label for the menu item.
+	 * @param   string  $name       Name for the filter. Also used as id.
+	 * @param   string  $options    Options for the select field.
+	 * @param   bool    $noDefault  Don't the label as the empty option
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function addFilter($label, $name, $options, $noDefault = false)
+	{
+		static::$filters[] = array('label' => $label, 'name' => $name, 'options' => $options, 'noDefault' => $noDefault);
+	}
+
+	/**
+	 * Returns an array of all filters
+	 *
+	 * @return  array
+	 *
+	 * @since   3.0
+	 */
+	public static function getFilters()
+	{
+		return static::$filters;
+	}
+
+	/**
+	 * Set value for the action attribute of the filter form
+	 *
+	 * @param   string  $action  Value for the action attribute of the form
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function setAction($action)
+	{
+		static::$action = $action;
+	}
+
+	/**
+	 * Get value for the action attribute of the filter form
+	 *
+	 * @return  string
+	 *
+	 * @since   3.0
+	 */
+	public static function getAction()
+	{
+		return static::$action;
+	}
+}
diff --git a/core/libraries/cms/html/sliders.php b/core/libraries/cms/html/sliders.php
new file mode 100644
index 00000000..a4e9924a
--- /dev/null
+++ b/core/libraries/cms/html/sliders.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for Sliders elements
+ *
+ * @since       1.6
+ * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+ */
+abstract class JHtmlSliders
+{
+	/**
+	 * Creates a panes and loads the javascript behavior for it.
+	 *
+	 * @param   string  $group   The pane identifier.
+	 * @param   array   $params  An array of options.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	public static function start($group = 'sliders', $params = array())
+	{
+		static::loadBehavior($group, $params);
+
+		return '<div id="' . $group . '" class="pane-sliders"><div style="display:none;"><div>';
+	}
+
+	/**
+	 * Close the current pane.
+	 *
+	 * @return  string  hTML to close the pane
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	public static function end()
+	{
+		return '</div></div></div>';
+	}
+
+	/**
+	 * Begins the display of a new panel.
+	 *
+	 * @param   string  $text  Text to display.
+	 * @param   string  $id    Identifier of the panel.
+	 *
+	 * @return  string  HTML to start a panel
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	public static function panel($text, $id)
+	{
+		return '</div></div><div class="panel"><h3 class="pane-toggler title" id="' . $id . '"><a href="javascript:void(0);"><span>' . $text
+			. '</span></a></h3><div class="pane-slider content">';
+	}
+
+	/**
+	 * Load the JavaScript behavior.
+	 *
+	 * @param   string  $group   The pane identifier.
+	 * @param   array   $params  Array of options.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	protected static function loadBehavior($group, $params = array())
+	{
+		static $loaded = array();
+
+		if (!array_key_exists($group, $loaded))
+		{
+			// Get the JInput object
+			$input = JFactory::getApplication()->input;
+
+			$loaded[$group] = true;
+
+			// Include mootools framework.
+			JHtml::_('behavior.framework', true);
+
+			$document = JFactory::getDocument();
+
+			$display = (isset($params['startOffset']) && isset($params['startTransition']) && $params['startTransition'])
+				? (int) $params['startOffset'] : null;
+			$show = (isset($params['startOffset']) && !(isset($params['startTransition']) && $params['startTransition']))
+				? (int) $params['startOffset'] : null;
+
+			$opt['onActive'] = "\\function(toggler, i) {toggler.addClass('pane-toggler-down');" .
+				"toggler.removeClass('pane-toggler');i.addClass('pane-down');i.removeClass('pane-hide');Cookie.write('jpanesliders_"
+				. $group . "',$$('div#" . $group . ".pane-sliders > .panel > h3').indexOf(toggler));}";
+			$opt['onBackground'] = "\\function(toggler, i) {toggler.addClass('pane-toggler');" .
+				"toggler.removeClass('pane-toggler-down');i.addClass('pane-hide');i.removeClass('pane-down');if($$('div#"
+				. $group . ".pane-sliders > .panel > h3').length==$$('div#" . $group
+				. ".pane-sliders > .panel > h3.pane-toggler').length) Cookie.write('jpanesliders_" . $group . "',-1);}";
+			$opt['duration'] = isset($params['duration']) ? (int) $params['duration'] : 300;
+			$opt['display'] = (isset($params['useCookie']) && $params['useCookie']) ? $input->cookie->get('jpanesliders_' . $group, $display, 'integer')
+				: $display;
+			$opt['show'] = (isset($params['useCookie']) && $params['useCookie']) ? $input->cookie->get('jpanesliders_' . $group, $show, 'integer') : $show;
+			$opt['opacity'] = (isset($params['opacityTransition']) && $params['opacityTransition']) ? 'true' : 'false';
+			$opt['alwaysHide'] = (isset($params['allowAllClose']) && (!$params['allowAllClose'])) ? 'false' : 'true';
+
+			$options = JHtml::getJSObject($opt);
+
+			$js = "window.addEvent('domready', function(){ new Fx.Accordion($$('div#" . $group
+				. ".pane-sliders > .panel > h3.pane-toggler'), $$('div#" . $group . ".pane-sliders > .panel > div.pane-slider'), " . $options
+				. "); });";
+
+			$document->addScriptDeclaration($js);
+		}
+	}
+}
diff --git a/core/libraries/cms/html/sortablelist.php b/core/libraries/cms/html/sortablelist.php
new file mode 100644
index 00000000..f47c9922
--- /dev/null
+++ b/core/libraries/cms/html/sortablelist.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTML utility class for creating a sortable table list
+ *
+ * @since  3.0
+ */
+abstract class JHtmlSortablelist
+{
+	/**
+	 * @var    array  Array containing information for loaded files
+	 * @since  3.0
+	 */
+	protected static $loaded = array();
+
+	/**
+	 * Method to load the Sortable script and make table sortable
+	 *
+	 * @param   string   $tableId                 DOM id of the table
+	 * @param   string   $formId                  DOM id of the form
+	 * @param   string   $sortDir                 Sort direction
+	 * @param   string   $saveOrderingUrl         Save ordering url, ajax-load after an item dropped
+	 * @param   boolean  $proceedSaveOrderButton  Set whether a save order button is displayed
+	 * @param   boolean  $nestedList              Set whether the list is a nested list
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 *
+	 * @throws  InvalidArgumentException
+	 */
+	public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderingUrl = null, $proceedSaveOrderButton = true, $nestedList = false)
+	{
+		// Only load once
+		if (isset(static::$loaded[__METHOD__]))
+		{
+			return;
+		}
+
+		// Note: $i is required but has to be an optional argument in the function call due to argument order
+		if ($saveOrderingUrl === null)
+		{
+			throw new InvalidArgumentException(sprintf('$saveOrderingUrl is a required argument in %s()', __METHOD__));
+		}
+
+		$displayData = array(
+			'tableId'                => $tableId,
+			'formId'                 => $formId,
+			'sortDir'                => $sortDir,
+			'saveOrderingUrl'        => $saveOrderingUrl,
+			'nestedList'             => $nestedList,
+			'proceedSaveOrderButton' => $proceedSaveOrderButton,
+		);
+
+		JLayoutHelper::render('joomla.html.sortablelist', $displayData);
+
+		// Set static array
+		static::$loaded[__METHOD__] = true;
+
+		return;
+	}
+
+	/**
+	 * Method to inject script for enabled and disable Save order button
+	 * when changing value of ordering input boxes
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 *
+	 * @deprecated 4.0 The logic is merged in the JLayout file
+	 */
+	public static function _proceedSaveOrderButton()
+	{
+		JFactory::getDocument()->addScriptDeclaration(
+			"(function ($){
+				$(document).ready(function (){
+					var saveOrderButton = $('.saveorder');
+					saveOrderButton.css({'opacity':'0.2', 'cursor':'default'}).attr('onclick','return false;');
+					var oldOrderingValue = '';
+					$('.text-area-order').focus(function ()
+					{
+						oldOrderingValue = $(this).attr('value');
+					})
+					.keyup(function (){
+						var newOrderingValue = $(this).attr('value');
+						if (oldOrderingValue != newOrderingValue)
+						{
+							saveOrderButton.css({'opacity':'1', 'cursor':'pointer'}).removeAttr('onclick')
+						}
+					});
+				});
+			})(jQuery);"
+		);
+
+		return;
+	}
+}
diff --git a/core/libraries/cms/html/string.php b/core/libraries/cms/html/string.php
new file mode 100644
index 00000000..bf5a38fe
--- /dev/null
+++ b/core/libraries/cms/html/string.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * HTML helper class for rendering manipulated strings.
+ *
+ * @since  1.6
+ */
+abstract class JHtmlString
+{
+	/**
+	 * Truncates text blocks over the specified character limit and closes
+	 * all open HTML tags. The method will optionally not truncate an individual
+	 * word, it will find the first space that is within the limit and
+	 * truncate at that point. This method is UTF-8 safe.
+	 *
+	 * @param   string   $text       The text to truncate.
+	 * @param   integer  $length     The maximum length of the text.
+	 * @param   boolean  $noSplit    Don't split a word if that is where the cutoff occurs (default: true).
+	 * @param   boolean  $allowHtml  Allow HTML tags in the output, and close any open tags (default: true).
+	 *
+	 * @return  string   The truncated text.
+	 *
+	 * @since   1.6
+	 */
+	public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)
+	{
+		// Assume a lone open tag is invalid HTML.
+		if ($length === 1 && $text[0] === '<')
+		{
+			return '...';
+		}
+
+		// Check if HTML tags are allowed.
+		if (!$allowHtml)
+		{
+			// Deal with spacing issues in the input.
+			$text = str_replace('>', '> ', $text);
+			$text = str_replace(array('&nbsp;', '&#160;'), ' ', $text);
+			$text = StringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
+
+			// Strip the tags from the input and decode entities.
+			$text = strip_tags($text);
+			$text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+
+			// Remove remaining extra spaces.
+			$text = str_replace('&nbsp;', ' ', $text);
+			$text = StringHelper::trim(preg_replace('#\s+#mui', ' ', $text));
+		}
+
+		// Whether or not allowing HTML, truncate the item text if it is too long.
+		if ($length > 0 && StringHelper::strlen($text) > $length)
+		{
+			$tmp = trim(StringHelper::substr($text, 0, $length));
+
+			if ($tmp[0] === '<' && strpos($tmp, '>') === false)
+			{
+				return '...';
+			}
+
+			// $noSplit true means that we do not allow splitting of words.
+			if ($noSplit)
+			{
+				// Find the position of the last space within the allowed length.
+				$offset = StringHelper::strrpos($tmp, ' ');
+				$tmp = StringHelper::substr($tmp, 0, $offset + 1);
+
+				// If there are no spaces and the string is longer than the maximum
+				// we need to just use the ellipsis. In that case we are done.
+				if ($offset === false && strlen($text) > $length)
+				{
+					return '...';
+				}
+
+				if (StringHelper::strlen($tmp) > $length - 3)
+				{
+					$tmp = trim(StringHelper::substr($tmp, 0, StringHelper::strrpos($tmp, ' ')));
+				}
+			}
+
+			if ($allowHtml)
+			{
+				// Put all opened tags into an array
+				preg_match_all("#<([a-z][a-z0-9]*)\b.*?(?!/)>#i", $tmp, $result);
+				$openedTags = $result[1];
+
+				// Some tags self close so they do not need a separate close tag.
+				$openedTags = array_diff($openedTags, array('img', 'hr', 'br'));
+				$openedTags = array_values($openedTags);
+
+				// Put all closed tags into an array
+				preg_match_all("#</([a-z][a-z0-9]*)\b(?:[^>]*?)>#iU", $tmp, $result);
+				$closedTags = $result[1];
+
+				$numOpened = count($openedTags);
+
+				// Not all tags are closed so trim the text and finish.
+				if (count($closedTags) !== $numOpened)
+				{
+					// Closing tags need to be in the reverse order of opening tags.
+					$openedTags = array_reverse($openedTags);
+
+					// Close tags
+					for ($i = 0; $i < $numOpened; $i++)
+					{
+						if (!in_array($openedTags[$i], $closedTags))
+						{
+							$tmp .= '</' . $openedTags[$i] . '>';
+						}
+						else
+						{
+							unset($closedTags[array_search($openedTags[$i], $closedTags)]);
+						}
+					}
+				}
+
+				// Check if we are within a tag
+				if (StringHelper::strrpos($tmp, '<') > StringHelper::strrpos($tmp, '>'))
+				{
+					$offset = StringHelper::strrpos($tmp, '<');
+					$tmp = StringHelper::trim(StringHelper::substr($tmp, 0, $offset));
+				}
+			}
+
+			if ($tmp === false || strlen($text) > strlen($tmp))
+			{
+				$text = trim($tmp) . '...';
+			}
+		}
+
+		// Clean up any internal spaces created by the processing.
+		$text = str_replace(' </', '</', $text);
+		$text = str_replace(' ...', '...', $text);
+
+		return $text;
+	}
+
+	/**
+	 * Method to extend the truncate method to more complex situations
+	 *
+	 * The goal is to get the proper length plain text string with as much of
+	 * the html intact as possible with all tags properly closed.
+	 *
+	 * @param   string   $html       The content of the introtext to be truncated
+	 * @param   integer  $maxLength  The maximum number of characters to render
+	 * @param   boolean  $noSplit    Don't split a word if that is where the cutoff occurs (default: true).
+	 *
+	 * @return  string  The truncated string. If the string is truncated an ellipsis
+	 *                  (...) will be appended.
+	 *
+	 * @note    If a maximum length of 3 or less is selected and the text has more than
+	 *          that number of characters an ellipsis will be displayed.
+	 *          This method will not create valid HTML from malformed HTML.
+	 *
+	 * @since   3.1
+	 */
+	public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
+	{
+		// Start with some basic rules.
+		$baseLength = strlen($html);
+
+		// If the original HTML string is shorter than the $maxLength do nothing and return that.
+		if ($baseLength <= $maxLength || $maxLength === 0)
+		{
+			return $html;
+		}
+
+		// Take care of short simple cases.
+		if ($maxLength <= 3 && $html[0] !== '<' && strpos(substr($html, 0, $maxLength - 1), '<') === false && $baseLength > $maxLength)
+		{
+			return '...';
+		}
+
+		// Deal with maximum length of 1 where the string starts with a tag.
+		if ($maxLength === 1 && $html[0] === '<')
+		{
+			$endTagPos = strlen(strstr($html, '>', true));
+			$tag = substr($html, 1, $endTagPos);
+
+			$l = $endTagPos + 1;
+
+			if ($noSplit)
+			{
+				return substr($html, 0, $l) . '</' . $tag . '...';
+			}
+
+			// TODO: $character doesn't seem to be used...
+			$character = substr(strip_tags($html), 0, 1);
+
+			return substr($html, 0, $l) . '</' . $tag . '...';
+		}
+
+		// First get the truncated plain text string. This is the rendered text we want to end up with.
+		$ptString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);
+
+		// It's all HTML, just return it.
+		if ($ptString === '')
+		{
+				return $html;
+		}
+
+		// If the plain text is shorter than the max length the variable will not end in ...
+		// In that case we use the whole string.
+		if (substr($ptString, -3) !== '...')
+		{
+				return $html;
+		}
+
+		// Regular truncate gives us the ellipsis but we want to go back for text and tags.
+		if ($ptString === '...')
+		{
+			$stripped = substr(strip_tags($html), 0, $maxLength);
+			$ptString = JHtml::_('string.truncate', $stripped, $maxLength, $noSplit, $allowHtml = false);
+		}
+
+		// We need to trim the ellipsis that truncate adds.
+		$ptString = rtrim($ptString, '.');
+
+		// Now deal with more complex truncation.
+		while ($maxLength <= $baseLength)
+		{
+			// Get the truncated string assuming HTML is allowed.
+			$htmlString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = true);
+
+			if ($htmlString === '...' && strlen($ptString) + 3 > $maxLength)
+			{
+				return $htmlString;
+			}
+
+			$htmlString = rtrim($htmlString, '.');
+
+			// Now get the plain text from the HTML string and trim it.
+			$htmlStringToPtString = JHtml::_('string.truncate', $htmlString, $maxLength, $noSplit, $allowHtml = false);
+			$htmlStringToPtString = rtrim($htmlStringToPtString, '.');
+
+			// If the new plain text string matches the original plain text string we are done.
+			if ($ptString === $htmlStringToPtString)
+			{
+				return $htmlString . '...';
+			}
+
+			// Get the number of HTML tag characters in the first $maxLength characters
+			$diffLength = strlen($ptString) - strlen($htmlStringToPtString);
+
+			if ($diffLength <= 0)
+			{
+				return $htmlString . '...';
+			}
+
+			// Set new $maxlength that adjusts for the HTML tags
+			$maxLength += $diffLength;
+		}
+	}
+
+	/**
+	 * Abridges text strings over the specified character limit. The
+	 * behavior will insert an ellipsis into the text replacing a section
+	 * of variable size to ensure the string does not exceed the defined
+	 * maximum length. This method is UTF-8 safe.
+	 *
+	 * For example, it transforms "Really long title" to "Really...title".
+	 *
+	 * Note that this method does not scan for HTML tags so will potentially break them.
+	 *
+	 * @param   string   $text    The text to abridge.
+	 * @param   integer  $length  The maximum length of the text (default is 50).
+	 * @param   integer  $intro   The maximum length of the intro text (default is 30).
+	 *
+	 * @return  string   The abridged text.
+	 *
+	 * @since   1.6
+	 */
+	public static function abridge($text, $length = 50, $intro = 30)
+	{
+		// Abridge the item text if it is too long.
+		if (StringHelper::strlen($text) > $length)
+		{
+			// Determine the remaining text length.
+			$remainder = $length - ($intro + 3);
+
+			// Extract the beginning and ending text sections.
+			$beg = StringHelper::substr($text, 0, $intro);
+			$end = StringHelper::substr($text, StringHelper::strlen($text) - $remainder);
+
+			// Build the resulting string.
+			$text = $beg . '...' . $end;
+		}
+
+		return $text;
+	}
+}
diff --git a/core/libraries/cms/html/tabs.php b/core/libraries/cms/html/tabs.php
new file mode 100644
index 00000000..ea46e746
--- /dev/null
+++ b/core/libraries/cms/html/tabs.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class for Tabs elements.
+ *
+ * @since       1.6
+ * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+ */
+abstract class JHtmlTabs
+{
+	/**
+	 * Creates a panes and creates the JavaScript object for it.
+	 *
+	 * @param   string  $group   The pane identifier.
+	 * @param   array   $params  An array of option.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	public static function start($group = 'tabs', $params = array())
+	{
+		static::loadBehavior($group, $params);
+
+		return '<dl class="tabs" id="' . $group . '"><dt style="display:none;"></dt><dd style="display:none;">';
+	}
+
+	/**
+	 * Close the current pane
+	 *
+	 * @return  string  HTML to close the pane
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	public static function end()
+	{
+		return '</dd></dl>';
+	}
+
+	/**
+	 * Begins the display of a new panel.
+	 *
+	 * @param   string  $text  Text to display.
+	 * @param   string  $id    Identifier of the panel.
+	 *
+	 * @return  string  HTML to start a new panel
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	public static function panel($text, $id)
+	{
+		return '</dd><dt class="tabs ' . $id . '"><span><h3><a href="javascript:void(0);">' . $text . '</a></h3></span></dt><dd class="tabs">';
+	}
+
+	/**
+	 * Load the JavaScript behavior.
+	 *
+	 * @param   string  $group   The pane identifier.
+	 * @param   array   $params  Array of options.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0 These helpers are dependent on the deprecated MooTools support
+	 */
+	protected static function loadBehavior($group, $params = array())
+	{
+		static $loaded = array();
+
+		if (!array_key_exists((string) $group, $loaded))
+		{
+			// Include MooTools framework
+			JHtml::_('behavior.framework', true);
+
+			$opt['onActive']            = isset($params['onActive']) ? '\\' . $params['onActive'] : null;
+			$opt['onBackground']        = isset($params['onBackground']) ? '\\' . $params['onBackground'] : null;
+			$opt['display']             = isset($params['startOffset']) ? (int) $params['startOffset'] : null;
+			$opt['titleSelector']       = 'dt.tabs';
+			$opt['descriptionSelector'] = 'dd.tabs';
+
+			// When use storage is set and value is false - By default we allow to use storage
+			$opt['useStorage'] = !(isset($params['useCookie']) && !$params['useCookie']);
+
+			$options = JHtml::getJSObject($opt);
+
+			$js = '	window.addEvent(\'domready\', function(){
+						$$(\'dl#' . $group . '.tabs\').each(function(tabs){
+							new JTabs(tabs, ' . $options . ');
+						});
+					});';
+
+			$document = JFactory::getDocument();
+			$document->addScriptDeclaration($js);
+			JHtml::_('script', 'system/tabs.js', array('version' => 'auto', 'relative' => true));
+
+			$loaded[(string) $group] = true;
+		}
+	}
+}
diff --git a/core/libraries/cms/html/tag.php b/core/libraries/cms/html/tag.php
new file mode 100644
index 00000000..269d1cc9
--- /dev/null
+++ b/core/libraries/cms/html/tag.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Utility class for tags
+ *
+ * @since  3.1
+ */
+abstract class JHtmlTag
+{
+	/**
+	 * Cached array of the tag items.
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected static $items = array();
+
+	/**
+	 * Returns an array of tags.
+	 *
+	 * @param   array  $config  An array of configuration options. By default, only
+	 *                          published and unpublished categories are returned.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public static function options($config = array('filter.published' => array(0, 1)))
+	{
+		$hash = md5(serialize($config));
+
+		if (!isset(static::$items[$hash]))
+		{
+			$config = (array) $config;
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('a.id, a.title, a.level')
+				->from('#__tags AS a')
+				->where('a.parent_id > 0');
+
+			// Filter on the published state
+			if (isset($config['filter.published']))
+			{
+				if (is_numeric($config['filter.published']))
+				{
+					$query->where('a.published = ' . (int) $config['filter.published']);
+				}
+				elseif (is_array($config['filter.published']))
+				{
+					$config['filter.published'] = ArrayHelper::toInteger($config['filter.published']);
+					$query->where('a.published IN (' . implode(',', $config['filter.published']) . ')');
+				}
+			}
+
+			// Filter on the language
+			if (isset($config['filter.language']))
+			{
+				if (is_string($config['filter.language']))
+				{
+					$query->where('a.language = ' . $db->quote($config['filter.language']));
+				}
+				elseif (is_array($config['filter.language']))
+				{
+					foreach ($config['filter.language'] as &$language)
+					{
+						$language = $db->quote($language);
+					}
+
+					$query->where('a.language IN (' . implode(',', $config['filter.language']) . ')');
+				}
+			}
+
+			$query->order('a.lft');
+
+			$db->setQuery($query);
+			$items = $db->loadObjectList();
+
+			// Assemble the list options.
+			static::$items[$hash] = array();
+
+			foreach ($items as &$item)
+			{
+				$repeat = ($item->level - 1 >= 0) ? $item->level - 1 : 0;
+				$item->title = str_repeat('- ', $repeat) . $item->title;
+				static::$items[$hash][] = JHtml::_('select.option', $item->id, $item->title);
+			}
+		}
+
+		return static::$items[$hash];
+	}
+
+	/**
+	 * Returns an array of tags.
+	 *
+	 * @param   array  $config  An array of configuration options. By default, only published and unpublished tags are returned.
+	 *
+	 * @return  array  Tag data
+	 *
+	 * @since   3.1
+	 */
+	public static function tags($config = array('filter.published' => array(0, 1)))
+	{
+		$hash = md5(serialize($config));
+		$config = (array) $config;
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.id, a.title, a.level, a.parent_id')
+			->from('#__tags AS a')
+			->where('a.parent_id > 0');
+
+		// Filter on the published state
+		if (isset($config['filter.published']))
+		{
+			if (is_numeric($config['filter.published']))
+			{
+				$query->where('a.published = ' . (int) $config['filter.published']);
+			}
+			elseif (is_array($config['filter.published']))
+			{
+				$config['filter.published'] = ArrayHelper::toInteger($config['filter.published']);
+				$query->where('a.published IN (' . implode(',', $config['filter.published']) . ')');
+			}
+		}
+
+		$query->order('a.lft');
+
+		$db->setQuery($query);
+		$items = $db->loadObjectList();
+
+		// Assemble the list options.
+		static::$items[$hash] = array();
+
+		foreach ($items as &$item)
+		{
+			$repeat = ($item->level - 1 >= 0) ? $item->level - 1 : 0;
+			$item->title = str_repeat('- ', $repeat) . $item->title;
+			static::$items[$hash][] = JHtml::_('select.option', $item->id, $item->title);
+		}
+
+		return static::$items[$hash];
+	}
+
+	/**
+	 * This is just a proxy for the formbehavior.ajaxchosen method
+	 *
+	 * @param   string   $selector     DOM id of the tag field
+	 * @param   boolean  $allowCustom  Flag to allow custom values
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public static function ajaxfield($selector = '#jform_tags', $allowCustom = true)
+	{
+		// Get the component parameters
+		$params = JComponentHelper::getParams('com_tags');
+		$minTermLength = (int) $params->get('min_term_length', 3);
+
+		$displayData = array(
+			'minTermLength' => $minTermLength,
+			'selector'      => $selector,
+			'allowCustom'   => JFactory::getUser()->authorise('core.create', 'com_tags') ? $allowCustom : false,
+		);
+
+		JLayoutHelper::render('joomla.html.tag', $displayData);
+
+		return;
+	}
+}
diff --git a/core/libraries/cms/html/tel.php b/core/libraries/cms/html/tel.php
new file mode 100644
index 00000000..e12047f0
--- /dev/null
+++ b/core/libraries/cms/html/tel.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTML helper class for rendering telephone numbers.
+ *
+ * @since  1.6
+ */
+abstract class JHtmlTel
+{
+	/**
+	 * Converts strings of integers into more readable telephone format
+	 *
+	 * By default, the ITU-T format will automatically be used.
+	 * However, one of the allowed unit types may also be used instead.
+	 *
+	 * @param   integer  $number       The integers in a phone number with dot separated country code
+	 *                                 ccc.nnnnnnn where ccc represents country code and nnn represents the local number.
+	 * @param   string   $displayplan  The numbering plan used to display the numbers.
+	 *
+	 * @return  string  The formatted telephone number.
+	 *
+	 * @see     JFormRuleTel
+	 * @since   1.6
+	 */
+	public static function tel($number, $displayplan)
+	{
+		$number = explode('.', $number);
+		$countrycode = $number[0];
+		$number = $number[1];
+
+		if ($displayplan === 'ITU-T' || $displayplan === 'International' || $displayplan === 'int' || $displayplan === 'missdn' || $displayplan == null)
+		{
+			$display[0] = '+';
+			$display[1] = $countrycode;
+			$display[2] = ' ';
+			$display[3] = implode(str_split($number, 2), ' ');
+		}
+		elseif ($displayplan === 'NANP' || $displayplan === 'northamerica' || $displayplan === 'US')
+		{
+			$display[0] = '(';
+			$display[1] = substr($number, 0, 3);
+			$display[2] = ') ';
+			$display[3] = substr($number, 3, 3);
+			$display[4] = '-';
+			$display[5] = substr($number, 6, 4);
+		}
+		elseif ($displayplan === 'EPP' || $displayplan === 'IETF')
+		{
+			$display[0] = '+';
+			$display[1] = $countrycode;
+			$display[2] = '.';
+			$display[3] = $number;
+		}
+		elseif ($displayplan === 'ARPA' || $displayplan === 'ENUM')
+		{
+			$number = implode(str_split(strrev($number), 1), '.');
+			$display[0] = '+';
+			$display[1] = $number;
+			$display[2] = '.';
+			$display[3] = $countrycode;
+			$display[4] = '.e164.arpa';
+		}
+
+		return implode($display, '');
+	}
+}
diff --git a/core/libraries/cms/html/user.php b/core/libraries/cms/html/user.php
new file mode 100644
index 00000000..e0719810
--- /dev/null
+++ b/core/libraries/cms/html/user.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  HTML
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class working with users
+ *
+ * @since  2.5
+ */
+abstract class JHtmlUser
+{
+	/**
+	 * Displays a list of user groups.
+	 *
+	 * @param   boolean  $includeSuperAdmin  true to include super admin groups, false to exclude them
+	 *
+	 * @return  array  An array containing a list of user groups.
+	 *
+	 * @since   2.5
+	 */
+	public static function groups($includeSuperAdmin = false)
+	{
+		$options = array_values(JHelperUsergroups::getInstance()->getAll());
+
+		for ($i = 0, $n = count($options); $i < $n; $i++)
+		{
+			$options[$i]->value = $options[$i]->id;
+			$options[$i]->text = str_repeat('- ', $options[$i]->level) . $options[$i]->title;
+			$groups[] = JHtml::_('select.option', $options[$i]->value, $options[$i]->text);
+		}
+
+		// Exclude super admin groups if requested
+		if (!$includeSuperAdmin)
+		{
+			$filteredGroups = array();
+
+			foreach ($groups as $group)
+			{
+				if (!JAccess::checkGroup($group->value, 'core.admin'))
+				{
+					$filteredGroups[] = $group;
+				}
+			}
+
+			$groups = $filteredGroups;
+		}
+
+		return $groups;
+	}
+
+	/**
+	 * Get a list of users.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	public static function userlist()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.id AS value, a.name AS text')
+			->from('#__users AS a')
+			->where('a.block = 0')
+			->order('a.name');
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+}
diff --git a/core/libraries/cms/less/formatter/joomla.php b/core/libraries/cms/less/formatter/joomla.php
new file mode 100644
index 00000000..52649d3a
--- /dev/null
+++ b/core/libraries/cms/less/formatter/joomla.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Less
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Formatter ruleset for Joomla formatted CSS generated via LESS
+ *
+ * @package     Joomla.Libraries
+ * @subpackage  Less
+ * @since       3.4
+ * @deprecated  4.0  without replacement
+ */
+class JLessFormatterJoomla extends lessc_formatter_classic
+{
+	public $disableSingle = true;
+
+	public $breakSelectors = true;
+
+	public $assignSeparator = ': ';
+
+	public $selectorSeparator = ',';
+
+	public $indentChar = "\t";
+}
diff --git a/core/libraries/cms/less/less.php b/core/libraries/cms/less/less.php
new file mode 100644
index 00000000..7aff4560
--- /dev/null
+++ b/core/libraries/cms/less/less.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  LESS
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for lessc
+ *
+ * @package     Joomla.Libraries
+ * @subpackage  Less
+ * @since       3.4
+ * @deprecated  4.0  without replacement
+ */
+class JLess extends lessc
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   string                 $fname      Filename to process
+	 * @param   \JLessFormatterJoomla  $formatter  Formatter object
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($fname = null, $formatter = null)
+	{
+		parent::__construct($fname);
+
+		if ($formatter === null)
+		{
+			$formatter = new JLessFormatterJoomla;
+		}
+
+		$this->setFormatter($formatter);
+	}
+
+	/**
+	 * Override compile to reset $this->allParsedFiles array to allow
+	 * parsing multiple files/strings using same imports.
+	 * PR: https://github.com/leafo/lessphp/pull/607
+	 *
+	 * For documentation on this please see /vendor/leafo/lessc.inc.php
+	 *
+	 * @param   string  $string  LESS string to parse.
+	 * @param   string  $name    The sourceName used for error messages.
+	 *
+	 * @return  string  $out     The compiled css output.
+	 */
+	public function compile($string, $name = null)
+	{
+		$this->allParsedFiles = array();
+
+		return parent::compile($string, $name);
+	}
+}
diff --git a/core/libraries/fof/LICENSE.txt b/core/libraries/fof/LICENSE.txt
new file mode 100644
index 00000000..56e598d4
--- /dev/null
+++ b/core/libraries/fof/LICENSE.txt
@@ -0,0 +1,345 @@
+================================================================================
+Historical note
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+On February 21st, 2013 FOF changed its license to GPLv2 or later.
+================================================================================
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
\ No newline at end of file
diff --git a/core/libraries/fof/autoloader/component.php b/core/libraries/fof/autoloader/component.php
new file mode 100644
index 00000000..f9a2a8e5
--- /dev/null
+++ b/core/libraries/fof/autoloader/component.php
@@ -0,0 +1,780 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  autoloader
+ *  @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * An autoloader for FOF-powered components. It allows the autoloading of
+ * various classes related to the operation of a component, from Controllers
+ * and Models to Helpers and Fields. If a class doesn't exist, it will be
+ * created on the fly.
+ *
+ * @package  FrameworkOnFramework
+ * @subpackage  autoloader
+ * @since    2.1
+ */
+class FOFAutoloaderComponent
+{
+	/**
+	 * An instance of this autoloader
+	 *
+	 * @var   FOFAutoloaderComponent
+	 */
+	public static $autoloader = null;
+
+	/**
+	 * The path to the FOF root directory
+	 *
+	 * @var   string
+	 */
+	public static $fofPath = null;
+
+	/**
+	 * An array holding component names and their FOF-ness status
+	 *
+	 * @var   array
+	 */
+	protected static $fofComponents = array();
+
+	/**
+	 * Initialise this autoloader
+	 *
+	 * @return  FOFAutoloaderComponent
+	 */
+	public static function init()
+	{
+		if (self::$autoloader == null)
+		{
+			self::$autoloader = new self;
+		}
+
+		return self::$autoloader;
+	}
+
+	/**
+	 * Public constructor. Registers the autoloader with PHP.
+	 */
+	public function __construct()
+	{
+		self::$fofPath = realpath(__DIR__ . '/../');
+
+		spl_autoload_register(array($this,'autoload_fof_controller'));
+		spl_autoload_register(array($this,'autoload_fof_model'));
+		spl_autoload_register(array($this,'autoload_fof_view'));
+		spl_autoload_register(array($this,'autoload_fof_table'));
+		spl_autoload_register(array($this,'autoload_fof_helper'));
+		spl_autoload_register(array($this,'autoload_fof_toolbar'));
+		spl_autoload_register(array($this,'autoload_fof_field'));
+	}
+
+	/**
+	 * Returns true if this is a FOF-powered component, i.e. if it has a fof.xml
+	 * file in its main directory.
+	 *
+	 * @param   string  $component  The component's name
+	 *
+	 * @return  boolean
+	 */
+	public function isFOFComponent($component)
+	{
+		if (!isset($fofComponents[$component]))
+		{
+			$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+			$fofComponents[$component] = file_exists($componentPaths['admin'] . '/fof.xml');
+		}
+
+		return $fofComponents[$component];
+	}
+
+	/**
+	 * Creates class aliases. On systems where eval() is enabled it creates a
+	 * real class. On other systems it merely creates an alias. The eval()
+	 * method is preferred as class_aliases result in the name of the class
+	 * being instanciated not being available, making it impossible to create
+	 * a class instance without passing a $config array :(
+	 *
+	 * @param   string   $original  The name of the original (existing) class
+	 * @param   string   $alias     The name of the new (aliased) class
+	 * @param   boolean  $autoload  Should I try to autoload the $original class?
+	 *
+	 * @return  void
+	 */
+	private function class_alias($original, $alias, $autoload = true)
+	{
+		static $hasEval = null;
+
+		if (is_null($hasEval))
+		{
+			$hasEval = false;
+
+			if (function_exists('ini_get'))
+			{
+				$disabled_functions = ini_get('disabled_functions');
+
+				if (!is_string($disabled_functions))
+				{
+					$hasEval = true;
+				}
+				else
+				{
+					$disabled_functions = explode(',', $disabled_functions);
+					$hasEval = !in_array('eval', $disabled_functions);
+				}
+			}
+		}
+
+		if (!class_exists($original, $autoload))
+		{
+			return;
+		}
+
+		if ($hasEval)
+		{
+			$phpCode = "class $alias extends $original {}";
+			eval($phpCode);
+		}
+		else
+		{
+			class_alias($original, $alias, $autoload);
+		}
+	}
+
+	/**
+	 * Autoload Controllers
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_controller($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli) && is_null($isAdmin))
+		{
+			list($isCli, $isAdmin) = FOFDispatcher::isCliAdmin();
+		}
+
+		if (strpos($class_name, 'Controller') === false)
+		{
+			return;
+		}
+
+		// Change from camel cased into a lowercase array
+		$class_modified = preg_replace('/(\s)+/', '_', $class_name);
+		$class_modified = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class_modified));
+		$parts = explode('_', $class_modified);
+
+		// We need three parts in the name
+		if (count($parts) != 3)
+		{
+			return;
+		}
+
+		// We need the second part to be "controller"
+		if ($parts[1] != 'controller')
+		{
+			return;
+		}
+
+		// Get the information about this class
+		$component_raw  = $parts[0];
+		$component = 'com_' . $parts[0];
+		$view = $parts[2];
+
+		// Is this an FOF 2.1 or later component?
+		if (!$this->isFOFComponent($component))
+		{
+			return;
+		}
+
+		// Get the alternate view and class name (opposite singular/plural name)
+		$alt_view = FOFInflector::isSingular($view) ? FOFInflector::pluralize($view) : FOFInflector::singularize($view);
+		$alt_class = FOFInflector::camelize($component_raw . '_controller_' . $alt_view);
+
+		// Get the component's paths
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+
+		// Get the proper and alternate paths and file names
+		$file = "/controllers/$view.php";
+		$altFile = "/controllers/$alt_view.php";
+		$path = $componentPaths['main'];
+		$altPath = $componentPaths['alt'];
+
+		// Try to find the proper class in the proper path
+		if (file_exists($path . $file))
+		{
+			@include_once $path . $file;
+		}
+
+		// Try to find the proper class in the alternate path
+		if (!class_exists($class_name) && file_exists($altPath . $file))
+		{
+			@include_once $altPath . $file;
+		}
+
+		// Try to find the alternate class in the proper path
+		if (!class_exists($alt_class) && file_exists($path . $altFile))
+		{
+			@include_once $path . $altFile;
+		}
+
+		// Try to find the alternate class in the alternate path
+		if (!class_exists($alt_class) && file_exists($altPath . $altFile))
+		{
+			@include_once $altPath . $altFile;
+		}
+
+		// If the alternate class exists just map the class to the alternate
+		if (!class_exists($class_name) && class_exists($alt_class))
+		{
+			$this->class_alias($alt_class, $class_name);
+		}
+
+		// No class found? Map to FOFController
+		elseif (!class_exists($class_name))
+		{
+			if ($view != 'default')
+			{
+				$defaultClass = FOFInflector::camelize($component_raw . '_controller_default');
+				$this->class_alias($defaultClass, $class_name);
+			}
+			else
+			{
+				$this->class_alias('FOFController', $class_name);
+			}
+		}
+	}
+
+	/**
+	 * Autoload Models
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_model($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli) && is_null($isAdmin))
+		{
+			list($isCli, $isAdmin) = FOFDispatcher::isCliAdmin();
+		}
+
+		if (strpos($class_name, 'Model') === false)
+		{
+			return;
+		}
+
+		// Change from camel cased into a lowercase array
+		$class_modified = preg_replace('/(\s)+/', '_', $class_name);
+		$class_modified = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class_modified));
+		$parts = explode('_', $class_modified);
+
+		// We need three parts in the name
+		if (count($parts) != 3)
+		{
+			return;
+		}
+
+		// We need the second part to be "model"
+		if ($parts[1] != 'model')
+		{
+			return;
+		}
+
+		// Get the information about this class
+		$component_raw  = $parts[0];
+		$component = 'com_' . $parts[0];
+		$view = $parts[2];
+
+		// Is this an FOF 2.1 or later component?
+		if (!$this->isFOFComponent($component))
+		{
+			return;
+		}
+
+		// Get the alternate view and class name (opposite singular/plural name)
+		$alt_view = FOFInflector::isSingular($view) ? FOFInflector::pluralize($view) : FOFInflector::singularize($view);
+		$alt_class = FOFInflector::camelize($component_raw . '_model_' . $alt_view);
+
+		// Get the proper and alternate paths and file names
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+
+		$file = "/models/$view.php";
+		$altFile = "/models/$alt_view.php";
+		$path = $componentPaths['main'];
+		$altPath = $componentPaths['alt'];
+
+		// Try to find the proper class in the proper path
+		if (file_exists($path . $file))
+		{
+			@include_once $path . $file;
+		}
+
+		// Try to find the proper class in the alternate path
+		if (!class_exists($class_name) && file_exists($altPath . $file))
+		{
+			@include_once $altPath . $file;
+		}
+
+		// Try to find the alternate class in the proper path
+		if (!class_exists($alt_class) && file_exists($path . $altFile))
+		{
+			@include_once $path . $altFile;
+		}
+
+		// Try to find the alternate class in the alternate path
+		if (!class_exists($alt_class) && file_exists($altPath . $altFile))
+		{
+			@include_once $altPath . $altFile;
+		}
+
+		// If the alternate class exists just map the class to the alternate
+		if (!class_exists($class_name) && class_exists($alt_class))
+		{
+			$this->class_alias($alt_class, $class_name);
+		}
+
+		// No class found? Map to FOFModel
+		elseif (!class_exists($class_name))
+		{
+			if ($view != 'default')
+			{
+				$defaultClass = FOFInflector::camelize($component_raw . '_model_default');
+				$this->class_alias($defaultClass, $class_name);
+			}
+			else
+			{
+				$this->class_alias('FOFModel', $class_name, true);
+			}
+		}
+	}
+
+	/**
+	 * Autoload Views
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_view($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli) && is_null($isAdmin))
+		{
+			list($isCli, $isAdmin) = FOFDispatcher::isCliAdmin();
+		}
+
+		if (strpos($class_name, 'View') === false)
+		{
+			return;
+		}
+
+		// Change from camel cased into a lowercase array
+		$class_modified = preg_replace('/(\s)+/', '_', $class_name);
+		$class_modified = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class_modified));
+		$parts = explode('_', $class_modified);
+
+		// We need at least three parts in the name
+
+		if (count($parts) < 3)
+		{
+			return;
+		}
+
+		// We need the second part to be "view"
+
+		if ($parts[1] != 'view')
+		{
+			return;
+		}
+
+		// Get the information about this class
+		$component_raw  = $parts[0];
+		$component = 'com_' . $parts[0];
+		$view = $parts[2];
+
+		if (count($parts) > 3)
+		{
+			$format = $parts[3];
+		}
+		else
+		{
+			$input = new FOFInput;
+			$format = $input->getCmd('format', 'html', 'cmd');
+		}
+
+		// Is this an FOF 2.1 or later component?
+		if (!$this->isFOFComponent($component))
+		{
+			return;
+		}
+
+		// Get the alternate view and class name (opposite singular/plural name)
+		$alt_view = FOFInflector::isSingular($view) ? FOFInflector::pluralize($view) : FOFInflector::singularize($view);
+		$alt_class = FOFInflector::camelize($component_raw . '_view_' . $alt_view);
+
+		// Get the proper and alternate paths and file names
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+
+		$protoFile = "/models/$view";
+		$protoAltFile = "/models/$alt_view";
+		$path = $componentPaths['main'];
+		$altPath = $componentPaths['alt'];
+
+		$formats = array($format);
+
+		if ($format != 'html')
+		{
+			$formats[] = 'raw';
+		}
+
+		foreach ($formats as $currentFormat)
+		{
+			$file = $protoFile . '.' . $currentFormat . '.php';
+			$altFile = $protoAltFile . '.' . $currentFormat . '.php';
+
+			// Try to find the proper class in the proper path
+			if (!class_exists($class_name) && file_exists($path . $file))
+			{
+				@include_once $path . $file;
+			}
+
+			// Try to find the proper class in the alternate path
+			if (!class_exists($class_name) && file_exists($altPath . $file))
+			{
+				@include_once $altPath . $file;
+			}
+
+			// Try to find the alternate class in the proper path
+			if (!class_exists($alt_class) && file_exists($path . $altFile))
+			{
+				@include_once $path . $altFile;
+			}
+
+			// Try to find the alternate class in the alternate path
+			if (!class_exists($alt_class) && file_exists($altPath . $altFile))
+			{
+				@include_once $altPath . $altFile;
+			}
+		}
+
+		// If the alternate class exists just map the class to the alternate
+		if (!class_exists($class_name) && class_exists($alt_class))
+		{
+			$this->class_alias($alt_class, $class_name);
+		}
+
+		// No class found? Map to FOFModel
+		elseif (!class_exists($class_name))
+		{
+			if ($view != 'default')
+			{
+				$defaultClass = FOFInflector::camelize($component_raw . '_view_default');
+				$this->class_alias($defaultClass, $class_name);
+			}
+			else
+			{
+				if (!file_exists(self::$fofPath . '/view/' . $format . '.php'))
+				{
+					$default_class = 'FOFView';
+				}
+				else
+				{
+					$default_class = 'FOFView' . ucfirst($format);
+				}
+
+				$this->class_alias($default_class, $class_name, true);
+			}
+		}
+	}
+
+	/**
+	 * Autoload Tables
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_table($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli) && is_null($isAdmin))
+		{
+			list($isCli, $isAdmin) = FOFDispatcher::isCliAdmin();
+		}
+
+		if (strpos($class_name, 'Table') === false)
+		{
+			return;
+		}
+
+		// Change from camel cased into a lowercase array
+		$class_modified = preg_replace('/(\s)+/', '_', $class_name);
+		$class_modified = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class_modified));
+		$parts = explode('_', $class_modified);
+
+		// We need three parts in the name
+
+		if (count($parts) != 3)
+		{
+			return;
+		}
+
+		// We need the second part to be "model"
+		if ($parts[1] != 'table')
+		{
+			return;
+		}
+
+		// Get the information about this class
+		$component_raw  = $parts[0];
+		$component = 'com_' . $parts[0];
+		$view = $parts[2];
+
+		// Is this an FOF 2.1 or later component?
+		if (!$this->isFOFComponent($component))
+		{
+			return;
+		}
+
+		// Get the alternate view and class name (opposite singular/plural name)
+		$alt_view = FOFInflector::isSingular($view) ? FOFInflector::pluralize($view) : FOFInflector::singularize($view);
+		$alt_class = FOFInflector::camelize($component_raw . '_table_' . $alt_view);
+
+		// Get the proper and alternate paths and file names
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+
+		$file = "/tables/$view.php";
+		$altFile = "/tables/$alt_view.php";
+		$path = $componentPaths['admin'];
+
+		// Try to find the proper class in the proper path
+		if (file_exists($path . $file))
+		{
+			@include_once $path . $file;
+		}
+
+		// Try to find the alternate class in the proper path
+		if (!class_exists($alt_class) && file_exists($path . $altFile))
+		{
+			@include_once $path . $altFile;
+		}
+
+		// If the alternate class exists just map the class to the alternate
+		if (!class_exists($class_name) && class_exists($alt_class))
+		{
+			$this->class_alias($alt_class, $class_name);
+		}
+
+		// No class found? Map to FOFModel
+		elseif (!class_exists($class_name))
+		{
+			if ($view != 'default')
+			{
+				$defaultClass = FOFInflector::camelize($component_raw . '_table_default');
+				$this->class_alias($defaultClass, $class_name);
+			}
+			else
+			{
+				$this->class_alias('FOFTable', $class_name, true);
+			}
+		}
+	}
+
+	/**
+	 * Autoload Helpers
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_helper($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli) && is_null($isAdmin))
+		{
+			list($isCli, $isAdmin) = FOFDispatcher::isCliAdmin();
+		}
+
+		if (strpos($class_name, 'Helper') === false)
+		{
+			return;
+		}
+
+		// Change from camel cased into a lowercase array
+		$class_modified = preg_replace('/(\s)+/', '_', $class_name);
+		$class_modified = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class_modified));
+		$parts = explode('_', $class_modified);
+
+		// We need three parts in the name
+		if (count($parts) != 3)
+		{
+			return;
+		}
+
+		// We need the second part to be "model"
+		if ($parts[1] != 'helper')
+		{
+			return;
+		}
+
+		// Get the information about this class
+		$component_raw  = $parts[0];
+		$component = 'com_' . $parts[0];
+		$view = $parts[2];
+
+		// Is this an FOF 2.1 or later component?
+		if (!$this->isFOFComponent($component))
+		{
+			return;
+		}
+
+		// Get the alternate view and class name (opposite singular/plural name)
+		$alt_view = FOFInflector::isSingular($view) ? FOFInflector::pluralize($view) : FOFInflector::singularize($view);
+		$alt_class = FOFInflector::camelize($component_raw . '_helper_' . $alt_view);
+
+		// Get the proper and alternate paths and file names
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+
+		$file = "/helpers/$view.php";
+		$altFile = "/helpers/$alt_view.php";
+		$path = $componentPaths['main'];
+		$altPath = $componentPaths['alt'];
+
+		// Try to find the proper class in the proper path
+		if (file_exists($path . $file))
+		{
+			@include_once $path . $file;
+		}
+
+		// Try to find the proper class in the alternate path
+		if (!class_exists($class_name) && file_exists($altPath . $file))
+		{
+			@include_once $altPath . $file;
+		}
+
+		// Try to find the alternate class in the proper path
+		if (!class_exists($alt_class) && file_exists($path . $altFile))
+		{
+			@include_once $path . $altFile;
+		}
+
+		// Try to find the alternate class in the alternate path
+		if (!class_exists($alt_class) && file_exists($altPath . $altFile))
+		{
+			@include_once $altPath . $altFile;
+		}
+
+		// If the alternate class exists just map the class to the alternate
+		if (!class_exists($class_name) && class_exists($alt_class))
+		{
+			$this->class_alias($alt_class, $class_name);
+		}
+	}
+
+	/**
+	 * Autoload Toolbars
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_toolbar($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli) && is_null($isAdmin))
+		{
+			list($isCli, $isAdmin) = FOFDispatcher::isCliAdmin();
+		}
+
+		if (strpos($class_name, 'Toolbar') === false)
+		{
+			return;
+		}
+
+		// Change from camel cased into a lowercase array
+		$class_modified = preg_replace('/(\s)+/', '_', $class_name);
+		$class_modified = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class_modified));
+		$parts = explode('_', $class_modified);
+
+		// We need two parts in the name
+		if (count($parts) != 2)
+		{
+			return;
+		}
+
+		// We need the second part to be "model"
+		if ($parts[1] != 'toolbar')
+		{
+			return;
+		}
+
+		// Get the information about this class
+		$component_raw  = $parts[0];
+		$component = 'com_' . $parts[0];
+
+        $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+
+		// Get the proper and alternate paths and file names
+		$file    = "/components/$component/toolbar.php";
+		$path    = ($isAdmin || $isCli) ? $platformDirs['admin'] : $platformDirs['public'];
+		$altPath = ($isAdmin || $isCli) ? $platformDirs['public'] : $platformDirs['admin'];
+
+		// Try to find the proper class in the proper path
+
+		if (file_exists($path . $file))
+		{
+			@include_once $path . $file;
+		}
+
+		// Try to find the proper class in the alternate path
+		if (!class_exists($class_name) && file_exists($altPath . $file))
+		{
+			@include_once $altPath . $file;
+		}
+
+		// No class found? Map to FOFToolbar
+		if (!class_exists($class_name))
+		{
+			$this->class_alias('FOFToolbar', $class_name, true);
+		}
+	}
+
+	/**
+	 * Autoload Fields
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_field($class_name)
+	{
+        FOFPlatform::getInstance()->logDebug(__METHOD__ . "() autoloading $class_name");
+
+		// @todo
+	}
+}
diff --git a/core/libraries/fof/autoloader/fof.php b/core/libraries/fof/autoloader/fof.php
new file mode 100644
index 00000000..602c9192
--- /dev/null
+++ b/core/libraries/fof/autoloader/fof.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  autoloader
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * The main class autoloader for FOF itself
+ *
+ * @package     FrameworkOnFramework
+ * @subpackage  autoloader
+ * @since       2.1
+ */
+class FOFAutoloaderFof
+{
+	/**
+	 * An instance of this autoloader
+	 *
+	 * @var   FOFAutoloaderFof
+	 */
+	public static $autoloader = null;
+
+	/**
+	 * The path to the FOF root directory
+	 *
+	 * @var   string
+	 */
+	public static $fofPath = null;
+
+	/**
+	 * Initialise this autoloader
+	 *
+	 * @return  FOFAutoloaderFof
+	 */
+	public static function init()
+	{
+		if (self::$autoloader == null)
+		{
+			self::$autoloader = new self;
+		}
+
+		return self::$autoloader;
+	}
+
+	/**
+	 * Public constructor. Registers the autoloader with PHP.
+	 */
+	public function __construct()
+	{
+		self::$fofPath = realpath(__DIR__ . '/../');
+
+		spl_autoload_register(array($this,'autoload_fof_core'));
+	}
+
+	/**
+	 * The actual autoloader
+	 *
+	 * @param   string  $class_name  The name of the class to load
+	 *
+	 * @return  void
+	 */
+	public function autoload_fof_core($class_name)
+	{
+		// Make sure the class has a FOF prefix
+		if (substr($class_name, 0, 3) != 'FOF')
+		{
+			return;
+		}
+
+		// Remove the prefix
+		$class = substr($class_name, 3);
+
+		// Change from camel cased (e.g. ViewHtml) into a lowercase array (e.g. 'view','html')
+		$class = preg_replace('/(\s)+/', '_', $class);
+		$class = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $class));
+		$class = explode('_', $class);
+
+		// First try finding in structured directory format (preferred)
+		$path = self::$fofPath . '/' . implode('/', $class) . '.php';
+
+		if (@file_exists($path))
+		{
+			include_once $path;
+		}
+
+		// Then try the duplicate last name structured directory format (not recommended)
+
+		if (!class_exists($class_name, false))
+		{
+			reset($class);
+			$lastPart = end($class);
+			$path = self::$fofPath . '/' . implode('/', $class) . '/' . $lastPart . '.php';
+
+			if (@file_exists($path))
+			{
+				include_once $path;
+			}
+		}
+
+		// If it still fails, try looking in the legacy folder (used for backwards compatibility)
+
+		if (!class_exists($class_name, false))
+		{
+			$path = self::$fofPath . '/legacy/' . implode('/', $class) . '.php';
+
+			if (@file_exists($path))
+			{
+				include_once $path;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/config/domain/dispatcher.php b/core/libraries/fof/config/domain/dispatcher.php
new file mode 100644
index 00000000..cbe05260
--- /dev/null
+++ b/core/libraries/fof/config/domain/dispatcher.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  config
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * Configuration parser for the dispatcher-specific settings
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFConfigDomainDispatcher implements FOFConfigDomainInterface
+{
+	/**
+	 * Parse the XML data, adding them to the $ret array
+	 *
+	 * @param   SimpleXMLElement  $xml   The XML data of the component's configuration area
+	 * @param   array             &$ret  The parsed data, in the form of a hash array
+	 *
+	 * @return  void
+	 */
+	public function parseDomain(SimpleXMLElement $xml, array &$ret)
+	{
+		// Initialise
+		$ret['dispatcher'] = array();
+
+		// Parse the dispatcher configuration
+		$dispatcherData = $xml->dispatcher;
+
+		// Sanity check
+
+		if (empty($dispatcherData))
+		{
+			return;
+		}
+
+		$options = $xml->xpath('dispatcher/option');
+
+		if (!empty($options))
+		{
+			foreach ($options as $option)
+			{
+				$key = (string) $option['name'];
+				$ret['dispatcher'][$key] = (string) $option;
+			}
+		}
+	}
+
+	/**
+	 * Return a configuration variable
+	 *
+	 * @param   string  &$configuration  Configuration variables (hashed array)
+	 * @param   string  $var             The variable we want to fetch
+	 * @param   mixed   $default         Default value
+	 *
+	 * @return  mixed  The variable's value
+	 */
+	public function get(&$configuration, $var, $default)
+	{
+		if (isset($configuration['dispatcher'][$var]))
+		{
+			return $configuration['dispatcher'][$var];
+		}
+		else
+		{
+			return $default;
+		}
+	}
+}
diff --git a/core/libraries/fof/config/domain/interface.php b/core/libraries/fof/config/domain/interface.php
new file mode 100644
index 00000000..d2901ab9
--- /dev/null
+++ b/core/libraries/fof/config/domain/interface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  config
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * The Interface of an FOFConfigDomain class. The methods are used to parse and
+ * privision sensible information to consumers. FOFConfigProvider acts as an
+ * adapter to the FOFConfigDomain classes.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+interface FOFConfigDomainInterface
+{
+	/**
+	 * Parse the XML data, adding them to the $ret array
+	 *
+	 * @param   SimpleXMLElement  $xml   The XML data of the component's configuration area
+	 * @param   array             &$ret  The parsed data, in the form of a hash array
+	 *
+	 * @return  void
+	 */
+	public function parseDomain(SimpleXMLElement $xml, array &$ret);
+
+	/**
+	 * Return a configuration variable
+	 *
+	 * @param   string  &$configuration  Configuration variables (hashed array)
+	 * @param   string  $var             The variable we want to fetch
+	 * @param   mixed   $default         Default value
+	 *
+	 * @return  mixed  The variable's value
+	 */
+	public function get(&$configuration, $var, $default);
+}
diff --git a/core/libraries/fof/config/domain/tables.php b/core/libraries/fof/config/domain/tables.php
new file mode 100644
index 00000000..3e4e4dd8
--- /dev/null
+++ b/core/libraries/fof/config/domain/tables.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  config
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * Configuration parser for the tables-specific settings
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFConfigDomainTables implements FOFConfigDomainInterface
+{
+	/**
+	 * Parse the XML data, adding them to the $ret array
+	 *
+	 * @param   SimpleXMLElement  $xml   The XML data of the component's configuration area
+	 * @param   array             &$ret  The parsed data, in the form of a hash array
+	 *
+	 * @return  void
+	 */
+	public function parseDomain(SimpleXMLElement $xml, array &$ret)
+	{
+		// Initialise
+		$ret['tables'] = array();
+
+		// Parse table configuration
+		$tableData = $xml->xpath('table');
+
+		// Sanity check
+		if (empty($tableData))
+		{
+			return;
+		}
+
+		foreach ($tableData as $aTable)
+		{
+			$key = (string) $aTable['name'];
+
+			$ret['tables'][$key]['behaviors'] = (string) $aTable->behaviors;
+			$ret['tables'][$key]['tablealias'] = $aTable->xpath('tablealias');
+			$ret['tables'][$key]['fields'] = array();
+			$ret['tables'][$key]['relations'] = array();
+
+			$fieldData = $aTable->xpath('field');
+
+			if (!empty($fieldData))
+			{
+				foreach ($fieldData as $field)
+				{
+					$k = (string) $field['name'];
+					$ret['tables'][$key]['fields'][$k] = (string) $field;
+				}
+			}
+
+			$relationsData = $aTable->xpath('relation');
+
+			if (!empty($relationsData))
+			{
+				foreach ($relationsData as $relationData)
+				{
+					$type = (string)$relationData['type'];
+					$itemName = (string)$relationData['name'];
+
+					if (empty($type) || empty($itemName))
+					{
+						continue;
+					}
+
+					$tableClass		= (string)$relationData['tableClass'];
+					$localKey		= (string)$relationData['localKey'];
+					$remoteKey		= (string)$relationData['remoteKey'];
+					$ourPivotKey	= (string)$relationData['ourPivotKey'];
+					$theirPivotKey	= (string)$relationData['theirPivotKey'];
+					$pivotTable		= (string)$relationData['pivotTable'];
+					$default		= (string)$relationData['default'];
+
+					$default = !in_array($default, array('no', 'false', 0));
+
+					$relation = array(
+						'type'			=> $type,
+						'itemName'		=> $itemName,
+						'tableClass'	=> empty($tableClass) ? null : $tableClass,
+						'localKey'		=> empty($localKey) ? null : $localKey,
+						'remoteKey'		=> empty($remoteKey) ? null : $remoteKey,
+						'default'		=> $default,
+					);
+
+					if (!empty($ourPivotKey) || !empty($theirPivotKey) || !empty($pivotTable))
+					{
+						$relation['ourPivotKey']	= empty($ourPivotKey) ? null : $ourPivotKey;
+						$relation['theirPivotKey']	= empty($theirPivotKey) ? null : $theirPivotKey;
+						$relation['pivotTable']	= empty($pivotTable) ? null : $pivotTable;
+					}
+
+					$ret['tables'][$key]['relations'][] = $relation;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Return a configuration variable
+	 *
+	 * @param   string  &$configuration  Configuration variables (hashed array)
+	 * @param   string  $var             The variable we want to fetch
+	 * @param   mixed   $default         Default value
+	 *
+	 * @return  mixed  The variable's value
+	 */
+	public function get(&$configuration, $var, $default)
+	{
+		$parts = explode('.', $var);
+
+		$view = $parts[0];
+		$method = 'get' . ucfirst($parts[1]);
+
+		if (!method_exists($this, $method))
+		{
+			return $default;
+		}
+
+		array_shift($parts);
+		array_shift($parts);
+
+		$ret = $this->$method($view, $configuration, $parts, $default);
+
+		return $ret;
+	}
+
+	/**
+	 * Internal method to return the magic field mapping
+	 *
+	 * @param   string  $table           The table for which we will be fetching a field map
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options; key 0 defines the table we want to fetch
+	 * @param   string  $default         Default magic field mapping; empty if not defined
+	 *
+	 * @return  array   Field map
+	 */
+	protected function getField($table, &$configuration, $params, $default = '')
+	{
+		$fieldmap = array();
+
+		if (isset($configuration['tables']['*']) && isset($configuration['tables']['*']['fields']))
+		{
+			$fieldmap = $configuration['tables']['*']['fields'];
+		}
+
+		if (isset($configuration['tables'][$table]) && isset($configuration['tables'][$table]['fields']))
+		{
+			$fieldmap = array_merge($fieldmap, $configuration['tables'][$table]['fields']);
+		}
+
+		$map = $default;
+
+		if (empty($params[0]))
+		{
+			$map = $fieldmap;
+		}
+		elseif (isset($fieldmap[$params[0]]))
+		{
+			$map = $fieldmap[$params[0]];
+		}
+
+		return $map;
+	}
+
+	/**
+	 * Internal method to get table alias
+	 *
+	 * @param   string  $table           The table for which we will be fetching table alias
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options; key 0 defines the table we want to fetch
+	 * @param   string  $default         Default table alias
+	 *
+	 * @return  string  Table alias
+	 */
+	protected function getTablealias($table, &$configuration, $params, $default = '')
+	{
+		$tablealias = $default;
+
+		if (isset($configuration['tables']['*'])
+			&& isset($configuration['tables']['*']['tablealias'])
+			&& isset($configuration['tables']['*']['tablealias'][0]))
+		{
+			$tablealias = (string) $configuration['tables']['*']['tablealias'][0];
+		}
+
+		if (isset($configuration['tables'][$table])
+			&& isset($configuration['tables'][$table]['tablealias'])
+			&& isset($configuration['tables'][$table]['tablealias'][0]))
+		{
+			$tablealias = (string) $configuration['tables'][$table]['tablealias'][0];
+		}
+
+		return $tablealias;
+	}
+
+	/**
+	 * Internal method to get table behaviours
+	 *
+	 * @param   string  $table           The table for which we will be fetching table alias
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options; key 0 defines the table we want to fetch
+	 * @param   string  $default         Default table alias
+	 *
+	 * @return  string  Table behaviours
+	 */
+	protected function getBehaviors($table, &$configuration, $params, $default = '')
+	{
+		$behaviors = $default;
+
+		if (isset($configuration['tables']['*'])
+			&& isset($configuration['tables']['*']['behaviors']))
+		{
+			$behaviors = (string) $configuration['tables']['*']['behaviors'];
+		}
+
+		if (isset($configuration['tables'][$table])
+			&& isset($configuration['tables'][$table]['behaviors']))
+		{
+			$behaviors = (string) $configuration['tables'][$table]['behaviors'];
+		}
+
+		return $behaviors;
+	}
+
+	/**
+	 * Internal method to get table relations
+	 *
+	 * @param   string  $table           The table for which we will be fetching table alias
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options; key 0 defines the table we want to fetch
+	 * @param   string  $default         Default table alias
+	 *
+	 * @return  array   Table relations
+	 */
+	protected function getRelations($table, &$configuration, $params, $default = '')
+	{
+		$relations = $default;
+
+		if (isset($configuration['tables']['*'])
+			&& isset($configuration['tables']['*']['relations']))
+		{
+			$relations = $configuration['tables']['*']['relations'];
+		}
+
+		if (isset($configuration['tables'][$table])
+			&& isset($configuration['tables'][$table]['relations']))
+		{
+			$relations = $configuration['tables'][$table]['relations'];
+		}
+
+		return $relations;
+	}
+}
diff --git a/core/libraries/fof/config/domain/views.php b/core/libraries/fof/config/domain/views.php
new file mode 100644
index 00000000..1c18b62e
--- /dev/null
+++ b/core/libraries/fof/config/domain/views.php
@@ -0,0 +1,302 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  config
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * Configuration parser for the view-specific settings
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFConfigDomainViews implements FOFConfigDomainInterface
+{
+	/**
+	 * Parse the XML data, adding them to the $ret array
+	 *
+	 * @param   SimpleXMLElement  $xml   The XML data of the component's configuration area
+	 * @param   array             &$ret  The parsed data, in the form of a hash array
+	 *
+	 * @return  void
+	 */
+	public function parseDomain(SimpleXMLElement $xml, array &$ret)
+	{
+		// Initialise
+		$ret['views'] = array();
+
+		// Parse view configuration
+		$viewData = $xml->xpath('view');
+
+		// Sanity check
+
+		if (empty($viewData))
+		{
+			return;
+		}
+
+		foreach ($viewData as $aView)
+		{
+			$key = (string) $aView['name'];
+
+			// Parse ACL options
+			$ret['views'][$key]['acl'] = array();
+			$aclData = $aView->xpath('acl/task');
+
+			if (!empty($aclData))
+			{
+				foreach ($aclData as $acl)
+				{
+					$k = (string) $acl['name'];
+					$ret['views'][$key]['acl'][$k] = (string) $acl;
+				}
+			}
+
+			// Parse taskmap
+			$ret['views'][$key]['taskmap'] = array();
+			$taskmapData = $aView->xpath('taskmap/task');
+
+			if (!empty($taskmapData))
+			{
+				foreach ($taskmapData as $map)
+				{
+					$k = (string) $map['name'];
+					$ret['views'][$key]['taskmap'][$k] = (string) $map;
+				}
+			}
+
+			// Parse controller configuration
+			$ret['views'][$key]['config'] = array();
+			$optionData = $aView->xpath('config/option');
+
+			if (!empty($optionData))
+			{
+				foreach ($optionData as $option)
+				{
+					$k = (string) $option['name'];
+					$ret['views'][$key]['config'][$k] = (string) $option;
+				}
+			}
+
+			// Parse the toolbar
+			$ret['views'][$key]['toolbar'] = array();
+			$toolBars = $aView->xpath('toolbar');
+
+			if (!empty($toolBars))
+			{
+				foreach ($toolBars as $toolBar)
+				{
+					$taskName = isset($toolBar['task']) ? (string) $toolBar['task'] : '*';
+
+					// If a toolbar title is specified, create a title element.
+					if (isset($toolBar['title']))
+					{
+						$ret['views'][$key]['toolbar'][$taskName]['title'] = array(
+							'value' => (string) $toolBar['title']
+						);
+					}
+
+					// Parse the toolbar buttons data
+					$toolbarData = $toolBar->xpath('button');
+
+					if (!empty($toolbarData))
+					{
+						foreach ($toolbarData as $button)
+						{
+							$k = (string) $button['type'];
+							$ret['views'][$key]['toolbar'][$taskName][$k] = current($button->attributes());
+							$ret['views'][$key]['toolbar'][$taskName][$k]['value'] = (string) $button;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Return a configuration variable
+	 *
+	 * @param   string  &$configuration  Configuration variables (hashed array)
+	 * @param   string  $var             The variable we want to fetch
+	 * @param   mixed   $default         Default value
+	 *
+	 * @return  mixed  The variable's value
+	 */
+	public function get(&$configuration, $var, $default)
+	{
+		$parts = explode('.', $var);
+
+		$view = $parts[0];
+		$method = 'get' . ucfirst($parts[1]);
+
+		if (!method_exists($this, $method))
+		{
+			return $default;
+		}
+
+		array_shift($parts);
+		array_shift($parts);
+
+		$ret = $this->$method($view, $configuration, $parts, $default);
+
+		return $ret;
+	}
+
+	/**
+	 * Internal function to return the task map for a view
+	 *
+	 * @param   string  $view            The view for which we will be fetching a task map
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options (not used)
+	 * @param   array   $default         ßDefault task map; empty array if not provided
+	 *
+	 * @return  array  The task map as a hash array in the format task => method
+	 */
+	protected function getTaskmap($view, &$configuration, $params, $default = array())
+	{
+		$taskmap = array();
+
+		if (isset($configuration['views']['*']) && isset($configuration['views']['*']['taskmap']))
+		{
+			$taskmap = $configuration['views']['*']['taskmap'];
+		}
+
+		if (isset($configuration['views'][$view]) && isset($configuration['views'][$view]['taskmap']))
+		{
+			$taskmap = array_merge($taskmap, $configuration['views'][$view]['taskmap']);
+		}
+
+		if (empty($taskmap))
+		{
+			return $default;
+		}
+
+		return $taskmap;
+	}
+
+	/**
+	 * Internal method to return the ACL mapping (privilege required to access
+	 * a specific task) for the given view's tasks
+	 *
+	 * @param   string  $view            The view for which we will be fetching a task map
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options; key 0 defines the task we want to fetch
+	 * @param   string  $default         Default ACL option; empty (no ACL check) if not defined
+	 *
+	 * @return  string  The privilege required to access this view
+	 */
+	protected function getAcl($view, &$configuration, $params, $default = '')
+	{
+		$aclmap = array();
+
+		if (isset($configuration['views']['*']) && isset($configuration['views']['*']['acl']))
+		{
+			$aclmap = $configuration['views']['*']['acl'];
+		}
+
+		if (isset($configuration['views'][$view]) && isset($configuration['views'][$view]['acl']))
+		{
+			$aclmap = array_merge($aclmap, $configuration['views'][$view]['acl']);
+		}
+
+		$acl = $default;
+
+		if (isset($aclmap['*']))
+		{
+			$acl = $aclmap['*'];
+		}
+
+		if (isset($aclmap[$params[0]]))
+		{
+			$acl = $aclmap[$params[0]];
+		}
+
+		return $acl;
+	}
+
+	/**
+	 * Internal method to return the a configuration option for the view. These
+	 * are equivalent to $config array options passed to the Controller
+	 *
+	 * @param   string  $view            The view for which we will be fetching a task map
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options; key 0 defines the option variable we want to fetch
+	 * @param   mixed   $default         Default option; null if not defined
+	 *
+	 * @return  string  The setting for the requested option
+	 */
+	protected function getConfig($view, &$configuration, $params, $default = null)
+	{
+		$ret = $default;
+
+		if (isset($configuration['views']['*'])
+			&& isset($configuration['views']['*']['config'])
+			&& isset($configuration['views']['*']['config'][$params[0]]))
+		{
+			$ret = $configuration['views']['*']['config'][$params[0]];
+		}
+
+		if (isset($configuration['views'][$view])
+			&& isset($configuration['views'][$view]['config'])
+			&& isset($configuration['views'][$view]['config'][$params[0]]))
+		{
+			$ret = $configuration['views'][$view]['config'][$params[0]];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Internal method to return the toolbar infos.
+	 *
+	 * @param   string  $view            The view for which we will be fetching buttons
+	 * @param   array   &$configuration  The configuration parameters hash array
+	 * @param   array   $params          Extra options
+	 * @param   string  $default         Default option
+	 *
+	 * @return  string  The toolbar data for this view
+	 */
+	protected function getToolbar($view, &$configuration, $params, $default = '')
+	{
+		$toolbar = array();
+
+		if (isset($configuration['views']['*'])
+			&& isset($configuration['views']['*']['toolbar'])
+			&& isset($configuration['views']['*']['toolbar']['*']))
+		{
+			$toolbar = $configuration['views']['*']['toolbar']['*'];
+		}
+
+		if (isset($configuration['views']['*'])
+			&& isset($configuration['views']['*']['toolbar'])
+			&& isset($configuration['views']['*']['toolbar'][$params[0]]))
+		{
+			$toolbar = array_merge($toolbar, $configuration['views']['*']['toolbar'][$params[0]]);
+		}
+
+		if (isset($configuration['views'][$view])
+			&& isset($configuration['views'][$view]['toolbar'])
+			&& isset($configuration['views'][$view]['toolbar']['*']))
+		{
+			$toolbar = array_merge($toolbar, $configuration['views'][$view]['toolbar']['*']);
+		}
+
+		if (isset($configuration['views'][$view])
+			&& isset($configuration['views'][$view]['toolbar'])
+			&& isset($configuration['views'][$view]['toolbar'][$params[0]]))
+		{
+			$toolbar = array_merge($toolbar, $configuration['views'][$view]['toolbar'][$params[0]]);
+		}
+
+		if (empty($toolbar))
+		{
+			return $default;
+		}
+
+		return $toolbar;
+	}
+}
diff --git a/core/libraries/fof/config/provider.php b/core/libraries/fof/config/provider.php
new file mode 100644
index 00000000..4b335371
--- /dev/null
+++ b/core/libraries/fof/config/provider.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  config
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ *  @license     GNU General Public License version 2, or later
+ */
+
+defined('FOF_INCLUDED') or die();
+
+/**
+ * Reads and parses the fof.xml file in the back-end of a FOF-powered component,
+ * provisioning the data to the rest of the FOF framework
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFConfigProvider
+{
+	/**
+	 * Cache of FOF components' configuration variables
+	 *
+	 * @var array
+	 */
+	public static $configurations = array();
+
+	/**
+	 * Parses the configuration of the specified component
+	 *
+	 * @param   string   $component  The name of the component, e.g. com_foobar
+	 * @param   boolean  $force      Force reload even if it's already parsed?
+	 *
+	 * @return  void
+	 */
+	public function parseComponent($component, $force = false)
+	{
+		if (!$force && isset(self::$configurations[$component]))
+		{
+			return;
+		}
+
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			$order = array('cli', 'backend');
+		}
+		elseif (FOFPlatform::getInstance()->isBackend())
+		{
+			$order = array('backend');
+		}
+		else
+		{
+			$order = array('frontend');
+		}
+
+		$order[] = 'common';
+
+		$order = array_reverse($order);
+		self::$configurations[$component] = array();
+
+		foreach ($order as $area)
+		{
+			$config = $this->parseComponentArea($component, $area);
+			self::$configurations[$component] = array_merge_recursive(self::$configurations[$component], $config);
+		}
+	}
+
+	/**
+	 * Returns the value of a variable. Variables use a dot notation, e.g.
+	 * view.config.whatever where the first part is the domain, the rest of the
+	 * parts specify the path to the variable.
+	 *
+	 * @param   string  $variable  The variable name
+	 * @param   mixed   $default   The default value, or null if not specified
+	 *
+	 * @return  mixed  The value of the variable
+	 */
+	public function get($variable, $default = null)
+	{
+		static $domains = null;
+
+		if (is_null($domains))
+		{
+			$domains = $this->getDomains();
+		}
+
+		list($component, $domain, $var) = explode('.', $variable, 3);
+
+		if (!isset(self::$configurations[$component]))
+		{
+			$this->parseComponent($component);
+		}
+
+		if (!in_array($domain, $domains))
+		{
+			return $default;
+		}
+
+		$class = 'FOFConfigDomain' . ucfirst($domain);
+		$o = new $class;
+
+		return $o->get(self::$configurations[$component], $var, $default);
+	}
+
+	/**
+	 * Parses the configuration options of a specific component area
+	 *
+	 * @param   string  $component  Which component's cionfiguration to parse
+	 * @param   string  $area       Which area to parse (frontend, backend, cli)
+	 *
+	 * @return  array  A hash array with the configuration data
+	 */
+	protected function parseComponentArea($component, $area)
+	{
+		// Initialise the return array
+		$ret = array();
+
+		// Get the folders of the component
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+        $filesystem     = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		// Check that the path exists
+		$path = $componentPaths['admin'];
+		$path = $filesystem->pathCheck($path);
+
+		if (!$filesystem->folderExists($path))
+		{
+			return $ret;
+		}
+
+		// Read the filename if it exists
+		$filename = $path . '/fof.xml';
+
+		if (!$filesystem->fileExists($filename))
+		{
+			return $ret;
+		}
+
+		$data = file_get_contents($filename);
+
+		// Load the XML data in a SimpleXMLElement object
+		$xml = simplexml_load_string($data);
+
+		if (!($xml instanceof SimpleXMLElement))
+		{
+			return $ret;
+		}
+
+		// Get this area's data
+		$areaData = $xml->xpath('//' . $area);
+
+		if (empty($areaData))
+		{
+			return $ret;
+		}
+
+		$xml = array_shift($areaData);
+
+		// Parse individual configuration domains
+		$domains = $this->getDomains();
+
+		foreach ($domains as $dom)
+		{
+			$class = 'FOFConfigDomain' . ucfirst($dom);
+
+			if (class_exists($class, true))
+			{
+				$o = new $class;
+				$o->parseDomain($xml, $ret);
+			}
+		}
+
+		// Finally, return the result
+		return $ret;
+	}
+
+	/**
+	 * Gets a list of the available configuration domain adapters
+	 *
+	 * @return  array  A list of the available domains
+	 */
+	protected function getDomains()
+	{
+		static $domains = array();
+
+		if (empty($domains))
+		{
+			$filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+			$files = $filesystem->folderFiles(__DIR__ . '/domain', '.php');
+
+			if (!empty($files))
+			{
+				foreach ($files as $file)
+				{
+					$domain = basename($file, '.php');
+
+					if ($domain == 'interface')
+					{
+						continue;
+					}
+
+					$domain = preg_replace('/[^A-Za-z0-9]/', '', $domain);
+					$domains[] = $domain;
+				}
+
+				$domains = array_unique($domains);
+			}
+		}
+
+		return $domains;
+	}
+}
diff --git a/core/libraries/fof/controller/controller.php b/core/libraries/fof/controller/controller.php
new file mode 100644
index 00000000..d972f077
--- /dev/null
+++ b/core/libraries/fof/controller/controller.php
@@ -0,0 +1,3413 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage controller
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework controller class. FOF is based on the thin controller
+ * paradigm, where the controller is mainly used to set up the model state and
+ * spawn the view.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFController extends FOFUtilsObject
+{
+	/**
+	 * @var int Bit mask to enable Routing on redirects.
+	 * 0 = never
+	 * 1 = frontend only
+	 * 2 = backend  only
+	 * 3 = always
+	 */
+	protected $autoRouting = 0;
+
+	/**
+	 * The current component's name without the com_ prefix
+	 *
+	 * @var    string
+	 */
+	protected $bareComponent = 'foobar';
+
+	/**
+	 * The base path of the controller
+	 *
+	 * @var    string
+	 */
+	protected $basePath;
+
+	/**
+	 * The tasks for which caching should be enabled by default
+	 *
+	 * @var array
+	 */
+	protected $cacheableTasks = array('browse', 'read');
+
+	/**
+	 * The current component's name; you can override it in the configuration
+	 *
+	 * @var    string
+	 */
+	protected $component = 'com_foobar';
+
+	/**
+	 * A cached copy of the class configuration parameter passed during initialisation
+	 *
+	 * @var    array
+	 */
+	protected $config = array();
+
+	/**
+	 * An instance of FOFConfigProvider to provision configuration overrides
+	 *
+	 * @var    FOFConfigProvider
+	 */
+	protected $configProvider = null;
+
+	/**
+	 * Set to true to enable CSRF protection on selected tasks. The possible
+	 * values are:
+	 * 0	Disabled; no token checks are performed
+	 * 1	Enabled; token checks are always performed
+	 * 2	Only on HTML requests and backend; token checks are always performed in the back-end and in the front-end only when format is 'html'
+	 * 3	Only on back-end; token checks are performer only in the back-end
+	 *
+	 * @var    integer
+	 */
+	protected $csrfProtection = 2;
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 */
+	protected $default_view;
+
+	/**
+	 * The mapped task that was performed.
+	 *
+	 * @var    string
+	 */
+	protected $doTask;
+
+	/**
+	 * The input object for this MVC triad; you can override it in the configuration
+	 *
+	 * @var    FOFInput
+	 */
+	protected $input = array();
+
+	/**
+	 * Redirect message.
+	 *
+	 * @var    string
+	 */
+	protected $message;
+
+	/**
+	 * Redirect message type.
+	 *
+	 * @var    string
+	 */
+	protected $messageType;
+
+	/**
+	 * The current layout; you can override it in the configuration
+	 *
+	 * @var    string
+	 */
+	protected $layout = null;
+
+	/**
+	 * Array of class methods
+	 *
+	 * @var    array
+	 */
+	protected $methods;
+
+	/**
+	 * The prefix of the models
+	 *
+	 * @var    string
+	 */
+	protected $model_prefix;
+
+	/**
+	 * Overrides the name of the view's default model
+	 *
+	 * @var    string
+	 */
+	protected $modelName = null;
+
+	/**
+	 * The set of search directories for resources (views).
+	 *
+	 * @var    array
+	 */
+	protected $paths;
+
+	/**
+	 * URL for redirection.
+	 *
+	 * @var    string
+	 */
+	protected $redirect;
+
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 */
+	protected $task;
+
+	/**
+	 * Array of class methods to call for a given task.
+	 *
+	 * @var    array
+	 */
+	protected $taskMap;
+
+	/**
+	 * The name of the controller
+	 *
+	 * @var    array
+	 */
+	protected $name;
+
+	/**
+	 * The current view name; you can override it in the configuration
+	 *
+	 * @var    string
+	 */
+	protected $view = '';
+
+	/**
+	 * Overrides the name of the view's default view
+	 *
+	 * @var    string
+	 */
+	protected $viewName = null;
+
+	/**
+	 * A copy of the FOFView object used in this triad
+	 *
+	 * @var    FOFView
+	 */
+	private $_viewObject = null;
+
+	/**
+	 * A cache for the view item objects created in this controller
+	 *
+	 * @var   array
+	 */
+	protected $viewsCache = array();
+
+	/**
+	 * A copy of the FOFModel object used in this triad
+	 *
+	 * @var    FOFModel
+	 */
+	private $_modelObject = null;
+
+	/**
+	 * Does this tried have a FOFForm which will be used to render it?
+	 *
+	 * @var    boolean
+	 */
+	protected $hasForm = false;
+
+	/**
+	 * Gets a static (Singleton) instance of a controller class. It loads the
+	 * relevant controller file from the component's directory or, if it doesn't
+	 * exist, creates a new controller object out of thin air.
+	 *
+	 * @param   string  $option  Component name, e.g. com_foobar
+	 * @param   string  $view    The view name, also used for the controller name
+	 * @param   array   $config  Configuration parameters
+	 *
+	 * @return  FOFController
+	 */
+	public static function &getAnInstance($option = null, $view = null, $config = array())
+	{
+		static $instances = array();
+
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$hash = $option . $view;
+
+		if (!array_key_exists($hash, $instances))
+		{
+			$instances[$hash] = self::getTmpInstance($option, $view, $config);
+		}
+
+		return $instances[$hash];
+	}
+
+	/**
+	 * Gets a temporary instance of a controller object. A temporary instance is
+	 * not a Singleton and can be disposed off after use.
+	 *
+	 * @param   string  $option  The component name, e.g. com_foobar
+	 * @param   string  $view    The view name, e.g. cpanel
+	 * @param   array   $config  Configuration parameters
+	 *
+	 * @return  \FOFController  A disposable class instance
+	 */
+	public static function &getTmpInstance($option = null, $view = null, $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		// Get an input object
+		if (array_key_exists('input', $config))
+		{
+			$input = $config['input'];
+		}
+		else
+		{
+			$input = null;
+		}
+
+		if (array_key_exists('input_options', $config))
+		{
+			$input_options = $config['input_options'];
+		}
+		else
+		{
+			$input_options = array();
+		}
+
+		if (!($input instanceof FOFInput))
+		{
+			$input = new FOFInput($input, $input_options);
+		}
+
+		// Determine the option (component name) and view
+		$config['option'] = !is_null($option) ? $option : $input->getCmd('option', 'com_foobar');
+		$config['view'] = !is_null($view) ? $view : $input->getCmd('view', 'cpanel');
+
+		// Get the class base name, e.g. FoobarController
+		$classBaseName = ucfirst(str_replace('com_', '', $config['option'])) . 'Controller';
+
+		// Get the class name suffixes, in the order to be searched for: plural, singular, 'default'
+		$classSuffixes = array(
+			FOFInflector::pluralize($config['view']),
+			FOFInflector::singularize($config['view']),
+			'default'
+		);
+
+		// Get the path names for the component
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($config['option']);
+        $filesystem     = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		// Look for the best classname match
+		foreach ($classSuffixes as $suffix)
+		{
+			$className = $classBaseName . ucfirst($suffix);
+
+			if (class_exists($className))
+			{
+				// The class is already loaded. We have a match!
+				break;
+			}
+
+			// The class is not already loaded. Try to find and load it.
+			$searchPaths = array(
+				$componentPaths['main'] . '/controllers',
+				$componentPaths['admin'] . '/controllers'
+			);
+
+			// If we have a searchpath in the configuration please search it first
+
+			if (array_key_exists('searchpath', $config))
+			{
+				array_unshift($searchPaths, $config['searchpath']);
+			}
+			else
+			{
+				$configProvider = new FOFConfigProvider;
+				$searchPath = $configProvider->get($config['option'] . '.views.' . FOFInflector::singularize($config['view']) . '.config.searchpath', null);
+
+				if ($searchPath)
+				{
+					array_unshift($searchPaths, $componentPaths['admin'] . '/' . $searchPath);
+					array_unshift($searchPaths, $componentPaths['main'] . '/' . $searchPath);
+				}
+			}
+
+			/**
+			 * Try to find the path to this file. First try to find the
+			 * format-specific controller file, e.g. foobar.json.php for
+			 * format=json, then the regular one-size-fits-all controller
+			 */
+
+			$format = $input->getCmd('format', 'html');
+			$path = null;
+
+			if (!empty($format))
+			{
+				$path = $filesystem->pathFind(
+					$searchPaths, strtolower($suffix) . '.' . strtolower($format) . '.php'
+				);
+			}
+
+			if (!$path)
+			{
+				$path = $filesystem->pathFind(
+						$searchPaths, strtolower($suffix) . '.php'
+				);
+			}
+
+			// The path is found. Load the file and make sure the expected class name exists.
+
+			if ($path)
+			{
+				require_once $path;
+
+				if (class_exists($className))
+				{
+					// The class was loaded successfully. We have a match!
+					break;
+				}
+			}
+		}
+
+		if (!class_exists($className))
+		{
+			// If no specialised class is found, instantiate the generic FOFController
+			$className = 'FOFController';
+		}
+
+		$instance = new $className($config);
+
+		return $instance;
+	}
+
+	/**
+	 * Public constructor of the Controller class
+	 *
+	 * @param   array  $config  Optional configuration parameters
+	 */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$this->methods = array();
+		$this->message = null;
+		$this->messageType = 'message';
+		$this->paths = array();
+		$this->redirect = null;
+		$this->taskMap = array();
+
+		// Cache the config
+		$this->config = $config;
+
+		// Get the input for this MVC triad
+
+		if (array_key_exists('input', $config))
+		{
+			$input = $config['input'];
+		}
+		else
+		{
+			$input = null;
+		}
+
+		if (array_key_exists('input_options', $config))
+		{
+			$input_options = $config['input_options'];
+		}
+		else
+		{
+			$input_options = array();
+		}
+
+		if ($input instanceof FOFInput)
+		{
+			$this->input = $input;
+		}
+		else
+		{
+			$this->input = new FOFInput($input, $input_options);
+		}
+
+		// Load the configuration provider
+		$this->configProvider = new FOFConfigProvider;
+
+		// Determine the methods to exclude from the base class.
+		$xMethods = get_class_methods('FOFController');
+
+		// Some methods must always be considered valid tasks
+		$iMethods = array('accesspublic', 'accessregistered', 'accessspecial',
+			'add', 'apply', 'browse', 'cancel', 'copy', 'edit', 'orderdown',
+			'orderup', 'publish', 'read', 'remove', 'save', 'savenew',
+			'saveorder', 'unpublish', 'display', 'archive', 'trash', 'loadhistory');
+
+		// Get the public methods in this class using reflection.
+		$r = new ReflectionClass($this);
+		$rMethods = $r->getMethods(ReflectionMethod::IS_PUBLIC);
+
+		foreach ($rMethods as $rMethod)
+		{
+			$mName = $rMethod->getName();
+
+			// If the developer screwed up and declared one of the helper method public do NOT make them available as
+			// tasks.
+			if ((substr($mName, 0, 8) == 'onBefore') || (substr($mName, 0, 7) == 'onAfter') || substr($mName, 0, 1) == '_')
+			{
+				continue;
+			}
+
+			// Add default display method if not explicitly declared.
+			if (!in_array($mName, $xMethods) || in_array($mName, $iMethods))
+			{
+				$this->methods[] = strtolower($mName);
+
+				// Auto register the methods as tasks.
+				$this->taskMap[strtolower($mName)] = $mName;
+			}
+		}
+
+		// Get the default values for the component and view names
+		$classNameParts = FOFInflector::explode(get_class($this));
+
+		if (count($classNameParts) == 3)
+		{
+			$defComponent = "com_" . $classNameParts[0];
+			$defView = $classNameParts[2];
+		}
+		else
+		{
+			$defComponent = 'com_foobar';
+			$defView = 'cpanel';
+		}
+
+		$this->component = $this->input->get('option', $defComponent, 'cmd');
+		$this->view = $this->input->get('view', $defView, 'cmd');
+		$this->layout = $this->input->get('layout', null, 'cmd');
+
+		// Overrides from the config
+		if (array_key_exists('option', $config))
+		{
+			$this->component = $config['option'];
+		}
+
+		if (array_key_exists('view', $config))
+		{
+			$this->view = $config['view'];
+		}
+
+		if (array_key_exists('layout', $config))
+		{
+			$this->layout = $config['layout'];
+		}
+
+		$this->layout = $this->configProvider->get($this->component . '.views.' . FOFInflector::singularize($this->view) . '.config.layout', $this->layout);
+
+		$this->input->set('option', $this->component);
+
+		// Set the bareComponent variable
+		$this->bareComponent = str_replace('com_', '', strtolower($this->component));
+
+		// Set the $name variable
+		$this->name = $this->bareComponent;
+
+		// Set the basePath variable
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($this->component);
+		$basePath = $componentPaths['main'];
+
+		if (array_key_exists('base_path', $config))
+		{
+			$basePath = $config['base_path'];
+		}
+
+		$altBasePath = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.config.base_path', null
+		);
+
+		if (!is_null($altBasePath))
+		{
+            $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+			$basePath     = $platformDirs['public'] . '/' . $altBasePath;
+		}
+
+		$this->basePath = $basePath;
+
+		// If the default task is set, register it as such
+		$defaultTask = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.config.default_task', 'display'
+		);
+
+		if (array_key_exists('default_task', $config))
+		{
+			$this->registerDefaultTask($config['default_task']);
+		}
+		else
+		{
+			$this->registerDefaultTask($defaultTask);
+		}
+
+		// Set the models prefix
+
+		if (empty($this->model_prefix))
+		{
+			if (array_key_exists('model_prefix', $config))
+			{
+				// User-defined prefix
+				$this->model_prefix = $config['model_prefix'];
+			}
+			else
+			{
+				$this->model_prefix = $this->name . 'Model';
+				$this->model_prefix = $this->configProvider->get(
+					$this->component . '.views.' .
+					FOFInflector::singularize($this->view) . '.config.model_prefix', $this->model_prefix
+				);
+			}
+		}
+
+		// Set the default model search path
+
+		if (array_key_exists('model_path', $config))
+		{
+			// User-defined dirs
+			$this->addModelPath($config['model_path'], $this->model_prefix);
+		}
+		else
+		{
+			$modelPath = $this->basePath . '/models';
+			$altModelPath = $this->configProvider->get(
+				$this->component . '.views.' .
+				FOFInflector::singularize($this->view) . '.config.model_path', null
+			);
+
+			if (!is_null($altModelPath))
+			{
+				$modelPath = $this->basePath . '/' . $altModelPath;
+			}
+
+			$this->addModelPath($modelPath, $this->model_prefix);
+		}
+
+		// Set the default view search path
+		if (array_key_exists('view_path', $config))
+		{
+			// User-defined dirs
+			$this->setPath('view', $config['view_path']);
+		}
+		else
+		{
+			$viewPath = $this->basePath . '/views';
+			$altViewPath = $this->configProvider->get(
+				$this->component . '.views.' .
+				FOFInflector::singularize($this->view) . '.config.view_path', null
+			);
+
+			if (!is_null($altViewPath))
+			{
+				$viewPath = $this->basePath . '/' . $altViewPath;
+			}
+
+			$this->setPath('view', $viewPath);
+		}
+
+		// Set the default view.
+
+		if (array_key_exists('default_view', $config))
+		{
+			$this->default_view = $config['default_view'];
+		}
+		else
+		{
+			if (empty($this->default_view))
+			{
+				$this->default_view = $this->getName();
+			}
+
+			$this->default_view = $this->configProvider->get(
+				$this->component . '.views.' .
+				FOFInflector::singularize($this->view) . '.config.default_view', $this->default_view
+			);
+		}
+
+		// Set the CSRF protection
+		if (array_key_exists('csrf_protection', $config))
+		{
+			$this->csrfProtection = $config['csrf_protection'];
+		}
+
+		$this->csrfProtection = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.config.csrf_protection', $this->csrfProtection
+		);
+
+		// Set any model/view name overrides
+		if (array_key_exists('viewName', $config))
+		{
+			$this->setThisViewName($config['viewName']);
+		}
+		else
+		{
+			$overrideViewName = $this->configProvider->get(
+				$this->component . '.views.' .
+				FOFInflector::singularize($this->view) . '.config.viewName', null
+			);
+
+			if ($overrideViewName)
+			{
+				$this->setThisViewName($overrideViewName);
+			}
+		}
+
+		if (array_key_exists('modelName', $config))
+		{
+			$this->setThisModelName($config['modelName']);
+		}
+		else
+		{
+			$overrideModelName = $this->configProvider->get(
+				$this->component . '.views.' .
+				FOFInflector::singularize($this->view) . '.config.modelName', null
+			);
+
+			if ($overrideModelName)
+			{
+				$this->setThisModelName($overrideModelName);
+			}
+		}
+
+		// Caching
+		if (array_key_exists('cacheableTasks', $config))
+		{
+			if (is_array($config['cacheableTasks']))
+			{
+				$this->cacheableTasks = $config['cacheableTasks'];
+			}
+		}
+		else
+		{
+			$cacheableTasks = $this->configProvider->get(
+				$this->component . '.views.' .
+				FOFInflector::singularize($this->view) . '.config.cacheableTasks', null
+			);
+
+			if ($cacheableTasks)
+			{
+				$cacheableTasks = explode(',', $cacheableTasks);
+
+				if (count($cacheableTasks))
+				{
+					$temp = array();
+
+					foreach ($cacheableTasks as $t)
+					{
+						$temp[] = trim($t);
+					}
+
+					$temp = array_unique($temp);
+					$this->cacheableTasks = $temp;
+				}
+			}
+		}
+
+		// Bit mask for auto routing on setRedirect
+		$this->autoRouting = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.config.autoRouting', $this->autoRouting
+		);
+
+		if (array_key_exists('autoRouting', $config))
+		{
+			$this->autoRouting = $config['autoRouting'];
+		}
+
+		// Apply task map
+		$taskmap = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.taskmap'
+		);
+
+		if (is_array($taskmap) && !empty($taskmap))
+		{
+			foreach ($taskmap as $aliasedtask => $realmethod)
+			{
+				$this->registerTask($aliasedtask, $realmethod);
+			}
+		}
+	}
+
+	/**
+	 * Adds to the stack of model paths in LIFO order.
+	 *
+	 * @param   mixed   $path    The directory (string) , or list of directories (array) to add.
+	 * @param   string  $prefix  A prefix for models
+	 *
+	 * @return  void
+	 */
+	public static function addModelPath($path, $prefix = '')
+	{
+		FOFModel::addIncludePath($path, $prefix);
+	}
+
+	/**
+	 * Adds to the search path for templates and resources.
+	 *
+	 * @param   string  $type  The path type (e.g. 'model', 'view').
+	 * @param   mixed   $path  The directory string  or stream array to search.
+	 *
+	 * @return  FOFController  A FOFController object to support chaining.
+	 */
+	protected function addPath($type, $path)
+	{
+		// Just force path to array
+		settype($path, 'array');
+
+        $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		if (!isset($this->paths[$type]))
+		{
+			$this->paths[$type] = array();
+		}
+
+		// Loop through the path directories
+		foreach ($path as $dir)
+		{
+			// No surrounding spaces allowed!
+			$dir = rtrim($filesystem->pathCheck($dir, '/'), '/') . '/';
+
+			// Add to the top of the search dirs
+			array_unshift($this->paths[$type], $dir);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add one or more view paths to the controller's stack, in LIFO order.
+	 *
+	 * @param   mixed  $path  The directory (string) or list of directories (array) to add.
+	 *
+	 * @return  FOFController  This object to support chaining.
+	 */
+	public function addViewPath($path)
+	{
+		$this->addPath('view', $path);
+
+		return $this;
+	}
+
+	/**
+	 * Authorisation check
+	 *
+	 * @param   string  $task  The ACO Section Value to check access on.
+	 *
+	 * @return  boolean  True if authorised
+	 *
+	 * @deprecated  2.0  Use JAccess instead.
+	 */
+	public function authorise($task)
+	{
+		FOFPlatform::getInstance()->logDeprecated(__CLASS__ . '::' .__METHOD__ . ' is deprecated. Use checkACL() instead.');
+
+		return true;
+	}
+
+	/**
+	 * Create the filename for a resource.
+	 *
+	 * @param   string  $type   The resource type to create the filename for.
+	 * @param   array   $parts  An associative array of filename information. Optional.
+	 *
+	 * @return  string  The filename.
+	 */
+	protected static function createFileName($type, $parts = array())
+	{
+		$filename = '';
+
+		switch ($type)
+		{
+			case 'controller':
+				if (!empty($parts['format']))
+				{
+					if ($parts['format'] == 'html')
+					{
+						$parts['format'] = '';
+					}
+					else
+					{
+						$parts['format'] = '.' . $parts['format'];
+					}
+				}
+				else
+				{
+					$parts['format'] = '';
+				}
+
+				$filename = strtolower($parts['name'] . $parts['format'] . '.php');
+				break;
+
+			case 'view':
+				if (!empty($parts['type']))
+				{
+					$parts['type'] = '.' . $parts['type'];
+				}
+				else
+				{
+					$parts['type'] = '';
+				}
+
+				$filename = strtolower($parts['name'] . '/view' . $parts['type'] . '.php');
+				break;
+		}
+
+		return $filename;
+	}
+
+    /**
+     * Executes a given controller task. The onBefore<task> and onAfter<task>
+     * methods are called automatically if they exist.
+     *
+     * @param   string $task The task to execute, e.g. "browse"
+     *
+     * @throws  Exception   Exception thrown if the onBefore<task> returns false
+     *
+     * @return  null|bool  False on execution failure
+     */
+	public function execute($task)
+	{
+		$this->task = $task;
+
+		$method_name = 'onBefore' . ucfirst($task);
+
+		if (!method_exists($this, $method_name))
+		{
+			$result = $this->onBeforeGenericTask($task);
+		}
+		elseif (method_exists($this, $method_name))
+		{
+			$result = $this->$method_name();
+		}
+		else
+		{
+			$result = true;
+		}
+
+		if ($result)
+		{
+			$plugin_event  = FOFInflector::camelize('on before ' . $this->bareComponent . ' controller ' . $this->view . ' ' . $task);
+			$plugin_result = FOFPlatform::getInstance()->runPlugins($plugin_event, array(&$this, &$this->input));
+
+			if (in_array(false, $plugin_result, true))
+			{
+				$result = false;
+			}
+		}
+
+		if (!$result)
+		{
+			throw new Exception(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		// Do not allow the display task to be directly called
+		$task = strtolower($task);
+
+		if (isset($this->taskMap[$task]))
+		{
+			$doTask = $this->taskMap[$task];
+		}
+		elseif (isset($this->taskMap['__default']))
+		{
+			$doTask = $this->taskMap['__default'];
+		}
+		else
+		{
+			$doTask = null;
+		}
+
+		if ($doTask == 'display')
+		{
+            FOFPlatform::getInstance()->setHeader('Status', '400 Bad Request', true);
+
+			throw new Exception('Bad Request', 400);
+		}
+
+		$this->doTask = $doTask;
+
+		$ret = $this->$doTask();
+
+		$method_name = 'onAfter' . ucfirst($task);
+
+		if (method_exists($this, $method_name))
+		{
+			$result = $this->$method_name();
+		}
+		else
+		{
+			$result = true;
+		}
+
+		if ($result)
+		{
+			$plugin_event = FOFInflector::camelize('on after ' . $this->bareComponent . ' controller ' . $this->view . ' ' . $task);
+			$plugin_result = FOFPlatform::getInstance()->runPlugins($plugin_event, array(&$this, &$this->input, &$ret));
+
+			if (in_array(false, $plugin_result, true))
+			{
+				$result = false;
+			}
+		}
+
+		if (!$result)
+		{
+			throw new Exception(JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Default task. Assigns a model to the view and asks the view to render
+	 * itself.
+	 *
+	 * YOU MUST NOT USETHIS TASK DIRECTLY IN A URL. It is supposed to be
+	 * used ONLY inside your code. In the URL, use task=browse instead.
+	 *
+	 * @param   bool    $cachable   Is this view cacheable?
+	 * @param   bool    $urlparams  Add your safe URL parameters (see further down in the code)
+	 * @param   string  $tpl        The name of the template file to parse
+	 *
+	 * @return  bool
+	 */
+	public function display($cachable = false, $urlparams = false, $tpl = null)
+	{
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			$viewType = $document->getType();
+		}
+		else
+		{
+			$viewType = $this->input->getCmd('format', 'html');
+		}
+
+		$view = $this->getThisView();
+
+		// Get/Create the model
+
+		if ($model = $this->getThisModel())
+		{
+			// Push the model into the view (as default)
+			$view->setModel($model, true);
+		}
+
+		// Set the layout
+		$view->setLayout(is_null($this->layout) ? 'default' : $this->layout);
+
+		// Display the view
+		$conf = FOFPlatform::getInstance()->getConfig();
+
+		if (FOFPlatform::getInstance()->isFrontend() && $cachable && ($viewType != 'feed') && $conf->get('caching') >= 1)
+		{
+			// Get a JCache object
+			$option = $this->input->get('option', 'com_foobar', 'cmd');
+			$cache = JFactory::getCache($option, 'view');
+
+			// Set up a cache ID based on component, view, task and user group assignment
+			$user = FOFPlatform::getInstance()->getUser();
+
+			if ($user->guest)
+			{
+				$groups = array();
+			}
+			else
+			{
+				$groups = $user->groups;
+			}
+
+			$importantParameters = array();
+
+			// Set up safe URL parameters
+			if (!is_array($urlparams))
+			{
+				$urlparams = array(
+					'option'		=> 'CMD',
+					'view'			=> 'CMD',
+					'task'			=> 'CMD',
+					'format'		=> 'CMD',
+					'layout'		=> 'CMD',
+					'id'			=> 'INT',
+				);
+			}
+
+			if (is_array($urlparams))
+			{
+				$app = JFactory::getApplication();
+
+				$registeredurlparams = null;
+
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					if (property_exists($app, 'registeredurlparams'))
+					{
+						$registeredurlparams = $app->registeredurlparams;
+					}
+				}
+				else
+				{
+					$registeredurlparams = $app->get('registeredurlparams');
+				}
+
+				if (empty($registeredurlparams))
+				{
+					$registeredurlparams = new stdClass;
+				}
+
+				foreach ($urlparams AS $key => $value)
+				{
+					// Add your safe url parameters with variable type as value {@see JFilterInput::clean()}.
+					$registeredurlparams->$key = $value;
+
+					// Add the URL-important parameters into the array
+					$importantParameters[$key] = $this->input->get($key, null, $value);
+				}
+
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					$app->registeredurlparams = $registeredurlparams;
+				}
+				else
+				{
+					$app->set('registeredurlparams', $registeredurlparams);
+				}
+			}
+
+			// Create the cache ID after setting the registered URL params, as they are used to generate the ID
+			$cacheId = md5(serialize(array(JCache::makeId(), $view->getName(), $this->doTask, $groups, $importantParameters)));
+
+			// Get the cached view or cache the current view
+			$cache->get($view, 'display', $cacheId);
+		}
+		else
+		{
+			// Display without caching
+			$view->display($tpl);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Implements a default browse task, i.e. read a bunch of records and send
+	 * them to the browser.
+	 *
+	 * @return  boolean
+	 */
+	public function browse()
+	{
+		if ($this->input->get('savestate', -999, 'int') == -999)
+		{
+			$this->input->set('savestate', true);
+		}
+
+		// Do I have a form?
+		$model = $this->getThisModel();
+
+		if (empty($this->layout))
+		{
+			$formname = 'form.default';
+		}
+		else
+		{
+			$formname = 'form.' . $this->layout;
+		}
+
+		$model->setState('form_name', $formname);
+
+		$form = $model->getForm();
+
+		if ($form !== false)
+		{
+			$this->hasForm = true;
+		}
+
+		$this->display(in_array('browse', $this->cacheableTasks));
+
+		return true;
+	}
+
+	/**
+	 * Single record read. The id set in the request is passed to the model and
+	 * then the item layout is used to render the result.
+	 *
+	 * @return  bool
+	 */
+	public function read()
+	{
+		// Load the model
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		// Set the layout to item, if it's not set in the URL
+		if (is_null($this->layout))
+		{
+			$this->layout = 'item';
+		}
+
+		// Do I have a form?
+		$model->setState('form_name', 'form.' . $this->layout);
+
+		$item = $model->getItem();
+
+		if (!($item instanceof FOFTable))
+		{
+			return false;
+		}
+
+		$itemKey = $item->getKeyName();
+
+		if ($item->$itemKey != $model->getId())
+		{
+			return false;
+		}
+
+		$formData = is_object($item) ? $item->getData() : array();
+		$form = $model->getForm($formData);
+
+		if ($form !== false)
+		{
+			$this->hasForm = true;
+		}
+
+		// Display
+		$this->display(in_array('read', $this->cacheableTasks));
+
+		return true;
+	}
+
+	/**
+	 * Single record add. The form layout is used to present a blank page.
+	 *
+	 * @return  false|void
+	 */
+	public function add()
+	{
+		// Load and reset the model
+		$model = $this->getThisModel();
+		$model->reset();
+
+		// Set the layout to form, if it's not set in the URL
+
+		if (!$this->layout)
+		{
+			$this->layout = 'form';
+		}
+
+		// Do I have a form?
+		$model->setState('form_name', 'form.' . $this->layout);
+
+		$item = $model->getItem();
+
+		if (!($item instanceof FOFTable))
+		{
+			return false;
+		}
+
+		$formData = is_object($item) ? $item->getData() : array();
+		$form = $model->getForm($formData);
+
+		if ($form !== false)
+		{
+			$this->hasForm = true;
+		}
+
+		// Display
+		$this->display(in_array('add', $this->cacheableTasks));
+	}
+
+	/**
+	 * Single record edit. The ID set in the request is passed to the model,
+	 * then the form layout is used to edit the result.
+	 *
+	 * @return  bool
+	 */
+	public function edit()
+	{
+		// Load the model
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$status = $model->checkout();
+
+		if (!$status)
+		{
+			// Redirect on error
+
+			if ($customURL = $this->input->get('returnurl', '', 'string'))
+			{
+				$customURL = base64_decode($customURL);
+			}
+
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+			$this->setRedirect($url, $model->getError(), 'error');
+
+			return false;
+		}
+
+		// Set the layout to form, if it's not set in the URL
+
+		if (is_null($this->layout))
+		{
+			$this->layout = 'form';
+		}
+
+		// Do I have a form?
+		$model->setState('form_name', 'form.' . $this->layout);
+
+		$item = $model->getItem();
+
+		if (!($item instanceof FOFTable))
+		{
+			return false;
+		}
+
+		$itemKey = $item->getKeyName();
+
+		if ($item->$itemKey != $model->getId())
+		{
+			return false;
+		}
+
+		$formData = is_object($item) ? $item->getData() : array();
+		$form = $model->getForm($formData);
+
+		if ($form !== false)
+		{
+			$this->hasForm = true;
+		}
+
+		// Display
+		$this->display(in_array('edit', $this->cacheableTasks));
+
+		return true;
+	}
+
+	/**
+	 * Save the incoming data and then return to the Edit task
+	 *
+	 * @return  bool
+	 */
+	public function apply()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+		$result = $this->applySave();
+
+		// Redirect to the edit task
+		if ($result)
+		{
+			$id = $this->input->get('id', 0, 'int');
+			$textkey = strtoupper($this->component) . '_LBL_' . strtoupper($this->view) . '_SAVED';
+
+			if ($customURL = $this->input->get('returnurl', '', 'string'))
+			{
+				$customURL = base64_decode($customURL);
+			}
+
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . $this->view . '&task=edit&id=' . $id . $this->getItemidURLSuffix();
+			$this->setRedirect($url, JText::_($textkey));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Duplicates selected items
+	 *
+	 * @return  bool
+	 */
+	public function copy()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$status = $model->copy();
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+
+		if (!$status)
+		{
+			$this->setRedirect($url, $model->getError(), 'error');
+
+			return false;
+		}
+		else
+		{
+			if(!FOFPlatform::getInstance()->isCli())
+			{
+				FOFPlatform::getInstance()->setHeader('Status', '201 Created', true);
+			}
+
+			$this->setRedirect($url);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Save the incoming data and then return to the Browse task
+	 *
+	 * @return  bool
+	 */
+	public function save()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$result = $this->applySave();
+
+		// Redirect to the display task
+		if ($result)
+		{
+			$textkey = strtoupper($this->component) . '_LBL_' . strtoupper($this->view) . '_SAVED';
+
+			if ($customURL = $this->input->get('returnurl', '', 'string'))
+			{
+				$customURL = base64_decode($customURL);
+			}
+
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+			$this->setRedirect($url, JText::_($textkey));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Save the incoming data and then return to the Add task
+	 *
+	 * @return  bool
+	 */
+	public function savenew()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$result = $this->applySave();
+
+		// Redirect to the display task
+
+		if ($result)
+		{
+			$textkey = strtoupper($this->component) . '_LBL_' . strtoupper($this->view) . '_SAVED';
+
+			if ($customURL = $this->input->get('returnurl', '', 'string'))
+			{
+				$customURL = base64_decode($customURL);
+			}
+
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . $this->view . '&task=add' . $this->getItemidURLSuffix();
+			$this->setRedirect($url, JText::_($textkey));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Cancel the edit, check in the record and return to the Browse task
+	 *
+	 * @return  bool
+	 */
+	public function cancel()
+	{
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$model->checkin();
+
+		// Remove any saved data
+		JFactory::getSession()->set($model->getHash() . 'savedata', null);
+
+		// Redirect to the display task
+
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+		$this->setRedirect($url);
+
+		return true;
+	}
+
+	/**
+	 * Method to load a row from version history
+	 *
+	 * @return   boolean  True if the content history is reverted, false otherwise
+	 *
+	 * @since   2.2
+	 */
+	public function loadhistory()
+	{
+		$app = JFactory::getApplication();
+		$lang  = JFactory::getLanguage();
+		$model = $this->getThisModel();
+		$table = $model->getTable();
+		$historyId = $app->input->get('version_id', null, 'integer');
+		$status = $model->checkout();
+		$alias = $this->component . '.' . $this->view;
+
+		if (!$model->loadhistory($historyId, $table, $alias))
+		{
+			$this->setMessage($model->getError(), 'error');
+
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+			$this->setRedirect($url);
+
+			return false;
+		}
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		$recordId = $table->$key;
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		$urlVar = empty($this->urlVar) ? $key : $this->urlVar;
+
+		// Access check.
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.edit', 'core.edit'
+		);
+
+		if (!$this->checkACL($privilege))
+		{
+			$this->setError(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+			$this->setRedirect($url);
+			$table->checkin();
+
+			return false;
+		}
+
+		$table->store();
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+		$this->setRedirect($url);
+
+		$this->setMessage(JText::sprintf('JLIB_APPLICATION_SUCCESS_LOAD_HISTORY', $model->getState('save_date'), $model->getState('version_note')));
+
+		return true;
+	}
+
+	/**
+	 * Sets the access to public. Joomla! 1.5 compatibility.
+	 *
+	 * @return  bool
+	 *
+	 * @deprecated since 2.0
+	 */
+	public function accesspublic()
+	{
+		// CSRF prevention
+
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setaccess(0);
+	}
+
+	/**
+	 * Sets the access to registered. Joomla! 1.5 compatibility.
+	 *
+	 * @return  bool
+	 *
+	 * @deprecated since 2.0
+	 */
+	public function accessregistered()
+	{
+		// CSRF prevention
+
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setaccess(1);
+	}
+
+	/**
+	 * Sets the access to special. Joomla! 1.5 compatibility.
+	 *
+	 * @return  bool
+	 *
+	 * @deprecated since 2.0
+	 */
+	public function accessspecial()
+	{
+		// CSRF prevention
+
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setaccess(2);
+	}
+
+	/**
+	 * Publish (set enabled = 1) an item.
+	 *
+	 * @return  bool
+	 */
+	public function publish()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setstate(1);
+	}
+
+	/**
+	 * Unpublish (set enabled = 0) an item.
+	 *
+	 * @return  bool
+	 */
+	public function unpublish()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setstate(0);
+	}
+
+	/**
+	 * Archive (set enabled = 2) an item.
+	 *
+	 * @return  bool
+	 */
+	public function archive()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setstate(2);
+	}
+
+	/**
+	 * Trash (set enabled = -2) an item.
+	 *
+	 * @return  bool
+	 */
+	public function trash()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		return $this->setstate(-2);
+	}
+
+	/**
+	 * Saves the order of the items
+	 *
+	 * @return  bool
+	 */
+	public function saveorder()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+        $ordering = $model->getTable()->getColumnAlias('ordering');
+		$ids      = $model->getIds();
+		$orders   = $this->input->get('order', array(), 'array');
+
+		if ($n = count($ids))
+		{
+			for ($i = 0; $i < $n; $i++)
+			{
+				$model->setId($ids[$i]);
+				$neworder = (int) $orders[$i];
+
+				$item = $model->getItem();
+
+				if (!($item instanceof FOFTable))
+				{
+					return false;
+				}
+
+				$key = $item->getKeyName();
+
+				if ($item->$key == $ids[$i])
+				{
+					$item->$ordering = $neworder;
+					$model->save($item);
+				}
+			}
+		}
+
+		$status = $model->reorder();
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+		$this->setRedirect($url);
+
+		return $status;
+	}
+
+	/**
+	 * Moves selected items one position down the ordering list
+	 *
+	 * @return  bool
+	 */
+	public function orderdown()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$status = $model->move(1);
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+
+		if (!$status)
+		{
+			$this->setRedirect($url, $model->getError(), 'error');
+		}
+		else
+		{
+			$this->setRedirect($url);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Moves selected items one position up the ordering list
+	 *
+	 * @return  bool
+	 */
+	public function orderup()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$status = $model->move(-1);
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+
+		if (!$status)
+		{
+			$this->setRedirect($url, $model->getError(), 'error');
+		}
+		else
+		{
+			$this->setRedirect($url);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Delete selected item(s)
+	 *
+	 * @return  bool
+	 */
+	public function remove()
+	{
+		// CSRF prevention
+		if ($this->csrfProtection)
+		{
+			$this->_csrfProtection();
+		}
+
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$status = $model->delete();
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+
+		if (!$status)
+		{
+			$this->setRedirect($url, $model->getError(), 'error');
+		}
+		else
+		{
+			$this->setRedirect($url);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Redirects the browser or returns false if no redirect is set.
+	 *
+	 * @return  boolean  False if no redirect exists.
+	 */
+	public function redirect()
+	{
+		if ($this->redirect)
+		{
+			$app = JFactory::getApplication();
+			$app->enqueueMessage($this->message, $this->messageType);
+			$app->redirect($this->redirect);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns true if there is a redirect set in the controller
+	 *
+	 * @return  boolean
+	 */
+	public function hasRedirect()
+	{
+		return !empty($this->redirect);
+	}
+
+	/**
+	 * Register the default task to perform if a mapping is not found.
+	 *
+	 * @param   string  $method  The name of the method in the derived class to perform if a named task is not found.
+	 *
+	 * @return  FOFController  A FOFController object to support chaining.
+	 */
+	public function registerDefaultTask($method)
+	{
+		$this->registerTask('__default', $method);
+
+		return $this;
+	}
+
+	/**
+	 * Register (map) a task to a method in the class.
+	 *
+	 * @param   string  $task    The task.
+	 * @param   string  $method  The name of the method in the derived class to perform for this task.
+	 *
+	 * @return  FOFController  A FOFController object to support chaining.
+	 */
+	public function registerTask($task, $method)
+	{
+		if (in_array(strtolower($method), $this->methods))
+		{
+			$this->taskMap[strtolower($task)] = $method;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Unregister (unmap) a task in the class.
+	 *
+	 * @param   string  $task  The task.
+	 *
+	 * @return  FOFController  This object to support chaining.
+	 */
+	public function unregisterTask($task)
+	{
+		unset($this->taskMap[strtolower($task)]);
+
+		return $this;
+	}
+
+	/**
+	 * Sets the internal message that is passed with a redirect
+	 *
+	 * @param   string  $text  Message to display on redirect.
+	 * @param   string  $type  Message type. Optional, defaults to 'message'.
+	 *
+	 * @return  string  Previous message
+	 */
+	public function setMessage($text, $type = 'message')
+	{
+		$previous = $this->message;
+		$this->message = $text;
+		$this->messageType = $type;
+
+		return $previous;
+	}
+
+	/**
+	 * Sets an entire array of search paths for resources.
+	 *
+	 * @param   string  $type  The type of path to set, typically 'view' or 'model'.
+	 * @param   string  $path  The new set of search paths. If null or false, resets to the current directory only.
+	 *
+	 * @return  void
+	 */
+	protected function setPath($type, $path)
+	{
+		// Clear out the prior search dirs
+		$this->paths[$type] = array();
+
+		// Actually add the user-specified directories
+		$this->addPath($type, $path);
+	}
+
+	/**
+	 * Registers a redirection with an optional message. The redirection is
+	 * carried out when you use the redirect method.
+	 *
+	 * @param   string  $url   The URL to redirect to
+	 * @param   string  $msg   The message to be pushed to the application
+	 * @param   string  $type  The message type to be pushed to the application, e.g. 'error'
+	 *
+	 * @return  FOFController  This object to support chaining
+	 */
+	public function setRedirect($url, $msg = null, $type = null)
+	{
+		// Do the logic only if we're parsing a raw url (index.php?foo=bar&etc=etc)
+		if (strpos($url, 'index.php') === 0)
+		{
+			$isAdmin = FOFPlatform::getInstance()->isBackend();
+			$auto = false;
+
+			if (($this->autoRouting == 2 || $this->autoRouting == 3) && $isAdmin)
+			{
+				$auto = true;
+			}
+			elseif (($this->autoRouting == 1 || $this->autoRouting == 3) && !$isAdmin)
+			{
+				$auto = true;
+			}
+
+			if ($auto)
+			{
+				$url = JRoute::_($url, false);
+			}
+		}
+
+		$this->redirect = $url;
+
+		if ($msg !== null)
+		{
+			// Controller may have set this directly
+			$this->message = $msg;
+		}
+
+		// Ensure the type is not overwritten by a previous call to setMessage.
+		if (empty($type))
+		{
+			if (empty($this->messageType))
+			{
+				$this->messageType = 'message';
+			}
+		}
+		// If the type is explicitly set, set it.
+		else
+		{
+			$this->messageType = $type;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the published state (the enabled field) of the selected item(s)
+	 *
+	 * @param   integer  $state  The desired state. 0 is unpublished, 1 is published.
+	 *
+	 * @return  bool
+	 */
+	protected function setstate($state = 0)
+	{
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$status = $model->publish($state);
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+
+		if (!$status)
+		{
+			$this->setRedirect($url, $model->getError(), 'error');
+		}
+		else
+		{
+			$this->setRedirect($url);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Sets the access level of the selected item(s).
+	 *
+	 * @param   integer  $level  The desired viewing access level ID
+	 *
+	 * @return  bool
+	 */
+	protected function setaccess($level = 0)
+	{
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$id   = $model->getId();
+		$item = $model->getItem();
+
+		if (!($item instanceof FOFTable))
+		{
+			return false;
+		}
+
+		$accessField = $item->getColumnAlias('access');
+		$key         = $item->getKeyName();
+		$loadedid    = $item->$key;
+
+		if ($id == $loadedid)
+		{
+			$item->$accessField = $level;
+			$status = $model->save($item);
+		}
+		else
+		{
+			$status = false;
+		}
+
+		// Redirect
+		if ($customURL = $this->input->get('returnurl', '', 'string'))
+		{
+			$customURL = base64_decode($customURL);
+		}
+
+		$url = !empty($customURL) ? $customURL : 'index.php?option=' . $this->component . '&view=' . FOFInflector::pluralize($this->view) . $this->getItemidURLSuffix();
+
+		if (!$status)
+		{
+			$this->setRedirect($url, $model->getError(), 'error');
+		}
+		else
+		{
+			$this->setRedirect($url);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Common method to handle apply and save tasks
+	 *
+	 * @return  boolean  Returns true on success
+	 */
+	final private function applySave()
+	{
+		// Load the model
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$id = $model->getId();
+
+		$data = $this->input->getData();
+
+		if (!$this->onBeforeApplySave($data))
+		{
+			return false;
+		}
+
+		// Set the layout to form, if it's not set in the URL
+
+		if (is_null($this->layout))
+		{
+			$this->layout = 'form';
+		}
+
+		// Do I have a form?
+		$model->setState('form_name', 'form.' . $this->layout);
+
+		$status = $model->save($data);
+
+		if ($status && ($id != 0))
+		{
+            FOFPlatform::getInstance()->setHeader('Status', '201 Created', true);
+
+			// Try to check-in the record if it's not a new one
+			$status = $model->checkin();
+		}
+
+		if ($status)
+		{
+			$status = $this->onAfterApplySave();
+		}
+
+		$this->input->set('id', $model->getId());
+
+		if (!$status)
+		{
+			// Redirect on error
+			$id = $model->getId();
+
+			if ($customURL = $this->input->get('returnurl', '', 'string'))
+			{
+				$customURL = base64_decode($customURL);
+			}
+
+			if (!empty($customURL))
+			{
+				$url = $customURL;
+			}
+			elseif ($id != 0)
+			{
+				$url = 'index.php?option=' . $this->component . '&view=' . $this->view . '&task=edit&id=' . $id . $this->getItemidURLSuffix();
+			}
+			else
+			{
+				$url = 'index.php?option=' . $this->component . '&view=' . $this->view . '&task=add' . $this->getItemidURLSuffix();
+			}
+
+			$this->setRedirect($url, '<li>' . implode('</li><li>', $model->getErrors()) . '</li>', 'error');
+
+			return false;
+		}
+		else
+		{
+			$session = JFactory::getSession();
+			$session->set($model->getHash() . 'savedata', null);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Returns the default model associated with the current view
+	 *
+	 * @param   array  $config  Configuration variables for the model
+	 *
+	 * @return  FOFModel  The global instance of the model (singleton)
+	 */
+	final public function getThisModel($config = array())
+	{
+		if (!is_object($this->_modelObject))
+		{
+			// Make sure $config is an array
+			if (is_object($config))
+			{
+				$config = (array) $config;
+			}
+			elseif (!is_array($config))
+			{
+				$config = array();
+			}
+
+			if (!empty($this->modelName))
+			{
+				$parts = FOFInflector::explode($this->modelName);
+				$modelName = ucfirst(array_pop($parts));
+				$prefix = FOFInflector::implode($parts);
+			}
+			else
+			{
+				$prefix = ucfirst($this->bareComponent) . 'Model';
+				$modelName = ucfirst(FOFInflector::pluralize($this->view));
+			}
+
+			if (!array_key_exists('input', $config) || !($config['input'] instanceof FOFInput))
+			{
+				$config['input'] = $this->input;
+			}
+
+			$this->_modelObject = $this->getModel($modelName, $prefix, $config);
+		}
+
+		return $this->_modelObject;
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 */
+	public function getModel($name = '', $prefix = '', $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config) || empty($config))
+		{
+			// array_merge is required to create a copy instead of assigning by reference
+			$config = array_merge($this->config);
+		}
+
+		if (empty($name))
+		{
+			$name = $this->getName();
+		}
+
+		if (empty($prefix))
+		{
+			$prefix = $this->model_prefix;
+		}
+
+		if ($model = $this->createModel($name, $prefix, $config))
+		{
+			// Task is a reserved state
+			$model->setState('task', $this->task);
+
+			// Let's get the application object and set menu information if it's available
+			if (!FOFPlatform::getInstance()->isCli())
+			{
+				$app = JFactory::getApplication();
+				$menu = $app->getMenu();
+
+				if (is_object($menu))
+				{
+					if ($item = $menu->getActive())
+					{
+						$params = $menu->getParams($item->id);
+
+						// Set default state data
+						$model->setState('parameters.menu', $params);
+					}
+				}
+			}
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Returns current view object
+	 *
+	 * @param   array  $config  Configuration variables for the model
+	 *
+	 * @return  FOFView  The global instance of the view object (singleton)
+	 */
+	final public function getThisView($config = array())
+	{
+		if (!is_object($this->_viewObject))
+		{
+			// Make sure $config is an array
+			if (is_object($config))
+			{
+				$config = (array) $config;
+			}
+			elseif (!is_array($config) || empty($config))
+			{
+				// array_merge is required to create a copy instead of assigning by reference
+				$config = array_merge($this->config);
+			}
+
+			$prefix = null;
+			$viewName = null;
+			$viewType = null;
+
+			if (!empty($this->viewName))
+			{
+				$parts = FOFInflector::explode($this->viewName);
+				$viewName = ucfirst(array_pop($parts));
+				$prefix = FOFInflector::implode($parts);
+			}
+			else
+			{
+				$prefix = ucfirst($this->bareComponent) . 'View';
+				$viewName = ucfirst($this->view);
+			}
+
+			$document = FOFPlatform::getInstance()->getDocument();
+
+			if ($document instanceof JDocument)
+			{
+				$viewType = $document->getType();
+			}
+			else
+			{
+				$viewType = $this->input->getCmd('format', 'html');
+			}
+
+			if (($viewType == 'html') && $this->hasForm)
+			{
+				$viewType = 'form';
+			}
+
+			if (!array_key_exists('input', $config) || !($config['input'] instanceof FOFInput))
+			{
+				$config['input'] = $this->input;
+			}
+
+			$config['input']->set('base_path', $this->basePath);
+
+			$this->_viewObject = $this->getView($viewName, $viewType, $prefix, $config);
+		}
+
+		return $this->_viewObject;
+	}
+
+    /**
+     * Method to get the controller name
+     *
+     * The dispatcher name is set by default parsed using the classname, or it can be set
+     * by passing a $config['name'] in the class constructor
+     *
+     * @throws Exception
+     *
+     * @return  string  The name of the dispatcher
+     */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			if (empty($this->bareComponent))
+			{
+				$r = null;
+
+				if (!preg_match('/(.*)Controller/i', get_class($this), $r))
+				{
+					throw new Exception(JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
+				}
+
+				$this->name = strtolower($r[1]);
+			}
+			else
+			{
+				$this->name = $this->bareComponent;
+			}
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Get the last task that is being performed or was most recently performed.
+	 *
+	 * @return  string  The task that is being performed or was most recently performed.
+	 */
+	public function getTask()
+	{
+		return $this->task;
+	}
+
+	/**
+	 * Gets the available tasks in the controller.
+	 *
+	 * @return  array  Array[i] of task names.
+	 */
+	public function getTasks()
+	{
+		return $this->methods;
+	}
+
+    /**
+     * Method to get a reference to the current view and load it if necessary.
+     *
+     * @param   string  $name   The view name. Optional, defaults to the controller name.
+     * @param   string  $type   The view type. Optional.
+     * @param   string  $prefix The class prefix. Optional.
+     * @param   array   $config Configuration array for view. Optional.
+     *
+     * @throws Exception
+     *
+     * @return  FOFView  Reference to the view or an error.
+     */
+	public function getView($name = '', $type = '', $prefix = '', $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		if (empty($name))
+		{
+			$name = $this->getName();
+		}
+
+		if (empty($prefix))
+		{
+			$prefix = $this->getName() . 'View';
+		}
+
+		$signature = md5($name . $type . $prefix . serialize($config));
+
+		if (empty($this->viewsCache[$signature]))
+		{
+			if ($view = $this->createView($name, $prefix, $type, $config))
+			{
+				$this->viewsCache[$signature] = & $view;
+			}
+			else
+			{
+				throw new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_VIEW_NOT_FOUND', $name, $type, $prefix), 500);
+			}
+		}
+
+		return $this->viewsCache[$signature];
+	}
+
+	/**
+	 * Creates a new model object
+	 *
+	 * @param   string  $name    The name of the model class, e.g. Items
+	 * @param   string  $prefix  The prefix of the model class, e.g. FoobarModel
+	 * @param   array   $config  The configuration parameters for the model class
+	 *
+	 * @return  FOFModel  The model object
+	 */
+	protected function createModel($name, $prefix = '', $config = array())
+	{
+		// Make sure $config is an array
+
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$result = null;
+
+		// Clean the model name
+		$modelName = preg_replace('/[^A-Z0-9_]/i', '', $name);
+		$classPrefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
+
+		$result = FOFModel::getAnInstance($modelName, $classPrefix, $config);
+
+		return $result;
+	}
+
+	/**
+	 * Method to load and return a model object.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  Optional model prefix.
+	 * @param   array   $config  Configuration array for the model. Optional.
+	 *
+	 * @return  mixed   Model object on success; otherwise null
+	 */
+	protected function &_createModel($name, $prefix = '', $config = array())
+	{
+		FOFPlatform::getInstance()->logDeprecated(__CLASS__ . '::' .__METHOD__ . ' is deprecated. Use createModel() instead.');
+
+		return $this->createModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Creates a View object instance and returns it
+	 *
+	 * @param   string  $name    The name of the view, e.g. Items
+	 * @param   string  $prefix  The prefix of the view, e.g. FoobarView
+	 * @param   string  $type    The type of the view, usually one of Html, Raw, Json or Csv
+	 * @param   array   $config  The configuration variables to use for creating the view
+	 *
+	 * @return  FOFView
+	 */
+	protected function createView($name, $prefix = '', $type = '', $config = array())
+	{
+		// Make sure $config is an array
+
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$result = null;
+
+		// Clean the view name
+		$viewName = preg_replace('/[^A-Z0-9_]/i', '', $name);
+		$classPrefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
+		$viewType = preg_replace('/[^A-Z0-9_]/i', '', $type);
+
+		if (!isset($config['input']))
+		{
+			$config['input'] = $this->input;
+		}
+
+		if (($config['input'] instanceof FOFInput))
+		{
+			$tmpInput = $config['input'];
+		}
+		else
+		{
+			$tmpInput = new FOFInput($config['input']);
+		}
+
+		// Guess the component name and view
+
+		if (!empty($prefix))
+		{
+			preg_match('/(.*)View$/', $prefix, $m);
+			$component = 'com_' . strtolower($m[1]);
+		}
+		else
+		{
+			$component = '';
+		}
+
+		if (empty($component) && array_key_exists('input', $config))
+		{
+			$component = $tmpInput->get('option', $component, 'cmd');
+		}
+
+		if (array_key_exists('option', $config))
+		{
+			if ($config['option'])
+			{
+				$component = $config['option'];
+			}
+		}
+
+		$config['option'] = $component;
+
+		$view = strtolower($viewName);
+
+		if (empty($view) && array_key_exists('input', $config))
+		{
+			$view = $tmpInput->get('view', $view, 'cmd');
+		}
+
+		if (array_key_exists('view', $config))
+		{
+			if ($config['view'])
+			{
+				$view = $config['view'];
+			}
+		}
+
+		$config['view'] = $view;
+
+		if (array_key_exists('input', $config))
+		{
+			$tmpInput->set('option', $config['option']);
+			$tmpInput->set('view', $config['view']);
+			$config['input'] = $tmpInput;
+		}
+
+		// Get the component directories
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($config['option']);
+
+		// Get the base paths where the view class files are expected to live
+		$basePaths = array(
+			$componentPaths['main'],
+			$componentPaths['alt']
+		);
+		$basePaths = array_merge($this->paths['view']);
+
+		// Get the alternate (singular/plural) view name
+		$altViewName = FOFInflector::isPlural($viewName) ? FOFInflector::singularize($viewName) : FOFInflector::pluralize($viewName);
+
+		$suffixes = array(
+			$viewName,
+			$altViewName,
+			'default'
+		);
+
+        $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		foreach ($suffixes as $suffix)
+		{
+			// Build the view class name
+			$viewClass = $classPrefix . ucfirst($suffix);
+
+			if (class_exists($viewClass))
+			{
+				// The class is already loaded
+				break;
+			}
+
+			// The class is not loaded. Let's load it!
+			$viewPath = $this->createFileName('view', array('name'	 => $suffix, 'type'	 => $viewType));
+			$path = $filesystem->pathFind($basePaths, $viewPath);
+
+			if ($path)
+			{
+				require_once $path;
+			}
+
+			if (class_exists($viewClass))
+			{
+				// The class was loaded successfully
+				break;
+			}
+		}
+
+		if (!class_exists($viewClass))
+		{
+			$viewClass = 'FOFView' . ucfirst($type);
+		}
+
+		$templateOverridePath = FOFPlatform::getInstance()->getTemplateOverridePath($config['option']);
+
+		// Setup View configuration options
+
+		if (!array_key_exists('template_path', $config))
+		{
+			$config['template_path'][] = $componentPaths['main'] . '/views/' . FOFInflector::pluralize($config['view']) . '/tmpl';
+
+			if ($templateOverridePath)
+			{
+				$config['template_path'][] = $templateOverridePath . '/' . FOFInflector::pluralize($config['view']);
+			}
+
+			$config['template_path'][] = $componentPaths['main'] . '/views/' . FOFInflector::singularize($config['view']) . '/tmpl';
+
+			if ($templateOverridePath)
+			{
+				$config['template_path'][] = $templateOverridePath . '/' . FOFInflector::singularize($config['view']);
+			}
+
+			$config['template_path'][] = $componentPaths['main'] . '/views/' . $config['view'] . '/tmpl';
+
+			if ($templateOverridePath)
+			{
+				$config['template_path'][] = $templateOverridePath . '/' . $config['view'];
+			}
+		}
+
+		$extraTemplatePath = $this->configProvider->get($config['option'] . '.views.' . $config['view'] . '.config.template_path', null);
+
+		if ($extraTemplatePath)
+		{
+			array_unshift($config['template_path'], $componentPaths['main'] . '/' . $extraTemplatePath);
+		}
+
+		if (!array_key_exists('helper_path', $config))
+		{
+			$config['helper_path'] = array(
+				$componentPaths['main'] . '/helpers',
+				$componentPaths['admin'] . '/helpers'
+			);
+		}
+
+		$extraHelperPath = $this->configProvider->get($config['option'] . '.views.' . $config['view'] . '.config.helper_path', null);
+
+		if ($extraHelperPath)
+		{
+			$config['helper_path'][] = $componentPaths['main'] . '/' . $extraHelperPath;
+		}
+
+		// Set up the page title
+		$setFrontendPageTitle = $this->configProvider->get($config['option'] . '.views.' . $config['view'] . '.config.setFrontendPageTitle', null);
+
+		if ($setFrontendPageTitle)
+		{
+			$setFrontendPageTitle = strtolower($setFrontendPageTitle);
+			$config['setFrontendPageTitle'][] = in_array($setFrontendPageTitle, array('1', 'yes', 'true', 'on'));
+		}
+
+		$defaultPageTitle = $this->configProvider->get($config['option'] . '.views.' . $config['view'] . '.config.defaultPageTitle', null);
+
+		if ($defaultPageTitle)
+		{
+			$config['defaultPageTitle'][] = in_array($defaultPageTitle, array('1', 'yes', 'true', 'on'));
+		}
+
+		// Set the use_hypermedia flag in $config if it's not already set
+		if (!isset($config['use_hypermedia']))
+		{
+			$config['use_hypermedia'] = $this->configProvider->get($config['option'] . '.views.' . $config['view'] . '.config.use_hypermedia', false);
+		}
+
+		// Set also the linkbar_style
+		if (!isset($config['linkbar_style']))
+		{
+			$style = $this->configProvider->get($config['option'] . '.views.' . $config['view'] . '.config.linkbar_style', false);
+
+			if ($style) {
+				$config['linkbar_style'] = $style;
+			}
+		}
+
+		/**
+		 * Some administrative templates force format=utf (yeah, I know, what the heck, right?) when a format
+		 * URL parameter does not exist in the URL. Of course there is no such thing as FOFViewUtf (why the heck would
+		 * it be, there is no such thing as a format=utf in Joomla! for crying out loud) which causes a Fatal Error. So
+		 * we have to detect that and force $type='html'...
+		 */
+		if (!class_exists($viewClass) && ($type != 'html'))
+		{
+			$type = 'html';
+			$result = $this->createView($name, $prefix, $type, $config);
+		}
+		else
+		{
+			$result = new $viewClass($config);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Deprecated function to create a View object instance
+	 *
+	 * @param   string  $name    The name of the view, e.g. 'Items'
+	 * @param   string  $prefix  The prefix of the view, e.g. 'FoobarView'
+	 * @param   string  $type    The view type, e.g. 'html'
+	 * @param   array   $config  The configuration array for the view
+	 *
+	 * @return  FOFView
+	 *
+	 * @see FOFController::createView
+	 *
+	 * @deprecated since version 2.0
+	 */
+	protected function &_createView($name, $prefix = '', $type = '', $config = array())
+	{
+		FOFPlatform::getInstance()->logDeprecated(__CLASS__ . '::' . __METHOD__ . ' is deprecated. Use createView() instead.');
+
+		return $this->createView($name, $prefix, $type, $config);
+	}
+
+	/**
+	 * Set the name of the view to be used by this Controller
+	 *
+	 * @param   string  $viewName  The name of the view
+	 *
+	 * @return  void
+	 */
+	public function setThisViewName($viewName)
+	{
+		$this->viewName = $viewName;
+	}
+
+	/**
+	 * Set the name of the model to be used by this Controller
+	 *
+	 * @param   string  $modelName  The name of the model
+	 *
+	 * @return  void
+	 */
+	public function setThisModelName($modelName)
+	{
+		$this->modelName = $modelName;
+	}
+
+	/**
+	 * Checks if the current user has enough privileges for the requested ACL
+	 * area.
+	 *
+	 * @param   string  $area  The ACL area, e.g. core.manage.
+	 *
+	 * @return  boolean  True if the user has the ACL privilege specified
+	 */
+	protected function checkACL($area)
+	{
+		if (in_array(strtolower($area), array('false','0','no','403')))
+		{
+			return false;
+		}
+
+		if (in_array(strtolower($area), array('true','1','yes')))
+		{
+			return true;
+		}
+		elseif (empty($area))
+		{
+			return true;
+		}
+		else
+		{
+			// Check if we're dealing with ids
+			$ids = null;
+
+			// First, check if there is an asset for this record
+			$table = $this->getThisModel()->getTable();
+
+			if ($table && $table->isAssetsTracked())
+			{
+				$ids = $this->getThisModel()->getId() ? $this->getThisModel()->getId() : null;
+			}
+
+			// Generic or Asset tracking
+
+			if (empty($ids))
+			{
+				return FOFPlatform::getInstance()->authorise($area, $this->component);
+			}
+			else
+			{
+				if (!is_array($ids))
+				{
+					$ids = array($ids);
+				}
+
+				$resource = FOFInflector::singularize($this->view);
+				$isEditState = ($area == 'core.edit.state');
+
+				foreach ($ids as $id)
+				{
+					$asset = $this->component . '.' . $resource . '.' . $id;
+
+					// Dedicated permission found, check it!
+
+					if (FOFPlatform::getInstance()->authorise($area, $asset) )
+					{
+						return true;
+					}
+
+					// Fallback on edit.own, if not edit.state. First test if the permission is available.
+
+					if ((!$isEditState) && (FOFPlatform::getInstance()->authorise('core.edit.own', $asset)))
+					{
+						$table = $this->getThisModel()->getTable();
+                        $table->load($id);
+
+                        $created_by = $table->getColumnAlias('created_by');
+
+						if ($table && isset($table->$created_by))
+						{
+							// Now test the owner is the user.
+							$owner_id = (int) $table->$created_by;
+
+							// If the owner matches 'me' then do the test.
+							if ($owner_id == FOFPlatform::getInstance()->getUser()->id)
+							{
+								return true;
+							}
+							else
+							{
+								return false;
+							}
+						}
+						else
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * A catch-all method for all tasks without a corresponding onBefore
+	 * method. Applies the ACL preferences defined in fof.xml.
+	 *
+	 * @param   string  $task  The task being executed
+	 *
+	 * @return  boolean  True to allow execution of the task
+	 */
+	protected function onBeforeGenericTask($task)
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.' . $task, ''
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * Execute something before applySave is called. Return false to prevent
+	 * applySave from executing.
+	 *
+	 * @param   array  &$data  The data upon which applySave will act
+	 *
+	 * @return  boolean  True to allow applySave to run
+	 */
+	protected function onBeforeApplySave(&$data)
+	{
+		return true;
+	}
+
+	/**
+	 * Execute something after applySave has run.
+	 *
+	 * @return  boolean  True to allow normal return, false to cause a 403 error
+	 */
+	protected function onAfterApplySave()
+	{
+		return true;
+	}
+
+	/**
+	 * ACL check before changing the access level; override to customise
+	 *
+	 * @return  boolean  True to allow accesspublic() to run
+	 */
+	protected function onBeforeAccesspublic()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.accesspublic', 'core.edit.state');
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the access level; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeAccessregistered()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.accessregistered', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the access level; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeAccessspecial()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.accessspecial', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before adding a new record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeAdd()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.add', 'core.create'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before saving a new/modified record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeApply()
+	{
+        $model = $this->getThisModel();
+
+        if (!$model->getId())
+        {
+            $model->setIDsFromRequest();
+        }
+
+        $id = $model->getId();
+
+        if(!$id)
+        {
+            $defaultPrivilege = 'core.create';
+        }
+        else
+        {
+            $defaultPrivilege = 'core.edit';
+        }
+
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.apply', $defaultPrivilege
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before allowing someone to browse
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeBrowse()
+	{
+		$defaultPrivilege = '';
+
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.browse', $defaultPrivilege
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before cancelling an edit
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeCancel()
+	{
+        $model = $this->getThisModel();
+
+        if (!$model->getId())
+        {
+            $model->setIDsFromRequest();
+        }
+
+        $id = $model->getId();
+
+        if(!$id)
+        {
+            $defaultPrivilege = 'core.create';
+        }
+        else
+        {
+            $defaultPrivilege = 'core.edit';
+        }
+
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.cancel', $defaultPrivilege
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before editing a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeEdit()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.edit', 'core.edit'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the ordering of a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeOrderdown()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.orderdown', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the ordering of a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeOrderup()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.orderup', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the publish status of a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforePublish()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.publish', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before removing a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeRemove()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.remove', 'core.delete'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before saving a new/modified record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeSave()
+	{
+		$model = $this->getThisModel();
+
+		if (!$model->getId())
+		{
+			$model->setIDsFromRequest();
+		}
+
+		$id = $model->getId();
+
+		if(!$id)
+		{
+			$defaultPrivilege = 'core.create';
+		}
+		else
+		{
+			$defaultPrivilege = 'core.edit';
+		}
+
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.save', $defaultPrivilege
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before saving a new/modified record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeSavenew()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.savenew', 'core.create'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the ordering of a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeSaveorder()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.saveorder', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * ACL check before changing the publish status of a record; override to customise
+	 *
+	 * @return  boolean  True to allow the method to run
+	 */
+	protected function onBeforeUnpublish()
+	{
+		$privilege = $this->configProvider->get(
+			$this->component . '.views.' .
+			FOFInflector::singularize($this->view) . '.acl.unpublish', 'core.edit.state'
+		);
+
+		return $this->checkACL($privilege);
+	}
+
+	/**
+	 * Gets a URL suffix with the Itemid parameter. If it's not the front-end of the site, or if
+	 * there is no Itemid set it returns an empty string.
+	 *
+	 * @return  string  The &Itemid=123 URL suffix, or an empty string if Itemid is not applicable
+	 */
+	public function getItemidURLSuffix()
+	{
+		if (FOFPlatform::getInstance()->isFrontend() && ($this->input->getCmd('Itemid', 0) != 0))
+		{
+			return '&Itemid=' . $this->input->getInt('Itemid', 0);
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	/**
+	 * Applies CSRF protection by means of a standard Joomla! token (nonce) check.
+	 * Raises a 403 Access Forbidden error through the platform if the check fails.
+	 *
+     * TODO Move this check inside the platform
+     *
+	 * @return  boolean  True if the CSRF check is successful
+	 *
+	 * @throws Exception
+	 */
+	protected function _csrfProtection()
+	{
+		static $isCli = null, $isAdmin = null;
+
+		if (is_null($isCli))
+		{
+			$isCli   = FOFPlatform::getInstance()->isCli();
+			$isAdmin = FOFPlatform::getInstance()->isBackend();
+		}
+
+		switch ($this->csrfProtection)
+		{
+			// Never
+			case 0:
+				return true;
+				break;
+
+			// Always
+			case 1:
+				break;
+
+			// Only back-end and HTML format
+			case 2:
+				if ($isCli)
+				{
+					return true;
+				}
+				elseif (!$isAdmin && ($this->input->get('format', 'html', 'cmd') != 'html'))
+				{
+					return true;
+				}
+				break;
+
+			// Only back-end
+			case 3:
+				if (!$isAdmin)
+				{
+					return true;
+				}
+				break;
+		}
+
+		$hasToken = false;
+		$session  = JFactory::getSession();
+
+		// Joomla! 1.5/1.6/1.7/2.5 (classic Joomla! API) method
+		if (method_exists('JUtility', 'getToken'))
+		{
+			$token    = JUtility::getToken();
+			$hasToken = $this->input->get($token, false, 'none') == 1;
+
+			if (!$hasToken)
+			{
+				$hasToken = $this->input->get('_token', null, 'none') == $token;
+			}
+		}
+
+		// Joomla! 2.5+ (Platform 12.1+) method
+		if (!$hasToken)
+		{
+			if (method_exists($session, 'getToken'))
+			{
+				$token    = $session->getToken();
+				$hasToken = $this->input->get($token, false, 'none') == 1;
+
+				if (!$hasToken)
+				{
+					$hasToken = $this->input->get('_token', null, 'none') == $token;
+				}
+			}
+		}
+
+		// Joomla! 2.5+ formToken method
+		if (!$hasToken)
+		{
+			if (method_exists($session, 'getFormToken'))
+			{
+				$token    = $session->getFormToken();
+				$hasToken = $this->input->get($token, false, 'none') == 1;
+
+				if (!$hasToken)
+				{
+					$hasToken = $this->input->get('_token', null, 'none') == $token;
+				}
+			}
+		}
+
+		if (!$hasToken)
+		{
+            FOFPlatform::getInstance()->raiseError(403, JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/fof/database/database.php b/core/libraries/fof/database/database.php
new file mode 100644
index 00000000..dc5a7188
--- /dev/null
+++ b/core/libraries/fof/database/database.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Database connector class.
+ *
+ * @since       11.1
+ * @deprecated  13.3 (Platform) & 4.0 (CMS)
+ */
+abstract class FOFDatabase
+{
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public function query()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::query() is deprecated, use FOFDatabaseDriver::execute() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return $this->execute();
+	}
+
+	/**
+	 * Get a list of available database connectors.  The list will only be populated with connectors that both
+	 * the class exists and the static test method returns true.  This gives us the ability to have a multitude
+	 * of connector classes that are self-aware as to whether or not they are able to be used on a given system.
+	 *
+	 * @return  array  An array of available database connectors.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function getConnectors()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getConnectors() is deprecated, use FOFDatabaseDriver::getConnectors() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return FOFDatabaseDriver::getConnectors();
+	}
+
+	/**
+	 * Gets the error message from the database connection.
+	 *
+	 * @param   boolean  $escaped  True to escape the message string for use in JavaScript.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 * @since   11.1
+	 */
+	public function getErrorMsg($escaped = false)
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getErrorMsg() is deprecated, use exception handling instead.', JLog::WARNING, 'deprecated');
+		}
+
+		if ($escaped)
+		{
+			return addslashes($this->errorMsg);
+		}
+		else
+		{
+			return $this->errorMsg;
+		}
+	}
+
+	/**
+	 * Gets the error number from the database connection.
+	 *
+	 * @return      integer  The error number for the most recent query.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function getErrorNum()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getErrorNum() is deprecated, use exception handling instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return $this->errorNum;
+	}
+
+	/**
+	 * Method to return a FOFDatabaseDriver instance based on the given options.  There are three global options and then
+	 * the rest are specific to the database driver.  The 'driver' option defines which FOFDatabaseDriver class is
+	 * used for the connection -- the default is 'mysqli'.  The 'database' option determines which database is to
+	 * be used for the connection.  The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   array  $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  FOFDatabaseDriver  A database object.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function getInstance($options = array())
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::getInstance() is deprecated, use FOFDatabaseDriver::getInstance() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return FOFDatabaseDriver::getInstance($options);
+	}
+
+	/**
+	 * Splits a string of multiple queries into an array of individual queries.
+	 *
+	 * @param   string  $query  Input SQL string with which to split into individual queries.
+	 *
+	 * @return  array  The queries from the input string separated into an array.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function splitSql($query)
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::splitSql() is deprecated, use FOFDatabaseDriver::splitSql() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return FOFDatabaseDriver::splitSql($query);
+	}
+
+	/**
+	 * Return the most recent error message for the database connector.
+	 *
+	 * @param   boolean  $showSQL  True to display the SQL statement sent to the database as well as the error.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function stderr($showSQL = false)
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::stderr() is deprecated.', JLog::WARNING, 'deprecated');
+		}
+
+		if ($this->errorNum != 0)
+		{
+			return JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $this->errorNum, $this->errorMsg)
+			. ($showSQL ? "<br />SQL = <pre>$this->sql</pre>" : '');
+		}
+		else
+		{
+			return JText::_('JLIB_DATABASE_FUNCTION_NOERROR');
+		}
+	}
+
+	/**
+	 * Test to see if the connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use FOFDatabaseDriver::isSupported() instead.
+	 */
+	public static function test()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabase::test() is deprecated. Use FOFDatabaseDriver::isSupported() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return static::isSupported();
+	}
+}
diff --git a/core/libraries/fof/database/driver.php b/core/libraries/fof/database/driver.php
new file mode 100644
index 00000000..27b17efc
--- /dev/null
+++ b/core/libraries/fof/database/driver.php
@@ -0,0 +1,2255 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Joomla Platform Database Driver Class
+ *
+ * @since  12.1
+ *
+ * @method      string  q()   q($text, $escape = true)  Alias for quote method
+ * @method      string  qn()  qn($name, $as = null)     Alias for quoteName method
+ */
+abstract class FOFDatabaseDriver extends FOFDatabase implements FOFDatabaseInterface
+{
+	/**
+	 * The name of the database.
+	 *
+	 * @var    string
+	 * @since  11.4
+	 */
+	private $_database;
+
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $name;
+
+	/**
+	 * The type of the database server family supported by this driver. Examples: mysql, oracle, postgresql, mssql,
+	 * sqlite.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType;
+
+	/**
+	 * @var    resource  The database connection resource.
+	 * @since  11.1
+	 */
+	protected $connection;
+
+	/**
+	 * @var    integer  The number of SQL statements executed by the database driver.
+	 * @since  11.1
+	 */
+	protected $count = 0;
+
+	/**
+	 * @var    resource  The database connection cursor from the last query.
+	 * @since  11.1
+	 */
+	protected $cursor;
+
+	/**
+	 * @var    boolean  The database driver debugging state.
+	 * @since  11.1
+	 */
+	protected $debug = false;
+
+	/**
+	 * @var    integer  The affected row limit for the current SQL statement.
+	 * @since  11.1
+	 */
+	protected $limit = 0;
+
+	/**
+	 * @var    array  The log of executed SQL statements by the database driver.
+	 * @since  11.1
+	 */
+	protected $log = array();
+
+	/**
+	 * @var    array  The log of executed SQL statements timings (start and stop microtimes) by the database driver.
+	 * @since  CMS 3.1.2
+	 */
+	protected $timings = array();
+
+	/**
+	 * @var    array  The log of executed SQL statements timings (start and stop microtimes) by the database driver.
+	 * @since  CMS 3.1.2
+	 */
+	protected $callStacks = array();
+
+	/**
+	 * @var    string  The character(s) used to quote SQL statement names such as table names or field names,
+	 *                 etc.  The child classes should define this as necessary.  If a single character string the
+	 *                 same character is used for both sides of the quoted name, else the first character will be
+	 *                 used for the opening quote and the second for the closing quote.
+	 * @since  11.1
+	 */
+	protected $nameQuote;
+
+	/**
+	 * @var    string  The null or zero representation of a timestamp for the database driver.  This should be
+	 *                 defined in child classes to hold the appropriate value for the engine.
+	 * @since  11.1
+	 */
+	protected $nullDate;
+
+	/**
+	 * @var    integer  The affected row offset to apply for the current SQL statement.
+	 * @since  11.1
+	 */
+	protected $offset = 0;
+
+	/**
+	 * @var    array  Passed in upon instantiation and saved.
+	 * @since  11.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    mixed  The current SQL statement to execute.
+	 * @since  11.1
+	 */
+	protected $sql;
+
+	/**
+	 * @var    string  The common database table prefix.
+	 * @since  11.1
+	 */
+	protected $tablePrefix;
+
+	/**
+	 * @var    boolean  True if the database engine supports UTF-8 character encoding.
+	 * @since  11.1
+	 */
+	protected $utf = true;
+
+	/**
+	 * @var    boolean  True if the database engine supports UTF-8 Multibyte (utf8mb4) character encoding.
+	 * @since  CMS 3.5.0
+	 */
+	protected $utf8mb4 = false;
+
+	/**
+	 * @var         integer  The database error number
+	 * @since       11.1
+	 * @deprecated  12.1
+	 */
+	protected $errorNum = 0;
+
+	/**
+	 * @var         string  The database error message
+	 * @since       11.1
+	 * @deprecated  12.1
+	 */
+	protected $errorMsg;
+
+	/**
+	 * @var    array  FOFDatabaseDriver instances container.
+	 * @since  11.1
+	 */
+	protected static $instances = array();
+
+	/**
+	 * @var    string  The minimum supported database version.
+	 * @since  12.1
+	 */
+	protected static $dbMinimum;
+
+	/**
+	 * @var    integer  The depth of the current transaction.
+	 * @since  12.3
+	 */
+	protected $transactionDepth = 0;
+
+	/**
+	 * @var    callable[]  List of callables to call just before disconnecting database
+	 * @since  CMS 3.1.2
+	 */
+	protected $disconnectHandlers = array();
+
+	/**
+	 * Get a list of available database connectors.  The list will only be populated with connectors that both
+	 * the class exists and the static test method returns true.  This gives us the ability to have a multitude
+	 * of connector classes that are self-aware as to whether or not they are able to be used on a given system.
+	 *
+	 * @return  array  An array of available database connectors.
+	 *
+	 * @since   11.1
+	 */
+	public static function getConnectors()
+	{
+		$connectors = array();
+
+		// Get an iterator and loop trough the driver classes.
+		$iterator = new DirectoryIterator(__DIR__ . '/driver');
+
+		/* @type  $file  DirectoryIterator */
+		foreach ($iterator as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() != 'php')
+			{
+				continue;
+			}
+
+			// Block the ext/mysql driver for PHP 7
+			if ($fileName === 'mysql.php' && PHP_MAJOR_VERSION >= 7)
+			{
+				continue;
+			}
+
+			// Derive the class name from the type.
+			$class = str_ireplace('.php', '', 'FOFDatabaseDriver' . ucfirst(trim($fileName)));
+
+			// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+			if (!class_exists($class))
+			{
+				continue;
+			}
+
+			// Sweet!  Our class exists, so now we just need to know if it passes its test method.
+			if ($class::isSupported())
+			{
+				// Connector names should not have file extensions.
+				$connectors[] = str_ireplace('.php', '', $fileName);
+			}
+		}
+
+		return $connectors;
+	}
+
+	/**
+	 * Method to return a FOFDatabaseDriver instance based on the given options.  There are three global options and then
+	 * the rest are specific to the database driver.  The 'driver' option defines which FOFDatabaseDriver class is
+	 * used for the connection -- the default is 'mysqli'.  The 'database' option determines which database is to
+	 * be used for the connection.  The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   array  $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  FOFDatabaseDriver  A database object.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public static function getInstance($options = array())
+	{
+		// Sanitize the database connector options.
+		$options['driver']   = (isset($options['driver'])) ? preg_replace('/[^A-Z0-9_\.-]/i', '', $options['driver']) : 'mysqli';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : null;
+		$options['select']   = (isset($options['select'])) ? $options['select'] : true;
+
+		// If the selected driver is `mysql` and we are on PHP 7 or greater, switch to the `mysqli` driver.
+		if ($options['driver'] === 'mysql' && PHP_MAJOR_VERSION >= 7)
+		{
+			// Check if we have support for the other MySQL drivers
+			$mysqliSupported   = FOFDatabaseDriverMysqli::isSupported();
+			$pdoMysqlSupported = FOFDatabaseDriverPdomysql::isSupported();
+
+			// If neither is supported, then the user cannot use MySQL; throw an exception
+			if (!$mysqliSupported && !$pdoMysqlSupported)
+			{
+				throw new RuntimeException(
+					'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.'
+					. ' Also, this system does not support MySQLi or PDO MySQL.  Cannot instantiate database driver.'
+				);
+			}
+
+			// Prefer MySQLi as it is a closer replacement for the removed MySQL driver, otherwise use the PDO driver
+			if ($mysqliSupported)
+			{
+				if (class_exists('JLog'))
+				{
+					JLog::add(
+							'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.  Trying `mysqli` instead.',
+							JLog::WARNING,
+							'deprecated'
+					);
+				}
+
+				$options['driver'] = 'mysqli';
+			}
+			else
+			{
+				if (class_exists('JLog'))
+				{
+					JLog::add(
+							'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.  Trying `pdomysql` instead.',
+							JLog::WARNING,
+							'deprecated'
+					);
+				}
+
+				$options['driver'] = 'pdomysql';
+			}
+		}
+
+		// Get the options signature for the database connector.
+		$signature = md5(serialize($options));
+
+		// If we already have a database connector instance for these options then just use that.
+		if (empty(self::$instances[$signature]))
+		{
+			// Derive the class name from the driver.
+			$class = 'FOFDatabaseDriver' . ucfirst(strtolower($options['driver']));
+
+			// If the class still doesn't exist we have nothing left to do but throw an exception.  We did our best.
+			if (!class_exists($class))
+			{
+				throw new RuntimeException(sprintf('Unable to load Database Driver: %s', $options['driver']));
+			}
+
+			// Create our new FOFDatabaseDriver connector based on the options given.
+			try
+			{
+				$instance = new $class($options);
+			}
+			catch (RuntimeException $e)
+			{
+				throw new RuntimeException(sprintf('Unable to connect to the Database: %s', $e->getMessage()), $e->getCode(), $e);
+			}
+
+			// Set the new connector to the global instances based on signature.
+			self::$instances[$signature] = $instance;
+		}
+
+		return self::$instances[$signature];
+	}
+
+	/**
+	 * Splits a string of multiple queries into an array of individual queries.
+	 *
+	 * @param   string  $sql  Input SQL string with which to split into individual queries.
+	 *
+	 * @return  array  The queries from the input string separated into an array.
+	 *
+	 * @since   11.1
+	 */
+	public static function splitSql($sql)
+	{
+		$start = 0;
+		$open = false;
+		$char = '';
+		$end = strlen($sql);
+		$queries = array();
+
+		for ($i = 0; $i < $end; $i++)
+		{
+			$current = substr($sql, $i, 1);
+
+			if (($current == '"' || $current == '\''))
+			{
+				$n = 2;
+
+				while (substr($sql, $i - $n + 1, 1) == '\\' && $n < $i)
+				{
+					$n++;
+				}
+
+				if ($n % 2 == 0)
+				{
+					if ($open)
+					{
+						if ($current == $char)
+						{
+							$open = false;
+							$char = '';
+						}
+					}
+					else
+					{
+						$open = true;
+						$char = $current;
+					}
+				}
+			}
+
+			if (($current == ';' && !$open) || $i == $end - 1)
+			{
+				$queries[] = substr($sql, $start, ($i - $start + 1));
+				$start = $i + 1;
+			}
+		}
+
+		return $queries;
+	}
+
+	/**
+	 * Magic method to provide method alias support for quote() and quoteName().
+	 *
+	 * @param   string  $method  The called method.
+	 * @param   array   $args    The array of arguments passed to the method.
+	 *
+	 * @return  mixed  The aliased method's return value or null.
+	 *
+	 * @since   11.1
+	 */
+	public function __call($method, $args)
+	{
+		if (empty($args))
+		{
+			return;
+		}
+
+		switch ($method)
+		{
+			case 'q':
+				return $this->quote($args[0], isset($args[1]) ? $args[1] : true);
+				break;
+			case 'qn':
+				return $this->quoteName($args[0], isset($args[1]) ? $args[1] : null);
+				break;
+		}
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options)
+	{
+		// Initialise object variables.
+		$this->_database = (isset($options['database'])) ? $options['database'] : '';
+		$this->tablePrefix = (isset($options['prefix'])) ? $options['prefix'] : 'jos_';
+		$this->connection = array_key_exists('connection', $options) ? $options['connection'] : null;
+
+		$this->count = 0;
+		$this->errorNum = 0;
+		$this->log = array();
+
+		// Set class options.
+		$this->options = $options;
+	}
+
+	/**
+	 * Alter database's character set, obtaining query string from protected member.
+	 *
+	 * @param   string  $dbName  The database name that will be altered
+	 *
+	 * @return  string  The query that alter the database query string
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function alterDbCharacterSet($dbName)
+	{
+		if (is_null($dbName))
+		{
+			throw new RuntimeException('Database name must not be null.');
+		}
+
+		$this->setQuery($this->getAlterDbCharacterSet($dbName));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Alter a table's character set, obtaining an array of queries to do so from a protected method. The conversion is
+	 * wrapped in a transaction, if supported by the database driver. Otherwise the table will be locked before the
+	 * conversion. This prevents data corruption.
+	 *
+	 * @param   string   $tableName  The name of the table to alter
+	 * @param   boolean  $rethrow    True to rethrow database exceptions. Default: false (exceptions are suppressed)
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   CMS 3.5.0
+	 * @throws  RuntimeException  If the table name is empty
+	 * @throws  Exception  Relayed from the database layer if a database error occurs and $rethrow == true
+	 */
+	public function alterTableCharacterSet($tableName, $rethrow = false)
+	{
+		if (is_null($tableName))
+		{
+			throw new RuntimeException('Table name must not be null.');
+		}
+
+		$queries = $this->getAlterTableCharacterSet($tableName);
+
+		if (empty($queries))
+		{
+			return false;
+		}
+
+		$hasTransaction = true;
+
+		try
+		{
+			$this->transactionStart();
+		}
+		catch (Exception $e)
+		{
+			$hasTransaction = false;
+			$this->lockTable($tableName);
+		}
+
+		foreach ($queries as $query)
+		{
+			try
+			{
+				$this->setQuery($query)->execute();
+			}
+			catch (Exception $e)
+			{
+				if ($hasTransaction)
+				{
+					$this->transactionRollback();
+				}
+				else
+				{
+					$this->unlockTables();
+				}
+
+				if ($rethrow)
+				{
+					throw $e;
+				}
+
+				return false;
+			}
+		}
+
+		if ($hasTransaction)
+		{
+			try
+			{
+				$this->transactionCommit();
+			}
+			catch (Exception $e)
+			{
+				$this->transactionRollback();
+
+				if ($rethrow)
+				{
+					throw $e;
+				}
+
+				return false;
+			}
+		}
+		else
+		{
+			$this->unlockTables();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function connect();
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function connected();
+
+	/**
+	 * Create a new database using information from $options object, obtaining query string
+	 * from protected member.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 * 									This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function createDatabase($options, $utf = true)
+	{
+		if (is_null($options))
+		{
+			throw new RuntimeException('$options object must not be null.');
+		}
+		elseif (empty($options->db_name))
+		{
+			throw new RuntimeException('$options object must have db_name set.');
+		}
+		elseif (empty($options->db_user))
+		{
+			throw new RuntimeException('$options object must have db_user set.');
+		}
+
+		$this->setQuery($this->getCreateDatabaseQuery($options, $utf));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	abstract public function disconnect();
+
+	/**
+	 * Adds a function callable just before disconnecting the database. Parameter of the callable is $this FOFDatabaseDriver
+	 *
+	 * @param   callable  $callable  Function to call in disconnect() method just before disconnecting from database
+	 *
+	 * @return  void
+	 *
+	 * @since   CMS 3.1.2
+	 */
+	public function addDisconnectHandler($callable)
+	{
+		$this->disconnectHandlers[] = $callable;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $table     The name of the database table to drop.
+	 * @param   boolean  $ifExists  Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  FOFDatabaseDriver     Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	public abstract function dropTable($table, $ifExists = true);
+
+	/**
+	 * Escapes a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string   The escaped string.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function escape($text, $extra = false);
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function fetchArray($cursor = null);
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function fetchAssoc($cursor = null);
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function fetchObject($cursor = null, $class = 'stdClass');
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function freeResult($cursor = null);
+
+	/**
+	 * Get the number of affected rows for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getAffectedRows();
+
+	/**
+	 * Return the query string to alter the database character set.
+	 *
+	 * @param   string  $dbName  The database name
+	 *
+	 * @return  string  The query that alter the database query string
+	 *
+	 * @since   12.2
+	 */
+	public function getAlterDbCharacterSet($dbName)
+	{
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset . '`';
+	}
+
+	/**
+	 * Get the query strings to alter the character set and collation of a table.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string[]  The queries required to alter the table's character set and collation
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getAlterTableCharacterSet($tableName)
+	{
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+		$collation = $charset . '_general_ci';
+
+		$quotedTableName = $this->quoteName($tableName);
+
+		$queries = array();
+		$queries[] = "ALTER TABLE $quotedTableName CONVERT TO CHARACTER SET $charset COLLATE $collation";
+
+		/**
+		 * We also need to convert each text column, modifying their character set and collation. This allows us to
+		 * change, for example, a utf8_bin collated column to a utf8mb4_bin collated column.
+		 */
+		$sql = "SHOW FULL COLUMNS FROM $quotedTableName";
+		$this->setQuery($sql);
+		$columns = $this->loadAssocList();
+		$columnMods = array();
+
+		if (is_array($columns))
+		{
+			foreach ($columns as $column)
+			{
+				// Make sure we are redefining only columns which do support a collation
+				$col = (object) $column;
+
+				if (empty($col->Collation))
+				{
+					continue;
+				}
+
+				// Default new collation: utf8_general_ci or utf8mb4_general_ci
+				$newCollation = $charset . '_general_ci';
+				$collationParts = explode('_', $col->Collation);
+
+				/**
+				 * If the collation is in the form charset_collationType_ci or charset_collationType we have to change
+				 * the charset but leave the collationType intact (e.g. utf8_bin must become utf8mb4_bin, NOT
+				 * utf8mb4_general_ci).
+				 */
+				if (count($collationParts) >= 2)
+				{
+					$ci = array_pop($collationParts);
+					$collationType = array_pop($collationParts);
+					$newCollation = $charset . '_' . $collationType . '_' . $ci;
+
+					/**
+					 * When the last part of the old collation is not _ci we have a charset_collationType format,
+					 * something like utf8_bin. Therefore the new collation only has *two* parts.
+					 */
+					if ($ci != 'ci')
+					{
+						$newCollation = $charset . '_' . $ci;
+					}
+				}
+
+				// If the old and new collation is the same we don't have to change the collation type
+				if (strtolower($newCollation) == strtolower($col->Collation))
+				{
+					continue;
+				}
+
+				$null = $col->Null == 'YES' ? 'NULL' : 'NOT NULL';
+				$default = is_null($col->Default) ? '' : "DEFAULT '" . $this->q($col->Default) . "'";
+				$columnMods[] = "MODIFY COLUMN `{$col->Field}` {$col->Type} CHARACTER SET $charset COLLATE $newCollation $null $default";
+			}
+		}
+
+		if (count($columnMods))
+		{
+			$queries[] = "ALTER TABLE $quotedTableName " .
+				implode(',', $columnMods) .
+				" CHARACTER SET $charset COLLATE $collation";
+		}
+
+		return $queries;
+	}
+
+	/**
+	 * Automatically downgrade a CREATE TABLE or ALTER TABLE query from utf8mb4 (UTF-8 Multibyte) to plain utf8. Used
+	 * when the server doesn't support UTF-8 Multibyte.
+	 *
+	 * @param   string  $query  The query to convert
+	 *
+	 * @return  string  The converted query
+	 */
+	public function convertUtf8mb4QueryToUtf8($query)
+	{
+		if ($this->hasUTF8mb4Support())
+		{
+			return $query;
+		}
+
+		// If it's not an ALTER TABLE or CREATE TABLE command there's nothing to convert
+		$beginningOfQuery = substr($query, 0, 12);
+		$beginningOfQuery = strtoupper($beginningOfQuery);
+
+		if (!in_array($beginningOfQuery, array('ALTER TABLE ', 'CREATE TABLE')))
+		{
+			return $query;
+		}
+
+		// Replace utf8mb4 with utf8
+		return str_replace('utf8mb4', 'utf8', $query);
+	}
+
+	/**
+	 * Return the query string to create new Database.
+	 * Each database driver, other than MySQL, need to override this member to return correct string.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 *                   This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 */
+	protected function getCreateDatabaseQuery($options, $utf)
+	{
+		if ($utf)
+		{
+			$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+			return 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' CHARACTER SET `' . $charset . '`';
+		}
+
+		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getCollation();
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return '';
+	}
+
+	/**
+	 * Method that provides access to the underlying database connection. Useful for when you need to call a
+	 * proprietary method such as postgresql's lo_* methods.
+	 *
+	 * @return  resource  The underlying database connection resource.
+	 *
+	 * @since   11.1
+	 */
+	public function getConnection()
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Get the total number of SQL statements executed by the database driver.
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	public function getCount()
+	{
+		return $this->count;
+	}
+
+	/**
+	 * Gets the name of the database used by this conneciton.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.4
+	 */
+	protected function getDatabase()
+	{
+		return $this->_database;
+	}
+
+	/**
+	 * Returns a PHP date() function compliant date format for the database driver.
+	 *
+	 * @return  string  The format string.
+	 *
+	 * @since   11.1
+	 */
+	public function getDateFormat()
+	{
+		return 'Y-m-d H:i:s';
+	}
+
+	/**
+	 * Get the database driver SQL statement log.
+	 *
+	 * @return  array  SQL statements executed by the database driver.
+	 *
+	 * @since   11.1
+	 */
+	public function getLog()
+	{
+		return $this->log;
+	}
+
+	/**
+	 * Get the database driver SQL statement log.
+	 *
+	 * @return  array  SQL statements executed by the database driver.
+	 *
+	 * @since   CMS 3.1.2
+	 */
+	public function getTimings()
+	{
+		return $this->timings;
+	}
+
+	/**
+	 * Get the database driver SQL statement log.
+	 *
+	 * @return  array  SQL statements executed by the database driver.
+	 *
+	 * @since   CMS 3.1.2
+	 */
+	public function getCallStacks()
+	{
+		return $this->callStacks;
+	}
+
+	/**
+	 * Get the minimum supported database version.
+	 *
+	 * @return  string  The minimum version number for the database driver.
+	 *
+	 * @since   12.1
+	 */
+	public function getMinimum()
+	{
+		return static::$dbMinimum;
+	}
+
+	/**
+	 * Get the null or zero representation of a timestamp for the database driver.
+	 *
+	 * @return  string  Null or zero representation of a timestamp.
+	 *
+	 * @since   11.1
+	 */
+	public function getNullDate()
+	{
+		return $this->nullDate;
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getNumRows($cursor = null);
+
+	/**
+	 * Get the common table prefix for the database driver.
+	 *
+	 * @return  string  The common database table prefix.
+	 *
+	 * @since   11.1
+	 */
+	public function getPrefix()
+	{
+		return $this->tablePrefix;
+	}
+
+	/**
+	 * Gets an exporter class object.
+	 *
+	 * @return  FOFDatabaseExporter  An exporter object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getExporter()
+	{
+		// Derive the class name from the driver.
+		$class = 'FOFDatabaseExporter' . ucfirst($this->name);
+
+		// Make sure we have an exporter class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new RuntimeException('Database Exporter not found.');
+		}
+
+		$o = new $class;
+		$o->setDbo($this);
+
+		return $o;
+	}
+
+	/**
+	 * Gets an importer class object.
+	 *
+	 * @return  FOFDatabaseImporter  An importer object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getImporter()
+	{
+		// Derive the class name from the driver.
+		$class = 'FOFDatabaseImporter' . ucfirst($this->name);
+
+		// Make sure we have an importer class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new RuntimeException('Database Importer not found');
+		}
+
+		$o = new $class;
+		$o->setDbo($this);
+
+		return $o;
+	}
+
+	/**
+	 * Get the name of the database driver. If $this->name is not set it will try guessing the driver name from the
+	 * class name.
+	 *
+	 * @return  string
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$className = get_class($this);
+			$className = str_replace('FOFDatabaseDriver', '', $className);
+			$this->name = strtolower($className);
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Get the server family type, e.g. mysql, postgresql, oracle, sqlite, mssql. If $this->serverType is not set it
+	 * will attempt guessing the server family type from the driver name. If this is not possible the driver name will
+	 * be returned instead.
+	 *
+	 * @return  string
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getServerType()
+	{
+		if (empty($this->serverType))
+		{
+			$name = $this->getName();
+
+			if (stristr($name, 'mysql') !== false)
+			{
+				$this->serverType = 'mysql';
+			}
+			elseif (stristr($name, 'postgre') !== false)
+			{
+				$this->serverType = 'postgresql';
+			}
+			elseif (stristr($name, 'oracle') !== false)
+			{
+				$this->serverType = 'oracle';
+			}
+			elseif (stristr($name, 'sqlite') !== false)
+			{
+				$this->serverType = 'sqlite';
+			}
+			elseif (stristr($name, 'sqlsrv') !== false)
+			{
+				$this->serverType = 'mssql';
+			}
+			elseif (stristr($name, 'mssql') !== false)
+			{
+				$this->serverType = 'mssql';
+			}
+			else
+			{
+				$this->serverType = $name;
+			}
+		}
+
+		return $this->serverType;
+	}
+
+	/**
+	 * Get the current query object or a new FOFDatabaseQuery object.
+	 *
+	 * @param   boolean  $new  False to return the current query object, True to return a new FOFDatabaseQuery object.
+	 *
+	 * @return  FOFDatabaseQuery  The current query object or a new object extending the FOFDatabaseQuery class.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function getQuery($new = false)
+	{
+		if ($new)
+		{
+			// Derive the class name from the driver.
+			$class = 'FOFDatabaseQuery' . ucfirst($this->name);
+
+			// Make sure we have a query class for this driver.
+			if (!class_exists($class))
+			{
+				// If it doesn't exist we are at an impasse so throw an exception.
+				throw new RuntimeException('Database Query Class not found.');
+			}
+
+			return new $class($this);
+		}
+		else
+		{
+			return $this->sql;
+		}
+	}
+
+	/**
+	 * Get a new iterator on the current query.
+	 *
+	 * @param   string  $column  An option column to use as the iterator key.
+	 * @param   string  $class   The class of object that is returned.
+	 *
+	 * @return  FOFDatabaseIterator  A new database iterator.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getIterator($column = null, $class = 'stdClass')
+	{
+		// Derive the class name from the driver.
+		$iteratorClass = 'FOFDatabaseIterator' . ucfirst($this->name);
+
+		// Make sure we have an iterator class for this driver.
+		if (!class_exists($iteratorClass))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new RuntimeException(sprintf('class *%s* is not defined', $iteratorClass));
+		}
+
+		// Return a new iterator
+		return new $iteratorClass($this->execute(), $column, $class);
+	}
+
+	/**
+	 * Retrieves field information about the given tables.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True (default) to only return field types.
+	 *
+	 * @return  array  An array of fields by table.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableColumns($table, $typeOnly = true);
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableCreate($tables);
+
+	/**
+	 * Retrieves field information about the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  An array of keys for the table(s).
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableKeys($tables);
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableList();
+
+	/**
+	 * Determine whether or not the database engine supports UTF-8 character encoding.
+	 *
+	 * @return  boolean  True if the database engine supports UTF-8 character encoding.
+	 *
+	 * @since   11.1
+	 * @deprecated 12.3 (Platform) & 4.0 (CMS) - Use hasUTFSupport() instead
+	 */
+	public function getUTFSupport()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add('FOFDatabaseDriver::getUTFSupport() is deprecated. Use FOFDatabaseDriver::hasUTFSupport() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		return $this->hasUTFSupport();
+	}
+
+	/**
+	 * Determine whether or not the database engine supports UTF-8 character encoding.
+	 *
+	 * @return  boolean  True if the database engine supports UTF-8 character encoding.
+	 *
+	 * @since   12.1
+	 */
+	public function hasUTFSupport()
+	{
+		return $this->utf;
+	}
+
+	/**
+	 * Determine whether the database engine support the UTF-8 Multibyte (utf8mb4) character encoding. This applies to
+	 * MySQL databases.
+	 *
+	 * @return  boolean  True if the database engine supports UTF-8 Multibyte.
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function hasUTF8mb4Support()
+	{
+		return $this->utf8mb4;
+	}
+
+	/**
+	 * Get the version of the database connector
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getVersion();
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  mixed  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function insertid();
+
+	/**
+	 * Inserts a row into a table based on an object's properties.
+	 *
+	 * @param   string  $table    The name of the database table to insert into.
+	 * @param   object  &$object  A reference to an object whose public properties match the table fields.
+	 * @param   string  $key      The name of the primary key. If provided the object property is updated.
+	 *
+	 * @return  boolean    True on success.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function insertObject($table, &$object, $key = null)
+	{
+		$fields = array();
+		$values = array();
+
+		// Iterate over the object variables to build the query fields and values.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process non-null scalars.
+			if (is_array($v) or is_object($v) or $v === null)
+			{
+				continue;
+			}
+
+			// Ignore any internal fields.
+			if ($k[0] == '_')
+			{
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			$fields[] = $this->quoteName($k);
+			$values[] = $this->quote($v);
+		}
+
+		// Create the base insert statement.
+		$query = $this->getQuery(true)
+			->insert($this->quoteName($table))
+			->columns($fields)
+			->values(implode(',', $values));
+
+		// Set the query and execute the insert.
+		$this->setQuery($query);
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		// Update the primary key if it exists.
+		$id = $this->insertid();
+
+		if ($key && $id && is_string($key))
+		{
+			$object->$key = $id;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to check whether the installed database version is supported by the database driver
+	 *
+	 * @return  boolean  True if the database version is supported
+	 *
+	 * @since   12.1
+	 */
+	public function isMinimumVersion()
+	{
+		return version_compare($this->getVersion(), static::$dbMinimum) >= 0;
+	}
+
+	/**
+	 * Method to get the first row of the result set from the database query as an associative array
+	 * of ['field_name' => 'row_value'].
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadAssoc()
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get the first row from the result set as an associative array.
+		if ($array = $this->fetchAssoc($cursor))
+		{
+			$ret = $array;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get an array of the result set rows from the database query where each row is an associative array
+	 * of ['field_name' => 'row_value'].  The array of rows can optionally be keyed by a field name, but defaults to
+	 * a sequential numeric array.
+	 *
+	 * NOTE: Chosing to key the result array by a non-unique field name can result in unwanted
+	 * behavior and should be avoided.
+	 *
+	 * @param   string  $key     The name of a field on which to key the result array.
+	 * @param   string  $column  An optional column name. Instead of the whole row, only this column value will be in
+	 * the result array.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadAssocList($key = null, $column = null)
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get all of the rows from the result set.
+		while ($row = $this->fetchAssoc($cursor))
+		{
+			$value = ($column) ? (isset($row[$column]) ? $row[$column] : $row) : $row;
+
+			if ($key)
+			{
+				$array[$row[$key]] = $value;
+			}
+			else
+			{
+				$array[] = $value;
+			}
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Method to get an array of values from the <var>$offset</var> field in each row of the result set from
+	 * the database query.
+	 *
+	 * @param   integer  $offset  The row offset to use to build the result array.
+	 *
+	 * @return  mixed    The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadColumn($offset = 0)
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get all of the rows from the result set as arrays.
+		while ($row = $this->fetchArray($cursor))
+		{
+			$array[] = $row[$offset];
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an object.
+	 *
+	 * @param   string  $class  The class name to use for the returned row object.
+	 *
+	 * @return  mixed   The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use getIterator() instead
+	 */
+	public function loadNextObject($class = 'stdClass')
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add(__METHOD__ . '() is deprecated. Use FOFDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		$this->connect();
+
+		static $cursor = null;
+
+		// Execute the query and get the result set cursor.
+		if ( is_null($cursor) )
+		{
+			if (!($cursor = $this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchObject($cursor, $class))
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+		$cursor = null;
+
+		return false;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an array.
+	 *
+	 * @return  mixed  The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  4.0 (CMS)  Use FOFDatabaseDriver::getIterator() instead
+	 */
+	public function loadNextRow()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add(__METHOD__ . '() is deprecated. Use FOFDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		}
+
+		$this->connect();
+
+		static $cursor = null;
+
+		// Execute the query and get the result set cursor.
+		if ( is_null($cursor) )
+		{
+			if (!($cursor = $this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchArray($cursor))
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+		$cursor = null;
+
+		return false;
+	}
+
+	/**
+	 * Method to get the first row of the result set from the database query as an object.
+	 *
+	 * @param   string  $class  The class name to use for the returned row object.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadObject($class = 'stdClass')
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get the first row from the result set as an object of type $class.
+		if ($object = $this->fetchObject($cursor, $class))
+		{
+			$ret = $object;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get an array of the result set rows from the database query where each row is an object.  The array
+	 * of objects can optionally be keyed by a field name, but defaults to a sequential numeric array.
+	 *
+	 * NOTE: Choosing to key the result array by a non-unique field name can result in unwanted
+	 * behavior and should be avoided.
+	 *
+	 * @param   string  $key    The name of a field on which to key the result array.
+	 * @param   string  $class  The class name to use for the returned row objects.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadObjectList($key = '', $class = 'stdClass')
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get all of the rows from the result set as objects of type $class.
+		while ($row = $this->fetchObject($cursor, $class))
+		{
+			if ($key)
+			{
+				$array[$row->$key] = $row;
+			}
+			else
+			{
+				$array[] = $row;
+			}
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Method to get the first field of the first row of the result set from the database query.
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadResult()
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get the first row from the result set as an array.
+		if ($row = $this->fetchArray($cursor))
+		{
+			$ret = $row[0];
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get the first row of the result set from the database query as an array.  Columns are indexed
+	 * numerically so the first column in the result set would be accessible via <var>$row[0]</var>, etc.
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadRow()
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get the first row from the result set as an array.
+		if ($row = $this->fetchArray($cursor))
+		{
+			$ret = $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get an array of the result set rows from the database query where each row is an array.  The array
+	 * of objects can optionally be keyed by a field offset, but defaults to a sequential numeric array.
+	 *
+	 * NOTE: Choosing to key the result array by a non-unique field can result in unwanted
+	 * behavior and should be avoided.
+	 *
+	 * @param   string  $key  The name of a field on which to key the result array.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadRowList($key = null)
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get all of the rows from the result set as arrays.
+		while ($row = $this->fetchArray($cursor))
+		{
+			if ($key !== null)
+			{
+				$array[$row[$key]] = $row;
+			}
+			else
+			{
+				$array[] = $row;
+			}
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $tableName  The name of the table to unlock.
+	 *
+	 * @return  FOFDatabaseDriver     Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	public abstract function lockTable($tableName);
+
+	/**
+	 * Quotes and optionally escapes a string to database requirements for use in database queries.
+	 *
+	 * @param   mixed    $text    A string or an array of strings to quote.
+	 * @param   boolean  $escape  True (default) to escape the string, false to leave it unchanged.
+	 *
+	 * @return  string  The quoted input string.
+	 *
+	 * @note    Accepting an array of strings was added in 12.3.
+	 * @since   11.1
+	 */
+	public function quote($text, $escape = true)
+	{
+		if (is_array($text))
+		{
+			foreach ($text as $k => $v)
+			{
+				$text[$k] = $this->quote($v, $escape);
+			}
+
+			return $text;
+		}
+		else
+		{
+			return '\'' . ($escape ? $this->escape($text) : $text) . '\'';
+		}
+	}
+
+	/**
+	 * Wrap an SQL statement identifier name such as column, table or database names in quotes to prevent injection
+	 * risks and reserved word conflicts.
+	 *
+	 * @param   mixed  $name  The identifier name to wrap in quotes, or an array of identifier names to wrap in quotes.
+	 *                        Each type supports dot-notation name.
+	 * @param   mixed  $as    The AS query part associated to $name. It can be string or array, in latter case it has to be
+	 *                        same length of $name; if is null there will not be any AS part for string or array element.
+	 *
+	 * @return  mixed  The quote wrapped name, same type of $name.
+	 *
+	 * @since   11.1
+	 */
+	public function quoteName($name, $as = null)
+	{
+		if (is_string($name))
+		{
+			$quotedName = $this->quoteNameStr(explode('.', $name));
+
+			$quotedAs = '';
+
+			if (!is_null($as))
+			{
+				settype($as, 'array');
+				$quotedAs .= ' AS ' . $this->quoteNameStr($as);
+			}
+
+			return $quotedName . $quotedAs;
+		}
+		else
+		{
+			$fin = array();
+
+			if (is_null($as))
+			{
+				foreach ($name as $str)
+				{
+					$fin[] = $this->quoteName($str);
+				}
+			}
+			elseif (is_array($name) && (count($name) == count($as)))
+			{
+				$count = count($name);
+
+				for ($i = 0; $i < $count; $i++)
+				{
+					$fin[] = $this->quoteName($name[$i], $as[$i]);
+				}
+			}
+
+			return $fin;
+		}
+	}
+
+	/**
+	 * Quote strings coming from quoteName call.
+	 *
+	 * @param   array  $strArr  Array of strings coming from quoteName dot-explosion.
+	 *
+	 * @return  string  Dot-imploded string of quoted parts.
+	 *
+	 * @since 11.3
+	 */
+	protected function quoteNameStr($strArr)
+	{
+		$parts = array();
+		$q = $this->nameQuote;
+
+		foreach ($strArr as $part)
+		{
+			if (is_null($part))
+			{
+				continue;
+			}
+
+			if (strlen($q) == 1)
+			{
+				$parts[] = $q . $part . $q;
+			}
+			else
+			{
+				$parts[] = $q{0} . $part . $q{1};
+			}
+		}
+
+		return implode('.', $parts);
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $sql     The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   11.1
+	 */
+	public function replacePrefix($sql, $prefix = '#__')
+	{
+		$startPos = 0;
+		$literal = '';
+
+		$sql = trim($sql);
+		$n = strlen($sql);
+
+		while ($startPos < $n)
+		{
+			$ip = strpos($sql, $prefix, $startPos);
+
+			if ($ip === false)
+			{
+				break;
+			}
+
+			$j = strpos($sql, "'", $startPos);
+			$k = strpos($sql, '"', $startPos);
+
+			if (($k !== false) && (($k < $j) || ($j === false)))
+			{
+				$quoteChar = '"';
+				$j = $k;
+			}
+			else
+			{
+				$quoteChar = "'";
+			}
+
+			if ($j === false)
+			{
+				$j = $n;
+			}
+
+			$literal .= str_replace($prefix, $this->tablePrefix, substr($sql, $startPos, $j - $startPos));
+			$startPos = $j;
+
+			$j = $startPos + 1;
+
+			if ($j >= $n)
+			{
+				break;
+			}
+
+			// Quote comes first, find end of quote
+			while (true)
+			{
+				$k = strpos($sql, $quoteChar, $j);
+				$escaped = false;
+
+				if ($k === false)
+				{
+					break;
+				}
+
+				$l = $k - 1;
+
+				while ($l >= 0 && $sql{$l} == '\\')
+				{
+					$l--;
+					$escaped = !$escaped;
+				}
+
+				if ($escaped)
+				{
+					$j = $k + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			if ($k === false)
+			{
+				// Error in the query - no end quote; ignore it
+				break;
+			}
+
+			$literal .= substr($sql, $startPos, $k - $startPos + 1);
+			$startPos = $k + 1;
+		}
+
+		if ($startPos < $n)
+		{
+			$literal .= substr($sql, $startPos, $n - $startPos);
+		}
+
+		return $literal;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Table prefix
+	 * @param   string  $prefix    For the table - used to rename constraints in non-mysql databases
+	 *
+	 * @return  FOFDatabaseDriver    Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	public abstract function renameTable($oldTable, $newTable, $backup = null, $prefix = null);
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function select($database);
+
+	/**
+	 * Sets the database debugging state for the driver.
+	 *
+	 * @param   boolean  $level  True to enable debugging.
+	 *
+	 * @return  boolean  The old debugging level.
+	 *
+	 * @since   11.1
+	 */
+	public function setDebug($level)
+	{
+		$previous = $this->debug;
+		$this->debug = (bool) $level;
+
+		return $previous;
+	}
+
+	/**
+	 * Sets the SQL statement string for later execution.
+	 *
+	 * @param   mixed    $query   The SQL statement to set either as a FOFDatabaseQuery object or a string.
+	 * @param   integer  $offset  The affected row offset to set.
+	 * @param   integer  $limit   The maximum affected rows to set.
+	 *
+	 * @return  FOFDatabaseDriver  This object to support method chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function setQuery($query, $offset = 0, $limit = 0)
+	{
+		$this->sql = $query;
+
+		if ($query instanceof FOFDatabaseQueryLimitable)
+		{
+			if (!$limit && $query->limit)
+			{
+				$limit = $query->limit;
+			}
+
+			if (!$offset && $query->offset)
+			{
+				$offset = $query->offset;
+			}
+
+			$query->setLimit($limit, $offset);
+		}
+		else
+		{
+			$this->limit = (int) max(0, $limit);
+			$this->offset = (int) max(0, $offset);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function setUtf();
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function transactionCommit($toSavepoint = false);
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function transactionRollback($toSavepoint = false);
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function transactionStart($asSavepoint = false);
+
+	/**
+	 * Method to truncate a table.
+	 *
+	 * @param   string  $table  The table to truncate
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 * @throws  RuntimeException
+	 */
+	public function truncateTable($table)
+	{
+		$this->setQuery('TRUNCATE TABLE ' . $this->quoteName($table));
+		$this->execute();
+	}
+
+	/**
+	 * Updates a row in a table based on an object's properties.
+	 *
+	 * @param   string   $table    The name of the database table to update.
+	 * @param   object   &$object  A reference to an object whose public properties match the table fields.
+	 * @param   array    $key      The name of the primary key.
+	 * @param   boolean  $nulls    True to update null fields or false to ignore them.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function updateObject($table, &$object, $key, $nulls = false)
+	{
+		$fields = array();
+		$where = array();
+
+		if (is_string($key))
+		{
+			$key = array($key);
+		}
+
+		if (is_object($key))
+		{
+			$key = (array) $key;
+		}
+
+		// Create the base update statement.
+		$statement = 'UPDATE ' . $this->quoteName($table) . ' SET %s WHERE %s';
+
+		// Iterate over the object variables to build the query fields/value pairs.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process scalars that are not internal fields.
+			if (is_array($v) or is_object($v) or $k[0] == '_')
+			{
+				continue;
+			}
+
+			// Set the primary key to the WHERE clause instead of a field to update.
+			if (in_array($k, $key))
+			{
+				$where[] = $this->quoteName($k) . '=' . $this->quote($v);
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			if ($v === null)
+			{
+				// If the value is null and we want to update nulls then set it.
+				if ($nulls)
+				{
+					$val = 'NULL';
+				}
+				// If the value is null and we do not want to update nulls then ignore this field.
+				else
+				{
+					continue;
+				}
+			}
+			// The field is not null so we prep it for update.
+			else
+			{
+				$val = $this->quote($v);
+			}
+
+			// Add the field to be updated.
+			$fields[] = $this->quoteName($k) . '=' . $val;
+		}
+
+		// We don't have any fields to update.
+		if (empty($fields))
+		{
+			return true;
+		}
+
+		// Set the query and execute the update.
+		$this->setQuery(sprintf($statement, implode(",", $fields), implode(' AND ', $where)));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function execute();
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  FOFDatabaseDriver  Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	public abstract function unlockTables();
+}
diff --git a/core/libraries/fof/database/driver/joomla.php b/core/libraries/fof/database/driver/joomla.php
new file mode 100644
index 00000000..63b67627
--- /dev/null
+++ b/core/libraries/fof/database/driver/joomla.php
@@ -0,0 +1,778 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This crazy three line bit is required to convince Joomla! to load JDatabaseInterface which is on the same file as the
+ * abstract JDatabaseDriver class for reasons that beat me. It makes no sense. Furthermore, jimport on Joomla! 3.4
+ * doesn't seem to actually load the file, merely registering the association in the autoloader. Hence the class_exists
+ * in here.
+ */
+jimport('joomla.database.driver');
+jimport('joomla.database.driver.mysqli');
+class_exists('JDatabaseDriver', true);
+
+/**
+ * Joomla! pass-through database driver.
+ */
+class FOFDatabaseDriverJoomla extends FOFDatabase implements FOFDatabaseInterface
+{
+	/** @var FOFDatabase The real database connection object */
+	private $dbo;
+
+	/**
+	 * @var    string  The character(s) used to quote SQL statement names such as table names or field names,
+	 *                 etc.  The child classes should define this as necessary.  If a single character string the
+	 *                 same character is used for both sides of the quoted name, else the first character will be
+	 *                 used for the opening quote and the second for the closing quote.
+	 * @since  11.1
+	 */
+	protected $nameQuote = '';
+
+	/**
+	 * Is this driver supported
+	 *
+	 * @since  11.2
+	 */
+	public static function isSupported()
+	{
+		return true;
+	}
+
+	/**
+	 * Database object constructor
+	 *
+	 * @param    array $options List of options used to configure the connection
+	 */
+	public function __construct($options = array())
+	{
+		// Get best matching Akeeba Backup driver instance
+		$this->dbo = JFactory::getDbo();
+
+		$reflection = new ReflectionClass($this->dbo);
+
+		try
+		{
+			$refProp = $reflection->getProperty('nameQuote');
+			$refProp->setAccessible(true);
+			$this->nameQuote = $refProp->getValue($this->dbo);
+		}
+		catch (Exception $e)
+		{
+			$this->nameQuote = '`';
+		}
+	}
+
+	public function close()
+	{
+		if (method_exists($this->dbo, 'close'))
+		{
+			$this->dbo->close();
+		}
+		elseif (method_exists($this->dbo, 'disconnect'))
+		{
+			$this->dbo->disconnect();
+		}
+	}
+
+	public function disconnect()
+	{
+		$this->close();
+	}
+
+	public function open()
+	{
+		if (method_exists($this->dbo, 'open'))
+		{
+			$this->dbo->open();
+		}
+		elseif (method_exists($this->dbo, 'connect'))
+		{
+			$this->dbo->connect();
+		}
+	}
+
+	public function connect()
+	{
+		$this->open();
+	}
+
+	public function connected()
+	{
+		if (method_exists($this->dbo, 'connected'))
+		{
+			return $this->dbo->connected();
+		}
+
+		return true;
+	}
+
+	public function escape($text, $extra = false)
+	{
+		return $this->dbo->escape($text, $extra);
+	}
+
+	public function execute()
+	{
+		if (method_exists($this->dbo, 'execute'))
+		{
+			return $this->dbo->execute();
+		}
+
+		return $this->dbo->query();
+	}
+
+	public function getAffectedRows()
+	{
+		if (method_exists($this->dbo, 'getAffectedRows'))
+		{
+			return $this->dbo->getAffectedRows();
+		}
+
+		return 0;
+	}
+
+	public function getCollation()
+	{
+		if (method_exists($this->dbo, 'getCollation'))
+		{
+			return $this->dbo->getCollation();
+		}
+
+		return 'utf8_general_ci';
+	}
+
+	public function getConnection()
+	{
+		if (method_exists($this->dbo, 'getConnection'))
+		{
+			return $this->dbo->getConnection();
+		}
+
+		return null;
+	}
+
+	public function getCount()
+	{
+		if (method_exists($this->dbo, 'getCount'))
+		{
+			return $this->dbo->getCount();
+		}
+
+		return 0;
+	}
+
+	public function getDateFormat()
+	{
+		if (method_exists($this->dbo, 'getDateFormat'))
+		{
+			return $this->dbo->getDateFormat();
+		}
+
+		return 'Y-m-d H:i:s';;
+	}
+
+	public function getMinimum()
+	{
+		if (method_exists($this->dbo, 'getMinimum'))
+		{
+			return $this->dbo->getMinimum();
+		}
+
+		return '5.0.40';
+	}
+
+	public function getNullDate()
+	{
+		if (method_exists($this->dbo, 'getNullDate'))
+		{
+			return $this->dbo->getNullDate();
+		}
+
+		return '0000-00-00 00:00:00';
+	}
+
+	public function getNumRows($cursor = null)
+	{
+		if (method_exists($this->dbo, 'getNumRows'))
+		{
+			return $this->dbo->getNumRows($cursor);
+		}
+
+		return 0;
+	}
+
+	public function getQuery($new = false)
+	{
+		if (method_exists($this->dbo, 'getQuery'))
+		{
+			return $this->dbo->getQuery($new);
+		}
+
+		return null;
+	}
+
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		if (method_exists($this->dbo, 'getTableColumns'))
+		{
+			return $this->dbo->getTableColumns($table, $typeOnly);
+		}
+
+		$result = $this->dbo->getTableFields(array($table), $typeOnly);
+
+		return $result[$table];
+	}
+
+	public function getTableKeys($tables)
+	{
+		if (method_exists($this->dbo, 'getTableKeys'))
+		{
+			return $this->dbo->getTableKeys($tables);
+		}
+
+		return array();
+	}
+
+	public function getTableList()
+	{
+		if (method_exists($this->dbo, 'getTableList'))
+		{
+			return $this->dbo->getTableList();
+		}
+
+		return array();
+	}
+
+	public function getVersion()
+	{
+		if (method_exists($this->dbo, 'getVersion'))
+		{
+			return $this->dbo->getVersion();
+		}
+
+		return '5.0.40';
+	}
+
+	public function insertid()
+	{
+		if (method_exists($this->dbo, 'insertid'))
+		{
+			return $this->dbo->insertid();
+		}
+
+		return null;
+	}
+
+	public function insertObject($table, &$object, $key = null)
+	{
+		if (method_exists($this->dbo, 'insertObject'))
+		{
+			return $this->dbo->insertObject($table, $object, $key);
+		}
+
+		return null;
+	}
+
+	public function loadAssoc()
+	{
+		if (method_exists($this->dbo, 'loadAssoc'))
+		{
+			return $this->dbo->loadAssoc();
+		}
+
+		return null;
+	}
+
+	public function loadAssocList($key = null, $column = null)
+	{
+		if (method_exists($this->dbo, 'loadAssocList'))
+		{
+			return $this->dbo->loadAssocList($key, $column);
+		}
+
+		return null;
+	}
+
+	public function loadObject($class = 'stdClass')
+	{
+		if (method_exists($this->dbo, 'loadObject'))
+		{
+			return $this->dbo->loadObject($class);
+		}
+
+		return null;
+	}
+
+	public function loadObjectList($key = '', $class = 'stdClass')
+	{
+		if (method_exists($this->dbo, 'loadObjectList'))
+		{
+			return $this->dbo->loadObjectList($key, $class);
+		}
+
+		return null;
+	}
+
+	public function loadResult()
+	{
+		if (method_exists($this->dbo, 'loadResult'))
+		{
+			return $this->dbo->loadResult();
+		}
+
+		return null;
+	}
+
+	public function loadRow()
+	{
+		if (method_exists($this->dbo, 'loadRow'))
+		{
+			return $this->dbo->loadRow();
+		}
+
+		return null;
+	}
+
+	public function loadRowList($key = null)
+	{
+		if (method_exists($this->dbo, 'loadRowList'))
+		{
+			return $this->dbo->loadRowList($key);
+		}
+
+		return null;
+	}
+
+	public function lockTable($tableName)
+	{
+		if (method_exists($this->dbo, 'lockTable'))
+		{
+			return $this->dbo->lockTable($this);
+		}
+
+		return $this;
+	}
+
+	public function quote($text, $escape = true)
+	{
+		if (method_exists($this->dbo, 'quote'))
+		{
+			return $this->dbo->quote($text, $escape);
+		}
+
+		return $text;
+	}
+
+	public function select($database)
+	{
+		if (method_exists($this->dbo, 'select'))
+		{
+			return $this->dbo->select($database);
+		}
+
+		return false;
+	}
+
+	public function setQuery($query, $offset = 0, $limit = 0)
+	{
+		if (method_exists($this->dbo, 'setQuery'))
+		{
+			return $this->dbo->setQuery($query, $offset, $limit);
+		}
+
+		return false;
+	}
+
+	public function transactionCommit($toSavepoint = false)
+	{
+		if (method_exists($this->dbo, 'transactionCommit'))
+		{
+			$this->dbo->transactionCommit($toSavepoint);
+		}
+	}
+
+	public function transactionRollback($toSavepoint = false)
+	{
+		if (method_exists($this->dbo, 'transactionRollback'))
+		{
+			$this->dbo->transactionRollback($toSavepoint);
+		}
+	}
+
+	public function transactionStart($asSavepoint = false)
+	{
+		if (method_exists($this->dbo, 'transactionStart'))
+		{
+			$this->dbo->transactionStart($asSavepoint);
+		}
+	}
+
+	public function unlockTables()
+	{
+		if (method_exists($this->dbo, 'unlockTables'))
+		{
+			return $this->dbo->unlockTables();
+		}
+
+		return $this;
+	}
+
+	public function updateObject($table, &$object, $key, $nulls = false)
+	{
+		if (method_exists($this->dbo, 'updateObject'))
+		{
+			return $this->dbo->updateObject($table, $object, $key, $nulls);
+		}
+
+		return false;
+	}
+
+	public function getLog()
+	{
+		if (method_exists($this->dbo, 'getLog'))
+		{
+			return $this->dbo->getLog();
+		}
+
+		return array();
+	}
+
+	public function dropTable($table, $ifExists = true)
+	{
+		if (method_exists($this->dbo, 'dropTable'))
+		{
+			return $this->dbo->dropTable($table, $ifExists);
+		}
+
+		return $this;
+	}
+
+	public function getTableCreate($tables)
+	{
+		if (method_exists($this->dbo, 'getTableCreate'))
+		{
+			return $this->dbo->getTableCreate($tables);
+		}
+
+		return array();
+	}
+
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		if (method_exists($this->dbo, 'renameTable'))
+		{
+			return $this->dbo->renameTable($oldTable, $newTable, $backup, $prefix);
+		}
+
+		return $this;
+	}
+
+	public function setUtf()
+	{
+		if (method_exists($this->dbo, 'setUtf'))
+		{
+			return $this->dbo->setUtf();
+		}
+
+		return false;
+	}
+
+
+	protected function freeResult($cursor = null)
+	{
+		return false;
+	}
+
+	/**
+	 * Method to get an array of values from the <var>$offset</var> field in each row of the result set from
+	 * the database query.
+	 *
+	 * @param   integer  $offset  The row offset to use to build the result array.
+	 *
+	 * @return  mixed    The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadColumn($offset = 0)
+	{
+		if (method_exists($this->dbo, 'loadColumn'))
+		{
+			return $this->dbo->loadColumn($offset);
+		}
+
+		return $this->dbo->loadResultArray($offset);
+	}
+
+	/**
+	 * Wrap an SQL statement identifier name such as column, table or database names in quotes to prevent injection
+	 * risks and reserved word conflicts.
+	 *
+	 * @param   mixed  $name  The identifier name to wrap in quotes, or an array of identifier names to wrap in quotes.
+	 *                        Each type supports dot-notation name.
+	 * @param   mixed  $as    The AS query part associated to $name. It can be string or array, in latter case it has to be
+	 *                        same length of $name; if is null there will not be any AS part for string or array element.
+	 *
+	 * @return  mixed  The quote wrapped name, same type of $name.
+	 *
+	 * @since   11.1
+	 */
+	public function quoteName($name, $as = null)
+	{
+		if (is_string($name))
+		{
+			$quotedName = $this->quoteNameStr(explode('.', $name));
+
+			$quotedAs = '';
+
+			if (!is_null($as))
+			{
+				settype($as, 'array');
+				$quotedAs .= ' AS ' . $this->quoteNameStr($as);
+			}
+
+			return $quotedName . $quotedAs;
+		}
+		else
+		{
+			$fin = array();
+
+			if (is_null($as))
+			{
+				foreach ($name as $str)
+				{
+					$fin[] = $this->quoteName($str);
+				}
+			}
+			elseif (is_array($name) && (count($name) == count($as)))
+			{
+				$count = count($name);
+
+				for ($i = 0; $i < $count; $i++)
+				{
+					$fin[] = $this->quoteName($name[$i], $as[$i]);
+				}
+			}
+
+			return $fin;
+		}
+	}
+
+	/**
+	 * Quote strings coming from quoteName call.
+	 *
+	 * @param   array  $strArr  Array of strings coming from quoteName dot-explosion.
+	 *
+	 * @return  string  Dot-imploded string of quoted parts.
+	 *
+	 * @since 11.3
+	 */
+	protected function quoteNameStr($strArr)
+	{
+		$parts = array();
+		$q = $this->nameQuote;
+
+		foreach ($strArr as $part)
+		{
+			if (is_null($part))
+			{
+				continue;
+			}
+
+			if (strlen($q) == 1)
+			{
+				$parts[] = $q . $part . $q;
+			}
+			else
+			{
+				$parts[] = $q{0} . $part . $q{1};
+			}
+		}
+
+		return implode('.', $parts);
+	}
+
+	/**
+	 * Gets the error message from the database connection.
+	 *
+	 * @param   boolean  $escaped  True to escape the message string for use in JavaScript.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @since   11.1
+	 */
+	public function getErrorMsg($escaped = false)
+	{
+		if (method_exists($this->dbo, 'getErrorMsg'))
+		{
+			$errorMessage = $this->dbo->getErrorMsg();
+		}
+		else
+		{
+			$errorMessage = $this->errorMsg;
+		}
+
+		if ($escaped)
+		{
+			return addslashes($errorMessage);
+		}
+
+		return $errorMessage;
+	}
+
+	/**
+	 * Gets the error number from the database connection.
+	 *
+	 * @return      integer  The error number for the most recent query.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function getErrorNum()
+	{
+		if (method_exists($this->dbo, 'getErrorNum'))
+		{
+			$errorNum = $this->dbo->getErrorNum();
+		}
+		else
+		{
+			$errorNum = $this->getErrorNum;
+		}
+
+		return $errorNum;
+	}
+
+	/**
+	 * Return the most recent error message for the database connector.
+	 *
+	 * @param   boolean  $showSQL  True to display the SQL statement sent to the database as well as the error.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 */
+	public function stderr($showSQL = false)
+	{
+		if (method_exists($this->dbo, 'stderr'))
+		{
+			return $this->dbo->stderr($showSQL);
+		}
+
+		return parent::stderr($showSQL);
+	}
+
+	/**
+	 * Magic method to proxy all calls to the loaded database driver object
+	 */
+	public function __call($name, array $arguments)
+	{
+		if (is_null($this->dbo))
+		{
+			throw new Exception('FOF database driver is not loaded');
+		}
+
+		if (method_exists($this->dbo, $name) || in_array($name, array('q', 'nq', 'qn', 'query')))
+		{
+			switch ($name)
+			{
+				case 'execute':
+					$name = 'query';
+					break;
+
+				case 'q':
+					$name = 'quote';
+					break;
+
+				case 'qn':
+				case 'nq':
+					switch (count($arguments))
+					{
+						case 0 :
+							$result = $this->quoteName();
+							break;
+						case 1 :
+							$result = $this->quoteName($arguments[0]);
+							break;
+						case 2:
+						default:
+							$result = $this->quoteName($arguments[0], $arguments[1]);
+							break;
+					}
+					return $result;
+
+					break;
+			}
+
+			switch (count($arguments))
+			{
+				case 0 :
+					$result = $this->dbo->$name();
+					break;
+				case 1 :
+					$result = $this->dbo->$name($arguments[0]);
+					break;
+				case 2:
+					$result = $this->dbo->$name($arguments[0], $arguments[1]);
+					break;
+				case 3:
+					$result = $this->dbo->$name($arguments[0], $arguments[1], $arguments[2]);
+					break;
+				case 4:
+					$result = $this->dbo->$name($arguments[0], $arguments[1], $arguments[2], $arguments[3]);
+					break;
+				case 5:
+					$result = $this->dbo->$name($arguments[0], $arguments[1], $arguments[2], $arguments[3], $arguments[4]);
+					break;
+				default:
+					// Resort to using call_user_func_array for many segments
+					$result = call_user_func_array(array($this->dbo, $name), $arguments);
+			}
+
+			if (class_exists('JDatabase') && is_object($result) && ($result instanceof JDatabase))
+			{
+				return $this;
+			}
+
+			return $result;
+		}
+		else
+		{
+			throw new \Exception('Method ' . $name . ' not found in FOFDatabase');
+		}
+	}
+
+	public function __get($name)
+	{
+		if (isset($this->dbo->$name) || property_exists($this->dbo, $name))
+		{
+			return $this->dbo->$name;
+		}
+		else
+		{
+			$this->dbo->$name = null;
+			user_error('Database driver does not support property ' . $name);
+		}
+	}
+
+	public function __set($name, $value)
+	{
+		if (isset($this->dbo->name) || property_exists($this->dbo, $name))
+		{
+			$this->dbo->$name = $value;
+		}
+		else
+		{
+			$this->dbo->$name = null;
+			user_error('Database driver not support property ' . $name);
+		}
+	}
+}
diff --git a/core/libraries/fof/database/driver/mysql.php b/core/libraries/fof/database/driver/mysql.php
new file mode 100644
index 00000000..5e35879f
--- /dev/null
+++ b/core/libraries/fof/database/driver/mysql.php
@@ -0,0 +1,577 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQL database driver
+ *
+ * @see         http://dev.mysql.com/doc/
+ * @since       12.1
+ * @deprecated  Will be removed when the minimum supported PHP version no longer includes the deprecated PHP `mysql` extension
+ */
+class FOFDatabaseDriverMysql extends FOFDatabaseDriverMysqli
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'mysql';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  Array of database options with keys: host, user, password, database, select.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// PHP's `mysql` extension is not present in PHP 7, block instantiation in this environment
+		if (PHP_MAJOR_VERSION >= 7)
+		{
+			throw new RuntimeException(
+				'This driver is unsupported in PHP 7, please use the MySQLi or PDO MySQL driver instead.'
+			);
+		}
+
+		// Get some basic values from the options.
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : 'root';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['select'] = (isset($options['select'])) ? (bool) $options['select'] : true;
+
+		// Finalize initialisation.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Make sure the MySQL extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('Could not connect to MySQL.');
+		}
+
+		// Attempt to connect to the server.
+		if (!($this->connection = @ mysql_connect($this->options['host'], $this->options['user'], $this->options['password'], true)))
+		{
+			throw new RuntimeException('Could not connect to MySQL.');
+		}
+
+		// Set sql_mode to non_strict mode
+		mysql_query("SET @@SESSION.sql_mode = '';", $this->connection);
+
+		// If auto-select is enabled select the given database.
+		if ($this->options['select'] && !empty($this->options['database']))
+		{
+			$this->select($this->options['database']);
+		}
+
+		// Pre-populate the UTF-8 Multibyte compatibility flag based on server version
+		$this->utf8mb4 = $this->serverClaimsUtf8mb4Support();
+
+		// Set the character set (needed for MySQL 4.1.2+).
+		$this->utf = $this->setUtf();
+
+		// Turn MySQL profiling ON in debug mode:
+		if ($this->debug && $this->hasProfiling())
+		{
+			mysql_query("SET profiling = 1;", $this->connection);
+		}
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if (is_resource($this->connection))
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			mysql_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		$result = mysql_real_escape_string($text, $this->getConnection());
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test to see if the MySQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return (function_exists('mysql_connect'));
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		if (is_resource($this->connection))
+		{
+			return @mysql_ping($this->connection);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return mysql_affected_rows($this->connection);
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		$this->connect();
+
+		return mysql_num_rows($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		return mysql_get_server_info($this->connection);
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  integer  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		return mysql_insert_id($this->connection);
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		if (!is_resource($this->connection))
+		{
+			if (class_exists('JLog'))
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			}
+			throw new RuntimeException($this->errorMsg, $this->errorNum);
+		}
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof FOFDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			if (class_exists('JLog'))
+			{
+				JLog::add($query, JLog::DEBUG, 'databasequery');
+			}
+
+			$this->timings[] = microtime(true);
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @mysql_query($query, $this->connection);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$this->errorNum = $this->getErrorNumber();
+			$this->errorMsg = $this->getErrorMessage($query);
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage($query);
+
+					// Throw the normal query exception.
+					if (class_exists('JLog'))
+					{
+						JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+					}
+
+					throw new RuntimeException($this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Throw the normal query exception.
+				if (class_exists('JLog'))
+				{
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+				}
+
+				throw new RuntimeException($this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		if (!$database)
+		{
+			return false;
+		}
+
+		if (!mysql_select_db($database, $this->connection))
+		{
+			throw new RuntimeException('Could not connect to database');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		// If UTF is not supported return false immediately
+		if (!$this->utf)
+		{
+			return false;
+		}
+
+		// Make sure we're connected to the server
+		$this->connect();
+
+		// Which charset should I use, plain utf8 or multibyte utf8mb4?
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		$result = @mysql_set_charset($charset, $this->connection);
+
+		/**
+		 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise.
+		 * This happens on old MySQL server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd
+		 * masks the server version and reports only its own we can not be sure if the server actually does support
+		 * UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is undefined in this case we
+		 * catch the error and determine that utf8mb4 is not supported!
+		 */
+		if (!$result && $this->utf8mb4)
+		{
+			$this->utf8mb4 = false;
+			$result = @mysql_set_charset('utf8', $this->connection);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return mysql_fetch_row($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return mysql_fetch_assoc($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return mysql_fetch_object($cursor ? $cursor : $this->cursor, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		mysql_free_result($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Internal function to check if profiling is available
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1.3
+	 */
+	private function hasProfiling()
+	{
+		try
+		{
+			$res = mysql_query("SHOW VARIABLES LIKE 'have_profiling'", $this->connection);
+			$row = mysql_fetch_assoc($res);
+
+			return isset($row);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Does the database server claim to have support for UTF-8 Multibyte (utf8mb4) collation?
+	 *
+	 * libmysql supports utf8mb4 since 5.5.3 (same version as the MySQL server). mysqlnd supports utf8mb4 since 5.0.9.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	private function serverClaimsUtf8mb4Support()
+	{
+		$client_version = mysql_get_client_info();
+
+		if (strpos($client_version, 'mysqlnd') !== false)
+		{
+			$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+
+			return version_compare($client_version, '5.0.9', '>=');
+		}
+		else
+		{
+			return version_compare($client_version, '5.5.3', '>=');
+		}
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) mysql_errno($this->connection);
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @param   string  $query  The SQL Query that fails
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage($query)
+	{
+		$errorMessage = (string) mysql_error($this->connection);
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+			$query        = str_replace($this->tablePrefix, '#__', $query);
+		}
+
+		return $errorMessage . ' SQL=' . $query;
+	}
+}
diff --git a/core/libraries/fof/database/driver/mysqli.php b/core/libraries/fof/database/driver/mysqli.php
new file mode 100644
index 00000000..bc271f1c
--- /dev/null
+++ b/core/libraries/fof/database/driver/mysqli.php
@@ -0,0 +1,1019 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQLi database driver
+ *
+ * @see    http://php.net/manual/en/book.mysqli.php
+ * @since  12.1
+ */
+class FOFDatabaseDriverMysqli extends FOFDatabaseDriver
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'mysqli';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'mysql';
+
+	/**
+	 * @var    mysqli  The database connection resource.
+	 * @since  11.1
+	 */
+	protected $connection;
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc. The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $nameQuote = '`';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $nullDate = '0000-00-00 00:00:00';
+
+	/**
+	 * @var    string  The minimum supported database version.
+	 * @since  12.2
+	 */
+	protected static $dbMinimum = '5.0.4';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['host']     = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user']     = (isset($options['user'])) ? $options['user'] : 'root';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['select']   = (isset($options['select'])) ? (bool) $options['select'] : true;
+		$options['port']     = null;
+		$options['socket']   = null;
+
+		// Finalize initialisation.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		/*
+		 * Unlike mysql_connect(), mysqli_connect() takes the port and socket as separate arguments. Therefore, we
+		 * have to extract them from the host string.
+		 */
+		$port = isset($this->options['port']) ? $this->options['port'] : 3306;
+		$regex = '/^(?P<host>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:(?P<port>.+))?$/';
+
+		if (preg_match($regex, $this->options['host'], $matches))
+		{
+			// It's an IPv4 address with ot without port
+			$this->options['host'] = $matches['host'];
+
+			if (!empty($matches['port']))
+			{
+				$port = $matches['port'];
+			}
+		}
+		elseif (preg_match('/^(?P<host>\[.*\])(:(?P<port>.+))?$/', $this->options['host'], $matches))
+		{
+			// We assume square-bracketed IPv6 address with or without port, e.g. [fe80:102::2%eth1]:3306
+			$this->options['host'] = $matches['host'];
+
+			if (!empty($matches['port']))
+			{
+				$port = $matches['port'];
+			}
+		}
+		elseif (preg_match('/^(?P<host>(\w+:\/{2,3})?[a-z0-9\.\-]+)(:(?P<port>[^:]+))?$/i', $this->options['host'], $matches))
+		{
+			// Named host (e.g domain.com or localhost) with ot without port
+			$this->options['host'] = $matches['host'];
+
+			if (!empty($matches['port']))
+			{
+				$port = $matches['port'];
+			}
+		}
+		elseif (preg_match('/^:(?P<port>[^:]+)$/', $this->options['host'], $matches))
+		{
+			// Empty host, just port, e.g. ':3306'
+			$this->options['host'] = 'localhost';
+			$port = $matches['port'];
+		}
+		// ... else we assume normal (naked) IPv6 address, so host and port stay as they are or default
+
+		// Get the port number or socket name
+		if (is_numeric($port))
+		{
+			$this->options['port'] = (int) $port;
+		}
+		else
+		{
+			$this->options['socket'] = $port;
+		}
+
+		// Make sure the MySQLi extension for PHP is installed and enabled.
+		if (!function_exists('mysqli_connect'))
+		{
+			throw new RuntimeException('The MySQL adapter mysqli is not available');
+		}
+
+		$this->connection = @mysqli_connect(
+			$this->options['host'], $this->options['user'], $this->options['password'], null, $this->options['port'], $this->options['socket']
+		);
+
+		// Attempt to connect to the server.
+		if (!$this->connection)
+		{
+			throw new RuntimeException('Could not connect to MySQL.');
+		}
+
+		// Set sql_mode to non_strict mode
+		mysqli_query($this->connection, "SET @@SESSION.sql_mode = '';");
+
+		// If auto-select is enabled select the given database.
+		if ($this->options['select'] && !empty($this->options['database']))
+		{
+			$this->select($this->options['database']);
+		}
+
+		// Pre-populate the UTF-8 Multibyte compatibility flag based on server version
+		$this->utf8mb4 = $this->serverClaimsUtf8mb4Support();
+
+		// Set the character set (needed for MySQL 4.1.2+).
+		$this->utf = $this->setUtf();
+
+		// Turn MySQL profiling ON in debug mode:
+		if ($this->debug && $this->hasProfiling())
+		{
+			mysqli_query($this->connection, "SET profiling_history_size = 100;");
+			mysqli_query($this->connection, "SET profiling = 1;");
+		}
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if ($this->connection)
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			mysqli_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		$result = mysqli_real_escape_string($this->getConnection(), $text);
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test to see if the MySQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return (function_exists('mysqli_connect'));
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		if (is_object($this->connection))
+		{
+			return mysqli_ping($this->connection);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  FOFDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$this->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $query->quoteName($tableName));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return mysqli_affected_rows($this->connection);
+	}
+
+	/**
+	 * Method to get the database collation.
+	 *
+	 * @return  mixed  The collation in use by the database (string) or boolean false if not supported.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_database"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_connection"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		return mysqli_num_rows($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		$result = array();
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		foreach ($tables as $table)
+		{
+			// Set the query to get the table CREATE statement.
+			$this->setQuery('SHOW CREATE table ' . $this->quoteName($this->escape($table)));
+			$row = $this->loadRow();
+
+			// Populate the result array based on the create statements.
+			$result[$table] = $row[1];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$result = array();
+
+		// Set the query to get the table fields statement.
+		$this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)));
+		$fields = $this->loadObjectList();
+
+		// If we only want the type as the value add just that to the list.
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = preg_replace("/[(0-9)]/", '', $field->Type);
+			}
+		}
+		// If we want the whole field data object add that to the list.
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = $field;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// Get the details columns information.
+		$this->setQuery('SHOW KEYS FROM ' . $this->quoteName($table));
+		$keys = $this->loadObjectList();
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		// Set the query to get the tables statement.
+		$this->setQuery('SHOW TABLES');
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		return mysqli_get_server_info($this->connection);
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  mixed  The value of the auto-increment field from the last inserted row.
+	 *                 If the value is greater than maximal int value, it will return a string.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		return mysqli_insert_id($this->connection);
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  FOFDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		$this->setQuery('LOCK TABLES ' . $this->quoteName($table) . ' WRITE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		if (!is_object($this->connection))
+		{
+			if (class_exists('JLog'))
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			}
+			throw new RuntimeException($this->errorMsg, $this->errorNum);
+		}
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof FOFDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+		$memoryBefore   = null;
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			if (class_exists('JLog'))
+			{
+				JLog::add($query, JLog::DEBUG, 'databasequery');
+			}
+
+			$this->timings[] = microtime(true);
+
+			if (is_object($this->cursor))
+			{
+				// Avoid warning if result already freed by third-party library
+				@$this->freeResult();
+			}
+
+			$memoryBefore = memory_get_usage();
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @mysqli_query($this->connection, $query);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+
+			$this->callStacks[count($this->callStacks) - 1][0]['memory'] = array(
+				$memoryBefore,
+				memory_get_usage(),
+				is_object($this->cursor) ? $this->getNumRows() : null
+			);
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$this->errorNum = $this->getErrorNumber();
+			$this->errorMsg = $this->getErrorMessage($query);
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage($query);
+
+					if (class_exists('JLog'))
+					{
+						JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+					}
+
+					throw new RuntimeException($this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				if (class_exists('JLog'))
+				{
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+				}
+
+				throw new RuntimeException($this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by MySQL.
+	 * @param   string  $prefix    Not used by MySQL.
+	 *
+	 * @return  FOFDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('RENAME TABLE ' . $oldTable . ' TO ' . $newTable)->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		if (!$database)
+		{
+			return false;
+		}
+
+		if (!mysqli_select_db($this->connection, $database))
+		{
+			throw new RuntimeException('Could not connect to database.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		// If UTF is not supported return false immediately
+		if (!$this->utf)
+		{
+			return false;
+		}
+
+		// Make sure we're connected to the server
+		$this->connect();
+
+		// Which charset should I use, plain utf8 or multibyte utf8mb4?
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		$result = @$this->connection->set_charset($charset);
+
+		/**
+		 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise.
+		 * This happens on old MySQL server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd
+		 * masks the server version and reports only its own we can not be sure if the server actually does support
+		 * UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is undefined in this case we
+		 * catch the error and determine that utf8mb4 is not supported!
+		 */
+		if (!$result && $this->utf8mb4)
+		{
+			$this->utf8mb4 = false;
+			$result = @$this->connection->set_charset('utf8');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('COMMIT')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('ROLLBACK')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . ($this->transactionDepth - 1);
+		$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			if ($this->setQuery('START TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 1;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return mysqli_fetch_row($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return mysqli_fetch_assoc($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return mysqli_fetch_object($cursor ? $cursor : $this->cursor, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		mysqli_free_result($cursor ? $cursor : $this->cursor);
+
+		if ((! $cursor) || ($cursor === $this->cursor))
+		{
+			$this->cursor = null;
+		}
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  FOFDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->setQuery('UNLOCK TABLES')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Internal function to check if profiling is available
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1.3
+	 */
+	private function hasProfiling()
+	{
+		try
+		{
+			$res = mysqli_query($this->connection, "SHOW VARIABLES LIKE 'have_profiling'");
+			$row = mysqli_fetch_assoc($res);
+
+			return isset($row);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Does the database server claim to have support for UTF-8 Multibyte (utf8mb4) collation?
+	 *
+	 * libmysql supports utf8mb4 since 5.5.3 (same version as the MySQL server). mysqlnd supports utf8mb4 since 5.0.9.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	private function serverClaimsUtf8mb4Support()
+	{
+		$client_version = mysqli_get_client_info();
+
+		if (strpos($client_version, 'mysqlnd') !== false)
+		{
+			$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+
+			return version_compare($client_version, '5.0.9', '>=');
+		}
+		else
+		{
+			return version_compare($client_version, '5.5.3', '>=');
+		}
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) mysqli_errno($this->connection);
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @param   string  $query  The SQL Query that fails
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage($query)
+	{
+		$errorMessage = (string) mysqli_error($this->connection);
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+			$query        = str_replace($this->tablePrefix, '#__', $query);
+		}
+
+		return $errorMessage . ' SQL=' . $query;
+	}
+}
diff --git a/core/libraries/fof/database/driver/oracle.php b/core/libraries/fof/database/driver/oracle.php
new file mode 100644
index 00000000..155246e5
--- /dev/null
+++ b/core/libraries/fof/database/driver/oracle.php
@@ -0,0 +1,712 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Oracle database driver
+ *
+ * @see    http://php.net/pdo
+ * @since  12.1
+ */
+class FOFDatabaseDriverOracle extends FOFDatabaseDriverPdo
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'oracle';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'oracle';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '"';
+
+	/**
+	 * Returns the current dateformat
+	 *
+	 * @var   string
+	 * @since 12.1
+	 */
+	protected $dateformat;
+
+	/**
+	 * Returns the current character set
+	 *
+	 * @var   string
+	 * @since 12.1
+	 */
+	protected $charset;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		$options['driver'] = 'oci';
+		$options['charset']    = (isset($options['charset'])) ? $options['charset']   : 'AL32UTF8';
+		$options['dateformat'] = (isset($options['dateformat'])) ? $options['dateformat'] : 'RRRR-MM-DD HH24:MI:SS';
+
+		$this->charset = $options['charset'];
+		$this->dateformat = $options['dateformat'];
+
+		// Finalize initialisation
+		parent::__construct($options);
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->freeResult();
+		unset($this->connection);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		parent::connect();
+
+		if (isset($this->options['schema']))
+		{
+			$this->setQuery('ALTER SESSION SET CURRENT_SCHEMA = ' . $this->quoteName($this->options['schema']))->execute();
+		}
+
+		$this->setDateFormat($this->dateformat);
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		$this->freeResult();
+		unset($this->connection);
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * Note: The IF EXISTS flag is unused in the Oracle driver.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  FOFDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true)
+			->setQuery('DROP TABLE :tableName');
+		$query->bind(':tableName', $tableName);
+
+		$this->setQuery($query);
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 */
+	public function getCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Get a query to run and verify the database is operational.
+	 *
+	 * @return  string  The query to check the health of the DB.
+	 *
+	 * @since   12.2
+	 */
+	public function getConnectedQuery()
+	{
+		return 'SELECT 1 FROM dual';
+	}
+
+	/**
+	 * Returns the current date format
+	 * This method should be useful in the case that
+	 * somebody actually wants to use a different
+	 * date format and needs to check what the current
+	 * one is to see if it needs to be changed.
+	 *
+	 * @return string The current date format
+	 *
+	 * @since 12.1
+	 */
+	public function getDateFormat()
+	{
+		return $this->dateformat;
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * Note: You must have the correct privileges before this method
+	 * will return usable results!
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		$result = array();
+		$query = $this->getQuery(true)
+			->select('dbms_metadata.get_ddl(:type, :tableName)')
+			->from('dual')
+			->bind(':type', 'TABLE');
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		foreach ($tables as $table)
+		{
+			$query->bind(':tableName', $table);
+			$this->setQuery($query);
+			$statement = (string) $this->loadResult();
+			$result[$table] = $statement;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$columns = array();
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+
+		$query->select('*');
+		$query->from('ALL_TAB_COLUMNS');
+		$query->where('table_name = :tableName');
+
+		$prefixedTable = str_replace('#__', strtoupper($this->tablePrefix), $table);
+		$query->bind(':tableName', $prefixedTable);
+		$this->setQuery($query);
+		$fields = $this->loadObjectList();
+
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$columns[$field->COLUMN_NAME] = $field->DATA_TYPE;
+			}
+		}
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$columns[$field->COLUMN_NAME] = $field;
+				$columns[$field->COLUMN_NAME]->Default = null;
+			}
+		}
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $columns;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+		$query->select('*')
+			->from('ALL_CONSTRAINTS')
+			->where('table_name = :tableName')
+			->bind(':tableName', $table);
+
+		$this->setQuery($query);
+		$keys = $this->loadObjectList();
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database (schema).
+	 *
+	 * @param   string   $databaseName         The database (schema) name
+	 * @param   boolean  $includeDatabaseName  Whether to include the schema name in the results
+	 *
+	 * @return  array    An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList($databaseName = null, $includeDatabaseName = false)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		if ($includeDatabaseName)
+		{
+			$query->select('owner, table_name');
+		}
+		else
+		{
+			$query->select('table_name');
+		}
+
+		$query->from('all_tables');
+
+		if ($databaseName)
+		{
+			$query->where('owner = :database')
+				->bind(':database', $databaseName);
+		}
+
+		$query->order('table_name');
+
+		$this->setQuery($query);
+
+		if ($includeDatabaseName)
+		{
+			$tables = $this->loadAssocList();
+		}
+		else
+		{
+			$tables = $this->loadColumn();
+		}
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		$this->setQuery("select value from nls_database_parameters where parameter = 'NLS_RDBMS_VERSION'");
+
+		return $this->loadResult();
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		return true;
+	}
+
+	/**
+	 * Sets the Oracle Date Format for the session
+	 * Default date format for Oracle is = DD-MON-RR
+	 * The default date format for this driver is:
+	 * 'RRRR-MM-DD HH24:MI:SS' since it is the format
+	 * that matches the MySQL one used within most Joomla
+	 * tables.
+	 *
+	 * @param   string  $dateFormat  Oracle Date Format String
+	 *
+	 * @return boolean
+	 *
+	 * @since  12.1
+	 */
+	public function setDateFormat($dateFormat = 'DD-MON-RR')
+	{
+		$this->connect();
+
+		$this->setQuery("ALTER SESSION SET NLS_DATE_FORMAT = '$dateFormat'");
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		$this->setQuery("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = '$dateFormat'");
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		$this->dateformat = $dateFormat;
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * Returns false automatically for the Oracle driver since
+	 * you can only set the character set when the connection
+	 * is created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		return false;
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  FOFDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		$this->setQuery('LOCK TABLE ' . $this->quoteName($table) . ' IN EXCLUSIVE MODE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by Oracle.
+	 * @param   string  $prefix    Not used by Oracle.
+	 *
+	 * @return  FOFDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('RENAME ' . $oldTable . ' TO ' . $newTable)->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  FOFDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->setQuery('COMMIT')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Test to see if the PDO ODBC connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return class_exists('PDO') && in_array('oci', PDO::getAvailableDrivers());
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $query   The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   11.1
+	 */
+	public function replacePrefix($query, $prefix = '#__')
+	{
+		$startPos = 0;
+		$quoteChar = "'";
+		$literal = '';
+
+		$query = trim($query);
+		$n = strlen($query);
+
+		while ($startPos < $n)
+		{
+			$ip = strpos($query, $prefix, $startPos);
+
+			if ($ip === false)
+			{
+				break;
+			}
+
+			$j = strpos($query, "'", $startPos);
+
+			if ($j === false)
+			{
+				$j = $n;
+			}
+
+			$literal .= str_replace($prefix, $this->tablePrefix, substr($query, $startPos, $j - $startPos));
+			$startPos = $j;
+
+			$j = $startPos + 1;
+
+			if ($j >= $n)
+			{
+				break;
+			}
+
+			// Quote comes first, find end of quote
+			while (true)
+			{
+				$k = strpos($query, $quoteChar, $j);
+				$escaped = false;
+
+				if ($k === false)
+				{
+					break;
+				}
+
+				$l = $k - 1;
+
+				while ($l >= 0 && $query{$l} == '\\')
+				{
+					$l--;
+					$escaped = !$escaped;
+				}
+
+				if ($escaped)
+				{
+					$j = $k + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			if ($k === false)
+			{
+				// Error in the query - no end quote; ignore it
+				break;
+			}
+
+			$literal .= substr($query, $startPos, $k - $startPos + 1);
+			$startPos = $k + 1;
+		}
+
+		if ($startPos < $n)
+		{
+			$literal .= substr($query, $startPos, $n - $startPos);
+		}
+
+		return $literal;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionCommit($toSavepoint);
+		}
+		else
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionRollback($toSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . ($this->transactionDepth - 1);
+			$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth--;
+			}
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			return parent::transactionStart($asSavepoint);
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+}
diff --git a/core/libraries/fof/database/driver/pdo.php b/core/libraries/fof/database/driver/pdo.php
new file mode 100644
index 00000000..ebc59eff
--- /dev/null
+++ b/core/libraries/fof/database/driver/pdo.php
@@ -0,0 +1,1106 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Joomla Platform PDO Database Driver Class
+ *
+ * @see    http://php.net/pdo
+ * @since  12.1
+ */
+abstract class FOFDatabaseDriverPdo extends FOFDatabaseDriver
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'pdo';
+
+	/**
+	 * @var    PDO  The database connection resource.
+	 * @since  12.1
+	 */
+	protected $connection;
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = "'";
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nullDate = '0000-00-00 00:00:00';
+
+	/**
+	 * @var    resource  The prepared statement.
+	 * @since  12.1
+	 */
+	protected $prepared;
+
+	/**
+	 * Contains the current query execution status
+	 *
+	 * @var array
+	 * @since 12.1
+	 */
+	protected $executed = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['driver'] = (isset($options['driver'])) ? $options['driver'] : 'odbc';
+		$options['dsn'] = (isset($options['dsn'])) ? $options['dsn'] : '';
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['driverOptions'] = (isset($options['driverOptions'])) ? $options['driverOptions'] : array();
+
+		$hostParts = explode(':', $options['host']);
+
+		if (!empty($hostParts[1]))
+		{
+			$options['host'] = $hostParts[0];
+			$options['port'] = $hostParts[1];
+		}
+
+		// Finalize initialisation
+		parent::__construct($options);
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Make sure the PDO extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('PDO Extension is not available.', 1);
+		}
+
+		$replace = array();
+		$with = array();
+
+		// Find the correct PDO DSN Format to use:
+		switch ($this->options['driver'])
+		{
+			case 'cubrid':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 33000;
+
+				$format = 'cubrid:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			case 'dblib':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1433;
+
+				$format = 'dblib:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			case 'firebird':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 3050;
+
+				$format = 'firebird:dbname=#DBNAME#';
+
+				$replace = array('#DBNAME#');
+				$with = array($this->options['database']);
+
+				break;
+
+			case 'ibm':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 56789;
+
+				if (!empty($this->options['dsn']))
+				{
+					$format = 'ibm:DSN=#DSN#';
+
+					$replace = array('#DSN#');
+					$with = array($this->options['dsn']);
+				}
+				else
+				{
+					$format = 'ibm:hostname=#HOST#;port=#PORT#;database=#DBNAME#';
+
+					$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+					$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+				}
+
+				break;
+
+			case 'informix':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1526;
+				$this->options['protocol'] = (isset($this->options['protocol'])) ? $this->options['protocol'] : 'onsoctcp';
+
+				if (!empty($this->options['dsn']))
+				{
+					$format = 'informix:DSN=#DSN#';
+
+					$replace = array('#DSN#');
+					$with = array($this->options['dsn']);
+				}
+				else
+				{
+					$format = 'informix:host=#HOST#;service=#PORT#;database=#DBNAME#;server=#SERVER#;protocol=#PROTOCOL#';
+
+					$replace = array('#HOST#', '#PORT#', '#DBNAME#', '#SERVER#', '#PROTOCOL#');
+					$with = array($this->options['host'], $this->options['port'], $this->options['database'], $this->options['server'], $this->options['protocol']);
+				}
+
+				break;
+
+			case 'mssql':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1433;
+
+				$format = 'mssql:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			// The pdomysql case is a special case within the CMS environment
+			case 'pdomysql':
+			case 'mysql':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 3306;
+
+				$format = 'mysql:host=#HOST#;port=#PORT#;dbname=#DBNAME#;charset=#CHARSET#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#', '#CHARSET#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database'], $this->options['charset']);
+
+				break;
+
+			case 'oci':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1521;
+				$this->options['charset'] = (isset($this->options['charset'])) ? $this->options['charset'] : 'AL32UTF8';
+
+				if (!empty($this->options['dsn']))
+				{
+					$format = 'oci:dbname=#DSN#';
+
+					$replace = array('#DSN#');
+					$with = array($this->options['dsn']);
+				}
+				else
+				{
+					$format = 'oci:dbname=//#HOST#:#PORT#/#DBNAME#';
+
+					$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+					$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+				}
+
+				$format .= ';charset=' . $this->options['charset'];
+
+				break;
+
+			case 'odbc':
+				$format = 'odbc:DSN=#DSN#;UID:#USER#;PWD=#PASSWORD#';
+
+				$replace = array('#DSN#', '#USER#', '#PASSWORD#');
+				$with = array($this->options['dsn'], $this->options['user'], $this->options['password']);
+
+				break;
+
+			case 'pgsql':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 5432;
+
+				$format = 'pgsql:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			case 'sqlite':
+				if (isset($this->options['version']) && $this->options['version'] == 2)
+				{
+					$format = 'sqlite2:#DBNAME#';
+				}
+				else
+				{
+					$format = 'sqlite:#DBNAME#';
+				}
+
+				$replace = array('#DBNAME#');
+				$with = array($this->options['database']);
+
+				break;
+
+			case 'sybase':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1433;
+
+				$format = 'mssql:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+		}
+
+		// Create the connection string:
+		$connectionString = str_replace($replace, $with, $format);
+
+		try
+		{
+			$this->connection = new PDO(
+				$connectionString,
+				$this->options['user'],
+				$this->options['password'],
+				$this->options['driverOptions']
+			);
+		}
+		catch (PDOException $e)
+		{
+			throw new RuntimeException('Could not connect to PDO: ' . $e->getMessage(), 2, $e);
+		}
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		foreach ($this->disconnectHandlers as $h)
+		{
+			call_user_func_array($h, array( &$this));
+		}
+
+		$this->freeResult();
+		unset($this->connection);
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * Oracle escaping reference:
+	 * http://www.orafaq.com/wiki/SQL_FAQ#How_does_one_escape_special_characters_when_writing_SQL_queries.3F
+	 *
+	 * SQLite escaping notes:
+	 * http://www.sqlite.org/faq.html#q14
+	 *
+	 * Method body is as implemented by the Zend Framework
+	 *
+	 * Note: Using query objects with bound variables is
+	 * preferable to the below.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Unused optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		if (is_int($text) || is_float($text))
+		{
+			return $text;
+		}
+
+		$text = str_replace("'", "''", $text);
+
+		return addcslashes($text, "\000\n\r\\\032");
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @throws  Exception
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		if (!is_object($this->connection))
+		{
+			if (class_exists('JLog'))
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			}
+			throw new RuntimeException($this->errorMsg, $this->errorNum);
+		}
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof FOFDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			// @TODO
+			$query .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			if (class_exists('JLog'))
+			{
+				JLog::add($query, JLog::DEBUG, 'databasequery');
+			}
+
+			$this->timings[] = microtime(true);
+		}
+
+		// Execute the query.
+		$this->executed = false;
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			// Bind the variables:
+			if ($this->sql instanceof FOFDatabaseQueryPreparable)
+			{
+				$bounded = $this->sql->getBounded();
+
+				foreach ($bounded as $key => $obj)
+				{
+					$this->prepared->bindParam($key, $obj->value, $obj->dataType, $obj->length, $obj->driverOptions);
+				}
+			}
+
+			$this->executed = $this->prepared->execute();
+		}
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->executed)
+		{
+			// Get the error number and message before we execute any more queries.
+			$errorNum = $this->getErrorNumber();
+			$errorMsg = $this->getErrorMessage($query);
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage($query);
+
+					// Throw the normal query exception.
+					if (class_exists('JLog'))
+					{
+						JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+					}
+
+					throw new RuntimeException($this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Get the error number and message from before we tried to reconnect.
+				$this->errorNum = $errorNum;
+				$this->errorMsg = $errorMsg;
+
+				// Throw the normal query exception.
+				if (class_exists('JLog'))
+				{
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+				}
+
+				throw new RuntimeException($this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->prepared;
+	}
+
+	/**
+	 * Retrieve a PDO database connection attribute
+	 * http://www.php.net/manual/en/pdo.getattribute.php
+	 *
+	 * Usage: $db->getOption(PDO::ATTR_CASE);
+	 *
+	 * @param   mixed  $key  One of the PDO::ATTR_* Constants
+	 *
+	 * @return mixed
+	 *
+	 * @since  12.1
+	 */
+	public function getOption($key)
+	{
+		$this->connect();
+
+		return $this->connection->getAttribute($key);
+	}
+
+	/**
+	 * Get a query to run and verify the database is operational.
+	 *
+	 * @return  string  The query to check the health of the DB.
+	 *
+	 * @since   12.2
+	 */
+	public function getConnectedQuery()
+	{
+		return 'SELECT 1';
+	}
+
+	/**
+	 * Sets an attribute on the PDO database handle.
+	 * http://www.php.net/manual/en/pdo.setattribute.php
+	 *
+	 * Usage: $db->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+	 *
+	 * @param   integer  $key    One of the PDO::ATTR_* Constants
+	 * @param   mixed    $value  One of the associated PDO Constants
+	 *                           related to the particular attribute
+	 *                           key.
+	 *
+	 * @return boolean
+	 *
+	 * @since  12.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->connect();
+
+		return $this->connection->setAttribute($key, $value);
+	}
+
+	/**
+	 * Test to see if the PDO extension is available.
+	 * Override as needed to check for specific PDO Drivers.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return defined('PDO::ATTR_DRIVER_NAME');
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		// Flag to prevent recursion into this function.
+		static $checkingConnected = false;
+
+		if ($checkingConnected)
+		{
+			// Reset this flag and throw an exception.
+			$checkingConnected = true;
+			die('Recursion trying to check if connected.');
+		}
+
+		// Backup the query state.
+		$query = $this->sql;
+		$limit = $this->limit;
+		$offset = $this->offset;
+		$prepared = $this->prepared;
+
+		try
+		{
+			// Set the checking connection flag.
+			$checkingConnected = true;
+
+			// Run a simple query to check the connection.
+			$this->setQuery($this->getConnectedQuery());
+			$status = (bool) $this->loadResult();
+		}
+		// If we catch an exception here, we must not be connected.
+		catch (Exception $e)
+		{
+			$status = false;
+		}
+
+		// Restore the query state.
+		$this->sql = $query;
+		$this->limit = $limit;
+		$this->offset = $offset;
+		$this->prepared = $prepared;
+		$checkingConnected = false;
+
+		return $status;
+	}
+
+	/**
+	 * Get the number of affected rows for the previous executed SQL statement.
+	 * Only applicable for DELETE, INSERT, or UPDATE statements.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->rowCount();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * Only applicable for DELETE, INSERT, or UPDATE statements.
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		$this->connect();
+
+		if ($cursor instanceof PDOStatement)
+		{
+			return $cursor->rowCount();
+		}
+		elseif ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->rowCount();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  string  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		// Error suppress this to prevent PDO warning us that the driver doesn't support this operation.
+		return @$this->connection->lastInsertId();
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		return true;
+	}
+
+	/**
+	 * Sets the SQL statement string for later execution.
+	 *
+	 * @param   mixed    $query          The SQL statement to set either as a FOFDatabaseQuery object or a string.
+	 * @param   integer  $offset         The affected row offset to set.
+	 * @param   integer  $limit          The maximum affected rows to set.
+	 * @param   array    $driverOptions  The optional PDO driver options.
+	 *
+	 * @return  FOFDatabaseDriver  This object to support method chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setQuery($query, $offset = null, $limit = null, $driverOptions = array())
+	{
+		$this->connect();
+
+		$this->freeResult();
+
+		if (is_string($query))
+		{
+			// Allows taking advantage of bound variables in a direct query:
+			$query = $this->getQuery(true)->setQuery($query);
+		}
+
+		if ($query instanceof FOFDatabaseQueryLimitable && !is_null($offset) && !is_null($limit))
+		{
+			$query = $query->processLimit($query, $limit, $offset);
+		}
+
+		// Create a stringified version of the query (with prefixes replaced):
+		$sql = $this->replacePrefix((string) $query);
+
+		// Use the stringified version in the prepare call:
+		$this->prepared = $this->connection->prepare($sql, $driverOptions);
+
+		// Store reference to the original FOFDatabaseQuery instance within the class.
+		// This is important since binding variables depends on it within execute():
+		parent::setQuery($query, $offset, $limit);
+
+		return $this;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		return false;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth == 1)
+		{
+			$this->connection->commit();
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth == 1)
+		{
+			$this->connection->rollBack();
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			$this->connection->beginTransaction();
+		}
+
+		$this->transactionDepth++;
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		if (!empty($cursor) && $cursor instanceof PDOStatement)
+		{
+			return $cursor->fetch(PDO::FETCH_NUM);
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->fetch(PDO::FETCH_NUM);
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		if (!empty($cursor) && $cursor instanceof PDOStatement)
+		{
+			return $cursor->fetch(PDO::FETCH_ASSOC);
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->fetch(PDO::FETCH_ASSOC);
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   Unused, only necessary so method signature will be the same as parent.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		if (!empty($cursor) && $cursor instanceof PDOStatement)
+		{
+			return $cursor->fetchObject($class);
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->fetchObject($class);
+		}
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		$this->executed = false;
+
+		if ($cursor instanceof PDOStatement)
+		{
+			$cursor->closeCursor();
+			$cursor = null;
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			$this->prepared->closeCursor();
+			$this->prepared = null;
+		}
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an object.
+	 *
+	 * @param   string  $class  The class name to use for the returned row object.
+	 *
+	 * @return  mixed   The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @deprecated  4.0 (CMS)  Use getIterator() instead
+	 */
+	public function loadNextObject($class = 'stdClass')
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add(__METHOD__ . '() is deprecated. Use FOFDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		}
+		$this->connect();
+
+		// Execute the query and get the result set cursor.
+		if (!$this->executed)
+		{
+			if (!($this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchObject(null, $class))
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult();
+
+		return false;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an array.
+	 *
+	 * @return  mixed  The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function loadNextAssoc()
+	{
+		$this->connect();
+
+		// Execute the query and get the result set cursor.
+		if (!$this->executed)
+		{
+			if (!($this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchAssoc())
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult();
+
+		return false;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an array.
+	 *
+	 * @return  mixed  The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @deprecated  4.0 (CMS)  Use getIterator() instead
+	 */
+	public function loadNextRow()
+	{
+		if (class_exists('JLog'))
+		{
+			JLog::add(__METHOD__ . '() is deprecated. Use FOFDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		}
+		$this->connect();
+
+		// Execute the query and get the result set cursor.
+		if (!$this->executed)
+		{
+			if (!($this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchArray())
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult();
+
+		return false;
+	}
+
+	/**
+	 * PDO does not support serialize
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function __sleep()
+	{
+		$serializedProperties = array();
+
+		$reflect = new ReflectionClass($this);
+
+		// Get properties of the current class
+		$properties = $reflect->getProperties();
+
+		foreach ($properties as $property)
+		{
+			// Do not serialize properties that are PDO
+			if ($property->isStatic() == false && !($this->{$property->name} instanceof PDO))
+			{
+				array_push($serializedProperties, $property->name);
+			}
+		}
+
+		return $serializedProperties;
+	}
+
+	/**
+	 * Wake up after serialization
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function __wakeup()
+	{
+		// Get connection back
+		$this->__construct($this->options);
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) $this->connection->errorCode();
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @param   string  $query  The SQL Query that fails
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage($query)
+	{
+		// Note we ignoring $query here as it not used in the original code.
+
+		// The SQL Error Information
+		$errorInfo = implode(", ", $this->connection->errorInfo());
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorInfo = str_replace($this->tablePrefix, '#__', $errorInfo);
+		}
+
+		return 'SQL: ' . $errorInfo;
+	}
+}
diff --git a/core/libraries/fof/database/driver/pdomysql.php b/core/libraries/fof/database/driver/pdomysql.php
new file mode 100644
index 00000000..8e975747
--- /dev/null
+++ b/core/libraries/fof/database/driver/pdomysql.php
@@ -0,0 +1,559 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQL database driver supporting PDO based connections
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @see         http://php.net/manual/en/ref.pdo-mysql.php
+ * @since       3.4
+ */
+class FOFDatabaseDriverPdomysql extends FOFDatabaseDriverPdo
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	public $name = 'pdomysql';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'mysql';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc. The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $nameQuote = '`';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $nullDate = '0000-00-00 00:00:00';
+
+	/**
+	 * The minimum supported database version.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected static $dbMinimum = '5.0.4';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  Array of database options with keys: host, user, password, database, select.
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($options)
+	{
+		/**
+		 * Pre-populate the UTF-8 Multibyte compatibility flag. Unfortuantely PDO won't report the server version
+		 * unless we're connected to it and we cannot connect to it unless we know if it supports utf8mb4 which requires
+		 * us knowing the server version. Between this chicken and egg issue we _assume_ it's supported and we'll just
+		 * catch any problems at connection time.
+		 */
+		$this->utf8mb4 = true;
+
+		// Get some basic values from the options.
+		$options['driver']  = 'mysql';
+		$options['charset'] = (isset($options['charset'])) ? $options['charset'] : 'utf8';
+
+		if ($this->utf8mb4 && ($options['charset'] == 'utf8'))
+		{
+			$options['charset'] = 'utf8mb4';
+		}
+
+		$this->charset = $options['charset'];
+
+		// Finalize initialisation.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		try
+		{
+			// Try to connect to MySQL
+			parent::connect();
+		}
+		catch (\RuntimeException $e)
+		{
+			// If the connection failed but not because of the wrong character set bubble up the exception
+			if (!$this->utf8mb4 || ($this->options['charset'] != 'utf8mb4'))
+			{
+				throw $e;
+			}
+
+			/**
+			 * If the connection failed and I was trying to use the utf8mb4 charset then it is likely that the server
+			 * doesn't support utf8mb4 despite claiming otherwise.
+			 *
+			 * This happens on old MySQL server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd
+			 * masks the server version and reports only its own we can not be sure if the server actually does support
+			 * UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is undefined in this case we
+			 * catch the error and determine that utf8mb4 is not supported!
+			 */
+			$this->utf8mb4 = false;
+			$this->options['charset'] = 'utf8';
+
+			parent::connect();
+		}
+
+		$this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		$this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+	}
+
+	/**
+	 * Test to see if the MySQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   3.4
+	 */
+	public static function isSupported()
+	{
+		return class_exists('PDO') && in_array('mysql', PDO::getAvailableDrivers());
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  FOFDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$query->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $this->quoteName($tableName));
+
+		$this->setQuery($query);
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		$this->setQuery('USE ' . $this->quoteName($database));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database (string) or boolean false if not supported.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_database"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_connection"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		// Initialise variables.
+		$result = array();
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		foreach ($tables as $table)
+		{
+			$this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table));
+
+			$row = $this->loadRow();
+
+			// Populate the result array based on the create statements.
+			$result[$table] = $row[1];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$result = array();
+
+		// Set the query to get the table fields statement.
+		$this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table));
+
+		$fields = $this->loadObjectList();
+
+		// If we only want the type as the value add just that to the list.
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = preg_replace("/[(0-9)]/", '', $field->Type);
+			}
+		}
+		// If we want the whole field data object add that to the list.
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = $field;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// Get the details columns information.
+		$this->setQuery('SHOW KEYS FROM ' . $this->quoteName($table));
+
+		$keys = $this->loadObjectList();
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		// Set the query to get the tables statement.
+		$this->setQuery('SHOW TABLES');
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   3.4
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		return $this->getOption(PDO::ATTR_SERVER_VERSION);
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  FOFDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		$this->setQuery('LOCK TABLES ' . $this->quoteName($table) . ' WRITE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by MySQL.
+	 * @param   string  $prefix    Not used by MySQL.
+	 *
+	 * @return  FOFDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('RENAME TABLE ' . $this->quoteName($oldTable) . ' TO ' . $this->quoteName($newTable));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * Oracle escaping reference:
+	 * http://www.orafaq.com/wiki/SQL_FAQ#How_does_one_escape_special_characters_when_writing_SQL_queries.3F
+	 *
+	 * SQLite escaping notes:
+	 * http://www.sqlite.org/faq.html#q14
+	 *
+	 * Method body is as implemented by the Zend Framework
+	 *
+	 * Note: Using query objects with bound variables is
+	 * preferable to the below.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Unused optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   3.4
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		if (is_int($text) || is_float($text))
+		{
+			return $text;
+		}
+
+		$result = substr($this->connection->quote($text), 1, -1);
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  FOFDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->setQuery('UNLOCK TABLES')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionCommit($toSavepoint);
+		}
+		else
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionRollback($toSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . ($this->transactionDepth - 1);
+			$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth--;
+			}
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			parent::transactionStart($asSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . $this->transactionDepth;
+			$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth++;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/database/driver/postgresql.php b/core/libraries/fof/database/driver/postgresql.php
new file mode 100644
index 00000000..4908377f
--- /dev/null
+++ b/core/libraries/fof/database/driver/postgresql.php
@@ -0,0 +1,1529 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * PostgreSQL database driver
+ *
+ * @since  12.1
+ */
+class FOFDatabaseDriverPostgresql extends FOFDatabaseDriver
+{
+	/**
+	 * The database driver name
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'postgresql';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'postgresql';
+
+	/**
+	 * Quote for named objects
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '"';
+
+	/**
+	 * The null/zero date string
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nullDate = '1970-01-01 00:00:00';
+
+	/**
+	 * The minimum supported database version.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected static $dbMinimum = '8.3.18';
+
+	/**
+	 * Operator used for concatenation
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $concat_operator = '||';
+
+	/**
+	 * FOFDatabaseDriverPostgresqlQuery object returned by getQuery
+	 *
+	 * @var    FOFDatabaseDriverPostgresqlQuery
+	 * @since  12.1
+	 */
+	protected $queryObject = null;
+
+	/**
+	 * Database object constructor
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since	12.1
+	 */
+	public function __construct( $options )
+	{
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+
+		// Finalize initialization
+		parent::__construct($options);
+	}
+
+	/**
+	 * Database object destructor
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Make sure the postgresql extension for PHP is installed and enabled.
+		if (!function_exists('pg_connect'))
+		{
+			throw new RuntimeException('PHP extension pg_connect is not available.');
+		}
+
+		// Build the DSN for the connection.
+		$dsn = '';
+
+		if (!empty($this->options['host']))
+		{
+			$dsn .= "host={$this->options['host']} ";
+		}
+
+		$dsn .= "dbname={$this->options['database']} user={$this->options['user']} password={$this->options['password']}";
+
+		// Attempt to connect to the server.
+		if (!($this->connection = @pg_connect($dsn)))
+		{
+			throw new RuntimeException('Error connecting to PGSQL database.');
+		}
+
+		pg_set_error_verbosity($this->connection, PGSQL_ERRORS_DEFAULT);
+		pg_query('SET standard_conforming_strings=off');
+		pg_query('SET escape_string_warning=off');
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if (is_resource($this->connection))
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			pg_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		$result = pg_escape_string($this->connection, $text);
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test to see if the PostgreSQL connector is available
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function test()
+	{
+		return (function_exists('pg_connect'));
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return	boolean
+	 *
+	 * @since	12.1
+	 */
+	public function connected()
+	{
+		$this->connect();
+
+		if (is_resource($this->connection))
+		{
+			return pg_ping($this->connection);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$this->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $this->quoteName($tableName));
+		$this->execute();
+
+		return true;
+	}
+
+	/**
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows in the previous operation
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return pg_affected_rows($this->cursor);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getCollation()
+	{
+		$this->connect();
+
+		$this->setQuery('SHOW LC_COLLATE');
+		$array = $this->loadAssocList();
+
+		return $array[0]['lc_collate'];
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return pg_client_encoding($this->connection);
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
+	 *
+	 * @param   resource  $cur  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cur = null)
+	{
+		$this->connect();
+
+		return pg_num_rows((int) $cur ? $cur : $this->cursor);
+	}
+
+	/**
+	 * Get the current or query, or new FOFDatabaseQuery object.
+	 *
+	 * @param   boolean  $new    False to return the last query set, True to return a new FOFDatabaseQuery object.
+	 * @param   boolean  $asObj  False to return last query as string, true to get FOFDatabaseQueryPostgresql object.
+	 *
+	 * @return  FOFDatabaseQuery  The current query object or a new object extending the FOFDatabaseQuery class.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getQuery($new = false, $asObj = false)
+	{
+		if ($new)
+		{
+			// Make sure we have a query class for this driver.
+			if (!class_exists('FOFDatabaseQueryPostgresql'))
+			{
+				throw new RuntimeException('FOFDatabaseQueryPostgresql Class not found.');
+			}
+
+			$this->queryObject = new FOFDatabaseQueryPostgresql($this);
+
+			return $this->queryObject;
+		}
+		else
+		{
+			if ($asObj)
+			{
+				return $this->queryObject;
+			}
+			else
+			{
+				return $this->sql;
+			}
+		}
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * This is unsuported by PostgreSQL.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  string  An empty char because this function is not supported by PostgreSQL.
+	 *
+	 * @since   12.1
+	 */
+	public function getTableCreate($tables)
+	{
+		return '';
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$result = array();
+
+		$tableSub = $this->replacePrefix($table);
+
+		$this->setQuery('
+			SELECT a.attname AS "column_name",
+				pg_catalog.format_type(a.atttypid, a.atttypmod) as "type",
+				CASE WHEN a.attnotnull IS TRUE
+					THEN \'NO\'
+					ELSE \'YES\'
+				END AS "null",
+				CASE WHEN pg_catalog.pg_get_expr(adef.adbin, adef.adrelid, true) IS NOT NULL
+					THEN pg_catalog.pg_get_expr(adef.adbin, adef.adrelid, true)
+				END as "Default",
+				CASE WHEN pg_catalog.col_description(a.attrelid, a.attnum) IS NULL
+				THEN \'\'
+				ELSE pg_catalog.col_description(a.attrelid, a.attnum)
+				END  AS "comments"
+			FROM pg_catalog.pg_attribute a
+			LEFT JOIN pg_catalog.pg_attrdef adef ON a.attrelid=adef.adrelid AND a.attnum=adef.adnum
+			LEFT JOIN pg_catalog.pg_type t ON a.atttypid=t.oid
+			WHERE a.attrelid =
+				(SELECT oid FROM pg_catalog.pg_class WHERE relname=' . $this->quote($tableSub) . '
+					AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE
+					nspname = \'public\')
+				)
+			AND a.attnum > 0 AND NOT a.attisdropped
+			ORDER BY a.attnum'
+		);
+
+		$fields = $this->loadObjectList();
+
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->column_name] = preg_replace("/[(0-9)]/", '', $field->type);
+			}
+		}
+		else
+		{
+			foreach ($fields as $field)
+			{
+				if (stristr(strtolower($field->type), "character varying"))
+				{
+					$field->Default = "";
+				}
+				if (stristr(strtolower($field->type), "text"))
+				{
+					$field->Default = "";
+				}
+				// Do some dirty translation to MySQL output.
+				// TODO: Come up with and implement a standard across databases.
+				$result[$field->column_name] = (object) array(
+					'column_name' => $field->column_name,
+					'type' => $field->type,
+					'null' => $field->null,
+					'Default' => $field->Default,
+					'comments' => '',
+					'Field' => $field->column_name,
+					'Type' => $field->type,
+					'Null' => $field->null,
+					// TODO: Improve query above to return primary key info as well
+					// 'Key' => ($field->PK == '1' ? 'PRI' : '')
+				);
+			}
+		}
+
+		/* Change Postgresql's NULL::* type with PHP's null one */
+		foreach ($fields as $field)
+		{
+			if (preg_match("/^NULL::*/", $field->Default))
+			{
+				$field->Default = null;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// To check if table exists and prevent SQL injection
+		$tableList = $this->getTableList();
+
+		if (in_array($table, $tableList))
+		{
+			// Get the details columns information.
+			$this->setQuery('
+				SELECT indexname AS "idxName", indisprimary AS "isPrimary", indisunique  AS "isUnique",
+					CASE WHEN indisprimary = true THEN
+						( SELECT \'ALTER TABLE \' || tablename || \' ADD \' || pg_catalog.pg_get_constraintdef(const.oid, true)
+							FROM pg_constraint AS const WHERE const.conname= pgClassFirst.relname )
+					ELSE pg_catalog.pg_get_indexdef(indexrelid, 0, true)
+					END AS "Query"
+				FROM pg_indexes
+				LEFT JOIN pg_class AS pgClassFirst ON indexname=pgClassFirst.relname
+				LEFT JOIN pg_index AS pgIndex ON pgClassFirst.oid=pgIndex.indexrelid
+				WHERE tablename=' . $this->quote($table) . ' ORDER BY indkey'
+			);
+
+			$keys = $this->loadObjectList();
+
+			return $keys;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true)
+			->select('table_name')
+			->from('information_schema.tables')
+			->where('table_type=' . $this->quote('BASE TABLE'))
+			->where('table_schema NOT IN (' . $this->quote('pg_catalog') . ', ' . $this->quote('information_schema') . ')')
+			->order('table_name ASC');
+
+		$this->setQuery($query);
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the details list of sequences for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of sequences specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableSequences($table)
+	{
+		$this->connect();
+
+		// To check if table exists and prevent SQL injection
+		$tableList = $this->getTableList();
+
+		if (in_array($table, $tableList))
+		{
+			$name = array(
+				's.relname', 'n.nspname', 't.relname', 'a.attname', 'info.data_type', 'info.minimum_value', 'info.maximum_value',
+				'info.increment', 'info.cycle_option'
+			);
+			$as = array('sequence', 'schema', 'table', 'column', 'data_type', 'minimum_value', 'maximum_value', 'increment', 'cycle_option');
+
+			if (version_compare($this->getVersion(), '9.1.0') >= 0)
+			{
+				$name[] .= 'info.start_value';
+				$as[] .= 'start_value';
+			}
+
+			// Get the details columns information.
+			$query = $this->getQuery(true)
+				->select($this->quoteName($name, $as))
+				->from('pg_class AS s')
+				->join('LEFT', "pg_depend d ON d.objid=s.oid AND d.classid='pg_class'::regclass AND d.refclassid='pg_class'::regclass")
+				->join('LEFT', 'pg_class t ON t.oid=d.refobjid')
+				->join('LEFT', 'pg_namespace n ON n.oid=t.relnamespace')
+				->join('LEFT', 'pg_attribute a ON a.attrelid=t.oid AND a.attnum=d.refobjsubid')
+				->join('LEFT', 'information_schema.sequences AS info ON info.sequence_name=s.relname')
+				->where("s.relkind='S' AND d.deptype='a' AND t.relname=" . $this->quote($table));
+			$this->setQuery($query);
+			$seq = $this->loadObjectList();
+
+			return $seq;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+		$version = pg_version($this->connection);
+
+		return $version['server'];
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 * To be called after the INSERT statement, it's MANDATORY to have a sequence on
+	 * every primary key table.
+	 *
+	 * To get the auto incremented value it's possible to call this function after
+	 * INSERT INTO query, or use INSERT INTO with RETURNING clause.
+	 *
+	 * @example with insertid() call:
+	 *		$query = $this->getQuery(true)
+	 *			->insert('jos_dbtest')
+	 *			->columns('title,start_date,description')
+	 *			->values("'testTitle2nd','1971-01-01','testDescription2nd'");
+	 *		$this->setQuery($query);
+	 *		$this->execute();
+	 *		$id = $this->insertid();
+	 *
+	 * @example with RETURNING clause:
+	 *		$query = $this->getQuery(true)
+	 *			->insert('jos_dbtest')
+	 *			->columns('title,start_date,description')
+	 *			->values("'testTitle2nd','1971-01-01','testDescription2nd'")
+	 *			->returning('id');
+	 *		$this->setQuery($query);
+	 *		$id = $this->loadResult();
+	 *
+	 * @return  integer  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+		$insertQuery = $this->getQuery(false, true);
+		$table = $insertQuery->__get('insert')->getElements();
+
+		/* find sequence column name */
+		$colNameQuery = $this->getQuery(true);
+		$colNameQuery->select('column_default')
+			->from('information_schema.columns')
+			->where("table_name=" . $this->quote($this->replacePrefix(str_replace('"', '', $table[0]))), 'AND')
+			->where("column_default LIKE '%nextval%'");
+
+		$this->setQuery($colNameQuery);
+		$colName = $this->loadRow();
+		$changedColName = str_replace('nextval', 'currval', $colName);
+
+		$insertidQuery = $this->getQuery(true);
+		$insertidQuery->select($changedColName);
+		$this->setQuery($insertidQuery);
+		$insertVal = $this->loadRow();
+
+		return $insertVal[0];
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $tableName  The name of the table to unlock.
+	 *
+	 * @return  FOFDatabaseDriverPostgresql  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($tableName)
+	{
+		$this->transactionStart();
+		$this->setQuery('LOCK TABLE ' . $this->quoteName($tableName) . ' IN ACCESS EXCLUSIVE MODE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		if (!is_resource($this->connection))
+		{
+			if (class_exists('JLog'))
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			}
+			throw new RuntimeException($this->errorMsg, $this->errorNum);
+		}
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof FOFDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query .= ' LIMIT ' . $this->limit . ' OFFSET ' . $this->offset;
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			if (class_exists('JLog'))
+			{
+				JLog::add($query, JLog::DEBUG, 'databasequery');
+			}
+
+			$this->timings[] = microtime(true);
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @pg_query($this->connection, $query);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$errorNum = $this->getErrorNumber();
+			$errorMsg = $this->getErrorMessage($query);
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage($query);
+
+					// Throw the normal query exception.
+					if (class_exists('JLog'))
+					{
+						JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+					}
+
+					throw new RuntimeException($this->errorMsg, null, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Get the error number and message from before we tried to reconnect.
+				$this->errorNum = $errorNum;
+				$this->errorMsg = $errorMsg;
+
+				// Throw the normal query exception.
+				if (class_exists('JLog'))
+				{
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+				}
+
+				throw new RuntimeException($this->errorMsg);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by PostgreSQL.
+	 * @param   string  $prefix    Not used by PostgreSQL.
+	 *
+	 * @return  FOFDatabaseDriverPostgresql  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->connect();
+
+		// To check if table exists and prevent SQL injection
+		$tableList = $this->getTableList();
+
+		// Origin Table does not exist
+		if (!in_array($oldTable, $tableList))
+		{
+			// Origin Table not found
+			throw new RuntimeException('Table not found in Postgresql database.');
+		}
+		else
+		{
+			/* Rename indexes */
+			$this->setQuery(
+				'SELECT relname
+					FROM pg_class
+					WHERE oid IN (
+						SELECT indexrelid
+						FROM pg_index, pg_class
+						WHERE pg_class.relname=' . $this->quote($oldTable, true) . '
+						AND pg_class.oid=pg_index.indrelid );'
+			);
+
+			$oldIndexes = $this->loadColumn();
+
+			foreach ($oldIndexes as $oldIndex)
+			{
+				$changedIdxName = str_replace($oldTable, $newTable, $oldIndex);
+				$this->setQuery('ALTER INDEX ' . $this->escape($oldIndex) . ' RENAME TO ' . $this->escape($changedIdxName));
+				$this->execute();
+			}
+
+			/* Rename sequence */
+			$this->setQuery(
+				'SELECT relname
+					FROM pg_class
+					WHERE relkind = \'S\'
+					AND relnamespace IN (
+						SELECT oid
+						FROM pg_namespace
+						WHERE nspname NOT LIKE \'pg_%\'
+						AND nspname != \'information_schema\'
+					)
+					AND relname LIKE \'%' . $oldTable . '%\' ;'
+			);
+
+			$oldSequences = $this->loadColumn();
+
+			foreach ($oldSequences as $oldSequence)
+			{
+				$changedSequenceName = str_replace($oldTable, $newTable, $oldSequence);
+				$this->setQuery('ALTER SEQUENCE ' . $this->escape($oldSequence) . ' RENAME TO ' . $this->escape($changedSequenceName));
+				$this->execute();
+			}
+
+			/* Rename table */
+			$this->setQuery('ALTER TABLE ' . $this->escape($oldTable) . ' RENAME TO ' . $this->escape($newTable));
+			$this->execute();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Selects the database, but redundant for PostgreSQL
+	 *
+	 * @param   string  $database  Database name to select.
+	 *
+	 * @return  boolean  Always true
+	 *
+	 * @since   12.1
+	 */
+	public function select($database)
+	{
+		return true;
+	}
+
+	/**
+	 * Custom settings for UTF support
+	 *
+	 * @return  integer  Zero on success, -1 on failure
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		$this->connect();
+
+		return pg_set_client_encoding($this->connection, 'UTF8');
+	}
+
+	/**
+	 * This function return a field value as a prepared string to be used in a SQL statement.
+	 *
+	 * @param   array   $columns      Array of table's column returned by ::getTableColumns.
+	 * @param   string  $field_name   The table field's name.
+	 * @param   string  $field_value  The variable value to quote and return.
+	 *
+	 * @return  string  The quoted string.
+	 *
+	 * @since   12.1
+	 */
+	public function sqlValue($columns, $field_name, $field_value)
+	{
+		switch ($columns[$field_name])
+		{
+			case 'boolean':
+				$val = 'NULL';
+
+				if ($field_value == 't')
+				{
+					$val = 'TRUE';
+				}
+				elseif ($field_value == 'f')
+				{
+					$val = 'FALSE';
+				}
+
+				break;
+
+			case 'bigint':
+			case 'bigserial':
+			case 'integer':
+			case 'money':
+			case 'numeric':
+			case 'real':
+			case 'smallint':
+			case 'serial':
+			case 'numeric,':
+				$val = strlen($field_value) == 0 ? 'NULL' : $field_value;
+				break;
+
+			case 'date':
+			case 'timestamp without time zone':
+				if (empty($field_value))
+				{
+					$field_value = $this->getNullDate();
+				}
+
+				$val = $this->quote($field_value);
+				break;
+
+			default:
+				$val = $this->quote($field_value);
+				break;
+		}
+
+		return $val;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('COMMIT')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('ROLLBACK')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . ($this->transactionDepth - 1);
+		$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth--;
+			$this->setQuery('RELEASE SAVEPOINT ' . $this->quoteName($savepoint))->execute();
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			if ($this->setQuery('START TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 1;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return pg_fetch_row($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return pg_fetch_assoc($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return pg_fetch_object(is_null($cursor) ? $this->cursor : $cursor, null, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		pg_free_result($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Inserts a row into a table based on an object's properties.
+	 *
+	 * @param   string  $table    The name of the database table to insert into.
+	 * @param   object  &$object  A reference to an object whose public properties match the table fields.
+	 * @param   string  $key      The name of the primary key. If provided the object property is updated.
+	 *
+	 * @return  boolean    True on success.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function insertObject($table, &$object, $key = null)
+	{
+		$columns = $this->getTableColumns($table);
+
+		$fields = array();
+		$values = array();
+
+		// Iterate over the object variables to build the query fields and values.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process non-null scalars.
+			if (is_array($v) or is_object($v) or $v === null)
+			{
+				continue;
+			}
+
+			// Ignore any internal fields or primary keys with value 0.
+			if (($k[0] == "_") || ($k == $key && (($v === 0) || ($v === '0'))))
+			{
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			$fields[] = $this->quoteName($k);
+			$values[] = $this->sqlValue($columns, $k, $v);
+		}
+
+		// Create the base insert statement.
+		$query = $this->getQuery(true)
+			->insert($this->quoteName($table))
+			->columns($fields)
+			->values(implode(',', $values));
+
+		$retVal = false;
+
+		if ($key)
+		{
+			$query->returning($key);
+
+			// Set the query and execute the insert.
+			$this->setQuery($query);
+
+			$id = $this->loadResult();
+
+			if ($id)
+			{
+				$object->$key = $id;
+				$retVal = true;
+			}
+		}
+		else
+		{
+			// Set the query and execute the insert.
+			$this->setQuery($query);
+
+			if ($this->execute())
+			{
+				$retVal = true;
+			}
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Test to see if the PostgreSQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return (function_exists('pg_connect'));
+	}
+
+	/**
+	 * Returns an array containing database's table list.
+	 *
+	 * @return  array  The database's table list.
+	 *
+	 * @since   12.1
+	 */
+	public function showTables()
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true)
+			->select('table_name')
+			->from('information_schema.tables')
+			->where('table_type = ' . $this->quote('BASE TABLE'))
+			->where('table_schema NOT IN (' . $this->quote('pg_catalog') . ', ' . $this->quote('information_schema') . ' )');
+
+		$this->setQuery($query);
+		$tableList = $this->loadColumn();
+
+		return $tableList;
+	}
+
+	/**
+	 * Get the substring position inside a string
+	 *
+	 * @param   string  $substring  The string being sought
+	 * @param   string  $string     The string/column being searched
+	 *
+	 * @return  integer  The position of $substring in $string
+	 *
+	 * @since   12.1
+	 */
+	public function getStringPositionSql( $substring, $string )
+	{
+		$this->connect();
+
+		$query = "SELECT POSITION( $substring IN $string )";
+		$this->setQuery($query);
+		$position = $this->loadRow();
+
+		return $position['position'];
+	}
+
+	/**
+	 * Generate a random value
+	 *
+	 * @return  float  The random generated number
+	 *
+	 * @since   12.1
+	 */
+	public function getRandom()
+	{
+		$this->connect();
+
+		$this->setQuery('SELECT RANDOM()');
+		$random = $this->loadAssoc();
+
+		return $random['random'];
+	}
+
+	/**
+	 * Get the query string to alter the database character set.
+	 *
+	 * @param   string  $dbName  The database name
+	 *
+	 * @return  string  The query that alter the database query string
+	 *
+	 * @since   12.1
+	 */
+	public function getAlterDbCharacterSet( $dbName )
+	{
+		$query = 'ALTER DATABASE ' . $this->quoteName($dbName) . ' SET CLIENT_ENCODING TO ' . $this->quote('UTF8');
+
+		return $query;
+	}
+
+	/**
+	 * Get the query string to create new Database in correct PostgreSQL syntax.
+	 *
+	 * @param   object   $options  object coming from "initialise" function to pass user and database name to database driver.
+	 * @param   boolean  $utf      True if the database supports the UTF-8 character set, not used in PostgreSQL "CREATE DATABASE" query.
+	 *
+	 * @return  string	The query that creates database, owned by $options['user']
+	 *
+	 * @since   12.1
+	 */
+	public function getCreateDbQuery($options, $utf)
+	{
+		$query = 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' OWNER ' . $this->quoteName($options->db_user);
+
+		if ($utf)
+		{
+			$query .= ' ENCODING ' . $this->quote('UTF-8');
+		}
+
+		return $query;
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $query   The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   12.1
+	 */
+	public function replacePrefix($query, $prefix = '#__')
+	{
+		$query = trim($query);
+
+		if (strpos($query, '\''))
+		{
+			// Sequence name quoted with ' ' but need to be replaced
+			if (strpos($query, 'currval'))
+			{
+				$query = explode('currval', $query);
+
+				for ($nIndex = 1; $nIndex < count($query); $nIndex = $nIndex + 2)
+				{
+					$query[$nIndex] = str_replace($prefix, $this->tablePrefix, $query[$nIndex]);
+				}
+
+				$query = implode('currval', $query);
+			}
+
+			// Sequence name quoted with ' ' but need to be replaced
+			if (strpos($query, 'nextval'))
+			{
+				$query = explode('nextval', $query);
+
+				for ($nIndex = 1; $nIndex < count($query); $nIndex = $nIndex + 2)
+				{
+					$query[$nIndex] = str_replace($prefix, $this->tablePrefix, $query[$nIndex]);
+				}
+
+				$query = implode('nextval', $query);
+			}
+
+			// Sequence name quoted with ' ' but need to be replaced
+			if (strpos($query, 'setval'))
+			{
+				$query = explode('setval', $query);
+
+				for ($nIndex = 1; $nIndex < count($query); $nIndex = $nIndex + 2)
+				{
+					$query[$nIndex] = str_replace($prefix, $this->tablePrefix, $query[$nIndex]);
+				}
+
+				$query = implode('setval', $query);
+			}
+
+			$explodedQuery = explode('\'', $query);
+
+			for ($nIndex = 0; $nIndex < count($explodedQuery); $nIndex = $nIndex + 2)
+			{
+				if (strpos($explodedQuery[$nIndex], $prefix))
+				{
+					$explodedQuery[$nIndex] = str_replace($prefix, $this->tablePrefix, $explodedQuery[$nIndex]);
+				}
+			}
+
+			$replacedQuery = implode('\'', $explodedQuery);
+		}
+		else
+		{
+			$replacedQuery = str_replace($prefix, $this->tablePrefix, $query);
+		}
+
+		return $replacedQuery;
+	}
+
+	/**
+	 * Method to release a savepoint.
+	 *
+	 * @param   string  $savepointName  Savepoint's name to release
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function releaseTransactionSavepoint( $savepointName )
+	{
+		$this->connect();
+		$this->setQuery('RELEASE SAVEPOINT ' . $this->quoteName($this->escape($savepointName)));
+		$this->execute();
+	}
+
+	/**
+	 * Method to create a savepoint.
+	 *
+	 * @param   string  $savepointName  Savepoint's name to create
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function transactionSavepoint( $savepointName )
+	{
+		$this->connect();
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($this->escape($savepointName)));
+		$this->execute();
+	}
+
+	/**
+	 * Unlocks tables in the database, this command does not exist in PostgreSQL,
+	 * it is automatically done on commit or rollback.
+	 *
+	 * @return  FOFDatabaseDriverPostgresql  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->transactionCommit();
+
+		return $this;
+	}
+
+	/**
+	 * Updates a row in a table based on an object's properties.
+	 *
+	 * @param   string   $table    The name of the database table to update.
+	 * @param   object   &$object  A reference to an object whose public properties match the table fields.
+	 * @param   array    $key      The name of the primary key.
+	 * @param   boolean  $nulls    True to update null fields or false to ignore them.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function updateObject($table, &$object, $key, $nulls = false)
+	{
+		$columns = $this->getTableColumns($table);
+		$fields  = array();
+		$where   = array();
+
+		if (is_string($key))
+		{
+			$key = array($key);
+		}
+
+		if (is_object($key))
+		{
+			$key = (array) $key;
+		}
+
+		// Create the base update statement.
+		$statement = 'UPDATE ' . $this->quoteName($table) . ' SET %s WHERE %s';
+
+		// Iterate over the object variables to build the query fields/value pairs.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process scalars that are not internal fields.
+			if (is_array($v) or is_object($v) or $k[0] == '_')
+			{
+				continue;
+			}
+
+			// Set the primary key to the WHERE clause instead of a field to update.
+			if (in_array($k, $key))
+			{
+				$key_val = $this->sqlValue($columns, $k, $v);
+				$where[] = $this->quoteName($k) . '=' . $key_val;
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			if ($v === null)
+			{
+				// If the value is null and we want to update nulls then set it.
+				if ($nulls)
+				{
+					$val = 'NULL';
+				}
+				// If the value is null and we do not want to update nulls then ignore this field.
+				else
+				{
+					continue;
+				}
+			}
+			// The field is not null so we prep it for update.
+			else
+			{
+				$val = $this->sqlValue($columns, $k, $v);
+			}
+
+			// Add the field to be updated.
+			$fields[] = $this->quoteName($k) . '=' . $val;
+		}
+
+		// We don't have any fields to update.
+		if (empty($fields))
+		{
+			return true;
+		}
+
+		// Set the query and execute the update.
+		$this->setQuery(sprintf($statement, implode(",", $fields), implode(' AND ', $where)));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) pg_result_error_field($this->cursor, PGSQL_DIAG_SQLSTATE) . ' ';
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @param   string  $query  The SQL Query that fails
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage($query)
+	{
+		$errorMessage = (string) pg_last_error($this->connection);
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+			$query        = str_replace($this->tablePrefix, '#__', $query);
+		}
+
+		return $errorMessage . "SQL=" . $query;
+	}
+}
diff --git a/core/libraries/fof/database/driver/sqlazure.php b/core/libraries/fof/database/driver/sqlazure.php
new file mode 100644
index 00000000..90e0a4f8
--- /dev/null
+++ b/core/libraries/fof/database/driver/sqlazure.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * SQL Server database driver
+ *
+ * @see    http://msdn.microsoft.com/en-us/library/ee336279.aspx
+ * @since  12.1
+ */
+class FOFDatabaseDriverSqlazure extends FOFDatabaseDriverSqlsrv
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'sqlazure';
+}
diff --git a/core/libraries/fof/database/driver/sqlite.php b/core/libraries/fof/database/driver/sqlite.php
new file mode 100644
index 00000000..c93ea837
--- /dev/null
+++ b/core/libraries/fof/database/driver/sqlite.php
@@ -0,0 +1,484 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * SQLite database driver
+ *
+ * @see    http://php.net/pdo
+ * @since  12.1
+ */
+class FOFDatabaseDriverSqlite extends FOFDatabaseDriverPdo
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'sqlite';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'sqlite';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc. The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '`';
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->freeResult();
+		unset($this->connection);
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		$this->freeResult();
+		unset($this->connection);
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  FOFDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$this->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $query->quoteName($tableName));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQLite statement.
+	 *
+	 * Note: Using query objects with bound variables is
+	 * preferable to the below.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Unused optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		if (is_int($text) || is_float($text))
+		{
+			return $text;
+		}
+
+		return SQLite3::escapeString($text);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 */
+	public function getCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * Note: Doesn't appear to have support in SQLite
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		return $tables;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$columns = array();
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+
+		$query->setQuery('pragma table_info(' . $table . ')');
+
+		$this->setQuery($query);
+		$fields = $this->loadObjectList();
+
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$columns[$field->NAME] = $field->TYPE;
+			}
+		}
+		else
+		{
+			foreach ($fields as $field)
+			{
+				// Do some dirty translation to MySQL output.
+				// TODO: Come up with and implement a standard across databases.
+				$columns[$field->NAME] = (object) array(
+					'Field' => $field->NAME,
+					'Type' => $field->TYPE,
+					'Null' => ($field->NOTNULL == '1' ? 'NO' : 'YES'),
+					'Default' => $field->DFLT_VALUE,
+					'Key' => ($field->PK != '0' ? 'PRI' : '')
+				);
+			}
+		}
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $columns;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		$keys = array();
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+		$query->setQuery('pragma table_info( ' . $table . ')');
+
+		// $query->bind(':tableName', $table);
+
+		$this->setQuery($query);
+		$rows = $this->loadObjectList();
+
+		foreach ($rows as $column)
+		{
+			if ($column->PK == 1)
+			{
+				$keys[$column->NAME] = $column;
+			}
+		}
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database (schema).
+	 *
+	 * @return  array   An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		$type = 'table';
+
+		$query = $this->getQuery(true)
+			->select('name')
+			->from('sqlite_master')
+			->where('type = :type')
+			->bind(':type', $type)
+			->order('name');
+
+		$this->setQuery($query);
+
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		$this->setQuery("SELECT sqlite_version()");
+
+		return $this->loadResult();
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * Returns false automatically for the Oracle driver since
+	 * you can only set the character set when the connection
+	 * is created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		$this->connect();
+
+		return false;
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  FOFDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		return $this;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by Sqlite.
+	 * @param   string  $prefix    Not used by Sqlite.
+	 *
+	 * @return  FOFDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('ALTER TABLE ' . $oldTable . ' RENAME TO ' . $newTable)->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  FOFDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		return $this;
+	}
+
+	/**
+	 * Test to see if the PDO ODBC connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers());
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionCommit($toSavepoint);
+		}
+		else
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionRollback($toSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . ($this->transactionDepth - 1);
+			$this->setQuery('ROLLBACK TO ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth--;
+			}
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			parent::transactionStart($asSavepoint);
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+}
diff --git a/core/libraries/fof/database/driver/sqlsrv.php b/core/libraries/fof/database/driver/sqlsrv.php
new file mode 100644
index 00000000..cf47e2b8
--- /dev/null
+++ b/core/libraries/fof/database/driver/sqlsrv.php
@@ -0,0 +1,1171 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * SQL Server database driver
+ *
+ * @see    http://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
+ * @since  12.1
+ */
+class FOFDatabaseDriverSqlsrv extends FOFDatabaseDriver
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'sqlsrv';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'mssql';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '[]';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nullDate = '1900-01-01 00:00:00';
+
+	/**
+	 * @var    string  The minimum supported database version.
+	 * @since  12.1
+	 */
+	protected static $dbMinimum = '10.50.1600.1';
+
+	/**
+	 * Test to see if the SQLSRV connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return (function_exists('sqlsrv_connect'));
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['select'] = (isset($options['select'])) ? (bool) $options['select'] : true;
+
+		// Finalize initialisation
+		parent::__construct($options);
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Build the connection configuration array.
+		$config = array(
+			'Database' => $this->options['database'],
+			'uid' => $this->options['user'],
+			'pwd' => $this->options['password'],
+			'CharacterSet' => 'UTF-8',
+			'ReturnDatesAsStrings' => true);
+
+		// Make sure the SQLSRV extension for PHP is installed and enabled.
+		if (!function_exists('sqlsrv_connect'))
+		{
+			throw new RuntimeException('PHP extension sqlsrv_connect is not available.');
+		}
+
+		// Attempt to connect to the server.
+		if (!($this->connection = @ sqlsrv_connect($this->options['host'], $config)))
+		{
+			throw new RuntimeException('Database sqlsrv_connect failed');
+		}
+
+		// Make sure that DB warnings are not returned as errors.
+		sqlsrv_configure('WarningsReturnAsErrors', 0);
+
+		// If auto-select is enabled select the given database.
+		if ($this->options['select'] && !empty($this->options['database']))
+		{
+			$this->select($this->options['database']);
+		}
+
+		// Set charactersets.
+		$this->utf = $this->setUtf();
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if (is_resource($this->connection))
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			sqlsrv_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Get table constraints
+	 *
+	 * @param   string  $tableName  The name of the database table.
+	 *
+	 * @return  array  Any constraints available for the table.
+	 *
+	 * @since   12.1
+	 */
+	protected function getTableConstraints($tableName)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$this->setQuery(
+			'SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_NAME = ' . $query->quote($tableName)
+		);
+
+		return $this->loadColumn();
+	}
+
+	/**
+	 * Rename constraints.
+	 *
+	 * @param   array   $constraints  Array(strings) of table constraints
+	 * @param   string  $prefix       A string
+	 * @param   string  $backup       A string
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function renameConstraints($constraints = array(), $prefix = null, $backup = null)
+	{
+		$this->connect();
+
+		foreach ($constraints as $constraint)
+		{
+			$this->setQuery('sp_rename ' . $constraint . ',' . str_replace($prefix, $backup, $constraint));
+			$this->execute();
+		}
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * The escaping for MSSQL isn't handled in the driver though that would be nice.  Because of this we need
+	 * to handle the escaping ourselves.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$result = addslashes($text);
+		$result = str_replace("\'", "''", $result);
+		$result = str_replace('\"', '"', $result);
+		$result = str_replace('\/', '/', $result);
+
+		if ($extra)
+		{
+			// We need the below str_replace since the search in sql server doesn't recognize _ character.
+			$result = str_replace('_', '[_]', $result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		// TODO: Run a blank query here
+		return true;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  FOFDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		if ($ifExists)
+		{
+			$this->setQuery(
+				'IF EXISTS(SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = ' . $query->quote($tableName) . ') DROP TABLE ' . $tableName
+			);
+		}
+		else
+		{
+			$this->setQuery('DROP TABLE ' . $tableName);
+		}
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Get the number of affected rows for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return sqlsrv_rows_affected($this->cursor);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 */
+	public function getCollation()
+	{
+		// TODO: Not fake this
+		return 'MSSQL UTF-8 (UCS2)';
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		// TODO: Not fake this
+		return 'MSSQL UTF-8 (UCS2)';
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		$this->connect();
+
+		return sqlsrv_num_rows($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Retrieves field information about the given tables.
+	 *
+	 * @param   mixed    $table     A table name
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$result = array();
+
+		$table_temp = $this->replacePrefix((string) $table);
+
+		// Set the query to get the table fields statement.
+		$this->setQuery(
+			'SELECT column_name as Field, data_type as Type, is_nullable as \'Null\', column_default as \'Default\'' .
+			' FROM information_schema.columns WHERE table_name = ' . $this->quote($table_temp)
+		);
+		$fields = $this->loadObjectList();
+
+		// If we only want the type as the value add just that to the list.
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = preg_replace("/[(0-9)]/", '', $field->Type);
+			}
+		}
+		// If we want the whole field data object add that to the list.
+		else
+		{
+			foreach ($fields as $field)
+			{
+				if (stristr(strtolower($field->Type), "nvarchar"))
+				{
+					$field->Default = "";
+				}
+				$result[$field->Field] = $field;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * This is unsupported by MSSQL.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		return '';
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// TODO To implement.
+		return array();
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		// Set the query to get the tables statement.
+		$this->setQuery('SELECT name FROM ' . $this->getDatabase() . '.sys.Tables WHERE type = \'U\';');
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		$version = sqlsrv_server_info($this->connection);
+
+		return $version['SQLServerVersion'];
+	}
+
+	/**
+	 * Inserts a row into a table based on an object's properties.
+	 *
+	 * @param   string  $table    The name of the database table to insert into.
+	 * @param   object  &$object  A reference to an object whose public properties match the table fields.
+	 * @param   string  $key      The name of the primary key. If provided the object property is updated.
+	 *
+	 * @return  boolean    True on success.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function insertObject($table, &$object, $key = null)
+	{
+		$fields = array();
+		$values = array();
+		$statement = 'INSERT INTO ' . $this->quoteName($table) . ' (%s) VALUES (%s)';
+
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process non-null scalars.
+			if (is_array($v) or is_object($v) or $v === null)
+			{
+				continue;
+			}
+
+			if (!$this->checkFieldExists($table, $k))
+			{
+				continue;
+			}
+
+			if ($k[0] == '_')
+			{
+				// Internal field
+				continue;
+			}
+
+			if ($k == $key && $key == 0)
+			{
+				continue;
+			}
+
+			$fields[] = $this->quoteName($k);
+			$values[] = $this->Quote($v);
+		}
+		// Set the query and execute the insert.
+		$this->setQuery(sprintf($statement, implode(',', $fields), implode(',', $values)));
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		$id = $this->insertid();
+
+		if ($key && $id)
+		{
+			$object->$key = $id;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  integer  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		// TODO: SELECT IDENTITY
+		$this->setQuery('SELECT @@IDENTITY');
+
+		return (int) $this->loadResult();
+	}
+
+	/**
+	 * Method to get the first field of the first row of the result set from the database query.
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function loadResult()
+	{
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return null;
+		}
+
+		// Get the first row from the result set as an array.
+		if ($row = sqlsrv_fetch_array($cursor, SQLSRV_FETCH_NUMERIC))
+		{
+			$ret = $row[0];
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		// For SQLServer - we need to strip slashes
+		$ret = stripslashes($ret);
+
+		return $ret;
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @throws  Exception
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		if (!is_resource($this->connection))
+		{
+			if (class_exists('JLog'))
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			}
+			throw new RuntimeException($this->errorMsg, $this->errorNum);
+		}
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof FOFDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query = $this->limit($query, $this->limit, $this->offset);
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			if (class_exists('JLog'))
+			{
+				JLog::add($query, JLog::DEBUG, 'databasequery');
+			}
+
+			$this->timings[] = microtime(true);
+		}
+
+		// SQLSrv_num_rows requires a static or keyset cursor.
+		if (strncmp(ltrim(strtoupper($query)), 'SELECT', strlen('SELECT')) == 0)
+		{
+			$array = array('Scrollable' => SQLSRV_CURSOR_KEYSET);
+		}
+		else
+		{
+			$array = array();
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @sqlsrv_query($this->connection, $query, array(), $array);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$errorNum = $this->getErrorNumber();
+			$errorMsg = $this->getErrorMessage($query);
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage($query);
+
+					// Throw the normal query exception.
+					if (class_exists('JLog'))
+					{
+						JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+					}
+
+					throw new RuntimeException($this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Get the error number and message from before we tried to reconnect.
+				$this->errorNum = $errorNum;
+				$this->errorMsg = $errorMsg;
+
+				// Throw the normal query exception.
+				if (class_exists('JLog'))
+				{
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+				}
+
+				throw new RuntimeException($this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $query   The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   12.1
+	 */
+	public function replacePrefix($query, $prefix = '#__')
+	{
+		$startPos = 0;
+		$literal = '';
+
+		$query = trim($query);
+		$n = strlen($query);
+
+		while ($startPos < $n)
+		{
+			$ip = strpos($query, $prefix, $startPos);
+
+			if ($ip === false)
+			{
+				break;
+			}
+
+			$j = strpos($query, "N'", $startPos);
+			$k = strpos($query, '"', $startPos);
+
+			if (($k !== false) && (($k < $j) || ($j === false)))
+			{
+				$quoteChar = '"';
+				$j = $k;
+			}
+			else
+			{
+				$quoteChar = "'";
+			}
+
+			if ($j === false)
+			{
+				$j = $n;
+			}
+
+			$literal .= str_replace($prefix, $this->tablePrefix, substr($query, $startPos, $j - $startPos));
+			$startPos = $j;
+
+			$j = $startPos + 1;
+
+			if ($j >= $n)
+			{
+				break;
+			}
+
+			// Quote comes first, find end of quote
+			while (true)
+			{
+				$k = strpos($query, $quoteChar, $j);
+				$escaped = false;
+
+				if ($k === false)
+				{
+					break;
+				}
+
+				$l = $k - 1;
+
+				while ($l >= 0 && $query{$l} == '\\')
+				{
+					$l--;
+					$escaped = !$escaped;
+				}
+
+				if ($escaped)
+				{
+					$j = $k + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			if ($k === false)
+			{
+				// Error in the query - no end quote; ignore it
+				break;
+			}
+
+			$literal .= substr($query, $startPos, $k - $startPos + 1);
+			$startPos = $k + 1;
+		}
+
+		if ($startPos < $n)
+		{
+			$literal .= substr($query, $startPos, $n - $startPos);
+		}
+
+		return $literal;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		if (!$database)
+		{
+			return false;
+		}
+
+		if (!sqlsrv_query($this->connection, 'USE ' . $database, null, array('scrollable' => SQLSRV_CURSOR_STATIC)))
+		{
+			throw new RuntimeException('Could not connect to database');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		return false;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('COMMIT TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('ROLLBACK TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . ($this->transactionDepth - 1);
+		$this->setQuery('ROLLBACK TRANSACTION ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			if ($this->setQuery('BEGIN TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 1;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('BEGIN TRANSACTION ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return sqlsrv_fetch_array($cursor ? $cursor : $this->cursor, SQLSRV_FETCH_NUMERIC);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return sqlsrv_fetch_array($cursor ? $cursor : $this->cursor, SQLSRV_FETCH_ASSOC);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return sqlsrv_fetch_object($cursor ? $cursor : $this->cursor, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		sqlsrv_free_stmt($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to check and see if a field exists in a table.
+	 *
+	 * @param   string  $table  The table in which to verify the field.
+	 * @param   string  $field  The field to verify.
+	 *
+	 * @return  boolean  True if the field exists in the table.
+	 *
+	 * @since   12.1
+	 */
+	protected function checkFieldExists($table, $field)
+	{
+		$this->connect();
+
+		$table = $this->replacePrefix((string) $table);
+		$query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$table' AND COLUMN_NAME = '$field'" .
+			" ORDER BY ORDINAL_POSITION";
+		$this->setQuery($query);
+
+		if ($this->loadResult())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to wrap an SQL statement to provide a LIMIT and OFFSET behavior for scrolling through a result set.
+	 *
+	 * @param   string   $query   The SQL statement to process.
+	 * @param   integer  $limit   The maximum affected rows to set.
+	 * @param   integer  $offset  The affected row offset to set.
+	 *
+	 * @return  string   The processed SQL statement.
+	 *
+	 * @since   12.1
+	 */
+	protected function limit($query, $limit, $offset)
+	{
+		if ($limit == 0 && $offset == 0)
+		{
+			return $query;
+		}
+
+		$start = $offset + 1;
+		$end   = $offset + $limit;
+
+		$orderBy = stristr($query, 'ORDER BY');
+
+		if (is_null($orderBy) || empty($orderBy))
+		{
+			$orderBy = 'ORDER BY (select 0)';
+		}
+
+		$query = str_ireplace($orderBy, '', $query);
+
+		$rowNumberText = ', ROW_NUMBER() OVER (' . $orderBy . ') AS RowNumber FROM ';
+
+		$query = preg_replace('/\sFROM\s/i', $rowNumberText, $query, 1);
+
+		return $query;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Table prefix
+	 * @param   string  $prefix    For the table - used to rename constraints in non-mysql databases
+	 *
+	 * @return  FOFDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$constraints = array();
+
+		if (!is_null($prefix) && !is_null($backup))
+		{
+			$constraints = $this->getTableConstraints($oldTable);
+		}
+
+		if (!empty($constraints))
+		{
+			$this->renameConstraints($constraints, $prefix, $backup);
+		}
+
+		$this->setQuery("sp_rename '" . $oldTable . "', '" . $newTable . "'");
+
+		return $this->execute();
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $tableName  The name of the table to lock.
+	 *
+	 * @return  FOFDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($tableName)
+	{
+		return $this;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  FOFDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		return $this;
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		$errors = sqlsrv_errors();
+
+		return $errors[0]['SQLSTATE'];
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @param   string  $query  The SQL Query that fails
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage($query)
+	{
+		$errors       = sqlsrv_errors();
+		$errorMessage = (string) $errors[0]['message'];
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+			$query        = str_replace($this->tablePrefix, '#__', $query);
+		}
+
+		return $errorMessage . ' SQL=' . $query;
+	}
+}
diff --git a/core/libraries/fof/database/factory.php b/core/libraries/fof/database/factory.php
new file mode 100644
index 00000000..681247ad
--- /dev/null
+++ b/core/libraries/fof/database/factory.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Joomla Platform Database Factory class
+ *
+ * @since  12.1
+ */
+class FOFDatabaseFactory
+{
+	/**
+	 * Contains the current FOFDatabaseFactory instance
+	 *
+	 * @var    FOFDatabaseFactory
+	 * @since  12.1
+	 */
+	private static $_instance = null;
+
+	/**
+	 * Method to return a FOFDatabaseDriver instance based on the given options. There are three global options and then
+	 * the rest are specific to the database driver. The 'database' option determines which database is to
+	 * be used for the connection. The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   string  $name     Name of the database driver you'd like to instantiate
+	 * @param   array   $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  FOFDatabaseDriver  A database driver object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getDriver($name = 'joomla', $options = array())
+	{
+		// Sanitize the database connector options.
+		$options['driver']   = preg_replace('/[^A-Z0-9_\.-]/i', '', $name);
+		$options['database'] = (isset($options['database'])) ? $options['database'] : null;
+		$options['select']   = (isset($options['select'])) ? $options['select'] : true;
+
+		// Derive the class name from the driver.
+		$class = 'FOFDatabaseDriver' . ucfirst(strtolower($options['driver']));
+
+		// If the class still doesn't exist we have nothing left to do but throw an exception.  We did our best.
+		if (!class_exists($class))
+		{
+			throw new RuntimeException(sprintf('Unable to load Database Driver: %s', $options['driver']));
+		}
+
+		// Create our new FOFDatabaseDriver connector based on the options given.
+		try
+		{
+			$instance = new $class($options);
+		}
+		catch (RuntimeException $e)
+		{
+			throw new RuntimeException(sprintf('Unable to connect to the Database: %s', $e->getMessage()), $e->getCode(), $e);
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * Gets an instance of the factory object.
+	 *
+	 * @return  FOFDatabaseFactory
+	 *
+	 * @since   12.1
+	 */
+	public static function getInstance()
+	{
+		return self::$_instance ? self::$_instance : new FOFDatabaseFactory;
+	}
+
+	/**
+	 * Get the current query object or a new FOFDatabaseQuery object.
+	 *
+	 * @param   string           $name  Name of the driver you want an query object for.
+	 * @param   FOFDatabaseDriver  $db    Optional FOFDatabaseDriver instance
+	 *
+	 * @return  FOFDatabaseQuery  The current query object or a new object extending the FOFDatabaseQuery class.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getQuery($name, FOFDatabaseDriver $db = null)
+	{
+		// Derive the class name from the driver.
+		$class = 'FOFDatabaseQuery' . ucfirst(strtolower($name));
+
+		// Make sure we have a query class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new RuntimeException('Database Query class not found');
+		}
+
+		return new $class($db);
+	}
+
+	/**
+	 * Gets an instance of a factory object to return on subsequent calls of getInstance.
+	 *
+	 * @param   FOFDatabaseFactory  $instance  A FOFDatabaseFactory object.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public static function setInstance(FOFDatabaseFactory $instance = null)
+	{
+		self::$_instance = $instance;
+	}
+}
diff --git a/core/libraries/fof/database/installer.php b/core/libraries/fof/database/installer.php
new file mode 100644
index 00000000..c7aec16e
--- /dev/null
+++ b/core/libraries/fof/database/installer.php
@@ -0,0 +1,1020 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+class FOFDatabaseInstaller
+{
+	/** @var  FOFDatabase  The database connector object */
+	private $db = null;
+
+	/**
+	 * @var   FOFInput  Input variables
+	 */
+	protected $input = array();
+
+	/** @var  string  The directory where the XML schema files are stored */
+	private $xmlDirectory = null;
+
+	/** @var  array  A list of the base names of the XML schema files */
+	public $xmlFiles = array('mysql', 'mysqli', 'pdomysql', 'postgresql', 'sqlsrv', 'mssql');
+
+	/** @var array Internal cache for table list  */
+	protected static $allTables = array();
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   array  $config  The configuration array
+	 */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		// Get the input
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$this->input = $config['input'];
+			}
+			else
+			{
+				$this->input = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		// Set the database object
+		if (array_key_exists('dbo', $config))
+		{
+			$this->db = $config['dbo'];
+		}
+		else
+		{
+			$this->db = FOFPlatform::getInstance()->getDbo();
+		}
+
+		// Set the $name/$_name variable
+		$component = $this->input->getCmd('option', 'com_foobar');
+
+		if (array_key_exists('option', $config))
+		{
+			$component = $config['option'];
+		}
+
+		// Figure out where the XML schema files are stored
+		if (array_key_exists('dbinstaller_directory', $config))
+		{
+			$this->xmlDirectory = $config['dbinstaller_directory'];
+		}
+		else
+		{
+			// Nothing is defined, assume the files are stored in the sql/xml directory inside the component's administrator section
+			$directories = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+			$this->setXmlDirectory($directories['admin'] . '/sql/xml');
+		}
+
+		// Do we have a set of XML files to look for?
+		if (array_key_exists('dbinstaller_files', $config))
+		{
+			$files = $config['dbinstaller_files'];
+
+			if (!is_array($files))
+			{
+				$files = explode(',', $files);
+			}
+
+			$this->xmlFiles = $files;
+		}
+
+	}
+
+	/**
+	 * Sets the directory where XML schema files are stored
+	 *
+	 * @param   string  $xmlDirectory
+	 */
+	public function setXmlDirectory($xmlDirectory)
+	{
+		$this->xmlDirectory = $xmlDirectory;
+	}
+
+	/**
+	 * Returns the directory where XML schema files are stored
+	 *
+	 * @return  string
+	 */
+	public function getXmlDirectory()
+	{
+		return $this->xmlDirectory;
+	}
+
+	/**
+	 * Creates or updates the database schema
+	 *
+	 * @return  void
+	 *
+	 * @throws  Exception  When a database query fails and it doesn't have the canfail flag
+	 */
+	public function updateSchema()
+	{
+		// Get the schema XML file
+		$xml = $this->findSchemaXml();
+
+		if (empty($xml))
+		{
+			return;
+		}
+
+		// Make sure there are SQL commands in this file
+		if (!$xml->sql)
+		{
+			return;
+		}
+
+		// Walk the sql > action tags to find all tables
+		/** @var SimpleXMLElement $actions */
+		$actions = $xml->sql->children();
+
+		/**
+		 * The meta/autocollation node defines if I should automatically apply the correct collation (utf8 or utf8mb4)
+		 * to the database tables managed by the schema updater. When enabled (default) the queries are automatically
+		 * converted to the correct collation (utf8mb4_unicode_ci or utf8_general_ci) depending on whether your Joomla!
+		 * and MySQL server support Multibyte UTF-8 (UTF8MB4). Moreover, if UTF8MB4 is supported, all CREATE TABLE
+		 * queries are analyzed and the tables referenced in them are auto-converted to the proper utf8mb4 collation.
+		 */
+		$autoCollationConversion = true;
+
+		if ($xml->meta->autocollation)
+		{
+			$value = (string) $xml->meta->autocollation;
+			$value = trim($value);
+			$value = strtolower($value);
+
+			$autoCollationConversion = in_array($value, array('true', '1', 'on', 'yes'));
+		}
+
+		try
+		{
+			$hasUtf8mb4Support = $this->db->hasUTF8mb4Support();
+		}
+		catch (\Exception $e)
+		{
+			$hasUtf8mb4Support = false;
+		}
+
+		$tablesToConvert = array();
+
+		/** @var SimpleXMLElement $action */
+		foreach ($actions as $action)
+		{
+			// Get the attributes
+			$attributes = $action->attributes();
+
+			// Get the table / view name
+			$table = $attributes->table ? (string)$attributes->table : '';
+
+			if (empty($table))
+			{
+				continue;
+			}
+
+			// Am I allowed to let this action fail?
+			$canFailAction = $attributes->canfail ? $attributes->canfail : 0;
+
+			// Evaluate conditions
+			$shouldExecute = true;
+
+			/** @var SimpleXMLElement $node */
+			foreach ($action->children() as $node)
+			{
+				if ($node->getName() == 'condition')
+				{
+					// Get the operator
+					$operator = $node->attributes()->operator ? (string)$node->attributes()->operator : 'and';
+					$operator = empty($operator) ? 'and' : $operator;
+
+					$condition = $this->conditionMet($table, $node);
+
+					switch ($operator)
+					{
+						case 'not':
+							$shouldExecute = $shouldExecute && !$condition;
+							break;
+
+						case 'or':
+							$shouldExecute = $shouldExecute || $condition;
+							break;
+
+						case 'nor':
+							$shouldExecute = !$shouldExecute && !$condition;
+							break;
+
+						case 'xor':
+							$shouldExecute = ($shouldExecute xor $condition);
+							break;
+
+						case 'maybe':
+							$shouldExecute = $condition ? true : $shouldExecute;
+							break;
+
+						default:
+							$shouldExecute = $shouldExecute && $condition;
+							break;
+					}
+				}
+
+				// DO NOT USE BOOLEAN SHORT CIRCUIT EVALUATION!
+				// if (!$shouldExecute) break;
+			}
+
+			// Do I have to only collect the tables from CREATE TABLE queries?
+			$onlyCollectTables = !$shouldExecute && $autoCollationConversion && $hasUtf8mb4Support;
+
+			// Make sure all conditions are met OR I have to collect tables from CREATE TABLE queries.
+			if (!$shouldExecute && !$onlyCollectTables)
+			{
+				continue;
+			}
+
+			// Execute queries
+			foreach ($action->children() as $node)
+			{
+				if ($node->getName() == 'query')
+				{
+					$query = (string) $node;
+
+					if ($autoCollationConversion && $hasUtf8mb4Support)
+					{
+						$this->extractTablesToConvert($query, $tablesToConvert);
+					}
+
+					// If we're only collecting tables do not run the queries
+					if ($onlyCollectTables)
+					{
+						continue;
+					}
+
+					$canFail = $node->attributes->canfail ? (string)$node->attributes->canfail : $canFailAction;
+
+					if (is_string($canFail))
+					{
+						$canFail = strtoupper($canFail);
+					}
+
+					$canFail = (in_array($canFail, array(true, 1, 'YES', 'TRUE')));
+
+					// Do I need to automatically convert the collation of all CREATE / ALTER queries?
+					if ($autoCollationConversion)
+					{
+						if ($hasUtf8mb4Support)
+						{
+							// We have UTF8MB4 support. Convert all queries to UTF8MB4.
+							$query = $this->convertUtf8QueryToUtf8mb4($query);
+						}
+						else
+						{
+							// We do not have UTF8MB4 support. Convert all queries to plain old UTF8.
+							$query = $this->convertUtf8mb4QueryToUtf8($query);
+						}
+					}
+
+					$this->db->setQuery($query);
+
+					try
+					{
+						$this->db->execute();
+					}
+					catch (Exception $e)
+					{
+						// If we are not allowed to fail, throw back the exception we caught
+						if (!$canFail)
+						{
+							throw $e;
+						}
+					}
+				}
+			}
+		}
+
+		// Auto-convert the collation of tables if we are told to do so, have utf8mb4 support and a list of tables.
+		if ($autoCollationConversion && $hasUtf8mb4Support && !empty($tablesToConvert))
+		{
+			$this->convertTablesToUtf8mb4($tablesToConvert);
+		}
+	}
+
+	/**
+	 * Uninstalls the database schema
+	 *
+	 * @return  void
+	 */
+	public function removeSchema()
+	{
+		// Get the schema XML file
+		$xml = $this->findSchemaXml();
+
+		if (empty($xml))
+		{
+			return;
+		}
+
+		// Make sure there are SQL commands in this file
+		if (!$xml->sql)
+		{
+			return;
+		}
+
+		// Walk the sql > action tags to find all tables
+		$tables = array();
+		/** @var SimpleXMLElement $actions */
+		$actions = $xml->sql->children();
+
+		/** @var SimpleXMLElement $action */
+		foreach ($actions as $action)
+		{
+			$attributes = $action->attributes();
+			$tables[] = (string)$attributes->table;
+		}
+
+		// Simplify the tables list
+		$tables = array_unique($tables);
+
+		// Start dropping tables
+		foreach ($tables as $table)
+		{
+			try
+			{
+				$this->db->dropTable($table);
+			}
+			catch (Exception $e)
+			{
+				// Do not fail if I can't drop the table
+			}
+		}
+	}
+
+	/**
+	 * Find an suitable schema XML file for this database type and return the SimpleXMLElement holding its information
+	 *
+	 * @return  null|SimpleXMLElement  Null if no suitable schema XML file is found
+	 */
+	protected function findSchemaXml()
+	{
+		$driverType = $this->db->name;
+		$xml = null;
+
+		// And now look for the file
+		foreach ($this->xmlFiles as $baseName)
+		{
+			// Remove any accidental whitespace
+			$baseName = trim($baseName);
+
+			// Get the full path to the file
+			$fileName = $this->xmlDirectory . '/' . $baseName . '.xml';
+
+			// Make sure the file exists
+			if (!@file_exists($fileName))
+			{
+				continue;
+			}
+
+			// Make sure the file is a valid XML document
+			try
+			{
+				$xml = new SimpleXMLElement($fileName, LIBXML_NONET, true);
+			}
+			catch (Exception $e)
+			{
+				$xml = null;
+				continue;
+			}
+
+			// Make sure the file is an XML schema file
+			if ($xml->getName() != 'schema')
+			{
+				$xml = null;
+				continue;
+			}
+
+			if (!$xml->meta)
+			{
+				$xml = null;
+				continue;
+			}
+
+			if (!$xml->meta->drivers)
+			{
+				$xml = null;
+				continue;
+			}
+
+			/** @var SimpleXMLElement $drivers */
+			$drivers = $xml->meta->drivers;
+
+			// Strict driver name match
+			foreach ($drivers->children() as $driverTypeTag)
+			{
+				$thisDriverType = (string)$driverTypeTag;
+
+				if ($thisDriverType == $driverType)
+				{
+					return $xml;
+				}
+			}
+
+			// Some custom database drivers use a non-standard $name variable. Let try a relaxed match.
+			foreach ($drivers->children() as $driverTypeTag)
+			{
+				$thisDriverType = (string)$driverTypeTag;
+
+				if (
+					// e.g. $driverType = 'mysqlistupid', $thisDriverType = 'mysqli' => driver matched
+					strpos($driverType, $thisDriverType) === 0
+					// e.g. $driverType = 'stupidmysqli', $thisDriverType = 'mysqli' => driver matched
+					|| (substr($driverType, -strlen($thisDriverType)) == $thisDriverType)
+				)
+				{
+					return $xml;
+				}
+			}
+
+			$xml = null;
+		}
+
+		return $xml;
+	}
+
+	/**
+	 * Checks if a condition is met
+	 *
+	 * @param   string            $table  The table we're operating on
+	 * @param   SimpleXMLElement  $node   The condition definition node
+	 *
+	 * @return  bool
+	 */
+	protected function conditionMet($table, SimpleXMLElement $node)
+	{
+		if (empty(static::$allTables))
+		{
+			static::$allTables = $this->db->getTableList();
+		}
+
+		// Does the table exist?
+		$tableNormal = $this->db->replacePrefix($table);
+		$tableExists = in_array($tableNormal, static::$allTables);
+
+		// Initialise
+		$condition = false;
+
+		// Get the condition's attributes
+		$attributes = $node->attributes();
+		$type = $attributes->type ? $attributes->type : null;
+		$value = $attributes->value ? (string) $attributes->value : null;
+
+		switch ($type)
+		{
+			// Check if a table or column is missing
+			case 'missing':
+				$fieldName = (string)$value;
+
+				if (empty($fieldName))
+				{
+					$condition = !$tableExists;
+				}
+				else
+				{
+					try
+					{
+						$tableColumns = $this->db->getTableColumns($tableNormal, true);
+					}
+					catch (\Exception $e)
+					{
+						$tableColumns = array();
+					}
+
+					$condition = !array_key_exists($fieldName, $tableColumns);
+				}
+
+				break;
+
+			// Check if a column type matches the "coltype" attribute
+			case 'type':
+				try
+				{
+					$tableColumns = $this->db->getTableColumns($tableNormal, false);
+				}
+				catch (\Exception $e)
+				{
+					$tableColumns = array();
+				}
+
+				$condition = false;
+
+				if (array_key_exists($value, $tableColumns))
+				{
+					$coltype = $attributes->coltype ? $attributes->coltype : null;
+
+					if (!empty($coltype))
+					{
+						$coltype = strtolower($coltype);
+						$currentType = strtolower($tableColumns[$value]->Type);
+
+						$condition = ($coltype == $currentType);
+					}
+				}
+
+				break;
+
+			// Check if a (named) index exists on the table. Currently only supported on MySQL.
+			case 'index':
+				$indexName = (string) $value;
+				$condition = true;
+
+				if (!empty($indexName))
+				{
+					$indexName = str_replace('#__', $this->db->getPrefix(), $indexName);
+					$condition = $this->hasIndex($tableNormal, $indexName);
+				}
+
+				break;
+
+			// Check if a table or column needs to be upgraded to utf8mb4
+			case 'utf8mb4upgrade':
+				$condition = false;
+
+				// Check if the driver and the database connection have UTF8MB4 support
+				try
+				{
+					$hasUtf8mb4Support = $this->db->hasUTF8mb4Support();
+				}
+				catch (\Exception $e)
+				{
+					$hasUtf8mb4Support = false;
+				}
+
+				if ($hasUtf8mb4Support)
+				{
+					$fieldName = (string)$value;
+
+					if (empty($fieldName))
+					{
+						$collation = $this->getTableCollation($tableNormal);
+					}
+					else
+					{
+						$collation = $this->getColumnCollation($tableNormal, $fieldName);
+					}
+
+					$parts    = explode('_', $collation, 3);
+					$encoding = empty($parts[0]) ? '' : strtolower($parts[0]);
+
+					$condition = $encoding != 'utf8mb4';
+				}
+
+				break;
+
+			// Check if the result of a query matches our expectation
+			case 'equals':
+				$query = (string)$node;
+				$this->db->setQuery($query);
+
+				try
+				{
+					$result = $this->db->loadResult();
+					$condition = ($result == $value);
+				}
+				catch (Exception $e)
+				{
+					return false;
+				}
+
+				break;
+
+			// Always returns true
+			case 'true':
+				return true;
+				break;
+
+			default:
+				return false;
+				break;
+		}
+
+		return $condition;
+	}
+
+	/**
+	 * Get the collation of a table. Uses an internal cache for efficiency.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string  The collation, e.g. "utf8_general_ci"
+	 */
+	private function getTableCollation($tableName)
+	{
+		static $cache = array();
+
+		$tableName = $this->db->replacePrefix($tableName);
+
+		if (!isset($cache[$tableName]))
+		{
+			$cache[$tableName] = $this->realGetTableCollation($tableName);
+		}
+
+		return $cache[$tableName];
+	}
+
+	/**
+	 * Get the collation of a table. This is the internal method used by getTableCollation.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string  The collation, e.g. "utf8_general_ci"
+	 */
+	private function realGetTableCollation($tableName)
+	{
+		try
+		{
+			$utf8Support = $this->db->hasUTFSupport();
+		}
+		catch (\Exception $e)
+		{
+			$utf8Support = false;
+		}
+
+		try
+		{
+			$utf8mb4Support = $utf8Support && $this->db->hasUTF8mb4Support();
+		}
+		catch (\Exception $e)
+		{
+			$utf8mb4Support = false;
+		}
+
+		$collation = $utf8mb4Support ? 'utf8mb4_unicode_ci' : ($utf8Support ? 'utf_general_ci' : 'latin1_swedish_ci');
+
+		$query = 'SHOW TABLE STATUS LIKE ' . $this->db->q($tableName);
+
+		try
+		{
+			$row = $this->db->setQuery($query)->loadAssoc();
+		}
+		catch (\Exception $e)
+		{
+			return $collation;
+		}
+
+		if (empty($row))
+		{
+			return $collation;
+		}
+
+		if (!isset($row['Collation']))
+		{
+			return $collation;
+		}
+
+		if (empty($row['Collation']))
+		{
+			return $collation;
+		}
+
+		return $row['Collation'];
+	}
+
+	/**
+	 * Get the collation of a column. Uses an internal cache for efficiency.
+	 *
+	 * @param   string  $tableName   The name of the table
+	 * @param   string  $columnName  The name of the column
+	 *
+	 * @return  string  The collation, e.g. "utf8_general_ci"
+	 */
+	private function getColumnCollation($tableName, $columnName)
+	{
+		static $cache = array();
+
+		$tableName = $this->db->replacePrefix($tableName);
+		$columnName = $this->db->replacePrefix($columnName);
+
+		if (!isset($cache[$tableName]))
+		{
+			$cache[$tableName] = array();
+		}
+
+		if (!isset($cache[$tableName][$columnName]))
+		{
+			$cache[$tableName][$columnName] = $this->realGetColumnCollation($tableName, $columnName);
+		}
+
+		return $cache[$tableName][$columnName];
+	}
+
+	/**
+	 * Get the collation of a column. This is the internal method used by getColumnCollation.
+	 *
+	 * @param   string  $tableName   The name of the table
+	 * @param   string  $columnName  The name of the column
+	 *
+	 * @return  string  The collation, e.g. "utf8_general_ci"
+	 */
+	private function realGetColumnCollation($tableName, $columnName)
+	{
+		$collation = $this->getTableCollation($tableName);
+
+		$query = 'SHOW FULL COLUMNS FROM ' . $this->db->qn($tableName) . ' LIKE ' . $this->db->q($columnName);
+
+		try
+		{
+			$row = $this->db->setQuery($query)->loadAssoc();
+		}
+		catch (\Exception $e)
+		{
+			return $collation;
+		}
+
+		if (empty($row))
+		{
+			return $collation;
+		}
+
+		if (!isset($row['Collation']))
+		{
+			return $collation;
+		}
+
+		if (empty($row['Collation']))
+		{
+			return $collation;
+		}
+
+		return $row['Collation'];
+	}
+
+	/**
+	 * Automatically downgrade a CREATE TABLE or ALTER TABLE query from utf8mb4 (UTF-8 Multibyte) to plain utf8.
+	 *
+	 * We use our own method so we can be site it works even on Joomla! 3.4 or earlier, where UTF8MB4 support is not
+	 * implemented.
+	 *
+	 * @param   string  $query  The query to convert
+	 *
+	 * @return  string  The converted query
+	 */
+	private function convertUtf8mb4QueryToUtf8($query)
+	{
+		// If it's not an ALTER TABLE or CREATE TABLE command there's nothing to convert
+		$beginningOfQuery = substr($query, 0, 12);
+		$beginningOfQuery = strtoupper($beginningOfQuery);
+
+		if (!in_array($beginningOfQuery, array('ALTER TABLE ', 'CREATE TABLE')))
+		{
+			return $query;
+		}
+
+		// Replace utf8mb4 with utf8
+		$from = array(
+			'utf8mb4_unicode_ci',
+			'utf8mb4_',
+			'utf8mb4',
+		);
+
+		$to = array(
+			'utf8_general_ci', // Yeah, we convert utf8mb4_unicode_ci to utf8_general_ci per Joomla!'s conventions
+			'utf8_',
+			'utf8',
+		);
+
+		return str_replace($from, $to, $query);
+	}
+
+	/**
+	 * Automatically upgrade a CREATE TABLE or ALTER TABLE query from plain utf8 to utf8mb4 (UTF-8 Multibyte).
+	 *
+	 * @param   string  $query  The query to convert
+	 *
+	 * @return  string  The converted query
+	 */
+	private function convertUtf8QueryToUtf8mb4($query)
+	{
+		// If it's not an ALTER TABLE or CREATE TABLE command there's nothing to convert
+		$beginningOfQuery = substr($query, 0, 12);
+		$beginningOfQuery = strtoupper($beginningOfQuery);
+
+		if (!in_array($beginningOfQuery, array('ALTER TABLE ', 'CREATE TABLE')))
+		{
+			return $query;
+		}
+
+		// Replace utf8 with utf8mb4
+		$from = array(
+			'utf8_general_ci',
+			'utf8_',
+			'utf8',
+		);
+
+		$to = array(
+			'utf8mb4_unicode_ci', // Yeah, we convert utf8_general_ci to utf8mb4_unicode_ci per Joomla!'s conventions
+			'utf8mb4_',
+			'utf8mb4',
+		);
+
+		return str_replace($from, $to, $query);
+	}
+
+	/**
+	 * Analyzes a query. If it's a CREATE TABLE query the table is added to the $tables array.
+	 *
+	 * @param   string  $query   The query to analyze
+	 * @param   string  $tables  The array where the name of the detected table is added
+	 *
+	 * @return  void
+	 */
+	private function extractTablesToConvert($query, &$tables)
+	{
+		// Normalize the whitespace of the query
+		$query = trim($query);
+		$query = str_replace(array("\r\n", "\r", "\n"), ' ', $query);
+
+		while (strstr($query, '  ') !== false)
+		{
+			$query = str_replace('  ', ' ', $query);
+		}
+
+		// Is it a create table query?
+		$queryStart = substr($query, 0, 12);
+		$queryStart = strtoupper($queryStart);
+
+		if ($queryStart != 'CREATE TABLE')
+		{
+			return;
+		}
+
+		// Remove the CREATE TABLE keyword. Also, If there's an IF NOT EXISTS clause remove it.
+		$query = substr($query, 12);
+		$query = str_ireplace('IF NOT EXISTS', '', $query);
+		$query = trim($query);
+
+		// Make sure there is a space between the table name and its definition, denoted by an open parenthesis
+		$query = str_replace('(', ' (', $query);
+
+		// Now we should have the name of the table, a space and the rest of the query. Extract the table name.
+		$parts = explode(' ', $query, 2);
+		$tableName = $parts[0];
+
+		/**
+		 * The table name may be quoted. Since UTF8MB4 is only supported in MySQL, the table name can only be
+		 * quoted with surrounding backticks. Therefore we can trim backquotes from the table name to unquote it!
+		 **/
+		$tableName = trim($tableName, '`');
+
+		// Finally, add the table name to $tables if it doesn't already exist.
+		if (!in_array($tableName, $tables))
+		{
+			$tables[] = $tableName;
+		}
+	}
+
+	/**
+	 * Converts the collation of tables listed in $tablesToConvert to utf8mb4_unicode_ci
+	 *
+	 * @param   array  $tablesToConvert  The list of tables to convert
+	 *
+	 * @return  void
+	 */
+	private function convertTablesToUtf8mb4($tablesToConvert)
+	{
+		try
+		{
+			$utf8mb4Support = $this->db->hasUTF8mb4Support();
+		}
+		catch (\Exception $e)
+		{
+			$utf8mb4Support = false;
+		}
+
+		// Make sure the database driver REALLY has support for converting character sets
+		if (!$utf8mb4Support)
+		{
+			return;
+		}
+
+		asort($tablesToConvert);
+
+		foreach ($tablesToConvert as $tableName)
+		{
+			$collation = $this->getTableCollation($tableName);
+
+			$parts    = explode('_', $collation, 3);
+			$encoding = empty($parts[0]) ? '' : strtolower($parts[0]);
+
+			if ($encoding != 'utf8mb4')
+			{
+				$queries = $this->db->getAlterTableCharacterSet($tableName);
+
+				try
+				{
+					foreach ($queries as $query)
+					{
+						$this->db->setQuery($query)->execute();
+					}
+				}
+				catch (\Exception $e)
+				{
+					// We ignore failed conversions. Remember, you MUST change your indices MANUALLY.
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns true if table $tableName has an index named $indexName or if it's impossible to retrieve index names for
+	 * the table (not enough privileges, not a MySQL database, ...)
+	 *
+	 * @param   string  $tableName  The name of the table
+	 * @param   string  $indexName  The name of the index
+	 *
+	 * @return  bool
+	 */
+	private function hasIndex($tableName, $indexName)
+	{
+		static $isMySQL = null;
+		static $cache = array();
+
+		if (is_null($isMySQL))
+		{
+			$driverType = $this->db->name;
+			$driverType = strtolower($driverType);
+			$isMySQL = true;
+
+			if (
+				!strpos($driverType, 'mysql') === 0
+				&& !(substr($driverType, -5) == 'mysql')
+				&& !(substr($driverType, -6) == 'mysqli')
+			)
+			{
+				$isMySQL = false;
+			}
+		}
+
+		// Not MySQL? Lie and return true.
+		if (!$isMySQL)
+		{
+			return true;
+		}
+
+		if (!isset($cache[$tableName]))
+		{
+			$cache[$tableName] = array();
+		}
+
+		if (!isset($cache[$tableName][$indexName]))
+		{
+			$cache[$tableName][$indexName] = true;
+
+			try
+			{
+				$indices          = array();
+				$query            = 'SHOW INDEXES FROM ' . $this->db->qn($tableName);
+				$indexDefinitions = $this->db->setQuery($query)->loadAssocList();
+
+				if (!empty($indexDefinitions) && is_array($indexDefinitions))
+				{
+					foreach ($indexDefinitions as $def)
+					{
+						$indices[] = $def['Key_name'];
+					}
+
+					$indices = array_unique($indices);
+				}
+
+				$cache[$tableName][$indexName] = in_array($indexName, $indices);
+			}
+			catch (\Exception $e)
+			{
+				// Ignore errors
+			}
+		}
+
+		return $cache[$tableName][$indexName];
+	}
+}
diff --git a/core/libraries/fof/database/interface.php b/core/libraries/fof/database/interface.php
new file mode 100644
index 00000000..21be6112
--- /dev/null
+++ b/core/libraries/fof/database/interface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (!interface_exists('JDatabaseInterface'))
+{
+	/**
+	 * Joomla Platform Database Interface
+	 *
+	 * @since  11.2
+	 */
+	interface JDatabaseInterface
+	{
+		/**
+		 * Test to see if the connector is available.
+		 *
+		 * @return  boolean  True on success, false otherwise.
+		 *
+		 * @since   11.2
+		 */
+		public static function isSupported();
+	}
+}
+
+interface FOFDatabaseInterface extends JDatabaseInterface
+{
+}
diff --git a/core/libraries/fof/database/iterator.php b/core/libraries/fof/database/iterator.php
new file mode 100644
index 00000000..c05d8a6f
--- /dev/null
+++ b/core/libraries/fof/database/iterator.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Database iterator
+ */
+abstract class FOFDatabaseIterator implements Iterator
+{
+	/**
+	 * The database cursor.
+	 *
+	 * @var    mixed
+	 */
+	protected $cursor;
+
+	/**
+	 * The class of object to create.
+	 *
+	 * @var    string
+	 */
+	protected $class;
+
+	/**
+	 * The name of the column to use for the key of the database record.
+	 *
+	 * @var    mixed
+	 */
+	private $_column;
+
+	/**
+	 * The current database record.
+	 *
+	 * @var    mixed
+	 */
+	private $_current;
+
+	/**
+	 * The current database record as a FOFTable object.
+	 *
+	 * @var    FOFTable
+	 */
+	private $_currentTable;
+
+	/**
+	 * A numeric or string key for the current database record.
+	 *
+	 * @var    scalar
+	 */
+	private $_key;
+
+	/**
+	 * The number of fetched records.
+	 *
+	 * @var    integer
+	 */
+	private $_fetched = 0;
+
+	/**
+	 * A FOFTable object created using the class type $class, used by getTable
+	 *
+	 * @var   FOFTable
+	 */
+	private $_tableObject = null;
+
+	/**
+	 * Returns an iterator object for a specific database type
+	 *
+	 * @param   string  $dbName  The database type, e.g. mysql, mysqli, sqlazure etc.
+	 * @param   mixed   $cursor  The database cursor
+	 * @param   string  $column  An option column to use as the iterator key
+	 * @param   string  $class   The table class of the returned objects
+	 * @param   array   $config  Configuration parameters to push to the table class
+	 *
+	 * @return  FOFDatabaseIterator
+	 *
+	 * @throws  InvalidArgumentException
+	 */
+	public static function &getIterator($dbName, $cursor, $column = null, $class, $config = array())
+	{
+		$className = 'FOFDatabaseIterator' . ucfirst($dbName);
+
+		$object = new $className($cursor, $column, $class, $config);
+
+		return $object;
+	}
+
+	/**
+	 * Database iterator constructor.
+	 *
+	 * @param   mixed   $cursor  The database cursor.
+	 * @param   string  $column  An option column to use as the iterator key.
+	 * @param   string  $class   The table class of the returned objects.
+	 * @param   array   $config  Configuration parameters to push to the table class
+	 *
+	 * @throws  InvalidArgumentException
+	 */
+	public function __construct($cursor, $column = null, $class, $config = array())
+	{
+		// Figure out the type and prefix of the class by the class name
+		$parts = FOFInflector::explode($class);
+
+        if(count($parts) != 3)
+        {
+            throw new InvalidArgumentException('Invalid table name, expected a pattern like ComponentTableFoobar got '.$class);
+        }
+
+		$this->_tableObject = FOFTable::getInstance($parts[2], ucfirst($parts[0]) . ucfirst($parts[1]))->getClone();
+
+		$this->cursor   = $cursor;
+		$this->class    = 'stdClass';
+		$this->_column  = $column;
+		$this->_fetched = 0;
+
+		$this->next();
+	}
+
+	/**
+	 * Database iterator destructor.
+	 */
+	public function __destruct()
+	{
+		if ($this->cursor)
+		{
+			$this->freeResult($this->cursor);
+		}
+	}
+
+	/**
+	 * The current element in the iterator.
+	 *
+	 * @return  object
+	 *
+	 * @see     Iterator::current()
+	 */
+	public function current()
+	{
+		return $this->_currentTable;
+	}
+
+	/**
+	 * The key of the current element in the iterator.
+	 *
+	 * @return  scalar
+	 *
+	 * @see     Iterator::key()
+	 */
+	public function key()
+	{
+		return $this->_key;
+	}
+
+	/**
+	 * Moves forward to the next result from the SQL query.
+	 *
+	 * @return  void
+	 *
+	 * @see     Iterator::next()
+	 */
+	public function next()
+	{
+		// Set the default key as being the number of fetched object
+		$this->_key = $this->_fetched;
+
+		// Try to get an object
+		$this->_current = $this->fetchObject();
+
+		// If an object has been found
+		if ($this->_current)
+		{
+			$this->_currentTable = $this->getTable();
+
+			// Set the key as being the indexed column (if it exists)
+			if (isset($this->_current->{$this->_column}))
+			{
+				$this->_key = $this->_current->{$this->_column};
+			}
+
+			// Update the number of fetched object
+			$this->_fetched++;
+		}
+	}
+
+	/**
+	 * Rewinds the iterator.
+	 *
+	 * This iterator cannot be rewound.
+	 *
+	 * @return  void
+	 *
+	 * @see     Iterator::rewind()
+	 */
+	public function rewind()
+	{
+	}
+
+	/**
+	 * Checks if the current position of the iterator is valid.
+	 *
+	 * @return  boolean
+	 *
+	 * @see     Iterator::valid()
+	 */
+	public function valid()
+	{
+		return (boolean) $this->_current;
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 */
+	abstract protected function fetchObject();
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 */
+	abstract protected function freeResult();
+
+	/**
+	 * Returns the data in $this->_current as a FOFTable instance
+	 *
+	 * @return  FOFTable
+	 *
+	 * @throws  OutOfBoundsException
+	 */
+	protected function getTable()
+	{
+		if (!$this->valid())
+		{
+			throw new OutOfBoundsException('Cannot get item past iterator\'s bounds', 500);
+		}
+
+		$this->_tableObject->bind($this->_current);
+
+		return $this->_tableObject;
+	}
+}
diff --git a/core/libraries/fof/database/iterator/azure.php b/core/libraries/fof/database/iterator/azure.php
new file mode 100644
index 00000000..384e1050
--- /dev/null
+++ b/core/libraries/fof/database/iterator/azure.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * SQL azure database iterator.
+ */
+class FOFDatabaseIteratorAzure extends FOFDatabaseIteratorSqlsrv
+{
+}
diff --git a/core/libraries/fof/database/iterator/mysql.php b/core/libraries/fof/database/iterator/mysql.php
new file mode 100644
index 00000000..a5ba3ba8
--- /dev/null
+++ b/core/libraries/fof/database/iterator/mysql.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQL database iterator.
+ */
+class FOFDatabaseIteratorMysql extends FOFDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return @mysql_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 */
+	protected function fetchObject()
+	{
+		return @mysql_fetch_object($this->cursor, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 */
+	protected function freeResult()
+	{
+		@mysql_free_result($this->cursor);
+	}
+}
diff --git a/core/libraries/fof/database/iterator/mysqli.php b/core/libraries/fof/database/iterator/mysqli.php
new file mode 100644
index 00000000..91de4c32
--- /dev/null
+++ b/core/libraries/fof/database/iterator/mysqli.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQLi database iterator.
+ */
+class FOFDatabaseIteratorMysqli extends FOFDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return @mysqli_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 */
+	protected function fetchObject()
+	{
+		return @mysqli_fetch_object($this->cursor, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 */
+	protected function freeResult()
+	{
+		@mysqli_free_result($this->cursor);
+	}
+}
diff --git a/core/libraries/fof/database/iterator/oracle.php b/core/libraries/fof/database/iterator/oracle.php
new file mode 100644
index 00000000..fc63e9e5
--- /dev/null
+++ b/core/libraries/fof/database/iterator/oracle.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQLi database iterator.
+ */
+class FOFDatabaseIteratorOracle extends FOFDatabaseIteratorPdo
+{
+}
diff --git a/core/libraries/fof/database/iterator/pdo.php b/core/libraries/fof/database/iterator/pdo.php
new file mode 100644
index 00000000..78a949d6
--- /dev/null
+++ b/core/libraries/fof/database/iterator/pdo.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * PDO database iterator.
+ */
+class FOFDatabaseIteratorPdo extends FOFDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		if (!empty($this->cursor) && $this->cursor instanceof PDOStatement)
+		{
+			return @$this->cursor->rowCount();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 */
+	protected function fetchObject()
+	{
+		if (!empty($this->cursor) && $this->cursor instanceof PDOStatement)
+		{
+			return @$this->cursor->fetchObject($this->class);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 */
+	protected function freeResult()
+	{
+		if (!empty($this->cursor) && $this->cursor instanceof PDOStatement)
+		{
+			@$this->cursor->closeCursor();
+		}
+	}
+}
diff --git a/core/libraries/fof/database/iterator/pdomysql.php b/core/libraries/fof/database/iterator/pdomysql.php
new file mode 100644
index 00000000..558455a3
--- /dev/null
+++ b/core/libraries/fof/database/iterator/pdomysql.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQLi database iterator.
+ */
+class FOFDatabaseIteratorPdomysql extends FOFDatabaseIteratorPdo
+{
+}
diff --git a/core/libraries/fof/database/iterator/postgresql.php b/core/libraries/fof/database/iterator/postgresql.php
new file mode 100644
index 00000000..f5ff7ef7
--- /dev/null
+++ b/core/libraries/fof/database/iterator/postgresql.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * PostgreSQL database iterator.
+ */
+class FOFDatabaseIteratorPostgresql extends FOFDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return @pg_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 */
+	protected function fetchObject()
+	{
+		return @pg_fetch_object($this->cursor, null, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 */
+	protected function freeResult()
+	{
+		@pg_free_result($this->cursor);
+	}
+}
diff --git a/core/libraries/fof/database/iterator/sqlite.php b/core/libraries/fof/database/iterator/sqlite.php
new file mode 100644
index 00000000..02cffb82
--- /dev/null
+++ b/core/libraries/fof/database/iterator/sqlite.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * MySQLi database iterator.
+ */
+class FOFDatabaseIteratorSqlite extends FOFDatabaseIteratorPdo
+{
+}
diff --git a/core/libraries/fof/database/iterator/sqlsrv.php b/core/libraries/fof/database/iterator/sqlsrv.php
new file mode 100644
index 00000000..00ead6ff
--- /dev/null
+++ b/core/libraries/fof/database/iterator/sqlsrv.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * SQL server database iterator.
+ */
+class FOFDatabaseIteratorSqlsrv extends FOFDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return @sqlsrv_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 */
+	protected function fetchObject()
+	{
+		return @sqlsrv_fetch_object($this->cursor, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 */
+	protected function freeResult()
+	{
+		@sqlsrv_free_stmt($this->cursor);
+	}
+}
diff --git a/core/libraries/fof/database/query.php b/core/libraries/fof/database/query.php
new file mode 100644
index 00000000..cb610f08
--- /dev/null
+++ b/core/libraries/fof/database/query.php
@@ -0,0 +1,1732 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ *
+ * @method      string  q()   q($text, $escape = true)  Alias for quote method
+ * @method      string  qn()  qn($name, $as = null)     Alias for quoteName method
+ * @method      string  e()   e($text, $extra = false)  Alias for escape method
+ * @property-read   FOFDatabaseQueryElement  $type
+ * @property-read   FOFDatabaseQueryElement  $select
+ * @property-read   FOFDatabaseQueryElement  $group
+ * @property-read   FOFDatabaseQueryElement  $having
+ */
+abstract class FOFDatabaseQuery
+{
+	/**
+	 * @var    FOFDatabaseDriver  The database driver.
+	 * @since  11.1
+	 */
+	protected $db = null;
+
+	/**
+	 * @var    string  The SQL query (if a direct query string was provided).
+	 * @since  12.1
+	 */
+	protected $sql = null;
+
+	/**
+	 * @var    string  The query type.
+	 * @since  11.1
+	 */
+	protected $type = '';
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The query element for a generic query (type = null).
+	 * @since  11.1
+	 */
+	protected $element = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The select element.
+	 * @since  11.1
+	 */
+	protected $select = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The delete element.
+	 * @since  11.1
+	 */
+	protected $delete = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The update element.
+	 * @since  11.1
+	 */
+	protected $update = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The insert element.
+	 * @since  11.1
+	 */
+	protected $insert = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The from element.
+	 * @since  11.1
+	 */
+	protected $from = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The join element.
+	 * @since  11.1
+	 */
+	protected $join = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The set element.
+	 * @since  11.1
+	 */
+	protected $set = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The where element.
+	 * @since  11.1
+	 */
+	protected $where = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The group by element.
+	 * @since  11.1
+	 */
+	protected $group = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The having element.
+	 * @since  11.1
+	 */
+	protected $having = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The column list for an INSERT statement.
+	 * @since  11.1
+	 */
+	protected $columns = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The values list for an INSERT statement.
+	 * @since  11.1
+	 */
+	protected $values = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The order element.
+	 * @since  11.1
+	 */
+	protected $order = null;
+
+	/**
+	 * @var   object  The auto increment insert field element.
+	 * @since 11.1
+	 */
+	protected $autoIncrementField = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The call element.
+	 * @since  12.1
+	 */
+	protected $call = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The exec element.
+	 * @since  12.1
+	 */
+	protected $exec = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The union element.
+	 * @since  12.1
+	 */
+	protected $union = null;
+
+	/**
+	 * @var    FOFDatabaseQueryElement  The unionAll element.
+	 * @since  13.1
+	 */
+	protected $unionAll = null;
+
+	/**
+	 * Magic method to provide method alias support for quote() and quoteName().
+	 *
+	 * @param   string  $method  The called method.
+	 * @param   array   $args    The array of arguments passed to the method.
+	 *
+	 * @return  string  The aliased method's return value or null.
+	 *
+	 * @since   11.1
+	 */
+	public function __call($method, $args)
+	{
+		if (empty($args))
+		{
+			return;
+		}
+
+		switch ($method)
+		{
+			case 'q':
+				return $this->quote($args[0], isset($args[1]) ? $args[1] : true);
+				break;
+
+			case 'qn':
+				return $this->quoteName($args[0], isset($args[1]) ? $args[1] : null);
+				break;
+
+			case 'e':
+				return $this->escape($args[0], isset($args[1]) ? $args[1] : false);
+				break;
+		}
+	}
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   FOFDatabaseDriver  $db  The database driver.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(FOFDatabaseDriver $db = null)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Magic function to convert the query to a string.
+	 *
+	 * @return  string	The completed query.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		$query = '';
+
+		if ($this->sql)
+		{
+			return $this->sql;
+		}
+
+		switch ($this->type)
+		{
+			case 'element':
+				$query .= (string) $this->element;
+				break;
+
+			case 'select':
+				$query .= (string) $this->select;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->group)
+				{
+					$query .= (string) $this->group;
+				}
+
+				if ($this->having)
+				{
+					$query .= (string) $this->having;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				if ($this->union)
+				{
+					$query .= (string) $this->union;
+				}
+
+				break;
+
+			case 'delete':
+				$query .= (string) $this->delete;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'update':
+				$query .= (string) $this->update;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				$query .= (string) $this->set;
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'insert':
+				$query .= (string) $this->insert;
+
+				// Set method
+				if ($this->set)
+				{
+					$query .= (string) $this->set;
+				}
+				// Columns-Values method
+				elseif ($this->values)
+				{
+					if ($this->columns)
+					{
+						$query .= (string) $this->columns;
+					}
+
+					$elements = $this->values->getElements();
+
+					if (!($elements[0] instanceof $this))
+					{
+						$query .= ' VALUES ';
+					}
+
+					$query .= (string) $this->values;
+				}
+
+				break;
+
+			case 'call':
+				$query .= (string) $this->call;
+				break;
+
+			case 'exec':
+				$query .= (string) $this->exec;
+				break;
+		}
+
+		if ($this instanceof FOFDatabaseQueryLimitable)
+		{
+			$query = $this->processLimit($query, $this->limit, $this->offset);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Magic function to get protected variable value
+	 *
+	 * @param   string  $name  The name of the variable.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function __get($name)
+	{
+		return isset($this->$name) ? $this->$name : null;
+	}
+
+	/**
+	 * Add a single column, or array of columns to the CALL clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 * The call method can, however, be called multiple times in the same query.
+	 *
+	 * Usage:
+	 * $query->call('a.*')->call('b.id');
+	 * $query->call(array('a.*', 'b.id'));
+	 *
+	 * @param   mixed  $columns  A string or an array of field names.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function call($columns)
+	{
+		$this->type = 'call';
+
+		if (is_null($this->call))
+		{
+			$this->call = new FOFDatabaseQueryElement('CALL', $columns);
+		}
+		else
+		{
+			$this->call->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * Usage:
+	 * $query->select($query->castAsChar('a'));
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.1
+	 */
+	public function castAsChar($value)
+	{
+		return $value;
+	}
+
+	/**
+	 * Gets the number of characters in a string.
+	 *
+	 * Note, use 'length' to find the number of bytes in a string.
+	 *
+	 * Usage:
+	 * $query->select($query->charLength('a'));
+	 *
+	 * @param   string  $field      A value.
+	 * @param   string  $operator   Comparison operator between charLength integer value and $condition
+	 * @param   string  $condition  Integer value to compare charLength with.
+	 *
+	 * @return  string  The required char length call.
+	 *
+	 * @since   11.1
+	 */
+	public function charLength($field, $operator = null, $condition = null)
+	{
+		return 'CHAR_LENGTH(' . $field . ')' . (isset($operator) && isset($condition) ? ' ' . $operator . ' ' . $condition : '');
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function clear($clause = null)
+	{
+		$this->sql = null;
+
+		switch ($clause)
+		{
+			case 'select':
+				$this->select = null;
+				$this->type = null;
+				break;
+
+			case 'delete':
+				$this->delete = null;
+				$this->type = null;
+				break;
+
+			case 'update':
+				$this->update = null;
+				$this->type = null;
+				break;
+
+			case 'insert':
+				$this->insert = null;
+				$this->type = null;
+				$this->autoIncrementField = null;
+				break;
+
+			case 'from':
+				$this->from = null;
+				break;
+
+			case 'join':
+				$this->join = null;
+				break;
+
+			case 'set':
+				$this->set = null;
+				break;
+
+			case 'where':
+				$this->where = null;
+				break;
+
+			case 'group':
+				$this->group = null;
+				break;
+
+			case 'having':
+				$this->having = null;
+				break;
+
+			case 'order':
+				$this->order = null;
+				break;
+
+			case 'columns':
+				$this->columns = null;
+				break;
+
+			case 'values':
+				$this->values = null;
+				break;
+
+			case 'exec':
+				$this->exec = null;
+				$this->type = null;
+				break;
+
+			case 'call':
+				$this->call = null;
+				$this->type = null;
+				break;
+
+			case 'limit':
+				$this->offset = 0;
+				$this->limit = 0;
+				break;
+
+			case 'offset':
+				$this->offset = 0;
+				break;
+
+			case 'union':
+				$this->union = null;
+				break;
+
+			case 'unionAll':
+				$this->unionAll = null;
+				break;
+
+			default:
+				$this->type = null;
+				$this->select = null;
+				$this->delete = null;
+				$this->update = null;
+				$this->insert = null;
+				$this->from = null;
+				$this->join = null;
+				$this->set = null;
+				$this->where = null;
+				$this->group = null;
+				$this->having = null;
+				$this->order = null;
+				$this->columns = null;
+				$this->values = null;
+				$this->autoIncrementField = null;
+				$this->exec = null;
+				$this->call = null;
+				$this->union = null;
+				$this->unionAll = null;
+				$this->offset = 0;
+				$this->limit = 0;
+				break;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds a column, or array of column names that would be used for an INSERT INTO statement.
+	 *
+	 * @param   mixed  $columns  A column name, or array of column names.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function columns($columns)
+	{
+		if (is_null($this->columns))
+		{
+			$this->columns = new FOFDatabaseQueryElement('()', $columns);
+		}
+		else
+		{
+			$this->columns->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * Usage:
+	 * $query->select($query->concatenate(array('a', 'b')));
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return 'CONCATENATE(' . implode(' || ' . $this->quote($separator) . ' || ', $values) . ')';
+		}
+		else
+		{
+			return 'CONCATENATE(' . implode(' || ', $values) . ')';
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * Usage:
+	 * $query->where('published_up < '.$query->currentTimestamp());
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function currentTimestamp()
+	{
+		return 'CURRENT_TIMESTAMP()';
+	}
+
+	/**
+	 * Returns a PHP date() function compliant date format for the database driver.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the getDateFormat method directly.
+	 *
+	 * @return  string  The format string.
+	 *
+	 * @since   11.1
+	 */
+	public function dateFormat()
+	{
+		if (!($this->db instanceof FOFDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->getDateFormat();
+	}
+
+	/**
+	 * Creates a formatted dump of the query for debugging purposes.
+	 *
+	 * Usage:
+	 * echo $query->dump();
+	 *
+	 * @return  string
+	 *
+	 * @since   11.3
+	 */
+	public function dump()
+	{
+		return '<pre class="FOFDatabasequery">' . str_replace('#__', $this->db->getPrefix(), $this) . '</pre>';
+	}
+
+	/**
+	 * Add a table name to the DELETE clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 *
+	 * Usage:
+	 * $query->delete('#__a')->where('id = 1');
+	 *
+	 * @param   string  $table  The name of the table to delete from.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function delete($table = null)
+	{
+		$this->type = 'delete';
+		$this->delete = new FOFDatabaseQueryElement('DELETE', null);
+
+		if (!empty($table))
+		{
+			$this->from($table);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the escape method directly.
+	 *
+	 * Note that 'e' is an alias for this method as it is in FOFDatabaseDriver.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if the internal db property is not a valid object.
+	 */
+	public function escape($text, $extra = false)
+	{
+		if (!($this->db instanceof FOFDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->escape($text, $extra);
+	}
+
+	/**
+	 * Add a single column, or array of columns to the EXEC clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 * The exec method can, however, be called multiple times in the same query.
+	 *
+	 * Usage:
+	 * $query->exec('a.*')->exec('b.id');
+	 * $query->exec(array('a.*', 'b.id'));
+	 *
+	 * @param   mixed  $columns  A string or an array of field names.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function exec($columns)
+	{
+		$this->type = 'exec';
+
+		if (is_null($this->exec))
+		{
+			$this->exec = new FOFDatabaseQueryElement('EXEC', $columns);
+		}
+		else
+		{
+			$this->exec->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a table to the FROM clause of the query.
+	 *
+	 * Note that while an array of tables can be provided, it is recommended you use explicit joins.
+	 *
+	 * Usage:
+	 * $query->select('*')->from('#__a');
+	 *
+	 * @param   mixed   $tables         A string or array of table names.
+	 *                                  This can be a FOFDatabaseQuery object (or a child of it) when used
+	 *                                  as a subquery in FROM clause along with a value for $subQueryAlias.
+	 * @param   string  $subQueryAlias  Alias used when $tables is a FOFDatabaseQuery.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @throws  RuntimeException
+	 *
+	 * @since   11.1
+	 */
+	public function from($tables, $subQueryAlias = null)
+	{
+		if (is_null($this->from))
+		{
+			if ($tables instanceof $this)
+			{
+				if (is_null($subQueryAlias))
+				{
+					throw new RuntimeException('JLIB_DATABASE_ERROR_NULL_SUBQUERY_ALIAS');
+				}
+
+				$tables = '( ' . (string) $tables . ' ) AS ' . $this->quoteName($subQueryAlias);
+			}
+
+			$this->from = new FOFDatabaseQueryElement('FROM', $tables);
+		}
+		else
+		{
+			$this->from->append($tables);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Used to get a string to extract year from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->year($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing year to be extracted.
+	 *
+	 * @return  string  Returns string to extract year from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function year($date)
+	{
+		return 'YEAR(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract month from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->month($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing month to be extracted.
+	 *
+	 * @return  string  Returns string to extract month from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function month($date)
+	{
+		return 'MONTH(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract day from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->day($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing day to be extracted.
+	 *
+	 * @return  string  Returns string to extract day from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function day($date)
+	{
+		return 'DAY(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract hour from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->hour($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing hour to be extracted.
+	 *
+	 * @return  string  Returns string to extract hour from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function hour($date)
+	{
+		return 'HOUR(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract minute from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->minute($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing minute to be extracted.
+	 *
+	 * @return  string  Returns string to extract minute from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function minute($date)
+	{
+		return 'MINUTE(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract seconds from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->second($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing second to be extracted.
+	 *
+	 * @return  string  Returns string to extract second from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function second($date)
+	{
+		return 'SECOND(' . $date . ')';
+	}
+
+	/**
+	 * Add a grouping column to the GROUP clause of the query.
+	 *
+	 * Usage:
+	 * $query->group('id');
+	 *
+	 * @param   mixed  $columns  A string or array of ordering columns.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function group($columns)
+	{
+		if (is_null($this->group))
+		{
+			$this->group = new FOFDatabaseQueryElement('GROUP BY', $columns);
+		}
+		else
+		{
+			$this->group->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * A conditions to the HAVING clause of the query.
+	 *
+	 * Usage:
+	 * $query->group('id')->having('COUNT(id) > 5');
+	 *
+	 * @param   mixed   $conditions  A string or array of columns.
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to AND.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function having($conditions, $glue = 'AND')
+	{
+		if (is_null($this->having))
+		{
+			$glue = strtoupper($glue);
+			$this->having = new FOFDatabaseQueryElement('HAVING', $conditions, " $glue ");
+		}
+		else
+		{
+			$this->having->append($conditions);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add an INNER JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->innerJoin('b ON b.id = a.id')->innerJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function innerJoin($condition)
+	{
+		$this->join('INNER', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Add a table name to the INSERT clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 *
+	 * Usage:
+	 * $query->insert('#__a')->set('id = 1');
+	 * $query->insert('#__a')->columns('id, title')->values('1,2')->values('3,4');
+	 * $query->insert('#__a')->columns('id, title')->values(array('1,2', '3,4'));
+	 *
+	 * @param   mixed    $table           The name of the table to insert data into.
+	 * @param   boolean  $incrementField  The name of the field to auto increment.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function insert($table, $incrementField=false)
+	{
+		$this->type = 'insert';
+		$this->insert = new FOFDatabaseQueryElement('INSERT INTO', $table);
+		$this->autoIncrementField = $incrementField;
+
+		return $this;
+	}
+
+	/**
+	 * Add a JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->join('INNER', 'b ON b.id = a.id);
+	 *
+	 * @param   string  $type        The type of join. This string is prepended to the JOIN keyword.
+	 * @param   string  $conditions  A string or array of conditions.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function join($type, $conditions)
+	{
+		if (is_null($this->join))
+		{
+			$this->join = array();
+		}
+
+		$this->join[] = new FOFDatabaseQueryElement(strtoupper($type) . ' JOIN', $conditions);
+
+		return $this;
+	}
+
+	/**
+	 * Add a LEFT JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->leftJoin('b ON b.id = a.id')->leftJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function leftJoin($condition)
+	{
+		$this->join('LEFT', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Get the length of a string in bytes.
+	 *
+	 * Note, use 'charLength' to find the number of characters in a string.
+	 *
+	 * Usage:
+	 * query->where($query->length('a').' > 3');
+	 *
+	 * @param   string  $value  The string to measure.
+	 *
+	 * @return  int
+	 *
+	 * @since   11.1
+	 */
+	public function length($value)
+	{
+		return 'LENGTH(' . $value . ')';
+	}
+
+	/**
+	 * Get the null or zero representation of a timestamp for the database driver.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the nullDate method directly.
+	 *
+	 * Usage:
+	 * $query->where('modified_date <> '.$query->nullDate());
+	 *
+	 * @param   boolean  $quoted  Optionally wraps the null date in database quotes (true by default).
+	 *
+	 * @return  string  Null or zero representation of a timestamp.
+	 *
+	 * @since   11.1
+	 */
+	public function nullDate($quoted = true)
+	{
+		if (!($this->db instanceof FOFDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		$result = $this->db->getNullDate($quoted);
+
+		if ($quoted)
+		{
+			return $this->db->quote($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Add a ordering column to the ORDER clause of the query.
+	 *
+	 * Usage:
+	 * $query->order('foo')->order('bar');
+	 * $query->order(array('foo','bar'));
+	 *
+	 * @param   mixed  $columns  A string or array of ordering columns.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function order($columns)
+	{
+		if (is_null($this->order))
+		{
+			$this->order = new FOFDatabaseQueryElement('ORDER BY', $columns);
+		}
+		else
+		{
+			$this->order->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add an OUTER JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->outerJoin('b ON b.id = a.id')->outerJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function outerJoin($condition)
+	{
+		$this->join('OUTER', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Method to quote and optionally escape a string to database requirements for insertion into the database.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the quote method directly.
+	 *
+	 * Note that 'q' is an alias for this method as it is in FOFDatabaseDriver.
+	 *
+	 * Usage:
+	 * $query->quote('fulltext');
+	 * $query->q('fulltext');
+	 * $query->q(array('option', 'fulltext'));
+	 *
+	 * @param   mixed    $text    A string or an array of strings to quote.
+	 * @param   boolean  $escape  True to escape the string, false to leave it unchanged.
+	 *
+	 * @return  string  The quoted input string.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if the internal db property is not a valid object.
+	 */
+	public function quote($text, $escape = true)
+	{
+		if (!($this->db instanceof FOFDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->quote($text, $escape);
+	}
+
+	/**
+	 * Wrap an SQL statement identifier name such as column, table or database names in quotes to prevent injection
+	 * risks and reserved word conflicts.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the quoteName method directly.
+	 *
+	 * Note that 'qn' is an alias for this method as it is in FOFDatabaseDriver.
+	 *
+	 * Usage:
+	 * $query->quoteName('#__a');
+	 * $query->qn('#__a');
+	 *
+	 * @param   mixed  $name  The identifier name to wrap in quotes, or an array of identifier names to wrap in quotes.
+	 *                        Each type supports dot-notation name.
+	 * @param   mixed  $as    The AS query part associated to $name. It can be string or array, in latter case it has to be
+	 *                        same length of $name; if is null there will not be any AS part for string or array element.
+	 *
+	 * @return  mixed  The quote wrapped name, same type of $name.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if the internal db property is not a valid object.
+	 */
+	public function quoteName($name, $as = null)
+	{
+		if (!($this->db instanceof FOFDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->quoteName($name, $as);
+	}
+
+	/**
+	 * Add a RIGHT JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->rightJoin('b ON b.id = a.id')->rightJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function rightJoin($condition)
+	{
+		$this->join('RIGHT', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Add a single column, or array of columns to the SELECT clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 * The select method can, however, be called multiple times in the same query.
+	 *
+	 * Usage:
+	 * $query->select('a.*')->select('b.id');
+	 * $query->select(array('a.*', 'b.id'));
+	 *
+	 * @param   mixed  $columns  A string or an array of field names.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function select($columns)
+	{
+		$this->type = 'select';
+
+		if (is_null($this->select))
+		{
+			$this->select = new FOFDatabaseQueryElement('SELECT', $columns);
+		}
+		else
+		{
+			$this->select->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a single condition string, or an array of strings to the SET clause of the query.
+	 *
+	 * Usage:
+	 * $query->set('a = 1')->set('b = 2');
+	 * $query->set(array('a = 1', 'b = 2');
+	 *
+	 * @param   mixed   $conditions  A string or array of string conditions.
+	 * @param   string  $glue        The glue by which to join the condition strings. Defaults to ,.
+	 *                               Note that the glue is set on first use and cannot be changed.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function set($conditions, $glue = ',')
+	{
+		if (is_null($this->set))
+		{
+			$glue = strtoupper($glue);
+			$this->set = new FOFDatabaseQueryElement('SET', $conditions, "\n\t$glue ");
+		}
+		else
+		{
+			$this->set->append($conditions);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Allows a direct query to be provided to the database
+	 * driver's setQuery() method, but still allow queries
+	 * to have bounded variables.
+	 *
+	 * Usage:
+	 * $query->setQuery('select * from #__users');
+	 *
+	 * @param   mixed  $sql  An SQL Query
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setQuery($sql)
+	{
+		$this->sql = $sql;
+
+		return $this;
+	}
+
+	/**
+	 * Add a table name to the UPDATE clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 *
+	 * Usage:
+	 * $query->update('#__foo')->set(...);
+	 *
+	 * @param   string  $table  A table to update.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function update($table)
+	{
+		$this->type = 'update';
+		$this->update = new FOFDatabaseQueryElement('UPDATE', $table);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a tuple, or array of tuples that would be used as values for an INSERT INTO statement.
+	 *
+	 * Usage:
+	 * $query->values('1,2,3')->values('4,5,6');
+	 * $query->values(array('1,2,3', '4,5,6'));
+	 *
+	 * @param   string  $values  A single tuple, or array of tuples.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function values($values)
+	{
+		if (is_null($this->values))
+		{
+			$this->values = new FOFDatabaseQueryElement('()', $values, '),(');
+		}
+		else
+		{
+			$this->values->append($values);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a single condition, or an array of conditions to the WHERE clause of the query.
+	 *
+	 * Usage:
+	 * $query->where('a = 1')->where('b = 2');
+	 * $query->where(array('a = 1', 'b = 2'));
+	 *
+	 * @param   mixed   $conditions  A string or array of where conditions.
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to AND.
+	 *                               Note that the glue is set on first use and cannot be changed.
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function where($conditions, $glue = 'AND')
+	{
+		if (is_null($this->where))
+		{
+			$glue = strtoupper($glue);
+			$this->where = new FOFDatabaseQueryElement('WHERE', $conditions, " $glue ");
+		}
+		else
+		{
+			$this->where->append($conditions);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to provide deep copy support to nested objects and
+	 * arrays when cloning.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function __clone()
+	{
+		foreach ($this as $k => $v)
+		{
+			if ($k === 'db')
+			{
+				continue;
+			}
+
+			if (is_object($v) || is_array($v))
+			{
+				$this->{$k} = unserialize(serialize($v));
+			}
+		}
+	}
+
+	/**
+	 * Add a query to UNION with the current query.
+	 * Multiple unions each require separate statements and create an array of unions.
+	 *
+	 * Usage (the $query base query MUST be a select query):
+	 * $query->union('SELECT name FROM  #__foo')
+	 * $query->union('SELECT name FROM  #__foo', true)
+	 * $query->union(array('SELECT name FROM  #__foo','SELECT name FROM  #__bar'))
+	 * $query->union($query2)->union($query3)
+	 * $query->union(array($query2, $query3))
+	 *
+	 * @param   mixed    $query     The FOFDatabaseQuery object or string to union.
+	 * @param   boolean  $distinct  True to only return distinct rows from the union.
+	 * @param   string   $glue      The glue by which to join the conditions.
+	 *
+	 * @return  mixed    The FOFDatabaseQuery object on success or boolean false on failure.
+	 *
+	 * @see  http://dev.mysql.com/doc/refman/5.0/en/union.html
+	 *
+	 * @since   12.1
+	 */
+	public function union($query, $distinct = false, $glue = '')
+	{
+		// Set up the DISTINCT flag, the name with parentheses, and the glue.
+		if ($distinct)
+		{
+			$name = 'UNION DISTINCT ()';
+			$glue = ')' . PHP_EOL . 'UNION DISTINCT (';
+		}
+		else
+		{
+			$glue = ')' . PHP_EOL . 'UNION (';
+			$name = 'UNION ()';
+		}
+
+		// Get the FOFDatabaseQueryElement if it does not exist
+		if (is_null($this->union))
+		{
+			$this->union = new FOFDatabaseQueryElement($name, $query, "$glue");
+		}
+		// Otherwise append the second UNION.
+		else
+		{
+			$this->union->append($query);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a query to UNION DISTINCT with the current query. Simply a proxy to union with the DISTINCT keyword.
+	 *
+	 * Usage:
+	 * $query->unionDistinct('SELECT name FROM  #__foo')
+	 *
+	 * @param   mixed   $query  The FOFDatabaseQuery object or string to union.
+	 * @param   string  $glue   The glue by which to join the conditions.
+	 *
+	 * @return  mixed   The FOFDatabaseQuery object on success or boolean false on failure.
+	 *
+	 * @see     union
+	 *
+	 * @since   12.1
+	 */
+	public function unionDistinct($query, $glue = '')
+	{
+		$distinct = true;
+
+		// Apply the distinct flag to the union.
+		return $this->union($query, $distinct, $glue);
+	}
+
+	/**
+	 * Find and replace sprintf-like tokens in a format string.
+	 * Each token takes one of the following forms:
+	 *     %%       - A literal percent character.
+	 *     %[t]     - Where [t] is a type specifier.
+	 *     %[n]$[x] - Where [n] is an argument specifier and [t] is a type specifier.
+	 *
+	 * Types:
+	 * a - Numeric: Replacement text is coerced to a numeric type but not quoted or escaped.
+	 * e - Escape: Replacement text is passed to $this->escape().
+	 * E - Escape (extra): Replacement text is passed to $this->escape() with true as the second argument.
+	 * n - Name Quote: Replacement text is passed to $this->quoteName().
+	 * q - Quote: Replacement text is passed to $this->quote().
+	 * Q - Quote (no escape): Replacement text is passed to $this->quote() with false as the second argument.
+	 * r - Raw: Replacement text is used as-is. (Be careful)
+	 *
+	 * Date Types:
+	 * - Replacement text automatically quoted (use uppercase for Name Quote).
+	 * - Replacement text should be a string in date format or name of a date column.
+	 * y/Y - Year
+	 * m/M - Month
+	 * d/D - Day
+	 * h/H - Hour
+	 * i/I - Minute
+	 * s/S - Second
+	 *
+	 * Invariable Types:
+	 * - Takes no argument.
+	 * - Argument index not incremented.
+	 * t - Replacement text is the result of $this->currentTimestamp().
+	 * z - Replacement text is the result of $this->nullDate(false).
+	 * Z - Replacement text is the result of $this->nullDate(true).
+	 *
+	 * Usage:
+	 * $query->format('SELECT %1$n FROM %2$n WHERE %3$n = %4$a', 'foo', '#__foo', 'bar', 1);
+	 * Returns: SELECT `foo` FROM `#__foo` WHERE `bar` = 1
+	 *
+	 * Notes:
+	 * The argument specifier is optional but recommended for clarity.
+	 * The argument index used for unspecified tokens is incremented only when used.
+	 *
+	 * @param   string  $format  The formatting string.
+	 *
+	 * @return  string  Returns a string produced according to the formatting string.
+	 *
+	 * @since   12.3
+	 */
+	public function format($format)
+	{
+		$query = $this;
+		$args = array_slice(func_get_args(), 1);
+		array_unshift($args, null);
+
+		$i = 1;
+		$func = function ($match) use ($query, $args, &$i)
+		{
+			if (isset($match[6]) && $match[6] == '%')
+			{
+				return '%';
+			}
+
+			// No argument required, do not increment the argument index.
+			switch ($match[5])
+			{
+				case 't':
+					return $query->currentTimestamp();
+					break;
+
+				case 'z':
+					return $query->nullDate(false);
+					break;
+
+				case 'Z':
+					return $query->nullDate(true);
+					break;
+			}
+
+			// Increment the argument index only if argument specifier not provided.
+			$index = is_numeric($match[4]) ? (int) $match[4] : $i++;
+
+			if (!$index || !isset($args[$index]))
+			{
+				// TODO - What to do? sprintf() throws a Warning in these cases.
+				$replacement = '';
+			}
+			else
+			{
+				$replacement = $args[$index];
+			}
+
+			switch ($match[5])
+			{
+				case 'a':
+					return 0 + $replacement;
+					break;
+
+				case 'e':
+					return $query->escape($replacement);
+					break;
+
+				case 'E':
+					return $query->escape($replacement, true);
+					break;
+
+				case 'n':
+					return $query->quoteName($replacement);
+					break;
+
+				case 'q':
+					return $query->quote($replacement);
+					break;
+
+				case 'Q':
+					return $query->quote($replacement, false);
+					break;
+
+				case 'r':
+					return $replacement;
+					break;
+
+				// Dates
+				case 'y':
+					return $query->year($query->quote($replacement));
+					break;
+
+				case 'Y':
+					return $query->year($query->quoteName($replacement));
+					break;
+
+				case 'm':
+					return $query->month($query->quote($replacement));
+					break;
+
+				case 'M':
+					return $query->month($query->quoteName($replacement));
+					break;
+
+				case 'd':
+					return $query->day($query->quote($replacement));
+					break;
+
+				case 'D':
+					return $query->day($query->quoteName($replacement));
+					break;
+
+				case 'h':
+					return $query->hour($query->quote($replacement));
+					break;
+
+				case 'H':
+					return $query->hour($query->quoteName($replacement));
+					break;
+
+				case 'i':
+					return $query->minute($query->quote($replacement));
+					break;
+
+				case 'I':
+					return $query->minute($query->quoteName($replacement));
+					break;
+
+				case 's':
+					return $query->second($query->quote($replacement));
+					break;
+
+				case 'S':
+					return $query->second($query->quoteName($replacement));
+					break;
+			}
+
+			return '';
+		};
+
+		/**
+		 * Regexp to find an replace all tokens.
+		 * Matched fields:
+		 * 0: Full token
+		 * 1: Everything following '%'
+		 * 2: Everything following '%' unless '%'
+		 * 3: Argument specifier and '$'
+		 * 4: Argument specifier
+		 * 5: Type specifier
+		 * 6: '%' if full token is '%%'
+		 */
+		return preg_replace_callback('#%(((([\d]+)\$)?([aeEnqQryYmMdDhHiIsStzZ]))|(%))#', $func, $format);
+	}
+
+	/**
+	 * Add to the current date and time.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 * Note: Not all drivers support all units.
+	 *
+	 * @param   datetime  $date      The date to add to. May be date or datetime
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @link     http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_date-add
+	 * @since   13.1
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		return trim("DATE_ADD('" . $date . "', INTERVAL " . $interval . ' ' . $datePart . ')');
+	}
+
+	/**
+	 * Add a query to UNION ALL with the current query.
+	 * Multiple unions each require separate statements and create an array of unions.
+	 *
+	 * Usage:
+	 * $query->union('SELECT name FROM  #__foo')
+	 * $query->union(array('SELECT name FROM  #__foo','SELECT name FROM  #__bar'))
+	 *
+	 * @param   mixed    $query     The FOFDatabaseQuery object or string to union.
+	 * @param   boolean  $distinct  Not used - ignored.
+	 * @param   string   $glue      Not used - ignored.
+	 *
+	 * @return  mixed    The FOFDatabaseQuery object on success or boolean false on failure.
+	 *
+	 * @see     union
+	 *
+	 * @since   13.1
+	 */
+	public function unionAll($query, $distinct = false, $glue = '')
+	{
+		$glue = ')' . PHP_EOL . 'UNION ALL (';
+		$name = 'UNION ALL ()';
+
+		// Get the FOFDatabaseQueryElement if it does not exist
+		if (is_null($this->unionAll))
+		{
+			$this->unionAll = new FOFDatabaseQueryElement($name, $query, "$glue");
+		}
+
+		// Otherwise append the second UNION.
+		else
+		{
+			$this->unionAll->append($query);
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/fof/database/query/element.php b/core/libraries/fof/database/query/element.php
new file mode 100644
index 00000000..f3a5bae8
--- /dev/null
+++ b/core/libraries/fof/database/query/element.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Element Class.
+ *
+ * @property-read    string  $name      The name of the element.
+ * @property-read    array   $elements  An array of elements.
+ * @property-read    string  $glue      Glue piece.
+ *
+ * @since  11.1
+ */
+class FOFDatabaseQueryElement
+{
+	/**
+	 * @var    string  The name of the element.
+	 * @since  11.1
+	 */
+	protected $name = null;
+
+	/**
+	 * @var    array  An array of elements.
+	 * @since  11.1
+	 */
+	protected $elements = null;
+
+	/**
+	 * @var    string  Glue piece.
+	 * @since  11.1
+	 */
+	protected $glue = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $name      The name of the element.
+	 * @param   mixed   $elements  String or array.
+	 * @param   string  $glue      The glue for elements.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($name, $elements, $glue = ',')
+	{
+		$this->elements = array();
+		$this->name = $name;
+		$this->glue = $glue;
+
+		$this->append($elements);
+	}
+
+	/**
+	 * Magic function to convert the query element to a string.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		if (substr($this->name, -2) == '()')
+		{
+			return PHP_EOL . substr($this->name, 0, -2) . '(' . implode($this->glue, $this->elements) . ')';
+		}
+		else
+		{
+			return PHP_EOL . $this->name . ' ' . implode($this->glue, $this->elements);
+		}
+	}
+
+	/**
+	 * Appends element parts to the internal list.
+	 *
+	 * @param   mixed  $elements  String or array.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function append($elements)
+	{
+		if (is_array($elements))
+		{
+			$this->elements = array_merge($this->elements, $elements);
+		}
+		else
+		{
+			$this->elements = array_merge($this->elements, array($elements));
+		}
+	}
+
+	/**
+	 * Gets the elements of this element.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function getElements()
+	{
+		return $this->elements;
+	}
+
+	/**
+	 * Method to provide deep copy support to nested objects and arrays
+	 * when cloning.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function __clone()
+	{
+		foreach ($this as $k => $v)
+		{
+			if (is_object($v) || is_array($v))
+			{
+				$this->{$k} = unserialize(serialize($v));
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/database/query/limitable.php b/core/libraries/fof/database/query/limitable.php
new file mode 100644
index 00000000..5d450e5b
--- /dev/null
+++ b/core/libraries/fof/database/query/limitable.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (!interface_exists('JDatabaseQueryLimitable'))
+{
+	/**
+	 * Joomla Database Query Limitable Interface.
+	 * Adds bind/unbind methods as well as a getBounded() method
+	 * to retrieve the stored bounded variables on demand prior to
+	 * query execution.
+	 *
+	 * @since  12.1
+	 */
+	interface JDatabaseQueryLimitable
+	{
+		/**
+		 * Method to modify a query already in string format with the needed
+		 * additions to make the query limited to a particular number of
+		 * results, or start at a particular offset. This method is used
+		 * automatically by the __toString() method if it detects that the
+		 * query implements the FOFDatabaseQueryLimitable interface.
+		 *
+		 * @param   string   $query   The query in string format
+		 * @param   integer  $limit   The limit for the result set
+		 * @param   integer  $offset  The offset for the result set
+		 *
+		 * @return  string
+		 *
+		 * @since   12.1
+		 */
+		public function processLimit($query, $limit, $offset = 0);
+
+		/**
+		 * Sets the offset and limit for the result set, if the database driver supports it.
+		 *
+		 * Usage:
+		 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+		 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+		 *
+		 * @param   integer  $limit   The limit for the result set
+		 * @param   integer  $offset  The offset for the result set
+		 *
+		 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+		 *
+		 * @since   12.1
+		 */
+		public function setLimit($limit = 0, $offset = 0);
+	}
+}
+
+/**
+ * Joomla Database Query Limitable Interface.
+ * Adds bind/unbind methods as well as a getBounded() method
+ * to retrieve the stored bounded variables on demand prior to
+ * query execution.
+ *
+ * @since  12.1
+ */
+interface FOFDatabaseQueryLimitable extends JDatabaseQueryLimitable
+{
+}
diff --git a/core/libraries/fof/database/query/mysql.php b/core/libraries/fof/database/query/mysql.php
new file mode 100644
index 00000000..73db5b31
--- /dev/null
+++ b/core/libraries/fof/database/query/mysql.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since       11.1
+ * @deprecated  Will be removed when the minimum supported PHP version no longer includes the deprecated PHP `mysql` extension
+ */
+class FOFDatabaseQueryMysql extends FOFDatabaseQueryMysqli
+{
+}
diff --git a/core/libraries/fof/database/query/mysqli.php b/core/libraries/fof/database/query/mysqli.php
new file mode 100644
index 00000000..7022f552
--- /dev/null
+++ b/core/libraries/fof/database/query/mysqli.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ */
+class FOFDatabaseQueryMysqli extends FOFDatabaseQuery implements FOFDatabaseQueryLimitable
+{
+	/**
+	 * @var    integer  The offset for the result set.
+	 * @since  12.1
+	 */
+	protected $offset;
+
+	/**
+	 * @var    integer  The limit for the result set.
+	 * @since  12.1
+	 */
+	protected $limit;
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return string
+	 *
+	 * @since 12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit > 0 || $offset > 0)
+		{
+			$query .= ' LIMIT ' . $offset . ', ' . $limit;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			$concat_string = 'CONCAT_WS(' . $this->quote($separator);
+
+			foreach ($values as $value)
+			{
+				$concat_string .= ', ' . $value;
+			}
+
+			return $concat_string . ')';
+		}
+		else
+		{
+			return 'CONCAT(' . implode(',', $values) . ')';
+		}
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit  = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Return correct regexp operator for mysqli.
+	 *
+	 * Ensure that the regexp operator is mysqli compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   11.3
+	 */
+	public function regexp($value)
+	{
+		return ' REGEXP ' . $value;
+	}
+
+	/**
+	 * Return correct rand() function for Mysql.
+	 *
+	 * Ensure that the rand() function is Mysql compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   3.5
+	 */
+	public function Rand()
+	{
+		return ' RAND() ';
+	}
+}
diff --git a/core/libraries/fof/database/query/oracle.php b/core/libraries/fof/database/query/oracle.php
new file mode 100644
index 00000000..62206908
--- /dev/null
+++ b/core/libraries/fof/database/query/oracle.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Oracle Query Building Class.
+ *
+ * @since  12.1
+ */
+class FOFDatabaseQueryOracle extends FOFDatabaseQueryPdo implements FOFDatabaseQueryPreparable, FOFDatabaseQueryLimitable
+{
+	/**
+	 * @var    integer  The offset for the result set.
+	 * @since  12.1
+	 */
+	protected $offset;
+
+	/**
+	 * @var    integer  The limit for the result set.
+	 * @since  12.1
+	 */
+	protected $limit;
+
+	/**
+	 * @var    array  Bounded object array
+	 * @since  12.1
+	 */
+	protected $bounded = array();
+
+	/**
+	 * Method to add a variable to an internal array that will be bound to a prepared SQL statement before query execution. Also
+	 * removes a variable that has been bounded from the internal bounded array when the passed in value is null.
+	 *
+	 * @param   string|integer  $key            The key that will be used in your SQL query to reference the value. Usually of
+	 *                                          the form ':key', but can also be an integer.
+	 * @param   mixed           &$value         The value that will be bound. The value is passed by reference to support output
+	 *                                          parameters such as those possible with stored procedures.
+	 * @param   integer         $dataType       Constant corresponding to a SQL datatype.
+	 * @param   integer         $length         The length of the variable. Usually required for OUTPUT parameters.
+	 * @param   array           $driverOptions  Optional driver options to be used.
+	 *
+	 * @return  FOFDatabaseQueryOracle
+	 *
+	 * @since   12.1
+	 */
+	public function bind($key = null, &$value = null, $dataType = PDO::PARAM_STR, $length = 0, $driverOptions = array())
+	{
+		// Case 1: Empty Key (reset $bounded array)
+		if (empty($key))
+		{
+			$this->bounded = array();
+
+			return $this;
+		}
+
+		// Case 2: Key Provided, null value (unset key from $bounded array)
+		if (is_null($value))
+		{
+			if (isset($this->bounded[$key]))
+			{
+				unset($this->bounded[$key]);
+			}
+
+			return $this;
+		}
+
+		$obj = new stdClass;
+
+		$obj->value = &$value;
+		$obj->dataType = $dataType;
+		$obj->length = $length;
+		$obj->driverOptions = $driverOptions;
+
+		// Case 3: Simply add the Key/Value into the bounded array
+		$this->bounded[$key] = $obj;
+
+		return $this;
+	}
+
+	/**
+	 * Retrieves the bound parameters array when key is null and returns it by reference. If a key is provided then that item is
+	 * returned.
+	 *
+	 * @param   mixed  $key  The bounded variable key to retrieve.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.1
+	 */
+	public function &getBounded($key = null)
+	{
+		if (empty($key))
+		{
+			return $this->bounded;
+		}
+		else
+		{
+			if (isset($this->bounded[$key]))
+			{
+				return $this->bounded[$key];
+			}
+		}
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  FOFDatabaseQueryOracle  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function clear($clause = null)
+	{
+		switch ($clause)
+		{
+			case null:
+				$this->bounded = array();
+				break;
+		}
+
+		parent::clear($clause);
+
+		return $this;
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset. This method is used
+	 * automatically by the __toString() method if it detects that the
+	 * query implements the FOFDatabaseQueryLimitable interface.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		// Check if we need to mangle the query.
+		if ($limit || $offset)
+		{
+			$query = "SELECT joomla2.*
+		              FROM (
+		                  SELECT joomla1.*, ROWNUM AS joomla_db_rownum
+		                  FROM (
+		                      " . $query . "
+		                  ) joomla1
+		              ) joomla2";
+
+			// Check if the limit value is greater than zero.
+			if ($limit > 0)
+			{
+				$query .= ' WHERE joomla2.joomla_db_rownum BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $limit);
+			}
+			else
+			{
+				// Check if there is an offset and then use this.
+				if ($offset)
+				{
+					$query .= ' WHERE joomla2.joomla_db_rownum > ' . ($offset + 1);
+				}
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  FOFDatabaseQueryOracle  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/fof/database/query/pdo.php b/core/libraries/fof/database/query/pdo.php
new file mode 100644
index 00000000..13d36198
--- /dev/null
+++ b/core/libraries/fof/database/query/pdo.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * PDO Query Building Class.
+ *
+ * @since  12.1
+ */
+class FOFDatabaseQueryPdo extends FOFDatabaseQuery
+{
+}
diff --git a/core/libraries/fof/database/query/pdomysql.php b/core/libraries/fof/database/query/pdomysql.php
new file mode 100644
index 00000000..035f133e
--- /dev/null
+++ b/core/libraries/fof/database/query/pdomysql.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @since       3.4
+ */
+class FOFDatabaseQueryPdomysql extends FOFDatabaseQueryMysqli
+{
+}
diff --git a/core/libraries/fof/database/query/postgresql.php b/core/libraries/fof/database/query/postgresql.php
new file mode 100644
index 00000000..1ae81b72
--- /dev/null
+++ b/core/libraries/fof/database/query/postgresql.php
@@ -0,0 +1,661 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.3
+ */
+class FOFDatabaseQueryPostgresql extends FOFDatabaseQuery implements FOFDatabaseQueryLimitable
+{
+	/**
+	 * @var    object  The FOR UPDATE element used in "FOR UPDATE"  lock
+	 * @since  11.3
+	 */
+	protected $forUpdate = null;
+
+	/**
+	 * @var    object  The FOR SHARE element used in "FOR SHARE"  lock
+	 * @since  11.3
+	 */
+	protected $forShare = null;
+
+	/**
+	 * @var    object  The NOWAIT element used in "FOR SHARE" and "FOR UPDATE" lock
+	 * @since  11.3
+	 */
+	protected $noWait = null;
+
+	/**
+	 * @var    object  The LIMIT element
+	 * @since  11.3
+	 */
+	protected $limit = null;
+
+	/**
+	 * @var    object  The OFFSET element
+	 * @since  11.3
+	 */
+	protected $offset = null;
+
+	/**
+	 * @var    object  The RETURNING element of INSERT INTO
+	 * @since  11.3
+	 */
+	protected $returning = null;
+
+	/**
+	 * Magic function to convert the query to a string, only for postgresql specific query
+	 *
+	 * @return  string	The completed query.
+	 *
+	 * @since   11.3
+	 */
+	public function __toString()
+	{
+		$query = '';
+
+		switch ($this->type)
+		{
+			case 'select':
+				$query .= (string) $this->select;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->group)
+				{
+					$query .= (string) $this->group;
+				}
+
+				if ($this->having)
+				{
+					$query .= (string) $this->having;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				if ($this->forUpdate)
+				{
+					$query .= (string) $this->forUpdate;
+				}
+				else
+				{
+					if ($this->forShare)
+					{
+						$query .= (string) $this->forShare;
+					}
+				}
+
+				if ($this->noWait)
+				{
+					$query .= (string) $this->noWait;
+				}
+
+				break;
+
+			case 'update':
+				$query .= (string) $this->update;
+				$query .= (string) $this->set;
+
+				if ($this->join)
+				{
+					$onWord = ' ON ';
+
+					// Workaround for special case of JOIN with UPDATE
+					foreach ($this->join as $join)
+					{
+						$joinElem = $join->getElements();
+
+						$joinArray = explode($onWord, $joinElem[0]);
+
+						$this->from($joinArray[0]);
+						$this->where($joinArray[1]);
+					}
+
+					$query .= (string) $this->from;
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				break;
+
+			case 'insert':
+				$query .= (string) $this->insert;
+
+				if ($this->values)
+				{
+					if ($this->columns)
+					{
+						$query .= (string) $this->columns;
+					}
+
+					$elements = $this->values->getElements();
+
+					if (!($elements[0] instanceof $this))
+					{
+						$query .= ' VALUES ';
+					}
+
+					$query .= (string) $this->values;
+
+					if ($this->returning)
+					{
+						$query .= (string) $this->returning;
+					}
+				}
+
+				break;
+
+			default:
+				$query = parent::__toString();
+				break;
+		}
+
+		if ($this instanceof FOFDatabaseQueryLimitable)
+		{
+			$query = $this->processLimit($query, $this->limit, $this->offset);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function clear($clause = null)
+	{
+		switch ($clause)
+		{
+			case 'limit':
+				$this->limit = null;
+				break;
+
+			case 'offset':
+				$this->offset = null;
+				break;
+
+			case 'forUpdate':
+				$this->forUpdate = null;
+				break;
+
+			case 'forShare':
+				$this->forShare = null;
+				break;
+
+			case 'noWait':
+				$this->noWait = null;
+				break;
+
+			case 'returning':
+				$this->returning = null;
+				break;
+
+			case 'select':
+			case 'update':
+			case 'delete':
+			case 'insert':
+			case 'from':
+			case 'join':
+			case 'set':
+			case 'where':
+			case 'group':
+			case 'having':
+			case 'order':
+			case 'columns':
+			case 'values':
+				parent::clear($clause);
+				break;
+
+			default:
+				$this->type = null;
+				$this->limit = null;
+				$this->offset = null;
+				$this->forUpdate = null;
+				$this->forShare = null;
+				$this->noWait = null;
+				$this->returning = null;
+				parent::clear($clause);
+				break;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * Usage:
+	 * $query->select($query->castAsChar('a'));
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.3
+	 */
+	public function castAsChar($value)
+	{
+		return $value . '::text';
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * Usage:
+	 * $query->select($query->concatenate(array('a', 'b')));
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.3
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return implode(' || ' . $this->quote($separator) . ' || ', $values);
+		}
+		else
+		{
+			return implode(' || ', $values);
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * @return  string  Return string used in query to obtain
+	 *
+	 * @since   11.3
+	 */
+	public function currentTimestamp()
+	{
+		return 'NOW()';
+	}
+
+	/**
+	 * Sets the FOR UPDATE lock on select's output row
+	 *
+	 * @param   string  $table_name  The table to lock
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to ',' .
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  FOR UPDATE query element
+	 *
+	 * @since   11.3
+	 */
+	public function forUpdate($table_name, $glue = ',')
+	{
+		$this->type = 'forUpdate';
+
+		if (is_null($this->forUpdate))
+		{
+			$glue            = strtoupper($glue);
+			$this->forUpdate = new FOFDatabaseQueryElement('FOR UPDATE', 'OF ' . $table_name, "$glue ");
+		}
+		else
+		{
+			$this->forUpdate->append($table_name);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the FOR SHARE lock on select's output row
+	 *
+	 * @param   string  $table_name  The table to lock
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to ',' .
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  FOR SHARE query element
+	 *
+	 * @since   11.3
+	 */
+	public function forShare($table_name, $glue = ',')
+	{
+		$this->type = 'forShare';
+
+		if (is_null($this->forShare))
+		{
+			$glue           = strtoupper($glue);
+			$this->forShare = new FOFDatabaseQueryElement('FOR SHARE', 'OF ' . $table_name, "$glue ");
+		}
+		else
+		{
+			$this->forShare->append($table_name);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Used to get a string to extract year from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->year($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing year to be extracted.
+	 *
+	 * @return  string  Returns string to extract year from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function year($date)
+	{
+		return 'EXTRACT (YEAR FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract month from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->month($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing month to be extracted.
+	 *
+	 * @return  string  Returns string to extract month from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function month($date)
+	{
+		return 'EXTRACT (MONTH FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract day from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->day($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing day to be extracted.
+	 *
+	 * @return  string  Returns string to extract day from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function day($date)
+	{
+		return 'EXTRACT (DAY FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract hour from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->hour($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing hour to be extracted.
+	 *
+	 * @return  string  Returns string to extract hour from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function hour($date)
+	{
+		return 'EXTRACT (HOUR FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract minute from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->minute($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing minute to be extracted.
+	 *
+	 * @return  string  Returns string to extract minute from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function minute($date)
+	{
+		return 'EXTRACT (MINUTE FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract seconds from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->second($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing second to be extracted.
+	 *
+	 * @return  string  Returns string to extract second from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function second($date)
+	{
+		return 'EXTRACT (SECOND FROM ' . $date . ')';
+	}
+
+	/**
+	 * Sets the NOWAIT lock on select's output row
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  NO WAIT query element
+	 *
+	 * @since   11.3
+	 */
+	public function noWait ()
+	{
+		$this->type = 'noWait';
+
+		if (is_null($this->noWait))
+		{
+			$this->noWait = new FOFDatabaseQueryElement('NOWAIT', null);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the LIMIT clause to the query
+	 *
+	 * @param   integer  $limit  An int of how many row will be returned
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function limit($limit = 0)
+	{
+		if (is_null($this->limit))
+		{
+			$this->limit = new FOFDatabaseQueryElement('LIMIT', (int) $limit);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the OFFSET clause to the query
+	 *
+	 * @param   integer  $offset  An int for skipping row
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function offset($offset = 0)
+	{
+		if (is_null($this->offset))
+		{
+			$this->offset = new FOFDatabaseQueryElement('OFFSET', (int) $offset);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add the RETURNING element to INSERT INTO statement.
+	 *
+	 * @param   mixed  $pkCol  The name of the primary key column.
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function returning($pkCol)
+	{
+		if (is_null($this->returning))
+		{
+			$this->returning = new FOFDatabaseQueryElement('RETURNING', $pkCol);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  FOFDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit  = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit > 0)
+		{
+			$query .= ' LIMIT ' . $limit;
+		}
+
+		if ($offset > 0)
+		{
+			$query .= ' OFFSET ' . $offset;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Add to the current date and time in Postgresql.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 *
+	 * @param   datetime  $date      The date to add to
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @since   13.1
+	 * @note    Not all drivers support all units. Check appropriate references
+	 * @link    http://www.postgresql.org/docs/9.0/static/functions-datetime.html.
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		if (substr($interval, 0, 1) != '-')
+		{
+			return "timestamp '" . $date . "' + interval '" . $interval . " " . $datePart . "'";
+		}
+		else
+		{
+			return "timestamp '" . $date . "' - interval '" . ltrim($interval, '-') . " " . $datePart . "'";
+		}
+	}
+
+	/**
+	 * Return correct regexp operator for Postgresql.
+	 *
+	 * Ensure that the regexp operator is Postgresql compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   11.3
+	 */
+	public function regexp($value)
+	{
+		return ' ~* ' . $value;
+	}
+
+	/**
+	 * Return correct rand() function for Postgresql.
+	 *
+	 * Ensure that the rand() function is Postgresql compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   3.5
+	 */
+	public function Rand()
+	{
+		return ' RANDOM() ';
+	}
+}
diff --git a/core/libraries/fof/database/query/preparable.php b/core/libraries/fof/database/query/preparable.php
new file mode 100644
index 00000000..8f58bfa8
--- /dev/null
+++ b/core/libraries/fof/database/query/preparable.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (!interface_exists('JDatabaseQueryPreparable'))
+{
+	/**
+	 * Joomla Database Query Preparable Interface.
+	 * Adds bind/unbind methods as well as a getBounded() method
+	 * to retrieve the stored bounded variables on demand prior to
+	 * query execution.
+	 *
+	 * @since  12.1
+	 */
+	interface JDatabaseQueryPreparable
+	{
+		/**
+		 * Method to add a variable to an internal array that will be bound to a prepared SQL statement before query execution. Also
+		 * removes a variable that has been bounded from the internal bounded array when the passed in value is null.
+		 *
+		 * @param   string|integer  $key            The key that will be used in your SQL query to reference the value. Usually of
+		 *                                          the form ':key', but can also be an integer.
+		 * @param   mixed           &$value         The value that will be bound. The value is passed by reference to support output
+		 *                                          parameters such as those possible with stored procedures.
+		 * @param   integer         $dataType       Constant corresponding to a SQL datatype.
+		 * @param   integer         $length         The length of the variable. Usually required for OUTPUT parameters.
+		 * @param   array           $driverOptions  Optional driver options to be used.
+		 *
+		 * @return  FOFDatabaseQuery
+		 *
+		 * @since   12.1
+		 */
+		public function bind($key = null, &$value = null, $dataType = PDO::PARAM_STR, $length = 0, $driverOptions = array());
+
+		/**
+		 * Retrieves the bound parameters array when key is null and returns it by reference. If a key is provided then that item is
+		 * returned.
+		 *
+		 * @param   mixed  $key  The bounded variable key to retrieve.
+		 *
+		 * @return  mixed
+		 *
+		 * @since   12.1
+		 */
+		public function &getBounded($key = null);
+	}
+}
+
+interface FOFDatabaseQueryPreparable extends JDatabaseQueryPreparable
+{
+
+}
\ No newline at end of file
diff --git a/core/libraries/fof/database/query/sqlazure.php b/core/libraries/fof/database/query/sqlazure.php
new file mode 100644
index 00000000..28484cb8
--- /dev/null
+++ b/core/libraries/fof/database/query/sqlazure.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ */
+class FOFDatabaseQuerySqlazure extends FOFDatabaseQuerySqlsrv
+{
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 *
+	 * @since  11.1
+	 */
+	protected $name_quotes = '';
+}
diff --git a/core/libraries/fof/database/query/sqlite.php b/core/libraries/fof/database/query/sqlite.php
new file mode 100644
index 00000000..46a7c522
--- /dev/null
+++ b/core/libraries/fof/database/query/sqlite.php
@@ -0,0 +1,279 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * SQLite Query Building Class.
+ *
+ * @since  12.1
+ */
+class FOFDatabaseQuerySqlite extends FOFDatabaseQueryPdo implements FOFDatabaseQueryPreparable, FOFDatabaseQueryLimitable
+{
+	/**
+	 * @var    integer  The offset for the result set.
+	 * @since  12.1
+	 */
+	protected $offset;
+
+	/**
+	 * @var    integer  The limit for the result set.
+	 * @since  12.1
+	 */
+	protected $limit;
+
+	/**
+	 * @var    array  Bounded object array
+	 * @since  12.1
+	 */
+	protected $bounded = array();
+
+	/**
+	 * Method to add a variable to an internal array that will be bound to a prepared SQL statement before query execution. Also
+	 * removes a variable that has been bounded from the internal bounded array when the passed in value is null.
+	 *
+	 * @param   string|integer  $key            The key that will be used in your SQL query to reference the value. Usually of
+	 *                                          the form ':key', but can also be an integer.
+	 * @param   mixed           &$value         The value that will be bound. The value is passed by reference to support output
+	 *                                          parameters such as those possible with stored procedures.
+	 * @param   integer         $dataType       Constant corresponding to a SQL datatype.
+	 * @param   integer         $length         The length of the variable. Usually required for OUTPUT parameters.
+	 * @param   array           $driverOptions  Optional driver options to be used.
+	 *
+	 * @return  FOFDatabaseQuerySqlite
+	 *
+	 * @since   12.1
+	 */
+	public function bind($key = null, &$value = null, $dataType = PDO::PARAM_STR, $length = 0, $driverOptions = array())
+	{
+		// Case 1: Empty Key (reset $bounded array)
+		if (empty($key))
+		{
+			$this->bounded = array();
+
+			return $this;
+		}
+
+		// Case 2: Key Provided, null value (unset key from $bounded array)
+		if (is_null($value))
+		{
+			if (isset($this->bounded[$key]))
+			{
+				unset($this->bounded[$key]);
+			}
+
+			return $this;
+		}
+
+		$obj = new stdClass;
+
+		$obj->value = &$value;
+		$obj->dataType = $dataType;
+		$obj->length = $length;
+		$obj->driverOptions = $driverOptions;
+
+		// Case 3: Simply add the Key/Value into the bounded array
+		$this->bounded[$key] = $obj;
+
+		return $this;
+	}
+
+	/**
+	 * Retrieves the bound parameters array when key is null and returns it by reference. If a key is provided then that item is
+	 * returned.
+	 *
+	 * @param   mixed  $key  The bounded variable key to retrieve.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.1
+	 */
+	public function &getBounded($key = null)
+	{
+		if (empty($key))
+		{
+			return $this->bounded;
+		}
+		else
+		{
+			if (isset($this->bounded[$key]))
+			{
+				return $this->bounded[$key];
+			}
+		}
+	}
+
+	/**
+	 * Gets the number of characters in a string.
+	 *
+	 * Note, use 'length' to find the number of bytes in a string.
+	 *
+	 * Usage:
+	 * $query->select($query->charLength('a'));
+	 *
+	 * @param   string  $field      A value.
+	 * @param   string  $operator   Comparison operator between charLength integer value and $condition
+	 * @param   string  $condition  Integer value to compare charLength with.
+	 *
+	 * @return  string  The required char length call.
+	 *
+	 * @since   13.1
+	 */
+	public function charLength($field, $operator = null, $condition = null)
+	{
+		return 'length(' . $field . ')' . (isset($operator) && isset($condition) ? ' ' . $operator . ' ' . $condition : '');
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  FOFDatabaseQuerySqlite  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function clear($clause = null)
+	{
+		switch ($clause)
+		{
+			case null:
+				$this->bounded = array();
+				break;
+		}
+
+		parent::clear($clause);
+
+		return $this;
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * Usage:
+	 * $query->select($query->concatenate(array('a', 'b')));
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return implode(' || ' . $this->quote($separator) . ' || ', $values);
+		}
+		else
+		{
+			return implode(' || ', $values);
+		}
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset. This method is used
+	 * automatically by the __toString() method if it detects that the
+	 * query implements the FOFDatabaseQueryLimitable interface.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit > 0 || $offset > 0)
+		{
+			$query .= ' LIMIT ' . $offset . ', ' . $limit;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  FOFDatabaseQuerySqlite  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Add to the current date and time.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 *
+	 * @param   datetime  $date      The date or datetime to add to
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @since   13.1
+	 * @link    http://www.sqlite.org/lang_datefunc.html
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		// SQLite does not support microseconds as a separate unit. Convert the interval to seconds
+		if (strcasecmp($datePart, 'microseconds') == 0)
+		{
+			$interval = .001 * $interval;
+			$datePart = 'seconds';
+		}
+
+		if (substr($interval, 0, 1) != '-')
+		{
+			return "datetime('" . $date . "', '+" . $interval . " " . $datePart . "')";
+		}
+		else
+		{
+			return "datetime('" . $date . "', '" . $interval . " " . $datePart . "')";
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * Usage:
+	 * $query->where('published_up < '.$query->currentTimestamp());
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	public function currentTimestamp()
+	{
+		return 'CURRENT_TIMESTAMP';
+	}
+}
diff --git a/core/libraries/fof/database/query/sqlsrv.php b/core/libraries/fof/database/query/sqlsrv.php
new file mode 100644
index 00000000..bee0f807
--- /dev/null
+++ b/core/libraries/fof/database/query/sqlsrv.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  database
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file is adapted from the Joomla! Platform. It is used to iterate a database cursor returning FOFTable objects
+ * instead of plain stdClass objects
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ */
+class FOFDatabaseQuerySqlsrv extends FOFDatabaseQuery implements FOFDatabaseQueryLimitable
+{
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $name_quotes = '`';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $null_date = '1900-01-01 00:00:00';
+
+	/**
+	 * @var    integer  The affected row limit for the current SQL statement.
+	 * @since  3.2
+	 */
+	protected $limit = 0;
+
+	/**
+	 * @var    integer  The affected row offset to apply for the current SQL statement.
+	 * @since  3.2
+	 */
+	protected $offset = 0;
+
+	/**
+	 * Magic function to convert the query to a string.
+	 *
+	 * @return  string	The completed query.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		$query = '';
+
+		switch ($this->type)
+		{
+			case 'select':
+				$query .= (string) $this->select;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->group)
+				{
+					$query .= (string) $this->group;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				if ($this->having)
+				{
+					$query .= (string) $this->having;
+				}
+
+				if ($this instanceof FOFDatabaseQueryLimitable && ($this->limit > 0 || $this->offset > 0))
+				{
+					$query = $this->processLimit($query, $this->limit, $this->offset);
+				}
+
+				break;
+
+			case 'insert':
+				$query .= (string) $this->insert;
+
+				// Set method
+				if ($this->set)
+				{
+					$query .= (string) $this->set;
+				}
+				// Columns-Values method
+				elseif ($this->values)
+				{
+					if ($this->columns)
+					{
+						$query .= (string) $this->columns;
+					}
+
+					$elements = $this->insert->getElements();
+					$tableName = array_shift($elements);
+
+					$query .= 'VALUES ';
+					$query .= (string) $this->values;
+
+					if ($this->autoIncrementField)
+					{
+						$query = 'SET IDENTITY_INSERT ' . $tableName . ' ON;' . $query . 'SET IDENTITY_INSERT ' . $tableName . ' OFF;';
+					}
+
+					if ($this->where)
+					{
+						$query .= (string) $this->where;
+					}
+				}
+
+				break;
+
+			case 'delete':
+				$query .= (string) $this->delete;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'update':
+				$query .= (string) $this->update;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				$query .= (string) $this->set;
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			default:
+				$query = parent::__toString();
+				break;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.1
+	 */
+	public function castAsChar($value)
+	{
+		return 'CAST(' . $value . ' as NVARCHAR(10))';
+	}
+
+	/**
+	 * Gets the function to determine the length of a character string.
+	 *
+	 * @param   string  $field      A value.
+	 * @param   string  $operator   Comparison operator between charLength integer value and $condition
+	 * @param   string  $condition  Integer value to compare charLength with.
+	 *
+	 * @return  string  The required char length call.
+	 *
+	 * @since   11.1
+	 */
+	public function charLength($field, $operator = null, $condition = null)
+	{
+		return 'DATALENGTH(' . $field . ')' . (isset($operator) && isset($condition) ? ' ' . $operator . ' ' . $condition : '');
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return '(' . implode('+' . $this->quote($separator) . '+', $values) . ')';
+		}
+		else
+		{
+			return '(' . implode('+', $values) . ')';
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function currentTimestamp()
+	{
+		return 'GETDATE()';
+	}
+
+	/**
+	 * Get the length of a string in bytes.
+	 *
+	 * @param   string  $value  The string to measure.
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	public function length($value)
+	{
+		return 'LEN(' . $value . ')';
+	}
+
+	/**
+	 * Add to the current date and time.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 *
+	 * @param   datetime  $date      The date to add to; type may be time or datetime.
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @since   13.1
+	 * @note    Not all drivers support all units.
+	 * @link    http://msdn.microsoft.com/en-us/library/ms186819.aspx for more information
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		return "DATEADD('" . $datePart . "', '" . $interval . "', '" . $date . "'" . ')';
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit == 0 && $offset == 0)
+		{
+			return $query;
+		}
+
+		$start = $offset + 1;
+		$end   = $offset + $limit;
+
+		$orderBy = stristr($query, 'ORDER BY');
+
+		if (is_null($orderBy) || empty($orderBy))
+		{
+			$orderBy = 'ORDER BY (select 0)';
+		}
+
+		$query = str_ireplace($orderBy, '', $query);
+
+		$rowNumberText = ', ROW_NUMBER() OVER (' . $orderBy . ') AS RowNumber FROM ';
+
+		$query = preg_replace('/\sFROM\s/i', $rowNumberText, $query, 1);
+		$query = 'SELECT * FROM (' . $query . ') A WHERE A.RowNumber BETWEEN ' . $start . ' AND ' . $end;
+
+		return $query;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  FOFDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit  = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Return correct rand() function for MSSQL.
+	 *
+	 * Ensure that the rand() function is MSSQL compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   3.5
+	 */
+	public function Rand()
+	{
+		return ' NEWID() ';
+	}
+}
diff --git a/core/libraries/fof/dispatcher/dispatcher.php b/core/libraries/fof/dispatcher/dispatcher.php
new file mode 100644
index 00000000..e253b15d
--- /dev/null
+++ b/core/libraries/fof/dispatcher/dispatcher.php
@@ -0,0 +1,718 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  dispatcher
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework dispatcher class
+ *
+ * FrameworkOnFramework is a set of classes which extend Joomla! 1.5 and later's
+ * MVC framework with features making maintaining complex software much easier,
+ * without tedious repetitive copying of the same code over and over again.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFDispatcher extends FOFUtilsObject
+{
+	/** @var array Configuration variables */
+	protected $config = array();
+
+	/** @var FOFInput Input variables */
+	protected $input = array();
+
+	/** @var string The name of the default view, in case none is specified */
+	public $defaultView = 'cpanel';
+
+	// Variables for FOF's transparent user authentication. You can override them
+	// in your Dispatcher's __construct() method.
+
+	/** @var int The Time Step for the TOTP used in FOF's transparent user authentication */
+	protected $fofAuth_timeStep = 6;
+
+	/** @var string The key for the TOTP, Base32 encoded (watch out; Base32, NOT Base64!) */
+	protected $fofAuth_Key = null;
+
+	/** @var array Which formats to be handled by transparent authentication */
+	protected $fofAuth_Formats = array('json', 'csv', 'xml', 'raw');
+
+	/**
+	 * Should I logout the transparently authenticated user on logout?
+	 * Recommended to leave it on in order to avoid crashing the sessions table.
+	 *
+	 * @var boolean
+	 */
+	protected $fofAuth_LogoutOnReturn = true;
+
+	/** @var array Which methods to use to fetch authentication credentials and in which order */
+	protected $fofAuth_AuthMethods = array(
+		/* HTTP Basic Authentication using encrypted information protected
+		 * with a TOTP (the username must be "_fof_auth") */
+		'HTTPBasicAuth_TOTP',
+		/* Encrypted information protected with a TOTP passed in the
+		 * _fofauthentication query string parameter */
+		'QueryString_TOTP',
+		/* HTTP Basic Authentication using a username and password pair in plain text */
+		'HTTPBasicAuth_Plaintext',
+		/* Plaintext, JSON-encoded username and password pair passed in the
+		 * _fofauthentication query string parameter */
+		'QueryString_Plaintext',
+		/* Plaintext username and password in the _fofauthentication_username
+		 * and _fofauthentication_username query string parameters */
+		'SplitQueryString_Plaintext',
+	);
+
+	/** @var bool Did we successfully and transparently logged in a user? */
+	private $_fofAuth_isLoggedIn = false;
+
+	/** @var string The calculated encryption key for the _TOTP methods, used if we have to encrypt the reply */
+	private $_fofAuth_CryptoKey = '';
+
+	/**
+	 * Get a static (Singleton) instance of a particular Dispatcher
+	 *
+	 * @param   string  $option  The component name
+	 * @param   string  $view    The View name
+	 * @param   array   $config  Configuration data
+	 *
+	 * @staticvar  array  $instances  Holds the array of Dispatchers FOF knows about
+	 *
+	 * @return  FOFDispatcher
+	 */
+	public static function &getAnInstance($option = null, $view = null, $config = array())
+	{
+		static $instances = array();
+
+		$hash = $option . $view;
+
+		if (!array_key_exists($hash, $instances))
+		{
+			$instances[$hash] = self::getTmpInstance($option, $view, $config);
+		}
+
+		return $instances[$hash];
+	}
+
+	/**
+	 * Gets a temporary instance of a Dispatcher
+	 *
+	 * @param   string  $option  The component name
+	 * @param   string  $view    The View name
+	 * @param   array   $config  Configuration data
+	 *
+	 * @return FOFDispatcher
+	 */
+	public static function &getTmpInstance($option = null, $view = null, $config = array())
+	{
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$input = $config['input'];
+			}
+			else
+			{
+				if (!is_array($config['input']))
+				{
+					$config['input'] = (array) $config['input'];
+				}
+
+				$config['input'] = array_merge($_REQUEST, $config['input']);
+				$input = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$input = new FOFInput;
+		}
+
+		$config['option']   = !is_null($option) ? $option : $input->getCmd('option', 'com_foobar');
+		$config['view']     = !is_null($view) ? $view : $input->getCmd('view', '');
+
+		$input->set('option', $config['option']);
+		$input->set('view', $config['view']);
+
+		$config['input'] = $input;
+
+		$className = ucfirst(str_replace('com_', '', $config['option'])) . 'Dispatcher';
+
+		if (!class_exists($className))
+		{
+			$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($config['option']);
+
+			$searchPaths = array(
+				$componentPaths['main'],
+				$componentPaths['main'] . '/dispatchers',
+				$componentPaths['admin'],
+				$componentPaths['admin'] . '/dispatchers'
+			);
+
+			if (array_key_exists('searchpath', $config))
+			{
+				array_unshift($searchPaths, $config['searchpath']);
+			}
+
+			$filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+			$path = $filesystem->pathFind(
+					$searchPaths, 'dispatcher.php'
+			);
+
+			if ($path)
+			{
+				require_once $path;
+			}
+		}
+
+		if (!class_exists($className))
+		{
+			$className = 'FOFDispatcher';
+		}
+
+		$instance = new $className($config);
+
+		return $instance;
+	}
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   array  $config  The configuration variables
+	 */
+	public function __construct($config = array())
+	{
+		// Cache the config
+		$this->config = $config;
+
+		// Get the input for this MVC triad
+		if (array_key_exists('input', $config))
+		{
+			$this->input = $config['input'];
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		// Get the default values for the component name
+		$this->component = $this->input->getCmd('option', 'com_foobar');
+
+		// Load the component's fof.xml configuration file
+		$configProvider = new FOFConfigProvider;
+		$this->defaultView = $configProvider->get($this->component . '.dispatcher.default_view', $this->defaultView);
+
+		// Get the default values for the view name
+		$this->view = $this->input->getCmd('view', null);
+
+		if (empty($this->view))
+		{
+			// Do we have a task formatted as controller.task?
+			$task = $this->input->getCmd('task', '');
+
+			if (!empty($task) && (strstr($task, '.') !== false))
+			{
+				list($this->view, $task) = explode('.', $task, 2);
+				$this->input->set('task', $task);
+			}
+		}
+
+		if (empty($this->view))
+		{
+			$this->view = $this->defaultView;
+		}
+
+		$this->layout = $this->input->getCmd('layout', null);
+
+		// Overrides from the config
+		if (array_key_exists('option', $config))
+		{
+			$this->component = $config['option'];
+		}
+
+		if (array_key_exists('view', $config))
+		{
+			$this->view = empty($config['view']) ? $this->view : $config['view'];
+		}
+
+		if (array_key_exists('layout', $config))
+		{
+			$this->layout = $config['layout'];
+		}
+
+		$this->input->set('option', $this->component);
+		$this->input->set('view', $this->view);
+		$this->input->set('layout', $this->layout);
+
+		if (array_key_exists('authTimeStep', $config))
+		{
+			$this->fofAuth_timeStep = empty($config['authTimeStep']) ? 6 : $config['authTimeStep'];
+		}
+	}
+
+    /**
+     * The main code of the Dispatcher. It spawns the necessary controller and
+     * runs it.
+     *
+     * @throws Exception
+     *
+     * @return  void|Exception
+     */
+	public function dispatch()
+	{
+        $platform = FOFPlatform::getInstance();
+
+		if (!$platform->authorizeAdmin($this->input->getCmd('option', 'com_foobar')))
+		{
+            return $platform->raiseError(403, JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
+		}
+
+		$this->transparentAuthentication();
+
+		// Merge English and local translations
+		$platform->loadTranslations($this->component);
+
+		$canDispatch = true;
+
+		if ($platform->isCli())
+		{
+			$canDispatch = $canDispatch && $this->onBeforeDispatchCLI();
+		}
+
+		$canDispatch = $canDispatch && $this->onBeforeDispatch();
+
+		if (!$canDispatch)
+		{
+            // We can set header only if we're not in CLI
+            if(!$platform->isCli())
+            {
+                $platform->setHeader('Status', '403 Forbidden', true);
+            }
+
+            return $platform->raiseError(403, JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
+		}
+
+		// Get and execute the controller
+		$option = $this->input->getCmd('option', 'com_foobar');
+		$view   = $this->input->getCmd('view', $this->defaultView);
+		$task   = $this->input->getCmd('task', null);
+
+		if (empty($task))
+		{
+			$task = $this->getTask($view);
+		}
+
+		// Pluralise/sungularise the view name for typical tasks
+		if (in_array($task, array('edit', 'add', 'read')))
+		{
+			$view = FOFInflector::singularize($view);
+		}
+		elseif (in_array($task, array('browse')))
+		{
+			$view = FOFInflector::pluralize($view);
+		}
+
+		$this->input->set('view', $view);
+		$this->input->set('task', $task);
+
+		$config = $this->config;
+		$config['input'] = $this->input;
+
+		$controller = FOFController::getTmpInstance($option, $view, $config);
+		$status = $controller->execute($task);
+
+		if (!$this->onAfterDispatch())
+		{
+            // We can set header only if we're not in CLI
+            if(!$platform->isCli())
+            {
+                $platform->setHeader('Status', '403 Forbidden', true);
+            }
+
+            return $platform->raiseError(403, JText::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'));
+		}
+
+		$format = $this->input->get('format', 'html', 'cmd');
+		$format = empty($format) ? 'html' : $format;
+
+		if ($controller->hasRedirect())
+		{
+			$controller->redirect();
+		}
+	}
+
+	/**
+	 * Tries to guess the controller task to execute based on the view name and
+	 * the HTTP request method.
+	 *
+	 * @param   string  $view  The name of the view
+	 *
+	 * @return  string  The best guess of the task to execute
+	 */
+	protected function getTask($view)
+	{
+		// Get a default task based on plural/singular view
+		$request_task = $this->input->getCmd('task', null);
+		$task = FOFInflector::isPlural($view) ? 'browse' : 'edit';
+
+		// Get a potential ID, we might need it later
+		$id = $this->input->get('id', null, 'int');
+
+		if ($id == 0)
+		{
+			$ids = $this->input->get('ids', array(), 'array');
+
+			if (!empty($ids))
+			{
+				$id = array_shift($ids);
+			}
+		}
+
+		// Check the request method
+
+		if (!isset($_SERVER['REQUEST_METHOD']))
+		{
+			$_SERVER['REQUEST_METHOD'] = 'GET';
+		}
+
+		$requestMethod = strtoupper($_SERVER['REQUEST_METHOD']);
+
+		switch ($requestMethod)
+		{
+			case 'POST':
+			case 'PUT':
+				if (!is_null($id))
+				{
+					$task = 'save';
+				}
+				break;
+
+			case 'DELETE':
+				if ($id != 0)
+				{
+					$task = 'delete';
+				}
+				break;
+
+			case 'GET':
+			default:
+				// If it's an edit without an ID or ID=0, it's really an add
+				if (($task == 'edit') && ($id == 0))
+				{
+					$task = 'add';
+				}
+
+				// If it's an edit in the frontend, it's really a read
+				elseif (($task == 'edit') && FOFPlatform::getInstance()->isFrontend())
+				{
+					$task = 'read';
+				}
+				break;
+		}
+
+		return $task;
+	}
+
+	/**
+	 * Executes right before the dispatcher tries to instantiate and run the
+	 * controller.
+	 *
+	 * @return  boolean  Return false to abort
+	 */
+	public function onBeforeDispatch()
+	{
+		return true;
+	}
+
+	/**
+	 * Sets up some environment variables, so we can work as usually on CLI, too.
+	 *
+	 * @return  boolean  Return false to abort
+	 */
+	public function onBeforeDispatchCLI()
+	{
+		JLoader::import('joomla.environment.uri');
+		JLoader::import('joomla.application.component.helper');
+
+		// Trick to create a valid url used by JURI
+		$this->_originalPhpScript = '';
+
+		// We have no Application Helper (there is no Application!), so I have to define these constants manually
+		$option = $this->input->get('option', '', 'cmd');
+
+		if ($option)
+		{
+			$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($option);
+
+			if (!defined('JPATH_COMPONENT'))
+			{
+				define('JPATH_COMPONENT', $componentPaths['main']);
+			}
+
+			if (!defined('JPATH_COMPONENT_SITE'))
+			{
+				define('JPATH_COMPONENT_SITE', $componentPaths['site']);
+			}
+
+			if (!defined('JPATH_COMPONENT_ADMINISTRATOR'))
+			{
+				define('JPATH_COMPONENT_ADMINISTRATOR', $componentPaths['admin']);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Executes right after the dispatcher runs the controller.
+	 *
+	 * @return  boolean  Return false to abort
+	 */
+	public function onAfterDispatch()
+	{
+		// If we have to log out the user, please do so now
+		if ($this->fofAuth_LogoutOnReturn && $this->_fofAuth_isLoggedIn)
+		{
+			FOFPlatform::getInstance()->logoutUser();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Transparently authenticates a user
+	 *
+	 * @return  void
+	 */
+	public function transparentAuthentication()
+	{
+		// Only run when there is no logged in user
+		if (!FOFPlatform::getInstance()->getUser()->guest)
+		{
+			return;
+		}
+
+		// @todo Check the format
+		$format = $this->input->getCmd('format', 'html');
+
+		if (!in_array($format, $this->fofAuth_Formats))
+		{
+			return;
+		}
+
+		foreach ($this->fofAuth_AuthMethods as $method)
+		{
+			// If we're already logged in, don't bother
+			if ($this->_fofAuth_isLoggedIn)
+			{
+				continue;
+			}
+
+			// This will hold our authentication data array (username, password)
+			$authInfo = null;
+
+			switch ($method)
+			{
+				case 'HTTPBasicAuth_TOTP':
+
+					if (empty($this->fofAuth_Key))
+					{
+						continue;
+					}
+
+					if (!isset($_SERVER['PHP_AUTH_USER']))
+					{
+						continue;
+					}
+
+					if (!isset($_SERVER['PHP_AUTH_PW']))
+					{
+						continue;
+					}
+
+					if ($_SERVER['PHP_AUTH_USER'] != '_fof_auth')
+					{
+						continue;
+					}
+
+					$encryptedData = $_SERVER['PHP_AUTH_PW'];
+
+					$authInfo = $this->_decryptWithTOTP($encryptedData);
+					break;
+
+				case 'QueryString_TOTP':
+					$encryptedData = $this->input->get('_fofauthentication', '', 'raw');
+
+					if (empty($encryptedData))
+					{
+						continue;
+					}
+
+					$authInfo = $this->_decryptWithTOTP($encryptedData);
+					break;
+
+				case 'HTTPBasicAuth_Plaintext':
+					if (!isset($_SERVER['PHP_AUTH_USER']))
+					{
+						continue;
+					}
+
+					if (!isset($_SERVER['PHP_AUTH_PW']))
+					{
+						continue;
+					}
+
+					$authInfo = array(
+						'username'	 => $_SERVER['PHP_AUTH_USER'],
+						'password'	 => $_SERVER['PHP_AUTH_PW']
+					);
+					break;
+
+				case 'QueryString_Plaintext':
+					$jsonencoded = $this->input->get('_fofauthentication', '', 'raw');
+
+					if (empty($jsonencoded))
+					{
+						continue;
+					}
+
+					$authInfo = json_decode($jsonencoded, true);
+
+					if (!is_array($authInfo))
+					{
+						$authInfo = null;
+					}
+					elseif (!array_key_exists('username', $authInfo) || !array_key_exists('password', $authInfo))
+					{
+						$authInfo = null;
+					}
+					break;
+
+				case 'SplitQueryString_Plaintext':
+					$authInfo = array(
+						'username'	 => $this->input->get('_fofauthentication_username', '', 'raw'),
+						'password'	 => $this->input->get('_fofauthentication_password', '', 'raw'),
+					);
+
+					if (empty($authInfo['username']))
+					{
+						$authInfo = null;
+					}
+
+					break;
+
+				default:
+					continue;
+
+					break;
+			}
+
+			// No point trying unless we have a username and password
+			if (!is_array($authInfo))
+			{
+				continue;
+			}
+
+			$this->_fofAuth_isLoggedIn = FOFPlatform::getInstance()->loginUser($authInfo);
+		}
+	}
+
+	/**
+	 * Decrypts a transparent authentication message using a TOTP
+	 *
+	 * @param   string  $encryptedData  The encrypted data
+	 *
+     * @codeCoverageIgnore
+	 * @return  array  The decrypted data
+	 */
+	private function _decryptWithTOTP($encryptedData)
+	{
+		if (empty($this->fofAuth_Key))
+		{
+			$this->_fofAuth_CryptoKey = null;
+
+			return null;
+		}
+
+		$totp = new FOFEncryptTotp($this->fofAuth_timeStep);
+		$period = $totp->getPeriod();
+		$period--;
+
+		for ($i = 0; $i <= 2; $i++)
+		{
+			$time = ($period + $i) * $this->fofAuth_timeStep;
+			$otp = $totp->getCode($this->fofAuth_Key, $time);
+			$this->_fofAuth_CryptoKey = hash('sha256', $this->fofAuth_Key . $otp);
+
+			$aes = new FOFEncryptAes($this->_fofAuth_CryptoKey);
+			$ret = $aes->decryptString($encryptedData);
+			$ret = rtrim($ret, "\000");
+
+			$ret = json_decode($ret, true);
+
+			if (!is_array($ret))
+			{
+				continue;
+			}
+
+			if (!array_key_exists('username', $ret))
+			{
+				continue;
+			}
+
+			if (!array_key_exists('password', $ret))
+			{
+				continue;
+			}
+
+			// Successful decryption!
+			return $ret;
+		}
+
+		// Obviously if we're here we could not decrypt anything. Bail out.
+		$this->_fofAuth_CryptoKey = null;
+
+		return null;
+	}
+
+	/**
+	 * Creates a decryption key for use with the TOTP decryption method
+	 *
+	 * @param   integer  $time  The timestamp used for TOTP calculation, leave empty to use current timestamp
+	 *
+     * @codeCoverageIgnore
+	 * @return  string  THe encryption key
+	 */
+	private function _createDecryptionKey($time = null)
+	{
+		$totp = new FOFEncryptTotp($this->fofAuth_timeStep);
+		$otp = $totp->getCode($this->fofAuth_Key, $time);
+
+		$key = hash('sha256', $this->fofAuth_Key . $otp);
+
+		return $key;
+	}
+
+	/**
+	 * Main function to detect if we're running in a CLI environment and we're admin
+	 *
+	 * @return  array  isCLI and isAdmin. It's not an associtive array, so we can use list.
+	 */
+	public static function isCliAdmin()
+	{
+		static $isCLI   = null;
+		static $isAdmin = null;
+
+		if (is_null($isCLI) && is_null($isAdmin))
+		{
+			$isCLI   = FOFPlatform::getInstance()->isCli();
+			$isAdmin = FOFPlatform::getInstance()->isBackend();
+		}
+
+		return array($isCLI, $isAdmin);
+	}
+}
diff --git a/core/libraries/fof/download/adapter/abstract.php b/core/libraries/fof/download/adapter/abstract.php
new file mode 100644
index 00000000..19f46f2f
--- /dev/null
+++ b/core/libraries/fof/download/adapter/abstract.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  dispatcher
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Abstract base class for download adapters
+ */
+abstract class FOFDownloadAdapterAbstract implements FOFDownloadInterface
+{
+	public $priority = 100;
+
+	public $name = '';
+
+	public $isSupported = false;
+
+	public $supportsChunkDownload = false;
+
+	public $supportsFileSize = false;
+
+	/**
+	 * Does this download adapter support downloading files in chunks?
+	 *
+	 * @return  boolean  True if chunk download is supported
+	 */
+	public function supportsChunkDownload()
+	{
+		return $this->supportsChunkDownload;
+	}
+
+	/**
+	 * Does this download adapter support reading the size of a remote file?
+	 *
+	 * @return  boolean  True if remote file size determination is supported
+	 */
+	public function supportsFileSize()
+	{
+		return $this->supportsFileSize;
+	}
+
+	/**
+	 * Is this download class supported in the current server environment?
+	 *
+	 * @return  boolean  True if this server environment supports this download class
+	 */
+	public function isSupported()
+	{
+		return $this->isSupported;
+	}
+
+	/**
+	 * Get the priority of this adapter. If multiple download adapters are
+	 * supported on a site, the one with the highest priority will be
+	 * used.
+	 *
+	 * @return  boolean
+	 */
+	public function getPriority()
+	{
+		return $this->priority;
+	}
+
+	/**
+	 * Returns the name of this download adapter in use
+	 *
+	 * @return  string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Download a part (or the whole) of a remote URL and return the downloaded
+	 * data. You are supposed to check the size of the returned data. If it's
+	 * smaller than what you expected you've reached end of file. If it's empty
+	 * you have tried reading past EOF. If it's larger than what you expected
+	 * the server doesn't support chunk downloads.
+	 *
+	 * If this class' supportsChunkDownload returns false you should assume
+	 * that the $from and $to parameters will be ignored.
+	 *
+	 * @param   string   $url     The remote file's URL
+	 * @param   integer  $from    Byte range to start downloading from. Use null for start of file.
+	 * @param   integer  $to      Byte range to stop downloading. Use null to download the entire file ($from is ignored)
+	 * @param   array    $params  Additional params that will be added before performing the download
+	 *
+	 * @return  string  The raw file data retrieved from the remote URL.
+	 *
+	 * @throws  Exception  A generic exception is thrown on error
+	 */
+	public function downloadAndReturn($url, $from = null, $to = null, array $params = array())
+	{
+		return '';
+	}
+
+	/**
+	 * Get the size of a remote file in bytes
+	 *
+	 * @param   string  $url  The remote file's URL
+	 *
+	 * @return  integer  The file size, or -1 if the remote server doesn't support this feature
+	 */
+	public function getFileSize($url)
+	{
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/download/adapter/cacert.pem b/core/libraries/fof/download/adapter/cacert.pem
new file mode 100644
index 00000000..f9126f8f
--- /dev/null
+++ b/core/libraries/fof/download/adapter/cacert.pem
@@ -0,0 +1,5104 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from CentOS as of Oct 3 2015
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from CentOS /etc/pki/tls/certs/ca-bundle.crt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
+EwhEU1RDQSBFMTAeFw05ODEyMTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJ
+BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
+ETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQCg
+bIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJENySZ
+j9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlV
+Sn5JTe2io74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCG
+SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
+JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
+RFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMTAxODEw
+MjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFGp5
+fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i
++DAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
+SIb3DQEBBQUAA4GBACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lN
+QseSJqBcNJo4cvj9axY+IO6CizEqkzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+
+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4RbyhkwS7hp86W0N6w4pl
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJV
+UzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQL
+EwhEU1RDQSBFMjAeFw05ODEyMDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJ
+BgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4x
+ETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQC/
+k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGODVvso
+LeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3o
+TQPMx7JSxhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCG
+SAGG+EIBAQQEAwIABzBoBgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMx
+JDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0dXJlIFRydXN0IENvLjERMA8GA1UECxMI
+RFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQwIoAPMTk5ODEyMDkxOTE3
+MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFB6C
+TShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5
+WzAMBgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqG
+SIb3DQEBBQUAA4GBAEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHR
+xdf0CiUPPXiBng+xZ8SQTGPdXqfiup/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVL
+B3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1mPnHfxsb1gYgAlihw6ID
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgdk4xWArzZbxpvUjZudVYK
+VdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIqWpDBucSm
+Fc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0J
+h9ZrbWB85a7FkCMMXErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2ul
+uIncrKTdcu1OofdPvAbT6shkdHvClUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68
+DzFc6PLZ
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
+nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
+8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
+ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
+PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
+6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
+n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
+qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
+wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
+ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
+pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
+E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
+aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
+Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
+BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
+Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
+Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
+J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
+JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
+wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
+koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
+qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
+Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
+xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
+7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
+sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
+sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
+cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
+BAMTFOFkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
+7CAFYd4=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx
+MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG
+29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk
+oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk
+3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL
+qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN
+nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX
+ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H
+DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO
+TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv
+kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w
+zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
+mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB
+rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt
+Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa
+Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV
+BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l
+dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE
+AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B
+YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9
+hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l
+L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm
+SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM
+1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws
+6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw
+Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50
+aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u
+7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0
+xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ
+rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim
+eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk
+USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB
+lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt
+T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc
+BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3
+dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP
+HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO
+KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo
+5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+
+pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb
+kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC
+AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov
+L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV
+HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN
+AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
+NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB
+mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU
+4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5
+81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR
+Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD
+EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz
+aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w
+MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l
+dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh
+bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq
+eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe
+r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5
+3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd
+vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l
+mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC
+wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg
+hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0
+TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh
+biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg
+ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg
+dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6
+b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl
+c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0
+ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3
+dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu
+ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo
+ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3
+Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u
+ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA
+A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ
+MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+
+NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR
+VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY
+83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3
+macqaJVmlaut74nLYKkGEsaUR+ko
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
+AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
+CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
+BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
+VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
+qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
+HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
+G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
+lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
+IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
+0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
+k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
+4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
+m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
+cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
+uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
+KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
+ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
+AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
+VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
+CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
+cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
+QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
+7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
+cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
+QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
+czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
+aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
+aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
+DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
+BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
+D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
+JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
+AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
+vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
+tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
+7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
+h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
+d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
+pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
+CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
+ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
+QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
+NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
+ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
+QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
+qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
+fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
+Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
+Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
+54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
+MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
+ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
+YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
+A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
+rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
+pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
+lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
+YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
+7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
+YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
+xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
+unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
+Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
+ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
+gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
+jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
+W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
+RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
+MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
+BYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UE
+AwwVQXRvcyBUcnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQG
+EwJERTAeFw0xMTA3MDcxNDU4MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMM
+FUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMC
+REUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVhTuXbyo7LjvPpvMp
+Nb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr54rM
+VD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+
+SZFhyBH+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ
+4J7sVaE3IqKHBAUsR320HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0L
+cp2AMBYHlT8oDv3FdU9T1nSatCQujgKRz3bFmx5VdJx4IbHwLfELn8LVlhgf8FQi
+eowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7Rl+lwrrw7GWzbITAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZbNshMBgG
+A1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3
+DQEBCwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8j
+vZfza1zv7v1Apt+hk6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kP
+DpFrdRbhIfzYJsdHt6bPWHJxfrrhTZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pc
+maHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a961qn8FYiqTxlVMYVqL2Gns2D
+lmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G3mB/ufNPRJLv
+KrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
+VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
+bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
+dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
+MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
+dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
+ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
+EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
+lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
+znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
+2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
+k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
+2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
+VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
+KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
+FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
+DNuxUCAKGkq6ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
+isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
+NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
+hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
+Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
+EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
+mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
+e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
+dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
+MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
+D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
+OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
+fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
+IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
+oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
+/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
+rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
+3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
+7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
+yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
+qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
+hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
+SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
+HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
+emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
+AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
+7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
+DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
+F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
+a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
+Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
+MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
+NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
+PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
+x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
+QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
+yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
+QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
+H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
+QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
+i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
+nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
+rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
+hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
+GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
+lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
+TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
+nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
+gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
+G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
+zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
+L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
+DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
+BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
+QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
+gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
+zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
+130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
+JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
+ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
+AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
+9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
+bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
+fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
+HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
+t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
+BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
+Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
+cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
+aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
+F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
+8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
+rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
+/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
+7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
+28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
+lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
+nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
+0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
+5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
+WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
+jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
+ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
+OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
+619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
+2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
+o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
+nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
+5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
+pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
+dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
+BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJD
+TjEwMC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkx
+MjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEwMC4GA1UECgwnQ2hpbmEgRmluYW5j
+aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJP
+T1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnVBU03
+sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpL
+TIpTUnrD7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5
+/ZOkVIBMUtRSqy5J35DNuF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp
+7hZZLDRJGqgG16iI0gNyejLi6mhNbiyWZXvKWfry4t3uMCz7zEasxGPrb382KzRz
+EpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7xzbh72fROdOXW3NiGUgt
+hxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9fpy25IGvP
+a931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqot
+aK8KgWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNg
+TnYGmE69g60dWIolhdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfV
+PKPtl8MeNPo4+QgO48BdK4PRVmrJtqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hv
+cWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAfBgNVHSMEGDAWgBTj/i39KNAL
+tbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAd
+BgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObT
+ej/tUxPQ4i9qecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdL
+jOztUmCypAbqTuv0axn96/Ua4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBS
+ESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sGE5uPhnEFtC+NiWYzKXZUmhH4J/qy
+P5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfXBDrDMlI1Dlb4pd19
+xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjnaH9d
+Ci77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN
+5mydLIhyPDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe
+/v5WOaHIz16eGWRGENoXkbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+Z
+AAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ
+5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
+Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
+aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
+Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
+SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
+aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
+ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
+7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
+DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
+zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
+hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
+4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
+gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
+NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
+j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
+52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
+echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
+zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
+wy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
+ZQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
+hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
+6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
+pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
+9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
+/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
+Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
+qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
+SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
+u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
+Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
+crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
+/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
+wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
+4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
+2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
+FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
+CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
+boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
+jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
+S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
+QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
+0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
+NVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0
+MRMwEQYDVQQDEwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQG
+EwJJTDAeFw0wNDAzMjQxMTMyMThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMT
+CkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNpZ24xCzAJBgNVBAYTAklMMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49qROR+WCf4C9DklBKK
+8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTyP2Q2
+98CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb
+2CEJKHxNGGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxC
+ejVb7Us6eva1jsz/D3zkYDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7Kpi
+Xd3DTKaCQeQzC6zJMw9kglcq/QytNuEMrkvF7zuZ2SOzW120V+x0cAwqTwIDAQAB
+o4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2Zl
+ZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0PAQH/BAQD
+AgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRL
+AZs+VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWd
+foPPbrxHbvUanlR2QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0M
+cXS6hMTXcpuEfDhOZAYnKuGntewImbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq
+8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb/627HOkthIDYIb6FUtnUdLlp
+hbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VGzT2ouvDzuFYk
+Res3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
+AGegcQCCSA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
+PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
+MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
+GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
+MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
+HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
+gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
+v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
+Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
+9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
+6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
+MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
+Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
+ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
+hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
+iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
+dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
+kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
+hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA
+n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc
+biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp
+EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA
+bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu
+YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW
+BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI
+QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I
+0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni
+lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9
+B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv
+ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQsw
+CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
+ZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3Qg
+RzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJf
+Zn4f5dwbRXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17Q
+RSAPWXYQ1qAk8C3eNvJsKTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgFUaFNN6KDec6NHSrkhDAKBggqhkjOPQQD
+AwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5FyYZ5eEJJZVrmDxxDnOOlY
+JjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy1vUhZscv
+6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQsw
+CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
+ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe
+Fw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUw
+EwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20x
+IDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0CAQYF
+K4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FG
+fp4tn+6OYwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPO
+Z9wj/wMco+I+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAd
+BgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNpYim8S8YwCgYIKoZIzj0EAwMDaAAwZQIx
+AK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y3maTD/HMsQmP3Wyr+mt/
+oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34VOKa5Vt8
+sycX
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
+RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
+ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
+xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
+ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
+DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
+jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
+CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
+EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
+fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
+uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
+chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
+9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
+SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
++SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
+fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
+sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
+cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
+0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
+4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
+r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
+/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
+gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+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
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
+8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
+dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
+YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
+dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
+IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
+LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
+EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
+KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
+ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
+bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
+ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
+85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
+4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
+HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
+QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
+lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
+o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
+opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
+dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
+ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
+AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
+/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
+SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
+Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
+Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
+nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
+czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
+CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
+MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
+ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
+b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
+euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
+bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
+WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
+MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
+1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
+zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
+BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
+v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
+E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
+iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
+GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
+A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
+d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
+dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
+RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
+MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
+VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
+L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
+Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
+A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
+ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
+Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
+R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
+hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
+cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
+IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
+dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
+NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
+dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
+dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
+aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
+RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
+cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
+wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
+U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
+jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
+BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
+jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
+1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
+nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
+VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV
+BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC
+aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV
+BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1
+Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz
+MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+
+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp
+em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY
+B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH
+D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF
+Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo
+q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D
+k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH
+fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut
+dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM
+ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8
+zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX
+U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6
+Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5
+XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF
+Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR
+HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY
+GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c
+77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3
++GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK
+vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6
+FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl
+yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P
+AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD
+y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d
+NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEk
+MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpH
+bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
+QSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprlOQcJ
+FspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61F
+uOJAf/sKbvu+M8k8o4TVMAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGX
+kPoUVy0D7O48027KqGx2vKLeuwIgJ6iFJzWbVsaj8kfSt24bAgAXqmemFZHe+pTs
+ewv4n4Q=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEk
+MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpH
+bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
+QSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6SFkc
+8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8ke
+hOvRnkmSh5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYI
+KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg
+515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7yFz9SO8NdCKoCOJuxUnO
+xwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
+RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
+dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
+YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
+NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
+EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
+cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
+dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
+fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
+bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
+75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
+FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
+HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
+5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
+b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
+A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
+6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
+dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
+Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
+l7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu
+VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw
+MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw
+JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT
+3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU
++ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp
+S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1
+bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi
+T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL
+vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK
+Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK
+dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT
+c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv
+l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N
+iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD
+ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt
+LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93
+nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3
++wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK
+W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT
+AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq
+l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG
+4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ
+mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A
+7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVu
+VHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcN
+MzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0
+MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTyP4o7
+ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGy
+RBb06tD6Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlS
+bdsHyo+1W/CD80/HLaXIrcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF
+/YTLNiCBWS2ab21ISGHKTN9T0a9SvESfqy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R
+3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoSmJxZZoY+rfGwyj4GD3vw
+EUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFnol57plzy
+9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9V
+GxyhLrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ
+2fjXctscvG29ZV/viDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsV
+WaFHVCkugyhfHMKiq3IXAAaOReyL4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gD
+W/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMwDQYJKoZIhvcN
+AQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHV
+DRDtfULAj+7AmgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9
+TaDKQGXSc3z1i9kKlT/YPyNtGtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8G
+lwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFtm6/n6J91eEyrRjuazr8FGF1NFTwW
+mhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMxNRF4eKLg6TCMf4Df
+WN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4Mhn5
++bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJ
+tshquDDIajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhA
+GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
+8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
+0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
+cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
+b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
+ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
+NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
+TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
+Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
+uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
+vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
+Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
+62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
+AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
+LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
+BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
+AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
+MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
+ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
+AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
+ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
+AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
+AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
+bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
+Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
+PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
+Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
+EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
+w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
+cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
+HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
+VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
+BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
+b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
+8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
+ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
+7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
+hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
+MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
+MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
+b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
+KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
+A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
+aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
+7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
+BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
+ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
+JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
+PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
+0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
+6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
+v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
+K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
+bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
+MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
+MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
+gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
+b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
+bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
+cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
+ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
+ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
+hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
+AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
+MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
+RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
+UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
+cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
+AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
+AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
+1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
+3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
+Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
+HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
+pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
+sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
+qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
+mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
+opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
+YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00
+MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakEPBtV
+wedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWe
+rNrwU8lmPNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF341
+68Xfuw6cwI2H44g4hWf6Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh
+4Pw5qlPafX7PGglTvFOFBM+hSo+LdoINofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXp
+UhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/lg6AnhF4EwfWQvTA9xO+o
+abw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV7qJZjqlc
+3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/G
+KubX9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSt
+hfbZxbGL0eUQMk1fiyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KO
+Tk0k+17kBL5yG6YnLUlamXrXXAkgt3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOt
+zCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZIhvcNAQELBQAD
+ggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2
+cDMT/uFPpiN3GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUN
+qXsCHKnQO18LwIE6PWThv6ctTr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5
+YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP+V04ikkwj+3x6xn0dxoxGE1nVGwv
+b2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh3jRJjehZrJ3ydlo2
+8hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fawx/k
+NSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNj
+ZgKAvQU6O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhp
+q1467HxpvMc7hU6eFbm0FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFt
+nh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOVhMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
+MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
+qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
+n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
+c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
+o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
+IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
+IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
+8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
+vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
+7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
+cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
+ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
+roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
+W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
+lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
++V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
+csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
+dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
+KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
+HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
+WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00
+MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286IxSR
+/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNu
+FoM7pmRLMon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXR
+U7Ox7sWTaYI+FrUoRqHe6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+c
+ra1AdHkrAj80//ogaX3T7mH1urPnMNA3I4ZyYUUpSFlob3emLoG+B01vr87ERROR
+FHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3UVDmrJqMz6nWB2i3ND0/k
+A9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f75li59wzw
+eyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634Ryl
+sSqiMd5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBp
+VzgeAVuNVejH38DMdyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0Q
+A4XN8f+MFrXBsj6IbGB/kE+V9/YtrQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+
+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZIhvcNAQELBQAD
+ggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnI
+FUBhynLWcKzSt/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5Wvv
+oxXqA/4Ti2Tk08HS6IT7SdEQTXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFg
+u/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9DuDcpmvJRPpq3t/O5jrFc/ZSXPsoaP
+0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGibIh6BJpsQBJFxwAYf
+3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmDhPbl
+8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+
+DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN
+PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/
+ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
+UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
+R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
+MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
+JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
+WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
+SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
+u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
+A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
+Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
+MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
+aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
+IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
+cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
+YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
+bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
+bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
+aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
+ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
+YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
+ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
+LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
+Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
+eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
+CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
+A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
+Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
+lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
+b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
+9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
+ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
+IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
+MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
+IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
+bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
+RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
+zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
+bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
+MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
+VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
+OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
+tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
+q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
+EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
+VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gRVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0y
+MjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIg
+TmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBS
+b290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkkSzrS
+M4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nC
+UiY4iKTWO0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3d
+Z//BYY1jTw+bbRcwJu+r0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46p
+rfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13l
+pJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gVXJrm0w912fxBmJc+qiXb
+j5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr08C+eKxC
+KFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS
+/ZbV0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0X
+cgOPvZuM5l5Tnrmd74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH
+1vI4gnPah1vlPNOePqc7nvQDs/nxfRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrP
+px9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwaivsnuL8wbqg7
+MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u
+2dfOWBfoqSmuc0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHS
+v4ilf0X8rLiltTMMgsT7B/Zq5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTC
+wPTxGfARKbalGAKb12NMcIxHowNDXLldRqANb/9Zjr7dn3LDWyvfjFvO5QxGbJKy
+CqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tNf1zuacpzEPuKqf2e
+vTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi5Dp6
+Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIa
+Gl6I6lD4WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeL
+eG9QgkRQP2YGiqtDhFZKDyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8
+FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGyeUN51q1veieQA6TqJIc/2b3Z6fJfUEkc
+7uzXLg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloX
+DTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4yolQP
+cPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WW
+IkYFsO2tx1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqX
+xz8ecAgwoNzFs21v0IJyEavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFy
+KJLZWyNtZrVtB0LrpjPOktvA9mxjeM3KTj215VKb8b475lRgsGYeCasH/lSJEULR
+9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUurmkVLoR9BvUhTFXFkC4az
+5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU51nus6+N8
+6U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7
+Ngzp07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHP
+bMk7ccHViLVlvMDoFxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXt
+BznaqB16nzaeErAMZRKQFWDZJkBE41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTt
+XUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMBAAGjQjBAMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleuyjWcLhL75Lpd
+INyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwp
+LiniyMMB8jPqKqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8
+Ipf3YF3qKS9Ysr1YvY2WTxB1v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixp
+gZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA8KCWAg8zxXHzniN9lLf9OtMJgwYh
+/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b8KKaa8MFSu1BYBQw
+0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0rmj1A
+fsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq
+4BZ+Extq1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR
+1VmiiXTTn74eS9fGbbeIJG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/
+QFH1T/U67cjF68IeHRaVesd+QnGTbksVtzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM
+94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
+OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
+A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
+JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
+vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
+D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
+Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
+RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
+HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
+nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
+0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
+UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
+Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
+TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
+BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
+UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
+6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
+9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
+HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
+wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
+XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
+IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
+hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
+so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCB
+rjELMAkGA1UEBhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcp
+MRIwEAYDVQQHEwlTdHV0dGdhcnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fz
+c2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVTLVRSVVNUIEF1dGhlbnRpY2F0aW9u
+IGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0wNTA2MjIwMDAwMDBa
+Fw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFkZW4t
+V3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMg
+RGV1dHNjaGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJV
+U1QgQXV0aGVudGljYXRpb24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBO
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1
+toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob4QSwI7+Vio5bG0F/WsPo
+TUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXLg3KSwlOy
+ggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1
+XgqfeN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteF
+hy+S8dF2g08LOlk3KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm
+7QIDAQABo4GSMIGPMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEG
+MCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJvbmxpbmUxLTIwNDgtNTAdBgNV
+HQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAUD8oeXHngovMp
+ttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
+pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFo
+LtU96G7m1R08P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersF
+iXOMy6ZNwPv2AtawB6MDwidAnwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0y
+h9WUUpY6RsZxlj33mA6ykaqP2vROJAA5VeitF7nTNCtKqUDMFypVZUF0Qn71wK/I
+k63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8bHz2eBIPdltkdOpQ=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID2DCCAsCgAwIBAgIQYFbFSyNAW2TU7SXa2dYeHjANBgkqhkiG9w0BAQsFADCB
+hTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZl
+cmxhZyBHbWJIMScwJQYDVQQLEx5TLVRSVVNUIENlcnRpZmljYXRpb24gU2Vydmlj
+ZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVyc2FsIFJvb3QgQ0EwHhcNMTMxMDIy
+MDAwMDAwWhcNMzgxMDIxMjM1OTU5WjCBhTELMAkGA1UEBhMCREUxKTAnBgNVBAoT
+IERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQLEx5TLVRS
+VVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5p
+dmVyc2FsIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo
+4wvfETeFgpq1bGZ8YT/ARxodRuOwVWTluII5KAd+F//0m4rwkYHqOD8heGxI7Gsv
+otOKcrKn19nqf7TASWswJYmM67fVQGGY4tw8IJLNZUpynxqOjPolFb/zIYMoDYuv
+WRGCQ1ybTSVRf1gYY2A7s7WKi1hjN0hIkETCQN1d90NpKZhcEmVeq5CSS2bf1XUS
+U1QYpt6K1rtXAzlZmRgFDPn9FcaQZEYXgtfCSkE9/QC+V3IYlHcbU1qJAfYzcg6T
+OtzoHv0FBda8c+CI3KtP7LUYhk95hA5IKmYq3TLIeGXIC51YAQVx7YH1aBduyw20
+S9ih7K446xxYL6FlAzQvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBSafdfr639UmEUptCCrbQuWIxmkwjANBgkqhkiG
+9w0BAQsFAAOCAQEATpYS2353XpInniEXGIJ22D+8pQkEZoiJrdtVszNqxmXEj03z
+MjbceQSWqXcy0Zf1GGuMuu3OEdBEx5LxtESO7YhSSJ7V/Vn4ox5R+wFS5V/let2q
+JE8ii912RvaloA812MoPmLkwXSBvwoEevb3A/hXTOCoJk5gnG5N70Cs0XmilFU/R
+UsOgyqCDRR319bdZc11ZAY+qwkcvFHHVKeMQtUeTJcwjKdq3ctiR1OwbSIoi5MEq
+9zpok59FGW5Dt8z+uJGaYRo2aWNkkijzb2GShROfyQcsi1fc65551cLeCNVUsldO
+KjKNoeI60RAgIjl9NEVvcTvDHfz/sk+o4vYwHg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
+MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
+jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
+0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
+2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
+ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
+y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
+tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
+6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
+uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
+acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
+k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
+VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
+b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
+fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
+/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
+REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
+srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
+aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
+woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
+Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
+t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
+8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
+9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
+wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
+ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
+dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
+IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
+VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
+dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
+MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
+UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
+1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
+oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
+HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
+5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
+idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
+OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
+NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
+46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
+UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
+7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
+A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
+bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
+XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
+PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
+Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
+WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
+Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
+7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
+nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
+vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
+WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
+fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
+I+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
+IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
+WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
+ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
+IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
+IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
+6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
+jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
+izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
++zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
+zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
+pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
+KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
+ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
+AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
+ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
+IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
+A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
+uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
+jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
+u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
+YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
+puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
+icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
+DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
+kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
+Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
+pYYsfPQS
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
+tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
+uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
+XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
+8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
+5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
+kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
+GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
+ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
+au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
+hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
+dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
+Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
+Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
+1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
+ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
+Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
+XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
+irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
+TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
+g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
+95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
+S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
+BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
+c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
+MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
+R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
+VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
+JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
+fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
+jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
+wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
+fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
+VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
+CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
+7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
+8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
+ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
+2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
+NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv
+b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD
+VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F
+VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1
+7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X
+Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+
+/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs
+81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm
+dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe
+Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu
+sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4
+pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs
+slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ
+arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG
+9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl
+dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj
+TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed
+Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7
+Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI
+OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7
+vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW
+t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn
+HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx
+SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB
+zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
+d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
+cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow
+gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT
+CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV
+BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo
+YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z
+ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560
+ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j
++ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI
+CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH
+IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga
+WuFg3GQjPEIuTQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
+ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
+MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
+MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
+iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
+vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
+0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
+OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
+BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
+FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
+GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
+zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
+1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
+f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
+jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
+ZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgxMDAxMTA0MDE0WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUd
+AqSzm1nzHoqvNK38DcLZSBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiC
+FoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/FvudocP05l03Sx5iRUKrERLMjfTlH6VJi
+1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx9702cu+fjOlbpSD8DT6Iavq
+jnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGVWOHAD3bZ
+wI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/
+WSA2AHmgoCJrjNXyYdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhy
+NsZt+U2e+iKo4YFWz827n+qrkRk4r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPAC
+uvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNfvNoBYimipidx5joifsFvHZVw
+IEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR3p1m0IvVVGb6
+g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlP
+BSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
+RGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
+OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
+b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
+VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
+sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
+ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
+KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
+HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
+IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
+733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
+Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
+AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
+mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
+XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
+qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
+EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
+VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
+NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
+B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
+10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
+0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
+MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
+zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
+46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
+yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
+laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
+oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
+BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
+qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
+4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
+1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
+H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
+RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
+15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
+6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
+nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
+wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
+aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
+KwbQBM0=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
+MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
+V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
+WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
+LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
+AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
+K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
+RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
+rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
+3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
+hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
+MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
+XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
+lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
+aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
+YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
+eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
+JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
+VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
+I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
+o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
+A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
+zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
+RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
+MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
+3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
+tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
+Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
+VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
+79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
+c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
+Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
+c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
+UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
+Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
+Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
+VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
+ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
+8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
+iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
+Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
+XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
+qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
+VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
+L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
+jjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0f
+zGVuDLDQVoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHi
+TkVWaR94AoDa3EeRKbs2yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBAFgVKTk8d6PaXCUDfGD67gmZPCcQcMgMCeazh88K4hiW
+NWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n0a3hUKw8fGJLj7qE1xIV
+Gx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZRjXZ+Hxb
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
+2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBV
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNV
+BAMTIUNlcnRpZmljYXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgw
+MTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFX
+b1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvcqN
+rLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1U
+fcIiePyOCbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcScc
+f+Hb0v1naMQFXQoOXXDX2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2
+ZjC1vt7tj/id07sBMOby8w7gLJKA84X5KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4M
+x1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR+ScPewavVIMYe+HdVHpR
+aG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ezEC8wQjch
+zDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDar
+uHqklWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221K
+mYo0SLwX3OSACCK28jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvA
+Sh0JWzko/amrzgD5LkhLJuYwTKVYyrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWv
+HYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0CAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R8bNLtwYgFP6H
+EtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJ
+MuYhOZO9sxXqT2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2e
+JXLOC62qx1ViC777Y7NhRCOjy+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VN
+g64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC2nz4SNAzqfkHx5Xh9T71XXG68pWp
+dIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes5cVAWubXbHssw1ab
+R80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/EaEQ
+PkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGce
+xGATVdVhmVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+
+J7x6v+Db9NpSvd4MVHAxkUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMl
+OtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGikpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWT
+ee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBG
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNV
+BAMMEkNBIOayg+mAmuagueivgeS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgw
+MTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRl
+ZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k8H/r
+D195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld1
+9AXbbQs5uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExf
+v5RxadmWPgxDT74wwJ85dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnk
+UkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+L
+NVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFyb7Ao65vh4YOhn0pdr8yb
++gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc76DbT52V
+qyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6K
+yX2m+Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0G
+AbQOXDBGVWCvOGU6yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaK
+J/kR8slC/k7e3x9cxKSGhxYzoacXGKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwEC
+AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUAA4ICAQBqinA4
+WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
+yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj
+/feTZU7n85iYr83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6
+jBAyvd0zaziGfjk9DgNyp115j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2
+ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0AkLppRQjbbpCBhqcqBT/mhDn4t/lX
+X0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97qA4bLJyuQHCH2u2n
+FoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Yjj4D
+u9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10l
+O1Hm13ZBONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Le
+ie2uPAmvylezkolwQOQvT8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR1
+2KvxAmLBsX5VYc8T1yaw15zLKYs4SgsOkI26oQ==
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIEMDCCA5mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBxzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMR8wHQYDVQQHExZSZXNlYXJjaCBUcmlh
+bmdsZSBQYXJrMRYwFAYDVQQKEw1SZWQgSGF0LCBJbmMuMSEwHwYDVQQLExhSZWQg
+SGF0IE5ldHdvcmsgU2VydmljZXMxIzAhBgNVBAMTGlJITlMgQ2VydGlmaWNhdGUg
+QXV0aG9yaXR5MR4wHAYJKoZIhvcNAQkBFg9yaG5zQHJlZGhhdC5jb20wHhcNMDAw
+ODIzMjI0NTU1WhcNMDMwODI4MjI0NTU1WjCBxzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAgTDk5vcnRoIENhcm9saW5hMR8wHQYDVQQHExZSZXNlYXJjaCBUcmlhbmdsZSBQ
+YXJrMRYwFAYDVQQKEw1SZWQgSGF0LCBJbmMuMSEwHwYDVQQLExhSZWQgSGF0IE5l
+dHdvcmsgU2VydmljZXMxIzAhBgNVBAMTGlJITlMgQ2VydGlmaWNhdGUgQXV0aG9y
+aXR5MR4wHAYJKoZIhvcNAQkBFg9yaG5zQHJlZGhhdC5jb20wgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBAMBoKxIw4iEtIsZycVu/F6CTEOmb48mNOy2sxLuVO+DK
+VTLclcIQswSyUfvohWEWNKW0HWdcp3f08JLatIuvlZNi82YprsCIt2SEDkiQYPhg
+PgB/VN0XpqwY4ELefL6Qgff0BYUKCMzV8p/8JIt3pT3pSKnvDztjo/6mg0zo3At3
+AgMBAAGjggEoMIIBJDAdBgNVHQ4EFgQUVBXNnyz37A0f0qi+TAesiD77mwowgfQG
+A1UdIwSB7DCB6YAUVBXNnyz37A0f0qi+TAesiD77mwqhgc2kgcowgccxCzAJBgNV
+BAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEfMB0GA1UEBxMWUmVzZWFy
+Y2ggVHJpYW5nbGUgUGFyazEWMBQGA1UEChMNUmVkIEhhdCwgSW5jLjEhMB8GA1UE
+CxMYUmVkIEhhdCBOZXR3b3JrIFNlcnZpY2VzMSMwIQYDVQQDExpSSE5TIENlcnRp
+ZmljYXRlIEF1dGhvcml0eTEeMBwGCSqGSIb3DQEJARYPcmhuc0ByZWRoYXQuY29t
+ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAkwGIiGdnkYye0BIU
+kHESh1UK8lIbrfLTBx2vcJm7sM2AI8ntK3PpY7HQs4xgxUJkpsGVVpDFNQYDWPWO
+K9n5qaAQqZn3FUKSpVDXEQfxAtXgcORVbirOJfhdzQsvEGH49iBCzMOJ+IpPgiQS
+zzl/IagsjVKXUsX3X0KlhwlmsMw=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID7jCCA1egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsTELMAkGA1UEBhMCVVMx
+FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD
+VQQKEw1SZWQgSGF0LCBJbmMuMRgwFgYDVQQLEw9SZWQgSGF0IE5ldHdvcmsxIjAg
+BgNVBAMTGVJITiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEW
+EnJobi1ub2NAcmVkaGF0LmNvbTAeFw0wMjA5MDUyMDQ1MTZaFw0wNzA5MDkyMDQ1
+MTZaMIGxMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAO
+BgNVBAcTB1JhbGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsT
+D1JlZCBIYXQgTmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhv
+cml0eTEhMB8GCSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCzFrfF9blpUR/NtD1wz2BXhaQqp10oIg7sGeKS
+90iXpqYfUZWDEY+amKKQ4MtKJBmUqIpLiLQGbM531xU7PM1mg88jHQ28CgzLH8tA
++/PZ/iq0hSx7yaH+849oHfISsaQWGc4PuJqc2bxfSWKylZPOXS7deTzxW6a3orU5
+DY4SMQIDAQABo4IBEjCCAQ4wHQYDVR0OBBYEFH8bZKEuAsWofbjRsYsGnaOpUGOS
+MIHeBgNVHSMEgdYwgdOAFH8bZKEuAsWofbjRsYsGnaOpUGOSoYG3pIG0MIGxMQsw
+CQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcTB1Jh
+bGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsTD1JlZCBIYXQg
+TmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhvcml0eTEhMB8G
+CSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEEBQADgYEAKE1C5TQi3caGYwR1UmcXRXLyOyErRVlyc/dZNp1X
+Q8bclA8O/xNcT1A3hbLkwh81n3T051P7oQa4Oc7kCoZ7XyhdxxGeEqXWuWzpGAnV
+8ELnVLWRniOtEnqqcnw5PIP4daR7A5L/KtTFdhkS+rQ7sIkslYwBkA3YugYFYQCs
+ldo=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIID7jCCA1egAwIBAgIBADANBgkqhkiG9w0BAQQFADCBsTELMAkGA1UEBhMCVVMx
+FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD
+VQQKEw1SZWQgSGF0LCBJbmMuMRgwFgYDVQQLEw9SZWQgSGF0IE5ldHdvcmsxIjAg
+BgNVBAMTGVJITiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEW
+EnJobi1ub2NAcmVkaGF0LmNvbTAeFw0wMzA4MjkwMjEwNTVaFw0xMzA4MjYwMjEw
+NTVaMIGxMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAO
+BgNVBAcTB1JhbGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsT
+D1JlZCBIYXQgTmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhv
+cml0eTEhMB8GCSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQC/YWPrPYsrRUjmwvt80iEhuOyQk0EwfCyNedUU
+6Q5+P+/WCpsKpgJSAS0mlqTtvameqggDwWEKQYDqrnTMYSbQBZFVPmYUoiCz1p1x
+DKt3zPTwEbUlM4pOIpoQNmf6EW1Idjof0uNEe4lmvrSF+y+mqhP6mm3JuxjEBK9P
+FWmJmwIDAQABo4IBEjCCAQ4wHQYDVR0OBBYEFGlEJwXcLu2l9IHE13hF50Rd+IdH
+MIHeBgNVHSMEgdYwgdOAFGlEJwXcLu2l9IHE13hF50Rd+IdHoYG3pIG0MIGxMQsw
+CQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcTB1Jh
+bGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xGDAWBgNVBAsTD1JlZCBIYXQg
+TmV0d29yazEiMCAGA1UEAxMZUkhOIENlcnRpZmljYXRlIEF1dGhvcml0eTEhMB8G
+CSqGSIb3DQEJARYScmhuLW5vY0ByZWRoYXQuY29tggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEEBQADgYEAI8nKB59eljmD4E7a3UeEMMrU1TiG+d6Ig8osRyY2
+q/QUHigp3n0QSl6RPlqZBwypLuP7eERJxTLW6HqX/ynQM64munYGfnmXFwxPLSqL
+iqxBWa7pxFUtuYjfm3tB+DIu7snAWeIwV143RynALXgz086jK9yE2r87Lku2s7ZO
+noA=
+-----END CERTIFICATE-----
+
diff --git a/core/libraries/fof/download/adapter/curl.php b/core/libraries/fof/download/adapter/curl.php
new file mode 100644
index 00000000..70035bb6
--- /dev/null
+++ b/core/libraries/fof/download/adapter/curl.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  dispatcher
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A download adapter using the cURL PHP module
+ */
+class FOFDownloadAdapterCurl extends FOFDownloadAdapterAbstract implements FOFDownloadInterface
+{
+	protected $headers = array();
+
+	public function __construct()
+	{
+		$this->priority = 110;
+		$this->supportsFileSize = true;
+		$this->supportsChunkDownload = true;
+		$this->name = 'curl';
+		$this->isSupported = function_exists('curl_init') && function_exists('curl_exec') && function_exists('curl_close');
+	}
+
+	/**
+	 * Download a part (or the whole) of a remote URL and return the downloaded
+	 * data. You are supposed to check the size of the returned data. If it's
+	 * smaller than what you expected you've reached end of file. If it's empty
+	 * you have tried reading past EOF. If it's larger than what you expected
+	 * the server doesn't support chunk downloads.
+	 *
+	 * If this class' supportsChunkDownload returns false you should assume
+	 * that the $from and $to parameters will be ignored.
+	 *
+	 * @param   string   $url     The remote file's URL
+	 * @param   integer  $from    Byte range to start downloading from. Use null for start of file.
+	 * @param   integer  $to      Byte range to stop downloading. Use null to download the entire file ($from is ignored)
+	 * @param   array    $params  Additional params that will be added before performing the download
+	 *
+	 * @return  string  The raw file data retrieved from the remote URL.
+	 *
+	 * @throws  Exception  A generic exception is thrown on error
+	 */
+	public function downloadAndReturn($url, $from = null, $to = null, array $params = array())
+	{
+		$ch = curl_init();
+
+		if (empty($from))
+		{
+			$from = 0;
+		}
+
+		if (empty($to))
+		{
+			$to = 0;
+		}
+
+		if ($to < $from)
+		{
+			$temp = $to;
+			$to   = $from;
+			$from = $temp;
+
+			unset($temp);
+		}
+
+		// Default cURL options
+		$options = array(
+			CURLOPT_AUTOREFERER     => 1,
+			CURLOPT_SSL_VERIFYPEER  => 1,
+			CURLOPT_SSL_VERIFYHOST  => 2,
+			CURLOPT_SSLVERSION      => 0,
+			CURLOPT_AUTOREFERER     => 1,
+			CURLOPT_URL             => $url,
+			CURLOPT_BINARYTRANSFER  => 1,
+			CURLOPT_RETURNTRANSFER  => 1,
+			CURLOPT_FOLLOWLOCATION  => 1,
+			CURLOPT_CAINFO          => __DIR__ . '/cacert.pem',
+			CURLOPT_HEADERFUNCTION  => array($this, 'reponseHeaderCallback')
+		);
+
+		if (!(empty($from) && empty($to)))
+		{
+			$options[CURLOPT_RANGE] = "$from-$to";
+		}
+
+		// Add any additional options: Since they are numeric, we must use the array operator. If the jey exists in both
+		// arrays, only the first one will be used while the second one will be ignored
+		$options = $params + $options;
+
+		@curl_setopt_array($ch, $options);
+
+		$this->headers = array();
+
+		$result = curl_exec($ch);
+
+		$errno       = curl_errno($ch);
+		$errmsg      = curl_error($ch);
+		$http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+		if ($result === false)
+		{
+			$error = JText::sprintf('LIB_FOF_DOWNLOAD_ERR_CURL_ERROR', $errno, $errmsg);
+		}
+		elseif (($http_status >= 300) && ($http_status <= 399) && isset($this->headers['Location']) && !empty($this->headers['Location']))
+		{
+			return $this->downloadAndReturn($this->headers['Location'], $from, $to, $params);
+		}
+		elseif ($http_status > 399)
+		{
+			$result = false;
+			$errno = $http_status;
+			$error = JText::sprintf('LIB_FOF_DOWNLOAD_ERR_HTTPERROR', $http_status);
+		}
+
+		curl_close($ch);
+
+		if ($result === false)
+		{
+			throw new Exception($error, $errno);
+		}
+		else
+		{
+			return $result;
+		}
+	}
+
+	/**
+	 * Get the size of a remote file in bytes
+	 *
+	 * @param   string  $url  The remote file's URL
+	 *
+	 * @return  integer  The file size, or -1 if the remote server doesn't support this feature
+	 */
+	public function getFileSize($url)
+	{
+		$result = -1;
+
+		$ch = curl_init();
+
+		curl_setopt($ch, CURLOPT_AUTOREFERER, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
+		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+		curl_setopt($ch, CURLOPT_SSLVERSION, 0);
+
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_NOBODY, true );
+		curl_setopt($ch, CURLOPT_HEADER, true );
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true );
+		@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true );
+		@curl_setopt($ch, CURLOPT_CAINFO, __DIR__ . '/cacert.pem');
+
+		$data = curl_exec($ch);
+		curl_close($ch);
+
+		if ($data)
+		{
+			$content_length = "unknown";
+			$status = "unknown";
+			$redirection = null;
+
+			if (preg_match( "/^HTTP\/1\.[01] (\d\d\d)/", $data, $matches))
+			{
+				$status = (int)$matches[1];
+			}
+
+			if (preg_match( "/Content-Length: (\d+)/", $data, $matches))
+			{
+				$content_length = (int)$matches[1];
+			}
+
+			if (preg_match( "/Location: (.*)/", $data, $matches))
+			{
+				$redirection = (int)$matches[1];
+			}
+
+			if ($status == 200)
+			{
+				$result = $content_length;
+			}
+
+			if (($status > 300) && ($status <= 308))
+			{
+				if (!empty($redirection))
+				{
+					return $this->getFileSize($redirection);
+				}
+
+				return -1;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Handles the HTTP headers returned by cURL
+	 *
+	 * @param   resource  $ch    cURL resource handle (unused)
+	 * @param   string    $data  Each header line, as returned by the server
+	 *
+	 * @return  int  The length of the $data string
+	 */
+	protected function reponseHeaderCallback(&$ch, &$data)
+	{
+		$strlen = strlen($data);
+
+		if (($strlen) <= 2)
+		{
+			return $strlen;
+		}
+
+		if (substr($data, 0, 4) == 'HTTP')
+		{
+			return $strlen;
+		}
+
+		list($header, $value) = explode(': ', trim($data), 2);
+
+		$this->headers[$header] = $value;
+
+		return $strlen;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/download/adapter/fopen.php b/core/libraries/fof/download/adapter/fopen.php
new file mode 100644
index 00000000..aa9cb3df
--- /dev/null
+++ b/core/libraries/fof/download/adapter/fopen.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  dispatcher
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A download adapter using URL fopen() wrappers
+ */
+class FOFDownloadAdapterFopen extends FOFDownloadAdapterAbstract implements FOFDownloadInterface
+{
+	public function __construct()
+	{
+		$this->priority = 100;
+		$this->supportsFileSize = false;
+		$this->supportsChunkDownload = true;
+		$this->name = 'fopen';
+
+		// If we are not allowed to use ini_get, we assume that URL fopen is
+		// disabled.
+		if (!function_exists('ini_get'))
+		{
+			$this->isSupported = false;
+		}
+		else
+		{
+			$this->isSupported = ini_get('allow_url_fopen');
+		}
+	}
+
+	/**
+	 * Download a part (or the whole) of a remote URL and return the downloaded
+	 * data. You are supposed to check the size of the returned data. If it's
+	 * smaller than what you expected you've reached end of file. If it's empty
+	 * you have tried reading past EOF. If it's larger than what you expected
+	 * the server doesn't support chunk downloads.
+	 *
+	 * If this class' supportsChunkDownload returns false you should assume
+	 * that the $from and $to parameters will be ignored.
+	 *
+	 * @param   string   $url     The remote file's URL
+	 * @param   integer  $from    Byte range to start downloading from. Use null for start of file.
+	 * @param   integer  $to      Byte range to stop downloading. Use null to download the entire file ($from is ignored)
+	 * @param   array    $params  Additional params that will be added before performing the download
+	 *
+	 * @return  string  The raw file data retrieved from the remote URL.
+	 *
+	 * @throws  Exception  A generic exception is thrown on error
+	 */
+	public function downloadAndReturn($url, $from = null, $to = null, array $params = array())
+	{
+		if (empty($from))
+		{
+			$from = 0;
+		}
+
+		if (empty($to))
+		{
+			$to = 0;
+		}
+
+		if ($to < $from)
+		{
+			$temp = $to;
+			$to   = $from;
+			$from = $temp;
+
+			unset($temp);
+		}
+
+		if (!(empty($from) && empty($to)))
+		{
+			$options = array(
+				'http'	=> array(
+					'method'	=> 'GET',
+					'header'	=> "Range: bytes=$from-$to\r\n"
+				),
+				'ssl' => array(
+					'verify_peer'   => true,
+					'cafile'        => __DIR__ . '/cacert.pem',
+					'verify_depth'  => 5,
+				)
+			);
+
+			$options = array_merge($options, $params);
+
+			$context = stream_context_create($options);
+			$result  = @file_get_contents($url, false, $context, $from - $to + 1);
+		}
+		else
+		{
+			$options = array(
+				'http'	=> array(
+					'method'	=> 'GET',
+				),
+				'ssl' => array(
+					'verify_peer'   => true,
+					'cafile'        => __DIR__ . '/cacert.pem',
+					'verify_depth'  => 5,
+				)
+			);
+
+			$options = array_merge($options, $params);
+
+			$context = stream_context_create($options);
+			$result  = @file_get_contents($url, false, $context);
+		}
+
+		if ($result === false)
+		{
+			$error = JText::sprintf('LIB_FOF_DOWNLOAD_ERR_HTTPERROR');
+			throw new Exception($error, 1);
+		}
+		else
+		{
+			return $result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/download/download.php b/core/libraries/fof/download/download.php
new file mode 100644
index 00000000..3d346b95
--- /dev/null
+++ b/core/libraries/fof/download/download.php
@@ -0,0 +1,495 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  dispatcher
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+class FOFDownload
+{
+	/**
+	 * Parameters passed from the GUI when importing from URL
+	 *
+	 * @var  array
+	 */
+	private $params = array();
+
+	/**
+	 * The download adapter which will be used by this class
+	 *
+	 * @var  FOFDownloadInterface
+	 */
+	private $adapter = null;
+
+	/**
+	 * Additional params that will be passed to the adapter while performing the download
+	 *
+	 * @var  array
+	 */
+	private $adapterOptions = array();
+
+	/**
+	 * Creates a new download object and assigns it the most fitting download adapter
+	 */
+	public function __construct()
+	{
+		// Find the best fitting adapter
+		$allAdapters = self::getFiles(__DIR__ . '/adapter', array(), array('abstract.php'));
+		$priority    = 0;
+
+		foreach ($allAdapters as $adapterInfo)
+		{
+			if (!class_exists($adapterInfo['classname'], true))
+			{
+				continue;
+			}
+
+			/** @var FOFDownloadAdapterAbstract $adapter */
+			$adapter = new $adapterInfo['classname'];
+
+			if ( !$adapter->isSupported())
+			{
+				continue;
+			}
+
+			if ($adapter->priority > $priority)
+			{
+				$this->adapter = $adapter;
+				$priority      = $adapter->priority;
+			}
+		}
+
+		// Load the language strings
+		FOFPlatform::getInstance()->loadTranslations('lib_f0f');
+	}
+
+	/**
+	 * Forces the use of a specific adapter
+	 *
+	 * @param  string $className   The name of the class or the name of the adapter, e.g. 'FOFDownloadAdapterCurl' or
+	 *                             'curl'
+	 */
+	public function setAdapter($className)
+	{
+		$adapter = null;
+
+		if (class_exists($className, true))
+		{
+			$adapter = new $className;
+		}
+		elseif (class_exists('FOFDownloadAdapter' . ucfirst($className)))
+		{
+			$className = 'FOFDownloadAdapter' . ucfirst($className);
+			$adapter   = new $className;
+		}
+
+		if (is_object($adapter) && ($adapter instanceof FOFDownloadInterface))
+		{
+			$this->adapter = $adapter;
+		}
+	}
+
+	/**
+	 * Returns the name of the current adapter
+	 *
+	 * @return string
+	 */
+	public function getAdapterName()
+	{
+		if(is_object($this->adapter))
+		{
+			$class = get_class($this->adapter);
+
+			return strtolower(str_ireplace('FOFDownloadAdapter', '', $class));
+		}
+
+		return '';
+	}
+
+	/**
+	 * Sets the additional options for the adapter
+	 *
+	 * @param array $options
+	 */
+	public function setAdapterOptions(array $options)
+	{
+		$this->adapterOptions = $options;
+	}
+
+	/**
+	 * Returns the additional options for the adapter
+	 *
+	 * @return array
+	 */
+	public function getAdapterOptions()
+	{
+		return $this->adapterOptions;
+	}
+
+	/**
+	 * Used to decode the $params array
+	 *
+	 * @param   string $key     The parameter key you want to retrieve the value for
+	 * @param   mixed  $default The default value, if none is specified
+	 *
+	 * @return  mixed  The value for this parameter key
+	 */
+	private function getParam($key, $default = null)
+	{
+		if (array_key_exists($key, $this->params))
+		{
+			return $this->params[$key];
+		}
+		else
+		{
+			return $default;
+		}
+	}
+
+	/**
+	 * Download data from a URL and return it
+	 *
+	 * @param   string $url The URL to download from
+	 *
+	 * @return  bool|string  The downloaded data or false on failure
+	 */
+	public function getFromURL($url)
+	{
+		try
+		{
+			return $this->adapter->downloadAndReturn($url, null, null, $this->adapterOptions);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Performs the staggered download of file. The downloaded file will be stored in Joomla!'s temp-path using the
+	 * basename of the URL as a filename
+	 *
+	 * The $params array can have any of the following keys
+	 * url			The file being downloaded
+	 * frag			Rolling counter of the file fragment being downloaded
+	 * totalSize	The total size of the file being downloaded, in bytes
+	 * doneSize		How many bytes we have already downloaded
+	 * maxExecTime	Maximum execution time downloading file fragments, in seconds
+	 * length		How many bytes to download at once
+	 *
+	 * The array returned is in the following format:
+	 *
+	 * status		True if there are no errors, false if there are errors
+	 * error		A string with the error message if there are errors
+	 * frag			The next file fragment to download
+	 * totalSize	The total size of the downloaded file in bytes, if the server supports HEAD requests
+	 * doneSize		How many bytes have already been downloaded
+	 * percent		% of the file already downloaded (if totalSize could be determined)
+	 * localfile	The name of the local file, without the path
+	 *
+	 * @param   array $params A parameters array, as sent by the user interface
+	 *
+	 * @return  array  A return status array
+	 */
+	public function importFromURL($params)
+	{
+		$this->params = $params;
+
+		// Fetch data
+		$url         	= $this->getParam('url');
+		$localFilename	= $this->getParam('localFilename');
+		$frag        	= $this->getParam('frag', -1);
+		$totalSize   	= $this->getParam('totalSize', -1);
+		$doneSize    	= $this->getParam('doneSize', -1);
+		$maxExecTime 	= $this->getParam('maxExecTime', 5);
+		$runTimeBias 	= $this->getParam('runTimeBias', 75);
+		$length      	= $this->getParam('length', 1048576);
+
+		if (empty($localFilename))
+		{
+			$localFilename = basename($url);
+
+			if (strpos($localFilename, '?') !== false)
+			{
+				$paramsPos = strpos($localFilename, '?');
+				$localFilename = substr($localFilename, 0, $paramsPos - 1);
+			}
+		}
+
+		$tmpDir        = JFactory::getConfig()->get('tmp_path', JPATH_ROOT . '/tmp');
+		$tmpDir        = rtrim($tmpDir, '/\\');
+
+		// Init retArray
+		$retArray = array(
+			"status"    => true,
+			"error"     => '',
+			"frag"      => $frag,
+			"totalSize" => $totalSize,
+			"doneSize"  => $doneSize,
+			"percent"   => 0,
+			"localfile"	=> $localFilename
+		);
+
+		try
+		{
+			$timer = new FOFUtilsTimer($maxExecTime, $runTimeBias);
+			$start = $timer->getRunningTime(); // Mark the start of this download
+			$break = false; // Don't break the step
+
+			// Figure out where on Earth to put that file
+			$local_file = $tmpDir . '/' . $localFilename;
+
+			while (($timer->getTimeLeft() > 0) && !$break)
+			{
+				// Do we have to initialize the file?
+				if ($frag == -1)
+				{
+					// Currently downloaded size
+					$doneSize = 0;
+
+					if (@file_exists($local_file))
+					{
+						@unlink($local_file);
+					}
+
+					// Delete and touch the output file
+					$fp = @fopen($local_file, 'wb');
+
+					if ($fp !== false)
+					{
+						@fclose($fp);
+					}
+
+					// Init
+					$frag = 0;
+
+					//debugMsg("-- First frag, getting the file size");
+					$retArray['totalSize'] = $this->adapter->getFileSize($url);
+					$totalSize             = $retArray['totalSize'];
+				}
+
+				// Calculate from and length
+				$from = $frag * $length;
+				$to   = $length + $from - 1;
+
+				// Try to download the first frag
+				$required_time = 1.0;
+
+				try
+				{
+					$result = $this->adapter->downloadAndReturn($url, $from, $to, $this->adapterOptions);
+
+					if ($result === false)
+					{
+						throw new Exception(JText::sprintf('LIB_FOF_DOWNLOAD_ERR_COULDNOTDOWNLOADFROMURL', $url), 500);
+					}
+				}
+				catch (Exception $e)
+				{
+					$result = false;
+					$error  = $e->getMessage();
+				}
+
+				if ($result === false)
+				{
+					// Failed download
+					if ($frag == 0)
+					{
+						// Failure to download first frag = failure to download. Period.
+						$retArray['status'] = false;
+						$retArray['error']  = $error;
+
+						//debugMsg("-- Download FAILED");
+
+						return $retArray;
+					}
+					else
+					{
+						// Since this is a staggered download, consider this normal and finish
+						$frag = -1;
+						//debugMsg("-- Import complete");
+						$totalSize = $doneSize;
+						$break     = true;
+					}
+				}
+
+				// Add the currently downloaded frag to the total size of downloaded files
+				if ($result)
+				{
+					$filesize = strlen($result);
+					//debugMsg("-- Successful download of $filesize bytes");
+					$doneSize += $filesize;
+
+					// Append the file
+					$fp = @fopen($local_file, 'ab');
+
+					if ($fp === false)
+					{
+						//debugMsg("-- Can't open local file $local_file for writing");
+						// Can't open the file for writing
+						$retArray['status'] = false;
+						$retArray['error']  = JText::sprintf('LIB_FOF_DOWNLOAD_ERR_COULDNOTWRITELOCALFILE', $local_file);
+
+						return $retArray;
+					}
+
+					fwrite($fp, $result);
+					fclose($fp);
+
+					//debugMsg("-- Appended data to local file $local_file");
+
+					$frag++;
+
+					//debugMsg("-- Proceeding to next fragment, frag $frag");
+
+					if (($filesize < $length) || ($filesize > $length))
+					{
+						// A partial download or a download larger than the frag size means we are done
+						$frag = -1;
+						//debugMsg("-- Import complete (partial download of last frag)");
+						$totalSize = $doneSize;
+						$break     = true;
+					}
+				}
+
+				// Advance the frag pointer and mark the end
+				$end = $timer->getRunningTime();
+
+				// Do we predict that we have enough time?
+				$required_time = max(1.1 * ($end - $start), $required_time);
+
+				if ($required_time > (10 - $end + $start))
+				{
+					$break = true;
+				}
+
+				$start = $end;
+			}
+
+			if ($frag == -1)
+			{
+				$percent = 100;
+			}
+			elseif ($doneSize <= 0)
+			{
+				$percent = 0;
+			}
+			else
+			{
+				if ($totalSize > 0)
+				{
+					$percent = 100 * ($doneSize / $totalSize);
+				}
+				else
+				{
+					$percent = 0;
+				}
+			}
+
+			// Update $retArray
+			$retArray = array(
+				"status"    => true,
+				"error"     => '',
+				"frag"      => $frag,
+				"totalSize" => $totalSize,
+				"doneSize"  => $doneSize,
+				"percent"   => $percent,
+			);
+		}
+		catch (Exception $e)
+		{
+			//debugMsg("EXCEPTION RAISED:");
+			//debugMsg($e->getMessage());
+			$retArray['status'] = false;
+			$retArray['error']  = $e->getMessage();
+		}
+
+		return $retArray;
+	}
+
+	/**
+	 * This method will crawl a starting directory and get all the valid files
+	 * that will be analyzed by __construct. Then it organizes them into an
+	 * associative array.
+	 *
+	 * @param   string $path          Folder where we should start looking
+	 * @param   array  $ignoreFolders Folder ignore list
+	 * @param   array  $ignoreFiles   File ignore list
+	 *
+	 * @return  array   Associative array, where the `fullpath` key contains the path to the file,
+	 *                  and the `classname` key contains the name of the class
+	 */
+	protected static function getFiles($path, array $ignoreFolders = array(), array $ignoreFiles = array())
+	{
+		$return = array();
+
+		$files = self::scanDirectory($path, $ignoreFolders, $ignoreFiles);
+
+		// Ok, I got the files, now I have to organize them
+		foreach ($files as $file)
+		{
+			$clean = str_replace($path, '', $file);
+			$clean = trim(str_replace('\\', '/', $clean), '/');
+
+			$parts = explode('/', $clean);
+
+			$return[] = array(
+				'fullpath'  => $file,
+				'classname' => 'FOFDownloadAdapter' . ucfirst(basename($parts[0], '.php'))
+			);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Recursive function that will scan every directory unless it's in the
+	 * ignore list. Files that aren't in the ignore list are returned.
+	 *
+	 * @param   string $path          Folder where we should start looking
+	 * @param   array  $ignoreFolders Folder ignore list
+	 * @param   array  $ignoreFiles   File ignore list
+	 *
+	 * @return  array   List of all the files
+	 */
+	protected static function scanDirectory($path, array $ignoreFolders = array(), array $ignoreFiles = array())
+	{
+		$return = array();
+
+		$handle = @opendir($path);
+
+		if ( !$handle)
+		{
+			return $return;
+		}
+
+		while (($file = readdir($handle)) !== false)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			$fullpath = $path . '/' . $file;
+
+			if ((is_dir($fullpath) && in_array($file, $ignoreFolders)) || (is_file($fullpath) && in_array($file, $ignoreFiles)))
+			{
+				continue;
+			}
+
+			if (is_dir($fullpath))
+			{
+				$return = array_merge(self::scanDirectory($fullpath, $ignoreFolders, $ignoreFiles), $return);
+			}
+			else
+			{
+				$return[] = $path . '/' . $file;
+			}
+		}
+
+		return $return;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/download/interface.php b/core/libraries/fof/download/interface.php
new file mode 100644
index 00000000..b5089fa5
--- /dev/null
+++ b/core/libraries/fof/download/interface.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  dispatcher
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+interface FOFDownloadInterface
+{
+	/**
+	 * Does this download adapter support downloading files in chunks?
+	 *
+	 * @return  boolean  True if chunk download is supported
+	 */
+	public function supportsChunkDownload();
+
+	/**
+	 * Does this download adapter support reading the size of a remote file?
+	 *
+	 * @return  boolean  True if remote file size determination is supported
+	 */
+	public function supportsFileSize();
+
+	/**
+	 * Is this download class supported in the current server environment?
+	 *
+	 * @return  boolean  True if this server environment supports this download class
+	 */
+	public function isSupported();
+
+	/**
+	 * Get the priority of this adapter. If multiple download adapters are
+	 * supported on a site, the one with the highest priority will be
+	 * used.
+	 *
+	 * @return  boolean
+	 */
+	public function getPriority();
+
+	/**
+	 * Returns the name of this download adapter in use
+	 *
+	 * @return  string
+	 */
+	public function getName();
+
+	/**
+	 * Download a part (or the whole) of a remote URL and return the downloaded
+	 * data. You are supposed to check the size of the returned data. If it's
+	 * smaller than what you expected you've reached end of file. If it's empty
+	 * you have tried reading past EOF. If it's larger than what you expected
+	 * the server doesn't support chunk downloads.
+	 *
+	 * If this class' supportsChunkDownload returns false you should assume
+	 * that the $from and $to parameters will be ignored.
+	 *
+	 * @param   string   $url     The remote file's URL
+	 * @param   integer  $from    Byte range to start downloading from. Use null for start of file.
+	 * @param   integer  $to      Byte range to stop downloading. Use null to download the entire file ($from is ignored)
+	 * @param   array    $params  Additional params that will be added before performing the download
+	 *
+	 * @return  string  The raw file data retrieved from the remote URL.
+	 *
+	 * @throws  Exception  A generic exception is thrown on error
+	 */
+	public function downloadAndReturn($url, $from = null, $to = null, array $params = array());
+
+	/**
+	 * Get the size of a remote file in bytes
+	 *
+	 * @param   string  $url  The remote file's URL
+	 *
+	 * @return  integer  The file size, or -1 if the remote server doesn't support this feature
+	 */
+	public function getFileSize($url);
+}
\ No newline at end of file
diff --git a/core/libraries/fof/encrypt/aes.php b/core/libraries/fof/encrypt/aes.php
new file mode 100644
index 00000000..25c5c06b
--- /dev/null
+++ b/core/libraries/fof/encrypt/aes.php
@@ -0,0 +1,285 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage encrypt
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A simple implementation of AES-128, AES-192 and AES-256 encryption using the
+ * high performance mcrypt library.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFEncryptAes
+{
+	/**
+	 * The cipher key.
+	 *
+	 * @var   string
+	 */
+	protected $key = '';
+
+	/**
+	 * The AES encryption adapter in use.
+	 *
+	 * @var  FOFEncryptAesInterface
+	 */
+	protected $adapter;
+	
+	/**
+	 * Initialise the AES encryption object.
+	 *
+	 * Note: If the key is not 16 bytes this class will do a stupid key expansion for legacy reasons (produce the
+	 * SHA-256 of the key string and throw away half of it).
+	 *
+	 * @param   string          $key      The encryption key (password). It can be a raw key (16 bytes) or a passphrase.
+	 * @param   int             $strength Bit strength (128, 192 or 256) – ALWAYS USE 128 BITS. THIS PARAMETER IS DEPRECATED.
+	 * @param   string          $mode     Encryption mode. Can be ebc or cbc. We recommend using cbc.
+	 * @param   FOFUtilsPhpfunc $phpfunc  For testing
+	 * @param   string          $priority Priority which adapter we should try first
+	 */
+	public function __construct($key, $strength = 128, $mode = 'cbc', FOFUtilsPhpfunc $phpfunc = null, $priority = 'openssl')
+	{
+		if ($priority == 'openssl')
+		{
+			$this->adapter = new FOFEncryptAesOpenssl();
+			
+			if (!$this->adapter->isSupported($phpfunc))
+			{
+				$this->adapter = new FOFEncryptAesMcrypt();
+			}
+		}
+		else
+		{
+			$this->adapter = new FOFEncryptAesMcrypt();
+			
+			if (!$this->adapter->isSupported($phpfunc))
+			{
+				$this->adapter = new FOFEncryptAesOpenssl();
+			}
+		}
+
+		$this->adapter->setEncryptionMode($mode, $strength);
+		$this->setPassword($key, true);
+	}
+
+	/**
+	 * Sets the password for this instance.
+	 *
+	 * WARNING: Do not use the legacy mode, it's insecure
+	 *
+	 * @param   string $password   The password (either user-provided password or binary encryption key) to use
+	 * @param   bool   $legacyMode True to use the legacy key expansion. We recommend against using it.
+	 */
+	public function setPassword($password, $legacyMode = false)
+	{
+		$this->key = $password;
+
+		$passLength = strlen($password);
+
+		if (function_exists('mb_strlen'))
+		{
+			$passLength = mb_strlen($password, 'ASCII');
+		}
+
+		// Legacy mode was doing something stupid, requiring a key of 32 bytes. DO NOT USE LEGACY MODE!
+		if ($legacyMode && ($passLength != 32))
+		{
+			// Legacy mode: use the sha256 of the password
+			$this->key = hash('sha256', $password, true);
+			// We have to trim or zero pad the password (we end up throwing half of it away in Rijndael-128 / AES...)
+			$this->key = $this->adapter->resizeKey($this->key, $this->adapter->getBlockSize());
+		}
+	}
+
+	/**
+	 * Encrypts a string using AES
+	 *
+	 * @param   string $stringToEncrypt The plaintext to encrypt
+	 * @param   bool   $base64encoded   Should I Base64-encode the result?
+	 *
+	 * @return   string  The cryptotext. Please note that the first 16 bytes of
+	 *                   the raw string is the IV (initialisation vector) which
+	 *                   is necessary for decoding the string.
+	 */
+	public function encryptString($stringToEncrypt, $base64encoded = true)
+	{
+		$blockSize = $this->adapter->getBlockSize();
+		$randVal   = new FOFEncryptRandval();
+		$iv        = $randVal->generate($blockSize);
+
+		$key        = $this->getExpandedKey($blockSize, $iv);
+		$cipherText = $this->adapter->encrypt($stringToEncrypt, $key, $iv);
+
+		// Optionally pass the result through Base64 encoding
+		if ($base64encoded)
+		{
+			$cipherText = base64_encode($cipherText);
+		}
+
+		// Return the result
+		return $cipherText;
+	}
+
+	/**
+	 * Decrypts a ciphertext into a plaintext string using AES
+	 *
+	 * @param   string $stringToDecrypt The ciphertext to decrypt. The first 16 bytes of the raw string must contain
+	 *                                  the IV (initialisation vector).
+	 * @param   bool   $base64encoded   Should I Base64-decode the data before decryption?
+	 *
+	 * @return   string  The plain text string
+	 */
+	public function decryptString($stringToDecrypt, $base64encoded = true)
+	{
+		if ($base64encoded)
+		{
+			$stringToDecrypt = base64_decode($stringToDecrypt);
+		}
+
+		// Extract IV
+		$iv_size = $this->adapter->getBlockSize();
+		$iv      = substr($stringToDecrypt, 0, $iv_size);
+		$key     = $this->getExpandedKey($iv_size, $iv);
+
+		// Decrypt the data
+		$plainText = $this->adapter->decrypt($stringToDecrypt, $key);
+
+		return $plainText;
+	}
+
+	/**
+	 * Is AES encryption supported by this PHP installation?
+	 *
+	 * @param   FOFUtilsPhpfunc  $phpfunc
+	 *
+	 * @return boolean
+	 */
+	public static function isSupported(FOFUtilsPhpfunc $phpfunc = null)
+	{
+		if (!is_object($phpfunc) || !($phpfunc instanceof $phpfunc))
+		{
+			$phpfunc = new FOFUtilsPhpfunc();
+		}
+
+		$adapter = new FOFEncryptAesMcrypt();
+
+		if (!$adapter->isSupported($phpfunc))
+		{
+			$adapter = new FOFEncryptAesOpenssl();
+		}
+
+		if (!$adapter->isSupported($phpfunc))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('base64_encode'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('base64_decode'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('hash_algos'))
+		{
+			return false;
+		}
+
+		$algorightms = $phpfunc->hash_algos();
+
+		if (!in_array('sha256', $algorightms))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $blockSize
+	 * @param $iv
+	 *
+	 * @return string
+	 */
+	public function getExpandedKey($blockSize, $iv)
+	{
+		$key        = $this->key;
+		$passLength = strlen($key);
+
+		if (function_exists('mb_strlen'))
+		{
+			$passLength = mb_strlen($key, 'ASCII');
+		}
+
+		if ($passLength != $blockSize)
+		{
+			$iterations = 1000;
+			$salt       = $this->adapter->resizeKey($iv, 16);
+			$key        = hash_pbkdf2('sha256', $this->key, $salt, $iterations, $blockSize, true);
+		}
+
+		return $key;
+	}
+}
+
+if (!function_exists('hash_pbkdf2'))
+{
+	function hash_pbkdf2($algo, $password, $salt, $count, $length = 0, $raw_output = false)
+	{
+		if (!in_array(strtolower($algo), hash_algos()))
+		{
+			trigger_error(__FUNCTION__ . '(): Unknown hashing algorithm: ' . $algo, E_USER_WARNING);
+		}
+
+		if (!is_numeric($count))
+		{
+			trigger_error(__FUNCTION__ . '(): expects parameter 4 to be long, ' . gettype($count) . ' given', E_USER_WARNING);
+		}
+
+		if (!is_numeric($length))
+		{
+			trigger_error(__FUNCTION__ . '(): expects parameter 5 to be long, ' . gettype($length) . ' given', E_USER_WARNING);
+		}
+
+		if ($count <= 0)
+		{
+			trigger_error(__FUNCTION__ . '(): Iterations must be a positive integer: ' . $count, E_USER_WARNING);
+		}
+
+		if ($length < 0)
+		{
+			trigger_error(__FUNCTION__ . '(): Length must be greater than or equal to 0: ' . $length, E_USER_WARNING);
+		}
+
+		$output      = '';
+		$block_count = $length ? ceil($length / strlen(hash($algo, '', $raw_output))) : 1;
+
+		for ($i = 1; $i <= $block_count; $i++)
+		{
+			$last = $xorsum = hash_hmac($algo, $salt . pack('N', $i), $password, true);
+
+			for ($j = 1; $j < $count; $j++)
+			{
+				$xorsum ^= ($last = hash_hmac($algo, $last, $password, true));
+			}
+
+			$output .= $xorsum;
+		}
+
+		if (!$raw_output)
+		{
+			$output = bin2hex($output);
+		}
+
+		return $length ? substr($output, 0, $length) : $output;
+	}
+}
diff --git a/core/libraries/fof/encrypt/aes/abstract.php b/core/libraries/fof/encrypt/aes/abstract.php
new file mode 100644
index 00000000..981f653b
--- /dev/null
+++ b/core/libraries/fof/encrypt/aes/abstract.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Abstract AES encryption class
+ */
+abstract class FOFEncryptAesAbstract
+{
+	/**
+	 * Trims or zero-pads a key / IV
+	 *
+	 * @param   string $key  The key or IV to treat
+	 * @param   int    $size The block size of the currently used algorithm
+	 *
+	 * @return  null|string  Null if $key is null, treated string of $size byte length otherwise
+	 */
+	public function resizeKey($key, $size)
+	{
+		if (empty($key))
+		{
+			return null;
+		}
+
+		$keyLength = strlen($key);
+
+		if (function_exists('mb_strlen'))
+		{
+			$keyLength = mb_strlen($key, 'ASCII');
+		}
+
+		if ($keyLength == $size)
+		{
+			return $key;
+		}
+
+		if ($keyLength > $size)
+		{
+			if (function_exists('mb_substr'))
+			{
+				return mb_substr($key, 0, $size, 'ASCII');
+			}
+
+			return substr($key, 0, $size);
+		}
+
+		return $key . str_repeat("\0", ($size - $keyLength));
+	}
+
+	/**
+	 * Returns null bytes to append to the string so that it's zero padded to the specified block size
+	 *
+	 * @param   string $string    The binary string which will be zero padded
+	 * @param   int    $blockSize The block size
+	 *
+	 * @return  string  The zero bytes to append to the string to zero pad it to $blockSize
+	 */
+	protected function getZeroPadding($string, $blockSize)
+	{
+		$stringSize = strlen($string);
+
+		if (function_exists('mb_strlen'))
+		{
+			$stringSize = mb_strlen($string, 'ASCII');
+		}
+
+		if ($stringSize == $blockSize)
+		{
+			return '';
+		}
+
+		if ($stringSize < $blockSize)
+		{
+			return str_repeat("\0", $blockSize - $stringSize);
+		}
+
+		$paddingBytes = $stringSize % $blockSize;
+
+		return str_repeat("\0", $blockSize - $paddingBytes);
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/encrypt/aes/interface.php b/core/libraries/fof/encrypt/aes/interface.php
new file mode 100644
index 00000000..e8edaebe
--- /dev/null
+++ b/core/libraries/fof/encrypt/aes/interface.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Interface for AES encryption adapters
+ */
+interface FOFEncryptAesInterface
+{
+	/**
+	 * Sets the AES encryption mode.
+	 *
+	 * WARNING: The strength is deprecated as it has a different effect in MCrypt and OpenSSL. MCrypt was abandoned in
+	 * 2003 before the Rijndael-128 algorithm was officially the Advanced Encryption Standard (AES). MCrypt also offered
+	 * Rijndael-192 and Rijndael-256 algorithms with different block sizes. These are NOT used in AES. OpenSSL, however,
+	 * implements AES correctly. It always uses a 128-bit (16 byte) block. The 192 and 256 bit strengths refer to the
+	 * key size, not the block size. Therefore using different strengths in MCrypt and OpenSSL will result in different
+	 * and incompatible ciphertexts.
+	 *
+	 * TL;DR: Always use $strength = 128!
+	 *
+	 * @param   string  $mode      Choose between CBC (recommended) or ECB
+	 * @param   int     $strength  Bit strength of the key (128, 192 or 256 bits). DEPRECATED. READ NOTES ABOVE.
+	 *
+	 * @return  mixed
+	 */
+	public function setEncryptionMode($mode = 'cbc', $strength = 128);
+
+	/**
+	 * Encrypts a string. Returns the raw binary ciphertext.
+	 *
+	 * WARNING: The plaintext is zero-padded to the algorithm's block size. You are advised to store the size of the
+	 * plaintext and trim the string to that length upon decryption.
+	 *
+	 * @param   string       $plainText  The plaintext to encrypt
+	 * @param   string       $key        The raw binary key (will be zero-padded or chopped if its size is different than the block size)
+	 * @param   null|string  $iv         The initialization vector (for CBC mode algorithms)
+	 *
+	 * @return  string  The raw encrypted binary string.
+	 */
+	public function encrypt($plainText, $key, $iv = null);
+
+	/**
+	 * Decrypts a string. Returns the raw binary plaintext.
+	 *
+	 * $ciphertext MUST start with the IV followed by the ciphertext, even for EBC data (the first block of data is
+	 * dropped in EBC mode since there is no concept of IV in EBC).
+	 *
+	 * WARNING: The returned plaintext is zero-padded to the algorithm's block size during encryption. You are advised
+	 * to trim the string to the original plaintext's length upon decryption. While rtrim($decrypted, "\0") sounds
+	 * appealing it's NOT the correct approach for binary data (zero bytes may actually be part of your plaintext, not
+	 * just padding!).
+	 *
+	 * @param   string  $cipherText  The ciphertext to encrypt
+	 * @param   string  $key         The raw binary key (will be zero-padded or chopped if its size is different than the block size)
+	 *
+	 * @return  string  The raw unencrypted binary string.
+	 */
+	public function decrypt($cipherText, $key);
+
+	/**
+	 * Returns the encryption block size in bytes
+	 *
+	 * @return  int
+	 */
+	public function getBlockSize();
+
+	/**
+	 * Is this adapter supported?
+	 *
+	 * @param   FOFUtilsPhpfunc  $phpfunc
+	 *
+	 * @return  bool
+	 */
+	public function isSupported(FOFUtilsPhpfunc $phpfunc = null);
+}
\ No newline at end of file
diff --git a/core/libraries/fof/encrypt/aes/mcrypt.php b/core/libraries/fof/encrypt/aes/mcrypt.php
new file mode 100644
index 00000000..fffcb337
--- /dev/null
+++ b/core/libraries/fof/encrypt/aes/mcrypt.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+class FOFEncryptAesMcrypt extends FOFEncryptAesAbstract implements FOFEncryptAesInterface
+{
+	protected $cipherType = MCRYPT_RIJNDAEL_128;
+
+	protected $cipherMode = MCRYPT_MODE_CBC;
+
+	public function setEncryptionMode($mode = 'cbc', $strength = 128)
+	{
+		switch ((int) $strength)
+		{
+			default:
+			case '128':
+				$this->cipherType = MCRYPT_RIJNDAEL_128;
+				break;
+
+			case '192':
+				$this->cipherType = MCRYPT_RIJNDAEL_192;
+				break;
+
+			case '256':
+				$this->cipherType = MCRYPT_RIJNDAEL_256;
+				break;
+		}
+
+		switch (strtolower($mode))
+		{
+			case 'ecb':
+				$this->cipherMode = MCRYPT_MODE_ECB;
+				break;
+
+			default:
+			case 'cbc':
+				$this->cipherMode = MCRYPT_MODE_CBC;
+				break;
+		}
+
+	}
+
+	public function encrypt($plainText, $key, $iv = null)
+	{
+		$iv_size = $this->getBlockSize();
+		$key     = $this->resizeKey($key, $iv_size);
+		$iv      = $this->resizeKey($iv, $iv_size);
+
+		if (empty($iv))
+		{
+			$randVal   = new FOFEncryptRandval();
+			$iv        = $randVal->generate($iv_size);
+		}
+
+		$cipherText = mcrypt_encrypt($this->cipherType, $key, $plainText, $this->cipherMode, $iv);
+		$cipherText = $iv . $cipherText;
+
+		return $cipherText;
+	}
+
+	public function decrypt($cipherText, $key)
+	{
+		$iv_size    = $this->getBlockSize();
+		$key        = $this->resizeKey($key, $iv_size);
+		$iv         = substr($cipherText, 0, $iv_size);
+		$cipherText = substr($cipherText, $iv_size);
+		$plainText  = mcrypt_decrypt($this->cipherType, $key, $cipherText, $this->cipherMode, $iv);
+
+		return $plainText;
+	}
+
+	public function isSupported(FOFUtilsPhpfunc $phpfunc = null)
+	{
+		if (!is_object($phpfunc) || !($phpfunc instanceof $phpfunc))
+		{
+			$phpfunc = new FOFUtilsPhpfunc();
+		}
+
+		if (!$phpfunc->function_exists('mcrypt_get_key_size'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('mcrypt_get_iv_size'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('mcrypt_create_iv'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('mcrypt_encrypt'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('mcrypt_decrypt'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('mcrypt_list_algorithms'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('hash'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('hash_algos'))
+		{
+			return false;
+		}
+
+		$algorightms = $phpfunc->mcrypt_list_algorithms();
+
+		if (!in_array('rijndael-128', $algorightms))
+		{
+			return false;
+		}
+
+		if (!in_array('rijndael-192', $algorightms))
+		{
+			return false;
+		}
+
+		if (!in_array('rijndael-256', $algorightms))
+		{
+			return false;
+		}
+
+		$algorightms = $phpfunc->hash_algos();
+
+		if (!in_array('sha256', $algorightms))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	public function getBlockSize()
+	{
+		return mcrypt_get_iv_size($this->cipherType, $this->cipherMode);
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/encrypt/aes/openssl.php b/core/libraries/fof/encrypt/aes/openssl.php
new file mode 100644
index 00000000..094b1e50
--- /dev/null
+++ b/core/libraries/fof/encrypt/aes/openssl.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+class FOFEncryptAesOpenssl extends FOFEncryptAesAbstract implements FOFEncryptAesInterface
+{
+	/**
+	 * The OpenSSL options for encryption / decryption
+	 *
+	 * @var  int
+	 */
+	protected $openSSLOptions = 0;
+
+	/**
+	 * The encryption method to use
+	 *
+	 * @var  string
+	 */
+	protected $method = 'aes-128-cbc';
+
+	public function __construct()
+	{
+		$this->openSSLOptions = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
+	}
+
+	public function setEncryptionMode($mode = 'cbc', $strength = 128)
+	{
+		static $availableAlgorithms = null;
+		static $defaultAlgo = 'aes-128-cbc';
+
+		if (!is_array($availableAlgorithms))
+		{
+			$availableAlgorithms = openssl_get_cipher_methods();
+
+			foreach (array('aes-256-cbc', 'aes-256-ecb', 'aes-192-cbc',
+				         'aes-192-ecb', 'aes-128-cbc', 'aes-128-ecb') as $algo)
+			{
+				if (in_array($algo, $availableAlgorithms))
+				{
+					$defaultAlgo = $algo;
+					break;
+				}
+			}
+		}
+
+		$strength = (int) $strength;
+		$mode     = strtolower($mode);
+
+		if (!in_array($strength, array(128, 192, 256)))
+		{
+			$strength = 256;
+		}
+
+		if (!in_array($mode, array('cbc', 'ebc')))
+		{
+			$mode = 'cbc';
+		}
+
+		$algo = 'aes-' . $strength . '-' . $mode;
+
+		if (!in_array($algo, $availableAlgorithms))
+		{
+			$algo = $defaultAlgo;
+		}
+
+		$this->method = $algo;
+	}
+
+	public function encrypt($plainText, $key, $iv = null)
+	{
+		$iv_size = $this->getBlockSize();
+		$key     = $this->resizeKey($key, $iv_size);
+		$iv      = $this->resizeKey($iv, $iv_size);
+
+		if (empty($iv))
+		{
+			$randVal   = new FOFEncryptRandval();
+			$iv        = $randVal->generate($iv_size);
+		}
+
+		$plainText .= $this->getZeroPadding($plainText, $iv_size);
+		$cipherText = openssl_encrypt($plainText, $this->method, $key, $this->openSSLOptions, $iv);
+		$cipherText = $iv . $cipherText;
+
+		return $cipherText;
+	}
+
+	public function decrypt($cipherText, $key)
+	{
+		$iv_size    = $this->getBlockSize();
+		$key        = $this->resizeKey($key, $iv_size);
+		$iv         = substr($cipherText, 0, $iv_size);
+		$cipherText = substr($cipherText, $iv_size);
+		$plainText  = openssl_decrypt($cipherText, $this->method, $key, $this->openSSLOptions, $iv);
+
+		return $plainText;
+	}
+
+	public function isSupported(FOFUtilsPhpfunc $phpfunc = null)
+	{
+		if (!is_object($phpfunc) || !($phpfunc instanceof $phpfunc))
+		{
+			$phpfunc = new FOFUtilsPhpfunc();
+		}
+
+		if (!$phpfunc->function_exists('openssl_get_cipher_methods'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('openssl_random_pseudo_bytes'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('openssl_cipher_iv_length'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('openssl_encrypt'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('openssl_decrypt'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('hash'))
+		{
+			return false;
+		}
+
+		if (!$phpfunc->function_exists('hash_algos'))
+		{
+			return false;
+		}
+
+		$algorightms = $phpfunc->openssl_get_cipher_methods();
+
+		if (!in_array('aes-128-cbc', $algorightms))
+		{
+			return false;
+		}
+
+		$algorightms = $phpfunc->hash_algos();
+
+		if (!in_array('sha256', $algorightms))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getBlockSize()
+	{
+		return openssl_cipher_iv_length($this->method);
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/encrypt/base32.php b/core/libraries/fof/encrypt/base32.php
new file mode 100644
index 00000000..768e064d
--- /dev/null
+++ b/core/libraries/fof/encrypt/base32.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage encrypt
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FOFEncryptBase32
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFEncryptBase32
+{
+	/**
+	 * CSRFC3548
+	 *
+	 * The character set as defined by RFC3548
+	 * @link http://www.ietf.org/rfc/rfc3548.txt
+	 */
+	const CSRFC3548 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+
+	/**
+	 * str2bin
+	 *
+	 * Converts any ascii string to a binary string
+	 *
+	 * @param   string  $str  The string you want to convert
+	 *
+	 * @return  string  String of 0's and 1's
+	 */
+	private function str2bin($str)
+	{
+		$chrs = unpack('C*', $str);
+
+		return vsprintf(str_repeat('%08b', count($chrs)), $chrs);
+	}
+
+	/**
+	 * bin2str
+	 *
+	 * Converts a binary string to an ascii string
+	 *
+	 * @param   string  $str  The string of 0's and 1's you want to convert
+	 *
+	 * @return  string  The ascii output
+	 *
+	 * @throws Exception
+	 */
+	private function bin2str($str)
+	{
+		if (strlen($str) % 8 > 0)
+		{
+			throw new Exception('Length must be divisible by 8');
+		}
+
+		if (!preg_match('/^[01]+$/', $str))
+		{
+			throw new Exception('Only 0\'s and 1\'s are permitted');
+		}
+
+		preg_match_all('/.{8}/', $str, $chrs);
+		$chrs = array_map('bindec', $chrs[0]);
+
+		// I'm just being slack here
+		array_unshift($chrs, 'C*');
+
+		return call_user_func_array('pack', $chrs);
+	}
+
+	/**
+	 * fromBin
+	 *
+	 * Converts a correct binary string to base32
+	 *
+	 * @param   string  $str  The string of 0's and 1's you want to convert
+	 *
+	 * @return  string  String encoded as base32
+	 *
+	 * @throws exception
+	 */
+	private function fromBin($str)
+	{
+		if (strlen($str) % 8 > 0)
+		{
+			throw new Exception('Length must be divisible by 8');
+		}
+
+		if (!preg_match('/^[01]+$/', $str))
+		{
+			throw new Exception('Only 0\'s and 1\'s are permitted');
+		}
+
+		// Base32 works on the first 5 bits of a byte, so we insert blanks to pad it out
+		$str = preg_replace('/(.{5})/', '000$1', $str);
+
+		// We need a string divisible by 5
+		$length = strlen($str);
+		$rbits = $length & 7;
+
+		if ($rbits > 0)
+		{
+			// Excessive bits need to be padded
+			$ebits = substr($str, $length - $rbits);
+			$str = substr($str, 0, $length - $rbits);
+			$str .= "000$ebits" . str_repeat('0', 5 - strlen($ebits));
+		}
+
+		preg_match_all('/.{8}/', $str, $chrs);
+		$chrs = array_map(array($this, '_mapcharset'), $chrs[0]);
+
+		return join('', $chrs);
+	}
+
+	/**
+	 * toBin
+	 *
+	 * Accepts a base32 string and returns an ascii binary string
+	 *
+	 * @param   string  $str  The base32 string to convert
+	 *
+	 * @return  string  Ascii binary string
+	 *
+	 * @throws  Exception
+	 */
+	private function toBin($str)
+	{
+		if (!preg_match('/^[' . self::CSRFC3548 . ']+$/', $str))
+		{
+			throw new Exception('Must match character set');
+		}
+
+		// Convert the base32 string back to a binary string
+		$str = join('', array_map(array($this, '_mapbin'), str_split($str)));
+
+		// Remove the extra 0's we added
+		$str = preg_replace('/000(.{5})/', '$1', $str);
+
+		// Unpad if nessicary
+		$length = strlen($str);
+		$rbits = $length & 7;
+
+		if ($rbits > 0)
+		{
+			$str = substr($str, 0, $length - $rbits);
+		}
+
+		return $str;
+	}
+
+	/**
+	 * fromString
+	 *
+	 * Convert any string to a base32 string
+	 * This should be binary safe...
+	 *
+	 * @param   string  $str  The string to convert
+	 *
+	 * @return  string  The converted base32 string
+	 */
+	public function encode($str)
+	{
+		return $this->fromBin($this->str2bin($str));
+	}
+
+	/**
+	 * toString
+	 *
+	 * Convert any base32 string to a normal sctring
+	 * This should be binary safe...
+	 *
+	 * @param   string  $str  The base32 string to convert
+	 *
+	 * @return  string  The normal string
+	 */
+	public function decode($str)
+	{
+		$str = strtoupper($str);
+
+		return $this->bin2str($this->tobin($str));
+	}
+
+	/**
+	 * _mapcharset
+	 *
+	 * Used with array_map to map the bits from a binary string
+	 * directly into a base32 character set
+	 *
+	 * @param   string  $str  The string of 0's and 1's you want to convert
+	 *
+	 * @return  string  Resulting base32 character
+	 *
+	 * @access private
+	 */
+	private function _mapcharset($str)
+	{
+		// Huh!
+		$x = self::CSRFC3548;
+
+		return $x[bindec($str)];
+	}
+
+	/**
+	 * _mapbin
+	 *
+	 * Used with array_map to map the characters from a base32
+	 * character set directly into a binary string
+	 *
+	 * @param   string  $chr  The caracter to map
+	 *
+	 * @return  string  String of 0's and 1's
+	 *
+	 * @access private
+	 */
+	private function _mapbin($chr)
+	{
+		return sprintf('%08b', strpos(self::CSRFC3548, $chr));
+	}
+}
diff --git a/core/libraries/fof/encrypt/randval.php b/core/libraries/fof/encrypt/randval.php
new file mode 100644
index 00000000..d6a51156
--- /dev/null
+++ b/core/libraries/fof/encrypt/randval.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generates cryptographically-secure random values.
+ */
+class FOFEncryptRandval implements FOFEncryptRandvalinterface
+{
+	/**
+	 * @var FOFUtilsPhpfunc
+	 */
+	protected $phpfunc;
+
+	/**
+	 *
+	 * Constructor.
+	 *
+	 * @param FOFUtilsPhpfunc $phpfunc An object to intercept PHP function calls;
+	 *                         this makes testing easier.
+	 *
+	 */
+	public function __construct(FOFUtilsPhpfunc $phpfunc = null)
+	{
+		if (!is_object($phpfunc) || !($phpfunc instanceof FOFUtilsPhpfunc))
+		{
+			$phpfunc = new FOFUtilsPhpfunc();
+		}
+
+		$this->phpfunc = $phpfunc;
+	}
+
+	/**
+	 *
+	 * Returns a cryptographically secure random value.
+	 *
+	 * @param   integer  $bytes  How many bytes to return
+	 *
+	 * @return  string
+	 */
+	public function generate($bytes = 32)
+	{
+		if ($this->phpfunc->extension_loaded('openssl') && (version_compare(PHP_VERSION, '5.3.4') >= 0 || IS_WIN))
+		{
+			$strong = false;
+			$randBytes = openssl_random_pseudo_bytes($bytes, $strong);
+
+			if ($strong)
+			{
+				return $randBytes;
+			}
+		}
+
+		if ($this->phpfunc->extension_loaded('mcrypt'))
+		{
+			return $this->phpfunc->mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+		}
+
+		return $this->genRandomBytes($bytes);
+	}
+
+	/**
+	 * Generate random bytes. Adapted from Joomla! 3.2.
+	 *
+	 * @param   integer  $length  Length of the random data to generate
+	 *
+	 * @return  string  Random binary data
+	 */
+	public function genRandomBytes($length = 32)
+	{
+		$length = (int) $length;
+		$sslStr = '';
+
+		/*
+		 * Collect any entropy available in the system along with a number
+		 * of time measurements of operating system randomness.
+		 */
+		$bitsPerRound = 2;
+		$maxTimeMicro = 400;
+		$shaHashLength = 20;
+		$randomStr = '';
+		$total = $length;
+
+		// Check if we can use /dev/urandom.
+		$urandom = false;
+		$handle = null;
+
+		// This is PHP 5.3.3 and up
+		if ($this->phpfunc->function_exists('stream_set_read_buffer') && @is_readable('/dev/urandom'))
+		{
+			$handle = @fopen('/dev/urandom', 'rb');
+
+			if ($handle)
+			{
+				$urandom = true;
+			}
+		}
+
+		while ($length > strlen($randomStr))
+		{
+			$bytes = ($total > $shaHashLength)? $shaHashLength : $total;
+			$total -= $bytes;
+
+			/*
+			 * Collect any entropy available from the PHP system and filesystem.
+			 * If we have ssl data that isn't strong, we use it once.
+			 */
+			$entropy = rand() . uniqid(mt_rand(), true) . $sslStr;
+			$entropy .= implode('', @fstat(fopen(__FILE__, 'r')));
+			$entropy .= memory_get_usage();
+			$sslStr = '';
+
+			if ($urandom)
+			{
+				stream_set_read_buffer($handle, 0);
+				$entropy .= @fread($handle, $bytes);
+			}
+			else
+			{
+				/*
+				 * There is no external source of entropy so we repeat calls
+				 * to mt_rand until we are assured there's real randomness in
+				 * the result.
+				 *
+				 * Measure the time that the operations will take on average.
+				 */
+				$samples = 3;
+				$duration = 0;
+
+				for ($pass = 0; $pass < $samples; ++$pass)
+				{
+					$microStart = microtime(true) * 1000000;
+					$hash = sha1(mt_rand(), true);
+
+					for ($count = 0; $count < 50; ++$count)
+					{
+						$hash = sha1($hash, true);
+					}
+
+					$microEnd = microtime(true) * 1000000;
+					$entropy .= $microStart . $microEnd;
+
+					if ($microStart >= $microEnd)
+					{
+						$microEnd += 1000000;
+					}
+
+					$duration += $microEnd - $microStart;
+				}
+
+				$duration = $duration / $samples;
+
+				/*
+				 * Based on the average time, determine the total rounds so that
+				 * the total running time is bounded to a reasonable number.
+				 */
+				$rounds = (int) (($maxTimeMicro / $duration) * 50);
+
+				/*
+				 * Take additional measurements. On average we can expect
+				 * at least $bitsPerRound bits of entropy from each measurement.
+				 */
+				$iter = $bytes * (int) ceil(8 / $bitsPerRound);
+
+				for ($pass = 0; $pass < $iter; ++$pass)
+				{
+					$microStart = microtime(true);
+					$hash = sha1(mt_rand(), true);
+
+					for ($count = 0; $count < $rounds; ++$count)
+					{
+						$hash = sha1($hash, true);
+					}
+
+					$entropy .= $microStart . microtime(true);
+				}
+			}
+
+			$randomStr .= sha1($entropy, true);
+		}
+
+		if ($urandom)
+		{
+			@fclose($handle);
+		}
+
+		return substr($randomStr, 0, $length);
+	}
+}
diff --git a/core/libraries/fof/encrypt/randvalinterface.php b/core/libraries/fof/encrypt/randvalinterface.php
new file mode 100644
index 00000000..85cd6bd7
--- /dev/null
+++ b/core/libraries/fof/encrypt/randvalinterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+interface FOFEncryptRandvalinterface
+{
+	/**
+	 *
+	 * Returns a cryptographically secure random value.
+	 *
+	 * @return string
+	 *
+	 */
+	public function generate();
+}
\ No newline at end of file
diff --git a/core/libraries/fof/encrypt/totp.php b/core/libraries/fof/encrypt/totp.php
new file mode 100644
index 00000000..7b89c6f9
--- /dev/null
+++ b/core/libraries/fof/encrypt/totp.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage encrypt
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class provides an RFC6238-compliant Time-based One Time Passwords,
+ * compatible with Google Authenticator (with PassCodeLength = 6 and TimePeriod = 30).
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFEncryptTotp
+{
+	private $_passCodeLength = 6;
+
+	private $_pinModulo;
+
+	private $_secretLength = 10;
+
+	private $_timeStep = 30;
+
+	private $_base32 = null;
+
+	/**
+	 * Initialises an RFC6238-compatible TOTP generator. Please note that this
+	 * class does not implement the constraint in the last paragraph of §5.2
+	 * of RFC6238. It's up to you to ensure that the same user/device does not
+	 * retry validation within the same Time Step.
+	 *
+	 * @param   int     $timeStep        The Time Step (in seconds). Use 30 to be compatible with Google Authenticator.
+	 * @param   int     $passCodeLength  The generated passcode length. Default: 6 digits.
+	 * @param   int     $secretLength    The length of the secret key. Default: 10 bytes (80 bits).
+	 * @param   Object  $base32          The base32 en/decrypter
+	 */
+	public function __construct($timeStep = 30, $passCodeLength = 6, $secretLength = 10, $base32=null)
+	{
+		$this->_timeStep       = $timeStep;
+		$this->_passCodeLength = $passCodeLength;
+		$this->_secretLength   = $secretLength;
+		$this->_pinModulo      = pow(10, $this->_passCodeLength);
+
+		if (is_null($base32))
+		{
+			$this->_base32 = new FOFEncryptBase32;
+		}
+		else
+		{
+			$this->_base32 = $base32;
+		}
+	}
+
+	/**
+	 * Get the time period based on the $time timestamp and the Time Step
+	 * defined. If $time is skipped or set to null the current timestamp will
+	 * be used.
+	 *
+	 * @param   int|null  $time  Timestamp
+	 *
+	 * @return  int  The time period since the UNIX Epoch
+	 */
+	public function getPeriod($time = null)
+	{
+		if (is_null($time))
+		{
+			$time = time();
+		}
+
+		$period = floor($time / $this->_timeStep);
+
+		return $period;
+	}
+
+	/**
+	 * Check is the given passcode $code is a valid TOTP generated using secret
+	 * key $secret
+	 *
+	 * @param   string  $secret  The Base32-encoded secret key
+	 * @param   string  $code    The passcode to check
+	 *
+	 * @return boolean True if the code is valid
+	 */
+	public function checkCode($secret, $code)
+	{
+		$time = $this->getPeriod();
+
+		for ($i = -1; $i <= 1; $i++)
+		{
+			if ($this->getCode($secret, ($time + $i) * $this->_timeStep) == $code)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets the TOTP passcode for a given secret key $secret and a given UNIX
+	 * timestamp $time
+	 *
+	 * @param   string  $secret  The Base32-encoded secret key
+	 * @param   int     $time    UNIX timestamp
+	 *
+	 * @return string
+	 */
+	public function getCode($secret, $time = null)
+	{
+		$period = $this->getPeriod($time);
+		$secret = $this->_base32->decode($secret);
+
+		$time = pack("N", $period);
+		$time = str_pad($time, 8, chr(0), STR_PAD_LEFT);
+
+		$hash = hash_hmac('sha1', $time, $secret, true);
+		$offset = ord(substr($hash, -1));
+		$offset = $offset & 0xF;
+
+		$truncatedHash = $this->hashToInt($hash, $offset) & 0x7FFFFFFF;
+		$pinValue = str_pad($truncatedHash % $this->_pinModulo, $this->_passCodeLength, "0", STR_PAD_LEFT);
+
+		return $pinValue;
+	}
+
+	/**
+	 * Extracts a part of a hash as an integer
+	 *
+	 * @param   string  $bytes  The hash
+	 * @param   string  $start  The char to start from (0 = first char)
+	 *
+	 * @return  string
+	 */
+	protected function hashToInt($bytes, $start)
+	{
+		$input = substr($bytes, $start, strlen($bytes) - $start);
+		$val2 = unpack("N", substr($input, 0, 4));
+
+		return $val2[1];
+	}
+
+	/**
+	 * Returns a QR code URL for easy setup of TOTP apps like Google Authenticator
+	 *
+	 * @param   string  $user      User
+	 * @param   string  $hostname  Hostname
+	 * @param   string  $secret    Secret string
+	 *
+	 * @return  string
+	 */
+	public function getUrl($user, $hostname, $secret)
+	{
+		$url = sprintf("otpauth://totp/%s@%s?secret=%s", $user, $hostname, $secret);
+		$encoder = "https://chart.googleapis.com/chart?chs=200x200&chld=Q|2&cht=qr&chl=";
+		$encoderURL = $encoder . urlencode($url);
+
+		return $encoderURL;
+	}
+
+	/**
+	 * Generates a (semi-)random Secret Key for TOTP generation
+	 *
+	 * @return  string
+	 */
+	public function generateSecret()
+	{
+		$secret = "";
+
+		for ($i = 1; $i <= $this->_secretLength; $i++)
+		{
+			$c = rand(0, 255);
+			$secret .= pack("c", $c);
+		}
+		$base32 = new FOFEncryptBase32;
+
+		return $this->_base32->encode($secret);
+	}
+}
diff --git a/core/libraries/fof/form/field.php b/core/libraries/fof/form/field.php
new file mode 100644
index 00000000..3f6df7b4
--- /dev/null
+++ b/core/libraries/fof/form/field.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic interface that a FOF form field class must implement
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+interface FOFFormField
+{
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @return  string  The field HTML
+	 *
+	 * @since 2.0
+	 */
+	public function getStatic();
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @return  string  The field HTML
+	 *
+	 * @since 2.0
+	 */
+	public function getRepeatable();
+}
diff --git a/core/libraries/fof/form/field/accesslevel.php b/core/libraries/fof/form/field/accesslevel.php
new file mode 100644
index 00000000..1fd17a0f
--- /dev/null
+++ b/core/libraries/fof/form/field/accesslevel.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('accesslevel');
+
+/**
+ * Form Field class for FOF
+ * Joomla! access levels
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldAccesslevel extends JFormFieldAccessLevel implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		$params = $this->getOptions();
+
+		$db    = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.id AS value, a.title AS text');
+		$query->from('#__viewlevels AS a');
+		$query->group('a.id, a.title, a.ordering');
+		$query->order('a.ordering ASC');
+		$query->order($query->qn('title') . ' ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		// If params is an array, push these options to the array
+		if (is_array($params))
+		{
+			$options = array_merge($params, $options);
+		}
+
+		// If all levels is allowed, push it into the array.
+		elseif ($params)
+		{
+			array_unshift($options, JHtml::_('select.option', '', JText::_('JOPTION_ACCESS_SHOW_ALL_LEVELS')));
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($options, $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		$params = $this->getOptions();
+
+		$db    = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.id AS value, a.title AS text');
+		$query->from('#__viewlevels AS a');
+		$query->group('a.id, a.title, a.ordering');
+		$query->order('a.ordering ASC');
+		$query->order($query->qn('title') . ' ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		// If params is an array, push these options to the array
+		if (is_array($params))
+		{
+			$options = array_merge($params, $options);
+		}
+
+		// If all levels is allowed, push it into the array.
+		elseif ($params)
+		{
+			array_unshift($options, JHtml::_('select.option', '', JText::_('JOPTION_ACCESS_SHOW_ALL_LEVELS')));
+		}
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($options, $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/actions.php b/core/libraries/fof/form/field/actions.php
new file mode 100644
index 00000000..fc232da7
--- /dev/null
+++ b/core/libraries/fof/form/field/actions.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for FOF
+ * Supports a generic list of options.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldActions extends JFormFieldList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the field configuration
+	 *
+	 * @return  array
+	 */
+	protected function getConfig()
+	{
+		// If no custom options were defined let's figure out which ones of the
+		// defaults we shall use...
+		$config = array(
+			'published'		 => 1,
+			'unpublished'	 => 1,
+			'archived'		 => 0,
+			'trash'			 => 0,
+			'all'			 => 0,
+		);
+
+		$stack = array();
+
+		if (isset($this->element['show_published']))
+		{
+			$config['published'] = FOFStringUtils::toBool($this->element['show_published']);
+		}
+
+		if (isset($this->element['show_unpublished']))
+		{
+			$config['unpublished'] = FOFStringUtils::toBool($this->element['show_unpublished']);
+		}
+
+		if (isset($this->element['show_archived']))
+		{
+			$config['archived'] = FOFStringUtils::toBool($this->element['show_archived']);
+		}
+
+		if (isset($this->element['show_trash']))
+		{
+			$config['trash'] = FOFStringUtils::toBool($this->element['show_trash']);
+		}
+
+		if (isset($this->element['show_all']))
+		{
+			$config['all'] = FOFStringUtils::toBool($this->element['show_all']);
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @since 2.0
+	 *
+	 * @return  array  The field option objects.
+	 */
+	protected function getOptions()
+	{
+		return null;
+	}
+
+	/**
+	 * Method to get a
+	 *
+	 * @param   string  $enabledFieldName  Name of the enabled/published field
+	 *
+	 * @return  FOFFormFieldPublished  Field
+	 */
+	protected function getPublishedField($enabledFieldName)
+	{
+		$attributes = array(
+			'name' => $enabledFieldName,
+			'type' => 'published',
+		);
+
+		if ($this->element['publish_up'])
+		{
+			$attributes['publish_up'] = (string) $this->element['publish_up'];
+		}
+
+		if ($this->element['publish_down'])
+		{
+			$attributes['publish_down'] = (string) $this->element['publish_down'];
+		}
+
+		foreach ($attributes as $name => $value)
+		{
+			if (!is_null($value))
+			{
+				$renderedAttributes[] = $name . '="' . $value . '"';
+			}
+		}
+
+		$publishedXml = new SimpleXMLElement('<field ' . implode(' ', $renderedAttributes) . ' />');
+
+		$publishedField = new FOFFormFieldPublished($this->form);
+
+		// Pass required objects to the field
+		$publishedField->item = $this->item;
+		$publishedField->rowid = $this->rowid;
+		$publishedField->setup($publishedXml, $this->item->{$enabledFieldName});
+
+		return $publishedField;
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		throw new Exception(__CLASS__ . ' cannot be used in single item display forms');
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		if (!($this->item instanceof FOFTable))
+		{
+			throw new Exception(__CLASS__ . ' needs a FOFTable to act upon');
+		}
+
+		$config = $this->getConfig();
+
+		// Initialise
+		$prefix       = '';
+		$checkbox     = 'cb';
+		$publish_up   = null;
+		$publish_down = null;
+		$enabled      = true;
+
+		$html = '<div class="btn-group">';
+
+		// Render a published field
+		if ($publishedFieldName = $this->item->getColumnAlias('enabled'))
+		{
+			if ($config['published'] || $config['unpublished'])
+			{
+				// Generate a FOFFormFieldPublished field
+				$publishedField = $this->getPublishedField($publishedFieldName);
+
+				// Render the publish button
+				$html .= $publishedField->getRepeatable();
+			}
+
+			if ($config['archived'])
+			{
+				$archived	= $this->item->{$publishedFieldName} == 2 ? true : false;
+
+				// Create dropdown items
+				$action = $archived ? 'unarchive' : 'archive';
+				JHtml::_('actionsdropdown.' . $action, 'cb' . $this->rowid, $prefix);
+			}
+
+			if ($config['trash'])
+			{
+				$trashed	= $this->item->{$publishedFieldName} == -2 ? true : false;
+
+				$action = $trashed ? 'untrash' : 'trash';
+				JHtml::_('actionsdropdown.' . $action, 'cb' . $this->rowid, $prefix);
+			}
+
+			// Render dropdown list
+			if ($config['archived'] || $config['trash'])
+			{
+				$html .= JHtml::_('actionsdropdown.render', $this->item->title);
+			}
+		}
+
+		$html .= '</div>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/button.php b/core/libraries/fof/form/field/button.php
new file mode 100644
index 00000000..1f459dbb
--- /dev/null
+++ b/core/libraries/fof/form/field/button.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('text');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a button input.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldButton extends FOFFormFieldText implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getInput()
+	{
+		$this->label = '';
+
+		$allowedElement = array('button', 'a');
+
+		if (in_array($this->element['htmlelement'], $allowedElement))
+			$type = $this->element['htmlelement'];
+		else
+			$type = 'button';
+
+		$text    = $this->element['text'];
+		$class   = $this->element['class'] ? (string) $this->element['class'] : '';
+		$icon    = $this->element['icon'] ? (string) $this->element['icon'] : '';
+		$onclick = $this->element['onclick'] ? 'onclick="' . (string) $this->element['onclick'] . '"' : '';
+		$url     = $this->element['url'] ? 'href="' . $this->parseFieldTags((string) $this->element['url']) . '"' : '';
+		$title   = $this->element['title'] ? 'title="' . JText::_((string) $this->element['title']) . '"' : '';
+
+		$this->value = JText::_($text);
+
+		if ($icon)
+		{
+			$icon = '<span class="icon ' . $icon . '"></span>';
+		}
+
+		return '<' . $type . ' id="' . $this->id . '" class="btn ' . $class . '" ' .
+			$onclick . $url . $title . '>' .
+			$icon .
+			htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') .
+			'</' . $type . '>';
+	}
+
+	/**
+	 * Method to get the field title.
+	 *
+	 * @return  string  The field title.
+	 */
+	protected function getTitle()
+	{
+		return null;
+	}
+}
diff --git a/core/libraries/fof/form/field/cachehandler.php b/core/libraries/fof/form/field/cachehandler.php
new file mode 100644
index 00000000..6b9816b5
--- /dev/null
+++ b/core/libraries/fof/form/field/cachehandler.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('cachehandler');
+
+/**
+ * Form Field class for FOF
+ * Joomla! cache handlers
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldCachehandler extends JFormFieldCacheHandler implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/calendar.php b/core/libraries/fof/form/field/calendar.php
new file mode 100644
index 00000000..40552e6d
--- /dev/null
+++ b/core/libraries/fof/form/field/calendar.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('calendar');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a calendar / date field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldCalendar extends JFormFieldCalendar implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			// ATTENTION: Redirected getInput() to getStatic()
+			case 'input':
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getCalendar('static');
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getCalendar('repeatable');
+	}
+
+	/**
+	 * Method to get the calendar input markup.
+	 *
+	 * @param   string  $display  The display to render ('static' or 'repeatable')
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   2.1.rc4
+	 */
+	protected function getCalendar($display)
+	{
+		// Initialize some field attributes.
+		$format  = $this->element['format'] ? (string) $this->element['format'] : '%Y-%m-%d';
+		$class   = $this->element['class'] ? (string) $this->element['class'] : '';
+		$default = $this->element['default'] ? (string) $this->element['default'] : '';
+
+		// PHP date doesn't use percentages (%) for the format, but the calendar Javascript
+		// DOES use it (@see: calendar-uncompressed.js). Therefore we have to convert it.
+		$formatJS  = $format;
+		$formatPHP = str_replace(array('%', 'H:M:S', 'B'), array('', 'H:i:s', 'F'), $formatJS);
+
+		// Check for empty date values
+		if (empty($this->value) || $this->value == FOFPlatform::getInstance()->getDbo()->getNullDate() || $this->value == '0000-00-00')
+		{
+			$this->value = $default;
+		}
+
+		// Get some system objects.
+		$config = FOFPlatform::getInstance()->getConfig();
+		$user   = JFactory::getUser();
+
+		// Format date if exists
+		if (!empty($this->value))
+		{
+			$date   = FOFPlatform::getInstance()->getDate($this->value, 'UTC');
+
+			// If a known filter is given use it.
+			switch (strtoupper((string) $this->element['filter']))
+			{
+				case 'SERVER_UTC':
+					// Convert a date to UTC based on the server timezone.
+					if ((int) $this->value)
+					{
+						// Get a date object based on the correct timezone.
+						$date->setTimezone(new DateTimeZone($config->get('offset')));
+					}
+					break;
+
+				case 'USER_UTC':
+					// Convert a date to UTC based on the user timezone.
+					if ((int) $this->value)
+					{
+						// Get a date object based on the correct timezone.
+						$date->setTimezone($user->getTimezone());
+					}
+					break;
+
+				default:
+					break;
+			}
+
+			// Transform the date string.
+			$this->value = $date->format($formatPHP, true, false);
+		}
+
+		if ($display == 'static')
+		{
+			// Build the attributes array.
+			$attributes = array();
+
+			if ($this->element['size'])
+			{
+				$attributes['size'] = (int) $this->element['size'];
+			}
+
+			if ($this->element['maxlength'])
+			{
+				$attributes['maxlength'] = (int) $this->element['maxlength'];
+			}
+
+			if ($this->element['class'])
+			{
+				$attributes['class'] = (string) $this->element['class'];
+			}
+
+			if ((string) $this->element['readonly'] == 'true')
+			{
+				$attributes['readonly'] = 'readonly';
+			}
+
+			if ((string) $this->element['disabled'] == 'true')
+			{
+				$attributes['disabled'] = 'disabled';
+			}
+
+			if ($this->element['onchange'])
+			{
+				$attributes['onchange'] = (string) $this->element['onchange'];
+			}
+
+			if ($this->required)
+			{
+				$attributes['required'] = 'required';
+				$attributes['aria-required'] = 'true';
+			}
+
+			return JHtml::_('calendar', $this->value, $this->name, $this->id, $formatJS, $attributes);
+		}
+		else
+		{
+			return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') .
+			'</span>';
+		}
+	}
+}
diff --git a/core/libraries/fof/form/field/captcha.php b/core/libraries/fof/form/field/captcha.php
new file mode 100644
index 00000000..4d55b3b9
--- /dev/null
+++ b/core/libraries/fof/form/field/captcha.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('captcha');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a captcha field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldCaptcha extends JFormFieldCaptcha implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getInput();
+	}
+}
diff --git a/core/libraries/fof/form/field/checkbox.php b/core/libraries/fof/form/field/checkbox.php
new file mode 100644
index 00000000..c8acc646
--- /dev/null
+++ b/core/libraries/fof/form/field/checkbox.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('checkbox');
+
+/**
+ * Form Field class for the FOF framework
+ * A single checkbox
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldCheckbox extends JFormFieldCheckbox implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$value = $this->element['value'] ? (string) $this->element['value'] : '1';
+		$disabled = ((string) $this->element['disabled'] == 'true') ? ' disabled="disabled"' : '';
+		$onclick = $this->element['onclick'] ? ' onclick="' . (string) $this->element['onclick'] . '"' : '';
+		$required = $this->required ? ' required="required" aria-required="true"' : '';
+
+		if (empty($this->value))
+		{
+			$checked = (isset($this->element['checked'])) ? ' checked="checked"' : '';
+		}
+		else
+		{
+			$checked = ' checked="checked"';
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			'<input type="checkbox" name="' . $this->name . '" id="' . $this->id . '"' . ' value="'
+			. htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"' . $class . $checked . $disabled . $onclick . $required . ' />' .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+		$value = $this->element['value'] ? (string) $this->element['value'] : '1';
+		$disabled = ((string) $this->element['disabled'] == 'true') ? ' disabled="disabled"' : '';
+		$onclick = $this->element['onclick'] ? ' onclick="' . (string) $this->element['onclick'] . '"' : '';
+		$required = $this->required ? ' required="required" aria-required="true"' : '';
+
+		if (empty($this->value))
+		{
+			$checked = (isset($this->element['checked'])) ? ' checked="checked"' : '';
+		}
+		else
+		{
+			$checked = ' checked="checked"';
+		}
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			'<input type="checkbox" name="' . $this->name . '" class="' . $this->id . ' ' . $class . '"' . ' value="'
+			. htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"' . $checked . $disabled . $onclick . $required . ' />' .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/checkboxes.php b/core/libraries/fof/form/field/checkboxes.php
new file mode 100644
index 00000000..88023bc7
--- /dev/null
+++ b/core/libraries/fof/form/field/checkboxes.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('checkboxes');
+
+/**
+ * Form Field class for FOF
+ * Supports a list of checkbox.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldCheckboxes extends JFormFieldCheckboxes implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getRepeatable();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class     = $this->element['class'] ? (string) $this->element['class'] : $this->id;
+		$translate = $this->element['translate'] ? (string) $this->element['translate'] : false;
+
+		$html = '<span class="' . $class . '">';
+		foreach ($this->value as $value) {
+
+			$html .= '<span>';
+
+			if ($translate == true)
+			{
+				$html .= JText::_($value);
+			}
+			else
+			{
+				$html .= $value;
+			}
+
+			$html .= '</span>';
+		}
+		$html .= '</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getInput()
+	{
+		// Used for J! 2.5 compatibility
+		$this->value = !is_array($this->value) ? explode(',', $this->value) : $this->value;
+
+		return parent::getInput();
+	}
+}
diff --git a/core/libraries/fof/form/field/components.php b/core/libraries/fof/form/field/components.php
new file mode 100644
index 00000000..f236632b
--- /dev/null
+++ b/core/libraries/fof/form/field/components.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for FOF
+ * Components installed on the site
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFFormFieldComponents extends JFormFieldList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	public $client_ids = null;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.1
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.1
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.1
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get a list of all installed components and also translates them.
+	 *
+	 * The manifest_cache is used to get the extension names, since JInstaller is also
+	 * translating those names in stead of the name column. Else some of the translations
+	 * fails.
+	 *
+	 * @since    2.1
+	 *
+	 * @return 	array	An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// Check for client_ids override
+		if ($this->client_ids !== null)
+		{
+			$client_ids = $this->client_ids;
+		}
+		else
+		{
+			$client_ids = $this->element['client_ids'];
+		}
+
+		$client_ids = explode(',', $client_ids);
+
+		// Calculate client_ids where clause
+		foreach ($client_ids as &$client_id)
+		{
+			$client_id = (int) trim($client_id);
+			$client_id = $db->q($client_id);
+		}
+
+		$query = $db->getQuery(true)
+			->select(
+				array(
+					$db->qn('name'),
+					$db->qn('element'),
+					$db->qn('client_id'),
+					$db->qn('manifest_cache'),
+				)
+			)
+			->from($db->qn('#__extensions'))
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('client_id') . ' IN (' . implode(',', $client_ids) . ')');
+		$db->setQuery($query);
+		$components = $db->loadObjectList('element');
+
+		// Convert to array of objects, so we can use sortObjects()
+		// Also translate component names with JText::_()
+		$aComponents = array();
+		$user = JFactory::getUser();
+
+		foreach ($components as $component)
+		{
+			// Don't show components in the list where the user doesn't have access for
+			// TODO: perhaps add an option for this
+			if (!$user->authorise('core.manage', $component->element))
+			{
+				continue;
+			}
+
+			$oData = (object) array(
+				'value'	=> $component->element,
+				'text' 	=> $this->translate($component, 'component')
+			);
+			$aComponents[$component->element] = $oData;
+		}
+
+		// Reorder the components array, because the alphabetical
+		// ordering changed due to the JText::_() translation
+		uasort(
+			$aComponents,
+			function ($a, $b) {
+				return strcasecmp($a->text, $b->text);
+			}
+		);
+
+		return $aComponents;
+	}
+
+	/**
+	 * Translate a list of objects with JText::_().
+	 *
+	 * @param   array   $item  The array of objects
+	 * @param   string  $type  The extension type (e.g. component)
+	 *
+	 * @since   2.1
+	 *
+	 * @return  string  $text  The translated name of the extension
+	 *
+	 * @see administrator/com_installer/models/extension.php
+	 */
+	public function translate($item, $type)
+	{
+        $platform = FOFPlatform::getInstance();
+
+		// Map the manifest cache to $item. This is needed to get the name from the
+		// manifest_cache and NOT from the name column, else some JText::_() translations fails.
+		$mData = json_decode($item->manifest_cache);
+
+		if ($mData)
+		{
+			foreach ($mData as $key => $value)
+			{
+				if ($key == 'type')
+				{
+					// Ignore the type field
+					continue;
+				}
+
+				$item->$key = $value;
+			}
+		}
+
+		$lang = $platform->getLanguage();
+
+		switch ($type)
+		{
+			case 'component':
+				$source = JPATH_ADMINISTRATOR . '/components/' . $item->element;
+				$lang->load("$item->element.sys", JPATH_ADMINISTRATOR, null, false, false)
+					||	$lang->load("$item->element.sys", $source, null, false, false)
+					||	$lang->load("$item->element.sys", JPATH_ADMINISTRATOR, $lang->getDefault(), false, false)
+					||	$lang->load("$item->element.sys", $source, $lang->getDefault(), false, false);
+				break;
+		}
+
+		$text = JText::_($item->name);
+
+		return $text;
+	}
+}
diff --git a/core/libraries/fof/form/field/editor.php b/core/libraries/fof/form/field/editor.php
new file mode 100644
index 00000000..8c01e26d
--- /dev/null
+++ b/core/libraries/fof/form/field/editor.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('editor');
+
+/**
+ * Form Field class for the FOF framework
+ * An editarea field for content creation and formatted HTML display
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldEditor extends JFormFieldEditor implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<div id="' . $this->id . '" ' . $class . '>' . $this->value . '</div>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<div class="' . $this->id . ' ' . $class . '">' . $this->value . '</div>';
+	}
+}
diff --git a/core/libraries/fof/form/field/email.php b/core/libraries/fof/form/field/email.php
new file mode 100644
index 00000000..e79ccca2
--- /dev/null
+++ b/core/libraries/fof/form/field/email.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('email');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a one line text field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldEmail extends JFormFieldEMail implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$dolink = $this->element['show_link'] == 'true';
+		$empty_replacement = '';
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		$innerHtml = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		if ($dolink)
+		{
+			$innerHtml = '<a href="mailto:' . $innerHtml . '">' .
+				$innerHtml . '</a>';
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			$innerHtml .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		// Initialise
+		$class = '';
+		$show_link = false;
+		$link_url = '';
+		$empty_replacement = '';
+
+		// Get field parameters
+		if ($this->element['class'])
+		{
+			$class = (string) $this->element['class'];
+		}
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['url'])
+		{
+			$link_url = $this->element['url'];
+		}
+		else
+		{
+			$link_url = 'mailto:' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+		}
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		// Get the (optionally formatted) value
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		$value = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		// Create the HTML
+		$html = '<span class="' . $this->id . ' ' . $class . '">';
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		$html .= $value;
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/groupedbutton.php b/core/libraries/fof/form/field/groupedbutton.php
new file mode 100644
index 00000000..c6d5b292
--- /dev/null
+++ b/core/libraries/fof/form/field/groupedbutton.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for FOF
+ * Supports a generic list of options.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldGroupedbutton extends JFormFieldText implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getInput()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		$html = '<div id="' . $this->id . '" class="btn-group ' . $class . '">';
+
+		foreach ($this->element->children() as $option)
+		{
+			$renderedAttributes = array();
+
+			foreach ($option->attributes() as $name => $value)
+			{
+				if (!is_null($value))
+				{
+					$renderedAttributes[] = $name . '="' . htmlentities($value) . '"';
+				}
+			}
+
+			$buttonXML   = new SimpleXMLElement('<field ' . implode(' ', $renderedAttributes) . ' />');
+			$buttonField = new FOFFormFieldButton($this->form);
+
+			// Pass required objects to the field
+			$buttonField->item = $this->item;
+			$buttonField->rowid = $this->rowid;
+			$buttonField->setup($buttonXML, null);
+
+			$html .= $buttonField->getRepeatable();
+		}
+		$html .= '</div>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/groupedlist.php b/core/libraries/fof/form/field/groupedlist.php
new file mode 100644
index 00000000..dcdba418
--- /dev/null
+++ b/core/libraries/fof/form/field/groupedlist.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('groupedlist');
+
+/**
+ * Form Field class for FOF
+ * Supports a generic list of options.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldGroupedlist extends JFormFieldGroupedList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		$selected = self::getOptionName($this->getGroups(), $this->value);
+
+		if (is_null($selected))
+		{
+			$selected = array(
+				'group'	 => '',
+				'item'	 => ''
+			);
+		}
+
+		return '<span id="' . $this->id . '-group" class="fof-groupedlist-group ' . $class . '>' .
+			htmlspecialchars($selected['group'], ENT_COMPAT, 'UTF-8') .
+			'</span>' .
+			'<span id="' . $this->id . '-item" class="fof-groupedlist-item ' . $class . '>' .
+			htmlspecialchars($selected['item'], ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		$selected = self::getOptionName($this->getGroups(), $this->value);
+
+		if (is_null($selected))
+		{
+			$selected = array(
+				'group'	 => '',
+				'item'	 => ''
+			);
+		}
+
+		return '<span class="' . $this->id . '-group fof-groupedlist-group ' . $class . '">' .
+			htmlspecialchars($selected['group'], ENT_COMPAT, 'UTF-8') .
+			'</span>' .
+			'<span class="' . $this->id . '-item fof-groupedlist-item ' . $class . '">' .
+			htmlspecialchars($selected['item'], ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Gets the active option's label given an array of JHtml options
+	 *
+	 * @param   array   $data      The JHtml options to parse
+	 * @param   mixed   $selected  The currently selected value
+	 * @param   string  $groupKey  Group name
+	 * @param   string  $optKey    Key name
+	 * @param   string  $optText   Value name
+	 *
+	 * @return  mixed   The label of the currently selected option
+	 */
+	public static function getOptionName($data, $selected = null, $groupKey = 'items', $optKey = 'value', $optText = 'text')
+	{
+		$ret = null;
+
+		foreach ($data as $dataKey => $group)
+		{
+			$label = $dataKey;
+			$noGroup = is_int($dataKey);
+
+			if (is_array($group))
+			{
+				$subList = $group[$groupKey];
+				$label = $group[$optText];
+				$noGroup = false;
+			}
+			elseif (is_object($group))
+			{
+				// Sub-list is in a property of an object
+				$subList = $group->$groupKey;
+				$label = $group->$optText;
+				$noGroup = false;
+			}
+			else
+			{
+				throw new RuntimeException('Invalid group contents.', 1);
+			}
+
+			if ($noGroup)
+			{
+				$label = '';
+			}
+
+			$match = FOFFormFieldList::getOptionName($data, $selected, $optKey, $optText);
+
+			if (!is_null($match))
+			{
+				$ret = array(
+					'group'	 => $label,
+					'item'	 => $match
+				);
+				break;
+			}
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/libraries/fof/form/field/hidden.php b/core/libraries/fof/form/field/hidden.php
new file mode 100644
index 00000000..61c8e943
--- /dev/null
+++ b/core/libraries/fof/form/field/hidden.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('hidden');
+
+/**
+ * Form Field class for the FOF framework
+ * A hidden field
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldHidden extends JFormFieldHidden implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getInput();
+	}
+}
diff --git a/core/libraries/fof/form/field/image.php b/core/libraries/fof/form/field/image.php
new file mode 100644
index 00000000..c909453c
--- /dev/null
+++ b/core/libraries/fof/form/field/image.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Form Field class for the FOF framework
+ * Media selection field. This is an alias of the "media" field type.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldImage extends FOFFormFieldMedia
+{
+}
diff --git a/core/libraries/fof/form/field/imagelist.php b/core/libraries/fof/form/field/imagelist.php
new file mode 100644
index 00000000..c0c41ce8
--- /dev/null
+++ b/core/libraries/fof/form/field/imagelist.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('imagelist');
+
+/**
+ * Form Field class for the FOF framework
+ * Media selection field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldImagelist extends JFormFieldImageList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$imgattr = array(
+			'id' => $this->id
+		);
+
+		if ($this->element['class'])
+		{
+			$imgattr['class'] = (string) $this->element['class'];
+		}
+
+		if ($this->element['style'])
+		{
+			$imgattr['style'] = (string) $this->element['style'];
+		}
+
+		if ($this->element['width'])
+		{
+			$imgattr['width'] = (string) $this->element['width'];
+		}
+
+		if ($this->element['height'])
+		{
+			$imgattr['height'] = (string) $this->element['height'];
+		}
+
+		if ($this->element['align'])
+		{
+			$imgattr['align'] = (string) $this->element['align'];
+		}
+
+		if ($this->element['rel'])
+		{
+			$imgattr['rel'] = (string) $this->element['rel'];
+		}
+
+		if ($this->element['alt'])
+		{
+			$alt = JText::_((string) $this->element['alt']);
+		}
+		else
+		{
+			$alt = null;
+		}
+
+		if ($this->element['title'])
+		{
+			$imgattr['title'] = JText::_((string) $this->element['title']);
+		}
+
+		$path = (string) $this->element['directory'];
+		$path = trim($path, '/' . DIRECTORY_SEPARATOR);
+
+		if ($this->value && file_exists(JPATH_ROOT . '/' . $path . '/' . $this->value))
+		{
+			$src = FOFPlatform::getInstance()->URIroot() . '/' . $path . '/' . $this->value;
+		}
+		else
+		{
+			$src = '';
+		}
+
+		return JHtml::_('image', $src, $alt, $imgattr);
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getStatic();
+	}
+}
diff --git a/core/libraries/fof/form/field/integer.php b/core/libraries/fof/form/field/integer.php
new file mode 100644
index 00000000..a00e34b3
--- /dev/null
+++ b/core/libraries/fof/form/field/integer.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('integer');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a one line text field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldInteger extends JFormFieldInteger implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/language.php b/core/libraries/fof/form/field/language.php
new file mode 100644
index 00000000..4f822f93
--- /dev/null
+++ b/core/libraries/fof/form/field/language.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('language');
+
+/**
+ * Form Field class for FOF
+ * Available site languages
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldLanguage extends JFormFieldLanguage implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @since 2.0
+	 *
+	 * @return  array  The field option objects.
+	 */
+	protected function getOptions()
+	{
+		$options = parent::getOptions();
+
+		$noneoption = $this->element['none'] ? $this->element['none'] : null;
+
+		if ($noneoption)
+		{
+			array_unshift($options, JHtml::_('select.option', '*', JText::_($noneoption)));
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/list.php b/core/libraries/fof/form/field/list.php
new file mode 100644
index 00000000..1c9ee7bf
--- /dev/null
+++ b/core/libraries/fof/form/field/list.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for FOF
+ * Supports a generic list of options.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldList extends JFormFieldList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(self::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$show_link         = false;
+		$link_url          = '';
+
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['url'])
+		{
+			$link_url = $this->element['url'];
+		}
+		else
+		{
+			$show_link = false;
+		}
+
+		if ($show_link && ($this->item instanceof FOFTable))
+		{
+			$link_url = $this->parseFieldTags($link_url);
+		}
+		else
+		{
+			$show_link = false;
+		}
+
+		$html = '<span class="' . $this->id . ' ' . $class . '">';
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		$html .= htmlspecialchars(self::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8');
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+
+	/**
+	 * Gets the active option's label given an array of JHtml options
+	 *
+	 * @param   array   $data      The JHtml options to parse
+	 * @param   mixed   $selected  The currently selected value
+	 * @param   string  $optKey    Key name
+	 * @param   string  $optText   Value name
+	 *
+	 * @return  mixed   The label of the currently selected option
+	 */
+	public static function getOptionName($data, $selected = null, $optKey = 'value', $optText = 'text')
+	{
+		$ret = null;
+
+		foreach ($data as $elementKey => &$element)
+		{
+			if (is_array($element))
+			{
+				$key = $optKey === null ? $elementKey : $element[$optKey];
+				$text = $element[$optText];
+			}
+			elseif (is_object($element))
+			{
+				$key = $optKey === null ? $elementKey : $element->$optKey;
+				$text = $element->$optText;
+			}
+			else
+			{
+				// This is a simple associative array
+				$key = $elementKey;
+				$text = $element;
+			}
+
+			if (is_null($ret))
+			{
+				$ret = $text;
+			}
+			elseif ($selected == $key)
+			{
+				$ret = $text;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * Ordering is disabled by default. You can enable ordering by setting the
+	 * 'order' element in your form field. The other order values are optional.
+	 *
+	 * - order					What to order.			Possible values: 'name' or 'value' (default = false)
+	 * - order_dir				Order direction.		Possible values: 'asc' = Ascending or 'desc' = Descending (default = 'asc')
+	 * - order_case_sensitive	Order case sensitive.	Possible values: 'true' or 'false' (default = false)
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since	Ordering is available since FOF 2.1.b2.
+	 */
+	protected function getOptions()
+	{
+		// Ordering is disabled by default for backward compatibility
+		$order = false;
+
+		// Set default order direction
+		$order_dir = 'asc';
+
+		// Set default value for case sensitive sorting
+		$order_case_sensitive = false;
+
+		if ($this->element['order'] && $this->element['order'] !== 'false')
+		{
+			$order = $this->element['order'];
+		}
+
+		if ($this->element['order_dir'])
+		{
+			$order_dir = $this->element['order_dir'];
+		}
+
+		if ($this->element['order_case_sensitive'])
+		{
+			// Override default setting when the form element value is 'true'
+			if ($this->element['order_case_sensitive'] == 'true')
+			{
+				$order_case_sensitive = true;
+			}
+		}
+
+		// Create a $sortOptions array in order to apply sorting
+		$i = 0;
+		$sortOptions = array();
+
+		foreach ($this->element->children() as $option)
+		{
+			$name = JText::alt(trim((string) $option), preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname));
+
+			$sortOptions[$i] = new stdClass;
+			$sortOptions[$i]->option = $option;
+			$sortOptions[$i]->value = $option['value'];
+			$sortOptions[$i]->name = $name;
+			$i++;
+		}
+
+		// Only order if it's set
+		if ($order)
+		{
+			jimport('joomla.utilities.arrayhelper');
+			FOFUtilsArray::sortObjects($sortOptions, $order, $order_dir == 'asc' ? 1 : -1, $order_case_sensitive, false);
+		}
+
+		// Initialise the options
+		$options = array();
+
+		// Get the field $options
+		foreach ($sortOptions as $sortOption)
+		{
+			$option = $sortOption->option;
+			$name = $sortOption->name;
+
+			// Only add <option /> elements.
+			if ($option->getName() != 'option')
+			{
+				continue;
+			}
+
+			$tmp = JHtml::_('select.option', (string) $option['value'], $name, 'value', 'text', ((string) $option['disabled'] == 'true'));
+
+			// Set some option attributes.
+			$tmp->class = (string) $option['class'];
+
+			// Set some JavaScript option attributes.
+			$tmp->onclick = (string) $option['onclick'];
+
+			// Add the option object to the result set.
+			$options[] = $tmp;
+		}
+
+		// Do we have a class and method source for our options?
+		$source_file      = empty($this->element['source_file']) ? '' : (string) $this->element['source_file'];
+		$source_class     = empty($this->element['source_class']) ? '' : (string) $this->element['source_class'];
+		$source_method    = empty($this->element['source_method']) ? '' : (string) $this->element['source_method'];
+		$source_key       = empty($this->element['source_key']) ? '*' : (string) $this->element['source_key'];
+		$source_value     = empty($this->element['source_value']) ? '*' : (string) $this->element['source_value'];
+		$source_translate = empty($this->element['source_translate']) ? 'true' : (string) $this->element['source_translate'];
+		$source_translate = in_array(strtolower($source_translate), array('true','yes','1','on')) ? true : false;
+		$source_format	  = empty($this->element['source_format']) ? '' : (string) $this->element['source_format'];
+
+		if ($source_class && $source_method)
+		{
+			// Maybe we have to load a file?
+			if (!empty($source_file))
+			{
+				$source_file = FOFTemplateUtils::parsePath($source_file, true);
+
+				if (FOFPlatform::getInstance()->getIntegrationObject('filesystem')->fileExists($source_file))
+				{
+					include_once $source_file;
+				}
+			}
+
+			// Make sure the class exists
+			if (class_exists($source_class, true))
+			{
+				// ...and so does the option
+				if (in_array($source_method, get_class_methods($source_class)))
+				{
+					// Get the data from the class
+					if ($source_format == 'optionsobject')
+					{
+						$options = array_merge($options, $source_class::$source_method());
+					}
+					else
+					{
+						// Get the data from the class
+						$source_data = $source_class::$source_method();
+
+						// Loop through the data and prime the $options array
+						foreach ($source_data as $k => $v)
+						{
+							$key = (empty($source_key) || ($source_key == '*')) ? $k : $v[$source_key];
+							$value = (empty($source_value) || ($source_value == '*')) ? $v : $v[$source_value];
+
+							if ($source_translate)
+							{
+								$value = JText::_($value);
+							}
+
+							$options[] = JHtml::_('select.option', $key, $value, 'value', 'text');
+						}
+					}
+				}
+			}
+		}
+
+		reset($options);
+
+		return $options;
+	}
+
+	/**
+	 * Replace string with tags that reference fields
+	 *
+	 * @param   string  $text  Text to process
+	 *
+	 * @return  string         Text with tags replace
+	 */
+	protected function parseFieldTags($text)
+	{
+		$ret = $text;
+
+		// Replace [ITEM:ID] in the URL with the item's key value (usually:
+		// the auto-incrementing numeric ID)
+		$keyfield = $this->item->getKeyName();
+		$replace  = $this->item->$keyfield;
+		$ret = str_replace('[ITEM:ID]', $replace, $ret);
+
+		// Replace the [ITEMID] in the URL with the current Itemid parameter
+		$ret = str_replace('[ITEMID]', JFactory::getApplication()->input->getInt('Itemid', 0), $ret);
+
+		// Replace other field variables in the URL
+		$fields = $this->item->getTableFields();
+
+		foreach ($fields as $fielddata)
+		{
+			$fieldname = $fielddata->Field;
+
+			if (empty($fieldname))
+			{
+				$fieldname = $fielddata->column_name;
+			}
+
+			$search    = '[ITEM:' . strtoupper($fieldname) . ']';
+			$replace   = $this->item->$fieldname;
+			$ret  = str_replace($search, $replace, $ret);
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/libraries/fof/form/field/media.php b/core/libraries/fof/form/field/media.php
new file mode 100644
index 00000000..6a26fcb0
--- /dev/null
+++ b/core/libraries/fof/form/field/media.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('media');
+
+/**
+ * Form Field class for the FOF framework
+ * Media selection field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldMedia extends JFormFieldMedia implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$imgattr = array(
+			'id' => $this->id
+		);
+
+		if ($this->element['class'])
+		{
+			$imgattr['class'] = (string) $this->element['class'];
+		}
+
+		if ($this->element['style'])
+		{
+			$imgattr['style'] = (string) $this->element['style'];
+		}
+
+		if ($this->element['width'])
+		{
+			$imgattr['width'] = (string) $this->element['width'];
+		}
+
+		if ($this->element['height'])
+		{
+			$imgattr['height'] = (string) $this->element['height'];
+		}
+
+		if ($this->element['align'])
+		{
+			$imgattr['align'] = (string) $this->element['align'];
+		}
+
+		if ($this->element['rel'])
+		{
+			$imgattr['rel'] = (string) $this->element['rel'];
+		}
+
+		if ($this->element['alt'])
+		{
+			$alt = JText::_((string) $this->element['alt']);
+		}
+		else
+		{
+			$alt = null;
+		}
+
+		if ($this->element['title'])
+		{
+			$imgattr['title'] = JText::_((string) $this->element['title']);
+		}
+
+		if ($this->value && file_exists(JPATH_ROOT . '/' . $this->value))
+		{
+			$src = FOFPlatform::getInstance()->URIroot() . $this->value;
+		}
+		else
+		{
+			$src = '';
+		}
+
+		return JHtml::_('image', $src, $alt, $imgattr);
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getStatic();
+	}
+}
diff --git a/core/libraries/fof/form/field/model.php b/core/libraries/fof/form/field/model.php
new file mode 100644
index 00000000..1c831b12
--- /dev/null
+++ b/core/libraries/fof/form/field/model.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for FOF
+ * Generic list from a model's results
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldModel extends FOFFormFieldList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class				= $this->id;
+		$format_string		= '';
+		$show_link			= false;
+		$link_url			= '';
+		$empty_replacement	= '';
+
+		// Get field parameters
+		if ($this->element['class'])
+		{
+			$class = (string) $this->element['class'];
+		}
+
+		if ($this->element['format'])
+		{
+			$format_string = (string) $this->element['format'];
+		}
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['url'])
+		{
+			$link_url = $this->element['url'];
+		}
+		else
+		{
+			$show_link = false;
+		}
+
+		if ($show_link && ($this->item instanceof FOFTable))
+		{
+			$link_url = $this->parseFieldTags($link_url);
+		}
+		else
+		{
+			$show_link = false;
+		}
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		$value = FOFFormFieldList::getOptionName($this->getOptions(), $this->value);
+
+		// Get the (optionally formatted) value
+		if (!empty($empty_replacement) && empty($value))
+		{
+			$value = JText::_($empty_replacement);
+		}
+
+		if (empty($format_string))
+		{
+			$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+		}
+		else
+		{
+			$value = sprintf($format_string, $value);
+		}
+
+		// Create the HTML
+		$html = '<span class="' . $class . '">';
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		$html .= $value;
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Initialize some field attributes.
+		$key = $this->element['key_field'] ? (string) $this->element['key_field'] : 'value';
+		$value = $this->element['value_field'] ? (string) $this->element['value_field'] : (string) $this->element['name'];
+		$translate = $this->element['translate'] ? (string) $this->element['translate'] : false;
+		$applyAccess = $this->element['apply_access'] ? (string) $this->element['apply_access'] : 'false';
+		$modelName = (string) $this->element['model'];
+		$nonePlaceholder = (string) $this->element['none'];
+
+		if (!empty($nonePlaceholder))
+		{
+			$options[] = JHtml::_('select.option', null, JText::_($nonePlaceholder));
+		}
+
+		// Process field atrtibutes
+		$applyAccess = strtolower($applyAccess);
+		$applyAccess = in_array($applyAccess, array('yes', 'on', 'true', '1'));
+
+		// Explode model name into model name and prefix
+		$parts = FOFInflector::explode($modelName);
+		$mName = ucfirst(array_pop($parts));
+		$mPrefix = FOFInflector::implode($parts);
+
+		// Get the model object
+		$config = array('savestate' => 0);
+		$model = FOFModel::getTmpInstance($mName, $mPrefix, $config);
+
+		if ($applyAccess)
+		{
+			$model->applyAccessFiltering();
+		}
+
+		// Process state variables
+		foreach ($this->element->children() as $stateoption)
+		{
+			// Only add <option /> elements.
+			if ($stateoption->getName() != 'state')
+			{
+				continue;
+			}
+
+			$stateKey = (string) $stateoption['key'];
+			$stateValue = (string) $stateoption;
+
+			$model->setState($stateKey, $stateValue);
+		}
+
+		// Set the query and get the result list.
+		$items = $model->getItemList(true);
+
+		// Build the field options.
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				if ($translate == true)
+				{
+					$options[] = JHtml::_('select.option', $item->$key, JText::_($item->$value));
+				}
+				else
+				{
+					$options[] = JHtml::_('select.option', $item->$key, $item->$value);
+				}
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+
+	/**
+	 * Replace string with tags that reference fields
+	 *
+	 * @param   string  $text  Text to process
+	 *
+	 * @return  string         Text with tags replace
+	 */
+	protected function parseFieldTags($text)
+	{
+		$ret = $text;
+
+		// Replace [ITEM:ID] in the URL with the item's key value (usually:
+		// the auto-incrementing numeric ID)
+		$keyfield = $this->item->getKeyName();
+		$replace  = $this->item->$keyfield;
+		$ret = str_replace('[ITEM:ID]', $replace, $ret);
+
+		// Replace the [ITEMID] in the URL with the current Itemid parameter
+		$ret = str_replace('[ITEMID]', JFactory::getApplication()->input->getInt('Itemid', 0), $ret);
+
+		// Replace other field variables in the URL
+		$fields = $this->item->getTableFields();
+
+		foreach ($fields as $fielddata)
+		{
+			$fieldname = $fielddata->Field;
+
+			if (empty($fieldname))
+			{
+				$fieldname = $fielddata->column_name;
+			}
+
+			$search    = '[ITEM:' . strtoupper($fieldname) . ']';
+			$replace   = $this->item->$fieldname;
+			$ret  = str_replace($search, $replace, $ret);
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/libraries/fof/form/field/ordering.php b/core/libraries/fof/form/field/ordering.php
new file mode 100644
index 00000000..45ae1b6e
--- /dev/null
+++ b/core/libraries/fof/form/field/ordering.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Form Field class for FOF
+ * Renders the row ordering interface checkbox in browse views
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldOrdering extends JFormField implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Method to get the field input markup for this field type.
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field input markup.
+	 */
+	protected function getInput()
+	{
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= $this->disabled ? ' disabled' : '';
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+
+		// Initialize JavaScript field attributes.
+		$attr .= !empty($this->onchange) ? ' onchange="' . $this->onchange . '"' : '';
+
+		$this->item = $this->form->getModel()->getItem();
+
+		$keyfield = $this->item->getKeyName();
+		$itemId   = $this->item->$keyfield;
+
+		$query = $this->getQuery();
+
+		// Create a read-only list (no name) with a hidden input to store the value.
+		if ($this->readonly)
+		{
+			$html[] = JHtml::_('list.ordering', '', $query, trim($attr), $this->value, $itemId ? 0 : 1);
+			$html[] = '<input type="hidden" name="' . $this->name . '" value="' . $this->value . '"/>';
+		}
+		else
+		{
+			// Create a regular list.
+			$html[] = JHtml::_('list.ordering', $this->name, $query, trim($attr), $this->value, $itemId ? 0 : 1);
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		throw new Exception(__CLASS__ . ' cannot be used in single item display forms');
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		if (!($this->item instanceof FOFTable))
+		{
+			throw new Exception(__CLASS__ . ' needs a FOFTable to act upon');
+		}
+
+		$class = isset($this->element['class']) ? $this->element['class'] : 'input-mini';
+		$icon  = isset($this->element['icon']) ? $this->element['icon'] : 'icon-menu';
+
+		$html = '';
+
+		$view = $this->form->getView();
+
+		$ordering = $view->getLists()->order == 'ordering';
+
+		if (!$view->hasAjaxOrderingSupport())
+		{
+			// Ye olde Joomla! 2.5 method
+			$disabled = $ordering ? '' : 'disabled="disabled"';
+			$html .= '<span>';
+			$html .= $view->pagination->orderUpIcon($this->rowid, true, 'orderup', 'Move Up', $ordering);
+			$html .= '</span><span>';
+			$html .= $view->pagination->orderDownIcon($this->rowid, $view->pagination->total, true, 'orderdown', 'Move Down', $ordering);
+			$html .= '</span>';
+			$html .= '<input type="text" name="order[]" size="5" value="' . $this->value . '" ' . $disabled;
+			$html .= 'class="text-area-order" style="text-align: center" />';
+		}
+		else
+		{
+			// The modern drag'n'drop method
+			if ($view->getPerms()->editstate)
+			{
+				$disableClassName = '';
+				$disabledLabel = '';
+
+				$hasAjaxOrderingSupport = $view->hasAjaxOrderingSupport();
+
+				if (!$hasAjaxOrderingSupport['saveOrder'])
+				{
+					$disabledLabel = JText::_('JORDERINGDISABLED');
+					$disableClassName = 'inactive tip-top';
+				}
+
+				$orderClass = $ordering ? 'order-enabled' : 'order-disabled';
+
+				$html .= '<div class="' . $orderClass . '">';
+				$html .= '<span class="sortable-handler ' . $disableClassName . '" title="' . $disabledLabel . '" rel="tooltip">';
+				$html .= '<i class="' . $icon . '"></i>';
+				$html .= '</span>';
+
+				if ($ordering)
+				{
+					$html .= '<input type="text" name="order[]" size="5" class="' . $class . ' text-area-order" value="' . $this->value . '" />';
+				}
+
+				$html .= '</div>';
+			}
+			else
+			{
+				$html .= '<span class="sortable-handler inactive" >';
+				$html .= '<i class="' . $icon . '"></i>';
+				$html .= '</span>';
+			}
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Builds the query for the ordering list.
+	 *
+	 * @since 2.3.2
+	 *
+	 * @return FOFDatabaseQuery  The query for the ordering form field
+	 */
+	protected function getQuery()
+	{
+		$ordering = $this->name;
+		$title    = $this->element['ordertitle'] ? (string) $this->element['ordertitle'] : $this->item->getColumnAlias('title');
+
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+		$query->select(array($db->quoteName($ordering, 'value'), $db->quoteName($title, 'text')))
+				->from($db->quoteName($this->item->getTableName()))
+				->order($ordering);
+
+		return $query;
+	}
+}
diff --git a/core/libraries/fof/form/field/password.php b/core/libraries/fof/form/field/password.php
new file mode 100644
index 00000000..43dc9de9
--- /dev/null
+++ b/core/libraries/fof/form/field/password.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('password');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a one line text field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldPassword extends JFormFieldPassword implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/plugins.php b/core/libraries/fof/form/field/plugins.php
new file mode 100644
index 00000000..ed0fc5a5
--- /dev/null
+++ b/core/libraries/fof/form/field/plugins.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('plugins');
+
+/**
+ * Form Field class for FOF
+ * Plugins installed on the site
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldPlugins extends JFormFieldPlugins implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/published.php b/core/libraries/fof/form/field/published.php
new file mode 100644
index 00000000..ceea5439
--- /dev/null
+++ b/core/libraries/fof/form/field/published.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for FOF
+ * Supports a generic list of options.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldPublished extends JFormFieldList implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @since 2.0
+	 *
+	 * @return  array  The field option objects.
+	 */
+	protected function getOptions()
+	{
+		$options = parent::getOptions();
+
+		if (!empty($options))
+		{
+			return $options;
+		}
+
+		// If no custom options were defined let's figure out which ones of the
+		// defaults we shall use...
+
+		$config = array(
+			'published'		 => 1,
+			'unpublished'	 => 1,
+			'archived'		 => 0,
+			'trash'			 => 0,
+			'all'			 => 0,
+		);
+
+		$configMap = array(
+			'show_published'	=> array('published', 1),
+			'show_unpublished'	=> array('unpublished', 1),
+			'show_archived'		=> array('archived', 0),
+			'show_trash'		=> array('trash', 0),
+			'show_all'			=> array('all', 0),
+		);
+
+		foreach ($configMap as $attribute => $preferences)
+		{
+			list($configKey, $default) = $preferences;
+
+			switch (strtolower($this->element[$attribute]))
+			{
+				case 'true':
+				case '1':
+				case 'yes':
+					$config[$configKey] = true;
+
+				case 'false':
+				case '0':
+				case 'no':
+					$config[$configKey] = false;
+
+				default:
+					$config[$configKey] = $default;
+			}
+		}
+
+		if ($config['published'])
+		{
+			$stack[] = JHtml::_('select.option', '1', JText::_('JPUBLISHED'));
+		}
+
+		if ($config['unpublished'])
+		{
+			$stack[] = JHtml::_('select.option', '0', JText::_('JUNPUBLISHED'));
+		}
+
+		if ($config['archived'])
+		{
+			$stack[] = JHtml::_('select.option', '2', JText::_('JARCHIVED'));
+		}
+
+		if ($config['trash'])
+		{
+			$stack[] = JHtml::_('select.option', '-2', JText::_('JTRASHED'));
+		}
+
+		if ($config['all'])
+		{
+			$stack[] = JHtml::_('select.option', '*', JText::_('JALL'));
+		}
+
+		return $stack;
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		if (!($this->item instanceof FOFTable))
+		{
+			throw new Exception(__CLASS__ . ' needs a FOFTable to act upon');
+		}
+
+		// Initialise
+		$prefix = '';
+		$checkbox = 'cb';
+		$publish_up = null;
+		$publish_down = null;
+		$enabled = true;
+
+		// Get options
+		if ($this->element['prefix'])
+		{
+			$prefix = (string) $this->element['prefix'];
+		}
+
+		if ($this->element['checkbox'])
+		{
+			$checkbox = (string) $this->element['checkbox'];
+		}
+
+		if ($this->element['publish_up'])
+		{
+			$publish_up = (string) $this->element['publish_up'];
+		}
+
+		if ($this->element['publish_down'])
+		{
+			$publish_down = (string) $this->element['publish_down'];
+		}
+
+		// @todo Enforce ACL checks to determine if the field should be enabled or not
+		// Get the HTML
+		return JHTML::_('jgrid.published', $this->value, $this->rowid, $prefix, $enabled, $checkbox, $publish_up, $publish_down);
+	}
+}
diff --git a/core/libraries/fof/form/field/radio.php b/core/libraries/fof/form/field/radio.php
new file mode 100644
index 00000000..c636bc30
--- /dev/null
+++ b/core/libraries/fof/form/field/radio.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('radio');
+
+/**
+ * Form Field class for FOF
+ * Radio selection list
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldRadio extends JFormFieldRadio implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/relation.php b/core/libraries/fof/form/field/relation.php
new file mode 100644
index 00000000..70f0efed
--- /dev/null
+++ b/core/libraries/fof/form/field/relation.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Form Field class for FOF
+ * Relation list
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldRelation extends FOFFormFieldList
+{
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic() {
+		return $this->getRepeatable();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class         = $this->element['class'] ? (string) $this->element['class'] : $this->id;
+		$relationclass = $this->element['relationclass'] ? (string) $this->element['relationclass'] : '';
+		$value_field   = $this->element['value_field'] ? (string) $this->element['value_field'] : 'title';
+		$translate     = $this->element['translate'] ? (string) $this->element['translate'] : false;
+		$link_url      = $this->element['url'] ? (string) $this->element['url'] : false;
+
+		if (!($link_url && $this->item instanceof FOFTable))
+		{
+			$link_url = false;
+		}
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		$relationName = FOFInflector::pluralize($this->name);
+		$relations    = $this->item->getRelations()->getMultiple($relationName);
+
+		foreach ($relations as $relation) {
+
+			$html = '<span class="' . $relationclass . '">';
+
+			if ($link_url)
+			{
+				$keyfield = $relation->getKeyName();
+				$this->_relationId =  $relation->$keyfield;
+
+				$url = $this->parseFieldTags($link_url);
+				$html .= '<a href="' . $url . '">';
+			}
+
+			$value = $relation->get($relation->getColumnAlias($value_field));
+
+			// Get the (optionally formatted) value
+			if (!empty($empty_replacement) && empty($value))
+			{
+				$value = JText::_($empty_replacement);
+			}
+
+			if ($translate == true)
+			{
+				$html .= JText::_($value);
+			}
+			else
+			{
+				$html .= $value;
+			}
+
+			if ($link_url)
+			{
+				$html .= '</a>';
+			}
+
+			$html .= '</span>';
+
+			$rels[] = $html;
+		}
+
+		$html = '<span class="' . $class . '">';
+		$html .= implode(', ', $rels);
+		$html .= '</span>';
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 */
+	protected function getOptions()
+	{
+		$options     = array();
+		$this->value = array();
+
+		$value_field = $this->element['value_field'] ? (string) $this->element['value_field'] : 'title';
+
+		$input     = new FOFInput;
+		$component = ucfirst(str_replace('com_', '', $input->getString('option')));
+		$view      = ucfirst($input->getString('view'));
+		$relation  = FOFInflector::pluralize((string) $this->element['name']);
+
+		$model = FOFModel::getTmpInstance(ucfirst($relation), $component . 'Model');
+		$table = $model->getTable();
+
+		$key   = $table->getKeyName();
+		$value = $table->getColumnAlias($value_field);
+
+		foreach ($model->getItemList(true) as $option)
+		{
+			$options[] = JHtml::_('select.option', $option->$key, $option->$value);
+		}
+
+		if ($id = FOFModel::getAnInstance($view)->getId())
+		{
+			$table = FOFTable::getInstance($view, $component . 'Table');
+			$table->load($id);
+
+			$relations = $table->getRelations()->getMultiple($relation);
+
+			foreach ($relations as $item)
+			{
+				$this->value[] = $item->getId();
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Replace string with tags that reference fields
+	 *
+	 * @param   string  $text  Text to process
+	 *
+	 * @return  string         Text with tags replace
+	 */
+	protected function parseFieldTags($text)
+	{
+		$ret = $text;
+
+		// Replace [ITEM:ID] in the URL with the item's key value (usually:
+		// the auto-incrementing numeric ID)
+		$keyfield = $this->item->getKeyName();
+		$replace  = $this->item->$keyfield;
+		$ret = str_replace('[ITEM:ID]', $replace, $ret);
+
+		// Replace the [ITEMID] in the URL with the current Itemid parameter
+		$ret = str_replace('[ITEMID]', JFactory::getApplication()->input->getInt('Itemid', 0), $ret);
+
+		// Replace the [RELATION:ID] in the URL with the relation's key value
+		$ret = str_replace('[RELATION:ID]', $this->_relationId, $ret);
+
+		// Replace other field variables in the URL
+		$fields = $this->item->getTableFields();
+
+		foreach ($fields as $fielddata)
+		{
+			$fieldname = $fielddata->Field;
+
+			if (empty($fieldname))
+			{
+				$fieldname = $fielddata->column_name;
+			}
+
+			$search    = '[ITEM:' . strtoupper($fieldname) . ']';
+			$replace   = $this->item->$fieldname;
+			$ret  = str_replace($search, $replace, $ret);
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/libraries/fof/form/field/rules.php b/core/libraries/fof/form/field/rules.php
new file mode 100644
index 00000000..8cc324ba
--- /dev/null
+++ b/core/libraries/fof/form/field/rules.php
@@ -0,0 +1,630 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('rules');
+
+/**
+ * Form Field class for FOF
+ * Joomla! ACL Rules
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFFormFieldRules extends JFormFieldRules implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			// This field cannot provide a static display
+			case 'static':
+				return '';
+				break;
+
+			// This field cannot provide a repeateable display
+			case 'repeatable':
+				return '';
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return '';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.1
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return '';
+	}
+
+    /**
+	 * At the timing of this writing (2013-12-03), the Joomla "rules" field is buggy. When you are
+	 * dealing with a new record it gets the default permissions from the root asset node, which
+	 * is fine for the default permissions of Joomla articles, but unsuitable for third party software.
+	 * We had to copy & paste the whole code, since we can't "inject" the correct asset id if one is
+	 * not found. Our fixes are surrounded by `FOF Library fix` remarks.
+     *
+     * @return  string  The input field's HTML for this field type
+     */
+    public function getInput()
+    {
+        if (version_compare(JVERSION, '3.0', 'ge'))
+        {
+            return $this->getInput3x();
+        }
+        else
+        {
+            return $this->getInput25();
+        }
+    }
+
+    protected function getInput25()
+    {
+        JHtml::_('behavior.tooltip');
+
+        // Initialise some field attributes.
+        $section = $this->element['section'] ? (string) $this->element['section'] : '';
+        $component = $this->element['component'] ? (string) $this->element['component'] : '';
+        $assetField = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
+
+        // Get the actions for the asset.
+        $actions = JAccess::getActions($component, $section);
+
+        // Iterate over the children and add to the actions.
+        foreach ($this->element->children() as $el)
+        {
+            if ($el->getName() == 'action')
+            {
+                $actions[] = (object) array('name' => (string) $el['name'], 'title' => (string) $el['title'],
+                    'description' => (string) $el['description']);
+            }
+        }
+
+        // Get the explicit rules for this asset.
+        if ($section == 'component')
+        {
+            // Need to find the asset id by the name of the component.
+            $db    = FOFPlatform::getInstance()->getDbo();
+            $query = $db->getQuery(true);
+            $query->select($db->quoteName('id'));
+            $query->from($db->quoteName('#__assets'));
+            $query->where($db->quoteName('name') . ' = ' . $db->quote($component));
+            $db->setQuery($query);
+            $assetId = (int) $db->loadResult();
+
+            if ($error = $db->getErrorMsg())
+            {
+                JError::raiseNotice(500, $error);
+            }
+        }
+        else
+        {
+            // Find the asset id of the content.
+            // Note that for global configuration, com_config injects asset_id = 1 into the form.
+            $assetId = $this->form->getValue($assetField);
+
+            // ==== FOF Library fix - Start ====
+            // If there is no assetId (let's say we are dealing with a new record), let's ask the table
+            // to give it to us. Here you should implement your logic (ie getting default permissions from
+            // the component or from the category)
+            if(!$assetId)
+            {
+                $table   = $this->form->getModel()->getTable();
+                $assetId = $table->getAssetParentId();
+            }
+            // ==== FOF Library fix - End   ====
+        }
+
+        // Use the compact form for the content rules (deprecated).
+        //if (!empty($component) && $section != 'component') {
+        //	return JHtml::_('rules.assetFormWidget', $actions, $assetId, $assetId ? null : $component, $this->name, $this->id);
+        //}
+
+        // Full width format.
+
+        // Get the rules for just this asset (non-recursive).
+        $assetRules = JAccess::getAssetRules($assetId);
+
+        // Get the available user groups.
+        $groups = $this->getUserGroups();
+
+        // Build the form control.
+        $curLevel = 0;
+
+        // Prepare output
+        $html = array();
+        $html[] = '<div id="permissions-sliders" class="pane-sliders">';
+        $html[] = '<p class="rule-desc">' . JText::_('JLIB_RULES_SETTINGS_DESC') . '</p>';
+        $html[] = '<ul id="rules">';
+
+        // Start a row for each user group.
+        foreach ($groups as $group)
+        {
+            $difLevel = $group->level - $curLevel;
+
+            if ($difLevel > 0)
+            {
+                $html[] = '<li><ul>';
+            }
+            elseif ($difLevel < 0)
+            {
+                $html[] = str_repeat('</ul></li>', -$difLevel);
+            }
+
+            $html[] = '<li>';
+
+            $html[] = '<div class="panel">';
+            $html[] = '<h3 class="pane-toggler title"><a href="javascript:void(0);"><span>';
+            $html[] = str_repeat('<span class="level">|&ndash;</span> ', $curLevel = $group->level) . $group->text;
+            $html[] = '</span></a></h3>';
+            $html[] = '<div class="pane-slider content pane-hide">';
+            $html[] = '<div class="mypanel">';
+            $html[] = '<table class="group-rules">';
+            $html[] = '<thead>';
+            $html[] = '<tr>';
+
+            $html[] = '<th class="actions" id="actions-th' . $group->value . '">';
+            $html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_ACTION') . '</span>';
+            $html[] = '</th>';
+
+            $html[] = '<th class="settings" id="settings-th' . $group->value . '">';
+            $html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_SELECT_SETTING') . '</span>';
+            $html[] = '</th>';
+
+            // The calculated setting is not shown for the root group of global configuration.
+            $canCalculateSettings = ($group->parent_id || !empty($component));
+            if ($canCalculateSettings)
+            {
+                $html[] = '<th id="aclactionth' . $group->value . '">';
+                $html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_CALCULATED_SETTING') . '</span>';
+                $html[] = '</th>';
+            }
+
+            $html[] = '</tr>';
+            $html[] = '</thead>';
+            $html[] = '<tbody>';
+
+            foreach ($actions as $action)
+            {
+                $html[] = '<tr>';
+                $html[] = '<td headers="actions-th' . $group->value . '">';
+                $html[] = '<label class="hasTip" for="' . $this->id . '_' . $action->name . '_' . $group->value . '" title="'
+                    . htmlspecialchars(JText::_($action->title) . '::' . JText::_($action->description), ENT_COMPAT, 'UTF-8') . '">';
+                $html[] = JText::_($action->title);
+                $html[] = '</label>';
+                $html[] = '</td>';
+
+                $html[] = '<td headers="settings-th' . $group->value . '">';
+
+                $html[] = '<select name="' . $this->name . '[' . $action->name . '][' . $group->value . ']" id="' . $this->id . '_' . $action->name
+                    . '_' . $group->value . '" title="'
+                    . JText::sprintf('JLIB_RULES_SELECT_ALLOW_DENY_GROUP', JText::_($action->title), trim($group->text)) . '">';
+
+                $inheritedRule = JAccess::checkGroup($group->value, $action->name, $assetId);
+
+                // Get the actual setting for the action for this group.
+                $assetRule = $assetRules->allow($action->name, $group->value);
+
+                // Build the dropdowns for the permissions sliders
+
+                // The parent group has "Not Set", all children can rightly "Inherit" from that.
+                $html[] = '<option value=""' . ($assetRule === null ? ' selected="selected"' : '') . '>'
+                    . JText::_(empty($group->parent_id) && empty($component) ? 'JLIB_RULES_NOT_SET' : 'JLIB_RULES_INHERITED') . '</option>';
+                $html[] = '<option value="1"' . ($assetRule === true ? ' selected="selected"' : '') . '>' . JText::_('JLIB_RULES_ALLOWED')
+                    . '</option>';
+                $html[] = '<option value="0"' . ($assetRule === false ? ' selected="selected"' : '') . '>' . JText::_('JLIB_RULES_DENIED')
+                    . '</option>';
+
+                $html[] = '</select>&#160; ';
+
+                // If this asset's rule is allowed, but the inherited rule is deny, we have a conflict.
+                if (($assetRule === true) && ($inheritedRule === false))
+                {
+                    $html[] = JText::_('JLIB_RULES_CONFLICT');
+                }
+
+                $html[] = '</td>';
+
+                // Build the Calculated Settings column.
+                // The inherited settings column is not displayed for the root group in global configuration.
+                if ($canCalculateSettings)
+                {
+                    $html[] = '<td headers="aclactionth' . $group->value . '">';
+
+                    // This is where we show the current effective settings considering currrent group, path and cascade.
+                    // Check whether this is a component or global. Change the text slightly.
+
+                    if (JAccess::checkGroup($group->value, 'core.admin', $assetId) !== true)
+                    {
+                        if ($inheritedRule === null)
+                        {
+                            $html[] = '<span class="icon-16-unset">' . JText::_('JLIB_RULES_NOT_ALLOWED') . '</span>';
+                        }
+                        elseif ($inheritedRule === true)
+                        {
+                            $html[] = '<span class="icon-16-allowed">' . JText::_('JLIB_RULES_ALLOWED') . '</span>';
+                        }
+                        elseif ($inheritedRule === false)
+                        {
+                            if ($assetRule === false)
+                            {
+                                $html[] = '<span class="icon-16-denied">' . JText::_('JLIB_RULES_NOT_ALLOWED') . '</span>';
+                            }
+                            else
+                            {
+                                $html[] = '<span class="icon-16-denied"><span class="icon-16-locked">' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED')
+                                    . '</span></span>';
+                            }
+                        }
+                    }
+                    elseif (!empty($component))
+                    {
+                        $html[] = '<span class="icon-16-allowed"><span class="icon-16-locked">' . JText::_('JLIB_RULES_ALLOWED_ADMIN')
+                            . '</span></span>';
+                    }
+                    else
+                    {
+                        // Special handling for  groups that have global admin because they can't  be denied.
+                        // The admin rights can be changed.
+                        if ($action->name === 'core.admin')
+                        {
+                            $html[] = '<span class="icon-16-allowed">' . JText::_('JLIB_RULES_ALLOWED') . '</span>';
+                        }
+                        elseif ($inheritedRule === false)
+                        {
+                            // Other actions cannot be changed.
+                            $html[] = '<span class="icon-16-denied"><span class="icon-16-locked">'
+                                . JText::_('JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT') . '</span></span>';
+                        }
+                        else
+                        {
+                            $html[] = '<span class="icon-16-allowed"><span class="icon-16-locked">' . JText::_('JLIB_RULES_ALLOWED_ADMIN')
+                                . '</span></span>';
+                        }
+                    }
+
+                    $html[] = '</td>';
+                }
+
+                $html[] = '</tr>';
+            }
+
+            $html[] = '</tbody>';
+            $html[] = '</table></div>';
+
+            $html[] = '</div></div>';
+            $html[] = '</li>';
+
+        }
+
+        $html[] = str_repeat('</ul></li>', $curLevel);
+        $html[] = '</ul><div class="rule-notes">';
+        if ($section == 'component' || $section == null)
+        {
+            $html[] = JText::_('JLIB_RULES_SETTING_NOTES');
+        }
+        else
+        {
+            $html[] = JText::_('JLIB_RULES_SETTING_NOTES_ITEM');
+        }
+        $html[] = '</div></div>';
+
+        $js = "window.addEvent('domready', function(){ new Fx.Accordion($$('div#permissions-sliders.pane-sliders .panel h3.pane-toggler'),"
+            . "$$('div#permissions-sliders.pane-sliders .panel div.pane-slider'), {onActive: function(toggler, i) {toggler.addClass('pane-toggler-down');"
+            . "toggler.removeClass('pane-toggler');i.addClass('pane-down');i.removeClass('pane-hide');Cookie.write('jpanesliders_permissions-sliders"
+            . $component
+            . "',$$('div#permissions-sliders.pane-sliders .panel h3').indexOf(toggler));},"
+            . "onBackground: function(toggler, i) {toggler.addClass('pane-toggler');toggler.removeClass('pane-toggler-down');i.addClass('pane-hide');"
+            . "i.removeClass('pane-down');}, duration: 300, display: "
+            . JRequest::getInt('jpanesliders_permissions-sliders' . $component, 0, 'cookie') . ", show: "
+            . JRequest::getInt('jpanesliders_permissions-sliders' . $component, 0, 'cookie') . ", alwaysHide:true, opacity: false}); });";
+
+        JFactory::getDocument()->addScriptDeclaration($js);
+
+        return implode("\n", $html);
+    }
+
+    protected function getInput3x()
+    {
+        JHtml::_('bootstrap.tooltip');
+
+        // Initialise some field attributes.
+        $section    = $this->section;
+        $component  = $this->component;
+        $assetField = $this->assetField;
+
+        // Get the actions for the asset.
+        $actions = JAccess::getActions($component, $section);
+
+        // Iterate over the children and add to the actions.
+        foreach ($this->element->children() as $el)
+        {
+            if ($el->getName() == 'action')
+            {
+                $actions[] = (object) array('name' => (string) $el['name'], 'title' => (string) $el['title'],
+                    'description' => (string) $el['description']);
+            }
+        }
+
+        // Get the explicit rules for this asset.
+        if ($section == 'component')
+        {
+            // Need to find the asset id by the name of the component.
+            $db    = FOFPlatform::getInstance()->getDbo();
+            $query = $db->getQuery(true)
+                        ->select($db->quoteName('id'))
+                        ->from($db->quoteName('#__assets'))
+                        ->where($db->quoteName('name') . ' = ' . $db->quote($component));
+
+            $assetId = (int) $db->setQuery($query)->loadResult();
+        }
+        else
+        {
+            // Find the asset id of the content.
+            // Note that for global configuration, com_config injects asset_id = 1 into the form.
+            $assetId = $this->form->getValue($assetField);
+
+            // ==== FOF Library fix - Start ====
+            // If there is no assetId (let's say we are dealing with a new record), let's ask the table
+            // to give it to us. Here you should implement your logic (ie getting default permissions from
+            // the component or from the category)
+            if(!$assetId)
+            {
+                $table   = $this->form->getModel()->getTable();
+                $assetId = $table->getAssetParentId();
+            }
+            // ==== FOF Library fix - End   ====
+        }
+
+        // Full width format.
+
+        // Get the rules for just this asset (non-recursive).
+        $assetRules = JAccess::getAssetRules($assetId);
+
+        // Get the available user groups.
+        $groups = $this->getUserGroups();
+
+        // Prepare output
+        $html = array();
+
+        // Description
+        $html[] = '<p class="rule-desc">' . JText::_('JLIB_RULES_SETTINGS_DESC') . '</p>';
+
+        // Begin tabs
+        $html[] = '<div id="permissions-sliders" class="tabbable tabs-left">';
+
+        // Building tab nav
+        $html[] = '<ul class="nav nav-tabs">';
+
+        foreach ($groups as $group)
+        {
+            // Initial Active Tab
+            $active = "";
+
+            if ($group->value == 1)
+            {
+                $active = "active";
+            }
+
+            $html[] = '<li class="' . $active . '">';
+            $html[] = '<a href="#permission-' . $group->value . '" data-toggle="tab">';
+            $html[] = str_repeat('<span class="level">&ndash;</span> ', $curLevel = $group->level) . $group->text;
+            $html[] = '</a>';
+            $html[] = '</li>';
+        }
+
+        $html[] = '</ul>';
+
+        $html[] = '<div class="tab-content">';
+
+        // Start a row for each user group.
+        foreach ($groups as $group)
+        {
+            // Initial Active Pane
+            $active = "";
+
+            if ($group->value == 1)
+            {
+                $active = " active";
+            }
+
+            $html[] = '<div class="tab-pane' . $active . '" id="permission-' . $group->value . '">';
+            $html[] = '<table class="table table-striped">';
+            $html[] = '<thead>';
+            $html[] = '<tr>';
+
+            $html[] = '<th class="actions" id="actions-th' . $group->value . '">';
+            $html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_ACTION') . '</span>';
+            $html[] = '</th>';
+
+            $html[] = '<th class="settings" id="settings-th' . $group->value . '">';
+            $html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_SELECT_SETTING') . '</span>';
+            $html[] = '</th>';
+
+            // The calculated setting is not shown for the root group of global configuration.
+            $canCalculateSettings = ($group->parent_id || !empty($component));
+
+            if ($canCalculateSettings)
+            {
+                $html[] = '<th id="aclactionth' . $group->value . '">';
+                $html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_CALCULATED_SETTING') . '</span>';
+                $html[] = '</th>';
+            }
+
+            $html[] = '</tr>';
+            $html[] = '</thead>';
+            $html[] = '<tbody>';
+
+            foreach ($actions as $action)
+            {
+                $html[] = '<tr>';
+                $html[] = '<td headers="actions-th' . $group->value . '">';
+                $html[] = '<label for="' . $this->id . '_' . $action->name . '_' . $group->value . '" class="hasTooltip" title="'
+                    . htmlspecialchars(JText::_($action->title) . ' ' . JText::_($action->description), ENT_COMPAT, 'UTF-8') . '">';
+                $html[] = JText::_($action->title);
+                $html[] = '</label>';
+                $html[] = '</td>';
+
+                $html[] = '<td headers="settings-th' . $group->value . '">';
+
+                $html[] = '<select class="input-small" name="' . $this->name . '[' . $action->name . '][' . $group->value . ']" id="' . $this->id . '_' . $action->name
+                    . '_' . $group->value . '" title="'
+                    . JText::sprintf('JLIB_RULES_SELECT_ALLOW_DENY_GROUP', JText::_($action->title), trim($group->text)) . '">';
+
+                $inheritedRule = JAccess::checkGroup($group->value, $action->name, $assetId);
+
+                // Get the actual setting for the action for this group.
+                $assetRule = $assetRules->allow($action->name, $group->value);
+
+                // Build the dropdowns for the permissions sliders
+
+                // The parent group has "Not Set", all children can rightly "Inherit" from that.
+                $html[] = '<option value=""' . ($assetRule === null ? ' selected="selected"' : '') . '>'
+                    . JText::_(empty($group->parent_id) && empty($component) ? 'JLIB_RULES_NOT_SET' : 'JLIB_RULES_INHERITED') . '</option>';
+                $html[] = '<option value="1"' . ($assetRule === true ? ' selected="selected"' : '') . '>' . JText::_('JLIB_RULES_ALLOWED')
+                    . '</option>';
+                $html[] = '<option value="0"' . ($assetRule === false ? ' selected="selected"' : '') . '>' . JText::_('JLIB_RULES_DENIED')
+                    . '</option>';
+
+                $html[] = '</select>&#160; ';
+
+                // If this asset's rule is allowed, but the inherited rule is deny, we have a conflict.
+                if (($assetRule === true) && ($inheritedRule === false))
+                {
+                    $html[] = JText::_('JLIB_RULES_CONFLICT');
+                }
+
+                $html[] = '</td>';
+
+                // Build the Calculated Settings column.
+                // The inherited settings column is not displayed for the root group in global configuration.
+                if ($canCalculateSettings)
+                {
+                    $html[] = '<td headers="aclactionth' . $group->value . '">';
+
+                    // This is where we show the current effective settings considering currrent group, path and cascade.
+                    // Check whether this is a component or global. Change the text slightly.
+
+                    if (JAccess::checkGroup($group->value, 'core.admin', $assetId) !== true)
+                    {
+                        if ($inheritedRule === null)
+                        {
+                            $html[] = '<span class="label label-important">' . JText::_('JLIB_RULES_NOT_ALLOWED') . '</span>';
+                        }
+                        elseif ($inheritedRule === true)
+                        {
+                            $html[] = '<span class="label label-success">' . JText::_('JLIB_RULES_ALLOWED') . '</span>';
+                        }
+                        elseif ($inheritedRule === false)
+                        {
+                            if ($assetRule === false)
+                            {
+                                $html[] = '<span class="label label-important">' . JText::_('JLIB_RULES_NOT_ALLOWED') . '</span>';
+                            }
+                            else
+                            {
+                                $html[] = '<span class="label"><i class="icon-lock icon-white"></i> ' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED')
+                                    . '</span>';
+                            }
+                        }
+                    }
+                    elseif (!empty($component))
+                    {
+                        $html[] = '<span class="label label-success"><i class="icon-lock icon-white"></i> ' . JText::_('JLIB_RULES_ALLOWED_ADMIN')
+                            . '</span>';
+                    }
+                    else
+                    {
+                        // Special handling for  groups that have global admin because they can't  be denied.
+                        // The admin rights can be changed.
+                        if ($action->name === 'core.admin')
+                        {
+                            $html[] = '<span class="label label-success">' . JText::_('JLIB_RULES_ALLOWED') . '</span>';
+                        }
+                        elseif ($inheritedRule === false)
+                        {
+                            // Other actions cannot be changed.
+                            $html[] = '<span class="label label-important"><i class="icon-lock icon-white"></i> '
+                                . JText::_('JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT') . '</span>';
+                        }
+                        else
+                        {
+                            $html[] = '<span class="label label-success"><i class="icon-lock icon-white"></i> ' . JText::_('JLIB_RULES_ALLOWED_ADMIN')
+                                . '</span>';
+                        }
+                    }
+
+                    $html[] = '</td>';
+                }
+
+                $html[] = '</tr>';
+            }
+
+            $html[] = '</tbody>';
+            $html[] = '</table></div>';
+        }
+
+        $html[] = '</div></div>';
+
+        $html[] = '<div class="alert">';
+
+        if ($section == 'component' || $section == null)
+        {
+            $html[] = JText::_('JLIB_RULES_SETTING_NOTES');
+        }
+        else
+        {
+            $html[] = JText::_('JLIB_RULES_SETTING_NOTES_ITEM');
+        }
+
+        $html[] = '</div>';
+
+        return implode("\n", $html);
+    }
+}
diff --git a/core/libraries/fof/form/field/selectrow.php b/core/libraries/fof/form/field/selectrow.php
new file mode 100644
index 00000000..eec7cea8
--- /dev/null
+++ b/core/libraries/fof/form/field/selectrow.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Form Field class for FOF
+ * Renders the checkbox in browse views which allows you to select rows
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldSelectrow extends JFormField implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Method to get the field input markup for this field type.
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field input markup.
+	 */
+	protected function getInput()
+	{
+		throw new Exception(__CLASS__ . ' cannot be used in input forms');
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		throw new Exception(__CLASS__ . ' cannot be used in single item display forms');
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		if (!($this->item instanceof FOFTable))
+		{
+			throw new Exception(__CLASS__ . ' needs a FOFTable to act upon');
+		}
+
+		// Is this record checked out?
+		$checked_out     = false;
+		$locked_by_field = $this->item->getColumnAlias('locked_by');
+		$myId            = JFactory::getUser()->get('id', 0);
+
+		if (property_exists($this->item, $locked_by_field))
+		{
+			$locked_by   = $this->item->$locked_by_field;
+			$checked_out = ($locked_by != 0 && $locked_by != $myId);
+		}
+
+		// Get the key id for this record
+		$key_field = $this->item->getKeyName();
+		$key_id    = $this->item->$key_field;
+
+		// Get the HTML
+		return JHTML::_('grid.id', $this->rowid, $key_id, $checked_out);
+	}
+}
diff --git a/core/libraries/fof/form/field/sessionhandler.php b/core/libraries/fof/form/field/sessionhandler.php
new file mode 100644
index 00000000..40082b76
--- /dev/null
+++ b/core/libraries/fof/form/field/sessionhandler.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('sessionhandler');
+
+/**
+ * Form Field class for FOF
+ * Joomla! session handlers
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldSessionhandler extends JFormFieldSessionHandler implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/spacer.php b/core/libraries/fof/form/field/spacer.php
new file mode 100644
index 00000000..045dc53e
--- /dev/null
+++ b/core/libraries/fof/form/field/spacer.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('spacer');
+
+/**
+ * Form Field class for the FOF framework
+ * Spacer used between form elements
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldSpacer extends JFormFieldSpacer implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		return $this->getInput();
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getInput();
+	}
+}
diff --git a/core/libraries/fof/form/field/sql.php b/core/libraries/fof/form/field/sql.php
new file mode 100644
index 00000000..a8214328
--- /dev/null
+++ b/core/libraries/fof/form/field/sql.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('sql');
+
+/**
+ * Form Field class for FOF
+ * Radio selection listGeneric list from an SQL statement
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldSql extends JFormFieldSql implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($this->getOptions(), $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/tag.php b/core/libraries/fof/form/field/tag.php
new file mode 100644
index 00000000..ef5d0b4a
--- /dev/null
+++ b/core/libraries/fof/form/field/tag.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('tag');
+
+/**
+ * Form Field class for FOF
+ * Tag Fields
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFFormFieldTag extends JFormFieldTag implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Method to get a list of tags
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$published = $this->element['published']? $this->element['published'] : array(0,1);
+
+		$db		= FOFPlatform::getInstance()->getDbo();
+		$query	= $db->getQuery(true)
+			->select('DISTINCT a.id AS value, a.path, a.title AS text, a.level, a.published, a.lft')
+			->from('#__tags AS a')
+			->join('LEFT', $db->quoteName('#__tags') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
+
+		if ($this->item instanceof FOFTable)
+		{
+			$item = $this->item;
+		}
+		else
+		{
+			$item = $this->form->getModel()->getItem();
+		}
+
+		if ($item instanceof FOFTable)
+		{
+			// Fake value for selected tags
+			$keyfield = $item->getKeyName();
+			$content_id  = $item->$keyfield;
+			$type = $item->getContentType();
+
+			$selected_query = $db->getQuery(true);
+			$selected_query
+				->select('tag_id')
+				->from('#__contentitem_tag_map')
+				->where('content_item_id = ' . (int) $content_id)
+				->where('type_alias = ' . $db->quote($type));
+
+			$db->setQuery($selected_query);
+
+			$this->value = $db->loadColumn();
+		}
+
+		// Filter language
+		if (!empty($this->element['language']))
+		{
+			$query->where('a.language = ' . $db->quote($this->element['language']));
+		}
+
+		$query->where($db->qn('a.lft') . ' > 0');
+
+		// Filter to only load active items
+
+		// Filter on the published state
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif (is_array($published))
+		{
+            FOFUtilsArray::toInteger($published);
+			$query->where('a.published IN (' . implode(',', $published) . ')');
+		}
+
+		$query->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+
+		// Prepare nested data
+		if ($this->isNested())
+		{
+			$this->prepareOptionsNested($options);
+		}
+		else
+		{
+			$options = JHelperTags::convertPathsToNames($options);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class     = $this->element['class'] ? (string) $this->element['class'] : '';
+		$translate = $this->element['translate'] ? (string) $this->element['translate'] : false;
+
+		$options = $this->getOptions();
+
+		$html = '';
+
+		foreach ($options as $option) {
+
+			$html .= '<span>';
+
+			if ($translate == true)
+			{
+				$html .= JText::_($option->text);
+			}
+			else
+			{
+				$html .= $option->text;
+			}
+
+			$html .= '</span>';
+		}
+
+		return '<span id="' . $this->id . '" class="' . $class . '">' .
+			$html .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.1
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class     = $this->element['class'] ? (string) $this->element['class'] : '';
+		$translate = $this->element['translate'] ? (string) $this->element['translate'] : false;
+
+		$options = $this->getOptions();
+
+		$html = '';
+
+		foreach ($options as $option) {
+
+			$html .= '<span>';
+
+			if ($translate == true)
+			{
+				$html .= JText::_($option->text);
+			}
+			else
+			{
+				$html .= $option->text;
+			}
+
+			$html .= '</span>';
+		}
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			$html .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/field/tel.php b/core/libraries/fof/form/field/tel.php
new file mode 100644
index 00000000..66f070a2
--- /dev/null
+++ b/core/libraries/fof/form/field/tel.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('tel');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a URL text field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldTel extends JFormFieldTel implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class  = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$dolink = $this->element['show_link'] == 'true';
+		$empty_replacement = '';
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		$innerHtml = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		if ($dolink)
+		{
+			$innerHtml = '<a href="tel:' . $innerHtml . '">' .
+				$innerHtml . '</a>';
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			$innerHtml .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		// Initialise
+		$class             = $this->id;
+		$show_link         = false;
+		$empty_replacement = '';
+
+		$link_url = 'tel:' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		// Get field parameters
+		if ($this->element['class'])
+		{
+			$class = ' ' . (string) $this->element['class'];
+		}
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		// Get the (optionally formatted) value
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		$value = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		// Create the HTML
+		$html = '<span class="' . $class . '">';
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		$html .= $value;
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/text.php b/core/libraries/fof/form/field/text.php
new file mode 100644
index 00000000..89751f07
--- /dev/null
+++ b/core/libraries/fof/form/field/text.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('text');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a one line text field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldText extends JFormFieldText implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$empty_replacement = '';
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		// Initialise
+		$class					= $this->id;
+		$format_string			= '';
+		$format_if_not_empty	= false;
+		$parse_value			= false;
+		$show_link				= false;
+		$link_url				= '';
+		$empty_replacement		= '';
+
+		// Get field parameters
+		if ($this->element['class'])
+		{
+			$class = (string) $this->element['class'];
+		}
+
+		if ($this->element['format'])
+		{
+			$format_string = (string) $this->element['format'];
+		}
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['format_if_not_empty'] == 'true')
+		{
+			$format_if_not_empty = true;
+		}
+
+		if ($this->element['parse_value'] == 'true')
+		{
+			$parse_value = true;
+		}
+
+		if ($this->element['url'])
+		{
+			$link_url = $this->element['url'];
+		}
+		else
+		{
+			$show_link = false;
+		}
+
+		if ($show_link && ($this->item instanceof FOFTable))
+		{
+			$link_url = $this->parseFieldTags($link_url);
+		}
+		else
+		{
+			$show_link = false;
+		}
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		// Get the (optionally formatted) value
+		$value = $this->value;
+
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$value = JText::_($empty_replacement);
+		}
+
+		if ($parse_value)
+		{
+			$value = $this->parseFieldTags($value);
+		}
+
+		if (!empty($format_string) && (!$format_if_not_empty || ($format_if_not_empty && !empty($this->value))))
+		{
+			$format_string = $this->parseFieldTags($format_string);
+			$value = sprintf($format_string, $value);
+		}
+		else
+		{
+			$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
+		}
+
+		// Create the HTML
+		$html = '<span class="' . $class . '">';
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		$html .= $value;
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+
+	/**
+	 * Replace string with tags that reference fields
+	 *
+	 * @param   string  $text  Text to process
+	 *
+	 * @return  string         Text with tags replace
+	 */
+	protected function parseFieldTags($text)
+	{
+		$ret = $text;
+
+		// Replace [ITEM:ID] in the URL with the item's key value (usually:
+		// the auto-incrementing numeric ID)
+		$keyfield = $this->item->getKeyName();
+		$replace  = $this->item->$keyfield;
+		$ret = str_replace('[ITEM:ID]', $replace, $ret);
+
+		// Replace the [ITEMID] in the URL with the current Itemid parameter
+		$ret = str_replace('[ITEMID]', JFactory::getApplication()->input->getInt('Itemid', 0), $ret);
+
+		// Replace other field variables in the URL
+		$fields = $this->item->getTableFields();
+
+		foreach ($fields as $fielddata)
+		{
+			$fieldname = $fielddata->Field;
+
+			if (empty($fieldname))
+			{
+				$fieldname = $fielddata->column_name;
+			}
+
+			$search    = '[ITEM:' . strtoupper($fieldname) . ']';
+			$replace   = $this->item->$fieldname;
+			$ret  = str_replace($search, $replace, $ret);
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/libraries/fof/form/field/textarea.php b/core/libraries/fof/form/field/textarea.php
new file mode 100644
index 00000000..03c327dd
--- /dev/null
+++ b/core/libraries/fof/form/field/textarea.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('textarea');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a text area
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldTextarea extends JFormFieldTextarea implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		return '<div id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(nl2br($this->value), ENT_COMPAT, 'UTF-8') .
+			'</div>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getStatic();
+	}
+}
diff --git a/core/libraries/fof/form/field/timezone.php b/core/libraries/fof/form/field/timezone.php
new file mode 100644
index 00000000..272295d2
--- /dev/null
+++ b/core/libraries/fof/form/field/timezone.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('timezone');
+
+/**
+ * Form Field class for FOF
+ * Supports a generic list of options.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldTimezone extends JFormFieldTimezone implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		$selected = FOFFormFieldGroupedlist::getOptionName($this->getOptions(), $this->value);
+
+		if (is_null($selected))
+		{
+			$selected = array(
+				'group'	 => '',
+				'item'	 => ''
+			);
+		}
+
+		return '<span id="' . $this->id . '-group" class="fof-groupedlist-group ' . $class . '>' .
+			htmlspecialchars($selected['group'], ENT_COMPAT, 'UTF-8') .
+			'</span>' .
+			'<span id="' . $this->id . '-item" class="fof-groupedlist-item ' . $class . '>' .
+			htmlspecialchars($selected['item'], ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		return $this->getStatic();
+	}
+}
diff --git a/core/libraries/fof/form/field/title.php b/core/libraries/fof/form/field/title.php
new file mode 100644
index 00000000..8ed993e3
--- /dev/null
+++ b/core/libraries/fof/form/field/title.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('text');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a title field with an optional slug display below it.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldTitle extends FOFFormFieldText implements FOFFormField
+{
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		// Initialise
+		$slug_format	= '(%s)';
+		$slug_class		= 'small';
+
+		// Get field parameters
+		if ($this->element['slug_field'])
+		{
+			$slug_field = (string) $this->element['slug_field'];
+		}
+		else
+		{
+			$slug_field = $this->item->getColumnAlias('slug');
+		}
+
+		if ($this->element['slug_format'])
+		{
+			$slug_format = (string) $this->element['slug_format'];
+		}
+
+		if ($this->element['slug_class'])
+		{
+			$slug_class = (string) $this->element['slug_class'];
+		}
+
+		// Get the regular display
+		$html = parent::getRepeatable();
+
+		$slug = $this->item->$slug_field;
+
+		$html .= '<br />' . '<span class="' . $slug_class . '">';
+		$html .= JText::sprintf($slug_format, $slug);
+		$html .= '</span>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/url.php b/core/libraries/fof/form/field/url.php
new file mode 100644
index 00000000..db3b2c1a
--- /dev/null
+++ b/core/libraries/fof/form/field/url.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('url');
+
+/**
+ * Form Field class for the FOF framework
+ * Supports a URL text field.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldUrl extends JFormFieldUrl implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class  = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+		$dolink = $this->element['show_link'] == 'true';
+		$empty_replacement = '';
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		$innerHtml = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		if ($dolink)
+		{
+			$innerHtml = '<a href="' . $innerHtml . '">' .
+				$innerHtml . '</a>';
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			$innerHtml .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		// Initialise
+		$class             = $this->id;
+		$show_link         = false;
+		$empty_replacement = '';
+
+		$link_url = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		// Get field parameters
+		if ($this->element['class'])
+		{
+			$class .= ' ' . (string) $this->element['class'];
+		}
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['empty_replacement'])
+		{
+			$empty_replacement = (string) $this->element['empty_replacement'];
+		}
+
+		// Get the (optionally formatted) value
+		if (!empty($empty_replacement) && empty($this->value))
+		{
+			$this->value = JText::_($empty_replacement);
+		}
+
+		$value = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+
+		// Create the HTML
+		$html = '<span class="' . $class . '">';
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		$html .= $value;
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</span>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/user.php b/core/libraries/fof/form/field/user.php
new file mode 100644
index 00000000..f2d6f9bc
--- /dev/null
+++ b/core/libraries/fof/form/field/user.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JFormHelper::loadFieldClass('user');
+
+/**
+ * Form Field class for the FOF framework
+ * A user selection box / display field
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldUser extends JFormFieldUser implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		// Initialise
+		$show_username = true;
+		$show_email    = false;
+		$show_name     = false;
+		$show_id       = false;
+		$class         = '';
+
+		// Get the field parameters
+		if ($this->element['class'])
+		{
+			$class = ' class="' . (string) $this->element['class'] . '"';
+		}
+
+		if ($this->element['show_username'] == 'false')
+		{
+			$show_username = false;
+		}
+
+		if ($this->element['show_email'] == 'true')
+		{
+			$show_email = true;
+		}
+
+		if ($this->element['show_name'] == 'true')
+		{
+			$show_name = true;
+		}
+
+		if ($this->element['show_id'] == 'true')
+		{
+			$show_id = true;
+		}
+
+		// Get the user record
+		$user = JFactory::getUser($this->value);
+
+		// Render the HTML
+		$html = '<div id="' . $this->id . '" ' . $class . '>';
+
+		if ($show_username)
+		{
+			$html .= '<span class="fof-userfield-username">' . $user->username . '</span>';
+		}
+
+		if ($show_id)
+		{
+			$html .= '<span class="fof-userfield-id">' . $user->id . '</span>';
+		}
+
+		if ($show_name)
+		{
+			$html .= '<span class="fof-userfield-name">' . $user->name . '</span>';
+		}
+
+		if ($show_email)
+		{
+			$html .= '<span class="fof-userfield-email">' . $user->email . '</span>';
+		}
+
+		$html .= '</div>';
+
+		return $html;
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		// Initialise
+		$show_username = true;
+		$show_email    = true;
+		$show_name     = true;
+		$show_id       = true;
+		$show_avatar   = true;
+		$show_link     = false;
+		$link_url      = null;
+		$avatar_method = 'gravatar';
+		$avatar_size   = 64;
+		$class         = '';
+
+		// Get the user record
+		$user = JFactory::getUser($this->value);
+
+		// Get the field parameters
+		if ($this->element['class'])
+		{
+			$class = ' class="' . (string) $this->element['class'] . '"';
+		}
+
+		if ($this->element['show_username'] == 'false')
+		{
+			$show_username = false;
+		}
+
+		if ($this->element['show_email'] == 'false')
+		{
+			$show_email = false;
+		}
+
+		if ($this->element['show_name'] == 'false')
+		{
+			$show_name = false;
+		}
+
+		if ($this->element['show_id'] == 'false')
+		{
+			$show_id = false;
+		}
+
+		if ($this->element['show_avatar'] == 'false')
+		{
+			$show_avatar = false;
+		}
+
+		if ($this->element['avatar_method'])
+		{
+			$avatar_method = strtolower($this->element['avatar_method']);
+		}
+
+		if ($this->element['avatar_size'])
+		{
+			$avatar_size = $this->element['avatar_size'];
+		}
+
+		if ($this->element['show_link'] == 'true')
+		{
+			$show_link = true;
+		}
+
+		if ($this->element['link_url'])
+		{
+			$link_url = $this->element['link_url'];
+		}
+		else
+		{
+			if (FOFPlatform::getInstance()->isBackend())
+			{
+				// If no link is defined in the back-end, assume the user edit
+				// link in the User Manager component
+				$link_url = 'index.php?option=com_users&task=user.edit&id=[USER:ID]';
+			}
+			else
+			{
+				// If no link is defined in the front-end, we can't create a
+				// default link. Therefore, show no link.
+				$show_link = false;
+			}
+		}
+
+		// Post-process the link URL
+		if ($show_link)
+		{
+			$replacements = array(
+				'[USER:ID]'			 => $user->id,
+				'[USER:USERNAME]'	 => $user->username,
+				'[USER:EMAIL]'		 => $user->email,
+				'[USER:NAME]'		 => $user->name,
+			);
+
+			foreach ($replacements as $key => $value)
+			{
+				$link_url = str_replace($key, $value, $link_url);
+			}
+		}
+
+		// Get the avatar image, if necessary
+		if ($show_avatar)
+		{
+			$avatar_url = '';
+
+			if ($avatar_method == 'plugin')
+			{
+				// Use the user plugins to get an avatar
+				FOFPlatform::getInstance()->importPlugin('user');
+				$jResponse = FOFPlatform::getInstance()->runPlugins('onUserAvatar', array($user, $avatar_size));
+
+				if (!empty($jResponse))
+				{
+					foreach ($jResponse as $response)
+					{
+						if ($response)
+						{
+							$avatar_url = $response;
+						}
+					}
+				}
+
+				if (empty($avatar_url))
+				{
+					$show_avatar = false;
+				}
+			}
+			else
+			{
+				// Fall back to the Gravatar method
+				$md5 = md5($user->email);
+
+				if (FOFPlatform::getInstance()->isCli())
+				{
+					$scheme = 'http';
+				}
+				else
+				{
+					$scheme = JURI::getInstance()->getScheme();
+				}
+
+				if ($scheme == 'http')
+				{
+					$avatar_url = 'http://www.gravatar.com/avatar/' . $md5 . '.jpg?s='
+						. $avatar_size . '&d=mm';
+				}
+				else
+				{
+					$avatar_url = 'https://secure.gravatar.com/avatar/' . $md5 . '.jpg?s='
+						. $avatar_size . '&d=mm';
+				}
+			}
+		}
+
+		// Generate the HTML
+		$html = '<div id="' . $this->id . '" ' . $class . '>';
+
+		if ($show_avatar)
+		{
+			$html .= '<img src="' . $avatar_url . '" align="left" class="fof-usersfield-avatar" />';
+		}
+
+		if ($show_link)
+		{
+			$html .= '<a href="' . $link_url . '">';
+		}
+
+		if ($show_username)
+		{
+			$html .= '<span class="fof-usersfield-username">' . $user->username
+				. '</span>';
+		}
+
+		if ($show_id)
+		{
+			$html .= '<span class="fof-usersfield-id">' . $user->id
+				. '</span>';
+		}
+
+		if ($show_name)
+		{
+			$html .= '<span class="fof-usersfield-name">' . $user->name
+				. '</span>';
+		}
+
+		if ($show_email)
+		{
+			$html .= '<span class="fof-usersfield-email">' . $user->email
+				. '</span>';
+		}
+
+		if ($show_link)
+		{
+			$html .= '</a>';
+		}
+
+		$html .= '</div>';
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/field/usergroup.php b/core/libraries/fof/form/field/usergroup.php
new file mode 100644
index 00000000..fd9d4c07
--- /dev/null
+++ b/core/libraries/fof/form/field/usergroup.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('usergroup');
+
+/**
+ * Form Field class for FOF
+ * Joomla! user groups
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormFieldUsergroup extends JFormFieldUsergroup implements FOFFormField
+{
+	protected $static;
+
+	protected $repeatable;
+
+	/** @var int A monotonically increasing number, denoting the row number in a repeatable view */
+	public $rowid;
+
+	/** @var   FOFTable  The item being rendered in a repeatable form field */
+	public $item;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'static':
+				if (empty($this->static))
+				{
+					$this->static = $this->getStatic();
+				}
+
+				return $this->static;
+				break;
+
+			case 'repeatable':
+				if (empty($this->repeatable))
+				{
+					$this->repeatable = $this->getRepeatable();
+				}
+
+				return $this->repeatable;
+				break;
+
+			default:
+				return parent::__get($name);
+		}
+	}
+
+	/**
+	 * Get the rendering of this field type for static display, e.g. in a single
+	 * item view (typically a "read" task).
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getStatic()
+	{
+		$class = $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+		$params = $this->getOptions();
+
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.id AS value, a.title AS text');
+		$query->from('#__usergroups AS a');
+		$query->group('a.id, a.title');
+		$query->order('a.id ASC');
+		$query->order($query->qn('title') . ' ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		// If params is an array, push these options to the array
+		if (is_array($params))
+		{
+			$options = array_merge($params, $options);
+		}
+
+		// If all levels is allowed, push it into the array.
+		elseif ($params)
+		{
+			array_unshift($options, JHtml::_('select.option', '', JText::_('JOPTION_ACCESS_SHOW_ALL_LEVELS')));
+		}
+
+		return '<span id="' . $this->id . '" ' . $class . '>' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($options, $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+
+	/**
+	 * Get the rendering of this field type for a repeatable (grid) display,
+	 * e.g. in a view listing many item (typically a "browse" task)
+	 *
+	 * @since 2.0
+	 *
+	 * @return  string  The field HTML
+	 */
+	public function getRepeatable()
+	{
+		$class = $this->element['class'] ? (string) $this->element['class'] : '';
+
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.id AS value, a.title AS text');
+		$query->from('#__usergroups AS a');
+		$query->group('a.id, a.title');
+		$query->order('a.id ASC');
+		$query->order($query->qn('title') . ' ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+
+		return '<span class="' . $this->id . ' ' . $class . '">' .
+			htmlspecialchars(FOFFormFieldList::getOptionName($options, $this->value), ENT_COMPAT, 'UTF-8') .
+			'</span>';
+	}
+}
diff --git a/core/libraries/fof/form/form.php b/core/libraries/fof/form/form.php
new file mode 100644
index 00000000..9fe7983b
--- /dev/null
+++ b/core/libraries/fof/form/form.php
@@ -0,0 +1,659 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (version_compare(JVERSION, '2.5.0', 'lt'))
+{
+	jimport('joomla.form.form');
+	jimport('joomla.form.formfield');
+	jimport('joomla.form.formrule');
+}
+
+/**
+ * FOFForm is an extension to JForm which support not only edit views but also
+ * browse (record list) and read (single record display) views based on XML
+ * forms.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFForm extends JForm
+{
+	/**
+	 * The model attached to this view
+	 *
+	 * @var FOFModel
+	 */
+	protected $model;
+
+	/**
+	 * The view used to render this form
+	 *
+	 * @var FOFView
+	 */
+	protected $view;
+
+	/**
+	 * Method to get an instance of a form.
+	 *
+	 * @param   string  	$name		The name of the form.
+	 * @param   string  	$data		The name of an XML file or string to load as the form definition.
+	 * @param   array   	$options	An array of form options.
+	 * @param   bool  		$replace	Flag to toggle whether form fields should be replaced if a field
+	 *                      	      	already exists with the same group/name.
+	 * @param   bool|string $xpath		An optional xpath to search for the fields.
+	 *
+	 * @return  object  FOFForm instance.
+	 *
+	 * @since   2.0
+	 * @throws  InvalidArgumentException if no data provided.
+	 * @throws  RuntimeException if the form could not be loaded.
+	 */
+	public static function getInstance($name, $data = null, $options = array(), $replace = true, $xpath = false)
+	{
+		// Reference to array with form instances
+		$forms = &self::$forms;
+
+		// Only instantiate the form if it does not already exist.
+		if (!isset($forms[$name]))
+		{
+			$data = trim($data);
+
+			if (empty($data))
+			{
+				throw new InvalidArgumentException(sprintf('FOFForm::getInstance(name, *%s*)', gettype($data)));
+			}
+
+			// Instantiate the form.
+			$forms[$name] = new FOFForm($name, $options);
+
+			// Load the data.
+			if (substr(trim($data), 0, 1) == '<')
+			{
+				if ($forms[$name]->load($data, $replace, $xpath) == false)
+				{
+					throw new RuntimeException('FOFForm::getInstance could not load form');
+				}
+			}
+			else
+			{
+				if ($forms[$name]->loadFile($data, $replace, $xpath) == false)
+				{
+					throw new RuntimeException('FOFForm::getInstance could not load file ' . $data . '.xml');
+				}
+			}
+		}
+
+		return $forms[$name];
+	}
+
+	/**
+	 * Returns the value of an attribute of the form itself
+	 *
+	 * @param   string  $attribute  The name of the attribute
+	 * @param   mixed   $default    Optional default value to return
+	 *
+	 * @return  mixed
+	 *
+	 * @since 2.0
+	 */
+	public function getAttribute($attribute, $default = null)
+	{
+		$value = $this->xml->attributes()->$attribute;
+
+		if (is_null($value))
+		{
+			return $default;
+		}
+		else
+		{
+			return (string) $value;
+		}
+	}
+
+	/**
+	 * Loads the CSS files defined in the form, based on its cssfiles attribute
+	 *
+	 * @return  void
+	 *
+	 * @since 2.0
+	 */
+	public function loadCSSFiles()
+	{
+		// Support for CSS files
+		$cssfiles = $this->getAttribute('cssfiles');
+
+		if (!empty($cssfiles))
+		{
+			$cssfiles = explode(',', $cssfiles);
+
+			foreach ($cssfiles as $cssfile)
+			{
+				FOFTemplateUtils::addCSS(trim($cssfile));
+			}
+		}
+
+		// Support for LESS files
+		$lessfiles = $this->getAttribute('lessfiles');
+
+		if (!empty($lessfiles))
+		{
+			$lessfiles = explode(',', $lessfiles);
+
+			foreach ($lessfiles as $def)
+			{
+				$parts = explode('||', $def, 2);
+				$lessfile = $parts[0];
+				$alt = (count($parts) > 1) ? trim($parts[1]) : null;
+				FOFTemplateUtils::addLESS(trim($lessfile), $alt);
+			}
+		}
+	}
+
+	/**
+	 * Loads the Javascript files defined in the form, based on its jsfiles attribute
+	 *
+	 * @return  void
+	 *
+	 * @since 2.0
+	 */
+	public function loadJSFiles()
+	{
+		$jsfiles = $this->getAttribute('jsfiles');
+
+		if (empty($jsfiles))
+		{
+			return;
+		}
+
+		$jsfiles = explode(',', $jsfiles);
+
+		foreach ($jsfiles as $jsfile)
+		{
+			FOFTemplateUtils::addJS(trim($jsfile));
+		}
+	}
+
+	/**
+	 * Returns a reference to the protected $data object, allowing direct
+	 * access to and manipulation of the form's data.
+	 *
+	 * @return   JRegistry  The form's data registry
+	 *
+	 * @since 2.0
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Attaches a FOFModel to this form
+	 *
+	 * @param   FOFModel  &$model  The model to attach to the form
+	 *
+	 * @return  void
+	 */
+	public function setModel(FOFModel &$model)
+	{
+		$this->model = $model;
+	}
+
+	/**
+	 * Returns the FOFModel attached to this form
+	 *
+	 * @return FOFModel
+	 */
+	public function &getModel()
+	{
+		return $this->model;
+	}
+
+	/**
+	 * Attaches a FOFView to this form
+	 *
+	 * @param   FOFView  &$view  The view to attach to the form
+	 *
+	 * @return  void
+	 */
+	public function setView(FOFView &$view)
+	{
+		$this->view = $view;
+	}
+
+	/**
+	 * Returns the FOFView attached to this form
+	 *
+	 * @return FOFView
+	 */
+	public function &getView()
+	{
+		return $this->view;
+	}
+
+	/**
+	 * Method to get an array of FOFFormHeader objects in the headerset.
+	 *
+	 * @return  array  The array of FOFFormHeader objects in the headerset.
+	 *
+	 * @since   2.0
+	 */
+	public function getHeaderset()
+	{
+		$fields = array();
+
+		$elements = $this->findHeadersByGroup();
+
+		// If no field elements were found return empty.
+
+		if (empty($elements))
+		{
+			return $fields;
+		}
+
+		// Build the result array from the found field elements.
+
+		foreach ($elements as $element)
+		{
+			// Get the field groups for the element.
+			$attrs = $element->xpath('ancestor::headers[@name]/@name');
+			$groups = array_map('strval', $attrs ? $attrs : array());
+			$group = implode('.', $groups);
+
+			// If the field is successfully loaded add it to the result array.
+			if ($field = $this->loadHeader($element, $group))
+			{
+				$fields[$field->id] = $field;
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get an array of <header /> elements from the form XML document which are
+	 * in a control group by name.
+	 *
+	 * @param   mixed    $group   The optional dot-separated form group path on which to find the fields.
+	 *                            Null will return all fields. False will return fields not in a group.
+	 * @param   boolean  $nested  True to also include fields in nested groups that are inside of the
+	 *                            group for which to find fields.
+	 *
+	 * @return  mixed  Boolean false on error or array of SimpleXMLElement objects.
+	 *
+	 * @since   2.0
+	 */
+	protected function &findHeadersByGroup($group = null, $nested = false)
+	{
+		$false = false;
+		$fields = array();
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof SimpleXMLElement))
+		{
+			return $false;
+		}
+
+		// Get only fields in a specific group?
+		if ($group)
+		{
+			// Get the fields elements for a given group.
+			$elements = &$this->findHeader($group);
+
+			// Get all of the field elements for the fields elements.
+			foreach ($elements as $element)
+			{
+				// If there are field elements add them to the return result.
+				if ($tmp = $element->xpath('descendant::header'))
+				{
+					// If we also want fields in nested groups then just merge the arrays.
+					if ($nested)
+					{
+						$fields = array_merge($fields, $tmp);
+					}
+
+					// If we want to exclude nested groups then we need to check each field.
+					else
+					{
+						$groupNames = explode('.', $group);
+
+						foreach ($tmp as $field)
+						{
+							// Get the names of the groups that the field is in.
+							$attrs = $field->xpath('ancestor::headers[@name]/@name');
+							$names = array_map('strval', $attrs ? $attrs : array());
+
+							// If the field is in the specific group then add it to the return list.
+							if ($names == (array) $groupNames)
+							{
+								$fields = array_merge($fields, array($field));
+							}
+						}
+					}
+				}
+			}
+		}
+		elseif ($group === false)
+		{
+			// Get only field elements not in a group.
+			$fields = $this->xml->xpath('descendant::headers[not(@name)]/header | descendant::headers[not(@name)]/headerset/header ');
+		}
+		else
+		{
+			// Get an array of all the <header /> elements.
+			$fields = $this->xml->xpath('//header');
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get a header field represented as a FOFFormHeader object.
+	 *
+	 * @param   string  $name   The name of the header field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 * @param   mixed   $value  The optional value to use as the default for the field.
+	 *
+	 * @return  mixed  The FOFFormHeader object for the field or boolean false on error.
+	 *
+	 * @since   2.0
+	 */
+	public function getHeader($name, $group = null, $value = null)
+	{
+		// Make sure there is a valid FOFForm XML document.
+		if (!($this->xml instanceof SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Attempt to find the field by name and group.
+		$element = $this->findHeader($name, $group);
+
+		// If the field element was not found return false.
+		if (!$element)
+		{
+			return false;
+		}
+
+		return $this->loadHeader($element, $group, $value);
+	}
+
+	/**
+	 * Method to get a header field represented as an XML element object.
+	 *
+	 * @param   string  $name   The name of the form field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  mixed  The XML element object for the field or boolean false on error.
+	 *
+	 * @since   2.0
+	 */
+	protected function findHeader($name, $group = null)
+	{
+		$element = false;
+		$fields = array();
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Let's get the appropriate field element based on the method arguments.
+		if ($group)
+		{
+			// Get the fields elements for a given group.
+			$elements = &$this->findGroup($group);
+
+			// Get all of the field elements with the correct name for the fields elements.
+			foreach ($elements as $element)
+			{
+				// If there are matching field elements add them to the fields array.
+				if ($tmp = $element->xpath('descendant::header[@name="' . $name . '"]'))
+				{
+					$fields = array_merge($fields, $tmp);
+				}
+			}
+
+			// Make sure something was found.
+			if (!$fields)
+			{
+				return false;
+			}
+
+			// Use the first correct match in the given group.
+			$groupNames = explode('.', $group);
+
+			foreach ($fields as &$field)
+			{
+				// Get the group names as strings for ancestor fields elements.
+				$attrs = $field->xpath('ancestor::headerfields[@name]/@name');
+				$names = array_map('strval', $attrs ? $attrs : array());
+
+				// If the field is in the exact group use it and break out of the loop.
+				if ($names == (array) $groupNames)
+				{
+					$element = &$field;
+					break;
+				}
+			}
+		}
+		else
+		{
+			// Get an array of fields with the correct name.
+			$fields = $this->xml->xpath('//header[@name="' . $name . '"]');
+
+			// Make sure something was found.
+			if (!$fields)
+			{
+				return false;
+			}
+
+			// Search through the fields for the right one.
+			foreach ($fields as &$field)
+			{
+				// If we find an ancestor fields element with a group name then it isn't what we want.
+				if ($field->xpath('ancestor::headerfields[@name]'))
+				{
+					continue;
+				}
+
+				// Found it!
+				else
+				{
+					$element = &$field;
+					break;
+				}
+			}
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Method to load, setup and return a FOFFormHeader object based on field data.
+	 *
+	 * @param   string  $element  The XML element object representation of the form field.
+	 * @param   string  $group    The optional dot-separated form group path on which to find the field.
+	 * @param   mixed   $value    The optional value to use as the default for the field.
+	 *
+	 * @return  mixed  The FOFFormHeader object for the field or boolean false on error.
+	 *
+	 * @since   2.0
+	 */
+	protected function loadHeader($element, $group = null, $value = null)
+	{
+		// Make sure there is a valid SimpleXMLElement.
+		if (!($element instanceof SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Get the field type.
+		$type = $element['type'] ? (string) $element['type'] : 'field';
+
+		// Load the JFormField object for the field.
+		$field = $this->loadHeaderType($type);
+
+		// If the object could not be loaded, get a text field object.
+		if ($field === false)
+		{
+			$field = $this->loadHeaderType('field');
+		}
+
+		// Setup the FOFFormHeader object.
+		$field->setForm($this);
+
+		if ($field->setup($element, $value, $group))
+		{
+			return $field;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	/**
+	 * Method to remove a header from the form definition.
+	 *
+	 * @param   string  $name   The name of the form field for which remove.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @throws  UnexpectedValueException
+	 */
+	public function removeHeader($name, $group = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof SimpleXMLElement))
+		{
+			throw new UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Find the form field element from the definition.
+		$element = $this->findHeader($name, $group);
+
+		// If the element exists remove it from the form definition.
+		if ($element instanceof SimpleXMLElement)
+		{
+			$dom = dom_import_simplexml($element);
+			$dom->parentNode->removeChild($dom);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Proxy for {@link FOFFormHelper::loadFieldType()}.
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  FOFFormField object on success, false otherwise.
+	 *
+	 * @since   2.0
+	 */
+	protected function loadFieldType($type, $new = true)
+	{
+		return FOFFormHelper::loadFieldType($type, $new);
+	}
+
+	/**
+	 * Proxy for {@link FOFFormHelper::loadHeaderType()}.
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  FOFFormHeader object on success, false otherwise.
+	 *
+	 * @since   2.0
+	 */
+	protected function loadHeaderType($type, $new = true)
+	{
+		return FOFFormHelper::loadHeaderType($type, $new);
+	}
+
+	/**
+	 * Proxy for {@link FOFFormHelper::loadRuleType()}.
+	 *
+	 * @param   string   $type  The rule type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  JFormRule object on success, false otherwise.
+	 *
+	 * @see     FOFFormHelper::loadRuleType()
+	 * @since   2.0
+	 */
+	protected function loadRuleType($type, $new = true)
+	{
+		return FOFFormHelper::loadRuleType($type, $new);
+	}
+
+	/**
+	 * Proxy for {@link FOFFormHelper::addFieldPath()}.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   2.0
+	 */
+	public static function addFieldPath($new = null)
+	{
+		return FOFFormHelper::addFieldPath($new);
+	}
+
+	/**
+	 * Proxy for {@link FOFFormHelper::addHeaderPath()}.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   2.0
+	 */
+	public static function addHeaderPath($new = null)
+	{
+		return FOFFormHelper::addHeaderPath($new);
+	}
+
+	/**
+	 * Proxy for FOFFormHelper::addFormPath().
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see     FOFFormHelper::addFormPath()
+	 * @since   2.0
+	 */
+	public static function addFormPath($new = null)
+	{
+		return FOFFormHelper::addFormPath($new);
+	}
+
+	/**
+	 * Proxy for FOFFormHelper::addRulePath().
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see FOFFormHelper::addRulePath()
+	 * @since   2.0
+	 */
+	public static function addRulePath($new = null)
+	{
+		return FOFFormHelper::addRulePath($new);
+	}
+}
diff --git a/core/libraries/fof/form/header.php b/core/libraries/fof/form/header.php
new file mode 100644
index 00000000..881b3d81
--- /dev/null
+++ b/core/libraries/fof/form/header.php
@@ -0,0 +1,579 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * An interface for FOFFormHeader fields, used to define the filters and the
+ * elements of the header row in repeatable (browse) views
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+abstract class FOFFormHeader
+{
+	/**
+	 * The description text for the form field.  Usually used in tooltips.
+	 *
+	 * @var    string
+	 * @since  2.0
+	 */
+	protected $description;
+
+	/**
+	 * The SimpleXMLElement object of the <field /> XML element that describes the header field.
+	 *
+	 * @var    SimpleXMLElement
+	 * @since  2.0
+	 */
+	protected $element;
+
+	/**
+	 * The FOFForm object of the form attached to the header field.
+	 *
+	 * @var    FOFForm
+	 * @since  2.0
+	 */
+	protected $form;
+
+	/**
+	 * The label for the header field.
+	 *
+	 * @var    string
+	 * @since  2.0
+	 */
+	protected $label;
+
+	/**
+	 * The header HTML.
+	 *
+	 * @var    string|null
+	 * @since  2.0
+	 */
+	protected $header;
+
+	/**
+	 * The filter HTML.
+	 *
+	 * @var    string|null
+	 * @since  2.0
+	 */
+	protected $filter;
+
+	/**
+	 * The buttons HTML.
+	 *
+	 * @var    string|null
+	 * @since  2.0
+	 */
+	protected $buttons;
+
+	/**
+	 * The options for a drop-down filter.
+	 *
+	 * @var    array|null
+	 * @since  2.0
+	 */
+	protected $options;
+
+	/**
+	 * The name of the form field.
+	 *
+	 * @var    string
+	 * @since  2.0
+	 */
+	protected $name;
+
+	/**
+	 * The name of the field.
+	 *
+	 * @var    string
+	 * @since  2.0
+	 */
+	protected $fieldname;
+
+	/**
+	 * The group of the field.
+	 *
+	 * @var    string
+	 * @since  2.0
+	 */
+	protected $group;
+
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  2.0
+	 */
+	protected $type;
+
+	/**
+	 * The value of the filter.
+	 *
+	 * @var    mixed
+	 * @since  2.0
+	 */
+	protected $value;
+
+	/**
+	 * The intended table data width (in pixels or percent).
+	 *
+	 * @var    mixed
+	 * @since  2.0
+	 */
+	protected $tdwidth;
+
+	/**
+	 * The key of the filter value in the model state.
+	 *
+	 * @var    mixed
+	 * @since  2.0
+	 */
+	protected $filterSource;
+
+	/**
+	 * Is this a sortable column?
+	 *
+	 * @var    bool
+	 * @since  2.0
+	 */
+	protected $sortable = false;
+
+	/**
+	 * Method to instantiate the form field object.
+	 *
+	 * @param   FOFForm  $form  The form to attach to the form field object.
+	 *
+	 * @since   2.0
+	 */
+	public function __construct(FOFForm $form = null)
+	{
+		// If there is a form passed into the constructor set the form and form control properties.
+		if ($form instanceof FOFForm)
+		{
+			$this->form = $form;
+		}
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to the the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   2.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'description':
+			case 'name':
+			case 'type':
+			case 'fieldname':
+			case 'group':
+			case 'tdwidth':
+				return $this->$name;
+				break;
+
+			case 'label':
+				if (empty($this->label))
+				{
+					$this->label = $this->getLabel();
+				}
+
+				return $this->label;
+
+			case 'value':
+				if (empty($this->value))
+				{
+					$this->value = $this->getValue();
+				}
+
+				return $this->value;
+				break;
+
+			case 'header':
+				if (empty($this->header))
+				{
+					$this->header = $this->getHeader();
+				}
+
+				return $this->header;
+				break;
+
+			case 'filter':
+				if (empty($this->filter))
+				{
+					$this->filter = $this->getFilter();
+				}
+
+				return $this->filter;
+				break;
+
+			case 'buttons':
+				if (empty($this->buttons))
+				{
+					$this->buttons = $this->getButtons();
+				}
+
+				return $this->buttons;
+				break;
+
+			case 'options':
+				if (empty($this->options))
+				{
+					$this->options = $this->getOptions();
+				}
+
+				return $this->options;
+				break;
+
+			case 'sortable':
+				if (empty($this->sortable))
+				{
+					$this->sortable = $this->getSortable();
+				}
+
+				return $this->sortable;
+				break;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   FOFForm  $form  The JForm object to attach to the form field.
+	 *
+	 * @return  FOFFormHeader  The form field object so that the method can be used in a chain.
+	 *
+	 * @since   2.0
+	 */
+	public function setForm(FOFForm $form)
+	{
+		$this->form = $form;
+
+		return $this;
+	}
+
+	/**
+	 * Method to attach a FOFForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the <field /> tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.0
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		// Make sure there is a valid JFormField XML element.
+		if ((string) $element->getName() != 'header')
+		{
+			return false;
+		}
+
+		// Reset the internal fields
+		$this->label = null;
+		$this->header = null;
+		$this->filter = null;
+		$this->buttons = null;
+		$this->options = null;
+		$this->value = null;
+		$this->filterSource = null;
+
+		// Set the XML element object.
+		$this->element = $element;
+
+		// Get some important attributes from the form field element.
+		$class = (string) $element['class'];
+		$id = (string) $element['id'];
+		$name = (string) $element['name'];
+		$filterSource = (string) $element['filter_source'];
+		$tdwidth = (string) $element['tdwidth'];
+
+		// Set the field description text.
+		$this->description = (string) $element['description'];
+
+		// Set the group of the field.
+		$this->group = $group;
+
+		// Set the td width of the field.
+		$this->tdwidth = $tdwidth;
+
+		// Set the field name and id.
+		$this->fieldname = $this->getFieldName($name);
+		$this->name = $this->getName($this->fieldname);
+		$this->id = $this->getId($id, $this->fieldname);
+		$this->filterSource = $this->getFilterSource($filterSource);
+
+		// Set the field default value.
+		$this->value = $this->getValue();
+
+		return true;
+	}
+
+	/**
+	 * Method to get the id used for the field input tag.
+	 *
+	 * @param   string  $fieldId    The field element id.
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The id to be used for the field input tag.
+	 *
+	 * @since   2.0
+	 */
+	protected function getId($fieldId, $fieldName)
+	{
+		$id = '';
+
+		// If the field is in a group add the group control to the field id.
+
+		if ($this->group)
+		{
+			// If we already have an id segment add the group control as another level.
+
+			if ($id)
+			{
+				$id .= '_' . str_replace('.', '_', $this->group);
+			}
+			else
+			{
+				$id .= str_replace('.', '_', $this->group);
+			}
+		}
+
+		// If we already have an id segment add the field id/name as another level.
+
+		if ($id)
+		{
+			$id .= '_' . ($fieldId ? $fieldId : $fieldName);
+		}
+		else
+		{
+			$id .= ($fieldId ? $fieldId : $fieldName);
+		}
+
+		// Clean up any invalid characters.
+		$id = preg_replace('#\W#', '_', $id);
+
+		return $id;
+	}
+
+	/**
+	 * Method to get the name used for the field input tag.
+	 *
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The name to be used for the field input tag.
+	 *
+	 * @since   2.0
+	 */
+	protected function getName($fieldName)
+	{
+		$name = '';
+
+		// If the field is in a group add the group control to the field name.
+
+		if ($this->group)
+		{
+			// If we already have a name segment add the group control as another level.
+			$groups = explode('.', $this->group);
+
+			if ($name)
+			{
+				foreach ($groups as $group)
+				{
+					$name .= '[' . $group . ']';
+				}
+			}
+			else
+			{
+				$name .= array_shift($groups);
+
+				foreach ($groups as $group)
+				{
+					$name .= '[' . $group . ']';
+				}
+			}
+		}
+
+		// If we already have a name segment add the field name as another level.
+
+		if ($name)
+		{
+			$name .= '[' . $fieldName . ']';
+		}
+		else
+		{
+			$name .= $fieldName;
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Method to get the field name used.
+	 *
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The field name
+	 *
+	 * @since   2.0
+	 */
+	protected function getFieldName($fieldName)
+	{
+		return $fieldName;
+	}
+
+	/**
+	 * Method to get the field label.
+	 *
+	 * @return  string  The field label.
+	 *
+	 * @since   2.0
+	 */
+	protected function getLabel()
+	{
+		// Get the label text from the XML element, defaulting to the element name.
+		$title = $this->element['label'] ? (string) $this->element['label'] : '';
+
+		if (empty($title))
+		{
+			$view = $this->form->getView();
+			$params = $view->getViewOptionAndName();
+			$title = $params['option'] . '_' .
+				FOFInflector::pluralize($params['view']) . '_FIELD_' .
+				(string) $this->element['name'];
+			$title = strtoupper($title);
+			$result = JText::_($title);
+
+			if ($result === $title)
+			{
+				$title = ucfirst((string) $this->element['name']);
+			}
+		}
+
+		return $title;
+	}
+
+	/**
+	 * Get the filter value for this header field
+	 *
+	 * @return  mixed  The filter value
+	 */
+	protected function getValue()
+	{
+		$model = $this->form->getModel();
+
+		return $model->getState($this->filterSource);
+	}
+
+	/**
+	 * Return the key of the filter value in the model state or, if it's not set,
+	 * the name of the field.
+	 *
+	 * @param   string  $filterSource  The filter source value to return
+	 *
+	 * @return  string
+	 */
+	protected function getFilterSource($filterSource)
+	{
+		if ($filterSource)
+		{
+			return $filterSource;
+		}
+		else
+		{
+			return $this->name;
+		}
+	}
+
+	/**
+	 * Is this a sortable field?
+	 *
+	 * @return  boolean  True if it's sortable
+	 */
+	protected function getSortable()
+	{
+		$sortable = ($this->element['sortable'] != 'false');
+
+		if ($sortable)
+		{
+			if (empty($this->header))
+			{
+				$this->header = $this->getHeader();
+			}
+
+			$sortable = !empty($this->header);
+		}
+
+		return $sortable;
+	}
+
+	/**
+	 * Returns the HTML for the header row, or null if this element should
+	 * render no header element
+	 *
+	 * @return  string|null  HTML code or null if nothing is to be rendered
+	 *
+	 * @since 2.0
+	 */
+	protected function getHeader()
+	{
+		return null;
+	}
+
+	/**
+	 * Returns the HTML for a text filter to be rendered in the filter row,
+	 * or null if this element should render no text input filter.
+	 *
+	 * @return  string|null  HTML code or null if nothing is to be rendered
+	 *
+	 * @since 2.0
+	 */
+	protected function getFilter()
+	{
+		return null;
+	}
+
+	/**
+	 * Returns the HTML for the buttons to be rendered in the filter row,
+	 * next to the text input filter, or null if this element should render no
+	 * text input filter buttons.
+	 *
+	 * @return  string|null  HTML code or null if nothing is to be rendered
+	 *
+	 * @since 2.0
+	 */
+	protected function getButtons()
+	{
+		return null;
+	}
+
+	/**
+	 * Returns the JHtml options for a drop-down filter. Do not include an
+	 * empty option, it is added automatically.
+	 *
+	 * @return  array  The JHtml options for a drop-down filter
+	 *
+	 * @since 2.0
+	 */
+	protected function getOptions()
+	{
+		return array();
+	}
+}
diff --git a/core/libraries/fof/form/header/accesslevel.php b/core/libraries/fof/form/header/accesslevel.php
new file mode 100644
index 00000000..7de32e13
--- /dev/null
+++ b/core/libraries/fof/form/header/accesslevel.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Access level field header
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderAccesslevel extends FOFFormHeaderFieldselectable
+{
+	/**
+	 * Method to get the list of access levels
+	 *
+	 * @return  array	A list of access levels.
+	 *
+	 * @since   2.0
+	 */
+	protected function getOptions()
+	{
+		$db    = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.id AS value, a.title AS text');
+		$query->from('#__viewlevels AS a');
+		$query->group('a.id, a.title, a.ordering');
+		$query->order('a.ordering ASC');
+		$query->order($query->qn('title') . ' ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+		$options = $db->loadObjectList();
+
+		return $options;
+	}
+}
diff --git a/core/libraries/fof/form/header/field.php b/core/libraries/fof/form/header/field.php
new file mode 100644
index 00000000..91f66356
--- /dev/null
+++ b/core/libraries/fof/form/header/field.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic field header, without any filters
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderField extends FOFFormHeader
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		$sortable = ($this->element['sortable'] != 'false');
+
+		$label = $this->getLabel();
+
+		if ($sortable)
+		{
+			$view = $this->form->getView();
+
+			return JHTML::_('grid.sort', $label, $this->name,
+				$view->getLists()->order_Dir, $view->getLists()->order,
+				$this->form->getModel()->task
+			);
+		}
+		else
+		{
+			return JText::_($label);
+		}
+	}
+}
diff --git a/core/libraries/fof/form/header/fielddate.php b/core/libraries/fof/form/header/fielddate.php
new file mode 100644
index 00000000..475fcf15
--- /dev/null
+++ b/core/libraries/fof/form/header/fielddate.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic field header, with text input (search) filter
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFielddate extends FOFFormHeaderField
+{
+	/**
+	 * Get the filter field
+	 *
+	 * @return  string  The HTML
+	 */
+	protected function getFilter()
+	{
+		// Initialize some field attributes.
+		$format		 = $this->element['format'] ? (string) $this->element['format'] : '%Y-%m-%d';
+		$attributes  = array();
+
+		if ($this->element['size'])
+		{
+			$attributes['size'] = (int) $this->element['size'];
+		}
+
+		if ($this->element['maxlength'])
+		{
+			$attributes['maxlength'] = (int) $this->element['maxlength'];
+		}
+
+		if ($this->element['filterclass'])
+		{
+			$attributes['class'] = (string) $this->element['filterclass'];
+		}
+
+		if ((string) $this->element['readonly'] == 'true')
+		{
+			$attributes['readonly'] = 'readonly';
+		}
+
+		if ((string) $this->element['disabled'] == 'true')
+		{
+			$attributes['disabled'] = 'disabled';
+		}
+
+		if ($this->element['onchange'])
+		{
+			$attributes['onchange'] = (string) $this->element['onchange'];
+		}
+		else
+		{
+			$onchange = 'document.adminForm.submit()';
+		}
+
+		if ((string) $this->element['placeholder'])
+		{
+			$attributes['placeholder'] = JText::_((string) $this->element['placeholder']);
+		}
+
+		$name = $this->element['searchfieldname'] ? $this->element['searchfieldname'] : $this->name;
+
+		if ($this->element['searchfieldname'])
+		{
+			$model       = $this->form->getModel();
+			$searchvalue = $model->getState((string) $this->element['searchfieldname']);
+		}
+		else
+		{
+			$searchvalue = $this->value;
+		}
+
+		// Get some system objects.
+		$config = FOFPlatform::getInstance()->getConfig();
+		$user   = JFactory::getUser();
+
+		// If a known filter is given use it.
+		switch (strtoupper((string) $this->element['filter']))
+		{
+			case 'SERVER_UTC':
+				// Convert a date to UTC based on the server timezone.
+				if ((int) $this->value)
+				{
+					// Get a date object based on the correct timezone.
+					$date = FOFPlatform::getInstance()->getDate($searchvalue, 'UTC');
+					$date->setTimezone(new DateTimeZone($config->get('offset')));
+
+					// Transform the date string.
+					$searchvalue = $date->format('Y-m-d H:i:s', true, false);
+				}
+				break;
+
+			case 'USER_UTC':
+				// Convert a date to UTC based on the user timezone.
+				if ((int) $searchvalue)
+				{
+					// Get a date object based on the correct timezone.
+					$date = FOFPlatform::getInstance()->getDate($this->value, 'UTC');
+					$date->setTimezone($user->getTimezone());
+
+					// Transform the date string.
+					$searchvalue = $date->format('Y-m-d H:i:s', true, false);
+				}
+				break;
+		}
+
+		return JHtml::_('calendar', $searchvalue, $name, $name, $format, $attributes);
+	}
+
+	/**
+	 * Get the buttons HTML code
+	 *
+	 * @return  string  The HTML
+	 */
+	protected function getButtons()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/form/header/fieldfilterable.php b/core/libraries/fof/form/header/fieldfilterable.php
new file mode 100644
index 00000000..f51187af
--- /dev/null
+++ b/core/libraries/fof/form/header/fieldfilterable.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic field header, with text input (search) filter
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFieldfilterable extends FOFFormHeaderFieldsearchable
+{
+	/**
+	 * Get the filter field
+	 *
+	 * @return  string  The HTML
+	 */
+	protected function getFilter()
+	{
+		$valide = array('yes', 'true', '1');
+
+		// Initialize some field(s) attributes.
+		$size        = $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+		$maxLength   = $this->element['maxlength'] ? ' maxlength="' . (int) $this->element['maxlength'] . '"' : '';
+		$filterclass = $this->element['filterclass'] ? ' class="' . (string) $this->element['filterclass'] . '"' : '';
+		$placeholder = $this->element['placeholder'] ? $this->element['placeholder'] : $this->getLabel();
+		$name        = $this->element['searchfieldname'] ? $this->element['searchfieldname'] : $this->name;
+		$placeholder = ' placeholder="' . JText::_($placeholder) . '"';
+
+		$single      = in_array($this->element['single'], $valide) ? true : false;
+		$showMethod  = in_array($this->element['showmethod'], $valide) ? true : false;
+		$method      = $this->element['method'] ? $this->element['method'] : 'between';
+		$fromName    = $this->element['fromname'] ? $this->element['fromname'] : 'from';
+		$toName      = $this->element['toname'] ? $this->element['toname'] : 'to';
+
+		$values      = $this->form->getModel()->getState($name);
+		$fromValue   = $values[$fromName];
+		$toValue     = $values[$toName];
+
+		// Initialize JavaScript field attributes.
+		if ($this->element['onchange'])
+		{
+			$onchange = ' onchange="' . (string) $this->element['onchange'] . '"';
+		}
+		else
+		{
+			$onchange = ' onchange="document.adminForm.submit();"';
+		}
+
+		if ($showMethod)
+		{
+			$html  = '<input type="text" name="' . $name . '[method]" value="'. $method . '" />';
+		} else
+		{
+			$html  = '<input type="hidden" name="' . $name . '[method]" value="'. $method . '" />';
+		}
+
+		$html .= '<input type="text" name="' . $name . '[from]" id="' . $this->id . '_' . $fromName . '"' . ' value="'
+				. htmlspecialchars($fromValue, ENT_COMPAT, 'UTF-8') . '"' . $filterclass . $size . $placeholder . $onchange . $maxLength . '/>';
+
+		if (!$single)
+		{
+			$html .= '<input type="text" name="' . $name . '[to]" id="' . $this->id . '_' . $toName . '"' . ' value="'
+				. htmlspecialchars($toValue, ENT_COMPAT, 'UTF-8') . '"' . $filterclass . $size . $placeholder . $onchange . $maxLength . '/>';
+		}
+
+		return $html;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/form/header/fieldsearchable.php b/core/libraries/fof/form/header/fieldsearchable.php
new file mode 100644
index 00000000..cc7bcaf2
--- /dev/null
+++ b/core/libraries/fof/form/header/fieldsearchable.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic field header, with text input (search) filter
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFieldsearchable extends FOFFormHeaderField
+{
+	/**
+	 * Get the filter field
+	 *
+	 * @return  string  The HTML
+	 */
+	protected function getFilter()
+	{
+		// Initialize some field attributes.
+		$size        = $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+		$maxLength   = $this->element['maxlength'] ? ' maxlength="' . (int) $this->element['maxlength'] . '"' : '';
+		$filterclass = $this->element['filterclass'] ? ' class="' . (string) $this->element['filterclass'] . '"' : '';
+		$placeholder = $this->element['placeholder'] ? $this->element['placeholder'] : $this->getLabel();
+		$name        = $this->element['searchfieldname'] ? $this->element['searchfieldname'] : $this->name;
+		$placeholder = ' placeholder="' . JText::_($placeholder) . '"';
+
+		if ($this->element['searchfieldname'])
+		{
+			$model       = $this->form->getModel();
+			$searchvalue = $model->getState((string) $this->element['searchfieldname']);
+		}
+		else
+		{
+			$searchvalue = $this->value;
+		}
+
+		// Initialize JavaScript field attributes.
+		if ($this->element['onchange'])
+		{
+			$onchange = ' onchange="' . (string) $this->element['onchange'] . '"';
+		}
+		else
+		{
+			$onchange = ' onchange="document.adminForm.submit();"';
+		}
+
+		return '<input type="text" name="' . $name . '" id="' . $this->id . '"' . ' value="'
+			. htmlspecialchars($searchvalue, ENT_COMPAT, 'UTF-8') . '"' . $filterclass . $size . $placeholder . $onchange . $maxLength . '/>';
+	}
+
+	/**
+	 * Get the buttons HTML code
+	 *
+	 * @return  string  The HTML
+	 */
+	protected function getButtons()
+	{
+		$buttonclass = $this->element['buttonclass'] ? (string) $this->element['buttonclass'] : 'btn hasTip hasTooltip';
+		$buttonsState = strtolower($this->element['buttons']);
+		$show_buttons = !in_array($buttonsState, array('no', 'false', '0'));
+
+		if (!$show_buttons)
+		{
+			return '';
+		}
+
+		$html = '';
+
+		$html .= '<button class="' . $buttonclass . '" onclick="this.form.submit();" title="' . JText::_('JSEARCH_FILTER') . '" >' . "\n";
+		$html .= '<i class="icon-search"></i>';
+		$html .= '</button>' . "\n";
+		$html .= '<button class="' . $buttonclass . '" onclick="document.adminForm.' . $this->id . '.value=\'\';this.form.submit();" title="' . JText::_('JSEARCH_RESET') . '">' . "\n";
+		$html .= '<i class="icon-remove"></i>';
+		$html .= '</button>' . "\n";
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/form/header/fieldselectable.php b/core/libraries/fof/form/header/fieldselectable.php
new file mode 100644
index 00000000..9e6a56b6
--- /dev/null
+++ b/core/libraries/fof/form/header/fieldselectable.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic field header, with drop down filters
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFieldselectable extends FOFFormHeaderField
+{
+	/**
+	 * Create objects for the options
+	 *
+	 * @return  array  The array of option objects
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Get the field $options
+		foreach ($this->element->children() as $option)
+		{
+			// Only add <option /> elements.
+			if ($option->getName() != 'option')
+			{
+				continue;
+			}
+
+			// Create a new option object based on the <option /> element.
+			$options[] = JHtml::_(
+				'select.option',
+				(string) $option['value'],
+				JText::alt(
+					trim((string) $option),
+					preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)
+				),
+				'value', 'text', ((string) $option['disabled'] == 'true')
+			);
+		}
+
+		// Do we have a class and method source for our options?
+		$source_file = empty($this->element['source_file']) ? '' : (string) $this->element['source_file'];
+		$source_class = empty($this->element['source_class']) ? '' : (string) $this->element['source_class'];
+		$source_method = empty($this->element['source_method']) ? '' : (string) $this->element['source_method'];
+		$source_key = empty($this->element['source_key']) ? '*' : (string) $this->element['source_key'];
+		$source_value = empty($this->element['source_value']) ? '*' : (string) $this->element['source_value'];
+		$source_translate = empty($this->element['source_translate']) ? 'true' : (string) $this->element['source_translate'];
+		$source_translate = in_array(strtolower($source_translate), array('true','yes','1','on')) ? true : false;
+		$source_format = empty($this->element['source_format']) ? '' : (string) $this->element['source_format'];
+
+		if ($source_class && $source_method)
+		{
+			// Maybe we have to load a file?
+			if (!empty($source_file))
+			{
+				$source_file = FOFTemplateUtils::parsePath($source_file, true);
+
+				if (FOFPlatform::getInstance()->getIntegrationObject('filesystem')->fileExists($source_file))
+				{
+					include_once $source_file;
+				}
+			}
+
+			// Make sure the class exists
+			if (class_exists($source_class, true))
+			{
+				// ...and so does the option
+				if (in_array($source_method, get_class_methods($source_class)))
+				{
+					// Get the data from the class
+					if ($source_format == 'optionsobject')
+					{
+						$options = array_merge($options, $source_class::$source_method());
+					}
+					else
+					{
+						$source_data = $source_class::$source_method();
+
+						// Loop through the data and prime the $options array
+						foreach ($source_data as $k => $v)
+						{
+							$key = (empty($source_key) || ($source_key == '*')) ? $k : $v[$source_key];
+							$value = (empty($source_value) || ($source_value == '*')) ? $v : $v[$source_value];
+
+							if ($source_translate)
+							{
+								$value = JText::_($value);
+							}
+
+							$options[] = JHtml::_('select.option', $key, $value, 'value', 'text');
+						}
+					}
+				}
+			}
+		}
+
+		reset($options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/fof/form/header/fieldsql.php b/core/libraries/fof/form/header/fieldsql.php
new file mode 100644
index 00000000..e714b4ea
--- /dev/null
+++ b/core/libraries/fof/form/header/fieldsql.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic field header, with drop down filters based on a SQL query
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFieldsql extends FOFFormHeaderFieldselectable
+{
+	/**
+	 * Create objects for the options
+	 *
+	 * @return  array  The array of option objects
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Initialize some field attributes.
+		$key       = $this->element['key_field'] ? (string) $this->element['key_field'] : 'value';
+		$value     = $this->element['value_field'] ? (string) $this->element['value_field'] : (string) $this->element['name'];
+		$translate = $this->element['translate'] ? (string) $this->element['translate'] : false;
+		$query     = (string) $this->element['query'];
+
+		// Get the database object.
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// Set the query and get the result list.
+		$db->setQuery($query);
+		$items = $db->loadObjectlist();
+
+		// Build the field options.
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				if ($translate == true)
+				{
+					$options[] = JHtml::_('select.option', $item->$key, JText::_($item->$value));
+				}
+				else
+				{
+					$options[] = JHtml::_('select.option', $item->$key, $item->$value);
+				}
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/fof/form/header/filterdate.php b/core/libraries/fof/form/header/filterdate.php
new file mode 100644
index 00000000..cef04f8a
--- /dev/null
+++ b/core/libraries/fof/form/header/filterdate.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic filter, text box entry with calendar button
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.3.3
+ */
+class FOFFormHeaderFilterdate extends FOFFormHeaderFielddate
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/form/header/filterfilterable.php b/core/libraries/fof/form/header/filterfilterable.php
new file mode 100644
index 00000000..fc1260e7
--- /dev/null
+++ b/core/libraries/fof/form/header/filterfilterable.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic filter, text box entry with optional buttons
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFilterfilterable extends FOFFormHeaderFieldfilterable
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/form/header/filtersearchable.php b/core/libraries/fof/form/header/filtersearchable.php
new file mode 100644
index 00000000..0d3c207e
--- /dev/null
+++ b/core/libraries/fof/form/header/filtersearchable.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic filter, text box entry with optional buttons
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFiltersearchable extends FOFFormHeaderFieldsearchable
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/form/header/filterselectable.php b/core/libraries/fof/form/header/filterselectable.php
new file mode 100644
index 00000000..171b006a
--- /dev/null
+++ b/core/libraries/fof/form/header/filterselectable.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic filter, drop-down based on fixed options
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFilterselectable extends FOFFormHeaderFieldselectable
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/form/header/filtersql.php b/core/libraries/fof/form/header/filtersql.php
new file mode 100644
index 00000000..6adf71ff
--- /dev/null
+++ b/core/libraries/fof/form/header/filtersql.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Generic filter, drop-down based on SQL query
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderFiltersql extends FOFFormHeaderFieldsql
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/form/header/language.php b/core/libraries/fof/form/header/language.php
new file mode 100644
index 00000000..8ddfdb65
--- /dev/null
+++ b/core/libraries/fof/form/header/language.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Language field header
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderLanguage extends FOFFormHeaderFieldselectable
+{
+	/**
+	 * Method to get the filter options.
+	 *
+	 * @return  array  The filter option objects.
+	 *
+	 * @since   2.0
+	 */
+	protected function getOptions()
+	{
+		// Initialize some field attributes.
+		$client = (string) $this->element['client'];
+
+		if ($client != 'site' && $client != 'administrator')
+		{
+			$client = 'site';
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(
+			parent::getOptions(), JLanguageHelper::createLanguageList($this->value, constant('JPATH_' . strtoupper($client)), true, true)
+		);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/fof/form/header/model.php b/core/libraries/fof/form/header/model.php
new file mode 100644
index 00000000..e27d8895
--- /dev/null
+++ b/core/libraries/fof/form/header/model.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (!class_exists('JFormFieldSql'))
+{
+	require_once JPATH_LIBRARIES . '/joomla/form/fields/sql.php';
+}
+
+/**
+ * Form Field class for FOF
+ * Generic list from a model's results
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderModel extends FOFFormHeaderFieldselectable
+{
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Initialize some field attributes.
+		$key = $this->element['key_field'] ? (string) $this->element['key_field'] : 'value';
+		$value = $this->element['value_field'] ? (string) $this->element['value_field'] : (string) $this->element['name'];
+		$applyAccess = $this->element['apply_access'] ? (string) $this->element['apply_access'] : 'false';
+		$modelName = (string) $this->element['model'];
+		$nonePlaceholder = (string) $this->element['none'];
+		$translate = empty($this->element['translate']) ? 'true' : (string) $this->element['translate'];
+		$translate = in_array(strtolower($translate), array('true','yes','1','on')) ? true : false;
+
+		if (!empty($nonePlaceholder))
+		{
+			$options[] = JHtml::_('select.option', null, JText::_($nonePlaceholder));
+		}
+
+		// Process field atrtibutes
+		$applyAccess = strtolower($applyAccess);
+		$applyAccess = in_array($applyAccess, array('yes', 'on', 'true', '1'));
+
+		// Explode model name into model name and prefix
+		$parts = FOFInflector::explode($modelName);
+		$mName = ucfirst(array_pop($parts));
+		$mPrefix = FOFInflector::implode($parts);
+
+		// Get the model object
+		$config = array('savestate' => 0);
+		$model = FOFModel::getTmpInstance($mName, $mPrefix, $config);
+
+		if ($applyAccess)
+		{
+			$model->applyAccessFiltering();
+		}
+
+		// Process state variables
+		foreach ($this->element->children() as $stateoption)
+		{
+			// Only add <option /> elements.
+			if ($stateoption->getName() != 'state')
+			{
+				continue;
+			}
+
+			$stateKey = (string) $stateoption['key'];
+			$stateValue = (string) $stateoption;
+
+			$model->setState($stateKey, $stateValue);
+		}
+
+		// Set the query and get the result list.
+		$items = $model->getItemList(true);
+
+		// Build the field options.
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				if ($translate == true)
+				{
+					$options[] = JHtml::_('select.option', $item->$key, JText::_($item->$value));
+				}
+				else
+				{
+					$options[] = JHtml::_('select.option', $item->$key, $item->$value);
+				}
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/fof/form/header/ordering.php b/core/libraries/fof/form/header/ordering.php
new file mode 100644
index 00000000..467ab83e
--- /dev/null
+++ b/core/libraries/fof/form/header/ordering.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Ordering field header
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderOrdering extends FOFFormHeader
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		$sortable = ($this->element['sortable'] != 'false');
+
+		$view = $this->form->getView();
+		$model = $this->form->getModel();
+
+		$hasAjaxOrderingSupport = $view->hasAjaxOrderingSupport();
+
+		if (!$sortable)
+		{
+			// Non sortable?! I'm not sure why you'd want that, but if you insist...
+			return JText::_('JGRID_HEADING_ORDERING');
+		}
+
+		if (!$hasAjaxOrderingSupport)
+		{
+			// Ye olde Joomla! 2.5 method
+			$html = JHTML::_('grid.sort', 'JFIELD_ORDERING_LABEL', 'ordering', $view->getLists()->order_Dir, $view->getLists()->order, 'browse');
+			$html .= JHTML::_('grid.order', $model->getList());
+
+			return $html;
+		}
+		else
+		{
+			// The new, drag'n'drop ordering support WITH a save order button
+			$html = JHtml::_(
+				'grid.sort',
+				'<i class="icon-menu-2"></i>',
+				'ordering',
+				$view->getLists()->order_Dir,
+				$view->getLists()->order,
+				null,
+				'asc',
+				'JGRID_HEADING_ORDERING'
+			);
+
+			$ordering = $view->getLists()->order == 'ordering';
+
+			if ($ordering)
+			{
+				$html .= '<a href="javascript:saveorder(' . (count($model->getList()) - 1) . ', \'saveorder\')" ' .
+					'rel="tooltip" class="save-order btn btn-micro pull-right" title="' . JText::_('JLIB_HTML_SAVE_ORDER') . '">'
+					. '<span class="icon-ok"></span></a>';
+			}
+
+			return $html;
+		}
+	}
+}
diff --git a/core/libraries/fof/form/header/published.php b/core/libraries/fof/form/header/published.php
new file mode 100644
index 00000000..8d48a674
--- /dev/null
+++ b/core/libraries/fof/form/header/published.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Field header for Published (enabled) columns
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderPublished extends FOFFormHeaderFieldselectable
+{
+	/**
+	 * Create objects for the options
+	 *
+	 * @return  array  The array of option objects
+	 */
+	protected function getOptions()
+	{
+		$config = array(
+			'published'		 => 1,
+			'unpublished'	 => 1,
+			'archived'		 => 0,
+			'trash'			 => 0,
+			'all'			 => 0,
+		);
+
+		$stack = array();
+
+		if ($this->element['show_published'] == 'false')
+		{
+			$config['published'] = 0;
+		}
+
+		if ($this->element['show_unpublished'] == 'false')
+		{
+			$config['unpublished'] = 0;
+		}
+
+		if ($this->element['show_archived'] == 'true')
+		{
+			$config['archived'] = 1;
+		}
+
+		if ($this->element['show_trash'] == 'true')
+		{
+			$config['trash'] = 1;
+		}
+
+		if ($this->element['show_all'] == 'true')
+		{
+			$config['all'] = 1;
+		}
+
+		$options = JHtml::_('jgrid.publishedOptions', $config);
+
+		reset($options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/fof/form/header/rowselect.php b/core/libraries/fof/form/header/rowselect.php
new file mode 100644
index 00000000..340a6832
--- /dev/null
+++ b/core/libraries/fof/form/header/rowselect.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Row selection checkbox
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHeaderRowselect extends FOFFormHeader
+{
+	/**
+	 * Get the header
+	 *
+	 * @return  string  The header HTML
+	 */
+	protected function getHeader()
+	{
+		return '<input type="checkbox" name="checkall-toggle" value="" title="'
+			. JText::_('JGLOBAL_CHECK_ALL')
+			. '" onclick="Joomla.checkAll(this)" />';
+	}
+}
diff --git a/core/libraries/fof/form/helper.php b/core/libraries/fof/form/helper.php
new file mode 100644
index 00000000..073e3518
--- /dev/null
+++ b/core/libraries/fof/form/helper.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @package    FrameworkOnFramework
+ * @subpackage form
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+JLoader::import('joomla.form.helper');
+
+/**
+ * FOFForm's helper class.
+ * Provides a storage for filesystem's paths where FOFForm's entities reside and
+ * methods for creating those entities. Also stores objects with entities'
+ * prototypes for further reusing.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFFormHelper extends JFormHelper
+{
+	/**
+	 * Method to load a form field object given a type.
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  JFormField object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadFieldType($type, $new = true)
+	{
+		return self::loadType('field', $type, $new);
+	}
+
+	/**
+	 * Method to load a form field object given a type.
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  JFormField object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadHeaderType($type, $new = true)
+	{
+		return self::loadType('header', $type, $new);
+	}
+
+	/**
+	 * Method to load a form entity object given a type.
+	 * Each type is loaded only once and then used as a prototype for other objects of same type.
+	 * Please, use this method only with those entities which support types (forms don't support them).
+	 *
+	 * @param   string   $entity  The entity.
+	 * @param   string   $type    The entity type.
+	 * @param   boolean  $new     Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  Entity object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	protected static function loadType($entity, $type, $new = true)
+	{
+		// Reference to an array with current entity's type instances
+		$types = &self::$entities[$entity];
+
+		$key = md5($type);
+
+		// Return an entity object if it already exists and we don't need a new one.
+		if (isset($types[$key]) && $new === false)
+		{
+			return $types[$key];
+		}
+
+		$class = self::loadClass($entity, $type);
+
+		if ($class !== false)
+		{
+			// Instantiate a new type object.
+			$types[$key] = new $class;
+
+			return $types[$key];
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Attempt to import the JFormField class file if it isn't already imported.
+	 * You can use this method outside of JForm for loading a field for inheritance or composition.
+	 *
+	 * @param   string  $type  Type of a field whose class should be loaded.
+	 *
+	 * @return  mixed  Class name on success or false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadFieldClass($type)
+	{
+		return self::loadClass('field', $type);
+	}
+
+	/**
+	 * Attempt to import the FOFFormHeader class file if it isn't already imported.
+	 * You can use this method outside of JForm for loading a field for inheritance or composition.
+	 *
+	 * @param   string  $type  Type of a field whose class should be loaded.
+	 *
+	 * @return  mixed  Class name on success or false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadHeaderClass($type)
+	{
+		return self::loadClass('header', $type);
+	}
+
+	/**
+	 * Load a class for one of the form's entities of a particular type.
+	 * Currently, it makes sense to use this method for the "field" and "rule" entities
+	 * (but you can support more entities in your subclass).
+	 *
+	 * @param   string  $entity  One of the form entities (field or rule).
+	 * @param   string  $type    Type of an entity.
+	 *
+	 * @return  mixed  Class name on success or false otherwise.
+	 *
+	 * @since   2.0
+	 */
+	public static function loadClass($entity, $type)
+	{
+		if (strpos($type, '.'))
+		{
+			list($prefix, $type) = explode('.', $type);
+			$altPrefix = $prefix;
+		}
+		else
+		{
+			$prefix = 'FOF';
+			$altPrefix = 'J';
+		}
+
+		$class = JString::ucfirst($prefix, '_') . 'Form' . JString::ucfirst($entity, '_') . JString::ucfirst($type, '_');
+		$altClass = JString::ucfirst($altPrefix, '_') . 'Form' . JString::ucfirst($entity, '_') . JString::ucfirst($type, '_');
+
+		if (class_exists($class))
+		{
+			return $class;
+		}
+		elseif (class_exists($altClass))
+		{
+			return $altClass;
+		}
+
+		// Get the field search path array.
+		$paths = self::addPath($entity);
+
+		// If the type is complex, add the base type to the paths.
+		if ($pos = strpos($type, '_'))
+		{
+			// Add the complex type prefix to the paths.
+			for ($i = 0, $n = count($paths); $i < $n; $i++)
+			{
+				// Derive the new path.
+				$path = $paths[$i] . '/' . strtolower(substr($type, 0, $pos));
+
+				// If the path does not exist, add it.
+				if (!in_array($path, $paths))
+				{
+					$paths[] = $path;
+				}
+			}
+
+			// Break off the end of the complex type.
+			$type = substr($type, $pos + 1);
+		}
+
+		// Try to find the class file.
+		$type       = strtolower($type) . '.php';
+        $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		foreach ($paths as $path)
+		{
+			if ($file = $filesystem->pathFind($path, $type))
+			{
+				require_once $file;
+
+				if (class_exists($class))
+				{
+					break;
+				}
+				elseif (class_exists($altClass))
+				{
+					break;
+				}
+			}
+		}
+
+		// Check for all if the class exists.
+		if (class_exists($class))
+		{
+			return $class;
+		}
+		elseif (class_exists($altClass))
+		{
+			return $altClass;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to add a path to the list of header include paths.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 */
+	public static function addHeaderPath($new = null)
+	{
+		return self::addPath('header', $new);
+	}
+}
diff --git a/core/libraries/fof/hal/document.php b/core/libraries/fof/hal/document.php
new file mode 100644
index 00000000..aeee468a
--- /dev/null
+++ b/core/libraries/fof/hal/document.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  hal
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Implementation of the Hypertext Application Language document in PHP. It can
+ * be used to provide hypermedia in a web service context.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFHalDocument
+{
+	/**
+	 * The collection of links of this document
+	 *
+	 * @var   FOFHalLinks
+	 */
+	private $_links = null;
+
+	/**
+	 * The data (resource state or collection of resource state objects) of the
+	 * document.
+	 *
+	 * @var   array
+	 */
+	private $_data = null;
+
+	/**
+	 * Embedded documents. This is an array of FOFHalDocument instances.
+	 *
+	 * @var   array
+	 */
+	private $_embedded = array();
+
+	/**
+	 * When $_data is an array we'll output the list of data under this key
+	 * (JSON) or tag (XML)
+	 *
+	 * @var   string
+	 */
+	private $_dataKey = '_list';
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   mixed  $data  The data of the document (usually, the resource state)
+	 */
+	public function __construct($data = null)
+	{
+		$this->_data = $data;
+		$this->_links = new FOFHalLinks;
+	}
+
+	/**
+	 * Add a link to the document
+	 *
+	 * @param   string      $rel        The relation of the link to the document.
+	 *                                  See RFC 5988 http://tools.ietf.org/html/rfc5988#section-6.2.2 A document MUST always have
+	 *                                  a "self" link.
+	 * @param   FOFHalLink  $link       The actual link object
+	 * @param   boolean     $overwrite  When false and a link of $rel relation exists, an array of links is created. Otherwise the
+	 *                                  existing link is overwriten with the new one
+	 *
+	 * @see FOFHalLinks::addLink
+	 *
+	 * @return  boolean  True if the link was added to the collection
+	 */
+	public function addLink($rel, FOFHalLink $link, $overwrite = true)
+	{
+		return $this->_links->addLink($rel, $link, $overwrite);
+	}
+
+	/**
+	 * Add links to the document
+	 *
+	 * @param   string   $rel        The relation of the link to the document. See RFC 5988
+	 * @param   array    $links      An array of FOFHalLink objects
+	 * @param   boolean  $overwrite  When false and a link of $rel relation exists, an array of
+	 *                               links is created. Otherwise the existing link is overwriten
+	 *                               with the new one
+	 *
+	 * @see FOFHalLinks::addLinks
+	 *
+	 * @return  boolean
+	 */
+	public function addLinks($rel, array $links, $overwrite = true)
+	{
+		return $this->_links->addLinks($rel, $links, $overwrite);
+	}
+
+	/**
+	 * Add data to the document
+	 *
+	 * @param   stdClass  $data       The data to add
+	 * @param   boolean   $overwrite  Should I overwrite existing data?
+	 *
+	 * @return  void
+	 */
+	public function addData($data, $overwrite = true)
+	{
+		if (is_array($data))
+		{
+			$data = (object) $data;
+		}
+
+		if ($overwrite)
+		{
+			$this->_data = $data;
+		}
+		else
+		{
+			if (!is_array($this->_data))
+			{
+				$this->_data = array($this->_data);
+			}
+
+			$this->_data[] = $data;
+		}
+	}
+
+	/**
+	 * Add an embedded document
+	 *
+	 * @param   string          $rel        The relation of the embedded document to its container document
+	 * @param   FOFHalDocument  $document   The document to add
+	 * @param   boolean         $overwrite  Should I overwrite existing data with the same relation?
+	 *
+	 * @return  boolean
+	 */
+	public function addEmbedded($rel, FOFHalDocument $document, $overwrite = true)
+	{
+		if (!array_key_exists($rel, $this->_embedded) || !$overwrite)
+		{
+			$this->_embedded[$rel] = $document;
+		}
+		elseif (array_key_exists($rel, $this->_embedded) && !$overwrite)
+		{
+			if (!is_array($this->_embedded[$rel]))
+			{
+				$this->_embedded[$rel] = array($this->_embedded[$rel]);
+			}
+
+			$this->_embedded[$rel][] = $document;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the collection of links of this document
+	 *
+	 * @param   string  $rel  The relation of the links to fetch. Skip to get all links.
+	 *
+	 * @return  array
+	 */
+	public function getLinks($rel = null)
+	{
+		return $this->_links->getLinks($rel);
+	}
+
+	/**
+	 * Returns the collection of embedded documents
+	 *
+	 * @param   string  $rel  Optional; the relation to return the embedded documents for
+	 *
+	 * @return  array|FOFHalDocument
+	 */
+	public function getEmbedded($rel = null)
+	{
+		if (empty($rel))
+		{
+			return $this->_embedded;
+		}
+		elseif (isset($this->_embedded[$rel]))
+		{
+			return $this->_embedded[$rel];
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Return the data attached to this document
+	 *
+	 * @return   array|stdClass
+	 */
+	public function getData()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * Instantiate and call a suitable renderer class to render this document
+	 * into the specified format.
+	 *
+	 * @param   string  $format  The format to render the document into, e.g. 'json'
+	 *
+	 * @return  string  The rendered document
+	 *
+	 * @throws  RuntimeException  If the format is unknown, i.e. there is no suitable renderer
+	 */
+	public function render($format = 'json')
+	{
+		$class_name = 'FOFHalRender' . ucfirst($format);
+
+		if (!class_exists($class_name, true))
+		{
+			throw new RuntimeException("Unsupported HAL Document format '$format'. Render aborted.");
+		}
+
+		$renderer = new $class_name($this);
+
+		return $renderer->render(
+			array(
+				'data_key'		=> $this->_dataKey
+			)
+		);
+	}
+}
diff --git a/core/libraries/fof/hal/link.php b/core/libraries/fof/hal/link.php
new file mode 100644
index 00000000..90660a5f
--- /dev/null
+++ b/core/libraries/fof/hal/link.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  hal
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Implementation of the Hypertext Application Language link in PHP.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFHalLink
+{
+	/**
+	 * For indicating the target URI. Corresponds with the ’Target IRI’ as
+	 * defined in Web Linking (RFC 5988). This attribute MAY contain a URI
+	 * Template (RFC6570) and in which case, SHOULD be complemented by an
+	 * additional templated attribtue on the link with a boolean value true.
+	 *
+	 * @var string
+	 */
+	protected $_href = '';
+
+	/**
+	 * This attribute SHOULD be present with a boolean value of true when the
+	 * href of the link contains a URI Template (RFC6570).
+	 *
+	 * @var  boolean
+	 */
+	protected $_templated = false;
+
+	/**
+	 * For distinguishing between Resource and Link elements that share the
+	 * same relation
+	 *
+	 * @var  string
+	 */
+	protected $_name = null;
+
+	/**
+	 * For indicating what the language of the result of dereferencing the link should be.
+	 *
+	 * @var  string
+	 */
+	protected $_hreflang = null;
+
+	/**
+	 * For labeling the destination of a link with a human-readable identifier.
+	 *
+	 * @var  string
+	 */
+	protected $_title = null;
+
+	/**
+	 * Public constructor of a FOFHalLink object
+	 *
+	 * @param   string   $href       See $this->_href
+	 * @param   boolean  $templated  See $this->_templated
+	 * @param   string   $name       See $this->_name
+	 * @param   string   $hreflang   See $this->_hreflang
+	 * @param   string   $title      See $this->_title
+	 *
+	 * @throws  RuntimeException  If $href is empty
+	 */
+	public function __construct($href, $templated = false, $name = null, $hreflang = null, $title = null)
+	{
+		if (empty($href))
+		{
+			throw new RuntimeException('A HAL link must always have a non-empty href');
+		}
+
+		$this->_href = $href;
+		$this->_templated = $templated;
+		$this->_name = $name;
+		$this->_hreflang = $hreflang;
+		$this->_title = $title;
+	}
+
+	/**
+	 * Is this a valid link? Checks the existence of required fields, not their
+	 * values.
+	 *
+	 * @return  boolean
+	 */
+	public function check()
+	{
+		return !empty($this->_href);
+	}
+
+	/**
+	 * Magic getter for the protected properties
+	 *
+	 * @param   string  $name  The name of the property to retrieve, sans the underscore
+	 *
+	 * @return  mixed  Null will always be returned if the property doesn't exist
+	 */
+	public function __get($name)
+	{
+		$property = '_' . $name;
+
+		if (property_exists($this, $property))
+		{
+			return $this->$property;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Magic setter for the protected properties
+	 *
+	 * @param   string  $name   The name of the property to set, sans the underscore
+	 * @param   mixed   $value  The value of the property to set
+	 *
+	 * @return  void
+	 */
+	public function __set($name, $value)
+	{
+		if (($name == 'href') && empty($value))
+		{
+			return;
+		}
+
+		$property = '_' . $name;
+
+		if (property_exists($this, $property))
+		{
+			$this->$property = $value;
+		}
+	}
+}
diff --git a/core/libraries/fof/hal/links.php b/core/libraries/fof/hal/links.php
new file mode 100644
index 00000000..d24d5d27
--- /dev/null
+++ b/core/libraries/fof/hal/links.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  hal
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Implementation of the Hypertext Application Language links in PHP. This is
+ * actually a collection of links.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFHalLinks
+{
+	/**
+	 * The collection of links, sorted by relation
+	 *
+	 * @var array
+	 */
+	private $_links = array();
+
+	/**
+	 * Add a single link to the links collection
+	 *
+	 * @param   string      $rel        The relation of the link to the document. See RFC 5988
+	 *                                  http://tools.ietf.org/html/rfc5988#section-6.2.2 A document
+	 *                                  MUST always have a "self" link.
+	 * @param   FOFHalLink  $link       The actual link object
+	 * @param   boolean     $overwrite  When false and a link of $rel relation exists, an array of
+	 *                                  links is created. Otherwise the existing link is overwriten
+	 *                                  with the new one
+	 *
+	 * @return  boolean  True if the link was added to the collection
+	 */
+	public function addLink($rel, FOFHalLink $link, $overwrite = true)
+	{
+		if (!$link->check())
+		{
+			return false;
+		}
+
+		if (!array_key_exists($rel, $this->_links) || $overwrite)
+		{
+			$this->_links[$rel] = $link;
+		}
+		elseif (array_key_exists($rel, $this->_links) && !$overwrite)
+		{
+			if (!is_array($this->_links[$rel]))
+			{
+				$this->_links[$rel] = array($this->_links[$rel]);
+			}
+
+			$this->_links[$rel][] = $link;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Add multiple links to the links collection
+	 *
+	 * @param   string   $rel        The relation of the links to the document. See RFC 5988.
+	 * @param   array    $links      An array of FOFHalLink objects
+	 * @param   boolean  $overwrite  When false and a link of $rel relation exists, an array
+	 *                               of links is created. Otherwise the existing link is
+	 *                               overwriten with the new one
+	 *
+	 * @return  boolean  True if the link was added to the collection
+	 */
+	public function addLinks($rel, array $links, $overwrite = true)
+	{
+		if (empty($links))
+		{
+			return false;
+		}
+
+		$localOverwrite = $overwrite;
+
+		foreach ($links as $link)
+		{
+			if ($link instanceof FOFHalLink)
+			{
+				$this->addLink($rel, $link, $localOverwrite);
+			}
+
+			// After the first time we call this with overwrite on we have to
+			// turn it off so that the other links are added to the set instead
+			// of overwriting the first item that's already added.
+			if ($localOverwrite)
+			{
+				$localOverwrite = false;
+			}
+		}
+	}
+
+	/**
+	 * Returns the collection of links
+	 *
+	 * @param   string  $rel  Optional; the relation to return the links for
+	 *
+	 * @return  array|FOFHalLink
+	 */
+	public function getLinks($rel = null)
+	{
+		if (empty($rel))
+		{
+			return $this->_links;
+		}
+		elseif (isset($this->_links[$rel]))
+		{
+			return $this->_links[$rel];
+		}
+		else
+		{
+			return array();
+		}
+	}
+}
diff --git a/core/libraries/fof/hal/render/interface.php b/core/libraries/fof/hal/render/interface.php
new file mode 100644
index 00000000..c8644f0b
--- /dev/null
+++ b/core/libraries/fof/hal/render/interface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  hal
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Interface for HAL document renderers
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+interface FOFHalRenderInterface
+{
+	/**
+	 * Render a HAL document into a representation suitable for consumption.
+	 *
+	 * @param   array  $options  Renderer-specific options
+	 *
+	 * @return  void
+	 */
+	public function render($options = array());
+}
diff --git a/core/libraries/fof/hal/render/json.php b/core/libraries/fof/hal/render/json.php
new file mode 100644
index 00000000..61776814
--- /dev/null
+++ b/core/libraries/fof/hal/render/json.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  hal
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Implements the HAL over JSON renderer
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFHalRenderJson implements FOFHalRenderInterface
+{
+	/**
+	 * When data is an array we'll output the list of data under this key
+	 *
+	 * @var   string
+	 */
+	private $_dataKey = '_list';
+
+	/**
+	 * The document to render
+	 *
+	 * @var   FOFHalDocument
+	 */
+	protected $_document;
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   FOFHalDocument  &$document  The document to render
+	 */
+	public function __construct(&$document)
+	{
+		$this->_document = $document;
+	}
+
+	/**
+	 * Render a HAL document in JSON format
+	 *
+	 * @param   array  $options  Rendering options. You can currently only set json_options (json_encode options)
+	 *
+	 * @return  string  The JSON representation of the HAL document
+	 */
+	public function render($options = array())
+	{
+		if (isset($options['data_key']))
+		{
+			$this->_dataKey = $options['data_key'];
+		}
+
+		if (isset($options['json_options']))
+		{
+			$jsonOptions = $options['json_options'];
+		}
+		else
+		{
+			$jsonOptions = 0;
+		}
+
+		$serialiseThis = new stdClass;
+
+		// Add links
+		$collection = $this->_document->getLinks();
+		$serialiseThis->_links = new stdClass;
+
+		foreach ($collection as $rel => $links)
+		{
+			if (!is_array($links))
+			{
+				$serialiseThis->_links->$rel = $this->_getLink($links);
+			}
+			else
+			{
+				$serialiseThis->_links->$rel = array();
+
+				foreach ($links as $link)
+				{
+					array_push($serialiseThis->_links->$rel, $this->_getLink($link));
+				}
+			}
+		}
+
+		// Add embedded documents
+
+		$collection = $this->_document->getEmbedded();
+
+		if (!empty($collection))
+		{
+			$serialiseThis->_embedded->$rel = new stdClass;
+
+			foreach ($collection as $rel => $embeddeddocs)
+			{
+				if (!is_array($embeddeddocs))
+				{
+					$embeddeddocs = array($embeddeddocs);
+				}
+
+				foreach ($embeddeddocs as $embedded)
+				{
+					$renderer = new FOFHalRenderJson($embedded);
+					array_push($serialiseThis->_embedded->$rel, $renderer->render($options));
+				}
+			}
+		}
+
+		// Add data
+		$data = $this->_document->getData();
+
+		if (is_object($data))
+		{
+			if ($data instanceof FOFTable)
+			{
+				$data = $data->getData();
+			}
+			else
+			{
+				$data = (array) $data;
+			}
+
+			if (!empty($data))
+			{
+				foreach ($data as $k => $v)
+				{
+					$serialiseThis->$k = $v;
+				}
+			}
+		}
+		elseif (is_array($data))
+		{
+			$serialiseThis->{$this->_dataKey} = $data;
+		}
+
+		return json_encode($serialiseThis, $jsonOptions);
+	}
+
+	/**
+	 * Converts a FOFHalLink object into a stdClass object which will be used
+	 * for JSON serialisation
+	 *
+	 * @param   FOFHalLink  $link  The link you want converted
+	 *
+	 * @return  stdClass  The converted link object
+	 */
+	protected function _getLink(FOFHalLink $link)
+	{
+		$ret = array(
+			'href'	=> $link->href
+		);
+
+		if ($link->templated)
+		{
+			$ret['templated'] = 'true';
+		}
+
+		if (!empty($link->name))
+		{
+			$ret['name'] = $link->name;
+		}
+
+		if (!empty($link->hreflang))
+		{
+			$ret['hreflang'] = $link->hreflang;
+		}
+
+		if (!empty($link->title))
+		{
+			$ret['title'] = $link->title;
+		}
+
+		return (object) $ret;
+	}
+}
diff --git a/core/libraries/fof/include.php b/core/libraries/fof/include.php
new file mode 100644
index 00000000..e48b455f
--- /dev/null
+++ b/core/libraries/fof/include.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ *  @package     FrameworkOnFramework
+ *  @subpackage  include
+ *  @copyright   Copyright (C) 2010-2015 Nicholas K. Dionysopoulos
+ *  @license     GNU General Public License version 2, or later
+ *
+ *  @deprecated  4.0  Deprecated without replacement include FOF by your own if required
+ *
+ *  Initializes FOF
+ */
+
+defined('_JEXEC') or die();
+
+if (!defined('FOF_INCLUDED'))
+{
+	define('FOF_INCLUDED', '2.5.5');
+
+	// Register the FOF autoloader
+	require_once __DIR__ . '/autoloader/fof.php';
+	FOFAutoloaderFof::init();
+
+	// Register a debug log
+	if (defined('JDEBUG') && JDEBUG)
+	{
+		FOFPlatform::getInstance()->logAddLogger('fof.log.php');
+	}
+}
diff --git a/core/libraries/fof/inflector/inflector.php b/core/libraries/fof/inflector/inflector.php
new file mode 100644
index 00000000..880df47a
--- /dev/null
+++ b/core/libraries/fof/inflector/inflector.php
@@ -0,0 +1,461 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  inflector
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * The FOFInflector is an adaptation of the Akelos PHP Inflector which is a PHP
+ * port from a Ruby on Rails project.
+ */
+
+/**
+ * FOFInflector to pluralize and singularize English nouns.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFInflector
+{
+	/**
+	 * Rules for pluralizing and singularizing of nouns.
+	 *
+	 * @var array
+	 */
+	protected static $_rules = array
+	(
+		'pluralization'   => array(
+			'/move$/i'                      => 'moves',
+			'/sex$/i'                       => 'sexes',
+			'/child$/i'                     => 'children',
+			'/children$/i'                  => 'children',
+			'/man$/i'                       => 'men',
+			'/men$/i'                       => 'men',
+			'/foot$/i'                      => 'feet',
+			'/feet$/i'                      => 'feet',
+			'/person$/i'                    => 'people',
+			'/people$/i'                    => 'people',
+			'/taxon$/i'                     => 'taxa',
+			'/taxa$/i'                      => 'taxa',
+			'/(quiz)$/i'                    => '$1zes',
+			'/^(ox)$/i'                     => '$1en',
+			'/oxen$/i'                      => 'oxen',
+			'/(m|l)ouse$/i'                 => '$1ice',
+			'/(m|l)ice$/i'                  => '$1ice',
+			'/(matr|vert|ind|suff)ix|ex$/i' => '$1ices',
+			'/(x|ch|ss|sh)$/i'              => '$1es',
+			'/([^aeiouy]|qu)y$/i'           => '$1ies',
+			'/(?:([^f])fe|([lr])f)$/i'      => '$1$2ves',
+			'/sis$/i'                       => 'ses',
+			'/([ti]|addend)um$/i'           => '$1a',
+			'/([ti]|addend)a$/i'            => '$1a',
+			'/(alumn|formul)a$/i'           => '$1ae',
+			'/(alumn|formul)ae$/i'          => '$1ae',
+			'/(buffal|tomat|her)o$/i'       => '$1oes',
+			'/(bu)s$/i'                     => '$1ses',
+			'/(alias|status)$/i'            => '$1es',
+			'/(octop|vir)us$/i'             => '$1i',
+			'/(octop|vir)i$/i'              => '$1i',
+			'/(gen)us$/i'                   => '$1era',
+			'/(gen)era$/i'                  => '$1era',
+			'/(ax|test)is$/i'               => '$1es',
+			'/s$/i'                         => 's',
+			'/$/'                           => 's',
+		),
+		'singularization' => array(
+			'/cookies$/i'                                                      => 'cookie',
+			'/moves$/i'                                                        => 'move',
+			'/sexes$/i'                                                        => 'sex',
+			'/children$/i'                                                     => 'child',
+			'/men$/i'                                                          => 'man',
+			'/feet$/i'                                                         => 'foot',
+			'/people$/i'                                                       => 'person',
+			'/taxa$/i'                                                         => 'taxon',
+			'/databases$/i'                                                    => 'database',
+      '/menus$/i'                                                        => 'menu',
+			'/(quiz)zes$/i'                                                    => '\1',
+			'/(matr|suff)ices$/i'                                              => '\1ix',
+			'/(vert|ind|cod)ices$/i'                                           => '\1ex',
+			'/^(ox)en/i'                                                       => '\1',
+			'/(alias|status)es$/i'                                             => '\1',
+			'/(tomato|hero|buffalo)es$/i'                                      => '\1',
+			'/([octop|vir])i$/i'                                               => '\1us',
+			'/(gen)era$/i'                                                     => '\1us',
+			'/(cris|^ax|test)es$/i'                                            => '\1is',
+			'/is$/i'                                                           => 'is',
+			'/us$/i'                                                           => 'us',
+			'/ias$/i'                                                          => 'ias',
+			'/(shoe)s$/i'                                                      => '\1',
+			'/(o)es$/i'                                                        => '\1e',
+			'/(bus)es$/i'                                                      => '\1',
+			'/([m|l])ice$/i'                                                   => '\1ouse',
+			'/(x|ch|ss|sh)es$/i'                                               => '\1',
+			'/(m)ovies$/i'                                                     => '\1ovie',
+			'/(s)eries$/i'                                                     => '\1eries',
+			'/(v)ies$/i'                                                       => '\1ie',
+			'/([^aeiouy]|qu)ies$/i'                                            => '\1y',
+			'/([lr])ves$/i'                                                    => '\1f',
+			'/(tive)s$/i'                                                      => '\1',
+			'/(hive)s$/i'                                                      => '\1',
+			'/([^f])ves$/i'                                                    => '\1fe',
+			'/(^analy)ses$/i'                                                  => '\1sis',
+			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/([ti]|addend)a$/i'                                               => '\1um',
+			'/(alumn|formul)ae$/i'                                             => '$1a',
+			'/(n)ews$/i'                                                       => '\1ews',
+			'/(.*)ss$/i'                                                       => '\1ss',
+			'/(.*)s$/i'                                                        => '\1',
+		),
+		'countable'       => array(
+			'aircraft',
+			'cannon',
+			'deer',
+			'equipment',
+			'fish',
+			'information',
+			'money',
+			'moose',
+			'rice',
+			'series',
+			'sheep',
+			'species',
+			'swine',
+		)
+	);
+
+	/**
+	 * Cache of pluralized and singularized nouns.
+	 *
+	 * @var array
+	 */
+	protected static $_cache = array(
+		'singularized' => array(),
+		'pluralized'   => array()
+	);
+
+	/**
+	 * Constructor
+	 *
+	 * Prevent creating instances of this class by making the constructor private
+	 */
+	private function __construct()
+	{
+	}
+
+	public static function deleteCache()
+	{
+		static::$_cache['pluralized'] = array();
+		static::$_cache['singularized'] = array();
+	}
+
+	/**
+	 * Add a word to the cache, useful to make exceptions or to add words in other languages.
+	 *
+	 * @param   string  $singular  word.
+	 * @param   string  $plural    word.
+	 *
+	 * @return  void
+	 */
+	public static function addWord($singular, $plural)
+	{
+		static::$_cache['pluralized'][$singular] = $plural;
+		static::$_cache['singularized'][$plural] = $singular;
+	}
+
+	/**
+	 * Singular English word to plural.
+	 *
+	 * @param   string  $word  word to pluralize.
+	 *
+	 * @return  string Plural noun.
+	 */
+	public static function pluralize($word)
+	{
+		// Get the cached noun of it exists
+		if (isset(static::$_cache['pluralized'][$word]))
+		{
+			return static::$_cache['pluralized'][$word];
+		}
+
+		// Create the plural noun
+		if (in_array($word, self::$_rules['countable']))
+		{
+			static::$_cache['pluralized'][$word] = $word;
+
+			return $word;
+		}
+
+		foreach (self::$_rules['pluralization'] as $regexp => $replacement)
+		{
+			$matches = null;
+			$plural  = preg_replace($regexp, $replacement, $word, -1, $matches);
+
+			if ($matches > 0)
+			{
+				static::$_cache['pluralized'][$word] = $plural;
+
+				return $plural;
+			}
+		}
+
+		static::$_cache['pluralized'][$word] = $word;
+
+		return static::$_cache['pluralized'][$word];
+	}
+
+	/**
+	 * Plural English word to singular.
+	 *
+	 * @param   string  $word  Word to singularize.
+	 *
+	 * @return  string Singular noun.
+	 */
+	public static function singularize($word)
+	{
+		// Get the cached noun of it exists
+		if (isset(static::$_cache['singularized'][$word]))
+		{
+			return static::$_cache['singularized'][$word];
+		}
+
+		// Create the singular noun
+		if (in_array($word, self::$_rules['countable']))
+		{
+			static::$_cache['singularized'][$word] = $word;
+
+			return $word;
+		}
+
+		foreach (self::$_rules['singularization'] as $regexp => $replacement)
+		{
+			$matches  = null;
+			$singular = preg_replace($regexp, $replacement, $word, -1, $matches);
+
+			if ($matches > 0)
+			{
+				static::$_cache['singularized'][$word] = $singular;
+
+				return $singular;
+			}
+		}
+
+		static::$_cache['singularized'][$word] = $word;
+
+		return static::$_cache['singularized'][$word];
+	}
+
+	/**
+	 * Returns given word as CamelCased.
+	 *
+	 * Converts a word like "foo_bar" or "foo bar" to "FooBar". It
+	 * will remove non alphanumeric characters from the word, so
+	 * "who's online" will be converted to "WhoSOnline"
+	 *
+	 * @param   string  $word  Word to convert to camel case.
+	 *
+	 * @return  string  UpperCamelCasedWord
+	 */
+	public static function camelize($word)
+	{
+		$word = preg_replace('/[^a-zA-Z0-9\s]/', ' ', $word);
+		$word = str_replace(' ', '', ucwords(strtolower(str_replace('_', ' ', $word))));
+
+		return $word;
+	}
+
+	/**
+	 * Converts a word "into_it_s_underscored_version"
+	 *
+	 * Convert any "CamelCased" or "ordinary Word" into an "underscored_word".
+	 *
+	 * @param   string  $word  Word to underscore
+	 *
+	 * @return string Underscored word
+	 */
+	public static function underscore($word)
+	{
+		$word = preg_replace('/(\s)+/', '_', $word);
+		$word = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $word));
+
+		return $word;
+	}
+
+	/**
+	 * Convert any "CamelCased" word into an array of strings
+	 *
+	 * Returns an array of strings each of which is a substring of string formed
+	 * by splitting it at the camelcased letters.
+	 *
+	 * @param   string  $word  Word to explode
+	 *
+	 * @return  array   Array of strings
+	 */
+	public static function explode($word)
+	{
+		$result = explode('_', self::underscore($word));
+
+		return $result;
+	}
+
+	/**
+	 * Convert  an array of strings into a "CamelCased" word.
+	 *
+	 * @param   array  $words  Array to implode
+	 *
+	 * @return  string UpperCamelCasedWord
+	 */
+	public static function implode($words)
+	{
+		$result = self::camelize(implode('_', $words));
+
+		return $result;
+	}
+
+	/**
+	 * Returns a human-readable string from $word.
+	 *
+	 * Returns a human-readable string from $word, by replacing
+	 * underscores with a space, and by upper-casing the initial
+	 * character by default.
+	 *
+	 * @param   string  $word  String to "humanize"
+	 *
+	 * @return string Human-readable word
+	 */
+	public static function humanize($word)
+	{
+		$result = ucwords(strtolower(str_replace("_", " ", $word)));
+
+		return $result;
+	}
+
+	/**
+	 * Converts a class name to its table name according to Koowa
+	 * naming conventions.
+	 *
+	 * Converts "Person" to "people"
+	 *
+	 * @param   string  $className  Class name for getting related table_name.
+	 *
+	 * @return  string  plural_table_name
+	 *
+	 * @see classify
+	 */
+	public static function tableize($className)
+	{
+		$result = self::underscore($className);
+
+		if (!self::isPlural($className))
+		{
+			$result = self::pluralize($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Converts a table name to its class name according to Koowa naming conventions.
+	 *
+	 * @param   string  $tableName  Table name for getting related ClassName.
+	 *
+	 * @return string SingularClassName
+	 *
+	 * @example  Converts "people" to "Person"
+	 * @see tableize
+	 */
+	public static function classify($tableName)
+	{
+		$result = self::camelize(self::singularize($tableName));
+
+		return $result;
+	}
+
+	/**
+	 * Returns camelBacked version of a string. Same as camelize but first char is lowercased.
+	 *
+	 * @param   string  $string  String to be camelBacked.
+	 *
+	 * @return string
+	 *
+	 * @see camelize
+	 */
+	public static function variablize($string)
+	{
+		$string   = self::camelize(self::underscore($string));
+		$result   = strtolower(substr($string, 0, 1));
+		$variable = preg_replace('/\\w/', $result, $string, 1);
+
+		return $variable;
+	}
+
+	/**
+	 * Check to see if an English word is singular
+	 *
+	 * @param   string  $string  The word to check
+	 *
+	 * @return boolean
+	 */
+	public static function isSingular($string)
+	{
+		// Check cache assuming the string is plural.
+		$singular = isset(static::$_cache['singularized'][$string]) ? static::$_cache['singularized'][$string] : null;
+		$plural   = $singular && isset(static::$_cache['pluralized'][$singular]) ? static::$_cache['pluralized'][$singular] : null;
+
+		if ($singular && $plural)
+		{
+			return $plural != $string;
+		}
+
+		// If string is not in the cache, try to pluralize and singularize it.
+		return self::singularize(self::pluralize($string)) == $string;
+	}
+
+	/**
+	 * Check to see if an Enlish word is plural.
+	 *
+	 * @param   string  $string  String to be checked.
+	 *
+	 * @return boolean
+	 */
+	public static function isPlural($string)
+	{
+		// Check cache assuming the string is singular.
+		$plural   = isset(static::$_cache['pluralized'][$string]) ? static::$_cache['pluralized'][$string] : null;
+		$singular = $plural && isset(static::$_cache['singularized'][$plural]) ? static::$_cache['singularized'][$plural] : null;
+
+		if ($plural && $singular)
+		{
+			return $singular != $string;
+		}
+
+		// If string is not in the cache, try to singularize and pluralize it.
+		return self::pluralize(self::singularize($string)) == $string;
+	}
+
+	/**
+	 * Gets a part of a CamelCased word by index.
+	 *
+	 * Use a negative index to start at the last part of the word (-1 is the
+	 * last part)
+	 *
+	 * @param   string   $string   Word
+	 * @param   integer  $index    Index of the part
+	 * @param   string   $default  Default value
+	 *
+	 * @return string
+	 */
+	public static function getPart($string, $index, $default = null)
+	{
+		$parts = self::explode($string);
+
+		if ($index < 0)
+		{
+			$index = count($parts) + $index;
+		}
+
+		return isset($parts[$index]) ? $parts[$index] : $default;
+	}
+}
diff --git a/core/libraries/fof/input/input.php b/core/libraries/fof/input/input.php
new file mode 100644
index 00000000..cdd1e2e9
--- /dev/null
+++ b/core/libraries/fof/input/input.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  input
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (version_compare(JVERSION, '1.7.0', 'lt'))
+{
+	jimport('joomla.filter.input');
+	jimport('joomla.filter.filterinput');
+	jimport('joomla.base.object');
+
+	require_once __DIR__ . '/jinput/input.php';
+	require_once __DIR__ . '/jinput/cli.php';
+	require_once __DIR__ . '/jinput/cookie.php';
+	require_once __DIR__ . '/jinput/files.php';
+	require_once __DIR__ . '/jinput/json.php';
+}
+elseif (version_compare(JVERSION, '2.5.0', 'lt'))
+{
+	jimport('joomla.application.input');
+	jimport('joomla.input.input');
+}
+
+/**
+ * FrameworkOnFramework input handling class. Extends upon the JInput class.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFInput extends JInput
+{
+	/**
+	 * Public constructor. Overriden to allow specifying the global input array
+	 * to use as a string and instantiate from an objetc holding variables.
+	 *
+	 * @param   array|string|object|null  $source   Source data; set null to use $_REQUEST
+	 * @param   array                     $options  Filter options
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		$hash = null;
+
+		if (is_string($source))
+		{
+			$hash = strtoupper($source);
+
+			switch ($hash)
+			{
+				case 'GET':
+					$source = $_GET;
+					break;
+				case 'POST':
+					$source = $_POST;
+					break;
+				case 'FILES':
+					$source = $_FILES;
+					break;
+				case 'COOKIE':
+					$source = $_COOKIE;
+					break;
+				case 'ENV':
+					$source = $_ENV;
+					break;
+				case 'SERVER':
+					$source = $_SERVER;
+					break;
+				default:
+					$source = $_REQUEST;
+					$hash = 'REQUEST';
+					break;
+			}
+		}
+		elseif (is_object($source))
+		{
+			try
+			{
+				$source = (array) $source;
+			}
+			catch (Exception $exc)
+			{
+				$source = null;
+			}
+		}
+		elseif (is_array($source))
+		{
+			// Nothing, it's already an array
+		}
+		else
+		{
+			// Any other case
+			$source = $_REQUEST;
+			$hash = 'REQUEST';
+		}
+
+		// Magic quotes GPC handling (something JInput simply can't handle at all)
+
+		if (($hash == 'REQUEST') && get_magic_quotes_gpc() && class_exists('JRequest', true))
+		{
+			$source = JRequest::get('REQUEST', 2);
+		}
+
+		parent::__construct($source, $options);
+	}
+
+	/**
+	 * Gets a value from the input data. Overriden to allow specifying a filter
+	 * mask.
+	 *
+	 * @param   string  $name     Name of the value to get.
+	 * @param   mixed   $default  Default value to return if variable does not exist.
+	 * @param   string  $filter   Filter to apply to the value.
+	 * @param   int     $mask     The filter mask
+	 *
+	 * @return  mixed  The filtered input value.
+	 */
+	public function get($name, $default = null, $filter = 'cmd', $mask = 0)
+	{
+		if (isset($this->data[$name]))
+		{
+			return $this->_cleanVar($this->data[$name], $mask, $filter);
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Returns a copy of the raw data stored in the class
+	 *
+	 * @return  array
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Old static methods are now deprecated. This magic method makes sure there
+	 * is a continuity in our approach. The downside is that it's only compatible
+	 * with PHP 5.3.0. Sorry!
+	 *
+	 * @param   string  $name       Name of the method we're calling
+	 * @param   array   $arguments  The arguments passed to the method
+	 *
+	 * @return  mixed
+	 */
+	public static function __callStatic($name, $arguments)
+	{
+		FOFPlatform::getInstance()->logDeprecated('FOFInput: static getXXX() methods are deprecated. Use the input object\'s methods instead.');
+
+		if (substr($name, 0, 3) == 'get')
+		{
+			// Initialise arguments
+			$key = array_shift($arguments);
+			$default = array_shift($arguments);
+			$input = array_shift($arguments);
+			$type = 'none';
+			$mask = 0;
+
+			$type = strtolower(substr($name, 3));
+
+			if ($type == 'var')
+			{
+				$type = array_shift($arguments);
+				$mask = array_shift($arguments);
+			}
+
+			if (is_null($type))
+			{
+				$type = 'none';
+			}
+
+			if (is_null($mask))
+			{
+				$mask = 0;
+			}
+
+			if (!($input instanceof FOFInput) && !($input instanceof JInput))
+			{
+				$input = new FOFInput($input);
+			}
+
+			return $input->get($key, $default, $type, $mask);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Magic method to get filtered input data.
+	 *
+	 * @param   mixed   $name       Name of the value to get.
+	 * @param   string  $arguments  Default value to return if variable does not exist.
+	 *
+	 * @return  boolean  The filtered boolean input value.
+	 */
+	public function __call($name, $arguments)
+	{
+		if (substr($name, 0, 3) == 'get')
+		{
+			$filter = substr($name, 3);
+
+			$default = null;
+			$mask = 0;
+
+			if (isset($arguments[1]))
+			{
+				$default = $arguments[1];
+			}
+
+			if (isset($arguments[2]))
+			{
+				$mask = $arguments[2];
+			}
+
+			return $this->get($arguments[0], $default, $filter, $mask);
+		}
+	}
+
+	/**
+	 * Sets an input variable. WARNING: IT SHOULD NO LONGER BE USED!
+	 *
+	 * @param   string   $name       The name of the variable to set
+	 * @param   mixed    $value      The value to set it to
+	 * @param   array    &$input     The input array or FOFInput object
+	 * @param   boolean  $overwrite  Should I overwrite existing values (default: true)
+	 *
+	 * @return  string   Previous value
+	 *
+	 * @deprecated
+	 */
+	public static function setVar($name, $value = null, &$input = array(), $overwrite = true)
+	{
+		FOFPlatform::getInstance()->logDeprecated('FOFInput::setVar() is deprecated. Use set() instead.');
+
+		if (empty($input))
+		{
+			return JRequest::setVar($name, $value, 'default', $overwrite);
+		}
+		elseif (is_string($input))
+		{
+			return JRequest::setVar($name, $value, $input, $overwrite);
+		}
+		else
+		{
+			if (!$overwrite && array_key_exists($name, $input))
+			{
+				return $input[$name];
+			}
+
+			$previous = array_key_exists($name, $input) ? $input[$name] : null;
+
+			if (is_array($input))
+			{
+				$input[$name] = $value;
+			}
+			elseif ($input instanceof FOFInput)
+			{
+				$input->set($name, $value);
+			}
+
+			return $previous;
+		}
+	}
+
+	/**
+	 * Custom filter implementation. Works better with arrays and allows the use
+	 * of a filter mask.
+	 *
+	 * @param   mixed    $var   The variable (value) to clean
+	 * @param   integer  $mask  The clean mask
+	 * @param   string   $type  The variable type
+	 *
+	 * @return   mixed
+	 */
+	protected function _cleanVar($var, $mask = 0, $type = null)
+	{
+		if (is_array($var))
+		{
+			$temp = array();
+
+			foreach ($var as $k => $v)
+			{
+				$temp[$k] = self::_cleanVar($v, $mask);
+			}
+
+			return $temp;
+		}
+
+		// If the no trim flag is not set, trim the variable
+		if (!($mask & 1) && is_string($var))
+		{
+			$var = trim($var);
+		}
+
+		// Now we handle input filtering
+		if ($mask & 2)
+		{
+			// If the allow raw flag is set, do not modify the variable
+			$var = $var;
+		}
+		elseif ($mask & 4)
+		{
+			// If the allow HTML flag is set, apply a safe HTML filter to the variable
+			$safeHtmlFilter = JFilterInput::getInstance(null, null, 1, 1);
+			$var = $safeHtmlFilter->clean($var, $type);
+		}
+		else
+		{
+			$var = $this->filter->clean($var, $type);
+		}
+
+		return $var;
+	}
+}
diff --git a/core/libraries/fof/input/jinput/cli.php b/core/libraries/fof/input/jinput/cli.php
new file mode 100644
index 00000000..35577937
--- /dev/null
+++ b/core/libraries/fof/input/jinput/cli.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Input
+ *
+ * @copyright   Copyright (C) 2005-2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Input CLI Class
+ *
+ * @since  11.1
+ */
+class JInputCli extends JInput
+{
+	/**
+	 * The executable that was called to run the CLI script.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $executable;
+
+	/**
+	 * The additional arguments passed to the script that are not associated
+	 * with a specific argument name.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $args = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+
+		// Get the command line options
+		$this->parseArguments();
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Method to serialize the input.
+	 *
+	 * @return  string  The serialized input.
+	 *
+	 * @since   12.1
+	 */
+	public function serialize()
+	{
+		// Load all of the inputs.
+		$this->loadAllInputs();
+
+		// Remove $_ENV and $_SERVER from the inputs.
+		$inputs = $this->inputs;
+		unset($inputs['env']);
+		unset($inputs['server']);
+
+		// Serialize the executable, args, options, data, and inputs.
+		return serialize(array($this->executable, $this->args, $this->options, $this->data, $inputs));
+	}
+
+	/**
+	 * Method to unserialize the input.
+	 *
+	 * @param   string  $input  The serialized input.
+	 *
+	 * @return  JInput  The input object.
+	 *
+	 * @since   12.1
+	 */
+	public function unserialize($input)
+	{
+		// Unserialize the executable, args, options, data, and inputs.
+		list($this->executable, $this->args, $this->options, $this->data, $this->inputs) = unserialize($input);
+
+		// Load the filter.
+		if (isset($this->options['filter']))
+		{
+			$this->filter = $this->options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+	}
+
+	/**
+	 * Initialise the options and arguments
+	 *
+	 * Not supported: -abc c-value
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function parseArguments()
+	{
+		$argv = $_SERVER['argv'];
+
+		$this->executable = array_shift($argv);
+
+		$out = array();
+
+		for ($i = 0, $j = count($argv); $i < $j; $i++)
+		{
+			$arg = $argv[$i];
+
+			// --foo --bar=baz
+			if (substr($arg, 0, 2) === '--')
+			{
+				$eqPos = strpos($arg, '=');
+
+				// --foo
+				if ($eqPos === false)
+				{
+					$key = substr($arg, 2);
+
+					// --foo value
+					if ($i + 1 < $j && $argv[$i + 1][0] !== '-')
+					{
+						$value = $argv[$i + 1];
+						$i++;
+					}
+					else
+					{
+						$value = isset($out[$key]) ? $out[$key] : true;
+					}
+
+					$out[$key] = $value;
+				}
+
+				// --bar=baz
+				else
+				{
+					$key = substr($arg, 2, $eqPos - 2);
+					$value = substr($arg, $eqPos + 1);
+					$out[$key] = $value;
+				}
+			}
+			elseif (substr($arg, 0, 1) === '-')
+			// -k=value -abc
+			{
+				// -k=value
+				if (substr($arg, 2, 1) === '=')
+				{
+					$key = substr($arg, 1, 1);
+					$value = substr($arg, 3);
+					$out[$key] = $value;
+				}
+				else
+				// -abc
+				{
+					$chars = str_split(substr($arg, 1));
+
+					foreach ($chars as $char)
+					{
+						$key = $char;
+						$value = isset($out[$key]) ? $out[$key] : true;
+						$out[$key] = $value;
+					}
+
+					// -a a-value
+					if ((count($chars) === 1) && ($i + 1 < $j) && ($argv[$i + 1][0] !== '-'))
+					{
+						$out[$key] = $argv[$i + 1];
+						$i++;
+					}
+				}
+			}
+			else
+			{
+				// Plain-arg
+				$this->args[] = $arg;
+			}
+		}
+
+		$this->data = $out;
+	}
+}
diff --git a/core/libraries/fof/input/jinput/cookie.php b/core/libraries/fof/input/jinput/cookie.php
new file mode 100644
index 00000000..03920495
--- /dev/null
+++ b/core/libraries/fof/input/jinput/cookie.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Input
+ *
+ * @copyright   Copyright (C) 2005-2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Input Cookie Class
+ *
+ * @since  11.1
+ */
+class JInputCookie extends JInput
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Ignored.
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+
+		// Set the data source.
+		$this->data = & $_COOKIE;
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Sets a value
+	 *
+	 * @param   string   $name      Name of the value to set.
+	 * @param   mixed    $value     Value to assign to the input.
+	 * @param   integer  $expire    The time the cookie expires. This is a Unix timestamp so is in number
+	 *                              of seconds since the epoch. In other words, you'll most likely set this
+	 *                              with the time() function plus the number of seconds before you want it
+	 *                              to expire. Or you might use mktime(). time()+60*60*24*30 will set the
+	 *                              cookie to expire in 30 days. If set to 0, or omitted, the cookie will
+	 *                              expire at the end of the session (when the browser closes).
+	 * @param   string   $path      The path on the server in which the cookie will be available on. If set
+	 *                              to '/', the cookie will be available within the entire domain. If set to
+	 *                              '/foo/', the cookie will only be available within the /foo/ directory and
+	 *                              all sub-directories such as /foo/bar/ of domain. The default value is the
+	 *                              current directory that the cookie is being set in.
+	 * @param   string   $domain    The domain that the cookie is available to. To make the cookie available
+	 *                              on all subdomains of example.com (including example.com itself) then you'd
+	 *                              set it to '.example.com'. Although some browsers will accept cookies without
+	 *                              the initial ., RFC 2109 requires it to be included. Setting the domain to
+	 *                              'www.example.com' or '.www.example.com' will make the cookie only available
+	 *                              in the www subdomain.
+	 * @param   boolean  $secure    Indicates that the cookie should only be transmitted over a secure HTTPS
+	 *                              connection from the client. When set to TRUE, the cookie will only be set
+	 *                              if a secure connection exists. On the server-side, it's on the programmer
+	 *                              to send this kind of cookie only on secure connection (e.g. with respect
+	 *                              to $_SERVER["HTTPS"]).
+	 * @param   boolean  $httpOnly  When TRUE the cookie will be made accessible only through the HTTP protocol.
+	 *                              This means that the cookie won't be accessible by scripting languages, such
+	 *                              as JavaScript. This setting can effectively help to reduce identity theft
+	 *                              through XSS attacks (although it is not supported by all browsers).
+	 *
+	 * @return  void
+	 *
+	 * @link    http://www.ietf.org/rfc/rfc2109.txt
+	 * @see     setcookie()
+	 * @since   11.1
+	 */
+	public function set($name, $value, $expire = 0, $path = '', $domain = '', $secure = false, $httpOnly = false)
+	{
+		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+
+		$this->data[$name] = $value;
+	}
+}
diff --git a/core/libraries/fof/input/jinput/files.php b/core/libraries/fof/input/jinput/files.php
new file mode 100644
index 00000000..7cd537e9
--- /dev/null
+++ b/core/libraries/fof/input/jinput/files.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Input
+ *
+ * @copyright   Copyright (C) 2005-2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Input Files Class
+ *
+ * @since  11.1
+ */
+class JInputFiles extends JInput
+{
+	/**
+	 * The pivoted data from a $_FILES or compatible array.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $decodedData = array();
+
+	/**
+	 * The class constructor.
+	 *
+	 * @param   array  $source   The source argument is ignored. $_FILES is always used.
+	 * @param   array  $options  An optional array of configuration options:
+	 *                           filter : a custom JFilterInput object.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+
+		// Set the data source.
+		$this->data = & $_FILES;
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Gets a value from the input data.
+	 *
+	 * @param   string  $name     The name of the input property (usually the name of the files INPUT tag) to get.
+	 * @param   mixed   $default  The default value to return if the named property does not exist.
+	 * @param   string  $filter   The filter to apply to the value.
+	 *
+	 * @return  mixed  The filtered input value.
+	 *
+	 * @see     JFilterInput::clean()
+	 * @since   11.1
+	 */
+	public function get($name, $default = null, $filter = 'cmd')
+	{
+		if (isset($this->data[$name]))
+		{
+			$results = $this->decodeData(
+				array(
+					$this->data[$name]['name'],
+					$this->data[$name]['type'],
+					$this->data[$name]['tmp_name'],
+					$this->data[$name]['error'],
+					$this->data[$name]['size']
+				)
+			);
+
+			// Prevent returning an unsafe file unless speciffically requested
+			if ($filter != 'raw')
+			{
+				$isSafe = JFilterInput::isSafeFile($results);
+
+				if (!$isSafe)
+				{
+					return $default;
+				}
+			}
+
+			return $results;
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Method to decode a data array.
+	 *
+	 * @param   array  $data  The data array to decode.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	protected function decodeData(array $data)
+	{
+		$result = array();
+
+		if (is_array($data[0]))
+		{
+			foreach ($data[0] as $k => $v)
+			{
+				$result[$k] = $this->decodeData(array($data[0][$k], $data[1][$k], $data[2][$k], $data[3][$k], $data[4][$k]));
+			}
+
+			return $result;
+		}
+
+		return array('name' => $data[0], 'type' => $data[1], 'tmp_name' => $data[2], 'error' => $data[3], 'size' => $data[4]);
+	}
+
+	/**
+	 * Sets a value.
+	 *
+	 * @param   string  $name   The name of the input property to set.
+	 * @param   mixed   $value  The value to assign to the input property.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function set($name, $value)
+	{
+	}
+}
diff --git a/core/libraries/fof/input/jinput/input.php b/core/libraries/fof/input/jinput/input.php
new file mode 100644
index 00000000..6a1f2787
--- /dev/null
+++ b/core/libraries/fof/input/jinput/input.php
@@ -0,0 +1,383 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Input
+ *
+ * @copyright   Copyright (C) 2005-2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Input Base Class
+ *
+ * This is an abstracted input class used to manage retrieving data from the application environment.
+ *
+ * @since  11.1
+ *
+ * @property-read    JInput        $get
+ * @property-read    JInput        $post
+ * @property-read    JInput        $request
+ * @property-read    JInput        $server
+ * @property-read    JInputFiles   $files
+ * @property-read    JInputCookie  $cookie
+ *
+ * @method      integer  getInt()       getInt($name, $default = null)    Get a signed integer.
+ * @method      integer  getUint()      getUint($name, $default = null)   Get an unsigned integer.
+ * @method      float    getFloat()     getFloat($name, $default = null)  Get a floating-point number.
+ * @method      boolean  getBool()      getBool($name, $default = null)   Get a boolean.
+ * @method      string   getWord()      getWord($name, $default = null)
+ * @method      string   getAlnum()     getAlnum($name, $default = null)
+ * @method      string   getCmd()       getCmd($name, $default = null)
+ * @method      string   getBase64()    getBase64($name, $default = null)
+ * @method      string   getString()    getString($name, $default = null)
+ * @method      string   getHtml()      getHtml($name, $default = null)
+ * @method      string   getPath()      getPath($name, $default = null)
+ * @method      string   getUsername()  getUsername($name, $default = null)
+ */
+class JInput implements Serializable, Countable
+{
+	/**
+	 * Options array for the JInput instance.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $options = array();
+
+	/**
+	 * Filter object to use.
+	 *
+	 * @var    JFilterInput
+	 * @since  11.1
+	 */
+	protected $filter = null;
+
+	/**
+	 * Input data.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $data = array();
+
+	/**
+	 * Input objects
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $inputs = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+
+		if (is_null($source))
+		{
+			$this->data = &$_REQUEST;
+		}
+		else
+		{
+			$this->data = $source;
+		}
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Magic method to get an input object
+	 *
+	 * @param   mixed  $name  Name of the input object to retrieve.
+	 *
+	 * @return  JInput  The request input object
+	 *
+	 * @since   11.1
+	 */
+	public function __get($name)
+	{
+		if (isset($this->inputs[$name]))
+		{
+			return $this->inputs[$name];
+		}
+
+		$className = 'JInput' . ucfirst($name);
+
+		if (class_exists($className))
+		{
+			$this->inputs[$name] = new $className(null, $this->options);
+
+			return $this->inputs[$name];
+		}
+
+		$superGlobal = '_' . strtoupper($name);
+
+		if (isset($GLOBALS[$superGlobal]))
+		{
+			$this->inputs[$name] = new JInput($GLOBALS[$superGlobal], $this->options);
+
+			return $this->inputs[$name];
+		}
+
+		// TODO throw an exception
+	}
+
+	/**
+	 * Get the number of variables.
+	 *
+	 * @return  integer  The number of variables in the input.
+	 *
+	 * @since   12.2
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return count($this->data);
+	}
+
+	/**
+	 * Gets a value from the input data.
+	 *
+	 * @param   string  $name     Name of the value to get.
+	 * @param   mixed   $default  Default value to return if variable does not exist.
+	 * @param   string  $filter   Filter to apply to the value.
+	 *
+	 * @return  mixed  The filtered input value.
+	 *
+	 * @since   11.1
+	 */
+	public function get($name, $default = null, $filter = 'cmd')
+	{
+		if (isset($this->data[$name]))
+		{
+			return $this->filter->clean($this->data[$name], $filter);
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Gets an array of values from the request.
+	 *
+	 * @param   array  $vars        Associative array of keys and filter types to apply.
+	 *                              If empty and datasource is null, all the input data will be returned
+	 *                              but filtered using the default case in JFilterInput::clean.
+	 * @param   mixed  $datasource  Array to retrieve data from, or null
+	 *
+	 * @return  mixed  The filtered input data.
+	 *
+	 * @since   11.1
+	 */
+	public function getArray(array $vars = array(), $datasource = null)
+	{
+		if (empty($vars) && is_null($datasource))
+		{
+			$vars = $this->data;
+		}
+
+		$results = array();
+
+		foreach ($vars as $k => $v)
+		{
+			if (is_array($v))
+			{
+				if (is_null($datasource))
+				{
+					$results[$k] = $this->getArray($v, $this->get($k, null, 'array'));
+				}
+				else
+				{
+					$results[$k] = $this->getArray($v, $datasource[$k]);
+				}
+			}
+			else
+			{
+				if (is_null($datasource))
+				{
+					$results[$k] = $this->get($k, null, $v);
+				}
+				elseif (isset($datasource[$k]))
+				{
+					$results[$k] = $this->filter->clean($datasource[$k], $v);
+				}
+				else
+				{
+					$results[$k] = $this->filter->clean(null, $v);
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Sets a value
+	 *
+	 * @param   string  $name   Name of the value to set.
+	 * @param   mixed   $value  Value to assign to the input.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function set($name, $value)
+	{
+		$this->data[$name] = $value;
+	}
+
+	/**
+	 * Define a value. The value will only be set if there's no value for the name or if it is null.
+	 *
+	 * @param   string  $name   Name of the value to define.
+	 * @param   mixed   $value  Value to assign to the input.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function def($name, $value)
+	{
+		if (isset($this->data[$name]))
+		{
+			return;
+		}
+
+		$this->data[$name] = $value;
+	}
+
+	/**
+	 * Magic method to get filtered input data.
+	 *
+	 * @param   string  $name       Name of the filter type prefixed with 'get'.
+	 * @param   array   $arguments  [0] The name of the variable [1] The default value.
+	 *
+	 * @return  mixed   The filtered input value.
+	 *
+	 * @since   11.1
+	 */
+	public function __call($name, $arguments)
+	{
+		if (substr($name, 0, 3) == 'get')
+		{
+			$filter = substr($name, 3);
+
+			$default = null;
+
+			if (isset($arguments[1]))
+			{
+				$default = $arguments[1];
+			}
+
+			return $this->get($arguments[0], $default, $filter);
+		}
+	}
+
+	/**
+	 * Gets the request method.
+	 *
+	 * @return  string   The request method.
+	 *
+	 * @since   11.1
+	 */
+	public function getMethod()
+	{
+		$method = strtoupper($_SERVER['REQUEST_METHOD']);
+
+		return $method;
+	}
+
+	/**
+	 * Method to serialize the input.
+	 *
+	 * @return  string  The serialized input.
+	 *
+	 * @since   12.1
+	 */
+	public function serialize()
+	{
+		// Load all of the inputs.
+		$this->loadAllInputs();
+
+		// Remove $_ENV and $_SERVER from the inputs.
+		$inputs = $this->inputs;
+		unset($inputs['env']);
+		unset($inputs['server']);
+
+		// Serialize the options, data, and inputs.
+		return serialize(array($this->options, $this->data, $inputs));
+	}
+
+	/**
+	 * Method to unserialize the input.
+	 *
+	 * @param   string  $input  The serialized input.
+	 *
+	 * @return  JInput  The input object.
+	 *
+	 * @since   12.1
+	 */
+	public function unserialize($input)
+	{
+		// Unserialize the options, data, and inputs.
+		list($this->options, $this->data, $this->inputs) = unserialize($input);
+
+		// Load the filter.
+		if (isset($this->options['filter']))
+		{
+			$this->filter = $this->options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+	}
+
+	/**
+	 * Method to load all of the global inputs.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function loadAllInputs()
+	{
+		static $loaded = false;
+
+		if (!$loaded)
+		{
+			// Load up all the globals.
+			foreach ($GLOBALS as $global => $data)
+			{
+				// Check if the global starts with an underscore.
+				if (strpos($global, '_') === 0)
+				{
+					// Convert global name to input name.
+					$global = strtolower($global);
+					$global = substr($global, 1);
+
+					// Get the input.
+					$this->$global;
+				}
+			}
+
+			$loaded = true;
+		}
+	}
+}
diff --git a/core/libraries/fof/input/jinput/json.php b/core/libraries/fof/input/jinput/json.php
new file mode 100644
index 00000000..e71dbdd5
--- /dev/null
+++ b/core/libraries/fof/input/jinput/json.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Input
+ *
+ * @copyright   Copyright (C) 2005-2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Input JSON Class
+ *
+ * This class decodes a JSON string from the raw request data and makes it available via
+ * the standard JInput interface.
+ *
+ * @since  12.2
+ */
+class JInputJSON extends JInput
+{
+	/**
+	 * @var    string  The raw JSON string from the request.
+	 * @since  12.2
+	 */
+	private $_raw;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is the raw HTTP input decoded from JSON)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   12.2
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = JFilterInput::getInstance();
+		}
+
+		if (is_null($source))
+		{
+			$this->_raw = file_get_contents('php://input');
+			$this->data = json_decode($this->_raw, true);
+		}
+		else
+		{
+			$this->data = & $source;
+		}
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Gets the raw JSON string from the request.
+	 *
+	 * @return  string  The raw JSON string from the request.
+	 *
+	 * @since   12.2
+	 */
+	public function getRaw()
+	{
+		return $this->_raw;
+	}
+}
diff --git a/core/libraries/fof/integration/joomla/filesystem/filesystem.php b/core/libraries/fof/integration/joomla/filesystem/filesystem.php
new file mode 100644
index 00000000..a051c158
--- /dev/null
+++ b/core/libraries/fof/integration/joomla/filesystem/filesystem.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  platformFilesystem
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+class FOFIntegrationJoomlaFilesystem extends FOFPlatformFilesystem implements FOFPlatformFilesystemInterface
+{
+	public function __construct()
+	{
+		if (class_exists('JLoader'))
+		{
+			JLoader::import('joomla.filesystem.path');
+			JLoader::import('joomla.filesystem.folder');
+			JLoader::import('joomla.filesystem.file');
+		}
+	}
+
+	/**
+	 * Does the file exists?
+	 *
+	 * @param   $path  string   Path to the file to test
+	 *
+	 * @return  bool
+	 */
+    public function fileExists($path)
+    {
+        return JFile::exists($path);
+    }
+
+	/**
+	 * Delete a file or array of files
+	 *
+	 * @param   mixed  $file  The file name or an array of file names
+	 *
+	 * @return  boolean  True on success
+	 *
+	 */
+    public function fileDelete($file)
+    {
+        return JFile::delete($file);
+    }
+
+	/**
+	 * Copies a file
+	 *
+	 * @param   string   $src          The path to the source file
+	 * @param   string   $dest         The path to the destination file
+     * @param   string   $path         An optional base path to prefix to the file names
+     * @param   boolean  $use_streams  True to use streams
+	 *
+	 * @return  boolean  True on success
+	 */
+    public function fileCopy($src, $dest, $path = null, $use_streams = false)
+    {
+        return JFile::copy($src, $dest, $path, $use_streams);
+    }
+
+	/**
+	 * Write contents to a file
+	 *
+	 * @param   string   $file         The full file path
+	 * @param   string   &$buffer      The buffer to write
+     * @param   boolean  $use_streams  Use streams
+	 *
+	 * @return  boolean  True on success
+	 */
+    public function fileWrite($file, &$buffer, $use_streams = false)
+    {
+        return JFile::write($file, $buffer, $use_streams);
+    }
+
+	/**
+	 * Checks for snooping outside of the file system root.
+	 *
+	 * @param   string  $path  A file system path to check.
+	 *
+	 * @return  string  A cleaned version of the path or exit on error.
+	 *
+	 * @throws  Exception
+	 */
+    public function pathCheck($path)
+    {
+        return JPath::check($path);
+    }
+
+	/**
+	 * Function to strip additional / or \ in a path name.
+	 *
+	 * @param   string  $path  The path to clean.
+	 * @param   string  $ds    Directory separator (optional).
+	 *
+	 * @return  string  The cleaned path.
+	 *
+	 * @throws  UnexpectedValueException
+	 */
+    public function pathClean($path, $ds = DIRECTORY_SEPARATOR)
+    {
+        return JPath::clean($path, $ds);
+    }
+
+	/**
+	 * Searches the directory paths for a given file.
+	 *
+	 * @param   mixed   $paths  An path string or array of path strings to search in
+	 * @param   string  $file   The file name to look for.
+	 *
+	 * @return  mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+	 */
+    public function pathFind($paths, $file)
+    {
+        return JPath::find($paths, $file);
+    }
+
+	/**
+	 * Wrapper for the standard file_exists function
+	 *
+	 * @param   string  $path  Folder name relative to installation dir
+	 *
+	 * @return  boolean  True if path is a folder
+	 */
+    public function folderExists($path)
+    {
+        return JFolder::exists($path);
+    }
+
+	/**
+	 * Utility function to read the files in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for file names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the file.
+	 * @param   array    $exclude        Array with names of files which should not be shown in the result.
+	 * @param   array    $excludefilter  Array of filter to exclude
+     * @param   boolean  $naturalSort    False for asort, true for natsort
+	 *
+	 * @return  array  Files in the given folder.
+	 */
+    public function folderFiles($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+                                $excludefilter = array('^\..*', '.*~'), $naturalSort = false)
+    {
+        return JFolder::files($path, $filter, $recurse, $full, $exclude, $excludefilter, $naturalSort);
+    }
+
+	/**
+	 * Utility function to read the folders in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for folder names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the folders.
+	 * @param   array    $exclude        Array with names of folders which should not be shown in the result.
+	 * @param   array    $excludefilter  Array with regular expressions matching folders which should not be shown in the result.
+	 *
+	 * @return  array  Folders in the given folder.
+	 */
+    public function folderFolders($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+                                  $excludefilter = array('^\..*'))
+    {
+        return JFolder::folders($path, $filter, $recurse, $full, $exclude, $excludefilter);
+    }
+
+	/**
+	 * Create a folder -- and all necessary parent folders.
+	 *
+	 * @param   string   $path  A path to create from the base path.
+	 * @param   integer  $mode  Directory permissions to set for folders created. 0755 by default.
+	 *
+	 * @return  boolean  True if successful.
+	 */
+    public function folderCreate($path = '', $mode = 0755)
+    {
+        return JFolder::create($path, $mode);
+    }
+}
\ No newline at end of file
diff --git a/core/libraries/fof/integration/joomla/platform.php b/core/libraries/fof/integration/joomla/platform.php
new file mode 100644
index 00000000..6fe75a85
--- /dev/null
+++ b/core/libraries/fof/integration/joomla/platform.php
@@ -0,0 +1,968 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  platform
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Part of the FOF Platform Abstraction Layer.
+ *
+ * This implements the platform class for Joomla! 2.5 or later
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFIntegrationJoomlaPlatform extends FOFPlatform implements FOFPlatformInterface
+{
+	/**
+	 * The table and table field cache object, used to speed up database access
+	 *
+	 * @var  JRegistry|null
+	 */
+	private $_cache = null;
+
+	/**
+	 * Public constructor
+	 */
+	public function __construct()
+	{
+		$this->name = 'joomla';
+		$this->humanReadableName = 'Joomla!';
+		$this->version = defined('JVERSION') ? JVERSION : '0.0';
+	}
+
+    /**
+     * Checks if the current script is run inside a valid CMS execution
+     *
+     * @see FOFPlatformInterface::checkExecution()
+     *
+     * @return bool
+     */
+    public function checkExecution()
+    {
+        return defined('_JEXEC');
+    }
+
+    public function raiseError($code, $message)
+    {
+        if (version_compare($this->version, '3.0', 'ge'))
+        {
+            throw new Exception($message, $code);
+        }
+        else
+        {
+            return JError::raiseError($code, $message);
+        }
+    }
+
+	/**
+	 * Is this platform enabled?
+	 *
+	 * @see FOFPlatformInterface::isEnabled()
+	 *
+	 * @return  boolean
+	 */
+	public function isEnabled()
+	{
+		if (is_null($this->isEnabled))
+		{
+			$this->isEnabled = true;
+
+			// Make sure _JEXEC is defined
+			if (!defined('_JEXEC'))
+			{
+				$this->isEnabled = false;
+			}
+
+			// We need JVERSION to be defined
+			if ($this->isEnabled)
+			{
+				if (!defined('JVERSION'))
+				{
+					$this->isEnabled = false;
+				}
+			}
+
+			// Check if JFactory exists
+			if ($this->isEnabled)
+			{
+				if (!class_exists('JFactory'))
+				{
+					$this->isEnabled = false;
+				}
+			}
+
+			// Check if JApplication exists
+			if ($this->isEnabled)
+			{
+				$appExists = class_exists('JApplication');
+				$appExists = $appExists || class_exists('JCli');
+				$appExists = $appExists || class_exists('JApplicationCli');
+
+				if (!$appExists)
+				{
+					$this->isEnabled = false;
+				}
+			}
+		}
+
+		return $this->isEnabled;
+	}
+
+	/**
+	 * Main function to detect if we're running in a CLI environment and we're admin
+	 *
+	 * @return  array  isCLI and isAdmin. It's not an associtive array, so we can use list.
+	 */
+	protected function isCliAdmin()
+	{
+		static $isCLI   = null;
+		static $isAdmin = null;
+
+		if (is_null($isCLI) && is_null($isAdmin))
+		{
+			try
+			{
+				if (is_null(JFactory::$application))
+				{
+					$isCLI = true;
+				}
+				else
+				{
+                    $app = JFactory::getApplication();
+					$isCLI = $app instanceof JException || $app instanceof JApplicationCli;
+				}
+			}
+			catch (Exception $e)
+			{
+				$isCLI = true;
+			}
+
+			if ($isCLI)
+			{
+				$isAdmin = false;
+			}
+			else
+			{
+				$isAdmin = !JFactory::$application ? false : JFactory::getApplication()->isAdmin();
+			}
+		}
+
+		return array($isCLI, $isAdmin);
+	}
+
+    /**
+     * Returns absolute path to directories used by the CMS.
+     *
+     * @see FOFPlatformInterface::getPlatformBaseDirs()
+     *
+     * @return  array  A hash array with keys root, public, admin, tmp and log.
+     */
+    public function getPlatformBaseDirs()
+    {
+        return array(
+            'root'   => JPATH_ROOT,
+            'public' => JPATH_SITE,
+            'admin'  => JPATH_ADMINISTRATOR,
+            'tmp'    => JFactory::getConfig()->get('tmp_dir'),
+            'log'    => JFactory::getConfig()->get('log_dir')
+        );
+    }
+
+	/**
+	 * Returns the base (root) directories for a given component.
+	 *
+	 * @param   string  $component  The name of the component. For Joomla! this
+	 *                              is something like "com_example"
+	 *
+	 * @see FOFPlatformInterface::getComponentBaseDirs()
+	 *
+	 * @return  array  A hash array with keys main, alt, site and admin.
+	 */
+	public function getComponentBaseDirs($component)
+	{
+		if ($this->isFrontend())
+		{
+			$mainPath	= JPATH_SITE . '/components/' . $component;
+			$altPath	= JPATH_ADMINISTRATOR . '/components/' . $component;
+		}
+		else
+		{
+			$mainPath	= JPATH_ADMINISTRATOR . '/components/' . $component;
+			$altPath	= JPATH_SITE . '/components/' . $component;
+		}
+
+		return array(
+			'main'	=> $mainPath,
+			'alt'	=> $altPath,
+			'site'	=> JPATH_SITE . '/components/' . $component,
+			'admin'	=> JPATH_ADMINISTRATOR . '/components/' . $component,
+		);
+	}
+
+	/**
+	 * Return a list of the view template paths for this component.
+	 *
+	 * @param   string   $component  The name of the component. For Joomla! this
+	 *                               is something like "com_example"
+	 * @param   string   $view       The name of the view you're looking a
+	 *                               template for
+	 * @param   string   $layout     The layout name to load, e.g. 'default'
+	 * @param   string   $tpl        The sub-template name to load (null by default)
+	 * @param   boolean  $strict     If true, only the specified layout will be searched for.
+	 *                               Otherwise we'll fall back to the 'default' layout if the
+	 *                               specified layout is not found.
+	 *
+	 * @see FOFPlatformInterface::getViewTemplateDirs()
+	 *
+	 * @return  array
+	 */
+	public function getViewTemplatePaths($component, $view, $layout = 'default', $tpl = null, $strict = false)
+	{
+		$isAdmin = $this->isBackend();
+
+		$basePath = $isAdmin ? 'admin:' : 'site:';
+		$basePath .= $component . '/';
+		$altBasePath = $basePath;
+		$basePath .= $view . '/';
+		$altBasePath .= (FOFInflector::isSingular($view) ? FOFInflector::pluralize($view) : FOFInflector::singularize($view)) . '/';
+
+		if ($strict)
+		{
+			$paths = array(
+				$basePath . $layout . ($tpl ? "_$tpl" : ''),
+				$altBasePath . $layout . ($tpl ? "_$tpl" : ''),
+			);
+		}
+		else
+		{
+			$paths = array(
+				$basePath . $layout . ($tpl ? "_$tpl" : ''),
+				$basePath . $layout,
+				$basePath . 'default' . ($tpl ? "_$tpl" : ''),
+				$basePath . 'default',
+				$altBasePath . $layout . ($tpl ? "_$tpl" : ''),
+				$altBasePath . $layout,
+				$altBasePath . 'default' . ($tpl ? "_$tpl" : ''),
+				$altBasePath . 'default',
+			);
+			$paths = array_unique($paths);
+		}
+
+		return $paths;
+	}
+
+	/**
+	 * Get application-specific suffixes to use with template paths. This allows
+	 * you to look for view template overrides based on the application version.
+	 *
+	 * @return  array  A plain array of suffixes to try in template names
+	 */
+	public function getTemplateSuffixes()
+	{
+		$jversion = new JVersion;
+		$versionParts = explode('.', $jversion->RELEASE);
+		$majorVersion = array_shift($versionParts);
+		$suffixes = array(
+			'.j' . str_replace('.', '', $jversion->getHelpVersion()),
+			'.j' . $majorVersion,
+		);
+
+		return $suffixes;
+	}
+
+	/**
+	 * Return the absolute path to the application's template overrides
+	 * directory for a specific component. We will use it to look for template
+	 * files instead of the regular component directorues. If the application
+	 * does not have such a thing as template overrides return an empty string.
+	 *
+	 * @param   string   $component  The name of the component for which to fetch the overrides
+	 * @param   boolean  $absolute   Should I return an absolute or relative path?
+	 *
+	 * @return  string  The path to the template overrides directory
+	 */
+	public function getTemplateOverridePath($component, $absolute = true)
+	{
+		list($isCli, $isAdmin) = $this->isCliAdmin();
+
+		if (!$isCli)
+		{
+			if ($absolute)
+			{
+				$path = JPATH_THEMES . '/';
+			}
+			else
+			{
+				$path = $isAdmin ? 'administrator/templates/' : 'templates/';
+			}
+
+			if (substr($component, 0, 7) == 'media:/')
+			{
+				$directory = 'media/' . substr($component, 7);
+			}
+			else
+			{
+				$directory = 'html/' . $component;
+			}
+
+			$path .= JFactory::getApplication()->getTemplate() .
+				'/' . $directory;
+		}
+		else
+		{
+			$path = '';
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Load the translation files for a given component.
+	 *
+	 * @param   string  $component  The name of the component. For Joomla! this
+	 *                              is something like "com_example"
+	 *
+	 * @see FOFPlatformInterface::loadTranslations()
+	 *
+	 * @return  void
+	 */
+	public function loadTranslations($component)
+	{
+		if ($this->isBackend())
+		{
+			$paths = array(JPATH_ROOT, JPATH_ADMINISTRATOR);
+		}
+		else
+		{
+			$paths = array(JPATH_ADMINISTRATOR, JPATH_ROOT);
+		}
+
+		$jlang = JFactory::getLanguage();
+		$jlang->load($component, $paths[0], 'en-GB', true);
+		$jlang->load($component, $paths[0], null, true);
+		$jlang->load($component, $paths[1], 'en-GB', true);
+		$jlang->load($component, $paths[1], null, true);
+	}
+
+	/**
+	 * Authorise access to the component in the back-end.
+	 *
+	 * @param   string  $component  The name of the component.
+	 *
+	 * @see FOFPlatformInterface::authorizeAdmin()
+	 *
+	 * @return  boolean  True to allow loading the component, false to halt loading
+	 */
+	public function authorizeAdmin($component)
+	{
+		if ($this->isBackend())
+		{
+			// Master access check for the back-end, Joomla! 1.6 style.
+			$user = JFactory::getUser();
+
+			if (!$user->authorise('core.manage', $component)
+				&& !$user->authorise('core.admin', $component))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Return a user object.
+	 *
+	 * @param   integer  $id  The user ID to load. Skip or use null to retrieve
+	 *                        the object for the currently logged in user.
+	 *
+	 * @see FOFPlatformInterface::getUser()
+	 *
+	 * @return  JUser  The JUser object for the specified user
+	 */
+	public function getUser($id = null)
+	{
+		return JFactory::getUser($id);
+	}
+
+	/**
+	 * Returns the JDocument object which handles this component's response.
+	 *
+	 * @see FOFPlatformInterface::getDocument()
+	 *
+	 * @return  JDocument
+	 */
+	public function getDocument()
+	{
+		$document = null;
+
+		if (!$this->isCli())
+		{
+			try
+			{
+				$document = JFactory::getDocument();
+			}
+			catch (Exception $exc)
+			{
+				$document = null;
+			}
+		}
+
+		return $document;
+	}
+
+    /**
+     * Returns an object to handle dates
+     *
+     * @param   mixed   $time       The initial time
+     * @param   null    $tzOffest   The timezone offset
+     * @param   bool    $locale     Should I try to load a specific class for current language?
+     *
+     * @return  JDate object
+     */
+    public function getDate($time = 'now', $tzOffest = null, $locale = true)
+    {
+        if($locale)
+        {
+            return JFactory::getDate($time, $tzOffest);
+        }
+        else
+        {
+            return new JDate($time, $tzOffest);
+        }
+    }
+
+    public function getLanguage()
+    {
+        return JFactory::getLanguage();
+    }
+
+    public function getDbo()
+    {
+		return FOFDatabaseFactory::getInstance()->getDriver('joomla');
+    }
+
+	/**
+	 * This method will try retrieving a variable from the request (input) data.
+	 *
+	 * @param   string    $key           The user state key for the variable
+	 * @param   string    $request       The request variable name for the variable
+	 * @param   FOFInput  $input         The FOFInput object with the request (input) data
+	 * @param   mixed     $default       The default value. Default: null
+	 * @param   string    $type          The filter type for the variable data. Default: none (no filtering)
+	 * @param   boolean   $setUserState  Should I set the user state with the fetched value?
+	 *
+	 * @see FOFPlatformInterface::getUserStateFromRequest()
+	 *
+	 * @return  mixed  The value of the variable
+	 */
+	public function getUserStateFromRequest($key, $request, $input, $default = null, $type = 'none', $setUserState = true)
+	{
+		list($isCLI, $isAdmin) = $this->isCliAdmin();
+
+		if ($isCLI)
+		{
+			return $input->get($request, $default, $type);
+		}
+
+		$app = JFactory::getApplication();
+
+		if (method_exists($app, 'getUserState'))
+		{
+			$old_state = $app->getUserState($key, $default);
+		}
+		else
+		{
+			$old_state = null;
+		}
+
+		$cur_state = (!is_null($old_state)) ? $old_state : $default;
+		$new_state = $input->get($request, null, $type);
+
+		// Save the new value only if it was set in this request
+		if ($setUserState)
+		{
+			if ($new_state !== null)
+			{
+				$app->setUserState($key, $new_state);
+			}
+			else
+			{
+				$new_state = $cur_state;
+			}
+		}
+		elseif (is_null($new_state))
+		{
+			$new_state = $cur_state;
+		}
+
+		return $new_state;
+	}
+
+	/**
+	 * Load plugins of a specific type. Obviously this seems to only be required
+	 * in the Joomla! CMS.
+	 *
+	 * @param   string  $type  The type of the plugins to be loaded
+	 *
+	 * @see FOFPlatformInterface::importPlugin()
+	 *
+	 * @return void
+	 */
+	public function importPlugin($type)
+	{
+		if (!$this->isCli())
+		{
+            JLoader::import('joomla.plugin.helper');
+			JPluginHelper::importPlugin($type);
+		}
+	}
+
+	/**
+	 * Execute plugins (system-level triggers) and fetch back an array with
+	 * their return values.
+	 *
+	 * @param   string  $event  The event (trigger) name, e.g. onBeforeScratchMyEar
+	 * @param   array   $data   A hash array of data sent to the plugins as part of the trigger
+	 *
+	 * @see FOFPlatformInterface::runPlugins()
+	 *
+	 * @return  array  A simple array containing the results of the plugins triggered
+	 */
+	public function runPlugins($event, $data)
+	{
+		if (!$this->isCli())
+		{
+			$app = JFactory::getApplication();
+
+			if (method_exists($app, 'triggerEvent'))
+			{
+				return $app->triggerEvent($event, $data);
+			}
+
+			// IMPORTANT: DO NOT REPLACE THIS INSTANCE OF JDispatcher WITH ANYTHING ELSE. WE NEED JOOMLA!'S PLUGIN EVENT
+			// DISPATCHER HERE, NOT OUR GENERIC EVENTS DISPATCHER
+			if (class_exists('JEventDispatcher'))
+			{
+				$dispatcher = JEventDispatcher::getInstance();
+			}
+			else
+			{
+				$dispatcher = JDispatcher::getInstance();
+			}
+
+			return $dispatcher->trigger($event, $data);
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Perform an ACL check.
+	 *
+	 * @param   string  $action     The ACL privilege to check, e.g. core.edit
+	 * @param   string  $assetname  The asset name to check, typically the component's name
+	 *
+	 * @see FOFPlatformInterface::authorise()
+	 *
+	 * @return  boolean  True if the user is allowed this action
+	 */
+	public function authorise($action, $assetname)
+	{
+		if ($this->isCli())
+		{
+			return true;
+		}
+
+		return JFactory::getUser()->authorise($action, $assetname);
+	}
+
+	/**
+	 * Is this the administrative section of the component?
+	 *
+	 * @see FOFPlatformInterface::isBackend()
+	 *
+	 * @return  boolean
+	 */
+	public function isBackend()
+	{
+		list ($isCli, $isAdmin) = $this->isCliAdmin();
+
+		return $isAdmin && !$isCli;
+	}
+
+	/**
+	 * Is this the public section of the component?
+	 *
+	 * @see FOFPlatformInterface::isFrontend()
+	 *
+	 * @return  boolean
+	 */
+	public function isFrontend()
+	{
+		list ($isCli, $isAdmin) = $this->isCliAdmin();
+
+		return !$isAdmin && !$isCli;
+	}
+
+	/**
+	 * Is this a component running in a CLI application?
+	 *
+	 * @see FOFPlatformInterface::isCli()
+	 *
+	 * @return  boolean
+	 */
+	public function isCli()
+	{
+		list ($isCli, $isAdmin) = $this->isCliAdmin();
+
+		return !$isAdmin && $isCli;
+	}
+
+	/**
+	 * Is AJAX re-ordering supported? This is 100% Joomla!-CMS specific. All
+	 * other platforms should return false and never ask why.
+	 *
+	 * @see FOFPlatformInterface::supportsAjaxOrdering()
+	 *
+	 * @return  boolean
+	 */
+	public function supportsAjaxOrdering()
+	{
+		return version_compare(JVERSION, '3.0', 'ge');
+	}
+
+	/**
+	 * Is the global FOF cache enabled?
+	 *
+	 * @return  boolean
+	 */
+	public function isGlobalFOFCacheEnabled()
+	{
+		return !(defined('JDEBUG') && JDEBUG);
+	}
+
+	/**
+	 * Saves something to the cache. This is supposed to be used for system-wide
+	 * FOF data, not application data.
+	 *
+	 * @param   string  $key      The key of the data to save
+	 * @param   string  $content  The actual data to save
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function setCache($key, $content)
+	{
+		$registry = $this->getCacheObject();
+
+		$registry->set($key, $content);
+
+		return $this->saveCache();
+	}
+
+	/**
+	 * Retrieves data from the cache. This is supposed to be used for system-side
+	 * FOF data, not application data.
+	 *
+	 * @param   string  $key      The key of the data to retrieve
+	 * @param   string  $default  The default value to return if the key is not found or the cache is not populated
+	 *
+	 * @return  string  The cached value
+	 */
+	public function getCache($key, $default = null)
+	{
+		$registry = $this->getCacheObject();
+
+		return $registry->get($key, $default);
+	}
+
+	/**
+	 * Gets a reference to the cache object, loading it from the disk if
+	 * needed.
+	 *
+	 * @param   boolean  $force  Should I forcibly reload the registry?
+	 *
+	 * @return  JRegistry
+	 */
+	private function &getCacheObject($force = false)
+	{
+		// Check if we have to load the cache file or we are forced to do that
+		if (is_null($this->_cache) || $force)
+		{
+			// Create a new JRegistry object
+			JLoader::import('joomla.registry.registry');
+			$this->_cache = new JRegistry;
+
+			// Try to get data from Joomla!'s cache
+			$cache = JFactory::getCache('fof', '');
+			$data = $cache->get('cache', 'fof');
+
+			// If data is not found, fall back to the legacy (FOF 2.1.rc3 and earlier) method
+			if ($data === false)
+			{
+				// Find the path to the file
+				$cachePath  = JPATH_CACHE . '/fof';
+				$filename   = $cachePath . '/cache.php';
+                $filesystem = $this->getIntegrationObject('filesystem');
+
+				// Load the cache file if it exists. JRegistryFormatPHP fails
+				// miserably, so I have to work around it.
+				if ($filesystem->fileExists($filename))
+				{
+					@include_once $filename;
+
+					$filesystem->fileDelete($filename);
+
+					$className = 'FOFCacheStorage';
+
+					if (class_exists($className))
+					{
+						$object = new $className;
+						$this->_cache->loadObject($object);
+
+						$options = array(
+							'class' => 'FOFCacheStorage'
+						);
+						$cache->store($this->_cache, 'cache', 'fof');
+					}
+				}
+			}
+			else
+			{
+				$this->_cache = $data;
+			}
+		}
+
+		return $this->_cache;
+	}
+
+	/**
+	 * Save the cache object back to disk
+	 *
+	 * @return  boolean  True on success
+	 */
+	private function saveCache()
+	{
+		// Get the JRegistry object of our cached data
+		$registry = $this->getCacheObject();
+
+		$cache = JFactory::getCache('fof', '');
+		return $cache->store($registry, 'cache', 'fof');
+	}
+
+	/**
+	 * Clears the cache of system-wide FOF data. You are supposed to call this in
+	 * your components' installation script post-installation and post-upgrade
+	 * methods or whenever you are modifying the structure of database tables
+	 * accessed by FOF. Please note that FOF's cache never expires and is not
+	 * purged by Joomla!. You MUST use this method to manually purge the cache.
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function clearCache()
+	{
+		$false = false;
+		$cache = JFactory::getCache('fof', '');
+		$cache->store($false, 'cache', 'fof');
+	}
+
+    public function getConfig()
+    {
+        return JFactory::getConfig();
+    }
+
+	/**
+	 * logs in a user
+	 *
+	 * @param   array  $authInfo  authentification information
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function loginUser($authInfo)
+	{
+		JLoader::import('joomla.user.authentication');
+		$options = array('remember'		 => false);
+		$authenticate = JAuthentication::getInstance();
+		$response = $authenticate->authenticate($authInfo, $options);
+
+        // User failed to authenticate: maybe he enabled two factor authentication?
+        // Let's try again "manually", skipping the check vs two factor auth
+        // Due the big mess with encryption algorithms and libraries, we are doing this extra check only
+        // if we're in Joomla 2.5.18+ or 3.2.1+
+        if($response->status != JAuthentication::STATUS_SUCCESS && method_exists('JUserHelper', 'verifyPassword'))
+        {
+            $db    = $this->getDbo();
+            $query = $db->getQuery(true)
+                        ->select('id, password')
+                        ->from('#__users')
+                        ->where('username=' . $db->quote($authInfo['username']));
+            $result = $db->setQuery($query)->loadObject();
+
+            if ($result)
+            {
+
+                $match = JUserHelper::verifyPassword($authInfo['password'], $result->password, $result->id);
+
+                if ($match === true)
+                {
+                    // Bring this in line with the rest of the system
+                    $user = JUser::getInstance($result->id);
+                    $response->email = $user->email;
+                    $response->fullname = $user->name;
+
+                    if (JFactory::getApplication()->isAdmin())
+                    {
+                        $response->language = $user->getParam('admin_language');
+                    }
+                    else
+                    {
+                        $response->language = $user->getParam('language');
+                    }
+
+                    $response->status = JAuthentication::STATUS_SUCCESS;
+                    $response->error_message = '';
+                }
+            }
+        }
+
+		if ($response->status == JAuthentication::STATUS_SUCCESS)
+		{
+			$this->importPlugin('user');
+			$results = $this->runPlugins('onLoginUser', array((array) $response, $options));
+
+			JLoader::import('joomla.user.helper');
+			$userid = JUserHelper::getUserId($response->username);
+			$user = $this->getUser($userid);
+
+			$session = JFactory::getSession();
+			$session->set('user', $user);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * logs out a user
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function logoutUser()
+	{
+		JLoader::import('joomla.user.authentication');
+		$app = JFactory::getApplication();
+		$options = array('remember'	 => false);
+		$parameters = array('username'	 => $this->getUser()->username);
+
+		return $app->triggerEvent('onLogoutUser', array($parameters, $options));
+	}
+
+    public function logAddLogger($file)
+    {
+		if (!class_exists('JLog'))
+		{
+			return;
+		}
+
+        JLog::addLogger(array('text_file' => $file), JLog::ALL, array('fof'));
+    }
+
+	/**
+	 * Logs a deprecated practice. In Joomla! this results in the $message being output in the
+	 * deprecated log file, found in your site's log directory.
+	 *
+	 * @param   string  $message  The deprecated practice log message
+	 *
+	 * @return  void
+	 */
+	public function logDeprecated($message)
+	{
+		if (!class_exists('JLog'))
+		{
+			return;
+		}
+
+		JLog::add($message, JLog::WARNING, 'deprecated');
+	}
+
+    public function logDebug($message)
+    {
+		if (!class_exists('JLog'))
+		{
+			return;
+		}
+
+        JLog::add($message, JLog::DEBUG, 'fof');
+    }
+
+    /**
+     * Returns the root URI for the request.
+     *
+     * @param   boolean  $pathonly  If false, prepend the scheme, host and port information. Default is false.
+     * @param   string   $path      The path
+     *
+     * @return  string  The root URI string.
+     */
+    public function URIroot($pathonly = false, $path = null)
+    {
+        JLoader::import('joomla.environment.uri');
+
+        return JUri::root($pathonly, $path);
+    }
+
+    /**
+     * Returns the base URI for the request.
+     *
+     * @param   boolean  $pathonly  If false, prepend the scheme, host and port information. Default is false.
+     * |
+     * @return  string  The base URI string
+     */
+    public function URIbase($pathonly = false)
+    {
+        JLoader::import('joomla.environment.uri');
+
+        return JUri::base($pathonly);
+    }
+
+    /**
+     * Method to set a response header.  If the replace flag is set then all headers
+     * with the given name will be replaced by the new one (only if the current platform supports header caching)
+     *
+     * @param   string   $name     The name of the header to set.
+     * @param   string   $value    The value of the header to set.
+     * @param   boolean  $replace  True to replace any headers with the same name.
+     *
+     * @return  void
+     */
+    public function setHeader($name, $value, $replace = false)
+    {
+		if (version_compare($this->version, '3.2', 'ge'))
+		{
+			JFactory::getApplication()->setHeader($name, $value, $replace);
+		}
+		else
+		{
+			JResponse::setHeader($name, $value, $replace);
+		}
+    }
+
+    public function sendHeaders()
+    {
+    	if (version_compare($this->version, '3.2', 'ge'))
+		{
+			JFactory::getApplication()->sendHeaders();
+		}
+		else
+		{
+			JResponse::sendHeaders();
+		}
+    }
+}
diff --git a/core/libraries/fof/layout/file.php b/core/libraries/fof/layout/file.php
new file mode 100644
index 00000000..f3617c11
--- /dev/null
+++ b/core/libraries/fof/layout/file.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  layout
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Base class for rendering a display layout
+ * loaded from from a layout file
+ *
+ * This class searches for Joomla! version override Layouts. For example,
+ * if you have run this under Joomla! 3.0 and you try to load
+ * mylayout.default it will automatically search for the
+ * layout files default.j30.php, default.j3.php and default.php, in this
+ * order.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFLayoutFile extends JLayoutFile
+{
+	/**
+	 * Method to finds the full real file path, checking possible overrides
+	 *
+	 * @return  string  The full path to the layout file
+	 */
+	protected function getPath()
+	{
+		$filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		if (is_null($this->fullPath) && !empty($this->layoutId))
+		{
+			$parts = explode('.', $this->layoutId);
+			$file  = array_pop($parts);
+
+			$filePath = implode('/', $parts);
+			$suffixes = FOFPlatform::getInstance()->getTemplateSuffixes();
+
+			foreach ($suffixes as $suffix)
+			{
+				$files[] = $file . $suffix . '.php';
+			}
+
+			$files[] = $file . '.php';
+
+            $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+            $prefix       = FOFPlatform::getInstance()->isBackend() ? $platformDirs['admin'] : $platformDirs['root'];
+
+			$possiblePaths = array(
+				$prefix . '/templates/' . JFactory::getApplication()->getTemplate() . '/html/layouts/' . $filePath,
+				$this->basePath . '/' . $filePath
+			);
+
+			reset($files);
+
+			while ((list(, $fileName) = each($files)) && is_null($this->fullPath))
+			{
+				$r = $filesystem->pathFind($possiblePaths, $fileName);
+				$this->fullPath = $r === false ? null : $r;
+			}
+		}
+
+		return $this->fullPath;
+	}
+}
diff --git a/core/libraries/fof/layout/helper.php b/core/libraries/fof/layout/helper.php
new file mode 100644
index 00000000..16bf9353
--- /dev/null
+++ b/core/libraries/fof/layout/helper.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  layout
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Helper to render a FOFLayout object, storing a base path
+ *
+ * @package  FrameworkOnFramework
+ * @since    x.y
+ */
+class FOFLayoutHelper extends JLayoutHelper
+{
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 * @param   string  $basePath     Base path to use when loading layout files
+	 *
+	 * @return  string
+	 */
+	public static function render($layoutFile, $displayData = null, $basePath = '')
+	{
+		$basePath = empty($basePath) ? self::$defaultBasePath : $basePath;
+
+		// Make sure we send null to FOFLayoutFile if no path set
+		$basePath = empty($basePath) ? null : $basePath;
+		$layout = new FOFLayoutFile($layoutFile, $basePath);
+		$renderedLayout = $layout->render($displayData);
+
+		return $renderedLayout;
+	}
+}
diff --git a/core/libraries/fof/less/formatter/classic.php b/core/libraries/fof/less/formatter/classic.php
new file mode 100644
index 00000000..2df9569e
--- /dev/null
+++ b/core/libraries/fof/less/formatter/classic.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  less
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class is taken verbatim from:
+ *
+ * lessphp v0.3.9
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFLessFormatterClassic
+{
+	public $indentChar			 = "  ";
+
+	public $break				 = "\n";
+
+	public $open				 = " {";
+
+	public $close				 = "}";
+
+	public $selectorSeparator	 = ", ";
+
+	public $assignSeparator	 = ":";
+
+	public $openSingle			 = " { ";
+
+	public $closeSingle		 = " }";
+
+	public $disableSingle		 = false;
+
+	public $breakSelectors		 = false;
+
+	public $compressColors		 = false;
+
+	/**
+	 * Public constructor
+	 */
+	public function __construct()
+	{
+		$this->indentLevel = 0;
+	}
+
+	/**
+	 * Indent a string by $n positions
+	 *
+	 * @param   integer  $n  How many positions to indent
+	 *
+	 * @return  string  The indented string
+	 */
+	public function indentStr($n = 0)
+	{
+		return str_repeat($this->indentChar, max($this->indentLevel + $n, 0));
+	}
+
+	/**
+	 * Return the code for a property
+	 *
+	 * @param   string  $name   The name of the porperty
+	 * @param   string  $value  The value of the porperty
+	 *
+	 * @return  string  The CSS code
+	 */
+	public function property($name, $value)
+	{
+		return $name . $this->assignSeparator . $value . ";";
+	}
+
+	/**
+	 * Is a block empty?
+	 *
+	 * @param   stdClass  $block  The block to check
+	 *
+	 * @return  boolean  True if the block has no lines or children
+	 */
+	protected function isEmpty($block)
+	{
+		if (empty($block->lines))
+		{
+			foreach ($block->children as $child)
+			{
+				if (!$this->isEmpty($child))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Output a CSS block
+	 *
+	 * @param   stdClass  $block  The block definition to output
+	 *
+	 * @return  void
+	 */
+	public function block($block)
+	{
+		if ($this->isEmpty($block))
+		{
+			return;
+		}
+
+		$inner	 = $pre	 = $this->indentStr();
+
+		$isSingle = !$this->disableSingle &&
+			is_null($block->type) && count($block->lines) == 1;
+
+		if (!empty($block->selectors))
+		{
+			$this->indentLevel++;
+
+			if ($this->breakSelectors)
+			{
+				$selectorSeparator = $this->selectorSeparator . $this->break . $pre;
+			}
+			else
+			{
+				$selectorSeparator = $this->selectorSeparator;
+			}
+
+			echo $pre .
+			implode($selectorSeparator, $block->selectors);
+
+			if ($isSingle)
+			{
+				echo $this->openSingle;
+				$inner = "";
+			}
+			else
+			{
+				echo $this->open . $this->break;
+				$inner = $this->indentStr();
+			}
+		}
+
+		if (!empty($block->lines))
+		{
+			$glue = $this->break . $inner;
+			echo $inner . implode($glue, $block->lines);
+
+			if (!$isSingle && !empty($block->children))
+			{
+				echo $this->break;
+			}
+		}
+
+		foreach ($block->children as $child)
+		{
+			$this->block($child);
+		}
+
+		if (!empty($block->selectors))
+		{
+			if (!$isSingle && empty($block->children))
+			{
+				echo $this->break;
+			}
+
+			if ($isSingle)
+			{
+				echo $this->closeSingle . $this->break;
+			}
+			else
+			{
+				echo $pre . $this->close . $this->break;
+			}
+
+			$this->indentLevel--;
+		}
+	}
+}
diff --git a/core/libraries/fof/less/formatter/compressed.php b/core/libraries/fof/less/formatter/compressed.php
new file mode 100644
index 00000000..f1c2efdd
--- /dev/null
+++ b/core/libraries/fof/less/formatter/compressed.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  less
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class is taken verbatim from:
+ *
+ * lessphp v0.3.9
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFLessFormatterCompressed extends FOFLessFormatterClassic
+{
+	public $disableSingle = true;
+
+	public $open = "{";
+
+	public $selectorSeparator = ",";
+
+	public $assignSeparator = ":";
+
+	public $break = "";
+
+	public $compressColors = true;
+
+	/**
+	 * Indent a string by $n positions
+	 *
+	 * @param   integer  $n  How many positions to indent
+	 *
+	 * @return  string  The indented string
+	 */
+	public function indentStr($n = 0)
+	{
+		return "";
+	}
+}
diff --git a/core/libraries/fof/less/formatter/joomla.php b/core/libraries/fof/less/formatter/joomla.php
new file mode 100644
index 00000000..cc09ca51
--- /dev/null
+++ b/core/libraries/fof/less/formatter/joomla.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  less
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class is taken verbatim from:
+ *
+ * lessphp v0.3.9
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFLessFormatterJoomla extends FOFLessFormatterClassic
+{
+	public $disableSingle = true;
+
+	public $breakSelectors = true;
+
+	public $assignSeparator = ": ";
+
+	public $selectorSeparator = ",";
+
+	public $indentChar = "\t";
+}
diff --git a/core/libraries/fof/less/formatter/lessjs.php b/core/libraries/fof/less/formatter/lessjs.php
new file mode 100644
index 00000000..8b123879
--- /dev/null
+++ b/core/libraries/fof/less/formatter/lessjs.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  less
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class is taken verbatim from:
+ *
+ * lessphp v0.3.9
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFLessFormatterLessjs extends FOFLessFormatterClassic
+{
+	public $disableSingle = true;
+
+	public $breakSelectors = true;
+
+	public $assignSeparator = ": ";
+
+	public $selectorSeparator = ",";
+}
diff --git a/core/libraries/fof/less/less.php b/core/libraries/fof/less/less.php
new file mode 100644
index 00000000..d4e14fbd
--- /dev/null
+++ b/core/libraries/fof/less/less.php
@@ -0,0 +1,3450 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  less
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class is taken near verbatim (changes marked with **FOF** comment markers) from:
+ *
+ * lessphp v0.3.9
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ *
+ * THIS IS THIRD PARTY CODE. Code comments are mostly useless placeholders to
+ * stop phpcs from complaining...
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFLess
+{
+	public static $VERSION = "v0.3.9";
+
+	protected static $TRUE = array("keyword", "true");
+
+	protected static $FALSE = array("keyword", "false");
+
+	protected $libFunctions = array();
+
+	protected $registeredVars = array();
+
+	protected $preserveComments = false;
+
+	/**
+	 * Prefix of abstract properties
+	 *
+	 * @var  string
+	 */
+	public $vPrefix = '@';
+
+	/**
+	 * Prefix of abstract blocks
+	 *
+	 * @var  string
+	 */
+	public $mPrefix = '$';
+
+	public $parentSelector = '&';
+
+	public $importDisabled = false;
+
+	public $importDir = '';
+
+	protected $numberPrecision = null;
+
+	/**
+	 * Set to the parser that generated the current line when compiling
+	 * so we know how to create error messages
+	 *
+	 * @var  FOFLessParser
+	 */
+	protected $sourceParser = null;
+
+	protected $sourceLoc = null;
+
+	public static $defaultValue = array("keyword", "");
+
+	/**
+	 * Uniquely identify imports
+	 *
+	 * @var  integer
+	 */
+	protected static $nextImportId = 0;
+
+	/**
+	 * Attempts to find the path of an import url, returns null for css files
+	 *
+	 * @param   string  $url  The URL of the import
+	 *
+	 * @return  string|null
+	 */
+	protected function findImport($url)
+	{
+		foreach ((array) $this->importDir as $dir)
+		{
+			$full = $dir . (substr($dir, -1) != '/' ? '/' : '') . $url;
+
+			if ($this->fileExists($file = $full . '.less') || $this->fileExists($file = $full))
+			{
+				return $file;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Does file $name exists? It's a simple proxy to JFile for now
+	 *
+	 * @param   string  $name  The file we check for existence
+	 *
+	 * @return  boolean
+	 */
+	protected function fileExists($name)
+	{
+		/** FOF - BEGIN CHANGE * */
+		return FOFPlatform::getInstance()->getIntegrationObject('filesystem')->fileExists($name);
+		/** FOF - END CHANGE * */
+	}
+
+	/**
+	 * Compresslist
+	 *
+	 * @param   array   $items  Items
+	 * @param   string  $delim  Delimiter
+	 *
+	 * @return  array
+	 */
+	public static function compressList($items, $delim)
+	{
+		if (!isset($items[1]) && isset($items[0]))
+		{
+			return $items[0];
+		}
+		else
+		{
+			return array('list', $delim, $items);
+		}
+	}
+
+	/**
+	 * Quote for regular expression
+	 *
+	 * @param   string  $what  What to quote
+	 *
+	 * @return  string  Quoted string
+	 */
+	public static function preg_quote($what)
+	{
+		return preg_quote($what, '/');
+	}
+
+	/**
+	 * Try import
+	 *
+	 * @param   string     $importPath   Import path
+	 * @param   stdObject  $parentBlock  Parent block
+	 * @param   string     $out          Out
+	 *
+	 * @return  boolean
+	 */
+	protected function tryImport($importPath, $parentBlock, $out)
+	{
+		if ($importPath[0] == "function" && $importPath[1] == "url")
+		{
+			$importPath = $this->flattenList($importPath[2]);
+		}
+
+		$str = $this->coerceString($importPath);
+
+		if ($str === null)
+		{
+			return false;
+		}
+
+		$url = $this->compileValue($this->lib_e($str));
+
+		// Don't import if it ends in css
+		if (substr_compare($url, '.css', -4, 4) === 0)
+		{
+			return false;
+		}
+
+		$realPath = $this->findImport($url);
+
+		if ($realPath === null)
+		{
+			return false;
+		}
+
+		if ($this->importDisabled)
+		{
+			return array(false, "/* import disabled */");
+		}
+
+		$this->addParsedFile($realPath);
+		$parser = $this->makeParser($realPath);
+		$root = $parser->parse(file_get_contents($realPath));
+
+		// Set the parents of all the block props
+		foreach ($root->props as $prop)
+		{
+			if ($prop[0] == "block")
+			{
+				$prop[1]->parent = $parentBlock;
+			}
+		}
+
+		/**
+		 * Copy mixins into scope, set their parents, bring blocks from import
+		 * into current block
+		 * TODO: need to mark the source parser	these came from this file
+		 */
+		foreach ($root->children as $childName => $child)
+		{
+			if (isset($parentBlock->children[$childName]))
+			{
+				$parentBlock->children[$childName] = array_merge(
+					$parentBlock->children[$childName], $child
+				);
+			}
+			else
+			{
+				$parentBlock->children[$childName] = $child;
+			}
+		}
+
+		$pi = pathinfo($realPath);
+		$dir = $pi["dirname"];
+
+		list($top, $bottom) = $this->sortProps($root->props, true);
+		$this->compileImportedProps($top, $parentBlock, $out, $parser, $dir);
+
+		return array(true, $bottom, $parser, $dir);
+	}
+
+	/**
+	 * Compile Imported Props
+	 *
+	 * @param   array          $props         Props
+	 * @param   stdClass       $block         Block
+	 * @param   string         $out           Out
+	 * @param   FOFLessParser  $sourceParser  Source parser
+	 * @param   string         $importDir     Import dir
+	 *
+	 * @return  void
+	 */
+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir)
+	{
+		$oldSourceParser = $this->sourceParser;
+
+		$oldImport = $this->importDir;
+
+		// TODO: this is because the importDir api is stupid
+		$this->importDir = (array) $this->importDir;
+		array_unshift($this->importDir, $importDir);
+
+		foreach ($props as $prop)
+		{
+			$this->compileProp($prop, $block, $out);
+		}
+
+		$this->importDir = $oldImport;
+		$this->sourceParser = $oldSourceParser;
+	}
+
+	/**
+	 * Recursively compiles a block.
+	 *
+	 * A block is analogous to a CSS block in most cases. A single LESS document
+	 * is encapsulated in a block when parsed, but it does not have parent tags
+	 * so all of it's children appear on the root level when compiled.
+	 *
+	 * Blocks are made up of props and children.
+	 *
+	 * Props are property instructions, array tuples which describe an action
+	 * to be taken, eg. write a property, set a variable, mixin a block.
+	 *
+	 * The children of a block are just all the blocks that are defined within.
+	 * This is used to look up mixins when performing a mixin.
+	 *
+	 * Compiling the block involves pushing a fresh environment on the stack,
+	 * and iterating through the props, compiling each one.
+	 *
+	 * @param   stdClass  $block  Block
+	 *
+	 * @see  FOFLess::compileProp()
+	 *
+	 * @return  void
+	 */
+	protected function compileBlock($block)
+	{
+		switch ($block->type)
+		{
+			case "root":
+				$this->compileRoot($block);
+				break;
+			case null:
+				$this->compileCSSBlock($block);
+				break;
+			case "media":
+				$this->compileMedia($block);
+				break;
+			case "directive":
+				$name = "@" . $block->name;
+
+				if (!empty($block->value))
+				{
+					$name .= " " . $this->compileValue($this->reduce($block->value));
+				}
+
+				$this->compileNestedBlock($block, array($name));
+				break;
+			default:
+				$this->throwError("unknown block type: $block->type\n");
+		}
+	}
+
+	/**
+	 * Compile CSS block
+	 *
+	 * @param   stdClass  $block  Block to compile
+	 *
+	 * @return  void
+	 */
+	protected function compileCSSBlock($block)
+	{
+		$env = $this->pushEnv();
+
+		$selectors = $this->compileSelectors($block->tags);
+		$env->selectors = $this->multiplySelectors($selectors);
+		$out = $this->makeOutputBlock(null, $env->selectors);
+
+		$this->scope->children[] = $out;
+		$this->compileProps($block, $out);
+
+		// Mixins carry scope with them!
+		$block->scope = $env;
+		$this->popEnv();
+	}
+
+	/**
+	 * Compile media
+	 *
+	 * @param   stdClass  $media  Media
+	 *
+	 * @return  void
+	 */
+	protected function compileMedia($media)
+	{
+		$env = $this->pushEnv($media);
+		$parentScope = $this->mediaParent($this->scope);
+
+		$query = $this->compileMediaQuery($this->multiplyMedia($env));
+
+		$this->scope = $this->makeOutputBlock($media->type, array($query));
+		$parentScope->children[] = $this->scope;
+
+		$this->compileProps($media, $this->scope);
+
+		if (count($this->scope->lines) > 0)
+		{
+			$orphanSelelectors = $this->findClosestSelectors();
+
+			if (!is_null($orphanSelelectors))
+			{
+				$orphan = $this->makeOutputBlock(null, $orphanSelelectors);
+				$orphan->lines = $this->scope->lines;
+				array_unshift($this->scope->children, $orphan);
+				$this->scope->lines = array();
+			}
+		}
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	/**
+	 * Media parent
+	 *
+	 * @param   stdClass  $scope  Scope
+	 *
+	 * @return  stdClass
+	 */
+	protected function mediaParent($scope)
+	{
+		while (!empty($scope->parent))
+		{
+			if (!empty($scope->type) && $scope->type != "media")
+			{
+				break;
+			}
+
+			$scope = $scope->parent;
+		}
+
+		return $scope;
+	}
+
+	/**
+	 * Compile nested block
+	 *
+	 * @param   stdClass  $block      Block
+	 * @param   array     $selectors  Selectors
+	 *
+	 * @return  void
+	 */
+	protected function compileNestedBlock($block, $selectors)
+	{
+		$this->pushEnv($block);
+		$this->scope = $this->makeOutputBlock($block->type, $selectors);
+		$this->scope->parent->children[] = $this->scope;
+
+		$this->compileProps($block, $this->scope);
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	/**
+	 * Compile root
+	 *
+	 * @param   stdClass  $root  Root
+	 *
+	 * @return  void
+	 */
+	protected function compileRoot($root)
+	{
+		$this->pushEnv();
+		$this->scope = $this->makeOutputBlock($root->type);
+		$this->compileProps($root, $this->scope);
+		$this->popEnv();
+	}
+
+	/**
+	 * Compile props
+	 *
+	 * @param   type  $block  Something
+	 * @param   type  $out    Something
+	 *
+	 * @return  void
+	 */
+	protected function compileProps($block, $out)
+	{
+		foreach ($this->sortProps($block->props) as $prop)
+		{
+			$this->compileProp($prop, $block, $out);
+		}
+	}
+
+	/**
+	 * Sort props
+	 *
+	 * @param   type  $props  X
+	 * @param   type  $split  X
+	 *
+	 * @return  type
+	 */
+	protected function sortProps($props, $split = false)
+	{
+		$vars    = array();
+		$imports = array();
+		$other   = array();
+
+		foreach ($props as $prop)
+		{
+			switch ($prop[0])
+			{
+				case "assign":
+					if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix)
+					{
+						$vars[] = $prop;
+					}
+					else
+					{
+						$other[] = $prop;
+					}
+					break;
+				case "import":
+					$id        = self::$nextImportId++;
+					$prop[]    = $id;
+					$imports[] = $prop;
+					$other[]   = array("import_mixin", $id);
+					break;
+				default:
+					$other[] = $prop;
+			}
+		}
+
+		if ($split)
+		{
+			return array(array_merge($vars, $imports), $other);
+		}
+		else
+		{
+			return array_merge($vars, $imports, $other);
+		}
+	}
+
+	/**
+	 * Compile media query
+	 *
+	 * @param   type  $queries  Queries
+	 *
+	 * @return  string
+	 */
+	protected function compileMediaQuery($queries)
+	{
+		$compiledQueries = array();
+
+		foreach ($queries as $query)
+		{
+			$parts = array();
+
+			foreach ($query as $q)
+			{
+				switch ($q[0])
+				{
+					case "mediaType":
+						$parts[] = implode(" ", array_slice($q, 1));
+						break;
+					case "mediaExp":
+						if (isset($q[2]))
+						{
+							$parts[] = "($q[1]: " .
+								$this->compileValue($this->reduce($q[2])) . ")";
+						}
+						else
+						{
+							$parts[] = "($q[1])";
+						}
+						break;
+					case "variable":
+						$parts[] = $this->compileValue($this->reduce($q));
+						break;
+				}
+			}
+
+			if (count($parts) > 0)
+			{
+				$compiledQueries[] = implode(" and ", $parts);
+			}
+		}
+
+		$out = "@media";
+
+		if (!empty($parts))
+		{
+			$out .= " " .
+				implode($this->formatter->selectorSeparator, $compiledQueries);
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Multiply media
+	 *
+	 * @param   type  $env           X
+	 * @param   type  $childQueries  X
+	 *
+	 * @return  type
+	 */
+	protected function multiplyMedia($env, $childQueries = null)
+	{
+		if (is_null($env)
+			|| !empty($env->block->type)
+			&& $env->block->type != "media")
+		{
+			return $childQueries;
+		}
+
+		// Plain old block, skip
+		if (empty($env->block->type))
+		{
+			return $this->multiplyMedia($env->parent, $childQueries);
+		}
+
+		$out = array();
+		$queries = $env->block->queries;
+
+		if (is_null($childQueries))
+		{
+			$out = $queries;
+		}
+		else
+		{
+			foreach ($queries as $parent)
+			{
+				foreach ($childQueries as $child)
+				{
+					$out[] = array_merge($parent, $child);
+				}
+			}
+		}
+
+		return $this->multiplyMedia($env->parent, $out);
+	}
+
+	/**
+	 * Expand parent selectors
+	 *
+	 * @param   type  &$tag     Tag
+	 * @param   type  $replace  Replace
+	 *
+	 * @return  type
+	 */
+	protected function expandParentSelectors(&$tag, $replace)
+	{
+		$parts = explode("$&$", $tag);
+		$count = 0;
+
+		foreach ($parts as &$part)
+		{
+			$part = str_replace($this->parentSelector, $replace, $part, $c);
+			$count += $c;
+		}
+
+		$tag = implode($this->parentSelector, $parts);
+
+		return $count;
+	}
+
+	/**
+	 * Find closest selectors
+	 *
+	 * @return  array
+	 */
+	protected function findClosestSelectors()
+	{
+		$env = $this->env;
+		$selectors = null;
+
+		while ($env !== null)
+		{
+			if (isset($env->selectors))
+			{
+				$selectors = $env->selectors;
+				break;
+			}
+
+			$env = $env->parent;
+		}
+
+		return $selectors;
+	}
+
+	/**
+	 * Multiply $selectors against the nearest selectors in env
+	 *
+	 * @param   array  $selectors  The selectors
+	 *
+	 * @return  array
+	 */
+	protected function multiplySelectors($selectors)
+	{
+		// Find parent selectors
+
+		$parentSelectors = $this->findClosestSelectors();
+
+		if (is_null($parentSelectors))
+		{
+			// Kill parent reference in top level selector
+			foreach ($selectors as &$s)
+			{
+				$this->expandParentSelectors($s, "");
+			}
+
+			return $selectors;
+		}
+
+		$out = array();
+
+		foreach ($parentSelectors as $parent)
+		{
+			foreach ($selectors as $child)
+			{
+				$count = $this->expandParentSelectors($child, $parent);
+
+				// Don't prepend the parent tag if & was used
+				if ($count > 0)
+				{
+					$out[] = trim($child);
+				}
+				else
+				{
+					$out[] = trim($parent . ' ' . $child);
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Reduces selector expressions
+	 *
+	 * @param   array  $selectors  The selector expressions
+	 *
+	 * @return  array
+	 */
+	protected function compileSelectors($selectors)
+	{
+		$out = array();
+
+		foreach ($selectors as $s)
+		{
+			if (is_array($s))
+			{
+				list(, $value) = $s;
+				$out[] = trim($this->compileValue($this->reduce($value)));
+			}
+			else
+			{
+				$out[] = $s;
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Equality check
+	 *
+	 * @param   mixed  $left   Left operand
+	 * @param   mixed  $right  Right operand
+	 *
+	 * @return  boolean  True if equal
+	 */
+	protected function eq($left, $right)
+	{
+		return $left == $right;
+	}
+
+	/**
+	 * Pattern match
+	 *
+	 * @param   type  $block        X
+	 * @param   type  $callingArgs  X
+	 *
+	 * @return  boolean
+	 */
+	protected function patternMatch($block, $callingArgs)
+	{
+		/**
+		 * Match the guards if it has them
+		 * any one of the groups must have all its guards pass for a match
+		 */
+		if (!empty($block->guards))
+		{
+			$groupPassed = false;
+
+			foreach ($block->guards as $guardGroup)
+			{
+				foreach ($guardGroup as $guard)
+				{
+					$this->pushEnv();
+					$this->zipSetArgs($block->args, $callingArgs);
+
+					$negate = false;
+
+					if ($guard[0] == "negate")
+					{
+						$guard = $guard[1];
+						$negate = true;
+					}
+
+					$passed = $this->reduce($guard) == self::$TRUE;
+
+					if ($negate)
+					{
+						$passed = !$passed;
+					}
+
+					$this->popEnv();
+
+					if ($passed)
+					{
+						$groupPassed = true;
+					}
+					else
+					{
+						$groupPassed = false;
+						break;
+					}
+				}
+
+				if ($groupPassed)
+				{
+					break;
+				}
+			}
+
+			if (!$groupPassed)
+			{
+				return false;
+			}
+		}
+
+		$numCalling = count($callingArgs);
+
+		if (empty($block->args))
+		{
+			return $block->isVararg || $numCalling == 0;
+		}
+
+		// No args
+		$i = -1;
+
+		// Try to match by arity or by argument literal
+		foreach ($block->args as $i => $arg)
+		{
+			switch ($arg[0])
+			{
+				case "lit":
+					if (empty($callingArgs[$i]) || !$this->eq($arg[1], $callingArgs[$i]))
+					{
+						return false;
+					}
+					break;
+				case "arg":
+					// No arg and no default value
+					if (!isset($callingArgs[$i]) && !isset($arg[2]))
+					{
+						return false;
+					}
+					break;
+				case "rest":
+					// Rest can be empty
+					$i--;
+					break 2;
+			}
+		}
+
+		if ($block->isVararg)
+		{
+			// Not having enough is handled above
+			return true;
+		}
+		else
+		{
+			$numMatched = $i + 1;
+
+			// Greater than becuase default values always match
+			return $numMatched >= $numCalling;
+		}
+	}
+
+	/**
+	 * Pattern match all
+	 *
+	 * @param   type  $blocks       X
+	 * @param   type  $callingArgs  X
+	 *
+	 * @return  type
+	 */
+	protected function patternMatchAll($blocks, $callingArgs)
+	{
+		$matches = null;
+
+		foreach ($blocks as $block)
+		{
+			if ($this->patternMatch($block, $callingArgs))
+			{
+				$matches[] = $block;
+			}
+		}
+
+		return $matches;
+	}
+
+	/**
+	 * Attempt to find blocks matched by path and args
+	 *
+	 * @param   array   $searchIn  Block to search in
+	 * @param   string  $path      The path to search for
+	 * @param   array   $args      Arguments
+	 * @param   array   $seen      Your guess is as good as mine; that's third party code
+	 *
+	 * @return  null
+	 */
+	protected function findBlocks($searchIn, $path, $args, $seen = array())
+	{
+		if ($searchIn == null)
+		{
+			return null;
+		}
+
+		if (isset($seen[$searchIn->id]))
+		{
+			return null;
+		}
+
+		$seen[$searchIn->id] = true;
+
+		$name = $path[0];
+
+		if (isset($searchIn->children[$name]))
+		{
+			$blocks = $searchIn->children[$name];
+
+			if (count($path) == 1)
+			{
+				$matches = $this->patternMatchAll($blocks, $args);
+
+				if (!empty($matches))
+				{
+					// This will return all blocks that match in the closest
+					// scope that has any matching block, like lessjs
+					return $matches;
+				}
+			}
+			else
+			{
+				$matches = array();
+
+				foreach ($blocks as $subBlock)
+				{
+					$subMatches = $this->findBlocks($subBlock, array_slice($path, 1), $args, $seen);
+
+					if (!is_null($subMatches))
+					{
+						foreach ($subMatches as $sm)
+						{
+							$matches[] = $sm;
+						}
+					}
+				}
+
+				return count($matches) > 0 ? $matches : null;
+			}
+		}
+
+		if ($searchIn->parent === $searchIn)
+		{
+			return null;
+		}
+
+		return $this->findBlocks($searchIn->parent, $path, $args, $seen);
+	}
+
+	/**
+	 * Sets all argument names in $args to either the default value
+	 * or the one passed in through $values
+	 *
+	 * @param   array  $args    Arguments
+	 * @param   array  $values  Values
+	 *
+	 * @return  void
+	 */
+	protected function zipSetArgs($args, $values)
+	{
+		$i = 0;
+		$assignedValues = array();
+
+		foreach ($args as $a)
+		{
+			if ($a[0] == "arg")
+			{
+				if ($i < count($values) && !is_null($values[$i]))
+				{
+					$value = $values[$i];
+				}
+				elseif (isset($a[2]))
+				{
+					$value = $a[2];
+				}
+				else
+				{
+					$value = null;
+				}
+
+				$value = $this->reduce($value);
+				$this->set($a[1], $value);
+				$assignedValues[] = $value;
+			}
+
+			$i++;
+		}
+
+		// Check for a rest
+		$last = end($args);
+
+		if ($last[0] == "rest")
+		{
+			$rest = array_slice($values, count($args) - 1);
+			$this->set($last[1], $this->reduce(array("list", " ", $rest)));
+		}
+
+		$this->env->arguments = $assignedValues;
+	}
+
+	/**
+	 * Compile a prop and update $lines or $blocks appropriately
+	 *
+	 * @param   array     $prop   Prop
+	 * @param   stdClass  $block  Block
+	 * @param   string    $out    Out
+	 *
+	 * @return  void
+	 */
+	protected function compileProp($prop, $block, $out)
+	{
+		// Set error position context
+		$this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
+
+		switch ($prop[0])
+		{
+			case 'assign':
+				list(, $name, $value) = $prop;
+
+				if ($name[0] == $this->vPrefix)
+				{
+					$this->set($name, $value);
+				}
+				else
+				{
+					$out->lines[] = $this->formatter->property($name, $this->compileValue($this->reduce($value)));
+				}
+				break;
+			case 'block':
+				list(, $child) = $prop;
+				$this->compileBlock($child);
+				break;
+			case 'mixin':
+				list(, $path, $args, $suffix) = $prop;
+
+				$args = array_map(array($this, "reduce"), (array) $args);
+				$mixins = $this->findBlocks($block, $path, $args);
+
+				if ($mixins === null)
+				{
+					// Throw error here??
+					break;
+				}
+
+				foreach ($mixins as $mixin)
+				{
+					$haveScope = false;
+
+					if (isset($mixin->parent->scope))
+					{
+						$haveScope = true;
+						$mixinParentEnv = $this->pushEnv();
+						$mixinParentEnv->storeParent = $mixin->parent->scope;
+					}
+
+					$haveArgs = false;
+
+					if (isset($mixin->args))
+					{
+						$haveArgs = true;
+						$this->pushEnv();
+						$this->zipSetArgs($mixin->args, $args);
+					}
+
+					$oldParent = $mixin->parent;
+
+					if ($mixin != $block)
+					{
+						$mixin->parent = $block;
+					}
+
+					foreach ($this->sortProps($mixin->props) as $subProp)
+					{
+						if ($suffix !== null
+							&& $subProp[0] == "assign"
+							&& is_string($subProp[1])
+							&& $subProp[1]{0} != $this->vPrefix)
+						{
+							$subProp[2] = array(
+								'list', ' ',
+								array($subProp[2], array('keyword', $suffix))
+							);
+						}
+
+						$this->compileProp($subProp, $mixin, $out);
+					}
+
+					$mixin->parent = $oldParent;
+
+					if ($haveArgs)
+					{
+						$this->popEnv();
+					}
+
+					if ($haveScope)
+					{
+						$this->popEnv();
+					}
+				}
+
+				break;
+			case 'raw':
+				$out->lines[] = $prop[1];
+				break;
+			case "directive":
+				list(, $name, $value) = $prop;
+				$out->lines[] = "@$name " . $this->compileValue($this->reduce($value)) . ';';
+				break;
+			case "comment":
+				$out->lines[] = $prop[1];
+				break;
+			case "import";
+				list(, $importPath, $importId) = $prop;
+				$importPath = $this->reduce($importPath);
+
+				if (!isset($this->env->imports))
+				{
+					$this->env->imports = array();
+				}
+
+				$result = $this->tryImport($importPath, $block, $out);
+
+				$this->env->imports[$importId] = $result === false ?
+					array(false, "@import " . $this->compileValue($importPath) . ";") :
+					$result;
+
+				break;
+			case "import_mixin":
+				list(, $importId) = $prop;
+				$import = $this->env->imports[$importId];
+
+				if ($import[0] === false)
+				{
+					$out->lines[] = $import[1];
+				}
+				else
+				{
+					list(, $bottom, $parser, $importDir) = $import;
+					$this->compileImportedProps($bottom, $block, $out, $parser, $importDir);
+				}
+
+				break;
+			default:
+				$this->throwError("unknown op: {$prop[0]}\n");
+		}
+	}
+
+	/**
+	 * Compiles a primitive value into a CSS property value.
+	 *
+	 * Values in lessphp are typed by being wrapped in arrays, their format is
+	 * typically:
+	 *
+	 *     array(type, contents [, additional_contents]*)
+	 *
+	 * The input is expected to be reduced. This function will not work on
+	 * things like expressions and variables.
+	 *
+	 * @param   array  $value  Value
+	 *
+	 * @return  void
+	 */
+	protected function compileValue($value)
+	{
+		switch ($value[0])
+		{
+			case 'list':
+				// [1] - delimiter
+				// [2] - array of values
+				return implode($value[1], array_map(array($this, 'compileValue'), $value[2]));
+			case 'raw_color':
+				if (!empty($this->formatter->compressColors))
+				{
+					return $this->compileValue($this->coerceColor($value));
+				}
+
+				return $value[1];
+			case 'keyword':
+				// [1] - the keyword
+				return $value[1];
+			case 'number':
+				// Format: [1] - the number -- [2] - the unit
+				list(, $num, $unit) = $value;
+
+				if ($this->numberPrecision !== null)
+				{
+					$num = round($num, $this->numberPrecision);
+				}
+
+				return $num . $unit;
+			case 'string':
+				// [1] - contents of string (includes quotes)
+				list(, $delim, $content) = $value;
+
+				foreach ($content as &$part)
+				{
+					if (is_array($part))
+					{
+						$part = $this->compileValue($part);
+					}
+				}
+
+				return $delim . implode($content) . $delim;
+			case 'color':
+				/**
+				 * Format:
+				 *
+				 * [1] - red component (either number or a %)
+				 * [2] - green component
+				 * [3] - blue component
+				 * [4] - optional alpha component
+				 */
+				list(, $r, $g, $b) = $value;
+				$r = round($r);
+				$g = round($g);
+				$b = round($b);
+
+				if (count($value) == 5 && $value[4] != 1)
+				{
+					// Return an rgba value
+					return 'rgba(' . $r . ',' . $g . ',' . $b . ',' . $value[4] . ')';
+				}
+
+				$h = sprintf("#%02x%02x%02x", $r, $g, $b);
+
+				if (!empty($this->formatter->compressColors))
+				{
+					// Converting hex color to short notation (e.g. #003399 to #039)
+					if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6])
+					{
+						$h = '#' . $h[1] . $h[3] . $h[5];
+					}
+				}
+
+				return $h;
+
+			case 'function':
+				list(, $name, $args) = $value;
+
+				return $name . '(' . $this->compileValue($args) . ')';
+
+			default:
+				// Assumed to be unit
+				$this->throwError("unknown value type: $value[0]");
+		}
+	}
+
+	/**
+	 * Lib is number
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_isnumber($value)
+	{
+		return $this->toBool($value[0] == "number");
+	}
+
+	/**
+	 * Lib is string
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_isstring($value)
+	{
+		return $this->toBool($value[0] == "string");
+	}
+
+	/**
+	 * Lib is color
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_iscolor($value)
+	{
+		return $this->toBool($this->coerceColor($value));
+	}
+
+	/**
+	 * Lib is keyword
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_iskeyword($value)
+	{
+		return $this->toBool($value[0] == "keyword");
+	}
+
+	/**
+	 * Lib is pixel
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_ispixel($value)
+	{
+		return $this->toBool($value[0] == "number" && $value[2] == "px");
+	}
+
+	/**
+	 * Lib is percentage
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_ispercentage($value)
+	{
+		return $this->toBool($value[0] == "number" && $value[2] == "%");
+	}
+
+	/**
+	 * Lib is em
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_isem($value)
+	{
+		return $this->toBool($value[0] == "number" && $value[2] == "em");
+	}
+
+	/**
+	 * Lib is rem
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_isrem($value)
+	{
+		return $this->toBool($value[0] == "number" && $value[2] == "rem");
+	}
+
+	/**
+	 * LIb rgba hex
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  boolean
+	 */
+	protected function lib_rgbahex($color)
+	{
+		$color = $this->coerceColor($color);
+
+		if (is_null($color))
+		{
+			$this->throwError("color expected for rgbahex");
+		}
+
+		return sprintf("#%02x%02x%02x%02x", isset($color[4]) ? $color[4] * 255 : 255, $color[1], $color[2], $color[3]);
+	}
+
+	/**
+	 * Lib argb
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_argb($color)
+	{
+		return $this->lib_rgbahex($color);
+	}
+
+	/**
+	 * Utility func to unquote a string
+	 *
+	 * @param   string  $arg  Arg
+	 *
+	 * @return  string
+	 */
+	protected function lib_e($arg)
+	{
+		switch ($arg[0])
+		{
+			case "list":
+				$items = $arg[2];
+
+				if (isset($items[0]))
+				{
+					return $this->lib_e($items[0]);
+				}
+
+				return self::$defaultValue;
+
+			case "string":
+				$arg[1] = "";
+
+				return $arg;
+
+			case "keyword":
+				return $arg;
+
+			default:
+				return array("keyword", $this->compileValue($arg));
+		}
+	}
+
+	/**
+	 * Lib sprintf
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib__sprintf($args)
+	{
+		if ($args[0] != "list")
+		{
+			return $args;
+		}
+
+		$values = $args[2];
+		$string = array_shift($values);
+		$template = $this->compileValue($this->lib_e($string));
+
+		$i = 0;
+
+		if (preg_match_all('/%[dsa]/', $template, $m))
+		{
+			foreach ($m[0] as $match)
+			{
+				$val = isset($values[$i]) ?
+					$this->reduce($values[$i]) : array('keyword', '');
+
+				// Lessjs compat, renders fully expanded color, not raw color
+				if ($color = $this->coerceColor($val))
+				{
+					$val = $color;
+				}
+
+				$i++;
+				$rep = $this->compileValue($this->lib_e($val));
+				$template = preg_replace('/' . self::preg_quote($match) . '/', $rep, $template, 1);
+			}
+		}
+
+		$d = $string[0] == "string" ? $string[1] : '"';
+
+		return array("string", $d, array($template));
+	}
+
+	/**
+	 * Lib floor
+	 *
+	 * @param   type  $arg  X
+	 *
+	 * @return  array
+	 */
+	protected function lib_floor($arg)
+	{
+		$value = $this->assertNumber($arg);
+
+		return array("number", floor($value), $arg[2]);
+	}
+
+	/**
+	 * Lib ceil
+	 *
+	 * @param   type  $arg  X
+	 *
+	 * @return  array
+	 */
+	protected function lib_ceil($arg)
+	{
+		$value = $this->assertNumber($arg);
+
+		return array("number", ceil($value), $arg[2]);
+	}
+
+	/**
+	 * Lib round
+	 *
+	 * @param   type  $arg  X
+	 *
+	 * @return  array
+	 */
+	protected function lib_round($arg)
+	{
+		$value = $this->assertNumber($arg);
+
+		return array("number", round($value), $arg[2]);
+	}
+
+	/**
+	 * Lib unit
+	 *
+	 * @param   type  $arg  X
+	 *
+	 * @return  array
+	 */
+	protected function lib_unit($arg)
+	{
+		if ($arg[0] == "list")
+		{
+			list($number, $newUnit) = $arg[2];
+			return array("number", $this->assertNumber($number), $this->compileValue($this->lib_e($newUnit)));
+		}
+		else
+		{
+			return array("number", $this->assertNumber($arg), "");
+		}
+	}
+
+	/**
+	 * Helper function to get arguments for color manipulation functions.
+	 * takes a list that contains a color like thing and a percentage
+	 *
+	 * @param   array  $args  Args
+	 *
+	 * @return  array
+	 */
+	protected function colorArgs($args)
+	{
+		if ($args[0] != 'list' || count($args[2]) < 2)
+		{
+			return array(array('color', 0, 0, 0), 0);
+		}
+
+		list($color, $delta) = $args[2];
+		$color = $this->assertColor($color);
+		$delta = floatval($delta[1]);
+
+		return array($color, $delta);
+	}
+
+	/**
+	 * Lib darken
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_darken($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] - $delta, 100);
+
+		return $this->toRGB($hsl);
+	}
+
+	/**
+	 * Lib lighten
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_lighten($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] + $delta, 100);
+
+		return $this->toRGB($hsl);
+	}
+
+	/**
+	 * Lib saturate
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_saturate($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] + $delta, 100);
+
+		return $this->toRGB($hsl);
+	}
+
+	/**
+	 * Lib desaturate
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_desaturate($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] - $delta, 100);
+
+		return $this->toRGB($hsl);
+	}
+
+	/**
+	 * Lib spin
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_spin($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+
+		$hsl[1] = $hsl[1] + $delta % 360;
+
+		if ($hsl[1] < 0)
+		{
+			$hsl[1] += 360;
+		}
+
+		return $this->toRGB($hsl);
+	}
+
+	/**
+	 * Lib fadeout
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_fadeout($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta / 100);
+
+		return $color;
+	}
+
+	/**
+	 * Lib fadein
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_fadein($args)
+	{
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta / 100);
+
+		return $color;
+	}
+
+	/**
+	 * Lib hue
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_hue($color)
+	{
+		$hsl = $this->toHSL($this->assertColor($color));
+
+		return round($hsl[1]);
+	}
+
+	/**
+	 * Lib saturation
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_saturation($color)
+	{
+		$hsl = $this->toHSL($this->assertColor($color));
+
+		return round($hsl[2]);
+	}
+
+	/**
+	 * Lib lightness
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	protected function lib_lightness($color)
+	{
+		$hsl = $this->toHSL($this->assertColor($color));
+
+		return round($hsl[3]);
+	}
+
+	/**
+	 * Get the alpha of a color
+	 * Defaults to 1 for non-colors or colors without an alpha
+	 *
+	 * @param   string  $value  Value
+	 *
+	 * @return  string
+	 */
+	protected function lib_alpha($value)
+	{
+		if (!is_null($color = $this->coerceColor($value)))
+		{
+			return isset($color[4]) ? $color[4] : 1;
+		}
+	}
+
+	/**
+	 * Set the alpha of the color
+	 *
+	 * @param   array  $args  Args
+	 *
+	 * @return  string
+	 */
+	protected function lib_fade($args)
+	{
+		list($color, $alpha) = $this->colorArgs($args);
+		$color[4] = $this->clamp($alpha / 100.0);
+
+		return $color;
+	}
+
+	/**
+	 * Third party code; your guess is as good as mine
+	 *
+	 * @param   array  $arg  Arg
+	 *
+	 * @return  string
+	 */
+	protected function lib_percentage($arg)
+	{
+		$num = $this->assertNumber($arg);
+
+		return array("number", $num * 100, "%");
+	}
+
+	/**
+	 * mixes two colors by weight
+	 * mix(@color1, @color2, @weight);
+	 * http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+	 *
+	 * @param   array  $args  Args
+	 *
+	 * @return  string
+	 */
+	protected function lib_mix($args)
+	{
+		if ($args[0] != "list" || count($args[2]) < 3)
+		{
+			$this->throwError("mix expects (color1, color2, weight)");
+		}
+
+		list($first, $second, $weight) = $args[2];
+		$first = $this->assertColor($first);
+		$second = $this->assertColor($second);
+
+		$first_a = $this->lib_alpha($first);
+		$second_a = $this->lib_alpha($second);
+		$weight = $weight[1] / 100.0;
+
+		$w = $weight * 2 - 1;
+		$a = $first_a - $second_a;
+
+		$w1 = (($w * $a == -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;
+		$w2 = 1.0 - $w1;
+
+		$new = array('color',
+			$w1 * $first[1] + $w2 * $second[1],
+			$w1 * $first[2] + $w2 * $second[2],
+			$w1 * $first[3] + $w2 * $second[3],
+		);
+
+		if ($first_a != 1.0 || $second_a != 1.0)
+		{
+			$new[] = $first_a * $weight + $second_a * ($weight - 1);
+		}
+
+		return $this->fixColor($new);
+	}
+
+	/**
+	 * Third party code; your guess is as good as mine
+	 *
+	 * @param   array  $arg  Arg
+	 *
+	 * @return  string
+	 */
+	protected function lib_contrast($args)
+	{
+		if ($args[0] != 'list' || count($args[2]) < 3)
+		{
+			return array(array('color', 0, 0, 0), 0);
+		}
+
+		list($inputColor, $darkColor, $lightColor) = $args[2];
+
+		$inputColor = $this->assertColor($inputColor);
+		$darkColor = $this->assertColor($darkColor);
+		$lightColor = $this->assertColor($lightColor);
+		$hsl = $this->toHSL($inputColor);
+
+		if ($hsl[3] > 50)
+		{
+			return $darkColor;
+		}
+
+		return $lightColor;
+	}
+
+	/**
+	 * Assert color
+	 *
+	 * @param   type  $value  X
+	 * @param   type  $error  X
+	 *
+	 * @return  type
+	 */
+	protected function assertColor($value, $error = "expected color value")
+	{
+		$color = $this->coerceColor($value);
+
+		if (is_null($color))
+		{
+			$this->throwError($error);
+		}
+
+		return $color;
+	}
+
+	/**
+	 * Assert number
+	 *
+	 * @param   type  $value  X
+	 * @param   type  $error  X
+	 *
+	 * @return  type
+	 */
+	protected function assertNumber($value, $error = "expecting number")
+	{
+		if ($value[0] == "number")
+		{
+			return $value[1];
+		}
+
+		$this->throwError($error);
+	}
+
+	/**
+	 * To HSL
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	protected function toHSL($color)
+	{
+		if ($color[0] == 'hsl')
+		{
+			return $color;
+		}
+
+		$r = $color[1] / 255;
+		$g = $color[2] / 255;
+		$b = $color[3] / 255;
+
+		$min = min($r, $g, $b);
+		$max = max($r, $g, $b);
+
+		$L = ($min + $max) / 2;
+
+		if ($min == $max)
+		{
+			$S = $H = 0;
+		}
+		else
+		{
+			if ($L < 0.5)
+			{
+				$S = ($max - $min) / ($max + $min);
+			}
+			else
+			{
+				$S = ($max - $min) / (2.0 - $max - $min);
+			}
+
+			if ($r == $max)
+			{
+				$H = ($g - $b) / ($max - $min);
+			}
+			elseif ($g == $max)
+			{
+				$H = 2.0 + ($b - $r) / ($max - $min);
+			}
+			elseif ($b == $max)
+			{
+				$H = 4.0 + ($r - $g) / ($max - $min);
+			}
+		}
+
+		$out = array('hsl',
+			($H < 0 ? $H + 6 : $H) * 60,
+			$S * 100,
+			$L * 100,
+		);
+
+		if (count($color) > 4)
+		{
+			// Copy alpha
+			$out[] = $color[4];
+		}
+
+		return $out;
+	}
+
+	/**
+	 * To RGB helper
+	 *
+	 * @param   type  $comp   X
+	 * @param   type  $temp1  X
+	 * @param   type  $temp2  X
+	 *
+	 * @return  type
+	 */
+	protected function toRGB_helper($comp, $temp1, $temp2)
+	{
+		if ($comp < 0)
+		{
+			$comp += 1.0;
+		}
+		elseif ($comp > 1)
+		{
+			$comp -= 1.0;
+		}
+
+		if (6 * $comp < 1)
+		{
+			return $temp1 + ($temp2 - $temp1) * 6 * $comp;
+		}
+
+		if (2 * $comp < 1)
+		{
+			return $temp2;
+		}
+
+		if (3 * $comp < 2)
+		{
+			return $temp1 + ($temp2 - $temp1) * ((2 / 3) - $comp) * 6;
+		}
+
+		return $temp1;
+	}
+
+	/**
+	 * Converts a hsl array into a color value in rgb.
+	 * Expects H to be in range of 0 to 360, S and L in 0 to 100
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	protected function toRGB($color)
+	{
+		if ($color == 'color')
+		{
+			return $color;
+		}
+
+		$H = $color[1] / 360;
+		$S = $color[2] / 100;
+		$L = $color[3] / 100;
+
+		if ($S == 0)
+		{
+			$r = $g = $b = $L;
+		}
+		else
+		{
+			$temp2 = $L < 0.5 ?
+				$L * (1.0 + $S) :
+				$L + $S - $L * $S;
+
+			$temp1 = 2.0 * $L - $temp2;
+
+			$r = $this->toRGB_helper($H + 1 / 3, $temp1, $temp2);
+			$g = $this->toRGB_helper($H, $temp1, $temp2);
+			$b = $this->toRGB_helper($H - 1 / 3, $temp1, $temp2);
+		}
+
+		// $out = array('color', round($r*255), round($g*255), round($b*255));
+		$out = array('color', $r * 255, $g * 255, $b * 255);
+
+		if (count($color) > 4)
+		{
+			// Copy alpha
+			$out[] = $color[4];
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Clamp
+	 *
+	 * @param   type  $v    X
+	 * @param   type  $max  X
+	 * @param   type  $min  X
+	 *
+	 * @return  type
+	 */
+	protected function clamp($v, $max = 1, $min = 0)
+	{
+		return min($max, max($min, $v));
+	}
+
+	/**
+	 * Convert the rgb, rgba, hsl color literals of function type
+	 * as returned by the parser into values of color type.
+	 *
+	 * @param   type  $func  X
+	 *
+	 * @return  type
+	 */
+	protected function funcToColor($func)
+	{
+		$fname = $func[1];
+
+		if ($func[2][0] != 'list')
+		{
+			// Need a list of arguments
+			return false;
+		}
+
+		$rawComponents = $func[2][2];
+
+		if ($fname == 'hsl' || $fname == 'hsla')
+		{
+			$hsl = array('hsl');
+			$i = 0;
+
+			foreach ($rawComponents as $c)
+			{
+				$val = $this->reduce($c);
+				$val = isset($val[1]) ? floatval($val[1]) : 0;
+
+				if ($i == 0)
+				{
+					$clamp = 360;
+				}
+				elseif ($i < 3)
+				{
+					$clamp = 100;
+				}
+				else
+				{
+					$clamp = 1;
+				}
+
+				$hsl[] = $this->clamp($val, $clamp);
+				$i++;
+			}
+
+			while (count($hsl) < 4)
+			{
+				$hsl[] = 0;
+			}
+
+			return $this->toRGB($hsl);
+		}
+		elseif ($fname == 'rgb' || $fname == 'rgba')
+		{
+			$components = array();
+			$i = 1;
+
+			foreach ($rawComponents as $c)
+			{
+				$c = $this->reduce($c);
+
+				if ($i < 4)
+				{
+					if ($c[0] == "number" && $c[2] == "%")
+					{
+						$components[] = 255 * ($c[1] / 100);
+					}
+					else
+					{
+						$components[] = floatval($c[1]);
+					}
+				}
+				elseif ($i == 4)
+				{
+					if ($c[0] == "number" && $c[2] == "%")
+					{
+						$components[] = 1.0 * ($c[1] / 100);
+					}
+					else
+					{
+						$components[] = floatval($c[1]);
+					}
+				}
+				else
+				{
+					break;
+				}
+
+				$i++;
+			}
+
+			while (count($components) < 3)
+			{
+				$components[] = 0;
+			}
+
+			array_unshift($components, 'color');
+
+			return $this->fixColor($components);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Reduce
+	 *
+	 * @param   type  $value          X
+	 * @param   type  $forExpression  X
+	 *
+	 * @return  type
+	 */
+	protected function reduce($value, $forExpression = false)
+	{
+		switch ($value[0])
+		{
+			case "interpolate":
+				$reduced = $this->reduce($value[1]);
+				$var     = $this->compileValue($reduced);
+				$res     = $this->reduce(array("variable", $this->vPrefix . $var));
+
+				if (empty($value[2]))
+				{
+					$res = $this->lib_e($res);
+				}
+
+				return $res;
+			case "variable":
+				$key = $value[1];
+				if (is_array($key))
+				{
+					$key = $this->reduce($key);
+					$key = $this->vPrefix . $this->compileValue($this->lib_e($key));
+				}
+
+				$seen = & $this->env->seenNames;
+
+				if (!empty($seen[$key]))
+				{
+					$this->throwError("infinite loop detected: $key");
+				}
+
+				$seen[$key] = true;
+				$out = $this->reduce($this->get($key, self::$defaultValue));
+				$seen[$key] = false;
+
+				return $out;
+			case "list":
+				foreach ($value[2] as &$item)
+				{
+					$item = $this->reduce($item, $forExpression);
+				}
+
+				return $value;
+			case "expression":
+				return $this->evaluate($value);
+			case "string":
+				foreach ($value[2] as &$part)
+				{
+					if (is_array($part))
+					{
+						$strip = $part[0] == "variable";
+						$part = $this->reduce($part);
+
+						if ($strip)
+						{
+							$part = $this->lib_e($part);
+						}
+					}
+				}
+
+				return $value;
+			case "escape":
+				list(, $inner) = $value;
+
+				return $this->lib_e($this->reduce($inner));
+			case "function":
+				$color = $this->funcToColor($value);
+
+				if ($color)
+				{
+					return $color;
+				}
+
+				list(, $name, $args) = $value;
+
+				if ($name == "%")
+				{
+					$name = "_sprintf";
+				}
+
+				$f = isset($this->libFunctions[$name]) ?
+					$this->libFunctions[$name] : array($this, 'lib_' . $name);
+
+				if (is_callable($f))
+				{
+					if ($args[0] == 'list')
+					{
+						$args = self::compressList($args[2], $args[1]);
+					}
+
+					$ret = call_user_func($f, $this->reduce($args, true), $this);
+
+					if (is_null($ret))
+					{
+						return array("string", "", array(
+								$name, "(", $args, ")"
+							));
+					}
+
+					// Convert to a typed value if the result is a php primitive
+					if (is_numeric($ret))
+					{
+						$ret = array('number', $ret, "");
+					}
+					elseif (!is_array($ret))
+					{
+						$ret = array('keyword', $ret);
+					}
+
+					return $ret;
+				}
+
+				// Plain function, reduce args
+				$value[2] = $this->reduce($value[2]);
+
+				return $value;
+			case "unary":
+				list(, $op, $exp) = $value;
+				$exp = $this->reduce($exp);
+
+				if ($exp[0] == "number")
+				{
+					switch ($op)
+					{
+						case "+":
+							return $exp;
+						case "-":
+							$exp[1] *= -1;
+
+							return $exp;
+					}
+				}
+
+				return array("string", "", array($op, $exp));
+		}
+
+		if ($forExpression)
+		{
+			switch ($value[0])
+			{
+				case "keyword":
+					if ($color = $this->coerceColor($value))
+					{
+						return $color;
+					}
+					break;
+				case "raw_color":
+					return $this->coerceColor($value);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Coerce a value for use in color operation
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  null
+	 */
+	protected function coerceColor($value)
+	{
+		switch ($value[0])
+		{
+			case 'color':
+				return $value;
+			case 'raw_color':
+				$c = array("color", 0, 0, 0);
+				$colorStr = substr($value[1], 1);
+				$num = hexdec($colorStr);
+				$width = strlen($colorStr) == 3 ? 16 : 256;
+
+				for ($i = 3; $i > 0; $i--)
+				{
+					// It's 3 2 1
+					$t = $num % $width;
+					$num /= $width;
+
+					$c[$i] = $t * (256 / $width) + $t * floor(16 / $width);
+				}
+
+				return $c;
+			case 'keyword':
+				$name = $value[1];
+
+				if (isset(self::$cssColors[$name]))
+				{
+					$rgba = explode(',', self::$cssColors[$name]);
+
+					if (isset($rgba[3]))
+					{
+						return array('color', $rgba[0], $rgba[1], $rgba[2], $rgba[3]);
+					}
+
+					return array('color', $rgba[0], $rgba[1], $rgba[2]);
+				}
+
+				return null;
+		}
+	}
+
+	/**
+	 * Make something string like into a string
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  null
+	 */
+	protected function coerceString($value)
+	{
+		switch ($value[0])
+		{
+			case "string":
+				return $value;
+			case "keyword":
+				return array("string", "", array($value[1]));
+		}
+
+		return null;
+	}
+
+	/**
+	 * Turn list of length 1 into value type
+	 *
+	 * @param   type  $value  X
+	 *
+	 * @return  type
+	 */
+	protected function flattenList($value)
+	{
+		if ($value[0] == "list" && count($value[2]) == 1)
+		{
+			return $this->flattenList($value[2][0]);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * To bool
+	 *
+	 * @param   type  $a  X
+	 *
+	 * @return  type
+	 */
+	protected function toBool($a)
+	{
+		if ($a)
+		{
+			return self::$TRUE;
+		}
+		else
+		{
+			return self::$FALSE;
+		}
+	}
+
+	/**
+	 * Evaluate an expression
+	 *
+	 * @param   type  $exp  X
+	 *
+	 * @return  type
+	 */
+	protected function evaluate($exp)
+	{
+		list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp;
+
+		$left = $this->reduce($left, true);
+		$right = $this->reduce($right, true);
+
+		if ($leftColor = $this->coerceColor($left))
+		{
+			$left = $leftColor;
+		}
+
+		if ($rightColor = $this->coerceColor($right))
+		{
+			$right = $rightColor;
+		}
+
+		$ltype = $left[0];
+		$rtype = $right[0];
+
+		// Operators that work on all types
+		if ($op == "and")
+		{
+			return $this->toBool($left == self::$TRUE && $right == self::$TRUE);
+		}
+
+		if ($op == "=")
+		{
+			return $this->toBool($this->eq($left, $right));
+		}
+
+		if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right)))
+		{
+			return $str;
+		}
+
+		// Type based operators
+		$fname = "op_${ltype}_${rtype}";
+
+		if (is_callable(array($this, $fname)))
+		{
+			$out = $this->$fname($op, $left, $right);
+
+			if (!is_null($out))
+			{
+				return $out;
+			}
+		}
+
+		// Make the expression look it did before being parsed
+		$paddedOp = $op;
+
+		if ($whiteBefore)
+		{
+			$paddedOp = " " . $paddedOp;
+		}
+
+		if ($whiteAfter)
+		{
+			$paddedOp .= " ";
+		}
+
+		return array("string", "", array($left, $paddedOp, $right));
+	}
+
+	/**
+	 * String concatenate
+	 *
+	 * @param   type    $left   X
+	 * @param   string  $right  X
+	 *
+	 * @return  string
+	 */
+	protected function stringConcatenate($left, $right)
+	{
+		if ($strLeft = $this->coerceString($left))
+		{
+			if ($right[0] == "string")
+			{
+				$right[1] = "";
+			}
+
+			$strLeft[2][] = $right;
+
+			return $strLeft;
+		}
+
+		if ($strRight = $this->coerceString($right))
+		{
+			array_unshift($strRight[2], $left);
+
+			return $strRight;
+		}
+	}
+
+	/**
+	 * Make sure a color's components don't go out of bounds
+	 *
+	 * @param   type  $c  X
+	 *
+	 * @return  int
+	 */
+	protected function fixColor($c)
+	{
+		foreach (range(1, 3) as $i)
+		{
+			if ($c[$i] < 0)
+			{
+				$c[$i] = 0;
+			}
+
+			if ($c[$i] > 255)
+			{
+				$c[$i] = 255;
+			}
+		}
+
+		return $c;
+	}
+
+	/**
+	 * Op number color
+	 *
+	 * @param   type  $op   X
+	 * @param   type  $lft  X
+	 * @param   type  $rgt  X
+	 *
+	 * @return  type
+	 */
+	protected function op_number_color($op, $lft, $rgt)
+	{
+		if ($op == '+' || $op == '*')
+		{
+			return $this->op_color_number($op, $rgt, $lft);
+		}
+	}
+
+	/**
+	 * Op color number
+	 *
+	 * @param   type  $op   X
+	 * @param   type  $lft  X
+	 * @param   int   $rgt  X
+	 *
+	 * @return  type
+	 */
+	protected function op_color_number($op, $lft, $rgt)
+	{
+		if ($rgt[0] == '%')
+		{
+			$rgt[1] /= 100;
+		}
+
+		return $this->op_color_color($op, $lft, array_fill(1, count($lft) - 1, $rgt[1]));
+	}
+
+	/**
+	 * Op color color
+	 *
+	 * @param   type  $op     X
+	 * @param   type  $left   X
+	 * @param   type  $right  X
+	 *
+	 * @return  type
+	 */
+	protected function op_color_color($op, $left, $right)
+	{
+		$out = array('color');
+		$max = count($left) > count($right) ? count($left) : count($right);
+
+		foreach (range(1, $max - 1) as $i)
+		{
+			$lval = isset($left[$i]) ? $left[$i] : 0;
+			$rval = isset($right[$i]) ? $right[$i] : 0;
+
+			switch ($op)
+			{
+				case '+':
+					$out[] = $lval + $rval;
+					break;
+				case '-':
+					$out[] = $lval - $rval;
+					break;
+				case '*':
+					$out[] = $lval * $rval;
+					break;
+				case '%':
+					$out[] = $lval % $rval;
+					break;
+				case '/':
+					if ($rval == 0)
+					{
+						$this->throwError("evaluate error: can't divide by zero");
+					}
+
+					$out[] = $lval / $rval;
+					break;
+				default:
+					$this->throwError('evaluate error: color op number failed on op ' . $op);
+			}
+		}
+
+		return $this->fixColor($out);
+	}
+
+	/**
+	 * Lib red
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	public function lib_red($color)
+	{
+		$color = $this->coerceColor($color);
+
+		if (is_null($color))
+		{
+			$this->throwError('color expected for red()');
+		}
+
+		return $color[1];
+	}
+
+	/**
+	 * Lib green
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	public function lib_green($color)
+	{
+		$color = $this->coerceColor($color);
+
+		if (is_null($color))
+		{
+			$this->throwError('color expected for green()');
+		}
+
+		return $color[2];
+	}
+
+	/**
+	 * Lib blue
+	 *
+	 * @param   type  $color  X
+	 *
+	 * @return  type
+	 */
+	public function lib_blue($color)
+	{
+		$color = $this->coerceColor($color);
+
+		if (is_null($color))
+		{
+			$this->throwError('color expected for blue()');
+		}
+
+		return $color[3];
+	}
+
+	/**
+	 * Operator on two numbers
+	 *
+	 * @param   type  $op     X
+	 * @param   type  $left   X
+	 * @param   type  $right  X
+	 *
+	 * @return  type
+	 */
+	protected function op_number_number($op, $left, $right)
+	{
+		$unit = empty($left[2]) ? $right[2] : $left[2];
+
+		$value = 0;
+
+		switch ($op)
+		{
+			case '+':
+				$value = $left[1] + $right[1];
+				break;
+			case '*':
+				$value = $left[1] * $right[1];
+				break;
+			case '-':
+				$value = $left[1] - $right[1];
+				break;
+			case '%':
+				$value = $left[1] % $right[1];
+				break;
+			case '/':
+				if ($right[1] == 0)
+				{
+					$this->throwError('parse error: divide by zero');
+				}
+
+				$value = $left[1] / $right[1];
+				break;
+			case '<':
+				return $this->toBool($left[1] < $right[1]);
+			case '>':
+				return $this->toBool($left[1] > $right[1]);
+			case '>=':
+				return $this->toBool($left[1] >= $right[1]);
+			case '=<':
+				return $this->toBool($left[1] <= $right[1]);
+			default:
+				$this->throwError('parse error: unknown number operator: ' . $op);
+		}
+
+		return array("number", $value, $unit);
+	}
+
+	/**
+	 * Make output block
+	 *
+	 * @param   type  $type       X
+	 * @param   type  $selectors  X
+	 *
+	 * @return  stdclass
+	 */
+	protected function makeOutputBlock($type, $selectors = null)
+	{
+		$b = new stdclass;
+		$b->lines = array();
+		$b->children = array();
+		$b->selectors = $selectors;
+		$b->type = $type;
+		$b->parent = $this->scope;
+
+		return $b;
+	}
+
+	/**
+	 * The state of execution
+	 *
+	 * @param   type  $block  X
+	 *
+	 * @return  stdclass
+	 */
+	protected function pushEnv($block = null)
+	{
+		$e = new stdclass;
+		$e->parent = $this->env;
+		$e->store = array();
+		$e->block = $block;
+
+		$this->env = $e;
+
+		return $e;
+	}
+
+	/**
+	 * Pop something off the stack
+	 *
+	 * @return  type
+	 */
+	protected function popEnv()
+	{
+		$old = $this->env;
+		$this->env = $this->env->parent;
+
+		return $old;
+	}
+
+	/**
+	 * Set something in the current env
+	 *
+	 * @param   type  $name   X
+	 * @param   type  $value  X
+	 *
+	 * @return  void
+	 */
+	protected function set($name, $value)
+	{
+		$this->env->store[$name] = $value;
+	}
+
+	/**
+	 * Get the highest occurrence entry for a name
+	 *
+	 * @param   type  $name     X
+	 * @param   type  $default  X
+	 *
+	 * @return  type
+	 */
+	protected function get($name, $default = null)
+	{
+		$current = $this->env;
+
+		$isArguments = $name == $this->vPrefix . 'arguments';
+
+		while ($current)
+		{
+			if ($isArguments && isset($current->arguments))
+			{
+				return array('list', ' ', $current->arguments);
+			}
+
+			if (isset($current->store[$name]))
+			{
+				return $current->store[$name];
+			}
+			else
+			{
+				$current = isset($current->storeParent) ?
+					$current->storeParent : $current->parent;
+			}
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Inject array of unparsed strings into environment as variables
+	 *
+	 * @param   type  $args  X
+	 *
+	 * @return  void
+	 *
+	 * @throws  Exception
+	 */
+	protected function injectVariables($args)
+	{
+		$this->pushEnv();
+		/** FOF -- BEGIN CHANGE * */
+		$parser = new FOFLessParser($this, __METHOD__);
+		/** FOF -- END CHANGE * */
+		foreach ($args as $name => $strValue)
+		{
+			if ($name{0} != '@')
+			{
+				$name = '@' . $name;
+			}
+
+			$parser->count = 0;
+			$parser->buffer = (string) $strValue;
+
+			if (!$parser->propertyValue($value))
+			{
+				throw new Exception("failed to parse passed in variable $name: $strValue");
+			}
+
+			$this->set($name, $value);
+		}
+	}
+
+	/**
+	 * Initialize any static state, can initialize parser for a file
+	 *
+	 * @param   type  $fname  X
+	 */
+	public function __construct($fname = null)
+	{
+		if ($fname !== null)
+		{
+			// Used for deprecated parse method
+			$this->_parseFile = $fname;
+		}
+	}
+
+	/**
+	 * Compile
+	 *
+	 * @param   type  $string  X
+	 * @param   type  $name    X
+	 *
+	 * @return  type
+	 */
+	public function compile($string, $name = null)
+	{
+		$locale = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, "C");
+
+		$this->parser = $this->makeParser($name);
+		$root = $this->parser->parse($string);
+
+		$this->env = null;
+		$this->scope = null;
+
+		$this->formatter = $this->newFormatter();
+
+		if (!empty($this->registeredVars))
+		{
+			$this->injectVariables($this->registeredVars);
+		}
+
+		// Used for error messages
+		$this->sourceParser = $this->parser;
+		$this->compileBlock($root);
+
+		ob_start();
+		$this->formatter->block($this->scope);
+		$out = ob_get_clean();
+		setlocale(LC_NUMERIC, $locale);
+
+		return $out;
+	}
+
+	/**
+	 * Compile file
+	 *
+	 * @param   type  $fname     X
+	 * @param   type  $outFname  X
+	 *
+	 * @return  type
+	 *
+	 * @throws  Exception
+	 */
+	public function compileFile($fname, $outFname = null)
+	{
+		if (!is_readable($fname))
+		{
+			throw new Exception('load error: failed to find ' . $fname);
+		}
+
+		$pi = pathinfo($fname);
+
+		$oldImport = $this->importDir;
+
+		$this->importDir = (array) $this->importDir;
+		$this->importDir[] = $pi['dirname'] . '/';
+
+		$this->allParsedFiles = array();
+		$this->addParsedFile($fname);
+
+		$out = $this->compile(file_get_contents($fname), $fname);
+
+		$this->importDir = $oldImport;
+
+		if ($outFname !== null)
+		{
+			/** FOF - BEGIN CHANGE * */
+			return FOFPlatform::getInstance()->getIntegrationObject('filesystem')->fileWrite($outFname, $out);
+			/** FOF - END CHANGE * */
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Compile only if changed input has changed or output doesn't exist
+	 *
+	 * @param   type  $in   X
+	 * @param   type  $out  X
+	 *
+	 * @return  boolean
+	 */
+	public function checkedCompile($in, $out)
+	{
+		if (!is_file($out) || filemtime($in) > filemtime($out))
+		{
+			$this->compileFile($in, $out);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Execute lessphp on a .less file or a lessphp cache structure
+	 *
+	 * The lessphp cache structure contains information about a specific
+	 * less file having been parsed. It can be used as a hint for future
+	 * calls to determine whether or not a rebuild is required.
+	 *
+	 * The cache structure contains two important keys that may be used
+	 * externally:
+	 *
+	 * compiled: The final compiled CSS
+	 * updated: The time (in seconds) the CSS was last compiled
+	 *
+	 * The cache structure is a plain-ol' PHP associative array and can
+	 * be serialized and unserialized without a hitch.
+	 *
+	 * @param   mixed  $in     Input
+	 * @param   bool   $force  Force rebuild?
+	 *
+	 * @return  array  lessphp cache structure
+	 */
+	public function cachedCompile($in, $force = false)
+	{
+		// Assume no root
+		$root = null;
+
+		if (is_string($in))
+		{
+			$root = $in;
+		}
+		elseif (is_array($in) and isset($in['root']))
+		{
+			if ($force or !isset($in['files']))
+			{
+				/**
+				 * If we are forcing a recompile or if for some reason the
+				 * structure does not contain any file information we should
+				 * specify the root to trigger a rebuild.
+				 */
+				$root = $in['root'];
+			}
+			elseif (isset($in['files']) and is_array($in['files']))
+			{
+				foreach ($in['files'] as $fname => $ftime)
+				{
+					if (!file_exists($fname) or filemtime($fname) > $ftime)
+					{
+						/**
+						 * One of the files we knew about previously has changed
+						 * so we should look at our incoming root again.
+						 */
+						$root = $in['root'];
+						break;
+					}
+				}
+			}
+		}
+		else
+		{
+			/**
+			 * TODO: Throw an exception? We got neither a string nor something
+			 * that looks like a compatible lessphp cache structure.
+			 */
+			return null;
+		}
+
+		if ($root !== null)
+		{
+			// If we have a root value which means we should rebuild.
+			$out = array();
+			$out['root'] = $root;
+			$out['compiled'] = $this->compileFile($root);
+			$out['files'] = $this->allParsedFiles();
+			$out['updated'] = time();
+
+			return $out;
+		}
+		else
+		{
+			// No changes, pass back the structure
+			// we were given initially.
+			return $in;
+		}
+	}
+
+	//
+	// This is deprecated
+	/**
+	 * Parse and compile buffer
+	 *
+	 * @param   null  $str               X
+	 * @param   type  $initialVariables  X
+	 *
+	 * @return  type
+	 *
+	 * @throws  Exception
+	 *
+	 * @deprecated  2.0
+	 */
+	public function parse($str = null, $initialVariables = null)
+	{
+		if (is_array($str))
+		{
+			$initialVariables = $str;
+			$str = null;
+		}
+
+		$oldVars = $this->registeredVars;
+
+		if ($initialVariables !== null)
+		{
+			$this->setVariables($initialVariables);
+		}
+
+		if ($str == null)
+		{
+			if (empty($this->_parseFile))
+			{
+				throw new exception("nothing to parse");
+			}
+
+			$out = $this->compileFile($this->_parseFile);
+		}
+		else
+		{
+			$out = $this->compile($str);
+		}
+
+		$this->registeredVars = $oldVars;
+
+		return $out;
+	}
+
+	/**
+	 * Make parser
+	 *
+	 * @param   type  $name  X
+	 *
+	 * @return  FOFLessParser
+	 */
+	protected function makeParser($name)
+	{
+		/** FOF -- BEGIN CHANGE * */
+		$parser = new FOFLessParser($this, $name);
+		/** FOF -- END CHANGE * */
+		$parser->writeComments = $this->preserveComments;
+
+		return $parser;
+	}
+
+	/**
+	 * Set Formatter
+	 *
+	 * @param   type  $name  X
+	 *
+	 * @return  void
+	 */
+	public function setFormatter($name)
+	{
+		$this->formatterName = $name;
+	}
+
+	/**
+	 * New formatter
+	 *
+	 * @return  FOFLessFormatterLessjs
+	 */
+	protected function newFormatter()
+	{
+		/** FOF -- BEGIN CHANGE * */
+		$className = "FOFLessFormatterLessjs";
+		/** FOF -- END CHANGE * */
+		if (!empty($this->formatterName))
+		{
+			if (!is_string($this->formatterName))
+				return $this->formatterName;
+			/** FOF -- BEGIN CHANGE * */
+			$className = "FOFLessFormatter" . ucfirst($this->formatterName);
+			/** FOF -- END CHANGE * */
+		}
+
+		return new $className;
+	}
+
+	/**
+	 * Set preserve comments
+	 *
+	 * @param   type  $preserve  X
+	 *
+	 * @return  void
+	 */
+	public function setPreserveComments($preserve)
+	{
+		$this->preserveComments = $preserve;
+	}
+
+	/**
+	 * Register function
+	 *
+	 * @param   type  $name  X
+	 * @param   type  $func  X
+	 *
+	 * @return  void
+	 */
+	public function registerFunction($name, $func)
+	{
+		$this->libFunctions[$name] = $func;
+	}
+
+	/**
+	 * Unregister function
+	 *
+	 * @param   type  $name  X
+	 *
+	 * @return  void
+	 */
+	public function unregisterFunction($name)
+	{
+		unset($this->libFunctions[$name]);
+	}
+
+	/**
+	 * Set variables
+	 *
+	 * @param   type  $variables  X
+	 *
+	 * @return  void
+	 */
+	public function setVariables($variables)
+	{
+		$this->registeredVars = array_merge($this->registeredVars, $variables);
+	}
+
+	/**
+	 * Unset variable
+	 *
+	 * @param   type  $name  X
+	 *
+	 * @return  void
+	 */
+	public function unsetVariable($name)
+	{
+		unset($this->registeredVars[$name]);
+	}
+
+	/**
+	 * Set import dir
+	 *
+	 * @param   type  $dirs  X
+	 *
+	 * @return  void
+	 */
+	public function setImportDir($dirs)
+	{
+		$this->importDir = (array) $dirs;
+	}
+
+	/**
+	 * Add import dir
+	 *
+	 * @param   type  $dir  X
+	 *
+	 * @return  void
+	 */
+	public function addImportDir($dir)
+	{
+		$this->importDir = (array) $this->importDir;
+		$this->importDir[] = $dir;
+	}
+
+	/**
+	 * All parsed files
+	 *
+	 * @return  type
+	 */
+	public function allParsedFiles()
+	{
+		return $this->allParsedFiles;
+	}
+
+	/**
+	 * Add parsed file
+	 *
+	 * @param   type  $file  X
+	 *
+	 * @return  void
+	 */
+	protected function addParsedFile($file)
+	{
+		$this->allParsedFiles[realpath($file)] = filemtime($file);
+	}
+
+	/**
+	 * Uses the current value of $this->count to show line and line number
+	 *
+	 * @param   type  $msg  X
+	 *
+	 * @return  void
+	 */
+	protected function throwError($msg = null)
+	{
+		if ($this->sourceLoc >= 0)
+		{
+			$this->sourceParser->throwError($msg, $this->sourceLoc);
+		}
+
+		throw new exception($msg);
+	}
+
+	/**
+	 * Compile file $in to file $out if $in is newer than $out
+	 * Returns true when it compiles, false otherwise
+	 *
+	 * @param   type  $in    X
+	 * @param   type  $out   X
+	 * @param   self  $less  X
+	 *
+	 * @return  type
+	 */
+	public static function ccompile($in, $out, $less = null)
+	{
+		if ($less === null)
+		{
+			$less = new self;
+		}
+
+		return $less->checkedCompile($in, $out);
+	}
+
+	/**
+	 * Compile execute
+	 *
+	 * @param   type  $in     X
+	 * @param   type  $force  X
+	 * @param   self  $less   X
+	 *
+	 * @return  type
+	 */
+	public static function cexecute($in, $force = false, $less = null)
+	{
+		if ($less === null)
+		{
+			$less = new self;
+		}
+
+		return $less->cachedCompile($in, $force);
+	}
+
+	protected static $cssColors = array(
+		'aliceblue'				 => '240,248,255',
+		'antiquewhite'			 => '250,235,215',
+		'aqua'					 => '0,255,255',
+		'aquamarine'			 => '127,255,212',
+		'azure'					 => '240,255,255',
+		'beige'					 => '245,245,220',
+		'bisque'				 => '255,228,196',
+		'black'					 => '0,0,0',
+		'blanchedalmond'		 => '255,235,205',
+		'blue'					 => '0,0,255',
+		'blueviolet'			 => '138,43,226',
+		'brown'					 => '165,42,42',
+		'burlywood'				 => '222,184,135',
+		'cadetblue'				 => '95,158,160',
+		'chartreuse'			 => '127,255,0',
+		'chocolate'				 => '210,105,30',
+		'coral'					 => '255,127,80',
+		'cornflowerblue'		 => '100,149,237',
+		'cornsilk'				 => '255,248,220',
+		'crimson'				 => '220,20,60',
+		'cyan'					 => '0,255,255',
+		'darkblue'				 => '0,0,139',
+		'darkcyan'				 => '0,139,139',
+		'darkgoldenrod'			 => '184,134,11',
+		'darkgray'				 => '169,169,169',
+		'darkgreen'				 => '0,100,0',
+		'darkgrey'				 => '169,169,169',
+		'darkkhaki'				 => '189,183,107',
+		'darkmagenta'			 => '139,0,139',
+		'darkolivegreen'		 => '85,107,47',
+		'darkorange'			 => '255,140,0',
+		'darkorchid'			 => '153,50,204',
+		'darkred'				 => '139,0,0',
+		'darksalmon'			 => '233,150,122',
+		'darkseagreen'			 => '143,188,143',
+		'darkslateblue'			 => '72,61,139',
+		'darkslategray'			 => '47,79,79',
+		'darkslategrey'			 => '47,79,79',
+		'darkturquoise'			 => '0,206,209',
+		'darkviolet'			 => '148,0,211',
+		'deeppink'				 => '255,20,147',
+		'deepskyblue'			 => '0,191,255',
+		'dimgray'				 => '105,105,105',
+		'dimgrey'				 => '105,105,105',
+		'dodgerblue'			 => '30,144,255',
+		'firebrick'				 => '178,34,34',
+		'floralwhite'			 => '255,250,240',
+		'forestgreen'			 => '34,139,34',
+		'fuchsia'				 => '255,0,255',
+		'gainsboro'				 => '220,220,220',
+		'ghostwhite'			 => '248,248,255',
+		'gold'					 => '255,215,0',
+		'goldenrod'				 => '218,165,32',
+		'gray'					 => '128,128,128',
+		'green'					 => '0,128,0',
+		'greenyellow'			 => '173,255,47',
+		'grey'					 => '128,128,128',
+		'honeydew'				 => '240,255,240',
+		'hotpink'				 => '255,105,180',
+		'indianred'				 => '205,92,92',
+		'indigo'				 => '75,0,130',
+		'ivory'					 => '255,255,240',
+		'khaki'					 => '240,230,140',
+		'lavender'				 => '230,230,250',
+		'lavenderblush'			 => '255,240,245',
+		'lawngreen'				 => '124,252,0',
+		'lemonchiffon'			 => '255,250,205',
+		'lightblue'				 => '173,216,230',
+		'lightcoral'			 => '240,128,128',
+		'lightcyan'				 => '224,255,255',
+		'lightgoldenrodyellow'	 => '250,250,210',
+		'lightgray'				 => '211,211,211',
+		'lightgreen'			 => '144,238,144',
+		'lightgrey'				 => '211,211,211',
+		'lightpink'				 => '255,182,193',
+		'lightsalmon'			 => '255,160,122',
+		'lightseagreen'			 => '32,178,170',
+		'lightskyblue'			 => '135,206,250',
+		'lightslategray'		 => '119,136,153',
+		'lightslategrey'		 => '119,136,153',
+		'lightsteelblue'		 => '176,196,222',
+		'lightyellow'			 => '255,255,224',
+		'lime'					 => '0,255,0',
+		'limegreen'				 => '50,205,50',
+		'linen'					 => '250,240,230',
+		'magenta'				 => '255,0,255',
+		'maroon'				 => '128,0,0',
+		'mediumaquamarine'		 => '102,205,170',
+		'mediumblue'			 => '0,0,205',
+		'mediumorchid'			 => '186,85,211',
+		'mediumpurple'			 => '147,112,219',
+		'mediumseagreen'		 => '60,179,113',
+		'mediumslateblue'		 => '123,104,238',
+		'mediumspringgreen'		 => '0,250,154',
+		'mediumturquoise'		 => '72,209,204',
+		'mediumvioletred'		 => '199,21,133',
+		'midnightblue'			 => '25,25,112',
+		'mintcream'				 => '245,255,250',
+		'mistyrose'				 => '255,228,225',
+		'moccasin'				 => '255,228,181',
+		'navajowhite'			 => '255,222,173',
+		'navy'					 => '0,0,128',
+		'oldlace'				 => '253,245,230',
+		'olive'					 => '128,128,0',
+		'olivedrab'				 => '107,142,35',
+		'orange'				 => '255,165,0',
+		'orangered'				 => '255,69,0',
+		'orchid'				 => '218,112,214',
+		'palegoldenrod'			 => '238,232,170',
+		'palegreen'				 => '152,251,152',
+		'paleturquoise'			 => '175,238,238',
+		'palevioletred'			 => '219,112,147',
+		'papayawhip'			 => '255,239,213',
+		'peachpuff'				 => '255,218,185',
+		'peru'					 => '205,133,63',
+		'pink'					 => '255,192,203',
+		'plum'					 => '221,160,221',
+		'powderblue'			 => '176,224,230',
+		'purple'				 => '128,0,128',
+		'red'					 => '255,0,0',
+		'rosybrown'				 => '188,143,143',
+		'royalblue'				 => '65,105,225',
+		'saddlebrown'			 => '139,69,19',
+		'salmon'				 => '250,128,114',
+		'sandybrown'			 => '244,164,96',
+		'seagreen'				 => '46,139,87',
+		'seashell'				 => '255,245,238',
+		'sienna'				 => '160,82,45',
+		'silver'				 => '192,192,192',
+		'skyblue'				 => '135,206,235',
+		'slateblue'				 => '106,90,205',
+		'slategray'				 => '112,128,144',
+		'slategrey'				 => '112,128,144',
+		'snow'					 => '255,250,250',
+		'springgreen'			 => '0,255,127',
+		'steelblue'				 => '70,130,180',
+		'tan'					 => '210,180,140',
+		'teal'					 => '0,128,128',
+		'thistle'				 => '216,191,216',
+		'tomato'				 => '255,99,71',
+		'transparent'			 => '0,0,0,0',
+		'turquoise'				 => '64,224,208',
+		'violet'				 => '238,130,238',
+		'wheat'					 => '245,222,179',
+		'white'					 => '255,255,255',
+		'whitesmoke'			 => '245,245,245',
+		'yellow'				 => '255,255,0',
+		'yellowgreen'			 => '154,205,50'
+	);
+}
diff --git a/core/libraries/fof/less/parser/parser.php b/core/libraries/fof/less/parser/parser.php
new file mode 100644
index 00000000..fa4021a9
--- /dev/null
+++ b/core/libraries/fof/less/parser/parser.php
@@ -0,0 +1,2235 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  less
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * This class is taken verbatim from:
+ *
+ * lessphp v0.3.9
+ * http://leafo.net/lessphp
+ *
+ * LESS css compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2012, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ *
+ * Responsible for taking a string of LESS code and converting it into a syntax tree
+ *
+ * @since  2.0
+ */
+class FOFLessParser
+{
+	// Used to uniquely identify blocks
+	protected static $nextBlockId = 0;
+
+	protected static $precedence = array(
+		'=<'					 => 0,
+		'>='					 => 0,
+		'='						 => 0,
+		'<'						 => 0,
+		'>'						 => 0,
+		'+'						 => 1,
+		'-'						 => 1,
+		'*'						 => 2,
+		'/'						 => 2,
+		'%'						 => 2,
+	);
+
+	protected static $whitePattern;
+
+	protected static $commentMulti;
+
+	protected static $commentSingle = "//";
+
+	protected static $commentMultiLeft = "/*";
+
+	protected static $commentMultiRight = "*/";
+
+	// Regex string to match any of the operators
+	protected static $operatorString;
+
+	// These properties will supress division unless it's inside parenthases
+	protected static $supressDivisionProps = array('/border-radius$/i', '/^font$/i');
+
+	protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document");
+
+	protected $lineDirectives = array("charset");
+
+	/**
+	 * if we are in parens we can be more liberal with whitespace around
+	 * operators because it must evaluate to a single value and thus is less
+	 * ambiguous.
+	 *
+	 * Consider:
+	 *     property1: 10 -5; // is two numbers, 10 and -5
+	 *     property2: (10 -5); // should evaluate to 5
+	 */
+	protected $inParens = false;
+
+	// Caches preg escaped literals
+	protected static $literalCache = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   [type]  $lessc       [description]
+	 * @param   string  $sourceName  [description]
+	 */
+	public function __construct($lessc, $sourceName = null)
+	{
+		$this->eatWhiteDefault = true;
+
+		// Reference to less needed for vPrefix, mPrefix, and parentSelector
+		$this->lessc = $lessc;
+
+		// Name used for error messages
+		$this->sourceName = $sourceName;
+
+		$this->writeComments = false;
+
+		if (!self::$operatorString)
+		{
+			self::$operatorString = '(' . implode('|', array_map(array('FOFLess', 'preg_quote'), array_keys(self::$precedence))) . ')';
+
+			$commentSingle = FOFLess::preg_quote(self::$commentSingle);
+			$commentMultiLeft = FOFLess::preg_quote(self::$commentMultiLeft);
+			$commentMultiRight = FOFLess::preg_quote(self::$commentMultiRight);
+
+			self::$commentMulti = $commentMultiLeft . '.*?' . $commentMultiRight;
+			self::$whitePattern = '/' . $commentSingle . '[^\n]*\s*|(' . self::$commentMulti . ')\s*|\s+/Ais';
+		}
+	}
+
+	/**
+	 * Parse text
+	 *
+	 * @param   string  $buffer  [description]
+	 *
+	 * @return  [type]           [description]
+	 */
+	public function parse($buffer)
+	{
+		$this->count = 0;
+		$this->line = 1;
+
+		// Block stack
+		$this->env = null;
+		$this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
+		$this->pushSpecialBlock("root");
+		$this->eatWhiteDefault = true;
+		$this->seenComments = array();
+
+		/*
+		 * trim whitespace on head
+		 * if (preg_match('/^\s+/', $this->buffer, $m)) {
+		 * 	$this->line += substr_count($m[0], "\n");
+		 * 	$this->buffer = ltrim($this->buffer);
+		 * }
+		 */
+		$this->whitespace();
+
+		// Parse the entire file
+		$lastCount = $this->count;
+		while (false !== $this->parseChunk());
+
+		if ($this->count != strlen($this->buffer))
+		{
+			$this->throwError();
+		}
+
+		// TODO report where the block was opened
+		if (!is_null($this->env->parent))
+		{
+			throw new exception('parse error: unclosed block');
+		}
+
+		return $this->env;
+	}
+
+	/**
+	 * Parse a single chunk off the head of the buffer and append it to the
+	 * current parse environment.
+	 * Returns false when the buffer is empty, or when there is an error.
+	 *
+	 * This function is called repeatedly until the entire document is
+	 * parsed.
+	 *
+	 * This parser is most similar to a recursive descent parser. Single
+	 * functions represent discrete grammatical rules for the language, and
+	 * they are able to capture the text that represents those rules.
+	 *
+	 * Consider the function lessc::keyword(). (all parse functions are
+	 * structured the same)
+	 *
+	 * The function takes a single reference argument. When calling the
+	 * function it will attempt to match a keyword on the head of the buffer.
+	 * If it is successful, it will place the keyword in the referenced
+	 * argument, advance the position in the buffer, and return true. If it
+	 * fails then it won't advance the buffer and it will return false.
+	 *
+	 * All of these parse functions are powered by lessc::match(), which behaves
+	 * the same way, but takes a literal regular expression. Sometimes it is
+	 * more convenient to use match instead of creating a new function.
+	 *
+	 * Because of the format of the functions, to parse an entire string of
+	 * grammatical rules, you can chain them together using &&.
+	 *
+	 * But, if some of the rules in the chain succeed before one fails, then
+	 * the buffer position will be left at an invalid state. In order to
+	 * avoid this, lessc::seek() is used to remember and set buffer positions.
+	 *
+	 * Before parsing a chain, use $s = $this->seek() to remember the current
+	 * position into $s. Then if a chain fails, use $this->seek($s) to
+	 * go back where we started.
+	 *
+	 * @return  boolean
+	 */
+	protected function parseChunk()
+	{
+		if (empty($this->buffer))
+		{
+			return false;
+		}
+
+		$s = $this->seek();
+
+		// Setting a property
+		if ($this->keyword($key) && $this->assign()
+			&& $this->propertyValue($value, $key) && $this->end())
+		{
+			$this->append(array('assign', $key, $value), $s);
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		// Look for special css blocks
+		if ($this->literal('@', false))
+		{
+			$this->count--;
+
+			// Media
+			if ($this->literal('@media'))
+			{
+				if (($this->mediaQueryList($mediaQueries) || true)
+					&& $this->literal('{'))
+				{
+					$media = $this->pushSpecialBlock("media");
+					$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+
+					return true;
+				}
+				else
+				{
+					$this->seek($s);
+
+					return false;
+				}
+			}
+
+			if ($this->literal("@", false) && $this->keyword($dirName))
+			{
+				if ($this->isDirective($dirName, $this->blockDirectives))
+				{
+					if (($this->openString("{", $dirValue, null, array(";")) || true)
+						&& $this->literal("{"))
+					{
+						$dir = $this->pushSpecialBlock("directive");
+						$dir->name = $dirName;
+
+						if (isset($dirValue))
+						{
+							$dir->value = $dirValue;
+						}
+
+						return true;
+					}
+				}
+				elseif ($this->isDirective($dirName, $this->lineDirectives))
+				{
+					if ($this->propertyValue($dirValue) && $this->end())
+					{
+						$this->append(array("directive", $dirName, $dirValue));
+
+						return true;
+					}
+				}
+			}
+
+			$this->seek($s);
+		}
+
+		// Setting a variable
+		if ($this->variable($var) && $this->assign()
+			&& $this->propertyValue($value) && $this->end())
+		{
+			$this->append(array('assign', $var, $value), $s);
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		if ($this->import($importValue))
+		{
+			$this->append($importValue, $s);
+
+			return true;
+		}
+
+		// Opening parametric mixin
+		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg)
+			&& ($this->guards($guards) || true)
+			&& $this->literal('{'))
+		{
+			$block = $this->pushBlock($this->fixTags(array($tag)));
+			$block->args = $args;
+			$block->isVararg = $isVararg;
+
+			if (!empty($guards))
+			{
+				$block->guards = $guards;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		// Opening a simple block
+		if ($this->tags($tags) && $this->literal('{'))
+		{
+			$tags = $this->fixTags($tags);
+			$this->pushBlock($tags);
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		// Closing a block
+		if ($this->literal('}', false))
+		{
+			try
+			{
+				$block = $this->pop();
+			}
+			catch (exception $e)
+			{
+				$this->seek($s);
+				$this->throwError($e->getMessage());
+			}
+
+			$hidden = false;
+
+			if (is_null($block->type))
+			{
+				$hidden = true;
+
+				if (!isset($block->args))
+				{
+					foreach ($block->tags as $tag)
+					{
+						if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix)
+						{
+							$hidden = false;
+							break;
+						}
+					}
+				}
+
+				foreach ($block->tags as $tag)
+				{
+					if (is_string($tag))
+					{
+						$this->env->children[$tag][] = $block;
+					}
+				}
+			}
+
+			if (!$hidden)
+			{
+				$this->append(array('block', $block), $s);
+			}
+
+			// This is done here so comments aren't bundled into he block that was just closed
+			$this->whitespace();
+
+			return true;
+		}
+
+		// Mixin
+		if ($this->mixinTags($tags)
+			&& ($this->argumentValues($argv) || true)
+			&& ($this->keyword($suffix) || true)
+			&& $this->end())
+		{
+			$tags = $this->fixTags($tags);
+			$this->append(array('mixin', $tags, $argv, $suffix), $s);
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		// Spare ;
+		if ($this->literal(';'))
+		{
+			return true;
+		}
+
+		// Got nothing, throw error
+		return false;
+	}
+
+	/**
+	 * [isDirective description]
+	 *
+	 * @param   string  $dirname     [description]
+	 * @param   [type]  $directives  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function isDirective($dirname, $directives)
+	{
+		// TODO: cache pattern in parser
+		$pattern = implode("|", array_map(array("FOFLess", "preg_quote"), $directives));
+		$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
+
+		return preg_match($pattern, $dirname);
+	}
+
+	/**
+	 * [fixTags description]
+	 *
+	 * @param   [type]  $tags  [description]
+	 *
+	 * @return  [type]         [description]
+	 */
+	protected function fixTags($tags)
+	{
+		// Move @ tags out of variable namespace
+		foreach ($tags as &$tag)
+		{
+			if ($tag{0} == $this->lessc->vPrefix)
+			{
+				$tag[0] = $this->lessc->mPrefix;
+			}
+		}
+
+		return $tags;
+	}
+
+	/**
+	 * a list of expressions
+	 *
+	 * @param   [type]  &$exps  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function expressionList(&$exps)
+	{
+		$values = array();
+
+		while ($this->expression($exp))
+		{
+			$values[] = $exp;
+		}
+
+		if (count($values) == 0)
+		{
+			return false;
+		}
+
+		$exps = FOFLess::compressList($values, ' ');
+
+		return true;
+	}
+
+	/**
+	 * Attempt to consume an expression.
+	 *
+	 * @param   string  &$out  [description]
+	 *
+	 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+	 *
+	 * @return  boolean
+	 */
+	protected function expression(&$out)
+	{
+		if ($this->value($lhs))
+		{
+			$out = $this->expHelper($lhs, 0);
+
+			// Look for / shorthand
+			if (!empty($this->env->supressedDivision))
+			{
+				unset($this->env->supressedDivision);
+				$s = $this->seek();
+
+				if ($this->literal("/") && $this->value($rhs))
+				{
+					$out = array("list", "",
+						array($out, array("keyword", "/"), $rhs));
+				}
+				else
+				{
+					$this->seek($s);
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Recursively parse infix equation with $lhs at precedence $minP
+	 *
+	 * @param   type  $lhs   [description]
+	 * @param   type  $minP  [description]
+	 *
+	 * @return   string
+	 */
+	protected function expHelper($lhs, $minP)
+	{
+		$this->inExp = true;
+		$ss = $this->seek();
+
+		while (true)
+		{
+			$whiteBefore = isset($this->buffer[$this->count - 1]) && ctype_space($this->buffer[$this->count - 1]);
+
+			// If there is whitespace before the operator, then we require
+			// whitespace after the operator for it to be an expression
+			$needWhite = $whiteBefore && !$this->inParens;
+
+			if ($this->match(self::$operatorString . ($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP)
+			{
+				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision))
+				{
+					foreach (self::$supressDivisionProps as $pattern)
+					{
+						if (preg_match($pattern, $this->env->currentProperty))
+						{
+							$this->env->supressedDivision = true;
+							break 2;
+						}
+					}
+				}
+
+				$whiteAfter = isset($this->buffer[$this->count - 1]) && ctype_space($this->buffer[$this->count - 1]);
+
+				if (!$this->value($rhs))
+				{
+					break;
+				}
+
+				// Peek for next operator to see what to do with rhs
+				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]])
+				{
+					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+				}
+
+				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+				$ss = $this->seek();
+
+				continue;
+			}
+
+			break;
+		}
+
+		$this->seek($ss);
+
+		return $lhs;
+	}
+
+	/**
+	 * Consume a list of values for a property
+	 *
+	 * @param   [type]  &$value   [description]
+	 * @param   [type]  $keyName  [description]
+	 *
+	 * @return  boolean
+	 */
+	public function propertyValue(&$value, $keyName = null)
+	{
+		$values = array();
+
+		if ($keyName !== null)
+		{
+			$this->env->currentProperty = $keyName;
+		}
+
+		$s = null;
+
+		while ($this->expressionList($v))
+		{
+			$values[] = $v;
+			$s = $this->seek();
+
+			if (!$this->literal(','))
+			{
+				break;
+			}
+		}
+
+		if ($s)
+		{
+			$this->seek($s);
+		}
+
+		if ($keyName !== null)
+		{
+			unset($this->env->currentProperty);
+		}
+
+		if (count($values) == 0)
+		{
+			return false;
+		}
+
+		$value = FOFLess::compressList($values, ', ');
+
+		return true;
+	}
+
+	/**
+	 * [parenValue description]
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function parenValue(&$out)
+	{
+		$s = $this->seek();
+
+		// Speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(")
+		{
+			return false;
+		}
+
+		$inParens = $this->inParens;
+
+		if ($this->literal("(") && ($this->inParens = true) && $this->expression($exp) && $this->literal(")"))
+		{
+			$out = $exp;
+			$this->inParens = $inParens;
+
+			return true;
+		}
+		else
+		{
+			$this->inParens = $inParens;
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+	/**
+	 * a single value
+	 *
+	 * @param   [type]  &$value  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function value(&$value)
+	{
+		$s = $this->seek();
+
+		// Speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-")
+		{
+			// Negation
+			if ($this->literal("-", false) &&(($this->variable($inner) && $inner = array("variable", $inner))
+				|| $this->unit($inner) || $this->parenValue($inner)))
+			{
+				$value = array("unary", "-", $inner);
+
+				return true;
+			}
+			else
+			{
+				$this->seek($s);
+			}
+		}
+
+		if ($this->parenValue($value))
+		{
+			return true;
+		}
+
+		if ($this->unit($value))
+		{
+			return true;
+		}
+
+		if ($this->color($value))
+		{
+			return true;
+		}
+
+		if ($this->func($value))
+		{
+			return true;
+		}
+
+		if ($this->string($value))
+		{
+			return true;
+		}
+
+		if ($this->keyword($word))
+		{
+			$value = array('keyword', $word);
+
+			return true;
+		}
+
+		// Try a variable
+		if ($this->variable($var))
+		{
+			$value = array('variable', $var);
+
+			return true;
+		}
+
+		// Unquote string (should this work on any type?
+		if ($this->literal("~") && $this->string($str))
+		{
+			$value = array("escape", $str);
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		// Css hack: \0
+		if ($this->literal('\\') && $this->match('([0-9]+)', $m))
+		{
+			$value = array('keyword', '\\' . $m[1]);
+
+			return true;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+	/**
+	 * an import statement
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function import(&$out)
+	{
+		$s = $this->seek();
+
+		if (!$this->literal('@import'))
+		{
+			return false;
+		}
+
+		/*
+		 * @import "something.css" media;
+		 * @import url("something.css") media;
+		 * @import url(something.css) media;
+		 */
+
+		if ($this->propertyValue($value))
+		{
+			$out = array("import", $value);
+
+			return true;
+		}
+	}
+
+	/**
+	 * [mediaQueryList description]
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function mediaQueryList(&$out)
+	{
+		if ($this->genericList($list, "mediaQuery", ",", false))
+		{
+			$out = $list[2];
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * [mediaQuery description]
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  [type]        [description]
+	 */
+	protected function mediaQuery(&$out)
+	{
+		$s = $this->seek();
+
+		$expressions = null;
+		$parts = array();
+
+		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType))
+		{
+			$prop = array("mediaType");
+
+			if (isset($only))
+			{
+				$prop[] = "only";
+			}
+
+			if (isset($not))
+			{
+				$prop[] = "not";
+			}
+
+			$prop[] = $mediaType;
+			$parts[] = $prop;
+		}
+		else
+		{
+			$this->seek($s);
+		}
+
+		if (!empty($mediaType) && !$this->literal("and"))
+		{
+			// ~
+		}
+		else
+		{
+			$this->genericList($expressions, "mediaExpression", "and", false);
+
+			if (is_array($expressions))
+			{
+				$parts = array_merge($parts, $expressions[2]);
+			}
+		}
+
+		if (count($parts) == 0)
+		{
+			$this->seek($s);
+
+			return false;
+		}
+
+		$out = $parts;
+
+		return true;
+	}
+
+	/**
+	 * [mediaExpression description]
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function mediaExpression(&$out)
+	{
+		$s = $this->seek();
+		$value = null;
+
+		if ($this->literal("(") && $this->keyword($feature) && ($this->literal(":")
+			&& $this->expression($value) || true) && $this->literal(")"))
+		{
+			$out = array("mediaExp", $feature);
+
+			if ($value)
+			{
+				$out[] = $value;
+			}
+
+			return true;
+		}
+		elseif ($this->variable($variable))
+		{
+			$out = array('variable', $variable);
+
+			return true;
+		}
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * An unbounded string stopped by $end
+	 *
+	 * @param   [type]  $end          [description]
+	 * @param   [type]  &$out         [description]
+	 * @param   [type]  $nestingOpen  [description]
+	 * @param   [type]  $rejectStrs   [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)
+	{
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		$stop = array("'", '"', "@{", $end);
+		$stop = array_map(array("FOFLess", "preg_quote"), $stop);
+
+		// $stop[] = self::$commentMulti;
+
+		if (!is_null($rejectStrs))
+		{
+			$stop = array_merge($stop, $rejectStrs);
+		}
+
+		$patt = '(.*?)(' . implode("|", $stop) . ')';
+
+		$nestingLevel = 0;
+
+		$content = array();
+
+		while ($this->match($patt, $m, false))
+		{
+			if (!empty($m[1]))
+			{
+				$content[] = $m[1];
+
+				if ($nestingOpen)
+				{
+					$nestingLevel += substr_count($m[1], $nestingOpen);
+				}
+			}
+
+			$tok = $m[2];
+
+			$this->count -= strlen($tok);
+
+			if ($tok == $end)
+			{
+				if ($nestingLevel == 0)
+				{
+					break;
+				}
+				else
+				{
+					$nestingLevel--;
+				}
+			}
+
+			if (($tok == "'" || $tok == '"') && $this->string($str))
+			{
+				$content[] = $str;
+				continue;
+			}
+
+			if ($tok == "@{" && $this->interpolation($inter))
+			{
+				$content[] = $inter;
+				continue;
+			}
+
+			if (in_array($tok, $rejectStrs))
+			{
+				$count = null;
+				break;
+			}
+
+			$content[] = $tok;
+			$this->count += strlen($tok);
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if (count($content) == 0)
+			return false;
+
+		// Trim the end
+		if (is_string(end($content)))
+		{
+			$content[count($content) - 1] = rtrim(end($content));
+		}
+
+		$out = array("string", "", $content);
+
+		return true;
+	}
+
+	/**
+	 * [string description]
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function string(&$out)
+	{
+		$s = $this->seek();
+
+		if ($this->literal('"', false))
+		{
+			$delim = '"';
+		}
+		elseif ($this->literal("'", false))
+		{
+			$delim = "'";
+		}
+		else
+		{
+			return false;
+		}
+
+		$content = array();
+
+		// Look for either ending delim , escape, or string interpolation
+		$patt = '([^\n]*?)(@\{|\\\\|' . FOFLess::preg_quote($delim) . ')';
+
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		while ($this->match($patt, $m, false))
+		{
+			$content[] = $m[1];
+
+			if ($m[2] == "@{")
+			{
+				$this->count -= strlen($m[2]);
+
+				if ($this->interpolation($inter, false))
+				{
+					$content[] = $inter;
+				}
+				else
+				{
+					$this->count += strlen($m[2]);
+
+					// Ignore it
+					$content[] = "@{";
+				}
+			}
+			elseif ($m[2] == '\\')
+			{
+				$content[] = $m[2];
+
+				if ($this->literal($delim, false))
+				{
+					$content[] = $delim;
+				}
+			}
+			else
+			{
+				$this->count -= strlen($delim);
+
+				// Delim
+				break;
+			}
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if ($this->literal($delim))
+		{
+			$out = array("string", $delim, $content);
+
+			return true;
+		}
+
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * [interpolation description]
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function interpolation(&$out)
+	{
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = true;
+
+		$s = $this->seek();
+
+		if ($this->literal("@{") && $this->openString("}", $interp, null, array("'", '"', ";")) && $this->literal("}", false))
+		{
+			$out = array("interpolate", $interp);
+			$this->eatWhiteDefault = $oldWhite;
+
+			if ($this->eatWhiteDefault)
+			{
+				$this->whitespace();
+			}
+
+			return true;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * [unit description]
+	 *
+	 * @param   [type]  &$unit  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function unit(&$unit)
+	{
+		// Speed shortcut
+		if (isset($this->buffer[$this->count]))
+		{
+			$char = $this->buffer[$this->count];
+
+			if (!ctype_digit($char) && $char != ".")
+			{
+				return false;
+			}
+		}
+
+		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m))
+		{
+			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * a # color
+	 *
+	 * @param   [type]  &$out  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function color(&$out)
+	{
+		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m))
+		{
+			if (strlen($m[1]) > 7)
+			{
+				$out = array("string", "", array($m[1]));
+			}
+			else
+			{
+				$out = array("raw_color", $m[1]);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Consume a list of property values delimited by ; and wrapped in ()
+	 *
+	 * @param   [type]  &$args  [description]
+	 * @param   [type]  $delim  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function argumentValues(&$args, $delim = ',')
+	{
+		$s = $this->seek();
+
+		if (!$this->literal('('))
+		{
+			return false;
+		}
+
+		$values = array();
+
+		while (true)
+		{
+			if ($this->expressionList($value))
+			{
+				$values[] = $value;
+			}
+
+			if (!$this->literal($delim))
+			{
+				break;
+			}
+			else
+			{
+				if ($value == null)
+				{
+					$values[] = null;
+				}
+
+				$value = null;
+			}
+		}
+
+		if (!$this->literal(')'))
+		{
+			$this->seek($s);
+
+			return false;
+		}
+
+		$args = $values;
+
+		return true;
+	}
+
+	/**
+	 * Consume an argument definition list surrounded by ()
+	 * each argument is a variable name with optional value
+	 * or at the end a ... or a variable named followed by ...
+	 *
+	 * @param   [type]  &$args      [description]
+	 * @param   [type]  &$isVararg  [description]
+	 * @param   [type]  $delim      [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function argumentDef(&$args, &$isVararg, $delim = ',')
+	{
+		$s = $this->seek();
+		if (!$this->literal('('))
+			return false;
+
+		$values = array();
+
+		$isVararg = false;
+
+		while (true)
+		{
+			if ($this->literal("..."))
+			{
+				$isVararg = true;
+				break;
+			}
+
+			if ($this->variable($vname))
+			{
+				$arg = array("arg", $vname);
+				$ss = $this->seek();
+
+				if ($this->assign() && $this->expressionList($value))
+				{
+					$arg[] = $value;
+				}
+				else
+				{
+					$this->seek($ss);
+
+					if ($this->literal("..."))
+					{
+						$arg[0] = "rest";
+						$isVararg = true;
+					}
+				}
+
+				$values[] = $arg;
+
+				if ($isVararg)
+				{
+					break;
+				}
+
+				continue;
+			}
+
+			if ($this->value($literal))
+			{
+				$values[] = array("lit", $literal);
+			}
+
+			if (!$this->literal($delim))
+			{
+				break;
+			}
+		}
+
+		if (!$this->literal(')'))
+		{
+			$this->seek($s);
+
+			return false;
+		}
+
+		$args = $values;
+
+		return true;
+	}
+
+	/**
+	 * Consume a list of tags
+	 * This accepts a hanging delimiter
+	 *
+	 * @param   [type]  &$tags   [description]
+	 * @param   [type]  $simple  [description]
+	 * @param   [type]  $delim   [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function tags(&$tags, $simple = false, $delim = ',')
+	{
+		$tags = array();
+
+		while ($this->tag($tt, $simple))
+		{
+			$tags[] = $tt;
+
+			if (!$this->literal($delim))
+			{
+				break;
+			}
+		}
+
+		if (count($tags) == 0)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * List of tags of specifying mixin path
+	 * Optionally separated by > (lazy, accepts extra >)
+	 *
+	 * @param   [type]  &$tags  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function mixinTags(&$tags)
+	{
+		$s = $this->seek();
+		$tags = array();
+
+		while ($this->tag($tt, true))
+		{
+			$tags[] = $tt;
+			$this->literal(">");
+		}
+
+		if (count($tags) == 0)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * A bracketed value (contained within in a tag definition)
+	 *
+	 * @param   [type]  &$value  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function tagBracket(&$value)
+	{
+		// Speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[")
+		{
+			return false;
+		}
+
+		$s = $this->seek();
+
+		if ($this->literal('[') && $this->to(']', $c, true) && $this->literal(']', false))
+		{
+			$value = '[' . $c . ']';
+
+			// Whitespace?
+			if ($this->whitespace())
+			{
+				$value .= " ";
+			}
+
+			// Escape parent selector, (yuck)
+			$value = str_replace($this->lessc->parentSelector, "$&$", $value);
+
+			return true;
+		}
+
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * [tagExpression description]
+	 *
+	 * @param   [type]  &$value  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function tagExpression(&$value)
+	{
+		$s = $this->seek();
+
+		if ($this->literal("(") && $this->expression($exp) && $this->literal(")"))
+		{
+			$value = array('exp', $exp);
+
+			return true;
+		}
+
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * A single tag
+	 *
+	 * @param   [type]   &$tag    [description]
+	 * @param   boolean  $simple  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function tag(&$tag, $simple = false)
+	{
+		if ($simple)
+		{
+			$chars = '^@,:;{}\][>\(\) "\'';
+		}
+		else
+		{
+			$chars = '^@,;{}["\'';
+		}
+
+		$s = $this->seek();
+
+		if (!$simple && $this->tagExpression($tag))
+		{
+			return true;
+		}
+
+		$hasExpression = false;
+		$parts         = array();
+
+		while ($this->tagBracket($first))
+		{
+			$parts[] = $first;
+		}
+
+		$oldWhite = $this->eatWhiteDefault;
+
+		$this->eatWhiteDefault = false;
+
+		while (true)
+		{
+			if ($this->match('([' . $chars . '0-9][' . $chars . ']*)', $m))
+			{
+				$parts[] = $m[1];
+
+				if ($simple)
+				{
+					break;
+				}
+
+				while ($this->tagBracket($brack))
+				{
+					$parts[] = $brack;
+				}
+
+				continue;
+			}
+
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@")
+			{
+				if ($this->interpolation($interp))
+				{
+					$hasExpression = true;
+
+					// Don't unescape
+					$interp[2] = true;
+					$parts[] = $interp;
+
+					continue;
+				}
+
+				if ($this->literal("@"))
+				{
+					$parts[] = "@";
+
+					continue;
+				}
+			}
+
+			// For keyframes
+			if ($this->unit($unit))
+			{
+				$parts[] = $unit[1];
+				$parts[] = $unit[2];
+				continue;
+			}
+
+			break;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if (!$parts)
+		{
+			$this->seek($s);
+
+			return false;
+		}
+
+		if ($hasExpression)
+		{
+			$tag = array("exp", array("string", "", $parts));
+		}
+		else
+		{
+			$tag = trim(implode($parts));
+		}
+
+		$this->whitespace();
+
+		return true;
+	}
+
+	/**
+	 * A css function
+	 *
+	 * @param   [type]  &$func  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function func(&$func)
+	{
+		$s = $this->seek();
+
+		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('('))
+		{
+			$fname = $m[1];
+
+			$sPreArgs = $this->seek();
+
+			$args = array();
+
+			while (true)
+			{
+				$ss = $this->seek();
+
+				// This ugly nonsense is for ie filter properties
+				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value))
+				{
+					$args[] = array("string", "", array($name, "=", $value));
+				}
+				else
+				{
+					$this->seek($ss);
+
+					if ($this->expressionList($value))
+					{
+						$args[] = $value;
+					}
+				}
+
+				if (!$this->literal(','))
+				{
+					break;
+				}
+			}
+
+			$args = array('list', ',', $args);
+
+			if ($this->literal(')'))
+			{
+				$func = array('function', $fname, $args);
+
+				return true;
+			}
+			elseif ($fname == 'url')
+			{
+				// Couldn't parse and in url? treat as string
+				$this->seek($sPreArgs);
+
+				if ($this->openString(")", $string) && $this->literal(")"))
+				{
+					$func = array('function', $fname, $string);
+
+					return true;
+				}
+			}
+		}
+
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * Consume a less variable
+	 *
+	 * @param   [type]  &$name  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function variable(&$name)
+	{
+		$s = $this->seek();
+
+		if ($this->literal($this->lessc->vPrefix, false) &&	($this->variable($sub) || $this->keyword($name)))
+		{
+			if (!empty($sub))
+			{
+				$name = array('variable', $sub);
+			}
+			else
+			{
+				$name = $this->lessc->vPrefix . $name;
+			}
+
+			return true;
+		}
+
+		$name = null;
+		$this->seek($s);
+
+		return false;
+	}
+
+	/**
+	 * Consume an assignment operator
+	 * Can optionally take a name that will be set to the current property name
+	 *
+	 * @param   string  $name  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function assign($name = null)
+	{
+		if ($name)
+		{
+			$this->currentProperty = $name;
+		}
+
+		return $this->literal(':') || $this->literal('=');
+	}
+
+	/**
+	 * Consume a keyword
+	 *
+	 * @param   [type]  &$word  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function keyword(&$word)
+	{
+		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m))
+		{
+			$word = $m[1];
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Consume an end of statement delimiter
+	 *
+	 * @return  boolean
+	 */
+	protected function end()
+	{
+		if ($this->literal(';'))
+		{
+			return true;
+		}
+		elseif ($this->count == strlen($this->buffer) || $this->buffer{$this->count} == '}')
+		{
+			// If there is end of file or a closing block next then we don't need a ;
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * [guards description]
+	 *
+	 * @param   [type]  &$guards  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function guards(&$guards)
+	{
+		$s = $this->seek();
+
+		if (!$this->literal("when"))
+		{
+			$this->seek($s);
+
+			return false;
+		}
+
+		$guards = array();
+
+		while ($this->guardGroup($g))
+		{
+			$guards[] = $g;
+
+			if (!$this->literal(","))
+			{
+				break;
+			}
+		}
+
+		if (count($guards) == 0)
+		{
+			$guards = null;
+			$this->seek($s);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * A bunch of guards that are and'd together
+	 *
+	 * @param   [type]  &$guardGroup  [description]
+	 *
+	 * @todo rename to guardGroup
+	 *
+	 * @return  boolean
+	 */
+	protected function guardGroup(&$guardGroup)
+	{
+		$s = $this->seek();
+		$guardGroup = array();
+
+		while ($this->guard($guard))
+		{
+			$guardGroup[] = $guard;
+
+			if (!$this->literal("and"))
+			{
+				break;
+			}
+		}
+
+		if (count($guardGroup) == 0)
+		{
+			$guardGroup = null;
+			$this->seek($s);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * [guard description]
+	 *
+	 * @param   [type]  &$guard  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function guard(&$guard)
+	{
+		$s = $this->seek();
+		$negate = $this->literal("not");
+
+		if ($this->literal("(") && $this->expression($exp) && $this->literal(")"))
+		{
+			$guard = $exp;
+
+			if ($negate)
+			{
+				$guard = array("negate", $guard);
+			}
+
+			return true;
+		}
+
+		$this->seek($s);
+
+		return false;
+	}
+
+	/* raw parsing functions */
+
+	/**
+	 * [literal description]
+	 *
+	 * @param   [type]  $what           [description]
+	 * @param   [type]  $eatWhitespace  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function literal($what, $eatWhitespace = null)
+	{
+		if ($eatWhitespace === null)
+		{
+			$eatWhitespace = $this->eatWhiteDefault;
+		}
+
+		// Shortcut on single letter
+		if (!isset($what[1]) && isset($this->buffer[$this->count]))
+		{
+			if ($this->buffer[$this->count] == $what)
+			{
+				if (!$eatWhitespace)
+				{
+					$this->count++;
+
+					return true;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		if (!isset(self::$literalCache[$what]))
+		{
+			self::$literalCache[$what] = FOFLess::preg_quote($what);
+		}
+
+		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+	}
+
+	/**
+	 * [genericList description]
+	 *
+	 * @param   [type]   &$out       [description]
+	 * @param   [type]   $parseItem  [description]
+	 * @param   string   $delim      [description]
+	 * @param   boolean  $flatten    [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
+	{
+		$s = $this->seek();
+		$items = array();
+
+		while ($this->$parseItem($value))
+		{
+			$items[] = $value;
+
+			if ($delim)
+			{
+				if (!$this->literal($delim))
+				{
+					break;
+				}
+			}
+		}
+
+		if (count($items) == 0)
+		{
+			$this->seek($s);
+
+			return false;
+		}
+
+		if ($flatten && count($items) == 1)
+		{
+			$out = $items[0];
+		}
+		else
+		{
+			$out = array("list", $delim, $items);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Advance counter to next occurrence of $what
+	 * $until - don't include $what in advance
+	 * $allowNewline, if string, will be used as valid char set
+	 *
+	 * @param   [type]   $what          [description]
+	 * @param   [type]   &$out          [description]
+	 * @param   boolean  $until         [description]
+	 * @param   boolean  $allowNewline  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function to($what, &$out, $until = false, $allowNewline = false)
+	{
+		if (is_string($allowNewline))
+		{
+			$validChars = $allowNewline;
+		}
+		else
+		{
+			$validChars = $allowNewline ? "." : "[^\n]";
+		}
+
+		if (!$this->match('(' . $validChars . '*?)' . FOFLess::preg_quote($what), $m, !$until))
+		{
+			return false;
+		}
+
+		if ($until)
+		{
+			// Give back $what
+			$this->count -= strlen($what);
+		}
+
+		$out = $m[1];
+
+		return true;
+	}
+
+	/**
+	 * Try to match something on head of buffer
+	 *
+	 * @param   [type]  $regex          [description]
+	 * @param   [type]  &$out           [description]
+	 * @param   [type]  $eatWhitespace  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function match($regex, &$out, $eatWhitespace = null)
+	{
+		if ($eatWhitespace === null)
+		{
+			$eatWhitespace = $this->eatWhiteDefault;
+		}
+
+		$r = '/' . $regex . ($eatWhitespace && !$this->writeComments ? '\s*' : '') . '/Ais';
+
+		if (preg_match($r, $this->buffer, $out, null, $this->count))
+		{
+			$this->count += strlen($out[0]);
+
+			if ($eatWhitespace && $this->writeComments)
+			{
+				$this->whitespace();
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Watch some whitespace
+	 *
+	 * @return  boolean
+	 */
+	protected function whitespace()
+	{
+		if ($this->writeComments)
+		{
+			$gotWhite = false;
+
+			while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count))
+			{
+				if (isset($m[1]) && empty($this->commentsSeen[$this->count]))
+				{
+					$this->append(array("comment", $m[1]));
+					$this->commentsSeen[$this->count] = true;
+				}
+
+				$this->count += strlen($m[0]);
+				$gotWhite = true;
+			}
+
+			return $gotWhite;
+		}
+		else
+		{
+			$this->match("", $m);
+
+			return strlen($m[0]) > 0;
+		}
+	}
+
+	/**
+	 * Match something without consuming it
+	 *
+	 * @param   [type]  $regex  [description]
+	 * @param   [type]  &$out   [description]
+	 * @param   [type]  $from   [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function peek($regex, &$out = null, $from = null)
+	{
+		if (is_null($from))
+		{
+			$from = $this->count;
+		}
+
+		$r = '/' . $regex . '/Ais';
+		$result = preg_match($r, $this->buffer, $out, null, $from);
+
+		return $result;
+	}
+
+	/**
+	 * Seek to a spot in the buffer or return where we are on no argument
+	 *
+	 * @param   [type]  $where  [description]
+	 *
+	 * @return  boolean
+	 */
+	protected function seek($where = null)
+	{
+		if ($where === null)
+		{
+			return $this->count;
+		}
+		else
+		{
+			$this->count = $where;
+		}
+
+		return true;
+	}
+
+	/* misc functions */
+
+	/**
+	 * [throwError description]
+	 *
+	 * @param   string  $msg    [description]
+	 * @param   [type]  $count  [description]
+	 *
+	 * @return  void
+	 */
+	public function throwError($msg = "parse error", $count = null)
+	{
+		$count = is_null($count) ? $this->count : $count;
+
+		$line = $this->line + substr_count(substr($this->buffer, 0, $count), "\n");
+
+		if (!empty($this->sourceName))
+		{
+			$loc = "$this->sourceName on line $line";
+		}
+		else
+		{
+			$loc = "line: $line";
+		}
+
+		// TODO this depends on $this->count
+		if ($this->peek("(.*?)(\n|$)", $m, $count))
+		{
+			throw new exception("$msg: failed at `$m[1]` $loc");
+		}
+		else
+		{
+			throw new exception("$msg: $loc");
+		}
+	}
+
+	/**
+	 * [pushBlock description]
+	 *
+	 * @param   [type]  $selectors  [description]
+	 * @param   [type]  $type       [description]
+	 *
+	 * @return  stdClass
+	 */
+	protected function pushBlock($selectors = null, $type = null)
+	{
+		$b = new stdclass;
+		$b->parent = $this->env;
+
+		$b->type = $type;
+		$b->id = self::$nextBlockId++;
+
+		// TODO: kill me from here
+		$b->isVararg = false;
+		$b->tags = $selectors;
+
+		$b->props = array();
+		$b->children = array();
+
+		$this->env = $b;
+
+		return $b;
+	}
+
+	/**
+	 * Push a block that doesn't multiply tags
+	 *
+	 * @param   [type]  $type  [description]
+	 *
+	 * @return  stdClass
+	 */
+	protected function pushSpecialBlock($type)
+	{
+		return $this->pushBlock(null, $type);
+	}
+
+	/**
+	 * Append a property to the current block
+	 *
+	 * @param   [type]  $prop  [description]
+	 * @param   [type]  $pos   [description]
+	 *
+	 * @return  void
+	 */
+	protected function append($prop, $pos = null)
+	{
+		if ($pos !== null)
+		{
+			$prop[-1] = $pos;
+		}
+
+		$this->env->props[] = $prop;
+	}
+
+	/**
+	 * Pop something off the stack
+	 *
+	 * @return  [type]  [description]
+	 */
+	protected function pop()
+	{
+		$old = $this->env;
+		$this->env = $this->env->parent;
+
+		return $old;
+	}
+
+	/**
+	 * Remove comments from $text
+	 *
+	 * @param   [type]  $text  [description]
+	 *
+	 * @todo: make it work for all functions, not just url
+	 *
+	 * @return  [type]         [description]
+	 */
+	protected function removeComments($text)
+	{
+		$look = array(
+			'url(', '//', '/*', '"', "'"
+		);
+
+		$out = '';
+		$min = null;
+
+		while (true)
+		{
+			// Find the next item
+			foreach ($look as $token)
+			{
+				$pos = strpos($text, $token);
+
+				if ($pos !== false)
+				{
+					if (!isset($min) || $pos < $min[1])
+					{
+						$min = array($token, $pos);
+					}
+				}
+			}
+
+			if (is_null($min))
+				break;
+
+			$count = $min[1];
+			$skip = 0;
+			$newlines = 0;
+
+			switch ($min[0])
+			{
+				case 'url(':
+
+					if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
+					{
+						$count += strlen($m[0]) - strlen($min[0]);
+					}
+
+					break;
+				case '"':
+				case "'":
+
+					if (preg_match('/' . $min[0] . '.*?' . $min[0] . '/', $text, $m, 0, $count))
+					{
+						$count += strlen($m[0]) - 1;
+					}
+
+					break;
+				case '//':
+					$skip = strpos($text, "\n", $count);
+
+					if ($skip === false)
+					{
+						$skip = strlen($text) - $count;
+					}
+					else
+					{
+						$skip -= $count;
+					}
+
+					break;
+				case '/*':
+
+					if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count))
+					{
+						$skip = strlen($m[0]);
+						$newlines = substr_count($m[0], "\n");
+					}
+
+					break;
+			}
+
+			if ($skip == 0)
+			{
+				$count += strlen($min[0]);
+			}
+
+			$out .= substr($text, 0, $count) . str_repeat("\n", $newlines);
+			$text = substr($text, $count + $skip);
+
+			$min = null;
+		}
+
+		return $out . $text;
+	}
+}
diff --git a/core/libraries/fof/model/behavior.php b/core/libraries/fof/model/behavior.php
new file mode 100644
index 00000000..7086d1c4
--- /dev/null
+++ b/core/libraries/fof/model/behavior.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class. It defines the events which are
+ * called by a Model.
+ *
+ * @codeCoverageIgnore
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+abstract class FOFModelBehavior extends FOFUtilsObservableEvent
+{
+	/**
+	 * This event runs before saving data in the model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 * @param   array     &$data   The data to save
+	 *
+	 * @return  void
+	 */
+	public function onBeforeSave(&$model, &$data)
+	{
+	}
+
+	/**
+	 * This event runs before deleting a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforeDelete(&$model)
+	{
+	}
+
+	/**
+	 * This event runs before copying a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforeCopy(&$model)
+	{
+	}
+
+	/**
+	 * This event runs before publishing a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforePublish(&$model)
+	{
+	}
+
+	/**
+	 * This event runs before registering a hit on a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforeHit(&$model)
+	{
+	}
+
+	/**
+	 * This event runs before moving a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforeMove(&$model)
+	{
+	}
+
+	/**
+	 * This event runs before changing the records' order in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforeReorder(&$model)
+	{
+	}
+
+	/**
+	 * This event runs when we are building the query used to fetch a record
+	 * list in a model
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The query being built
+	 *
+	 * @return  void
+	 */
+	public function onBeforeBuildQuery(&$model, &$query)
+	{
+	}
+
+	/**
+	 * This event runs after saving a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterSave(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after deleting a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterDelete(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after copying a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterCopy(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after publishing a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterPublish(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after registering a hit on a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterHit(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after moving a record in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterMove(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after reordering records in a model
+	 *
+	 * @param   FOFModel  &$model  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterReorder(&$model)
+	{
+	}
+
+	/**
+	 * This event runs after we have built the query used to fetch a record
+	 * list in a model
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The query being built
+	 *
+	 * @return  void
+	 */
+	public function onAfterBuildQuery(&$model, &$query)
+	{
+	}
+
+	/**
+	 * This event runs after getting a single item
+	 *
+	 * @param   FOFModel  &$model   The model which calls this event
+	 * @param   FOFTable  &$record  The record loaded by this model
+	 *
+	 * @return  void
+	 */
+	public function onAfterGetItem(&$model, &$record)
+	{
+	}
+}
diff --git a/core/libraries/fof/model/behavior/access.php b/core/libraries/fof/model/behavior/access.php
new file mode 100644
index 00000000..1cafe7f0
--- /dev/null
+++ b/core/libraries/fof/model/behavior/access.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class to filter front-end access to items
+ * based on the viewing access levels.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelBehaviorAccess extends FOFModelBehavior
+{
+	/**
+	 * This event runs after we have built the query used to fetch a record
+	 * list in a model. It is used to apply automatic query filters.
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterBuildQuery(&$model, &$query)
+	{
+		// This behavior only applies to the front-end.
+		if (!FOFPlatform::getInstance()->isFrontend())
+		{
+			return;
+		}
+
+		// Get the name of the access field
+		$table       = $model->getTable();
+		$accessField = $table->getColumnAlias('access');
+
+		// Make sure the field actually exists
+		if (!in_array($accessField, $table->getKnownFields()))
+		{
+			return;
+		}
+
+		$model->applyAccessFiltering(null);
+	}
+
+	/**
+	 * The event runs after FOFModel has called FOFTable and retrieved a single
+	 * item from the database. It is used to apply automatic filters.
+	 *
+	 * @param   FOFModel  &$model   The model which was called
+	 * @param   FOFTable  &$record  The record loaded from the databae
+	 *
+	 * @return  void
+	 */
+	public function onAfterGetItem(&$model, &$record)
+	{
+		if ($record instanceof FOFTable)
+		{
+			$fieldName = $record->getColumnAlias('access');
+
+			// Make sure the field actually exists
+			if (!in_array($fieldName, $record->getKnownFields()))
+			{
+				return;
+			}
+
+			// Get the user
+			$user = FOFPlatform::getInstance()->getUser();
+
+			// Filter by authorised access levels
+			if (!in_array($record->$fieldName, $user->getAuthorisedViewLevels()))
+			{
+				$record = null;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/model/behavior/emptynonzero.php b/core/libraries/fof/model/behavior/emptynonzero.php
new file mode 100644
index 00000000..9efb07c2
--- /dev/null
+++ b/core/libraries/fof/model/behavior/emptynonzero.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelBehaviorEmptynonzero extends FOFModelBehavior
+{
+	/**
+	 * This event runs when we are building the query used to fetch a record
+	 * list in a model
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The query being built
+	 *
+	 * @return  void
+	 */
+	public function onBeforeBuildQuery(&$model, &$query)
+	{
+		$model->setState('_emptynonzero', '1');
+	}
+}
diff --git a/core/libraries/fof/model/behavior/enabled.php b/core/libraries/fof/model/behavior/enabled.php
new file mode 100644
index 00000000..c2e35852
--- /dev/null
+++ b/core/libraries/fof/model/behavior/enabled.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class to filter front-end access to items
+ * that are enabled.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelBehaviorEnabled extends FOFModelBehavior
+{
+	/**
+	 * This event runs after we have built the query used to fetch a record
+	 * list in a model. It is used to apply automatic query filters.
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterBuildQuery(&$model, &$query)
+	{
+		// This behavior only applies to the front-end.
+		if (!FOFPlatform::getInstance()->isFrontend())
+		{
+			return;
+		}
+
+		// Get the name of the enabled field
+		$table = $model->getTable();
+		$enabledField = $table->getColumnAlias('enabled');
+
+		// Make sure the field actually exists
+		if (!in_array($enabledField, $table->getKnownFields()))
+		{
+			return;
+		}
+
+		// Filter by enabled fields only
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// Alias
+		$alias = $model->getTableAlias();
+		$alias = $alias ? $db->qn($alias) . '.' : '';
+
+		$query->where($alias . $db->qn($enabledField) . ' = ' . $db->q(1));
+	}
+
+	/**
+	 * The event runs after FOFModel has called FOFTable and retrieved a single
+	 * item from the database. It is used to apply automatic filters.
+	 *
+	 * @param   FOFModel  &$model   The model which was called
+	 * @param   FOFTable  &$record  The record loaded from the databae
+	 *
+	 * @return  void
+	 */
+	public function onAfterGetItem(&$model, &$record)
+	{
+		if ($record instanceof FOFTable)
+		{
+			$fieldName = $record->getColumnAlias('enabled');
+
+			// Make sure the field actually exists
+			if (!in_array($fieldName, $record->getKnownFields()))
+			{
+				return;
+			}
+
+			if ($record->$fieldName != 1)
+			{
+				$record = null;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/model/behavior/filters.php b/core/libraries/fof/model/behavior/filters.php
new file mode 100644
index 00000000..7cd1ccd1
--- /dev/null
+++ b/core/libraries/fof/model/behavior/filters.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelBehaviorFilters extends FOFModelBehavior
+{
+	/**
+	 * This event runs after we have built the query used to fetch a record
+	 * list in a model. It is used to apply automatic query filters.
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterBuildQuery(&$model, &$query)
+	{
+		$table = $model->getTable();
+		$tableName = $table->getTableName();
+		$tableKey = $table->getKeyName();
+		$db = $model->getDBO();
+
+		$filterzero = $model->getState('_emptynonzero', null);
+
+		$fields = $model->getTableFields();
+		$backlist = $model->blacklistFilters();
+
+		foreach ($fields as $fieldname => $fieldtype)
+		{
+			if (in_array($fieldname, $backlist)) {
+				continue;
+			}
+			$field = new stdClass;
+			$field->name = $fieldname;
+			$field->type = $fieldtype;
+			$field->filterzero = $filterzero;
+
+			$filterName = ($field->name == $tableKey) ? 'id' : $field->name;
+			$filterState = $model->getState($filterName, null);
+
+			$field = FOFModelField::getField($field, array('dbo' => $db, 'table_alias' => $model->getTableAlias()));
+
+			if ((is_array($filterState) && (
+					array_key_exists('value', $filterState) ||
+					array_key_exists('from', $filterState) ||
+					array_key_exists('to', $filterState)
+				)) || is_object($filterState))
+			{
+				$options = new JRegistry($filterState);
+			}
+			else
+			{
+				$options = new JRegistry;
+				$options->set('value', $filterState);
+			}
+
+			$methods = $field->getSearchMethods();
+			$method = $options->get('method', $field->getDefaultSearchMethod());
+
+			if (!in_array($method, $methods))
+			{
+				$method = 'exact';
+			}
+
+			switch ($method)
+			{
+				case 'between':
+				case 'outside':
+				case 'range' :
+					$sql = $field->$method($options->get('from', null), $options->get('to'));
+					break;
+
+				case 'interval':
+				case 'modulo':
+					$sql = $field->$method($options->get('value', null), $options->get('interval'));
+					break;
+
+				case 'exact':
+				case 'partial':
+				case 'search':
+				default:
+					$sql = $field->$method($options->get('value', null));
+					break;
+			}
+
+			if ($sql)
+			{
+				$query->where($sql);
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/model/behavior/language.php b/core/libraries/fof/model/behavior/language.php
new file mode 100644
index 00000000..e42911c2
--- /dev/null
+++ b/core/libraries/fof/model/behavior/language.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class to filter front-end access to items
+ * based on the language.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelBehaviorLanguage extends FOFModelBehavior
+{
+	/**
+	 * This event runs before we have built the query used to fetch a record
+	 * list in a model. It is used to blacklist the language filter
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onBeforeBuildQuery(&$model, &$query)
+	{
+		if (FOFPlatform::getInstance()->isFrontend())
+		{
+			$model->blacklistFilters('language');
+		}
+	}
+
+	/**
+	 * This event runs after we have built the query used to fetch a record
+	 * list in a model. It is used to apply automatic query filters.
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterBuildQuery(&$model, &$query)
+	{
+		// This behavior only applies to the front-end.
+		if (!FOFPlatform::getInstance()->isFrontend())
+		{
+			return;
+		}
+
+		// Get the name of the language field
+		$table = $model->getTable();
+		$languageField = $table->getColumnAlias('language');
+
+		// Make sure the access field actually exists
+		if (!in_array($languageField, $table->getKnownFields()))
+		{
+			return;
+		}
+
+		// Make sure it is a multilingual site and get a list of languages
+		$app = JFactory::getApplication();
+		$hasLanguageFilter = method_exists($app, 'getLanguageFilter');
+
+		if ($hasLanguageFilter)
+		{
+			$hasLanguageFilter = $app->getLanguageFilter();
+		}
+
+		if (!$hasLanguageFilter)
+		{
+			return;
+		}
+
+		$lang_filter_plugin = JPluginHelper::getPlugin('system', 'languagefilter');
+		$lang_filter_params = new JRegistry($lang_filter_plugin->params);
+
+		$languages = array('*');
+
+		if ($lang_filter_params->get('remove_default_prefix'))
+		{
+			// Get default site language
+			$lg = FOFPlatform::getInstance()->getLanguage();
+			$languages[] = $lg->getTag();
+		}
+		else
+		{
+			$languages[] = JFactory::getApplication()->input->getCmd('language', '*');
+		}
+
+		// Filter out double languages
+		$languages = array_unique($languages);
+
+		// And filter the query output by these languages
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// Alias
+		$alias = $model->getTableAlias();
+		$alias = $alias ? $db->qn($alias) . '.' : '';
+
+		$languages = array_map(array($db, 'quote'), $languages);
+		$query->where($alias . $db->qn($languageField) . ' IN (' . implode(',', $languages) . ')');
+	}
+
+	/**
+	 * The event runs after FOFModel has called FOFTable and retrieved a single
+	 * item from the database. It is used to apply automatic filters.
+	 *
+	 * @param   FOFModel  &$model   The model which was called
+	 * @param   FOFTable  &$record  The record loaded from the databae
+	 *
+	 * @return  void
+	 */
+	public function onAfterGetItem(&$model, &$record)
+	{
+		if ($record instanceof FOFTable)
+		{
+			$fieldName = $record->getColumnAlias('language');
+
+			// Make sure the field actually exists
+			if (!in_array($fieldName, $record->getKnownFields()))
+			{
+				return;
+			}
+
+			// Make sure it is a multilingual site and get a list of languages
+			$app = JFactory::getApplication();
+			$hasLanguageFilter = method_exists($app, 'getLanguageFilter');
+
+			if ($hasLanguageFilter)
+			{
+				$hasLanguageFilter = $app->getLanguageFilter();
+			}
+
+			if (!$hasLanguageFilter)
+			{
+				return;
+			}
+
+			$lang_filter_plugin = JPluginHelper::getPlugin('system', 'languagefilter');
+			$lang_filter_params = new JRegistry($lang_filter_plugin->params);
+
+			$languages = array('*');
+
+			if ($lang_filter_params->get('remove_default_prefix'))
+			{
+				// Get default site language
+				$lg = FOFPlatform::getInstance()->getLanguage();
+				$languages[] = $lg->getTag();
+			}
+			else
+			{
+				$languages[] = JFactory::getApplication()->input->getCmd('language', '*');
+			}
+
+			// Filter out double languages
+			$languages = array_unique($languages);
+
+			if (!in_array($record->$fieldName, $languages))
+			{
+				$record = null;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/model/behavior/private.php b/core/libraries/fof/model/behavior/private.php
new file mode 100644
index 00000000..85ce3d1d
--- /dev/null
+++ b/core/libraries/fof/model/behavior/private.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class to filter front-end access to items
+ * craeted by the currently logged in user only.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelBehaviorPrivate extends FOFModelBehavior
+{
+	/**
+	 * This event runs after we have built the query used to fetch a record
+	 * list in a model. It is used to apply automatic query filters.
+	 *
+	 * @param   FOFModel        &$model  The model which calls this event
+	 * @param   FOFDatabaseQuery  &$query  The model which calls this event
+	 *
+	 * @return  void
+	 */
+	public function onAfterBuildQuery(&$model, &$query)
+	{
+		// This behavior only applies to the front-end.
+		if (!FOFPlatform::getInstance()->isFrontend())
+		{
+			return;
+		}
+
+		// Get the name of the access field
+		$table = $model->getTable();
+		$createdField = $table->getColumnAlias('created_by');
+
+		// Make sure the access field actually exists
+		if (!in_array($createdField, $table->getKnownFields()))
+		{
+			return;
+		}
+
+		// Get the current user's id
+		$user_id = FOFPlatform::getInstance()->getUser()->id;
+
+		// And filter the query output by the user id
+		$db    = FOFPlatform::getInstance()->getDbo();
+
+		$alias = $model->getTableAlias();
+		$alias = $alias ? $db->qn($alias) . '.' : '';
+
+		$query->where($alias . $db->qn($createdField) . ' = ' . $db->q($user_id));
+	}
+
+	/**
+	 * The event runs after FOFModel has called FOFTable and retrieved a single
+	 * item from the database. It is used to apply automatic filters.
+	 *
+	 * @param   FOFModel  &$model   The model which was called
+	 * @param   FOFTable  &$record  The record loaded from the databae
+	 *
+	 * @return  void
+	 */
+	public function onAfterGetItem(&$model, &$record)
+	{
+		if ($record instanceof FOFTable)
+		{
+			$keyName = $record->getKeyName();
+			if ($record->$keyName === null)
+			{
+				return;
+			}
+
+			$fieldName = $record->getColumnAlias('created_by');
+
+			// Make sure the field actually exists
+			if (!in_array($fieldName, $record->getKnownFields()))
+			{
+				return;
+			}
+
+			$user_id = FOFPlatform::getInstance()->getUser()->id;
+
+			if ($record->$fieldName != $user_id)
+			{
+				$record = null;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/model/dispatcher/behavior.php b/core/libraries/fof/model/dispatcher/behavior.php
new file mode 100644
index 00000000..7df41c82
--- /dev/null
+++ b/core/libraries/fof/model/dispatcher/behavior.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior dispatcher class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelDispatcherBehavior extends FOFUtilsObservableDispatcher
+{
+}
diff --git a/core/libraries/fof/model/field.php b/core/libraries/fof/model/field.php
new file mode 100644
index 00000000..8a7c04a9
--- /dev/null
+++ b/core/libraries/fof/model/field.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+abstract class FOFModelField
+{
+	protected $_db = null;
+
+	/**
+	 * The column name of the table field
+	 *
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * The column type of the table field
+	 *
+	 * @var string
+	 */
+	protected $type = '';
+
+	/**
+	 * The alias of the table used for filtering
+	 *
+	 * @var string
+	 */
+	protected $table_alias = false;
+
+	/**
+	 * The null value for this type
+	 *
+	 * @var  mixed
+	 */
+	public $null_value = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   FOFDatabaseDriver  $db           The database object
+	 * @param   object           $field        The field informations as taken from the db
+	 * @param   string           $table_alias  The table alias to use when filtering
+	 */
+	public function __construct($db, $field, $table_alias = false)
+	{
+		$this->_db = $db;
+
+		$this->name = $field->name;
+		$this->type = $field->type;
+		$this->filterzero = $field->filterzero;
+		$this->table_alias = $table_alias;
+	}
+
+	/**
+	 * Is it a null or otherwise empty value?
+	 *
+	 * @param   mixed  $value  The value to test for emptiness
+	 *
+	 * @return  boolean
+	 */
+	public function isEmpty($value)
+	{
+		return (($value === $this->null_value) || empty($value))
+			&& !($this->filterzero && $value === "0");
+	}
+
+	/**
+	 * Returns the default search method for a field. This always returns 'exact'
+	 * and you are supposed to override it in specialised classes. The possible
+	 * values are exact, partial, between and outside, unless something
+	 * different is returned by getSearchMethods().
+	 *
+	 * @see  self::getSearchMethods()
+	 *
+	 * @return  string
+	 */
+	public function getDefaultSearchMethod()
+	{
+		return 'exact';
+	}
+
+	/**
+	 * Return the search methods available for this field class,
+	 *
+	 * @return  array
+	 */
+	public function getSearchMethods()
+	{
+		$ignore = array('isEmpty', 'getField', 'getFieldType', '__construct', 'getDefaultSearchMethod', 'getSearchMethods');
+
+		$class = new ReflectionClass(__CLASS__);
+		$methods = $class->getMethods(ReflectionMethod::IS_PUBLIC);
+
+		$tmp = array();
+
+		foreach ($methods as $method)
+		{
+			$tmp[] = $method->name;
+		}
+
+		$methods = $tmp;
+
+		if ($methods = array_diff($methods, $ignore))
+		{
+			return $methods;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Perform an exact match (equality matching)
+	 *
+	 * @param   mixed  $value  The value to compare to
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function exact($value)
+	{
+		if ($this->isEmpty($value))
+		{
+			return '';
+		}
+
+		if (is_array($value))
+		{
+			$db    = FOFPlatform::getInstance()->getDbo();
+			$value = array_map(array($db, 'quote'), $value);
+
+			return '(' . $this->getFieldName() . ' IN (' . implode(',', $value) . '))';
+		}
+		else
+		{
+			return $this->search($value, '=');
+		}
+	}
+
+	/**
+	 * Perform a partial match (usually: search in string)
+	 *
+	 * @param   mixed  $value  The value to compare to
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	abstract public function partial($value);
+
+	/**
+	 * Perform a between limits match (usually: search for a value between
+	 * two numbers or a date between two preset dates). When $include is true
+	 * the condition tested is:
+	 * $from <= VALUE <= $to
+	 * When $include is false the condition tested is:
+	 * $from < VALUE < $to
+	 *
+	 * @param   mixed    $from     The lowest value to compare to
+	 * @param   mixed    $to       The higherst value to compare to
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	abstract public function between($from, $to, $include = true);
+
+	/**
+	 * Perform an outside limits match (usually: search for a value outside an
+	 * area or a date outside a preset period). When $include is true
+	 * the condition tested is:
+	 * (VALUE <= $from) || (VALUE >= $to)
+	 * When $include is false the condition tested is:
+	 * (VALUE < $from) || (VALUE > $to)
+	 *
+	 * @param   mixed    $from     The lowest value of the excluded range
+	 * @param   mixed    $to       The higherst value of the excluded range
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	abstract public function outside($from, $to, $include = false);
+
+	/**
+	 * Perform an interval search (usually: a date interval check)
+	 *
+	 * @param   string               $from      The value to search
+	 * @param   string|array|object  $interval  The interval
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	abstract public function interval($from, $interval);
+
+	/**
+	 * Perform a between limits match (usually: search for a value between
+	 * two numbers or a date between two preset dates). When $include is true
+	 * the condition tested is:
+	 * $from <= VALUE <= $to
+	 * When $include is false the condition tested is:
+	 * $from < VALUE < $to
+	 *
+	 * @param   mixed    $from     The lowest value to compare to
+	 * @param   mixed    $to       The higherst value to compare to
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	abstract public function range($from, $to, $include = true);
+
+	/**
+	 * Perform an modulo search
+	 *
+	 * @param   integer|float  $value     The starting value of the search space
+	 * @param   integer|float  $interval  The interval period of the search space
+	 * @param   boolean        $include   Should I include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause
+	 */
+	abstract public function modulo($from, $interval, $include = true);
+
+	/**
+	 * Return the SQL where clause for a search
+	 *
+	 * @param   mixed   $value     The value to search for
+	 * @param   string  $operator  The operator to use
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function search($value, $operator = '=')
+	{
+		if ($this->isEmpty($value))
+		{
+			return '';
+		}
+
+		return '(' . $this->getFieldName() . ' ' . $operator . ' ' . $this->_db->quote($value) . ')';
+	}
+
+	/**
+	 * Get the field name with the given table alias
+	 *
+	 * @return  string 	The field name
+	 */
+	public function getFieldName()
+	{
+		$name = $this->_db->qn($this->name);
+
+		if ($this->table_alias)
+		{
+			$name = $this->_db->qn($this->table_alias) . '.' . $name;
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Creates a field Object based on the field column type
+	 *
+	 * @param   object  $field   The field informations
+	 * @param   array   $config  The field configuration (like the db object to use)
+	 *
+	 * @return  FOFModelField  The Field object
+	 */
+	public static function getField($field, $config = array())
+	{
+		$type = $field->type;
+
+		$classType = self::getFieldType($type);
+
+		$className = 'FOFModelField' . $classType;
+
+		if (class_exists($className))
+		{
+			if (isset($config['dbo']))
+			{
+				$db = $config['dbo'];
+			}
+			else
+			{
+				$db = FOFPlatform::getInstance()->getDbo();
+			}
+
+			if (isset($config['table_alias']))
+			{
+				$table_alias = $config['table_alias'];
+			}
+			else
+			{
+				$table_alias = false;
+			}
+
+			$field = new $className($db, $field, $table_alias);
+
+			return $field;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the classname based on the field Type
+	 *
+	 * @param   string  $type  The type of the field
+	 *
+	 * @return  string  the class suffix
+	 */
+	public static function getFieldType($type)
+	{
+		switch ($type)
+		{
+			case 'varchar':
+			case 'text':
+			case 'smalltext':
+			case 'longtext':
+			case 'char':
+			case 'mediumtext':
+			case 'character varying':
+			case 'nvarchar':
+			case 'nchar':
+				$type = 'Text';
+				break;
+
+			case 'date':
+			case 'datetime':
+			case 'time':
+			case 'year':
+			case 'timestamp':
+			case 'timestamp without time zone':
+			case 'timestamp with time zone':
+				$type = 'Date';
+				break;
+
+			case 'tinyint':
+			case 'smallint':
+				$type = 'Boolean';
+				break;
+
+			default:
+				$type = 'Number';
+				break;
+		}
+
+		return $type;
+	}
+}
diff --git a/core/libraries/fof/model/field/boolean.php b/core/libraries/fof/model/field/boolean.php
new file mode 100644
index 00000000..9140d303
--- /dev/null
+++ b/core/libraries/fof/model/field/boolean.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelFieldBoolean extends FOFModelFieldNumber
+{
+	/**
+	 * Is it a null or otherwise empty value?
+	 *
+	 * @param   mixed  $value  The value to test for emptiness
+	 *
+	 * @return  boolean
+	 */
+	public function isEmpty($value)
+	{
+		return is_null($value) || ($value === '');
+	}
+}
diff --git a/core/libraries/fof/model/field/date.php b/core/libraries/fof/model/field/date.php
new file mode 100644
index 00000000..9a18957f
--- /dev/null
+++ b/core/libraries/fof/model/field/date.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelFieldDate extends FOFModelFieldText
+{
+	/**
+	 * Returns the default search method for this field.
+	 *
+	 * @return  string
+	 */
+	public function getDefaultSearchMethod()
+	{
+		return 'exact';
+	}
+
+	/**
+	 * Perform a between limits match. When $include is true
+	 * the condition tested is:
+	 * $from <= VALUE <= $to
+	 * When $include is false the condition tested is:
+	 * $from < VALUE < $to
+	 *
+	 * @param   mixed    $from     The lowest value to compare to
+	 * @param   mixed    $to       The higherst value to compare to
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function between($from, $to, $include = true)
+	{
+		if ($this->isEmpty($from) || $this->isEmpty($to))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '((' . $this->getFieldName() . ' >' . $extra . ' "' . $from . '") AND ';
+		$sql .= '(' . $this->getFieldName() . ' <' . $extra . ' "' . $to . '"))';
+
+		return $sql;
+	}
+
+	/**
+	 * Perform an outside limits match. When $include is true
+	 * the condition tested is:
+	 * (VALUE <= $from) || (VALUE >= $to)
+	 * When $include is false the condition tested is:
+	 * (VALUE < $from) || (VALUE > $to)
+	 *
+	 * @param   mixed    $from     The lowest value of the excluded range
+	 * @param   mixed    $to       The higherst value of the excluded range
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function outside($from, $to, $include = false)
+	{
+		if ($this->isEmpty($from) || $this->isEmpty($to))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '((' . $this->getFieldName() . ' <' . $extra . ' "' . $from . '") OR ';
+		$sql .= '(' . $this->getFieldName() . ' >' . $extra . ' "' . $to . '"))';
+
+		return $sql;
+	}
+
+	/**
+	 * Interval date search
+	 *
+	 * @param   string               $value     The value to search
+	 * @param   string|array|object  $interval  The interval. Can be (+1 MONTH or array('value' => 1, 'unit' => 'MONTH', 'sign' => '+'))
+	 * @param   boolean              $include   If the borders should be included
+	 *
+	 * @return  string  the sql string
+	 */
+	public function interval($value, $interval, $include = true)
+	{
+		if ($this->isEmpty($value) || $this->isEmpty($interval))
+		{
+			return '';
+		}
+
+		$interval = $this->getInterval($interval);
+
+		if ($interval['sign'] == '+')
+		{
+			$function = 'DATE_ADD';
+		}
+		else
+		{
+			$function = 'DATE_SUB';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '(' . $this->getFieldName() . ' >' . $extra . ' ' . $function;
+		$sql .= '(' . $this->getFieldName() . ', INTERVAL ' . $interval['value'] . ' ' . $interval['unit'] . '))';
+
+		return $sql;
+	}
+
+	/**
+	 * Perform a between limits match. When $include is true
+	 * the condition tested is:
+	 * $from <= VALUE <= $to
+	 * When $include is false the condition tested is:
+	 * $from < VALUE < $to
+	 *
+	 * @param   mixed    $from     The lowest value to compare to
+	 * @param   mixed    $to       The higherst value to compare to
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function range($from, $to, $include = true)
+	{
+		if ($this->isEmpty($from) && $this->isEmpty($to))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		if ($from)
+			$sql[] = '(' . $this->getFieldName() . ' >' . $extra . ' "' . $from . '")';
+		if ($to)
+			$sql[] = '(' . $this->getFieldName() . ' <' . $extra . ' "' . $to . '")';
+
+		$sql = '(' . implode(' AND ', $sql) . ')';
+
+		return $sql;
+	}
+
+	/**
+	 * Parses an interval –which may be given as a string, array or object– into
+	 * a standardised hash array that can then be used bu the interval() method.
+	 *
+	 * @param   string|array|object  $interval  The interval expression to parse
+	 *
+	 * @return  array  The parsed, hash array form of the interval
+	 */
+	protected function getInterval($interval)
+	{
+		if (is_string($interval))
+		{
+			if (strlen($interval) > 2)
+			{
+				$interval = explode(" ", $interval);
+				$sign = ($interval[0] == '-') ? '-' : '+';
+				$value = (int) substr($interval[0], 1);
+
+				$interval = array(
+					'unit' => $interval[1],
+					'value' => $value,
+					'sign' => $sign
+				);
+			}
+			else
+			{
+				$interval = array(
+					'unit' => 'MONTH',
+					'value' => 1,
+					'sign' => '+'
+				);
+			}
+		}
+		else
+		{
+			$interval = (array) $interval;
+		}
+
+		return $interval;
+	}
+}
diff --git a/core/libraries/fof/model/field/number.php b/core/libraries/fof/model/field/number.php
new file mode 100644
index 00000000..712e4eca
--- /dev/null
+++ b/core/libraries/fof/model/field/number.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelFieldNumber extends FOFModelField
+{
+	/**
+	 * The partial match is mapped to an exact match
+	 *
+	 * @param   mixed  $value  The value to compare to
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function partial($value)
+	{
+		return $this->exact($value);
+	}
+
+	/**
+	 * Perform a between limits match. When $include is true
+	 * the condition tested is:
+	 * $from <= VALUE <= $to
+	 * When $include is false the condition tested is:
+	 * $from < VALUE < $to
+	 *
+	 * @param   mixed    $from     The lowest value to compare to
+	 * @param   mixed    $to       The higherst value to compare to
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function between($from, $to, $include = true)
+	{
+		if ($this->isEmpty($from) || $this->isEmpty($to))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '((' . $this->getFieldName() . ' >' . $extra . ' ' . $from . ') AND ';
+		$sql .= '(' . $this->getFieldName() . ' <' . $extra . ' ' . $to . '))';
+
+		return $sql;
+	}
+
+	/**
+	 * Perform an outside limits match. When $include is true
+	 * the condition tested is:
+	 * (VALUE <= $from) || (VALUE >= $to)
+	 * When $include is false the condition tested is:
+	 * (VALUE < $from) || (VALUE > $to)
+	 *
+	 * @param   mixed    $from     The lowest value of the excluded range
+	 * @param   mixed    $to       The higherst value of the excluded range
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function outside($from, $to, $include = false)
+	{
+		if ($this->isEmpty($from) || $this->isEmpty($to))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '((' . $this->getFieldName() . ' <' . $extra . ' ' . $from . ') OR ';
+		$sql .= '(' . $this->getFieldName() . ' >' . $extra . ' ' . $to . '))';
+
+		return $sql;
+	}
+
+	/**
+	 * Perform an interval match. It's similar to a 'between' match, but the
+	 * from and to values are calculated based on $value and $interval:
+	 * $value - $interval < VALUE < $value + $interval
+	 *
+	 * @param   integer|float  $value     The center value of the search space
+	 * @param   integer|float  $interval  The width of the search space
+	 * @param   boolean        $include   Should I include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause
+	 */
+	public function interval($value, $interval, $include = true)
+	{
+		if ($this->isEmpty($value))
+		{
+			return '';
+		}
+
+		$from = $value - $interval;
+		$to = $value + $interval;
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '((' . $this->getFieldName() . ' >' . $extra . ' ' . $from . ') AND ';
+		$sql .= '(' . $this->getFieldName() . ' <' . $extra . ' ' . $to . '))';
+
+		return $sql;
+	}
+
+	/**
+	 * Perform a range limits match. When $include is true
+	 * the condition tested is:
+	 * $from <= VALUE <= $to
+	 * When $include is false the condition tested is:
+	 * $from < VALUE < $to
+	 *
+	 * @param   mixed    $from     The lowest value to compare to
+	 * @param   mixed    $to       The higherst value to compare to
+	 * @param   boolean  $include  Should we include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function range($from, $to, $include = true)
+	{
+		if ($this->isEmpty($from) && $this->isEmpty($to))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		if ($from)
+			$sql[] = '(' . $this->getFieldName() . ' >' . $extra . ' ' . $from . ')';
+		if ($to)
+			$sql[] = '(' . $this->getFieldName() . ' <' . $extra . ' ' . $to . ')';
+
+		$sql = '(' . implode(' AND ', $sql) . ')';
+
+		return $sql;
+	}
+
+	/**
+	 * Perform an interval match. It's similar to a 'between' match, but the
+	 * from and to values are calculated based on $value and $interval:
+	 * $value - $interval < VALUE < $value + $interval
+	 *
+	 * @param   integer|float  $value     The starting value of the search space
+	 * @param   integer|float  $interval  The interval period of the search space
+	 * @param   boolean        $include   Should I include the boundaries in the search?
+	 *
+	 * @return  string  The SQL where clause
+	 */
+	public function modulo($value, $interval, $include = true)
+	{
+		if ($this->isEmpty($value) || $this->isEmpty($interval))
+		{
+			return '';
+		}
+
+		$extra = '';
+
+		if ($include)
+		{
+			$extra = '=';
+		}
+
+		$sql = '(' . $this->getFieldName() . ' >' . $extra . ' ' . $value . ' AND ';
+		$sql .= '(' . $this->getFieldName() . ' - ' . $value . ') % ' . $interval . ' = 0)';
+
+		return $sql;
+	}
+}
diff --git a/core/libraries/fof/model/field/text.php b/core/libraries/fof/model/field/text.php
new file mode 100644
index 00000000..ebeeeded
--- /dev/null
+++ b/core/libraries/fof/model/field/text.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework model behavior class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFModelFieldText extends FOFModelField
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   FOFDatabaseDriver  $db     The database object
+	 * @param   object           $field  The field informations as taken from the db
+	 */
+	public function __construct($db, $field, $table_alias = false)
+	{
+		parent::__construct($db, $field, $table_alias);
+
+		$this->null_value = '';
+	}
+
+	/**
+	 * Returns the default search method for this field.
+	 *
+	 * @return  string
+	 */
+	public function getDefaultSearchMethod()
+	{
+		return 'partial';
+	}
+
+	/**
+	 * Perform a partial match (search in string)
+	 *
+	 * @param   mixed  $value  The value to compare to
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function partial($value)
+	{
+		if ($this->isEmpty($value))
+		{
+			return '';
+		}
+
+		return '(' . $this->getFieldName() . ' LIKE ' . $this->_db->quote('%' . $value . '%') . ')';
+	}
+
+	/**
+	 * Perform an exact match (match string)
+	 *
+	 * @param   mixed  $value  The value to compare to
+	 *
+	 * @return  string  The SQL where clause for this search
+	 */
+	public function exact($value)
+	{
+		if ($this->isEmpty($value))
+		{
+			return '';
+		}
+
+		return '(' . $this->getFieldName() . ' LIKE ' . $this->_db->quote($value) . ')';
+	}
+
+	/**
+	 * Dummy method; this search makes no sense for text fields
+	 *
+	 * @param   mixed    $from     Ignored
+	 * @param   mixed    $to       Ignored
+	 * @param   boolean  $include  Ignored
+	 *
+	 * @return  string  Empty string
+	 */
+	public function between($from, $to, $include = true)
+	{
+		return '';
+	}
+
+	/**
+	 * Dummy method; this search makes no sense for text fields
+	 *
+	 * @param   mixed    $from     Ignored
+	 * @param   mixed    $to       Ignored
+	 * @param   boolean  $include  Ignored
+	 *
+	 * @return  string  Empty string
+	 */
+	public function outside($from, $to, $include = false)
+	{
+		return '';
+	}
+
+	/**
+	 * Dummy method; this search makes no sense for text fields
+	 *
+	 * @param   mixed    $value     Ignored
+	 * @param   mixed    $interval  Ignored
+	 * @param   boolean  $include   Ignored
+	 *
+	 * @return  string  Empty string
+	 */
+	public function interval($value, $interval, $include = true)
+	{
+		return '';
+	}
+
+	/**
+	 * Dummy method; this search makes no sense for text fields
+	 *
+	 * @param   mixed    $from     Ignored
+	 * @param   mixed    $to       Ignored
+	 * @param   boolean  $include  Ignored
+	 *
+	 * @return  string  Empty string
+	 */
+	public function range($from, $to, $include = false)
+	{
+		return '';
+	}
+
+	/**
+	 * Dummy method; this search makes no sense for text fields
+	 *
+	 * @param   mixed    $from     Ignored
+	 * @param   mixed    $to       Ignored
+	 * @param   boolean  $include  Ignored
+	 *
+	 * @return  string  Empty string
+	 */
+	public function modulo($from, $to, $include = false)
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/fof/model/model.php b/core/libraries/fof/model/model.php
new file mode 100644
index 00000000..5d67e2af
--- /dev/null
+++ b/core/libraries/fof/model/model.php
@@ -0,0 +1,3256 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  model
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework Model class. The Model is the workhorse. It performs all
+ * of the business logic based on its state and then returns the raw (processed)
+ * data to the caller, or modifies its own state. It's important to note that
+ * the model doesn't get data directly from the request (this is the
+ * Controller's business) and that it doesn't output anything (that the View's
+ * business).
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFModel extends FOFUtilsObject
+{
+	/**
+	 * Indicates if the internal state has been set
+	 *
+	 * @var    boolean
+	 * @since  12.2
+	 */
+	protected $__state_set = null;
+
+	/**
+	 * Database Connector
+	 *
+	 * @var    object
+	 * @since  12.2
+	 */
+	protected $_db;
+
+	/**
+	 * The event to trigger after deleting the data.
+	 * @var    string
+	 */
+	protected $event_after_delete = 'onContentAfterDelete';
+
+	/**
+	 * The event to trigger after saving the data.
+	 * @var    string
+	 */
+	protected $event_after_save = 'onContentAfterSave';
+
+	/**
+	 * The event to trigger before deleting the data.
+	 * @var    string
+	 */
+	protected $event_before_delete = 'onContentBeforeDelete';
+
+	/**
+	 * The event to trigger before saving the data.
+	 * @var    string
+	 */
+	protected $event_before_save = 'onContentBeforeSave';
+
+	/**
+	 * The event to trigger after changing the published state of the data.
+	 * @var    string
+	 */
+	protected $event_change_state = 'onContentChangeState';
+
+	/**
+	 * The event to trigger when cleaning cache.
+	 *
+	 * @var      string
+	 * @since    12.2
+	 */
+	protected $event_clean_cache = null;
+
+	/**
+	 * Stores a list of IDs passed to the model's state
+	 * @var array
+	 */
+	protected $id_list = array();
+
+	/**
+	 * The first row ID passed to the model's state
+	 * @var int
+	 */
+	protected $id = null;
+
+	/**
+	 * Input variables, passed on from the controller, in an associative array
+	 * @var FOFInput
+	 */
+	protected $input = array();
+
+	/**
+	 * The list of records made available through getList
+	 * @var array
+	 */
+	protected $list = null;
+
+	/**
+	 * The model (base) name
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $name;
+
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $option = null;
+
+	/**
+	 * The table object, populated when saving data
+	 * @var FOFTable
+	 */
+	protected $otable = null;
+
+	/**
+	 * Pagination object
+	 * @var JPagination
+	 */
+	protected $pagination = null;
+
+	/**
+	 * The table object, populated when retrieving data
+	 * @var FOFTable
+	 */
+	protected $record = null;
+
+	/**
+	 * A state object
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $state;
+
+	/**
+	 * The name of the table to use
+	 * @var string
+	 */
+	protected $table = null;
+
+	/**
+	 * Total rows based on the filters set in the model's state
+	 * @var int
+	 */
+	protected $total = null;
+
+	/**
+	 * Should I save the model's state in the session?
+	 * @var bool
+	 */
+	protected $_savestate = null;
+
+	/**
+	 * Array of form objects.
+	 *
+	 * @var    array
+	 * @since  2.0
+	 */
+	protected $_forms = array();
+
+	/**
+	 * The data to load into a form
+	 *
+	 * @var    array
+	 * @since  2.0
+	 */
+	protected $_formData = array();
+
+	/**
+	 * An instance of FOFConfigProvider to provision configuration overrides
+	 *
+	 * @var    FOFConfigProvider
+	 */
+	protected $configProvider = null;
+
+	/**
+	 * FOFModelDispatcherBehavior for dealing with extra behaviors
+	 *
+	 * @var    FOFModelDispatcherBehavior
+	 */
+	protected $modelDispatcher = null;
+
+	/**
+	 *	Default behaviors to apply to the model
+	 *
+	 * @var  	array
+	 */
+	protected $default_behaviors = array('filters');
+
+	/**
+	 * Behavior parameters
+	 *
+	 * @var    array
+	 */
+	protected $_behaviorParams = array();
+
+	/**
+	 * Returns a new model object. Unless overriden by the $config array, it will
+	 * try to automatically populate its state from the request variables.
+	 *
+	 * @param   string  $type    Model type, e.g. 'Items'
+	 * @param   string  $prefix  Model prefix, e.g. 'FoobarModel'
+	 * @param   array   $config  Model configuration variables
+	 *
+	 * @return  FOFModel
+	 */
+	public static function &getAnInstance($type, $prefix = '', $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$type = preg_replace('/[^A-Z0-9_\.-]/i', '', $type);
+		$modelClass = $prefix . ucfirst($type);
+		$result = false;
+
+		// Guess the component name and include path
+		if (!empty($prefix))
+		{
+			preg_match('/(.*)Model$/', $prefix, $m);
+			$component = 'com_' . strtolower($m[1]);
+		}
+		else
+		{
+			$component = '';
+		}
+
+		if (array_key_exists('input', $config))
+		{
+			if (!($config['input'] instanceof FOFInput))
+			{
+				if (!is_array($config['input']))
+				{
+					$config['input'] = (array) $config['input'];
+				}
+
+				$config['input'] = array_merge($_REQUEST, $config['input']);
+				$config['input'] = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$config['input'] = new FOFInput;
+		}
+
+		if (empty($component))
+		{
+			$component = $config['input']->get('option', 'com_foobar');
+		}
+
+		$config['option'] = $component;
+
+		$needsAView = true;
+
+		if (array_key_exists('view', $config))
+		{
+			if (!empty($config['view']))
+			{
+				$needsAView = false;
+			}
+		}
+
+		if ($needsAView)
+		{
+			$config['view'] = strtolower($type);
+		}
+
+		$config['input']->set('option', $config['option']);
+
+		// Get the component directories
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($component);
+        $filesystem     = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		// Try to load the requested model class
+		if (!class_exists($modelClass))
+		{
+			$include_paths = self::addIncludePath();
+
+			$extra_paths = array(
+				$componentPaths['main'] . '/models',
+				$componentPaths['alt'] . '/models'
+			);
+
+			$include_paths = array_merge($extra_paths, $include_paths);
+
+			// Try to load the model file
+			$path = $filesystem->pathFind(
+					$include_paths, self::_createFileName('model', array('name' => $type))
+			);
+
+			if ($path)
+			{
+				require_once $path;
+			}
+		}
+
+		// Fallback to the Default model class, e.g. FoobarModelDefault
+		if (!class_exists($modelClass))
+		{
+			$modelClass = $prefix . 'Default';
+
+			if (!class_exists($modelClass))
+			{
+				$include_paths = self::addIncludePath();
+
+				$extra_paths = array(
+					$componentPaths['main'] . '/models',
+					$componentPaths['alt'] . '/models'
+				);
+
+				$include_paths = array_merge($extra_paths, $include_paths);
+
+				// Try to load the model file
+				$path = $filesystem->pathFind(
+						$include_paths, self::_createFileName('model', array('name' => 'default'))
+				);
+
+				if ($path)
+				{
+					require_once $path;
+				}
+			}
+		}
+
+		// Fallback to the generic FOFModel model class
+
+		if (!class_exists($modelClass))
+		{
+			$modelClass = 'FOFModel';
+		}
+
+		$result = new $modelClass($config);
+
+		return $result;
+	}
+
+	/**
+	 * Adds a behavior to the model
+	 *
+	 * @param   string  $name    The name of the behavior
+	 * @param   array   $config  Optional Behavior configuration
+	 *
+	 * @return  boolean  True if the behavior is found and added
+	 */
+	public function addBehavior($name, $config = array())
+	{
+		// Sanity check: this objects needs a non-null behavior handler
+		if (!is_object($this->modelDispatcher))
+		{
+			return false;
+		}
+
+		// Sanity check: this objects needs a behavior handler of the correct class type
+		if (!($this->modelDispatcher instanceof FOFModelDispatcherBehavior))
+		{
+			return false;
+		}
+
+		// First look for ComponentnameModelViewnameBehaviorName (e.g. FoobarModelItemsBehaviorFilter)
+		$option_name = str_replace('com_', '', $this->option);
+		$behaviorClass = ucfirst($option_name) . 'Model' . FOFInflector::pluralize($this->name) . 'Behavior' . ucfirst(strtolower($name));
+
+		if (class_exists($behaviorClass))
+		{
+			$behavior = new $behaviorClass($this->modelDispatcher, $config);
+
+			return true;
+		}
+
+		// Then look for ComponentnameModelBehaviorName (e.g. FoobarModelBehaviorFilter)
+		$option_name = str_replace('com_', '', $this->option);
+		$behaviorClass = ucfirst($option_name) . 'ModelBehavior' . ucfirst(strtolower($name));
+
+		if (class_exists($behaviorClass))
+		{
+			$behavior = new $behaviorClass($this->modelDispatcher, $config);
+
+			return true;
+		}
+
+		// Then look for FOFModelBehaviorName (e.g. FOFModelBehaviorFilter)
+		$behaviorClassAlt = 'FOFModelBehavior' . ucfirst(strtolower($name));
+
+		if (class_exists($behaviorClassAlt))
+		{
+			$behavior = new $behaviorClassAlt($this->modelDispatcher, $config);
+
+			return true;
+		}
+
+		// Nothing found? Return false.
+
+		return false;
+	}
+
+	/**
+	 * Returns a new instance of a model, with the state reset to defaults
+	 *
+	 * @param   string  $type    Model type, e.g. 'Items'
+	 * @param   string  $prefix  Model prefix, e.g. 'FoobarModel'
+	 * @param   array   $config  Model configuration variables
+	 *
+	 * @return FOFModel
+	 */
+	public static function &getTmpInstance($type, $prefix = '', $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		if (!array_key_exists('savestate', $config))
+		{
+			$config['savestate'] = false;
+		}
+
+		$ret = self::getAnInstance($type, $prefix, $config)
+			->getClone()
+			->clearState()
+			->clearInput()
+			->reset()
+			->savestate(0)
+			->limitstart(0)
+			->limit(0);
+
+		return $ret;
+	}
+
+	/**
+	 * Add a directory where FOFModel should search for models. You may
+	 * either pass a string or an array of directories.
+	 *
+	 * @param   mixed   $path    A path or array[sting] of paths to search.
+	 * @param   string  $prefix  A prefix for models.
+	 *
+	 * @return  array  An array with directory elements. If prefix is equal to '', all directories are returned.
+	 *
+	 * @since   12.2
+	 */
+	public static function addIncludePath($path = '', $prefix = '')
+	{
+		static $paths;
+
+		if (!isset($paths))
+		{
+			$paths = array();
+		}
+
+		if (!isset($paths[$prefix]))
+		{
+			$paths[$prefix] = array();
+		}
+
+		if (!isset($paths['']))
+		{
+			$paths[''] = array();
+		}
+
+		if (!empty($path))
+		{
+            $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+			if (!in_array($path, $paths[$prefix]))
+			{
+				array_unshift($paths[$prefix], $filesystem->pathClean($path));
+			}
+
+			if (!in_array($path, $paths['']))
+			{
+				array_unshift($paths[''], $filesystem->pathClean($path));
+			}
+		}
+
+		return $paths[$prefix];
+	}
+
+	/**
+	 * Adds to the stack of model table paths in LIFO order.
+	 *
+	 * @param   mixed  $path  The directory as a string or directories as an array to add.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public static function addTablePath($path)
+	{
+		FOFTable::addIncludePath($path);
+	}
+
+	/**
+	 * Create the filename for a resource
+	 *
+	 * @param   string  $type   The resource type to create the filename for.
+	 * @param   array   $parts  An associative array of filename information.
+	 *
+	 * @return  string  The filename
+	 *
+	 * @since   12.2
+	 */
+	protected static function _createFileName($type, $parts = array())
+	{
+		$filename = '';
+
+		switch ($type)
+		{
+			case 'model':
+				$filename = strtolower($parts['name']) . '.php';
+				break;
+		}
+
+		return $filename;
+	}
+
+    /**
+     * Public class constructor
+     *
+     * @param array $config The configuration array
+     */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		// Get the input
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$this->input = $config['input'];
+			}
+			else
+			{
+				$this->input = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		// Load the configuration provider
+		$this->configProvider = new FOFConfigProvider;
+
+		// Load the behavior dispatcher
+		$this->modelDispatcher = new FOFModelDispatcherBehavior;
+
+		// Set the $name/$_name variable
+		$component = $this->input->getCmd('option', 'com_foobar');
+
+		if (array_key_exists('option', $config))
+		{
+			$component = $config['option'];
+		}
+
+		// Set the $name variable
+		$this->input->set('option', $component);
+		$component = $this->input->getCmd('option', 'com_foobar');
+
+		if (array_key_exists('option', $config))
+		{
+			$component = $config['option'];
+		}
+
+		$this->input->set('option', $component);
+		$bareComponent = str_replace('com_', '', strtolower($component));
+
+		// Get the view name
+		$className = get_class($this);
+
+		if ($className == 'FOFModel')
+		{
+			if (array_key_exists('view', $config))
+			{
+				$view = $config['view'];
+			}
+
+			if (empty($view))
+			{
+				$view = $this->input->getCmd('view', 'cpanel');
+			}
+		}
+		else
+		{
+            if (array_key_exists('view', $config))
+            {
+                $view = $config['view'];
+            }
+
+            if (empty($view))
+            {
+                $eliminatePart = ucfirst($bareComponent) . 'Model';
+                $view = strtolower(str_replace($eliminatePart, '', $className));
+            }
+		}
+
+		if (array_key_exists('name', $config))
+		{
+			$name = $config['name'];
+		}
+		else
+		{
+			$name = $view;
+		}
+
+		$this->name = $name;
+		$this->option = $component;
+
+		// Set the model state
+		if (array_key_exists('state', $config))
+		{
+			$this->state = $config['state'];
+		}
+		else
+		{
+			$this->state = new FOFUtilsObject;
+		}
+
+		// Set the model dbo
+		if (array_key_exists('dbo', $config))
+		{
+			$this->_db = $config['dbo'];
+		}
+		else
+		{
+			$this->_db = FOFPlatform::getInstance()->getDbo();
+		}
+
+		// Set the default view search path
+		if (array_key_exists('table_path', $config))
+		{
+			$this->addTablePath($config['table_path']);
+		}
+		else
+		{
+			$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($this->option);
+
+			$path = $componentPaths['admin'] . '/tables';
+			$altPath = $this->configProvider->get($this->option . '.views.' . FOFInflector::singularize($this->name) . '.config.table_path', null);
+
+			if ($altPath)
+			{
+				$path = $componentPaths['main'] . '/' . $altPath;
+			}
+
+			$this->addTablePath($path);
+		}
+
+		// Assign the correct table
+		if (array_key_exists('table', $config))
+		{
+			$this->table = $config['table'];
+		}
+		else
+		{
+			$table = $this->configProvider->get(
+				$this->option . '.views.' . FOFInflector::singularize($this->name) .
+				'.config.table', FOFInflector::singularize($view)
+			);
+			$this->table = $table;
+		}
+
+		// Set the internal state marker - used to ignore setting state from the request
+
+		if (!empty($config['ignore_request']) || !is_null(
+				$this->configProvider->get(
+					$this->option . '.views.' . FOFInflector::singularize($this->name) .
+					'.config.ignore_request', null
+				)
+		))
+		{
+			$this->__state_set = true;
+		}
+
+		// Get and store the pagination request variables
+		$defaultSaveState = array_key_exists('savestate', $config) ? $config['savestate'] : -999;
+		$this->populateSavestate($defaultSaveState);
+
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			$limit = 20;
+			$limitstart = 0;
+		}
+		else
+		{
+			$app = JFactory::getApplication();
+
+			if (method_exists($app, 'getCfg'))
+			{
+				$default_limit = $app->getCfg('list_limit');
+			}
+			else
+			{
+				$default_limit = 20;
+			}
+
+			$limit = $this->getUserStateFromRequest($component . '.' . $view . '.limit', 'limit', $default_limit, 'int', $this->_savestate);
+			$limitstart = $this->getUserStateFromRequest($component . '.' . $view . '.limitstart', 'limitstart', 0, 'int', $this->_savestate);
+		}
+
+		$this->setState('limit', $limit);
+		$this->setState('limitstart', $limitstart);
+
+		// Get the ID or list of IDs from the request or the configuration
+
+		if (array_key_exists('cid', $config))
+		{
+			$cid = $config['cid'];
+		}
+		elseif ($cid = $this->configProvider->get(
+				$this->option . '.views.' . FOFInflector::singularize($this->name) . '.config.cid', null
+			)
+		)
+		{
+			$cid = explode(',', $cid);
+		}
+		else
+		{
+			$cid = $this->input->get('cid', array(), 'array');
+		}
+
+		if (array_key_exists('id', $config))
+		{
+			$id = $config['id'];
+		}
+		elseif ($id = $this->configProvider->get(
+				$this->option . '.views.' . FOFInflector::singularize($this->name) . '.config.id', null
+			)
+		)
+		{
+			$id = explode(',', $id);
+			$id = array_shift($id);
+		}
+		else
+		{
+			$id = $this->input->getInt('id', 0);
+		}
+
+		if (is_array($cid) && !empty($cid))
+		{
+			$this->setIds($cid);
+		}
+		else
+		{
+			$this->setId($id);
+		}
+
+		// Populate the event names from the $config array
+		$configKey = $this->option . '.views.' . FOFInflector::singularize($view) . '.config.';
+
+		// Assign after delete event handler
+
+		if (isset($config['event_after_delete']))
+		{
+			$this->event_after_delete = $config['event_after_delete'];
+		}
+		else
+		{
+			$this->event_after_delete = $this->configProvider->get(
+				$configKey . 'event_after_delete',
+				$this->event_after_delete
+			);
+		}
+
+		// Assign after save event handler
+
+		if (isset($config['event_after_save']))
+		{
+			$this->event_after_save = $config['event_after_save'];
+		}
+		else
+		{
+			$this->event_after_save = $this->configProvider->get(
+				$configKey . 'event_after_save',
+				$this->event_after_save
+			);
+		}
+
+		// Assign before delete event handler
+
+		if (isset($config['event_before_delete']))
+		{
+			$this->event_before_delete = $config['event_before_delete'];
+		}
+		else
+		{
+			$this->event_before_delete = $this->configProvider->get(
+				$configKey . 'event_before_delete',
+				$this->event_before_delete
+			);
+		}
+
+		// Assign before save event handler
+
+		if (isset($config['event_before_save']))
+		{
+			$this->event_before_save = $config['event_before_save'];
+		}
+		else
+		{
+			$this->event_before_save = $this->configProvider->get(
+				$configKey . 'event_before_save',
+				$this->event_before_save
+			);
+		}
+
+		// Assign state change event handler
+
+		if (isset($config['event_change_state']))
+		{
+			$this->event_change_state = $config['event_change_state'];
+		}
+		else
+		{
+			$this->event_change_state = $this->configProvider->get(
+				$configKey . 'event_change_state',
+				$this->event_change_state
+			);
+		}
+
+		// Assign cache clean event handler
+
+		if (isset($config['event_clean_cache']))
+		{
+			$this->event_clean_cache = $config['event_clean_cache'];
+		}
+		else
+		{
+			$this->event_clean_cache = $this->configProvider->get(
+				$configKey . 'event_clean_cache',
+				$this->event_clean_cache
+			);
+		}
+
+		// Apply model behaviors
+
+		if (isset($config['behaviors']))
+		{
+			$behaviors = (array) $config['behaviors'];
+		}
+		elseif ($behaviors = $this->configProvider->get($configKey . 'behaviors', null))
+		{
+			$behaviors = explode(',', $behaviors);
+		}
+		else
+		{
+			$behaviors = $this->default_behaviors;
+		}
+
+		if (is_array($behaviors) && count($behaviors))
+		{
+			foreach ($behaviors as $behavior)
+			{
+				$this->addBehavior($behavior);
+			}
+		}
+	}
+
+	/**
+	 * Sets the list of IDs from the request data
+	 *
+	 * @return FOFModel
+	 */
+	public function setIDsFromRequest()
+	{
+		// Get the ID or list of IDs from the request or the configuration
+		$cid = $this->input->get('cid', array(), 'array');
+		$id = $this->input->getInt('id', 0);
+		$kid = $this->input->getInt($this->getTable($this->table)->getKeyName(), 0);
+
+		if (is_array($cid) && !empty($cid))
+		{
+			$this->setIds($cid);
+		}
+		else
+		{
+			if (empty($id))
+			{
+				$this->setId($kid);
+			}
+			else
+			{
+				$this->setId($id);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the ID and resets internal data
+	 *
+	 * @param   integer $id The ID to use
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @return FOFModel
+	 */
+	public function setId($id = 0)
+	{
+		// If this is an array extract the first item
+		if (is_array($id))
+		{
+			FOFPlatform::getInstance()->logDeprecated('Passing arrays to FOFModel::setId is deprecated. Use setIds() instead.');
+			$id = array_shift($id);
+		}
+
+		// No string or no integer? What are you trying to do???
+		if (!is_string($id) && !is_numeric($id))
+		{
+			throw new InvalidArgumentException(sprintf('%s::setId()', get_class($this)));
+		}
+
+		$this->reset();
+		$this->id = (int) $id;
+		$this->id_list = array($this->id);
+
+		return $this;
+	}
+
+	/**
+	 * Returns the currently set ID
+	 *
+	 * @return  integer
+	 */
+	public function getId()
+	{
+		return $this->id;
+	}
+
+	/**
+	 * Sets a list of IDs for batch operations from an array and resets the model
+	 *
+	 * @param   array  $idlist  An array of item IDs to be set to the model's state
+	 *
+	 * @return  FOFModel
+	 */
+	public function setIds($idlist)
+	{
+		$this->reset();
+		$this->id_list = array();
+		$this->id = 0;
+
+		if (is_array($idlist) && !empty($idlist))
+		{
+			foreach ($idlist as $value)
+			{
+                // Protect vs fatal error (objects) and wrong behavior (nested array)
+                if(!is_object($value) && !is_array($value))
+                {
+                    $this->id_list[] = (int) $value;
+                }
+			}
+
+            if(count($this->id_list))
+            {
+                $this->id = $this->id_list[0];
+            }
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns the list of IDs for batch operations
+	 *
+	 * @return  array  An array of integers
+	 */
+	public function getIds()
+	{
+		return $this->id_list;
+	}
+
+	/**
+	 * Resets the model, like it was freshly loaded
+	 *
+	 * @return  FOFModel
+	 */
+	public function reset()
+	{
+		$this->id = 0;
+		$this->id_list = null;
+		$this->record = null;
+		$this->list = null;
+		$this->pagination = null;
+		$this->total = null;
+		$this->otable = null;
+
+		return $this;
+	}
+
+	/**
+	 * Clears the model state, but doesn't touch the internal lists of records,
+	 * record tables or record id variables. To clear these values, please use
+	 * reset().
+	 *
+	 * @return  FOFModel
+	 */
+	public function clearState()
+	{
+		$this->state = new FOFUtilsObject;
+
+		return $this;
+	}
+
+	/**
+	 * Clears the input array.
+	 *
+	 * @return  FOFModel
+	 */
+	public function clearInput()
+	{
+		$defSource = array();
+		$this->input = new FOFInput($defSource);
+
+		return $this;
+	}
+
+	/**
+	 * Set the internal input field
+	 *
+	 * @param $input
+	 *
+	 * @return FOFModel
+	 */
+	public function setInput($input)
+	{
+		if (!($input instanceof FOFInput))
+		{
+			if (!is_array($input))
+			{
+				$input = (array) $input;
+			}
+
+			$input = array_merge($_REQUEST, $input);
+			$input = new FOFInput($input);
+		}
+
+		$this->input = $input;
+
+		return $this;
+	}
+
+	/**
+	 * Resets the saved state for this view
+	 *
+	 * @return  FOFModel
+	 */
+	public function resetSavedState()
+	{
+		JFactory::getApplication()->setUserState(substr($this->getHash(), 0, -1), null);
+
+		return $this;
+	}
+
+	/**
+	 * Method to load a row for editing from the version history table.
+	 *
+	 * @param   integer    $version_id  Key to the version history table.
+	 * @param   FOFTable   &$table      Content table object being loaded.
+	 * @param   string     $alias       The type_alias in #__content_types
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   2.3
+	 */
+	public function loadhistory($version_id, FOFTable &$table, $alias)
+	{
+		// Only attempt to check the row in if it exists.
+		if ($version_id)
+		{
+			$user = JFactory::getUser();
+
+			// Get an instance of the row to checkout.
+			$historyTable = JTable::getInstance('Contenthistory');
+
+			if (!$historyTable->load($version_id))
+			{
+				$this->setError($historyTable->getError());
+
+				return false;
+			}
+
+			$rowArray = JArrayHelper::fromObject(json_decode($historyTable->version_data));
+
+			$typeId = JTable::getInstance('Contenttype')->getTypeId($alias);
+
+			if ($historyTable->ucm_type_id != $typeId)
+			{
+				$this->setError(JText::_('JLIB_APPLICATION_ERROR_HISTORY_ID_MISMATCH'));
+				$key = $table->getKeyName();
+
+				if (isset($rowArray[$key]))
+				{
+					$table->checkIn($rowArray[$key]);
+				}
+
+				return false;
+			}
+		}
+
+		$this->setState('save_date', $historyTable->save_date);
+		$this->setState('version_note', $historyTable->version_note);
+
+		return $table->bind($rowArray);
+	}
+
+	/**
+	 * Returns a single item. It uses the id set with setId, or the first ID in
+	 * the list of IDs for batch operations
+	 *
+	 * @param   integer  $id  Force a primary key ID to the model. Use null to use the id from the state.
+	 *
+	 * @return  FOFTable  A copy of the item's FOFTable array
+	 */
+	public function &getItem($id = null)
+	{
+		if (!is_null($id))
+		{
+			$this->record = null;
+			$this->setId($id);
+		}
+
+		if (empty($this->record))
+		{
+			$table = $this->getTable($this->table);
+			$table->load($this->id);
+			$this->record = $table;
+
+			// Do we have saved data?
+			$session = JFactory::getSession();
+			if ($this->_savestate)
+			{
+				$serialized = $session->get($this->getHash() . 'savedata', null);
+				if (!empty($serialized))
+				{
+					$data = @unserialize($serialized);
+
+					if ($data !== false)
+					{
+						$k = $table->getKeyName();
+
+						if (!array_key_exists($k, $data))
+						{
+							$data[$k] = null;
+						}
+
+						if ($data[$k] != $this->id)
+						{
+							$session->set($this->getHash() . 'savedata', null);
+						}
+						else
+						{
+							$this->record->bind($data);
+						}
+					}
+				}
+			}
+
+			$this->onAfterGetItem($this->record);
+		}
+
+		return $this->record;
+	}
+
+	/**
+	 * Alias for getItemList
+	 *
+	 * @param   boolean  $overrideLimits  Should I override set limits?
+	 * @param   string   $group           The group by clause
+	 * @codeCoverageIgnore
+     *
+	 * @return  array
+	 */
+	public function &getList($overrideLimits = false, $group = '')
+	{
+		return $this->getItemList($overrideLimits, $group);
+	}
+
+	/**
+	 * Returns a list of items
+	 *
+	 * @param   boolean  $overrideLimits  Should I override set limits?
+	 * @param   string   $group           The group by clause
+	 *
+	 * @return  array
+	 */
+	public function &getItemList($overrideLimits = false, $group = '')
+	{
+		if (empty($this->list))
+		{
+			$query = $this->buildQuery($overrideLimits);
+
+			if (!$overrideLimits)
+			{
+				$limitstart = $this->getState('limitstart');
+				$limit = $this->getState('limit');
+				$this->list = $this->_getList((string) $query, $limitstart, $limit, $group);
+			}
+			else
+			{
+				$this->list = $this->_getList((string) $query, 0, 0, $group);
+			}
+		}
+
+		return $this->list;
+	}
+
+	/**
+	 * Returns a FOFDatabaseIterator over a list of items.
+	 *
+	 * THERE BE DRAGONS. Unlike the getItemList() you have a few restrictions:
+	 * - The onProcessList event does not run when you get an iterator
+	 * - The Iterator returns FOFTable instances. By default, $this->table is used. If you have JOINs, GROUPs or a
+	 *   complex query in general you will need to create a custom FOFTable subclass and pass its type in $tableType.
+	 *
+	 * The getIterator() method is a great way to sift through a large amount of records which would otherwise not fit
+	 * in memory since it only keeps one record in PHP memory at a time. It works best with simple models, returning
+	 * all the contents of a single database table.
+	 *
+	 * @param   boolean  $overrideLimits  Should I ignore set limits?
+	 * @param   string   $tableClass      The table class for the iterator, e.g. FoobarTableBar. Leave empty to use
+	 *                                    the default Table class for this Model.
+	 *
+	 * @return  FOFDatabaseIterator
+	 */
+	public function &getIterator($overrideLimits = false, $tableClass = null)
+	{
+		// Get the table name (required by the Iterator)
+		if (empty($tableClass))
+		{
+			$name = $this->table;
+
+			if (empty($name))
+			{
+				$name = FOFInflector::singularize($this->getName());
+			}
+
+			$bareComponent = str_replace('com_', '', $this->option);
+			$prefix        = ucfirst($bareComponent) . 'Table';
+
+			$tableClass = $prefix . ucfirst($name);
+		}
+
+		// Get the query
+		$query = $this->buildQuery($overrideLimits);
+
+		// Apply limits
+		if ($overrideLimits)
+		{
+			$limitStart = 0;
+			$limit = 0;
+		}
+		else
+		{
+			$limitStart = $this->getState('limitstart');
+			$limit      = $this->getState('limit');
+		}
+
+		// This is required to prevent one relation from killing the db cursor used in a different relation...
+		$oldDb = $this->getDbo();
+		$oldDb->disconnect(); // YES, WE DO NEED TO DISCONNECT BEFORE WE CLONE THE DB OBJECT. ARGH!
+		$db = clone $oldDb;
+
+		// Execute the query, get a db cursor and return the iterator
+		$db->setQuery($query, $limitStart, $limit);
+
+		$cursor = $db->execute();
+
+		$iterator = FOFDatabaseIterator::getIterator($db->name, $cursor, null, $tableClass);
+
+		return $iterator;
+	}
+
+	/**
+	 * A cross-breed between getItem and getItemList. It runs the complete query,
+	 * like getItemList does. However, instead of returning an array of ad-hoc
+	 * objects, it binds the data from the first item fetched on the list to an
+	 * instance of the table object and returns that table object instead.
+	 *
+	 * @param   boolean  $overrideLimits  Should I override set limits?
+	 *
+	 * @return  FOFTable
+	 */
+	public function &getFirstItem($overrideLimits = false)
+	{
+		/**
+		 * We have to clone the instance, or when multiple getFirstItem calls occur,
+		 * we'll update EVERY instance created
+		 */
+		$table = clone $this->getTable($this->table);
+
+		$list = $this->getItemList($overrideLimits);
+
+		if (!empty($list))
+		{
+			$firstItem = array_shift($list);
+			$table->bind($firstItem);
+		}
+
+		unset($list);
+
+		return $table;
+	}
+
+	/**
+	 * Binds the data to the model and tries to save it
+	 *
+	 * @param   array|object  $data  The source data array or object
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function save($data)
+	{
+		$this->otable = null;
+
+		$table = $this->getTable($this->table);
+
+		if (is_object($data))
+		{
+			$data = clone($data);
+		}
+
+		$key = $table->getKeyName();
+
+		if (array_key_exists($key, (array) $data))
+		{
+			$aData = (array) $data;
+			$oid = $aData[$key];
+			$table->load($oid);
+		}
+
+		if ($data instanceof FOFTable)
+		{
+			$allData = $data->getData();
+		}
+		elseif (is_object($data))
+		{
+			$allData = (array) $data;
+		}
+		else
+		{
+			$allData = $data;
+		}
+
+		// Get the form if there is any
+		$form = $this->getForm($allData, false);
+
+		if ($form instanceof FOFForm)
+		{
+			// Make sure that $allData has for any field a key
+			$fieldset = $form->getFieldset();
+
+			foreach ($fieldset as $nfield => $fldset)
+			{
+				if (!array_key_exists($nfield, $allData))
+				{
+					$field = $form->getField($fldset->fieldname, $fldset->group);
+					$type  = strtolower($field->type);
+
+					switch ($type)
+					{
+						case 'checkbox':
+							$allData[$nfield] = 0;
+							break;
+
+						default:
+							$allData[$nfield] = '';
+							break;
+					}
+				}
+			}
+
+			$serverside_validate = strtolower($form->getAttribute('serverside_validate'));
+
+			$validateResult = true;
+			if (in_array($serverside_validate, array('true', 'yes', '1', 'on')))
+			{
+				$validateResult = $this->validateForm($form, $allData);
+			}
+
+			if ($validateResult === false)
+			{
+				if ($this->_savestate)
+				{
+					$session = JFactory::getSession();
+					$hash = $this->getHash() . 'savedata';
+					$session->set($hash, serialize($allData));
+				}
+
+				return false;
+			}
+		}
+
+		if (!$this->onBeforeSave($allData, $table))
+		{
+			if ($this->_savestate)
+			{
+				$session = JFactory::getSession();
+				$hash = $this->getHash() . 'savedata';
+				$session->set($hash, serialize($allData));
+			}
+
+			return false;
+		}
+		else
+		{
+			// If onBeforeSave successful, refetch the possibly modified data
+			if ($data instanceof FOFTable)
+			{
+				$data->bind($allData);
+			}
+			elseif (is_object($data))
+			{
+				$data = (object) $allData;
+			}
+			else
+			{
+				$data = $allData;
+			}
+		}
+
+		if (!$table->save($data))
+		{
+			foreach ($table->getErrors() as $error)
+			{
+				if (!empty($error))
+				{
+					$this->setError($error);
+					$session = JFactory::getSession();
+					$tableprops = $table->getProperties(true);
+
+					unset($tableprops['input']);
+					unset($tableprops['config']['input']);
+					unset($tableprops['config']['db']);
+					unset($tableprops['config']['dbo']);
+
+
+					if ($this->_savestate)
+					{
+						$hash = $this->getHash() . 'savedata';
+						$session->set($hash, serialize($tableprops));
+					}
+				}
+			}
+
+			return false;
+		}
+		else
+		{
+			$this->id = $table->$key;
+
+			// Remove the session data
+			if ($this->_savestate)
+			{
+				JFactory::getSession()->set($this->getHash() . 'savedata', null);
+			}
+		}
+
+		$this->onAfterSave($table);
+
+		$this->otable = $table;
+
+		return true;
+	}
+
+	/**
+	 * Copy one or more records
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function copy()
+	{
+		if (is_array($this->id_list) && !empty($this->id_list))
+		{
+			$table = $this->getTable($this->table);
+
+			if (!$this->onBeforeCopy($table))
+			{
+				return false;
+			}
+
+			if (!$table->copy($this->id_list))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+			else
+			{
+				// Call our internal event
+				$this->onAfterCopy($table);
+
+				// @todo Should we fire the content plugin?
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the table object after the last save() operation
+	 *
+	 * @return  FOFTable
+	 */
+	public function getSavedTable()
+	{
+		return $this->otable;
+	}
+
+	/**
+	 * Deletes one or several items
+	 *
+	 * @return  boolean True on success
+	 */
+	public function delete()
+	{
+		if (is_array($this->id_list) && !empty($this->id_list))
+		{
+			$table = $this->getTable($this->table);
+
+			foreach ($this->id_list as $id)
+			{
+				if (!$this->onBeforeDelete($id, $table))
+				{
+					continue;
+				}
+
+				if (!$table->delete($id))
+				{
+					$this->setError($table->getError());
+
+					return false;
+				}
+				else
+				{
+					$this->onAfterDelete($id);
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Toggles the published state of one or several items
+	 *
+	 * @param   integer  $publish  The publishing state to set (e.g. 0 is unpublished)
+	 * @param   integer  $user     The user ID performing this action
+	 *
+	 * @return  boolean True on success
+	 */
+	public function publish($publish = 1, $user = null)
+	{
+		if (is_array($this->id_list) && !empty($this->id_list))
+		{
+			if (empty($user))
+			{
+				$oUser = FOFPlatform::getInstance()->getUser();
+				$user = $oUser->id;
+			}
+
+			$table = $this->getTable($this->table);
+
+			if (!$this->onBeforePublish($table))
+			{
+				return false;
+			}
+
+			if (!$table->publish($this->id_list, $publish, $user))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+			else
+			{
+				// Call our internal event
+				$this->onAfterPublish($table);
+
+				// Call the plugin events
+				FOFPlatform::getInstance()->importPlugin('content');
+				$name = $this->name;
+				$context = $this->option . '.' . $name;
+
+                // @TODO should we do anything with this return value?
+				$result  = FOFPlatform::getInstance()->runPlugins($this->event_change_state, array($context, $this->id_list, $publish));
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks out the current item
+	 *
+	 * @return  boolean
+	 */
+	public function checkout()
+	{
+		$table  = $this->getTable($this->table);
+		$status = $table->checkout(FOFPlatform::getInstance()->getUser()->id, $this->id);
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Checks in the current item
+	 *
+	 * @return  boolean
+	 */
+	public function checkin()
+	{
+		$table  = $this->getTable($this->table);
+		$status = $table->checkin($this->id);
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Tells you if the current item is checked out or not
+	 *
+	 * @return  boolean
+	 */
+	public function isCheckedOut()
+	{
+		$table  = $this->getTable($this->table);
+		$status = $table->isCheckedOut($this->id);
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Increments the hit counter
+	 *
+	 * @return  boolean
+	 */
+	public function hit()
+	{
+		$table = $this->getTable($this->table);
+
+		if (!$this->onBeforeHit($table))
+		{
+			return false;
+		}
+
+		$status = $table->hit($this->id);
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+		else
+		{
+			$this->onAfterHit($table);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Moves the current item up or down in the ordering list
+	 *
+	 * @param   string  $dirn  The direction and magnitude to use (2 means move up by 2 positions, -3 means move down three positions)
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function move($dirn)
+	{
+		$table = $this->getTable($this->table);
+
+		$id = $this->getId();
+		$status = $table->load($id);
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+
+		if (!$status)
+		{
+			return false;
+		}
+
+		if (!$this->onBeforeMove($table))
+		{
+			return false;
+		}
+
+		$status = $table->move($dirn);
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+		else
+		{
+			$this->onAfterMove($table);
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Reorders all items in the table
+	 *
+	 * @return  boolean
+	 */
+	public function reorder()
+	{
+		$table = $this->getTable($this->table);
+
+		if (!$this->onBeforeReorder($table))
+		{
+			return false;
+		}
+
+		$status = $table->reorder($this->getReorderWhere());
+
+		if (!$status)
+		{
+			$this->setError($table->getError());
+		}
+		else
+		{
+			if (!$this->onAfterReorder($table))
+			{
+				return false;
+			}
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Get a pagination object
+	 *
+	 * @return  JPagination
+	 */
+	public function getPagination()
+	{
+		if (empty($this->pagination))
+		{
+			// Import the pagination library
+			JLoader::import('joomla.html.pagination');
+
+			// Prepare pagination values
+			$total = $this->getTotal();
+			$limitstart = $this->getState('limitstart');
+			$limit = $this->getState('limit');
+
+			// Create the pagination object
+			$this->pagination = new JPagination($total, $limitstart, $limit);
+		}
+
+		return $this->pagination;
+	}
+
+	/**
+	 * Get the number of all items
+	 *
+	 * @return  integer
+	 */
+	public function getTotal()
+	{
+		if (is_null($this->total))
+		{
+			$query = $this->buildCountQuery();
+
+			if ($query === false)
+			{
+				$subquery = $this->buildQuery(false);
+				$subquery->clear('order');
+				$query = $this->_db->getQuery(true)
+					->select('COUNT(*)')
+					->from("(" . (string) $subquery . ") AS a");
+			}
+
+			$this->_db->setQuery((string) $query);
+
+			$this->total = $this->_db->loadResult();
+		}
+
+		return $this->total;
+	}
+
+	/**
+	 * Returns a record count for the query
+	 *
+	 * @param   string  $query  The query.
+	 *
+	 * @return  integer  Number of rows for query
+	 *
+	 * @since   12.2
+	 */
+	protected function _getListCount($query)
+	{
+		return $this->getTotal();
+	}
+
+	/**
+	 * Get a filtered state variable
+	 *
+	 * @param   string  $key          The name of the state variable
+	 * @param   mixed   $default      The default value to use
+	 * @param   string  $filter_type  Filter type
+	 *
+	 * @return  mixed  The variable's value
+	 */
+	public function getState($key = null, $default = null, $filter_type = 'raw')
+	{
+		if (empty($key))
+		{
+			return $this->_real_getState();
+		}
+
+		// Get the savestate status
+		$value = $this->_real_getState($key);
+
+		if (is_null($value))
+		{
+			$value = $this->getUserStateFromRequest($this->getHash() . $key, $key, $value, 'none', $this->_savestate);
+
+			if (is_null($value))
+			{
+				return $default;
+			}
+		}
+
+		if (strtoupper($filter_type) == 'RAW')
+		{
+			return $value;
+		}
+		else
+		{
+			JLoader::import('joomla.filter.filterinput');
+			$filter = new JFilterInput;
+
+			return $filter->clean($value, $filter_type);
+		}
+	}
+
+	/**
+	 * Method to get model state variables
+	 *
+	 * @param   string  $property  Optional parameter name
+	 * @param   mixed   $default   Optional default value
+	 *
+	 * @return  object  The property where specified, the state object where omitted
+	 *
+	 * @since   12.2
+	 */
+	protected function _real_getState($property = null, $default = null)
+	{
+		if (!$this->__state_set)
+		{
+			// Protected method to auto-populate the model state.
+			$this->populateState();
+
+			// Set the model state set flag to true.
+			$this->__state_set = true;
+		}
+
+		return $property === null ? $this->state : $this->state->get($property, $default);
+	}
+
+	/**
+	 * Returns a hash for this component and view, e.g. "foobar.items.", used
+	 * for determining the keys of the variables which will be placed in the
+	 * session storage.
+	 *
+	 * @return  string  The hash
+	 */
+	public function getHash()
+	{
+		$option = $this->input->getCmd('option', 'com_foobar');
+		$view = FOFInflector::pluralize($this->input->getCmd('view', 'cpanel'));
+
+		return "$option.$view.";
+	}
+
+	/**
+	 * Gets the value of a user state variable.
+	 *
+	 * @param   string   $key           The key of the user state variable.
+	 * @param   string   $request       The name of the variable passed in a request.
+	 * @param   string   $default       The default value for the variable if not found. Optional.
+	 * @param   string   $type          Filter for the variable, for valid values see {@link JFilterInput::clean()}. Optional.
+	 * @param   boolean  $setUserState  Should I save the variable in the user state? Default: true. Optional.
+	 *
+	 * @return  string   The request user state.
+	 */
+	protected function getUserStateFromRequest($key, $request, $default = null, $type = 'none', $setUserState = true)
+	{
+		return FOFPlatform::getInstance()->getUserStateFromRequest($key, $request, $this->input, $default, $type, $setUserState);
+	}
+
+	/**
+	 * Returns an object list
+	 *
+	 * @param   string   $query       The query
+	 * @param   integer  $limitstart  Offset from start
+	 * @param   integer  $limit       The number of records
+	 * @param   string   $group       The group by clause
+	 *
+	 * @return  array  Array of objects
+	 */
+	protected function &_getList($query, $limitstart = 0, $limit = 0, $group = '')
+	{
+		$this->_db->setQuery($query, $limitstart, $limit);
+		$result = $this->_db->loadObjectList($group);
+
+		$this->onProcessList($result);
+
+		return $result;
+	}
+
+    /**
+     * Method to get a table object, load it if necessary.
+     *
+     * @param   string  $name The table name. Optional.
+     * @param   string  $prefix The class prefix. Optional.
+     * @param   array   $options Configuration array for model. Optional.
+     *
+     * @throws Exception
+     *
+     * @return  FOFTable  A FOFTable object
+     */
+	public function getTable($name = '', $prefix = null, $options = array())
+	{
+		if (empty($name))
+		{
+			$name = $this->table;
+
+			if (empty($name))
+			{
+				$name = FOFInflector::singularize($this->getName());
+			}
+		}
+
+		if (empty($prefix))
+		{
+			$bareComponent = str_replace('com_', '', $this->option);
+			$prefix        = ucfirst($bareComponent) . 'Table';
+		}
+
+		if (empty($options))
+		{
+			$options = array('input' => $this->input);
+		}
+
+		if ($table = $this->_createTable($name, $prefix, $options))
+		{
+			return $table;
+		}
+
+        FOFPlatform::getInstance()->raiseError(0, JText::sprintf('JLIB_APPLICATION_ERROR_TABLE_NAME_NOT_SUPPORTED', $name));
+
+		return null;
+	}
+
+	/**
+	 * Method to load and return a model object.
+	 *
+	 * @param   string  $name    The name of the view
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The configuration array to pass to the table
+	 *
+	 * @return  FOFTable  Table object or boolean false if failed
+	 */
+	protected function &_createTable($name, $prefix = 'Table', $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$result = null;
+
+		// Clean the model name
+		$name   = preg_replace('/[^A-Z0-9_]/i', '', $name);
+		$prefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
+
+		// Make sure we are returning a DBO object
+		if (!array_key_exists('dbo', $config))
+		{
+			$config['dbo'] = $this->getDBO();
+		}
+
+		$instance = FOFTable::getAnInstance($name, $prefix, $config);
+
+		return $instance;
+	}
+
+	/**
+	 * Creates the WHERE part of the reorder query
+	 *
+	 * @return  string
+	 */
+	public function getReorderWhere()
+	{
+		return '';
+	}
+
+	/**
+	 * Builds the SELECT query
+	 *
+	 * @param   boolean  $overrideLimits  Are we requested to override the set limits?
+	 *
+	 * @return  FOFDatabaseQuery
+	 */
+	public function buildQuery($overrideLimits = false)
+	{
+		$table = $this->getTable();
+		$tableName = $table->getTableName();
+		$tableKey = $table->getKeyName();
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true);
+
+		// Call the behaviors
+		$this->modelDispatcher->trigger('onBeforeBuildQuery', array(&$this, &$query));
+
+		$alias = $this->getTableAlias();
+
+		if ($alias)
+		{
+			$alias = ' AS ' . $db->qn($alias);
+		}
+		else
+		{
+			$alias = '';
+		}
+
+		$select = $this->getTableAlias() ? $db->qn($this->getTableAlias()) . '.*' : $db->qn($tableName) . '.*';
+
+		$query->select($select)->from($db->qn($tableName) . $alias);
+
+		if (!$overrideLimits)
+		{
+			$order = $this->getState('filter_order', null, 'cmd');
+
+			if (!in_array($order, array_keys($table->getData())))
+			{
+				$order = $tableKey;
+			}
+
+			$order = $db->qn($order);
+
+			if ($alias)
+			{
+				$order = $db->qn($this->getTableAlias()) . '.' . $order;
+			}
+
+			$dir = strtoupper($this->getState('filter_order_Dir', 'ASC', 'cmd'));
+			$dir = in_array($dir, array('DESC', 'ASC')) ? $dir : 'ASC';
+
+			// If the table cache is broken you may end up with an empty order by.
+			if (!empty($order) && ($order != $db->qn('')))
+			{
+				$query->order($order . ' ' . $dir);
+			}
+		}
+
+		// Call the behaviors
+		$this->modelDispatcher->trigger('onAfterBuildQuery', array(&$this, &$query));
+
+		return $query;
+	}
+
+	/**
+	 * Returns a list of the fields of the table associated with this model
+	 *
+	 * @return  array
+	 */
+	public function getTableFields()
+	{
+		$tableName = $this->getTable()->getTableName();
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$fields = $this->getDbo()->getTableColumns($tableName, true);
+		}
+		else
+		{
+			$fieldsArray = $this->getDbo()->getTableFields($tableName, true);
+			$fields = array_shift($fieldsArray);
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Get the alias set for this model's table
+	 *
+	 * @return  string 	The table alias
+	 */
+	public function getTableAlias()
+	{
+		return $this->getTable($this->table)->getTableAlias();
+	}
+
+	/**
+	 * Builds the count query used in getTotal()
+	 *
+	 * @return  boolean
+	 */
+	public function buildCountQuery()
+	{
+		return false;
+	}
+
+	/**
+	 * Clones the model object and returns the clone
+	 *
+	 * @return  FOFModel
+	 */
+	public function &getClone()
+	{
+		$clone = clone($this);
+
+		return $clone;
+	}
+
+	/**
+	 * Magic getter; allows to use the name of model state keys as properties
+	 *
+	 * @param   string  $name  The name of the variable to get
+	 *
+	 * @return  mixed  The value of the variable
+	 */
+	public function __get($name)
+	{
+		return $this->getState($name);
+	}
+
+	/**
+	 * Magic setter; allows to use the name of model state keys as properties
+	 *
+	 * @param   string  $name   The name of the variable
+	 * @param   mixed   $value  The value to set the variable to
+	 *
+	 * @return  void
+	 */
+	public function __set($name, $value)
+	{
+		return $this->setState($name, $value);
+	}
+
+	/**
+	 * Magic caller; allows to use the name of model state keys as methods to
+	 * set their values.
+	 *
+	 * @param   string  $name       The name of the state variable to set
+	 * @param   mixed   $arguments  The value to set the state variable to
+	 *
+	 * @return  FOFModel  Reference to self
+	 */
+	public function __call($name, $arguments)
+	{
+		$arg1 = array_shift($arguments);
+		$this->setState($name, $arg1);
+
+		return $this;
+	}
+
+	/**
+	 * Sets the model state auto-save status. By default the model is set up to
+	 * save its state to the session.
+	 *
+	 * @param   boolean  $newState  True to save the state, false to not save it.
+	 *
+	 * @return  FOFModel  Reference to self
+	 */
+	public function &savestate($newState)
+	{
+		$this->_savestate = $newState ? true : false;
+
+		return $this;
+	}
+
+	/**
+	 * Initialises the _savestate variable
+	 *
+	 * @param   integer  $defaultSaveState  The default value for the savestate
+	 *
+	 * @return  void
+	 */
+	public function populateSavestate($defaultSaveState = -999)
+	{
+		if (is_null($this->_savestate))
+		{
+			$savestate = $this->input->getInt('savestate', $defaultSaveState);
+
+			if ($savestate == -999)
+			{
+				$savestate = true;
+			}
+
+			$this->savestate($savestate);
+		}
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * @return  void
+	 *
+	 * @note    Calling getState in this method will result in recursion.
+	 * @since   12.2
+	 */
+	protected function populateState()
+	{
+	}
+
+	/**
+	 * Applies view access level filtering for the specified user. Useful to
+	 * filter a front-end items listing.
+	 *
+	 * @param   integer  $userID  The user ID to use. Skip it to use the currently logged in user.
+	 *
+	 * @return  FOFModel  Reference to self
+	 */
+	public function applyAccessFiltering($userID = null)
+	{
+		$user = FOFPlatform::getInstance()->getUser($userID);
+
+		$table = $this->getTable();
+		$accessField = $table->getColumnAlias('access');
+
+		$this->setState($accessField, $user->getAuthorisedViewLevels());
+
+		return $this;
+	}
+
+	/**
+	 * A method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 * @param   boolean  $source    The name of the form. If not set we'll try the form_name state variable or fall back to default.
+	 *
+	 * @return  mixed  A FOFForm object on success, false on failure
+	 *
+	 * @since   2.0
+	 */
+	public function getForm($data = array(), $loadData = true, $source = null)
+	{
+		$this->_formData = $data;
+
+		if (empty($source))
+		{
+			$source = $this->getState('form_name', null);
+		}
+
+		if (empty($source))
+		{
+			$source = 'form.' . $this->name;
+		}
+
+		$name = $this->input->getCmd('option', 'com_foobar') . '.' . $this->name . '.' . $source;
+
+		$options = array(
+			'control'	 => false,
+			'load_data'	 => $loadData,
+		);
+
+		$this->onBeforeLoadForm($name, $source, $options);
+
+		$form = $this->loadForm($name, $source, $options);
+
+		if ($form instanceof FOFForm)
+		{
+			$this->onAfterLoadForm($form, $name, $source, $options);
+		}
+
+		return $form;
+	}
+
+    /**
+     * Method to get a form object.
+     *
+     * @param   string          $name       The name of the form.
+     * @param   string          $source     The form filename (e.g. form.browse)
+     * @param   array           $options    Optional array of options for the form creation.
+     * @param   boolean         $clear      Optional argument to force load a new form.
+     * @param   bool|string     $xpath      An optional xpath to search for the fields.
+     *
+     * @return  mixed  FOFForm object on success, False on error.
+	 *
+	 * @throws  Exception
+     *
+     * @see     FOFForm
+     * @since   2.0
+     */
+	protected function loadForm($name, $source, $options = array(), $clear = false, $xpath = false)
+	{
+		// Handle the optional arguments.
+		$options['control'] = isset($options['control']) ? $options['control'] : false;
+
+		// Create a signature hash.
+		$hash = md5($source . serialize($options));
+
+		// Check if we can use a previously loaded form.
+		if (isset($this->_forms[$hash]) && !$clear)
+		{
+			return $this->_forms[$hash];
+		}
+
+		// Try to find the name and path of the form to load
+		$formFilename = $this->findFormFilename($source);
+
+		// No form found? Quit!
+		if ($formFilename === false)
+		{
+			return false;
+		}
+
+		// Set up the form name and path
+		$source = basename($formFilename, '.xml');
+		FOFForm::addFormPath(dirname($formFilename));
+
+		// Set up field paths
+		$option         = $this->input->getCmd('option', 'com_foobar');
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($option);
+		$view           = $this->name;
+		$file_root      = $componentPaths['main'];
+		$alt_file_root  = $componentPaths['alt'];
+
+		FOFForm::addFieldPath($file_root . '/fields');
+		FOFForm::addFieldPath($file_root . '/models/fields');
+		FOFForm::addFieldPath($alt_file_root . '/fields');
+		FOFForm::addFieldPath($alt_file_root . '/models/fields');
+
+		FOFForm::addHeaderPath($file_root . '/fields/header');
+		FOFForm::addHeaderPath($file_root . '/models/fields/header');
+		FOFForm::addHeaderPath($alt_file_root . '/fields/header');
+		FOFForm::addHeaderPath($alt_file_root . '/models/fields/header');
+
+		// Get the form.
+		try
+		{
+			$form = FOFForm::getInstance($name, $source, $options, false, $xpath);
+
+			if (isset($options['load_data']) && $options['load_data'])
+			{
+				// Get the data for the form.
+				$data = $this->loadFormData();
+			}
+			else
+			{
+				$data = array();
+			}
+
+			// Allows data and form manipulation before preprocessing the form
+			$this->onBeforePreprocessForm($form, $data);
+
+			// Allow for additional modification of the form, and events to be triggered.
+			// We pass the data because plugins may require it.
+			$this->preprocessForm($form, $data);
+
+			// Allows data and form manipulation After preprocessing the form
+			$this->onAfterPreprocessForm($form, $data);
+
+			// Load the data into the form after the plugins have operated.
+			$form->bind($data);
+		}
+		catch (Exception $e)
+		{
+            // The above try-catch statement will catch EVERYTHING, even PhpUnit exceptions while testing
+            if(stripos(get_class($e), 'phpunit') !== false)
+            {
+                throw $e;
+            }
+            else
+            {
+                $this->setError($e->getMessage());
+
+                return false;
+            }
+		}
+
+		// Store the form for later.
+		$this->_forms[$hash] = $form;
+
+		return $form;
+	}
+
+	/**
+	 * Guesses the best candidate for the path to use for a particular form.
+	 *
+	 * @param   string  $source  The name of the form file to load, without the .xml extension.
+	 * @param   array   $paths   The paths to look into. You can declare this to override the default FOF paths.
+	 *
+	 * @return  mixed  A string if the path and filename of the form to load is found, false otherwise.
+	 *
+	 * @since   2.0
+	 */
+	public function findFormFilename($source, $paths = array())
+	{
+        // TODO Should we read from internal variables instead of the input? With a temp instance we have no input
+		$option = $this->input->getCmd('option', 'com_foobar');
+		$view 	= $this->name;
+
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($option);
+		$file_root      = $componentPaths['main'];
+		$alt_file_root  = $componentPaths['alt'];
+		$template_root  = FOFPlatform::getInstance()->getTemplateOverridePath($option);
+
+		if (empty($paths))
+		{
+			// Set up the paths to look into
+            // PLEASE NOTE: If you ever change this, please update Model Unit tests, too, since we have to
+            // copy these default folders (we have to add the protocol for the virtual filesystem)
+			$paths = array(
+				// In the template override
+				$template_root . '/' . $view,
+				$template_root . '/' . FOFInflector::singularize($view),
+				$template_root . '/' . FOFInflector::pluralize($view),
+				// In this side of the component
+				$file_root . '/views/' . $view . '/tmpl',
+				$file_root . '/views/' . FOFInflector::singularize($view) . '/tmpl',
+				$file_root . '/views/' . FOFInflector::pluralize($view) . '/tmpl',
+				// In the other side of the component
+				$alt_file_root . '/views/' . $view . '/tmpl',
+				$alt_file_root . '/views/' . FOFInflector::singularize($view) . '/tmpl',
+				$alt_file_root . '/views/' . FOFInflector::pluralize($view) . '/tmpl',
+				// In the models/forms of this side
+				$file_root . '/models/forms',
+				// In the models/forms of the other side
+				$alt_file_root . '/models/forms',
+			);
+		}
+
+        $paths = array_unique($paths);
+
+		// Set up the suffixes to look into
+		$suffixes = array();
+		$temp_suffixes = FOFPlatform::getInstance()->getTemplateSuffixes();
+
+		if (!empty($temp_suffixes))
+		{
+			foreach ($temp_suffixes as $suffix)
+			{
+				$suffixes[] = $suffix . '.xml';
+			}
+		}
+
+		$suffixes[] = '.xml';
+
+		// Look for all suffixes in all paths
+		$result     = false;
+        $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		foreach ($paths as $path)
+		{
+			foreach ($suffixes as $suffix)
+			{
+				$filename = $path . '/' . $source . $suffix;
+
+				if ($filesystem->fileExists($filename))
+				{
+					$result = $filename;
+					break;
+				}
+			}
+
+			if ($result)
+			{
+				break;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array    The default data is an empty array.
+	 *
+	 * @since   2.0
+	 */
+	protected function loadFormData()
+	{
+		if (empty($this->_formData))
+		{
+			return array();
+		}
+		else
+		{
+			return $this->_formData;
+		}
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   FOFForm  $form   A FOFForm object.
+	 * @param   mixed    &$data  The data expected for the form.
+	 * @param   string   $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @see     FOFFormField
+	 * @since   2.0
+	 * @throws  Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(FOFForm &$form, &$data, $group = 'content')
+	{
+		// Import the appropriate plugin group.
+		FOFPlatform::getInstance()->importPlugin($group);
+
+		// Trigger the form preparation event.
+		$results = FOFPlatform::getInstance()->runPlugins('onContentPrepareForm', array($form, $data));
+
+		// Check for errors encountered while preparing the form.
+		if (count($results) && in_array(false, $results, true))
+		{
+			// Get the last error.
+			$dispatcher = FOFUtilsObservableDispatcher::getInstance();
+			$error = $dispatcher->getError();
+
+			if (!($error instanceof Exception))
+			{
+				throw new Exception($error);
+			}
+		}
+	}
+
+	/**
+	 * Method to validate the form data.
+	 *
+	 * @param   FOFForm  $form   The form to validate against.
+	 * @param   array    $data   The data to validate.
+	 * @param   string   $group  The name of the field group to validate.
+	 *
+	 * @return  mixed   Array of filtered data if valid, false otherwise.
+	 *
+	 * @see     JFormRule
+	 * @see     JFilterInput
+	 * @since   2.0
+	 */
+	public function validateForm($form, $data, $group = null)
+	{
+		// Filter and validate the form data.
+		$data   = $form->filter($data);
+		$return = $form->validate($data, $group);
+
+		// Check for an error.
+		if ($return instanceof Exception)
+		{
+			$this->setError($return->getMessage());
+
+			return false;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $message)
+			{
+				if ($message instanceof Exception)
+				{
+					$this->setError($message->getMessage());
+				}
+				else
+				{
+					$this->setError($message);
+				}
+			}
+
+			return false;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Allows the manipulation before the form is loaded
+	 *
+	 * @param   string  &$name     The name of the form.
+	 * @param   string  &$source   The form source. Can be XML string if file flag is set to false.
+	 * @param   array   &$options  Optional array of options for the form creation.
+	 * @codeCoverageIgnore
+     *
+	 * @return  void
+	 */
+	public function onBeforeLoadForm(&$name, &$source, &$options)
+	{
+	}
+
+	/**
+	 * Allows the manipulation after the form is loaded
+	 *
+	 * @param   FOFForm  $form      A FOFForm object.
+	 * @param   string   &$name     The name of the form.
+	 * @param   string   &$source   The form source. Can be XML string if file flag is set to false.
+	 * @param   array    &$options  Optional array of options for the form creation.
+	 * @codeCoverageIgnore
+     *
+	 * @return  void
+	 */
+	public function onAfterLoadForm(FOFForm &$form, &$name, &$source, &$options)
+	{
+	}
+
+	/**
+	 * Allows data and form manipulation before preprocessing the form
+	 *
+	 * @param   FOFForm  $form    A FOFForm object.
+	 * @param   array    &$data   The data expected for the form.
+	 * @codeCoverageIgnore
+     *
+	 * @return  void
+	 */
+	public function onBeforePreprocessForm(FOFForm &$form, &$data)
+	{
+	}
+
+	/**
+	 * Allows data and form manipulation after preprocessing the form
+	 *
+	 * @param   FOFForm  $form    A FOFForm object.
+	 * @param   array    &$data   The data expected for the form.
+	 * @codeCoverageIgnore
+     *
+	 * @return  void
+	 */
+	public function onAfterPreprocessForm(FOFForm &$form, &$data)
+	{
+	}
+
+	/**
+	 * This method can be overriden to automatically do something with the
+	 * list results array. You are supposed to modify the list which was passed
+	 * in the parameters; DO NOT return a new array!
+	 *
+	 * @param   array  &$resultArray  An array of objects, each row representing a record
+	 *
+	 * @return  void
+	 */
+	protected function onProcessList(&$resultArray)
+	{
+	}
+
+	/**
+	 * This method runs after an item has been gotten from the database in a read
+	 * operation. You can modify it before it's returned to the MVC triad for
+	 * further processing.
+	 *
+	 * @param   FOFTable  &$record  The table instance we fetched
+	 *
+	 * @return  void
+	 */
+	protected function onAfterGetItem(&$record)
+	{
+		try
+		{
+			// Call the behaviors
+			$result = $this->modelDispatcher->trigger('onAfterGetItem', array(&$this, &$record));
+		}
+		catch (Exception $e)
+		{
+			// Oops, an exception occured!
+			$this->setError($e->getMessage());
+		}
+	}
+
+	/**
+	 * This method runs before the $data is saved to the $table. Return false to
+	 * stop saving.
+	 *
+	 * @param   array     &$data   The data to save
+	 * @param   FOFTable  &$table  The table to save the data to
+	 *
+	 * @return  boolean  Return false to prevent saving, true to allow it
+	 */
+	protected function onBeforeSave(&$data, &$table)
+	{
+		// Let's import the plugin only if we're not in CLI (content plugin needs a user)
+		FOFPlatform::getInstance()->importPlugin('content');
+
+		try
+		{
+			// Do I have a new record?
+			$key = $table->getKeyName();
+
+			$pk = (!empty($data[$key])) ? $data[$key] : 0;
+
+			$this->_isNewRecord = $pk <= 0;
+
+			// Bind the data
+			$table->bind($data);
+
+			// Call the behaviors
+			$result = $this->modelDispatcher->trigger('onBeforeSave', array(&$this, &$data));
+
+			if (in_array(false, $result, true))
+			{
+				// Behavior failed, return false
+				return false;
+			}
+
+			// Call the plugin
+			$name = $this->name;
+			$result = FOFPlatform::getInstance()->runPlugins($this->event_before_save, array($this->option . '.' . $name, &$table, $this->_isNewRecord));
+
+			if (in_array(false, $result, true))
+			{
+				// Plugin failed, return false
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+		catch (Exception $e)
+		{
+			// Oops, an exception occured!
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs after the data is saved to the $table.
+	 *
+	 * @param   FOFTable  &$table  The table which was saved
+	 *
+	 * @return  boolean
+	 */
+	protected function onAfterSave(&$table)
+	{
+		// Let's import the plugin only if we're not in CLI (content plugin needs a user)
+
+		FOFPlatform::getInstance()->importPlugin('content');
+
+		try
+		{
+			// Call the behaviors
+			$result = $this->modelDispatcher->trigger('onAfterSave', array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				// Behavior failed, return false
+				return false;
+			}
+
+			$name = $this->name;
+			FOFPlatform::getInstance()->runPlugins($this->event_after_save, array($this->option . '.' . $name, &$table, $this->_isNewRecord));
+
+			return true;
+		}
+		catch (Exception $e)
+		{
+			// Oops, an exception occured!
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+	}
+
+	/**
+	 * This method runs before the record with key value of $id is deleted from $table
+	 *
+	 * @param   integer   &$id     The ID of the record being deleted
+	 * @param   FOFTable  &$table  The table instance used to delete the record
+	 *
+	 * @return  boolean
+	 */
+	protected function onBeforeDelete(&$id, &$table)
+	{
+		// Let's import the plugin only if we're not in CLI (content plugin needs a user)
+
+		FOFPlatform::getInstance()->importPlugin('content');
+
+		try
+		{
+			$table->load($id);
+
+			// Call the behaviors
+			$result = $this->modelDispatcher->trigger('onBeforeDelete', array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				// Behavior failed, return false
+				return false;
+			}
+
+			$name = $this->name;
+			$context = $this->option . '.' . $name;
+			$result = FOFPlatform::getInstance()->runPlugins($this->event_before_delete, array($context, $table));
+
+			if (in_array(false, $result, true))
+			{
+				// Plugin failed, return false
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			$this->_recordForDeletion = clone $table;
+		}
+		catch (Exception $e)
+		{
+			// Oops, an exception occured!
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * This method runs after a record with key value $id is deleted
+	 *
+	 * @param   integer  $id  The id of the record which was deleted
+	 *
+	 * @return  boolean  Return false to raise an error, true otherwise
+	 */
+	protected function onAfterDelete($id)
+	{
+		FOFPlatform::getInstance()->importPlugin('content');
+
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onAfterDelete', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		try
+		{
+			$name = $this->name;
+			$context = $this->option . '.' . $name;
+			$result = FOFPlatform::getInstance()->runPlugins($this->event_after_delete, array($context, $this->_recordForDeletion));
+			unset($this->_recordForDeletion);
+		}
+		catch (Exception $e)
+		{
+			// Oops, an exception occured!
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+	}
+
+	/**
+	 * This method runs before a record is copied
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record being copied
+	 *
+	 * @return  boolean  True to allow the copy
+	 */
+	protected function onBeforeCopy(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onBeforeCopy', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs after a record has been copied
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record which was copied
+	 *
+	 * @return  boolean  True to allow the copy
+	 */
+	protected function onAfterCopy(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onAfterCopy', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs before a record is published
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record being published
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onBeforePublish(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onBeforePublish', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs after a record has been published
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record which was published
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onAfterPublish(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onAfterPublish', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs before a record is hit
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record being hit
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onBeforeHit(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onBeforeHit', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs after a record has been hit
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record which was hit
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onAfterHit(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onAfterHit', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs before a record is moved
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record being moved
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onBeforeMove(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onBeforeMove', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs after a record has been moved
+	 *
+	 * @param   FOFTable  &$table  The table instance of the record which was moved
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onAfterMove(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onAfterMove', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs before a table is reordered
+	 *
+	 * @param   FOFTable  &$table  The table instance being reordered
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onBeforeReorder(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onBeforeReorder', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method runs after a table is reordered
+	 *
+	 * @param   FOFTable  &$table  The table instance which was reordered
+	 *
+	 * @return  boolean  True to allow the operation
+	 */
+	protected function onAfterReorder(&$table)
+	{
+		// Call the behaviors
+		$result = $this->modelDispatcher->trigger('onAfterReorder', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the database driver object
+	 *
+	 * @return  FOFDatabaseDriver
+	 */
+	public function getDbo()
+	{
+		return $this->_db;
+	}
+
+	/**
+	 * Method to get the model name
+	 *
+	 * The model name. By default parsed using the classname or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the model
+	 *
+	 * @throws  Exception
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$r = null;
+
+			if (!preg_match('/Model(.*)/i', get_class($this), $r))
+			{
+				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_MODEL_GET_NAME'), 500);
+			}
+
+			$this->name = strtolower($r[1]);
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Method to set the database driver object
+	 *
+	 * @param   FOFDatabaseDriver  $db  A FOFDatabaseDriver based object
+	 *
+	 * @return  void
+	 */
+	public function setDbo($db)
+	{
+		$this->_db = $db;
+	}
+
+	/**
+	 * Method to set model state variables
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value of the property to set or null.
+	 *
+	 * @return  mixed  The previous value of the property or null if not set.
+	 */
+	public function setState($property, $value = null)
+	{
+		return $this->state->set($property, $value);
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		$conf         = JFactory::getConfig();
+        $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+
+		$options = array(
+			'defaultgroup' => ($group) ? $group : (isset($this->option) ? $this->option : JFactory::getApplication()->input->get('option')),
+			'cachebase'    => ($client_id) ? $platformDirs['admin'] . '/cache' : $conf->get('cache_path', $platformDirs['public'] . '/cache'));
+
+		$cache = JCache::getInstance('callback', $options);
+		$cache->clean();
+
+		// Trigger the onContentCleanCache event.
+		FOFPlatform::getInstance()->runPlugins($this->event_clean_cache, $options);
+	}
+
+	/**
+	 * Set a behavior param
+	 *
+	 * @param   string  $name     The name of the param
+	 * @param   mixed   $value    The param value to set
+	 *
+	 * @return  FOFModel
+	 */
+	public function setBehaviorParam($name, $value)
+	{
+		$this->_behaviorParams[$name] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Get a behavior param
+	 *
+	 * @param   string  $name     The name of the param
+	 * @param   mixed   $default  The default value returned if not set
+	 *
+	 * @return  mixed
+	 */
+	public function getBehaviorParam($name, $default = null)
+	{
+		return isset($this->_behaviorParams[$name]) ? $this->_behaviorParams[$name] : $default;
+	}
+
+	/**
+	 * Set or get the backlisted filters
+	 *
+	 * @param   mixed    $list    A filter or list of filters to backlist. If null return the list of backlisted filter
+	 * @param   boolean  $reset   Reset the blacklist if true
+	 *
+	 * @return  void|array  Return an array of value if $list is null
+	 */
+	public function blacklistFilters($list = null, $reset = false)
+	{
+		if (!isset($list))
+		{
+			return $this->getBehaviorParam('blacklistFilters', array());
+		}
+
+		if (is_string($list))
+		{
+			$list = (array) $list;
+		}
+
+		if (!$reset)
+		{
+			$list = array_unique(array_merge($this->getBehaviorParam('blacklistFilters', array()), $list));
+		}
+
+		$this->setBehaviorParam('blacklistFilters', $list);
+	}
+}
diff --git a/core/libraries/fof/platform/filesystem/filesystem.php b/core/libraries/fof/platform/filesystem/filesystem.php
new file mode 100644
index 00000000..a1cbd0f2
--- /dev/null
+++ b/core/libraries/fof/platform/filesystem/filesystem.php
@@ -0,0 +1,134 @@
+<?php
+/**
+* @package     FrameworkOnFramework
+* @subpackage  platform
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+* @license     GNU General Public License version 2 or later; see LICENSE.txt
+*/
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+abstract class FOFPlatformFilesystem implements FOFPlatformFilesystemInterface
+{
+    /**
+     * The list of paths where platform class files will be looked for
+     *
+     * @var  array
+     */
+    protected static $paths = array();
+
+    /**
+     * This method will crawl a starting directory and get all the valid files that will be analyzed by getInstance.
+     * Then it organizes them into an associative array.
+     *
+     * @param   string  $path               Folder where we should start looking
+     * @param   array   $ignoreFolders      Folder ignore list
+     * @param   array   $ignoreFiles        File ignore list
+     *
+     * @return  array   Associative array, where the `fullpath` key contains the path to the file,
+     *                  and the `classname` key contains the name of the class
+     */
+    protected static function getFiles($path, array $ignoreFolders = array(), array $ignoreFiles = array())
+    {
+        $return = array();
+
+        $files  = self::scanDirectory($path, $ignoreFolders, $ignoreFiles);
+
+        // Ok, I got the files, now I have to organize them
+        foreach($files as $file)
+        {
+            $clean = str_replace($path, '', $file);
+            $clean = trim(str_replace('\\', '/', $clean), '/');
+
+            $parts = explode('/', $clean);
+
+            // If I have less than 3 fragments, it means that the file was inside the generic folder
+            // (interface + abstract) so I have to skip it
+            if(count($parts) < 3)
+            {
+                continue;
+            }
+
+            $return[] = array(
+                'fullpath'  => $file,
+                'classname' => 'FOFPlatform'.ucfirst($parts[0]).ucfirst(basename($parts[1], '.php'))
+            );
+        }
+
+        return $return;
+    }
+
+    /**
+     * Recursive function that will scan every directory unless it's in the ignore list. Files that aren't in the
+     * ignore list are returned.
+     *
+     * @param   string  $path               Folder where we should start looking
+     * @param   array   $ignoreFolders      Folder ignore list
+     * @param   array   $ignoreFiles        File ignore list
+     *
+     * @return  array   List of all the files
+     */
+    protected static function scanDirectory($path, array $ignoreFolders = array(), array $ignoreFiles = array())
+    {
+        $return = array();
+
+        $handle = @opendir($path);
+
+        if(!$handle)
+        {
+            return $return;
+        }
+
+        while (($file = readdir($handle)) !== false)
+        {
+            if($file == '.' || $file == '..')
+            {
+                continue;
+            }
+
+            $fullpath = $path . '/' . $file;
+
+            if((is_dir($fullpath) && in_array($file, $ignoreFolders)) || (is_file($fullpath) && in_array($file, $ignoreFiles)))
+            {
+                continue;
+            }
+
+            if(is_dir($fullpath))
+            {
+                $return = array_merge(self::scanDirectory($fullpath, $ignoreFolders, $ignoreFiles), $return);
+            }
+            else
+            {
+                $return[] = $path . '/' . $file;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Gets the extension of a file name
+     *
+     * @param   string  $file  The file name
+     *
+     * @return  string  The file extension
+     */
+    public function getExt($file)
+    {
+        $dot = strrpos($file, '.') + 1;
+
+        return substr($file, $dot);
+    }
+
+    /**
+     * Strips the last extension off of a file name
+     *
+     * @param   string  $file  The file name
+     *
+     * @return  string  The file name without the extension
+     */
+    public function stripExt($file)
+    {
+        return preg_replace('#\.[^.]*$#', '', $file);
+    }
+}
\ No newline at end of file
diff --git a/core/libraries/fof/platform/filesystem/interface.php b/core/libraries/fof/platform/filesystem/interface.php
new file mode 100644
index 00000000..70cb33fa
--- /dev/null
+++ b/core/libraries/fof/platform/filesystem/interface.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  platformFilesystem
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+interface FOFPlatformFilesystemInterface
+{
+    /**
+     * Does the file exists?
+     *
+     * @param   $path  string   Path to the file to test
+     *
+     * @return  bool
+     */
+    public function fileExists($path);
+
+    /**
+     * Delete a file or array of files
+     *
+     * @param   mixed  $file  The file name or an array of file names
+     *
+     * @return  boolean  True on success
+     *
+     */
+    public function fileDelete($file);
+
+    /**
+     * Copies a file
+     *
+     * @param   string   $src          The path to the source file
+     * @param   string   $dest         The path to the destination file
+     *
+     * @return  boolean  True on success
+     */
+    public function fileCopy($src, $dest);
+
+    /**
+     * Write contents to a file
+     *
+     * @param   string   $file         The full file path
+     * @param   string   &$buffer      The buffer to write
+     *
+     * @return  boolean  True on success
+     */
+    public function fileWrite($file, &$buffer);
+
+    /**
+     * Checks for snooping outside of the file system root.
+     *
+     * @param   string  $path  A file system path to check.
+     *
+     * @return  string  A cleaned version of the path or exit on error.
+     *
+     * @throws  Exception
+     */
+    public function pathCheck($path);
+
+    /**
+     * Function to strip additional / or \ in a path name.
+     *
+     * @param   string  $path  The path to clean.
+     * @param   string  $ds    Directory separator (optional).
+     *
+     * @return  string  The cleaned path.
+     *
+     * @throws  UnexpectedValueException
+     */
+    public function pathClean($path, $ds = DIRECTORY_SEPARATOR);
+
+    /**
+     * Searches the directory paths for a given file.
+     *
+     * @param   mixed   $paths  An path string or array of path strings to search in
+     * @param   string  $file   The file name to look for.
+     *
+     * @return  mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+     */
+    public function pathFind($paths, $file);
+
+    /**
+     * Wrapper for the standard file_exists function
+     *
+     * @param   string  $path  Folder name relative to installation dir
+     *
+     * @return  boolean  True if path is a folder
+     */
+    public function folderExists($path);
+
+    /**
+     * Utility function to read the files in a folder.
+     *
+     * @param   string   $path           The path of the folder to read.
+     * @param   string   $filter         A filter for file names.
+     * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+     * @param   boolean  $full           True to return the full path to the file.
+     * @param   array    $exclude        Array with names of files which should not be shown in the result.
+     * @param   array    $excludefilter  Array of filter to exclude
+     *
+     * @return  array  Files in the given folder.
+     */
+    public function folderFiles($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+                                $excludefilter = array('^\..*', '.*~'));
+
+    /**
+     * Utility function to read the folders in a folder.
+     *
+     * @param   string   $path           The path of the folder to read.
+     * @param   string   $filter         A filter for folder names.
+     * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+     * @param   boolean  $full           True to return the full path to the folders.
+     * @param   array    $exclude        Array with names of folders which should not be shown in the result.
+     * @param   array    $excludefilter  Array with regular expressions matching folders which should not be shown in the result.
+     *
+     * @return  array  Folders in the given folder.
+     */
+    public function folderFolders($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+                                  $excludefilter = array('^\..*'));
+
+    /**
+     * Create a folder -- and all necessary parent folders.
+     *
+     * @param   string   $path  A path to create from the base path.
+     * @param   integer  $mode  Directory permissions to set for folders created. 0755 by default.
+     *
+     * @return  boolean  True if successful.
+     */
+    public function folderCreate($path = '', $mode = 0755);
+}
\ No newline at end of file
diff --git a/core/libraries/fof/platform/interface.php b/core/libraries/fof/platform/interface.php
new file mode 100644
index 00000000..04048df1
--- /dev/null
+++ b/core/libraries/fof/platform/interface.php
@@ -0,0 +1,490 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  platform
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Part of the FOF Platform Abstraction Layer. It implements everything that
+ * depends on the platform FOF is running under, e.g. the Joomla! CMS front-end,
+ * the Joomla! CMS back-end, a CLI Joomla! Platform app, a bespoke Joomla!
+ * Platform / Framework web application and so on.
+ *
+ * This is the abstract class implementing some basic housekeeping functionality
+ * and provides the static interface to get the appropriate Platform object for
+ * use in the rest of the framework.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+interface FOFPlatformInterface
+{
+    /**
+     * Checks if the current script is run inside a valid CMS execution
+     *
+     * @return bool
+     */
+    public function checkExecution();
+
+	/**
+	 * Set the error Handling, if possible
+	 *
+	 * @param   integer  $level      PHP error level (E_ALL)
+	 * @param   string   $log_level  What to do with the error (ignore, callback)
+	 * @param   array    $options    Options for the error handler
+	 *
+	 * @return  void
+	 */
+	public function setErrorHandling($level, $log_level, $options = array());
+
+    /**
+     * Raises an error, using the logic requested by the CMS (PHP Exception or dedicated class)
+     *
+     * @param   integer  $code
+     * @param   string   $message
+     *
+     * @return mixed
+     */
+    public function raiseError($code, $message);
+
+	/**
+	 * Returns the ordering of the platform class. Files with a lower ordering
+	 * number will be loaded first.
+	 *
+	 * @return  integer
+	 */
+	public function getOrdering();
+
+	/**
+	 * Returns a platform integration object
+	 *
+	 * @param   string  $key  The key name of the platform integration object, e.g. 'filesystem'
+	 *
+	 * @return  object
+	 *
+	 * @since  2.1.2
+	 */
+	public function getIntegrationObject($key);
+
+	/**
+	 * Forces a platform integration object instance
+	 *
+	 * @param   string  $key     The key name of the platform integration object, e.g. 'filesystem'
+	 * @param   object  $object  The object to force for this key
+	 *
+	 * @return  object
+	 *
+	 * @since  2.1.2
+	 */
+	public function setIntegrationObject($key, $object);
+
+	/**
+	 * Is this platform enabled? This is used for automatic platform detection.
+	 * If the environment we're currently running in doesn't seem to be your
+	 * platform return false. If many classes return true, the one with the
+	 * lowest order will be picked by FOFPlatform.
+	 *
+	 * @return  boolean
+	 */
+	public function isEnabled();
+
+	/**
+	 * Returns the (internal) name of the platform implementation, e.g.
+	 * "joomla", "foobar123" etc. This MUST be the last part of the platform
+	 * class name. For example, if you have a plaform implementation class
+	 * FOFPlatformFoobar you MUST return "foobar" (all lowercase).
+	 *
+	 * @return  string
+	 *
+	 * @since  2.1.2
+	 */
+	public function getPlatformName();
+
+	/**
+	 * Returns the version number string of the platform, e.g. "4.5.6". If
+	 * implementation integrates with a CMS or a versioned foundation (e.g.
+	 * a framework) it is advisable to return that version.
+	 *
+	 * @return  string
+	 *
+	 * @since  2.1.2
+	 */
+	public function getPlatformVersion();
+
+	/**
+	 * Returns the human readable platform name, e.g. "Joomla!", "Joomla!
+	 * Framework", "Something Something Something Framework" etc.
+	 *
+	 * @return  string
+	 *
+	 * @since  2.1.2
+	 */
+	public function getPlatformHumanName();
+
+    /**
+     * Returns absolute path to directories used by the CMS.
+     *
+     * The return is a table with the following key:
+     * * root    Path to the site root
+     * * public  Path to the public area of the site
+     * * admin   Path to the administrative area of the site
+     * * tmp     Path to the temp directory
+     * * log     Path to the log directory
+     *
+     * @return  array  A hash array with keys root, public, admin, tmp and log.
+     */
+    public function getPlatformBaseDirs();
+
+	/**
+	 * Returns the base (root) directories for a given component. The
+	 * "component" is used in the sense of what we call "component" in Joomla!,
+	 * "plugin" in WordPress and "module" in Drupal, i.e. an application which
+	 * is running inside our main application (CMS).
+	 *
+	 * The return is a table with the following keys:
+	 * * main	The normal location of component files. For a back-end Joomla!
+	 *          component this is the administrator/components/com_example
+	 *          directory.
+	 * * alt	The alternate location of component files. For a back-end
+	 *          Joomla! component this is the front-end directory, e.g.
+	 *          components/com_example
+	 * * site	The location of the component files serving the public part of
+	 *          the application.
+	 * * admin	The location of the component files serving the administrative
+	 *          part of the application.
+	 *
+	 * All paths MUST be absolute. All four paths MAY be the same if the
+	 * platform doesn't make a distinction between public and private parts,
+	 * or when the component does not provide both a public and private part.
+	 * All of the directories MUST be defined and non-empty.
+	 *
+	 * @param   string  $component  The name of the component. For Joomla! this
+	 *                              is something like "com_example"
+	 *
+	 * @return  array  A hash array with keys main, alt, site and admin.
+	 */
+	public function getComponentBaseDirs($component);
+
+	/**
+	 * Return a list of the view template paths for this component. The paths
+	 * are in the format site:/component_name/view_name/layout_name or
+	 * admin:/component_name/view_name/layout_name
+	 *
+	 * The list of paths returned is a prioritised list. If a file is
+	 * found in the first path the other paths will not be scanned.
+	 *
+	 * @param   string   $component  The name of the component. For Joomla! this
+	 *                               is something like "com_example"
+	 * @param   string   $view       The name of the view you're looking a
+	 *                               template for
+	 * @param   string   $layout     The layout name to load, e.g. 'default'
+	 * @param   string   $tpl        The sub-template name to load (null by default)
+	 * @param   boolean  $strict     If true, only the specified layout will be
+	 *                               searched for. Otherwise we'll fall back to
+	 *                               the 'default' layout if the specified layout
+	 *                               is not found.
+	 *
+	 * @return  array
+	 */
+	public function getViewTemplatePaths($component, $view, $layout = 'default', $tpl = null, $strict = false);
+
+	/**
+	 * Get application-specific suffixes to use with template paths. This allows
+	 * you to look for view template overrides based on the application version.
+	 *
+	 * @return  array  A plain array of suffixes to try in template names
+	 */
+	public function getTemplateSuffixes();
+
+	/**
+	 * Return the absolute path to the application's template overrides
+	 * directory for a specific component. We will use it to look for template
+	 * files instead of the regular component directorues. If the application
+	 * does not have such a thing as template overrides return an empty string.
+	 *
+	 * @param   string   $component  The name of the component for which to fetch the overrides
+	 * @param   boolean  $absolute   Should I return an absolute or relative path?
+	 *
+	 * @return  string  The path to the template overrides directory
+	 */
+	public function getTemplateOverridePath($component, $absolute = true);
+
+	/**
+	 * Load the translation files for a given component. The
+	 * "component" is used in the sense of what we call "component" in Joomla!,
+	 * "plugin" in WordPress and "module" in Drupal, i.e. an application which
+	 * is running inside our main application (CMS).
+	 *
+	 * @param   string  $component  The name of the component. For Joomla! this
+	 *                              is something like "com_example"
+	 *
+	 * @return  void
+	 */
+	public function loadTranslations($component);
+
+	/**
+	 * By default FOF will only use the Controller's onBefore* methods to
+	 * perform user authorisation. In some cases, like the Joomla! back-end,
+	 * you alos need to perform component-wide user authorisation in the
+	 * Dispatcher. This method MUST implement this authorisation check. If you
+	 * do not need this in your platform, please always return true.
+	 *
+	 * @param   string  $component  The name of the component.
+	 *
+	 * @return  boolean  True to allow loading the component, false to halt loading
+	 */
+	public function authorizeAdmin($component);
+
+	/**
+	 * This method will try retrieving a variable from the request (input) data.
+	 * If it doesn't exist it will be loaded from the user state, typically
+	 * stored in the session. If it doesn't exist there either, the $default
+	 * value will be used. If $setUserState is set to true, the retrieved
+	 * variable will be stored in the user session.
+	 *
+	 * @param   string    $key           The user state key for the variable
+	 * @param   string    $request       The request variable name for the variable
+	 * @param   FOFInput  $input         The FOFInput object with the request (input) data
+	 * @param   mixed     $default       The default value. Default: null
+	 * @param   string    $type          The filter type for the variable data. Default: none (no filtering)
+	 * @param   boolean   $setUserState  Should I set the user state with the fetched value?
+	 *
+	 * @return  mixed  The value of the variable
+	 */
+	public function getUserStateFromRequest($key, $request, $input, $default = null, $type = 'none', $setUserState = true);
+
+	/**
+	 * Load plugins of a specific type. Obviously this seems to only be required
+	 * in the Joomla! CMS.
+	 *
+	 * @param   string  $type  The type of the plugins to be loaded
+	 *
+	 * @return void
+	 */
+	public function importPlugin($type);
+
+	/**
+	 * Execute plugins (system-level triggers) and fetch back an array with
+	 * their return values.
+	 *
+	 * @param   string  $event  The event (trigger) name, e.g. onBeforeScratchMyEar
+	 * @param   array   $data   A hash array of data sent to the plugins as part of the trigger
+	 *
+	 * @return  array  A simple array containing the resutls of the plugins triggered
+	 */
+	public function runPlugins($event, $data);
+
+	/**
+	 * Perform an ACL check. Please note that FOF uses by default the Joomla!
+	 * CMS convention for ACL privileges, e.g core.edit for the edit privilege.
+	 * If your platform uses different conventions you'll have to override the
+	 * FOF defaults using fof.xml or by specialising the controller.
+	 *
+	 * @param   string  $action     The ACL privilege to check, e.g. core.edit
+	 * @param   string  $assetname  The asset name to check, typically the component's name
+	 *
+	 * @return  boolean  True if the user is allowed this action
+	 */
+	public function authorise($action, $assetname);
+
+	/**
+	 * Returns a user object.
+	 *
+	 * @param   integer  $id  The user ID to load. Skip or use null to retrieve
+	 *                        the object for the currently logged in user.
+	 *
+	 * @return  JUser  The JUser object for the specified user
+	 */
+	public function getUser($id = null);
+
+	/**
+	 * Returns the JDocument object which handles this component's response. You
+	 * may also return null and FOF will a. try to figure out the output type by
+	 * examining the "format" input parameter (or fall back to "html") and b.
+	 * FOF will not attempt to load CSS and Javascript files (as it doesn't make
+	 * sense if there's no JDocument to handle them).
+	 *
+	 * @return  JDocument
+	 */
+	public function getDocument();
+
+    /**
+     * Returns an object to handle dates
+     *
+     * @param   mixed   $time       The initial time
+     * @param   null    $tzOffest   The timezone offset
+     * @param   bool    $locale     Should I try to load a specific class for current language?
+     *
+     * @return  JDate object
+     */
+    public function getDate($time = 'now', $tzOffest = null, $locale = true);
+
+    public function getLanguage();
+
+	/**
+	 * @return FOFDatabaseDriver
+	 */
+    public function getDbo();
+
+	/**
+	 * Is this the administrative section of the component?
+	 *
+	 * @return  boolean
+	 */
+	public function isBackend();
+
+	/**
+	 * Is this the public section of the component?
+	 *
+	 * @return  boolean
+	 */
+	public function isFrontend();
+
+	/**
+	 * Is this a component running in a CLI application?
+	 *
+	 * @return  boolean
+	 */
+	public function isCli();
+
+	/**
+	 * Is AJAX re-ordering supported? This is 100% Joomla!-CMS specific. All
+	 * other platforms should return false and never ask why.
+	 *
+	 * @return  boolean
+	 */
+	public function supportsAjaxOrdering();
+
+	/**
+	 * Performs a check between two versions. Use this function instead of PHP version_compare
+	 * so we can mock it while testing
+	 *
+	 * @param   string  $version1  First version number
+	 * @param   string  $version2  Second version number
+	 * @param   string  $operator  Operator (see version_compare for valid operators)
+	 *
+     * @deprecated Use PHP's version_compare against JVERSION in your code. This method is scheduled for removal in FOF 3.0
+     *
+	 * @return  boolean
+	 */
+	public function checkVersion($version1, $version2, $operator);
+
+	/**
+	 * Saves something to the cache. This is supposed to be used for system-wide
+	 * FOF data, not application data.
+	 *
+	 * @param   string  $key      The key of the data to save
+	 * @param   string  $content  The actual data to save
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function setCache($key, $content);
+
+	/**
+	 * Retrieves data from the cache. This is supposed to be used for system-side
+	 * FOF data, not application data.
+	 *
+	 * @param   string  $key      The key of the data to retrieve
+	 * @param   string  $default  The default value to return if the key is not found or the cache is not populated
+	 *
+	 * @return  string  The cached value
+	 */
+	public function getCache($key, $default = null);
+
+	/**
+	 * Clears the cache of system-wide FOF data. You are supposed to call this in
+	 * your components' installation script post-installation and post-upgrade
+	 * methods or whenever you are modifying the structure of database tables
+	 * accessed by FOF. Please note that FOF's cache never expires and is not
+	 * purged by Joomla!. You MUST use this method to manually purge the cache.
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function clearCache();
+
+    /**
+     * Returns an object that holds the configuration of the current site.
+     *
+     * @return  mixed
+     */
+    public function getConfig();
+
+	/**
+	 * Is the global FOF cache enabled?
+	 *
+	 * @return  boolean
+	 */
+	public function isGlobalFOFCacheEnabled();
+
+	/**
+	 * logs in a user
+	 *
+	 * @param   array  $authInfo  authentification information
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function loginUser($authInfo);
+
+	/**
+	 * logs out a user
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function logoutUser();
+
+    public function logAddLogger($file);
+
+	/**
+	 * Logs a deprecated practice. In Joomla! this results in the $message being output in the
+	 * deprecated log file, found in your site's log directory.
+	 *
+	 * @param   string  $message  The deprecated practice log message
+	 *
+	 * @return  void
+	 */
+	public function logDeprecated($message);
+
+    public function logDebug($message);
+
+    /**
+     * Returns the root URI for the request.
+     *
+     * @param   boolean  $pathonly  If false, prepend the scheme, host and port information. Default is false.
+     * @param   string   $path      The path
+     *
+     * @return  string  The root URI string.
+     */
+    public function URIroot($pathonly = false, $path = null);
+
+    /**
+     * Returns the base URI for the request.
+     *
+     * @param   boolean  $pathonly  If false, prepend the scheme, host and port information. Default is false.
+     * |
+     * @return  string  The base URI string
+     */
+    public function URIbase($pathonly = false);
+
+    /**
+     * Method to set a response header.  If the replace flag is set then all headers
+     * with the given name will be replaced by the new one (only if the current platform supports header caching)
+     *
+     * @param   string   $name     The name of the header to set.
+     * @param   string   $value    The value of the header to set.
+     * @param   boolean  $replace  True to replace any headers with the same name.
+     *
+     * @return  void
+     */
+    public function setHeader($name, $value, $replace = false);
+
+    /**
+     * In platforms that perform header caching, send all headers.
+     *
+     * @return  void
+     */
+    public function sendHeaders();
+}
diff --git a/core/libraries/fof/platform/platform.php b/core/libraries/fof/platform/platform.php
new file mode 100644
index 00000000..452230f3
--- /dev/null
+++ b/core/libraries/fof/platform/platform.php
@@ -0,0 +1,744 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  platform
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Part of the FOF Platform Abstraction Layer. It implements everything that
+ * depends on the platform FOF is running under, e.g. the Joomla! CMS front-end,
+ * the Joomla! CMS back-end, a CLI Joomla! Platform app, a bespoke Joomla!
+ * Platform / Framework web application and so on.
+ *
+ * This is the abstract class implementing some basic housekeeping functionality
+ * and provides the static interface to get the appropriate Platform object for
+ * use in the rest of the framework.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+abstract class FOFPlatform implements FOFPlatformInterface
+{
+	/**
+	 * The ordering for this platform class. The lower this number is, the more
+	 * important this class becomes. Most important enabled class ends up being
+	 * used.
+	 *
+	 * @var  integer
+	 */
+	public $ordering = 100;
+
+	/**
+	 * The internal name of this platform implementation. It must match the
+	 * last part of the platform class name and be in all lowercase letters,
+	 * e.g. "foobar" for FOFPlatformFoobar
+	 *
+	 * @var  string
+	 *
+	 * @since  2.1.2
+	 */
+	public $name = '';
+
+	/**
+	 * The human readable platform name
+	 *
+	 * @var  string
+	 *
+	 * @since  2.1.2
+	 */
+	public $humanReadableName = 'Unknown Platform';
+
+	/**
+	 * The platform version string
+	 *
+	 * @var  string
+	 *
+	 * @since  2.1.2
+	 */
+	public $version = '';
+
+	/**
+	 * Caches the enabled status of this platform class.
+	 *
+	 * @var  boolean
+	 */
+	protected $isEnabled = null;
+
+    /**
+     * Filesystem integration objects cache
+     *
+     * @var  object
+	 *
+	 * @since  2.1.2
+     */
+    protected $objectCache = array();
+
+	/**
+	 * The list of paths where platform class files will be looked for
+	 *
+	 * @var  array
+	 */
+	protected static $paths = array();
+
+	/**
+	 * The platform class instance which will be returned by getInstance
+	 *
+	 * @var  FOFPlatformInterface
+	 */
+	protected static $instance = null;
+
+	// ========================================================================
+	// Public API for platform integration handling
+	// ========================================================================
+
+	/**
+	 * Register a path where platform files will be looked for. These take
+	 * precedence over the built-in platform files.
+	 *
+	 * @param   string  $path  The path to add
+	 *
+	 * @return  void
+	 */
+	public static function registerPlatformPath($path)
+	{
+		if (!in_array($path, self::$paths))
+		{
+			self::$paths[] = $path;
+			self::$instance = null;
+		}
+	}
+
+	/**
+	 * Unregister a path where platform files will be looked for.
+	 *
+	 * @param   string  $path  The path to remove
+	 *
+	 * @return  void
+	 */
+	public static function unregisterPlatformPath($path)
+	{
+		$pos = array_search($path, self::$paths);
+
+		if ($pos !== false)
+		{
+			unset(self::$paths[$pos]);
+			self::$instance = null;
+		}
+	}
+
+	/**
+	 * Force a specific platform object to be used. If null, nukes the cache
+	 *
+	 * @param   FOFPlatformInterface|null  $instance  The Platform object to be used
+	 *
+	 * @return  void
+	 */
+	public static function forceInstance($instance)
+	{
+		if ($instance instanceof FOFPlatformInterface || is_null($instance))
+		{
+			self::$instance = $instance;
+		}
+	}
+
+	/**
+	 * Find and return the most relevant platform object
+	 *
+	 * @return  FOFPlatformInterface
+	 */
+	public static function getInstance()
+	{
+		if (!is_object(self::$instance))
+		{
+			// Where to look for platform integrations
+			$paths = array(__DIR__ . '/../integration');
+
+			if (is_array(self::$paths))
+			{
+				$paths = array_merge($paths, self::$paths);
+			}
+
+			// Get a list of folders inside this directory
+			$integrations = array();
+
+			foreach ($paths as $path)
+			{
+				if (!is_dir($path))
+				{
+					continue;
+				}
+
+				$di = new DirectoryIterator($path);
+				$temp = array();
+
+				foreach ($di as $fileSpec)
+				{
+					if (!$fileSpec->isDir())
+					{
+						continue;
+					}
+
+					$fileName = $fileSpec->getFilename();
+
+					if (substr($fileName, 0, 1) == '.')
+					{
+						continue;
+					}
+
+					$platformFilename = $path . '/' . $fileName . '/platform.php';
+
+					if (!file_exists($platformFilename))
+					{
+						continue;
+					}
+
+					$temp[] = array(
+						'classname'		=> 'FOFIntegration' . ucfirst($fileName) . 'Platform',
+						'fullpath'		=> $path . '/' . $fileName . '/platform.php',
+					);
+				}
+
+				$integrations = array_merge($integrations, $temp);
+			}
+
+			// Loop all paths
+			foreach ($integrations as $integration)
+			{
+				// Get the class name for this platform class
+				$class_name = $integration['classname'];
+
+				// Load the file if the class doesn't exist
+				if (!class_exists($class_name, false))
+				{
+					@include_once $integration['fullpath'];
+				}
+
+				// If the class still doesn't exist this file didn't
+				// actually contain a platform class; skip it
+				if (!class_exists($class_name, false))
+				{
+					continue;
+				}
+
+				// If it doesn't implement FOFPlatformInterface, skip it
+				if (!class_implements($class_name, 'FOFPlatformInterface'))
+				{
+					continue;
+				}
+
+				// Get an object of this platform
+				$o = new $class_name;
+
+				// If it's not enabled, skip it
+				if (!$o->isEnabled())
+				{
+					continue;
+				}
+
+				if (is_object(self::$instance))
+				{
+					// Replace self::$instance if this object has a
+					// lower order number
+					$current_order = self::$instance->getOrdering();
+					$new_order = $o->getOrdering();
+
+					if ($new_order < $current_order)
+					{
+						self::$instance = null;
+						self::$instance = $o;
+					}
+				}
+				else
+				{
+					// There is no self::$instance already, so use the
+					// object we just created.
+					self::$instance = $o;
+				}
+			}
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Returns the ordering of the platform class.
+	 *
+	 * @see FOFPlatformInterface::getOrdering()
+	 *
+	 * @return  integer
+	 */
+	public function getOrdering()
+	{
+		return $this->ordering;
+	}
+
+	/**
+	 * Is this platform enabled?
+	 *
+	 * @see FOFPlatformInterface::isEnabled()
+	 *
+	 * @return  boolean
+	 */
+	public function isEnabled()
+	{
+		if (is_null($this->isEnabled))
+		{
+			$this->isEnabled = false;
+		}
+
+		return $this->isEnabled;
+	}
+
+	/**
+	 * Returns a platform integration object
+	 *
+	 * @param   string  $key  The key name of the platform integration object, e.g. 'filesystem'
+	 *
+	 * @return  object
+	 *
+	 * @since  2.1.2
+	 */
+	public function getIntegrationObject($key)
+	{
+		$hasObject = false;
+
+		if (array_key_exists($key, $this->objectCache))
+		{
+			if (is_object($this->objectCache[$key]))
+			{
+				$hasObject = true;
+			}
+		}
+
+		if (!$hasObject)
+		{
+			// Instantiate a new platform integration object
+			$className = 'FOFIntegration' . ucfirst($this->getPlatformName()) . ucfirst($key);
+			$this->objectCache[$key] = new $className;
+		}
+
+		return $this->objectCache[$key];
+	}
+
+	/**
+	 * Forces a platform integration object instance
+	 *
+	 * @param   string  $key     The key name of the platform integration object, e.g. 'filesystem'
+	 * @param   object  $object  The object to force for this key
+	 *
+	 * @return  object
+	 *
+	 * @since  2.1.2
+	 */
+	public function setIntegrationObject($key, $object)
+	{
+		$this->objectCache[$key] = $object;
+	}
+
+	// ========================================================================
+	// Default implementation
+	// ========================================================================
+
+	/**
+	 * Set the error Handling, if possible
+	 *
+	 * @param   integer  $level      PHP error level (E_ALL)
+	 * @param   string   $log_level  What to do with the error (ignore, callback)
+	 * @param   array    $options    Options for the error handler
+	 *
+	 * @return  void
+	 */
+	public function setErrorHandling($level, $log_level, $options = array())
+	{
+		if (version_compare(JVERSION, '3.0', 'lt') )
+		{
+			return JError::setErrorHandling($level, $log_level, $options);
+		}
+	}
+
+	/**
+	 * Returns the base (root) directories for a given component.
+	 *
+	 * @param   string  $component  The name of the component. For Joomla! this
+	 *                              is something like "com_example"
+	 *
+	 * @see FOFPlatformInterface::getComponentBaseDirs()
+	 *
+	 * @return  array  A hash array with keys main, alt, site and admin.
+	 */
+	public function getComponentBaseDirs($component)
+	{
+		return array(
+			'main'	=> '',
+			'alt'	=> '',
+			'site'	=> '',
+			'admin'	=> '',
+		);
+	}
+
+	/**
+	 * Return a list of the view template directories for this component.
+	 *
+	 * @param   string   $component  The name of the component. For Joomla! this
+	 *                               is something like "com_example"
+	 * @param   string   $view       The name of the view you're looking a
+	 *                               template for
+	 * @param   string   $layout     The layout name to load, e.g. 'default'
+	 * @param   string   $tpl        The sub-template name to load (null by default)
+	 * @param   boolean  $strict     If true, only the specified layout will be
+	 *                               searched for. Otherwise we'll fall back to
+	 *                               the 'default' layout if the specified layout
+	 *                               is not found.
+	 *
+	 * @see FOFPlatformInterface::getViewTemplateDirs()
+	 *
+	 * @return  array
+	 */
+	public function getViewTemplatePaths($component, $view, $layout = 'default', $tpl = null, $strict = false)
+	{
+		return array();
+	}
+
+	/**
+	 * Get application-specific suffixes to use with template paths. This allows
+	 * you to look for view template overrides based on the application version.
+	 *
+	 * @return  array  A plain array of suffixes to try in template names
+	 */
+	public function getTemplateSuffixes()
+	{
+		return array();
+	}
+
+	/**
+	 * Return the absolute path to the application's template overrides
+	 * directory for a specific component. We will use it to look for template
+	 * files instead of the regular component directorues. If the application
+	 * does not have such a thing as template overrides return an empty string.
+	 *
+	 * @param   string   $component  The name of the component for which to fetch the overrides
+	 * @param   boolean  $absolute   Should I return an absolute or relative path?
+	 *
+	 * @return  string  The path to the template overrides directory
+	 */
+	public function getTemplateOverridePath($component, $absolute = true)
+	{
+		return '';
+	}
+
+	/**
+	 * Load the translation files for a given component.
+	 *
+	 * @param   string  $component  The name of the component. For Joomla! this
+	 *                              is something like "com_example"
+	 *
+	 * @see FOFPlatformInterface::loadTranslations()
+	 *
+	 * @return  void
+	 */
+	public function loadTranslations($component)
+	{
+		return null;
+	}
+
+	/**
+	 * Authorise access to the component in the back-end.
+	 *
+	 * @param   string  $component  The name of the component.
+	 *
+	 * @see FOFPlatformInterface::authorizeAdmin()
+	 *
+	 * @return  boolean  True to allow loading the component, false to halt loading
+	 */
+	public function authorizeAdmin($component)
+	{
+		return true;
+	}
+
+	/**
+	 * Returns the JUser object for the current user
+	 *
+	 * @param   integer  $id  The ID of the user to fetch
+	 *
+	 * @see FOFPlatformInterface::getUser()
+	 *
+	 * @return  JDocument
+	 */
+	public function getUser($id = null)
+	{
+		return null;
+	}
+
+	/**
+	 * Returns the JDocument object which handles this component's response.
+	 *
+	 * @see FOFPlatformInterface::getDocument()
+	 *
+	 * @return  JDocument
+	 */
+	public function getDocument()
+	{
+		return null;
+	}
+
+	/**
+	 * This method will try retrieving a variable from the request (input) data.
+	 *
+	 * @param   string    $key           The user state key for the variable
+	 * @param   string    $request       The request variable name for the variable
+	 * @param   FOFInput  $input         The FOFInput object with the request (input) data
+	 * @param   mixed     $default       The default value. Default: null
+	 * @param   string    $type          The filter type for the variable data. Default: none (no filtering)
+	 * @param   boolean   $setUserState  Should I set the user state with the fetched value?
+	 *
+	 * @see FOFPlatformInterface::getUserStateFromRequest()
+	 *
+	 * @return  mixed  The value of the variable
+	 */
+	public function getUserStateFromRequest($key, $request, $input, $default = null, $type = 'none', $setUserState = true)
+	{
+		return $input->get($request, $default, $type);
+	}
+
+	/**
+	 * Load plugins of a specific type. Obviously this seems to only be required
+	 * in the Joomla! CMS.
+	 *
+	 * @param   string  $type  The type of the plugins to be loaded
+	 *
+	 * @see FOFPlatformInterface::importPlugin()
+	 *
+	 * @return void
+	 */
+	public function importPlugin($type)
+	{
+	}
+
+	/**
+	 * Execute plugins (system-level triggers) and fetch back an array with
+	 * their return values.
+	 *
+	 * @param   string  $event  The event (trigger) name, e.g. onBeforeScratchMyEar
+	 * @param   array   $data   A hash array of data sent to the plugins as part of the trigger
+	 *
+	 * @see FOFPlatformInterface::runPlugins()
+	 *
+	 * @return  array  A simple array containing the results of the plugins triggered
+	 */
+	public function runPlugins($event, $data)
+	{
+		return array();
+	}
+
+	/**
+	 * Perform an ACL check.
+	 *
+	 * @param   string  $action     The ACL privilege to check, e.g. core.edit
+	 * @param   string  $assetname  The asset name to check, typically the component's name
+	 *
+	 * @see FOFPlatformInterface::authorise()
+	 *
+	 * @return  boolean  True if the user is allowed this action
+	 */
+	public function authorise($action, $assetname)
+	{
+		return true;
+	}
+
+	/**
+	 * Is this the administrative section of the component?
+	 *
+	 * @see FOFPlatformInterface::isBackend()
+	 *
+	 * @return  boolean
+	 */
+	public function isBackend()
+	{
+		return true;
+	}
+
+	/**
+	 * Is this the public section of the component?
+	 *
+	 * @see FOFPlatformInterface::isFrontend()
+	 *
+	 * @return  boolean
+	 */
+	public function isFrontend()
+	{
+		return true;
+	}
+
+	/**
+	 * Is this a component running in a CLI application?
+	 *
+	 * @see FOFPlatformInterface::isCli()
+	 *
+	 * @return  boolean
+	 */
+	public function isCli()
+	{
+		return true;
+	}
+
+	/**
+	 * Is AJAX re-ordering supported? This is 100% Joomla!-CMS specific. All
+	 * other platforms should return false and never ask why.
+	 *
+	 * @see FOFPlatformInterface::supportsAjaxOrdering()
+	 *
+	 * @return  boolean
+	 */
+	public function supportsAjaxOrdering()
+	{
+		return true;
+	}
+
+	/**
+	 * Performs a check between two versions. Use this function instead of PHP version_compare
+	 * so we can mock it while testing
+	 *
+	 * @param   string  $version1  First version number
+	 * @param   string  $version2  Second version number
+	 * @param   string  $operator  Operator (see version_compare for valid operators)
+	 *
+	 * @return  boolean
+	 */
+	public function checkVersion($version1, $version2, $operator)
+	{
+		return version_compare($version1, $version2, $operator);
+	}
+
+	/**
+	 * Saves something to the cache. This is supposed to be used for system-wide
+	 * FOF data, not application data.
+	 *
+	 * @param   string  $key      The key of the data to save
+	 * @param   string  $content  The actual data to save
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function setCache($key, $content)
+	{
+		return false;
+	}
+
+	/**
+	 * Retrieves data from the cache. This is supposed to be used for system-side
+	 * FOF data, not application data.
+	 *
+	 * @param   string  $key      The key of the data to retrieve
+	 * @param   string  $default  The default value to return if the key is not found or the cache is not populated
+	 *
+	 * @return  string  The cached value
+	 */
+	public function getCache($key, $default = null)
+	{
+		return false;
+	}
+
+	/**
+	 * Is the global FOF cache enabled?
+	 *
+	 * @return  boolean
+	 */
+	public function isGlobalFOFCacheEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 * Clears the cache of system-wide FOF data. You are supposed to call this in
+	 * your components' installation script post-installation and post-upgrade
+	 * methods or whenever you are modifying the structure of database tables
+	 * accessed by FOF. Please note that FOF's cache never expires and is not
+	 * purged by Joomla!. You MUST use this method to manually purge the cache.
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function clearCache()
+	{
+		return false;
+	}
+
+	/**
+	 * logs in a user
+	 *
+	 * @param   array  $authInfo  authentification information
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function loginUser($authInfo)
+	{
+		return true;
+	}
+
+	/**
+	 * logs out a user
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function logoutUser()
+	{
+		return true;
+	}
+
+	/**
+	 * Logs a deprecated practice. In Joomla! this results in the $message being output in the
+	 * deprecated log file, found in your site's log directory.
+	 *
+	 * @param   $message  The deprecated practice log message
+	 *
+	 * @return  void
+	 */
+	public function logDeprecated($message)
+	{
+		// The default implementation does nothing. Override this in your platform classes.
+	}
+
+	/**
+	 * Returns the (internal) name of the platform implementation, e.g.
+	 * "joomla", "foobar123" etc. This MUST be the last part of the platform
+	 * class name. For example, if you have a plaform implementation class
+	 * FOFPlatformFoobar you MUST return "foobar" (all lowercase).
+	 *
+	 * @return  string
+	 *
+	 * @since  2.1.2
+	 */
+	public function getPlatformName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Returns the version number string of the platform, e.g. "4.5.6". If
+	 * implementation integrates with a CMS or a versioned foundation (e.g.
+	 * a framework) it is advisable to return that version.
+	 *
+	 * @return  string
+	 *
+	 * @since  2.1.2
+	 */
+	public function getPlatformVersion()
+	{
+		return $this->version;
+	}
+
+	/**
+	 * Returns the human readable platform name, e.g. "Joomla!", "Joomla!
+	 * Framework", "Something Something Something Framework" etc.
+	 *
+	 * @return  string
+	 *
+	 * @since  2.1.2
+	 */
+	public function getPlatformHumanName()
+	{
+		return $this->humanReadableName;
+	}
+}
diff --git a/core/libraries/fof/query/abstract.php b/core/libraries/fof/query/abstract.php
new file mode 100644
index 00000000..659c6f41
--- /dev/null
+++ b/core/libraries/fof/query/abstract.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  query
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework query base class; for compatibility purposes
+ *
+ * @package     FrameworkOnFramework
+ * @since       2.1
+ * @deprecated  2.1
+ */
+abstract class FOFQueryAbstract
+{
+	/**
+	 * Returns a new database query class
+	 *
+	 * @param   FOFDatabaseDriver  $db  The DB driver which will provide us with a query object
+	 *
+	 * @return FOFQueryAbstract
+	 */
+	public static function &getNew($db = null)
+	{
+		FOFPlatform::getInstance()->logDeprecated('FOFQueryAbstract is deprecated. Use FOFDatabaseQuery instead.');
+
+		if (is_null($db))
+		{
+			$ret = FOFPlatform::getInstance()->getDbo()->getQuery(true);
+		}
+		else
+		{
+			$ret = $db->getQuery(true);
+		}
+
+		return $ret;
+	}
+}
diff --git a/core/libraries/fof/render/abstract.php b/core/libraries/fof/render/abstract.php
new file mode 100644
index 00000000..7b62aaa2
--- /dev/null
+++ b/core/libraries/fof/render/abstract.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  render
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Abstract view renderer class. The renderer is what turns XML view templates
+ * into actual HTML code, renders the submenu links and potentially wraps the
+ * HTML output in a div with a component-specific ID.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+abstract class FOFRenderAbstract
+{
+	/** @var int Priority of this renderer. Higher means more important */
+	protected $priority = 50;
+
+	/** @var int Is this renderer enabled? */
+	protected $enabled = false;
+
+	/**
+	 * Returns the information about this renderer
+	 *
+	 * @return object
+	 */
+	public function getInformation()
+	{
+		return (object) array(
+				'priority'	 => $this->priority,
+				'enabled'	 => $this->enabled,
+		);
+	}
+
+	/**
+	 * Echoes any HTML to show before the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	abstract public function preRender($view, $task, $input, $config = array());
+
+	/**
+	 * Echoes any HTML to show after the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	abstract public function postRender($view, $task, $input, $config = array());
+
+	/**
+	 * Renders a FOFForm and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form     The form to render
+	 * @param   FOFModel  $model     The model providing our data
+	 * @param   FOFInput  $input     The input object
+	 * @param   string    $formType  The form type: edit, browse or read
+	 * @param   boolean   $raw       If true, the raw form fields rendering (without the surrounding form tag) is returned.
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	public function renderForm(FOFForm &$form, FOFModel $model, FOFInput $input, $formType = null, $raw = false)
+	{
+		if (is_null($formType))
+		{
+			$formType = $form->getAttribute('type', 'edit');
+		}
+		else
+		{
+			$formType = strtolower($formType);
+		}
+
+		switch ($formType)
+		{
+			case 'browse':
+				return $this->renderFormBrowse($form, $model, $input);
+				break;
+
+			case 'read':
+				if ($raw)
+				{
+					return $this->renderFormRaw($form, $model, $input, 'read');
+				}
+				else
+				{
+					return $this->renderFormRead($form, $model, $input);
+				}
+
+				break;
+
+			default:
+				if ($raw)
+				{
+					return $this->renderFormRaw($form, $model, $input, 'edit');
+				}
+				else
+				{
+					return $this->renderFormEdit($form, $model, $input);
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Renders the submenu (link bar) for a category view when it is used in a
+	 * extension
+	 *
+	 * Note: this function has to be called from the addSubmenu function in
+	 * 		 the ExtensionNameHelper class located in
+	 * 		 administrator/components/com_ExtensionName/helpers/Extensionname.php
+	 *
+	 * Example Code:
+	 *
+	 *	class ExtensionNameHelper
+	 *	{
+	 * 		public static function addSubmenu($vName)
+	 *		{
+	 *			// Load FOF
+	 *			include_once JPATH_LIBRARIES . '/fof/include.php';
+	 *
+	 *			if (!defined('FOF_INCLUDED'))
+	 *			{
+	 *				JError::raiseError('500', 'FOF is not installed');
+	 *			}
+	 *
+	 *			if (version_compare(JVERSION, '3.0', 'ge'))
+	 *			{
+	 *				$strapper = new FOFRenderJoomla3;
+	 *			}
+	 *			else
+	 *			{
+	 *				$strapper = new FOFRenderJoomla;
+	 *			}
+	 *
+	 *			$strapper->renderCategoryLinkbar('com_babioonevent');
+	 *		}
+	 *	}
+	 *
+	 * @param   string  $extension  The name of the extension
+	 * @param   array   $config     Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	public function renderCategoryLinkbar($extension, $config = array())
+	{
+		// On command line don't do anything
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		// Do not render a category submenu unless we are in the the admin area
+		if (!FOFPlatform::getInstance()->isBackend())
+		{
+			return;
+		}
+
+		$toolbar = FOFToolbar::getAnInstance($extension, $config);
+		$toolbar->renderSubmenu();
+
+		$this->renderLinkbarItems($toolbar);
+	}
+
+	/**
+	 * Renders a FOFForm for a Browse view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	abstract protected function renderFormBrowse(FOFForm &$form, FOFModel $model, FOFInput $input);
+
+	/**
+	 * Renders a FOFForm for a Read view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	abstract protected function renderFormRead(FOFForm &$form, FOFModel $model, FOFInput $input);
+
+	/**
+	 * Renders a FOFForm for an Edit view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	abstract protected function renderFormEdit(FOFForm &$form, FOFModel $model, FOFInput $input);
+
+	/**
+	 * Renders a raw FOFForm and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form     The form to render
+	 * @param   FOFModel  $model     The model providing our data
+	 * @param   FOFInput  $input     The input object
+	 * @param   string    $formType  The form type e.g. 'edit' or 'read'
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	abstract protected function renderFormRaw(FOFForm &$form, FOFModel $model, FOFInput $input, $formType);
+
+	/**
+	 * Renders a raw fieldset of a FOFForm and returns the corresponding HTML
+	 *
+	 * @TODO: Convert to an abstract method or interface at FOF3
+	 *
+	 * @param   stdClass  &$fieldset   The fieldset to render
+	 * @param   FOFForm   &$form       The form to render
+	 * @param   FOFModel  $model       The model providing our data
+	 * @param   FOFInput  $input       The input object
+	 * @param   string    $formType    The form type e.g. 'edit' or 'read'
+	 * @param   boolean   $showHeader  Should I render the fieldset's header?
+	 *
+	 * @return  string    The HTML rendering of the fieldset
+	 */
+	protected function renderFieldset(stdClass &$fieldset, FOFForm &$form, FOFModel $model, FOFInput $input, $formType, $showHeader = true)
+	{
+
+	}
+
+	/**
+	 * Renders a label for a fieldset.
+	 *
+	 * @TODO: Convert to an abstract method or interface at FOF3
+	 *
+	 * @param   object  	$field  	The field of the label to render
+	 * @param   FOFForm   	&$form      The form to render
+	 * @param 	string		$title		The title of the label
+	 *
+	 * @return 	string		The rendered label
+	 */
+	protected function renderFieldsetLabel($field, FOFForm &$form, $title)
+	{
+
+	}
+
+	/**
+	 * Checks if the fieldset defines a tab pane
+	 *
+	 * @param   SimpleXMLElement  $fieldset
+	 *
+	 * @return  boolean
+	 */
+	protected function isTabFieldset($fieldset)
+	{
+		if (!isset($fieldset->class) || !$fieldset->class)
+		{
+			return false;
+		}
+
+		$class = $fieldset->class;
+		$classes = explode(' ', $class);
+
+		if (!in_array('tab-pane', $classes))
+		{
+			return false;
+		}
+		else
+		{
+			return in_array('active', $classes) ? 2 : 1;
+		}
+	}
+}
diff --git a/core/libraries/fof/render/joomla.php b/core/libraries/fof/render/joomla.php
new file mode 100644
index 00000000..34964012
--- /dev/null
+++ b/core/libraries/fof/render/joomla.php
@@ -0,0 +1,787 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  render
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Default Joomla! 1.5, 1.7, 2.5 view renderer class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFRenderJoomla extends FOFRenderAbstract
+{
+	/**
+	 * Public constructor. Determines the priority of this class and if it should be enabled
+	 */
+	public function __construct()
+	{
+		$this->priority	 = 50;
+		$this->enabled	 = true;
+	}
+
+	/**
+	 * Echoes any HTML to show before the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	public function preRender($view, $task, $input, $config = array())
+	{
+		$format	 = $input->getCmd('format', 'html');
+
+		if (empty($format))
+		{
+			$format	 = 'html';
+		}
+
+		if ($format != 'html')
+		{
+			return;
+		}
+
+		$platform = FOFPlatform::getInstance();
+
+		if ($platform->isCli())
+		{
+			return;
+		}
+
+		if (version_compare(JVERSION, '3.0.0', 'lt'))
+		{
+			JHtml::_('behavior.framework');
+		}
+		else
+		{
+			if (version_compare(JVERSION, '3.3.0', 'ge'))
+			{
+				JHtml::_('behavior.core');
+			}
+			else
+			{
+				JHtml::_('behavior.framework', true);
+			}
+
+			JHtml::_('jquery.framework');
+		}
+
+		// Wrap output in various classes
+		$version = new JVersion;
+		$versionParts = explode('.', $version->RELEASE);
+		$minorVersion = str_replace('.', '', $version->RELEASE);
+		$majorVersion = array_shift($versionParts);
+
+		if ($platform->isBackend())
+		{
+			$area = $platform->isBackend() ? 'admin' : 'site';
+			$option = $input->getCmd('option', '');
+			$view = $input->getCmd('view', '');
+			$layout = $input->getCmd('layout', '');
+			$task = $input->getCmd('task', '');
+
+			$classes = array(
+				'joomla-version-' . $majorVersion,
+				'joomla-version-' . $minorVersion,
+				$area,
+				$option,
+				'view-' . $view,
+				'layout-' . $layout,
+				'task-' . $task,
+			);
+		}
+		elseif ($platform->isFrontend())
+		{
+			// @TODO: Remove the frontend Joomla! version classes in FOF 3
+			$classes = array(
+				'joomla-version-' . $majorVersion,
+				'joomla-version-' . $minorVersion,
+			);
+		}
+
+		echo '<div id="akeeba-renderjoomla" class="' . implode($classes, ' ') . "\">\n";
+
+		// Render submenu and toolbar (only if asked to)
+		if ($input->getBool('render_toolbar', true))
+		{
+			$this->renderButtons($view, $task, $input, $config);
+			$this->renderLinkbar($view, $task, $input, $config);
+		}
+	}
+
+	/**
+	 * Echoes any HTML to show after the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	public function postRender($view, $task, $input, $config = array())
+	{
+		$format	 = $input->getCmd('format', 'html');
+
+		if (empty($format))
+		{
+			$format	 = 'html';
+		}
+
+		if ($format != 'html')
+		{
+			return;
+		}
+
+		// Closing tag only if we're not in CLI
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		echo "</div>\n";    // Closes akeeba-renderjoomla div
+	}
+
+	/**
+	 * Renders a FOFForm for a Browse view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormBrowse(FOFForm &$form, FOFModel $model, FOFInput $input)
+	{
+		JHtml::_('behavior.multiselect');
+
+		// Getting all header row elements
+		$headerFields = $form->getHeaderset();
+
+		// Start the form
+		$html				 = '';
+		$filter_order		 = $form->getView()->getLists()->order;
+		$filter_order_Dir	 = $form->getView()->getLists()->order_Dir;
+        $actionUrl           = FOFPlatform::getInstance()->isBackend() ? 'index.php' : JUri::root().'index.php';
+
+		if (FOFPlatform::getInstance()->isFrontend() && ($input->getCmd('Itemid', 0) != 0))
+		{
+			$itemid = $input->getCmd('Itemid', 0);
+			$uri = new JUri($actionUrl);
+
+			if ($itemid)
+			{
+				$uri->setVar('Itemid', $itemid);
+			}
+
+			$actionUrl = JRoute::_($uri->toString());
+		}
+
+		$html .= '<form action="'.$actionUrl.'" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="option" value="' . $input->getCmd('option') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="view" value="' . FOFInflector::pluralize($input->getCmd('view')) . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="task" value="" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="layout" value="' . $input->getCmd('layout', '') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="boxchecked" value="" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="hidemainmenu" value="" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="filter_order" value="' . $filter_order . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="filter_order_Dir" value="' . $filter_order_Dir . '" />' . PHP_EOL;
+
+		$html .= "\t" . '<input type="hidden" name="' . JFactory::getSession()->getFormToken() . '" value="1" />' . PHP_EOL;
+
+		// Start the table output
+		$html .= "\t\t" . '<table class="adminlist" id="adminList">' . PHP_EOL;
+
+		// Get form parameters
+		$show_header		 = $form->getAttribute('show_header', 1);
+		$show_filters		 = $form->getAttribute('show_filters', 1);
+		$show_pagination	 = $form->getAttribute('show_pagination', 1);
+		$norows_placeholder	 = $form->getAttribute('norows_placeholder', '');
+
+		// Open the table header region if required
+		if ($show_header || $show_filters)
+		{
+			$html .= "\t\t\t<thead>" . PHP_EOL;
+		}
+
+		// Pre-render the header and filter rows
+		if ($show_header || $show_filters)
+		{
+			$header_html = '';
+			$filter_html = '';
+
+			foreach ($headerFields as $header)
+			{
+				// Make sure we have a header field. Under Joomla! 2.5 we cannot
+				// render filter-only fields.
+				$tmpHeader = $header->header;
+
+				if (empty($tmpHeader))
+				{
+					continue;
+				}
+
+				$tdwidth = $header->tdwidth;
+
+				if (!empty($tdwidth))
+				{
+					$tdwidth = 'width="' . $tdwidth . '"';
+				}
+				else
+				{
+					$tdwidth = '';
+				}
+
+				$header_html .= "\t\t\t\t\t<th $tdwidth>" . PHP_EOL;
+				$header_html .= "\t\t\t\t\t\t" . $tmpHeader;
+				$header_html .= "\t\t\t\t\t</th>" . PHP_EOL;
+
+				$filter	 = $header->filter;
+				$buttons = $header->buttons;
+				$options = $header->options;
+
+				$filter_html .= "\t\t\t\t\t<td>" . PHP_EOL;
+
+				if (!empty($filter))
+				{
+					$filter_html .= "\t\t\t\t\t\t$filter" . PHP_EOL;
+
+					if (!empty($buttons))
+					{
+						$filter_html .= "\t\t\t\t\t\t<nobr>$buttons</nobr>" . PHP_EOL;
+					}
+				}
+				elseif (!empty($options))
+				{
+					$label		 = $header->label;
+					$emptyOption = JHtml::_('select.option', '', '- ' . JText::_($label) . ' -');
+					array_unshift($options, $emptyOption);
+					$attribs	 = array(
+						'onchange' => 'document.adminForm.submit();'
+					);
+					$filter		 = JHtml::_('select.genericlist', $options, $header->name, $attribs, 'value', 'text', $header->value, false, true);
+					$filter_html .= "\t\t\t\t\t\t$filter" . PHP_EOL;
+				}
+
+				$filter_html .= "\t\t\t\t\t</td>" . PHP_EOL;
+			}
+		}
+
+		// Render header if enabled
+		if ($show_header)
+		{
+			$html .= "\t\t\t\t<tr>" . PHP_EOL;
+			$html .= $header_html;
+			$html .= "\t\t\t\t</tr>" . PHP_EOL;
+		}
+
+		// Render filter row if enabled
+		if ($show_filters)
+		{
+			$html .= "\t\t\t\t<tr>";
+			$html .= $filter_html;
+			$html .= "\t\t\t\t</tr>";
+		}
+
+		// Close the table header region if required
+		if ($show_header || $show_filters)
+		{
+			$html .= "\t\t\t</thead>" . PHP_EOL;
+		}
+
+		// Loop through rows and fields, or show placeholder for no rows
+		$html .= "\t\t\t<tbody>" . PHP_EOL;
+		$fields		 = $form->getFieldset('items');
+		$num_columns = count($fields);
+		$items		 = $form->getModel()->getItemList();
+
+		if ($count = count($items))
+		{
+			$m = 1;
+
+			foreach ($items as $i => $item)
+			{
+				$table_item = $form->getModel()->getTable();
+				$table_item->reset();
+				$table_item->bind($item);
+
+				$form->bind($item);
+
+				$m		 = 1 - $m;
+				$class	 = 'row' . $m;
+
+				$html .= "\t\t\t\t<tr class=\"$class\">" . PHP_EOL;
+
+				$fields = $form->getFieldset('items');
+
+				foreach ($fields as $field)
+				{
+					$field->rowid	 = $i;
+					$field->item	 = $table_item;
+					$labelClass = $field->labelClass ? $field->labelClass : $field->labelclass; // Joomla! 2.5/3.x use different case for the same name
+					$class			 = $labelClass ? 'class ="' . $labelClass . '"' : '';
+					$html .= "\t\t\t\t\t<td $class>" . $field->getRepeatable() . '</td>' . PHP_EOL;
+				}
+
+				$html .= "\t\t\t\t</tr>" . PHP_EOL;
+			}
+		}
+		elseif ($norows_placeholder)
+		{
+			$html .= "\t\t\t\t<tr><td colspan=\"$num_columns\">";
+			$html .= JText::_($norows_placeholder);
+			$html .= "</td></tr>\n";
+		}
+
+		$html .= "\t\t\t</tbody>" . PHP_EOL;
+
+		// Render the pagination bar, if enabled
+
+		if ($show_pagination)
+		{
+			$pagination = $form->getModel()->getPagination();
+			$html .= "\t\t\t<tfoot>" . PHP_EOL;
+			$html .= "\t\t\t\t<tr><td colspan=\"$num_columns\">";
+
+			if (($pagination->total > 0))
+			{
+				$html .= $pagination->getListFooter();
+			}
+
+			$html .= "</td></tr>\n";
+			$html .= "\t\t\t</tfoot>" . PHP_EOL;
+		}
+
+		// End the table output
+		$html .= "\t\t" . '</table>' . PHP_EOL;
+
+		// End the form
+		$html .= '</form>' . PHP_EOL;
+
+		return $html;
+	}
+
+	/**
+	 * Renders a FOFForm for a Read view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormRead(FOFForm &$form, FOFModel $model, FOFInput $input)
+	{
+		$html = $this->renderFormRaw($form, $model, $input, 'read');
+
+		return $html;
+	}
+
+	/**
+	 * Renders a FOFForm for an Edit view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormEdit(FOFForm &$form, FOFModel $model, FOFInput $input)
+	{
+		// Get the key for this model's table
+		$key		 = $model->getTable()->getKeyName();
+		$keyValue	 = $model->getId();
+
+		JHTML::_('behavior.tooltip');
+
+		$html = '';
+
+		$validate	 = strtolower($form->getAttribute('validate'));
+		$class		 = '';
+
+		if (in_array($validate, array('true', 'yes', '1', 'on')))
+		{
+			JHtml::_('behavior.formvalidation');
+			$class = 'form-validate ';
+			$this->loadValidationScript($form);
+		}
+
+		// Check form enctype. Use enctype="multipart/form-data" to upload binary files in your form.
+		$template_form_enctype = $form->getAttribute('enctype');
+
+		if (!empty($template_form_enctype))
+		{
+			$enctype = ' enctype="' . $form->getAttribute('enctype') . '" ';
+		}
+		else
+		{
+			$enctype = '';
+		}
+
+		// Check form name. Use name="yourformname" to modify the name of your form.
+		$formname = $form->getAttribute('name');
+
+		if (empty($formname))
+		{
+			$formname = 'adminForm';
+		}
+
+		// Check form ID. Use id="yourformname" to modify the id of your form.
+		$formid = $form->getAttribute('name');
+
+		if (empty($formid))
+		{
+			$formid = 'adminForm';
+		}
+
+		// Check if we have a custom task
+		$customTask = $form->getAttribute('customTask');
+
+		if (empty($customTask))
+		{
+			$customTask = '';
+		}
+
+		// Get the form action URL
+        $actionUrl = FOFPlatform::getInstance()->isBackend() ? 'index.php' : JUri::root().'index.php';
+
+		if (FOFPlatform::getInstance()->isFrontend() && ($input->getCmd('Itemid', 0) != 0))
+		{
+			$itemid = $input->getCmd('Itemid', 0);
+			$uri = new JUri($actionUrl);
+
+			if ($itemid)
+			{
+				$uri->setVar('Itemid', $itemid);
+			}
+
+			$actionUrl = JRoute::_($uri->toString());
+		}
+
+		$html .= '<form action="'.$actionUrl.'" method="post" name="' . $formname .
+			'" id="' . $formid . '"' . $enctype . ' class="' . $class .
+			'">' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="option" value="' . $input->getCmd('option') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="view" value="' . $input->getCmd('view', 'edit') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="task" value="' . $customTask . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="' . $key . '" value="' . $keyValue . '" />' . PHP_EOL;
+
+		$html .= "\t" . '<input type="hidden" name="' . JFactory::getSession()->getFormToken() . '" value="1" />' . PHP_EOL;
+
+		$html .= $this->renderFormRaw($form, $model, $input, 'edit');
+		$html .= '</form>';
+
+		return $html;
+	}
+
+	/**
+	 * Renders a raw FOFForm and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form     The form to render
+	 * @param   FOFModel  $model     The model providing our data
+	 * @param   FOFInput  $input     The input object
+	 * @param   string    $formType  The form type e.g. 'edit' or 'read'
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormRaw(FOFForm &$form, FOFModel $model, FOFInput $input, $formType)
+	{
+		$html = '';
+
+		foreach ($form->getFieldsets() as $fieldset)
+		{
+			$html .= $this->renderFieldset($fieldset, $form, $model, $input, $formType, false);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Renders a raw fieldset of a FOFForm and returns the corresponding HTML
+	 *
+	 * @param   stdClass  &$fieldset   The fieldset to render
+	 * @param   FOFForm   &$form       The form to render
+	 * @param   FOFModel  $model       The model providing our data
+	 * @param   FOFInput  $input       The input object
+	 * @param   string    $formType    The form type e.g. 'edit' or 'read'
+	 * @param   boolean   $showHeader  Should I render the fieldset's header?
+	 *
+	 * @return  string    The HTML rendering of the fieldset
+	 */
+	protected function renderFieldset(stdClass &$fieldset, FOFForm &$form, FOFModel $model, FOFInput $input, $formType, $showHeader = true)
+	{
+		$html = '';
+
+		$fields = $form->getFieldset($fieldset->name);
+
+		if (isset($fieldset->class))
+		{
+			$class = 'class="' . $fieldset->class . '"';
+		}
+		else
+		{
+			$class = '';
+		}
+
+		$element = empty($fields) ? 'div' : 'fieldset';
+		$html .= "\t" . '<' . $element . ' id="' . $fieldset->name . '" ' . $class . '>' . PHP_EOL;
+
+		$isTabbedFieldset = $this->isTabFieldset($fieldset);
+
+		if (isset($fieldset->label) && !empty($fieldset->label) && !$isTabbedFieldset)
+		{
+			$html .= "\t\t" . '<h3>' . JText::_($fieldset->label) . '</h3>' . PHP_EOL;
+		}
+
+		foreach ($fields as $field)
+		{
+			$groupClass	 = $form->getFieldAttribute($field->fieldname, 'groupclass', '', $field->group);
+
+			// Auto-generate label and description if needed
+			// Field label
+			$title 		 = $form->getFieldAttribute($field->fieldname, 'label', '', $field->group);
+			$emptylabel  = $form->getFieldAttribute($field->fieldname, 'emptylabel', false, $field->group);
+
+			if (empty($title) && !$emptylabel)
+			{
+				$model->getName();
+				$title = strtoupper($input->get('option') . '_' . $model->getName() . '_' . $field->id . '_LABEL');
+			}
+
+			// Field description
+			$description = $form->getFieldAttribute($field->fieldname, 'description', '', $field->group);
+
+			/**
+			 * The following code is backwards incompatible. Most forms don't require a description in their form
+			 * fields. Having to use emptydescription="1" on each one of them is an overkill. Removed.
+			 */
+			/*
+			$emptydescription   = $form->getFieldAttribute($field->fieldname, 'emptydescription', false, $field->group);
+			if (empty($description) && !$emptydescription)
+			{
+				$description = strtoupper($input->get('option') . '_' . $model->getName() . '_' . $field->id . '_DESC');
+			}
+			*/
+
+			if ($formType == 'read')
+			{
+				$inputField = $field->static;
+			}
+			elseif ($formType == 'edit')
+			{
+				$inputField = $field->input;
+			}
+
+			if (empty($title))
+			{
+				$html .= "\t\t\t" . $inputField . PHP_EOL;
+
+				if (!empty($description) && $formType == 'edit')
+				{
+					$html .= "\t\t\t\t" . '<span class="help-block">';
+					$html .= JText::_($description) . '</span>' . PHP_EOL;
+				}
+			}
+			else
+			{
+				$html .= "\t\t\t" . '<div class="fof-row ' . $groupClass . '">' . PHP_EOL;
+				$html .= $this->renderFieldsetLabel($field, $form, $title);
+				$html .= "\t\t\t\t" . $inputField . PHP_EOL;
+
+				if (!empty($description))
+				{
+					$html .= "\t\t\t\t" . '<span class="help-block">';
+					$html .= JText::_($description) . '</span>' . PHP_EOL;
+				}
+
+				$html .= "\t\t\t" . '</div>' . PHP_EOL;
+			}
+		}
+
+		$element = empty($fields) ? 'div' : 'fieldset';
+		$html .= "\t" . '</' . $element . '>' . PHP_EOL;
+
+		return $html;
+	}
+
+	/**
+	 * Renders a label for a fieldset.
+	 *
+	 * @param   object  	$field  	The field of the label to render
+	 * @param   FOFForm   	&$form      The form to render
+	 * @param 	string		$title		The title of the label
+	 *
+	 * @return 	string		The rendered label
+	 */
+	protected function renderFieldsetLabel($field, FOFForm &$form, $title)
+	{
+		$html = '';
+
+		$labelClass	 = $field->labelClass ? $field->labelClass : $field->labelclass; // Joomla! 2.5/3.x use different case for the same name
+		$required	 = $field->required;
+
+		if ($required)
+		{
+			$labelClass .= ' required';
+		}
+
+		$tooltip = $form->getFieldAttribute($field->fieldname, 'tooltip', '', $field->group);
+
+		if (!empty($tooltip))
+		{
+			JHtml::_('behavior.tooltip');
+
+			$tooltipText = JText::_($title) . '::' . JText::_($tooltip);
+
+			$labelClass .= ' hasTip';
+
+			$html .= "\t\t\t\t" . '<label id="' . $field->id . '-lbl" class="' . $labelClass . '" for="' . $field->id . '" title="' . $tooltipText . '" rel="tooltip">';
+		}
+		else
+		{
+			$html .= "\t\t\t\t" . '<label class="' . $labelClass . '" for="' . $field->id . '">';
+		}
+
+		$html .= JText::_($title);
+
+		if ($required)
+		{
+			$html .= '<span class="star">&nbsp;*</span>';
+		}
+
+		$html .= "\t\t\t\t" . '</label>' . PHP_EOL;
+
+		return $html;
+	}
+
+	/**
+	 * Loads the validation script for an edit form
+	 *
+	 * @param   FOFForm  &$form  The form we are rendering
+	 *
+	 * @return  void
+	 */
+	protected function loadValidationScript(FOFForm &$form)
+	{
+		$message = $form->getView()->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));
+
+		$js = <<<JS
+Joomla.submitbutton = function(task)
+{
+	if (task == 'cancel' || document.formvalidator.isValid(document.id('adminForm')))
+	{
+		Joomla.submitform(task, document.getElementById('adminForm'));
+	}
+	else {
+		alert('$message');
+	}
+};
+JS;
+
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			$document->addScriptDeclaration($js);
+		}
+	}
+
+	/**
+	 * Renders the submenu (link bar)
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbar($view, $task, $input, $config = array())
+	{
+		// On command line don't do anything
+
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		// Do not render a submenu unless we are in the the admin area
+		$toolbar				 = FOFToolbar::getAnInstance($input->getCmd('option', 'com_foobar'), $config);
+		$renderFrontendSubmenu	 = $toolbar->getRenderFrontendSubmenu();
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$renderFrontendSubmenu)
+		{
+			return;
+		}
+
+		$this->renderLinkbarItems($toolbar);
+	}
+
+	/**
+	 * do the rendering job for the linkbar
+	 *
+	 * @param   FOFToolbar  $toolbar  A toolbar object
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbarItems($toolbar)
+	{
+		$links = $toolbar->getLinks();
+
+		if (!empty($links))
+		{
+			foreach ($links as $link)
+			{
+				JSubMenuHelper::addEntry($link['name'], $link['link'], $link['active']);
+			}
+		}
+	}
+
+	/**
+	 * Renders the toolbar buttons
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderButtons($view, $task, $input, $config = array())
+	{
+		// On command line don't do anything
+
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		// Do not render buttons unless we are in the the frontend area and we are asked to do so
+		$toolbar				 = FOFToolbar::getAnInstance($input->getCmd('option', 'com_foobar'), $config);
+		$renderFrontendButtons	 = $toolbar->getRenderFrontendButtons();
+
+		if (FOFPlatform::getInstance()->isBackend() || !$renderFrontendButtons)
+		{
+			return;
+		}
+
+		// Load main backend language, in order to display toolbar strings
+		// (JTOOLBAR_BACK, JTOOLBAR_PUBLISH etc etc)
+		FOFPlatform::getInstance()->loadTranslations('joomla');
+
+		$title	 = JFactory::getApplication()->get('JComponentTitle');
+		$bar	 = JToolbar::getInstance('toolbar');
+
+		// Delete faux links, since if SEF is on, Joomla will follow the link instead of submitting the form
+		$bar_content = str_replace('href="#"', '', $bar->render());
+
+		echo '<div id="FOFHeaderHolder">', $bar_content, $title, '<div style="clear:both"></div>', '</div>';
+	}
+}
diff --git a/core/libraries/fof/render/joomla3.php b/core/libraries/fof/render/joomla3.php
new file mode 100644
index 00000000..9580e4d1
--- /dev/null
+++ b/core/libraries/fof/render/joomla3.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  render
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Joomla! 3 view renderer class
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFRenderJoomla3 extends FOFRenderStrapper
+{
+	/**
+	 * Public constructor. Determines the priority of this class and if it should be enabled
+	 */
+	public function __construct()
+	{
+		$this->priority	 = 55;
+		$this->enabled	 = version_compare(JVERSION, '3.0', 'ge');
+	}
+
+	/**
+	 * Echoes any HTML to show before the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	public function preRender($view, $task, $input, $config = array())
+	{
+		$format	 = $input->getCmd('format', 'html');
+
+		if (empty($format))
+		{
+			$format	 = 'html';
+		}
+
+		if ($format != 'html')
+		{
+			return;
+		}
+
+		$platform = FOFPlatform::getInstance();
+
+		if ($platform->isCli())
+		{
+			return;
+		}
+
+		if (version_compare(JVERSION, '3.3.0', 'ge'))
+		{
+			JHtml::_('behavior.core');
+		}
+		else
+		{
+			JHtml::_('behavior.framework', true);
+		}
+
+		JHtml::_('jquery.framework');
+
+		if ($platform->isBackend())
+		{
+			// Wrap output in various classes
+			$version = new JVersion;
+			$versionParts = explode('.', $version->RELEASE);
+			$minorVersion = str_replace('.', '', $version->RELEASE);
+			$majorVersion = array_shift($versionParts);
+
+			$option = $input->getCmd('option', '');
+			$view = $input->getCmd('view', '');
+			$layout = $input->getCmd('layout', '');
+			$task = $input->getCmd('task', '');
+
+			$classes = ' class="' . implode(array(
+				'joomla-version-' . $majorVersion,
+				'joomla-version-' . $minorVersion,
+				'admin',
+				$option,
+				'view-' . $view,
+				'layout-' . $layout,
+				'task-' . $task,
+			), ' ') . '"';
+		}
+		else
+		{
+			$classes = '';
+		}
+
+		echo '<div id="akeeba-renderjoomla"' . $classes . ">\n";
+
+		// Render the submenu and toolbar
+		if ($input->getBool('render_toolbar', true))
+		{
+			$this->renderButtons($view, $task, $input, $config);
+			$this->renderLinkbar($view, $task, $input, $config);
+		}
+	}
+
+	/**
+	 * Echoes any HTML to show after the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	public function postRender($view, $task, $input, $config = array())
+	{
+		$format	 = $input->getCmd('format', 'html');
+
+		if (empty($format))
+		{
+			$format	 = 'html';
+		}
+
+		if ($format != 'html')
+		{
+			return;
+		}
+
+		// Closing tag only if we're not in CLI
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		echo "</div>\n";    // Closes akeeba-renderjoomla div
+	}
+
+	/**
+	 * Renders the submenu (link bar)
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbar($view, $task, $input, $config = array())
+	{
+		$style = 'joomla';
+
+		if (array_key_exists('linkbar_style', $config))
+		{
+			$style = $config['linkbar_style'];
+		}
+
+		switch ($style)
+		{
+			case 'joomla':
+				$this->renderLinkbar_joomla($view, $task, $input);
+				break;
+
+			case 'classic':
+			default:
+				$this->renderLinkbar_classic($view, $task, $input);
+				break;
+		}
+	}
+
+	/**
+	 * Renders a label for a fieldset.
+	 *
+	 * @param   object  	$field  	The field of the label to render
+	 * @param   FOFForm   	&$form      The form to render
+	 * @param 	string		$title		The title of the label
+	 *
+	 * @return 	string		The rendered label
+	 */
+	protected function renderFieldsetLabel($field, FOFForm &$form, $title)
+	{
+		$html = '';
+
+		$labelClass	 = $field->labelClass ? $field->labelClass : $field->labelclass; // Joomla! 2.5/3.x use different case for the same name
+		$required	 = $field->required;
+
+		$tooltip = $form->getFieldAttribute($field->fieldname, 'tooltip', '', $field->group);
+
+		if (!empty($tooltip))
+		{
+			JHtml::_('bootstrap.tooltip');
+
+			$tooltipText = '<strong>' . JText::_($title) . '</strong><br />' . JText::_($tooltip);
+
+			$html .= "\t\t\t\t" . '<label class="control-label hasTooltip ' . $labelClass . '" for="' . $field->id . '" title="' . $tooltipText . '" rel="tooltip">';
+		}
+		else
+		{
+			$html .= "\t\t\t\t" . '<label class="control-label ' . $labelClass . '" for="' . $field->id . '">';
+		}
+
+		$html .= JText::_($title);
+
+		if ($required)
+		{
+			$html .= ' *';
+		}
+
+		$html .= '</label>' . PHP_EOL;
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/render/strapper.php b/core/libraries/fof/render/strapper.php
new file mode 100644
index 00000000..71d88bb5
--- /dev/null
+++ b/core/libraries/fof/render/strapper.php
@@ -0,0 +1,1388 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  render
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Akeeba Strapper view renderer class.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFRenderStrapper extends FOFRenderAbstract
+{
+	/**
+	 * Public constructor. Determines the priority of this class and if it should be enabled
+	 */
+	public function __construct()
+	{
+		$this->priority	 = 60;
+		$this->enabled	 = class_exists('AkeebaStrapper');
+	}
+
+	/**
+	 * Echoes any HTML to show before the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	public function preRender($view, $task, $input, $config = array())
+	{
+		$format	 = $input->getCmd('format', 'html');
+
+		if (empty($format))
+		{
+			$format	 = 'html';
+		}
+
+		if ($format != 'html')
+		{
+			return;
+		}
+
+		$platform = FOFPlatform::getInstance();
+
+		if ($platform->isCli())
+		{
+			return;
+		}
+
+		if (version_compare(JVERSION, '3.0.0', 'lt'))
+		{
+			JHtml::_('behavior.framework');
+		}
+		else
+		{
+			if (version_compare(JVERSION, '3.3.0', 'ge'))
+			{
+				JHtml::_('behavior.core');
+			}
+			else
+			{
+				JHtml::_('behavior.framework', true);
+			}
+
+			JHtml::_('jquery.framework');
+		}
+
+		// Wrap output in various classes
+		$version = new JVersion;
+		$versionParts = explode('.', $version->RELEASE);
+		$minorVersion = str_replace('.', '', $version->RELEASE);
+		$majorVersion = array_shift($versionParts);
+
+		if ($platform->isBackend())
+		{
+			$area = $platform->isBackend() ? 'admin' : 'site';
+			$option = $input->getCmd('option', '');
+			$view = $input->getCmd('view', '');
+			$layout = $input->getCmd('layout', '');
+			$task = $input->getCmd('task', '');
+
+			$classes = array(
+				'joomla-version-' . $majorVersion,
+				'joomla-version-' . $minorVersion,
+				$area,
+				$option,
+				'view-' . $view,
+				'layout-' . $layout,
+				'task-' . $task,
+				// We have a floating sidebar, they said. It looks great, they said. They must've been blind, I say!
+				'j-toggle-main',
+				'j-toggle-transition',
+				'span12',
+			);
+		}
+		elseif ($platform->isFrontend())
+		{
+			// @TODO: Remove the frontend Joomla! version classes in FOF 3
+			$classes = array(
+				'joomla-version-' . $majorVersion,
+				'joomla-version-' . $minorVersion,
+			);
+		}
+
+		// Wrap output in divs
+		echo '<div id="akeeba-bootstrap" class="' . implode($classes, ' ') . "\">\n";
+		echo "<div class=\"akeeba-bootstrap\">\n";
+		echo "<div class=\"row-fluid\">\n";
+
+		// Render submenu and toolbar (only if asked to)
+		if ($input->getBool('render_toolbar', true))
+		{
+			$this->renderButtons($view, $task, $input, $config);
+			$this->renderLinkbar($view, $task, $input, $config);
+		}
+	}
+
+	/**
+	 * Echoes any HTML to show after the view template
+	 *
+	 * @param   string    $view    The current view
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input array (request parameters)
+	 * @param   array     $config  The view configuration array
+	 *
+	 * @return  void
+	 */
+	public function postRender($view, $task, $input, $config = array())
+	{
+		$format = $input->getCmd('format', 'html');
+
+		if ($format != 'html' || FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		if (!FOFPlatform::getInstance()->isCli() && version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$sidebarEntries = JHtmlSidebar::getEntries();
+
+			if (!empty($sidebarEntries))
+			{
+				echo '</div>';
+			}
+		}
+
+		echo "</div>\n";    // Closes row-fluid div
+		echo "</div>\n";    // Closes akeeba-bootstrap div
+		echo "</div>\n";    // Closes joomla-version div
+	}
+
+	/**
+	 * Loads the validation script for an edit form
+	 *
+	 * @param   FOFForm  &$form  The form we are rendering
+	 *
+	 * @return  void
+	 */
+	protected function loadValidationScript(FOFForm &$form)
+	{
+		$message = $form->getView()->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));
+
+		$js = <<<JS
+Joomla.submitbutton = function(task)
+{
+	if (task == 'cancel' || document.formvalidator.isValid(document.id('adminForm')))
+	{
+		Joomla.submitform(task, document.getElementById('adminForm'));
+	}
+	else {
+		alert('$message');
+	}
+};
+JS;
+
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			$document->addScriptDeclaration($js);
+		}
+	}
+
+	/**
+	 * Renders the submenu (link bar)
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbar($view, $task, $input, $config = array())
+	{
+		$style = 'classic';
+
+		if (array_key_exists('linkbar_style', $config))
+		{
+			$style = $config['linkbar_style'];
+		}
+
+		if (!version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$style = 'classic';
+		}
+
+		switch ($style)
+		{
+			case 'joomla':
+				$this->renderLinkbar_joomla($view, $task, $input);
+				break;
+
+			case 'classic':
+			default:
+				$this->renderLinkbar_classic($view, $task, $input);
+				break;
+		}
+	}
+
+	/**
+	 * Renders the submenu (link bar) in FOF's classic style, using a Bootstrapped
+	 * tab bar.
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbar_classic($view, $task, $input, $config = array())
+	{
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		// Do not render a submenu unless we are in the the admin area
+		$toolbar				 = FOFToolbar::getAnInstance($input->getCmd('option', 'com_foobar'), $config);
+		$renderFrontendSubmenu	 = $toolbar->getRenderFrontendSubmenu();
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$renderFrontendSubmenu)
+		{
+			return;
+		}
+
+		$links = $toolbar->getLinks();
+
+		if (!empty($links))
+		{
+			echo "<ul class=\"nav nav-tabs\">\n";
+
+			foreach ($links as $link)
+			{
+				$dropdown = false;
+
+				if (array_key_exists('dropdown', $link))
+				{
+					$dropdown = $link['dropdown'];
+				}
+
+				if ($dropdown)
+				{
+					echo "<li";
+					$class = 'dropdown';
+
+					if ($link['active'])
+					{
+						$class .= ' active';
+					}
+
+					echo ' class="' . $class . '">';
+
+					echo '<a class="dropdown-toggle" data-toggle="dropdown" href="#">';
+
+					if ($link['icon'])
+					{
+						echo "<i class=\"icon icon-" . $link['icon'] . "\"></i>";
+					}
+
+					echo $link['name'];
+					echo '<b class="caret"></b>';
+					echo '</a>';
+
+					echo "\n<ul class=\"dropdown-menu\">";
+
+					foreach ($link['items'] as $item)
+					{
+						echo "<li";
+
+						if ($item['active'])
+						{
+							echo ' class="active"';
+						}
+
+						echo ">";
+
+						if ($item['icon'])
+						{
+							echo "<i class=\"icon icon-" . $item['icon'] . "\"></i>";
+						}
+
+						if ($item['link'])
+						{
+							echo "<a href=\"" . $item['link'] . "\">" . $item['name'] . "</a>";
+						}
+						else
+						{
+							echo $item['name'];
+						}
+
+						echo "</li>";
+					}
+
+					echo "</ul>\n";
+				}
+				else
+				{
+					echo "<li";
+
+					if ($link['active'])
+					{
+						echo ' class="active"';
+					}
+
+					echo ">";
+
+					if ($link['icon'])
+					{
+						echo "<i class=\"icon icon-" . $link['icon'] . "\"></i>";
+					}
+
+					if ($link['link'])
+					{
+						echo "<a href=\"" . $link['link'] . "\">" . $link['name'] . "</a>";
+					}
+					else
+					{
+						echo $link['name'];
+					}
+				}
+
+				echo "</li>\n";
+			}
+
+			echo "</ul>\n";
+		}
+	}
+
+	/**
+	 * Renders the submenu (link bar) using Joomla!'s style. On Joomla! 2.5 this
+	 * is a list of bar separated links, on Joomla! 3 it's a sidebar at the
+	 * left-hand side of the page.
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbar_joomla($view, $task, $input, $config = array())
+	{
+		// On command line don't do anything
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		// Do not render a submenu unless we are in the the admin area
+		$toolbar				 = FOFToolbar::getAnInstance($input->getCmd('option', 'com_foobar'), $config);
+		$renderFrontendSubmenu	 = $toolbar->getRenderFrontendSubmenu();
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$renderFrontendSubmenu)
+		{
+			return;
+		}
+
+		$this->renderLinkbarItems($toolbar);
+	}
+
+	/**
+	 * do the rendering job for the linkbar
+	 *
+	 * @param   FOFToolbar  $toolbar  A toolbar object
+	 *
+	 * @return  void
+	 */
+	protected function renderLinkbarItems($toolbar)
+	{
+		$links = $toolbar->getLinks();
+
+		if (!empty($links))
+		{
+			foreach ($links as $link)
+			{
+				JHtmlSidebar::addEntry($link['name'], $link['link'], $link['active']);
+
+				$dropdown = false;
+
+				if (array_key_exists('dropdown', $link))
+				{
+					$dropdown = $link['dropdown'];
+				}
+
+				if ($dropdown)
+				{
+					foreach ($link['items'] as $item)
+					{
+						JHtmlSidebar::addEntry('– ' . $item['name'], $item['link'], $item['active']);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Renders the toolbar buttons
+	 *
+	 * @param   string    $view    The active view name
+	 * @param   string    $task    The current task
+	 * @param   FOFInput  $input   The input object
+	 * @param   array     $config  Extra configuration variables for the toolbar
+	 *
+	 * @return  void
+	 */
+	protected function renderButtons($view, $task, $input, $config = array())
+	{
+		if (FOFPlatform::getInstance()->isCli())
+		{
+			return;
+		}
+
+		// Do not render buttons unless we are in the the frontend area and we are asked to do so
+		$toolbar				 = FOFToolbar::getAnInstance($input->getCmd('option', 'com_foobar'), $config);
+		$renderFrontendButtons	 = $toolbar->getRenderFrontendButtons();
+
+        // Load main backend language, in order to display toolbar strings
+        // (JTOOLBAR_BACK, JTOOLBAR_PUBLISH etc etc)
+        FOFPlatform::getInstance()->loadTranslations('joomla');
+
+		if (FOFPlatform::getInstance()->isBackend() || !$renderFrontendButtons)
+		{
+			return;
+		}
+
+		$bar	 = JToolbar::getInstance('toolbar');
+		$items	 = $bar->getItems();
+
+		$substitutions = array(
+			'icon-32-new'		 => 'icon-plus',
+			'icon-32-publish'	 => 'icon-eye-open',
+			'icon-32-unpublish'	 => 'icon-eye-close',
+			'icon-32-delete'	 => 'icon-trash',
+			'icon-32-edit'		 => 'icon-edit',
+			'icon-32-copy'		 => 'icon-th-large',
+			'icon-32-cancel'	 => 'icon-remove',
+			'icon-32-back'		 => 'icon-circle-arrow-left',
+			'icon-32-apply'		 => 'icon-ok',
+			'icon-32-save'		 => 'icon-hdd',
+			'icon-32-save-new'	 => 'icon-repeat',
+		);
+
+        if(isset(JFactory::getApplication()->JComponentTitle))
+        {
+            $title	 = JFactory::getApplication()->JComponentTitle;
+        }
+		else
+		{
+			$title = '';
+		}
+
+        $html	 = array();
+        $actions = array();
+
+        // For BC we have to use the same id we're using inside other renderers (FOFHeaderHolder)
+        //$html[]	 = '<div class="well" id="' . $bar->getName() . '">';
+
+        $html[]	 = '<div class="well" id="FOFHeaderHolder">';
+        $html[]  =      '<div class="titleHolder">'.$title.'</div>';
+        $html[]  =      '<div class="buttonsHolder">';
+
+		foreach ($items as $node)
+		{
+			$type	 = $node[0];
+			$button	 = $bar->loadButtonType($type);
+
+			if ($button !== false)
+			{
+				if (method_exists($button, 'fetchId'))
+				{
+					$id = call_user_func_array(array(&$button, 'fetchId'), $node);
+				}
+				else
+				{
+					$id = null;
+				}
+
+				$action	    = call_user_func_array(array(&$button, 'fetchButton'), $node);
+				$action	    = str_replace('class="toolbar"', 'class="toolbar btn"', $action);
+				$action	    = str_replace('<span ', '<i ', $action);
+				$action	    = str_replace('</span>', '</i>', $action);
+				$action	    = str_replace(array_keys($substitutions), array_values($substitutions), $action);
+				$actions[]	= $action;
+			}
+		}
+
+        $html   = array_merge($html, $actions);
+		$html[] = '</div>';
+		$html[] = '</div>';
+
+        echo implode("\n", $html);
+	}
+
+	/**
+	 * Renders a FOFForm for a Browse view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormBrowse(FOFForm &$form, FOFModel $model, FOFInput $input)
+	{
+		$html = '';
+
+		JHtml::_('behavior.multiselect');
+
+		// Joomla! 3.0+ support
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			JHtml::_('bootstrap.tooltip');
+			JHtml::_('dropdown.init');
+			JHtml::_('formbehavior.chosen', 'select');
+			$view	 = $form->getView();
+			$order	 = $view->escape($view->getLists()->order);
+			$html .= <<<HTML
+<script type="text/javascript">
+	Joomla.orderTable = function() {
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '$order')
+		{
+			dirn = 'asc';
+		}
+		else {
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn);
+	};
+</script>
+
+HTML;
+		}
+		else
+		{
+			JHtml::_('behavior.tooltip');
+		}
+
+		// Getting all header row elements
+		$headerFields = $form->getHeaderset();
+
+		// Get form parameters
+		$show_header		 = $form->getAttribute('show_header', 1);
+		$show_filters		 = $form->getAttribute('show_filters', 1);
+		$show_pagination	 = $form->getAttribute('show_pagination', 1);
+		$norows_placeholder	 = $form->getAttribute('norows_placeholder', '');
+
+		// Joomla! 3.0 sidebar support
+
+		if (version_compare(JVERSION, '3.0', 'gt'))
+		{
+			$form_class = '';
+
+			if ($show_filters)
+			{
+				JHtmlSidebar::setAction("index.php?option=" .
+					$input->getCmd('option') . "&view=" .
+					FOFInflector::pluralize($input->getCmd('view'))
+				);
+			}
+
+			// Reorder the fields with ordering first
+			$tmpFields = array();
+			$i = 1;
+
+			foreach ($headerFields as $tmpField)
+			{
+				if ($tmpField instanceof FOFFormHeaderOrdering)
+				{
+					$tmpFields[0] = $tmpField;
+				}
+
+				else
+				{
+					$tmpFields[$i] = $tmpField;
+				}
+
+				$i++;
+			}
+
+			$headerFields = $tmpFields;
+			ksort($headerFields, SORT_NUMERIC);
+		}
+		else
+		{
+			$form_class = 'class="form-horizontal"';
+		}
+
+		// Pre-render the header and filter rows
+		$header_html = '';
+		$filter_html = '';
+		$sortFields	 = array();
+
+		if ($show_header || $show_filters)
+		{
+			foreach ($headerFields as $headerField)
+			{
+				$header		 = $headerField->header;
+				$filter		 = $headerField->filter;
+				$buttons	 = $headerField->buttons;
+				$options	 = $headerField->options;
+				$sortable	 = $headerField->sortable;
+				$tdwidth	 = $headerField->tdwidth;
+
+				// Under Joomla! < 3.0 we can't have filter-only fields
+
+				if (version_compare(JVERSION, '3.0', 'lt') && empty($header))
+				{
+					continue;
+				}
+
+				// If it's a sortable field, add to the list of sortable fields
+
+				if ($sortable)
+				{
+					$sortFields[$headerField->name] = JText::_($headerField->label);
+				}
+
+				// Get the table data width, if set
+
+				if (!empty($tdwidth))
+				{
+					$tdwidth = 'width="' . $tdwidth . '"';
+				}
+				else
+				{
+					$tdwidth = '';
+				}
+
+				if (!empty($header))
+				{
+					$header_html .= "\t\t\t\t\t<th $tdwidth>" . PHP_EOL;
+					$header_html .= "\t\t\t\t\t\t" . $header;
+					$header_html .= "\t\t\t\t\t</th>" . PHP_EOL;
+				}
+
+				if (version_compare(JVERSION, '3.0', 'ge'))
+				{
+					// Joomla! 3.0 or later
+					if (!empty($filter))
+					{
+						$filter_html .= '<div class="filter-search btn-group pull-left">' . "\n";
+						$filter_html .= "\t" . '<label for="title" class="element-invisible">';
+						$filter_html .= JText::_($headerField->label);
+						$filter_html .= "</label>\n";
+						$filter_html .= "\t$filter\n";
+						$filter_html .= "</div>\n";
+
+						if (!empty($buttons))
+						{
+							$filter_html .= '<div class="btn-group pull-left hidden-phone">' . "\n";
+							$filter_html .= "\t$buttons\n";
+							$filter_html .= '</div>' . "\n";
+						}
+					}
+					elseif (!empty($options))
+					{
+						$label = $headerField->label;
+
+						JHtmlSidebar::addFilter(
+							'- ' . JText::_($label) . ' -', (string) $headerField->name,
+							JHtml::_(
+								'select.options',
+								$options,
+								'value',
+								'text',
+								$model->getState($headerField->name, ''), true
+							)
+						);
+					}
+				}
+				else
+				{
+					// Joomla! 2.5
+					$filter_html .= "\t\t\t\t\t<td>" . PHP_EOL;
+
+					if (!empty($filter))
+					{
+						$filter_html .= "\t\t\t\t\t\t$filter" . PHP_EOL;
+
+						if (!empty($buttons))
+						{
+							$filter_html .= '<div class="btn-group hidden-phone">' . PHP_EOL;
+							$filter_html .= "\t\t\t\t\t\t$buttons" . PHP_EOL;
+							$filter_html .= '</div>' . PHP_EOL;
+						}
+					}
+					elseif (!empty($options))
+					{
+						$label		 = $headerField->label;
+						$emptyOption = JHtml::_('select.option', '', '- ' . JText::_($label) . ' -');
+						array_unshift($options, $emptyOption);
+						$attribs	 = array(
+							'onchange' => 'document.adminForm.submit();'
+						);
+						$filter		 = JHtml::_('select.genericlist', $options, $headerField->name, $attribs, 'value', 'text', $headerField->value, false, true);
+						$filter_html .= "\t\t\t\t\t\t$filter" . PHP_EOL;
+					}
+
+					$filter_html .= "\t\t\t\t\t</td>" . PHP_EOL;
+				}
+			}
+		}
+
+		// Start the form
+		$filter_order		 = $form->getView()->getLists()->order;
+		$filter_order_Dir	 = $form->getView()->getLists()->order_Dir;
+        $actionUrl           = FOFPlatform::getInstance()->isBackend() ? 'index.php' : JUri::root().'index.php';
+
+		if (FOFPlatform::getInstance()->isFrontend() && ($input->getCmd('Itemid', 0) != 0))
+		{
+			$itemid = $input->getCmd('Itemid', 0);
+			$uri = new JUri($actionUrl);
+
+			if ($itemid)
+			{
+				$uri->setVar('Itemid', $itemid);
+			}
+
+			$actionUrl = JRoute::_($uri->toString());
+		}
+
+		$html .= '<form action="'.$actionUrl.'" method="post" name="adminForm" id="adminForm" ' . $form_class . '>' . PHP_EOL;
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			// Joomla! 3.0+
+			// Get and output the sidebar, if present
+			$sidebar = JHtmlSidebar::render();
+
+			if ($show_filters && !empty($sidebar))
+			{
+				$html .= '<div id="j-sidebar-container" class="span2">' . "\n";
+				$html .= "\t$sidebar\n";
+				$html .= "</div>\n";
+				$html .= '<div id="j-main-container" class="span10">' . "\n";
+			}
+			else
+			{
+				$html .= '<div id="j-main-container">' . "\n";
+			}
+
+			// Render header search fields, if the header is enabled
+
+			if ($show_header)
+			{
+				$html .= "\t" . '<div id="filter-bar" class="btn-toolbar">' . "\n";
+				$html .= "$filter_html\n";
+
+				if ($show_pagination)
+				{
+					// Render the pagination rows per page selection box, if the pagination is enabled
+					$html .= "\t" . '<div class="btn-group pull-right hidden-phone">' . "\n";
+					$html .= "\t\t" . '<label for="limit" class="element-invisible">' . JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC') . '</label>' . "\n";
+					$html .= "\t\t" . $model->getPagination()->getLimitBox() . "\n";
+					$html .= "\t" . '</div>' . "\n";
+				}
+
+				if (!empty($sortFields))
+				{
+					// Display the field sort order
+					$asc_sel	 = ($view->getLists()->order_Dir == 'asc') ? 'selected="selected"' : '';
+					$desc_sel	 = ($view->getLists()->order_Dir == 'desc') ? 'selected="selected"' : '';
+					$html .= "\t" . '<div class="btn-group pull-right hidden-phone">' . "\n";
+					$html .= "\t\t" . '<label for="directionTable" class="element-invisible">' . JText::_('JFIELD_ORDERING_DESC') . '</label>' . "\n";
+					$html .= "\t\t" . '<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">' . "\n";
+					$html .= "\t\t\t" . '<option value="">' . JText::_('JFIELD_ORDERING_DESC') . '</option>' . "\n";
+					$html .= "\t\t\t" . '<option value="asc" ' . $asc_sel . '>' . JText::_('JGLOBAL_ORDER_ASCENDING') . '</option>' . "\n";
+					$html .= "\t\t\t" . '<option value="desc" ' . $desc_sel . '>' . JText::_('JGLOBAL_ORDER_DESCENDING') . '</option>' . "\n";
+					$html .= "\t\t" . '</select>' . "\n";
+					$html .= "\t" . '</div>' . "\n\n";
+
+					// Display the sort fields
+					$html .= "\t" . '<div class="btn-group pull-right">' . "\n";
+					$html .= "\t\t" . '<label for="sortTable" class="element-invisible">' . JText::_('JGLOBAL_SORT_BY') . '</label>' . "\n";
+					$html .= "\t\t" . '<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">' . "\n";
+					$html .= "\t\t\t" . '<option value="">' . JText::_('JGLOBAL_SORT_BY') . '</option>' . "\n";
+					$html .= "\t\t\t" . JHtml::_('select.options', $sortFields, 'value', 'text', $view->getLists()->order) . "\n";
+					$html .= "\t\t" . '</select>' . "\n";
+					$html .= "\t" . '</div>' . "\n";
+				}
+
+				$html .= "\t</div>\n\n";
+				$html .= "\t" . '<div class="clearfix"> </div>' . "\n\n";
+			}
+		}
+
+		// Start the table output
+		$html .= "\t\t" . '<table class="table table-striped" id="itemsList">' . PHP_EOL;
+
+		// Open the table header region if required
+
+		if ($show_header || ($show_filters && version_compare(JVERSION, '3.0', 'lt')))
+		{
+			$html .= "\t\t\t<thead>" . PHP_EOL;
+		}
+
+		// Render the header row, if enabled
+
+		if ($show_header)
+		{
+			$html .= "\t\t\t\t<tr>" . PHP_EOL;
+			$html .= $header_html;
+			$html .= "\t\t\t\t</tr>" . PHP_EOL;
+		}
+
+		// Render filter row if enabled
+
+		if ($show_filters && version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$html .= "\t\t\t\t<tr>";
+			$html .= $filter_html;
+			$html .= "\t\t\t\t</tr>";
+		}
+
+		// Close the table header region if required
+
+		if ($show_header || ($show_filters && version_compare(JVERSION, '3.0', 'lt')))
+		{
+			$html .= "\t\t\t</thead>" . PHP_EOL;
+		}
+
+		// Loop through rows and fields, or show placeholder for no rows
+		$html .= "\t\t\t<tbody>" . PHP_EOL;
+		$fields		 = $form->getFieldset('items');
+		$num_columns = count($fields);
+		$items		 = $model->getItemList();
+
+		if ($count = count($items))
+		{
+			$m = 1;
+
+			foreach ($items as $i => $item)
+			{
+				$table_item = $model->getTable();
+				$table_item->reset();
+				$table_item->bind($item);
+
+				$form->bind($item);
+
+				$m		 = 1 - $m;
+				$class	 = 'row' . $m;
+
+				$html .= "\t\t\t\t<tr class=\"$class\">" . PHP_EOL;
+
+				$fields = $form->getFieldset('items');
+
+				// Reorder the fields to have ordering first
+				if (version_compare(JVERSION, '3.0', 'gt'))
+				{
+					$tmpFields = array();
+					$j = 1;
+
+					foreach ($fields as $tmpField)
+					{
+						if ($tmpField instanceof FOFFormFieldOrdering)
+						{
+							$tmpFields[0] = $tmpField;
+						}
+
+						else
+						{
+							$tmpFields[$j] = $tmpField;
+						}
+
+						$j++;
+					}
+
+					$fields = $tmpFields;
+					ksort($fields, SORT_NUMERIC);
+				}
+
+				foreach ($fields as $field)
+				{
+					$field->rowid	 = $i;
+					$field->item	 = $table_item;
+					$labelClass = $field->labelClass ? $field->labelClass : $field->labelclass; // Joomla! 2.5/3.x use different case for the same name
+					$class			 = $labelClass ? 'class ="' . $labelClass . '"' : '';
+					$html .= "\t\t\t\t\t<td $class>" . $field->getRepeatable() . '</td>' . PHP_EOL;
+				}
+
+				$html .= "\t\t\t\t</tr>" . PHP_EOL;
+			}
+		}
+		elseif ($norows_placeholder)
+		{
+			$html .= "\t\t\t\t<tr><td colspan=\"$num_columns\">";
+			$html .= JText::_($norows_placeholder);
+			$html .= "</td></tr>\n";
+		}
+
+		$html .= "\t\t\t</tbody>" . PHP_EOL;
+
+		// Render the pagination bar, if enabled, on J! 2.5
+		if ($show_pagination && version_compare(JVERSION, '3.0', 'lt'))
+		{
+			$pagination = $model->getPagination();
+			$html .= "\t\t\t<tfoot>" . PHP_EOL;
+			$html .= "\t\t\t\t<tr><td colspan=\"$num_columns\">";
+
+			if (($pagination->total > 0))
+			{
+				$html .= $pagination->getListFooter();
+			}
+
+			$html .= "</td></tr>\n";
+			$html .= "\t\t\t</tfoot>" . PHP_EOL;
+		}
+
+		// End the table output
+		$html .= "\t\t" . '</table>' . PHP_EOL;
+
+		// Render the pagination bar, if enabled, on J! 3.0+
+
+		if ($show_pagination && version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html .= $model->getPagination()->getListFooter();
+		}
+
+		// Close the wrapper element div on Joomla! 3.0+
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			$html .= "</div>\n";
+		}
+
+		$html .= "\t" . '<input type="hidden" name="option" value="' . $input->getCmd('option') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="view" value="' . FOFInflector::pluralize($input->getCmd('view')) . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="task" value="' . $input->getCmd('task', 'browse') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="layout" value="' . $input->getCmd('layout', '') . '" />' . PHP_EOL;
+
+		// The id field is required in Joomla! 3 front-end to prevent the pagination limit box from screwing it up. Huh!!
+
+		if (version_compare(JVERSION, '3.0', 'ge') && FOFPlatform::getInstance()->isFrontend())
+		{
+			$html .= "\t" . '<input type="hidden" name="id" value="' . $input->getCmd('id', '') . '" />' . PHP_EOL;
+		}
+
+		$html .= "\t" . '<input type="hidden" name="boxchecked" value="" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="hidemainmenu" value="" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="filter_order" value="' . $filter_order . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="filter_order_Dir" value="' . $filter_order_Dir . '" />' . PHP_EOL;
+
+		$html .= "\t" . '<input type="hidden" name="' . JFactory::getSession()->getFormToken() . '" value="1" />' . PHP_EOL;
+
+		// End the form
+		$html .= '</form>' . PHP_EOL;
+
+		return $html;
+	}
+
+	/**
+	 * Renders a FOFForm for a Read view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormRead(FOFForm &$form, FOFModel $model, FOFInput $input)
+	{
+		$html = $this->renderFormRaw($form, $model, $input, 'read');
+
+		return $html;
+	}
+
+	/**
+	 * Renders a FOFForm for an Edit view and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form  The form to render
+	 * @param   FOFModel  $model  The model providing our data
+	 * @param   FOFInput  $input  The input object
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormEdit(FOFForm &$form, FOFModel $model, FOFInput $input)
+	{
+		// Get the key for this model's table
+		$key		 = $model->getTable()->getKeyName();
+		$keyValue	 = $model->getId();
+
+		$html = '';
+
+		$validate	 = strtolower($form->getAttribute('validate'));
+
+		if (in_array($validate, array('true', 'yes', '1', 'on')))
+		{
+			JHtml::_('behavior.formvalidation');
+			$class = ' form-validate';
+			$this->loadValidationScript($form);
+		}
+		else
+		{
+			$class = '';
+		}
+
+		// Check form enctype. Use enctype="multipart/form-data" to upload binary files in your form.
+		$template_form_enctype = $form->getAttribute('enctype');
+
+		if (!empty($template_form_enctype))
+		{
+			$enctype = ' enctype="' . $form->getAttribute('enctype') . '" ';
+		}
+		else
+		{
+			$enctype = '';
+		}
+
+		// Check form name. Use name="yourformname" to modify the name of your form.
+		$formname = $form->getAttribute('name');
+
+		if (empty($formname))
+		{
+			$formname = 'adminForm';
+		}
+
+		// Check form ID. Use id="yourformname" to modify the id of your form.
+		$formid = $form->getAttribute('name');
+
+		if (empty($formid))
+		{
+			$formid = 'adminForm';
+		}
+
+		// Check if we have a custom task
+		$customTask = $form->getAttribute('customTask');
+
+		if (empty($customTask))
+		{
+			$customTask = '';
+		}
+
+		// Get the form action URL
+        $actionUrl = FOFPlatform::getInstance()->isBackend() ? 'index.php' : JUri::root().'index.php';
+
+		if (FOFPlatform::getInstance()->isFrontend() && ($input->getCmd('Itemid', 0) != 0))
+		{
+			$itemid = $input->getCmd('Itemid', 0);
+			$uri = new JUri($actionUrl);
+
+			if ($itemid)
+			{
+				$uri->setVar('Itemid', $itemid);
+			}
+
+			$actionUrl = JRoute::_($uri->toString());
+		}
+
+		$html .= '<form action="'.$actionUrl.'" method="post" name="' . $formname .
+			'" id="' . $formid . '"' . $enctype . ' class="form-horizontal' .
+			$class . '">' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="option" value="' . $input->getCmd('option') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="view" value="' . $input->getCmd('view', 'edit') . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="task" value="' . $customTask . '" />' . PHP_EOL;
+		$html .= "\t" . '<input type="hidden" name="' . $key . '" value="' . $keyValue . '" />' . PHP_EOL;
+
+		$html .= "\t" . '<input type="hidden" name="' . JFactory::getSession()->getFormToken() . '" value="1" />' . PHP_EOL;
+
+		$html .= $this->renderFormRaw($form, $model, $input, 'edit');
+		$html .= '</form>';
+
+		return $html;
+	}
+
+	/**
+	 * Renders a raw FOFForm and returns the corresponding HTML
+	 *
+	 * @param   FOFForm   &$form     The form to render
+	 * @param   FOFModel  $model     The model providing our data
+	 * @param   FOFInput  $input     The input object
+	 * @param   string    $formType  The form type e.g. 'edit' or 'read'
+	 *
+	 * @return  string    The HTML rendering of the form
+	 */
+	protected function renderFormRaw(FOFForm &$form, FOFModel $model, FOFInput $input, $formType)
+	{
+		$html = '';
+		$tabHtml = array();
+
+		// Do we have a tabbed form?
+		$isTabbed = $form->getAttribute('tabbed', '0');
+		$isTabbed = in_array($isTabbed, array('true', 'yes', 'on', '1'));
+
+		foreach ($form->getFieldsets() as $fieldset)
+		{
+			if ($isTabbed && $this->isTabFieldset($fieldset))
+			{
+				continue;
+			}
+			elseif ($isTabbed && isset($fieldset->innertab))
+			{
+				$inTab = $fieldset->innertab;
+			}
+			else
+			{
+				$inTab = '__outer';
+			}
+
+			$tabHtml[$inTab][] = $this->renderFieldset($fieldset, $form, $model, $input, $formType, false);
+		}
+
+		// If the form is tabbed, render the tabs bars
+		if ($isTabbed)
+		{
+			$html .= '<ul class="nav nav-tabs">' . PHP_EOL;
+
+			foreach ($form->getFieldsets() as $fieldset)
+			{
+				// Only create tabs for tab fieldsets
+				$isTabbedFieldset = $this->isTabFieldset($fieldset);
+				if (!$isTabbedFieldset)
+				{
+					continue;
+				}
+
+				// Only create tabs if we do have a label
+				if (!isset($fieldset->label) || empty($fieldset->label))
+				{
+					continue;
+				}
+
+				$label = JText::_($fieldset->label);
+				$name = $fieldset->name;
+				$liClass = ($isTabbedFieldset == 2) ? 'class="active"' : '';
+
+				$html .= "<li $liClass><a href=\"#$name\" data-toggle=\"tab\">$label</a></li>" . PHP_EOL;
+			}
+
+			$html .= '</ul>' . "\n\n<div class=\"tab-content\">" . PHP_EOL;
+
+			foreach ($form->getFieldsets() as $fieldset)
+			{
+				if (!$this->isTabFieldset($fieldset))
+				{
+					continue;
+				}
+
+				$html .= $this->renderFieldset($fieldset, $form, $model, $input, $formType, false, $tabHtml);
+			}
+
+			$html .= "</div>\n";
+		}
+
+		if (isset($tabHtml['__outer']))
+		{
+			$html .= implode('', $tabHtml['__outer']);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Renders a raw fieldset of a FOFForm and returns the corresponding HTML
+	 *
+	 * @param   stdClass  &$fieldset   The fieldset to render
+	 * @param   FOFForm   &$form       The form to render
+	 * @param   FOFModel  $model       The model providing our data
+	 * @param   FOFInput  $input       The input object
+	 * @param   string    $formType    The form type e.g. 'edit' or 'read'
+	 * @param   boolean   $showHeader  Should I render the fieldset's header?
+	 *
+	 * @return  string    The HTML rendering of the fieldset
+	 */
+	protected function renderFieldset(stdClass &$fieldset, FOFForm &$form, FOFModel $model, FOFInput $input, $formType, $showHeader = true, &$innerHtml = null)
+	{
+		$html = '';
+
+		$fields = $form->getFieldset($fieldset->name);
+
+		if (isset($fieldset->class))
+		{
+			$class = 'class="' . $fieldset->class . '"';
+		}
+		else
+		{
+			$class = '';
+		}
+
+		if (isset($innerHtml[$fieldset->name]))
+		{
+			$innerclass = isset($fieldset->innerclass) ? ' class="' . $fieldset->innerclass . '"' : '';
+
+			$html .= "\t" . '<div id="' . $fieldset->name . '" ' . $class . '>' . PHP_EOL;
+			$html .= "\t\t" . '<div' . $innerclass . '>' . PHP_EOL;
+		}
+		else
+		{
+			$html .= "\t" . '<div id="' . $fieldset->name . '" ' . $class . '>' . PHP_EOL;
+		}
+
+		$isTabbedFieldset = $this->isTabFieldset($fieldset);
+
+		if (isset($fieldset->label) && !empty($fieldset->label) && !$isTabbedFieldset)
+		{
+			$html .= "\t\t" . '<h3>' . JText::_($fieldset->label) . '</h3>' . PHP_EOL;
+		}
+
+		foreach ($fields as $field)
+		{
+			$groupClass	 = $form->getFieldAttribute($field->fieldname, 'groupclass', '', $field->group);
+
+			// Auto-generate label and description if needed
+			// Field label
+			$title 		 = $form->getFieldAttribute($field->fieldname, 'label', '', $field->group);
+			$emptylabel  = $form->getFieldAttribute($field->fieldname, 'emptylabel', false, $field->group);
+
+			if (empty($title) && !$emptylabel)
+			{
+				$model->getName();
+				$title = strtoupper($input->get('option') . '_' . $model->getName() . '_' . $field->id . '_LABEL');
+			}
+
+			// Field description
+			$description = $form->getFieldAttribute($field->fieldname, 'description', '', $field->group);
+
+			/**
+			 * The following code is backwards incompatible. Most forms don't require a description in their form
+			 * fields. Having to use emptydescription="1" on each one of them is an overkill. Removed.
+			 */
+			/*
+			$emptydescription   = $form->getFieldAttribute($field->fieldname, 'emptydescription', false, $field->group);
+			if (empty($description) && !$emptydescription)
+			{
+				$description = strtoupper($input->get('option') . '_' . $model->getName() . '_' . $field->id . '_DESC');
+			}
+			*/
+
+			if ($formType == 'read')
+			{
+				$inputField = $field->static;
+			}
+			elseif ($formType == 'edit')
+			{
+				$inputField = $field->input;
+			}
+
+			if (empty($title))
+			{
+				$html .= "\t\t\t" . $inputField . PHP_EOL;
+
+				if (!empty($description) && $formType == 'edit')
+				{
+					$html .= "\t\t\t\t" . '<span class="help-block">';
+					$html .= JText::_($description) . '</span>' . PHP_EOL;
+				}
+			}
+			else
+			{
+				$html .= "\t\t\t" . '<div class="control-group ' . $groupClass . '">' . PHP_EOL;
+				$html .= $this->renderFieldsetLabel($field, $form, $title);
+				$html .= "\t\t\t\t" . '<div class="controls">' . PHP_EOL;
+				$html .= "\t\t\t\t\t" . $inputField . PHP_EOL;
+
+				if (!empty($description))
+				{
+					$html .= "\t\t\t\t" . '<span class="help-block">';
+					$html .= JText::_($description) . '</span>' . PHP_EOL;
+				}
+
+				$html .= "\t\t\t\t" . '</div>' . PHP_EOL;
+				$html .= "\t\t\t" . '</div>' . PHP_EOL;
+			}
+		}
+
+		if (isset($innerHtml[$fieldset->name]))
+		{
+			$html .= "\t\t" . '</div>' . PHP_EOL;
+			$html .= implode('', $innerHtml[$fieldset->name]) . PHP_EOL;
+			$html .= "\t" . '</div>' . PHP_EOL;
+		}
+		else
+		{
+			$html .= "\t" . '</div>' . PHP_EOL;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Renders a label for a fieldset.
+	 *
+	 * @param   object  	$field  	The field of the label to render
+	 * @param   FOFForm   	&$form      The form to render
+	 * @param 	string		$title		The title of the label
+	 *
+	 * @return 	string		The rendered label
+	 */
+	protected function renderFieldsetLabel($field, FOFForm &$form, $title)
+	{
+		$html = '';
+
+		$labelClass	 = $field->labelClass ? $field->labelClass : $field->labelclass; // Joomla! 2.5/3.x use different case for the same name
+		$required	 = $field->required;
+
+		$tooltip = $form->getFieldAttribute($field->fieldname, 'tooltip', '', $field->group);
+
+		if (!empty($tooltip))
+		{
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				static $loadedTooltipScript = false;
+
+				if (!$loadedTooltipScript)
+				{
+					$js = <<<JS
+(function($)
+{
+	$(document).ready(function()
+	{
+		$('.fof-tooltip').tooltip({placement: 'top'});
+	});
+})(akeeba.jQuery);
+JS;
+					$document = FOFPlatform::getInstance()->getDocument();
+
+					if ($document instanceof JDocument)
+					{
+						$document->addScriptDeclaration($js);
+					}
+
+					$loadedTooltipScript = true;
+				}
+
+				$tooltipText = '<strong>' . JText::_($title) . '</strong><br />' . JText::_($tooltip);
+
+				$html .= "\t\t\t\t" . '<label class="control-label fof-tooltip ' . $labelClass . '" for="' . $field->id . '" title="' . $tooltipText . '" data-toggle="fof-tooltip">';
+			}
+			else
+			{
+				// Joomla! 2.5 has a conflict with the jQueryUI tooltip, therefore we
+				// have to use native Joomla! 2.5 tooltips
+				JHtml::_('behavior.tooltip');
+
+				$tooltipText = JText::_($title) . '::' . JText::_($tooltip);
+
+				$html .= "\t\t\t\t" . '<label class="control-label hasTip ' . $labelClass . '" for="' . $field->id . '" title="' . $tooltipText . '" rel="tooltip">';
+			}
+		}
+		else
+		{
+			$html .= "\t\t\t\t" . '<label class="control-label ' . $labelClass . '" for="' . $field->id . '">';
+		}
+
+		$html .= JText::_($title);
+
+		if ($required)
+		{
+			$html .= ' *';
+		}
+
+		$html .= '</label>' . PHP_EOL;
+
+		return $html;
+	}
+}
diff --git a/core/libraries/fof/string/utils.php b/core/libraries/fof/string/utils.php
new file mode 100644
index 00000000..b0ce0356
--- /dev/null
+++ b/core/libraries/fof/string/utils.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Helper class with utilitarian functions concerning strings
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+abstract class FOFStringUtils
+{
+	/**
+	 * Convert a string into a slug (alias), suitable for use in URLs. Please
+	 * note that transliteration suupport is rudimentary at this stage.
+	 *
+	 * @param   string  $value  A string to convert to slug
+	 *
+	 * @return  string  The slug
+	 */
+	public static function toSlug($value)
+	{
+		// Remove any '-' from the string they will be used as concatonater
+		$value = str_replace('-', ' ', $value);
+
+		// Convert to ascii characters
+		$value = self::toASCII($value);
+
+		// Lowercase and trim
+		$value = trim(strtolower($value));
+
+		// Remove any duplicate whitespace, and ensure all characters are alphanumeric
+		$value = preg_replace(array('/\s+/', '/[^A-Za-z0-9\-_]/'), array('-', ''), $value);
+
+		// Limit length
+		if (strlen($value) > 100)
+		{
+			$value = substr($value, 0, 100);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Convert common norhern European languages' letters into plain ASCII. This
+	 * is a rudimentary transliteration.
+	 *
+	 * @param   string  $value  The value to convert to ASCII
+	 *
+	 * @return  string  The converted string
+	 */
+	public static function toASCII($value)
+	{
+		$string = htmlentities(utf8_decode($value), null, 'ISO-8859-1');
+		$string = preg_replace(
+			array('/&szlig;/', '/&(..)lig;/', '/&([aouAOU])uml;/', '/&(.)[^;]*;/'), array('ss', "$1", "$1" . 'e', "$1"), $string
+		);
+
+		return $string;
+	}
+
+	/**
+	 * Convert a string to a boolean.
+	 *
+	 * @param   string  $string  The string.
+	 *
+	 * @return  boolean  The converted string
+	 */
+	public static function toBool($string)
+	{
+		$string = trim((string) $string);
+
+		if ($string == 'true')
+		{
+			return true;
+		}
+
+		if ($string == 'false')
+		{
+			return false;
+		}
+
+		return (bool) $string;
+	}
+}
diff --git a/core/libraries/fof/table/behavior.php b/core/libraries/fof/table/behavior.php
new file mode 100644
index 00000000..4d3f2161
--- /dev/null
+++ b/core/libraries/fof/table/behavior.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework table behavior class. It defines the events which are
+ * called by a Table.
+ *
+ * @codeCoverageIgnore
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+abstract class FOFTableBehavior extends FOFUtilsObservableEvent
+{
+	/**
+	 * This event runs before binding data to the table
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   array     &$data   The data to bind
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function onBeforeBind(&$table, &$data)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after binding data to the table
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   object|array  &$src  The data to bind
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function onAfterBind(&$table, &$src)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after loading a record from the database
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   boolean  &$result  Did the load succeeded?
+	 *
+	 * @return  void
+	 */
+	public function onAfterLoad(&$table, &$result)
+	{
+
+	}
+
+	/**
+	 * The event which runs before storing (saving) data to the database
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   boolean  $updateNulls  Should nulls be saved as nulls (true) or just skipped over (false)?
+	 *
+	 * @return  boolean  True to allow saving
+	 */
+	public function onBeforeStore(&$table, $updateNulls)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after storing (saving) data to the database
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 *
+	 * @return  boolean  True to allow saving without an error
+	 */
+	public function onAfterStore(&$table)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs before moving a record
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   boolean  $updateNulls  Should nulls be saved as nulls (true) or just skipped over (false)?
+	 *
+	 * @return  boolean  True to allow moving
+	 */
+	public function onBeforeMove(&$table, $updateNulls)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after moving a record
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 *
+	 * @return  boolean  True to allow moving without an error
+	 */
+	public function onAfterMove(&$table)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs before reordering a table
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   string  $where  The WHERE clause of the SQL query to run on reordering (record filter)
+	 *
+	 * @return  boolean  True to allow reordering
+	 */
+	public function onBeforeReorder(&$table, $where = '')
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after reordering a table
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 *
+	 * @return  boolean  True to allow the reordering to complete without an error
+	 */
+	public function onAfterReorder(&$table)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs before deleting a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record to delete
+	 *
+	 * @return  boolean  True to allow the deletion
+	 */
+	public function onBeforeDelete(&$table, $oid)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after deleting a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record which was deleted
+	 *
+	 * @return  boolean  True to allow the deletion without errors
+	 */
+	public function onAfterDelete(&$table, $oid)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs before hitting a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record to hit
+	 * @param   boolean  $log  Should we log the hit?
+	 *
+	 * @return  boolean  True to allow the hit
+	 */
+	public function onBeforeHit(&$table, $oid, $log)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after hitting a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record which was hit
+	 *
+	 * @return  boolean  True to allow the hitting without errors
+	 */
+	public function onAfterHit(&$table, $oid)
+	{
+		return true;
+	}
+
+	/**
+	 * The even which runs before copying a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record being copied
+	 *
+	 * @return  boolean  True to allow the copy to take place
+	 */
+	public function onBeforeCopy(&$table, $oid)
+	{
+		return true;
+	}
+
+	/**
+	 * The even which runs after copying a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record which was copied (not the new one)
+	 *
+	 * @return  boolean  True to allow the copy without errors
+	 */
+	public function onAfterCopy(&$table, $oid)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs before a record is (un)published
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer|array  &$cid     The PK IDs of the records being (un)published
+	 * @param   integer        $publish  1 to publish, 0 to unpublish
+	 *
+	 * @return  boolean  True to allow the (un)publish to proceed
+	 */
+	public function onBeforePublish(&$table, &$cid, $publish)
+	{
+		return true;
+	}
+
+	/**
+	 * The event which runs after the object is reset to its default values.
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 *
+	 * @return  boolean  True to allow the reset to complete without errors
+	 */
+	public function onAfterReset(&$table)
+	{
+		return true;
+	}
+
+	/**
+	 * The even which runs before the object is reset to its default values.
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 *
+	 * @return  boolean  True to allow the reset to complete
+	 */
+	public function onBeforeReset(&$table)
+	{
+		return true;
+	}
+}
diff --git a/core/libraries/fof/table/behavior/assets.php b/core/libraries/fof/table/behavior/assets.php
new file mode 100644
index 00000000..d1c21511
--- /dev/null
+++ b/core/libraries/fof/table/behavior/assets.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework table behavior class for assets
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFTableBehaviorAssets extends FOFTableBehavior
+{
+	/**
+	 * The event which runs after storing (saving) data to the database
+	 *
+	 * @param   FOFTable  &$table       The table which calls this event
+	 *
+	 * @return  boolean  True to allow saving
+	 */
+	public function onAfterStore(&$table)
+	{
+		$result = true;
+
+		$asset_id_field	= $table->getColumnAlias('asset_id');
+
+		if (in_array($asset_id_field, $table->getKnownFields()))
+		{
+			if (!empty($table->$asset_id_field))
+			{
+				$currentAssetId = $table->$asset_id_field;
+			}
+
+			// The asset id field is managed privately by this class.
+			if ($table->isAssetsTracked())
+			{
+				unset($table->$asset_id_field);
+			}
+		}
+
+		// Create the object used for inserting/udpating data to the database
+		$fields     = $table->getTableFields();
+
+		// Let's remove the asset_id field, since we unset the property above and we would get a PHP notice
+		if (isset($fields[$asset_id_field]))
+		{
+			unset($fields[$asset_id_field]);
+		}
+
+		// Asset Tracking
+		if (in_array($asset_id_field, $table->getKnownFields()) && $table->isAssetsTracked())
+		{
+			$parentId = $table->getAssetParentId();
+
+            try{
+                $name     = $table->getAssetName();
+            }
+            catch(Exception $e)
+            {
+                $table->setError($e->getMessage());
+                return false;
+            }
+
+			$title    = $table->getAssetTitle();
+
+			$asset = JTable::getInstance('Asset');
+			$asset->loadByName($name);
+
+			// Re-inject the asset id.
+			$this->$asset_id_field = $asset->id;
+
+			// Check for an error.
+			$error = $asset->getError();
+
+            // Since we are using JTable, there is no way to mock it and test for failures :(
+            // @codeCoverageIgnoreStart
+			if ($error)
+			{
+				$table->setError($error);
+
+				return false;
+			}
+            // @codeCoverageIgnoreEnd
+
+			// Specify how a new or moved node asset is inserted into the tree.
+            // Since we're unsetting the table field before, this statement is always true...
+			if (empty($table->$asset_id_field) || $asset->parent_id != $parentId)
+			{
+				$asset->setLocation($parentId, 'last-child');
+			}
+
+			// Prepare the asset to be stored.
+			$asset->parent_id = $parentId;
+			$asset->name      = $name;
+			$asset->title     = $title;
+
+			if ($table->getRules() instanceof JAccessRules)
+			{
+				$asset->rules = (string) $table->getRules();
+			}
+
+            // Since we are using JTable, there is no way to mock it and test for failures :(
+            // @codeCoverageIgnoreStart
+			if (!$asset->check() || !$asset->store())
+			{
+				$table->setError($asset->getError());
+
+				return false;
+			}
+            // @codeCoverageIgnoreEnd
+
+			// Create an asset_id or heal one that is corrupted.
+			if (empty($table->$asset_id_field) || (($currentAssetId != $table->$asset_id_field) && !empty($table->$asset_id_field)))
+			{
+				// Update the asset_id field in this table.
+				$table->$asset_id_field = (int) $asset->id;
+
+				$k = $table->getKeyName();
+
+                $db = $table->getDbo();
+
+				$query = $db->getQuery(true)
+				            ->update($db->qn($table->getTableName()))
+				            ->set($db->qn($asset_id_field).' = ' . (int) $table->$asset_id_field)
+				            ->where($db->qn($k) . ' = ' . (int) $table->$k);
+
+				$db->setQuery($query)->execute();
+			}
+
+			$result = true;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * The event which runs after binding data to the table
+	 *
+	 * @param   FOFTable      &$table  The table which calls this event
+	 * @param   object|array  &$src    The data to bind
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function onAfterBind(&$table, &$src)
+	{
+		// Set rules for assets enabled tables
+		if ($table->isAssetsTracked())
+		{
+			// Bind the rules.
+			if (isset($src['rules']) && is_array($src['rules']))
+			{
+                // We have to manually remove any empty value, since they will be converted to int,
+                // and "Inherited" values will become "Denied". Joomla is doing this manually, too.
+                // @todo Should we move this logic inside the setRules method?
+                $rules = array();
+
+                foreach ($src['rules'] as $action => $ids)
+                {
+                    // Build the rules array.
+                    $rules[$action] = array();
+
+                    foreach ($ids as $id => $p)
+                    {
+                        if ($p !== '')
+                        {
+                            $rules[$action][$id] = ($p == '1' || $p == 'true') ? true : false;
+                        }
+                    }
+                }
+
+				$table->setRules($rules);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before deleting a record
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   integer   $oid     The PK value of the record to delete
+	 *
+	 * @return  boolean  True to allow the deletion
+	 */
+	public function onBeforeDelete(&$table, $oid)
+	{
+		// If tracking assets, remove the asset first.
+		if ($table->isAssetsTracked())
+		{
+            $k = $table->getKeyName();
+
+            // If the table is not loaded, let's try to load it with the id
+            if(!$table->$k)
+            {
+                $table->load($oid);
+            }
+
+            // If I have an invalid assetName I have to stop
+            try
+            {
+                $name = $table->getAssetName();
+            }
+            catch(Exception $e)
+            {
+                $table->setError($e->getMessage());
+                return false;
+            }
+
+			// Do NOT touch JTable here -- we are loading the core asset table which is a JTable, not a FOFTable
+			$asset = JTable::getInstance('Asset');
+
+			if ($asset->loadByName($name))
+			{
+                // Since we are using JTable, there is no way to mock it and test for failures :(
+                // @codeCoverageIgnoreStart
+				if (!$asset->delete())
+				{
+					$table->setError($asset->getError());
+
+					return false;
+				}
+                // @codeCoverageIgnoreEnd
+			}
+			else
+			{
+                // I'll simply return true even if I couldn't load the asset. In this way I can still
+                // delete a broken record
+				return true;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/fof/table/behavior/contenthistory.php b/core/libraries/fof/table/behavior/contenthistory.php
new file mode 100644
index 00000000..ce6c8a63
--- /dev/null
+++ b/core/libraries/fof/table/behavior/contenthistory.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework table behavior class for content History
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.2.0
+ */
+class FOFTableBehaviorContenthistory extends FOFTableBehavior
+{
+	/**
+	 * The event which runs after storing (saving) data to the database
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 *
+	 * @return  boolean  True to allow saving without an error
+	 */
+	public function onAfterStore(&$table)
+	{
+		$aliasParts = explode('.', $table->getContentType());
+		$table->checkContentType();
+
+		if (JComponentHelper::getParams($aliasParts[0])->get('save_history', 0))
+		{
+			$historyHelper = new JHelperContenthistory($table->getContentType());
+			$historyHelper->store($table);
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before deleting a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record to delete
+	 *
+	 * @return  boolean  True to allow the deletion
+	 */
+	public function onBeforeDelete(&$table, $oid)
+	{
+		$aliasParts = explode('.', $table->getContentType());
+
+		if (JComponentHelper::getParams($aliasParts[0])->get('save_history', 0))
+		{
+			$historyHelper = new JHelperContenthistory($table->getContentType());
+			$historyHelper->deleteHistory($table);
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/fof/table/behavior/tags.php b/core/libraries/fof/table/behavior/tags.php
new file mode 100644
index 00000000..7eb1d27c
--- /dev/null
+++ b/core/libraries/fof/table/behavior/tags.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework table behavior class for tags
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFTableBehaviorTags extends FOFTableBehavior
+{
+	/**
+	 * The event which runs after binding data to the table
+	 *
+	 * @param   FOFTable  		&$table  	The table which calls this event
+	 * @param   object|array  	&$src  		The data to bind
+	 * @param  	array 			$options 	The options of the table
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function onAfterBind(&$table, &$src, $options = array())
+	{
+		// Bind tags
+		if ($table->hasTags())
+		{
+			if ((!empty($src['tags']) && $src['tags'][0] != ''))
+			{
+				$table->newTags = $src['tags'];
+			}
+
+			// Check if the content type exists, and create it if it does not
+			$table->checkContentType();
+
+			$tagsTable = clone($table);
+
+			$tagsHelper = new JHelperTags();
+			$tagsHelper->typeAlias = $table->getContentType();
+
+			// TODO: This little guy here fails because JHelperTags
+			// need a JTable object to work, while our is FOFTable
+			// Need probably to write our own FOFHelperTags
+			// Thank you com_tags
+			if (!$tagsHelper->postStoreProcess($tagsTable))
+			{
+				$table->setError('Error storing tags');
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before storing (saving) data to the database
+	 *
+	 * @param   FOFTable  &$table  The table which calls this event
+	 * @param   boolean  $updateNulls  Should nulls be saved as nulls (true) or just skipped over (false)?
+	 *
+	 * @return  boolean  True to allow saving
+	 */
+	public function onBeforeStore(&$table, $updateNulls)
+	{
+		if ($table->hasTags())
+		{
+			$tagsHelper = new JHelperTags();
+			$tagsHelper->typeAlias = $table->getContentType();
+
+			// TODO: JHelperTags sucks in Joomla! 3.1, it requires that tags are
+			// stored in the metadata property. Not our case, therefore we need
+			// to add it in a fake object. We sent a PR to Joomla! CMS to fix
+			// that. Once it's accepted, we'll have to remove the attrocity
+			// here...
+			$tagsTable = clone($table);
+			$tagsHelper->preStoreProcess($tagsTable);
+		}
+	}
+
+	/**
+	 * The event which runs after deleting a record
+	 *
+	 * @param   FOFTable &$table  The table which calls this event
+	 * @param   integer  $oid  The PK value of the record which was deleted
+	 *
+	 * @return  boolean  True to allow the deletion without errors
+	 */
+	public function onAfterDelete(&$table, $oid)
+	{
+		// If this resource has tags, delete the tags first
+		if ($table->hasTags())
+		{
+			$tagsHelper = new JHelperTags();
+			$tagsHelper->typeAlias = $table->getContentType();
+
+			if (!$tagsHelper->deleteTagData($table, $oid))
+			{
+				$table->setError('Error deleting Tags');
+				return false;
+			}
+		}
+	}
+}
diff --git a/core/libraries/fof/table/dispatcher/behavior.php b/core/libraries/fof/table/dispatcher/behavior.php
new file mode 100644
index 00000000..d46d3c00
--- /dev/null
+++ b/core/libraries/fof/table/dispatcher/behavior.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework table behavior dispatcher class
+ *
+ * @codeCoverageIgnore
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFTableDispatcherBehavior extends FOFUtilsObservableDispatcher
+{
+
+}
diff --git a/core/libraries/fof/table/nested.php b/core/libraries/fof/table/nested.php
new file mode 100644
index 00000000..e57679ed
--- /dev/null
+++ b/core/libraries/fof/table/nested.php
@@ -0,0 +1,2211 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A class to manage tables holding nested sets (hierarchical data)
+ *
+ * @property int    $lft   Left value (for nested set implementation)
+ * @property int    $rgt   Right value (for nested set implementation)
+ * @property string $hash  Slug hash (optional; for faster searching)
+ * @property string $slug  Node's slug (optional)
+ * @property string $title Title of the node (optional)
+ */
+class FOFTableNested extends FOFTable
+{
+	/** @var int The level (depth) of this node in the tree */
+	protected $treeDepth = null;
+
+	/** @var FOFTableNested The root node in the tree */
+	protected $treeRoot = null;
+
+	/** @var FOFTableNested The parent node of ourselves */
+	protected $treeParent = null;
+
+	/** @var bool Should I perform a nested get (used to query ascendants/descendants) */
+	protected $treeNestedGet = false;
+
+	/** @var   array  A collection of custom, additional where clauses to apply during buildQuery */
+	protected $whereClauses = array();
+
+	/**
+	 * Public constructor. Overrides the parent constructor, making sure there are lft/rgt columns which make it
+	 * compatible with nested sets.
+	 *
+	 * @param   string          $table  Name of the database table to model.
+	 * @param   string          $key    Name of the primary key field in the table.
+	 * @param   FOFDatabaseDriver &$db    Database driver
+	 * @param   array           $config The configuration parameters array
+	 *
+	 * @throws \RuntimeException When lft/rgt columns are not found
+	 */
+	public function __construct($table, $key, &$db, $config = array())
+	{
+		parent::__construct($table, $key, $db, $config);
+
+		if (!$this->hasField('lft') || !$this->hasField('rgt'))
+		{
+			throw new \RuntimeException("Table " . $this->getTableName() . " is not compatible with FOFTableNested: it does not have lft/rgt columns");
+		}
+	}
+
+	/**
+	 * Overrides the automated table checks to handle the 'hash' column for faster searching
+	 *
+	 * @return boolean
+	 */
+	public function check()
+	{
+		// Create a slug if there is a title and an empty slug
+		if ($this->hasField('title') && $this->hasField('slug') && empty($this->slug))
+		{
+			$this->slug = FOFStringUtils::toSlug($this->title);
+		}
+
+		// Create the SHA-1 hash of the slug for faster searching (make sure the hash column is CHAR(64) to take
+		// advantage of MySQL's optimised searching for fixed size CHAR columns)
+		if ($this->hasField('hash') && $this->hasField('slug'))
+		{
+			$this->hash = sha1($this->slug);
+		}
+
+		// Reset cached values
+		$this->resetTreeCache();
+
+		return parent::check();
+	}
+
+	/**
+	 * Delete a node, either the currently loaded one or the one specified in $id. If an $id is specified that node
+	 * is loaded before trying to delete it. In the end the data model is reset. If the node has any children nodes
+	 * they will be removed before the node itself is deleted.
+	 *
+	 * @param   integer $oid       The primary key value of the item to delete
+	 *
+	 * @throws  UnexpectedValueException
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function delete($oid = null)
+	{
+		// Load the specified record (if necessary)
+		if (!empty($oid))
+		{
+			$this->load($oid);
+		}
+
+        $k  = $this->_tbl_key;
+        $pk = (!$oid) ? $this->$k : $oid;
+
+        // If no primary key is given, return false.
+        if (!$pk)
+        {
+            throw new UnexpectedValueException('Null primary key not allowed.');
+        }
+
+        // Execute the logic only if I have a primary key, otherwise I could have weird results
+        // Perform the checks on the current node *BEFORE* starting to delete the children
+        if (!$this->onBeforeDelete($oid))
+        {
+            return false;
+        }
+
+        $result = true;
+
+		// Recursively delete all children nodes as long as we are not a leaf node and $recursive is enabled
+		if (!$this->isLeaf())
+		{
+			// Get all sub-nodes
+			$table = $this->getClone();
+			$table->bind($this->getData());
+			$subNodes = $table->getDescendants();
+
+			// Delete all subnodes (goes through the model to trigger the observers)
+			if (!empty($subNodes))
+			{
+				/** @var FOFTableNested $item */
+				foreach ($subNodes as $item)
+				{
+                    // We have to pass the id, so we are getting it again from the database.
+                    // We have to do in this way, since a previous child could have changed our lft and rgt values
+					if(!$item->delete($item->$k))
+                    {
+                        // A subnode failed or prevents the delete, continue deleting other nodes,
+                        // but preserve the current node (ie the parent)
+                        $result = false;
+                    }
+				};
+
+                // Load it again, since while deleting a children we could have updated ourselves, too
+                $this->load($pk);
+			}
+		}
+
+        if($result)
+        {
+            // Delete the row by primary key.
+            $query = $this->_db->getQuery(true);
+            $query->delete();
+            $query->from($this->_tbl);
+            $query->where($this->_tbl_key . ' = ' . $this->_db->q($pk));
+
+            $this->_db->setQuery($query)->execute();
+
+            $result = $this->onAfterDelete($oid);
+        }
+
+		return $result;
+	}
+
+    protected function onAfterDelete($oid)
+    {
+        $db = $this->getDbo();
+
+        $myLeft  = $this->lft;
+        $myRight = $this->rgt;
+
+        $fldLft = $db->qn($this->getColumnAlias('lft'));
+        $fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+        // Move all siblings to the left
+        $width = $this->rgt - $this->lft + 1;
+
+        // Wrap everything in a transaction
+        $db->transactionStart();
+
+        try
+        {
+            // Shrink lft values
+            $query = $db->getQuery(true)
+                        ->update($db->qn($this->getTableName()))
+                        ->set($fldLft . ' = ' . $fldLft . ' - '.$width)
+                        ->where($fldLft . ' > ' . $db->q($myLeft));
+            $db->setQuery($query)->execute();
+
+            // Shrink rgt values
+            $query = $db->getQuery(true)
+                        ->update($db->qn($this->getTableName()))
+                        ->set($fldRgt . ' = ' . $fldRgt . ' - '.$width)
+                        ->where($fldRgt . ' > ' . $db->q($myRight));
+            $db->setQuery($query)->execute();
+
+            // Commit the transaction
+            $db->transactionCommit();
+        }
+        catch (\Exception $e)
+        {
+            // Roll back the transaction on error
+            $db->transactionRollback();
+
+            throw $e;
+        }
+
+        return parent::onAfterDelete($oid);
+    }
+
+	/**
+	 * Not supported in nested sets
+	 *
+	 * @param   string $where Ignored
+	 *
+	 * @return  void
+	 *
+	 * @throws  RuntimeException
+	 */
+	public function reorder($where = '')
+	{
+		throw new RuntimeException('reorder() is not supported by FOFTableNested');
+	}
+
+	/**
+	 * Not supported in nested sets
+	 *
+	 * @param   integer $delta Ignored
+	 * @param   string  $where Ignored
+	 *
+	 * @return  void
+	 *
+	 * @throws  RuntimeException
+	 */
+	public function move($delta, $where = '')
+	{
+		throw new RuntimeException('move() is not supported by FOFTableNested');
+	}
+
+	/**
+	 * Create a new record with the provided data. It is inserted as the last child of the current node's parent
+	 *
+	 * @param   array $data The data to use in the new record
+	 *
+	 * @return  static  The new node
+	 */
+	public function create($data)
+	{
+		$newNode = $this->getClone();
+		$newNode->reset();
+		$newNode->bind($data);
+
+		if ($this->isRoot())
+		{
+			return $newNode->insertAsChildOf($this);
+		}
+		else
+		{
+			return $newNode->insertAsChildOf($this->getParent());
+		}
+	}
+
+	/**
+	 * Makes a copy of the record, inserting it as the last child of the given node's parent.
+	 *
+	 * @param   integer|array  $cid  The primary key value (or values) or the record(s) to copy. 
+	 *                               If null, the current record will be copied
+	 * 
+	 * @return self|FOFTableNested	 The last copied node
+	 */
+	public function copy($cid = null)
+	{
+		//We have to cast the id as array, or the helper function will return an empty set
+		if($cid)
+		{
+			$cid = (array) $cid;
+		}
+
+        FOFUtilsArray::toInteger($cid);
+		$k = $this->_tbl_key;
+
+		if (count($cid) < 1)
+		{
+			if ($this->$k)
+			{
+				$cid = array($this->$k);
+			}
+			else
+			{
+				// Even if it's null, let's still create the record
+				$this->create($this->getData());
+				
+				return $this;
+			}
+		}
+
+		foreach ($cid as $item)
+		{
+			// Prevent load with id = 0
+
+			if (!$item)
+			{
+				continue;
+			}
+
+			$this->load($item);
+			
+			$this->create($this->getData());
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to reset class properties to the defaults set in the class
+	 * definition. It will ignore the primary key as well as any private class
+	 * properties.
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->resetTreeCache();
+
+		parent::reset();
+	}
+
+	/**
+	 * Insert the current node as a tree root. It is a good idea to never use this method, instead providing a root node
+	 * in your schema installation and then sticking to only one root.
+	 *
+	 * @return self
+	 */
+	public function insertAsRoot()
+	{
+        // You can't insert a node that is already saved i.e. the table has an id
+        if($this->getId())
+        {
+            throw new RuntimeException(__METHOD__.' can be only used with new nodes');
+        }
+
+		// First we need to find the right value of the last parent, a.k.a. the max(rgt) of the table
+		$db = $this->getDbo();
+
+		// Get the lft/rgt names
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$query = $db->getQuery(true)
+			->select('MAX(' . $fldRgt . ')')
+			->from($db->qn($this->getTableName()));
+		$maxRgt = $db->setQuery($query, 0, 1)->loadResult();
+
+		if (empty($maxRgt))
+		{
+			$maxRgt = 0;
+		}
+
+		$this->lft = ++$maxRgt;
+		$this->rgt = ++$maxRgt;
+
+		$this->store();
+
+		return $this;
+	}
+
+	/**
+	 * Insert the current node as the first (leftmost) child of a parent node.
+	 *
+	 * WARNING: If it's an existing node it will be COPIED, not moved.
+	 *
+	 * @param FOFTableNested $parentNode The node which will become our parent
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function insertAsFirstChildOf(FOFTableNested &$parentNode)
+	{
+        if($parentNode->lft >= $parentNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the parent node');
+        }
+
+		// Get a reference to the database
+		$db = $this->getDbo();
+
+		// Get the field names
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+
+        // Nullify the PK, so a new record will be created
+        $pk = $this->getKeyName();
+        $this->$pk = null;
+
+		// Get the value of the parent node's rgt
+		$myLeft = $parentNode->lft;
+
+		// Update my lft/rgt values
+		$this->lft = $myLeft + 1;
+		$this->rgt = $myLeft + 2;
+
+		// Update parent node's right (we added two elements in there, remember?)
+		$parentNode->rgt += 2;
+
+		// Wrap everything in a transaction
+		$db->transactionStart();
+
+		try
+		{
+			// Make a hole (2 queries)
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($fldLft . ' = ' . $fldLft . '+2')
+				->where($fldLft . ' > ' . $db->q($myLeft));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($fldRgt . ' = ' . $fldRgt . '+ 2')
+				->where($fldRgt . '>' . $db->q($myLeft));
+			$db->setQuery($query)->execute();
+
+			// Insert the new node
+			$this->store();
+
+			// Commit the transaction
+			$db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			// Roll back the transaction on error
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Insert the current node as the last (rightmost) child of a parent node.
+	 *
+	 * WARNING: If it's an existing node it will be COPIED, not moved.
+	 *
+	 * @param FOFTableNested $parentNode The node which will become our parent
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function insertAsLastChildOf(FOFTableNested &$parentNode)
+	{
+        if($parentNode->lft >= $parentNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the parent node');
+        }
+
+		// Get a reference to the database
+		$db = $this->getDbo();
+
+		// Get the field names
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+
+        // Nullify the PK, so a new record will be created
+        $pk = $this->getKeyName();
+        $this->$pk = null;
+
+		// Get the value of the parent node's lft
+		$myRight = $parentNode->rgt;
+
+		// Update my lft/rgt values
+		$this->lft = $myRight;
+		$this->rgt = $myRight + 1;
+
+		// Update parent node's right (we added two elements in there, remember?)
+		$parentNode->rgt += 2;
+
+		// Wrap everything in a transaction
+		$db->transactionStart();
+
+		try
+		{
+			// Make a hole (2 queries)
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($fldRgt . ' = ' . $fldRgt . '+2')
+				->where($fldRgt . '>=' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($fldLft . ' = ' . $fldLft . '+2')
+				->where($fldLft . '>' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Insert the new node
+			$this->store();
+
+			// Commit the transaction
+			$db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			// Roll back the transaction on error
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Alias for insertAsLastchildOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $parentNode
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 */
+	public function insertAsChildOf(FOFTableNested &$parentNode)
+	{
+		return $this->insertAsLastChildOf($parentNode);
+	}
+
+	/**
+	 * Insert the current node to the left of (before) a sibling node
+	 *
+	 * WARNING: If it's an existing node it will be COPIED, not moved.
+	 *
+	 * @param FOFTableNested $siblingNode We will be inserted before this node
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function insertLeftOf(FOFTableNested &$siblingNode)
+	{
+        if($siblingNode->lft >= $siblingNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the sibling node');
+        }
+
+		// Get a reference to the database
+		$db = $this->getDbo();
+
+		// Get the field names
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+
+        // Nullify the PK, so a new record will be created
+        $pk = $this->getKeyName();
+        $this->$pk = null;
+
+		// Get the value of the parent node's rgt
+		$myLeft = $siblingNode->lft;
+
+		// Update my lft/rgt values
+		$this->lft = $myLeft;
+		$this->rgt = $myLeft + 1;
+
+		// Update sibling's lft/rgt values
+		$siblingNode->lft += 2;
+		$siblingNode->rgt += 2;
+
+		$db->transactionStart();
+
+		try
+		{
+			$db->setQuery(
+				$db->getQuery(true)
+					->update($db->qn($this->getTableName()))
+					->set($fldLft . ' = ' . $fldLft . '+2')
+					->where($fldLft . ' >= ' . $db->q($myLeft))
+			)->execute();
+
+			$db->setQuery(
+				$db->getQuery(true)
+					->update($db->qn($this->getTableName()))
+					->set($fldRgt . ' = ' . $fldRgt . '+2')
+					->where($fldRgt . ' > ' . $db->q($myLeft))
+			)->execute();
+
+			$this->store();
+
+            // Commit the transaction
+            $db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Insert the current node to the right of (after) a sibling node
+	 *
+	 * WARNING: If it's an existing node it will be COPIED, not moved.
+	 *
+	 * @param FOFTableNested $siblingNode We will be inserted after this node
+	 *
+	 * @return $this for chaining
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function insertRightOf(FOFTableNested &$siblingNode)
+	{
+        if($siblingNode->lft >= $siblingNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the sibling node');
+        }
+
+		// Get a reference to the database
+		$db = $this->getDbo();
+
+		// Get the field names
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+
+        // Nullify the PK, so a new record will be created
+        $pk = $this->getKeyName();
+        $this->$pk = null;
+
+		// Get the value of the parent node's lft
+		$myRight = $siblingNode->rgt;
+
+		// Update my lft/rgt values
+		$this->lft = $myRight + 1;
+		$this->rgt = $myRight + 2;
+
+		$db->transactionStart();
+
+		try
+		{
+			$db->setQuery(
+				$db->getQuery(true)
+					->update($db->qn($this->getTableName()))
+					->set($fldRgt . ' = ' . $fldRgt . '+2')
+					->where($fldRgt . ' > ' . $db->q($myRight))
+			)->execute();
+
+			$db->setQuery(
+				$db->getQuery(true)
+					->update($db->qn($this->getTableName()))
+					->set($fldLft . ' = ' . $fldLft . '+2')
+					->where($fldLft . ' > ' . $db->q($myRight))
+			)->execute();
+
+			$this->store();
+
+            // Commit the transaction
+            $db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Alias for insertRightOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $siblingNode
+	 *
+	 * @return $this for chaining
+	 */
+	public function insertAsSiblingOf(FOFTableNested &$siblingNode)
+	{
+		return $this->insertRightOf($siblingNode);
+	}
+
+	/**
+	 * Move the current node (and its subtree) one position to the left in the tree, i.e. before its left-hand sibling
+	 *
+     * @throws  RuntimeException
+     *
+	 * @return $this
+	 */
+	public function moveLeft()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		// If it is a root node we will not move the node (roots don't participate in tree ordering)
+		if ($this->isRoot())
+		{
+			return $this;
+		}
+
+		// Are we already the leftmost node?
+		$parentNode = $this->getParent();
+
+		if ($parentNode->lft == ($this->lft - 1))
+		{
+			return $this;
+		}
+
+		// Get the sibling to the left
+		$db = $this->getDbo();
+		$table = $this->getClone();
+		$table->reset();
+		$leftSibling = $table->whereRaw($db->qn($this->getColumnAlias('rgt')) . ' = ' . $db->q($this->lft - 1))
+			->get(0, 1)->current();
+
+		// Move the node
+		if (is_object($leftSibling) && ($leftSibling instanceof FOFTableNested))
+		{
+			return $this->moveToLeftOf($leftSibling);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Move the current node (and its subtree) one position to the right in the tree, i.e. after its right-hand sibling
+     *
+     * @throws RuntimeException
+	 *
+	 * @return $this
+	 */
+	public function moveRight()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		// If it is a root node we will not move the node (roots don't participate in tree ordering)
+		if ($this->isRoot())
+		{
+			return $this;
+		}
+
+		// Are we already the rightmost node?
+		$parentNode = $this->getParent();
+
+		if ($parentNode->rgt == ($this->rgt + 1))
+		{
+			return $this;
+		}
+
+		// Get the sibling to the right
+		$db = $this->getDbo();
+
+		$table = $this->getClone();
+		$table->reset();
+		$rightSibling = $table->whereRaw($db->qn($this->getColumnAlias('lft')) . ' = ' . $db->q($this->rgt + 1))
+			->get(0, 1)->current();
+
+		// Move the node
+		if (is_object($rightSibling) && ($rightSibling instanceof FOFTableNested))
+		{
+			return $this->moveToRightOf($rightSibling);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Moves the current node (and its subtree) to the left of another node. The other node can be in a different
+	 * position in the tree or even under a different root.
+	 *
+	 * @param FOFTableNested $siblingNode
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function moveToLeftOf(FOFTableNested $siblingNode)
+	{
+        // Sanity checks on current and sibling node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($siblingNode->lft >= $siblingNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the sibling node');
+        }
+
+		$db    = $this->getDbo();
+		$left  = $db->qn($this->getColumnAlias('lft'));
+		$right = $db->qn($this->getColumnAlias('rgt'));
+
+		// Get node metrics
+		$myLeft  = $this->lft;
+		$myRight = $this->rgt;
+		$myWidth = $myRight - $myLeft + 1;
+
+		// Get sibling metrics
+		$sibLeft = $siblingNode->lft;
+
+		// Start the transaction
+		$db->transactionStart();
+
+		try
+		{
+			// Temporary remove subtree being moved
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set("$left = " . $db->q(0) . " - $left")
+				->set("$right = " . $db->q(0) . " - $right")
+				->where($left . ' >= ' . $db->q($myLeft))
+				->where($right . ' <= ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Close hole left behind
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' - ' . $db->q($myWidth))
+				->where($left . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' - ' . $db->q($myWidth))
+				->where($right . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Make a hole for the new items
+			$newSibLeft = ($sibLeft > $myRight) ? $sibLeft - $myWidth : $sibLeft;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' + ' . $db->q($myWidth))
+				->where($right . ' >= ' . $db->q($newSibLeft));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' + ' . $db->q($myWidth))
+				->where($left . ' >= ' . $db->q($newSibLeft));
+			$db->setQuery($query)->execute();
+
+			// Move node and subnodes
+			$moveRight = $newSibLeft - $myLeft;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $db->q(0) . ' - ' . $left . ' + ' . $db->q($moveRight))
+				->set($right . ' = ' . $db->q(0) . ' - ' . $right . ' + ' . $db->q($moveRight))
+				->where($left . ' <= 0 - ' . $db->q($myLeft))
+				->where($right . ' >= 0 - ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Commit the transaction
+			$db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+        // Let's load the record again to fetch the new values for lft and rgt
+        $this->load();
+
+		return $this;
+	}
+
+	/**
+	 * Moves the current node (and its subtree) to the right of another node. The other node can be in a different
+	 * position in the tree or even under a different root.
+	 *
+	 * @param FOFTableNested $siblingNode
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function moveToRightOf(FOFTableNested $siblingNode)
+	{
+        // Sanity checks on current and sibling node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($siblingNode->lft >= $siblingNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the sibling node');
+        }
+
+		$db    = $this->getDbo();
+		$left  = $db->qn($this->getColumnAlias('lft'));
+		$right = $db->qn($this->getColumnAlias('rgt'));
+
+		// Get node metrics
+		$myLeft  = $this->lft;
+		$myRight = $this->rgt;
+		$myWidth = $myRight - $myLeft + 1;
+
+		// Get parent metrics
+		$sibRight = $siblingNode->rgt;
+
+		// Start the transaction
+		$db->transactionStart();
+
+		try
+		{
+			// Temporary remove subtree being moved
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set("$left = " . $db->q(0) . " - $left")
+				->set("$right = " . $db->q(0) . " - $right")
+				->where($left . ' >= ' . $db->q($myLeft))
+				->where($right . ' <= ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Close hole left behind
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' - ' . $db->q($myWidth))
+				->where($left . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' - ' . $db->q($myWidth))
+				->where($right . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Make a hole for the new items
+			$newSibRight = ($sibRight > $myRight) ? $sibRight - $myWidth : $sibRight;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' + ' . $db->q($myWidth))
+				->where($left . ' > ' . $db->q($newSibRight));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' + ' . $db->q($myWidth))
+				->where($right . ' > ' . $db->q($newSibRight));
+			$db->setQuery($query)->execute();
+
+			// Move node and subnodes
+			$moveRight = ($sibRight > $myRight) ? $sibRight - $myRight : $sibRight - $myRight + $myWidth;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $db->q(0) . ' - ' . $left . ' + ' . $db->q($moveRight))
+				->set($right . ' = ' . $db->q(0) . ' - ' . $right . ' + ' . $db->q($moveRight))
+				->where($left . ' <= 0 - ' . $db->q($myLeft))
+				->where($right . ' >= 0 - ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Commit the transaction
+			$db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+        // Let's load the record again to fetch the new values for lft and rgt
+        $this->load();
+
+		return $this;
+	}
+
+	/**
+	 * Alias for moveToRightOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $siblingNode
+	 *
+	 * @return $this for chaining
+	 */
+	public function makeNextSiblingOf(FOFTableNested $siblingNode)
+	{
+		return $this->moveToRightOf($siblingNode);
+	}
+
+	/**
+	 * Alias for makeNextSiblingOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $siblingNode
+	 *
+	 * @return $this for chaining
+	 */
+	public function makeSiblingOf(FOFTableNested $siblingNode)
+	{
+		return $this->makeNextSiblingOf($siblingNode);
+	}
+
+	/**
+	 * Alias for moveToLeftOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $siblingNode
+	 *
+	 * @return $this for chaining
+	 */
+	public function makePreviousSiblingOf(FOFTableNested $siblingNode)
+	{
+		return $this->moveToLeftOf($siblingNode);
+	}
+
+	/**
+	 * Moves a node and its subtree as a the first (leftmost) child of $parentNode
+	 *
+	 * @param FOFTableNested $parentNode
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 */
+	public function makeFirstChildOf(FOFTableNested $parentNode)
+	{
+        // Sanity checks on current and sibling node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($parentNode->lft >= $parentNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the parent node');
+        }
+
+		$db    = $this->getDbo();
+		$left  = $db->qn($this->getColumnAlias('lft'));
+		$right = $db->qn($this->getColumnAlias('rgt'));
+
+		// Get node metrics
+		$myLeft  = $this->lft;
+		$myRight = $this->rgt;
+		$myWidth = $myRight - $myLeft + 1;
+
+		// Get parent metrics
+		$parentLeft = $parentNode->lft;
+
+		// Start the transaction
+		$db->transactionStart();
+
+		try
+		{
+			// Temporary remove subtree being moved
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set("$left = " . $db->q(0) . " - $left")
+				->set("$right = " . $db->q(0) . " - $right")
+				->where($left . ' >= ' . $db->q($myLeft))
+				->where($right . ' <= ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Close hole left behind
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' - ' . $db->q($myWidth))
+				->where($left . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' - ' . $db->q($myWidth))
+				->where($right . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Make a hole for the new items
+			$newParentLeft = ($parentLeft > $myRight) ? $parentLeft - $myWidth : $parentLeft;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' + ' . $db->q($myWidth))
+				->where($right . ' >= ' . $db->q($newParentLeft));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' + ' . $db->q($myWidth))
+				->where($left . ' > ' . $db->q($newParentLeft));
+			$db->setQuery($query)->execute();
+
+			// Move node and subnodes
+			$moveRight = $newParentLeft - $myLeft + 1;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $db->q(0) . ' - ' . $left . ' + ' . $db->q($moveRight))
+				->set($right . ' = ' . $db->q(0) . ' - ' . $right . ' + ' . $db->q($moveRight))
+				->where($left . ' <= 0 - ' . $db->q($myLeft))
+				->where($right . ' >= 0 - ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Commit the transaction
+			$db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+        // Let's load the record again to fetch the new values for lft and rgt
+        $this->load();
+
+		return $this;
+	}
+
+	/**
+	 * Moves a node and its subtree as a the last (rightmost) child of $parentNode
+	 *
+	 * @param FOFTableNested $parentNode
+	 *
+	 * @return $this for chaining
+	 *
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	public function makeLastChildOf(FOFTableNested $parentNode)
+	{
+        // Sanity checks on current and sibling node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($parentNode->lft >= $parentNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the parent node');
+        }
+
+		$db    = $this->getDbo();
+		$left  = $db->qn($this->getColumnAlias('lft'));
+		$right = $db->qn($this->getColumnAlias('rgt'));
+
+		// Get node metrics
+		$myLeft  = $this->lft;
+		$myRight = $this->rgt;
+		$myWidth = $myRight - $myLeft + 1;
+
+		// Get parent metrics
+		$parentRight = $parentNode->rgt;
+
+		// Start the transaction
+		$db->transactionStart();
+
+		try
+		{
+			// Temporary remove subtree being moved
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set("$left = " . $db->q(0) . " - $left")
+				->set("$right = " . $db->q(0) . " - $right")
+				->where($left . ' >= ' . $db->q($myLeft))
+				->where($right . ' <= ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Close hole left behind
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' - ' . $db->q($myWidth))
+				->where($left . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' - ' . $db->q($myWidth))
+				->where($right . ' > ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Make a hole for the new items
+			$newLeft = ($parentRight > $myRight) ? $parentRight - $myWidth : $parentRight;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $left . ' + ' . $db->q($myWidth))
+				->where($left . ' >= ' . $db->q($newLeft));
+			$db->setQuery($query)->execute();
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($right . ' = ' . $right . ' + ' . $db->q($myWidth))
+				->where($right . ' >= ' . $db->q($newLeft));
+			$db->setQuery($query)->execute();
+
+			// Move node and subnodes
+			$moveRight = ($parentRight > $myRight) ? $parentRight - $myRight - 1 : $parentRight - $myRight - 1 + $myWidth;
+
+			$query = $db->getQuery(true)
+				->update($db->qn($this->getTableName()))
+				->set($left . ' = ' . $db->q(0) . ' - ' . $left . ' + ' . $db->q($moveRight))
+				->set($right . ' = ' . $db->q(0) . ' - ' . $right . ' + ' . $db->q($moveRight))
+				->where($left . ' <= 0 - ' . $db->q($myLeft))
+				->where($right . ' >= 0 - ' . $db->q($myRight));
+			$db->setQuery($query)->execute();
+
+			// Commit the transaction
+			$db->transactionCommit();
+		}
+		catch (\Exception $e)
+		{
+			$db->transactionRollback();
+
+			throw $e;
+		}
+
+        // Let's load the record again to fetch the new values for lft and rgt
+        $this->load();
+
+		return $this;
+	}
+
+	/**
+	 * Alias for makeLastChildOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $parentNode
+	 *
+	 * @return $this for chaining
+	 */
+	public function makeChildOf(FOFTableNested $parentNode)
+	{
+		return $this->makeLastChildOf($parentNode);
+	}
+
+	/**
+	 * Makes the current node a root (and moving its entire subtree along the way). This is achieved by moving the node
+	 * to the right of its root node
+	 *
+	 * @return  $this  for chaining
+	 */
+	public function makeRoot()
+	{
+		// Make sure we are not a root
+		if ($this->isRoot())
+		{
+			return $this;
+		}
+
+		// Get a reference to my root
+		$myRoot = $this->getRoot();
+
+		// Double check I am not a root
+		if ($this->equals($myRoot))
+		{
+			return $this;
+		}
+
+		// Move myself to the right of my root
+		$this->moveToRightOf($myRoot);
+		$this->treeDepth = 0;
+
+		return $this;
+	}
+
+	/**
+	 * Gets the level (depth) of this node in the tree. The result is cached in $this->treeDepth for faster retrieval.
+	 *
+     * @throws  RuntimeException
+     *
+	 * @return int|mixed
+	 */
+	public function getLevel()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		if (is_null($this->treeDepth))
+		{
+			$db = $this->getDbo();
+
+			$fldLft = $db->qn($this->getColumnAlias('lft'));
+			$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+			$query = $db->getQuery(true)
+				->select('(COUNT(' . $db->qn('parent') . '.' . $fldLft . ') - 1) AS ' . $db->qn('depth'))
+				->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'))
+				->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'))
+				->where($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('parent') . '.' . $fldLft)
+				->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt)
+				->where($db->qn('node') . '.' . $fldLft . ' = ' . $db->q($this->lft))
+				->group($db->qn('node') . '.' . $fldLft)
+				->order($db->qn('node') . '.' . $fldLft . ' ASC');
+
+			$this->treeDepth = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		return $this->treeDepth;
+	}
+
+	/**
+	 * Returns the immediate parent of the current node
+	 *
+     * @throws RuntimeException
+     *
+	 * @return FOFTableNested
+	 */
+	public function getParent()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		if ($this->isRoot())
+		{
+			return $this;
+		}
+
+		if (empty($this->treeParent) || !is_object($this->treeParent) || !($this->treeParent instanceof FOFTableNested))
+		{
+			$db = $this->getDbo();
+
+			$fldLft = $db->qn($this->getColumnAlias('lft'));
+			$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+			$query = $db->getQuery(true)
+				->select($db->qn('parent') . '.' . $fldLft)
+				->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'))
+				->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'))
+				->where($db->qn('node') . '.' . $fldLft . ' > ' . $db->qn('parent') . '.' . $fldLft)
+				->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt)
+				->where($db->qn('node') . '.' . $fldLft . ' = ' . $db->q($this->lft))
+				->order($db->qn('parent') . '.' . $fldLft . ' DESC');
+			$targetLft = $db->setQuery($query, 0, 1)->loadResult();
+
+			$table = $this->getClone();
+			$table->reset();
+			$this->treeParent = $table
+				->whereRaw($fldLft . ' = ' . $db->q($targetLft))
+				->get()->current();
+		}
+
+		return $this->treeParent;
+	}
+
+	/**
+	 * Is this a top-level root node?
+	 *
+	 * @return bool
+	 */
+	public function isRoot()
+	{
+		// If lft=1 it is necessarily a root node
+		if ($this->lft == 1)
+		{
+			return true;
+		}
+
+		// Otherwise make sure its level is 0
+		return $this->getLevel() == 0;
+	}
+
+	/**
+	 * Is this a leaf node (a node without children)?
+	 *
+     * @throws  RuntimeException
+     *
+	 * @return bool
+	 */
+	public function isLeaf()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		return ($this->rgt - 1) == $this->lft;
+	}
+
+	/**
+	 * Is this a child node (not root)?
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return bool
+	 */
+	public function isChild()
+	{
+		return !$this->isRoot();
+	}
+
+	/**
+	 * Returns true if we are a descendant of $otherNode
+	 *
+	 * @param FOFTableNested $otherNode
+	 *
+     * @throws  RuntimeException
+     *
+	 * @return bool
+	 */
+	public function isDescendantOf(FOFTableNested $otherNode)
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($otherNode->lft >= $otherNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the other node');
+        }
+
+		return ($otherNode->lft < $this->lft) && ($otherNode->rgt > $this->rgt);
+	}
+
+	/**
+	 * Returns true if $otherNode is ourselves or if we are a descendant of $otherNode
+	 *
+	 * @param FOFTableNested $otherNode
+	 *
+     * @throws  RuntimeException
+     *
+	 * @return bool
+	 */
+	public function isSelfOrDescendantOf(FOFTableNested $otherNode)
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($otherNode->lft >= $otherNode->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the other node');
+        }
+
+		return ($otherNode->lft <= $this->lft) && ($otherNode->rgt >= $this->rgt);
+	}
+
+	/**
+	 * Returns true if we are an ancestor of $otherNode
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $otherNode
+	 *
+	 * @return bool
+	 */
+	public function isAncestorOf(FOFTableNested $otherNode)
+	{
+		return $otherNode->isDescendantOf($this);
+	}
+
+	/**
+	 * Returns true if $otherNode is ourselves or we are an ancestor of $otherNode
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $otherNode
+	 *
+	 * @return bool
+	 */
+	public function isSelfOrAncestorOf(FOFTableNested $otherNode)
+	{
+		return $otherNode->isSelfOrDescendantOf($this);
+	}
+
+	/**
+	 * Is $node this very node?
+	 *
+	 * @param FOFTableNested $node
+	 *
+     * @throws  RuntimeException
+     *
+	 * @return bool
+	 */
+	public function equals(FOFTableNested &$node)
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+        if($node->lft >= $node->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the other node');
+        }
+
+		return (
+			($this->getId() == $node->getId())
+			&& ($this->lft == $node->lft)
+			&& ($this->rgt == $node->rgt)
+		);
+	}
+
+	/**
+	 * Alias for isDescendantOf
+	 *
+     * @codeCoverageIgnore
+	 * @param FOFTableNested $otherNode
+     *
+	 * @return bool
+	 */
+	public function insideSubtree(FOFTableNested $otherNode)
+	{
+		return $this->isDescendantOf($otherNode);
+	}
+
+	/**
+	 * Returns true if both this node and $otherNode are root, leaf or child (same tree scope)
+	 *
+	 * @param FOFTableNested $otherNode
+	 *
+	 * @return bool
+	 */
+	public function inSameScope(FOFTableNested $otherNode)
+	{
+		if ($this->isLeaf())
+		{
+			return $otherNode->isLeaf();
+		}
+		elseif ($this->isRoot())
+		{
+			return $otherNode->isRoot();
+		}
+		elseif ($this->isChild())
+		{
+			return $otherNode->isChild();
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * get() will return all ancestor nodes and ourselves
+	 *
+	 * @return void
+	 */
+	protected function scopeAncestorsAndSelf()
+	{
+		$this->treeNestedGet = true;
+
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' >= ' . $db->qn('node') . '.' . $fldLft);
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' <= ' . $db->qn('node') . '.' . $fldRgt);
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' = ' . $db->q($this->lft));
+	}
+
+	/**
+	 * get() will return all ancestor nodes but not ourselves
+	 *
+	 * @return void
+	 */
+	protected function scopeAncestors()
+	{
+		$this->treeNestedGet = true;
+
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' > ' . $db->qn('node') . '.' . $fldLft);
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' < ' . $db->qn('node') . '.' . $fldRgt);
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' = ' . $db->q($this->lft));
+	}
+
+	/**
+	 * get() will return all sibling nodes and ourselves
+	 *
+	 * @return void
+	 */
+	protected function scopeSiblingsAndSelf()
+	{
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$parent = $this->getParent();
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' > ' . $db->q($parent->lft));
+		$this->whereRaw($db->qn('node') . '.' . $fldRgt . ' < ' . $db->q($parent->rgt));
+	}
+
+	/**
+	 * get() will return all sibling nodes but not ourselves
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return void
+	 */
+	protected function scopeSiblings()
+	{
+		$this->scopeSiblingsAndSelf();
+		$this->scopeWithoutSelf();
+	}
+
+	/**
+	 * get() will return only leaf nodes
+	 *
+	 * @return void
+	 */
+	protected function scopeLeaves()
+	{
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' = ' . $db->qn('node') . '.' . $fldRgt . ' - ' . $db->q(1));
+	}
+
+	/**
+	 * get() will return all descendants (even subtrees of subtrees!) and ourselves
+	 *
+	 * @return void
+	 */
+	protected function scopeDescendantsAndSelf()
+	{
+		$this->treeNestedGet = true;
+
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('parent') . '.' . $fldLft);
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt);
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' = ' . $db->q($this->lft));
+	}
+
+	/**
+	 * get() will return all descendants (even subtrees of subtrees!) but not ourselves
+	 *
+	 * @return void
+	 */
+	protected function scopeDescendants()
+	{
+		$this->treeNestedGet = true;
+
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' > ' . $db->qn('parent') . '.' . $fldLft);
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' < ' . $db->qn('parent') . '.' . $fldRgt);
+		$this->whereRaw($db->qn('parent') . '.' . $fldLft . ' = ' . $db->q($this->lft));
+	}
+
+	/**
+	 * get() will only return immediate descendants (first level children) of the current node
+	 *
+	 * @return void
+	 */
+	protected function scopeImmediateDescendants()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		$subQuery = $db->getQuery(true)
+			->select(array(
+				$db->qn('node') . '.' . $fldLft,
+				'(COUNT(*) - 1) AS ' . $db->qn('depth')
+			))
+			->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'))
+			->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'))
+			->where($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('parent') . '.' . $fldLft)
+			->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt)
+			->where($db->qn('node') . '.' . $fldLft . ' = ' . $db->q($this->lft))
+			->group($db->qn('node') . '.' . $fldLft)
+			->order($db->qn('node') . '.' . $fldLft . ' ASC');
+
+		$query = $db->getQuery(true)
+			->select(array(
+				$db->qn('node') . '.' . $fldLft,
+				'(COUNT(' . $db->qn('parent') . '.' . $fldLft . ') - (' .
+				$db->qn('sub_tree') . '.' . $db->qn('depth') . ' + 1)) AS ' . $db->qn('depth')
+			))
+			->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'))
+			->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'))
+			->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('sub_parent'))
+			->join('CROSS', '(' . $subQuery . ') AS ' . $db->qn('sub_tree'))
+			->where($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('parent') . '.' . $fldLft)
+			->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt)
+			->where($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('sub_parent') . '.' . $fldLft)
+			->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('sub_parent') . '.' . $fldRgt)
+			->where($db->qn('sub_parent') . '.' . $fldLft . ' = ' . $db->qn('sub_tree') . '.' . $fldLft)
+			->group($db->qn('node') . '.' . $fldLft)
+			->having(array(
+				$db->qn('depth') . ' > ' . $db->q(0),
+				$db->qn('depth') . ' <= ' . $db->q(1),
+			))
+			->order($db->qn('node') . '.' . $fldLft . ' ASC');
+
+		$leftValues = $db->setQuery($query)->loadColumn();
+
+		if (empty($leftValues))
+		{
+			$leftValues = array(0);
+		}
+
+		array_walk($leftValues, function (&$item, $key) use (&$db)
+		{
+			$item = $db->q($item);
+		});
+
+		$this->whereRaw($db->qn('node') . '.' . $fldLft . ' IN (' . implode(',', $leftValues) . ')');
+	}
+
+	/**
+	 * get() will not return the selected node if it's part of the query results
+	 *
+	 * @param FOFTableNested $node The node to exclude from the results
+	 *
+	 * @return void
+	 */
+	public function withoutNode(FOFTableNested $node)
+	{
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+
+		$this->whereRaw('NOT(' . $db->qn('node') . '.' . $fldLft . ' = ' . $db->q($node->lft) . ')');
+	}
+
+	/**
+	 * get() will not return ourselves if it's part of the query results
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return void
+	 */
+	protected function scopeWithoutSelf()
+	{
+		$this->withoutNode($this);
+	}
+
+	/**
+	 * get() will not return our root if it's part of the query results
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return void
+	 */
+	protected function scopeWithoutRoot()
+	{
+		$rootNode = $this->getRoot();
+		$this->withoutNode($rootNode);
+	}
+
+	/**
+	 * Returns the root node of the tree this node belongs to
+	 *
+	 * @return self
+	 *
+	 * @throws \RuntimeException
+	 */
+	public function getRoot()
+	{
+        // Sanity checks on current node position
+        if($this->lft >= $this->rgt)
+        {
+            throw new RuntimeException('Invalid position values for the current node');
+        }
+
+		// If this is a root node return itself (there is no such thing as the root of a root node)
+		if ($this->isRoot())
+		{
+			return $this;
+		}
+
+		if (empty($this->treeRoot) || !is_object($this->treeRoot) || !($this->treeRoot instanceof FOFTableNested))
+		{
+			$this->treeRoot = null;
+
+			// First try to get the record with the minimum ID
+			$db = $this->getDbo();
+
+			$fldLft = $db->qn($this->getColumnAlias('lft'));
+			$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+			$subQuery = $db->getQuery(true)
+				->select('MIN(' . $fldLft . ')')
+				->from($db->qn($this->getTableName()));
+
+			try
+			{
+				$table = $this->getClone();
+				$table->reset();
+				$root = $table
+					->whereRaw($fldLft . ' = (' . (string)$subQuery . ')')
+					->get(0, 1)->current();
+
+				if ($this->isDescendantOf($root))
+				{
+					$this->treeRoot = $root;
+				}
+			}
+			catch (\RuntimeException $e)
+			{
+				// If there is no root found throw an exception. Basically: your table is FUBAR.
+				throw new \RuntimeException("No root found for table " . $this->getTableName() . ", node lft=" . $this->lft);
+			}
+
+			// If the above method didn't work, get all roots and select the one with the appropriate lft/rgt values
+			if (is_null($this->treeRoot))
+			{
+				// Find the node with depth = 0, lft < our lft and rgt > our right. That's our root node.
+				$query = $db->getQuery(true)
+					->select(array(
+                        $db->qn('node') . '.' . $fldLft,
+						'(COUNT(' . $db->qn('parent') . '.' . $fldLft . ') - 1) AS ' . $db->qn('depth')
+					))
+					->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'))
+					->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'))
+					->where($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('parent') . '.' . $fldLft)
+					->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt)
+					->where($db->qn('node') . '.' . $fldLft . ' < ' . $db->q($this->lft))
+					->where($db->qn('node') . '.' . $fldRgt . ' > ' . $db->q($this->rgt))
+					->having($db->qn('depth') . ' = ' . $db->q(0))
+					->group($db->qn('node') . '.' . $fldLft);
+
+				// Get the lft value
+				$targetLeft = $db->setQuery($query)->loadResult();
+
+				if (empty($targetLeft))
+				{
+					// If there is no root found throw an exception. Basically: your table is FUBAR.
+					throw new \RuntimeException("No root found for table " . $this->getTableName() . ", node lft=" . $this->lft);
+				}
+
+				try
+				{
+					$table = $this->getClone();
+					$table->reset();
+					$this->treeRoot = $table
+						->whereRaw($fldLft . ' = ' . $db->q($targetLeft))
+						->get(0, 1)->current();
+				}
+				catch (\RuntimeException $e)
+				{
+					// If there is no root found throw an exception. Basically: your table is FUBAR.
+					throw new \RuntimeException("No root found for table " . $this->getTableName() . ", node lft=" . $this->lft);
+				}
+			}
+		}
+
+		return $this->treeRoot;
+	}
+
+	/**
+	 * Get all ancestors to this node and the node itself. In other words it gets the full path to the node and the node
+	 * itself.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getAncestorsAndSelf()
+	{
+		$this->scopeAncestorsAndSelf();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all ancestors to this node and the node itself, but not the root node. If you want to
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getAncestorsAndSelfWithoutRoot()
+	{
+		$this->scopeAncestorsAndSelf();
+		$this->scopeWithoutRoot();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all ancestors to this node but not the node itself. In other words it gets the path to the node, without the
+	 * node itself.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getAncestors()
+	{
+		$this->scopeAncestorsAndSelf();
+		$this->scopeWithoutSelf();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all ancestors to this node but not the node itself and its root.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getAncestorsWithoutRoot()
+	{
+		$this->scopeAncestors();
+		$this->scopeWithoutRoot();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all sibling nodes, including ourselves
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getSiblingsAndSelf()
+	{
+		$this->scopeSiblingsAndSelf();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all sibling nodes, except ourselves
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getSiblings()
+	{
+		$this->scopeSiblings();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all leaf nodes in the tree. You may want to use the scopes to narrow down the search in a specific subtree or
+	 * path.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getLeaves()
+	{
+		$this->scopeLeaves();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get all descendant (children) nodes and ourselves.
+	 *
+	 * Note: all descendant nodes, even descendants of our immediate descendants, will be returned.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getDescendantsAndSelf()
+	{
+		$this->scopeDescendantsAndSelf();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get only our descendant (children) nodes, not ourselves.
+	 *
+	 * Note: all descendant nodes, even descendants of our immediate descendants, will be returned.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getDescendants()
+	{
+		$this->scopeDescendants();
+
+		return $this->get();
+	}
+
+	/**
+	 * Get the immediate descendants (children). Unlike getDescendants it only goes one level deep into the tree
+	 * structure. Descendants of descendant nodes will not be returned.
+	 *
+     * @codeCoverageIgnore
+     *
+	 * @return FOFDatabaseIterator
+	 */
+	public function getImmediateDescendants()
+	{
+		$this->scopeImmediateDescendants();
+
+		return $this->get();
+	}
+
+	/**
+	 * Returns a hashed array where each element's key is the value of the $key column (default: the ID column of the
+	 * table) and its value is the value of the $column column (default: title). Each nesting level will have the value
+	 * of the $column column prefixed by a number of $separator strings, as many as its nesting level (depth).
+	 *
+	 * This is useful for creating HTML select elements showing the hierarchy in a human readable format.
+	 *
+	 * @param string $column
+	 * @param null   $key
+	 * @param string $seperator
+	 *
+	 * @return array
+	 */
+	public function getNestedList($column = 'title', $key = null, $seperator = '  ')
+	{
+		$db = $this->getDbo();
+
+		$fldLft = $db->qn($this->getColumnAlias('lft'));
+		$fldRgt = $db->qn($this->getColumnAlias('rgt'));
+
+		if (empty($key) || !$this->hasField($key))
+		{
+			$key = $this->getKeyName();
+		}
+
+		if (empty($column))
+		{
+			$column = 'title';
+		}
+
+		$fldKey = $db->qn($this->getColumnAlias($key));
+		$fldColumn = $db->qn($this->getColumnAlias($column));
+
+		$query = $db->getQuery(true)
+			->select(array(
+				$db->qn('node') . '.' . $fldKey,
+				$db->qn('node') . '.' . $fldColumn,
+				'(COUNT(' . $db->qn('parent') . '.' . $fldKey . ') - 1) AS ' . $db->qn('depth')
+			))
+			->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'))
+			->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'))
+			->where($db->qn('node') . '.' . $fldLft . ' >= ' . $db->qn('parent') . '.' . $fldLft)
+			->where($db->qn('node') . '.' . $fldLft . ' <= ' . $db->qn('parent') . '.' . $fldRgt)
+			->group($db->qn('node') . '.' . $fldLft)
+			->order($db->qn('node') . '.' . $fldLft . ' ASC');
+
+		$tempResults = $db->setQuery($query)->loadAssocList();
+		$ret = array();
+
+		if (!empty($tempResults))
+		{
+			foreach ($tempResults as $row)
+			{
+				$ret[$row[$key]] = str_repeat($seperator, $row['depth']) . $row[$column];
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Locate a node from a given path, e.g. "/some/other/leaf"
+	 *
+	 * Notes:
+	 * - This will only work when you have a "slug" and a "hash" field in your table.
+	 * - If the path starts with "/" we will use the root with lft=1. Otherwise the first component of the path is
+	 *   supposed to be the slug of the root node.
+	 * - If the root node is not found you'll get null as the return value
+	 * - You will also get null if any component of the path is not found
+	 *
+	 * @param string $path The path to locate
+	 *
+	 * @return FOFTableNested|null The found node or null if nothing is found
+	 */
+	public function findByPath($path)
+	{
+		// @todo
+	}
+
+	public function isValid()
+	{
+		// @todo
+	}
+
+	public function rebuild()
+	{
+		// @todo
+	}
+
+	/**
+	 * Resets cached values used to speed up querying the tree
+	 *
+	 * @return  static  for chaining
+	 */
+	protected function resetTreeCache()
+	{
+		$this->treeDepth = null;
+		$this->treeRoot = null;
+		$this->treeParent = null;
+		$this->treeNestedGet = false;
+
+		return $this;
+	}
+
+	/**
+	 * Add custom, pre-compiled WHERE clauses for use in buildQuery. The raw WHERE clause you specify is added as is to
+	 * the query generated by buildQuery. You are responsible for quoting and escaping the field names and data found
+	 * inside the WHERE clause.
+	 *
+	 * @param   string $rawWhereClause The raw WHERE clause to add
+	 *
+	 * @return  $this  For chaining
+	 */
+	public function whereRaw($rawWhereClause)
+	{
+		$this->whereClauses[] = $rawWhereClause;
+
+		return $this;
+	}
+
+	/**
+	 * Builds the query for the get() method
+	 *
+	 * @return FOFDatabaseQuery
+	 */
+	protected function buildQuery()
+	{
+		$db = $this->getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->qn('node') . '.*')
+			->from($db->qn($this->getTableName()) . ' AS ' . $db->qn('node'));
+
+		if ($this->treeNestedGet)
+		{
+			$query
+				->join('CROSS', $db->qn($this->getTableName()) . ' AS ' . $db->qn('parent'));
+		}
+
+		// Apply custom WHERE clauses
+		if (count($this->whereClauses))
+		{
+			foreach ($this->whereClauses as $clause)
+			{
+				$query->where($clause);
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Returns a database iterator to retrieve records. Use the scope methods and the whereRaw method to define what
+	 * exactly will be returned.
+	 *
+	 * @param   integer $limitstart How many items to skip from the start, only when $overrideLimits = true
+	 * @param   integer $limit      How many items to return, only when $overrideLimits = true
+	 *
+	 * @return  FOFDatabaseIterator  The data collection
+	 */
+	public function get($limitstart = 0, $limit = 0)
+	{
+		$limitstart = max($limitstart, 0);
+		$limit = max($limit, 0);
+
+		$query = $this->buildQuery();
+		$db = $this->getDbo();
+		$db->setQuery($query, $limitstart, $limit);
+		$cursor = $db->execute();
+
+		$dataCollection = FOFDatabaseIterator::getIterator($db->name, $cursor, null, $this->config['_table_class']);
+
+		return $dataCollection;
+	}
+}
diff --git a/core/libraries/fof/table/relations.php b/core/libraries/fof/table/relations.php
new file mode 100644
index 00000000..a431bf75
--- /dev/null
+++ b/core/libraries/fof/table/relations.php
@@ -0,0 +1,1028 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+class FOFTableRelations
+{
+	/**
+	 * Holds all known relation definitions
+	 *
+	 * @var   array
+	 */
+	protected $relations = array(
+		'child'		=> array(),
+		'parent'	=> array(),
+		'children'	=> array(),
+		'multiple'	=> array(),
+	);
+
+	/**
+	 * Holds the default relations' keys
+	 *
+	 * @var  array
+	 */
+	protected $defaultRelation = array(
+		'child'		=> null,
+		'parent'	=> null,
+		'children'	=> null,
+		'multiple'	=> null,
+	);
+
+	/**
+	 * The table these relations are attached to
+	 *
+	 * @var   FOFTable
+	 */
+	protected $table = null;
+
+	/**
+	 * The name of the component used by our attached table
+	 *
+	 * @var   string
+	 */
+	protected $componentName = 'joomla';
+
+	/**
+	 * The type (table name without prefix and component name) of our attached table
+	 *
+	 * @var   string
+	 */
+	protected $tableType = '';
+
+
+	/**
+	 * Create a relations object based on the provided FOFTable instance
+	 *
+	 * @param   FOFTable   $table  The table instance used to initialise the relations
+	 */
+	public function __construct(FOFTable $table)
+	{
+		// Store the table
+		$this->table = $table;
+
+		// Get the table's type from its name
+		$tableName = $table->getTableName();
+		$tableName = str_replace('#__', '', $tableName);
+		$type = explode("_", $tableName);
+
+		if (count($type) == 1)
+		{
+			$this->tableType = array_pop($type);
+		}
+		else
+		{
+			$this->componentName = array_shift($type);
+			$this->tableType = array_pop($type);
+		}
+
+		$this->tableType = FOFInflector::singularize($this->tableType);
+
+		$tableKey = $table->getKeyName();
+
+		unset($type);
+
+		// Scan all table keys and look for foo_bar_id fields. These fields are used to populate parent relations.
+		foreach ($table->getKnownFields() as $field)
+		{
+			// Skip the table key name
+			if ($field == $tableKey)
+			{
+				continue;
+			}
+
+			if (substr($field, -3) != '_id')
+			{
+				continue;
+			}
+
+			$parts = explode('_', $field);
+
+			// If the component type of the field is not set assume 'joomla'
+			if (count($parts) == 2)
+			{
+				array_unshift($parts, 'joomla');
+			}
+
+			// Sanity check
+			if (count($parts) != 3)
+			{
+				continue;
+			}
+
+			// Make sure we skip any references back to ourselves (should be redundant, due to key field check above)
+			if ($parts[1] == $this->tableType)
+			{
+				continue;
+			}
+
+			// Default item name: the name of the table, singular
+			$itemName = FOFInflector::singularize($parts[1]);
+
+			// Prefix the item name with the component name if we refer to a different component
+			if ($parts[0] != $this->componentName)
+			{
+				$itemName = $parts[0] . '_' . $itemName;
+			}
+
+			// Figure out the table class
+			$tableClass = ucfirst($parts[0]) . 'Table' . ucfirst($parts[1]);
+
+			$default = empty($this->relations['parent']);
+
+			$this->addParentRelation($itemName, $tableClass, $field, $field, $default);
+		}
+
+		// Get the relations from the configuration provider
+		$key = $table->getConfigProviderKey() . '.relations';
+		$configRelations = $table->getConfigProvider()->get($key, array());
+
+		if (!empty($configRelations))
+		{
+			foreach ($configRelations as $relation)
+			{
+				if (empty($relation['type']))
+				{
+					continue;
+				}
+
+				if (isset($relation['pivotTable']))
+				{
+					$this->addMultipleRelation($relation['itemName'], $relation['tableClass'],
+						$relation['localKey'], $relation['ourPivotKey'], $relation['theirPivotKey'],
+						$relation['remoteKey'], $relation['pivotTable'], $relation['default']);
+				}
+				else
+				{
+					$method = 'add' . ucfirst($relation['type']). 'Relation';
+
+					if (!method_exists($this, $method))
+					{
+						continue;
+					}
+
+					$this->$method($relation['itemName'], $relation['tableClass'],
+						$relation['localKey'], $relation['remoteKey'], $relation['default']);
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Add a 1:1 forward (child) relation. This adds relations for the getChild() method.
+	 *
+	 * In other words: does a table HAVE ONE child
+	 *
+	 * Parent and child relations works the same way. We have them separated as it makes more sense for us humans to
+	 * read code like $item->getParent() and $item->getChild() than $item->getRelatedObject('someRandomKeyName')
+	 *
+	 * @param   string   $itemName    is how it will be known locally to the getRelatedItem method (singular)
+	 * @param   string   $tableClass  if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey    is the column containing our side of the FK relation, default: our primary key
+	 * @param   string   $remoteKey   is the remote table's FK column, default: componentname_itemname_id
+	 * @param   boolean  $default     add as the default child relation?
+	 *
+	 * @return  void
+	 */
+	public function addChildRelation($itemName, $tableClass = null, $localKey = null, $remoteKey = null, $default = true)
+	{
+		$itemName = $this->normaliseItemName($itemName, false);
+
+		if (empty($localKey))
+		{
+			$localKey = $this->table->getKeyName();
+		}
+
+		$this->addBespokeSimpleRelation('child', $itemName, $tableClass, $localKey, $remoteKey, $default);
+	}
+
+	/**
+	 * Defining an inverse 1:1 (parent) relation. You must specify at least the $tableClass or the $localKey.
+	 * This adds relations for the getParent() method.
+	 *
+	 * In other words: does a table BELONG TO ONE parent
+	 *
+	 * Parent and child relations works the same way. We have them separated as it makes more sense for us humans to
+	 * read code like $item->getParent() and $item->getChild() than $item->getRelatedObject('someRandomKeyName')
+	 *
+	 * @param   string   $itemName    is how it will be known locally to the getRelatedItem method (singular)
+	 * @param   string   $tableClass  if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey    is the column containing our side of the FK relation, default: componentname_itemname_id
+	 * @param   string   $remoteKey   is the remote table's FK column, default: componentname_itemname_id
+	 * @param   boolean  $default     Is this the default parent relationship?
+	 *
+	 * @return  void
+	 */
+	public function addParentRelation($itemName, $tableClass = null, $localKey = null, $remoteKey = null, $default = true)
+	{
+		$itemName = $this->normaliseItemName($itemName, false);
+
+		$this->addBespokeSimpleRelation('parent', $itemName, $tableClass, $localKey, $remoteKey, $default);
+	}
+
+	/**
+	 * Defining a forward 1:∞ (children) relation. This adds relations to the getChildren() method.
+	 *
+	 * In other words: does a table HAVE MANY children?
+	 *
+	 * The children relation works very much the same as the parent and child relation. The difference is that the
+	 * parent and child relations return a single table object, whereas the children relation returns an iterator to
+	 * many objects.
+	 *
+	 * @param   string   $itemName    is how it will be known locally to the getRelatedItems method (plural)
+	 * @param   string   $tableClass  if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey    is the column containing our side of the FK relation, default: our primary key
+	 * @param   string   $remoteKey   is the remote table's FK column, default: componentname_itemname_id
+	 * @param   boolean  $default     is this the default children relationship?
+	 *
+	 * @return  void
+	 */
+	public function addChildrenRelation($itemName, $tableClass = null, $localKey = null, $remoteKey = null, $default = true)
+	{
+		$itemName = $this->normaliseItemName($itemName, true);
+
+		if (empty($localKey))
+		{
+			$localKey = $this->table->getKeyName();
+		}
+
+		$this->addBespokeSimpleRelation('children', $itemName, $tableClass, $localKey, $remoteKey, $default);
+	}
+
+	/**
+	 * Defining a ∞:∞ (multiple) relation. This adds relations to the getMultiple() method.
+	 *
+	 * In other words: is a table RELATED TO MANY other records?
+	 *
+	 * @param   string   $itemName       is how it will be known locally to the getRelatedItems method (plural)
+	 * @param   string   $tableClass     if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey       is the column containing our side of the FK relation, default: our primary key field name
+	 * @param   string   $ourPivotKey    is the column containing our side of the FK relation in the pivot table, default: $localKey
+	 * @param   string   $theirPivotKey  is the column containing the other table's side of the FK relation in the pivot table, default $remoteKey
+	 * @param   string   $remoteKey      is the remote table's FK column, default: componentname_itemname_id
+	 * @param   string   $glueTable      is the name of the glue (pivot) table, default: #__componentname_thisclassname_itemname with plural items (e.g. #__foobar_users_roles)
+	 * @param   boolean  $default        is this the default multiple relation?
+	 */
+	public function addMultipleRelation($itemName, $tableClass = null, $localKey = null, $ourPivotKey = null, $theirPivotKey = null, $remoteKey = null, $glueTable = null, $default = true)
+	{
+		$itemName = $this->normaliseItemName($itemName, true);
+
+		if (empty($localKey))
+		{
+			$localKey = $this->table->getKeyName();
+		}
+
+		$this->addBespokePivotRelation('multiple', $itemName, $tableClass, $localKey, $remoteKey, $ourPivotKey, $theirPivotKey, $glueTable, $default);
+	}
+
+	/**
+	 * Removes a previously defined relation by name. You can optionally specify the relation type.
+	 *
+	 * @param   string  $itemName  The name of the relation to remove
+	 * @param   string  $type      [optional] The relation type (child, parent, children, ...)
+	 *
+	 * @return  void
+	 */
+	public function removeRelation($itemName, $type = null)
+	{
+		$types = array_keys($this->relations);
+
+		if (in_array($type, $types))
+		{
+			$types = array($type);
+		}
+
+		foreach ($types as $type)
+		{
+			foreach ($this->relations[$type] as $key => $relations)
+			{
+				if ($itemName == $key)
+				{
+					unset ($this->relations[$type][$itemName]);
+
+                    // If it's the default one, remove it from the default array, too
+                    if($this->defaultRelation[$type] == $itemName)
+                    {
+                        $this->defaultRelation[$type] = null;
+                    }
+
+					return;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Removes all existing relations
+	 *
+	 * @param   string  $type  The type or relations to remove, omit to remove all relation types
+	 *
+	 * @return  void
+	 */
+	public function clearRelations($type = null)
+	{
+		$types = array_keys($this->relations);
+
+		if (in_array($type, $types))
+		{
+			$types = array($type);
+		}
+
+		foreach ($types as $type)
+		{
+			$this->relations[$type] = array();
+
+            // Remove the relation from the default stack, too
+            $this->defaultRelation[$type] = null;
+		}
+	}
+
+	/**
+	 * Does the named relation exist? You can optionally specify the type.
+	 *
+	 * @param   string  $itemName  The name of the relation to check
+	 * @param   string  $type      [optional] The relation type (child, parent, children, ...)
+	 *
+	 * @return  boolean
+	 */
+	public function hasRelation($itemName, $type = null)
+	{
+		$types = array_keys($this->relations);
+
+		if (in_array($type, $types))
+		{
+			$types = array($type);
+		}
+
+		foreach ($types as $type)
+		{
+			foreach ($this->relations[$type] as $key => $relations)
+			{
+				if ($itemName == $key)
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the definition of a relation
+	 *
+	 * @param   string  $itemName  The name of the relation to check
+	 * @param   string  $type      [optional] The relation type (child, parent, children, ...)
+	 *
+	 * @return  array
+	 *
+	 * @throws  RuntimeException  When the relation is not found
+	 */
+	public function getRelation($itemName, $type)
+	{
+		$types = array_keys($this->relations);
+
+		if (in_array($type, $types))
+		{
+			$types = array($type);
+		}
+
+		foreach ($types as $type)
+		{
+			foreach ($this->relations[$type] as $key => $relations)
+			{
+				if ($itemName == $key)
+				{
+					$temp         = $relations;
+					$temp['type'] = $type;
+
+					return $temp;
+				}
+			}
+		}
+
+		throw new RuntimeException("Relation $itemName not found in table {$this->tableType}", 500);
+	}
+
+	/**
+	 * Gets the item referenced by a named relation. You can optionally specify the type. Only single item relation
+	 * types will be searched.
+	 *
+	 * @param   string  $itemName  The name of the relation to use
+	 * @param   string  $type      [optional] The relation type (child, parent)
+	 *
+	 * @return  FOFTable
+	 *
+	 * @throws  RuntimeException  If the named relation doesn't exist or isn't supposed to return single items
+	 */
+	public function getRelatedItem($itemName, $type = null)
+	{
+		if (empty($type))
+		{
+			$relation = $this->getRelation($itemName, $type);
+			$type = $relation['type'];
+		}
+
+		switch ($type)
+		{
+			case 'parent':
+				return $this->getParent($itemName);
+				break;
+
+			case 'child':
+				return $this->getChild($itemName);
+				break;
+
+			default:
+				throw new RuntimeException("Invalid relation type $type for returning a single related item", 500);
+				break;
+		}
+	}
+
+	/**
+	 * Gets the iterator for the items referenced by a named relation. You can optionally specify the type. Only
+	 * multiple item relation types will be searched.
+	 *
+	 * @param   string  $itemName  The name of the relation to use
+	 * @param   string  $type      [optional] The relation type (children, multiple)
+	 *
+	 * @return  FOFDatabaseIterator
+	 *
+	 * @throws  RuntimeException  If the named relation doesn't exist or isn't supposed to return single items
+	 */
+	public function getRelatedItems($itemName, $type = null)
+	{
+		if (empty($type))
+		{
+			$relation = $this->getRelation($itemName, $type);
+			$type = $relation['type'];
+		}
+
+		switch ($type)
+		{
+			case 'children':
+				return $this->getChildren($itemName);
+				break;
+
+			case 'multiple':
+				return $this->getMultiple($itemName);
+				break;
+
+			case 'siblings':
+				return $this->getSiblings($itemName);
+				break;
+
+			default:
+				throw new RuntimeException("Invalid relation type $type for returning a collection of related items", 500);
+				break;
+		}
+	}
+
+	/**
+	 * Gets a parent item
+	 *
+	 * @param   string  $itemName  [optional] The name of the relation to use, skip to use the default parent relation
+	 *
+	 * @return  FOFTable
+	 *
+	 * @throws  RuntimeException  When the relation is not found
+	 */
+	public function getParent($itemName = null)
+	{
+		if (empty($itemName))
+		{
+			$itemName = $this->defaultRelation['parent'];
+		}
+
+		if (empty($itemName))
+		{
+			throw new RuntimeException(sprintf('Default parent relation for %s not found', $this->table->getTableName()), 500);
+		}
+
+		if (!isset($this->relations['parent'][$itemName]))
+		{
+			throw new RuntimeException(sprintf('Parent relation %s for %s not found', $itemName, $this->table->getTableName()), 500);
+		}
+
+		return $this->getTableFromRelation($this->relations['parent'][$itemName]);
+	}
+
+	/**
+	 * Gets a child item
+	 *
+	 * @param   string  $itemName  [optional] The name of the relation to use, skip to use the default child relation
+	 *
+	 * @return  FOFTable
+	 *
+	 * @throws  RuntimeException  When the relation is not found
+	 */
+	public function getChild($itemName = null)
+	{
+		if (empty($itemName))
+		{
+			$itemName = $this->defaultRelation['child'];
+		}
+
+		if (empty($itemName))
+		{
+			throw new RuntimeException(sprintf('Default child relation for %s not found', $this->table->getTableName()), 500);
+		}
+
+		if (!isset($this->relations['child'][$itemName]))
+		{
+			throw new RuntimeException(sprintf('Child relation %s for %s not found', $itemName, $this->table->getTableName()), 500);
+		}
+
+		return $this->getTableFromRelation($this->relations['child'][$itemName]);
+	}
+
+	/**
+	 * Gets an iterator for the children items
+	 *
+	 * @param   string  $itemName  [optional] The name of the relation to use, skip to use the default children relation
+	 *
+	 * @return  FOFDatabaseIterator
+	 *
+	 * @throws  RuntimeException  When the relation is not found
+	 */
+	public function getChildren($itemName = null)
+	{
+		if (empty($itemName))
+		{
+			$itemName = $this->defaultRelation['children'];
+		}
+		if (empty($itemName))
+		{
+			throw new RuntimeException(sprintf('Default children relation for %s not found', $this->table->getTableName()), 500);
+		}
+
+		if (!isset($this->relations['children'][$itemName]))
+		{
+			throw new RuntimeException(sprintf('Children relation %s for %s not found', $itemName, $this->table->getTableName()), 500);
+		}
+
+		return $this->getIteratorFromRelation($this->relations['children'][$itemName]);
+	}
+
+	/**
+	 * Gets an iterator for the sibling items. This relation is inferred from the parent relation. It returns all
+	 * elements on the same table which have the same parent.
+	 *
+	 * @param   string  $itemName  [optional] The name of the relation to use, skip to use the default children relation
+	 *
+	 * @return  FOFDatabaseIterator
+	 *
+	 * @throws  RuntimeException  When the relation is not found
+	 */
+	public function getSiblings($itemName = null)
+	{
+		if (empty($itemName))
+		{
+			$itemName = $this->defaultRelation['parent'];
+		}
+		if (empty($itemName))
+		{
+			throw new RuntimeException(sprintf('Default siblings relation for %s not found', $this->table->getTableName()), 500);
+		}
+
+		if (!isset($this->relations['parent'][$itemName]))
+		{
+			throw new RuntimeException(sprintf('Sibling relation %s for %s not found', $itemName, $this->table->getTableName()), 500);
+		}
+
+		// Get my table class
+		$tableName = $this->table->getTableName();
+		$tableName = str_replace('#__', '', $tableName);
+		$tableNameParts = explode('_', $tableName, 2);
+		$tableClass = ucfirst($tableNameParts[0]) . 'Table' . ucfirst(FOFInflector::singularize($tableNameParts[1]));
+
+		$parentRelation = $this->relations['parent'][$itemName];
+		$relation = array(
+			'tableClass'	=> $tableClass,
+			'localKey'		=> $parentRelation['localKey'],
+			'remoteKey'		=> $parentRelation['localKey'],
+		);
+
+		return $this->getIteratorFromRelation($relation);
+	}
+
+	/**
+	 * Gets an iterator for the multiple items
+	 *
+	 * @param   string  $itemName  [optional] The name of the relation to use, skip to use the default multiple relation
+	 *
+	 * @return  FOFDatabaseIterator
+	 *
+	 * @throws  RuntimeException  When the relation is not found
+	 */
+	public function getMultiple($itemName = null)
+	{
+		if (empty($itemName))
+		{
+			$itemName = $this->defaultRelation['multiple'];
+		}
+
+		if (empty($itemName))
+		{
+			throw new RuntimeException(sprintf('Default multiple relation for %s not found', $this->table->getTableName()), 500);
+		}
+
+		if (!isset($this->relations['multiple'][$itemName]))
+		{
+			throw new RuntimeException(sprintf('Multiple relation %s for %s not found', $itemName, $this->table->getTableName()), 500);
+		}
+
+		return $this->getIteratorFromRelation($this->relations['multiple'][$itemName]);
+	}
+
+	/**
+	 * Returns a FOFTable object based on a given relation
+	 *
+	 * @param   array    $relation   Indexed array holding relation definition.
+     *                                  tableClass => name of the related table class
+     *                                  localKey   => name of the local key
+     *                                  remoteKey  => name of the remote key
+	 *
+	 * @return FOFTable
+	 *
+	 * @throws RuntimeException
+     * @throws InvalidArgumentException
+	 */
+	protected function getTableFromRelation($relation)
+	{
+        // Sanity checks
+        if(
+            !isset($relation['tableClass']) || !isset($relation['remoteKey']) || !isset($relation['localKey']) ||
+            !$relation['tableClass'] || !$relation['remoteKey'] || !$relation['localKey']
+        )
+        {
+            throw new InvalidArgumentException('Missing array index for the '.__METHOD__.' method. Please check method signature', 500);
+        }
+
+		// Get a table object from the table class name
+		$tableClass      = $relation['tableClass'];
+		$tableClassParts = FOFInflector::explode($tableClass);
+
+        if(count($tableClassParts) < 3)
+        {
+            throw new InvalidArgumentException('Invalid table class named. It should be something like FooTableBar');
+        }
+
+		$table = FOFTable::getInstance($tableClassParts[2], ucfirst($tableClassParts[0]) . ucfirst($tableClassParts[1]));
+
+		// Get the table name
+		$tableName = $table->getTableName();
+
+		// Get the remote and local key names
+		$remoteKey = $relation['remoteKey'];
+		$localKey  = $relation['localKey'];
+
+		// Get the local key's value
+		$value = $this->table->$localKey;
+
+        // If there's no value for the primary key, let's stop here
+        if(!$value)
+        {
+            throw new RuntimeException('Missing value for the primary key of the table '.$this->table->getTableName(), 500);
+        }
+
+		// This is required to prevent one relation from killing the db cursor used in a different relation...
+		$oldDb = $this->table->getDbo();
+		$oldDb->disconnect(); // YES, WE DO NEED TO DISCONNECT BEFORE WE CLONE THE DB OBJECT. ARGH!
+		$db = clone $oldDb;
+
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn($tableName))
+			->where($db->qn($remoteKey) . ' = ' . $db->q($value));
+		$db->setQuery($query, 0, 1);
+
+		$data = $db->loadObject();
+
+		if (!is_object($data))
+		{
+			throw new RuntimeException(sprintf('Cannot load item from relation against table %s column %s', $tableName, $remoteKey), 500);
+		}
+
+		$table->bind($data);
+
+		return $table;
+	}
+
+	/**
+	 * Returns a FOFDatabaseIterator based on a given relation
+	 *
+	 * @param   array    $relation   Indexed array holding relation definition.
+     *                                  tableClass => name of the related table class
+     *                                  localKey   => name of the local key
+     *                                  remoteKey  => name of the remote key
+     *                                  pivotTable    => name of the pivot table (optional)
+     *                                  theirPivotKey => name of the remote key in the pivot table (mandatory if pivotTable is set)
+     *                                  ourPivotKey   => name of our key in the pivot table (mandatory if pivotTable is set)
+	 *
+	 * @return FOFDatabaseIterator
+	 *
+	 * @throws RuntimeException
+	 * @throws InvalidArgumentException
+	 */
+	protected function getIteratorFromRelation($relation)
+	{
+        // Sanity checks
+        if(
+            !isset($relation['tableClass']) || !isset($relation['remoteKey']) || !isset($relation['localKey']) ||
+            !$relation['tableClass'] || !$relation['remoteKey'] || !$relation['localKey']
+        )
+        {
+            throw new InvalidArgumentException('Missing array index for the '.__METHOD__.' method. Please check method signature', 500);
+        }
+
+        if(array_key_exists('pivotTable', $relation))
+        {
+            if(
+                !isset($relation['theirPivotKey']) || !isset($relation['ourPivotKey']) ||
+                !$relation['pivotTable'] || !$relation['theirPivotKey'] || !$relation['ourPivotKey']
+            )
+            {
+                throw new InvalidArgumentException('Missing array index for the '.__METHOD__.' method. Please check method signature', 500);
+            }
+        }
+
+		// Get a table object from the table class name
+		$tableClass      = $relation['tableClass'];
+		$tableClassParts = FOFInflector::explode($tableClass);
+
+        if(count($tableClassParts) < 3)
+        {
+            throw new InvalidArgumentException('Invalid table class named. It should be something like FooTableBar');
+        }
+
+		$table = FOFTable::getInstance($tableClassParts[2], ucfirst($tableClassParts[0]) . ucfirst($tableClassParts[1]));
+
+		// Get the table name
+		$tableName = $table->getTableName();
+
+		// Get the remote and local key names
+		$remoteKey = $relation['remoteKey'];
+		$localKey  = $relation['localKey'];
+
+		// Get the local key's value
+		$value = $this->table->$localKey;
+
+        // If there's no value for the primary key, let's stop here
+        if(!$value)
+        {
+            throw new RuntimeException('Missing value for the primary key of the table '.$this->table->getTableName(), 500);
+        }
+
+		// This is required to prevent one relation from killing the db cursor used in a different relation...
+		$oldDb = $this->table->getDbo();
+		$oldDb->disconnect(); // YES, WE DO NEED TO DISCONNECT BEFORE WE CLONE THE DB OBJECT. ARGH!
+		$db = clone $oldDb;
+
+		// Begin the query
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn($tableName));
+
+		// Do we have a pivot table?
+		$hasPivot = array_key_exists('pivotTable', $relation);
+
+		// If we don't have pivot it's a straightforward query
+		if (!$hasPivot)
+		{
+			$query->where($db->qn($remoteKey) . ' = ' . $db->q($value));
+		}
+		// If we have a pivot table we have to do a subquery
+		else
+		{
+			$subQuery = $db->getQuery(true)
+				->select($db->qn($relation['theirPivotKey']))
+				->from($db->qn($relation['pivotTable']))
+				->where($db->qn($relation['ourPivotKey']) . ' = ' . $db->q($value));
+			$query->where($db->qn($remoteKey) . ' IN (' . $subQuery . ')');
+		}
+
+		$db->setQuery($query);
+
+		$cursor = $db->execute();
+
+		$iterator = FOFDatabaseIterator::getIterator($db->name, $cursor, null, $tableClass);
+
+		return $iterator;
+	}
+
+	/**
+	 * Add any bespoke relation which doesn't involve a pivot table.
+	 *
+	 * @param   string   $relationType  The type of the relationship (parent, child, children)
+	 * @param   string   $itemName      is how it will be known locally to the getRelatedItems method
+	 * @param   string   $tableClass    if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey      is the column containing our side of the FK relation, default: componentname_itemname_id
+	 * @param   string   $remoteKey     is the remote table's FK column, default: componentname_itemname_id
+	 * @param   boolean  $default       is this the default children relationship?
+	 *
+	 * @return  void
+	 */
+	protected function addBespokeSimpleRelation($relationType, $itemName, $tableClass, $localKey, $remoteKey, $default)
+	{
+		$ourPivotKey   = null;
+		$theirPivotKey = null;
+		$pivotTable    = null;
+
+		$this->normaliseParameters(false, $itemName, $tableClass, $localKey, $remoteKey, $ourPivotKey, $theirPivotKey, $pivotTable);
+
+		$this->relations[$relationType][$itemName] = array(
+			'tableClass'	=> $tableClass,
+			'localKey'		=> $localKey,
+			'remoteKey'		=> $remoteKey,
+		);
+
+		if ($default)
+		{
+			$this->defaultRelation[$relationType] = $itemName;
+		}
+	}
+
+	/**
+	 * Add any bespoke relation which involves a pivot table.
+	 *
+	 * @param   string   $relationType   The type of the relationship (multiple)
+	 * @param   string   $itemName       is how it will be known locally to the getRelatedItems method
+	 * @param   string   $tableClass     if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey       is the column containing our side of the FK relation, default: componentname_itemname_id
+	 * @param   string   $remoteKey      is the remote table's FK column, default: componentname_itemname_id
+	 * @param   string   $ourPivotKey    is the column containing our side of the FK relation in the pivot table, default: $localKey
+	 * @param   string   $theirPivotKey  is the column containing the other table's side of the FK relation in the pivot table, default $remoteKey
+	 * @param   string   $pivotTable     is the name of the glue (pivot) table, default: #__componentname_thisclassname_itemname with plural items (e.g. #__foobar_users_roles)
+	 * @param   boolean  $default        is this the default children relationship?
+	 *
+	 * @return  void
+	 */
+	protected function addBespokePivotRelation($relationType, $itemName, $tableClass, $localKey, $remoteKey, $ourPivotKey, $theirPivotKey, $pivotTable, $default)
+	{
+		$this->normaliseParameters(true, $itemName, $tableClass, $localKey, $remoteKey, $ourPivotKey, $theirPivotKey, $pivotTable);
+
+		$this->relations[$relationType][$itemName] = array(
+			'tableClass'	=> $tableClass,
+			'localKey'		=> $localKey,
+			'remoteKey'		=> $remoteKey,
+			'ourPivotKey'	=> $ourPivotKey,
+			'theirPivotKey'	=> $theirPivotKey,
+			'pivotTable'	=> $pivotTable,
+		);
+
+		if ($default)
+		{
+			$this->defaultRelation[$relationType] = $itemName;
+		}
+	}
+
+	/**
+	 * Normalise the parameters of a relation, guessing missing values
+	 *
+	 * @param   boolean  $pivot          Is this a many to many relation involving a pivot table?
+	 * @param   string   $itemName       is how it will be known locally to the getRelatedItems method (plural)
+	 * @param   string   $tableClass     if skipped it is defined automatically as ComponentnameTableItemname
+	 * @param   string   $localKey       is the column containing our side of the FK relation, default: componentname_itemname_id
+	 * @param   string   $remoteKey      is the remote table's FK column, default: componentname_itemname_id
+	 * @param   string   $ourPivotKey    is the column containing our side of the FK relation in the pivot table, default: $localKey
+	 * @param   string   $theirPivotKey  is the column containing the other table's side of the FK relation in the pivot table, default $remoteKey
+	 * @param   string   $pivotTable     is the name of the glue (pivot) table, default: #__componentname_thisclassname_itemname with plural items (e.g. #__foobar_users_roles)
+	 *
+	 * @return  void
+	 */
+	protected function normaliseParameters($pivot = false, &$itemName, &$tableClass, &$localKey, &$remoteKey, &$ourPivotKey, &$theirPivotKey, &$pivotTable)
+	{
+		// Get a default table class if none is provided
+		if (empty($tableClass))
+		{
+			$tableClassParts = explode('_', $itemName, 3);
+
+			if (count($tableClassParts) == 1)
+			{
+				array_unshift($tableClassParts, $this->componentName);
+			}
+
+			if ($tableClassParts[0] == 'joomla')
+			{
+				$tableClassParts[0] = 'J';
+			}
+
+			$tableClass = ucfirst($tableClassParts[0]) . 'Table' . ucfirst(FOFInflector::singularize($tableClassParts[1]));
+		}
+
+		// Make sure we have both a local and remote key
+		if (empty($localKey) && empty($remoteKey))
+		{
+            // WARNING! If we have a pivot table, this behavior is wrong!
+            // Infact if we have `parts` and `groups` the local key should be foobar_part_id and the remote one foobar_group_id.
+            // However, this isn't a real issue because:
+            // 1. we have no way to detect the local key of a multiple relation
+            // 2. this scenario never happens, since, in this class, if we're adding a multiple relation we always supply the local key
+			$tableClassParts = FOFInflector::explode($tableClass);
+			$localKey  = $tableClassParts[0] . '_' . $tableClassParts[2] . '_id';
+			$remoteKey = $localKey;
+		}
+		elseif (empty($localKey) && !empty($remoteKey))
+		{
+			$localKey = $remoteKey;
+		}
+		elseif (!empty($localKey) && empty($remoteKey))
+		{
+            if($pivot)
+            {
+                $tableClassParts = FOFInflector::explode($tableClass);
+                $remoteKey = $tableClassParts[0] . '_' . $tableClassParts[2] . '_id';
+            }
+            else
+            {
+                $remoteKey = $localKey;
+            }
+		}
+
+		// If we don't have a pivot table nullify the relevant variables and return
+		if (!$pivot)
+		{
+			$ourPivotKey   = null;
+			$theirPivotKey = null;
+			$pivotTable    = null;
+
+			return;
+		}
+
+		if (empty($ourPivotKey))
+		{
+			$ourPivotKey = $localKey;
+		}
+
+		if (empty($theirPivotKey))
+		{
+			$theirPivotKey = $remoteKey;
+		}
+
+		if (empty($pivotTable))
+		{
+			$pivotTable = '#__' . strtolower($this->componentName) . '_' .
+							strtolower(FOFInflector::pluralize($this->tableType)) . '_';
+
+			$itemNameParts = explode('_', $itemName);
+			$lastPart = array_pop($itemNameParts);
+			$pivotTable .= strtolower($lastPart);
+		}
+	}
+
+	/**
+	 * Normalises the format of a relation name
+	 *
+	 * @param   string   $itemName   The raw relation name
+	 * @param   boolean  $pluralise  Should I pluralise the name? If not, I will singularise it
+	 *
+	 * @return  string  The normalised relation key name
+	 */
+	protected function normaliseItemName($itemName, $pluralise = false)
+	{
+		// Explode the item name
+		$itemNameParts = explode('_', $itemName);
+
+		// If we have multiple parts the first part is considered to be the component name
+		if (count($itemNameParts) > 1)
+		{
+			$prefix = array_shift($itemNameParts);
+		}
+		else
+		{
+			$prefix = null;
+		}
+
+		// If we still have multiple parts we need to pluralise/singularise the last part and join everything in
+		// CamelCase format
+		if (count($itemNameParts) > 1)
+		{
+			$name = array_pop($itemNameParts);
+			$name = $pluralise ? FOFInflector::pluralize($name) : FOFInflector::singularize($name);
+			$itemNameParts[] = $name;
+
+			$itemName = FOFInflector::implode($itemNameParts);
+		}
+		// Otherwise we singularise/pluralise the remaining part
+		else
+		{
+			$name = array_pop($itemNameParts);
+			$itemName = $pluralise ? FOFInflector::pluralize($name) : FOFInflector::singularize($name);
+		}
+
+		if (!empty($prefix))
+		{
+			$itemName = $prefix . '_' . $itemName;
+		}
+
+		return $itemName;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/table/table.php b/core/libraries/fof/table/table.php
new file mode 100644
index 00000000..9f565054
--- /dev/null
+++ b/core/libraries/fof/table/table.php
@@ -0,0 +1,3852 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  table
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Normally this shouldn't be required. Some PHP versions, however, seem to
+ * require this. Why? No idea whatsoever. If I remove it, FOF crashes on some
+ * hosts. Same PHP version on another host and no problem occurs. Any takers?
+ */
+if (class_exists('FOFTable', false))
+{
+	return;
+}
+
+if (!interface_exists('JTableInterface', true))
+{
+	interface JTableInterface {}
+}
+
+/**
+ * FrameworkOnFramework Table class. The Table is one part controller, one part
+ * model and one part data adapter. It's supposed to handle operations for single
+ * records.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFTable extends FOFUtilsObject implements JTableInterface
+{
+	/**
+	 * Cache array for instances
+	 *
+	 * @var    array
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Include paths for searching for FOFTable classes.
+	 *
+	 * @var    array
+	 */
+	protected static $_includePaths = array();
+
+	/**
+	 * The configuration parameters array
+	 *
+	 * @var  array
+	 */
+	protected $config = array();
+
+	/**
+	 * Name of the database table to model.
+	 *
+	 * @var    string
+	 */
+	protected $_tbl = '';
+
+	/**
+	 * Name of the primary key field in the table.
+	 *
+	 * @var    string
+	 */
+	protected $_tbl_key = '';
+
+	/**
+	 * FOFDatabaseDriver object.
+	 *
+	 * @var    FOFDatabaseDriver
+	 */
+	protected $_db;
+
+	/**
+	 * Should rows be tracked as ACL assets?
+	 *
+	 * @var    boolean
+	 */
+	protected $_trackAssets = false;
+
+	/**
+	 * Does the resource support joomla tags?
+	 *
+	 * @var    boolean
+	 */
+	protected $_has_tags = false;
+
+	/**
+	 * The rules associated with this record.
+	 *
+	 * @var    JAccessRules  A JAccessRules object.
+	 */
+	protected $_rules;
+
+	/**
+	 * Indicator that the tables have been locked.
+	 *
+	 * @var    boolean
+	 */
+	protected $_locked = false;
+
+	/**
+	 * If this is set to true, it triggers automatically plugin events for
+	 * table actions
+	 *
+	 * @var    boolean
+	 */
+	protected $_trigger_events = false;
+
+	/**
+	 * Table alias used in queries
+	 *
+	 * @var    string
+	 */
+	protected $_tableAlias = false;
+
+	/**
+	 * Array with alias for "special" columns such as ordering, hits etc etc
+	 *
+	 * @var    array
+	 */
+	protected $_columnAlias = array();
+
+	/**
+	 * If set to true, it enabled automatic checks on fields based on columns properties
+	 *
+	 * @var    boolean
+	 */
+	protected $_autoChecks = false;
+
+	/**
+	 * Array with fields that should be skipped by automatic checks
+	 *
+	 * @var    array
+	 */
+	protected $_skipChecks = array();
+
+	/**
+	 * Does the table actually exist? We need that to avoid PHP notices on
+	 * table-less views.
+	 *
+	 * @var    boolean
+	 */
+	protected $_tableExists = true;
+
+	/**
+	 * The asset key for items in this table. It's usually something in the
+	 * com_example.viewname format. They asset name will be this key appended
+	 * with the item's ID, e.g. com_example.viewname.123
+	 *
+	 * @var    string
+	 */
+	protected $_assetKey = '';
+
+	/**
+	 * The input data
+	 *
+	 * @var    FOFInput
+	 */
+	protected $input = null;
+
+	/**
+	 * Extended query including joins with other tables
+	 *
+	 * @var    FOFDatabaseQuery
+	 */
+	protected $_queryJoin = null;
+
+	/**
+	 * The prefix for the table class
+	 *
+	 * @var		string
+	 */
+	protected $_tablePrefix = '';
+
+	/**
+	 * The known fields for this table
+	 *
+	 * @var		array
+	 */
+	protected $knownFields = array();
+
+	/**
+	 * A list of table fields, keyed per table
+	 *
+	 * @var array
+	 */
+	protected static $tableFieldCache = array();
+
+	/**
+	 * A list of tables in the database
+	 *
+	 * @var array
+	 */
+	protected static $tableCache = array();
+
+	/**
+	 * An instance of FOFConfigProvider to provision configuration overrides
+	 *
+	 * @var    FOFConfigProvider
+	 */
+	protected $configProvider = null;
+
+	/**
+	 * FOFTableDispatcherBehavior for dealing with extra behaviors
+	 *
+	 * @var    FOFTableDispatcherBehavior
+	 */
+	protected $tableDispatcher = null;
+
+	/**
+	 * List of default behaviors to apply to the table
+	 *
+	 * @var    array
+	 */
+	protected $default_behaviors = array('tags', 'assets');
+
+	/**
+	 * The relations object of the table. It's lazy-loaded by getRelations().
+	 *
+	 * @var   FOFTableRelations
+	 */
+	protected $_relations = null;
+
+	/**
+	 * The configuration provider's key for this table, e.g. foobar.tables.bar for the #__foobar_bars table. This is set
+	 * automatically by the constructor
+	 *
+	 * @var  string
+	 */
+	protected $_configProviderKey = '';
+
+	/**
+	 * The content type of the table. Required if using tags or content history behaviour
+	 *
+	 * @var  string
+	 */
+	protected $contentType = null;
+
+	/**
+	 * Returns a static object instance of a particular table type
+	 *
+	 * @param   string  $type    The table name
+	 * @param   string  $prefix  The prefix of the table class
+	 * @param   array   $config  Optional configuration variables
+	 *
+	 * @return FOFTable
+	 */
+	public static function getInstance($type, $prefix = 'JTable', $config = array())
+	{
+		return self::getAnInstance($type, $prefix, $config);
+	}
+
+	/**
+	 * Returns a static object instance of a particular table type
+	 *
+	 * @param   string  $type    The table name
+	 * @param   string  $prefix  The prefix of the table class
+	 * @param   array   $config  Optional configuration variables
+	 *
+	 * @return FOFTable
+	 */
+	public static function &getAnInstance($type = null, $prefix = 'JTable', $config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		// Guess the component name
+		if (!array_key_exists('input', $config))
+		{
+			$config['input'] = new FOFInput;
+		}
+
+		if ($config['input'] instanceof FOFInput)
+		{
+			$tmpInput = $config['input'];
+		}
+		else
+		{
+			$tmpInput = new FOFInput($config['input']);
+		}
+
+		$option = $tmpInput->getCmd('option', '');
+		$tmpInput->set('option', $option);
+		$config['input'] = $tmpInput;
+
+		if (!in_array($prefix, array('Table', 'JTable')))
+		{
+			preg_match('/(.*)Table$/', $prefix, $m);
+			$option = 'com_' . strtolower($m[1]);
+		}
+
+		if (array_key_exists('option', $config))
+		{
+			$option = $config['option'];
+		}
+
+		$config['option'] = $option;
+
+		if (!array_key_exists('view', $config))
+		{
+			$config['view'] = $config['input']->getCmd('view', 'cpanel');
+		}
+
+		if (is_null($type))
+		{
+			if ($prefix == 'JTable')
+			{
+				$prefix = 'Table';
+			}
+
+			$type = $config['view'];
+		}
+
+		$type       = preg_replace('/[^A-Z0-9_\.-]/i', '', $type);
+		$tableClass = $prefix . ucfirst($type);
+
+		$config['_table_type'] = $type;
+		$config['_table_class'] = $tableClass;
+
+		$configProvider = new FOFConfigProvider;
+		$configProviderKey = $option . '.views.' . FOFInflector::singularize($type) . '.config.';
+
+		if (!array_key_exists($tableClass, self::$instances))
+		{
+			if (!class_exists($tableClass))
+			{
+				$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($config['option']);
+
+				$searchPaths = array(
+					$componentPaths['main'] . '/tables',
+					$componentPaths['admin'] . '/tables'
+				);
+
+				if (array_key_exists('tablepath', $config))
+				{
+					array_unshift($searchPaths, $config['tablepath']);
+				}
+
+				$altPath = $configProvider->get($configProviderKey . 'table_path', null);
+
+				if ($altPath)
+				{
+					array_unshift($searchPaths, $componentPaths['admin'] . '/' . $altPath);
+				}
+
+                $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+				$path = $filesystem->pathFind(
+					$searchPaths, strtolower($type) . '.php'
+				);
+
+				if ($path)
+				{
+					require_once $path;
+				}
+			}
+
+			if (!class_exists($tableClass))
+			{
+				$tableClass = 'FOFTable';
+			}
+
+			$component = str_replace('com_', '', $config['option']);
+			$tbl_common = $component . '_';
+
+			if (!array_key_exists('tbl', $config))
+			{
+				$config['tbl'] = strtolower('#__' . $tbl_common . strtolower(FOFInflector::pluralize($type)));
+			}
+
+			$altTbl = $configProvider->get($configProviderKey . 'tbl', null);
+
+			if ($altTbl)
+			{
+				$config['tbl'] = $altTbl;
+			}
+
+			if (!array_key_exists('tbl_key', $config))
+			{
+				$keyName           = FOFInflector::singularize($type);
+				$config['tbl_key'] = strtolower($tbl_common . $keyName . '_id');
+			}
+
+			$altTblKey = $configProvider->get($configProviderKey . 'tbl_key', null);
+
+			if ($altTblKey)
+			{
+				$config['tbl_key'] = $altTblKey;
+			}
+
+			if (!array_key_exists('db', $config))
+			{
+				$config['db'] = FOFPlatform::getInstance()->getDbo();
+			}
+
+			// Assign the correct table alias
+			if (array_key_exists('table_alias', $config))
+			{
+				$table_alias = $config['table_alias'];
+			}
+			else
+			{
+				$configProviderTableAliasKey = $option . '.tables.' . FOFInflector::singularize($type) . '.tablealias';
+				$table_alias = $configProvider->get($configProviderTableAliasKey, false	);
+			}
+
+			// Can we use the FOF cache?
+			if (!array_key_exists('use_table_cache', $config))
+			{
+				$config['use_table_cache'] = FOFPlatform::getInstance()->isGlobalFOFCacheEnabled();
+			}
+
+			$alt_use_table_cache = $configProvider->get($configProviderKey . 'use_table_cache', null);
+
+			if (!is_null($alt_use_table_cache))
+			{
+				$config['use_table_cache'] = $alt_use_table_cache;
+			}
+
+			// Create a new table instance
+			$instance = new $tableClass($config['tbl'], $config['tbl_key'], $config['db'], $config);
+			$instance->setInput($tmpInput);
+			$instance->setTablePrefix($prefix);
+			$instance->setTableAlias($table_alias);
+
+			// Determine and set the asset key for this table
+			$assetKey = 'com_' . $component . '.' . strtolower(FOFInflector::singularize($type));
+			$assetKey = $configProvider->get($configProviderKey . 'asset_key', $assetKey);
+			$instance->setAssetKey($assetKey);
+
+			if (array_key_exists('trigger_events', $config))
+			{
+				$instance->setTriggerEvents($config['trigger_events']);
+			}
+
+			if (version_compare(JVERSION, '3.1', 'ge'))
+			{
+				if (array_key_exists('has_tags', $config))
+				{
+					$instance->setHasTags($config['has_tags']);
+				}
+
+				$altHasTags = $configProvider->get($configProviderKey . 'has_tags', null);
+
+				if ($altHasTags)
+				{
+					$instance->setHasTags($altHasTags);
+				}
+			}
+			else
+			{
+				$instance->setHasTags(false);
+			}
+
+			$configProviderFieldmapKey = $option . '.tables.' . FOFInflector::singularize($type) . '.field';
+			$aliases = $configProvider->get($configProviderFieldmapKey, $instance->_columnAlias);
+			$instance->_columnAlias = array_merge($instance->_columnAlias, $aliases);
+
+			self::$instances[$tableClass] = $instance;
+		}
+
+		return self::$instances[$tableClass];
+	}
+
+	/**
+	 * Force an instance inside class cache. Setting arguments to null nukes all or part of the cache
+	 *
+	 * @param    string|null       $key        TableClass to replace. Set it to null to nuke the entire cache
+	 * @param    FOFTable|null     $instance   Instance to replace. Set it to null to nuke $key instances
+	 *
+	 * @return   bool              Did I correctly switch the instance?
+	 */
+	public static function forceInstance($key = null, $instance = null)
+	{
+		if(is_null($key))
+		{
+			self::$instances = array();
+
+			return true;
+		}
+		elseif($key && isset(self::$instances[$key]))
+		{
+			// I'm forcing an instance, but it's not a FOFTable, abort! abort!
+			if(!$instance || ($instance && $instance instanceof FOFTable))
+			{
+				self::$instances[$key] = $instance;
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Class Constructor.
+	 *
+	 * @param   string           $table   Name of the database table to model.
+	 * @param   string           $key     Name of the primary key field in the table.
+	 * @param   FOFDatabaseDriver  &$db     Database driver
+	 * @param   array            $config  The configuration parameters array
+	 */
+	public function __construct($table, $key, &$db, $config = array())
+	{
+		$this->_tbl     = $table;
+		$this->_tbl_key = $key;
+		$this->_db      = $db;
+
+		// Make sure the use FOF cache information is in the config
+		if (!array_key_exists('use_table_cache', $config))
+		{
+			$config['use_table_cache'] = FOFPlatform::getInstance()->isGlobalFOFCacheEnabled();
+		}
+		$this->config   = $config;
+
+		// Load the configuration provider
+		$this->configProvider = new FOFConfigProvider;
+
+		// Load the behavior dispatcher
+		$this->tableDispatcher = new FOFTableDispatcherBehavior;
+
+		// Initialise the table properties.
+
+		if ($fields = $this->getTableFields())
+		{
+			// Do I have anything joined?
+			$j_fields = $this->getQueryJoinFields();
+
+			if ($j_fields)
+			{
+				$fields = array_merge($fields, $j_fields);
+			}
+
+			$this->setKnownFields(array_keys($fields), true);
+			$this->reset();
+		}
+		else
+		{
+			$this->_tableExists = false;
+		}
+
+		// Get the input
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$this->input = $config['input'];
+			}
+			else
+			{
+				$this->input = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		// Set the $name/$_name variable
+		$component = $this->input->getCmd('option', 'com_foobar');
+
+		if (array_key_exists('option', $config))
+		{
+			$component = $config['option'];
+		}
+
+		$this->input->set('option', $component);
+
+		// Apply table behaviors
+		$type = explode("_", $this->_tbl);
+		$type = $type[count($type) - 1];
+
+		$this->_configProviderKey = $component . '.tables.' . FOFInflector::singularize($type);
+
+		$configKey = $this->_configProviderKey . '.behaviors';
+
+		if (isset($config['behaviors']))
+		{
+			$behaviors = (array) $config['behaviors'];
+		}
+		elseif ($behaviors = $this->configProvider->get($configKey, null))
+		{
+			$behaviors = explode(',', $behaviors);
+		}
+		else
+		{
+			$behaviors = $this->default_behaviors;
+		}
+
+		if (is_array($behaviors) && count($behaviors))
+		{
+			foreach ($behaviors as $behavior)
+			{
+				$this->addBehavior($behavior);
+			}
+		}
+
+		// If we are tracking assets, make sure an access field exists and initially set the default.
+		$asset_id_field	= $this->getColumnAlias('asset_id');
+		$access_field	= $this->getColumnAlias('access');
+
+		if (in_array($asset_id_field, $this->getKnownFields()))
+		{
+			JLoader::import('joomla.access.rules');
+			$this->_trackAssets = true;
+		}
+
+		// If the access property exists, set the default.
+		if (in_array($access_field, $this->getKnownFields()))
+		{
+			$this->$access_field = (int) FOFPlatform::getInstance()->getConfig()->get('access');
+		}
+
+		$this->config = $config;
+	}
+
+	/**
+	 * Replace the entire known fields array
+	 *
+	 * @param   array    $fields      A simple array of known field names
+	 * @param   boolean  $initialise  Should we initialise variables to null?
+	 *
+	 * @return  void
+	 */
+	public function setKnownFields($fields, $initialise = false)
+	{
+		$this->knownFields = $fields;
+
+		if ($initialise)
+		{
+			foreach ($this->knownFields as $field)
+			{
+				$this->$field = null;
+			}
+		}
+	}
+
+	/**
+	 * Get the known fields array
+	 *
+	 * @return  array
+	 */
+	public function getKnownFields()
+	{
+		return $this->knownFields;
+	}
+
+	/**
+	 * Does the specified field exist?
+	 *
+	 * @param   string  $fieldName  The field name to search (it's OK to use aliases)
+	 *
+	 * @return  bool
+	 */
+	public function hasField($fieldName)
+	{
+		$search = $this->getColumnAlias($fieldName);
+
+		return in_array($search, $this->knownFields);
+	}
+
+	/**
+	 * Add a field to the known fields array
+	 *
+	 * @param   string   $field       The name of the field to add
+	 * @param   boolean  $initialise  Should we initialise the variable to null?
+	 *
+	 * @return  void
+	 */
+	public function addKnownField($field, $initialise = false)
+	{
+		if (!in_array($field, $this->knownFields))
+		{
+			$this->knownFields[] = $field;
+
+			if ($initialise)
+			{
+				$this->$field = null;
+			}
+		}
+	}
+
+	/**
+	 * Remove a field from the known fields array
+	 *
+	 * @param   string  $field  The name of the field to remove
+	 *
+	 * @return  void
+	 */
+	public function removeKnownField($field)
+	{
+		if (in_array($field, $this->knownFields))
+		{
+			$pos = array_search($field, $this->knownFields);
+			unset($this->knownFields[$pos]);
+		}
+	}
+
+	/**
+	 * Adds a behavior to the table
+	 *
+	 * @param   string  $name    The name of the behavior
+	 * @param   array   $config  Optional Behavior configuration
+	 *
+	 * @return  boolean
+	 */
+	public function addBehavior($name, $config = array())
+	{
+		// First look for ComponentnameTableViewnameBehaviorName (e.g. FoobarTableItemsBehaviorTags)
+		if (isset($this->config['option']))
+		{
+			$option_name = str_replace('com_', '', $this->config['option']);
+			$behaviorClass = $this->config['_table_class'] . 'Behavior' . ucfirst(strtolower($name));
+
+			if (class_exists($behaviorClass))
+			{
+				$behavior = new $behaviorClass($this->tableDispatcher, $config);
+
+				return true;
+			}
+
+			// Then look for ComponentnameTableBehaviorName (e.g. FoobarTableBehaviorTags)
+			$option_name = str_replace('com_', '', $this->config['option']);
+			$behaviorClass = ucfirst($option_name) . 'TableBehavior' . ucfirst(strtolower($name));
+
+			if (class_exists($behaviorClass))
+			{
+				$behavior = new $behaviorClass($this->tableDispatcher, $config);
+
+				return true;
+			}
+		}
+
+		// Nothing found? Return false.
+
+		$behaviorClass = 'FOFTableBehavior' . ucfirst(strtolower($name));
+
+		if (class_exists($behaviorClass) && $this->tableDispatcher)
+		{
+			$behavior = new $behaviorClass($this->tableDispatcher, $config);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets the events trigger switch state
+	 *
+	 * @param   boolean  $newState  The new state of the switch (what else could it be?)
+	 *
+	 * @return  void
+	 */
+	public function setTriggerEvents($newState = false)
+	{
+		$this->_trigger_events = $newState ? true : false;
+	}
+
+	/**
+	 * Gets the events trigger switch state
+	 *
+	 * @return  boolean
+	 */
+	public function getTriggerEvents()
+	{
+		return $this->_trigger_events;
+	}
+
+	/**
+	 * Gets the has tags switch state
+	 *
+	 * @return bool
+	 */
+	public function hasTags()
+	{
+		return $this->_has_tags;
+	}
+
+	/**
+	 * Sets the has tags switch state
+	 *
+	 * @param   bool  $newState
+	 */
+	public function setHasTags($newState = false)
+	{
+		$this->_has_tags = false;
+
+		// Tags are available only in 3.1+
+		if (version_compare(JVERSION, '3.1', 'ge'))
+		{
+			$this->_has_tags = $newState ? true : false;
+		}
+	}
+
+	/**
+	 * Set the class prefix
+	 *
+	 * @param string $prefix The prefix
+	 */
+	public function setTablePrefix($prefix)
+	{
+		$this->_tablePrefix = $prefix;
+	}
+
+	/**
+	 * Sets fields to be skipped from automatic checks.
+	 *
+	 * @param   array/string  $skip  Fields to be skipped by automatic checks
+	 *
+	 * @return void
+	 */
+	public function setSkipChecks($skip)
+	{
+		$this->_skipChecks = (array) $skip;
+	}
+
+	/**
+	 * Method to load a row from the database by primary key and bind the fields
+	 * to the FOFTable instance properties.
+	 *
+	 * @param   mixed    $keys   An optional primary key value to load the row by, or an array of fields to match.  If not
+	 *                           set the instance property value is used.
+	 * @param   boolean  $reset  True to reset the default values before loading the new row.
+	 *
+	 * @return  boolean  True if successful. False if row not found.
+	 *
+	 * @throws  RuntimeException
+	 * @throws  UnexpectedValueException
+	 */
+	public function load($keys = null, $reset = true)
+	{
+		if (!$this->_tableExists)
+		{
+			$result = false;
+
+            return $this->onAfterLoad($result);
+		}
+
+		if (empty($keys))
+		{
+			// If empty, use the value of the current key
+			$keyName = $this->_tbl_key;
+
+			if (isset($this->$keyName))
+			{
+				$keyValue = $this->$keyName;
+			}
+			else
+			{
+				$keyValue = null;
+			}
+
+			// If empty primary key there's is no need to load anything
+
+			if (empty($keyValue))
+			{
+				$result = true;
+
+				return $this->onAfterLoad($result);
+			}
+
+			$keys = array($keyName => $keyValue);
+		}
+		elseif (!is_array($keys))
+		{
+			// Load by primary key.
+			$keys = array($this->_tbl_key => $keys);
+		}
+
+		if ($reset)
+		{
+			$this->reset();
+		}
+
+		// Initialise the query.
+		$query = $this->_db->getQuery(true);
+		$query->select($this->_tbl . '.*');
+		$query->from($this->_tbl);
+
+		// Joined fields are ok, since I initialized them in the constructor
+		$fields = $this->getKnownFields();
+
+		foreach ($keys as $field => $value)
+		{
+			// Check that $field is in the table.
+
+			if (!in_array($field, $fields))
+			{
+				throw new UnexpectedValueException(sprintf('Missing field in table %s : %s.', $this->_tbl, $field));
+			}
+
+			// Add the search tuple to the query.
+			$query->where($this->_db->qn($this->_tbl . '.' . $field) . ' = ' . $this->_db->q($value));
+		}
+
+		// Do I have any joined table?
+		$j_query = $this->getQueryJoin();
+
+		if ($j_query)
+		{
+			if ($j_query->select && $j_query->select->getElements())
+			{
+				//$query->select($this->normalizeSelectFields($j_query->select->getElements(), true));
+				$query->select($j_query->select->getElements());
+			}
+
+			if ($j_query->join)
+			{
+				foreach ($j_query->join as $join)
+				{
+					$t = (string) $join;
+
+					// Joomla doesn't provide any access to the "name" variable, so I have to work with strings...
+					if (stripos($t, 'inner') !== false)
+					{
+						$query->innerJoin($join->getElements());
+					}
+					elseif (stripos($t, 'left') !== false)
+					{
+						$query->leftJoin($join->getElements());
+					}
+					elseif (stripos($t, 'right') !== false)
+					{
+						$query->rightJoin($join->getElements());
+					}
+					elseif (stripos($t, 'outer') !== false)
+					{
+						$query->outerJoin($join->getElements());
+					}
+				}
+			}
+		}
+
+		$this->_db->setQuery($query);
+
+		$row = $this->_db->loadAssoc();
+
+		// Check that we have a result.
+		if (empty($row))
+		{
+			$result = false;
+
+			return $this->onAfterLoad($result);
+		}
+
+		// Bind the object with the row and return.
+		$result = $this->bind($row);
+
+		$this->onAfterLoad($result);
+
+		return $result;
+	}
+
+	/**
+	 * Based on fields properties (nullable column), checks if the field is required or not
+	 *
+	 * @return boolean
+	 */
+	public function check()
+	{
+		if (!$this->_autoChecks)
+		{
+			return true;
+		}
+
+		$fields = $this->getTableFields();
+
+        // No fields? Why in the hell am I here?
+        if(!$fields)
+        {
+            return false;
+        }
+
+        $result       = true;
+        $known        = $this->getKnownFields();
+        $skipFields[] = $this->_tbl_key;
+
+		if(in_array($this->getColumnAlias('title'), $known)
+			&& in_array($this->getColumnAlias('slug'), $known))      $skipFields[] = $this->getColumnAlias('slug');
+        if(in_array($this->getColumnAlias('hits'), $known))         $skipFields[] = $this->getColumnAlias('hits');
+        if(in_array($this->getColumnAlias('created_on'), $known))   $skipFields[] = $this->getColumnAlias('created_on');
+        if(in_array($this->getColumnAlias('created_by'), $known))   $skipFields[] = $this->getColumnAlias('created_by');
+        if(in_array($this->getColumnAlias('modified_on'), $known))  $skipFields[] = $this->getColumnAlias('modified_on');
+        if(in_array($this->getColumnAlias('modified_by'), $known))  $skipFields[] = $this->getColumnAlias('modified_by');
+        if(in_array($this->getColumnAlias('locked_by'), $known))    $skipFields[] = $this->getColumnAlias('locked_by');
+        if(in_array($this->getColumnAlias('locked_on'), $known))    $skipFields[] = $this->getColumnAlias('locked_on');
+
+        // Let's merge it with custom skips
+        $skipFields = array_merge($skipFields, $this->_skipChecks);
+
+		foreach ($fields as $field)
+		{
+			$fieldName = $field->Field;
+
+			if (empty($fieldName))
+			{
+				$fieldName = $field->column_name;
+			}
+
+			// Field is not nullable but it's null, set error
+
+			if ($field->Null == 'NO' && $this->$fieldName == '' && !in_array($fieldName, $skipFields))
+			{
+				$text = str_replace('#__', 'COM_', $this->getTableName()) . '_ERR_' . $fieldName;
+				$this->setError(JText::_(strtoupper($text)));
+				$result = false;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to reset class properties to the defaults set in the class
+	 * definition. It will ignore the primary key as well as any private class
+	 * properties.
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		if (!$this->onBeforeReset())
+		{
+			return false;
+		}
+
+		// Get the default values for the class from the table.
+		$fields   = $this->getTableFields();
+		$j_fields = $this->getQueryJoinFields();
+
+		if ($j_fields)
+		{
+			$fields = array_merge($fields, $j_fields);
+		}
+
+		if (is_array($fields) && !empty($fields))
+		{
+			foreach ($fields as $k => $v)
+			{
+				// If the property is not the primary key or private, reset it.
+				if ($k != $this->_tbl_key && (strpos($k, '_') !== 0))
+				{
+					$this->$k = $v->Default;
+				}
+			}
+
+			if (!$this->onAfterReset())
+			{
+				return false;
+			}
+		}
+	}
+
+    /**
+     * Clones the current object, after resetting it
+     *
+     * @return static
+     */
+    public function getClone()
+    {
+        $clone = clone $this;
+        $clone->reset();
+
+        $key = $this->getKeyName();
+        $clone->$key = null;
+
+        return $clone;
+    }
+
+	/**
+	 * Generic check for whether dependencies exist for this object in the db schema
+	 *
+	 * @param   integer  $oid    The primary key of the record to delete
+	 * @param   array    $joins  Any joins to foreign table, used to determine if dependent records exist
+	 *
+	 * @return  boolean  True if the record can be deleted
+	 */
+	public function canDelete($oid = null, $joins = null)
+	{
+		$k = $this->_tbl_key;
+
+		if ($oid)
+		{
+			$this->$k = intval($oid);
+		}
+
+		if (is_array($joins))
+		{
+			$db      = $this->_db;
+			$query   = $db->getQuery(true)
+				->select($db->qn('master') . '.' . $db->qn($k))
+				->from($db->qn($this->_tbl) . ' AS ' . $db->qn('master'));
+			$tableNo = 0;
+
+			foreach ($joins as $table)
+			{
+				$tableNo++;
+				$query->select(
+					array(
+						'COUNT(DISTINCT ' . $db->qn('t' . $tableNo) . '.' . $db->qn($table['idfield']) . ') AS ' . $db->qn($table['idalias'])
+					)
+				);
+				$query->join('LEFT', $db->qn($table['name']) .
+					' AS ' . $db->qn('t' . $tableNo) .
+					' ON ' . $db->qn('t' . $tableNo) . '.' . $db->qn($table['joinfield']) .
+					' = ' . $db->qn('master') . '.' . $db->qn($k)
+				);
+			}
+
+			$query->where($db->qn('master') . '.' . $db->qn($k) . ' = ' . $db->q($this->$k));
+			$query->group($db->qn('master') . '.' . $db->qn($k));
+			$this->_db->setQuery((string) $query);
+
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				try
+				{
+					$obj = $this->_db->loadObject();
+				}
+				catch (Exception $e)
+				{
+					$this->setError($e->getMessage());
+				}
+			}
+			else
+			{
+				if (!$obj = $this->_db->loadObject())
+				{
+					$this->setError($this->_db->getErrorMsg());
+
+					return false;
+				}
+			}
+
+			$msg = array();
+			$i   = 0;
+
+			foreach ($joins as $table)
+			{
+				$k = $table['idalias'];
+
+				if ($obj->$k > 0)
+				{
+					$msg[] = JText::_($table['label']);
+				}
+
+				$i++;
+			}
+
+			if (count($msg))
+			{
+				$option  = $this->input->getCmd('option', 'com_foobar');
+				$comName = str_replace('com_', '', $option);
+				$tview   = str_replace('#__' . $comName . '_', '', $this->_tbl);
+				$prefix  = $option . '_' . $tview . '_NODELETE_';
+
+				foreach ($msg as $key)
+				{
+					$this->setError(JText::_($prefix . $key));
+				}
+
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to bind an associative array or object to the FOFTable instance.This
+	 * method only binds properties that are publicly accessible and optionally
+	 * takes an array of properties to ignore when binding.
+	 *
+	 * @param   mixed  $src     An associative array or object to bind to the FOFTable instance.
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @throws  InvalidArgumentException
+	 */
+	public function bind($src, $ignore = array())
+	{
+		if (!$this->onBeforeBind($src))
+		{
+			return false;
+		}
+
+		// If the source value is not an array or object return false.
+		if (!is_object($src) && !is_array($src))
+		{
+			throw new InvalidArgumentException(sprintf('%s::bind(*%s*)', get_class($this), gettype($src)));
+		}
+
+		// If the source value is an object, get its accessible properties.
+		if (is_object($src))
+		{
+			$src = get_object_vars($src);
+		}
+
+		// If the ignore value is a string, explode it over spaces.
+		if (!is_array($ignore))
+		{
+			$ignore = explode(' ', $ignore);
+		}
+
+		// Bind the source value, excluding the ignored fields.
+		foreach ($this->getKnownFields() as $k)
+		{
+			// Only process fields not in the ignore array.
+			if (!in_array($k, $ignore))
+			{
+				if (isset($src[$k]))
+				{
+					$this->$k = $src[$k];
+				}
+			}
+		}
+
+		$result = $this->onAfterBind($src);
+
+		return $result;
+	}
+
+	/**
+	 * Method to store a row in the database from the FOFTable instance properties.
+	 * If a primary key value is set the row with that primary key value will be
+	 * updated with the instance property values.  If no primary key value is set
+	 * a new row will be inserted into the database with the properties from the
+	 * FOFTable instance.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function store($updateNulls = false)
+	{
+		if (!$this->onBeforeStore($updateNulls))
+		{
+			return false;
+		}
+
+		$k = $this->_tbl_key;
+
+		if ($this->$k == 0)
+		{
+			$this->$k = null;
+		}
+
+		// Create the object used for inserting/updating data to the database
+		$fields     = $this->getTableFields();
+		$properties = $this->getKnownFields();
+		$keys       = array();
+
+		foreach ($properties as $property)
+		{
+			// 'input' property is a reserved name
+
+			if (isset($fields[$property]))
+			{
+				$keys[] = $property;
+			}
+		}
+
+		$updateObject = array();
+		foreach ($keys as $key)
+		{
+			$updateObject[$key] = $this->$key;
+		}
+		$updateObject = (object)$updateObject;
+
+		/**
+		 * While the documentation for update/insertObject and execute() say they return a boolean,
+		 * not all of the implemtnations.  Depending on the version of J! and the specific driver,
+		 * they may return a database object, or boolean, or a mix, or toss an exception.  So try/catch,
+		 * and test for false.
+		 */
+
+		try
+		{
+			// If a primary key exists update the object, otherwise insert it.
+			if ($this->$k)
+			{
+				$result = $this->_db->updateObject($this->_tbl, $updateObject, $this->_tbl_key, $updateNulls);
+			}
+			else
+			{
+				$result = $this->_db->insertObject($this->_tbl, $updateObject, $this->_tbl_key);
+			}
+
+			if ($result === false)
+			{
+				$this->setError($this->_db->getErrorMsg());
+
+				return false;
+			}
+		}
+		catch (Exception $e)
+		{
+			$this->setError($e->getMessage());
+		}
+
+		$this->bind($updateObject);
+
+		if ($this->_locked)
+		{
+			$this->_unlock();
+		}
+
+		$result = $this->onAfterStore();
+
+		return $result;
+	}
+
+	/**
+	 * Method to move a row in the ordering sequence of a group of rows defined by an SQL WHERE clause.
+	 * Negative numbers move the row up in the sequence and positive numbers move it down.
+	 *
+	 * @param   integer  $delta  The direction and magnitude to move the row in the ordering sequence.
+	 * @param   string   $where  WHERE clause to use for limiting the selection of rows to compact the
+	 *                           ordering values.
+	 *
+	 * @return  mixed    Boolean  True on success.
+	 *
+	 * @throws  UnexpectedValueException
+	 */
+	public function move($delta, $where = '')
+	{
+		if (!$this->onBeforeMove($delta, $where))
+		{
+			return false;
+		}
+
+		// If there is no ordering field set an error and return false.
+		$ordering_field = $this->getColumnAlias('ordering');
+
+		if (!in_array($ordering_field, $this->getKnownFields()))
+		{
+			throw new UnexpectedValueException(sprintf('%s does not support ordering.', $this->_tbl));
+		}
+
+		// If the change is none, do nothing.
+		if (empty($delta))
+		{
+			$result = $this->onAfterMove();
+
+			return $result;
+		}
+
+		$k     = $this->_tbl_key;
+		$row   = null;
+		$query = $this->_db->getQuery(true);
+
+        // If the table is not loaded, return false
+        if (empty($this->$k))
+        {
+            return false;
+        }
+
+		// Select the primary key and ordering values from the table.
+		$query->select(array($this->_db->qn($this->_tbl_key), $this->_db->qn($ordering_field)));
+		$query->from($this->_tbl);
+
+		// If the movement delta is negative move the row up.
+
+		if ($delta < 0)
+		{
+			$query->where($this->_db->qn($ordering_field) . ' < ' . $this->_db->q((int) $this->$ordering_field));
+			$query->order($this->_db->qn($ordering_field) . ' DESC');
+		}
+
+		// If the movement delta is positive move the row down.
+
+		elseif ($delta > 0)
+		{
+			$query->where($this->_db->qn($ordering_field) . ' > ' . $this->_db->q((int) $this->$ordering_field));
+			$query->order($this->_db->qn($ordering_field) . ' ASC');
+		}
+
+		// Add the custom WHERE clause if set.
+
+		if ($where)
+		{
+			$query->where($where);
+		}
+
+		// Select the first row with the criteria.
+		$this->_db->setQuery($query, 0, 1);
+		$row = $this->_db->loadObject();
+
+		// If a row is found, move the item.
+
+		if (!empty($row))
+		{
+			// Update the ordering field for this instance to the row's ordering value.
+			$query = $this->_db->getQuery(true);
+			$query->update($this->_tbl);
+			$query->set($this->_db->qn($ordering_field) . ' = ' . $this->_db->q((int) $row->$ordering_field));
+			$query->where($this->_tbl_key . ' = ' . $this->_db->q($this->$k));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+
+			// Update the ordering field for the row to this instance's ordering value.
+			$query = $this->_db->getQuery(true);
+			$query->update($this->_tbl);
+			$query->set($this->_db->qn($ordering_field) . ' = ' . $this->_db->q((int) $this->$ordering_field));
+			$query->where($this->_tbl_key . ' = ' . $this->_db->q($row->$k));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+
+			// Update the instance value.
+			$this->$ordering_field = $row->$ordering_field;
+		}
+		else
+		{
+			// Update the ordering field for this instance.
+			$query = $this->_db->getQuery(true);
+			$query->update($this->_tbl);
+			$query->set($this->_db->qn($ordering_field) . ' = ' . $this->_db->q((int) $this->$ordering_field));
+			$query->where($this->_tbl_key . ' = ' . $this->_db->q($this->$k));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+		}
+
+		$result = $this->onAfterMove();
+
+		return $result;
+	}
+
+    /**
+     * Change the ordering of the records of the table
+     *
+     * @param   string   $where  The WHERE clause of the SQL used to fetch the order
+     *
+     * @return  boolean  True is successful
+     *
+     * @throws  UnexpectedValueException
+     */
+	public function reorder($where = '')
+	{
+		if (!$this->onBeforeReorder($where))
+		{
+			return false;
+		}
+
+		// If there is no ordering field set an error and return false.
+
+		$order_field = $this->getColumnAlias('ordering');
+
+		if (!in_array($order_field, $this->getKnownFields()))
+		{
+			throw new UnexpectedValueException(sprintf('%s does not support ordering.', $this->_tbl_key));
+		}
+
+		$k = $this->_tbl_key;
+
+		// Get the primary keys and ordering values for the selection.
+		$query = $this->_db->getQuery(true);
+		$query->select($this->_tbl_key . ', ' . $this->_db->qn($order_field));
+		$query->from($this->_tbl);
+		$query->where($this->_db->qn($order_field) . ' >= ' . $this->_db->q(0));
+		$query->order($this->_db->qn($order_field));
+
+		// Setup the extra where and ordering clause data.
+
+		if ($where)
+		{
+			$query->where($where);
+		}
+
+		$this->_db->setQuery($query);
+		$rows = $this->_db->loadObjectList();
+
+		// Compact the ordering values.
+
+		foreach ($rows as $i => $row)
+		{
+			// Make sure the ordering is a positive integer.
+
+			if ($row->$order_field >= 0)
+			{
+				// Only update rows that are necessary.
+
+				if ($row->$order_field != $i + 1)
+				{
+					// Update the row ordering field.
+					$query = $this->_db->getQuery(true);
+					$query->update($this->_tbl);
+					$query->set($this->_db->qn($order_field) . ' = ' . $this->_db->q($i + 1));
+					$query->where($this->_tbl_key . ' = ' . $this->_db->q($row->$k));
+					$this->_db->setQuery($query);
+					$this->_db->execute();
+				}
+			}
+		}
+
+		$result = $this->onAfterReorder();
+
+		return $result;
+	}
+
+	/**
+	 * Check out (lock) a record
+	 *
+	 * @param   integer  $userId  The locking user's ID
+	 * @param   integer  $oid     The primary key value of the record to lock
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function checkout($userId, $oid = null)
+	{
+		$fldLockedBy = $this->getColumnAlias('locked_by');
+		$fldLockedOn = $this->getColumnAlias('locked_on');
+
+		if (!(in_array($fldLockedBy, $this->getKnownFields())
+			|| in_array($fldLockedOn, $this->getKnownFields())))
+		{
+			return true;
+		}
+
+		$k = $this->_tbl_key;
+
+		if ($oid !== null)
+		{
+			$this->$k = $oid;
+		}
+
+        // No primary key defined, stop here
+        if (!$this->$k)
+        {
+            return false;
+        }
+
+		$date = FOFPlatform::getInstance()->getDate();
+
+		if (method_exists($date, 'toSql'))
+		{
+			$time = $date->toSql();
+		}
+		else
+		{
+			$time = $date->toMySQL();
+		}
+
+
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->qn($this->_tbl))
+			->set(
+				array(
+					$this->_db->qn($fldLockedBy) . ' = ' . $this->_db->q((int) $userId),
+					$this->_db->qn($fldLockedOn) . ' = ' . $this->_db->q($time)
+				)
+			)
+			->where($this->_db->qn($this->_tbl_key) . ' = ' . $this->_db->q($this->$k));
+		$this->_db->setQuery((string) $query);
+
+		$this->$fldLockedBy = $userId;
+		$this->$fldLockedOn = $time;
+
+		return $this->_db->execute();
+	}
+
+	/**
+	 * Check in (unlock) a record
+	 *
+	 * @param   integer  $oid  The primary key value of the record to unlock
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function checkin($oid = null)
+	{
+		$fldLockedBy = $this->getColumnAlias('locked_by');
+		$fldLockedOn = $this->getColumnAlias('locked_on');
+
+		if (!(in_array($fldLockedBy, $this->getKnownFields())
+			|| in_array($fldLockedOn, $this->getKnownFields())))
+		{
+			return true;
+		}
+
+		$k = $this->_tbl_key;
+
+		if ($oid !== null)
+		{
+			$this->$k = $oid;
+		}
+
+		if ($this->$k == null)
+		{
+			return false;
+		}
+
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->qn($this->_tbl))
+			->set(
+				array(
+					$this->_db->qn($fldLockedBy) . ' = 0',
+					$this->_db->qn($fldLockedOn) . ' = ' . $this->_db->q($this->_db->getNullDate())
+				)
+			)
+			->where($this->_db->qn($this->_tbl_key) . ' = ' . $this->_db->q($this->$k));
+		$this->_db->setQuery((string) $query);
+
+		$this->$fldLockedBy = 0;
+		$this->$fldLockedOn = '';
+
+		return $this->_db->execute();
+	}
+
+    /**
+     * Is a record locked?
+     *
+     * @param   integer $with            The userid to preform the match with. If an item is checked
+     *                                   out by this user the function will return false.
+     * @param   integer $unused_against  Junk inherited from JTable; ignore
+     *
+     * @throws  UnexpectedValueException
+     *
+     * @return  boolean  True if the record is locked by another user
+     */
+	public function isCheckedOut($with = 0, $unused_against = null)
+	{
+        $against     = null;
+		$fldLockedBy = $this->getColumnAlias('locked_by');
+
+        $k  = $this->_tbl_key;
+
+        // If no primary key is given, return false.
+
+        if ($this->$k === null)
+        {
+            throw new UnexpectedValueException('Null primary key not allowed.');
+        }
+
+		if (isset($this) && is_a($this, 'FOFTable') && !$against)
+		{
+			$against = $this->get($fldLockedBy);
+		}
+
+		// Item is not checked out, or being checked out by the same user
+
+		if (!$against || $against == $with)
+		{
+			return false;
+		}
+
+		$session = JTable::getInstance('session');
+
+		return $session->exists($against);
+	}
+
+	/**
+	 * Copy (duplicate) one or more records
+	 *
+	 * @param   integer|array  $cid  The primary key value (or values) or the record(s) to copy
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function copy($cid = null)
+	{
+		//We have to cast the id as array, or the helper function will return an empty set
+		if($cid)
+		{
+			$cid = (array) $cid;
+		}
+
+        FOFUtilsArray::toInteger($cid);
+		$k = $this->_tbl_key;
+
+		if (count($cid) < 1)
+		{
+			if ($this->$k)
+			{
+				$cid = array($this->$k);
+			}
+			else
+			{
+				$this->setError("No items selected.");
+
+				return false;
+			}
+		}
+
+		$created_by  = $this->getColumnAlias('created_by');
+		$created_on  = $this->getColumnAlias('created_on');
+		$modified_by = $this->getColumnAlias('modified_by');
+		$modified_on = $this->getColumnAlias('modified_on');
+
+		$locked_byName = $this->getColumnAlias('locked_by');
+		$checkin       = in_array($locked_byName, $this->getKnownFields());
+
+		foreach ($cid as $item)
+		{
+			// Prevent load with id = 0
+
+			if (!$item)
+			{
+				continue;
+			}
+
+			$this->load($item);
+
+			if ($checkin)
+			{
+				// We're using the checkin and the record is used by someone else
+
+				if ($this->isCheckedOut($item))
+				{
+					continue;
+				}
+			}
+
+			if (!$this->onBeforeCopy($item))
+			{
+				continue;
+			}
+
+			$this->$k           = null;
+			$this->$created_by  = null;
+			$this->$created_on  = null;
+			$this->$modified_on = null;
+			$this->$modified_by = null;
+
+			// Let's fire the event only if everything is ok
+			if ($this->store())
+			{
+				$this->onAfterCopy($item);
+			}
+
+			$this->reset();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Publish or unpublish records
+	 *
+	 * @param   integer|array  $cid      The primary key value(s) of the item(s) to publish/unpublish
+	 * @param   integer        $publish  1 to publish an item, 0 to unpublish
+	 * @param   integer        $user_id  The user ID of the user (un)publishing the item.
+	 *
+	 * @return  boolean  True on success, false on failure (e.g. record is locked)
+	 */
+	public function publish($cid = null, $publish = 1, $user_id = 0)
+	{
+		$enabledName   = $this->getColumnAlias('enabled');
+		$locked_byName = $this->getColumnAlias('locked_by');
+
+		// Mhm... you called the publish method on a table without publish support...
+		if(!in_array($enabledName, $this->getKnownFields()))
+		{
+			return false;
+		}
+
+		//We have to cast the id as array, or the helper function will return an empty set
+		if($cid)
+		{
+			$cid = (array) $cid;
+		}
+
+        FOFUtilsArray::toInteger($cid);
+		$user_id = (int) $user_id;
+		$publish = (int) $publish;
+		$k       = $this->_tbl_key;
+
+		if (count($cid) < 1)
+		{
+			if ($this->$k)
+			{
+				$cid = array($this->$k);
+			}
+			else
+			{
+				$this->setError("No items selected.");
+
+				return false;
+			}
+		}
+
+		if (!$this->onBeforePublish($cid, $publish))
+		{
+			return false;
+		}
+
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->qn($this->_tbl))
+			->set($this->_db->qn($enabledName) . ' = ' . (int) $publish);
+
+		$checkin = in_array($locked_byName, $this->getKnownFields());
+
+		if ($checkin)
+		{
+			$query->where(
+				' (' . $this->_db->qn($locked_byName) .
+					' = 0 OR ' . $this->_db->qn($locked_byName) . ' = ' . (int) $user_id . ')', 'AND'
+			);
+		}
+
+		// TODO Rewrite this statment using IN. Check if it work in SQLServer and PostgreSQL
+		$cids = $this->_db->qn($k) . ' = ' . implode(' OR ' . $this->_db->qn($k) . ' = ', $cid);
+
+		$query->where('(' . $cids . ')');
+
+		$this->_db->setQuery((string) $query);
+
+		if (version_compare(JVERSION, '3.0', 'ge'))
+		{
+			try
+			{
+				$this->_db->execute();
+			}
+			catch (Exception $e)
+			{
+				$this->setError($e->getMessage());
+			}
+		}
+		else
+		{
+			if (!$this->_db->execute())
+			{
+				$this->setError($this->_db->getErrorMsg());
+
+				return false;
+			}
+		}
+
+		if (count($cid) == 1 && $checkin)
+		{
+			if ($this->_db->getAffectedRows() == 1)
+			{
+				$this->checkin($cid[0]);
+
+				if ($this->$k == $cid[0])
+				{
+					$this->$enabledName = $publish;
+				}
+			}
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+
+	/**
+	 * Delete a record
+	 *
+	 * @param   integer $oid  The primary key value of the item to delete
+	 *
+	 * @throws  UnexpectedValueException
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function delete($oid = null)
+	{
+		if ($oid)
+		{
+			$this->load($oid);
+		}
+
+		$k  = $this->_tbl_key;
+		$pk = (!$oid) ? $this->$k : $oid;
+
+		// If no primary key is given, return false.
+		if (!$pk)
+		{
+			throw new UnexpectedValueException('Null primary key not allowed.');
+		}
+
+		// Execute the logic only if I have a primary key, otherwise I could have weird results
+		if (!$this->onBeforeDelete($oid))
+		{
+			return false;
+		}
+
+		// Delete the row by primary key.
+		$query = $this->_db->getQuery(true);
+		$query->delete();
+		$query->from($this->_tbl);
+		$query->where($this->_tbl_key . ' = ' . $this->_db->q($pk));
+		$this->_db->setQuery($query);
+
+		$this->_db->execute();
+
+		$result = $this->onAfterDelete($oid);
+
+		return $result;
+	}
+
+	/**
+	 * Register a hit on a record
+	 *
+	 * @param   integer  $oid  The primary key value of the record
+	 * @param   boolean  $log  Should I log the hit?
+	 *
+	 * @return  boolean  True on success
+	 */
+	public function hit($oid = null, $log = false)
+	{
+		if (!$this->onBeforeHit($oid, $log))
+		{
+			return false;
+		}
+
+		// If there is no hits field, just return true.
+		$hits_field = $this->getColumnAlias('hits');
+
+		if (!in_array($hits_field, $this->getKnownFields()))
+		{
+			return true;
+		}
+
+		$k  = $this->_tbl_key;
+		$pk = ($oid) ? $oid : $this->$k;
+
+		// If no primary key is given, return false.
+		if (!$pk)
+		{
+			$result = false;
+		}
+		else
+		{
+			// Check the row in by primary key.
+			$query = $this->_db->getQuery(true)
+						  ->update($this->_tbl)
+						  ->set($this->_db->qn($hits_field) . ' = (' . $this->_db->qn($hits_field) . ' + 1)')
+						  ->where($this->_tbl_key . ' = ' . $this->_db->q($pk));
+
+			$this->_db->setQuery($query)->execute();
+
+			// In order to update the table object, I have to load the table
+			if(!$this->$k)
+			{
+				$query = $this->_db->getQuery(true)
+							  ->select($this->_db->qn($hits_field))
+							  ->from($this->_db->qn($this->_tbl))
+							  ->where($this->_db->qn($this->_tbl_key) . ' = ' . $this->_db->q($pk));
+
+				$this->$hits_field = $this->_db->setQuery($query)->loadResult();
+			}
+			else
+			{
+				// Set table values in the object.
+				$this->$hits_field++;
+			}
+
+			$result = true;
+		}
+
+		if ($result)
+		{
+			$result = $this->onAfterHit($oid);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Export the item as a CSV line
+	 *
+	 * @param   string  $separator  CSV separator. Tip: use "\t" to get a TSV file instead.
+	 *
+	 * @return  string  The CSV line
+	 */
+	public function toCSV($separator = ',')
+	{
+		$csv = array();
+
+		foreach (get_object_vars($this) as $k => $v)
+		{
+			if (!in_array($k, $this->getKnownFields()))
+			{
+				continue;
+			}
+
+			$csv[] = '"' . str_replace('"', '""', $v) . '"';
+		}
+
+		$csv = implode($separator, $csv);
+
+		return $csv;
+	}
+
+	/**
+	 * Exports the table in array format
+	 *
+	 * @return  array
+	 */
+	public function getData()
+	{
+		$ret = array();
+
+		foreach (get_object_vars($this) as $k => $v)
+		{
+			if (!in_array($k, $this->getKnownFields()))
+			{
+				continue;
+			}
+
+			$ret[$k] = $v;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Get the header for exporting item list to CSV
+	 *
+	 * @param   string  $separator  CSV separator. Tip: use "\t" to get a TSV file instead.
+	 *
+	 * @return  string  The CSV file's header
+	 */
+	public function getCSVHeader($separator = ',')
+	{
+		$csv = array();
+
+		foreach (get_object_vars($this) as $k => $v)
+		{
+			if (!in_array($k, $this->getKnownFields()))
+			{
+				continue;
+			}
+
+			$csv[] = '"' . str_replace('"', '\"', $k) . '"';
+		}
+
+		$csv = implode($separator, $csv);
+
+		return $csv;
+	}
+
+	/**
+	 * Get the columns from a database table.
+	 *
+	 * @param   string  $tableName  Table name. If null current table is used
+	 *
+	 * @return  mixed  An array of the field names, or false if an error occurs.
+	 */
+	public function getTableFields($tableName = null)
+	{
+		// Should I load the cached data?
+		$useCache = array_key_exists('use_table_cache', $this->config) ? $this->config['use_table_cache'] : false;
+
+		// Make sure we have a list of tables in this db
+
+		if (empty(self::$tableCache))
+		{
+			if ($useCache)
+			{
+				// Try to load table cache from a cache file
+				$cacheData = FOFPlatform::getInstance()->getCache('tables', null);
+
+				// Unserialise the cached data, or set the table cache to empty
+				// if the cache data wasn't loaded.
+				if (!is_null($cacheData))
+				{
+					self::$tableCache = json_decode($cacheData, true);
+				}
+				else
+				{
+					self::$tableCache = array();
+				}
+			}
+
+			// This check is true if the cache data doesn't exist / is not loaded
+			if (empty(self::$tableCache))
+			{
+				self::$tableCache = $this->_db->getTableList();
+
+				if ($useCache)
+				{
+					FOFPlatform::getInstance()->setCache('tables', json_encode(self::$tableCache));
+				}
+			}
+		}
+
+		// Make sure the cached table fields cache is loaded
+		if (empty(self::$tableFieldCache))
+		{
+			if ($useCache)
+			{
+				// Try to load table cache from a cache file
+				$cacheData = FOFPlatform::getInstance()->getCache('tablefields', null);
+
+				// Unserialise the cached data, or set to empty if the cache
+				// data wasn't loaded.
+				if (!is_null($cacheData))
+				{
+					$decoded = json_decode($cacheData, true);
+					$tableCache = array();
+
+					if (count($decoded))
+					{
+						foreach ($decoded as $myTableName => $tableFields)
+						{
+							$temp = array();
+
+							if (is_array($tableFields))
+							{
+								foreach($tableFields as $field => $def)
+								{
+									$temp[$field] = (object)$def;
+								}
+								$tableCache[$myTableName] = $temp;
+							}
+							elseif (is_object($tableFields) || is_bool($tableFields))
+							{
+								$tableCache[$myTableName] = $tableFields;
+							}
+						}
+					}
+
+					self::$tableFieldCache = $tableCache;
+				}
+				else
+				{
+					self::$tableFieldCache = array();
+				}
+			}
+		}
+
+		if (!$tableName)
+		{
+			$tableName = $this->_tbl;
+		}
+
+		// Try to load again column specifications if the table is not loaded OR if it's loaded and
+		// the previous call returned an error
+		if (!array_key_exists($tableName, self::$tableFieldCache) ||
+			(isset(self::$tableFieldCache[$tableName]) && !self::$tableFieldCache[$tableName]))
+		{
+			// Lookup the fields for this table only once.
+			$name = $tableName;
+
+			$prefix = $this->_db->getPrefix();
+
+			if (substr($name, 0, 3) == '#__')
+			{
+				$checkName = $prefix . substr($name, 3);
+			}
+			else
+			{
+				$checkName = $name;
+			}
+
+			if (!in_array($checkName, self::$tableCache))
+			{
+				// The table doesn't exist. Return false.
+				self::$tableFieldCache[$tableName] = false;
+			}
+			elseif (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				$fields = $this->_db->getTableColumns($name, false);
+
+				if (empty($fields))
+				{
+					$fields = false;
+				}
+
+				self::$tableFieldCache[$tableName] = $fields;
+			}
+			else
+			{
+				$fields = $this->_db->getTableFields($name, false);
+
+				if (!isset($fields[$name]))
+				{
+					$fields = false;
+				}
+
+				self::$tableFieldCache[$tableName] = $fields[$name];
+			}
+
+			// PostgreSQL date type compatibility
+			if (($this->_db->name == 'postgresql') && (self::$tableFieldCache[$tableName] != false))
+			{
+				foreach (self::$tableFieldCache[$tableName] as $field)
+				{
+					if (strtolower($field->type) == 'timestamp without time zone')
+					{
+						if (stristr($field->Default, '\'::timestamp without time zone'))
+						{
+							list ($date, $junk) = explode('::', $field->Default, 2);
+							$field->Default = trim($date, "'");
+						}
+					}
+				}
+			}
+
+			// Save the data for this table into the cache
+			if ($useCache)
+			{
+				$cacheData = FOFPlatform::getInstance()->setCache('tablefields', json_encode(self::$tableFieldCache));
+			}
+		}
+
+		return self::$tableFieldCache[$tableName];
+	}
+
+	public function getTableAlias()
+	{
+		return $this->_tableAlias;
+	}
+
+	public function setTableAlias($string)
+	{
+		$string = preg_replace('#[^A-Z0-9_]#i', '', $string);
+		$this->_tableAlias = $string;
+	}
+
+	/**
+	 * Method to return the real name of a "special" column such as ordering, hits, published
+	 * etc etc. In this way you are free to follow your db naming convention and use the
+	 * built in Joomla functions.
+	 *
+	 * @param   string  $column  Name of the "special" column (ie ordering, hits etc etc)
+	 *
+	 * @return  string  The string that identify the special
+	 */
+	public function getColumnAlias($column)
+	{
+		if (isset($this->_columnAlias[$column]))
+		{
+			$return = $this->_columnAlias[$column];
+		}
+		else
+		{
+			$return = $column;
+		}
+
+		$return = preg_replace('#[^A-Z0-9_]#i', '', $return);
+
+		return $return;
+	}
+
+	/**
+	 * Method to register a column alias for a "special" column.
+	 *
+	 * @param   string  $column       The "special" column (ie ordering)
+	 * @param   string  $columnAlias  The real column name (ie foo_ordering)
+	 *
+	 * @return  void
+	 */
+	public function setColumnAlias($column, $columnAlias)
+	{
+		$column = strtolower($column);
+
+		$column                      = preg_replace('#[^A-Z0-9_]#i', '', $column);
+		$this->_columnAlias[$column] = $columnAlias;
+	}
+
+	/**
+	 * Get a JOIN query, used to join other tables
+	 *
+	 * @param   boolean  $asReference  Return an object reference instead of a copy
+	 *
+	 * @return  FOFDatabaseQuery  Query used to join other tables
+	 */
+	public function getQueryJoin($asReference = false)
+	{
+		if ($asReference)
+		{
+			return $this->_queryJoin;
+		}
+		else
+		{
+			if ($this->_queryJoin)
+			{
+				return clone $this->_queryJoin;
+			}
+			else
+			{
+				return null;
+			}
+		}
+	}
+
+	/**
+	 * Sets the query with joins to other tables
+	 *
+	 * @param   FOFDatabaseQuery  $query  The JOIN query to use
+	 *
+	 * @return  void
+	 */
+	public function setQueryJoin($query)
+	{
+		$this->_queryJoin = $query;
+	}
+
+	/**
+	 * Extracts the fields from the join query
+	 *
+	 * @return   array    Fields contained in the join query
+	 */
+	protected function getQueryJoinFields()
+	{
+		$query = $this->getQueryJoin();
+
+		if (!$query)
+		{
+			return array();
+		}
+
+		$tables   = array();
+		$j_tables = array();
+		$j_fields = array();
+
+		// Get joined tables. Ignore FROM clause, since it should not be used (the starting point is the table "table")
+		$joins    = $query->join;
+
+		foreach ($joins as $join)
+		{
+			$tables = array_merge($tables, $join->getElements());
+		}
+
+		// Clean up table names
+		foreach($tables as $table)
+		{
+			preg_match('#(.*)((\w)*(on|using))(.*)#i', $table, $matches);
+
+			if($matches && isset($matches[1]))
+			{
+				// I always want the first part, no matter what
+				$parts = explode(' ', $matches[1]);
+				$t_table = $parts[0];
+
+				if($this->isQuoted($t_table))
+				{
+					$t_table = substr($t_table, 1, strlen($t_table) - 2);
+				}
+
+				if(!in_array($t_table, $j_tables))
+				{
+					$j_tables[] =  $t_table;
+				}
+			}
+		}
+
+		// Do I have the current table inside the query join? Remove it (its fields are already ok)
+		$find = array_search($this->getTableName(), $j_tables);
+		if($find !== false)
+		{
+			unset($j_tables[$find]);
+		}
+
+		// Get table fields
+		$fields = array();
+
+		foreach ($j_tables as $table)
+		{
+			$t_fields = $this->getTableFields($table);
+
+			if ($t_fields)
+			{
+				$fields = array_merge($fields, $t_fields);
+			}
+		}
+
+		// Remove any fields that aren't in the joined select
+		$j_select = $query->select;
+
+		if ($j_select && $j_select->getElements())
+		{
+			$j_fields = $this->normalizeSelectFields($j_select->getElements());
+		}
+
+		// I can intesect the keys
+		$fields   = array_intersect_key($fields, $j_fields);
+
+		// Now I walk again the array to change the key of columns that have an alias
+		foreach ($j_fields as $column => $alias)
+		{
+			if ($column != $alias)
+			{
+				$fields[$alias] = $fields[$column];
+				unset($fields[$column]);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Normalizes the fields, returning an associative array with all the fields.
+	 * Ie array('foobar as foo, bar') becomes array('foobar' => 'foo', 'bar' => 'bar')
+	 *
+	 * @param   array $fields    Array with column fields
+	 *
+	 * @return  array  Normalized array
+	 */
+	protected function normalizeSelectFields($fields)
+	{
+		$db     = FOFPlatform::getInstance()->getDbo();
+		$return = array();
+
+		foreach ($fields as $field)
+		{
+			$t_fields = explode(',', $field);
+
+			foreach ($t_fields as $t_field)
+			{
+				// Is there any alias?
+				$parts  = preg_split('#\sas\s#i', $t_field);
+
+				// Do I have a table.column situation? Let's get the field name
+				$tableField  = explode('.', $parts[0]);
+
+				if(isset($tableField[1]))
+				{
+					$column = trim($tableField[1]);
+				}
+				else
+				{
+					$column = trim($tableField[0]);
+				}
+
+				// Is this field quoted? If so, remove the quotes
+				if($this->isQuoted($column))
+				{
+					$column = substr($column, 1, strlen($column) - 2);
+				}
+
+				if(isset($parts[1]))
+				{
+					$alias = trim($parts[1]);
+
+					// Is this field quoted? If so, remove the quotes
+					if($this->isQuoted($alias))
+					{
+						$alias = substr($alias, 1, strlen($alias) - 2);
+					}
+				}
+				else
+				{
+					$alias = $column;
+				}
+
+				$return[$column] = $alias;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Is the field quoted?
+	 *
+	 * @param   string  $column     Column field
+	 *
+	 * @return  bool    Is the field quoted?
+	 */
+	protected function isQuoted($column)
+	{
+		// Empty string, un-quoted by definition
+		if(!$column)
+		{
+			return false;
+		}
+
+		// I need some "magic". If the first char is not a letter, a number
+		// an underscore or # (needed for table), then most likely the field is quoted
+		preg_match_all('/^[a-z0-9_#]/i', $column, $matches);
+
+		if(!$matches[0])
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * The event which runs before binding data to the table
+	 *
+	 * NOTE TO 3RD PARTY DEVELOPERS:
+	 *
+	 * When you override the following methods in your child classes,
+	 * be sure to call parent::method *AFTER* your code, otherwise the
+	 * plugin events do NOT get triggered
+	 *
+	 * Example:
+	 * protected function onBeforeBind(){
+	 *       // Your code here
+	 *     return parent::onBeforeBind() && $your_result;
+	 * }
+	 *
+	 * Do not do it the other way around, e.g. return $your_result && parent::onBeforeBind()
+	 * Due to  PHP short-circuit boolean evaluation the parent::onBeforeBind()
+	 * will not be called if $your_result is false.
+	 *
+	 * @param   object|array  &$from  The data to bind
+	 *
+	 * @return  boolean  True on success
+	 */
+	protected function onBeforeBind(&$from)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeBind', array(&$this, &$from));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeBind' . ucfirst($name), array(&$this, &$from));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after loading a record from the database
+	 *
+	 * @param   boolean  &$result  Did the load succeeded?
+	 *
+	 * @return  void
+	 */
+	protected function onAfterLoad(&$result)
+	{
+		// Call the behaviors
+		$eventResult = $this->tableDispatcher->trigger('onAfterLoad', array(&$this, &$result));
+
+		if (in_array(false, $eventResult, true))
+		{
+			// Behavior failed, return false
+			$result = false;
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			FOFPlatform::getInstance()->runPlugins('onAfterLoad' . ucfirst($name), array(&$this, &$result));
+		}
+	}
+
+	/**
+	 * The event which runs before storing (saving) data to the database
+	 *
+	 * @param   boolean  $updateNulls  Should nulls be saved as nulls (true) or just skipped over (false)?
+	 *
+	 * @return  boolean  True to allow saving
+	 */
+	protected function onBeforeStore($updateNulls)
+	{
+		// Do we have a "Created" set of fields?
+		$created_on  = $this->getColumnAlias('created_on');
+		$created_by  = $this->getColumnAlias('created_by');
+		$modified_on = $this->getColumnAlias('modified_on');
+		$modified_by = $this->getColumnAlias('modified_by');
+		$locked_on   = $this->getColumnAlias('locked_on');
+		$locked_by   = $this->getColumnAlias('locked_by');
+		$title       = $this->getColumnAlias('title');
+		$slug        = $this->getColumnAlias('slug');
+
+		$hasCreatedOn = in_array($created_on, $this->getKnownFields());
+		$hasCreatedBy = in_array($created_by, $this->getKnownFields());
+
+		if ($hasCreatedOn && $hasCreatedBy)
+		{
+			$hasModifiedOn = in_array($modified_on, $this->getKnownFields());
+			$hasModifiedBy = in_array($modified_by, $this->getKnownFields());
+
+			$nullDate = $this->_db->getNullDate();
+
+			if (empty($this->$created_by) || ($this->$created_on == $nullDate) || empty($this->$created_on))
+			{
+				$uid = FOFPlatform::getInstance()->getUser()->id;
+
+				if ($uid)
+				{
+					$this->$created_by = FOFPlatform::getInstance()->getUser()->id;
+				}
+
+				$date = FOFPlatform::getInstance()->getDate('now', null, false);
+
+				$this->$created_on = method_exists($date, 'toSql') ? $date->toSql() : $date->toMySQL();
+			}
+			elseif ($hasModifiedOn && $hasModifiedBy)
+			{
+				$uid = FOFPlatform::getInstance()->getUser()->id;
+
+				if ($uid)
+				{
+					$this->$modified_by = FOFPlatform::getInstance()->getUser()->id;
+				}
+
+                $date = FOFPlatform::getInstance()->getDate('now', null, false);
+
+				$this->$modified_on = method_exists($date, 'toSql') ? $date->toSql() : $date->toMySQL();
+			}
+		}
+
+		// Do we have a set of title and slug fields?
+		$hasTitle = in_array($title, $this->getKnownFields());
+		$hasSlug  = in_array($slug, $this->getKnownFields());
+
+		if ($hasTitle && $hasSlug)
+		{
+			if (empty($this->$slug))
+			{
+				// Create a slug from the title
+				$this->$slug = FOFStringUtils::toSlug($this->$title);
+			}
+			else
+			{
+				// Filter the slug for invalid characters
+				$this->$slug = FOFStringUtils::toSlug($this->$slug);
+			}
+
+			// Make sure we don't have a duplicate slug on this table
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select($db->qn($slug))
+				->from($this->_tbl)
+				->where($db->qn($slug) . ' = ' . $db->q($this->$slug))
+				->where('NOT ' . $db->qn($this->_tbl_key) . ' = ' . $db->q($this->{$this->_tbl_key}));
+			$db->setQuery($query);
+			$existingItems = $db->loadAssocList();
+
+			$count   = 0;
+			$newSlug = $this->$slug;
+
+			while (!empty($existingItems))
+			{
+				$count++;
+				$newSlug = $this->$slug . '-' . $count;
+				$query   = $db->getQuery(true)
+					->select($db->qn($slug))
+					->from($this->_tbl)
+					->where($db->qn($slug) . ' = ' . $db->q($newSlug))
+					->where('NOT '. $db->qn($this->_tbl_key) . ' = ' . $db->q($this->{$this->_tbl_key}));
+				$db->setQuery($query);
+				$existingItems = $db->loadAssocList();
+			}
+
+			$this->$slug = $newSlug;
+		}
+
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeStore', array(&$this, $updateNulls));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		// Execute onBeforeStore<tablename> events in loaded plugins
+		if ($this->_trigger_events)
+		{
+			$name       = FOFInflector::pluralize($this->getKeyName());
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeStore' . ucfirst($name), array(&$this, $updateNulls));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after binding data to the class
+	 *
+	 * @param   object|array  &$src  The data to bind
+	 *
+	 * @return  boolean  True to allow binding without an error
+	 */
+	protected function onAfterBind(&$src)
+	{
+		// Call the behaviors
+		$options = array(
+			'component' 	=> $this->input->get('option'),
+			'view'			=> $this->input->get('view'),
+			'table_prefix'	=> $this->_tablePrefix
+		);
+
+		$result = $this->tableDispatcher->trigger('onAfterBind', array(&$this, &$src, $options));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterBind' . ucfirst($name), array(&$this, &$src));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after storing (saving) data to the database
+	 *
+	 * @return  boolean  True to allow saving without an error
+	 */
+	protected function onAfterStore()
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterStore', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterStore' . ucfirst($name), array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before moving a record
+	 *
+	 * @param   boolean  $updateNulls  Should nulls be saved as nulls (true) or just skipped over (false)?
+	 *
+	 * @return  boolean  True to allow moving
+	 */
+	protected function onBeforeMove($updateNulls)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeMove', array(&$this, $updateNulls));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeMove' . ucfirst($name), array(&$this, $updateNulls));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after moving a record
+	 *
+	 * @return  boolean  True to allow moving without an error
+	 */
+	protected function onAfterMove()
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterMove', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterMove' . ucfirst($name), array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before reordering a table
+	 *
+	 * @param   string  $where  The WHERE clause of the SQL query to run on reordering (record filter)
+	 *
+	 * @return  boolean  True to allow reordering
+	 */
+	protected function onBeforeReorder($where = '')
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeReorder', array(&$this, $where));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeReorder' . ucfirst($name), array(&$this, $where));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after reordering a table
+	 *
+	 * @return  boolean  True to allow the reordering to complete without an error
+	 */
+	protected function onAfterReorder()
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterReorder', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterReorder' . ucfirst($name), array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before deleting a record
+	 *
+	 * @param   integer  $oid  The PK value of the record to delete
+	 *
+	 * @return  boolean  True to allow the deletion
+	 */
+	protected function onBeforeDelete($oid)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeDelete', array(&$this, $oid));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeDelete' . ucfirst($name), array(&$this, $oid));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after deleting a record
+	 *
+	 * @param   integer  $oid  The PK value of the record which was deleted
+	 *
+	 * @return  boolean  True to allow the deletion without errors
+	 */
+	protected function onAfterDelete($oid)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterDelete', array(&$this, $oid));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterDelete' . ucfirst($name), array(&$this, $oid));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before hitting a record
+	 *
+	 * @param   integer  $oid  The PK value of the record to hit
+	 * @param   boolean  $log  Should we log the hit?
+	 *
+	 * @return  boolean  True to allow the hit
+	 */
+	protected function onBeforeHit($oid, $log)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeHit', array(&$this, $oid, $log));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeHit' . ucfirst($name), array(&$this, $oid, $log));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after hitting a record
+	 *
+	 * @param   integer  $oid  The PK value of the record which was hit
+	 *
+	 * @return  boolean  True to allow the hitting without errors
+	 */
+	protected function onAfterHit($oid)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterHit', array(&$this, $oid));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterHit' . ucfirst($name), array(&$this, $oid));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The even which runs before copying a record
+	 *
+	 * @param   integer  $oid  The PK value of the record being copied
+	 *
+	 * @return  boolean  True to allow the copy to take place
+	 */
+	protected function onBeforeCopy($oid)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeCopy', array(&$this, $oid));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeCopy' . ucfirst($name), array(&$this, $oid));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The even which runs after copying a record
+	 *
+	 * @param   integer  $oid  The PK value of the record which was copied (not the new one)
+	 *
+	 * @return  boolean  True to allow the copy without errors
+	 */
+	protected function onAfterCopy($oid)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterCopy', array(&$this, $oid));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterCopy' . ucfirst($name), array(&$this, $oid));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs before a record is (un)published
+	 *
+	 * @param   integer|array  &$cid     The PK IDs of the records being (un)published
+	 * @param   integer        $publish  1 to publish, 0 to unpublish
+	 *
+	 * @return  boolean  True to allow the (un)publish to proceed
+	 */
+	protected function onBeforePublish(&$cid, $publish)
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforePublish', array(&$this, &$cid, $publish));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforePublish' . ucfirst($name), array(&$this, &$cid, $publish));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The event which runs after the object is reset to its default values.
+	 *
+	 * @return  boolean  True to allow the reset to complete without errors
+	 */
+	protected function onAfterReset()
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onAfterReset', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onAfterReset' . ucfirst($name), array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * The even which runs before the object is reset to its default values.
+	 *
+	 * @return  boolean  True to allow the reset to complete
+	 */
+	protected function onBeforeReset()
+	{
+		// Call the behaviors
+		$result = $this->tableDispatcher->trigger('onBeforeReset', array(&$this));
+
+		if (in_array(false, $result, true))
+		{
+			// Behavior failed, return false
+			return false;
+		}
+
+		if ($this->_trigger_events)
+		{
+			$name = FOFInflector::pluralize($this->getKeyName());
+
+			$result     = FOFPlatform::getInstance()->runPlugins('onBeforeReset' . ucfirst($name), array(&$this));
+
+			if (in_array(false, $result, true))
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Replace the input object of this table with the provided FOFInput object
+	 *
+	 * @param   FOFInput  $input  The new input object
+	 *
+	 * @return  void
+	 */
+	public function setInput(FOFInput $input)
+	{
+		$this->input = $input;
+	}
+
+	/**
+	 * Get the columns from database table.
+	 *
+	 * @return  mixed  An array of the field names, or false if an error occurs.
+	 *
+	 * @deprecated  2.1
+	 */
+	public function getFields()
+	{
+		return $this->getTableFields();
+	}
+
+	/**
+	 * Add a filesystem path where FOFTable should search for table class files.
+	 * You may either pass a string or an array of paths.
+	 *
+	 * @param   mixed  $path  A filesystem path or array of filesystem paths to add.
+	 *
+	 * @return  array  An array of filesystem paths to find FOFTable classes in.
+	 */
+	public static function addIncludePath($path = null)
+	{
+		// If the internal paths have not been initialised, do so with the base table path.
+		if (empty(self::$_includePaths))
+		{
+			self::$_includePaths = array(__DIR__);
+		}
+
+		// Convert the passed path(s) to add to an array.
+		settype($path, 'array');
+
+		// If we have new paths to add, do so.
+		if (!empty($path) && !in_array($path, self::$_includePaths))
+		{
+			// Check and add each individual new path.
+			foreach ($path as $dir)
+			{
+				// Sanitize path.
+				$dir = trim($dir);
+
+				// Add to the front of the list so that custom paths are searched first.
+				array_unshift(self::$_includePaths, $dir);
+			}
+		}
+
+		return self::$_includePaths;
+	}
+
+	/**
+	 * Loads the asset table related to this table.
+	 * This will help tests, too, since we can mock this function.
+	 *
+	 * @return bool|JTableAsset     False on failure, otherwise JTableAsset
+	 */
+	protected function getAsset()
+	{
+		$name     = $this->_getAssetName();
+
+		// Do NOT touch JTable here -- we are loading the core asset table which is a JTable, not a FOFTable
+		$asset    = JTable::getInstance('Asset');
+
+		if (!$asset->loadByName($name))
+		{
+			return false;
+		}
+
+		return $asset;
+	}
+
+    /**
+     * Method to compute the default name of the asset.
+     * The default name is in the form table_name.id
+     * where id is the value of the primary key of the table.
+     *
+     * @throws  UnexpectedValueException
+     *
+     * @return  string
+     */
+	public function getAssetName()
+	{
+		$k = $this->_tbl_key;
+
+        // If there is no assetKey defined, stop here, or we'll get a wrong name
+        if(!$this->_assetKey || !$this->$k)
+        {
+            throw new UnexpectedValueException('Table must have an asset key defined and a value for the table id in order to track assets');
+        }
+
+		return $this->_assetKey . '.' . (int) $this->$k;
+	}
+
+	/**
+     * Method to compute the default name of the asset.
+     * The default name is in the form table_name.id
+     * where id is the value of the primary key of the table.
+     *
+     * @throws  UnexpectedValueException
+     *
+     * @return  string
+     */
+	public function getAssetKey()
+	{
+		return $this->_assetKey;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.  In
+	 * tracking the assets a title is kept for each asset so that there is some
+	 * context available in a unified access manager.  Usually this would just
+	 * return $this->title or $this->name or whatever is being used for the
+	 * primary name of the row. If this method is not overridden, the asset name is used.
+	 *
+	 * @return  string  The string to use as the title in the asset table.
+	 */
+	public function getAssetTitle()
+	{
+		return $this->getAssetName();
+	}
+
+	/**
+	 * Method to get the parent asset under which to register this one.
+	 * By default, all assets are registered to the ROOT node with ID,
+	 * which will default to 1 if none exists.
+	 * The extended class can define a table and id to lookup.  If the
+	 * asset does not exist it will be created.
+	 *
+	 * @param   FOFTable  $table  A FOFTable object for the asset parent.
+	 * @param   integer   $id     Id to look up
+	 *
+	 * @return  integer
+	 */
+	public function getAssetParentId($table = null, $id = null)
+	{
+		// For simple cases, parent to the asset root.
+		$assets = JTable::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
+		$rootId = $assets->getRootId();
+
+		if (!empty($rootId))
+		{
+			return $rootId;
+		}
+
+		return 1;
+	}
+
+	/**
+	 * This method sets the asset key for the items of this table. Obviously, it
+	 * is only meant to be used when you have a table with an asset field.
+	 *
+	 * @param   string  $assetKey  The name of the asset key to use
+	 *
+	 * @return  void
+	 */
+	public function setAssetKey($assetKey)
+	{
+		$this->_assetKey = $assetKey;
+	}
+
+	/**
+	 * Method to get the database table name for the class.
+	 *
+	 * @return  string  The name of the database table being modeled.
+	 */
+	public function getTableName()
+	{
+		return $this->_tbl;
+	}
+
+	/**
+	 * Method to get the primary key field name for the table.
+	 *
+	 * @return  string  The name of the primary key for the table.
+	 */
+	public function getKeyName()
+	{
+		return $this->_tbl_key;
+	}
+
+	/**
+	 * Returns the identity value of this record
+	 *
+	 * @return mixed
+	 */
+	public function getId()
+	{
+		$key = $this->getKeyName();
+
+		return $this->$key;
+	}
+
+	/**
+	 * Method to get the FOFDatabaseDriver object.
+	 *
+	 * @return  FOFDatabaseDriver  The internal database driver object.
+	 */
+	public function getDbo()
+	{
+		return $this->_db;
+	}
+
+	/**
+	 * Method to set the FOFDatabaseDriver object.
+	 *
+	 * @param   FOFDatabaseDriver  $db  A FOFDatabaseDriver object to be used by the table object.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function setDBO($db)
+	{
+		$this->_db = $db;
+
+		return true;
+	}
+
+	/**
+	 * Method to set rules for the record.
+	 *
+	 * @param   mixed  $input  A JAccessRules object, JSON string, or array.
+	 *
+	 * @return  void
+	 */
+	public function setRules($input)
+	{
+		if ($input instanceof JAccessRules)
+		{
+			$this->_rules = $input;
+		}
+		else
+		{
+			$this->_rules = new JAccessRules($input);
+		}
+	}
+
+	/**
+	 * Method to get the rules for the record.
+	 *
+	 * @return  JAccessRules object
+	 */
+	public function getRules()
+	{
+		return $this->_rules;
+	}
+
+	/**
+	 * Method to check if the record is treated as an ACL asset
+	 *
+	 * @return  boolean [description]
+	 */
+	public function isAssetsTracked()
+	{
+		return $this->_trackAssets;
+	}
+
+    /**
+     * Method to manually set this record as ACL asset or not.
+     * We have to do this since the automatic check is made in the constructor, but here we can't set any alias.
+     * So, even if you have an alias for `asset_id`, it wouldn't be reconized and assets won't be tracked.
+     *
+     * @param $state
+     */
+    public function setAssetsTracked($state)
+    {
+        $state = (bool) $state;
+
+        if($state)
+        {
+            JLoader::import('joomla.access.rules');
+        }
+
+        $this->_trackAssets = $state;
+    }
+
+	/**
+	 * Method to provide a shortcut to binding, checking and storing a FOFTable
+	 * instance to the database table.  The method will check a row in once the
+	 * data has been stored and if an ordering filter is present will attempt to
+	 * reorder the table rows based on the filter.  The ordering filter is an instance
+	 * property name.  The rows that will be reordered are those whose value matches
+	 * the FOFTable instance for the property specified.
+	 *
+	 * @param   mixed   $src             An associative array or object to bind to the FOFTable instance.
+	 * @param   string  $orderingFilter  Filter for the order updating
+	 * @param   mixed   $ignore          An optional array or space separated list of properties
+	 *                                   to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	public function save($src, $orderingFilter = '', $ignore = '')
+	{
+		// Attempt to bind the source to the instance.
+		if (!$this->bind($src, $ignore))
+		{
+			return false;
+		}
+
+		// Run any sanity checks on the instance and verify that it is ready for storage.
+		if (!$this->check())
+		{
+			return false;
+		}
+
+		// Attempt to store the properties to the database table.
+		if (!$this->store())
+		{
+			return false;
+		}
+
+		// Attempt to check the row in, just in case it was checked out.
+		if (!$this->checkin())
+		{
+			return false;
+		}
+
+		// If an ordering filter is set, attempt reorder the rows in the table based on the filter and value.
+		if ($orderingFilter)
+		{
+			$filterValue = $this->$orderingFilter;
+			$this->reorder($orderingFilter ? $this->_db->qn($orderingFilter) . ' = ' . $this->_db->q($filterValue) : '');
+		}
+
+		// Set the error to empty and return true.
+		$this->setError('');
+
+		return true;
+	}
+
+	/**
+	 * Method to get the next ordering value for a group of rows defined by an SQL WHERE clause.
+	 * This is useful for placing a new item last in a group of items in the table.
+	 *
+	 * @param   string  $where  WHERE clause to use for selecting the MAX(ordering) for the table.
+	 *
+	 * @return  mixed  Boolean false an failure or the next ordering value as an integer.
+	 */
+	public function getNextOrder($where = '')
+	{
+		// If there is no ordering field set an error and return false.
+		$ordering = $this->getColumnAlias('ordering');
+		if (!in_array($ordering, $this->getKnownFields()))
+		{
+			throw new UnexpectedValueException(sprintf('%s does not support ordering.', get_class($this)));
+		}
+
+		// Get the largest ordering value for a given where clause.
+		$query = $this->_db->getQuery(true);
+		$query->select('MAX('.$this->_db->qn($ordering).')');
+		$query->from($this->_tbl);
+
+		if ($where)
+		{
+			$query->where($where);
+		}
+
+		$this->_db->setQuery($query);
+		$max = (int) $this->_db->loadResult();
+
+		// Return the largest ordering value + 1.
+		return ($max + 1);
+	}
+
+	/**
+	 * Method to lock the database table for writing.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @throws  RuntimeException
+	 */
+	protected function _lock()
+	{
+		$this->_db->lockTable($this->_tbl);
+		$this->_locked = true;
+
+		return true;
+	}
+
+	/**
+	 * Method to unlock the database table for writing.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	protected function _unlock()
+	{
+		$this->_db->unlockTables();
+		$this->_locked = false;
+
+		return true;
+	}
+
+	public function setConfig(array $config)
+	{
+		$this->config = $config;
+	}
+
+	/**
+	 * Get the content type for ucm
+	 *
+	 * @return string The content type alias
+	 */
+	public function getContentType()
+	{
+		if ($this->contentType)
+		{
+			return $this->contentType;
+		}
+
+		/**
+		 * When tags was first introduced contentType variable didn't exist - so we guess one
+		 * This will fail if content history behvaiour is enabled. This code is deprecated
+		 * and will be removed in FOF 3.0 in favour of the content type class variable
+		 */
+		$component = $this->input->get('option');
+
+		$view = FOFInflector::singularize($this->input->get('view'));
+		$alias = $component . '.' . $view;
+
+		return $alias;
+	}
+
+	/**
+	 * Returns the table relations object of the current table, lazy-loading it if necessary
+	 *
+	 * @return  FOFTableRelations
+	 */
+	public function getRelations()
+	{
+		if (is_null($this->_relations))
+		{
+			$this->_relations = new FOFTableRelations($this);
+		}
+
+		return $this->_relations;
+	}
+
+	/**
+	 * Gets a reference to the configuration parameters provider for this table
+	 *
+	 * @return  FOFConfigProvider
+	 */
+	public function getConfigProvider()
+	{
+		return $this->configProvider;
+	}
+
+	/**
+	 * Returns the configuration parameters provider's key for this table
+	 *
+	 * @return  string
+	 */
+	public function getConfigProviderKey()
+	{
+		return $this->_configProviderKey;
+	}
+
+	/**
+	 * Check if a UCM content type exists for this resource, and
+	 * create it if it does not
+	 *
+	 * @param  string  $alias  The content type alias (optional)
+	 *
+	 * @return  null
+	 */
+	public function checkContentType($alias = null)
+	{
+		$contentType = new JTableContenttype($this->getDbo());
+
+		if (!$alias)
+		{
+			$alias = $this->getContentType();
+		}
+
+		$aliasParts = explode('.', $alias);
+
+		// Fetch the extension name
+		$component = $aliasParts[0];
+		$component = JComponentHelper::getComponent($component);
+
+		// Fetch the name using the menu item
+		$query = $this->getDbo()->getQuery(true);
+		$query->select('title')->from('#__menu')->where('component_id = ' . (int) $component->id);
+		$this->getDbo()->setQuery($query);
+		$component_name = JText::_($this->getDbo()->loadResult());
+
+		$name = $component_name . ' ' . ucfirst($aliasParts[1]);
+
+		// Create a new content type for our resource
+		if (!$contentType->load(array('type_alias' => $alias)))
+		{
+			$contentType->type_title = $name;
+			$contentType->type_alias = $alias;
+			$contentType->table = json_encode(
+				array(
+					'special' => array(
+						'dbtable' => $this->getTableName(),
+						'key'     => $this->getKeyName(),
+						'type'    => $name,
+						'prefix'  => $this->_tablePrefix,
+						'class'   => 'FOFTable',
+						'config'  => 'array()'
+					),
+					'common' => array(
+						'dbtable' => '#__ucm_content',
+						'key' => 'ucm_id',
+						'type' => 'CoreContent',
+						'prefix' => 'JTable',
+						'config' => 'array()'
+					)
+				)
+			);
+
+			$contentType->field_mappings = json_encode(
+				array(
+					'common' => array(
+						0 => array(
+							"core_content_item_id" => $this->getKeyName(),
+							"core_title"           => $this->getUcmCoreAlias('title'),
+							"core_state"           => $this->getUcmCoreAlias('enabled'),
+							"core_alias"           => $this->getUcmCoreAlias('alias'),
+							"core_created_time"    => $this->getUcmCoreAlias('created_on'),
+							"core_modified_time"   => $this->getUcmCoreAlias('created_by'),
+							"core_body"            => $this->getUcmCoreAlias('body'),
+							"core_hits"            => $this->getUcmCoreAlias('hits'),
+							"core_publish_up"      => $this->getUcmCoreAlias('publish_up'),
+							"core_publish_down"    => $this->getUcmCoreAlias('publish_down'),
+							"core_access"          => $this->getUcmCoreAlias('access'),
+							"core_params"          => $this->getUcmCoreAlias('params'),
+							"core_featured"        => $this->getUcmCoreAlias('featured'),
+							"core_metadata"        => $this->getUcmCoreAlias('metadata'),
+							"core_language"        => $this->getUcmCoreAlias('language'),
+							"core_images"          => $this->getUcmCoreAlias('images'),
+							"core_urls"            => $this->getUcmCoreAlias('urls'),
+							"core_version"         => $this->getUcmCoreAlias('version'),
+							"core_ordering"        => $this->getUcmCoreAlias('ordering'),
+							"core_metakey"         => $this->getUcmCoreAlias('metakey'),
+							"core_metadesc"        => $this->getUcmCoreAlias('metadesc'),
+							"core_catid"           => $this->getUcmCoreAlias('cat_id'),
+							"core_xreference"      => $this->getUcmCoreAlias('xreference'),
+							"asset_id"             => $this->getUcmCoreAlias('asset_id')
+						)
+					),
+					'special' => array(
+						0 => array(
+						)
+					)
+				)
+			);
+
+			$ignoreFields = array(
+				$this->getUcmCoreAlias('modified_on', null),
+				$this->getUcmCoreAlias('modified_by', null),
+				$this->getUcmCoreAlias('locked_by', null),
+				$this->getUcmCoreAlias('locked_on', null),
+				$this->getUcmCoreAlias('hits', null),
+				$this->getUcmCoreAlias('version', null)
+			);
+
+			$contentType->content_history_options = json_encode(
+				array(
+					"ignoreChanges" => array_filter($ignoreFields, 'strlen')
+				)
+			);
+
+			$contentType->router = '';
+
+			$contentType->store();
+		}
+	}
+
+	/**
+	 * Utility methods that fetches the column name for the field.
+	 * If it does not exists, returns a "null" string
+	 *
+	 * @param  string  $alias  The alias for the column
+	 * @param  string  $null   What to return if no column exists
+	 *
+	 * @return string The column name
+	 */
+	protected function getUcmCoreAlias($alias, $null = "null")
+	{
+		$alias = $this->getColumnAlias($alias);
+
+		if (in_array($alias, $this->getKnownFields()))
+		{
+			return $alias;
+		}
+
+		return $null;
+	}
+}
diff --git a/core/libraries/fof/template/utils.php b/core/libraries/fof/template/utils.php
new file mode 100644
index 00000000..797a53b6
--- /dev/null
+++ b/core/libraries/fof/template/utils.php
@@ -0,0 +1,518 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  template
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A utility class to load view templates, media files and modules.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFTemplateUtils
+{
+	/**
+	 * Add a CSS file to the page generated by the CMS
+	 *
+	 * @param   string  $path  A fancy path definition understood by parsePath
+	 *
+	 * @see FOFTemplateUtils::parsePath
+	 *
+	 * @return  void
+	 */
+	public static function addCSS($path)
+	{
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			if (method_exists($document, 'addStyleSheet'))
+			{
+				$url = self::parsePath($path);
+				$document->addStyleSheet($url);
+			}
+		}
+	}
+
+	/**
+	 * Add a JS script file to the page generated by the CMS.
+	 *
+	 * There are three combinations of defer and async (see http://www.w3schools.com/tags/att_script_defer.asp):
+	 * * $defer false, $async true: The script is executed asynchronously with the rest of the page
+	 *   (the script will be executed while the page continues the parsing)
+	 * * $defer true, $async false: The script is executed when the page has finished parsing.
+	 * * $defer false, $async false. (default) The script is loaded and executed immediately. When it finishes
+	 *   loading the browser continues parsing the rest of the page.
+	 *
+	 * When you are using $defer = true there is no guarantee about the load order of the scripts. Whichever
+	 * script loads first will be executed first. The order they appear on the page is completely irrelevant.
+	 *
+	 * @param   string   $path   A fancy path definition understood by parsePath
+	 * @param   boolean  $defer  Adds the defer attribute, meaning that your script
+	 *                           will only load after the page has finished parsing.
+	 * @param   boolean  $async  Adds the async attribute, meaning that your script
+	 *                           will be executed while the resto of the page
+	 *                           continues parsing.
+	 *
+	 * @see FOFTemplateUtils::parsePath
+	 *
+	 * @return  void
+	 */
+	public static function addJS($path, $defer = false, $async = false)
+	{
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			if (method_exists($document, 'addScript'))
+			{
+				$url = self::parsePath($path);
+				$document->addScript($url, "text/javascript", $defer, $async);
+			}
+		}
+	}
+
+	/**
+	 * Compile a LESS file into CSS and add it to the page generated by the CMS.
+	 * This method has integrated cache support. The compiled LESS files will be
+	 * written to the media/lib_fof/compiled directory of your site. If the file
+	 * cannot be written we will use the $altPath, if specified
+	 *
+	 * @param   string   $path        A fancy path definition understood by parsePath pointing to the source LESS file
+	 * @param   string   $altPath     A fancy path definition understood by parsePath pointing to a precompiled CSS file,
+	 *                                used when we can't write the generated file to the output directory
+	 * @param   boolean  $returnPath  Return the URL of the generated CSS file but do not include it. If it can't be
+	 *                                generated, false is returned and the alt files are not included
+	 *
+	 * @see FOFTemplateUtils::parsePath
+	 *
+	 * @since 2.0
+	 *
+	 * @return  mixed  True = successfully included generated CSS, False = the alternate CSS file was used, null = the source file does not exist
+	 */
+	public static function addLESS($path, $altPath = null, $returnPath = false)
+	{
+		// Does the cache directory exists and is writeable
+		static $sanityCheck = null;
+
+		// Get the local LESS file
+		$localFile = self::parsePath($path, true);
+
+		$filesystem   = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+        $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+
+		if (is_null($sanityCheck))
+		{
+			// Make sure the cache directory exists
+			if (!is_dir($platformDirs['public'] . '/media/lib_fof/compiled/'))
+			{
+				$sanityCheck = $filesystem->folderCreate($platformDirs['public'] . '/media/lib_fof/compiled/');
+			}
+			else
+			{
+				$sanityCheck = true;
+			}
+		}
+
+		// No point continuing if the source file is not there or we can't write to the cache
+
+		if (!$sanityCheck || !is_file($localFile))
+		{
+			if (!$returnPath)
+			{
+				if (is_string($altPath))
+				{
+					self::addCSS($altPath);
+				}
+				elseif (is_array($altPath))
+				{
+					foreach ($altPath as $anAltPath)
+					{
+						self::addCSS($anAltPath);
+					}
+				}
+			}
+
+			return false;
+		}
+
+		// Get the source file's unique ID
+		$id = md5(filemtime($localFile) . filectime($localFile) . $localFile);
+
+		// Get the cached file path
+		$cachedPath = $platformDirs['public'] . '/media/lib_fof/compiled/' . $id . '.css';
+
+		// Get the LESS compiler
+		$lessCompiler = new FOFLess;
+		$lessCompiler->formatterName = 'compressed';
+
+		// Should I add an alternative import path?
+		$altFiles = self::getAltPaths($path);
+
+		if (isset($altFiles['alternate']))
+		{
+			$currentLocation = realpath(dirname($localFile));
+			$normalLocation = realpath(dirname($altFiles['normal']));
+			$alternateLocation = realpath(dirname($altFiles['alternate']));
+
+			if ($currentLocation == $normalLocation)
+			{
+				$lessCompiler->importDir = array($alternateLocation, $currentLocation);
+			}
+			else
+			{
+				$lessCompiler->importDir = array($currentLocation, $normalLocation);
+			}
+		}
+
+		// Compile the LESS file
+		$lessCompiler->checkedCompile($localFile, $cachedPath);
+
+		// Add the compiled CSS to the page
+		$base_url = rtrim(FOFPlatform::getInstance()->URIbase(), '/');
+
+		if (substr($base_url, -14) == '/administrator')
+		{
+			$base_url = substr($base_url, 0, -14);
+		}
+
+		$url = $base_url . '/media/lib_fof/compiled/' . $id . '.css';
+
+		if ($returnPath)
+		{
+			return $url;
+		}
+		else
+		{
+			$document = FOFPlatform::getInstance()->getDocument();
+
+			if ($document instanceof JDocument)
+			{
+				if (method_exists($document, 'addStyleSheet'))
+				{
+					$document->addStyleSheet($url);
+				}
+			}
+			return true;
+		}
+	}
+
+	/**
+	 * Creates a SEF compatible sort header. Standard Joomla function will add a href="#" tag, so with SEF
+	 * enabled, the browser will follow the fake link instead of processing the onSubmit event; so we
+	 * need a fix.
+	 *
+	 * @param   string          $text   Header text
+	 * @param   string          $field  Field used for sorting
+	 * @param   FOFUtilsObject  $list   Object holding the direction and the ordering field
+	 *
+	 * @return  string  HTML code for sorting
+	 */
+	public static function sefSort($text, $field, $list)
+	{
+		$sort = JHTML::_('grid.sort', JText::_(strtoupper($text)) . '&nbsp;', $field, $list->order_Dir, $list->order);
+
+		return str_replace('href="#"', 'href="javascript:void(0);"', $sort);
+	}
+
+	/**
+	 * Parse a fancy path definition into a path relative to the site's root,
+	 * respecting template overrides, suitable for inclusion of media files.
+	 * For example, media://com_foobar/css/test.css is parsed into
+	 * media/com_foobar/css/test.css if no override is found, or
+	 * templates/mytemplate/media/com_foobar/css/test.css if the current
+	 * template is called mytemplate and there's a media override for it.
+	 *
+	 * The valid protocols are:
+	 * media://		The media directory or a media override
+	 * admin://		Path relative to administrator directory (no overrides)
+	 * site://		Path relative to site's root (no overrides)
+	 *
+	 * @param   string   $path       Fancy path
+	 * @param   boolean  $localFile  When true, it returns the local path, not the URL
+	 *
+	 * @return  string  Parsed path
+	 */
+	public static function parsePath($path, $localFile = false)
+	{
+        $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+
+		if ($localFile)
+		{
+			$url = rtrim($platformDirs['root'], DIRECTORY_SEPARATOR) . '/';
+		}
+		else
+		{
+			$url = FOFPlatform::getInstance()->URIroot();
+		}
+
+		$altPaths = self::getAltPaths($path);
+		$filePath = $altPaths['normal'];
+
+		// If JDEBUG is enabled, prefer that path, else prefer an alternate path if present
+		if (defined('JDEBUG') && JDEBUG && isset($altPaths['debug']))
+		{
+			if (file_exists($platformDirs['public'] . '/' . $altPaths['debug']))
+			{
+				$filePath = $altPaths['debug'];
+			}
+		}
+		elseif (isset($altPaths['alternate']))
+		{
+			if (file_exists($platformDirs['public'] . '/' . $altPaths['alternate']))
+			{
+				$filePath = $altPaths['alternate'];
+			}
+		}
+
+		$url .= $filePath;
+
+		return $url;
+	}
+
+	/**
+	 * Parse a fancy path definition into a path relative to the site's root.
+	 * It returns both the normal and alternative (template media override) path.
+	 * For example, media://com_foobar/css/test.css is parsed into
+	 * array(
+	 *   'normal' => 'media/com_foobar/css/test.css',
+	 *   'alternate' => 'templates/mytemplate/media/com_foobar/css//test.css'
+	 * );
+	 *
+	 * The valid protocols are:
+	 * media://		The media directory or a media override
+	 * admin://		Path relative to administrator directory (no alternate)
+	 * site://		Path relative to site's root (no alternate)
+	 *
+	 * @param   string  $path  Fancy path
+	 *
+	 * @return  array  Array of normal and alternate parsed path
+	 */
+	public static function getAltPaths($path)
+	{
+		$protoAndPath = explode('://', $path, 2);
+
+		if (count($protoAndPath) < 2)
+		{
+			$protocol = 'media';
+		}
+		else
+		{
+			$protocol = $protoAndPath[0];
+			$path = $protoAndPath[1];
+		}
+
+		$path = ltrim($path, '/' . DIRECTORY_SEPARATOR);
+
+		switch ($protocol)
+		{
+			case 'media':
+				// Do we have a media override in the template?
+				$pathAndParams = explode('?', $path, 2);
+
+				$ret = array(
+					'normal'	 => 'media/' . $pathAndParams[0],
+					'alternate'	 => FOFPlatform::getInstance()->getTemplateOverridePath('media:/' . $pathAndParams[0], false),
+				);
+				break;
+
+			case 'admin':
+				$ret = array(
+					'normal' => 'administrator/' . $path
+				);
+				break;
+
+			default:
+			case 'site':
+				$ret = array(
+					'normal' => $path
+				);
+				break;
+		}
+
+		// For CSS and JS files, add a debug path if the supplied file is compressed
+		$filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+		$ext        = $filesystem->getExt($ret['normal']);
+
+		if (in_array($ext, array('css', 'js')))
+		{
+			$file = basename($filesystem->stripExt($ret['normal']));
+
+			/*
+			 * Detect if we received a file in the format name.min.ext
+			 * If so, strip the .min part out, otherwise append -uncompressed
+			 */
+
+			if (strlen($file) > 4 && strrpos($file, '.min', '-4'))
+			{
+				$position = strrpos($file, '.min', '-4');
+				$filename = str_replace('.min', '.', $file, $position) . $ext;
+			}
+			else
+			{
+				$filename = $file . '-uncompressed.' . $ext;
+			}
+
+			// Clone the $ret array so we can manipulate the 'normal' path a bit
+			$t1 = (object) $ret;
+			$temp = clone $t1;
+			unset($t1);
+			$temp = (array)$temp;
+			$normalPath = explode('/', $temp['normal']);
+			array_pop($normalPath);
+			$normalPath[] = $filename;
+			$ret['debug'] = implode('/', $normalPath);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Returns the contents of a module position
+	 *
+	 * @param   string  $position  The position name, e.g. "position-1"
+	 * @param   int     $style     Rendering style; please refer to Joomla!'s code for more information
+	 *
+	 * @return  string  The contents of the module position
+	 */
+	public static function loadPosition($position, $style = -2)
+	{
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if (!($document instanceof JDocument))
+		{
+			return '';
+		}
+
+		if (!method_exists($document, 'loadRenderer'))
+		{
+			return '';
+		}
+
+		try
+		{
+			$renderer = $document->loadRenderer('module');
+		}
+		catch (Exception $exc)
+		{
+			return '';
+		}
+
+		$params = array('style' => $style);
+
+		$contents = '';
+
+		foreach (JModuleHelper::getModules($position) as $mod)
+		{
+			$contents .= $renderer->render($mod, $params);
+		}
+
+		return $contents;
+	}
+
+	/**
+	 * Merges the current url with new or changed parameters.
+	 *
+	 * This method merges the route string with the url parameters defined
+	 * in current url. The parameters defined in current url, but not given
+	 * in route string, will automatically reused in the resulting url.
+	 * But only these following parameters will be reused:
+	 *
+	 * option, view, layout, format
+	 *
+	 * Example:
+	 *
+	 * Assuming that current url is:
+	 * http://fobar.com/index.php?option=com_foo&view=cpanel
+	 *
+	 * <code>
+	 * <?php echo FOFTemplateutils::route('view=categories&layout=tree'); ?>
+	 * </code>
+	 *
+	 * Result:
+	 * http://fobar.com/index.php?option=com_foo&view=categories&layout=tree
+	 *
+	 * @param   string  $route  The parameters string
+	 *
+	 * @return  string  The human readable, complete url
+	 */
+	public static function route($route = '')
+	{
+		$route = trim($route);
+
+		// Special cases
+
+		if ($route == 'index.php' || $route == 'index.php?')
+		{
+			$result = $route;
+		}
+		elseif (substr($route, 0, 1) == '&')
+		{
+			$url = JURI::getInstance();
+			$vars = array();
+			parse_str($route, $vars);
+
+			$url->setQuery(array_merge($url->getQuery(true), $vars));
+
+			$result = 'index.php?' . $url->getQuery();
+		}
+		else
+		{
+			$url = JURI::getInstance();
+			$props = $url->getQuery(true);
+
+			// Strip 'index.php?'
+			if (substr($route, 0, 10) == 'index.php?')
+			{
+				$route = substr($route, 10);
+			}
+
+			// Parse route
+			$parts = array();
+			parse_str($route, $parts);
+			$result = array();
+
+			// Check to see if there is component information in the route if not add it
+
+			if (!isset($parts['option']) && isset($props['option']))
+			{
+				$result[] = 'option=' . $props['option'];
+			}
+
+			// Add the layout information to the route only if it's not 'default'
+
+			if (!isset($parts['view']) && isset($props['view']))
+			{
+				$result[] = 'view=' . $props['view'];
+
+				if (!isset($parts['layout']) && isset($props['layout']))
+				{
+					$result[] = 'layout=' . $props['layout'];
+				}
+			}
+
+			// Add the format information to the URL only if it's not 'html'
+
+			if (!isset($parts['format']) && isset($props['format']) && $props['format'] != 'html')
+			{
+				$result[] = 'format=' . $props['format'];
+			}
+
+			// Reconstruct the route
+
+			if (!empty($route))
+			{
+				$result[] = $route;
+			}
+
+			$result = 'index.php?' . implode('&', $result);
+		}
+
+		return JRoute::_($result);
+	}
+}
diff --git a/core/libraries/fof/toolbar/toolbar.php b/core/libraries/fof/toolbar/toolbar.php
new file mode 100644
index 00000000..345aaf96
--- /dev/null
+++ b/core/libraries/fof/toolbar/toolbar.php
@@ -0,0 +1,1090 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  toolbar
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * The Toolbar class renders the back-end component title area and the back-
+ * and front-end toolbars.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFToolbar
+{
+	/** @var array Configuration parameters */
+	protected $config = array();
+
+	/** @var array Input (e.g. request) variables */
+	protected $input = array();
+
+	/** @var array Permissions map, see the __construct method for more information */
+	public $perms = array();
+
+	/** @var array The links to be rendered in the toolbar */
+	protected $linkbar = array();
+
+	/** @var bool Should I render the submenu in the front-end? */
+	protected $renderFrontendSubmenu = false;
+
+	/** @var bool Should I render buttons in the front-end? */
+	protected $renderFrontendButtons = false;
+
+	/**
+	 * Gets an instance of a component's toolbar
+	 *
+	 * @param   string  $option  The name of the component
+	 * @param   array   $config  The configuration array for the component
+	 *
+	 * @return  FOFToolbar  The toolbar instance for the component
+	 */
+	public static function &getAnInstance($option = null, $config = array())
+	{
+		static $instances = array();
+
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$hash = $option;
+
+		if (!array_key_exists($hash, $instances))
+		{
+			if (array_key_exists('input', $config))
+			{
+				if ($config['input'] instanceof FOFInput)
+				{
+					$input = $config['input'];
+				}
+				else
+				{
+					$input = new FOFInput($config['input']);
+				}
+			}
+			else
+			{
+				$input = new FOFInput;
+			}
+
+			$config['option'] = !is_null($option) ? $option : $input->getCmd('option', 'com_foobar');
+			$input->set('option', $config['option']);
+			$config['input'] = $input;
+
+			$className = ucfirst(str_replace('com_', '', $config['option'])) . 'Toolbar';
+
+			if (!class_exists($className))
+			{
+				$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($config['option']);
+
+				$searchPaths = array(
+					$componentPaths['main'],
+					$componentPaths['main'] . '/toolbars',
+					$componentPaths['alt'],
+					$componentPaths['alt'] . '/toolbars'
+				);
+
+				if (array_key_exists('searchpath', $config))
+				{
+					array_unshift($searchPaths, $config['searchpath']);
+				}
+
+                $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+				$path = $filesystem->pathFind(
+						$searchPaths, 'toolbar.php'
+				);
+
+				if ($path)
+				{
+					require_once $path;
+				}
+			}
+
+			if (!class_exists($className))
+			{
+				$className = 'FOFToolbar';
+			}
+
+			$instance = new $className($config);
+
+			$instances[$hash] = $instance;
+		}
+
+		return $instances[$hash];
+	}
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   array  $config  The configuration array of the component
+	 */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		// Cache the config
+		$this->config = $config;
+
+		// Get the input for this MVC triad
+		if (array_key_exists('input', $config))
+		{
+			$this->input = $config['input'];
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		// Get the default values for the component and view names
+		$this->component = $this->input->getCmd('option', 'com_foobar');
+
+		// Overrides from the config
+
+		if (array_key_exists('option', $config))
+		{
+			$this->component = $config['option'];
+		}
+
+		$this->input->set('option', $this->component);
+
+		// Get default permissions (can be overriden by the view)
+		$platform = FOFPlatform::getInstance();
+		$perms = (object) array(
+				'manage'	 => $platform->authorise('core.manage', $this->input->getCmd('option', 'com_foobar')),
+				'create'	 => $platform->authorise('core.create', $this->input->getCmd('option', 'com_foobar')),
+				'edit'		 => $platform->authorise('core.edit', $this->input->getCmd('option', 'com_foobar')),
+				'editstate'	 => $platform->authorise('core.edit.state', $this->input->getCmd('option', 'com_foobar')),
+				'delete'	 => $platform->authorise('core.delete', $this->input->getCmd('option', 'com_foobar')),
+		);
+
+		// Save front-end toolbar and submenu rendering flags if present in the config
+		if (array_key_exists('renderFrontendButtons', $config))
+		{
+			$this->renderFrontendButtons = $config['renderFrontendButtons'];
+		}
+
+		if (array_key_exists('renderFrontendSubmenu', $config))
+		{
+			$this->renderFrontendSubmenu = $config['renderFrontendSubmenu'];
+		}
+
+		// If not in the administrative area, load the JToolbarHelper
+		if (!FOFPlatform::getInstance()->isBackend())
+		{
+            // Needed for tests, so we can inject our "special" helper class
+            if(!class_exists('JToolbarHelper'))
+            {
+                $platformDirs = FOFPlatform::getInstance()->getPlatformBaseDirs();
+                require_once $platformDirs['root'] . '/administrator/includes/toolbar.php';
+            }
+
+			// Things to do if we have to render a front-end toolbar
+			if ($this->renderFrontendButtons)
+			{
+				// Load back-end toolbar language files in front-end
+				FOFPlatform::getInstance()->loadTranslations('');
+
+                // Needed for tests (we can fake we're not in the backend, but we are still in CLI!)
+                if(!FOFPlatform::getInstance()->isCli())
+                {
+                    // Load the core Javascript
+	                if (version_compare(JVERSION, '3.0', 'ge'))
+	                {
+		                JHtml::_('jquery.framework');
+
+						if (version_compare(JVERSION, '3.3.0', 'ge'))
+						{
+							JHtml::_('behavior.core');
+						}
+						else
+						{
+							JHtml::_('behavior.framework', true);
+						}
+	                }
+	                else
+	                {
+		                JHtml::_('behavior.framework');
+	                }
+                }
+			}
+		}
+
+		// Store permissions in the local toolbar object
+		$this->perms = $perms;
+	}
+
+	/**
+	 * Renders the toolbar for the current view and task
+	 *
+	 * @param   string    $view   The view of the component
+	 * @param   string    $task   The exact task of the view
+	 * @param   FOFInput  $input  An optional input object used to determine the defaults
+	 *
+	 * @return  void
+	 */
+	public function renderToolbar($view = null, $task = null, $input = null)
+	{
+		if (!empty($input))
+		{
+			$saveInput = $this->input;
+			$this->input = $input;
+		}
+
+		// If tmpl=component the default behaviour is to not render the toolbar
+		if ($this->input->getCmd('tmpl', '') == 'component')
+		{
+			$render_toolbar = false;
+		}
+		else
+		{
+			$render_toolbar = true;
+		}
+
+		// If there is a render_toolbar=0 in the URL, do not render a toolbar
+
+		$render_toolbar = $this->input->getBool('render_toolbar', $render_toolbar);
+
+		if (!$render_toolbar)
+		{
+			return;
+		}
+
+		// Get the view and task
+
+		if (empty($view))
+		{
+			$view = $this->input->getCmd('view', 'cpanel');
+		}
+
+		if (empty($task))
+		{
+			$task = $this->input->getCmd('task', 'default');
+		}
+
+		$this->view = $view;
+		$this->task = $task;
+		$view = FOFInflector::pluralize($view);
+		$component = $this->input->get('option', 'com_foobar', 'cmd');
+
+		$configProvider = new FOFConfigProvider;
+		$toolbar = $configProvider->get(
+			$component . '.views.' . $view . '.toolbar.' . $task
+		);
+
+		// If we have a toolbar config specified
+		if (!empty($toolbar))
+		{
+			return $this->renderFromConfig($toolbar);
+		}
+
+		// Check for an onViewTask method
+		$methodName = 'on' . ucfirst($view) . ucfirst($task);
+
+		if (method_exists($this, $methodName))
+		{
+			return $this->$methodName();
+		}
+
+		// Check for an onView method
+		$methodName = 'on' . ucfirst($view);
+
+		if (method_exists($this, $methodName))
+		{
+			return $this->$methodName();
+		}
+
+		// Check for an onTask method
+		$methodName = 'on' . ucfirst($task);
+
+		if (method_exists($this, $methodName))
+		{
+			return $this->$methodName();
+		}
+
+		if (!empty($input))
+		{
+			$this->input = $saveInput;
+		}
+	}
+
+	/**
+	 * Renders the toolbar for the component's Control Panel page
+	 *
+	 * @return  void
+	 */
+	public function onCpanelsBrowse()
+	{
+		if (FOFPlatform::getInstance()->isBackend() || $this->renderFrontendSubmenu)
+		{
+			$this->renderSubmenu();
+		}
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$this->renderFrontendButtons)
+		{
+			return;
+		}
+
+		$option = $this->input->getCmd('option', 'com_foobar');
+
+		JToolbarHelper::title(JText::_(strtoupper($option)), str_replace('com_', '', $option));
+		JToolbarHelper::preferences($option, 550, 875);
+	}
+
+	/**
+	 * Renders the toolbar for the component's Browse pages (the plural views)
+	 *
+	 * @return  void
+	 */
+	public function onBrowse()
+	{
+		// On frontend, buttons must be added specifically
+		if (FOFPlatform::getInstance()->isBackend() || $this->renderFrontendSubmenu)
+		{
+			$this->renderSubmenu();
+		}
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$this->renderFrontendButtons)
+		{
+			return;
+		}
+
+		// Set toolbar title
+		$option = $this->input->getCmd('option', 'com_foobar');
+		$subtitle_key = strtoupper($option . '_TITLE_' . $this->input->getCmd('view', 'cpanel'));
+		JToolbarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), str_replace('com_', '', $option));
+
+		// Add toolbar buttons
+		if ($this->perms->create)
+		{
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				JToolbarHelper::addNew();
+			}
+			else
+			{
+				JToolbarHelper::addNewX();
+			}
+		}
+
+		if ($this->perms->edit)
+		{
+			if (version_compare(JVERSION, '3.0', 'ge'))
+			{
+				JToolbarHelper::editList();
+			}
+			else
+			{
+				JToolbarHelper::editListX();
+			}
+		}
+
+		if ($this->perms->create || $this->perms->edit)
+		{
+			JToolbarHelper::divider();
+		}
+
+		if ($this->perms->editstate)
+		{
+			JToolbarHelper::publishList();
+			JToolbarHelper::unpublishList();
+			JToolbarHelper::divider();
+		}
+
+		if ($this->perms->delete)
+		{
+			$msg = JText::_($this->input->getCmd('option', 'com_foobar') . '_CONFIRM_DELETE');
+			JToolbarHelper::deleteList(strtoupper($msg));
+		}
+	}
+
+	/**
+	 * Renders the toolbar for the component's Read pages
+	 *
+	 * @return  void
+	 */
+	public function onRead()
+	{
+		// On frontend, buttons must be added specifically
+		if (FOFPlatform::getInstance()->isBackend() || $this->renderFrontendSubmenu)
+		{
+			$this->renderSubmenu();
+		}
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$this->renderFrontendButtons)
+		{
+			return;
+		}
+
+		$option = $this->input->getCmd('option', 'com_foobar');
+		$componentName = str_replace('com_', '', $option);
+
+		// Set toolbar title
+		$subtitle_key = strtoupper($option . '_TITLE_' . $this->input->getCmd('view', 'cpanel') . '_READ');
+		JToolbarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), $componentName);
+
+		// Set toolbar icons
+		JToolbarHelper::back();
+	}
+
+	/**
+	 * Renders the toolbar for the component's Add pages
+	 *
+	 * @return  void
+	 */
+	public function onAdd()
+	{
+		// On frontend, buttons must be added specifically
+		if (!FOFPlatform::getInstance()->isBackend() && !$this->renderFrontendButtons)
+		{
+			return;
+		}
+
+		$option = $this->input->getCmd('option', 'com_foobar');
+		$componentName = str_replace('com_', '', $option);
+
+		// Set toolbar title
+		$subtitle_key = strtoupper($option . '_TITLE_' . FOFInflector::pluralize($this->input->getCmd('view', 'cpanel'))) . '_EDIT';
+		JToolbarHelper::title(JText::_(strtoupper($option)) . ': ' . JText::_($subtitle_key), $componentName);
+
+		// Set toolbar icons
+        if ($this->perms->edit || $this->perms->editown)
+        {
+            // Show the apply button only if I can edit the record, otherwise I'll return to the edit form and get a
+            // 403 error since I can't do that
+            JToolbarHelper::apply();
+        }
+
+		JToolbarHelper::save();
+
+		if ($this->perms->create)
+		{
+			JToolbarHelper::custom('savenew', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false);
+		}
+
+		JToolbarHelper::cancel();
+	}
+
+	/**
+	 * Renders the toolbar for the component's Edit pages
+	 *
+	 * @return  void
+	 */
+	public function onEdit()
+	{
+		// On frontend, buttons must be added specifically
+		if (!FOFPlatform::getInstance()->isBackend() && !$this->renderFrontendButtons)
+		{
+			return;
+		}
+
+		$this->onAdd();
+	}
+
+	/**
+	 * Removes all links from the link bar
+	 *
+	 * @return  void
+	 */
+	public function clearLinks()
+	{
+		$this->linkbar = array();
+	}
+
+	/**
+	 * Get the link bar's link definitions
+	 *
+	 * @return  array
+	 */
+	public function &getLinks()
+	{
+		return $this->linkbar;
+	}
+
+	/**
+	 * Append a link to the link bar
+	 *
+	 * @param   string       $name    The text of the link
+	 * @param   string|null  $link    The link to render; set to null to render a separator
+	 * @param   boolean      $active  True if it's an active link
+	 * @param   string|null  $icon    Icon class (used by some renderers, like the Bootstrap renderer)
+	 * @param   string|null  $parent  The parent element (referenced by name)) Thsi will create a dropdown list
+	 *
+	 * @return  void
+	 */
+	public function appendLink($name, $link = null, $active = false, $icon = null, $parent = '')
+	{
+		$linkDefinition = array(
+			'name'	 => $name,
+			'link'	 => $link,
+			'active' => $active,
+			'icon'	 => $icon
+		);
+
+		if (empty($parent))
+		{
+            if(array_key_exists($name, $this->linkbar))
+            {
+                $this->linkbar[$name] = array_merge($this->linkbar[$name], $linkDefinition);
+
+                // If there already are some children, I have to put this view link in the "items" array in the first place
+                if(array_key_exists('items', $this->linkbar[$name]))
+                {
+                    array_unshift($this->linkbar[$name]['items'], $linkDefinition);
+                }
+            }
+            else
+            {
+                $this->linkbar[$name] = $linkDefinition;
+            }
+		}
+		else
+		{
+			if (!array_key_exists($parent, $this->linkbar))
+			{
+				$parentElement = $linkDefinition;
+                $parentElement['name'] = $parent;
+				$parentElement['link'] = null;
+				$this->linkbar[$parent] = $parentElement;
+				$parentElement['items'] = array();
+			}
+			else
+			{
+				$parentElement = $this->linkbar[$parent];
+
+				if (!array_key_exists('dropdown', $parentElement) && !empty($parentElement['link']))
+				{
+					$newSubElement = $parentElement;
+					$parentElement['items'] = array($newSubElement);
+				}
+			}
+
+			$parentElement['items'][] = $linkDefinition;
+			$parentElement['dropdown'] = true;
+
+			if($active)
+			{
+				$parentElement['active'] = true;
+			}
+
+			$this->linkbar[$parent] = $parentElement;
+		}
+	}
+
+	/**
+	 * Prefixes (some people erroneously call this "prepend" – there is no such word) a link to the link bar
+	 *
+	 * @param   string       $name    The text of the link
+	 * @param   string|null  $link    The link to render; set to null to render a separator
+	 * @param   boolean      $active  True if it's an active link
+	 * @param   string|null  $icon    Icon class (used by some renderers, like the Bootstrap renderer)
+	 *
+	 * @return  void
+	 */
+	public function prefixLink($name, $link = null, $active = false, $icon = null)
+	{
+		$linkDefinition = array(
+			'name'	 => $name,
+			'link'	 => $link,
+			'active' => $active,
+			'icon'	 => $icon
+		);
+		array_unshift($this->linkbar, $linkDefinition);
+	}
+
+	/**
+	 * Renders the submenu (toolbar links) for all detected views of this component
+	 *
+	 * @return  void
+	 */
+	public function renderSubmenu()
+	{
+		$views = $this->getMyViews();
+
+		if (empty($views))
+		{
+			return;
+		}
+
+		$activeView = $this->input->getCmd('view', 'cpanel');
+
+		foreach ($views as $view)
+		{
+			// Get the view name
+			$key = strtoupper($this->component) . '_TITLE_' . strtoupper($view);
+
+            //Do we have a translation for this key?
+			if (strtoupper(JText::_($key)) == $key)
+			{
+				$altview = FOFInflector::isPlural($view) ? FOFInflector::singularize($view) : FOFInflector::pluralize($view);
+				$key2 = strtoupper($this->component) . '_TITLE_' . strtoupper($altview);
+
+                // Maybe we have for the alternative view?
+				if (strtoupper(JText::_($key2)) == $key2)
+				{
+                    // Nope, let's use the raw name
+					$name = ucfirst($view);
+				}
+				else
+				{
+					$name = JText::_($key2);
+				}
+			}
+			else
+			{
+				$name = JText::_($key);
+			}
+
+			$link = 'index.php?option=' . $this->component . '&view=' . $view;
+
+			$active = $view == $activeView;
+
+			$this->appendLink($name, $link, $active);
+		}
+	}
+
+	/**
+	 * Automatically detects all views of the component
+	 *
+	 * @return  array  A list of all views, in the order to be displayed in the toolbar submenu
+	 */
+	protected function getMyViews()
+	{
+		$views      = array();
+		$t_views    = array();
+		$using_meta = false;
+
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($this->component);
+		$searchPath     = $componentPaths['main'] . '/views';
+        $filesystem     = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		$allFolders = $filesystem->folderFolders($searchPath);
+
+		if (!empty($allFolders))
+		{
+			foreach ($allFolders as $folder)
+			{
+				$view = $folder;
+
+				// View already added
+				if (in_array(FOFInflector::pluralize($view), $t_views))
+				{
+					continue;
+				}
+
+				// Do we have a 'skip.xml' file in there?
+				$files = $filesystem->folderFiles($searchPath . '/' . $view, '^skip\.xml$');
+
+				if (!empty($files))
+				{
+					continue;
+				}
+
+				// Do we have extra information about this view? (ie. ordering)
+				$meta = $filesystem->folderFiles($searchPath . '/' . $view, '^metadata\.xml$');
+
+				// Not found, do we have it inside the plural one?
+				if (!$meta)
+				{
+					$plural = FOFInflector::pluralize($view);
+
+					if (in_array($plural, $allFolders))
+					{
+						$view = $plural;
+						$meta = $filesystem->folderFiles($searchPath . '/' . $view, '^metadata\.xml$');
+					}
+				}
+
+				if (!empty($meta))
+				{
+					$using_meta = true;
+					$xml = simplexml_load_file($searchPath . '/' . $view . '/' . $meta[0]);
+					$order = (int) $xml->foflib->ordering;
+				}
+				else
+				{
+					// Next place. It's ok since the index are 0-based and count is 1-based
+
+					if (!isset($to_order))
+					{
+						$to_order = array();
+					}
+
+					$order = count($to_order);
+				}
+
+				$view = FOFInflector::pluralize($view);
+
+				$t_view = new stdClass;
+				$t_view->ordering = $order;
+				$t_view->view = $view;
+
+				$to_order[] = $t_view;
+				$t_views[] = $view;
+			}
+		}
+
+        FOFUtilsArray::sortObjects($to_order, 'ordering');
+		$views = FOFUtilsArray::getColumn($to_order, 'view');
+
+		// If not using the metadata file, let's put the cpanel view on top
+		if (!$using_meta)
+		{
+			$cpanel = array_search('cpanels', $views);
+
+			if ($cpanel !== false)
+			{
+				unset($views[$cpanel]);
+				array_unshift($views, 'cpanels');
+			}
+		}
+
+		return $views;
+	}
+
+	/**
+	 * Return the front-end toolbar rendering flag
+	 *
+	 * @return  boolean
+	 */
+	public function getRenderFrontendButtons()
+	{
+		return $this->renderFrontendButtons;
+	}
+
+	/**
+	 * Return the front-end submenu rendering flag
+	 *
+	 * @return  boolean
+	 */
+	public function getRenderFrontendSubmenu()
+	{
+		return $this->renderFrontendSubmenu;
+	}
+
+	/**
+	 * Render the toolbar from the configuration.
+	 *
+	 * @param   array  $toolbar  The toolbar definition
+	 *
+	 * @return  void
+	 */
+	private function renderFromConfig(array $toolbar)
+	{
+		if (FOFPlatform::getInstance()->isBackend() || $this->renderFrontendSubmenu)
+		{
+			$this->renderSubmenu();
+		}
+
+		if (!FOFPlatform::getInstance()->isBackend() && !$this->renderFrontendButtons)
+		{
+			return;
+		}
+
+		// Render each element
+		foreach ($toolbar as $elementType => $elementAttributes)
+		{
+			$value = isset($elementAttributes['value']) ? $elementAttributes['value'] : null;
+			$this->renderToolbarElement($elementType, $value, $elementAttributes);
+		}
+
+		return;
+	}
+
+	/**
+	 * Render a toolbar element.
+	 *
+	 * @param   string  $type        The element type.
+	 * @param   mixed   $value       The element value.
+	 * @param   array   $attributes  The element attributes.
+	 *
+	 * @return  void
+	 *
+     * @codeCoverageIgnore
+	 * @throws  InvalidArgumentException
+	 */
+	private function renderToolbarElement($type, $value = null, array $attributes = array())
+	{
+		switch ($type)
+		{
+			case 'title':
+				$icon = isset($attributes['icon']) ? $attributes['icon'] : 'generic.png';
+				JToolbarHelper::title($value, $icon);
+				break;
+
+			case 'divider':
+				JToolbarHelper::divider();
+				break;
+
+			case 'custom':
+				$task = isset($attributes['task']) ? $attributes['task'] : '';
+				$icon = isset($attributes['icon']) ? $attributes['icon'] : '';
+				$iconOver = isset($attributes['icon_over']) ? $attributes['icon_over'] : '';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : '';
+				$listSelect = isset($attributes['list_select']) ?
+					FOFStringUtils::toBool($attributes['list_select']) : true;
+
+				JToolbarHelper::custom($task, $icon, $iconOver, $alt, $listSelect);
+				break;
+
+			case 'preview':
+				$url = isset($attributes['url']) ? $attributes['url'] : '';
+				$update_editors = isset($attributes['update_editors']) ?
+					FOFStringUtils::toBool($attributes['update_editors']) : false;
+
+				JToolbarHelper::preview($url, $update_editors);
+				break;
+
+			case 'help':
+				if (!isset($attributes['help']))
+				{
+					throw new InvalidArgumentException(
+						'The help attribute is missing in the help button type.'
+					);
+				}
+
+				$ref = $attributes['help'];
+				$com = isset($attributes['com']) ? FOFStringUtils::toBool($attributes['com']) : false;
+				$override = isset($attributes['override']) ? $attributes['override'] : null;
+				$component = isset($attributes['component']) ? $attributes['component'] : null;
+
+				JToolbarHelper::help($ref, $com, $override, $component);
+				break;
+
+			case 'back':
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_BACK';
+				$href = isset($attributes['href']) ? $attributes['href'] : 'javascript:history.back();';
+
+				JToolbarHelper::back($alt, $href);
+				break;
+
+			case 'media_manager':
+				$directory = isset($attributes['directory']) ? $attributes['directory'] : '';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_UPLOAD';
+
+				JToolbarHelper::media_manager($directory, $alt);
+				break;
+
+			case 'assign':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'assign';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_ASSIGN';
+
+				JToolbarHelper::assign($task, $alt);
+				break;
+
+			case 'new':
+				if ($this->perms->create)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'add';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_NEW';
+					$check = isset($attributes['check']) ?
+						FOFStringUtils::toBool($attributes['check']) : false;
+
+					JToolbarHelper::addNew($task, $alt, $check);
+				}
+
+				break;
+
+			case 'publish':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'publish';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_PUBLISH';
+					$check = isset($attributes['check']) ?
+						FOFStringUtils::toBool($attributes['check']) : false;
+
+					JToolbarHelper::publish($task, $alt, $check);
+				}
+
+				break;
+
+			case 'publishList':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'publish';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_PUBLISH';
+
+					JToolbarHelper::publishList($task, $alt);
+				}
+
+				break;
+
+			case 'unpublish':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'unpublish';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_UNPUBLISH';
+					$check = isset($attributes['check']) ?
+						FOFStringUtils::toBool($attributes['check']) : false;
+
+					JToolbarHelper::unpublish($task, $alt, $check);
+				}
+
+				break;
+
+			case 'unpublishList':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'unpublish';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_UNPUBLISH';
+
+					JToolbarHelper::unpublishList($task, $alt);
+				}
+
+				break;
+
+			case 'archiveList':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'archive';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_ARCHIVE';
+
+					JToolbarHelper::archiveList($task, $alt);
+				}
+
+				break;
+
+			case 'unarchiveList':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'unarchive';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_UNARCHIVE';
+
+					JToolbarHelper::unarchiveList($task, $alt);
+				}
+
+				break;
+
+			case 'editList':
+				if ($this->perms->edit)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'edit';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_EDIT';
+
+					JToolbarHelper::editList($task, $alt);
+				}
+
+				break;
+
+			case 'editHtml':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'edit_source';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_EDIT_HTML';
+
+				JToolbarHelper::editHtml($task, $alt);
+				break;
+
+			case 'editCss':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'edit_css';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_EDIT_CSS';
+
+				JToolbarHelper::editCss($task, $alt);
+				break;
+
+			case 'deleteList':
+				if ($this->perms->delete)
+				{
+					$msg = isset($attributes['msg']) ? $attributes['msg'] : '';
+					$task = isset($attributes['task']) ? $attributes['task'] : 'remove';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_DELETE';
+
+					JToolbarHelper::deleteList($msg, $task, $alt);
+				}
+
+				break;
+
+			case 'trash':
+				if ($this->perms->editstate)
+				{
+					$task = isset($attributes['task']) ? $attributes['task'] : 'remove';
+					$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_TRASH';
+					$check = isset($attributes['check']) ?
+						FOFStringUtils::toBool($attributes['check']) : true;
+
+					JToolbarHelper::trash($task, $alt, $check);
+				}
+
+				break;
+
+			case 'apply':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'apply';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_APPLY';
+
+				JToolbarHelper::apply($task, $alt);
+				break;
+
+			case 'save':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'save';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_SAVE';
+
+				JToolbarHelper::save($task, $alt);
+				break;
+
+			case 'save2new':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'save2new';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_SAVE_AND_NEW';
+
+				JToolbarHelper::save2new($task, $alt);
+				break;
+
+			case 'save2copy':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'save2copy';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_SAVE_AS_COPY';
+				JToolbarHelper::save2copy($task, $alt);
+				break;
+
+			case 'checkin':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'checkin';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] :'JTOOLBAR_CHECKIN';
+				$check = isset($attributes['check']) ?
+					FOFStringUtils::toBool($attributes['check']) : true;
+
+				JToolbarHelper::checkin($task, $alt, $check);
+				break;
+
+			case 'cancel':
+				$task = isset($attributes['task']) ? $attributes['task'] : 'cancel';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JTOOLBAR_CANCEL';
+
+				JToolbarHelper::cancel($task, $alt);
+				break;
+
+			case 'preferences':
+				if (!isset($attributes['component']))
+				{
+					throw new InvalidArgumentException(
+						'The component attribute is missing in the preferences button type.'
+					);
+				}
+
+				$component = $attributes['component'];
+				$height = isset($attributes['height']) ? $attributes['height'] : '550';
+				$width = isset($attributes['width']) ? $attributes['width'] : '875';
+				$alt = isset($attributes['alt']) ? $attributes['alt'] : 'JToolbar_Options';
+				$path = isset($attributes['path']) ? $attributes['path'] : '';
+
+				JToolbarHelper::preferences($component, $height, $width, $alt, $path);
+				break;
+
+			default:
+				throw new InvalidArgumentException(sprintf('Unknown button type %s', $type));
+		}
+	}
+}
diff --git a/core/libraries/fof/utils/array/array.php b/core/libraries/fof/utils/array/array.php
new file mode 100644
index 00000000..7be251f7
--- /dev/null
+++ b/core/libraries/fof/utils/array/array.php
@@ -0,0 +1,585 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A utility class to handle array manipulation.
+ *
+ * Based on the JArrayHelper class as found in Joomla! 3.2.0
+ */
+abstract class FOFUtilsArray
+{
+	/**
+	 * Option to perform case-sensitive sorts.
+	 *
+	 * @var    mixed  Boolean or array of booleans.
+	 */
+	protected static $sortCase;
+
+	/**
+	 * Option to set the sort direction.
+	 *
+	 * @var    mixed  Integer or array of integers.
+	 */
+	protected static $sortDirection;
+
+	/**
+	 * Option to set the object key to sort on.
+	 *
+	 * @var    string
+	 */
+	protected static $sortKey;
+
+	/**
+	 * Option to perform a language aware sort.
+	 *
+	 * @var    mixed  Boolean or array of booleans.
+	 */
+	protected static $sortLocale;
+
+	/**
+	 * Function to convert array to integer values
+	 *
+	 * @param   array  &$array   The source array to convert
+	 * @param   mixed  $default  A default value (int|array) to assign if $array is not an array
+	 *
+	 * @return  void
+	 */
+	public static function toInteger(&$array, $default = null)
+	{
+		if (is_array($array))
+		{
+			foreach ($array as $i => $v)
+			{
+				$array[$i] = (int) $v;
+			}
+		}
+		else
+		{
+			if ($default === null)
+			{
+				$array = array();
+			}
+			elseif (is_array($default))
+			{
+				self::toInteger($default, null);
+				$array = $default;
+			}
+			else
+			{
+				$array = array((int) $default);
+			}
+		}
+	}
+
+	/**
+	 * Utility function to map an array to a stdClass object.
+	 *
+	 * @param   array   &$array  The array to map.
+	 * @param   string  $class   Name of the class to create
+	 *
+	 * @return  object   The object mapped from the given array
+	 */
+	public static function toObject(&$array, $class = 'stdClass')
+	{
+		$obj = null;
+
+		if (is_array($array))
+		{
+			$obj = new $class;
+
+			foreach ($array as $k => $v)
+			{
+				if (is_array($v))
+				{
+					$obj->$k = self::toObject($v, $class);
+				}
+				else
+				{
+					$obj->$k = $v;
+				}
+			}
+		}
+		return $obj;
+	}
+
+	/**
+	 * Utility function to map an array to a string.
+	 *
+	 * @param   array    $array         The array to map.
+	 * @param   string   $inner_glue    The glue (optional, defaults to '=') between the key and the value.
+	 * @param   string   $outer_glue    The glue (optional, defaults to ' ') between array elements.
+	 * @param   boolean  $keepOuterKey  True if final key should be kept.
+	 *
+	 * @return  string   The string mapped from the given array
+	 */
+	public static function toString($array = null, $inner_glue = '=', $outer_glue = ' ', $keepOuterKey = false)
+	{
+		$output = array();
+
+		if (is_array($array))
+		{
+			foreach ($array as $key => $item)
+			{
+				if (is_array($item))
+				{
+					if ($keepOuterKey)
+					{
+						$output[] = $key;
+					}
+					// This is value is an array, go and do it again!
+					$output[] = self::toString($item, $inner_glue, $outer_glue, $keepOuterKey);
+				}
+				else
+				{
+					$output[] = $key . $inner_glue . '"' . $item . '"';
+				}
+			}
+		}
+
+		return implode($outer_glue, $output);
+	}
+
+	/**
+	 * Utility function to map an object to an array
+	 *
+	 * @param   object   $p_obj    The source object
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array    The array mapped from the given object
+	 */
+	public static function fromObject($p_obj, $recurse = true, $regex = null)
+	{
+		if (is_object($p_obj))
+		{
+			return self::_fromObject($p_obj, $recurse, $regex);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Utility function to map an object or array to an array
+	 *
+	 * @param   mixed    $item     The source object or array
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array  The array mapped from the given object
+	 */
+	protected static function _fromObject($item, $recurse, $regex)
+	{
+		if (is_object($item))
+		{
+			$result = array();
+
+			foreach (get_object_vars($item) as $k => $v)
+			{
+				if (!$regex || preg_match($regex, $k))
+				{
+					if ($recurse)
+					{
+						$result[$k] = self::_fromObject($v, $recurse, $regex);
+					}
+					else
+					{
+						$result[$k] = $v;
+					}
+				}
+			}
+		}
+		elseif (is_array($item))
+		{
+			$result = array();
+
+			foreach ($item as $k => $v)
+			{
+				$result[$k] = self::_fromObject($v, $recurse, $regex);
+			}
+		}
+		else
+		{
+			$result = $item;
+		}
+		return $result;
+	}
+
+	/**
+	 * Extracts a column from an array of arrays or objects
+	 *
+	 * @param   array   &$array  The source array
+	 * @param   string  $index   The index of the column or name of object property
+	 *
+	 * @return  array  Column of values from the source array
+	 */
+	public static function getColumn(&$array, $index)
+	{
+		$result = array();
+
+		if (is_array($array))
+		{
+			foreach ($array as &$item)
+			{
+				if (is_array($item) && isset($item[$index]))
+				{
+					$result[] = $item[$index];
+				}
+				elseif (is_object($item) && isset($item->$index))
+				{
+					$result[] = $item->$index;
+				}
+				// Else ignore the entry
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Utility function to return a value from a named array or a specified default
+	 *
+	 * @param   array   &$array   A named array
+	 * @param   string  $name     The key to search for
+	 * @param   mixed   $default  The default value to give if no key found
+	 * @param   string  $type     Return type for the variable (INT, FLOAT, STRING, WORD, BOOLEAN, ARRAY)
+	 *
+	 * @return  mixed  The value from the source array
+	 */
+	public static function getValue(&$array, $name, $default = null, $type = '')
+	{
+		$result = null;
+
+		if (isset($array[$name]))
+		{
+			$result = $array[$name];
+		}
+
+		// Handle the default case
+		if (is_null($result))
+		{
+			$result = $default;
+		}
+
+		// Handle the type constraint
+		switch (strtoupper($type))
+		{
+			case 'INT':
+			case 'INTEGER':
+				// Only use the first integer value
+				@preg_match('/-?[0-9]+/', $result, $matches);
+				$result = @(int) $matches[0];
+				break;
+
+			case 'FLOAT':
+			case 'DOUBLE':
+				// Only use the first floating point value
+				@preg_match('/-?[0-9]+(\.[0-9]+)?/', $result, $matches);
+				$result = @(float) $matches[0];
+				break;
+
+			case 'BOOL':
+			case 'BOOLEAN':
+				$result = (bool) $result;
+				break;
+
+			case 'ARRAY':
+				if (!is_array($result))
+				{
+					$result = array($result);
+				}
+				break;
+
+			case 'STRING':
+				$result = (string) $result;
+				break;
+
+			case 'WORD':
+				$result = (string) preg_replace('#\W#', '', $result);
+				break;
+
+			case 'NONE':
+			default:
+				// No casting necessary
+				break;
+		}
+		return $result;
+	}
+
+	/**
+	 * Takes an associative array of arrays and inverts the array keys to values using the array values as keys.
+	 *
+	 * Example:
+	 * $input = array(
+	 *     'New' => array('1000', '1500', '1750'),
+	 *     'Used' => array('3000', '4000', '5000', '6000')
+	 * );
+	 * $output = FOFUtilsArray::invert($input);
+	 *
+	 * Output would be equal to:
+	 * $output = array(
+	 *     '1000' => 'New',
+	 *     '1500' => 'New',
+	 *     '1750' => 'New',
+	 *     '3000' => 'Used',
+	 *     '4000' => 'Used',
+	 *     '5000' => 'Used',
+	 *     '6000' => 'Used'
+	 * );
+	 *
+	 * @param   array  $array  The source array.
+	 *
+	 * @return  array  The inverted array.
+	 */
+	public static function invert($array)
+	{
+		$return = array();
+
+		foreach ($array as $base => $values)
+		{
+			if (!is_array($values))
+			{
+				continue;
+			}
+
+			foreach ($values as $key)
+			{
+				// If the key isn't scalar then ignore it.
+				if (is_scalar($key))
+				{
+					$return[$key] = $base;
+				}
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * Method to determine if an array is an associative array.
+	 *
+	 * @param   array  $array  An array to test.
+	 *
+	 * @return  boolean  True if the array is an associative array.
+	 */
+	public static function isAssociative($array)
+	{
+		if (is_array($array))
+		{
+			foreach (array_keys($array) as $k => $v)
+			{
+				if ($k !== $v)
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Pivots an array to create a reverse lookup of an array of scalars, arrays or objects.
+	 *
+	 * @param   array   $source  The source array.
+	 * @param   string  $key     Where the elements of the source array are objects or arrays, the key to pivot on.
+	 *
+	 * @return  array  An array of arrays pivoted either on the value of the keys, or an individual key of an object or array.
+	 */
+	public static function pivot($source, $key = null)
+	{
+		$result = array();
+		$counter = array();
+
+		foreach ($source as $index => $value)
+		{
+			// Determine the name of the pivot key, and its value.
+			if (is_array($value))
+			{
+				// If the key does not exist, ignore it.
+				if (!isset($value[$key]))
+				{
+					continue;
+				}
+
+				$resultKey = $value[$key];
+				$resultValue = &$source[$index];
+			}
+			elseif (is_object($value))
+			{
+				// If the key does not exist, ignore it.
+				if (!isset($value->$key))
+				{
+					continue;
+				}
+
+				$resultKey = $value->$key;
+				$resultValue = &$source[$index];
+			}
+			else
+			{
+				// Just a scalar value.
+				$resultKey = $value;
+				$resultValue = $index;
+			}
+
+			// The counter tracks how many times a key has been used.
+			if (empty($counter[$resultKey]))
+			{
+				// The first time around we just assign the value to the key.
+				$result[$resultKey] = $resultValue;
+				$counter[$resultKey] = 1;
+			}
+			elseif ($counter[$resultKey] == 1)
+			{
+				// If there is a second time, we convert the value into an array.
+				$result[$resultKey] = array(
+					$result[$resultKey],
+					$resultValue,
+				);
+				$counter[$resultKey]++;
+			}
+			else
+			{
+				// After the second time, no need to track any more. Just append to the existing array.
+				$result[$resultKey][] = $resultValue;
+			}
+		}
+
+		unset($counter);
+
+		return $result;
+	}
+
+	/**
+	 * Utility function to sort an array of objects on a given field
+	 *
+	 * @param   array  &$a             An array of objects
+	 * @param   mixed  $k              The key (string) or a array of key to sort on
+	 * @param   mixed  $direction      Direction (integer) or an array of direction to sort in [1 = Ascending] [-1 = Descending]
+	 * @param   mixed  $caseSensitive  Boolean or array of booleans to let sort occur case sensitive or insensitive
+	 * @param   mixed  $locale         Boolean or array of booleans to let sort occur using the locale language or not
+	 *
+	 * @return  array  The sorted array of objects
+	 */
+	public static function sortObjects(&$a, $k, $direction = 1, $caseSensitive = true, $locale = false)
+	{
+		if (!is_array($locale) || !is_array($locale[0]))
+		{
+			$locale = array($locale);
+		}
+
+		self::$sortCase = (array) $caseSensitive;
+		self::$sortDirection = (array) $direction;
+		self::$sortKey = (array) $k;
+		self::$sortLocale = $locale;
+
+		usort($a, array(__CLASS__, '_sortObjects'));
+
+		self::$sortCase = null;
+		self::$sortDirection = null;
+		self::$sortKey = null;
+		self::$sortLocale = null;
+
+		return $a;
+	}
+
+	/**
+	 * Callback function for sorting an array of objects on a key
+	 *
+	 * @param   array  &$a  An array of objects
+	 * @param   array  &$b  An array of objects
+	 *
+	 * @return  integer  Comparison status
+	 *
+	 * @see     FOFUtilsArray::sortObjects()
+	 */
+	protected static function _sortObjects(&$a, &$b)
+	{
+		$key = self::$sortKey;
+
+		for ($i = 0, $count = count($key); $i < $count; $i++)
+		{
+			if (isset(self::$sortDirection[$i]))
+			{
+				$direction = self::$sortDirection[$i];
+			}
+
+			if (isset(self::$sortCase[$i]))
+			{
+				$caseSensitive = self::$sortCase[$i];
+			}
+
+			if (isset(self::$sortLocale[$i]))
+			{
+				$locale = self::$sortLocale[$i];
+			}
+
+			$va = $a->{$key[$i]};
+			$vb = $b->{$key[$i]};
+
+			if ((is_bool($va) || is_numeric($va)) && (is_bool($vb) || is_numeric($vb)))
+			{
+				$cmp = $va - $vb;
+			}
+			elseif ($caseSensitive)
+			{
+				$cmp = JString::strcmp($va, $vb, $locale);
+			}
+			else
+			{
+				$cmp = JString::strcasecmp($va, $vb, $locale);
+			}
+
+			if ($cmp > 0)
+			{
+
+				return $direction;
+			}
+
+			if ($cmp < 0)
+			{
+				return -$direction;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Multidimensional array safe unique test
+	 *
+	 * @param   array  $myArray  The array to make unique.
+	 *
+	 * @return  array
+	 *
+	 * @see     http://php.net/manual/en/function.array-unique.php
+	 */
+	public static function arrayUnique($myArray)
+	{
+		if (!is_array($myArray))
+		{
+			return $myArray;
+		}
+
+		foreach ($myArray as &$myvalue)
+		{
+			$myvalue = serialize($myvalue);
+		}
+
+		$myArray = array_unique($myArray);
+
+		foreach ($myArray as &$myvalue)
+		{
+			$myvalue = unserialize($myvalue);
+		}
+
+		return $myArray;
+	}
+}
diff --git a/core/libraries/fof/utils/cache/cleaner.php b/core/libraries/fof/utils/cache/cleaner.php
new file mode 100644
index 00000000..8b0272a6
--- /dev/null
+++ b/core/libraries/fof/utils/cache/cleaner.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A utility class to help you quickly clean the Joomla! cache
+ */
+class FOFUtilsCacheCleaner
+{
+	/**
+	 * Clears the com_modules and com_plugins cache. You need to call this whenever you alter the publish state or
+	 * parameters of a module or plugin from your code.
+	 *
+	 * @return  void
+	 */
+	public static function clearPluginsAndModulesCache()
+	{
+		self::clearPluginsCache();
+		self::clearModulesCache();
+	}
+
+	/**
+	 * Clears the com_plugins cache. You need to call this whenever you alter the publish state or parameters of a
+	 * plugin from your code.
+	 *
+	 * @return  void
+	 */
+	public static function clearPluginsCache()
+	{
+		self::clearCacheGroups(array('com_plugins'), array(0,1));
+	}
+
+	/**
+	 * Clears the com_modules cache. You need to call this whenever you alter the publish state or parameters of a
+	 * module from your code.
+	 *
+	 * @return  void
+	 */
+	public static function clearModulesCache()
+	{
+		self::clearCacheGroups(array('com_modules'), array(0,1));
+	}
+
+	/**
+	 * Clears the specified cache groups.
+	 *
+	 * @param   array $clearGroups    Which cache groups to clear. Usually this is com_yourcomponent to clear your
+	 *                                component's cache.
+	 * @param   array   $cacheClients Which cache clients to clear. 0 is the back-end, 1 is the front-end. If you do not
+	 *                                specify anything, both cache clients will be cleared.
+	 *
+	 * @return  void
+	 */
+	public static function clearCacheGroups(array $clearGroups, array $cacheClients = array(0, 1))
+	{
+		$conf = JFactory::getConfig();
+
+		foreach ($clearGroups as $group)
+		{
+			foreach ($cacheClients as $client_id)
+			{
+				try
+				{
+					$options = array(
+						'defaultgroup' => $group,
+						'cachebase' => ($client_id) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache')
+					);
+
+					$cache = JCache::getInstance('callback', $options);
+					$cache->clean();
+				}
+				catch (Exception $e)
+				{
+					// suck it up
+				}
+			}
+		}
+	}
+} 
\ No newline at end of file
diff --git a/core/libraries/fof/utils/config/helper.php b/core/libraries/fof/utils/config/helper.php
new file mode 100644
index 00000000..fb5340ba
--- /dev/null
+++ b/core/libraries/fof/utils/config/helper.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A utility class to help you fetch component parameters without going through JComponentHelper
+ */
+class FOFUtilsConfigHelper
+{
+	/**
+	 * Caches the component parameters without going through JComponentHelper. This is necessary since JComponentHelper
+	 * cannot be reset or updated once you update parameters in the database.
+	 *
+	 * @var array
+	 */
+	private static $componentParams = array();
+
+	/**
+	 * Loads the component's configuration parameters so they can be accessed by getComponentConfigurationValue
+	 *
+	 * @param   string  $component  The component for loading the parameters
+	 * @param   bool    $force      Should I force-reload the configuration information?
+	 */
+	public final static function loadComponentConfig($component, $force = false)
+	{
+		if (isset(self::$componentParams[$component]) && !is_null(self::$componentParams[$component]) && !$force)
+		{
+			return;
+		}
+
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		$sql = $db->getQuery(true)
+				  ->select($db->qn('params'))
+				  ->from($db->qn('#__extensions'))
+				  ->where($db->qn('type') . ' = ' . $db->q('component'))
+				  ->where($db->qn('element') . " = " . $db->q($component));
+		$db->setQuery($sql);
+		$config_ini = $db->loadResult();
+
+		// OK, Joomla! 1.6 stores values JSON-encoded so, what do I do? Right!
+		$config_ini = trim($config_ini);
+
+		if ((substr($config_ini, 0, 1) == '{') && substr($config_ini, -1) == '}')
+		{
+			$config_ini = json_decode($config_ini, true);
+		}
+		else
+		{
+			$config_ini = FOFUtilsIniParser::parse_ini_file($config_ini, false, true);
+		}
+
+		if (is_null($config_ini) || empty($config_ini))
+		{
+			$config_ini = array();
+		}
+
+		self::$componentParams[$component] = $config_ini;
+	}
+
+	/**
+	 * Retrieves the value of a component configuration parameter without going through JComponentHelper
+	 *
+	 * @param   string  $component  The component for loading the parameter value
+	 * @param   string  $key        The key to retrieve
+	 * @param   mixed   $default    The default value to use in case the key is missing
+	 *
+	 * @return  mixed
+	 */
+	public final static function getComponentConfigurationValue($component, $key, $default = null)
+	{
+		self::loadComponentConfig($component, false);
+
+		if (array_key_exists($key, self::$componentParams[$component]))
+		{
+			return self::$componentParams[$component][$key];
+		}
+		else
+		{
+			return $default;
+		}
+	}
+} 
\ No newline at end of file
diff --git a/core/libraries/fof/utils/filescheck/filescheck.php b/core/libraries/fof/utils/filescheck/filescheck.php
new file mode 100644
index 00000000..78d48d23
--- /dev/null
+++ b/core/libraries/fof/utils/filescheck/filescheck.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A utility class to check that your extension's files are not missing and have not been tampered with.
+ *
+ * You need a file called fileslist.php in your component's administrator root directory with the following contents:
+ *
+ * $phpFileChecker = array(
+ *   'version' => 'revCEE2DAB',
+ *   'date' => '2014-10-16',
+ *   'directories' => array(
+ *     'administrator/components/com_foobar',
+ *     ....
+ *   ),
+ *   'files' => array(
+ *     'administrator/components/com_foobar/access.xml' => array('705', '09aa0351a316bf011ecc8c1145134761', 'b95f00c7b49a07a60570dc674f2497c45c4e7152'),
+ *     ....
+ *   )
+ * );
+ *
+ * All directory and file paths are relative to the site's root
+ *
+ * The directories array is a list of
+ */
+class FOFUtilsFilescheck
+{
+	/** @var string The name of the component */
+	protected $option = '';
+
+	/** @var string Current component version */
+	protected $version = null;
+
+	/** @var string Current component release date */
+	protected $date = null;
+
+	/** @var array List of files to check as filepath => (filesize, md5, sha1) */
+	protected $fileList = array();
+
+	/** @var array List of directories to check that exist */
+	protected $dirList = array();
+
+	/** @var bool Is the reported component version different than the version of the #__extensions table? */
+	protected $wrongComponentVersion = false;
+
+	/** @var bool Is the fileslist.php reporting a version different than the reported component version? */
+	protected $wrongFilesVersion = false;
+
+	/**
+	 * Create and initialise the object
+	 *
+	 * @param string $option Component name, e.g. com_foobar
+	 * @param string $version The current component version, as reported by the component
+	 * @param string $date The current component release date, as reported by the component
+	 */
+	public function __construct($option, $version, $date)
+	{
+		// Initialise from parameters
+		$this->option = $option;
+		$this->version = $version;
+		$this->date = $date;
+
+		// Retrieve the date and version from the #__extensions table
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true)->select('*')->from($db->qn('#__extensions'))
+					->where($db->qn('element') . ' = ' . $db->q($this->option))
+					->where($db->qn('type') . ' = ' . $db->q('component'));
+		$extension = $db->setQuery($query)->loadObject();
+
+		// Check the version and date against those from #__extensions. I hate heavily nested IFs as much as the next
+		// guy, but what can you do...
+		if (!is_null($extension))
+		{
+			$manifestCache = $extension->manifest_cache;
+
+			if (!empty($manifestCache))
+			{
+				$manifestCache = json_decode($manifestCache, true);
+
+				if (is_array($manifestCache) && isset($manifestCache['creationDate']) && isset($manifestCache['version']))
+				{
+					// Make sure the fileslist.php version and date match the component's version
+					if ($this->version != $manifestCache['version'])
+					{
+						$this->wrongComponentVersion = true;
+					}
+
+					if ($this->date != $manifestCache['creationDate'])
+					{
+						$this->wrongComponentVersion = true;
+					}
+				}
+			}
+		}
+
+		// Try to load the fileslist.php file from the component's back-end root
+		$filePath = JPATH_ADMINISTRATOR . '/components/' . $this->option . '/fileslist.php';
+
+		if (!file_exists($filePath))
+		{
+			return;
+		}
+
+		include $filePath;
+
+		// Make sure the fileslist.php version and date match the component's version
+		if ($this->version != $phpFileChecker['version'])
+		{
+			$this->wrongFilesVersion = true;
+		}
+
+		if ($this->date != $phpFileChecker['date'])
+		{
+			$this->wrongFilesVersion = true;
+		}
+
+		// Initialise the files and directories lists
+		$this->fileList = $phpFileChecker['files'];
+		$this->dirList = $phpFileChecker['directories'];
+	}
+
+	/**
+	 * Is the reported component version different than the version of the #__extensions table?
+	 *
+	 * @return boolean
+	 */
+	public function isWrongComponentVersion()
+	{
+		return $this->wrongComponentVersion;
+	}
+
+	/**
+	 * Is the fileslist.php reporting a version different than the reported component version?
+	 *
+	 * @return boolean
+	 */
+	public function isWrongFilesVersion()
+	{
+		return $this->wrongFilesVersion;
+	}
+
+	/**
+	 * Performs a fast check of file and folders. If even one of the files/folders doesn't exist, or even one file has
+	 * the wrong file size it will return false.
+	 *
+	 * @return bool False when there are mismatched files and directories
+	 */
+	public function fastCheck()
+	{
+		// Check that all directories exist
+		foreach ($this->dirList as $directory)
+		{
+			$directory = JPATH_ROOT . '/' . $directory;
+
+			if (!@is_dir($directory))
+			{
+				return false;
+			}
+		}
+
+		// Check that all files exist and have the right size
+		foreach ($this->fileList as $filePath => $fileData)
+		{
+			$filePath = JPATH_ROOT . '/' . $filePath;
+
+			if (!@file_exists($filePath))
+			{
+				return false;
+			}
+
+			$fileSize = @filesize($filePath);
+
+			if ($fileSize != $fileData[0])
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Performs a slow, thorough check of all files and folders (including MD5/SHA1 sum checks)
+	 *
+	 * @param int $idx The index from where to start
+	 *
+	 * @return array Progress report
+	 */
+	public function slowCheck($idx = 0)
+	{
+		$ret = array(
+			'done'	=> false,
+			'files'	=> array(),
+			'folders'	=> array(),
+			'idx'	=> $idx
+		);
+
+		$totalFiles = count($this->fileList);
+		$totalFolders = count($this->dirList);
+		$fileKeys = array_keys($this->fileList);
+
+		$timer = new FOFUtilsTimer(3.0, 75.0);
+
+		while ($timer->getTimeLeft() && (($idx < $totalFiles) || ($idx < $totalFolders)))
+		{
+			if ($idx < $totalFolders)
+			{
+				$directory = JPATH_ROOT . '/' . $this->dirList[$idx];
+
+				if (!@is_dir($directory))
+				{
+					$ret['folders'][] = $directory;
+				}
+			}
+
+			if ($idx < $totalFiles)
+			{
+				$fileKey = $fileKeys[$idx];
+				$filePath = JPATH_ROOT . '/' . $fileKey;
+				$fileData = $this->fileList[$fileKey];
+
+				if (!@file_exists($filePath))
+				{
+					$ret['files'][] = $fileKey . ' (missing)';
+				}
+				elseif (@filesize($filePath) != $fileData[0])
+				{
+					$ret['files'][] = $fileKey . ' (size ' . @filesize($filePath) . ' ≠ ' . $fileData[0] . ')';
+				}
+				else
+				{
+					if (function_exists('sha1_file'))
+					{
+						$fileSha1 = @sha1_file($filePath);
+
+						if ($fileSha1 != $fileData[2])
+						{
+							$ret['files'][] = $fileKey . ' (SHA1 ' . $fileSha1 . ' ≠ ' . $fileData[2] . ')';
+						}
+					}
+					elseif (function_exists('md5_file'))
+					{
+						$fileMd5 = @md5_file($filePath);
+
+						if ($fileMd5 != $fileData[1])
+						{
+							$ret['files'][] = $fileKey . ' (MD5 ' . $fileMd5 . ' ≠ ' . $fileData[1] . ')';
+						}
+					}
+				}
+			}
+
+			$idx++;
+		}
+
+		if (($idx >= $totalFiles) && ($idx >= $totalFolders))
+		{
+			$ret['done'] = true;
+		}
+
+		$ret['idx'] = $idx;
+
+		return $ret;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/utils/ini/parser.php b/core/libraries/fof/utils/ini/parser.php
new file mode 100644
index 00000000..2c8efdf1
--- /dev/null
+++ b/core/libraries/fof/utils/ini/parser.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A utility class to parse INI files. This monstrosity is only required because some impossibly misguided individuals
+ * who misrepresent themselves as hosts have disabled PHP's parse_ini_file() function for "security reasons". Apparently
+ * their blatant ignorance doesn't allow them to discern between the innocuous parse_ini_file and the _potentially_
+ * dangerous ini_set functions, leading them to disable the former and let the latter enabled. In other words, THIS
+ * CLASS IS HERE TO FIX STUPID.
+ */
+class FOFUtilsIniParser
+{
+	/**
+	 * Parse an INI file and return an associative array.
+	 *
+	 * @param    string  $file              The file to process
+	 * @param    bool    $process_sections  True to also process INI sections
+	 *
+	 * @return   array    An associative array of sections, keys and values
+	 */
+	public static function parse_ini_file($file, $process_sections, $rawdata = false)
+	{
+		$isMoronHostFile = !function_exists('parse_ini_file');
+		$isMoronHostString = !function_exists('parse_ini_string');
+
+		if ($rawdata)
+		{
+			if ($isMoronHostString)
+			{
+				return self::parse_ini_file_php($file, $process_sections, $rawdata);
+			}
+			else
+			{
+				return parse_ini_string($file, $process_sections);
+			}
+		}
+		else
+		{
+			if ($isMoronHostFile)
+			{
+				return self::parse_ini_file_php($file, $process_sections);
+			}
+			else
+			{
+				return parse_ini_file($file, $process_sections);
+			}
+		}
+	}
+
+	/**
+	 * A PHP based INI file parser.
+	 *
+	 * Thanks to asohn ~at~ aircanopy ~dot~ net for posting this handy function on
+	 * the parse_ini_file page on http://gr.php.net/parse_ini_file
+	 *
+	 * @param    string $file             Filename to process
+	 * @param    bool   $process_sections True to also process INI sections
+	 * @param    bool   $rawdata          If true, the $file contains raw INI data, not a filename
+	 *
+	 * @return    array    An associative array of sections, keys and values
+	 */
+	static function parse_ini_file_php($file, $process_sections = false, $rawdata = false)
+	{
+		$process_sections = ($process_sections !== true) ? false : true;
+
+		if (!$rawdata)
+		{
+			$ini = file($file);
+		}
+		else
+		{
+			$file = str_replace("\r", "", $file);
+			$ini = explode("\n", $file);
+		}
+
+		if (count($ini) == 0)
+		{
+			return array();
+		}
+
+		$sections = array();
+		$values = array();
+		$result = array();
+		$globals = array();
+		$i = 0;
+		foreach ($ini as $line)
+		{
+			$line = trim($line);
+			$line = str_replace("\t", " ", $line);
+
+			// Comments
+			if (!preg_match('/^[a-zA-Z0-9[]/', $line))
+			{
+				continue;
+			}
+
+			// Sections
+			if ($line{0} == '[')
+			{
+				$tmp = explode(']', $line);
+				$sections[] = trim(substr($tmp[0], 1));
+				$i++;
+				continue;
+			}
+
+			// Key-value pair
+			$lineParts = explode('=', $line, 2);
+			if (count($lineParts) != 2)
+			{
+				continue;
+			}
+			$key = trim($lineParts[0]);
+			$value = trim($lineParts[1]);
+			unset($lineParts);
+
+			if (strstr($value, ";"))
+			{
+				$tmp = explode(';', $value);
+				if (count($tmp) == 2)
+				{
+					if ((($value{0} != '"') && ($value{0} != "'")) ||
+							preg_match('/^".*"\s*;/', $value) || preg_match('/^".*;[^"]*$/', $value) ||
+							preg_match("/^'.*'\s*;/", $value) || preg_match("/^'.*;[^']*$/", $value)
+					)
+					{
+						$value = $tmp[0];
+					}
+				}
+				else
+				{
+					if ($value{0} == '"')
+					{
+						$value = preg_replace('/^"(.*)".*/', '$1', $value);
+					}
+					elseif ($value{0} == "'")
+					{
+						$value = preg_replace("/^'(.*)'.*/", '$1', $value);
+					}
+					else
+					{
+						$value = $tmp[0];
+					}
+				}
+			}
+			$value = trim($value);
+			$value = trim($value, "'\"");
+
+			if ($i == 0)
+			{
+				if (substr($line, -1, 2) == '[]')
+				{
+					$globals[$key][] = $value;
+				}
+				else
+				{
+					$globals[$key] = $value;
+				}
+			}
+			else
+			{
+				if (substr($line, -1, 2) == '[]')
+				{
+					$values[$i - 1][$key][] = $value;
+				}
+				else
+				{
+					$values[$i - 1][$key] = $value;
+				}
+			}
+		}
+
+		for ($j = 0; $j < $i; $j++)
+		{
+			if ($process_sections === true)
+			{
+				if (isset($sections[$j]) && isset($values[$j]))
+				{
+					$result[$sections[$j]] = $values[$j];
+				}
+			}
+			else
+			{
+				if (isset($values[$j]))
+				{
+					$result[] = $values[$j];
+				}
+			}
+		}
+
+		return $result + $globals;
+	}
+} 
\ No newline at end of file
diff --git a/core/libraries/fof/utils/installscript/installscript.php b/core/libraries/fof/utils/installscript/installscript.php
new file mode 100644
index 00000000..435b966a
--- /dev/null
+++ b/core/libraries/fof/utils/installscript/installscript.php
@@ -0,0 +1,2399 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+JLoader::import('joomla.filesystem.folder');
+JLoader::import('joomla.filesystem.file');
+JLoader::import('joomla.installer.installer');
+JLoader::import('joomla.utilities.date');
+
+/**
+ * A helper class which you can use to create component installation scripts
+ */
+abstract class FOFUtilsInstallscript
+{
+	/**
+	 * The component's name
+	 *
+	 * @var   string
+	 */
+	protected $componentName = 'com_foobar';
+
+	/**
+	 * The title of the component (printed on installation and uninstallation messages)
+	 *
+	 * @var string
+	 */
+	protected $componentTitle = 'Foobar Component';
+
+	/**
+	 * The list of extra modules and plugins to install on component installation / update and remove on component
+	 * uninstallation.
+	 *
+	 * @var   array
+	 */
+	protected $installation_queue = array(
+		// modules => { (folder) => { (module) => { (position), (published) } }* }*
+		'modules' => array(
+			'admin' => array(),
+			'site'  => array()
+		),
+		// plugins => { (folder) => { (element) => (published) }* }*
+		'plugins' => array(
+			'system' => array(),
+		)
+	);
+
+	/**
+	 * The list of obsolete extra modules and plugins to uninstall on component upgrade / installation.
+	 *
+	 * @var array
+	 */
+	protected $uninstallation_queue = array(
+		// modules => { (folder) => { (module) }* }*
+		'modules' => array(
+			'admin' => array(),
+			'site'  => array()
+		),
+		// plugins => { (folder) => { (element) }* }*
+		'plugins' => array(
+			'system' => array(),
+		)
+	);
+
+	/**
+	 * Obsolete files and folders to remove from the free version only. This is used when you move a feature from the
+	 * free version of your extension to its paid version. If you don't have such a distinction you can ignore this.
+	 *
+	 * @var   array
+	 */
+	protected $removeFilesFree = array(
+		'files'   => array(
+			// Use pathnames relative to your site's root, e.g.
+			// 'administrator/components/com_foobar/helpers/whatever.php'
+		),
+		'folders' => array(
+			// Use pathnames relative to your site's root, e.g.
+			// 'administrator/components/com_foobar/baz'
+		)
+	);
+
+	/**
+	 * Obsolete files and folders to remove from both paid and free releases. This is used when you refactor code and
+	 * some files inevitably become obsolete and need to be removed.
+	 *
+	 * @var   array
+	 */
+	protected $removeFilesAllVersions = array(
+		'files'   => array(
+			// Use pathnames relative to your site's root, e.g.
+			// 'administrator/components/com_foobar/helpers/whatever.php'
+		),
+		'folders' => array(
+			// Use pathnames relative to your site's root, e.g.
+			// 'administrator/components/com_foobar/baz'
+		)
+	);
+
+	/**
+	 * A list of scripts to be copied to the "cli" directory of the site
+	 *
+	 * @var   array
+	 */
+	protected $cliScriptFiles = array(
+		// Use just the filename, e.g.
+		// 'my-cron-script.php'
+	);
+
+	/**
+	 * The path inside your package where cli scripts are stored
+	 *
+	 * @var   string
+	 */
+	protected $cliSourcePath = 'cli';
+
+	/**
+	 * The path inside your package where FOF is stored
+	 *
+	 * @var   string
+	 */
+	protected $fofSourcePath = 'fof';
+
+	/**
+	 * The path inside your package where Akeeba Strapper is stored
+	 *
+	 * @var   string
+	 */
+	protected $strapperSourcePath = 'strapper';
+
+	/**
+	 * The path inside your package where extra modules are stored
+	 *
+	 * @var   string
+	 */
+	protected $modulesSourcePath = 'modules';
+
+	/**
+	 * The path inside your package where extra plugins are stored
+	 *
+	 * @var   string
+	 */
+	protected $pluginsSourcePath = 'plugins';
+
+	/**
+	 * Is the schemaXmlPath class variable a relative path? If set to true the schemaXmlPath variable contains a path
+	 * relative to the component's back-end directory. If set to false the schemaXmlPath variable contains an absolute
+	 * filesystem path.
+	 *
+	 * @var   boolean
+	 */
+	protected $schemaXmlPathRelative = true;
+
+	/**
+	 * The path where the schema XML files are stored. Its contents depend on the schemaXmlPathRelative variable above
+	 * true        => schemaXmlPath contains a path relative to the component's back-end directory
+	 * false    => schemaXmlPath contains an absolute filesystem path
+	 *
+	 * @var string
+	 */
+	protected $schemaXmlPath = 'sql/xml';
+
+	/**
+	 * The minimum PHP version required to install this extension
+	 *
+	 * @var   string
+	 */
+	protected $minimumPHPVersion = '5.3.3';
+
+	/**
+	 * The minimum Joomla! version required to install this extension
+	 *
+	 * @var   string
+	 */
+	protected $minimumJoomlaVersion = '2.5.6';
+
+	/**
+	 * The maximum Joomla! version this extension can be installed on
+	 *
+	 * @var   string
+	 */
+	protected $maximumJoomlaVersion = '3.9.99';
+
+	/**
+	 * Is this the paid version of the extension? This only determines which files / extensions will be removed.
+	 *
+	 * @var   boolean
+	 */
+	protected $isPaid = false;
+
+	/**
+	 * Post-installation message definitions for Joomla! 3.2 or later.
+	 *
+	 * This array contains the message definitions for the Post-installation Messages component added in Joomla! 3.2 and
+	 * later versions. Each element is also a hashed array. For the keys used in these message definitions please
+	 * @see FOFUtilsInstallscript::addPostInstallationMessage
+	 *
+	 * @var array
+	 */
+	protected $postInstallationMessages = array();
+
+	/**
+	 * Joomla! pre-flight event. This runs before Joomla! installs or updates the component. This is our last chance to
+	 * tell Joomla! if it should abort the installation.
+	 *
+	 * @param   string     $type   Installation type (install, update, discover_install)
+	 * @param   JInstaller $parent Parent object
+	 *
+	 * @return  boolean  True to let the installation proceed, false to halt the installation
+	 */
+	public function preflight($type, $parent)
+	{
+		// Check the minimum PHP version
+		if (!empty($this->minimumPHPVersion))
+		{
+			if (defined('PHP_VERSION'))
+			{
+				$version = PHP_VERSION;
+			}
+			elseif (function_exists('phpversion'))
+			{
+				$version = phpversion();
+			}
+			else
+			{
+				$version = '5.0.0'; // all bets are off!
+			}
+
+			if (!version_compare($version, $this->minimumPHPVersion, 'ge'))
+			{
+				$msg = "<p>You need PHP $this->minimumPHPVersion or later to install this component</p>";
+
+				if (version_compare(JVERSION, '3.0', 'gt'))
+				{
+					JLog::add($msg, JLog::WARNING, 'jerror');
+				}
+				else
+				{
+					JError::raiseWarning(100, $msg);
+				}
+
+				return false;
+			}
+		}
+
+		// Check the minimum Joomla! version
+		if (!empty($this->minimumJoomlaVersion) && !version_compare(JVERSION, $this->minimumJoomlaVersion, 'ge'))
+		{
+			$msg = "<p>You need Joomla! $this->minimumJoomlaVersion or later to install this component</p>";
+
+			if (version_compare(JVERSION, '3.0', 'gt'))
+			{
+				JLog::add($msg, JLog::WARNING, 'jerror');
+			}
+			else
+			{
+				JError::raiseWarning(100, $msg);
+			}
+
+			return false;
+		}
+
+		// Check the maximum Joomla! version
+		if (!empty($this->maximumJoomlaVersion) && !version_compare(JVERSION, $this->maximumJoomlaVersion, 'le'))
+		{
+			$msg = "<p>You need Joomla! $this->maximumJoomlaVersion or earlier to install this component</p>";
+
+			if (version_compare(JVERSION, '3.0', 'gt'))
+			{
+				JLog::add($msg, JLog::WARNING, 'jerror');
+			}
+			else
+			{
+				JError::raiseWarning(100, $msg);
+			}
+
+			return false;
+		}
+
+		// Always reset the OPcache if it's enabled. Otherwise there's a good chance the server will not know we are
+		// replacing .php scripts. This is a major concern since PHP 5.5 included and enabled OPcache by default.
+		if (function_exists('opcache_reset'))
+		{
+			opcache_reset();
+		}
+
+		// Workarounds for JInstaller issues
+		if (in_array($type, array('install', 'discover_install')))
+		{
+			// Bugfix for "Database function returned no error"
+			$this->bugfixDBFunctionReturnedNoError();
+		}
+		else
+		{
+			// Bugfix for "Can not build admin menus"
+			$this->bugfixCantBuildAdminMenus();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Runs after install, update or discover_update. In other words, it executes after Joomla! has finished installing
+	 * or updating your component. This is the last chance you've got to perform any additional installations, clean-up,
+	 * database updates and similar housekeeping functions.
+	 *
+	 * @param   string     $type   install, update or discover_update
+	 * @param   JInstaller $parent Parent object
+	 */
+	public function postflight($type, $parent)
+	{
+		// Install or update database
+		$dbInstaller = new FOFDatabaseInstaller(array(
+			'dbinstaller_directory' =>
+				($this->schemaXmlPathRelative ? JPATH_ADMINISTRATOR . '/components/' . $this->componentName : '') . '/' .
+				$this->schemaXmlPath
+		));
+		$dbInstaller->updateSchema();
+
+		// Install subextensions
+		$status = $this->installSubextensions($parent);
+
+		// Install FOF
+		$fofInstallationStatus = $this->installFOF($parent);
+
+		// Install Akeeba Straper
+		$strapperInstallationStatus = $this->installStrapper($parent);
+
+		// Make sure menu items are installed
+		$this->_createAdminMenus($parent);
+
+		// Make sure menu items are published (surprise goal in the 92' by JInstaller wins the cup for "most screwed up
+		// bug in the history of Joomla!")
+		$this->_reallyPublishAdminMenuItems($parent);
+
+		// Which files should I remove?
+		if ($this->isPaid)
+		{
+			// This is the paid version, only remove the removeFilesAllVersions files
+			$removeFiles = $this->removeFilesAllVersions;
+		}
+		else
+		{
+			// This is the free version, remove the removeFilesAllVersions and removeFilesFree files
+			$removeFiles = array('files' => array(), 'folders' => array());
+
+			if (isset($this->removeFilesAllVersions['files']))
+			{
+				if (isset($this->removeFilesFree['files']))
+				{
+					$removeFiles['files'] = array_merge($this->removeFilesAllVersions['files'], $this->removeFilesFree['files']);
+				}
+				else
+				{
+					$removeFiles['files'] = $this->removeFilesAllVersions['files'];
+				}
+			}
+			elseif (isset($this->removeFilesFree['files']))
+			{
+				$removeFiles['files'] = $this->removeFilesFree['files'];
+			}
+
+			if (isset($this->removeFilesAllVersions['folders']))
+			{
+				if (isset($this->removeFilesFree['folders']))
+				{
+					$removeFiles['folders'] = array_merge($this->removeFilesAllVersions['folders'], $this->removeFilesFree['folders']);
+				}
+				else
+				{
+					$removeFiles['folders'] = $this->removeFilesAllVersions['folders'];
+				}
+			}
+			elseif (isset($this->removeFilesFree['folders']))
+			{
+				$removeFiles['folders'] = $this->removeFilesFree['folders'];
+			}
+		}
+
+		// Remove obsolete files and folders
+		$this->removeFilesAndFolders($removeFiles);
+
+		// Copy the CLI files (if any)
+		$this->copyCliFiles($parent);
+
+		// Show the post-installation page
+		$this->renderPostInstallation($status, $fofInstallationStatus, $strapperInstallationStatus, $parent);
+
+		// Uninstall obsolete subextensions
+		$uninstall_status = $this->uninstallObsoleteSubextensions($parent);
+
+		// Clear the FOF cache
+		$platform = FOFPlatform::getInstance();
+
+		if (method_exists($platform, 'clearCache'))
+		{
+			FOFPlatform::getInstance()->clearCache();
+		}
+
+		// Make sure the Joomla! menu structure is correct
+		$this->_rebuildMenu();
+
+		// Add post-installation messages on Joomla! 3.2 and later
+		$this->_applyPostInstallationMessages();
+	}
+
+	/**
+	 * Runs on uninstallation
+	 *
+	 * @param   JInstaller $parent The parent object
+	 */
+	public function uninstall($parent)
+	{
+		// Uninstall database
+		$dbInstaller = new FOFDatabaseInstaller(array(
+			'dbinstaller_directory' =>
+				($this->schemaXmlPathRelative ? JPATH_ADMINISTRATOR . '/components/' . $this->componentName : '') . '/' .
+				$this->schemaXmlPath
+		));
+		$dbInstaller->removeSchema();
+
+		// Uninstall modules and plugins
+		$status = $this->uninstallSubextensions($parent);
+
+		// Uninstall post-installation messages on Joomla! 3.2 and later
+		$this->uninstallPostInstallationMessages();
+
+		// Show the post-uninstallation page
+		$this->renderPostUninstallation($status, $parent);
+	}
+
+	/**
+	 * Copies the CLI scripts into Joomla!'s cli directory
+	 *
+	 * @param JInstaller $parent
+	 */
+	protected function copyCliFiles($parent)
+	{
+		$src = $parent->getParent()->getPath('source');
+
+		$cliPath = JPATH_ROOT . '/cli';
+
+		if (!JFolder::exists($cliPath))
+		{
+			JFolder::create($cliPath);
+		}
+
+		foreach ($this->cliScriptFiles as $script)
+		{
+			if (JFile::exists($cliPath . '/' . $script))
+			{
+				JFile::delete($cliPath . '/' . $script);
+			}
+
+			if (JFile::exists($src . '/' . $this->cliSourcePath . '/' . $script))
+			{
+				JFile::copy($src . '/' . $this->cliSourcePath . '/' . $script, $cliPath . '/' . $script);
+			}
+		}
+	}
+
+	/**
+	 * Renders the message after installing or upgrading the component
+	 */
+	protected function renderPostInstallation($status, $fofInstallationStatus, $strapperInstallationStatus, $parent)
+	{
+		$rows = 0;
+		?>
+		<table class="adminlist table table-striped" width="100%">
+			<thead>
+			<tr>
+				<th class="title" colspan="2">Extension</th>
+				<th width="30%">Status</th>
+			</tr>
+			</thead>
+			<tfoot>
+			<tr>
+				<td colspan="3"></td>
+			</tr>
+			</tfoot>
+			<tbody>
+			<tr class="row<?php echo($rows++ % 2); ?>">
+				<td class="key" colspan="2"><?php echo $this->componentTitle ?></td>
+				<td><strong style="color: green">Installed</strong></td>
+			</tr>
+			<?php if ($fofInstallationStatus['required']): ?>
+				<tr class="row<?php echo($rows++ % 2); ?>">
+					<td class="key" colspan="2">
+						<strong>Framework on Framework (FOF) <?php echo $fofInstallationStatus['version'] ?></strong>
+						[<?php echo $fofInstallationStatus['date'] ?>]
+					</td>
+					<td><strong>
+							<span
+								style="color: <?php echo $fofInstallationStatus['required'] ? ($fofInstallationStatus['installed'] ? 'green' : 'red') : '#660' ?>; font-weight: bold;">
+		<?php echo $fofInstallationStatus['required'] ? ($fofInstallationStatus['installed'] ? 'Installed' : 'Not Installed') : 'Already up-to-date'; ?>
+							</span>
+						</strong></td>
+				</tr>
+			<?php endif; ?>
+			<?php if ($strapperInstallationStatus['required']): ?>
+				<tr class="row<?php echo($rows++ % 2); ?>">
+					<td class="key" colspan="2">
+						<strong>Akeeba Strapper <?php echo $strapperInstallationStatus['version'] ?></strong>
+						[<?php echo $strapperInstallationStatus['date'] ?>]
+					</td>
+					<td><strong>
+							<span
+								style="color: <?php echo $strapperInstallationStatus['required'] ? ($strapperInstallationStatus['installed'] ? 'green' : 'red') : '#660' ?>; font-weight: bold;">
+				<?php echo $strapperInstallationStatus['required'] ? ($strapperInstallationStatus['installed'] ? 'Installed' : 'Not Installed') : 'Already up-to-date'; ?>
+							</span>
+						</strong></td>
+				</tr>
+			<?php endif; ?>
+			<?php if (count($status->modules)) : ?>
+				<tr>
+					<th>Module</th>
+					<th>Client</th>
+					<th></th>
+				</tr>
+				<?php foreach ($status->modules as $module) : ?>
+					<tr class="row<?php echo($rows++ % 2); ?>">
+						<td class="key"><?php echo $module['name']; ?></td>
+						<td class="key"><?php echo ucfirst($module['client']); ?></td>
+						<td><strong
+								style="color: <?php echo ($module['result']) ? "green" : "red" ?>"><?php echo ($module['result']) ? 'Installed' : 'Not installed'; ?></strong>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
+			<?php if (count($status->plugins)) : ?>
+				<tr>
+					<th>Plugin</th>
+					<th>Group</th>
+					<th></th>
+				</tr>
+				<?php foreach ($status->plugins as $plugin) : ?>
+					<tr class="row<?php echo($rows++ % 2); ?>">
+						<td class="key"><?php echo ucfirst($plugin['name']); ?></td>
+						<td class="key"><?php echo ucfirst($plugin['group']); ?></td>
+						<td><strong
+								style="color: <?php echo ($plugin['result']) ? "green" : "red" ?>"><?php echo ($plugin['result']) ? 'Installed' : 'Not installed'; ?></strong>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
+			</tbody>
+		</table>
+	<?php
+	}
+
+	/**
+	 * Renders the message after uninstalling the component
+	 */
+	protected function renderPostUninstallation($status, $parent)
+	{
+		$rows = 1;
+		?>
+		<table class="adminlist table table-striped" width="100%">
+			<thead>
+			<tr>
+				<th class="title" colspan="2"><?php echo JText::_('Extension'); ?></th>
+				<th width="30%"><?php echo JText::_('Status'); ?></th>
+			</tr>
+			</thead>
+			<tfoot>
+			<tr>
+				<td colspan="3"></td>
+			</tr>
+			</tfoot>
+			<tbody>
+			<tr class="row<?php echo($rows++ % 2); ?>">
+				<td class="key" colspan="2"><?php echo $this->componentTitle; ?></td>
+				<td><strong style="color: green">Removed</strong></td>
+			</tr>
+			<?php if (count($status->modules)) : ?>
+				<tr>
+					<th>Module</th>
+					<th>Client</th>
+					<th></th>
+				</tr>
+				<?php foreach ($status->modules as $module) : ?>
+					<tr class="row<?php echo($rows++ % 2); ?>">
+						<td class="key"><?php echo $module['name']; ?></td>
+						<td class="key"><?php echo ucfirst($module['client']); ?></td>
+						<td><strong
+								style="color: <?php echo ($module['result']) ? "green" : "red" ?>"><?php echo ($module['result']) ? 'Removed' : 'Not removed'; ?></strong>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
+			<?php if (count($status->plugins)) : ?>
+				<tr>
+					<th>Plugin</th>
+					<th>Group</th>
+					<th></th>
+				</tr>
+				<?php foreach ($status->plugins as $plugin) : ?>
+					<tr class="row<?php echo($rows++ % 2); ?>">
+						<td class="key"><?php echo ucfirst($plugin['name']); ?></td>
+						<td class="key"><?php echo ucfirst($plugin['group']); ?></td>
+						<td><strong
+								style="color: <?php echo ($plugin['result']) ? "green" : "red" ?>"><?php echo ($plugin['result']) ? 'Removed' : 'Not removed'; ?></strong>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+			<?php endif; ?>
+			</tbody>
+		</table>
+	<?php
+	}
+
+	/**
+	 * Bugfix for "DB function returned no error"
+	 */
+	protected function bugfixDBFunctionReturnedNoError()
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// Fix broken #__assets records
+		$query = $db->getQuery(true);
+		$query->select('id')
+			->from('#__assets')
+			->where($db->qn('name') . ' = ' . $db->q($this->componentName));
+		$db->setQuery($query);
+
+		try
+		{
+			$ids = $db->loadColumn();
+		}
+		catch (Exception $exc)
+		{
+			return;
+		}
+
+		if (!empty($ids))
+		{
+			foreach ($ids as $id)
+			{
+				$query = $db->getQuery(true);
+				$query->delete('#__assets')
+					->where($db->qn('id') . ' = ' . $db->q($id));
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (Exception $exc)
+				{
+					// Nothing
+				}
+			}
+		}
+
+		// Fix broken #__extensions records
+		$query = $db->getQuery(true);
+		$query->select('extension_id')
+			->from('#__extensions')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->componentName));
+		$db->setQuery($query);
+		$ids = $db->loadColumn();
+
+		if (!empty($ids))
+		{
+			foreach ($ids as $id)
+			{
+				$query = $db->getQuery(true);
+				$query->delete('#__extensions')
+					->where($db->qn('extension_id') . ' = ' . $db->q($id));
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (Exception $exc)
+				{
+					// Nothing
+				}
+			}
+		}
+
+		// Fix broken #__menu records
+		$query = $db->getQuery(true);
+		$query->select('id')
+			->from('#__menu')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('menutype') . ' = ' . $db->q('main'))
+			->where($db->qn('link') . ' LIKE ' . $db->q('index.php?option=' . $this->componentName));
+		$db->setQuery($query);
+		$ids = $db->loadColumn();
+
+		if (!empty($ids))
+		{
+			foreach ($ids as $id)
+			{
+				$query = $db->getQuery(true);
+				$query->delete('#__menu')
+					->where($db->qn('id') . ' = ' . $db->q($id));
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (Exception $exc)
+				{
+					// Nothing
+				}
+			}
+		}
+	}
+
+	/**
+	 * Joomla! 1.6+ bugfix for "Can not build admin menus"
+	 */
+	protected function bugfixCantBuildAdminMenus()
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// If there are multiple #__extensions record, keep one of them
+		$query = $db->getQuery(true);
+		$query->select('extension_id')
+			->from('#__extensions')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->componentName));
+		$db->setQuery($query);
+
+		try
+		{
+			$ids = $db->loadColumn();
+		}
+		catch (Exception $exc)
+		{
+			return;
+		}
+
+
+		if (count($ids) > 1)
+		{
+			asort($ids);
+			$extension_id = array_shift($ids); // Keep the oldest id
+
+			foreach ($ids as $id)
+			{
+				$query = $db->getQuery(true);
+				$query->delete('#__extensions')
+					->where($db->qn('extension_id') . ' = ' . $db->q($id));
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (Exception $exc)
+				{
+					// Nothing
+				}
+			}
+		}
+
+		// If there are multiple assets records, delete all except the oldest one
+		$query = $db->getQuery(true);
+		$query->select('id')
+			->from('#__assets')
+			->where($db->qn('name') . ' = ' . $db->q($this->componentName));
+		$db->setQuery($query);
+		$ids = $db->loadObjectList();
+
+		if (count($ids) > 1)
+		{
+			asort($ids);
+			$asset_id = array_shift($ids); // Keep the oldest id
+
+			foreach ($ids as $id)
+			{
+				$query = $db->getQuery(true);
+				$query->delete('#__assets')
+					->where($db->qn('id') . ' = ' . $db->q($id));
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (Exception $exc)
+				{
+					// Nothing
+				}
+			}
+		}
+
+		// Remove #__menu records for good measure! –– I think this is not necessary and causes the menu item to
+		// disappear on extension update.
+		/**
+		$query = $db->getQuery(true);
+		$query->select('id')
+			->from('#__menu')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('menutype') . ' = ' . $db->q('main'))
+			->where($db->qn('link') . ' LIKE ' . $db->q('index.php?option=' . $this->componentName));
+		$db->setQuery($query);
+
+		try
+		{
+			$ids1 = $db->loadColumn();
+		}
+		catch (Exception $exc)
+		{
+			$ids1 = array();
+		}
+
+		if (empty($ids1))
+		{
+			$ids1 = array();
+		}
+
+		$query = $db->getQuery(true);
+		$query->select('id')
+			->from('#__menu')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('menutype') . ' = ' . $db->q('main'))
+			->where($db->qn('link') . ' LIKE ' . $db->q('index.php?option=' . $this->componentName . '&%'));
+		$db->setQuery($query);
+
+		try
+		{
+			$ids2 = $db->loadColumn();
+		}
+		catch (Exception $exc)
+		{
+			$ids2 = array();
+		}
+
+		if (empty($ids2))
+		{
+			$ids2 = array();
+		}
+
+		$ids = array_merge($ids1, $ids2);
+
+		if (!empty($ids))
+		{
+			foreach ($ids as $id)
+			{
+				$query = $db->getQuery(true);
+				$query->delete('#__menu')
+					->where($db->qn('id') . ' = ' . $db->q($id));
+				$db->setQuery($query);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (Exception $exc)
+				{
+					// Nothing
+				}
+			}
+		}
+		/**/
+	}
+
+	/**
+	 * Installs subextensions (modules, plugins) bundled with the main extension
+	 *
+	 * @param JInstaller $parent
+	 *
+	 * @return JObject The subextension installation status
+	 */
+	protected function installSubextensions($parent)
+	{
+		$src = $parent->getParent()->getPath('source');
+
+		$db = FOFPlatform::getInstance()->getDbo();;
+
+		$status = new JObject();
+		$status->modules = array();
+		$status->plugins = array();
+
+		// Modules installation
+		if (isset($this->installation_queue['modules']) && count($this->installation_queue['modules']))
+		{
+			foreach ($this->installation_queue['modules'] as $folder => $modules)
+			{
+				if (count($modules))
+				{
+					foreach ($modules as $module => $modulePreferences)
+					{
+						// Install the module
+						if (empty($folder))
+						{
+							$folder = 'site';
+						}
+
+						$path = "$src/" . $this->modulesSourcePath . "/$folder/$module";
+
+						if (!is_dir($path))
+						{
+							$path = "$src/" . $this->modulesSourcePath . "/$folder/mod_$module";
+						}
+
+						if (!is_dir($path))
+						{
+							$path = "$src/" . $this->modulesSourcePath . "/$module";
+						}
+
+						if (!is_dir($path))
+						{
+							$path = "$src/" . $this->modulesSourcePath . "/mod_$module";
+						}
+
+						if (!is_dir($path))
+						{
+							continue;
+						}
+
+						// Was the module already installed?
+						$sql = $db->getQuery(true)
+							->select('COUNT(*)')
+							->from('#__modules')
+							->where($db->qn('module') . ' = ' . $db->q('mod_' . $module));
+						$db->setQuery($sql);
+
+						try
+						{
+							$count = $db->loadResult();
+						}
+						catch (Exception $exc)
+						{
+							$count = 0;
+						}
+
+						$installer = new JInstaller;
+						$result = $installer->install($path);
+						$status->modules[] = array(
+							'name'   => 'mod_' . $module,
+							'client' => $folder,
+							'result' => $result
+						);
+
+						// Modify where it's published and its published state
+						if (!$count)
+						{
+							// A. Position and state
+							list($modulePosition, $modulePublished) = $modulePreferences;
+
+							$sql = $db->getQuery(true)
+								->update($db->qn('#__modules'))
+								->set($db->qn('position') . ' = ' . $db->q($modulePosition))
+								->where($db->qn('module') . ' = ' . $db->q('mod_' . $module));
+
+							if ($modulePublished)
+							{
+								$sql->set($db->qn('published') . ' = ' . $db->q('1'));
+							}
+
+							$db->setQuery($sql);
+
+							try
+							{
+								$db->execute();
+							}
+							catch (Exception $exc)
+							{
+								// Nothing
+							}
+
+							// B. Change the ordering of back-end modules to 1 + max ordering
+							if ($folder == 'admin')
+							{
+								try
+								{
+									$query = $db->getQuery(true);
+									$query->select('MAX(' . $db->qn('ordering') . ')')
+										->from($db->qn('#__modules'))
+										->where($db->qn('position') . '=' . $db->q($modulePosition));
+									$db->setQuery($query);
+									$position = $db->loadResult();
+									$position++;
+
+									$query = $db->getQuery(true);
+									$query->update($db->qn('#__modules'))
+										->set($db->qn('ordering') . ' = ' . $db->q($position))
+										->where($db->qn('module') . ' = ' . $db->q('mod_' . $module));
+									$db->setQuery($query);
+									$db->execute();
+								}
+								catch (Exception $exc)
+								{
+									// Nothing
+								}
+							}
+
+							// C. Link to all pages
+							try
+							{
+								$query = $db->getQuery(true);
+								$query->select('id')->from($db->qn('#__modules'))
+									->where($db->qn('module') . ' = ' . $db->q('mod_' . $module));
+								$db->setQuery($query);
+								$moduleid = $db->loadResult();
+
+								$query = $db->getQuery(true);
+								$query->select('*')->from($db->qn('#__modules_menu'))
+									->where($db->qn('moduleid') . ' = ' . $db->q($moduleid));
+								$db->setQuery($query);
+								$assignments = $db->loadObjectList();
+								$isAssigned = !empty($assignments);
+
+								if (!$isAssigned)
+								{
+									$o = (object)array(
+										'moduleid' => $moduleid,
+										'menuid'   => 0
+									);
+									$db->insertObject('#__modules_menu', $o);
+								}
+							}
+							catch (Exception $exc)
+							{
+								// Nothing
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Plugins installation
+		if (isset($this->installation_queue['plugins']) && count($this->installation_queue['plugins']))
+		{
+			foreach ($this->installation_queue['plugins'] as $folder => $plugins)
+			{
+				if (count($plugins))
+				{
+					foreach ($plugins as $plugin => $published)
+					{
+						$path = "$src/" . $this->pluginsSourcePath . "/$folder/$plugin";
+
+						if (!is_dir($path))
+						{
+							$path = "$src/" . $this->pluginsSourcePath . "/$folder/plg_$plugin";
+						}
+
+						if (!is_dir($path))
+						{
+							$path = "$src/" . $this->pluginsSourcePath . "/$plugin";
+						}
+
+						if (!is_dir($path))
+						{
+							$path = "$src/" . $this->pluginsSourcePath . "/plg_$plugin";
+						}
+
+						if (!is_dir($path))
+						{
+							continue;
+						}
+
+						// Was the plugin already installed?
+						$query = $db->getQuery(true)
+							->select('COUNT(*)')
+							->from($db->qn('#__extensions'))
+							->where($db->qn('element') . ' = ' . $db->q($plugin))
+							->where($db->qn('folder') . ' = ' . $db->q($folder));
+						$db->setQuery($query);
+
+						try
+						{
+							$count = $db->loadResult();
+						}
+						catch (Exception $exc)
+						{
+							$count = 0;
+						}
+
+						$installer = new JInstaller;
+						$result = $installer->install($path);
+
+						$status->plugins[] = array('name' => 'plg_' . $plugin, 'group' => $folder, 'result' => $result);
+
+						if ($published && !$count)
+						{
+							$query = $db->getQuery(true)
+								->update($db->qn('#__extensions'))
+								->set($db->qn('enabled') . ' = ' . $db->q('1'))
+								->where($db->qn('element') . ' = ' . $db->q($plugin))
+								->where($db->qn('folder') . ' = ' . $db->q($folder));
+							$db->setQuery($query);
+
+							try
+							{
+								$db->execute();
+							}
+							catch (Exception $exc)
+							{
+								// Nothing
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Clear com_modules and com_plugins cache (needed when we alter module/plugin state)
+		FOFUtilsCacheCleaner::clearPluginsAndModulesCache();
+
+		return $status;
+	}
+
+	/**
+	 * Uninstalls subextensions (modules, plugins) bundled with the main extension
+	 *
+	 * @param   JInstaller $parent The parent object
+	 *
+	 * @return  stdClass  The subextension uninstallation status
+	 */
+	protected function uninstallSubextensions($parent)
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		$status = new stdClass();
+		$status->modules = array();
+		$status->plugins = array();
+
+		$src = $parent->getParent()->getPath('source');
+
+		// Modules uninstallation
+		if (isset($this->installation_queue['modules']) && count($this->installation_queue['modules']))
+		{
+			foreach ($this->installation_queue['modules'] as $folder => $modules)
+			{
+				if (count($modules))
+				{
+					foreach ($modules as $module => $modulePreferences)
+					{
+						// Find the module ID
+						$sql = $db->getQuery(true)
+							->select($db->qn('extension_id'))
+							->from($db->qn('#__extensions'))
+							->where($db->qn('element') . ' = ' . $db->q('mod_' . $module))
+							->where($db->qn('type') . ' = ' . $db->q('module'));
+						$db->setQuery($sql);
+
+						try
+						{
+							$id = $db->loadResult();
+						}
+						catch (Exception $exc)
+						{
+							$id = 0;
+						}
+
+						// Uninstall the module
+						if ($id)
+						{
+							$installer = new JInstaller;
+							$result = $installer->uninstall('module', $id, 1);
+							$status->modules[] = array(
+								'name'   => 'mod_' . $module,
+								'client' => $folder,
+								'result' => $result
+							);
+						}
+					}
+				}
+			}
+		}
+
+		// Plugins uninstallation
+		if (isset($this->installation_queue['plugins']) && count($this->installation_queue['plugins']))
+		{
+			foreach ($this->installation_queue['plugins'] as $folder => $plugins)
+			{
+				if (count($plugins))
+				{
+					foreach ($plugins as $plugin => $published)
+					{
+						$sql = $db->getQuery(true)
+							->select($db->qn('extension_id'))
+							->from($db->qn('#__extensions'))
+							->where($db->qn('type') . ' = ' . $db->q('plugin'))
+							->where($db->qn('element') . ' = ' . $db->q($plugin))
+							->where($db->qn('folder') . ' = ' . $db->q($folder));
+						$db->setQuery($sql);
+
+						try
+						{
+							$id = $db->loadResult();
+						}
+						catch (Exception $exc)
+						{
+							$id = 0;
+						}
+
+						if ($id)
+						{
+							$installer = new JInstaller;
+							$result = $installer->uninstall('plugin', $id, 1);
+							$status->plugins[] = array(
+								'name'   => 'plg_' . $plugin,
+								'group'  => $folder,
+								'result' => $result
+							);
+						}
+					}
+				}
+			}
+		}
+
+		// Clear com_modules and com_plugins cache (needed when we alter module/plugin state)
+		FOFUtilsCacheCleaner::clearPluginsAndModulesCache();
+
+		return $status;
+	}
+
+	/**
+	 * Removes obsolete files and folders
+	 *
+	 * @param   array $removeList The files and directories to remove
+	 */
+	protected function removeFilesAndFolders($removeList)
+	{
+		// Remove files
+		if (isset($removeList['files']) && !empty($removeList['files']))
+		{
+			foreach ($removeList['files'] as $file)
+			{
+				$f = JPATH_ROOT . '/' . $file;
+
+				if (!JFile::exists($f))
+				{
+					continue;
+				}
+
+				JFile::delete($f);
+			}
+		}
+
+		// Remove folders
+		if (isset($removeList['folders']) && !empty($removeList['folders']))
+		{
+			foreach ($removeList['folders'] as $folder)
+			{
+				$f = JPATH_ROOT . '/' . $folder;
+
+				if (!JFolder::exists($f))
+				{
+					continue;
+				}
+
+				JFolder::delete($f);
+			}
+		}
+	}
+
+	/**
+	 * Installs FOF if necessary
+	 *
+	 * @param   JInstaller $parent The parent object
+	 *
+	 * @return  array  The installation status
+	 */
+	protected function installFOF($parent)
+	{
+		// Get the source path
+		$src = $parent->getParent()->getPath('source');
+		$source = $src . '/' . $this->fofSourcePath;
+
+		if (!JFolder::exists($source))
+		{
+			return array(
+				'required'  => false,
+				'installed' => false,
+				'version'   => '0.0.0',
+				'date'      => '2011-01-01',
+			);
+		}
+
+		// Get the target path
+		if (!defined('JPATH_LIBRARIES'))
+		{
+			$target = JPATH_ROOT . '/libraries/f0f';
+		}
+		else
+		{
+			$target = JPATH_LIBRARIES . '/f0f';
+		}
+
+		// Do I have to install FOF?
+		$haveToInstallFOF = false;
+
+		if (!JFolder::exists($target))
+		{
+			// FOF is not installed; install now
+			$haveToInstallFOF = true;
+		}
+		else
+		{
+			// FOF is already installed; check the version
+			$fofVersion = array();
+
+			if (JFile::exists($target . '/version.txt'))
+			{
+				$rawData = JFile::read($target . '/version.txt');
+				$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+				$info = explode("\n", $rawData);
+				$fofVersion['installed'] = array(
+					'version' => trim($info[0]),
+					'date'    => new JDate(trim($info[1]))
+				);
+			}
+			else
+			{
+				$fofVersion['installed'] = array(
+					'version' => '0.0',
+					'date'    => new JDate('2011-01-01')
+				);
+			}
+
+			$rawData = @file_get_contents($source . '/version.txt');
+			$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+			$info = explode("\n", $rawData);
+
+			$fofVersion['package'] = array(
+				'version' => trim($info[0]),
+				'date'    => new JDate(trim($info[1]))
+			);
+
+			$haveToInstallFOF = $fofVersion['package']['date']->toUNIX() > $fofVersion['installed']['date']->toUNIX();
+		}
+
+		$installedFOF = false;
+
+		if ($haveToInstallFOF)
+		{
+			$versionSource = 'package';
+			$installer = new JInstaller;
+			$installedFOF = $installer->install($source);
+		}
+		else
+		{
+			$versionSource = 'installed';
+		}
+
+		if (!isset($fofVersion))
+		{
+			$fofVersion = array();
+
+			if (JFile::exists($target . '/version.txt'))
+			{
+				$rawData = @file_get_contents($source . '/version.txt');
+				$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+				$info = explode("\n", $rawData);
+				$fofVersion['installed'] = array(
+					'version' => trim($info[0]),
+					'date'    => new JDate(trim($info[1]))
+				);
+			}
+			else
+			{
+				$fofVersion['installed'] = array(
+					'version' => '0.0',
+					'date'    => new JDate('2011-01-01')
+				);
+			}
+
+			$rawData = @file_get_contents($source . '/version.txt');
+			$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+			$info = explode("\n", $rawData);
+
+			$fofVersion['package'] = array(
+				'version' => trim($info[0]),
+				'date'    => new JDate(trim($info[1]))
+			);
+
+			$versionSource = 'installed';
+		}
+
+		if (!($fofVersion[$versionSource]['date'] instanceof JDate))
+		{
+			$fofVersion[$versionSource]['date'] = new JDate();
+		}
+
+		return array(
+			'required'  => $haveToInstallFOF,
+			'installed' => $installedFOF,
+			'version'   => $fofVersion[$versionSource]['version'],
+			'date'      => $fofVersion[$versionSource]['date']->format('Y-m-d'),
+		);
+	}
+
+	/**
+	 * Installs Akeeba Strapper if necessary
+	 *
+	 * @param   JInstaller $parent The parent object
+	 *
+	 * @return  array  The installation status
+	 */
+	protected function installStrapper($parent)
+	{
+		$src = $parent->getParent()->getPath('source');
+		$source = $src . '/' . $this->strapperSourcePath;
+
+		$target = JPATH_ROOT . '/media/akeeba_strapper';
+
+		if (!JFolder::exists($source))
+		{
+			return array(
+				'required'  => false,
+				'installed' => false,
+				'version'   => '0.0.0',
+				'date'      => '2011-01-01',
+			);
+		}
+
+		$haveToInstallStrapper = false;
+
+		if (!JFolder::exists($target))
+		{
+			$haveToInstallStrapper = true;
+		}
+		else
+		{
+			$strapperVersion = array();
+
+			if (JFile::exists($target . '/version.txt'))
+			{
+				$rawData = JFile::read($target . '/version.txt');
+				$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+				$info = explode("\n", $rawData);
+				$strapperVersion['installed'] = array(
+					'version' => trim($info[0]),
+					'date'    => new JDate(trim($info[1]))
+				);
+			}
+			else
+			{
+				$strapperVersion['installed'] = array(
+					'version' => '0.0',
+					'date'    => new JDate('2011-01-01')
+				);
+			}
+
+			$rawData = JFile::read($source . '/version.txt');
+			$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+			$info = explode("\n", $rawData);
+			$strapperVersion['package'] = array(
+				'version' => trim($info[0]),
+				'date'    => new JDate(trim($info[1]))
+			);
+
+			$haveToInstallStrapper = $strapperVersion['package']['date']->toUNIX() > $strapperVersion['installed']['date']->toUNIX();
+		}
+
+		$installedStraper = false;
+
+		if ($haveToInstallStrapper)
+		{
+			$versionSource = 'package';
+			$installer = new JInstaller;
+			$installedStraper = $installer->install($source);
+		}
+		else
+		{
+			$versionSource = 'installed';
+		}
+
+		if (!isset($strapperVersion))
+		{
+			$strapperVersion = array();
+
+			if (JFile::exists($target . '/version.txt'))
+			{
+				$rawData = JFile::read($target . '/version.txt');
+				$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+				$info = explode("\n", $rawData);
+				$strapperVersion['installed'] = array(
+					'version' => trim($info[0]),
+					'date'    => new JDate(trim($info[1]))
+				);
+			}
+			else
+			{
+				$strapperVersion['installed'] = array(
+					'version' => '0.0',
+					'date'    => new JDate('2011-01-01')
+				);
+			}
+
+			$rawData = JFile::read($source . '/version.txt');
+			$rawData = ($rawData === false) ? "0.0.0\n2011-01-01\n" : $rawData;
+			$info = explode("\n", $rawData);
+
+			$strapperVersion['package'] = array(
+				'version' => trim($info[0]),
+				'date'    => new JDate(trim($info[1]))
+			);
+
+			$versionSource = 'installed';
+		}
+
+		if (!($strapperVersion[$versionSource]['date'] instanceof JDate))
+		{
+			$strapperVersion[$versionSource]['date'] = new JDate();
+		}
+
+		return array(
+			'required'  => $haveToInstallStrapper,
+			'installed' => $installedStraper,
+			'version'   => $strapperVersion[$versionSource]['version'],
+			'date'      => $strapperVersion[$versionSource]['date']->format('Y-m-d'),
+		);
+	}
+
+	/**
+	 * Uninstalls obsolete subextensions (modules, plugins) bundled with the main extension
+	 *
+	 * @param   JInstaller $parent The parent object
+	 *
+	 * @return  stdClass The subextension uninstallation status
+	 */
+	protected function uninstallObsoleteSubextensions($parent)
+	{
+		JLoader::import('joomla.installer.installer');
+
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		$status = new stdClass();
+		$status->modules = array();
+		$status->plugins = array();
+
+		$src = $parent->getParent()->getPath('source');
+
+		// Modules uninstallation
+		if (isset($this->uninstallation_queue['modules']) && count($this->uninstallation_queue['modules']))
+		{
+			foreach ($this->uninstallation_queue['modules'] as $folder => $modules)
+			{
+				if (count($modules))
+				{
+					foreach ($modules as $module)
+					{
+						// Find the module ID
+						$sql = $db->getQuery(true)
+							->select($db->qn('extension_id'))
+							->from($db->qn('#__extensions'))
+							->where($db->qn('element') . ' = ' . $db->q('mod_' . $module))
+							->where($db->qn('type') . ' = ' . $db->q('module'));
+						$db->setQuery($sql);
+						$id = $db->loadResult();
+						// Uninstall the module
+						if ($id)
+						{
+							$installer = new JInstaller;
+							$result = $installer->uninstall('module', $id, 1);
+							$status->modules[] = array(
+								'name'   => 'mod_' . $module,
+								'client' => $folder,
+								'result' => $result
+							);
+						}
+					}
+				}
+			}
+		}
+
+		// Plugins uninstallation
+		if (isset($this->uninstallation_queue['plugins']) && count($this->uninstallation_queue['plugins']))
+		{
+			foreach ($this->uninstallation_queue['plugins'] as $folder => $plugins)
+			{
+				if (count($plugins))
+				{
+					foreach ($plugins as $plugin)
+					{
+						$sql = $db->getQuery(true)
+							->select($db->qn('extension_id'))
+							->from($db->qn('#__extensions'))
+							->where($db->qn('type') . ' = ' . $db->q('plugin'))
+							->where($db->qn('element') . ' = ' . $db->q($plugin))
+							->where($db->qn('folder') . ' = ' . $db->q($folder));
+						$db->setQuery($sql);
+
+						$id = $db->loadResult();
+						if ($id)
+						{
+							$installer = new JInstaller;
+							$result = $installer->uninstall('plugin', $id, 1);
+							$status->plugins[] = array(
+								'name'   => 'plg_' . $plugin,
+								'group'  => $folder,
+								'result' => $result
+							);
+						}
+					}
+				}
+			}
+		}
+
+		return $status;
+	}
+
+	/**
+	 * @param JInstallerAdapterComponent $parent
+	 *
+	 * @return bool
+	 *
+	 * @throws Exception When the Joomla! menu is FUBAR
+	 */
+	private function _createAdminMenus($parent)
+	{
+		$db = $db = FOFPlatform::getInstance()->getDbo();
+
+		/** @var JTableMenu $table */
+		$table = JTable::getInstance('menu');
+		$option = $parent->get('element');
+
+		// If a component exists with this option in the table then we don't need to add menus - check only 'main' menutype
+		$query = $db->getQuery(true)
+			->select('m.id, e.extension_id')
+			->from('#__menu AS m')
+			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+			->where('m.parent_id = 1')
+			->where('m.client_id = 1')
+			->where('m.menutype = ' . $db->q('main'))
+			->where($db->qn('e') . '.' . $db->qn('type') . ' = ' . $db->q('component'))
+			->where('e.element = ' . $db->quote($option));
+
+		$db->setQuery($query);
+
+		$componentrow = $db->loadObject();
+
+		// Check if menu items exist
+		if ($componentrow)
+		{
+			// @todo Return if the menu item already exists to save some time
+			//return true;
+		}
+
+		// Let's find the extension id
+		$query->clear()
+			->select('e.extension_id')
+			->from('#__extensions AS e')
+			->where('e.type = ' . $db->quote('component'))
+			->where('e.element = ' . $db->quote($option));
+		$db->setQuery($query);
+		$component_id = $db->loadResult();
+
+		// Ok, now its time to handle the menus.  Start with the component root menu, then handle submenus.
+		$menuElement = $parent->get('manifest')->administration->menu;
+
+		// We need to insert the menu item as the last child of Joomla!'s menu root node. By default this is the
+		// menu item with ID=1. However, some crappy upgrade scripts enjoy screwing it up. Hey, ho, the workaround
+		// way I go.
+		$query = $db->getQuery(true)
+			->select($db->qn('id'))
+			->from($db->qn('#__menu'))
+			->where($db->qn('id') . ' = ' . $db->q(1));
+		$rootItemId = $db->setQuery($query)->loadResult();
+
+		if (is_null($rootItemId))
+		{
+			// Guess what? The Problem has happened. Let's find the root node by title.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->where($db->qn('title') . ' = ' . $db->q('Menu_Item_Root'));
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// For crying out loud, did that idiot changed the title too?! Let's find it by alias.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->where($db->qn('alias') . ' = ' . $db->q('root'));
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// Dude. Dude! Duuuuuuude! The alias is screwed up, too?! Find it by component ID.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->where($db->qn('component_id') . ' = ' . $db->q('0'));
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// Your site is more of a "shite" than a "site". Let's try with minimum lft value.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->order($db->qn('lft') . ' ASC');
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// I quit. Your site is broken. What the hell are you doing with it? I'll just throw an error.
+			throw new Exception("Your site is broken. There is no root menu item. As a result it is impossible to create menu items. The installation of this component has failed. Please fix your database and retry!", 500);
+		}
+
+		if ($menuElement)
+		{
+			$data = array();
+			$data['menutype'] = 'main';
+			$data['client_id'] = 1;
+			$data['title'] = (string)trim($menuElement);
+			$data['alias'] = (string)$menuElement;
+			$data['link'] = 'index.php?option=' . $option;
+			$data['type'] = 'component';
+			$data['published'] = 0;
+			$data['parent_id'] = 1;
+			$data['component_id'] = $component_id;
+			$data['img'] = ((string)$menuElement->attributes()->img) ? (string)$menuElement->attributes()->img : 'class:component';
+			$data['home'] = 0;
+			$data['path'] = '';
+			$data['params'] = '';
+		}
+		// No menu element was specified, Let's make a generic menu item
+		else
+		{
+			$data = array();
+			$data['menutype'] = 'main';
+			$data['client_id'] = 1;
+			$data['title'] = $option;
+			$data['alias'] = $option;
+			$data['link'] = 'index.php?option=' . $option;
+			$data['type'] = 'component';
+			$data['published'] = 0;
+			$data['parent_id'] = 1;
+			$data['component_id'] = $component_id;
+			$data['img'] = 'class:component';
+			$data['home'] = 0;
+			$data['path'] = '';
+			$data['params'] = '';
+		}
+
+		try
+		{
+			$table->setLocation($rootItemId, 'last-child');
+		}
+		catch (InvalidArgumentException $e)
+		{
+			if (class_exists('JLog'))
+			{
+				JLog::add($e->getMessage(), JLog::WARNING, 'jerror');
+			}
+
+			return false;
+		}
+
+		if (!$table->bind($data) || !$table->check() || !$table->store())
+		{
+			// The menu item already exists. Delete it and retry instead of throwing an error.
+			$query->clear()
+				->select('id')
+				->from('#__menu')
+				->where('menutype = ' . $db->quote('main'))
+				->where('client_id = 1')
+				->where('link = ' . $db->quote('index.php?option=' . $option))
+				->where('type = ' . $db->quote('component'))
+				->where('parent_id = 1')
+				->where('home = 0');
+
+			$db->setQuery($query);
+			$menu_ids_level1 = $db->loadColumn();
+
+			if (empty($menu_ids_level1))
+			{
+				// Oops! Could not get the menu ID. Go back and rollback changes.
+				JError::raiseWarning(1, $table->getError());
+
+				return false;
+			}
+			else
+			{
+				$ids = implode(',', $menu_ids_level1);
+
+				$query->clear()
+					->select('id')
+					->from('#__menu')
+					->where('menutype = ' . $db->quote('main'))
+					->where('client_id = 1')
+					->where('type = ' . $db->quote('component'))
+					->where('parent_id in (' . $ids . ')')
+					->where('level = 2')
+					->where('home = 0');
+
+				$db->setQuery($query);
+				$menu_ids_level2 = $db->loadColumn();
+
+				$ids = implode(',', array_merge($menu_ids_level1, $menu_ids_level2));
+
+				// Remove the old menu item
+				$query->clear()
+					->delete('#__menu')
+					->where('id in (' . $ids . ')');
+
+				$db->setQuery($query);
+				$db->query();
+
+				// Retry creating the menu item
+				$table->setLocation($rootItemId, 'last-child');
+
+				if (!$table->bind($data) || !$table->check() || !$table->store())
+				{
+					// Install failed, warn user and rollback changes
+					JError::raiseWarning(1, $table->getError());
+
+					return false;
+				}
+			}
+		}
+
+		/*
+		 * Since we have created a menu item, we add it to the installation step stack
+		 * so that if we have to rollback the changes we can undo it.
+		 */
+		$parent->getParent()->pushStep(array('type' => 'menu', 'id' => $component_id));
+
+		/*
+		 * Process SubMenus
+		 */
+
+		if (!$parent->get('manifest')->administration->submenu)
+		{
+			return true;
+		}
+
+		$parent_id = $table->id;
+
+		foreach ($parent->get('manifest')->administration->submenu->menu as $child)
+		{
+			$data = array();
+			$data['menutype'] = 'main';
+			$data['client_id'] = 1;
+			$data['title'] = (string)trim($child);
+			$data['alias'] = (string)$child;
+			$data['type'] = 'component';
+			$data['published'] = 0;
+			$data['parent_id'] = $parent_id;
+			$data['component_id'] = $component_id;
+			$data['img'] = ((string)$child->attributes()->img) ? (string)$child->attributes()->img : 'class:component';
+			$data['home'] = 0;
+
+			// Set the sub menu link
+			if ((string)$child->attributes()->link)
+			{
+				$data['link'] = 'index.php?' . $child->attributes()->link;
+			}
+			else
+			{
+				$request = array();
+
+				if ((string)$child->attributes()->act)
+				{
+					$request[] = 'act=' . $child->attributes()->act;
+				}
+
+				if ((string)$child->attributes()->task)
+				{
+					$request[] = 'task=' . $child->attributes()->task;
+				}
+
+				if ((string)$child->attributes()->controller)
+				{
+					$request[] = 'controller=' . $child->attributes()->controller;
+				}
+
+				if ((string)$child->attributes()->view)
+				{
+					$request[] = 'view=' . $child->attributes()->view;
+				}
+
+				if ((string)$child->attributes()->layout)
+				{
+					$request[] = 'layout=' . $child->attributes()->layout;
+				}
+
+				if ((string)$child->attributes()->sub)
+				{
+					$request[] = 'sub=' . $child->attributes()->sub;
+				}
+
+				$qstring = (count($request)) ? '&' . implode('&', $request) : '';
+				$data['link'] = 'index.php?option=' . $option . $qstring;
+			}
+
+			$table = JTable::getInstance('menu');
+
+			try
+			{
+				$table->setLocation($parent_id, 'last-child');
+			}
+			catch (InvalidArgumentException $e)
+			{
+				return false;
+			}
+
+			if (!$table->bind($data) || !$table->check() || !$table->store())
+			{
+				// Install failed, rollback changes
+				return false;
+			}
+
+			/*
+			 * Since we have created a menu item, we add it to the installation step stack
+			 * so that if we have to rollback the changes we can undo it.
+			 */
+			$parent->getParent()->pushStep(array('type' => 'menu', 'id' => $component_id));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Make sure the Component menu items are really published!
+	 *
+	 * @param JInstallerAdapterComponent $parent
+	 *
+	 * @return bool
+	 */
+	private function _reallyPublishAdminMenuItems($parent)
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		$option = $parent->get('element');
+
+		$query = $db->getQuery(true)
+			->update('#__menu AS m')
+			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+			->set($db->qn('published') . ' = ' . $db->q(1))
+			->where('m.parent_id = 1')
+			->where('m.client_id = 1')
+			->where('m.menutype = ' . $db->quote('main'))
+			->where('e.type = ' . $db->quote('component'))
+			->where('e.element = ' . $db->quote($option));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (Exception $e)
+		{
+			// If it fails, it fails. Who cares.
+		}
+	}
+
+	/**
+	 * Tells Joomla! to rebuild its menu structure to make triple-sure that the Components menu items really do exist
+	 * in the correct place and can really be rendered.
+	 */
+	private function _rebuildMenu()
+	{
+		/** @var JTableMenu $table */
+		$table = JTable::getInstance('menu');
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// We need to rebuild the menu based on its root item. By default this is the menu item with ID=1. However, some
+		// crappy upgrade scripts enjoy screwing it up. Hey, ho, the workaround way I go.
+		$query = $db->getQuery(true)
+			->select($db->qn('id'))
+			->from($db->qn('#__menu'))
+			->where($db->qn('id') . ' = ' . $db->q(1));
+		$rootItemId = $db->setQuery($query)->loadResult();
+
+		if (is_null($rootItemId))
+		{
+			// Guess what? The Problem has happened. Let's find the root node by title.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->where($db->qn('title') . ' = ' . $db->q('Menu_Item_Root'));
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// For crying out loud, did that idiot changed the title too?! Let's find it by alias.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->where($db->qn('alias') . ' = ' . $db->q('root'));
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// Dude. Dude! Duuuuuuude! The alias is screwed up, too?! Find it by component ID.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->where($db->qn('component_id') . ' = ' . $db->q('0'));
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// Your site is more of a "shite" than a "site". Let's try with minimum lft value.
+			$rootItemId = null;
+			$query = $db->getQuery(true)
+				->select($db->qn('id'))
+				->from($db->qn('#__menu'))
+				->order($db->qn('lft') . ' ASC');
+			$rootItemId = $db->setQuery($query, 0, 1)->loadResult();
+		}
+
+		if (is_null($rootItemId))
+		{
+			// I quit. Your site is broken.
+			return false;
+		}
+
+		$table->rebuild($rootItemId);
+	}
+
+	/**
+	 * Adds or updates a post-installation message (PIM) definition for Joomla! 3.2 or later. You can use this in your
+	 * post-installation script using this code:
+	 *
+	 * The $options array contains the following mandatory keys:
+	 *
+	 * extension_id        The numeric ID of the extension this message is for (see the #__extensions table)
+	 *
+	 * type                One of message, link or action. Their meaning is:
+	 *                    message        Informative message. The user can dismiss it.
+	 *                    link        The action button links to a URL. The URL is defined in the action parameter.
+	 *                  action      A PHP action takes place when the action button is clicked. You need to specify the
+	 *                              action_file (RAD path to the PHP file) and action (PHP function name) keys. See
+	 *                              below for more information.
+	 *
+	 * title_key        The JText language key for the title of this PIM
+	 *                    Example: COM_FOOBAR_POSTINSTALL_MESSAGEONE_TITLE
+	 *
+	 * description_key    The JText language key for the main body (description) of this PIM
+	 *                    Example: COM_FOOBAR_POSTINSTALL_MESSAGEONE_DESCRIPTION
+	 *
+	 * action_key        The JText language key for the action button. Ignored and not required when type=message
+	 *                    Example: COM_FOOBAR_POSTINSTALL_MESSAGEONE_ACTION
+	 *
+	 * language_extension    The extension name which holds the language keys used above. For example, com_foobar,
+	 *                    mod_something, plg_system_whatever, tpl_mytemplate
+	 *
+	 * language_client_id   Should we load the front-end (0) or back-end (1) language keys?
+	 *
+	 * version_introduced   Which was the version of your extension where this message appeared for the first time?
+	 *                        Example: 3.2.1
+	 *
+	 * enabled              Must be 1 for this message to be enabled. If you omit it, it defaults to 1.
+	 *
+	 * condition_file        The RAD path to a PHP file containing a PHP function which determines whether this message
+	 *                        should be shown to the user. @see FOFTemplateUtils::parsePath() for RAD path format. Joomla!
+	 *                        will include this file before calling the condition_method.
+	 *                      Example:   admin://components/com_foobar/helpers/postinstall.php
+	 *
+	 * condition_method     The name of a PHP function which will be used to determine whether to show this message to
+	 *                      the user. This must be a simple PHP user function (not a class method, static method etc)
+	 *                        which returns true to show the message and false to hide it. This function is defined in the
+	 *                        condition_file.
+	 *                        Example: com_foobar_postinstall_messageone_condition
+	 *
+	 * When type=message no additional keys are required.
+	 *
+	 * When type=link the following additional keys are required:
+	 *
+	 * action                The URL which will open when the user clicks on the PIM's action button
+	 *                        Example:    index.php?option=com_foobar&view=tools&task=installSampleData
+	 *
+	 * Then type=action the following additional keys are required:
+	 *
+	 * action_file            The RAD path to a PHP file containing a PHP function which performs the action of this PIM.
+	 *
+	 * @see                   FOFTemplateUtils::parsePath() for RAD path format. Joomla! will include this file
+	 *                        before calling the function defined in the action key below.
+	 *                        Example:   admin://components/com_foobar/helpers/postinstall.php
+	 *
+	 * action                The name of a PHP function which will be used to run the action of this PIM. This must be a
+	 *                      simple PHP user function (not a class method, static method etc) which returns no result.
+	 *                        Example: com_foobar_postinstall_messageone_action
+	 *
+	 * @param array $options See description
+	 *
+	 * @return  void
+	 *
+	 * @throws Exception
+	 */
+	protected function addPostInstallationMessage(array $options)
+	{
+		// Make sure there are options set
+		if (!is_array($options))
+		{
+			throw new Exception('Post-installation message definitions must be of type array', 500);
+		}
+
+		// Initialise array keys
+		$defaultOptions = array(
+			'extension_id'       => '',
+			'type'               => '',
+			'title_key'          => '',
+			'description_key'    => '',
+			'action_key'         => '',
+			'language_extension' => '',
+			'language_client_id' => '',
+			'action_file'        => '',
+			'action'             => '',
+			'condition_file'     => '',
+			'condition_method'   => '',
+			'version_introduced' => '',
+			'enabled'            => '1',
+		);
+
+		$options = array_merge($defaultOptions, $options);
+
+		// Array normalisation. Removes array keys not belonging to a definition.
+		$defaultKeys = array_keys($defaultOptions);
+		$allKeys = array_keys($options);
+		$extraKeys = array_diff($allKeys, $defaultKeys);
+
+		if (!empty($extraKeys))
+		{
+			foreach ($extraKeys as $key)
+			{
+				unset($options[$key]);
+			}
+		}
+
+		// Normalisation of integer values
+		$options['extension_id'] = (int)$options['extension_id'];
+		$options['language_client_id'] = (int)$options['language_client_id'];
+		$options['enabled'] = (int)$options['enabled'];
+
+		// Normalisation of 0/1 values
+		foreach (array('language_client_id', 'enabled') as $key)
+		{
+			$options[$key] = $options[$key] ? 1 : 0;
+		}
+
+		// Make sure there's an extension_id
+		if (!(int)$options['extension_id'])
+		{
+			throw new Exception('Post-installation message definitions need an extension_id', 500);
+		}
+
+		// Make sure there's a valid type
+		if (!in_array($options['type'], array('message', 'link', 'action')))
+		{
+			throw new Exception('Post-installation message definitions need to declare a type of message, link or action', 500);
+		}
+
+		// Make sure there's a title key
+		if (empty($options['title_key']))
+		{
+			throw new Exception('Post-installation message definitions need a title key', 500);
+		}
+
+		// Make sure there's a description key
+		if (empty($options['description_key']))
+		{
+			throw new Exception('Post-installation message definitions need a description key', 500);
+		}
+
+		// If the type is anything other than message you need an action key
+		if (($options['type'] != 'message') && empty($options['action_key']))
+		{
+			throw new Exception('Post-installation message definitions need an action key when they are of type "' . $options['type'] . '"', 500);
+		}
+
+		// You must specify the language extension
+		if (empty($options['language_extension']))
+		{
+			throw new Exception('Post-installation message definitions need to specify which extension contains their language keys', 500);
+		}
+
+		// The action file and method are only required for the "action" type
+		if ($options['type'] == 'action')
+		{
+			if (empty($options['action_file']))
+			{
+				throw new Exception('Post-installation message definitions need an action file when they are of type "action"', 500);
+			}
+
+			$file_path = FOFTemplateUtils::parsePath($options['action_file'], true);
+
+			if (!@is_file($file_path))
+			{
+				throw new Exception('The action file ' . $options['action_file'] . ' of your post-installation message definition does not exist', 500);
+			}
+
+			if (empty($options['action']))
+			{
+				throw new Exception('Post-installation message definitions need an action (function name) when they are of type "action"', 500);
+			}
+		}
+
+		if ($options['type'] == 'link')
+		{
+			if (empty($options['link']))
+			{
+				throw new Exception('Post-installation message definitions need an action (URL) when they are of type "link"', 500);
+			}
+		}
+
+		// The condition file and method are only required when the type is not "message"
+		if ($options['type'] != 'message')
+		{
+			if (empty($options['condition_file']))
+			{
+				throw new Exception('Post-installation message definitions need a condition file when they are of type "' . $options['type'] . '"', 500);
+			}
+
+			$file_path = FOFTemplateUtils::parsePath($options['condition_file'], true);
+
+			if (!@is_file($file_path))
+			{
+				throw new Exception('The condition file ' . $options['condition_file'] . ' of your post-installation message definition does not exist', 500);
+			}
+
+			if (empty($options['condition_method']))
+			{
+				throw new Exception('Post-installation message definitions need a condition method (function name) when they are of type "' . $options['type'] . '"', 500);
+			}
+		}
+
+		// Check if the definition exists
+		$tableName = '#__postinstall_messages';
+
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn($tableName))
+			->where($db->qn('extension_id') . ' = ' . $db->q($options['extension_id']))
+			->where($db->qn('type') . ' = ' . $db->q($options['type']))
+			->where($db->qn('title_key') . ' = ' . $db->q($options['title_key']));
+		$existingRow = $db->setQuery($query)->loadAssoc();
+
+		// Is the existing definition the same as the one we're trying to save (ignore the enabled flag)?
+		if (!empty($existingRow))
+		{
+			$same = true;
+
+			foreach ($options as $k => $v)
+			{
+				if ($k == 'enabled')
+				{
+					continue;
+				}
+
+				if ($existingRow[$k] != $v)
+				{
+					$same = false;
+					break;
+				}
+			}
+
+			// Trying to add the same row as the existing one; quit
+			if ($same)
+			{
+				return;
+			}
+
+			// Otherwise it's not the same row. Remove the old row before insert a new one.
+			$query = $db->getQuery(true)
+				->delete($db->qn($tableName))
+				->where($db->q('extension_id') . ' = ' . $db->q($options['extension_id']))
+				->where($db->q('type') . ' = ' . $db->q($options['type']))
+				->where($db->q('title_key') . ' = ' . $db->q($options['title_key']));
+			$db->setQuery($query)->execute();
+		}
+
+		// Insert the new row
+		$options = (object)$options;
+		$db->insertObject($tableName, $options);
+	}
+
+	/**
+	 * Applies the post-installation messages for Joomla! 3.2 or later
+	 *
+	 * @return void
+	 */
+	protected function _applyPostInstallationMessages()
+	{
+		// Make sure it's Joomla! 3.2.0 or later
+		if (!version_compare(JVERSION, '3.2.0', 'ge'))
+		{
+			return;
+		}
+
+		// Make sure there are post-installation messages
+		if (empty($this->postInstallationMessages))
+		{
+			return;
+		}
+
+		// Get the extension ID for our component
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('extension_id')
+			->from('#__extensions')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->componentName));
+		$db->setQuery($query);
+
+		try
+		{
+			$ids = $db->loadColumn();
+		}
+		catch (Exception $exc)
+		{
+			return;
+		}
+
+		if (empty($ids))
+		{
+			return;
+		}
+
+		$extension_id = array_shift($ids);
+
+		foreach ($this->postInstallationMessages as $message)
+		{
+			$message['extension_id'] = $extension_id;
+			$this->addPostInstallationMessage($message);
+		}
+	}
+
+	protected function uninstallPostInstallationMessages()
+	{
+		// Make sure it's Joomla! 3.2.0 or later
+		if (!version_compare(JVERSION, '3.2.0', 'ge'))
+		{
+			return;
+		}
+
+		// Make sure there are post-installation messages
+		if (empty($this->postInstallationMessages))
+		{
+			return;
+		}
+
+		// Get the extension ID for our component
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true);
+		$query->select('extension_id')
+			->from('#__extensions')
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->componentName));
+		$db->setQuery($query);
+
+		try
+		{
+			$ids = $db->loadColumn();
+		}
+		catch (Exception $exc)
+		{
+			return;
+		}
+
+		if (empty($ids))
+		{
+			return;
+		}
+
+		$extension_id = array_shift($ids);
+
+		$query = $db->getQuery(true)
+			->delete($db->qn('#__postinstall_messages'))
+			->where($db->qn('extension_id') . ' = ' . $db->q($extension_id));
+
+		try
+		{
+			$db->setQuery($query)->execute();
+		}
+		catch (Exception $e)
+		{
+			return;
+		}
+	}
+}
diff --git a/core/libraries/fof/utils/ip/ip.php b/core/libraries/fof/utils/ip/ip.php
new file mode 100644
index 00000000..40f00094
--- /dev/null
+++ b/core/libraries/fof/utils/ip/ip.php
@@ -0,0 +1,523 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * IP address utilities
+ */
+abstract class FOFUtilsIp
+{
+	/** @var   string  The IP address of the current visitor */
+	protected static $ip = null;
+
+	/**
+	 * Should I allow IP overrides through X-Forwarded-For or Client-Ip HTTP headers?
+	 *
+	 * @var    bool
+	 */
+	protected static $allowIpOverrides = true;
+
+	/**
+	 * Get the current visitor's IP address
+	 *
+	 * @return string
+	 */
+	public static function getIp()
+	{
+		if (is_null(static::$ip))
+		{
+			$ip = self::detectAndCleanIP();
+
+			if (!empty($ip) && ($ip != '0.0.0.0') && function_exists('inet_pton') && function_exists('inet_ntop'))
+			{
+				$myIP = @inet_pton($ip);
+
+				if ($myIP !== false)
+				{
+					$ip = inet_ntop($myIP);
+				}
+			}
+
+			static::setIp($ip);
+		}
+
+		return static::$ip;
+	}
+
+	/**
+	 * Set the IP address of the current visitor
+	 *
+	 * @param   string  $ip
+	 *
+	 * @return  void
+	 */
+	public static function setIp($ip)
+	{
+		static::$ip = $ip;
+	}
+
+	/**
+	 * Is it an IPv6 IP address?
+	 *
+	 * @param   string   $ip  An IPv4 or IPv6 address
+	 *
+	 * @return  boolean  True if it's IPv6
+	 */
+	public static function isIPv6($ip)
+	{
+		if (strstr($ip, ':'))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if an IP is contained in a list of IPs or IP expressions
+	 *
+	 * @param   string        $ip       The IPv4/IPv6 address to check
+	 * @param   array|string  $ipTable  An IP expression (or a comma-separated or array list of IP expressions) to check against
+	 *
+	 * @return  null|boolean  True if it's in the list
+	 */
+	public static function IPinList($ip, $ipTable = '')
+	{
+		// No point proceeding with an empty IP list
+		if (empty($ipTable))
+		{
+			return false;
+		}
+
+		// If the IP list is not an array, convert it to an array
+		if (!is_array($ipTable))
+		{
+			if (strpos($ipTable, ',') !== false)
+			{
+				$ipTable = explode(',', $ipTable);
+				$ipTable = array_map(function($x) { return trim($x); }, $ipTable);
+			}
+			else
+			{
+				$ipTable = trim($ipTable);
+				$ipTable = array($ipTable);
+			}
+		}
+
+		// If no IP address is found, return false
+		if ($ip == '0.0.0.0')
+		{
+			return false;
+		}
+
+		// If no IP is given, return false
+		if (empty($ip))
+		{
+			return false;
+		}
+
+		// Sanity check
+		if (!function_exists('inet_pton'))
+		{
+			return false;
+		}
+
+		// Get the IP's in_adds representation
+		$myIP = @inet_pton($ip);
+
+		// If the IP is in an unrecognisable format, quite
+		if ($myIP === false)
+		{
+			return false;
+		}
+
+		$ipv6 = self::isIPv6($ip);
+
+		foreach ($ipTable as $ipExpression)
+		{
+			$ipExpression = trim($ipExpression);
+
+			// Inclusive IP range, i.e. 123.123.123.123-124.125.126.127
+			if (strstr($ipExpression, '-'))
+			{
+				list($from, $to) = explode('-', $ipExpression, 2);
+
+				if ($ipv6 && (!self::isIPv6($from) || !self::isIPv6($to)))
+				{
+					// Do not apply IPv4 filtering on an IPv6 address
+					continue;
+				}
+				elseif (!$ipv6 && (self::isIPv6($from) || self::isIPv6($to)))
+				{
+					// Do not apply IPv6 filtering on an IPv4 address
+					continue;
+				}
+
+				$from = @inet_pton(trim($from));
+				$to = @inet_pton(trim($to));
+
+				// Sanity check
+				if (($from === false) || ($to === false))
+				{
+					continue;
+				}
+
+				// Swap from/to if they're in the wrong order
+				if ($from > $to)
+				{
+					list($from, $to) = array($to, $from);
+				}
+
+				if (($myIP >= $from) && ($myIP <= $to))
+				{
+					return true;
+				}
+			}
+			// Netmask or CIDR provided
+			elseif (strstr($ipExpression, '/'))
+			{
+				$binaryip = self::inet_to_bits($myIP);
+
+				list($net, $maskbits) = explode('/', $ipExpression, 2);
+				if ($ipv6 && !self::isIPv6($net))
+				{
+					// Do not apply IPv4 filtering on an IPv6 address
+					continue;
+				}
+				elseif (!$ipv6 && self::isIPv6($net))
+				{
+					// Do not apply IPv6 filtering on an IPv4 address
+					continue;
+				}
+				elseif ($ipv6 && strstr($maskbits, ':'))
+				{
+					// Perform an IPv6 CIDR check
+					if (self::checkIPv6CIDR($myIP, $ipExpression))
+					{
+						return true;
+					}
+
+					// If we didn't match it proceed to the next expression
+					continue;
+				}
+				elseif (!$ipv6 && strstr($maskbits, '.'))
+				{
+					// Convert IPv4 netmask to CIDR
+					$long = ip2long($maskbits);
+					$base = ip2long('255.255.255.255');
+					$maskbits = 32 - log(($long ^ $base) + 1, 2);
+				}
+
+				// Convert network IP to in_addr representation
+				$net = @inet_pton($net);
+
+				// Sanity check
+				if ($net === false)
+				{
+					continue;
+				}
+
+				// Get the network's binary representation
+				$binarynet = self::inet_to_bits($net);
+				$expectedNumberOfBits = $ipv6 ? 128 : 24;
+				$binarynet = str_pad($binarynet, $expectedNumberOfBits, '0', STR_PAD_RIGHT);
+
+				// Check the corresponding bits of the IP and the network
+				$ip_net_bits = substr($binaryip, 0, $maskbits);
+				$net_bits = substr($binarynet, 0, $maskbits);
+
+				if ($ip_net_bits == $net_bits)
+				{
+					return true;
+				}
+			}
+			else
+			{
+				// IPv6: Only single IPs are supported
+				if ($ipv6)
+				{
+					$ipExpression = trim($ipExpression);
+
+					if (!self::isIPv6($ipExpression))
+					{
+						continue;
+					}
+
+					$ipCheck = @inet_pton($ipExpression);
+					if ($ipCheck === false)
+					{
+						continue;
+					}
+
+					if ($ipCheck == $myIP)
+					{
+						return true;
+					}
+				}
+				else
+				{
+					// Standard IPv4 address, i.e. 123.123.123.123 or partial IP address, i.e. 123.[123.][123.][123]
+					$dots = 0;
+					if (substr($ipExpression, -1) == '.')
+					{
+						// Partial IP address. Convert to CIDR and re-match
+						foreach (count_chars($ipExpression, 1) as $i => $val)
+						{
+							if ($i == 46)
+							{
+								$dots = $val;
+							}
+						}
+						switch ($dots)
+						{
+							case 1:
+								$netmask = '255.0.0.0';
+								$ipExpression .= '0.0.0';
+								break;
+
+							case 2:
+								$netmask = '255.255.0.0';
+								$ipExpression .= '0.0';
+								break;
+
+							case 3:
+								$netmask = '255.255.255.0';
+								$ipExpression .= '0';
+								break;
+
+							default:
+								$dots = 0;
+						}
+
+						if ($dots)
+						{
+							$binaryip = self::inet_to_bits($myIP);
+
+							// Convert netmask to CIDR
+							$long = ip2long($netmask);
+							$base = ip2long('255.255.255.255');
+							$maskbits = 32 - log(($long ^ $base) + 1, 2);
+
+							$net = @inet_pton($ipExpression);
+
+							// Sanity check
+							if ($net === false)
+							{
+								continue;
+							}
+
+							// Get the network's binary representation
+							$binarynet = self::inet_to_bits($net);
+							$expectedNumberOfBits = $ipv6 ? 128 : 24;
+							$binarynet = str_pad($binarynet, $expectedNumberOfBits, '0', STR_PAD_RIGHT);
+
+							// Check the corresponding bits of the IP and the network
+							$ip_net_bits = substr($binaryip, 0, $maskbits);
+							$net_bits = substr($binarynet, 0, $maskbits);
+
+							if ($ip_net_bits == $net_bits)
+							{
+								return true;
+							}
+						}
+					}
+					if (!$dots)
+					{
+						$ip = @inet_pton(trim($ipExpression));
+						if ($ip == $myIP)
+						{
+							return true;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Works around the REMOTE_ADDR not containing the user's IP
+	 */
+	public static function workaroundIPIssues()
+	{
+		$ip = self::getIp();
+
+		if ($_SERVER['REMOTE_ADDR'] == $ip)
+		{
+			return;
+		}
+
+		if (array_key_exists('REMOTE_ADDR', $_SERVER))
+		{
+			$_SERVER['FOF_REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
+		}
+		elseif (function_exists('getenv'))
+		{
+			if (getenv('REMOTE_ADDR'))
+			{
+				$_SERVER['FOF_REMOTE_ADDR'] = getenv('REMOTE_ADDR');
+			}
+		}
+
+		$_SERVER['REMOTE_ADDR'] = $ip;
+	}
+
+	/**
+	 * Should I allow the remote client's IP to be overridden by an X-Forwarded-For or Client-Ip HTTP header?
+	 *
+	 * @param   bool  $newState  True to allow the override
+	 *
+	 * @return  void
+	 */
+	public static function setAllowIpOverrides($newState)
+	{
+		self::$allowIpOverrides = $newState ? true : false;
+	}
+
+	/**
+	 * Gets the visitor's IP address. Automatically handles reverse proxies
+	 * reporting the IPs of intermediate devices, like load balancers. Examples:
+	 * https://www.akeebabackup.com/support/admin-tools/13743-double-ip-adresses-in-security-exception-log-warnings.html
+	 * http://stackoverflow.com/questions/2422395/why-is-request-envremote-addr-returning-two-ips
+	 * The solution used is assuming that the last IP address is the external one.
+	 *
+	 * @return  string
+	 */
+	protected static function detectAndCleanIP()
+	{
+		$ip = self::detectIP();
+
+		if ((strstr($ip, ',') !== false) || (strstr($ip, ' ') !== false))
+		{
+			$ip = str_replace(' ', ',', $ip);
+			$ip = str_replace(',,', ',', $ip);
+			$ips = explode(',', $ip);
+			$ip = '';
+			while (empty($ip) && !empty($ips))
+			{
+				$ip = array_pop($ips);
+				$ip = trim($ip);
+			}
+		}
+		else
+		{
+			$ip = trim($ip);
+		}
+
+		return $ip;
+	}
+
+	/**
+	 * Gets the visitor's IP address
+	 *
+	 * @return  string
+	 */
+	protected static function detectIP()
+	{
+		// Normally the $_SERVER superglobal is set
+		if (isset($_SERVER))
+		{
+			// Do we have an x-forwarded-for HTTP header (e.g. NginX)?
+			if (self::$allowIpOverrides && array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER))
+			{
+				return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			}
+
+			// Do we have a client-ip header (e.g. non-transparent proxy)?
+			if (self::$allowIpOverrides && array_key_exists('HTTP_CLIENT_IP', $_SERVER))
+			{
+				return $_SERVER['HTTP_CLIENT_IP'];
+			}
+
+			// Normal, non-proxied server or server behind a transparent proxy
+			return $_SERVER['REMOTE_ADDR'];
+		}
+
+		// This part is executed on PHP running as CGI, or on SAPIs which do
+		// not set the $_SERVER superglobal
+		// If getenv() is disabled, you're screwed
+		if (!function_exists('getenv'))
+		{
+			return '';
+		}
+
+		// Do we have an x-forwarded-for HTTP header?
+		if (self::$allowIpOverrides && getenv('HTTP_X_FORWARDED_FOR'))
+		{
+			return getenv('HTTP_X_FORWARDED_FOR');
+		}
+
+		// Do we have a client-ip header?
+		if (self::$allowIpOverrides && getenv('HTTP_CLIENT_IP'))
+		{
+			return getenv('HTTP_CLIENT_IP');
+		}
+
+		// Normal, non-proxied server or server behind a transparent proxy
+		if (getenv('REMOTE_ADDR'))
+		{
+			return getenv('REMOTE_ADDR');
+		}
+
+		// Catch-all case for broken servers, apparently
+		return '';
+	}
+
+	/**
+	 * Converts inet_pton output to bits string
+	 *
+	 * @param   string $inet The in_addr representation of an IPv4 or IPv6 address
+	 *
+	 * @return  string
+	 */
+	protected static function inet_to_bits($inet)
+	{
+		if (strlen($inet) == 4)
+		{
+			$unpacked = unpack('A4', $inet);
+		}
+		else
+		{
+			$unpacked = unpack('A16', $inet);
+		}
+		$unpacked = str_split($unpacked[1]);
+		$binaryip = '';
+
+		foreach ($unpacked as $char)
+		{
+			$binaryip .= str_pad(decbin(ord($char)), 8, '0', STR_PAD_LEFT);
+		}
+
+		return $binaryip;
+	}
+
+	/**
+	 * Checks if an IPv6 address $ip is part of the IPv6 CIDR block $cidrnet
+	 *
+	 * @param   string  $ip       The IPv6 address to check, e.g. 21DA:00D3:0000:2F3B:02AC:00FF:FE28:9C5A
+	 * @param   string  $cidrnet  The IPv6 CIDR block, e.g. 21DA:00D3:0000:2F3B::/64
+	 *
+	 * @return  bool
+	 */
+	protected static function checkIPv6CIDR($ip, $cidrnet)
+	{
+		$ip = inet_pton($ip);
+		$binaryip=self::inet_to_bits($ip);
+
+		list($net,$maskbits)=explode('/',$cidrnet);
+		$net=inet_pton($net);
+		$binarynet=self::inet_to_bits($net);
+
+		$ip_net_bits=substr($binaryip,0,$maskbits);
+		$net_bits   =substr($binarynet,0,$maskbits);
+
+		return $ip_net_bits === $net_bits;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/utils/object/object.php b/core/libraries/fof/utils/object/object.php
new file mode 100644
index 00000000..f3fe186a
--- /dev/null
+++ b/core/libraries/fof/utils/object/object.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Temporary class for backwards compatibility. You should not be using this
+ * in your code. It is currently present to handle the validation error stack
+ * for FOFTable::check() and will be removed in an upcoming version.
+ *
+ * This class is based on JObject as found in Joomla! 3.2.1
+ *
+ * @deprecated  2.1
+ * @codeCoverageIgnore
+ */
+class FOFUtilsObject
+{
+    /**
+     * An array of error messages or Exception objects.
+     *
+     * @var    array
+     */
+    protected $_errors = array();
+
+    /**
+     * Class constructor, overridden in descendant classes.
+     *
+     * @param   mixed  $properties  Either and associative array or another
+     *                              object to set the initial properties of the object.
+     */
+    public function __construct($properties = null)
+    {
+        if ($properties !== null)
+        {
+            $this->setProperties($properties);
+        }
+    }
+
+    /**
+     * Magic method to convert the object to a string gracefully.
+     *
+     * @return  string  The classname.
+     */
+    public function __toString()
+    {
+        return get_class($this);
+    }
+
+    /**
+     * Sets a default value if not alreay assigned
+     *
+     * @param   string  $property  The name of the property.
+     * @param   mixed   $default   The default value.
+     *
+     * @return  mixed
+     */
+    public function def($property, $default = null)
+    {
+        $value = $this->get($property, $default);
+        return $this->set($property, $value);
+    }
+
+    /**
+     * Returns a property of the object or the default value if the property is not set.
+     *
+     * @param   string  $property  The name of the property.
+     * @param   mixed   $default   The default value.
+     *
+     * @return  mixed    The value of the property.
+     */
+    public function get($property, $default = null)
+    {
+        if (isset($this->$property))
+        {
+            return $this->$property;
+        }
+        return $default;
+    }
+
+    /**
+     * Returns an associative array of object properties.
+     *
+     * @param   boolean  $public  If true, returns only the public properties.
+     *
+     * @return  array
+     */
+    public function getProperties($public = true)
+    {
+        $vars = get_object_vars($this);
+        if ($public)
+        {
+            foreach ($vars as $key => $value)
+            {
+                if ('_' == substr($key, 0, 1))
+                {
+                    unset($vars[$key]);
+                }
+            }
+        }
+
+        return $vars;
+    }
+
+    /**
+     * Get the most recent error message.
+     *
+     * @param   integer  $i         Option error index.
+     * @param   boolean  $toString  Indicates if JError objects should return their error message.
+     *
+     * @return  string   Error message
+     */
+    public function getError($i = null, $toString = true)
+    {
+        // Find the error
+        if ($i === null)
+        {
+            // Default, return the last message
+            $error = end($this->_errors);
+        }
+        elseif (!array_key_exists($i, $this->_errors))
+        {
+            // If $i has been specified but does not exist, return false
+            return false;
+        }
+        else
+        {
+            $error = $this->_errors[$i];
+        }
+
+        // Check if only the string is requested
+        if ($error instanceof Exception && $toString)
+        {
+            return (string) $error;
+        }
+
+        return $error;
+    }
+
+    /**
+     * Return all errors, if any.
+     *
+     * @return  array  Array of error messages or JErrors.
+     */
+    public function getErrors()
+    {
+        return $this->_errors;
+    }
+
+    /**
+     * Modifies a property of the object, creating it if it does not already exist.
+     *
+     * @param   string  $property  The name of the property.
+     * @param   mixed   $value     The value of the property to set.
+     *
+     * @return  mixed  Previous value of the property.
+     */
+    public function set($property, $value = null)
+    {
+        $previous = isset($this->$property) ? $this->$property : null;
+        $this->$property = $value;
+        return $previous;
+    }
+
+    /**
+     * Set the object properties based on a named array/hash.
+     *
+     * @param   mixed  $properties  Either an associative array or another object.
+     *
+     * @return  boolean
+     */
+    public function setProperties($properties)
+    {
+        if (is_array($properties) || is_object($properties))
+        {
+            foreach ((array) $properties as $k => $v)
+            {
+                // Use the set function which might be overridden.
+                $this->set($k, $v);
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Add an error message.
+     *
+     * @param   string  $error  Error message.
+     *
+     * @return  void
+     */
+    public function setError($error)
+    {
+        array_push($this->_errors, $error);
+    }
+}
diff --git a/core/libraries/fof/utils/observable/dispatcher.php b/core/libraries/fof/utils/observable/dispatcher.php
new file mode 100644
index 00000000..6dbe38aa
--- /dev/null
+++ b/core/libraries/fof/utils/observable/dispatcher.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Class to handle dispatching of events.
+ *
+ * This is the Observable part of the Observer design pattern
+ * for the event architecture.
+ *
+ * This class is based on JEventDispatcher as found in Joomla! 3.2.0
+ */
+class FOFUtilsObservableDispatcher extends FOFUtilsObject
+{
+    /**
+     * An array of Observer objects to notify
+     *
+     * @var    array
+     */
+    protected $_observers = array();
+
+    /**
+     * The state of the observable object
+     *
+     * @var    mixed
+     */
+    protected $_state = null;
+
+    /**
+     * A multi dimensional array of [function][] = key for observers
+     *
+     * @var    array
+     */
+    protected $_methods = array();
+
+    /**
+     * Stores the singleton instance of the dispatcher.
+     *
+     * @var    FOFUtilsObservableDispatcher
+     */
+    protected static $instance = null;
+
+    /**
+     * Returns the global Event Dispatcher object, only creating it
+     * if it doesn't already exist.
+     *
+     * @return  FOFUtilsObservableDispatcher  The EventDispatcher object.
+     */
+    public static function getInstance()
+    {
+        if (self::$instance === null)
+        {
+            self::$instance = new static;
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the state of the FOFUtilsObservableDispatcher object
+     *
+     * @return  mixed    The state of the object.
+     */
+    public function getState()
+    {
+        return $this->_state;
+    }
+
+    /**
+     * Registers an event handler to the event dispatcher
+     *
+     * @param   string  $event    Name of the event to register handler for
+     * @param   string  $handler  Name of the event handler
+     *
+     * @return  void
+     *
+     * @throws  InvalidArgumentException
+     */
+    public function register($event, $handler)
+    {
+        // Are we dealing with a class or callback type handler?
+        if (is_callable($handler))
+        {
+            // Ok, function type event handler... let's attach it.
+            $method = array('event' => $event, 'handler' => $handler);
+            $this->attach($method);
+        }
+        elseif (class_exists($handler))
+        {
+            // Ok, class type event handler... let's instantiate and attach it.
+            $this->attach(new $handler($this));
+        }
+        else
+        {
+            throw new InvalidArgumentException('Invalid event handler.');
+        }
+    }
+
+    /**
+     * Triggers an event by dispatching arguments to all observers that handle
+     * the event and returning their return values.
+     *
+     * @param   string  $event  The event to trigger.
+     * @param   array   $args   An array of arguments.
+     *
+     * @return  array  An array of results from each function call.
+     */
+    public function trigger($event, $args = array())
+    {
+        $result = array();
+
+        /*
+         * If no arguments were passed, we still need to pass an empty array to
+         * the call_user_func_array function.
+         */
+        $args = (array) $args;
+
+        $event = strtolower($event);
+
+        // Check if any plugins are attached to the event.
+        if (!isset($this->_methods[$event]) || empty($this->_methods[$event]))
+        {
+            // No Plugins Associated To Event!
+            return $result;
+        }
+
+        // Loop through all plugins having a method matching our event
+        foreach ($this->_methods[$event] as $key)
+        {
+            // Check if the plugin is present.
+            if (!isset($this->_observers[$key]))
+            {
+                continue;
+            }
+
+            // Fire the event for an object based observer.
+            if (is_object($this->_observers[$key]))
+            {
+                $args['event'] = $event;
+                $value = $this->_observers[$key]->update($args);
+            }
+            // Fire the event for a function based observer.
+            elseif (is_array($this->_observers[$key]))
+            {
+                $value = call_user_func_array($this->_observers[$key]['handler'], $args);
+            }
+
+            if (isset($value))
+            {
+                $result[] = $value;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Attach an observer object
+     *
+     * @param   object  $observer  An observer object to attach
+     *
+     * @return  void
+     */
+    public function attach($observer)
+    {
+        if (is_array($observer))
+        {
+            if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
+            {
+                return;
+            }
+
+            // Make sure we haven't already attached this array as an observer
+            foreach ($this->_observers as $check)
+            {
+                if (is_array($check) && $check['event'] == $observer['event'] && $check['handler'] == $observer['handler'])
+                {
+                    return;
+                }
+            }
+
+            $this->_observers[] = $observer;
+            end($this->_observers);
+            $methods = array($observer['event']);
+        }
+        else
+        {
+            if (!($observer instanceof FOFUtilsObservableEvent))
+            {
+                return;
+            }
+
+            // Make sure we haven't already attached this object as an observer
+            $class = get_class($observer);
+
+            foreach ($this->_observers as $check)
+            {
+                if ($check instanceof $class)
+                {
+                    return;
+                }
+            }
+
+            $this->_observers[] = $observer;
+
+            // Required in PHP 7 since foreach() doesn't advance the internal array counter, see http://php.net/manual/en/migration70.incompatible.php
+            end($this->_observers);
+
+            $methods = array();
+
+            foreach(get_class_methods($observer) as $obs_method)
+            {
+                // Magic methods are not allowed
+                if(strpos('__', $obs_method) === 0)
+                {
+                    continue;
+                }
+
+                $methods[] = $obs_method;
+            }
+
+            //$methods = get_class_methods($observer);
+        }
+
+        $key = key($this->_observers);
+
+        foreach ($methods as $method)
+        {
+            $method = strtolower($method);
+
+            if (!isset($this->_methods[$method]))
+            {
+                $this->_methods[$method] = array();
+            }
+
+            $this->_methods[$method][] = $key;
+        }
+    }
+
+    /**
+     * Detach an observer object
+     *
+     * @param   object  $observer  An observer object to detach.
+     *
+     * @return  boolean  True if the observer object was detached.
+     */
+    public function detach($observer)
+    {
+        $retval = false;
+
+        $key = array_search($observer, $this->_observers);
+
+        if ($key !== false)
+        {
+            unset($this->_observers[$key]);
+            $retval = true;
+
+            foreach ($this->_methods as &$method)
+            {
+                $k = array_search($key, $method);
+
+                if ($k !== false)
+                {
+                    unset($method[$k]);
+                }
+            }
+        }
+
+        return $retval;
+    }
+}
diff --git a/core/libraries/fof/utils/observable/event.php b/core/libraries/fof/utils/observable/event.php
new file mode 100644
index 00000000..49bc8f22
--- /dev/null
+++ b/core/libraries/fof/utils/observable/event.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Defines an observable event.
+ *
+ * This class is based on JEvent as found in Joomla! 3.2.0
+ */
+abstract class FOFUtilsObservableEvent extends FOFUtilsObject
+{
+    /**
+     * Event object to observe.
+     *
+     * @var    object
+     */
+    protected $_subject = null;
+
+    /**
+     * Constructor
+     *
+     * @param   object  &$subject  The object to observe.
+     */
+    public function __construct(&$subject)
+    {
+        // Register the observer ($this) so we can be notified
+        $subject->attach($this);
+
+        // Set the subject to observe
+        $this->_subject = &$subject;
+    }
+
+    /**
+     * Method to trigger events.
+     * The method first generates the even from the argument array. Then it unsets the argument
+     * since the argument has no bearing on the event handler.
+     * If the method exists it is called and returns its return value. If it does not exist it
+     * returns null.
+     *
+     * @param   array  &$args  Arguments
+     *
+     * @return  mixed  Routine return value
+     */
+    public function update(&$args)
+    {
+        // First let's get the event from the argument array.  Next we will unset the
+        // event argument as it has no bearing on the method to handle the event.
+        $event = $args['event'];
+        unset($args['event']);
+
+        /*
+         * If the method to handle an event exists, call it and return its return
+         * value.  If it does not exist, return null.
+         */
+        if (method_exists($this, $event))
+        {
+            return call_user_func_array(array($this, $event), $args);
+        }
+        else
+        {
+            return null;
+        }
+    }
+}
diff --git a/core/libraries/fof/utils/phpfunc/phpfunc.php b/core/libraries/fof/utils/phpfunc/phpfunc.php
new file mode 100644
index 00000000..f7311994
--- /dev/null
+++ b/core/libraries/fof/utils/phpfunc/phpfunc.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * Intercept calls to PHP functions.
+ *
+ * @method  function_exists(string $function)
+ * @method  mcrypt_list_algorithms()
+ * @method  hash_algos()
+ * @method  extension_loaded(string $ext)
+ * @method  mcrypt_create_iv(int $bytes, int $source)
+ * @method  openssl_get_cipher_methods()
+ */
+class FOFUtilsPhpfunc
+{
+	/**
+	 *
+	 * Magic call to intercept any function pass to it.
+	 *
+	 * @param string $func The function to call.
+	 *
+	 * @param array  $args Arguments passed to the function.
+	 *
+	 * @return mixed The result of the function call.
+	 *
+	 */
+	public function __call($func, $args)
+	{
+		return call_user_func_array($func, $args);
+	}
+}
diff --git a/core/libraries/fof/utils/timer/timer.php b/core/libraries/fof/utils/timer/timer.php
new file mode 100644
index 00000000..bb2c7b2f
--- /dev/null
+++ b/core/libraries/fof/utils/timer/timer.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('FOF_INCLUDED') or die;
+
+/**
+ * An execution timer monitor class
+ */
+class FOFUtilsTimer
+{
+	/** @var float Maximum execution time allowance */
+	private $max_exec_time = null;
+
+	/** @var float Timestamp of execution start */
+	private $start_time = null;
+
+	/**
+	 * Public constructor, creates the timer object and calculates the execution
+	 * time limits.
+	 *
+	 * @param float $max_exec_time Maximum execution time allowance
+	 * @param float $runtime_bias  Execution time bias (expressed as % of $max_exec_time)
+	 */
+	public function __construct($max_exec_time = 5.0, $runtime_bias = 75.0)
+	{
+		// Initialize start time
+		$this->start_time = $this->microtime_float();
+
+		$this->max_exec_time = $max_exec_time * $runtime_bias / 100.0;
+	}
+
+	/**
+	 * Wake-up function to reset internal timer when we get unserialized
+	 */
+	public function __wakeup()
+	{
+		// Re-initialize start time on wake-up
+		$this->start_time = $this->microtime_float();
+	}
+
+	/**
+	 * Gets the number of seconds left, before we hit the "must break" threshold. Negative
+	 * values mean that we have already crossed that threshold.
+	 *
+	 * @return  float
+	 */
+	public function getTimeLeft()
+	{
+		return $this->max_exec_time - $this->getRunningTime();
+	}
+
+	/**
+	 * Gets the time elapsed since object creation/unserialization, effectively
+	 * how long we are running
+	 *
+	 * @return  float
+	 */
+	public function getRunningTime()
+	{
+		return $this->microtime_float() - $this->start_time;
+	}
+
+	/**
+	 * Returns the current timestamp in decimal seconds
+	 *
+	 * @return  float
+	 */
+	private function microtime_float()
+	{
+		list($usec, $sec) = explode(" ", microtime());
+		return ((float)$usec + (float)$sec);
+	}
+
+	/**
+	 * Reset the timer
+	 */
+	public function resetTime()
+	{
+		$this->start_time = $this->microtime_float();
+	}
+
+}
\ No newline at end of file
diff --git a/core/libraries/fof/utils/update/collection.php b/core/libraries/fof/utils/update/collection.php
new file mode 100644
index 00000000..cbea01aa
--- /dev/null
+++ b/core/libraries/fof/utils/update/collection.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A helper class to read and parse "collection" update XML files over the web
+ */
+class FOFUtilsUpdateCollection
+{
+	/**
+	 * Reads a "collection" XML update source and returns the complete tree of categories
+	 * and extensions applicable for platform version $jVersion
+	 *
+	 * @param   string  $url       The collection XML update source URL to read from
+	 * @param   string  $jVersion  Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  array  A list of update sources applicable to $jVersion
+	 */
+	public function getAllUpdates($url, $jVersion = null)
+	{
+		// Get the target platform
+		if (is_null($jVersion))
+		{
+			$jVersion = JVERSION;
+		}
+
+		// Initialise return value
+		$updates = array(
+			'metadata'		=> array(
+				'name'			=> '',
+				'description'	=> '',
+			),
+			'categories'	=> array(),
+			'extensions'	=> array(),
+		);
+
+		// Download and parse the XML file
+		$donwloader = new FOFDownload();
+		$xmlSource = $donwloader->getFromURL($url);
+
+		try
+		{
+			$xml = new SimpleXMLElement($xmlSource, LIBXML_NONET);
+		}
+		catch(Exception $e)
+		{
+			return $updates;
+		}
+
+		// Sanity check
+		if (($xml->getName() != 'extensionset'))
+		{
+			unset($xml);
+
+			return $updates;
+		}
+
+		// Initialise return value with the stream metadata (name, description)
+		$rootAttributes = $xml->attributes();
+		foreach ($rootAttributes as $k => $v)
+		{
+			$updates['metadata'][$k] = (string)$v;
+		}
+
+		// Initialise the raw list of updates
+		$rawUpdates = array(
+			'categories'	=> array(),
+			'extensions'	=> array(),
+		);
+
+		// Segregate the raw list to a hierarchy of extension and category entries
+		/** @var SimpleXMLElement $extension */
+		foreach ($xml->children() as $extension)
+		{
+			switch ($extension->getName())
+			{
+				case 'category':
+					// These are the parameters we expect in a category
+					$params = array(
+						'name'					=> '',
+						'description'			=> '',
+						'category'				=> '',
+						'ref'					=> '',
+						'targetplatformversion'	=> $jVersion,
+					);
+
+					// These are the attributes of the element
+					$attributes = $extension->attributes();
+
+					// Merge them all
+					foreach ($attributes as $k => $v)
+					{
+						$params[$k] = (string)$v;
+					}
+
+					// We can't have a category with an empty category name
+					if (empty($params['category']))
+					{
+						continue;
+					}
+
+					// We can't have a category with an empty ref
+					if (empty($params['ref']))
+					{
+						continue;
+					}
+
+					if (empty($params['description']))
+					{
+						$params['description'] = $params['category'];
+					}
+
+					if (!array_key_exists($params['category'], $rawUpdates['categories']))
+					{
+						$rawUpdates['categories'][$params['category']] = array();
+					}
+
+					$rawUpdates['categories'][$params['category']][] = $params;
+
+					break;
+
+				case 'extension':
+					// These are the parameters we expect in a category
+					$params = array(
+						'element'				=> '',
+						'type'					=> '',
+						'version'				=> '',
+						'name'					=> '',
+						'detailsurl'			=> '',
+						'targetplatformversion'	=> $jVersion,
+					);
+
+					// These are the attributes of the element
+					$attributes = $extension->attributes();
+
+					// Merge them all
+					foreach ($attributes as $k => $v)
+					{
+						$params[$k] = (string)$v;
+					}
+
+					// We can't have an extension with an empty element
+					if (empty($params['element']))
+					{
+						continue;
+					}
+
+					// We can't have an extension with an empty type
+					if (empty($params['type']))
+					{
+						continue;
+					}
+
+					// We can't have an extension with an empty version
+					if (empty($params['version']))
+					{
+						continue;
+					}
+
+					if (empty($params['name']))
+					{
+						$params['name'] = $params['element'] . ' ' . $params['version'];
+					}
+
+					if (!array_key_exists($params['type'], $rawUpdates['extensions']))
+					{
+						$rawUpdates['extensions'][$params['type']] = array();
+					}
+
+					if (!array_key_exists($params['element'], $rawUpdates['extensions'][$params['type']]))
+					{
+						$rawUpdates['extensions'][$params['type']][$params['element']] = array();
+					}
+
+					$rawUpdates['extensions'][$params['type']][$params['element']][] = $params;
+					break;
+
+				default:
+					break;
+			}
+		}
+
+		unset($xml);
+
+		if (!empty($rawUpdates['categories']))
+		{
+			foreach ($rawUpdates['categories'] as $category => $entries)
+			{
+				$update = $this->filterListByPlatform($entries, $jVersion);
+				$updates['categories'][$category] = $update;
+			}
+		}
+
+		if (!empty($rawUpdates['extensions']))
+		{
+			foreach ($rawUpdates['extensions'] as $type => $extensions)
+			{
+				$updates['extensions'][$type] = array();
+
+				if (!empty($extensions))
+				{
+					foreach ($extensions as $element => $entries)
+					{
+						$update = $this->filterListByPlatform($entries, $jVersion);
+						$updates['extensions'][$type][$element] = $update;
+					}
+				}
+			}
+		}
+
+		return $updates;
+	}
+
+	/**
+	 * Filters a list of updates, returning only those available for the
+	 * specified platform version $jVersion
+	 *
+	 * @param   array   $updates   An array containing update definitions (categories or extensions)
+	 * @param   string  $jVersion  Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  array|null  The update definition that is compatible, or null if none is compatible
+	 */
+	private function filterListByPlatform($updates, $jVersion = null)
+	{
+		// Get the target platform
+		if (is_null($jVersion))
+		{
+			$jVersion = JVERSION;
+		}
+
+		$versionParts = explode('.', $jVersion, 4);
+		$platformVersionMajor = $versionParts[0];
+		$platformVersionMinor = (count($versionParts) > 1) ? $platformVersionMajor . '.' . $versionParts[1] : $platformVersionMajor;
+		$platformVersionNormal = (count($versionParts) > 2) ? $platformVersionMinor . '.' . $versionParts[2] : $platformVersionMinor;
+		$platformVersionFull = (count($versionParts) > 3) ? $platformVersionNormal . '.' . $versionParts[3] : $platformVersionNormal;
+
+		$pickedExtension = null;
+		$pickedSpecificity = -1;
+
+		foreach ($updates as $update)
+		{
+			// Test the target platform
+			$targetPlatform = (string)$update['targetplatformversion'];
+
+			if ($targetPlatform === $platformVersionFull)
+			{
+				$pickedExtension = $update;
+				$pickedSpecificity = 4;
+			}
+			elseif (($targetPlatform === $platformVersionNormal) && ($pickedSpecificity <= 3))
+			{
+				$pickedExtension = $update;
+				$pickedSpecificity = 3;
+			}
+			elseif (($targetPlatform === $platformVersionMinor) && ($pickedSpecificity <= 2))
+			{
+				$pickedExtension = $update;
+				$pickedSpecificity = 2;
+			}
+			elseif (($targetPlatform === $platformVersionMajor) && ($pickedSpecificity <= 1))
+			{
+				$pickedExtension = $update;
+				$pickedSpecificity = 1;
+			}
+		}
+
+		return $pickedExtension;
+	}
+
+	/**
+	 * Returns only the category definitions of a collection
+	 *
+	 * @param   string  $url       The URL of the collection update source
+	 * @param   string  $jVersion  Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  array  An array of category update definitions
+	 */
+	public function getCategories($url, $jVersion = null)
+	{
+		$allUpdates = $this->getAllUpdates($url, $jVersion);
+
+		return $allUpdates['categories'];
+	}
+
+	/**
+	 * Returns the update source for a specific category
+	 *
+	 * @param   string  $url       The URL of the collection update source
+	 * @param   string  $category  The category name you want to get the update source URL of
+	 * @param   string  $jVersion  Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  string|null  The update stream URL, or null if it's not found
+	 */
+	public function getCategoryUpdateSource($url, $category, $jVersion = null)
+	{
+		$allUpdates = $this->getAllUpdates($url, $jVersion);
+
+		if (array_key_exists($category, $allUpdates['categories']))
+		{
+			return $allUpdates['categories'][$category]['ref'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a list of updates for extensions only, optionally of a specific type
+	 *
+	 * @param   string  $url       The URL of the collection update source
+	 * @param   string  $type      The extension type you want to get the update source URL of, empty to get all
+	 *                             extension types
+	 * @param   string  $jVersion  Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  array|null  An array of extension update definitions or null if none is found
+	 */
+	public function getExtensions($url, $type = null, $jVersion = null)
+	{
+		$allUpdates = $this->getAllUpdates($url, $jVersion);
+
+		if (empty($type))
+		{
+			return $allUpdates['extensions'];
+		}
+		elseif (array_key_exists($type, $allUpdates['extensions']))
+		{
+			return $allUpdates['extensions'][$type];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the update source URL for a specific extension, based on the type and element, e.g.
+	 * type=file and element=joomla is Joomla! itself.
+	 *
+	 * @param   string  $url       The URL of the collection update source
+	 * @param   string  $type      The extension type you want to get the update source URL of
+	 * @param   string  $element   The extension element you want to get the update source URL of
+	 * @param   string  $jVersion  Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  string|null  The update source URL or null if the extension is not found
+	 */
+	public function getExtensionUpdateSource($url, $type, $element, $jVersion = null)
+	{
+		$allUpdates = $this->getExtensions($url, $type, $jVersion);
+
+		if (empty($allUpdates))
+		{
+			return null;
+		}
+		elseif (array_key_exists($element, $allUpdates))
+		{
+			return $allUpdates[$element]['detailsurl'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/utils/update/extension.php b/core/libraries/fof/utils/update/extension.php
new file mode 100644
index 00000000..a24de5ce
--- /dev/null
+++ b/core/libraries/fof/utils/update/extension.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A helper class to read and parse "extension" update XML files over the web
+ */
+class FOFUtilsUpdateExtension
+{
+	/**
+	 * Reads an "extension" XML update source and returns all listed update entries.
+	 *
+	 * If you have a "collection" XML update source you should do something like this:
+	 * $collection = new FOFUtilsUpdateCollection();
+	 * $extensionUpdateURL = $collection->getExtensionUpdateSource($url, 'component', 'com_foobar', JVERSION);
+	 * $extension = new FOFUtilsUpdateExtension();
+	 * $updates = $extension->getUpdatesFromExtension($extensionUpdateURL);
+	 *
+	 * @param   string  $url  The extension XML update source URL to read from
+	 *
+	 * @return  array  An array of update entries
+	 */
+	public function getUpdatesFromExtension($url)
+	{
+		// Initialise
+		$ret = array();
+
+		// Get and parse the XML source
+		$downloader = new FOFDownload();
+		$xmlSource = $downloader->getFromURL($url);
+
+		try
+		{
+			$xml = new SimpleXMLElement($xmlSource, LIBXML_NONET);
+		}
+		catch(Exception $e)
+		{
+			return $ret;
+		}
+
+		// Sanity check
+		if (($xml->getName() != 'updates'))
+		{
+			unset($xml);
+
+			return $ret;
+		}
+
+		// Let's populate the list of updates
+		/** @var SimpleXMLElement $update */
+		foreach ($xml->children() as $update)
+		{
+			// Sanity check
+			if ($update->getName() != 'update')
+			{
+				continue;
+			}
+
+			$entry = array(
+				'infourl'			=> array('title' => '', 'url' => ''),
+				'downloads'			=> array(),
+				'tags'				=> array(),
+				'targetplatform'	=> array(),
+			);
+
+			$properties = get_object_vars($update);
+
+			foreach ($properties as $nodeName => $nodeContent)
+			{
+				switch ($nodeName)
+				{
+					default:
+						$entry[$nodeName] = $nodeContent;
+						break;
+
+					case 'infourl':
+					case 'downloads':
+					case 'tags':
+					case 'targetplatform':
+						break;
+				}
+			}
+
+			$infourlNode = $update->xpath('infourl');
+			$entry['infourl']['title'] = (string)$infourlNode[0]['title'];
+			$entry['infourl']['url'] = (string)$infourlNode[0];
+
+			$downloadNodes = $update->xpath('downloads/downloadurl');
+			foreach ($downloadNodes as $downloadNode)
+			{
+				$entry['downloads'][] = array(
+					'type'		=> (string)$downloadNode['type'],
+					'format'	=> (string)$downloadNode['format'],
+					'url'		=> (string)$downloadNode,
+				);
+			}
+
+			$tagNodes = $update->xpath('tags/tag');
+			foreach ($tagNodes as $tagNode)
+			{
+				$entry['tags'][] = (string)$tagNode;
+			}
+
+			/** @var SimpleXMLElement $targetPlatformNode */
+			$targetPlatformNode = $update->xpath('targetplatform');
+
+			$entry['targetplatform']['name'] = (string)$targetPlatformNode[0]['name'];
+			$entry['targetplatform']['version'] = (string)$targetPlatformNode[0]['version'];
+			$client = $targetPlatformNode[0]->xpath('client');
+			$entry['targetplatform']['client'] = (is_array($client) && count($client)) ? (string)$client[0] : '';
+			$folder = $targetPlatformNode[0]->xpath('folder');
+			$entry['targetplatform']['folder'] = is_array($folder) && count($folder) ? (string)$folder[0] : '';
+
+			$ret[] = $entry;
+		}
+
+		unset($xml);
+
+		return $ret;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/utils/update/joomla.php b/core/libraries/fof/utils/update/joomla.php
new file mode 100644
index 00000000..3a80fac8
--- /dev/null
+++ b/core/libraries/fof/utils/update/joomla.php
@@ -0,0 +1,625 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * A helper class which provides update information for the Joomla! CMS itself. This is slightly different than the
+ * regular "extension" files as we need to know if a Joomla! version is STS, LTS, testing, current and so on.
+ */
+class FOFUtilsUpdateJoomla extends FOFUtilsUpdateExtension
+{
+	/**
+	 * The source for LTS updates
+	 *
+	 * @var  string
+	 */
+	protected static $lts_url = 'http://update.joomla.org/core/list.xml';
+
+	/**
+	 * The source for STS updates
+	 *
+	 * @var  string
+	 */
+	protected static $sts_url = 'http://update.joomla.org/core/sts/list_sts.xml';
+
+	/**
+	 * The source for test release updates
+	 *
+	 * @var  string
+	 */
+	protected static $test_url = 'http://update.joomla.org/core/test/list_test.xml';
+
+	/**
+	 * Reads an "extension" XML update source and returns all listed update entries.
+	 *
+	 * If you have a "collection" XML update source you should do something like this:
+	 * $collection = new CmsupdateHelperCollection();
+	 * $extensionUpdateURL = $collection->getExtensionUpdateSource($url, 'component', 'com_foobar', JVERSION);
+	 * $extension = new CmsupdateHelperExtension();
+	 * $updates = $extension->getUpdatesFromExtension($extensionUpdateURL);
+	 *
+	 * @param   string $url The extension XML update source URL to read from
+	 *
+	 * @return  array  An array of update entries
+	 */
+	public function getUpdatesFromExtension($url)
+	{
+		// Initialise
+		$ret = array();
+
+		// Get and parse the XML source
+		$downloader = new FOFDownload();
+		$xmlSource  = $downloader->getFromURL($url);
+
+		try
+		{
+			$xml = new SimpleXMLElement($xmlSource, LIBXML_NONET);
+		}
+		catch (Exception $e)
+		{
+			return $ret;
+		}
+
+		// Sanity check
+		if (($xml->getName() != 'updates'))
+		{
+			unset($xml);
+
+			return $ret;
+		}
+
+		// Let's populate the list of updates
+		/** @var SimpleXMLElement $update */
+		foreach ($xml->children() as $update)
+		{
+			// Sanity check
+			if ($update->getName() != 'update')
+			{
+				continue;
+			}
+
+			$entry = array(
+				'infourl'        => array('title' => '', 'url' => ''),
+				'downloads'      => array(),
+				'tags'           => array(),
+				'targetplatform' => array(),
+			);
+
+			$properties = get_object_vars($update);
+
+			foreach ($properties as $nodeName => $nodeContent)
+			{
+				switch ($nodeName)
+				{
+					default:
+						$entry[ $nodeName ] = $nodeContent;
+						break;
+
+					case 'infourl':
+					case 'downloads':
+					case 'tags':
+					case 'targetplatform':
+						break;
+				}
+			}
+
+			$infourlNode               = $update->xpath('infourl');
+			$entry['infourl']['title'] = (string) $infourlNode[0]['title'];
+			$entry['infourl']['url']   = (string) $infourlNode[0];
+
+			$downloadNodes = $update->xpath('downloads/downloadurl');
+			foreach ($downloadNodes as $downloadNode)
+			{
+				$entry['downloads'][] = array(
+					'type'   => (string) $downloadNode['type'],
+					'format' => (string) $downloadNode['format'],
+					'url'    => (string) $downloadNode,
+				);
+			}
+
+			$tagNodes = $update->xpath('tags/tag');
+			foreach ($tagNodes as $tagNode)
+			{
+				$entry['tags'][] = (string) $tagNode;
+			}
+
+			/** @var SimpleXMLElement[] $targetPlatformNode */
+			$targetPlatformNode = $update->xpath('targetplatform');
+
+			$entry['targetplatform']['name']    = (string) $targetPlatformNode[0]['name'];
+			$entry['targetplatform']['version'] = (string) $targetPlatformNode[0]['version'];
+			$client                             = $targetPlatformNode[0]->xpath('client');
+			$entry['targetplatform']['client']  = (is_array($client) && count($client)) ? (string) $client[0] : '';
+			$folder                             = $targetPlatformNode[0]->xpath('folder');
+			$entry['targetplatform']['folder']  = is_array($folder) && count($folder) ? (string) $folder[0] : '';
+
+			$ret[] = $entry;
+		}
+
+		unset($xml);
+
+		return $ret;
+	}
+
+	/**
+	 * Reads a "collection" XML update source and picks the correct source URL
+	 * for the extension update source.
+	 *
+	 * @param   string $url      The collection XML update source URL to read from
+	 * @param   string $jVersion Joomla! version to fetch updates for, or null to use JVERSION
+	 *
+	 * @return  string  The URL of the extension update source, or empty if no updates are provided / fetching failed
+	 */
+	public function getUpdateSourceFromCollection($url, $jVersion = null)
+	{
+		$provider = new FOFUtilsUpdateCollection();
+
+		return $provider->getExtensionUpdateSource($url, 'file', 'joomla', $jVersion);
+	}
+
+	/**
+	 * Determines the properties of a version: STS/LTS, normal or testing
+	 *
+	 * @param   string $jVersion       The version number to check
+	 * @param   string $currentVersion The current Joomla! version number
+	 *
+	 * @return  array  The properties analysis
+	 */
+	public function getVersionProperties($jVersion, $currentVersion = null)
+	{
+		// Initialise
+		$ret = array(
+			'lts'     => true,
+			// Is this an LTS release? False means STS.
+			'current' => false,
+			// Is this a release in the $currentVersion branch?
+			'upgrade' => 'none',
+			// Upgrade relation of $jVersion to $currentVersion: 'none' (can't upgrade), 'lts' (next or current LTS), 'sts' (next or current STS) or 'current' (same release, no upgrade available)
+			'testing' => false,
+			// Is this a testing (alpha, beta, RC) release?
+		);
+
+		// Get the current version if none is defined
+		if (is_null($currentVersion))
+		{
+			$currentVersion = JVERSION;
+		}
+
+		// Sanitise version numbers
+		$sameVersion    = $jVersion == $currentVersion;
+		$jVersion       = $this->sanitiseVersion($jVersion);
+		$currentVersion = $this->sanitiseVersion($currentVersion);
+		$sameVersion    = $sameVersion || ($jVersion == $currentVersion);
+
+		// Get the base version
+		$baseVersion = substr($jVersion, 0, 3);
+
+		// Get the minimum and maximum current version numbers
+		$current_minimum = substr($currentVersion, 0, 3);
+		$current_maximum = $current_minimum . '.9999';
+
+		// Initialise STS/LTS version numbers
+		$sts_minimum = false;
+		$sts_maximum = false;
+		$lts_minimum = false;
+
+		// Is it an LTS or STS release?
+		switch ($baseVersion)
+		{
+			case '1.5':
+				$ret['lts'] = true;
+				break;
+
+			case '1.6':
+				$ret['lts']  = false;
+				$sts_minimum = '1.7';
+				$sts_maximum = '1.7.999';
+				$lts_minimum = '2.5';
+				break;
+
+			case '1.7':
+				$ret['lts']  = false;
+				$sts_minimum = false;
+				$lts_minimum = '2.5';
+				break;
+
+			case '2.5':
+				$ret['lts']  = true;
+				$sts_minimum = false;
+				$lts_minimum = '2.5';
+				break;
+
+			default:
+				$majorVersion = (int) substr($jVersion, 0, 1);
+				//$minorVersion = (int) substr($jVersion, 2, 1);
+
+				$ret['lts']  = true;
+				$sts_minimum = false;
+				$lts_minimum = $majorVersion . '.0';
+				break;
+		}
+
+		// Is it a current release?
+		if (version_compare($jVersion, $current_minimum, 'ge') && version_compare($jVersion, $current_maximum, 'le'))
+		{
+			$ret['current'] = true;
+		}
+
+		// Is this a testing release?
+		$versionParts    = explode('.', $jVersion);
+		$lastVersionPart = array_pop($versionParts);
+
+		if (in_array(substr($lastVersionPart, 0, 1), array('a', 'b')))
+		{
+			$ret['testing'] = true;
+		}
+		elseif (substr($lastVersionPart, 0, 2) == 'rc')
+		{
+			$ret['testing'] = true;
+		}
+		elseif (substr($lastVersionPart, 0, 3) == 'dev')
+		{
+			$ret['testing'] = true;
+		}
+
+		// Find the upgrade relation of $jVersion to $currentVersion
+		if (version_compare($jVersion, $currentVersion, 'eq'))
+		{
+			$ret['upgrade'] = 'current';
+		}
+		elseif (($sts_minimum !== false) && version_compare($jVersion, $sts_minimum, 'ge') && version_compare($jVersion, $sts_maximum, 'le'))
+		{
+			$ret['upgrade'] = 'sts';
+		}
+		elseif (($lts_minimum !== false) && version_compare($jVersion, $lts_minimum, 'ge'))
+		{
+			$ret['upgrade'] = 'lts';
+		}
+		elseif ($baseVersion == $current_minimum)
+		{
+			$ret['upgrade'] = $ret['lts'] ? 'lts' : 'sts';
+		}
+		else
+		{
+			$ret['upgrade'] = 'none';
+		}
+
+		if ($sameVersion)
+		{
+			$ret['upgrade'] = 'none';
+		}
+
+		return $ret;
+	}
+
+
+	/**
+	 * Filters a list of updates, making sure they apply to the specifed CMS
+	 * release.
+	 *
+	 * @param   array  $updates  A list of update records returned by the getUpdatesFromExtension method
+	 * @param   string $jVersion The current Joomla! version number
+	 *
+	 * @return  array  A filtered list of updates. Each update record also includes version relevance information.
+	 */
+	public function filterApplicableUpdates($updates, $jVersion = null)
+	{
+		if (empty($jVersion))
+		{
+			$jVersion = JVERSION;
+		}
+
+		$versionParts          = explode('.', $jVersion, 4);
+		$platformVersionMajor  = $versionParts[0];
+		$platformVersionMinor  = $platformVersionMajor . '.' . $versionParts[1];
+		$platformVersionNormal = $platformVersionMinor . '.' . $versionParts[2];
+		//$platformVersionFull   = (count($versionParts) > 3) ? $platformVersionNormal . '.' . $versionParts[3] : $platformVersionNormal;
+
+		$ret = array();
+
+		foreach ($updates as $update)
+		{
+			// Check each update for platform match
+			if (strtolower($update['targetplatform']['name']) != 'joomla')
+			{
+				continue;
+			}
+
+			$targetPlatformVersion = $update['targetplatform']['version'];
+
+			if (!preg_match('/' . $targetPlatformVersion . '/', $platformVersionMinor))
+			{
+				continue;
+			}
+
+			// Get some information from the version number
+			$updateVersion     = $update['version'];
+			$versionProperties = $this->getVersionProperties($updateVersion, $jVersion);
+
+			if ($versionProperties['upgrade'] == 'none')
+			{
+				continue;
+			}
+
+			// The XML files are ill-maintained. Maybe we already have this update?
+			if (!array_key_exists($updateVersion, $ret))
+			{
+				$ret[ $updateVersion ] = array_merge($update, $versionProperties);
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Joomla! has a lousy track record in naming its alpha, beta and release
+	 * candidate releases. The convention used seems to be "what the hell the
+	 * current package maintainer thinks looks better". This method tries to
+	 * figure out what was in the mind of the maintainer and translate the
+	 * funky version number to an actual PHP-format version string.
+	 *
+	 * @param   string $version The whatever-format version number
+	 *
+	 * @return  string  A standard formatted version number
+	 */
+	public function sanitiseVersion($version)
+	{
+		$test                   = strtolower($version);
+		$alphaQualifierPosition = strpos($test, 'alpha-');
+		$betaQualifierPosition  = strpos($test, 'beta-');
+		$betaQualifierPosition2 = strpos($test, '-beta');
+		$rcQualifierPosition    = strpos($test, 'rc-');
+		$rcQualifierPosition2 = strpos($test, '-rc');
+		$rcQualifierPosition3 = strpos($test, 'rc');
+		$devQualifiedPosition   = strpos($test, 'dev');
+
+		if ($alphaQualifierPosition !== false)
+		{
+			$betaRevision = substr($test, $alphaQualifierPosition + 6);
+			if (!$betaRevision)
+			{
+				$betaRevision = 1;
+			}
+			$test = substr($test, 0, $alphaQualifierPosition) . '.a' . $betaRevision;
+		}
+		elseif ($betaQualifierPosition !== false)
+		{
+			$betaRevision = substr($test, $betaQualifierPosition + 5);
+			if (!$betaRevision)
+			{
+				$betaRevision = 1;
+			}
+			$test = substr($test, 0, $betaQualifierPosition) . '.b' . $betaRevision;
+		}
+		elseif ($betaQualifierPosition2 !== false)
+		{
+			$betaRevision = substr($test, $betaQualifierPosition2 + 5);
+
+			if (!$betaRevision)
+			{
+				$betaRevision = 1;
+			}
+
+			$test = substr($test, 0, $betaQualifierPosition2) . '.b' . $betaRevision;
+		}
+		elseif ($rcQualifierPosition !== false)
+		{
+			$betaRevision = substr($test, $rcQualifierPosition + 5);
+			if (!$betaRevision)
+			{
+				$betaRevision = 1;
+			}
+			$test = substr($test, 0, $rcQualifierPosition) . '.rc' . $betaRevision;
+		}
+		elseif ($rcQualifierPosition2 !== false)
+		{
+			$betaRevision = substr($test, $rcQualifierPosition2 + 3);
+
+			if (!$betaRevision)
+			{
+				$betaRevision = 1;
+			}
+
+			$test = substr($test, 0, $rcQualifierPosition2) . '.rc' . $betaRevision;
+		}
+		elseif ($rcQualifierPosition3 !== false)
+		{
+			$betaRevision = substr($test, $rcQualifierPosition3 + 5);
+
+			if (!$betaRevision)
+			{
+				$betaRevision = 1;
+			}
+
+			$test = substr($test, 0, $rcQualifierPosition3) . '.rc' . $betaRevision;
+		}
+		elseif ($devQualifiedPosition !== false)
+		{
+			$betaRevision = substr($test, $devQualifiedPosition + 6);
+			if (!$betaRevision)
+			{
+				$betaRevision = '';
+			}
+			$test = substr($test, 0, $devQualifiedPosition) . '.dev' . $betaRevision;
+		}
+
+		return $test;
+	}
+
+	/**
+	 * Reloads the list of all updates available for the specified Joomla! version
+	 * from the network.
+	 *
+	 * @param    array  $sources  The enabled sources to look into
+	 * @param    string $jVersion The Joomla! version we are checking updates for
+	 *
+	 * @return   array  A list of updates for the installed, current, lts and sts versions
+	 */
+	public function getUpdates($sources = array(), $jVersion = null)
+	{
+		// Make sure we have a valid list of sources
+		if (empty($sources) || !is_array($sources))
+		{
+			$sources = array();
+		}
+
+		$defaultSources = array('lts' => true, 'sts' => true, 'test' => true, 'custom' => '');
+
+		$sources = array_merge($defaultSources, $sources);
+
+		// Use the current JVERSION if none is specified
+		if (empty($jVersion))
+		{
+			$jVersion = JVERSION;
+		}
+
+		// Get the current branch' min/max versions
+		$versionParts      = explode('.', $jVersion, 4);
+		$currentMinVersion = $versionParts[0] . '.' . $versionParts[1];
+		$currentMaxVersion = $versionParts[0] . '.' . $versionParts[1] . '.9999';
+
+
+		// Retrieve all updates
+		$allUpdates = array();
+
+		foreach ($sources as $source => $value)
+		{
+			if (($value === false) || empty($value))
+			{
+				continue;
+			}
+
+			switch ($source)
+			{
+				case 'lts':
+					$url = self::$lts_url;
+					break;
+
+				case 'sts':
+					$url = self::$sts_url;
+					break;
+
+				case 'test':
+					$url = self::$test_url;
+					break;
+
+				default:
+				case 'custom':
+					$url = $value;
+					break;
+			}
+
+			$url = $this->getUpdateSourceFromCollection($url, $jVersion);
+
+			if (!empty($url))
+			{
+				$updates = $this->getUpdatesFromExtension($url);
+
+				if (!empty($updates))
+				{
+					$applicableUpdates = $this->filterApplicableUpdates($updates, $jVersion);
+
+					if (!empty($applicableUpdates))
+					{
+						$allUpdates = array_merge($allUpdates, $applicableUpdates);
+					}
+				}
+			}
+		}
+
+		$ret = array(
+			// Currently installed version (used to reinstall, if available)
+			'installed' => array(
+				'version' => '',
+				'package' => '',
+				'infourl' => '',
+			),
+			// Current branch
+			'current'   => array(
+				'version' => '',
+				'package' => '',
+				'infourl' => '',
+			),
+			// Upgrade to STS release
+			'sts'       => array(
+				'version' => '',
+				'package' => '',
+				'infourl' => '',
+			),
+			// Upgrade to LTS release
+			'lts'       => array(
+				'version' => '',
+				'package' => '',
+				'infourl' => '',
+			),
+			// Upgrade to LTS release
+			'test'      => array(
+				'version' => '',
+				'package' => '',
+				'infourl' => '',
+			),
+		);
+
+		foreach ($allUpdates as $update)
+		{
+			$sections = array();
+
+			if ($update['upgrade'] == 'current')
+			{
+				$sections[0] = 'installed';
+			}
+			elseif (version_compare($update['version'], $currentMinVersion, 'ge') && version_compare($update['version'], $currentMaxVersion, 'le'))
+			{
+				$sections[0] = 'current';
+			}
+			else
+			{
+				$sections[0] = '';
+			}
+
+			$sections[1] = $update['lts'] ? 'lts' : 'sts';
+
+			if ($update['testing'])
+			{
+				$sections = array('test');
+			}
+
+			foreach ($sections as $section)
+			{
+				if (empty($section))
+				{
+					continue;
+				}
+
+				$existingVersionForSection = $ret[ $section ]['version'];
+
+				if (empty($existingVersionForSection))
+				{
+					$existingVersionForSection = '0.0.0';
+				}
+
+				if (version_compare($update['version'], $existingVersionForSection, 'ge'))
+				{
+					$ret[ $section ]['version'] = $update['version'];
+					$ret[ $section ]['package'] = $update['downloads'][0]['url'];
+					$ret[ $section ]['infourl'] = $update['infourl']['url'];
+				}
+			}
+		}
+
+		// Catch the case when the latest current branch version is the installed version (up to date site)
+		if (empty($ret['current']['version']) && !empty($ret['installed']['version']))
+		{
+			$ret['current'] = $ret['installed'];
+		}
+
+		return $ret;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/fof/utils/update/update.php b/core/libraries/fof/utils/update/update.php
new file mode 100644
index 00000000..d459538f
--- /dev/null
+++ b/core/libraries/fof/utils/update/update.php
@@ -0,0 +1,1213 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  utils
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+if (version_compare(JVERSION, '2.5.0', 'lt'))
+{
+	jimport('joomla.updater.updater');
+}
+
+/**
+ * A helper Model to interact with Joomla!'s extensions update feature
+ */
+class FOFUtilsUpdate extends FOFModel
+{
+	/** @var JUpdater The Joomla! updater object */
+	protected $updater = null;
+
+	/** @var int The extension_id of this component */
+	protected $extension_id = 0;
+
+	/** @var string The currently installed version, as reported by the #__extensions table */
+	protected $version = 'dev';
+
+	/** @var string The machine readable name of the component e.g. com_something */
+	protected $component = 'com_foobar';
+
+	/** @var string The human readable name of the component e.g. Your Component's Name. Used for emails. */
+	protected $componentDescription = 'Foobar';
+
+	/** @var string The URL to the component's update XML stream */
+	protected $updateSite = null;
+
+	/** @var string The name to the component's update site (description of the update XML stream) */
+	protected $updateSiteName = null;
+
+	/** @var string The extra query to append to (commercial) components' download URLs */
+	protected $extraQuery = null;
+
+	/** @var string The common parameters' key, used for storing data in the #__akeeba_common table */
+	protected $commonKey = 'foobar';
+
+	/**
+	 * The common parameters table. It's a simple table with key(VARCHAR) and value(LONGTEXT) fields.
+	 * Here is an example MySQL CREATE TABLE command to make this kind of table:
+	 *
+	 * CREATE TABLE `#__akeeba_common` (
+	 * 	`key` varchar(255) NOT NULL,
+	 * 	`value` longtext NOT NULL,
+	 * 	PRIMARY KEY (`key`)
+	 * 	) DEFAULT COLLATE utf8_general_ci CHARSET=utf8;
+	 *
+	 * @var  string
+	 */
+	protected $commonTable = '#__akeeba_common';
+
+	/**
+	 * Subject of the component update emails
+	 *
+	 * @var  string
+	 */
+	protected $updateEmailSubject = 'THIS EMAIL IS SENT FROM YOUR SITE "[SITENAME]" - Update available for [COMPONENT], new version [VERSION]';
+
+	/**
+	 * Body of the component update email
+	 *
+	 * @var  string
+	 */
+	protected $updateEmailBody= <<< ENDBLOCK
+This email IS NOT sent by the authors of [COMPONENT].
+It is sent automatically by your own site, [SITENAME].
+
+================================================================================
+UPDATE INFORMATION
+================================================================================
+
+Your site has determined that there is an updated version of [COMPONENT]
+available for download.
+
+New version number: [VERSION]
+
+This email is sent to you by your site to remind you of this fact. The authors
+of the software will never contact you about available updates.
+
+================================================================================
+WHY AM I RECEIVING THIS EMAIL?
+================================================================================
+
+This email has been automatically sent by a CLI script or Joomla! plugin you, or
+the person who built or manages your site, has installed and explicitly
+activated. This script or plugin looks for updated versions of the software and
+sends an email notification to all Super Users. You will receive several similar
+emails from your site, up to 6 times per day, until you either update the
+software or disable these emails.
+
+To disable these emails, please contact your site administrator.
+
+If you do not understand what this means, please do not contact the authors of
+the software. They are NOT sending you this email and they cannot help you.
+Instead, please contact the person who built or manages your site.
+
+================================================================================
+WHO SENT ME THIS EMAIL?
+================================================================================
+
+This email is sent to you by your own site, [SITENAME]
+ENDBLOCK;
+
+	/**
+	 * Public constructor. Initialises the protected members as well. Useful $config keys:
+	 * update_component		The component name, e.g. com_foobar
+	 * update_version		The default version if the manifest cache is unreadable
+	 * update_site			The URL to the component's update XML stream
+	 * update_extraquery	The extra query to append to (commercial) components' download URLs
+	 * update_sitename		The update site's name (description)
+	 *
+	 * @param array $config
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Get an instance of the updater class
+		$this->updater = JUpdater::getInstance();
+
+		// Get the component name
+		if (isset($config['update_component']))
+		{
+			$this->component = $config['update_component'];
+		}
+		else
+		{
+			$this->component = $this->input->getCmd('option', '');
+		}
+
+		// Get the component description
+		if (isset($config['update_component_description']))
+		{
+			$this->component = $config['update_component_description'];
+		}
+		else
+		{
+			// Try to auto-translate (hopefully you've loaded the language files)
+			$key = strtoupper($this->component);
+			$description = JText::_($key);
+		}
+
+		// Get the component version
+		if (isset($config['update_version']))
+		{
+			$this->version = $config['update_version'];
+		}
+
+		// Get the common key
+		if (isset($config['common_key']))
+		{
+			$this->commonKey = $config['common_key'];
+		}
+		else
+		{
+			// Convert com_foobar, pkg_foobar etc to "foobar"
+			$this->commonKey = substr($this->component, 4);
+		}
+
+		// Get the update site
+		if (isset($config['update_site']))
+		{
+			$this->updateSite = $config['update_site'];
+		}
+
+		// Get the extra query
+		if (isset($config['update_extraquery']))
+		{
+			$this->extraQuery = $config['update_extraquery'];
+		}
+
+		// Get the update site's name
+		if (isset($config['update_sitename']))
+		{
+			$this->updateSiteName = $config['update_sitename'];
+		}
+
+		// Find the extension ID
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->qn('#__extensions'))
+			->where($db->qn('type') . ' = ' . $db->q('component'))
+			->where($db->qn('element') . ' = ' . $db->q($this->component));
+		$db->setQuery($query);
+		$extension = $db->loadObject();
+
+		if (is_object($extension))
+		{
+			$this->extension_id = $extension->extension_id;
+			$data = json_decode($extension->manifest_cache, true);
+
+			if (isset($data['version']))
+			{
+				$this->version = $data['version'];
+			}
+		}
+	}
+
+	/**
+	 * Retrieves the update information of the component, returning an array with the following keys:
+	 *
+	 * hasUpdate	True if an update is available
+	 * version		The version of the available update
+	 * infoURL		The URL to the download page of the update
+	 *
+	 * @param   bool    $force            Set to true if you want to forcibly reload the update information
+	 * @param   string  $preferredMethod  Preferred update method: 'joomla' or 'classic'
+	 *
+	 * @return  array  See the method description for more information
+	 */
+	public function getUpdates($force = false, $preferredMethod = null)
+	{
+		// Default response (no update)
+		$updateResponse = array(
+			'hasUpdate' => false,
+			'version'   => '',
+			'infoURL'   => '',
+			'downloadURL' => '',
+		);
+
+		if (empty($this->extension_id))
+		{
+			return $updateResponse;
+		}
+
+		$updateRecord = $this->findUpdates($force, $preferredMethod);
+
+		// If we have an update record in the database return the information found there
+		if (is_object($updateRecord))
+		{
+			$updateResponse = array(
+				'hasUpdate' => true,
+				'version'   => $updateRecord->version,
+				'infoURL'   => $updateRecord->infourl,
+				'downloadURL' => $updateRecord->downloadurl,
+			);
+		}
+
+		return $updateResponse;
+	}
+
+	/**
+	 * Find the available update record object. If we're at the latest version it will return null.
+	 *
+	 * Please see getUpdateMethod for information on how the $preferredMethod is handled and what it means.
+	 *
+	 * @param   bool    $force            Should I forcibly reload the updates from the server?
+	 * @param   string  $preferredMethod  Preferred update method: 'joomla' or 'classic'
+	 *
+	 * @return  \stdClass|null
+	 */
+	public function findUpdates($force, $preferredMethod = null)
+	{
+		$preferredMethod = $this->getUpdateMethod($preferredMethod);
+
+		switch ($preferredMethod)
+		{
+			case 'joomla':
+				return $this->findUpdatesJoomla($force);
+				break;
+
+			default:
+			case 'classic':
+				return $this->findUpdatesClassic($force);
+				break;
+		}
+	}
+
+	/**
+	 * Gets the update site Ids for our extension.
+	 *
+	 * @return 	mixed	An array of Ids or null if the query failed.
+	 */
+	public function getUpdateSiteIds()
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+		$query = $db->getQuery(true)
+					->select($db->qn('update_site_id'))
+					->from($db->qn('#__update_sites_extensions'))
+					->where($db->qn('extension_id') . ' = ' . $db->q($this->extension_id));
+		$db->setQuery($query);
+		$updateSiteIds = $db->loadColumn(0);
+
+		return $updateSiteIds;
+	}
+
+	/**
+	 * Get the currently installed version as reported by the #__extensions table
+	 *
+	 * @return  string
+	 */
+	public function getVersion()
+	{
+		return $this->version;
+	}
+
+	/**
+	 * Returns the name of the component, e.g. com_foobar
+	 *
+	 * @return  string
+	 */
+	public function getComponentName()
+	{
+		return $this->component;
+	}
+
+	/**
+	 * Returns the human readable component name, e.g. Foobar Component
+	 *
+	 * @return  string
+	 */
+	public function getComponentDescription()
+	{
+		return $this->componentDescription;
+	}
+
+	/**
+	 * Returns the numeric extension ID for the component
+	 *
+	 * @return  int
+	 */
+	public function getExtensionId()
+	{
+		return $this->extension_id;
+	}
+
+	/**
+	 * Returns the update site URL, i.e. the URL to the XML update stream
+	 *
+	 * @return  string
+	 */
+	public function getUpdateSite()
+	{
+		return $this->updateSite;
+	}
+
+	/**
+	 * Returns the human readable description of the update site
+	 *
+	 * @return  string
+	 */
+	public function getUpdateSiteName()
+	{
+		return $this->updateSiteName;
+	}
+
+	/**
+	 * Override the currently installed version as reported by the #__extensions table
+	 *
+	 * @param  string  $version
+	 */
+	public function setVersion($version)
+	{
+		$this->version = $version;
+	}
+
+	/**
+	 * Refreshes the Joomla! update sites for this extension as needed
+	 *
+	 * @return  void
+	 */
+	public function refreshUpdateSite()
+	{
+		// Joomla! 1.5 does not have update sites.
+		if (version_compare(JVERSION, '1.6.0', 'lt'))
+		{
+			return;
+		}
+
+		if (empty($this->extension_id))
+		{
+			return;
+		}
+
+		// Remove obsolete update sites that don't match our extension ID but match our name or update site location
+		$this->removeObsoleteUpdateSites();
+
+		// Create the update site definition we want to store to the database
+		$update_site = array(
+				'name'		=> $this->updateSiteName,
+				'type'		=> 'extension',
+				'location'	=> $this->updateSite,
+				'enabled'	=> 1,
+				'last_check_timestamp'	=> 0,
+				'extra_query'	=> $this->extraQuery
+		);
+
+		// Get a reference to the db driver
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// Get the #__update_sites columns
+		$columns = $db->getTableColumns('#__update_sites', true);
+
+		if (version_compare(JVERSION, '3.2.0', 'lt') || !array_key_exists('extra_query', $columns))
+		{
+			unset($update_site['extra_query']);
+		}
+
+		if (version_compare(JVERSION, '2.5.0', 'lt') || !array_key_exists('extra_query', $columns))
+		{
+			unset($update_site['last_check_timestamp']);
+		}
+
+		// Get the update sites for our extension
+		$updateSiteIds = $this->getUpdateSiteIds();
+
+		if (empty($updateSiteIds))
+		{
+			$updateSiteIds = array();
+		}
+
+		/** @var boolean $needNewUpdateSite Do I need to create a new update site? */
+		$needNewUpdateSite = true;
+
+		/** @var int[] $deleteOldSites Old Site IDs to delete */
+		$deleteOldSites = array();
+
+		// Loop through all update sites
+		foreach ($updateSiteIds as $id)
+		{
+			$query = $db->getQuery(true)
+						->select('*')
+						->from($db->qn('#__update_sites'))
+						->where($db->qn('update_site_id') . ' = ' . $db->q($id));
+			$db->setQuery($query);
+			$aSite = $db->loadObject();
+
+			if (empty($aSite))
+			{
+				// Update site is now up-to-date, don't need to refresh it anymore.
+				continue;
+			}
+
+			// We have an update site that looks like ours
+			if ($needNewUpdateSite && ($aSite->name == $update_site['name']) && ($aSite->location == $update_site['location']))
+			{
+				$needNewUpdateSite = false;
+				$mustUpdate = false;
+
+				// Is it enabled? If not, enable it.
+				if (!$aSite->enabled)
+				{
+					$mustUpdate = true;
+					$aSite->enabled = 1;
+				}
+
+				// Do we have the extra_query property (J 3.2+) and does it match?
+				if (property_exists($aSite, 'extra_query') && isset($update_site['extra_query'])
+					&& ($aSite->extra_query != $update_site['extra_query']))
+				{
+					$mustUpdate = true;
+					$aSite->extra_query = $update_site['extra_query'];
+				}
+
+				// Update the update site if necessary
+				if ($mustUpdate)
+				{
+					$db->updateObject('#__update_sites', $aSite, 'update_site_id', true);
+				}
+
+				continue;
+			}
+
+			// In any other case we need to delete this update site, it's obsolete
+			$deleteOldSites[] = $aSite->update_site_id;
+		}
+
+		if (!empty($deleteOldSites))
+		{
+			try
+			{
+				$obsoleteIDsQuoted = array_map(array($db, 'quote'), $deleteOldSites);
+
+				// Delete update sites
+				$query = $db->getQuery(true)
+							->delete('#__update_sites')
+							->where($db->qn('update_site_id') . ' IN (' . implode(',', $obsoleteIDsQuoted) . ')');
+				$db->setQuery($query)->execute();
+
+				// Delete update sites to extension ID records
+				$query = $db->getQuery(true)
+							->delete('#__update_sites_extensions')
+							->where($db->qn('update_site_id') . ' IN (' . implode(',', $obsoleteIDsQuoted) . ')');
+				$db->setQuery($query)->execute();
+			}
+			catch (\Exception $e)
+			{
+				// Do nothing on failure
+				return;
+			}
+
+		}
+
+		// Do we still need to create a new update site?
+		if ($needNewUpdateSite)
+		{
+			// No update sites defined. Create a new one.
+			$newSite = (object)$update_site;
+			$db->insertObject('#__update_sites', $newSite);
+
+			$id                  = $db->insertid();
+			$updateSiteExtension = (object)array(
+				'update_site_id' => $id,
+				'extension_id'   => $this->extension_id,
+			);
+			$db->insertObject('#__update_sites_extensions', $updateSiteExtension);
+		}
+	}
+
+	/**
+	 * Removes any update sites which go by the same name or the same location as our update site but do not match the
+	 * extension ID.
+	 */
+	public function removeObsoleteUpdateSites()
+	{
+		$db = $this->getDbo();
+
+		// Get update site IDs
+		$updateSiteIDs = $this->getUpdateSiteIds();
+
+		// Find update sites where the name OR the location matches BUT they are not one of the update site IDs
+		$query = $db->getQuery(true)
+					->select($db->qn('update_site_id'))
+					->from($db->qn('#__update_sites'))
+					->where(
+						'((' . $db->qn('name') . ' = ' . $db->q($this->updateSiteName) . ') OR ' .
+						'(' . $db->qn('location') . ' = ' . $db->q($this->updateSite) . '))'
+					);
+
+		if (!empty($updateSiteIDs))
+		{
+			$updateSitesQuoted = array_map(array($db, 'quote'), $updateSiteIDs);
+			$query->where($db->qn('update_site_id') . ' NOT IN (' . implode(',', $updateSitesQuoted) . ')');
+		}
+
+		try
+		{
+			$ids = $db->setQuery($query)->loadColumn();
+
+			if (!empty($ids))
+			{
+				$obsoleteIDsQuoted = array_map(array($db, 'quote'), $ids);
+
+				// Delete update sites
+				$query = $db->getQuery(true)
+							->delete('#__update_sites')
+							->where($db->qn('update_site_id') . ' IN (' . implode(',', $obsoleteIDsQuoted) . ')');
+				$db->setQuery($query)->execute();
+
+				// Delete update sites to extension ID records
+				$query = $db->getQuery(true)
+							->delete('#__update_sites_extensions')
+							->where($db->qn('update_site_id') . ' IN (' . implode(',', $obsoleteIDsQuoted) . ')');
+				$db->setQuery($query)->execute();
+			}
+		}
+		catch (\Exception $e)
+		{
+			// Do nothing on failure
+			return;
+		}
+	}
+
+	/**
+	 * Get the update method we should use, 'joomla' or 'classic'
+	 *
+	 * You can defined the preferred update method: 'joomla' uses JUpdater whereas 'classic' handles update caching and
+	 * parsing internally. If you are on Joomla! 3.1 or earlier this option is forced to 'classic' since these old
+	 * Joomla! versions couldn't handle updates of commercial components correctly (that's why I contributed the fix to
+	 * that problem, the extra_query field that's present in Joomla! 3.2 onwards).
+	 *
+	 * If 'classic' is defined then it will be used in *all* Joomla! versions. It's the most stable method for fetching
+	 * update information.
+	 *
+	 * @param   string  $preferred  Preferred update method. One of 'joomla' or 'classic'.
+	 *
+	 * @return  string
+	 */
+	public function getUpdateMethod($preferred = null)
+	{
+		$method = $preferred;
+
+		// Make sure the update fetch method is valid, otherwise load the component's "update_method" parameter.
+		$validMethods = array('joomla', 'classic');
+
+		if (!in_array($method, $validMethods))
+		{
+			$method = FOFUtilsConfigHelper::getComponentConfigurationValue($this->component, 'update_method', 'joomla');
+		}
+
+		// We can't handle updates using Joomla!'s extensions updater in Joomla! 3.1 and earlier
+		if (($method == 'joomla') && version_compare(JVERSION, '3.2.0', 'lt'))
+		{
+			$method = 'classic';
+		}
+
+		return $method;
+	}
+
+	/**
+	 * Find the available update record object. If we're at the latest version it will return null.
+	 *
+	 * @param   bool  $force  Should I forcibly reload the updates from the server?
+	 *
+	 * @return  \stdClass|null
+	 */
+	protected function findUpdatesJoomla($force = false)
+	{
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		// If we are forcing the reload, set the last_check_timestamp to 0
+		// and remove cached component update info in order to force a reload
+		if ($force)
+		{
+			// Find the update site IDs
+			$updateSiteIds = $this->getUpdateSiteIds();
+
+			if (empty($updateSiteIds))
+			{
+				return null;
+			}
+
+			// Set the last_check_timestamp to 0
+			if (version_compare(JVERSION, '2.5.0', 'ge'))
+			{
+				$query = $db->getQuery(true)
+							->update($db->qn('#__update_sites'))
+							->set($db->qn('last_check_timestamp') . ' = ' . $db->q('0'))
+							->where($db->qn('update_site_id') .' IN ('.implode(', ', $updateSiteIds).')');
+				$db->setQuery($query);
+				$db->execute();
+			}
+
+			// Remove cached component update info from #__updates
+			$query = $db->getQuery(true)
+						->delete($db->qn('#__updates'))
+						->where($db->qn('update_site_id') .' IN ('.implode(', ', $updateSiteIds).')');
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Use the update cache timeout specified in com_installer
+		$timeout = 3600 * FOFUtilsConfigHelper::getComponentConfigurationValue('com_installer', 'cachetimeout', '6');
+
+		// Load any updates from the network into the #__updates table
+		$this->updater->findUpdates($this->extension_id, $timeout);
+
+		// Get the update record from the database
+		$query = $db->getQuery(true)
+					->select('*')
+					->from($db->qn('#__updates'))
+					->where($db->qn('extension_id') . ' = ' . $db->q($this->extension_id));
+		$db->setQuery($query);
+
+		try
+		{
+			$updateObject = $db->loadObject();
+		}
+		catch (Exception $e)
+		{
+			return null;
+		}
+
+		if (!is_object($updateObject))
+		{
+			return null;
+		}
+
+		$updateObject->downloadurl = '';
+
+		JLoader::import('joomla.updater.update');
+
+		if (class_exists('JUpdate'))
+		{
+			$update = new JUpdate();
+			$update->loadFromXML($updateObject->detailsurl);
+
+			if (isset($update->get('downloadurl')->_data))
+			{
+				$url = trim($update->downloadurl->_data);
+
+				$extra_query = isset($updateObject->extra_query) ? $updateObject->extra_query : $this->extraQuery;
+
+				if ($extra_query)
+				{
+					if (strpos($url, '?') === false)
+					{
+						$url .= '?';
+					}
+					else
+					{
+						$url .= '&amp;';
+					}
+
+					$url .= $extra_query;
+				}
+
+				$updateObject->downloadurl = $url;
+			}
+		}
+
+		return $updateObject;
+	}
+
+	/**
+	 * Find the available update record object. If we're at the latest version return null.
+	 *
+	 * @param   bool  $force  Should I forcibly reload the updates from the server?
+	 *
+	 * @return  \stdClass|null
+	 */
+	protected function findUpdatesClassic($force = false)
+	{
+		$allUpdates = $this->loadUpdatesClassic($force);
+
+		if (empty($allUpdates))
+		{
+			return null;
+		}
+
+		$bestVersion = '0.0.0';
+		$bestUpdate = null;
+		$bestUpdateObject = null;
+
+		foreach($allUpdates as $update)
+		{
+			if (!isset($update['version']))
+			{
+				continue;
+			}
+
+			if (version_compare($bestVersion, $update['version'], 'lt'))
+			{
+				$bestVersion = $update['version'];
+				$bestUpdate = $update;
+			}
+		}
+
+        // If the current version is newer or equal to the best one, unset it. Otherwise the user will be always prompted to update
+        if(version_compare($this->version, $bestVersion, 'ge'))
+        {
+            $bestUpdate = null;
+            $bestVersion = '0.0.0';
+        }
+
+		if (!is_null($bestUpdate))
+		{
+			$url = '';
+
+			if (isset($bestUpdate['downloads']) && isset($bestUpdate['downloads'][0])
+			&& isset($bestUpdate['downloads'][0]['url']))
+			{
+				$url = $bestUpdate['downloads'][0]['url'];
+			}
+
+			if ($this->extraQuery)
+			{
+				if (strpos($url, '?') === false)
+				{
+					$url .= '?';
+				}
+				else
+				{
+					$url .= '&amp;';
+				}
+
+				$url .= $this->extraQuery;
+			}
+
+			$bestUpdateObject = (object)array(
+					'update_id'      => 0,
+					'update_site_id' => 0,
+					'extension_id'   => $this->extension_id,
+					'name'           => $this->updateSiteName,
+					'description'    => $bestUpdate['description'],
+					'element'        => $bestUpdate['element'],
+					'type'           => $bestUpdate['type'],
+					'folder'         => count($bestUpdate['folder']) ? $bestUpdate['folder'][0] : '',
+					'client_id'      => isset($bestUpdate['client']) ? $bestUpdate['client'] : 0,
+					'version'        => $bestUpdate['version'],
+					'data'           => '',
+					'detailsurl'     => $this->updateSite,
+					'infourl'        => $bestUpdate['infourl']['url'],
+					'extra_query'    => $this->extraQuery,
+					'downloadurl'	 => $url,
+			);
+		}
+
+		return $bestUpdateObject;
+	}
+
+	/**
+	 * Load all available updates without going through JUpdate
+	 *
+	 * @param   bool  $force  Should I forcibly reload the updates from the server?
+	 *
+	 * @return  array
+	 */
+	protected function loadUpdatesClassic($force = false)
+	{
+		// Is the cache busted? If it is I set $force = true to make sure I download fresh updates
+		if (!$force)
+		{
+			// Get the cache timeout. On older Joomla! installations it will always default to 6 hours.
+			$timeout = 3600 * FOFUtilsConfigHelper::getComponentConfigurationValue('com_installer', 'cachetimeout', '6');
+
+			// Do I need to check for updates?
+			$lastCheck = $this->getCommonParameter('lastcheck', 0);
+			$now = time();
+
+			if (($now - $lastCheck) >= $timeout)
+			{
+				$force = true;
+			}
+		}
+
+		// Get the cached JSON-encoded updates list
+		$rawUpdates = $this->getCommonParameter('allUpdates', '');
+
+		// Am I forced to reload the XML file (explicitly or because the cache is busted)?
+		if ($force)
+		{
+			// Set the timestamp
+			$now = time();
+			$this->setCommonParameter('lastcheck', $now);
+
+			// Get all available updates
+			$updateHelper = new FOFUtilsUpdateExtension();
+			$updates = $updateHelper->getUpdatesFromExtension($this->updateSite);
+
+			// Save the raw updates list in the database
+			$rawUpdates = json_encode($updates);
+			$this->setCommonParameter('allUpdates', $rawUpdates);
+		}
+
+		// Decode the updates list
+		$updates = json_decode($rawUpdates, true);
+
+		// Walk through the updates and find the ones compatible with our Joomla! and PHP version
+		$compatibleUpdates = array();
+
+		// Get the Joomla! version family (e.g. 2.5)
+		$jVersion = JVERSION;
+		$jVersionParts = explode('.', $jVersion);
+		$jVersionShort = $jVersionParts[0] . '.' . $jVersionParts[1];
+
+		// Get the PHP version family (e.g. 5.6)
+		$phpVersion = PHP_VERSION;
+		$phpVersionParts = explode('.', $phpVersion);
+		$phpVersionShort = $phpVersionParts[0] . '.' . $phpVersionParts[1];
+
+		foreach ($updates as $update)
+		{
+			// No platform?
+			if (!isset($update['targetplatform']))
+			{
+				continue;
+			}
+
+			// Wrong platform?
+			if ($update['targetplatform']['name'] != 'joomla')
+			{
+				continue;
+			}
+
+			// Get the target Joomla! version
+			$targetJoomlaVersion = $update['targetplatform']['version'];
+			$targetVersionParts = explode('.', $targetJoomlaVersion);
+			$targetVersionShort = $targetVersionParts[0] . '.' . $targetVersionParts[1];
+
+			// The target version MUST be in the same Joomla! branch
+			if ($jVersionShort != $targetVersionShort)
+			{
+				continue;
+			}
+
+			// If the target version is major.minor.revision we must make sure our current JVERSION is AT LEAST equal to that.
+			if (version_compare($targetJoomlaVersion, JVERSION, 'gt'))
+			{
+				continue;
+			}
+
+			// Do I have target PHP versions?
+			if (isset($update['ars-phpcompat']))
+			{
+				$phpCompatible = false;
+
+				foreach ($update['ars-phpcompat'] as $entry)
+				{
+					// Get the target PHP version family
+					$targetPHPVersion = $entry['@attributes']['version'];
+					$targetPHPVersionParts = explode('.', $targetPHPVersion);
+					$targetPHPVersionShort = $targetPHPVersionParts[0] . '.' . $targetPHPVersionParts[1];
+
+					// The target PHP version MUST be in the same PHP branch
+					if ($phpVersionShort != $targetPHPVersionShort)
+					{
+						continue;
+					}
+
+					// If the target version is major.minor.revision we must make sure our current PHP_VERSION is AT LEAST equal to that.
+					if (version_compare($targetPHPVersion, PHP_VERSION, 'gt'))
+					{
+						continue;
+					}
+
+					$phpCompatible = true;
+					break;
+				}
+
+				if (!$phpCompatible)
+				{
+					continue;
+				}
+			}
+
+			// All checks pass. Add this update to the list of compatible updates.
+			$compatibleUpdates[] = $update;
+		}
+
+		return $compatibleUpdates;
+	}
+
+	/**
+	 * Get a common parameter from the #__akeeba_common table
+	 *
+	 * @param   string  $key      The key to retrieve
+	 * @param   mixed   $default  The default value in case none is set
+	 *
+	 * @return  mixed  The saved parameter value (or $default, if nothing is currently set)
+	 */
+	protected function getCommonParameter($key, $default = null)
+	{
+		$dbKey = $this->commonKey . '_autoupdate_' . $key;
+
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		$query = $db->getQuery(true)
+					->select($db->qn('value'))
+					->from($db->qn($this->commonTable))
+					->where($db->qn('key') . ' = ' . $db->q($dbKey));
+
+		$result = $db->setQuery($query)->loadResult();
+
+		if (!$result)
+		{
+			return $default;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Set a common parameter from the #__akeeba_common table
+	 *
+	 * @param   string  $key    The key to set
+	 * @param   mixed   $value  The value to set
+	 *
+	 * @return  void
+	 */
+	protected function setCommonParameter($key, $value)
+	{
+		$dbKey = $this->commonKey . '_autoupdate_' . $key;
+
+		$db = FOFPlatform::getInstance()->getDbo();
+
+		$query = $db->getQuery(true)
+					->select('COUNT(*)')
+					->from($db->qn($this->commonTable))
+					->where($db->qn('key') . ' = ' . $db->q($dbKey));
+		$count = $db->setQuery($query)->loadResult();
+
+		if ($count)
+		{
+			$query = $db->getQuery(true)
+						->update($db->qn($this->commonTable))
+						->set($db->qn('value') . ' = ' . $db->q($value))
+						->where($db->qn('key') . ' = ' . $db->q($dbKey));
+			$db->setQuery($query)->execute();
+		}
+		else
+		{
+			$data = (object)array(
+					'key'   => $dbKey,
+					'value' => $value,
+			);
+
+			$db->insertObject($this->commonTable, $data);
+		}
+	}
+
+	/**
+	 * Proxy to updateComponent(). Required since old versions of our software had an updateComponent method declared
+	 * private. If we set the updateComponent() method public we cause a fatal error.
+	 *
+	 * @return  string
+	 */
+	public function doUpdateComponent()
+	{
+		return $this->updateComponent();
+	}
+
+	/**
+	 * Automatically install the extension update under Joomla! 1.5.5 or later (web) / 3.0 or later (CLI).
+	 *
+	 * @return  string  The update message
+	 */
+	private function updateComponent()
+	{
+		$isCli          = FOFPlatform::getInstance()->isCli();
+		$minVersion     = $isCli ? '3.0.0' : '1.5.5';
+		$errorQualifier = $isCli ? ' using an unattended CLI CRON script ' : ' ';
+
+		if (version_compare(JVERSION, $minVersion, 'lt'))
+		{
+			return "Extension updates{$errorQualifier}only work with Joomla! $minVersion and later.";
+		}
+
+		try
+		{
+			$updatePackagePath = $this->downloadUpdate();
+		}
+		catch (Exception $e)
+		{
+			return $e->getMessage();
+		}
+
+		// Unpack the downloaded package file
+		jimport('joomla.installer.helper');
+		jimport('cms.installer.helper');
+		$package = JInstallerHelper::unpack($updatePackagePath);
+
+		if (!$package)
+		{
+			// Clean up
+			if (JFile::exists($updatePackagePath))
+			{
+				JFile::delete($updatePackagePath);
+			}
+
+			return "An error occurred while unpacking the file. Please double check your Joomla temp-directory setting in Global Configuration.";
+		}
+
+		$installer = new JInstaller;
+		$installed = $installer->install($package['extractdir']);
+
+		// Let's cleanup the downloaded archive and the temp folder
+		if (JFolder::exists($package['extractdir']))
+		{
+			JFolder::delete($package['extractdir']);
+		}
+
+		if (JFile::exists($package['packagefile']))
+		{
+			JFile::delete($package['packagefile']);
+		}
+
+		if ($installed)
+		{
+			return "Component successfully updated";
+		}
+		else
+		{
+			return "An error occurred while trying to update the component";
+		}
+	}
+
+	/**
+	 * Downloads the latest update package to Joomla!'s temporary directory
+	 *
+	 * @return  string  The absolute path to the downloaded update package.
+	 */
+	public function downloadUpdate()
+	{
+		// Get the update URL
+		$updateInformation = $this->getUpdates();
+		$url               = $updateInformation['downloadURL'];
+
+		if (empty($url))
+		{
+			throw new RuntimeException("No download URL was provided in the update information");
+		}
+
+		$config   = JFactory::getConfig();
+		$tmp_dest = $config->get('tmp_path');
+
+		if (!$tmp_dest)
+		{
+			throw new RuntimeException("You must set a non-empty Joomla! temp-directory in Global Configuration before continuing.");
+		}
+
+		if (!JFolder::exists($tmp_dest))
+		{
+			throw new RuntimeException("Joomla!'s temp-directory does not exist. Please set the correct path in Global Configuration before continuing.");
+		}
+
+		// Get the target filename
+		$filename = $this->component . '.zip';
+		$filename = rtrim($tmp_dest, '\\/') . '/' . $filename;
+
+		try
+		{
+			$downloader = new FOFDownload();
+			$data = $downloader->getFromURL($url);
+		}
+		catch (Exception $e)
+		{
+			$code =$e->getCode();
+			$message =$e->getMessage();
+			throw new RuntimeException("An error occurred while trying to download the update package. Double check your Download ID and your server's network settings. The error message was: #$code: $message");
+		}
+
+		if (!JFile::write($filename, $data))
+		{
+			if (!file_put_contents($filename, $data))
+			{
+				throw new RuntimeException("Joomla!'s temp-directory is not writeable. Please check its permissions or set a different, writeable path in Global Configuration before continuing.");
+			}
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Gets a file name out of a url
+	 *
+	 * @param   string  $url  URL to get name from
+	 *
+	 * @return  mixed   String filename or boolean false if failed
+	 */
+	private function getFilenameFromURL($url)
+	{
+		if (is_string($url))
+		{
+			$parts = explode('/', $url);
+
+			return $parts[count($parts) - 1];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Proxy to sendNotificationEmail(). Required since old versions of our software had a sendNotificationEmail method
+	 * declared private. If we set the sendNotificationEmail() method public we cause a fatal error.
+	 *
+	 * @param   string  $version  The new version of our software
+	 * @param   string  $email    The email address to send the notification to
+	 *
+	 * @return  mixed  The result of JMail::send()
+	 */
+	public function doSendNotificationEmail($version, $email)
+	{
+		try
+		{
+			return $this->sendNotificationEmail($version, $email);
+		}
+		catch (\Exception $e)
+		{
+			// Joomla! 3.5 is buggy
+		}
+	}
+
+	/**
+	 * Sends an update notification email
+	 *
+	 * @param   string  $version  The new version of our software
+	 * @param   string  $email    The email address to send the notification to
+	 *
+	 * @return  mixed  The result of JMail::send()
+	 */
+	private function sendNotificationEmail($version, $email)
+	{
+		$email_subject	= $this->updateEmailSubject;
+		$email_body = $this->updateEmailBody;
+
+		$jconfig  = JFactory::getConfig();
+		$sitename = $jconfig->get('sitename');
+
+		$substitutions = array(
+				'[VERSION]'			=> $version,
+				'[SITENAME]'		=> $sitename,
+				'[COMPONENT]'		=> $this->componentDescription,
+		);
+
+		$email_subject = str_replace(array_keys($substitutions), array_values($substitutions), $email_subject);
+		$email_body    = str_replace(array_keys($substitutions), array_values($substitutions), $email_body);
+
+		$mailer = JFactory::getMailer();
+
+		$mailfrom = $jconfig->get('mailfrom');
+		$fromname = $jconfig->get('fromname');
+
+		$mailer->setSender(array( $mailfrom, $fromname ));
+		$mailer->addRecipient($email);
+		$mailer->setSubject($email_subject);
+		$mailer->setBody($email_body);
+
+		return $mailer->Send();
+	}
+}
diff --git a/core/libraries/fof/version.txt b/core/libraries/fof/version.txt
new file mode 100644
index 00000000..4b0b4615
--- /dev/null
+++ b/core/libraries/fof/version.txt
@@ -0,0 +1,2 @@
+2.5.5
+2016-08-19
\ No newline at end of file
diff --git a/core/libraries/fof/view/csv.php b/core/libraries/fof/view/csv.php
new file mode 100644
index 00000000..5b4dec29
--- /dev/null
+++ b/core/libraries/fof/view/csv.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  view
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework CSV View class. Automatically renders the data in CSV
+ * format.
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+class FOFViewCsv extends FOFViewHtml
+{
+	/**
+	 *  Should I produce a CSV header row.
+	 *
+	 * @var  boolean
+	 */
+	protected $csvHeader = true;
+
+	/**
+	 * The filename of the downloaded CSV file.
+	 *
+	 * @var  string
+	 */
+	protected $csvFilename = null;
+
+	/**
+	 * The columns to include in the CSV output. If it's empty it will be ignored.
+	 *
+	 * @var  array
+	 */
+	protected $csvFields = array();
+
+	/**
+	* Public constructor. Instantiates a FOFViewCsv object.
+	*
+	* @param   array  $config  The configuration data array
+	*/
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		parent::__construct($config);
+
+		if (array_key_exists('csv_header', $config))
+		{
+			$this->csvHeader = $config['csv_header'];
+		}
+		else
+		{
+			$this->csvHeader = $this->input->getBool('csv_header', true);
+		}
+
+		if (array_key_exists('csv_filename', $config))
+		{
+			$this->csvFilename = $config['csv_filename'];
+		}
+		else
+		{
+			$this->csvFilename = $this->input->getString('csv_filename', '');
+		}
+
+		if (empty($this->csvFilename))
+		{
+			$view              = $this->input->getCmd('view', 'cpanel');
+			$view              = FOFInflector::pluralize($view);
+			$this->csvFilename = strtolower($view);
+		}
+
+		if (array_key_exists('csv_fields', $config))
+		{
+			$this->csvFields = $config['csv_fields'];
+		}
+	}
+
+	/**
+	* Executes before rendering a generic page, default to actions necessary for the Browse task.
+	*
+	* @param   string  $tpl  Subtemplate to use
+	*
+	* @return  boolean  Return true to allow rendering of the page
+	*/
+	protected function onDisplay($tpl = null)
+	{
+		// Load the model
+		$model = $this->getModel();
+
+		$items = $model->getItemList();
+		$this->items = $items;
+
+        $platform = FOFPlatform::getInstance();
+		$document = $platform->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			$document->setMimeEncoding('text/csv');
+		}
+
+		$platform->setHeader('Pragma', 'public');
+        $platform->setHeader('Expires', '0');
+        $platform->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
+        $platform->setHeader('Cache-Control', 'public', false);
+        $platform->setHeader('Content-Description', 'File Transfer');
+        $platform->setHeader('Content-Disposition', 'attachment; filename="' . $this->csvFilename . '"');
+
+		if (is_null($tpl))
+		{
+			$tpl = 'csv';
+		}
+
+		FOFPlatform::getInstance()->setErrorHandling(E_ALL, 'ignore');
+
+		$hasFailed = false;
+
+		try
+		{
+			$result = $this->loadTemplate($tpl, true);
+
+			if ($result instanceof Exception)
+			{
+				$hasFailed = true;
+			}
+		}
+		catch (Exception $e)
+		{
+			$hasFailed = true;
+		}
+
+		if (!$hasFailed)
+		{
+			echo $result;
+		}
+		else
+		{
+			// Default CSV behaviour in case the template isn't there!
+
+			if (empty($items))
+			{
+				return;
+			}
+
+			$item    = array_pop($items);
+			$keys    = get_object_vars($item);
+			$keys    = array_keys($keys);
+			$items[] = $item;
+			reset($items);
+
+			if (!empty($this->csvFields))
+			{
+				$temp = array();
+
+				foreach ($this->csvFields as $f)
+				{
+					if (in_array($f, $keys))
+					{
+						$temp[] = $f;
+					}
+				}
+
+				$keys = $temp;
+			}
+
+			if ($this->csvHeader)
+			{
+				$csv = array();
+
+				foreach ($keys as $k)
+				{
+					$k = str_replace('"', '""', $k);
+					$k = str_replace("\r", '\\r', $k);
+					$k = str_replace("\n", '\\n', $k);
+					$k = '"' . $k . '"';
+
+					$csv[] = $k;
+				}
+
+				echo implode(",", $csv) . "\r\n";
+			}
+
+			foreach ($items as $item)
+			{
+				$csv  = array();
+				$item = (array) $item;
+
+				foreach ($keys as $k)
+				{
+					if (!isset($item[$k]))
+					{
+						$v = '';
+					}
+					else
+					{
+						$v = $item[$k];
+					}
+
+					if (is_array($v))
+					{
+						$v = 'Array';
+					}
+					elseif (is_object($v))
+					{
+						$v = 'Object';
+					}
+
+					$v = str_replace('"', '""', $v);
+					$v = str_replace("\r", '\\r', $v);
+					$v = str_replace("\n", '\\n', $v);
+					$v = '"' . $v . '"';
+
+					$csv[] = $v;
+				}
+
+				echo implode(",", $csv) . "\r\n";
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/fof/view/form.php b/core/libraries/fof/view/form.php
new file mode 100644
index 00000000..8710315b
--- /dev/null
+++ b/core/libraries/fof/view/form.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  view
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework Form class. It preferrably renders an XML view template
+ * instead of a traditional PHP-based view template.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFViewForm extends FOFViewHtml
+{
+	/** @var FOFForm The form to render */
+	protected $form;
+
+	/**
+	 * Displays the view
+	 *
+	 * @param   string  $tpl  The template to use
+	 *
+	 * @return  boolean|null False if we can't render anything
+	 */
+	public function display($tpl = null)
+	{
+		$model = $this->getModel();
+
+		// Get the form
+		$this->form = $model->getForm();
+		$this->form->setModel($model);
+		$this->form->setView($this);
+
+		// Get the task set in the model
+		$task = $model->getState('task', 'browse');
+
+		// Call the relevant method
+		$method_name = 'on' . ucfirst($task);
+
+		if (method_exists($this, $method_name))
+		{
+			$result = $this->$method_name($tpl);
+		}
+		else
+		{
+			$result = $this->onDisplay();
+		}
+
+		// Bail out if we're told not to render anything
+
+		if ($result === false)
+		{
+			return;
+		}
+
+		// Show the view
+		// -- Output HTML before the view template
+		$this->preRender();
+
+		// -- Try to load a view template; if not exists render the form directly
+		$basePath = FOFPlatform::getInstance()->isBackend() ? 'admin:' : 'site:';
+		$basePath .= $this->config['option'] . '/';
+		$basePath .= $this->config['view'] . '/';
+		$path = $basePath . $this->getLayout();
+
+		if ($tpl)
+		{
+			$path .= '_' . $tpl;
+		}
+
+		$viewTemplate = $this->loadAnyTemplate($path);
+
+		// If there was no template file found, display the form
+		if ($viewTemplate instanceof Exception)
+		{
+			$viewTemplate = $this->getRenderedForm();
+		}
+
+		// -- Output the view template
+		echo $viewTemplate;
+
+		// -- Output HTML after the view template
+		$this->postRender();
+	}
+
+	/**
+	 * Returns the HTML rendering of the FOFForm attached to this view. Very
+	 * useful for customising a form page without having to meticulously hand-
+	 * code the entire form.
+	 *
+	 * @return  string  The HTML of the rendered form
+	 */
+	public function getRenderedForm()
+	{
+		$html = '';
+		$renderer = $this->getRenderer();
+
+		if ($renderer instanceof FOFRenderAbstract)
+		{
+			// Load CSS and Javascript files defined in the form
+			$this->form->loadCSSFiles();
+			$this->form->loadJSFiles();
+
+			// Get the form's HTML
+			$html = $renderer->renderForm($this->form, $this->getModel(), $this->input);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * The event which runs when we are displaying the Add page
+	 *
+	 * @param   string  $tpl  The view sub-template to use
+	 *
+	 * @return  boolean  True to allow display of the view
+	 */
+	protected function onAdd($tpl = null)
+	{
+		// Hide the main menu
+		JRequest::setVar('hidemainmenu', true);
+
+		// Get the model
+		$model = $this->getModel();
+
+		// Assign the item and form to the view
+		$this->item = $model->getItem();
+
+		return true;
+	}
+}
diff --git a/core/libraries/fof/view/html.php b/core/libraries/fof/view/html.php
new file mode 100644
index 00000000..c8b85ff5
--- /dev/null
+++ b/core/libraries/fof/view/html.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  view
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework HTML output class. Together with PHP-based view tempalates
+ * it will render your data into an HTML representation.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFViewHtml extends FOFViewRaw
+{
+	/** @var bool Should I set the page title in the front-end of the site? */
+	public $setFrontendPageTitle = false;
+
+	/** @var string The translation key for the default page title */
+	public $defaultPageTitle = null;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array $config Configuration parameters
+	 */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array)$config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		if (isset($config['setFrontendPageTitle']))
+		{
+			$this->setFrontendPageTitle = (bool)$config['setFrontendPageTitle'];
+		}
+
+		if (isset($config['defaultPageTitle']))
+		{
+			$this->defaultPageTitle = $config['defaultPageTitle'];
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Runs before rendering the view template, echoing HTML to put before the
+	 * view template's generated HTML
+	 *
+	 * @return void
+	 */
+	protected function preRender()
+	{
+		$view = $this->input->getCmd('view', 'cpanel');
+		$task = $this->getModel()->getState('task', 'browse');
+
+		// Don't load the toolbar on CLI
+
+		if (!FOFPlatform::getInstance()->isCli())
+		{
+			$toolbar = FOFToolbar::getAnInstance($this->input->getCmd('option', 'com_foobar'), $this->config);
+			$toolbar->perms = $this->perms;
+			$toolbar->renderToolbar($view, $task, $this->input);
+		}
+
+		if (FOFPlatform::getInstance()->isFrontend())
+		{
+			if ($this->setFrontendPageTitle)
+			{
+				$this->setPageTitle();
+			}
+		}
+
+		$renderer = $this->getRenderer();
+		$renderer->preRender($view, $task, $this->input, $this->config);
+	}
+
+	/**
+	 * Runs after rendering the view template, echoing HTML to put after the
+	 * view template's generated HTML
+	 *
+	 * @return  void
+	 */
+	protected function postRender()
+	{
+		$view = $this->input->getCmd('view', 'cpanel');
+		$task = $this->getModel()->getState('task', 'browse');
+
+		$renderer = $this->getRenderer();
+
+		if ($renderer instanceof FOFRenderAbstract)
+		{
+			$renderer->postRender($view, $task, $this->input, $this->config);
+		}
+	}
+
+	public function setPageTitle()
+	{
+		$document = JFactory::getDocument();
+		$app = JFactory::getApplication();
+		$menus = $app->getMenu();
+		$menu = $menus->getActive();
+		$title = null;
+
+		// Get the option and view name
+		$option = empty($this->option) ? $this->input->getCmd('option', 'com_foobar') : $this->option;
+		$view = empty($this->view) ? $this->input->getCmd('view', $this->getName()) : $this->view;
+
+		// Get the default page title translation key
+		$default = empty($this->defaultPageTitle) ? $option . '_TITLE_' . $view : $this->defaultPageTitle;
+
+		$params = $app->getPageParameters($option);
+
+		// Set the default value for page_heading
+		if ($menu)
+		{
+			$params->def('page_heading', $params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$params->def('page_heading', JText::_($default));
+		}
+
+		// Set the document title
+		$title = $params->get('page_title', '');
+		$sitename = $app->getCfg('sitename');
+
+		if ($title == $sitename)
+		{
+			$title = JText::_($default);
+		}
+
+		if (empty($title))
+		{
+			$title = $sitename;
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+
+		$document->setTitle($title);
+
+		// Set meta
+		if ($params->get('menu-meta_description'))
+		{
+			$document->setDescription($params->get('menu-meta_description'));
+		}
+
+		if ($params->get('menu-meta_keywords'))
+		{
+			$document->setMetadata('keywords', $params->get('menu-meta_keywords'));
+		}
+
+		if ($params->get('robots'))
+		{
+			$document->setMetadata('robots', $params->get('robots'));
+		}
+
+		return $title;
+	}
+}
diff --git a/core/libraries/fof/view/json.php b/core/libraries/fof/view/json.php
new file mode 100644
index 00000000..c2874a8f
--- /dev/null
+++ b/core/libraries/fof/view/json.php
@@ -0,0 +1,360 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  view
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework JSON View class. Renders the data as a JSON object or
+ * array. It can optionally output HAL links as well.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.0
+ */
+class FOFViewJson extends FOFViewHtml
+{
+	/**
+	 * When set to true we'll add hypermedia to the output, implementing the
+	 * HAL specification (http://stateless.co/hal_specification.html)
+	 *
+	 * @var   boolean
+	 */
+	public $useHypermedia = false;
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   array  $config  The component's configuration array
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		if (isset($config['use_hypermedia']))
+		{
+			$this->useHypermedia = (bool) $config['use_hypermedia'];
+		}
+	}
+
+	/**
+	 * The event which runs when we are displaying the record list JSON view
+	 *
+	 * @param   string  $tpl  The view sub-template to use
+	 *
+	 * @return  boolean  True to allow display of the view
+	 */
+	protected function onDisplay($tpl = null)
+	{
+		// Load the model
+		$model = $this->getModel();
+
+		$items = $model->getItemList();
+		$this->items = $items;
+
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			if ($this->useHypermedia)
+			{
+				$document->setMimeEncoding('application/hal+json');
+			}
+			else
+			{
+				$document->setMimeEncoding('application/json');
+			}
+		}
+
+		if (is_null($tpl))
+		{
+			$tpl = 'json';
+		}
+
+		FOFPlatform::getInstance()->setErrorHandling(E_ALL, 'ignore');
+
+		$hasFailed = false;
+
+		try
+		{
+			$result = $this->loadTemplate($tpl, true);
+
+			if ($result instanceof Exception)
+			{
+				$hasFailed = true;
+			}
+		}
+		catch (Exception $e)
+		{
+			$hasFailed = true;
+		}
+
+		if ($hasFailed)
+		{
+			// Default JSON behaviour in case the template isn't there!
+			if ($this->useHypermedia)
+			{
+				$haldocument = $this->_createDocumentWithHypermedia($items, $model);
+				$json = $haldocument->render('json');
+			}
+			else
+			{
+				$json = json_encode($items);
+			}
+
+			// JSONP support
+			$callback = $this->input->get('callback', null, 'raw');
+
+			if (!empty($callback))
+			{
+				echo $callback . '(' . $json . ')';
+			}
+			else
+			{
+				$defaultName = $this->input->getCmd('view', 'joomla');
+				$filename = $this->input->getCmd('basename', $defaultName);
+
+				$document->setName($filename);
+				echo $json;
+			}
+
+			return false;
+		}
+		else
+		{
+			echo $result;
+
+			return false;
+		}
+	}
+
+	/**
+	 * The event which runs when we are displaying a single item JSON view
+	 *
+	 * @param   string  $tpl  The view sub-template to use
+	 *
+	 * @return  boolean  True to allow display of the view
+	 */
+	protected function onRead($tpl = null)
+	{
+		$model = $this->getModel();
+
+		$item = $model->getItem();
+		$this->item = $item;
+
+		$document = FOFPlatform::getInstance()->getDocument();
+
+		if ($document instanceof JDocument)
+		{
+			if ($this->useHypermedia)
+			{
+				$document->setMimeEncoding('application/hal+json');
+			}
+			else
+			{
+				$document->setMimeEncoding('application/json');
+			}
+		}
+
+		if (is_null($tpl))
+		{
+			$tpl = 'json';
+		}
+
+    	FOFPlatform::getInstance()->setErrorHandling(E_ALL, 'ignore');
+
+		$hasFailed = false;
+
+		try
+		{
+			$result = $this->loadTemplate($tpl, true);
+
+            if ($result instanceof Exception)
+            {
+                $hasFailed = true;
+            }
+		}
+		catch (Exception $e)
+		{
+			$hasFailed = true;
+		}
+
+		if ($hasFailed)
+		{
+			// Default JSON behaviour in case the template isn't there!
+
+			if ($this->useHypermedia)
+			{
+				$haldocument = $this->_createDocumentWithHypermedia($item, $model);
+				$json = $haldocument->render('json');
+			}
+			else
+			{
+				$json = json_encode($item);
+			}
+
+			// JSONP support
+			$callback = $this->input->get('callback', null);
+
+			if (!empty($callback))
+			{
+				echo $callback . '(' . $json . ')';
+			}
+			else
+			{
+				$defaultName = $this->input->getCmd('view', 'joomla');
+				$filename = $this->input->getCmd('basename', $defaultName);
+				$document->setName($filename);
+				echo $json;
+			}
+
+			return false;
+		}
+		else
+		{
+			echo $result;
+
+			return false;
+		}
+	}
+
+	/**
+	 * Creates a FOFHalDocument using the provided data
+	 *
+	 * @param   array     $data   The data to put in the document
+	 * @param   FOFModel  $model  The model of this view
+	 *
+	 * @return  FOFHalDocument  A HAL-enabled document
+	 */
+	protected function _createDocumentWithHypermedia($data, $model = null)
+	{
+		// Create a new HAL document
+
+		if (is_array($data))
+		{
+			$count = count($data);
+		}
+		else
+		{
+			$count = null;
+		}
+
+		if ($count == 1)
+		{
+			reset($data);
+			$document = new FOFHalDocument(end($data));
+		}
+		else
+		{
+			$document = new FOFHalDocument($data);
+		}
+
+		// Create a self link
+		$uri = (string) (JUri::getInstance());
+		$uri = $this->_removeURIBase($uri);
+		$uri = JRoute::_($uri);
+		$document->addLink('self', new FOFHalLink($uri));
+
+		// Create relative links in a record list context
+
+		if (is_array($data) && ($model instanceof FOFModel))
+		{
+			$pagination = $model->getPagination();
+
+			if ($pagination->get('pages.total') > 1)
+			{
+				// Try to guess URL parameters and create a prototype URL
+				// NOTE: You are better off specialising this method
+				$protoUri = $this->_getPrototypeURIForPagination();
+
+				// The "first" link
+				$uri = clone $protoUri;
+				$uri->setVar('limitstart', 0);
+				$uri = JRoute::_((string) $uri);
+
+				$document->addLink('first', new FOFHalLink($uri));
+
+				// Do we need a "prev" link?
+
+				if ($pagination->get('pages.current') > 1)
+				{
+					$prevPage = $pagination->get('pages.current') - 1;
+					$limitstart = ($prevPage - 1) * $pagination->limit;
+					$uri = clone $protoUri;
+					$uri->setVar('limitstart', $limitstart);
+					$uri = JRoute::_((string) $uri);
+
+					$document->addLink('prev', new FOFHalLink($uri));
+				}
+
+				// Do we need a "next" link?
+
+				if ($pagination->get('pages.current') < $pagination->get('pages.total'))
+				{
+					$nextPage = $pagination->get('pages.current') + 1;
+					$limitstart = ($nextPage - 1) * $pagination->limit;
+					$uri = clone $protoUri;
+					$uri->setVar('limitstart', $limitstart);
+					$uri = JRoute::_((string) $uri);
+
+					$document->addLink('next', new FOFHalLink($uri));
+				}
+
+				// The "last" link?
+				$lastPage = $pagination->get('pages.total');
+				$limitstart = ($lastPage - 1) * $pagination->limit;
+				$uri = clone $protoUri;
+				$uri->setVar('limitstart', $limitstart);
+				$uri = JRoute::_((string) $uri);
+
+				$document->addLink('last', new FOFHalLink($uri));
+			}
+		}
+
+		return $document;
+	}
+
+	/**
+	 * Convert an absolute URI to a relative one
+	 *
+	 * @param   string  $uri  The URI to convert
+	 *
+	 * @return  string  The relative URL
+	 */
+	protected function _removeURIBase($uri)
+	{
+		static $root = null, $rootlen = 0;
+
+		if (is_null($root))
+		{
+			$root = rtrim(FOFPlatform::getInstance()->URIbase(), '/');
+			$rootlen = strlen($root);
+		}
+
+		if (substr($uri, 0, $rootlen) == $root)
+		{
+			$uri = substr($uri, $rootlen);
+		}
+
+		return ltrim($uri, '/');
+	}
+
+	/**
+	 * Returns a JUri instance with a prototype URI used as the base for the
+	 * other URIs created by the JSON renderer
+	 *
+	 * @return  JUri  The prototype JUri instance
+	 */
+	protected function _getPrototypeURIForPagination()
+	{
+		$protoUri = new JUri('index.php');
+		$protoUri->setQuery($this->input->getData());
+		$protoUri->delVar('savestate');
+		$protoUri->delVar('base_path');
+
+		return $protoUri;
+	}
+}
diff --git a/core/libraries/fof/view/raw.php b/core/libraries/fof/view/raw.php
new file mode 100644
index 00000000..99bb0f42
--- /dev/null
+++ b/core/libraries/fof/view/raw.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  view
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework raw output class. It works like an HTML view, but the
+ * output is bare HTML.
+ *
+ * @package  FrameworkOnFramework
+ * @since    2.1
+ */
+class FOFViewRaw extends FOFView
+{
+	/** @var array Data lists */
+	protected $lists = null;
+
+	/** @var array Permissions map */
+	protected $perms = null;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $config  Configuration parameters
+	 */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		parent::__construct($config);
+
+		$this->config = $config;
+
+		// Get the input
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$this->input = $config['input'];
+			}
+			else
+			{
+				$this->input = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		if (!array_key_exists('option', $this->config))
+		{
+			$this->config['option'] = $this->input->getCmd('option', 'com_foobar');
+		}
+
+		if (!array_key_exists('view', $this->config))
+		{
+			$this->config['view'] = $this->input->getCmd('view', 'cpanel');
+		}
+
+		$this->lists = new FOFUtilsObject;
+
+		if (!FOFPlatform::getInstance()->isCli())
+		{
+			$platform = FOFPlatform::getInstance();
+			$perms = (object) array(
+					'create'	 => $platform->authorise('core.create'     , $this->input->getCmd('option', 'com_foobar')),
+					'edit'		 => $platform->authorise('core.edit'       , $this->input->getCmd('option', 'com_foobar')),
+					'editown'	 => $platform->authorise('core.edit.own'   , $this->input->getCmd('option', 'com_foobar')),
+					'editstate'	 => $platform->authorise('core.edit.state' , $this->input->getCmd('option', 'com_foobar')),
+					'delete'	 => $platform->authorise('core.delete'     , $this->input->getCmd('option', 'com_foobar')),
+			);
+
+			$this->aclperms = $perms;
+			$this->perms    = $perms;
+		}
+	}
+
+	/**
+	 * Displays the view
+	 *
+	 * @param   string  $tpl  The template to use
+	 *
+	 * @return  boolean|null False if we can't render anything
+	 */
+	public function display($tpl = null)
+	{
+		// Get the task set in the model
+		$model = $this->getModel();
+		$task = $model->getState('task', 'browse');
+
+		// Call the relevant method
+		$method_name = 'on' . ucfirst($task);
+
+		if (method_exists($this, $method_name))
+		{
+			$result = $this->$method_name($tpl);
+		}
+		else
+		{
+			$result = $this->onDisplay();
+		}
+
+		if ($result === false)
+		{
+			return;
+		}
+
+		// Show the view
+		if ($this->doPreRender)
+		{
+			$this->preRender();
+		}
+
+		parent::display($tpl);
+
+		if ($this->doPostRender)
+		{
+			$this->postRender();
+		}
+	}
+
+	/**
+	 * Last chance to output something before rendering the view template
+	 *
+	 * @return  void
+	 */
+	protected function preRender()
+	{
+	}
+
+	/**
+	 * Last chance to output something after rendering the view template and
+	 * before returning to the caller
+	 *
+	 * @return  void
+	 */
+	protected function postRender()
+	{
+	}
+
+	/**
+	 * Executes before rendering the page for the Browse task.
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 */
+	protected function onBrowse($tpl = null)
+	{
+		// When in interactive browsing mode, save the state to the session
+		$this->getModel()->savestate(1);
+
+		return $this->onDisplay($tpl);
+	}
+
+	/**
+	 * Executes before rendering a generic page, default to actions necessary
+	 * for the Browse task.
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 */
+	protected function onDisplay($tpl = null)
+	{
+		$view = $this->input->getCmd('view', 'cpanel');
+
+		if (in_array($view, array('cpanel', 'cpanels')))
+		{
+			return;
+		}
+
+		// Load the model
+		$model = $this->getModel();
+
+		// ...ordering
+		$this->lists->set('order', $model->getState('filter_order', 'id', 'cmd'));
+		$this->lists->set('order_Dir', $model->getState('filter_order_Dir', 'DESC', 'cmd'));
+
+		// Assign data to the view
+		$this->items      = $model->getItemList();
+		$this->pagination = $model->getPagination();
+
+		// Pass page params on frontend only
+		if (FOFPlatform::getInstance()->isFrontend())
+		{
+			$params = JFactory::getApplication()->getParams();
+			$this->params = $params;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Executes before rendering the page for the Add task.
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 */
+	protected function onAdd($tpl = null)
+	{
+		JRequest::setVar('hidemainmenu', true);
+		$model = $this->getModel();
+		$this->item = $model->getItem();
+
+		return true;
+	}
+
+	/**
+	 * Executes before rendering the page for the Edit task.
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 */
+	protected function onEdit($tpl = null)
+	{
+        // This perms are used only for hestetic reasons (ie showing toolbar buttons), "real" checks
+        // are made by the controller
+        // It seems that I can't edit records, maybe I can edit only this one due asset tracking?
+		if (!$this->perms->edit || !$this->perms->editown)
+        {
+            $model = $this->getModel();
+
+            if($model)
+            {
+                $table = $model->getTable();
+
+                // Ok, record is tracked, let's see if I can this record
+                if($table->isAssetsTracked())
+                {
+                    $platform = FOFPlatform::getInstance();
+
+                    if(!$this->perms->edit)
+                    {
+                        $this->perms->edit = $platform->authorise('core.edit', $table->getAssetName());
+                    }
+
+                    if(!$this->perms->editown)
+                    {
+                        $this->perms->editown = $platform->authorise('core.edit.own', $table->getAssetName());
+                    }
+                }
+            }
+        }
+
+		return $this->onAdd($tpl);
+	}
+
+	/**
+	 * Executes before rendering the page for the Read task.
+	 *
+	 * @param   string  $tpl  Subtemplate to use
+	 *
+	 * @return  boolean  Return true to allow rendering of the page
+	 */
+	protected function onRead($tpl = null)
+	{
+		// All I need is to read the record
+
+		return $this->onAdd($tpl);
+	}
+
+	/**
+	 * Determines if the current Joomla! version and your current table support
+	 * AJAX-powered drag and drop reordering. If they do, it will set up the
+	 * drag & drop reordering feature.
+	 *
+	 * @return  boolean|array  False if not suported, a table with necessary
+	 *                         information (saveOrder: should you enabled DnD
+	 *                         reordering; orderingColumn: which column has the
+	 *                         ordering information).
+	 */
+	public function hasAjaxOrderingSupport()
+	{
+		if (version_compare(JVERSION, '3.0', 'lt'))
+		{
+			return false;
+		}
+
+		$model = $this->getModel();
+
+		if (!method_exists($model, 'getTable'))
+		{
+			return false;
+		}
+
+		$table = $this->getModel()->getTable();
+
+		if (!method_exists($table, 'getColumnAlias') || !method_exists($table, 'getTableFields'))
+		{
+			return false;
+		}
+
+		$orderingColumn = $table->getColumnAlias('ordering');
+		$fields = $table->getTableFields();
+
+		if (!is_array($fields) || !array_key_exists($orderingColumn, $fields))
+		{
+			return false;
+		}
+
+		$listOrder = $this->escape($model->getState('filter_order', null, 'cmd'));
+		$listDirn = $this->escape($model->getState('filter_order_Dir', 'ASC', 'cmd'));
+		$saveOrder = $listOrder == $orderingColumn;
+
+		if ($saveOrder)
+		{
+			$saveOrderingUrl = 'index.php?option=' . $this->config['option'] . '&view=' . $this->config['view'] . '&task=saveorder&format=json';
+			JHtml::_('sortablelist.sortable', 'itemsList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
+		}
+
+		return array(
+			'saveOrder'		 => $saveOrder,
+			'orderingColumn' => $orderingColumn
+		);
+	}
+
+	/**
+	 * Returns the internal list of useful variables to the benefit of
+	 * FOFFormHeader fields.
+	 *
+	 * @return array
+	 *
+	 * @since 2.0
+	 */
+	public function getLists()
+	{
+		return $this->lists;
+	}
+
+	/**
+	 * Returns a reference to the permissions object of this view
+	 *
+	 * @return stdClass
+	 */
+	public function getPerms()
+	{
+		return $this->perms;
+	}
+}
diff --git a/core/libraries/fof/view/view.php b/core/libraries/fof/view/view.php
new file mode 100644
index 00000000..5aba5638
--- /dev/null
+++ b/core/libraries/fof/view/view.php
@@ -0,0 +1,1175 @@
+<?php
+/**
+ * @package     FrameworkOnFramework
+ * @subpackage  view
+ * @copyright   Copyright (C) 2010-2016 Nicholas K. Dionysopoulos / Akeeba Ltd. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Protect from unauthorized access
+defined('FOF_INCLUDED') or die;
+
+/**
+ * FrameworkOnFramework View class. The View is the MVC component which gets the
+ * raw data from a Model and renders it in a way that makes sense. The usual
+ * rendering is HTML, but you can also output JSON, CSV, XML, or even media
+ * (images, videos, ...) and documents (Word, PDF, Excel...).
+ *
+ * @package  FrameworkOnFramework
+ * @since    1.0
+ */
+abstract class FOFView extends FOFUtilsObject
+{
+	/**
+	 * The name of the view
+	 *
+	 * @var    array
+	 */
+	protected $_name = null;
+
+	/**
+	 * Registered models
+	 *
+	 * @var    array
+	 */
+	protected $_models = array();
+
+	/**
+	 * The base path of the view
+	 *
+	 * @var    string
+	 */
+	protected $_basePath = null;
+
+	/**
+	 * The default model
+	 *
+	 * @var	string
+	 */
+	protected $_defaultModel = null;
+
+	/**
+	 * Layout name
+	 *
+	 * @var    string
+	 */
+	protected $_layout = 'default';
+
+	/**
+	 * Layout extension
+	 *
+	 * @var    string
+	 */
+	protected $_layoutExt = 'php';
+
+	/**
+	 * Layout template
+	 *
+	 * @var    string
+	 */
+	protected $_layoutTemplate = '_';
+
+	/**
+	 * The set of search directories for resources (templates)
+	 *
+	 * @var array
+	 */
+	protected $_path = array('template' => array(), 'helper' => array());
+
+	/**
+	 * The name of the default template source file.
+	 *
+	 * @var string
+	 */
+	protected $_template = null;
+
+	/**
+	 * The output of the template script.
+	 *
+	 * @var string
+	 */
+	protected $_output = null;
+
+	/**
+	 * Callback for escaping.
+	 *
+	 * @var string
+	 * @deprecated 13.3
+	 */
+	protected $_escape = 'htmlspecialchars';
+
+	/**
+	 * Charset to use in escaping mechanisms; defaults to urf8 (UTF-8)
+	 *
+	 * @var string
+	 */
+	protected $_charset = 'UTF-8';
+
+	/**
+	 * The available renderer objects we can use to render views
+	 *
+	 * @var    array  Contains objects of the FOFRenderAbstract class
+	 */
+	public static $renderers = array();
+
+	/**
+	 * Cache of the configuration array
+	 *
+	 * @var    array
+	 */
+	protected $config = array();
+
+	/**
+	 * The input object of this view
+	 *
+	 * @var    FOFInput
+	 */
+	protected $input = null;
+
+	/**
+	 * The chosen renderer object
+	 *
+	 * @var    FOFRenderAbstract
+	 */
+	protected $rendererObject = null;
+
+	/**
+	 * Should I run the pre-render step?
+	 *
+	 * @var    boolean
+	 */
+	protected $doPreRender = true;
+
+	/**
+	 * Should I run the post-render step?
+	 *
+	 * @var    boolean
+	 */
+	protected $doPostRender = true;
+
+	/**
+	 * Public constructor. Instantiates a FOFView object.
+	 *
+	 * @param   array  $config  The configuration data array
+	 */
+	public function __construct($config = array())
+	{
+		// Make sure $config is an array
+		if (is_object($config))
+		{
+			$config = (array) $config;
+		}
+		elseif (!is_array($config))
+		{
+			$config = array();
+		}
+
+		// Get the input
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$this->input = $config['input'];
+			}
+			else
+			{
+				$this->input = new FOFInput($config['input']);
+			}
+		}
+		else
+		{
+			$this->input = new FOFInput;
+		}
+
+		parent::__construct($config);
+
+		$component = 'com_foobar';
+
+		// Get the component name
+		if (array_key_exists('input', $config))
+		{
+			if ($config['input'] instanceof FOFInput)
+			{
+				$tmpInput = $config['input'];
+			}
+			else
+			{
+				$tmpInput = new FOFInput($config['input']);
+			}
+
+			$component = $tmpInput->getCmd('option', '');
+		}
+		else
+		{
+			$tmpInput = $this->input;
+		}
+
+		if (array_key_exists('option', $config))
+		{
+			if ($config['option'])
+			{
+				$component = $config['option'];
+			}
+		}
+
+		$config['option'] = $component;
+
+		// Get the view name
+		$view = null;
+		if (array_key_exists('input', $config))
+		{
+			$view = $tmpInput->getCmd('view', '');
+		}
+
+		if (array_key_exists('view', $config))
+		{
+			if ($config['view'])
+			{
+				$view = $config['view'];
+			}
+		}
+
+		$config['view'] = $view;
+
+		// Set the component and the view to the input array
+
+		if (array_key_exists('input', $config))
+		{
+			$tmpInput->set('option', $config['option']);
+			$tmpInput->set('view', $config['view']);
+		}
+
+		// Set the view name
+
+		if (array_key_exists('name', $config))
+		{
+			$this->_name = $config['name'];
+		}
+		else
+		{
+			$this->_name = $config['view'];
+		}
+
+		$tmpInput->set('view', $this->_name);
+		$config['input'] = $tmpInput;
+		$config['name'] = $this->_name;
+		$config['view'] = $this->_name;
+
+		// Get the component directories
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($config['option']);
+
+		// Set the charset (used by the variable escaping functions)
+
+		if (array_key_exists('charset', $config))
+		{
+			FOFPlatform::getInstance()->logDeprecated('Setting a custom charset for escaping in FOFView\'s constructor is deprecated. Override FOFView::escape() instead.');
+			$this->_charset = $config['charset'];
+		}
+
+		// User-defined escaping callback
+
+		if (array_key_exists('escape', $config))
+		{
+			$this->setEscape($config['escape']);
+		}
+
+		// Set a base path for use by the view
+
+		if (array_key_exists('base_path', $config))
+		{
+			$this->_basePath = $config['base_path'];
+		}
+		else
+		{
+			$this->_basePath = $componentPaths['main'];
+		}
+
+		// Set the default template search path
+
+		if (array_key_exists('template_path', $config))
+		{
+			// User-defined dirs
+			$this->_setPath('template', $config['template_path']);
+		}
+		else
+		{
+			$altView = FOFInflector::isSingular($this->getName()) ? FOFInflector::pluralize($this->getName()) : FOFInflector::singularize($this->getName());
+			$this->_setPath('template', $this->_basePath . '/views/' . $altView . '/tmpl');
+			$this->_addPath('template', $this->_basePath . '/views/' . $this->getName() . '/tmpl');
+		}
+
+		// Set the default helper search path
+
+		if (array_key_exists('helper_path', $config))
+		{
+			// User-defined dirs
+			$this->_setPath('helper', $config['helper_path']);
+		}
+		else
+		{
+			$this->_setPath('helper', $this->_basePath . '/helpers');
+		}
+
+		// Set the layout
+
+		if (array_key_exists('layout', $config))
+		{
+			$this->setLayout($config['layout']);
+		}
+		else
+		{
+			$this->setLayout('default');
+		}
+
+		$this->config = $config;
+
+		if (!FOFPlatform::getInstance()->isCli())
+		{
+			$this->baseurl = FOFPlatform::getInstance()->URIbase(true);
+
+			$fallback = FOFPlatform::getInstance()->getTemplateOverridePath($component) . '/' . $this->getName();
+			$this->_addPath('template', $fallback);
+		}
+	}
+
+	/**
+	 * Loads a template given any path. The path is in the format:
+	 * [admin|site]:com_foobar/viewname/templatename
+	 * e.g. admin:com_foobar/myview/default
+	 *
+	 * This function searches for Joomla! version override templates. For example,
+	 * if you have run this under Joomla! 3.0 and you try to load
+	 * admin:com_foobar/myview/default it will automatically search for the
+	 * template files default.j30.php, default.j3.php and default.php, in this
+	 * order.
+	 *
+	 * @param   string  $path         See above
+	 * @param   array   $forceParams  A hash array of variables to be extracted in the local scope of the template file
+	 *
+	 * @return  boolean  False if loading failed
+	 */
+	public function loadAnyTemplate($path = '', $forceParams = array())
+	{
+		// Automatically check for a Joomla! version specific override
+		$throwErrorIfNotFound = true;
+
+		$suffixes = FOFPlatform::getInstance()->getTemplateSuffixes();
+
+		foreach ($suffixes as $suffix)
+		{
+			if (substr($path, -strlen($suffix)) == $suffix)
+			{
+				$throwErrorIfNotFound = false;
+				break;
+			}
+		}
+
+		if ($throwErrorIfNotFound)
+		{
+			foreach ($suffixes as $suffix)
+			{
+				$result = $this->loadAnyTemplate($path . $suffix, $forceParams);
+
+				if ($result !== false)
+				{
+					return $result;
+				}
+			}
+		}
+
+		$layoutTemplate = $this->getLayoutTemplate();
+
+		// Parse the path
+		$templateParts = $this->_parseTemplatePath($path);
+
+		// Get the paths
+		$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($templateParts['component']);
+		$templatePath   = FOFPlatform::getInstance()->getTemplateOverridePath($templateParts['component']);
+
+		// Get the default paths
+		$paths = array();
+		$paths[] = $templatePath . '/' . $templateParts['view'];
+		$paths[] = ($templateParts['admin'] ? $componentPaths['admin'] : $componentPaths['site']) . '/views/' . $templateParts['view'] . '/tmpl';
+
+		if (isset($this->_path) || property_exists($this, '_path'))
+		{
+			$paths = array_merge($paths, $this->_path['template']);
+		}
+		elseif (isset($this->path) || property_exists($this, 'path'))
+		{
+			$paths = array_merge($paths, $this->path['template']);
+		}
+
+		// Look for a template override
+
+		if (isset($layoutTemplate) && $layoutTemplate != '_' && $layoutTemplate != $template)
+		{
+			$apath = array_shift($paths);
+			array_unshift($paths, str_replace($template, $layoutTemplate, $apath));
+		}
+
+		$filetofind = $templateParts['template'] . '.php';
+        $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		$this->_tempFilePath = $filesystem->pathFind($paths, $filetofind);
+
+		if ($this->_tempFilePath)
+		{
+			// Unset from local scope
+			unset($template);
+			unset($layoutTemplate);
+			unset($paths);
+			unset($path);
+			unset($filetofind);
+
+			// Never allow a 'this' property
+
+			if (isset($this->this))
+			{
+				unset($this->this);
+			}
+
+			// Force parameters into scope
+
+			if (!empty($forceParams))
+			{
+				extract($forceParams);
+			}
+
+			// Start capturing output into a buffer
+			ob_start();
+
+			// Include the requested template filename in the local scope (this will execute the view logic).
+			include $this->_tempFilePath;
+
+			// Done with the requested template; get the buffer and clear it.
+			$this->_output = ob_get_contents();
+			ob_end_clean();
+
+			return $this->_output;
+		}
+		else
+		{
+			if ($throwErrorIfNotFound)
+			{
+				return new Exception(JText::sprintf('JLIB_APPLICATION_ERROR_LAYOUTFILE_NOT_FOUND', $path), 500);
+			}
+
+			return false;
+		}
+	}
+
+	/**
+	 * Overrides the default method to execute and display a template script.
+	 * Instead of loadTemplate is uses loadAnyTemplate which allows for automatic
+	 * Joomla! version overrides. A little slice of awesome pie!
+	 *
+	 * @param   string  $tpl  The name of the template file to parse
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object.
+	 */
+	public function display($tpl = null)
+	{
+		FOFPlatform::getInstance()->setErrorHandling(E_ALL, 'ignore');
+
+		$result = $this->loadTemplate($tpl);
+
+		if ($result instanceof Exception)
+		{
+            FOFPlatform::getInstance()->raiseError($result->getCode(), $result->getMessage());
+
+			return $result;
+		}
+
+		echo $result;
+	}
+
+	/**
+	 * Assigns variables to the view script via differing strategies.
+	 *
+	 * This method is overloaded; you can assign all the properties of
+	 * an object, an associative array, or a single value by name.
+	 *
+	 * You are not allowed to set variables that begin with an underscore;
+	 * these are either private properties for FOFView or private variables
+	 * within the template script itself.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @deprecated  13.3 Use native PHP syntax.
+	 */
+	public function assign()
+	{
+		FOFPlatform::getInstance()->logDeprecated(__CLASS__ . '::' . __METHOD__ . ' is deprecated. Use native PHP syntax.');
+
+		// Get the arguments; there may be 1 or 2.
+		$arg0 = @func_get_arg(0);
+		$arg1 = @func_get_arg(1);
+
+		// Assign by object
+
+		if (is_object($arg0))
+		{
+			// Assign public properties
+			foreach (get_object_vars($arg0) as $key => $val)
+			{
+				if (substr($key, 0, 1) != '_')
+				{
+					$this->$key = $val;
+				}
+			}
+
+			return true;
+		}
+
+		// Assign by associative array
+
+		if (is_array($arg0))
+		{
+			foreach ($arg0 as $key => $val)
+			{
+				if (substr($key, 0, 1) != '_')
+				{
+					$this->$key = $val;
+				}
+			}
+
+			return true;
+		}
+
+		// Assign by string name and mixed value. We use array_key_exists() instead of isset()
+		// because isset() fails if the value is set to null.
+
+		if (is_string($arg0) && substr($arg0, 0, 1) != '_' && func_num_args() > 1)
+		{
+			$this->$arg0 = $arg1;
+
+			return true;
+		}
+
+		// $arg0 was not object, array, or string.
+		return false;
+	}
+
+	/**
+	 * Assign variable for the view (by reference).
+	 *
+	 * You are not allowed to set variables that begin with an underscore;
+	 * these are either private properties for FOFView or private variables
+	 * within the template script itself.
+	 *
+	 * @param   string  $key   The name for the reference in the view.
+	 * @param   mixed   &$val  The referenced variable.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @deprecated  13.3  Use native PHP syntax.
+	 */
+	public function assignRef($key, &$val)
+	{
+		FOFPlatform::getInstance()->logDeprecated(__CLASS__ . '::' . __METHOD__ . ' is deprecated. Use native PHP syntax.');
+
+		if (is_string($key) && substr($key, 0, 1) != '_')
+		{
+			$this->$key = &$val;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Escapes a value for output in a view script.
+	 *
+	 * If escaping mechanism is either htmlspecialchars or htmlentities, uses
+	 * {@link $_encoding} setting.
+	 *
+	 * @param   mixed  $var  The output to escape.
+	 *
+	 * @return  mixed  The escaped value.
+	 */
+	public function escape($var)
+	{
+		if (in_array($this->_escape, array('htmlspecialchars', 'htmlentities')))
+		{
+			return call_user_func($this->_escape, $var, ENT_COMPAT, $this->_charset);
+		}
+
+		return call_user_func($this->_escape, $var);
+	}
+
+	/**
+	 * Method to get data from a registered model or a property of the view
+	 *
+	 * @param   string  $property  The name of the method to call on the model or the property to get
+	 * @param   string  $default   The name of the model to reference or the default value [optional]
+	 *
+	 * @return  mixed  The return value of the method
+	 */
+	public function get($property, $default = null)
+	{
+		// If $model is null we use the default model
+		if (is_null($default))
+		{
+			$model = $this->_defaultModel;
+		}
+		else
+		{
+			$model = strtolower($default);
+		}
+
+		// First check to make sure the model requested exists
+		if (isset($this->_models[$model]))
+		{
+			// Model exists, let's build the method name
+			$method = 'get' . ucfirst($property);
+
+			// Does the method exist?
+			if (method_exists($this->_models[$model], $method))
+			{
+				// The method exists, let's call it and return what we get
+				$result = $this->_models[$model]->$method();
+
+				return $result;
+			}
+		}
+
+		// Degrade to FOFUtilsObject::get
+		$result = parent::get($property, $default);
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the model object
+	 *
+	 * @param   string  $name  The name of the model (optional)
+	 *
+	 * @return  mixed  FOFModel object
+	 */
+	public function getModel($name = null)
+	{
+		if ($name === null)
+		{
+			$name = $this->_defaultModel;
+		}
+
+		return $this->_models[strtolower($name)];
+	}
+
+	/**
+	 * Get the layout.
+	 *
+	 * @return  string  The layout name
+	 */
+	public function getLayout()
+	{
+		return $this->_layout;
+	}
+
+	/**
+	 * Get the layout template.
+	 *
+	 * @return  string  The layout template name
+	 */
+	public function getLayoutTemplate()
+	{
+		return $this->_layoutTemplate;
+	}
+
+	/**
+	 * Method to get the view name
+	 *
+	 * The model name by default parsed using the classname, or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the model
+	 */
+	public function getName()
+	{
+		if (empty($this->_name))
+		{
+			$classname = get_class($this);
+			$viewpos = strpos($classname, 'View');
+
+			if ($viewpos === false)
+			{
+				throw new Exception(JText::_('JLIB_APPLICATION_ERROR_VIEW_GET_NAME'), 500);
+			}
+
+			$this->_name = strtolower(substr($classname, $viewpos + 4));
+		}
+
+		return $this->_name;
+	}
+
+	/**
+	 * Method to add a model to the view.
+	 *
+	 * @param   FOFMOdel  $model    The model to add to the view.
+     * @param   boolean   $default  Is this the default model?
+     * @param   String    $name     optional index name to store the model
+	 *
+	 * @return  object   The added model.
+	 */
+	public function setModel($model, $default = false, $name = null)
+	{
+		if (is_null($name))
+		{
+			$name = $model->getName();
+		}
+
+		$name = strtolower($name);
+
+		$this->_models[$name] = $model;
+
+		if ($default)
+		{
+			$this->_defaultModel = $name;
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Sets the layout name to use
+	 *
+	 * @param   string  $layout  The layout name or a string in format <template>:<layout file>
+	 *
+	 * @return  string  Previous value.
+	 */
+	public function setLayout($layout)
+	{
+		$previous = $this->_layout;
+
+		if (strpos($layout, ':') === false)
+		{
+			$this->_layout = $layout;
+		}
+		else
+		{
+			// Convert parameter to array based on :
+			$temp = explode(':', $layout);
+			$this->_layout = $temp[1];
+
+			// Set layout template
+			$this->_layoutTemplate = $temp[0];
+		}
+
+		return $previous;
+	}
+
+	/**
+	 * Allows a different extension for the layout files to be used
+	 *
+	 * @param   string  $value  The extension.
+	 *
+	 * @return  string   Previous value
+	 */
+	public function setLayoutExt($value)
+	{
+		$previous = $this->_layoutExt;
+
+		if ($value = preg_replace('#[^A-Za-z0-9]#', '', trim($value)))
+		{
+			$this->_layoutExt = $value;
+		}
+
+		return $previous;
+	}
+
+	/**
+	 * Sets the _escape() callback.
+	 *
+	 * @param   mixed  $spec  The callback for _escape() to use.
+	 *
+	 * @return  void
+	 *
+	 * @deprecated  2.1  Override FOFView::escape() instead.
+	 */
+	public function setEscape($spec)
+	{
+		FOFPlatform::getInstance()->logDeprecated(__CLASS__ . '::' . __METHOD__ . ' is deprecated. Override FOFView::escape() instead.');
+
+		$this->_escape = $spec;
+	}
+
+	/**
+	 * Adds to the stack of view script paths in LIFO order.
+	 *
+	 * @param   mixed  $path  A directory path or an array of paths.
+	 *
+	 * @return  void
+	 */
+	public function addTemplatePath($path)
+	{
+		$this->_addPath('template', $path);
+	}
+
+	/**
+	 * Adds to the stack of helper script paths in LIFO order.
+	 *
+	 * @param   mixed  $path  A directory path or an array of paths.
+	 *
+	 * @return  void
+	 */
+	public function addHelperPath($path)
+	{
+		$this->_addPath('helper', $path);
+	}
+
+	/**
+	 * Overrides the built-in loadTemplate function with an FOF-specific one.
+	 * Our overriden function uses loadAnyTemplate to provide smarter view
+	 * template loading.
+	 *
+	 * @param   string   $tpl     The name of the template file to parse
+	 * @param   boolean  $strict  Should we use strict naming, i.e. force a non-empty $tpl?
+	 *
+	 * @return  mixed  A string if successful, otherwise a JError object
+	 */
+	public function loadTemplate($tpl = null, $strict = false)
+	{
+		$paths = FOFPlatform::getInstance()->getViewTemplatePaths(
+			$this->input->getCmd('option', ''),
+			$this->input->getCmd('view', ''),
+			$this->getLayout(),
+			$tpl,
+			$strict
+		);
+
+		foreach ($paths as $path)
+		{
+			$result = $this->loadAnyTemplate($path);
+
+			if (!($result instanceof Exception))
+			{
+				break;
+			}
+		}
+
+		if ($result instanceof Exception)
+		{
+            FOFPlatform::getInstance()->raiseError($result->getCode(), $result->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Parses a template path in the form of admin:/component/view/layout or
+	 * site:/component/view/layout to an array which can be used by
+	 * loadAnyTemplate to locate and load the view template file.
+	 *
+	 * @param   string  $path  The template path to parse
+	 *
+	 * @return  array  A hash array with the parsed path parts
+	 */
+	private function _parseTemplatePath($path = '')
+	{
+		$parts = array(
+			'admin'		 => 0,
+			'component'	 => $this->config['option'],
+			'view'		 => $this->config['view'],
+			'template'	 => 'default'
+		);
+
+		if (substr($path, 0, 6) == 'admin:')
+		{
+			$parts['admin'] = 1;
+			$path = substr($path, 6);
+		}
+		elseif (substr($path, 0, 5) == 'site:')
+		{
+			$path = substr($path, 5);
+		}
+
+		if (empty($path))
+		{
+			return;
+		}
+
+		$pathparts = explode('/', $path, 3);
+
+		switch (count($pathparts))
+		{
+			case 3:
+				$parts['component'] = array_shift($pathparts);
+
+			case 2:
+				$parts['view'] = array_shift($pathparts);
+
+			case 1:
+				$parts['template'] = array_shift($pathparts);
+				break;
+		}
+
+		return $parts;
+	}
+
+	/**
+	 * Get the renderer object for this view
+	 *
+	 * @return  FOFRenderAbstract
+	 */
+	public function &getRenderer()
+	{
+		if (!($this->rendererObject instanceof FOFRenderAbstract))
+		{
+			$this->rendererObject = $this->findRenderer();
+		}
+
+		return $this->rendererObject;
+	}
+
+	/**
+	 * Sets the renderer object for this view
+	 *
+	 * @param   FOFRenderAbstract  &$renderer  The render class to use
+	 *
+	 * @return  void
+	 */
+	public function setRenderer(FOFRenderAbstract &$renderer)
+	{
+		$this->rendererObject = $renderer;
+	}
+
+	/**
+	 * Finds a suitable renderer
+	 *
+	 * @return  FOFRenderAbstract
+	 */
+	protected function findRenderer()
+	{
+        $filesystem     = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		// Try loading the stock renderers shipped with FOF
+
+		if (empty(self::$renderers) || !class_exists('FOFRenderJoomla', false))
+		{
+			$path = __DIR__ . '/../render/';
+			$renderFiles = $filesystem->folderFiles($path, '.php');
+
+			if (!empty($renderFiles))
+			{
+				foreach ($renderFiles as $filename)
+				{
+					if ($filename == 'abstract.php')
+					{
+						continue;
+					}
+
+					@include_once $path . '/' . $filename;
+
+					$camel = FOFInflector::camelize($filename);
+					$className = 'FOFRender' . ucfirst(FOFInflector::getPart($camel, 0));
+					$o = new $className;
+
+					self::registerRenderer($o);
+				}
+			}
+		}
+
+		// Try to detect the most suitable renderer
+		$o = null;
+		$priority = 0;
+
+		if (!empty(self::$renderers))
+		{
+			foreach (self::$renderers as $r)
+			{
+				$info = $r->getInformation();
+
+				if (!$info->enabled)
+				{
+					continue;
+				}
+
+				if ($info->priority > $priority)
+				{
+					$priority = $info->priority;
+					$o = $r;
+				}
+			}
+		}
+
+		// Return the current renderer
+		return $o;
+	}
+
+	/**
+	 * Registers a renderer object with the view
+	 *
+	 * @param   FOFRenderAbstract  &$renderer  The render object to register
+	 *
+	 * @return  void
+	 */
+	public static function registerRenderer(FOFRenderAbstract &$renderer)
+	{
+		self::$renderers[] = $renderer;
+	}
+
+	/**
+	 * Sets the pre-render flag
+	 *
+	 * @param   boolean  $value  True to enable the pre-render step
+	 *
+	 * @return  void
+	 */
+	public function setPreRender($value)
+	{
+		$this->doPreRender = $value;
+	}
+
+	/**
+	 * Sets the post-render flag
+	 *
+	 * @param   boolean  $value  True to enable the post-render step
+	 *
+	 * @return  void
+	 */
+	public function setPostRender($value)
+	{
+		$this->doPostRender = $value;
+	}
+
+	/**
+	 * Load a helper file
+	 *
+	 * @param   string  $hlp  The name of the helper source file automatically searches the helper paths and compiles as needed.
+	 *
+	 * @return  void
+	 */
+	public function loadHelper($hlp = null)
+	{
+		// Clean the file name
+		$file = preg_replace('/[^A-Z0-9_\.-]/i', '', $hlp);
+
+		// Load the template script using the default Joomla! features
+        $filesystem = FOFPlatform::getInstance()->getIntegrationObject('filesystem');
+
+		$helper = $filesystem->pathFind($this->_path['helper'], $this->_createFileName('helper', array('name' => $file)));
+
+		if ($helper == false)
+		{
+			$componentPaths = FOFPlatform::getInstance()->getComponentBaseDirs($this->config['option']);
+			$path = $componentPaths['main'] . '/helpers';
+			$helper = $filesystem->pathFind($path, $this->_createFileName('helper', array('name' => $file)));
+
+			if ($helper == false)
+			{
+				$path = $path = $componentPaths['alt'] . '/helpers';
+				$helper = $filesystem->pathFind($path, $this->_createFileName('helper', array('name' => $file)));
+			}
+		}
+
+		if ($helper != false)
+		{
+			// Include the requested template filename in the local scope
+			include_once $helper;
+		}
+	}
+
+	/**
+	 * Returns the view's option (component name) and view name in an
+	 * associative array.
+	 *
+	 * @return  array
+	 */
+	public function getViewOptionAndName()
+	{
+		return array(
+			'option' => $this->config['option'],
+			'view'	 => $this->config['view'],
+		);
+	}
+
+	/**
+	 * Sets an entire array of search paths for templates or resources.
+	 *
+	 * @param   string  $type  The type of path to set, typically 'template'.
+	 * @param   mixed   $path  The new search path, or an array of search paths.  If null or false, resets to the current directory only.
+	 *
+	 * @return  void
+	 */
+	protected function _setPath($type, $path)
+	{
+		// Clear out the prior search dirs
+		$this->_path[$type] = array();
+
+		// Actually add the user-specified directories
+		$this->_addPath($type, $path);
+
+		// Always add the fallback directories as last resort
+		switch (strtolower($type))
+		{
+			case 'template':
+				// Set the alternative template search dir
+
+				if (!FOFPlatform::getInstance()->isCli())
+				{
+					$fallback = FOFPlatform::getInstance()->getTemplateOverridePath($this->input->getCmd('option', '')) . '/' . $this->getName();
+					$this->_addPath('template', $fallback);
+				}
+
+				break;
+		}
+	}
+
+	/**
+	 * Adds to the search path for templates and resources.
+	 *
+	 * @param   string  $type  The type of path to add.
+	 * @param   mixed   $path  The directory or stream, or an array of either, to search.
+	 *
+	 * @return  void
+	 */
+	protected function _addPath($type, $path)
+	{
+		// Just force to array
+		settype($path, 'array');
+
+		// Loop through the path directories
+		foreach ($path as $dir)
+		{
+			// No surrounding spaces allowed!
+			$dir = trim($dir);
+
+			// Add trailing separators as needed
+			if (substr($dir, -1) != DIRECTORY_SEPARATOR)
+			{
+				// Directory
+				$dir .= DIRECTORY_SEPARATOR;
+			}
+
+			// Add to the top of the search dirs
+			array_unshift($this->_path[$type], $dir);
+		}
+	}
+
+	/**
+	 * Create the filename for a resource
+	 *
+	 * @param   string  $type   The resource type to create the filename for
+	 * @param   array   $parts  An associative array of filename information
+	 *
+	 * @return  string  The filename
+	 */
+	protected function _createFileName($type, $parts = array())
+	{
+		$filename = '';
+
+		switch ($type)
+		{
+			case 'template':
+				$filename = strtolower($parts['name']) . '.' . $this->_layoutExt;
+				break;
+
+			default:
+				$filename = strtolower($parts['name']) . '.php';
+				break;
+		}
+
+		return $filename;
+	}
+}
diff --git a/core/libraries/idna_convert/LICENCE b/core/libraries/idna_convert/LICENCE
new file mode 100644
index 00000000..25a1d22d
--- /dev/null
+++ b/core/libraries/idna_convert/LICENCE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/core/libraries/idna_convert/ReadMe.txt b/core/libraries/idna_convert/ReadMe.txt
new file mode 100644
index 00000000..83dc34e9
--- /dev/null
+++ b/core/libraries/idna_convert/ReadMe.txt
@@ -0,0 +1,198 @@
+*******************************************************************************
+*                                                                             *
+*                    IDNA Convert (idna_convert.class.php)                    *
+*                                                                             *
+* http://idnaconv.phlymail.de                     mailto:phlymail@phlylabs.de *
+*******************************************************************************
+* (c) 2004-2011 phlyLabs, Berlin                                              *
+* This file is encoded in UTF-8                                               *
+*******************************************************************************
+
+Introduction
+------------
+
+The class idna_convert allows to convert internationalized domain names
+(see RFC 3490, 3491, 3492 and 3454 for detials) as they can be used with various
+registries worldwide to be translated between their original (localized) form
+and their encoded form as it will be used in the DNS (Domain Name System).
+
+The class provides two public methods, encode() and decode(), which do exactly
+what you would expect them to do. You are allowed to use complete domain names,
+simple strings and complete email addresses as well. That means, that you might
+use any of the following notations:
+
+- www.nörgler.com
+- xn--nrgler-wxa
+- xn--brse-5qa.xn--knrz-1ra.info
+
+Errors, incorrectly encoded or invalid strings will lead to either a FALSE
+response (when in strict mode) or to only partially converted strings.
+You can query the occured error by calling the method get_last_error().
+
+Unicode strings are expected to be either UTF-8 strings, UCS-4 strings or UCS-4
+arrays. The default format is UTF-8. For setting different encodings, you can
+call the method setParams() - please see the inline documentation for details.
+ACE strings (the Punycode form) are always 7bit ASCII strings.
+
+ATTENTION: As of version 0.6.0 this class is written in the OOP style of PHP5.
+Since PHP4 is no longer actively maintained, you should switch to PHP5 as fast as
+possible.
+We expect to see no compatibility issues with the upcoming PHP6, too.
+
+ATTENTION: BC break! As of version 0.6.4 the class per default allows the German
+ligature ß to be encoded as the DeNIC, the registry for .DE allows domains
+containing ß.
+In older builds "ß" was mapped to "ss". Should you still need this behaviour,
+see example 5 below.
+
+ATTENTION: As of version 0.8.0 the class fully supports IDNA 2008. Thus the 
+aforementioned parameter is deprecated and replaced by a parameter to switch
+between the standards. See the updated example 5 below.
+
+Files
+-----
+idna_convert.class.php         - The actual class
+example.php                    - An example web page for converting
+transcode_wrapper.php          - Convert various encodings, see below
+uctc.php                       - phlyLabs' Unicode Transcoder, see below
+ReadMe.txt                     - This file
+LICENCE                        - The LGPL licence file
+
+The class is contained in idna_convert.class.php.
+
+
+Examples
+--------
+1. Say we wish to encode the domain name nörgler.com:
+
+// Include the class
+require_once('idna_convert.class.php');
+// Instantiate it
+$IDN = new idna_convert();
+// The input string, if input is not UTF-8 or UCS-4, it must be converted before
+$input = utf8_encode('nörgler.com');
+// Encode it to its punycode presentation
+$output = $IDN->encode($input);
+// Output, what we got now
+echo $output; // This will read: xn--nrgler-wxa.com
+
+
+2. We received an email from a punycoded domain and are willing to learn, how
+   the domain name reads originally
+
+// Include the class
+require_once('idna_convert.class.php');
+// Instantiate it
+$IDN = new idna_convert();
+// The input string
+$input = 'andre@xn--brse-5qa.xn--knrz-1ra.info';
+// Encode it to its punycode presentation
+$output = $IDN->decode($input);
+// Output, what we got now, if output should be in a format different to UTF-8
+// or UCS-4, you will have to convert it before outputting it
+echo utf8_decode($output); // This will read: andre@börse.knörz.info
+
+
+3. The input is read from a UCS-4 coded file and encoded line by line. By
+   appending the optional second parameter we tell enode() about the input
+   format to be used
+
+// Include the class
+require_once('idna_convert.class.php');
+// Instantiate it
+$IDN = new dinca_convert();
+// Iterate through the input file line by line
+foreach (file('ucs4-domains.txt') as $line) {
+    echo $IDN->encode(trim($line), 'ucs4_string');
+    echo "\n";
+}
+
+
+4. We wish to convert a whole URI into the IDNA form, but leave the path or
+   query string component of it alone. Just using encode() would lead to mangled
+   paths or query strings. Here the public method encode_uri() comes into play:
+
+// Include the class
+require_once('idna_convert.class.php');
+// Instantiate it
+$IDN = new idna_convert();
+// The input string, a whole URI in UTF-8 (!)
+$input = 'http://nörgler:secret@nörgler.com/my_päth_is_not_ÄSCII/');
+// Encode it to its punycode presentation
+$output = $IDN->encode_uri($input);
+// Output, what we got now
+echo $output; // http://nörgler:secret@xn--nrgler-wxa.com/my_päth_is_not_ÄSCII/
+
+
+5. To support IDNA 2008, the class needs to be invoked with an additional
+   parameter. This can also be achieved on an instance.
+
+// Include the class
+require_once('idna_convert.class.php');
+// Instantiate it
+$IDN = new idna_convert(array('idn_version' => 2008));
+// Sth. containing the German letter ß
+$input = 'meine-straße.de');
+// Encode it to its punycode presentation
+$output = $IDN->encode_uri($input);
+// Output, what we got now
+echo $output; // xn--meine-strae-46a.de
+// Switch back to old IDNA 2003, the original standard
+$IDN->set_parameter('idn_version', 2003);
+// Sth. containing the German letter ß
+$input = 'meine-straße.de');
+// Encode it to its punycode presentation
+$output = $IDN->encode_uri($input);
+// Output, what we got now
+echo $output; // meine-strasse.de
+
+
+Transcode wrapper
+-----------------
+In case you have strings in different encoding than ISO-8859-1 and UTF-8 you might need to
+translate these strings to UTF-8 before feeding the IDNA converter with it.
+PHP's built in functions utf8_encode() and utf8_decode() can only deal with ISO-8859-1.
+Use the file transcode_wrapper.php for the conversion. It requires either iconv, libiconv
+or mbstring installed together with one of the relevant PHP extensions.
+The functions you will find useful are
+encode_utf8() as a replacement for utf8_encode() and
+decode_utf8() as a replacement for utf8_decode().
+
+Example usage:
+<?php
+require_once('idna_convert.class.php');
+require_once('transcode_wrapper.php');
+$mystring = '<something in e.g. ISO-8859-15';
+$mystring = encode_utf8($mystring, 'ISO-8859-15');
+echo $IDN->encode($mystring);
+?>
+
+
+UCTC - Unicode Transcoder
+-------------------------
+Another class you might find useful when dealing with one or more of the Unicode encoding
+flavours. The class is static, it requires PHP5. It can transcode into each other:
+- UCS-4 string / array
+- UTF-8
+- UTF-7
+- UTF-7 IMAP (modified UTF-7)
+All encodings expect / return a string in the given format, with one major exception:
+UCS-4 array is jsut an array, where each value represents one codepoint in the string, i.e.
+every value is a 32bit integer value.
+
+Example usage:
+<?php
+require_once('uctc.php');
+$mystring = 'nörgler.com';
+echo uctc::convert($mystring, 'utf8', 'utf7imap');
+?>
+
+
+Contact us
+----------
+In case of errors, bugs, questions, wishes, please don't hesitate to contact us
+under the email address above.
+
+The team of phlyLabs
+http://phlylabs.de
+mailto:phlymail@phlylabs.de
\ No newline at end of file
diff --git a/core/libraries/idna_convert/idna_convert.class.php b/core/libraries/idna_convert/idna_convert.class.php
new file mode 100644
index 00000000..949bd4a6
--- /dev/null
+++ b/core/libraries/idna_convert/idna_convert.class.php
@@ -0,0 +1,1605 @@
+<?php
+// {{{ license
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
+//
+// +----------------------------------------------------------------------+
+// | This library is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU Lesser General Public License as       |
+// | published by the Free Software Foundation; either version 2.1 of the |
+// | License, or (at your option) any later version.                      |
+// |                                                                      |
+// | This library is distributed in the hope that it will be useful, but  |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of           |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    |
+// | Lesser General Public License for more details.                      |
+// |                                                                      |
+// | You should have received a copy of the GNU Lesser General Public     |
+// | License along with this library; if not, write to the Free Software  |
+// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 |
+// | USA.                                                                 |
+// +----------------------------------------------------------------------+
+//
+
+// }}}
+
+/**
+ * Encode/decode Internationalized Domain Names.
+ *
+ * The class allows to convert internationalized domain names
+ * (see RFC 3490 for details) as they can be used with various registries worldwide
+ * to be translated between their original (localized) form and their encoded form
+ * as it will be used in the DNS (Domain Name System).
+ *
+ * The class provides two public methods, encode() and decode(), which do exactly
+ * what you would expect them to do. You are allowed to use complete domain names,
+ * simple strings and complete email addresses as well. That means, that you might
+ * use any of the following notations:
+ *
+ * - www.nörgler.com
+ * - xn--nrgler-wxa
+ * - xn--brse-5qa.xn--knrz-1ra.info
+ *
+ * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4 array.
+ * Unicode output is available in the same formats.
+ * You can select your preferred format via {@link set_paramter()}.
+ *
+ * ACE input and output is always expected to be ASCII.
+ *
+ * @author  Matthias Sommerfeld <mso@phlylabs.de>
+ * @copyright 2004-2011 phlyLabs Berlin, http://phlylabs.de
+ * @version 0.8.0 2011-03-11
+ */
+class idna_convert
+{
+    // NP See below
+
+    // Internal settings, do not mess with them
+    protected $_punycode_prefix = 'xn--';
+    protected $_invalid_ucs = 0x80000000;
+    protected $_max_ucs = 0x10FFFF;
+    protected $_base = 36;
+    protected $_tmin = 1;
+    protected $_tmax = 26;
+    protected $_skew = 38;
+    protected $_damp = 700;
+    protected $_initial_bias = 72;
+    protected $_initial_n = 0x80;
+    protected $_sbase = 0xAC00;
+    protected $_lbase = 0x1100;
+    protected $_vbase = 0x1161;
+    protected $_tbase = 0x11A7;
+    protected $_lcount = 19;
+    protected $_vcount = 21;
+    protected $_tcount = 28;
+    protected $_ncount = 588;   // _vcount * _tcount
+    protected $_scount = 11172; // _lcount * _tcount * _vcount
+    protected $_error = false;
+
+    protected static $_mb_string_overload = null;
+
+    // See {@link set_paramter()} for details of how to change the following
+    // settings from within your script / application
+    protected $_api_encoding = 'utf8';   // Default input charset is UTF-8
+    protected $_allow_overlong = false;  // Overlong UTF-8 encodings are forbidden
+    protected $_strict_mode = false;     // Behave strict or not
+    protected $_idn_version = 2003;      // Can be either 2003 (old, default) or 2008
+
+    /**
+     * the constructor
+     *
+     * @param array $options
+     * @return boolean
+     * @since 0.5.2
+     */
+    public function __construct($options = false)
+    {
+        $this->slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
+        // If parameters are given, pass these to the respective method
+        if (is_array($options)) {
+            $this->set_parameter($options);
+        }
+
+        // populate mbstring overloading cache if not set
+        if (self::$_mb_string_overload === null) {
+            self::$_mb_string_overload = (extension_loaded('mbstring')
+                && (ini_get('mbstring.func_overload') & 0x02) === 0x02);
+        }
+    }
+
+    /**
+     * Sets a new option value. Available options and values:
+     * [encoding - Use either UTF-8, UCS4 as array or UCS4 as string as input ('utf8' for UTF-8,
+     *         'ucs4_string' and 'ucs4_array' respectively for UCS4); The output is always UTF-8]
+     * [overlong - Unicode does not allow unnecessarily long encodings of chars,
+     *             to allow this, set this parameter to true, else to false;
+     *             default is false.]
+     * [strict - true: strict mode, good for registration purposes - Causes errors
+     *           on failures; false: loose mode, ideal for "wildlife" applications
+     *           by silently ignoring errors and returning the original input instead
+     *
+     * @param    mixed     Parameter to set (string: single parameter; array of Parameter => Value pairs)
+     * @param    string    Value to use (if parameter 1 is a string)
+     * @return   boolean  true on success, false otherwise
+     */
+    public function set_parameter($option, $value = false)
+    {
+        if (!is_array($option)) {
+            $option = array($option => $value);
+        }
+        foreach ($option as $k => $v) {
+            switch ($k) {
+            case 'encoding':
+                switch ($v) {
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    $this->_api_encoding = $v;
+                    break;
+                default:
+                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    return false;
+                }
+                break;
+            case 'overlong':
+                $this->_allow_overlong = ($v) ? true : false;
+                break;
+            case 'strict':
+                $this->_strict_mode = ($v) ? true : false;
+                break;
+            case 'idn_version':
+                if (in_array($v, array('2003', '2008'))) {
+                    $this->_idn_version = $v;
+                } else {
+                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                }
+                break;
+            case 'encode_german_sz': // Deprecated
+                if (!$v) {
+                    self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
+                } else {
+                    unset(self::$NP['replacemaps'][0xDF]);
+                }
+                break;
+            default:
+                $this->_error('Set Parameter: Unknown option '.$k);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Decode a given ACE domain name
+     * @param    string   Domain name (ACE string)
+     * [@param    string   Desired output encoding, see {@link set_parameter}]
+     * @return   string   Decoded Domain name (UTF-8 or UCS-4)
+     */
+    public function decode($input, $one_time_encoding = false)
+    {
+        // Optionally set
+        if ($one_time_encoding) {
+            switch ($one_time_encoding) {
+            case 'utf8':
+            case 'ucs4_string':
+            case 'ucs4_array':
+                break;
+            default:
+                $this->_error('Unknown encoding '.$one_time_encoding);
+                return false;
+            }
+        }
+        // Make sure to drop any newline characters around
+        $input = trim($input);
+
+        // Negotiate input and try to determine, whether it is a plain string,
+        // an email address or something like a complete URL
+        if (strpos($input, '@')) { // Maybe it is an email address
+            // No no in strict mode
+            if ($this->_strict_mode) {
+                $this->_error('Only simple domain name parts can be handled in strict mode');
+                return false;
+            }
+            list ($email_pref, $input) = explode('@', $input, 2);
+            $arr = explode('.', $input);
+            foreach ($arr as $k => $v) {
+                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+            }
+            $input = join('.', $arr);
+            $arr = explode('.', $email_pref);
+            foreach ($arr as $k => $v) {
+                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+            }
+            $email_pref = join('.', $arr);
+            $return = $email_pref . '@' . $input;
+        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+            // No no in strict mode
+            if ($this->_strict_mode) {
+                $this->_error('Only simple domain name parts can be handled in strict mode');
+                return false;
+            }
+            $parsed = parse_url($input);
+            if (isset($parsed['host'])) {
+                $arr = explode('.', $parsed['host']);
+                foreach ($arr as $k => $v) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+                $parsed['host'] = join('.', $arr);
+                $return =
+                        (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://'))
+                        .(empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@')
+                        .$parsed['host']
+                        .(empty($parsed['port']) ? '' : ':'.$parsed['port'])
+                        .(empty($parsed['path']) ? '' : $parsed['path'])
+                        .(empty($parsed['query']) ? '' : '?'.$parsed['query'])
+                        .(empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
+            } else { // parse_url seems to have failed, try without it
+                $arr = explode('.', $input);
+                foreach ($arr as $k => $v) {
+                    $conv = $this->_decode($v);
+                    $arr[$k] = ($conv) ? $conv : $v;
+                }
+                $return = join('.', $arr);
+            }
+        } else { // Otherwise we consider it being a pure domain name string
+            $return = $this->_decode($input);
+            if (!$return) $return = $input;
+        }
+        // The output is UTF-8 by default, other output formats need conversion here
+        // If one time encoding is given, use this, else the objects property
+        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
+        case 'utf8':
+            return $return;
+            break;
+        case 'ucs4_string':
+           return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+           break;
+        case 'ucs4_array':
+            return $this->_utf8_to_ucs4($return);
+            break;
+        default:
+            $this->_error('Unsupported output format');
+            return false;
+        }
+    }
+
+    /**
+     * Encode a given UTF-8 domain name
+     * @param    string   Domain name (UTF-8 or UCS-4)
+     * [@param    string   Desired input encoding, see {@link set_parameter}]
+     * @return   string   Encoded Domain name (ACE string)
+     */
+    public function encode($decoded, $one_time_encoding = false)
+    {
+        // Forcing conversion of input to UCS4 array
+        // If one time encoding is given, use this, else the objects property
+        switch ($one_time_encoding ? $one_time_encoding : $this->_api_encoding) {
+        case 'utf8':
+            $decoded = $this->_utf8_to_ucs4($decoded);
+            break;
+        case 'ucs4_string':
+           $decoded = $this->_ucs4_string_to_ucs4($decoded);
+        case 'ucs4_array':
+           break;
+        default:
+            $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
+            return false;
+        }
+
+        // No input, no output, what else did you expect?
+        if (empty($decoded)) return '';
+
+        // Anchors for iteration
+        $last_begin = 0;
+        // Output string
+        $output = '';
+        foreach ($decoded as $k => $v) {
+            // Make sure to use just the plain dot
+            switch($v) {
+            case 0x3002:
+            case 0xFF0E:
+            case 0xFF61:
+                $decoded[$k] = 0x2E;
+                // Right, no break here, the above are converted to dots anyway
+            // Stumbling across an anchoring character
+            case 0x2E:
+            case 0x2F:
+            case 0x3A:
+            case 0x3F:
+            case 0x40:
+                // Neither email addresses nor URLs allowed in strict mode
+                if ($this->_strict_mode) {
+                   $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
+                   return false;
+                } else {
+                    // Skip first char
+                    if ($k) {
+                        $encoded = '';
+                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        if ($encoded) {
+                            $output .= $encoded;
+                        } else {
+                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        }
+                        $output .= chr($decoded[$k]);
+                    }
+                    $last_begin = $k + 1;
+                }
+            }
+        }
+        // Catch the rest of the string
+        if ($last_begin) {
+            $inp_len = sizeof($decoded);
+            $encoded = '';
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            if ($encoded) {
+                $output .= $encoded;
+            } else {
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            }
+            return $output;
+        } else {
+            if ($output = $this->_encode($decoded)) {
+                return $output;
+            } else {
+                return $this->_ucs4_to_utf8($decoded);
+            }
+        }
+    }
+
+    /**
+     * Removes a weakness of encode(), which cannot properly handle URIs but instead encodes their
+     * path or query components, too.
+     * @param string  $uri  Expects the URI as a UTF-8 (or ASCII) string
+     * @return  string  The URI encoded to Punycode, everything but the host component is left alone
+     * @since 0.6.4
+     */
+    public function encode_uri($uri)
+    {
+        $parsed = parse_url($uri);
+        if (!isset($parsed['host'])) {
+            $this->_error('The given string does not look like a URI');
+            return false;
+        }
+        $arr = explode('.', $parsed['host']);
+        foreach ($arr as $k => $v) {
+            $conv = $this->encode($v, 'utf8');
+            if ($conv) $arr[$k] = $conv;
+        }
+        $parsed['host'] = join('.', $arr);
+        $return =
+                (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://'))
+                .(empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@')
+                .$parsed['host']
+                .(empty($parsed['port']) ? '' : ':'.$parsed['port'])
+                .(empty($parsed['path']) ? '' : $parsed['path'])
+                .(empty($parsed['query']) ? '' : '?'.$parsed['query'])
+                .(empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
+        return $return;
+    }
+
+    /**
+     * Use this method to get the last error ocurred
+     * @param    void
+     * @return   string   The last error, that occured
+     */
+    public function get_last_error()
+    {
+        return $this->_error;
+    }
+
+    /**
+     * The actual decoding algorithm
+     * @param string
+     * @return mixed
+     */
+    protected function _decode($encoded)
+    {
+        $decoded = array();
+        // find the Punycode prefix
+        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
+            $this->_error('This is not a punycode string');
+            return false;
+        }
+        $encode_test = preg_replace('!^'.preg_quote($this->_punycode_prefix, '!').'!', '', $encoded);
+        // If nothing left after removing the prefix, it is hopeless
+        if (!$encode_test) {
+            $this->_error('The given encoded string was empty');
+            return false;
+        }
+        // Find last occurence of the delimiter
+        $delim_pos = strrpos($encoded, '-');
+        if ($delim_pos > self::byteLength($this->_punycode_prefix)) {
+            for ($k = self::byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
+                $decoded[] = ord($encoded{$k});
+            }
+        }
+        $deco_len = count($decoded);
+        $enco_len = self::byteLength($encoded);
+
+        // Wandering through the strings; init
+        $is_first = true;
+        $bias = $this->_initial_bias;
+        $idx = 0;
+        $char = $this->_initial_n;
+
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+                $digit = $this->_decode_digit($encoded{$enco_idx++});
+                $idx += $digit * $w;
+                $t = ($k <= $bias) ? $this->_tmin :
+                        (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
+                if ($digit < $t) break;
+                $w = (int) ($w * ($this->_base - $t));
+            }
+            $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
+            $is_first = false;
+            $char += (int) ($idx / ($deco_len + 1));
+            $idx %= ($deco_len + 1);
+            if ($deco_len > 0) {
+                // Make room for the decoded char
+                for ($i = $deco_len; $i > $idx; $i--) $decoded[$i] = $decoded[($i - 1)];
+            }
+            $decoded[$idx++] = $char;
+        }
+        return $this->_ucs4_to_utf8($decoded);
+    }
+
+    /**
+     * The actual encoding algorithm
+     * @param  string
+     * @return mixed
+     */
+    protected function _encode($decoded)
+    {
+        // We cannot encode a domain name containing the Punycode prefix
+        $extract = self::byteLength($this->_punycode_prefix);
+        $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
+        $check_deco = array_slice($decoded, 0, $extract);
+
+        if ($check_pref == $check_deco) {
+            $this->_error('This is already a punycode string');
+            return false;
+        }
+        // We will not try to encode strings consisting of basic code points only
+        $encodable = false;
+        foreach ($decoded as $k => $v) {
+            if ($v > 0x7a) {
+                $encodable = true;
+                break;
+            }
+        }
+        if (!$encodable) {
+            $this->_error('The given string does not contain encodable chars');
+            return false;
+        }
+        // Do NAMEPREP
+        $decoded = $this->_nameprep($decoded);
+        if (!$decoded || !is_array($decoded)) return false; // NAMEPREP failed
+        $deco_len  = count($decoded);
+        if (!$deco_len) return false; // Empty array
+        $codecount = 0; // How many chars have been consumed
+        $encoded = '';
+        // Copy all basic code points to output
+        for ($i = 0; $i < $deco_len; ++$i) {
+            $test = $decoded[$i];
+            // Will match [-0-9a-zA-Z]
+            if ((0x2F < $test && $test < 0x40) || (0x40 < $test && $test < 0x5B)
+                    || (0x60 < $test && $test <= 0x7B) || (0x2D == $test)) {
+                $encoded .= chr($decoded[$i]);
+                $codecount++;
+            }
+        }
+        if ($codecount == $deco_len) return $encoded; // All codepoints were basic ones
+
+        // Start with the prefix; copy it to output
+        $encoded = $this->_punycode_prefix.$encoded;
+        // If we have basic code points in output, add an hyphen to the end
+        if ($codecount) $encoded .= '-';
+        // Now find and encode all non-basic code points
+        $is_first = true;
+        $cur_code = $this->_initial_n;
+        $bias = $this->_initial_bias;
+        $delta = 0;
+        while ($codecount < $deco_len) {
+            // Find the smallest code point >= the current code point and
+            // remember the last ouccrence of it in the input
+            for ($i = 0, $next_code = $this->_max_ucs; $i < $deco_len; $i++) {
+                if ($decoded[$i] >= $cur_code && $decoded[$i] <= $next_code) {
+                    $next_code = $decoded[$i];
+                }
+            }
+            $delta += ($next_code - $cur_code) * ($codecount + 1);
+            $cur_code = $next_code;
+
+            // Scan input again and encode all characters whose code point is $cur_code
+            for ($i = 0; $i < $deco_len; $i++) {
+                if ($decoded[$i] < $cur_code) {
+                    $delta++;
+                } elseif ($decoded[$i] == $cur_code) {
+                    for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
+                        $t = ($k <= $bias) ? $this->_tmin :
+                                (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
+                        if ($q < $t) break;
+                        $encoded .= $this->_encode_digit(intval($t + (($q - $t) % ($this->_base - $t)))); //v0.4.5 Changed from ceil() to intval()
+                        $q = (int) (($q - $t) / ($this->_base - $t));
+                    }
+                    $encoded .= $this->_encode_digit($q);
+                    $bias = $this->_adapt($delta, $codecount+1, $is_first);
+                    $codecount++;
+                    $delta = 0;
+                    $is_first = false;
+                }
+            }
+            $delta++;
+            $cur_code++;
+        }
+        return $encoded;
+    }
+
+    /**
+     * Adapt the bias according to the current code point and position
+     * @param int $delta
+     * @param int $npoints
+     * @param int $is_first
+     * @return int
+     */
+    protected function _adapt($delta, $npoints, $is_first)
+    {
+        $delta = intval($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += intval($delta / $npoints);
+        for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
+            $delta = intval($delta / ($this->_base - $this->_tmin));
+        }
+        return intval($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+    }
+
+    /**
+     * Encoding a certain digit
+     * @param    int $d
+     * @return string
+     */
+    protected function _encode_digit($d)
+    {
+        return chr($d + 22 + 75 * ($d < 26));
+    }
+
+    /**
+     * Decode a certain digit
+     * @param    int $cp
+     * @return int
+     */
+    protected function _decode_digit($cp)
+    {
+        $cp = ord($cp);
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
+    }
+
+    /**
+     * Internal error handling method
+     * @param  string $error
+     */
+    protected function _error($error = '')
+    {
+        $this->_error = $error;
+    }
+
+    /**
+     * Do Nameprep according to RFC3491 and RFC3454
+     * @param    array    Unicode Characters
+     * @return   string   Unicode Characters, Nameprep'd
+     */
+    protected function _nameprep($input)
+    {
+        $output = array();
+        $error = false;
+        //
+        // Mapping
+        // Walking through the input array, performing the required steps on each of
+        // the input chars and putting the result into the output array
+        // While mapping required chars we apply the cannonical ordering
+        foreach ($input as $v) {
+            // Map to nothing == skip that code point
+            if (in_array($v, self::$NP['map_nothing'])) continue;
+            // Try to find prohibited input
+            if (in_array($v, self::$NP['prohibit']) || in_array($v, self::$NP['general_prohibited'])) {
+                $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
+                return false;
+            }
+            foreach (self::$NP['prohibit_ranges'] as $range) {
+                if ($range[0] <= $v && $v <= $range[1]) {
+                    $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
+                    return false;
+                }
+            }
+
+            if (0xAC00 <= $v && $v <= 0xD7AF) {
+                // Hangul syllable decomposition
+                foreach ($this->_hangul_decompose($v) as $out) {
+                    $output[] = (int) $out;
+                }
+            } elseif (($this->_idn_version == '2003') && isset(self::$NP['replacemaps'][$v])) {
+                // There's a decomposition mapping for that code point
+                // Decompositions only in version 2003 (original) of IDNA
+                foreach ($this->_apply_cannonical_ordering(self::$NP['replacemaps'][$v]) as $out) {
+                    $output[] = (int) $out;
+                }
+            } else {
+                $output[] = (int) $v;
+            }
+        }
+        // Before applying any Combining, try to rearrange any Hangul syllables
+        $output = $this->_hangul_compose($output);
+        //
+        // Combine code points
+        //
+        $last_class = 0;
+        $last_starter = 0;
+        $out_len = count($output);
+        for ($i = 0; $i < $out_len; ++$i) {
+            $class = $this->_get_combining_class($output[$i]);
+            if ((!$last_class || $last_class > $class) && $class) {
+                // Try to match
+                $seq_len = $i - $last_starter;
+                $out = $this->_combine(array_slice($output, $last_starter, $seq_len));
+                // On match: Replace the last starter with the composed character and remove
+                // the now redundant non-starter(s)
+                if ($out) {
+                    $output[$last_starter] = $out;
+                    if (count($out) != $seq_len) {
+                        for ($j = $i+1; $j < $out_len; ++$j) $output[$j-1] = $output[$j];
+                        unset($output[$out_len]);
+                    }
+                    // Rewind the for loop by one, since there can be more possible compositions
+                    $i--;
+                    $out_len--;
+                    $last_class = ($i == $last_starter) ? 0 : $this->_get_combining_class($output[$i-1]);
+                    continue;
+                }
+            }
+            // The current class is 0
+            if (!$class) $last_starter = $i;
+            $last_class = $class;
+        }
+        return $output;
+    }
+
+    /**
+     * Decomposes a Hangul syllable
+     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul
+     * @param    integer  32bit UCS4 code point
+     * @return   array    Either Hangul Syllable decomposed or original 32bit value as one value array
+     */
+    protected function _hangul_decompose($char)
+    {
+        $sindex = (int) $char - $this->_sbase;
+        if ($sindex < 0 || $sindex >= $this->_scount) return array($char);
+        $result = array();
+        $result[] = (int) $this->_lbase + $sindex / $this->_ncount;
+        $result[] = (int) $this->_vbase + ($sindex % $this->_ncount) / $this->_tcount;
+        $T = intval($this->_tbase + $sindex % $this->_tcount);
+        if ($T != $this->_tbase) $result[] = $T;
+        return $result;
+    }
+    /**
+     * Ccomposes a Hangul syllable
+     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul
+     * @param    array    Decomposed UCS4 sequence
+     * @return   array    UCS4 sequence with syllables composed
+     */
+    protected function _hangul_compose($input)
+    {
+        $inp_len = count($input);
+        if (!$inp_len) return array();
+        $result = array();
+        $last = (int) $input[0];
+        $result[] = $last; // copy first char from input to output
+
+        for ($i = 1; $i < $inp_len; ++$i) {
+            $char = (int) $input[$i];
+            $sindex = $last - $this->_sbase;
+            $lindex = $last - $this->_lbase;
+            $vindex = $char - $this->_vbase;
+            $tindex = $char - $this->_tbase;
+            // Find out, whether two current characters are LV and T
+            if (0 <= $sindex && $sindex < $this->_scount && ($sindex % $this->_tcount == 0)
+                    && 0 <= $tindex && $tindex <= $this->_tcount) {
+                // create syllable of form LVT
+                $last += $tindex;
+                $result[(count($result) - 1)] = $last; // reset last
+                continue; // discard char
+            }
+            // Find out, whether two current characters form L and V
+            if (0 <= $lindex && $lindex < $this->_lcount && 0 <= $vindex && $vindex < $this->_vcount) {
+                // create syllable of form LV
+                $last = (int) $this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount;
+                $result[(count($result) - 1)] = $last; // reset last
+                continue; // discard char
+            }
+            // if neither case was true, just add the character
+            $last = $char;
+            $result[] = $char;
+        }
+        return $result;
+    }
+
+    /**
+     * Returns the combining class of a certain wide char
+     * @param    integer    Wide char to check (32bit integer)
+     * @return   integer    Combining class if found, else 0
+     */
+    protected function _get_combining_class($char)
+    {
+        return isset(self::$NP['norm_combcls'][$char]) ? self::$NP['norm_combcls'][$char] : 0;
+    }
+
+    /**
+     * Applies the cannonical ordering of a decomposed UCS4 sequence
+     * @param    array      Decomposed UCS4 sequence
+     * @return   array      Ordered USC4 sequence
+     */
+    protected function _apply_cannonical_ordering($input)
+    {
+        $swap = true;
+        $size = count($input);
+        while ($swap) {
+            $swap = false;
+            $last = $this->_get_combining_class(intval($input[0]));
+            for ($i = 0; $i < $size-1; ++$i) {
+                $next = $this->_get_combining_class(intval($input[$i+1]));
+                if ($next != 0 && $last > $next) {
+                    // Move item leftward until it fits
+                    for ($j = $i + 1; $j > 0; --$j) {
+                        if ($this->_get_combining_class(intval($input[$j-1])) <= $next) break;
+                        $t = intval($input[$j]);
+                        $input[$j] = intval($input[$j-1]);
+                        $input[$j-1] = $t;
+                        $swap = true;
+                    }
+                    // Reentering the loop looking at the old character again
+                    $next = $last;
+                }
+                $last = $next;
+            }
+        }
+        return $input;
+    }
+
+    /**
+     * Do composition of a sequence of starter and non-starter
+     * @param    array      UCS4 Decomposed sequence
+     * @return   array      Ordered USC4 sequence
+     */
+    protected function _combine($input)
+    {
+        $inp_len = count($input);
+        foreach (self::$NP['replacemaps'] as $np_src => $np_target) {
+            if ($np_target[0] != $input[0]) continue;
+            if (count($np_target) != $inp_len) continue;
+            $hit = false;
+            foreach ($input as $k2 => $v2) {
+                if ($v2 == $np_target[$k2]) {
+                    $hit = true;
+                } else {
+                    $hit = false;
+                    break;
+                }
+            }
+            if ($hit) return $np_src;
+        }
+        return false;
+    }
+
+    /**
+     * This converts an UTF-8 encoded string to its UCS-4 representation
+     * By talking about UCS-4 "strings" we mean arrays of 32bit integers representing
+     * each of the "chars". This is due to PHP not being able to handle strings with
+     * bit depth different from 8. This apllies to the reverse method _ucs4_to_utf8(), too.
+     * The following UTF-8 encodings are supported:
+     * bytes bits  representation
+     * 1        7  0xxxxxxx
+     * 2       11  110xxxxx 10xxxxxx
+     * 3       16  1110xxxx 10xxxxxx 10xxxxxx
+     * 4       21  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * 5       26  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * 6       31  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * Each x represents a bit that can be used to store character data.
+     * The five and six byte sequences are part of Annex D of ISO/IEC 10646-1:2000
+     * @param string $input
+     * @return string
+     */
+    protected function _utf8_to_ucs4($input)
+    {
+        $output = array();
+        $out_len = 0;
+        $inp_len = self::byteLength($input);
+        $mode = 'next';
+        $test = 'none';
+        for ($k = 0; $k < $inp_len; ++$k) {
+            $v = ord($input{$k}); // Extract byte from input string
+            if ($v < 128) { // We found an ASCII char - put into stirng as is
+                $output[$out_len] = $v;
+                ++$out_len;
+                if ('add' == $mode) {
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    return false;
+                }
+                continue;
+            }
+            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+                $start_byte = $v;
+                $mode = 'add';
+                $test = 'range';
+                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
+                    $v = ($v - 192) << 6;
+                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 1;
+                    $v = ($v - 224) << 12;
+                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 2;
+                    $v = ($v - 240) << 18;
+                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 3;
+                    $v = ($v - 248) << 24;
+                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 4;
+                    $v = ($v - 252) << 30;
+                } else {
+                    $this->_error('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    return false;
+                }
+                if ('add' == $mode) {
+                    $output[$out_len] = (int) $v;
+                    ++$out_len;
+                    continue;
+                }
+            }
+            if ('add' == $mode) {
+                if (!$this->_allow_overlong && $test == 'range') {
+                    $test = 'none';
+                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
+                        $this->_error('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        return false;
+                    }
+                }
+                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                    $v = ($v - 128) << ($next_byte * 6);
+                    $output[($out_len - 1)] += $v;
+                    --$next_byte;
+                } else {
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    return false;
+                }
+                if ($next_byte < 0) {
+                    $mode = 'next';
+                }
+            }
+        } // for
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 string into UTF-8 string
+     * See _utf8_to_ucs4() for details
+     * @param string  $input
+     * @return string
+     */
+    protected function _ucs4_to_utf8($input)
+    {
+        $output = '';
+        foreach ($input as $k => $v) {
+            if ($v < 128) { // 7bit are transferred literally
+                $output .= chr($v);
+            } elseif ($v < (1 << 11)) { // 2 bytes
+                $output .= chr(192+($v >> 6)).chr(128+($v & 63));
+            } elseif ($v < (1 << 16)) { // 3 bytes
+                $output .= chr(224+($v >> 12)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+            } elseif ($v < (1 << 21)) { // 4 bytes
+                $output .= chr(240+($v >> 18)).chr(128+(($v >> 12) & 63)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+            } elseif (self::$safe_mode) {
+                $output .= self::$safe_char;
+            } else {
+                $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+                return false;
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 array into UCS-4 string
+     *
+     * @param array $input
+     * @return string
+     */
+    protected function _ucs4_to_ucs4_string($input)
+    {
+        $output = '';
+        // Take array values and split output to 4 bytes per value
+        // The bit mask is 255, which reads &11111111
+        foreach ($input as $v) {
+            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
+        }
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 strin into UCS-4 garray
+     *
+     * @param  string $input
+     * @return array
+     */
+    protected function _ucs4_string_to_ucs4($input)
+    {
+        $output = array();
+        $inp_len = self::byteLength($input);
+        // Input length must be dividable by 4
+        if ($inp_len % 4) {
+            $this->_error('Input UCS4 string is broken');
+            return false;
+        }
+        // Empty input - return empty output
+        if (!$inp_len) return $output;
+        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
+            // Increment output position every 4 input bytes
+            if (!($i % 4)) {
+                $out_len++;
+                $output[$out_len] = 0;
+            }
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+        }
+        return $output;
+    }
+
+    /**
+     * Gets the length of a string in bytes even if mbstring function
+     * overloading is turned on
+     *
+     * @param string $string the string for which to get the length.
+     * @return integer the length of the string in bytes.
+     */
+    protected static function byteLength($string)
+    {
+        if (self::$_mb_string_overload) {
+            return mb_strlen($string, '8bit');
+        }
+        return strlen((binary) $string);
+    }
+
+    /**
+     * Attempts to return a concrete IDNA instance.
+     *
+     * @param array $params Set of paramaters
+     * @return idna_convert
+     * @access public
+     */
+    public function getInstance($params = array())
+    {
+        return new idna_convert($params);
+    }
+
+    /**
+     * Attempts to return a concrete IDNA instance for either php4 or php5,
+     * only creating a new instance if no IDNA instance with the same
+     * parameters currently exists.
+     *
+     * @param array $params Set of paramaters
+     *
+     * @return object idna_convert
+     * @access public
+     */
+    public function singleton($params = array())
+    {
+        static $instances;
+        if (!isset($instances)) {
+            $instances = array();
+        }
+        $signature = serialize($params);
+        if (!isset($instances[$signature])) {
+            $instances[$signature] = idna_convert::getInstance($params);
+        }
+        return $instances[$signature];
+    }
+
+    /**
+     * Holds all relevant mapping tables
+     * See RFC3454 for details
+     *
+     * @private array
+     * @since 0.5.2
+     */
+    protected static $NP = array
+            ('map_nothing' => array(0xAD, 0x34F, 0x1806, 0x180B, 0x180C, 0x180D, 0x200B, 0x200C
+                    ,0x200D, 0x2060, 0xFE00, 0xFE01, 0xFE02, 0xFE03, 0xFE04, 0xFE05, 0xFE06, 0xFE07
+                    ,0xFE08, 0xFE09, 0xFE0A, 0xFE0B, 0xFE0C, 0xFE0D, 0xFE0E, 0xFE0F, 0xFEFF
+                    )
+            ,'general_prohibited' => array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
+                    ,20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 ,33, 34, 35, 36, 37, 38, 39, 40, 41, 42
+                    ,43, 44, 47, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 127, 0x3002
+                    )
+            ,'prohibit' => array(0xA0, 0x340, 0x341, 0x6DD, 0x70F, 0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003
+                    ,0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x200B, 0x200C, 0x200D, 0x200E, 0x200F
+                    ,0x2028, 0x2029, 0x202A, 0x202B, 0x202C, 0x202D, 0x202E, 0x202F, 0x205F, 0x206A, 0x206B, 0x206C
+                    ,0x206D, 0x206E, 0x206F, 0x3000, 0xFEFF, 0xFFF9, 0xFFFA, 0xFFFB, 0xFFFC, 0xFFFD, 0xFFFE, 0xFFFF
+                    ,0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE, 0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF, 0x6FFFE
+                    ,0x6FFFF, 0x7FFFE, 0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE, 0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE, 0xBFFFF
+                    ,0xCFFFE, 0xCFFFF, 0xDFFFE, 0xDFFFF, 0xE0001, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF, 0x10FFFE, 0x10FFFF
+                    )
+            ,'prohibit_ranges' => array(array(0x80, 0x9F), array(0x2060, 0x206F), array(0x1D173, 0x1D17A)
+                    ,array(0xE000, 0xF8FF) ,array(0xF0000, 0xFFFFD), array(0x100000, 0x10FFFD)
+                    ,array(0xFDD0, 0xFDEF), array(0xD800, 0xDFFF), array(0x2FF0, 0x2FFB), array(0xE0020, 0xE007F)
+                    )
+            ,'replacemaps' => array(0x41 => array(0x61), 0x42 => array(0x62), 0x43 => array(0x63)
+                    ,0x44 => array(0x64), 0x45 => array(0x65), 0x46 => array(0x66), 0x47 => array(0x67)
+                    ,0x48 => array(0x68), 0x49 => array(0x69), 0x4A => array(0x6A), 0x4B => array(0x6B)
+                    ,0x4C => array(0x6C), 0x4D => array(0x6D), 0x4E => array(0x6E), 0x4F => array(0x6F)
+                    ,0x50 => array(0x70), 0x51 => array(0x71), 0x52 => array(0x72), 0x53 => array(0x73)
+                    ,0x54 => array(0x74), 0x55 => array(0x75), 0x56 => array(0x76), 0x57 => array(0x77)
+                    ,0x58 => array(0x78), 0x59 => array(0x79), 0x5A => array(0x7A), 0xB5 => array(0x3BC)
+                    ,0xC0 => array(0xE0), 0xC1 => array(0xE1), 0xC2 => array(0xE2), 0xC3 => array(0xE3)
+                    ,0xC4 => array(0xE4), 0xC5 => array(0xE5), 0xC6 => array(0xE6), 0xC7 => array(0xE7)
+                    ,0xC8 => array(0xE8), 0xC9 => array(0xE9), 0xCA => array(0xEA), 0xCB => array(0xEB)
+                    ,0xCC => array(0xEC), 0xCD => array(0xED), 0xCE => array(0xEE), 0xCF => array(0xEF)
+                    ,0xD0 => array(0xF0), 0xD1 => array(0xF1), 0xD2 => array(0xF2), 0xD3 => array(0xF3)
+                    ,0xD4 => array(0xF4), 0xD5 => array(0xF5), 0xD6 => array(0xF6), 0xD8 => array(0xF8)
+                    ,0xD9 => array(0xF9), 0xDA => array(0xFA), 0xDB => array(0xFB), 0xDC => array(0xFC)
+                    ,0xDD => array(0xFD), 0xDE => array(0xFE), 0xDF => array(0x73, 0x73)
+                    ,0x100 => array(0x101), 0x102 => array(0x103), 0x104 => array(0x105)
+                    ,0x106 => array(0x107), 0x108 => array(0x109), 0x10A => array(0x10B)
+                    ,0x10C => array(0x10D), 0x10E => array(0x10F), 0x110 => array(0x111)
+                    ,0x112 => array(0x113), 0x114 => array(0x115), 0x116 => array(0x117)
+                    ,0x118 => array(0x119), 0x11A => array(0x11B), 0x11C => array(0x11D)
+                    ,0x11E => array(0x11F), 0x120 => array(0x121), 0x122 => array(0x123)
+                    ,0x124 => array(0x125), 0x126 => array(0x127), 0x128 => array(0x129)
+                    ,0x12A => array(0x12B), 0x12C => array(0x12D), 0x12E => array(0x12F)
+                    ,0x130 => array(0x69, 0x307), 0x132 => array(0x133), 0x134 => array(0x135)
+                    ,0x136 => array(0x137), 0x139 => array(0x13A), 0x13B => array(0x13C)
+                    ,0x13D => array(0x13E), 0x13F => array(0x140), 0x141 => array(0x142)
+                    ,0x143 => array(0x144), 0x145 => array(0x146), 0x147 => array(0x148)
+                    ,0x149 => array(0x2BC, 0x6E), 0x14A => array(0x14B), 0x14C => array(0x14D)
+                    ,0x14E => array(0x14F), 0x150 => array(0x151), 0x152 => array(0x153)
+                    ,0x154 => array(0x155), 0x156 => array(0x157), 0x158 => array(0x159)
+                    ,0x15A => array(0x15B), 0x15C => array(0x15D), 0x15E => array(0x15F)
+                    ,0x160 => array(0x161), 0x162 => array(0x163), 0x164 => array(0x165)
+                    ,0x166 => array(0x167), 0x168 => array(0x169), 0x16A => array(0x16B)
+                    ,0x16C => array(0x16D), 0x16E => array(0x16F), 0x170 => array(0x171)
+                    ,0x172 => array(0x173), 0x174 => array(0x175), 0x176 => array(0x177)
+                    ,0x178 => array(0xFF), 0x179 => array(0x17A), 0x17B => array(0x17C)
+                    ,0x17D => array(0x17E), 0x17F => array(0x73), 0x181 => array(0x253)
+                    ,0x182 => array(0x183), 0x184 => array(0x185), 0x186 => array(0x254)
+                    ,0x187 => array(0x188), 0x189 => array(0x256), 0x18A => array(0x257)
+                    ,0x18B => array(0x18C), 0x18E => array(0x1DD), 0x18F => array(0x259)
+                    ,0x190 => array(0x25B), 0x191 => array(0x192), 0x193 => array(0x260)
+                    ,0x194 => array(0x263), 0x196 => array(0x269), 0x197 => array(0x268)
+                    ,0x198 => array(0x199), 0x19C => array(0x26F), 0x19D => array(0x272)
+                    ,0x19F => array(0x275), 0x1A0 => array(0x1A1), 0x1A2 => array(0x1A3)
+                    ,0x1A4 => array(0x1A5), 0x1A6 => array(0x280), 0x1A7 => array(0x1A8)
+                    ,0x1A9 => array(0x283), 0x1AC => array(0x1AD), 0x1AE => array(0x288)
+                    ,0x1AF => array(0x1B0), 0x1B1 => array(0x28A), 0x1B2 => array(0x28B)
+                    ,0x1B3 => array(0x1B4), 0x1B5 => array(0x1B6), 0x1B7 => array(0x292)
+                    ,0x1B8 => array(0x1B9), 0x1BC => array(0x1BD), 0x1C4 => array(0x1C6)
+                    ,0x1C5 => array(0x1C6), 0x1C7 => array(0x1C9), 0x1C8 => array(0x1C9)
+                    ,0x1CA => array(0x1CC), 0x1CB => array(0x1CC), 0x1CD => array(0x1CE)
+                    ,0x1CF => array(0x1D0), 0x1D1   => array(0x1D2), 0x1D3   => array(0x1D4)
+                    ,0x1D5   => array(0x1D6), 0x1D7   => array(0x1D8), 0x1D9   => array(0x1DA)
+                    ,0x1DB   => array(0x1DC), 0x1DE   => array(0x1DF), 0x1E0   => array(0x1E1)
+                    ,0x1E2   => array(0x1E3), 0x1E4   => array(0x1E5), 0x1E6   => array(0x1E7)
+                    ,0x1E8   => array(0x1E9), 0x1EA   => array(0x1EB), 0x1EC   => array(0x1ED)
+                    ,0x1EE   => array(0x1EF), 0x1F0   => array(0x6A, 0x30C), 0x1F1   => array(0x1F3)
+                    ,0x1F2   => array(0x1F3), 0x1F4   => array(0x1F5), 0x1F6   => array(0x195)
+                    ,0x1F7   => array(0x1BF), 0x1F8   => array(0x1F9), 0x1FA   => array(0x1FB)
+                    ,0x1FC   => array(0x1FD), 0x1FE   => array(0x1FF), 0x200   => array(0x201)
+                    ,0x202   => array(0x203), 0x204   => array(0x205), 0x206   => array(0x207)
+                    ,0x208   => array(0x209), 0x20A   => array(0x20B), 0x20C   => array(0x20D)
+                    ,0x20E   => array(0x20F), 0x210   => array(0x211), 0x212   => array(0x213)
+                    ,0x214   => array(0x215), 0x216   => array(0x217), 0x218   => array(0x219)
+                    ,0x21A   => array(0x21B), 0x21C   => array(0x21D), 0x21E   => array(0x21F)
+                    ,0x220   => array(0x19E), 0x222   => array(0x223), 0x224   => array(0x225)
+                    ,0x226   => array(0x227), 0x228   => array(0x229), 0x22A   => array(0x22B)
+                    ,0x22C   => array(0x22D), 0x22E   => array(0x22F), 0x230   => array(0x231)
+                    ,0x232   => array(0x233), 0x345   => array(0x3B9), 0x37A   => array(0x20, 0x3B9)
+                    ,0x386   => array(0x3AC), 0x388   => array(0x3AD), 0x389   => array(0x3AE)
+                    ,0x38A   => array(0x3AF), 0x38C   => array(0x3CC), 0x38E   => array(0x3CD)
+                    ,0x38F   => array(0x3CE), 0x390   => array(0x3B9, 0x308, 0x301)
+                    ,0x391   => array(0x3B1), 0x392   => array(0x3B2), 0x393   => array(0x3B3)
+                    ,0x394   => array(0x3B4), 0x395   => array(0x3B5), 0x396   => array(0x3B6)
+                    ,0x397   => array(0x3B7), 0x398   => array(0x3B8), 0x399   => array(0x3B9)
+                    ,0x39A   => array(0x3BA), 0x39B   => array(0x3BB), 0x39C   => array(0x3BC)
+                    ,0x39D   => array(0x3BD), 0x39E   => array(0x3BE), 0x39F   => array(0x3BF)
+                    ,0x3A0   => array(0x3C0), 0x3A1   => array(0x3C1), 0x3A3   => array(0x3C3)
+                    ,0x3A4   => array(0x3C4), 0x3A5   => array(0x3C5), 0x3A6   => array(0x3C6)
+                    ,0x3A7   => array(0x3C7), 0x3A8   => array(0x3C8), 0x3A9   => array(0x3C9)
+                    ,0x3AA   => array(0x3CA), 0x3AB   => array(0x3CB), 0x3B0   => array(0x3C5, 0x308, 0x301)
+                    ,0x3C2   => array(0x3C3), 0x3D0   => array(0x3B2), 0x3D1   => array(0x3B8)
+                    ,0x3D2   => array(0x3C5), 0x3D3   => array(0x3CD), 0x3D4   => array(0x3CB)
+                    ,0x3D5   => array(0x3C6), 0x3D6   => array(0x3C0), 0x3D8   => array(0x3D9)
+                    ,0x3DA   => array(0x3DB), 0x3DC   => array(0x3DD), 0x3DE   => array(0x3DF)
+                    ,0x3E0   => array(0x3E1), 0x3E2   => array(0x3E3), 0x3E4   => array(0x3E5)
+                    ,0x3E6   => array(0x3E7), 0x3E8   => array(0x3E9), 0x3EA   => array(0x3EB)
+                    ,0x3EC   => array(0x3ED), 0x3EE   => array(0x3EF), 0x3F0   => array(0x3BA)
+                    ,0x3F1   => array(0x3C1), 0x3F2   => array(0x3C3), 0x3F4   => array(0x3B8)
+                    ,0x3F5   => array(0x3B5), 0x400   => array(0x450), 0x401   => array(0x451)
+                    ,0x402   => array(0x452), 0x403   => array(0x453), 0x404   => array(0x454)
+                    ,0x405   => array(0x455), 0x406   => array(0x456), 0x407   => array(0x457)
+                    ,0x408   => array(0x458), 0x409   => array(0x459), 0x40A   => array(0x45A)
+                    ,0x40B   => array(0x45B), 0x40C   => array(0x45C), 0x40D   => array(0x45D)
+                    ,0x40E   => array(0x45E), 0x40F   => array(0x45F), 0x410   => array(0x430)
+                    ,0x411   => array(0x431), 0x412   => array(0x432), 0x413   => array(0x433)
+                    ,0x414   => array(0x434), 0x415   => array(0x435), 0x416   => array(0x436)
+                    ,0x417   => array(0x437), 0x418   => array(0x438), 0x419   => array(0x439)
+                    ,0x41A   => array(0x43A), 0x41B   => array(0x43B), 0x41C   => array(0x43C)
+                    ,0x41D   => array(0x43D), 0x41E   => array(0x43E), 0x41F   => array(0x43F)
+                    ,0x420   => array(0x440), 0x421   => array(0x441), 0x422   => array(0x442)
+                    ,0x423   => array(0x443), 0x424   => array(0x444), 0x425   => array(0x445)
+                    ,0x426   => array(0x446), 0x427   => array(0x447), 0x428   => array(0x448)
+                    ,0x429   => array(0x449), 0x42A   => array(0x44A), 0x42B   => array(0x44B)
+                    ,0x42C   => array(0x44C), 0x42D   => array(0x44D), 0x42E   => array(0x44E)
+                    ,0x42F   => array(0x44F), 0x460   => array(0x461), 0x462   => array(0x463)
+                    ,0x464   => array(0x465), 0x466   => array(0x467), 0x468   => array(0x469)
+                    ,0x46A   => array(0x46B), 0x46C   => array(0x46D), 0x46E   => array(0x46F)
+                    ,0x470   => array(0x471), 0x472   => array(0x473), 0x474   => array(0x475)
+                    ,0x476   => array(0x477), 0x478   => array(0x479), 0x47A   => array(0x47B)
+                    ,0x47C   => array(0x47D), 0x47E   => array(0x47F), 0x480   => array(0x481)
+                    ,0x48A   => array(0x48B), 0x48C   => array(0x48D), 0x48E   => array(0x48F)
+                    ,0x490   => array(0x491), 0x492   => array(0x493), 0x494   => array(0x495)
+                    ,0x496   => array(0x497), 0x498   => array(0x499), 0x49A   => array(0x49B)
+                    ,0x49C   => array(0x49D), 0x49E   => array(0x49F), 0x4A0   => array(0x4A1)
+                    ,0x4A2   => array(0x4A3), 0x4A4   => array(0x4A5), 0x4A6   => array(0x4A7)
+                    ,0x4A8   => array(0x4A9), 0x4AA   => array(0x4AB), 0x4AC   => array(0x4AD)
+                    ,0x4AE   => array(0x4AF), 0x4B0   => array(0x4B1), 0x4B2   => array(0x4B3)
+                    ,0x4B4   => array(0x4B5), 0x4B6   => array(0x4B7), 0x4B8   => array(0x4B9)
+                    ,0x4BA   => array(0x4BB), 0x4BC   => array(0x4BD), 0x4BE   => array(0x4BF)
+                    ,0x4C1   => array(0x4C2), 0x4C3   => array(0x4C4), 0x4C5   => array(0x4C6)
+                    ,0x4C7   => array(0x4C8), 0x4C9   => array(0x4CA), 0x4CB   => array(0x4CC)
+                    ,0x4CD   => array(0x4CE), 0x4D0   => array(0x4D1), 0x4D2   => array(0x4D3)
+                    ,0x4D4   => array(0x4D5), 0x4D6   => array(0x4D7), 0x4D8   => array(0x4D9)
+                    ,0x4DA   => array(0x4DB), 0x4DC   => array(0x4DD), 0x4DE   => array(0x4DF)
+                    ,0x4E0   => array(0x4E1), 0x4E2   => array(0x4E3), 0x4E4   => array(0x4E5)
+                    ,0x4E6   => array(0x4E7), 0x4E8   => array(0x4E9), 0x4EA   => array(0x4EB)
+                    ,0x4EC   => array(0x4ED), 0x4EE   => array(0x4EF), 0x4F0   => array(0x4F1)
+                    ,0x4F2   => array(0x4F3), 0x4F4   => array(0x4F5), 0x4F8   => array(0x4F9)
+                    ,0x500   => array(0x501), 0x502   => array(0x503), 0x504   => array(0x505)
+                    ,0x506   => array(0x507), 0x508   => array(0x509), 0x50A   => array(0x50B)
+                    ,0x50C   => array(0x50D), 0x50E   => array(0x50F), 0x531   => array(0x561)
+                    ,0x532   => array(0x562), 0x533   => array(0x563), 0x534   => array(0x564)
+                    ,0x535   => array(0x565), 0x536   => array(0x566), 0x537   => array(0x567)
+                    ,0x538   => array(0x568), 0x539   => array(0x569), 0x53A   => array(0x56A)
+                    ,0x53B   => array(0x56B), 0x53C   => array(0x56C), 0x53D   => array(0x56D)
+                    ,0x53E   => array(0x56E), 0x53F   => array(0x56F), 0x540   => array(0x570)
+                    ,0x541   => array(0x571), 0x542   => array(0x572), 0x543   => array(0x573)
+                    ,0x544   => array(0x574), 0x545   => array(0x575), 0x546   => array(0x576)
+                    ,0x547   => array(0x577), 0x548   => array(0x578), 0x549   => array(0x579)
+                    ,0x54A   => array(0x57A), 0x54B   => array(0x57B), 0x54C   => array(0x57C)
+                    ,0x54D   => array(0x57D), 0x54E   => array(0x57E), 0x54F   => array(0x57F)
+                    ,0x550   => array(0x580), 0x551   => array(0x581), 0x552   => array(0x582)
+                    ,0x553   => array(0x583), 0x554   => array(0x584), 0x555   => array(0x585)
+                    ,0x556 => array(0x586), 0x587 => array(0x565, 0x582), 0xE33 => array(0xE4D, 0xE32)
+                    ,0x1E00  => array(0x1E01), 0x1E02  => array(0x1E03), 0x1E04  => array(0x1E05)
+                    ,0x1E06  => array(0x1E07), 0x1E08  => array(0x1E09), 0x1E0A  => array(0x1E0B)
+                    ,0x1E0C  => array(0x1E0D), 0x1E0E  => array(0x1E0F), 0x1E10  => array(0x1E11)
+                    ,0x1E12  => array(0x1E13), 0x1E14  => array(0x1E15), 0x1E16  => array(0x1E17)
+                    ,0x1E18  => array(0x1E19), 0x1E1A  => array(0x1E1B), 0x1E1C  => array(0x1E1D)
+                    ,0x1E1E  => array(0x1E1F), 0x1E20  => array(0x1E21), 0x1E22  => array(0x1E23)
+                    ,0x1E24  => array(0x1E25), 0x1E26  => array(0x1E27), 0x1E28  => array(0x1E29)
+                    ,0x1E2A  => array(0x1E2B), 0x1E2C  => array(0x1E2D), 0x1E2E  => array(0x1E2F)
+                    ,0x1E30  => array(0x1E31), 0x1E32  => array(0x1E33), 0x1E34  => array(0x1E35)
+                    ,0x1E36  => array(0x1E37), 0x1E38  => array(0x1E39), 0x1E3A  => array(0x1E3B)
+                    ,0x1E3C  => array(0x1E3D), 0x1E3E  => array(0x1E3F), 0x1E40  => array(0x1E41)
+                    ,0x1E42  => array(0x1E43), 0x1E44  => array(0x1E45), 0x1E46  => array(0x1E47)
+                    ,0x1E48  => array(0x1E49), 0x1E4A  => array(0x1E4B), 0x1E4C  => array(0x1E4D)
+                    ,0x1E4E  => array(0x1E4F), 0x1E50  => array(0x1E51), 0x1E52  => array(0x1E53)
+                    ,0x1E54  => array(0x1E55), 0x1E56  => array(0x1E57), 0x1E58  => array(0x1E59)
+                    ,0x1E5A  => array(0x1E5B), 0x1E5C  => array(0x1E5D), 0x1E5E  => array(0x1E5F)
+                    ,0x1E60  => array(0x1E61), 0x1E62  => array(0x1E63), 0x1E64  => array(0x1E65)
+                    ,0x1E66  => array(0x1E67), 0x1E68  => array(0x1E69), 0x1E6A  => array(0x1E6B)
+                    ,0x1E6C  => array(0x1E6D), 0x1E6E  => array(0x1E6F), 0x1E70  => array(0x1E71)
+                    ,0x1E72  => array(0x1E73), 0x1E74  => array(0x1E75), 0x1E76  => array(0x1E77)
+                    ,0x1E78  => array(0x1E79), 0x1E7A  => array(0x1E7B), 0x1E7C  => array(0x1E7D)
+                    ,0x1E7E  => array(0x1E7F), 0x1E80  => array(0x1E81), 0x1E82  => array(0x1E83)
+                    ,0x1E84  => array(0x1E85), 0x1E86  => array(0x1E87), 0x1E88  => array(0x1E89)
+                    ,0x1E8A  => array(0x1E8B), 0x1E8C  => array(0x1E8D), 0x1E8E  => array(0x1E8F)
+                    ,0x1E90  => array(0x1E91), 0x1E92  => array(0x1E93), 0x1E94  => array(0x1E95)
+                    ,0x1E96  => array(0x68, 0x331), 0x1E97  => array(0x74, 0x308), 0x1E98  => array(0x77, 0x30A)
+                    ,0x1E99  => array(0x79, 0x30A), 0x1E9A  => array(0x61, 0x2BE), 0x1E9B  => array(0x1E61)
+                    ,0x1EA0  => array(0x1EA1), 0x1EA2  => array(0x1EA3), 0x1EA4  => array(0x1EA5)
+                    ,0x1EA6  => array(0x1EA7), 0x1EA8  => array(0x1EA9), 0x1EAA  => array(0x1EAB)
+                    ,0x1EAC  => array(0x1EAD), 0x1EAE  => array(0x1EAF), 0x1EB0  => array(0x1EB1)
+                    ,0x1EB2  => array(0x1EB3), 0x1EB4  => array(0x1EB5), 0x1EB6  => array(0x1EB7)
+                    ,0x1EB8  => array(0x1EB9), 0x1EBA  => array(0x1EBB), 0x1EBC  => array(0x1EBD)
+                    ,0x1EBE  => array(0x1EBF), 0x1EC0  => array(0x1EC1), 0x1EC2  => array(0x1EC3)
+                    ,0x1EC4  => array(0x1EC5), 0x1EC6  => array(0x1EC7), 0x1EC8  => array(0x1EC9)
+                    ,0x1ECA  => array(0x1ECB), 0x1ECC  => array(0x1ECD), 0x1ECE  => array(0x1ECF)
+                    ,0x1ED0  => array(0x1ED1), 0x1ED2  => array(0x1ED3), 0x1ED4  => array(0x1ED5)
+                    ,0x1ED6  => array(0x1ED7), 0x1ED8  => array(0x1ED9), 0x1EDA  => array(0x1EDB)
+                    ,0x1EDC  => array(0x1EDD), 0x1EDE  => array(0x1EDF), 0x1EE0  => array(0x1EE1)
+                    ,0x1EE2  => array(0x1EE3), 0x1EE4  => array(0x1EE5), 0x1EE6  => array(0x1EE7)
+                    ,0x1EE8  => array(0x1EE9), 0x1EEA  => array(0x1EEB), 0x1EEC  => array(0x1EED)
+                    ,0x1EEE  => array(0x1EEF), 0x1EF0  => array(0x1EF1), 0x1EF2  => array(0x1EF3)
+                    ,0x1EF4  => array(0x1EF5), 0x1EF6  => array(0x1EF7), 0x1EF8  => array(0x1EF9)
+                    ,0x1F08  => array(0x1F00), 0x1F09  => array(0x1F01), 0x1F0A  => array(0x1F02)
+                    ,0x1F0B  => array(0x1F03), 0x1F0C  => array(0x1F04), 0x1F0D  => array(0x1F05)
+                    ,0x1F0E  => array(0x1F06), 0x1F0F  => array(0x1F07), 0x1F18  => array(0x1F10)
+                    ,0x1F19  => array(0x1F11), 0x1F1A  => array(0x1F12), 0x1F1B  => array(0x1F13)
+                    ,0x1F1C  => array(0x1F14), 0x1F1D  => array(0x1F15), 0x1F28  => array(0x1F20)
+                    ,0x1F29  => array(0x1F21), 0x1F2A  => array(0x1F22), 0x1F2B  => array(0x1F23)
+                    ,0x1F2C  => array(0x1F24), 0x1F2D  => array(0x1F25), 0x1F2E  => array(0x1F26)
+                    ,0x1F2F  => array(0x1F27), 0x1F38  => array(0x1F30), 0x1F39  => array(0x1F31)
+                    ,0x1F3A  => array(0x1F32), 0x1F3B  => array(0x1F33), 0x1F3C  => array(0x1F34)
+                    ,0x1F3D  => array(0x1F35), 0x1F3E  => array(0x1F36), 0x1F3F  => array(0x1F37)
+                    ,0x1F48  => array(0x1F40), 0x1F49  => array(0x1F41), 0x1F4A  => array(0x1F42)
+                    ,0x1F4B  => array(0x1F43), 0x1F4C  => array(0x1F44), 0x1F4D  => array(0x1F45)
+                    ,0x1F50  => array(0x3C5, 0x313), 0x1F52  => array(0x3C5, 0x313, 0x300)
+                    ,0x1F54  => array(0x3C5, 0x313, 0x301), 0x1F56  => array(0x3C5, 0x313, 0x342)
+                    ,0x1F59  => array(0x1F51), 0x1F5B  => array(0x1F53), 0x1F5D  => array(0x1F55)
+                    ,0x1F5F  => array(0x1F57), 0x1F68  => array(0x1F60), 0x1F69  => array(0x1F61)
+                    ,0x1F6A  => array(0x1F62), 0x1F6B  => array(0x1F63), 0x1F6C  => array(0x1F64)
+                    ,0x1F6D  => array(0x1F65), 0x1F6E  => array(0x1F66), 0x1F6F  => array(0x1F67)
+                    ,0x1F80  => array(0x1F00, 0x3B9), 0x1F81  => array(0x1F01, 0x3B9)
+                    ,0x1F82  => array(0x1F02, 0x3B9), 0x1F83  => array(0x1F03, 0x3B9)
+                    ,0x1F84  => array(0x1F04, 0x3B9), 0x1F85  => array(0x1F05, 0x3B9)
+                    ,0x1F86  => array(0x1F06, 0x3B9), 0x1F87  => array(0x1F07, 0x3B9)
+                    ,0x1F88  => array(0x1F00, 0x3B9), 0x1F89  => array(0x1F01, 0x3B9)
+                    ,0x1F8A  => array(0x1F02, 0x3B9), 0x1F8B  => array(0x1F03, 0x3B9)
+                    ,0x1F8C  => array(0x1F04, 0x3B9), 0x1F8D  => array(0x1F05, 0x3B9)
+                    ,0x1F8E  => array(0x1F06, 0x3B9), 0x1F8F  => array(0x1F07, 0x3B9)
+                    ,0x1F90  => array(0x1F20, 0x3B9), 0x1F91  => array(0x1F21, 0x3B9)
+                    ,0x1F92  => array(0x1F22, 0x3B9), 0x1F93  => array(0x1F23, 0x3B9)
+                    ,0x1F94  => array(0x1F24, 0x3B9), 0x1F95  => array(0x1F25, 0x3B9)
+                    ,0x1F96  => array(0x1F26, 0x3B9), 0x1F97  => array(0x1F27, 0x3B9)
+                    ,0x1F98  => array(0x1F20, 0x3B9), 0x1F99  => array(0x1F21, 0x3B9)
+                    ,0x1F9A  => array(0x1F22, 0x3B9), 0x1F9B  => array(0x1F23, 0x3B9)
+                    ,0x1F9C  => array(0x1F24, 0x3B9), 0x1F9D  => array(0x1F25, 0x3B9)
+                    ,0x1F9E  => array(0x1F26, 0x3B9), 0x1F9F  => array(0x1F27, 0x3B9)
+                    ,0x1FA0  => array(0x1F60, 0x3B9), 0x1FA1  => array(0x1F61, 0x3B9)
+                    ,0x1FA2  => array(0x1F62, 0x3B9), 0x1FA3  => array(0x1F63, 0x3B9)
+                    ,0x1FA4  => array(0x1F64, 0x3B9), 0x1FA5  => array(0x1F65, 0x3B9)
+                    ,0x1FA6  => array(0x1F66, 0x3B9), 0x1FA7  => array(0x1F67, 0x3B9)
+                    ,0x1FA8  => array(0x1F60, 0x3B9), 0x1FA9  => array(0x1F61, 0x3B9)
+                    ,0x1FAA  => array(0x1F62, 0x3B9), 0x1FAB  => array(0x1F63, 0x3B9)
+                    ,0x1FAC  => array(0x1F64, 0x3B9), 0x1FAD  => array(0x1F65, 0x3B9)
+                    ,0x1FAE  => array(0x1F66, 0x3B9), 0x1FAF  => array(0x1F67, 0x3B9)
+                    ,0x1FB2  => array(0x1F70, 0x3B9), 0x1FB3  => array(0x3B1, 0x3B9)
+                    ,0x1FB4  => array(0x3AC, 0x3B9), 0x1FB6  => array(0x3B1, 0x342)
+                    ,0x1FB7  => array(0x3B1, 0x342, 0x3B9), 0x1FB8  => array(0x1FB0)
+                    ,0x1FB9  => array(0x1FB1), 0x1FBA  => array(0x1F70), 0x1FBB  => array(0x1F71)
+                    ,0x1FBC  => array(0x3B1, 0x3B9), 0x1FBE  => array(0x3B9)
+                    ,0x1FC2  => array(0x1F74, 0x3B9), 0x1FC3  => array(0x3B7, 0x3B9)
+                    ,0x1FC4  => array(0x3AE, 0x3B9), 0x1FC6  => array(0x3B7, 0x342)
+                    ,0x1FC7  => array(0x3B7, 0x342, 0x3B9), 0x1FC8  => array(0x1F72)
+                    ,0x1FC9  => array(0x1F73), 0x1FCA  => array(0x1F74), 0x1FCB  => array(0x1F75)
+                    ,0x1FCC  => array(0x3B7, 0x3B9), 0x1FD2  => array(0x3B9, 0x308, 0x300)
+                    ,0x1FD3  => array(0x3B9, 0x308, 0x301), 0x1FD6  => array(0x3B9, 0x342)
+                    ,0x1FD7  => array(0x3B9, 0x308, 0x342), 0x1FD8  => array(0x1FD0)
+                    ,0x1FD9  => array(0x1FD1), 0x1FDA  => array(0x1F76)
+                    ,0x1FDB  => array(0x1F77), 0x1FE2  => array(0x3C5, 0x308, 0x300)
+                    ,0x1FE3  => array(0x3C5, 0x308, 0x301), 0x1FE4  => array(0x3C1, 0x313)
+                    ,0x1FE6  => array(0x3C5, 0x342), 0x1FE7  => array(0x3C5, 0x308, 0x342)
+                    ,0x1FE8  => array(0x1FE0), 0x1FE9  => array(0x1FE1)
+                    ,0x1FEA  => array(0x1F7A), 0x1FEB  => array(0x1F7B)
+                    ,0x1FEC  => array(0x1FE5), 0x1FF2  => array(0x1F7C, 0x3B9)
+                    ,0x1FF3  => array(0x3C9, 0x3B9), 0x1FF4  => array(0x3CE, 0x3B9)
+                    ,0x1FF6  => array(0x3C9, 0x342), 0x1FF7  => array(0x3C9, 0x342, 0x3B9)
+                    ,0x1FF8  => array(0x1F78), 0x1FF9  => array(0x1F79), 0x1FFA  => array(0x1F7C)
+                    ,0x1FFB  => array(0x1F7D), 0x1FFC  => array(0x3C9, 0x3B9)
+                    ,0x20A8  => array(0x72, 0x73), 0x2102  => array(0x63), 0x2103  => array(0xB0, 0x63)
+                    ,0x2107  => array(0x25B), 0x2109  => array(0xB0, 0x66), 0x210B  => array(0x68)
+                    ,0x210C  => array(0x68), 0x210D  => array(0x68), 0x2110  => array(0x69)
+                    ,0x2111  => array(0x69), 0x2112  => array(0x6C), 0x2115  => array(0x6E)
+                    ,0x2116  => array(0x6E, 0x6F), 0x2119  => array(0x70), 0x211A  => array(0x71)
+                    ,0x211B  => array(0x72), 0x211C  => array(0x72), 0x211D  => array(0x72)
+                    ,0x2120  => array(0x73, 0x6D), 0x2121  => array(0x74, 0x65, 0x6C)
+                    ,0x2122  => array(0x74, 0x6D), 0x2124  => array(0x7A), 0x2126  => array(0x3C9)
+                    ,0x2128  => array(0x7A), 0x212A  => array(0x6B), 0x212B  => array(0xE5)
+                    ,0x212C  => array(0x62), 0x212D  => array(0x63), 0x2130  => array(0x65)
+                    ,0x2131  => array(0x66), 0x2133  => array(0x6D), 0x213E  => array(0x3B3)
+                    ,0x213F  => array(0x3C0), 0x2145  => array(0x64) ,0x2160  => array(0x2170)
+                    ,0x2161  => array(0x2171), 0x2162  => array(0x2172), 0x2163  => array(0x2173)
+                    ,0x2164  => array(0x2174), 0x2165  => array(0x2175), 0x2166  => array(0x2176)
+                    ,0x2167  => array(0x2177), 0x2168  => array(0x2178), 0x2169  => array(0x2179)
+                    ,0x216A  => array(0x217A), 0x216B  => array(0x217B), 0x216C  => array(0x217C)
+                    ,0x216D  => array(0x217D), 0x216E  => array(0x217E), 0x216F  => array(0x217F)
+                    ,0x24B6  => array(0x24D0), 0x24B7  => array(0x24D1), 0x24B8  => array(0x24D2)
+                    ,0x24B9  => array(0x24D3), 0x24BA  => array(0x24D4), 0x24BB  => array(0x24D5)
+                    ,0x24BC  => array(0x24D6), 0x24BD  => array(0x24D7), 0x24BE  => array(0x24D8)
+                    ,0x24BF  => array(0x24D9), 0x24C0  => array(0x24DA), 0x24C1  => array(0x24DB)
+                    ,0x24C2  => array(0x24DC), 0x24C3  => array(0x24DD), 0x24C4  => array(0x24DE)
+                    ,0x24C5  => array(0x24DF), 0x24C6  => array(0x24E0), 0x24C7  => array(0x24E1)
+                    ,0x24C8  => array(0x24E2), 0x24C9  => array(0x24E3), 0x24CA  => array(0x24E4)
+                    ,0x24CB  => array(0x24E5), 0x24CC  => array(0x24E6), 0x24CD  => array(0x24E7)
+                    ,0x24CE  => array(0x24E8), 0x24CF  => array(0x24E9), 0x3371  => array(0x68, 0x70, 0x61)
+                    ,0x3373  => array(0x61, 0x75), 0x3375  => array(0x6F, 0x76)
+                    ,0x3380  => array(0x70, 0x61), 0x3381  => array(0x6E, 0x61)
+                    ,0x3382  => array(0x3BC, 0x61), 0x3383  => array(0x6D, 0x61)
+                    ,0x3384  => array(0x6B, 0x61), 0x3385  => array(0x6B, 0x62)
+                    ,0x3386  => array(0x6D, 0x62), 0x3387  => array(0x67, 0x62)
+                    ,0x338A  => array(0x70, 0x66), 0x338B  => array(0x6E, 0x66)
+                    ,0x338C  => array(0x3BC, 0x66), 0x3390  => array(0x68, 0x7A)
+                    ,0x3391  => array(0x6B, 0x68, 0x7A), 0x3392  => array(0x6D, 0x68, 0x7A)
+                    ,0x3393  => array(0x67, 0x68, 0x7A), 0x3394  => array(0x74, 0x68, 0x7A)
+                    ,0x33A9  => array(0x70, 0x61), 0x33AA  => array(0x6B, 0x70, 0x61)
+                    ,0x33AB  => array(0x6D, 0x70, 0x61), 0x33AC  => array(0x67, 0x70, 0x61)
+                    ,0x33B4  => array(0x70, 0x76), 0x33B5  => array(0x6E, 0x76)
+                    ,0x33B6  => array(0x3BC, 0x76), 0x33B7  => array(0x6D, 0x76)
+                    ,0x33B8  => array(0x6B, 0x76), 0x33B9  => array(0x6D, 0x76)
+                    ,0x33BA  => array(0x70, 0x77), 0x33BB  => array(0x6E, 0x77)
+                    ,0x33BC  => array(0x3BC, 0x77), 0x33BD  => array(0x6D, 0x77)
+                    ,0x33BE  => array(0x6B, 0x77), 0x33BF  => array(0x6D, 0x77)
+                    ,0x33C0  => array(0x6B, 0x3C9), 0x33C1  => array(0x6D, 0x3C9) /*
+                    ,0x33C2  => array(0x61, 0x2E, 0x6D, 0x2E) */
+                    ,0x33C3  => array(0x62, 0x71), 0x33C6  => array(0x63, 0x2215, 0x6B, 0x67)
+                    ,0x33C7  => array(0x63, 0x6F, 0x2E), 0x33C8  => array(0x64, 0x62)
+                    ,0x33C9  => array(0x67, 0x79), 0x33CB  => array(0x68, 0x70)
+                    ,0x33CD  => array(0x6B, 0x6B), 0x33CE  => array(0x6B, 0x6D)
+                    ,0x33D7  => array(0x70, 0x68), 0x33D9  => array(0x70, 0x70, 0x6D)
+                    ,0x33DA  => array(0x70, 0x72), 0x33DC  => array(0x73, 0x76)
+                    ,0x33DD  => array(0x77, 0x62), 0xFB00  => array(0x66, 0x66)
+                    ,0xFB01  => array(0x66, 0x69), 0xFB02  => array(0x66, 0x6C)
+                    ,0xFB03  => array(0x66, 0x66, 0x69), 0xFB04  => array(0x66, 0x66, 0x6C)
+                    ,0xFB05  => array(0x73, 0x74), 0xFB06  => array(0x73, 0x74)
+                    ,0xFB13  => array(0x574, 0x576), 0xFB14  => array(0x574, 0x565)
+                    ,0xFB15  => array(0x574, 0x56B), 0xFB16  => array(0x57E, 0x576)
+                    ,0xFB17  => array(0x574, 0x56D), 0xFF21  => array(0xFF41)
+                    ,0xFF22  => array(0xFF42), 0xFF23  => array(0xFF43), 0xFF24  => array(0xFF44)
+                    ,0xFF25  => array(0xFF45), 0xFF26  => array(0xFF46), 0xFF27  => array(0xFF47)
+                    ,0xFF28  => array(0xFF48), 0xFF29  => array(0xFF49), 0xFF2A  => array(0xFF4A)
+                    ,0xFF2B  => array(0xFF4B), 0xFF2C  => array(0xFF4C), 0xFF2D  => array(0xFF4D)
+                    ,0xFF2E  => array(0xFF4E), 0xFF2F  => array(0xFF4F), 0xFF30  => array(0xFF50)
+                    ,0xFF31  => array(0xFF51), 0xFF32  => array(0xFF52), 0xFF33  => array(0xFF53)
+                    ,0xFF34  => array(0xFF54), 0xFF35  => array(0xFF55), 0xFF36  => array(0xFF56)
+                    ,0xFF37  => array(0xFF57), 0xFF38  => array(0xFF58), 0xFF39  => array(0xFF59)
+                    ,0xFF3A  => array(0xFF5A), 0x10400 => array(0x10428), 0x10401 => array(0x10429)
+                    ,0x10402 => array(0x1042A), 0x10403 => array(0x1042B), 0x10404 => array(0x1042C)
+                    ,0x10405 => array(0x1042D), 0x10406 => array(0x1042E), 0x10407 => array(0x1042F)
+                    ,0x10408 => array(0x10430), 0x10409 => array(0x10431), 0x1040A => array(0x10432)
+                    ,0x1040B => array(0x10433), 0x1040C => array(0x10434), 0x1040D => array(0x10435)
+                    ,0x1040E => array(0x10436), 0x1040F => array(0x10437), 0x10410 => array(0x10438)
+                    ,0x10411 => array(0x10439), 0x10412 => array(0x1043A), 0x10413 => array(0x1043B)
+                    ,0x10414 => array(0x1043C), 0x10415 => array(0x1043D), 0x10416 => array(0x1043E)
+                    ,0x10417 => array(0x1043F), 0x10418 => array(0x10440), 0x10419 => array(0x10441)
+                    ,0x1041A => array(0x10442), 0x1041B => array(0x10443), 0x1041C => array(0x10444)
+                    ,0x1041D => array(0x10445), 0x1041E => array(0x10446), 0x1041F => array(0x10447)
+                    ,0x10420 => array(0x10448), 0x10421 => array(0x10449), 0x10422 => array(0x1044A)
+                    ,0x10423 => array(0x1044B), 0x10424 => array(0x1044C), 0x10425 => array(0x1044D)
+                    ,0x1D400 => array(0x61), 0x1D401 => array(0x62), 0x1D402 => array(0x63)
+                    ,0x1D403 => array(0x64), 0x1D404 => array(0x65), 0x1D405 => array(0x66)
+                    ,0x1D406 => array(0x67), 0x1D407 => array(0x68), 0x1D408 => array(0x69)
+                    ,0x1D409 => array(0x6A), 0x1D40A => array(0x6B), 0x1D40B => array(0x6C)
+                    ,0x1D40C => array(0x6D), 0x1D40D => array(0x6E), 0x1D40E => array(0x6F)
+                    ,0x1D40F => array(0x70), 0x1D410 => array(0x71), 0x1D411 => array(0x72)
+                    ,0x1D412 => array(0x73), 0x1D413 => array(0x74), 0x1D414 => array(0x75)
+                    ,0x1D415 => array(0x76), 0x1D416 => array(0x77), 0x1D417 => array(0x78)
+                    ,0x1D418 => array(0x79), 0x1D419 => array(0x7A), 0x1D434 => array(0x61)
+                    ,0x1D435 => array(0x62), 0x1D436 => array(0x63), 0x1D437 => array(0x64)
+                    ,0x1D438 => array(0x65), 0x1D439 => array(0x66), 0x1D43A => array(0x67)
+                    ,0x1D43B => array(0x68), 0x1D43C => array(0x69), 0x1D43D => array(0x6A)
+                    ,0x1D43E => array(0x6B), 0x1D43F => array(0x6C), 0x1D440 => array(0x6D)
+                    ,0x1D441 => array(0x6E), 0x1D442 => array(0x6F), 0x1D443 => array(0x70)
+                    ,0x1D444 => array(0x71), 0x1D445 => array(0x72), 0x1D446 => array(0x73)
+                    ,0x1D447 => array(0x74), 0x1D448 => array(0x75), 0x1D449 => array(0x76)
+                    ,0x1D44A => array(0x77), 0x1D44B => array(0x78), 0x1D44C => array(0x79)
+                    ,0x1D44D => array(0x7A), 0x1D468 => array(0x61), 0x1D469 => array(0x62)
+                    ,0x1D46A => array(0x63), 0x1D46B => array(0x64), 0x1D46C => array(0x65)
+                    ,0x1D46D => array(0x66), 0x1D46E => array(0x67), 0x1D46F => array(0x68)
+                    ,0x1D470 => array(0x69), 0x1D471 => array(0x6A), 0x1D472 => array(0x6B)
+                    ,0x1D473 => array(0x6C), 0x1D474 => array(0x6D), 0x1D475 => array(0x6E)
+                    ,0x1D476 => array(0x6F), 0x1D477 => array(0x70), 0x1D478 => array(0x71)
+                    ,0x1D479 => array(0x72), 0x1D47A => array(0x73), 0x1D47B => array(0x74)
+                    ,0x1D47C => array(0x75), 0x1D47D => array(0x76), 0x1D47E => array(0x77)
+                    ,0x1D47F => array(0x78), 0x1D480 => array(0x79), 0x1D481 => array(0x7A)
+                    ,0x1D49C => array(0x61), 0x1D49E => array(0x63), 0x1D49F => array(0x64)
+                    ,0x1D4A2 => array(0x67), 0x1D4A5 => array(0x6A), 0x1D4A6 => array(0x6B)
+                    ,0x1D4A9 => array(0x6E), 0x1D4AA => array(0x6F), 0x1D4AB => array(0x70)
+                    ,0x1D4AC => array(0x71), 0x1D4AE => array(0x73), 0x1D4AF => array(0x74)
+                    ,0x1D4B0 => array(0x75), 0x1D4B1 => array(0x76), 0x1D4B2 => array(0x77)
+                    ,0x1D4B3 => array(0x78), 0x1D4B4 => array(0x79), 0x1D4B5 => array(0x7A)
+                    ,0x1D4D0 => array(0x61), 0x1D4D1 => array(0x62), 0x1D4D2 => array(0x63)
+                    ,0x1D4D3 => array(0x64), 0x1D4D4 => array(0x65), 0x1D4D5 => array(0x66)
+                    ,0x1D4D6 => array(0x67), 0x1D4D7 => array(0x68), 0x1D4D8 => array(0x69)
+                    ,0x1D4D9 => array(0x6A), 0x1D4DA => array(0x6B), 0x1D4DB => array(0x6C)
+                    ,0x1D4DC => array(0x6D), 0x1D4DD => array(0x6E), 0x1D4DE => array(0x6F)
+                    ,0x1D4DF => array(0x70), 0x1D4E0 => array(0x71), 0x1D4E1 => array(0x72)
+                    ,0x1D4E2 => array(0x73), 0x1D4E3 => array(0x74), 0x1D4E4 => array(0x75)
+                    ,0x1D4E5 => array(0x76), 0x1D4E6 => array(0x77), 0x1D4E7 => array(0x78)
+                    ,0x1D4E8 => array(0x79), 0x1D4E9 => array(0x7A), 0x1D504 => array(0x61)
+                    ,0x1D505 => array(0x62), 0x1D507 => array(0x64), 0x1D508 => array(0x65)
+                    ,0x1D509 => array(0x66), 0x1D50A => array(0x67), 0x1D50D => array(0x6A)
+                    ,0x1D50E => array(0x6B), 0x1D50F => array(0x6C), 0x1D510 => array(0x6D)
+                    ,0x1D511 => array(0x6E), 0x1D512 => array(0x6F), 0x1D513 => array(0x70)
+                    ,0x1D514 => array(0x71), 0x1D516 => array(0x73), 0x1D517 => array(0x74)
+                    ,0x1D518 => array(0x75), 0x1D519 => array(0x76), 0x1D51A => array(0x77)
+                    ,0x1D51B => array(0x78), 0x1D51C => array(0x79), 0x1D538 => array(0x61)
+                    ,0x1D539 => array(0x62), 0x1D53B => array(0x64), 0x1D53C => array(0x65)
+                    ,0x1D53D => array(0x66), 0x1D53E => array(0x67), 0x1D540 => array(0x69)
+                    ,0x1D541 => array(0x6A), 0x1D542 => array(0x6B), 0x1D543 => array(0x6C)
+                    ,0x1D544 => array(0x6D), 0x1D546 => array(0x6F), 0x1D54A => array(0x73)
+                    ,0x1D54B => array(0x74), 0x1D54C => array(0x75), 0x1D54D => array(0x76)
+                    ,0x1D54E => array(0x77), 0x1D54F => array(0x78), 0x1D550 => array(0x79)
+                    ,0x1D56C => array(0x61), 0x1D56D => array(0x62), 0x1D56E => array(0x63)
+                    ,0x1D56F => array(0x64), 0x1D570 => array(0x65), 0x1D571 => array(0x66)
+                    ,0x1D572 => array(0x67), 0x1D573 => array(0x68), 0x1D574 => array(0x69)
+                    ,0x1D575 => array(0x6A), 0x1D576 => array(0x6B), 0x1D577 => array(0x6C)
+                    ,0x1D578 => array(0x6D), 0x1D579 => array(0x6E), 0x1D57A => array(0x6F)
+                    ,0x1D57B => array(0x70), 0x1D57C => array(0x71), 0x1D57D => array(0x72)
+                    ,0x1D57E => array(0x73), 0x1D57F => array(0x74), 0x1D580 => array(0x75)
+                    ,0x1D581 => array(0x76), 0x1D582 => array(0x77), 0x1D583 => array(0x78)
+                    ,0x1D584 => array(0x79), 0x1D585 => array(0x7A), 0x1D5A0 => array(0x61)
+                    ,0x1D5A1 => array(0x62), 0x1D5A2 => array(0x63), 0x1D5A3 => array(0x64)
+                    ,0x1D5A4 => array(0x65), 0x1D5A5 => array(0x66), 0x1D5A6 => array(0x67)
+                    ,0x1D5A7 => array(0x68), 0x1D5A8 => array(0x69), 0x1D5A9 => array(0x6A)
+                    ,0x1D5AA => array(0x6B), 0x1D5AB => array(0x6C), 0x1D5AC => array(0x6D)
+                    ,0x1D5AD => array(0x6E), 0x1D5AE => array(0x6F), 0x1D5AF => array(0x70)
+                    ,0x1D5B0 => array(0x71), 0x1D5B1 => array(0x72), 0x1D5B2 => array(0x73)
+                    ,0x1D5B3 => array(0x74), 0x1D5B4 => array(0x75), 0x1D5B5 => array(0x76)
+                    ,0x1D5B6 => array(0x77), 0x1D5B7 => array(0x78), 0x1D5B8 => array(0x79)
+                    ,0x1D5B9 => array(0x7A), 0x1D5D4 => array(0x61), 0x1D5D5 => array(0x62)
+                    ,0x1D5D6 => array(0x63), 0x1D5D7 => array(0x64), 0x1D5D8 => array(0x65)
+                    ,0x1D5D9 => array(0x66), 0x1D5DA => array(0x67), 0x1D5DB => array(0x68)
+                    ,0x1D5DC => array(0x69), 0x1D5DD => array(0x6A), 0x1D5DE => array(0x6B)
+                    ,0x1D5DF => array(0x6C), 0x1D5E0 => array(0x6D), 0x1D5E1 => array(0x6E)
+                    ,0x1D5E2 => array(0x6F), 0x1D5E3 => array(0x70), 0x1D5E4 => array(0x71)
+                    ,0x1D5E5 => array(0x72), 0x1D5E6 => array(0x73), 0x1D5E7 => array(0x74)
+                    ,0x1D5E8 => array(0x75), 0x1D5E9 => array(0x76), 0x1D5EA => array(0x77)
+                    ,0x1D5EB => array(0x78), 0x1D5EC => array(0x79), 0x1D5ED => array(0x7A)
+                    ,0x1D608 => array(0x61), 0x1D609 => array(0x62) ,0x1D60A => array(0x63)
+                    ,0x1D60B => array(0x64), 0x1D60C => array(0x65), 0x1D60D => array(0x66)
+                    ,0x1D60E => array(0x67), 0x1D60F => array(0x68), 0x1D610 => array(0x69)
+                    ,0x1D611 => array(0x6A), 0x1D612 => array(0x6B), 0x1D613 => array(0x6C)
+                    ,0x1D614 => array(0x6D), 0x1D615 => array(0x6E), 0x1D616 => array(0x6F)
+                    ,0x1D617 => array(0x70), 0x1D618 => array(0x71), 0x1D619 => array(0x72)
+                    ,0x1D61A => array(0x73), 0x1D61B => array(0x74), 0x1D61C => array(0x75)
+                    ,0x1D61D => array(0x76), 0x1D61E => array(0x77), 0x1D61F => array(0x78)
+                    ,0x1D620 => array(0x79), 0x1D621 => array(0x7A), 0x1D63C => array(0x61)
+                    ,0x1D63D => array(0x62), 0x1D63E => array(0x63), 0x1D63F => array(0x64)
+                    ,0x1D640 => array(0x65), 0x1D641 => array(0x66), 0x1D642 => array(0x67)
+                    ,0x1D643 => array(0x68), 0x1D644 => array(0x69), 0x1D645 => array(0x6A)
+                    ,0x1D646 => array(0x6B), 0x1D647 => array(0x6C), 0x1D648 => array(0x6D)
+                    ,0x1D649 => array(0x6E), 0x1D64A => array(0x6F), 0x1D64B => array(0x70)
+                    ,0x1D64C => array(0x71), 0x1D64D => array(0x72), 0x1D64E => array(0x73)
+                    ,0x1D64F => array(0x74), 0x1D650 => array(0x75), 0x1D651 => array(0x76)
+                    ,0x1D652 => array(0x77), 0x1D653 => array(0x78), 0x1D654 => array(0x79)
+                    ,0x1D655 => array(0x7A), 0x1D670 => array(0x61), 0x1D671 => array(0x62)
+                    ,0x1D672 => array(0x63), 0x1D673 => array(0x64), 0x1D674 => array(0x65)
+                    ,0x1D675 => array(0x66), 0x1D676 => array(0x67), 0x1D677 => array(0x68)
+                    ,0x1D678 => array(0x69), 0x1D679 => array(0x6A), 0x1D67A => array(0x6B)
+                    ,0x1D67B => array(0x6C), 0x1D67C => array(0x6D), 0x1D67D => array(0x6E)
+                    ,0x1D67E => array(0x6F), 0x1D67F => array(0x70), 0x1D680 => array(0x71)
+                    ,0x1D681 => array(0x72), 0x1D682 => array(0x73), 0x1D683 => array(0x74)
+                    ,0x1D684 => array(0x75), 0x1D685 => array(0x76), 0x1D686 => array(0x77)
+                    ,0x1D687 => array(0x78), 0x1D688 => array(0x79), 0x1D689 => array(0x7A)
+                    ,0x1D6A8 => array(0x3B1), 0x1D6A9 => array(0x3B2), 0x1D6AA => array(0x3B3)
+                    ,0x1D6AB => array(0x3B4), 0x1D6AC => array(0x3B5), 0x1D6AD => array(0x3B6)
+                    ,0x1D6AE => array(0x3B7), 0x1D6AF => array(0x3B8), 0x1D6B0 => array(0x3B9)
+                    ,0x1D6B1 => array(0x3BA), 0x1D6B2 => array(0x3BB), 0x1D6B3 => array(0x3BC)
+                    ,0x1D6B4 => array(0x3BD), 0x1D6B5 => array(0x3BE), 0x1D6B6 => array(0x3BF)
+                    ,0x1D6B7 => array(0x3C0), 0x1D6B8 => array(0x3C1), 0x1D6B9 => array(0x3B8)
+                    ,0x1D6BA => array(0x3C3), 0x1D6BB => array(0x3C4), 0x1D6BC => array(0x3C5)
+                    ,0x1D6BD => array(0x3C6), 0x1D6BE => array(0x3C7), 0x1D6BF => array(0x3C8)
+                    ,0x1D6C0 => array(0x3C9), 0x1D6D3 => array(0x3C3), 0x1D6E2 => array(0x3B1)
+                    ,0x1D6E3 => array(0x3B2), 0x1D6E4 => array(0x3B3), 0x1D6E5 => array(0x3B4)
+                    ,0x1D6E6 => array(0x3B5), 0x1D6E7 => array(0x3B6), 0x1D6E8 => array(0x3B7)
+                    ,0x1D6E9 => array(0x3B8), 0x1D6EA => array(0x3B9), 0x1D6EB => array(0x3BA)
+                    ,0x1D6EC => array(0x3BB), 0x1D6ED => array(0x3BC), 0x1D6EE => array(0x3BD)
+                    ,0x1D6EF => array(0x3BE), 0x1D6F0 => array(0x3BF), 0x1D6F1 => array(0x3C0)
+                    ,0x1D6F2 => array(0x3C1), 0x1D6F3 => array(0x3B8) ,0x1D6F4 => array(0x3C3)
+                    ,0x1D6F5 => array(0x3C4), 0x1D6F6 => array(0x3C5), 0x1D6F7 => array(0x3C6)
+                    ,0x1D6F8 => array(0x3C7), 0x1D6F9 => array(0x3C8) ,0x1D6FA => array(0x3C9)
+                    ,0x1D70D => array(0x3C3), 0x1D71C => array(0x3B1), 0x1D71D => array(0x3B2)
+                    ,0x1D71E => array(0x3B3), 0x1D71F => array(0x3B4), 0x1D720 => array(0x3B5)
+                    ,0x1D721 => array(0x3B6), 0x1D722 => array(0x3B7), 0x1D723 => array(0x3B8)
+                    ,0x1D724 => array(0x3B9), 0x1D725 => array(0x3BA), 0x1D726 => array(0x3BB)
+                    ,0x1D727 => array(0x3BC), 0x1D728 => array(0x3BD), 0x1D729 => array(0x3BE)
+                    ,0x1D72A => array(0x3BF), 0x1D72B => array(0x3C0), 0x1D72C => array(0x3C1)
+                    ,0x1D72D => array(0x3B8), 0x1D72E => array(0x3C3), 0x1D72F => array(0x3C4)
+                    ,0x1D730 => array(0x3C5), 0x1D731 => array(0x3C6), 0x1D732 => array(0x3C7)
+                    ,0x1D733 => array(0x3C8), 0x1D734 => array(0x3C9), 0x1D747 => array(0x3C3)
+                    ,0x1D756 => array(0x3B1), 0x1D757 => array(0x3B2), 0x1D758 => array(0x3B3)
+                    ,0x1D759 => array(0x3B4), 0x1D75A => array(0x3B5), 0x1D75B => array(0x3B6)
+                    ,0x1D75C => array(0x3B7), 0x1D75D => array(0x3B8), 0x1D75E => array(0x3B9)
+                    ,0x1D75F => array(0x3BA), 0x1D760 => array(0x3BB), 0x1D761 => array(0x3BC)
+                    ,0x1D762 => array(0x3BD), 0x1D763 => array(0x3BE), 0x1D764 => array(0x3BF)
+                    ,0x1D765 => array(0x3C0), 0x1D766 => array(0x3C1), 0x1D767 => array(0x3B8)
+                    ,0x1D768 => array(0x3C3), 0x1D769 => array(0x3C4), 0x1D76A => array(0x3C5)
+                    ,0x1D76B => array(0x3C6), 0x1D76C => array(0x3C7), 0x1D76D => array(0x3C8)
+                    ,0x1D76E => array(0x3C9), 0x1D781 => array(0x3C3), 0x1D790 => array(0x3B1)
+                    ,0x1D791 => array(0x3B2), 0x1D792 => array(0x3B3), 0x1D793 => array(0x3B4)
+                    ,0x1D794 => array(0x3B5), 0x1D795 => array(0x3B6), 0x1D796 => array(0x3B7)
+                    ,0x1D797 => array(0x3B8), 0x1D798 => array(0x3B9), 0x1D799 => array(0x3BA)
+                    ,0x1D79A => array(0x3BB), 0x1D79B => array(0x3BC), 0x1D79C => array(0x3BD)
+                    ,0x1D79D => array(0x3BE), 0x1D79E => array(0x3BF), 0x1D79F => array(0x3C0)
+                    ,0x1D7A0 => array(0x3C1), 0x1D7A1 => array(0x3B8), 0x1D7A2 => array(0x3C3)
+                    ,0x1D7A3 => array(0x3C4), 0x1D7A4 => array(0x3C5), 0x1D7A5 => array(0x3C6)
+                    ,0x1D7A6 => array(0x3C7), 0x1D7A7 => array(0x3C8), 0x1D7A8 => array(0x3C9)
+                    ,0x1D7BB => array(0x3C3), 0x3F9   => array(0x3C3), 0x1D2C  => array(0x61)
+                    ,0x1D2D  => array(0xE6), 0x1D2E  => array(0x62), 0x1D30  => array(0x64)
+                    ,0x1D31  => array(0x65), 0x1D32  => array(0x1DD), 0x1D33  => array(0x67)
+                    ,0x1D34  => array(0x68), 0x1D35  => array(0x69), 0x1D36  => array(0x6A)
+                    ,0x1D37  => array(0x6B), 0x1D38  => array(0x6C), 0x1D39  => array(0x6D)
+                    ,0x1D3A  => array(0x6E), 0x1D3C  => array(0x6F), 0x1D3D  => array(0x223)
+                    ,0x1D3E  => array(0x70), 0x1D3F  => array(0x72), 0x1D40  => array(0x74)
+                    ,0x1D41  => array(0x75), 0x1D42  => array(0x77), 0x213B  => array(0x66, 0x61, 0x78)
+                    ,0x3250  => array(0x70, 0x74, 0x65), 0x32CC  => array(0x68, 0x67)
+                    ,0x32CE  => array(0x65, 0x76), 0x32CF  => array(0x6C, 0x74, 0x64)
+                    ,0x337A  => array(0x69, 0x75), 0x33DE  => array(0x76, 0x2215, 0x6D)
+                    ,0x33DF  => array(0x61, 0x2215, 0x6D)
+                    )
+            ,'norm_combcls' => array(0x334   => 1,   0x335   => 1,   0x336   => 1,   0x337   => 1
+                    ,0x338   => 1,   0x93C   => 7,   0x9BC   => 7,   0xA3C   => 7,   0xABC   => 7
+                    ,0xB3C   => 7,   0xCBC   => 7,   0x1037  => 7,   0x3099  => 8,   0x309A  => 8
+                    ,0x94D   => 9,   0x9CD   => 9,   0xA4D   => 9,   0xACD   => 9,   0xB4D   => 9
+                    ,0xBCD   => 9,   0xC4D   => 9,   0xCCD   => 9,   0xD4D   => 9,   0xDCA   => 9
+                    ,0xE3A   => 9,   0xF84   => 9,   0x1039  => 9,   0x1714  => 9,   0x1734  => 9
+                    ,0x17D2  => 9,   0x5B0   => 10,  0x5B1   => 11,  0x5B2   => 12,  0x5B3   => 13
+                    ,0x5B4   => 14,  0x5B5   => 15,  0x5B6   => 16,  0x5B7   => 17,  0x5B8   => 18
+                    ,0x5B9   => 19,  0x5BB   => 20,  0x5Bc   => 21,  0x5BD   => 22,  0x5BF   => 23
+                    ,0x5C1   => 24,  0x5C2   => 25,  0xFB1E  => 26,  0x64B   => 27,  0x64C   => 28
+                    ,0x64D   => 29,  0x64E   => 30,  0x64F   => 31,  0x650   => 32,  0x651   => 33
+                    ,0x652   => 34,  0x670   => 35,  0x711   => 36,  0xC55   => 84,  0xC56   => 91
+                    ,0xE38   => 103, 0xE39   => 103, 0xE48   => 107, 0xE49   => 107, 0xE4A   => 107
+                    ,0xE4B   => 107, 0xEB8   => 118, 0xEB9   => 118, 0xEC8   => 122, 0xEC9   => 122
+                    ,0xECA   => 122, 0xECB   => 122, 0xF71   => 129, 0xF72   => 130, 0xF7A   => 130
+                    ,0xF7B   => 130, 0xF7C   => 130, 0xF7D   => 130, 0xF80   => 130, 0xF74   => 132
+                    ,0x321   => 202, 0x322   => 202, 0x327   => 202, 0x328   => 202, 0x31B   => 216
+                    ,0xF39   => 216, 0x1D165 => 216, 0x1D166 => 216, 0x1D16E => 216, 0x1D16F => 216
+                    ,0x1D170 => 216, 0x1D171 => 216, 0x1D172 => 216, 0x302A  => 218, 0x316   => 220
+                    ,0x317   => 220, 0x318   => 220, 0x319   => 220, 0x31C   => 220, 0x31D   => 220
+                    ,0x31E   => 220, 0x31F   => 220, 0x320   => 220, 0x323   => 220, 0x324   => 220
+                    ,0x325   => 220, 0x326   => 220, 0x329   => 220, 0x32A   => 220, 0x32B   => 220
+                    ,0x32C   => 220, 0x32D   => 220, 0x32E   => 220, 0x32F   => 220, 0x330   => 220
+                    ,0x331   => 220, 0x332   => 220, 0x333   => 220, 0x339   => 220, 0x33A   => 220
+                    ,0x33B   => 220, 0x33C   => 220, 0x347   => 220, 0x348   => 220, 0x349   => 220
+                    ,0x34D   => 220, 0x34E   => 220, 0x353   => 220, 0x354   => 220, 0x355   => 220
+                    ,0x356   => 220, 0x591   => 220, 0x596   => 220, 0x59B   => 220, 0x5A3   => 220
+                    ,0x5A4   => 220, 0x5A5   => 220, 0x5A6   => 220, 0x5A7   => 220, 0x5AA   => 220
+                    ,0x655   => 220, 0x656   => 220, 0x6E3   => 220, 0x6EA   => 220, 0x6ED   => 220
+                    ,0x731   => 220, 0x734   => 220, 0x737   => 220, 0x738   => 220, 0x739   => 220
+                    ,0x73B   => 220, 0x73C   => 220, 0x73E   => 220, 0x742   => 220, 0x744   => 220
+                    ,0x746   => 220, 0x748   => 220, 0x952   => 220, 0xF18   => 220, 0xF19   => 220
+                    ,0xF35   => 220, 0xF37   => 220, 0xFC6   => 220, 0x193B  => 220, 0x20E8  => 220
+                    ,0x1D17B => 220, 0x1D17C => 220, 0x1D17D => 220, 0x1D17E => 220, 0x1D17F => 220
+                    ,0x1D180 => 220, 0x1D181 => 220, 0x1D182 => 220, 0x1D18A => 220, 0x1D18B => 220
+                    ,0x59A   => 222, 0x5AD   => 222, 0x1929  => 222, 0x302D  => 222, 0x302E  => 224
+                    ,0x302F  => 224, 0x1D16D => 226, 0x5AE   => 228, 0x18A9  => 228, 0x302B  => 228
+                    ,0x300   => 230, 0x301   => 230, 0x302   => 230, 0x303   => 230, 0x304   => 230
+                    ,0x305   => 230, 0x306   => 230, 0x307   => 230, 0x308   => 230, 0x309   => 230
+                    ,0x30A   => 230, 0x30B   => 230, 0x30C   => 230, 0x30D   => 230, 0x30E   => 230
+                    ,0x30F   => 230, 0x310   => 230, 0x311   => 230, 0x312   => 230, 0x313   => 230
+                    ,0x314   => 230, 0x33D   => 230, 0x33E   => 230, 0x33F   => 230, 0x340   => 230
+                    ,0x341   => 230, 0x342   => 230, 0x343   => 230, 0x344   => 230, 0x346   => 230
+                    ,0x34A   => 230, 0x34B   => 230, 0x34C   => 230, 0x350   => 230, 0x351   => 230
+                    ,0x352   => 230, 0x357   => 230, 0x363   => 230, 0x364   => 230, 0x365   => 230
+                    ,0x366   => 230, 0x367   => 230, 0x368   => 230, 0x369   => 230, 0x36A   => 230
+                    ,0x36B   => 230, 0x36C   => 230, 0x36D   => 230, 0x36E   => 230, 0x36F   => 230
+                    ,0x483   => 230, 0x484   => 230, 0x485   => 230, 0x486   => 230, 0x592   => 230
+                    ,0x593   => 230, 0x594   => 230, 0x595   => 230, 0x597   => 230, 0x598   => 230
+                    ,0x599   => 230, 0x59C   => 230, 0x59D   => 230, 0x59E   => 230, 0x59F   => 230
+                    ,0x5A0   => 230, 0x5A1   => 230, 0x5A8   => 230, 0x5A9   => 230, 0x5AB   => 230
+                    ,0x5AC   => 230, 0x5AF   => 230, 0x5C4   => 230, 0x610   => 230, 0x611   => 230
+                    ,0x612   => 230, 0x613   => 230, 0x614   => 230, 0x615   => 230, 0x653   => 230
+                    ,0x654   => 230, 0x657   => 230, 0x658   => 230, 0x6D6   => 230, 0x6D7   => 230
+                    ,0x6D8   => 230, 0x6D9   => 230, 0x6DA   => 230, 0x6DB   => 230, 0x6DC   => 230
+                    ,0x6DF   => 230, 0x6E0   => 230, 0x6E1   => 230, 0x6E2   => 230, 0x6E4   => 230
+                    ,0x6E7   => 230, 0x6E8   => 230, 0x6EB   => 230, 0x6EC   => 230, 0x730   => 230
+                    ,0x732   => 230, 0x733   => 230, 0x735   => 230, 0x736   => 230, 0x73A   => 230
+                    ,0x73D   => 230, 0x73F   => 230, 0x740   => 230, 0x741   => 230, 0x743   => 230
+                    ,0x745   => 230, 0x747   => 230, 0x749   => 230, 0x74A   => 230, 0x951   => 230
+                    ,0x953   => 230, 0x954   => 230, 0xF82   => 230, 0xF83   => 230, 0xF86   => 230
+                    ,0xF87   => 230, 0x170D  => 230, 0x193A  => 230, 0x20D0  => 230, 0x20D1  => 230
+                    ,0x20D4  => 230, 0x20D5  => 230, 0x20D6  => 230, 0x20D7  => 230, 0x20DB  => 230
+                    ,0x20DC  => 230, 0x20E1  => 230, 0x20E7  => 230, 0x20E9  => 230, 0xFE20  => 230
+                    ,0xFE21  => 230, 0xFE22  => 230, 0xFE23  => 230, 0x1D185 => 230, 0x1D186 => 230
+                    ,0x1D187 => 230, 0x1D189 => 230, 0x1D188 => 230, 0x1D1AA => 230, 0x1D1AB => 230
+                    ,0x1D1AC => 230, 0x1D1AD => 230, 0x315   => 232, 0x31A   => 232, 0x302C  => 232
+                    ,0x35F   => 233, 0x362   => 233, 0x35D   => 234, 0x35E   => 234, 0x360   => 234
+                    ,0x361   => 234, 0x345   => 240
+                    )
+            );
+}
+?>
diff --git a/core/libraries/idna_convert/transcode_wrapper.php b/core/libraries/idna_convert/transcode_wrapper.php
new file mode 100644
index 00000000..6862e40c
--- /dev/null
+++ b/core/libraries/idna_convert/transcode_wrapper.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * transcode wrapper functions
+ * @package IDNA Convert
+ * @subpackage charset transcoding
+ * @author Matthias Sommerfeld, <mso@phlylabs.de>
+ * @version 0.1.0
+ */
+
+/**
+ * Convert a string from any of various encodings to UTF-8
+ *
+ * @param  string  String to encode
+ *[@param  string  Encoding; Default: ISO-8859-1]
+ *[@param  bool  Safe Mode: if set to TRUE, the original string is retunred on errors]
+ * @return  string  The encoded string or false on failure
+ * @since 0.0.1
+ */
+function encode_utf8($string = '', $encoding = 'iso-8859-1', $safe_mode = false)
+{
+    $safe = ($safe_mode) ? $string : false;
+    if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
+        return $string;
+    } elseif (strtoupper($encoding) == 'ISO-8859-1') {
+        return utf8_encode($string);
+    } elseif (strtoupper($encoding) == 'WINDOWS-1252') {
+        return utf8_encode(map_w1252_iso8859_1($string));
+    } elseif (strtoupper($encoding) == 'UNICODE-1-1-UTF-7') {
+        $encoding = 'utf-7';
+    }
+    if (function_exists('mb_convert_encoding')) {
+        $conv = @mb_convert_encoding($string, 'UTF-8', strtoupper($encoding));
+        if ($conv) return $conv;
+    }
+    if (function_exists('iconv')) {
+        $conv = @iconv(strtoupper($encoding), 'UTF-8', $string);
+        if ($conv) return $conv;
+    }
+    if (function_exists('libiconv')) {
+        $conv = @libiconv(strtoupper($encoding), 'UTF-8', $string);
+        if ($conv) return $conv;
+    }
+    return $safe;
+}
+
+/**
+ * Convert a string from UTF-8 to any of various encodings
+ *
+ * @param  string  String to decode
+ *[@param  string  Encoding; Default: ISO-8859-1]
+ *[@param  bool  Safe Mode: if set to TRUE, the original string is retunred on errors]
+ * @return  string  The decoded string or false on failure
+ * @since 0.0.1
+ */
+function decode_utf8($string = '', $encoding = 'iso-8859-1', $safe_mode = false)
+{
+    $safe = ($safe_mode) ? $string : false;
+    if (!$encoding) $encoding = 'ISO-8859-1';
+    if (strtoupper($encoding) == 'UTF-8' || strtoupper($encoding) == 'UTF8') {
+        return $string;
+    } elseif (strtoupper($encoding) == 'ISO-8859-1') {
+        return utf8_decode($string);
+    } elseif (strtoupper($encoding) == 'WINDOWS-1252') {
+        return map_iso8859_1_w1252(utf8_decode($string));
+    } elseif (strtoupper($encoding) == 'UNICODE-1-1-UTF-7') {
+        $encoding = 'utf-7';
+    }
+    if (function_exists('mb_convert_encoding')) {
+        $conv = @mb_convert_encoding($string, strtoupper($encoding), 'UTF-8');
+        if ($conv) return $conv;
+    }
+    if (function_exists('iconv')) {
+        $conv = @iconv('UTF-8', strtoupper($encoding), $string);
+        if ($conv) return $conv;
+    }
+    if (function_exists('libiconv')) {
+        $conv = @libiconv('UTF-8', strtoupper($encoding), $string);
+        if ($conv) return $conv;
+    }
+    return $safe;
+}
+
+/**
+ * Special treatment for our guys in Redmond
+ * Windows-1252 is basically ISO-8859-1 -- with some exceptions, which get accounted for here
+ * @param  string  Your input in Win1252
+ * @param  string  The resulting ISO-8859-1 string
+ * @since 3.0.8
+ */
+function map_w1252_iso8859_1($string = '')
+{
+    if ($string == '') return '';
+    $return = '';
+    for ($i = 0; $i < strlen($string); ++$i) {
+        $c = ord($string{$i});
+        switch ($c) {
+            case 129: $return .= chr(252); break;
+            case 132: $return .= chr(228); break;
+            case 142: $return .= chr(196); break;
+            case 148: $return .= chr(246); break;
+            case 153: $return .= chr(214); break;
+            case 154: $return .= chr(220); break;
+            case 225: $return .= chr(223); break;
+            default: $return .= chr($c); break;
+        }
+    }
+    return $return;
+}
+
+/**
+ * Special treatment for our guys in Redmond
+ * Windows-1252 is basically ISO-8859-1 -- with some exceptions, which get accounted for here
+ * @param  string  Your input in ISO-8859-1
+ * @param  string  The resulting Win1252 string
+ * @since 3.0.8
+ */
+function map_iso8859_1_w1252($string = '')
+{
+    if ($string == '') return '';
+    $return = '';
+    for ($i = 0; $i < strlen($string); ++$i) {
+        $c = ord($string{$i});
+        switch ($c) {
+            case 196: $return .= chr(142); break;
+            case 214: $return .= chr(153); break;
+            case 220: $return .= chr(154); break;
+            case 223: $return .= chr(225); break;
+            case 228: $return .= chr(132); break;
+            case 246: $return .= chr(148); break;
+            case 252: $return .= chr(129); break;
+            default: $return .= chr($c); break;
+        }
+    }
+    return $return;
+}
+
+?>
\ No newline at end of file
diff --git a/core/libraries/idna_convert/uctc.php b/core/libraries/idna_convert/uctc.php
new file mode 100644
index 00000000..ea5e4769
--- /dev/null
+++ b/core/libraries/idna_convert/uctc.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * UCTC - The Unicode Transcoder
+ *
+ * Converts between various flavours of Unicode representations like UCS-4 or UTF-8
+ * Supported schemes:
+ * - UCS-4 Little Endian / Big Endian / Array (partially)
+ * - UTF-16 Little Endian / Big Endian (not yet)
+ * - UTF-8
+ * - UTF-7
+ * - UTF-7 IMAP (modified UTF-7)
+ *
+ * @package phlyMail Nahariya 4.0+ Default branch
+ * @author Matthias Sommerfeld  <mso@phlyLabs.de>
+ * @copyright 2003-2009 phlyLabs Berlin, http://phlylabs.de
+ * @version 0.0.6 2009-05-10
+ */
+class uctc {
+    private static $mechs = array('ucs4', /*'ucs4le', 'ucs4be', */'ucs4array', /*'utf16', 'utf16le', 'utf16be', */'utf8', 'utf7', 'utf7imap');
+    private static $allow_overlong = false;
+    private static $safe_mode;
+    private static $safe_char;
+
+    /**
+     * The actual conversion routine
+     *
+     * @param mixed $data  The data to convert, usually a string, array when converting from UCS-4 array
+     * @param string $from  Original encoding of the data
+     * @param string $to  Target encoding of the data
+     * @param bool $safe_mode  SafeMode tries to correct invalid codepoints
+     * @return mixed  False on failure, String or array on success, depending on target encoding
+     * @access public
+     * @since 0.0.1
+     */
+    public static function convert($data, $from, $to, $safe_mode = false, $safe_char = 0xFFFC)
+    {
+        self::$safe_mode = ($safe_mode) ? true : false;
+        self::$safe_char = ($safe_char) ? $safe_char : 0xFFFC;
+        if (self::$safe_mode) self::$allow_overlong = true;
+        if (!in_array($from, self::$mechs)) throw new Exception('Invalid input format specified');
+        if (!in_array($to, self::$mechs)) throw new Exception('Invalid output format specified');
+        if ($from != 'ucs4array') eval('$data = self::'.$from.'_ucs4array($data);');
+        if ($to != 'ucs4array') eval('$data = self::ucs4array_'.$to.'($data);');
+        return $data;
+    }
+
+    /**
+     * This converts an UTF-8 encoded string to its UCS-4 representation
+     *
+     * @param string $input  The UTF-8 string to convert
+     * @return array  Array of 32bit values representing each codepoint
+     * @access private
+     */
+    private static function utf8_ucs4array($input)
+    {
+        $output = array();
+        $out_len = 0;
+        $inp_len = strlen($input);
+        $mode = 'next';
+        $test = 'none';
+        for ($k = 0; $k < $inp_len; ++$k) {
+            $v = ord($input{$k}); // Extract byte from input string
+
+            if ($v < 128) { // We found an ASCII char - put into stirng as is
+                $output[$out_len] = $v;
+                ++$out_len;
+                if ('add' == $mode) {
+                    if (self::$safe_mode) {
+                        $output[$out_len-2] = self::$safe_char;
+                        $mode = 'next';
+                    } else {
+                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    }
+                }
+                continue;
+            }
+            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+                $start_byte = $v;
+                $mode = 'add';
+                $test = 'range';
+                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
+                    $v = ($v - 192) << 6;
+                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 1;
+                    $v = ($v - 224) << 12;
+                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 2;
+                    $v = ($v - 240) << 18;
+                } elseif (self::$safe_mode) {
+                    $mode = 'next';
+                    $output[$out_len] = self::$safe_char;
+                    ++$out_len;
+                    continue;
+                } else {
+                    throw new Exception('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                }
+                if ($inp_len-$k-$next_byte < 2) {
+                    $output[$out_len] = self::$safe_char;
+                    $mode = 'no';
+                    continue;
+                }
+
+                if ('add' == $mode) {
+                    $output[$out_len] = (int) $v;
+                    ++$out_len;
+                    continue;
+                }
+            }
+            if ('add' == $mode) {
+                if (!self::$allow_overlong && $test == 'range') {
+                    $test = 'none';
+                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
+                        throw new Exception('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                    }
+                }
+                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                    $v = ($v-128) << ($next_byte*6);
+                    $output[($out_len-1)] += $v;
+                    --$next_byte;
+                } else {
+                    if (self::$safe_mode) {
+                        $output[$out_len-1] = ord(self::$safe_char);
+                        $k--;
+                        $mode = 'next';
+                        continue;
+                    } else {
+                        throw new Exception('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    }
+                }
+                if ($next_byte < 0) {
+                    $mode = 'next';
+                }
+            }
+        } // for
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 string into UTF-8 string
+     * See utf8_ucs4array() for details
+     * @access   private
+     */
+    private static function ucs4array_utf8($input)
+    {
+        $output = '';
+        foreach ($input as $v) {
+            if ($v < 128) { // 7bit are transferred literally
+                $output .= chr($v);
+            } elseif ($v < (1 << 11)) { // 2 bytes
+                $output .= chr(192+($v >> 6)).chr(128+($v & 63));
+            } elseif ($v < (1 << 16)) { // 3 bytes
+                $output .= chr(224+($v >> 12)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+            } elseif ($v < (1 << 21)) { // 4 bytes
+                $output .= chr(240+($v >> 18)).chr(128+(($v >> 12) & 63)).chr(128+(($v >> 6) & 63)).chr(128+($v & 63));
+            } elseif (self::$safe_mode) {
+                $output .= self::$safe_char;
+            } else {
+                throw new Exception('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+            }
+        }
+        return $output;
+    }
+
+    private static function utf7imap_ucs4array($input)
+    {
+        return self::utf7_ucs4array(str_replace(',', '/', $input), '&');
+    }
+
+    private static function utf7_ucs4array($input, $sc = '+')
+    {
+        $output  = array();
+        $out_len = 0;
+        $inp_len = strlen($input);
+        $mode    = 'd';
+        $b64     = '';
+
+        for ($k = 0; $k < $inp_len; ++$k) {
+            $c = $input{$k};
+            if (0 == ord($c)) continue; // Ignore zero bytes
+            if ('b' == $mode) {
+                // Sequence got terminated
+                if (!preg_match('![A-Za-z0-9/'.preg_quote($sc, '!').']!', $c)) {
+                    if ('-' == $c) {
+                        if ($b64 == '') {
+                            $output[$out_len] = ord($sc);
+                            $out_len++;
+                            $mode = 'd';
+                            continue;
+                        }
+                    }
+                    $tmp = base64_decode($b64);
+                    $tmp = substr($tmp, -1 * (strlen($tmp) % 2));
+                    for ($i = 0; $i < strlen($tmp); $i++) {
+                        if ($i % 2) {
+                            $output[$out_len] += ord($tmp{$i});
+                            $out_len++;
+                        } else {
+                            $output[$out_len] = ord($tmp{$i}) << 8;
+                        }
+                    }
+                    $mode = 'd';
+                    $b64 = '';
+                    continue;
+                } else {
+                    $b64 .= $c;
+                }
+            }
+            if ('d' == $mode) {
+                if ($sc == $c) {
+                    $mode = 'b';
+                    continue;
+                }
+                $output[$out_len] = ord($c);
+                $out_len++;
+            }
+        }
+        return $output;
+    }
+
+    private static function ucs4array_utf7imap($input)
+    {
+        return str_replace('/', ',', self::ucs4array_utf7($input, '&'));
+    }
+
+    private static function ucs4array_utf7($input, $sc = '+')
+    {
+        $output = '';
+        $mode = 'd';
+        $b64 = '';
+        while (true) {
+            $v = (!empty($input)) ? array_shift($input) : false;
+            $is_direct = (false !== $v) ? (0x20 <= $v && $v <= 0x7e && $v != ord($sc)) : true;
+            if ($mode == 'b') {
+                if ($is_direct) {
+                    if ($b64 == chr(0).$sc) {
+                        $output .= $sc.'-';
+                        $b64 = '';
+                    } elseif ($b64) {
+                        $output .= $sc.str_replace('=', '', base64_encode($b64)).'-';
+                        $b64 = '';
+                    }
+                    $mode = 'd';
+                } elseif (false !== $v) {
+                    $b64 .= chr(($v >> 8) & 255). chr($v & 255);
+                }
+            }
+            if ($mode == 'd' && false !== $v) {
+                if ($is_direct) {
+                    $output .= chr($v);
+                } else {
+                    $b64 = chr(($v >> 8) & 255). chr($v & 255);
+                    $mode = 'b';
+                }
+            }
+            if (false === $v && $b64 == '') break;
+        }
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 array into UCS-4 string (Little Endian at the moment)
+     * @access   private
+     */
+    private static function ucs4array_ucs4($input)
+    {
+        $output = '';
+        foreach ($input as $v) {
+            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
+        }
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 string (LE in the moment) into UCS-4 garray
+     * @access   private
+     */
+    private static function ucs4_ucs4array($input)
+    {
+        $output = array();
+
+        $inp_len = strlen($input);
+        // Input length must be dividable by 4
+        if ($inp_len % 4) {
+            throw new Exception('Input UCS4 string is broken');
+        }
+        // Empty input - return empty output
+        if (!$inp_len) return $output;
+
+        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
+            if (!($i % 4)) { // Increment output position every 4 input bytes
+                $out_len++;
+                $output[$out_len] = 0;
+            }
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+        }
+        return $output;
+    }
+}
+?>
\ No newline at end of file
diff --git a/core/libraries/import.legacy.php b/core/libraries/import.legacy.php
new file mode 100644
index 00000000..00710191
--- /dev/null
+++ b/core/libraries/import.legacy.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Bootstrap file for the Joomla Platform [with legacy libraries].  Including this file into your application
+ * will make Joomla Platform libraries [including legacy libraries] available for use.
+ *
+ * @package    Joomla.Platform
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Set the platform root path as a constant if necessary.
+if (!defined('JPATH_PLATFORM'))
+{
+	define('JPATH_PLATFORM', __DIR__);
+}
+
+// Detect the native operating system type.
+$os = strtoupper(substr(PHP_OS, 0, 3));
+
+if (!defined('IS_WIN'))
+{
+	define('IS_WIN', $os === 'WIN');
+}
+
+if (!defined('IS_UNIX'))
+{
+	define('IS_UNIX', $os !== 'MAC' && $os !== 'WIN');
+}
+
+/**
+ * @deprecated 13.3	Use IS_UNIX instead
+ */
+if (!defined('IS_MAC'))
+{
+	define('IS_MAC', IS_UNIX === true && ($os === 'DAR' || $os === 'MAC'));
+}
+
+// Import the library loader if necessary.
+if (!class_exists('JLoader'))
+{
+	require_once JPATH_PLATFORM . '/loader.php';
+}
+
+// Make sure that the Joomla Loader has been successfully loaded.
+if (!class_exists('JLoader'))
+{
+	throw new RuntimeException('Joomla Loader not loaded.');
+}
+
+// Setup the autoloaders.
+JLoader::setup();
+
+JLoader::registerPrefix('J', JPATH_PLATFORM . '/legacy');
+
+// Check if the JsonSerializable interface exists already
+if (!interface_exists('JsonSerializable'))
+{
+	JLoader::register('JsonSerializable', JPATH_PLATFORM . '/vendor/joomla/compat/src/JsonSerializable.php');
+}
+
+// Add deprecated constants
+// @deprecated 4.0
+define('JPATH_ISWIN', IS_WIN);
+define('JPATH_ISMAC', IS_MAC);
+
+/**
+ * Mask for the raw routing mode
+ *
+ * @deprecated  4.0
+ */
+const JROUTER_MODE_RAW = 0;
+
+/**
+ * Mask for the SEF routing mode
+ *
+ * @deprecated  4.0
+ */
+const JROUTER_MODE_SEF = 1;
+
+// Register the PasswordHash lib
+JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+
+// Register classes where the names have been changed to fit the autoloader rules
+// @deprecated  4.0
+JLoader::register('JSimpleCrypt', JPATH_PLATFORM . '/legacy/simplecrypt/simplecrypt.php');
+JLoader::register('JTree', JPATH_PLATFORM . '/legacy/base/tree.php');
+JLoader::register('JNode', JPATH_PLATFORM . '/legacy/base/node.php');
+JLoader::register('JObserver', JPATH_PLATFORM . '/legacy/base/observer.php');
+JLoader::register('JObservable', JPATH_PLATFORM . '/legacy/base/observable.php');
+JLoader::register('LogException', JPATH_PLATFORM . '/legacy/log/logexception.php');
+JLoader::register('JXMLElement', JPATH_PLATFORM . '/legacy/utilities/xmlelement.php');
+JLoader::register('JCli', JPATH_PLATFORM . '/legacy/application/cli.php');
+JLoader::register('JDaemon', JPATH_PLATFORM . '/legacy/application/daemon.php');
+JLoader::register('JApplication', JPATH_LIBRARIES . '/legacy/application/application.php');
diff --git a/core/libraries/import.php b/core/libraries/import.php
new file mode 100644
index 00000000..730dd3c5
--- /dev/null
+++ b/core/libraries/import.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Bootstrap file for the Joomla Platform.  Including this file into your application will make Joomla
+ * Platform libraries available for use.
+ *
+ * @package    Joomla.Platform
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Set the platform root path as a constant if necessary.
+if (!defined('JPATH_PLATFORM'))
+{
+	define('JPATH_PLATFORM', __DIR__);
+}
+
+// Detect the native operating system type.
+$os = strtoupper(substr(PHP_OS, 0, 3));
+
+if (!defined('IS_WIN'))
+{
+	define('IS_WIN', $os === 'WIN');
+}
+
+if (!defined('IS_UNIX'))
+{
+	define('IS_UNIX', IS_WIN === false);
+}
+
+// Import the library loader if necessary.
+if (!class_exists('JLoader'))
+{
+	require_once JPATH_PLATFORM . '/loader.php';
+}
+
+// Make sure that the Joomla Platform has been successfully loaded.
+if (!class_exists('JLoader'))
+{
+	throw new RuntimeException('Joomla Platform not loaded.');
+}
+
+// Setup the autoloaders.
+JLoader::setup();
+
+// Check if the JsonSerializable interface exists already
+if (!interface_exists('JsonSerializable'))
+{
+	JLoader::register('JsonSerializable', JPATH_PLATFORM . '/vendor/joomla/compat/src/JsonSerializable.php');
+}
+
+// Register the PasswordHash lib
+JLoader::register('PasswordHash', JPATH_PLATFORM . '/phpass/PasswordHash.php');
+
+/**
+ * Mask for the raw routing mode
+ *
+ * @deprecated  4.0
+ */
+const JROUTER_MODE_RAW = 0;
+
+/**
+ * Mask for the SEF routing mode
+ *
+ * @deprecated  4.0
+ */
+const JROUTER_MODE_SEF = 1;
diff --git a/core/libraries/index.html b/core/libraries/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/libraries/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/libraries/joomla/application/web/router.php b/core/libraries/joomla/application/web/router.php
new file mode 100644
index 00000000..9db709e0
--- /dev/null
+++ b/core/libraries/joomla/application/web/router.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Application
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Class to define an abstract Web application router.
+ *
+ * @since       12.2
+ * @deprecated  3.7.0  Use the `joomla/router` package via Composer instead
+ */
+abstract class JApplicationWebRouter
+{
+	/**
+	 * @var    JApplicationWeb  The web application on whose behalf we are routing the request.
+	 * @since  12.2
+	 */
+	protected $app;
+
+	/**
+	 * @var    string  The default page controller name for an empty route.
+	 * @since  12.2
+	 */
+	protected $default;
+
+	/**
+	 * @var    string  Controller class name prefix for creating controller objects by name.
+	 * @since  12.2
+	 */
+	protected $controllerPrefix;
+
+	/**
+	 * @var    JInput  An input object from which to derive the route.
+	 * @since  12.2
+	 */
+	protected $input;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   JApplicationWeb  $app    The web application on whose behalf we are routing the request.
+	 * @param   JInput           $input  An optional input object from which to derive the route.  If none
+	 *                                   is given than the input from the application object will be used.
+	 *
+	 * @since   12.2
+	 */
+	public function __construct(JApplicationWeb $app, JInput $input = null)
+	{
+		$this->app   = $app;
+		$this->input = ($input === null) ? $this->app->input : $input;
+	}
+
+	/**
+	 * Find and execute the appropriate controller based on a given route.
+	 *
+	 * @param   string  $route  The route string for which to find and execute a controller.
+	 *
+	 * @return  mixed   The return value of the controller executed
+	 *
+	 * @since   12.2
+	 * @throws  InvalidArgumentException
+	 * @throws  RuntimeException
+	 */
+	public function execute($route)
+	{
+		// Get the controller name based on the route patterns and requested route.
+		$name = $this->parseRoute($route);
+
+		// Get the controller object by name.
+		$controller = $this->fetchController($name);
+
+		// Execute the controller.
+		return $controller->execute();
+	}
+
+	/**
+	 * Set the controller name prefix.
+	 *
+	 * @param   string  $prefix  Controller class name prefix for creating controller objects by name.
+	 *
+	 * @return  JApplicationWebRouter  This object for method chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function setControllerPrefix($prefix)
+	{
+		$this->controllerPrefix	= (string) $prefix;
+
+		return $this;
+	}
+
+	/**
+	 * Set the default controller name.
+	 *
+	 * @param   string  $name  The default page controller name for an empty route.
+	 *
+	 * @return  JApplicationWebRouter  This object for method chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function setDefaultController($name)
+	{
+		$this->default = (string) $name;
+
+		return $this;
+	}
+
+	/**
+	 * Parse the given route and return the name of a controller mapped to the given route.
+	 *
+	 * @param   string  $route  The route string for which to find and execute a controller.
+	 *
+	 * @return  string  The controller name for the given route excluding prefix.
+	 *
+	 * @since   12.2
+	 * @throws  InvalidArgumentException
+	 */
+	abstract protected function parseRoute($route);
+
+	/**
+	 * Get a JController object for a given name.
+	 *
+	 * @param   string  $name  The controller name (excluding prefix) for which to fetch and instance.
+	 *
+	 * @return  JController
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	protected function fetchController($name)
+	{
+		// Derive the controller class name.
+		$class = $this->controllerPrefix . ucfirst($name);
+
+		// If the controller class does not exist panic.
+		if (!class_exists($class) || !is_subclass_of($class, 'JController'))
+		{
+			throw new RuntimeException(sprintf('Unable to locate controller `%s`.', $class), 404);
+		}
+
+		// Instantiate the controller.
+		$controller = new $class($this->input, $this->app);
+
+		return $controller;
+	}
+}
diff --git a/core/libraries/joomla/application/web/router/base.php b/core/libraries/joomla/application/web/router/base.php
new file mode 100644
index 00000000..dfcd0e6d
--- /dev/null
+++ b/core/libraries/joomla/application/web/router/base.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Application
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Basic Web application router class for the Joomla Platform.
+ *
+ * @since       12.2
+ * @deprecated  3.7.0  Use the `joomla/router` package via Composer instead
+ */
+class JApplicationWebRouterBase extends JApplicationWebRouter
+{
+	/**
+	 * @var    array  An array of rules, each rule being an associative array('regex'=> $regex, 'vars' => $vars, 'controller' => $controller)
+	 *                for routing the request.
+	 * @since  12.2
+	 */
+	protected $maps = array();
+
+	/**
+	 * Add a route map to the router.  If the pattern already exists it will be overwritten.
+	 *
+	 * @param   string  $pattern     The route pattern to use for matching.
+	 * @param   string  $controller  The controller name to map to the given pattern.
+	 *
+	 * @return  JApplicationWebRouter  This object for method chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function addMap($pattern, $controller)
+	{
+		// Sanitize and explode the pattern.
+		$pattern = explode('/', trim(parse_url((string) $pattern, PHP_URL_PATH), ' /'));
+
+		// Prepare the route variables
+		$vars = array();
+
+		// Initialize regular expression
+		$regex = array();
+
+		// Loop on each segment
+		foreach ($pattern as $segment)
+		{
+			// Match a splat with no variable.
+			if ($segment == '*')
+			{
+				$regex[] = '.*';
+			}
+			// Match a splat and capture the data to a named variable.
+			elseif ($segment[0] == '*')
+			{
+				$vars[] = substr($segment, 1);
+				$regex[] = '(.*)';
+			}
+			// Match an escaped splat segment.
+			elseif ($segment[0] == '\\' && $segment[1] == '*')
+			{
+				$regex[] = '\*' . preg_quote(substr($segment, 2));
+			}
+			// Match an unnamed variable without capture.
+			elseif ($segment == ':')
+			{
+				$regex[] = '[^/]*';
+			}
+			// Match a named variable and capture the data.
+			elseif ($segment[0] == ':')
+			{
+				$vars[] = substr($segment, 1);
+				$regex[] = '([^/]*)';
+			}
+			// Match a segment with an escaped variable character prefix.
+			elseif ($segment[0] == '\\' && $segment[1] == ':')
+			{
+				$regex[] = preg_quote(substr($segment, 1));
+			}
+			// Match the standard segment.
+			else
+			{
+				$regex[] = preg_quote($segment);
+			}
+		}
+
+		$this->maps[] = array(
+			'regex' => chr(1) . '^' . implode('/', $regex) . '$' . chr(1),
+			'vars' => $vars,
+			'controller' => (string) $controller,
+		);
+
+		return $this;
+	}
+
+	/**
+	 * Add a route map to the router.  If the pattern already exists it will be overwritten.
+	 *
+	 * @param   array  $maps  A list of route maps to add to the router as $pattern => $controller.
+	 *
+	 * @return  JApplicationWebRouter  This object for method chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function addMaps($maps)
+	{
+		foreach ($maps as $pattern => $controller)
+		{
+			$this->addMap($pattern, $controller);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Parse the given route and return the name of a controller mapped to the given route.
+	 *
+	 * @param   string  $route  The route string for which to find and execute a controller.
+	 *
+	 * @return  string  The controller name for the given route excluding prefix.
+	 *
+	 * @since   12.2
+	 * @throws  InvalidArgumentException
+	 */
+	protected function parseRoute($route)
+	{
+		$controller = false;
+
+		// Trim the query string off.
+		$route = preg_replace('/([^?]*).*/u', '\1', $route);
+
+		// Sanitize and explode the route.
+		$route = trim(parse_url($route, PHP_URL_PATH), ' /');
+
+		// If the route is empty then simply return the default route.  No parsing necessary.
+		if ($route == '')
+		{
+			return $this->default;
+		}
+
+		// Iterate through all of the known route maps looking for a match.
+		foreach ($this->maps as $rule)
+		{
+			if (preg_match($rule['regex'], $route, $matches))
+			{
+				// If we have gotten this far then we have a positive match.
+				$controller = $rule['controller'];
+
+				// Time to set the input variables.
+				// We are only going to set them if they don't already exist to avoid overwriting things.
+				foreach ($rule['vars'] as $i => $var)
+				{
+					$this->input->def($var, $matches[$i + 1]);
+
+					// Don't forget to do an explicit set on the GET superglobal.
+					$this->input->get->def($var, $matches[$i + 1]);
+				}
+
+				$this->input->def('_rawRoute', $route);
+
+				break;
+			}
+		}
+
+		// We were unable to find a route match for the request.  Panic.
+		if (!$controller)
+		{
+			throw new InvalidArgumentException(sprintf('Unable to handle request for route `%s`.', $route), 404);
+		}
+
+		return $controller;
+	}
+}
diff --git a/core/libraries/joomla/application/web/router/rest.php b/core/libraries/joomla/application/web/router/rest.php
new file mode 100644
index 00000000..a3a6150e
--- /dev/null
+++ b/core/libraries/joomla/application/web/router/rest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Application
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * RESTful Web application router class for the Joomla Platform.
+ *
+ * @since       12.2
+ * @deprecated  3.7.0  Use the `joomla/router` package via Composer instead
+ */
+class JApplicationWebRouterRest extends JApplicationWebRouterBase
+{
+	/**
+	 * @var     boolean  A boolean allowing to pass _method as parameter in POST requests
+	 *
+	 * @since  12.2
+	 */
+	protected $methodInPostRequest = false;
+
+	/**
+	 * @var    array  An array of HTTP Method => controller suffix pairs for routing the request.
+	 * @since  12.2
+	 */
+	protected $suffixMap = array(
+		'GET' => 'Get',
+		'POST' => 'Create',
+		'PUT' => 'Update',
+		'PATCH' => 'Update',
+		'DELETE' => 'Delete',
+		'HEAD' => 'Head',
+		'OPTIONS' => 'Options',
+	);
+
+	/**
+	 * Find and execute the appropriate controller based on a given route.
+	 *
+	 * @param   string  $route  The route string for which to find and execute a controller.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  InvalidArgumentException
+	 * @throws  RuntimeException
+	 */
+	public function execute($route)
+	{
+		// Get the controller name based on the route patterns and requested route.
+		$name = $this->parseRoute($route);
+
+		// Append the HTTP method based suffix.
+		$name .= $this->fetchControllerSuffix();
+
+		// Get the controller object by name.
+		$controller = $this->fetchController($name);
+
+		// Execute the controller.
+		$controller->execute();
+	}
+
+	/**
+	 * Set a controller class suffix for a given HTTP method.
+	 *
+	 * @param   string  $method  The HTTP method for which to set the class suffix.
+	 * @param   string  $suffix  The class suffix to use when fetching the controller name for a given request.
+	 *
+	 * @return  JApplicationWebRouter  This object for method chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function setHttpMethodSuffix($method, $suffix)
+	{
+		$this->suffixMap[strtoupper((string) $method)] = (string) $suffix;
+
+		return $this;
+	}
+
+	/**
+	 * Set to allow or not method in POST request
+	 *
+	 * @param   boolean  $value  A boolean to allow or not method in POST request
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function setMethodInPostRequest($value)
+	{
+		$this->methodInPostRequest = $value;
+	}
+
+	/**
+	 * Get the property to allow or not method in POST request
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.2
+	 */
+	public function isMethodInPostRequest()
+	{
+		return $this->methodInPostRequest;
+	}
+
+	/**
+	 * Get the controller class suffix string.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	protected function fetchControllerSuffix()
+	{
+		// Validate that we have a map to handle the given HTTP method.
+		if (!isset($this->suffixMap[$this->input->getMethod()]))
+		{
+			throw new RuntimeException(sprintf('Unable to support the HTTP method `%s`.', $this->input->getMethod()), 404);
+		}
+
+		// Check if request method is POST
+		if ($this->methodInPostRequest == true && strcmp(strtoupper($this->input->server->getMethod()), 'POST') === 0)
+		{
+			// Get the method from input
+			$postMethod = $this->input->get->getWord('_method');
+
+			// Validate that we have a map to handle the given HTTP method from input
+			if ($postMethod && isset($this->suffixMap[strtoupper($postMethod)]))
+			{
+				return ucfirst($this->suffixMap[strtoupper($postMethod)]);
+			}
+		}
+
+		return ucfirst($this->suffixMap[$this->input->getMethod()]);
+	}
+}
diff --git a/core/libraries/joomla/archive/archive.php b/core/libraries/joomla/archive/archive.php
new file mode 100644
index 00000000..8bdecdd1
--- /dev/null
+++ b/core/libraries/joomla/archive/archive.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+use Joomla\Archive\Archive;
+
+/**
+ * An Archive handling class
+ *
+ * @since       11.1
+ * @deprecated  4.0 use the Joomla\Archive\Archive class instead
+ */
+class JArchive
+{
+	/**
+	 * @var    array  The array of instantiated archive adapters.
+	 * @since  12.1
+	 */
+	protected static $adapters = array();
+
+	/**
+	 * Extract an archive file to a directory.
+	 *
+	 * @param   string  $archivename  The name of the archive file
+	 * @param   string  $extractdir   Directory to unpack into
+	 *
+	 * @return  boolean  True for success
+	 *
+	 * @since   11.1
+	 * @throws  InvalidArgumentException
+	 * @deprecated 4.0 use the Joomla\Archive\Archive class instead
+	 */
+	public static function extract($archivename, $extractdir)
+	{
+		// The archive instance
+		$archive = new Archive(array('tmp_path' => JFactory::getConfig()->get('tmp_path')));
+
+		// Extract the archive
+		return $archive->extract($archivename, $extractdir);
+	}
+
+	/**
+	 * Get a file compression adapter.
+	 *
+	 * @param   string  $type  The type of adapter (bzip2|gzip|tar|zip).
+	 *
+	 * @return  JArchiveExtractable  Adapter for the requested type
+	 *
+	 * @since   11.1
+	 * @throws  UnexpectedValueException
+	 * @deprecated 4.0 use the Joomla\Archive\Archive class instead
+	 */
+	public static function getAdapter($type)
+	{
+		if (!isset(self::$adapters[$type]))
+		{
+			// Try to load the adapter object
+			$class = 'JArchive' . ucfirst($type);
+
+			if (!class_exists($class))
+			{
+				throw new UnexpectedValueException('Unable to load archive', 500);
+			}
+
+			self::$adapters[$type] = new $class;
+		}
+
+		return self::$adapters[$type];
+	}
+}
diff --git a/core/libraries/joomla/archive/bzip2.php b/core/libraries/joomla/archive/bzip2.php
new file mode 100644
index 00000000..b9e1d395
--- /dev/null
+++ b/core/libraries/joomla/archive/bzip2.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.stream');
+
+/**
+ * Bzip2 format adapter for the JArchive class
+ *
+ * @since       11.1
+ * @deprecated  4.0 use the Joomla\Archive\Bzip2 class instead
+ */
+class JArchiveBzip2 implements JArchiveExtractable
+{
+	/**
+	 * Bzip2 file data buffer
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_data = null;
+
+	/**
+	 * Extract a Bzip2 compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to Bzip2 archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 * @param   array   $options      Extraction options [unused]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function extract($archive, $destination, array $options = array())
+	{
+		$this->_data = null;
+
+		if (!extension_loaded('bz2'))
+		{
+			$this->raiseWarning(100, 'The bz2 extension is not available.');
+		}
+
+		if (isset($options['use_streams']) && $options['use_streams'] != false)
+		{
+			return $this->extractStream($archive, $destination, $options);
+		}
+
+		// Old style: read the whole file and then parse it
+		$this->_data = file_get_contents($archive);
+
+		if (!$this->_data)
+		{
+			return $this->raiseWarning(100, 'Unable to read archive');
+		}
+
+		$buffer = bzdecompress($this->_data);
+		unset($this->_data);
+
+		if (empty($buffer))
+		{
+			return $this->raiseWarning(100, 'Unable to decompress data');
+		}
+
+		if (JFile::write($destination, $buffer) === false)
+		{
+			return $this->raiseWarning(100, 'Unable to write archive');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to extract archive using stream objects
+	 *
+	 * @param   string  $archive      Path to Bzip2 archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 * @param   array   $options      Extraction options [unused]
+	 *
+	 * @return  boolean  True if successful
+	 */
+	protected function extractStream($archive, $destination, $options = array())
+	{
+		// New style! streams!
+		$input = JFactory::getStream();
+
+		// Use bzip
+		$input->set('processingmethod', 'bz');
+
+		if (!$input->open($archive))
+		{
+			return $this->raiseWarning(100, 'Unable to read archive (bz2)');
+
+		}
+
+		$output = JFactory::getStream();
+
+		if (!$output->open($destination, 'w'))
+		{
+			$input->close();
+
+			return $this->raiseWarning(100, 'Unable to write archive (bz2)');
+
+		}
+
+		do
+		{
+			$this->_data = $input->read($input->get('chunksize', 8196));
+
+			if ($this->_data && !$output->write($this->_data))
+			{
+				$input->close();
+
+				return $this->raiseWarning(100, 'Unable to write archive (bz2)');
+			}
+		}
+
+		while ($this->_data);
+
+		$output->close();
+		$input->close();
+
+		return true;
+	}
+
+	/**
+	 * Temporary private method to isolate JError from the extract method
+	 * This code should be removed when JError is removed.
+	 *
+	 * @param   int     $code  The application-internal error code for this error
+	 * @param   string  $msg   The error message, which may also be shown the user if need be.
+	 *
+	 * @return  JException  JException instance if JError class exists
+	 *
+	 * @throws  RuntimeException if JError class does not exist
+	 */
+	private function raiseWarning($code, $msg)
+	{
+		if (class_exists('JError'))
+		{
+			return JError::raiseWarning($code, $msg);
+		}
+
+		throw new RuntimeException($msg);
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   11.3
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('bz2');
+	}
+}
diff --git a/core/libraries/joomla/archive/extractable.php b/core/libraries/joomla/archive/extractable.php
new file mode 100644
index 00000000..f3ffb8fb
--- /dev/null
+++ b/core/libraries/joomla/archive/extractable.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Archieve class interface
+ *
+ * @since       12.1
+ * @deprecated  4.0 use the Joomla\Archive\ExtractableInterface interface instead
+ */
+interface JArchiveExtractable
+{
+	/**
+	 * Extract a compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 * @param   array   $options      Extraction options [may be unused]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function extract($archive, $destination, array $options = array());
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported();
+}
diff --git a/core/libraries/joomla/archive/gzip.php b/core/libraries/joomla/archive/gzip.php
new file mode 100644
index 00000000..9fe2dd96
--- /dev/null
+++ b/core/libraries/joomla/archive/gzip.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+
+/**
+ * Gzip format adapter for the JArchive class
+ *
+ * This class is inspired from and draws heavily in code and concept from the Compress package of
+ * The Horde Project <https://www.horde.org>
+ *
+ * @contributor  Michael Slusarz <slusarz@horde.org>
+ * @contributor  Michael Cochrane <mike@graftonhall.co.nz>
+ *
+ * @since       11.1
+ * @deprecated  4.0 use the Joomla\Archive\Gzip class instead
+ */
+class JArchiveGzip implements JArchiveExtractable
+{
+	/**
+	 * Gzip file flags.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	private $_flags = array('FTEXT' => 0x01, 'FHCRC' => 0x02, 'FEXTRA' => 0x04, 'FNAME' => 0x08, 'FCOMMENT' => 0x10);
+
+	/**
+	 * Gzip file data buffer
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_data = null;
+
+	/**
+	 * Extract a Gzip compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 * @param   array   $options      Extraction options [unused]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function extract($archive, $destination, array $options = array())
+	{
+		$this->_data = null;
+
+		if (!extension_loaded('zlib'))
+		{
+			return $this->raiseWarning(100, 'The zlib extension is not available.');
+		}
+
+		if (isset($options['use_streams']) && $options['use_streams'] != false)
+		{
+			return $this->extractStream($archive, $destination, $options);
+		}
+
+		$this->_data = file_get_contents($archive);
+
+		if (!$this->_data)
+		{
+			return $this->raiseWarning(100, 'Unable to read archive');
+		}
+
+		$position = $this->_getFilePosition();
+		$buffer = gzinflate(substr($this->_data, $position, strlen($this->_data) - $position));
+
+		if (empty($buffer))
+		{
+			return $this->raiseWarning(100, 'Unable to decompress data');
+		}
+
+		if (JFile::write($destination, $buffer) === false)
+		{
+			return $this->raiseWarning(100, 'Unable to write archive');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to extract archive using stream objects
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 * @param   array   $options      Extraction options [unused]
+	 *
+	 * @return  boolean  True if successful
+	 */
+	protected function extractStream($archive, $destination, $options = array())
+	{
+		// New style! streams!
+		$input = JFactory::getStream();
+
+		// Use gz
+		$input->set('processingmethod', 'gz');
+
+		if (!$input->open($archive))
+		{
+			return $this->raiseWarning(100, 'Unable to read archive (gz)');
+		}
+
+		$output = JFactory::getStream();
+
+		if (!$output->open($destination, 'w'))
+		{
+			$input->close();
+
+			return $this->raiseWarning(100, 'Unable to write archive (gz)');
+		}
+
+		do
+		{
+			$this->_data = $input->read($input->get('chunksize', 8196));
+
+			if ($this->_data && !$output->write($this->_data))
+			{
+				$input->close();
+
+				return $this->raiseWarning(100, 'Unable to write file (gz)');
+			}
+		}
+
+		while ($this->_data);
+
+		$output->close();
+		$input->close();
+
+		return true;
+	}
+
+	/**
+	 * Temporary private method to isolate JError from the extract method
+	 * This code should be removed when JError is removed.
+	 *
+	 * @param   int     $code  The application-internal error code for this error
+	 * @param   string  $msg   The error message, which may also be shown the user if need be.
+	 *
+	 * @return  JException  JException instance if JError class exists
+	 *
+	 * @throws  RuntimeException if JError class does not exist
+	 */
+	private function raiseWarning($code, $msg)
+	{
+		if (class_exists('JError'))
+		{
+			return JError::raiseWarning($code, $msg);
+		}
+
+		throw new RuntimeException($msg);
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   11.3
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('zlib');
+	}
+
+	/**
+	 * Get file data offset for archive
+	 *
+	 * @return  integer  Data position marker for archive
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function _getFilePosition()
+	{
+		// Gzipped file... unpack it first
+		$position = 0;
+		$info = @ unpack('CCM/CFLG/VTime/CXFL/COS', substr($this->_data, $position + 2));
+
+		if (!$info)
+		{
+			return $this->raiseWarning(100, 'Unable to decompress data.');
+		}
+
+		$position += 10;
+
+		if ($info['FLG'] & $this->_flags['FEXTRA'])
+		{
+			$XLEN = unpack('vLength', substr($this->_data, $position + 0, 2));
+			$XLEN = $XLEN['Length'];
+			$position += $XLEN + 2;
+		}
+
+		if ($info['FLG'] & $this->_flags['FNAME'])
+		{
+			$filenamePos = strpos($this->_data, "\x0", $position);
+			$position = $filenamePos + 1;
+		}
+
+		if ($info['FLG'] & $this->_flags['FCOMMENT'])
+		{
+			$commentPos = strpos($this->_data, "\x0", $position);
+			$position = $commentPos + 1;
+		}
+
+		if ($info['FLG'] & $this->_flags['FHCRC'])
+		{
+			$hcrc = unpack('vCRC', substr($this->_data, $position + 0, 2));
+			$hcrc = $hcrc['CRC'];
+			$position += 2;
+		}
+
+		return $position;
+	}
+}
diff --git a/core/libraries/joomla/archive/tar.php b/core/libraries/joomla/archive/tar.php
new file mode 100644
index 00000000..cb0007c2
--- /dev/null
+++ b/core/libraries/joomla/archive/tar.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.path');
+
+/**
+ * Tar format adapter for the JArchive class
+ *
+ * This class is inspired from and draws heavily in code and concept from the Compress package of
+ * The Horde Project <https://www.horde.org>
+ *
+ * @contributor  Michael Slusarz <slusarz@horde.org>
+ * @contributor  Michael Cochrane <mike@graftonhall.co.nz>
+ *
+ * @since       11.1
+ * @deprecated  4.0 use the Joomla\Archive\Tar class instead
+ */
+class JArchiveTar implements JArchiveExtractable
+{
+	/**
+	 * Tar file types.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	private $_types = array(
+		0x0  => 'Unix file',
+		0x30 => 'File',
+		0x31 => 'Link',
+		0x32 => 'Symbolic link',
+		0x33 => 'Character special file',
+		0x34 => 'Block special file',
+		0x35 => 'Directory',
+		0x36 => 'FIFO special file',
+		0x37 => 'Contiguous file',
+	);
+
+	/**
+	 * Tar file data buffer
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_data = null;
+
+	/**
+	 * Tar file metadata array
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	private $_metadata = null;
+
+	/**
+	 * Extract a ZIP compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive into
+	 * @param   array   $options      Extraction options [unused]
+	 *
+	 * @return  boolean|JException  True on success, JException instance on failure if JError class exists
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if JError class does not exist
+	 */
+	public function extract($archive, $destination, array $options = array())
+	{
+		$this->_data = null;
+		$this->_metadata = null;
+
+		$this->_data = file_get_contents($archive);
+
+		if (!$this->_data)
+		{
+			if (class_exists('JError'))
+			{
+				return JError::raiseWarning(100, 'Unable to read archive');
+			}
+			else
+			{
+				throw new RuntimeException('Unable to read archive');
+			}
+		}
+
+		$this->_getTarInfo($this->_data);
+
+		for ($i = 0, $n = count($this->_metadata); $i < $n; $i++)
+		{
+			$type = strtolower($this->_metadata[$i]['type']);
+
+			if ($type == 'file' || $type == 'unix file')
+			{
+				$buffer = $this->_metadata[$i]['data'];
+				$path = JPath::clean($destination . '/' . $this->_metadata[$i]['name']);
+
+				// Make sure the destination folder exists
+				if (!JFolder::create(dirname($path)))
+				{
+					if (class_exists('JError'))
+					{
+						return JError::raiseWarning(100, 'Unable to create destination');
+					}
+					else
+					{
+						throw new RuntimeException('Unable to create destination');
+					}
+				}
+
+				if (JFile::write($path, $buffer) === false)
+				{
+					if (class_exists('JError'))
+					{
+						return JError::raiseWarning(100, 'Unable to write entry');
+					}
+					else
+					{
+						throw new RuntimeException('Unable to write entry');
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   11.3
+	 */
+	public static function isSupported()
+	{
+		return true;
+	}
+
+	/**
+	 * Get the list of files/data from a Tar archive buffer.
+	 *
+	 * @param   string  &$data  The Tar archive buffer.
+	 *
+	 * @return  boolean|JException  True on success, JException instance on failure if JError class exists
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if JError class does not exist
+	 */
+	protected function _getTarInfo(& $data)
+	{
+		$position = 0;
+		$return_array = array();
+
+		while ($position < strlen($data))
+		{
+			if (version_compare(PHP_VERSION, '5.5', '>='))
+			{
+				$info = @unpack(
+					'Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/Z8checksum/Ctypeflag/Z100link/Z6magic/Z2version/Z32uname/Z32gname/Z8devmajor/Z8devminor',
+					substr($data, $position)
+				);
+			}
+			else
+			{
+				$info = @unpack(
+					'a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/Ctypeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor',
+					substr($data, $position)
+				);
+			}
+
+			/**
+			 * This variable has been set in the previous loop,
+			 * meaning that the filename was present in the previous block
+			 * to allow more than 100 characters - see below
+			 */
+			if (isset($longlinkfilename))
+			{
+				$info['filename'] = $longlinkfilename;
+				unset($longlinkfilename);
+			}
+
+			if (!$info)
+			{
+				if (class_exists('JError'))
+				{
+					return JError::raiseWarning(100, 'Unable to decompress data');
+				}
+				else
+				{
+					throw new RuntimeException('Unable to decompress data');
+				}
+			}
+
+			$position += 512;
+			$contents = substr($data, $position, octdec($info['size']));
+			$position += ceil(octdec($info['size']) / 512) * 512;
+
+			if ($info['filename'])
+			{
+				$file = array(
+					'attr' => null,
+					'data' => null,
+					'date' => octdec($info['mtime']),
+					'name' => trim($info['filename']),
+					'size' => octdec($info['size']),
+					'type' => isset($this->_types[$info['typeflag']]) ? $this->_types[$info['typeflag']] : null,
+				);
+
+				if (($info['typeflag'] == 0) || ($info['typeflag'] == 0x30) || ($info['typeflag'] == 0x35))
+				{
+					// File or folder.
+					$file['data'] = $contents;
+
+					$mode = hexdec(substr($info['mode'], 4, 3));
+					$file['attr'] = (($info['typeflag'] == 0x35) ? 'd' : '-') . (($mode & 0x400) ? 'r' : '-') . (($mode & 0x200) ? 'w' : '-') .
+						(($mode & 0x100) ? 'x' : '-') . (($mode & 0x040) ? 'r' : '-') . (($mode & 0x020) ? 'w' : '-') . (($mode & 0x010) ? 'x' : '-') .
+						(($mode & 0x004) ? 'r' : '-') . (($mode & 0x002) ? 'w' : '-') . (($mode & 0x001) ? 'x' : '-');
+				}
+				elseif (chr($info['typeflag']) == 'L' && $info['filename'] == '././@LongLink')
+				{
+					// GNU tar ././@LongLink support - the filename is actually in the contents,
+					// setting a variable here so we can test in the next loop
+					$longlinkfilename = $contents;
+
+					// And the file contents are in the next block so we'll need to skip this
+					continue;
+				}
+				else
+				{
+					// Some other type.
+				}
+
+				$return_array[] = $file;
+			}
+		}
+
+		$this->_metadata = $return_array;
+
+		return true;
+	}
+}
diff --git a/core/libraries/joomla/archive/wrapper/archive.php b/core/libraries/joomla/archive/wrapper/archive.php
new file mode 100644
index 00000000..9f3be9aa
--- /dev/null
+++ b/core/libraries/joomla/archive/wrapper/archive.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for JArchive
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ * @since       3.4
+ * @deprecated  4.0 use the Joomla\Archive\Archive class instead
+ */
+class JArchiveWrapperArchive
+{
+	/**
+	 * Helper wrapper method for extract
+	 *
+	 * @param   string  $archivename  The name of the archive file
+	 * @param   string  $extractdir   Directory to unpack into
+	 *
+	 * @return  boolean  True for success
+	 *
+	 * @see     JArchive::extract()
+	 * @since   3.4
+	 * @throws InvalidArgumentException
+	 * @deprecated 4.0 use the Joomla\Archive\Archive class instead
+	 */
+	public function extract($archivename, $extractdir)
+	{
+		return JArchive::extract($archivename, $extractdir);
+	}
+
+	/**
+	 * Helper wrapper method for getAdapter
+	 *
+	 * @param   string  $type  The type of adapter (bzip2|gzip|tar|zip).
+	 *
+	 * @return  JArchiveExtractable  Adapter for the requested type
+	 *
+	 * @see     JUserHelper::getAdapter()
+	 * @since   3.4
+	 * @deprecated 4.0 use the Joomla\Archive\Archive class instead
+	 */
+	public function getAdapter($type)
+	{
+		return JArchive::getAdapter($type);
+	}
+}
diff --git a/core/libraries/joomla/archive/zip.php b/core/libraries/joomla/archive/zip.php
new file mode 100644
index 00000000..042b4fd7
--- /dev/null
+++ b/core/libraries/joomla/archive/zip.php
@@ -0,0 +1,650 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.folder');
+
+/**
+ * ZIP format adapter for the JArchive class
+ *
+ * The ZIP compression code is partially based on code from:
+ * Eric Mueller <eric@themepark.com>
+ * http://www.zend.com/codex.php?id=535&single=1
+ *
+ * Deins125 <webmaster@atlant.ru>
+ * http://www.zend.com/codex.php?id=470&single=1
+ *
+ * The ZIP compression date code is partially based on code from
+ * Peter Listiak <mlady@users.sourceforge.net>
+ *
+ * This class is inspired from and draws heavily in code and concept from the Compress package of
+ * The Horde Project <https://www.horde.org>
+ *
+ * @contributor  Chuck Hagenbuch <chuck@horde.org>
+ * @contributor  Michael Slusarz <slusarz@horde.org>
+ * @contributor  Michael Cochrane <mike@graftonhall.co.nz>
+ *
+ * @since       11.1
+ * @deprecated  4.0 use the Joomla\Archive\Zip class instead
+ */
+class JArchiveZip implements JArchiveExtractable
+{
+	/**
+	 * ZIP compression methods.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	private $_methods = array(
+		0x0 => 'None',
+		0x1 => 'Shrunk',
+		0x2 => 'Super Fast',
+		0x3 => 'Fast',
+		0x4 => 'Normal',
+		0x5 => 'Maximum',
+		0x6 => 'Imploded',
+		0x8 => 'Deflated',
+	);
+
+	/**
+	 * Beginning of central directory record.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_ctrlDirHeader = "\x50\x4b\x01\x02";
+
+	/**
+	 * End of central directory record.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_ctrlDirEnd = "\x50\x4b\x05\x06\x00\x00\x00\x00";
+
+	/**
+	 * Beginning of file contents.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_fileHeader = "\x50\x4b\x03\x04";
+
+	/**
+	 * ZIP file data buffer
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_data = null;
+
+	/**
+	 * ZIP file metadata array
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	private $_metadata = null;
+
+	/**
+	 * Create a ZIP compressed file from an array of file data.
+	 *
+	 * @param   string  $archive  Path to save archive.
+	 * @param   array   $files    Array of files to add to archive.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @since   11.1
+	 *
+	 * @todo    Finish Implementation
+	 */
+	public function create($archive, $files)
+	{
+		$contents = array();
+		$ctrldir = array();
+
+		foreach ($files as $file)
+		{
+			$this->_addToZIPFile($file, $contents, $ctrldir);
+		}
+
+		return $this->_createZIPFile($contents, $ctrldir, $archive);
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive into
+	 * @param   array   $options      Extraction options [unused]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   11.1
+	 * @throws RuntimeException
+	 */
+	public function extract($archive, $destination, array $options = array())
+	{
+		if (!is_file($archive))
+		{
+			return $this->raiseWarning(100, 'Archive does not exist');
+		}
+
+		if ($this->hasNativeSupport())
+		{
+			return $this->extractNative($archive, $destination);
+		}
+
+		return $this->extractCustom($archive, $destination);
+	}
+
+	/**
+	 * Temporary private method to isolate JError from the extract method
+	 * This code should be removed when JError is removed.
+	 *
+	 * @param   int     $code  The application-internal error code for this error
+	 * @param   string  $msg   The error message, which may also be shown the user if need be.
+	 *
+	 * @return  JException  JException instance if JError class exists
+	 *
+	 * @throws  RuntimeException if JError class does not exist
+	 */
+	private function raiseWarning($code, $msg)
+	{
+		if (class_exists('JError'))
+		{
+			return JError::raiseWarning($code, $msg);
+		}
+
+		throw new RuntimeException($msg);
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   11.3
+	 */
+	public static function isSupported()
+	{
+		return self::hasNativeSupport() || extension_loaded('zlib');
+	}
+
+	/**
+	 * Method to determine if the server has native zip support for faster handling
+	 *
+	 * @return  boolean  True if php has native ZIP support
+	 *
+	 * @since   11.1
+	 */
+	public static function hasNativeSupport()
+	{
+		return function_exists('zip_open') && function_exists('zip_read');
+	}
+
+	/**
+	 * Checks to see if the data is a valid ZIP file.
+	 *
+	 * @param   string  &$data  ZIP archive data buffer.
+	 *
+	 * @return  boolean  True if valid, false if invalid.
+	 *
+	 * @since   11.1
+	 */
+	public function checkZipData(&$data)
+	{
+		if (strpos($data, $this->_fileHeader) === false)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path using a php based algorithm that only requires zlib support
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract.
+	 * @param   string  $destination  Path to extract archive into.
+	 *
+	 * @return  mixed   True if successful
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	protected function extractCustom($archive, $destination)
+	{
+		$this->_data = null;
+		$this->_metadata = null;
+
+		if (!extension_loaded('zlib'))
+		{
+			return $this->raiseWarning(100, 'Zlib not supported');
+		}
+
+		$this->_data = file_get_contents($archive);
+
+		if (!$this->_data)
+		{
+			return $this->raiseWarning(100, 'Unable to read archive (zip)');
+		}
+
+		if (!$this->_readZipInfo($this->_data))
+		{
+			return $this->raiseWarning(100, 'Get ZIP Information failed');
+		}
+
+		for ($i = 0, $n = count($this->_metadata); $i < $n; $i++)
+		{
+			$lastPathCharacter = substr($this->_metadata[$i]['name'], -1, 1);
+
+			if ($lastPathCharacter !== '/' && $lastPathCharacter !== '\\')
+			{
+				$buffer = $this->_getFileData($i);
+				$path = JPath::clean($destination . '/' . $this->_metadata[$i]['name']);
+
+				// Make sure the destination folder exists
+				if (!JFolder::create(dirname($path)))
+				{
+					return $this->raiseWarning(100, 'Unable to create destination');
+				}
+
+				if (JFile::write($path, $buffer) === false)
+				{
+					return $this->raiseWarning(100, 'Unable to write entry');
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path using native php api calls for speed
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive into
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	protected function extractNative($archive, $destination)
+	{
+		$zip = zip_open($archive);
+
+		if (!is_resource($zip))
+		{
+			return $this->raiseWarning(100, 'Unable to open archive');
+		}
+
+		// Make sure the destination folder exists
+		if (!JFolder::create($destination))
+		{
+			return $this->raiseWarning(100, 'Unable to create destination');
+		}
+
+		// Read files in the archive
+		while ($file = @zip_read($zip))
+		{
+			if (!zip_entry_open($zip, $file, 'r'))
+			{
+				return $this->raiseWarning(100, 'Unable to read entry');
+			}
+
+			if (substr(zip_entry_name($file), strlen(zip_entry_name($file)) - 1) != '/')
+			{
+				$buffer = zip_entry_read($file, zip_entry_filesize($file));
+
+				if (JFile::write($destination . '/' . zip_entry_name($file), $buffer) === false)
+				{
+					return $this->raiseWarning(100, 'Unable to write entry');
+				}
+
+				zip_entry_close($file);
+			}
+		}
+
+		@zip_close($zip);
+
+		return true;
+	}
+
+	/**
+	 * Get the list of files/data from a ZIP archive buffer.
+	 *
+	 * <pre>
+	 * KEY: Position in zipfile
+	 * VALUES: 'attr'  --  File attributes
+	 * 'crc'   --  CRC checksum
+	 * 'csize' --  Compressed file size
+	 * 'date'  --  File modification time
+	 * 'name'  --  Filename
+	 * 'method'--  Compression method
+	 * 'size'  --  Original file size
+	 * 'type'  --  File type
+	 * </pre>
+	 *
+	 * @param   string  &$data  The ZIP archive buffer.
+	 *
+	 * @return  boolean True on success
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	private function _readZipInfo(&$data)
+	{
+		$entries = array();
+
+		// Find the last central directory header entry
+		$fhLast = strpos($data, $this->_ctrlDirEnd);
+
+		do
+		{
+			$last = $fhLast;
+		}
+
+		while (($fhLast = strpos($data, $this->_ctrlDirEnd, $fhLast + 1)) !== false);
+
+		// Find the central directory offset
+		$offset = 0;
+
+		if ($last)
+		{
+			$endOfCentralDirectory = unpack(
+				'vNumberOfDisk/vNoOfDiskWithStartOfCentralDirectory/vNoOfCentralDirectoryEntriesOnDisk/' .
+				'vTotalCentralDirectoryEntries/VSizeOfCentralDirectory/VCentralDirectoryOffset/vCommentLength',
+				substr($data, $last + 4)
+			);
+			$offset = $endOfCentralDirectory['CentralDirectoryOffset'];
+		}
+
+		// Get details from central directory structure.
+		$fhStart = strpos($data, $this->_ctrlDirHeader, $offset);
+		$dataLength = strlen($data);
+
+		do
+		{
+			if ($dataLength < $fhStart + 31)
+			{
+				return $this->raiseWarning(100, 'Invalid Zip Data');
+			}
+
+			$info = unpack('vMethod/VTime/VCRC32/VCompressed/VUncompressed/vLength', substr($data, $fhStart + 10, 20));
+			$name = substr($data, $fhStart + 46, $info['Length']);
+
+			$entries[$name] = array(
+				'attr' => null,
+				'crc' => sprintf('%08s', dechex($info['CRC32'])),
+				'csize' => $info['Compressed'],
+				'date' => null,
+				'_dataStart' => null,
+				'name' => $name,
+				'method' => $this->_methods[$info['Method']],
+				'_method' => $info['Method'],
+				'size' => $info['Uncompressed'],
+				'type' => null,
+			);
+
+			$entries[$name]['date'] = mktime(
+				(($info['Time'] >> 11) & 0x1f),
+				(($info['Time'] >> 5) & 0x3f),
+				(($info['Time'] << 1) & 0x3e),
+				(($info['Time'] >> 21) & 0x07),
+				(($info['Time'] >> 16) & 0x1f),
+				((($info['Time'] >> 25) & 0x7f) + 1980)
+			);
+
+			if ($dataLength < $fhStart + 43)
+			{
+				return $this->raiseWarning(100, 'Invalid ZIP data');
+			}
+
+			$info = unpack('vInternal/VExternal/VOffset', substr($data, $fhStart + 36, 10));
+
+			$entries[$name]['type'] = ($info['Internal'] & 0x01) ? 'text' : 'binary';
+			$entries[$name]['attr'] = (($info['External'] & 0x10) ? 'D' : '-') . (($info['External'] & 0x20) ? 'A' : '-')
+				. (($info['External'] & 0x03) ? 'S' : '-') . (($info['External'] & 0x02) ? 'H' : '-') . (($info['External'] & 0x01) ? 'R' : '-');
+			$entries[$name]['offset'] = $info['Offset'];
+
+			// Get details from local file header since we have the offset
+			$lfhStart = strpos($data, $this->_fileHeader, $entries[$name]['offset']);
+
+			if ($dataLength < $lfhStart + 34)
+			{
+				return $this->raiseWarning(100, 'Invalid Zip Data');
+			}
+
+			$info = unpack('vMethod/VTime/VCRC32/VCompressed/VUncompressed/vLength/vExtraLength', substr($data, $lfhStart + 8, 25));
+			$name = substr($data, $lfhStart + 30, $info['Length']);
+			$entries[$name]['_dataStart'] = $lfhStart + 30 + $info['Length'] + $info['ExtraLength'];
+
+			// Bump the max execution time because not using the built in php zip libs makes this process slow.
+			@set_time_limit(ini_get('max_execution_time'));
+		}
+
+		while ((($fhStart = strpos($data, $this->_ctrlDirHeader, $fhStart + 46)) !== false));
+
+		$this->_metadata = array_values($entries);
+
+		return true;
+	}
+
+	/**
+	 * Returns the file data for a file by offsest in the ZIP archive
+	 *
+	 * @param   integer  $key  The position of the file in the archive.
+	 *
+	 * @return  string  Uncompressed file data buffer.
+	 *
+	 * @since   11.1
+	 */
+	private function _getFileData($key)
+	{
+		$method = $this->_metadata[$key]['_method'];
+
+		if ($method == 0x12 && !extension_loaded('bz2'))
+		{
+			return '';
+		}
+
+		switch ($method)
+		{
+			case 0x8:
+				return gzinflate(substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']));
+
+			case 0x0:
+				// Files that aren't compressed.
+				return substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']);
+
+			case 0x12:
+
+				return bzdecompress(substr($this->_data, $this->_metadata[$key]['_dataStart'], $this->_metadata[$key]['csize']));
+		}
+
+		return '';
+	}
+
+	/**
+	 * Converts a UNIX timestamp to a 4-byte DOS date and time format
+	 * (date in high 2-bytes, time in low 2-bytes allowing magnitude
+	 * comparison).
+	 *
+	 * @param   int  $unixtime  The current UNIX timestamp.
+	 *
+	 * @return  int  The current date in a 4-byte DOS format.
+	 *
+	 * @since   11.1
+	 */
+	protected function _unix2DOSTime($unixtime = null)
+	{
+		$timearray = (is_null($unixtime)) ? getdate() : getdate($unixtime);
+
+		if ($timearray['year'] < 1980)
+		{
+			$timearray['year'] = 1980;
+			$timearray['mon'] = 1;
+			$timearray['mday'] = 1;
+			$timearray['hours'] = 0;
+			$timearray['minutes'] = 0;
+			$timearray['seconds'] = 0;
+		}
+
+		return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) | ($timearray['hours'] << 11) |
+			($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1);
+	}
+
+	/**
+	 * Adds a "file" to the ZIP archive.
+	 *
+	 * @param   array  &$file      File data array to add
+	 * @param   array  &$contents  An array of existing zipped files.
+	 * @param   array  &$ctrldir   An array of central directory information.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 *
+	 * @todo    Review and finish implementation
+	 */
+	private function _addToZIPFile(array &$file, array &$contents, array &$ctrldir)
+	{
+		$data = &$file['data'];
+		$name = str_replace('\\', '/', $file['name']);
+
+		/* See if time/date information has been provided. */
+		$ftime = null;
+
+		if (isset($file['time']))
+		{
+			$ftime = $file['time'];
+		}
+
+		// Get the hex time.
+		$dtime = dechex($this->_unix2DosTime($ftime));
+		$hexdtime = chr(hexdec($dtime[6] . $dtime[7])) . chr(hexdec($dtime[4] . $dtime[5])) . chr(hexdec($dtime[2] . $dtime[3]))
+			. chr(hexdec($dtime[0] . $dtime[1]));
+
+		/* Begin creating the ZIP data. */
+		$fr = $this->_fileHeader;
+		/* Version needed to extract. */
+		$fr .= "\x14\x00";
+		/* General purpose bit flag. */
+		$fr .= "\x00\x00";
+		/* Compression method. */
+		$fr .= "\x08\x00";
+		/* Last modification time/date. */
+		$fr .= $hexdtime;
+
+		/* "Local file header" segment. */
+		$unc_len = strlen($data);
+		$crc = crc32($data);
+		$zdata = gzcompress($data);
+		$zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2);
+		$c_len = strlen($zdata);
+
+		/* CRC 32 information. */
+		$fr .= pack('V', $crc);
+		/* Compressed filesize. */
+		$fr .= pack('V', $c_len);
+		/* Uncompressed filesize. */
+		$fr .= pack('V', $unc_len);
+		/* Length of filename. */
+		$fr .= pack('v', strlen($name));
+		/* Extra field length. */
+		$fr .= pack('v', 0);
+		/* File name. */
+		$fr .= $name;
+
+		/* "File data" segment. */
+		$fr .= $zdata;
+
+		/* Add this entry to array. */
+		$old_offset = strlen(implode('', $contents));
+		$contents[] = &$fr;
+
+		/* Add to central directory record. */
+		$cdrec = $this->_ctrlDirHeader;
+		/* Version made by. */
+		$cdrec .= "\x00\x00";
+		/* Version needed to extract */
+		$cdrec .= "\x14\x00";
+		/* General purpose bit flag */
+		$cdrec .= "\x00\x00";
+		/* Compression method */
+		$cdrec .= "\x08\x00";
+		/* Last mod time/date. */
+		$cdrec .= $hexdtime;
+		/* CRC 32 information. */
+		$cdrec .= pack('V', $crc);
+		/* Compressed filesize. */
+		$cdrec .= pack('V', $c_len);
+		/* Uncompressed filesize. */
+		$cdrec .= pack('V', $unc_len);
+		/* Length of filename. */
+		$cdrec .= pack('v', strlen($name));
+		/* Extra field length. */
+		$cdrec .= pack('v', 0);
+		/* File comment length. */
+		$cdrec .= pack('v', 0);
+		/* Disk number start. */
+		$cdrec .= pack('v', 0);
+		/* Internal file attributes. */
+		$cdrec .= pack('v', 0);
+		/* External file attributes -'archive' bit set. */
+		$cdrec .= pack('V', 32);
+		/* Relative offset of local header. */
+		$cdrec .= pack('V', $old_offset);
+		/* File name. */
+		$cdrec .= $name;
+		/* Optional extra field, file comment goes here. */
+
+		/* Save to central directory array. */
+		$ctrldir[] = &$cdrec;
+	}
+
+	/**
+	 * Creates the ZIP file.
+	 *
+	 * Official ZIP file format: https://support.pkware.com/display/PKZIP/APPNOTE
+	 *
+	 * @param   array   &$contents  An array of existing zipped files.
+	 * @param   array   &$ctrlDir   An array of central directory information.
+	 * @param   string  $path       The path to store the archive.
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   11.1
+	 *
+	 * @todo	Review and finish implementation
+	 */
+	private function _createZIPFile(array &$contents, array &$ctrlDir, $path)
+	{
+		$data = implode('', $contents);
+		$dir = implode('', $ctrlDir);
+
+		$buffer = $data . $dir . $this->_ctrlDirEnd . /* Total # of entries "on this disk". */
+		pack('v', count($ctrlDir)) . /* Total # of entries overall. */
+		pack('v', count($ctrlDir)) . /* Size of central directory. */
+		pack('V', strlen($dir)) . /* Offset to start of central dir. */
+		pack('V', strlen($data)) . /* ZIP file comment length. */
+		"\x00\x00";
+
+		if (JFile::write($path, $buffer) === false)
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/joomla/base/adapter.php b/core/libraries/joomla/base/adapter.php
new file mode 100644
index 00000000..f03ca613
--- /dev/null
+++ b/core/libraries/joomla/base/adapter.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Adapter Class
+ * Retains common adapter pattern functions
+ * Class harvested from joomla.installer.installer
+ *
+ * @since  11.1
+ */
+class JAdapter extends JObject
+{
+	/**
+	 * Associative array of adapters
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_adapters = array();
+
+	/**
+	 * Adapter Folder
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_adapterfolder = 'adapters';
+
+	/**
+	 * @var    string	Adapter Class Prefix
+	 * @since  11.1
+	 */
+	protected $_classprefix = 'J';
+
+	/**
+	 * Base Path for the adapter instance
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_basepath = null;
+
+	/**
+	 * Database Connector Object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  11.1
+	 */
+	protected $_db;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $basepath       Base Path of the adapters
+	 * @param   string  $classprefix    Class prefix of adapters
+	 * @param   string  $adapterfolder  Name of folder to append to base path
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($basepath, $classprefix = null, $adapterfolder = null)
+	{
+		$this->_basepath = $basepath;
+		$this->_classprefix = $classprefix ? $classprefix : 'J';
+		$this->_adapterfolder = $adapterfolder ? $adapterfolder : 'adapters';
+
+		$this->_db = JFactory::getDbo();
+	}
+
+	/**
+	 * Get the database connector object
+	 *
+	 * @return  JDatabaseDriver  Database connector object
+	 *
+	 * @since   11.1
+	 */
+	public function getDbo()
+	{
+		return $this->_db;
+	}
+
+	/**
+	 * Return an adapter.
+	 *
+	 * @param   string  $name     Name of adapter to return
+	 * @param   array   $options  Adapter options
+	 *
+	 * @return  object  Adapter of type 'name' or false
+	 *
+	 * @since   11.1
+	 */
+	public function getAdapter($name, $options = array())
+	{
+		if (array_key_exists($name, $this->_adapters))
+		{
+			return $this->_adapters[$name];
+		}
+
+		if ($this->setAdapter($name, $options))
+		{
+			return $this->_adapters[$name];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set an adapter by name
+	 *
+	 * @param   string  $name      Adapter name
+	 * @param   object  &$adapter  Adapter object
+	 * @param   array   $options   Adapter options
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   11.1
+	 */
+	public function setAdapter($name, &$adapter = null, $options = array())
+	{
+		if (is_object($adapter))
+		{
+			$this->_adapters[$name] = &$adapter;
+
+			return true;
+		}
+
+		$class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name);
+
+		if (class_exists($class))
+		{
+			$this->_adapters[$name] = new $class($this, $this->_db, $options);
+
+			return true;
+		}
+
+		$class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name) . 'Adapter';
+
+		if (class_exists($class))
+		{
+			$this->_adapters[$name] = new $class($this, $this->_db, $options);
+
+			return true;
+		}
+
+		$fullpath = $this->_basepath . '/' . $this->_adapterfolder . '/' . strtolower($name) . '.php';
+
+		if (!file_exists($fullpath))
+		{
+			return false;
+		}
+
+		// Try to load the adapter object
+		$class = $this->_classprefix . ucfirst($name);
+
+		JLoader::register($class, $fullpath);
+
+		if (!class_exists($class))
+		{
+			return false;
+		}
+
+		$this->_adapters[$name] = new $class($this, $this->_db, $options);
+
+		return true;
+	}
+
+	/**
+	 * Loads all adapters.
+	 *
+	 * @param   array  $options  Adapter options
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function loadAllAdapters($options = array())
+	{
+		$files = new DirectoryIterator($this->_basepath . '/' . $this->_adapterfolder);
+
+		/* @type  $file  DirectoryIterator */
+		foreach ($files as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() != 'php')
+			{
+				continue;
+			}
+
+			// Try to load the adapter object
+			require_once $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName;
+
+			// Derive the class name from the filename.
+			$name = str_ireplace('.php', '', ucfirst(trim($fileName)));
+			$class = $this->_classprefix . ucfirst($name);
+
+			if (!class_exists($class))
+			{
+				// Skip to next one
+				continue;
+			}
+
+			$adapter = new $class($this, $this->_db, $options);
+			$this->_adapters[$name] = clone $adapter;
+		}
+	}
+}
diff --git a/core/libraries/joomla/base/adapterinstance.php b/core/libraries/joomla/base/adapterinstance.php
new file mode 100644
index 00000000..54cd2e1c
--- /dev/null
+++ b/core/libraries/joomla/base/adapterinstance.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Adapter Instance Class
+ *
+ * @since  11.1
+ */
+class JAdapterInstance extends JObject
+{
+	/**
+	 * Parent
+	 *
+	 * @var    JAdapter
+	 * @since  11.1
+	 */
+	protected $parent = null;
+
+	/**
+	 * Database
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  11.1
+	 */
+	protected $db = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JAdapter         $parent   Parent object
+	 * @param   JDatabaseDriver  $db       Database object
+	 * @param   array            $options  Configuration Options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(JAdapter $parent, JDatabaseDriver $db, array $options = array())
+	{
+		// Set the properties from the options array that is passed in
+		$this->setProperties($options);
+
+		// Set the parent and db in case $options for some reason overrides it.
+		$this->parent = $parent;
+
+		// Pull in the global dbo in case something happened to it.
+		$this->db = $db ?: JFactory::getDbo();
+	}
+
+	/**
+	 * Retrieves the parent object
+	 *
+	 * @return  JAdapter parent
+	 *
+	 * @since   11.1
+	 */
+	public function getParent()
+	{
+		return $this->parent;
+	}
+}
diff --git a/core/libraries/joomla/controller/base.php b/core/libraries/joomla/controller/base.php
new file mode 100644
index 00000000..e087897a
--- /dev/null
+++ b/core/libraries/joomla/controller/base.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Controller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\AbstractApplication;
+
+/**
+ * Joomla Platform Base Controller Class
+ *
+ * @since  12.1
+ */
+abstract class JControllerBase implements JController
+{
+	/**
+	 * The application object.
+	 *
+	 * @var    AbstractApplication
+	 * @since  12.1
+	 */
+	protected $app;
+
+	/**
+	 * The input object.
+	 *
+	 * @var    JInput
+	 * @since  12.1
+	 */
+	protected $input;
+
+	/**
+	 * Instantiate the controller.
+	 *
+	 * @param   JInput               $input  The input object.
+	 * @param   AbstractApplication  $app    The application object.
+	 *
+	 * @since  12.1
+	 */
+	public function __construct(JInput $input = null, AbstractApplication $app = null)
+	{
+		// Setup dependencies.
+		$this->app = isset($app) ? $app : $this->loadApplication();
+		$this->input = isset($input) ? $input : $this->loadInput();
+	}
+
+	/**
+	 * Get the application object.
+	 *
+	 * @return  AbstractApplication  The application object.
+	 *
+	 * @since   12.1
+	 */
+	public function getApplication()
+	{
+		return $this->app;
+	}
+
+	/**
+	 * Get the input object.
+	 *
+	 * @return  JInput  The input object.
+	 *
+	 * @since   12.1
+	 */
+	public function getInput()
+	{
+		return $this->input;
+	}
+
+	/**
+	 * Serialize the controller.
+	 *
+	 * @return  string  The serialized controller.
+	 *
+	 * @since   12.1
+	 */
+	public function serialize()
+	{
+		return serialize($this->input);
+	}
+
+	/**
+	 * Unserialize the controller.
+	 *
+	 * @param   string  $input  The serialized controller.
+	 *
+	 * @return  JController  Supports chaining.
+	 *
+	 * @since   12.1
+	 * @throws  UnexpectedValueException if input is not the right class.
+	 */
+	public function unserialize($input)
+	{
+		// Setup dependencies.
+		$this->app = $this->loadApplication();
+
+		// Unserialize the input.
+		$this->input = unserialize($input);
+
+		if (!($this->input instanceof JInput))
+		{
+			throw new UnexpectedValueException(sprintf('%s::unserialize would not accept a `%s`.', get_class($this), gettype($this->input)));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Load the application object.
+	 *
+	 * @return  AbstractApplication  The application object.
+	 *
+	 * @since   12.1
+	 */
+	protected function loadApplication()
+	{
+		return JFactory::getApplication();
+	}
+
+	/**
+	 * Load the input object.
+	 *
+	 * @return  JInput  The input object.
+	 *
+	 * @since   12.1
+	 */
+	protected function loadInput()
+	{
+		return $this->app->input;
+	}
+}
diff --git a/core/libraries/joomla/controller/controller.php b/core/libraries/joomla/controller/controller.php
new file mode 100644
index 00000000..6d11750c
--- /dev/null
+++ b/core/libraries/joomla/controller/controller.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Controller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\AbstractApplication;
+
+/**
+ * Joomla Platform Controller Interface
+ *
+ * @since  12.1
+ */
+interface JController extends Serializable
+{
+	/**
+	 * Execute the controller.
+	 *
+	 * @return  boolean  True if controller finished execution, false if the controller did not
+	 *                   finish execution. A controller might return false if some precondition for
+	 *                   the controller to run has not been satisfied.
+	 *
+	 * @since   12.1
+	 * @throws  LogicException
+	 * @throws  RuntimeException
+	 */
+	public function execute();
+
+	/**
+	 * Get the application object.
+	 *
+	 * @return  AbstractApplication  The application object.
+	 *
+	 * @since   12.1
+	 */
+	public function getApplication();
+
+	/**
+	 * Get the input object.
+	 *
+	 * @return  JInput  The input object.
+	 *
+	 * @since   12.1
+	 */
+	public function getInput();
+}
diff --git a/core/libraries/joomla/database/database.php b/core/libraries/joomla/database/database.php
new file mode 100644
index 00000000..3f003049
--- /dev/null
+++ b/core/libraries/joomla/database/database.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Database connector class.
+ *
+ * @since       11.1
+ * @deprecated  13.3 (Platform) & 4.0 (CMS)
+ */
+abstract class JDatabase
+{
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public function query()
+	{
+		JLog::add('JDatabase::query() is deprecated, use JDatabaseDriver::execute() instead.', JLog::WARNING, 'deprecated');
+
+		return $this->execute();
+	}
+
+	/**
+	 * Get a list of available database connectors.  The list will only be populated with connectors that both
+	 * the class exists and the static test method returns true.  This gives us the ability to have a multitude
+	 * of connector classes that are self-aware as to whether or not they are able to be used on a given system.
+	 *
+	 * @return  array  An array of available database connectors.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function getConnectors()
+	{
+		JLog::add('JDatabase::getConnectors() is deprecated, use JDatabaseDriver::getConnectors() instead.', JLog::WARNING, 'deprecated');
+
+		return JDatabaseDriver::getConnectors();
+	}
+
+	/**
+	 * Gets the error message from the database connection.
+	 *
+	 * @param   boolean  $escaped  True to escape the message string for use in JavaScript.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 * @since   11.1
+	 */
+	public function getErrorMsg($escaped = false)
+	{
+		JLog::add('JDatabase::getErrorMsg() is deprecated, use exception handling instead.', JLog::WARNING, 'deprecated');
+
+		if ($escaped)
+		{
+			return addslashes($this->errorMsg);
+		}
+		else
+		{
+			return $this->errorMsg;
+		}
+	}
+
+	/**
+	 * Gets the error number from the database connection.
+	 *
+	 * @return      integer  The error number for the most recent query.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function getErrorNum()
+	{
+		JLog::add('JDatabase::getErrorNum() is deprecated, use exception handling instead.', JLog::WARNING, 'deprecated');
+
+		return $this->errorNum;
+	}
+
+	/**
+	 * Method to return a JDatabaseDriver instance based on the given options.  There are three global options and then
+	 * the rest are specific to the database driver.  The 'driver' option defines which JDatabaseDriver class is
+	 * used for the connection -- the default is 'mysqli'.  The 'database' option determines which database is to
+	 * be used for the connection.  The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   array  $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  JDatabaseDriver  A database object.
+	 *
+	 * @since       11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function getInstance($options = array())
+	{
+		JLog::add('JDatabase::getInstance() is deprecated, use JDatabaseDriver::getInstance() instead.', JLog::WARNING, 'deprecated');
+
+		return JDatabaseDriver::getInstance($options);
+	}
+
+	/**
+	 * Splits a string of multiple queries into an array of individual queries.
+	 *
+	 * @param   string  $query  Input SQL string with which to split into individual queries.
+	 *
+	 * @return  array  The queries from the input string separated into an array.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 */
+	public static function splitSql($query)
+	{
+		JLog::add('JDatabase::splitSql() is deprecated, use JDatabaseDriver::splitSql() instead.', JLog::WARNING, 'deprecated');
+
+		return JDatabaseDriver::splitSql($query);
+	}
+
+	/**
+	 * Return the most recent error message for the database connector.
+	 *
+	 * @param   boolean  $showSQL  True to display the SQL statement sent to the database as well as the error.
+	 *
+	 * @return  string  The error message for the most recent query.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public function stderr($showSQL = false)
+	{
+		JLog::add('JDatabase::stderr() is deprecated.', JLog::WARNING, 'deprecated');
+
+		if ($this->errorNum != 0)
+		{
+			return JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $this->errorNum, $this->errorMsg)
+			. ($showSQL ? "<br />SQL = <pre>$this->sql</pre>" : '');
+		}
+		else
+		{
+			return JText::_('JLIB_DATABASE_FUNCTION_NOERROR');
+		}
+	}
+
+	/**
+	 * Test to see if the connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use JDatabaseDriver::isSupported() instead.
+	 */
+	public static function test()
+	{
+		JLog::add('JDatabase::test() is deprecated. Use JDatabaseDriver::isSupported() instead.', JLog::WARNING, 'deprecated');
+
+		return static::isSupported();
+	}
+}
diff --git a/core/libraries/joomla/database/driver.php b/core/libraries/joomla/database/driver.php
new file mode 100644
index 00000000..f7710133
--- /dev/null
+++ b/core/libraries/joomla/database/driver.php
@@ -0,0 +1,2300 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Database Driver Class
+ *
+ * @since  12.1
+ *
+ * @method   string|array  q()   q($text, $escape = true)  Alias for quote method
+ * @method   string|array  qn()  qn($name, $as = null)     Alias for quoteName method
+ */
+abstract class JDatabaseDriver extends JDatabase implements JDatabaseInterface
+{
+	/**
+	 * The name of the database.
+	 *
+	 * @var    string
+	 * @since  11.4
+	 */
+	private $_database;
+
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $name;
+
+	/**
+	 * The type of the database server family supported by this driver. Examples: mysql, oracle, postgresql, mssql,
+	 * sqlite.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType;
+
+	/**
+	 * @var    resource  The database connection resource.
+	 * @since  11.1
+	 */
+	protected $connection;
+
+	/**
+	 * @var    integer  The number of SQL statements executed by the database driver.
+	 * @since  11.1
+	 */
+	protected $count = 0;
+
+	/**
+	 * @var    resource  The database connection cursor from the last query.
+	 * @since  11.1
+	 */
+	protected $cursor;
+
+	/**
+	 * @var    boolean  The database driver debugging state.
+	 * @since  11.1
+	 */
+	protected $debug = false;
+
+	/**
+	 * @var    integer  The affected row limit for the current SQL statement.
+	 * @since  11.1
+	 */
+	protected $limit = 0;
+
+	/**
+	 * @var    array  The log of executed SQL statements by the database driver.
+	 * @since  11.1
+	 */
+	protected $log = array();
+
+	/**
+	 * @var    array  The log of executed SQL statements timings (start and stop microtimes) by the database driver.
+	 * @since  CMS 3.1.2
+	 */
+	protected $timings = array();
+
+	/**
+	 * @var    array  The log of executed SQL statements timings (start and stop microtimes) by the database driver.
+	 * @since  CMS 3.1.2
+	 */
+	protected $callStacks = array();
+
+	/**
+	 * @var    string  The character(s) used to quote SQL statement names such as table names or field names,
+	 *                 etc.  The child classes should define this as necessary.  If a single character string the
+	 *                 same character is used for both sides of the quoted name, else the first character will be
+	 *                 used for the opening quote and the second for the closing quote.
+	 * @since  11.1
+	 */
+	protected $nameQuote;
+
+	/**
+	 * @var    string  The null or zero representation of a timestamp for the database driver.  This should be
+	 *                 defined in child classes to hold the appropriate value for the engine.
+	 * @since  11.1
+	 */
+	protected $nullDate;
+
+	/**
+	 * @var    integer  The affected row offset to apply for the current SQL statement.
+	 * @since  11.1
+	 */
+	protected $offset = 0;
+
+	/**
+	 * @var    array  Passed in upon instantiation and saved.
+	 * @since  11.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    JDatabaseQuery|string  The current SQL statement to execute.
+	 * @since  11.1
+	 */
+	protected $sql;
+
+	/**
+	 * @var    string  The common database table prefix.
+	 * @since  11.1
+	 */
+	protected $tablePrefix;
+
+	/**
+	 * @var    boolean  True if the database engine supports UTF-8 character encoding.
+	 * @since  11.1
+	 */
+	protected $utf = true;
+
+	/**
+	 * @var    boolean  True if the database engine supports UTF-8 Multibyte (utf8mb4) character encoding.
+	 * @since  CMS 3.5.0
+	 */
+	protected $utf8mb4 = false;
+
+	/**
+	 * @var         integer  The database error number
+	 * @since       11.1
+	 * @deprecated  12.1
+	 */
+	protected $errorNum = 0;
+
+	/**
+	 * @var         string  The database error message
+	 * @since       11.1
+	 * @deprecated  12.1
+	 */
+	protected $errorMsg;
+
+	/**
+	 * @var    array  JDatabaseDriver instances container.
+	 * @since  11.1
+	 */
+	protected static $instances = array();
+
+	/**
+	 * @var    string  The minimum supported database version.
+	 * @since  12.1
+	 */
+	protected static $dbMinimum;
+
+	/**
+	 * @var    integer  The depth of the current transaction.
+	 * @since  12.3
+	 */
+	protected $transactionDepth = 0;
+
+	/**
+	 * @var    callable[]  List of callables to call just before disconnecting database
+	 * @since  CMS 3.1.2
+	 */
+	protected $disconnectHandlers = array();
+
+	/**
+	 * Get a list of available database connectors.  The list will only be populated with connectors that both
+	 * the class exists and the static test method returns true.  This gives us the ability to have a multitude
+	 * of connector classes that are self-aware as to whether or not they are able to be used on a given system.
+	 *
+	 * @return  array  An array of available database connectors.
+	 *
+	 * @since   11.1
+	 */
+	public static function getConnectors()
+	{
+		$connectors = array();
+
+		// Get an iterator and loop trough the driver classes.
+		$iterator = new DirectoryIterator(__DIR__ . '/driver');
+
+		/* @type  $file  DirectoryIterator */
+		foreach ($iterator as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() != 'php')
+			{
+				continue;
+			}
+
+			// Derive the class name from the type.
+			$class = str_ireplace('.php', '', 'JDatabaseDriver' . ucfirst(trim($fileName)));
+
+			// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+			if (!class_exists($class))
+			{
+				continue;
+			}
+
+			// Sweet!  Our class exists, so now we just need to know if it passes its test method.
+			if ($class::isSupported())
+			{
+				// Connector names should not have file extensions.
+				$connectors[] = str_ireplace('.php', '', $fileName);
+			}
+		}
+
+		return $connectors;
+	}
+
+	/**
+	 * Method to return a JDatabaseDriver instance based on the given options.  There are three global options and then
+	 * the rest are specific to the database driver.  The 'driver' option defines which JDatabaseDriver class is
+	 * used for the connection -- the default is 'mysqli'.  The 'database' option determines which database is to
+	 * be used for the connection.  The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   array  $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  JDatabaseDriver  A database object.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public static function getInstance($options = array())
+	{
+		// Sanitize the database connector options.
+		$options['driver']   = (isset($options['driver'])) ? preg_replace('/[^A-Z0-9_\.-]/i', '', $options['driver']) : 'mysqli';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : null;
+		$options['select']   = (isset($options['select'])) ? $options['select'] : true;
+
+		// If the selected driver is `mysql` and we are on PHP 7 or greater, switch to the `mysqli` driver.
+		if ($options['driver'] === 'mysql' && PHP_MAJOR_VERSION >= 7)
+		{
+			// Check if we have support for the other MySQL drivers
+			$mysqliSupported   = JDatabaseDriverMysqli::isSupported();
+			$pdoMysqlSupported = JDatabaseDriverPdomysql::isSupported();
+
+			// If neither is supported, then the user cannot use MySQL; throw an exception
+			if (!$mysqliSupported && !$pdoMysqlSupported)
+			{
+				throw new JDatabaseExceptionUnsupported(
+					'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.'
+					. ' Also, this system does not support MySQLi or PDO MySQL.  Cannot instantiate database driver.'
+				);
+			}
+
+			// Prefer MySQLi as it is a closer replacement for the removed MySQL driver, otherwise use the PDO driver
+			if ($mysqliSupported)
+			{
+				JLog::add(
+					'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.  Trying `mysqli` instead.',
+					JLog::WARNING,
+					'deprecated'
+				);
+
+				$options['driver'] = 'mysqli';
+			}
+			else
+			{
+				JLog::add(
+					'The PHP `ext/mysql` extension is removed in PHP 7, cannot use the `mysql` driver.  Trying `pdomysql` instead.',
+					JLog::WARNING,
+					'deprecated'
+				);
+
+				$options['driver'] = 'pdomysql';
+			}
+		}
+
+		// Get the options signature for the database connector.
+		$signature = md5(serialize($options));
+
+		// If we already have a database connector instance for these options then just use that.
+		if (empty(self::$instances[$signature]))
+		{
+			// Derive the class name from the driver.
+			$class = 'JDatabaseDriver' . ucfirst(strtolower($options['driver']));
+
+			// If the class still doesn't exist we have nothing left to do but throw an exception.  We did our best.
+			if (!class_exists($class))
+			{
+				throw new JDatabaseExceptionUnsupported(sprintf('Unable to load Database Driver: %s', $options['driver']));
+			}
+
+			// Create our new JDatabaseDriver connector based on the options given.
+			try
+			{
+				$instance = new $class($options);
+			}
+			catch (RuntimeException $e)
+			{
+				throw new JDatabaseExceptionConnecting(sprintf('Unable to connect to the Database: %s', $e->getMessage()), $e->getCode(), $e);
+			}
+
+			// Set the new connector to the global instances based on signature.
+			self::$instances[$signature] = $instance;
+		}
+
+		return self::$instances[$signature];
+	}
+
+	/**
+	 * Splits a string of multiple queries into an array of individual queries.
+	 * Single line or line end comments and multi line comments are stripped off.
+	 *
+	 * @param   string  $sql  Input SQL string with which to split into individual queries.
+	 *
+	 * @return  array  The queries from the input string separated into an array.
+	 *
+	 * @since   11.1
+	 */
+	public static function splitSql($sql)
+	{
+		$start = 0;
+		$open = false;
+		$comment = false;
+		$endString = '';
+		$end = strlen($sql);
+		$queries = array();
+		$query = '';
+
+		for ($i = 0; $i < $end; $i++)
+		{
+			$current = substr($sql, $i, 1);
+			$current2 = substr($sql, $i, 2);
+			$current3 = substr($sql, $i, 3);
+			$lenEndString = strlen($endString);
+			$testEnd = substr($sql, $i, $lenEndString);
+
+			if ($current == '"' || $current == "'" || $current2 == '--'
+				|| ($current2 == '/*' && $current3 != '/*!' && $current3 != '/*+')
+				|| ($current == '#' && $current3 != '#__')
+				|| ($comment && $testEnd == $endString))
+			{
+				// Check if quoted with previous backslash
+				$n = 2;
+
+				while (substr($sql, $i - $n + 1, 1) == '\\' && $n < $i)
+				{
+					$n++;
+				}
+
+				// Not quoted
+				if ($n % 2 == 0)
+				{
+					if ($open)
+					{
+						if ($testEnd == $endString)
+						{
+							if ($comment)
+							{
+								$comment = false;
+								if ($lenEndString > 1)
+								{
+									$i += ($lenEndString - 1);
+									$current = substr($sql, $i, 1);
+								}
+								$start = $i + 1;
+							}
+							$open = false;
+							$endString = '';
+						}
+					}
+					else
+					{
+						$open = true;
+						if ($current2 == '--')
+						{
+							$endString = "\n";
+							$comment = true;
+						}
+						elseif ($current2 == '/*')
+						{
+							$endString = '*/';
+							$comment = true;
+						}
+						elseif ($current == '#')
+						{
+							$endString = "\n";
+							$comment = true;
+						}
+						else
+						{
+							$endString = $current;
+						}
+						if ($comment && $start < $i)
+						{
+							$query = $query . substr($sql, $start, ($i - $start));
+						}
+					}
+				}
+			}
+
+			if ($comment)
+			{
+				$start = $i + 1;
+			}
+
+			if (($current == ';' && !$open) || $i == $end - 1)
+			{
+				if ($start <= $i)
+				{
+					$query = $query . substr($sql, $start, ($i - $start + 1));
+				}
+				$query = trim($query);
+
+				if ($query)
+				{
+					if (($i == $end - 1) && ($current != ';'))
+					{
+						$query = $query . ';';
+					}
+					$queries[] = $query;
+				}
+
+				$query = '';
+				$start = $i + 1;
+			}
+		}
+
+		return $queries;
+	}
+
+	/**
+	 * Magic method to provide method alias support for quote() and quoteName().
+	 *
+	 * @param   string  $method  The called method.
+	 * @param   array   $args    The array of arguments passed to the method.
+	 *
+	 * @return  mixed  The aliased method's return value or null.
+	 *
+	 * @since   11.1
+	 */
+	public function __call($method, $args)
+	{
+		if (empty($args))
+		{
+			return;
+		}
+
+		switch ($method)
+		{
+			case 'q':
+				return $this->quote($args[0], isset($args[1]) ? $args[1] : true);
+				break;
+			case 'qn':
+				return $this->quoteName($args[0], isset($args[1]) ? $args[1] : null);
+				break;
+		}
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options)
+	{
+		// Initialise object variables.
+		$this->_database = (isset($options['database'])) ? $options['database'] : '';
+
+		$this->tablePrefix = (isset($options['prefix'])) ? $options['prefix'] : 'jos_';
+		$this->count = 0;
+		$this->errorNum = 0;
+		$this->log = array();
+
+		// Set class options.
+		$this->options = $options;
+	}
+
+	/**
+	 * Alter database's character set, obtaining query string from protected member.
+	 *
+	 * @param   string  $dbName  The database name that will be altered
+	 *
+	 * @return  string  The query that alter the database query string
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function alterDbCharacterSet($dbName)
+	{
+		if (is_null($dbName))
+		{
+			throw new RuntimeException('Database name must not be null.');
+		}
+
+		$this->setQuery($this->getAlterDbCharacterSet($dbName));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Alter a table's character set, obtaining an array of queries to do so from a protected method. The conversion is
+	 * wrapped in a transaction, if supported by the database driver. Otherwise the table will be locked before the
+	 * conversion. This prevents data corruption.
+	 *
+	 * @param   string   $tableName  The name of the table to alter
+	 * @param   boolean  $rethrow    True to rethrow database exceptions. Default: false (exceptions are suppressed)
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   CMS 3.5.0
+	 * @throws  RuntimeException  If the table name is empty
+	 * @throws  Exception  Relayed from the database layer if a database error occurs and $rethrow == true
+	 */
+	public function alterTableCharacterSet($tableName, $rethrow = false)
+	{
+		if (is_null($tableName))
+		{
+			throw new RuntimeException('Table name must not be null.');
+		}
+
+		$queries = $this->getAlterTableCharacterSet($tableName);
+
+		if (empty($queries))
+		{
+			return false;
+		}
+
+		$hasTransaction = true;
+
+		try
+		{
+			$this->transactionStart();
+		}
+		catch (Exception $e)
+		{
+			$hasTransaction = false;
+			$this->lockTable($tableName);
+		}
+
+		foreach ($queries as $query)
+		{
+			try
+			{
+				$this->setQuery($query)->execute();
+			}
+			catch (Exception $e)
+			{
+				if ($hasTransaction)
+				{
+					$this->transactionRollback();
+				}
+				else
+				{
+					$this->unlockTables();
+				}
+
+				if ($rethrow)
+				{
+					throw $e;
+				}
+
+				return false;
+			}
+		}
+
+		if ($hasTransaction)
+		{
+			try
+			{
+				$this->transactionCommit();
+			}
+			catch (Exception $e)
+			{
+				$this->transactionRollback();
+
+				if ($rethrow)
+				{
+					throw $e;
+				}
+
+				return false;
+			}
+		}
+		else
+		{
+			$this->unlockTables();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function connect();
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function connected();
+
+	/**
+	 * Create a new database using information from $options object, obtaining query string
+	 * from protected member.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 * 									This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function createDatabase($options, $utf = true)
+	{
+		if (is_null($options))
+		{
+			throw new RuntimeException('$options object must not be null.');
+		}
+		elseif (empty($options->db_name))
+		{
+			throw new RuntimeException('$options object must have db_name set.');
+		}
+		elseif (empty($options->db_user))
+		{
+			throw new RuntimeException('$options object must have db_user set.');
+		}
+
+		$this->setQuery($this->getCreateDatabaseQuery($options, $utf));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   3.8.0
+	 */
+	public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	abstract public function disconnect();
+
+	/**
+	 * Adds a function callable just before disconnecting the database. Parameter of the callable is $this JDatabaseDriver
+	 *
+	 * @param   callable  $callable  Function to call in disconnect() method just before disconnecting from database
+	 *
+	 * @return  void
+	 *
+	 * @since   CMS 3.1.2
+	 */
+	public function addDisconnectHandler($callable)
+	{
+		$this->disconnectHandlers[] = $callable;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $table     The name of the database table to drop.
+	 * @param   boolean  $ifExists  Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  JDatabaseDriver     Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	abstract public function dropTable($table, $ifExists = true);
+
+	/**
+	 * Escapes a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string   The escaped string.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function escape($text, $extra = false);
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function fetchArray($cursor = null);
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function fetchAssoc($cursor = null);
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function fetchObject($cursor = null, $class = 'stdClass');
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	abstract protected function freeResult($cursor = null);
+
+	/**
+	 * Get the number of affected rows for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getAffectedRows();
+
+	/**
+	 * Return the query string to alter the database character set.
+	 *
+	 * @param   string  $dbName  The database name
+	 *
+	 * @return  string  The query that alter the database query string
+	 *
+	 * @since   12.2
+	 */
+	public function getAlterDbCharacterSet($dbName)
+	{
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset . '`';
+	}
+
+	/**
+	 * Get the query strings to alter the character set and collation of a table.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string[]  The queries required to alter the table's character set and collation
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getAlterTableCharacterSet($tableName)
+	{
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+		$collation = $charset . '_unicode_ci';
+
+		$quotedTableName = $this->quoteName($tableName);
+
+		$queries = array();
+		$queries[] = "ALTER TABLE $quotedTableName CONVERT TO CHARACTER SET $charset COLLATE $collation";
+
+		/**
+		 * We also need to convert each text column, modifying their character set and collation. This allows us to
+		 * change, for example, a utf8_bin collated column to a utf8mb4_bin collated column.
+		 */
+		$sql = "SHOW FULL COLUMNS FROM $quotedTableName";
+		$this->setQuery($sql);
+		$columns = $this->loadAssocList();
+		$columnMods = array();
+
+		if (is_array($columns))
+		{
+			foreach ($columns as $column)
+			{
+				// Make sure we are redefining only columns which do support a collation
+				$col = (object) $column;
+
+				if (empty($col->Collation))
+				{
+					continue;
+				}
+
+				// Default new collation: utf8_unicode_ci or utf8mb4_unicode_ci
+				$newCollation = $charset . '_unicode_ci';
+				$collationParts = explode('_', $col->Collation);
+
+				/**
+				 * If the collation is in the form charset_collationType_ci or charset_collationType we have to change
+				 * the charset but leave the collationType intact (e.g. utf8_bin must become utf8mb4_bin, NOT
+				 * utf8mb4_general_ci).
+				 */
+				if (count($collationParts) >= 2)
+				{
+					$ci = array_pop($collationParts);
+					$collationType = array_pop($collationParts);
+					$newCollation = $charset . '_' . $collationType . '_' . $ci;
+
+					/**
+					 * When the last part of the old collation is not _ci we have a charset_collationType format,
+					 * something like utf8_bin. Therefore the new collation only has *two* parts.
+					 */
+					if ($ci != 'ci')
+					{
+						$newCollation = $charset . '_' . $ci;
+					}
+				}
+
+				// If the old and new collation is the same we don't have to change the collation type
+				if (strtolower($newCollation) == strtolower($col->Collation))
+				{
+					continue;
+				}
+
+				$null = $col->Null == 'YES' ? 'NULL' : 'NOT NULL';
+				$default = is_null($col->Default) ? '' : "DEFAULT '" . $this->q($col->Default) . "'";
+				$columnMods[] = "MODIFY COLUMN `{$col->Field}` {$col->Type} CHARACTER SET $charset COLLATE $newCollation $null $default";
+			}
+		}
+
+		if (count($columnMods))
+		{
+			$queries[] = "ALTER TABLE $quotedTableName " .
+				implode(',', $columnMods) .
+				" CHARACTER SET $charset COLLATE $collation";
+		}
+
+		return $queries;
+	}
+
+	/**
+	 * Automatically downgrade a CREATE TABLE or ALTER TABLE query from utf8mb4 (UTF-8 Multibyte) to plain utf8. Used
+	 * when the server doesn't support UTF-8 Multibyte.
+	 *
+	 * @param   string  $query  The query to convert
+	 *
+	 * @return  string  The converted query
+	 */
+	public function convertUtf8mb4QueryToUtf8($query)
+	{
+		if ($this->hasUTF8mb4Support())
+		{
+			return $query;
+		}
+
+		// If it's not an ALTER TABLE or CREATE TABLE command there's nothing to convert
+		if (!preg_match('/^(ALTER|CREATE)\s+TABLE\s+/i', $query))
+		{
+			return $query;
+		}
+
+		// Replace utf8mb4 with utf8 if not within single or double quotes or name quotes
+		return preg_replace('/[`"\'][^`"\']*[`"\'](*SKIP)(*FAIL)|utf8mb4/i', 'utf8', $query);
+	}
+
+	/**
+	 * Return the query string to create new Database.
+	 * Each database driver, other than MySQL, need to override this member to return correct string.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 *                   This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 */
+	protected function getCreateDatabaseQuery($options, $utf)
+	{
+		if ($utf)
+		{
+			$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+			$collation = $charset . '_unicode_ci';
+
+			return 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' CHARACTER SET `' . $charset . '` COLLATE `' . $collation . '`';
+		}
+
+		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getCollation();
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return '';
+	}
+
+	/**
+	 * Method that provides access to the underlying database connection. Useful for when you need to call a
+	 * proprietary method such as postgresql's lo_* methods.
+	 *
+	 * @return  resource  The underlying database connection resource.
+	 *
+	 * @since   11.1
+	 */
+	public function getConnection()
+	{
+		return $this->connection;
+	}
+
+	/**
+	 * Get the total number of SQL statements executed by the database driver.
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	public function getCount()
+	{
+		return $this->count;
+	}
+
+	/**
+	 * Gets the name of the database used by this conneciton.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.4
+	 */
+	protected function getDatabase()
+	{
+		return $this->_database;
+	}
+
+	/**
+	 * Returns a PHP date() function compliant date format for the database driver.
+	 *
+	 * @return  string  The format string.
+	 *
+	 * @since   11.1
+	 */
+	public function getDateFormat()
+	{
+		return 'Y-m-d H:i:s';
+	}
+
+	/**
+	 * Get the database driver SQL statement log.
+	 *
+	 * @return  array  SQL statements executed by the database driver.
+	 *
+	 * @since   11.1
+	 */
+	public function getLog()
+	{
+		return $this->log;
+	}
+
+	/**
+	 * Get the database driver SQL statement log.
+	 *
+	 * @return  array  SQL statements executed by the database driver.
+	 *
+	 * @since   CMS 3.1.2
+	 */
+	public function getTimings()
+	{
+		return $this->timings;
+	}
+
+	/**
+	 * Get the database driver SQL statement log.
+	 *
+	 * @return  array  SQL statements executed by the database driver.
+	 *
+	 * @since   CMS 3.1.2
+	 */
+	public function getCallStacks()
+	{
+		return $this->callStacks;
+	}
+
+	/**
+	 * Get the minimum supported database version.
+	 *
+	 * @return  string  The minimum version number for the database driver.
+	 *
+	 * @since   12.1
+	 */
+	public function getMinimum()
+	{
+		return static::$dbMinimum;
+	}
+
+	/**
+	 * Get the null or zero representation of a timestamp for the database driver.
+	 *
+	 * @return  string  Null or zero representation of a timestamp.
+	 *
+	 * @since   11.1
+	 */
+	public function getNullDate()
+	{
+		return $this->nullDate;
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getNumRows($cursor = null);
+
+	/**
+	 * Get the common table prefix for the database driver.
+	 *
+	 * @return  string  The common database table prefix.
+	 *
+	 * @since   11.1
+	 */
+	public function getPrefix()
+	{
+		return $this->tablePrefix;
+	}
+
+	/**
+	 * Gets an exporter class object.
+	 *
+	 * @return  JDatabaseExporter  An exporter object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getExporter()
+	{
+		// Derive the class name from the driver.
+		$class = 'JDatabaseExporter' . ucfirst($this->name);
+
+		// Make sure we have an exporter class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new JDatabaseExceptionUnsupported('Database Exporter not found.');
+		}
+
+		$o = new $class;
+		$o->setDbo($this);
+
+		return $o;
+	}
+
+	/**
+	 * Gets an importer class object.
+	 *
+	 * @return  JDatabaseImporter  An importer object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getImporter()
+	{
+		// Derive the class name from the driver.
+		$class = 'JDatabaseImporter' . ucfirst($this->name);
+
+		// Make sure we have an importer class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new JDatabaseExceptionUnsupported('Database Importer not found');
+		}
+
+		$o = new $class;
+		$o->setDbo($this);
+
+		return $o;
+	}
+
+	/**
+	 * Get the name of the database driver. If $this->name is not set it will try guessing the driver name from the
+	 * class name.
+	 *
+	 * @return  string
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$className = get_class($this);
+			$className = str_replace('JDatabaseDriver', '', $className);
+			$this->name = strtolower($className);
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Get the server family type, e.g. mysql, postgresql, oracle, sqlite, mssql. If $this->serverType is not set it
+	 * will attempt guessing the server family type from the driver name. If this is not possible the driver name will
+	 * be returned instead.
+	 *
+	 * @return  string
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getServerType()
+	{
+		if (empty($this->serverType))
+		{
+			$name = $this->getName();
+
+			if (stristr($name, 'mysql') !== false)
+			{
+				$this->serverType = 'mysql';
+			}
+			elseif (stristr($name, 'postgre') !== false)
+			{
+				$this->serverType = 'postgresql';
+			}
+			elseif (stristr($name, 'oracle') !== false)
+			{
+				$this->serverType = 'oracle';
+			}
+			elseif (stristr($name, 'sqlite') !== false)
+			{
+				$this->serverType = 'sqlite';
+			}
+			elseif (stristr($name, 'sqlsrv') !== false)
+			{
+				$this->serverType = 'mssql';
+			}
+			elseif (stristr($name, 'mssql') !== false)
+			{
+				$this->serverType = 'mssql';
+			}
+			else
+			{
+				$this->serverType = $name;
+			}
+		}
+
+		return $this->serverType;
+	}
+
+	/**
+	 * Get the current query object or a new JDatabaseQuery object.
+	 *
+	 * @param   boolean  $new  False to return the current query object, True to return a new JDatabaseQuery object.
+	 *
+	 * @return  JDatabaseQuery  The current query object or a new object extending the JDatabaseQuery class.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function getQuery($new = false)
+	{
+		if ($new)
+		{
+			// Derive the class name from the driver.
+			$class = 'JDatabaseQuery' . ucfirst($this->name);
+
+			// Make sure we have a query class for this driver.
+			if (!class_exists($class))
+			{
+				// If it doesn't exist we are at an impasse so throw an exception.
+				throw new JDatabaseExceptionUnsupported('Database Query Class not found.');
+			}
+
+			return new $class($this);
+		}
+		else
+		{
+			return $this->sql;
+		}
+	}
+
+	/**
+	 * Get a new iterator on the current query.
+	 *
+	 * @param   string  $column  An option column to use as the iterator key.
+	 * @param   string  $class   The class of object that is returned.
+	 *
+	 * @return  JDatabaseIterator  A new database iterator.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getIterator($column = null, $class = 'stdClass')
+	{
+		// Derive the class name from the driver.
+		$iteratorClass = 'JDatabaseIterator' . ucfirst($this->name);
+
+		// Make sure we have an iterator class for this driver.
+		if (!class_exists($iteratorClass))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new JDatabaseExceptionUnsupported(sprintf('class *%s* is not defined', $iteratorClass));
+		}
+
+		// Return a new iterator
+		return new $iteratorClass($this->execute(), $column, $class);
+	}
+
+	/**
+	 * Retrieves field information about the given tables.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True (default) to only return field types.
+	 *
+	 * @return  array  An array of fields by table.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableColumns($table, $typeOnly = true);
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableCreate($tables);
+
+	/**
+	 * Retrieves keys information about the given table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array   An array of keys for the table.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableKeys($table);
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function getTableList();
+
+	/**
+	 * Determine whether or not the database engine supports UTF-8 character encoding.
+	 *
+	 * @return  boolean  True if the database engine supports UTF-8 character encoding.
+	 *
+	 * @since   11.1
+	 * @deprecated 12.3 (Platform) & 4.0 (CMS) - Use hasUTFSupport() instead
+	 */
+	public function getUTFSupport()
+	{
+		JLog::add('JDatabaseDriver::getUTFSupport() is deprecated. Use JDatabaseDriver::hasUTFSupport() instead.', JLog::WARNING, 'deprecated');
+
+		return $this->hasUTFSupport();
+	}
+
+	/**
+	 * Determine whether or not the database engine supports UTF-8 character encoding.
+	 *
+	 * @return  boolean  True if the database engine supports UTF-8 character encoding.
+	 *
+	 * @since   12.1
+	 */
+	public function hasUTFSupport()
+	{
+		return $this->utf;
+	}
+
+	/**
+	 * Determine whether the database engine support the UTF-8 Multibyte (utf8mb4) character encoding. This applies to
+	 * MySQL databases.
+	 *
+	 * @return  boolean  True if the database engine supports UTF-8 Multibyte.
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function hasUTF8mb4Support()
+	{
+		return $this->utf8mb4;
+	}
+
+	/**
+	 * Get the version of the database connector
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function getVersion();
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  mixed  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function insertid();
+
+	/**
+	 * Inserts a row into a table based on an object's properties.
+	 *
+	 * @param   string  $table    The name of the database table to insert into.
+	 * @param   object  &$object  A reference to an object whose public properties match the table fields.
+	 * @param   string  $key      The name of the primary key. If provided the object property is updated.
+	 *
+	 * @return  boolean    True on success.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function insertObject($table, &$object, $key = null)
+	{
+		$fields = array();
+		$values = array();
+
+		// Iterate over the object variables to build the query fields and values.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process non-null scalars.
+			if (is_array($v) or is_object($v) or $v === null)
+			{
+				continue;
+			}
+
+			// Ignore any internal fields.
+			if ($k[0] == '_')
+			{
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			$fields[] = $this->quoteName($k);
+			$values[] = $this->quote($v);
+		}
+
+		// Create the base insert statement.
+		$query = $this->getQuery(true)
+			->insert($this->quoteName($table))
+			->columns($fields)
+			->values(implode(',', $values));
+
+		// Set the query and execute the insert.
+		$this->setQuery($query);
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		// Update the primary key if it exists.
+		$id = $this->insertid();
+
+		if ($key && $id && is_string($key))
+		{
+			$object->$key = $id;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to check whether the installed database version is supported by the database driver
+	 *
+	 * @return  boolean  True if the database version is supported
+	 *
+	 * @since   12.1
+	 */
+	public function isMinimumVersion()
+	{
+		return version_compare($this->getVersion(), static::$dbMinimum) >= 0;
+	}
+
+	/**
+	 * Method to get the first row of the result set from the database query as an associative array
+	 * of ['field_name' => 'row_value'].
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadAssoc()
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get the first row from the result set as an associative array.
+		if ($array = $this->fetchAssoc($cursor))
+		{
+			$ret = $array;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get an array of the result set rows from the database query where each row is an associative array
+	 * of ['field_name' => 'row_value'].  The array of rows can optionally be keyed by a field name, but defaults to
+	 * a sequential numeric array.
+	 *
+	 * NOTE: Chosing to key the result array by a non-unique field name can result in unwanted
+	 * behavior and should be avoided.
+	 *
+	 * @param   string  $key     The name of a field on which to key the result array.
+	 * @param   string  $column  An optional column name. Instead of the whole row, only this column value will be in
+	 * the result array.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadAssocList($key = null, $column = null)
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get all of the rows from the result set.
+		while ($row = $this->fetchAssoc($cursor))
+		{
+			$value = ($column) ? (isset($row[$column]) ? $row[$column] : $row) : $row;
+
+			if ($key)
+			{
+				$array[$row[$key]] = $value;
+			}
+			else
+			{
+				$array[] = $value;
+			}
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Method to get an array of values from the <var>$offset</var> field in each row of the result set from
+	 * the database query.
+	 *
+	 * @param   integer  $offset  The row offset to use to build the result array.
+	 *
+	 * @return  mixed    The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadColumn($offset = 0)
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get all of the rows from the result set as arrays.
+		while ($row = $this->fetchArray($cursor))
+		{
+			$array[] = $row[$offset];
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an object.
+	 *
+	 * @param   string  $class  The class name to use for the returned row object.
+	 *
+	 * @return  mixed   The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use getIterator() instead
+	 */
+	public function loadNextObject($class = 'stdClass')
+	{
+		JLog::add(__METHOD__ . '() is deprecated. Use JDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		$this->connect();
+
+		static $cursor = null;
+
+		// Execute the query and get the result set cursor.
+		if (is_null($cursor))
+		{
+			if (!($cursor = $this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchObject($cursor, $class))
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+		$cursor = null;
+
+		return false;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an array.
+	 *
+	 * @return  mixed  The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 * @deprecated  4.0 (CMS)  Use JDatabaseDriver::getIterator() instead
+	 */
+	public function loadNextRow()
+	{
+		JLog::add(__METHOD__ . '() is deprecated. Use JDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		$this->connect();
+
+		static $cursor = null;
+
+		// Execute the query and get the result set cursor.
+		if (is_null($cursor))
+		{
+			if (!($cursor = $this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchArray($cursor))
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+		$cursor = null;
+
+		return false;
+	}
+
+	/**
+	 * Method to get the first row of the result set from the database query as an object.
+	 *
+	 * @param   string  $class  The class name to use for the returned row object.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadObject($class = 'stdClass')
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get the first row from the result set as an object of type $class.
+		if ($object = $this->fetchObject($cursor, $class))
+		{
+			$ret = $object;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get an array of the result set rows from the database query where each row is an object.  The array
+	 * of objects can optionally be keyed by a field name, but defaults to a sequential numeric array.
+	 *
+	 * NOTE: Choosing to key the result array by a non-unique field name can result in unwanted
+	 * behavior and should be avoided.
+	 *
+	 * @param   string  $key    The name of a field on which to key the result array.
+	 * @param   string  $class  The class name to use for the returned row objects.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadObjectList($key = '', $class = 'stdClass')
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get all of the rows from the result set as objects of type $class.
+		while ($row = $this->fetchObject($cursor, $class))
+		{
+			if ($key)
+			{
+				$array[$row->$key] = $row;
+			}
+			else
+			{
+				$array[] = $row;
+			}
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Method to get the first field of the first row of the result set from the database query.
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadResult()
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get the first row from the result set as an array.
+		if ($row = $this->fetchArray($cursor))
+		{
+			$ret = $row[0];
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get the first row of the result set from the database query as an array.  Columns are indexed
+	 * numerically so the first column in the result set would be accessible via <var>$row[0]</var>, etc.
+	 *
+	 * @return  mixed  The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadRow()
+	{
+		$this->connect();
+
+		$ret = null;
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get the first row from the result set as an array.
+		if ($row = $this->fetchArray($cursor))
+		{
+			$ret = $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $ret;
+	}
+
+	/**
+	 * Method to get an array of the result set rows from the database query where each row is an array.  The array
+	 * of objects can optionally be keyed by a field offset, but defaults to a sequential numeric array.
+	 *
+	 * NOTE: Choosing to key the result array by a non-unique field can result in unwanted
+	 * behavior and should be avoided.
+	 *
+	 * @param   integer  $index  The index of a field on which to key the result array.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function loadRowList($index = null)
+	{
+		$this->connect();
+
+		$array = array();
+
+		// Execute the query and get the result set cursor.
+		if (!($cursor = $this->execute()))
+		{
+			return;
+		}
+
+		// Get all of the rows from the result set as arrays.
+		while ($row = $this->fetchArray($cursor))
+		{
+			if ($index !== null)
+			{
+				$array[$row[$index]] = $row;
+			}
+			else
+			{
+				$array[] = $row;
+			}
+		}
+
+		// Free up system resources and return.
+		$this->freeResult($cursor);
+
+		return $array;
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $tableName  The name of the table to unlock.
+	 *
+	 * @return  JDatabaseDriver     Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	abstract public function lockTable($tableName);
+
+	/**
+	 * Quotes and optionally escapes a string to database requirements for use in database queries.
+	 *
+	 * @param   mixed    $text    A string or an array of strings to quote.
+	 * @param   boolean  $escape  True (default) to escape the string, false to leave it unchanged.
+	 *
+	 * @return  string|array  The quoted input.
+	 *
+	 * @note    Accepting an array of strings was added in 12.3.
+	 * @since   11.1
+	 */
+	public function quote($text, $escape = true)
+	{
+		if (is_array($text))
+		{
+			foreach ($text as $k => $v)
+			{
+				$text[$k] = $this->quote($v, $escape);
+			}
+
+			return $text;
+		}
+		else
+		{
+			return '\'' . ($escape ? $this->escape($text) : $text) . '\'';
+		}
+	}
+
+	/**
+	 * Wrap an SQL statement identifier name such as column, table or database names in quotes to prevent injection
+	 * risks and reserved word conflicts.
+	 *
+	 * @param   mixed  $name  The identifier name to wrap in quotes, or an array of identifier names to wrap in quotes.
+	 *                        Each type supports dot-notation name.
+	 * @param   mixed  $as    The AS query part associated to $name. It can be string or array, in latter case it has to be
+	 *                        same length of $name; if is null there will not be any AS part for string or array element.
+	 *
+	 * @return  mixed  The quote wrapped name, same type of $name.
+	 *
+	 * @since   11.1
+	 */
+	public function quoteName($name, $as = null)
+	{
+		if (is_string($name))
+		{
+			$quotedName = $this->quoteNameStr(explode('.', $name));
+
+			$quotedAs = '';
+
+			if (!is_null($as))
+			{
+				settype($as, 'array');
+				$quotedAs .= ' AS ' . $this->quoteNameStr($as);
+			}
+
+			return $quotedName . $quotedAs;
+		}
+		else
+		{
+			$fin = array();
+
+			if (is_null($as))
+			{
+				foreach ($name as $str)
+				{
+					$fin[] = $this->quoteName($str);
+				}
+			}
+			elseif (is_array($name) && (count($name) == count($as)))
+			{
+				$count = count($name);
+
+				for ($i = 0; $i < $count; $i++)
+				{
+					$fin[] = $this->quoteName($name[$i], $as[$i]);
+				}
+			}
+
+			return $fin;
+		}
+	}
+
+	/**
+	 * Quote strings coming from quoteName call.
+	 *
+	 * @param   array  $strArr  Array of strings coming from quoteName dot-explosion.
+	 *
+	 * @return  string  Dot-imploded string of quoted parts.
+	 *
+	 * @since 11.3
+	 */
+	protected function quoteNameStr($strArr)
+	{
+		$parts = array();
+		$q = $this->nameQuote;
+
+		foreach ($strArr as $part)
+		{
+			if (is_null($part))
+			{
+				continue;
+			}
+
+			if (strlen($q) == 1)
+			{
+				$parts[] = $q . str_replace($q, $q . $q, $part) . $q;
+			}
+			else
+			{
+				$parts[] = $q{0} . str_replace($q{1}, $q{1} . $q{1}, $part) . $q{1};
+			}
+		}
+
+		return implode('.', $parts);
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $sql     The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   11.1
+	 */
+	public function replacePrefix($sql, $prefix = '#__')
+	{
+		$startPos = 0;
+		$literal = '';
+
+		$sql = trim($sql);
+		$n = strlen($sql);
+
+		while ($startPos < $n)
+		{
+			$ip = strpos($sql, $prefix, $startPos);
+
+			if ($ip === false)
+			{
+				break;
+			}
+
+			$j = strpos($sql, "'", $startPos);
+			$k = strpos($sql, '"', $startPos);
+
+			if (($k !== false) && (($k < $j) || ($j === false)))
+			{
+				$quoteChar = '"';
+				$j = $k;
+			}
+			else
+			{
+				$quoteChar = "'";
+			}
+
+			if ($j === false)
+			{
+				$j = $n;
+			}
+
+			$literal .= str_replace($prefix, $this->tablePrefix, substr($sql, $startPos, $j - $startPos));
+			$startPos = $j;
+
+			$j = $startPos + 1;
+
+			if ($j >= $n)
+			{
+				break;
+			}
+
+			// Quote comes first, find end of quote
+			while (true)
+			{
+				$k = strpos($sql, $quoteChar, $j);
+				$escaped = false;
+
+				if ($k === false)
+				{
+					break;
+				}
+
+				$l = $k - 1;
+
+				while ($l >= 0 && $sql{$l} == '\\')
+				{
+					$l--;
+					$escaped = !$escaped;
+				}
+
+				if ($escaped)
+				{
+					$j = $k + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			if ($k === false)
+			{
+				// Error in the query - no end quote; ignore it
+				break;
+			}
+
+			$literal .= substr($sql, $startPos, $k - $startPos + 1);
+			$startPos = $k + 1;
+		}
+
+		if ($startPos < $n)
+		{
+			$literal .= substr($sql, $startPos, $n - $startPos);
+		}
+
+		return $literal;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Table prefix
+	 * @param   string  $prefix    For the table - used to rename constraints in non-mysql databases
+	 *
+	 * @return  JDatabaseDriver    Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	abstract public function renameTable($oldTable, $newTable, $backup = null, $prefix = null);
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function select($database);
+
+	/**
+	 * Sets the database debugging state for the driver.
+	 *
+	 * @param   boolean  $level  True to enable debugging.
+	 *
+	 * @return  boolean  The old debugging level.
+	 *
+	 * @since   11.1
+	 */
+	public function setDebug($level)
+	{
+		$previous = $this->debug;
+		$this->debug = (bool) $level;
+
+		return $previous;
+	}
+
+	/**
+	 * Sets the SQL statement string for later execution.
+	 *
+	 * @param   mixed    $query   The SQL statement to set either as a JDatabaseQuery object or a string.
+	 * @param   integer  $offset  The affected row offset to set.
+	 * @param   integer  $limit   The maximum affected rows to set.
+	 *
+	 * @return  JDatabaseDriver  This object to support method chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function setQuery($query, $offset = 0, $limit = 0)
+	{
+		$this->sql = $query;
+
+		if ($query instanceof JDatabaseQueryLimitable)
+		{
+			if (!$limit && $query->limit)
+			{
+				$limit = $query->limit;
+			}
+
+			if (!$offset && $query->offset)
+			{
+				$offset = $query->offset;
+			}
+
+			$query->setLimit($limit, $offset);
+		}
+		else
+		{
+			$this->limit = (int) max(0, $limit);
+			$this->offset = (int) max(0, $offset);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	abstract public function setUtf();
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function transactionCommit($toSavepoint = false);
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function transactionRollback($toSavepoint = false);
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function transactionStart($asSavepoint = false);
+
+	/**
+	 * Method to truncate a table.
+	 *
+	 * @param   string  $table  The table to truncate
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 * @throws  RuntimeException
+	 */
+	public function truncateTable($table)
+	{
+		$this->setQuery('TRUNCATE TABLE ' . $this->quoteName($table));
+		$this->execute();
+	}
+
+	/**
+	 * Updates a row in a table based on an object's properties.
+	 *
+	 * @param   string   $table    The name of the database table to update.
+	 * @param   object   &$object  A reference to an object whose public properties match the table fields.
+	 * @param   array    $key      The name of the primary key.
+	 * @param   boolean  $nulls    True to update null fields or false to ignore them.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function updateObject($table, &$object, $key, $nulls = false)
+	{
+		$fields = array();
+		$where = array();
+
+		if (is_string($key))
+		{
+			$key = array($key);
+		}
+
+		if (is_object($key))
+		{
+			$key = (array) $key;
+		}
+
+		// Create the base update statement.
+		$statement = 'UPDATE ' . $this->quoteName($table) . ' SET %s WHERE %s';
+
+		// Iterate over the object variables to build the query fields/value pairs.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process scalars that are not internal fields.
+			if (is_array($v) || is_object($v) || $k[0] === '_')
+			{
+				continue;
+			}
+
+			// Set the primary key to the WHERE clause instead of a field to update.
+			if (in_array($k, $key))
+			{
+				$where[] = $this->quoteName($k) . ($v === null ? ' IS NULL' : ' = ' . $this->quote($v));
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			if ($v === null)
+			{
+				// If the value is null and we want to update nulls then set it.
+				if ($nulls)
+				{
+					$val = 'NULL';
+				}
+				// If the value is null and we do not want to update nulls then ignore this field.
+				else
+				{
+					continue;
+				}
+			}
+			// The field is not null so we prep it for update.
+			else
+			{
+				$val = $this->quote($v);
+			}
+
+			// Add the field to be updated.
+			$fields[] = $this->quoteName($k) . '=' . $val;
+		}
+
+		// We don't have any fields to update.
+		if (empty($fields))
+		{
+			return true;
+		}
+
+		// Set the query and execute the update.
+		$this->setQuery(sprintf($statement, implode(',', $fields), implode(' AND ', $where)));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	abstract public function execute();
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  JDatabaseDriver  Returns this object to support chaining.
+	 *
+	 * @since   11.4
+	 * @throws  RuntimeException
+	 */
+	abstract public function unlockTables();
+}
diff --git a/core/libraries/joomla/database/driver/mysql.php b/core/libraries/joomla/database/driver/mysql.php
new file mode 100644
index 00000000..c871efdf
--- /dev/null
+++ b/core/libraries/joomla/database/driver/mysql.php
@@ -0,0 +1,557 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL database driver
+ *
+ * @link        https://dev.mysql.com/doc/
+ * @since       12.1
+ * @deprecated  4.0  Use MySQLi or PDO MySQL instead
+ */
+class JDatabaseDriverMysql extends JDatabaseDriverMysqli
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'mysql';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  Array of database options with keys: host, user, password, database, select.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// PHP's `mysql` extension is not present in PHP 7, block instantiation in this environment
+		if (PHP_MAJOR_VERSION >= 7)
+		{
+			throw new JDatabaseExceptionUnsupported(
+				'This driver is unsupported in PHP 7, please use the MySQLi or PDO MySQL driver instead.'
+			);
+		}
+
+		// Get some basic values from the options.
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['select'] = (isset($options['select'])) ? (bool) $options['select'] : true;
+
+		// Finalize initialisation.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Make sure the MySQL extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new JDatabaseExceptionUnsupported('Make sure the MySQL extension for PHP is installed and enabled.');
+		}
+
+		// Attempt to connect to the server.
+		if (!($this->connection = @ mysql_connect($this->options['host'], $this->options['user'], $this->options['password'], true)))
+		{
+			throw new JDatabaseExceptionConnecting('Could not connect to MySQL server.');
+		}
+
+		// Set sql_mode to non_strict mode
+		mysql_query("SET @@SESSION.sql_mode = '';", $this->connection);
+
+		// If auto-select is enabled select the given database.
+		if ($this->options['select'] && !empty($this->options['database']))
+		{
+			$this->select($this->options['database']);
+		}
+
+		// Pre-populate the UTF-8 Multibyte compatibility flag based on server version
+		$this->utf8mb4 = $this->serverClaimsUtf8mb4Support();
+
+		// Set the character set (needed for MySQL 4.1.2+).
+		$this->utf = $this->setUtf();
+
+		// Turn MySQL profiling ON in debug mode:
+		if ($this->debug && $this->hasProfiling())
+		{
+			mysql_query('SET profiling = 1;', $this->connection);
+		}
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if (is_resource($this->connection))
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			mysql_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		$result = mysql_real_escape_string($text, $this->getConnection());
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test to see if the MySQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return PHP_MAJOR_VERSION < 7 && function_exists('mysql_connect');
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		if (is_resource($this->connection))
+		{
+			return @mysql_ping($this->connection);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return mysql_affected_rows($this->connection);
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by an INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		$this->connect();
+
+		return mysql_num_rows($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		return mysql_get_server_info($this->connection);
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  integer  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		return mysql_insert_id($this->connection);
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof JDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
+		}
+
+		if (!is_resource($this->connection))
+		{
+			JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			JLog::add($query, JLog::DEBUG, 'databasequery');
+
+			$this->timings[] = microtime(true);
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @mysql_query($query, $this->connection);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$this->errorNum = $this->getErrorNumber();
+			$this->errorMsg = $this->getErrorMessage();
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage();
+
+					// Throw the normal query exception.
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+					throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Throw the normal query exception.
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+				throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		if (!$database)
+		{
+			return false;
+		}
+
+		if (!mysql_select_db($database, $this->connection))
+		{
+			throw new JDatabaseExceptionConnecting('Could not connect to MySQL database.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		// If UTF is not supported return false immediately
+		if (!$this->utf)
+		{
+			return false;
+		}
+
+		// Make sure we're connected to the server
+		$this->connect();
+
+		// Which charset should I use, plain utf8 or multibyte utf8mb4?
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		$result = @mysql_set_charset($charset, $this->connection);
+
+		/**
+		 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise.
+		 * This happens on old MySQL server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd
+		 * masks the server version and reports only its own we can not be sure if the server actually does support
+		 * UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is undefined in this case we
+		 * catch the error and determine that utf8mb4 is not supported!
+		 */
+		if (!$result && $this->utf8mb4)
+		{
+			$this->utf8mb4 = false;
+			$result = @mysql_set_charset('utf8', $this->connection);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return mysql_fetch_row($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return mysql_fetch_assoc($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return mysql_fetch_object($cursor ? $cursor : $this->cursor, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		mysql_free_result($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Internal function to check if profiling is available
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1.3
+	 */
+	private function hasProfiling()
+	{
+		try
+		{
+			$res = mysql_query("SHOW VARIABLES LIKE 'have_profiling'", $this->connection);
+			$row = mysql_fetch_assoc($res);
+
+			return isset($row);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Does the database server claim to have support for UTF-8 Multibyte (utf8mb4) collation?
+	 *
+	 * libmysql supports utf8mb4 since 5.5.3 (same version as the MySQL server). mysqlnd supports utf8mb4 since 5.0.9.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	private function serverClaimsUtf8mb4Support()
+	{
+		$client_version = mysql_get_client_info();
+		$server_version = $this->getVersion();
+
+		if (version_compare($server_version, '5.5.3', '<'))
+		{
+			return false;
+		}
+		else
+		{
+			if (strpos($client_version, 'mysqlnd') !== false)
+			{
+				$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+
+				return version_compare($client_version, '5.0.9', '>=');
+			}
+			else
+			{
+				return version_compare($client_version, '5.5.3', '>=');
+			}
+		}
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) mysql_errno($this->connection);
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage()
+	{
+		$errorMessage = (string) mysql_error($this->connection);
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+		}
+
+		return $errorMessage;
+	}
+}
diff --git a/core/libraries/joomla/database/driver/mysqli.php b/core/libraries/joomla/database/driver/mysqli.php
new file mode 100644
index 00000000..e4876984
--- /dev/null
+++ b/core/libraries/joomla/database/driver/mysqli.php
@@ -0,0 +1,999 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQLi database driver
+ *
+ * @link   https://secure.php.net/manual/en/book.mysqli.php
+ * @since  12.1
+ */
+class JDatabaseDriverMysqli extends JDatabaseDriver
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'mysqli';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'mysql';
+
+	/**
+	 * @var    mysqli  The database connection resource.
+	 * @since  11.1
+	 */
+	protected $connection;
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc. The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $nameQuote = '`';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $nullDate = '0000-00-00 00:00:00';
+
+	/**
+	 * @var    string  The minimum supported database version.
+	 * @since  12.2
+	 */
+	protected static $dbMinimum = '5.0.4';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['host']     = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user']     = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['select']   = (isset($options['select'])) ? (bool) $options['select'] : true;
+		$options['port']     = (isset($options['port'])) ? (int) $options['port'] : null;
+		$options['socket']   = (isset($options['socket'])) ? $options['socket'] : null;
+
+		// Finalize initialisation.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		/*
+		 * Unlike mysql_connect(), mysqli_connect() takes the port and socket as separate arguments. Therefore, we
+		 * have to extract them from the host string.
+		 */
+		$port = isset($this->options['port']) ? $this->options['port'] : 3306;
+		$regex = '/^(?P<host>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:(?P<port>.+))?$/';
+
+		if (preg_match($regex, $this->options['host'], $matches))
+		{
+			// It's an IPv4 address with or without port
+			$this->options['host'] = $matches['host'];
+
+			if (!empty($matches['port']))
+			{
+				$port = $matches['port'];
+			}
+		}
+		elseif (preg_match('/^(?P<host>\[.*\])(:(?P<port>.+))?$/', $this->options['host'], $matches))
+		{
+			// We assume square-bracketed IPv6 address with or without port, e.g. [fe80:102::2%eth1]:3306
+			$this->options['host'] = $matches['host'];
+
+			if (!empty($matches['port']))
+			{
+				$port = $matches['port'];
+			}
+		}
+		elseif (preg_match('/^(?P<host>(\w+:\/{2,3})?[a-z0-9\.\-]+)(:(?P<port>[^:]+))?$/i', $this->options['host'], $matches))
+		{
+			// Named host (e.g example.com or localhost) with or without port
+			$this->options['host'] = $matches['host'];
+
+			if (!empty($matches['port']))
+			{
+				$port = $matches['port'];
+			}
+		}
+		elseif (preg_match('/^:(?P<port>[^:]+)$/', $this->options['host'], $matches))
+		{
+			// Empty host, just port, e.g. ':3306'
+			$this->options['host'] = 'localhost';
+			$port = $matches['port'];
+		}
+		// ... else we assume normal (naked) IPv6 address, so host and port stay as they are or default
+
+		// Get the port number or socket name
+		if (is_numeric($port))
+		{
+			$this->options['port'] = (int) $port;
+		}
+		else
+		{
+			$this->options['socket'] = $port;
+		}
+
+		// Make sure the MySQLi extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new JDatabaseExceptionUnsupported('The MySQLi extension for PHP is not installed or enabled.');
+		}
+
+		$this->connection = @mysqli_connect(
+			$this->options['host'], $this->options['user'], $this->options['password'], null, $this->options['port'], $this->options['socket']
+		);
+
+		// Attempt to connect to the server.
+		if (!$this->connection)
+		{
+			throw new JDatabaseExceptionConnecting('Could not connect to MySQL server.');
+		}
+
+		// Set sql_mode to non_strict mode
+		mysqli_query($this->connection, "SET @@SESSION.sql_mode = '';");
+
+		// If auto-select is enabled select the given database.
+		if ($this->options['select'] && !empty($this->options['database']))
+		{
+			$this->select($this->options['database']);
+		}
+
+		// Pre-populate the UTF-8 Multibyte compatibility flag based on server version
+		$this->utf8mb4 = $this->serverClaimsUtf8mb4Support();
+
+		// Set the character set (needed for MySQL 4.1.2+).
+		$this->utf = $this->setUtf();
+
+		// Turn MySQL profiling ON in debug mode:
+		if ($this->debug && $this->hasProfiling())
+		{
+			mysqli_query($this->connection, 'SET profiling_history_size = 100;');
+			mysqli_query($this->connection, 'SET profiling = 1;');
+		}
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if ($this->connection instanceof mysqli && $this->connection->stat() !== false)
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			mysqli_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		$result = mysqli_real_escape_string($this->getConnection(), $text);
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test to see if the MySQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return function_exists('mysqli_connect');
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		if (is_object($this->connection))
+		{
+			return mysqli_ping($this->connection);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  JDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$this->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $query->quoteName($tableName));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return mysqli_affected_rows($this->connection);
+	}
+
+	/**
+	 * Method to get the database collation.
+	 *
+	 * @return  mixed  The collation in use by the database (string) or boolean false if not supported.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_database"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_connection"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by an INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		return mysqli_num_rows($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		$result = array();
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		foreach ($tables as $table)
+		{
+			// Set the query to get the table CREATE statement.
+			$this->setQuery('SHOW CREATE table ' . $this->quoteName($this->escape($table)));
+			$row = $this->loadRow();
+
+			// Populate the result array based on the create statements.
+			$result[$table] = $row[1];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$result = array();
+
+		// Set the query to get the table fields statement.
+		$this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($this->escape($table)));
+		$fields = $this->loadObjectList();
+
+		// If we only want the type as the value add just that to the list.
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = preg_replace('/[(0-9)]/', '', $field->Type);
+			}
+		}
+		// If we want the whole field data object add that to the list.
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = $field;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// Get the details columns information.
+		$this->setQuery('SHOW KEYS FROM ' . $this->quoteName($table));
+		$keys = $this->loadObjectList();
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		// Set the query to get the tables statement.
+		$this->setQuery('SHOW TABLES');
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		return mysqli_get_server_info($this->connection);
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  mixed  The value of the auto-increment field from the last inserted row.
+	 *                 If the value is greater than maximal int value, it will return a string.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		return mysqli_insert_id($this->connection);
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  JDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		$this->setQuery('LOCK TABLES ' . $this->quoteName($table) . ' WRITE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof JDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query .= ' LIMIT ' . $this->offset . ', ' . $this->limit;
+		}
+
+		if (!is_object($this->connection))
+		{
+			JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+		$memoryBefore   = null;
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			JLog::add($query, JLog::DEBUG, 'databasequery');
+
+			$this->timings[] = microtime(true);
+
+			if (is_object($this->cursor))
+			{
+				// Avoid warning if result already freed by third-party library
+				@$this->freeResult();
+			}
+
+			$memoryBefore = memory_get_usage();
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @mysqli_query($this->connection, $query);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+
+			$this->callStacks[count($this->callStacks) - 1][0]['memory'] = array(
+				$memoryBefore,
+				memory_get_usage(),
+				is_object($this->cursor) ? $this->getNumRows() : null,
+			);
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$this->errorNum = $this->getErrorNumber();
+			$this->errorMsg = $this->getErrorMessage();
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage();
+
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+					throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+				throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by MySQL.
+	 * @param   string  $prefix    Not used by MySQL.
+	 *
+	 * @return  JDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('RENAME TABLE ' . $oldTable . ' TO ' . $newTable)->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		if (!$database)
+		{
+			return false;
+		}
+
+		if (!mysqli_select_db($this->connection, $database))
+		{
+			throw new JDatabaseExceptionConnecting('Could not connect to MySQL database.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		// If UTF is not supported return false immediately
+		if (!$this->utf)
+		{
+			return false;
+		}
+
+		// Make sure we're connected to the server
+		$this->connect();
+
+		// Which charset should I use, plain utf8 or multibyte utf8mb4?
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		$result = @$this->connection->set_charset($charset);
+
+		/**
+		 * If I could not set the utf8mb4 charset then the server doesn't support utf8mb4 despite claiming otherwise.
+		 * This happens on old MySQL server versions (less than 5.5.3) using the mysqlnd PHP driver. Since mysqlnd
+		 * masks the server version and reports only its own we can not be sure if the server actually does support
+		 * UTF-8 Multibyte (i.e. it's MySQL 5.5.3 or later). Since the utf8mb4 charset is undefined in this case we
+		 * catch the error and determine that utf8mb4 is not supported!
+		 */
+		if (!$result && $this->utf8mb4)
+		{
+			$this->utf8mb4 = false;
+			$result = @$this->connection->set_charset('utf8');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('COMMIT')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('ROLLBACK')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . ($this->transactionDepth - 1);
+		$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			if ($this->setQuery('START TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 1;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return mysqli_fetch_row($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return mysqli_fetch_assoc($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return mysqli_fetch_object($cursor ? $cursor : $this->cursor, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		mysqli_free_result($cursor ? $cursor : $this->cursor);
+
+		if ((! $cursor) || ($cursor === $this->cursor))
+		{
+			$this->cursor = null;
+		}
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  JDatabaseDriverMysqli  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->setQuery('UNLOCK TABLES')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Internal function to check if profiling is available
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1.3
+	 */
+	private function hasProfiling()
+	{
+		try
+		{
+			$res = mysqli_query($this->connection, "SHOW VARIABLES LIKE 'have_profiling'");
+			$row = mysqli_fetch_assoc($res);
+
+			return isset($row);
+		}
+		catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Does the database server claim to have support for UTF-8 Multibyte (utf8mb4) collation?
+	 *
+	 * libmysql supports utf8mb4 since 5.5.3 (same version as the MySQL server). mysqlnd supports utf8mb4 since 5.0.9.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	private function serverClaimsUtf8mb4Support()
+	{
+		$client_version = mysqli_get_client_info();
+		$server_version = $this->getVersion();
+
+		if (version_compare($server_version, '5.5.3', '<'))
+		{
+			return false;
+		}
+		else
+		{
+			if (strpos($client_version, 'mysqlnd') !== false)
+			{
+				$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+
+				return version_compare($client_version, '5.0.9', '>=');
+			}
+			else
+			{
+				return version_compare($client_version, '5.5.3', '>=');
+			}
+		}
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) mysqli_errno($this->connection);
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage()
+	{
+		$errorMessage = (string) mysqli_error($this->connection);
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+		}
+
+		return $errorMessage;
+	}
+}
diff --git a/core/libraries/joomla/database/driver/oracle.php b/core/libraries/joomla/database/driver/oracle.php
new file mode 100644
index 00000000..70035c8a
--- /dev/null
+++ b/core/libraries/joomla/database/driver/oracle.php
@@ -0,0 +1,730 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Oracle database driver
+ *
+ * @link   https://secure.php.net/pdo
+ * @since  12.1
+ */
+class JDatabaseDriverOracle extends JDatabaseDriverPdo
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'oracle';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'oracle';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '"';
+
+	/**
+	 * Returns the current dateformat
+	 *
+	 * @var   string
+	 * @since 12.1
+	 */
+	protected $dateformat;
+
+	/**
+	 * Returns the current character set
+	 *
+	 * @var   string
+	 * @since 12.1
+	 */
+	protected $charset;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		$options['driver'] = 'oci';
+		$options['charset']    = (isset($options['charset'])) ? $options['charset']   : 'AL32UTF8';
+		$options['dateformat'] = (isset($options['dateformat'])) ? $options['dateformat'] : 'RRRR-MM-DD HH24:MI:SS';
+
+		$this->charset = $options['charset'];
+		$this->dateformat = $options['dateformat'];
+
+		// Finalize initialisation
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		parent::connect();
+
+		if (isset($this->options['schema']))
+		{
+			$this->setQuery('ALTER SESSION SET CURRENT_SCHEMA = ' . $this->quoteName($this->options['schema']))->execute();
+		}
+
+		$this->setDateFormat($this->dateformat);
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		$this->freeResult();
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * Note: The IF EXISTS flag is unused in the Oracle driver.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  JDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true)
+			->setQuery('DROP TABLE :tableName');
+		$query->bind(':tableName', $tableName);
+
+		$this->setQuery($query);
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 */
+	public function getCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Get a query to run and verify the database is operational.
+	 *
+	 * @return  string  The query to check the health of the DB.
+	 *
+	 * @since   12.2
+	 */
+	public function getConnectedQuery()
+	{
+		return 'SELECT 1 FROM dual';
+	}
+
+	/**
+	 * Returns the current date format
+	 * This method should be useful in the case that
+	 * somebody actually wants to use a different
+	 * date format and needs to check what the current
+	 * one is to see if it needs to be changed.
+	 *
+	 * @return string The current date format
+	 *
+	 * @since 12.1
+	 */
+	public function getDateFormat()
+	{
+		return $this->dateformat;
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * Note: You must have the correct privileges before this method
+	 * will return usable results!
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		$result = array();
+		$query = $this->getQuery(true)
+			->select('dbms_metadata.get_ddl(:type, :tableName)')
+			->from('dual')
+			->bind(':type', 'TABLE');
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		foreach ($tables as $table)
+		{
+			$query->bind(':tableName', $table);
+			$this->setQuery($query);
+			$statement = (string) $this->loadResult();
+			$result[$table] = $statement;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$columns = array();
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+
+		$query->select('*');
+		$query->from('ALL_TAB_COLUMNS');
+		$query->where('table_name = :tableName');
+
+		$prefixedTable = str_replace('#__', strtoupper($this->tablePrefix), $table);
+		$query->bind(':tableName', $prefixedTable);
+		$this->setQuery($query);
+		$fields = $this->loadObjectList();
+
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$columns[$field->COLUMN_NAME] = $field->DATA_TYPE;
+			}
+		}
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$columns[$field->COLUMN_NAME] = $field;
+				$columns[$field->COLUMN_NAME]->Default = null;
+			}
+		}
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $columns;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+		$query->select('*')
+			->from('ALL_CONSTRAINTS')
+			->where('table_name = :tableName')
+			->bind(':tableName', $table);
+
+		$this->setQuery($query);
+		$keys = $this->loadObjectList();
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database (schema).
+	 *
+	 * @param   string   $databaseName         The database (schema) name
+	 * @param   boolean  $includeDatabaseName  Whether to include the schema name in the results
+	 *
+	 * @return  array    An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList($databaseName = null, $includeDatabaseName = false)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		if ($includeDatabaseName)
+		{
+			$query->select('owner, table_name');
+		}
+		else
+		{
+			$query->select('table_name');
+		}
+
+		$query->from('all_tables');
+
+		if ($databaseName)
+		{
+			$query->where('owner = :database')
+				->bind(':database', $databaseName);
+		}
+
+		$query->order('table_name');
+
+		$this->setQuery($query);
+
+		if ($includeDatabaseName)
+		{
+			$tables = $this->loadAssocList();
+		}
+		else
+		{
+			$tables = $this->loadColumn();
+		}
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		$this->setQuery("select value from nls_database_parameters where parameter = 'NLS_RDBMS_VERSION'");
+
+		return $this->loadResult();
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		return true;
+	}
+
+	/**
+	 * Sets the Oracle Date Format for the session
+	 * Default date format for Oracle is = DD-MON-RR
+	 * The default date format for this driver is:
+	 * 'RRRR-MM-DD HH24:MI:SS' since it is the format
+	 * that matches the MySQL one used within most Joomla
+	 * tables.
+	 *
+	 * @param   string  $dateFormat  Oracle Date Format String
+	 *
+	 * @return boolean
+	 *
+	 * @since  12.1
+	 */
+	public function setDateFormat($dateFormat = 'DD-MON-RR')
+	{
+		$this->connect();
+
+		$this->setQuery("ALTER SESSION SET NLS_DATE_FORMAT = '$dateFormat'");
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		$this->setQuery("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = '$dateFormat'");
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		$this->dateformat = $dateFormat;
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * Returns false automatically for the Oracle driver since
+	 * you can only set the character set when the connection
+	 * is created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		return false;
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  JDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		$this->setQuery('LOCK TABLE ' . $this->quoteName($table) . ' IN EXCLUSIVE MODE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by Oracle.
+	 * @param   string  $prefix    Not used by Oracle.
+	 *
+	 * @return  JDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('RENAME ' . $oldTable . ' TO ' . $newTable)->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  JDatabaseDriverOracle  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->setQuery('COMMIT')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Test to see if the PDO ODBC connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return class_exists('PDO') && in_array('oci', PDO::getAvailableDrivers());
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $query   The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   11.1
+	 */
+	public function replacePrefix($query, $prefix = '#__')
+	{
+		$startPos = 0;
+		$quoteChar = "'";
+		$literal = '';
+
+		$query = trim($query);
+		$n = strlen($query);
+
+		while ($startPos < $n)
+		{
+			$ip = strpos($query, $prefix, $startPos);
+
+			if ($ip === false)
+			{
+				break;
+			}
+
+			$j = strpos($query, "'", $startPos);
+
+			if ($j === false)
+			{
+				$j = $n;
+			}
+
+			$literal .= str_replace($prefix, $this->tablePrefix, substr($query, $startPos, $j - $startPos));
+			$startPos = $j;
+
+			$j = $startPos + 1;
+
+			if ($j >= $n)
+			{
+				break;
+			}
+
+			// Quote comes first, find end of quote
+			while (true)
+			{
+				$k = strpos($query, $quoteChar, $j);
+				$escaped = false;
+
+				if ($k === false)
+				{
+					break;
+				}
+
+				$l = $k - 1;
+
+				while ($l >= 0 && $query{$l} == '\\')
+				{
+					$l--;
+					$escaped = !$escaped;
+				}
+
+				if ($escaped)
+				{
+					$j = $k + 1;
+					continue;
+				}
+
+				break;
+			}
+
+			if ($k === false)
+			{
+				// Error in the query - no end quote; ignore it
+				break;
+			}
+
+			$literal .= substr($query, $startPos, $k - $startPos + 1);
+			$startPos = $k + 1;
+		}
+
+		if ($startPos < $n)
+		{
+			$literal .= substr($query, $startPos, $n - $startPos);
+		}
+
+		return $literal;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionCommit($toSavepoint);
+		}
+		else
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionRollback($toSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . ($this->transactionDepth - 1);
+			$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth--;
+			}
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			return parent::transactionStart($asSavepoint);
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Get the query strings to alter the character set and collation of a table.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string[]  The queries required to alter the table's character set and collation
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getAlterTableCharacterSet($tableName)
+	{
+		return array();
+	}
+
+	/**
+	 * Return the query string to create new Database.
+	 * Each database driver, other than MySQL, need to override this member to return correct string.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 *                   This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 */
+	protected function getCreateDatabaseQuery($options, $utf)
+	{
+		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
+	}
+}
diff --git a/core/libraries/joomla/database/driver/pdo.php b/core/libraries/joomla/database/driver/pdo.php
new file mode 100644
index 00000000..6f91f97c
--- /dev/null
+++ b/core/libraries/joomla/database/driver/pdo.php
@@ -0,0 +1,1063 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform PDO Database Driver Class
+ *
+ * @link   https://secure.php.net/pdo
+ * @since  12.1
+ */
+abstract class JDatabaseDriverPdo extends JDatabaseDriver
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'pdo';
+
+	/**
+	 * @var    PDO  The database connection resource.
+	 * @since  12.1
+	 */
+	protected $connection;
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = "'";
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nullDate = '0000-00-00 00:00:00';
+
+	/**
+	 * @var    resource  The prepared statement.
+	 * @since  12.1
+	 */
+	protected $prepared;
+
+	/**
+	 * Contains the current query execution status
+	 *
+	 * @var array
+	 * @since 12.1
+	 */
+	protected $executed = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['driver'] = (isset($options['driver'])) ? $options['driver'] : 'odbc';
+		$options['dsn'] = (isset($options['dsn'])) ? $options['dsn'] : '';
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['driverOptions'] = (isset($options['driverOptions'])) ? $options['driverOptions'] : array();
+
+		$hostParts = explode(':', $options['host']);
+
+		if (!empty($hostParts[1]))
+		{
+			$options['host'] = $hostParts[0];
+			$options['port'] = $hostParts[1];
+		}
+
+		// Finalize initialisation
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Make sure the PDO extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new JDatabaseExceptionUnsupported('PDO Extension is not available.', 1);
+		}
+
+		$replace = array();
+		$with = array();
+
+		// Find the correct PDO DSN Format to use:
+		switch ($this->options['driver'])
+		{
+			case 'cubrid':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 33000;
+
+				$format = 'cubrid:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			case 'dblib':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1433;
+
+				$format = 'dblib:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			case 'firebird':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 3050;
+
+				$format = 'firebird:dbname=#DBNAME#';
+
+				$replace = array('#DBNAME#');
+				$with = array($this->options['database']);
+
+				break;
+
+			case 'ibm':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 56789;
+
+				if (!empty($this->options['dsn']))
+				{
+					$format = 'ibm:DSN=#DSN#';
+
+					$replace = array('#DSN#');
+					$with = array($this->options['dsn']);
+				}
+				else
+				{
+					$format = 'ibm:hostname=#HOST#;port=#PORT#;database=#DBNAME#';
+
+					$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+					$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+				}
+
+				break;
+
+			case 'informix':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1526;
+				$this->options['protocol'] = (isset($this->options['protocol'])) ? $this->options['protocol'] : 'onsoctcp';
+
+				if (!empty($this->options['dsn']))
+				{
+					$format = 'informix:DSN=#DSN#';
+
+					$replace = array('#DSN#');
+					$with = array($this->options['dsn']);
+				}
+				else
+				{
+					$format = 'informix:host=#HOST#;service=#PORT#;database=#DBNAME#;server=#SERVER#;protocol=#PROTOCOL#';
+
+					$replace = array('#HOST#', '#PORT#', '#DBNAME#', '#SERVER#', '#PROTOCOL#');
+					$with = array($this->options['host'], $this->options['port'], $this->options['database'], $this->options['server'], $this->options['protocol']);
+				}
+
+				break;
+
+			case 'mssql':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1433;
+
+				$format = 'mssql:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			// The pdomysql case is a special case within the CMS environment
+			case 'pdomysql':
+			case 'mysql':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 3306;
+
+				$format = 'mysql:host=#HOST#;port=#PORT#;dbname=#DBNAME#;charset=#CHARSET#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#', '#CHARSET#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database'], $this->options['charset']);
+
+				break;
+
+			case 'oci':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1521;
+				$this->options['charset'] = (isset($this->options['charset'])) ? $this->options['charset'] : 'AL32UTF8';
+
+				if (!empty($this->options['dsn']))
+				{
+					$format = 'oci:dbname=#DSN#';
+
+					$replace = array('#DSN#');
+					$with = array($this->options['dsn']);
+				}
+				else
+				{
+					$format = 'oci:dbname=//#HOST#:#PORT#/#DBNAME#';
+
+					$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+					$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+				}
+
+				$format .= ';charset=' . $this->options['charset'];
+
+				break;
+
+			case 'odbc':
+				$format = 'odbc:DSN=#DSN#;UID:#USER#;PWD=#PASSWORD#';
+
+				$replace = array('#DSN#', '#USER#', '#PASSWORD#');
+				$with = array($this->options['dsn'], $this->options['user'], $this->options['password']);
+
+				break;
+
+			case 'pgsql':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 5432;
+
+				$format = 'pgsql:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+
+			case 'sqlite':
+				if (isset($this->options['version']) && $this->options['version'] == 2)
+				{
+					$format = 'sqlite2:#DBNAME#';
+				}
+				else
+				{
+					$format = 'sqlite:#DBNAME#';
+				}
+
+				$replace = array('#DBNAME#');
+				$with = array($this->options['database']);
+
+				break;
+
+			case 'sybase':
+				$this->options['port'] = (isset($this->options['port'])) ? $this->options['port'] : 1433;
+
+				$format = 'mssql:host=#HOST#;port=#PORT#;dbname=#DBNAME#';
+
+				$replace = array('#HOST#', '#PORT#', '#DBNAME#');
+				$with = array($this->options['host'], $this->options['port'], $this->options['database']);
+
+				break;
+		}
+
+		// Create the connection string:
+		$connectionString = str_replace($replace, $with, $format);
+
+		try
+		{
+			$this->connection = new PDO(
+				$connectionString,
+				$this->options['user'],
+				$this->options['password'],
+				$this->options['driverOptions']
+			);
+		}
+		catch (PDOException $e)
+		{
+			throw new JDatabaseExceptionConnecting('Could not connect to PDO: ' . $e->getMessage(), 2, $e);
+		}
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		foreach ($this->disconnectHandlers as $h)
+		{
+			call_user_func_array($h, array( &$this));
+		}
+
+		$this->freeResult();
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * Oracle escaping reference:
+	 * http://www.orafaq.com/wiki/SQL_FAQ#How_does_one_escape_special_characters_when_writing_SQL_queries.3F
+	 *
+	 * SQLite escaping notes:
+	 * http://www.sqlite.org/faq.html#q14
+	 *
+	 * Method body is as implemented by the Zend Framework
+	 *
+	 * Note: Using query objects with bound variables is
+	 * preferable to the below.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Unused optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		if (is_int($text) || is_float($text))
+		{
+			return $text;
+		}
+
+		$text = str_replace("'", "''", $text);
+
+		return addcslashes($text, "\000\n\r\\\032");
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @throws  Exception
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!is_object($this->connection))
+		{
+			JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			JLog::add($query, JLog::DEBUG, 'databasequery');
+
+			$this->timings[] = microtime(true);
+		}
+
+		// Execute the query.
+		$this->executed = false;
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			// Bind the variables:
+			if ($this->sql instanceof JDatabaseQueryPreparable)
+			{
+				$bounded = $this->sql->getBounded();
+
+				foreach ($bounded as $key => $obj)
+				{
+					$this->prepared->bindParam($key, $obj->value, $obj->dataType, $obj->length, $obj->driverOptions);
+				}
+			}
+
+			$this->executed = $this->prepared->execute();
+		}
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->executed)
+		{
+			// Get the error number and message before we execute any more queries.
+			$errorNum = $this->getErrorNumber();
+			$errorMsg = $this->getErrorMessage();
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage();
+
+					// Throw the normal query exception.
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+					throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Get the error number and message from before we tried to reconnect.
+				$this->errorNum = $errorNum;
+				$this->errorMsg = $errorMsg;
+
+				// Throw the normal query exception.
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+				throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->prepared;
+	}
+
+	/**
+	 * Retrieve a PDO database connection attribute
+	 *
+	 * Usage: $db->getOption(PDO::ATTR_CASE);
+	 *
+	 * @param   mixed  $key  One of the PDO::ATTR_* Constants
+	 *
+	 * @return  mixed
+	 *
+	 * @link    https://secure.php.net/manual/en/pdo.getattribute.php
+	 * @since   12.1
+	 */
+	public function getOption($key)
+	{
+		$this->connect();
+
+		return $this->connection->getAttribute($key);
+	}
+
+	/**
+	 * Get a query to run and verify the database is operational.
+	 *
+	 * @return  string  The query to check the health of the DB.
+	 *
+	 * @since   12.2
+	 */
+	public function getConnectedQuery()
+	{
+		return 'SELECT 1';
+	}
+
+	/**
+	 * Sets an attribute on the PDO database handle.
+	 *
+	 * Usage: $db->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+	 *
+	 * @param   integer  $key    One of the PDO::ATTR_* Constants
+	 * @param   mixed    $value  One of the associated PDO Constants related to the particular attribute key.
+	 *
+	 * @return  boolean
+	 *
+	 * @link   https://secure.php.net/manual/en/pdo.setattribute.php
+	 * @since   12.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->connect();
+
+		return $this->connection->setAttribute($key, $value);
+	}
+
+	/**
+	 * Test to see if the PDO extension is available.
+	 * Override as needed to check for specific PDO Drivers.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return defined('PDO::ATTR_DRIVER_NAME');
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		// Flag to prevent recursion into this function.
+		static $checkingConnected = false;
+
+		if ($checkingConnected)
+		{
+			// Reset this flag and throw an exception.
+			$checkingConnected = true;
+			die('Recursion trying to check if connected.');
+		}
+
+		// Backup the query state.
+		$query = $this->sql;
+		$limit = $this->limit;
+		$offset = $this->offset;
+		$prepared = $this->prepared;
+
+		try
+		{
+			// Set the checking connection flag.
+			$checkingConnected = true;
+
+			// Run a simple query to check the connection.
+			$this->setQuery($this->getConnectedQuery());
+			$status = (bool) $this->loadResult();
+		}
+		// If we catch an exception here, we must not be connected.
+		catch (Exception $e)
+		{
+			$status = false;
+		}
+
+		// Restore the query state.
+		$this->sql = $query;
+		$this->limit = $limit;
+		$this->offset = $offset;
+		$this->prepared = $prepared;
+		$checkingConnected = false;
+
+		return $status;
+	}
+
+	/**
+	 * Get the number of affected rows for the previous executed SQL statement.
+	 * Only applicable for DELETE, INSERT, or UPDATE statements.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->rowCount();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * Only applicable for DELETE, INSERT, or UPDATE statements.
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		$this->connect();
+
+		if ($cursor instanceof PDOStatement)
+		{
+			return $cursor->rowCount();
+		}
+		elseif ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->rowCount();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  string  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		// Error suppress this to prevent PDO warning us that the driver doesn't support this operation.
+		return @$this->connection->lastInsertId();
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		return true;
+	}
+
+	/**
+	 * Sets the SQL statement string for later execution.
+	 *
+	 * @param   mixed    $query          The SQL statement to set either as a JDatabaseQuery object or a string.
+	 * @param   integer  $offset         The affected row offset to set.
+	 * @param   integer  $limit          The maximum affected rows to set.
+	 * @param   array    $driverOptions  The optional PDO driver options.
+	 *
+	 * @return  JDatabaseDriver  This object to support method chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setQuery($query, $offset = null, $limit = null, $driverOptions = array())
+	{
+		$this->connect();
+
+		$this->freeResult();
+
+		if (is_string($query))
+		{
+			// Allows taking advantage of bound variables in a direct query:
+			$query = $this->getQuery(true)->setQuery($query);
+		}
+
+		if ($query instanceof JDatabaseQueryLimitable && !is_null($offset) && !is_null($limit))
+		{
+			$query = $query->processLimit($query, $limit, $offset);
+		}
+
+		// Create a stringified version of the query (with prefixes replaced):
+		$sql = $this->replacePrefix((string) $query);
+
+		// Use the stringified version in the prepare call:
+		$this->prepared = $this->connection->prepare($sql, $driverOptions);
+
+		// Store reference to the original JDatabaseQuery instance within the class.
+		// This is important since binding variables depends on it within execute():
+		parent::setQuery($query, $offset, $limit);
+
+		return $this;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		return false;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth == 1)
+		{
+			$this->connection->commit();
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth == 1)
+		{
+			$this->connection->rollBack();
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			$this->connection->beginTransaction();
+		}
+
+		$this->transactionDepth++;
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		if (!empty($cursor) && $cursor instanceof PDOStatement)
+		{
+			return $cursor->fetch(PDO::FETCH_NUM);
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->fetch(PDO::FETCH_NUM);
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		if (!empty($cursor) && $cursor instanceof PDOStatement)
+		{
+			return $cursor->fetch(PDO::FETCH_ASSOC);
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->fetch(PDO::FETCH_ASSOC);
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   Unused, only necessary so method signature will be the same as parent.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		if (!empty($cursor) && $cursor instanceof PDOStatement)
+		{
+			return $cursor->fetchObject($class);
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			return $this->prepared->fetchObject($class);
+		}
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		$this->executed = false;
+
+		if ($cursor instanceof PDOStatement)
+		{
+			$cursor->closeCursor();
+			$cursor = null;
+		}
+
+		if ($this->prepared instanceof PDOStatement)
+		{
+			$this->prepared->closeCursor();
+			$this->prepared = null;
+		}
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an object.
+	 *
+	 * @param   string  $class  The class name to use for the returned row object.
+	 *
+	 * @return  mixed   The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @deprecated  4.0 (CMS)  Use getIterator() instead
+	 */
+	public function loadNextObject($class = 'stdClass')
+	{
+		JLog::add(__METHOD__ . '() is deprecated. Use JDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		$this->connect();
+
+		// Execute the query and get the result set cursor.
+		if (!$this->executed)
+		{
+			if (!($this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchObject(null, $class))
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult();
+
+		return false;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an array.
+	 *
+	 * @return  mixed  The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function loadNextAssoc()
+	{
+		$this->connect();
+
+		// Execute the query and get the result set cursor.
+		if (!$this->executed)
+		{
+			if (!($this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchAssoc())
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult();
+
+		return false;
+	}
+
+	/**
+	 * Method to get the next row in the result set from the database query as an array.
+	 *
+	 * @return  mixed  The result of the query as an array, false if there are no more rows.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @deprecated  4.0 (CMS)  Use getIterator() instead
+	 */
+	public function loadNextRow()
+	{
+		JLog::add(__METHOD__ . '() is deprecated. Use JDatabaseDriver::getIterator() instead.', JLog::WARNING, 'deprecated');
+		$this->connect();
+
+		// Execute the query and get the result set cursor.
+		if (!$this->executed)
+		{
+			if (!($this->execute()))
+			{
+				return $this->errorNum ? null : false;
+			}
+		}
+
+		// Get the next row from the result set as an object of type $class.
+		if ($row = $this->fetchArray())
+		{
+			return $row;
+		}
+
+		// Free up system resources and return.
+		$this->freeResult();
+
+		return false;
+	}
+
+	/**
+	 * PDO does not support serialize
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function __sleep()
+	{
+		$serializedProperties = array();
+
+		$reflect = new ReflectionClass($this);
+
+		// Get properties of the current class
+		$properties = $reflect->getProperties();
+
+		foreach ($properties as $property)
+		{
+			// Do not serialize properties that are PDO
+			if ($property->isStatic() == false && !($this->{$property->name} instanceof PDO))
+			{
+				$serializedProperties[] = $property->name;
+			}
+		}
+
+		return $serializedProperties;
+	}
+
+	/**
+	 * Wake up after serialization
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function __wakeup()
+	{
+		// Get connection back
+		$this->__construct($this->options);
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		return (int) $this->connection->errorCode();
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage()
+	{
+		// The SQL Error Information
+		$errorInfo = implode(', ', $this->connection->errorInfo());
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorInfo = str_replace($this->tablePrefix, '#__', $errorInfo);
+		}
+
+		return $errorInfo;
+	}
+}
diff --git a/core/libraries/joomla/database/driver/pdomysql.php b/core/libraries/joomla/database/driver/pdomysql.php
new file mode 100644
index 00000000..057dadbf
--- /dev/null
+++ b/core/libraries/joomla/database/driver/pdomysql.php
@@ -0,0 +1,574 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL database driver supporting PDO based connections
+ *
+ * @link   https://secure.php.net/manual/en/ref.pdo-mysql.php
+ * @since  3.4
+ */
+class JDatabaseDriverPdomysql extends JDatabaseDriverPdo
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	public $name = 'pdomysql';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'mysql';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc. The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $nameQuote = '`';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $nullDate = '0000-00-00 00:00:00';
+
+	/**
+	 * The minimum supported database version.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected static $dbMinimum = '5.0.4';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  Array of database options with keys: host, user, password, database, select.
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['driver']  = 'mysql';
+
+		if (!isset($options['charset']) || $options['charset'] == 'utf8')
+		{
+			$options['charset'] = 'utf8mb4';
+		}
+
+		/**
+		 * Pre-populate the UTF-8 Multibyte compatibility flag. Unfortunately PDO won't report the server version
+		 * unless we're connected to it, and we cannot connect to it unless we know if it supports utf8mb4, which requires
+		 * us knowing the server version. Because of this chicken and egg issue, we _assume_ it's supported and we'll just
+		 * catch any problems at connection time.
+		 */
+		$this->utf8mb4 = ($options['charset'] == 'utf8mb4');
+
+		// Finalize initialisation.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		try
+		{
+			// Try to connect to MySQL
+			parent::connect();
+		}
+		catch (\RuntimeException $e)
+		{
+			// If the connection failed, but not because of the wrong character set, then bubble up the exception.
+			if (!$this->utf8mb4)
+			{
+				throw $e;
+			}
+
+			/*
+			 * Otherwise, try connecting again without using
+			 * utf8mb4 and see if maybe that was the problem. If the
+			 * connection succeeds, then we will have learned that the
+			 * client end of the connection does not support utf8mb4.
+  			 */
+			$this->utf8mb4 = false;
+			$this->options['charset'] = 'utf8';
+
+			parent::connect();
+		}
+
+		if ($this->utf8mb4)
+		{
+			/*
+ 			 * At this point we know the client supports utf8mb4.  Now
+ 			 * we must check if the server supports utf8mb4 as well.
+ 			 */
+			$serverVersion = $this->connection->getAttribute(PDO::ATTR_SERVER_VERSION);
+			$this->utf8mb4 = version_compare($serverVersion, '5.5.3', '>=');
+
+			if (!$this->utf8mb4)
+			{
+				// Reconnect with the utf8 character set.
+				parent::disconnect();
+				$this->options['charset'] = 'utf8';
+				parent::connect();
+			}
+		}
+
+		$this->connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		$this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+
+		// Set sql_mode to non_strict mode
+		$this->connection->query("SET @@SESSION.sql_mode = '';");
+	}
+
+	/**
+	 * Test to see if the MySQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   3.4
+	 */
+	public static function isSupported()
+	{
+		return class_exists('PDO') && in_array('mysql', PDO::getAvailableDrivers());
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  JDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$query->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $this->quoteName($tableName));
+
+		$this->setQuery($query);
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		$this->setQuery('USE ' . $this->quoteName($database));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database (string) or boolean false if not supported.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_database"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		$this->connect();
+
+		// Attempt to get the database collation by accessing the server system variable.
+		$this->setQuery('SHOW VARIABLES LIKE "collation_connection"');
+		$result = $this->loadObject();
+
+		if (property_exists($result, 'Value'))
+		{
+			return $result->Value;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		// Initialise variables.
+		$result = array();
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		foreach ($tables as $table)
+		{
+			$this->setQuery('SHOW CREATE TABLE ' . $this->quoteName($table));
+
+			$row = $this->loadRow();
+
+			// Populate the result array based on the create statements.
+			$result[$table] = $row[1];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$result = array();
+
+		// Set the query to get the table fields statement.
+		$this->setQuery('SHOW FULL COLUMNS FROM ' . $this->quoteName($table));
+
+		$fields = $this->loadObjectList();
+
+		// If we only want the type as the value add just that to the list.
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = preg_replace('/[(0-9)]/', '', $field->Type);
+			}
+		}
+		// If we want the whole field data object add that to the list.
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = $field;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// Get the details columns information.
+		$this->setQuery('SHOW KEYS FROM ' . $this->quoteName($table));
+
+		$keys = $this->loadObjectList();
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		// Set the query to get the tables statement.
+		$this->setQuery('SHOW TABLES');
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   3.4
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		return $this->getOption(PDO::ATTR_SERVER_VERSION);
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  JDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		$this->setQuery('LOCK TABLES ' . $this->quoteName($table) . ' WRITE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by MySQL.
+	 * @param   string  $prefix    Not used by MySQL.
+	 *
+	 * @return  JDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('RENAME TABLE ' . $this->quoteName($oldTable) . ' TO ' . $this->quoteName($newTable));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * Oracle escaping reference:
+	 * http://www.orafaq.com/wiki/SQL_FAQ#How_does_one_escape_special_characters_when_writing_SQL_queries.3F
+	 *
+	 * SQLite escaping notes:
+	 * http://www.sqlite.org/faq.html#q14
+	 *
+	 * Method body is as implemented by the Zend Framework
+	 *
+	 * Note: Using query objects with bound variables is
+	 * preferable to the below.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Unused optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   3.4
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		if (is_int($text) || is_float($text))
+		{
+			return $text;
+		}
+
+		$result = substr($this->connection->quote($text), 1, -1);
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  JDatabaseDriverPdomysql  Returns this object to support chaining.
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->setQuery('UNLOCK TABLES')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionCommit($toSavepoint);
+		}
+		else
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionRollback($toSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . ($this->transactionDepth - 1);
+			$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth--;
+			}
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			parent::transactionStart($asSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . $this->transactionDepth;
+			$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth++;
+			}
+		}
+	}
+}
diff --git a/core/libraries/joomla/database/driver/postgresql.php b/core/libraries/joomla/database/driver/postgresql.php
new file mode 100644
index 00000000..d47c5fdf
--- /dev/null
+++ b/core/libraries/joomla/database/driver/postgresql.php
@@ -0,0 +1,1561 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PostgreSQL database driver
+ *
+ * @since  12.1
+ */
+class JDatabaseDriverPostgresql extends JDatabaseDriver
+{
+	/**
+	 * The database driver name
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'postgresql';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'postgresql';
+
+	/**
+	 * Quote for named objects
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '"';
+
+	/**
+	 * The null/zero date string
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nullDate = '1970-01-01 00:00:00';
+
+	/**
+	 * The minimum supported database version.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected static $dbMinimum = '8.3.18';
+
+	/**
+	 * Operator used for concatenation
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $concat_operator = '||';
+
+	/**
+	 * JDatabaseDriverPostgresqlQuery object returned by getQuery
+	 *
+	 * @var    JDatabaseQueryPostgresql
+	 * @since  12.1
+	 */
+	protected $queryObject = null;
+
+	/**
+	 * Database object constructor
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since	12.1
+	 */
+	public function __construct($options)
+	{
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+
+		// Finalize initialization
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Make sure the postgresql extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new JDatabaseExceptionUnsupported('The pgsql extension for PHP is not installed or enabled.');
+		}
+
+		// Build the DSN for the connection.
+		$dsn = '';
+
+		if (!empty($this->options['host']))
+		{
+			$dsn .= "host={$this->options['host']} ";
+		}
+
+		$dsn .= "dbname={$this->options['database']} user={$this->options['user']} password={$this->options['password']}";
+
+		// Attempt to connect to the server.
+		if (!($this->connection = @pg_connect($dsn)))
+		{
+			throw new JDatabaseExceptionConnecting('Error connecting to PGSQL database.');
+		}
+
+		pg_set_error_verbosity($this->connection, PGSQL_ERRORS_DEFAULT);
+		pg_query($this->connection, 'SET standard_conforming_strings=off');
+		pg_query($this->connection, 'SET escape_string_warning=off');
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if (is_resource($this->connection))
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			pg_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$this->connect();
+
+		$result = pg_escape_string($this->connection, $text);
+
+		if ($extra)
+		{
+			$result = addcslashes($result, '%_');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Test to see if the PostgreSQL connector is available
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function test()
+	{
+		return function_exists('pg_connect');
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return	boolean
+	 *
+	 * @since	12.1
+	 */
+	public function connected()
+	{
+		$this->connect();
+
+		if (is_resource($this->connection))
+		{
+			return pg_ping($this->connection);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$this->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $this->quoteName($tableName));
+		$this->execute();
+
+		return true;
+	}
+
+	/**
+	 * Get the number of affected rows by the last INSERT, UPDATE, REPLACE or DELETE for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows in the previous operation
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return pg_affected_rows($this->cursor);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getCollation()
+	{
+		$this->connect();
+
+		$this->setQuery('SHOW LC_COLLATE');
+		$array = $this->loadAssocList();
+
+		return $array[0]['lc_collate'];
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return pg_client_encoding($this->connection);
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 * This command is only valid for statements like SELECT or SHOW that return an actual result set.
+	 * To retrieve the number of rows affected by an INSERT, UPDATE, REPLACE or DELETE query, use getAffectedRows().
+	 *
+	 * @param   resource  $cur  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cur = null)
+	{
+		$this->connect();
+
+		return pg_num_rows((int) $cur ? $cur : $this->cursor);
+	}
+
+	/**
+	 * Get the current or query, or new JDatabaseQuery object.
+	 *
+	 * @param   boolean  $new    False to return the last query set, True to return a new JDatabaseQuery object.
+	 * @param   boolean  $asObj  False to return last query as string, true to get JDatabaseQueryPostgresql object.
+	 *
+	 * @return  JDatabaseQuery  The current query object or a new object extending the JDatabaseQuery class.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getQuery($new = false, $asObj = false)
+	{
+		if ($new)
+		{
+			// Make sure we have a query class for this driver.
+			if (!class_exists('JDatabaseQueryPostgresql'))
+			{
+				throw new JDatabaseExceptionUnsupported('JDatabaseQueryPostgresql Class not found.');
+			}
+
+			$this->queryObject = new JDatabaseQueryPostgresql($this);
+
+			return $this->queryObject;
+		}
+		else
+		{
+			if ($asObj)
+			{
+				return $this->queryObject;
+			}
+			else
+			{
+				return $this->sql;
+			}
+		}
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * This is unsuported by PostgreSQL.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  string  An empty char because this function is not supported by PostgreSQL.
+	 *
+	 * @since   12.1
+	 */
+	public function getTableCreate($tables)
+	{
+		return '';
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$result = array();
+
+		$tableSub = $this->replacePrefix($table);
+
+		$this->setQuery('
+			SELECT a.attname AS "column_name",
+				pg_catalog.format_type(a.atttypid, a.atttypmod) as "type",
+				CASE WHEN a.attnotnull IS TRUE
+					THEN \'NO\'
+					ELSE \'YES\'
+				END AS "null",
+				CASE WHEN pg_catalog.pg_get_expr(adef.adbin, adef.adrelid, true) IS NOT NULL
+					THEN pg_catalog.pg_get_expr(adef.adbin, adef.adrelid, true)
+				END as "Default",
+				CASE WHEN pg_catalog.col_description(a.attrelid, a.attnum) IS NULL
+				THEN \'\'
+				ELSE pg_catalog.col_description(a.attrelid, a.attnum)
+				END  AS "comments"
+			FROM pg_catalog.pg_attribute a
+			LEFT JOIN pg_catalog.pg_attrdef adef ON a.attrelid=adef.adrelid AND a.attnum=adef.adnum
+			LEFT JOIN pg_catalog.pg_type t ON a.atttypid=t.oid
+			WHERE a.attrelid =
+				(SELECT oid FROM pg_catalog.pg_class WHERE relname=' . $this->quote($tableSub) . '
+					AND relnamespace = (SELECT oid FROM pg_catalog.pg_namespace WHERE
+					nspname = \'public\')
+				)
+			AND a.attnum > 0 AND NOT a.attisdropped
+			ORDER BY a.attnum'
+		);
+
+		$fields = $this->loadObjectList();
+
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->column_name] = preg_replace('/[(0-9)]/', '', $field->type);
+			}
+		}
+		else
+		{
+			foreach ($fields as $field)
+			{
+				if (stristr(strtolower($field->type), 'character varying'))
+				{
+					$field->Default = '';
+				}
+
+				if (stristr(strtolower($field->type), 'text'))
+				{
+					$field->Default = '';
+				}
+				// Do some dirty translation to MySQL output.
+				// TODO: Come up with and implement a standard across databases.
+				$result[$field->column_name] = (object) array(
+					'column_name' => $field->column_name,
+					'type' => $field->type,
+					'null' => $field->null,
+					'Default' => $field->Default,
+					'comments' => '',
+					'Field' => $field->column_name,
+					'Type' => $field->type,
+					'Null' => $field->null,
+					// TODO: Improve query above to return primary key info as well
+					// 'Key' => ($field->PK == '1' ? 'PRI' : '')
+				);
+			}
+		}
+
+		/* Change Postgresql's NULL::* type with PHP's null one */
+		foreach ($fields as $field)
+		{
+			if (preg_match('/^NULL::*/', $field->Default))
+			{
+				$field->Default = null;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// To check if table exists and prevent SQL injection
+		$tableList = $this->getTableList();
+
+		if (in_array($table, $tableList))
+		{
+			// Get the details columns information.
+			$this->setQuery('
+				SELECT indexname AS "idxName", indisprimary AS "isPrimary", indisunique  AS "isUnique",
+					CASE WHEN indisprimary = true THEN
+						( SELECT \'ALTER TABLE \' || tablename || \' ADD \' || pg_catalog.pg_get_constraintdef(const.oid, true)
+							FROM pg_constraint AS const WHERE const.conname= pgClassFirst.relname )
+					ELSE pg_catalog.pg_get_indexdef(indexrelid, 0, true)
+					END AS "Query"
+				FROM pg_indexes
+				LEFT JOIN pg_class AS pgClassFirst ON indexname=pgClassFirst.relname
+				LEFT JOIN pg_index AS pgIndex ON pgClassFirst.oid=pgIndex.indexrelid
+				WHERE tablename=' . $this->quote($table) . ' ORDER BY indkey'
+			);
+
+			$keys = $this->loadObjectList();
+
+			return $keys;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true)
+			->select('table_name')
+			->from('information_schema.tables')
+			->where('table_type=' . $this->quote('BASE TABLE'))
+			->where('table_schema NOT IN (' . $this->quote('pg_catalog') . ', ' . $this->quote('information_schema') . ')')
+			->order('table_name ASC');
+
+		$this->setQuery($query);
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the details list of sequences for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of sequences specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableSequences($table)
+	{
+		$this->connect();
+
+		// To check if table exists and prevent SQL injection
+		$tableList = $this->getTableList();
+
+		if (in_array($table, $tableList))
+		{
+			$name = array(
+				's.relname', 'n.nspname', 't.relname', 'a.attname', 'info.data_type', 'info.minimum_value', 'info.maximum_value',
+				'info.increment', 'info.cycle_option',
+			);
+			$as = array('sequence', 'schema', 'table', 'column', 'data_type', 'minimum_value', 'maximum_value', 'increment', 'cycle_option');
+
+			if (version_compare($this->getVersion(), '9.1.0') >= 0)
+			{
+				$name[] .= 'info.start_value';
+				$as[] .= 'start_value';
+			}
+
+			// Get the details columns information.
+			$query = $this->getQuery(true)
+				->select($this->quoteName($name, $as))
+				->from('pg_class AS s')
+				->join('LEFT', "pg_depend d ON d.objid=s.oid AND d.classid='pg_class'::regclass AND d.refclassid='pg_class'::regclass")
+				->join('LEFT', 'pg_class t ON t.oid=d.refobjid')
+				->join('LEFT', 'pg_namespace n ON n.oid=t.relnamespace')
+				->join('LEFT', 'pg_attribute a ON a.attrelid=t.oid AND a.attnum=d.refobjsubid')
+				->join('LEFT', 'information_schema.sequences AS info ON info.sequence_name=s.relname')
+				->where("s.relkind='S' AND d.deptype='a' AND t.relname=" . $this->quote($table));
+			$this->setQuery($query);
+			$seq = $this->loadObjectList();
+
+			return $seq;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+		$version = pg_version($this->connection);
+
+		return $version['server'];
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 * To be called after the INSERT statement, it's MANDATORY to have a sequence on
+	 * every primary key table.
+	 *
+	 * To get the auto incremented value it's possible to call this function after
+	 * INSERT INTO query, or use INSERT INTO with RETURNING clause.
+	 *
+	 * @example with insertid() call:
+	 *		$query = $this->getQuery(true)
+	 *			->insert('jos_dbtest')
+	 *			->columns('title,start_date,description')
+	 *			->values("'testTitle2nd','1971-01-01','testDescription2nd'");
+	 *		$this->setQuery($query);
+	 *		$this->execute();
+	 *		$id = $this->insertid();
+	 *
+	 * @example with RETURNING clause:
+	 *		$query = $this->getQuery(true)
+	 *			->insert('jos_dbtest')
+	 *			->columns('title,start_date,description')
+	 *			->values("'testTitle2nd','1971-01-01','testDescription2nd'")
+	 *			->returning('id');
+	 *		$this->setQuery($query);
+	 *		$id = $this->loadResult();
+	 *
+	 * @return  integer  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+		$insertQuery = $this->getQuery(false, true);
+		$table = $insertQuery->__get('insert')->getElements();
+
+		/* find sequence column name */
+		$colNameQuery = $this->getQuery(true);
+		$colNameQuery->select('column_default')
+			->from('information_schema.columns')
+			->where('table_name=' . $this->quote($this->replacePrefix(str_replace('"', '', $table[0]))), 'AND')
+			->where("column_default LIKE '%nextval%'");
+
+		$this->setQuery($colNameQuery);
+		$colName = $this->loadRow();
+		$changedColName = str_replace('nextval', 'currval', $colName);
+
+		$insertidQuery = $this->getQuery(true);
+		$insertidQuery->select($changedColName);
+		$this->setQuery($insertidQuery);
+		$insertVal = $this->loadRow();
+
+		return $insertVal[0];
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $tableName  The name of the table to unlock.
+	 *
+	 * @return  JDatabaseDriverPostgresql  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($tableName)
+	{
+		$this->transactionStart();
+		$this->setQuery('LOCK TABLE ' . $this->quoteName($tableName) . ' IN ACCESS EXCLUSIVE MODE')->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof JDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query .= ' LIMIT ' . $this->limit . ' OFFSET ' . $this->offset;
+		}
+
+		if (!is_resource($this->connection))
+		{
+			JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			JLog::add($query, JLog::DEBUG, 'databasequery');
+
+			$this->timings[] = microtime(true);
+
+			if (is_object($this->cursor))
+			{
+				// Avoid warning if result already freed by third-party library
+				@$this->freeResult();
+			}
+
+			$memoryBefore = memory_get_usage();
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @pg_query($this->connection, $query);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+
+			$this->callStacks[count($this->callStacks) - 1][0]['memory'] = array(
+				$memoryBefore,
+				memory_get_usage(),
+				is_resource($this->cursor) ? $this->getNumRows($this->cursor) : null,
+			);
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$errorNum = $this->getErrorNumber();
+			$errorMsg = $this->getErrorMessage();
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage();
+
+					// Throw the normal query exception.
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+					throw new JDatabaseExceptionExecuting($query, $this->errorMsg, null, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Get the error number and message from before we tried to reconnect.
+				$this->errorNum = $errorNum;
+				$this->errorMsg = $errorMsg;
+
+				// Throw the normal query exception.
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+				throw new JDatabaseExceptionExecuting($query, $this->errorMsg);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by PostgreSQL.
+	 * @param   string  $prefix    Not used by PostgreSQL.
+	 *
+	 * @return  JDatabaseDriverPostgresql  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->connect();
+
+		// To check if table exists and prevent SQL injection
+		$tableList = $this->getTableList();
+
+		// Origin Table does not exist
+		if (!in_array($oldTable, $tableList))
+		{
+			// Origin Table not found
+			throw new RuntimeException('Table not found in Postgresql database.');
+		}
+		else
+		{
+			/* Rename indexes */
+			$this->setQuery(
+				'SELECT relname
+					FROM pg_class
+					WHERE oid IN (
+						SELECT indexrelid
+						FROM pg_index, pg_class
+						WHERE pg_class.relname=' . $this->quote($oldTable, true) . '
+						AND pg_class.oid=pg_index.indrelid );'
+			);
+
+			$oldIndexes = $this->loadColumn();
+
+			foreach ($oldIndexes as $oldIndex)
+			{
+				$changedIdxName = str_replace($oldTable, $newTable, $oldIndex);
+				$this->setQuery('ALTER INDEX ' . $this->escape($oldIndex) . ' RENAME TO ' . $this->escape($changedIdxName));
+				$this->execute();
+			}
+
+			/* Rename sequence */
+			$this->setQuery(
+				'SELECT relname
+					FROM pg_class
+					WHERE relkind = \'S\'
+					AND relnamespace IN (
+						SELECT oid
+						FROM pg_namespace
+						WHERE nspname NOT LIKE \'pg_%\'
+						AND nspname != \'information_schema\'
+					)
+					AND relname LIKE \'%' . $oldTable . '%\' ;'
+			);
+
+			$oldSequences = $this->loadColumn();
+
+			foreach ($oldSequences as $oldSequence)
+			{
+				$changedSequenceName = str_replace($oldTable, $newTable, $oldSequence);
+				$this->setQuery('ALTER SEQUENCE ' . $this->escape($oldSequence) . ' RENAME TO ' . $this->escape($changedSequenceName));
+				$this->execute();
+			}
+
+			/* Rename table */
+			$this->setQuery('ALTER TABLE ' . $this->escape($oldTable) . ' RENAME TO ' . $this->escape($newTable));
+			$this->execute();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Selects the database, but redundant for PostgreSQL
+	 *
+	 * @param   string  $database  Database name to select.
+	 *
+	 * @return  boolean  Always true
+	 *
+	 * @since   12.1
+	 */
+	public function select($database)
+	{
+		return true;
+	}
+
+	/**
+	 * Custom settings for UTF support
+	 *
+	 * @return  integer  Zero on success, -1 on failure
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		$this->connect();
+
+		if (!function_exists('pg_set_client_encoding'))
+		{
+			return -1;
+		}
+
+		return pg_set_client_encoding($this->connection, 'UTF8');
+	}
+
+	/**
+	 * This function return a field value as a prepared string to be used in a SQL statement.
+	 *
+	 * @param   array   $columns      Array of table's column returned by ::getTableColumns.
+	 * @param   string  $field_name   The table field's name.
+	 * @param   string  $field_value  The variable value to quote and return.
+	 *
+	 * @return  string  The quoted string.
+	 *
+	 * @since   12.1
+	 */
+	public function sqlValue($columns, $field_name, $field_value)
+	{
+		switch ($columns[$field_name])
+		{
+			case 'boolean':
+				$val = 'NULL';
+
+				if ($field_value == 't')
+				{
+					$val = 'TRUE';
+				}
+				elseif ($field_value == 'f')
+				{
+					$val = 'FALSE';
+				}
+
+				break;
+
+			case 'bigint':
+			case 'bigserial':
+			case 'integer':
+			case 'money':
+			case 'numeric':
+			case 'real':
+			case 'smallint':
+			case 'serial':
+			case 'numeric,':
+				$val = strlen($field_value) == 0 ? 'NULL' : $field_value;
+				break;
+
+			case 'date':
+			case 'timestamp without time zone':
+				if (empty($field_value))
+				{
+					$field_value = $this->getNullDate();
+				}
+
+				$val = $this->quote($field_value);
+				break;
+
+			default:
+				$val = $this->quote($field_value);
+				break;
+		}
+
+		return $val;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('COMMIT')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('ROLLBACK')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . ($this->transactionDepth - 1);
+		$this->setQuery('ROLLBACK TO SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth--;
+			$this->setQuery('RELEASE SAVEPOINT ' . $this->quoteName($savepoint))->execute();
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			if ($this->setQuery('START TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 1;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return pg_fetch_row($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return pg_fetch_assoc($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		return pg_fetch_object(is_null($cursor) ? $this->cursor : $cursor, null, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		pg_free_result($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Inserts a row into a table based on an object's properties.
+	 *
+	 * @param   string  $table    The name of the database table to insert into.
+	 * @param   object  &$object  A reference to an object whose public properties match the table fields.
+	 * @param   string  $key      The name of the primary key. If provided the object property is updated.
+	 *
+	 * @return  boolean    True on success.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function insertObject($table, &$object, $key = null)
+	{
+		$columns = $this->getTableColumns($table);
+
+		$fields = array();
+		$values = array();
+
+		// Iterate over the object variables to build the query fields and values.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process non-null scalars.
+			if (is_array($v) or is_object($v) or $v === null)
+			{
+				continue;
+			}
+
+			// Ignore any internal fields or primary keys with value 0.
+			if (($k[0] == '_') || ($k == $key && (($v === 0) || ($v === '0'))))
+			{
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			$fields[] = $this->quoteName($k);
+			$values[] = $this->sqlValue($columns, $k, $v);
+		}
+
+		// Create the base insert statement.
+		$query = $this->getQuery(true)
+			->insert($this->quoteName($table))
+			->columns($fields)
+			->values(implode(',', $values));
+
+		$retVal = false;
+
+		if ($key)
+		{
+			$query->returning($key);
+
+			// Set the query and execute the insert.
+			$this->setQuery($query);
+
+			$id = $this->loadResult();
+
+			if ($id)
+			{
+				$object->$key = $id;
+				$retVal = true;
+			}
+		}
+		else
+		{
+			// Set the query and execute the insert.
+			$this->setQuery($query);
+
+			if ($this->execute())
+			{
+				$retVal = true;
+			}
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Test to see if the PostgreSQL connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return function_exists('pg_connect');
+	}
+
+	/**
+	 * Returns an array containing database's table list.
+	 *
+	 * @return  array  The database's table list.
+	 *
+	 * @since   12.1
+	 */
+	public function showTables()
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true)
+			->select('table_name')
+			->from('information_schema.tables')
+			->where('table_type = ' . $this->quote('BASE TABLE'))
+			->where('table_schema NOT IN (' . $this->quote('pg_catalog') . ', ' . $this->quote('information_schema') . ' )');
+
+		$this->setQuery($query);
+		$tableList = $this->loadColumn();
+
+		return $tableList;
+	}
+
+	/**
+	 * Get the substring position inside a string
+	 *
+	 * @param   string  $substring  The string being sought
+	 * @param   string  $string     The string/column being searched
+	 *
+	 * @return  integer  The position of $substring in $string
+	 *
+	 * @since   12.1
+	 */
+	public function getStringPositionSql($substring, $string)
+	{
+		$this->connect();
+
+		$query = "SELECT POSITION( $substring IN $string )";
+		$this->setQuery($query);
+		$position = $this->loadRow();
+
+		return $position['position'];
+	}
+
+	/**
+	 * Generate a random value
+	 *
+	 * @return  float  The random generated number
+	 *
+	 * @since   12.1
+	 */
+	public function getRandom()
+	{
+		$this->connect();
+
+		$this->setQuery('SELECT RANDOM()');
+		$random = $this->loadAssoc();
+
+		return $random['random'];
+	}
+
+	/**
+	 * Get the query string to alter the database character set.
+	 *
+	 * @param   string  $dbName  The database name
+	 *
+	 * @return  string  The query that alter the database query string
+	 *
+	 * @since   12.1
+	 */
+	public function getAlterDbCharacterSet($dbName)
+	{
+		$query = 'ALTER DATABASE ' . $this->quoteName($dbName) . ' SET CLIENT_ENCODING TO ' . $this->quote('UTF8');
+
+		return $query;
+	}
+
+	/**
+	 * Get the query string to create new Database in correct PostgreSQL syntax.
+	 *
+	 * @param   object   $options  object coming from "initialise" function to pass user and database name to database driver.
+	 * @param   boolean  $utf      True if the database supports the UTF-8 character set, not used in PostgreSQL "CREATE DATABASE" query.
+	 *
+	 * @return  string	The query that creates database, owned by $options['user']
+	 *
+	 * @since   12.1
+	 */
+	public function getCreateDbQuery($options, $utf)
+	{
+		$query = 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' OWNER ' . $this->quoteName($options->db_user);
+
+		if ($utf)
+		{
+			$query .= ' ENCODING ' . $this->quote('UTF-8');
+		}
+
+		return $query;
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $query   The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   12.1
+	 */
+	public function replacePrefix($query, $prefix = '#__')
+	{
+		$query = trim($query);
+
+		if (strpos($query, '\''))
+		{
+			// Sequence name quoted with ' ' but need to be replaced
+			if (strpos($query, 'currval'))
+			{
+				$query = explode('currval', $query);
+
+				for ($nIndex = 1, $nIndexMax = count($query); $nIndex < $nIndexMax; $nIndex += 2)
+				{
+					$query[$nIndex] = str_replace($prefix, $this->tablePrefix, $query[$nIndex]);
+				}
+
+				$query = implode('currval', $query);
+			}
+
+			// Sequence name quoted with ' ' but need to be replaced
+			if (strpos($query, 'nextval'))
+			{
+				$query = explode('nextval', $query);
+
+				for ($nIndex = 1, $nIndexMax = count($query); $nIndex < $nIndexMax; $nIndex += 2)
+				{
+					$query[$nIndex] = str_replace($prefix, $this->tablePrefix, $query[$nIndex]);
+				}
+
+				$query = implode('nextval', $query);
+			}
+
+			// Sequence name quoted with ' ' but need to be replaced
+			if (strpos($query, 'setval'))
+			{
+				$query = explode('setval', $query);
+
+				for ($nIndex = 1, $nIndexMax = count($query); $nIndex < $nIndexMax; $nIndex += 2)
+				{
+					$query[$nIndex] = str_replace($prefix, $this->tablePrefix, $query[$nIndex]);
+				}
+
+				$query = implode('setval', $query);
+			}
+
+			$explodedQuery = explode('\'', $query);
+
+			for ($nIndex = 0, $nIndexMax = count($explodedQuery); $nIndex < $nIndexMax; $nIndex += 2)
+			{
+				if (strpos($explodedQuery[$nIndex], $prefix))
+				{
+					$explodedQuery[$nIndex] = str_replace($prefix, $this->tablePrefix, $explodedQuery[$nIndex]);
+				}
+			}
+
+			$replacedQuery = implode('\'', $explodedQuery);
+		}
+		else
+		{
+			$replacedQuery = str_replace($prefix, $this->tablePrefix, $query);
+		}
+
+		return $replacedQuery;
+	}
+
+	/**
+	 * Method to release a savepoint.
+	 *
+	 * @param   string  $savepointName  Savepoint's name to release
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function releaseTransactionSavepoint($savepointName)
+	{
+		$this->connect();
+		$this->setQuery('RELEASE SAVEPOINT ' . $this->quoteName($this->escape($savepointName)));
+		$this->execute();
+	}
+
+	/**
+	 * Method to create a savepoint.
+	 *
+	 * @param   string  $savepointName  Savepoint's name to create
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function transactionSavepoint($savepointName)
+	{
+		$this->connect();
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($this->escape($savepointName)));
+		$this->execute();
+	}
+
+	/**
+	 * Unlocks tables in the database, this command does not exist in PostgreSQL,
+	 * it is automatically done on commit or rollback.
+	 *
+	 * @return  JDatabaseDriverPostgresql  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		$this->transactionCommit();
+
+		return $this;
+	}
+
+	/**
+	 * Updates a row in a table based on an object's properties.
+	 *
+	 * @param   string   $table    The name of the database table to update.
+	 * @param   object   &$object  A reference to an object whose public properties match the table fields.
+	 * @param   array    $key      The name of the primary key.
+	 * @param   boolean  $nulls    True to update null fields or false to ignore them.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function updateObject($table, &$object, $key, $nulls = false)
+	{
+		$columns = $this->getTableColumns($table);
+		$fields  = array();
+		$where   = array();
+
+		if (is_string($key))
+		{
+			$key = array($key);
+		}
+
+		if (is_object($key))
+		{
+			$key = (array) $key;
+		}
+
+		// Create the base update statement.
+		$statement = 'UPDATE ' . $this->quoteName($table) . ' SET %s WHERE %s';
+
+		// Iterate over the object variables to build the query fields/value pairs.
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process scalars that are not internal fields.
+			if (is_array($v) or is_object($v) or $k[0] == '_')
+			{
+				continue;
+			}
+
+			// Set the primary key to the WHERE clause instead of a field to update.
+			if (in_array($k, $key))
+			{
+				$key_val = $this->sqlValue($columns, $k, $v);
+				$where[] = $this->quoteName($k) . '=' . $key_val;
+				continue;
+			}
+
+			// Prepare and sanitize the fields and values for the database query.
+			if ($v === null)
+			{
+				// If the value is null and we want to update nulls then set it.
+				if ($nulls)
+				{
+					$val = 'NULL';
+				}
+				// If the value is null and we do not want to update nulls then ignore this field.
+				else
+				{
+					continue;
+				}
+			}
+			// The field is not null so we prep it for update.
+			else
+			{
+				$val = $this->sqlValue($columns, $k, $v);
+			}
+
+			// Add the field to be updated.
+			$fields[] = $this->quoteName($k) . '=' . $val;
+		}
+
+		// We don't have any fields to update.
+		if (empty($fields))
+		{
+			return true;
+		}
+
+		// Set the query and execute the update.
+		$this->setQuery(sprintf($statement, implode(',', $fields), implode(' AND ', $where)));
+
+		return $this->execute();
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 *
+	 * @throws  \JDatabaseExceptionExecuting  Thrown if the global cursor is false indicating a query failed
+	 */
+	protected function getErrorNumber()
+	{
+		if ($this->cursor === false)
+		{
+			$this->errorMsg = pg_last_error($this->connection);
+
+			throw new JDatabaseExceptionExecuting($this->sql, $this->errorMsg);
+		}
+
+		return (int) pg_result_error_field($this->cursor, PGSQL_DIAG_SQLSTATE) . ' ';
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage()
+	{
+		$errorMessage = (string) pg_last_error($this->connection);
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+		}
+
+		return $errorMessage;
+	}
+
+	/**
+	 * Get the query strings to alter the character set and collation of a table.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string[]  The queries required to alter the table's character set and collation
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getAlterTableCharacterSet($tableName)
+	{
+		return array();
+	}
+
+	/**
+	 * Return the query string to create new Database.
+	 * Each database driver, other than MySQL, need to override this member to return correct string.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 *                   This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 */
+	protected function getCreateDatabaseQuery($options, $utf)
+	{
+		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
+	}
+}
diff --git a/core/libraries/joomla/database/driver/sqlazure.php b/core/libraries/joomla/database/driver/sqlazure.php
new file mode 100644
index 00000000..5bb7deca
--- /dev/null
+++ b/core/libraries/joomla/database/driver/sqlazure.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQL Server database driver
+ *
+ * @link   https://azure.microsoft.com/en-us/documentation/services/sql-database/
+ * @since  12.1
+ */
+class JDatabaseDriverSqlazure extends JDatabaseDriverSqlsrv
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'sqlazure';
+}
diff --git a/core/libraries/joomla/database/driver/sqlite.php b/core/libraries/joomla/database/driver/sqlite.php
new file mode 100644
index 00000000..b7319577
--- /dev/null
+++ b/core/libraries/joomla/database/driver/sqlite.php
@@ -0,0 +1,553 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQLite database driver
+ *
+ * @link   https://secure.php.net/pdo
+ * @since  12.1
+ */
+class JDatabaseDriverSqlite extends JDatabaseDriverPdo
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'sqlite';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'sqlite';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc. The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '`';
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		parent::connect();
+
+		$this->connection->sqliteCreateFunction(
+			'ROW_NUMBER',
+			function($init = null)
+			{
+				static $rownum, $partition;
+
+				if ($init !== null)
+				{
+					$rownum = $init;
+					$partition = null;
+
+					return $rownum;
+				}
+
+				$args = func_get_args();
+				array_shift($args);
+
+				$partitionBy = $args ? implode(',', $args) : null;
+
+				if ($partitionBy === null || $partitionBy === $partition)
+				{
+					$rownum++;
+				}
+				else
+				{
+					$rownum    = 1;
+					$partition = $partitionBy;
+				}
+
+				return $rownum;
+			}
+		);
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		$this->freeResult();
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  JDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$this->setQuery('DROP TABLE ' . ($ifExists ? 'IF EXISTS ' : '') . $query->quoteName($tableName));
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQLite statement.
+	 *
+	 * Note: Using query objects with bound variables is
+	 * preferable to the below.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Unused optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		if (is_int($text) || is_float($text))
+		{
+			return $text;
+		}
+
+		return SQLite3::escapeString($text);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 */
+	public function getCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * Note: Doesn't appear to have support in SQLite
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		// Sanitize input to an array and iterate over the list.
+		settype($tables, 'array');
+
+		return $tables;
+	}
+
+	/**
+	 * Retrieves field information about a given table.
+	 *
+	 * @param   string   $table     The name of the database table.
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields for the database table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$this->connect();
+
+		$columns = array();
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+
+		$query->setQuery('pragma table_info(' . $table . ')');
+
+		$this->setQuery($query);
+		$fields = $this->loadObjectList();
+
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$columns[$field->NAME] = $field->TYPE;
+			}
+		}
+		else
+		{
+			foreach ($fields as $field)
+			{
+				// Do some dirty translation to MySQL output.
+				// TODO: Come up with and implement a standard across databases.
+				$columns[$field->NAME] = (object) array(
+					'Field' => $field->NAME,
+					'Type' => $field->TYPE,
+					'Null' => ($field->NOTNULL == '1' ? 'NO' : 'YES'),
+					'Default' => $field->DFLT_VALUE,
+					'Key' => ($field->PK != '0' ? 'PRI' : ''),
+				);
+			}
+		}
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $columns;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		$keys = array();
+		$query = $this->getQuery(true);
+
+		$fieldCasing = $this->getOption(PDO::ATTR_CASE);
+
+		$this->setOption(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+		$table = strtoupper($table);
+		$query->setQuery('pragma table_info( ' . $table . ')');
+
+		// $query->bind(':tableName', $table);
+
+		$this->setQuery($query);
+		$rows = $this->loadObjectList();
+
+		foreach ($rows as $column)
+		{
+			if ($column->PK == 1)
+			{
+				$keys[$column->NAME] = $column;
+			}
+		}
+
+		$this->setOption(PDO::ATTR_CASE, $fieldCasing);
+
+		return $keys;
+	}
+
+	/**
+	 * Method to get an array of all tables in the database (schema).
+	 *
+	 * @return  array   An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		$type = 'table';
+
+		$query = $this->getQuery(true)
+			->select('name')
+			->from('sqlite_master')
+			->where('type = :type')
+			->bind(':type', $type)
+			->order('name');
+
+		$this->setQuery($query);
+
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		$this->setQuery('SELECT sqlite_version()');
+
+		return $this->loadResult();
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * Returns false automatically for the Oracle driver since
+	 * you can only set the character set when the connection
+	 * is created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		$this->connect();
+
+		return false;
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $table  The name of the table to unlock.
+	 *
+	 * @return  JDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($table)
+	{
+		return $this;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Not used by Sqlite.
+	 * @param   string  $prefix    Not used by Sqlite.
+	 *
+	 * @return  JDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$this->setQuery('ALTER TABLE ' . $oldTable . ' RENAME TO ' . $newTable)->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  JDatabaseDriverSqlite  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		return $this;
+	}
+
+	/**
+	 * Test to see if the PDO ODBC connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return class_exists('PDO') && in_array('sqlite', PDO::getAvailableDrivers());
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionCommit($toSavepoint);
+		}
+		else
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			parent::transactionRollback($toSavepoint);
+		}
+		else
+		{
+			$savepoint = 'SP_' . ($this->transactionDepth - 1);
+			$this->setQuery('ROLLBACK TO ' . $this->quoteName($savepoint));
+
+			if ($this->execute())
+			{
+				$this->transactionDepth--;
+			}
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			parent::transactionStart($asSavepoint);
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('SAVEPOINT ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Get the query strings to alter the character set and collation of a table.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string[]  The queries required to alter the table's character set and collation
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getAlterTableCharacterSet($tableName)
+	{
+		return array();
+	}
+
+	/**
+	 * Return the query string to create new Database.
+	 * Each database driver, other than MySQL, need to override this member to return correct string.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 *                   This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 */
+	protected function getCreateDatabaseQuery($options, $utf)
+	{
+		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
+	}
+}
diff --git a/core/libraries/joomla/database/driver/sqlsrv.php b/core/libraries/joomla/database/driver/sqlsrv.php
new file mode 100644
index 00000000..74495279
--- /dev/null
+++ b/core/libraries/joomla/database/driver/sqlsrv.php
@@ -0,0 +1,1116 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQL Server database driver
+ *
+ * @link   https://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
+ * @since  12.1
+ */
+class JDatabaseDriverSqlsrv extends JDatabaseDriver
+{
+	/**
+	 * The name of the database driver.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	public $name = 'sqlsrv';
+
+	/**
+	 * The type of the database server family supported by this driver.
+	 *
+	 * @var    string
+	 * @since  CMS 3.5.0
+	 */
+	public $serverType = 'mssql';
+
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nameQuote = '[]';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $nullDate = '1900-01-01 00:00:00';
+
+	/**
+	 * @var    string  The minimum supported database version.
+	 * @since  12.1
+	 */
+	protected static $dbMinimum = '10.50.1600.1';
+
+	/**
+	 * Test to see if the SQLSRV connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return function_exists('sqlsrv_connect');
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $options  List of options used to configure the connection
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options)
+	{
+		// Get some basic values from the options.
+		$options['host'] = (isset($options['host'])) ? $options['host'] : 'localhost';
+		$options['user'] = (isset($options['user'])) ? $options['user'] : '';
+		$options['password'] = (isset($options['password'])) ? $options['password'] : '';
+		$options['database'] = (isset($options['database'])) ? $options['database'] : '';
+		$options['select'] = (isset($options['select'])) ? (bool) $options['select'] : true;
+
+		// Finalize initialisation
+		parent::__construct($options);
+	}
+
+	/**
+	 * Connects to the database if needed.
+	 *
+	 * @return  void  Returns void if the database connected successfully.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function connect()
+	{
+		if ($this->connection)
+		{
+			return;
+		}
+
+		// Build the connection configuration array.
+		$config = array(
+			'Database' => $this->options['database'],
+			'uid' => $this->options['user'],
+			'pwd' => $this->options['password'],
+			'CharacterSet' => 'UTF-8',
+			'ReturnDatesAsStrings' => true,
+		);
+
+		// Make sure the SQLSRV extension for PHP is installed and enabled.
+		if (!self::isSupported())
+		{
+			throw new JDatabaseExceptionUnsupported('The sqlsrv extension for PHP is not installed or enabled..');
+		}
+
+		// Attempt to connect to the server.
+		if (!($this->connection = @ sqlsrv_connect($this->options['host'], $config)))
+		{
+			throw new JDatabaseExceptionConnecting('Database sqlsrv_connect failed, ' . print_r(sqlsrv_errors(), true));
+		}
+
+		// Make sure that DB warnings are not returned as errors.
+		sqlsrv_configure('WarningsReturnAsErrors', 0);
+
+		// If auto-select is enabled select the given database.
+		if ($this->options['select'] && !empty($this->options['database']))
+		{
+			$this->select($this->options['database']);
+		}
+
+		// Set charactersets.
+		$this->utf = $this->setUtf();
+
+		// Set QUOTED_IDENTIFIER always ON
+		sqlsrv_query($this->connection, 'SET QUOTED_IDENTIFIER ON');
+	}
+
+	/**
+	 * Disconnects the database.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function disconnect()
+	{
+		// Close the connection.
+		if (is_resource($this->connection))
+		{
+			foreach ($this->disconnectHandlers as $h)
+			{
+				call_user_func_array($h, array( &$this));
+			}
+
+			sqlsrv_close($this->connection);
+		}
+
+		$this->connection = null;
+	}
+
+	/**
+	 * Get table constraints
+	 *
+	 * @param   string  $tableName  The name of the database table.
+	 *
+	 * @return  array  Any constraints available for the table.
+	 *
+	 * @since   12.1
+	 */
+	protected function getTableConstraints($tableName)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		$this->setQuery(
+			'SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_NAME = ' . $query->quote($tableName)
+		);
+
+		return $this->loadColumn();
+	}
+
+	/**
+	 * Rename constraints.
+	 *
+	 * @param   array   $constraints  Array(strings) of table constraints
+	 * @param   string  $prefix       A string
+	 * @param   string  $backup       A string
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function renameConstraints($constraints = array(), $prefix = null, $backup = null)
+	{
+		$this->connect();
+
+		foreach ($constraints as $constraint)
+		{
+			$this->setQuery('sp_rename ' . $constraint . ',' . str_replace($prefix, $backup, $constraint));
+			$this->execute();
+		}
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * The escaping for MSSQL isn't handled in the driver though that would be nice.  Because of this we need
+	 * to handle the escaping ourselves.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($text, $extra = false)
+	{
+		$result = str_replace("'", "''", $text);
+
+		// SQL Server does not accept NULL byte in query string
+		$result = str_replace("\0", "' + CHAR(0) + N'", $result);
+
+		// Fix for SQL Server escape sequence, see https://support.microsoft.com/en-us/kb/164291
+		$result = str_replace(
+			array("\\\n",     "\\\r",     "\\\\\r\r\n"),
+			array("\\\\\n\n", "\\\\\r\r", "\\\\\r\n\r\n"),
+			$result
+		);
+
+		if ($extra)
+		{
+			// Escape special chars
+			$result = str_replace(
+				array('[',   '_',   '%'),
+				array('[[]', '[_]', '[%]'),
+				$result
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Quotes and optionally escapes a string to database requirements for use in database queries.
+	 *
+	 * @param   mixed    $text    A string or an array of strings to quote.
+	 * @param   boolean  $escape  True (default) to escape the string, false to leave it unchanged.
+	 *
+	 * @return  string  The quoted input string.
+	 *
+	 * @note    Accepting an array of strings was added in 12.3.
+	 * @since   11.1
+	 */
+	public function quote($text, $escape = true)
+	{
+		if (is_array($text))
+		{
+			return parent::quote($text, $escape);
+		}
+
+		// To support unicode on MSSQL we have to add prefix N
+		return 'N\'' . ($escape ? $this->escape($text) : $text) . '\'';
+	}
+
+	/**
+	 * Determines if the connection to the server is active.
+	 *
+	 * @return  boolean  True if connected to the database engine.
+	 *
+	 * @since   12.1
+	 */
+	public function connected()
+	{
+		// TODO: Run a blank query here
+		return true;
+	}
+
+	/**
+	 * Drops a table from the database.
+	 *
+	 * @param   string   $tableName  The name of the database table to drop.
+	 * @param   boolean  $ifExists   Optionally specify that the table must exist before it is dropped.
+	 *
+	 * @return  JDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function dropTable($tableName, $ifExists = true)
+	{
+		$this->connect();
+
+		$query = $this->getQuery(true);
+
+		if ($ifExists)
+		{
+			$this->setQuery(
+				'IF EXISTS(SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = ' . $query->quote($tableName) . ') DROP TABLE ' . $tableName
+			);
+		}
+		else
+		{
+			$this->setQuery('DROP TABLE ' . $tableName);
+		}
+
+		$this->execute();
+
+		return $this;
+	}
+
+	/**
+	 * Get the number of affected rows for the previous executed SQL statement.
+	 *
+	 * @return  integer  The number of affected rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getAffectedRows()
+	{
+		$this->connect();
+
+		return sqlsrv_rows_affected($this->cursor);
+	}
+
+	/**
+	 * Method to get the database collation in use by sampling a text field of a table in the database.
+	 *
+	 * @return  mixed  The collation in use by the database or boolean false if not supported.
+	 *
+	 * @since   12.1
+	 */
+	public function getCollation()
+	{
+		// TODO: Not fake this
+		return 'MSSQL UTF-8 (UCS2)';
+	}
+
+	/**
+	 * Method to get the database connection collation, as reported by the driver. If the connector doesn't support
+	 * reporting this value please return an empty string.
+	 *
+	 * @return  string
+	 */
+	public function getConnectionCollation()
+	{
+		// TODO: Not fake this
+		return 'MSSQL UTF-8 (UCS2)';
+	}
+
+	/**
+	 * Get the number of returned rows for the previous executed SQL statement.
+	 *
+	 * @param   resource  $cursor  An optional database cursor resource to extract the row count from.
+	 *
+	 * @return  integer   The number of returned rows.
+	 *
+	 * @since   12.1
+	 */
+	public function getNumRows($cursor = null)
+	{
+		$this->connect();
+
+		return sqlsrv_num_rows($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Retrieves field information about the given tables.
+	 *
+	 * @param   mixed    $table     A table name
+	 * @param   boolean  $typeOnly  True to only return field types.
+	 *
+	 * @return  array  An array of fields.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableColumns($table, $typeOnly = true)
+	{
+		$result = array();
+
+		$table_temp = $this->replacePrefix((string) $table);
+
+		// Set the query to get the table fields statement.
+		$this->setQuery(
+			'SELECT column_name as Field, data_type as Type, is_nullable as \'Null\', column_default as \'Default\'' .
+			' FROM information_schema.columns WHERE table_name = ' . $this->quote($table_temp)
+		);
+		$fields = $this->loadObjectList();
+
+		// If we only want the type as the value add just that to the list.
+		if ($typeOnly)
+		{
+			foreach ($fields as $field)
+			{
+				$result[$field->Field] = preg_replace('/[(0-9)]/', '', $field->Type);
+			}
+		}
+		// If we want the whole field data object add that to the list.
+		else
+		{
+			foreach ($fields as $field)
+			{
+				$field->Default = preg_replace("/(^(\(\(|\('|\(N'|\()|(('\)|(?<!\()\)\)|\))$))/i", '', $field->Default);
+				$result[$field->Field] = $field;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Shows the table CREATE statement that creates the given tables.
+	 *
+	 * This is unsupported by MSSQL.
+	 *
+	 * @param   mixed  $tables  A table name or a list of table names.
+	 *
+	 * @return  array  A list of the create SQL for the tables.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableCreate($tables)
+	{
+		$this->connect();
+
+		return '';
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  array  An array of the column specification for the table.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableKeys($table)
+	{
+		$this->connect();
+
+		// TODO To implement.
+		return array();
+	}
+
+	/**
+	 * Method to get an array of all tables in the database.
+	 *
+	 * @return  array  An array of all the tables in the database.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getTableList()
+	{
+		$this->connect();
+
+		// Set the query to get the tables statement.
+		$this->setQuery('SELECT name FROM ' . $this->getDatabase() . '.sys.Tables WHERE type = \'U\';');
+		$tables = $this->loadColumn();
+
+		return $tables;
+	}
+
+	/**
+	 * Get the version of the database connector.
+	 *
+	 * @return  string  The database connector version.
+	 *
+	 * @since   12.1
+	 */
+	public function getVersion()
+	{
+		$this->connect();
+
+		$version = sqlsrv_server_info($this->connection);
+
+		return $version['SQLServerVersion'];
+	}
+
+	/**
+	 * Inserts a row into a table based on an object's properties.
+	 *
+	 * @param   string  $table    The name of the database table to insert into.
+	 * @param   object  &$object  A reference to an object whose public properties match the table fields.
+	 * @param   string  $key      The name of the primary key. If provided the object property is updated.
+	 *
+	 * @return  boolean    True on success.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function insertObject($table, &$object, $key = null)
+	{
+		$fields = array();
+		$values = array();
+		$statement = 'INSERT INTO ' . $this->quoteName($table) . ' (%s) VALUES (%s)';
+
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			// Only process non-null scalars.
+			if (is_array($v) or is_object($v) or $v === null)
+			{
+				continue;
+			}
+
+			if (!$this->checkFieldExists($table, $k))
+			{
+				continue;
+			}
+
+			if ($k[0] == '_')
+			{
+				// Internal field
+				continue;
+			}
+
+			if ($k == $key && $key == 0)
+			{
+				continue;
+			}
+
+			$fields[] = $this->quoteName($k);
+			$values[] = $this->Quote($v);
+		}
+		// Set the query and execute the insert.
+		$this->setQuery(sprintf($statement, implode(',', $fields), implode(',', $values)));
+
+		if (!$this->execute())
+		{
+			return false;
+		}
+
+		$id = $this->insertid();
+
+		if ($key && $id)
+		{
+			$object->$key = $id;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the auto-incremented value from the last INSERT statement.
+	 *
+	 * @return  integer  The value of the auto-increment field from the last inserted row.
+	 *
+	 * @since   12.1
+	 */
+	public function insertid()
+	{
+		$this->connect();
+
+		// TODO: SELECT IDENTITY
+		$this->setQuery('SELECT @@IDENTITY');
+
+		return (int) $this->loadResult();
+	}
+
+	/**
+	 * Execute the SQL statement.
+	 *
+	 * @return  mixed  A database cursor resource on success, boolean false on failure.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 * @throws  Exception
+	 */
+	public function execute()
+	{
+		$this->connect();
+
+		// Take a local copy so that we don't modify the original query and cause issues later
+		$query = $this->replacePrefix((string) $this->sql);
+
+		if (!($this->sql instanceof JDatabaseQuery) && ($this->limit > 0 || $this->offset > 0))
+		{
+			$query = $this->limit($query, $this->limit, $this->offset);
+		}
+
+		if (!is_resource($this->connection))
+		{
+			JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database');
+			throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+		}
+
+		// Increment the query counter.
+		$this->count++;
+
+		// Reset the error values.
+		$this->errorNum = 0;
+		$this->errorMsg = '';
+
+		// If debugging is enabled then let's log the query.
+		if ($this->debug)
+		{
+			// Add the query to the object queue.
+			$this->log[] = $query;
+
+			JLog::add($query, JLog::DEBUG, 'databasequery');
+
+			$this->timings[] = microtime(true);
+		}
+
+		// SQLSrv_num_rows requires a static or keyset cursor.
+		if (strncmp(ltrim(strtoupper($query)), 'SELECT', strlen('SELECT')) == 0)
+		{
+			$array = array('Scrollable' => SQLSRV_CURSOR_KEYSET);
+		}
+		else
+		{
+			$array = array();
+		}
+
+		// Execute the query. Error suppression is used here to prevent warnings/notices that the connection has been lost.
+		$this->cursor = @sqlsrv_query($this->connection, $query, array(), $array);
+
+		if ($this->debug)
+		{
+			$this->timings[] = microtime(true);
+
+			if (defined('DEBUG_BACKTRACE_IGNORE_ARGS'))
+			{
+				$this->callStacks[] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			}
+			else
+			{
+				$this->callStacks[] = debug_backtrace();
+			}
+		}
+
+		// If an error occurred handle it.
+		if (!$this->cursor)
+		{
+			// Get the error number and message before we execute any more queries.
+			$errorNum = $this->getErrorNumber();
+			$errorMsg = $this->getErrorMessage();
+
+			// Check if the server was disconnected.
+			if (!$this->connected())
+			{
+				try
+				{
+					// Attempt to reconnect.
+					$this->connection = null;
+					$this->connect();
+				}
+				// If connect fails, ignore that exception and throw the normal exception.
+				catch (RuntimeException $e)
+				{
+					// Get the error number and message.
+					$this->errorNum = $this->getErrorNumber();
+					$this->errorMsg = $this->getErrorMessage();
+
+					// Throw the normal query exception.
+					JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+					throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum, $e);
+				}
+
+				// Since we were able to reconnect, run the query again.
+				return $this->execute();
+			}
+			// The server was not disconnected.
+			else
+			{
+				// Get the error number and message from before we tried to reconnect.
+				$this->errorNum = $errorNum;
+				$this->errorMsg = $errorMsg;
+
+				// Throw the normal query exception.
+				JLog::add(JText::sprintf('JLIB_DATABASE_QUERY_FAILED', $this->errorNum, $this->errorMsg), JLog::ERROR, 'database-error');
+
+				throw new JDatabaseExceptionExecuting($query, $this->errorMsg, $this->errorNum);
+			}
+		}
+
+		return $this->cursor;
+	}
+
+	/**
+	 * This function replaces a string identifier <var>$prefix</var> with the string held is the
+	 * <var>tablePrefix</var> class variable.
+	 *
+	 * @param   string  $query   The SQL statement to prepare.
+	 * @param   string  $prefix  The common table prefix.
+	 *
+	 * @return  string  The processed SQL statement.
+	 *
+	 * @since   12.1
+	 */
+	public function replacePrefix($query, $prefix = '#__')
+	{
+		$query = trim($query);
+
+		if (strpos($query, "'"))
+		{
+			$parts = explode("'", $query);
+
+			for ($nIndex = 0, $size = count($parts); $nIndex < $size; $nIndex = $nIndex + 2)
+			{
+				if (strpos($parts[$nIndex], $prefix) !== false)
+				{
+					$parts[$nIndex] = str_replace($prefix, $this->tablePrefix, $parts[$nIndex]);
+				}
+			}
+
+			$query = implode("'", $parts);
+		}
+		else
+		{
+			$query = str_replace($prefix, $this->tablePrefix, $query);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Select a database for use.
+	 *
+	 * @param   string  $database  The name of the database to select for use.
+	 *
+	 * @return  boolean  True if the database was successfully selected.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function select($database)
+	{
+		$this->connect();
+
+		if (!$database)
+		{
+			return false;
+		}
+
+		if (!sqlsrv_query($this->connection, 'USE ' . $database, null, array('scrollable' => SQLSRV_CURSOR_STATIC)))
+		{
+			throw new JDatabaseExceptionConnecting('Could not connect to SQL Server database.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the connection to use UTF-8 character encoding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.1
+	 */
+	public function setUtf()
+	{
+		return false;
+	}
+
+	/**
+	 * Method to commit a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, commit to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionCommit($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('COMMIT TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$this->transactionDepth--;
+	}
+
+	/**
+	 * Method to roll back a transaction.
+	 *
+	 * @param   boolean  $toSavepoint  If true, rollback to the last savepoint.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionRollback($toSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$toSavepoint || $this->transactionDepth <= 1)
+		{
+			if ($this->setQuery('ROLLBACK TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 0;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . ($this->transactionDepth - 1);
+		$this->setQuery('ROLLBACK TRANSACTION ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth--;
+		}
+	}
+
+	/**
+	 * Method to initialize a transaction.
+	 *
+	 * @param   boolean  $asSavepoint  If true and a transaction is already active, a savepoint will be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function transactionStart($asSavepoint = false)
+	{
+		$this->connect();
+
+		if (!$asSavepoint || !$this->transactionDepth)
+		{
+			if ($this->setQuery('BEGIN TRANSACTION')->execute())
+			{
+				$this->transactionDepth = 1;
+			}
+
+			return;
+		}
+
+		$savepoint = 'SP_' . $this->transactionDepth;
+		$this->setQuery('BEGIN TRANSACTION ' . $this->quoteName($savepoint));
+
+		if ($this->execute())
+		{
+			$this->transactionDepth++;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchArray($cursor = null)
+	{
+		return sqlsrv_fetch_array($cursor ? $cursor : $this->cursor, SQLSRV_FETCH_NUMERIC);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an associative array.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchAssoc($cursor = null)
+	{
+		return sqlsrv_fetch_array($cursor ? $cursor : $this->cursor, SQLSRV_FETCH_ASSOC);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @param   mixed   $cursor  The optional result set cursor from which to fetch the row.
+	 * @param   string  $class   The class name to use for the returned row object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject($cursor = null, $class = 'stdClass')
+	{
+		// Class has to be loaded for sqlsrv on windows platform
+		class_exists($class);
+
+		return sqlsrv_fetch_object($cursor ? $cursor : $this->cursor, $class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @param   mixed  $cursor  The optional result set cursor from which to fetch the row.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult($cursor = null)
+	{
+		sqlsrv_free_stmt($cursor ? $cursor : $this->cursor);
+	}
+
+	/**
+	 * Method to check and see if a field exists in a table.
+	 *
+	 * @param   string  $table  The table in which to verify the field.
+	 * @param   string  $field  The field to verify.
+	 *
+	 * @return  boolean  True if the field exists in the table.
+	 *
+	 * @since   12.1
+	 */
+	protected function checkFieldExists($table, $field)
+	{
+		$this->connect();
+
+		$table = $this->replacePrefix((string) $table);
+		$query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$table' AND COLUMN_NAME = '$field' ORDER BY ORDINAL_POSITION";
+		$this->setQuery($query);
+
+		if ($this->loadResult())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to wrap an SQL statement to provide a LIMIT and OFFSET behavior for scrolling through a result set.
+	 *
+	 * @param   string   $query   The SQL statement to process.
+	 * @param   integer  $limit   The maximum affected rows to set.
+	 * @param   integer  $offset  The affected row offset to set.
+	 *
+	 * @return  string   The processed SQL statement.
+	 *
+	 * @since   12.1
+	 */
+	protected function limit($query, $limit, $offset)
+	{
+		if ($limit)
+		{
+			$total = $offset + $limit;
+
+			$position = stripos($query, 'SELECT');
+			$distinct = stripos($query, 'SELECT DISTINCT');
+
+			if ($position === $distinct)
+			{
+				$query = substr_replace($query, 'SELECT DISTINCT TOP ' . (int) $total, $position, 15);
+			}
+			else
+			{
+				$query = substr_replace($query, 'SELECT TOP ' . (int) $total, $position, 6);
+			}
+		}
+
+		if (!$offset)
+		{
+			return $query;
+		}
+
+		return PHP_EOL
+			. 'SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS RowNumber FROM ('
+			. $query
+			. PHP_EOL . ') AS A) AS A WHERE RowNumber > ' . (int) $offset;
+	}
+
+	/**
+	 * Renames a table in the database.
+	 *
+	 * @param   string  $oldTable  The name of the table to be renamed
+	 * @param   string  $newTable  The new name for the table.
+	 * @param   string  $backup    Table prefix
+	 * @param   string  $prefix    For the table - used to rename constraints in non-mysql databases
+	 *
+	 * @return  JDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function renameTable($oldTable, $newTable, $backup = null, $prefix = null)
+	{
+		$constraints = array();
+
+		if (!is_null($prefix) && !is_null($backup))
+		{
+			$constraints = $this->getTableConstraints($oldTable);
+		}
+
+		if (!empty($constraints))
+		{
+			$this->renameConstraints($constraints, $prefix, $backup);
+		}
+
+		$this->setQuery("sp_rename '" . $oldTable . "', '" . $newTable . "'");
+
+		return $this->execute();
+	}
+
+	/**
+	 * Locks a table in the database.
+	 *
+	 * @param   string  $tableName  The name of the table to lock.
+	 *
+	 * @return  JDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function lockTable($tableName)
+	{
+		return $this;
+	}
+
+	/**
+	 * Unlocks tables in the database.
+	 *
+	 * @return  JDatabaseDriverSqlsrv  Returns this object to support chaining.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function unlockTables()
+	{
+		return $this;
+	}
+
+	/**
+	 * Return the actual SQL Error number
+	 *
+	 * @return  integer  The SQL Error number
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorNumber()
+	{
+		$errors = sqlsrv_errors();
+
+		return $errors[0]['code'];
+	}
+
+	/**
+	 * Return the actual SQL Error message
+	 *
+	 * @return  string  The SQL Error message
+	 *
+	 * @since   3.4.6
+	 */
+	protected function getErrorMessage()
+	{
+		$errors       = sqlsrv_errors();
+		$errorMessage = (string) $errors[0]['message'];
+
+		// Replace the Databaseprefix with `#__` if we are not in Debug
+		if (!$this->debug)
+		{
+			$errorMessage = str_replace($this->tablePrefix, '#__', $errorMessage);
+		}
+
+		return $errorMessage;
+	}
+
+	/**
+	 * Get the query strings to alter the character set and collation of a table.
+	 *
+	 * @param   string  $tableName  The name of the table
+	 *
+	 * @return  string[]  The queries required to alter the table's character set and collation
+	 *
+	 * @since   CMS 3.5.0
+	 */
+	public function getAlterTableCharacterSet($tableName)
+	{
+		return array();
+	}
+
+	/**
+	 * Return the query string to create new Database.
+	 * Each database driver, other than MySQL, need to override this member to return correct string.
+	 *
+	 * @param   stdClass  $options  Object used to pass user and database name to database driver.
+	 *                   This object must have "db_name" and "db_user" set.
+	 * @param   boolean   $utf      True if the database supports the UTF-8 character set.
+	 *
+	 * @return  string  The query that creates database
+	 *
+	 * @since   12.2
+	 */
+	protected function getCreateDatabaseQuery($options, $utf)
+	{
+		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);
+	}
+}
diff --git a/core/libraries/joomla/database/exception/connecting.php b/core/libraries/joomla/database/exception/connecting.php
new file mode 100644
index 00000000..9b0303b9
--- /dev/null
+++ b/core/libraries/joomla/database/exception/connecting.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an error connecting to the database platform
+ *
+ * @since  3.6
+ */
+class JDatabaseExceptionConnecting extends RuntimeException
+{
+}
diff --git a/core/libraries/joomla/database/exception/executing.php b/core/libraries/joomla/database/exception/executing.php
new file mode 100644
index 00000000..a79a366e
--- /dev/null
+++ b/core/libraries/joomla/database/exception/executing.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an error executing a statement
+ *
+ * @since  3.6
+ */
+class JDatabaseExceptionExecuting extends RuntimeException
+{
+	/**
+	 * The SQL statement that was executed.
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	private $query;
+
+	/**
+	 * Construct the exception
+	 *
+	 * @param   string     $query     The SQL statement that was executed.
+	 * @param   string     $message   The Exception message to throw. [optional]
+	 * @param   integer    $code      The Exception code. [optional]
+	 * @param   Exception  $previous  The previous exception used for the exception chaining. [optional]
+	 *
+	 * @since   3.6
+	 */
+	public function __construct($query, $message = '', $code = 0, Exception $previous = null)
+	{
+		parent::__construct($message, $code, $previous);
+
+		$this->query = $query;
+	}
+
+	/**
+	 * Get the SQL statement that was executed
+	 *
+	 * @return  string
+	 *
+	 * @since   3.6
+	 */
+	public function getQuery()
+	{
+		return $this->query;
+	}
+}
diff --git a/core/libraries/joomla/database/exception/unsupported.php b/core/libraries/joomla/database/exception/unsupported.php
new file mode 100644
index 00000000..7f8907f8
--- /dev/null
+++ b/core/libraries/joomla/database/exception/unsupported.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an unsupported database object
+ *
+ * @since  3.6
+ */
+class JDatabaseExceptionUnsupported extends RuntimeException
+{
+}
diff --git a/core/libraries/joomla/database/exporter.php b/core/libraries/joomla/database/exporter.php
new file mode 100644
index 00000000..08d49a26
--- /dev/null
+++ b/core/libraries/joomla/database/exporter.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Database Exporter Class
+ *
+ * @since  12.1
+ */
+abstract class JDatabaseExporter
+{
+	/**
+	 * The type of output format (xml).
+	 *
+	 * @var    string
+	 * @since  13.1
+	 */
+	protected $asFormat = 'xml';
+
+	/**
+	 * An array of cached data.
+	 *
+	 * @var    array
+	 * @since  13.1
+	 */
+	protected $cache = array();
+
+	/**
+	 * The database connector to use for exporting structure and/or data.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  13.1
+	 */
+	protected $db = null;
+
+	/**
+	 * An array input sources (table names).
+	 *
+	 * @var    array
+	 * @since  13.1
+	 */
+	protected $from = array();
+
+	/**
+	 * An array of options for the exporter.
+	 *
+	 * @var    object
+	 * @since  13.1
+	 */
+	protected $options = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * Sets up the default options for the exporter.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct()
+	{
+		$this->options = new stdClass;
+
+		$this->cache = array('columns' => array(), 'keys' => array());
+
+		// Set up the class defaults:
+
+		// Export with only structure
+		$this->withStructure();
+
+		// Export as xml.
+		$this->asXml();
+
+		// Default destination is a string using $output = (string) $exporter;
+	}
+
+	/**
+	 * Magic function to exports the data to a string.
+	 *
+	 * @return  string
+	 *
+	 * @since   13.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function __toString()
+	{
+		// Check everything is ok to run first.
+		$this->check();
+
+		// Get the format.
+		switch ($this->asFormat)
+		{
+			case 'xml':
+			default:
+				$buffer = $this->buildXml();
+				break;
+		}
+
+		return $buffer;
+	}
+
+	/**
+	 * Set the output option for the exporter to XML format.
+	 *
+	 * @return  JDatabaseExporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function asXml()
+	{
+		$this->asFormat = 'xml';
+
+		return $this;
+	}
+
+	/**
+	 * Builds the XML data for the tables to export.
+	 *
+	 * @return  string  An XML string
+	 *
+	 * @since   13.1
+	 * @throws  Exception if an error occurs.
+	 */
+	abstract protected function buildXml();
+
+	/**
+	 * Builds the XML structure to export.
+	 *
+	 * @return  array  An array of XML lines (strings).
+	 *
+	 * @since   13.1
+	 * @throws  Exception if an error occurs.
+	 */
+	abstract protected function buildXmlStructure();
+
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseDriver  Method supports chaining.
+	 *
+	 * @since   13.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	abstract public function check();
+
+	/**
+	 * Specifies a list of table names to export.
+	 *
+	 * @param   mixed  $from  The name of a single table, or an array of the table names to export.
+	 *
+	 * @return  JDatabaseExporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 * @throws  Exception if input is not a string or array.
+	 */
+	public function from($from)
+	{
+		if (is_string($from))
+		{
+			$this->from = array($from);
+		}
+		elseif (is_array($from))
+		{
+			$this->from = $from;
+		}
+		else
+		{
+			throw new Exception('JPLATFORM_ERROR_INPUT_REQUIRES_STRING_OR_ARRAY');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the generic name of the table, converting the database prefix to the wildcard string.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  string  The name of the table with the database prefix replaced with #__.
+	 *
+	 * @since   13.1
+	 */
+	protected function getGenericTableName($table)
+	{
+		$prefix = $this->db->getPrefix();
+
+		// Replace the magic prefix if found.
+		$table = preg_replace("|^$prefix|", '#__', $table);
+
+		return $table;
+	}
+
+	/**
+	 * Sets the database connector to use for exporting structure and/or data from MySQL.
+	 *
+	 * @param   JDatabaseDriver  $db  The database connector.
+	 *
+	 * @return  JDatabaseExporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setDbo(JDatabaseDriver $db)
+	{
+		$this->db = $db;
+
+		return $this;
+	}
+
+	/**
+	 * Sets an internal option to export the structure of the input table(s).
+	 *
+	 * @param   boolean  $setting  True to export the structure, false to not.
+	 *
+	 * @return  JDatabaseExporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function withStructure($setting = true)
+	{
+		$this->options->withStructure = (boolean) $setting;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/exporter/mysql.php b/core/libraries/joomla/database/exporter/mysql.php
new file mode 100644
index 00000000..a588a98d
--- /dev/null
+++ b/core/libraries/joomla/database/exporter/mysql.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL export driver.
+ *
+ * @since       11.1
+ * @deprecated  4.0  Use MySQLi or PDO MySQL instead
+ */
+class JDatabaseExporterMysql extends JDatabaseExporterMysqli
+{
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseExporterMysql  Method supports chaining.
+	 *
+	 * @since   11.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverMysql))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/exporter/mysqli.php b/core/libraries/joomla/database/exporter/mysqli.php
new file mode 100644
index 00000000..358ac675
--- /dev/null
+++ b/core/libraries/joomla/database/exporter/mysqli.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQLi export driver.
+ *
+ * @since  11.1
+ */
+class JDatabaseExporterMysqli extends JDatabaseExporter
+{
+	/**
+	 * Builds the XML data for the tables to export.
+	 *
+	 * @return  string  An XML string
+	 *
+	 * @since   11.1
+	 * @throws  Exception if an error occurs.
+	 */
+	protected function buildXml()
+	{
+		$buffer = array();
+
+		$buffer[] = '<?xml version="1.0"?>';
+		$buffer[] = '<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+		$buffer[] = ' <database name="">';
+
+		$buffer = array_merge($buffer, $this->buildXmlStructure());
+
+		$buffer[] = ' </database>';
+		$buffer[] = '</mysqldump>';
+
+		return implode("\n", $buffer);
+	}
+
+	/**
+	 * Builds the XML structure to export.
+	 *
+	 * @return  array  An array of XML lines (strings).
+	 *
+	 * @since   11.1
+	 * @throws  Exception if an error occurs.
+	 */
+	protected function buildXmlStructure()
+	{
+		$buffer = array();
+
+		foreach ($this->from as $table)
+		{
+			// Replace the magic prefix if found.
+			$table = $this->getGenericTableName($table);
+
+			// Get the details columns information.
+			$fields = $this->db->getTableColumns($table, false);
+			$keys = $this->db->getTableKeys($table);
+
+			$buffer[] = '  <table_structure name="' . $table . '">';
+
+			foreach ($fields as $field)
+			{
+				$buffer[] = '   <field Field="' . $field->Field . '"' . ' Type="' . $field->Type . '"' . ' Null="' . $field->Null . '"' . ' Key="' .
+					$field->Key . '"' . (isset($field->Default) ? ' Default="' . $field->Default . '"' : '') . ' Extra="' . $field->Extra . '"' .
+					' />';
+			}
+
+			foreach ($keys as $key)
+			{
+				$buffer[] = '   <key Table="' . $table . '"' . ' Non_unique="' . $key->Non_unique . '"' . ' Key_name="' . $key->Key_name . '"' .
+					' Seq_in_index="' . $key->Seq_in_index . '"' . ' Column_name="' . $key->Column_name . '"' . ' Collation="' . $key->Collation . '"' .
+					' Null="' . $key->Null . '"' . ' Index_type="' . $key->Index_type . '"' .
+					' Comment="' . htmlspecialchars($key->Comment, ENT_COMPAT, 'UTF-8') . '"' . ' />';
+			}
+
+			$buffer[] = '  </table_structure>';
+		}
+
+		return $buffer;
+	}
+
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseExporterMysqli  Method supports chaining.
+	 *
+	 * @since   11.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverMysqli))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/exporter/pdomysql.php b/core/libraries/joomla/database/exporter/pdomysql.php
new file mode 100644
index 00000000..b902a213
--- /dev/null
+++ b/core/libraries/joomla/database/exporter/pdomysql.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL export driver for the PDO based MySQL database driver.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @since       3.4
+ */
+class JDatabaseExporterPdomysql extends JDatabaseExporter
+{
+	/**
+	 * Builds the XML data for the tables to export.
+	 *
+	 * @return  string  An XML string
+	 *
+	 * @since   3.4
+	 * @throws  Exception if an error occurs.
+	 */
+	protected function buildXml()
+	{
+		$buffer   = array();
+
+		$buffer[] = '<?xml version="1.0"?>';
+		$buffer[] = '<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+		$buffer[] = ' <database name="">';
+
+		$buffer   = array_merge($buffer, $this->buildXmlStructure());
+
+		$buffer[] = ' </database>';
+		$buffer[] = '</mysqldump>';
+
+		return implode("\n", $buffer);
+	}
+
+	/**
+	 * Builds the XML structure to export.
+	 *
+	 * @return  array  An array of XML lines (strings).
+	 *
+	 * @since   3.4
+	 * @throws  Exception if an error occurs.
+	 */
+	protected function buildXmlStructure()
+	{
+		$buffer = array();
+
+		foreach ($this->from as $table)
+		{
+			// Replace the magic prefix if found.
+			$table = $this->getGenericTableName($table);
+
+			// Get the details columns information.
+			$fields = $this->db->getTableColumns($table, false);
+			$keys   = $this->db->getTableKeys($table);
+
+			$buffer[] = '  <table_structure name="' . $table . '">';
+
+			foreach ($fields as $field)
+			{
+				$buffer[] = '   <field Field="' . $field->Field . '"' . ' Type="' . $field->Type . '"' . ' Null="' . $field->Null . '"' . ' Key="' .
+					$field->Key . '"' . (isset($field->Default) ? ' Default="' . $field->Default . '"' : '') . ' Extra="' . $field->Extra . '"' .
+					' />';
+			}
+
+			foreach ($keys as $key)
+			{
+				$buffer[] = '   <key Table="' . $table . '"' . ' Non_unique="' . $key->Non_unique . '"' . ' Key_name="' . $key->Key_name . '"' .
+					' Seq_in_index="' . $key->Seq_in_index . '"' . ' Column_name="' . $key->Column_name . '"' . ' Collation="' . $key->Collation . '"' .
+					' Null="' . $key->Null . '"' . ' Index_type="' . $key->Index_type . '"' .
+					' Comment="' . htmlspecialchars($key->Comment, ENT_COMPAT, 'UTF-8') . '"' . ' />';
+			}
+
+			$buffer[] = '  </table_structure>';
+		}
+
+		return $buffer;
+	}
+
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseExporterPdomysql  Method supports chaining.
+	 *
+	 * @since   3.4
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverPdomysql))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/exporter/postgresql.php b/core/libraries/joomla/database/exporter/postgresql.php
new file mode 100644
index 00000000..7bf5066b
--- /dev/null
+++ b/core/libraries/joomla/database/exporter/postgresql.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PostgreSQL export driver.
+ *
+ * @since  12.1
+ *
+ * @property-read  JDatabaseDriverPostgresql  $db  The database connector to use for exporting structure and/or data.
+ */
+class JDatabaseExporterPostgresql extends JDatabaseExporter
+{
+	/**
+	 * Builds the XML data for the tables to export.
+	 *
+	 * @return  string  An XML string
+	 *
+	 * @since   12.1
+	 * @throws  Exception if an error occurs.
+	 */
+	protected function buildXml()
+	{
+		$buffer = array();
+
+		$buffer[] = '<?xml version="1.0"?>';
+		$buffer[] = '<postgresqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+		$buffer[] = ' <database name="">';
+
+		$buffer = array_merge($buffer, $this->buildXmlStructure());
+
+		$buffer[] = ' </database>';
+		$buffer[] = '</postgresqldump>';
+
+		return implode("\n", $buffer);
+	}
+
+	/**
+	 * Builds the XML structure to export.
+	 *
+	 * @return  array  An array of XML lines (strings).
+	 *
+	 * @since   12.1
+	 * @throws  Exception if an error occurs.
+	 */
+	protected function buildXmlStructure()
+	{
+		$buffer = array();
+
+		foreach ($this->from as $table)
+		{
+			// Replace the magic prefix if found.
+			$table = $this->getGenericTableName($table);
+
+			// Get the details columns information.
+			$fields = $this->db->getTableColumns($table, false);
+			$keys = $this->db->getTableKeys($table);
+			$sequences = $this->db->getTableSequences($table);
+
+			$buffer[] = '  <table_structure name="' . $table . '">';
+
+			foreach ($sequences as $sequence)
+			{
+				if (version_compare($this->db->getVersion(), '9.1.0') < 0)
+				{
+					$sequence->start_value = null;
+				}
+
+				$buffer[] = '   <sequence Name="' . $sequence->sequence . '"' . ' Schema="' . $sequence->schema . '"' .
+					' Table="' . $sequence->table . '"' . ' Column="' . $sequence->column . '"' . ' Type="' . $sequence->data_type . '"' .
+					' Start_Value="' . $sequence->start_value . '"' . ' Min_Value="' . $sequence->minimum_value . '"' .
+					' Max_Value="' . $sequence->maximum_value . '"' . ' Increment="' . $sequence->increment . '"' .
+					' Cycle_option="' . $sequence->cycle_option . '"' .
+					' />';
+			}
+
+			foreach ($fields as $field)
+			{
+				$buffer[] = '   <field Field="' . $field->column_name . '"' . ' Type="' . $field->type . '"' . ' Null="' . $field->null . '"' .
+							(isset($field->default) ? ' Default="' . $field->default . '"' : '') . ' Comments="' . $field->comments . '"' .
+					' />';
+			}
+
+			foreach ($keys as $key)
+			{
+				$buffer[] = '   <key Index="' . $key->idxName . '"' . ' is_primary="' . $key->isPrimary . '"' . ' is_unique="' . $key->isUnique . '"' .
+					' Query="' . $key->Query . '" />';
+			}
+
+			$buffer[] = '  </table_structure>';
+		}
+
+		return $buffer;
+	}
+
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseExporterPostgresql  Method supports chaining.
+	 *
+	 * @since   12.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverPostgresql))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/factory.php b/core/libraries/joomla/database/factory.php
new file mode 100644
index 00000000..8f279ad0
--- /dev/null
+++ b/core/libraries/joomla/database/factory.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Database Factory class
+ *
+ * @since  12.1
+ */
+class JDatabaseFactory
+{
+	/**
+	 * Contains the current JDatabaseFactory instance
+	 *
+	 * @var    JDatabaseFactory
+	 * @since  12.1
+	 */
+	private static $_instance = null;
+
+	/**
+	 * Method to return a JDatabaseDriver instance based on the given options. There are three global options and then
+	 * the rest are specific to the database driver. The 'database' option determines which database is to
+	 * be used for the connection. The 'select' option determines whether the connector should automatically select
+	 * the chosen database.
+	 *
+	 * Instances are unique to the given options and new objects are only created when a unique options array is
+	 * passed into the method.  This ensures that we don't end up with unnecessary database connection resources.
+	 *
+	 * @param   string  $name     Name of the database driver you'd like to instantiate
+	 * @param   array   $options  Parameters to be passed to the database driver.
+	 *
+	 * @return  JDatabaseDriver  A database driver object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getDriver($name = 'mysqli', $options = array())
+	{
+		// Sanitize the database connector options.
+		$options['driver']   = preg_replace('/[^A-Z0-9_\.-]/i', '', $name);
+		$options['database'] = (isset($options['database'])) ? $options['database'] : null;
+		$options['select']   = (isset($options['select'])) ? $options['select'] : true;
+
+		// Derive the class name from the driver.
+		$class = 'JDatabaseDriver' . ucfirst(strtolower($options['driver']));
+
+		// If the class still doesn't exist we have nothing left to do but throw an exception.  We did our best.
+		if (!class_exists($class))
+		{
+			throw new JDatabaseExceptionUnsupported(sprintf('Unable to load Database Driver: %s', $options['driver']));
+		}
+
+		// Create our new JDatabaseDriver connector based on the options given.
+		try
+		{
+			$instance = new $class($options);
+		}
+		catch (RuntimeException $e)
+		{
+			throw new JDatabaseExceptionConnecting(sprintf('Unable to connect to the Database: %s', $e->getMessage()), $e->getCode(), $e);
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * Gets an exporter class object.
+	 *
+	 * @param   string           $name  Name of the driver you want an exporter for.
+	 * @param   JDatabaseDriver  $db    Optional JDatabaseDriver instance
+	 *
+	 * @return  JDatabaseExporter  An exporter object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getExporter($name, JDatabaseDriver $db = null)
+	{
+		// Derive the class name from the driver.
+		$class = 'JDatabaseExporter' . ucfirst(strtolower($name));
+
+		// Make sure we have an exporter class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new JDatabaseExceptionUnsupported('Database Exporter not found.');
+		}
+
+		$o = new $class;
+
+		if ($db instanceof JDatabaseDriver)
+		{
+			$o->setDbo($db);
+		}
+
+		return $o;
+	}
+
+	/**
+	 * Gets an importer class object.
+	 *
+	 * @param   string           $name  Name of the driver you want an importer for.
+	 * @param   JDatabaseDriver  $db    Optional JDatabaseDriver instance
+	 *
+	 * @return  JDatabaseImporter  An importer object.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getImporter($name, JDatabaseDriver $db = null)
+	{
+		// Derive the class name from the driver.
+		$class = 'JDatabaseImporter' . ucfirst(strtolower($name));
+
+		// Make sure we have an importer class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new JDatabaseExceptionUnsupported('Database importer not found.');
+		}
+
+		$o = new $class;
+
+		if ($db instanceof JDatabaseDriver)
+		{
+			$o->setDbo($db);
+		}
+
+		return $o;
+	}
+
+	/**
+	 * Gets an instance of the factory object.
+	 *
+	 * @return  JDatabaseFactory
+	 *
+	 * @since   12.1
+	 */
+	public static function getInstance()
+	{
+		return self::$_instance ? self::$_instance : new JDatabaseFactory;
+	}
+
+	/**
+	 * Get the current query object or a new JDatabaseQuery object.
+	 *
+	 * @param   string           $name  Name of the driver you want an query object for.
+	 * @param   JDatabaseDriver  $db    Optional JDatabaseDriver instance
+	 *
+	 * @return  JDatabaseQuery  The current query object or a new object extending the JDatabaseQuery class.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function getQuery($name, JDatabaseDriver $db = null)
+	{
+		// Derive the class name from the driver.
+		$class = 'JDatabaseQuery' . ucfirst(strtolower($name));
+
+		// Make sure we have a query class for this driver.
+		if (!class_exists($class))
+		{
+			// If it doesn't exist we are at an impasse so throw an exception.
+			throw new JDatabaseExceptionUnsupported('Database Query class not found');
+		}
+
+		return new $class($db);
+	}
+
+	/**
+	 * Gets an instance of a factory object to return on subsequent calls of getInstance.
+	 *
+	 * @param   JDatabaseFactory  $instance  A JDatabaseFactory object.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public static function setInstance(JDatabaseFactory $instance = null)
+	{
+		self::$_instance = $instance;
+	}
+}
diff --git a/core/libraries/joomla/database/importer.php b/core/libraries/joomla/database/importer.php
new file mode 100644
index 00000000..a5a5d713
--- /dev/null
+++ b/core/libraries/joomla/database/importer.php
@@ -0,0 +1,242 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Database Importer Class
+ *
+ * @since  12.1
+ */
+abstract class JDatabaseImporter
+{
+	/**
+	 * @var    array  An array of cached data.
+	 * @since  13.1
+	 */
+	protected $cache = array();
+
+	/**
+	 * The database connector to use for exporting structure and/or data.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  13.1
+	 */
+	protected $db = null;
+
+	/**
+	 * The input source.
+	 *
+	 * @var    mixed
+	 * @since  13.1
+	 */
+	protected $from = array();
+
+	/**
+	 * The type of input format (XML).
+	 *
+	 * @var    string
+	 * @since  13.1
+	 */
+	protected $asFormat = 'xml';
+
+	/**
+	 * An array of options for the exporter.
+	 *
+	 * @var    object
+	 * @since  13.1
+	 */
+	protected $options = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * Sets up the default options for the exporter.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct()
+	{
+		$this->options = new stdClass;
+
+		$this->cache = array('columns' => array(), 'keys' => array());
+
+		// Set up the class defaults:
+
+		// Import with only structure
+		$this->withStructure();
+
+		// Export as XML.
+		$this->asXml();
+
+		// Default destination is a string using $output = (string) $exporter;
+	}
+
+	/**
+	 * Set the output option for the exporter to XML format.
+	 *
+	 * @return  JDatabaseImporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function asXml()
+	{
+		$this->asFormat = 'xml';
+
+		return $this;
+	}
+
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseImporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	abstract public function check();
+
+	/**
+	 * Specifies the data source to import.
+	 *
+	 * @param   mixed  $from  The data source to import.
+	 *
+	 * @return  JDatabaseImporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function from($from)
+	{
+		$this->from = $from;
+
+		return $this;
+	}
+
+	/**
+	 * Get the SQL syntax to drop a column.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   string  $name   The name of the field to drop.
+	 *
+	 * @return  string
+	 *
+	 * @since   13.1
+	 */
+	protected function getDropColumnSql($table, $name)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' DROP COLUMN ' . $this->db->quoteName($name);
+	}
+
+	/**
+	 * Get the real name of the table, converting the prefix wildcard string if present.
+	 *
+	 * @param   string  $table  The name of the table.
+	 *
+	 * @return  string	The real name of the table.
+	 *
+	 * @since   13.1
+	 */
+	protected function getRealTableName($table)
+	{
+		$prefix = $this->db->getPrefix();
+
+		// Replace the magic prefix if found.
+		$table = preg_replace('|^#__|', $prefix, $table);
+
+		return $table;
+	}
+
+	/**
+	 * Merges the incoming structure definition with the existing structure.
+	 *
+	 * @return  void
+	 *
+	 * @note    Currently only supports XML format.
+	 * @since   13.1
+	 * @throws  RuntimeException on error.
+	 */
+	public function mergeStructure()
+	{
+		$prefix = $this->db->getPrefix();
+		$tables = $this->db->getTableList();
+
+		if ($this->from instanceof SimpleXMLElement)
+		{
+			$xml = $this->from;
+		}
+		else
+		{
+			$xml = new SimpleXMLElement($this->from);
+		}
+
+		// Get all the table definitions.
+		$xmlTables = $xml->xpath('database/table_structure');
+
+		foreach ($xmlTables as $table)
+		{
+			// Convert the magic prefix into the real table name.
+			$tableName = (string) $table['name'];
+			$tableName = preg_replace('|^#__|', $prefix, $tableName);
+
+			if (in_array($tableName, $tables))
+			{
+				// The table already exists. Now check if there is any difference.
+				if ($queries = $this->getAlterTableSql($xml->database->table_structure))
+				{
+					// Run the queries to upgrade the data structure.
+					foreach ($queries as $query)
+					{
+						$this->db->setQuery((string) $query);
+						$this->db->execute();
+					}
+				}
+			}
+			else
+			{
+				// This is a new table.
+				$sql = $this->xmlToCreate($table);
+
+				$this->db->setQuery((string) $sql);
+				$this->db->execute();
+			}
+		}
+	}
+
+	/**
+	 * Sets the database connector to use for exporting structure and/or data.
+	 *
+	 * @param   JDatabaseDriver  $db  The database connector.
+	 *
+	 * @return  JDatabaseImporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setDbo(JDatabaseDriver $db)
+	{
+		$this->db = $db;
+
+		return $this;
+	}
+
+	/**
+	 * Sets an internal option to merge the structure based on the input data.
+	 *
+	 * @param   boolean  $setting  True to export the structure, false to not.
+	 *
+	 * @return  JDatabaseImporter  Method supports chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function withStructure($setting = true)
+	{
+		$this->options->withStructure = (boolean) $setting;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/importer/mysql.php b/core/libraries/joomla/database/importer/mysql.php
new file mode 100644
index 00000000..d41d497b
--- /dev/null
+++ b/core/libraries/joomla/database/importer/mysql.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL import driver.
+ *
+ * @since       11.1
+ * @deprecated  4.0  Use MySQLi or PDO MySQL instead
+ */
+class JDatabaseImporterMysql extends JDatabaseImporterMysqli
+{
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseImporterMysql  Method supports chaining.
+	 *
+	 * @since   11.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverMysql))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/importer/mysqli.php b/core/libraries/joomla/database/importer/mysqli.php
new file mode 100644
index 00000000..60921533
--- /dev/null
+++ b/core/libraries/joomla/database/importer/mysqli.php
@@ -0,0 +1,450 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQLi import driver.
+ *
+ * @since  11.1
+ */
+class JDatabaseImporterMysqli extends JDatabaseImporter
+{
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseImporterMysqli  Method supports chaining.
+	 *
+	 * @since   11.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverMysqli))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the SQL syntax to add a table.
+	 *
+	 * @param   SimpleXMLElement  $table  The table information.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	protected function xmlToCreate(SimpleXMLElement $table)
+	{
+		$existingTables = $this->db->getTableList();
+		$tableName = (string) $table['name'];
+
+		if (in_array($tableName, $existingTables))
+		{
+			throw new RuntimeException('The table you are trying to create already exists');
+		}
+
+		$createTableStatement = 'CREATE TABLE ' . $this->db->quoteName($tableName) . ' (';
+
+		foreach ($table->xpath('field') as $field)
+		{
+			$createTableStatement .= $this->getColumnSQL($field) . ', ';
+		}
+
+		$newLookup = $this->getKeyLookup($table->xpath('key'));
+
+		// Loop through each key in the new structure.
+		foreach ($newLookup as $key)
+		{
+			$createTableStatement .= $this->getKeySQL($key) . ', ';
+		}
+
+		// Remove the comma after the last key
+		$createTableStatement = rtrim($createTableStatement, ', ');
+
+		$createTableStatement .= ')';
+
+		return $createTableStatement;
+	}
+
+	/**
+	 * Get the SQL syntax to add a column.
+	 *
+	 * @param   string            $table  The table name.
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getAddColumnSql($table, SimpleXMLElement $field)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' ADD COLUMN ' . $this->getColumnSql($field);
+	}
+
+	/**
+	 * Get the SQL syntax to add a key.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   array   $keys   An array of the fields pertaining to this key.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getAddKeySql($table, $keys)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' ADD ' . $this->getKeySql($keys);
+	}
+
+	/**
+	 * Get alters for table if there is a difference.
+	 *
+	 * @param   SimpleXMLElement  $structure  The XML structure pf the table.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	protected function getAlterTableSql(SimpleXMLElement $structure)
+	{
+		$table = $this->getRealTableName($structure['name']);
+		$oldFields = $this->db->getTableColumns($table, false);
+		$oldKeys = $this->db->getTableKeys($table);
+		$alters = array();
+
+		// Get the fields and keys from the XML that we are aiming for.
+		$newFields = $structure->xpath('field');
+		$newKeys = $structure->xpath('key');
+
+		// Loop through each field in the new structure.
+		foreach ($newFields as $field)
+		{
+			$fName = (string) $field['Field'];
+
+			if (isset($oldFields[$fName]))
+			{
+				// The field exists, check it's the same.
+				$column = $oldFields[$fName];
+
+				// Test whether there is a change.
+				$change = ((string) $field['Type'] != $column->Type) || ((string) $field['Null'] != $column->Null)
+					|| ((string) $field['Default'] != $column->Default) || ((string) $field['Extra'] != $column->Extra);
+
+				if ($change)
+				{
+					$alters[] = $this->getChangeColumnSql($table, $field);
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldFields[$fName]);
+			}
+			else
+			{
+				// The field is new.
+				$alters[] = $this->getAddColumnSql($table, $field);
+			}
+		}
+
+		// Any columns left are orphans
+		foreach ($oldFields as $name => $column)
+		{
+			// Delete the column.
+			$alters[] = $this->getDropColumnSql($table, $name);
+		}
+
+		// Get the lookups for the old and new keys.
+		$oldLookup = $this->getKeyLookup($oldKeys);
+		$newLookup = $this->getKeyLookup($newKeys);
+
+		// Loop through each key in the new structure.
+		foreach ($newLookup as $name => $keys)
+		{
+			// Check if there are keys on this field in the existing table.
+			if (isset($oldLookup[$name]))
+			{
+				$same = true;
+				$newCount = count($newLookup[$name]);
+				$oldCount = count($oldLookup[$name]);
+
+				// There is a key on this field in the old and new tables. Are they the same?
+				if ($newCount == $oldCount)
+				{
+					// Need to loop through each key and do a fine grained check.
+					for ($i = 0; $i < $newCount; $i++)
+					{
+						$same = (((string) $newLookup[$name][$i]['Non_unique'] == $oldLookup[$name][$i]->Non_unique)
+							&& ((string) $newLookup[$name][$i]['Column_name'] == $oldLookup[$name][$i]->Column_name)
+							&& ((string) $newLookup[$name][$i]['Seq_in_index'] == $oldLookup[$name][$i]->Seq_in_index)
+							&& ((string) $newLookup[$name][$i]['Collation'] == $oldLookup[$name][$i]->Collation)
+							&& ((string) $newLookup[$name][$i]['Index_type'] == $oldLookup[$name][$i]->Index_type));
+
+						/*
+						Debug.
+						echo '<pre>';
+						echo '<br />Non_unique:   '.
+							((string) $newLookup[$name][$i]['Non_unique'] == $oldLookup[$name][$i]->Non_unique ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Non_unique'].' vs '.$oldLookup[$name][$i]->Non_unique;
+						echo '<br />Column_name:  '.
+							((string) $newLookup[$name][$i]['Column_name'] == $oldLookup[$name][$i]->Column_name ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Column_name'].' vs '.$oldLookup[$name][$i]->Column_name;
+						echo '<br />Seq_in_index: '.
+							((string) $newLookup[$name][$i]['Seq_in_index'] == $oldLookup[$name][$i]->Seq_in_index ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Seq_in_index'].' vs '.$oldLookup[$name][$i]->Seq_in_index;
+						echo '<br />Collation:    '.
+							((string) $newLookup[$name][$i]['Collation'] == $oldLookup[$name][$i]->Collation ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Collation'].' vs '.$oldLookup[$name][$i]->Collation;
+						echo '<br />Index_type:   '.
+							((string) $newLookup[$name][$i]['Index_type'] == $oldLookup[$name][$i]->Index_type ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Index_type'].' vs '.$oldLookup[$name][$i]->Index_type;
+						echo '<br />Same = '.($same ? 'true' : 'false');
+						echo '</pre>';
+						 */
+
+						if (!$same)
+						{
+							// Break out of the loop. No need to check further.
+							break;
+						}
+					}
+				}
+				else
+				{
+					// Count is different, just drop and add.
+					$same = false;
+				}
+
+				if (!$same)
+				{
+					$alters[] = $this->getDropKeySql($table, $name);
+					$alters[] = $this->getAddKeySql($table, $keys);
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldLookup[$name]);
+			}
+			else
+			{
+				// This is a new key.
+				$alters[] = $this->getAddKeySql($table, $keys);
+			}
+		}
+
+		// Any keys left are orphans.
+		foreach ($oldLookup as $name => $keys)
+		{
+			if (strtoupper($name) == 'PRIMARY')
+			{
+				$alters[] = $this->getDropPrimaryKeySql($table);
+			}
+			else
+			{
+				$alters[] = $this->getDropKeySql($table, $name);
+			}
+		}
+
+		return $alters;
+	}
+
+	/**
+	 * Get the syntax to alter a column.
+	 *
+	 * @param   string            $table  The name of the database table to alter.
+	 * @param   SimpleXMLElement  $field  The XML definition for the field.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getChangeColumnSql($table, SimpleXMLElement $field)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' CHANGE COLUMN ' . $this->db->quoteName((string) $field['Field']) . ' '
+			. $this->getColumnSql($field);
+	}
+
+	/**
+	 * Get the SQL syntax for a single column that would be included in a table create or alter statement.
+	 *
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getColumnSql(SimpleXMLElement $field)
+	{
+		// TODO Incorporate into parent class and use $this.
+		$blobs = array('text', 'smalltext', 'mediumtext', 'largetext');
+
+		$fName = (string) $field['Field'];
+		$fType = (string) $field['Type'];
+		$fNull = (string) $field['Null'];
+		$fDefault = isset($field['Default']) ? (string) $field['Default'] : null;
+		$fExtra = (string) $field['Extra'];
+
+		$query = $this->db->quoteName($fName) . ' ' . $fType;
+
+		if ($fNull == 'NO')
+		{
+			if (in_array($fType, $blobs) || $fDefault === null)
+			{
+				$query .= ' NOT NULL';
+			}
+			else
+			{
+				// TODO Don't quote numeric values.
+				$query .= ' NOT NULL DEFAULT ' . $this->db->quote($fDefault);
+			}
+		}
+		else
+		{
+			if ($fDefault === null)
+			{
+				$query .= ' DEFAULT NULL';
+			}
+			else
+			{
+				// TODO Don't quote numeric values.
+				$query .= ' DEFAULT ' . $this->db->quote($fDefault);
+			}
+		}
+
+		if ($fExtra)
+		{
+			$query .= ' ' . strtoupper($fExtra);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Get the SQL syntax to drop a key.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   string  $name   The name of the key to drop.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getDropKeySql($table, $name)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' DROP KEY ' . $this->db->quoteName($name);
+	}
+
+	/**
+	 * Get the SQL syntax to drop a key.
+	 *
+	 * @param   string  $table  The table name.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getDropPrimaryKeySql($table)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' DROP PRIMARY KEY';
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   array  $keys  An array of objects that comprise the keys for the table.
+	 *
+	 * @return  array  The lookup array. array({key name} => array(object, ...))
+	 *
+	 * @since   11.1
+	 * @throws  Exception
+	 */
+	protected function getKeyLookup($keys)
+	{
+		// First pass, create a lookup of the keys.
+		$lookup = array();
+
+		foreach ($keys as $key)
+		{
+			if ($key instanceof SimpleXMLElement)
+			{
+				$kName = (string) $key['Key_name'];
+			}
+			else
+			{
+				$kName = $key->Key_name;
+			}
+
+			if (empty($lookup[$kName]))
+			{
+				$lookup[$kName] = array();
+			}
+
+			$lookup[$kName][] = $key;
+		}
+
+		return $lookup;
+	}
+
+	/**
+	 * Get the SQL syntax for a key.
+	 *
+	 * @param   array  $columns  An array of SimpleXMLElement objects comprising the key.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function getKeySql($columns)
+	{
+		// TODO Error checking on array and element types.
+
+		$kNonUnique = (string) $columns[0]['Non_unique'];
+		$kName = (string) $columns[0]['Key_name'];
+		$kColumn = (string) $columns[0]['Column_name'];
+
+		$prefix = '';
+
+		if ($kName == 'PRIMARY')
+		{
+			$prefix = 'PRIMARY ';
+		}
+		elseif ($kNonUnique == 0)
+		{
+			$prefix = 'UNIQUE ';
+		}
+
+		$nColumns = count($columns);
+		$kColumns = array();
+
+		if ($nColumns == 1)
+		{
+			$kColumns[] = $this->db->quoteName($kColumn);
+		}
+		else
+		{
+			foreach ($columns as $column)
+			{
+				$kColumns[] = (string) $column['Column_name'];
+			}
+		}
+
+		$query = $prefix . 'KEY ' . ($kName != 'PRIMARY' ? $this->db->quoteName($kName) : '') . ' (' . implode(',', $kColumns) . ')';
+
+		return $query;
+	}
+}
diff --git a/core/libraries/joomla/database/importer/pdomysql.php b/core/libraries/joomla/database/importer/pdomysql.php
new file mode 100644
index 00000000..c65b3572
--- /dev/null
+++ b/core/libraries/joomla/database/importer/pdomysql.php
@@ -0,0 +1,437 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL import driver for the PDO based MySQL database driver.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @since       3.4
+ */
+class JDatabaseImporterPdomysql extends JDatabaseImporter
+{
+	/**
+	 * Get the SQL syntax to add a column.
+	 *
+	 * @param   string            $table  The table name.
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getAddColumnSql($table, SimpleXMLElement $field)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteName($table) . ' ADD COLUMN ' . $this->getColumnSql($field);
+
+		return $sql;
+	}
+
+	/**
+	 * Get the SQL syntax to add a key.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   array   $keys   An array of the fields pertaining to this key.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getAddKeySql($table, $keys)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteName($table) . ' ADD ' . $this->getKeySql($keys);
+
+		return $sql;
+	}
+
+	/**
+	 * Get alters for table if there is a difference.
+	 *
+	 * @param   SimpleXMLElement  $structure  The XML structure pf the table.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.4
+	 */
+	protected function getAlterTableSql(SimpleXMLElement $structure)
+	{
+		// Initialise variables.
+		$table     = $this->getRealTableName($structure['name']);
+		$oldFields = $this->db->getTableColumns($table);
+		$oldKeys   = $this->db->getTableKeys($table);
+		$alters    = array();
+
+		// Get the fields and keys from the XML that we are aiming for.
+		$newFields = $structure->xpath('field');
+		$newKeys   = $structure->xpath('key');
+
+		// Loop through each field in the new structure.
+		foreach ($newFields as $field)
+		{
+			$fName = (string) $field['Field'];
+
+			if (isset($oldFields[$fName]))
+			{
+				// The field exists, check it's the same.
+				$column = $oldFields[$fName];
+
+				// Test whether there is a change.
+				$change = ((string) $field['Type'] != $column->Type) || ((string) $field['Null'] != $column->Null)
+					|| ((string) $field['Default'] != $column->Default) || ((string) $field['Extra'] != $column->Extra);
+
+				if ($change)
+				{
+					$alters[] = $this->getChangeColumnSql($table, $field);
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldFields[$fName]);
+			}
+			else
+			{
+				// The field is new.
+				$alters[] = $this->getAddColumnSql($table, $field);
+			}
+		}
+
+		// Any columns left are orphans
+		foreach ($oldFields as $name => $column)
+		{
+			// Delete the column.
+			$alters[] = $this->getDropColumnSql($table, $name);
+		}
+
+		// Get the lookups for the old and new keys.
+		$oldLookup = $this->getKeyLookup($oldKeys);
+		$newLookup = $this->getKeyLookup($newKeys);
+
+		// Loop through each key in the new structure.
+		foreach ($newLookup as $name => $keys)
+		{
+			// Check if there are keys on this field in the existing table.
+			if (isset($oldLookup[$name]))
+			{
+				$same     = true;
+				$newCount = count($newLookup[$name]);
+				$oldCount = count($oldLookup[$name]);
+
+				// There is a key on this field in the old and new tables. Are they the same?
+				if ($newCount == $oldCount)
+				{
+					// Need to loop through each key and do a fine grained check.
+					for ($i = 0; $i < $newCount; $i++)
+					{
+						$same = (((string) $newLookup[$name][$i]['Non_unique'] == $oldLookup[$name][$i]->Non_unique)
+							&& ((string) $newLookup[$name][$i]['Column_name'] == $oldLookup[$name][$i]->Column_name)
+							&& ((string) $newLookup[$name][$i]['Seq_in_index'] == $oldLookup[$name][$i]->Seq_in_index)
+							&& ((string) $newLookup[$name][$i]['Collation'] == $oldLookup[$name][$i]->Collation)
+							&& ((string) $newLookup[$name][$i]['Index_type'] == $oldLookup[$name][$i]->Index_type));
+
+						/*
+						Debug.
+						echo '<pre>';
+						echo '<br />Non_unique:   '.
+							((string) $newLookup[$name][$i]['Non_unique'] == $oldLookup[$name][$i]->Non_unique ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Non_unique'].' vs '.$oldLookup[$name][$i]->Non_unique;
+						echo '<br />Column_name:  '.
+							((string) $newLookup[$name][$i]['Column_name'] == $oldLookup[$name][$i]->Column_name ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Column_name'].' vs '.$oldLookup[$name][$i]->Column_name;
+						echo '<br />Seq_in_index: '.
+							((string) $newLookup[$name][$i]['Seq_in_index'] == $oldLookup[$name][$i]->Seq_in_index ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Seq_in_index'].' vs '.$oldLookup[$name][$i]->Seq_in_index;
+						echo '<br />Collation:    '.
+							((string) $newLookup[$name][$i]['Collation'] == $oldLookup[$name][$i]->Collation ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Collation'].' vs '.$oldLookup[$name][$i]->Collation;
+						echo '<br />Index_type:   '.
+							((string) $newLookup[$name][$i]['Index_type'] == $oldLookup[$name][$i]->Index_type ? 'Pass' : 'Fail').' '.
+							(string) $newLookup[$name][$i]['Index_type'].' vs '.$oldLookup[$name][$i]->Index_type;
+						echo '<br />Same = '.($same ? 'true' : 'false');
+						echo '</pre>';
+						 */
+
+						if (!$same)
+						{
+							// Break out of the loop. No need to check further.
+							break;
+						}
+					}
+				}
+				else
+				{
+					// Count is different, just drop and add.
+					$same = false;
+				}
+
+				if (!$same)
+				{
+					$alters[] = $this->getDropKeySql($table, $name);
+					$alters[] = $this->getAddKeySql($table, $keys);
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldLookup[$name]);
+			}
+			else
+			{
+				// This is a new key.
+				$alters[] = $this->getAddKeySql($table, $keys);
+			}
+		}
+
+		// Any keys left are orphans.
+		foreach ($oldLookup as $name => $keys)
+		{
+			if (strtoupper($name) == 'PRIMARY')
+			{
+				$alters[] = $this->getDropPrimaryKeySql($table);
+			}
+			else
+			{
+				$alters[] = $this->getDropKeySql($table, $name);
+			}
+		}
+
+		return $alters;
+	}
+
+	/**
+	 * Get the syntax to alter a column.
+	 *
+	 * @param   string            $table  The name of the database table to alter.
+	 * @param   SimpleXMLElement  $field  The XML definition for the field.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getChangeColumnSql($table, SimpleXMLElement $field)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteName($table) . ' CHANGE COLUMN ' . $this->db->quoteName((string) $field['Field']) . ' '
+			. $this->getColumnSql($field);
+
+		return $sql;
+	}
+
+	/**
+	 * Get the SQL syntax for a single column that would be included in a table create or alter statement.
+	 *
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getColumnSql(SimpleXMLElement $field)
+	{
+		// Initialise variables.
+		// TODO Incorporate into parent class and use $this.
+		$blobs = array('text', 'smalltext', 'mediumtext', 'largetext');
+
+		$fName    = (string) $field['Field'];
+		$fType    = (string) $field['Type'];
+		$fNull    = (string) $field['Null'];
+		$fDefault = isset($field['Default']) ? (string) $field['Default'] : null;
+		$fExtra   = (string) $field['Extra'];
+
+		$sql = $this->db->quoteName($fName) . ' ' . $fType;
+
+		if ($fNull == 'NO')
+		{
+			if (in_array($fType, $blobs) || $fDefault === null)
+			{
+				$sql .= ' NOT NULL';
+			}
+			else
+			{
+				// TODO Don't quote numeric values.
+				$sql .= ' NOT NULL DEFAULT ' . $this->db->quote($fDefault);
+			}
+		}
+		else
+		{
+			if ($fDefault === null)
+			{
+				$sql .= ' DEFAULT NULL';
+			}
+			else
+			{
+				// TODO Don't quote numeric values.
+				$sql .= ' DEFAULT ' . $this->db->quote($fDefault);
+			}
+		}
+
+		if ($fExtra)
+		{
+			$sql .= ' ' . strtoupper($fExtra);
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * Get the SQL syntax to drop a column.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   string  $name   The name of the field to drop.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getDropColumnSql($table, $name)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteName($table) . ' DROP COLUMN ' . $this->db->quoteName($name);
+
+		return $sql;
+	}
+
+	/**
+	 * Get the SQL syntax to drop a key.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   string  $name   The name of the key to drop.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getDropKeySql($table, $name)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteName($table) . ' DROP KEY ' . $this->db->quoteName($name);
+
+		return $sql;
+	}
+
+	/**
+	 * Get the SQL syntax to drop a key.
+	 *
+	 * @param   string  $table  The table name.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getDropPrimaryKeySql($table)
+	{
+		$sql = 'ALTER TABLE ' . $this->db->quoteName($table) . ' DROP PRIMARY KEY';
+
+		return $sql;
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   array  $keys  An array of objects that comprise the keys for the table.
+	 *
+	 * @return  array  The lookup array. array({key name} => array(object, ...))
+	 *
+	 * @since   3.4
+	 * @throws  Exception
+	 */
+	protected function getKeyLookup($keys)
+	{
+		// First pass, create a lookup of the keys.
+		$lookup = array();
+
+		foreach ($keys as $key)
+		{
+			if ($key instanceof SimpleXMLElement)
+			{
+				$kName = (string) $key['Key_name'];
+			}
+			else
+			{
+				$kName = $key->Key_name;
+			}
+
+			if (empty($lookup[$kName]))
+			{
+				$lookup[$kName] = array();
+			}
+
+			$lookup[$kName][] = $key;
+		}
+
+		return $lookup;
+	}
+
+	/**
+	 * Get the SQL syntax for a key.
+	 *
+	 * @param   array  $columns  An array of SimpleXMLElement objects comprising the key.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	protected function getKeySql($columns)
+	{
+		// TODO Error checking on array and element types.
+
+		$kNonUnique = (string) $columns[0]['Non_unique'];
+		$kName      = (string) $columns[0]['Key_name'];
+		$kColumn    = (string) $columns[0]['Column_name'];
+		$prefix     = '';
+
+		if ($kName == 'PRIMARY')
+		{
+			$prefix = 'PRIMARY ';
+		}
+		elseif ($kNonUnique == 0)
+		{
+			$prefix = 'UNIQUE ';
+		}
+
+		$nColumns = count($columns);
+		$kColumns = array();
+
+		if ($nColumns == 1)
+		{
+			$kColumns[] = $this->db->quoteName($kColumn);
+		}
+		else
+		{
+			foreach ($columns as $column)
+			{
+				$kColumns[] = (string) $column['Column_name'];
+			}
+		}
+
+		$sql = $prefix . 'KEY ' . ($kName != 'PRIMARY' ? $this->db->quoteName($kName) : '') . ' (' . implode(',', $kColumns) . ')';
+
+		return $sql;
+	}
+
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseImporterPdomysql  Method supports chaining.
+	 *
+	 * @since   3.4
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverPdomysql))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/importer/postgresql.php b/core/libraries/joomla/database/importer/postgresql.php
new file mode 100644
index 00000000..95815752
--- /dev/null
+++ b/core/libraries/joomla/database/importer/postgresql.php
@@ -0,0 +1,545 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PostgreSQL import driver.
+ *
+ * @since  12.1
+ */
+class JDatabaseImporterPostgresql extends JDatabaseImporter
+{
+	/**
+	 * Checks if all data and options are in order prior to exporting.
+	 *
+	 * @return  JDatabaseImporterPostgresql  Method supports chaining.
+	 *
+	 * @since   12.1
+	 * @throws  Exception if an error is encountered.
+	 */
+	public function check()
+	{
+		// Check if the db connector has been set.
+		if (!($this->db instanceof JDatabaseDriverPostgresql))
+		{
+			throw new Exception('JPLATFORM_ERROR_DATABASE_CONNECTOR_WRONG_TYPE');
+		}
+
+		// Check if the tables have been specified.
+		if (empty($this->from))
+		{
+			throw new Exception('JPLATFORM_ERROR_NO_TABLES_SPECIFIED');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the SQL syntax to add a column.
+	 *
+	 * @param   string            $table  The table name.
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getAddColumnSql($table, SimpleXMLElement $field)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' ADD COLUMN ' . $this->getColumnSql($field);
+	}
+
+	/**
+	 * Get the SQL syntax to add an index.
+	 *
+	 * @param   SimpleXMLElement  $field  The XML index definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getAddIndexSql(SimpleXMLElement $field)
+	{
+		return (string) $field['Query'];
+	}
+
+	/**
+	 * Get alters for table if there is a difference.
+	 *
+	 * @param   SimpleXMLElement  $structure  The XML structure of the table.
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	protected function getAlterTableSql(SimpleXMLElement $structure)
+	{
+		$table = $this->getRealTableName($structure['name']);
+		$oldFields = $this->db->getTableColumns($table);
+		$oldKeys = $this->db->getTableKeys($table);
+		$oldSequence = $this->db->getTableSequences($table);
+		$alters = array();
+
+		// Get the fields and keys from the XML that we are aiming for.
+		$newFields = $structure->xpath('field');
+		$newKeys = $structure->xpath('key');
+		$newSequence = $structure->xpath('sequence');
+
+		/* Sequence section */
+		$oldSeq = $this->getSeqLookup($oldSequence);
+		$newSequenceLook = $this->getSeqLookup($newSequence);
+
+		foreach ($newSequenceLook as $kSeqName => $vSeq)
+		{
+			if (isset($oldSeq[$kSeqName]))
+			{
+				// The field exists, check it's the same.
+				$column = $oldSeq[$kSeqName][0];
+
+				/* For older database version that doesn't support these fields use default values */
+				if (version_compare($this->db->getVersion(), '9.1.0') < 0)
+				{
+					$column->Min_Value = '1';
+					$column->Max_Value = '9223372036854775807';
+					$column->Increment = '1';
+					$column->Cycle_option = 'NO';
+					$column->Start_Value = '1';
+				}
+
+				// Test whether there is a change.
+				$change = ((string) $vSeq[0]['Type'] != $column->Type) || ((string) $vSeq[0]['Start_Value'] != $column->Start_Value)
+					|| ((string) $vSeq[0]['Min_Value'] != $column->Min_Value) || ((string) $vSeq[0]['Max_Value'] != $column->Max_Value)
+					|| ((string) $vSeq[0]['Increment'] != $column->Increment) || ((string) $vSeq[0]['Cycle_option'] != $column->Cycle_option)
+					|| ((string) $vSeq[0]['Table'] != $column->Table) || ((string) $vSeq[0]['Column'] != $column->Column)
+					|| ((string) $vSeq[0]['Schema'] != $column->Schema) || ((string) $vSeq[0]['Name'] != $column->Name);
+
+				if ($change)
+				{
+					$alters[] = $this->getChangeSequenceSql($kSeqName, $vSeq);
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldSeq[$kSeqName]);
+			}
+			else
+			{
+				// The sequence is new
+				$alters[] = $this->getAddSequenceSql($newSequenceLook[$kSeqName][0]);
+			}
+		}
+
+		// Any sequences left are orphans
+		foreach ($oldSeq as $name => $column)
+		{
+			// Delete the sequence.
+			$alters[] = $this->getDropSequenceSql($name);
+		}
+
+		/* Field section */
+		// Loop through each field in the new structure.
+		foreach ($newFields as $field)
+		{
+			$fName = (string) $field['Field'];
+
+			if (isset($oldFields[$fName]))
+			{
+				// The field exists, check it's the same.
+				$column = $oldFields[$fName];
+
+				// Test whether there is a change.
+				$change = ((string) $field['Type'] != $column->Type) || ((string) $field['Null'] != $column->Null)
+					|| ((string) $field['Default'] != $column->Default);
+
+				if ($change)
+				{
+					$alters[] = $this->getChangeColumnSql($table, $field);
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldFields[$fName]);
+			}
+			else
+			{
+				// The field is new.
+				$alters[] = $this->getAddColumnSql($table, $field);
+			}
+		}
+
+		// Any columns left are orphans
+		foreach ($oldFields as $name => $column)
+		{
+			// Delete the column.
+			$alters[] = $this->getDropColumnSql($table, $name);
+		}
+
+		/* Index section */
+		// Get the lookups for the old and new keys
+		$oldLookup = $this->getIdxLookup($oldKeys);
+		$newLookup = $this->getIdxLookup($newKeys);
+
+		// Loop through each key in the new structure.
+		foreach ($newLookup as $name => $keys)
+		{
+			// Check if there are keys on this field in the existing table.
+			if (isset($oldLookup[$name]))
+			{
+				$same = true;
+				$newCount = count($newLookup[$name]);
+				$oldCount = count($oldLookup[$name]);
+
+				// There is a key on this field in the old and new tables. Are they the same?
+				if ($newCount == $oldCount)
+				{
+					for ($i = 0; $i < $newCount; $i++)
+					{
+						// Check only query field -> different query means different index
+						$same = ((string) $newLookup[$name][$i]['Query'] == $oldLookup[$name][$i]->Query);
+
+						if (!$same)
+						{
+							// Break out of the loop. No need to check further.
+							break;
+						}
+					}
+				}
+				else
+				{
+					// Count is different, just drop and add.
+					$same = false;
+				}
+
+				if (!$same)
+				{
+					$alters[] = $this->getDropIndexSql($name);
+					$alters[]  = (string) $newLookup[$name][0]['Query'];
+				}
+
+				// Unset this field so that what we have left are fields that need to be removed.
+				unset($oldLookup[$name]);
+			}
+			else
+			{
+				// This is a new key.
+				$alters[] = (string) $newLookup[$name][0]['Query'];
+			}
+		}
+
+		// Any keys left are orphans.
+		foreach ($oldLookup as $name => $keys)
+		{
+			if ($oldLookup[$name][0]->is_primary == 'TRUE')
+			{
+				$alters[] = $this->getDropPrimaryKeySql($table, $oldLookup[$name][0]->Index);
+			}
+			else
+			{
+				$alters[] = $this->getDropIndexSql($name);
+			}
+		}
+
+		return $alters;
+	}
+
+	/**
+	 * Get the SQL syntax to drop a sequence.
+	 *
+	 * @param   string  $name  The name of the sequence to drop.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getDropSequenceSql($name)
+	{
+		return 'DROP SEQUENCE ' . $this->db->quoteName($name);
+	}
+
+	/**
+	 * Get the syntax to add a sequence.
+	 *
+	 * @param   SimpleXMLElement  $field  The XML definition for the sequence.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getAddSequenceSql($field)
+	{
+		/* For older database version that doesn't support these fields use default values */
+		if (version_compare($this->db->getVersion(), '9.1.0') < 0)
+		{
+			$field['Min_Value'] = '1';
+			$field['Max_Value'] = '9223372036854775807';
+			$field['Increment'] = '1';
+			$field['Cycle_option'] = 'NO';
+			$field['Start_Value'] = '1';
+		}
+
+		return 'CREATE SEQUENCE ' . (string) $field['Name'] .
+			' INCREMENT BY ' . (string) $field['Increment'] . ' MINVALUE ' . $field['Min_Value'] .
+			' MAXVALUE ' . (string) $field['Max_Value'] . ' START ' . (string) $field['Start_Value'] .
+			(((string) $field['Cycle_option'] == 'NO') ? ' NO' : '') . ' CYCLE' .
+			' OWNED BY ' . $this->db->quoteName((string) $field['Schema'] . '.' . (string) $field['Table'] . '.' . (string) $field['Column']);
+	}
+
+	/**
+	 * Get the syntax to alter a sequence.
+	 *
+	 * @param   SimpleXMLElement  $field  The XML definition for the sequence.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getChangeSequenceSql($field)
+	{
+		/* For older database version that doesn't support these fields use default values */
+		if (version_compare($this->db->getVersion(), '9.1.0') < 0)
+		{
+			$field['Min_Value'] = '1';
+			$field['Max_Value'] = '9223372036854775807';
+			$field['Increment'] = '1';
+			$field['Cycle_option'] = 'NO';
+			$field['Start_Value'] = '1';
+		}
+
+		return 'ALTER SEQUENCE ' . (string) $field['Name'] .
+			' INCREMENT BY ' . (string) $field['Increment'] . ' MINVALUE ' . (string) $field['Min_Value'] .
+			' MAXVALUE ' . (string) $field['Max_Value'] . ' START ' . (string) $field['Start_Value'] .
+			' OWNED BY ' . $this->db->quoteName((string) $field['Schema'] . '.' . (string) $field['Table'] . '.' . (string) $field['Column']);
+	}
+
+	/**
+	 * Get the syntax to alter a column.
+	 *
+	 * @param   string            $table  The name of the database table to alter.
+	 * @param   SimpleXMLElement  $field  The XML definition for the field.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getChangeColumnSql($table, SimpleXMLElement $field)
+	{
+		return 'ALTER TABLE ' . $this->db->quoteName($table) . ' ALTER COLUMN ' . $this->db->quoteName((string) $field['Field']) . ' '
+			. $this->getAlterColumnSql($table, $field);
+	}
+
+	/**
+	 * Get the SQL syntax for a single column that would be included in a table create statement.
+	 *
+	 * @param   string            $table  The name of the database table to alter.
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getAlterColumnSql($table, $field)
+	{
+		// TODO Incorporate into parent class and use $this.
+		$blobs = array('text', 'smalltext', 'mediumtext', 'largetext');
+
+		$fName = (string) $field['Field'];
+		$fType = (string) $field['Type'];
+		$fNull = (string) $field['Null'];
+		$fDefault = (isset($field['Default']) && $field['Default'] != 'NULL') ?
+						preg_match('/^[0-9]$/', $field['Default']) ? $field['Default'] : $this->db->quote((string) $field['Default'])
+					: null;
+
+		$query = ' TYPE ' . $fType;
+
+		if ($fNull == 'NO')
+		{
+			if (in_array($fType, $blobs) || $fDefault === null)
+			{
+				$query .= ",\nALTER COLUMN " . $this->db->quoteName($fName) . ' SET NOT NULL' .
+						",\nALTER COLUMN " . $this->db->quoteName($fName) . ' DROP DEFAULT';
+			}
+			else
+			{
+				$query .= ",\nALTER COLUMN " . $this->db->quoteName($fName) . ' SET NOT NULL' .
+						",\nALTER COLUMN " . $this->db->quoteName($fName) . ' SET DEFAULT ' . $fDefault;
+			}
+		}
+		else
+		{
+			if ($fDefault !== null)
+			{
+				$query .= ",\nALTER COLUMN " . $this->db->quoteName($fName) . ' DROP NOT NULL' .
+						",\nALTER COLUMN " . $this->db->quoteName($fName) . ' SET DEFAULT ' . $fDefault;
+			}
+		}
+
+		/* sequence was created in other function, here is associated a default value but not yet owner */
+		if (strpos($fDefault, 'nextval') !== false)
+		{
+			$query .= ";\nALTER SEQUENCE " . $this->db->quoteName($table . '_' . $fName . '_seq') . ' OWNED BY ' . $this->db->quoteName($table . '.' . $fName);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Get the SQL syntax for a single column that would be included in a table create statement.
+	 *
+	 * @param   SimpleXMLElement  $field  The XML field definition.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getColumnSql(SimpleXMLElement $field)
+	{
+		// TODO Incorporate into parent class and use $this.
+		$blobs = array('text', 'smalltext', 'mediumtext', 'largetext');
+
+		$fName = (string) $field['Field'];
+		$fType = (string) $field['Type'];
+		$fNull = (string) $field['Null'];
+		$fDefault = (isset($field['Default']) && $field['Default'] != 'NULL') ?
+						preg_match('/^[0-9]$/', $field['Default']) ? $field['Default'] : $this->db->quote((string) $field['Default'])
+					: null;
+
+		/* nextval() as default value means that type field is serial */
+		if (strpos($fDefault, 'nextval') !== false)
+		{
+			$query = $this->db->quoteName($fName) . ' SERIAL';
+		}
+		else
+		{
+			$query = $this->db->quoteName($fName) . ' ' . $fType;
+
+			if ($fNull == 'NO')
+			{
+				if (in_array($fType, $blobs) || $fDefault === null)
+				{
+					$query .= ' NOT NULL';
+				}
+				else
+				{
+					$query .= ' NOT NULL DEFAULT ' . $fDefault;
+				}
+			}
+			else
+			{
+				if ($fDefault !== null)
+				{
+					$query .= ' DEFAULT ' . $fDefault;
+				}
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Get the SQL syntax to drop an index.
+	 *
+	 * @param   string  $name  The name of the key to drop.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getDropIndexSql($name)
+	{
+		return 'DROP INDEX ' . $this->db->quoteName($name);
+	}
+
+	/**
+	 * Get the SQL syntax to drop a key.
+	 *
+	 * @param   string  $table  The table name.
+	 * @param   string  $name   The constraint name.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	protected function getDropPrimaryKeySql($table, $name)
+	{
+		return 'ALTER TABLE ONLY ' . $this->db->quoteName($table) . ' DROP CONSTRAINT ' . $this->db->quoteName($name);
+	}
+
+	/**
+	 * Get the details list of keys for a table.
+	 *
+	 * @param   array  $keys  An array of objects that comprise the keys for the table.
+	 *
+	 * @return  array  The lookup array. array({key name} => array(object, ...))
+	 *
+	 * @since   12.1
+	 * @throws  Exception
+	 */
+	protected function getIdxLookup($keys)
+	{
+		// First pass, create a lookup of the keys.
+		$lookup = array();
+
+		foreach ($keys as $key)
+		{
+			if ($key instanceof SimpleXMLElement)
+			{
+				$kName = (string) $key['Index'];
+			}
+			else
+			{
+				$kName = $key->Index;
+			}
+
+			if (empty($lookup[$kName]))
+			{
+				$lookup[$kName] = array();
+			}
+
+			$lookup[$kName][] = $key;
+		}
+
+		return $lookup;
+	}
+
+	/**
+	 * Get the details list of sequences for a table.
+	 *
+	 * @param   array  $sequences  An array of objects that comprise the sequences for the table.
+	 *
+	 * @return  array  The lookup array. array({key name} => array(object, ...))
+	 *
+	 * @since   12.1
+	 * @throws  Exception
+	 */
+	protected function getSeqLookup($sequences)
+	{
+		// First pass, create a lookup of the keys.
+		$lookup = array();
+
+		foreach ($sequences as $seq)
+		{
+			if ($seq instanceof SimpleXMLElement)
+			{
+				$sName = (string) $seq['Name'];
+			}
+			else
+			{
+				$sName = $seq->Name;
+			}
+
+			if (empty($lookup[$sName]))
+			{
+				$lookup[$sName] = array();
+			}
+
+			$lookup[$sName][] = $seq;
+		}
+
+		return $lookup;
+	}
+}
diff --git a/core/libraries/joomla/database/interface.php b/core/libraries/joomla/database/interface.php
new file mode 100644
index 00000000..09174809
--- /dev/null
+++ b/core/libraries/joomla/database/interface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Database Interface
+ *
+ * @since  11.2
+*/
+interface JDatabaseInterface
+{
+	/**
+	 * Test to see if the connector is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.2
+	 */
+	public static function isSupported();
+}
diff --git a/core/libraries/joomla/database/iterator.php b/core/libraries/joomla/database/iterator.php
new file mode 100644
index 00000000..2eecf54e
--- /dev/null
+++ b/core/libraries/joomla/database/iterator.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Database Driver Class
+ *
+ * @since  12.1
+ */
+abstract class JDatabaseIterator implements Countable, Iterator
+{
+	/**
+	 * The database cursor.
+	 *
+	 * @var    mixed
+	 * @since  12.1
+	 */
+	protected $cursor;
+
+	/**
+	 * The class of object to create.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $class;
+
+	/**
+	 * The name of the column to use for the key of the database record.
+	 *
+	 * @var    mixed
+	 * @since  12.1
+	 */
+	private $_column;
+
+	/**
+	 * The current database record.
+	 *
+	 * @var    mixed
+	 * @since  12.1
+	 */
+	private $_current;
+
+	/**
+	 * A numeric or string key for the current database record.
+	 *
+	 * @var    int|string
+	 * @since  12.1
+	 */
+	private $_key;
+
+	/**
+	 * The number of fetched records.
+	 *
+	 * @var    integer
+	 * @since  12.1
+	 */
+	private $_fetched = 0;
+
+	/**
+	 * Database iterator constructor.
+	 *
+	 * @param   mixed   $cursor  The database cursor.
+	 * @param   string  $column  An option column to use as the iterator key.
+	 * @param   string  $class   The class of object that is returned.
+	 *
+	 * @throws  InvalidArgumentException
+	 */
+	public function __construct($cursor, $column = null, $class = 'stdClass')
+	{
+		if (!class_exists($class))
+		{
+			throw new InvalidArgumentException(sprintf('new %s(*%s*, cursor)', get_class($this), gettype($class)));
+		}
+
+		$this->cursor = $cursor;
+		$this->class = $class;
+		$this->_column = $column;
+		$this->_fetched = 0;
+		$this->next();
+	}
+
+	/**
+	 * Database iterator destructor.
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		if ($this->cursor)
+		{
+			$this->freeResult($this->cursor);
+		}
+	}
+
+	/**
+	 * The current element in the iterator.
+	 *
+	 * @return  object
+	 *
+	 * @see     Iterator::current()
+	 * @since   12.1
+	 */
+	public function current()
+	{
+		return $this->_current;
+	}
+
+	/**
+	 * The key of the current element in the iterator.
+	 *
+	 * @return  int|string
+	 *
+	 * @see     Iterator::key()
+	 * @since   12.1
+	 */
+	public function key()
+	{
+		return $this->_key;
+	}
+
+	/**
+	 * Moves forward to the next result from the SQL query.
+	 *
+	 * @return  void
+	 *
+	 * @see     Iterator::next()
+	 * @since   12.1
+	 */
+	public function next()
+	{
+		// Set the default key as being the number of fetched object
+		$this->_key = $this->_fetched;
+
+		// Try to get an object
+		$this->_current = $this->fetchObject();
+
+		// If an object has been found
+		if ($this->_current)
+		{
+			// Set the key as being the indexed column (if it exists)
+			if (isset($this->_current->{$this->_column}))
+			{
+				$this->_key = $this->_current->{$this->_column};
+			}
+
+			// Update the number of fetched object
+			$this->_fetched++;
+		}
+	}
+
+	/**
+	 * Rewinds the iterator.
+	 *
+	 * This iterator cannot be rewound.
+	 *
+	 * @return  void
+	 *
+	 * @see     Iterator::rewind()
+	 * @since   12.1
+	 */
+	public function rewind()
+	{
+	}
+
+	/**
+	 * Checks if the current position of the iterator is valid.
+	 *
+	 * @return  boolean
+	 *
+	 * @see     Iterator::valid()
+	 * @since   12.1
+	 */
+	public function valid()
+	{
+		return (boolean) $this->_current;
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed  Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	abstract protected function fetchObject();
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	abstract protected function freeResult();
+}
diff --git a/core/libraries/joomla/database/iterator/mysql.php b/core/libraries/joomla/database/iterator/mysql.php
new file mode 100644
index 00000000..1dc5b358
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/mysql.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL database iterator.
+ *
+ * @link        http://dev.mysql.com/doc/
+ * @since       12.1
+ * @deprecated  4.0  Use MySQLi or PDO MySQL instead
+ */
+class JDatabaseIteratorMysql extends JDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @since   12.1
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return mysql_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject()
+	{
+		return mysql_fetch_object($this->cursor, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult()
+	{
+		mysql_free_result($this->cursor);
+	}
+}
diff --git a/core/libraries/joomla/database/iterator/mysqli.php b/core/libraries/joomla/database/iterator/mysqli.php
new file mode 100644
index 00000000..0b316e7f
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/mysqli.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQLi database iterator.
+ *
+ * @since  12.1
+ */
+class JDatabaseIteratorMysqli extends JDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @since   12.1
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return mysqli_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject()
+	{
+		return mysqli_fetch_object($this->cursor, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult()
+	{
+		mysqli_free_result($this->cursor);
+	}
+}
diff --git a/core/libraries/joomla/database/iterator/oracle.php b/core/libraries/joomla/database/iterator/oracle.php
new file mode 100644
index 00000000..cdaacd31
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/oracle.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Oracle database iterator.
+ *
+ * @since  12.1
+ */
+class JDatabaseIteratorOracle extends JDatabaseIteratorPdo
+{
+}
diff --git a/core/libraries/joomla/database/iterator/pdo.php b/core/libraries/joomla/database/iterator/pdo.php
new file mode 100644
index 00000000..0b9c6f91
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/pdo.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PDO database iterator.
+ *
+ * @since  12.1
+ */
+class JDatabaseIteratorPdo extends JDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @since   12.1
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		if (!empty($this->cursor) && $this->cursor instanceof PDOStatement)
+		{
+			return $this->cursor->rowCount();
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject()
+	{
+		if (!empty($this->cursor) && $this->cursor instanceof PDOStatement)
+		{
+			return $this->cursor->fetchObject($this->class);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult()
+	{
+		if (!empty($this->cursor) && $this->cursor instanceof PDOStatement)
+		{
+			$this->cursor->closeCursor();
+		}
+	}
+}
diff --git a/core/libraries/joomla/database/iterator/pdomysql.php b/core/libraries/joomla/database/iterator/pdomysql.php
new file mode 100644
index 00000000..a6c49fda
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/pdomysql.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MySQL database iterator for the PDO based MySQL database driver.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @link        https://dev.mysql.com/doc/
+ * @since       3.4
+ */
+class JDatabaseIteratorPdomysql extends JDatabaseIteratorPdo
+{
+}
diff --git a/core/libraries/joomla/database/iterator/postgresql.php b/core/libraries/joomla/database/iterator/postgresql.php
new file mode 100644
index 00000000..04a819e0
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/postgresql.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PostgreSQL database iterator.
+ *
+ * @since  13.1
+ */
+class JDatabaseIteratorPostgresql extends JDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @since   13.1
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return pg_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   13.1
+	 */
+	protected function fetchObject()
+	{
+		return pg_fetch_object($this->cursor, null, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 */
+	protected function freeResult()
+	{
+		pg_free_result($this->cursor);
+	}
+}
diff --git a/core/libraries/joomla/database/iterator/sqlazure.php b/core/libraries/joomla/database/iterator/sqlazure.php
new file mode 100644
index 00000000..56983e2b
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/sqlazure.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQL azure database iterator.
+ *
+ * @since  12.1
+ */
+class JDatabaseIteratorSqlazure extends JDatabaseIteratorSqlsrv
+{
+}
diff --git a/core/libraries/joomla/database/iterator/sqlite.php b/core/libraries/joomla/database/iterator/sqlite.php
new file mode 100644
index 00000000..80733234
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/sqlite.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQLite database iterator.
+ *
+ * @since  12.1
+ */
+class JDatabaseIteratorSqlite extends JDatabaseIteratorPdo
+{
+}
diff --git a/core/libraries/joomla/database/iterator/sqlsrv.php b/core/libraries/joomla/database/iterator/sqlsrv.php
new file mode 100644
index 00000000..a055447a
--- /dev/null
+++ b/core/libraries/joomla/database/iterator/sqlsrv.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQL server database iterator.
+ *
+ * @since  12.1
+ */
+class JDatabaseIteratorSqlsrv extends JDatabaseIterator
+{
+	/**
+	 * Get the number of rows in the result set for the executed SQL given by the cursor.
+	 *
+	 * @return  integer  The number of rows in the result set.
+	 *
+	 * @since   12.1
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return sqlsrv_num_rows($this->cursor);
+	}
+
+	/**
+	 * Method to fetch a row from the result set cursor as an object.
+	 *
+	 * @return  mixed   Either the next row from the result set or false if there are no more rows.
+	 *
+	 * @since   12.1
+	 */
+	protected function fetchObject()
+	{
+		return sqlsrv_fetch_object($this->cursor, $this->class);
+	}
+
+	/**
+	 * Method to free up the memory used for the result set.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function freeResult()
+	{
+		sqlsrv_free_stmt($this->cursor);
+	}
+}
diff --git a/core/libraries/joomla/database/query.php b/core/libraries/joomla/database/query.php
new file mode 100644
index 00000000..097e505a
--- /dev/null
+++ b/core/libraries/joomla/database/query.php
@@ -0,0 +1,1879 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ *
+ * @method      string  q()   q($text, $escape = true)  Alias for quote method
+ * @method      string  qn()  qn($name, $as = null)     Alias for quoteName method
+ * @method      string  e()   e($text, $extra = false)  Alias for escape method
+ * @property-read   JDatabaseQueryElement  $type
+ * @property-read   JDatabaseQueryElement  $select
+ * @property-read   JDatabaseQueryElement  $group
+ * @property-read   JDatabaseQueryElement  $having
+ */
+abstract class JDatabaseQuery
+{
+	/**
+	 * @var    JDatabaseDriver  The database driver.
+	 * @since  11.1
+	 */
+	protected $db = null;
+
+	/**
+	 * @var    string  The SQL query (if a direct query string was provided).
+	 * @since  12.1
+	 */
+	protected $sql = null;
+
+	/**
+	 * @var    string  The query type.
+	 * @since  11.1
+	 */
+	protected $type = '';
+
+	/**
+	 * @var    JDatabaseQueryElement  The query element for a generic query (type = null).
+	 * @since  11.1
+	 */
+	protected $element = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The select element.
+	 * @since  11.1
+	 */
+	protected $select = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The delete element.
+	 * @since  11.1
+	 */
+	protected $delete = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The update element.
+	 * @since  11.1
+	 */
+	protected $update = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The insert element.
+	 * @since  11.1
+	 */
+	protected $insert = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The from element.
+	 * @since  11.1
+	 */
+	protected $from = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The join element.
+	 * @since  11.1
+	 */
+	protected $join = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The set element.
+	 * @since  11.1
+	 */
+	protected $set = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The where element.
+	 * @since  11.1
+	 */
+	protected $where = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The group by element.
+	 * @since  11.1
+	 */
+	protected $group = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The having element.
+	 * @since  11.1
+	 */
+	protected $having = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The column list for an INSERT statement.
+	 * @since  11.1
+	 */
+	protected $columns = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The values list for an INSERT statement.
+	 * @since  11.1
+	 */
+	protected $values = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The order element.
+	 * @since  11.1
+	 */
+	protected $order = null;
+
+	/**
+	 * @var   object  The auto increment insert field element.
+	 * @since 11.1
+	 */
+	protected $autoIncrementField = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The call element.
+	 * @since  12.1
+	 */
+	protected $call = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The exec element.
+	 * @since  12.1
+	 */
+	protected $exec = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The union element.
+	 * @since  12.1
+	 * @deprecated  4.0  Will be transformed and moved to $merge variable.
+	 */
+	protected $union = null;
+
+	/**
+	 * @var    JDatabaseQueryElement  The unionAll element.
+	 * @since  13.1
+	 * @deprecated  4.0  Will be transformed and moved to $merge variable.
+	 */
+	protected $unionAll = null;
+
+	/**
+	 * @var    array  Details of window function.
+	 * @since  3.7.0
+	 */
+	protected $selectRowNumber = null;
+
+	/**
+	 * Magic method to provide method alias support for quote() and quoteName().
+	 *
+	 * @param   string  $method  The called method.
+	 * @param   array   $args    The array of arguments passed to the method.
+	 *
+	 * @return  string  The aliased method's return value or null.
+	 *
+	 * @since   11.1
+	 */
+	public function __call($method, $args)
+	{
+		if (empty($args))
+		{
+			return;
+		}
+
+		switch ($method)
+		{
+			case 'q':
+				return $this->quote($args[0], isset($args[1]) ? $args[1] : true);
+				break;
+
+			case 'qn':
+				return $this->quoteName($args[0], isset($args[1]) ? $args[1] : null);
+				break;
+
+			case 'e':
+				return $this->escape($args[0], isset($args[1]) ? $args[1] : false);
+				break;
+		}
+	}
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   JDatabaseDriver  $db  The database driver.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(JDatabaseDriver $db = null)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Magic function to convert the query to a string.
+	 *
+	 * @return  string	The completed query.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		$query = '';
+
+		if ($this->sql)
+		{
+			return $this->sql;
+		}
+
+		switch ($this->type)
+		{
+			case 'element':
+				$query .= (string) $this->element;
+				break;
+
+			case 'select':
+				$query .= (string) $this->select;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->selectRowNumber === null)
+				{
+					if ($this->group)
+					{
+						$query .= (string) $this->group;
+					}
+
+					if ($this->having)
+					{
+						$query .= (string) $this->having;
+					}
+
+					if ($this->union)
+					{
+						$query .= (string) $this->union;
+					}
+
+					if ($this->unionAll)
+					{
+						$query .= (string) $this->unionAll;
+					}
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'delete':
+				$query .= (string) $this->delete;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'update':
+				$query .= (string) $this->update;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				$query .= (string) $this->set;
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'insert':
+				$query .= (string) $this->insert;
+
+				// Set method
+				if ($this->set)
+				{
+					$query .= (string) $this->set;
+				}
+				// Columns-Values method
+				elseif ($this->values)
+				{
+					if ($this->columns)
+					{
+						$query .= (string) $this->columns;
+					}
+
+					$elements = $this->values->getElements();
+
+					if (!($elements[0] instanceof $this))
+					{
+						$query .= ' VALUES ';
+					}
+
+					$query .= (string) $this->values;
+				}
+
+				break;
+
+			case 'call':
+				$query .= (string) $this->call;
+				break;
+
+			case 'exec':
+				$query .= (string) $this->exec;
+				break;
+		}
+
+		if ($this instanceof JDatabaseQueryLimitable)
+		{
+			$query = $this->processLimit($query, $this->limit, $this->offset);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Magic function to get protected variable value
+	 *
+	 * @param   string  $name  The name of the variable.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function __get($name)
+	{
+		return isset($this->$name) ? $this->$name : null;
+	}
+
+	/**
+	 * Add a single column, or array of columns to the CALL clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 * The call method can, however, be called multiple times in the same query.
+	 *
+	 * Usage:
+	 * $query->call('a.*')->call('b.id');
+	 * $query->call(array('a.*', 'b.id'));
+	 *
+	 * @param   mixed  $columns  A string or an array of field names.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function call($columns)
+	{
+		$this->type = 'call';
+
+		if (is_null($this->call))
+		{
+			$this->call = new JDatabaseQueryElement('CALL', $columns);
+		}
+		else
+		{
+			$this->call->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * Usage:
+	 * $query->select($query->castAsChar('a'));
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.1
+	 */
+	public function castAsChar($value)
+	{
+		return $value;
+	}
+
+	/**
+	 * Gets the number of characters in a string.
+	 *
+	 * Note, use 'length' to find the number of bytes in a string.
+	 *
+	 * Usage:
+	 * $query->select($query->charLength('a'));
+	 *
+	 * @param   string  $field      A value.
+	 * @param   string  $operator   Comparison operator between charLength integer value and $condition
+	 * @param   string  $condition  Integer value to compare charLength with.
+	 *
+	 * @return  string  The required char length call.
+	 *
+	 * @since   11.1
+	 */
+	public function charLength($field, $operator = null, $condition = null)
+	{
+		return 'CHAR_LENGTH(' . $field . ')' . (isset($operator) && isset($condition) ? ' ' . $operator . ' ' . $condition : '');
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function clear($clause = null)
+	{
+		$this->sql = null;
+
+		switch ($clause)
+		{
+			case 'select':
+				$this->select = null;
+				$this->type = null;
+				$this->selectRowNumber = null;
+				break;
+
+			case 'delete':
+				$this->delete = null;
+				$this->type = null;
+				break;
+
+			case 'update':
+				$this->update = null;
+				$this->type = null;
+				break;
+
+			case 'insert':
+				$this->insert = null;
+				$this->type = null;
+				$this->autoIncrementField = null;
+				break;
+
+			case 'from':
+				$this->from = null;
+				break;
+
+			case 'join':
+				$this->join = null;
+				break;
+
+			case 'set':
+				$this->set = null;
+				break;
+
+			case 'where':
+				$this->where = null;
+				break;
+
+			case 'group':
+				$this->group = null;
+				break;
+
+			case 'having':
+				$this->having = null;
+				break;
+
+			case 'order':
+				$this->order = null;
+				break;
+
+			case 'columns':
+				$this->columns = null;
+				break;
+
+			case 'values':
+				$this->values = null;
+				break;
+
+			case 'exec':
+				$this->exec = null;
+				$this->type = null;
+				break;
+
+			case 'call':
+				$this->call = null;
+				$this->type = null;
+				break;
+
+			case 'limit':
+				$this->offset = 0;
+				$this->limit = 0;
+				break;
+
+			case 'offset':
+				$this->offset = 0;
+				break;
+
+			case 'union':
+				$this->union = null;
+				break;
+
+			case 'unionAll':
+				$this->unionAll = null;
+				break;
+
+			default:
+				$this->type = null;
+				$this->select = null;
+				$this->selectRowNumber = null;
+				$this->delete = null;
+				$this->update = null;
+				$this->insert = null;
+				$this->from = null;
+				$this->join = null;
+				$this->set = null;
+				$this->where = null;
+				$this->group = null;
+				$this->having = null;
+				$this->order = null;
+				$this->columns = null;
+				$this->values = null;
+				$this->autoIncrementField = null;
+				$this->exec = null;
+				$this->call = null;
+				$this->union = null;
+				$this->unionAll = null;
+				$this->offset = 0;
+				$this->limit = 0;
+				break;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds a column, or array of column names that would be used for an INSERT INTO statement.
+	 *
+	 * @param   mixed  $columns  A column name, or array of column names.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function columns($columns)
+	{
+		if (is_null($this->columns))
+		{
+			$this->columns = new JDatabaseQueryElement('()', $columns);
+		}
+		else
+		{
+			$this->columns->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * Usage:
+	 * $query->select($query->concatenate(array('a', 'b')));
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return 'CONCATENATE(' . implode(' || ' . $this->quote($separator) . ' || ', $values) . ')';
+		}
+		else
+		{
+			return 'CONCATENATE(' . implode(' || ', $values) . ')';
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * Usage:
+	 * $query->where('published_up < '.$query->currentTimestamp());
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function currentTimestamp()
+	{
+		return 'CURRENT_TIMESTAMP()';
+	}
+
+	/**
+	 * Returns a PHP date() function compliant date format for the database driver.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the getDateFormat method directly.
+	 *
+	 * @return  string  The format string.
+	 *
+	 * @since   11.1
+	 */
+	public function dateFormat()
+	{
+		if (!($this->db instanceof JDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->getDateFormat();
+	}
+
+	/**
+	 * Creates a formatted dump of the query for debugging purposes.
+	 *
+	 * Usage:
+	 * echo $query->dump();
+	 *
+	 * @return  string
+	 *
+	 * @since   11.3
+	 */
+	public function dump()
+	{
+		return '<pre class="jdatabasequery">' . str_replace('#__', $this->db->getPrefix(), $this) . '</pre>';
+	}
+
+	/**
+	 * Add a table name to the DELETE clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 *
+	 * Usage:
+	 * $query->delete('#__a')->where('id = 1');
+	 *
+	 * @param   string  $table  The name of the table to delete from.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function delete($table = null)
+	{
+		$this->type = 'delete';
+		$this->delete = new JDatabaseQueryElement('DELETE', null);
+
+		if (!empty($table))
+		{
+			$this->from($table);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to escape a string for usage in an SQL statement.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the escape method directly.
+	 *
+	 * Note that 'e' is an alias for this method as it is in JDatabaseDriver.
+	 *
+	 * @param   string   $text   The string to be escaped.
+	 * @param   boolean  $extra  Optional parameter to provide extra escaping.
+	 *
+	 * @return  string  The escaped string.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if the internal db property is not a valid object.
+	 */
+	public function escape($text, $extra = false)
+	{
+		if (!($this->db instanceof JDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->escape($text, $extra);
+	}
+
+	/**
+	 * Add a single column, or array of columns to the EXEC clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 * The exec method can, however, be called multiple times in the same query.
+	 *
+	 * Usage:
+	 * $query->exec('a.*')->exec('b.id');
+	 * $query->exec(array('a.*', 'b.id'));
+	 *
+	 * @param   mixed  $columns  A string or an array of field names.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function exec($columns)
+	{
+		$this->type = 'exec';
+
+		if (is_null($this->exec))
+		{
+			$this->exec = new JDatabaseQueryElement('EXEC', $columns);
+		}
+		else
+		{
+			$this->exec->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a table to the FROM clause of the query.
+	 *
+	 * Note that while an array of tables can be provided, it is recommended you use explicit joins.
+	 *
+	 * Usage:
+	 * $query->select('*')->from('#__a');
+	 *
+	 * @param   mixed   $tables         A string or array of table names.
+	 *                                  This can be a JDatabaseQuery object (or a child of it) when used
+	 *                                  as a subquery in FROM clause along with a value for $subQueryAlias.
+	 * @param   string  $subQueryAlias  Alias used when $tables is a JDatabaseQuery.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @throws  RuntimeException
+	 *
+	 * @since   11.1
+	 */
+	public function from($tables, $subQueryAlias = null)
+	{
+		if (is_null($this->from))
+		{
+			if ($tables instanceof $this)
+			{
+				if (is_null($subQueryAlias))
+				{
+					throw new RuntimeException('JLIB_DATABASE_ERROR_NULL_SUBQUERY_ALIAS');
+				}
+
+				$tables = '( ' . (string) $tables . ' ) AS ' . $this->quoteName($subQueryAlias);
+			}
+
+			$this->from = new JDatabaseQueryElement('FROM', $tables);
+		}
+		else
+		{
+			$this->from->append($tables);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Used to get a string to extract year from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->year($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing year to be extracted.
+	 *
+	 * @return  string  Returns string to extract year from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function year($date)
+	{
+		return 'YEAR(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract month from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->month($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing month to be extracted.
+	 *
+	 * @return  string  Returns string to extract month from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function month($date)
+	{
+		return 'MONTH(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract day from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->day($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing day to be extracted.
+	 *
+	 * @return  string  Returns string to extract day from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function day($date)
+	{
+		return 'DAY(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract hour from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->hour($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing hour to be extracted.
+	 *
+	 * @return  string  Returns string to extract hour from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function hour($date)
+	{
+		return 'HOUR(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract minute from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->minute($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing minute to be extracted.
+	 *
+	 * @return  string  Returns string to extract minute from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function minute($date)
+	{
+		return 'MINUTE(' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract seconds from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->second($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing second to be extracted.
+	 *
+	 * @return  string  Returns string to extract second from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function second($date)
+	{
+		return 'SECOND(' . $date . ')';
+	}
+
+	/**
+	 * Add a grouping column to the GROUP clause of the query.
+	 *
+	 * Usage:
+	 * $query->group('id');
+	 *
+	 * @param   mixed  $columns  A string or array of ordering columns.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function group($columns)
+	{
+		if (is_null($this->group))
+		{
+			$this->group = new JDatabaseQueryElement('GROUP BY', $columns);
+		}
+		else
+		{
+			$this->group->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * A conditions to the HAVING clause of the query.
+	 *
+	 * Usage:
+	 * $query->group('id')->having('COUNT(id) > 5');
+	 *
+	 * @param   mixed   $conditions  A string or array of columns.
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to AND.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function having($conditions, $glue = 'AND')
+	{
+		if (is_null($this->having))
+		{
+			$glue = strtoupper($glue);
+			$this->having = new JDatabaseQueryElement('HAVING', $conditions, " $glue ");
+		}
+		else
+		{
+			$this->having->append($conditions);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add an INNER JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->innerJoin('b ON b.id = a.id')->innerJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function innerJoin($condition)
+	{
+		$this->join('INNER', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Add a table name to the INSERT clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 *
+	 * Usage:
+	 * $query->insert('#__a')->set('id = 1');
+	 * $query->insert('#__a')->columns('id, title')->values('1,2')->values('3,4');
+	 * $query->insert('#__a')->columns('id, title')->values(array('1,2', '3,4'));
+	 *
+	 * @param   mixed    $table           The name of the table to insert data into.
+	 * @param   boolean  $incrementField  The name of the field to auto increment.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function insert($table, $incrementField=false)
+	{
+		$this->type = 'insert';
+		$this->insert = new JDatabaseQueryElement('INSERT INTO', $table);
+		$this->autoIncrementField = $incrementField;
+
+		return $this;
+	}
+
+	/**
+	 * Add a JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->join('INNER', 'b ON b.id = a.id);
+	 *
+	 * @param   string  $type        The type of join. This string is prepended to the JOIN keyword.
+	 * @param   string  $conditions  A string or array of conditions.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function join($type, $conditions)
+	{
+		if (is_null($this->join))
+		{
+			$this->join = array();
+		}
+
+		$this->join[] = new JDatabaseQueryElement(strtoupper($type) . ' JOIN', $conditions);
+
+		return $this;
+	}
+
+	/**
+	 * Add a LEFT JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->leftJoin('b ON b.id = a.id')->leftJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function leftJoin($condition)
+	{
+		$this->join('LEFT', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Get the length of a string in bytes.
+	 *
+	 * Note, use 'charLength' to find the number of characters in a string.
+	 *
+	 * Usage:
+	 * query->where($query->length('a').' > 3');
+	 *
+	 * @param   string  $value  The string to measure.
+	 *
+	 * @return  int
+	 *
+	 * @since   11.1
+	 */
+	public function length($value)
+	{
+		return 'LENGTH(' . $value . ')';
+	}
+
+	/**
+	 * Get the null or zero representation of a timestamp for the database driver.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the nullDate method directly.
+	 *
+	 * Usage:
+	 * $query->where('modified_date <> '.$query->nullDate());
+	 *
+	 * @param   boolean  $quoted  Optionally wraps the null date in database quotes (true by default).
+	 *
+	 * @return  string  Null or zero representation of a timestamp.
+	 *
+	 * @since   11.1
+	 */
+	public function nullDate($quoted = true)
+	{
+		if (!($this->db instanceof JDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		$result = $this->db->getNullDate($quoted);
+
+		if ($quoted)
+		{
+			return $this->db->quote($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Add an ordering column to the ORDER clause of the query.
+	 *
+	 * Usage:
+	 * $query->order('foo')->order('bar');
+	 * $query->order(array('foo','bar'));
+	 *
+	 * @param   mixed  $columns  A string or array of ordering columns.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function order($columns)
+	{
+		if (is_null($this->order))
+		{
+			$this->order = new JDatabaseQueryElement('ORDER BY', $columns);
+		}
+		else
+		{
+			$this->order->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add an OUTER JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->outerJoin('b ON b.id = a.id')->outerJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function outerJoin($condition)
+	{
+		$this->join('OUTER', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Method to quote and optionally escape a string to database requirements for insertion into the database.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the quote method directly.
+	 *
+	 * Note that 'q' is an alias for this method as it is in JDatabaseDriver.
+	 *
+	 * Usage:
+	 * $query->quote('fulltext');
+	 * $query->q('fulltext');
+	 * $query->q(array('option', 'fulltext'));
+	 *
+	 * @param   mixed    $text    A string or an array of strings to quote.
+	 * @param   boolean  $escape  True to escape the string, false to leave it unchanged.
+	 *
+	 * @return  string  The quoted input string.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if the internal db property is not a valid object.
+	 */
+	public function quote($text, $escape = true)
+	{
+		if (!($this->db instanceof JDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->quote($text, $escape);
+	}
+
+	/**
+	 * Wrap an SQL statement identifier name such as column, table or database names in quotes to prevent injection
+	 * risks and reserved word conflicts.
+	 *
+	 * This method is provided for use where the query object is passed to a function for modification.
+	 * If you have direct access to the database object, it is recommended you use the quoteName method directly.
+	 *
+	 * Note that 'qn' is an alias for this method as it is in JDatabaseDriver.
+	 *
+	 * Usage:
+	 * $query->quoteName('#__a');
+	 * $query->qn('#__a');
+	 *
+	 * @param   mixed  $name  The identifier name to wrap in quotes, or an array of identifier names to wrap in quotes.
+	 *                        Each type supports dot-notation name.
+	 * @param   mixed  $as    The AS query part associated to $name. It can be string or array, in latter case it has to be
+	 *                        same length of $name; if is null there will not be any AS part for string or array element.
+	 *
+	 * @return  mixed  The quote wrapped name, same type of $name.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException if the internal db property is not a valid object.
+	 */
+	public function quoteName($name, $as = null)
+	{
+		if (!($this->db instanceof JDatabaseDriver))
+		{
+			throw new RuntimeException('JLIB_DATABASE_ERROR_INVALID_DB_OBJECT');
+		}
+
+		return $this->db->quoteName($name, $as);
+	}
+
+	/**
+	 * Add a RIGHT JOIN clause to the query.
+	 *
+	 * Usage:
+	 * $query->rightJoin('b ON b.id = a.id')->rightJoin('c ON c.id = b.id');
+	 *
+	 * @param   string  $condition  The join condition.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function rightJoin($condition)
+	{
+		$this->join('RIGHT', $condition);
+
+		return $this;
+	}
+
+	/**
+	 * Add a single column, or array of columns to the SELECT clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 * The select method can, however, be called multiple times in the same query.
+	 *
+	 * Usage:
+	 * $query->select('a.*')->select('b.id');
+	 * $query->select(array('a.*', 'b.id'));
+	 *
+	 * @param   mixed  $columns  A string or an array of field names.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function select($columns)
+	{
+		$this->type = 'select';
+
+		if (is_null($this->select))
+		{
+			$this->select = new JDatabaseQueryElement('SELECT', $columns);
+		}
+		else
+		{
+			$this->select->append($columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a single condition string, or an array of strings to the SET clause of the query.
+	 *
+	 * Usage:
+	 * $query->set('a = 1')->set('b = 2');
+	 * $query->set(array('a = 1', 'b = 2');
+	 *
+	 * @param   mixed   $conditions  A string or array of string conditions.
+	 * @param   string  $glue        The glue by which to join the condition strings. Defaults to ,.
+	 *                               Note that the glue is set on first use and cannot be changed.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function set($conditions, $glue = ',')
+	{
+		if (is_null($this->set))
+		{
+			$glue = strtoupper($glue);
+			$this->set = new JDatabaseQueryElement('SET', $conditions, "\n\t$glue ");
+		}
+		else
+		{
+			$this->set->append($conditions);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Allows a direct query to be provided to the database
+	 * driver's setQuery() method, but still allow queries
+	 * to have bounded variables.
+	 *
+	 * Usage:
+	 * $query->setQuery('select * from #__users');
+	 *
+	 * @param   mixed  $sql  An SQL Query
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setQuery($sql)
+	{
+		$this->sql = $sql;
+
+		return $this;
+	}
+
+	/**
+	 * Add a table name to the UPDATE clause of the query.
+	 *
+	 * Note that you must not mix insert, update, delete and select method calls when building a query.
+	 *
+	 * Usage:
+	 * $query->update('#__foo')->set(...);
+	 *
+	 * @param   string  $table  A table to update.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function update($table)
+	{
+		$this->type = 'update';
+		$this->update = new JDatabaseQueryElement('UPDATE', $table);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a tuple, or array of tuples that would be used as values for an INSERT INTO statement.
+	 *
+	 * Usage:
+	 * $query->values('1,2,3')->values('4,5,6');
+	 * $query->values(array('1,2,3', '4,5,6'));
+	 *
+	 * @param   string  $values  A single tuple, or array of tuples.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function values($values)
+	{
+		if (is_null($this->values))
+		{
+			$this->values = new JDatabaseQueryElement('()', $values, '),(');
+		}
+		else
+		{
+			$this->values->append($values);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a single condition, or an array of conditions to the WHERE clause of the query.
+	 *
+	 * Usage:
+	 * $query->where('a = 1')->where('b = 2');
+	 * $query->where(array('a = 1', 'b = 2'));
+	 *
+	 * @param   mixed   $conditions  A string or array of where conditions.
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to AND.
+	 *                               Note that the glue is set on first use and cannot be changed.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function where($conditions, $glue = 'AND')
+	{
+		if (is_null($this->where))
+		{
+			$glue = strtoupper($glue);
+			$this->where = new JDatabaseQueryElement('WHERE', $conditions, " $glue ");
+		}
+		else
+		{
+			$this->where->append($conditions);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Extend the WHERE clause with a single condition or an array of conditions, with a potentially
+	 * different logical operator from the one in the current WHERE clause.
+	 *
+	 * Usage:
+	 * $query->where(array('a = 1', 'b = 2'))->extendWhere('XOR', array('c = 3', 'd = 4'));
+	 * will produce: WHERE ((a = 1 AND b = 2) XOR (c = 3 AND d = 4)
+	 *
+	 * @param   string  $outerGlue   The glue by which to join the conditions to the current WHERE conditions.
+	 * @param   mixed   $conditions  A string or array of WHERE conditions.
+	 * @param   string  $innerGlue   The glue by which to join the conditions. Defaults to AND.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.6
+	 */
+	public function extendWhere($outerGlue, $conditions, $innerGlue = 'AND')
+	{
+		// Replace the current WHERE with a new one which has the old one as an unnamed child.
+		$this->where = new JDatabaseQueryElement('WHERE', $this->where->setName('()'), " $outerGlue ");
+
+		// Append the new conditions as a new unnamed child.
+		$this->where->append(new JDatabaseQueryElement('()', $conditions, " $innerGlue "));
+
+		return $this;
+	}
+
+	/**
+	 * Extend the WHERE clause with an OR and a single condition or an array of conditions.
+	 *
+	 * Usage:
+	 * $query->where(array('a = 1', 'b = 2'))->orWhere(array('c = 3', 'd = 4'));
+	 * will produce: WHERE ((a = 1 AND b = 2) OR (c = 3 AND d = 4)
+	 *
+	 * @param   mixed   $conditions  A string or array of WHERE conditions.
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to AND.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.6
+	 */
+	public function orWhere($conditions, $glue = 'AND')
+	{
+		return $this->extendWhere('OR', $conditions, $glue);
+	}
+
+	/**
+	 * Extend the WHERE clause with an AND and a single condition or an array of conditions.
+	 *
+	 * Usage:
+	 * $query->where(array('a = 1', 'b = 2'))->andWhere(array('c = 3', 'd = 4'));
+	 * will produce: WHERE ((a = 1 AND b = 2) AND (c = 3 OR d = 4)
+	 *
+	 * @param   mixed   $conditions  A string or array of WHERE conditions.
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to OR.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.6
+	 */
+	public function andWhere($conditions, $glue = 'OR')
+	{
+		return $this->extendWhere('AND', $conditions, $glue);
+	}
+
+	/**
+	 * Method to provide deep copy support to nested objects and
+	 * arrays when cloning.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function __clone()
+	{
+		foreach ($this as $k => $v)
+		{
+			if ($k === 'db')
+			{
+				continue;
+			}
+
+			if (is_object($v) || is_array($v))
+			{
+				$this->{$k} = unserialize(serialize($v));
+			}
+		}
+	}
+
+	/**
+	 * Add a query to UNION with the current query.
+	 * Multiple unions each require separate statements and create an array of unions.
+	 *
+	 * Usage (the $query base query MUST be a select query):
+	 * $query->union('SELECT name FROM  #__foo')
+	 * $query->union('SELECT name FROM  #__foo', true)
+	 * $query->union($query2)->union($query3)
+	 *
+	 * The $query attribute as an array is deprecated and will not be supported in 4.0.
+	 *
+	 * $query->union(array('SELECT name FROM  #__foo','SELECT name FROM  #__bar'))
+	 * $query->union(array($query2, $query3))
+	 *
+	 * @param   mixed    $query     The JDatabaseQuery object or string to union.
+	 * @param   boolean  $distinct  True to only return distinct rows from the union.
+	 * @param   string   $glue      The glue by which to join the conditions.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @link http://dev.mysql.com/doc/refman/5.0/en/union.html
+	 *
+	 * @since   12.1
+	 */
+	public function union($query, $distinct = false, $glue = '')
+	{
+		// Set up the DISTINCT flag, the name with parentheses, and the glue.
+		if ($distinct)
+		{
+			$name = 'UNION DISTINCT ()';
+			$glue = ')' . PHP_EOL . 'UNION DISTINCT (';
+		}
+		else
+		{
+			$glue = ')' . PHP_EOL . 'UNION (';
+			$name = 'UNION ()';
+		}
+
+		if (is_array($query))
+		{
+			JLog::add('Query attribute as an array is deprecated.', JLog::WARNING, 'deprecated');
+		}
+
+		// Get the JDatabaseQueryElement if it does not exist
+		if (is_null($this->union))
+		{
+			$this->union = new JDatabaseQueryElement($name, $query, "$glue");
+		}
+		// Otherwise append the second UNION.
+		else
+		{
+			$this->union->append($query);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add a query to UNION DISTINCT with the current query. Simply a proxy to union with the DISTINCT keyword.
+	 *
+	 * Usage:
+	 * $query->unionDistinct('SELECT name FROM  #__foo')
+	 *
+	 * @param   mixed   $query  The JDatabaseQuery object or string to union.
+	 * @param   string  $glue   The glue by which to join the conditions.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @see     union
+	 *
+	 * @since   12.1
+	 * @deprecated  4.0  Use union() instead.
+	 */
+	public function unionDistinct($query, $glue = '')
+	{
+		$distinct = true;
+
+		// Apply the distinct flag to the union.
+		return $this->union($query, $distinct, $glue);
+	}
+
+	/**
+	 * Find and replace sprintf-like tokens in a format string.
+	 * Each token takes one of the following forms:
+	 *     %%       - A literal percent character.
+	 *     %[t]     - Where [t] is a type specifier.
+	 *     %[n]$[x] - Where [n] is an argument specifier and [t] is a type specifier.
+	 *
+	 * Types:
+	 * a - Numeric: Replacement text is coerced to a numeric type but not quoted or escaped.
+	 * e - Escape: Replacement text is passed to $this->escape().
+	 * E - Escape (extra): Replacement text is passed to $this->escape() with true as the second argument.
+	 * n - Name Quote: Replacement text is passed to $this->quoteName().
+	 * q - Quote: Replacement text is passed to $this->quote().
+	 * Q - Quote (no escape): Replacement text is passed to $this->quote() with false as the second argument.
+	 * r - Raw: Replacement text is used as-is. (Be careful)
+	 *
+	 * Date Types:
+	 * - Replacement text automatically quoted (use uppercase for Name Quote).
+	 * - Replacement text should be a string in date format or name of a date column.
+	 * y/Y - Year
+	 * m/M - Month
+	 * d/D - Day
+	 * h/H - Hour
+	 * i/I - Minute
+	 * s/S - Second
+	 *
+	 * Invariable Types:
+	 * - Takes no argument.
+	 * - Argument index not incremented.
+	 * t - Replacement text is the result of $this->currentTimestamp().
+	 * z - Replacement text is the result of $this->nullDate(false).
+	 * Z - Replacement text is the result of $this->nullDate(true).
+	 *
+	 * Usage:
+	 * $query->format('SELECT %1$n FROM %2$n WHERE %3$n = %4$a', 'foo', '#__foo', 'bar', 1);
+	 * Returns: SELECT `foo` FROM `#__foo` WHERE `bar` = 1
+	 *
+	 * Notes:
+	 * The argument specifier is optional but recommended for clarity.
+	 * The argument index used for unspecified tokens is incremented only when used.
+	 *
+	 * @param   string  $format  The formatting string.
+	 *
+	 * @return  string  Returns a string produced according to the formatting string.
+	 *
+	 * @since   12.3
+	 */
+	public function format($format)
+	{
+		$query = $this;
+		$args = array_slice(func_get_args(), 1);
+		array_unshift($args, null);
+
+		$i = 1;
+		$func = function ($match) use ($query, $args, &$i)
+		{
+			if (isset($match[6]) && $match[6] == '%')
+			{
+				return '%';
+			}
+
+			// No argument required, do not increment the argument index.
+			switch ($match[5])
+			{
+				case 't':
+					return $query->currentTimestamp();
+					break;
+
+				case 'z':
+					return $query->nullDate(false);
+					break;
+
+				case 'Z':
+					return $query->nullDate(true);
+					break;
+			}
+
+			// Increment the argument index only if argument specifier not provided.
+			$index = is_numeric($match[4]) ? (int) $match[4] : $i++;
+
+			if (!$index || !isset($args[$index]))
+			{
+				// TODO - What to do? sprintf() throws a Warning in these cases.
+				$replacement = '';
+			}
+			else
+			{
+				$replacement = $args[$index];
+			}
+
+			switch ($match[5])
+			{
+				case 'a':
+					return 0 + $replacement;
+					break;
+
+				case 'e':
+					return $query->escape($replacement);
+					break;
+
+				case 'E':
+					return $query->escape($replacement, true);
+					break;
+
+				case 'n':
+					return $query->quoteName($replacement);
+					break;
+
+				case 'q':
+					return $query->quote($replacement);
+					break;
+
+				case 'Q':
+					return $query->quote($replacement, false);
+					break;
+
+				case 'r':
+					return $replacement;
+					break;
+
+				// Dates
+				case 'y':
+					return $query->year($query->quote($replacement));
+					break;
+
+				case 'Y':
+					return $query->year($query->quoteName($replacement));
+					break;
+
+				case 'm':
+					return $query->month($query->quote($replacement));
+					break;
+
+				case 'M':
+					return $query->month($query->quoteName($replacement));
+					break;
+
+				case 'd':
+					return $query->day($query->quote($replacement));
+					break;
+
+				case 'D':
+					return $query->day($query->quoteName($replacement));
+					break;
+
+				case 'h':
+					return $query->hour($query->quote($replacement));
+					break;
+
+				case 'H':
+					return $query->hour($query->quoteName($replacement));
+					break;
+
+				case 'i':
+					return $query->minute($query->quote($replacement));
+					break;
+
+				case 'I':
+					return $query->minute($query->quoteName($replacement));
+					break;
+
+				case 's':
+					return $query->second($query->quote($replacement));
+					break;
+
+				case 'S':
+					return $query->second($query->quoteName($replacement));
+					break;
+			}
+
+			return '';
+		};
+
+		/**
+		 * Regexp to find and replace all tokens.
+		 * Matched fields:
+		 * 0: Full token
+		 * 1: Everything following '%'
+		 * 2: Everything following '%' unless '%'
+		 * 3: Argument specifier and '$'
+		 * 4: Argument specifier
+		 * 5: Type specifier
+		 * 6: '%' if full token is '%%'
+		 */
+		return preg_replace_callback('#%(((([\d]+)\$)?([aeEnqQryYmMdDhHiIsStzZ]))|(%))#', $func, $format);
+	}
+
+	/**
+	 * Add to the current date and time.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 * Note: Not all drivers support all units.
+	 *
+	 * @param   mixed   $date      The date to add to. May be date or datetime
+	 * @param   string  $interval  The string representation of the appropriate number of units
+	 * @param   string  $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @link    http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_date-add
+	 * @since   13.1
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		return trim("DATE_ADD('" . $date . "', INTERVAL " . $interval . ' ' . $datePart . ')');
+	}
+
+	/**
+	 * Add a query to UNION ALL with the current query.
+	 * Multiple unions each require separate statements and create an array of unions.
+	 *
+	 * Usage:
+	 * $query->union('SELECT name FROM  #__foo')
+	 *
+	 * The $query attribute as an array is deprecated and will not be supported in 4.0.
+	 *
+	 * $query->union(array('SELECT name FROM  #__foo','SELECT name FROM  #__bar'))
+	 *
+	 * @param   mixed    $query     The JDatabaseQuery object or string to union.
+	 * @param   boolean  $distinct  Not used - ignored.
+	 * @param   string   $glue      Not used - ignored.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @see     union
+	 *
+	 * @since   13.1
+	 */
+	public function unionAll($query, $distinct = false, $glue = '')
+	{
+		$glue = ')' . PHP_EOL . 'UNION ALL (';
+		$name = 'UNION ALL ()';
+
+		if (is_array($query))
+		{
+			JLog::add('Query attribute as an array is deprecated.', JLog::WARNING, 'deprecated');
+		}
+
+		// Get the JDatabaseQueryElement if it does not exist
+		if (is_null($this->unionAll))
+		{
+			$this->unionAll = new JDatabaseQueryElement($name, $query, "$glue");
+		}
+
+		// Otherwise append the second UNION.
+		else
+		{
+			$this->unionAll->append($query);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Validate arguments which are passed to selectRowNumber method and set up common variables.
+	 *
+	 * @param   string  $orderBy           An expression of ordering for window function.
+	 * @param   string  $orderColumnAlias  An alias for new ordering column.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 * @throws  RuntimeException
+	 */
+	protected function validateRowNumber($orderBy, $orderColumnAlias)
+	{
+		if ($this->selectRowNumber)
+		{
+			throw new RuntimeException("Method 'selectRowNumber' can be called only once per instance.");
+		}
+
+		$this->type = 'select';
+
+		$this->selectRowNumber = array(
+			'orderBy' => $orderBy,
+			'orderColumnAlias' => $orderColumnAlias,
+		);
+	}
+
+	/**
+	 * Return the number of the current row.
+	 *
+	 * Usage:
+	 * $query->select('id');
+	 * $query->selectRowNumber('ordering,publish_up DESC', 'new_ordering');
+	 * $query->from('#__content');
+	 *
+	 * @param   string  $orderBy           An expression of ordering for window function.
+	 * @param   string  $orderColumnAlias  An alias for new ordering column.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.7.0
+	 * @throws  RuntimeException
+	 */
+	public function selectRowNumber($orderBy, $orderColumnAlias)
+	{
+		$this->validateRowNumber($orderBy, $orderColumnAlias);
+		$this->select("ROW_NUMBER() OVER (ORDER BY $orderBy) AS $orderColumnAlias");
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/query/element.php b/core/libraries/joomla/database/query/element.php
new file mode 100644
index 00000000..e5cbd844
--- /dev/null
+++ b/core/libraries/joomla/database/query/element.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Element Class.
+ *
+ * @property-read    string  $name      The name of the element.
+ * @property-read    array   $elements  An array of elements.
+ * @property-read    string  $glue      Glue piece.
+ *
+ * @since  11.1
+ */
+class JDatabaseQueryElement
+{
+	/**
+	 * @var    string  The name of the element.
+	 * @since  11.1
+	 */
+	protected $name = null;
+
+	/**
+	 * @var    array  An array of elements.
+	 * @since  11.1
+	 */
+	protected $elements = null;
+
+	/**
+	 * @var    string  Glue piece.
+	 * @since  11.1
+	 */
+	protected $glue = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $name      The name of the element.
+	 * @param   mixed   $elements  String or array.
+	 * @param   string  $glue      The glue for elements.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($name, $elements, $glue = ',')
+	{
+		$this->elements = array();
+		$this->name = $name;
+		$this->glue = $glue;
+
+		$this->append($elements);
+	}
+
+	/**
+	 * Magic function to convert the query element to a string.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		if (substr($this->name, -2) == '()')
+		{
+			return PHP_EOL . substr($this->name, 0, -2) . '(' . implode($this->glue, $this->elements) . ')';
+		}
+		else
+		{
+			return PHP_EOL . $this->name . ' ' . implode($this->glue, $this->elements);
+		}
+	}
+
+	/**
+	 * Appends element parts to the internal list.
+	 *
+	 * @param   mixed  $elements  String or array.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function append($elements)
+	{
+		if (is_array($elements))
+		{
+			$this->elements = array_merge($this->elements, $elements);
+		}
+		else
+		{
+			$this->elements[] = $elements;
+		}
+	}
+
+	/**
+	 * Gets the elements of this element.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function getElements()
+	{
+		return $this->elements;
+	}
+
+	/**
+	 * Sets the name of this element.
+	 *
+	 * @param   string  $name  Name of the element.
+	 *
+	 * @return  JDatabaseQueryElement  Returns this object to allow chaining.
+	 *
+	 * @since   3.6
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+
+		return $this;
+	}
+
+	/**
+	 * Method to provide deep copy support to nested objects and arrays
+	 * when cloning.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function __clone()
+	{
+		foreach ($this as $k => $v)
+		{
+			if (is_object($v) || is_array($v))
+			{
+				$this->{$k} = unserialize(serialize($v));
+			}
+		}
+	}
+}
diff --git a/core/libraries/joomla/database/query/limitable.php b/core/libraries/joomla/database/query/limitable.php
new file mode 100644
index 00000000..03e40f95
--- /dev/null
+++ b/core/libraries/joomla/database/query/limitable.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Database Query Limitable Interface.
+ * Adds bind/unbind methods as well as a getBounded() method
+ * to retrieve the stored bounded variables on demand prior to
+ * query execution.
+ *
+ * @since  12.1
+ */
+interface JDatabaseQueryLimitable
+{
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset. This method is used
+	 * automatically by the __toString() method if it detects that the
+	 * query implements the JDatabaseQueryLimitable interface.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0);
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0);
+}
diff --git a/core/libraries/joomla/database/query/mysql.php b/core/libraries/joomla/database/query/mysql.php
new file mode 100644
index 00000000..5b9fb1ff
--- /dev/null
+++ b/core/libraries/joomla/database/query/mysql.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since       11.1
+ * @deprecated  4.0  Use MySQLi or PDO MySQL instead
+ */
+class JDatabaseQueryMysql extends JDatabaseQueryMysqli
+{
+}
diff --git a/core/libraries/joomla/database/query/mysqli.php b/core/libraries/joomla/database/query/mysqli.php
new file mode 100644
index 00000000..d6cae973
--- /dev/null
+++ b/core/libraries/joomla/database/query/mysqli.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ */
+class JDatabaseQueryMysqli extends JDatabaseQuery implements JDatabaseQueryLimitable
+{
+	/**
+	 * @var    integer  The offset for the result set.
+	 * @since  12.1
+	 */
+	protected $offset;
+
+	/**
+	 * @var    integer  The limit for the result set.
+	 * @since  12.1
+	 */
+	protected $limit;
+
+	/**
+	 * Magic function to convert the query to a string.
+	 *
+	 * @return  string  The completed query.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		switch ($this->type)
+		{
+			case 'select':
+				if ($this->selectRowNumber)
+				{
+					$orderBy      = $this->selectRowNumber['orderBy'];
+					$tmpOffset    = $this->offset;
+					$tmpLimit     = $this->limit;
+					$this->offset = 0;
+					$this->limit  = 0;
+					$tmpOrder     = $this->order;
+					$this->order  = null;
+					$query        = parent::__toString();
+					$this->order  = $tmpOrder;
+					$this->offset = $tmpOffset;
+					$this->limit  = $tmpLimit;
+
+					// Add support for second order by, offset and limit
+					$query = PHP_EOL . 'SELECT * FROM (' . $query . PHP_EOL . "ORDER BY $orderBy" . PHP_EOL . ') w';
+
+					if ($this->order)
+					{
+						$query .= (string) $this->order;
+					}
+
+					return $this->processLimit($query, $this->limit, $this->offset);
+				}
+		}
+
+		return parent::__toString();
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return string
+	 *
+	 * @since 12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit > 0 && $offset > 0)
+		{
+			$query .= ' LIMIT ' . $offset . ', ' . $limit;
+		}
+		elseif ($limit > 0)
+		{
+			$query .= ' LIMIT ' . $limit;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			$concat_string = 'CONCAT_WS(' . $this->quote($separator);
+
+			foreach ($values as $value)
+			{
+				$concat_string .= ', ' . $value;
+			}
+
+			return $concat_string . ')';
+		}
+		else
+		{
+			return 'CONCAT(' . implode(',', $values) . ')';
+		}
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit  = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Return correct regexp operator for mysqli.
+	 *
+	 * Ensure that the regexp operator is mysqli compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   11.3
+	 */
+	public function regexp($value)
+	{
+		return ' REGEXP ' . $value;
+	}
+
+	/**
+	 * Return correct rand() function for Mysql.
+	 *
+	 * Ensure that the rand() function is Mysql compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   3.5
+	 */
+	public function Rand()
+	{
+		return ' RAND() ';
+	}
+
+	/**
+	 * Return the number of the current row.
+	 *
+	 * @param   string  $orderBy           An expression of ordering for window function.
+	 * @param   string  $orderColumnAlias  An alias for new ordering column.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.7.0
+	 * @throws  RuntimeException
+	 */
+	public function selectRowNumber($orderBy, $orderColumnAlias)
+	{
+		$this->validateRowNumber($orderBy, $orderColumnAlias);
+		$this->select("(SELECT @rownum := @rownum + 1 FROM (SELECT @rownum := 0) AS r) AS $orderColumnAlias");
+
+		return $this;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * Usage:
+	 * $query->select($query->castAsChar('a'));
+	 * $query->select($query->castAsChar('a', 40));
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @param   string  $len    The lenght of the char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   3.7.0
+	 */
+	public function castAsChar($value, $len = null)
+	{
+		if (!$len)
+		{
+			return $value;
+		}
+		else
+		{
+			return ' CAST(' . $value . ' AS CHAR(' . $len . '))';
+		}
+	}
+}
diff --git a/core/libraries/joomla/database/query/oracle.php b/core/libraries/joomla/database/query/oracle.php
new file mode 100644
index 00000000..2dd5a6c0
--- /dev/null
+++ b/core/libraries/joomla/database/query/oracle.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Oracle Query Building Class.
+ *
+ * @since  12.1
+ */
+class JDatabaseQueryOracle extends JDatabaseQueryPdo implements JDatabaseQueryPreparable, JDatabaseQueryLimitable
+{
+	/**
+	 * @var    integer  The offset for the result set.
+	 * @since  12.1
+	 */
+	protected $offset;
+
+	/**
+	 * @var    integer  The limit for the result set.
+	 * @since  12.1
+	 */
+	protected $limit;
+
+	/**
+	 * @var    array  Bounded object array
+	 * @since  12.1
+	 */
+	protected $bounded = array();
+
+	/**
+	 * Method to add a variable to an internal array that will be bound to a prepared SQL statement before query execution. Also
+	 * removes a variable that has been bounded from the internal bounded array when the passed in value is null.
+	 *
+	 * @param   string|integer  $key            The key that will be used in your SQL query to reference the value. Usually of
+	 *                                          the form ':key', but can also be an integer.
+	 * @param   mixed           &$value         The value that will be bound. The value is passed by reference to support output
+	 *                                          parameters such as those possible with stored procedures.
+	 * @param   integer         $dataType       Constant corresponding to a SQL datatype.
+	 * @param   integer         $length         The length of the variable. Usually required for OUTPUT parameters.
+	 * @param   array           $driverOptions  Optional driver options to be used.
+	 *
+	 * @return  JDatabaseQueryOracle
+	 *
+	 * @since   12.1
+	 */
+	public function bind($key = null, &$value = null, $dataType = PDO::PARAM_STR, $length = 0, $driverOptions = array())
+	{
+		// Case 1: Empty Key (reset $bounded array)
+		if (empty($key))
+		{
+			$this->bounded = array();
+
+			return $this;
+		}
+
+		// Case 2: Key Provided, null value (unset key from $bounded array)
+		if (is_null($value))
+		{
+			if (isset($this->bounded[$key]))
+			{
+				unset($this->bounded[$key]);
+			}
+
+			return $this;
+		}
+
+		$obj = new stdClass;
+
+		$obj->value = &$value;
+		$obj->dataType = $dataType;
+		$obj->length = $length;
+		$obj->driverOptions = $driverOptions;
+
+		// Case 3: Simply add the Key/Value into the bounded array
+		$this->bounded[$key] = $obj;
+
+		return $this;
+	}
+
+	/**
+	 * Retrieves the bound parameters array when key is null and returns it by reference. If a key is provided then that item is
+	 * returned.
+	 *
+	 * @param   mixed  $key  The bounded variable key to retrieve.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.1
+	 */
+	public function &getBounded($key = null)
+	{
+		if (empty($key))
+		{
+			return $this->bounded;
+		}
+		else
+		{
+			if (isset($this->bounded[$key]))
+			{
+				return $this->bounded[$key];
+			}
+		}
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  JDatabaseQueryOracle  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function clear($clause = null)
+	{
+		switch ($clause)
+		{
+			case null:
+				$this->bounded = array();
+				break;
+		}
+
+		parent::clear($clause);
+
+		return $this;
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset. This method is used
+	 * automatically by the __toString() method if it detects that the
+	 * query implements the JDatabaseQueryLimitable interface.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		// Check if we need to mangle the query.
+		if ($limit || $offset)
+		{
+			$query = 'SELECT joomla2.*
+		              FROM (
+		                  SELECT joomla1.*, ROWNUM AS joomla_db_rownum
+		                  FROM (
+		                      ' . $query . '
+		                  ) joomla1
+		              ) joomla2';
+
+			// Check if the limit value is greater than zero.
+			if ($limit > 0)
+			{
+				$query .= ' WHERE joomla2.joomla_db_rownum BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $limit);
+			}
+			else
+			{
+				// Check if there is an offset and then use this.
+				if ($offset)
+				{
+					$query .= ' WHERE joomla2.joomla_db_rownum > ' . ($offset + 1);
+				}
+			}
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  JDatabaseQueryOracle  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/query/pdo.php b/core/libraries/joomla/database/query/pdo.php
new file mode 100644
index 00000000..784db831
--- /dev/null
+++ b/core/libraries/joomla/database/query/pdo.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * PDO Query Building Class.
+ *
+ * @since  12.1
+ */
+class JDatabaseQueryPdo extends JDatabaseQuery
+{
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * Usage:
+	 * $query->select($query->castAsChar('a'));
+	 * $query->select($query->castAsChar('a', 40));
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @param   string  $len    The lenght of the char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.1
+	 */
+	public function castAsChar($value, $len = null)
+	{
+		if (!$len)
+		{
+			return $value;
+		}
+		else
+		{
+			return ' CAST(' . $value . ' AS CHAR(' . $len . '))';
+		}
+	}
+}
diff --git a/core/libraries/joomla/database/query/pdomysql.php b/core/libraries/joomla/database/query/pdomysql.php
new file mode 100644
index 00000000..301e6546
--- /dev/null
+++ b/core/libraries/joomla/database/query/pdomysql.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ * @since       3.4
+ */
+class JDatabaseQueryPdomysql extends JDatabaseQueryMysqli
+{
+}
diff --git a/core/libraries/joomla/database/query/postgresql.php b/core/libraries/joomla/database/query/postgresql.php
new file mode 100644
index 00000000..4d6e773e
--- /dev/null
+++ b/core/libraries/joomla/database/query/postgresql.php
@@ -0,0 +1,776 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.3
+ */
+class JDatabaseQueryPostgresql extends JDatabaseQuery implements JDatabaseQueryLimitable
+{
+	/**
+	 * @var    object  The FOR UPDATE element used in "FOR UPDATE"  lock
+	 * @since  11.3
+	 */
+	protected $forUpdate = null;
+
+	/**
+	 * @var    object  The FOR SHARE element used in "FOR SHARE"  lock
+	 * @since  11.3
+	 */
+	protected $forShare = null;
+
+	/**
+	 * @var    object  The NOWAIT element used in "FOR SHARE" and "FOR UPDATE" lock
+	 * @since  11.3
+	 */
+	protected $noWait = null;
+
+	/**
+	 * @var    object  The LIMIT element
+	 * @since  11.3
+	 */
+	protected $limit = null;
+
+	/**
+	 * @var    object  The OFFSET element
+	 * @since  11.3
+	 */
+	protected $offset = null;
+
+	/**
+	 * @var    object  The RETURNING element of INSERT INTO
+	 * @since  11.3
+	 */
+	protected $returning = null;
+
+	/**
+	 * Magic function to convert the query to a string, only for postgresql specific query
+	 *
+	 * @return  string	The completed query.
+	 *
+	 * @since   11.3
+	 */
+	public function __toString()
+	{
+		$query = '';
+
+		switch ($this->type)
+		{
+			case 'select':
+				if ($this->selectRowNumber && $this->selectRowNumber['native'] === false)
+				{
+					// Workaround for postgresql version less than 8.4.0
+					try
+					{
+						$this->db->setQuery('CREATE TEMP SEQUENCE ROW_NUMBER');
+						$this->db->execute();
+					}
+					catch (JDatabaseExceptionExecuting $e)
+					{
+						// Do nothing, sequence exists
+					}
+
+					$orderBy          = $this->selectRowNumber['orderBy'];
+					$orderColumnAlias = $this->selectRowNumber['orderColumnAlias'];
+
+					$columns = "nextval('ROW_NUMBER') - 1 AS $orderColumnAlias";
+
+					if ($this->select === null)
+					{
+						$query = PHP_EOL . "SELECT 1"
+							. (string) $this->from
+							. (string) $this->where;
+					}
+					else
+					{
+						$tmpOffset    = $this->offset;
+						$tmpLimit     = $this->limit;
+						$this->offset = 0;
+						$this->limit  = 0;
+						$tmpOrder     = $this->order;
+						$this->order  = null;
+						$query        = parent::__toString();
+						$columns      = "w.*, $columns";
+						$this->order  = $tmpOrder;
+						$this->offset = $tmpOffset;
+						$this->limit  = $tmpLimit;
+					}
+
+					// Add support for second order by, offset and limit
+					$query = PHP_EOL . "SELECT $columns FROM (" . $query . PHP_EOL . "ORDER BY $orderBy"
+						. PHP_EOL . ") w,(SELECT setval('ROW_NUMBER', 1)) AS r";
+
+					if ($this->order)
+					{
+						$query .= (string) $this->order;
+					}
+
+					break;
+				}
+
+				$query .= (string) $this->select;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->selectRowNumber)
+				{
+					if ($this->order)
+					{
+						$query .= (string) $this->order;
+					}
+
+					break;
+				}
+
+				if ($this->group)
+				{
+					$query .= (string) $this->group;
+				}
+
+				if ($this->having)
+				{
+					$query .= (string) $this->having;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				if ($this->forUpdate)
+				{
+					$query .= (string) $this->forUpdate;
+				}
+				else
+				{
+					if ($this->forShare)
+					{
+						$query .= (string) $this->forShare;
+					}
+				}
+
+				if ($this->noWait)
+				{
+					$query .= (string) $this->noWait;
+				}
+
+				break;
+
+			case 'update':
+				$query .= (string) $this->update;
+				$query .= (string) $this->set;
+
+				if ($this->join)
+				{
+					$tmpFrom     = $this->from;
+					$tmpWhere    = $this->where ? clone $this->where : null;
+					$this->from  = null;
+
+					// Workaround for special case of JOIN with UPDATE
+					foreach ($this->join as $join)
+					{
+						$joinElem = $join->getElements();
+
+						$joinArray = preg_split('/\sON\s/i', $joinElem[0]);
+
+						if (count($joinArray) > 2)
+						{
+							$condition = array_pop($joinArray);
+							$joinArray = array(implode(' ON ', $joinArray), $condition);
+						}
+
+						$this->from($joinArray[0]);
+
+						if (isset($joinArray[1]))
+						{
+							$this->where($joinArray[1]);
+						}
+					}
+
+					$query .= (string) $this->from;
+
+					if ($this->where)
+					{
+						$query .= (string) $this->where;
+					}
+
+					$this->from  = $tmpFrom;
+					$this->where = $tmpWhere;
+				}
+				elseif ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				break;
+
+			case 'insert':
+				$query .= (string) $this->insert;
+
+				if ($this->values)
+				{
+					if ($this->columns)
+					{
+						$query .= (string) $this->columns;
+					}
+
+					$elements = $this->values->getElements();
+
+					if (!($elements[0] instanceof $this))
+					{
+						$query .= ' VALUES ';
+					}
+
+					$query .= (string) $this->values;
+
+					if ($this->returning)
+					{
+						$query .= (string) $this->returning;
+					}
+				}
+
+				break;
+
+			default:
+				$query = parent::__toString();
+				break;
+		}
+
+		if ($this instanceof JDatabaseQueryLimitable)
+		{
+			$query = $this->processLimit($query, $this->limit, $this->offset);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  JDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function clear($clause = null)
+	{
+		switch ($clause)
+		{
+			case 'limit':
+				$this->limit = null;
+				break;
+
+			case 'offset':
+				$this->offset = null;
+				break;
+
+			case 'forUpdate':
+				$this->forUpdate = null;
+				break;
+
+			case 'forShare':
+				$this->forShare = null;
+				break;
+
+			case 'noWait':
+				$this->noWait = null;
+				break;
+
+			case 'returning':
+				$this->returning = null;
+				break;
+
+			case 'select':
+			case 'update':
+			case 'delete':
+			case 'insert':
+			case 'from':
+			case 'join':
+			case 'set':
+			case 'where':
+			case 'group':
+			case 'having':
+			case 'order':
+			case 'columns':
+			case 'values':
+				parent::clear($clause);
+				break;
+
+			default:
+				$this->type = null;
+				$this->limit = null;
+				$this->offset = null;
+				$this->forUpdate = null;
+				$this->forShare = null;
+				$this->noWait = null;
+				$this->returning = null;
+				parent::clear($clause);
+				break;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * Usage:
+	 * $query->select($query->castAsChar('a'));
+	 * $query->select($query->castAsChar('a', 40));
+	 *
+	 * @param   string  $value  The value to cast as a char.
+	 *
+	 * @param   string  $len    The lenght of the char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.3
+	 */
+	public function castAsChar($value, $len = null)
+	{
+		if (!$len)
+		{
+			return $value . '::text';
+		}
+		else
+		{
+			return ' CAST(' . $value . ' AS CHAR(' . $len . '))';
+		}
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * Usage:
+	 * $query->select($query->concatenate(array('a', 'b')));
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.3
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return implode(' || ' . $this->quote($separator) . ' || ', $values);
+		}
+		else
+		{
+			return implode(' || ', $values);
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * @return  string  Return string used in query to obtain
+	 *
+	 * @since   11.3
+	 */
+	public function currentTimestamp()
+	{
+		return 'NOW()';
+	}
+
+	/**
+	 * Sets the FOR UPDATE lock on select's output row
+	 *
+	 * @param   string  $table_name  The table to lock
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to ',' .
+	 *
+	 * @return  JDatabaseQueryPostgresql  FOR UPDATE query element
+	 *
+	 * @since   11.3
+	 */
+	public function forUpdate($table_name, $glue = ',')
+	{
+		$this->type = 'forUpdate';
+
+		if (is_null($this->forUpdate))
+		{
+			$glue            = strtoupper($glue);
+			$this->forUpdate = new JDatabaseQueryElement('FOR UPDATE', 'OF ' . $table_name, "$glue ");
+		}
+		else
+		{
+			$this->forUpdate->append($table_name);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the FOR SHARE lock on select's output row
+	 *
+	 * @param   string  $table_name  The table to lock
+	 * @param   string  $glue        The glue by which to join the conditions. Defaults to ',' .
+	 *
+	 * @return  JDatabaseQueryPostgresql  FOR SHARE query element
+	 *
+	 * @since   11.3
+	 */
+	public function forShare($table_name, $glue = ',')
+	{
+		$this->type = 'forShare';
+
+		if (is_null($this->forShare))
+		{
+			$glue           = strtoupper($glue);
+			$this->forShare = new JDatabaseQueryElement('FOR SHARE', 'OF ' . $table_name, "$glue ");
+		}
+		else
+		{
+			$this->forShare->append($table_name);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Used to get a string to extract year from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->year($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing year to be extracted.
+	 *
+	 * @return  string  Returns string to extract year from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function year($date)
+	{
+		return 'EXTRACT (YEAR FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract month from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->month($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing month to be extracted.
+	 *
+	 * @return  string  Returns string to extract month from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function month($date)
+	{
+		return 'EXTRACT (MONTH FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract day from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->day($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing day to be extracted.
+	 *
+	 * @return  string  Returns string to extract day from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function day($date)
+	{
+		return 'EXTRACT (DAY FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract hour from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->hour($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing hour to be extracted.
+	 *
+	 * @return  string  Returns string to extract hour from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function hour($date)
+	{
+		return 'EXTRACT (HOUR FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract minute from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->minute($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing minute to be extracted.
+	 *
+	 * @return  string  Returns string to extract minute from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function minute($date)
+	{
+		return 'EXTRACT (MINUTE FROM ' . $date . ')';
+	}
+
+	/**
+	 * Used to get a string to extract seconds from date column.
+	 *
+	 * Usage:
+	 * $query->select($query->second($query->quoteName('dateColumn')));
+	 *
+	 * @param   string  $date  Date column containing second to be extracted.
+	 *
+	 * @return  string  Returns string to extract second from a date.
+	 *
+	 * @since   12.1
+	 */
+	public function second($date)
+	{
+		return 'EXTRACT (SECOND FROM ' . $date . ')';
+	}
+
+	/**
+	 * Sets the NOWAIT lock on select's output row
+	 *
+	 * @return  JDatabaseQueryPostgresql  NO WAIT query element
+	 *
+	 * @since   11.3
+	 */
+	public function noWait ()
+	{
+		$this->type = 'noWait';
+
+		if (is_null($this->noWait))
+		{
+			$this->noWait = new JDatabaseQueryElement('NOWAIT', null);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the LIMIT clause to the query
+	 *
+	 * @param   integer  $limit  An int of how many row will be returned
+	 *
+	 * @return  JDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function limit($limit = 0)
+	{
+		if (is_null($this->limit))
+		{
+			$this->limit = new JDatabaseQueryElement('LIMIT', (int) $limit);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the OFFSET clause to the query
+	 *
+	 * @param   integer  $offset  An int for skipping row
+	 *
+	 * @return  JDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function offset($offset = 0)
+	{
+		if (is_null($this->offset))
+		{
+			$this->offset = new JDatabaseQueryElement('OFFSET', (int) $offset);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add the RETURNING element to INSERT INTO statement.
+	 *
+	 * @param   mixed  $pkCol  The name of the primary key column.
+	 *
+	 * @return  JDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function returning($pkCol)
+	{
+		if (is_null($this->returning))
+		{
+			$this->returning = new JDatabaseQueryElement('RETURNING', $pkCol);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  JDatabaseQueryPostgresql  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit  = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit > 0)
+		{
+			$query .= ' LIMIT ' . $limit;
+		}
+
+		if ($offset > 0)
+		{
+			$query .= ' OFFSET ' . $offset;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Add to the current date and time in Postgresql.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 *
+	 * @param   datetime  $date      The date to add to
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @since   13.1
+	 * @note    Not all drivers support all units. Check appropriate references
+	 * @link    http://www.postgresql.org/docs/9.0/static/functions-datetime.html.
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		if (substr($interval, 0, 1) != '-')
+		{
+			return "timestamp '" . $date . "' + interval '" . $interval . " " . $datePart . "'";
+		}
+		else
+		{
+			return "timestamp '" . $date . "' - interval '" . ltrim($interval, '-') . " " . $datePart . "'";
+		}
+	}
+
+	/**
+	 * Return correct regexp operator for Postgresql.
+	 *
+	 * Ensure that the regexp operator is Postgresql compatible.
+	 *
+	 * Usage:
+	 * $query->where('field ' . $query->regexp($search));
+	 *
+	 * @param   string  $value  The regex pattern.
+	 *
+	 * @return  string  Returns the regex operator.
+	 *
+	 * @since   11.3
+	 */
+	public function regexp($value)
+	{
+		return ' ~* ' . $value;
+	}
+
+	/**
+	 * Return correct rand() function for Postgresql.
+	 *
+	 * Ensure that the rand() function is Postgresql compatible.
+	 * 
+	 * Usage:
+	 * $query->Rand();
+	 * 
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   3.5
+	 */
+	public function Rand()
+	{
+		return ' RANDOM() ';
+	}
+
+	/**
+	 * Return the number of the current row.
+	 *
+	 * @param   string  $orderBy           An expression of ordering for window function.
+	 * @param   string  $orderColumnAlias  An alias for new ordering column.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.7.0
+	 * @throws  RuntimeException
+	 */
+	public function selectRowNumber($orderBy, $orderColumnAlias)
+	{
+		$this->validateRowNumber($orderBy, $orderColumnAlias);
+
+		if (version_compare($this->db->getVersion(), '8.4.0') >= 0)
+		{
+			$this->selectRowNumber['native'] = true;
+			$this->select("ROW_NUMBER() OVER (ORDER BY $orderBy) AS $orderColumnAlias");
+		}
+		else
+		{
+			$this->selectRowNumber['native'] = false;
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/query/preparable.php b/core/libraries/joomla/database/query/preparable.php
new file mode 100644
index 00000000..15f9c24f
--- /dev/null
+++ b/core/libraries/joomla/database/query/preparable.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Database Query Preparable Interface.
+ * Adds bind/unbind methods as well as a getBounded() method
+ * to retrieve the stored bounded variables on demand prior to
+ * query execution.
+ *
+ * @since  12.1
+ */
+interface JDatabaseQueryPreparable
+{
+	/**
+	 * Method to add a variable to an internal array that will be bound to a prepared SQL statement before query execution. Also
+	 * removes a variable that has been bounded from the internal bounded array when the passed in value is null.
+	 *
+	 * @param   string|integer  $key            The key that will be used in your SQL query to reference the value. Usually of
+	 *                                          the form ':key', but can also be an integer.
+	 * @param   mixed           &$value         The value that will be bound. The value is passed by reference to support output
+	 *                                          parameters such as those possible with stored procedures.
+	 * @param   integer         $dataType       Constant corresponding to a SQL datatype.
+	 * @param   integer         $length         The length of the variable. Usually required for OUTPUT parameters.
+	 * @param   array           $driverOptions  Optional driver options to be used.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since   12.1
+	 */
+	public function bind($key = null, &$value = null, $dataType = PDO::PARAM_STR, $length = 0, $driverOptions = array());
+
+	/**
+	 * Retrieves the bound parameters array when key is null and returns it by reference. If a key is provided then that item is
+	 * returned.
+	 *
+	 * @param   mixed  $key  The bounded variable key to retrieve.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.1
+	 */
+	public function &getBounded($key = null);
+}
diff --git a/core/libraries/joomla/database/query/sqlazure.php b/core/libraries/joomla/database/query/sqlazure.php
new file mode 100644
index 00000000..d7fd351d
--- /dev/null
+++ b/core/libraries/joomla/database/query/sqlazure.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ */
+class JDatabaseQuerySqlazure extends JDatabaseQuerySqlsrv
+{
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 *
+	 * @since  11.1
+	 */
+	protected $name_quotes = '';
+}
diff --git a/core/libraries/joomla/database/query/sqlite.php b/core/libraries/joomla/database/query/sqlite.php
new file mode 100644
index 00000000..53b1bbf8
--- /dev/null
+++ b/core/libraries/joomla/database/query/sqlite.php
@@ -0,0 +1,399 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * SQLite Query Building Class.
+ *
+ * @since  12.1
+ */
+class JDatabaseQuerySqlite extends JDatabaseQueryPdo implements JDatabaseQueryPreparable, JDatabaseQueryLimitable
+{
+	/**
+	 * @var    integer  The offset for the result set.
+	 * @since  12.1
+	 */
+	protected $offset;
+
+	/**
+	 * @var    integer  The limit for the result set.
+	 * @since  12.1
+	 */
+	protected $limit;
+
+	/**
+	 * @var    array  Bounded object array
+	 * @since  12.1
+	 */
+	protected $bounded = array();
+
+	/**
+	 * Method to add a variable to an internal array that will be bound to a prepared SQL statement before query execution. Also
+	 * removes a variable that has been bounded from the internal bounded array when the passed in value is null.
+	 *
+	 * @param   string|integer  $key            The key that will be used in your SQL query to reference the value. Usually of
+	 *                                          the form ':key', but can also be an integer.
+	 * @param   mixed           &$value         The value that will be bound. The value is passed by reference to support output
+	 *                                          parameters such as those possible with stored procedures.
+	 * @param   integer         $dataType       Constant corresponding to a SQL datatype.
+	 * @param   integer         $length         The length of the variable. Usually required for OUTPUT parameters.
+	 * @param   array           $driverOptions  Optional driver options to be used.
+	 *
+	 * @return  JDatabaseQuerySqlite
+	 *
+	 * @since   12.1
+	 */
+	public function bind($key = null, &$value = null, $dataType = PDO::PARAM_STR, $length = 0, $driverOptions = array())
+	{
+		// Case 1: Empty Key (reset $bounded array)
+		if (empty($key))
+		{
+			$this->bounded = array();
+
+			return $this;
+		}
+
+		// Case 2: Key Provided, null value (unset key from $bounded array)
+		if (is_null($value))
+		{
+			if (isset($this->bounded[$key]))
+			{
+				unset($this->bounded[$key]);
+			}
+
+			return $this;
+		}
+
+		$obj = new stdClass;
+
+		$obj->value = &$value;
+		$obj->dataType = $dataType;
+		$obj->length = $length;
+		$obj->driverOptions = $driverOptions;
+
+		// Case 3: Simply add the Key/Value into the bounded array
+		$this->bounded[$key] = $obj;
+
+		return $this;
+	}
+
+	/**
+	 * Retrieves the bound parameters array when key is null and returns it by reference. If a key is provided then that item is
+	 * returned.
+	 *
+	 * @param   mixed  $key  The bounded variable key to retrieve.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.1
+	 */
+	public function &getBounded($key = null)
+	{
+		if (empty($key))
+		{
+			return $this->bounded;
+		}
+		else
+		{
+			if (isset($this->bounded[$key]))
+			{
+				return $this->bounded[$key];
+			}
+		}
+	}
+
+	/**
+	 * Gets the number of characters in a string.
+	 *
+	 * Note, use 'length' to find the number of bytes in a string.
+	 *
+	 * Usage:
+	 * $query->select($query->charLength('a'));
+	 *
+	 * @param   string  $field      A value.
+	 * @param   string  $operator   Comparison operator between charLength integer value and $condition
+	 * @param   string  $condition  Integer value to compare charLength with.
+	 *
+	 * @return  string  The required char length call.
+	 *
+	 * @since   13.1
+	 */
+	public function charLength($field, $operator = null, $condition = null)
+	{
+		return 'length(' . $field . ')' . (isset($operator) && isset($condition) ? ' ' . $operator . ' ' . $condition : '');
+	}
+
+	/**
+	 * Clear data from the query or a specific clause of the query.
+	 *
+	 * @param   string  $clause  Optionally, the name of the clause to clear, or nothing to clear the whole query.
+	 *
+	 * @return  JDatabaseQuerySqlite  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function clear($clause = null)
+	{
+		switch ($clause)
+		{
+			case null:
+				$this->bounded = array();
+				break;
+		}
+
+		parent::clear($clause);
+
+		return $this;
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * Usage:
+	 * $query->select($query->concatenate(array('a', 'b')));
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return implode(' || ' . $this->quote($separator) . ' || ', $values);
+		}
+		else
+		{
+			return implode(' || ', $values);
+		}
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset. This method is used
+	 * automatically by the __toString() method if it detects that the
+	 * query implements the JDatabaseQueryLimitable interface.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit > 0 || $offset > 0)
+		{
+			$query .= ' LIMIT ' . $offset . ', ' . $limit;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  JDatabaseQuerySqlite  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Add to the current date and time.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 *
+	 * @param   datetime  $date      The date or datetime to add to
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @since   13.1
+	 * @link    http://www.sqlite.org/lang_datefunc.html
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		// SQLite does not support microseconds as a separate unit. Convert the interval to seconds
+		if (strcasecmp($datePart, 'microseconds') == 0)
+		{
+			$interval = .001 * $interval;
+			$datePart = 'seconds';
+		}
+
+		if (substr($interval, 0, 1) != '-')
+		{
+			return "datetime('" . $date . "', '+" . $interval . " " . $datePart . "')";
+		}
+		else
+		{
+			return "datetime('" . $date . "', '" . $interval . " " . $datePart . "')";
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * Usage:
+	 * $query->where('published_up < '.$query->currentTimestamp());
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4
+	 */
+	public function currentTimestamp()
+	{
+		return 'CURRENT_TIMESTAMP';
+	}
+
+	/**
+	 * Magic function to convert the query to a string.
+	 *
+	 * @return  string  The completed query.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		switch ($this->type)
+		{
+			case 'select':
+				if ($this->selectRowNumber)
+				{
+					$orderBy          = $this->selectRowNumber['orderBy'];
+					$orderColumnAlias = $this->selectRowNumber['orderColumnAlias'];
+
+					$column = "ROW_NUMBER() AS $orderColumnAlias";
+
+					if ($this->select === null)
+					{
+						$query = PHP_EOL . "SELECT 1"
+							. (string) $this->from
+							. (string) $this->where;
+					}
+					else
+					{
+						$tmpOffset    = $this->offset;
+						$tmpLimit     = $this->limit;
+						$this->offset = 0;
+						$this->limit  = 0;
+						$tmpOrder    = $this->order;
+						$this->order = null;
+						$query       = parent::__toString();
+						$column      = "w.*, $column";
+						$this->order = $tmpOrder;
+						$this->offset = $tmpOffset;
+						$this->limit  = $tmpLimit;
+					}
+
+					// Special sqlite query to count ROW_NUMBER
+					$query = PHP_EOL . "SELECT $column"
+						. PHP_EOL . "FROM ($query" . PHP_EOL . "ORDER BY $orderBy"
+						. PHP_EOL . ") AS w,(SELECT ROW_NUMBER(0)) AS r"
+						// Forbid to flatten subqueries.
+						. ((string) $this->order ?: PHP_EOL . 'ORDER BY NULL');
+
+					return $this->processLimit($query, $this->limit, $this->offset);
+				}
+
+				break;
+
+			case 'update':
+				if ($this->join)
+				{
+					$table = $this->update->getElements();
+					$table = $table[0];
+
+					$tableName = explode(' ', $table);
+					$tableName = $tableName[0];
+
+					if ($this->columns === null)
+					{
+						$fields = $this->db->getTableColumns($tableName);
+
+						foreach ($fields as $key => $value)
+						{
+							$fields[$key] = $key;
+						}
+
+						$this->columns = new JDatabaseQueryElement('()', $fields);
+					}
+
+					$fields   = $this->columns->getElements();
+					$elements = $this->set->getElements();
+
+					foreach ($elements as $nameValue)
+					{
+						$setArray = explode(' = ', $nameValue, 2);
+
+						if ($setArray[0][0] === '`')
+						{
+							// Unquote column name
+							$setArray[0] = substr($setArray[0], 1, -1);
+						}
+
+						$fields[$setArray[0]] = $setArray[1];
+					}
+
+					$select = new JDatabaseQuerySqlite($this->db);
+					$select->select(array_values($fields))
+						->from($table);
+
+					$select->join  = $this->join;
+					$select->where = $this->where;
+
+					return 'INSERT OR REPLACE INTO ' . $tableName
+						. ' (' . implode(',', array_keys($fields)) . ')'
+						. (string) $select;
+				}
+		}
+
+		return parent::__toString();
+	}
+
+	/**
+	 * Return the number of the current row.
+	 *
+	 * @param   string  $orderBy           An expression of ordering for window function.
+	 * @param   string  $orderColumnAlias  An alias for new ordering column.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.7.0
+	 * @throws  RuntimeException
+	 */
+	public function selectRowNumber($orderBy, $orderColumnAlias)
+	{
+		$this->validateRowNumber($orderBy, $orderColumnAlias);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/database/query/sqlsrv.php b/core/libraries/joomla/database/query/sqlsrv.php
new file mode 100644
index 00000000..2583ebc8
--- /dev/null
+++ b/core/libraries/joomla/database/query/sqlsrv.php
@@ -0,0 +1,1048 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Query Building Class.
+ *
+ * @since  11.1
+ */
+class JDatabaseQuerySqlsrv extends JDatabaseQuery implements JDatabaseQueryLimitable
+{
+	/**
+	 * The character(s) used to quote SQL statement names such as table names or field names,
+	 * etc.  The child classes should define this as necessary.  If a single character string the
+	 * same character is used for both sides of the quoted name, else the first character will be
+	 * used for the opening quote and the second for the closing quote.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $name_quotes = '`';
+
+	/**
+	 * The null or zero representation of a timestamp for the database driver.  This should be
+	 * defined in child classes to hold the appropriate value for the engine.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $null_date = '1900-01-01 00:00:00';
+
+	/**
+	 * @var    integer  The affected row limit for the current SQL statement.
+	 * @since  3.2
+	 */
+	protected $limit = 0;
+
+	/**
+	 * @var    integer  The affected row offset to apply for the current SQL statement.
+	 * @since  3.2
+	 */
+	protected $offset = 0;
+
+	/**
+	 * Magic function to convert the query to a string.
+	 *
+	 * @return  string	The completed query.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		$query = '';
+
+		switch ($this->type)
+		{
+			case 'select':
+				// Add required aliases for offset or fixGroupColumns method
+				$columns = $this->fixSelectAliases();
+
+				$query = (string) $this->select;
+
+				if ($this->group)
+				{
+					$this->fixGroupColumns($columns);
+				}
+
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->selectRowNumber === null)
+				{
+					if ($this->group)
+					{
+						$query .= (string) $this->group;
+					}
+
+					if ($this->having)
+					{
+						$query .= (string) $this->having;
+					}
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				if ($this instanceof JDatabaseQueryLimitable && ($this->limit > 0 || $this->offset > 0))
+				{
+					$query = $this->processLimit($query, $this->limit, $this->offset);
+				}
+
+				break;
+
+			case 'insert':
+				$query .= (string) $this->insert;
+
+				// Set method
+				if ($this->set)
+				{
+					$query .= (string) $this->set;
+				}
+				// Columns-Values method
+				elseif ($this->values)
+				{
+					if ($this->columns)
+					{
+						$query .= (string) $this->columns;
+					}
+
+					$elements = $this->insert->getElements();
+					$tableName = array_shift($elements);
+
+					$query .= 'VALUES ';
+					$query .= (string) $this->values;
+
+					if ($this->autoIncrementField)
+					{
+						$query = 'SET IDENTITY_INSERT ' . $tableName . ' ON;' . $query . 'SET IDENTITY_INSERT ' . $tableName . ' OFF;';
+					}
+
+					if ($this->where)
+					{
+						$query .= (string) $this->where;
+					}
+				}
+
+				break;
+
+			case 'delete':
+				$query .= (string) $this->delete;
+				$query .= (string) $this->from;
+
+				if ($this->join)
+				{
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			case 'update':
+				if ($this->join)
+				{
+					$tmpUpdate    = $this->update;
+					$tmpFrom      = $this->from;
+					$this->update = null;
+					$this->from   = null;
+
+					$updateElem  = $tmpUpdate->getElements();
+					$updateArray = explode(' ', $updateElem[0]);
+
+					// Use table alias if exists
+					$this->update(end($updateArray));
+					$this->from($updateElem[0]);
+
+					$query .= (string) $this->update;
+					$query .= (string) $this->set;
+					$query .= (string) $this->from;
+
+					$this->update = $tmpUpdate;
+					$this->from   = $tmpFrom;
+
+					// Special case for joins
+					foreach ($this->join as $join)
+					{
+						$query .= (string) $join;
+					}
+				}
+				else
+				{
+					$query .= (string) $this->update;
+					$query .= (string) $this->set;
+				}
+
+				if ($this->where)
+				{
+					$query .= (string) $this->where;
+				}
+
+				if ($this->order)
+				{
+					$query .= (string) $this->order;
+				}
+
+				break;
+
+			default:
+				$query = parent::__toString();
+
+				break;
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Casts a value to a char.
+	 *
+	 * Ensure that the value is properly quoted before passing to the method.
+	 *
+	 * @param   string  $value  The value to cast as a char.	 
+	 *
+	 * @param   string  $len    The lenght of the char.
+	 *
+	 * @return  string  Returns the cast value.
+	 *
+	 * @since   11.1
+	 */
+	public function castAsChar($value, $len = null)
+	{
+		if (!$len)
+		{			
+			return 'CAST(' . $value . ' as NVARCHAR(30))';
+		}
+		else
+		{
+			return 'CAST(' . $value . ' as NVARCHAR(' . $len . '))';
+		}
+	}
+
+	/**
+	 * Gets the function to determine the length of a character string.
+	 *
+	 * @param   string  $field      A value.
+	 * @param   string  $operator   Comparison operator between charLength integer value and $condition
+	 * @param   string  $condition  Integer value to compare charLength with.
+	 *
+	 * @return  string  The required char length call.
+	 *
+	 * @since   11.1
+	 */
+	public function charLength($field, $operator = null, $condition = null)
+	{
+		return 'DATALENGTH(' . $field . ')' . (isset($operator) && isset($condition) ? ' ' . $operator . ' ' . $condition : '');
+	}
+
+	/**
+	 * Concatenates an array of column names or values.
+	 *
+	 * @param   array   $values     An array of values to concatenate.
+	 * @param   string  $separator  As separator to place between each value.
+	 *
+	 * @return  string  The concatenated values.
+	 *
+	 * @since   11.1
+	 */
+	public function concatenate($values, $separator = null)
+	{
+		if ($separator)
+		{
+			return '(' . implode('+' . $this->quote($separator) . '+', $values) . ')';
+		}
+		else
+		{
+			return '(' . implode('+', $values) . ')';
+		}
+	}
+
+	/**
+	 * Gets the current date and time.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function currentTimestamp()
+	{
+		return 'GETDATE()';
+	}
+
+	/**
+	 * Get the length of a string in bytes.
+	 *
+	 * @param   string  $value  The string to measure.
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	public function length($value)
+	{
+		return 'LEN(' . $value . ')';
+	}
+
+	/**
+	 * Add to the current date and time.
+	 * Usage:
+	 * $query->select($query->dateAdd());
+	 * Prefixing the interval with a - (negative sign) will cause subtraction to be used.
+	 *
+	 * @param   datetime  $date      The date to add to; type may be time or datetime.
+	 * @param   string    $interval  The string representation of the appropriate number of units
+	 * @param   string    $datePart  The part of the date to perform the addition on
+	 *
+	 * @return  string  The string with the appropriate sql for addition of dates
+	 *
+	 * @since   13.1
+	 * @note    Not all drivers support all units.
+	 * @link    http://msdn.microsoft.com/en-us/library/ms186819.aspx for more information
+	 */
+	public function dateAdd($date, $interval, $datePart)
+	{
+		return "DATEADD('" . $datePart . "', '" . $interval . "', '" . $date . "'" . ')';
+	}
+
+	/**
+	 * Method to modify a query already in string format with the needed
+	 * additions to make the query limited to a particular number of
+	 * results, or start at a particular offset.
+	 *
+	 * @param   string   $query   The query in string format
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function processLimit($query, $limit, $offset = 0)
+	{
+		if ($limit)
+		{
+			$total = $offset + $limit;
+
+			$position = stripos($query, 'SELECT');
+			$distinct = stripos($query, 'SELECT DISTINCT');
+
+			if ($position === $distinct)
+			{
+				$query = substr_replace($query, 'SELECT DISTINCT TOP ' . (int) $total, $position, 15);
+			}
+			else
+			{
+				$query = substr_replace($query, 'SELECT TOP ' . (int) $total, $position, 6);
+			}
+		}
+
+		if (!$offset)
+		{
+			return $query;
+		}
+
+		return PHP_EOL
+			. 'SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS RowNumber FROM ('
+			. $query
+			. PHP_EOL . ') AS A) AS A WHERE RowNumber > ' . (int) $offset;
+	}
+
+	/**
+	 * Sets the offset and limit for the result set, if the database driver supports it.
+	 *
+	 * Usage:
+	 * $query->setLimit(100, 0); (retrieve 100 rows, starting at first record)
+	 * $query->setLimit(50, 50); (retrieve 50 rows, starting at 50th record)
+	 *
+	 * @param   integer  $limit   The limit for the result set
+	 * @param   integer  $offset  The offset for the result set
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLimit($limit = 0, $offset = 0)
+	{
+		$this->limit  = (int) $limit;
+		$this->offset = (int) $offset;
+
+		return $this;
+	}
+
+	/**
+	 * Split a string of sql expression into an array of individual columns.
+	 * Single line or line end comments and multi line comments are stripped off.
+	 * Always return at least one column.
+	 *
+	 * @param   string  $string  Input string of sql expression like select expression.
+	 *
+	 * @return  array[]  The columns from the input string separated into an array.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function splitSqlExpression($string)
+	{
+		// Append whitespace as equivalent to the last comma
+		$string .= ' ';
+
+		$colIdx    = 0;
+		$start     = 0;
+		$open      = false;
+		$openC     = 0;
+		$comment   = false;
+		$endString = '';
+		$length    = strlen($string);
+		$columns   = array();
+		$column    = array();
+		$current   = '';
+		$previous  = null;
+		$operators = array(
+			'+' => '',
+			'-' => '',
+			'*' => '',
+			'/' => '',
+			'%' => '',
+			'&' => '',
+			'|' => '',
+			'~' => '',
+			'^' => '',
+		);
+
+		$addBlock = function ($block) use (&$column, &$colIdx)
+		{
+			if (isset($column[$colIdx]))
+			{
+				$column[$colIdx] .= $block;
+			}
+			else
+			{
+				$column[$colIdx] = $block;
+			}
+		};
+
+		for ($i = 0; $i < $length; $i++)
+		{
+			$current      = substr($string, $i, 1);
+			$current2     = substr($string, $i, 2);
+			$current3     = substr($string, $i, 3);
+			$lenEndString = strlen($endString);
+			$testEnd      = substr($string, $i, $lenEndString);
+
+			if ($current == '[' || $current == '"' || $current == "'" || $current2 == '--'
+				|| ($current2 == '/*') || ($current == '#' && $current3 != '#__')
+				|| ($lenEndString && $testEnd == $endString))
+			{
+				if ($open)
+				{
+					if ($testEnd === $endString)
+					{
+						if ($comment)
+						{
+							if ($lenEndString > 1)
+							{
+								$i += ($lenEndString - 1);
+							}
+
+							// Move cursor after close tag of comment
+							$start = $i + 1;
+							$comment = false;
+						}
+						elseif ($current == "'" || $current == ']' || $current == '"')
+						{
+							// Check for escaped quote like '', ]] or ""
+							$n = 1;
+
+							while ($i + $n < $length && $string[$i + $n] == $current)
+							{
+								$n++;
+							}
+
+							// Jump to the last quote
+							$i += $n - 1;
+
+							if ($n % 2 === 0)
+							{
+								// There is only escaped quote
+								continue;
+							}
+							elseif ($n > 2)
+							{
+								// The last right close quote is not escaped
+								$current = $string[$i];
+							}
+						}
+
+						$open = false;
+						$endString = '';
+					}
+				}
+				else
+				{
+					$open = true;
+
+					if ($current == '#' || $current2 == '--')
+					{
+						$endString = "\n";
+						$comment = true;
+					}
+					elseif ($current2 == '/*')
+					{
+						$endString = '*/';
+						$comment = true;
+					}
+					elseif ($current == '[')
+					{
+						$endString = ']';
+					}
+					else
+					{
+						$endString = $current;
+					}
+
+					if ($comment && $start < $i)
+					{
+						// Add string exists before comment
+						$addBlock(substr($string, $start, $i - $start));
+						$previous = $string[$i - 1];
+						$start = $i;
+					}
+				}
+			}
+			elseif (!$open)
+			{
+				if ($current == '(')
+				{
+					$openC++;
+					$previous = $current;
+				}
+				elseif ($current == ')')
+				{
+					$openC--;
+					$previous = $current;
+				}
+				elseif ($current == '.')
+				{
+					if ($i === $start && $colIdx > 0 && !isset($column[$colIdx]))
+					{
+						// Remove whitepace placed before dot
+						$colIdx--;
+					}
+
+					$previous = $current;
+				}
+				elseif ($openC === 0)
+				{
+					if (ctype_space($current))
+					{
+						// Normalize whitepace
+						$string[$i] = ' ';
+
+						if ($start < $i)
+						{
+							// Add text placed before whitespace
+							$addBlock(substr($string, $start, $i - $start));
+							$colIdx++;
+							$previous = $string[$i - 1];
+						}
+						elseif (isset($column[$colIdx]))
+						{
+							if ($colIdx > 1 || !isset($operators[$previous]))
+							{
+								// There was whitespace after comment
+								$colIdx++;
+							}
+						}
+
+						// Move cursor forward
+						$start = $i + 1;
+					}
+					elseif (isset($operators[$current]) && ($current !== '*' || $previous !== '.'))
+					{
+						if ($start < $i)
+						{
+							// Add text before operator
+							$addBlock(substr($string, $start, $i - $start));
+							$colIdx++;
+						}
+						elseif (!isset($column[$colIdx]) && isset($operators[$previous]))
+						{
+							// Do not create whitespace between operators
+							$colIdx--;
+						}
+
+						// Add operator
+						$addBlock($current);
+						$previous = $current;
+						$colIdx++;
+
+						// Move cursor forward
+						$start = $i + 1;
+					}
+					else
+					{
+						$previous = $current;
+					}
+				}
+			}
+
+			if (($current == ',' && !$open && $openC == 0) || $i == $length - 1)
+			{
+				if ($start < $i && !$comment)
+				{
+					// Save remaining text
+					$addBlock(substr($string, $start, $i - $start));
+				}
+
+				$columns[] = $column;
+
+				// Reset values
+				$column   = array();
+				$colIdx   = 0;
+				$previous = null;
+
+				// Column saved, move cursor forward after comma
+				$start = $i + 1;
+			}
+		}
+
+		return $columns;
+	}
+
+	/**
+	 * Add required aliases to columns for select statement in subquery.
+	 *
+	 * @return  array[]  Array of columns with added missing aliases.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function fixSelectAliases()
+	{
+		$operators = array(
+			'+' => '',
+			'-' => '',
+			'*' => '',
+			'/' => '',
+			'%' => '',
+			'&' => '',
+			'|' => '',
+			'~' => '',
+			'^' => '',
+		);
+
+		// Split into array and remove comments
+		$columns = $this->splitSqlExpression(implode(',', $this->select->getElements()));
+
+		foreach ($columns as $i => $column)
+		{
+			$size = count($column);
+
+			if ($size == 0)
+			{
+				continue;
+			}
+
+			if ($size > 2 && strcasecmp($column[$size - 2], 'AS') === 0)
+			{
+				// Alias exists, replace it to uppercase
+				$columns[$i][$size - 2] = 'AS';
+				continue;
+			}
+
+			if ($i == 0 && stripos(' DISTINCT ALL ', " $column[0] ") !== false)
+			{
+				// This words are reserved, they are not column names
+				array_shift($column);
+				$size--;
+			}
+
+			$lastWord = strtoupper($column[$size - 1]);
+			$length   = strlen($lastWord);
+			$lastChar = $lastWord[$length - 1];
+
+			if ($lastChar == '*')
+			{
+				// Skip on wildcard
+				continue;
+			}
+
+			if ($lastChar == ')'
+				|| ($size == 1 && $lastChar == "'")
+				|| $lastWord[0] == '@'
+				|| $lastWord == 'NULL'
+				|| $lastWord == 'END'
+				|| is_numeric($lastWord))
+			{
+				/* Ends with:
+				 * - SQL function
+				 * - single static value like 'only '+'string'
+				 * - @@var
+				 * - NULL
+				 * - CASE ... END
+				 * - Numeric
+				 */
+				$columns[$i][] = 'AS';
+				$columns[$i][] = $this->quoteName('columnAlias' . $i);
+				continue;
+			}
+
+			if ($size == 1)
+			{
+				continue;
+			}
+
+			$lastChar2 = substr($column[$size - 2], -1);
+
+			// Check if column ends with  '- a.x' or '- a. x'
+			if (isset($operators[$lastChar2])
+				|| ($size > 2 && $lastChar2 === '.' && isset($operators[substr($column[$size - 3], -1)])))
+			{
+				// Ignore plus signs if column start with them
+				if ($size != 2 || ltrim($column[0], '+') !== '' || $column[1][0] === "'")
+				{
+					// If operator exists before last word then alias is required for subquery
+					$columns[$i][] = 'AS';
+					$columns[$i][] = $this->quoteName('columnAlias' . $i);
+					continue;
+				}
+			}
+			elseif ($column[$size - 1][0] !== '.' && $lastChar2 !== '.')
+			{
+				// If columns is like name name2 then second word is alias.
+				// Add missing AS before the alias, exception for 'a. x' and 'a .x'
+				array_splice($columns[$i], -1, 0, 'AS');
+			}
+		}
+
+		$selectColumns = array();
+
+		foreach ($columns as $i => $column)
+		{
+			$selectColumns[$i] = implode(' ', $column);
+		}
+
+		$this->select = new JDatabaseQueryElement('SELECT', $selectColumns);
+
+		return $columns;
+	}
+
+	/**
+	 * Add missing columns names to GROUP BY clause.
+	 *
+	 * @param   array[]  $selectColumns  Array of columns from splitSqlExpression method.
+	 *
+	 * @return  JDatabaseQuery  Returns this object to allow chaining.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function fixGroupColumns($selectColumns)
+	{
+		// Cache tables columns
+		static $cacheCols = array();
+
+		// Known columns of all included tables
+		$knownColumnsByAlias = array();
+
+		$iquotes  = array('"' => '', '[' => '', "'" => '');
+		$nquotes = array('"', '[', ']');
+
+		// Aggregate functions
+		$aFuncs = array(
+			'AVG(',
+			'CHECKSUM_AGG(',
+			'COUNT(',
+			'COUNT_BIG(',
+			'GROUPING(',
+			'GROUPING_ID(',
+			'MIN(',
+			'MAX(',
+			'SUM(',
+			'STDEV(',
+			'STDEVP(',
+			'VAR(',
+			'VARP(',
+		);
+
+		// Aggregated columns
+		$filteredColumns = array();
+
+		// Aliases found in SELECT statement
+		$knownAliases = array();
+		$wildcardTables = array();
+
+		foreach ($selectColumns as $i => $column)
+		{
+			$size = count($column);
+
+			if ($size === 0)
+			{
+				continue;
+			}
+
+			if ($size > 2 && $column[$size - 2] === 'AS')
+			{
+				// Save and remove AS alias
+				$alias = $column[$size - 1];
+
+				if (isset($iquotes[$alias[0]]))
+				{
+					$alias = substr($alias, 1, -1);
+				}
+
+				// Remove alias
+				$selectColumns[$i] = $column = array_slice($column, 0, -2);
+
+				if ($size === 3 || ($size === 4 && strpos('+-*/%&|~^', $column[0][0]) !== false))
+				{
+					$lastWord = $column[$size - 3];
+
+					if ($lastWord[0] === "'" || $lastWord === 'NULL' || is_numeric($lastWord))
+					{
+						unset($selectColumns[$i]);
+
+						continue;
+					}
+				}
+
+				// Remember pair alias => column expression
+				$knownAliases[$alias] = implode(' ', $column);
+			}
+
+			$aggregated = false;
+
+			foreach ($column as $j => $block)
+			{
+				if (substr($block, -2) === '.*')
+				{
+					// Found column ends with .*
+					if (isset($iquotes[$block[0]]))
+					{
+						// Quoted table
+						$wildcardTables[] = substr($block, 1, -3);
+					}
+					else
+					{
+						$wildcardTables[] = substr($block, 0, -2);
+					}
+				}
+				elseif (str_ireplace($aFuncs, '', $block) != $block)
+				{
+					$aggregated = true;
+				}
+
+				if ($block[0] === "'")
+				{
+					// Shrink static strings which could contain column name
+					$column[$j] = "''";
+				}
+			}
+
+			if (!$aggregated)
+			{
+				// Without aggregated columns and aliases
+				$filteredColumns[] = implode(' ', $selectColumns[$i]);
+			}
+
+			// Without aliases and static strings
+			$selectColumns[$i] = implode(' ', $column);
+		}
+
+		// If select statement use table.* expression
+		if ($wildcardTables)
+		{
+			// Split FROM statement into list of tables
+			$tables = $this->splitSqlExpression(implode(',', $this->from->getElements()));
+
+			foreach ($tables as $i => $table)
+			{
+				$table = implode(' ', $table);
+
+				// Exclude subquery from the FROM clause
+				if (strpos($table, '(') === false)
+				{
+					// Unquote
+					$table = str_replace($nquotes, '', $table);
+					$table = str_replace('#__', $this->db->getPrefix(), $table);
+					$table = explode(' ', $table);
+					$alias = end($table);
+					$table = $table[0];
+
+					// Chek if exists a wildcard with current alias table?
+					if (in_array($alias, $wildcardTables, true))
+					{
+						if (!isset($cacheCols[$table]))
+						{
+							$cacheCols[$table] = $this->db->getTableColumns($table);
+						}
+
+						if ($this->join || $table != $alias)
+						{
+							foreach ($cacheCols[$table] as $name => $type)
+							{
+								$knownColumnsByAlias[$alias][] = $alias . '.' . $name;
+							}
+						}
+						else
+						{
+							foreach ($cacheCols[$table] as $name => $type)
+							{
+								$knownColumnsByAlias[$alias][] = $name;
+							}
+						}
+					}
+				}
+			}
+
+			// Now we need to get all tables from any joins
+			// Go through all joins and add them to the tables array
+			if ($this->join)
+			{
+				foreach ($this->join as $join)
+				{
+					// Unquote and replace prefix
+					$joinTbl = str_replace($nquotes, '', (string) $join);
+					$joinTbl = str_replace("#__", $this->db->getPrefix(), $joinTbl);
+
+					// Exclude subquery
+					if (preg_match('/JOIN\s+(\w+)(?:\s+AS)?(?:\s+(\w+))?/i', $joinTbl, $matches))
+					{
+						$table = $matches[1];
+						$alias = isset($matches[2]) ? $matches[2] : $table;
+
+						// Chek if exists a wildcard with current alias table?
+						if (in_array($alias, $wildcardTables, true))
+						{
+							if (!isset($cacheCols[$table]))
+							{
+								$cacheCols[$table] = $this->db->getTableColumns($table);
+							}
+
+							foreach ($cacheCols[$table] as $name => $type)
+							{
+								$knownColumnsByAlias[$alias][] = $alias . '.' . $name;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		$selectExpression = implode(',', $selectColumns);
+
+		// Split into the right columns
+		$groupColumns = $this->splitSqlExpression(implode(',', $this->group->getElements()));
+
+		// Remove column aliases from GROUP statement - SQLSRV does not support it
+		foreach ($groupColumns as $i => $column)
+		{
+			$groupColumns[$i] = implode(' ', $column);
+			$column = str_replace($nquotes, '', $groupColumns[$i]);
+
+			if (isset($knownAliases[$column]))
+			{
+				// Be sure that this is not a valid column name
+				if (!preg_match('/\b' . preg_quote($column, '/') . '\b/', $selectExpression))
+				{
+					// Replace column alias by column expression
+					$groupColumns[$i] = $knownAliases[$column];
+				}
+			}
+		}
+
+		// Find all alias.* and fill with proper table column names
+		foreach ($filteredColumns as $i => $column)
+		{
+			if (substr($column, -2) === '.*')
+			{
+				unset($filteredColumns[$i]);
+
+				// Extract alias.* columns into GROUP BY statement
+				$groupColumns = array_merge($groupColumns, $knownColumnsByAlias[substr($column, 0, -2)]);
+			}
+		}
+
+		$groupColumns = array_merge($groupColumns, $filteredColumns);
+
+		if ($this->order)
+		{
+			// Remove direction suffixes
+			$dir = array(" DESC\v", " ASC\v");
+
+			$orderColumns = $this->splitSqlExpression(implode(',', $this->order->getElements()));
+
+			foreach ($orderColumns as $i => $column)
+			{
+				$column = implode(' ', $column);
+				$orderColumns[$i] = $column = trim(str_ireplace($dir, '', "$column\v"), "\v");
+
+				if (isset($knownAliases[str_replace($nquotes, '', $column)]))
+				{
+					unset($orderColumns[$i]);
+				}
+
+				if (str_ireplace($aFuncs, '', $column) != $column)
+				{
+					// Do not add aggregate expression
+					unset($orderColumns[$i]);
+				}
+			}
+
+			$groupColumns = array_merge($groupColumns, $orderColumns);
+		}
+
+		// Get a unique string of all column names that need to be included in the group statement
+		$this->group = new JDatabaseQueryElement('GROUP BY', array_unique($groupColumns));
+
+		return $this;
+	}
+
+	/**
+	 * Return correct rand() function for MSSQL.
+	 *
+	 * Ensure that the rand() function is MSSQL compatible.
+	 *
+	 * Usage:
+	 * $query->Rand();
+	 *
+	 * @return  string  The correct rand function.
+	 *
+	 * @since   3.5
+	 */
+	public function Rand()
+	{
+		return ' NEWID() ';
+	}
+}
diff --git a/core/libraries/joomla/event/dispatcher.php b/core/libraries/joomla/event/dispatcher.php
new file mode 100644
index 00000000..5c16fc7e
--- /dev/null
+++ b/core/libraries/joomla/event/dispatcher.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Event
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Class to handle dispatching of events.
+ *
+ * This is the Observable part of the Observer design pattern
+ * for the event architecture.
+ *
+ * @see         JPlugin
+ * @since       12.1
+ * @deprecated  4.0  The CMS' Event classes will be replaced with the `joomla/event` package
+ */
+class JEventDispatcher extends JObject
+{
+	/**
+	 * An array of Observer objects to notify
+	 *
+	 * @var    array
+	 * @since  11.3
+	 */
+	protected $_observers = array();
+
+	/**
+	 * The state of the observable object
+	 *
+	 * @var    mixed
+	 * @since  11.3
+	 */
+	protected $_state = null;
+
+	/**
+	 * A multi dimensional array of [function][] = key for observers
+	 *
+	 * @var    array
+	 * @since  11.3
+	 */
+	protected $_methods = array();
+
+	/**
+	 * Stores the singleton instance of the dispatcher.
+	 *
+	 * @var    JEventDispatcher
+	 * @since  11.3
+	 */
+	protected static $instance = null;
+
+	/**
+	 * Returns the global Event Dispatcher object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @return  JEventDispatcher  The EventDispatcher object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance()
+	{
+		if (self::$instance === null)
+		{
+			self::$instance = new static;
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Get the state of the JEventDispatcher object
+	 *
+	 * @return  mixed    The state of the object.
+	 *
+	 * @since   11.3
+	 */
+	public function getState()
+	{
+		return $this->_state;
+	}
+
+	/**
+	 * Registers an event handler to the event dispatcher
+	 *
+	 * @param   string  $event    Name of the event to register handler for
+	 * @param   string  $handler  Name of the event handler
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  InvalidArgumentException
+	 */
+	public function register($event, $handler)
+	{
+		// Are we dealing with a class or callback type handler?
+		if (is_callable($handler))
+		{
+			// Ok, function type event handler... let's attach it.
+			$method = array('event' => $event, 'handler' => $handler);
+			$this->attach($method);
+		}
+		elseif (class_exists($handler))
+		{
+			// Ok, class type event handler... let's instantiate and attach it.
+			$this->attach(new $handler($this));
+		}
+		else
+		{
+			throw new InvalidArgumentException('Invalid event handler.');
+		}
+	}
+
+	/**
+	 * Triggers an event by dispatching arguments to all observers that handle
+	 * the event and returning their return values.
+	 *
+	 * @param   string  $event  The event to trigger.
+	 * @param   array   $args   An array of arguments.
+	 *
+	 * @return  array  An array of results from each function call.
+	 *
+	 * @since   11.1
+	 */
+	public function trigger($event, $args = array())
+	{
+		$result = array();
+
+		/*
+		 * If no arguments were passed, we still need to pass an empty array to
+		 * the call_user_func_array function.
+		 */
+		$args = (array) $args;
+
+		$event = strtolower($event);
+
+		// Check if any plugins are attached to the event.
+		if (!isset($this->_methods[$event]) || empty($this->_methods[$event]))
+		{
+			// No Plugins Associated To Event!
+			return $result;
+		}
+
+		// Loop through all plugins having a method matching our event
+		foreach ($this->_methods[$event] as $key)
+		{
+			// Check if the plugin is present.
+			if (!isset($this->_observers[$key]))
+			{
+				continue;
+			}
+
+			// Fire the event for an object based observer.
+			if (is_object($this->_observers[$key]))
+			{
+				$args['event'] = $event;
+				$value = $this->_observers[$key]->update($args);
+			}
+			// Fire the event for a function based observer.
+			elseif (is_array($this->_observers[$key]))
+			{
+				$value = call_user_func_array($this->_observers[$key]['handler'], $args);
+			}
+
+			if (isset($value))
+			{
+				$result[] = $value;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Attach an observer object
+	 *
+	 * @param   object  $observer  An observer object to attach
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function attach($observer)
+	{
+		if (is_array($observer))
+		{
+			if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this array as an observer
+			foreach ($this->_observers as $check)
+			{
+				if (is_array($check) && $check['event'] === $observer['event'] && $check['handler'] === $observer['handler'])
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			$methods = array($observer['event']);
+		}
+		else
+		{
+			if (!($observer instanceof JEvent))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this object as an observer
+			$class = get_class($observer);
+
+			foreach ($this->_observers as $check)
+			{
+				if ($check instanceof $class)
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			$methods = array_diff(get_class_methods($observer), get_class_methods('JPlugin'));
+		}
+
+		end($this->_observers);
+		$key = key($this->_observers);
+
+		foreach ($methods as $method)
+		{
+			$method = strtolower($method);
+
+			if (!isset($this->_methods[$method]))
+			{
+				$this->_methods[$method] = array();
+			}
+
+			$this->_methods[$method][] = $key;
+		}
+	}
+
+	/**
+	 * Detach an observer object
+	 *
+	 * @param   object  $observer  An observer object to detach.
+	 *
+	 * @return  boolean  True if the observer object was detached.
+	 *
+	 * @since   11.3
+	 */
+	public function detach($observer)
+	{
+		$retval = false;
+
+		$key = array_search($observer, $this->_observers);
+
+		if ($key !== false)
+		{
+			unset($this->_observers[$key]);
+			$retval = true;
+
+			foreach ($this->_methods as &$method)
+			{
+				$k = array_search($key, $method);
+
+				if ($k !== false)
+				{
+					unset($method[$k]);
+				}
+			}
+		}
+
+		return $retval;
+	}
+}
diff --git a/core/libraries/joomla/event/event.php b/core/libraries/joomla/event/event.php
new file mode 100644
index 00000000..e5ab0c5c
--- /dev/null
+++ b/core/libraries/joomla/event/event.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Event
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JEvent Class
+ *
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Event classes will be replaced with the `joomla/event` package
+ */
+abstract class JEvent extends JObject
+{
+	/**
+	 * Event object to observe.
+	 *
+	 * @var    object
+	 * @since  11.3
+	 */
+	protected $_subject = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(&$subject)
+	{
+		// Register the observer ($this) so we can be notified
+		$subject->attach($this);
+
+		// Set the subject to observe
+		$this->_subject = &$subject;
+	}
+
+	/**
+	 * Method to trigger events.
+	 * The method first generates the even from the argument array. Then it unsets the argument
+	 * since the argument has no bearing on the event handler.
+	 * If the method exists it is called and returns its return value. If it does not exist it
+	 * returns null.
+	 *
+	 * @param   array  &$args  Arguments
+	 *
+	 * @return  mixed  Routine return value
+	 *
+	 * @since   11.1
+	 */
+	public function update(&$args)
+	{
+		// First let's get the event from the argument array.  Next we will unset the
+		// event argument as it has no bearing on the method to handle the event.
+		$event = $args['event'];
+		unset($args['event']);
+
+		/*
+		 * If the method to handle an event exists, call it and return its return
+		 * value.  If it does not exist, return null.
+		 */
+		if (method_exists($this, $event))
+		{
+			return call_user_func_array(array($this, $event), $args);
+		}
+	}
+}
diff --git a/core/libraries/joomla/facebook/album.php b/core/libraries/joomla/facebook/album.php
new file mode 100644
index 00000000..e8f72186
--- /dev/null
+++ b/core/libraries/joomla/facebook/album.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Album class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/album/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookAlbum extends JFacebookObject
+{
+	/**
+	 * Method to get an album. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string  $album  The album id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getAlbum($album)
+	{
+		return $this->get($album);
+	}
+
+	/**
+	 * Method to get the photos contained in this album. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $album   The album id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPhotos($album, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($album, 'photos', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to add photos to an album. Note: check can_upload flag first. Requires authentication and publish_stream  permission.
+	 *
+	 * @param   string  $album    The album id.
+	 * @param   string  $source   Path to photo.
+	 * @param   string  $message  Photo description.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createPhoto($album, $source, $message = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data[basename($source)] = '@' . realpath($source);
+
+		if ($message)
+		{
+			$data['message'] = $message;
+		}
+
+		return $this->createConnection($album, 'photos', $data, array('Content-Type' => 'multipart/form-data'));
+	}
+
+	/**
+	 * Method to get an album's comments. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $album   The album id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($album, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($album, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on an album. Requires authentication and publish_stream  permission.
+	 *
+	 * @param   string  $album    The album id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($album, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($album, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream  permission.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get album's likes. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $album   The album id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($album, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($album, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like an album. Requires authentication and publish_stream  permission.
+	 *
+	 * @param   string  $album  The album id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($album)
+	{
+		return $this->createConnection($album, 'likes');
+	}
+
+	/**
+	 * Method to unlike an album. Requires authentication and publish_stream  permission.
+	 *
+	 * @param   string  $album  The album id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($album)
+	{
+		return $this->deleteConnection($album, 'likes');
+	}
+
+	/**
+	 * Method to get the album's cover photo, the first picture uploaded to an album becomes the cover photo for the album.
+	 * Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $album     The album id.
+	 * @param   boolean  $redirect  If false this will return the URL of the picture without a 302 redirect.
+	 *
+	 * @return  string  URL of the picture.
+	 *
+	 * @since   13.1
+	 */
+	public function getPicture($album, $redirect = true)
+	{
+		$extra_fields = '';
+
+		if ($redirect == false)
+		{
+			$extra_fields = '?redirect=false';
+		}
+
+		return $this->getConnection($album, 'picture', $extra_fields);
+	}
+}
diff --git a/core/libraries/joomla/facebook/checkin.php b/core/libraries/joomla/facebook/checkin.php
new file mode 100644
index 00000000..77c95f67
--- /dev/null
+++ b/core/libraries/joomla/facebook/checkin.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Checkin class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/checkin/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookCheckin extends JFacebookObject
+{
+	/**
+	 * Method to get a checkin. Requires authentication and user_checkins or friends_checkins permission.
+	 *
+	 * @param   string  $checkin  The checkin id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getCheckin($checkin)
+	{
+		return $this->get($checkin);
+	}
+
+	/**
+	 * Method to get a checkin's comments. Requires authentication and user_checkins or friends_checkins permission.
+	 *
+	 * @param   string   $checkin  The checkin id.
+	 * @param   integer  $limit    The number of objects per page.
+	 * @param   integer  $offset   The object's number on the page.
+	 * @param   string   $until    A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since    A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($checkin, $limit=0, $offset=0, $until=null, $since=null)
+	{
+		return $this->getConnection($checkin, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a comment to the checkin. Requires authentication and publish_stream and user_checkins or friends_checkins permission.
+	 *
+	 * @param   string  $checkin  The checkin id.
+	 * @param   string  $message  The checkin's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($checkin, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($checkin, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get a checkin's likes. Requires authentication and user_checkins or friends_checkins permission.
+	 *
+	 * @param   string   $checkin  The checkin id.
+	 * @param   integer  $limit    The number of objects per page.
+	 * @param   integer  $offset   The object's number on the page.
+	 * @param   string   $until    A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since    A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($checkin, $limit=0, $offset=0, $until=null, $since=null)
+	{
+		return $this->getConnection($checkin, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a checkin. Requires authentication and publish_stream and user_checkins or friends_checkins permission.
+	 *
+	 * @param   string  $checkin  The checkin id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($checkin)
+	{
+		return $this->createConnection($checkin, 'likes');
+	}
+
+	/**
+	 * Method to unlike a checkin. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $checkin  The checkin id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($checkin)
+	{
+		return $this->deleteConnection($checkin, 'likes');
+	}
+}
diff --git a/core/libraries/joomla/facebook/comment.php b/core/libraries/joomla/facebook/comment.php
new file mode 100644
index 00000000..3cb320cf
--- /dev/null
+++ b/core/libraries/joomla/facebook/comment.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Comment class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/Comment/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookComment extends JFacebookObject
+{
+	/**
+	 * Method to get a comment. Requires authentication.
+	 *
+	 * @param   string  $comment  The comment id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComment($comment)
+	{
+		return $this->get($comment);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $comment  The comment id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get a comment's comments. Requires authentication.
+	 *
+	 * @param   string   $comment  The comment id.
+	 * @param   integer  $limit    The number of objects per page.
+	 * @param   integer  $offset   The object's number on the page.
+	 * @param   string   $until    A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since    A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($comment, $limit=0, $offset=0, $until=null, $since=null)
+	{
+		return $this->getConnection($comment, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on a comment. Requires authentication with publish_stream permission.
+	 *
+	 * @param   string  $comment  The comment id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($comment, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($comment, 'comments', $data);
+	}
+
+	/**
+	 * Method to get comment's likes. Requires authentication.
+	 *
+	 * @param   string   $comment  The comment id.
+	 * @param   integer  $limit    The number of objects per page.
+	 * @param   integer  $offset   The object's number on the page.
+	 * @param   string   $until    A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since    A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($comment, $limit=0, $offset=0, $until=null, $since=null)
+	{
+		return $this->getConnection($comment, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a comment. Requires authentication and publish_stram permission.
+	 *
+	 * @param   string  $comment  The comment id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($comment)
+	{
+		return $this->createConnection($comment, 'likes');
+	}
+
+	/**
+	 * Method to unlike a comment. Requires authentication and publish_stram permission.
+	 *
+	 * @param   string  $comment  The comment id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($comment)
+	{
+		return $this->deleteConnection($comment, 'likes');
+	}
+}
diff --git a/core/libraries/joomla/facebook/event.php b/core/libraries/joomla/facebook/event.php
new file mode 100644
index 00000000..949a23ca
--- /dev/null
+++ b/core/libraries/joomla/facebook/event.php
@@ -0,0 +1,520 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API User class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/event/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookEvent extends JFacebookObject
+{
+	/**
+	 * Method to get information about an event visible to the current user. Requires authentication.
+	 *
+	 * @param   string  $event  The event id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getEvent($event)
+	{
+		return $this->get($event);
+	}
+
+	/**
+	 * Method to get the event's wall. Requires authentication.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFeed($event, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($event, 'feed', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a link on event's feed which the current_user is or maybe attending. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $event    The event id.
+	 * @param   string  $link     Link URL.
+	 * @param   string  $message  Link message.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createLink($event, $link, $message = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['link'] = $link;
+		$data['message'] = $message;
+
+		return $this->createConnection($event, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a link. Requires authentication and publish_stream permission.
+	 *
+	 * @param   mixed  $link  The Link ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLink($link)
+	{
+		return $this->deleteConnection($link);
+	}
+
+	/**
+	 * Method to post on event's wall. Message or link parameter is required. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $event        The event id.
+	 * @param   string  $message      Post message.
+	 * @param   string  $link         Post URL.
+	 * @param   string  $picture      Post thumbnail image (can only be used if link is specified)
+	 * @param   string  $name         Post name (can only be used if link is specified).
+	 * @param   string  $caption      Post caption (can only be used if link is specified).
+	 * @param   string  $description  Post description (can only be used if link is specified).
+	 * @param   array   $actions      Post actions array of objects containing name and link.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createPost($event, $message = null, $link = null, $picture = null, $name = null, $caption = null,
+		$description = null, $actions = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+		$data['link'] = $link;
+		$data['name'] = $name;
+		$data['caption'] = $caption;
+		$data['description'] = $description;
+		$data['actions'] = $actions;
+		$data['picture'] = $picture;
+
+		return $this->createConnection($event, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a post. Note: you can only delete the post if it was created by the current user.
+	 * Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $post  The Post ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deletePost($post)
+	{
+		return $this->deleteConnection($post);
+	}
+
+	/**
+	 * Method to post a status message on behalf of the user on the event's wall. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $event    The event id.
+	 * @param   string  $message  Status message content.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createStatus($event, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($event, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a status. Note: you can only delete the post if it was created by the current user.
+	 * Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $status  The Status ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteStatus($status)
+	{
+		return $this->deleteConnection($status);
+	}
+
+	/**
+	 * Method to get the list of invitees for the event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getInvited($event, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($event, 'invited', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to check if a user is invited to the event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   mixed   $user   Either an integer containing the user ID or a string containing the username.
+	 *
+	 * @return  array   The decoded JSON response or an empty array if the user is not invited.
+	 *
+	 * @since   13.1
+	 */
+	public function isInvited($event, $user)
+	{
+		return $this->getConnection($event, 'invited/' . $user);
+	}
+
+	/**
+	 * Method to invite users to the event. Requires authentication and create_event permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   string  $users  Comma separated list of user ids.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createInvite($event, $users)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['users'] = $users;
+
+		return $this->createConnection($event, 'invited', $data);
+	}
+
+	/**
+	 * Method to delete an invitation. Note: you can only delete the invite if the current user is the event admin.
+	 * Requires authentication and rsvp_event permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   string  $user   The user id.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteInvite($event, $user)
+	{
+		return $this->deleteConnection($event, 'invited/' . $user);
+	}
+
+	/**
+	 * Method to get the list of attending users. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getAttending($event, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($event, 'attending', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to check if a user is attending an event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   mixed   $user   Either an integer containing the user ID or a string containing the username.
+	 *
+	 * @return  array   The decoded JSON response or an empty array if the user is not invited.
+	 *
+	 * @since   13.1
+	 */
+	public function isAttending($event, $user)
+	{
+		return $this->getConnection($event, 'attending/' . $user);
+	}
+
+	/**
+	 * Method to set the current user as attending. Requires authentication and rsvp_event permission.
+	 *
+	 * @param   string  $event  The event id.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createAttending($event)
+	{
+		return $this->createConnection($event, 'attending');
+	}
+
+	/**
+	 * Method to get the list of maybe attending users. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getMaybe($event, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($event, 'maybe', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to check if a user is maybe attending an event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   mixed   $user   Either an integer containing the user ID or a string containing the username.
+	 *
+	 * @return  array   The decoded JSON response or an empty array if the user is not invited.
+	 *
+	 * @since   13.1
+	 */
+	public function isMaybe($event, $user)
+	{
+		return $this->getConnection($event, 'maybe/' . $user);
+	}
+
+	/**
+	 * Method to set the current user as maybe attending. Requires authentication and rscp_event permission.
+	 *
+	 * @param   string  $event  The event id.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createMaybe($event)
+	{
+		return $this->createConnection($event, 'maybe');
+	}
+
+	/**
+	 * Method to get the list of users which declined the event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getDeclined($event, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($event, 'declined', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to check if a user responded 'no' to the event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   mixed   $user   Either an integer containing the user ID or a string containing the username.
+	 *
+	 * @return  array   The decoded JSON response or an empty array if the user is not invited.
+	 *
+	 * @since   13.1
+	 */
+	public function isDeclined($event, $user)
+	{
+		return $this->getConnection($event, 'declined/' . $user);
+	}
+
+	/**
+	 * Method to set the current user as declined. Requires authentication and rscp_event permission.
+	 *
+	 * @param   string  $event  The event id.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createDeclined($event)
+	{
+		return $this->createConnection($event, 'declined');
+	}
+
+	/**
+	 * Method to get the list of users which have not replied to the event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getNoreply($event, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($event, 'noreply', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to check if a user has not replied to the event. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string  $event  The event id.
+	 * @param   mixed   $user   Either an integer containing the user ID or a string containing the username.
+	 *
+	 * @return  array   The decoded JSON response or an empty array if the user is not invited.
+	 *
+	 * @since   13.1
+	 */
+	public function isNoreply($event, $user)
+	{
+		return $this->getConnection($event, 'noreply/' . $user);
+	}
+
+	/**
+	 * Method to get the event's profile picture. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   string   $event     The event id.
+	 * @param   boolean  $redirect  If false this will return the URL of the picture without a 302 redirect.
+	 * @param   string   $type      To request a different photo use square | small | normal | large.
+	 *
+	 * @return  string   The URL to the event's profile picture.
+	 *
+	 * @since   13.1
+	 */
+	public function getPicture($event, $redirect = true, $type = null)
+	{
+		$extra_fields = '';
+
+		if ($redirect == false)
+		{
+			$extra_fields = '?redirect=false';
+		}
+
+		if ($type)
+		{
+			$extra_fields .= (strpos($extra_fields, '?') === false) ? '?type=' . $type : '&type=' . $type;
+		}
+
+		return $this->getConnection($event, 'picture', $extra_fields);
+	}
+
+	/**
+	 * Method to get photos published on event's wall. Requires authentication.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPhotos($event, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($event, 'photos', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a photo on event's wall. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $event    The event id.
+	 * @param   string  $source   Path to photo.
+	 * @param   string  $message  Photo description.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createPhoto($event, $source, $message = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data[basename($source)] = '@' . realpath($source);
+
+		if ($message)
+		{
+			$data['message'] = $message;
+		}
+
+		return $this->createConnection($event, 'photos', $data, array('Content-Type' => 'multipart/form-data'));
+	}
+
+	/**
+	 * Method to get videos published on event's wall. Requires authentication.
+	 *
+	 * @param   string   $event   The event id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getVideos($event, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($event, 'videos', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a video on event's wall. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $event        The event id.
+	 * @param   string  $source       Path to photo.
+	 * @param   string  $title        Video title.
+	 * @param   string  $description  Video description.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createVideo($event, $source, $title = null, $description = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data[basename($source)] = '@' . realpath($source);
+
+		if ($title)
+		{
+			$data['title'] = $title;
+		}
+
+		if ($description)
+		{
+			$data['description'] = $description;
+		}
+
+		return $this->createConnection($event, 'videos', $data, array('Content-Type' => 'multipart/form-data'));
+	}
+}
diff --git a/core/libraries/joomla/facebook/facebook.php b/core/libraries/joomla/facebook/facebook.php
new file mode 100644
index 00000000..2daa8c49
--- /dev/null
+++ b/core/libraries/joomla/facebook/facebook.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with a Facebook API instance.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebook
+{
+	/**
+	 * @var    Registry  Options for the Facebook object.
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * @var    JFacebookOAuth  The OAuth client.
+	 * @since  13.1
+	 */
+	protected $oauth;
+
+	/**
+	 * @var    JFacebookUser  Facebook API object for user.
+	 * @since  13.1
+	 */
+	protected $user;
+
+	/**
+	 * @var    JFacebookStatus  Facebook API object for status.
+	 * @since  13.1
+	 */
+	protected $status;
+
+	/**
+	 * @var    JFacebookCheckin  Facebook API object for checkin.
+	 * @since  13.1
+	 */
+	protected $checkin;
+
+	/**
+	 * @var    JFacebookEvent  Facebook API object for event.
+	 * @since  13.1
+	 */
+	protected $event;
+
+	/**
+	 * @var    JFacebookGroup  Facebook API object for group.
+	 * @since  13.1
+	 */
+	protected $group;
+
+	/**
+	 * @var    JFacebookLink  Facebook API object for link.
+	 * @since  13.1
+	 */
+	protected $link;
+
+	/**
+	 * @var    JFacebookNote  Facebook API object for note.
+	 * @since  13.1
+	 */
+	protected $note;
+
+	/**
+	 * @var    JFacebookPost  Facebook API object for post.
+	 * @since  13.1
+	 */
+	protected $post;
+
+	/**
+	 * @var    JFacebookComment  Facebook API object for comment.
+	 * @since  13.1
+	 */
+	protected $comment;
+
+	/**
+	 * @var    JFacebookPhoto  Facebook API object for photo.
+	 * @since  13.1
+	 */
+	protected $photo;
+
+	/**
+	 * @var    JFacebookVideo  Facebook API object for video.
+	 * @since  13.1
+	 */
+	protected $video;
+
+	/**
+	 * @var    JFacebookAlbum  Facebook API object for album.
+	 * @since  13.1
+	 */
+	protected $album;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   JFacebookOAuth  $oauth    OAuth client.
+	 * @param   Registry        $options  Facebook options object.
+	 * @param   JHttp           $client   The HTTP client object.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(JFacebookOAuth $oauth = null, Registry $options = null, JHttp $client = null)
+	{
+		$this->oauth = $oauth;
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client  = isset($client) ? $client : new JHttp($this->options);
+
+		// Setup the default API url if not already set.
+		$this->options->def('api.url', 'https://graph.facebook.com/');
+	}
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JFacebookObject  Facebook API object (status, user, friends etc).
+	 *
+	 * @since   13.1
+	 * @throws  InvalidArgumentException
+	 */
+	public function __get($name)
+	{
+		$class = 'JFacebook' . ucfirst($name);
+
+		if (class_exists($class))
+		{
+			if (false == isset($this->$name))
+			{
+				$this->$name = new $class($this->options, $this->client, $this->oauth);
+			}
+
+			return $this->$name;
+		}
+
+		throw new InvalidArgumentException(sprintf('Argument %s produced an invalid class name: %s', $name, $class));
+	}
+
+	/**
+	 * Get an option from the JFacebook instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   13.1
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JFacebook instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JFacebook  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/facebook/group.php b/core/libraries/joomla/facebook/group.php
new file mode 100644
index 00000000..00b057f5
--- /dev/null
+++ b/core/libraries/joomla/facebook/group.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Group class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/group/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookGroup extends JFacebookObject
+{
+	/**
+	 * Method to read a group. Requires authentication and user_groups or friends_groups permission for non-public groups.
+	 *
+	 * @param   string  $group  The group id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getGroup($group)
+	{
+		return $this->get($group);
+	}
+
+	/**
+	 * Method to get the group's wall. Requires authentication and user_groups or friends_groups permission for non-public groups.
+	 *
+	 * @param   string   $group   The group id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFeed($group, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($group, 'feed', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the group's members. Requires authentication and user_groups or friends_groups permission for non-public groups.
+	 *
+	 * @param   string   $group   The group id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getMembers($group, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($group, 'members', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to get the group's docs. Requires authentication and user_groups or friends_groups permission for non-public groups.
+	 *
+	 * @param   string   $group   The group id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getDocs($group, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($group, 'docs', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the groups's picture. Requires authentication and user_groups or friends_groups permission.
+	 *
+	 * @param   string  $group  The group id.
+	 * @param   string  $type   To request a different photo use square | small | normal | large.
+	 *
+	 * @return  string   The URL to the group's picture.
+	 *
+	 * @since   13.1
+	 */
+	public function getPicture($group, $type = null)
+	{
+		if ($type)
+		{
+			$type = '?type=' . $type;
+		}
+
+		return $this->getConnection($group, 'picture', $type);
+	}
+
+	/**
+	 * Method to post a link on group's wall. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $group    The group id.
+	 * @param   string  $link     Link URL.
+	 * @param   string  $message  Link message.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createLink($group, $link, $message = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['link'] = $link;
+
+		if ($message)
+		{
+			$data['message'] = $message;
+		}
+
+		return $this->createConnection($group, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a link. Requires authentication.
+	 *
+	 * @param   mixed  $link  The Link ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLink($link)
+	{
+		return $this->deleteConnection($link);
+	}
+
+	/**
+	 * Method to post on group's wall. Message or link parameter is required. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $group        The group id.
+	 * @param   string  $message      Post message.
+	 * @param   string  $link         Post URL.
+	 * @param   string  $picture      Post thumbnail image (can only be used if link is specified)
+	 * @param   string  $name         Post name (can only be used if link is specified).
+	 * @param   string  $caption      Post caption (can only be used if link is specified).
+	 * @param   string  $description  Post description (can only be used if link is specified).
+	 * @param   array   $actions      Post actions array of objects containing name and link.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createPost($group, $message = null, $link = null, $picture = null, $name = null, $caption = null,
+		$description = null, $actions = null)
+	{
+		// Set POST request parameters.
+		if ($message)
+		{
+			$data['message'] = $message;
+		}
+
+		if ($link)
+		{
+			$data['link'] = $link;
+		}
+
+		if ($name)
+		{
+			$data['name'] = $name;
+		}
+
+		if ($caption)
+		{
+			$data['caption'] = $caption;
+		}
+
+		if ($description)
+		{
+			$data['description'] = $description;
+		}
+
+		if ($actions)
+		{
+			$data['actions'] = $actions;
+		}
+
+		if ($picture)
+		{
+			$data['picture'] = $picture;
+		}
+
+		return $this->createConnection($group, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a post. Note: you can only delete the post if it was created by the current user. Requires authentication.
+	 *
+	 * @param   string  $post  The Post ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deletePost($post)
+	{
+		return $this->deleteConnection($post);
+	}
+
+	/**
+	 * Method to post a status message on behalf of the user on the group's wall. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $group    The group id.
+	 * @param   string  $message  Status message content.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createStatus($group, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($group, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a status. Note: you can only delete the status if it was created by the current user. Requires authentication.
+	 *
+	 * @param   string  $status  The Status ID.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteStatus($status)
+	{
+		return $this->deleteConnection($status);
+	}
+}
diff --git a/core/libraries/joomla/facebook/link.php b/core/libraries/joomla/facebook/link.php
new file mode 100644
index 00000000..a6c749ba
--- /dev/null
+++ b/core/libraries/joomla/facebook/link.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Link class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/link/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookLink extends JFacebookObject
+{
+	/**
+	 * Method to get a link. Requires authentication and read_stream permission for non-public links.
+	 *
+	 * @param   string  $link  The link id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLink($link)
+	{
+		return $this->get($link);
+	}
+
+	/**
+	 * Method to get a link's comments. Requires authentication and read_stream permission for non-public links.
+	 *
+	 * @param   string   $link    The link id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($link, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($link, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on a link. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $link     The link id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($link, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($link, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get link's likes. Requires authentication and read_stream permission for non-public links.
+	 *
+	 * @param   string   $link    The link id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($link, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($link, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a link. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $link  The link id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($link)
+	{
+		return $this->createConnection($link, 'likes');
+	}
+
+	/**
+	 * Method to unlike a link. Requires authentication and publish_stream permission.
+	 *
+	 * @param   string  $link  The link id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($link)
+	{
+		return $this->deleteConnection($link, 'likes');
+	}
+}
diff --git a/core/libraries/joomla/facebook/note.php b/core/libraries/joomla/facebook/note.php
new file mode 100644
index 00000000..9862b11b
--- /dev/null
+++ b/core/libraries/joomla/facebook/note.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Note class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/note/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookNote extends JFacebookObject
+{
+	/**
+	 * Method to get a note. Requires authentication and user_notes or friends_notes permission for non-public notes.
+	 *
+	 * @param   string  $note  The note id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getNote($note)
+	{
+		return $this->get($note);
+	}
+
+	/**
+	 * Method to get a note's comments. Requires authentication and user_notes or friends_notes permission for non-public notes.
+	 *
+	 * @param   string   $note    The note id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($note, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($note, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on a note. Requires authentication and publish_stream and user_notes or friends_notes permissions.
+	 *
+	 * @param   string  $note     The note id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($note, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($note, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream and user_notes or friends_notes permissions.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get note's likes. Requires authentication and user_notes or friends_notes for non-public notes.
+	 *
+	 * @param   string   $note    The note id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($note, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($note, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a note. Requires authentication and publish_stream and user_notes or friends_notes permissions.
+	 *
+	 * @param   string  $note  The note id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($note)
+	{
+		return $this->createConnection($note, 'likes');
+	}
+
+	/**
+	 * Method to unlike a note. Requires authentication and publish_stream and user_notes or friends_notes permissions.
+	 *
+	 * @param   string  $note  The note id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($note)
+	{
+		return $this->deleteConnection($note, 'likes');
+	}
+}
diff --git a/core/libraries/joomla/facebook/oauth.php b/core/libraries/joomla/facebook/oauth.php
new file mode 100644
index 00000000..edd74067
--- /dev/null
+++ b/core/libraries/joomla/facebook/oauth.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for generating Facebook API access token.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookOAuth extends JOAuth2Client
+{
+	/**
+	 * @var    Registry Options for the JFacebookOAuth object.
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  JFacebookOauth options object.
+	 * @param   JHttp     $client   The HTTP client object.
+	 * @param   JInput    $input    The input object.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JInput $input = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+
+		// Setup the authentication and token urls if not already set.
+		$this->options->def('authurl', 'http://www.facebook.com/dialog/oauth');
+		$this->options->def('tokenurl', 'https://graph.facebook.com/oauth/access_token');
+
+		// Call the JOAuth2Client constructor to setup the object.
+		parent::__construct($this->options, $client, $input);
+	}
+
+	/**
+	 * Method used to set permissions.
+	 *
+	 * @param   string  $scope  Comma separated list of permissions.
+	 *
+	 * @return  JFacebookOauth  This object for method chaining
+	 *
+	 * @since   13.1
+	 */
+	public function setScope($scope)
+	{
+		$this->setOption('scope', $scope);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the current scope
+	 *
+	 * @return  string Comma separated list of permissions.
+	 *
+	 * @since   13.1
+	 */
+	public function getScope()
+	{
+		return $this->getOption('scope');
+	}
+}
diff --git a/core/libraries/joomla/facebook/object.php b/core/libraries/joomla/facebook/object.php
new file mode 100644
index 00000000..951e6c36
--- /dev/null
+++ b/core/libraries/joomla/facebook/object.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Facebook API object class for the Joomla Platform.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+abstract class JFacebookObject
+{
+	/**
+	 * @var    Registry  Options for the Facebook object.
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * @var    JFacebookOAuth  The OAuth client.
+	 * @since  13.1
+	 */
+	protected $oauth;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry        $options  Facebook options object.
+	 * @param   JHttp           $client   The HTTP client object.
+	 * @param   JFacebookOAuth  $oauth    The OAuth client.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JFacebookOAuth $oauth = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JHttp($this->options);
+		$this->oauth = $oauth;
+	}
+
+	/**
+	 * Method to build and return a full request URL for the request.  This method will
+	 * add appropriate pagination details if necessary and also prepend the API url
+	 * to have a complete URL for the request.
+	 *
+	 * @param   string   $path    URL to inflect.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   integer  $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   integer  $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  string  The request URL.
+	 *
+	 * @since   13.1
+	 */
+	protected function fetchUrl($path, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		// Get a new JUri object fousing the api url and given path.
+		$uri = new JUri($this->options->get('api.url') . $path);
+
+		if ($limit > 0)
+		{
+			$uri->setVar('limit', (int) $limit);
+		}
+
+		if ($offset > 0)
+		{
+			$uri->setVar('offset', (int) $offset);
+		}
+
+		if ($until != null)
+		{
+			$uri->setVar('until', $until);
+		}
+
+		if ($since != null)
+		{
+			$uri->setVar('since', $since);
+		}
+
+		return (string) $uri;
+	}
+
+	/**
+	 * Method to send the request.
+	 *
+	 * @param   string   $path     The path of the request to make.
+	 * @param   mixed    $data     Either an associative array or a string to be sent with the post request.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request
+	 * @param   integer  $limit    The number of objects per page.
+	 * @param   integer  $offset   The object's number on the page.
+	 * @param   string   $until    A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since    A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return   mixed  The request response.
+	 *
+	 * @since    13.1
+	 * @throws   DomainException
+	 */
+	public function sendRequest($path, $data = '', array $headers = null, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $limit, $offset, $until, $since), $headers);
+
+		$response = json_decode($response->body);
+
+		// Validate the response.
+		if (property_exists($response, 'error'))
+		{
+			throw new RuntimeException($response->error->message);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Method to get an object.
+	 *
+	 * @param   string  $object  The object id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function get($object)
+	{
+		if ($this->oauth != null)
+		{
+			if ($this->oauth->isAuthenticated())
+			{
+				$response = $this->oauth->query($this->fetchUrl($object));
+
+				return json_decode($response->body);
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		// Send the request.
+		return $this->sendRequest($object);
+	}
+
+	/**
+	 * Method to get object's connection.
+	 *
+	 * @param   string   $object        The object id.
+	 * @param   string   $connection    The object's connection name.
+	 * @param   string   $extra_fields  URL fields.
+	 * @param   integer  $limit         The number of objects per page.
+	 * @param   integer  $offset        The object's number on the page.
+	 * @param   string   $until         A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since         A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getConnection($object, $connection = null, $extra_fields = '', $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		$path = $object . '/' . $connection . $extra_fields;
+
+		if ($this->oauth != null)
+		{
+			if ($this->oauth->isAuthenticated())
+			{
+				$response = $this->oauth->query($this->fetchUrl($path, $limit, $offset, $until, $since));
+
+				if (strcmp($response->body, ''))
+				{
+					return json_decode($response->body);
+				}
+				else
+				{
+					return $response->headers['Location'];
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, '', null, $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to create a connection.
+	 *
+	 * @param   string  $object      The object id.
+	 * @param   string  $connection  The object's connection name.
+	 * @param   array   $parameters  The POST request parameters.
+	 * @param   array   $headers     An array of name-value pairs to include in the header of the request
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createConnection($object, $connection = null, $parameters = null, array $headers = null)
+	{
+		if ($this->oauth->isAuthenticated())
+		{
+			// Build the request path.
+			if ($connection != null)
+			{
+				$path = $object . '/' . $connection;
+			}
+			else
+			{
+				$path = $object;
+			}
+
+			// Send the post request.
+			$response = $this->oauth->query($this->fetchUrl($path), $parameters, $headers, 'post');
+
+			return json_decode($response->body);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to delete a connection.
+	 *
+	 * @param   string  $object        The object id.
+	 * @param   string  $connection    The object's connection name.
+	 * @param   string  $extra_fields  URL fields.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteConnection($object, $connection = null, $extra_fields = '')
+	{
+		if ($this->oauth->isAuthenticated())
+		{
+			// Build the request path.
+			if ($connection != null)
+			{
+				$path = $object . '/' . $connection . $extra_fields;
+			}
+			else
+			{
+				$path = $object . $extra_fields;
+			}
+
+			// Send the delete request.
+			$response = $this->oauth->query($this->fetchUrl($path), null, array(), 'delete');
+
+			return json_decode($response->body);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method used to set the OAuth client.
+	 *
+	 * @param   JFacebookOAuth  $oauth  The OAuth client object.
+	 *
+	 * @return  JFacebookObject  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setOAuth($oauth)
+	{
+		$this->oauth = $oauth;
+
+		return $this;
+	}
+
+	/**
+	 * Method used to get the OAuth client.
+	 *
+	 * @return  JFacebookOAuth  The OAuth client
+	 *
+	 * @since   13.1
+	 */
+	public function getOAuth()
+	{
+		return $this->oauth;
+	}
+}
diff --git a/core/libraries/joomla/facebook/photo.php b/core/libraries/joomla/facebook/photo.php
new file mode 100644
index 00000000..3ce983e8
--- /dev/null
+++ b/core/libraries/joomla/facebook/photo.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Photo class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/photo/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookPhoto extends JFacebookObject
+{
+	/**
+	 * Method to get a photo. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string  $photo  The photo id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPhoto($photo)
+	{
+		return $this->get($photo);
+	}
+
+	/**
+	 * Method to get a photo's comments. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $photo   The photo id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($photo, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($photo, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on a photo. Requires authentication and publish_stream permission, user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string  $photo    The photo id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($photo, $message)
+	{
+		// Set POST request parameters.
+		$data['message'] = $message;
+
+		return $this->createConnection($photo, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream permission, user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get photo's likes. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $photo   The photo id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($photo, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($photo, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a photo. Requires authentication and publish_stream permission, user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string  $photo  The photo id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($photo)
+	{
+		return $this->createConnection($photo, 'likes');
+	}
+
+	/**
+	 * Method to unlike a photo. Requires authentication and publish_stream permission, user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string  $photo  The photo id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($photo)
+	{
+		return $this->deleteConnection($photo, 'likes');
+	}
+
+	/**
+	 * Method to get the Users tagged in the photo. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $photo   The photo id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getTags($photo, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($photo, 'tags', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to tag one or more Users in a photo. $to or $tag_text required.
+	 * Requires authentication and publish_stream permission, user_photos permission for private photos.
+	 *
+	 * @param   string   $photo     The photo id.
+	 * @param   mixed    $to        ID of the User or an array of Users to tag in the photo: [{"id":"1234"}, {"id":"12345"}].
+	 * @param   string   $tag_text  A text string to tag.
+	 * @param   integer  $x         x coordinate of tag, as a percentage offset from the left edge of the picture.
+	 * @param   integer  $y         y coordinate of tag, as a percentage offset from the top edge of the picture.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createTag($photo, $to = null, $tag_text = null, $x = null, $y = null)
+	{
+		// Set POST request parameters.
+		if (is_array($to))
+		{
+			$data['tags'] = $to;
+		}
+		else
+		{
+			$data['to'] = $to;
+		}
+
+		if ($tag_text)
+		{
+			$data['tag_text'] = $tag_text;
+		}
+
+		if ($x)
+		{
+			$data['x'] = $x;
+		}
+
+		if ($y)
+		{
+			$data['y'] = $y;
+		}
+
+		return $this->createConnection($photo, 'tags', $data);
+	}
+
+	/**
+	 * Method to update the position of the tag for a particular Users in a photo.
+	 * Requires authentication and publish_stream permission, user_photos permission for private photos.
+	 *
+	 * @param   string   $photo  The photo id.
+	 * @param   string   $to     ID of the User to update tag in the photo.
+	 * @param   integer  $x      x coordinate of tag, as a percentage offset from the left edge of the picture.
+	 * @param   integer  $y      y coordinate of tag, as a percentage offset from the top edge of the picture.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function updateTag($photo, $to, $x = null, $y = null)
+	{
+		// Set POST request parameters.
+		$data['to'] = $to;
+
+		if ($x)
+		{
+			$data['x'] = $x;
+		}
+
+		if ($y)
+		{
+			$data['y'] = $y;
+		}
+
+		return $this->createConnection($photo, 'tags', $data);
+	}
+
+	/**
+	 * Method to get the album-sized view of the photo. Requires authentication and user_photos or friends_photos permission for private photos.
+	 *
+	 * @param   string   $photo     The photo id.
+	 * @param   boolean  $redirect  If false this will return the URL of the picture without a 302 redirect.
+	 *
+	 * @return  string  URL of the picture.
+	 *
+	 * @since   13.1
+	 */
+	public function getPicture($photo, $redirect = true)
+	{
+		$extra_fields = '';
+
+		if ($redirect == false)
+		{
+			$extra_fields = '?redirect=false';
+		}
+
+		return $this->getConnection($photo, 'picture', $extra_fields);
+	}
+}
diff --git a/core/libraries/joomla/facebook/post.php b/core/libraries/joomla/facebook/post.php
new file mode 100644
index 00000000..fead7280
--- /dev/null
+++ b/core/libraries/joomla/facebook/post.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Post class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/post/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookPost extends JFacebookObject
+{
+	/**
+	 * Method to get a post. Requires authentication and read_stream permission for all data.
+	 *
+	 * @param   string  $post  The post id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPost($post)
+	{
+		return $this->get($post);
+	}
+
+	/**
+	 * Method to delete a post if it was created by this application. Requires authentication and publish_stream permission
+	 *
+	 * @param   string  $post  The post id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deletePost($post)
+	{
+		return $this->deleteConnection($post);
+	}
+
+	/**
+	 * Method to get a post's comments. Requires authentication and read_stream permission.
+	 *
+	 * @param   string   $post    The post id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($post, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($post, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on a post. Requires authentication and publish_stream permission
+	 *
+	 * @param   string  $post     The post id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($post, $message)
+	{
+		// Set POST request parameters.
+		$data['message'] = $message;
+
+		return $this->createConnection($post, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream permission
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get post's likes. Requires authentication and read_stream permission.
+	 *
+	 * @param   string   $post    The post id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($post, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($post, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a post. Requires authentication and publish_stream permission
+	 *
+	 * @param   string  $post  The post id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($post)
+	{
+		return $this->createConnection($post, 'likes');
+	}
+
+	/**
+	 * Method to unlike a post. Requires authentication and publish_stream permission
+	 *
+	 * @param   string  $post  The post id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($post)
+	{
+		return $this->deleteConnection($post, 'likes');
+	}
+}
diff --git a/core/libraries/joomla/facebook/status.php b/core/libraries/joomla/facebook/status.php
new file mode 100644
index 00000000..7e377ad6
--- /dev/null
+++ b/core/libraries/joomla/facebook/status.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Status class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/status/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookStatus extends JFacebookObject
+{
+	/**
+	 * Method to get a status message. Requires authentication.
+	 *
+	 * @param   string  $status  The status message id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getStatus($status)
+	{
+		return $this->get($status);
+	}
+
+	/**
+	 * Method to get a status message's comments. Requires authentication.
+	 *
+	 * @param   string   $status  The status message id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($status, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($status, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a comment to the status message. Requires authentication and publish_stream and user_status or friends_status permission.
+	 *
+	 * @param   string  $status   The status message id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($status, $message)
+	{
+		// Set POST request parameters.
+		$data['message'] = $message;
+
+		return $this->createConnection($status, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream and user_status or friends_status permission.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get a status message's likes. Requires authentication.
+	 *
+	 * @param   string   $status  The status message id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($status, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($status, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like status message. Requires authentication and publish_stream and user_status or friends_status permission.
+	 *
+	 * @param   string  $status  The status message id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($status)
+	{
+		return $this->createConnection($status, 'likes');
+	}
+
+	/**
+	 * Method to unlike a status message. Requires authentication and publish_stream and user_status or friends_status permission.
+	 *
+	 * @param   string  $status  The status message id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($status)
+	{
+		return $this->deleteConnection($status, 'likes');
+	}
+}
diff --git a/core/libraries/joomla/facebook/user.php b/core/libraries/joomla/facebook/user.php
new file mode 100644
index 00000000..ed64f9f4
--- /dev/null
+++ b/core/libraries/joomla/facebook/user.php
@@ -0,0 +1,987 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API User class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/user/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookUser extends JFacebookObject
+{
+	/**
+	 * Method to get the specified user's details. Authentication is required only for some fields.
+	 *
+	 * @param   mixed  $user  Either an integer containing the user ID or a string containing the username.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getUser($user)
+	{
+		return $this->get($user);
+	}
+
+	/**
+	 * Method to get the specified user's friends. Requires authentication.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFriends($user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($user, 'friends', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to get the user's incoming friend requests. Requires authentication and read_requests permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFriendRequests($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'friendrequests', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the user's friend lists. Requires authentication and read_friendlists permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFriendLists($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'friendlists', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the user's wall. Requires authentication and read_stream permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFeed($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'feed', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the user's news feed. Requires authentication and read_stream permission.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the username.
+	 * @param   string   $filter    User's stream filter.
+	 * @param   boolean  $location  Retreive only posts with a location attached.
+	 * @param   integer  $limit     The number of objects per page.
+	 * @param   integer  $offset    The object's number on the page.
+	 * @param   string   $until     A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since     A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getHome($user, $filter = null, $location = false, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		$extra_fields = '';
+
+		if ($filter != null)
+		{
+			$extra_fields = '?filter=' . $filter;
+		}
+
+		if ($location == true)
+		{
+			$extra_fields .= (strpos($extra_fields, '?') === false) ? '?with=location' : '&with=location';
+		}
+
+		return $this->getConnection($user, 'home', $extra_fields, $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to see if a user is a friend of the current user. Requires authentication.
+	 *
+	 * @param   mixed  $current_user  Either an integer containing the user ID or a string containing the username for the current user.
+	 * @param   mixed  $user          Either an integer containing the user ID or a string containing the username for the user.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function hasFriend($current_user, $user)
+	{
+		return $this->getConnection($current_user, 'friends/' . $user);
+	}
+
+	/**
+	 * Method to get mutual friends of one user and the current user. Requires authentication.
+	 *
+	 * @param   mixed    $current_user  Either an integer containing the user ID or a string containing the username for the current user.
+	 * @param   mixed    $user          Either an integer containing the user ID or a string containing the username for the user.
+	 * @param   integer  $limit         The number of objects per page.
+	 * @param   integer  $offset        The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getMutualFriends($current_user, $user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($current_user, 'mutualfriends/' . $user, '', $limit, $offset);
+	}
+
+	/**
+	 * Method to get the user's profile picture. Requires authentication.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the username.
+	 * @param   boolean  $redirect  If false this will return the URL of the profile picture without a 302 redirect.
+	 * @param   string   $type      To request a different photo use square | small | normal | large.
+	 *
+	 * @return  string   The URL to the user's profile picture.
+	 *
+	 * @since   13.1
+	 */
+	public function getPicture($user, $redirect = true, $type = null)
+	{
+		$extra_fields = '';
+
+		if ($redirect == false)
+		{
+			$extra_fields = '?redirect=false';
+		}
+
+		if ($type != null)
+		{
+			$extra_fields .= (strpos($extra_fields, '?') === false) ? '?type=' . $type : '&type=' . $type;
+		}
+
+		return $this->getConnection($user, 'picture', $extra_fields);
+	}
+
+	/**
+	 * Method to get the user's family relationships. Requires authentication and user_relationships permission..
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getFamily($user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($user, 'family', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to get the user's notifications. Requires authentication and manage_notifications permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   boolean  $read    Enables you to see notifications that the user has already read.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getNotifications($user, $read = null, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		if ($read == true)
+		{
+			$read = '?include_read=1';
+		}
+
+		// Send the request.
+		return $this->getConnection($user, 'notifications', $read, $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to mark a notification as read. Requires authentication and manage_notifications permission.
+	 *
+	 * @param   string  $notification  The notification id.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function updateNotification($notification)
+	{
+		$data['unread'] = 0;
+
+		return $this->createConnection($notification, null, $data);
+	}
+
+	/**
+	 * Method to get the user's permissions. Requires authentication.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPermissions($user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($user, 'permissions', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to revoke a specific permission on behalf of a user. Requires authentication.
+	 *
+	 * @param   mixed   $user        Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $permission  The permission to revoke. If none specified, then this will de-authorize the application completely.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deletePermission($user, $permission = '')
+	{
+		return $this->deleteConnection($user, 'permissions', '?permission=' . $permission);
+	}
+
+	/**
+	 * Method to get the user's albums. Requires authentication and user_photos or friends_photos permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getAlbums($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'albums', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to create an album for a user.  Requires authentication and publish_stream permission.
+	 *
+	 * @param   mixed   $user         Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $name         Album name.
+	 * @param   string  $description  Album description.
+	 * @param   string  $privacy      A JSON-encoded object that defines the privacy setting for the album.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createAlbum($user, $name, $description = null, $privacy = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['name'] = $name;
+		$data['description'] = $description;
+		$data['privacy'] = $privacy;
+
+		return $this->createConnection($user, 'albums', $data);
+	}
+
+	/**
+	 * Method to get the user's checkins. Requires authentication and user_checkins or friends_checkins permission
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getCheckins($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'checkins', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to create a checkin for a user. Requires authentication and publish_checkins permission.
+	 *
+	 * @param   mixed   $user         Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $place        Id of the Place Page.
+	 * @param   string  $coordinates  A JSON-encoded string containing latitute and longitude.
+	 * @param   string  $tags         Comma separated list of USER_IDs.
+	 * @param   string  $message      A message to add to the checkin.
+	 * @param   string  $link         A link to add to the checkin.
+	 * @param   string  $picture      A picture to add to the checkin.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createCheckin($user, $place, $coordinates, $tags = null, $message = null, $link = null, $picture = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['place'] = $place;
+		$data['coordinates'] = $coordinates;
+		$data['tags'] = $tags;
+		$data['message'] = $message;
+		$data['link'] = $link;
+		$data['picture'] = $picture;
+
+		return $this->createConnection($user, 'checkins', $data);
+	}
+
+	/**
+	 * Method to get the user's likes. Requires authentication and user_likes or friends_likes permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to see if a user likes a specific Page. Requires authentication.
+	 *
+	 * @param   mixed   $user  Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $page  Facebook ID of the Page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function likesPage($user, $page)
+	{
+		return $this->getConnection($user, 'likes/' . $page);
+	}
+
+	/**
+	 * Method to get the current user's events. Requires authentication and user_events or friends_events permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getEvents($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'events', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to create an event for a user. Requires authentication create_event permission.
+	 *
+	 * @param   mixed   $user          Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $name          Event name.
+	 * @param   string  $start_time    Event start time as UNIX timestamp.
+	 * @param   string  $end_time      Event end time as UNIX timestamp.
+	 * @param   string  $description   Event description.
+	 * @param   string  $location      Event location.
+	 * @param   string  $location_id   Facebook Place ID of the place the Event is taking place.
+	 * @param   string  $privacy_type  Event privacy setting, a string containing 'OPEN' (default), 'CLOSED', or 'SECRET'.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createEvent($user, $name, $start_time, $end_time = null, $description = null,
+		$location = null, $location_id = null, $privacy_type = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['start_time'] = $start_time;
+		$data['name'] = $name;
+		$data['end_time'] = $end_time;
+		$data['description'] = $description;
+		$data['location'] = $location;
+		$data['location_id'] = $location_id;
+		$data['privacy_type'] = $privacy_type;
+
+		return $this->createConnection($user, 'events', $data);
+	}
+
+	/**
+	 * Method to edit an event. Requires authentication create_event permission.
+	 *
+	 * @param   mixed   $event         Event ID.
+	 * @param   string  $name          Event name.
+	 * @param   string  $start_time    Event start time as UNIX timestamp.
+	 * @param   string  $end_time      Event end time as UNIX timestamp.
+	 * @param   string  $description   Event description.
+	 * @param   string  $location      Event location.
+	 * @param   string  $location_id   Facebook Place ID of the place the Event is taking place.
+	 * @param   string  $privacy_type  Event privacy setting, a string containing 'OPEN' (default), 'CLOSED', or 'SECRET'.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function editEvent($event, $name = null, $start_time = null, $end_time = null, $description = null,
+		$location = null, $location_id = null, $privacy_type = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['start_time'] = $start_time;
+		$data['name'] = $name;
+		$data['end_time'] = $end_time;
+		$data['description'] = $description;
+		$data['location'] = $location;
+		$data['location_id'] = $location_id;
+		$data['privacy_type'] = $privacy_type;
+
+		return $this->createConnection($event, null, $data);
+	}
+
+	/**
+	 * Method to delete an event. Note: you can only delete the event if it was created by the same app. Requires authentication create_event permission.
+	 *
+	 * @param   string  $event  Event ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteEvent($event)
+	{
+		return $this->deleteConnection($event);
+	}
+
+	/**
+	 * Method to get the groups that the user belongs to. Requires authentication and user_groups or friends_groups permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getGroups($user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($user, 'groups', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to get the user's posted links. Requires authentication and user_groups or friends_groups permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLinks($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'links', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a link on user's feed. Requires authentication and publish_stream permission.
+	 *
+	 * @param   mixed   $user     Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $link     Link URL.
+	 * @param   string  $message  Link message.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createLink($user, $link, $message = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['link'] = $link;
+		$data['message'] = $message;
+
+		return $this->createConnection($user, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a link. Requires authentication and publish_stream permission.
+	 *
+	 * @param   mixed  $link  The Link ID.
+	 *
+	 * @return  boolean   Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLink($link)
+	{
+		return $this->deleteConnection($link);
+	}
+
+	/**
+	 * Method to get the user's notes. Requires authentication and user_groups or friends_groups permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getNotes($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'notes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to create a note on the behalf of the user.
+	 * Requires authentication and publish_stream permission, user_groups or friends_groups permission.
+	 *
+	 * @param   mixed   $user     Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $subject  The subject of the note.
+	 * @param   string  $message  Note content.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createNote($user, $subject, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['subject'] = $subject;
+		$data['message'] = $message;
+
+		return $this->createConnection($user, 'notes', $data);
+	}
+
+	/**
+	 * Method to get the user's photos. Requires authentication and user_groups or friends_groups permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPhotos($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'photos', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a photo on user's wall. Requires authentication and publish_stream permission, user_groups or friends_groups permission.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the username.
+	 * @param   string   $source    Path to photo.
+	 * @param   string   $message   Photo description.
+	 * @param   string   $place     Facebook ID of the place associated with the photo.
+	 * @param   boolean  $no_story  If set to 1, optionally suppresses the feed story that is automatically
+	 * 								generated on a user’s profile when they upload a photo using your application.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createPhoto($user, $source, $message = null, $place = null, $no_story = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data[basename($source)] = '@' . realpath($source);
+		$data['message'] = $message;
+		$data['place'] = $place;
+		$data['no_story'] = $no_story;
+
+		return $this->createConnection($user, 'photos', $data, array('Content-Type' => 'multipart/form-data'));
+	}
+
+	/**
+	 * Method to get the user's posts. Requires authentication and read_stream permission for non-public posts.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the username.
+	 * @param   boolean  $location  Retreive only posts with a location attached.
+	 * @param   integer  $limit     The number of objects per page.
+	 * @param   integer  $offset    The object's number on the page.
+	 * @param   string   $until     A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since     A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getPosts($user, $location = false, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		if ($location == true)
+		{
+			$location = '?with=location';
+		}
+
+		// Send the request.
+		return $this->getConnection($user, 'posts', $location, $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post on a user's wall. Message or link parameter is required. Requires authentication and publish_stream permission.
+	 *
+	 * @param   mixed   $user               Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $message            Post message.
+	 * @param   string  $link               Post URL.
+	 * @param   string  $picture            Post thumbnail image (can only be used if link is specified)
+	 * @param   string  $name               Post name (can only be used if link is specified).
+	 * @param   string  $caption            Post caption (can only be used if link is specified).
+	 * @param   string  $description        Post description (can only be used if link is specified).
+	 * @param   array   $actions            Post actions array of objects containing name and link.
+	 * @param   string  $place              Facebook Page ID of the location associated with this Post.
+	 * @param   string  $tags               Comma-separated list of Facebook IDs of people tagged in this Post.
+	 * 										For example: 1207059,701732. You cannot specify this field without also specifying a place.
+	 * @param   string  $privacy            Post privacy settings (can only be specified if the Timeline being posted
+	 * 										on belongs to the User creating the Post).
+	 * @param   string  $object_attachment  Facebook ID for an existing picture in the User's photo albums to use as the thumbnail image.
+	 *                                      The User must be the owner of the photo, and the photo cannot be part of a message attachment.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createPost($user, $message = null, $link = null, $picture = null, $name = null, $caption = null,
+		$description = null, $actions = null, $place = null, $tags = null, $privacy = null, $object_attachment = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+		$data['link'] = $link;
+		$data['name'] = $name;
+		$data['caption'] = $caption;
+		$data['description'] = $description;
+		$data['actions'] = $actions;
+		$data['place'] = $place;
+		$data['tags'] = $tags;
+		$data['privacy'] = $privacy;
+		$data['object_attachment'] = $object_attachment;
+		$data['picture'] = $picture;
+
+		return $this->createConnection($user, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a post. Note: you can only delete the post if it was created by the current user. Requires authentication
+	 *
+	 * @param   string  $post  The Post ID.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deletePost($post)
+	{
+		return $this->deleteConnection($post);
+	}
+
+	/**
+	 * Method to get the user's statuses. Requires authentication read_stream permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getStatuses($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'statuses', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a status message on behalf of the user. Requires authentication publish_stream permission.
+	 *
+	 * @param   mixed   $user     Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $message  Status message content.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createStatus($user, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($user, 'feed', $data);
+	}
+
+	/**
+	 * Method to delete a status. Note: you can only delete the post if it was created by the current user.
+	 * Requires authentication publish_stream permission.
+	 *
+	 * @param   string  $status  The Status ID.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteStatus($status)
+	{
+		return $this->deleteConnection($status);
+	}
+
+	/**
+	 * Method to get the videos the user has been tagged in. Requires authentication and user_videos or friends_videos permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getVideos($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'videos', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to post a video on behalf of the user. Requires authentication and publish_stream permission.
+	 *
+	 * @param   mixed   $user         Either an integer containing the user ID or a string containing the username.
+	 * @param   string  $source       Path to video.
+	 * @param   string  $title        Video title.
+	 * @param   string  $description  Video description.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createVideo($user, $source, $title = null, $description = null)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data[basename($source)] = '@' . realpath($source);
+		$data['title'] = $title;
+		$data['description'] = $description;
+
+		return $this->createConnection($user, 'videos', $data, array('Content-Type' => 'multipart/form-data'));
+	}
+
+	/**
+	 * Method to get the posts the user has been tagged in. Requires authentication and user_videos or friends_videos permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getTagged($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'tagged', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the activities listed on the user's profile. Requires authentication and user_activities or friends_activities permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getActivities($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'activities', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the books listed on the user's profile. Requires authentication and user_likes or friends_likes permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getBooks($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'books', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the interests listed on the user's profile. Requires authentication.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getInterests($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'interests', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the movies listed on the user's profile. Requires authentication and user_likes or friends_likes permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getMovies($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'movies', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the television listed on the user's profile. Requires authentication and user_likes or friends_likes permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getTelevision($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'television', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the music listed on the user's profile. Requires authentication user_likes or friends_likes permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getMusic($user, $limit = 0, $offset = 0, $until = null, $since = null)
+	{
+		return $this->getConnection($user, 'music', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to get the user's subscribers. Requires authentication and user_subscriptions or friends_subscriptions permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getSubscribers($user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($user, 'subscribers', '', $limit, $offset);
+	}
+
+	/**
+	 * Method to get the people the user is subscribed to. Requires authentication and user_subscriptions or friends_subscriptions permission.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the username.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getSubscribedTo($user, $limit = 0, $offset = 0)
+	{
+		return $this->getConnection($user, 'subscribedto', '', $limit, $offset);
+	}
+}
diff --git a/core/libraries/joomla/facebook/video.php b/core/libraries/joomla/facebook/video.php
new file mode 100644
index 00000000..c00c8c36
--- /dev/null
+++ b/core/libraries/joomla/facebook/video.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Facebook
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Facebook API Video class for the Joomla Platform.
+ *
+ * @link        http://developers.facebook.com/docs/reference/api/video/
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/facebook` package via Composer instead
+ */
+class JFacebookVideo extends JFacebookObject
+{
+	/**
+	 * Method to get a video. Requires authentication and user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string  $video  The video id.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getVideo($video)
+	{
+		return $this->get($video);
+	}
+
+	/**
+	 * Method to get a video's comments. Requires authentication and user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string   $video   The video id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($video, $limit=0, $offset=0, $until=null, $since=null)
+	{
+		return $this->getConnection($video, 'comments', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to comment on a video. Requires authentication and publish_stream permission, user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string  $video    The video id.
+	 * @param   string  $message  The comment's text.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function createComment($video, $message)
+	{
+		// Set POST request parameters.
+		$data = array();
+		$data['message'] = $message;
+
+		return $this->createConnection($video, 'comments', $data);
+	}
+
+	/**
+	 * Method to delete a comment. Requires authentication and publish_stream permission, user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string  $comment  The comment's id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment)
+	{
+		return $this->deleteConnection($comment);
+	}
+
+	/**
+	 * Method to get video's likes. Requires authentication and user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string   $video   The video id.
+	 * @param   integer  $limit   The number of objects per page.
+	 * @param   integer  $offset  The object's number on the page.
+	 * @param   string   $until   A unix timestamp or any date accepted by strtotime.
+	 * @param   string   $since   A unix timestamp or any date accepted by strtotime.
+	 *
+	 * @return  mixed   The decoded JSON response or false if the client is not authenticated.
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($video, $limit=0, $offset=0, $until=null, $since=null)
+	{
+		return $this->getConnection($video, 'likes', '', $limit, $offset, $until, $since);
+	}
+
+	/**
+	 * Method to like a video. Requires authentication and publish_stream permission, user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string  $video  The video id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function createLike($video)
+	{
+		return $this->createConnection($video, 'likes');
+	}
+
+	/**
+	 * Method to unlike a video. Requires authentication and publish_stream permission, user_videos or friends_videos permission for private videos.
+	 *
+	 * @param   string  $video  The video id.
+	 *
+	 * @return  boolean Returns true if successful, and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function deleteLike($video)
+	{
+		return $this->deleteConnection($video, 'likes');
+	}
+
+	/**
+	 * Method to get the album-sized view of the video. Requires authentication and user_videos or friends_videos permission for private photos.
+	 *
+	 * @param   string  $video  The video id.
+	 *
+	 * @return  string  URL of the picture.
+	 *
+	 * @since   13.1
+	 */
+	public function getPicture($video)
+	{
+		return $this->getConnection($video, 'picture');
+	}
+}
diff --git a/core/libraries/joomla/filesystem/file.php b/core/libraries/joomla/filesystem/file.php
new file mode 100644
index 00000000..b161cde0
--- /dev/null
+++ b/core/libraries/joomla/filesystem/file.php
@@ -0,0 +1,660 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * A File handling class
+ *
+ * @since  11.1
+ */
+class JFile
+{
+	/**
+	 * Gets the extension of a file name
+	 *
+	 * @param   string  $file  The file name
+	 *
+	 * @return  string  The file extension
+	 *
+	 * @since   11.1
+	 */
+	public static function getExt($file)
+	{
+		$dot = strrpos($file, '.');
+
+		if ($dot === false)
+		{
+			return '';
+		}
+
+		return (string) substr($file, $dot + 1);
+	}
+
+	/**
+	 * Strips the last extension off of a file name
+	 *
+	 * @param   string  $file  The file name
+	 *
+	 * @return  string  The file name without the extension
+	 *
+	 * @since   11.1
+	 */
+	public static function stripExt($file)
+	{
+		return preg_replace('#\.[^.]*$#', '', $file);
+	}
+
+	/**
+	 * Makes file name safe to use
+	 *
+	 * @param   string  $file  The name of the file [not full path]
+	 *
+	 * @return  string  The sanitised string
+	 *
+	 * @since   11.1
+	 */
+	public static function makeSafe($file)
+	{
+		// Remove any trailing dots, as those aren't ever valid file names.
+		$file = rtrim($file, '.');
+
+		$regex = array('#(\.){2,}#', '#[^A-Za-z0-9\.\_\- ]#', '#^\.#');
+
+		return trim(preg_replace($regex, '', $file));
+	}
+
+	/**
+	 * Copies a file
+	 *
+	 * @param   string   $src          The path to the source file
+	 * @param   string   $dest         The path to the destination file
+	 * @param   string   $path         An optional base path to prefix to the file names
+	 * @param   boolean  $use_streams  True to use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function copy($src, $dest, $path = null, $use_streams = false)
+	{
+		$pathObject = new JFilesystemWrapperPath;
+
+		// Prepend a base path if it exists
+		if ($path)
+		{
+			$src = $pathObject->clean($path . '/' . $src);
+			$dest = $pathObject->clean($path . '/' . $dest);
+		}
+
+		// Check src path
+		if (!is_readable($src))
+		{
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_JFILE_FIND_COPY', $src), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if ($use_streams)
+		{
+			$stream = JFactory::getStream();
+
+			if (!$stream->copy($src, $dest))
+			{
+				JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_JFILE_STREAMS', $src, $dest, $stream->getError()), JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+		else
+		{
+			$FTPOptions = JClientHelper::getCredentials('ftp');
+
+			if ($FTPOptions['enabled'] == 1)
+			{
+				// Connect the FTP client
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+				// If the parent folder doesn't exist we must create it
+				if (!file_exists(dirname($dest)))
+				{
+					$folderObject = new JFilesystemWrapperFolder;
+					$folderObject->create(dirname($dest));
+				}
+
+				// Translate the destination path for the FTP account
+				$dest = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $dest), '/');
+
+				if (!$ftp->store($src, $dest))
+				{
+					// FTP connector throws an error
+					return false;
+				}
+
+				$ret = true;
+			}
+			else
+			{
+				if (!@ copy($src, $dest))
+				{
+					JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_COPY_FAILED_ERR01', $src, $dest), JLog::WARNING, 'jerror');
+
+					return false;
+				}
+
+				$ret = true;
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * Delete a file or array of files
+	 *
+	 * @param   mixed  $file  The file name or an array of file names
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function delete($file)
+	{
+		$FTPOptions = JClientHelper::getCredentials('ftp');
+		$pathObject = new JFilesystemWrapperPath;
+
+		if (is_array($file))
+		{
+			$files = $file;
+		}
+		else
+		{
+			$files[] = $file;
+		}
+
+		// Do NOT use ftp if it is not enabled
+		if ($FTPOptions['enabled'] == 1)
+		{
+			// Connect the FTP client
+			$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+		}
+
+		foreach ($files as $file)
+		{
+			$file = $pathObject->clean($file);
+
+			if (!is_file($file))
+			{
+				continue;
+			}
+
+			// Try making the file writable first. If it's read-only, it can't be deleted
+			// on Windows, even if the parent folder is writable
+			@chmod($file, 0777);
+
+			// In case of restricted permissions we zap it one way or the other
+			// as long as the owner is either the webserver or the ftp
+			if (@unlink($file))
+			{
+				// Do nothing
+			}
+			elseif ($FTPOptions['enabled'] == 1)
+			{
+				$file = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $file), '/');
+
+				if (!$ftp->delete($file))
+				{
+					// FTP connector throws an error
+
+					return false;
+				}
+			}
+			else
+			{
+				$filename = basename($file);
+				JLog::add(JText::sprintf('JLIB_FILESYSTEM_DELETE_FAILED', $filename), JLog::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Moves a file
+	 *
+	 * @param   string   $src          The path to the source file
+	 * @param   string   $dest         The path to the destination file
+	 * @param   string   $path         An optional base path to prefix to the file names
+	 * @param   boolean  $use_streams  True to use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function move($src, $dest, $path = '', $use_streams = false)
+	{
+		$pathObject = new JFilesystemWrapperPath;
+
+		if ($path)
+		{
+			$src = $pathObject->clean($path . '/' . $src);
+			$dest = $pathObject->clean($path . '/' . $dest);
+		}
+
+		// Check src path
+		if (!is_readable($src))
+		{
+			JLog::add(JText::_('JLIB_FILESYSTEM_CANNOT_FIND_SOURCE_FILE'), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if ($use_streams)
+		{
+			$stream = JFactory::getStream();
+
+			if (!$stream->move($src, $dest))
+			{
+				JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_JFILE_MOVE_STREAMS', $stream->getError()), JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+		else
+		{
+			$FTPOptions = JClientHelper::getCredentials('ftp');
+
+			if ($FTPOptions['enabled'] == 1)
+			{
+				// Connect the FTP client
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+				// Translate path for the FTP account
+				$src = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $src), '/');
+				$dest = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $dest), '/');
+
+				// Use FTP rename to simulate move
+				if (!$ftp->rename($src, $dest))
+				{
+					JLog::add(JText::_('JLIB_FILESYSTEM_ERROR_RENAME_FILE'), JLog::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+			else
+			{
+				if (!@ rename($src, $dest))
+				{
+					JLog::add(JText::_('JLIB_FILESYSTEM_ERROR_RENAME_FILE'), JLog::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Read the contents of a file
+	 *
+	 * @param   string   $filename   The full file path
+	 * @param   boolean  $incpath    Use include path
+	 * @param   integer  $amount     Amount of file to read
+	 * @param   integer  $chunksize  Size of chunks to read
+	 * @param   integer  $offset     Offset of the file
+	 *
+	 * @return  mixed  Returns file contents or boolean False if failed
+	 *
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use the native file_get_contents() instead.
+	 */
+	public static function read($filename, $incpath = false, $amount = 0, $chunksize = 8192, $offset = 0)
+	{
+		JLog::add(__METHOD__ . ' is deprecated. Use native file_get_contents() syntax.', JLog::WARNING, 'deprecated');
+
+		$data = null;
+
+		if ($amount && $chunksize > $amount)
+		{
+			$chunksize = $amount;
+		}
+
+		if (false === $fh = fopen($filename, 'rb', $incpath))
+		{
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_READ_UNABLE_TO_OPEN_FILE', $filename), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		clearstatcache();
+
+		if ($offset)
+		{
+			fseek($fh, $offset);
+		}
+
+		if ($fsize = @ filesize($filename))
+		{
+			if ($amount && $fsize > $amount)
+			{
+				$data = fread($fh, $amount);
+			}
+			else
+			{
+				$data = fread($fh, $fsize);
+			}
+		}
+		else
+		{
+			$data = '';
+
+			/*
+			 * While it's:
+			 * 1: Not the end of the file AND
+			 * 2a: No Max Amount set OR
+			 * 2b: The length of the data is less than the max amount we want
+			 */
+			while (!feof($fh) && (!$amount || strlen($data) < $amount))
+			{
+				$data .= fread($fh, $chunksize);
+			}
+		}
+
+		fclose($fh);
+
+		return $data;
+	}
+
+	/**
+	 * Write contents to a file
+	 *
+	 * @param   string   $file         The full file path
+	 * @param   string   $buffer       The buffer to write
+	 * @param   boolean  $use_streams  Use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function write($file, $buffer, $use_streams = false)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		// If the destination directory doesn't exist we need to create it
+		if (!file_exists(dirname($file)))
+		{
+			$folderObject = new JFilesystemWrapperFolder;
+
+			if ($folderObject->create(dirname($file)) == false)
+			{
+				return false;
+			}
+		}
+
+		if ($use_streams)
+		{
+			$stream = JFactory::getStream();
+
+			// Beef up the chunk size to a meg
+			$stream->set('chunksize', (1024 * 1024));
+
+			if (!$stream->writeFile($file, $buffer))
+			{
+				JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_WRITE_STREAMS', $file, $stream->getError()), JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+		else
+		{
+			$FTPOptions = JClientHelper::getCredentials('ftp');
+			$pathObject = new JFilesystemWrapperPath;
+
+			if ($FTPOptions['enabled'] == 1)
+			{
+				// Connect the FTP client
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+				// Translate path for the FTP account and use FTP write buffer to file
+				$file = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $file), '/');
+				$ret = $ftp->write($file, $buffer);
+			}
+			else
+			{
+				$file = $pathObject->clean($file);
+				$ret = is_int(file_put_contents($file, $buffer)) ? true : false;
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * Append contents to a file
+	 *
+	 * @param   string   $file         The full file path
+	 * @param   string   $buffer       The buffer to write
+	 * @param   boolean  $use_streams  Use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.6.0
+	 */
+	public static function append($file, $buffer, $use_streams = false)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		// If the file doesn't exist, just write instead of append
+		if (!file_exists($file))
+		{
+			return self::write($file, $buffer, $use_streams);
+		}
+
+		if ($use_streams)
+		{
+			$stream = JFactory::getStream();
+
+			// Beef up the chunk size to a meg
+			$stream->set('chunksize', (1024 * 1024));
+
+			if ($stream->open($file, 'ab') && $stream->write($buffer) && $stream->close())
+			{
+				return true;
+			}
+
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_WRITE_STREAMS', $file, $stream->getError()), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+		else
+		{
+			// Initialise variables.
+			$FTPOptions = JClientHelper::getCredentials('ftp');
+
+			if ($FTPOptions['enabled'] == 1)
+			{
+				// Connect the FTP client
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+				// Translate path for the FTP account and use FTP write buffer to file
+				$file = JPath::clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $file), '/');
+				$ret = $ftp->append($file, $buffer);
+			}
+			else
+			{
+				$file = JPath::clean($file);
+				$ret = is_int(file_put_contents($file, $buffer, FILE_APPEND));
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * Moves an uploaded file to a destination folder
+	 *
+	 * @param   string   $src              The name of the php (temporary) uploaded file
+	 * @param   string   $dest             The path (including filename) to move the uploaded file to
+	 * @param   boolean  $use_streams      True to use streams
+	 * @param   boolean  $allow_unsafe     Allow the upload of unsafe files
+	 * @param   boolean  $safeFileOptions  Options to JFilterInput::isSafeFile
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function upload($src, $dest, $use_streams = false, $allow_unsafe = false, $safeFileOptions = array())
+	{
+		if (!$allow_unsafe)
+		{
+			$descriptor = array(
+				'tmp_name' => $src,
+				'name'     => basename($dest),
+				'type'     => '',
+				'error'    => '',
+				'size'     => '',
+			);
+
+			$isSafe = JFilterInput::isSafeFile($descriptor, $safeFileOptions);
+
+			if (!$isSafe)
+			{
+				JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_WARNFS_ERR03', $dest), JLog::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+
+		// Ensure that the path is valid and clean
+		$pathObject = new JFilesystemWrapperPath;
+		$dest = $pathObject->clean($dest);
+
+		// Create the destination directory if it does not exist
+		$baseDir = dirname($dest);
+
+		if (!file_exists($baseDir))
+		{
+			$folderObject = new JFilesystemWrapperFolder;
+			$folderObject->create($baseDir);
+		}
+
+		if ($use_streams)
+		{
+			$stream = JFactory::getStream();
+
+			if (!$stream->upload($src, $dest))
+			{
+				JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_UPLOAD', $stream->getError()), JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+		else
+		{
+			$FTPOptions = JClientHelper::getCredentials('ftp');
+			$ret = false;
+
+			if ($FTPOptions['enabled'] == 1)
+			{
+				// Connect the FTP client
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+				// Translate path for the FTP account
+				$dest = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $dest), '/');
+
+				// Copy the file to the destination directory
+				if (is_uploaded_file($src) && $ftp->store($src, $dest))
+				{
+					unlink($src);
+					$ret = true;
+				}
+				else
+				{
+					JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_WARNFS_ERR04', $src, $dest), JLog::WARNING, 'jerror');
+				}
+			}
+			else
+			{
+				if (is_writeable($baseDir) && move_uploaded_file($src, $dest))
+				{
+					// Short circuit to prevent file permission errors
+					if ($pathObject->setPermissions($dest))
+					{
+						$ret = true;
+					}
+					else
+					{
+						JLog::add(JText::_('JLIB_FILESYSTEM_ERROR_WARNFS_ERR01'), JLog::WARNING, 'jerror');
+					}
+				}
+				else
+				{
+					JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_WARNFS_ERR04', $src, $dest), JLog::WARNING, 'jerror');
+				}
+			}
+
+			return $ret;
+		}
+	}
+
+	/**
+	 * Wrapper for the standard file_exists function
+	 *
+	 * @param   string  $file  File path
+	 *
+	 * @return  boolean  True if path is a file
+	 *
+	 * @since   11.1
+	 */
+	public static function exists($file)
+	{
+		$pathObject = new JFilesystemWrapperPath;
+
+		return is_file($pathObject->clean($file));
+	}
+
+	/**
+	 * Returns the name, without any path.
+	 *
+	 * @param   string  $file  File path
+	 *
+	 * @return  string  filename
+	 *
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use basename() instead.
+	 */
+	public static function getName($file)
+	{
+		JLog::add(__METHOD__ . ' is deprecated. Use native basename() syntax.', JLog::WARNING, 'deprecated');
+
+		// Convert back slashes to forward slashes
+		$file = str_replace('\\', '/', $file);
+		$slash = strrpos($file, '/');
+
+		if ($slash !== false)
+		{
+			return substr($file, $slash + 1);
+		}
+		else
+		{
+			return $file;
+		}
+	}
+}
diff --git a/core/libraries/joomla/filesystem/folder.php b/core/libraries/joomla/filesystem/folder.php
new file mode 100644
index 00000000..76db95ce
--- /dev/null
+++ b/core/libraries/joomla/filesystem/folder.php
@@ -0,0 +1,722 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * A Folder handling class
+ *
+ * @since  11.1
+ */
+abstract class JFolder
+{
+	/**
+	 * Copy a folder.
+	 *
+	 * @param   string   $src          The path to the source folder.
+	 * @param   string   $dest         The path to the destination folder.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $force        Force copy.
+	 * @param   boolean  $use_streams  Optionally force folder/file overwrites.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public static function copy($src, $dest, $path = '', $force = false, $use_streams = false)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		$FTPOptions = JClientHelper::getCredentials('ftp');
+		$pathObject = new JFilesystemWrapperPath;
+
+		if ($path)
+		{
+			$src  = $pathObject->clean($path . '/' . $src);
+			$dest = $pathObject->clean($path . '/' . $dest);
+		}
+
+		// Eliminate trailing directory separators, if any
+		$src = rtrim($src, DIRECTORY_SEPARATOR);
+		$dest = rtrim($dest, DIRECTORY_SEPARATOR);
+
+		if (!self::exists($src))
+		{
+			throw new RuntimeException('Source folder not found', -1);
+		}
+
+		if (self::exists($dest) && !$force)
+		{
+			throw new RuntimeException('Destination folder already exists', -1);
+		}
+
+		// Make sure the destination exists
+		if (!self::create($dest))
+		{
+			throw new RuntimeException('Cannot create destination folder', -1);
+		}
+
+		// If we're using ftp and don't have streams enabled
+		if ($FTPOptions['enabled'] == 1 && !$use_streams)
+		{
+			// Connect the FTP client
+			$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+			if (!($dh = @opendir($src)))
+			{
+				throw new RuntimeException('Cannot open source folder', -1);
+			}
+			// Walk through the directory copying files and recursing into folders.
+			while (($file = readdir($dh)) !== false)
+			{
+				$sfid = $src . '/' . $file;
+				$dfid = $dest . '/' . $file;
+
+				switch (filetype($sfid))
+				{
+					case 'dir':
+						if ($file != '.' && $file != '..')
+						{
+							$ret = self::copy($sfid, $dfid, null, $force);
+
+							if ($ret !== true)
+							{
+								return $ret;
+							}
+						}
+						break;
+
+					case 'file':
+						// Translate path for the FTP account
+						$dfid = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $dfid), '/');
+
+						if (!$ftp->store($sfid, $dfid))
+						{
+							throw new RuntimeException('Copy file failed', -1);
+						}
+						break;
+				}
+			}
+		}
+		else
+		{
+			if (!($dh = @opendir($src)))
+			{
+				throw new RuntimeException('Cannot open source folder', -1);
+			}
+			// Walk through the directory copying files and recursing into folders.
+			while (($file = readdir($dh)) !== false)
+			{
+				$sfid = $src . '/' . $file;
+				$dfid = $dest . '/' . $file;
+
+				switch (filetype($sfid))
+				{
+					case 'dir':
+						if ($file != '.' && $file != '..')
+						{
+							$ret = self::copy($sfid, $dfid, null, $force, $use_streams);
+
+							if ($ret !== true)
+							{
+								return $ret;
+							}
+						}
+						break;
+
+					case 'file':
+						if ($use_streams)
+						{
+							$stream = JFactory::getStream();
+
+							if (!$stream->copy($sfid, $dfid))
+							{
+								throw new RuntimeException('Cannot copy file: ' . $stream->getError(), -1);
+							}
+						}
+						else
+						{
+							if (!@copy($sfid, $dfid))
+							{
+								throw new RuntimeException('Copy file failed', -1);
+							}
+						}
+						break;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Create a folder -- and all necessary parent folders.
+	 *
+	 * @param   string   $path  A path to create from the base path.
+	 * @param   integer  $mode  Directory permissions to set for folders created. 0755 by default.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @since   11.1
+	 */
+	public static function create($path = '', $mode = 0755)
+	{
+		$FTPOptions = JClientHelper::getCredentials('ftp');
+		static $nested = 0;
+
+		// Check to make sure the path valid and clean
+		$pathObject = new JFilesystemWrapperPath;
+		$path = $pathObject->clean($path);
+
+		// Check if parent dir exists
+		$parent = dirname($path);
+
+		if (!self::exists($parent))
+		{
+			// Prevent infinite loops!
+			$nested++;
+
+			if (($nested > 20) || ($parent == $path))
+			{
+				JLog::add(__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_LOOP'), JLog::WARNING, 'jerror');
+				$nested--;
+
+				return false;
+			}
+
+			// Create the parent directory
+			if (self::create($parent, $mode) !== true)
+			{
+				// JFolder::create throws an error
+				$nested--;
+
+				return false;
+			}
+
+			// OK, parent directory has been created
+			$nested--;
+		}
+
+		// Check if dir already exists
+		if (self::exists($path))
+		{
+			return true;
+		}
+
+		// Check for safe mode
+		if ($FTPOptions['enabled'] == 1)
+		{
+			// Connect the FTP client
+			$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+			// Translate path to FTP path
+			$path = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $path), '/');
+			$ret = $ftp->mkdir($path);
+			$ftp->chmod($path, $mode);
+		}
+		else
+		{
+			// We need to get and explode the open_basedir paths
+			$obd = ini_get('open_basedir');
+
+			// If open_basedir is set we need to get the open_basedir that the path is in
+			if ($obd != null)
+			{
+				if (IS_WIN)
+				{
+					$obdSeparator = ';';
+				}
+				else
+				{
+					$obdSeparator = ':';
+				}
+
+				// Create the array of open_basedir paths
+				$obdArray = explode($obdSeparator, $obd);
+				$inBaseDir = false;
+
+				// Iterate through open_basedir paths looking for a match
+				foreach ($obdArray as $test)
+				{
+					$test = $pathObject->clean($test);
+
+					if (strpos($path, $test) === 0 || strpos($path, realpath($test)) === 0)
+					{
+						$inBaseDir = true;
+						break;
+					}
+				}
+
+				if ($inBaseDir == false)
+				{
+					// Return false for JFolder::create because the path to be created is not in open_basedir
+					JLog::add(__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_PATH'), JLog::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+
+			// First set umask
+			$origmask = @umask(0);
+
+			// Create the path
+			if (!$ret = @mkdir($path, $mode))
+			{
+				@umask($origmask);
+				JLog::add(
+					__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_COULD_NOT_CREATE_DIRECTORY') . 'Path: ' . $path, JLog::WARNING, 'jerror'
+				);
+
+				return false;
+			}
+
+			// Reset umask
+			@umask($origmask);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Delete a folder.
+	 *
+	 * @param   string  $path  The path to the folder to delete.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public static function delete($path)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+		$pathObject = new JFilesystemWrapperPath;
+
+		// Sanity check
+		if (!$path)
+		{
+			// Bad programmer! Bad Bad programmer!
+			JLog::add(__METHOD__ . ': ' . JText::_('JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY'), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$FTPOptions = JClientHelper::getCredentials('ftp');
+
+		// Check to make sure the path valid and clean
+		$path = $pathObject->clean($path);
+
+		// Is this really a folder?
+		if (!is_dir($path))
+		{
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Remove all the files in folder if they exist; disable all filtering
+		$files = self::files($path, '.', false, true, array(), array());
+
+		if (!empty($files))
+		{
+			$file = new JFilesystemWrapperFile;
+
+			if ($file->delete($files) !== true)
+			{
+				// JFile::delete throws an error
+				return false;
+			}
+		}
+
+		// Remove sub-folders of folder; disable all filtering
+		$folders = self::folders($path, '.', false, true, array(), array());
+
+		foreach ($folders as $folder)
+		{
+			if (is_link($folder))
+			{
+				// Don't descend into linked directories, just delete the link.
+				$file = new JFilesystemWrapperFile;
+
+				if ($file->delete($folder) !== true)
+				{
+					// JFile::delete throws an error
+					return false;
+				}
+			}
+			elseif (self::delete($folder) !== true)
+			{
+				// JFolder::delete throws an error
+				return false;
+			}
+		}
+
+		if ($FTPOptions['enabled'] == 1)
+		{
+			// Connect the FTP client
+			$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+		}
+
+		// In case of restricted permissions we zap it one way or the other
+		// as long as the owner is either the webserver or the ftp.
+		if (@rmdir($path))
+		{
+			$ret = true;
+		}
+		elseif ($FTPOptions['enabled'] == 1)
+		{
+			// Translate path and delete
+			$path = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $path), '/');
+
+			// FTP connector throws an error
+			$ret = $ftp->delete($path);
+		}
+		else
+		{
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_FOLDER_DELETE', $path), JLog::WARNING, 'jerror');
+			$ret = false;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Moves a folder.
+	 *
+	 * @param   string   $src          The path to the source folder.
+	 * @param   string   $dest         The path to the destination folder.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $use_streams  Optionally use streams.
+	 *
+	 * @return  mixed  Error message on false or boolean true on success.
+	 *
+	 * @since   11.1
+	 */
+	public static function move($src, $dest, $path = '', $use_streams = false)
+	{
+		$FTPOptions = JClientHelper::getCredentials('ftp');
+		$pathObject = new JFilesystemWrapperPath;
+
+		if ($path)
+		{
+			$src = $pathObject->clean($path . '/' . $src);
+			$dest = $pathObject->clean($path . '/' . $dest);
+		}
+
+		if (!self::exists($src))
+		{
+			return JText::_('JLIB_FILESYSTEM_ERROR_FIND_SOURCE_FOLDER');
+		}
+
+		if (self::exists($dest))
+		{
+			return JText::_('JLIB_FILESYSTEM_ERROR_FOLDER_EXISTS');
+		}
+
+		if ($use_streams)
+		{
+			$stream = JFactory::getStream();
+
+			if (!$stream->move($src, $dest))
+			{
+				return JText::sprintf('JLIB_FILESYSTEM_ERROR_FOLDER_RENAME', $stream->getError());
+			}
+
+			$ret = true;
+		}
+		else
+		{
+			if ($FTPOptions['enabled'] == 1)
+			{
+				// Connect the FTP client
+				$ftp = JClientFtp::getInstance($FTPOptions['host'], $FTPOptions['port'], array(), $FTPOptions['user'], $FTPOptions['pass']);
+
+				// Translate path for the FTP account
+				$src = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $src), '/');
+				$dest = $pathObject->clean(str_replace(JPATH_ROOT, $FTPOptions['root'], $dest), '/');
+
+				// Use FTP rename to simulate move
+				if (!$ftp->rename($src, $dest))
+				{
+					return JText::_('JLIB_FILESYSTEM_ERROR_RENAME_FILE');
+				}
+
+				$ret = true;
+			}
+			else
+			{
+				if (!@rename($src, $dest))
+				{
+					return JText::_('JLIB_FILESYSTEM_ERROR_RENAME_FILE');
+				}
+
+				$ret = true;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Wrapper for the standard file_exists function
+	 *
+	 * @param   string  $path  Folder name relative to installation dir
+	 *
+	 * @return  boolean  True if path is a folder
+	 *
+	 * @since   11.1
+	 */
+	public static function exists($path)
+	{
+		$pathObject = new JFilesystemWrapperPath;
+
+		return is_dir($pathObject->clean($path));
+	}
+
+	/**
+	 * Utility function to read the files in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for file names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the file.
+	 * @param   array    $exclude        Array with names of files which should not be shown in the result.
+	 * @param   array    $excludefilter  Array of filter to exclude
+	 * @param   boolean  $naturalSort    False for asort, true for natsort
+	 *
+	 * @return  array  Files in the given folder.
+	 *
+	 * @since   11.1
+	 */
+	public static function files($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*', '.*~'), $naturalSort = false)
+	{
+		// Check to make sure the path valid and clean
+		$pathObject = new JFilesystemWrapperPath;
+		$path = $pathObject->clean($path);
+
+		// Is the path a folder?
+		if (!is_dir($path))
+		{
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES', $path), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Compute the excludefilter string
+		if (count($excludefilter))
+		{
+			$excludefilter_string = '/(' . implode('|', $excludefilter) . ')/';
+		}
+		else
+		{
+			$excludefilter_string = '';
+		}
+
+		// Get the files
+		$arr = self::_items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, true);
+
+		// Sort the files based on either natural or alpha method
+		if ($naturalSort)
+		{
+			natsort($arr);
+		}
+		else
+		{
+			asort($arr);
+		}
+
+		return array_values($arr);
+	}
+
+	/**
+	 * Utility function to read the folders in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for folder names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the folders.
+	 * @param   array    $exclude        Array with names of folders which should not be shown in the result.
+	 * @param   array    $excludefilter  Array with regular expressions matching folders which should not be shown in the result.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @since   11.1
+	 */
+	public static function folders($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*'))
+	{
+		// Check to make sure the path valid and clean
+		$pathObject = new JFilesystemWrapperPath;
+		$path = $pathObject->clean($path);
+
+		// Is the path a folder?
+		if (!is_dir($path))
+		{
+			JLog::add(JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FOLDER', $path), JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Compute the excludefilter string
+		if (count($excludefilter))
+		{
+			$excludefilter_string = '/(' . implode('|', $excludefilter) . ')/';
+		}
+		else
+		{
+			$excludefilter_string = '';
+		}
+
+		// Get the folders
+		$arr = self::_items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, false);
+
+		// Sort the folders
+		asort($arr);
+
+		return array_values($arr);
+	}
+
+	/**
+	 * Function to read the files/folders in a folder.
+	 *
+	 * @param   string   $path                  The path of the folder to read.
+	 * @param   string   $filter                A filter for file names.
+	 * @param   mixed    $recurse               True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full                  True to return the full path to the file.
+	 * @param   array    $exclude               Array with names of files which should not be shown in the result.
+	 * @param   string   $excludefilter_string  Regexp of files to exclude
+	 * @param   boolean  $findfiles             True to read the files, false to read the folders
+	 *
+	 * @return  array  Files.
+	 *
+	 * @since   11.1
+	 */
+	protected static function _items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, $findfiles)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		$arr = array();
+
+		// Read the source directory
+		if (!($handle = @opendir($path)))
+		{
+			return $arr;
+		}
+
+		while (($file = readdir($handle)) !== false)
+		{
+			if ($file != '.' && $file != '..' && !in_array($file, $exclude)
+				&& (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
+			{
+				// Compute the fullpath
+				$fullpath = $path . '/' . $file;
+
+				// Compute the isDir flag
+				$isDir = is_dir($fullpath);
+
+				if (($isDir xor $findfiles) && preg_match("/$filter/", $file))
+				{
+					// (fullpath is dir and folders are searched or fullpath is not dir and files are searched) and file matches the filter
+					if ($full)
+					{
+						// Full path is requested
+						$arr[] = $fullpath;
+					}
+					else
+					{
+						// Filename is requested
+						$arr[] = $file;
+					}
+				}
+
+				if ($isDir && $recurse)
+				{
+					// Search recursively
+					if (is_int($recurse))
+					{
+						// Until depth 0 is reached
+						$arr = array_merge($arr, self::_items($fullpath, $filter, $recurse - 1, $full, $exclude, $excludefilter_string, $findfiles));
+					}
+					else
+					{
+						$arr = array_merge($arr, self::_items($fullpath, $filter, $recurse, $full, $exclude, $excludefilter_string, $findfiles));
+					}
+				}
+			}
+		}
+
+		closedir($handle);
+
+		return $arr;
+	}
+
+	/**
+	 * Lists folder in format suitable for tree display.
+	 *
+	 * @param   string   $path      The path of the folder to read.
+	 * @param   string   $filter    A filter for folder names.
+	 * @param   integer  $maxLevel  The maximum number of levels to recursively read, defaults to three.
+	 * @param   integer  $level     The current level, optional.
+	 * @param   integer  $parent    Unique identifier of the parent folder, if any.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @since   11.1
+	 */
+	public static function listFolderTree($path, $filter, $maxLevel = 3, $level = 0, $parent = 0)
+	{
+		$dirs = array();
+
+		if ($level == 0)
+		{
+			$GLOBALS['_JFolder_folder_tree_index'] = 0;
+		}
+
+		if ($level < $maxLevel)
+		{
+			$folders    = self::folders($path, $filter);
+			$pathObject = new JFilesystemWrapperPath;
+
+			// First path, index foldernames
+			foreach ($folders as $name)
+			{
+				$id = ++$GLOBALS['_JFolder_folder_tree_index'];
+				$fullName = $pathObject->clean($path . '/' . $name);
+				$dirs[] = array(
+					'id' => $id,
+					'parent' => $parent,
+					'name' => $name,
+					'fullname' => $fullName,
+					'relname' => str_replace(JPATH_ROOT, '', $fullName),
+				);
+				$dirs2 = self::listFolderTree($fullName, $filter, $maxLevel, $level + 1, $id);
+				$dirs = array_merge($dirs, $dirs2);
+			}
+		}
+
+		return $dirs;
+	}
+
+	/**
+	 * Makes path name safe to use.
+	 *
+	 * @param   string  $path  The full path to sanitise.
+	 *
+	 * @return  string  The sanitised string.
+	 *
+	 * @since   11.1
+	 */
+	public static function makeSafe($path)
+	{
+		$regex = array('#[^A-Za-z0-9_\\\/\(\)\[\]\{\}\#\$\^\+\.\'~`!@&=;,-]#');
+
+		return preg_replace($regex, '', $path);
+	}
+}
diff --git a/core/libraries/joomla/filesystem/helper.php b/core/libraries/joomla/filesystem/helper.php
new file mode 100644
index 00000000..c66bce33
--- /dev/null
+++ b/core/libraries/joomla/filesystem/helper.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * File system helper
+ *
+ * Holds support functions for the filesystem, particularly the stream
+ *
+ * @since  11.1
+ */
+class JFilesystemHelper
+{
+	/**
+	 * Remote file size function for streams that don't support it
+	 *
+	 * @param   string  $url  TODO Add text
+	 *
+	 * @return  mixed
+	 *
+	 * @link    https://secure.php.net/manual/en/function.filesize.php#71098
+	 * @since   11.1
+	 */
+	public static function remotefsize($url)
+	{
+		$sch = parse_url($url, PHP_URL_SCHEME);
+
+		if (($sch != 'http') && ($sch != 'https') && ($sch != 'ftp') && ($sch != 'ftps'))
+		{
+			return false;
+		}
+
+		if (($sch == 'http') || ($sch == 'https'))
+		{
+			$headers = get_headers($url, 1);
+
+			if ((!array_key_exists('Content-Length', $headers)))
+			{
+				return false;
+			}
+
+			return $headers['Content-Length'];
+		}
+
+		if (($sch == 'ftp') || ($sch == 'ftps'))
+		{
+			$server = parse_url($url, PHP_URL_HOST);
+			$port = parse_url($url, PHP_URL_PORT);
+			$path = parse_url($url, PHP_URL_PATH);
+			$user = parse_url($url, PHP_URL_USER);
+			$pass = parse_url($url, PHP_URL_PASS);
+
+			if ((!$server) || (!$path))
+			{
+				return false;
+			}
+
+			if (!$port)
+			{
+				$port = 21;
+			}
+
+			if (!$user)
+			{
+				$user = 'anonymous';
+			}
+
+			if (!$pass)
+			{
+				$pass = '';
+			}
+
+			switch ($sch)
+			{
+				case 'ftp':
+					$ftpid = ftp_connect($server, $port);
+					break;
+
+				case 'ftps':
+					$ftpid = ftp_ssl_connect($server, $port);
+					break;
+			}
+
+			if (!$ftpid)
+			{
+				return false;
+			}
+
+			$login = ftp_login($ftpid, $user, $pass);
+
+			if (!$login)
+			{
+				return false;
+			}
+
+			$ftpsize = ftp_size($ftpid, $path);
+			ftp_close($ftpid);
+
+			if ($ftpsize == -1)
+			{
+				return false;
+			}
+
+			return $ftpsize;
+		}
+	}
+
+	/**
+	 * Quick FTP chmod
+	 *
+	 * @param   string   $url   Link identifier
+	 * @param   integer  $mode  The new permissions, given as an octal value.
+	 *
+	 * @return  mixed
+	 *
+	 * @link    https://secure.php.net/manual/en/function.ftp-chmod.php
+	 * @since   11.1
+	 */
+	public static function ftpChmod($url, $mode)
+	{
+		$sch = parse_url($url, PHP_URL_SCHEME);
+
+		if (($sch != 'ftp') && ($sch != 'ftps'))
+		{
+			return false;
+		}
+
+		$server = parse_url($url, PHP_URL_HOST);
+		$port = parse_url($url, PHP_URL_PORT);
+		$path = parse_url($url, PHP_URL_PATH);
+		$user = parse_url($url, PHP_URL_USER);
+		$pass = parse_url($url, PHP_URL_PASS);
+
+		if ((!$server) || (!$path))
+		{
+			return false;
+		}
+
+		if (!$port)
+		{
+			$port = 21;
+		}
+
+		if (!$user)
+		{
+			$user = 'anonymous';
+		}
+
+		if (!$pass)
+		{
+			$pass = '';
+		}
+
+		switch ($sch)
+		{
+			case 'ftp':
+				$ftpid = ftp_connect($server, $port);
+				break;
+
+			case 'ftps':
+				$ftpid = ftp_ssl_connect($server, $port);
+				break;
+		}
+
+		if (!$ftpid)
+		{
+			return false;
+		}
+
+		$login = ftp_login($ftpid, $user, $pass);
+
+		if (!$login)
+		{
+			return false;
+		}
+
+		$res = ftp_chmod($ftpid, $mode, $path);
+		ftp_close($ftpid);
+
+		return $res;
+	}
+
+	/**
+	 * Modes that require a write operation
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public static function getWriteModes()
+	{
+		return array('w', 'w+', 'a', 'a+', 'r+', 'x', 'x+');
+	}
+
+	/**
+	 * Stream and Filter Support Operations
+	 *
+	 * Returns the supported streams, in addition to direct file access
+	 * Also includes Joomla! streams as well as PHP streams
+	 *
+	 * @return  array  Streams
+	 *
+	 * @since   11.1
+	 */
+	public static function getSupported()
+	{
+		// Really quite cool what php can do with arrays when you let it...
+		static $streams;
+
+		if (!$streams)
+		{
+			$streams = array_merge(stream_get_wrappers(), self::getJStreams());
+		}
+
+		return $streams;
+	}
+
+	/**
+	 * Returns a list of transports
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public static function getTransports()
+	{
+		// Is this overkill?
+		return stream_get_transports();
+	}
+
+	/**
+	 * Returns a list of filters
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public static function getFilters()
+	{
+		// Note: This will look like the getSupported() function with J! filters.
+		// TODO: add user space filter loading like user space stream loading
+		return stream_get_filters();
+	}
+
+	/**
+	 * Returns a list of J! streams
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public static function getJStreams()
+	{
+		static $streams = array();
+
+		if (!$streams)
+		{
+			$files = new DirectoryIterator(__DIR__ . '/streams');
+
+			/* @type  $file  DirectoryIterator */
+			foreach ($files as $file)
+			{
+				// Only load for php files.
+				if (!$file->isFile() || $file->getExtension() !== 'php')
+				{
+					continue;
+				}
+
+				$streams[] = $file->getBasename('.php');
+			}
+		}
+
+		return $streams;
+	}
+
+	/**
+	 * Determine if a stream is a Joomla stream.
+	 *
+	 * @param   string  $streamname  The name of a stream
+	 *
+	 * @return  boolean  True for a Joomla Stream
+	 *
+	 * @since   11.1
+	 */
+	public static function isJoomlaStream($streamname)
+	{
+		return in_array($streamname, self::getJStreams());
+	}
+
+	/**
+	 * Calculates the maximum upload file size and returns string with unit or the size in bytes
+	 *
+	 * Call it with JFilesystemHelper::fileUploadMaxSize();
+	 *
+	 * @param   bool  $unit_output  This parameter determines whether the return value should be a string with a unit
+	 *
+	 * @return  float|string The maximum upload size of files with the appropriate unit or in bytes
+	 *
+	 * @since   3.4
+	 */
+	public static function fileUploadMaxSize($unit_output = true)
+	{
+		static $max_size = false;
+		static $output_type = true;
+
+		if ($max_size === false || $output_type != $unit_output)
+		{
+			$max_size   = self::parseSize(ini_get('post_max_size'));
+			$upload_max = self::parseSize(ini_get('upload_max_filesize'));
+
+			if ($upload_max > 0 && ($upload_max < $max_size || $max_size == 0))
+			{
+				$max_size = $upload_max;
+			}
+
+			if ($unit_output == true)
+			{
+				$max_size = self::parseSizeUnit($max_size);
+			}
+
+			$output_type = $unit_output;
+		}
+
+		return $max_size;
+	}
+
+	/**
+	 * Returns the size in bytes without the unit for the comparison
+	 *
+	 * @param   string  $size  The size which is received from the PHP settings
+	 *
+	 * @return  float The size in bytes without the unit
+	 *
+	 * @since   3.4
+	 */
+	private static function parseSize($size)
+	{
+		$unit = preg_replace('/[^bkmgtpezy]/i', '', $size);
+		$size = preg_replace('/[^0-9\.]/', '', $size);
+
+		$return = round($size);
+
+		if ($unit)
+		{
+			$return = round($size * pow(1024, stripos('bkmgtpezy', $unit[0])));
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Creates the rounded size of the size with the appropriate unit
+	 *
+	 * @param   float  $max_size  The maximum size which is allowed for the uploads
+	 *
+	 * @return  string String with the size and the appropriate unit
+	 *
+	 * @since   3.4
+	 */
+	private static function parseSizeUnit($max_size)
+	{
+		$base     = log($max_size) / log(1024);
+		$suffixes = array('', 'k', 'M', 'G', 'T');
+
+		return round(pow(1024, $base - floor($base)), 0) . $suffixes[floor($base)];
+	}
+}
diff --git a/core/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini b/core/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
new file mode 100644
index 00000000..a78e0e32
--- /dev/null
+++ b/core/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+JLIB_FILESYSTEM_PATCHER_FAILED_VERIFY="Failed source verification of file %s at line %d"
+JLIB_FILESYSTEM_PATCHER_INVALID_DIFF="Invalid unified diff block"
+JLIB_FILESYSTEM_PATCHER_INVALID_INPUT="Invalid input"
+JLIB_FILESYSTEM_PATCHER_UNEXISING_SOURCE="Unexisting source file"
+JLIB_FILESYSTEM_PATCHER_UNEXPECTED_ADD_LINE="Unexpected add line at line %d'"
+JLIB_FILESYSTEM_PATCHER_UNEXPECTED_EOF="Unexpected end of file"
+JLIB_FILESYSTEM_PATCHER_UNEXPECTED_REMOVE_LINE="Unexpected remove line at line %d"
+
diff --git a/core/libraries/joomla/filesystem/patcher.php b/core/libraries/joomla/filesystem/patcher.php
new file mode 100644
index 00000000..cd3138a2
--- /dev/null
+++ b/core/libraries/joomla/filesystem/patcher.php
@@ -0,0 +1,532 @@
+<?php
+
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+
+/**
+ * A Unified Diff Format Patcher class
+ *
+ * @link   http://sourceforge.net/projects/phppatcher/ This has been derived from the PhpPatcher version 0.1.1 written by Giuseppe Mazzotta
+ * @since  12.1
+ */
+class JFilesystemPatcher
+{
+	/**
+	 * Regular expression for searching source files
+	 */
+	const SRC_FILE = '/^---\\s+(\\S+)\s+\\d{1,4}-\\d{1,2}-\\d{1,2}\\s+\\d{1,2}:\\d{1,2}:\\d{1,2}(\\.\\d+)?\\s+(\+|-)\\d{4}/A';
+
+	/**
+	 * Regular expression for searching destination files
+	 */
+	const DST_FILE = '/^\\+\\+\\+\\s+(\\S+)\s+\\d{1,4}-\\d{1,2}-\\d{1,2}\\s+\\d{1,2}:\\d{1,2}:\\d{1,2}(\\.\\d+)?\\s+(\+|-)\\d{4}/A';
+
+	/**
+	 * Regular expression for searching hunks of differences
+	 */
+	const HUNK = '/@@ -(\\d+)(,(\\d+))?\\s+\\+(\\d+)(,(\\d+))?\\s+@@($)/A';
+
+	/**
+	 * Regular expression for splitting lines
+	 */
+	const SPLIT = '/(\r\n)|(\r)|(\n)/';
+
+	/**
+	 * @var    array  sources files
+	 * @since  12.1
+	 */
+	protected $sources = array();
+
+	/**
+	 * @var    array  destination files
+	 * @since  12.1
+	 */
+	protected $destinations = array();
+
+	/**
+	 * @var    array  removal files
+	 * @since  12.1
+	 */
+	protected $removals = array();
+
+	/**
+	 * @var    array  patches
+	 * @since  12.1
+	 */
+	protected $patches = array();
+
+	/**
+	 * @var    array  instance of this class
+	 * @since  12.1
+	 */
+	protected static $instance;
+
+	/**
+	 * Constructor
+	 *
+	 * The constructor is protected to force the use of JFilesystemPatcher::getInstance()
+	 *
+	 * @since   12.1
+	 */
+	protected function __construct()
+	{
+	}
+
+	/**
+	 * Method to get a patcher
+	 *
+	 * @return  JFilesystemPatcher  an instance of the patcher
+	 *
+	 * @since   12.1
+	 */
+	public static function getInstance()
+	{
+		if (!isset(static::$instance))
+		{
+			static::$instance = new static;
+		}
+
+		return static::$instance;
+	}
+
+	/**
+	 * Reset the pacher
+	 *
+	 * @return  JFilesystemPatcher  This object for chaining
+	 *
+	 * @since   12.1
+	 */
+	public function reset()
+	{
+		$this->sources = array();
+		$this->destinations = array();
+		$this->removals = array();
+		$this->patches = array();
+
+		return $this;
+	}
+
+	/**
+	 * Apply the patches
+	 *
+	 * @return  integer  The number of files patched
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function apply()
+	{
+		foreach ($this->patches as $patch)
+		{
+			// Separate the input into lines
+			$lines = self::splitLines($patch['udiff']);
+
+			// Loop for each header
+			while (self::findHeader($lines, $src, $dst))
+			{
+				$done = false;
+
+				$regex = '#^([^/]*/)*#';
+				if ($patch['strip'] !== null)
+				{
+					$regex = '#^([^/]*/){' . (int) $patch['strip'] . '}#';
+				}
+
+				$src = $patch['root'] . preg_replace($regex, '', $src);
+				$dst = $patch['root'] . preg_replace($regex, '', $dst);
+
+				// Loop for each hunk of differences
+				while (self::findHunk($lines, $src_line, $src_size, $dst_line, $dst_size))
+				{
+					$done = true;
+
+					// Apply the hunk of differences
+					$this->applyHunk($lines, $src, $dst, $src_line, $src_size, $dst_line, $dst_size);
+				}
+
+				// If no modifications were found, throw an exception
+				if (!$done)
+				{
+					throw new RuntimeException('Invalid Diff');
+				}
+			}
+		}
+
+		// Initialize the counter
+		$done = 0;
+
+		// Patch each destination file
+		foreach ($this->destinations as $file => $content)
+		{
+			$buffer = implode("\n", $content);
+
+			if (JFile::write($file, $buffer))
+			{
+				if (isset($this->sources[$file]))
+				{
+					$this->sources[$file] = $content;
+				}
+
+				$done++;
+			}
+		}
+
+		// Remove each removed file
+		foreach ($this->removals as $file)
+		{
+			if (JFile::delete($file))
+			{
+				if (isset($this->sources[$file]))
+				{
+					unset($this->sources[$file]);
+				}
+
+				$done++;
+			}
+		}
+
+		// Clear the destinations cache
+		$this->destinations = array();
+
+		// Clear the removals
+		$this->removals = array();
+
+		// Clear the patches
+		$this->patches = array();
+
+		return $done;
+	}
+
+	/**
+	 * Add a unified diff file to the patcher
+	 *
+	 * @param   string  $filename  Path to the unified diff file
+	 * @param   string  $root      The files root path
+	 * @param   string  $strip     The number of '/' to strip
+	 *
+	 * @return	JFilesystemPatcher  $this for chaining
+	 *
+	 * @since   12.1
+	 */
+	public function addFile($filename, $root = JPATH_BASE, $strip = 0)
+	{
+		return $this->add(file_get_contents($filename), $root, $strip);
+	}
+
+	/**
+	 * Add a unified diff string to the patcher
+	 *
+	 * @param   string  $udiff  Unified diff input string
+	 * @param   string  $root   The files root path
+	 * @param   string  $strip  The number of '/' to strip
+	 *
+	 * @return	JFilesystemPatcher  $this for chaining
+	 *
+	 * @since   12.1
+	 */
+	public function add($udiff, $root = JPATH_BASE, $strip = 0)
+	{
+		$this->patches[] = array(
+			'udiff' => $udiff,
+			'root' => isset($root) ? rtrim($root, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : '',
+			'strip' => $strip,
+		);
+
+		return $this;
+	}
+
+	/**
+	 * Separate CR or CRLF lines
+	 *
+	 * @param   string  $data  Input string
+	 *
+	 * @return  array  The lines of the inputdestination file
+	 *
+	 * @since   12.1
+	 */
+	protected static function splitLines($data)
+	{
+		return preg_split(self::SPLIT, $data);
+	}
+
+	/**
+	 * Find the diff header
+	 *
+	 * The internal array pointer of $lines is on the next line after the finding
+	 *
+	 * @param   array   &$lines  The udiff array of lines
+	 * @param   string  &$src    The source file
+	 * @param   string  &$dst    The destination file
+	 *
+	 * @return  boolean  TRUE in case of success, FALSE in case of failure
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	protected static function findHeader(&$lines, &$src, &$dst)
+	{
+		// Get the current line
+		$line = current($lines);
+
+		// Search for the header
+		while ($line !== false && !preg_match(self::SRC_FILE, $line, $m))
+		{
+			$line = next($lines);
+		}
+
+		if ($line === false)
+		{
+			// No header found, return false
+			return false;
+		}
+
+		// Set the source file
+		$src = $m[1];
+
+		// Advance to the next line
+		$line = next($lines);
+
+		if ($line === false)
+		{
+			throw new RuntimeException('Unexpected EOF');
+		}
+
+		// Search the destination file
+		if (!preg_match(self::DST_FILE, $line, $m))
+		{
+			throw new RuntimeException('Invalid Diff file');
+		}
+
+		// Set the destination file
+		$dst = $m[1];
+
+		// Advance to the next line
+		if (next($lines) === false)
+		{
+			throw new RuntimeException('Unexpected EOF');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Find the next hunk of difference
+	 *
+	 * The internal array pointer of $lines is on the next line after the finding
+	 *
+	 * @param   array   &$lines     The udiff array of lines
+	 * @param   string  &$src_line  The beginning of the patch for the source file
+	 * @param   string  &$src_size  The size of the patch for the source file
+	 * @param   string  &$dst_line  The beginning of the patch for the destination file
+	 * @param   string  &$dst_size  The size of the patch for the destination file
+	 *
+	 * @return  boolean  TRUE in case of success, false in case of failure
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	protected static function findHunk(&$lines, &$src_line, &$src_size, &$dst_line, &$dst_size)
+	{
+		$line = current($lines);
+
+		if (preg_match(self::HUNK, $line, $m))
+		{
+			$src_line = (int) $m[1];
+
+			$src_size = 1;
+			if ($m[3] !== '')
+			{
+				$src_size = (int) $m[3];
+			}
+
+			$dst_line = (int) $m[4];
+
+			$dst_size = 1;
+			if ($m[6] !== '')
+			{
+				$dst_size = (int) $m[6];
+			}
+
+			if (next($lines) === false)
+			{
+				throw new RuntimeException('Unexpected EOF');
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Apply the patch
+	 *
+	 * @param   array   &$lines    The udiff array of lines
+	 * @param   string  $src       The source file
+	 * @param   string  $dst       The destination file
+	 * @param   string  $src_line  The beginning of the patch for the source file
+	 * @param   string  $src_size  The size of the patch for the source file
+	 * @param   string  $dst_line  The beginning of the patch for the destination file
+	 * @param   string  $dst_size  The size of the patch for the destination file
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	protected function applyHunk(&$lines, $src, $dst, $src_line, $src_size, $dst_line, $dst_size)
+	{
+		$src_line--;
+		$dst_line--;
+		$line = current($lines);
+
+		// Source lines (old file)
+		$source = array();
+
+		// New lines (new file)
+		$destin = array();
+		$src_left = $src_size;
+		$dst_left = $dst_size;
+
+		do
+		{
+			if (!isset($line[0]))
+			{
+				$source[] = '';
+				$destin[] = '';
+				$src_left--;
+				$dst_left--;
+			}
+			elseif ($line[0] == '-')
+			{
+				if ($src_left == 0)
+				{
+					throw new RuntimeException(JText::sprintf('JLIB_FILESYSTEM_PATCHER_UNEXPECTED_REMOVE_LINE', key($lines)));
+				}
+
+				$source[] = substr($line, 1);
+				$src_left--;
+			}
+			elseif ($line[0] == '+')
+			{
+				if ($dst_left == 0)
+				{
+					throw new RuntimeException(JText::sprintf('JLIB_FILESYSTEM_PATCHER_UNEXPECTED_ADD_LINE', key($lines)));
+				}
+
+				$destin[] = substr($line, 1);
+				$dst_left--;
+			}
+			elseif ($line != '\\ No newline at end of file')
+			{
+				$line = substr($line, 1);
+				$source[] = $line;
+				$destin[] = $line;
+				$src_left--;
+				$dst_left--;
+			}
+
+			if ($src_left == 0 && $dst_left == 0)
+			{
+				// Now apply the patch, finally!
+				if ($src_size > 0)
+				{
+					$src_lines = & $this->getSource($src);
+
+					if (!isset($src_lines))
+					{
+						throw new RuntimeException(JText::sprintf('JLIB_FILESYSTEM_PATCHER_UNEXISING_SOURCE', $src));
+					}
+				}
+
+				if ($dst_size > 0)
+				{
+					if ($src_size > 0)
+					{
+						$dst_lines = & $this->getDestination($dst, $src);
+						$src_bottom = $src_line + count($source);
+
+						for ($l = $src_line;$l < $src_bottom;$l++)
+						{
+							if ($src_lines[$l] != $source[$l - $src_line])
+							{
+								throw new RuntimeException(JText::sprintf('JLIB_FILESYSTEM_PATCHER_FAILED_VERIFY', $src, $l));
+							}
+						}
+
+						array_splice($dst_lines, $dst_line, count($source), $destin);
+					}
+					else
+					{
+						$this->destinations[$dst] = $destin;
+					}
+				}
+				else
+				{
+					$this->removals[] = $src;
+				}
+
+				next($lines);
+
+				return;
+			}
+
+			$line = next($lines);
+		}
+
+		while ($line !== false);
+		throw new RuntimeException('Unexpected EOF');
+	}
+
+	/**
+	 * Get the lines of a source file
+	 *
+	 * @param   string  $src  The path of a file
+	 *
+	 * @return  array  The lines of the source file
+	 *
+	 * @since   12.1
+	 */
+	protected function &getSource($src)
+	{
+		if (!isset($this->sources[$src]))
+		{
+			$this->sources[$src] = null;
+			if (is_readable($src))
+			{
+				$this->sources[$src] = self::splitLines(file_get_contents($src));
+			}
+		}
+
+		return $this->sources[$src];
+	}
+
+	/**
+	 * Get the lines of a destination file
+	 *
+	 * @param   string  $dst  The path of a destination file
+	 * @param   string  $src  The path of a source file
+	 *
+	 * @return  array  The lines of the destination file
+	 *
+	 * @since   12.1
+	 */
+	protected function &getDestination($dst, $src)
+	{
+		if (!isset($this->destinations[$dst]))
+		{
+			$this->destinations[$dst] = $this->getSource($src);
+		}
+
+		return $this->destinations[$dst];
+	}
+}
diff --git a/core/libraries/joomla/filesystem/path.php b/core/libraries/joomla/filesystem/path.php
new file mode 100644
index 00000000..3985c412
--- /dev/null
+++ b/core/libraries/joomla/filesystem/path.php
@@ -0,0 +1,341 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+if (!defined('JPATH_ROOT'))
+{
+	// Define a string constant for the root directory of the file system in native format
+	$pathHelper = new JFilesystemWrapperPath;
+	define('JPATH_ROOT', $pathHelper->clean(JPATH_SITE));
+}
+
+/**
+ * A Path handling class
+ *
+ * @since  11.1
+ */
+class JPath
+{
+	/**
+	 * Checks if a path's permissions can be changed.
+	 *
+	 * @param   string  $path  Path to check.
+	 *
+	 * @return  boolean  True if path can have mode changed.
+	 *
+	 * @since   11.1
+	 */
+	public static function canChmod($path)
+	{
+		$perms = fileperms($path);
+
+		if ($perms !== false)
+		{
+			if (@chmod($path, $perms ^ 0001))
+			{
+				@chmod($path, $perms);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Chmods files and directories recursively to given permissions.
+	 *
+	 * @param   string  $path        Root path to begin changing mode [without trailing slash].
+	 * @param   string  $filemode    Octal representation of the value to change file mode to [null = no change].
+	 * @param   string  $foldermode  Octal representation of the value to change folder mode to [null = no change].
+	 *
+	 * @return  boolean  True if successful [one fail means the whole operation failed].
+	 *
+	 * @since   11.1
+	 */
+	public static function setPermissions($path, $filemode = '0644', $foldermode = '0755')
+	{
+		// Initialise return value
+		$ret = true;
+
+		if (is_dir($path))
+		{
+			$dh = opendir($path);
+
+			while ($file = readdir($dh))
+			{
+				if ($file != '.' && $file != '..')
+				{
+					$fullpath = $path . '/' . $file;
+
+					if (is_dir($fullpath))
+					{
+						if (!self::setPermissions($fullpath, $filemode, $foldermode))
+						{
+							$ret = false;
+						}
+					}
+					else
+					{
+						if (isset($filemode))
+						{
+							if (!@ chmod($fullpath, octdec($filemode)))
+							{
+								$ret = false;
+							}
+						}
+					}
+				}
+			}
+
+			closedir($dh);
+
+			if (isset($foldermode))
+			{
+				if (!@ chmod($path, octdec($foldermode)))
+				{
+					$ret = false;
+				}
+			}
+		}
+		else
+		{
+			if (isset($filemode))
+			{
+				$ret = @ chmod($path, octdec($filemode));
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Get the permissions of the file/folder at a given path.
+	 *
+	 * @param   string  $path  The path of a file/folder.
+	 *
+	 * @return  string  Filesystem permissions.
+	 *
+	 * @since   11.1
+	 */
+	public static function getPermissions($path)
+	{
+		$path = self::clean($path);
+		$mode = @ decoct(@ fileperms($path) & 0777);
+
+		if (strlen($mode) < 3)
+		{
+			return '---------';
+		}
+
+		$parsed_mode = '';
+
+		for ($i = 0; $i < 3; $i++)
+		{
+			// Read
+			$parsed_mode .= ($mode{$i} & 04) ? 'r' : '-';
+
+			// Write
+			$parsed_mode .= ($mode{$i} & 02) ? 'w' : '-';
+
+			// Execute
+			$parsed_mode .= ($mode{$i} & 01) ? 'x' : '-';
+		}
+
+		return $parsed_mode;
+	}
+
+	/**
+	 * Checks for snooping outside of the file system root.
+	 *
+	 * @param   string  $path  A file system path to check.
+	 *
+	 * @return  string  A cleaned version of the path or exit on error.
+	 *
+	 * @since   11.1
+	 * @throws  Exception
+	 */
+	public static function check($path)
+	{
+		if (strpos($path, '..') !== false)
+		{
+			// Don't translate
+			throw new Exception(
+				sprintf(
+					'%s() - Use of relative paths not permitted',
+					__METHOD__
+				),
+				20
+			);
+		}
+
+		$path = self::clean($path);
+
+		if ((JPATH_ROOT != '') && strpos($path, self::clean(JPATH_ROOT)) !== 0)
+		{
+			throw new Exception(
+				sprintf(
+					'%1$s() - Snooping out of bounds @ %2$s',
+					__METHOD__,
+					$path
+				),
+				20
+			);
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Function to strip additional / or \ in a path name.
+	 *
+	 * @param   string  $path  The path to clean.
+	 * @param   string  $ds    Directory separator (optional).
+	 *
+	 * @return  string  The cleaned path.
+	 *
+	 * @since   11.1
+	 * @throws  UnexpectedValueException
+	 */
+	public static function clean($path, $ds = DIRECTORY_SEPARATOR)
+	{
+		if (!is_string($path) && !empty($path))
+		{
+			throw new UnexpectedValueException(
+				sprintf(
+					'%s() - $path is not a string',
+					__METHOD__
+				),
+				20
+			);
+		}
+
+		$path = trim($path);
+
+		if (empty($path))
+		{
+			$path = JPATH_ROOT;
+		}
+		// Remove double slashes and backslashes and convert all slashes and backslashes to DIRECTORY_SEPARATOR
+		// If dealing with a UNC path don't forget to prepend the path with a backslash.
+		elseif (($ds == '\\') && substr($path, 0, 2) == '\\\\')
+		{
+			$path = "\\" . preg_replace('#[/\\\\]+#', $ds, $path);
+		}
+		else
+		{
+			$path = preg_replace('#[/\\\\]+#', $ds, $path);
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Method to determine if script owns the path.
+	 *
+	 * @param   string  $path  Path to check ownership.
+	 *
+	 * @return  boolean  True if the php script owns the path passed.
+	 *
+	 * @since   11.1
+	 */
+	public static function isOwner($path)
+	{
+		jimport('joomla.filesystem.file');
+
+		$tmp = md5(JCrypt::genRandomBytes());
+		$ssp = ini_get('session.save_path');
+		$jtp = JPATH_SITE . '/tmp';
+
+		// Try to find a writable directory
+		$dir = false;
+
+		foreach (array($jtp, $ssp, '/tmp') as $currentDir)
+		{
+			if (is_writable($currentDir))
+			{
+				$dir = $currentDir;
+
+				break;
+			}
+		}
+
+		if ($dir)
+		{
+			$fileObject = new JFilesystemWrapperFile;
+			$test       = $dir . '/' . $tmp;
+
+			// Create the test file
+			$blank = '';
+			$fileObject->write($test, $blank, false);
+
+			// Test ownership
+			$return = (fileowner($test) == fileowner($path));
+
+			// Delete the test file
+			$fileObject->delete($test);
+
+			return $return;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Searches the directory paths for a given file.
+	 *
+	 * @param   mixed   $paths  An path string or array of path strings to search in
+	 * @param   string  $file   The file name to look for.
+	 *
+	 * @return  mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+	 *
+	 * @since   11.1
+	 */
+	public static function find($paths, $file)
+	{
+		// Force to array
+		if (!is_array($paths) && !($paths instanceof Iterator))
+		{
+			settype($paths, 'array');
+		}
+
+		// Start looping through the path set
+		foreach ($paths as $path)
+		{
+			// Get the path to the file
+			$fullname = $path . '/' . $file;
+
+			// Is the path based on a stream?
+			if (strpos($path, '://') === false)
+			{
+				// Not a stream, so do a realpath() to avoid directory
+				// traversal attempts on the local file system.
+
+				// Needed for substr() later
+				$path = realpath($path);
+				$fullname = realpath($fullname);
+			}
+
+			/*
+			 * The substr() check added to make sure that the realpath()
+			 * results in a directory registered so that
+			 * non-registered directories are not accessible via directory
+			 * traversal attempts.
+			 */
+			if (file_exists($fullname) && substr($fullname, 0, strlen($path)) == $path)
+			{
+				return $fullname;
+			}
+		}
+
+		// Could not find the file in the set of paths
+		return false;
+	}
+}
diff --git a/core/libraries/joomla/filesystem/stream.php b/core/libraries/joomla/filesystem/stream.php
new file mode 100644
index 00000000..44712f56
--- /dev/null
+++ b/core/libraries/joomla/filesystem/stream.php
@@ -0,0 +1,1422 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Stream Interface
+ *
+ * The Joomla! stream interface is designed to handle files as streams
+ * where as the legacy JFile static class treated files in a rather
+ * atomic manner.
+ *
+ * @note   This class adheres to the stream wrapper operations:
+ * @link   https://secure.php.net/manual/en/function.stream-get-wrappers.php
+ * @link   https://secure.php.net/manual/en/intro.stream.php PHP Stream Manual
+ * @link   https://secure.php.net/manual/en/wrappers.php Stream Wrappers
+ * @link   https://secure.php.net/manual/en/filters.php Stream Filters
+ * @link   https://secure.php.net/manual/en/transports.php Socket Transports (used by some options, particularly HTTP proxy)
+ * @since  11.1
+ */
+class JStream extends JObject
+{
+	/**
+	 * File Mode
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $filemode = 0644;
+
+	/**
+	 * Directory Mode
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $dirmode = 0755;
+
+	/**
+	 * Default Chunk Size
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $chunksize = 8192;
+
+	/**
+	 * Filename
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $filename;
+
+	/**
+	 * Prefix of the connection for writing
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $writeprefix;
+
+	/**
+	 * Prefix of the connection for reading
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $readprefix;
+
+	/**
+	 * Read Processing method
+	 * @var    string  gz, bz, f
+	 * If a scheme is detected, fopen will be defaulted
+	 * To use compression with a network stream use a filter
+	 * @since  11.1
+	 */
+	protected $processingmethod = 'f';
+
+	/**
+	 * Filters applied to the current stream
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $filters = array();
+
+	/**
+	 * File Handle
+	 *
+	 * @var    resource
+	 * @since  12.1
+	 */
+	protected $fh;
+
+	/**
+	 * File size
+	 *
+	 * @var    integer
+	 * @since  12.1
+	 */
+	protected $filesize;
+
+	/**
+	 * Context to use when opening the connection
+	 *
+	 * @var    resource
+	 * @since  12.1
+	 */
+	protected $context = null;
+
+	/**
+	 * Context options; used to rebuild the context
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $contextOptions;
+
+	/**
+	 * The mode under which the file was opened
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $openmode;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $writeprefix  Prefix of the stream (optional). Unlike the JPATH_*, this has a final path separator!
+	 * @param   string  $readprefix   The read prefix (optional).
+	 * @param   array   $context      The context options (optional).
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($writeprefix = '', $readprefix = '', $context = array())
+	{
+		$this->writeprefix = $writeprefix;
+		$this->readprefix = $readprefix;
+		$this->contextOptions = $context;
+		$this->_buildContext();
+	}
+
+	/**
+	 * Destructor
+	 *
+	 * @since   11.1
+	 */
+	public function __destruct()
+	{
+		// Attempt to close on destruction if there is a file handle
+		if ($this->fh)
+		{
+			@$this->close();
+		}
+	}
+
+	/**
+	 * Generic File Operations
+	 *
+	 * Open a stream with some lazy loading smarts
+	 *
+	 * @param   string    $filename              Filename
+	 * @param   string    $mode                  Mode string to use
+	 * @param   boolean   $use_include_path      Use the PHP include path
+	 * @param   resource  $context               Context to use when opening
+	 * @param   boolean   $use_prefix            Use a prefix to open the file
+	 * @param   boolean   $relative              Filename is a relative path (if false, strips JPATH_ROOT to make it relative)
+	 * @param   boolean   $detectprocessingmode  Detect the processing method for the file and use the appropriate function
+	 *                                           to handle output automatically
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function open($filename, $mode = 'r', $use_include_path = false, $context = null,
+		$use_prefix = false, $relative = false, $detectprocessingmode = false)
+	{
+		$filename = $this->_getFilename($filename, $mode, $use_prefix, $relative);
+
+		if (!$filename)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILENAME'));
+
+			return false;
+		}
+
+		$this->filename = $filename;
+		$this->openmode = $mode;
+
+		$url = parse_url($filename);
+		$retval = false;
+
+		if (isset($url['scheme']))
+		{
+			// If we're dealing with a Joomla! stream, load it
+			if (JFilesystemHelper::isJoomlaStream($url['scheme']))
+			{
+				require_once __DIR__ . '/streams/' . $url['scheme'] . '.php';
+			}
+
+			// We have a scheme! force the method to be f
+			$this->processingmethod = 'f';
+		}
+		elseif ($detectprocessingmode)
+		{
+			$ext = strtolower(JFile::getExt($this->filename));
+
+			switch ($ext)
+			{
+				case 'tgz':
+				case 'gz':
+				case 'gzip':
+					$this->processingmethod = 'gz';
+					break;
+
+				case 'tbz2':
+				case 'bz2':
+				case 'bzip2':
+					$this->processingmethod = 'bz';
+					break;
+
+				default:
+					$this->processingmethod = 'f';
+					break;
+			}
+		}
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown whilst opening a file';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		// Decide which context to use:
+		switch ($this->processingmethod)
+		{
+			// Gzip doesn't support contexts or streams
+			case 'gz':
+				$this->fh = gzopen($filename, $mode, $use_include_path);
+				break;
+
+			// Bzip2 is much like gzip except it doesn't use the include path
+			case 'bz':
+				$this->fh = bzopen($filename, $mode);
+				break;
+
+			// Fopen can handle streams
+			case 'f':
+			default:
+				// One supplied at open; overrides everything
+				if ($context)
+				{
+					$this->fh = fopen($filename, $mode, $use_include_path, $context);
+				}
+				// One provided at initialisation
+				elseif ($this->context)
+				{
+					$this->fh = fopen($filename, $mode, $use_include_path, $this->context);
+				}
+				// No context; all defaults
+				else
+				{
+					$this->fh = fopen($filename, $mode, $use_include_path);
+				}
+
+				break;
+		}
+
+		if (!$this->fh)
+		{
+			$this->setError($php_errormsg);
+		}
+		else
+		{
+			$retval = true;
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Attempt to close a file handle
+	 *
+	 * Will return false if it failed and true on success
+	 * If the file is not open the system will return true, this function destroys the file handle as well
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function close()
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return true;
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gzclose($this->fh);
+				break;
+
+			case 'bz':
+				$res = bzclose($this->fh);
+				break;
+
+			case 'f':
+			default:
+				$res = fclose($this->fh);
+				break;
+		}
+
+		if (!$res)
+		{
+			$this->setError($php_errormsg);
+		}
+		else
+		{
+			// Reset this
+			$this->fh = null;
+			$retval = true;
+		}
+
+		// If we wrote, chmod the file after it's closed
+		if ($this->openmode[0] == 'w')
+		{
+			$this->chmod();
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Work out if we're at the end of the file for a stream
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function eof()
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gzeof($this->fh);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = feof($this->fh);
+				break;
+		}
+
+		if ($php_errormsg)
+		{
+			$this->setError($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $res;
+	}
+
+	/**
+	 * Retrieve the file size of the path
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function filesize()
+	{
+		if (!$this->filename)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$res = @filesize($this->filename);
+
+		if (!$res)
+		{
+			$tmp_error = '';
+
+			if ($php_errormsg)
+			{
+				// Something went wrong.
+				// Store the error in case we need it.
+				$tmp_error = $php_errormsg;
+			}
+
+			$res = JFilesystemHelper::remotefsize($this->filename);
+
+			if (!$res)
+			{
+				if ($tmp_error)
+				{
+					// Use the php_errormsg from before
+					$this->setError($tmp_error);
+				}
+				else
+				{
+					// Error but nothing from php? How strange! Create our own
+					$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_SIZE'));
+				}
+			}
+			else
+			{
+				$this->filesize = $res;
+				$retval = $res;
+			}
+		}
+		else
+		{
+			$this->filesize = $res;
+			$retval = $res;
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Get a line from the stream source.
+	 *
+	 * @param   integer  $length  The number of bytes (optional) to read.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function gets($length = 0)
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = $length ? gzgets($this->fh, $length) : gzgets($this->fh);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = $length ? fgets($this->fh, $length) : fgets($this->fh);
+				break;
+		}
+
+		if (!$res)
+		{
+			$this->setError($php_errormsg);
+		}
+		else
+		{
+			$retval = $res;
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Read a file
+	 *
+	 * Handles user space streams appropriately otherwise any read will return 8192
+	 *
+	 * @param   integer  $length  Length of data to read
+	 *
+	 * @return  mixed
+	 *
+	 * @link    https://secure.php.net/manual/en/function.fread.php
+	 * @since   11.1
+	 */
+	public function read($length = 0)
+	{
+		if (!$this->filesize && !$length)
+		{
+			// Get the filesize
+			$this->filesize();
+
+			if (!$this->filesize)
+			{
+				// Set it to the biggest and then wait until eof
+				$length = -1;
+			}
+			else
+			{
+				$length = $this->filesize;
+			}
+		}
+
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$remaining = $length;
+
+		do
+		{
+			// Do chunked reads where relevant
+			switch ($this->processingmethod)
+			{
+				case 'bz':
+					$res = ($remaining > 0) ? bzread($this->fh, $remaining) : bzread($this->fh, $this->chunksize);
+					break;
+
+				case 'gz':
+					$res = ($remaining > 0) ? gzread($this->fh, $remaining) : gzread($this->fh, $this->chunksize);
+					break;
+
+				case 'f':
+				default:
+					$res = ($remaining > 0) ? fread($this->fh, $remaining) : fread($this->fh, $this->chunksize);
+					break;
+			}
+
+			if (!$res)
+			{
+				$this->setError($php_errormsg);
+
+				// Jump from the loop
+				$remaining = 0;
+			}
+			else
+			{
+				if (!$retval)
+				{
+					$retval = '';
+				}
+
+				$retval .= $res;
+
+				if (!$this->eof())
+				{
+					$len = strlen($res);
+					$remaining -= $len;
+				}
+				else
+				{
+					// If it's the end of the file then we've nothing left to read; reset remaining and len
+					$remaining = 0;
+					$length = strlen($retval);
+				}
+			}
+		}
+		while ($remaining || !$length);
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Seek the file
+	 *
+	 * Note: the return value is different to that of fseek
+	 *
+	 * @param   integer  $offset  Offset to use when seeking.
+	 * @param   integer  $whence  Seek mode to use.
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @link    https://secure.php.net/manual/en/function.fseek.php
+	 * @since   11.1
+	 */
+	public function seek($offset, $whence = SEEK_SET)
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gzseek($this->fh, $offset, $whence);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = fseek($this->fh, $offset, $whence);
+				break;
+		}
+
+		// Seek, interestingly, returns 0 on success or -1 on failure.
+		if ($res == -1)
+		{
+			$this->setError($php_errormsg);
+		}
+		else
+		{
+			$retval = true;
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Returns the current position of the file read/write pointer.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function tell()
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gztell($this->fh);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = ftell($this->fh);
+				break;
+		}
+
+		// May return 0 so check if it's really false
+		if ($res === false)
+		{
+			$this->setError($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $res;
+	}
+
+	/**
+	 * File write
+	 *
+	 * Whilst this function accepts a reference, the underlying fwrite
+	 * will do a copy! This will roughly double the memory allocation for
+	 * any write you do. Specifying chunked will get around this by only
+	 * writing in specific chunk sizes. This defaults to 8192 which is a
+	 * sane number to use most of the time (change the default with
+	 * JStream::set('chunksize', newsize);)
+	 * Note: This doesn't support gzip/bzip2 writing like reading does
+	 *
+	 * @param   string   &$string  Reference to the string to write.
+	 * @param   integer  $length   Length of the string to write.
+	 * @param   integer  $chunk    Size of chunks to write in.
+	 *
+	 * @return  boolean
+	 *
+	 * @link    https://secure.php.net/manual/en/function.fwrite.php
+	 * @since   11.1
+	 */
+	public function write(&$string, $length = 0, $chunk = 0)
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		// If the length isn't set, set it to the length of the string.
+		if (!$length)
+		{
+			$length = strlen($string);
+		}
+
+		// If the chunk isn't set, set it to the default.
+		if (!$chunk)
+		{
+			$chunk = $this->chunksize;
+		}
+
+		$retval = true;
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$remaining = $length;
+		$start = 0;
+
+		do
+		{
+			// If the amount remaining is greater than the chunk size, then use the chunk
+			$amount = ($remaining > $chunk) ? $chunk : $remaining;
+			$res = fwrite($this->fh, substr($string, $start), $amount);
+
+			// Returns false on error or the number of bytes written
+			if ($res === false)
+			{
+				// Returned error
+				$this->setError($php_errormsg);
+				$retval = false;
+				$remaining = 0;
+			}
+			elseif ($res === 0)
+			{
+				// Wrote nothing?
+				$remaining = 0;
+				$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_NO_DATA_WRITTEN'));
+			}
+			else
+			{
+				// Wrote something
+				$start += $amount;
+				$remaining -= $res;
+			}
+		}
+		while ($remaining);
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Chmod wrapper
+	 *
+	 * @param   string  $filename  File name.
+	 * @param   mixed   $mode      Mode to use.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function chmod($filename = '', $mode = 0)
+	{
+		if (!$filename)
+		{
+			if (!isset($this->filename) || !$this->filename)
+			{
+				$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILENAME'));
+
+				return false;
+			}
+
+			$filename = $this->filename;
+		}
+
+		// If no mode is set use the default
+		if (!$mode)
+		{
+			$mode = $this->filemode;
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$sch = parse_url($filename, PHP_URL_SCHEME);
+
+		// Scheme specific options; ftp's chmod support is fun.
+		switch ($sch)
+		{
+			case 'ftp':
+			case 'ftps':
+				$res = JFilesystemHelper::ftpChmod($filename, $mode);
+				break;
+
+			default:
+				$res = chmod($filename, $mode);
+				break;
+		}
+
+		// Seek, interestingly, returns 0 on success or -1 on failure
+		if (!$res)
+		{
+			$this->setError($php_errormsg);
+		}
+		else
+		{
+			$retval = true;
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Get the stream metadata
+	 *
+	 * @return  array  header/metadata
+	 *
+	 * @link    https://secure.php.net/manual/en/function.stream-get-meta-data.php
+	 * @since   11.1
+	 */
+	public function get_meta_data()
+	{
+		if (!$this->fh)
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_FILE_NOT_OPEN'));
+
+			return false;
+		}
+
+		return stream_get_meta_data($this->fh);
+	}
+
+	/**
+	 * Stream contexts
+	 * Builds the context from the array
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function _buildContext()
+	{
+		// According to the manual this always works!
+		if (count($this->contextOptions))
+		{
+			$this->context = @stream_context_create($this->contextOptions);
+		}
+		else
+		{
+			$this->context = null;
+		}
+	}
+
+	/**
+	 * Updates the context to the array
+	 *
+	 * Format is the same as the options for stream_context_create
+	 *
+	 * @param   array  $context  Options to create the context with
+	 *
+	 * @return  void
+	 *
+	 * @link    https://secure.php.net/stream_context_create
+	 * @since   11.1
+	 */
+	public function setContextOptions($context)
+	{
+		$this->contextOptions = $context;
+		$this->_buildContext();
+	}
+
+	/**
+	 * Adds a particular options to the context
+	 *
+	 * @param   string  $wrapper  The wrapper to use
+	 * @param   string  $name     The option to set
+	 * @param   string  $value    The value of the option
+	 *
+	 * @return  void
+	 *
+	 * @link    https://secure.php.net/stream_context_create Stream Context Creation
+	 * @link    https://secure.php.net/manual/en/context.php Context Options for various streams
+	 * @since   11.1
+	 */
+	public function addContextEntry($wrapper, $name, $value)
+	{
+		$this->contextOptions[$wrapper][$name] = $value;
+		$this->_buildContext();
+	}
+
+	/**
+	 * Deletes a particular setting from a context
+	 *
+	 * @param   string  $wrapper  The wrapper to use
+	 * @param   string  $name     The option to unset
+	 *
+	 * @return  void
+	 *
+	 * @link    https://secure.php.net/stream_context_create
+	 * @since   11.1
+	 */
+	public function deleteContextEntry($wrapper, $name)
+	{
+		// Check whether the wrapper is set
+		if (isset($this->contextOptions[$wrapper]))
+		{
+			// Check that entry is set for that wrapper
+			if (isset($this->contextOptions[$wrapper][$name]))
+			{
+				// Unset the item
+				unset($this->contextOptions[$wrapper][$name]);
+
+				// Check that there are still items there
+				if (!count($this->contextOptions[$wrapper]))
+				{
+					// Clean up an empty wrapper context option
+					unset($this->contextOptions[$wrapper]);
+				}
+			}
+		}
+
+		// Rebuild the context and apply it to the stream
+		$this->_buildContext();
+	}
+
+	/**
+	 * Applies the current context to the stream
+	 *
+	 * Use this to change the values of the context after you've opened a stream
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function applyContextToStream()
+	{
+		$retval = false;
+
+		if ($this->fh)
+		{
+			// Capture PHP errors
+			$php_errormsg = 'Unknown error setting context option';
+			$track_errors = ini_get('track_errors');
+			ini_set('track_errors', true);
+			$retval = @stream_context_set_option($this->fh, $this->contextOptions);
+
+			if (!$retval)
+			{
+				$this->setError($php_errormsg);
+			}
+
+			// Restore error tracking to what it was before
+			ini_set('track_errors', $track_errors);
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Stream filters
+	 * Append a filter to the chain
+	 *
+	 * @param   string   $filtername  The key name of the filter.
+	 * @param   integer  $read_write  Optional. Defaults to STREAM_FILTER_READ.
+	 * @param   array    $params      An array of params for the stream_filter_append call.
+	 *
+	 * @return  mixed
+	 *
+	 * @link    https://secure.php.net/manual/en/function.stream-filter-append.php
+	 * @since   11.1
+	 */
+	public function appendFilter($filtername, $read_write = STREAM_FILTER_READ, $params = array())
+	{
+		$res = false;
+
+		if ($this->fh)
+		{
+			// Capture PHP errors
+			$php_errormsg = '';
+			$track_errors = ini_get('track_errors');
+			ini_set('track_errors', true);
+
+			$res = @stream_filter_append($this->fh, $filtername, $read_write, $params);
+
+			if (!$res && $php_errormsg)
+			{
+				$this->setError($php_errormsg);
+			}
+			else
+			{
+				$this->filters[] = &$res;
+			}
+
+			// Restore error tracking to what it was before.
+			ini_set('track_errors', $track_errors);
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Prepend a filter to the chain
+	 *
+	 * @param   string   $filtername  The key name of the filter.
+	 * @param   integer  $read_write  Optional. Defaults to STREAM_FILTER_READ.
+	 * @param   array    $params      An array of params for the stream_filter_prepend call.
+	 *
+	 * @return  mixed
+	 *
+	 * @link    https://secure.php.net/manual/en/function.stream-filter-prepend.php
+	 * @since   11.1
+	 */
+	public function prependFilter($filtername, $read_write = STREAM_FILTER_READ, $params = array())
+	{
+		$res = false;
+
+		if ($this->fh)
+		{
+			// Capture PHP errors
+			$php_errormsg = '';
+			$track_errors = ini_get('track_errors');
+			ini_set('track_errors', true);
+			$res = @stream_filter_prepend($this->fh, $filtername, $read_write, $params);
+
+			if (!$res && $php_errormsg)
+			{
+				// Set the error msg
+				$this->setError($php_errormsg);
+			}
+			else
+			{
+				array_unshift($res, '');
+				$res[0] = &$this->filters;
+			}
+
+			// Restore error tracking to what it was before.
+			ini_set('track_errors', $track_errors);
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Remove a filter, either by resource (handed out from the append or prepend function)
+	 * or via getting the filter list)
+	 *
+	 * @param   resource  &$resource  The resource.
+	 * @param   boolean   $byindex    The index of the filter.
+	 *
+	 * @return  boolean   Result of operation
+	 *
+	 * @since   11.1
+	 */
+	public function removeFilter(&$resource, $byindex = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		if ($byindex)
+		{
+			$res = stream_filter_remove($this->filters[$resource]);
+		}
+		else
+		{
+			$res = stream_filter_remove($resource);
+		}
+
+		if ($res && $php_errormsg)
+		{
+			$this->setError($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Copy a file from src to dest
+	 *
+	 * @param   string    $src         The file path to copy from.
+	 * @param   string    $dest        The file path to copy to.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function copy($src, $dest, $context = null, $use_prefix = true, $relative = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		$chmodDest = $this->_getFilename($dest, 'w', $use_prefix, $relative);
+
+		// Since we're going to open the file directly we need to get the filename.
+		// We need to use the same prefix so force everything to write.
+		$src = $this->_getFilename($src, 'w', $use_prefix, $relative);
+		$dest = $this->_getFilename($dest, 'w', $use_prefix, $relative);
+
+		if ($context)
+		{
+			// Use the provided context
+			$res = @copy($src, $dest, $context);
+		}
+		elseif ($this->context)
+		{
+			// Use the objects context
+			$res = @copy($src, $dest, $this->context);
+		}
+		else
+		{
+			// Don't use any context
+			$res = @copy($src, $dest);
+		}
+
+		if (!$res && $php_errormsg)
+		{
+			$this->setError($php_errormsg);
+		}
+		else
+		{
+			$this->chmod($chmodDest);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Moves a file
+	 *
+	 * @param   string    $src         The file path to move from.
+	 * @param   string    $dest        The file path to move to.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function move($src, $dest, $context = null, $use_prefix = true, $relative = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		$src = $this->_getFilename($src, 'w', $use_prefix, $relative);
+		$dest = $this->_getFilename($dest, 'w', $use_prefix, $relative);
+
+		if ($context)
+		{
+			// Use the provided context
+			$res = @rename($src, $dest, $context);
+		}
+		elseif ($this->context)
+		{
+			// Use the object's context
+			$res = @rename($src, $dest, $this->context);
+		}
+		else
+		{
+			// Don't use any context
+			$res = @rename($src, $dest);
+		}
+
+		if (!$res && $php_errormsg)
+		{
+			$this->setError($php_errormsg());
+		}
+
+		$this->chmod($dest);
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Delete a file
+	 *
+	 * @param   string    $filename    The file path to delete.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function delete($filename, $context = null, $use_prefix = true, $relative = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		$filename = $this->_getFilename($filename, 'w', $use_prefix, $relative);
+
+		if ($context)
+		{
+			// Use the provided context
+			$res = @unlink($filename, $context);
+		}
+		elseif ($this->context)
+		{
+			// Use the object's context
+			$res = @unlink($filename, $this->context);
+		}
+		else
+		{
+			// Don't use any context
+			$res = @unlink($filename);
+		}
+
+		if (!$res && $php_errormsg)
+		{
+			$this->setError($php_errormsg());
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Upload a file
+	 *
+	 * @param   string    $src         The file path to copy from (usually a temp folder).
+	 * @param   string    $dest        The file path to copy to.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function upload($src, $dest, $context = null, $use_prefix = true, $relative = false)
+	{
+		if (is_uploaded_file($src))
+		{
+			// Make sure it's an uploaded file
+			return $this->copy($src, $dest, $context, $use_prefix, $relative);
+		}
+		else
+		{
+			$this->setError(JText::_('JLIB_FILESYSTEM_ERROR_STREAMS_NOT_UPLOADED_FILE'));
+
+			return false;
+		}
+	}
+
+	/**
+	 * Writes a chunk of data to a file.
+	 *
+	 * @param   string  $filename  The file name.
+	 * @param   string  &$buffer   The data to write to the file.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function writeFile($filename, &$buffer)
+	{
+		if ($this->open($filename, 'w'))
+		{
+			$result = $this->write($buffer);
+			$this->chmod();
+			$this->close();
+
+			return $result;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Determine the appropriate 'filename' of a file
+	 *
+	 * @param   string   $filename    Original filename of the file
+	 * @param   string   $mode        Mode string to retrieve the filename
+	 * @param   boolean  $use_prefix  Controls the use of a prefix
+	 * @param   boolean  $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function _getFilename($filename, $mode, $use_prefix, $relative)
+	{
+		if ($use_prefix)
+		{
+			// Get rid of binary or t, should be at the end of the string
+			$tmode = trim($mode, 'btf123456789');
+
+			// Check if it's a write mode then add the appropriate prefix
+			// Get rid of JPATH_ROOT (legacy compat) along the way
+			if (in_array($tmode, JFilesystemHelper::getWriteModes()))
+			{
+				if (!$relative && $this->writeprefix)
+				{
+					$filename = str_replace(JPATH_ROOT, '', $filename);
+				}
+
+				$filename = $this->writeprefix . $filename;
+			}
+			else
+			{
+				if (!$relative && $this->readprefix)
+				{
+					$filename = str_replace(JPATH_ROOT, '', $filename);
+				}
+
+				$filename = $this->readprefix . $filename;
+			}
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Return the internal file handle
+	 *
+	 * @return  resource  File handler
+	 *
+	 * @since   11.1
+	 */
+	public function getFileHandle()
+	{
+		return $this->fh;
+	}
+}
diff --git a/core/libraries/joomla/filesystem/streams/string.php b/core/libraries/joomla/filesystem/streams/string.php
new file mode 100644
index 00000000..4c53a1a9
--- /dev/null
+++ b/core/libraries/joomla/filesystem/streams/string.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.support.stringcontroller');
+
+/**
+ * String Stream Wrapper
+ *
+ * This class allows you to use a PHP string in the same way that
+ * you would normally use a regular stream wrapper
+ *
+ * @since  11.1
+ */
+class JStreamString
+{
+	/**
+	 * The current string
+	 *
+	 * @var   string
+	 * @since  12.1
+	 */
+	protected $currentString;
+
+	/**
+	 * The path
+	 *
+	 * @var   string
+	 * @since  12.1
+	 */
+	protected $path;
+
+	/**
+	 * The mode
+	 *
+	 * @var   string
+	 * @since  12.1
+	 */
+	protected $mode;
+
+	/**
+	 * Enter description here ...
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $options;
+
+	/**
+	 * Enter description here ...
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $openedPath;
+
+	/**
+	 * Current position
+	 *
+	 * @var    integer
+	 * @since  12.1
+	 */
+	protected $pos;
+
+	/**
+	 * Length of the string
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $len;
+
+	/**
+	 * Statistics for a file
+	 *
+	 * @var    array
+	 * @since  12.1
+	 *
+	 * @link   http://us.php.net/manual/en/function.stat.php
+	 */
+	protected $stat;
+
+	/**
+	 * Method to open a file or URL.
+	 *
+	 * @param   string   $path          The stream path.
+	 * @param   string   $mode          Not used.
+	 * @param   integer  $options       Not used.
+	 * @param   string   &$opened_path  Not used.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function stream_open($path, $mode, $options, &$opened_path)
+	{
+		$this->currentString = &JStringController::getRef(str_replace('string://', '', $path));
+
+		if ($this->currentString)
+		{
+			$this->len = strlen($this->currentString);
+			$this->pos = 0;
+			$this->stat = $this->url_stat($path, 0);
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve information from a file resource
+	 *
+	 * @return  array
+	 *
+	 * @link    https://secure.php.net/manual/en/streamwrapper.stream-stat.php
+	 * @since   11.1
+	 */
+	public function stream_stat()
+	{
+		return $this->stat;
+	}
+
+	/**
+	 * Method to retrieve information about a file.
+	 *
+	 * @param   string   $path   File path or URL to stat
+	 * @param   integer  $flags  Additional flags set by the streams API
+	 *
+	 * @return  array
+	 *
+	 * @link    https://secure.php.net/manual/en/streamwrapper.url-stat.php
+	 * @since   11.1
+	 */
+	public function url_stat($path, $flags = 0)
+	{
+		$now = time();
+		$string = &JStringController::getRef(str_replace('string://', '', $path));
+		$stat = array(
+			'dev' => 0,
+			'ino' => 0,
+			'mode' => 0,
+			'nlink' => 1,
+			'uid' => 0,
+			'gid' => 0,
+			'rdev' => 0,
+			'size' => strlen($string),
+			'atime' => $now,
+			'mtime' => $now,
+			'ctime' => $now,
+			'blksize' => '512',
+			'blocks' => ceil(strlen($string) / 512),
+		);
+
+		return $stat;
+	}
+
+	/**
+	 * Method to read a given number of bytes starting at the current position
+	 * and moving to the end of the string defined by the current position plus the
+	 * given number.
+	 *
+	 * @param   integer  $count  Bytes of data from the current position should be returned.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 *
+	 * @link    https://secure.php.net/manual/en/streamwrapper.stream-read.php
+	 */
+	public function stream_read($count)
+	{
+		$result = substr($this->currentString, $this->pos, $count);
+		$this->pos += $count;
+
+		return $result;
+	}
+
+	/**
+	 * Stream write, always returning false.
+	 *
+	 * @param   string  $data  The data to write.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @note    Updating the string is not supported.
+	 */
+	public function stream_write($data)
+	{
+		// We don't support updating the string.
+		return false;
+	}
+
+	/**
+	 * Method to get the current position
+	 *
+	 * @return  integer  The position
+	 *
+	 * @since   11.1
+	 */
+	public function stream_tell()
+	{
+		return $this->pos;
+	}
+
+	/**
+	 * End of field check
+	 *
+	 * @return  boolean  True if at end of field.
+	 *
+	 * @since   11.1
+	 */
+	public function stream_eof()
+	{
+		if ($this->pos > $this->len)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Stream offset
+	 *
+	 * @param   integer  $offset  The starting offset.
+	 * @param   integer  $whence  SEEK_SET, SEEK_CUR, SEEK_END
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function stream_seek($offset, $whence)
+	{
+		// $whence: SEEK_SET, SEEK_CUR, SEEK_END
+		if ($offset > $this->len)
+		{
+			// We can't seek beyond our len.
+			return false;
+		}
+
+		switch ($whence)
+		{
+			case SEEK_SET:
+				$this->pos = $offset;
+				break;
+
+			case SEEK_CUR:
+				if (($this->pos + $offset) < $this->len)
+				{
+					$this->pos += $offset;
+				}
+				else
+				{
+					return false;
+				}
+				break;
+
+			case SEEK_END:
+				$this->pos = $this->len - $offset;
+				break;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Stream flush, always returns true.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @note    Data storage is not supported
+	 */
+	public function stream_flush()
+	{
+		// We don't store data.
+		return true;
+	}
+}
+
+stream_wrapper_register('string', 'JStreamString') or die('JStreamString Wrapper Registration Failed');
diff --git a/core/libraries/joomla/filesystem/support/stringcontroller.php b/core/libraries/joomla/filesystem/support/stringcontroller.php
new file mode 100644
index 00000000..6e67e796
--- /dev/null
+++ b/core/libraries/joomla/filesystem/support/stringcontroller.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  FileSystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * String Controller
+ *
+ * @since  11.1
+ */
+class JStringController
+{
+	/**
+	 * Defines a variable as an array
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function _getArray()
+	{
+		static $strings = array();
+
+		return $strings;
+	}
+
+	/**
+	 * Create a reference
+	 *
+	 * @param   string  $reference  The key
+	 * @param   string  &$string    The value
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function createRef($reference, &$string)
+	{
+		$ref = &self::_getArray();
+		$ref[$reference] = & $string;
+	}
+
+	/**
+	 * Get reference
+	 *
+	 * @param   string  $reference  The key for the reference.
+	 *
+	 * @return  mixed  False if not set, reference if it exists
+	 *
+	 * @since   11.1
+	 */
+	public function getRef($reference)
+	{
+		$ref = &self::_getArray();
+
+		if (isset($ref[$reference]))
+		{
+			return $ref[$reference];
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/filesystem/wrapper/file.php b/core/libraries/joomla/filesystem/wrapper/file.php
new file mode 100644
index 00000000..25b0ca9f
--- /dev/null
+++ b/core/libraries/joomla/filesystem/wrapper/file.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Filesystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.file');
+
+/**
+ * Wrapper class for JFile
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Filesystem
+ * @since       3.4
+ */
+class JFilesystemWrapperFile
+{
+	/**
+	 * Helper wrapper method for getExt
+	 *
+	 * @param   string  $file  The file name.
+	 *
+	 * @return  string  The file extension.
+	 *
+	 * @see     JFile::getExt()
+	 * @since   3.4
+	 */
+	public function getExt($file)
+	{
+		return JFile::getExt($file);
+	}
+
+	/**
+	 * Helper wrapper method for stripExt
+	 *
+	 * @param   string  $file  The file name.
+	 *
+	 * @return  string  The file name without the extension.
+	 *
+	 * @see     JFile::stripExt()
+	 * @since   3.4
+	 */
+	public function stripExt($file)
+	{
+		return JFile::stripExt($file);
+	}
+
+	/**
+	 * Helper wrapper method for makeSafe
+	 *
+	 * @param   string  $file  The name of the file [not full path].
+	 *
+	 * @return  string  The sanitised string.
+	 *
+	 * @see     JFile::makeSafe()
+	 * @since   3.4
+	 */
+	public function makeSafe($file)
+	{
+		return JFile::makeSafe($file);
+	}
+
+	/**
+	 * Helper wrapper method for copy
+	 *
+	 * @param   string   $src          The path to the source file.
+	 * @param   string   $dest         The path to the destination file.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $use_streams  True to use streams.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFile::copy()
+	 * @since   3.4
+	 */
+	public function copy($src, $dest, $path = null, $use_streams = false)
+	{
+		return JFile::copy($src, $dest, $path, $use_streams);
+	}
+
+	/**
+	 * Helper wrapper method for delete
+	 *
+	 * @param   mixed  $file  The file name or an array of file names
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFile::delete()
+	 * @since   3.4
+	 */
+	public function delete($file)
+	{
+		return JFile::delete($file);
+	}
+
+	/**
+	 * Helper wrapper method for move
+	 *
+	 * @param   string   $src          The path to the source file.
+	 * @param   string   $dest         The path to the destination file.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $use_streams  True to use streams.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFile::move()
+	 * @since   3.4
+	 */
+	public function move($src, $dest, $path = '', $use_streams = false)
+	{
+		return JFile::move($src, $dest, $path, $use_streams);
+	}
+
+	/**
+	 * Helper wrapper method for read
+	 *
+	 * @param   string   $filename   The full file path.
+	 * @param   boolean  $incpath    Use include path.
+	 * @param   integer  $amount     Amount of file to read.
+	 * @param   integer  $chunksize  Size of chunks to read.
+	 * @param   integer  $offset     Offset of the file.
+	 *
+	 * @return mixed  Returns file contents or boolean False if failed.
+	 *
+	 * @see     JFile::read()
+	 * @since   3.4
+	 */
+	public function read($filename, $incpath = false, $amount = 0, $chunksize = 8192, $offset = 0)
+	{
+		return JFile::read($filename, $incpath, $amount, $chunksize, $offset);
+	}
+
+	/**
+	 * Helper wrapper method for write
+	 *
+	 * @param   string   $file         The full file path.
+	 * @param   string   &$buffer      The buffer to write.
+	 * @param   boolean  $use_streams  Use streams.
+	 *
+	 * @return boolean  True on success.
+	 *
+	 * @see     JFile::write()
+	 * @since   3.4
+	 */
+	public function write($file, &$buffer, $use_streams = false)
+	{
+		return JFile::write($file, $buffer, $use_streams);
+	}
+
+	/**
+	 * Helper wrapper method for upload
+	 *
+	 * @param   string   $src          The name of the php (temporary) uploaded file.
+	 * @param   string   $dest         The path (including filename) to move the uploaded file to.
+	 * @param   boolean  $use_streams  True to use streams.
+	 *
+	 * @return boolean  True on success.
+	 *
+	 * @see     JFile::upload()
+	 * @since   3.4
+	 */
+	public function upload($src, $dest, $use_streams = false)
+	{
+		return JFile::upload($src, $dest, $use_streams);
+	}
+
+	/**
+	 * Helper wrapper method for exists
+	 *
+	 * @param   string  $file  File path.
+	 *
+	 * @return boolean  True if path is a file.
+	 *
+	 * @see     JFile::exists()
+	 * @since   3.4
+	 */
+	public function exists($file)
+	{
+		return JFile::exists($file);
+	}
+
+	/**
+	 * Helper wrapper method for getName
+	 *
+	 * @param   string  $file  File path.
+	 *
+	 * @return string  filename.
+	 *
+	 * @see     JFile::getName()
+	 * @since   3.4
+	 */
+	public function getName($file)
+	{
+		return JFile::getName($file);
+	}
+}
diff --git a/core/libraries/joomla/filesystem/wrapper/folder.php b/core/libraries/joomla/filesystem/wrapper/folder.php
new file mode 100644
index 00000000..69272645
--- /dev/null
+++ b/core/libraries/joomla/filesystem/wrapper/folder.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Filesystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Wrapper class for JFilesystemFolder
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Filesystem
+ * @since       3.4
+ */
+class JFilesystemWrapperFolder
+{
+	/**
+	 * Helper wrapper method for copy
+	 *
+	 * @param   string   $src          The path to the source folder.
+	 * @param   string   $dest         The path to the destination folder.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $force        Force copy.
+	 * @param   boolean  $use_streams  Optionally force folder/file overwrites.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFolder::copy()
+	 * @since   3.4
+	 * @throws  RuntimeException
+	 */
+	public function copy($src, $dest, $path = '', $force = false, $use_streams = false)
+	{
+		return JFolder::copy($src, $dest, $path, $force, $use_streams);
+	}
+
+	/**
+	 * Helper wrapper method for create
+	 *
+	 * @param   string   $path  A path to create from the base path.
+	 * @param   integer  $mode  Directory permissions to set for folders created. 0755 by default.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @see     JFolder::create()
+	 * @since   3.4
+	 */
+	public function create($path = '', $mode = 493)
+	{
+		return JFolder::create($path, $mode);
+	}
+
+	/**
+	 * Helper wrapper method for delete
+	 *
+	 * @param   string  $path  The path to the folder to delete.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFolder::delete()
+	 * @since   3.4
+	 * @throws  UnexpectedValueException
+	 */
+	public function delete($path)
+	{
+		return JFolder::delete($path);
+	}
+
+	/**
+	 * Helper wrapper method for move
+	 *
+	 * @param   string   $src          The path to the source folder.
+	 * @param   string   $dest         The path to the destination folder.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $use_streams  Optionally use streams.
+	 *
+	 * @return  mixed  Error message on false or boolean true on success.
+	 *
+	 * @see     JFolder::move()
+	 * @since   3.4
+	 */
+	public function move($src, $dest, $path = '', $use_streams = false)
+	{
+		return JFolder::move($src, $dest, $path, $use_streams);
+	}
+
+	/**
+	 * Helper wrapper method for exists
+	 *
+	 * @param   string  $path  Folder name relative to installation dir.
+	 *
+	 * @return  boolean  True if path is a folder.
+	 *
+	 * @see     JFolder::exists()
+	 * @since   3.4
+	 */
+	public function exists($path)
+	{
+		return JFolder::exists($path);
+	}
+
+	/**
+	 * Helper wrapper method for files
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for file names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the file.
+	 * @param   array    $exclude        Array with names of files which should not be shown in the result.
+	 * @param   array    $excludefilter  Array of filter to exclude.
+	 * @param   boolean  $naturalSort    False for asort, true for natsort.
+	 *
+	 * @return  array  Files in the given folder.
+	 *
+	 * @see     JFolder::files()
+	 * @since   3.4
+	 */
+	public function files($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*', '.*~'), $naturalSort = false)
+	{
+		return JFolder::files($path, $filter, $recurse, $full, $exclude, $excludefilter, $naturalSort);
+	}
+
+	/**
+	 * Helper wrapper method for folders
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for folder names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the folders.
+	 * @param   array    $exclude        Array with names of folders which should not be shown in the result.
+	 * @param   array    $excludefilter  Array with regular expressions matching folders which should not be shown in the result.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @see     JFolder::folders()
+	 * @since   3.4
+	 */
+	public function folders($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*'))
+	{
+		return JFolder::folders($path, $filter, $recurse, $full, $exclude, $excludefilter);
+	}
+
+	/**
+	 * Helper wrapper method for listFolderTree
+	 *
+	 * @param   string   $path      The path of the folder to read.
+	 * @param   string   $filter    A filter for folder names.
+	 * @param   integer  $maxLevel  The maximum number of levels to recursively read, defaults to three.
+	 * @param   integer  $level     The current level, optional.
+	 * @param   integer  $parent    Unique identifier of the parent folder, if any.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @see     JFolder::listFolderTree()
+	 * @since   3.4
+	 */
+	public function listFolderTree($path, $filter, $maxLevel = 3, $level = 0, $parent = 0)
+	{
+		return JFolder::listFolderTree($path, $filter, $maxLevel, $level, $parent);
+	}
+
+	/**
+	 * Helper wrapper method for makeSafe
+	 *
+	 * @param   string  $path  The full path to sanitise.
+	 *
+	 * @return  string  The sanitised string
+	 *
+	 * @see     JFolder::makeSafe()
+	 * @since   3.4
+	 */
+	public function makeSafe($path)
+	{
+		return JFolder::makeSafe($path);
+	}
+}
diff --git a/core/libraries/joomla/filesystem/wrapper/path.php b/core/libraries/joomla/filesystem/wrapper/path.php
new file mode 100644
index 00000000..46801c2e
--- /dev/null
+++ b/core/libraries/joomla/filesystem/wrapper/path.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Filesystem
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.path');
+
+/**
+ * Wrapper class for JPath
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Filesystem
+ * @since       3.4
+ */
+class JFilesystemWrapperPath
+{
+	/**
+	 * Helper wrapper method for canChmod
+	 *
+	 * @param   string  $path  Path to check.
+	 *
+	 * @return  boolean  True if path can have mode changed.
+	 *
+	 * @see     JPath::canChmod()
+	 * @since   3.4
+	 */
+	public function canChmod($path)
+	{
+		return JPath::canChmod($path);
+	}
+
+	/**
+	 * Helper wrapper method for setPermissions
+	 *
+	 * @param   string  $path        Root path to begin changing mode [without trailing slash].
+	 * @param   string  $filemode    Octal representation of the value to change file mode to [null = no change].
+	 * @param   string  $foldermode  Octal representation of the value to change folder mode to [null = no change].
+	 *
+	 * @return  boolean  True if successful [one fail means the whole operation failed].
+	 *
+	 * @see     JPath::setPermissions()
+	 * @since   3.4
+	 */
+	public function setPermissions($path, $filemode = '0644', $foldermode = '0755')
+	{
+		return JPath::setPermissions($path, $filemode, $foldermode);
+	}
+
+	/**
+	 * Helper wrapper method for getPermissions
+	 *
+	 * @param   string  $path  The path of a file/folder.
+	 *
+	 * @return  string  Filesystem permissions.
+	 *
+	 * @see     JPath::getPermissions()
+	 * @since   3.4
+	 */
+	public function getPermissions($path)
+	{
+		return JPath::getPermissions($path);
+	}
+
+	/**
+	 * Helper wrapper method for check
+	 *
+	 * @param   string  $path  A file system path to check.
+	 *
+	 * @return  string  A cleaned version of the path or exit on error.
+	 *
+	 * @see     JPath::check()
+	 * @since   3.4
+	 * @throws  Exception
+	 */
+	public function check($path)
+	{
+		return JPath::check($path);
+	}
+
+	/**
+	 * Helper wrapper method for clean
+	 *
+	 * @param   string  $path  The path to clean.
+	 * @param   string  $ds    Directory separator (optional).
+	 *
+	 * @return  string  The cleaned path.
+	 *
+	 * @see     JPath::clean()
+	 * @since   3.4
+	 * @throws  UnexpectedValueException
+	 */
+	public function clean($path, $ds = DIRECTORY_SEPARATOR)
+	{
+		return JPath::clean($path, $ds);
+	}
+
+	/**
+	 * Helper wrapper method for isOwner
+	 *
+	 * @param   string  $path  Path to check ownership.
+	 *
+	 * @return  boolean  True if the php script owns the path passed.
+	 *
+	 * @see     JPath::isOwner()
+	 * @since   3.4
+	 */
+	public function isOwner($path)
+	{
+		return JPath::isOwner($path);
+	}
+
+	/**
+	 * Helper wrapper method for find
+	 *
+	 * @param   mixed   $paths  A path string or array of path strings to search in
+	 * @param   string  $file   The file name to look for.
+	 *
+	 * @return mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+	 *
+	 * @see     JPath::find()
+	 * @since   3.4
+	 */
+	public function find($paths, $file)
+	{
+		return JPath::find($paths, $file);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/accesslevel.php b/core/libraries/joomla/form/fields/accesslevel.php
new file mode 100644
index 00000000..8683ef0a
--- /dev/null
+++ b/core/libraries/joomla/form/fields/accesslevel.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a list of access levels. Access levels control what users in specific
+ * groups can see.
+ *
+ * @see    JAccess
+ * @since  11.1
+ */
+class JFormFieldAccessLevel extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'AccessLevel';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= $this->disabled ? ' disabled' : '';
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= $this->required ? ' required aria-required="true"' : '';
+		$attr .= $this->autofocus ? ' autofocus' : '';
+
+		// Initialize JavaScript field attributes.
+		$attr .= $this->onchange ? ' onchange="' . $this->onchange . '"' : '';
+
+		// Get the field options.
+		$options = $this->getOptions();
+
+		return JHtml::_('access.level', $this->name, $this->value, $attr, $options, $this->id);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/aliastag.php b/core/libraries/joomla/form/fields/aliastag.php
new file mode 100644
index 00000000..7f3b0f9d
--- /dev/null
+++ b/core/libraries/joomla/form/fields/aliastag.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Framework.
+ *
+ * @since  11.4
+ */
+class JFormFieldAliastag extends JFormFieldList
+{
+	/**
+	 * The field type.
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $type = 'Aliastag';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array  An array of JHtml options.
+	 *
+	 * @since   3.6
+	 */
+	protected function getOptions()
+	{
+			// Get list of tag type alias
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('Distinct type_alias AS value, type_alias AS text')
+				->from('#__contentitem_tag_map');
+			$db->setQuery($query);
+
+			$options = $db->loadObjectList();
+
+			$lang = JFactory::getLanguage();
+
+			foreach ($options as $i => $item)
+			{
+				$parts     = explode('.', $item->value);
+				$extension = $parts[0];
+				$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+				|| $lang->load($extension, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $extension), null, false, true);
+				$options[$i]->text = JText::_(strtoupper($extension) . '_TAGS_' . strtoupper($parts[1]));
+			}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		// Sort by language value
+		usort(
+			$options,
+			function($a, $b)
+			{
+				return $a->text > $b->text;
+			}
+		);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/cachehandler.php b/core/libraries/joomla/form/fields/cachehandler.php
new file mode 100644
index 00000000..084f7b2a
--- /dev/null
+++ b/core/libraries/joomla/form/fields/cachehandler.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a list of available cache handlers
+ *
+ * @see    JCache
+ * @since  11.1
+ */
+class JFormFieldCacheHandler extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'CacheHandler';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Convert to name => name array.
+		foreach (JCache::getStores() as $store)
+		{
+			$options[] = JHtml::_('select.option', $store, JText::_('JLIB_FORM_VALUE_CACHE_' . $store), 'value', 'text');
+		}
+
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/calendar.php b/core/libraries/joomla/form/fields/calendar.php
new file mode 100644
index 00000000..3bc372ff
--- /dev/null
+++ b/core/libraries/joomla/form/fields/calendar.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ *
+ * Provides a pop up date picker linked to a button.
+ * Optionally may be filtered to use user's or server's time zone.
+ *
+ * @since  11.1
+ */
+class JFormFieldCalendar extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Calendar';
+
+	/**
+	 * The allowable maxlength of calendar field.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $maxlength;
+
+	/**
+	 * The format of date and time.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $format;
+
+	/**
+	 * The filter.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $filter;
+
+	/**
+	 * The minimum year number to subtract/add from the current year
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	protected $minyear;
+
+	/**
+	 * The maximum year number to subtract/add from the current year
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	protected $maxyear;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $layout = 'joomla.form.field.calendar';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'maxlength':
+			case 'format':
+			case 'filter':
+			case 'timeformat':
+			case 'todaybutton':
+			case 'singleheader':
+			case 'weeknumbers':
+			case 'showtime':
+			case 'filltable':
+			case 'minyear':
+			case 'maxyear':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'maxlength':
+			case 'timeformat':
+				$this->$name = (int) $value;
+				break;
+			case 'todaybutton':
+			case 'singleheader':
+			case 'weeknumbers':
+			case 'showtime':
+			case 'filltable':
+			case 'format':
+			case 'filter':
+			case 'minyear':
+			case 'maxyear':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->maxlength    = (int) $this->element['maxlength'] ? (int) $this->element['maxlength'] : 45;
+			$this->format       = (string) $this->element['format'] ? (string) $this->element['format'] : '%Y-%m-%d';
+			$this->filter       = (string) $this->element['filter'] ? (string) $this->element['filter'] : 'USER_UTC';
+			$this->todaybutton  = (string) $this->element['todaybutton'] ? (string) $this->element['todaybutton'] : 'true';
+			$this->weeknumbers  = (string) $this->element['weeknumbers'] ? (string) $this->element['weeknumbers'] : 'true';
+			$this->showtime     = (string) $this->element['showtime'] ? (string) $this->element['showtime'] : 'false';
+			$this->filltable    = (string) $this->element['filltable'] ? (string) $this->element['filltable'] : 'true';
+			$this->timeformat   = (int) $this->element['timeformat'] ? (int) $this->element['timeformat'] : 24;
+			$this->singleheader = (string) $this->element['singleheader'] ? (string) $this->element['singleheader'] : 'false';
+			$this->minyear      = strlen((string) $this->element['minyear']) ? (string) $this->element['minyear'] : null;
+			$this->maxyear      = strlen((string) $this->element['maxyear']) ? (string) $this->element['maxyear'] : null;
+
+			if ($this->maxyear < 0 || $this->minyear > 0)
+			{
+				$this->todaybutton = 'false';
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		$config    = JFactory::getConfig();
+		$user      = JFactory::getUser();
+
+		// Translate the format if requested
+		$translateFormat = (string) $this->element['translateformat'];
+
+		if ($translateFormat && $translateFormat != 'false')
+		{
+			$showTime = (string) $this->element['showtime'];
+
+			if ($showTime && $showTime != 'false')
+			{
+				$this->format = JText::_('DATE_FORMAT_CALENDAR_DATETIME');
+			}
+			else
+			{
+				$this->format = JText::_('DATE_FORMAT_CALENDAR_DATE');
+			}
+		}
+
+		// If a known filter is given use it.
+		switch (strtoupper($this->filter))
+		{
+			case 'SERVER_UTC':
+				// Convert a date to UTC based on the server timezone.
+				if ($this->value && $this->value != JFactory::getDbo()->getNullDate())
+				{
+					// Get a date object based on the correct timezone.
+					$date = JFactory::getDate($this->value, 'UTC');
+					$date->setTimezone(new DateTimeZone($config->get('offset')));
+
+					// Transform the date string.
+					$this->value = $date->format('Y-m-d H:i:s', true, false);
+				}
+				break;
+			case 'USER_UTC':
+				// Convert a date to UTC based on the user timezone.
+				if ($this->value && $this->value != JFactory::getDbo()->getNullDate())
+				{
+					// Get a date object based on the correct timezone.
+					$date = JFactory::getDate($this->value, 'UTC');
+					$date->setTimezone($user->getTimezone());
+
+					// Transform the date string.
+					$this->value = $date->format('Y-m-d H:i:s', true, false);
+				}
+				break;
+		}
+
+		// Format value when not nulldate ('0000-00-00 00:00:00'), otherwise blank it as it would result in 1970-01-01.
+		if ($this->value && $this->value != JFactory::getDbo()->getNullDate() && strtotime($this->value) !== false)
+		{
+			$tz = date_default_timezone_get();
+			date_default_timezone_set('UTC');
+			$this->value = strftime($this->format, strtotime($this->value));
+			date_default_timezone_set($tz);
+		}
+		else
+		{
+			$this->value = '';
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since  3.7.0
+	 */
+	protected function getLayoutData()
+	{
+		$data      = parent::getLayoutData();
+		$tag       = JFactory::getLanguage()->getTag();
+		$calendar  = JFactory::getLanguage()->getCalendar();
+		$direction = strtolower(JFactory::getDocument()->getDirection());
+
+		// Get the appropriate file for the current language date helper
+		$helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js';
+
+		if (!empty($calendar) && is_dir(JPATH_ROOT . '/media/system/js/fields/calendar-locales/date/' . strtolower($calendar)))
+		{
+			$helperPath = 'system/fields/calendar-locales/date/' . strtolower($calendar) . '/date-helper.min.js';
+		}
+
+		// Get the appropriate locale file for the current language
+		$localesPath = 'system/fields/calendar-locales/en.js';
+
+		if (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower($tag) . '.js'))
+		{
+			$localesPath = 'system/fields/calendar-locales/' . strtolower($tag) . '.js';
+		}
+		elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . $tag . '.js'))
+		{
+			$localesPath = 'system/fields/calendar-locales/' . $tag . '.js';
+		}
+		elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js'))
+		{
+			$localesPath = 'system/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js';
+		}
+
+		$extraData = array(
+			'value'        => $this->value,
+			'maxLength'    => $this->maxlength,
+			'format'       => $this->format,
+			'filter'       => $this->filter,
+			'todaybutton'  => ($this->todaybutton === 'true') ? 1 : 0,
+			'weeknumbers'  => ($this->weeknumbers === 'true') ? 1 : 0,
+			'showtime'     => ($this->showtime === 'true') ? 1 : 0,
+			'filltable'    => ($this->filltable === 'true') ? 1 : 0,
+			'timeformat'   => $this->timeformat,
+			'singleheader' => ($this->singleheader === 'true') ? 1 : 0,
+			'helperPath'   => $helperPath,
+			'localesPath'  => $localesPath,
+			'minYear'      => $this->minyear,
+			'maxYear'      => $this->maxyear,
+			'direction'    => $direction,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/checkbox.php b/core/libraries/joomla/form/fields/checkbox.php
new file mode 100644
index 00000000..e7ec021d
--- /dev/null
+++ b/core/libraries/joomla/form/fields/checkbox.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Single checkbox field.
+ * This is a boolean field with null for false and the specified option for true
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.checkbox.html#input.checkbox
+ * @see    JFormFieldCheckboxes
+ * @since  11.1
+ */
+class JFormFieldCheckbox extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Checkbox';
+
+	/**
+	 * The checked state of checkbox field.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $checked = false;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'checked':
+				return $this->checked;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'checked':
+				$value = (string) $value;
+				$this->checked = ($value == 'true' || $value == $name || $value == '1');
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		// Handle the default attribute
+		$default = (string) $element['default'];
+
+		if ($default)
+		{
+			$test = $this->form->getValue((string) $element['name'], $group);
+
+			$value = ($test == $default) ? $default : null;
+		}
+
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$checked = (string) $this->element['checked'];
+			$this->checked = ($checked == 'true' || $checked == 'checked' || $checked == '1');
+
+			empty($this->value) || $this->checked ? null : $this->checked = true;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 * The checked element sets the field to selected.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		// Initialize some field attributes.
+		$class     = !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$disabled  = $this->disabled ? ' disabled' : '';
+		$value     = !empty($this->default) ? $this->default : '1';
+		$required  = $this->required ? ' required aria-required="true"' : '';
+		$autofocus = $this->autofocus ? ' autofocus' : '';
+		$checked   = $this->checked || !empty($this->value) ? ' checked' : '';
+
+		// Initialize JavaScript field attributes.
+		$onclick  = !empty($this->onclick) ? ' onclick="' . $this->onclick . '"' : '';
+		$onchange = !empty($this->onchange) ? ' onchange="' . $this->onchange . '"' : '';
+
+		// Including fallback code for HTML5 non supported browsers.
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+		return '<input type="checkbox" name="' . $this->name . '" id="' . $this->id . '" value="'
+			. htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"' . $class . $checked . $disabled . $onclick . $onchange
+			. $required . $autofocus . ' />';
+	}
+}
diff --git a/core/libraries/joomla/form/fields/checkboxes.php b/core/libraries/joomla/form/fields/checkboxes.php
new file mode 100644
index 00000000..08de997b
--- /dev/null
+++ b/core/libraries/joomla/form/fields/checkboxes.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Displays options as a list of checkboxes.
+ * Multiselect may be forced to be true.
+ *
+ * @see    JFormFieldCheckbox
+ * @since  11.1
+ */
+class JFormFieldCheckboxes extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Checkboxes';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout = 'joomla.form.field.checkboxes';
+
+	/**
+	 * Flag to tell the field to always be in multiple values mode.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $forceMultiple = true;
+
+	/**
+	 * The comma seprated list of checked checkboxes value.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	public $checkedOptions;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'forceMultiple':
+			case 'checkedOptions':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'checkedOptions':
+				$this->checkedOptions = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to get the radio button field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->checkedOptions = (string) $this->element['checked'];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// True if the field has 'value' set. In other words, it has been stored, don't use the default values.
+		$hasValue = (isset($this->value) && !empty($this->value));
+
+		// If a value has been stored, use it. Otherwise, use the defaults.
+		$checkedOptions = $hasValue ? $this->value : $this->checkedOptions;
+
+		$extraData = array(
+			'checkedOptions' => is_array($checkedOptions) ? $checkedOptions : explode(',', (string) $checkedOptions),
+			'hasValue'       => $hasValue,
+			'options'        => $this->getOptions(),
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/color.php b/core/libraries/joomla/form/fields/color.php
new file mode 100644
index 00000000..0d4ece2d
--- /dev/null
+++ b/core/libraries/joomla/form/fields/color.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Color Form Field class for the Joomla Platform.
+ * This implementation is designed to be compatible with HTML5's `<input type="color">`
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.color.html
+ * @since  11.3
+ */
+class JFormFieldColor extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.3
+	 */
+	protected $type = 'Color';
+
+	/**
+	 * The control.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $control = 'hue';
+
+	/**
+	 * The format.
+	 *
+	 * @var    string
+	 * @since  3.6.0
+	 */
+	protected $format = 'hex';
+
+	/**
+	 * The keywords (transparent,initial,inherit).
+	 *
+	 * @var    string
+	 * @since  3.6.0
+	 */
+	protected $keywords = '';
+
+	/**
+	 * The position.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $position = 'default';
+
+	/**
+	 * The colors.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $colors;
+
+	/**
+	 * The split.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $split = 3;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout = 'joomla.form.field.color';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'control':
+			case 'format':
+			case 'keywords':
+			case 'exclude':
+			case 'colors':
+			case 'split':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'split':
+				$value = (int) $value;
+			case 'control':
+			case 'format':
+				$this->$name = (string) $value;
+				break;
+			case 'keywords':
+				$this->$name = (string) $value;
+				break;
+			case 'exclude':
+			case 'colors':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->control  = isset($this->element['control']) ? (string) $this->element['control'] : 'hue';
+			$this->format   = isset($this->element['format']) ? (string) $this->element['format'] : 'hex';
+			$this->keywords = isset($this->element['keywords']) ? (string) $this->element['keywords'] : '';
+			$this->position = isset($this->element['position']) ? (string) $this->element['position'] : 'default';
+			$this->colors   = (string) $this->element['colors'];
+			$this->split    = isset($this->element['split']) ? (int) $this->element['split'] : 3;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.3
+	 */
+	protected function getInput()
+	{
+		// Switch the layouts
+		$this->layout = $this->control === 'simple' ? $this->layout . '.simple' : $this->layout . '.advanced';
+
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.5
+	 */
+	protected function getLayoutData()
+	{
+		$lang  = JFactory::getLanguage();
+		$data  = parent::getLayoutData();
+		$color = strtolower($this->value);
+		$color = ! $color ? '' : $color;
+
+		// Position of the panel can be: right (default), left, top or bottom (default RTL is left)
+		$position = ' data-position="' . (($lang->isRTL() && $this->position == 'default') ? 'left' : $this->position) . '"';
+
+		if (!$color || in_array($color, array('none', 'transparent')))
+		{
+			$color = 'none';
+		}
+		elseif ($color['0'] != '#' && $this->format == 'hex')
+		{
+			$color = '#' . $color;
+		}
+
+		// Assign data for simple/advanced mode
+		$controlModeData = $this->control === 'simple' ? $this->getSimpleModeLayoutData() : $this->getAdvancedModeLayoutData($lang);
+
+		$extraData = array(
+			'color'    => $color,
+			'format'   => $this->format,
+			'keywords' => $this->keywords,
+			'position' => $position,
+			'validate' => $this->validate
+		);
+
+		return array_merge($data, $extraData, $controlModeData);
+	}
+
+	/**
+	 * Method to get the data for the simple mode to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.5
+	 */
+	protected function getSimpleModeLayoutData()
+	{
+		$colors = strtolower($this->colors);
+
+		if (empty($colors))
+		{
+			$colors = array(
+				'none',
+				'#049cdb',
+				'#46a546',
+				'#9d261d',
+				'#ffc40d',
+				'#f89406',
+				'#c3325f',
+				'#7a43b6',
+				'#ffffff',
+				'#999999',
+				'#555555',
+				'#000000',
+			);
+		}
+		else
+		{
+			$colors = explode(',', $colors);
+		}
+
+		if (!$this->split)
+		{
+			$count = count($colors);
+			if ($count % 5 == 0)
+			{
+				$split = 5;
+			}
+			else
+			{
+				if ($count % 4 == 0)
+				{
+					$split = 4;
+				}
+			}
+		}
+
+		$split = $this->split ? $this->split : 3;
+
+		return array(
+			'colors' => $colors,
+			'split'  => $split,
+		);
+	}
+
+	/**
+	 * Method to get the data for the advanced mode to be passed to the layout for rendering.
+	 *
+	 * @param   object  $lang  The language object
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getAdvancedModeLayoutData($lang)
+	{
+		return array(
+			'colors'  => $this->colors,
+			'control' => $this->control,
+			'lang'    => $lang,
+		);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/combo.php b/core/libraries/joomla/form/fields/combo.php
new file mode 100644
index 00000000..20e53f5e
--- /dev/null
+++ b/core/libraries/joomla/form/fields/combo.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Implements a combo box field.
+ *
+ * @since  11.1
+ */
+class JFormFieldCombo extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Combo';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	protected $layout = 'joomla.form.field.combo';
+
+	/**
+	 * Method to get the field input markup for a combo box field.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.8.0
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Get the field options.
+		$options = $this->getOptions();
+
+		$extraData = array(
+			'options' => $options,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/components.php b/core/libraries/joomla/form/fields/components.php
new file mode 100644
index 00000000..9bf319b1
--- /dev/null
+++ b/core/libraries/joomla/form/fields/components.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Framework.
+ *
+ * @since  3.7.0
+ */
+class JFormFieldComponents extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   3.7.0
+	 */
+	protected $type = 'Components';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array  An array of JHtml options.
+	 *
+	 * @since   11.4
+	 */
+	protected function getOptions()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('name AS text, element AS value')
+			->from('#__extensions')
+			->where('enabled >= 1')
+			->where('type =' . $db->quote('component'));
+
+		$items = $db->setQuery($query)->loadObjectList();
+
+		if ($items)
+		{
+			$lang = JFactory::getLanguage();
+
+			foreach ($items as &$item)
+			{
+				// Load language
+				$extension = $item->value;
+
+				$lang->load("$extension.sys", JPATH_ADMINISTRATOR, null, false, true)
+					|| $lang->load("$extension.sys", JPATH_ADMINISTRATOR . '/components/' . $extension, null, false, true);
+
+				// Translate component name
+				$item->text = JText::_($item->text);
+			}
+
+			// Sort by component name
+			$items = ArrayHelper::sortObjects($items, 'text', 1, true, true);
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $items);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/databaseconnection.php b/core/libraries/joomla/form/fields/databaseconnection.php
new file mode 100644
index 00000000..3187b851
--- /dev/null
+++ b/core/libraries/joomla/form/fields/databaseconnection.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a list of available database connections, optionally limiting to
+ * a given list.
+ *
+ * @see    JDatabaseDriver
+ * @since  11.3
+ */
+class JFormFieldDatabaseConnection extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.3
+	 */
+	protected $type = 'DatabaseConnection';
+
+	/**
+	 * Method to get the list of database options.
+	 *
+	 * This method produces a drop down list of available databases supported
+	 * by JDatabaseDriver classes that are also supported by the application.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.3
+	 * @see     JDatabaseDriver::getConnectors()
+	 */
+	protected function getOptions()
+	{
+		// This gets the connectors available in the platform and supported by the server.
+		$available = JDatabaseDriver::getConnectors();
+
+		/**
+		 * This gets the list of database types supported by the application.
+		 * This should be entered in the form definition as a comma separated list.
+		 * If no supported databases are listed, it is assumed all available databases
+		 * are supported.
+		 */
+		$supported = $this->element['supported'];
+
+		if (!empty($supported))
+		{
+			$supported = explode(',', $supported);
+
+			foreach ($supported as $support)
+			{
+				if (in_array($support, $available))
+				{
+					$options[$support] = JText::_(ucfirst($support));
+				}
+			}
+		}
+		else
+		{
+			foreach ($available as $support)
+			{
+				$options[$support] = JText::_(ucfirst($support));
+			}
+		}
+
+		// This will come into play if an application is installed that requires
+		// a database that is not available on the server.
+		if (empty($options))
+		{
+			$options[''] = JText::_('JNONE');
+		}
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/email.php b/core/libraries/joomla/form/fields/email.php
new file mode 100644
index 00000000..3c0daf2d
--- /dev/null
+++ b/core/libraries/joomla/form/fields/email.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('text');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides and input field for email addresses
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.email.html#input.email
+ * @see    JFormRuleEmail
+ * @since  11.1
+ */
+class JFormFieldEMail extends JFormFieldText
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Email';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.email';
+
+	/**
+	 * Method to get the field input markup for email addresses.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.5
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		$extraData = array(
+			'maxLength'  => $this->maxLength,
+			'multiple'   => $this->multiple,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/file.php b/core/libraries/joomla/form/fields/file.php
new file mode 100644
index 00000000..2ad5bcf7
--- /dev/null
+++ b/core/libraries/joomla/form/fields/file.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides an input field for files
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.file.html#input.file
+ * @since  11.1
+ */
+class JFormFieldFile extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'File';
+
+	/**
+	 * The accepted file type list.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $accept;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $layout = 'joomla.form.field.file';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'accept':
+				return $this->accept;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'accept':
+				$this->accept = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->accept = (string) $this->element['accept'];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup for the file field.
+	 * Field attributes allow specification of a maximum file size and a string
+	 * of accepted file extensions.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @note    The field does not include an upload mechanism.
+	 * @see     JFormFieldMedia
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		$extraData = array(
+			'accept'   => $this->accept,
+			'multiple' => $this->multiple,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/filelist.php b/core/libraries/joomla/form/fields/filelist.php
new file mode 100644
index 00000000..da864d71
--- /dev/null
+++ b/core/libraries/joomla/form/fields/filelist.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.file');
+jimport('joomla.filesystem.path');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Supports an HTML select list of files
+ *
+ * @since  11.1
+ */
+class JFormFieldFileList extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'FileList';
+
+	/**
+	 * The filter.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $filter;
+
+	/**
+	 * The exclude.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $exclude;
+
+	/**
+	 * The hideNone.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $hideNone = false;
+
+	/**
+	 * The hideDefault.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $hideDefault = false;
+
+	/**
+	 * The stripExt.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $stripExt = false;
+
+	/**
+	 * The directory.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $directory;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'filter':
+			case 'exclude':
+			case 'hideNone':
+			case 'hideDefault':
+			case 'stripExt':
+			case 'directory':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'filter':
+			case 'directory':
+			case 'exclude':
+				$this->$name = (string) $value;
+				break;
+
+			case 'hideNone':
+			case 'hideDefault':
+			case 'stripExt':
+				$value = (string) $value;
+				$this->$name = ($value === 'true' || $value === $name || $value === '1');
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->filter  = (string) $this->element['filter'];
+			$this->exclude = (string) $this->element['exclude'];
+
+			$hideNone       = (string) $this->element['hide_none'];
+			$this->hideNone = ($hideNone == 'true' || $hideNone == 'hideNone' || $hideNone == '1');
+
+			$hideDefault       = (string) $this->element['hide_default'];
+			$this->hideDefault = ($hideDefault == 'true' || $hideDefault == 'hideDefault' || $hideDefault == '1');
+
+			$stripExt       = (string) $this->element['stripext'];
+			$this->stripExt = ($stripExt == 'true' || $stripExt == 'stripExt' || $stripExt == '1');
+
+			// Get the path in which to search for file options.
+			$this->directory = (string) $this->element['directory'];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the list of files for the field options.
+	 * Specify the target directory with a directory attribute
+	 * Attributes allow an exclude mask and stripping of extensions from file name.
+	 * Default attribute may optionally be set to null (no file) or -1 (use a default).
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$path = $this->directory;
+
+		if (!is_dir($path))
+		{
+			$path = JPATH_ROOT . '/' . $path;
+		}
+		
+		$path = JPath::clean($path);
+
+		// Prepend some default options based on field attributes.
+		if (!$this->hideNone)
+		{
+			$options[] = JHtml::_('select.option', '-1', JText::alt('JOPTION_DO_NOT_USE', preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)));
+		}
+
+		if (!$this->hideDefault)
+		{
+			$options[] = JHtml::_('select.option', '', JText::alt('JOPTION_USE_DEFAULT', preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)));
+		}
+
+		// Get a list of files in the search path with the given filter.
+		$files = JFolder::files($path, $this->filter);
+
+		// Build the options list from the list of files.
+		if (is_array($files))
+		{
+			foreach ($files as $file)
+			{
+				// Check to see if the file is in the exclude mask.
+				if ($this->exclude)
+				{
+					if (preg_match(chr(1) . $this->exclude . chr(1), $file))
+					{
+						continue;
+					}
+				}
+
+				// If the extension is to be stripped, do it.
+				if ($this->stripExt)
+				{
+					$file = JFile::stripExt($file);
+				}
+
+				$options[] = JHtml::_('select.option', $file, $file);
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/folderlist.php b/core/libraries/joomla/form/fields/folderlist.php
new file mode 100644
index 00000000..b4aaa578
--- /dev/null
+++ b/core/libraries/joomla/form/fields/folderlist.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+jimport('joomla.filesystem.path');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Supports an HTML select list of folder
+ *
+ * @since  11.1
+ */
+class JFormFieldFolderList extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'FolderList';
+
+	/**
+	 * The filter.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $filter;
+
+	/**
+	 * The exclude.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $exclude;
+
+	/**
+	 * The recursive.
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $recursive;
+
+	/**
+	 * The hideNone.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $hideNone = false;
+
+	/**
+	 * The hideDefault.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $hideDefault = false;
+
+	/**
+	 * The directory.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $directory;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'filter':
+			case 'exclude':
+			case 'recursive':
+			case 'hideNone':
+			case 'hideDefault':
+			case 'directory':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'filter':
+			case 'directory':
+			case 'exclude':
+			case 'recursive':
+				$this->$name = (string) $value;
+				break;
+
+			case 'hideNone':
+			case 'hideDefault':
+				$value = (string) $value;
+				$this->$name = ($value === 'true' || $value === $name || $value === '1');
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->filter  = (string) $this->element['filter'];
+			$this->exclude = (string) $this->element['exclude'];
+
+			$recursive       = (string) $this->element['recursive'];
+			$this->recursive = ($recursive == 'true' || $recursive == 'recursive' || $recursive == '1');
+
+			$hideNone       = (string) $this->element['hide_none'];
+			$this->hideNone = ($hideNone == 'true' || $hideNone == 'hideNone' || $hideNone == '1');
+
+			$hideDefault       = (string) $this->element['hide_default'];
+			$this->hideDefault = ($hideDefault == 'true' || $hideDefault == 'hideDefault' || $hideDefault == '1');
+
+			// Get the path in which to search for file options.
+			$this->directory = (string) $this->element['directory'];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		$path = $this->directory;
+
+		if (!is_dir($path))
+		{
+			$path = JPATH_ROOT . '/' . $path;
+		}
+		
+		$path = JPath::clean($path);
+
+		// Prepend some default options based on field attributes.
+		if (!$this->hideNone)
+		{
+			$options[] = JHtml::_('select.option', '-1', JText::alt('JOPTION_DO_NOT_USE', preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)));
+		}
+
+		if (!$this->hideDefault)
+		{
+			$options[] = JHtml::_('select.option', '', JText::alt('JOPTION_USE_DEFAULT', preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)));
+		}
+
+		// Get a list of folders in the search path with the given filter.
+		$folders = JFolder::folders($path, $this->filter, $this->recursive, true);
+
+		// Build the options list from the list of folders.
+		if (is_array($folders))
+		{
+			foreach ($folders as $folder)
+			{
+				// Check to see if the file is in the exclude mask.
+				if ($this->exclude)
+				{
+					if (preg_match(chr(1) . $this->exclude . chr(1), $folder))
+					{
+						continue;
+					}
+				}
+
+				// Remove the root part and the leading /
+				$folder = trim(str_replace($path, '', $folder), '/');
+
+				$options[] = JHtml::_('select.option', $folder, $folder);
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/groupedlist.php b/core/libraries/joomla/form/fields/groupedlist.php
new file mode 100644
index 00000000..5c471816
--- /dev/null
+++ b/core/libraries/joomla/form/fields/groupedlist.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a grouped list select field.
+ *
+ * @since  11.1
+ */
+class JFormFieldGroupedList extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'GroupedList';
+
+	/**
+	 * Method to get the field option groups.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   11.1
+	 * @throws  UnexpectedValueException
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+		$label = 0;
+
+		foreach ($this->element->children() as $element)
+		{
+			switch ($element->getName())
+			{
+				// The element is an <option />
+				case 'option':
+					// Initialize the group if necessary.
+					if (!isset($groups[$label]))
+					{
+						$groups[$label] = array();
+					}
+
+					$disabled = (string) $element['disabled'];
+					$disabled = ($disabled == 'true' || $disabled == 'disabled' || $disabled == '1');
+
+					// Create a new option object based on the <option /> element.
+					$tmp = JHtml::_(
+						'select.option', ($element['value']) ? (string) $element['value'] : trim((string) $element),
+						JText::alt(trim((string) $element), preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)), 'value', 'text',
+						$disabled
+					);
+
+					// Set some option attributes.
+					$tmp->class = (string) $element['class'];
+
+					// Set some JavaScript option attributes.
+					$tmp->onclick = (string) $element['onclick'];
+
+					// Add the option.
+					$groups[$label][] = $tmp;
+					break;
+
+				// The element is a <group />
+				case 'group':
+					// Get the group label.
+					if ($groupLabel = (string) $element['label'])
+					{
+						$label = JText::_($groupLabel);
+					}
+
+					// Initialize the group if necessary.
+					if (!isset($groups[$label]))
+					{
+						$groups[$label] = array();
+					}
+
+					// Iterate through the children and build an array of options.
+					foreach ($element->children() as $option)
+					{
+						// Only add <option /> elements.
+						if ($option->getName() != 'option')
+						{
+							continue;
+						}
+
+						$disabled = (string) $option['disabled'];
+						$disabled = ($disabled == 'true' || $disabled == 'disabled' || $disabled == '1');
+
+						// Create a new option object based on the <option /> element.
+						$tmp = JHtml::_(
+							'select.option', ($option['value']) ? (string) $option['value'] : JText::_(trim((string) $option)),
+							JText::_(trim((string) $option)), 'value', 'text', $disabled
+						);
+
+						// Set some option attributes.
+						$tmp->class = (string) $option['class'];
+
+						// Set some JavaScript option attributes.
+						$tmp->onclick = (string) $option['onclick'];
+
+						// Add the option.
+						$groups[$label][] = $tmp;
+					}
+
+					if ($groupLabel)
+					{
+						$label = count($groups);
+					}
+					break;
+
+				// Unknown element type.
+				default:
+					throw new UnexpectedValueException(sprintf('Unsupported element %s in JFormFieldGroupedList', $element->getName()), 500);
+			}
+		}
+
+		reset($groups);
+
+		return $groups;
+	}
+
+	/**
+	 * Method to get the field input markup fora grouped list.
+	 * Multiselect is enabled by using the multiple attribute.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= $this->required ? ' required aria-required="true"' : '';
+		$attr .= $this->autofocus ? ' autofocus' : '';
+
+		// To avoid user's confusion, readonly="true" should imply disabled="true".
+		if ($this->readonly || $this->disabled)
+		{
+			$attr .= ' disabled="disabled"';
+		}
+
+		// Initialize JavaScript field attributes.
+		$attr .= !empty($this->onchange) ? ' onchange="' . $this->onchange . '"' : '';
+
+		// Get the field groups.
+		$groups = (array) $this->getGroups();
+
+		// Create a read-only list (no name) with a hidden input to store the value.
+		if ($this->readonly)
+		{
+			$html[] = JHtml::_(
+				'select.groupedlist', $groups, null,
+				array(
+					'list.attr' => $attr, 'id' => $this->id, 'list.select' => $this->value, 'group.items' => null, 'option.key.toHtml' => false,
+					'option.text.toHtml' => false,
+				)
+			);
+
+			// E.g. form field type tag sends $this->value as array
+			if ($this->multiple && is_array($this->value))
+			{
+				if (!count($this->value))
+				{
+					$this->value[] = '';
+				}
+
+				foreach ($this->value as $value)
+				{
+					$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"/>';
+				}
+			}
+			else
+			{
+				$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
+			}
+		}
+
+		// Create a regular list.
+		else
+		{
+			$html[] = JHtml::_(
+				'select.groupedlist', $groups, $this->name,
+				array(
+					'list.attr' => $attr, 'id' => $this->id, 'list.select' => $this->value, 'group.items' => null, 'option.key.toHtml' => false,
+					'option.text.toHtml' => false,
+				)
+			);
+		}
+
+		return implode($html);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/hidden.php b/core/libraries/joomla/form/fields/hidden.php
new file mode 100644
index 00000000..47160a59
--- /dev/null
+++ b/core/libraries/joomla/form/fields/hidden.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a hidden field
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.hidden.html#input.hidden
+ * @since  11.1
+ */
+class JFormFieldHidden extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Hidden';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.hidden';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		return parent::getLayoutData();
+	}
+}
diff --git a/core/libraries/joomla/form/fields/imagelist.php b/core/libraries/joomla/form/fields/imagelist.php
new file mode 100644
index 00000000..a99b8b8b
--- /dev/null
+++ b/core/libraries/joomla/form/fields/imagelist.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('filelist');
+
+/**
+ * Supports an HTML select list of image
+ *
+ * @since  11.1
+ */
+class JFormFieldImageList extends JFormFieldFileList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'ImageList';
+
+	/**
+	 * Method to get the list of images field options.
+	 * Use the filter attribute to specify allowable file extensions.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		// Define the image file type filter.
+		$this->filter = '\.png$|\.gif$|\.jpg$|\.bmp$|\.ico$|\.jpeg$|\.psd$|\.eps$';
+
+		// Get the field options.
+		return parent::getOptions();
+	}
+}
diff --git a/core/libraries/joomla/form/fields/integer.php b/core/libraries/joomla/form/fields/integer.php
new file mode 100644
index 00000000..e6413406
--- /dev/null
+++ b/core/libraries/joomla/form/fields/integer.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a select list of integers with specified first, last and step values.
+ *
+ * @since  11.1
+ */
+class JFormFieldInteger extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Integer';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Initialize some field attributes.
+		$first = (int) $this->element['first'];
+		$last = (int) $this->element['last'];
+		$step = (int) $this->element['step'];
+
+		// Sanity checks.
+		if ($step == 0)
+		{
+			// Step of 0 will create an endless loop.
+			return $options;
+		}
+		elseif ($first < $last && $step < 0)
+		{
+			// A negative step will never reach the last number.
+			return $options;
+		}
+		elseif ($first > $last && $step > 0)
+		{
+			// A position step will never reach the last number.
+			return $options;
+		}
+		elseif ($step < 0)
+		{
+			// Build the options array backwards.
+			for ($i = $first; $i >= $last; $i += $step)
+			{
+				$options[] = JHtml::_('select.option', $i);
+			}
+		}
+		else
+		{
+			// Build the options array.
+			for ($i = $first; $i <= $last; $i += $step)
+			{
+				$options[] = JHtml::_('select.option', $i);
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/language.php b/core/libraries/joomla/form/fields/language.php
new file mode 100644
index 00000000..f2edb9aa
--- /dev/null
+++ b/core/libraries/joomla/form/fields/language.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a list of installed application languages
+ *
+ * @see    JFormFieldContentLanguage for a select list of content languages.
+ * @since  11.1
+ */
+class JFormFieldLanguage extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Language';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		// Initialize some field attributes.
+		$client = (string) $this->element['client'];
+
+		if ($client != 'site' && $client != 'administrator')
+		{
+			$client = 'site';
+		}
+
+		// Make sure the languages are sorted base on locale instead of random sorting
+		$languages = JLanguageHelper::createLanguageList($this->value, constant('JPATH_' . strtoupper($client)), true, true);
+		if (count($languages) > 1)
+		{
+			usort(
+				$languages,
+				function ($a, $b)
+				{
+					return strcmp($a['value'], $b['value']);
+				}
+			);
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(
+			parent::getOptions(),
+			$languages
+		);
+
+		// Set the default value active language
+		if ($langParams = JComponentHelper::getParams('com_languages'))
+		{
+			switch ((string) $this->value)
+			{
+				case 'site':
+				case 'frontend':
+				case '0':
+					$this->value = $langParams->get('site', 'en-GB');
+					break;
+				case 'admin':
+				case 'administrator':
+				case 'backend':
+				case '1':
+					$this->value = $langParams->get('administrator', 'en-GB');
+					break;
+				case 'active':
+				case 'auto':
+					$lang = JFactory::getLanguage();
+					$this->value = $lang->getTag();
+					break;
+				default:
+				break;
+			}
+		}
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/list.php b/core/libraries/joomla/form/fields/list.php
new file mode 100644
index 00000000..34f8ff60
--- /dev/null
+++ b/core/libraries/joomla/form/fields/list.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a generic list of options.
+ *
+ * @since  11.1
+ */
+class JFormFieldList extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'List';
+
+	/**
+	 * Method to get the field input markup for a generic list.
+	 * Use the multiple attribute to enable multiselect.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= $this->required ? ' required aria-required="true"' : '';
+		$attr .= $this->autofocus ? ' autofocus' : '';
+
+		// To avoid user's confusion, readonly="true" should imply disabled="true".
+		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true' || (string) $this->disabled == '1'|| (string) $this->disabled == 'true')
+		{
+			$attr .= ' disabled="disabled"';
+		}
+
+		// Initialize JavaScript field attributes.
+		$attr .= $this->onchange ? ' onchange="' . $this->onchange . '"' : '';
+
+		// Get the field options.
+		$options = (array) $this->getOptions();
+
+		// Create a read-only list (no name) with hidden input(s) to store the value(s).
+		if ((string) $this->readonly == '1' || (string) $this->readonly == 'true')
+		{
+			$html[] = JHtml::_('select.genericlist', $options, '', trim($attr), 'value', 'text', $this->value, $this->id);
+
+			// E.g. form field type tag sends $this->value as array
+			if ($this->multiple && is_array($this->value))
+			{
+				if (!count($this->value))
+				{
+					$this->value[] = '';
+				}
+
+				foreach ($this->value as $value)
+				{
+					$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"/>';
+				}
+			}
+			else
+			{
+				$html[] = '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
+			}
+		}
+		else
+		// Create a regular list.
+		{
+			$html[] = JHtml::_('select.genericlist', $options, $this->name, trim($attr), 'value', 'text', $this->value, $this->id);
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getOptions()
+	{
+		$fieldname = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname);
+		$options   = array();
+
+		foreach ($this->element->xpath('option') as $option)
+		{
+			// Filter requirements
+			if ($requires = explode(',', (string) $option['requires']))
+			{
+				// Requires multilanguage
+				if (in_array('multilanguage', $requires) && !JLanguageMultilang::isEnabled())
+				{
+					continue;
+				}
+
+				// Requires associations
+				if (in_array('associations', $requires) && !JLanguageAssociations::isEnabled())
+				{
+					continue;
+				}
+
+				// Requires adminlanguage
+				if (in_array('adminlanguage', $requires) && !JModuleHelper::isAdminMultilang())
+				{
+					continue;
+				}
+
+				// Requires vote plugin
+				if (in_array('vote', $requires) && !JPluginHelper::isEnabled('content', 'vote'))
+				{
+					continue;
+				}
+			}
+
+			$value = (string) $option['value'];
+			$text  = trim((string) $option) != '' ? trim((string) $option) : $value;
+
+			$disabled = (string) $option['disabled'];
+			$disabled = ($disabled == 'true' || $disabled == 'disabled' || $disabled == '1');
+			$disabled = $disabled || ($this->readonly && $value != $this->value);
+
+			$checked = (string) $option['checked'];
+			$checked = ($checked == 'true' || $checked == 'checked' || $checked == '1');
+
+			$selected = (string) $option['selected'];
+			$selected = ($selected == 'true' || $selected == 'selected' || $selected == '1');
+
+			$tmp = array(
+					'value'    => $value,
+					'text'     => JText::alt($text, $fieldname),
+					'disable'  => $disabled,
+					'class'    => (string) $option['class'],
+					'selected' => ($checked || $selected),
+					'checked'  => ($checked || $selected),
+			);
+
+			// Set some event handler attributes. But really, should be using unobtrusive js.
+			$tmp['onclick']  = (string) $option['onclick'];
+			$tmp['onchange'] = (string) $option['onchange'];
+
+			// Add the option object to the result set.
+			$options[] = (object) $tmp;
+		}
+
+		if ($this->element['useglobal'])
+		{
+			$tmp        = new stdClass;
+			$tmp->value = '';
+			$tmp->text  = JText::_('JGLOBAL_USE_GLOBAL');
+			$component  = JFactory::getApplication()->input->getCmd('option');
+
+			// Get correct component for menu items
+			if ($component == 'com_menus')
+			{
+				$link      = $this->form->getData()->get('link');
+				$uri       = new JUri($link);
+				$component = $uri->getVar('option', 'com_menus');
+			}
+
+			$params = JComponentHelper::getParams($component);
+			$value  = $params->get($this->fieldname);
+
+			// Try with global configuration
+			if (is_null($value))
+			{
+				$value = JFactory::getConfig()->get($this->fieldname);
+			}
+
+			// Try with menu configuration
+			if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus')
+			{
+				$value = JComponentHelper::getParams('com_menus')->get($this->fieldname);
+			}
+
+			if (!is_null($value))
+			{
+				$value = (string) $value;
+
+				foreach ($options as $option)
+				{
+					if ($option->value === $value)
+					{
+						$value = $option->text;
+
+						break;
+					}
+				}
+
+				$tmp->text = JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value);
+			}
+
+			array_unshift($options, $tmp);
+		}
+
+		reset($options);
+
+		return $options;
+	}
+
+	/**
+	 * Method to add an option to the list field.
+	 *
+	 * @param   string  $text        Text/Language variable of the option.
+	 * @param   array   $attributes  Array of attributes ('name' => 'value' format)
+	 *
+	 * @return  JFormFieldList  For chaining.
+	 *
+	 * @since   3.7.0
+	 */
+	public function addOption($text, $attributes = array())
+	{
+		if ($text && $this->element instanceof SimpleXMLElement)
+		{
+			$child = $this->element->addChild('option', $text);
+
+			foreach ($attributes as $name => $value)
+			{
+				$child->addAttribute($name, $value);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __get($name)
+	{
+		if ($name == 'options')
+		{
+			return $this->getOptions();
+		}
+
+		return parent::__get($name);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/meter.php b/core/libraries/joomla/form/fields/meter.php
new file mode 100644
index 00000000..0983de21
--- /dev/null
+++ b/core/libraries/joomla/form/fields/meter.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('number');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a meter to show value in a range.
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
+ * @since  3.2
+ */
+class JFormFieldMeter extends JFormFieldNumber
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $type = 'Meter';
+
+	/**
+	 * The width of the field increased or decreased.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $width;
+
+	/**
+	 * Whether the field is active or not.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $active = false;
+
+	/**
+	 * Whether the field is animated or not.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $animated = true;
+
+	/**
+	 * The color of the field
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $color;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.meter';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'active':
+			case 'width':
+			case 'animated':
+			case 'color':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'width':
+			case 'color':
+				$this->$name = (string) $value;
+				break;
+
+			case 'active':
+				$value = (string) $value;
+				$this->active = ($value === 'true' || $value === $name || $value === '1');
+				break;
+
+			case 'animated':
+				$value = (string) $value;
+				$this->animated = !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->width = isset($this->element['width']) ? (string) $this->element['width'] : '';
+			$this->color = isset($this->element['color']) ? (string) $this->element['color'] : '';
+
+			$active       = (string) $this->element['active'];
+			$this->active = ($active == 'true' || $active == 'on' || $active == '1');
+
+			$animated       = (string) $this->element['animated'];
+			$this->animated = !($animated == 'false' || $animated == 'off' || $animated == '0');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.5
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$extraData = array(
+			'width'    => $this->width,
+			'color'    => $this->color,
+			'animated' => $this->animated,
+			'active'   => $this->active,
+			'max'      => $this->max,
+			'min'      => $this->min,
+			'step'     => $this->step,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/note.php b/core/libraries/joomla/form/fields/note.php
new file mode 100644
index 00000000..2b4f9c99
--- /dev/null
+++ b/core/libraries/joomla/form/fields/note.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a one line text field.
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
+ * @since  11.1
+ */
+class JFormFieldNote extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Note';
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getLabel()
+	{
+		if (empty($this->element['label']) && empty($this->element['description']))
+		{
+			return '';
+		}
+
+		$title = $this->element['label'] ? (string) $this->element['label'] : ($this->element['title'] ? (string) $this->element['title'] : '');
+		$heading = $this->element['heading'] ? (string) $this->element['heading'] : 'h4';
+		$description = (string) $this->element['description'];
+		$class = !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$close = (string) $this->element['close'];
+
+		$html = array();
+
+		if ($close)
+		{
+			$close = $close == 'true' ? 'alert' : $close;
+			$html[] = '<button type="button" class="close" data-dismiss="' . $close . '">&times;</button>';
+		}
+
+		$html[] = !empty($title) ? '<' . $heading . '>' . JText::_($title) . '</' . $heading . '>' : '';
+		$html[] = !empty($description) ? JText::_($description) : '';
+
+		return '</div><div ' . $class . '>' . implode('', $html);
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		return '';
+	}
+}
diff --git a/core/libraries/joomla/form/fields/number.php b/core/libraries/joomla/form/fields/number.php
new file mode 100644
index 00000000..90b97aa8
--- /dev/null
+++ b/core/libraries/joomla/form/fields/number.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a one line text box with up-down handles to set a number in the field.
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
+ * @since  3.2
+ */
+class JFormFieldNumber extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $type = 'Number';
+
+	/**
+	 * The allowable maximum value of the field.
+	 *
+	 * @var    float
+	 * @since  3.2
+	 */
+	protected $max = null;
+
+	/**
+	 * The allowable minimum value of the field.
+	 *
+	 * @var    float
+	 * @since  3.2
+	 */
+	protected $min = null;
+
+	/**
+	 * The step by which value of the field increased or decreased.
+	 *
+	 * @var    float
+	 * @since  3.2
+	 */
+	protected $step = 0;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.number';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'max':
+			case 'min':
+			case 'step':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'step':
+			case 'min':
+			case 'max':
+				$this->$name = (float) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			// It is better not to force any default limits if none is specified
+			$this->max  = isset($this->element['max']) ? (float) $this->element['max'] : null;
+			$this->min  = isset($this->element['min']) ? (float) $this->element['min'] : null;
+			$this->step = isset($this->element['step']) ? (float) $this->element['step'] : 1;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		if ($this->element['useglobal'])
+		{
+			$component = JFactory::getApplication()->input->getCmd('option');
+
+			// Get correct component for menu items
+			if ($component == 'com_menus')
+			{
+				$link      = $this->form->getData()->get('link');
+				$uri       = new JUri($link);
+				$component = $uri->getVar('option', 'com_menus');
+			}
+
+			$params = JComponentHelper::getParams($component);
+			$value  = $params->get($this->fieldname);
+
+			// Try with global configuration
+			if (is_null($value))
+			{
+				$value = JFactory::getConfig()->get($this->fieldname);
+			}
+
+			// Try with menu configuration
+			if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus')
+			{
+				$value = JComponentHelper::getParams('com_menus')->get($this->fieldname);
+			}
+
+			if (!is_null($value))
+			{
+				$value = (string) $value;
+
+				$this->hint = JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value);
+			}
+		}
+
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$extraData = array(
+			'max'   => $this->max,
+			'min'   => $this->min,
+			'step'  => $this->step,
+			'value' => $this->value,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/password.php b/core/libraries/joomla/form/fields/password.php
new file mode 100644
index 00000000..032dd7db
--- /dev/null
+++ b/core/libraries/joomla/form/fields/password.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Text field for passwords
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.password.html#input.password
+ * @note   Two password fields may be validated as matching using JFormRuleEquals
+ * @since  11.1
+ */
+class JFormFieldPassword extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Password';
+
+	/**
+	 * The threshold of password field.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $threshold = 66;
+
+	/**
+	 * The allowable maxlength of password.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $maxLength;
+
+	/**
+	 * Whether to attach a password strength meter or not.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $meter = false;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.password';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'threshold':
+			case 'maxLength':
+			case 'meter':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		$value = (string) $value;
+
+		switch ($name)
+		{
+			case 'maxLength':
+			case 'threshold':
+				$this->$name = $value;
+				break;
+
+			case 'meter':
+				$this->meter = ($value === 'true' || $value === $name || $value === '1');
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->maxLength = $this->element['maxlength'] ? (int) $this->element['maxlength'] : 99;
+			$this->threshold = $this->element['threshold'] ? (int) $this->element['threshold'] : 66;
+
+			$meter       = (string) $this->element['strengthmeter'];
+			$this->meter = ($meter == 'true' || $meter == 'on' || $meter == '1');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup for password.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$extraData = array(
+			'maxLength' => $this->maxLength,
+			'meter'     => $this->meter,
+			'threshold' => $this->threshold,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/plugins.php b/core/libraries/joomla/form/fields/plugins.php
new file mode 100644
index 00000000..b2c0be0b
--- /dev/null
+++ b/core/libraries/joomla/form/fields/plugins.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Framework.
+ *
+ * @since  11.4
+ */
+class JFormFieldPlugins extends JFormFieldList
+{
+	/**
+	 * The field type.
+	 *
+	 * @var    string
+	 * @since  11.4
+	 */
+	protected $type = 'Plugins';
+
+	/**
+	 * The path to folder for plugins.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $folder;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'folder':
+				return $this->folder;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'folder':
+				$this->folder = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->folder = (string) $this->element['folder'];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array  An array of JHtml options.
+	 *
+	 * @since   11.4
+	 */
+	protected function getOptions()
+	{
+		$folder        = $this->folder;
+		$parentOptions = parent::getOptions();
+
+		if (!empty($folder))
+		{
+			// Get list of plugins
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('element AS value, name AS text')
+				->from('#__extensions')
+				->where('folder = ' . $db->quote($folder))
+				->where('enabled = 1')
+				->order('ordering, name');
+
+			if ((string) $this->element['useaccess'] === 'true')
+			{
+				$groups = implode(',', JFactory::getUser()->getAuthorisedViewLevels());
+				$query->where($db->quoteName('access') . ' IN (' . $groups . ')');
+			}
+
+			$options   = $db->setQuery($query)->loadObjectList();
+			$lang      = JFactory::getLanguage();
+			$useGlobal = $this->element['useglobal'];
+
+			if ($useGlobal)
+			{
+				$globalValue = JFactory::getConfig()->get($this->fieldname);
+			}
+
+			foreach ($options as $i => $item)
+			{
+				$source    = JPATH_PLUGINS . '/' . $folder . '/' . $item->value;
+				$extension = 'plg_' . $folder . '_' . $item->value;
+				$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true) || $lang->load($extension . '.sys', $source, null, false, true);
+				$options[$i]->text = JText::_($item->text);
+
+				// If we are using useglobal update the use global value text with the plugin text.
+				if ($useGlobal && isset($parentOptions[0]) && $item->value === $globalValue)
+				{
+					$text                   = JText::_($extension);
+					$parentOptions[0]->text = JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', ($text === '' || $text === $extension ? $item->value : $text));
+				}
+			}
+		}
+		else
+		{
+			JLog::add(JText::_('JFRAMEWORK_FORM_FIELDS_PLUGINS_ERROR_FOLDER_EMPTY'), JLog::WARNING, 'jerror');
+		}
+
+		return array_merge($parentOptions, $options);
+	}
+
+	/**
+	 * Method to get input and also set field readonly.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.8.7
+	 */
+	protected function getInput()
+	{
+		if (count($this->options) === 1 && $this->options[0]->text === JText::_('JOPTION_DO_NOT_USE'))
+		{
+			$this->readonly = true;
+		}
+
+		return parent::getInput();
+	}
+}
diff --git a/core/libraries/joomla/form/fields/predefinedlist.php b/core/libraries/joomla/form/fields/predefinedlist.php
new file mode 100644
index 00000000..0979b18e
--- /dev/null
+++ b/core/libraries/joomla/form/fields/predefinedlist.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field to load a list of predefined values
+ *
+ * @since  3.2
+ */
+abstract class JFormFieldPredefinedList extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $type = 'PredefinedList';
+
+	/**
+	 * Cached array of the category items.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $options = array();
+
+	/**
+	 * Available predefined options
+	 *
+	 * @var  array
+	 * @since  3.2
+	 */
+	protected $predefinedOptions = array();
+
+	/**
+	 * Translate options labels ?
+	 *
+	 * @var  boolean
+	 * @since  3.2
+	 */
+	protected $translate = true;
+
+	/**
+	 * Method to get the options to populate list
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.2
+	 */
+	protected function getOptions()
+	{
+		// Hash for caching
+		$hash = md5($this->element);
+		$type = strtolower($this->type);
+
+		if (!isset(static::$options[$type][$hash]) && !empty($this->predefinedOptions))
+		{
+			static::$options[$type][$hash] = parent::getOptions();
+
+			$options = array();
+
+			// Allow to only use specific values of the predefined list
+			$filter = isset($this->element['filter']) ? explode(',', $this->element['filter']) : array();
+
+			foreach ($this->predefinedOptions as $value => $text)
+			{
+				if (empty($filter) || in_array($value, $filter))
+				{
+					$text = $this->translate ? JText::_($text) : $text;
+
+					$options[] = (object) array(
+						'value' => $value,
+						'text'  => $text,
+					);
+				}
+			}
+
+			static::$options[$type][$hash] = array_merge(static::$options[$type][$hash], $options);
+		}
+
+		return static::$options[$type][$hash];
+	}
+}
diff --git a/core/libraries/joomla/form/fields/radio.php b/core/libraries/joomla/form/fields/radio.php
new file mode 100644
index 00000000..781dc83c
--- /dev/null
+++ b/core/libraries/joomla/form/fields/radio.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides radio button inputs
+ *
+ * @link   http://www.w3.org/TR/html-markup/command.radio.html#command.radio
+ * @since  11.1
+ */
+class JFormFieldRadio extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Radio';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout = 'joomla.form.field.radio';
+
+	/**
+	 * Method to get the radio button field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		$extraData = array(
+			'options' => $this->getOptions(),
+			'value'   => (string) $this->value,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/range.php b/core/libraries/joomla/form/fields/range.php
new file mode 100644
index 00000000..16bef803
--- /dev/null
+++ b/core/libraries/joomla/form/fields/range.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('number');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a horizontal scroll bar to specify a value in a range.
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
+ * @since  3.2
+ */
+class JFormFieldRange extends JFormFieldNumber
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $type = 'Range';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.range';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$extraData = array(
+			'max' => $this->max,
+			'min' => $this->min,
+			'step' => $this->step,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/repeatable.php b/core/libraries/joomla/form/fields/repeatable.php
new file mode 100644
index 00000000..83e04264
--- /dev/null
+++ b/core/libraries/joomla/form/fields/repeatable.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Display a JSON loaded window with a repeatable set of sub fields
+ *
+ * @since       3.2
+ *
+ * @deprecated  4.0  Use JFormFieldSubform
+ */
+class JFormFieldRepeatable extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $type = 'Repeatable';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		JLog::add('JFormFieldRepeatable is deprecated. Use JFormFieldSubform instead.', JLog::WARNING, 'deprecated');
+
+		// Initialize variables.
+		$subForm = new JForm($this->name, array('control' => 'jform'));
+		$xml = $this->element->children()->asXml();
+		$subForm->load($xml);
+
+		// Needed for repeating modals in gmaps
+		// @TODO: what and where???
+		$subForm->repeatCounter = (int) @$this->form->repeatCounter;
+
+		$children = $this->element->children();
+		$subForm->setFields($children);
+
+		// If a maximum value isn't set then we'll make the maximum amount of cells a large number
+		$maximum = $this->element['maximum'] ? (int) $this->element['maximum'] : '999';
+
+		// Build a Table
+		$head_row_str = array();
+		$body_row_str = array();
+		$head_row_str[] = '<th></th>';
+		$body_row_str[] = '<td><span class="sortable-handler " style="cursor: move;"><span class="icon-menu" aria-hidden="true"></span></span></td>';
+		foreach ($subForm->getFieldset() as $field)
+		{
+			// Reset name to simple
+			$field->name = (string) $field->element['name'];
+
+			// Build heading
+			$head_row_str[] = '<th>' . strip_tags($field->getLabel($field->name));
+			$head_row_str[] = '<br /><small style="font-weight:normal">' . JText::_($field->description) . '</small>';
+			$head_row_str[] = '</th>';
+
+			// Build body
+			$body_row_str[] = '<td>' . $field->getInput() . '</td>';
+		}
+
+		// Append buttons
+		$head_row_str[] = '<th><div class="btn-group"><a href="#" class="add btn button btn-success" aria-label="' . JText::_('JGLOBAL_FIELD_ADD') . '">';
+		$head_row_str[] = '<span class="icon-plus" aria-hidden="true"></span> </a></div></th>';
+		$body_row_str[] = '<td><div class="btn-group">';
+		$body_row_str[] = '<a class="add btn button btn-success" aria-label="' . JText::_('JGLOBAL_FIELD_ADD') . '">';
+		$body_row_str[] = '<span class="icon-plus" aria-hidden="true"></span> </a>';
+		$body_row_str[] = '<a class="remove btn button btn-danger" aria-label="' . JText::_('JGLOBAL_FIELD_REMOVE') . '">';
+		$body_row_str[] = '<span class="icon-minus" aria-hidden="true"></span> </a>';
+		$body_row_str[] = '</div></td>';
+
+		// Put all table parts together
+		$table = '<table id="' . $this->id . '_table" class="adminlist ' . $this->element['class'] . ' table table-striped">'
+					. '<thead><tr>' . implode("\n", $head_row_str) . '</tr></thead>'
+					. '<tbody><tr>' . implode("\n", $body_row_str) . '</tr></tbody>'
+				. '</table>';
+
+		// And finaly build a main container
+		$str = array();
+		$str[] = '<div id="' . $this->id . '_container">';
+
+		// Add the table to modal
+		$str[] = '<div id="' . $this->id . '_modal" class="modal hide">';
+		$str[] = $table;
+		$str[] = '<div class="modal-footer">';
+		$str[] = '<button class="close-modal btn button btn-link">' . JText::_('JCANCEL') . '</button>';
+		$str[] = '<button class="save-modal-data btn button btn-primary">' . JText::_('JAPPLY') . '</button>';
+		$str[] = '</div>';
+
+		// Close modal container
+		$str[] = '</div>';
+
+		// Close main container
+		$str[] = '</div>';
+
+		// Button for display the modal window
+		$select = (string) $this->element['select'] ? JText::_((string) $this->element['select']) : JText::_('JLIB_FORM_BUTTON_SELECT');
+		$icon = $this->element['icon'] ? '<span class="icon-' . $this->element['icon'] . '"></span> ' : '';
+		$str[] = '<button class="open-modal btn" id="' . $this->id . '_button" >' . $icon . $select . '</button>';
+
+		if (is_array($this->value))
+		{
+			$this->value = array_shift($this->value);
+		}
+
+		// Script params
+		$data = array();
+		$data[] = 'data-container="#' . $this->id . '_container"';
+		$data[] = 'data-modal-element="#' . $this->id . '_modal"';
+		$data[] = 'data-repeatable-element="table tbody tr"';
+		$data[] = 'data-bt-add="a.add"';
+		$data[] = 'data-bt-remove="a.remove"';
+		$data[] = 'data-bt-modal-open="#' . $this->id . '_button"';
+		$data[] = 'data-bt-modal-close="button.close-modal"';
+		$data[] = 'data-bt-modal-save-data="button.save-modal-data"';
+		$data[] = 'data-maximum="' . $maximum . '"';
+		$data[] = 'data-input="#' . $this->id . '"';
+
+		// Hidden input, where the main value is
+		$value = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+		$str[] = '<input type="hidden" name="' . $this->name . '" id="' . $this->id . '" value="' . $value
+				. '"  class="form-field-repeatable" ' . implode(' ', $data) . ' />';
+
+		// Add scripts
+		JHtml::_('bootstrap.framework');
+
+		// Depends on jQuery UI
+		JHtml::_('jquery.ui', array('core', 'sortable'));
+
+		JHtml::_('script', 'jui/sortablelist.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('stylesheet', 'jui/sortablelist.css', array('version' => 'auto', 'relative' => true));
+		JHtml::_('script', 'system/repeatable.js', array('framework' => true, 'version' => 'auto', 'relative' => true));
+
+		$javascript = 'jQuery(document).ready(function($) { $("#' . $this->id . '_table tbody").sortable(); });';
+
+		JFactory::getDocument()->addScriptDeclaration($javascript);
+
+		return implode("\n", $str);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/rules.php b/core/libraries/joomla/form/fields/rules.php
new file mode 100644
index 00000000..11ce09c4
--- /dev/null
+++ b/core/libraries/joomla/form/fields/rules.php
@@ -0,0 +1,458 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Field for assigning permissions to groups for a given asset
+ *
+ * @see    JAccess
+ * @since  11.1
+ */
+class JFormFieldRules extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Rules';
+
+	/**
+	 * The section.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $section;
+
+	/**
+	 * The component.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $component;
+
+	/**
+	 * The assetField.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $assetField;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'section':
+			case 'component':
+			case 'assetField':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'section':
+			case 'component':
+			case 'assetField':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->section    = $this->element['section'] ? (string) $this->element['section'] : '';
+			$this->component  = $this->element['component'] ? (string) $this->element['component'] : '';
+			$this->assetField = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup for Access Control Lists.
+	 * Optionally can be associated with a specific component and section.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 * @todo:   Add access check.
+	 */
+	protected function getInput()
+	{
+		JHtml::_('bootstrap.tooltip');
+
+		// Add Javascript for permission change
+		JHtml::_('script', 'system/permissions.js', array('version' => 'auto', 'relative' => true));
+
+		// Load JavaScript message titles
+		JText::script('ERROR');
+		JText::script('WARNING');
+		JText::script('NOTICE');
+		JText::script('MESSAGE');
+
+		// Add strings for JavaScript error translations.
+		JText::script('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT');
+		JText::script('JLIB_JS_AJAX_ERROR_NO_CONTENT');
+		JText::script('JLIB_JS_AJAX_ERROR_OTHER');
+		JText::script('JLIB_JS_AJAX_ERROR_PARSE');
+		JText::script('JLIB_JS_AJAX_ERROR_TIMEOUT');
+
+		// Initialise some field attributes.
+		$section    = $this->section;
+		$assetField = $this->assetField;
+		$component  = empty($this->component) ? 'root.1' : $this->component;
+
+		// Current view is global config?
+		$isGlobalConfig = $component === 'root.1';
+
+		// Get the actions for the asset.
+		$actions = JAccess::getActions($component, $section);
+
+		// Iterate over the children and add to the actions.
+		foreach ($this->element->children() as $el)
+		{
+			if ($el->getName() == 'action')
+			{
+				$actions[] = (object) array(
+					'name' => (string) $el['name'],
+					'title' => (string) $el['title'],
+					'description' => (string) $el['description'],
+				);
+			}
+		}
+
+		// Get the asset id.
+		// Note that for global configuration, com_config injects asset_id = 1 into the form.
+		$assetId       = $this->form->getValue($assetField);
+		$newItem       = empty($assetId) && $isGlobalConfig === false && $section !== 'component';
+		$parentAssetId = null;
+
+		// If the asset id is empty (component or new item).
+		if (empty($assetId))
+		{
+			// Get the component asset id as fallback.
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('id'))
+				->from($db->quoteName('#__assets'))
+				->where($db->quoteName('name') . ' = ' . $db->quote($component));
+
+			$db->setQuery($query);
+
+			$assetId = (int) $db->loadResult();
+
+			/**
+			 * @to do: incorrect info
+			 * When creating a new item (not saving) it uses the calculated permissions from the component (item <-> component <-> global config).
+			 * But if we have a section too (item <-> section(s) <-> component <-> global config) this is not correct.
+			 * Also, currently it uses the component permission, but should use the calculated permissions for achild of the component/section.
+			 */
+		}
+
+		// If not in global config we need the parent_id asset to calculate permissions.
+		if (!$isGlobalConfig)
+		{
+			// In this case we need to get the component rules too.
+			$db = JFactory::getDbo();
+
+			$query = $db->getQuery(true)
+				->select($db->quoteName('parent_id'))
+				->from($db->quoteName('#__assets'))
+				->where($db->quoteName('id') . ' = ' . $assetId);
+
+			$db->setQuery($query);
+
+			$parentAssetId = (int) $db->loadResult();
+		}
+
+		// Full width format.
+
+		// Get the rules for just this asset (non-recursive).
+		$assetRules = JAccess::getAssetRules($assetId, false, false);
+
+		// Get the available user groups.
+		$groups = $this->getUserGroups();
+
+		// Ajax request data.
+		$ajaxUri = JRoute::_('index.php?option=com_config&task=config.store&format=json&' . JSession::getFormToken() . '=1');
+
+		// Prepare output
+		$html = array();
+
+		// Description
+		$html[] = '<p class="rule-desc">' . JText::_('JLIB_RULES_SETTINGS_DESC') . '</p>';
+
+		// Begin tabs
+		$html[] = '<div class="tabbable tabs-left" data-ajaxuri="' . $ajaxUri . '" id="permissions-sliders">';
+
+		// Building tab nav
+		$html[] = '<ul class="nav nav-tabs">';
+
+		foreach ($groups as $group)
+		{
+			// Initial Active Tab
+			$active = (int) $group->value === 1 ? ' class="active"' : '';
+
+			$html[] = '<li' . $active . '>';
+			$html[] = '<a href="#permission-' . $group->value . '" data-toggle="tab">';
+			$html[] = JLayoutHelper::render('joomla.html.treeprefix', array('level' => $group->level + 1)) . $group->text;
+			$html[] = '</a>';
+			$html[] = '</li>';
+		}
+
+		$html[] = '</ul>';
+
+		$html[] = '<div class="tab-content">';
+
+		// Start a row for each user group.
+		foreach ($groups as $group)
+		{
+			// Initial Active Pane
+			$active = (int) $group->value === 1 ? ' active' : '';
+
+			$html[] = '<div class="tab-pane' . $active . '" id="permission-' . $group->value . '">';
+			$html[] = '<table class="table table-striped">';
+			$html[] = '<thead>';
+			$html[] = '<tr>';
+
+			$html[] = '<th class="actions" id="actions-th' . $group->value . '">';
+			$html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_ACTION') . '</span>';
+			$html[] = '</th>';
+
+			$html[] = '<th class="settings" id="settings-th' . $group->value . '">';
+			$html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_SELECT_SETTING') . '</span>';
+			$html[] = '</th>';
+
+			$html[] = '<th id="aclactionth' . $group->value . '">';
+			$html[] = '<span class="acl-action">' . JText::_('JLIB_RULES_CALCULATED_SETTING') . '</span>';
+			$html[] = '</th>';
+
+			$html[] = '</tr>';
+			$html[] = '</thead>';
+			$html[] = '<tbody>';
+
+			// Check if this group has super user permissions
+			$isSuperUserGroup = JAccess::checkGroup($group->value, 'core.admin');
+
+			foreach ($actions as $action)
+			{
+				$html[] = '<tr>';
+				$html[] = '<td headers="actions-th' . $group->value . '">';
+				$html[] = '<label for="' . $this->id . '_' . $action->name . '_' . $group->value . '" class="hasTooltip" title="'
+					. JHtml::_('tooltipText', $action->title, $action->description) . '">';
+				$html[] = JText::_($action->title);
+				$html[] = '</label>';
+				$html[] = '</td>';
+
+				$html[] = '<td headers="settings-th' . $group->value . '">';
+
+				$html[] = '<select onchange="sendPermissions.call(this, event)" data-chosen="true" class="input-small novalidate"'
+					. ' name="' . $this->name . '[' . $action->name . '][' . $group->value . ']"'
+					. ' id="' . $this->id . '_' . $action->name	. '_' . $group->value . '"'
+					. ' title="' . strip_tags(JText::sprintf('JLIB_RULES_SELECT_ALLOW_DENY_GROUP', JText::_($action->title), trim($group->text))) . '">';
+
+				/**
+				 * Possible values:
+				 * null = not set means inherited
+				 * false = denied
+				 * true = allowed
+				 */
+
+				// Get the actual setting for the action for this group.
+				$assetRule = $newItem === false ? $assetRules->allow($action->name, $group->value) : null;
+
+				// Build the dropdowns for the permissions sliders
+
+				// The parent group has "Not Set", all children can rightly "Inherit" from that.
+				$html[] = '<option value=""' . ($assetRule === null ? ' selected="selected"' : '') . '>'
+					. JText::_(empty($group->parent_id) && $isGlobalConfig ? 'JLIB_RULES_NOT_SET' : 'JLIB_RULES_INHERITED') . '</option>';
+				$html[] = '<option value="1"' . ($assetRule === true ? ' selected="selected"' : '') . '>' . JText::_('JLIB_RULES_ALLOWED')
+					. '</option>';
+				$html[] = '<option value="0"' . ($assetRule === false ? ' selected="selected"' : '') . '>' . JText::_('JLIB_RULES_DENIED')
+					. '</option>';
+
+				$html[] = '</select>&#160; ';
+
+				$html[] = '<span id="icon_' . $this->id . '_' . $action->name . '_' . $group->value . '"' . '></span>';
+				$html[] = '</td>';
+
+				// Build the Calculated Settings column.
+				$html[] = '<td headers="aclactionth' . $group->value . '">';
+
+				$result = array();
+
+				// Get the group, group parent id, and group global config recursive calculated permission for the chosen action.
+				$inheritedGroupRule            = JAccess::checkGroup((int) $group->value, $action->name, $assetId);
+				$inheritedGroupParentAssetRule = !empty($parentAssetId) ? JAccess::checkGroup($group->value, $action->name, $parentAssetId) : null;
+				$inheritedParentGroupRule      = !empty($group->parent_id) ? JAccess::checkGroup($group->parent_id, $action->name, $assetId) : null;
+
+				// Current group is a Super User group, so calculated setting is "Allowed (Super User)".
+				if ($isSuperUserGroup)
+				{
+					$result['class'] = 'label label-success';
+					$result['text'] = '<span class="icon-lock icon-white"></span>' . JText::_('JLIB_RULES_ALLOWED_ADMIN');
+				}
+				// Not super user.
+				else
+				{
+					// First get the real recursive calculated setting and add (Inherited) to it.
+
+					// If recursive calculated setting is "Denied" or null. Calculated permission is "Not Allowed (Inherited)".
+					if ($inheritedGroupRule === null || $inheritedGroupRule === false)
+					{
+						$result['class'] = 'label label-important';
+						$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED_INHERITED');
+					}
+					// If recursive calculated setting is "Allowed". Calculated permission is "Allowed (Inherited)".
+					else
+					{
+						$result['class'] = 'label label-success';
+						$result['text']  = JText::_('JLIB_RULES_ALLOWED_INHERITED');
+					}
+
+					// Second part: Overwrite the calculated permissions labels if there is an explicit permission in the current group.
+
+					/**
+					 * @to do: incorrect info
+					 * If a component has a permission that doesn't exists in global config (ex: frontend editing in com_modules) by default
+					 * we get "Not Allowed (Inherited)" when we should get "Not Allowed (Default)".
+					 */
+
+					// If there is an explicit permission "Not Allowed". Calculated permission is "Not Allowed".
+					if ($assetRule === false)
+					{
+						$result['class'] = 'label label-important';
+						$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED');
+					}
+					// If there is an explicit permission is "Allowed". Calculated permission is "Allowed".
+					elseif ($assetRule === true)
+					{
+						$result['class'] = 'label label-success';
+						$result['text']  = JText::_('JLIB_RULES_ALLOWED');
+					}
+
+					// Third part: Overwrite the calculated permissions labels for special cases.
+
+					// Global configuration with "Not Set" permission. Calculated permission is "Not Allowed (Default)".
+					if (empty($group->parent_id) && $isGlobalConfig === true && $assetRule === null)
+					{
+						$result['class'] = 'label label-important';
+						$result['text']  = JText::_('JLIB_RULES_NOT_ALLOWED_DEFAULT');
+					}
+
+					/**
+					 * Component/Item with explicit "Denied" permission at parent Asset (Category, Component or Global config) configuration.
+					 * Or some parent group has an explicit "Denied".
+					 * Calculated permission is "Not Allowed (Locked)".
+					 */
+					elseif ($inheritedGroupParentAssetRule === false || $inheritedParentGroupRule === false)
+					{
+						$result['class'] = 'label label-important';
+						$result['text']  = '<span class="icon-lock icon-white"></span>' . JText::_('JLIB_RULES_NOT_ALLOWED_LOCKED');
+					}
+				}
+
+				$html[] = '<span class="' . $result['class'] . '">' . $result['text'] . '</span>';
+				$html[] = '</td>';
+				$html[] = '</tr>';
+			}
+
+			$html[] = '</tbody>';
+			$html[] = '</table></div>';
+		}
+
+		$html[] = '</div></div>';
+		$html[] = '<div class="clr"></div>';
+		$html[] = '<div class="alert">';
+
+		if ($section === 'component' || !$section)
+		{
+			$html[] = JText::_('JLIB_RULES_SETTING_NOTES');
+		}
+		else
+		{
+			$html[] = JText::_('JLIB_RULES_SETTING_NOTES_ITEM');
+		}
+
+		$html[] = '</div>';
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Get a list of the user groups.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	protected function getUserGroups()
+	{
+		$options = JHelperUsergroups::getInstance()->getAll();
+
+		foreach ($options as &$option)
+		{
+			$option->value = $option->id;
+			$option->text  = $option->title;
+		}
+
+		return array_values($options);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/sessionhandler.php b/core/libraries/joomla/form/fields/sessionhandler.php
new file mode 100644
index 00000000..3c644d36
--- /dev/null
+++ b/core/libraries/joomla/form/fields/sessionhandler.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a select list of session handler options.
+ *
+ * @since  11.1
+ */
+class JFormFieldSessionHandler extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'SessionHandler';
+
+	/**
+	 * Method to get the session handler field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Get the options from JSession.
+		foreach (JSession::getStores() as $store)
+		{
+			$options[] = JHtml::_('select.option', $store, JText::_('JLIB_FORM_VALUE_SESSION_' . $store), 'value', 'text');
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/spacer.php b/core/libraries/joomla/form/fields/spacer.php
new file mode 100644
index 00000000..5b9f1820
--- /dev/null
+++ b/core/libraries/joomla/form/fields/spacer.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides spacer markup to be used in form layouts.
+ *
+ * @since  11.1
+ */
+class JFormFieldSpacer extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Spacer';
+
+	/**
+	 * Method to get the field input markup for a spacer.
+	 * The spacer does not have accept input.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		return ' ';
+	}
+
+	/**
+	 * Method to get the field label markup for a spacer.
+	 * Use the label text or name from the XML element as the spacer or
+	 * Use a hr="true" to automatically generate plain hr markup
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getLabel()
+	{
+		$html = array();
+		$class = !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$html[] = '<span class="spacer">';
+		$html[] = '<span class="before"></span>';
+		$html[] = '<span' . $class . '>';
+
+		if ((string) $this->element['hr'] == 'true')
+		{
+			$html[] = '<hr' . $class . ' />';
+		}
+		else
+		{
+			$label = '';
+
+			// Get the label text from the XML element, defaulting to the element name.
+			$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
+			$text = $this->translateLabel ? JText::_($text) : $text;
+
+			// Build the class for the label.
+			$class = !empty($this->description) ? 'hasTooltip' : '';
+			$class = $this->required == true ? $class . ' required' : $class;
+
+			// Add the opening label tag and main attributes attributes.
+			$label .= '<label id="' . $this->id . '-lbl" class="' . $class . '"';
+
+			// If a description is specified, use it to build a tooltip.
+			if (!empty($this->description))
+			{
+				JHtml::_('bootstrap.tooltip');
+				$label .= ' title="' . JHtml::_('tooltipText', trim($text, ':'), JText::_($this->description), 0) . '"';
+			}
+
+			// Add the label text and closing tag.
+			$label .= '>' . $text . '</label>';
+			$html[] = $label;
+		}
+
+		$html[] = '</span>';
+		$html[] = '<span class="after"></span>';
+		$html[] = '</span>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Method to get the field title.
+	 *
+	 * @return  string  The field title.
+	 *
+	 * @since   11.1
+	 */
+	protected function getTitle()
+	{
+		return $this->getLabel();
+	}
+
+	/**
+	 * Method to get a control group with label and input.
+	 *
+	 * @param   array  $options  Options to be passed into the rendering of the field
+	 *
+	 * @return  string  A string containing the html for the control group
+	 *
+	 * @since   3.7.3
+	 */
+	public function renderField($options = array())
+	{
+		$options['class'] = empty($options['class']) ? 'field-spacer' : $options['class'] . ' field-spacer';
+
+		return parent::renderField($options);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/sql.php b/core/libraries/joomla/form/fields/sql.php
new file mode 100644
index 00000000..11d91331
--- /dev/null
+++ b/core/libraries/joomla/form/fields/sql.php
@@ -0,0 +1,320 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Supports a custom SQL select list
+ *
+ * @since  11.1
+ */
+class JFormFieldSQL extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = 'SQL';
+
+	/**
+	 * The keyField.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $keyField;
+
+	/**
+	 * The valueField.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $valueField;
+
+	/**
+	 * The translate.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $translate = false;
+
+	/**
+	 * The query.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $query;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'keyField':
+			case 'valueField':
+			case 'translate':
+			case 'query':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'keyField':
+			case 'valueField':
+			case 'translate':
+			case 'query':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			// Check if its using the old way
+			$this->query = (string) $this->element['query'];
+
+			if (empty($this->query))
+			{
+				// Get the query from the form
+				$query    = array();
+				$defaults = array();
+
+				$sql_select = (string) $this->element['sql_select'];
+				$sql_from   = (string) $this->element['sql_from'];
+
+				if ($sql_select && $sql_from)
+				{
+					$query['select'] = $sql_select;
+					$query['from']   = $sql_from;
+					$query['join']   = (string) $this->element['sql_join'];
+					$query['where']  = (string) $this->element['sql_where'];
+					$query['group']  = (string) $this->element['sql_group'];
+					$query['order']  = (string) $this->element['sql_order'];
+
+					// Get the filters
+					$filters = isset($this->element['sql_filter']) ? explode(',', $this->element['sql_filter']) : '';
+
+					// Get the default value for query if empty
+					if (is_array($filters))
+					{
+						foreach ($filters as $filter)
+						{
+							$name   = "sql_default_{$filter}";
+							$attrib = (string) $this->element[$name];
+
+							if (!empty($attrib))
+							{
+								$defaults[$filter] = $attrib;
+							}
+						}
+					}
+
+					// Process the query
+					$this->query = $this->processQuery($query, $filters, $defaults);
+				}
+			}
+
+			$this->keyField   = (string) $this->element['key_field'] ?: 'value';
+			$this->valueField = (string) $this->element['value_field'] ?: (string) $this->element['name'];
+			$this->translate  = (string) $this->element['translate'] ?: false;
+			$this->header     = (string) $this->element['header'] ?: false;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to process the query from form.
+	 *
+	 * @param   array   $conditions  The conditions from the form.
+	 * @param   string  $filters     The columns to filter.
+	 * @param   array   $defaults    The defaults value to set if condition is empty.
+	 *
+	 * @return  JDatabaseQuery  The query object.
+	 *
+	 * @since   3.5
+	 */
+	protected function processQuery($conditions, $filters, $defaults)
+	{
+		// Get the database object.
+		$db = JFactory::getDbo();
+
+		// Get the query object
+		$query = $db->getQuery(true);
+
+		// Select fields
+		$query->select($conditions['select']);
+
+		// From selected table
+		$query->from($conditions['from']);
+
+		// Join over the groups
+		if (!empty($conditions['join']))
+		{
+			$query->join('LEFT', $conditions['join']);
+		}
+
+		// Where condition
+		if (!empty($conditions['where']))
+		{
+			$query->where($conditions['where']);
+		}
+
+		// Group by
+		if (!empty($conditions['group']))
+		{
+			$query->group($conditions['group']);
+		}
+
+		// Process the filters
+		if (is_array($filters))
+		{
+			$html_filters = JFactory::getApplication()->getUserStateFromRequest($this->context . '.filter', 'filter', array(), 'array');
+
+			foreach ($filters as $k => $value)
+			{
+				if (!empty($html_filters[$value]))
+				{
+					$escape = $db->quote($db->escape($html_filters[$value]), false);
+
+					$query->where("{$value} = {$escape}");
+				}
+				elseif (!empty($defaults[$value]))
+				{
+					$escape = $db->quote($db->escape($defaults[$value]), false);
+
+					$query->where("{$value} = {$escape}");
+				}
+			}
+		}
+
+		// Add order to query
+		if (!empty($conditions['order']))
+		{
+			$query->order($conditions['order']);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the custom field options.
+	 * Use the query attribute to supply a query to generate the list.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		// Initialize some field attributes.
+		$key   = $this->keyField;
+		$value = $this->valueField;
+		$header = $this->header;
+
+		if ($this->query)
+		{
+			// Get the database object.
+			$db = JFactory::getDbo();
+
+			// Set the query and get the result list.
+			$db->setQuery($this->query);
+
+			try
+			{
+				$items = $db->loadObjectlist();
+			}
+			catch (JDatabaseExceptionExecuting $e)
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			}
+		}
+
+		// Add header.
+		if (!empty($header))
+		{
+			$header_title = JText::_($header);
+			$options[] = JHtml::_('select.option', '', $header_title);
+		}
+
+		// Build the field options.
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				if ($this->translate == true)
+				{
+					$options[] = JHtml::_('select.option', $item->$key, JText::_($item->$value));
+				}
+				else
+				{
+					$options[] = JHtml::_('select.option', $item->$key, $item->$value);
+				}
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/subform.php b/core/libraries/joomla/form/fields/subform.php
new file mode 100644
index 00000000..988fb6eb
--- /dev/null
+++ b/core/libraries/joomla/form/fields/subform.php
@@ -0,0 +1,359 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.path');
+
+/**
+ * The Field to load the form inside current form
+ *
+ * @Example with all attributes:
+ * 	<field name="field-name" type="subform"
+ * 		formsource="path/to/form.xml" min="1" max="3" multiple="true" buttons="add,remove,move"
+ * 		layout="joomla.form.field.subform.repeatable-table" groupByFieldset="false" component="com_example" client="site"
+ * 		label="Field Label" description="Field Description" />
+ *
+ * @since  3.6
+ */
+class JFormFieldSubform extends JFormField
+{
+	/**
+	 * The form field type.
+	 * @var    string
+	 */
+	protected $type = 'Subform';
+
+	/**
+	 * Form source
+	 * @var string
+	 */
+	protected $formsource;
+
+	/**
+	 * Minimum items in repeat mode
+	 * @var int
+	 */
+	protected $min = 0;
+
+	/**
+	 * Maximum items in repeat mode
+	 * @var int
+	 */
+	protected $max = 1000;
+
+	/**
+	 * Layout to render the form
+	 * @var  string
+	 */
+	protected $layout = 'joomla.form.field.subform.default';
+
+	/**
+	 * Whether group subform fields by it`s fieldset
+	 * @var boolean
+	 */
+	protected $groupByFieldset = false;
+
+	/**
+	 * Which buttons to show in miltiple mode
+	 * @var array $buttons
+	 */
+	protected $buttons = array('add' => true, 'remove' => true, 'move' => true);
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.6
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'formsource':
+			case 'min':
+			case 'max':
+			case 'layout':
+			case 'groupByFieldset':
+			case 'buttons':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'formsource':
+				$this->formsource = (string) $value;
+
+				// Add root path if we have a path to XML file
+				if (strrpos($this->formsource, '.xml') === strlen($this->formsource) - 4)
+				{
+					$this->formsource = JPath::clean(JPATH_ROOT . '/' . $this->formsource);
+				}
+
+				break;
+
+			case 'min':
+				$this->min = (int) $value;
+				break;
+
+			case 'max':
+				if ($value)
+				{
+					$this->max = max(1, (int) $value);
+				}
+				break;
+
+			case 'groupByFieldset':
+				if ($value !== null)
+				{
+					$value = (string) $value;
+					$this->groupByFieldset = !($value === 'false' || $value === 'off' || $value === '0');
+				}
+				break;
+
+			case 'layout':
+				$this->layout = (string) $value;
+
+				// Make sure the layout is not empty.
+				if (!$this->layout)
+				{
+					// Set default value depend from "multiple" mode
+					$this->layout = !$this->multiple ? 'joomla.form.field.subform.default' : 'joomla.form.field.subform.repeatable';
+				}
+
+				break;
+
+			case 'buttons':
+
+				if (!$this->multiple)
+				{
+					$this->buttons = array();
+					break;
+				}
+
+				if ($value && !is_array($value))
+				{
+					$value = explode(',', (string) $value);
+					$value = array_fill_keys(array_filter($value), true);
+				}
+
+				if ($value)
+				{
+					$value = array_merge(array('add' => false, 'remove' => false, 'move' => false), $value);
+					$this->buttons = $value;
+				}
+
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the <field /> tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.6
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		if (!parent::setup($element, $value, $group))
+		{
+			return false;
+		}
+
+		foreach (array('formsource', 'min', 'max', 'layout', 'groupByFieldset', 'buttons') as $attributeName)
+		{
+			$this->__set($attributeName, $element[$attributeName]);
+		}
+
+		if ($this->value && is_string($this->value))
+		{
+			// Guess here is the JSON string from 'default' attribute
+			$this->value = json_decode($this->value, true);
+		}
+
+		if (!$this->formsource && $element->form)
+		{
+			// Set the formsource parameter from the content of the node
+			$this->formsource = $element->form->saveXML();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.6
+	 */
+	protected function getInput()
+	{
+		$value = $this->value ? (array) $this->value : array();
+
+		// Prepare data for renderer
+		$data    = parent::getLayoutData();
+		$tmpl    = null;
+		$forms   = array();
+		$control = $this->name;
+
+		try
+		{
+			// Prepare the form template
+			$formname = 'subform' . ($this->group ? $this->group . '.' : '.') . $this->fieldname;
+			$tmplcontrol = !$this->multiple ? $control : $control . '[' . $this->fieldname . 'X]';
+			$tmpl = JForm::getInstance($formname, $this->formsource, array('control' => $tmplcontrol));
+
+			// Prepare the forms for exiting values
+			if ($this->multiple)
+			{
+				$value = array_values($value);
+				$c = max($this->min, min(count($value), $this->max));
+				for ($i = 0; $i < $c; $i++)
+				{
+					$itemcontrol = $control . '[' . $this->fieldname . $i . ']';
+					$itemform    = JForm::getInstance($formname . $i, $this->formsource, array('control' => $itemcontrol));
+
+					if (!empty($value[$i]))
+					{
+						$itemform->bind($value[$i]);
+					}
+
+					$forms[] = $itemform;
+				}
+			}
+			else
+			{
+				$tmpl->bind($value);
+				$forms[] = $tmpl;
+			}
+		}
+		catch (Exception $e)
+		{
+			return $e->getMessage();
+		}
+
+		$data['tmpl']      = $tmpl;
+		$data['forms']     = $forms;
+		$data['min']       = $this->min;
+		$data['max']       = $this->max;
+		$data['control']   = $control;
+		$data['buttons']   = $this->buttons;
+		$data['fieldname'] = $this->fieldname;
+		$data['groupByFieldset'] = $this->groupByFieldset;
+
+		// Prepare renderer
+		$renderer = $this->getRenderer($this->layout);
+
+		// Allow to define some JLayout options as attribute of the element
+		if ($this->element['component'])
+		{
+			$renderer->setComponent((string) $this->element['component']);
+		}
+
+		if ($this->element['client'])
+		{
+			$renderer->setClient((string) $this->element['client']);
+		}
+
+		// Render
+		$html = $renderer->render($data);
+
+		// Add hidden input on front of the subform inputs, in multiple mode
+		// for allow to submit an empty value
+		if ($this->multiple)
+		{
+			$html = '<input name="' . $this->name . '" type="hidden" value="" />' . $html;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Method to get the name used for the field input tag.
+	 *
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The name to be used for the field input tag.
+	 *
+	 * @since   3.6
+	 */
+	protected function getName($fieldName)
+	{
+		$name = '';
+
+		// If there is a form control set for the attached form add it first.
+		if ($this->formControl)
+		{
+			$name .= $this->formControl;
+		}
+
+		// If the field is in a group add the group control to the field name.
+		if ($this->group)
+		{
+			// If we already have a name segment add the group control as another level.
+			$groups = explode('.', $this->group);
+
+			if ($name)
+			{
+				foreach ($groups as $group)
+				{
+					$name .= '[' . $group . ']';
+				}
+			}
+			else
+			{
+				$name .= array_shift($groups);
+
+				foreach ($groups as $group)
+				{
+					$name .= '[' . $group . ']';
+				}
+			}
+		}
+
+		// If we already have a name segment add the field name as another level.
+		if ($name)
+		{
+			$name .= '[' . $fieldName . ']';
+		}
+		else
+		{
+			$name .= $fieldName;
+		}
+
+		return $name;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/tel.php b/core/libraries/joomla/form/fields/tel.php
new file mode 100644
index 00000000..ade4ab3a
--- /dev/null
+++ b/core/libraries/joomla/form/fields/tel.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('text');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a text field telephone numbers.
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.tel.html
+ * @see    JFormRuleTel for telephone number validation
+ * @see    JHtmlTel for rendering of telephone numbers
+ * @since  11.1
+ */
+class JFormFieldTel extends JFormFieldText
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Tel';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $layout = 'joomla.form.field.tel';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7.0
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$maxLength    = !empty($this->maxLength) ? ' maxlength="' . $this->maxLength . '"' : '';
+
+		$extraData = array(
+			'maxLength' => $maxLength,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/text.php b/core/libraries/joomla/form/fields/text.php
new file mode 100644
index 00000000..8a489f63
--- /dev/null
+++ b/core/libraries/joomla/form/fields/text.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a one line text field.
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.text.html#input.text
+ * @since  11.1
+ */
+class JFormFieldText extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Text';
+
+	/**
+	 * The allowable maxlength of the field.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $maxLength;
+
+	/**
+	 * The mode of input associated with the field.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $inputmode;
+
+	/**
+	 * The name of the form field direction (ltr or rtl).
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $dirname;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.text';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'maxLength':
+			case 'dirname':
+			case 'inputmode':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'maxLength':
+				$this->maxLength = (int) $value;
+				break;
+
+			case 'dirname':
+				$value = (string) $value;
+				$this->dirname = ($value == $name || $value == 'true' || $value == '1');
+				break;
+
+			case 'inputmode':
+				$this->inputmode = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result == true)
+		{
+			$inputmode = (string) $this->element['inputmode'];
+			$dirname = (string) $this->element['dirname'];
+
+			$this->inputmode = '';
+			$inputmode = preg_replace('/\s+/', ' ', trim($inputmode));
+			$inputmode = explode(' ', $inputmode);
+
+			if (!empty($inputmode))
+			{
+				$defaultInputmode = in_array('default', $inputmode) ? JText::_('JLIB_FORM_INPUTMODE') . ' ' : '';
+
+				foreach (array_keys($inputmode, 'default') as $key)
+				{
+					unset($inputmode[$key]);
+				}
+
+				$this->inputmode = $defaultInputmode . implode(' ', $inputmode);
+			}
+
+			// Set the dirname.
+			$dirname = ((string) $dirname == 'dirname' || $dirname == 'true' || $dirname == '1');
+			$this->dirname = $dirname ? $this->getName($this->fieldname . '_dir') : false;
+
+			$this->maxLength = (int) $this->element['maxlength'];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		if ($this->element['useglobal'])
+		{
+			$component = JFactory::getApplication()->input->getCmd('option');
+
+			// Get correct component for menu items
+			if ($component == 'com_menus')
+			{
+				$link      = $this->form->getData()->get('link');
+				$uri       = new JUri($link);
+				$component = $uri->getVar('option', 'com_menus');
+			}
+
+			$params = JComponentHelper::getParams($component);
+			$value  = $params->get($this->fieldname);
+
+			// Try with global configuration
+			if (is_null($value))
+			{
+				$value = JFactory::getConfig()->get($this->fieldname);
+			}
+
+			// Try with menu configuration
+			if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus')
+			{
+				$value = JComponentHelper::getParams('com_menus')->get($this->fieldname);
+			}
+
+			if (!is_null($value))
+			{
+				$value = (string) $value;
+
+				$this->hint = JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value);
+			}
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.4
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+
+		foreach ($this->element->children() as $option)
+		{
+			// Only add <option /> elements.
+			if ($option->getName() != 'option')
+			{
+				continue;
+			}
+
+			// Create a new option object based on the <option /> element.
+			$options[] = JHtml::_(
+				'select.option', (string) $option['value'],
+				JText::alt(trim((string) $option), preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname)), 'value', 'text'
+			);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Method to get the field suggestions.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since       3.2
+	 * @deprecated  4.0  Use getOptions instead
+	 */
+	protected function getSuggestions()
+	{
+		return $this->getOptions();
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$maxLength    = !empty($this->maxLength) ? ' maxlength="' . $this->maxLength . '"' : '';
+		$inputmode    = !empty($this->inputmode) ? ' inputmode="' . $this->inputmode . '"' : '';
+		$dirname      = !empty($this->dirname) ? ' dirname="' . $this->dirname . '"' : '';
+
+		/* Get the field options for the datalist.
+			Note: getSuggestions() is deprecated and will be changed to getOptions() with 4.0. */
+		$options  = (array) $this->getSuggestions();
+
+		$extraData = array(
+			'maxLength' => $maxLength,
+			'pattern'   => $this->pattern,
+			'inputmode' => $inputmode,
+			'dirname'   => $dirname,
+			'options'   => $options,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/textarea.php b/core/libraries/joomla/form/fields/textarea.php
new file mode 100644
index 00000000..c1d1b81c
--- /dev/null
+++ b/core/libraries/joomla/form/fields/textarea.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a multi line area for entry of plain text
+ *
+ * @link   http://www.w3.org/TR/html-markup/textarea.html#textarea
+ * @since  11.1
+ */
+class JFormFieldTextarea extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Textarea';
+
+	/**
+	 * The number of rows in textarea.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $rows;
+
+	/**
+	 * The number of columns in textarea.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $columns;
+
+	/**
+	 * The maximum number of characters in textarea.
+	 *
+	 * @var    mixed
+	 * @since  3.4
+	 */
+	protected $maxlength;
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.textarea';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'rows':
+			case 'columns':
+			case 'maxlength':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'rows':
+			case 'columns':
+			case 'maxlength':
+				$this->$name = (int) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->rows      = isset($this->element['rows']) ? (int) $this->element['rows'] : false;
+			$this->columns   = isset($this->element['cols']) ? (int) $this->element['cols'] : false;
+			$this->maxlength = isset($this->element['maxlength']) ? (int) $this->element['maxlength'] : false;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the textarea field input markup.
+	 * Use the rows and columns attributes to specify the dimensions of the area.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$columns      = $this->columns ? ' cols="' . $this->columns . '"' : '';
+		$rows         = $this->rows ? ' rows="' . $this->rows . '"' : '';
+		$maxlength    = $this->maxlength ? ' maxlength="' . $this->maxlength . '"' : '';
+
+		$extraData = array(
+			'maxlength'    => $maxlength,
+			'rows'         => $rows,
+			'columns'      => $columns
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/timezone.php b/core/libraries/joomla/form/fields/timezone.php
new file mode 100644
index 00000000..3f684f58
--- /dev/null
+++ b/core/libraries/joomla/form/fields/timezone.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('groupedlist');
+
+/**
+ * Form Field class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class JFormFieldTimezone extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Timezone';
+
+	/**
+	 * The list of available timezone groups to use.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $zones = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
+
+	/**
+	 * The keyField of timezone field.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $keyField;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'keyField':
+				return $this->keyField;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'keyField':
+				$this->keyField = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->keyField = (string) $this->element['key_field'];
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the time zone field option groups.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   11.1
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		// Get the list of time zones from the server.
+		$zones = DateTimeZone::listIdentifiers();
+
+		// Build the group lists.
+		foreach ($zones as $zone)
+		{
+			// Time zones not in a group we will ignore.
+			if (strpos($zone, '/') === false)
+			{
+				continue;
+			}
+
+			// Get the group/locale from the timezone.
+			list ($group, $locale) = explode('/', $zone, 2);
+
+			// Only use known groups.
+			if (in_array($group, self::$zones))
+			{
+				// Initialize the group if necessary.
+				if (!isset($groups[$group]))
+				{
+					$groups[$group] = array();
+				}
+
+				// Only add options where a locale exists.
+				if (!empty($locale))
+				{
+					$groups[$group][$zone] = JHtml::_('select.option', $zone, str_replace('_', ' ', $locale), 'value', 'text', false);
+				}
+			}
+		}
+
+		// Sort the group lists.
+		ksort($groups);
+
+		foreach ($groups as &$location)
+		{
+			sort($location);
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}
diff --git a/core/libraries/joomla/form/fields/url.php b/core/libraries/joomla/form/fields/url.php
new file mode 100644
index 00000000..fb1f7313
--- /dev/null
+++ b/core/libraries/joomla/form/fields/url.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('text');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a URL text field
+ *
+ * @link   http://www.w3.org/TR/html-markup/input.url.html#input.url
+ * @see    JFormRuleUrl for validation of full urls
+ * @since  11.1
+ */
+class JFormFieldUrl extends JFormFieldText
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Url';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7
+	 */
+	protected $layout = 'joomla.form.field.url';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.1.2 (CMS)
+	 */
+	protected function getInput()
+	{
+		// Trim the trailing line in the layout file
+		return rtrim($this->getRenderer($this->layout)->render($this->getLayoutData()), PHP_EOL);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.7
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		// Initialize some field attributes.
+		$maxLength    = !empty($this->maxLength) ? ' maxlength="' . $this->maxLength . '"' : '';
+
+		// Note that the input type "url" is suitable only for external URLs, so if internal URLs are allowed
+		// we have to use the input type "text" instead.
+		$inputType    = $this->element['relative'] ? 'type="text"' : 'type="url"';
+
+		$extraData = array(
+			'maxLength' => $maxLength,
+			'inputType' => $inputType,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/joomla/form/fields/usergroup.php b/core/libraries/joomla/form/fields/usergroup.php
new file mode 100644
index 00000000..333d5449
--- /dev/null
+++ b/core/libraries/joomla/form/fields/usergroup.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports a nested checkbox field listing user groups.
+ * Multiselect is available by default.
+ *
+ * @since       11.1
+ * @deprecated  3.5
+ */
+class JFormFieldUsergroup extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type = 'Usergroup';
+
+	/**
+	 * Method to get the user group field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		JLog::add('JFormFieldUsergroup is deprecated. Use JFormFieldUserGroupList instead.', JLog::WARNING, 'deprecated');
+
+		$options = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= $this->disabled ? ' disabled' : '';
+		$attr .= $this->size ? ' size="' . $this->size . '"' : '';
+		$attr .= $this->multiple ? ' multiple' : '';
+		$attr .= $this->required ? ' required aria-required="true"' : '';
+		$attr .= $this->autofocus ? ' autofocus' : '';
+
+		// Initialize JavaScript field attributes.
+		$attr .= !empty($this->onchange) ? ' onchange="' . $this->onchange . '"' : '';
+		$attr .= !empty($this->onclick) ? ' onclick="' . $this->onclick . '"' : '';
+
+		// Iterate through the children and build an array of options.
+		foreach ($this->element->children() as $option)
+		{
+			// Only add <option /> elements.
+			if ($option->getName() != 'option')
+			{
+				continue;
+			}
+
+			$disabled = (string) $option['disabled'];
+			$disabled = ($disabled == 'true' || $disabled == 'disabled' || $disabled == '1');
+
+			// Create a new option object based on the <option /> element.
+			$tmp = JHtml::_(
+				'select.option', (string) $option['value'], trim((string) $option), 'value', 'text',
+				$disabled
+			);
+
+			// Set some option attributes.
+			$tmp->class = (string) $option['class'];
+
+			// Set some JavaScript option attributes.
+			$tmp->onclick = (string) $option['onclick'];
+
+			// Add the option object to the result set.
+			$options[] = $tmp;
+		}
+
+		return JHtml::_('access.usergroup', $this->name, $this->value, $attr, $options, $this->id);
+	}
+}
diff --git a/core/libraries/joomla/github/account.php b/core/libraries/joomla/github/account.php
new file mode 100644
index 00000000..cc94ca5b
--- /dev/null
+++ b/core/libraries/joomla/github/account.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Account class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubAccount extends JGithubObject
+{
+	/**
+	 * Method to create an authorisation.
+	 *
+	 * @param   array   $scopes  A list of scopes that this authorisation is in.
+	 * @param   string  $note    A note to remind you what the OAuth token is for.
+	 * @param   string  $url     A URL to remind you what app the OAuth token is for.
+	 *
+	 * @deprecated  use authorization->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function createAuthorisation(array $scopes = array(), $note = '', $url = '')
+	{
+		// Build the request path.
+		$path = '/authorizations';
+
+		$data = json_encode(
+			array('scopes' => $scopes, 'note' => $note, 'note_url' => $url)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete an authorisation
+	 *
+	 * @param   integer  $id  ID of the authorisation to delete
+	 *
+	 * @deprecated  use authorization->delete()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function deleteAuthorisation($id)
+	{
+		// Build the request path.
+		$path = '/authorizations/' . $id;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to edit an authorisation.
+	 *
+	 * @param   integer  $id            ID of the authorisation to edit
+	 * @param   array    $scopes        Replaces the authorisation scopes with these.
+	 * @param   array    $addScopes     A list of scopes to add to this authorisation.
+	 * @param   array    $removeScopes  A list of scopes to remove from this authorisation.
+	 * @param   string   $note          A note to remind you what the OAuth token is for.
+	 * @param   string   $url           A URL to remind you what app the OAuth token is for.
+	 *
+	 * @deprecated  use authorization->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 * @throws  RuntimeException
+	 */
+	public function editAuthorisation($id, array $scopes = array(), array $addScopes = array(), array $removeScopes = array(), $note = '', $url = '')
+	{
+		// Check if more than one scopes array contains data
+		$scopesCount = 0;
+
+		if (!empty($scopes))
+		{
+			$scope = 'scopes';
+			$scopeData = $scopes;
+			$scopesCount++;
+		}
+
+		if (!empty($addScopes))
+		{
+			$scope = 'add_scopes';
+			$scopeData = $addScopes;
+			$scopesCount++;
+		}
+
+		if (!empty($removeScopes))
+		{
+			$scope = 'remove_scopes';
+			$scopeData = $removeScopes;
+			$scopesCount++;
+		}
+
+		// Only allowed to send data for one scope parameter
+		if ($scopesCount >= 2)
+		{
+			throw new RuntimeException('You can only send one scope key in this request.');
+		}
+
+		// Build the request path.
+		$path = '/authorizations/' . $id;
+
+		$data = json_encode(
+			array(
+				$scope => $scopeData,
+				'note' => $note,
+				'note_url' => $url,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get details about an authorised application for the authenticated user.
+	 *
+	 * @param   integer  $id  ID of the authorisation to retrieve
+	 *
+	 * @deprecated  use authorization->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @note    This method will only accept Basic Authentication
+	 * @throws  DomainException
+	 */
+	public function getAuthorisation($id)
+	{
+		// Build the request path.
+		$path = '/authorizations/' . $id;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the authorised applications for the authenticated user.
+	 *
+	 * @deprecated  use authorization->getList()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 * @note    This method will only accept Basic Authentication
+	 */
+	public function getAuthorisations()
+	{
+		// Build the request path.
+		$path = '/authorizations';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the rate limit for the authenticated user.
+	 *
+	 * @deprecated  use authorization->getRateLimit()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function getRateLimit()
+	{
+		// Build the request path.
+		$path = '/rate_limit';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/commits.php b/core/libraries/joomla/github/commits.php
new file mode 100644
index 00000000..6e620073
--- /dev/null
+++ b/core/libraries/joomla/github/commits.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Commits class for the Joomla Platform.
+ *
+ * @since       12.1
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubCommits extends JGithubObject
+{
+	/**
+	 * Method to create a commit.
+	 *
+	 * @param   string  $user     The name of the owner of the GitHub repository.
+	 * @param   string  $repo     The name of the GitHub repository.
+	 * @param   string  $message  The commit message.
+	 * @param   string  $tree     SHA of the tree object this commit points to.
+	 * @param   array   $parents  Array of the SHAs of the commits that were the parents of this commit.
+	 *                            If omitted or empty, the commit will be written as a root commit.
+	 *                            For a single parent, an array of one SHA should be provided.
+	 *                            For a merge commit, an array of more than one should be provided.
+	 *
+	 * @deprecated  use data->commits->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function create($user, $repo, $message, $tree, array $parents = array())
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/commits';
+
+		$data = json_encode(
+			array('message' => $message, 'tree' => $tree, 'parents' => $parents)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to create a comment on a commit.
+	 *
+	 * @param   string   $user      The name of the owner of the GitHub repository.
+	 * @param   string   $repo      The name of the GitHub repository.
+	 * @param   string   $sha       The SHA of the commit to comment on.
+	 * @param   string   $comment   The text of the comment.
+	 * @param   integer  $line      The line number of the commit to comment on.
+	 * @param   string   $filepath  A relative path to the file to comment on within the commit.
+	 * @param   integer  $position  Line index in the diff to comment on.
+	 *
+	 * @deprecated  use repositories->comments->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function createCommitComment($user, $repo, $sha, $comment, $line, $filepath, $position)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits/' . $sha . '/comments';
+
+		$data = json_encode(
+			array(
+				'body' => $comment,
+				'commit_id' => $sha,
+				'line' => (int) $line,
+				'path' => $filepath,
+				'position' => (int) $position,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete a comment on a commit.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $id    The ID of the comment to edit.
+	 *
+	 * @deprecated  use repositories->comments->delete()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function deleteCommitComment($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments/' . $id;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to edit a comment on a commit.
+	 *
+	 * @param   string  $user     The name of the owner of the GitHub repository.
+	 * @param   string  $repo     The name of the GitHub repository.
+	 * @param   string  $id       The ID of the comment to edit.
+	 * @param   string  $comment  The text of the comment.
+	 *
+	 * @deprecated  use repositories->comments->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function editCommitComment($user, $repo, $id, $comment)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments/' . $id;
+
+		$data = json_encode(
+			array(
+				'body' => $comment,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a single commit for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   string   $sha    The SHA of the commit to retrieve.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @deprecated  use repositories->commits->get()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getCommit($user, $repo, $sha, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits/' . $sha;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a single comment on a commit.
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the comment to retrieve
+	 *
+	 * @deprecated  use repositories->comments->get()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getCommitComment($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments/' . $id;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of comments for a single commit for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   string   $sha    The SHA of the commit to retrieve.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @deprecated  use repositories->comments->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getCommitComments($user, $repo, $sha, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits/' . $sha . '/comments';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a diff for two commits.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $base  The base of the diff, either a commit SHA or branch.
+	 * @param   string  $head  The head of the diff, either a commit SHA or branch.
+	 *
+	 * @deprecated  use repositories->commits->compare()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getDiff($user, $repo, $base, $head)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/compare/' . $base . '...' . $head;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list commits for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @deprecated  use repositories->commits->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getList($user, $repo, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of commit comments for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @deprecated  use repositories->comments->getListRepository()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getListComments($user, $repo, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/forks.php b/core/libraries/joomla/github/forks.php
new file mode 100644
index 00000000..d4b544f3
--- /dev/null
+++ b/core/libraries/joomla/github/forks.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Forks class for the Joomla Platform.
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubForks extends JGithubObject
+{
+	/**
+	 * Method to fork a repository.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $org   The organization to fork the repo into. By default it is forked to the current user.
+	 *
+	 * @deprecated  use repositories->forks->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.4
+	 * @throws  DomainException
+	 */
+	public function create($user, $repo, $org = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/forks';
+
+		if (strlen($org) > 0)
+		{
+			$data = json_encode(
+				array('org' => $org)
+			);
+		}
+		else
+		{
+			$data = json_encode(array());
+		}
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 202)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list forks for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @deprecated  use repositories->forks->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   11.4
+	 * @throws  DomainException
+	 */
+	public function getList($user, $repo, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/forks';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/github.php b/core/libraries/joomla/github/github.php
new file mode 100644
index 00000000..3e8f1bea
--- /dev/null
+++ b/core/libraries/joomla/github/github.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with a GitHub server instance.
+ *
+ * @property-read  JGithubPackageActivity       $activity       GitHub API object for activity.
+ * @property-read  JGithubPackageAuthorization  $authorization  GitHub API object for authorizations.
+ * @property-read  JGithubPackageData           $data           GitHub API object for data.
+ * @property-read  JGithubPackageGists          $gists          GitHub API object for gists.
+ * @property-read  JGithubPackageGitignore      $gitignore      GitHub API object for gitignore.
+ * @property-read  JGithubPackageIssues         $issues         GitHub API object for issues.
+ * @property-read  JGithubPackageMarkdown       $markdown       GitHub API object for markdown.
+ * @property-read  JGithubPackageOrgs           $orgs           GitHub API object for orgs.
+ * @property-read  JGithubPackagePulls          $pulls          GitHub API object for pulls.
+ * @property-read  JGithubPackageRepositories   $repositories   GitHub API object for repositories.
+ * @property-read  JGithubPackageSearch         $search         GitHub API object for search.
+ * @property-read  JGithubPackageUsers          $users          GitHub API object for users.
+ *
+ * @property-read  JGithubRefs        $refs        Deprecated GitHub API object for referencess.
+ * @property-read  JGithubForks       $forks       Deprecated GitHub API object for forks.
+ * @property-read  JGithubCommits     $commits     Deprecated GitHub API object for commits.
+ * @property-read  JGithubMilestones  $milestones  Deprecated GitHub API object for commits.
+ * @property-read  JGithubStatuses    $statuses    Deprecated GitHub API object for commits.
+ * @property-read  JGithubAccount     $account     Deprecated GitHub API object for account references.
+ * @property-read  JGithubHooks       $hooks       Deprecated GitHub API object for hooks.
+ * @property-read  JGithubMeta        $meta        Deprecated GitHub API object for meta.
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithub
+{
+	/**
+	 * @var    Registry  Options for the GitHub object.
+	 * @since  11.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JGithubHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  11.3
+	 */
+	protected $client;
+
+	/**
+	 * @var    array  List of known packages.
+	 * @since  3.3 (CMS)
+	 */
+	protected $packages = array(
+		'activity',
+		'authorization',
+		'data',
+		'gists',
+		'gitignore',
+		'issues',
+		'markdown',
+		'orgs',
+		'pulls',
+		'repositories',
+		'users',
+	);
+
+	/**
+	 * @var    array  List of known legacy packages.
+	 * @since  3.3 (CMS)
+	 */
+	protected $legacyPackages = array('refs', 'forks', 'commits', 'milestones', 'statuses', 'account', 'hooks', 'meta');
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  GitHub options object.
+	 * @param   JGithubHttp  $client   The HTTP client object.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(Registry $options = null, JGithubHttp $client = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client  = isset($client) ? $client : new JGithubHttp($this->options);
+
+		// Setup the default API url if not already set.
+		$this->options->def('api.url', 'https://api.github.com');
+	}
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @throws RuntimeException
+	 *
+	 * @since   11.3
+	 * @return  JGithubObject  GitHub API object (gists, issues, pulls, etc).
+	 */
+	public function __get($name)
+	{
+		if (false == in_array($name, $this->packages))
+		{
+			// Check for a legacy class
+			if (in_array($name, $this->legacyPackages))
+			{
+				if (false == isset($this->$name))
+				{
+					$className = 'JGithub' . ucfirst($name);
+
+					$this->$name = new $className($this->options, $this->client);
+				}
+
+				return $this->$name;
+			}
+
+			throw new RuntimeException(sprintf('%1$s - Unknown package %2$s', __METHOD__, $name));
+		}
+
+		if (false == isset($this->$name))
+		{
+			$className = 'JGithubPackage' . ucfirst($name);
+
+			$this->$name = new $className($this->options, $this->client);
+		}
+
+		return $this->$name;
+	}
+
+	/**
+	 * Get an option from the JGitHub instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   11.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JGitHub instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JGitHub  This object for method chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/github/hooks.php b/core/libraries/joomla/github/hooks.php
new file mode 100644
index 00000000..8a81e74e
--- /dev/null
+++ b/core/libraries/joomla/github/hooks.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Hooks class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubHooks extends JGithubObject
+{
+	/**
+	 * Array containing the allowed hook events
+	 *
+	 * @var    array
+	 * @since  12.3
+	 */
+	protected $events = array(
+		'push',
+		'issues',
+		'issue_comment',
+		'commit_comment',
+		'pull_request',
+		'gollum',
+		'watch',
+		'download',
+		'fork',
+		'fork_apply',
+		'member',
+		'public',
+		'status',
+	);
+
+	/**
+	 * Method to create a hook on a repository.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   string   $name    The name of the service being called.
+	 * @param   array    $config  Array containing the config for the service.
+	 * @param   array    $events  The events the hook will be triggered for.
+	 * @param   boolean  $active  Flag to determine if the hook is active
+	 *
+	 * @deprecated  use repositories->hooks->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 * @throws  RuntimeException
+	 */
+	public function create($user, $repo, $name, array $config, array $events = array('push'), $active = true)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks';
+
+		// Check to ensure all events are in the allowed list
+		foreach ($events as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your events array contains an unauthorized event.');
+			}
+		}
+
+		$data = json_encode(
+			array('name' => $name, 'config' => $config, 'events' => $events, 'active' => $active)
+		);
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Method to delete a hook
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the hook to delete.
+	 *
+	 * @deprecated  use repositories->hooks->delete()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function delete($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Method to edit a hook.
+	 *
+	 * @param   string   $user          The name of the owner of the GitHub repository.
+	 * @param   string   $repo          The name of the GitHub repository.
+	 * @param   integer  $id            ID of the hook to edit.
+	 * @param   string   $name          The name of the service being called.
+	 * @param   array    $config        Array containing the config for the service.
+	 * @param   array    $events        The events the hook will be triggered for.  This resets the currently set list
+	 * @param   array    $addEvents     Events to add to the hook.
+	 * @param   array    $removeEvents  Events to remove from the hook.
+	 * @param   boolean  $active        Flag to determine if the hook is active
+	 *
+	 * @deprecated  use repositories->hooks->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 * @throws  RuntimeException
+	 */
+	public function edit($user, $repo, $id, $name, array $config, array $events = array('push'), array $addEvents = array(),
+		array $removeEvents = array(), $active = true)
+	{
+		// Check to ensure all events are in the allowed list
+		foreach ($events as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your events array contains an unauthorized event.');
+			}
+		}
+
+		foreach ($addEvents as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your active_events array contains an unauthorized event.');
+			}
+		}
+
+		foreach ($removeEvents as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your remove_events array contains an unauthorized event.');
+			}
+		}
+
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id;
+
+		$data = json_encode(
+			array(
+				'name' => $name,
+				'config' => $config,
+				'events' => $events,
+				'add_events' => $addEvents,
+				'remove_events' => $removeEvents,
+				'active' => $active,
+			)
+		);
+
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Method to get details about a single hook for the repository.
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the hook to retrieve
+	 *
+	 * @deprecated  use repositories->hooks->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function get($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to list hooks for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @deprecated  use repositories->hooks->getList()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function getList($user, $repo, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to test a hook against the latest repository commit
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the hook to delete
+	 *
+	 * @deprecated  use repositories->hooks->test()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function test($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id . '/test';
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode('')),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/http.php b/core/libraries/joomla/github/http.php
new file mode 100644
index 00000000..be977ea5
--- /dev/null
+++ b/core/libraries/joomla/github/http.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTTP client class for connecting to a GitHub instance.
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubHttp extends JHttp
+{
+	/**
+	 * @const  integer  Use no authentication for HTTP connections.
+	 * @since  11.3
+	 */
+	const AUTHENTICATION_NONE = 0;
+
+	/**
+	 * @const  integer  Use basic authentication for HTTP connections.
+	 * @since  11.3
+	 */
+	const AUTHENTICATION_BASIC = 1;
+
+	/**
+	 * @const  integer  Use OAuth authentication for HTTP connections.
+	 * @since  11.3
+	 */
+	const AUTHENTICATION_OAUTH = 2;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry        $options    Client options object.
+	 * @param   JHttpTransport  $transport  The HTTP transport object.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(Registry $options = null, JHttpTransport $transport = null)
+	{
+		// Call the JHttp constructor to setup the object.
+		parent::__construct($options, $transport);
+
+		// Make sure the user agent string is defined.
+		$this->options->def('userAgent', 'JGitHub/2.0');
+
+		// Set the default timeout to 120 seconds.
+		$this->options->def('timeout', 120);
+	}
+}
diff --git a/core/libraries/joomla/github/meta.php b/core/libraries/joomla/github/meta.php
new file mode 100644
index 00000000..3ef55316
--- /dev/null
+++ b/core/libraries/joomla/github/meta.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Meta class.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubMeta extends JGithubObject
+{
+	/**
+	 * Method to get the authorized IP addresses for services
+	 *
+	 * @return  array  Authorized IP addresses
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function getMeta()
+	{
+		// Build the request path.
+		$path = '/meta';
+
+		$githubIps = $this->processResponse($this->client->get($this->fetchUrl($path)), 200);
+
+		/*
+		 * The response body returns the IP addresses in CIDR format
+		 * Decode the response body and strip the subnet mask information prior to
+		 * returning the data to the user.  We're assuming quite a bit here that all
+		 * masks will be /32 as they are as of the time of development.
+		 */
+
+		$authorizedIps = array();
+
+		foreach ($githubIps as $key => $serviceIps)
+		{
+			// The first level contains an array of IPs based on the service
+			$authorizedIps[$key] = array();
+
+			foreach ($serviceIps as $serviceIp)
+			{
+				// The second level is each individual IP address, strip the mask here
+				$authorizedIps[$key][] = substr($serviceIp, 0, -3);
+			}
+		}
+
+		return $authorizedIps;
+	}
+}
diff --git a/core/libraries/joomla/github/milestones.php b/core/libraries/joomla/github/milestones.php
new file mode 100644
index 00000000..6c92e93c
--- /dev/null
+++ b/core/libraries/joomla/github/milestones.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Milestones class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubMilestones extends JGithubObject
+{
+	/**
+	 * Method to get the list of milestones for a repo.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   string   $state      The milestone state to retrieved.  Open (default) or closed.
+	 * @param   string   $sort       Sort can be due_date (default) or completeness.
+	 * @param   string   $direction  Direction is asc or desc (default).
+	 * @param   integer  $page       The page number from which to get items.
+	 * @param   integer  $limit      The number of items on a page.
+	 *
+	 * @deprecated  use issues->milestones->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function getList($user, $repo, $state = 'open', $sort = 'due_date', $direction = 'desc', $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones?';
+
+		$path .= 'state=' . $state;
+		$path .= '&sort=' . $sort;
+		$path .= '&direction=' . $direction;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a specific milestone.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $milestoneId  The milestone id to get.
+	 *
+	 * @deprecated  use issues->milestones->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function get($user, $repo, $milestoneId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones/' . (int) $milestoneId;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to create a milestone for a repository.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $title        The title of the milestone.
+	 * @param   string   $state        Can be open (default) or closed.
+	 * @param   string   $description  Optional description for milestone.
+	 * @param   string   $due_on       Optional ISO 8601 time.
+	 *
+	 * @deprecated  use issues->milestones->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function create($user, $repo, $title, $state = null, $description = null, $due_on = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+		);
+
+		if (!is_null($state))
+		{
+			$data['state'] = $state;
+		}
+
+		if (!is_null($description))
+		{
+			$data['description'] = $description;
+		}
+
+		if (!is_null($due_on))
+		{
+			$data['due_on'] = $due_on;
+		}
+
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update a milestone.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $milestoneId  The id of the comment to update.
+	 * @param   integer  $title        Optional title of the milestone.
+	 * @param   string   $state        Can be open (default) or closed.
+	 * @param   string   $description  Optional description for milestone.
+	 * @param   string   $due_on       Optional ISO 8601 time.
+	 *
+	 * @deprecated  use issues->milestones->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function edit($user, $repo, $milestoneId, $title = null, $state = null, $description = null, $due_on = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones/' . (int) $milestoneId;
+
+		// Build the request data.
+		$data = array();
+
+		if (!is_null($title))
+		{
+			$data['title'] = $title;
+		}
+
+		if (!is_null($state))
+		{
+			$data['state'] = $state;
+		}
+
+		if (!is_null($description))
+		{
+			$data['description'] = $description;
+		}
+
+		if (!is_null($due_on))
+		{
+			$data['due_on'] = $due_on;
+		}
+
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete a milestone.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $milestoneId  The id of the milestone to delete.
+	 *
+	 * @deprecated  use issues->milestones->delete()
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function delete($user, $repo, $milestoneId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones/' . (int) $milestoneId;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+}
diff --git a/core/libraries/joomla/github/object.php b/core/libraries/joomla/github/object.php
new file mode 100644
index 00000000..99f6dbe1
--- /dev/null
+++ b/core/libraries/joomla/github/object.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * GitHub API object class for the Joomla Platform.
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+abstract class JGithubObject
+{
+	/**
+	 * @var    Registry  Options for the GitHub object.
+	 * @since  11.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JGithubHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  11.3
+	 */
+	protected $client;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  GitHub options object.
+	 * @param   JGithubHttp  $client   The HTTP client object.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(Registry $options = null, JGithubHttp $client = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client  = isset($client) ? $client : new JGithubHttp($this->options);
+	}
+
+	/**
+	 * Method to build and return a full request URL for the request.  This method will
+	 * add appropriate pagination details if necessary and also prepend the API url
+	 * to have a complete URL for the request.
+	 *
+	 * @param   string   $path   URL to inflect
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @return  string   The request URL.
+	 *
+	 * @since   11.3
+	 */
+	protected function fetchUrl($path, $page = 0, $limit = 0)
+	{
+		// Get a new JUri object fousing the api url and given path.
+		$uri = new JUri($this->options->get('api.url') . $path);
+
+		if ($this->options->get('gh.token', false))
+		{
+			// Use oAuth authentication - @todo set in request header ?
+			$uri->setVar('access_token', $this->options->get('gh.token'));
+		}
+		else
+		{
+			// Use basic authentication
+			if ($this->options->get('api.username', false))
+			{
+				$username = $this->options->get('api.username');
+				$username = str_replace('@', '%40', $username);
+				$uri->setUser($username);
+			}
+
+			if ($this->options->get('api.password', false))
+			{
+				$password = $this->options->get('api.password');
+				$password = str_replace('@', '%40', $password);
+				$uri->setPass($password);
+			}
+		}
+
+		// If we have a defined page number add it to the JUri object.
+		if ($page > 0)
+		{
+			$uri->setVar('page', (int) $page);
+		}
+
+		// If we have a defined items per page add it to the JUri object.
+		if ($limit > 0)
+		{
+			$uri->setVar('per_page', (int) $limit);
+		}
+
+		return (string) $uri;
+	}
+
+	/**
+	 * Process the response and decode it.
+	 *
+	 * @param   JHttpResponse  $response      The response.
+	 * @param   integer        $expectedCode  The expected "good" code.
+	 * @param   boolean        $decode        If the should be response be JSON decoded.
+	 *
+	 * @throws DomainException
+	 * @since  12.4
+	 *
+	 * @return mixed
+	 */
+	protected function processResponse(JHttpResponse $response, $expectedCode = 200, $decode = true)
+	{
+		// Validate the response code.
+		if ($response->code == $expectedCode)
+		{
+			return ($decode) ? json_decode($response->body) : $response->body;
+		}
+
+		// Decode the error response and throw an exception.
+		$error   = json_decode($response->body);
+		$message = (isset($error->message)) ? $error->message : 'Error: ' . $response->code;
+
+		throw new DomainException($message, $response->code);
+	}
+}
diff --git a/core/libraries/joomla/github/package.php b/core/libraries/joomla/github/package.php
new file mode 100644
index 00000000..b03c859b
--- /dev/null
+++ b/core/libraries/joomla/github/package.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API package class for the Joomla Platform.
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+abstract class JGithubPackage extends JGithubObject
+{
+	/**
+	 * @var    string
+	 * @since  3.3 (CMS)
+	 */
+	protected $name = '';
+
+	/**
+	 * @var    array
+	 * @since  3.3 (CMS)
+	 */
+	protected $packages = array();
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JGithubPackage  GitHub API package object.
+	 *
+	 * @since   3.3 (CMS)
+	 * @throws  RuntimeException
+	 */
+	public function __get($name)
+	{
+		if (false == in_array($name, $this->packages))
+		{
+			throw new RuntimeException(sprintf('%1$s - Unknown package %2$s', __METHOD__, $name));
+		}
+
+		if (false == isset($this->$name))
+		{
+			$className = 'JGithubPackage' . ucfirst($this->name) . ucfirst($name);
+
+			$this->$name = new $className($this->options, $this->client);
+		}
+
+		return $this->$name;
+	}
+}
diff --git a/core/libraries/joomla/github/package/activity.php b/core/libraries/joomla/github/package/activity.php
new file mode 100644
index 00000000..eb93fb7e
--- /dev/null
+++ b/core/libraries/joomla/github/package/activity.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity class for the Joomla Platform.
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * @documentation  https://developer.github.com/v3/activity/
+ *
+ * @property-read  JGithubPackageActivityEvents  $events  GitHub API object for markdown.
+ */
+class JGithubPackageActivity extends JGithubPackage
+{
+	protected $name = 'Activity';
+
+	protected $packages = array('events', 'notifications', 'starring', 'watching');
+}
diff --git a/core/libraries/joomla/github/package/activity/events.php b/core/libraries/joomla/github/package/activity/events.php
new file mode 100644
index 00000000..1a89bb30
--- /dev/null
+++ b/core/libraries/joomla/github/package/activity/events.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity Events class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/activity/events/
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageActivityEvents extends JGithubPackage
+{
+	/**
+	 * List public events.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getPublic()
+	{
+		// Build the request path.
+		$path = '/events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List repository events.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function getRepository($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List issue events for a repository.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getIssue($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List public events for a network of repositories.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getNetwork($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/networks/' . $owner . '/' . $repo . '/events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List public events for an organization.
+	 *
+	 * @param   string  $org  Organisation.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getOrg($org)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List events that a user has received.
+	 *
+	 * These are events that you’ve received by watching repos and following users.
+	 * If you are authenticated as the given user, you will see private events.
+	 * Otherwise, you’ll only see public events.
+	 *
+	 * @param   string  $user  User name.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getUser($user)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/received_events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List public events that a user has received.
+	 *
+	 * @param   string  $user  User name.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getUserPublic($user)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/received_events/public';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List events performed by a user.
+	 *
+	 * If you are authenticated as the given user, you will see your private events.
+	 * Otherwise, you’ll only see public events.
+	 *
+	 * @param   string  $user  User name.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getByUser($user)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/events';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List public events performed by a user.
+	 *
+	 * @param   string  $user  User name.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getByUserPublic($user)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/events/public';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List events for an organization.
+	 *
+	 * This is the user’s organization dashboard.
+	 * You must be authenticated as the user to view this.
+	 *
+	 * @param   string  $user  User name.
+	 * @param   string  $org   Organisation.
+	 *
+	 * @since   12.3
+	 * @return  object
+	 */
+	public function getUserOrg($user, $org)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/events/orgs/' . $org;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/activity/notifications.php b/core/libraries/joomla/github/package/activity/notifications.php
new file mode 100644
index 00000000..ec3d09ff
--- /dev/null
+++ b/core/libraries/joomla/github/package/activity/notifications.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity Events class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/activity/notifications/
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageActivityNotifications extends JGithubPackage
+{
+	/**
+	 * List your notifications.
+	 *
+	 * List all notifications for the current user, grouped by repository.
+	 *
+	 * @param   boolean  $all            True to show notifications marked as read.
+	 * @param   boolean  $participating  True to show only notifications in which the user is directly participating or
+	 *                                   mentioned.
+	 * @param   JDate    $since          filters out any notifications updated before the given time. The time should be passed in
+	 *                                   as UTC in the ISO 8601 format.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList($all = true, $participating = true, JDate $since = null)
+	{
+		// Build the request path.
+		$path = '/notifications?';
+
+		$path .= ($all) ? '&all=1' : '';
+		$path .= ($participating) ? '&participating=1' : '';
+		$path .= ($since) ? '&since=' . $since->toISO8601() : '';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List your notifications in a repository.
+	 *
+	 * List all notifications for the current user.
+	 *
+	 * @param   string   $owner          Repository owner.
+	 * @param   string   $repo           Repository name.
+	 * @param   boolean  $all            True to show notifications marked as read.
+	 * @param   boolean  $participating  True to show only notifications in which the user is directly participating or
+	 *                                   mentioned.
+	 * @param   JDate    $since          filters out any notifications updated before the given time. The time should be passed in
+	 *                                   as UTC in the ISO 8601 format.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getListRepository($owner, $repo, $all = true, $participating = true, JDate $since = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/notifications?';
+
+		$path .= ($all) ? '&all=1' : '';
+		$path .= ($participating) ? '&participating=1' : '';
+		$path .= ($since) ? '&since=' . $since->toISO8601() : '';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Mark as read.
+	 *
+	 * Marking a notification as “read” removes it from the default view on GitHub.com.
+	 *
+	 * @param   boolean  $unread        Changes the unread status of the threads.
+	 * @param   boolean  $read          Inverse of “unread”.
+	 * @param   JDate    $last_read_at  Describes the last point that notifications were checked.
+	 *                                  Anything updated since this time will not be updated. Default: Now. Expected in ISO 8601 format.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function markRead($unread = true, $read = true, JDate $last_read_at = null)
+	{
+		// Build the request path.
+		$path = '/notifications';
+
+		$data = array(
+			'unread' => $unread,
+			'read'   => $read,
+		);
+
+		if ($last_read_at)
+		{
+			$data['last_read_at'] = $last_read_at->toISO8601();
+		}
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), json_encode($data)),
+			205
+		);
+	}
+
+	/**
+	 * Mark notifications as read in a repository.
+	 *
+	 * Marking all notifications in a repository as “read” removes them from the default view on GitHub.com.
+	 *
+	 * @param   string   $owner         Repository owner.
+	 * @param   string   $repo          Repository name.
+	 * @param   boolean  $unread        Changes the unread status of the threads.
+	 * @param   boolean  $read          Inverse of “unread”.
+	 * @param   JDate    $last_read_at  Describes the last point that notifications were checked.
+	 *                                  Anything updated since this time will not be updated. Default: Now. Expected in ISO 8601 format.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function markReadRepository($owner, $repo, $unread, $read, JDate $last_read_at = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/notifications';
+
+		$data = array(
+			'unread' => $unread,
+			'read'   => $read,
+		);
+
+		if ($last_read_at)
+		{
+			$data['last_read_at'] = $last_read_at->toISO8601();
+		}
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), json_encode($data)),
+			205
+		);
+	}
+
+	/**
+	 * View a single thread.
+	 *
+	 * @param   integer  $id  The thread id.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function viewThread($id)
+	{
+		// Build the request path.
+		$path = '/notifications/threads/' . $id;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Mark a thread as read.
+	 *
+	 * @param   integer  $id      The thread id.
+	 * @param   boolean  $unread  Changes the unread status of the threads.
+	 * @param   boolean  $read    Inverse of “unread”.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function markReadThread($id, $unread = true, $read = true)
+	{
+		// Build the request path.
+		$path = '/notifications/threads/' . $id;
+
+		$data = array(
+			'unread' => $unread,
+			'read'   => $read,
+		);
+
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), json_encode($data)),
+			205
+		);
+	}
+
+	/**
+	 * Get a Thread Subscription.
+	 *
+	 * This checks to see if the current user is subscribed to a thread.
+	 * You can also get a Repository subscription.
+	 *
+	 * @param   integer  $id  The thread id.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getThreadSubscription($id)
+	{
+		// Build the request path.
+		$path = '/notifications/threads/' . $id . '/subscription';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Set a Thread Subscription.
+	 *
+	 * This lets you subscribe to a thread, or ignore it. Subscribing to a thread is unnecessary
+	 * if the user is already subscribed to the repository. Ignoring a thread will mute all
+	 * future notifications (until you comment or get @mentioned).
+	 *
+	 * @param   integer  $id          The thread id.
+	 * @param   boolean  $subscribed  Determines if notifications should be received from this thread.
+	 * @param   boolean  $ignored     Determines if all notifications should be blocked from this thread.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function setThreadSubscription($id, $subscribed, $ignored)
+	{
+		// Build the request path.
+		$path = '/notifications/threads/' . $id . '/subscription';
+
+		$data = array(
+			'subscribed' => $subscribed,
+			'ignored'    => $ignored,
+		);
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), json_encode($data))
+		);
+	}
+
+	/**
+	 * Delete a Thread Subscription.
+	 *
+	 * @param   integer  $id  The thread id.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function deleteThreadSubscription($id)
+	{
+		// Build the request path.
+		$path = '/notifications/threads/' . $id . '/subscription';
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/activity/starring.php b/core/libraries/joomla/github/package/activity/starring.php
new file mode 100644
index 00000000..896ca889
--- /dev/null
+++ b/core/libraries/joomla/github/package/activity/starring.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity Events class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/activity/starring/
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageActivityStarring extends JGithubPackage
+{
+	/**
+	 * List Stargazers.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return mixed
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/stargazers';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List repositories being starred.
+	 *
+	 * List repositories being starred by a user.
+	 *
+	 * @param   string  $user  User name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getRepositories($user = '')
+	{
+		// Build the request path.
+		$path = ($user)
+			? '/users' . $user . '/starred'
+			: '/user/starred';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Check if you are starring a repository.
+	 *
+	 * Requires for the user to be authenticated.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function check($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/user/starred/' . $owner . '/' . $repo;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case '204' :
+				// This repository is watched by you.
+				return true;
+				break;
+
+			case '404' :
+				// This repository is not watched by you.
+				return false;
+				break;
+		}
+
+		throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+	}
+
+	/**
+	 * Star a repository.
+	 *
+	 * Requires for the user to be authenticated.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function star($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/user/starred/' . $owner . '/' . $repo;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Unstar a repository.
+	 *
+	 * Requires for the user to be authenticated.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function unstar($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/user/starred/' . $owner . '/' . $repo;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/activity/watching.php b/core/libraries/joomla/github/package/activity/watching.php
new file mode 100644
index 00000000..02a3b4ac
--- /dev/null
+++ b/core/libraries/joomla/github/package/activity/watching.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity Watching Events class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/activity/watching/
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageActivityWatching extends JGithubPackage
+{
+	/**
+	 * List watchers
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return mixed
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/subscribers';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List repositories being watched.
+	 *
+	 * List repositories being watched by a user.
+	 *
+	 * @param   string  $user  User name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return mixed
+	 */
+	public function getRepositories($user = '')
+	{
+		// Build the request path.
+		$path = ($user)
+			? '/users/' . $user . '/subscriptions'
+			: '/user/subscriptions';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a Repository Subscription.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return mixed
+	 */
+	public function getSubscription($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/subscription';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Set a Repository Subscription.
+	 *
+	 * @param   string   $owner       Repository owner.
+	 * @param   string   $repo        Repository name.
+	 * @param   boolean  $subscribed  Determines if notifications should be received from this thread.
+	 * @param   boolean  $ignored     Determines if all notifications should be blocked from this thread.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function setSubscription($owner, $repo, $subscribed, $ignored)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/subscription';
+
+		$data = array(
+			'subscribed' => $subscribed,
+			'ignored'    => $ignored,
+		);
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), json_encode($data))
+		);
+	}
+
+	/**
+	 * Delete a Repository Subscription.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function deleteSubscription($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/subscription';
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Check if you are watching a repository (LEGACY).
+	 *
+	 * Requires for the user to be authenticated.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function check($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/user/subscriptions/' . $owner . '/' . $repo;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case '204' :
+				// This repository is watched by you.
+				return true;
+				break;
+
+			case '404' :
+				// This repository is not watched by you.
+				return false;
+				break;
+		}
+
+		throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+	}
+
+	/**
+	 * Watch a repository (LEGACY).
+	 *
+	 * Requires for the user to be authenticated.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function watch($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/user/subscriptions/' . $owner . '/' . $repo;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Stop watching a repository (LEGACY).
+	 *
+	 * Requires for the user to be authenticated.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function unwatch($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/user/subscriptions/' . $owner . '/' . $repo;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/authorization.php b/core/libraries/joomla/github/package/authorization.php
new file mode 100644
index 00000000..47d7daae
--- /dev/null
+++ b/core/libraries/joomla/github/package/authorization.php
@@ -0,0 +1,334 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Authorization class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/oauth/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageAuthorization extends JGithubPackage
+{
+	/**
+	 * Method to create an authorization.
+	 *
+	 * @param   array   $scopes  A list of scopes that this authorization is in.
+	 * @param   string  $note    A note to remind you what the OAuth token is for.
+	 * @param   string  $url     A URL to remind you what app the OAuth token is for.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function create(array $scopes = array(), $note = '', $url = '')
+	{
+		// Build the request path.
+		$path = '/authorizations';
+
+		$data = json_encode(
+			array('scopes' => $scopes, 'note' => $note, 'note_url' => $url)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete an authorization
+	 *
+	 * @param   integer  $id  ID of the authorization to delete
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function delete($id)
+	{
+		// Build the request path.
+		$path = '/authorizations/' . $id;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to edit an authorization.
+	 *
+	 * @param   integer  $id            ID of the authorization to edit
+	 * @param   array    $scopes        Replaces the authorization scopes with these.
+	 * @param   array    $addScopes     A list of scopes to add to this authorization.
+	 * @param   array    $removeScopes  A list of scopes to remove from this authorization.
+	 * @param   string   $note          A note to remind you what the OAuth token is for.
+	 * @param   string   $url           A URL to remind you what app the OAuth token is for.
+	 *
+	 * @throws RuntimeException
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function edit($id, array $scopes = array(), array $addScopes = array(), array $removeScopes = array(), $note = '', $url = '')
+	{
+		// Check if more than one scopes array contains data
+		$scopesCount = 0;
+
+		if (!empty($scopes))
+		{
+			$scope     = 'scopes';
+			$scopeData = $scopes;
+			$scopesCount++;
+		}
+
+		if (!empty($addScopes))
+		{
+			$scope     = 'add_scopes';
+			$scopeData = $addScopes;
+			$scopesCount++;
+		}
+
+		if (!empty($removeScopes))
+		{
+			$scope     = 'remove_scopes';
+			$scopeData = $removeScopes;
+			$scopesCount++;
+		}
+
+		// Only allowed to send data for one scope parameter
+		if ($scopesCount >= 2)
+		{
+			throw new RuntimeException('You can only send one scope key in this request.');
+		}
+
+		// Build the request path.
+		$path = '/authorizations/' . $id;
+
+		$data = json_encode(
+			array(
+				$scope     => $scopeData,
+				'note'     => $note,
+				'note_url' => $url,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get details about an authorised application for the authenticated user.
+	 *
+	 * @param   integer  $id  ID of the authorization to retrieve
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 * @note    This method will only accept Basic Authentication
+	 *
+	 * @return  object
+	 */
+	public function get($id)
+	{
+		// Build the request path.
+		$path = '/authorizations/' . $id;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the authorised applications for the authenticated user.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 * @note    This method will only accept Basic Authentication
+	 *
+	 * @return  object
+	 */
+	public function getList()
+	{
+		// Build the request path.
+		$path = '/authorizations';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the rate limit for the authenticated user.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function getRateLimit()
+	{
+		// Build the request path.
+		$path = '/rate_limit';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * 1. Request authorization on GitHub.
+	 *
+	 * @param   string  $client_id     The client ID you received from GitHub when you registered.
+	 * @param   string  $redirect_uri  URL in your app where users will be sent after authorization.
+	 * @param   string  $scope         Comma separated list of scopes.
+	 * @param   string  $state         An unguessable random string. It is used to protect against
+	 *                                 cross-site request forgery attacks.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return JUri
+	 */
+	public function getAuthorizationLink($client_id, $redirect_uri = '', $scope = '', $state = '')
+	{
+		$uri = new JUri('https://github.com/login/oauth/authorize');
+
+		$uri->setVar('client_id', $client_id);
+
+		if ($redirect_uri)
+		{
+			$uri->setVar('redirect_uri', urlencode($redirect_uri));
+		}
+
+		if ($scope)
+		{
+			$uri->setVar('scope', $scope);
+		}
+
+		if ($state)
+		{
+			$uri->setVar('state', $state);
+		}
+
+		return (string) $uri;
+	}
+
+	/**
+	 * 2. Request the access token.
+	 *
+	 * @param   string  $client_id      The client ID you received from GitHub when you registered.
+	 * @param   string  $client_secret  The client secret you received from GitHub when you registered.
+	 * @param   string  $code           The code you received as a response to Step 1.
+	 * @param   string  $redirect_uri   URL in your app where users will be sent after authorization.
+	 * @param   string  $format         The response format (json, xml, ).
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 3.3 (CMS)
+	 *
+	 * @return string
+	 */
+	public function requestToken($client_id, $client_secret, $code, $redirect_uri = '', $format = '')
+	{
+		$uri = 'https://github.com/login/oauth/access_token';
+
+		$data = array(
+			'client_id'     => $client_id,
+			'client_secret' => $client_secret,
+			'code'          => $code,
+		);
+
+		if ($redirect_uri)
+		{
+			$data['redirect_uri'] = $redirect_uri;
+		}
+
+		$headers = array();
+
+		switch ($format)
+		{
+			case 'json' :
+				$headers['Accept'] = 'application/json';
+				break;
+			case 'xml' :
+				$headers['Accept'] = 'application/xml';
+				break;
+			default :
+				if ($format)
+				{
+					throw new UnexpectedValueException('Invalid format');
+				}
+				break;
+		}
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($uri, $data, $headers),
+			200, false
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/data.php b/core/libraries/joomla/github/package/data.php
new file mode 100644
index 00000000..1abcdd58
--- /dev/null
+++ b/core/libraries/joomla/github/package/data.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API DB class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/git/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * https://developer.github.com/v3/git/
+ * Git DB API
+ *
+ * The Git Database API gives you access to read and write raw Git objects to your Git database on GitHub and to list
+ *  * and update your references (branch heads and tags).
+ *
+ * This basically allows you to reimplement a lot of Git functionality over our API - by creating raw objects
+ *  * directly into the database and updating branch references you could technically do just about anything that
+ *  * Git can do without having Git installed.
+ *
+ * Git DB API functions will return a 409 if the git repo for a Repository is empty or unavailable.
+ *  * This typically means it is being created still. Contact Support if this response status persists.
+ *
+ * git db
+ *
+ * For more information on the Git object database, please read the Git Internals chapter of the Pro Git book.
+ *
+ * As an example, if you wanted to commit a change to a file in your repository, you would:
+ *
+ *     get the current commit object
+ *     retrieve the tree it points to
+ *     retrieve the content of the blob object that tree has for that particular file path
+ *     change the content somehow and post a new blob object with that new content, getting a blob SHA back
+ *     post a new tree object with that file path pointer replaced with your new blob SHA getting a tree SHA back
+ *     create a new commit object with the current commit SHA as the parent and the new tree SHA, getting a commit SHA back
+ *     update the reference of your branch to point to the new commit SHA
+ *
+ * It might seem complex, but it’s actually pretty simple when you understand the model and it opens up a ton of
+ * things you could potentially do with the API.
+ */
+class JGithubPackageData extends JGithubPackage
+{
+	protected $name = 'Data';
+
+	protected $packages = array('blobs', 'commits', 'refs', 'tags', 'trees');
+}
diff --git a/core/libraries/joomla/github/package/data/blobs.php b/core/libraries/joomla/github/package/data/blobs.php
new file mode 100644
index 00000000..eb779b2d
--- /dev/null
+++ b/core/libraries/joomla/github/package/data/blobs.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Data Blobs class for the Joomla Platform.
+ *
+ * Since blobs can be any arbitrary binary data, the input and responses for the blob API
+ * takes an encoding parameter that can be either utf-8 or base64. If your data cannot be
+ * losslessly sent as a UTF-8 string, you can base64 encode it.
+ *
+ * @documentation https://developer.github.com/v3/git/blobs/
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageDataBlobs extends JGithubPackage
+{
+	/**
+	 * Get a Blob.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 * @param   string  $sha    The commit SHA.
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/blobs/' . $sha;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a Blob.
+	 *
+	 * @param   string  $owner     Repository owner.
+	 * @param   string  $repo      Repository name.
+	 * @param   string  $content   The content of the blob.
+	 * @param   string  $encoding  The encoding to use.
+	 *
+	 * @return object
+	 */
+	public function create($owner, $repo, $content, $encoding = 'utf-8')
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/blobs';
+
+		$data = array(
+			'content'  => $content,
+			'encoding' => $encoding,
+		);
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($data)),
+			201
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/data/commits.php b/core/libraries/joomla/github/package/data/commits.php
new file mode 100644
index 00000000..9bf2e65f
--- /dev/null
+++ b/core/libraries/joomla/github/package/data/commits.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Data Commits class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/git/commits/
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageDataCommits extends JGithubPackage
+{
+	/**
+	 * Get a single commit.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $sha    The commit SHA.
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/commits/' . $sha;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to create a commit.
+	 *
+	 * @param   string  $owner    The name of the owner of the GitHub repository.
+	 * @param   string  $repo     The name of the GitHub repository.
+	 * @param   string  $message  The commit message.
+	 * @param   string  $tree     SHA of the tree object this commit points to.
+	 * @param   array   $parents  Array of the SHAs of the commits that were the parents of this commit.
+	 *                            If omitted or empty, the commit will be written as a root commit.
+	 *                            For a single parent, an array of one SHA should be provided.
+	 *                            For a merge commit, an array of more than one should be provided.
+	 *
+	 * @throws DomainException
+	 * @since   12.1
+	 *
+	 * @return  object
+	 */
+	public function create($owner, $repo, $message, $tree, array $parents = array())
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/commits';
+
+		$data = json_encode(
+			array('message' => $message, 'tree' => $tree, 'parents' => $parents)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$response = $this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/data/refs.php b/core/libraries/joomla/github/package/data/refs.php
new file mode 100644
index 00000000..d1ab2c0f
--- /dev/null
+++ b/core/libraries/joomla/github/package/data/refs.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/git/refs/
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageDataRefs extends JGithubPackage
+{
+	/**
+	 * Method to get a reference.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $ref   The reference to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function get($user, $repo, $ref)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs/' . $ref;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list references for a repository.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   string   $namespace  Optional sub-namespace to limit the returned references.
+	 * @param   integer  $page       Page to request
+	 * @param   integer  $limit      Number of results to return per page
+	 *
+	 * @return  array
+	 *
+	 * @since   11.3
+	 */
+	public function getList($user, $repo, $namespace = '', $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs' . $namespace;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to create a ref.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $ref   The name of the fully qualified reference.
+	 * @param   string  $sha   The SHA1 value to set this reference to.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($user, $repo, $ref, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'ref' => $ref,
+				'sha' => $sha,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update a reference.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   string   $ref    The reference to update.
+	 * @param   string   $sha    The SHA1 value to set the reference to.
+	 * @param   boolean  $force  Whether the update should be forced. Default to false.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function edit($user, $repo, $ref, $sha, $force = false)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs/' . $ref;
+
+		// Craete the data object.
+		$data = new stdClass;
+
+		// If a title is set add it to the data object.
+		if ($force)
+		{
+			$data->force = true;
+		}
+
+		$data->sha = $sha;
+
+		// Encode the request data.
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Delete a Reference
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $ref    The reference to update.
+	 *
+	 * @since   3.3 (CMS)
+	 * @return object
+	 */
+	public function delete($owner, $repo, $ref)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/refs/' . $ref;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/data/tags.php b/core/libraries/joomla/github/package/data/tags.php
new file mode 100644
index 00000000..89be41ff
--- /dev/null
+++ b/core/libraries/joomla/github/package/data/tags.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Data Tags class for the Joomla Platform.
+ *
+ * This tags API only deals with tag objects - so only annotated tags, not lightweight tags.
+ *
+ * @documentation https://developer.github.com/v3/git/tags/
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageDataTags extends JGithubPackage
+{
+	/**
+	 * Get a Tag.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $sha    The SHA1 value to set the reference to.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/tags/' . $sha;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a Tag Object
+	 *
+	 * Note that creating a tag object does not create the reference that makes a tag in Git.
+	 * If you want to create an annotated tag in Git, you have to do this call to create the tag object,
+	 * and then create the refs/tags/[tag] reference. If you want to create a lightweight tag,
+	 * you simply have to create the reference - this call would be unnecessary.
+	 *
+	 * @param   string  $owner         The name of the owner of the GitHub repository.
+	 * @param   string  $repo          The name of the GitHub repository.
+	 * @param   string  $tag           The tag string.
+	 * @param   string  $message       The tag message.
+	 * @param   string  $object        The SHA of the git object this is tagging.
+	 * @param   string  $type          The type of the object we’re tagging. Normally this is a commit
+	 *                                 but it can also be a tree or a blob.
+	 * @param   string  $tagger_name   The name of the author of the tag.
+	 * @param   string  $tagger_email  The email of the author of the tag.
+	 * @param   string  $tagger_date   Timestamp of when this object was tagged.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function create($owner, $repo, $tag, $message, $object, $type, $tagger_name, $tagger_email, $tagger_date)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/tags';
+
+		$data = array(
+			'tag'          => $tag,
+			'message'      => $message,
+			'object'       => $object,
+			'type'         => $type,
+			'tagger_name'  => $tagger_name,
+			'tagger_email' => $tagger_email,
+			'tagger_date'  => $tagger_date,
+		);
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($data)),
+			201
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/data/trees.php b/core/libraries/joomla/github/package/data/trees.php
new file mode 100644
index 00000000..216d0701
--- /dev/null
+++ b/core/libraries/joomla/github/package/data/trees.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Data Trees class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/git/trees/
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageDataTrees extends JGithubPackage
+{
+	/**
+	 * Get a Tree
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $sha    The SHA1 value to set the reference to.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/trees/' . $sha;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a Tree Recursively
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $sha    The SHA1 value to set the reference to.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getRecursively($owner, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/trees/' . $sha . '?recursive=1';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a Tree.
+	 *
+	 * The tree creation API will take nested entries as well. If both a tree and a nested path
+	 * modifying that tree are specified, it will overwrite the contents of that tree with the
+	 * new path contents and write a new tree out.
+	 *
+	 * Parameters fir the tree:
+	 *
+	 * tree.path
+	 *     String of the file referenced in the tree
+	 * tree.mode
+	 *     String of the file mode - one of 100644 for file (blob), 100755 for executable (blob),
+	 *     040000 for subdirectory (tree), 160000 for submodule (commit) or 120000 for a blob
+	 *     that specifies the path of a symlink
+	 * tree.type
+	 *     String of blob, tree, commit
+	 * tree.sha
+	 *     String of SHA1 checksum ID of the object in the tree
+	 * tree.content
+	 *     String of content you want this file to have - GitHub will write this blob out and use
+	 *     that SHA for this entry. Use either this or tree.sha
+	 *
+	 * @param   string  $owner      The name of the owner of the GitHub repository.
+	 * @param   string  $repo       The name of the GitHub repository.
+	 * @param   array   $tree       Array of Hash objects (of path, mode, type and sha) specifying
+	 *                              a tree structure
+	 * @param   string  $base_tree  The SHA1 of the tree you want to update with new data.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function create($owner, $repo, $tree, $base_tree = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/git/trees';
+
+		$data = array();
+
+		$data['tree'] = $tree;
+
+		if ($base_tree)
+		{
+			$data['base_tree'] = $base_tree;
+		}
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($data)),
+			201
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/gists.php b/core/libraries/joomla/github/package/gists.php
new file mode 100644
index 00000000..df16960a
--- /dev/null
+++ b/core/libraries/joomla/github/package/gists.php
@@ -0,0 +1,548 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Gists class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/gists
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * @property-read  JGithubPackageGistsComments  $comments  GitHub API object for gist comments.
+ */
+class JGithubPackageGists extends JGithubPackage
+{
+	protected $name = 'Gists';
+
+	protected $packages = array(
+		'comments',
+	);
+
+	/**
+	 * Method to create a gist.
+	 *
+	 * @param   mixed    $files        Either an array of file paths or a single file path as a string.
+	 * @param   boolean  $public       True if the gist should be public.
+	 * @param   string   $description  The optional description of the gist.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($files, $public = false, $description = null)
+	{
+		// Build the request path.
+		$path = '/gists';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'files' => $this->buildFileData((array) $files),
+				'public' => (bool) $public,
+				'description' => $description,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  void
+	 */
+	public function delete($gistId)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+
+	/**
+	 * Method to update a gist.
+	 *
+	 * @param   integer  $gistId       The gist number.
+	 * @param   mixed    $files        Either an array of file paths or a single file path as a string.
+	 * @param   boolean  $public       True if the gist should be public.
+	 * @param   string   $description  The description of the gist.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function edit($gistId, $files = null, $public = null, $description = null)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId;
+
+		// Craete the data object.
+		$data = new stdClass;
+
+		// If a description is set add it to the data object.
+		if (isset($description))
+		{
+			$data->description = $description;
+		}
+
+		// If the public flag is set add it to the data object.
+		if (isset($public))
+		{
+			$data->public = $public;
+		}
+
+		// If a state is set add it to the data object.
+		if (isset($files))
+		{
+			$data->files = $this->buildFileData((array) $files);
+		}
+
+		// Encode the request data.
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to fork a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function fork($gistId)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId . '/fork';
+
+		// Send the request.
+		// TODO: Verify change
+		$response = $this->client->post($this->fetchUrl($path), '');
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a single gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function get($gistId)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list gists.  If a user is authenticated it will return the user's gists, otherwise
+	 * it will return all public gists.
+	 *
+	 * @param   integer  $page   The page number from which to get items.
+	 * @param   integer  $limit  The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getList($page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/gists';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of gists belonging to a given user.
+	 *
+	 * @param   string   $user   The name of the GitHub user from which to list gists.
+	 * @param   integer  $page   The page number from which to get items.
+	 * @param   integer  $limit  The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getListByUser($user, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/gists';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of all public gists.
+	 *
+	 * @param   integer  $page   The page number from which to get items.
+	 * @param   integer  $limit  The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getListPublic($page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/gists/public';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of the authenticated users' starred gists.
+	 *
+	 * @param   integer  $page   The page number from which to get items.
+	 * @param   integer  $limit  The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getListStarred($page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/gists/starred';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to check if a gist has been starred.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  boolean  True if the gist is starred.
+	 */
+	public function isStarred($gistId)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId . '/star';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code == 204)
+		{
+			return true;
+		}
+		elseif ($response->code == 404)
+		{
+			return false;
+		}
+		else
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+
+	/**
+	 * Method to star a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  void
+	 */
+	public function star($gistId)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId . '/star';
+
+		// Send the request.
+		$response = $this->client->put($this->fetchUrl($path), '');
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+
+	/**
+	 * Method to star a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  void
+	 */
+	public function unstar($gistId)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId . '/star';
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+
+	/**
+	 * Method to fetch a data array for transmitting to the GitHub API for a list of files based on
+	 * an input array of file paths or filename and content pairs.
+	 *
+	 * @param   array  $files  The list of file paths or filenames and content.
+	 *
+	 * @throws InvalidArgumentException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	protected function buildFileData(array $files)
+	{
+		$data = array();
+
+		foreach ($files as $key => $file)
+		{
+			// If the key isn't numeric, then we are dealing with a file whose content has been supplied
+			if (!is_numeric($key))
+			{
+				$data[$key] = array('content' => $file);
+			}
+
+			// Otherwise, we have been given a path and we have to load the content
+			// Verify that the each file exists.
+			elseif (!file_exists($file))
+			{
+				throw new InvalidArgumentException('The file ' . $file . ' does not exist.');
+			}
+			else
+			{
+				$data[basename($file)] = array('content' => file_get_contents($file));
+			}
+		}
+
+		return $data;
+	}
+
+	/*
+	 * Deprecated methods
+	 */
+
+	/**
+	 * Method to create a comment on a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 * @param   string   $body    The comment body text.
+	 *
+	 * @deprecated use gists->comments->create()
+	 *
+	 * @return  object
+	 *
+	 * @since      11.3
+	 */
+	public function createComment($gistId, $body)
+	{
+		return $this->comments->create($gistId, $body);
+	}
+
+	/**
+	 * Method to delete a comment on a gist.
+	 *
+	 * @param   integer  $commentId  The id of the comment to delete.
+	 *
+	 * @deprecated use gists->comments->delete()
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function deleteComment($commentId)
+	{
+		$this->comments->delete($commentId);
+	}
+
+	/**
+	 * Method to update a comment on a gist.
+	 *
+	 * @param   integer  $commentId  The id of the comment to update.
+	 * @param   string   $body       The new body text for the comment.
+	 *
+	 * @deprecated use gists->comments->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function editComment($commentId, $body)
+	{
+		return $this->comments->edit($commentId, $body);
+	}
+
+	/**
+	 * Method to get a specific comment on a gist.
+	 *
+	 * @param   integer  $commentId  The comment id to get.
+	 *
+	 * @deprecated use gists->comments->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function getComment($commentId)
+	{
+		return $this->comments->get($commentId);
+	}
+
+	/**
+	 * Method to get the list of comments on a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 * @param   integer  $page    The page number from which to get items.
+	 * @param   integer  $limit   The number of items on a page.
+	 *
+	 * @deprecated use gists->comments->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   11.3
+	 */
+	public function getComments($gistId, $page = 0, $limit = 0)
+	{
+		return $this->comments->getList($gistId, $page, $limit);
+	}
+}
diff --git a/core/libraries/joomla/github/package/gists/comments.php b/core/libraries/joomla/github/package/gists/comments.php
new file mode 100644
index 00000000..9fb45605
--- /dev/null
+++ b/core/libraries/joomla/github/package/gists/comments.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Gists Comments class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/gists/comments/
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageGistsComments extends JGithubPackage
+{
+	/**
+	 * Method to create a comment on a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 * @param   string   $body    The comment body text.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($gistId, $body)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId . '/comments';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete a comment on a gist.
+	 *
+	 * @param   integer  $commentId  The id of the comment to delete.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  void
+	 */
+	public function delete($commentId)
+	{
+		// Build the request path.
+		$path = '/gists/comments/' . (int) $commentId;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+
+	/**
+	 * Method to update a comment on a gist.
+	 *
+	 * @param   integer  $commentId  The id of the comment to update.
+	 * @param   string   $body       The new body text for the comment.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function edit($commentId, $body)
+	{
+		// Build the request path.
+		$path = '/gists/comments/' . (int) $commentId;
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a specific comment on a gist.
+	 *
+	 * @param   integer  $commentId  The comment id to get.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function get($commentId)
+	{
+		// Build the request path.
+		$path = '/gists/comments/' . (int) $commentId;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the list of comments on a gist.
+	 *
+	 * @param   integer  $gistId  The gist number.
+	 * @param   integer  $page    The page number from which to get items.
+	 * @param   integer  $limit   The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getList($gistId, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/gists/' . (int) $gistId . '/comments';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/package/gitignore.php b/core/libraries/joomla/github/package/gitignore.php
new file mode 100644
index 00000000..bc6f0564
--- /dev/null
+++ b/core/libraries/joomla/github/package/gitignore.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Gitignore class for the Joomla Platform.
+ *
+ * The .gitignore Templates API lists and fetches templates from the GitHub .gitignore repository.
+ *
+ * @documentation https://developer.github.com/v3/gitignore/
+ * @documentation https://github.com/github/gitignore
+ *
+ * @since       12.4
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageGitignore extends JGithubPackage
+{
+	/**
+	 * Listing available templates
+	 *
+	 * List all templates available to pass as an option when creating a repository.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList()
+	{
+		// Build the request path.
+		$path = '/gitignore/templates';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a single template
+	 *
+	 * @param   string   $name  The name of the template
+	 * @param   boolean  $raw   Raw output
+	 *
+	 * @throws DomainException
+	 * @since  3.3 (CMS)
+	 *
+	 * @return mixed|string
+	 */
+	public function get($name, $raw = false)
+	{
+		// Build the request path.
+		$path = '/gitignore/templates/' . $name;
+
+		$headers = array();
+
+		if ($raw)
+		{
+			$headers['Accept'] = 'application/vnd.github.raw+json';
+		}
+
+		$response = $this->client->get($this->fetchUrl($path), $headers);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error   = json_decode($response->body);
+			$message = (isset($error->message)) ? $error->message : 'Invalid response';
+
+			throw new DomainException($message, $response->code);
+		}
+
+		return ($raw) ? $response->body : json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/package/issues.php b/core/libraries/joomla/github/package/issues.php
new file mode 100644
index 00000000..e79a8bf0
--- /dev/null
+++ b/core/libraries/joomla/github/package/issues.php
@@ -0,0 +1,511 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Issues class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/issues
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * @property-read  JGithubPackageIssuesAssignees   $assignees   GitHub API object for assignees.
+ * @property-read  JGithubPackageIssuesComments    $comments    GitHub API object for comments.
+ * @property-read  JGithubPackageIssuesEvents      $events      GitHub API object for events.
+ * @property-read  JGithubPackageIssuesLabels      $labels      GitHub API object for labels.
+ * @property-read  JGithubPackageIssuesMilestones  $milestones  GitHub API object for milestones.
+ */
+class JGithubPackageIssues extends JGithubPackage
+{
+	protected $name = 'Issues';
+
+	protected $packages = array('assignees', 'comments', 'events', 'labels', 'milestones');
+
+	/**
+	 * Method to create an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   string   $title      The title of the new issue.
+	 * @param   string   $body       The body text for the new issue.
+	 * @param   string   $assignee   The login for the GitHub user that this issue should be assigned to.
+	 * @param   integer  $milestone  The milestone to associate this issue with.
+	 * @param   array    $labels     The labels to associate with this issue.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($user, $repo, $title, $body = null, $assignee = null, $milestone = null, array $labels = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues';
+
+		// Ensure that we have a non-associative array.
+		if (isset($labels))
+		{
+			$labels = array_values($labels);
+		}
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'title'     => $title,
+				'assignee'  => $assignee,
+				'milestone' => $milestone,
+				'labels'    => $labels,
+				'body'      => $body,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $issueId    The issue number.
+	 * @param   string   $state      The optional new state for the issue. [open, closed]
+	 * @param   string   $title      The title of the new issue.
+	 * @param   string   $body       The body text for the new issue.
+	 * @param   string   $assignee   The login for the GitHub user that this issue should be assigned to.
+	 * @param   integer  $milestone  The milestone to associate this issue with.
+	 * @param   array    $labels     The labels to associate with this issue.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function edit($user, $repo, $issueId, $state = null, $title = null, $body = null, $assignee = null, $milestone = null, array $labels = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues/' . (int) $issueId;
+
+		// Craete the data object.
+		$data = new stdClass;
+
+		// If a title is set add it to the data object.
+		if (isset($title))
+		{
+			$data->title = $title;
+		}
+
+		// If a body is set add it to the data object.
+		if (isset($body))
+		{
+			$data->body = $body;
+		}
+
+		// If a state is set add it to the data object.
+		if (isset($state))
+		{
+			$data->state = $state;
+		}
+
+		// If an assignee is set add it to the data object.
+		if (isset($assignee))
+		{
+			$data->assignee = $assignee;
+		}
+
+		// If a milestone is set add it to the data object.
+		if (isset($milestone))
+		{
+			$data->milestone = $milestone;
+		}
+
+		// If labels are set add them to the data object.
+		if (isset($labels))
+		{
+			// Ensure that we have a non-associative array.
+			if (isset($labels))
+			{
+				$labels = array_values($labels);
+			}
+
+			$data->labels = $labels;
+		}
+
+		// Encode the request data.
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a single issue.
+	 *
+	 * @param   string   $user     The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function get($user, $repo, $issueId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues/' . (int) $issueId;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list an authenticated user's issues.
+	 *
+	 * @param   string   $filter     The filter type: assigned, created, mentioned, subscribed.
+	 * @param   string   $state      The optional state to filter requests by. [open, closed]
+	 * @param   string   $labels     The list of comma separated Label names. Example: bug,ui,@high.
+	 * @param   string   $sort       The sort order: created, updated, comments, default: created.
+	 * @param   string   $direction  The list direction: asc or desc, default: desc.
+	 * @param   JDate    $since      The date/time since when issues should be returned.
+	 * @param   integer  $page       The page number from which to get items.
+	 * @param   integer  $limit      The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getList($filter = null, $state = null, $labels = null, $sort = null,
+		$direction = null, JDate $since = null, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/issues';
+
+		// TODO Implement the filtering options.
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list issues.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   string   $milestone  The milestone number, 'none', or *.
+	 * @param   string   $state      The optional state to filter requests by. [open, closed]
+	 * @param   string   $assignee   The assignee name, 'none', or *.
+	 * @param   string   $mentioned  The GitHub user name.
+	 * @param   string   $labels     The list of comma separated Label names. Example: bug,ui,@high.
+	 * @param   string   $sort       The sort order: created, updated, comments, default: created.
+	 * @param   string   $direction  The list direction: asc or desc, default: desc.
+	 * @param   JDate    $since      The date/time since when issues should be returned.
+	 * @param   integer  $page       The page number from which to get items.
+	 * @param   integer  $limit      The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getListByRepository($user, $repo, $milestone = null, $state = null, $assignee = null, $mentioned = null, $labels = null,
+		$sort = null, $direction = null, JDate $since = null, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues';
+
+		$uri = new JUri($this->fetchUrl($path, $page, $limit));
+
+		if ($milestone)
+		{
+			$uri->setVar('milestone', $milestone);
+		}
+
+		if ($state)
+		{
+			$uri->setVar('state', $state);
+		}
+
+		if ($assignee)
+		{
+			$uri->setVar('assignee', $assignee);
+		}
+
+		if ($mentioned)
+		{
+			$uri->setVar('mentioned', $mentioned);
+		}
+
+		if ($labels)
+		{
+			$uri->setVar('labels', $labels);
+		}
+
+		if ($sort)
+		{
+			$uri->setVar('sort', $sort);
+		}
+
+		if ($direction)
+		{
+			$uri->setVar('direction', $direction);
+		}
+
+		if ($since)
+		{
+			$uri->setVar('since', $since->toISO8601());
+		}
+
+		// Send the request.
+		$response = $this->client->get((string) $uri);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/*
+	 * Deprecated methods
+	 */
+
+	/**
+	 * Method to create a comment on an issue.
+	 *
+	 * @param   string   $user     The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number.
+	 * @param   string   $body     The comment body text.
+	 *
+	 * @deprecated use issues->comments->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function createComment($user, $repo, $issueId, $body)
+	{
+		return $this->comments->create($user, $repo, $issueId, $body);
+	}
+
+	/**
+	 * Method to create a label on a repo.
+	 *
+	 * @param   string  $user   The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $name   The label name.
+	 * @param   string  $color  The label color.
+	 *
+	 * @deprecated use issues->labels->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function createLabel($user, $repo, $name, $color)
+	{
+		return $this->labels->create($user, $repo, $name, $color);
+	}
+
+	/**
+	 * Method to delete a comment on an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to delete.
+	 *
+	 * @deprecated use issues->comments->delete()
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function deleteComment($user, $repo, $commentId)
+	{
+		$this->comments->delete($user, $repo, $commentId);
+	}
+
+	/**
+	 * Method to delete a label on a repo.
+	 *
+	 * @param   string  $user   The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $label  The label name.
+	 *
+	 * @deprecated use issues->labels->delete()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function deleteLabel($user, $repo, $label)
+	{
+		return $this->labels->delete($user, $repo, $label);
+	}
+
+	/**
+	 * Method to update a comment on an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to update.
+	 * @param   string   $body       The new body text for the comment.
+	 *
+	 * @deprecated use issues->comments->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function editComment($user, $repo, $commentId, $body)
+	{
+		return $this->comments->edit($user, $repo, $commentId, $body);
+	}
+
+	/**
+	 * Method to update a label on a repo.
+	 *
+	 * @param   string  $user   The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $label  The label name.
+	 * @param   string  $name   The label name.
+	 * @param   string  $color  The label color.
+	 *
+	 * @deprecated use issues->labels->update()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function editLabel($user, $repo, $label, $name, $color)
+	{
+		return $this->labels->update($user, $repo, $label, $name, $color);
+	}
+
+	/**
+	 * Method to get a specific comment on an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The comment id to get.
+	 *
+	 * @deprecated use issues->comments->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function getComment($user, $repo, $commentId)
+	{
+		return $this->comments->get($user, $repo, $commentId);
+	}
+
+	/**
+	 * Method to get the list of comments on an issue.
+	 *
+	 * @param   string   $user     The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number.
+	 * @param   integer  $page     The page number from which to get items.
+	 * @param   integer  $limit    The number of items on a page.
+	 *
+	 * @deprecated use issues->comments->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   11.3
+	 */
+	public function getComments($user, $repo, $issueId, $page = 0, $limit = 0)
+	{
+		return $this->comments->getList($user, $repo, $issueId, $page, $limit);
+	}
+
+	/**
+	 * Method to get a specific label on a repo.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $name  The label name to get.
+	 *
+	 * @deprecated use issues->labels->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getLabel($user, $repo, $name)
+	{
+		return $this->labels->get($user, $repo, $name);
+	}
+
+	/**
+	 * Method to get the list of labels on a repo.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 *
+	 * @deprecated use issues->labels->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function getLabels($user, $repo)
+	{
+		return $this->labels->getList($user, $repo);
+	}
+}
diff --git a/core/libraries/joomla/github/package/issues/assignees.php b/core/libraries/joomla/github/package/issues/assignees.php
new file mode 100644
index 00000000..7a721dbe
--- /dev/null
+++ b/core/libraries/joomla/github/package/issues/assignees.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Assignees class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/issues/assignees/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageIssuesAssignees extends JGithubPackage
+{
+	/**
+	 * List assignees.
+	 *
+	 * This call lists all the available assignees (owner + collaborators) to which issues may be assigned.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 *
+	 * @return object
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/assignees';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Check assignee.
+	 *
+	 * You may check to see if a particular user is an assignee for a repository.
+	 * If the given assignee login belongs to an assignee for the repository, a 204 header
+	 * with no content is returned.
+	 * Otherwise a 404 status code is returned.
+	 *
+	 * @param   string  $owner     The name of the owner of the GitHub repository.
+	 * @param   string  $repo      The name of the GitHub repository.
+	 * @param   string  $assignee  The assinees login name.
+	 *
+	 * @throws DomainException|Exception
+	 * @return boolean
+	 */
+	public function check($owner, $repo, $assignee)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/assignees/' . $assignee;
+
+		try
+		{
+			$response = $this->client->get($this->fetchUrl($path));
+
+			if (204 == $response->code)
+			{
+				return true;
+			}
+
+			throw new DomainException('Invalid response: ' . $response->code);
+		}
+		catch (DomainException $e)
+		{
+			if (isset($response->code) && 404 == $response->code)
+			{
+				return false;
+			}
+
+			throw $e;
+		}
+	}
+}
diff --git a/core/libraries/joomla/github/package/issues/comments.php b/core/libraries/joomla/github/package/issues/comments.php
new file mode 100644
index 00000000..0ed431ec
--- /dev/null
+++ b/core/libraries/joomla/github/package/issues/comments.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Comments class for the Joomla Platform.
+ *
+ * The Issue Comments API supports listing, viewing, editing, and creating comments
+ * on issues and pull requests.
+ *
+ * @documentation https://developer.github.com/v3/issues/comments/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageIssuesComments extends JGithubPackage
+{
+	/**
+	 * Method to get the list of comments on an issue.
+	 *
+	 * @param   string   $owner    The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number.
+	 * @param   integer  $page     The page number from which to get items.
+	 * @param   integer  $limit    The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getList($owner, $repo, $issueId, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . (int) $issueId . '/comments';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path, $page, $limit))
+		);
+	}
+
+	/**
+	 * Method to get the list of comments in a repository.
+	 *
+	 * @param   string  $owner      The name of the owner of the GitHub repository.
+	 * @param   string  $repo       The name of the GitHub repository.
+	 * @param   string  $sort       The sort field - created or updated.
+	 * @param   string  $direction  The sort order- asc or desc. Ignored without sort parameter.
+	 * @param   JDate   $since      A timestamp in ISO 8601 format.
+	 *
+	 * @throws UnexpectedValueException
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getRepositoryList($owner, $repo, $sort = 'created', $direction = 'asc', JDate $since = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/comments';
+
+		if (false == in_array($sort, array('created', 'updated')))
+		{
+			throw new UnexpectedValueException(
+				sprintf(
+					'%1$s - sort field must be "created" or "updated"', __METHOD__
+				)
+			);
+		}
+
+		if (false == in_array($direction, array('asc', 'desc')))
+		{
+			throw new UnexpectedValueException(
+				sprintf(
+					'%1$s - direction field must be "asc" or "desc"', __METHOD__
+				)
+			);
+		}
+
+		$path .= '?sort=' . $sort;
+		$path .= '&direction=' . $direction;
+
+		if ($since)
+		{
+			$path .= '&since=' . $since->toISO8601();
+		}
+
+		// Send the request.
+		return $this->processResponse($this->client->get($this->fetchUrl($path)));
+	}
+
+	/**
+	 * Method to get a single comment.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The comment id.
+	 *
+	 * @return mixed
+	 */
+	public function get($owner, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/comments/' . (int) $id;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to update a comment on an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to update.
+	 * @param   string   $body       The new body text for the comment.
+	 *
+	 * @since   11.3
+	 * @throws DomainException
+	 *
+	 * @return  object
+	 */
+	public function edit($user, $repo, $commentId, $body)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues/comments/' . (int) $commentId;
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Method to create a comment on an issue.
+	 *
+	 * @param   string   $user     The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number.
+	 * @param   string   $body     The comment body text.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($user, $repo, $issueId, $body)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues/' . (int) $issueId . '/comments';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Method to delete a comment on an issue.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to delete.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  boolean
+	 */
+	public function delete($user, $repo, $commentId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/issues/comments/' . (int) $commentId;
+
+		// Send the request.
+		$this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+
+		return true;
+	}
+}
diff --git a/core/libraries/joomla/github/package/issues/events.php b/core/libraries/joomla/github/package/issues/events.php
new file mode 100644
index 00000000..b8588930
--- /dev/null
+++ b/core/libraries/joomla/github/package/issues/events.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Issues Events class for the Joomla Platform.
+ *
+ * Records various events that occur around an Issue or Pull Request.
+ * This is useful both for display on issue/pull request information pages and also
+ * to determine who should be notified of comments.
+ *
+ * @documentation https://developer.github.com/v3/issues/events/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageIssuesEvents extends JGithubPackage
+{
+	/**
+	 * List events for an issue.
+	 *
+	 * @param   string   $owner         The name of the owner of the GitHub repository.
+	 * @param   string   $repo          The name of the GitHub repository.
+	 * @param   integer  $issue_number  The issue number.
+	 * @param   integer  $page          The page number from which to get items.
+	 * @param   integer  $limit         The number of items on a page.
+	 *
+	 * @return object
+	 */
+	public function getList($owner, $repo, $issue_number, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . (int) $issue_number . '/events';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path, $page, $limit))
+		);
+	}
+
+	/**
+	 * List events for a repository.
+	 *
+	 * @param   string   $owner    The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number.
+	 * @param   integer  $page     The page number from which to get items.
+	 * @param   integer  $limit    The number of items on a page.
+	 *
+	 * @return object
+	 */
+	public function getListRepository($owner, $repo, $issueId, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . (int) $issueId . '/comments';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path, $page, $limit))
+		);
+	}
+
+	/**
+	 * Get a single event.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The event number.
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/events/' . (int) $id;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/issues/labels.php b/core/libraries/joomla/github/package/issues/labels.php
new file mode 100644
index 00000000..4262d7b3
--- /dev/null
+++ b/core/libraries/joomla/github/package/issues/labels.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Milestones class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/issues/labels/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageIssuesLabels extends JGithubPackage
+{
+	/**
+	 * Method to get the list of labels on a repo.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  array
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/labels';
+
+		// Send the request.
+		return $this->processResponse(
+			$response = $this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to get a specific label on a repo.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $name  The label name to get.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function get($user, $repo, $name)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/labels/' . $name;
+
+		// Send the request.
+		return $this->processResponse(
+			$response = $this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to create a label on a repo.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $name   The label name.
+	 * @param   string  $color  The label color.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function create($owner, $repo, $name, $color)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/labels';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'name'  => $name,
+				'color' => $color,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update a label on a repo.
+	 *
+	 * @param   string  $user   The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $label  The label name.
+	 * @param   string  $name   The new label name.
+	 * @param   string  $color  The new label color.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function update($user, $repo, $label, $name, $color)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/labels/' . $label;
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'name'  => $name,
+				'color' => $color,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Method to delete a label on a repo.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $name   The label name.
+	 *
+	 * @throws DomainException
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function delete($owner, $repo, $name)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/labels/' . $name;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * List labels on an issue.
+	 *
+	 * @param   string   $owner   The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $number  The issue number.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function getListByIssue($owner, $repo, $number)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . $number . '/labels';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Add labels to an issue.
+	 *
+	 * @param   string  $owner   The name of the owner of the GitHub repository.
+	 * @param   string  $repo    The name of the GitHub repository.
+	 * @param   string  $number  The issue number.
+	 * @param   array   $labels  An array of labels to add.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function add($owner, $repo, $number, array $labels)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . $number . '/labels';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($labels))
+		);
+	}
+
+	/**
+	 * Remove a label from an issue.
+	 *
+	 * @param   string  $owner   The name of the owner of the GitHub repository.
+	 * @param   string  $repo    The name of the GitHub repository.
+	 * @param   string  $number  The issue number.
+	 * @param   string  $name    The name of the label to remove.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function removeFromIssue($owner, $repo, $number, $name)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . $number . '/labels/' . $name;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Replace all labels for an issue.
+	 *
+	 * Sending an empty array ([]) will remove all Labels from the Issue.
+	 *
+	 * @param   string  $owner   The name of the owner of the GitHub repository.
+	 * @param   string  $repo    The name of the GitHub repository.
+	 * @param   string  $number  The issue number.
+	 * @param   array   $labels  New labels
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function replace($owner, $repo, $number, array $labels)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . $number . '/labels';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), json_encode($labels))
+		);
+	}
+
+	/**
+	.* Remove all labels from an issue.
+	 *
+	 * @param   string  $owner   The name of the owner of the GitHub repository.
+	 * @param   string  $repo    The name of the GitHub repository.
+	 * @param   string  $number  The issue number.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function removeAllFromIssue($owner, $repo, $number)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/issues/' . $number . '/labels';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Get labels for every issue in a milestone.
+	 *
+	 * @param   string  $owner   The name of the owner of the GitHub repository.
+	 * @param   string  $repo    The name of the GitHub repository.
+	 * @param   string  $number  The issue number.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function getListByMilestone($owner, $repo, $number)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/milestones/' . $number . '/labels';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/issues/milestones.php b/core/libraries/joomla/github/package/issues/milestones.php
new file mode 100644
index 00000000..05748f62
--- /dev/null
+++ b/core/libraries/joomla/github/package/issues/milestones.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Milestones class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/issues/milestones/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageIssuesMilestones extends JGithubPackage
+{
+	/**
+	 * Method to get the list of milestones for a repo.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   string   $state      The milestone state to retrieved.  Open (default) or closed.
+	 * @param   string   $sort       Sort can be due_date (default) or completeness.
+	 * @param   string   $direction  Direction is asc or desc (default).
+	 * @param   integer  $page       The page number from which to get items.
+	 * @param   integer  $limit      The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   12.3
+	 *
+	 * @return  array
+	 */
+	public function getList($user, $repo, $state = 'open', $sort = 'due_date', $direction = 'desc', $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones?';
+
+		$path .= 'state=' . $state;
+		$path .= '&sort=' . $sort;
+		$path .= '&direction=' . $direction;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a specific milestone.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $milestoneId  The milestone id to get.
+	 *
+	 * @throws DomainException
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function get($user, $repo, $milestoneId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones/' . (int) $milestoneId;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to create a milestone for a repository.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $title        The title of the milestone.
+	 * @param   string   $state        Can be open (default) or closed.
+	 * @param   string   $description  Optional description for milestone.
+	 * @param   string   $due_on       Optional ISO 8601 time.
+	 *
+	 * @throws DomainException
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function create($user, $repo, $title, $state = null, $description = null, $due_on = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+		);
+
+		if (!is_null($state))
+		{
+			$data['state'] = $state;
+		}
+
+		if (!is_null($description))
+		{
+			$data['description'] = $description;
+		}
+
+		if (!is_null($due_on))
+		{
+			$data['due_on'] = $due_on;
+		}
+
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update a milestone.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $milestoneId  The id of the comment to update.
+	 * @param   integer  $title        Optional title of the milestone.
+	 * @param   string   $state        Can be open (default) or closed.
+	 * @param   string   $description  Optional description for milestone.
+	 * @param   string   $due_on       Optional ISO 8601 time.
+	 *
+	 * @throws DomainException
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function edit($user, $repo, $milestoneId, $title = null, $state = null, $description = null, $due_on = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones/' . (int) $milestoneId;
+
+		// Build the request data.
+		$data = array();
+
+		if (!is_null($title))
+		{
+			$data['title'] = $title;
+		}
+
+		if (!is_null($state))
+		{
+			$data['state'] = $state;
+		}
+
+		if (!is_null($description))
+		{
+			$data['description'] = $description;
+		}
+
+		if (!is_null($due_on))
+		{
+			$data['due_on'] = $due_on;
+		}
+
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete a milestone.
+	 *
+	 * @param   string   $user         The name of the owner of the GitHub repository.
+	 * @param   string   $repo         The name of the GitHub repository.
+	 * @param   integer  $milestoneId  The id of the milestone to delete.
+	 *
+	 * @throws DomainException
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function delete($user, $repo, $milestoneId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/milestones/' . (int) $milestoneId;
+
+		// Send the request.
+		$response = $this->client->delete($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 204)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+}
diff --git a/core/libraries/joomla/github/package/markdown.php b/core/libraries/joomla/github/package/markdown.php
new file mode 100644
index 00000000..520d1856
--- /dev/null
+++ b/core/libraries/joomla/github/package/markdown.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2012 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Markdown class.
+ *
+ * @documentation https://developer.github.com/v3/markdown
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageMarkdown extends JGithubPackage
+{
+	/**
+	 * Method to render a markdown document.
+	 *
+	 * @param   string  $text     The text object being parsed.
+	 * @param   string  $mode     The parsing mode; valid options are 'markdown' or 'gfm'.
+	 * @param   string  $context  An optional repository context, only used in 'gfm' mode.
+	 *
+	 * @since   3.3 (CMS)
+	 * @throws  DomainException
+	 * @throws  InvalidArgumentException
+	 *
+	 * @return  string  Formatted HTML
+	 */
+	public function render($text, $mode = 'gfm', $context = null)
+	{
+		// The valid modes
+		$validModes = array('gfm', 'markdown');
+
+		// Make sure the scope is valid
+		if (!in_array($mode, $validModes))
+		{
+			throw new InvalidArgumentException(sprintf('The %s mode is not valid. Valid modes are "gfm" or "markdown".', $mode));
+		}
+
+		// Build the request path.
+		$path = '/markdown';
+
+		// Build the request data.
+		$data = str_replace('\\/', '/', json_encode(
+				array(
+					'text'    => $text,
+					'mode'    => $mode,
+					'context' => $context,
+				)
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			$message = (isset($error->message)) ? $error->message : 'Error: ' . $response->code;
+			throw new DomainException($message, $response->code);
+		}
+
+		return $response->body;
+	}
+}
diff --git a/core/libraries/joomla/github/package/orgs.php b/core/libraries/joomla/github/package/orgs.php
new file mode 100644
index 00000000..fe373b40
--- /dev/null
+++ b/core/libraries/joomla/github/package/orgs.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity class for the Joomla Platform.
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * @documentation  https://developer.github.com/v3/orgs/
+ *
+ * @property-read  JGithubPackageOrgsMembers  $members  GitHub API object for members.
+ * @property-read  JGithubPackageOrgsTeams    $teams    GitHub API object for teams.
+ */
+class JGithubPackageOrgs extends JGithubPackage
+{
+	protected $name = 'Orgs';
+
+	protected $packages = array('members', 'teams');
+
+	/**
+	 * List User Organizations.
+	 *
+	 * If a user name is given, public and private organizations for the authenticated user will be listed.
+	 *
+	 * @param   string  $user  The user name.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function getList($user = '')
+	{
+		// Build the request path.
+		$path = ($user)
+			? '/users/' . $user . '/orgs'
+			: '/user/orgs';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get an Organization.
+	 *
+	 * @param   string  $org  The organization name.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function get($org)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Edit an Organization.
+	 *
+	 * @param   string  $org           The organization name.
+	 * @param   string  $billingEmail  Billing email address. This address is not publicized.
+	 * @param   string  $company       The company name.
+	 * @param   string  $email         The email address.
+	 * @param   string  $location      The location name.
+	 * @param   string  $name          The name.
+	 *
+	 * @since   3.3 (CMS)
+	 *
+	 * @return  object
+	 */
+	public function edit($org, $billingEmail = '', $company = '', $email = '', $location = '', $name = '')
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org;
+
+		$args = array('billing_email', 'company', 'email', 'location', 'name');
+
+		$data = array();
+
+		$fArgs = func_get_args();
+
+		foreach ($args as $i => $arg)
+		{
+			if (array_key_exists($i + 1, $fArgs) && $fArgs[$i + 1])
+			{
+				$data[$arg] = $fArgs[$i + 1];
+			}
+		}
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/orgs/members.php b/core/libraries/joomla/github/package/orgs/members.php
new file mode 100644
index 00000000..b5d096e6
--- /dev/null
+++ b/core/libraries/joomla/github/package/orgs/members.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Orgs Members class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/orgs/members/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageOrgsMembers extends JGithubPackage
+{
+	/**
+	 * Members list.
+	 *
+	 * List all users who are members of an organization.
+	 * A member is a user that belongs to at least 1 team in the organization.
+	 * If the authenticated user is also a member of this organization then
+	 * both concealed and public members will be returned.
+	 * If the requester is not a member of the organization the query will be
+	 * redirected to the public members list.
+	 *
+	 * @param   string  $org  The name of the organization.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since    3.3 (CMS)
+	 *
+	 * @return boolean|mixed
+	 */
+	public function getList($org)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/members';
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case 302 :
+				// Requester is not an organization member.
+				return false;
+				break;
+
+			case 200 :
+				return json_decode($response->body);
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Check membership.
+	 *
+	 * Check if a user is, publicly or privately, a member of the organization.
+	 *
+	 * @param   string  $org   The name of the organization.
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since    3.3 (CMS)
+	 *
+	 * @return boolean
+	 */
+	public function check($org, $user)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/members/' . $user;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case 204 :
+				// Requester is an organization member and user is a member.
+				return true;
+				break;
+
+			case 404 :
+				// Requester is an organization member and user is not a member.
+				// Requester is not an organization member and is inquiring about themselves.
+				return false;
+				break;
+
+			case 302 :
+				// Requester is not an organization member.
+				return false;
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Add a member.
+	 *
+	 * To add someone as a member to an org, you must add them to a team.
+	 */
+
+	/**
+	 * Remove a member.
+	 *
+	 * Removing a user from this list will remove them from all teams and they will no longer have
+	 * any access to the organization’s repositories.
+	 *
+	 * @param   string  $org   The name of the organization.
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function remove($org, $user)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/members/' . $user;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Public members list.
+	 *
+	 * Members of an organization can choose to have their membership publicized or not.
+	 *
+	 * @param   string  $org  The name of the organization.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getListPublic($org)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/public_members';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Check public membership.
+	 *
+	 * @param   string  $org   The name of the organization.
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function checkPublic($org, $user)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/public_members/' . $user;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case 204 :
+				// Response if user is a public member.
+				return true;
+				break;
+
+			case 404 :
+				// Response if user is not a public member.
+				return false;
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Publicize a user’s membership.
+	 *
+	 * @param   string  $org   The name of the organization.
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function publicize($org, $user)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/public_members/' . $user;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Conceal a user’s membership.
+	 *
+	 * @param   string  $org   The name of the organization.
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function conceal($org, $user)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/public_members/' . $user;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/orgs/teams.php b/core/libraries/joomla/github/package/orgs/teams.php
new file mode 100644
index 00000000..f62e67a8
--- /dev/null
+++ b/core/libraries/joomla/github/package/orgs/teams.php
@@ -0,0 +1,392 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Orgs Teams class for the Joomla Platform.
+ *
+ * All actions against teams require at a minimum an authenticated user who is a member
+ * of the owner’s team in the :org being managed. Additionally, OAuth users require “user” scope.
+ *
+ * @documentation https://developer.github.com/v3/orgs/teams/
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageOrgsTeams extends JGithubPackage
+{
+	/**
+	 * List teams.
+	 *
+	 * @param   string  $org  The name of the organization.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList($org)
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/teams';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get team.
+	 *
+	 * @param   integer  $id  The team id.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function get($id)
+	{
+		// Build the request path.
+		$path = '/teams/' . (int) $id;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create team.
+	 *
+	 * In order to create a team, the authenticated user must be an owner of the organization.
+	 *
+	 * @param   string  $org         The name of the organization.
+	 * @param   string  $name        The name of the team.
+	 * @param   array   $repoNames   Repository names.
+	 * @param   string  $permission  The permission.
+	 *                               pull - team members can pull, but not push to or administer these repositories. Default
+	 *                               push - team members can pull and push, but not administer these repositories.
+	 *                               admin - team members can pull, push and administer these repositories.
+	 *
+	 * @throws UnexpectedValueException
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function create($org, $name, array $repoNames = array(), $permission = '')
+	{
+		// Build the request path.
+		$path = '/orgs/' . $org . '/teams';
+
+		$data = array(
+			'name' => $name,
+		);
+
+		if ($repoNames)
+		{
+			$data['repo_names'] = $repoNames;
+		}
+
+		if ($permission)
+		{
+			if (false == in_array($permission, array('pull', 'push', 'admin')))
+			{
+				throw new UnexpectedValueException('Permissions must be either "pull", "push", or "admin".');
+			}
+
+			$data['permission'] = $permission;
+		}
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Edit team.
+	 *
+	 * In order to edit a team, the authenticated user must be an owner of the org that the team is associated with.
+	 *
+	 * @param   integer  $id          The team id.
+	 * @param   string   $name        The name of the team.
+	 * @param   string   $permission  The permission.
+	 *                                pull - team members can pull, but not push to or administer these repositories. Default
+	 *                                push - team members can pull and push, but not administer these repositories.
+	 *                                admin - team members can pull, push and administer these repositories.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function edit($id, $name, $permission = '')
+	{
+		// Build the request path.
+		$path = '/teams/' . (int) $id;
+
+		$data = array(
+			'name' => $name,
+		);
+
+		if ($permission)
+		{
+			if (false == in_array($permission, array('pull', 'push', 'admin')))
+			{
+				throw new UnexpectedValueException('Permissions must be either "pull", "push", or "admin".');
+			}
+
+			$data['permission'] = $permission;
+		}
+
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Delete team.
+	 *
+	 * In order to delete a team, the authenticated user must be an owner of the org that the team is associated with.
+	 *
+	 * @param   integer  $id  The team id.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function delete($id)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * List team members.
+	 *
+	 * In order to list members in a team, the authenticated user must be a member of the team.
+	 *
+	 * @param   integer  $id  The team id.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getListMembers($id)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/members';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get team member.
+	 *
+	 * In order to get if a user is a member of a team, the authenticated user must be a member of the team.
+	 *
+	 * @param   integer  $id    The team id.
+	 * @param   string   $user  The name of the user.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function isMember($id, $user)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/members/' . $user;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case 204 :
+				// Response if user is a member
+				return true;
+				break;
+
+			case 404 :
+				// Response if user is not a member
+				return false;
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Add team member.
+	 *
+	 * In order to add a user to a team, the authenticated user must have ‘admin’ permissions
+	 * to the team or be an owner of the org that the team is associated with.
+	 *
+	 * @param   integer  $id    The team id.
+	 * @param   string   $user  The name of the user.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function addMember($id, $user)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/members/' . $user;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Remove team member.
+	 *
+	 * In order to remove a user from a team, the authenticated user must have ‘admin’ permissions
+	 * to the team or be an owner of the org that the team is associated with.
+	 * NOTE: This does not delete the user, it just remove them from the team.
+	 *
+	 * @param   integer  $id    The team id.
+	 * @param   string   $user  The name of the user.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function removeMember($id, $user)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/members/' . $user;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * List team repos.
+	 *
+	 * @param   integer  $id  The team id.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getListRepos($id)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/repos';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Check if the repo is managed by this team.
+	 *
+	 * @param   integer  $id    The team id.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function checkRepo($id, $repo)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/repos/' . $repo;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case 204 :
+				// Response if repo is managed by this team.
+				return true;
+				break;
+
+			case 404 :
+				// Response if repo is not managed by this team.
+				return false;
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Add team repo.
+	 *
+	 * In order to add a repo to a team, the authenticated user must be an owner of the
+	 * org that the team is associated with. Also, the repo must be owned by the organization,
+	 * or a direct form of a repo owned by the organization.
+	 *
+	 * If you attempt to add a repo to a team that is not owned by the organization, you get:
+	 * Status: 422 Unprocessable Entity
+	 *
+	 * @param   integer  $id     The team id.
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function addRepo($id, $owner, $repo)
+	{
+		// Build the request path.
+		$path = '/teams/' . $id . '/repos/' . $owner . '/' . $repo;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Remove team repo.
+	 *
+	 * In order to remove a repo from a team, the authenticated user must be an owner
+	 * of the org that the team is associated with. NOTE: This does not delete the
+	 * repo, it just removes it from the team.
+	 *
+	 * @param   integer  $id     The team id.
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function removeRepo($id, $owner, $repo)
+	{
+		// Build the request path.
+		$path = '/teams/' . (int) $id . '/repos/' . $owner . '/' . $repo;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/pulls.php b/core/libraries/joomla/github/package/pulls.php
new file mode 100644
index 00000000..b5e957d0
--- /dev/null
+++ b/core/libraries/joomla/github/package/pulls.php
@@ -0,0 +1,512 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Pull Requests class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/pulls
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * @property-read  JGithubPackagePullsComments  $comments  GitHub API object for comments.
+ */
+class JGithubPackagePulls extends JGithubPackage
+{
+	protected $name = 'Pulls';
+
+	protected $packages = array(
+		'comments',
+	);
+
+	/**
+	 * Method to create a pull request.
+	 *
+	 * @param   string  $user   The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $title  The title of the new pull request.
+	 * @param   string  $base   The branch (or git ref) you want your changes pulled into. This
+	 *                          should be an existing branch on the current repository. You cannot
+	 *                          submit a pull request to one repo that requests a merge to a base
+	 *                          of another repo.
+	 * @param   string  $head   The branch (or git ref) where your changes are implemented.
+	 * @param   string  $body   The body text for the new pull request.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($user, $repo, $title, $base, $head, $body = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'title' => $title,
+				'base' => $base,
+				'head' => $head,
+				'body' => $body,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to create a pull request from an existing issue.
+	 *
+	 * @param   string   $user     The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $issueId  The issue number for which to attach the new pull request.
+	 * @param   string   $base     The branch (or git ref) you want your changes pulled into. This
+	 *                             should be an existing branch on the current repository. You cannot
+	 *                             submit a pull request to one repo that requests a merge to a base
+	 *                             of another repo.
+	 * @param   string   $head     The branch (or git ref) where your changes are implemented.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function createFromIssue($user, $repo, $issueId, $base, $head)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'issue' => (int) $issueId,
+				'base' => $base,
+				'head' => $head,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update a pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 * @param   string   $title   The optional new title for the pull request.
+	 * @param   string   $body    The optional new body text for the pull request.
+	 * @param   string   $state   The optional new state for the pull request. [open, closed]
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function edit($user, $repo, $pullId, $title = null, $body = null, $state = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId;
+
+		// Craete the data object.
+		$data = new stdClass;
+
+		// If a title is set add it to the data object.
+		if (isset($title))
+		{
+			$data->title = $title;
+		}
+
+		// If a body is set add it to the data object.
+		if (isset($body))
+		{
+			$data->body = $body;
+		}
+
+		// If a state is set add it to the data object.
+		if (isset($state))
+		{
+			$data->state = $state;
+		}
+
+		// Encode the request data.
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a single pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function get($user, $repo, $pullId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of commits for a pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 * @param   integer  $page    The page number from which to get items.
+	 * @param   integer  $limit   The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getCommits($user, $repo, $pullId, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/commits';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of files for a pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 * @param   integer  $page    The page number from which to get items.
+	 * @param   integer  $limit   The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getFiles($user, $repo, $pullId, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/files';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list pull requests.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   string   $state  The optional state to filter requests by. [open, closed]
+	 * @param   integer  $page   The page number from which to get items.
+	 * @param   integer  $limit  The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getList($user, $repo, $state = 'open', $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls';
+
+		// If a state exists append it as an option.
+		if ($state != 'open')
+		{
+			$path .= '?state=' . $state;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to check if a pull request has been merged.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.  The pull request number.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  boolean  True if the pull request has been merged.
+	 */
+	public function isMerged($user, $repo, $pullId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/merge';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code == 204)
+		{
+			return true;
+		}
+		elseif ($response->code == 404)
+		{
+			return false;
+		}
+		else
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+	}
+
+	/**
+	 * Method to merge a pull request.
+	 *
+	 * @param   string   $user     The name of the owner of the GitHub repository.
+	 * @param   string   $repo     The name of the GitHub repository.
+	 * @param   integer  $pullId   The pull request number.
+	 * @param   string   $message  The message that will be used for the merge commit.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function merge($user, $repo, $pullId, $message = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/merge';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'commit_message' => $message,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->put($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/*
+	 * Legacy methods
+	 */
+
+	/**
+	 * Method to create a comment on a pull request.
+	 *
+	 * @param   string   $user      The name of the owner of the GitHub repository.
+	 * @param   string   $repo      The name of the GitHub repository.
+	 * @param   integer  $pullId    The pull request number.
+	 * @param   string   $body      The comment body text.
+	 * @param   string   $commitId  The SHA1 hash of the commit to comment on.
+	 * @param   string   $filePath  The Relative path of the file to comment on.
+	 * @param   string   $position  The line index in the diff to comment on.
+	 *
+	 * @deprecated  use pulls->comments->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function createComment($user, $repo, $pullId, $body, $commitId, $filePath, $position)
+	{
+		return $this->comments->create($user, $repo, $pullId, $body, $commitId, $filePath, $position);
+	}
+
+	/**
+	 * Method to create a comment in reply to another comment.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $pullId     The pull request number.
+	 * @param   string   $body       The comment body text.
+	 * @param   integer  $inReplyTo  The id of the comment to reply to.
+	 *
+	 * @deprecated  use pulls->comments->createReply()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function createCommentReply($user, $repo, $pullId, $body, $inReplyTo)
+	{
+		return $this->comments->createReply($user, $repo, $pullId, $body, $inReplyTo);
+	}
+
+	/**
+	 * Method to delete a comment on a pull request.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to delete.
+	 *
+	 * @deprecated  use pulls->comments->delete()
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function deleteComment($user, $repo, $commentId)
+	{
+		$this->comments->delete($user, $repo, $commentId);
+	}
+
+	/**
+	 * Method to update a comment on a pull request.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to update.
+	 * @param   string   $body       The new body text for the comment.
+	 *
+	 * @deprecated  use pulls->comments->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function editComment($user, $repo, $commentId, $body)
+	{
+		return $this->comments->edit($user, $repo, $commentId, $body);
+	}
+
+	/**
+	 * Method to get a specific comment on a pull request.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The comment id to get.
+	 *
+	 * @deprecated  use pulls->comments->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function getComment($user, $repo, $commentId)
+	{
+		return $this->comments->get($user, $repo, $commentId);
+	}
+
+	/**
+	 * Method to get the list of comments on a pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 * @param   integer  $page    The page number from which to get items.
+	 * @param   integer  $limit   The number of items on a page.
+	 *
+	 * @deprecated  use pulls->comments->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   11.3
+	 */
+	public function getComments($user, $repo, $pullId, $page = 0, $limit = 0)
+	{
+		return $this->comments->getList($user, $repo, $pullId, $page, $limit);
+	}
+}
diff --git a/core/libraries/joomla/github/package/pulls/comments.php b/core/libraries/joomla/github/package/pulls/comments.php
new file mode 100644
index 00000000..316377bb
--- /dev/null
+++ b/core/libraries/joomla/github/package/pulls/comments.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Pulls Comments class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/pulls/comments/
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackagePullsComments extends JGithubPackage
+{
+	/**
+	 * Method to create a comment on a pull request.
+	 *
+	 * @param   string   $user      The name of the owner of the GitHub repository.
+	 * @param   string   $repo      The name of the GitHub repository.
+	 * @param   integer  $pullId    The pull request number.
+	 * @param   string   $body      The comment body text.
+	 * @param   string   $commitId  The SHA1 hash of the commit to comment on.
+	 * @param   string   $filePath  The Relative path of the file to comment on.
+	 * @param   string   $position  The line index in the diff to comment on.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function create($user, $repo, $pullId, $body, $commitId, $filePath, $position)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/comments';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+				'commit_id' => $commitId,
+				'path' => $filePath,
+				'position' => $position,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Method to create a comment in reply to another comment.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $pullId     The pull request number.
+	 * @param   string   $body       The comment body text.
+	 * @param   integer  $inReplyTo  The id of the comment to reply to.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function createReply($user, $repo, $pullId, $body, $inReplyTo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/comments';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+				'in_reply_to' => (int) $inReplyTo,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Method to delete a comment on a pull request.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to delete.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  void
+	 */
+	public function delete($user, $repo, $commentId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/comments/' . (int) $commentId;
+
+		// Send the request.
+		$this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Method to update a comment on a pull request.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The id of the comment to update.
+	 * @param   string   $body       The new body text for the comment.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function edit($user, $repo, $commentId, $body)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/comments/' . (int) $commentId;
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'body' => $body,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Method to get a specific comment on a pull request.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   integer  $commentId  The comment id to get.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  object
+	 */
+	public function get($user, $repo, $commentId)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/comments/' . (int) $commentId;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to get the list of comments on a pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 * @param   integer  $page    The page number from which to get items.
+	 * @param   integer  $limit   The number of items on a page.
+	 *
+	 * @throws DomainException
+	 * @since   11.3
+	 *
+	 * @return  array
+	 */
+	public function getList($user, $repo, $pullId, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/pulls/' . (int) $pullId . '/comments';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path, $page, $limit))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories.php b/core/libraries/joomla/github/package/repositories.php
new file mode 100644
index 00000000..5d13ea3e
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories.php
@@ -0,0 +1,430 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Activity class for the Joomla Platform.
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ *
+ * @documentation  https://developer.github.com/v3/repos
+ *
+ * @property-read  JGithubPackageRepositoriesCollaborators  $collaborators  GitHub API object for collaborators.
+ * @property-read  JGithubPackageRepositoriesComments       $comments       GitHub API object for comments.
+ * @property-read  JGithubPackageRepositoriesCommits        $commits        GitHub API object for commits.
+ * @property-read  JGithubPackageRepositoriesContents       $contents       GitHub API object for contents.
+ * @property-read  JGithubPackageRepositoriesDownloads      $downloads      GitHub API object for downloads.
+ * @property-read  JGithubPackageRepositoriesForks          $forks          GitHub API object for forks.
+ * @property-read  JGithubPackageRepositoriesHooks          $hooks          GitHub API object for hooks.
+ * @property-read  JGithubPackageRepositoriesKeys           $keys           GitHub API object for keys.
+ * @property-read  JGithubPackageRepositoriesMerging        $merging        GitHub API object for merging.
+ * @property-read  JGithubPackageRepositoriesStatuses       $statuses       GitHub API object for statuses.
+ */
+class JGithubPackageRepositories extends JGithubPackage
+{
+	protected $name = 'Repositories';
+
+	protected $packages = array('collaborators', 'comments', 'commits', 'contents', 'downloads', 'forks', 'hooks', 'keys', 'merging', 'statuses');
+
+	/**
+	 * List your repositories.
+	 *
+	 * List repositories for the authenticated user.
+	 *
+	 * @param   string  $type       Sort type. all, owner, public, private, member. Default: all.
+	 * @param   string  $sort       Sort field. created, updated, pushed, full_name, default: full_name.
+	 * @param   string  $direction  Sort direction. asc or desc, default: when using full_name: asc, otherwise desc.
+	 *
+	 * @throws RuntimeException
+	 *
+	 * @return object
+	 */
+	public function getListOwn($type = 'all', $sort = 'full_name', $direction = '')
+	{
+		if (false == in_array($type, array('all', 'owner', 'public', 'private', 'member')))
+		{
+			throw new RuntimeException('Invalid type');
+		}
+
+		if (false == in_array($sort, array('created', 'updated', 'pushed', 'full_name')))
+		{
+			throw new RuntimeException('Invalid sort field');
+		}
+
+		// Sort direction default: when using full_name: asc, otherwise desc.
+		$direction = ($direction) ? : (('full_name' == $sort) ? 'asc' : 'desc');
+
+		if (false == in_array($direction, array('asc', 'desc')))
+		{
+			throw new RuntimeException('Invalid sort order');
+		}
+
+		// Build the request path.
+		$path = '/user/repos'
+			. '?type=' . $type
+			. '&sort=' . $sort
+			. '&direction=' . $direction;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List user repositories.
+	 *
+	 * List public repositories for the specified user.
+	 *
+	 * @param   string  $user       The user name.
+	 * @param   string  $type       Sort type. all, owner, member. Default: all.
+	 * @param   string  $sort       Sort field. created, updated, pushed, full_name, default: full_name.
+	 * @param   string  $direction  Sort direction. asc or desc, default: when using full_name: asc, otherwise desc.
+	 *
+	 * @throws RuntimeException
+	 *
+	 * @return object
+	 */
+	public function getListUser($user, $type = 'all', $sort = 'full_name', $direction = '')
+	{
+		if (false == in_array($type, array('all', 'owner', 'member')))
+		{
+			throw new RuntimeException('Invalid type');
+		}
+
+		if (false == in_array($sort, array('created', 'updated', 'pushed', 'full_name')))
+		{
+			throw new RuntimeException('Invalid sort field');
+		}
+
+		// Sort direction default: when using full_name: asc, otherwise desc.
+		$direction = ($direction) ? : (('full_name' == $sort) ? 'asc' : 'desc');
+
+		if (false == in_array($direction, array('asc', 'desc')))
+		{
+			throw new RuntimeException('Invalid sort order');
+		}
+
+		// Build the request path.
+		$path = '/users/' . $user . '/repos'
+			. '?type=' . $type
+			. '&sort=' . $sort
+			. '&direction=' . $direction;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List organization repositories.
+	 *
+	 * List repositories for the specified org.
+	 *
+	 * @param   string  $org   The name of the organization.
+	 * @param   string  $type  Sort type. all, public, private, forks, sources, member. Default: all.
+	 *
+	 * @throws RuntimeException
+	 *
+	 * @return object
+	 */
+	public function getListOrg($org, $type = 'all')
+	{
+		if (false == in_array($type, array('all', 'public', 'private', 'forks', 'sources', 'member')))
+		{
+			throw new RuntimeException('Invalid type');
+		}
+
+		// Build the request path.
+		$path = '/orgs/' . $org . '/repos'
+			. '?type=' . $type;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List all repositories.
+	 *
+	 * This provides a dump of every repository, in the order that they were created.
+	 *
+	 * @param   integer  $id  The integer ID of the last Repository that you’ve seen.
+	 *
+	 * @throws RuntimeException
+	 *
+	 * @return object
+	 */
+	public function getList($id = 0)
+	{
+		// Build the request path.
+		$path = '/repositories';
+		$path .= ($id) ? '?since=' . (int) $id : '';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a new repository for the authenticated user or an organization.
+	 * OAuth users must supply repo scope.
+	 *
+	 * @param   string   $name                The repository name.
+	 * @param   string   $org                 The organization name (if needed).
+	 * @param   string   $description         The repository description.
+	 * @param   string   $homepage            The repository homepage.
+	 * @param   boolean  $private             Set true to create a private repository, false to create a public one.
+	 *                                          Creating private repositories requires a paid GitHub account.
+	 * @param   boolean  $has_issues          Set true to enable issues for this repository, false to disable them.
+	 * @param   boolean  $has_wiki            Set true to enable the wiki for this repository, false to disable it.
+	 * @param   boolean  $has_downloads       Set true to enable downloads for this repository, false to disable them.
+	 * @param   integer  $team_id             The id of the team that will be granted access to this repository.
+	 *                                        This is only valid when creating a repo in an organization.
+	 * @param   boolean  $auto_init           true to create an initial commit with empty README.
+	 * @param   string   $gitignore_template  Desired language or platform .gitignore template to apply.
+	 *                                         Use the name of the template without the extension. For example,
+	 *                                        “Haskell” Ignored if auto_init parameter is not provided.
+	 *
+	 * @return object
+	 */
+	public function create($name, $org = '', $description = '', $homepage = '', $private = false, $has_issues = false,
+		$has_wiki = false, $has_downloads = false, $team_id = 0, $auto_init = false, $gitignore_template = '')
+	{
+		$path = ($org)
+			// Create a repository for an organization
+			? '/orgs/' . $org . '/repos'
+			// Create a repository for a user
+			: '/user/repos';
+
+		$data = array(
+			'name'               => $name,
+			'description'        => $description,
+			'homepage'           => $homepage,
+			'private'            => $private,
+			'has_issues'         => $has_issues,
+			'has_wiki'           => $has_wiki,
+			'has_downloads'      => $has_downloads,
+			'team_id'            => $team_id,
+			'auto_init'          => $auto_init,
+			'gitignore_template' => $gitignore_template,
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($data)),
+			201
+		);
+	}
+
+	/**
+	 * Get a repository.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Edit a repository.
+	 *
+	 * @param   string   $owner           Repository owner.
+	 * @param   string   $repo            Repository name.
+	 * @param   string   $name            The repository name.
+	 * @param   string   $description     The repository description.
+	 * @param   string   $homepage        The repository homepage.
+	 * @param   boolean  $private         Set true to create a private repository, false to create a public one.
+	 *                                    Creating private repositories requires a paid GitHub account.
+	 * @param   boolean  $has_issues      Set true to enable issues for this repository, false to disable them.
+	 * @param   boolean  $has_wiki        Set true to enable the wiki for this repository, false to disable it.
+	 * @param   boolean  $has_downloads   Set true to enable downloads for this repository, false to disable them.
+	 * @param   string   $default_branch  Update the default branch for this repository
+	 *
+	 * @return object
+	 */
+	public function edit($owner, $repo, $name, $description = '', $homepage = '', $private = false, $has_issues = false,
+		$has_wiki = false, $has_downloads = false, $default_branch = '')
+	{
+		$path = '/repos/' . $owner . '/' . $repo;
+
+		$data = array(
+			'name'           => $name,
+			'description'    => $description,
+			'homepage'       => $homepage,
+			'private'        => $private,
+			'has_issues'     => $has_issues,
+			'has_wiki'       => $has_wiki,
+			'has_downloads'  => $has_downloads,
+			'default_branch' => $default_branch,
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), json_encode($data))
+		);
+	}
+
+	/**
+	 * List contributors.
+	 *
+	 * @param   string   $owner  Repository owner.
+	 * @param   string   $repo   Repository name.
+	 * @param   boolean  $anon   Set to 1 or true to include anonymous contributors in results.
+	 *
+	 * @return object
+	 */
+	public function getListContributors($owner, $repo, $anon = false)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/contributors';
+
+		$path .= ($anon) ? '?anon=true' : '';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List languages.
+	 *
+	 * List languages for the specified repository. The value on the right of a language is the number of bytes of code
+	 * written in that language.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @return object
+	 */
+	public function getListLanguages($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/languages';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List Teams
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @return object
+	 */
+	public function getListTeams($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/teams';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List Tags.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @return object
+	 */
+	public function getListTags($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/tags';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List Branches.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @return object
+	 */
+	public function getListBranches($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/branches';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a Branch.
+	 *
+	 * @param   string  $owner   Repository owner.
+	 * @param   string  $repo    Repository name.
+	 * @param   string  $branch  Branch name.
+	 *
+	 * @return object
+	 */
+	public function getBranch($owner, $repo, $branch)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/branches/' . $branch;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Delete a Repository.
+	 *
+	 * Deleting a repository requires admin access. If OAuth is used, the delete_repo scope is required.
+	 *
+	 * @param   string  $owner  Repository owner.
+	 * @param   string  $repo   Repository name.
+	 *
+	 * @return object
+	 */
+	public function delete($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/collaborators.php b/core/libraries/joomla/github/package/repositories/collaborators.php
new file mode 100644
index 00000000..80f09aa3
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/collaborators.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Repositories Collaborators class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/collaborators
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesCollaborators extends JGithubPackage
+{
+	/**
+	 * List.
+	 *
+	 * When authenticating as an organization owner of an organization-owned repository, all organization
+	 * owners are included in the list of collaborators. Otherwise, only users with access to the repository
+	 * are returned in the collaborators list.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/collaborators';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Test if a user is a collaborator.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $user   The name of the GitHub user.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 3.3 (CMS)
+	 *
+	 * @return boolean
+	 */
+	public function get($owner, $repo, $user)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/collaborators/' . $user;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case '204';
+
+				return true;
+				break;
+			case '404';
+
+				return false;
+				break;
+			default;
+				throw new UnexpectedValueException('Unexpected code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Add collaborator.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $user   The name of the GitHub user.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function add($owner, $repo, $user)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/collaborators/' . $user;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Remove collaborator.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $user   The name of the GitHub user.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function remove($owner, $repo, $user)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/collaborators/' . $user;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/comments.php b/core/libraries/joomla/github/package/repositories/comments.php
new file mode 100644
index 00000000..2665fbf5
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/comments.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Repositories Comments class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/comments
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesComments extends JGithubPackage
+{
+	/**
+	 * Method to get a list of commit comments for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getListRepository($user, $repo, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path, $page, $limit))
+		);
+	}
+
+	/**
+	 * Method to get a list of comments for a single commit for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   string   $sha    The SHA of the commit to retrieve.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function getList($user, $repo, $sha, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits/' . $sha . '/comments';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path, $page, $limit))
+		);
+	}
+
+	/**
+	 * Method to get a single comment on a commit.
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the comment to retrieve
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function get($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments/' . (int) $id;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to edit a comment on a commit.
+	 *
+	 * @param   string  $user     The name of the owner of the GitHub repository.
+	 * @param   string  $repo     The name of the GitHub repository.
+	 * @param   string  $id       The ID of the comment to edit.
+	 * @param   string  $comment  The text of the comment.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function edit($user, $repo, $id, $comment)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments/' . $id;
+
+		$data = json_encode(
+			array(
+				'body' => $comment,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Method to delete a comment on a commit.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $id    The ID of the comment to edit.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function delete($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/comments/' . $id;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Method to create a comment on a commit.
+	 *
+	 * @param   string   $user      The name of the owner of the GitHub repository.
+	 * @param   string   $repo      The name of the GitHub repository.
+	 * @param   string   $sha       The SHA of the commit to comment on.
+	 * @param   string   $comment   The text of the comment.
+	 * @param   integer  $line      The line number of the commit to comment on.
+	 * @param   string   $filepath  A relative path to the file to comment on within the commit.
+	 * @param   integer  $position  Line index in the diff to comment on.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function create($user, $repo, $sha, $comment, $line, $filepath, $position)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits/' . $sha . '/comments';
+
+		$data = json_encode(
+			array(
+				'body' => $comment,
+				'path' => $filepath,
+				'position' => (int) $position,
+				'line' => (int) $line,
+			)
+		);
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/commits.php b/core/libraries/joomla/github/package/repositories/commits.php
new file mode 100644
index 00000000..6bec8a56
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/commits.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Repositories Commits class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/commits
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesCommits extends JGithubPackage
+{
+	/**
+	 * Method to list commits for a repository.
+	 *
+	 * A special note on pagination: Due to the way Git works, commits are paginated based on SHA
+	 * instead of page number.
+	 * Please follow the link headers as outlined in the pagination overview instead of constructing
+	 * page links yourself.
+	 *
+	 * @param   string  $user    The name of the owner of the GitHub repository.
+	 * @param   string  $repo    The name of the GitHub repository.
+	 * @param   string  $sha     Sha or branch to start listing commits from.
+	 * @param   string  $path    Only commits containing this file path will be returned.
+	 * @param   string  $author  GitHub login, name, or email by which to filter by commit author.
+	 * @param   JDate   $since   ISO 8601 Date - Only commits after this date will be returned.
+	 * @param   JDate   $until   ISO 8601 Date - Only commits before this date will be returned.
+	 *
+	 * @throws DomainException
+	 * @since    12.1
+	 *
+	 * @return  array
+	 */
+	public function getList($user, $repo, $sha = '', $path = '', $author = '', JDate $since = null, JDate $until = null)
+	{
+		// Build the request path.
+		$rPath = '/repos/' . $user . '/' . $repo . '/commits?';
+
+		$rPath .= ($sha) ? '&sha=' . $sha : '';
+		$rPath .= ($path) ? '&path=' . $path : '';
+		$rPath .= ($author) ? '&author=' . $author : '';
+		$rPath .= ($since) ? '&since=' . $since->toISO8601() : '';
+		$rPath .= ($until) ? '&until=' . $until->toISO8601() : '';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($rPath));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a single commit for a repository.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $sha   The SHA of the commit to retrieve.
+	 *
+	 * @throws DomainException
+	 * @since   12.1
+	 *
+	 * @return  array
+	 */
+	public function get($user, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/commits/' . $sha;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a diff for two commits.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $base  The base of the diff, either a commit SHA or branch.
+	 * @param   string  $head  The head of the diff, either a commit SHA or branch.
+	 *
+	 * @return  array
+	 *
+	 * @since   12.1
+	 */
+	public function compare($user, $repo, $base, $head)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/compare/' . $base . '...' . $head;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/contents.php b/core/libraries/joomla/github/package/repositories/contents.php
new file mode 100644
index 00000000..71dff2e9
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/contents.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Repositories Contents class for the Joomla Platform.
+ *
+ * These API methods let you retrieve the contents of files within a repository as Base64 encoded content.
+ * See media types for requesting raw or other formats.
+ *
+ * @documentation https://developer.github.com/v3/repos/contents
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesContents extends JGithubPackage
+{
+	/**
+	 * Get the README
+	 *
+	 * This method returns the preferred README for a repository.
+	 *
+	 * GET /repos/:owner/:repo/readme
+	 *
+	 * Parameters
+	 *
+	 * ref
+	 * Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * Response
+	 *
+	 * Status: 200 OK
+	 * X-RateLimit-Limit: 5000
+	 * X-RateLimit-Remaining: 4999
+	 *
+	 * {
+	 * "type": "file",
+	 * "encoding": "base64",
+	 * "_links": {
+	 * "git": "https://api.github.com/repos/octokit/octokit.rb/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
+	 * "self": "https://api.github.com/repos/octokit/octokit.rb/contents/README.md",
+	 * "html": "https://github.com/octokit/octokit.rb/blob/master/README.md"
+	 * },
+	 * "size": 5362,
+	 * "name": "README.md",
+	 * "path": "README.md",
+	 * "content": "encoded content ...",
+	 * "sha": "3d21ec53a331a6f037a91c368710b99387d012c1"
+	 * }
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $ref    The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getReadme($owner, $repo, $ref = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/readme';
+
+		if ($ref)
+		{
+			$path .= '?ref=' . $ref;
+		}
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get contents
+	 *
+	 * This method returns the contents of any file or directory in a repository.
+	 *
+	 * GET /repos/:owner/:repo/contents/:path
+	 *
+	 * Parameters
+	 *
+	 * path
+	 * Optional string - The content path.
+	 * ref
+	 * Optional string - The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * Response
+	 *
+	 * Status: 200 OK
+	 * X-RateLimit-Limit: 5000
+	 * X-RateLimit-Remaining: 4999
+	 *
+	 * {
+	 * "type": "file",
+	 * "encoding": "base64",
+	 * "_links": {
+	 * "git": "https://api.github.com/repos/octokit/octokit.rb/git/blobs/3d21ec53a331a6f037a91c368710b99387d012c1",
+	 * "self": "https://api.github.com/repos/octokit/octokit.rb/contents/README.md",
+	 * "html": "https://github.com/octokit/octokit.rb/blob/master/README.md"
+	 * },
+	 * "size": 5362,
+	 * "name": "README.md",
+	 * "path": "README.md",
+	 * "content": "encoded content ...",
+	 * "sha": "3d21ec53a331a6f037a91c368710b99387d012c1"
+	 * }
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $path   The content path.
+	 * @param   string  $ref    The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $path, $ref = '')
+	{
+		// Build the request path.
+		$rPath = '/repos/' . $owner . '/' . $repo . '/contents/' . $path;
+
+		if ($ref)
+		{
+			$rPath .= '?ref=' . $ref;
+		}
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($rPath))
+		);
+	}
+
+	/**
+	 * Get archive link
+	 *
+	 * This method will return a 302 to a URL to download a tarball or zipball archive for a repository.
+	 * Please make sure your HTTP framework is configured to follow redirects or you will need to use the Location header to make a second GET request.
+	 *
+	 * Note: For private repositories, these links are temporary and expire quickly.
+	 *
+	 * GET /repos/:owner/:repo/:archive_format/:ref
+	 *
+	 * Parameters
+	 *
+	 * archive_format
+	 * Either tarball or zipball
+	 * ref
+	 * Optional string - valid Git reference, defaults to master
+	 *
+	 * Response
+	 *
+	 * Status: 302 Found
+	 * Location: http://github.com/me/myprivate/tarball/master?SSO=thistokenexpires
+	 * X-RateLimit-Limit: 5000
+	 * X-RateLimit-Remaining: 4999
+	 *
+	 * To follow redirects with curl, use the -L switch:
+	 *
+	 * curl -L https://api.github.com/repos/octokit/octokit.rb/tarball > octokit.tar.gz
+	 *
+	 * @param   string  $owner           The name of the owner of the GitHub repository.
+	 * @param   string  $repo            The name of the GitHub repository.
+	 * @param   string  $archive_format  Either tarball or zipball.
+	 * @param   string  $ref             The String name of the Commit/Branch/Tag. Defaults to master.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getArchiveLink($owner, $repo, $archive_format = 'zipball', $ref = '')
+	{
+		if (false == in_array($archive_format, array('tarball', 'zipball')))
+		{
+			throw new UnexpectedValueException('Archive format must be either "tarball" or "zipball".');
+		}
+
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/' . $archive_format;
+
+		if ($ref)
+		{
+			$path .= '?ref=' . $ref;
+		}
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path)),
+			302
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/downloads.php b/core/libraries/joomla/github/package/repositories/downloads.php
new file mode 100644
index 00000000..c355090d
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/downloads.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Repositories Downloads class for the Joomla Platform.
+ *
+ * The downloads API is for package downloads only.
+ * If you want to get source tarballs you should use
+ * https://developer.github.com/v3/repos/contents/#get-archive-link instead.
+ *
+ * @documentation https://developer.github.com/v3/repos/downloads
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesDownloads extends JGithubPackage
+{
+	/**
+	 * List downloads for a repository.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/downloads';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a single download.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The id of the download.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/downloads/' . $id;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a new download (Part 1: Create the resource).
+	 *
+	 * Creating a new download is a two step process. You must first create a new download resource.
+	 *
+	 * @param   string  $owner         The name of the owner of the GitHub repository.
+	 * @param   string  $repo          The name of the GitHub repository.
+	 * @param   string  $name          The name.
+	 * @param   string  $size          Size of file in bytes.
+	 * @param   string  $description   The description.
+	 * @param   string  $content_type  The content type.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function create($owner, $repo, $name, $size, $description = '', $content_type = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/downloads';
+
+		$data = array(
+			'name' => $name,
+			'size' => $size,
+		);
+
+		if ($description)
+		{
+			$data['description'] = $description;
+		}
+
+		if ($content_type)
+		{
+			$data['content_type'] = $content_type;
+		}
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Create a new download (Part 2: Upload file to s3).
+	 *
+	 * Now that you have created the download resource, you can use the information
+	 * in the response to upload your file to s3. This can be done with a POST to
+	 * the s3_url you got in the create response. Here is a brief example using curl:
+	 *
+	 * curl \
+	 *     -F "key=downloads/octocat/Hello-World/new_file.jpg" \
+	 *     -F "acl=public-read" \
+	 *     -F "success_action_status=201" \
+	 *     -F "Filename=new_file.jpg" \
+	 *     -F "AWSAccessKeyId=1ABCDEF..." \
+	 *     -F "Policy=ewogIC..." \
+	 *     -F "Signature=mwnF..." \
+	 *     -F "Content-Type=image/jpeg" \
+	 *     -F "file=@new_file.jpg" \
+	 *           https://github.s3.amazonaws.com/
+	 *
+	 * NOTES
+	 * The order in which you pass these fields matters! Follow the order shown above exactly.
+	 * All parameters shown are required and if you excluded or modify them your upload will
+	 * fail because the values are hashed and signed by the policy.
+	 *
+	 * More information about using the REST API to interact with s3 can be found here:
+	 * http://docs.amazonwebservices.com/AmazonS3/latest/API/
+	 *
+	 * @param   string  $key                    Value of path field in the response.
+	 * @param   string  $acl                    Value of acl field in the response.
+	 * @param   string  $success_action_status  201, or whatever you want to get back.
+	 * @param   string  $filename               Value of name field in the response.
+	 * @param   string  $awsAccessKeyId         Value of accesskeyid field in the response.
+	 * @param   string  $policy                 Value of policy field in the response.
+	 * @param   string  $signature              Value of signature field in the response.
+	 * @param   string  $content_type           Value of mime_type field in the response.
+	 * @param   string  $file                   Local file. Example assumes the file existing in the directory
+	 *                                          where you are running the curl command. Yes, the @ matters.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return boolean
+	 */
+	public function upload($key, $acl, $success_action_status, $filename, $awsAccessKeyId, $policy, $signature, $content_type, $file)
+	{
+		// Build the request path.
+		$url = 'https://github.s3.amazonaws.com/';
+
+		$data = array(
+			'key'                   => $key,
+			'acl'                   => $acl,
+			'success_action_status' => (int) $success_action_status,
+			'Filename'              => $filename,
+			'AWSAccessKeyId'        => $awsAccessKeyId,
+			'Policy'                => $policy,
+			'Signature'             => $signature,
+			'Content-Type'          => $content_type,
+			'file'                  => $file,
+		);
+
+		// Send the request.
+		$response = $this->client->post($url, $data);
+
+		// @todo Process the response..
+
+		return (201 == $response->code) ? true : false;
+	}
+
+	/**
+	 * Delete a download.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The id of the download.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function delete($owner, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/downloads/' . (int) $id;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/forks.php b/core/libraries/joomla/github/package/repositories/forks.php
new file mode 100644
index 00000000..ef0e09a5
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/forks.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Forks class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/forks
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesForks extends JGithubPackage
+{
+	/**
+	 * Method to fork a repository.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $org   The organization to fork the repo into. By default it is forked to the current user.
+	 *
+	 * @return  object
+	 *
+	 * @since   11.4
+	 * @throws  DomainException
+	 */
+	public function create($user, $repo, $org = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/forks';
+
+		if (strlen($org) > 0)
+		{
+			$data = json_encode(
+				array('org' => $org)
+			);
+		}
+		else
+		{
+			$data = json_encode(array());
+		}
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 202)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list forks for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   Page to request
+	 * @param   integer  $limit  Number of results to return per page
+	 *
+	 * @return  array
+	 *
+	 * @since   11.4
+	 * @throws  DomainException
+	 */
+	public function getList($user, $repo, $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/forks';
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/hooks.php b/core/libraries/joomla/github/package/repositories/hooks.php
new file mode 100644
index 00000000..340a69a3
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/hooks.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Hooks class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/hooks
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesHooks extends JGithubPackage
+{
+	/**
+	 * Array containing the allowed hook events
+	 *
+	 * @var    array
+	 * @since  12.3
+	 */
+	protected $events = array(
+		'push',
+		'issues',
+		'issue_comment',
+		'commit_comment',
+		'pull_request',
+		'gollum',
+		'watch',
+		'download',
+		'fork',
+		'fork_apply',
+		'member',
+		'public',
+		'status',
+	);
+
+	/**
+	 * Method to create a hook on a repository.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   string   $name    The name of the service being called.
+	 * @param   array    $config  Array containing the config for the service.
+	 * @param   array    $events  The events the hook will be triggered for.
+	 * @param   boolean  $active  Flag to determine if the hook is active
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 * @throws  RuntimeException
+	 */
+	public function create($user, $repo, $name, $config, array $events = array('push'), $active = true)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks';
+
+		// Check to ensure all events are in the allowed list
+		foreach ($events as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your events array contains an unauthorized event.');
+			}
+		}
+
+		$data = json_encode(
+			array('name' => $name, 'config' => $config, 'events' => $events, 'active' => $active)
+		);
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), $data),
+			201
+		);
+	}
+
+	/**
+	 * Method to delete a hook
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the hook to delete.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function delete($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+
+	/**
+	 * Method to edit a hook.
+	 *
+	 * @param   string   $user          The name of the owner of the GitHub repository.
+	 * @param   string   $repo          The name of the GitHub repository.
+	 * @param   integer  $id            ID of the hook to edit.
+	 * @param   string   $name          The name of the service being called.
+	 * @param   array    $config        Array containing the config for the service.
+	 * @param   array    $events        The events the hook will be triggered for.  This resets the currently set list
+	 * @param   array    $addEvents     Events to add to the hook.
+	 * @param   array    $removeEvents  Events to remove from the hook.
+	 * @param   boolean  $active        Flag to determine if the hook is active
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 * @throws  RuntimeException
+	 */
+	public function edit($user, $repo, $id, $name, $config, array $events = array('push'), array $addEvents = array(),
+		array $removeEvents = array(), $active = true)
+	{
+		// Check to ensure all events are in the allowed list
+		foreach ($events as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your events array contains an unauthorized event.');
+			}
+		}
+
+		foreach ($addEvents as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your active_events array contains an unauthorized event.');
+			}
+		}
+
+		foreach ($removeEvents as $event)
+		{
+			if (!in_array($event, $this->events))
+			{
+				throw new RuntimeException('Your remove_events array contains an unauthorized event.');
+			}
+		}
+
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id;
+
+		$data = json_encode(
+			array(
+				'name'          => $name,
+				'config'        => $config,
+				'events'        => $events,
+				'add_events'    => $addEvents,
+				'remove_events' => $removeEvents,
+				'active'        => $active,
+			)
+		);
+
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), $data)
+		);
+	}
+
+	/**
+	 * Method to get details about a single hook for the repository.
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the hook to retrieve
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function get($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to list hooks for a repository.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function getList($user, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Method to test a hook against the latest repository commit
+	 *
+	 * @param   string   $user  The name of the owner of the GitHub repository.
+	 * @param   string   $repo  The name of the GitHub repository.
+	 * @param   integer  $id    ID of the hook to delete
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 * @throws  DomainException
+	 */
+	public function test($user, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/hooks/' . $id . '/test';
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode('')),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/keys.php b/core/libraries/joomla/github/package/repositories/keys.php
new file mode 100644
index 00000000..6030f0e6
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/keys.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Forks class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/keys
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesKeys extends JGithubPackage
+{
+	/**
+	 * List keys in a repository.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 *
+	 * @since 12.4
+	 *
+	 * @return object
+	 */
+	public function getList($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/keys';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a key.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The id of the key.
+	 *
+	 * @since 12.4
+	 *
+	 * @return object
+	 */
+	public function get($owner, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/keys/' . (int) $id;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a key.
+	 *
+	 * @param   string  $owner  The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $title  The key title.
+	 * @param   string  $key    The key.
+	 *
+	 * @since 12.4
+	 *
+	 * @return object
+	 */
+	public function create($owner, $repo, $title, $key)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/keys';
+
+		$data = array(
+			'title' => $title,
+			'key'   => $key,
+		);
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($data)),
+			201
+		);
+	}
+
+	/**
+	 * Edit a key.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The id of the key.
+	 * @param   string   $title  The key title.
+	 * @param   string   $key    The key.
+	 *
+	 * @since 12.4
+	 *
+	 * @return object
+	 */
+	public function edit($owner, $repo, $id, $title, $key)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/keys/' . (int) $id;
+
+		$data = array(
+			'title' => $title,
+			'key'   => $key,
+		);
+
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), json_encode($data))
+		);
+	}
+
+	/**
+	 * Delete a key.
+	 *
+	 * @param   string   $owner  The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $id     The id of the key.
+	 *
+	 * @since 12.4
+	 *
+	 * @return boolean
+	 */
+	public function delete($owner, $repo, $id)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/keys/' . (int) $id;
+
+		$this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+
+		return true;
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/merging.php b/core/libraries/joomla/github/package/repositories/merging.php
new file mode 100644
index 00000000..f3ca3102
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/merging.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Repositories Merging class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/merging
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesMerging extends JGithubPackage
+{
+	/**
+	 * Perform a merge.
+	 *
+	 * @param   string  $owner           The name of the owner of the GitHub repository.
+	 * @param   string  $repo            The name of the GitHub repository.
+	 * @param   string  $base            The name of the base branch that the head will be merged into.
+	 * @param   string  $head            The head to merge. This can be a branch name or a commit SHA1.
+	 * @param   string  $commit_message  Commit message to use for the merge commit.
+	 *                                   If omitted, a default message will be used.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since   12.4
+	 *
+	 * @return  boolean
+	 */
+	public function perform($owner, $repo, $base, $head, $commit_message = '')
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/merges';
+
+		$data = new stdClass;
+
+		$data->base = $base;
+		$data->head = $head;
+
+		if ($commit_message)
+		{
+			$data->commit_message = $commit_message;
+		}
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), json_encode($data));
+
+		switch ($response->code)
+		{
+			case '201':
+				// Success
+				return json_decode($response->body);
+				break;
+
+			case '204':
+				// No-op response (base already contains the head, nothing to merge)
+				throw new UnexpectedValueException('Nothing to merge');
+				break;
+
+			case '404':
+				// Missing base or Missing head response
+				$error = json_decode($response->body);
+
+				$message = (isset($error->message)) ? $error->message : 'Missing base or head: ' . $response->code;
+
+				throw new UnexpectedValueException($message);
+				break;
+
+			case '409':
+				// Merge conflict response
+				$error = json_decode($response->body);
+
+				$message = (isset($error->message)) ? $error->message : 'Merge conflict ' . $response->code;
+
+				throw new UnexpectedValueException($message);
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/statistics.php b/core/libraries/joomla/github/package/repositories/statistics.php
new file mode 100644
index 00000000..947b9b05
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/statistics.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API class for the Joomla Platform.
+ *
+ * The Repository Statistics API allows you to fetch the data that GitHub uses for
+ * visualizing different types of repository activity.
+ *
+ * @documentation https://developer.github.com/v3/repos/statistics
+ *
+ * @since       3.3 (CMS)
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesStatistics  extends JGithubPackage
+{
+	/**
+	 * Get contributors list with additions, deletions, and commit counts.
+	 *
+	 * Response include:
+	 * total - The Total number of commits authored by the contributor.
+	 *
+	 * Weekly Hash
+	 *
+	 * w - Start of the week
+	 * a - Number of additions
+	 * d - Number of deletions
+	 * c - Number of commits
+	 *
+	 * @param   string  $owner  The owner of the repository.
+	 * @param   string  $repo   The repository name.
+	 *
+	 * @since   1.0
+	 *
+	 * @return  object
+	 */
+	public function getListContributors($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/stats/contributors';
+
+		// Send the request.
+		return $this->processResponse($this->client->get($this->fetchUrl($path)));
+	}
+
+	/**
+	 * Get the last year of commit activity data.
+	 *
+	 * Returns the last year of commit activity grouped by week.
+	 * The days array is a group of commits per day, starting on Sunday.
+	 *
+	 * @param   string  $owner  The owner of the repository.
+	 * @param   string  $repo   The repository name.
+	 *
+	 * @since   1.0
+	 *
+	 * @return  object
+	 */
+	public function getActivityData($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/stats/commit_activity';
+
+		// Send the request.
+		return $this->processResponse($this->client->get($this->fetchUrl($path)));
+	}
+
+	/**
+	 * Get the number of additions and deletions per week.
+	 *
+	 * Response returns a weekly aggregate of the number of additions and deletions pushed to a repository.
+	 *
+	 * @param   string  $owner  The owner of the repository.
+	 * @param   string  $repo   The repository name.
+	 *
+	 * @since   1.0
+	 *
+	 * @return  object
+	 */
+	public function getCodeFrequency($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/stats/code_frequency';
+
+		// Send the request.
+		return $this->processResponse($this->client->get($this->fetchUrl($path)));
+	}
+
+	/**
+	 * Get the weekly commit count for the repo owner and everyone else.
+	 *
+	 * Returns the total commit counts for the "owner" and total commit counts in "all". "all" is everyone combined,
+	 * including the owner in the last 52 weeks.
+	 * If you’d like to get the commit counts for non-owners, you can subtract all from owner.
+	 *
+	 * The array order is oldest week (index 0) to most recent week.
+	 *
+	 * @param   string  $owner  The owner of the repository.
+	 * @param   string  $repo   The repository name.
+	 *
+	 * @since   1.0
+	 *
+	 * @return  object
+	 */
+	public function getParticipation($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/stats/participation';
+
+		// Send the request.
+		return $this->processResponse($this->client->get($this->fetchUrl($path)));
+	}
+
+	/**
+	 * Get the number of commits per hour in each day.
+	 *
+	 * Response
+	 * Each array contains the day number, hour number, and number of commits:
+	 *
+	 * 0-6: Sunday - Saturday
+	 * 0-23: Hour of day
+	 * Number of commits
+	 *
+	 * For example, [2, 14, 25] indicates that there were 25 total commits, during the 2:00pm hour on Tuesdays.
+	 * All times are based on the time zone of individual commits.
+	 *
+	 * @param   string  $owner  The owner of the repository.
+	 * @param   string  $repo   The repository name.
+	 *
+	 * @since   1.0
+	 *
+	 * @return  object
+	 */
+	public function getPunchCard($owner, $repo)
+	{
+		// Build the request path.
+		$path = '/repos/' . $owner . '/' . $repo . '/stats/punch_card';
+
+		// Send the request.
+		return $this->processResponse($this->client->get($this->fetchUrl($path)));
+	}
+
+	/**
+	 * Process the response and decode it.
+	 *
+	 * @param   JHttpResponse  $response      The response.
+	 * @param   integer        $expectedCode  The expected "good" code.
+	 * @param   boolean        $decode        If the should be response be JSON decoded.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  \DomainException
+	 */
+	protected function processResponse(JHttpResponse $response, $expectedCode = 200, $decode = true)
+	{
+		if (202 == $response->code)
+		{
+			throw new \DomainException(
+				'GitHub is building the statistics data. Please try again in a few moments.',
+				$response->code
+			);
+		}
+
+		return parent::processResponse($response, $expectedCode, $decode);
+	}
+}
diff --git a/core/libraries/joomla/github/package/repositories/statuses.php b/core/libraries/joomla/github/package/repositories/statuses.php
new file mode 100644
index 00000000..0ff7288d
--- /dev/null
+++ b/core/libraries/joomla/github/package/repositories/statuses.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/repos/statuses
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageRepositoriesStatuses extends JGithubPackage
+{
+	/**
+	 * Method to create a status.
+	 *
+	 * @param   string  $user         The name of the owner of the GitHub repository.
+	 * @param   string  $repo         The name of the GitHub repository.
+	 * @param   string  $sha          The SHA1 value for which to set the status.
+	 * @param   string  $state        The state (pending, success, error or failure).
+	 * @param   string  $targetUrl    Optional target URL.
+	 * @param   string  $description  Optional description for the status.
+	 *
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 *
+	 * @since   12.3
+	 *
+	 * @return  object
+	 */
+	public function create($user, $repo, $sha, $state, $targetUrl = null, $description = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/statuses/' . $sha;
+
+		if (!in_array($state, array('pending', 'success', 'error', 'failure')))
+		{
+			throw new InvalidArgumentException('State must be one of pending, success, error or failure.');
+		}
+
+		// Build the request data.
+		$data = array(
+			'state' => $state,
+		);
+
+		if (!is_null($targetUrl))
+		{
+			$data['target_url'] = $targetUrl;
+		}
+
+		if (!is_null($description))
+		{
+			$data['description'] = $description;
+		}
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), json_encode($data));
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list statuses for an SHA.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $sha   SHA1 for which to get the statuses.
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function getList($user, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/statuses/' . $sha;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/package/search.php b/core/libraries/joomla/github/package/search.php
new file mode 100644
index 00000000..9640e5aa
--- /dev/null
+++ b/core/libraries/joomla/github/package/search.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API Search class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/search
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageSearch extends JGithubPackage
+{
+	/**
+	 * Search issues.
+	 *
+	 * @param   string  $owner    The name of the owner of the repository.
+	 * @param   string  $repo     The name of the repository.
+	 * @param   string  $state    The state - open or closed.
+	 * @param   string  $keyword  The search term.
+	 *
+	 * @throws UnexpectedValueException
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function issues($owner, $repo, $state, $keyword)
+	{
+		if (false == in_array($state, array('open', 'close')))
+		{
+			throw new UnexpectedValueException('State must be either "open" or "closed"');
+		}
+
+		// Build the request path.
+		$path = '/legacy/issues/search/' . $owner . '/' . $repo . '/' . $state . '/' . $keyword;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Search repositories.
+	 *
+	 * Find repositories by keyword. Note, this legacy method does not follow
+	 * the v3 pagination pattern.
+	 * This method returns up to 100 results per page and pages can be fetched
+	 * using the start_page parameter.
+	 *
+	 * @param   string   $keyword     The search term.
+	 * @param   string   $language    Filter results by language https://github.com/languages
+	 * @param   integer  $start_page  Page number to fetch
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function repositories($keyword, $language = '', $start_page = 0)
+	{
+		// Build the request path.
+		$path = '/legacy/repos/search/' . $keyword . '?';
+
+		$path .= ($language) ? '&language=' . $language : '';
+		$path .= ($start_page) ? '&start_page=' . $start_page : '';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Search users.
+	 *
+	 * Find users by keyword.
+	 *
+	 * @param   string   $keyword     The search term.
+	 * @param   integer  $start_page  Page number to fetch
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function users($keyword, $start_page = 0)
+	{
+		// Build the request path.
+		$path = '/legacy/user/search/' . $keyword . '?';
+
+		$path .= ($start_page) ? '&start_page=' . $start_page : '';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Email search.
+	 *
+	 * This API call is added for compatibility reasons only. There’s no guarantee
+	 * that full email searches will always be available. The @ character in the
+	 * address must be left unencoded. Searches only against public email addresses
+	 * (as configured on the user’s GitHub profile).
+	 *
+	 * @param   string  $email  The email address(es).
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function email($email)
+	{
+		// Build the request path.
+		$path = '/legacy/user/email/' . $email;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/users.php b/core/libraries/joomla/github/package/users.php
new file mode 100644
index 00000000..f6029303
--- /dev/null
+++ b/core/libraries/joomla/github/package/users.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/users
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageUsers extends JGithubPackage
+{
+	protected $name = 'Users';
+
+	protected $packages = array('emails', 'followers', 'keys');
+
+	/**
+	 * Get a single user.
+	 *
+	 * @param   string  $user  The users login name.
+	 *
+	 * @throws DomainException
+	 *
+	 * @return object
+	 */
+	public function get($user)
+	{
+		// Build the request path.
+		$path = '/users/' . $user;
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get the current authenticated user.
+	 *
+	 * @throws DomainException
+	 *
+	 * @return mixed
+	 */
+	public function getAuthenticatedUser()
+	{
+		// Build the request path.
+		$path = '/user';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Update a user.
+	 *
+	 * @param   string  $name      The full name
+	 * @param   string  $email     The email
+	 * @param   string  $blog      The blog
+	 * @param   string  $company   The company
+	 * @param   string  $location  The location
+	 * @param   string  $hireable  If he is unemplayed :P
+	 * @param   string  $bio       The biometrical DNA fingerprint (or smthng...)
+	 *
+	 * @throws DomainException
+	 *
+	 * @return mixed
+	 */
+	public function edit($name = '', $email = '', $blog = '', $company = '', $location = '', $hireable = '', $bio = '')
+	{
+		$data = array(
+			'name'     => $name,
+			'email'    => $email,
+			'blog'     => $blog,
+			'company'  => $company,
+			'location' => $location,
+			'hireable' => $hireable,
+			'bio'      => $bio,
+		);
+
+		// Build the request path.
+		$path = '/user';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), json_encode($data))
+		);
+	}
+
+	/**
+	 * Get all users.
+	 *
+	 * This provides a dump of every user, in the order that they signed up for GitHub.
+	 *
+	 * @param   integer  $since  The integer ID of the last User that you’ve seen.
+	 *
+	 * @throws DomainException
+	 * @return mixed
+	 */
+	public function getList($since = 0)
+	{
+		// Build the request path.
+		$path = '/users';
+
+		$path .= ($since) ? '?since=' . $since : '';
+
+		// Send the request.
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/*
+	 * Legacy methods
+	 */
+
+	/**
+	 * Get a single user.
+	 *
+	 * @param   string  $user  The users login name.
+	 *
+	 * @deprecated use users->get()
+	 *
+	 * @throws DomainException
+	 *
+	 * @return mixed
+	 */
+	public function getUser($user)
+	{
+		return $this->get($user);
+	}
+
+	/**
+	 * Update a user.
+	 *
+	 * @param   string  $name      The full name
+	 * @param   string  $email     The email
+	 * @param   string  $blog      The blog
+	 * @param   string  $company   The company
+	 * @param   string  $location  The location
+	 * @param   string  $hireable  If he is unemplayed :P
+	 * @param   string  $bio       The biometrical DNA fingerprint (or smthng...)
+	 *
+	 * @deprecated use users->edit()
+	 *
+	 * @throws DomainException
+	 *
+	 * @return mixed
+	 */
+	public function updateUser($name = '', $email = '', $blog = '', $company = '', $location = '', $hireable = '', $bio = '')
+	{
+		return $this->edit($name = '', $email = '', $blog = '', $company = '', $location = '', $hireable = '', $bio = '');
+	}
+
+	/**
+	 * Get all users.
+	 *
+	 * This provides a dump of every user, in the order that they signed up for GitHub.
+	 *
+	 * @param   integer  $since  The integer ID of the last User that you’ve seen.
+	 *
+	 * @deprecated use users->getList()
+	 *
+	 * @throws DomainException
+	 * @return mixed
+	 */
+	public function getUsers($since = 0)
+	{
+		return $this->getList($since);
+	}
+}
diff --git a/core/libraries/joomla/github/package/users/emails.php b/core/libraries/joomla/github/package/users/emails.php
new file mode 100644
index 00000000..2d7a431c
--- /dev/null
+++ b/core/libraries/joomla/github/package/users/emails.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * Management of email addresses via the API requires that you are authenticated
+ * through basic auth or OAuth with the user scope.
+ *
+ * @documentation https://developer.github.com/v3/users/emails
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageUsersEmails extends JGithubPackage
+{
+	/**
+	 * List email addresses for a user.
+	 *
+	 * Future response:
+	 * In the final version of the API, this method will return an array of hashes
+	 * with extended information for each email address indicating if the address
+	 * has been verified and if it’s the user’s primary email address for GitHub.
+	 *
+	 * Until API v3 is finalized, use the application/vnd.github.v3 media type
+	 * to get this response format.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList()
+	{
+		// Build the request path.
+		$path = '/user/emails';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Add email address(es).
+	 *
+	 * @param   string|array  $email  The email address(es).
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function add($email)
+	{
+		// Build the request path.
+		$path = '/user/emails';
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($email)),
+			201
+		);
+	}
+
+	/**
+	 * Delete email address(es).
+	 *
+	 * @param   string|array  $email  The email address(es).
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function delete($email)
+	{
+		// Build the request path.
+		$path = '/user/emails';
+
+		$this->client->setOption('body', json_encode($email));
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/users/followers.php b/core/libraries/joomla/github/package/users/followers.php
new file mode 100644
index 00000000..e41aa3d0
--- /dev/null
+++ b/core/libraries/joomla/github/package/users/followers.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/users/followers
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageUsersFollowers extends JGithubPackage
+{
+	/**
+	 * List followers of a user.
+	 *
+	 * @param   string  $user  The name of the user. If not set the current authenticated user will be used.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList($user = '')
+	{
+		// Build the request path.
+		$path = ($user)
+			? '/users/' . $user . '/followers'
+			: '/user/followers';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List users followed by another user.
+	 *
+	 * @param   string  $user  The name of the user. If not set the current authenticated user will be used.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getListFollowedBy($user = '')
+	{
+		// Build the request path.
+		$path = ($user)
+			? '/users/' . $user . '/following'
+			: '/user/following';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Check if you are following a user.
+	 *
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @throws UnexpectedValueException
+	 * @since 3.3 (CMS)
+	 *
+	 * @return boolean
+	 */
+	public function check($user)
+	{
+		// Build the request path.
+		$path = '/user/following/' . $user;
+
+		$response = $this->client->get($this->fetchUrl($path));
+
+		switch ($response->code)
+		{
+			case '204' :
+				// You are following this user
+				return true;
+				break;
+
+			case '404' :
+				// You are not following this user
+				return false;
+				break;
+
+			default :
+				throw new UnexpectedValueException('Unexpected response code: ' . $response->code);
+				break;
+		}
+	}
+
+	/**
+	 * Follow a user.
+	 *
+	 * Following a user requires the user to be logged in and authenticated with
+	 * basic auth or OAuth with the user:follow scope.
+	 *
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function follow($user)
+	{
+		// Build the request path.
+		$path = '/user/following/' . $user;
+
+		return $this->processResponse(
+			$this->client->put($this->fetchUrl($path), ''),
+			204
+		);
+	}
+
+	/**
+	 * Unfollow a user.
+	 *
+	 * Unfollowing a user requires the user to be logged in and authenticated with
+	 * basic auth or OAuth with the user:follow scope.
+	 *
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function unfollow($user)
+	{
+		// Build the request path.
+		$path = '/user/following/' . $user;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/package/users/keys.php b/core/libraries/joomla/github/package/users/keys.php
new file mode 100644
index 00000000..a8077b63
--- /dev/null
+++ b/core/libraries/joomla/github/package/users/keys.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @documentation https://developer.github.com/v3/users/keys
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubPackageUsersKeys extends JGithubPackage
+{
+	/**
+	 * List public keys for a user.
+	 *
+	 * Lists the verified public keys for a user. This is accessible by anyone.
+	 *
+	 * @param   string  $user  The name of the user.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getListUser($user)
+	{
+		// Build the request path.
+		$path = '/users/' . $user . '/keys';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * List your public keys.
+	 *
+	 * Lists the current user’s keys.
+	 * Management of public keys via the API requires that you are authenticated
+	 * through basic auth, or OAuth with the ‘user’ scope.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function getList()
+	{
+		// Build the request path.
+		$path = '/users/keys';
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Get a single public key.
+	 *
+	 * @param   integer  $id  The id of the key.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function get($id)
+	{
+		// Build the request path.
+		$path = '/users/keys/' . $id;
+
+		return $this->processResponse(
+			$this->client->get($this->fetchUrl($path))
+		);
+	}
+
+	/**
+	 * Create a public key
+	 *
+	 * @param   string  $title  The title of the key.
+	 * @param   string  $key    The key.
+	 *
+	 * @since    3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function create($title, $key)
+	{
+		// Build the request path.
+		$path = '/users/keys';
+
+		$data = array(
+			'title' => $title,
+			'key'   => $key,
+		);
+
+		return $this->processResponse(
+			$this->client->post($this->fetchUrl($path), json_encode($data)),
+			201
+		);
+	}
+
+	/**
+	 * Update a public key.
+	 *
+	 * @param   integer  $id     The id of the key.
+	 * @param   string   $title  The title of the key.
+	 * @param   string   $key    The key.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function edit($id, $title, $key)
+	{
+		// Build the request path.
+		$path = '/users/keys/' . $id;
+
+		$data = array(
+			'title' => $title,
+			'key'   => $key,
+		);
+
+		return $this->processResponse(
+			$this->client->patch($this->fetchUrl($path), json_encode($data))
+		);
+	}
+
+	/**
+	 * Delete a public key.
+	 *
+	 * @param   integer  $id  The id of the key.
+	 *
+	 * @since 3.3 (CMS)
+	 *
+	 * @return object
+	 */
+	public function delete($id)
+	{
+		// Build the request path.
+		$path = '/users/keys/' . (int) $id;
+
+		return $this->processResponse(
+			$this->client->delete($this->fetchUrl($path)),
+			204
+		);
+	}
+}
diff --git a/core/libraries/joomla/github/refs.php b/core/libraries/joomla/github/refs.php
new file mode 100644
index 00000000..cfc01841
--- /dev/null
+++ b/core/libraries/joomla/github/refs.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @since       11.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubRefs extends JGithubObject
+{
+	/**
+	 * Method to create an issue.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $ref   The name of the fully qualified reference.
+	 * @param   string  $sha   The SHA1 value to set this reference to.
+	 *
+	 * @deprecated  use data->refs->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function create($user, $repo, $ref, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs';
+
+		// Build the request data.
+		$data = json_encode(
+			array(
+				'ref' => $ref,
+				'sha' => $sha,
+			)
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to update a reference.
+	 *
+	 * @param   string  $user   The name of the owner of the GitHub repository.
+	 * @param   string  $repo   The name of the GitHub repository.
+	 * @param   string  $ref    The reference to update.
+	 * @param   string  $sha    The SHA1 value to set the reference to.
+	 * @param   string  $force  Whether the update should be forced. Default to false.
+	 *
+	 * @deprecated  use data->refs->edit()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function edit($user, $repo, $ref, $sha, $force = false)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs/' . $ref;
+
+		// Craete the data object.
+		$data = new stdClass;
+
+		// If a title is set add it to the data object.
+		if ($force)
+		{
+			$data->force = true;
+		}
+
+		$data->sha = $sha;
+
+		// Encode the request data.
+		$data = json_encode($data);
+
+		// Send the request.
+		$response = $this->client->patch($this->fetchUrl($path), $data);
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a reference.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $ref   The reference to get.
+	 *
+	 * @deprecated  use data->refs->get()
+	 *
+	 * @return  object
+	 *
+	 * @since   11.3
+	 */
+	public function get($user, $repo, $ref)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs/' . $ref;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list references for a repository.
+	 *
+	 * @param   string   $user       The name of the owner of the GitHub repository.
+	 * @param   string   $repo       The name of the GitHub repository.
+	 * @param   string   $namespace  Optional sub-namespace to limit the returned references.
+	 * @param   integer  $page       Page to request
+	 * @param   integer  $limit      Number of results to return per page
+	 *
+	 * @deprecated  use data->refs->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   11.3
+	 */
+	public function getList($user, $repo, $namespace = '', $page = 0, $limit = 0)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/git/refs' . $namespace;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path, $page, $limit));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/github/statuses.php b/core/libraries/joomla/github/statuses.php
new file mode 100644
index 00000000..954880a7
--- /dev/null
+++ b/core/libraries/joomla/github/statuses.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  GitHub
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * GitHub API References class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/github` package via Composer instead
+ */
+class JGithubStatuses extends JGithubObject
+{
+	/**
+	 * Method to create a status.
+	 *
+	 * @param   string  $user         The name of the owner of the GitHub repository.
+	 * @param   string  $repo         The name of the GitHub repository.
+	 * @param   string  $sha          The SHA1 value for which to set the status.
+	 * @param   string  $state        The state (pending, success, error or failure).
+	 * @param   string  $targetUrl    Optional target URL.
+	 * @param   string  $description  Optional description for the status.
+	 *
+	 * @deprecated  use repositories->statuses->create()
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function create($user, $repo, $sha, $state, $targetUrl = null, $description = null)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/statuses/' . $sha;
+
+		if (!in_array($state, array('pending', 'success', 'error', 'failure')))
+		{
+			throw new InvalidArgumentException('State must be one of pending, success, error or failure.');
+		}
+
+		// Build the request data.
+		$data = array(
+			'state' => $state,
+		);
+
+		if (!is_null($targetUrl))
+		{
+			$data['target_url'] = $targetUrl;
+		}
+
+		if (!is_null($description))
+		{
+			$data['description'] = $description;
+		}
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), json_encode($data));
+
+		// Validate the response code.
+		if ($response->code != 201)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to list statuses for an SHA.
+	 *
+	 * @param   string  $user  The name of the owner of the GitHub repository.
+	 * @param   string  $repo  The name of the GitHub repository.
+	 * @param   string  $sha   SHA1 for which to get the statuses.
+	 *
+	 * @deprecated  use repositories->statuses->getList()
+	 *
+	 * @return  array
+	 *
+	 * @since   12.3
+	 */
+	public function getList($user, $repo, $sha)
+	{
+		// Build the request path.
+		$path = '/repos/' . $user . '/' . $repo . '/statuses/' . $sha;
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			// Decode the error response and throw an exception.
+			$error = json_decode($response->body);
+			throw new DomainException($error->message, $response->code);
+		}
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/google/auth.php b/core/libraries/joomla/google/auth.php
new file mode 100644
index 00000000..6f140d47
--- /dev/null
+++ b/core/libraries/joomla/google/auth.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Google authentication class abstract
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+abstract class JGoogleAuth
+{
+	/**
+	 * @var    \Joomla\Registry\Registry  Options for the Google authentication object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * Abstract method to authenticate to Google
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.3
+	 */
+	abstract public function authenticate();
+
+	/**
+	 * Verify if the client has been authenticated
+	 *
+	 * @return  boolean  Is authenticated
+	 *
+	 * @since   12.3
+	 */
+	abstract public function isAuthenticated();
+
+	/**
+	 * Abstract method to retrieve data from Google
+	 *
+	 * @param   string  $url      The URL for the request.
+	 * @param   mixed   $data     The data to include in the request.
+	 * @param   array   $headers  The headers to send with the request.
+	 * @param   string  $method   The type of http request to send.
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 */
+	abstract public function query($url, $data = null, $headers = null, $method = 'get');
+
+	/**
+	 * Get an option from the JGoogleAuth object.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JGoogleAuth object.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JGoogleAuth  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/google/auth/oauth2.php b/core/libraries/joomla/google/auth/oauth2.php
new file mode 100644
index 00000000..15c4ee07
--- /dev/null
+++ b/core/libraries/joomla/google/auth/oauth2.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google OAuth authentication class
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleAuthOauth2 extends JGoogleAuth
+{
+	/**
+	 * @var    JOAuth2Client  OAuth client for the Google authentication object.
+	 * @since  12.3
+	 */
+	protected $client;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry       $options  JGoogleAuth options object.
+	 * @param   JOAuth2Client  $client   OAuth client for Google authentication.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JOAuth2Client $client = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JOAuth2Client($this->options);
+	}
+
+	/**
+	 * Method to authenticate to Google
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.3
+	 */
+	public function authenticate()
+	{
+		$this->googlize();
+
+		return $this->client->authenticate();
+	}
+
+	/**
+	 * Verify if the client has been authenticated
+	 *
+	 * @return  boolean  Is authenticated
+	 *
+	 * @since   12.3
+	 */
+	public function isAuthenticated()
+	{
+		return $this->client->isAuthenticated();
+	}
+
+	/**
+	 * Method to retrieve data from Google
+	 *
+	 * @param   string  $url      The URL for the request.
+	 * @param   mixed   $data     The data to include in the request.
+	 * @param   array   $headers  The headers to send with the request.
+	 * @param   string  $method   The type of http request to send.
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 */
+	public function query($url, $data = null, $headers = null, $method = 'get')
+	{
+		$this->googlize();
+
+		return $this->client->query($url, $data, $headers, $method);
+	}
+
+	/**
+	 * Method to fill in Google-specific OAuth settings
+	 *
+	 * @return  JOAuth2Client  Google-configured Oauth2 client.
+	 *
+	 * @since   12.3
+	 */
+	protected function googlize()
+	{
+		if (!$this->client->getOption('authurl'))
+		{
+			$this->client->setOption('authurl', 'https://accounts.google.com/o/oauth2/auth');
+		}
+
+		if (!$this->client->getOption('tokenurl'))
+		{
+			$this->client->setOption('tokenurl', 'https://accounts.google.com/o/oauth2/token');
+		}
+
+		if (!$this->client->getOption('requestparams'))
+		{
+			$this->client->setOption('requestparams', array());
+		}
+
+		$params = $this->client->getOption('requestparams');
+
+		if (!array_key_exists('access_type', $params))
+		{
+			$params['access_type'] = 'offline';
+		}
+
+		if ($params['access_type'] == 'offline' && $this->client->getOption('userefresh') === null)
+		{
+			$this->client->setOption('userefresh', true);
+		}
+
+		if (!array_key_exists('approval_prompt', $params))
+		{
+			$params['approval_prompt'] = 'auto';
+		}
+
+		$this->client->setOption('requestparams', $params);
+
+		return $this->client;
+	}
+}
diff --git a/core/libraries/joomla/google/data.php b/core/libraries/joomla/google/data.php
new file mode 100644
index 00000000..31457f12
--- /dev/null
+++ b/core/libraries/joomla/google/data.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google API data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+abstract class JGoogleData
+{
+	/**
+	 * @var    Registry  Options for the Google data object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JGoogleAuth  Authentication client for the Google data object.
+	 * @since  12.3
+	 */
+	protected $auth;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object.
+	 * @param   JGoogleAuth  $auth     Google data http client object.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->auth = isset($auth) ? $auth : new JGoogleAuthOauth2($this->options);
+	}
+
+	/**
+	 * Method to authenticate to Google
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.3
+	 */
+	public function authenticate()
+	{
+		return $this->auth->authenticate();
+	}
+
+	/**
+	 * Check authentication
+	 *
+	 * @return  boolean  True if authenticated.
+	 *
+	 * @since   12.3
+	 */
+	public function isAuthenticated()
+	{
+		return $this->auth->isAuthenticated();
+	}
+
+	/**
+	 * Method to validate XML
+	 *
+	 * @param   string  $data  XML data to be parsed
+	 *
+	 * @return  SimpleXMLElement  XMLElement of parsed data
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	protected static function safeXml($data)
+	{
+		try
+		{
+			return new SimpleXMLElement($data, LIBXML_NOWARNING | LIBXML_NOERROR);
+		}
+		catch (Exception $e)
+		{
+			throw new UnexpectedValueException("Unexpected data received from Google: `$data`.", $e->getCode(), $e);
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of data
+	 *
+	 * @param   array   $url       URL to GET
+	 * @param   int     $maxpages  Maximum number of pages to return
+	 * @param   string  $token     Next page token
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	protected function listGetData($url, $maxpages = 1, $token = null)
+	{
+		$qurl = $url;
+
+		if (strpos($url, '&') && isset($token))
+		{
+			$qurl .= '&pageToken=' . $token;
+		}
+		elseif (isset($token))
+		{
+			$qurl .= 'pageToken=' . $token;
+		}
+
+		$jdata = $this->query($qurl);
+		$data = json_decode($jdata->body, true);
+
+		if ($data && array_key_exists('items', $data))
+		{
+			if ($maxpages != 1 && array_key_exists('nextPageToken', $data))
+			{
+				$data['items'] = array_merge($data['items'], $this->listGetData($url, $maxpages - 1, $data['nextPageToken']));
+			}
+
+			return $data['items'];
+		}
+		elseif ($data)
+		{
+			return array();
+		}
+		else
+		{
+			throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+		}
+	}
+
+	/**
+	 * Method to retrieve data from Google
+	 *
+	 * @param   string  $url      The URL for the request.
+	 * @param   mixed   $data     The data to include in the request.
+	 * @param   array   $headers  The headers to send with the request.
+	 * @param   string  $method   The type of http request to send.
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 */
+	protected function query($url, $data = null, $headers = null, $method = 'get')
+	{
+		return $this->auth->query($url, $data, $headers, $method);
+	}
+
+	/**
+	 * Get an option from the JGoogleData instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JGoogleData instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JGoogleData  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/google/data/adsense.php b/core/libraries/joomla/google/data/adsense.php
new file mode 100644
index 00000000..1a324d43
--- /dev/null
+++ b/core/libraries/joomla/google/data/adsense.php
@@ -0,0 +1,420 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google Adsense data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataAdsense extends JGoogleData
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://www.googleapis.com/auth/adsense');
+		}
+	}
+
+	/**
+	 * Method to get an Adsense account's settings from Google
+	 *
+	 * @param   string   $accountID    ID of account to get
+	 * @param   boolean  $subaccounts  Include list of subaccounts
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function getAccount($accountID, $subaccounts = true)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID) . ($subaccounts ? '?tree=true' : '');
+			$jdata = $this->query($url);
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of AdSense accounts from Google
+	 *
+	 * @param   array  $options   Search settings
+	 * @param   int    $maxpages  Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function listAccounts($options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of AdSense clients from Google
+	 *
+	 * @param   string  $accountID  ID of account to list the clients from
+	 * @param   array   $options    Search settings
+	 * @param   int     $maxpages   Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function listClients($accountID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID) . '/adclients?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get an AdSense AdUnit
+	 *
+	 * @param   string  $accountID   ID of account to get
+	 * @param   string  $adclientID  ID of client to get
+	 * @param   string  $adunitID    ID of adunit to get
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function getUnit($accountID, $adclientID, $adunitID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID);
+			$url .= '/adclients/' . urlencode($adclientID) . '/adunits/' . urlencode($adunitID);
+			$jdata = $this->query($url);
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of AdSense Custom Channels for a specific Adunit
+	 *
+	 * @param   string  $accountID   ID of account
+	 * @param   string  $adclientID  ID of client
+	 * @param   string  $adunitID    ID of adunit to list channels from
+	 * @param   array   $options     Search settings
+	 * @param   int     $maxpages    Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function listUnitChannels($accountID, $adclientID, $adunitID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID);
+			$url .= '/adclients/' . urlencode($adclientID) . '/adunits/' . urlencode($adunitID) . '/customchannels?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get an Adsense Channel
+	 *
+	 * @param   string  $accountID   ID of account to get
+	 * @param   string  $adclientID  ID of client to get
+	 * @param   string  $channelID   ID of channel to get
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function getChannel($accountID, $adclientID, $channelID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID) . '/adclients/';
+			$url .= urlencode($adclientID) . '/customchannels/' . urlencode($channelID);
+			$jdata = $this->query($url);
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of AdSense Custom Channels
+	 *
+	 * @param   string  $accountID   ID of account
+	 * @param   string  $adclientID  ID of client to list channels from
+	 * @param   array   $options     Search settings
+	 * @param   int     $maxpages    Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function listChannels($accountID, $adclientID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID) . '/adclients/' . urlencode($adclientID);
+			$url .= '/customchannels?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of AdSense Adunits for a specific Custom Channel
+	 *
+	 * @param   string  $accountID   ID of account
+	 * @param   string  $adclientID  ID of client
+	 * @param   string  $channelID   ID of channel to list units from
+	 * @param   array   $options     Search settings
+	 * @param   int     $maxpages    Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function listChannelUnits($accountID, $adclientID, $channelID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID) . '/adclients/' . urlencode($adclientID);
+			$url .= '/customchannels/' . urlencode($channelID) . '/adunits?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to generate a report from Google AdSense
+	 *
+	 * @param   string  $accountID   ID of account
+	 * @param   string  $adclientID  ID of client
+	 * @param   array   $options     Search settings
+	 * @param   int     $maxpages    Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  UnexpectedValueException
+	 */
+	public function listUrlChannels($accountID, $adclientID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID);
+			$url .= '/adclients/' . urlencode($adclientID) . '/urlchannels?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of AdSense Channel URLs
+	 *
+	 * @param   string  $accountID  ID of account
+	 * @param   mixed   $start      Start day
+	 * @param   mixed   $end        End day
+	 * @param   array   $options    Search settings
+	 * @param   int     $maxpages   Maximum number of pages of accounts to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  InvalidArgumentException
+	 * @throws  UnexpectedValueException
+	 */
+	public function generateReport($accountID, $start, $end = false, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			if (is_int($start))
+			{
+				$startobj = new DateTime;
+				$startobj->setTimestamp($start);
+			}
+			elseif (is_string($start))
+			{
+				$startobj = new DateTime($start);
+			}
+			elseif (is_a($start, 'DateTime'))
+			{
+				$startobj = $start;
+			}
+			else
+			{
+				throw new InvalidArgumentException('Invalid start time.');
+			}
+
+			if (!$end)
+			{
+				$endobj = new DateTime;
+			}
+			elseif (is_int($end))
+			{
+				$endobj = new DateTime;
+				$endobj->setTimestamp($end);
+			}
+			elseif (is_string($end))
+			{
+				$endobj = new DateTime($end);
+			}
+			elseif (is_a($end, 'DateTime'))
+			{
+				$endobj = $end;
+			}
+			else
+			{
+				throw new InvalidArgumentException('Invalid end time.');
+			}
+
+			$options['startDate'] = $startobj->format('Y-m-d');
+			$options['endDate'] = $endobj->format('Y-m-d');
+
+			unset($options['startIndex']);
+
+			$url = 'https://www.googleapis.com/adsense/v1.1/accounts/' . urlencode($accountID) . '/reports?' . http_build_query($options);
+
+			if (strpos($url, '&'))
+			{
+				$url .= '&';
+			}
+
+			$i = 0;
+			$data['rows'] = array();
+
+			do
+			{
+				$jdata = $this->query($url . 'startIndex=' . count($data['rows']));
+				$newdata = json_decode($jdata->body, true);
+
+				if ($newdata && array_key_exists('rows', $newdata))
+				{
+					$newdata['rows'] = array_merge($data['rows'], $newdata['rows']);
+					$data = $newdata;
+				}
+				else
+				{
+					throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+				}
+
+				$i++;
+			}
+			while (count($data['rows']) < $data['totalMatchedRows'] && $i < $maxpages);
+
+			return $data;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/calendar.php b/core/libraries/joomla/google/data/calendar.php
new file mode 100644
index 00000000..e85603c1
--- /dev/null
+++ b/core/libraries/joomla/google/data/calendar.php
@@ -0,0 +1,625 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google Calendar data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataCalendar extends JGoogleData
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://www.googleapis.com/auth/calendar');
+		}
+	}
+
+	/**
+	 * Method to remove a calendar from a user's calendar list
+	 *
+	 * @param   string  $calendarID  ID of calendar to delete
+	 *
+	 * @return  boolean  Success or failure
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function removeCalendar($calendarID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$jdata = $this->query('https://www.googleapis.com/calendar/v3/users/me/calendarList/' . urlencode($calendarID), null, null, 'delete');
+
+			if ($jdata->body != '')
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get a calendar's settings from Google
+	 *
+	 * @param   string  $calendarID  ID of calendar to get.
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function getCalendar($calendarID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$jdata = $this->query('https://www.googleapis.com/calendar/v3/users/me/calendarList/' . urlencode($calendarID));
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to add a calendar to a user's Google Calendar list
+	 *
+	 * @param   string  $calendarID  New calendar ID
+	 * @param   array   $options     New calendar settings
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function addCalendar($calendarID, $options = array())
+	{
+		if ($this->isAuthenticated())
+		{
+			$options['id'] = $calendarID;
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendarList';
+			$jdata = $this->query($url, json_encode($options), array('Content-type' => 'application/json'), 'post');
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve calendar list from Google
+	 *
+	 * @param   array  $options   Search settings
+	 * @param   int    $maxpages  Maximum number of pages of calendars to return
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function listCalendars($options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendarList?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to edit a Google Calendar's settings
+	 *
+	 * @param   string  $calendarID  Calendar ID
+	 * @param   array   $options     Calendar settings
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function editCalendarSettings($calendarID, $options)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendarList/' . urlencode($calendarID);
+			$jdata = $this->query($url, json_encode($options), array('Content-type' => 'application/json'), 'put');
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to clear a Google Calendar
+	 *
+	 * @param   string  $calendarID  ID of calendar to clear
+	 *
+	 * @return  boolean  Success or failure
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function clearCalendar($calendarID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$data = $this->query('https://www.googleapis.com/calendar/v3/users/me/calendars/' . urlencode($calendarID) . '/clear', null, null, 'post');
+
+			if ($data->body != '')
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$data->body}`.");
+			}
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to delete a calendar from Google
+	 *
+	 * @param   string  $calendarID  ID of calendar to delete.
+	 *
+	 * @return  boolean  Success or failure
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function deleteCalendar($calendarID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$data = $this->query('https://www.googleapis.com/calendar/v3/users/me/calendars/' . urlencode($calendarID), null, null, 'delete');
+
+			if ($data->body != '')
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$data->body}`.");
+			}
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to create a Google Calendar
+	 *
+	 * @param   string  $title    New calendar title
+	 * @param   array   $options  New calendar settings
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function createCalendar($title, $options = array())
+	{
+		if ($this->isAuthenticated())
+		{
+			$options['summary'] = $title;
+			$url = 'https://www.googleapis.com/calendar/v3/calendars';
+			$jdata = $this->query($url, json_encode($options), array('Content-type' => 'application/json'), 'post');
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to edit a Google Calendar
+	 *
+	 * @param   string  $calendarID  Calendar ID.
+	 * @param   array   $options     Calendar settings.
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function editCalendar($calendarID, $options)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendars/' . urlencode($calendarID);
+			$jdata = $this->query($url, json_encode($options), array('Content-type' => 'application/json'), 'put');
+			$data = json_decode($jdata->body, true);
+
+			if ($data && array_key_exists('items', $data))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to delete an event from a Google Calendar
+	 *
+	 * @param   string  $calendarID  ID of calendar to delete from
+	 * @param   string  $eventID     ID of event to delete.
+	 *
+	 * @return  boolean  Success or failure.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function deleteEvent($calendarID, $eventID)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendars/' . urlencode($calendarID) . '/events/' . urlencode($eventID);
+			$data = $this->query($url, null, null, 'delete');
+
+			if ($data->body != '')
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$data->body}`.");
+			}
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get an event from a Google Calendar
+	 *
+	 * @param   string  $calendarID  ID of calendar
+	 * @param   string  $eventID     ID of event to get
+	 * @param   array   $options     Options to send to Google
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function getEvent($calendarID, $eventID, $options = array())
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendarList/';
+			$url .= urlencode($calendarID) . '/events/' . urlencode($eventID) . '?' . http_build_query($options);
+			$jdata = $this->query($url);
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to create a Google Calendar event
+	 *
+	 * @param   string   $calendarID  ID of calendar
+	 * @param   mixed    $start       Event start time
+	 * @param   mixed    $end         Event end time
+	 * @param   array    $options     New event settings
+	 * @param   mixed    $timezone    Timezone for event
+	 * @param   boolean  $allday      Treat event as an all-day event
+	 * @param   boolean  $notify      Notify participants
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	public function createEvent($calendarID, $start, $end = false, $options = array(), $timezone = false, $allday = false, $notify = false)
+	{
+		if ($this->isAuthenticated())
+		{
+			if (!$start)
+			{
+				$startobj = new DateTime;
+			}
+			elseif (is_int($start))
+			{
+				$startobj = new DateTime;
+				$startobj->setTimestamp($start);
+			}
+			elseif (is_string($start))
+			{
+				$startobj = new DateTime($start);
+			}
+			elseif (is_a($start, 'DateTime'))
+			{
+				$startobj = $start;
+			}
+			else
+			{
+				throw new InvalidArgumentException('Invalid event start time.');
+			}
+
+			if (!$end)
+			{
+				$endobj = $startobj;
+			}
+			elseif (is_int($end))
+			{
+				$endobj = new DateTime;
+				$endobj->setTimestamp($end);
+			}
+			elseif (is_string($end))
+			{
+				$endobj = new DateTime($end);
+			}
+			elseif (is_a($end, 'DateTime'))
+			{
+				$endobj = $end;
+			}
+			else
+			{
+				throw new InvalidArgumentException('Invalid event end time.');
+			}
+
+			if ($allday)
+			{
+				$options['start'] = array('date' => $startobj->format('Y-m-d'));
+				$options['end'] = array('date' => $endobj->format('Y-m-d'));
+			}
+			else
+			{
+				$options['start'] = array('dateTime' => $startobj->format(DateTime::RFC3339));
+				$options['end'] = array('dateTime' => $endobj->format(DateTime::RFC3339));
+			}
+
+			if ($timezone === true)
+			{
+				$options['start']['timeZone'] = $startobj->getTimezone()->getName();
+				$options['end']['timeZone'] = $endobj->getTimezone()->getName();
+			}
+			elseif (is_a($timezone, 'DateTimeZone'))
+			{
+				$options['start']['timeZone'] = $timezone->getName();
+				$options['end']['timeZone'] = $timezone->getName();
+			}
+			elseif (is_string($timezone))
+			{
+				$options['start']['timeZone'] = $timezone;
+				$options['end']['timeZone'] = $timezone;
+			}
+
+			$url = 'https://www.googleapis.com/calendar/v3/calendars/' . urlencode($calendarID) . '/events' . ($notify ? '?sendNotifications=true' : '');
+			$jdata = $this->query($url, json_encode($options), array('Content-type' => 'application/json'), 'post');
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of events on a Google calendar
+	 *
+	 * @param   string  $calendarID  Calendar ID
+	 * @param   string  $eventID     ID of the event to change
+	 * @param   array   $options     Search settings
+	 * @param   int     $maxpages    Minimum number of events to retrieve (more may be retrieved depending on page size)
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function listRecurrences($calendarID, $eventID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/calendar/v3/users/me/calendars/' . urlencode($calendarID) . '/events/' . urlencode($eventID) . '/instances';
+			$url .= '?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of events on a Google calendar
+	 *
+	 * @param   string  $calendarID  Calendar ID
+	 * @param   array   $options     Calendar settings
+	 * @param   int     $maxpages    Cycle through pages of data to generate a complete list
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function listEvents($calendarID, $options = array(), $maxpages = 1)
+	{
+		if ($this->isAuthenticated())
+		{
+			$next = array_key_exists('nextPageToken', $options) ? $options['nextPage'] : null;
+			unset($options['nextPageToken']);
+			$url = 'https://www.googleapis.com/calendar/v3/calendars/' . urlencode($calendarID) . '/events?' . http_build_query($options);
+
+			return $this->listGetData($url, $maxpages, $next);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to move an event from one calendar to another
+	 *
+	 * @param   string   $calendarID  Calendar ID
+	 * @param   string   $eventID     ID of the event to change
+	 * @param   string   $destID      Calendar ID
+	 * @param   boolean  $notify      Notify participants of changes
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function moveEvent($calendarID, $eventID, $destID, $notify = false)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/calendar/v3/calendars/' . urlencode($calendarID) . '/events/' . urlencode($eventID) . '/move';
+			$url .= '?destination=' . $destID . ($notify ? '&sendNotifications=true' : '');
+			$jdata = $this->query($url, null, null, 'post');
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to edit a Google Calendar event
+	 *
+	 * @param   string   $calendarID  Calendar ID
+	 * @param   string   $eventID     ID of the event to change
+	 * @param   array    $options     Event settings
+	 * @param   boolean  $notify      Notify participants of changes
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function editEvent($calendarID, $eventID, $options, $notify = false)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://www.googleapis.com/calendar/v3/calendars/';
+			$url .= urlencode($calendarID) . '/events/' . urlencode($eventID) . ($notify ? '?sendNotifications=true' : '');
+			$jdata = $this->query($url, json_encode($options), array('Content-type' => 'application/json'), 'put');
+
+			if ($data = json_decode($jdata->body, true))
+			{
+				return $data;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/picasa.php b/core/libraries/joomla/google/data/picasa.php
new file mode 100644
index 00000000..f3ae7f2c
--- /dev/null
+++ b/core/libraries/joomla/google/data/picasa.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google Picasa data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPicasa extends JGoogleData
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://picasaweb.google.com/data/');
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of Picasa Albums
+	 *
+	 * @param   string  $userID  ID of user
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function listAlbums($userID = 'default')
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = 'https://picasaweb.google.com/data/feed/api/user/' . urlencode($userID);
+			$jdata = $this->query($url, null, array('GData-Version' => 2));
+			$xml = $this->safeXml($jdata->body);
+
+			if (isset($xml->children()->entry))
+			{
+				$items = array();
+
+				foreach ($xml->children()->entry as $item)
+				{
+					$items[] = new JGoogleDataPicasaAlbum($item, $this->options, $this->auth);
+				}
+
+				return $items;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to create a Picasa Album
+	 *
+	 * @param   string  $userID    ID of user
+	 * @param   string  $title     New album title
+	 * @param   string  $access    New album access settings
+	 * @param   string  $summary   New album summary
+	 * @param   string  $location  New album location
+	 * @param   int     $time      New album timestamp
+	 * @param   array   $keywords  New album keywords
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 */
+	public function createAlbum($userID = 'default', $title = '', $access = 'private', $summary = '', $location = '', $time = false, $keywords = array())
+	{
+		if ($this->isAuthenticated())
+		{
+			$time = $time ? $time : time();
+			$title = $title != '' ? $title : date('F j, Y');
+			$xml = new SimpleXMLElement('<entry></entry>');
+			$xml->addAttribute('xmlns', 'http://www.w3.org/2005/Atom');
+			$xml->addChild('title', $title);
+			$xml->addChild('summary', $summary);
+			$xml->addChild('gphoto:location', $location, 'http://schemas.google.com/photos/2007');
+			$xml->addChild('gphoto:access', $access);
+			$xml->addChild('gphoto:timestamp', $time);
+			$media = $xml->addChild('media:group', '', 'http://search.yahoo.com/mrss/');
+			$media->addChild('media:keywords', implode($keywords, ', '));
+			$cat = $xml->addChild('category', '');
+			$cat->addAttribute('scheme', 'http://schemas.google.com/g/2005#kind');
+			$cat->addAttribute('term', 'http://schemas.google.com/photos/2007#album');
+
+			$url = 'https://picasaweb.google.com/data/feed/api/user/' . urlencode($userID);
+			$jdata = $this->query($url, $xml->asXml(), array('GData-Version' => 2, 'Content-type' => 'application/atom+xml'), 'post');
+
+			$xml = $this->safeXml($jdata->body);
+
+			return new JGoogleDataPicasaAlbum($xml, $this->options, $this->auth);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get Picasa Album
+	 *
+	 * @param   string  $url  URL of album to get
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function getAlbum($url)
+	{
+		if ($this->isAuthenticated())
+		{
+			$jdata = $this->query($url, null, array('GData-Version' => 2));
+			$xml = $this->safeXml($jdata->body);
+
+			return new JGoogleDataPicasaAlbum($xml, $this->options, $this->auth);
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/picasa/album.php b/core/libraries/joomla/google/data/picasa/album.php
new file mode 100644
index 00000000..e337f798
--- /dev/null
+++ b/core/libraries/joomla/google/data/picasa/album.php
@@ -0,0 +1,492 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google Picasa data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPicasaAlbum extends JGoogleData
+{
+	/**
+	 * @var    SimpleXMLElement  The album's XML
+	 * @since  12.3
+	 */
+	protected $xml;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   SimpleXMLElement  $xml      XML from Google
+	 * @param   Registry          $options  Google options object
+	 * @param   JGoogleAuth       $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(SimpleXMLElement $xml, Registry $options = null, JGoogleAuth $auth = null)
+	{
+		$this->xml = $xml;
+
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://picasaweb.google.com/data/');
+		}
+	}
+
+	/**
+	 * Method to delete a Picasa album
+	 *
+	 * @param   mixed  $match  Check for most up to date album
+	 *
+	 * @return  boolean  Success or failure.
+	 *
+	 * @since   12.3
+	 * @throws  Exception
+	 * @throws  RuntimeException
+	 * @throws  UnexpectedValueException
+	 */
+	public function delete($match = '*')
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink();
+
+			if ($match === true)
+			{
+				$match = $this->xml->xpath('./@gd:etag');
+				$match = $match[0];
+			}
+
+			try
+			{
+				$jdata = $this->query($url, null, array('GData-Version' => 2, 'If-Match' => $match), 'delete');
+			}
+			catch (Exception $e)
+			{
+				if (strpos($e->getMessage(), 'Error code 412 received requesting data: Mismatch: etags') === 0)
+				{
+					throw new RuntimeException("Etag match failed: `$match`.", $e->getCode(), $e);
+				}
+
+				throw $e;
+			}
+
+			if ($jdata->body != '')
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+
+			$this->xml = null;
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get the album link
+	 *
+	 * @param   string  $type  Type of link to return
+	 *
+	 * @return  string  Link or false on failure
+	 *
+	 * @since   12.3
+	 */
+	public function getLink($type = 'edit')
+	{
+		$links = $this->xml->link;
+
+		foreach ($links as $link)
+		{
+			if ($link->attributes()->rel == $type)
+			{
+				return (string) $link->attributes()->href;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get the title of the album
+	 *
+	 * @return  string  Album title
+	 *
+	 * @since   12.3
+	 */
+	public function getTitle()
+	{
+		return (string) $this->xml->children()->title;
+	}
+
+	/**
+	 * Method to get the summary of the album
+	 *
+	 * @return  string  Album summary
+	 *
+	 * @since   12.3
+	 */
+	public function getSummary()
+	{
+		return (string) $this->xml->children()->summary;
+	}
+
+	/**
+	 * Method to get the location of the album
+	 *
+	 * @return  string  Album location
+	 *
+	 * @since   12.3
+	 */
+	public function getLocation()
+	{
+		return (string) $this->xml->children('gphoto', true)->location;
+	}
+
+	/**
+	 * Method to get the access level of the album
+	 *
+	 * @return  string  Album access level
+	 *
+	 * @since   12.3
+	 */
+	public function getAccess()
+	{
+		return (string) $this->xml->children('gphoto', true)->access;
+	}
+
+	/**
+	 * Method to get the time of the album
+	 *
+	 * @return  double  Album time
+	 *
+	 * @since   12.3
+	 */
+	public function getTime()
+	{
+		return (double) $this->xml->children('gphoto', true)->timestamp / 1000;
+	}
+
+	/**
+	 * Method to set the title of the album
+	 *
+	 * @param   string  $title  New album title
+	 *
+	 * @return  JGoogleDataPicasaAlbum  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setTitle($title)
+	{
+		$this->xml->children()->title = $title;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the summary of the album
+	 *
+	 * @param   string  $summary  New album summary
+	 *
+	 * @return  JGoogleDataPicasaAlbum  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setSummary($summary)
+	{
+		$this->xml->children()->summary = $summary;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the location of the album
+	 *
+	 * @param   string  $location  New album location
+	 *
+	 * @return  JGoogleDataPicasaAlbum  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setLocation($location)
+	{
+		$this->xml->children('gphoto', true)->location = $location;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the access level of the album
+	 *
+	 * @param   string  $access  New album access
+	 *
+	 * @return  JGoogleDataPicasaAlbum  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setAccess($access)
+	{
+		$this->xml->children('gphoto', true)->access = $access;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the time of the album
+	 *
+	 * @param   int  $time  New album time
+	 *
+	 * @return  JGoogleDataPicasaAlbum  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setTime($time)
+	{
+		$this->xml->children('gphoto', true)->timestamp = $time * 1000;
+
+		return $this;
+	}
+
+	/**
+	 * Method to modify a Picasa Album
+	 *
+	 * @param   string  $match  Optional eTag matching parameter
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 * @throws  Exception
+	 */
+	public function save($match = '*')
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink();
+
+			if ($match === true)
+			{
+				$match = $this->xml->xpath('./@gd:etag');
+				$match = $match[0];
+			}
+
+			try
+			{
+				$headers = array('GData-Version' => 2, 'Content-type' => 'application/atom+xml', 'If-Match' => $match);
+				$jdata = $this->query($url, $this->xml->asXml(), $headers, 'put');
+			}
+			catch (Exception $e)
+			{
+				if (strpos($e->getMessage(), 'Error code 412 received requesting data: Mismatch: etags') === 0)
+				{
+					throw new RuntimeException("Etag match failed: `$match`.", $e->getCode(), $e);
+				}
+
+				throw $e;
+			}
+
+			$this->xml = $this->safeXml($jdata->body);
+
+			return $this;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Refresh Picasa Album
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function refresh()
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink();
+			$jdata = $this->query($url, null, array('GData-Version' => 2));
+			$this->xml = $this->safeXml($jdata->body);
+
+			return $this;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to retrieve a list of Picasa Photos
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	public function listPhotos()
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink('http://schemas.google.com/g/2005#feed');
+			$jdata = $this->query($url, null, array('GData-Version' => 2));
+			$xml = $this->safeXml($jdata->body);
+
+			if (isset($xml->children()->entry))
+			{
+				$items = array();
+
+				foreach ($xml->children()->entry as $item)
+				{
+					$items[] = new JGoogleDataPicasaPhoto($item, $this->options, $this->auth);
+				}
+
+				return $items;
+			}
+			else
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Add photo
+	 *
+	 * @param   string  $file     Path of file to upload
+	 * @param   string  $title    Title to give to file (defaults to filename)
+	 * @param   string  $summary  Description of the file
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function upload($file, $title = '', $summary = '')
+	{
+		if ($this->isAuthenticated())
+		{
+			jimport('joomla.filesystem.file');
+			$title = $title != '' ? $title : JFile::getName($file);
+
+			if (!($type = $this->getMime($file)))
+			{
+				throw new RuntimeException('Inappropriate file type.');
+			}
+
+			if (!($data = file_get_contents($file)))
+			{
+				throw new RuntimeException("Cannot access file: `$file`");
+			}
+
+			$xml = new SimpleXMLElement('<entry></entry>');
+			$xml->addAttribute('xmlns', 'http://www.w3.org/2005/Atom');
+			$xml->addChild('title', $title);
+			$xml->addChild('summary', $summary);
+			$cat = $xml->addChild('category', '');
+			$cat->addAttribute('scheme', 'http://schemas.google.com/g/2005#kind');
+			$cat->addAttribute('term', 'http://schemas.google.com/photos/2007#photo');
+
+			$post = "Media multipart posting\n";
+			$post .= "--END_OF_PART\n";
+			$post .= "Content-Type: application/atom+xml\n\n";
+			$post .= $xml->asXml() . "\n";
+			$post .= "--END_OF_PART\n";
+			$post .= "Content-Type: {$type}\n\n";
+			$post .= $data;
+
+			$jdata = $this->query($this->getLink(), $post, array('GData-Version' => 2, 'Content-Type: multipart/related'), 'post');
+
+			return new JGoogleDataPicasaPhoto($this->safeXml($jdata->body), $this->options, $this->auth);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Add photo
+	 *
+	 * @param   string  $file  Filename
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 * @throws UnexpectedValueException
+	 */
+	protected function getMime($file)
+	{
+		switch (strtolower(JFile::getExt($file)))
+		{
+			case 'bmp':
+			case 'bm':
+			return 'image/bmp';
+			case 'gif':
+			return 'image/gif';
+			case 'jpg':
+			case 'jpeg':
+			case 'jpe':
+			case 'jif':
+			case 'jfif':
+			case 'jfi':
+			return 'image/jpeg';
+			case 'png':
+			return 'image/png';
+			case '3gp':
+			return 'video/3gpp';
+			case 'avi':
+			return 'video/avi';
+			case 'mov':
+			case 'moov':
+			case 'qt':
+			return 'video/quicktime';
+			case 'mp4':
+			case 'm4a':
+			case 'm4p':
+			case 'm4b':
+			case 'm4r':
+			case 'm4v':
+			return 'video/mp4';
+			case 'mpg':
+			case 'mpeg':
+			case 'mp1':
+			case 'mp2':
+			case 'mp3':
+			case 'm1v':
+			case 'm1a':
+			case 'm2a':
+			case 'mpa':
+			case 'mpv':
+			return 'video/mpeg';
+			case 'asf':
+			return 'video/x-ms-asf';
+			case 'wmv':
+			return 'video/x-ms-wmv';
+			default:
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/picasa/photo.php b/core/libraries/joomla/google/data/picasa/photo.php
new file mode 100644
index 00000000..e1724b3f
--- /dev/null
+++ b/core/libraries/joomla/google/data/picasa/photo.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google Picasa data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPicasaPhoto extends JGoogleData
+{
+	/**
+	 * @var    SimpleXMLElement  The photo's XML
+	 * @since  12.3
+	 */
+	protected $xml;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   SimpleXMLElement  $xml      XML from Google
+	 * @param   Registry          $options  Google options object
+	 * @param   JGoogleAuth       $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(SimpleXMLElement $xml, Registry $options = null, JGoogleAuth $auth = null)
+	{
+		$this->xml = $xml;
+
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://picasaweb.google.com/data/');
+		}
+	}
+
+	/**
+	 * Method to delete a Picasa photo
+	 *
+	 * @param   mixed  $match  Check for most up to date photo
+	 *
+	 * @return  boolean  Success or failure.
+	 *
+	 * @since   12.3
+	 * @throws  Exception
+	 * @throws  RuntimeException
+	 * @throws  UnexpectedValueException
+	 */
+	public function delete($match = '*')
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink();
+
+			if ($match === true)
+			{
+				$match = $this->xml->xpath('./@gd:etag');
+				$match = $match[0];
+			}
+
+			try
+			{
+				$jdata = $this->query($url, null, array('GData-Version' => 2, 'If-Match' => $match), 'delete');
+			}
+			catch (Exception $e)
+			{
+				if (strpos($e->getMessage(), 'Error code 412 received requesting data: Mismatch: etags') === 0)
+				{
+					throw new RuntimeException("Etag match failed: `$match`.", $e->getCode(), $e);
+				}
+
+				throw $e;
+			}
+
+			if ($jdata->body != '')
+			{
+				throw new UnexpectedValueException("Unexpected data received from Google: `{$jdata->body}`.");
+			}
+
+			$this->xml = null;
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get the photo link
+	 *
+	 * @param   string  $type  Type of link to return
+	 *
+	 * @return  string  Link or false on failure
+	 *
+	 * @since   12.3
+	 */
+	public function getLink($type = 'edit')
+	{
+		$links = $this->xml->link;
+
+		foreach ($links as $link)
+		{
+			if ($link->attributes()->rel == $type)
+			{
+				return (string) $link->attributes()->href;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to get the photo's URL
+	 *
+	 * @return  string  Link
+	 *
+	 * @since   12.3
+	 */
+	public function getUrl()
+	{
+		return (string) $this->xml->children()->content->attributes()->src;
+	}
+
+	/**
+	 * Method to get the photo's thumbnails
+	 *
+	 * @return  array  An array of thumbnails
+	 *
+	 * @since   12.3
+	 */
+	public function getThumbnails()
+	{
+		$thumbs = array();
+
+		foreach ($this->xml->children('media', true)->group->thumbnail as $item)
+		{
+			$url = (string) $item->attributes()->url;
+			$width = (int) $item->attributes()->width;
+			$height = (int) $item->attributes()->height;
+			$thumbs[$width] = array('url' => $url, 'w' => $width, 'h' => $height);
+		}
+
+		return $thumbs;
+	}
+
+	/**
+	 * Method to get the title of the photo
+	 *
+	 * @return  string  Photo title
+	 *
+	 * @since   12.3
+	 */
+	public function getTitle()
+	{
+		return (string) $this->xml->children()->title;
+	}
+
+	/**
+	 * Method to get the summary of the photo
+	 *
+	 * @return  string  Photo description
+	 *
+	 * @since   12.3
+	 */
+	public function getSummary()
+	{
+		return (string) $this->xml->children()->summary;
+	}
+
+	/**
+	 * Method to get the access level of the photo
+	 *
+	 * @return  string  Photo access level
+	 *
+	 * @since   12.3
+	 */
+	public function getAccess()
+	{
+		return (string) $this->xml->children('gphoto', true)->access;
+	}
+
+	/**
+	 * Method to get the time of the photo
+	 *
+	 * @return  double  Photo time
+	 *
+	 * @since   12.3
+	 */
+	public function getTime()
+	{
+		return (double) $this->xml->children('gphoto', true)->timestamp / 1000;
+	}
+
+	/**
+	 * Method to get the size of the photo
+	 *
+	 * @return  int  Photo size
+	 *
+	 * @since   12.3
+	 */
+	public function getSize()
+	{
+		return (int) $this->xml->children('gphoto', true)->size;
+	}
+
+	/**
+	 * Method to get the height of the photo
+	 *
+	 * @return  int  Photo height
+	 *
+	 * @since   12.3
+	 */
+	public function getHeight()
+	{
+		return (int) $this->xml->children('gphoto', true)->height;
+	}
+
+	/**
+	 * Method to get the width of the photo
+	 *
+	 * @return  int  Photo width
+	 *
+	 * @since   12.3
+	 */
+	public function getWidth()
+	{
+		return (int) $this->xml->children('gphoto', true)->width;
+	}
+
+	/**
+	 * Method to set the title of the photo
+	 *
+	 * @param   string  $title  New photo title
+	 *
+	 * @return  JGoogleDataPicasaPhoto  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setTitle($title)
+	{
+		$this->xml->children()->title = $title;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the summary of the photo
+	 *
+	 * @param   string  $summary  New photo description
+	 *
+	 * @return  JGoogleDataPicasaPhoto  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setSummary($summary)
+	{
+		$this->xml->children()->summary = $summary;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the access level of the photo
+	 *
+	 * @param   string  $access  New photo access level
+	 *
+	 * @return  JGoogleDataPicasaPhoto  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setAccess($access)
+	{
+		$this->xml->children('gphoto', true)->access = $access;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the time of the photo
+	 *
+	 * @param   int  $time  New photo time
+	 *
+	 * @return  JGoogleDataPicasaPhoto  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setTime($time)
+	{
+		$this->xml->children('gphoto', true)->timestamp = $time * 1000;
+
+		return $this;
+	}
+
+	/**
+	 * Method to modify a Picasa Photo
+	 *
+	 * @param   string  $match  Optional eTag matching parameter
+	 *
+	 * @return  mixed  Data from Google.
+	 *
+	 * @since   12.3
+	 */
+	public function save($match = '*')
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink();
+
+			if ($match === true)
+			{
+				$match = $this->xml->xpath('./@gd:etag');
+				$match = $match[0];
+			}
+
+			try
+			{
+				$headers = array('GData-Version' => 2, 'Content-type' => 'application/atom+xml', 'If-Match' => $match);
+				$jdata = $this->query($url, $this->xml->asXml(), $headers, 'put');
+			}
+			catch (Exception $e)
+			{
+				if (strpos($e->getMessage(), 'Error code 412 received requesting data: Mismatch: etags') === 0)
+				{
+					throw new RuntimeException("Etag match failed: `$match`.", $e->getCode(), $e);
+				}
+
+				throw $e;
+			}
+
+			$this->xml = $this->safeXml($jdata->body);
+
+			return $this;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Refresh photo data
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function refresh()
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getLink();
+			$jdata = $this->query($url, null, array('GData-Version' => 2));
+			$this->xml = $this->safeXml($jdata->body);
+
+			return $this;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/plus.php b/core/libraries/joomla/google/data/plus.php
new file mode 100644
index 00000000..41ed9c08
--- /dev/null
+++ b/core/libraries/joomla/google/data/plus.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google+ data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPlus extends JGoogleData
+{
+	/**
+	 * @var    JGoogleDataPlusPeople  Google+ API object for people.
+	 * @since  12.3
+	 */
+	protected $people;
+
+	/**
+	 * @var    JGoogleDataPlusActivities  Google+ API object for people.
+	 * @since  12.3
+	 */
+	protected $activities;
+
+	/**
+	 * @var    JGoogleDataPlusComments  Google+ API object for people.
+	 * @since  12.3
+	 */
+	protected $comments;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		// Setup the default API url if not already set.
+		$options->def('api.url', 'https://www.googleapis.com/plus/v1/');
+
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://www.googleapis.com/auth/plus.me');
+		}
+	}
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JGoogleDataPlus  Google+ API object (people, activities, comments).
+	 *
+	 * @since   12.3
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'people':
+				if ($this->people == null)
+				{
+					$this->people = new JGoogleDataPlusPeople($this->options, $this->auth);
+				}
+
+				return $this->people;
+
+			case 'activities':
+				if ($this->activities == null)
+				{
+					$this->activities = new JGoogleDataPlusActivities($this->options, $this->auth);
+				}
+
+				return $this->activities;
+
+			case 'comments':
+				if ($this->comments == null)
+				{
+					$this->comments = new JGoogleDataPlusComments($this->options, $this->auth);
+				}
+
+				return $this->comments;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/plus/activities.php b/core/libraries/joomla/google/data/plus/activities.php
new file mode 100644
index 00000000..ba73d22a
--- /dev/null
+++ b/core/libraries/joomla/google/data/plus/activities.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google+ data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPlusActivities extends JGoogleData
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+	parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://www.googleapis.com/auth/plus.me');
+		}
+	}
+
+	/**
+	 * List all of the activities in the specified collection for a particular user.
+	 *
+	 * @param   string   $userId      The ID of the user to get activities for. The special value "me" can be used to indicate the authenticated user.
+	 * @param   string   $collection  The collection of activities to list. Acceptable values are: "public".
+	 * @param   string   $fields      Used to specify the fields you want returned.
+	 * @param   integer  $max         The maximum number of people to include in the response, used for paging.
+	 * @param   string   $token       The continuation token, used to page through large result sets. To get the next page of results, set this
+	 *								  parameter to the value of "nextPageToken" from the previous response. This token may be of any length.
+	 * @param   string   $alt         Specifies an alternative representation type. Acceptable values are: "json" - Use JSON format (default)
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function listActivities($userId, $collection, $fields = null, $max = 10, $token = null, $alt = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'people/' . $userId . '/activities/' . $collection;
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '?fields=' . $fields;
+			}
+
+			// Check if max is specified.
+			if ($max != 10)
+			{
+				$url .= (strpos($url, '?') === false) ? '?maxResults=' : '&maxResults=';
+				$url .= $max;
+			}
+
+			// Check if token is specified.
+			if ($token)
+			{
+				$url .= (strpos($url, '?') === false) ? '?pageToken=' : '&pageToken=';
+				$url .= $token;
+			}
+
+			// Check if alt is specified.
+			if ($alt)
+			{
+				$url .= (strpos($url, '?') === false) ? '?alt=' : '&alt=';
+				$url .= $alt;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get an activity.
+	 *
+	 * @param   string  $id      The ID of the activity to get.
+	 * @param   string  $fields  Used to specify the fields you want returned.
+	 * @param   string  $alt     Specifies an alternative representation type. Acceptable values are: "json" - Use JSON format (default)
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function getActivity($id, $fields = null, $alt = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'activities/' . $id;
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '?fields=' . $fields;
+			}
+
+			// Check if alt is specified.
+			if ($alt)
+			{
+				$url .= (strpos($url, '?') === false) ? '?alt=' : '&alt=';
+				$url .= $alt;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Search all public activities.
+	 *
+	 * @param   string   $query     Full-text search query string.
+	 * @param   string   $fields    Used to specify the fields you want returned.
+	 * @param   string   $language  Specify the preferred language to search with. https://developers.google.com/+/api/search#available-languages
+	 * @param   integer  $max       The maximum number of people to include in the response, used for paging.
+	 * @param   string   $order     Specifies how to order search results. Acceptable values are "best" and "recent".
+	 * @param   string   $token     The continuation token, used to page through large result sets. To get the next page of results, set this
+	 * 								parameter to the value of "nextPageToken" from the previous response. This token may be of any length.
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function search($query, $fields = null, $language = null, $max = 10, $order = null, $token = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'activities?query=' . urlencode($query);
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '&fields=' . $fields;
+			}
+
+			// Check if language is specified.
+			if ($language)
+			{
+				$url .= '&language=' . $language;
+			}
+
+			// Check if max is specified.
+			if ($max != 10)
+			{
+				$url .= '&maxResults=' . $max;
+			}
+
+			// Check if order is specified.
+			if ($order)
+			{
+				$url .= '&orderBy=' . $order;
+			}
+
+			// Check of token is specified.
+			if ($token)
+			{
+				$url .= '&pageToken=' . $token;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/plus/comments.php b/core/libraries/joomla/google/data/plus/comments.php
new file mode 100644
index 00000000..947ceef9
--- /dev/null
+++ b/core/libraries/joomla/google/data/plus/comments.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google+ data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPlusComments extends JGoogleData
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://www.googleapis.com/auth/plus.me');
+		}
+	}
+
+	/**
+	 * List all of the comments for an activity.
+	 *
+	 * @param   string   $activityId  The ID of the activity to get comments for.
+	 * @param   string   $fields      Used to specify the fields you want returned.
+	 * @param   integer  $max         The maximum number of people to include in the response, used for paging.
+	 * @param   string   $order       The order in which to sort the list of comments. Acceptable values are "ascending" and "descending".
+	 * @param   string   $token       The continuation token, used to page through large result sets. To get the next page of results, set this
+	 * 								  parameter to the value of "nextPageToken" from the previous response. This token may be of any length.
+	 * @param   string   $alt         Specifies an alternative representation type. Acceptable values are: "json" - Use JSON format (default)
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function listComments($activityId, $fields = null, $max = 20, $order = null, $token = null, $alt = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'activities/' . $activityId . '/comments';
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '?fields=' . $fields;
+			}
+
+			// Check if max is specified.
+			if ($max != 20)
+			{
+				$url .= (strpos($url, '?') === false) ? '?maxResults=' : '&maxResults=';
+				$url .= $max;
+			}
+
+			// Check if order is specified.
+			if ($order)
+			{
+				$url .= (strpos($url, '?') === false) ? '?orderBy=' : '&orderBy=';
+				$url .= $order;
+			}
+
+			// Check of token is specified.
+			if ($token)
+			{
+				$url .= (strpos($url, '?') === false) ? '?pageToken=' : '&pageToken=';
+				$url .= $token;
+			}
+
+			// Check if alt is specified.
+			if ($alt)
+			{
+				$url .= (strpos($url, '?') === false) ? '?alt=' : '&alt=';
+				$url .= $alt;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get a comment.
+	 *
+	 * @param   string  $id      The ID of the comment to get.
+	 * @param   string  $fields  Used to specify the fields you want returned.
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function getComment($id, $fields = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'comments/' . $id;
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '?fields=' . $fields;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/data/plus/people.php b/core/libraries/joomla/google/data/plus/people.php
new file mode 100644
index 00000000..982da17a
--- /dev/null
+++ b/core/libraries/joomla/google/data/plus/people.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google+ data class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleDataPlusPeople extends JGoogleData
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object
+	 * @param   JGoogleAuth  $auth     Google data http client object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		parent::__construct($options, $auth);
+
+		if (isset($this->auth) && !$this->auth->getOption('scope'))
+		{
+			$this->auth->setOption('scope', 'https://www.googleapis.com/auth/plus.me');
+		}
+	}
+
+	/**
+	 * Get a person's profile.
+	 *
+	 * @param   string  $id      The ID of the person to get the profile for. The special value "me" can be used to indicate the authenticated user.
+	 * @param   string  $fields  Used to specify the fields you want returned.
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function getPeople($id, $fields = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'people/' . $id;
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '?fields=' . $fields;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Search all public profiles.
+	 *
+	 * @param   string   $query     Specify a query string for full text search of public text in all profiles.
+	 * @param   string   $fields    Used to specify the fields you want returned.
+	 * @param   string   $language  Specify the preferred language to search with. https://developers.google.com/+/api/search#available-languages
+	 * @param   integer  $max       The maximum number of people to include in the response, used for paging.
+	 * @param   string   $token     The continuation token, used to page through large result sets. To get the next page of results, set this
+	 * 								parameter to the value of "nextPageToken" from the previous response. This token may be of any length.
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function search($query, $fields = null, $language = null, $max = 10, $token = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'people?query=' . urlencode($query);
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '&fields=' . $fields;
+			}
+
+			// Check if language is specified.
+			if ($language)
+			{
+				$url .= '&language=' . $language;
+			}
+
+			// Check if max is specified.
+			if ($max != 10)
+			{
+				$url .= '&maxResults=' . $max;
+			}
+
+			// Check of token is specified.
+			if ($token)
+			{
+				$url .= '&pageToken=' . $token;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * List all of the people in the specified collection for a particular activity.
+	 *
+	 * @param   string   $activityId  The ID of the activity to get the list of people for.
+	 * @param   string   $collection  The collection of people to list. Acceptable values are "plusoners" and "resharers".
+	 * @param   string   $fields      Used to specify the fields you want returned.
+	 * @param   integer  $max         The maximum number of people to include in the response, used for paging.
+	 * @param   string   $token       The continuation token, used to page through large result sets. To get the next page of results, set this
+	 * 								  parameter to the value of "nextPageToken" from the previous response. This token may be of any length.
+	 *
+	 * @return  mixed  Data from Google
+	 *
+	 * @since   12.3
+	 */
+	public function listByActivity($activityId, $collection, $fields = null, $max = 10, $token = null)
+	{
+		if ($this->isAuthenticated())
+		{
+			$url = $this->getOption('api.url') . 'activities/' . $activityId . '/people/' . $collection;
+
+			// Check if fields is specified.
+			if ($fields)
+			{
+				$url .= '?fields=' . $fields;
+			}
+
+			// Check if max is specified.
+			if ($max != 10)
+			{
+				$url .= (strpos($url, '?') === false) ? '?maxResults=' : '&maxResults=';
+				$url .= $max;
+			}
+
+			// Check of token is specified.
+			if ($token)
+			{
+				$url .= (strpos($url, '?') === false) ? '?pageToken=' : '&pageToken=';
+				$url .= $token;
+			}
+
+			$jdata = $this->auth->query($url);
+
+			return json_decode($jdata->body, true);
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/google/embed.php b/core/libraries/joomla/google/embed.php
new file mode 100644
index 00000000..70ad2c3e
--- /dev/null
+++ b/core/libraries/joomla/google/embed.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google API object class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+abstract class JGoogleEmbed
+{
+	/**
+	 * @var    Registry  Options for the Google data object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JUri  URI of the page being rendered.
+	 * @since  12.3
+	 */
+	protected $uri;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  Google options object
+	 * @param   JUri      $uri      URL of the page being rendered
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JUri $uri = null)
+	{
+		$this->options = $options ? $options : new Registry;
+		$this->uri = $uri ? $uri : JUri::getInstance();
+	}
+
+	/**
+	 * Method to retrieve the javascript header for the embed API
+	 *
+	 * @return  string  The header
+	 *
+	 * @since   12.3
+	 */
+	public function isSecure()
+	{
+		return $this->uri->getScheme() == 'https';
+	}
+
+	/**
+	 * Method to retrieve the header for the API
+	 *
+	 * @return  string  The header
+	 *
+	 * @since   12.3
+	 */
+	abstract public function getHeader();
+
+	/**
+	 * Method to retrieve the body for the API
+	 *
+	 * @return  string  The body
+	 *
+	 * @since   12.3
+	 */
+	abstract public function getBody();
+
+	/**
+	 * Method to output the javascript header for the embed API
+	 *
+	 * @return  null
+	 *
+	 * @since   12.3
+	 */
+	public function echoHeader()
+	{
+		echo $this->getHeader();
+	}
+
+	/**
+	 * Method to output the body for the API
+	 *
+	 * @return  null
+	 *
+	 * @since   12.3
+	 */
+	public function echoBody()
+	{
+		echo $this->getBody();
+	}
+
+	/**
+	 * Get an option from the JGoogleEmbed instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JGoogleEmbed instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JGoogleEmbed  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/google/embed/analytics.php b/core/libraries/joomla/google/embed/analytics.php
new file mode 100644
index 00000000..65f91bc1
--- /dev/null
+++ b/core/libraries/joomla/google/embed/analytics.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Google Analytics embed class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleEmbedAnalytics extends JGoogleEmbed
+{
+	/**
+	 * Method to get the tracking code
+	 *
+	 * @return  string  The Google Analytics tracking code
+	 *
+	 * @since   12.3
+	 */
+	public function getCode()
+	{
+		return $this->getOption('code');
+	}
+
+	/**
+	 * Method to set the tracking code
+	 *
+	 * @param   string  $code  The Google Analytics tracking code
+	 *
+	 * @return  JGoogleEmbedAnalytics  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setCode($code)
+	{
+		$this->setOption('code', $code);
+
+		return $this;
+	}
+
+	/**
+	 * Checks if the javascript is set to be asynchronous
+	 *
+	 * @return  boolean  True if asynchronous
+	 *
+	 * @since   12.3
+	 */
+	public function isAsync()
+	{
+		return $this->getOption('async') === null ? true : $this->getOption('async');
+	}
+
+	/**
+	 * Load javascript asynchronously
+	 *
+	 * @return  JGoogleEmbedAnalytics  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function useAsync()
+	{
+		$this->setOption('async', true);
+
+		return $this;
+	}
+
+	/**
+	 * Load javascript synchronously
+	 *
+	 * @return  JGoogleEmbedAnalytics  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function useSync()
+	{
+		$this->setOption('async', false);
+
+		return $this;
+	}
+
+	/**
+	 * Add an analytics call
+	 *
+	 * @param   string  $method  The name of the function
+	 * @param   array   $params  The parameters for the call
+	 *
+	 * @return  array  The added call
+	 *
+	 * @since   12.3
+	 */
+	public function addCall($method, $params = array())
+	{
+		$call = array('name' => $method, 'params' => $params);
+
+		$calls = $this->listCalls();
+		$calls[] = $call;
+		$this->setOption('calls', $calls);
+
+		return $call;
+	}
+
+	/**
+	 * List the analytics calls to be executed
+	 *
+	 * @return  array  A list of calls
+	 *
+	 * @since   12.3
+	 */
+	public function listCalls()
+	{
+		return $this->getOption('calls') ? $this->getOption('calls') : array();
+	}
+
+	/**
+	 * Delete a call from the stack
+	 *
+	 * @param   int  $index  Index of call to delete (defaults to last added call)
+	 *
+	 * @return  array  The deleted call
+	 *
+	 * @since   12.3
+	 */
+	public function deleteCall($index = null)
+	{
+		$calls = $this->listCalls();
+
+		if ($index === null)
+		{
+			$index = count($calls) - 1;
+		}
+
+		$call = $calls[$index];
+		unset($calls[$index]);
+		$calls = array_values($calls);
+		$this->setOption('calls', $calls);
+
+		return $call;
+	}
+
+	/**
+	 * Create a javascript function from the call parameters
+	 *
+	 * @param   string  $method  The name of the function
+	 * @param   array   $params  The parameters for the call
+	 *
+	 * @return  string  The created call
+	 *
+	 * @since   12.3
+	 */
+	public function createCall($method, $params = array())
+	{
+		$params = array_values($params);
+
+		if ($this->isAsync())
+		{
+			$output = "_gaq.push(['{$method}',";
+			$output .= substr(json_encode($params), 1, -1);
+			$output .= ']);';
+		}
+		else
+		{
+			$output = "pageTracker.{$method}(";
+			$output .= substr(json_encode($params), 1, -1);
+			$output .= ');';
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Add a custom variable to the analytics
+	 *
+	 * @param   int     $slot   The slot to store the variable in (1-5)
+	 * @param   string  $name   The variable name
+	 * @param   string  $value  The variable value
+	 * @param   int     $scope  The scope of the variable (1: visitor level, 2: session level, 3: page level)
+	 *
+	 * @return  array  The added call
+	 *
+	 * @since   12.3
+	 */
+	public function addCustomVar($slot, $name, $value, $scope = 3)
+	{
+		return $this->addCall('_setCustomVar', array($slot, $name, $value, $scope));
+	}
+
+	/**
+	 * Get the code to create a custom analytics variable
+	 *
+	 * @param   int     $slot   The slot to store the variable in (1-5)
+	 * @param   string  $name   The variable name
+	 * @param   string  $value  The variable value
+	 * @param   int     $scope  The scope of the variable (1: visitor level, 2: session level, 3: page level)
+	 *
+	 * @return  string  The created call
+	 *
+	 * @since   12.3
+	 */
+	public function createCustomVar($slot, $name, $value, $scope = 3)
+	{
+		return $this->createCall('_setCustomVar', array($slot, $name, $value, $scope));
+	}
+
+	/**
+	 * Track an analytics event
+	 *
+	 * @param   string   $category     The general event category
+	 * @param   string   $action       The event action
+	 * @param   string   $label        The event description
+	 * @param   string   $value        The value of the event
+	 * @param   boolean  $noninteract  Don't allow this event to impact bounce statistics
+	 *
+	 * @return  array  The added call
+	 *
+	 * @since   12.3
+	 */
+	public function addEvent($category, $action, $label = null, $value = null, $noninteract = false)
+	{
+		return $this->addCall('_trackEvent', array($category, $action, $label, $value, $noninteract));
+	}
+
+	/**
+	 * Get the code to track an analytics event
+	 *
+	 * @param   string   $category     The general event category
+	 * @param   string   $action       The event action
+	 * @param   string   $label        The event description
+	 * @param   string   $value        The value of the event
+	 * @param   boolean  $noninteract  Don't allow this event to impact bounce statistics
+	 *
+	 * @return  string  The created call
+	 *
+	 * @since   12.3
+	 */
+	public function createEvent($category, $action, $label = null, $value = null, $noninteract = false)
+	{
+		return $this->createCall('_trackEvent', array($category, $action, $label, $value, $noninteract));
+	}
+
+	/**
+	 * Get code to load Google Analytics javascript
+	 *
+	 * @return  string  Javascript code
+	 *
+	 * @since   12.3
+	 */
+	public function getHeader()
+	{
+		if (!$this->isAsync())
+		{
+			// Synchronous code is included only in the body
+			return '';
+		}
+
+		if (!$this->getOption('code'))
+		{
+			throw new UnexpectedValueException('A Google Analytics tracking code is required.');
+		}
+
+		$code = $this->getOption('code');
+
+		$output = '<script type="text/javascript">';
+		$output .= 'var _gaq = _gaq || [];';
+		$output .= "_gaq.push(['_setAccount', '{$code}']);";
+
+		foreach ($this->listCalls() as $call)
+		{
+			$output .= $this->createCall($call['name'], $call['params']);
+		}
+
+		$output .= '_gaq.push(["_trackPageview"]);';
+		$output .= '</script>';
+
+		return $output;
+	}
+
+	/**
+	 * Google Analytics only needs to be included in the header
+	 *
+	 * @return  null
+	 *
+	 * @since   12.3
+	 */
+	public function getBody()
+	{
+		if (!$this->getOption('code'))
+		{
+			throw new UnexpectedValueException('A Google Analytics tracking code is required.');
+		}
+
+		$prefix = $this->isSecure() ? 'https://ssl' : 'http://www';
+		$code = $this->getOption('code');
+
+		if ($this->isAsync())
+		{
+			$output = '<script type="text/javascript">';
+			$output .= '(function() {';
+			$output .= 'var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;';
+			$output .= "ga.src = '{$prefix}.google-analytics.com/ga.js';";
+			$output .= 'var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);';
+			$output .= '})();';
+			$output .= '</script>';
+		}
+		else
+		{
+			$output = '<script type="text/javascript">';
+			$output .= "document.write(unescape(\"%3Cscript src='{$prefix}.google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E\"));";
+			$output .= '</script>';
+			$output .= '<script type="text/javascript">';
+			$output .= 'try{';
+			$output .= "var pageTracker = _gat._getTracker('{$code}');";
+
+			foreach ($this->listCalls() as $call)
+			{
+				$output .= $this->createCall($call['name'], $call['params']);
+			}
+
+			$output .= 'pageTracker._trackPageview();';
+			$output .= '} catch(err) {}</script>';
+		}
+
+		return $output;
+	}
+}
diff --git a/core/libraries/joomla/google/embed/maps.php b/core/libraries/joomla/google/embed/maps.php
new file mode 100644
index 00000000..d0b6c57c
--- /dev/null
+++ b/core/libraries/joomla/google/embed/maps.php
@@ -0,0 +1,821 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Google Maps embed class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogleEmbedMaps extends JGoogleEmbed
+{
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  12.3
+	 */
+	protected $http;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  Google options object
+	 * @param   JUri      $uri      URL of the page being rendered
+	 * @param   JHttp     $http     Http client for geocoding requests
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JUri $uri = null, JHttp $http = null)
+	{
+		parent::__construct($options, $uri);
+		$this->http = $http ? $http : new JHttp($this->options);
+	}
+
+	/**
+	 * Method to get the API key
+	 *
+	 * @return  string  The Google Maps API key
+	 *
+	 * @since   12.3
+	 */
+	public function getKey()
+	{
+		return $this->getOption('key');
+	}
+
+	/**
+	 * Method to set the API key
+	 *
+	 * @param   string  $key  The Google Maps API key
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setKey($key)
+	{
+		$this->setOption('key', $key);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the id of the map div
+	 *
+	 * @return  string  The ID
+	 *
+	 * @since   12.3
+	 */
+	public function getMapId()
+	{
+		return $this->getOption('mapid') ? $this->getOption('mapid') : 'map_canvas';
+	}
+
+	/**
+	 * Method to set the map div id
+	 *
+	 * @param   string  $id  The ID
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setMapId($id)
+	{
+		$this->setOption('mapid', $id);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the class of the map div
+	 *
+	 * @return  string  The class
+	 *
+	 * @since   12.3
+	 */
+	public function getMapClass()
+	{
+		return $this->getOption('mapclass') ? $this->getOption('mapclass') : '';
+	}
+
+	/**
+	 * Method to set the map div class
+	 *
+	 * @param   string  $class  The class
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setMapClass($class)
+	{
+		$this->setOption('mapclass', $class);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the style of the map div
+	 *
+	 * @return  string  The style
+	 *
+	 * @since   12.3
+	 */
+	public function getMapStyle()
+	{
+		return $this->getOption('mapstyle') ? $this->getOption('mapstyle') : '';
+	}
+
+	/**
+	 * Method to set the map div style
+	 *
+	 * @param   string  $style  The style
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setMapStyle($style)
+	{
+		$this->setOption('mapstyle', $style);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the map type setting
+	 *
+	 * @return  string  The class
+	 *
+	 * @since   12.3
+	 */
+	public function getMapType()
+	{
+		return $this->getOption('maptype') ? $this->getOption('maptype') : 'ROADMAP';
+	}
+
+	/**
+	 * Method to set the map type ()
+	 *
+	 * @param   string  $type  Valid types are ROADMAP, SATELLITE, HYBRID, and TERRAIN
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setMapType($type)
+	{
+		$this->setOption('maptype', strtoupper($type));
+
+		return $this;
+	}
+
+	/**
+	 * Method to get additional map options
+	 *
+	 * @return  string  The options
+	 *
+	 * @since   12.3
+	 */
+	public function getAdditionalMapOptions()
+	{
+		return $this->getOption('mapoptions') ? $this->getOption('mapoptions') : array();
+	}
+
+	/**
+	 * Method to add additional map options
+	 *
+	 * @param   array  $options  Additional map options
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setAdditionalMapOptions($options)
+	{
+		$this->setOption('mapoptions', $options);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get additional map options
+	 *
+	 * @return  string  The options
+	 *
+	 * @since   12.3
+	 */
+	public function getAdditionalJavascript()
+	{
+		return $this->getOption('extrascript') ? $this->getOption('extrascript') : '';
+	}
+
+	/**
+	 * Method to add additional javascript
+	 *
+	 * @param   array  $script  Additional javascript
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setAdditionalJavascript($script)
+	{
+		$this->setOption('extrascript', $script);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the zoom
+	 *
+	 * @return  int  The zoom level
+	 *
+	 * @since   12.3
+	 */
+	public function getZoom()
+	{
+		return $this->getOption('zoom') ? $this->getOption('zoom') : 0;
+	}
+
+	/**
+	 * Method to set the map zoom
+	 *
+	 * @param   int  $zoom  Zoom level (0 is whole world)
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setZoom($zoom)
+	{
+		$this->setOption('zoom', $zoom);
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the center of the map
+	 *
+	 * @return  mixed  A latitude longitude array or an address string
+	 *
+	 * @since   12.3
+	 */
+	public function getCenter()
+	{
+		return $this->getOption('mapcenter') ? $this->getOption('mapcenter') : array(0, 0);
+	}
+
+	/**
+	 * Method to set the center of the map
+	 *
+	 * @param   mixed  $location       A latitude/longitude array or an address string
+	 * @param   mixed  $title          Title of marker or false for no marker
+	 * @param   array  $markeroptions  Options for marker
+	 * @param   array  $markerevents   Events for marker
+	 *
+	 * @example with events call:
+	 *		$map->setCenter(
+	 *			array(0, 0),
+	 *			'Map Center',
+	 *			array(),
+	 *			array(
+	 *				'click' => 'function() { // code goes here }
+	 *			)
+	 *		)
+	 *
+	 * @return  JGoogleEmbedMaps  The latitude/longitude of the center or false on failure
+	 *
+	 * @since   12.3
+	 */
+	public function setCenter($location, $title = true, $markeroptions = array(), $markerevents = array())
+	{
+		if ($title)
+		{
+			$title = is_string($title) ? $title : null;
+
+			if (!$marker = $this->addMarker($location, $title, $markeroptions, $markerevents))
+			{
+				return false;
+			}
+
+			$location = $marker['loc'];
+		}
+		elseif (is_string($location))
+		{
+			$geocode = $this->geocodeAddress($location);
+
+			if (!$geocode)
+			{
+				return false;
+			}
+
+			$location = $geocode['geometry']['location'];
+			$location = array_values($location);
+		}
+
+		$this->setOption('mapcenter', $location);
+
+		return $this;
+	}
+
+	/**
+	 * Method to add an event handler to the map.
+	 * Event handlers must be passed in either as callback name or fully qualified function declaration
+	 *
+	 * @param   string  $type      The event name
+	 * @param   string  $function  The event handling function body
+	 *
+	 * @example to add an event call:
+	 *		$map->addEventHandler('click', 'function(){ alert("map click event"); }');
+	 *
+	 * @return  JGoogleEmbedMaps   The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function addEventHandler($type, $function)
+	{
+		$events = $this->listEventHandlers();
+
+		$events[$type] = $function;
+
+		$this->setOption('events', $events);
+
+		return $this;
+	}
+
+	/**
+	 * Method to remove an event handler from the map
+	 *
+	 * @param   string  $type  The event name
+	 *
+	 * @example to delete an event call:
+	 *		$map->deleteEventHandler('click');
+	 *
+	 * @return  string  The event handler content
+	 *
+	 * @since   12.3
+	 */
+	public function deleteEventHandler($type = null)
+	{
+		$events = $this->listEventHandlers();
+
+		if ($type === null || !isset($events[$type]))
+		{
+			return;
+		}
+
+		$event = $events[$type];
+		unset($events[$type]);
+		$this->setOption('events', $events);
+
+		return $event;
+	}
+
+	/**
+	 * List the events added to the map
+	 *
+	 * @return  array  A list of events
+	 *
+	 * @since   12.3
+	 */
+	public function listEventHandlers()
+	{
+		return $this->getOption('events') ? $this->getOption('events') : array();
+	}
+
+	/**
+	 * Add a marker to the map
+	 *
+	 * @param   mixed  $location  A latitude/longitude array or an address string
+	 * @param   mixed  $title     The hover-text for the marker
+	 * @param   array  $options   Options for marker
+	 * @param   array  $events    Events for marker
+	 *
+	 * @example with events call:
+	 *		$map->addMarker(
+	 *			array(0, 0),
+	 *			'My Marker',
+	 *			array(),
+	 *			array(
+	 *				'click' => 'function() { // code goes here }
+	 *			)
+	 *		)
+	 *
+	 * @return  mixed  The marker or false on failure
+	 *
+	 * @since   12.3
+	 */
+	public function addMarker($location, $title = null, $options = array(), $events = array())
+	{
+		if (is_string($location))
+		{
+			if (!$title)
+			{
+				$title = $location;
+			}
+
+			$geocode = $this->geocodeAddress($location);
+
+			if (!$geocode)
+			{
+				return false;
+			}
+
+			$location = $geocode['geometry']['location'];
+		}
+		elseif (!$title)
+		{
+			$title = implode(', ', $location);
+		}
+
+		$location = array_values($location);
+		$marker = array('loc' => $location, 'title' => $title, 'options' => $options, 'events' => $events);
+
+		$markers = $this->listMarkers();
+		$markers[] = $marker;
+		$this->setOption('markers', $markers);
+
+		return $marker;
+	}
+
+	/**
+	 * List the markers added to the map
+	 *
+	 * @return  array  A list of markers
+	 *
+	 * @since   12.3
+	 */
+	public function listMarkers()
+	{
+		return $this->getOption('markers') ? $this->getOption('markers') : array();
+	}
+
+	/**
+	 * Delete a marker from the map
+	 *
+	 * @param   int  $index  Index of marker to delete (defaults to last added marker)
+	 *
+	 * @return  array The latitude/longitude of the deleted marker
+	 *
+	 * @since   12.3
+	 */
+	public function deleteMarker($index = null)
+	{
+		$markers = $this->listMarkers();
+
+		if ($index === null)
+		{
+			$index = count($markers) - 1;
+		}
+
+		if ($index >= count($markers) || $index < 0)
+		{
+			throw new OutOfBoundsException('Marker index out of bounds.');
+		}
+
+		$marker = $markers[$index];
+		unset($markers[$index]);
+		$markers = array_values($markers);
+		$this->setOption('markers', $markers);
+
+		return $marker;
+	}
+
+	/**
+	 * Checks if the javascript is set to be asynchronous
+	 *
+	 * @return  boolean  True if asynchronous
+	 *
+	 * @since   12.3
+	 */
+	public function isAsync()
+	{
+		return $this->getOption('async') === null ? true : $this->getOption('async');
+	}
+
+	/**
+	 * Load javascript asynchronously
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function useAsync()
+	{
+		$this->setOption('async', true);
+
+		return $this;
+	}
+
+	/**
+	 * Load javascript synchronously
+	 *
+	 * @return  JGoogleEmbedAMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function useSync()
+	{
+		$this->setOption('async', false);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get callback function for async javascript loading
+	 *
+	 * @return  string  The ID
+	 *
+	 * @since   12.3
+	 */
+	public function getAsyncCallback()
+	{
+		return $this->getOption('callback') ? $this->getOption('callback') : 'initialize';
+	}
+
+	/**
+	 * Method to set the callback function for async javascript loading
+	 *
+	 * @param   string  $callback  The callback function name
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setAsyncCallback($callback)
+	{
+		$this->setOption('callback', $callback);
+
+		return $this;
+	}
+
+	/**
+	 * Checks if a sensor is set to be required
+	 *
+	 * @return  boolean  True if asynchronous
+	 *
+	 * @since   12.3
+	 */
+	public function hasSensor()
+	{
+		return $this->getOption('sensor') === null ? false : $this->getOption('sensor');
+	}
+
+	/**
+	 * Require access to sensor data
+	 *
+	 * @return  JGoogleEmbedMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function useSensor()
+	{
+		$this->setOption('sensor', true);
+
+		return $this;
+	}
+
+	/**
+	 * Don't require access to sensor data
+	 *
+	 * @return  JGoogleEmbedAMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function noSensor()
+	{
+		$this->setOption('sensor', false);
+
+		return $this;
+	}
+
+	/**
+	 * Checks how the script should be loaded
+	 *
+	 * @return  string  Autoload type (onload, jquery, mootools, or false)
+	 *
+	 * @since   12.3
+	 */
+	public function getAutoload()
+	{
+		return $this->getOption('autoload') ? $this->getOption('autoload') : 'false';
+	}
+
+	/**
+	 * Automatically add the callback to the window
+	 *
+	 * @param   string  $type  The method to add the callback (options are onload, jquery, mootools, and false)
+	 *
+	 * @return  JGoogleEmbedAMaps  The object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setAutoload($type = 'onload')
+	{
+		$this->setOption('autoload', $type);
+
+		return $this;
+	}
+
+	/**
+	 * Get code to load Google Maps javascript
+	 *
+	 * @return  string  Javascript code
+	 *
+	 * @since   12.3
+	 */
+	public function getHeader()
+	{
+		$zoom = $this->getZoom();
+		$center = $this->getCenter();
+		$maptype = $this->getMapType();
+		$id = $this->getMapId();
+		$scheme = $this->isSecure() ? 'https' : 'http';
+		$key = $this->getKey();
+		$sensor = $this->hasSensor() ? 'true' : 'false';
+
+		$setup = 'var mapOptions = {';
+		$setup .= "zoom: {$zoom},";
+		$setup .= "center: new google.maps.LatLng({$center[0]},{$center[1]}),";
+		$setup .= "mapTypeId: google.maps.MapTypeId.{$maptype},";
+		$setup .= substr(json_encode($this->getAdditionalMapOptions()), 1, -1);
+		$setup .= '};';
+		$setup .= "var map = new google.maps.Map(document.getElementById('{$id}'), mapOptions);";
+
+		$events = $this->listEventHandlers();
+
+		if (isset($events) && count($events))
+		{
+			foreach ($events as $type => $handler)
+			{
+				$setup .= "google.maps.event.addListener(map, '{$type}', {$handler});";
+			}
+		}
+
+		$markers = $this->listMarkers();
+
+		if (isset($markers) && count($markers))
+		{
+			$setup .= 'var marker;';
+
+			foreach ($markers as $marker)
+			{
+				$loc = $marker['loc'];
+				$title = $marker['title'];
+				$options = $marker['options'];
+
+				$setup .= 'marker = new google.maps.Marker({';
+				$setup .= "position: new google.maps.LatLng({$loc[0]},{$loc[1]}),";
+				$setup .= 'map: map,';
+				$setup .= "title:'{$title}',";
+				$setup .= substr(json_encode($options), 1, -1);
+				$setup .= '});';
+
+				if (isset($marker['events']) && is_array($marker['events']))
+				{
+					foreach ($marker['events'] as $type => $handler)
+					{
+						$setup .= 'google.maps.event.addListener(marker, "' . $type . '", ' . $handler . ');';
+					}
+				}
+			}
+		}
+
+		$setup .= $this->getAdditionalJavascript();
+
+		if ($this->isAsync())
+		{
+			$asynccallback = $this->getAsyncCallback();
+
+			$output = '<script type="text/javascript">';
+			$output .= "function {$asynccallback}() {";
+			$output .= $setup;
+			$output .= '}';
+
+			$onload = 'function() {';
+			$onload .= 'var script = document.createElement("script");';
+			$onload .= 'script.type = "text/javascript";';
+			$onload .= "script.src = '{$scheme}://maps.googleapis.com/maps/api/js?" . ($key ? "key={$key}&" : '')
+				. "sensor={$sensor}&callback={$asynccallback}';";
+			$onload .= 'document.body.appendChild(script);';
+			$onload .= '}';
+		}
+		else
+		{
+			$output = "<script type='text/javascript' src='{$scheme}://maps.googleapis.com/maps/api/js?" . ($key ? "key={$key}&" : '') . "sensor={$sensor}'>";
+			$output .= '</script>';
+			$output .= '<script type="text/javascript">';
+
+			$onload = 'function() {';
+			$onload .= $setup;
+			$onload .= '}';
+		}
+
+		switch ($this->getAutoload())
+		{
+			case 'onload':
+			$output .= "window.onload={$onload};";
+			break;
+
+			case 'jquery':
+			$output .= "jQuery(document).ready({$onload});";
+			break;
+
+			case 'mootools':
+			$output .= "window.addEvent('domready',{$onload});";
+			break;
+		}
+
+		$output .= '</script>';
+
+		return $output;
+	}
+
+	/**
+	 * Method to retrieve the div that the map is loaded into
+	 *
+	 * @return  string  The body
+	 *
+	 * @since   12.3
+	 */
+	public function getBody()
+	{
+		$id = $this->getMapId();
+		$class = $this->getMapClass();
+		$style = $this->getMapStyle();
+
+		$output = "<div id='{$id}'";
+
+		if (!empty($class))
+		{
+			$output .= " class='{$class}'";
+		}
+
+		if (!empty($style))
+		{
+			$output .= " style='{$style}'";
+		}
+
+		$output .= '></div>';
+
+		return $output;
+	}
+
+	/**
+	 * Method to get the location information back from an address
+	 *
+	 * @param   string  $address  The address to geocode
+	 *
+	 * @return  array  An array containing Google's geocode data
+	 *
+	 * @since   12.3
+	 */
+	public function geocodeAddress($address)
+	{
+		$uri = JUri::getInstance('https://maps.googleapis.com/maps/api/geocode/json');
+
+		$uri->setVar('address', urlencode($address));
+
+		if (($key = $this->getKey()))
+		{
+			$uri->setVar('key', $key);
+		}
+
+		$response = $this->http->get($uri->toString());
+
+		if ($response->code < 200 || $response->code >= 300)
+		{
+			throw new RuntimeException('Error code ' . $response->code . ' received geocoding address: ' . $response->body . '.');
+		}
+
+		$data = json_decode($response->body, true);
+
+		if (!$data)
+		{
+			throw new RuntimeException('Invalid json received geocoding address: ' . $response->body . '.');
+		}
+
+		if ($data['status'] != 'OK')
+		{
+			if (!empty($data['error_message']))
+			{
+				throw new RuntimeException($data['error_message']);
+			}
+
+			return;
+		}
+
+		return $data['results'][0];
+	}
+}
diff --git a/core/libraries/joomla/google/google.php b/core/libraries/joomla/google/google.php
new file mode 100644
index 00000000..bf19ad1a
--- /dev/null
+++ b/core/libraries/joomla/google/google.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Google
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with the Google APIs.
+ *
+ * @property-read  JGoogleData    $data    Google API object for data.
+ * @property-read  JGoogleEmbed   $embed   Google API object for embed generation.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/google` package via Composer instead
+ */
+class JGoogle
+{
+	/**
+	 * @var    Registry  Options for the Google object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JGoogleAuth  The authentication client object to use in sending authenticated HTTP requests.
+	 * @since  12.3
+	 */
+	protected $auth;
+
+	/**
+	 * @var    JGoogleData  Google API object for data request.
+	 * @since  12.3
+	 */
+	protected $data;
+
+	/**
+	 * @var    JGoogleEmbed  Google API object for embed generation.
+	 * @since  12.3
+	 */
+	protected $embed;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry     $options  Google options object.
+	 * @param   JGoogleAuth  $auth     The authentication client object.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JGoogleAuth $auth = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->auth  = isset($auth) ? $auth : new JGoogleAuthOauth2($this->options);
+	}
+
+	/**
+	 * Method to create JGoogleData objects
+	 *
+	 * @param   string       $name     Name of property to retrieve
+	 * @param   Registry     $options  Google options object.
+	 * @param   JGoogleAuth  $auth     The authentication client object.
+	 *
+	 * @return  JGoogleData  Google data API object.
+	 *
+	 * @since   12.3
+	 */
+	public function data($name, $options = null, $auth = null)
+	{
+		if ($this->options && !$options)
+		{
+			$options = $this->options;
+		}
+
+		if ($this->auth && !$auth)
+		{
+			$auth = $this->auth;
+		}
+
+		switch ($name)
+		{
+			case 'plus':
+			case 'Plus':
+				return new JGoogleDataPlus($options, $auth);
+			case 'picasa':
+			case 'Picasa':
+				return new JGoogleDataPicasa($options, $auth);
+			case 'adsense':
+			case 'Adsense':
+				return new JGoogleDataAdsense($options, $auth);
+			case 'calendar':
+			case 'Calendar':
+				return new JGoogleDataCalendar($options, $auth);
+			default:
+				return;
+		}
+	}
+
+	/**
+	 * Method to create JGoogleEmbed objects
+	 *
+	 * @param   string    $name     Name of property to retrieve
+	 * @param   Registry  $options  Google options object.
+	 *
+	 * @return  JGoogleEmbed  Google embed API object.
+	 *
+	 * @since   12.3
+	 */
+	public function embed($name, $options = null)
+	{
+		if ($this->options && !$options)
+		{
+			$options = $this->options;
+		}
+
+		switch ($name)
+		{
+			case 'maps':
+			case 'Maps':
+				return new JGoogleEmbedMaps($options);
+			case 'analytics':
+			case 'Analytics':
+				return new JGoogleEmbedAnalytics($options);
+			default:
+				return;
+		}
+	}
+
+	/**
+	 * Get an option from the JGoogle instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JGoogle instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JGoogle  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/grid/grid.php b/core/libraries/joomla/grid/grid.php
new file mode 100644
index 00000000..d424fafb
--- /dev/null
+++ b/core/libraries/joomla/grid/grid.php
@@ -0,0 +1,480 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Grid
+
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JGrid class to dynamically generate HTML tables
+ *
+ * @since       11.3
+ * @deprecated  4.0 This class will be removed without any replacement
+ */
+class JGrid
+{
+	/**
+	 * Array of columns
+	 * @var array
+	 * @since 11.3
+	 */
+	protected $columns = array();
+
+	/**
+	 * Current active row
+	 * @var int
+	 * @since 11.3
+	 */
+	protected $activeRow = 0;
+
+	/**
+	 * Rows of the table (including header and footer rows)
+	 * @var array
+	 * @since 11.3
+	 */
+	protected $rows = array();
+
+	/**
+	 * Header and Footer row-IDs
+	 * @var array
+	 * @since 11.3
+	 */
+	protected $specialRows = array('header' => array(), 'footer' => array());
+
+	/**
+	 * Associative array of attributes for the table-tag
+	 * @var array
+	 * @since 11.3
+	 */
+	protected $options;
+
+	/**
+	 * Constructor for a JGrid object
+	 *
+	 * @param   array  $options  Associative array of attributes for the table-tag
+	 *
+	 * @since 11.3
+	 */
+	public function __construct($options = array())
+	{
+		$this->setTableOptions($options, true);
+	}
+
+	/**
+	 * Magic function to render this object as a table.
+	 *
+	 * @return  string
+	 *
+	 * @since 11.3
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Method to set the attributes for a table-tag
+	 *
+	 * @param   array  $options  Associative array of attributes for the table-tag
+	 * @param   bool   $replace  Replace possibly existing attributes
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function setTableOptions($options = array(), $replace = false)
+	{
+		if ($replace)
+		{
+			$this->options = $options;
+		}
+		else
+		{
+			$this->options = array_merge($this->options, $options);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the Attributes of the current table
+	 *
+	 * @return  array Associative array of attributes
+	 *
+	 * @since 11.3
+	 */
+	public function getTableOptions()
+	{
+		return $this->options;
+	}
+
+	/**
+	 * Add new column name to process
+	 *
+	 * @param   string  $name  Internal column name
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function addColumn($name)
+	{
+		$this->columns[] = $name;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the list of internal columns
+	 *
+	 * @return  array List of internal columns
+	 *
+	 * @since 11.3
+	 */
+	public function getColumns()
+	{
+		return $this->columns;
+	}
+
+	/**
+	 * Delete column by name
+	 *
+	 * @param   string  $name  Name of the column to be deleted
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function deleteColumn($name)
+	{
+		$index = array_search($name, $this->columns);
+
+		if ($index !== false)
+		{
+			unset($this->columns[$index]);
+			$this->columns = array_values($this->columns);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to set a whole range of columns at once
+	 * This can be used to re-order the columns, too
+	 *
+	 * @param   array  $columns  List of internal column names
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function setColumns($columns)
+	{
+		$this->columns = array_values($columns);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a row to the table and sets the currently
+	 * active row to the new row
+	 *
+	 * @param   array  $options  Associative array of attributes for the row
+	 * @param   int    $special  1 for a new row in the header, 2 for a new row in the footer
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function addRow($options = array(), $special = false)
+	{
+		$this->rows[]['_row'] = $options;
+		$this->activeRow = count($this->rows) - 1;
+
+		if ($special)
+		{
+			if ($special === 1)
+			{
+				$this->specialRows['header'][] = $this->activeRow;
+			}
+			else
+			{
+				$this->specialRows['footer'][] = $this->activeRow;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the attributes of the currently active row
+	 *
+	 * @return array Associative array of attributes
+	 *
+	 * @since 11.3
+	 */
+	public function getRowOptions()
+	{
+		return $this->rows[$this->activeRow]['_row'];
+	}
+
+	/**
+	 * Method to set the attributes of the currently active row
+	 *
+	 * @param   array  $options  Associative array of attributes
+	 *
+	 * @return JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function setRowOptions($options)
+	{
+		$this->rows[$this->activeRow]['_row'] = $options;
+
+		return $this;
+	}
+
+	/**
+	 * Get the currently active row ID
+	 *
+	 * @return  int ID of the currently active row
+	 *
+	 * @since 11.3
+	 */
+	public function getActiveRow()
+	{
+		return $this->activeRow;
+	}
+
+	/**
+	 * Set the currently active row
+	 *
+	 * @param   int  $id  ID of the row to be set to current
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function setActiveRow($id)
+	{
+		$this->activeRow = (int) $id;
+
+		return $this;
+	}
+
+	/**
+	 * Set cell content for a specific column for the
+	 * currently active row
+	 *
+	 * @param   string  $name     Name of the column
+	 * @param   string  $content  Content for the cell
+	 * @param   array   $option   Associative array of attributes for the td-element
+	 * @param   bool    $replace  If false, the content is appended to the current content of the cell
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function setRowCell($name, $content, $option = array(), $replace = true)
+	{
+		if ($replace || !isset($this->rows[$this->activeRow][$name]))
+		{
+			$cell = new stdClass;
+			$cell->options = $option;
+			$cell->content = $content;
+			$this->rows[$this->activeRow][$name] = $cell;
+		}
+		else
+		{
+			$this->rows[$this->activeRow][$name]->content .= $content;
+			$this->rows[$this->activeRow][$name]->options = $option;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get all data for a row
+	 *
+	 * @param   int  $id  ID of the row to return
+	 *
+	 * @return  array Array of columns of a table row
+	 *
+	 * @since 11.3
+	 */
+	public function getRow($id = false)
+	{
+		if ($id === false)
+		{
+			$id = $this->activeRow;
+		}
+
+		if (isset($this->rows[(int) $id]))
+		{
+			return $this->rows[(int) $id];
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Get the IDs of all rows in the table
+	 *
+	 * @param   int  $special  false for the standard rows, 1 for the header rows, 2 for the footer rows
+	 *
+	 * @return  array Array of IDs
+	 *
+	 * @since 11.3
+	 */
+	public function getRows($special = false)
+	{
+		if ($special)
+		{
+			if ($special === 1)
+			{
+				return $this->specialRows['header'];
+			}
+			else
+			{
+				return $this->specialRows['footer'];
+			}
+		}
+
+		return array_diff(array_keys($this->rows), array_merge($this->specialRows['header'], $this->specialRows['footer']));
+	}
+
+	/**
+	 * Delete a row from the object
+	 *
+	 * @param   int  $id  ID of the row to be deleted
+	 *
+	 * @return  JGrid This object for chaining
+	 *
+	 * @since 11.3
+	 */
+	public function deleteRow($id)
+	{
+		unset($this->rows[$id]);
+
+		if (in_array($id, $this->specialRows['header']))
+		{
+			unset($this->specialRows['header'][array_search($id, $this->specialRows['header'])]);
+		}
+
+		if (in_array($id, $this->specialRows['footer']))
+		{
+			unset($this->specialRows['footer'][array_search($id, $this->specialRows['footer'])]);
+		}
+
+		if ($this->activeRow == $id)
+		{
+			end($this->rows);
+			$this->activeRow = key($this->rows);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Render the HTML table
+	 *
+	 * @return  string The rendered HTML table
+	 *
+	 * @since 11.3
+	 */
+	public function toString()
+	{
+		$output = array();
+		$output[] = '<table' . $this->renderAttributes($this->getTableOptions()) . '>';
+
+		if (count($this->specialRows['header']))
+		{
+			$output[] = $this->renderArea($this->specialRows['header'], 'thead', 'th');
+		}
+
+		if (count($this->specialRows['footer']))
+		{
+			$output[] = $this->renderArea($this->specialRows['footer'], 'tfoot');
+		}
+
+		$ids = array_diff(array_keys($this->rows), array_merge($this->specialRows['header'], $this->specialRows['footer']));
+
+		if (count($ids))
+		{
+			$output[] = $this->renderArea($ids);
+		}
+
+		$output[] = '</table>';
+
+		return implode('', $output);
+	}
+
+	/**
+	 * Render an area of the table
+	 *
+	 * @param   array   $ids   IDs of the rows to render
+	 * @param   string  $area  Name of the area to render. Valid: tbody, tfoot, thead
+	 * @param   string  $cell  Name of the cell to render. Valid: td, th
+	 *
+	 * @return string The rendered table area
+	 *
+	 * @since 11.3
+	 */
+	protected function renderArea($ids, $area = 'tbody', $cell = 'td')
+	{
+		$output = array();
+		$output[] = '<' . $area . ">\n";
+
+		foreach ($ids as $id)
+		{
+			$output[] = "\t<tr" . $this->renderAttributes($this->rows[$id]['_row']) . ">\n";
+
+			foreach ($this->getColumns() as $name)
+			{
+				if (isset($this->rows[$id][$name]))
+				{
+					$column = $this->rows[$id][$name];
+					$output[] = "\t\t<" . $cell . $this->renderAttributes($column->options) . '>' . $column->content . '</' . $cell . ">\n";
+				}
+			}
+
+			$output[] = "\t</tr>\n";
+		}
+
+		$output[] = '</' . $area . '>';
+
+		return implode('', $output);
+	}
+
+	/**
+	 * Renders an HTML attribute from an associative array
+	 *
+	 * @param   array  $attributes  Associative array of attributes
+	 *
+	 * @return  string The HTML attribute string
+	 *
+	 * @since 11.3
+	 */
+	protected function renderAttributes($attributes)
+	{
+		if (count((array) $attributes) == 0)
+		{
+			return '';
+		}
+
+		$return = array();
+
+		foreach ($attributes as $key => $option)
+		{
+			$return[] = $key . '="' . $option . '"';
+		}
+
+		return ' ' . implode(' ', $return);
+	}
+}
diff --git a/core/libraries/joomla/keychain/keychain.php b/core/libraries/joomla/keychain/keychain.php
new file mode 100644
index 00000000..12f20cf6
--- /dev/null
+++ b/core/libraries/joomla/keychain/keychain.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Keychain
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Keychain Class
+ *
+ * @since       12.3
+ * @deprecated  4.0  Deprecated without replacement
+ */
+class JKeychain extends \Joomla\Registry\Registry
+{
+	/**
+	 * @var    string  Method to use for encryption.
+	 * @since  12.3
+	 */
+	public $method = 'aes-128-cbc';
+
+	/**
+	 * @var    string  Initialisation vector for encryption method.
+	 * @since  12.3
+	 */
+	public $iv = '1234567890123456';
+
+	/**
+	 * Create a passphrase file
+	 *
+	 * @param   string  $passphrase            The passphrase to store in the passphrase file.
+	 * @param   string  $passphraseFile        Path to the passphrase file to create.
+	 * @param   string  $privateKeyFile        Path to the private key file to encrypt the passphrase file.
+	 * @param   string  $privateKeyPassphrase  The passphrase for the private key.
+	 *
+	 * @return  boolean  Result of writing the passphrase file to disk.
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function createPassphraseFile($passphrase, $passphraseFile, $privateKeyFile, $privateKeyPassphrase)
+	{
+		$privateKey = openssl_get_privatekey(file_get_contents($privateKeyFile), $privateKeyPassphrase);
+
+		if (!$privateKey)
+		{
+			throw new RuntimeException('Failed to load private key.');
+		}
+
+		$crypted = '';
+
+		if (!openssl_private_encrypt($passphrase, $crypted, $privateKey))
+		{
+			throw new RuntimeException('Failed to encrypt data using private key.');
+		}
+
+		return file_put_contents($passphraseFile, $crypted);
+	}
+
+	/**
+	 * Delete a registry value (very simple method)
+	 *
+	 * @param   string  $path  Registry Path (e.g. joomla.content.showauthor)
+	 *
+	 * @return  mixed  Value of old value or boolean false if operation failed
+	 *
+	 * @since   12.3
+	 */
+	public function deleteValue($path)
+	{
+		$result = null;
+
+		// Explode the registry path into an array
+		$nodes = explode('.', $path);
+
+		if ($nodes)
+		{
+			// Initialize the current node to be the registry root.
+			$node = $this->data;
+
+			// Traverse the registry to find the correct node for the result.
+			for ($i = 0, $n = count($nodes) - 1; $i < $n; $i++)
+			{
+				if (!isset($node->{$nodes[$i]}) && ($i != $n))
+				{
+					$node->{$nodes[$i]} = new stdClass;
+				}
+
+				$node = $node->{$nodes[$i]};
+			}
+
+			// Get the old value if exists so we can return it
+			$result = $node->{$nodes[$i]};
+			unset($node->{$nodes[$i]});
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Load a keychain file into this object.
+	 *
+	 * @param   string  $keychainFile    Path to the keychain file.
+	 * @param   string  $passphraseFile  The path to the passphrase file to decript the keychain.
+	 * @param   string  $publicKeyFile   The file containing the public key to decrypt the passphrase file.
+	 *
+	 * @return  boolean  Result of loading the object.
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function loadKeychain($keychainFile, $passphraseFile, $publicKeyFile)
+	{
+		if (!file_exists($keychainFile))
+		{
+			throw new RuntimeException('Attempting to load non-existent keychain file');
+		}
+
+		$passphrase = $this->getPassphraseFromFile($passphraseFile, $publicKeyFile);
+
+		$cleartext = openssl_decrypt(file_get_contents($keychainFile), $this->method, $passphrase, true, $this->iv);
+
+		if ($cleartext === false)
+		{
+			throw new RuntimeException('Failed to decrypt keychain file');
+		}
+
+		return $this->loadObject(json_decode($cleartext));
+	}
+
+	/**
+	 * Save this keychain to a file.
+	 *
+	 * @param   string  $keychainFile    The path to the keychain file.
+	 * @param   string  $passphraseFile  The path to the passphrase file to encrypt the keychain.
+	 * @param   string  $publicKeyFile   The file containing the public key to decrypt the passphrase file.
+	 *
+	 * @return  boolean  Result of storing the file.
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function saveKeychain($keychainFile, $passphraseFile, $publicKeyFile)
+	{
+		$passphrase = $this->getPassphraseFromFile($passphraseFile, $publicKeyFile);
+		$data = $this->toString('JSON');
+
+		$encrypted = @openssl_encrypt($data, $this->method, $passphrase, true, $this->iv);
+
+		if ($encrypted === false)
+		{
+			throw new RuntimeException('Unable to encrypt keychain');
+		}
+
+		return file_put_contents($keychainFile, $encrypted);
+	}
+
+	/**
+	 * Get the passphrase for this keychain
+	 *
+	 * @param   string  $passphraseFile  The file containing the passphrase to encrypt and decrypt.
+	 * @param   string  $publicKeyFile   The file containing the public key to decrypt the passphrase file.
+	 *
+	 * @return  string  The passphrase in from passphraseFile
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	protected function getPassphraseFromFile($passphraseFile, $publicKeyFile)
+	{
+		if (!file_exists($publicKeyFile))
+		{
+			throw new RuntimeException('Missing public key file');
+		}
+
+		$publicKey = openssl_get_publickey(file_get_contents($publicKeyFile));
+
+		if (!$publicKey)
+		{
+			throw new RuntimeException('Failed to load public key.');
+		}
+
+		if (!file_exists($passphraseFile))
+		{
+			throw new RuntimeException('Missing passphrase file');
+		}
+
+		$passphrase = '';
+
+		if (!openssl_public_decrypt(file_get_contents($passphraseFile), $passphrase, $publicKey))
+		{
+			throw new RuntimeException('Failed to decrypt passphrase file');
+		}
+
+		return $passphrase;
+	}
+}
diff --git a/core/libraries/joomla/linkedin/communications.php b/core/libraries/joomla/linkedin/communications.php
new file mode 100644
index 00000000..50146325
--- /dev/null
+++ b/core/libraries/joomla/linkedin/communications.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Linkedin API Social Communications class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+class JLinkedinCommunications extends JLinkedinObject
+{
+	/**
+	 * Method used to invite people.
+	 *
+	 * @param   string  $email       A string containing email of the recipient.
+	 * @param   string  $first_name  A string containing frist name of the recipient.
+	 * @param   string  $last_name   A string containing last name of the recipient.
+	 * @param   string  $subject     The subject of the message that will be sent to the recipient
+	 * @param   string  $body        A text of the message.
+	 * @param   string  $connection  Only connecting as a 'friend' is supported presently.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function inviteByEmail($email, $first_name, $last_name, $subject, $body, $connection = 'friend')
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base.
+		$base = '/v1/people/~/mailbox';
+
+		// Build the xml.
+		$xml = '<mailbox-item>
+				  <recipients>
+				  	<recipient>
+						<person path="/people/email=' . $email . '">
+							<first-name>' . $first_name . '</first-name>
+							<last-name>' . $last_name . '</last-name>
+						</person>
+					</recipient>
+				</recipients>
+				<subject>' . $subject . '</subject>
+				<body>' . $body . '</body>
+				<item-content>
+				    <invitation-request>
+				      <connect-type>' . $connection . '</connect-type>
+				    </invitation-request>
+				</item-content>
+			 </mailbox-item>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method used to invite people.
+	 *
+	 * @param   string  $id          Member id.
+	 * @param   string  $first_name  A string containing frist name of the recipient.
+	 * @param   string  $last_name   A string containing last name of the recipient.
+	 * @param   string  $subject     The subject of the message that will be sent to the recipient
+	 * @param   string  $body        A text of the message.
+	 * @param   string  $connection  Only connecting as a 'friend' is supported presently.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function inviteById($id, $first_name, $last_name, $subject, $body, $connection = 'friend')
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base for people search.
+		$base = '/v1/people-search:(people:(api-standard-profile-request))';
+
+		$data['format'] = 'json';
+		$data['first-name'] = $first_name;
+		$data['last-name'] = $last_name;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		if (strpos($response->body, 'apiStandardProfileRequest') === false)
+		{
+			throw new RuntimeException($response->body);
+		}
+
+		// Get header value.
+		$value = explode('"value": "', $response->body);
+		$value = explode('"', $value[1]);
+		$value = $value[0];
+
+		// Split on the colon character.
+		$value = explode(':', $value);
+		$name = $value[0];
+		$value = $value[1];
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base.
+		$base = '/v1/people/~/mailbox';
+
+		// Build the xml.
+		$xml = '<mailbox-item>
+				  <recipients>
+				  	<recipient>
+						<person path="/people/id=' . $id . '">
+						</person>
+					</recipient>
+				</recipients>
+				<subject>' . $subject . '</subject>
+				<body>' . $body . '</body>
+				<item-content>
+				    <invitation-request>
+				      <connect-type>' . $connection . '</connect-type>
+				      <authorization>
+				      	<name>' . $name . '</name>
+				        <value>' . $value . '</value>
+				      </authorization>
+				    </invitation-request>
+				</item-content>
+			 </mailbox-item>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method used to send messages via LinkedIn between two or more individuals connected to the member sending the message..
+	 *
+	 * @param   mixed   $recipient  A string containing the member id or an array of ids.
+	 * @param   string  $subject    The subject of the message that will be sent to the recipient
+	 * @param   string  $body       A text of the message.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function sendMessage($recipient, $subject, $body)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base.
+		$base = '/v1/people/~/mailbox';
+
+		// Build the xml.
+		$xml = '<mailbox-item>
+				  <recipients>';
+
+		if (is_array($recipient))
+		{
+			foreach ($recipient as $r)
+			{
+				$xml .= '<recipient>
+							<person path="/people/' . $r . '"/>
+						</recipient>';
+			}
+		}
+
+		$xml .= '</recipients>
+				 <subject>' . $subject . '</subject>
+				 <body>' . $body . '</body>
+				</mailbox-item>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+}
diff --git a/core/libraries/joomla/linkedin/companies.php b/core/libraries/joomla/linkedin/companies.php
new file mode 100644
index 00000000..35fc8923
--- /dev/null
+++ b/core/libraries/joomla/linkedin/companies.php
@@ -0,0 +1,480 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Linkedin API Companies class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+class JLinkedinCompanies extends JLinkedinObject
+{
+	/**
+	 * Method to retrieve companies using a company ID, a universal name, or an email domain.
+	 *
+	 * @param   integer  $id      The unique internal numeric company identifier.
+	 * @param   string   $name    The unique string identifier for a company.
+	 * @param   string   $domain  Company email domains.
+	 * @param   string   $fields  Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 * @throws  RuntimeException
+	 */
+	public function getCompanies($id = null, $name = null, $domain = null, $fields = null)
+	{
+		// At least one value is needed to retrieve data.
+		if ($id == null && $name == null && $domain == null)
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('You must specify a company ID, a universal name, or an email domain.');
+		}
+
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/companies';
+
+		if ($id && $name)
+		{
+			$base .= '::(' . $id . ',universal-name=' . $name . ')';
+		}
+		elseif ($id)
+		{
+			$base .= '/' . $id;
+		}
+		elseif ($name)
+		{
+			$base .= '/universal-name=' . $name;
+		}
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		if ($domain)
+		{
+			$data['email-domain'] = $domain;
+		}
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to read shares for a particular company .
+	 *
+	 * @param   string   $id     The unique company identifier.
+	 * @param   string   $type   Any valid Company Update Type from the table: https://developer.linkedin.com/reading-company-updates.
+	 * @param   integer  $count  Maximum number of updates to return.
+	 * @param   integer  $start  The offset by which to start Network Update pagination.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getUpdates($id, $type = null, $count = 0, $start = 0)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/companies/' . $id . '/updates';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Check if type is specified.
+		if ($type)
+		{
+			$data['event-type'] = $type;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to search across company pages.
+	 *
+	 * @param   string   $fields    Request fields beyond the default ones.
+	 * @param   string   $keywords  Members who have all the keywords anywhere in their profile.
+	 * @param   boolean  $hq        Matching companies by the headquarters location. When this is set to "true" and a location facet is used,
+	 * 								this restricts returned companies to only those whose headquarters resides in the specified location.
+	 * @param   string   $facets    Facet buckets to return, e.g. location.
+	 * @param   array    $facet     Array of facet values to search over. Contains values for location, industry, network, company-size,
+	 * 								num-followers-range and fortune, in exactly this order, null must be specified for an element if no value.
+	 * @param   integer  $start     Starting location within the result set for paginated returns.
+	 * @param   integer  $count     The number of results returned.
+	 * @param   string   $sort      Controls the search result order. There are four options: relevance, relationship,
+	 * 								followers and company-size.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function search($fields = null, $keywords = null, $hq = false, $facets = null, $facet = null, $start = 0, $count = 0, $sort = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/company-search';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if keywords is specified.
+		if ($keywords)
+		{
+			$data['keywords'] = $keywords;
+		}
+
+		// Check if hq is true.
+		if ($hq)
+		{
+			$data['hq-only'] = $hq;
+		}
+
+		// Check if facets is specified.
+		if ($facets)
+		{
+			$data['facets'] = $facets;
+		}
+
+		// Check if facet is specified.
+		if ($facet)
+		{
+			$data['facet'] = array();
+
+			for ($i = 0, $iMax = count($facet); $i < $iMax; $i++)
+			{
+				if ($facet[$i])
+				{
+					if ($i == 0)
+					{
+						$data['facet'][] = 'location,' . $facet[$i];
+					}
+
+					if ($i == 1)
+					{
+						$data['facet'][] = 'industry,' . $facet[$i];
+					}
+
+					if ($i == 2)
+					{
+						$data['facet'][] = 'network,' . $facet[$i];
+					}
+
+					if ($i == 3)
+					{
+						$data['facet'][] = 'company-size,' . $facet[$i];
+					}
+
+					if ($i == 4)
+					{
+						$data['facet'][] = 'num-followers-range,' . $facet[$i];
+					}
+
+					if ($i == 5)
+					{
+						$data['facet'][] = 'fortune,' . $facet[$i];
+					}
+				}
+			}
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if sort is specified.
+		if ($sort)
+		{
+			$data['sort'] = $sort;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of companies the current member is following.
+	 *
+	 * @param   string  $fields  Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getFollowed($fields = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/following/companies';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to follow a company.
+	 *
+	 * @param   string  $id  The unique identifier for a company.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function follow($id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/following/companies';
+
+		// Build xml.
+		$xml = '<company><id>' . $id . '</id></company>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to unfollow a company.
+	 *
+	 * @param   string  $id  The unique identifier for a company.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function unfollow($id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/people/~/following/companies/id=' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters);
+
+		return $response;
+	}
+
+	/**
+	 * Method to get a collection of suggested companies for the current user.
+	 *
+	 * @param   string   $fields  Request fields beyond the default ones.
+	 * @param   integer  $start   Starting location within the result set for paginated returns.
+	 * @param   integer  $count   The number of results returned.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getSuggested($fields = null, $start = 0, $count = 0)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/suggestions/to-follow/companies';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a collection of suggested companies for the current user.
+	 *
+	 * @param   string   $id      The unique identifier for a company.
+	 * @param   string   $fields  Request fields beyond the default ones.
+	 * @param   integer  $start   Starting location within the result set for paginated returns.
+	 * @param   integer  $count   The number of results returned.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getProducts($id, $fields = null, $start = 0, $count = 0)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/companies/' . $id . '/products';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/linkedin/groups.php b/core/libraries/joomla/linkedin/groups.php
new file mode 100644
index 00000000..e7c6f352
--- /dev/null
+++ b/core/libraries/joomla/linkedin/groups.php
@@ -0,0 +1,1096 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Linkedin API Groups class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+class JLinkedinGroups extends JLinkedinObject
+{
+	/**
+	 * Method to get a group.
+	 *
+	 * @param   string   $id      The unique identifier for a group.
+	 * @param   string   $fields  Request fields beyond the default ones.
+	 * @param   integer  $start   Starting location within the result set for paginated returns.
+	 * @param   integer  $count   The number of results returned.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getGroup($id, $fields = null, $start = 0, $count = 5)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/groups/' . $id;
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count != 5)
+		{
+			$data['count'] = $count;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to find the groups a member belongs to.
+	 *
+	 * @param   string   $id                The unique identifier for a user.
+	 * @param   string   $fields            Request fields beyond the default ones.
+	 * @param   integer  $start             Starting location within the result set for paginated returns.
+	 * @param   integer  $count             The number of results returned.
+	 * @param   string   $membership_state  The state of the caller’s membership to the specified group.
+	 * 										Values are: non-member, awaiting-confirmation, awaiting-parent-group-confirmation, member, moderator, manager, owner.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getMemberships($id = null, $fields = null, $start = 0, $count = 5, $membership_state = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if id is specified.
+		if ($id)
+		{
+			$base .= $id . '/group-memberships';
+		}
+		else
+		{
+			$base .= '~/group-memberships';
+		}
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count != 5)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if membership_state is specified.
+		if ($membership_state)
+		{
+			$data['membership-state'] = $membership_state;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to find the groups a member belongs to.
+	 *
+	 * @param   string   $person_id  The unique identifier for a user.
+	 * @param   string   $group_id   The unique identifier for a group.
+	 * @param   string   $fields     Request fields beyond the default ones.
+	 * @param   integer  $start      Starting location within the result set for paginated returns.
+	 * @param   integer  $count      The number of results returned.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getSettings($person_id = null, $group_id = null, $fields = null, $start = 0, $count = 5)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if person_id is specified.
+		if ($person_id)
+		{
+			$base .= $person_id . '/group-memberships';
+		}
+		else
+		{
+			$base .= '~/group-memberships';
+		}
+
+		// Check if group_id is specified.
+		if ($group_id)
+		{
+			$base .= '/' . $group_id;
+		}
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count != 5)
+		{
+			$data['count'] = $count;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to change a groups settings.
+	 *
+	 * @param   string   $group_id          The unique identifier for a group.
+	 * @param   boolean  $show_logo         Show group logo in profile.
+	 * @param   string   $digest_frequency  Email digest frequency.
+	 * @param   boolean  $announcements     Email announcements from managers.
+	 * @param   boolean  $allow_messages    Allow messages from members.
+	 * @param   boolean  $new_post          Email for every new post.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function changeSettings($group_id, $show_logo = null, $digest_frequency = null, $announcements = null,
+		$allow_messages = null, $new_post = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/group-memberships/' . $group_id;
+
+		// Build xml.
+		$xml = '<group-membership>';
+
+		if (!is_null($show_logo))
+		{
+			$xml .= '<show-group-logo-in-profile>' . $this->booleanToString($show_logo) . '</show-group-logo-in-profile>';
+		}
+
+		if ($digest_frequency)
+		{
+			$xml .= '<email-digest-frequency><code>' . $digest_frequency . '</code></email-digest-frequency>';
+		}
+
+		if (!is_null($announcements))
+		{
+			$xml .= '<email-announcements-from-managers>' . $this->booleanToString($announcements) . '</email-announcements-from-managers>';
+		}
+
+		if (!is_null($allow_messages))
+		{
+			$xml .= '<allow-messages-from-members>' . $this->booleanToString($allow_messages) . '</allow-messages-from-members>';
+		}
+
+		if (!is_null($new_post))
+		{
+			$xml .= '<email-for-every-new-post>' . $this->booleanToString($new_post) . '</email-for-every-new-post>';
+		}
+
+		$xml .= '</group-membership>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to join a group.
+	 *
+	 * @param   string   $group_id          The unique identifier for a group.
+	 * @param   boolean  $show_logo         Show group logo in profile.
+	 * @param   string   $digest_frequency  Email digest frequency.
+	 * @param   boolean  $announcements     Email announcements from managers.
+	 * @param   boolean  $allow_messages    Allow messages from members.
+	 * @param   boolean  $new_post          Email for every new post.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function joinGroup($group_id, $show_logo = null, $digest_frequency = null, $announcements = null,
+		$allow_messages = null, $new_post = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/group-memberships';
+
+		// Build xml.
+		$xml = '<group-membership><group><id>' . $group_id . '</id></group>';
+
+		if (!is_null($show_logo))
+		{
+			$xml .= '<show-group-logo-in-profile>' . $this->booleanToString($show_logo) . '</show-group-logo-in-profile>';
+		}
+
+		if ($digest_frequency)
+		{
+			$xml .= '<email-digest-frequency><code>' . $digest_frequency . '</code></email-digest-frequency>';
+		}
+
+		if (!is_null($announcements))
+		{
+			$xml .= '<email-announcements-from-managers>' . $this->booleanToString($announcements) . '</email-announcements-from-managers>';
+		}
+
+		if (!is_null($allow_messages))
+		{
+			$xml .= '<allow-messages-from-members>' . $this->booleanToString($allow_messages) . '</allow-messages-from-members>';
+		}
+
+		if (!is_null($new_post))
+		{
+			$xml .= '<email-for-every-new-post>' . $this->booleanToString($new_post) . '</email-for-every-new-post>';
+		}
+
+		$xml .= '<membership-state><code>member</code></membership-state></group-membership>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to leave a group.
+	 *
+	 * @param   string  $group_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function leaveGroup($group_id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/people/~/group-memberships/' . $group_id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters);
+
+		return $response;
+	}
+
+	/**
+	 * Method to get dicussions for a group.
+	 *
+	 * @param   string   $id              The unique identifier for a group.
+	 * @param   string   $fields          Request fields beyond the default ones.
+	 * @param   integer  $start           Starting location within the result set for paginated returns.
+	 * @param   integer  $count           The number of results returned.
+	 * @param   string   $order           Sort order for posts. Valid for: recency, popularity.
+	 * @param   string   $category        Category of posts. Valid for: discussion
+	 * @param   string   $modified_since  Timestamp filter for posts created after the specified value.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getDiscussions($id, $fields = null, $start = 0, $count = 0, $order = null, $category = 'discussion', $modified_since = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/groups/' . $id . '/posts';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if order is specified.
+		if ($order)
+		{
+			$data['order'] = $order;
+		}
+
+		// Check if category is specified.
+		if ($category)
+		{
+			$data['category'] = $category;
+		}
+
+		// Check if modified_since is specified.
+		if ($modified_since)
+		{
+			$data['modified-since'] = $modified_since;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get posts a user started / participated in / follows for a group.
+	 *
+	 * @param   string   $group_id        The unique identifier for a group.
+	 * @param   string   $role            Filter for posts related to the caller. Valid for: creator, commenter, follower.
+	 * @param   string   $person_id       The unique identifier for a user.
+	 * @param   string   $fields          Request fields beyond the default ones.
+	 * @param   integer  $start           Starting location within the result set for paginated returns.
+	 * @param   integer  $count           The number of results returned.
+	 * @param   string   $order           Sort order for posts. Valid for: recency, popularity.
+	 * @param   string   $category        Category of posts. Valid for: discussion
+	 * @param   string   $modified_since  Timestamp filter for posts created after the specified value.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getUserPosts($group_id, $role, $person_id = null, $fields = null, $start = 0, $count = 0,
+		$order = null, $category = 'discussion', $modified_since = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if person_id is specified.
+		if ($person_id)
+		{
+			$base .= $person_id;
+		}
+		else
+		{
+			$base .= '~';
+		}
+
+		$base .= '/group-memberships/' . $group_id . '/posts';
+
+		$data['format'] = 'json';
+		$data['role'] = $role;
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if order is specified.
+		if ($order)
+		{
+			$data['order'] = $order;
+		}
+
+		// Check if category is specified.
+		if ($category)
+		{
+			$data['category'] = $category;
+		}
+
+		// Check if modified_since is specified.
+		if ($modified_since)
+		{
+			$data['modified-since'] = $modified_since;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to retrieve details about a post.
+	 *
+	 * @param   string  $post_id  The unique identifier for a post.
+	 * @param   string  $fields   Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getPost($post_id, $fields = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id;
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to retrieve all comments of a post.
+	 *
+	 * @param   string   $post_id  The unique identifier for a post.
+	 * @param   string   $fields   Request fields beyond the default ones.
+	 * @param   integer  $start    Starting location within the result set for paginated returns.
+	 * @param   integer  $count    The number of results returned.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getPostComments($post_id, $fields = null, $start = 0, $count = 0)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id . '/comments';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to retrieve all comments of a post.
+	 *
+	 * @param   string  $group_id  The unique identifier for a group.
+	 * @param   string  $title     Post title.
+	 * @param   string  $summary   Post summary.
+	 *
+	 * @return  string  The created post's id.
+	 *
+	 * @since   13.1
+	 */
+	public function createPost($group_id, $title, $summary)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/groups/' . $group_id . '/posts';
+
+		// Build xml.
+		$xml = '<post><title>' . $title . '</title><summary>' . $summary . '</summary></post>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		// Return the post id.
+		$response = explode('posts/', $response->headers['Location']);
+
+		return $response[1];
+	}
+
+	/**
+	 * Method to like or unlike a post.
+	 *
+	 * @param   string   $post_id  The unique identifier for a group.
+	 * @param   boolean  $like     True to like post, false otherwise.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	private function _likeUnlike($post_id, $like)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id . '/relation-to-viewer/is-liked';
+
+		// Build xml.
+		$xml = '<is-liked>' . $this->booleanToString($like) . '</is-liked>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method used to like a post.
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function likePost($post_id)
+	{
+		return $this->_likeUnlike($post_id, true);
+	}
+
+	/**
+	 * Method used to unlike a post.
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function unlikePost($post_id)
+	{
+		return $this->_likeUnlike($post_id, false);
+	}
+
+	/**
+	 * Method to follow or unfollow a post.
+	 *
+	 * @param   string   $post_id  The unique identifier for a group.
+	 * @param   boolean  $follow   True to like post, false otherwise.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	private function _followUnfollow($post_id, $follow)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id . '/relation-to-viewer/is-following';
+
+		// Build xml.
+		$xml = '<is-following>' . $this->booleanToString($follow) . '</is-following>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method used to follow a post.
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function followPost($post_id)
+	{
+		return $this->_followUnfollow($post_id, true);
+	}
+
+	/**
+	 * Method used to unfollow a post.
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function unfollowPost($post_id)
+	{
+		return $this->_followUnfollow($post_id, false);
+	}
+
+	/**
+	 * Method to flag a post as a Promotion or Job.
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 * @param   string  $flag     Flag as a 'promotion' or 'job'.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function flagPost($post_id, $flag)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id . '/category/code';
+
+		// Build xml.
+		$xml = '<code>' . $flag . '</code>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to delete a post if the current user is the creator or flag it as inappropriate otherwise.
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function deletePost($post_id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters);
+
+		return $response;
+	}
+
+	/**
+	 * Method to access the comments resource.
+	 *
+	 * @param   string  $comment_id  The unique identifier for a comment.
+	 * @param   string  $fields      Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getComment($comment_id, $fields = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/comments/' . $comment_id;
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to add a comment to a post
+	 *
+	 * @param   string  $post_id  The unique identifier for a group.
+	 * @param   string  $comment  The post comment's text.
+	 *
+	 * @return  string   The created comment's id.
+	 *
+	 * @since   13.1
+	 */
+	public function addComment($post_id, $comment)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/posts/' . $post_id . '/comments';
+
+		// Build xml.
+		$xml = '<comment><text>' . $comment . '</text></comment>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		// Return the comment id.
+		$response = explode('comments/', $response->headers['Location']);
+
+		return $response[1];
+	}
+
+	/**
+	 * Method to delete a comment if the current user is the creator or flag it as inappropriate otherwise.
+	 *
+	 * @param   string  $comment_id  The unique identifier for a group.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function deleteComment($comment_id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/comments/' . $comment_id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters);
+
+		return $response;
+	}
+
+	/**
+	 * Method to get suggested groups for a user.
+	 *
+	 * @param   string  $person_id  The unique identifier for a user.
+	 * @param   string  $fields     Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getSuggested($person_id = null, $fields = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if person_id is specified.
+		if ($person_id)
+		{
+			$base .= $person_id . '/suggestions/groups';
+		}
+		else
+		{
+			$base .= '~/suggestions/groups';
+		}
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to delete a group suggestion for a user.
+	 *
+	 * @param   string  $suggestion_id  The unique identifier for a suggestion.
+	 * @param   string  $person_id      The unique identifier for a user.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function deleteSuggestion($suggestion_id, $person_id = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if person_id is specified.
+		if ($person_id)
+		{
+			$base .= $person_id . '/suggestions/groups/' . $suggestion_id;
+		}
+		else
+		{
+			$base .= '~/suggestions/groups/' . $suggestion_id;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters);
+
+		return $response;
+	}
+}
diff --git a/core/libraries/joomla/linkedin/jobs.php b/core/libraries/joomla/linkedin/jobs.php
new file mode 100644
index 00000000..f91d258c
--- /dev/null
+++ b/core/libraries/joomla/linkedin/jobs.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Linkedin API Jobs class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+class JLinkedinJobs extends JLinkedinObject
+{
+	/**
+	 * Method to retrieve detailed information about a job.
+	 *
+	 * @param   integer  $id      The unique identifier for a job.
+	 * @param   string   $fields  Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getJob($id, $fields = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/jobs/' . $id;
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of bookmarked jobs for the current member.
+	 *
+	 * @param   string  $fields  Request fields beyond the default ones.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getBookmarked($fields = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/job-bookmarks';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to bookmark a job to the current user's account.
+	 *
+	 * @param   integer  $id  The unique identifier for a job.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function bookmark($id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/job-bookmarks';
+
+		// Build xml.
+		$xml = '<job-bookmark><job><id>' . $id . '</id></job></job-bookmark>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to delete a bookmark.
+	 *
+	 * @param   integer  $id  The unique identifier for a job.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function deleteBookmark($id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/people/~/job-bookmarks/' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters);
+
+		return $response;
+	}
+
+	/**
+	 * Method to retrieve job suggestions for the current user.
+	 *
+	 * @param   string   $fields  Request fields beyond the default ones.
+	 * @param   integer  $start   Starting location within the result set for paginated returns.
+	 * @param   integer  $count   The number of results returned.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getSuggested($fields = null, $start = 0, $count = 0)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/suggestions/job-suggestions';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to search across LinkedIn's job postings.
+	 *
+	 * @param   string   $fields        Request fields beyond the default ones.
+	 * @param   string   $keywords      Members who have all the keywords anywhere in their profile.
+	 * @param   string   $company_name  Jobs with a matching company name.
+	 * @param   string   $job_title     Matches jobs with the same job title.
+	 * @param   string   $country_code  Matches members with a location in a specific country. Values are defined in by ISO 3166 standard.
+	 * 									Country codes must be in all lower case.
+	 * @param   integer  $postal_code   Matches members centered around a Postal Code. Must be combined with the country-code parameter.
+	 * 									Not supported for all countries.
+	 * @param   integer  $distance      Matches members within a distance from a central point. This is measured in miles.
+	 * @param   string   $facets        Facet buckets to return, e.g. location.
+	 * @param   array    $facet         Array of facet values to search over. Contains values for company, date-posted, location, job-function,
+	 * 									industry, and salary, in exactly this order, null must be specified for an element if no value.
+	 * @param   integer  $start         Starting location within the result set for paginated returns.
+	 * @param   integer  $count         The number of results returned.
+	 * @param   string   $sort          Controls the search result order. There are four options: R (relationship), DA (date-posted-asc),
+	 * 									DD (date-posted-desc).
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function search($fields = null, $keywords = null, $company_name = null, $job_title = null, $country_code = null, $postal_code = null,
+		$distance = null, $facets = null, $facet = null, $start = 0, $count = 0, $sort = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/job-search';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if keywords is specified.
+		if ($keywords)
+		{
+			$data['keywords'] = $keywords;
+		}
+
+		// Check if company-name is specified.
+		if ($company_name)
+		{
+			$data['company-name'] = $company_name;
+		}
+
+		// Check if job-title is specified.
+		if ($job_title)
+		{
+			$data['job-title'] = $job_title;
+		}
+
+		// Check if country_code is specified.
+		if ($country_code)
+		{
+			$data['country-code'] = $country_code;
+		}
+
+		// Check if postal_code is specified.
+		if ($postal_code)
+		{
+			$data['postal-code'] = $postal_code;
+		}
+
+		// Check if distance is specified.
+		if ($distance)
+		{
+			$data['distance'] = $distance;
+		}
+
+		// Check if facets is specified.
+		if ($facets)
+		{
+			$data['facets'] = $facets;
+		}
+
+		// Check if facet is specified.
+		if ($facet)
+		{
+			$data['facet'] = array();
+
+			for ($i = 0, $iMax = count($facet); $i < $iMax; $i++)
+			{
+				if ($facet[$i])
+				{
+					if ($i == 0)
+					{
+						$data['facet'][] = 'company,' . $this->oauth->safeEncode($facet[$i]);
+					}
+
+					if ($i == 1)
+					{
+						$data['facet'][] = 'date-posted,' . $facet[$i];
+					}
+
+					if ($i == 2)
+					{
+						$data['facet'][] = 'location,' . $facet[$i];
+					}
+
+					if ($i == 3)
+					{
+						$data['facet'][] = 'job-function,' . $this->oauth->safeEncode($facet[$i]);
+					}
+
+					if ($i == 4)
+					{
+						$data['facet'][] = 'industry,' . $facet[$i];
+					}
+
+					if ($i == 5)
+					{
+						$data['facet'][] = 'salary,' . $facet[$i];
+					}
+				}
+			}
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if sort is specified.
+		if ($sort)
+		{
+			$data['sort'] = $sort;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/linkedin/linkedin.php b/core/libraries/joomla/linkedin/linkedin.php
new file mode 100644
index 00000000..4a10388c
--- /dev/null
+++ b/core/libraries/joomla/linkedin/linkedin.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with a Linkedin API instance.
+ *
+ * @since  13.1
+ */
+class JLinkedin
+{
+	/**
+	 * @var    Registry  Options for the Linkedin object.
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * @var JLinkedinOAuth The OAuth client.
+	 * @since 13.1
+	 */
+	protected $oauth;
+
+	/**
+	 * @var    JLinkedinPeople  Linkedin API object for people.
+	 * @since  13.1
+	 */
+	protected $people;
+
+	/**
+	 * @var    JLinkedinGroups  Linkedin API object for groups.
+	 * @since  13.1
+	 */
+	protected $groups;
+
+	/**
+	 * @var    JLinkedinCompanies  Linkedin API object for companies.
+	 * @since  13.1
+	 */
+	protected $companies;
+
+	/**
+	 * @var    JLinkedinJobs  Linkedin API object for jobs.
+	 * @since  13.1
+	 */
+	protected $jobs;
+
+	/**
+	 * @var    JLinkedinStream  Linkedin API object for social stream.
+	 * @since  13.1
+	 */
+	protected $stream;
+
+	/**
+	 * @var    JLinkedinCommunications  Linkedin API object for communications.
+	 * @since  13.1
+	 */
+	protected $communications;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   JLinkedinOauth  $oauth    OAuth object
+	 * @param   Registry        $options  Linkedin options object.
+	 * @param   JHttp           $client   The HTTP client object.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(JLinkedinOauth $oauth = null, Registry $options = null, JHttp $client = null)
+	{
+		$this->oauth = $oauth;
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client  = isset($client) ? $client : new JHttp($this->options);
+
+		// Setup the default API url if not already set.
+		$this->options->def('api.url', 'https://api.linkedin.com');
+	}
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JLinkedinObject  Linkedin API object (statuses, users, favorites, etc.).
+	 *
+	 * @since   13.1
+	 * @throws  InvalidArgumentException
+	 */
+	public function __get($name)
+	{
+		$class = 'JLinkedin' . ucfirst($name);
+
+		if (class_exists($class))
+		{
+			if (false == isset($this->$name))
+			{
+				$this->$name = new $class($this->options, $this->client, $this->oauth);
+			}
+
+			return $this->$name;
+		}
+
+		throw new InvalidArgumentException(sprintf('Argument %s produced an invalid class name: %s', $name, $class));
+	}
+
+	/**
+	 * Get an option from the JLinkedin instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   13.1
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the Linkedin instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JLinkedin  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/linkedin/oauth.php b/core/libraries/joomla/linkedin/oauth.php
new file mode 100644
index 00000000..6c9b5570
--- /dev/null
+++ b/core/libraries/joomla/linkedin/oauth.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for generating Linkedin API access token.
+ *
+ * @since  13.1
+ */
+class JLinkedinOauth extends JOAuth1Client
+{
+	/**
+	* @var    Registry  Options for the JLinkedinOauth object.
+	* @since  13.1
+	*/
+	protected $options;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  JLinkedinOauth options object.
+	 * @param   JHttp     $client   The HTTP client object.
+	 * @param   JInput    $input    The input object
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JInput $input = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+
+		$this->options->def('accessTokenURL', 'https://www.linkedin.com/uas/oauth/accessToken');
+		$this->options->def('authenticateURL', 'https://www.linkedin.com/uas/oauth/authenticate');
+		$this->options->def('authoriseURL', 'https://www.linkedin.com/uas/oauth/authorize');
+		$this->options->def('requestTokenURL', 'https://www.linkedin.com/uas/oauth/requestToken');
+
+		// Call the JOauthV1aclient constructor to setup the object.
+		parent::__construct($this->options, $client, $input);
+	}
+
+	/**
+	 * Method to verify if the access token is valid by making a request to an API endpoint.
+	 *
+	 * @return  boolean  Returns true if the access token is valid and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function verifyCredentials()
+	{
+		$token = $this->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		$data['format'] = 'json';
+
+		// Set the API url.
+		$path = 'https://api.linkedin.com/v1/people::(~)';
+
+		// Send the request.
+		$response = $this->oauthRequest($path, 'GET', $parameters, $data);
+
+		// Verify response
+		if ($response->code == 200)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to validate a response.
+	 *
+	 * @param   string         $url       The request URL.
+	 * @param   JHttpResponse  $response  The response to validate.
+	 *
+	 * @return  void
+	 *
+	 * @since  13.1
+	 * @throws DomainException
+	 */
+	public function validateResponse($url, $response)
+	{
+		if (!$code = $this->getOption('success_code'))
+		{
+			$code = 200;
+		}
+
+		if (strpos($url, '::(~)') === false && $response->code != $code)
+		{
+			if ($error = json_decode($response->body))
+			{
+				throw new DomainException('Error code ' . $error->errorCode . ' received with message: ' . $error->message . '.');
+			}
+			else
+			{
+				throw new DomainException($response->body);
+			}
+		}
+	}
+
+	/**
+	 * Method used to set permissions.
+	 *
+	 * @param   mixed  $scope  String or an array of string containing permissions.
+	 *
+	 * @return  JLinkedinOauth  This object for method chaining
+	 *
+	 * @link    https://developer.linkedin.com/documents/authentication
+	 * @since   13.1
+	 */
+	public function setScope($scope)
+	{
+		$this->setOption('scope', $scope);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the current scope
+	 *
+	 * @return  string String or an array of string containing permissions.
+	 *
+	 * @since   13.1
+	 */
+	public function getScope()
+	{
+		return $this->getOption('scope');
+	}
+}
diff --git a/core/libraries/joomla/linkedin/object.php b/core/libraries/joomla/linkedin/object.php
new file mode 100644
index 00000000..bc00b540
--- /dev/null
+++ b/core/libraries/joomla/linkedin/object.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Linkedin API object class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+abstract class JLinkedinObject
+{
+	/**
+	 * @var    Registry  Options for the Linkedin object.
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * @var   JLinkedinOAuth The OAuth client.
+	 * @since  13.1
+	 */
+	protected $oauth;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry        $options  Linkedin options object.
+	 * @param   JHttp           $client   The HTTP client object.
+	 * @param   JLinkedinOAuth  $oauth    The OAuth client.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JLinkedinOAuth $oauth = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JHttp($this->options);
+		$this->oauth = $oauth;
+	}
+
+	/**
+	 * Method to convert boolean to string.
+	 *
+	 * @param   boolean  $bool  The boolean value to convert.
+	 *
+	 * @return  string  String with the converted boolean.
+	 *
+	 * @since 13.1
+	 */
+	public function booleanToString($bool)
+	{
+		if ($bool)
+		{
+			return 'true';
+		}
+		else
+		{
+			return 'false';
+		}
+	}
+
+	/**
+	 * Get an option from the JLinkedinObject instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   13.1
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JLinkedinObject instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JLinkedinObject  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/linkedin/people.php b/core/libraries/joomla/linkedin/people.php
new file mode 100644
index 00000000..19c950ea
--- /dev/null
+++ b/core/libraries/joomla/linkedin/people.php
@@ -0,0 +1,387 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Linkedin API People class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+class JLinkedinPeople extends JLinkedinObject
+{
+	/**
+	 * Method to get a member's profile.
+	 *
+	 * @param   string  $id        Member id of the profile you want.
+	 * @param   string  $url       The public profile URL.
+	 * @param   string  $fields    Request fields beyond the default ones.
+	 * @param   string  $type      Choosing public or standard profile.
+	 * @param   string  $language  A comma separated list of locales ordered from highest to lowest preference.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getProfile($id = null, $url = null, $fields = null, $type = 'standard', $language = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		$data['format'] = 'json';
+
+		// Check if a member id is specified.
+		if ($id)
+		{
+			$base .= 'id=' . $id;
+		}
+		elseif (!$url)
+		{
+			$base .= '~';
+		}
+
+		// Check if profile url is specified.
+		if ($url)
+		{
+			$base .= 'url=' . $this->oauth->safeEncode($url);
+
+			// Choose public profile
+			if (!strcmp($type, 'public'))
+			{
+				$base .= ':public';
+			}
+		}
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if language is specified.
+		$header = array();
+
+		if ($language)
+		{
+			$header = array('Accept-Language' => $language);
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data, $header);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a list of connections for a user who has granted access to his/her account.
+	 *
+	 * @param   string   $fields          Request fields beyond the default ones.
+	 * @param   integer  $start           Starting location within the result set for paginated returns.
+	 * @param   integer  $count           The number of results returned.
+	 * @param   string   $modified        Values are updated or new.
+	 * @param   string   $modified_since  Value as a Unix time stamp of milliseconds since epoch.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getConnections($fields = null, $start = 0, $count = 500, $modified = null, $modified_since = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/connections';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+		// Check if count is specified.
+		if ($count != 500)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if modified is specified.
+		if ($modified)
+		{
+			$data['modified'] = $modified;
+		}
+
+		// Check if modified_since is specified.
+		if ($modified_since)
+		{
+			$data['modified-since'] = $modified_since;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get information about people.
+	 *
+	 * @param   string   $fields           Request fields beyond the default ones. provide 'api-standard-profile-request'
+	 * 									   field for out of network profiles.
+	 * @param   string   $keywords         Members who have all the keywords anywhere in their profile.
+	 * @param   string   $first_name       Members with a matching first name. Matches must be exact.
+	 * @param   string   $last_name        Members with a matching last name. Matches must be exactly.
+	 * @param   string   $company_name     Members who have a matching company name on their profile.
+	 * @param   boolean  $current_company  A value of true matches members who currently work at the company specified in the company-name
+	 * 									   parameter.
+	 * @param   string   $title            Matches members with that title on their profile.
+	 * @param   boolean  $current_title    A value of true matches members whose title is currently the one specified in the title-name parameter.
+	 * @param   string   $school_name      Members who have a matching school name on their profile.
+	 * @param   string   $current_school   A value of true matches members who currently attend the school specified in the school-name parameter.
+	 * @param   string   $country_code     Matches members with a location in a specific country. Values are defined in by ISO 3166 standard.
+	 * 									   Country codes must be in all lower case.
+	 * @param   integer  $postal_code      Matches members centered around a Postal Code. Must be combined with the country-code parameter.
+	 * 									   Not supported for all countries.
+	 * @param   integer  $distance         Matches members within a distance from a central point. This is measured in miles.
+	 * @param   string   $facets           Facet buckets to return, e.g. location.
+	 * @param   array    $facet            Array of facet values to search over. Contains values for location, industry, network, language,
+	 * 									   current-company, past-company and school, in exactly this order, null must be specified for an element if no value.
+	 * @param   integer  $start            Starting location within the result set for paginated returns.
+	 * @param   integer  $count            The number of results returned.
+	 * @param   string   $sort             Controls the search result order. There are four options: connections, recommenders,
+	 * 									   distance and relevance.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function search($fields = null, $keywords = null, $first_name = null, $last_name = null, $company_name = null,
+		$current_company = null, $title = null, $current_title = null, $school_name = null, $current_school = null, $country_code = null,
+		$postal_code = null, $distance = null, $facets = null, $facet = null, $start = 0, $count = 10, $sort = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people-search';
+
+		$data['format'] = 'json';
+
+		// Check if fields is specified.
+		if ($fields)
+		{
+			$base .= ':' . $fields;
+		}
+
+		// Check if keywords is specified.
+		if ($keywords)
+		{
+			$data['keywords'] = $keywords;
+		}
+
+		// Check if first_name is specified.
+		if ($first_name)
+		{
+			$data['first-name'] = $first_name;
+		}
+
+		// Check if last_name is specified.
+		if ($last_name)
+		{
+			$data['last-name'] = $last_name;
+		}
+
+		// Check if company-name is specified.
+		if ($company_name)
+		{
+			$data['company-name'] = $company_name;
+		}
+
+		// Check if current_company is specified.
+		if ($current_company)
+		{
+			$data['current-company'] = $current_company;
+		}
+
+		// Check if title is specified.
+		if ($title)
+		{
+			$data['title'] = $title;
+		}
+
+		// Check if current_title is specified.
+		if ($current_title)
+		{
+			$data['current-title'] = $current_title;
+		}
+
+		// Check if school_name is specified.
+		if ($school_name)
+		{
+			$data['school-name'] = $school_name;
+		}
+
+		// Check if current_school is specified.
+		if ($current_school)
+		{
+			$data['current-school'] = $current_school;
+		}
+
+		// Check if country_code is specified.
+		if ($country_code)
+		{
+			$data['country-code'] = $country_code;
+		}
+
+		// Check if postal_code is specified.
+		if ($postal_code)
+		{
+			$data['postal-code'] = $postal_code;
+		}
+
+		// Check if distance is specified.
+		if ($distance)
+		{
+			$data['distance'] = $distance;
+		}
+
+		// Check if facets is specified.
+		if ($facets)
+		{
+			$data['facets'] = $facets;
+		}
+
+		// Check if facet is specified.
+		if ($facet)
+		{
+			$data['facet'] = array();
+
+			for ($i = 0, $iMax = count($facet); $i < $iMax; $i++)
+			{
+				if ($facet[$i])
+				{
+					if ($i == 0)
+					{
+						$data['facet'][] = 'location,' . $facet[$i];
+					}
+
+					if ($i == 1)
+					{
+						$data['facet'][] = 'industry,' . $facet[$i];
+					}
+
+					if ($i == 2)
+					{
+						$data['facet'][] = 'network,' . $facet[$i];
+					}
+
+					if ($i == 3)
+					{
+						$data['facet'][] = 'language,' . $facet[$i];
+					}
+
+					if ($i == 4)
+					{
+						$data['facet'][] = 'current-company,' . $facet[$i];
+					}
+
+					if ($i == 5)
+					{
+						$data['facet'][] = 'past-company,' . $facet[$i];
+					}
+
+					if ($i == 6)
+					{
+						$data['facet'][] = 'school,' . $facet[$i];
+					}
+				}
+			}
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if count is specified.
+		if ($count != 10)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if sort is specified.
+		if ($sort)
+		{
+			$data['sort'] = $sort;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		if (strpos($fields, 'api-standard-profile-request') === false)
+		{
+			return json_decode($response->body);
+		}
+
+		// Get header name.
+		$name = explode('"name": "', $response->body);
+		$name = explode('"', $name[1]);
+		$name = $name[0];
+
+		// Get header value.
+		$value = explode('"value": "', $response->body);
+		$value = explode('"', $value[1]);
+		$value = $value[0];
+
+		// Get request url.
+		$url = explode('"url": "', $response->body);
+		$url = explode('"', $url[1]);
+		$url = $url[0];
+
+		// Build header for out of network profile.
+		$header[$name] = $value;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($url, 'GET', $parameters, $data, $header);
+
+		return json_decode($response->body);
+	}
+}
diff --git a/core/libraries/joomla/linkedin/stream.php b/core/libraries/joomla/linkedin/stream.php
new file mode 100644
index 00000000..e72786e5
--- /dev/null
+++ b/core/libraries/joomla/linkedin/stream.php
@@ -0,0 +1,625 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Linkedin
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Linkedin API Social Stream class for the Joomla Platform.
+ *
+ * @since  13.1
+ */
+class JLinkedinStream extends JLinkedinObject
+{
+	/**
+	 * Method to add a new share. Note: post must contain comment and/or (title and url).
+	 *
+	 * @param   string   $visibility   One of anyone: all members or connections-only: connections only.
+	 * @param   string   $comment      Text of member's comment.
+	 * @param   string   $title        Title of shared document.
+	 * @param   string   $url          URL for shared content.
+	 * @param   string   $image        URL for image of shared content.
+	 * @param   string   $description  Description of shared content.
+	 * @param   boolean  $twitter      True to have LinkedIn pass the status message along to a member's tethered Twitter account.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 * @throws  RuntimeException
+	 */
+	public function share($visibility, $comment = null, $title = null, $url = null, $image = null, $description = null, $twitter = false)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/shares';
+
+		// Check if twitter is true.
+		if ($twitter)
+		{
+			$base .= '?twitter-post=true';
+		}
+
+		// Build xml.
+		$xml = '<share>
+				  <visibility>
+					 <code>' . $visibility . '</code>
+				  </visibility>';
+
+		// Check if comment specified.
+		if ($comment)
+		{
+			$xml .= '<comment>' . $comment . '</comment>';
+		}
+
+		// Check if title and url are specified.
+		if ($title && $url)
+		{
+			$xml .= '<content>
+					   <title>' . $title . '</title>
+					   <submitted-url>' . $url . '</submitted-url>';
+
+			// Check if image is specified.
+			if ($image)
+			{
+				$xml .= '<submitted-image-url>' . $image . '</submitted-image-url>';
+			}
+
+			// Check if descrption id specified.
+			if ($description)
+			{
+				$xml .= '<description>' . $description . '</description>';
+			}
+
+			$xml .= '</content>';
+		}
+		elseif (!$comment)
+		{
+			throw new RuntimeException('Post must contain comment and/or (title and url).');
+		}
+
+		$xml .= '</share>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to reshare an existing share.
+	 *
+	 * @param   string   $visibility  One of anyone: all members or connections-only: connections only.
+	 * @param   string   $id          The unique identifier for a share.
+	 * @param   string   $comment     Text of member's comment.
+	 * @param   boolean  $twitter     True to have LinkedIn pass the status message along to a member's tethered Twitter account.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 * @throws  RuntimeException
+	 */
+	public function reshare($visibility, $id, $comment = null, $twitter = false)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/shares';
+
+		// Check if twitter is true.
+		if ($twitter)
+		{
+			$base .= '?twitter-post=true';
+		}
+
+		// Build xml.
+		$xml = '<share>
+				  <visibility>
+					 <code>' . $visibility . '</code>
+				  </visibility>';
+
+		// Check if comment specified.
+		if ($comment)
+		{
+			$xml .= '<comment>' . $comment . '</comment>';
+		}
+
+		$xml .= '   <attribution>
+					   <share>
+					   	  <id>' . $id . '</id>
+					   </share>
+					</attribution>
+				 </share>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to get a particular member's current share.
+	 *
+	 * @param   string  $id   Member id of the profile you want.
+	 * @param   string  $url  The public profile URL.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getCurrentShare($id = null, $url = null)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if a member id is specified.
+		if ($id)
+		{
+			$base .= 'id=' . $id;
+		}
+		elseif (!$url)
+		{
+			$base .= '~';
+		}
+
+		// Check if profile url is specified.
+		if ($url)
+		{
+			$base .= 'url=' . $this->oauth->safeEncode($url);
+		}
+
+		$base .= ':(current-share)';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get a particular member's current share.
+	 *
+	 * @param   string   $id    Member id of the profile you want.
+	 * @param   string   $url   The public profile URL.
+	 * @param   boolean  $self  Used to return member's feed. Omitted to return aggregated network feed.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getShareStream($id = null, $url = null, $self = true)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if a member id is specified.
+		if ($id)
+		{
+			$base .= $id;
+		}
+		elseif (!$url)
+		{
+			$base .= '~';
+		}
+
+		// Check if profile url is specified.
+		if ($url)
+		{
+			$base .= 'url=' . $this->oauth->safeEncode($url);
+		}
+
+		$base .= '/network';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+		$data['type'] = 'SHAR';
+
+		// Check if self is true
+		if ($self)
+		{
+			$data['scope'] = 'self';
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the users network updates.
+	 *
+	 * @param   string   $id      Member id.
+	 * @param   boolean  $self    Used to return member's feed. Omitted to return aggregated network feed.
+	 * @param   mixed    $type    String containing any valid Network Update Type from the table or an array of strings
+	 * 							  to specify more than one Network Update type.
+	 * @param   integer  $count   Number of updates to return, with a maximum of 250.
+	 * @param   integer  $start   The offset by which to start Network Update pagination.
+	 * @param   string   $after   Timestamp after which to retrieve updates.
+	 * @param   string   $before  Timestamp before which to retrieve updates.
+	 * @param   boolean  $hidden  Whether to display updates from people the member has chosen to "hide" from their update stream.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getNetworkUpdates($id = null, $self = true, $type = null, $count = 0, $start = 0, $after = null, $before = null,
+		$hidden = false)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/';
+
+		// Check if a member id is specified.
+		if ($id)
+		{
+			$base .= $id;
+		}
+		else
+		{
+			$base .= '~';
+		}
+
+		$base .= '/network/updates';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Check if self is true.
+		if ($self)
+		{
+			$data['scope'] = 'self';
+		}
+
+		// Check if type is specified.
+		if ($type)
+		{
+			$data['type'] = $type;
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if start is specified.
+		if ($start > 0)
+		{
+			$data['start'] = $start;
+		}
+
+		// Check if after is specified.
+		if ($after)
+		{
+			$data['after'] = $after;
+		}
+
+		// Check if before is specified.
+		if ($before > 0)
+		{
+			$data['before'] = $before;
+		}
+
+		// Check if hidden is true.
+		if ($hidden)
+		{
+			$data['hidden'] = $hidden;
+		}
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get information about the current member's network.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getNetworkStats()
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/network/network-stats';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to get the users network updates.
+	 *
+	 * @param   string  $body  The actual content of the update. You can use HTML to include links to the user name and the content the user
+	 *                         created. Other HTML tags are not supported. All body text should be HTML entity escaped and UTF-8 compliant.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function postNetworkUpdate($body)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/person-activities';
+
+		// Build the xml.
+		$xml = '<activity locale="en_US">
+					<content-type>linkedin-html</content-type>
+				    <body>' . $body . '</body>
+				</activity>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to retrieve all comments for a given network update.
+	 *
+	 * @param   string  $key  update/update-key representing an update.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getComments($key)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/network/updates/key=' . $key . '/update-comments';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to post a new comment to an existing update.
+	 *
+	 * @param   string  $key      update/update-key representing an update.
+	 * @param   string  $comment  Maximum length of 700 characters
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function postComment($key, $comment)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 201);
+
+		// Set the API base
+		$base = '/v1/people/~/network/updates/key=' . $key . '/update-comments';
+
+		// Build the xml.
+		$xml = '<update-comment>
+				  <comment>' . $comment . '</comment>
+				</update-comment>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method to retrieve the complete list of people who liked an update.
+	 *
+	 * @param   string  $key  update/update-key representing an update.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function getLikes($key)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = '/v1/people/~/network/updates/key=' . $key . '/likes';
+
+		// Set request parameters.
+		$data['format'] = 'json';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters, $data);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to like or unlike an update.
+	 *
+	 * @param   string   $key   Update/update-key representing an update.
+	 * @param   boolean  $like  True to like update, false otherwise.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	private function _likeUnlike($key, $like)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the success response code.
+		$this->oauth->setOption('success_code', 204);
+
+		// Set the API base
+		$base = '/v1/people/~/network/updates/key=' . $key . '/is-liked';
+
+		// Build xml.
+		$xml = '<is-liked>' . $this->booleanToString($like) . '</is-liked>';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response;
+	}
+
+	/**
+	 * Method used to like an update.
+	 *
+	 * @param   string  $key  Update/update-key representing an update.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function like($key)
+	{
+		return $this->_likeUnlike($key, true);
+	}
+
+	/**
+	 * Method used to unlike an update.
+	 *
+	 * @param   string  $key  Update/update-key representing an update.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	public function unlike($key)
+	{
+		return $this->_likeUnlike($key, false);
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/categories.php b/core/libraries/joomla/mediawiki/categories.php
new file mode 100644
index 00000000..ac542f8c
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/categories.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Categories class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiCategories extends JMediawikiObject
+{
+	/**
+	 * Method to list all categories the page(s) belong to.
+	 *
+	 * @param   array    $titles        Page titles to retrieve categories.
+	 * @param   array    $clprop        List of additional properties to get.
+	 * @param   array    $clshow        Type of categories to show.
+	 * @param   integer  $cllimit       Number of categories to return.
+	 * @param   boolean  $clcontinue    Continue when more results are available.
+	 * @param   array    $clcategories  Only list these categories.
+	 * @param   string   $cldir         Direction of listing.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function getCategories(array $titles, array $clprop = null, array $clshow = null, $cllimit = null, $clcontinue = false,
+		array $clcategories = null, $cldir = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=categories';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($clprop))
+		{
+			$path .= '&clprop=' . $this->buildParameter($clprop);
+		}
+
+		if (isset($clshow))
+		{
+			$path .= '&$clshow=' . $this->buildParameter($clshow);
+		}
+
+		if (isset($cllimit))
+		{
+			$path .= '&cllimit=' . $cllimit;
+		}
+
+		if ($clcontinue)
+		{
+			$path .= '&clcontinue=';
+		}
+
+		if (isset($clcategories))
+		{
+			$path .= '&clcategories=' . $this->buildParameter($clcategories);
+		}
+
+		if (isset($cldir))
+		{
+			$path .= '&cldir=' . $cldir;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get information about all categories used.
+	 *
+	 * @param   array  $titles  Page titles to retrieve categories.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getCategoriesUsed(array $titles)
+	{
+		// Build the request
+		$path = '?action=query&generator=categories&prop=info';
+
+		// Append titles to the request
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get information about the given categories.
+	 *
+	 * @param   array    $titles      Page titles to retrieve categories.
+	 * @param   boolean  $clcontinue  Continue when more results are available.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getCategoriesInfo(array $titles, $clcontinue = false)
+	{
+		// Build the request.
+		$path = '?action=query&prop=categoryinfo';
+
+		// Append titles to the request
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if ($clcontinue)
+		{
+			$path .= '&clcontinue=';
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get information about the pages within a category
+	 *
+	 * @param   string  $cmtitle               The category title, must contain 'Category:' prefix, cannot be used together with $cmpageid
+	 * @param   string  $cmpageid              The category's page ID, cannot be used together with $cmtitle
+	 * @param   string  $cmlimit               Maximum number of pages to retrieve
+	 * @param   array   $cmprop                Array of properties to retrieve
+	 * @param   array   $cmnamespace           Namespaces to retrieve pages from
+	 * @param   array   $cmtype                Array of category members to include, ignored if $cmsort is set to 'timestamp'
+	 * @param   string  $cmstart               Timestamp to start listing from, only used if $cmsort is set to 'timestamp'
+	 * @param   string  $cmend                 Timestamp to end listing at, only used if $cmsort is set to 'timestamp'
+	 * @param   string  $cmstartsortkey        Hexadecimal key to start listing from, only used if $cmsort is set to 'sortkey'
+	 * @param   string  $cmendsortkey          Hexadecimal key to end listing at, only used if $cmsort is set to 'sortkey'
+	 * @param   string  $cmstartsortkeyprefix  Hexadecimal key prefix to start listing from, only used if $cmsort is set to 'sortkey',
+	 *                                         overrides $cmstartsortkey
+	 * @param   string  $cmendsortkeyprefix    Hexadecimal key prefix to end listing before, only used if $cmsort is set to 'sortkey',
+	 *                                         overrides $cmendsortkey
+	 * @param   string  $cmsort                Property to sort by
+	 * @param   string  $cmdir                 Direction to sort in
+	 * @param   string  $cmcontinue            Used to continue a previous request
+	 *
+	 * @return  object
+	 *
+	 * @since   3.2.2 (CMS)
+	 * @throws  RuntimeException
+	 */
+	public function getCategoryMembers($cmtitle = null, $cmpageid = null, $cmlimit = null, array $cmprop = null, array $cmnamespace = null,
+		array $cmtype = null, $cmstart = null, $cmend = null, $cmstartsortkey = null, $cmendsortkey = null, $cmstartsortkeyprefix = null,
+		$cmendsortkeyprefix = null, $cmsort = null, $cmdir = null, $cmcontinue = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=categorymembers';
+
+		// Make sure both $cmtitle and $cmpageid are not set
+		if (isset($cmtitle) && isset($cmpageid))
+		{
+			throw new RuntimeException('Both the $cmtitle and $cmpageid parameters cannot be set, please only use one of the two.');
+		}
+
+		if (isset($cmtitle))
+		{
+			// Verify that the Category: prefix exists
+			if (strpos($cmtitle, 'Category:') !== 0)
+			{
+				throw new RuntimeException('The $cmtitle parameter must include the Category: prefix.');
+			}
+
+			$path .= '&cmtitle=' . $cmtitle;
+		}
+
+		if (isset($cmpageid))
+		{
+			$path .= '&cmpageid=' . $cmpageid;
+		}
+
+		if (isset($cmlimit))
+		{
+			$path .= '&cmlimit=' . $cmlimit;
+		}
+
+		if (isset($cmprop))
+		{
+			$path .= '&cmprop=' . $this->buildParameter($cmprop);
+		}
+
+		if (isset($cmnamespace))
+		{
+			$path .= '&cmnamespace=' . $this->buildParameter($cmnamespace);
+		}
+
+		if (isset($cmtype))
+		{
+			$path .= '&cmtype=' . $this->buildParameter($cmtype);
+		}
+
+		if (isset($cmstart))
+		{
+			$path .= '&cmstart=' . $cmstart;
+		}
+
+		if (isset($cmend))
+		{
+			$path .= '&cmend=' . $cmend;
+		}
+
+		if (isset($cmstartsortkey))
+		{
+			$path .= '&cmstartsortkey=' . $cmstartsortkey;
+		}
+
+		if (isset($cmendsortkey))
+		{
+			$path .= '&cmendsortkey=' . $cmendsortkey;
+		}
+
+		if (isset($cmstartsortkeyprefix))
+		{
+			$path .= '&cmstartsortkeyprefix=' . $cmstartsortkeyprefix;
+		}
+
+		if (isset($cmendsortkeyprefix))
+		{
+			$path .= '&cmendsortkeyprefix=' . $cmendsortkeyprefix;
+		}
+
+		if (isset($cmsort))
+		{
+			$path .= '&cmsort=' . $cmsort;
+		}
+
+		if (isset($cmdir))
+		{
+			$path .= '&cmdir=' . $cmdir;
+		}
+
+		if (isset($cmcontinue))
+		{
+			$path .= '&cmcontinue=' . $cmcontinue;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to enumerate all categories.
+	 *
+	 * @param   string   $acfrom    The category to start enumerating from.
+	 * @param   string   $acto      The category to stop enumerating at.
+	 * @param   string   $acprefix  Search for all category titles that begin with this value.
+	 * @param   string   $acdir     Direction to sort in.
+	 * @param   integer  $acmin     Minimum number of category members.
+	 * @param   integer  $acmax     Maximum number of category members.
+	 * @param   integer  $aclimit   How many categories to return.
+	 * @param   array    $acprop    Which properties to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function enumerateCategories($acfrom = null, $acto = null, $acprefix = null, $acdir = null, $acmin = null,
+		$acmax = null, $aclimit = null, array $acprop = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=allcategories';
+
+		if (isset($acfrom))
+		{
+			$path .= '&acfrom=' . $acfrom;
+		}
+
+		if (isset($acto))
+		{
+			$path .= '&acto=' . $acto;
+		}
+
+		if (isset($acprefix))
+		{
+			$path .= '&acprefix=' . $acprefix;
+		}
+
+		if (isset($acdir))
+		{
+			$path .= '&acdir=' . $acdir;
+		}
+
+		if (isset($acfrom))
+		{
+			$path .= '&acfrom=' . $acfrom;
+		}
+
+		if (isset($acmin))
+		{
+			$path .= '&acmin=' . $acmin;
+		}
+
+		if (isset($acmax))
+		{
+			$path .= '&acmax=' . $acmax;
+		}
+
+		if (isset($aclimit))
+		{
+			$path .= '&aclimit=' . $aclimit;
+		}
+
+		if (isset($acprop))
+		{
+			$path .= '&acprop=' . $this->buildParameter($acprop);
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to list change tags.
+	 *
+	 * @param   array   $tgprop   List of properties to get.
+	 * @param   string  $tglimit  The maximum number of tags to limit.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getChangeTags(array $tgprop = null, $tglimit = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=tags';
+
+		if (isset($tgprop))
+		{
+			$path .= '&tgprop=' . $this->buildParameter($tgprop);
+		}
+
+		if (isset($tglimit))
+		{
+			$path .= '&tglimit=' . $tglimit;
+		}
+
+		// @TODO add support for $tgcontinue
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/http.php b/core/libraries/joomla/mediawiki/http.php
new file mode 100644
index 00000000..2c73435a
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/http.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * HTTP client class for connecting to a MediaWiki instance.
+ *
+ * @since  12.3
+ */
+class JMediawikiHttp extends JHttp
+{
+	/**
+     * Constructor.
+     *
+     * @param   Registry        $options    Client options object.
+     * @param   JHttpTransport  $transport  The HTTP transport object.
+     *
+     * @since   12.3
+     */
+	public function __construct(Registry $options = null, JHttpTransport $transport = null)
+	{
+		// Override the JHttp contructor to use JHttpTransportStream.
+		$this->options = isset($options) ? $options : new Registry;
+		$this->transport = isset($transport) ? $transport : new JHttpTransportStream($this->options);
+
+		// Make sure the user agent string is defined.
+		$this->options->def('api.useragent', 'JMediawiki/1.0');
+
+		// Set the default timeout to 120 seconds.
+		$this->options->def('api.timeout', 120);
+	}
+
+	/**
+	 * Method to send the GET command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  JHttpResponse
+	 *
+	 * @since   12.3
+	 */
+	public function get($url, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('api.timeout'))
+		{
+			$timeout = $this->options->get('api.timeout');
+		}
+
+		return $this->transport->request('GET', new JUri($url), null, $headers, $timeout, $this->options->get('api.useragent'));
+	}
+
+	/**
+	 * Method to send the POST command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   mixed    $data     Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  JHttpResponse
+	 *
+	 * @since   12.3
+	 */
+	public function post($url, $data, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('api.timeout'))
+		{
+			$timeout = $this->options->get('api.timeout');
+		}
+
+		return $this->transport->request('POST', new JUri($url), $data, $headers, $timeout, $this->options->get('api.useragent'));
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/images.php b/core/libraries/joomla/mediawiki/images.php
new file mode 100644
index 00000000..bf7db954
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/images.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Images class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiImages extends JMediawikiObject
+{
+	/**
+	 * Method to get all images contained on the given page(s).
+	 *
+	 * @param   array    $titles         Page titles to retrieve images.
+	 * @param   integer  $imagelimit     How many images to return.
+	 * @param   boolean  $imagecontinue  When more results are available, use this to continue.
+	 * @param   integer  $imimages       Only list these images.
+	 * @param   string   $imdir          The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getImages(array $titles, $imagelimit = null, $imagecontinue = null, $imimages = null, $imdir = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=images';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($imagelimit))
+		{
+			$path .= '&imagelimit=' . $imagelimit;
+		}
+
+		if ($imagecontinue)
+		{
+			$path .= '&imagecontinue=';
+		}
+
+		if (isset($imimages))
+		{
+			$path .= '&imimages=' . $imimages;
+		}
+
+		if (isset($imdir))
+		{
+			$path .= '&imdir=' . $imdir;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get all images contained on the given page(s).
+	 *
+	 * @param   array  $titles  Page titles to retrieve links.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getImagesUsed(array $titles)
+	{
+		// Build the request.
+		$path = '?action=query&generator=images&prop=info';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get all image information and upload history.
+	 *
+	 * @param   array    $liprop             What image information to get.
+	 * @param   integer  $lilimit            How many image revisions to return.
+	 * @param   string   $listart            Timestamp to start listing from.
+	 * @param   string   $liend              Timestamp to stop listing at.
+	 * @param   integer  $liurlwidth         URL to an image scaled to this width will be returned..
+	 * @param   integer  $liurlheight        URL to an image scaled to this height will be returned.
+	 * @param   string   $limetadataversion  Version of metadata to use.
+	 * @param   string   $liurlparam         A handler specific parameter string.
+	 * @param   boolean  $licontinue         When more results are available, use this to continue.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getImageInfo(array $liprop = null, $lilimit = null, $listart = null, $liend = null, $liurlwidth = null,
+		$liurlheight = null, $limetadataversion = null, $liurlparam = null, $licontinue = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=imageinfo';
+
+		if (isset($liprop))
+		{
+			$path .= '&liprop=' . $this->buildParameter($liprop);
+		}
+
+		if (isset($lilimit))
+		{
+			$path .= '&lilimit=' . $lilimit;
+		}
+
+		if (isset($listart))
+		{
+			$path .= '&listart=' . $listart;
+		}
+
+		if (isset($liend))
+		{
+			$path .= '&liend=' . $liend;
+		}
+
+		if (isset($liurlwidth))
+		{
+			$path .= '&liurlwidth=' . $liurlwidth;
+		}
+
+		if (isset($liurlheight))
+		{
+			$path .= '&liurlheight=' . $liurlheight;
+		}
+
+		if (isset($limetadataversion))
+		{
+			$path .= '&limetadataversion=' . $limetadataversion;
+		}
+
+		if (isset($liurlparam))
+		{
+			$path .= '&liurlparam=' . $liurlparam;
+		}
+
+		if ($licontinue)
+		{
+			$path .= '&alcontinue=';
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to enumerate all images.
+	 *
+	 * @param   string   $aifrom        The image title to start enumerating from.
+	 * @param   string   $aito          The image title to stop enumerating at.
+	 * @param   string   $aiprefix      Search for all image titles that begin with this value.
+	 * @param   integer  $aiminsize     Limit to images with at least this many bytes.
+	 * @param   integer  $aimaxsize     Limit to images with at most this many bytes.
+	 * @param   integer  $ailimit       How many images in total to return.
+	 * @param   string   $aidir         The direction in which to list.
+	 * @param   string   $aisha1        SHA1 hash of image.
+	 * @param   string   $aisha1base36  SHA1 hash of image in base 36.
+	 * @param   array    $aiprop        What image information to get.
+	 * @param   string   $aimime        What MIME type to search for.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function enumerateImages($aifrom = null, $aito = null, $aiprefix = null, $aiminsize = null, $aimaxsize = null, $ailimit = null,
+		$aidir = null, $aisha1 = null, $aisha1base36 = null, array $aiprop = null, $aimime = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=allimages';
+
+		if (isset($aifrom))
+		{
+			$path .= '&aifrom=' . $aifrom;
+		}
+
+		if (isset($aito))
+		{
+			$path .= '&aito=' . $aito;
+		}
+
+		if (isset($aiprefix))
+		{
+			$path .= '&aiprefix=' . $aiprefix;
+		}
+
+		if (isset($aiminsize))
+		{
+			$path .= '&aiminsize=' . $aiminsize;
+		}
+
+		if (isset($aimaxsize))
+		{
+			$path .= '&aimaxsize=' . $aimaxsize;
+		}
+
+		if (isset($ailimit))
+		{
+			$path .= '&ailimit=' . $ailimit;
+		}
+
+		if (isset($aidir))
+		{
+			$path .= '&aidir=' . $aidir;
+		}
+
+		if (isset($aisha1))
+		{
+			$path .= '&aisha1=' . $aisha1;
+		}
+
+		if (isset($aisha1base36))
+		{
+			$path .= '&$aisha1base36=' . $aisha1base36;
+		}
+
+		if (isset($aiprop))
+		{
+			$path .= '&aiprop=' . $this->buildParameter($aiprop);
+		}
+
+		if (isset($aimime))
+		{
+			$path .= '&aimime=' . $aimime;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/links.php b/core/libraries/joomla/mediawiki/links.php
new file mode 100644
index 00000000..f2ba42f8
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/links.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Links class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiLinks extends JMediawikiObject
+{
+	/**
+	 * Method to return all links from the given page(s).
+	 *
+	 * @param   array   $titles       Page titles to retrieve links.
+	 * @param   array   $plnamespace  Namespaces to get links.
+	 * @param   string  $pllimit      Number of links to return.
+	 * @param   string  $plcontinue   Continue when more results are available.
+	 * @param   array   $pltitles     List links to these titles.
+	 * @param   string  $pldir        Direction of listing.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getLinks(array $titles, array $plnamespace = null, $pllimit = null, $plcontinue = null, array $pltitles = null, $pldir = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=links';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($plnamespace))
+		{
+			$path .= '&plnamespace=' . $this->buildParameter($plnamespace);
+		}
+
+		if (isset($pllimit))
+		{
+			$path .= '&pllimit=' . $pllimit;
+		}
+
+		if (isset($plcontinue))
+		{
+			$path .= '&plcontinue=' . $plcontinue;
+		}
+
+		if (isset($pltitles))
+		{
+			$path .= '&pltitles=' . $this->buildParameter($pltitles);
+		}
+
+		if (isset($pldir))
+		{
+			$path .= '&pldir=' . $pldir;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to return info about the link pages.
+	 *
+	 * @param   array  $titles  Page titles to retrieve links.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getLinksUsed(array $titles)
+	{
+		// Build the request.
+		$path = '?action=query&generator=links&prop=info';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to return all interwiki links from the given page(s).
+	 *
+	 * @param   array    $titles      Page titles to retrieve links.
+	 * @param   boolean  $iwurl       Whether to get the full url.
+	 * @param   integer  $iwlimit     Number of interwiki links to return.
+	 * @param   boolean  $iwcontinue  When more results are available, use this to continue.
+	 * @param   string   $iwprefix    Prefix for the interwiki.
+	 * @param   string   $iwtitle     Interwiki link to search for.
+	 * @param   string   $iwdir       The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getIWLinks(array $titles, $iwurl = false, $iwlimit = null, $iwcontinue = false, $iwprefix = null, $iwtitle = null, $iwdir = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=links';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if ($iwurl)
+		{
+			$path .= '&iwurl=';
+		}
+
+		if (isset($iwlimit))
+		{
+			$path .= '&iwlimit=' . $iwlimit;
+		}
+
+		if ($iwcontinue)
+		{
+			$path .= '&iwcontinue=';
+		}
+
+		if (isset($iwprefix))
+		{
+			$path .= '&iwprefix=' . $iwprefix;
+		}
+
+		if (isset($iwtitle))
+		{
+			$path .= '&iwtitle=' . $iwtitle;
+		}
+
+		if (isset($iwdir))
+		{
+			$path .= '&iwdir=' . $iwdir;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to return all interlanguage links from the given page(s).
+	 *
+	 * @param   array    $titles      Page titles to retrieve links.
+	 * @param   integer  $lllimit     Number of language links to return.
+	 * @param   boolean  $llcontinue  When more results are available, use this to continue.
+	 * @param   string   $llurl       Whether to get the full URL.
+	 * @param   string   $lllang      Language code.
+	 * @param   string   $lltitle     Link to search for.
+	 * @param   string   $lldir       The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getLangLinks(array $titles, $lllimit = null, $llcontinue = false, $llurl = null, $lllang = null, $lltitle = null, $lldir = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=langlinks';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($lllimit))
+		{
+			$path .= '&lllimit=' . $lllimit;
+		}
+
+		if ($llcontinue)
+		{
+			$path .= '&llcontinue=';
+		}
+
+		if (isset($llurl))
+		{
+			$path .= '&llurl=' . $llurl;
+		}
+
+		if (isset($lllang))
+		{
+			$path .= '&lllang=' . $lllang;
+		}
+
+		if (isset($lltitle))
+		{
+			$path .= '&lltitle=' . $lltitle;
+		}
+
+		if (isset($lldir))
+		{
+			$path .= '&lldir=' . $lldir;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to return all external urls from the given page(s).
+	 *
+	 * @param   array    $titles      Page titles to retrieve links.
+	 * @param   integer  $ellimit     Number of links to return.
+	 * @param   string   $eloffset    When more results are available, use this to continue.
+	 * @param   string   $elprotocol  Protocol of the url.
+	 * @param   string   $elquery     Search string without protocol.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getExtLinks(array $titles, $ellimit = null, $eloffset = null, $elprotocol = null, $elquery = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=extlinks';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($ellimit))
+		{
+			$path .= '&ellimit=' . $ellimit;
+		}
+
+		if (isset($eloffset))
+		{
+			$path .= '&eloffset=' . $eloffset;
+		}
+
+		if (isset($elprotocol))
+		{
+			$path .= '&elprotocol=' . $elprotocol;
+		}
+
+		if (isset($elquery))
+		{
+			$path .= '&elquery=' . $elquery;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to enumerate all links that point to a given namespace.
+	 *
+	 * @param   boolean  $alcontinue   When more results are available, use this to continue.
+	 * @param   string   $alfrom       Start listing at this title. The title need not exist.
+	 * @param   string   $alto         The page title to stop enumerating at.
+	 * @param   string   $alprefix     Search for all page titles that begin with this value.
+	 * @param   string   $alunique     Only show unique links.
+	 * @param   array    $alprop       What pieces of information to include.
+	 * @param   string   $alnamespace  The namespace to enumerate.
+	 * @param   integer  $allimit      Number of links to return.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function enumerateLinks($alcontinue = false, $alfrom = null, $alto = null, $alprefix = null, $alunique = null, array $alprop = null,
+		$alnamespace = null, $allimit = null)
+	{
+		// Build the request.
+		$path = '?action=query&meta=siteinfo';
+
+		if ($alcontinue)
+		{
+			$path .= '&alcontinue=';
+		}
+
+		if (isset($alfrom))
+		{
+			$path .= '&alfrom=' . $alfrom;
+		}
+
+		if (isset($alto))
+		{
+			$path .= '&alto=' . $alto;
+		}
+
+		if (isset($alprefix))
+		{
+			$path .= '&alprefix=' . $alprefix;
+		}
+
+		if (isset($alunique))
+		{
+			$path .= '&alunique=' . $alunique;
+		}
+
+		if (isset($alprop))
+		{
+			$path .= '&alprop=' . $this->buildParameter($alprop);
+		}
+
+		if (isset($alnamespace))
+		{
+			$path .= '&alnamespace=' . $alnamespace;
+		}
+
+		if (isset($allimit))
+		{
+			$path .= '&allimit=' . $allimit;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/mediawiki.php b/core/libraries/joomla/mediawiki/mediawiki.php
new file mode 100644
index 00000000..e01e737d
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/mediawiki.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with a Mediawiki server instance.
+ *
+ * @property-read  JMediawikiSites          $sites          MediaWiki API object for sites.
+ * @property-read  JMediawikiPages          $pages          MediaWiki API object for pages.
+ * @property-read  JMediawikiUsers          $users          MediaWiki API object for users.
+ * @property-read  JMediawikiLinks          $links          MediaWiki API object for links.
+ * @property-read  JMediawikiCategories     $categories     MediaWiki API object for categories.
+ * @property-read  JMediawikiImages         $images         MediaWiki API object for images.
+ * @property-read  JMediawikiSearch         $search         MediaWiki API object for search.
+ *
+ * @since  12.3
+ */
+class JMediawiki
+{
+	/**
+	 * @var    Registry  Options for the MediaWiki object.
+	 * @since  12.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    JMediawikiHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  12.3
+	 */
+	protected $client;
+
+	/**
+	 * @var    JMediawikiSites  MediaWiki API object for Site.
+	 * @since  12.3
+	 */
+	protected $sites;
+
+	/**
+	 * @var    JMediawikiPages  MediaWiki API object for pages.
+	 * @since  12.1
+	 */
+	protected $pages;
+
+	/**
+	 * @var    JMediawikiUsers  MediaWiki API object for users.
+	 * @since  12.3
+	 */
+	protected $users;
+
+	/**
+	 * @var    JMediawikiLinks  MediaWiki API object for links.
+	 * @since  12.3
+	 */
+	protected $links;
+
+	/**
+	 * @var    JMediawikiCategories  MediaWiki API object for categories.
+	 * @since  12.3
+	 */
+	protected $categories;
+
+	/**
+	 * @var    JMediawikiImages  MediaWiki API object for images.
+	 * @since  12.3
+	 */
+	protected $images;
+
+	/**
+	 * @var    JMediawikiSearch  MediaWiki API object for search.
+	 * @since  12.1
+	 */
+	protected $search;
+
+	/**
+     * Constructor.
+     *
+     * @param   Registry        $options  MediaWiki options object.
+     * @param   JMediawikiHttp  $client   The HTTP client object.
+     *
+     * @since   12.3
+     */
+	public function __construct(Registry $options = null, JMediawikiHttp $client = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JMediawikiHttp($this->options);
+	}
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JMediaWikiObject  MediaWiki API object (users, reviews, etc).
+	 *
+	 * @since   12.3
+	 * @throws  InvalidArgumentException
+	 */
+	public function __get($name)
+	{
+		$name = strtolower($name);
+		$class = 'JMediawiki' . ucfirst($name);
+		$accessible = array(
+			'categories',
+			'images',
+			'links',
+			'pages',
+			'search',
+			'sites',
+			'users',
+		);
+
+		if (class_exists($class) && in_array($name, $accessible))
+		{
+			if (!isset($this->$name))
+			{
+				$this->$name = new $class($this->options, $this->client);
+			}
+
+			return $this->$name;
+		}
+
+		throw new InvalidArgumentException(sprintf('Property %s is not accessible.', $name));
+	}
+
+	/**
+	 * Get an option from the JMediawiki instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JMediawiki instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JMediawiki  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/object.php b/core/libraries/joomla/mediawiki/object.php
new file mode 100644
index 00000000..fe9111bf
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/object.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * MediaWiki API object class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+abstract class JMediawikiObject
+{
+	/**
+	 * @var    Registry  Options for the MediaWiki object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JMediawikiHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  12.3
+	 */
+	protected $client;
+
+	/**
+     * Constructor.
+     *
+     * @param   Registry        $options  Mediawiki options object.
+     * @param   JMediawikiHttp  $client   The HTTP client object.
+     *
+     * @since   12.3
+     */
+	public function __construct(Registry $options = null, JMediawikiHttp $client = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JMediawikiHttp($this->options);
+	}
+
+	/**
+	 * Method to build and return a full request URL for the request.
+	 *
+	 * @param   string  $path  URL to inflect
+	 *
+	 * @return  string   The request URL.
+	 *
+	 * @since   12.3
+	 */
+	protected function fetchUrl($path)
+	{
+		// Append the path with output format
+		$path .= '&format=xml';
+
+		$uri = new JUri($this->options->get('api.url') . '/api.php' . $path);
+
+		if ($this->options->get('api.username', false))
+		{
+			$uri->setUser($this->options->get('api.username'));
+		}
+
+		if ($this->options->get('api.password', false))
+		{
+			$uri->setPass($this->options->get('api.password'));
+		}
+
+		return (string) $uri;
+	}
+
+	/**
+	 * Method to build request parameters from a string array.
+	 *
+	 * @param   array  $params  string array that contains the parameters
+	 *
+	 * @return  string   request parameter
+	 *
+	 * @since   12.3
+	 */
+	public function buildParameter(array $params)
+	{
+		$path = '';
+
+		foreach ($params as $param)
+		{
+			$path .= $param;
+
+			if (next($params) == true)
+			{
+				$path .= '|';
+			}
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Method to validate response for errors
+	 *
+	 * @param   JHttpresponse  $response  reponse from the mediawiki server
+	 *
+	 * @return  Object
+	 *
+	 * @since   12.3
+	 *
+	 * @throws  DomainException
+	 */
+	public function validateResponse($response)
+	{
+		$xml = simplexml_load_string($response->body);
+
+		if (isset($xml->warnings))
+		{
+			throw new DomainException($xml->warnings->info);
+		}
+
+		if (isset($xml->error))
+		{
+			throw new DomainException($xml->error['info']);
+		}
+
+		return $xml;
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/pages.php b/core/libraries/joomla/mediawiki/pages.php
new file mode 100644
index 00000000..e127d345
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/pages.php
@@ -0,0 +1,626 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Pages class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiPages extends JMediawikiObject
+{
+	/**
+	 * Method to edit a page.
+	 *
+	 * @param   string  $title         Page title.
+	 * @param   int     $section       Section number.
+	 * @param   string  $sectiontitle  The title for a new section.
+	 * @param   string  $text          Page content.
+	 * @param   string  $summary       Title of the page you want to delete.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function editPage($title, $section = null, $sectiontitle = null, $text = null, $summary = null)
+	{
+		// Get the token.
+		$token = $this->getToken($title, 'edit');
+
+		// Build the request path.
+		$path = '?action=edit';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+			'token' => $token,
+			'section' => $section,
+			'sectiontitle' => $section,
+			'text' => $text,
+			'summary' => $summary,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to delete a page.
+	 *
+	 * @param   string  $title      Title of the page you want to delete.
+	 * @param   string  $reason     Reason for the deletion.
+	 * @param   string  $watchlist  Unconditionally add or remove the page from your watchlis.
+	 * @param   string  $oldimage   The name of the old image to delete.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function deletePageByName($title, $reason = null, $watchlist = null, $oldimage = null)
+	{
+		// Get the token.
+		$token = $this->getToken($title, 'delete');
+
+		// Build the request path.
+		$path = '?action=delete';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+			'token' => $token,
+			'reason' => $reason,
+			'watchlist' => $watchlist,
+			'oldimage' => $oldimage,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to delete a page.
+	 *
+	 * @param   string  $pageid     Page ID of the page you want to delete.
+	 * @param   string  $reason     Reason for the deletion.
+	 * @param   string  $watchlist  Unconditionally add or remove the page from your watchlis.
+	 * @param   string  $oldimage   The name of the old image to delete.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function deletePageById($pageid,  $reason = null, $watchlist = null, $oldimage = null)
+	{
+		// Get the token.
+		$token = $this->getToken($pageid, 'delete');
+
+		// Build the request path.
+		$path = '?action=delete';
+
+		// Build the request data.
+		$data = array(
+			'pageid' => $pageid,
+			'token' => $token,
+			'reason' => $reason,
+			'watchlist' => $watchlist,
+			'oldimage' => $oldimage,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to restore certain revisions of a deleted page.
+	 *
+	 * @param   string  $title      Title of the page you want to restore.
+	 * @param   string  $reason     Reason for restoring (optional).
+	 * @param   string  $timestamp  Timestamps of the revisions to restore.
+	 * @param   string  $watchlist  Unconditionally add or remove the page from your watchlist.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function undeletePage($title, $reason = null, $timestamp = null, $watchlist = null)
+	{
+		// Get the token.
+		$token = $this->getToken($title, 'undelete');
+
+		// Build the request path.
+		$path = '?action=undelete';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+			'token' => $token,
+			'reason' => $reason,
+			'timestamp' => $timestamp,
+			'watchlist' => $watchlist,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to move a page.
+	 *
+	 * @param   string   $from            Title of the page you want to move.
+	 * @param   string   $to              Title you want to rename the page to.
+	 * @param   string   $reason          Reason for the move (optional).
+	 * @param   string   $movetalk        Move the talk page, if it exists.
+	 * @param   string   $movesubpages    Move subpages, if applicable.
+	 * @param   boolean  $noredirect      Don't create a redirect.
+	 * @param   string   $watchlist       Unconditionally add or remove the page from your watchlist.
+	 * @param   boolean  $ignorewarnings  Ignore any warnings.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function movePageByName($from, $to, $reason = null, $movetalk = null, $movesubpages = null, $noredirect = null,
+		$watchlist =null, $ignorewarnings = null)
+	{
+		// Get the token.
+		$token = $this->getToken($from, 'move');
+
+		// Build the request path.
+		$path = '?action=move';
+
+		// Build the request data.
+		$data = array(
+			'from' => $from,
+			'to' => $reason,
+			'token' => $token,
+			'reason' => $reason,
+			'movetalk' => $movetalk,
+			'movesubpages' => $movesubpages,
+			'noredirect' => $noredirect,
+			'watchlist' => $watchlist,
+			'ignorewarnings' => $ignorewarnings,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to move a page.
+	 *
+	 * @param   int      $fromid          Page ID of the page you want to move.
+	 * @param   string   $to              Title you want to rename the page to.
+	 * @param   string   $reason          Reason for the move (optional).
+	 * @param   string   $movetalk        Move the talk page, if it exists.
+	 * @param   string   $movesubpages    Move subpages, if applicable.
+	 * @param   boolean  $noredirect      Don't create a redirect.
+	 * @param   string   $watchlist       Unconditionally add or remove the page from your watchlist.
+	 * @param   boolean  $ignorewarnings  Ignore any warnings.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function movePageById($fromid, $to, $reason = null, $movetalk = null, $movesubpages = null, $noredirect = null,
+		$watchlist =null, $ignorewarnings = null)
+	{
+		// Get the token.
+		$token = $this->getToken($fromid, 'move');
+
+		// Build the request path.
+		$path = '?action=move';
+
+		// Build the request data.
+		$data = array(
+			'fromid' => $fromid,
+			'to' => $reason,
+			'token' => $token,
+			'reason' => $reason,
+			'movetalk' => $movetalk,
+			'movesubpages' => $movesubpages,
+			'noredirect' => $noredirect,
+			'watchlist' => $watchlist,
+			'ignorewarnings' => $ignorewarnings,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to undo the last edit to the page.
+	 *
+	 * @param   string  $title      Title of the page you want to rollback.
+	 * @param   string  $user       Name of the user whose edits are to be rolled back.
+	 * @param   string  $summary    Custom edit summary. If not set, default summary will be used.
+	 * @param   string  $markbot    Mark the reverted edits and the revert as bot edits.
+	 * @param   string  $watchlist  Unconditionally add or remove the page from your watchlist.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function rollback($title, $user, $summary = null, $markbot = null, $watchlist = null)
+	{
+		// Get the token.
+		$token = $this->getToken($title, 'rollback');
+
+		// Build the request path.
+		$path = '?action=rollback';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+			'token' => $token,
+			'user' => $user,
+			'expiry' => $summary,
+			'markbot' => $markbot,
+			'watchlist' => $watchlist,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to change the protection level of a page.
+	 *
+	 * @param   string  $title        Title of the page you want to (un)protect.
+	 * @param   string  $protections  Pipe-separated list of protection levels.
+	 * @param   string  $expiry       Expiry timestamps.
+	 * @param   string  $reason       Reason for (un)protecting (optional).
+	 * @param   string  $cascade      Enable cascading protection.
+	 * @param   string  $watchlist    Unconditionally add or remove the page from your watchlist.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function changeProtection($title, $protections, $expiry = null, $reason = null, $cascade = null, $watchlist = null)
+	{
+		// Get the token.
+		$token = $this->getToken($title, 'unblock');
+
+		// Build the request path.
+		$path = '?action=protect';
+
+		// Build the request data.
+		$data = array(
+			'title' => $title,
+			'token' => $token,
+			'protections' => $protections,
+			'expiry' => $expiry,
+			'reason' => $reason,
+			'cascade' => $cascade,
+			'watchlist' => $watchlist,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get basic page information.
+	 *
+	 * @param   array    $titles      Page titles to retrieve info.
+	 * @param   array    $inprop      Which additional properties to get.
+	 * @param   array    $intoken     Request a token to perform a data-modifying action on a page
+	 * @param   boolean  $incontinue  When more results are available, use this to continue.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getPageInfo(array $titles, array $inprop = null, array $intoken = null, $incontinue = null)
+	{
+		// Build the request
+		$path = '?action=query&prop=info';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($inprop))
+		{
+			$path .= '&inprop=' . $this->buildParameter($inprop);
+		}
+
+		if (isset($intoken))
+		{
+			$path .= '&intoken=' . $this->buildParameter($intoken);
+		}
+
+		if ($incontinue)
+		{
+			$path .= '&incontinue=';
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get various properties defined in the page content.
+	 *
+	 * @param   array    $titles      Page titles to retrieve properties.
+	 * @param   boolean  $ppcontinue  When more results are available, use this to continue.
+	 * @param   string   $ppprop      Page prop to look on the page for.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getPageProperties(array $titles, $ppcontinue = null, $ppprop = null)
+	{
+		// Build the request
+		$path = '?action=query&prop=pageprops';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if ($ppcontinue)
+		{
+			$path .= '&ppcontinue=';
+		}
+
+		if (isset($ppprop))
+		{
+			$path .= '&ppprop=' . $ppprop;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get a list of revisions.
+	 *
+	 * @param   array    $titles   Page titles to retrieve revisions.
+	 * @param   array    $rvprop   Which properties to get for each revision.
+	 * @param   boolean  $rvparse  Parse revision content.
+	 * @param   int      $rvlimit  Limit how many revisions will be returned.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getRevisions(array $titles, array $rvprop = null, $rvparse = null, $rvlimit = null)
+	{
+		// Build the request
+		$path = '?action=query&prop=revisions';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($rvprop))
+		{
+			$path .= '&rvprop=' . $this->buildParameter($rvprop);
+		}
+
+		if ($rvparse)
+		{
+			$path .= '&rvparse=';
+		}
+
+		if (isset($rvlimit))
+		{
+			$path .= '&rvlimit=' . $rvlimit;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get all page templates from the given page.
+	 *
+	 * @param   array    $titles       Page titles to retrieve templates.
+	 * @param   array    $tlnamespace  Show templates in this namespace(s) only.
+	 * @param   integer  $tllimit      How many templates to return.
+	 * @param   boolean  $tlcontinue   When more results are available, use this to continue.
+	 * @param   string   $tltemplates  Only list these templates.
+	 * @param   string   $tldir        The direction in which to list.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getPageTemplates(array $titles, array $tlnamespace = null, $tllimit = null, $tlcontinue = null, $tltemplates = null, $tldir = null)
+	{
+		// Build the request.
+		$path = '?action=query&prop=templates';
+
+		// Append titles to the request.
+		$path .= '&titles=' . $this->buildParameter($titles);
+
+		if (isset($tlnamespace))
+		{
+			$path .= '&tlnamespace=' . $this->buildParameter($tlnamespace);
+		}
+
+		if (isset($tllimit))
+		{
+			$path .= '&tllimit=' . $tllimit;
+		}
+
+		if ($tlcontinue)
+		{
+			$path .= '&tlcontinue=';
+		}
+
+		if (isset($tltemplates))
+		{
+			$path .= '&tltemplates=' . $tltemplates;
+		}
+
+		if (isset($tldir))
+		{
+			$path .= '&tldir=' . $tldir;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get all pages that link to the given page.
+	 *
+	 * @param   string   $bltitle           Title to search.
+	 * @param   integer  $blpageid          Pageid to search.
+	 * @param   boolean  $blcontinue        When more results are available, use this to continue.
+	 * @param   array    $blnamespace       The namespace to enumerate.
+	 * @param   string   $blfilterredirect  How to filter for redirects..
+	 * @param   integer  $bllimit           How many total pages to return.
+	 * @param   boolean  $blredirect        If linking page is a redirect, find all pages that link to that redirect as well.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getBackLinks($bltitle, $blpageid = null, $blcontinue = null, array $blnamespace = null, $blfilterredirect = null,
+		$bllimit = null, $blredirect = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=backlinks';
+
+		if (isset($bltitle))
+		{
+			$path .= '&bltitle=' . $bltitle;
+		}
+
+		if (isset($blpageid))
+		{
+			$path .= '&blpageid=' . $blpageid;
+		}
+
+		if ($blcontinue)
+		{
+			$path .= '&blcontinue=';
+		}
+
+		if (isset($blnamespace))
+		{
+			$path .= '&blnamespace=' . $this->buildParameter($blnamespace);
+		}
+
+		if (isset($blfilterredirect))
+		{
+			$path .= '&blfilterredirect=' . $blfilterredirect;
+		}
+
+		if (isset($bllimit))
+		{
+			$path .= '&bllimit=' . $bllimit;
+		}
+
+		if ($blredirect)
+		{
+			$path .= '&blredirect=';
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get all pages that link to the given interwiki link.
+	 *
+	 * @param   string   $iwbltitle     Interwiki link to search for. Must be used with iwblprefix.
+	 * @param   string   $iwblprefix    Prefix for the interwiki.
+	 * @param   boolean  $iwblcontinue  When more results are available, use this to continue.
+	 * @param   integer  $iwbllimit     How many total pages to return.
+	 * @param   array    $iwblprop      Which properties to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getIWBackLinks($iwbltitle, $iwblprefix = null, $iwblcontinue = null, $iwbllimit = null, array $iwblprop = null)
+	{
+		// Build the request
+		$path = '?action=query&list=iwbacklinks';
+
+		if (isset($iwbltitle))
+		{
+			$path .= '&iwbltitle=' . $iwbltitle;
+		}
+
+		if (isset($iwblprefix))
+		{
+			$path .= '&iwblprefix=' . $iwblprefix;
+		}
+
+		if ($iwblcontinue)
+		{
+			$path .= '&iwblcontinue=';
+		}
+
+		if (isset($iwbllimit))
+		{
+			$path .= '&bllimit=' . $iwbllimit;
+		}
+
+		if (isset($iwblprop))
+		{
+			$path .= '&iwblprop=' . $this->buildParameter($iwblprop);
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get access token.
+	 *
+	 * @param   string  $user     The User to get token.
+	 * @param   string  $intoken  The type of token.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
+	public function getToken($user, $intoken)
+	{
+		// Build the request path.
+		$path = '?action=query&prop=info&intoken=' . $intoken . '&titles=User:' . $user;
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), null);
+
+		return (string) $this->validateResponse($response)->query->pages->page[$intoken . 'token'];
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/search.php b/core/libraries/joomla/mediawiki/search.php
new file mode 100644
index 00000000..2cf0ba39
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/search.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Search class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiSearch extends JMediawikiObject
+{
+	/**
+	 * Method to perform a full text search.
+	 *
+	 * @param   string   $srsearch     Search for all page titles (or content) that has this value.
+	 * @param   array    $srnamespace  The namespace(s) to enumerate.
+	 * @param   string   $srwhat       Search inside the text or titles.
+	 * @param   array    $srinfo       What metadata to return.
+	 * @param   array    $srprop       What properties to return.
+	 * @param   boolean  $srredirects  Include redirect pages in the search.
+	 * @param   integer  $sroffest     Use this value to continue paging.
+	 * @param   integer  $srlimit      How many total pages to return.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function search($srsearch, array $srnamespace = null, $srwhat = null, array $srinfo = null, array $srprop = null,
+		$srredirects = null, $sroffest = null, $srlimit = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=search';
+
+		if (isset($srsearch))
+		{
+			$path .= '&srsearch=' . $srsearch;
+		}
+
+		if (isset($srnamespace))
+		{
+			$path .= '&srnamespace=' . $this->buildParameter($srnamespace);
+		}
+
+		if (isset($srwhat))
+		{
+			$path .= '&srwhat=' . $srwhat;
+		}
+
+		if (isset($srinfo))
+		{
+			$path .= '&srinfo=' . $this->buildParameter($srinfo);
+		}
+
+		if (isset($srprop))
+		{
+			$path .= '&srprop=' . $this->buildParameter($srprop);
+		}
+
+		if ($srredirects)
+		{
+			$path .= '&srredirects=';
+		}
+
+		if (isset($sroffest))
+		{
+			$path .= '&sroffest=' . $sroffest;
+		}
+
+		if (isset($srlimit))
+		{
+			$path .= '&srlimit=' . $srlimit;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to search the wiki using opensearch protocol.
+	 *
+	 * @param   string   $search     Search string.
+	 * @param   integer  $limit	     Maximum amount of results to return.
+	 * @param   array    $namespace  Namespaces to search.
+	 * @param   string   $suggest    Do nothing if $wgEnableOpenSearchSuggest is false.
+	 * @param   string   $format     Output format.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function openSearch($search, $limit = null, array $namespace = null, $suggest = null, $format = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=search';
+
+		if (isset($search))
+		{
+			$path .= '&search=' . $search;
+		}
+
+		if (isset($limit))
+		{
+			$path .= '&limit=' . $limit;
+		}
+
+		if (isset($namespace))
+		{
+			$path .= '&namespace=' . $this->buildParameter($namespace);
+		}
+
+		if (isset($suggest))
+		{
+			$path .= '&suggest=' . $suggest;
+		}
+
+		if (isset($format))
+		{
+			$path .= '&format=' . $format;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/sites.php b/core/libraries/joomla/mediawiki/sites.php
new file mode 100644
index 00000000..ee893f8f
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/sites.php
@@ -0,0 +1,313 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Sites class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiSites extends JMediawikiObject
+{
+	/**
+	 * Method to get site information.
+	 *
+	 * @param   array    $siprop            The sysinfo properties to get.
+	 * @param   string   $sifilteriw        Only local or only non local entries to return.
+	 * @param   boolean  $sishowalldb       List all database servers.
+	 * @param   boolean  $sinumberingroup   List the number of users in usergroups.
+	 * @param   array    $siinlanguagecode  Language code for localized languages.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getSiteInfo(array $siprop = null, $sifilteriw = null, $sishowalldb = false, $sinumberingroup = false, array $siinlanguagecode = null)
+	{
+		// Build the request.
+		$path = '?action=query&meta=siteinfo';
+
+		if (isset($siprop))
+		{
+			$path .= '&siprop=' . $this->buildParameter($siprop);
+		}
+
+		if (isset($sifilteriw))
+		{
+			$path .= '&sifilteriw=' . $sifilteriw;
+		}
+
+		if ($sishowalldb)
+		{
+			$path .= '&sishowalldb=';
+		}
+
+		if ($sinumberingroup)
+		{
+			$path .= '&sinumberingroup=';
+		}
+
+		if (isset($siinlanguagecode))
+		{
+			$path .= '&siinlanguagecode=' . $this->buildParameter($siinlanguagecode);
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get events from logs.
+	 *
+	 * @param   array    $leprop    List of properties to get.
+	 * @param   string   $letype    Filter log actions to only this type.
+	 * @param   string   $leaction  Filter log actions to only this type.
+	 * @param   string   $letitle   Filter entries to those related to a page.
+	 * @param   string   $leprefix  Filter entries that start with this prefix.
+	 * @param   string   $letag     Filter entries with tag.
+	 * @param   string   $leuser    Filter entries made by the given user.
+	 * @param   string   $lestart   Starting timestamp.
+	 * @param   string   $leend     Ending timestamp.
+	 * @param   string   $ledir     Direction of enumeration.
+	 * @param   integer  $lelimit   Event limit to return.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getEvents(array $leprop = null, $letype = null, $leaction = null, $letitle = null, $leprefix = null, $letag = null,
+		$leuser = null, $lestart = null, $leend = null, $ledir = null, $lelimit = null)
+	{
+		// Build the request
+		$path = '?action=query&list=logevents';
+
+		if (isset($leprop))
+		{
+			$path .= '&leprop=' . $this->buildParameter($leprop);
+		}
+
+		if (isset($letype))
+		{
+			$path .= '&letype=' . $letype;
+		}
+
+		if (isset($leaction))
+		{
+			$path .= '&leaction=' . $leaction;
+		}
+
+		if (isset($letitle))
+		{
+			$path .= '&letitle=' . $letitle;
+		}
+
+		if (isset($leprefix))
+		{
+			$path .= '&leprefix=' . $leprefix;
+		}
+
+		if (isset($letag))
+		{
+			$path .= '&letag=' . $letag;
+		}
+
+		if (isset($leuser))
+		{
+			$path .= '&leuser=' . $leuser;
+		}
+
+		if (isset($lestart))
+		{
+			$path .= '&lestart=' . $lestart;
+		}
+
+		if (isset($leend))
+		{
+			$path .= '&leend=' . $leend;
+		}
+
+		if (isset($ledir))
+		{
+			$path .= '&ledir=' . $ledir;
+		}
+
+		if (isset($lelimit))
+		{
+			$path .= '&lelimit=' . $lelimit;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get recent changes on a site.
+	 *
+	 * @param   string  $rcstart        Starting timestamp.
+	 * @param   string  $rcend          Ending timestamp.
+	 * @param   string  $rcdir          Direction of enumeration.
+	 * @param   array   $rcnamespace    Filter changes to only this namespace(s).
+	 * @param   string  $rcuser         Filter changes by this user.
+	 * @param   string  $rcexcludeuser  Filter changes to exclude changes by this user.
+	 * @param   string  $rctag          Filter changes by this tag.
+	 * @param   array   $rcprop         Filter log actions to only this type.
+	 * @param   array   $rctoken        Which token to obtain for each change.
+	 * @param   array   $rcshow         Filter changes by this criteria.
+	 * @param   string  $rclimit        Changes limit to return.
+	 * @param   string  $rctype         Filter event by type of changes.
+	 * @param   string  $rctoponly      Filter changes which are latest revision.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getRecentChanges($rcstart = null, $rcend = null, $rcdir = null, array $rcnamespace = null, $rcuser = null, $rcexcludeuser = null,
+		$rctag = null, array $rcprop = null, array $rctoken = null, array $rcshow = null, $rclimit = null, $rctype = null, $rctoponly = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=recentchanges';
+
+		if (isset($rcstart))
+		{
+			$path .= '&rcstart=' . $rcstart;
+		}
+
+		if (isset($rcend))
+		{
+			$path .= '&rcend=' . $rcend;
+		}
+
+		if (isset($rcdir))
+		{
+			$path .= '&rcdir=' . $rcdir;
+		}
+
+		if (isset($rcnamespace))
+		{
+			$path .= '&rcnamespaces=' . $this->buildParameter($rcnamespace);
+		}
+
+		if (isset($rcuser))
+		{
+			$path .= '&rcuser=' . $rcuser;
+		}
+
+		if (isset($rcexcludeuser))
+		{
+			$path .= '&rcexcludeuser=' . $rcexcludeuser;
+		}
+
+		if (isset($rctag))
+		{
+			$path .= '&rctag=' . $rctag;
+		}
+
+		if (isset($rcprop))
+		{
+			$path .= '&rcprop=' . $this->buildParameter($rcprop);
+		}
+
+		if (isset($rctoken))
+		{
+			$path .= '&rctoken=' . $this->buildParameter($rctoken);
+		}
+
+		if (isset($rcshow))
+		{
+			$path .= '&rcshow=' . $this->buildParameter($rcshow);
+		}
+
+		if (isset($rclimit))
+		{
+			$path .= '&rclimit=' . $rclimit;
+		}
+
+		if (isset($rctype))
+		{
+			$path .= '&rctype=' . $rctype;
+		}
+
+		if (isset($rctoponly))
+		{
+			$path .= '&rctoponly=' . $rctoponly;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get protected titles on a site.
+	 *
+	 * @param   array    $ptnamespace  Only list titles in this namespace.
+	 * @param   array    $ptlevel      Only list titles with these protection level.
+	 * @param   integer  $ptlimit      Limit of pages to return.
+	 * @param   string   $ptdir        Direction of enumeration.
+	 * @param   string   $ptstart      Starting timestamp.
+	 * @param   string   $ptend        Ending timestamp.
+	 * @param   array    $ptprop       List of properties to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getProtectedTitles(array $ptnamespace = null, array $ptlevel = null, $ptlimit = null, $ptdir = null, $ptstart = null,
+		$ptend = null, array $ptprop = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=protectedtitles';
+
+		if (isset($ptnamespace))
+		{
+			$path .= '&ptnamespace=' . $this->buildParameter($ptnamespace);
+		}
+
+		if (isset($ptlevel))
+		{
+			$path .= '&ptlevel=' . $this->buildParameter($ptlevel);
+		}
+
+		if (isset($ptlimit))
+		{
+			$path .= '&ptlimit=' . $ptlimit;
+		}
+
+		if (isset($ptdir))
+		{
+			$path .= '&ptdir=' . $ptdir;
+		}
+
+		if (isset($ptstart))
+		{
+			$path .= '&ptstart=' . $ptstart;
+		}
+
+		if (isset($ptend))
+		{
+			$path .= '&ptend=' . $ptend;
+		}
+
+		if (isset($ptprop))
+		{
+			$path .= '&ptprop=' . $this->buildParameter($ptprop);
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+}
diff --git a/core/libraries/joomla/mediawiki/users.php b/core/libraries/joomla/mediawiki/users.php
new file mode 100644
index 00000000..b8e725eb
--- /dev/null
+++ b/core/libraries/joomla/mediawiki/users.php
@@ -0,0 +1,440 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  MediaWiki
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * MediaWiki API Users class for the Joomla Platform.
+ *
+ * @since  12.3
+ */
+class JMediawikiUsers extends JMediawikiObject
+{
+	/**
+	 * Method to login and get authentication tokens.
+	 *
+	 * @param   string  $lgname      User Name.
+	 * @param   string  $lgpassword  Password.
+	 * @param   string  $lgdomain    Domain (optional).
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function login($lgname, $lgpassword, $lgdomain = null)
+	{
+		// Build the request path.
+		$path = '?action=login&lgname=' . $lgname . '&lgpassword=' . $lgpassword;
+
+		if (isset($lgdomain))
+		{
+			$path .= '&lgdomain=' . $lgdomain;
+		}
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), null);
+
+		// Request path with login token.
+		$path = '?action=login&lgname=' . $lgname . '&lgpassword=' . $lgpassword . '&lgtoken=' . $this->validateResponse($response)->login['token'];
+
+		if (isset($lgdomain))
+		{
+			$path .= '&lgdomain=' . $lgdomain;
+		}
+
+		// Set the session cookies returned.
+		$headers = (array) $this->options->get('headers');
+		$headers['Cookie'] = !empty($headers['Cookie']) ? empty($headers['Cookie']) : '';
+		$headers['Cookie'] = $headers['Cookie'] . $response->headers['Set-Cookie'];
+		$this->options->set('headers', $headers);
+
+		// Send the request again with the token.
+		$response = $this->client->post($this->fetchUrl($path), null);
+		$response_body = $this->validateResponse($response);
+
+		$headers = (array) $this->options->get('headers');
+		$cookie_prefix = $response_body->login['cookieprefix'];
+		$cookie = $cookie_prefix . 'UserID=' . $response_body->login['lguserid'] . '; ' . $cookie_prefix
+			. 'UserName=' . $response_body->login['lgusername'];
+		$headers['Cookie'] = $headers['Cookie'] . '; ' . $response->headers['Set-Cookie'] . '; ' . $cookie;
+		$this->options->set('headers', $headers);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to logout and clear session data.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function logout()
+	{
+		// Build the request path.
+		$path = '?action=login';
+
+		// @TODO clear internal data as well
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get user information.
+	 *
+	 * @param   array  $ususers  A list of users to obtain the same information for.
+	 * @param   array  $usprop   What pieces of information to include.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getUserInfo(array $ususers, array $usprop = null)
+	{
+		// Build the request path.
+		$path = '?action=query&list=users';
+
+		// Append users to the request.
+		$path .= '&ususers=' . $this->buildParameter($ususers);
+
+		if (isset($usprop))
+		{
+			$path .= '&usprop' . $this->buildParameter($usprop);
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get current user information.
+	 *
+	 * @param   array  $uiprop  What pieces of information to include.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getCurrentUserInfo(array $uiprop = null)
+	{
+		// Build the request path.
+		$path = '?action=query&meta=userinfo';
+
+		if (isset($uiprop))
+		{
+			$path .= '&uiprop' . $this->buildParameter($uiprop);
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get user contributions.
+	 *
+	 * @param   string   $ucuser        The users to retrieve contributions for.
+	 * @param   string   $ucuserprefix  Retrieve contibutions for all users whose names begin with this value.
+	 * @param   integer  $uclimit       The users to retrieve contributions for.
+	 * @param   string   $ucstart       The start timestamp to return from.
+	 * @param   string   $ucend         The end timestamp to return to.
+	 * @param   boolean  $uccontinue    When more results are available, use this to continue.
+	 * @param   string   $ucdir         In which direction to enumerate.
+	 * @param   array    $ucnamespace   Only list contributions in these namespaces.
+	 * @param   array    $ucprop        Include additional pieces of information.
+	 * @param   array    $ucshow        Show only items that meet this criteria.
+	 * @param   string   $uctag         Only list revisions tagged with this tag.
+	 * @param   string   $uctoponly     Only list changes which are the latest revision
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getUserContribs($ucuser = null, $ucuserprefix = null, $uclimit = null, $ucstart = null, $ucend = null, $uccontinue = null,
+		$ucdir = null, array $ucnamespace = null, array $ucprop = null, array $ucshow = null, $uctag = null, $uctoponly = null)
+	{
+		// Build the request path.
+		$path = '?action=query&list=usercontribs';
+
+		if (isset($ucuser))
+		{
+			$path .= '&ucuser=' . $ucuser;
+		}
+
+		if (isset($ucuserprefix))
+		{
+			$path .= '&ucuserprefix=' . $ucuserprefix;
+		}
+
+		if (isset($uclimit))
+		{
+			$path .= '&uclimit=' . $uclimit;
+		}
+
+		if (isset($ucstart))
+		{
+			$path .= '&ucstart=' . $ucstart;
+		}
+
+		if (isset($ucend))
+		{
+			$path .= '&ucend=' . $ucend;
+		}
+
+		if ($uccontinue)
+		{
+			$path .= '&uccontinue=';
+		}
+
+		if (isset($ucdir))
+		{
+			$path .= '&ucdir=' . $ucdir;
+		}
+
+		if (isset($ucnamespace))
+		{
+			$path .= '&ucnamespace=' . $this->buildParameter($ucnamespace);
+		}
+
+		if (isset($ucprop))
+		{
+			$path .= '&ucprop=' . $this->buildParameter($ucprop);
+		}
+
+		if (isset($ucshow))
+		{
+			$path .= '&ucshow=' . $this->buildParameter($ucshow);
+		}
+
+		if (isset($uctag))
+		{
+			$path .= '&uctag=' . $uctag;
+		}
+
+		if (isset($uctoponly))
+		{
+			$path .= '&uctoponly=' . $uctoponly;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to block a user.
+	 *
+	 * @param   string   $user           Username, IP address or IP range you want to block.
+	 * @param   string   $expiry         Relative expiry time, Default: never.
+	 * @param   string   $reason         Reason for block (optional).
+	 * @param   boolean  $anononly       Block anonymous users only.
+	 * @param   boolean  $nocreate       Prevent account creation.
+	 * @param   boolean  $autoblock      Automatically block the last used IP address, and any subsequent IP addresses they try to login from.
+	 * @param   boolean  $noemail        Prevent user from sending email through the wiki.
+	 * @param   boolean  $hidename       Hide the username from the block log.
+	 * @param   boolean  $allowusertalk  Allow the user to edit their own talk page.
+	 * @param   boolean  $reblock        If the user is already blocked, overwrite the existing block.
+	 * @param   boolean  $watchuser      Watch the user/IP's user and talk pages.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function blockUser($user, $expiry = null, $reason = null, $anononly = null, $nocreate = null, $autoblock = null, $noemail = null,
+		$hidename = null, $allowusertalk = null, $reblock = null, $watchuser = null)
+	{
+		// Get the token.
+		$token = $this->getToken($user, 'block');
+
+		// Build the request path.
+		$path = '?action=unblock';
+
+		// Build the request data.
+		$data = array(
+			'user' => $user,
+			'token' => $token,
+			'expiry' => $expiry,
+			'reason' => $reason,
+			'anononly' => $anononly,
+			'nocreate' => $nocreate,
+			'autoblock' => $autoblock,
+			'noemail' => $noemail,
+			'hidename' => $hidename,
+			'allowusetalk' => $allowusertalk,
+			'reblock' => $reblock,
+			'watchuser' => $watchuser,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to unblock a user.
+	 *
+	 * @param   string  $user    Username, IP address or IP range you want to unblock.
+	 * @param   string  $reason  Reason for unblock (optional).
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function unBlockUserByName($user, $reason = null)
+	{
+		// Get the token.
+		$token = $this->getToken($user, 'unblock');
+
+		// Build the request path.
+		$path = '?action=unblock';
+
+		// Build the request data.
+		$data = array(
+				'user' => $user,
+				'token' => $token,
+				'reason' => $reason,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to unblock a user.
+	 *
+	 * @param   int     $id      Username, IP address or IP range you want to unblock.
+	 * @param   string  $reason  Reason for unblock (optional).
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function unBlockUserById($id, $reason = null)
+	{
+		// Get the token.
+		$token = $this->getToken($id, 'unblock');
+
+		// Build the request path.
+		$path = '?action=unblock';
+
+		// Build the request data.
+		// TODO: $data doesn't seem to be used!
+		$data = array(
+			'id' => $id,
+			'token' => $token,
+			'reason' => $reason,
+		);
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to assign a user to a group.
+	 *
+	 * @param   string  $username  User name.
+	 * @param   array   $add       Add the user to these groups.
+	 * @param   array   $remove    Remove the user from these groups.
+	 * @param   string  $reason    Reason for the change.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function assignGroup($username, $add = null, $remove = null, $reason = null)
+	{
+		// Get the token.
+		$token = $this->getToken($username, 'unblock');
+
+		// Build the request path.
+		$path = '?action=userrights';
+
+		// Build the request data.
+		$data = array(
+			'username' => $username,
+			'token' => $token,
+			'add' => $add,
+			'remove' => $remove,
+			'reason' => $reason,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to email a user.
+	 *
+	 * @param   string   $target   User to send email to.
+	 * @param   string   $subject  Subject header.
+	 * @param   string   $text     Mail body.
+	 * @param   boolean  $ccme     Send a copy of this mail to me.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function emailUser($target, $subject = null, $text = null, $ccme = null)
+	{
+		// Get the token.
+		$token = $this->getToken($target, 'emailuser');
+
+		// Build the request path.
+		$path = '?action=emailuser';
+
+		// Build the request data.
+		$data = array(
+			'target' => $target,
+			'token' => $token,
+			'subject' => $subject,
+			'text' => $text,
+			'ccme' => $ccme,
+		);
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), $data);
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to get access token.
+	 *
+	 * @param   string  $user     The User to get token.
+	 * @param   string  $intoken  The type of token.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
+	public function getToken($user, $intoken)
+	{
+		// Build the request path.
+		$path = '?action=query&prop=info&intoken=' . $intoken . '&titles=User:' . $user;
+
+		// Send the request.
+		$response = $this->client->post($this->fetchUrl($path), null);
+
+		return (string) $this->validateResponse($response)->query->pages->page[$intoken . 'token'];
+	}
+}
diff --git a/core/libraries/joomla/model/base.php b/core/libraries/joomla/model/base.php
new file mode 100644
index 00000000..4bdd8dc5
--- /dev/null
+++ b/core/libraries/joomla/model/base.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Model
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform Base Model Class
+ *
+ * @since  12.1
+ */
+abstract class JModelBase implements JModel
+{
+	/**
+	 * The model state.
+	 *
+	 * @var    Registry
+	 * @since  12.1
+	 */
+	protected $state;
+
+	/**
+	 * Instantiate the model.
+	 *
+	 * @param   Registry  $state  The model state.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(Registry $state = null)
+	{
+		// Setup the model.
+		$this->state = isset($state) ? $state : $this->loadState();
+	}
+
+	/**
+	 * Get the model state.
+	 *
+	 * @return  Registry  The state object.
+	 *
+	 * @since   12.1
+	 */
+	public function getState()
+	{
+		return $this->state;
+	}
+
+	/**
+	 * Set the model state.
+	 *
+	 * @param   Registry  $state  The state object.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function setState(Registry $state)
+	{
+		$this->state = $state;
+	}
+
+	/**
+	 * Load the model state.
+	 *
+	 * @return  Registry  The state object.
+	 *
+	 * @since   12.1
+	 */
+	protected function loadState()
+	{
+		return new Registry;
+	}
+}
diff --git a/core/libraries/joomla/model/database.php b/core/libraries/joomla/model/database.php
new file mode 100644
index 00000000..fa715998
--- /dev/null
+++ b/core/libraries/joomla/model/database.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Model
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform Database Model Class
+ *
+ * @since  12.1
+ */
+abstract class JModelDatabase extends JModelBase
+{
+	/**
+	 * The database driver.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  12.1
+	 */
+	protected $db;
+
+	/**
+	 * Instantiate the model.
+	 *
+	 * @param   Registry         $state  The model state.
+	 * @param   JDatabaseDriver  $db     The database adpater.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(Registry $state = null, JDatabaseDriver $db = null)
+	{
+		parent::__construct($state);
+
+		// Setup the model.
+		$this->db = isset($db) ? $db : $this->loadDb();
+	}
+
+	/**
+	 * Get the database driver.
+	 *
+	 * @return  JDatabaseDriver  The database driver.
+	 *
+	 * @since   12.1
+	 */
+	public function getDb()
+	{
+		return $this->db;
+	}
+
+	/**
+	 * Set the database driver.
+	 *
+	 * @param   JDatabaseDriver  $db  The database driver.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function setDb(JDatabaseDriver $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Load the database driver.
+	 *
+	 * @return  JDatabaseDriver  The database driver.
+	 *
+	 * @since   12.1
+	 */
+	protected function loadDb()
+	{
+		return JFactory::getDbo();
+	}
+}
diff --git a/core/libraries/joomla/model/model.php b/core/libraries/joomla/model/model.php
new file mode 100644
index 00000000..7ff6dd9b
--- /dev/null
+++ b/core/libraries/joomla/model/model.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Model
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform Model Interface
+ *
+ * @since  12.1
+ */
+interface JModel
+{
+	/**
+	 * Get the model state.
+	 *
+	 * @return  Registry  The state object.
+	 *
+	 * @since   12.1
+	 */
+	public function getState();
+
+	/**
+	 * Set the model state.
+	 *
+	 * @param   Registry  $state  The state object.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function setState(Registry $state);
+}
diff --git a/core/libraries/joomla/oauth1/client.php b/core/libraries/joomla/oauth1/client.php
new file mode 100644
index 00000000..5c0afa83
--- /dev/null
+++ b/core/libraries/joomla/oauth1/client.php
@@ -0,0 +1,607 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  OAuth1
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with an OAuth 1.0 and 1.0a server.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/oauth1` framework package that will be bundled instead
+ */
+abstract class JOAuth1Client
+{
+	/**
+	 * @var    Registry  Options for the JOAuth1Client object.
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * @var    array  Contains access token key, secret and verifier.
+	 * @since  13.1
+	 */
+	protected $token = array();
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * @var    JInput The input object to use in retrieving GET/POST data.
+	 * @since  13.1
+	 */
+	protected $input;
+
+	/**
+	 * @var    JApplicationWeb  The application object to send HTTP headers for redirects.
+	 * @since  13.1
+	 */
+	protected $application;
+
+	/**
+	 * @var   string  Selects which version of OAuth to use: 1.0 or 1.0a.
+	 * @since 13.1
+	 */
+	protected $version;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry         $options      OAuth1Client options object.
+	 * @param   JHttp            $client       The HTTP client object.
+	 * @param   JInput           $input        The input object
+	 * @param   JApplicationWeb  $application  The application object
+	 * @param   string           $version      Specify the OAuth version. By default we are using 1.0a.
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JInput $input = null, JApplicationWeb $application = null,
+		$version = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : JHttpFactory::getHttp($this->options);
+		$this->input = isset($input) ? $input : JFactory::getApplication()->input;
+		$this->application = isset($application) ? $application : new JApplicationWeb;
+		$this->version = isset($version) ? $version : '1.0a';
+	}
+
+	/**
+	 * Method to for the oauth flow.
+	 *
+	 * @return  array  Contains access token key, secret and verifier.
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function authenticate()
+	{
+		// Already got some credentials stored?
+		if ($this->token)
+		{
+			$response = $this->verifyCredentials();
+
+			if ($response)
+			{
+				return $this->token;
+			}
+			else
+			{
+				$this->token = null;
+			}
+		}
+
+		// Check for callback.
+		if (strcmp($this->version, '1.0a') === 0)
+		{
+			$verifier = $this->input->get('oauth_verifier');
+		}
+		else
+		{
+			$verifier = $this->input->get('oauth_token');
+		}
+
+		if (empty($verifier))
+		{
+			// Generate a request token.
+			$this->_generateRequestToken();
+
+			// Authenticate the user and authorise the app.
+			$this->_authorise();
+		}
+
+		// Callback
+		else
+		{
+			$session = JFactory::getSession();
+
+			// Get token form session.
+			$this->token = array('key' => $session->get('key', null, 'oauth_token'), 'secret' => $session->get('secret', null, 'oauth_token'));
+
+			// Verify the returned request token.
+			if (strcmp($this->token['key'], $this->input->get('oauth_token')) !== 0)
+			{
+				throw new DomainException('Bad session!');
+			}
+
+			// Set token verifier for 1.0a.
+			if (strcmp($this->version, '1.0a') === 0)
+			{
+				$this->token['verifier'] = $this->input->get('oauth_verifier');
+			}
+
+			// Generate access token.
+			$this->_generateAccessToken();
+
+			// Return the access token.
+			return $this->token;
+		}
+	}
+
+	/**
+	 * Method used to get a request token.
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	private function _generateRequestToken()
+	{
+		// Set the callback URL.
+		if ($this->getOption('callback'))
+		{
+			$parameters = array(
+				'oauth_callback' => $this->getOption('callback'),
+			);
+		}
+		else
+		{
+			$parameters = array();
+		}
+
+		// Make an OAuth request for the Request Token.
+		$response = $this->oauthRequest($this->getOption('requestTokenURL'), 'POST', $parameters);
+
+		parse_str($response->body, $params);
+
+		if (strcmp($this->version, '1.0a') === 0 && strcmp($params['oauth_callback_confirmed'], 'true') !== 0)
+		{
+			throw new DomainException('Bad request token!');
+		}
+
+		// Save the request token.
+		$this->token = array('key' => $params['oauth_token'], 'secret' => $params['oauth_token_secret']);
+
+		// Save the request token in session
+		$session = JFactory::getSession();
+		$session->set('key', $this->token['key'], 'oauth_token');
+		$session->set('secret', $this->token['secret'], 'oauth_token');
+	}
+
+	/**
+	 * Method used to authorise the application.
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 */
+	private function _authorise()
+	{
+		$url = $this->getOption('authoriseURL') . '?oauth_token=' . $this->token['key'];
+
+		if ($this->getOption('scope'))
+		{
+			$scope = is_array($this->getOption('scope')) ? implode(' ', $this->getOption('scope')) : $this->getOption('scope');
+			$url .= '&scope=' . urlencode($scope);
+		}
+
+		if ($this->getOption('sendheaders'))
+		{
+			$this->application->redirect($url);
+		}
+	}
+
+	/**
+	 * Method used to get an access token.
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 */
+	private function _generateAccessToken()
+	{
+		// Set the parameters.
+		$parameters = array(
+			'oauth_token' => $this->token['key'],
+		);
+
+		if (strcmp($this->version, '1.0a') === 0)
+		{
+			$parameters = array_merge($parameters, array('oauth_verifier' => $this->token['verifier']));
+		}
+
+		// Make an OAuth request for the Access Token.
+		$response = $this->oauthRequest($this->getOption('accessTokenURL'), 'POST', $parameters);
+
+		parse_str($response->body, $params);
+
+		// Save the access token.
+		$this->token = array('key' => $params['oauth_token'], 'secret' => $params['oauth_token_secret']);
+	}
+
+	/**
+	 * Method used to make an OAuth request.
+	 *
+	 * @param   string  $url         The request URL.
+	 * @param   string  $method      The request method.
+	 * @param   array   $parameters  Array containing request parameters.
+	 * @param   mixed   $data        The POST request data.
+	 * @param   array   $headers     An array of name-value pairs to include in the header of the request
+	 *
+	 * @return  JHttpResponse
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function oauthRequest($url, $method, $parameters, $data = array(), $headers = array())
+	{
+		// Set the parameters.
+		$defaults = array(
+			'oauth_consumer_key' => $this->getOption('consumer_key'),
+			'oauth_signature_method' => 'HMAC-SHA1',
+			'oauth_version' => '1.0',
+			'oauth_nonce' => $this->generateNonce(),
+			'oauth_timestamp' => time(),
+		);
+
+		$parameters = array_merge($parameters, $defaults);
+
+		// Do not encode multipart parameters. Do not include $data in the signature if $data is not array.
+		if (isset($headers['Content-Type']) && strpos($headers['Content-Type'], 'multipart/form-data') !== false || !is_array($data))
+		{
+			$oauth_headers = $parameters;
+		}
+		else
+		{
+			// Use all parameters for the signature.
+			$oauth_headers = array_merge($parameters, $data);
+		}
+
+		// Sign the request.
+		$oauth_headers = $this->_signRequest($url, $method, $oauth_headers);
+
+		// Get parameters for the Authorisation header.
+		if (is_array($data))
+		{
+			$oauth_headers = array_diff_key($oauth_headers, $data);
+		}
+
+		// Send the request.
+		switch ($method)
+		{
+			case 'GET':
+				$url = $this->toUrl($url, $data);
+				$response = $this->client->get($url, array('Authorization' => $this->_createHeader($oauth_headers)));
+				break;
+			case 'POST':
+				$headers = array_merge($headers, array('Authorization' => $this->_createHeader($oauth_headers)));
+				$response = $this->client->post($url, $data, $headers);
+				break;
+			case 'PUT':
+				$headers = array_merge($headers, array('Authorization' => $this->_createHeader($oauth_headers)));
+				$response = $this->client->put($url, $data, $headers);
+				break;
+			case 'DELETE':
+				$headers = array_merge($headers, array('Authorization' => $this->_createHeader($oauth_headers)));
+				$response = $this->client->delete($url, $headers);
+				break;
+		}
+
+		// Validate the response code.
+		$this->validateResponse($url, $response);
+
+		return $response;
+	}
+
+	/**
+	 * Method to validate a response.
+	 *
+	 * @param   string         $url       The request URL.
+	 * @param   JHttpResponse  $response  The response to validate.
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	abstract public function validateResponse($url, $response);
+
+	/**
+	 * Method used to create the header for the POST request.
+	 *
+	 * @param   array  $parameters  Array containing request parameters.
+	 *
+	 * @return  string  The header.
+	 *
+	 * @since   13.1
+	 */
+	private function _createHeader($parameters)
+	{
+		$header = 'OAuth ';
+
+		foreach ($parameters as $key => $value)
+		{
+			if (!strcmp($header, 'OAuth '))
+			{
+				$header .= $key . '="' . $this->safeEncode($value) . '"';
+			}
+			else
+			{
+				$header .= ', ' . $key . '="' . $value . '"';
+			}
+		}
+
+		return $header;
+	}
+
+	/**
+	 * Method to create the URL formed string with the parameters.
+	 *
+	 * @param   string  $url         The request URL.
+	 * @param   array   $parameters  Array containing request parameters.
+	 *
+	 * @return  string  The formed URL.
+	 *
+	 * @since   13.1
+	 */
+	public function toUrl($url, $parameters)
+	{
+		foreach ($parameters as $key => $value)
+		{
+			if (is_array($value))
+			{
+				foreach ($value as $v)
+				{
+					if (strpos($url, '?') === false)
+					{
+						$url .= '?' . $key . '=' . $v;
+					}
+					else
+					{
+						$url .= '&' . $key . '=' . $v;
+					}
+				}
+			}
+			else
+			{
+				if (strpos($value, ' ') !== false)
+				{
+					$value = $this->safeEncode($value);
+				}
+
+				if (strpos($url, '?') === false)
+				{
+					$url .= '?' . $key . '=' . $value;
+				}
+				else
+				{
+					$url .= '&' . $key . '=' . $value;
+				}
+			}
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Method used to sign requests.
+	 *
+	 * @param   string  $url         The URL to sign.
+	 * @param   string  $method      The request method.
+	 * @param   array   $parameters  Array containing request parameters.
+	 *
+	 * @return  array
+	 *
+	 * @since   13.1
+	 */
+	private function _signRequest($url, $method, $parameters)
+	{
+		// Create the signature base string.
+		$base = $this->_baseString($url, $method, $parameters);
+
+		$parameters['oauth_signature'] = $this->safeEncode(
+			base64_encode(
+				hash_hmac('sha1', $base, $this->_prepareSigningKey(), true)
+				)
+			);
+
+		return $parameters;
+	}
+
+	/**
+	 * Prepare the signature base string.
+	 *
+	 * @param   string  $url         The URL to sign.
+	 * @param   string  $method      The request method.
+	 * @param   array   $parameters  Array containing request parameters.
+	 *
+	 * @return  string  The base string.
+	 *
+	 * @since   13.1
+	 */
+	private function _baseString($url, $method, $parameters)
+	{
+		// Sort the parameters alphabetically
+		uksort($parameters, 'strcmp');
+
+		// Encode parameters.
+		foreach ($parameters as $key => $value)
+		{
+			$key = $this->safeEncode($key);
+
+			if (is_array($value))
+			{
+				foreach ($value as $v)
+				{
+					$v = $this->safeEncode($v);
+					$kv[] = "{$key}={$v}";
+				}
+			}
+			else
+			{
+				$value = $this->safeEncode($value);
+				$kv[] = "{$key}={$value}";
+			}
+		}
+		// Form the parameter string.
+		$params = implode('&', $kv);
+
+		// Signature base string elements.
+		$base = array(
+			$method,
+			$url,
+			$params,
+		);
+
+		// Return the base string.
+		return implode('&', $this->safeEncode($base));
+	}
+
+	/**
+	 * Encodes the string or array passed in a way compatible with OAuth.
+	 * If an array is passed each array value will will be encoded.
+	 *
+	 * @param   mixed  $data  The scalar or array to encode.
+	 *
+	 * @return  string  $data encoded in a way compatible with OAuth.
+	 *
+	 * @since   13.1
+	 */
+	public function safeEncode($data)
+	{
+		if (is_array($data))
+		{
+			return array_map(array($this, 'safeEncode'), $data);
+		}
+		elseif (is_scalar($data))
+		{
+			return str_ireplace(
+				array('+', '%7E'),
+				array(' ', '~'),
+				rawurlencode($data)
+				);
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	/**
+	 * Method used to generate the current nonce.
+	 *
+	 * @return  string  The current nonce.
+	 *
+	 * @since   13.1
+	 */
+	public static function generateNonce()
+	{
+		$mt = microtime();
+		$rand = JCrypt::genRandomBytes();
+
+		// The md5s look nicer than numbers.
+		return md5($mt . $rand);
+	}
+
+	/**
+	 * Prepares the OAuth signing key.
+	 *
+	 * @return  string  The prepared signing key.
+	 *
+	 * @since   13.1
+	 */
+	private function _prepareSigningKey()
+	{
+		return $this->safeEncode($this->getOption('consumer_secret')) . '&' . $this->safeEncode(($this->token) ? $this->token['secret'] : '');
+	}
+
+	/**
+	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful;
+	 * returns a 401 status code and an error message if not.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   13.1
+	 */
+	abstract public function verifyCredentials();
+
+	/**
+	 * Get an option from the JOauth1aClient instance.
+	 *
+	 * @param   string  $key  The name of the option to get
+	 *
+	 * @return  mixed  The option value
+	 *
+	 * @since   13.1
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JOauth1aClient instance.
+	 *
+	 * @param   string  $key    The name of the option to set
+	 * @param   mixed   $value  The option value to set
+	 *
+	 * @return  JOAuth1Client  This object for method chaining
+	 *
+	 * @since   13.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Get the oauth token key or secret.
+	 *
+	 * @return  array  The oauth token key and secret.
+	 *
+	 * @since   13.1
+	 */
+	public function getToken()
+	{
+		return $this->token;
+	}
+
+	/**
+	 * Set the oauth token.
+	 *
+	 * @param   array  $token  The access token key and secret.
+	 *
+	 * @return  JOAuth1Client  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setToken($token)
+	{
+		$this->token = $token;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/oauth2/client.php b/core/libraries/joomla/oauth2/client.php
new file mode 100644
index 00000000..67036454
--- /dev/null
+++ b/core/libraries/joomla/oauth2/client.php
@@ -0,0 +1,388 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  OAuth2
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with an OAuth 2.0 server.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/oauth2` framework package that will be bundled instead
+ */
+class JOAuth2Client
+{
+	/**
+	 * @var    Registry  Options for the JOAuth2Client object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  12.3
+	 */
+	protected $http;
+
+	/**
+	 * @var    JInput  The input object to use in retrieving GET/POST data.
+	 * @since  12.3
+	 */
+	protected $input;
+
+	/**
+	 * @var    JApplicationWeb  The application object to send HTTP headers for redirects.
+	 * @since  12.3
+	 */
+	protected $application;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry         $options      JOAuth2Client options object
+	 * @param   JHttp            $http         The HTTP client object
+	 * @param   JInput           $input        The input object
+	 * @param   JApplicationWeb  $application  The application object
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JHttp $http = null, JInput $input = null, JApplicationWeb $application = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->http = isset($http) ? $http : new JHttp($this->options);
+		$this->application = isset($application) ? $application : new JApplicationWeb;
+		$this->input = isset($input) ? $input : $this->application->input;
+	}
+
+	/**
+	 * Get the access token or redict to the authentication URL.
+	 *
+	 * @return  string  The access token
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function authenticate()
+	{
+		if ($data['code'] = $this->input->get('code', false, 'raw'))
+		{
+			$data['grant_type'] = 'authorization_code';
+			$data['redirect_uri'] = $this->getOption('redirecturi');
+			$data['client_id'] = $this->getOption('clientid');
+			$data['client_secret'] = $this->getOption('clientsecret');
+			$response = $this->http->post($this->getOption('tokenurl'), $data);
+
+			if ($response->code >= 200 && $response->code < 400)
+			{
+				if (strpos($response->headers['Content-Type'], 'application/json') === 0)
+				{
+					$token = array_merge(json_decode($response->body, true), array('created' => time()));
+				}
+				else
+				{
+					parse_str($response->body, $token);
+					$token = array_merge($token, array('created' => time()));
+				}
+
+				$this->setToken($token);
+
+				return $token;
+			}
+			else
+			{
+				throw new RuntimeException('Error code ' . $response->code . ' received requesting access token: ' . $response->body . '.');
+			}
+		}
+
+		if ($this->getOption('sendheaders'))
+		{
+			$this->application->redirect($this->createUrl());
+		}
+
+		return false;
+	}
+
+	/**
+	 * Verify if the client has been authenticated
+	 *
+	 * @return  boolean  Is authenticated
+	 *
+	 * @since   12.3
+	 */
+	public function isAuthenticated()
+	{
+		$token = $this->getToken();
+
+		if (!$token || !array_key_exists('access_token', $token))
+		{
+			return false;
+		}
+		elseif (array_key_exists('expires_in', $token) && $token['created'] + $token['expires_in'] < time() + 20)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Create the URL for authentication.
+	 *
+	 * @return  JHttpResponse  The HTTP response
+	 *
+	 * @since   12.3
+	 * @throws  InvalidArgumentException
+	 */
+	public function createUrl()
+	{
+		if (!$this->getOption('authurl') || !$this->getOption('clientid'))
+		{
+			throw new InvalidArgumentException('Authorization URL and client_id are required');
+		}
+
+		$url = $this->getOption('authurl');
+
+		if (strpos($url, '?'))
+		{
+			$url .= '&';
+		}
+		else
+		{
+			$url .= '?';
+		}
+
+		$url .= 'response_type=code';
+		$url .= '&client_id=' . urlencode($this->getOption('clientid'));
+
+		if ($this->getOption('redirecturi'))
+		{
+			$url .= '&redirect_uri=' . urlencode($this->getOption('redirecturi'));
+		}
+
+		if ($this->getOption('scope'))
+		{
+			$scope = is_array($this->getOption('scope')) ? implode(' ', $this->getOption('scope')) : $this->getOption('scope');
+			$url .= '&scope=' . urlencode($scope);
+		}
+
+		if ($this->getOption('state'))
+		{
+			$url .= '&state=' . urlencode($this->getOption('state'));
+		}
+
+		if (is_array($this->getOption('requestparams')))
+		{
+			foreach ($this->getOption('requestparams') as $key => $value)
+			{
+				$url .= '&' . $key . '=' . urlencode($value);
+			}
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Send a signed Oauth request.
+	 *
+	 * @param   string  $url      The URL for the request.
+	 * @param   mixed   $data     The data to include in the request
+	 * @param   array   $headers  The headers to send with the request
+	 * @param   string  $method   The method with which to send the request
+	 * @param   int     $timeout  The timeout for the request
+	 *
+	 * @return  string  The URL.
+	 *
+	 * @since   12.3
+	 * @throws  InvalidArgumentException
+	 * @throws  RuntimeException
+	 */
+	public function query($url, $data = null, $headers = array(), $method = 'get', $timeout = null)
+	{
+		$token = $this->getToken();
+
+		if (array_key_exists('expires_in', $token) && $token['created'] + $token['expires_in'] < time() + 20)
+		{
+			if (!$this->getOption('userefresh'))
+			{
+				return false;
+			}
+
+			$token = $this->refreshToken($token['refresh_token']);
+		}
+
+		if (!$this->getOption('authmethod') || $this->getOption('authmethod') == 'bearer')
+		{
+			$headers['Authorization'] = 'Bearer ' . $token['access_token'];
+		}
+		elseif ($this->getOption('authmethod') == 'get')
+		{
+			if (strpos($url, '?'))
+			{
+				$url .= '&';
+			}
+			else
+			{
+				$url .= '?';
+			}
+
+			$url .= $this->getOption('getparam') ? $this->getOption('getparam') : 'access_token';
+			$url .= '=' . $token['access_token'];
+		}
+
+		switch ($method)
+		{
+			case 'head':
+			case 'get':
+			case 'delete':
+			case 'trace':
+			$response = $this->http->$method($url, $headers, $timeout);
+			break;
+			case 'post':
+			case 'put':
+			case 'patch':
+			$response = $this->http->$method($url, $data, $headers, $timeout);
+			break;
+			default:
+			throw new InvalidArgumentException('Unknown HTTP request method: ' . $method . '.');
+		}
+
+		if ($response->code < 200 || $response->code >= 400)
+		{
+			throw new RuntimeException('Error code ' . $response->code . ' received requesting data: ' . $response->body . '.');
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Get an option from the JOAuth2Client instance.
+	 *
+	 * @param   string  $key  The name of the option to get
+	 *
+	 * @return  mixed  The option value
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JOAuth2Client instance.
+	 *
+	 * @param   string  $key    The name of the option to set
+	 * @param   mixed   $value  The option value to set
+	 *
+	 * @return  JOAuth2Client  This object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Get the access token from the JOAuth2Client instance.
+	 *
+	 * @return  array  The access token
+	 *
+	 * @since   12.3
+	 */
+	public function getToken()
+	{
+		return $this->getOption('accesstoken');
+	}
+
+	/**
+	 * Set an option for the JOAuth2Client instance.
+	 *
+	 * @param   array  $value  The access token
+	 *
+	 * @return  JOAuth2Client  This object for method chaining
+	 *
+	 * @since   12.3
+	 */
+	public function setToken($value)
+	{
+		if (is_array($value) && !array_key_exists('expires_in', $value) && array_key_exists('expires', $value))
+		{
+			$value['expires_in'] = $value['expires'];
+			unset($value['expires']);
+		}
+
+		$this->setOption('accesstoken', $value);
+
+		return $this;
+	}
+
+	/**
+	 * Refresh the access token instance.
+	 *
+	 * @param   string  $token  The refresh token
+	 *
+	 * @return  array  The new access token
+	 *
+	 * @since   12.3
+	 * @throws  Exception
+	 * @throws  RuntimeException
+	 */
+	public function refreshToken($token = null)
+	{
+		if (!$this->getOption('userefresh'))
+		{
+			throw new RuntimeException('Refresh token is not supported for this OAuth instance.');
+		}
+
+		if (!$token)
+		{
+			$token = $this->getToken();
+
+			if (!array_key_exists('refresh_token', $token))
+			{
+				throw new RuntimeException('No refresh token is available.');
+			}
+
+			$token = $token['refresh_token'];
+		}
+
+		$data['grant_type'] = 'refresh_token';
+		$data['refresh_token'] = $token;
+		$data['client_id'] = $this->getOption('clientid');
+		$data['client_secret'] = $this->getOption('clientsecret');
+		$response = $this->http->post($this->getOption('tokenurl'), $data);
+
+		if ($response->code >= 200 || $response->code < 400)
+		{
+			if (strpos($response->headers['Content-Type'], 'application/json') === 0)
+			{
+				$token = array_merge(json_decode($response->body, true), array('created' => time()));
+			}
+			else
+			{
+				parse_str($response->body, $token);
+				$token = array_merge($token, array('created' => time()));
+			}
+
+			$this->setToken($token);
+
+			return $token;
+		}
+		else
+		{
+			throw new Exception('Error code ' . $response->code . ' received refreshing token: ' . $response->body . '.');
+		}
+	}
+}
diff --git a/core/libraries/joomla/observable/interface.php b/core/libraries/joomla/observable/interface.php
new file mode 100644
index 00000000..7d029c12
--- /dev/null
+++ b/core/libraries/joomla/observable/interface.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Observable Subject pattern interface for Joomla
+ *
+ * To make a class and its inheriting classes observable:
+ * 1) add: implements JObservableInterface
+ *    to its class
+ *
+ * 2) at the end of the constructor, add:
+ * // Create observer updater and attaches all observers interested by $this class:
+ * $this->_observers = new JObserverUpdater($this);
+ * JObserverMapper::attachAllObservers($this);
+ *
+ * 3) add the function attachObserver below to your class to add observers using the JObserverUpdater class:
+ * 	public function attachObserver(JObserverInterface $observer)
+ * 	{
+ * 		$this->_observers->attachObserver($observer);
+ * 	}
+ *
+ * 4) in the methods that need to be observed, add, e.g. (name of event, params of event):
+ * 		$this->_observers->update('onBeforeLoad', array($keys, $reset));
+ *
+ * @since  3.1.2
+ */
+interface JObservableInterface
+{
+	/**
+	 * Adds an observer to this JObservableInterface instance.
+	 * Ideally, this method should be called fron the constructor of JObserverInterface
+	 * which should be instanciated by JObserverMapper.
+	 * The implementation of this function can use JObserverUpdater
+	 *
+	 * @param   JObserverInterface  $observer  The observer to attach to $this observable subject
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function attachObserver(JObserverInterface $observer);
+}
diff --git a/core/libraries/joomla/observer/interface.php b/core/libraries/joomla/observer/interface.php
new file mode 100644
index 00000000..231eea61
--- /dev/null
+++ b/core/libraries/joomla/observer/interface.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Observer pattern interface for Joomla
+ *
+ * A class that wants to observe another class must:
+ *
+ * 1) Add: implements JObserverInterface
+ *    to its class
+ *
+ * 2) Implement a constructor, that can look like this:
+ * 	public function __construct(JObservableInterface $observableObject)
+ * 	{
+ * 	    $observableObject->attachObserver($this);
+ *  	$this->observableObject = $observableObject;
+ * 	}
+ *
+ * 3) and must implement the instanciator function createObserver() below, e.g. as follows:
+ * 	public static function createObserver(JObservableInterface $observableObject, $params = array())
+ * 	{
+ * 	    $observer = new self($observableObject);
+ *      $observer->... = $params['...']; ...
+ * 	    return $observer;
+ * 	}
+ *
+ * 4) Then add functions corresponding to the events to be observed,
+ *    E.g. to respond to event: $this->_observers->update('onBeforeLoad', array($keys, $reset));
+ *    following function is needed in the obser:
+ *  public function onBeforeLoad($keys, $reset) { ... }
+ *
+ * 5) Finally, the binding is made outside the observable and observer classes, using:
+ * JObserverMapper::addObserverClassToClass('ObserverClassname', 'ObservableClassname', array('paramName' => 'paramValue'));
+ * where the last array will be provided to the observer instanciator function createObserver.
+ *
+ * @since  3.1.2
+ */
+interface JObserverInterface
+{
+	/**
+	 * Creates the associated observer instance and attaches it to the $observableObject
+	 *
+	 * @param   JObservableInterface  $observableObject  The observable subject object
+	 * @param   array                 $params            Params for this observer
+	 *
+	 * @return  JObserverInterface
+	 *
+	 * @since   3.1.2
+	 */
+	public static function createObserver(JObservableInterface $observableObject, $params = array());
+}
diff --git a/core/libraries/joomla/observer/mapper.php b/core/libraries/joomla/observer/mapper.php
new file mode 100644
index 00000000..ed2ad05c
--- /dev/null
+++ b/core/libraries/joomla/observer/mapper.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Observer mapping pattern implementation for Joomla
+ *
+ * @since  3.1.2
+ */
+class JObserverMapper
+{
+	/**
+	 * Array: array( JObservableInterface_classname => array( JObserverInterface_classname => array( paramname => param, .... ) ) )
+	 *
+	 * @var    array
+	 * @since  3.1.2
+	 */
+	protected static $observations = array();
+
+	/**
+	 * Adds a mapping to observe $observerClass subjects with $observableClass observer/listener, attaching it on creation with $params
+	 * on $observableClass instance creations
+	 *
+	 * @param   string         $observerClass    The name of the observer class (implementing JObserverInterface)
+	 * @param   string         $observableClass  The name of the observable class (implementing JObservableInterface)
+	 * @param   array|boolean  $params           The params to give to the JObserverInterface::createObserver() function, or false to remove mapping
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public static function addObserverClassToClass($observerClass, $observableClass, $params = array())
+	{
+		if ($params !== false)
+		{
+			static::$observations[$observableClass][$observerClass] = $params;
+		}
+		else
+		{
+			unset(static::$observations[$observableClass][$observerClass]);
+		}
+	}
+
+	/**
+	 * Attaches all applicable observers to an $observableObject
+	 *
+	 * @param   JObservableInterface  $observableObject  The observable subject object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public static function attachAllObservers(JObservableInterface $observableObject)
+	{
+		$observableClass = get_class($observableObject);
+
+		while ($observableClass != false)
+		{
+			// Attach applicable Observers for the class to the Observable subject:
+			if (isset(static::$observations[$observableClass]))
+			{
+				foreach (static::$observations[$observableClass] as $observerClass => $params)
+				{
+					// Attach an Observer to the Observable subject:
+					/**
+					 * @var JObserverInterface $observerClass
+					 */
+					$observerClass::createObserver($observableObject, $params);
+				}
+			}
+
+			// Get parent class name (or false if none), and redo the above on it:
+			$observableClass = get_parent_class($observableClass);
+		}
+	}
+}
diff --git a/core/libraries/joomla/observer/updater.php b/core/libraries/joomla/observer/updater.php
new file mode 100644
index 00000000..8f2860cb
--- /dev/null
+++ b/core/libraries/joomla/observer/updater.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Observer updater pattern implementation for Joomla
+ *
+ * @since  3.1.2
+ */
+class JObserverUpdater implements JObserverUpdaterInterface
+{
+	/**
+	 * Generic JObserverInterface observers for this JObservableInterface
+	 *
+	 * @var    JObserverInterface
+	 * @since  3.1.2
+	 */
+	protected $observers = array();
+
+	/**
+	 * Process observers (useful when a class extends significantly an observerved method, and calls observers itself
+	 *
+	 * @var    boolean
+	 * @since  3.1.2
+	 */
+	protected $doCallObservers = true;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   JObservableInterface  $observable  The observable subject object
+	 *
+	 * @since   3.1.2
+	 */
+	public function __construct(JObservableInterface $observable)
+	{
+		// Not yet needed, but possible:  $this->observable = $observable;
+	}
+
+	/**
+	 * Adds an observer to the JObservableInterface instance updated by this
+	 * This method can be called from JObservableInterface::attachObserver
+	 *
+	 * @param   JObserverInterface  $observer  The observer object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function attachObserver(JObserverInterface $observer)
+	{
+		$class = get_class($observer);
+		$this->observers[$class] = $observer;
+
+		// Also register the alias
+		foreach (JLoader::getDeprecatedAliases() as $alias)
+		{
+			$realClass  = trim($alias['new'], '\\');
+			$aliasClass = trim($alias['old'], '\\');
+
+			// Check if we have an alias for the observer class
+			if ($realClass == $class)
+			{
+				// Register the alias
+				$this->observers[$aliasClass] = $observer;
+			}
+
+			// Check if the observer class is an alias
+			if ($aliasClass == $class)
+			{
+				// Register the real class
+				$this->observers[$realClass] = $observer;
+			}
+		}
+	}
+
+	/**
+	 * Removes an observer from the JObservableInterface instance updated by this
+	 * This method can be called from JObservableInterface::attachObserver
+	 *
+	 * @param   String  $observer  The observer class name
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function detachObserver($observer)
+	{
+		$observer = trim($observer, '\\');
+
+		if (isset($this->observers[$observer]))
+		{
+			unset($this->observers[$observer]);
+		}
+	}
+
+	/**
+	 * Gets the instance of the observer of class $observerClass
+	 *
+	 * @param   string  $observerClass  The class name of the observer
+	 *
+	 * @return  JTableObserver|null  The observer object of this class if any
+	 *
+	 * @since   3.1.2
+	 */
+	public function getObserverOfClass($observerClass)
+	{
+		$observerClass = trim($observerClass, '\\');
+
+		if (isset($this->observers[$observerClass]))
+		{
+			return $this->observers[$observerClass];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Call all observers for $event with $params
+	 *
+	 * @param   string  $event   Name of the event
+	 * @param   array   $params  Params of the event
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function update($event, $params)
+	{
+		if ($this->doCallObservers)
+		{
+			foreach ($this->observers as $observer)
+			{
+				$eventListener = array($observer, $event);
+
+				if (is_callable($eventListener))
+				{
+					call_user_func_array($eventListener, $params);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Enable/Disable calling of observers (this is useful when calling parent:: function
+	 *
+	 * @param   boolean  $enabled  Enable (true) or Disable (false) the observer events
+	 *
+	 * @return  boolean  Returns old state
+	 *
+	 * @since   3.1.2
+	 */
+	public function doCallObservers($enabled)
+	{
+		$oldState = $this->doCallObservers;
+		$this->doCallObservers = $enabled;
+
+		return $oldState;
+	}
+}
diff --git a/core/libraries/joomla/observer/updater/interface.php b/core/libraries/joomla/observer/updater/interface.php
new file mode 100644
index 00000000..1ccfae7b
--- /dev/null
+++ b/core/libraries/joomla/observer/updater/interface.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Observer updater pattern implementation for Joomla
+ *
+ * @since  3.1.2
+ */
+interface JObserverUpdaterInterface
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JObservableInterface  $observable  The observable subject object
+	 *
+	 * @since   3.1.2
+	 */
+	public function __construct(JObservableInterface $observable);
+
+	/**
+	 * Adds an observer to the JObservableInterface instance updated by this
+	 * This method can be called fron JObservableInterface::attachObserver
+	 *
+	 * @param   JObserverInterface  $observer  The observer object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function attachObserver(JObserverInterface $observer);
+
+	/**
+	 * Call all observers for $event with $params
+	 *
+	 * @param   string  $event   Event name (function name in observer)
+	 * @param   array   $params  Params of event (params in observer function)
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function update($event, $params);
+
+	/**
+	 * Enable/Disable calling of observers (this is useful when calling parent:: function
+	 *
+	 * @param   boolean  $enabled  Enable (true) or Disable (false) the observer events
+	 *
+	 * @return  boolean  Returns old state
+	 *
+	 * @since   3.1.2
+	 */
+	public function doCallObservers($enabled);
+}
diff --git a/core/libraries/joomla/observer/wrapper/mapper.php b/core/libraries/joomla/observer/wrapper/mapper.php
new file mode 100644
index 00000000..a28f38df
--- /dev/null
+++ b/core/libraries/joomla/observer/wrapper/mapper.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for JObserverMapper
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Observer
+ * @since       3.4
+ */
+class JObserverWrapperMapper
+{
+	/**
+	 * Helper wrapper method for addObserverClassToClass
+	 *
+	 * @param   string         $observerClass    The name of the observer class (implementing JObserverInterface).
+	 * @param   string         $observableClass  The name of the observable class (implementing JObservableInterface).
+	 * @param   array|boolean  $params           The params to give to the JObserverInterface::createObserver() function, or false to remove mapping.
+	 *
+	 * @return void
+	 *
+	 * @see     JObserverMapper::addObserverClassToClass
+	 * @since   3.4
+	 */
+	public function addObserverClassToClass($observerClass, $observableClass, $params = array())
+	{
+		return JObserverMapper::addObserverClassToClass($observerClass, $observableClass, $params);
+	}
+
+	/**
+	 * Helper wrapper method for attachAllObservers
+	 *
+	 * @param   JObservableInterface  $observableObject  The observable subject object.
+	 *
+	 * @return void
+	 *
+	 * @see     JObserverMapper::attachAllObservers
+	 * @since   3.4
+	 */
+	public function attachAllObservers(JObservableInterface $observableObject)
+	{
+		return JObserverMapper::attachAllObservers($observableObject);
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/changesets.php b/core/libraries/joomla/openstreetmap/changesets.php
new file mode 100644
index 00000000..b5b20ed0
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/changesets.php
@@ -0,0 +1,317 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Openstreetmap API Changesets class for the Joomla Platform
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmapChangesets extends JOpenstreetmapObject
+{
+	/**
+	 * Method to create a changeset
+	 *
+	 * @param   array  $changesets  Array which contains changeset data
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function createChangeset($changesets=array())
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+			'oauth_token_secret' => $token['secret'],
+		);
+
+		// Set the API base
+		$base = 'changeset/create';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+			<osm version="0.6" generator="JOpenstreetmap">';
+
+		if (!empty($changesets))
+		{
+			// Create Changeset element for every changeset
+			foreach ($changesets as $tags)
+			{
+				$xml .= '<changeset>';
+
+				if (!empty($tags))
+				{
+					// Create a list of tags for each changeset
+					foreach ($tags as $key => $value)
+					{
+						$xml .= '<tag k="' . $key . '" v="' . $value . '"/>';
+					}
+				}
+
+				$xml .= '</changeset>';
+			}
+		}
+
+		$xml .= '</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to read a changeset
+	 *
+	 * @param   integer  $id  identifier of the changeset
+	 *
+	 * @return  array  The XML response about a changeset
+	 *
+	 * @since   13.1
+	 */
+	public function readChangeset($id)
+	{
+		// Set the API base
+		$base = 'changeset/' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->changeset;
+	}
+
+	/**
+	 * Method to update a changeset
+	 *
+	 * @param   integer  $id    Identifier of the changeset
+	 * @param   array    $tags  Array of tags to update
+	 *
+	 * @return  array  The XML response of updated changeset
+	 *
+	 * @since   13.1
+	 */
+	public function updateChangeset($id, $tags = array())
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'changeset/' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Create a list of tags to update changeset
+		$tag_list = '';
+
+		if (!empty($tags))
+		{
+			foreach ($tags as $key => $value)
+			{
+				$tag_list .= '<tag k="' . $key . '" v="' . $value . '"/>';
+			}
+		}
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+				<osm version="0.6" generator="JOpenstreetmap">
+				<changeset>'
+				. $tag_list .
+				'</changeset>
+				</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string->changeset;
+	}
+
+	/**
+	 * Method to close a changeset
+	 *
+	 * @param   integer  $id  identifier of the changeset
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 */
+	public function closeChangeset($id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'changeset/' . $id . '/close';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['format'] = 'text/xml';
+
+		// Send the request.
+		$this->oauth->oauthRequest($path, 'PUT', $parameters, $header);
+	}
+
+	/**
+	 * Method to download a changeset
+	 *
+	 * @param   integer  $id  Identifier of the changeset
+	 *
+	 * @return  array  The XML response of requested changeset
+	 *
+	 * @since   13.1
+	 */
+	public function downloadChangeset($id)
+	{
+		// Set the API base
+		$base = 'changeset/' . $id . '/download';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->create;
+	}
+
+	/**
+	 * Method to expand the bounding box of a changeset
+	 *
+	 * @param   integer  $id     Identifier of the changeset
+	 * @param   array    $nodes  List of lat lon about nodes
+	 *
+	 * @return  array  The XML response of changed changeset
+	 *
+	 * @since   13.1
+	 */
+	public function expandBBoxChangeset($id, $nodes)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'changeset/' . $id . '/expand_bbox';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Create a list of tags to update changeset
+		$node_list = '';
+
+		if (!empty($nodes))
+		{
+			foreach ($nodes as $node)
+			{
+				$node_list .= '<node lat="' . $node[0] . '" lon="' . $node[1] . '"/>';
+			}
+		}
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+				<osm version="0.6" generator="JOpenstreetmap">
+				<changeset>'
+				. $node_list .
+				'</changeset>
+			</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string->changeset;
+	}
+
+	/**
+	 * Method to query on changesets
+	 *
+	 * @param   string  $param  Parameters for query
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function queryChangeset($param)
+	{
+		// Set the API base
+		$base = 'changesets/' . $param;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->osm;
+	}
+
+	/**
+	 * Method to upload a diff to a changeset
+	 *
+	 * @param   string   $xml  Diff data to upload
+	 * @param   integer  $id   Identifier of the changeset
+	 *
+	 * @return  array  The XML response of result
+	 *
+	 * @since   13.1
+	 */
+	public function diffUploadChangeset($xml, $id)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'changeset/' . $id . '/upload';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'POST', $parameters, $xml, $header);
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string->diffResult;
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/elements.php b/core/libraries/joomla/openstreetmap/elements.php
new file mode 100644
index 00000000..5cdf9a68
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/elements.php
@@ -0,0 +1,550 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Openstreetmap API Elements class for the Joomla Platform
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmapElements extends JOpenstreetmapObject
+{
+	/**
+	 * Method to create a node
+	 *
+	 * @param   integer  $changeset  Changeset id
+	 * @param   float    $latitude   Latitude of the node
+	 * @param   float    $longitude  Longitude of the node
+	 * @param   array    $tags       Array of tags for a node
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function createNode($changeset, $latitude, $longitude, $tags)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'node/create';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$tag_list = '';
+
+		// Create XML node
+		if (!empty($tags))
+		{
+			foreach ($tags as $key => $value)
+			{
+				$tag_list .= '<tag k="' . $key . '" v="' . $value . '"/>';
+			}
+		}
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+				<osm version="0.6" generator="JOpenstreetmap">
+				<node changeset="' . $changeset . '" lat="' . $latitude . '" lon="' . $longitude . '">'
+				. $tag_list .
+				'</node>
+				</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to create a way
+	 *
+	 * @param   integer  $changeset  Changeset id
+	 * @param   array    $tags       Array of tags for a way
+	 * @param   array    $nds        Node ids to refer
+	 *
+	 * @return  array   The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function createWay($changeset, $tags, $nds)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'way/create';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$tag_list = '';
+
+		// Create XML node
+		if (!empty($tags))
+		{
+			foreach ($tags as $key => $value)
+			{
+				$tag_list .= '<tag k="' . $key . '" v="' . $value . '"/>';
+			}
+		}
+
+		$nd_list = '';
+
+		if (!empty($nds))
+		{
+			foreach ($nds as $value)
+			{
+				$nd_list .= '<nd ref="' . $value . '"/>';
+			}
+		}
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+				<osm version="0.6" generator="JOpenstreetmap">
+				<way changeset="' . $changeset . '">'
+					. $tag_list
+					. $nd_list .
+				'</way>
+			</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to create a relation
+	 *
+	 * @param   integer  $changeset  Changeset id
+	 * @param   array    $tags       Array of tags for a relation
+	 * @param   array    $members    Array of members for a relation
+	 *                               eg: $members = array(array("type"=>"node", "role"=>"stop", "ref"=>"123"), array("type"=>"way", "ref"=>"123"))
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function createRelation($changeset, $tags, $members)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'relation/create';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$tag_list = '';
+
+		// Create XML node
+		if (!empty($tags))
+		{
+			foreach ($tags as $key => $value)
+			{
+				$tag_list .= '<tag k="' . $key . '" v="' . $value . '"/>';
+			}
+		}
+
+		// Members
+		$member_list = '';
+
+		if (!empty($members))
+		{
+			foreach ($members as $member)
+			{
+				if ($member['type'] == 'node')
+				{
+					$member_list .= '<member type="' . $member['type'] . '" role="' . $member['role'] . '" ref="' . $member['ref'] . '"/>';
+				}
+				elseif ($member['type'] == 'way')
+				{
+					$member_list .= '<member type="' . $member['type'] . '" ref="' . $member['ref'] . '"/>';
+				}
+			}
+		}
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+				<osm version="0.6" generator="JOpenstreetmap">
+				<relation relation="' . $changeset . '" >'
+					. $tag_list
+					. $member_list .
+				'</relation>
+			</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to read an element [node|way|relation]
+	 *
+	 * @param   string   $element  [node|way|relation]
+	 * @param   integer  $id       Element identifier
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function readElement($element, $id)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		// Set the API base
+		$base = $element . '/' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->$element;
+	}
+
+	/**
+	 * Method to update an Element [node|way|relation]
+	 *
+	 * @param   string   $element  [node|way|relation]
+	 * @param   string   $xml      Full reperentation of the element with a version number
+	 * @param   integer  $id       Element identifier
+	 *
+	 * @return  array   The xml response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function updateElement($element, $xml, $id)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = $element . '/' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to delete an element [node|way|relation]
+	 *
+	 * @param   string   $element    [node|way|relation]
+	 * @param   integer  $id         Element identifier
+	 * @param   integer  $version    Element version
+	 * @param   integer  $changeset  Changeset identifier
+	 * @param   float    $latitude   Latitude of the element
+	 * @param   float    $longitude  Longitude of the element
+	 *
+	 * @return  array   The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function deleteElement($element, $id, $version, $changeset, $latitude = null, $longitude = null)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = $element . '/' . $id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Create xml
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+				<osm version="0.6" generator="JOpenstreetmap">
+				<' . $element . ' id="' . $id . '" version="' . $version . '" changeset="' . $changeset . '"';
+
+		if (!empty($latitude) && !empty($longitude))
+		{
+			$xml .= ' lat="' . $latitude . '" lon="' . $longitude . '"';
+		}
+
+		$xml .= '/></osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'DELETE', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to get history of an element [node|way|relation]
+	 *
+	 * @param   string   $element  [node|way|relation]
+	 * @param   integer  $id       Element identifier
+	 *
+	 * @return  array   The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function historyOfElement($element, $id)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		// Set the API base
+		$base = $element . '/' . $id . '/history';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->$element;
+	}
+
+	/**
+	 * Method to get details about a version of an element [node|way|relation]
+	 *
+	 * @param   string   $element  [node|way|relation]
+	 * @param   integer  $id       Element identifier
+	 * @param   integer  $version  Element version
+	 *
+	 * @return  array    The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function versionOfElement($element, $id, $version)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		// Set the API base
+		$base = $element . '/' . $id . '/' . $version;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->$element;
+	}
+
+	/**
+	 * Method to get data about multiple ids of an element [node|way|relation]
+	 *
+	 * @param   string  $element  [nodes|ways|relations] - use plural word
+	 * @param   string  $params   Comma separated list of ids belonging to type $element
+	 *
+	 * @return  array   The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function multiFetchElements($element, $params)
+	{
+		if ($element != 'nodes' && $element != 'ways' && $element != 'relations')
+		{
+			throw new DomainException('Element should be nodes, ways or relations');
+		}
+
+		// Get singular word
+		$single_element = substr($element, 0, strlen($element) - 1);
+
+		// Set the API base, $params is a string with comma separated values
+		$base = $element . '?' . $element . '=' . $params;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->$single_element;
+	}
+
+	/**
+	 * Method to get relations for an Element [node|way|relation]
+	 *
+	 * @param   string   $element  [node|way|relation]
+	 * @param   integer  $id       Element identifier
+	 *
+	 * @return  array   The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function relationsForElement($element, $id)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		// Set the API base
+		$base = $element . '/' . $id . '/relations';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->$element;
+	}
+
+	/**
+	 * Method to get ways for a Node element
+	 *
+	 * @param   integer  $id  Node identifier
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function waysForNode($id)
+	{
+		// Set the API base
+		$base = 'node/' . $id . '/ways';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->way;
+	}
+
+	/**
+	 * Method to get full information about an element [way|relation]
+	 *
+	 * @param   string   $element  [way|relation]
+	 * @param   integer  $id       Identifier
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function fullElement($element, $id)
+	{
+		if ($element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a way or a relation');
+		}
+
+		// Set the API base
+		$base = $element . '/' . $id . '/full';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path);
+
+		return $xml_string->node;
+	}
+
+	/**
+	 * Method used by the DWG to hide old versions of elements containing data privacy or copyright infringements
+	 *
+	 * @param   string   $element       [node|way|relation]
+	 * @param   integer  $id            Element identifier
+	 * @param   integer  $version       Element version
+	 * @param   integer  $redaction_id  Redaction id
+	 *
+	 * @return  array   The xml response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function redaction($element, $id, $version, $redaction_id)
+	{
+		if ($element != 'node' && $element != 'way' && $element != 'relation')
+		{
+			throw new DomainException('Element should be a node, a way or a relation');
+		}
+
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = $element . '/' . $id . '/' . $version . '/redact?redaction=' . $redaction_id;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters);
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string;
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/gps.php b/core/libraries/joomla/openstreetmap/gps.php
new file mode 100644
index 00000000..baa75953
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/gps.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Openstreetmap API GPS class for the Joomla Platform
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmapGps extends JOpenstreetmapObject
+{
+	/**
+	 * Method to retrieve GPS points
+	 *
+	 * @param   float    $left    Left boundary
+	 * @param   float    $bottom  Bottom boundary
+	 * @param   float    $right   Right boundary
+	 * @param   float    $top     Top boundary
+	 * @param   integer  $page    Page number
+	 *
+	 * @return	array  The XML response containing GPS points
+	 *
+	 * @since	13.1
+	 */
+	public function retrieveGps($left, $bottom, $right, $top, $page = 0)
+	{
+		// Set the API base
+		$base = 'trackpoints?bbox=' . $left . ',' . $bottom . ',' . $right . ',' . $top . '&page=' . $page;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', array());
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string;
+	}
+
+	/**
+	 * Method to upload GPS Traces
+	 *
+	 * @param   string   $file         File name that contains trace points
+	 * @param   string   $description  Description on trace points
+	 * @param   string   $tags         Tags for trace
+	 * @param   integer  $public       1 for public, 0 for private
+	 * @param   string   $visibility   One of the following: private, public, trackable, identifiable
+	 * @param   string   $username     Username
+	 * @param   string   $password     Password
+	 *
+	 * @return  JHttpResponse  The response
+	 *
+	 * @since   13.1
+	 */
+	public function uploadTrace($file, $description, $tags, $public, $visibility, $username, $password)
+	{
+		// Set parameters.
+		$parameters = array(
+			'file' => $file,
+			'description' => $description,
+			'tags' => $tags,
+			'public' => $public,
+			'visibility' => $visibility,
+		);
+
+		// Set the API base
+		$base = 'gpx/create';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		$header['Content-Type'] = 'multipart/form-data';
+
+		$header = array_merge($header, $parameters);
+		$header = array_merge($header, array('Authorization' => 'Basic ' . base64_encode($username . ':' . $password)));
+
+		// Send the request.
+		$response = $this->sendRequest($path, 'POST', $header, array());
+
+		return $response;
+	}
+
+	/**
+	 * Method to download Trace details
+	 *
+	 * @param   integer  $id        Trace identifier
+	 * @param   string   $username  Username
+	 * @param   string   $password  Password
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function downloadTraceMetadetails($id, $username, $password)
+	{
+		// Set the API base
+		$base = 'gpx/' . $id . '/details';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path, 'GET', array('Authorization' => 'Basic ' . base64_encode($username . ':' . $password)));
+
+		return $xml_string;
+	}
+
+	/**
+	 * Method to download Trace data
+	 *
+	 * @param   integer  $id        Trace identifier
+	 * @param   string   $username  Username
+	 * @param   string   $password  Password
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function downloadTraceMetadata($id, $username, $password)
+	{
+		// Set the API base
+		$base = 'gpx/' . $id . '/data';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$xml_string = $this->sendRequest($path, 'GET', array('Authorization' => 'Basic ' . base64_encode($username . ':' . $password)));
+
+		return $xml_string;
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/info.php b/core/libraries/joomla/openstreetmap/info.php
new file mode 100644
index 00000000..7a984b99
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/info.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Openstreetmap API Info class for the Joomla Platform
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmapInfo extends JOpenstreetmapObject
+{
+	/**
+	 * Method to get capabilities of the API
+	 *
+	 * @return	array  The XML response
+	 *
+	 * @since	13.1
+	 */
+	public function getCapabilities()
+	{
+		// Set the API base
+		$base = 'capabilities';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', array());
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string;
+	}
+
+	/**
+	 * Method to retrieve map data of a bounding box
+	 *
+	 * @param   float  $left    Left boundary
+	 * @param   float  $bottom  Bottom boundary
+	 * @param   float  $right   Right boundary
+	 * @param   float  $top     Top boundary
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function retrieveMapData($left, $bottom, $right, $top)
+	{
+		// Set the API base
+		$base = 'map?bbox=' . $left . ',' . $bottom . ',' . $right . ',' . $top;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', array());
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string;
+	}
+
+	/**
+	 * Method to retrieve permissions for current user
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function retrievePermissions()
+	{
+		// Set the API base
+		$base = 'permissions';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', array());
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string;
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/oauth.php b/core/libraries/joomla/openstreetmap/oauth.php
new file mode 100644
index 00000000..51a3a808
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/oauth.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for generating Openstreetmap API access token.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmapOauth extends JOAuth1Client
+{
+	/**
+	 * Options for the JOpenstreetmapOauth object.
+	 *
+	 * @var    Registry
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  JOpenstreetmapOauth options object.
+	 * @param   JHttp     $client   The HTTP client object.
+	 * @param   JInput    $input    The input object
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JInput $input = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+
+		$this->options->def('accessTokenURL', 'https://www.openstreetmap.org/oauth/access_token');
+		$this->options->def('authoriseURL', 'https://www.openstreetmap.org/oauth/authorize');
+		$this->options->def('requestTokenURL', 'https://www.openstreetmap.org/oauth/request_token');
+
+		/*
+		$this->options->def('accessTokenURL', 'https://api06.dev.openstreetmap.org/oauth/access_token');
+		$this->options->def('authoriseURL', 'https://api06.dev.openstreetmap.org/oauth/authorize');
+		$this->options->def('requestTokenURL', 'https://api06.dev.openstreetmap.org/oauth/request_token');
+		*/
+
+		// Call the JOauth1Client constructor to setup the object.
+		parent::__construct($this->options, $client, $input, null, '1.0');
+	}
+
+	/**
+	 * Method to verify if the access token is valid by making a request to an API endpoint.
+	 *
+	 * @return  boolean  Returns true if the access token is valid and false otherwise.
+	 *
+	 * @since   13.1
+	 */
+	public function verifyCredentials()
+	{
+		return true;
+	}
+
+	/**
+	 * Method to validate a response.
+	 *
+	 * @param   string         $url       The request URL.
+	 * @param   JHttpResponse  $response  The response to validate.
+	 *
+	 * @return  void
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function validateResponse($url, $response)
+	{
+		if ($response->code != 200)
+		{
+			$error = htmlspecialchars($response->body, ENT_COMPAT, 'UTF-8');
+
+			throw new DomainException($error, $response->code);
+		}
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/object.php b/core/libraries/joomla/openstreetmap/object.php
new file mode 100644
index 00000000..84802f4a
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/object.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Openstreetmap API object class for the Joomla Platform
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+abstract class JOpenstreetmapObject
+{
+	/**
+	 * Options for the Openstreetmap object.
+	 *
+	 * @var    Registry
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * The HTTP client object to use in sending HTTP requests.
+	 *
+	 * @var    JHttp
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * The OAuth client.
+	 *
+	 * @var    JOpenstreetmapOauth
+	 * @since  13.1
+	 */
+	protected $oauth;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   Registry             &$options  Openstreetmap options object.
+	 * @param   JHttp                $client    The HTTP client object.
+	 * @param   JOpenstreetmapOauth  $oauth     Openstreetmap oauth client
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(Registry &$options = null, JHttp $client = null, JOpenstreetmapOauth $oauth = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JHttp($this->options);
+		$this->oauth = $oauth;
+	}
+
+	/**
+	 * Get an option from the JOpenstreetmapObject instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   13.1
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JOpenstreetmapObject instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JOpenstreetmapObject  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Method to send the request which does not require authentication.
+	 *
+	 * @param   string  $path     The path of the request to make
+	 * @param   string  $method   The request method.
+	 * @param   array   $headers  The headers passed in the request.
+	 * @param   mixed   $data     Either an associative array or a string to be sent with the post request.
+	 *
+	 * @return  SimpleXMLElement  The XML response
+	 *
+	 * @since   13.1
+	 * @throws  DomainException
+	 */
+	public function sendRequest($path, $method = 'GET', $headers = array(), $data = '')
+	{
+		// Send the request.
+		switch ($method)
+		{
+			case 'GET':
+				$response = $this->client->get($path, $headers);
+				break;
+
+			case 'POST':
+				$response = $this->client->post($path, $data, $headers);
+				break;
+		}
+
+		// Validate the response code.
+		if ($response->code != 200)
+		{
+			$error = htmlspecialchars($response->body, ENT_COMPAT, 'UTF-8');
+
+			throw new DomainException($error, $response->code);
+		}
+
+		$xml_string = simplexml_load_string($response->body);
+
+		return $xml_string;
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/openstreetmap.php b/core/libraries/joomla/openstreetmap/openstreetmap.php
new file mode 100644
index 00000000..4731da58
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/openstreetmap.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interact with Openstreetmap API.
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmap
+{
+	/**
+	 * Options for the Openstreetmap object.
+	 *
+	 * @var    Registry
+	 * @since  13.1
+	 */
+	protected $options;
+
+	/**
+	 * The HTTP client object to use in sending HTTP requests.
+	 *
+	 * @var    JHttp
+	 * @since  13.1
+	 */
+	protected $client;
+
+	/**
+	 * The OAuth client.
+	 *
+	 * @var   JOpenstreetmapOauth
+	 * @since 13.1
+	 */
+	protected $oauth;
+
+	/**
+	 * Openstreetmap API object for changesets.
+	 *
+	 * @var    JOpenstreetmapChangesets
+	 * @since  13.1
+	 */
+	protected $changesets;
+
+	/**
+	 * Openstreetmap API object for elements.
+	 *
+	 * @var    JOpenstreetmapElements
+	 * @since  13.1
+	 */
+	protected $elements;
+
+	/**
+	 * Openstreetmap API object for GPS.
+	 *
+	 * @var    JOpenstreetmapGps
+	 * @since  13.1
+	 */
+	protected $gps;
+
+	/**
+	 * Openstreetmap API object for info.
+	 *
+	 * @var    JOpenstreetmapInfo
+	 * @since  13.1
+	 */
+	protected $info;
+
+	/**
+	 * Openstreetmap API object for user.
+	 *
+	 * @var    JOpenstreetmapUser
+	 * @since  13.1
+	 */
+	protected $user;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   JOpenstreetmapOauth  $oauth    Openstreetmap oauth client
+	 * @param   Registry             $options  Openstreetmap options object
+	 * @param   JHttp                $client   The HTTP client object
+	 *
+	 * @since   13.1
+	 */
+	public function __construct(JOpenstreetmapOauth $oauth = null, Registry $options = null, JHttp $client = null)
+	{
+		$this->oauth = $oauth;
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client  = isset($client) ? $client : new JHttp($this->options);
+
+		// Setup the default API url if not already set.
+		$this->options->def('api.url', 'https://api.openstreetmap.org/api/0.6/');
+
+		// $this->options->def('api.url', 'https://api06.dev.openstreetmap.org/api/0.6/');
+	}
+
+	/**
+	 * Method to get object instances
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JOpenstreetmapObject  Openstreetmap API object
+	 *
+	 * @since   13.1
+	 * @throws  InvalidArgumentException
+	 */
+	public function __get($name)
+	{
+		$class = 'JOpenstreetmap' . ucfirst($name);
+
+		if (class_exists($class))
+		{
+			if (false == isset($this->$name))
+			{
+				$this->$name = new $class($this->options, $this->client, $this->oauth);
+			}
+
+			return $this->$name;
+		}
+
+		throw new InvalidArgumentException(sprintf('Argument %s produced an invalid class name: %s', $name, $class));
+	}
+
+	/**
+	 * Get an option from the JOpenstreetmap instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   13.1
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the Openstreetmap instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JOpenstreetmap  This object for method chaining.
+	 *
+	 * @since   13.1
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/openstreetmap/user.php b/core/libraries/joomla/openstreetmap/user.php
new file mode 100644
index 00000000..029bef44
--- /dev/null
+++ b/core/libraries/joomla/openstreetmap/user.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Openstreetmap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Openstreetmap API User class for the Joomla Platform
+ *
+ * @since       13.1
+ * @deprecated  4.0  Use the `joomla/openstreetmap` package via Composer instead
+ */
+class JOpenstreetmapUser extends JOpenstreetmapObject
+{
+	/**
+	 * Method to get user details
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function getDetails()
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'user/details';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to get preferences
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function getPreferences()
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'user/preferences';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'GET', $parameters);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to replace user preferences
+	 *
+	 * @param   array  $preferences  Array of new preferences
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function replacePreferences($preferences)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'user/preferences';
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Create a list of preferences
+		$preference_list = '';
+
+		if (!empty($preferences))
+		{
+			foreach ($preferences as $key => $value)
+			{
+				$preference_list .= '<preference k="' . $key . '" v="' . $value . '"/>';
+			}
+		}
+
+		$xml = '<?xml version="1.0" encoding="UTF-8"?>
+			<osm version="0.6" generator="JOpenstreetmap">
+				<preferences>'
+				. $preference_list .
+				'</preferences>
+			</osm>';
+
+		$header['Content-Type'] = 'text/xml';
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $xml, $header);
+
+		return $response->body;
+	}
+
+	/**
+	 * Method to change user preferences
+	 *
+	 * @param   string  $key         Key of the preference
+	 * @param   string  $preference  New value for preference
+	 *
+	 * @return  array  The XML response
+	 *
+	 * @since   13.1
+	 */
+	public function changePreference($key, $preference)
+	{
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters = array(
+			'oauth_token' => $token['key'],
+		);
+
+		// Set the API base
+		$base = 'user/preferences/' . $key;
+
+		// Build the request path.
+		$path = $this->getOption('api.url') . $base;
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($path, 'PUT', $parameters, $preference);
+
+		return $response->body;
+	}
+}
diff --git a/core/libraries/joomla/platform.php b/core/libraries/joomla/platform.php
new file mode 100644
index 00000000..7f70490b
--- /dev/null
+++ b/core/libraries/joomla/platform.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package    Joomla.Platform
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Version information class for the Joomla Platform.
+ *
+ * @since       11.1
+ * @deprecated  4.0  Deprecated without replacement
+ */
+final class JPlatform
+{
+	// Product name.
+	const PRODUCT = 'Joomla Platform';
+
+	// Release version.
+	const RELEASE = '13.1';
+
+	// Maintenance version.
+	const MAINTENANCE = '0';
+
+	// Development STATUS.
+	const STATUS = 'Stable';
+
+	// Build number.
+	const BUILD = 0;
+
+	// Code name.
+	const CODE_NAME = 'Curiosity';
+
+	// Release date.
+	const RELEASE_DATE = '24-Apr-2013';
+
+	// Release time.
+	const RELEASE_TIME = '00:00';
+
+	// Release timezone.
+	const RELEASE_TIME_ZONE = 'GMT';
+
+	// Copyright Notice.
+	const COPYRIGHT = 'Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.';
+
+	// Link text.
+	const LINK_TEXT = '<a href="https://www.joomla.org">Joomla!</a> is Free Software released under the GNU General Public License.';
+
+	/**
+	 * Compares two a "PHP standardized" version number against the current Joomla Platform version.
+	 *
+	 * @param   string  $minimum  The minimum version of the Joomla Platform which is compatible.
+	 *
+	 * @return  boolean  True if the version is compatible.
+	 *
+	 * @link    https://secure.php.net/version_compare
+	 * @since   11.1
+	 * @deprecated  4.0  Deprecated without replacement
+	 */
+	public static function isCompatible($minimum)
+	{
+		return version_compare(self::getShortVersion(), $minimum, 'eq') == 1;
+	}
+
+	/**
+	 * Gets a "PHP standardized" version string for the current Joomla Platform.
+	 *
+	 * @return  string  Version string.
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0  Deprecated without replacement
+	 */
+	public static function getShortVersion()
+	{
+		return self::RELEASE . '.' . self::MAINTENANCE;
+	}
+
+	/**
+	 * Gets a version string for the current Joomla Platform with all release information.
+	 *
+	 * @return  string  Complete version string.
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0  Deprecated without replacement
+	 */
+	public static function getLongVersion()
+	{
+		return self::PRODUCT . ' ' . self::RELEASE . '.' . self::MAINTENANCE . ' ' . self::STATUS . ' [ ' . self::CODE_NAME . ' ] '
+			. self::RELEASE_DATE . ' ' . self::RELEASE_TIME . ' ' . self::RELEASE_TIME_ZONE;
+	}
+}
diff --git a/core/libraries/joomla/route/wrapper/route.php b/core/libraries/joomla/route/wrapper/route.php
new file mode 100644
index 00000000..ef6b044c
--- /dev/null
+++ b/core/libraries/joomla/route/wrapper/route.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Application
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for JRoute
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Application
+ * @since       3.4
+ * @deprecated  4.0 Will be removed without replacement
+ */
+class JRouteWrapperRoute
+{
+	/**
+	 * Helper wrapper method for _
+	 *
+	 * @param   string   $url    Absolute or Relative URI to Joomla resource.
+	 * @param   boolean  $xhtml  Replace & by &amp; for XML compliance.
+	 * @param   integer  $ssl    Secure state for the resolved URI.
+	 *
+	 * @return  string The translated humanly readable URL.
+	 *
+	 * @see     JRoute::_()
+	 * @since   3.4
+	 */
+	public function _($url, $xhtml = true, $ssl = null)
+	{
+		return JRoute::_($url, $xhtml, $ssl);
+	}
+}
diff --git a/core/libraries/joomla/session/handler/interface.php b/core/libraries/joomla/session/handler/interface.php
new file mode 100644
index 00000000..3fa14120
--- /dev/null
+++ b/core/libraries/joomla/session/handler/interface.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Interface for managing HTTP sessions
+ *
+ * @since       3.5
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+interface JSessionHandlerInterface
+{
+	/**
+	 * Starts the session.
+	 *
+	 * @return  boolean  True if started.
+	 *
+	 * @since   3.5
+	 * @throws  RuntimeException If something goes wrong starting the session.
+	 */
+	public function start();
+
+	/**
+	 * Checks if the session is started.
+	 *
+	 * @return  boolean  True if started, false otherwise.
+	 *
+	 * @since   3.5
+	 */
+	public function isStarted();
+
+	/**
+	 * Returns the session ID
+	 *
+	 * @return  string  The session ID
+	 *
+	 * @since   3.5
+	 */
+	public function getId();
+
+	/**
+	 * Sets the session ID
+	 *
+	 * @param   string  $id  The session ID
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function setId($id);
+
+	/**
+	 * Returns the session name
+	 *
+	 * @return  mixed  The session name.
+	 *
+	 * @since   3.5
+	 */
+	public function getName();
+
+	/**
+	 * Sets the session name
+	 *
+	 * @param   string  $name  The name of the session
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function setName($name);
+
+	/**
+	 * Regenerates ID that represents this storage.
+	 *
+	 * Note regenerate+destroy should not clear the session data in memory only delete the session data from persistent storage.
+	 *
+	 * @param   boolean  $destroy   Destroy session when regenerating?
+	 * @param   integer  $lifetime  Sets the cookie lifetime for the session cookie. A null value will leave the system settings unchanged,
+	 *                              0 sets the cookie to expire with browser session. Time is in seconds, and is not a Unix timestamp.
+	 *
+	 * @return  boolean  True if session regenerated, false if error
+	 *
+	 * @since   3.5
+	 */
+	public function regenerate($destroy = false, $lifetime = null);
+
+	/**
+	 * Force the session to be saved and closed.
+	 *
+	 * This method must invoke session_write_close() unless this interface is used for a storage object design for unit or functional testing where
+	 * a real PHP session would interfere with testing, in which case it should actually persist the session data if required.
+	 *
+	 * @return  void
+	 *
+	 * @see     session_write_close()
+	 * @since   3.5
+	 * @throws  RuntimeException  If the session is saved without being started, or if the session is already closed.
+	 */
+	public function save();
+
+	/**
+	 * Clear all session data in memory.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function clear();
+}
diff --git a/core/libraries/joomla/session/handler/joomla.php b/core/libraries/joomla/session/handler/joomla.php
new file mode 100644
index 00000000..db669395
--- /dev/null
+++ b/core/libraries/joomla/session/handler/joomla.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Interface for managing HTTP sessions
+ *
+ * @since       3.5
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionHandlerJoomla extends JSessionHandlerNative
+{
+	/**
+	 * The input object
+	 *
+	 * @var    JInput
+	 * @since  3.5
+	 */
+	public $input = null;
+
+	/**
+	 * Force cookies to be SSL only
+	 *
+	 * @var    boolean
+	 * @since  3.5
+	 */
+	protected $force_ssl = false;
+
+	/**
+	 * Public constructor
+	 *
+	 * @param   array  $options  An array of configuration options
+	 *
+	 * @since   3.5
+	 */
+	public function __construct($options = array())
+	{
+		if (!headers_sent())
+		{
+			// Disable transparent sid support
+			ini_set('session.use_trans_sid', '0');
+
+			// Only allow the session ID to come from cookies and nothing else.
+			if ((int) ini_get('session.use_cookies') !== 1)
+			{
+				ini_set('session.use_only_cookies', 1);
+			}
+		}
+
+		// Set options
+		$this->setOptions($options);
+		$this->setCookieParams();
+	}
+
+	/**
+	 * Starts the session
+	 *
+	 * @return  boolean  True if started
+	 *
+	 * @since   3.5
+	 * @throws  RuntimeException If something goes wrong starting the session.
+	 */
+	public function start()
+	{
+		$session_name = $this->getName();
+
+		// Get the JInputCookie object
+		$cookie = $this->input->cookie;
+
+		if (is_null($cookie->get($session_name)))
+		{
+			$session_clean = $this->input->get($session_name, false, 'string');
+
+			if ($session_clean)
+			{
+				$this->setId($session_clean);
+				$cookie->set($session_name, '', 1);
+			}
+		}
+
+		return parent::start();
+	}
+
+	/**
+	 * Clear all session data in memory.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function clear()
+	{
+		$sessionName = $this->getName();
+
+		/*
+		 * In order to kill the session altogether, such as to log the user out, the session id
+		 * must also be unset. If a cookie is used to propagate the session id (default behavior),
+		 * then the session cookie must be deleted.
+		 * We need to use setcookie here or we will get a warning in some session handlers (ex: files).
+		 */
+		if (isset($_COOKIE[$sessionName]))
+		{
+			$cookie = session_get_cookie_params();
+
+			setcookie($sessionName, '', 1, $cookie['path'], $cookie['domain'], $cookie['secure'], true);
+		}
+
+		parent::clear();
+	}
+
+	/**
+	 * Set session cookie parameters
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	protected function setCookieParams()
+	{
+		if (headers_sent())
+		{
+			return;
+		}
+
+		$cookie = session_get_cookie_params();
+
+		if ($this->force_ssl)
+		{
+			$cookie['secure'] = true;
+		}
+
+		$config = JFactory::getConfig();
+
+		if ($config->get('cookie_domain', '') != '')
+		{
+			$cookie['domain'] = $config->get('cookie_domain');
+		}
+
+		if ($config->get('cookie_path', '') != '')
+		{
+			$cookie['path'] = $config->get('cookie_path');
+		}
+
+		session_set_cookie_params($cookie['lifetime'], $cookie['path'], $cookie['domain'], $cookie['secure'], true);
+	}
+
+	/**
+	 * Set additional session options
+	 *
+	 * @param   array  $options  List of parameter
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.5
+	 */
+	protected function setOptions(array $options)
+	{
+		if (isset($options['force_ssl']))
+		{
+			$this->force_ssl = (bool) $options['force_ssl'];
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/joomla/session/handler/native.php b/core/libraries/joomla/session/handler/native.php
new file mode 100644
index 00000000..95e78607
--- /dev/null
+++ b/core/libraries/joomla/session/handler/native.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Interface for managing HTTP sessions
+ *
+ * @since       3.5
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionHandlerNative implements JSessionHandlerInterface
+{
+	/**
+	 * Has the session been started
+	 *
+	 * @var    boolean
+	 * @since  3.5
+	 */
+	private $started = false;
+
+	/**
+	 * Has the session been closed
+	 *
+	 * @var    boolean
+	 * @since  3.5
+	 */
+	private $closed = false;
+
+	/**
+	 * Starts the session
+	 *
+	 * @return  boolean  True if started
+	 *
+	 * @since   3.5
+	 */
+	public function start()
+	{
+		if ($this->isStarted())
+		{
+			return true;
+		}
+
+		$this->doSessionStart();
+
+		return true;
+	}
+
+	/**
+	 * Checks if the session is started.
+	 *
+	 * @return  boolean  True if started, false otherwise.
+	 *
+	 * @since   3.5
+	 */
+	public function isStarted()
+	{
+		return $this->started;
+	}
+
+	/**
+	 * Returns the session ID
+	 *
+	 * @return  string  The session ID
+	 *
+	 * @since   3.5
+	 */
+	public function getId()
+	{
+		return session_id();
+	}
+
+	/**
+	 * Sets the session ID
+	 *
+	 * @param   string  $id  The session ID
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 * @throws  LogicException
+	 */
+	public function setId($id)
+	{
+		if ($this->isStarted())
+		{
+			throw new LogicException('Cannot change the ID of an active session');
+		}
+
+		session_id($id);
+	}
+
+	/**
+	 * Returns the session name
+	 *
+	 * @return  mixed  The session name
+	 *
+	 * @since   3.5
+	 */
+	public function getName()
+	{
+		return session_name();
+	}
+
+	/**
+	 * Sets the session name
+	 *
+	 * @param   string  $name  The name of the session
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 * @throws  LogicException
+	 */
+	public function setName($name)
+	{
+		if ($this->isStarted())
+		{
+			throw new LogicException('Cannot change the name of an active session');
+		}
+
+		session_name($name);
+	}
+
+	/**
+	 * Regenerates ID that represents this storage.
+	 *
+	 * Note regenerate+destroy should not clear the session data in memory only delete the session data from persistent storage.
+	 *
+	 * @param   boolean  $destroy   Destroy session when regenerating?
+	 * @param   integer  $lifetime  Sets the cookie lifetime for the session cookie. A null value will leave the system settings unchanged,
+	 *                              0 sets the cookie to expire with browser session. Time is in seconds, and is not a Unix timestamp.
+	 *
+	 * @return  boolean  True if session regenerated, false if error
+	 *
+	 * @since   3.5
+	 */
+	public function regenerate($destroy = false, $lifetime = null)
+	{
+		if (!headers_sent() && null !== $lifetime)
+		{
+			ini_set('session.cookie_lifetime', $lifetime);
+		}
+
+		$return = session_regenerate_id($destroy);
+
+		// Workaround for https://bugs.php.net/bug.php?id=61470 as suggested by David Grudl
+		session_write_close();
+		$this->closed = true;
+
+		if (isset($_SESSION))
+		{
+			$backup = $_SESSION;
+			$this->doSessionStart();
+			$_SESSION = $backup;
+		}
+		else
+		{
+			$this->doSessionStart();
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Force the session to be saved and closed.
+	 *
+	 * This method must invoke session_write_close() unless this interface is used for a storage object design for unit or functional testing where
+	 * a real PHP session would interfere with testing, in which case it should actually persist the session data if required.
+	 *
+	 * @return  void
+	 *
+	 * @see     session_write_close()
+	 * @since   3.5
+	 */
+	public function save()
+	{
+		// Verify if the session is active
+		if ((version_compare(PHP_VERSION, '5.4', 'ge') && PHP_SESSION_ACTIVE === session_status())
+			|| (version_compare(PHP_VERSION, '5.4', 'lt') && $this->started && isset($_SESSION) && $this->getId()))
+		{
+			$session = JFactory::getSession();
+			$data    = $session->getData();
+
+			// Before storing it, let's serialize and encode the Registry object
+			$_SESSION['joomla'] = base64_encode(serialize($data));
+
+			session_write_close();
+
+			$this->closed  = true;
+			$this->started = false;
+		}
+	}
+
+	/**
+	 * Clear all session data in memory.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function clear()
+	{
+		// Need to destroy any existing sessions started with session.auto_start
+		if ($this->getId())
+		{
+			session_unset();
+			session_destroy();
+		}
+
+		$this->closed  = true;
+		$this->started = false;
+	}
+
+	/**
+	 * Performs the session start mechanism
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5.1
+	 * @throws  RuntimeException If something goes wrong starting the session.
+	 */
+	private function doSessionStart()
+	{
+		// Register our function as shutdown method, so we can manipulate it
+		register_shutdown_function(array($this, 'save'));
+
+		// Disable the cache limiter
+		session_cache_limiter('none');
+
+		/*
+		 * Extended checks to determine if the session has already been started
+		 */
+
+		// If running PHP 5.4, try to use the native API
+		if (version_compare(PHP_VERSION, '5.4', 'ge') && PHP_SESSION_ACTIVE === session_status())
+		{
+			throw new RuntimeException('Failed to start the session: already started by PHP.');
+		}
+
+		// Fallback check for PHP 5.3
+		if (version_compare(PHP_VERSION, '5.4', 'lt') && !$this->closed && isset($_SESSION) && $this->getId())
+		{
+			throw new RuntimeException('Failed to start the session: already started by PHP ($_SESSION is set).');
+		}
+
+		// If we are using cookies (default true) and headers have already been started (early output),
+		if (ini_get('session.use_cookies') && headers_sent($file, $line))
+		{
+			throw new RuntimeException(sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));
+		}
+
+		// Ok to try and start the session
+		if (!session_start())
+		{
+			throw new RuntimeException('Failed to start the session');
+		}
+
+		// Mark ourselves as started
+		$this->started = true;
+	}
+}
diff --git a/core/libraries/joomla/session/storage.php b/core/libraries/joomla/session/storage.php
new file mode 100644
index 00000000..8296e35e
--- /dev/null
+++ b/core/libraries/joomla/session/storage.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Custom session storage handler for PHP
+ *
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+abstract class JSessionStorage
+{
+	/**
+	 * @var    JSessionStorage[]  JSessionStorage instances container.
+	 * @since  11.3
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		$this->register($options);
+	}
+
+	/**
+	 * Returns a session storage handler object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $name     The session store to instantiate
+	 * @param   array   $options  Array of options
+	 *
+	 * @return  JSessionStorage
+	 *
+	 * @since   11.1
+	 * @throws  JSessionExceptionUnsupported
+	 */
+	public static function getInstance($name = 'none', $options = array())
+	{
+		$name = strtolower(JFilterInput::getInstance()->clean($name, 'word'));
+
+		if (empty(self::$instances[$name]))
+		{
+			/** @var JSessionStorage $class */
+			$class = 'JSessionStorage' . ucfirst($name);
+
+			if (!class_exists($class))
+			{
+				$path = __DIR__ . '/storage/' . $name . '.php';
+
+				if (!file_exists($path))
+				{
+					throw new JSessionExceptionUnsupported('Unable to load session storage class: ' . $name);
+				}
+
+				JLoader::register($class, $path);
+
+				// The class should now be loaded
+				if (!class_exists($class))
+				{
+					throw new JSessionExceptionUnsupported('Unable to load session storage class: ' . $name);
+				}
+			}
+
+			// Validate the session storage is supported on this platform
+			if (!$class::isSupported())
+			{
+				throw new JSessionExceptionUnsupported(sprintf('The %s Session Storage is not supported on this platform.', $name));
+			}
+
+			self::$instances[$name] = new $class($options);
+		}
+
+		return self::$instances[$name];
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function register()
+	{
+		if (!headers_sent())
+		{
+			session_set_save_handler(
+				array($this, 'open'),
+				array($this, 'close'),
+				array($this, 'read'),
+				array($this, 'write'),
+				array($this, 'destroy'),
+				array($this, 'gc')
+			);
+		}
+	}
+
+	/**
+	 * Open the SessionHandler backend.
+	 *
+	 * @param   string  $save_path     The path to the session object.
+	 * @param   string  $session_name  The name of the session.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function open($save_path, $session_name)
+	{
+		return true;
+	}
+
+	/**
+	 * Close the SessionHandler backend.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function close()
+	{
+		return true;
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the
+	 * SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   11.1
+	 */
+	public function read($id)
+	{
+		return;
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id            The session identifier.
+	 * @param   string  $session_data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function write($id, $session_data)
+	{
+		return true;
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the
+	 * SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function destroy($id)
+	{
+		return true;
+	}
+
+	/**
+	 * Garbage collect stale sessions from the SessionHandler backend.
+	 *
+	 * @param   integer  $maxlifetime  The maximum age of a session.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function gc($maxlifetime = null)
+	{
+		return true;
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return true;
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use JSessionStorage::isSupported() instead.
+	 */
+	public static function test()
+	{
+		JLog::add('JSessionStorage::test() is deprecated. Use JSessionStorage::isSupported() instead.', JLog::WARNING, 'deprecated');
+
+		return static::isSupported();
+	}
+}
diff --git a/core/libraries/joomla/session/storage/apc.php b/core/libraries/joomla/session/storage/apc.php
new file mode 100644
index 00000000..3388886b
--- /dev/null
+++ b/core/libraries/joomla/session/storage/apc.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * APC session storage handler for PHP
+ *
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageApc extends JSessionStorage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('APC Extension is not available', 404);
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the
+	 * SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   11.1
+	 */
+	public function read($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return (string) apc_fetch($sess_id);
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id            The session identifier.
+	 * @param   string  $session_data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function write($id, $session_data)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return apc_store($sess_id, $session_data, ini_get('session.gc_maxlifetime'));
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function destroy($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return apc_delete($sess_id);
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('apc');
+	}
+}
diff --git a/core/libraries/joomla/session/storage/database.php b/core/libraries/joomla/session/storage/database.php
new file mode 100644
index 00000000..d3f221f2
--- /dev/null
+++ b/core/libraries/joomla/session/storage/database.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Database session storage handler for PHP
+ *
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageDatabase extends JSessionStorage
+{
+	/**
+	 * Read the data for a particular session identifier from the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   11.1
+	 */
+	public function read($id)
+	{
+		// Get the database connection object and verify its connected.
+		$db = JFactory::getDbo();
+
+		try
+		{
+			// Get the session data from the database table.
+			$query = $db->getQuery(true)
+				->select($db->quoteName('data'))
+			->from($db->quoteName('#__session'))
+			->where($db->quoteName('session_id') . ' = ' . $db->quote($id));
+
+			$db->setQuery($query);
+
+			$result = (string) $db->loadResult();
+
+			$result = str_replace('\0\0\0', chr(0) . '*' . chr(0), $result);
+
+			return $result;
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id    The session identifier.
+	 * @param   string  $data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function write($id, $data)
+	{
+		// Get the database connection object and verify its connected.
+		$db = JFactory::getDbo();
+
+		$data = str_replace(chr(0) . '*' . chr(0), '\0\0\0', $data);
+
+		try
+		{
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__session'))
+				->set($db->quoteName('data') . ' = ' . $db->quote($data))
+				->set($db->quoteName('time') . ' = ' . $db->quote((int) time()))
+				->where($db->quoteName('session_id') . ' = ' . $db->quote($id));
+
+			// Try to update the session data in the database table.
+			$db->setQuery($query);
+			$db->execute();
+
+			/*
+			 * Since $db->execute did not throw an exception, so the query was successful.
+			 * Either the data changed, or the data was identical.
+			 * In either case we are done.
+			 */
+			return true;
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function destroy($id)
+	{
+		// Get the database connection object and verify its connected.
+		$db = JFactory::getDbo();
+
+		try
+		{
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__session'))
+				->where($db->quoteName('session_id') . ' = ' . $db->quote($id));
+
+			// Remove a session from the database.
+			$db->setQuery($query);
+
+			return (boolean) $db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Garbage collect stale sessions from the SessionHandler backend.
+	 *
+	 * @param   integer  $lifetime  The maximum age of a session.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function gc($lifetime = 1440)
+	{
+		// Get the database connection object and verify its connected.
+		$db = JFactory::getDbo();
+
+		// Determine the timestamp threshold with which to purge old sessions.
+		$past = time() - $lifetime;
+
+		try
+		{
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__session'))
+				->where($db->quoteName('time') . ' < ' . $db->quote((int) $past));
+
+			// Remove expired sessions from the database.
+			$db->setQuery($query);
+
+			return (boolean) $db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/joomla/session/storage/memcache.php b/core/libraries/joomla/session/storage/memcache.php
new file mode 100644
index 00000000..3a66a8bb
--- /dev/null
+++ b/core/libraries/joomla/session/storage/memcache.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Memcache session storage handler for PHP
+ *
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageMemcache extends JSessionStorage
+{
+	/**
+	 * @var array Container for memcache server conf arrays
+	 */
+	private $_servers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('Memcache Extension is not available', 404);
+		}
+
+		$config = JFactory::getConfig();
+
+		// This will be an array of loveliness
+		// @todo: multiple servers
+		$this->_servers = array(
+			array(
+				'host' => $config->get('session_memcache_server_host', 'localhost'),
+				'port' => $config->get('session_memcache_server_port', 11211),
+			),
+		);
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function register()
+	{
+		if (!empty($this->_servers) && isset($this->_servers[0]))
+		{
+			$serverConf = current($this->_servers);
+
+			if (!headers_sent())
+			{
+				ini_set('session.save_path', "{$serverConf['host']}:{$serverConf['port']}");
+				ini_set('session.save_handler', 'memcache');
+			}
+		}
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('memcache') && class_exists('Memcache');
+	}
+}
diff --git a/core/libraries/joomla/session/storage/memcached.php b/core/libraries/joomla/session/storage/memcached.php
new file mode 100644
index 00000000..2478adac
--- /dev/null
+++ b/core/libraries/joomla/session/storage/memcached.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Memcached session storage handler for PHP
+ *
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageMemcached extends JSessionStorage
+{
+	/**
+	 * @var array Container for memcache server conf arrays
+	 */
+	private $_servers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('Memcached Extension is not available', 404);
+		}
+
+		$config = JFactory::getConfig();
+
+		// This will be an array of loveliness
+		// @todo: multiple servers
+		$this->_servers = array(
+			array(
+				'host' => $config->get('session_memcached_server_host', 'localhost'),
+				'port' => $config->get('session_memcached_server_port', 11211),
+			),
+		);
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function register()
+	{
+		if (!empty($this->_servers) && isset($this->_servers[0]))
+		{
+			$serverConf = current($this->_servers);
+
+			if (!headers_sent())
+			{
+				ini_set('session.save_path', "{$serverConf['host']}:{$serverConf['port']}");
+				ini_set('session.save_handler', 'memcached');
+			}
+		}
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('memcached') && class_exists('Memcached');
+	}
+}
diff --git a/core/libraries/joomla/session/storage/none.php b/core/libraries/joomla/session/storage/none.php
new file mode 100644
index 00000000..917036a0
--- /dev/null
+++ b/core/libraries/joomla/session/storage/none.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * File session handler for PHP
+ *
+ * @link        https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageNone extends JSessionStorage
+{
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function register()
+	{
+		// Default session handler is `files`
+	}
+}
diff --git a/core/libraries/joomla/session/storage/redis.php b/core/libraries/joomla/session/storage/redis.php
new file mode 100644
index 00000000..fa00efa4
--- /dev/null
+++ b/core/libraries/joomla/session/storage/redis.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Redis session storage handler for PHP
+ *
+ * @link   https://secure.php.net/manual/en/function.session-set-save-handler.php
+ * @since  3.8.0
+ */
+class JSessionStorageRedis extends JSessionStorage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('Redis Extension is not available', 404);
+		}
+
+		$config = JFactory::getConfig();
+
+		$this->_server = array(
+			'host'    => $config->get('session_redis_server_host', 'localhost'),
+			'port'    => $config->get('session_redis_server_port', 6379),
+			'persist' => $config->get('session_redis_persist', true),
+			'auth'    => $config->get('session_redis_server_auth', null),
+			'db'      => (int) $config->get('session_redis_server_db', 0),
+		);
+
+		// If you are trying to connect to a socket file, ignore the supplied port
+		if ($this->_server['host'][0] === '/')
+		{
+			$this->_server['port'] = 0;
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function register()
+	{
+		if (!empty($this->_server) && isset($this->_server['host'], $this->_server['port']))
+		{
+			if (!headers_sent())
+			{
+				if ($this->_server['port'] === 0)
+				{
+					$path = 'unix://' . $this->_server['host'];
+				}
+				else
+				{
+					$path = 'tcp://' . $this->_server['host'] . ":" . $this->_server['port'];
+				}
+
+				$persist = isset($this->_server['persist']) ? $this->_server['persist'] : false;
+				$db      = isset($this->_server['db']) ? $this->_server['db'] : 0;
+
+				$path .= '?persistent=' . (int) $persist . '&database=' . $db;
+
+				if (!empty($this->_server['auth']))
+				{
+					$path .= '&auth=' . $this->_server['auth'];
+				}
+
+				ini_set('session.save_path', $path);
+				ini_set('session.save_handler', 'redis');
+			}
+
+			// This is required if the configuration.php gzip is turned on
+			ini_set('zlib.output_compression', 'Off');
+		}
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   3.8.0
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('redis') && class_exists('Redis');
+	}
+}
diff --git a/core/libraries/joomla/session/storage/wincache.php b/core/libraries/joomla/session/storage/wincache.php
new file mode 100644
index 00000000..96996d52
--- /dev/null
+++ b/core/libraries/joomla/session/storage/wincache.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * WINCACHE session storage handler for PHP
+ *
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageWincache extends JSessionStorage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('Wincache Extension is not available', 404);
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function register()
+	{
+		if (!headers_sent())
+		{
+			ini_set('session.save_handler', 'wincache');
+		}
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('wincache') && function_exists('wincache_ucache_get') && !strcmp(ini_get('wincache.ucenabled'), '1');
+	}
+}
diff --git a/core/libraries/joomla/session/storage/xcache.php b/core/libraries/joomla/session/storage/xcache.php
new file mode 100644
index 00000000..104d15a7
--- /dev/null
+++ b/core/libraries/joomla/session/storage/xcache.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Session
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * XCache session storage handler
+ *
+ * @since       11.1
+ * @deprecated  4.0  The CMS' Session classes will be replaced with the `joomla/session` package
+ */
+class JSessionStorageXcache extends JSessionStorage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 * @throws  RuntimeException
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new RuntimeException('XCache Extension is not available', 404);
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   11.1
+	 */
+	public function read($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		// Check if id exists
+		if (!xcache_isset($sess_id))
+		{
+			return;
+		}
+
+		return (string) xcache_get($sess_id);
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id            The session identifier.
+	 * @param   string  $session_data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function write($id, $session_data)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return xcache_set($sess_id, $session_data, ini_get('session.gc_maxlifetime'));
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function destroy($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		if (!xcache_isset($sess_id))
+		{
+			return true;
+		}
+
+		return xcache_unset($sess_id);
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return boolean  True on success, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('xcache');
+	}
+}
diff --git a/core/libraries/joomla/string/string.php b/core/libraries/joomla/string/string.php
new file mode 100644
index 00000000..7779604d
--- /dev/null
+++ b/core/libraries/joomla/string/string.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  String
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * String handling class for utf-8 data
+ * Wraps the phputf8 library
+ * All functions assume the validity of utf-8 strings.
+ *
+ * @since       11.1
+ * @deprecated  4.0  Use {@link \Joomla\String\StringHelper} instead unless otherwise noted.
+ */
+abstract class JString extends StringHelper
+{
+	/**
+	 * Split a string in camel case format
+	 *
+	 * "FooBarABCDef"            becomes  array("Foo", "Bar", "ABC", "Def");
+	 * "JFooBar"                 becomes  array("J", "Foo", "Bar");
+	 * "J001FooBar002"           becomes  array("J001", "Foo", "Bar002");
+	 * "abcDef"                  becomes  array("abc", "Def");
+	 * "abc_defGhi_Jkl"          becomes  array("abc_def", "Ghi_Jkl");
+	 * "ThisIsA_NASAAstronaut"   becomes  array("This", "Is", "A_NASA", "Astronaut")),
+	 * "JohnFitzgerald_Kennedy"  becomes  array("John", "Fitzgerald_Kennedy")),
+	 *
+	 * @param   string  $string  The source string.
+	 *
+	 * @return  array   The splitted string.
+	 *
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use JStringNormalise::fromCamelCase()
+	 * @since   11.3
+	 */
+	public static function splitCamelCase($string)
+	{
+		JLog::add('JString::splitCamelCase has been deprecated. Use JStringNormalise::fromCamelCase.', JLog::WARNING, 'deprecated');
+
+		return JStringNormalise::fromCamelCase($string, true);
+	}
+
+	/**
+	 * Does a UTF-8 safe version of PHP parse_url function
+	 *
+	 * @param   string  $url  URL to parse
+	 *
+	 * @return  mixed  Associative array or false if badly formed URL.
+	 *
+	 * @link    http://us3.php.net/manual/en/function.parse-url.php
+	 * @since   11.1
+	 * @deprecated  4.0 (CMS) - Use {@link \Joomla\Uri\UriHelper::parse_url()} instead.
+	 */
+	public static function parse_url($url)
+	{
+		JLog::add('JString::parse_url has been deprecated. Use \\Joomla\\Uri\\UriHelper::parse_url.', JLog::WARNING, 'deprecated');
+
+		return \Joomla\Uri\UriHelper::parse_url($url);
+	}
+}
diff --git a/core/libraries/joomla/string/wrapper/normalise.php b/core/libraries/joomla/string/wrapper/normalise.php
new file mode 100644
index 00000000..43d9f183
--- /dev/null
+++ b/core/libraries/joomla/string/wrapper/normalise.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  String
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for JStringNormalise
+ *
+ * @package     Joomla.Platform
+ * @subpackage  String
+ * @since       3.4
+ * @deprecated  4.0 Will be removed without replacement
+ */
+class JStringWrapperNormalise
+{
+	/**
+	 * Helper wrapper method for fromCamelCase
+	 *
+	 * @param   string   $input    The string input (ASCII only).
+	 * @param   boolean  $grouped  Optionally allows splitting on groups of uppercase characters.
+	 *
+	 * @return mixed  The space separated string or an array of substrings if grouped is true.
+	 *
+	 * @see     JUserHelper::fromCamelCase()
+	 * @since   3.4
+	 */
+	public function fromCamelCase($input, $grouped = false)
+	{
+		return JStringNormalise::fromCamelCase($input, $grouped);
+	}
+
+	/**
+	 * Helper wrapper method for toCamelCase
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return string  The camel case string.
+	 *
+	 * @see     JUserHelper::toCamelCase()
+	 * @since   3.4
+	 */
+	public function toCamelCase($input)
+	{
+		return JStringNormalise::toCamelCase($input);
+	}
+
+	/**
+	 * Helper wrapper method for toDashSeparated
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return string  The dash separated string.
+	 *
+	 * @see     JUserHelper::toDashSeparated()
+	 * @since   3.4
+	 */
+	public function toDashSeparated($input)
+	{
+		return JStringNormalise::toDashSeparated($input);
+	}
+
+	/**
+	 * Helper wrapper method for toSpaceSeparated
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return string  The space separated string.
+	 *
+	 * @see     JUserHelper::toSpaceSeparated()
+	 * @since   3.4
+	 */
+	public function toSpaceSeparated($input)
+	{
+		return JStringNormalise::toSpaceSeparated($input);
+	}
+
+	/**
+	 * Helper wrapper method for toUnderscoreSeparated
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return string  The underscore separated string.
+	 *
+	 * @see     JUserHelper::toUnderscoreSeparated()
+	 * @since   3.4
+	 */
+	public function toUnderscoreSeparated($input)
+	{
+		return JStringNormalise::toUnderscoreSeparated($input);
+	}
+
+	/**
+	 * Helper wrapper method for toVariable
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return string  The variable string.
+	 *
+	 * @see     JUserHelper::toVariable()
+	 * @since   3.4
+	 */
+	public function toVariable($input)
+	{
+		return JStringNormalise::toVariable($input);
+	}
+
+	/**
+	 * Helper wrapper method for toKey
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return string  The key string.
+	 *
+	 * @see     JUserHelper::toKey()
+	 * @since   3.4
+	 */
+	public function toKey($input)
+	{
+		return JStringNormalise::toKey($input);
+	}
+}
diff --git a/core/libraries/joomla/string/wrapper/punycode.php b/core/libraries/joomla/string/wrapper/punycode.php
new file mode 100644
index 00000000..55851d90
--- /dev/null
+++ b/core/libraries/joomla/string/wrapper/punycode.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  String
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLoader::register('idna_convert', JPATH_LIBRARIES . '/idna_convert/idna_convert.class.php');
+
+/**
+ * Wrapper class for JStringPunycode
+ *
+ * @package     Joomla.Platform
+ * @subpackage  String
+ * @since       3.4
+ * @deprecated  4.0 Will be removed without replacement
+ */
+class JStringWrapperPunycode
+{
+	/**
+	 * Helper wrapper method for toPunycode
+	 *
+	 * @param   string  $utfString  The UTF-8 string to transform.
+	 *
+	 * @return string  The punycode string.
+	 *
+	 * @see     JUserHelper::toPunycode()
+	 * @since   3.4
+	 */
+	public function toPunycode($utfString)
+	{
+		return JStringPunycode::toPunycode($utfString);
+	}
+
+	/**
+	 * Helper wrapper method for fromPunycode
+	 *
+	 * @param   string  $punycodeString  The Punycode string to transform.
+	 *
+	 * @return string  The UF-8 URL.
+	 *
+	 * @see     JUserHelper::fromPunycode()
+	 * @since   3.4
+	 */
+	public function fromPunycode($punycodeString)
+	{
+		return JStringPunycode::fromPunycode($punycodeString);
+	}
+
+	/**
+	 * Helper wrapper method for urlToPunycode
+	 *
+	 * @param   string  $uri  The UTF-8 URL to transform.
+	 *
+	 * @return string  The punycode URL.
+	 *
+	 * @see     JUserHelper::urlToPunycode()
+	 * @since   3.4
+	 */
+	public function urlToPunycode($uri)
+	{
+		return JStringPunycode::urlToPunycode($uri);
+	}
+
+	/**
+	 * Helper wrapper method for urlToUTF8
+	 *
+	 * @param   string  $uri  The Punycode URL to transform.
+	 *
+	 * @return string  The UTF-8 URL.
+	 *
+	 * @see     JStringPunycode::urlToUTF8()
+	 * @since   3.4
+	 */
+	public function urlToUTF8($uri)
+	{
+		return JStringPunycode::urlToUTF8($uri);
+	}
+
+	/**
+	 * Helper wrapper method for emailToPunycode
+	 *
+	 * @param   string  $email  The UTF-8 email to transform.
+	 *
+	 * @return string  The punycode email.
+	 *
+	 * @see     JStringPunycode::emailToPunycode()
+	 * @since   3.4
+	 */
+	public function emailToPunycode($email)
+	{
+		return JStringPunycode::emailToPunycode($email);
+	}
+
+	/**
+	 * Helper wrapper method for emailToUTF8
+	 *
+	 * @param   string  $email  The punycode email to transform.
+	 *
+	 * @return string  The punycode email.
+	 *
+	 * @see     JStringPunycode::emailToUTF8()
+	 * @since   3.4
+	 */
+	public function emailToUTF8($email)
+	{
+		return JStringPunycode::emailToUTF8($email);
+	}
+}
diff --git a/core/libraries/joomla/twitter/block.php b/core/libraries/joomla/twitter/block.php
new file mode 100644
index 00000000..b4e00265
--- /dev/null
+++ b/core/libraries/joomla/twitter/block.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Block class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterBlock extends JTwitterObject
+{
+	/**
+	 * Method to get the user ids the authenticating user is blocking.
+	 *
+	 * @param   boolean  $stringify_ids  Provide this option to have ids returned as strings instead.
+	 * @param   integer  $cursor         Causes the list of IDs to be broken into pages of no more than 5000 IDs at a time. The number of IDs returned
+	 * 									 is not guaranteed to be 5000 as suspended users are filtered out after connections are queried. If no cursor
+	 * 									 is provided, a value of -1 will be assumed, which is the first "page."
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getBlocking($stringify_ids = null, $cursor = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('blocks', 'ids');
+
+		$data = array();
+
+		// Check if stringify_ids is specified
+		if (!is_null($stringify_ids))
+		{
+			$data['stringify_ids'] = $stringify_ids;
+		}
+
+		// Check if cursor is specified
+		if (!is_null($stringify_ids))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Set the API path
+		$path = '/blocks/ids.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to block the specified user from following the authenticating user.
+	 *
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function block($user, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('blocks', 'create');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_statuses is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Set the API path
+		$path = '/blocks/create.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to unblock the specified user from following the authenticating user.
+	 *
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function unblock($user, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('blocks', 'destroy');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_statuses is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Set the API path
+		$path = '/blocks/destroy.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/directmessages.php b/core/libraries/joomla/twitter/directmessages.php
new file mode 100644
index 00000000..c88a1e2e
--- /dev/null
+++ b/core/libraries/joomla/twitter/directmessages.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Direct Messages class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterDirectmessages extends JTwitterObject
+{
+	/**
+	 * Method to get the most recent direct messages sent to the authenticating user.
+	 *
+	 * @param   integer  $since_id     Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id       Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param   integer  $count        Specifies the number of direct messages to try and retrieve, up to a maximum of 200.
+	 * @param   boolean  $entities     When set to true,  each tweet will include a node called "entities,". This node offers a variety of metadata
+	 *                                 about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getDirectMessages($since_id = 0, $max_id =  0, $count = 20, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('direct_messages');
+
+		// Set the API path
+		$path = '/direct_messages.json';
+
+		// Check if since_id is specified.
+		if ($since_id)
+		{
+			$data['since_id'] = $since_id;
+		}
+
+		// Check if max_id is specified.
+		if ($max_id)
+		{
+			$data['max_id'] = $max_id;
+		}
+
+		// Check if count is specified.
+		if ($count)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified.
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get the most recent direct messages sent by the authenticating user.
+	 *
+	 * @param   integer  $since_id  Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id    Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param   integer  $count     Specifies the number of direct messages to try and retrieve, up to a maximum of 200.
+	 * @param   integer  $page      Specifies the page of results to retrieve.
+	 * @param   boolean  $entities  When set to true,  each tweet will include a node called "entities,". This node offers a variety of metadata
+	 *                              about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSentDirectMessages($since_id = 0, $max_id =  0, $count = 20, $page = 0, $entities = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('direct_messages', 'sent');
+
+		// Set the API path
+		$path = '/direct_messages/sent.json';
+
+		// Check if since_id is specified.
+		if ($since_id)
+		{
+			$data['since_id'] = $since_id;
+		}
+
+		// Check if max_id is specified.
+		if ($max_id)
+		{
+			$data['max_id'] = $max_id;
+		}
+
+		// Check if count is specified.
+		if ($count)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if page is specified.
+		if ($page)
+		{
+			$data['page'] = $page;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to send a new direct message to the specified user from the authenticating user.
+	 *
+	 * @param   mixed   $user  Either an integer containing the user ID or a string containing the screen name.
+	 * @param   string  $text  The text of your direct message. Be sure to keep the message under 140 characters.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function sendDirectMessages($user, $text)
+	{
+		// Set the API path
+		$path = '/direct_messages/new.json';
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		$data['text'] = $text;
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to get a single direct message, specified by an id parameter.
+	 *
+	 * @param   integer  $id  The ID of the direct message.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getDirectMessagesById($id)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('direct_messages', 'show');
+
+		// Set the API path
+		$path = '/direct_messages/show.json';
+
+		$data['id'] = $id;
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to delete the direct message specified in the required ID parameter.
+	 *
+	 * @param   integer  $id        The ID of the direct message.
+	 * @param   boolean  $entities  When set to true,  each tweet will include a node called "entities,". This node offers a variety of metadata
+	 *                              about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function deleteDirectMessages($id, $entities = null)
+	{
+		// Set the API path
+		$path = '/direct_messages/destroy.json';
+
+		$data['id'] = $id;
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/favorites.php b/core/libraries/joomla/twitter/favorites.php
new file mode 100644
index 00000000..095bf9ec
--- /dev/null
+++ b/core/libraries/joomla/twitter/favorites.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Favorites class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterFavorites extends JTwitterObject
+{
+	/**
+	 * Method to get the most recent favorite statuses for the authenticating or specified user.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $count     Specifies the number of tweets to try and retrieve, up to a maximum of 200.  Retweets are always included
+	 *                              in the count, so it is always suggested to set $include_rts to true
+	 * @param   integer  $since_id  Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id    Returns results with an ID less than (that is, older than) the specified ID.
+	 * @param   boolean  $entities  When set to true,  each tweet will include a node called "entities,". This node offers a variety
+	 * 								of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getFavorites($user = null, $count = 20, $since_id = 0, $max_id = 0, $entities = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('favorites', 'list');
+
+		// Set the API path.
+		$path = '/favorites/list.json';
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+
+		// Set the count string
+		$data['count'] = $count;
+
+		// Check if since_id is specified.
+		if ($since_id > 0)
+		{
+			$data['since_id'] = $since_id;
+		}
+
+		// Check if max_id is specified.
+		if ($max_id > 0)
+		{
+			$data['max_id'] = $max_id;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to favorite the status specified in the ID parameter as the authenticating user
+	 *
+	 * @param   integer  $id        The numerical ID of the desired status.
+	 * @param   boolean  $entities  When set to true,  each tweet will include a node called "entities,". This node offers a variety
+	 * 								of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function createFavorites($id, $entities = null)
+	{
+		// Set the API path.
+		$path = '/favorites/create.json';
+
+		$data['id'] = $id;
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to un-favorites the status specified in the ID parameter as the authenticating user.
+	 *
+	 * @param   integer  $id        The numerical ID of the desired status.
+	 * @param   boolean  $entities  When set to true,  each tweet will include a node called "entities,". This node offers a variety
+	 * 								of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function deleteFavorites($id, $entities = null)
+	{
+		// Set the API path.
+		$path = '/favorites/destroy.json';
+
+		$data['id'] = $id;
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/friends.php b/core/libraries/joomla/twitter/friends.php
new file mode 100644
index 00000000..0b1161ef
--- /dev/null
+++ b/core/libraries/joomla/twitter/friends.php
@@ -0,0 +1,460 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Friends class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterFriends extends JTwitterObject
+{
+	/**
+	 * Method to get an array of user IDs the specified user follows.
+	 *
+	 * @param   mixed    $user        Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $cursor      Causes the list of connections to be broken into pages of no more than 5000 IDs at a time.
+	 * 								  The number of IDs returned is not guaranteed to be 5000 as suspended users are filtered out
+	 * 								  after connections are queried. If no cursor is provided, a value of -1 will be assumed, which is the first "page."
+	 * @param   boolean  $string_ids  Set to true to return IDs as strings, false to return as integers.
+	 * @param   integer  $count       Specifies the number of IDs attempt retrieval of, up to a maximum of 5,000 per distinct request.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getFriendIds($user, $cursor = null, $string_ids = null, $count = 0)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('friends', 'ids');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if cursor is specified
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Check if string_ids is true
+		if ($string_ids)
+		{
+			$data['stringify_ids'] = $string_ids;
+		}
+
+		// Check if count is specified
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Set the API path
+		$path = '/friends/ids.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to display detailed friend information between two users.
+	 *
+	 * @param   mixed  $user_a  Either an integer containing the user ID or a string containing the screen name of the first user.
+	 * @param   mixed  $user_b  Either an integer containing the user ID or a string containing the screen name of the second user.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getFriendshipDetails($user_a, $user_b)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('friendships', 'show');
+
+		// Determine which type of data was passed for $user_a
+		if (is_numeric($user_a))
+		{
+			$data['source_id'] = $user_a;
+		}
+		elseif (is_string($user_a))
+		{
+			$data['source_screen_name'] = $user_a;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The first specified username is not in the correct format; must use integer or string');
+		}
+
+		// Determine which type of data was passed for $user_b
+		if (is_numeric($user_b))
+		{
+			$data['target_id'] = $user_b;
+		}
+		elseif (is_string($user_b))
+		{
+			$data['target_screen_name'] = $user_b;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The second specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/friendships/show.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get an array of user IDs the specified user is followed by.
+	 *
+	 * @param   mixed    $user        Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $cursor      Causes the list of IDs to be broken into pages of no more than 5000 IDs at a time. The number of IDs returned
+	 * 								  is not guaranteed to be 5000 as suspended users are filtered out after connections are queried. If no cursor
+	 * 								  is provided, a value of -1 will be assumed, which is the first "page."
+	 * @param   boolean  $string_ids  Set to true to return IDs as strings, false to return as integers.
+	 * @param   integer  $count       Specifies the number of IDs attempt retrieval of, up to a maximum of 5,000 per distinct request.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getFollowerIds($user, $cursor = null, $string_ids = null, $count = 0)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('followers', 'ids');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/followers/ids.json';
+
+		// Check if cursor is specified
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Check if string_ids is specified
+		if (!is_null($string_ids))
+		{
+			$data['stringify_ids'] = $string_ids;
+		}
+
+		// Check if count is specified
+		if (!is_null($count))
+		{
+			$data['count'] = $count;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to determine pending requests to follow the authenticating user.
+	 *
+	 * @param   integer  $cursor      Causes the list of IDs to be broken into pages of no more than 5000 IDs at a time. The number of IDs returned
+	 * 								  is not guaranteed to be 5000 as suspended users are filtered out after connections are queried. If no cursor
+	 * 								  is provided, a value of -1 will be assumed, which is the first "page."
+	 * @param   boolean  $string_ids  Set to true to return IDs as strings, false to return as integers.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getFriendshipsIncoming($cursor = null, $string_ids = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('friendships', 'incoming');
+
+		$data = array();
+
+		// Check if cursor is specified
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Check if string_ids is specified
+		if (!is_null($string_ids))
+		{
+			$data['stringify_ids'] = $string_ids;
+		}
+
+		// Set the API path
+		$path = '/friendships/incoming.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to determine every protected user for whom the authenticating user has a pending follow request.
+	 *
+	 * @param   integer  $cursor      Causes the list of IDs to be broken into pages of no more than 5000 IDs at a time. The number of IDs returned
+	 * 								  is not guaranteed to be 5000 as suspended users are filtered out after connections are queried. If no cursor
+	 * 								  is provided, a value of -1 will be assumed, which is the first "page."
+	 * @param   boolean  $string_ids  Set to true to return IDs as strings, false to return as integers.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getFriendshipsOutgoing($cursor = null, $string_ids = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('friendships', 'outgoing');
+
+		$data = array();
+
+		// Check if cursor is specified
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Check if string_ids is specified
+		if (!is_null($string_ids))
+		{
+			$data['stringify_ids'] = $string_ids;
+		}
+
+		// Set the API path
+		$path = '/friendships/outgoing.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Allows the authenticating users to follow the user specified in the ID parameter.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $follow  Enable notifications for the target user.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function follow($user, $follow = false)
+	{
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if follow is true
+		if ($follow)
+		{
+			$data['follow'] = $follow;
+		}
+
+		// Set the API path
+		$path = '/friendships/create.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Allows the authenticating users to unfollow the user specified in the ID parameter.
+	 *
+	 * @param   mixed  $user  Either an integer containing the user ID or a string containing the screen name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function unfollow($user)
+	{
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/friendships/destroy.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to get the relationship of the authenticating user to the comma separated list of up to 100 screen_names or user_ids provided.
+	 *
+	 * @param   string  $screen_name  A comma separated list of screen names, up to 100 are allowed in a single request.
+	 * @param   string  $id           A comma separated list of user IDs, up to 100 are allowed in a single request.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getFriendshipsLookup($screen_name = null, $id = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('friendships', 'lookup');
+
+		// Set user IDs and screen names.
+		if ($id)
+		{
+			$data['user_id'] = $id;
+		}
+
+		if ($screen_name)
+		{
+			$data['screen_name'] = $screen_name;
+		}
+
+		if ($id == null && $screen_name == null)
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('You must specify either a comma separated list of screen names, user IDs, or a combination of the two');
+		}
+
+		// Set the API path
+		$path = '/friendships/lookup.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Allows one to enable or disable retweets and device notifications from the specified user.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $device    Enable/disable device notifications from the target user.
+	 * @param   boolean  $retweets  Enable/disable retweets from the target user.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function updateFriendship($user, $device = null, $retweets = null)
+	{
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if device is specified.
+		if (!is_null($device))
+		{
+			$data['device'] = $device;
+		}
+
+		// Check if retweets is specified.
+		if (!is_null($retweets))
+		{
+			$data['retweets'] = $retweets;
+		}
+
+		// Set the API path
+		$path = '/friendships/update.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to get the user ids that currently authenticated user does not want to see retweets from.
+	 *
+	 * @param   boolean  $string_ids  Set to true to return IDs as strings, false to return as integers.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getFriendshipNoRetweetIds($string_ids = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('friendships', 'no_retweets/ids');
+
+		$data = array();
+
+		// Check if string_ids is specified
+		if (!is_null($string_ids))
+		{
+			$data['stringify_ids'] = $string_ids;
+		}
+
+		// Set the API path
+		$path = '/friendships/no_retweets/ids.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/help.php b/core/libraries/joomla/twitter/help.php
new file mode 100644
index 00000000..005f009d
--- /dev/null
+++ b/core/libraries/joomla/twitter/help.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Help class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterHelp extends JTwitterObject
+{
+	/**
+	 * Method to get the supported languages from the API.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getLanguages()
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('help', 'languages');
+
+		// Set the API path
+		$path = '/help/languages.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to get the current configuration used by Twitter including twitter.com slugs which are not usernames,
+	 * maximum photo resolutions, and t.co URL lengths.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getConfiguration()
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('help', 'configuration');
+
+		// Set the API path
+		$path = '/help/configuration.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+}
diff --git a/core/libraries/joomla/twitter/lists.php b/core/libraries/joomla/twitter/lists.php
new file mode 100644
index 00000000..9586cf8a
--- /dev/null
+++ b/core/libraries/joomla/twitter/lists.php
@@ -0,0 +1,982 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Lists class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterLists extends JTwitterObject
+{
+	/**
+	 * Method to get all lists the authenticating or specified user subscribes to, including their own.
+	 *
+	 * @param   mixed    $user     Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $reverse  Set this to true if you would like owned lists to be returned first. See description
+	 * 					 above for information on how this parameter works.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getLists($user, $reverse = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'list');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if reverse is specified.
+		if (!is_null($reverse))
+		{
+			$data['reverse'] = $reverse;
+		}
+
+		// Set the API path
+		$path = '/lists/list.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get tweet timeline for members of the specified list
+	 *
+	 * @param   mixed    $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed    $owner        Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $since_id     Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id       Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param   integer  $count        Specifies the number of results to retrieve per "page."
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities". This node offers a variety
+	 * 								   of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $include_rts  When set to either true, t or 1, the list timeline will contain native retweets (if they exist) in addition
+	 * 								   to the standard stream of tweets.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getStatuses($list, $owner = null, $since_id = 0, $max_id = 0, $count = 0, $entities = null, $include_rts = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'statuses');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/statuses.json';
+
+		// Check if since_id is specified
+		if ($since_id > 0)
+		{
+			$data['since_id'] = $since_id;
+		}
+
+		// Check if max_id is specified
+		if ($max_id > 0)
+		{
+			$data['max_id'] = $max_id;
+		}
+
+		// Check if count is specified
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if include_rts is specified
+		if (!is_null($include_rts))
+		{
+			$data['include_rts'] = $include_rts;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get the subscribers of the specified list.
+	 *
+	 * @param   mixed    $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed    $owner        Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $cursor       Breaks the results into pages. A single page contains 20 lists. Provide a value of -1 to begin paging.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities". This node offers a variety
+	 * 								   of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getSubscribers($list, $owner = null, $cursor = null, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'subscribers');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/subscribers.json';
+
+		// Check if cursor is specified
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to remove multiple members from a list, by specifying a comma-separated list of member ids or screen names.
+	 *
+	 * @param   mixed   $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   string  $user_id      A comma separated list of user IDs, up to 100 are allowed in a single request.
+	 * @param   string  $screen_name  A comma separated list of screen names, up to 100 are allowed in a single request.
+	 * @param   mixed   $owner        Either an integer containing the user ID or a string containing the screen name of the owner.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function deleteMembers($list, $user_id = null, $screen_name = null, $owner = null)
+	{
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username for owner is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		if ($user_id)
+		{
+			$data['user_id'] = $user_id;
+		}
+
+		if ($screen_name)
+		{
+			$data['screen_name'] = $screen_name;
+		}
+
+		if ($user_id == null && $screen_name == null)
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('You must specify either a comma separated list of screen names, user IDs, or a combination of the two');
+		}
+
+		// Set the API path
+		$path = '/lists/members/destroy_all.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to subscribe the authenticated user to the specified list.
+	 *
+	 * @param   mixed  $list   Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed  $owner  Either an integer containing the user ID or a string containing the screen name of the owner.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function subscribe($list, $owner = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'subscribers/create');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username for owner is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/subscribers/create.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to check if the specified user is a member of the specified list.
+	 *
+	 * @param   mixed    $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name of the user to remove.
+	 * @param   mixed    $owner        Either an integer containing the user ID or a string containing the screen name of the owner.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function isMember($list, $user, $owner = null, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'members/show');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/members/show.json';
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to check if the specified user is a subscriber of the specified list.
+	 *
+	 * @param   mixed    $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name of the user to remove.
+	 * @param   mixed    $owner        Either an integer containing the user ID or a string containing the screen name of the owner.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function isSubscriber($list, $user, $owner = null, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'subscribers/show');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/subscribers/show.json';
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to unsubscribe the authenticated user from the specified list.
+	 *
+	 * @param   mixed  $list   Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed  $owner  Either an integer containing the user ID or a string containing the screen name of the owner.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function unsubscribe($list, $owner = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'subscribers/destroy');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/subscribers/destroy.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to add multiple members to a list, by specifying a comma-separated list of member ids or screen names.
+	 *
+	 * @param   mixed   $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   string  $user_id      A comma separated list of user IDs, up to 100 are allowed in a single request.
+	 * @param   string  $screen_name  A comma separated list of screen names, up to 100 are allowed in a single request.
+	 * @param   mixed   $owner        Either an integer containing the user ID or a string containing the screen name of the owner.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function addMembers($list, $user_id = null, $screen_name = null, $owner = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'members/create_all');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		if ($user_id)
+		{
+			$data['user_id'] = $user_id;
+		}
+
+		if ($screen_name)
+		{
+			$data['screen_name'] = $screen_name;
+		}
+
+		if ($user_id == null && $screen_name == null)
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('You must specify either a comma separated list of screen names, user IDs, or a combination of the two');
+		}
+
+		// Set the API path
+		$path = '/lists/members/create_all.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to get the members of the specified list.
+	 *
+	 * @param   mixed    $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed    $owner        Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities". This node offers a variety
+	 * 								   of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getMembers($list, $owner = null, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'members');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/members.json';
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get the specified list.
+	 *
+	 * @param   mixed  $list   Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed  $owner  Either an integer containing the user ID or a string containing the screen name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getListById($list, $owner = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'show');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/show.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get a collection of the lists the specified user is subscribed to, 20 lists per page by default. Does not include the user's own lists.
+	 *
+	 * @param   mixed    $user    Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $count   The amount of results to return per page. Defaults to 20. Maximum of 1,000 when using cursors.
+	 * @param   integer  $cursor  Breaks the results into pages. Provide a value of -1 to begin paging.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getSubscriptions($user, $count = 0, $cursor = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'subscriptions');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Check if count is specified.
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if cursor is specified.
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Set the API path
+		$path = '/lists/subscriptions.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to update the specified list
+	 *
+	 * @param   mixed   $list         Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed   $owner        Either an integer containing the user ID or a string containing the screen name of the owner.
+	 * @param   string  $name         The name of the list.
+	 * @param   string  $mode         Whether your list is public or private. Values can be public or private. If no mode is
+	 * 								  specified the list will be public.
+	 * @param   string  $description  The description to give the list.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function update($list, $owner = null, $name = null, $mode = null, $description = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'update');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Check if name is specified.
+		if ($name)
+		{
+			$data['name'] = $name;
+		}
+
+		// Check if mode is specified.
+		if ($mode)
+		{
+			$data['mode'] = $mode;
+		}
+
+		// Check if description is specified.
+		if ($description)
+		{
+			$data['description'] = $description;
+		}
+
+		// Set the API path
+		$path = '/lists/update.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to create a new list for the authenticated user.
+	 *
+	 * @param   string  $name         The name of the list.
+	 * @param   string  $mode         Whether your list is public or private. Values can be public or private. If no mode is
+	 * 								  specified the list will be public.
+	 * @param   string  $description  The description to give the list.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function create($name, $mode = null, $description = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'create');
+
+		// Check if name is specified.
+		if ($name)
+		{
+			$data['name'] = $name;
+		}
+
+		// Check if mode is specified.
+		if ($mode)
+		{
+			$data['mode'] = $mode;
+		}
+
+		// Check if description is specified.
+		if ($description)
+		{
+			$data['description'] = $description;
+		}
+
+		// Set the API path
+		$path = '/lists/create.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to delete a specified list.
+	 *
+	 * @param   mixed  $list   Either an integer containing the list ID or a string containing the list slug.
+	 * @param   mixed  $owner  Either an integer containing the user ID or a string containing the screen name of the owner.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function delete($list, $owner = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('lists', 'destroy');
+
+		// Determine which type of data was passed for $list
+		if (is_numeric($list))
+		{
+			$data['list_id'] = $list;
+		}
+		elseif (is_string($list))
+		{
+			$data['slug'] = $list;
+
+			// In this case the owner is required.
+			if (is_numeric($owner))
+			{
+				$data['owner_id'] = $owner;
+			}
+			elseif (is_string($owner))
+			{
+				$data['owner_screen_name'] = $owner;
+			}
+			else
+			{
+				// We don't have a valid entry
+				throw new RuntimeException('The specified username for owner is not in the correct format; must use integer or string');
+			}
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified list is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/lists/destroy.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/oauth.php b/core/libraries/joomla/twitter/oauth.php
new file mode 100644
index 00000000..3d9eab78
--- /dev/null
+++ b/core/libraries/joomla/twitter/oauth.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for generating Twitter API access token.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterOAuth extends JOAuth1Client
+{
+	/**
+	* @var    Registry  Options for the JTwitterOauth object.
+	* @since  12.3
+	*/
+	protected $options;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry         $options      JTwitterOauth options object.
+	 * @param   JHttp            $client       The HTTP client object.
+	 * @param   JInput           $input        The input object.
+	 * @param   JApplicationWeb  $application  The application object.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry $options = null, JHttp $client = null, JInput $input = null, JApplicationWeb $application = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+
+		$this->options->def('accessTokenURL', 'https://api.twitter.com/oauth/access_token');
+		$this->options->def('authenticateURL', 'https://api.twitter.com/oauth/authenticate');
+		$this->options->def('authoriseURL', 'https://api.twitter.com/oauth/authorize');
+		$this->options->def('requestTokenURL', 'https://api.twitter.com/oauth/request_token');
+
+		// Call the JOAuth1Client constructor to setup the object.
+		parent::__construct($this->options, $client, $input, $application);
+	}
+
+	/**
+	 * Method to verify if the access token is valid by making a request.
+	 *
+	 * @return  boolean  Returns true if the access token is valid and false otherwise.
+	 *
+	 * @since   12.3
+	 */
+	public function verifyCredentials()
+	{
+		$token = $this->getToken();
+
+		// Set the parameters.
+		$parameters = array('oauth_token' => $token['key']);
+
+		// Set the API base
+		$path = 'https://api.twitter.com/1.1/account/verify_credentials.json';
+
+		// Send the request.
+		$response = $this->oauthRequest($path, 'GET', $parameters);
+
+		// Verify response
+		if ($response->code == 200)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Ends the session of the authenticating user, returning a null cookie.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function endSession()
+	{
+		$token = $this->getToken();
+
+		// Set parameters.
+		$parameters = array('oauth_token' => $token['key']);
+
+		// Set the API base
+		$path = 'https://api.twitter.com/1.1/account/end_session.json';
+
+		// Send the request.
+		$response = $this->oauthRequest($path, 'POST', $parameters);
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Method to validate a response.
+	 *
+	 * @param   string         $url       The request URL.
+	 * @param   JHttpResponse  $response  The response to validate.
+	 *
+	 * @return  void
+	 *
+	 * @since  12.3
+	 * @throws DomainException
+	 */
+	public function validateResponse($url, $response)
+	{
+		if (strpos($url, 'verify_credentials') === false && $response->code != 200)
+		{
+			$error = json_decode($response->body);
+
+			if (property_exists($error, 'error'))
+			{
+				throw new DomainException($error->error);
+			}
+			else
+			{
+				$error = $error->errors;
+				throw new DomainException($error[0]->message, $error[0]->code);
+			}
+		}
+	}
+}
diff --git a/core/libraries/joomla/twitter/object.php b/core/libraries/joomla/twitter/object.php
new file mode 100644
index 00000000..0869305d
--- /dev/null
+++ b/core/libraries/joomla/twitter/object.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Twitter API object class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+abstract class JTwitterObject
+{
+	/**
+	 * @var    Registry  Options for the Twitter object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  12.3
+	 */
+	protected $client;
+
+	/**
+	 * @var    JTwitterOAuth The OAuth client.
+	 * @since  12.3
+	 */
+	protected $oauth;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry       &$options  Twitter options object.
+	 * @param   JHttp          $client    The HTTP client object.
+	 * @param   JTwitterOAuth  $oauth     The OAuth client.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(Registry &$options = null, JHttp $client = null, JTwitterOAuth $oauth = null)
+	{
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client = isset($client) ? $client : new JHttp($this->options);
+		$this->oauth = $oauth;
+	}
+
+	/**
+	 * Method to check the rate limit for the requesting IP address
+	 *
+	 * @param   string  $resource  A resource or a comma-separated list of resource families you want to know the current rate limit disposition for.
+	 * @param   string  $action    An action for the specified resource, if only one resource is specified.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function checkRateLimit($resource = null, $action = null)
+	{
+		// Check the rate limit for remaining hits
+		$rate_limit = $this->getRateLimit($resource);
+
+		$property = '/' . $resource;
+
+		if (!is_null($action))
+		{
+			$property .= '/' . $action;
+		}
+
+		if ($rate_limit->resources->$resource->$property->remaining == 0)
+		{
+			// The IP has exceeded the Twitter API rate limit
+			throw new RuntimeException('This server has exceed the Twitter API rate limit for the given period.  The limit will reset at '
+				. $rate_limit->resources->$resource->$property->reset
+			);
+		}
+	}
+
+	/**
+	 * Method to build and return a full request URL for the request.  This method will
+	 * add appropriate pagination details if necessary and also prepend the API url
+	 * to have a complete URL for the request.
+	 *
+	 * @param   string  $path        URL to inflect
+	 * @param   array   $parameters  The parameters passed in the URL.
+	 *
+	 * @return  string  The request URL.
+	 *
+	 * @since   12.3
+	 */
+	public function fetchUrl($path, $parameters = null)
+	{
+		if ($parameters)
+		{
+			foreach ($parameters as $key => $value)
+			{
+				if (strpos($path, '?') === false)
+				{
+					$path .= '?' . $key . '=' . $value;
+				}
+				else
+				{
+					$path .= '&' . $key . '=' . $value;
+				}
+			}
+		}
+
+		// Get a new JUri object fousing the api url and given path.
+		if (strpos($path, 'http://search.twitter.com/search.json') === false)
+		{
+			$uri = new JUri($this->options->get('api.url') . $path);
+		}
+		else
+		{
+			$uri = new JUri($path);
+		}
+
+		return (string) $uri;
+	}
+
+	/**
+	 * Method to retrieve the rate limit for the requesting IP address
+	 *
+	 * @param   string  $resource  A resource or a comma-separated list of resource families you want to know the current rate limit disposition for.
+	 *
+	 * @return  array  The JSON response decoded
+	 *
+	 * @since   12.3
+	 */
+	public function getRateLimit($resource)
+	{
+		// Build the request path.
+		$path = '/application/rate_limit_status.json';
+
+		if (!is_null($resource))
+		{
+			return $this->sendRequest($path, 'GET',  array('resources' => $resource));
+		}
+
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to send the request.
+	 *
+	 * @param   string  $path     The path of the request to make
+	 * @param   string  $method   The request method.
+	 * @param   mixed   $data     Either an associative array or a string to be sent with the post request.
+	 * @param   array   $headers  An array of name-value pairs to include in the header of the request
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function sendRequest($path, $method = 'GET', $data = array(), $headers = array())
+	{
+		// Get the access token.
+		$token = $this->oauth->getToken();
+
+		// Set parameters.
+		$parameters['oauth_token'] = $token['key'];
+
+		// Send the request.
+		$response = $this->oauth->oauthRequest($this->fetchUrl($path), $method, $parameters, $data, $headers);
+
+		if (strpos($path, 'update_with_media') !== false)
+		{
+			// Check Media Rate Limit.
+			$response_headers = $response->headers;
+
+			if ($response_headers['x-mediaratelimit-remaining'] == 0)
+			{
+				// The IP has exceeded the Twitter API media rate limit
+				throw new RuntimeException('This server has exceed the Twitter API media rate limit for the given period.  The limit will reset in '
+					. $response_headers['x-mediaratelimit-reset'] . 'seconds.'
+				);
+			}
+		}
+
+		if (strpos($response->body, 'redirected') !== false)
+		{
+			return $response->headers['Location'];
+		}
+
+		return json_decode($response->body);
+	}
+
+	/**
+	 * Get an option from the JTwitterObject instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JTwitterObject instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JTwitterObject  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/twitter/places.php b/core/libraries/joomla/twitter/places.php
new file mode 100644
index 00000000..6b28d640
--- /dev/null
+++ b/core/libraries/joomla/twitter/places.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Places & Geo class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterPlaces extends JTwitterObject
+{
+	/**
+	 * Method to get all the information about a known place.
+	 *
+	 * @param   string  $id  A place in the world. These IDs can be retrieved using getGeocode.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getPlace($id)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('geo', 'id/:place_id');
+
+		// Set the API path
+		$path = '/geo/id/' . $id . '.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to get up to 20 places that can be used as a place_id when updating a status.
+	 *
+	 * @param   float    $lat          The latitude to search around.
+	 * @param   float    $long         The longitude to search around.
+	 * @param   string   $accuracy     A hint on the "region" in which to search. If a number, then this is a radius in meters,
+	 * 								   but it can also take a string that is suffixed with ft to specify feet.
+	 * @param   string   $granularity  This is the minimal granularity of place types to return and must be one of: poi, neighborhood,
+	 * 								   city, admin or country.
+	 * @param   integer  $max_results  A hint as to the number of results to return.
+	 * @param   string   $callback     If supplied, the response will use the JSONP format with a callback of the given name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getGeocode($lat, $long, $accuracy = null, $granularity = null, $max_results = 0, $callback = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('geo', 'reverse_geocode');
+
+		// Set the API path
+		$path = '/geo/reverse_geocode.json';
+
+		// Set the request parameters
+		$data['lat'] = $lat;
+		$data['long'] = $long;
+
+		// Check if accuracy is specified
+		if ($accuracy)
+		{
+			$data['accuracy'] = $accuracy;
+		}
+
+		// Check if granularity is specified
+		if ($granularity)
+		{
+			$data['granularity'] = $granularity;
+		}
+
+		// Check if max_results is specified
+		if ($max_results)
+		{
+			$data['max_results'] = $max_results;
+		}
+
+		// Check if callback is specified
+		if ($callback)
+		{
+			$data['callback'] = $callback;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to search for places that can be attached to a statuses/update.
+	 *
+	 * @param   float    $lat          The latitude to search around.
+	 * @param   float    $long         The longitude to search around.
+	 * @param   string   $query        Free-form text to match against while executing a geo-based query, best suited for finding nearby
+	 * 								   locations by name.
+	 * @param   string   $ip           An IP address.
+	 * @param   string   $granularity  This is the minimal granularity of place types to return and must be one of: poi, neighborhood, city,
+	 * 								   admin or country.
+	 * @param   string   $accuracy     A hint on the "region" in which to search. If a number, then this is a radius in meters, but it can
+	 * 								   also take a string that is suffixed with ft to specify feet.
+	 * @param   integer  $max_results  A hint as to the number of results to return.
+	 * @param   string   $within       This is the place_id which you would like to restrict the search results to.
+	 * @param   string   $attribute    This parameter searches for places which have this given street address.
+	 * @param   string   $callback     If supplied, the response will use the JSONP format with a callback of the given name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function search($lat = null, $long = null, $query = null, $ip = null, $granularity = null, $accuracy = null, $max_results = 0,
+		$within = null, $attribute = null, $callback = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('geo', 'search');
+
+		// Set the API path
+		$path = '/geo/search.json';
+
+		// At least one of the following parameters must be provided: lat, long, ip, or query.
+		if ($lat == null && $long == null && $ip == null && $query == null)
+		{
+			throw new RuntimeException('At least one of the following parameters must be provided: lat, long, ip, or query.');
+		}
+
+		// Check if lat is specified.
+		if ($lat)
+		{
+			$data['lat'] = $lat;
+		}
+
+		// Check if long is specified.
+		if ($long)
+		{
+			$data['long'] = $long;
+		}
+
+		// Check if query is specified.
+		if ($query)
+		{
+			$data['query'] = rawurlencode($query);
+		}
+
+		// Check if ip is specified.
+		if ($ip)
+		{
+			$data['ip'] = $ip;
+		}
+
+		// Check if granularity is specified
+		if ($granularity)
+		{
+			$data['granularity'] = $granularity;
+		}
+
+		// Check if accuracy is specified
+		if ($accuracy)
+		{
+			$data['accuracy'] = $accuracy;
+		}
+
+		// Check if max_results is specified
+		if ($max_results)
+		{
+			$data['max_results'] = $max_results;
+		}
+
+		// Check if within is specified
+		if ($within)
+		{
+			$data['contained_within'] = $within;
+		}
+
+		// Check if attribute is specified
+		if ($attribute)
+		{
+			$data['attribute:street_address'] = rawurlencode($attribute);
+		}
+
+		// Check if callback is specified
+		if ($callback)
+		{
+			$data['callback'] = $callback;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to locate places near the given coordinates which are similar in name.
+	 *
+	 * @param   float   $lat        The latitude to search around.
+	 * @param   float   $long       The longitude to search around.
+	 * @param   string  $name       The name a place is known as.
+	 * @param   string  $within     This is the place_id which you would like to restrict the search results to.
+	 * @param   string  $attribute  This parameter searches for places which have this given street address.
+	 * @param   string  $callback   If supplied, the response will use the JSONP format with a callback of the given name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSimilarPlaces($lat, $long, $name, $within = null, $attribute = null, $callback = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('geo', 'similar_places');
+
+		// Set the API path
+		$path = '/geo/similar_places.json';
+
+		$data['lat'] = $lat;
+		$data['long'] = $long;
+		$data['name'] = rawurlencode($name);
+
+		// Check if within is specified
+		if ($within)
+		{
+			$data['contained_within'] = $within;
+		}
+
+		// Check if attribute is specified
+		if ($attribute)
+		{
+			$data['attribute:street_address'] = rawurlencode($attribute);
+		}
+
+		// Check if callback is specified
+		if ($callback)
+		{
+			$data['callback'] = $callback;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to create a new place object at the given latitude and longitude.
+	 *
+	 * @param   float   $lat        The latitude to search around.
+	 * @param   float   $long       The longitude to search around.
+	 * @param   string  $name       The name a place is known as.
+	 * @param   string  $geo_token  The token found in the response from geo/similar_places.
+	 * @param   string  $within     This is the place_id which you would like to restrict the search results to.
+	 * @param   string  $attribute  This parameter searches for places which have this given street address.
+	 * @param   string  $callback   If supplied, the response will use the JSONP format with a callback of the given name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function createPlace($lat, $long, $name, $geo_token, $within, $attribute = null, $callback = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('geo', 'place');
+
+		$data['lat'] = $lat;
+		$data['long'] = $long;
+		$data['name'] = rawurlencode($name);
+		$data['token'] = $geo_token;
+		$data['contained_within'] = $within;
+
+		// Check if attribute is specified
+		if ($attribute)
+		{
+			$data['attribute:street_address'] = rawurlencode($attribute);
+		}
+
+		// Check if callback is specified
+		if ($callback)
+		{
+			$data['callback'] = $callback;
+		}
+
+		// Set the API path
+		$path = '/geo/place.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/profile.php b/core/libraries/joomla/twitter/profile.php
new file mode 100644
index 00000000..f647ebad
--- /dev/null
+++ b/core/libraries/joomla/twitter/profile.php
@@ -0,0 +1,347 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Profile class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterProfile extends JTwitterObject
+{
+	/**
+	 * Method to et values that users are able to set under the "Account" tab of their settings page.
+	 *
+	 * @param   string   $name         Full name associated with the profile. Maximum of 20 characters.
+	 * @param   string   $url          URL associated with the profile. Will be prepended with "http://" if not present. Maximum of 100 characters.
+	 * @param   string   $location     The city or country describing where the user of the account is located. The contents are not normalized
+	 * 								   or geocoded in any way. Maximum of 30 characters.
+	 * @param   string   $description  A description of the user owning the account. Maximum of 160 characters.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function updateProfile($name = null, $url = null, $location = null, $description = null, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('account', 'update_profile');
+
+		$data = array();
+
+		// Check if name is specified.
+		if ($name)
+		{
+			$data['name'] = $name;
+		}
+
+		// Check if url is specified.
+		if ($url)
+		{
+			$data['url'] = $url;
+		}
+
+		// Check if location is specified.
+		if ($location)
+		{
+			$data['location'] = $location;
+		}
+
+		// Check if description is specified.
+		if ($description)
+		{
+			$data['description'] = $description;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified.
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Set the API path
+		$path = '/account/update_profile.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to update the authenticating user's profile background image. This method can also be used to enable or disable the profile
+	 * background image.
+	 *
+	 * @param   string   $image        The background image for the profile.
+	 * @param   boolean  $tile         Whether or not to tile the background image.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 * @param   boolean  $use          Determines whether to display the profile background image or not.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function updateProfileBackgroundImage($image = null, $tile = false, $entities = null, $skip_status = null, $use = false)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('account', 'update_profile_background_image');
+
+		$data = array();
+
+		// Check if image is specified.
+		if ($image)
+		{
+			$data['image'] = "@{$image}";
+		}
+
+		// Check if url is true.
+		if ($tile)
+		{
+			$data['tile'] = $tile;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified.
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Check if use is true.
+		if ($use)
+		{
+			$data['use'] = $use;
+		}
+
+		// Set the API path
+		$path = '/account/update_profile_background_image.json';
+
+		$header = array('Content-Type' => 'multipart/form-data', 'Expect' => '');
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data, $header);
+	}
+
+	/**
+	 * Method to update the authenticating user's profile image.
+	 *
+	 * @param   string   $image        The background image for the profile.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								   variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function updateProfileImage($image = null, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('account', 'update_profile_image');
+
+		$data = array();
+
+		// Check if image is specified.
+		if ($image)
+		{
+			$data['image'] = "@{$image}";
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified.
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Set the API path
+		$path = '/account/update_profile_image.json';
+
+		$header = array('Content-Type' => 'multipart/form-data', 'Expect' => '');
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data, $header);
+	}
+
+	/**
+	 * Method to set one or more hex values that control the color scheme of the authenticating user's profile page on twitter.com.
+	 *
+	 * @param   string   $background      Profile background color.
+	 * @param   string   $link            Profile link color.
+	 * @param   string   $sidebar_border  Profile sidebar's border color.
+	 * @param   string   $sidebar_fill    Profile sidebar's fill color.
+	 * @param   string   $text            Profile text color.
+	 * @param   boolean  $entities        When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 									  variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $skip_status     When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function updateProfileColors($background = null, $link = null, $sidebar_border = null, $sidebar_fill = null, $text = null,
+		$entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('account', 'update_profile_colors');
+
+		$data = array();
+
+		// Check if background is specified.
+		if ($background)
+		{
+			$data['profile_background_color'] = $background;
+		}
+
+		// Check if link is specified.
+		if ($link)
+		{
+			$data['profile_link_color'] = $link;
+		}
+
+		// Check if sidebar_border is specified.
+		if ($sidebar_border)
+		{
+			$data['profile_sidebar_border_color'] = $sidebar_border;
+		}
+
+		// Check if sidebar_fill is specified.
+		if ($sidebar_fill)
+		{
+			$data['profile_sidebar_fill_color'] = $sidebar_fill;
+		}
+
+		// Check if text is specified.
+		if ($text)
+		{
+			$data['profile_text_color'] = $text;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is true.
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Set the API path
+		$path = '/account/update_profile_colors.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to get the settings (including current trend, geo and sleep time information) for the authenticating user.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSettings()
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('account', 'settings');
+
+		// Set the API path
+		$path = '/account/settings.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to update the authenticating user's settings.
+	 *
+	 * @param   integer  $location     The Yahoo! Where On Earth ID to use as the user's default trend location.
+	 * @param   boolean  $sleep_time   When set to true, t or 1, will enable sleep time for the user.
+	 * @param   integer  $start_sleep  The hour that sleep time should begin if it is enabled.
+	 * @param   integer  $end_sleep    The hour that sleep time should end if it is enabled.
+	 * @param   string   $time_zone    The timezone dates and times should be displayed in for the user. The timezone must be one of the
+	 * 								   Rails TimeZone names.
+	 * @param   string   $lang         The language which Twitter should render in for this user.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function updateSettings($location = null, $sleep_time = false, $start_sleep = null, $end_sleep = null,
+		$time_zone = null, $lang = null)
+	{
+		$data = array();
+
+		// Check if location is specified.
+		if ($location)
+		{
+			$data['trend_location_woeid '] = $location;
+		}
+
+		// Check if sleep_time is true.
+		if ($sleep_time)
+		{
+			$data['sleep_time_enabled'] = $sleep_time;
+		}
+
+		// Check if start_sleep is specified.
+		if ($start_sleep)
+		{
+			$data['start_sleep_time'] = $start_sleep;
+		}
+
+		// Check if end_sleep is specified.
+		if ($end_sleep)
+		{
+			$data['end_sleep_time'] = $end_sleep;
+		}
+
+		// Check if time_zone is specified.
+		if ($time_zone)
+		{
+			$data['time_zone'] = $time_zone;
+		}
+
+		// Check if lang is specified.
+		if ($lang)
+		{
+			$data['lang'] = $lang;
+		}
+
+		// Set the API path
+		$path = '/account/settings.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/search.php b/core/libraries/joomla/twitter/search.php
new file mode 100644
index 00000000..396a3662
--- /dev/null
+++ b/core/libraries/joomla/twitter/search.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Search class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwittersearch extends JTwitterObject
+{
+	/**
+	 * Method to get tweets that match a specified query.
+	 *
+	 * @param   string   $query        Search query. Should be URL encoded. Queries will be limited by complexity.
+	 * @param   string   $callback     If supplied, the response will use the JSONP format with a callback of the given name
+	 * @param   string   $geocode      Returns tweets by users located within a given radius of the given latitude/longitude. The parameter value is
+	 * 								   specified by "latitude,longitude,radius", where radius units must be specified as either "mi" (miles) or "km" (kilometers).
+	 * @param   string   $lang         Restricts tweets to the given language, given by an ISO 639-1 code.
+	 * @param   string   $locale       Specify the language of the query you are sending (only ja is currently effective). This is intended for
+	 * 								   language-specific clients and the default should work in the majority of cases.
+	 * @param   string   $result_type  Specifies what type of search results you would prefer to receive. The current default is "mixed."
+	 * @param   integer  $count        The number of tweets to return per page, up to a maximum of 100. Defaults to 15.
+	 * @param   string   $until        Returns tweets generated before the given date. Date should be formatted as YYYY-MM-DD.
+	 * @param   integer  $since_id     Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id       Returns results with an ID less than (that is, older than) or equal to the specified ID.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								   variety of metadata about the tweet in a discrete structure, including: urls, media and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function search($query, $callback = null, $geocode = null, $lang = null, $locale = null, $result_type = null, $count = 15,
+		$until = null, $since_id = 0, $max_id = 0, $entities = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('search', 'tweets');
+
+		// Set the API path
+		$path = '/search/tweets.json';
+
+		// Set query parameter.
+		$data['q'] = rawurlencode($query);
+
+		// Check if callback is specified.
+		if ($callback)
+		{
+			$data['callback'] = $callback;
+		}
+
+		// Check if geocode is specified.
+		if ($geocode)
+		{
+			$data['geocode'] = $geocode;
+		}
+
+		// Check if lang is specified.
+		if ($lang)
+		{
+			$data['lang'] = $lang;
+		}
+
+		// Check if locale is specified.
+		if ($locale)
+		{
+			$data['locale'] = $locale;
+		}
+
+		// Check if result_type is specified.
+		if ($result_type)
+		{
+			$data['result_type'] = $result_type;
+		}
+
+		// Check if count is specified.
+		if ($count != 15)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if until is specified.
+		if ($until)
+		{
+			$data['until'] = $until;
+		}
+
+		// Check if since_id is specified.
+		if ($since_id > 0)
+		{
+			$data['since_id'] = $since_id;
+		}
+
+		// Check if max_id is specified.
+		if ($max_id > 0)
+		{
+			$data['max_id'] = $max_id;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get the authenticated user's saved search queries.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSavedSearches()
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('saved_searches', 'list');
+
+		// Set the API path
+		$path = '/saved_searches/list.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to get the information for the saved search represented by the given id.
+	 *
+	 * @param   integer  $id  The ID of the saved search.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSavedSearchesById($id)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('saved_searches', 'show/:id');
+
+		// Set the API path
+		$path = '/saved_searches/show/' . $id . '.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to create a new saved search for the authenticated user.
+	 *
+	 * @param   string  $query  The query of the search the user would like to save.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function createSavedSearch($query)
+	{
+		// Set the API path
+		$path = '/saved_searches/create.json';
+
+		// Set POST request data
+		$data['query'] = rawurlencode($query);
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to delete a saved search for the authenticating user.
+	 *
+	 * @param   integer  $id  The ID of the saved search.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function deleteSavedSearch($id)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('saved_searches', 'destroy/:id');
+
+		// Set the API path
+		$path = '/saved_searches/destroy/' . $id . '.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST');
+	}
+}
diff --git a/core/libraries/joomla/twitter/statuses.php b/core/libraries/joomla/twitter/statuses.php
new file mode 100644
index 00000000..fe4d6989
--- /dev/null
+++ b/core/libraries/joomla/twitter/statuses.php
@@ -0,0 +1,657 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Statuses class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterStatuses extends JTwitterObject
+{
+	/**
+	 * Method to get a single tweet with the given ID.
+	 *
+	 * @param   integer  $id          The ID of the tweet to retrieve.
+	 * @param   boolean  $trim_user   When set to true, each tweet returned in a timeline will include a user object including only
+	 *                                the status author's numerical ID.
+	 * @param   boolean  $entities    When set to true,  each tweet will include a node called "entities,". This node offers a variety of metadata
+	 *                                about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $my_retweet  When set to either true, t or 1, any statuses returned that have been retweeted by the authenticating user will
+	 *                                include an additional current_user_retweet node, containing the ID of the source status for the retweet.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getTweetById($id, $trim_user = null, $entities = null, $my_retweet = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('statuses', 'show/:id');
+
+		// Set the API base
+		$path = '/statuses/show/' . $id . '.json';
+
+		$data = array();
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if my_retweet is specified
+		if (!is_null($my_retweet))
+		{
+			$data['include_my_retweet'] = $my_retweet;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to retrieve the latest statuses from the specified user timeline.
+	 *
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name.
+	 * @param   integer  $count        Specifies the number of tweets to try and retrieve, up to a maximum of 200.  Retweets are always included
+	 *                                 in the count, so it is always suggested to set $include_rts to true
+	 * @param   boolean  $include_rts  When set to true, the timeline will contain native retweets in addition to the standard stream of tweets.
+	 * @param   boolean  $no_replies   This parameter will prevent replies from appearing in the returned timeline. This parameter is only supported
+	 *                                 for JSON and XML responses.
+	 * @param   integer  $since_id     Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id       Returns results with an ID less than (that is, older than) the specified ID.
+	 * @param   boolean  $trim_user    When set to true, each tweet returned in a timeline will include a user object including only
+	 *                                 the status author's numerical ID.
+	 * @param   boolean  $contributor  This parameter enhances the contributors element of the status response to include the screen_name of the
+	 *                                 contributor. By default only the user_id of the contributor is included.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getUserTimeline($user, $count = 20, $include_rts = null, $no_replies = null, $since_id = 0, $max_id = 0, $trim_user = null,
+		$contributor = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('statuses', 'user_timeline');
+
+		$data = array();
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API base
+		$path = '/statuses/user_timeline.json';
+
+		// Set the count string
+		$data['count'] = $count;
+
+		// Check if include_rts is specified
+		if (!is_null($include_rts))
+		{
+			$data['include_rts'] = $include_rts;
+		}
+
+		// Check if no_replies is specified
+		if (!is_null($no_replies))
+		{
+			$data['exclude_replies'] = $no_replies;
+		}
+
+		// Check if a since_id is specified
+		if ($since_id > 0)
+		{
+			$data['since_id'] = (int) $since_id;
+		}
+
+		// Check if a max_id is specified
+		if ($max_id > 0)
+		{
+			$data['max_id'] = (int) $max_id;
+		}
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Check if contributor details is specified
+		if (!is_null($contributor))
+		{
+			$data['contributor_details'] = $contributor;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to post a tweet.
+	 *
+	 * @param   string   $status                 The text of the tweet.
+	 * @param   integer  $in_reply_to_status_id  The ID of an existing status that the update is in reply to.
+	 * @param   float    $lat                    The latitude of the location this tweet refers to.
+	 * @param   float    $long                   The longitude of the location this tweet refers to.
+	 * @param   string   $place_id               A place in the world.
+	 * @param   boolean  $display_coordinates    Whether or not to put a pin on the exact coordinates a tweet has been sent from.
+	 * @param   boolean  $trim_user              When set to true, each tweet returned in a timeline will include a user object including only
+	 *                                           the status author's numerical ID.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function tweet($status, $in_reply_to_status_id = null, $lat = null, $long = null, $place_id = null, $display_coordinates = null,
+		$trim_user = null)
+	{
+		// Set the API base.
+		$path = '/statuses/update.json';
+
+		// Set POST data.
+		$data = array('status' => utf8_encode($status));
+
+		// Check if in_reply_to_status_id is specified.
+		if ($in_reply_to_status_id)
+		{
+			$data['in_reply_to_status_id'] = $in_reply_to_status_id;
+		}
+
+		// Check if lat is specified.
+		if ($lat)
+		{
+			$data['lat'] = $lat;
+		}
+
+		// Check if long is specified.
+		if ($long)
+		{
+			$data['long'] = $long;
+		}
+
+		// Check if place_id is specified.
+		if ($place_id)
+		{
+			$data['place_id'] = $place_id;
+		}
+
+		// Check if display_coordinates is specified.
+		if (!is_null($display_coordinates))
+		{
+			$data['display_coordinates'] = $display_coordinates;
+		}
+
+		// Check if trim_user is specified.
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to retrieve the most recent mentions for the authenticating user.
+	 *
+	 * @param   integer  $count        Specifies the number of tweets to try and retrieve, up to a maximum of 200.  Retweets are always included
+	 *                                 in the count, so it is always suggested to set $include_rts to true
+	 * @param   boolean  $include_rts  When set to true, the timeline will contain native retweets in addition to the standard stream of tweets.
+	 * @param   boolean  $entities     When set to true,  each tweet will include a node called "entities,". This node offers a variety of metadata
+	 *                                 about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   integer  $since_id     Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   integer  $max_id       Returns results with an ID less than (that is, older than) the specified ID.
+	 * @param   boolean  $trim_user    When set to true, each tweet returned in a timeline will include a user object including only
+	 *                                 the status author's numerical ID.
+	 * @param   string   $contributor  This parameter enhances the contributors element of the status response to include the screen_name
+	 *                                 of the contributor.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getMentions($count = 20, $include_rts = null, $entities = null, $since_id = 0, $max_id = 0,
+		$trim_user = null, $contributor = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('statuses', 'mentions_timeline');
+
+		// Set the API base
+		$path = '/statuses/mentions_timeline.json';
+
+		// Set the count string
+		$data['count'] = $count;
+
+		// Check if include_rts is specified
+		if (!is_null($include_rts))
+		{
+			$data['include_rts'] = $include_rts;
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if a since_id is specified
+		if ($since_id > 0)
+		{
+			$data['since_id'] = (int) $since_id;
+		}
+
+		// Check if a max_id is specified
+		if ($max_id > 0)
+		{
+			$data['max_id'] = (int) $max_id;
+		}
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Check if contributor is specified
+		if (!is_null($contributor))
+		{
+			$data['contributor_details'] = $contributor;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get the most recent tweets of the authenticated user that have been retweeted by others.
+	 *
+	 * @param   integer  $count          Specifies the number of tweets to try and retrieve, up to a maximum of 200.  Retweets are always included
+	 *                                   in the count, so it is always suggested to set $include_rts to true
+	 * @param   integer  $since_id       Returns results with an ID greater than (that is, more recent than) the specified ID.
+	 * @param   boolean  $entities       When set to true,  each tweet will include a node called "entities,". This node offers a variety of metadata
+	 *                                   about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 * @param   boolean  $user_entities  The user entities node will be disincluded when set to false.
+	 * @param   integer  $max_id         Returns results with an ID less than (that is, older than) the specified ID.
+	 * @param   boolean  $trim_user      When set to true, each tweet returned in a timeline will include a user object including only
+	 *                                   the status author's numerical ID.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getRetweetsOfMe($count = 20, $since_id = 0, $entities = null, $user_entities = null, $max_id = 0, $trim_user = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('statuses', 'retweets_of_me');
+
+		// Set the API path
+		$path = '/statuses/retweets_of_me.json';
+
+		// Set the count string
+		$data['count'] = $count;
+
+		// Check if a since_id is specified
+		if ($since_id > 0)
+		{
+			$data['since_id'] = (int) $since_id;
+		}
+
+		// Check if a max_id is specified
+		if ($max_id > 0)
+		{
+			$data['max_id'] = (int) $max_id;
+		}
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if entities is specified
+		if (!is_null($user_entities))
+		{
+			$data['include_user_entities'] = $user_entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to show user objects of up to 100 members who retweeted the status.
+	 *
+	 * @param   integer  $id             The numerical ID of the desired status.
+	 * @param   integer  $count          Specifies the number of retweets to try and retrieve, up to a maximum of 100.
+	 * @param   integer  $cursor         Causes the list of IDs to be broken into pages of no more than 100 IDs at a time.
+	 *                                   The number of IDs returned is not guaranteed to be 100 as suspended users are
+	 *                                   filtered out after connections are queried. If no cursor is provided, a value of
+	 *                                   -1 will be assumed, which is the first "page."
+	 * @param   boolean  $stringify_ids  Set to true to return IDs as strings, false to return as integers.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getRetweeters($id, $count = 20, $cursor = null, $stringify_ids = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('statuses', 'retweeters/ids');
+
+		// Set the API path
+		$path = '/statuses/retweeters/ids.json';
+
+		// Set the status id.
+		$data['id'] = $id;
+
+		// Set the count string
+		$data['count'] = $count;
+
+		// Check if cursor is specified
+		if (!is_null($cursor))
+		{
+			$data['cursor'] = $cursor;
+		}
+
+		// Check if entities is specified
+		if (!is_null($stringify_ids))
+		{
+			$data['stringify_ids'] = $stringify_ids;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get up to 100 of the first retweets of a given tweet.
+	 *
+	 * @param   integer  $id         The numerical ID of the desired status.
+	 * @param   integer  $count      Specifies the number of tweets to try and retrieve, up to a maximum of 200.  Retweets are always included
+	 *                               in the count, so it is always suggested to set $include_rts to true
+	 * @param   boolean  $trim_user  When set to true, each tweet returned in a timeline will include a user object including only
+	 *                               the status author's numerical ID.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getRetweetsById($id, $count = 20, $trim_user = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('statuses', 'retweets/:id');
+
+		// Set the API path
+		$path = '/statuses/retweets/' . $id . '.json';
+
+		// Set the count string
+		$data['count'] = $count;
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to delete the status specified by the required ID parameter.
+	 *
+	 * @param   integer  $id         The numerical ID of the desired status.
+	 * @param   boolean  $trim_user  When set to true, each tweet returned in a timeline will include a user object including only
+	 *                               the status author's numerical ID.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function deleteTweet($id, $trim_user = null)
+	{
+		// Set the API path
+		$path = '/statuses/destroy/' . $id . '.json';
+
+		$data = array();
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to retweet a tweet.
+	 *
+	 * @param   integer  $id         The numerical ID of the desired status.
+	 * @param   boolean  $trim_user  When set to true, each tweet returned in a timeline will include a user object including only
+	 *                               the status author's numerical ID.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function retweet($id, $trim_user = null)
+	{
+		// Set the API path
+		$path = '/statuses/retweet/' . $id . '.json';
+
+		$data = array();
+
+		// Check if trim_user is specified
+		if (!is_null($trim_user))
+		{
+			$data['trim_user'] = $trim_user;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to post a tweet with media.
+	 *
+	 * @param   string   $status                 The text of the tweet.
+	 * @param   string   $media                  File to upload
+	 * @param   integer  $in_reply_to_status_id  The ID of an existing status that the update is in reply to.
+	 * @param   float    $lat                    The latitude of the location this tweet refers to.
+	 * @param   float    $long                   The longitude of the location this tweet refers to.
+	 * @param   string   $place_id               A place in the world.
+	 * @param   boolean  $display_coordinates    Whether or not to put a pin on the exact coordinates a tweet has been sent from.
+	 * @param   boolean  $sensitive              Set to true for content which may not be suitable for every audience.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function tweetWithMedia($status, $media, $in_reply_to_status_id = null, $lat = null, $long = null, $place_id = null,
+		$display_coordinates = null, $sensitive = null)
+	{
+		// Set the API request path.
+		$path = '/statuses/update_with_media.json';
+
+		// Set POST data.
+		$data = array(
+			'status' => utf8_encode($status),
+			'media[]' => "@{$media}",
+		);
+
+		$header = array('Content-Type' => 'multipart/form-data');
+
+		// Check if in_reply_to_status_id is specified.
+		if (!is_null($in_reply_to_status_id))
+		{
+			$data['in_reply_to_status_id'] = $in_reply_to_status_id;
+		}
+
+		// Check if lat is specified.
+		if ($lat)
+		{
+			$data['lat'] = $lat;
+		}
+
+		// Check if long is specified.
+		if ($long)
+		{
+			$data['long'] = $long;
+		}
+
+		// Check if place_id is specified.
+		if ($place_id)
+		{
+			$data['place_id'] = $place_id;
+		}
+
+		// Check if display_coordinates is specified.
+		if (!is_null($display_coordinates))
+		{
+			$data['display_coordinates'] = $display_coordinates;
+		}
+
+		// Check if sensitive is specified.
+		if (!is_null($sensitive))
+		{
+			$data['possibly_sensitive'] = $sensitive;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data, $header);
+	}
+
+	/**
+	 * Method to get information allowing the creation of an embedded representation of a Tweet on third party sites.
+	 * Note: either the id or url parameters must be specified in a request. It is not necessary to include both.
+	 *
+	 * @param   integer  $id           The Tweet/status ID to return embed code for.
+	 * @param   string   $url          The URL of the Tweet/status to be embedded.
+	 * @param   integer  $maxwidth     The maximum width in pixels that the embed should be rendered at. This value is constrained to be
+	 *                                 between 250 and 550 pixels.
+	 * @param   boolean  $hide_media   Specifies whether the embedded Tweet should automatically expand images which were uploaded via
+	 *                                 POST statuses/update_with_media.
+	 * @param   boolean  $hide_thread  Specifies whether the embedded Tweet should automatically show the original message in the case that
+	 *                                 the embedded Tweet is a reply.
+	 * @param   boolean  $omit_script  Specifies whether the embedded Tweet HTML should include a `<script>` element pointing to widgets.js.
+	 *                                 In cases where a page already includes widgets.js, setting this value to true will prevent a redundant
+	 *                                 script element from being included.
+	 * @param   string   $align        Specifies whether the embedded Tweet should be left aligned, right aligned, or centered in the page.
+	 *                                 Valid values are left, right, center, and none.
+	 * @param   string   $related      A value for the TWT related parameter, as described in Web Intents. This value will be forwarded to all
+	 *                                 Web Intents calls.
+	 * @param   string   $lang         Language code for the rendered embed. This will affect the text and localization of the rendered HTML.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getOembed($id = null, $url = null, $maxwidth = null, $hide_media = null, $hide_thread = null, $omit_script = null,
+		$align = null, $related = null, $lang = null)
+	{
+		// Check the rate limit for remaining hits.
+		$this->checkRateLimit('statuses', 'oembed');
+
+		// Set the API request path.
+		$path = '/statuses/oembed.json';
+
+		// Determine which of $id and $url is specified.
+		if ($id)
+		{
+			$data['id'] = $id;
+		}
+		elseif ($url)
+		{
+			$data['url'] = rawurlencode($url);
+		}
+		else
+		{
+			// We don't have a valid entry.
+			throw new RuntimeException('Either the id or url parameters must be specified in a request.');
+		}
+
+		// Check if maxwidth is specified.
+		if ($maxwidth)
+		{
+			$data['maxwidth'] = $maxwidth;
+		}
+
+		// Check if hide_media is specified.
+		if (!is_null($hide_media))
+		{
+			$data['hide_media'] = $hide_media;
+		}
+
+		// Check if hide_thread is specified.
+		if (!is_null($hide_thread))
+		{
+			$data['hide_thread'] = $hide_thread;
+		}
+
+		// Check if omit_script is specified.
+		if (!is_null($omit_script))
+		{
+			$data['omit_script'] = $omit_script;
+		}
+
+		// Check if align is specified.
+		if ($align)
+		{
+			$data['align'] = $align;
+		}
+
+		// Check if related is specified.
+		if ($related)
+		{
+			$data['related'] = $related;
+		}
+
+		// Check if lang is specified.
+		if ($lang)
+		{
+			$data['lang'] = $lang;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/trends.php b/core/libraries/joomla/twitter/trends.php
new file mode 100644
index 00000000..7f1e438a
--- /dev/null
+++ b/core/libraries/joomla/twitter/trends.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Trends class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterTrends extends JTwitterObject
+{
+	/**
+	 * Method to get the top 10 trending topics for a specific WOEID, if trending information is available for it.
+	 *
+	 * @param   integer  $id       The Yahoo! Where On Earth ID of the location to return trending information for.
+	 * 							   Global information is available by using 1 as the WOEID.
+	 * @param   string   $exclude  Setting this equal to hashtags will remove all hashtags from the trends list.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getTrends($id, $exclude = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('trends', 'place');
+
+		// Set the API path
+		$path = '/trends/place.json';
+
+		$data['id'] = $id;
+
+		// Check if exclude is specified
+		if ($exclude)
+		{
+			$data['exclude'] = $exclude;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get the locations that Twitter has trending topic information for.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getLocations()
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('trends', 'available');
+
+		// Set the API path
+		$path = '/trends/available.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+
+	/**
+	 * Method to get the locations that Twitter has trending topic information for, closest to a specified location.
+	 *
+	 * @param   float  $lat   The latitude to search around.
+	 * @param   float  $long  The longitude to search around.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getClosest($lat = null, $long = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('trends', 'closest');
+
+		// Set the API path
+		$path = '/trends/closest.json';
+
+		$data = array();
+
+		// Check if lat is specified
+		if ($lat)
+		{
+			$data['lat'] = $lat;
+		}
+
+		// Check if long is specified
+		if ($long)
+		{
+			$data['long'] = $long;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+}
diff --git a/core/libraries/joomla/twitter/twitter.php b/core/libraries/joomla/twitter/twitter.php
new file mode 100644
index 00000000..27a173f6
--- /dev/null
+++ b/core/libraries/joomla/twitter/twitter.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform class for interacting with a Twitter API instance.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitter
+{
+	/**
+	 * @var    Registry  Options for the JTwitter object.
+	 * @since  12.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    JHttp  The HTTP client object to use in sending HTTP requests.
+	 * @since  12.3
+	 */
+	protected $client;
+
+	/**
+	 * @var    JTwitterOAuth The OAuth client.
+	 * @since  12.3
+	 */
+	protected $oauth;
+
+	/**
+	 * @var    JTwitterFriends  Twitter API object for friends.
+	 * @since  12.3
+	 */
+	protected $friends;
+
+	/**
+	 * @var    JTwitterUsers  Twitter API object for users.
+	 * @since  12.3
+	 */
+	protected $users;
+
+	/**
+	 * @var    JTwitterHelp  Twitter API object for help.
+	 * @since  12.3
+	 */
+	protected $help;
+
+	/**
+	 * @var    JTwitterStatuses  Twitter API object for statuses.
+	 * @since  12.3
+	 */
+	protected $statuses;
+
+	/**
+	 * @var    JTwitterSearch  Twitter API object for search.
+	 * @since  12.3
+	 */
+	protected $search;
+
+	/**
+	 * @var    JTwitterFavorites  Twitter API object for favorites.
+	 * @since  12.3
+	 */
+	protected $favorites;
+
+	/**
+	 * @var    JTwitterDirectMessages  Twitter API object for direct messages.
+	 * @since  12.3
+	 */
+	protected $directMessages;
+
+	/**
+	 * @var    JTwitterLists  Twitter API object for lists.
+	 * @since  12.3
+	 */
+	protected $lists;
+
+	/**
+	 * @var    JTwitterPlaces  Twitter API object for places & geo.
+	 * @since  12.3
+	 */
+	protected $places;
+
+	/**
+	 * @var    JTwitterTrends  Twitter API object for trends.
+	 * @since  12.3
+	 */
+	protected $trends;
+
+	/**
+	 * @var    JTwitterBlock  Twitter API object for block.
+	 * @since  12.3
+	 */
+	protected $block;
+
+	/**
+	 * @var    JTwitterProfile  Twitter API object for profile.
+	 * @since  12.3
+	 */
+	protected $profile;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   JTwitterOauth  $oauth    The oauth client.
+	 * @param   Registry       $options  Twitter options object.
+	 * @param   JHttp          $client   The HTTP client object.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(JTwitterOAuth $oauth = null, Registry $options = null, JHttp $client = null)
+	{
+		$this->oauth = $oauth;
+		$this->options = isset($options) ? $options : new Registry;
+		$this->client  = isset($client) ? $client : new JHttp($this->options);
+
+		// Setup the default API url if not already set.
+		$this->options->def('api.url', 'https://api.twitter.com/1.1');
+	}
+
+	/**
+	 * Magic method to lazily create API objects
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  JTwitterObject  Twitter API object (statuses, users, favorites, etc.).
+	 *
+	 * @since   12.3
+	 * @throws  InvalidArgumentException
+	 */
+	public function __get($name)
+	{
+		$class = 'JTwitter' . ucfirst($name);
+
+		if (class_exists($class))
+		{
+			if (false == isset($this->$name))
+			{
+				$this->$name = new $class($this->options, $this->client, $this->oauth);
+			}
+
+			return $this->$name;
+		}
+
+		throw new InvalidArgumentException(sprintf('Argument %s produced an invalid class name: %s', $name, $class));
+	}
+
+	/**
+	 * Get an option from the JTwitter instance.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   12.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the JTwitter instance.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  JTwitter  This object for method chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/joomla/twitter/users.php b/core/libraries/joomla/twitter/users.php
new file mode 100644
index 00000000..2dde8ac7
--- /dev/null
+++ b/core/libraries/joomla/twitter/users.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Twitter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die();
+
+/**
+ * Twitter API Users class for the Joomla Platform.
+ *
+ * @since       12.3
+ * @deprecated  4.0  Use the `joomla/twitter` package via Composer instead
+ */
+class JTwitterUsers extends JTwitterObject
+{
+	/**
+	 * Method to get up to 100 users worth of extended information, specified by either ID, screen name, or combination of the two.
+	 *
+	 * @param   string   $screen_name  A comma separated list of screen names, up to 100 are allowed in a single request.
+	 * @param   string   $id           A comma separated list of user IDs, up to 100 are allowed in a single request.
+	 * @param   boolean  $entities     When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a variety of
+	 * 								   metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getUsersLookup($screen_name = null, $id = null, $entities = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'lookup');
+
+		// Set user IDs and screen names.
+		if ($id)
+		{
+			$data['user_id'] = $id;
+		}
+
+		if ($screen_name)
+		{
+			$data['screen_name'] = $screen_name;
+		}
+
+		if ($id == null && $screen_name == null)
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('You must specify either a comma separated list of screen names, user IDs, or a combination of the two');
+		}
+
+		// Set the API path
+		$path = '/users/lookup.json';
+
+		// Check if string_ids is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'POST', $data);
+	}
+
+	/**
+	 * Method to access the profile banner in various sizes for the user with the indicated screen_name.
+	 *
+	 * @param   mixed  $user  Either an integer containing the user ID or a string containing the screen name.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getUserProfileBanner($user)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'profile_banner');
+
+		// Set the API path
+		$path = '/users/profile_banner.json';
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method used to search for users
+	 *
+	 * @param   string   $query     The search query to run against people search.
+	 * @param   integer  $page      Specifies the page of results to retrieve.
+	 * @param   integer  $count     The number of people to retrieve. Maximum of 20 allowed per page.
+	 * @param   boolean  $entities  When set to either true, t or 1, each tweet will include a node called "entities,". This node offers a
+	 * 								variety of metadata about the tweet in a discreet structure, including: user_mentions, urls, and hashtags.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function searchUsers($query, $page = 0, $count = 0, $entities = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'search');
+
+		$data['q'] = rawurlencode($query);
+
+		// Check if page is specified.
+		if ($page > 0)
+		{
+			$data['page'] = $page;
+		}
+
+		// Check if per_page is specified
+		if ($count > 0)
+		{
+			$data['count'] = $count;
+		}
+
+		// Check if entities is specified.
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Set the API path
+		$path = '/users/search.json';
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 *
+	 * @param   mixed    $user      Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $entities  Set to true to return IDs as strings, false to return as integers.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getUser($user, $entities = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'show/:id');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/users/show.json';
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get an array of users that the specified user can contribute to.
+	 *
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $entities     Set to true to return IDs as strings, false to return as integers.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getContributees($user, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'contributees');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/users/contributees.json';
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to get an array of users who can contribute to the specified account.
+	 *
+	 * @param   mixed    $user         Either an integer containing the user ID or a string containing the screen name.
+	 * @param   boolean  $entities     Set to true to return IDs as strings, false to return as integers.
+	 * @param   boolean  $skip_status  When set to either true, t or 1 statuses will not be included in the returned user objects.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 * @throws  RuntimeException
+	 */
+	public function getContributors($user, $entities = null, $skip_status = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'contributors');
+
+		// Determine which type of data was passed for $user
+		if (is_numeric($user))
+		{
+			$data['user_id'] = $user;
+		}
+		elseif (is_string($user))
+		{
+			$data['screen_name'] = $user;
+		}
+		else
+		{
+			// We don't have a valid entry
+			throw new RuntimeException('The specified username is not in the correct format; must use integer or string');
+		}
+
+		// Set the API path
+		$path = '/users/contributors.json';
+
+		// Check if entities is specified
+		if (!is_null($entities))
+		{
+			$data['include_entities'] = $entities;
+		}
+
+		// Check if skip_status is specified
+		if (!is_null($skip_status))
+		{
+			$data['skip_status'] = $skip_status;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method access to Twitter's suggested user list.
+	 *
+	 * @param   boolean  $lang  Restricts the suggested categories to the requested language.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSuggestions($lang = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'suggestions');
+
+		// Set the API path
+		$path = '/users/suggestions.json';
+
+		$data = array();
+
+		// Check if entities is true
+		if ($lang)
+		{
+			$data['lang'] = $lang;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * method to access the users in a given category of the Twitter suggested user list.
+	 *
+	 * @param   string   $slug  The short name of list or a category.
+	 * @param   boolean  $lang  Restricts the suggested categories to the requested language.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSuggestionsSlug($slug, $lang = null)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'suggestions/:slug');
+
+		// Set the API path
+		$path = '/users/suggestions/' . $slug . '.json';
+
+		$data = array();
+
+		// Check if entities is true
+		if ($lang)
+		{
+			$data['lang'] = $lang;
+		}
+
+		// Send the request.
+		return $this->sendRequest($path, 'GET', $data);
+	}
+
+	/**
+	 * Method to access the users in a given category of the Twitter suggested user list and return
+	 * their most recent status if they are not a protected user.
+	 *
+	 * @param   string  $slug  The short name of list or a category.
+	 *
+	 * @return  array  The decoded JSON response
+	 *
+	 * @since   12.3
+	 */
+	public function getSuggestionsSlugMembers($slug)
+	{
+		// Check the rate limit for remaining hits
+		$this->checkRateLimit('users', 'suggestions/:slug/members');
+
+		// Set the API path
+		$path = '/users/suggestions/' . $slug . '/members.json';
+
+		// Send the request.
+		return $this->sendRequest($path);
+	}
+}
diff --git a/core/libraries/joomla/utilities/arrayhelper.php b/core/libraries/joomla/utilities/arrayhelper.php
new file mode 100644
index 00000000..a9b41f04
--- /dev/null
+++ b/core/libraries/joomla/utilities/arrayhelper.php
@@ -0,0 +1,435 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Utilities
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * JArrayHelper is an array utility class for doing all sorts of odds and ends with arrays.
+ *
+ * @since       11.1
+ * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper instead
+ */
+abstract class JArrayHelper
+{
+	/**
+	 * Option to perform case-sensitive sorts.
+	 *
+	 * @var    mixed  Boolean or array of booleans.
+	 * @since  11.3
+	 */
+	protected static $sortCase;
+
+	/**
+	 * Option to set the sort direction.
+	 *
+	 * @var    mixed  Integer or array of integers.
+	 * @since  11.3
+	 */
+	protected static $sortDirection;
+
+	/**
+	 * Option to set the object key to sort on.
+	 *
+	 * @var    string
+	 * @since  11.3
+	 */
+	protected static $sortKey;
+
+	/**
+	 * Option to perform a language aware sort.
+	 *
+	 * @var    mixed  Boolean or array of booleans.
+	 * @since  11.3
+	 */
+	protected static $sortLocale;
+
+	/**
+	 * Function to convert array to integer values
+	 *
+	 * @param   array  &$array   The source array to convert
+	 * @param   mixed  $default  A default value (int|array) to assign if $array is not an array
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::toInteger instead
+	 */
+	public static function toInteger(&$array, $default = null)
+	{
+		$array = ArrayHelper::toInteger($array, $default);
+	}
+
+	/**
+	 * Utility function to map an array to a stdClass object.
+	 *
+	 * @param   array    &$array     The array to map.
+	 * @param   string   $class      Name of the class to create
+	 * @param   boolean  $recursive  Convert also any array inside the main array
+	 *
+	 * @return  object   The object mapped from the given array
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::toObject instead
+	 */
+	public static function toObject(&$array, $class = 'stdClass', $recursive = true)
+	{
+		$obj = null;
+
+		if (is_array($array))
+		{
+			$obj = ArrayHelper::toObject($array, $class, $recursive);
+		}
+		else
+		{
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::toObject.', JLog::WARNING, 'deprecated');
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * Utility function to map an array to a string.
+	 *
+	 * @param   array    $array         The array to map.
+	 * @param   string   $inner_glue    The glue (optional, defaults to '=') between the key and the value.
+	 * @param   string   $outer_glue    The glue (optional, defaults to ' ') between array elements.
+	 * @param   boolean  $keepOuterKey  True if final key should be kept.
+	 *
+	 * @return  string   The string mapped from the given array
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::toString instead
+	 */
+	public static function toString($array = null, $inner_glue = '=', $outer_glue = ' ', $keepOuterKey = false)
+	{
+		$output = array();
+
+		if (is_array($array))
+		{
+			$output[] = ArrayHelper::toString($array, $inner_glue, $outer_glue, $keepOuterKey);
+		}
+		else
+		{
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::toString.', JLog::WARNING, 'deprecated');
+		}
+
+		return implode($outer_glue, $output);
+	}
+
+	/**
+	 * Utility function to map an object to an array
+	 *
+	 * @param   object   $p_obj    The source object
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array    The array mapped from the given object
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::fromObject instead
+	 */
+	public static function fromObject($p_obj, $recurse = true, $regex = null)
+	{
+		if (is_object($p_obj))
+		{
+			return self::_fromObject($p_obj, $recurse, $regex);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Utility function to map an object or array to an array
+	 *
+	 * @param   mixed    $item     The source object or array
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array  The array mapped from the given object
+	 *
+	 * @since   11.1
+	 */
+	protected static function _fromObject($item, $recurse, $regex)
+	{
+		if (is_object($item))
+		{
+			$result = array();
+
+			foreach (get_object_vars($item) as $k => $v)
+			{
+				if (!$regex || preg_match($regex, $k))
+				{
+					if ($recurse)
+					{
+						$result[$k] = self::_fromObject($v, $recurse, $regex);
+					}
+					else
+					{
+						$result[$k] = $v;
+					}
+				}
+			}
+		}
+		elseif (is_array($item))
+		{
+			$result = array();
+
+			foreach ($item as $k => $v)
+			{
+				$result[$k] = self::_fromObject($v, $recurse, $regex);
+			}
+		}
+		else
+		{
+			$result = $item;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Extracts a column from an array of arrays or objects
+	 *
+	 * @param   array   &$array  The source array
+	 * @param   string  $index   The index of the column or name of object property
+	 *
+	 * @return  array  Column of values from the source array
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::getColumn instead
+	 */
+	public static function getColumn(&$array, $index)
+	{
+		$result = array();
+
+		if (is_array($array))
+		{
+			$result = ArrayHelper::getColumn($array, $index);
+		}
+		else
+		{
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::getColumn.', JLog::WARNING, 'deprecated');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Utility function to return a value from a named array or a specified default
+	 *
+	 * @param   array   &$array   A named array
+	 * @param   string  $name     The key to search for
+	 * @param   mixed   $default  The default value to give if no key found
+	 * @param   string  $type     Return type for the variable (INT, FLOAT, STRING, WORD, BOOLEAN, ARRAY)
+	 *
+	 * @return  mixed  The value from the source array
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::getValue instead
+	 */
+	public static function getValue(&$array, $name, $default = null, $type = '')
+	{
+		// Previously we didn't typehint an array. So force any object to be an array
+		return ArrayHelper::getValue((array) $array, $name, $default, $type);
+	}
+
+	/**
+	 * Takes an associative array of arrays and inverts the array keys to values using the array values as keys.
+	 *
+	 * Example:
+	 * $input = array(
+	 *     'New' => array('1000', '1500', '1750'),
+	 *     'Used' => array('3000', '4000', '5000', '6000')
+	 * );
+	 * $output = JArrayHelper::invert($input);
+	 *
+	 * Output would be equal to:
+	 * $output = array(
+	 *     '1000' => 'New',
+	 *     '1500' => 'New',
+	 *     '1750' => 'New',
+	 *     '3000' => 'Used',
+	 *     '4000' => 'Used',
+	 *     '5000' => 'Used',
+	 *     '6000' => 'Used'
+	 * );
+	 *
+	 * @param   array  $array  The source array.
+	 *
+	 * @return  array  The inverted array.
+	 *
+	 * @since   12.3
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::invert instead
+	 */
+	public static function invert($array)
+	{
+		return ArrayHelper::invert($array);
+	}
+
+	/**
+	 * Method to determine if an array is an associative array.
+	 *
+	 * @param   array  $array  An array to test.
+	 *
+	 * @return  boolean  True if the array is an associative array.
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::isAssociative instead
+	 */
+	public static function isAssociative($array)
+	{
+		return ArrayHelper::isAssociative($array);
+	}
+
+	/**
+	 * Pivots an array to create a reverse lookup of an array of scalars, arrays or objects.
+	 *
+	 * @param   array   $source  The source array.
+	 * @param   string  $key     Where the elements of the source array are objects or arrays, the key to pivot on.
+	 *
+	 * @return  array  An array of arrays pivoted either on the value of the keys, or an individual key of an object or array.
+	 *
+	 * @since   11.3
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::pivot instead
+	 */
+	public static function pivot($source, $key = null)
+	{
+		$result = array();
+
+		if (is_array($source))
+		{
+			$result = ArrayHelper::pivot($source, $key);
+		}
+		else
+		{
+			JLog::add('This method is typehinted to be an array in \Joomla\Utilities\ArrayHelper::pivot.', JLog::WARNING, 'deprecated');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Utility function to sort an array of objects on a given field
+	 *
+	 * @param   array  &$a             An array of objects
+	 * @param   mixed  $k              The key (string) or an array of keys to sort on
+	 * @param   mixed  $direction      Direction (integer) or an array of direction to sort in [1 = Ascending] [-1 = Descending]
+	 * @param   mixed  $caseSensitive  Boolean or array of booleans to let sort occur case sensitive or insensitive
+	 * @param   mixed  $locale         Boolean or array of booleans to let sort occur using the locale language or not
+	 *
+	 * @return  array  The sorted array of objects
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::sortObjects instead
+	 */
+	public static function sortObjects(&$a, $k, $direction = 1, $caseSensitive = true, $locale = false)
+	{
+		if (!is_array($locale) || !is_array($locale[0]))
+		{
+			$locale = array($locale);
+		}
+
+		self::$sortCase = (array) $caseSensitive;
+		self::$sortDirection = (array) $direction;
+		self::$sortKey = (array) $k;
+		self::$sortLocale = $locale;
+
+		usort($a, array(__CLASS__, '_sortObjects'));
+
+		self::$sortCase = null;
+		self::$sortDirection = null;
+		self::$sortKey = null;
+		self::$sortLocale = null;
+
+		return $a;
+	}
+
+	/**
+	 * Callback function for sorting an array of objects on a key
+	 *
+	 * @param   array  &$a  An array of objects
+	 * @param   array  &$b  An array of objects
+	 *
+	 * @return  integer  Comparison status
+	 *
+	 * @see     JArrayHelper::sortObjects()
+	 * @since   11.1
+	 */
+	protected static function _sortObjects(&$a, &$b)
+	{
+		$key = self::$sortKey;
+
+		for ($i = 0, $count = count($key); $i < $count; $i++)
+		{
+			if (isset(self::$sortDirection[$i]))
+			{
+				$direction = self::$sortDirection[$i];
+			}
+
+			if (isset(self::$sortCase[$i]))
+			{
+				$caseSensitive = self::$sortCase[$i];
+			}
+
+			if (isset(self::$sortLocale[$i]))
+			{
+				$locale = self::$sortLocale[$i];
+			}
+
+			$va = $a->{$key[$i]};
+			$vb = $b->{$key[$i]};
+
+			if ((is_bool($va) || is_numeric($va)) && (is_bool($vb) || is_numeric($vb)))
+			{
+				$cmp = $va - $vb;
+			}
+			elseif ($caseSensitive)
+			{
+				$cmp = StringHelper::strcmp($va, $vb, $locale);
+			}
+			else
+			{
+				$cmp = StringHelper::strcasecmp($va, $vb, $locale);
+			}
+
+			if ($cmp > 0)
+			{
+				return $direction;
+			}
+
+			if ($cmp < 0)
+			{
+				return -$direction;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Multidimensional array safe unique test
+	 *
+	 * @param   array  $myArray  The array to make unique.
+	 *
+	 * @return  array
+	 *
+	 * @link    https://secure.php.net/manual/en/function.array-unique.php
+	 * @since   11.2
+	 * @deprecated  4.0 Use Joomla\Utilities\ArrayHelper::arrayUnique instead
+	 */
+	public static function arrayUnique($myArray)
+	{
+		return is_array($myArray) ? ArrayHelper::arrayUnique($myArray) : $myArray;
+	}
+}
diff --git a/core/libraries/joomla/view/base.php b/core/libraries/joomla/view/base.php
new file mode 100644
index 00000000..ec9e5106
--- /dev/null
+++ b/core/libraries/joomla/view/base.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  View
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Base View Class
+ *
+ * @since  12.1
+ */
+abstract class JViewBase implements JView
+{
+	/**
+	 * The model object.
+	 *
+	 * @var    JModel
+	 * @since  12.1
+	 */
+	protected $model;
+
+	/**
+	 * Method to instantiate the view.
+	 *
+	 * @param   JModel  $model  The model object.
+	 *
+	 * @since  12.1
+	 */
+	public function __construct(JModel $model)
+	{
+		// Setup dependencies.
+		$this->model = $model;
+	}
+
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @see     JView::escape()
+	 * @since   12.1
+	 */
+	public function escape($output)
+	{
+		return $output;
+	}
+}
diff --git a/core/libraries/joomla/view/html.php b/core/libraries/joomla/view/html.php
new file mode 100644
index 00000000..e4165add
--- /dev/null
+++ b/core/libraries/joomla/view/html.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  View
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.path');
+
+/**
+ * Joomla Platform HTML View Class
+ *
+ * @since  12.1
+ */
+abstract class JViewHtml extends JViewBase
+{
+	/**
+	 * The view layout.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $layout = 'default';
+
+	/**
+	 * The paths queue.
+	 *
+	 * @var    SplPriorityQueue
+	 * @since  12.1
+	 */
+	protected $paths;
+
+	/**
+	 * Method to instantiate the view.
+	 *
+	 * @param   JModel            $model  The model object.
+	 * @param   SplPriorityQueue  $paths  The paths queue.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(JModel $model, SplPriorityQueue $paths = null)
+	{
+		parent::__construct($model);
+
+		// Setup dependencies.
+		$this->paths = isset($paths) ? $paths : $this->loadPaths();
+	}
+
+	/**
+	 * Magic toString method that is a proxy for the render method.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	public function __toString()
+	{
+		return $this->render();
+	}
+
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @see     JView::escape()
+	 * @since   12.1
+	 */
+	public function escape($output)
+	{
+		// Escape the output.
+		return htmlspecialchars($output, ENT_COMPAT, 'UTF-8');
+	}
+
+	/**
+	 * Method to get the view layout.
+	 *
+	 * @return  string  The layout name.
+	 *
+	 * @since   12.1
+	 */
+	public function getLayout()
+	{
+		return $this->layout;
+	}
+
+	/**
+	 * Method to get the layout path.
+	 *
+	 * @param   string  $layout  The layout name.
+	 *
+	 * @return  mixed  The layout file name if found, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public function getPath($layout)
+	{
+		// Get the layout file name.
+		$file = JPath::clean($layout . '.php');
+
+		// Find the layout file path.
+		$path = JPath::find(clone $this->paths, $file);
+
+		return $path;
+	}
+
+	/**
+	 * Method to get the view paths.
+	 *
+	 * @return  SplPriorityQueue  The paths queue.
+	 *
+	 * @since   12.1
+	 */
+	public function getPaths()
+	{
+		return $this->paths;
+	}
+
+	/**
+	 * Method to render the view.
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function render()
+	{
+		// Get the layout path.
+		$path = $this->getPath($this->getLayout());
+
+		// Check if the layout path was found.
+		if (!$path)
+		{
+			throw new RuntimeException('Layout Path Not Found');
+		}
+
+		// Start an output buffer.
+		ob_start();
+
+		// Load the layout.
+		include $path;
+
+		// Get the layout contents.
+		$output = ob_get_clean();
+
+		return $output;
+	}
+
+	/**
+	 * Method to set the view layout.
+	 *
+	 * @param   string  $layout  The layout name.
+	 *
+	 * @return  JViewHtml  Method supports chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setLayout($layout)
+	{
+		$this->layout = $layout;
+
+		return $this;
+	}
+
+	/**
+	 * Method to set the view paths.
+	 *
+	 * @param   SplPriorityQueue  $paths  The paths queue.
+	 *
+	 * @return  JViewHtml  Method supports chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function setPaths(SplPriorityQueue $paths)
+	{
+		$this->paths = $paths;
+
+		return $this;
+	}
+
+	/**
+	 * Method to load the paths queue.
+	 *
+	 * @return  SplPriorityQueue  The paths queue.
+	 *
+	 * @since   12.1
+	 */
+	protected function loadPaths()
+	{
+		return new SplPriorityQueue;
+	}
+}
diff --git a/core/libraries/joomla/view/view.php b/core/libraries/joomla/view/view.php
new file mode 100644
index 00000000..c5fff626
--- /dev/null
+++ b/core/libraries/joomla/view/view.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  View
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform View Interface
+ *
+ * @since  12.1
+ */
+interface JView
+{
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @since   12.1
+	 */
+	public function escape($output);
+
+	/**
+	 * Method to render the view.
+	 *
+	 * @return  string  The rendered view.
+	 *
+	 * @since   12.1
+	 * @throws  RuntimeException
+	 */
+	public function render();
+}
diff --git a/core/libraries/legacy/application/application.php b/core/libraries/legacy/application/application.php
new file mode 100644
index 00000000..2b25277e
--- /dev/null
+++ b/core/libraries/legacy/application/application.php
@@ -0,0 +1,1202 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Application
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\BaseApplication;
+use Joomla\Registry\Registry;
+
+JLog::add('JApplication is deprecated.', JLog::WARNING, 'deprecated');
+
+/**
+ * Base class for a Joomla! application.
+ *
+ * Acts as a Factory class for application specific objects and provides many
+ * supporting API functions. Derived clases should supply the route(), dispatch()
+ * and render() functions.
+ *
+ * @since       1.5
+ * @deprecated  3.2  Use CMSApplication instead unless specified otherwise
+ */
+class JApplication extends BaseApplication
+{
+	/**
+	 * The client identifier.
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 * @deprecated  3.2
+	 */
+	protected $_clientId = null;
+
+	/**
+	 * The application message queue.
+	 *
+	 * @var    array
+	 * @since  1.5
+	 * @deprecated  3.2
+	 */
+	protected $_messageQueue = array();
+
+	/**
+	 * The name of the application.
+	 *
+	 * @var    array
+	 * @since  1.5
+	 * @deprecated  3.2
+	 */
+	protected $_name = null;
+
+	/**
+	 * The scope of the application.
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  3.2
+	 */
+	public $scope = null;
+
+	/**
+	 * The time the request was made.
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  3.2
+	 */
+	public $requestTime = null;
+
+	/**
+	 * The time the request was made as Unix timestamp.
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 * @deprecated  3.2
+	 */
+	public $startTime = null;
+
+	/**
+	 * The application client object.
+	 *
+	 * @var    JApplicationWebClient
+	 * @since  3.0
+	 * @deprecated  3.2
+	 */
+	public $client;
+
+	/**
+	 * JApplication instances container.
+	 *
+	 * @var    JApplication[]
+	 * @since  2.5
+	 * @deprecated  3.2
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A configuration array including optional elements such as session
+	 * session_name, clientId and others. This is not exhaustive.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function __construct($config = array())
+	{
+		// Set the view name.
+		$this->_name = $this->getName();
+
+		// Only set the clientId if available.
+		if (isset($config['clientId']))
+		{
+			$this->_clientId = $config['clientId'];
+		}
+
+		// Enable sessions by default.
+		if (!isset($config['session']))
+		{
+			$config['session'] = true;
+		}
+
+		// Create the input object
+		$this->input = new JInput;
+
+		$this->client = new JApplicationWebClient;
+
+		$this->loadDispatcher();
+
+		// Set the session default name.
+		if (!isset($config['session_name']))
+		{
+			$config['session_name'] = $this->_name;
+		}
+
+		// Set the default configuration file.
+		if (!isset($config['config_file']))
+		{
+			$config['config_file'] = 'configuration.php';
+		}
+
+		// Create the configuration object.
+		if (file_exists(JPATH_CONFIGURATION . '/' . $config['config_file']))
+		{
+			$this->_createConfiguration(JPATH_CONFIGURATION . '/' . $config['config_file']);
+		}
+
+		// Create the session if a session name is passed.
+		if ($config['session'] !== false)
+		{
+			$this->_createSession(JApplicationHelper::getHash($config['session_name']));
+		}
+
+		$this->requestTime = gmdate('Y-m-d H:i');
+
+		// Used by task system to ensure that the system doesn't go over time.
+		$this->startTime = JProfiler::getmicrotime();
+	}
+
+	/**
+	 * Returns the global JApplicationCms object, only creating it if it
+	 * doesn't already exist.
+	 *
+	 * @param   mixed   $client  A client identifier or name.
+	 * @param   array   $config  An optional associative array of configuration settings.
+	 * @param   string  $prefix  A prefix for class names
+	 *
+	 * @return  JApplicationCms  A JApplicationCms object.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationCms::getInstance() instead
+	 * @note    As of 3.2, this proxies to JApplicationCms::getInstance()
+	 */
+	public static function getInstance($client, $config = array(), $prefix = 'J')
+	{
+		return JApplicationCms::getInstance($client);
+	}
+
+	/**
+	 * Initialise the application.
+	 *
+	 * @param   array  $options  An optional associative array of configuration settings.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function initialise($options = array())
+	{
+		// Set the language in the class.
+		$config = JFactory::getConfig();
+
+		// Check that we were given a language in the array (since by default may be blank).
+		if (isset($options['language']))
+		{
+			$config->set('language', $options['language']);
+		}
+
+		// Set user specific editor.
+		$user = JFactory::getUser();
+		$editor = $user->getParam('editor', $this->get('editor'));
+
+		if (!JPluginHelper::isEnabled('editors', $editor))
+		{
+			$editor = $this->get('editor');
+
+			if (!JPluginHelper::isEnabled('editors', $editor))
+			{
+				$editor = 'none';
+			}
+		}
+
+		$config->set('editor', $editor);
+
+		// Trigger the onAfterInitialise event.
+		JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterInitialise');
+	}
+
+	/**
+	 * Route the application.
+	 *
+	 * Routing is the process of examining the request environment to determine which
+	 * component should receive the request. The component optional parameters
+	 * are then set in the request object to be processed when the application is being
+	 * dispatched.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function route()
+	{
+		// Get the full request URI.
+		$uri = clone JUri::getInstance();
+
+		$router = $this->getRouter();
+		$result = $router->parse($uri);
+
+		foreach ($result as $key => $value)
+		{
+			$this->input->def($key, $value);
+		}
+
+		// Trigger the onAfterRoute event.
+		JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterRoute');
+	}
+
+	/**
+	 * Dispatch the application.
+	 *
+	 * Dispatching is the process of pulling the option from the request object and
+	 * mapping them to a component. If the component does not exist, it handles
+	 * determining a default component to dispatch.
+	 *
+	 * @param   string  $component  The component to dispatch.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function dispatch($component = null)
+	{
+		$document = JFactory::getDocument();
+
+		$contents = JComponentHelper::renderComponent($component);
+		$document->setBuffer($contents, 'component');
+
+		// Trigger the onAfterDispatch event.
+		JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterDispatch');
+	}
+
+	/**
+	 * Render the application.
+	 *
+	 * Rendering is the process of pushing the document buffers into the template
+	 * placeholders, retrieving data from the document and pushing it into
+	 * the JResponse buffer.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function render()
+	{
+		$template = $this->getTemplate(true);
+
+		$params = array('template' => $template->template, 'file' => 'index.php', 'directory' => JPATH_THEMES, 'params' => $template->params);
+
+		// Parse the document.
+		$document = JFactory::getDocument();
+		$document->parse($params);
+
+		// Trigger the onBeforeRender event.
+		JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onBeforeRender');
+
+		// Render the document.
+		$caching = ($this->get('caching') >= 2);
+		JResponse::setBody($document->render($caching, $params));
+
+		// Trigger the onAfterRender event.
+		$this->triggerEvent('onAfterRender');
+	}
+
+	/**
+	 * Redirect to another URL.
+	 *
+	 * Optionally enqueues a message in the system message queue (which will be displayed
+	 * the next time a page is loaded) using the enqueueMessage method. If the headers have
+	 * not been sent the redirect will be accomplished using a "301 Moved Permanently"
+	 * code in the header pointing to the new location. If the headers have already been
+	 * sent this will be accomplished using a JavaScript statement.
+	 *
+	 * @param   string   $url      The URL to redirect to. Can only be http/https URL
+	 * @param   string   $msg      An optional message to display on redirect.
+	 * @param   string   $msgType  An optional message type. Defaults to message.
+	 * @param   boolean  $moved    True if the page is 301 Permanently Moved, otherwise 303 See Other is assumed.
+	 *
+	 * @return  void  Calls exit().
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 *
+	 * @see     JApplication::enqueueMessage()
+	 */
+	public function redirect($url, $msg = '', $msgType = 'message', $moved = false)
+	{
+		// Check for relative internal links.
+		if (preg_match('#^index2?\.php#', $url))
+		{
+			$url = JUri::base() . $url;
+		}
+
+		// Strip out any line breaks.
+		$url = preg_split("/[\r\n]/", $url);
+		$url = $url[0];
+
+		/*
+		 * If we don't start with a http we need to fix this before we proceed.
+		 * We could validly start with something else (e.g. ftp), though this would
+		 * be unlikely and isn't supported by this API.
+		 */
+		if (stripos($url, 'http') !== 0)
+		{
+			$uri = JUri::getInstance();
+			$prefix = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+
+			if ($url[0] === '/')
+			{
+				// We just need the prefix since we have a path relative to the root.
+				$url = $prefix . $url;
+			}
+			else
+			{
+				// It's relative to where we are now, so lets add that.
+				$parts = explode('/', $uri->toString(array('path')));
+				array_pop($parts);
+				$path = implode('/', $parts) . '/';
+				$url = $prefix . $path . $url;
+			}
+		}
+
+		// If the message exists, enqueue it.
+		if (trim($msg))
+		{
+			$this->enqueueMessage($msg, $msgType);
+		}
+
+		// Persist messages if they exist.
+		if (count($this->_messageQueue))
+		{
+			$session = JFactory::getSession();
+			$session->set('application.queue', $this->_messageQueue);
+		}
+
+		// If the headers have been sent, then we cannot send an additional location header
+		// so we will output a javascript redirect statement.
+		if (headers_sent())
+		{
+			echo "<script>document.location.href=" . json_encode(str_replace("'", '&apos;', $url)) . ";</script>\n";
+		}
+		else
+		{
+			$document = JFactory::getDocument();
+
+			jimport('phputf8.utils.ascii');
+
+			if (($this->client->engine == JApplicationWebClient::TRIDENT) && !utf8_is_ascii($url))
+			{
+				// MSIE type browser and/or server cause issues when URL contains utf8 character,so use a javascript redirect method
+				echo '<html><head><meta http-equiv="content-type" content="text/html; charset=' . $document->getCharset() . '" />'
+					. '<script>document.location.href=' . json_encode(str_replace("'", '&apos;', $url)) . ';</script></head></html>';
+			}
+			else
+			{
+				// All other browsers, use the more efficient HTTP header method
+				header($moved ? 'HTTP/1.1 301 Moved Permanently' : 'HTTP/1.1 303 See other');
+				header('Location: ' . $url);
+				header('Content-Type: text/html; charset=' . $document->getCharset());
+			}
+		}
+
+		$this->close();
+	}
+
+	/**
+	 * Enqueue a system message.
+	 *
+	 * @param   string  $msg   The message to enqueue.
+	 * @param   string  $type  The message type. Default is message.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function enqueueMessage($msg, $type = 'message')
+	{
+		// For empty queue, if messages exists in the session, enqueue them first.
+		if (!count($this->_messageQueue))
+		{
+			$session = JFactory::getSession();
+			$sessionQueue = $session->get('application.queue');
+
+			if (count($sessionQueue))
+			{
+				$this->_messageQueue = $sessionQueue;
+				$session->set('application.queue', null);
+			}
+		}
+
+		// Enqueue the message.
+		$this->_messageQueue[] = array('message' => $msg, 'type' => strtolower($type));
+	}
+
+	/**
+	 * Get the system message queue.
+	 *
+	 * @return  array  The system message queue.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getMessageQueue()
+	{
+		// For empty queue, if messages exists in the session, enqueue them.
+		if (!count($this->_messageQueue))
+		{
+			$session = JFactory::getSession();
+			$sessionQueue = $session->get('application.queue');
+
+			if (count($sessionQueue))
+			{
+				$this->_messageQueue = $sessionQueue;
+				$session->set('application.queue', null);
+			}
+		}
+
+		return $this->_messageQueue;
+	}
+
+	/**
+	 * Gets a configuration value.
+	 *
+	 * An example is in application/japplication-getcfg.php Getting a configuration
+	 *
+	 * @param   string  $varname  The name of the value to get.
+	 * @param   string  $default  Default value to return
+	 *
+	 * @return  mixed  The user state.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getCfg($varname, $default = null)
+	{
+		$config = JFactory::getConfig();
+
+		return $config->get('' . $varname, $default);
+	}
+
+	/**
+	 * Method to get the application name.
+	 *
+	 * The dispatcher name is by default parsed using the classname, or it can be set
+	 * by passing a $config['name'] in the class constructor.
+	 *
+	 * @return  string  The name of the dispatcher.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getName()
+	{
+		$name = $this->_name;
+
+		if (empty($name))
+		{
+			$r = null;
+
+			if (!preg_match('/J(.*)/i', get_class($this), $r))
+			{
+				JLog::add(JText::_('JLIB_APPLICATION_ERROR_APPLICATION_GET_NAME'), JLog::WARNING, 'jerror');
+			}
+
+			$name = strtolower($r[1]);
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Gets a user state.
+	 *
+	 * @param   string  $key      The path of the state.
+	 * @param   mixed   $default  Optional default value, returned if the internal value is null.
+	 *
+	 * @return  mixed  The user state or null.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getUserState($key, $default = null)
+	{
+		$session = JFactory::getSession();
+		$registry = $session->get('registry');
+
+		if ($registry !== null)
+		{
+			return $registry->get($key, $default);
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Sets the value of a user state variable.
+	 *
+	 * @param   string  $key    The path of the state.
+	 * @param   string  $value  The value of the variable.
+	 *
+	 * @return  mixed  The previous state, if one existed.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function setUserState($key, $value)
+	{
+		$session = JFactory::getSession();
+		$registry = $session->get('registry');
+
+		if ($registry !== null)
+		{
+			return $registry->set($key, $value);
+		}
+	}
+
+	/**
+	 * Gets the value of a user state variable.
+	 *
+	 * @param   string  $key      The key of the user state variable.
+	 * @param   string  $request  The name of the variable passed in a request.
+	 * @param   string  $default  The default value for the variable if not found. Optional.
+	 * @param   string  $type     Filter for the variable, for valid values see {@link JFilterInput::clean()}. Optional.
+	 *
+	 * @return  mixed  The request user state.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getUserStateFromRequest($key, $request, $default = null, $type = 'none')
+	{
+		$cur_state = $this->getUserState($key, $default);
+		$new_state = $this->input->get($request, null, $type);
+
+		// Save the new value only if it was set in this request.
+		if ($new_state !== null)
+		{
+			$this->setUserState($key, $new_state);
+		}
+		else
+		{
+			$new_state = $cur_state;
+		}
+
+		return $new_state;
+	}
+
+	/**
+	 * Login authentication function.
+	 *
+	 * Username and encoded password are passed the onUserLogin event which
+	 * is responsible for the user validation. A successful validation updates
+	 * the current session record with the user's details.
+	 *
+	 * Username and encoded password are sent as credentials (along with other
+	 * possibilities) to each observer (authentication plugin) for user
+	 * validation.  Successful validation will update the current session with
+	 * the user details.
+	 *
+	 * @param   array  $credentials  Array('username' => string, 'password' => string)
+	 * @param   array  $options      Array('remember' => boolean)
+	 *
+	 * @return  boolean|JException  True on success, false if failed or silent handling is configured, or a JException object on authentication error.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function login($credentials, $options = array())
+	{
+		JPluginHelper::importPlugin('user');
+
+		// Get the global JAuthentication object.
+		$authenticate = JAuthentication::getInstance();
+		$response = $authenticate->authenticate($credentials, $options);
+
+		if ($response->status === JAuthentication::STATUS_SUCCESS)
+		{
+			// Validate that the user should be able to login (different to being authenticated).
+			// This permits authentication plugins blocking the user
+			$authorisations = $authenticate->authorise($response, $options);
+
+			foreach ($authorisations as $authorisation)
+			{
+				$denied_states = array(JAuthentication::STATUS_EXPIRED, JAuthentication::STATUS_DENIED);
+
+				if (in_array($authorisation->status, $denied_states))
+				{
+					// Trigger onUserAuthorisationFailure Event.
+					$this->triggerEvent('onUserAuthorisationFailure', array((array) $authorisation));
+
+					// If silent is set, just return false.
+					if (isset($options['silent']) && $options['silent'])
+					{
+						return false;
+					}
+
+					// Return the error.
+					switch ($authorisation->status)
+					{
+						case JAuthentication::STATUS_EXPIRED:
+							return JError::raiseWarning('102002', JText::_('JLIB_LOGIN_EXPIRED'));
+							break;
+
+						case JAuthentication::STATUS_DENIED:
+							return JError::raiseWarning('102003', JText::_('JLIB_LOGIN_DENIED'));
+							break;
+
+						default:
+							return JError::raiseWarning('102004', JText::_('JLIB_LOGIN_AUTHORISATION'));
+							break;
+					}
+				}
+			}
+
+			// Import the user plugin group.
+			JPluginHelper::importPlugin('user');
+
+			// OK, the credentials are authenticated and user is authorised.  Let's fire the onLogin event.
+			$results = $this->triggerEvent('onUserLogin', array((array) $response, $options));
+
+			/*
+			 * If any of the user plugins did not successfully complete the login routine
+			 * then the whole method fails.
+			 *
+			 * Any errors raised should be done in the plugin as this provides the ability
+			 * to provide much more information about why the routine may have failed.
+			 */
+			$user = JFactory::getUser();
+
+			if ($response->type === 'Cookie')
+			{
+				$user->set('cookieLogin', true);
+			}
+
+			if (in_array(false, $results, true) == false)
+			{
+				$options['user'] = $user;
+				$options['responseType'] = $response->type;
+
+				if (isset($response->length, $response->secure, $response->lifetime))
+				{
+					$options['length'] = $response->length;
+					$options['secure'] = $response->secure;
+					$options['lifetime'] = $response->lifetime;
+				}
+
+				// The user is successfully logged in. Run the after login events
+				$this->triggerEvent('onUserAfterLogin', array($options));
+			}
+
+			return true;
+		}
+
+		// Trigger onUserLoginFailure Event.
+		$this->triggerEvent('onUserLoginFailure', array((array) $response));
+
+		// If silent is set, just return false.
+		if (isset($options['silent']) && $options['silent'])
+		{
+			return false;
+		}
+
+		// If status is success, any error will have been raised by the user plugin
+		if ($response->status !== JAuthentication::STATUS_SUCCESS)
+		{
+			JLog::add($response->error_message, JLog::WARNING, 'jerror');
+		}
+
+		return false;
+	}
+
+	/**
+	 * Logout authentication function.
+	 *
+	 * Passed the current user information to the onUserLogout event and reverts the current
+	 * session record back to 'anonymous' parameters.
+	 * If any of the authentication plugins did not successfully complete
+	 * the logout routine then the whole method fails. Any errors raised
+	 * should be done in the plugin as this provides the ability to give
+	 * much more information about why the routine may have failed.
+	 *
+	 * @param   integer  $userid   The user to load - Can be an integer or string - If string, it is converted to ID automatically
+	 * @param   array    $options  Array('clientid' => array of client id's)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function logout($userid = null, $options = array())
+	{
+		// Get a user object from the JApplication.
+		$user = JFactory::getUser($userid);
+
+		// Build the credentials array.
+		$parameters['username'] = $user->get('username');
+		$parameters['id'] = $user->get('id');
+
+		// Set clientid in the options array if it hasn't been set already.
+		if (!isset($options['clientid']))
+		{
+			$options['clientid'] = $this->getClientId();
+		}
+
+		// Import the user plugin group.
+		JPluginHelper::importPlugin('user');
+
+		// OK, the credentials are built. Lets fire the onLogout event.
+		$results = $this->triggerEvent('onUserLogout', array($parameters, $options));
+
+		if (!in_array(false, $results, true))
+		{
+				$options['username'] = $user->get('username');
+				$this->triggerEvent('onUserAfterLogout', array($options));
+
+			return true;
+		}
+
+		// Trigger onUserLoginFailure Event.
+		$this->triggerEvent('onUserLogoutFailure', array($parameters));
+
+		return false;
+	}
+
+	/**
+	 * Gets the name of the current template.
+	 *
+	 * @param   boolean  $params  An optional associative array of configuration settings
+	 *
+	 * @return  mixed  System is the fallback.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getTemplate($params = false)
+	{
+		$template = new stdClass;
+
+		$template->template = 'system';
+		$template->params   = new Registry;
+
+		if ($params)
+		{
+			return $template;
+		}
+
+		return $template->template;
+	}
+
+	/**
+	 * Returns the application JRouter object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  JRouter|null  A JRouter object
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public static function getRouter($name = null, array $options = array())
+	{
+		if (!isset($name))
+		{
+			$app = JFactory::getApplication();
+			$name = $app->getName();
+		}
+
+		try
+		{
+			$router = JRouter::getInstance($name, $options);
+		}
+		catch (Exception $e)
+		{
+			return;
+		}
+
+		return $router;
+	}
+
+	/**
+	 * This method transliterates a string into a URL
+	 * safe string or returns a URL safe UTF-8 string
+	 * based on the global configuration
+	 *
+	 * @param   string  $string  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2  Use JApplicationHelper::stringURLSafe instead
+	 */
+	public static function stringURLSafe($string)
+	{
+		return JApplicationHelper::stringURLSafe($string);
+	}
+
+	/**
+	 * Returns the application JPathway object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  JPathway|null  A JPathway object
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getPathway($name = null, $options = array())
+	{
+		if (!isset($name))
+		{
+			$name = $this->_name;
+		}
+
+		try
+		{
+			$pathway = JPathway::getInstance($name, $options);
+		}
+		catch (Exception $e)
+		{
+			return;
+		}
+
+		return $pathway;
+	}
+
+	/**
+	 * Returns the application JPathway object.
+	 *
+	 * @param   string  $name     The name of the application/client.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  JMenu|null  JMenu object.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getMenu($name = null, $options = array())
+	{
+		if (!isset($name))
+		{
+			$name = $this->_name;
+		}
+
+		try
+		{
+			$menu = JMenu::getInstance($name, $options);
+		}
+		catch (Exception $e)
+		{
+			return;
+		}
+
+		return $menu;
+	}
+
+	/**
+	 * Provides a secure hash based on a seed
+	 *
+	 * @param   string  $seed  Seed string.
+	 *
+	 * @return  string  A secure hash
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2  Use JApplicationHelper::getHash instead
+	 */
+	public static function getHash($seed)
+	{
+		return JApplicationHelper::getHash($seed);
+	}
+
+	/**
+	 * Create the configuration registry.
+	 *
+	 * @param   string  $file  The path to the configuration file
+	 *
+	 * @return  JConfig  A JConfig object
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	protected function _createConfiguration($file)
+	{
+		JLoader::register('JConfig', $file);
+
+		// Create the JConfig object.
+		$config = new JConfig;
+
+		// Get the global configuration object.
+		$registry = JFactory::getConfig();
+
+		// Load the configuration values into the registry.
+		$registry->loadObject($config);
+
+		return $config;
+	}
+
+	/**
+	 * Create the user session.
+	 *
+	 * Old sessions are flushed based on the configuration value for the cookie
+	 * lifetime. If an existing session, then the last access time is updated.
+	 * If a new session, a session id is generated and a record is created in
+	 * the #__sessions table.
+	 *
+	 * @param   string  $name  The sessions name.
+	 *
+	 * @return  JSession  JSession on success. May call exit() on database error.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	protected function _createSession($name)
+	{
+		$options = array();
+		$options['name'] = $name;
+
+		switch ($this->_clientId)
+		{
+			case 0:
+				if ($this->get('force_ssl') == 2)
+				{
+					$options['force_ssl'] = true;
+				}
+				break;
+
+			case 1:
+				if ($this->get('force_ssl') >= 1)
+				{
+					$options['force_ssl'] = true;
+				}
+				break;
+		}
+
+		$this->registerEvent('onAfterSessionStart', array($this, 'afterSessionStart'));
+
+		$session = JFactory::getSession($options);
+		$session->initialise($this->input, $this->dispatcher);
+		$session->start();
+
+		// TODO: At some point we need to get away from having session data always in the db.
+
+		$db = JFactory::getDbo();
+
+		// Remove expired sessions from the database.
+		$time = time();
+
+		if ($time % 2)
+		{
+			// The modulus introduces a little entropy, making the flushing less accurate
+			// but fires the query less than half the time.
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__session'))
+				->where($db->quoteName('time') . ' < ' . $db->quote((int) ($time - $session->getExpire())));
+
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Check to see the the session already exists.
+		$handler = $this->get('session_handler');
+
+		if (($handler !== 'database' && ($time % 2 || $session->isNew())) || ($handler === 'database' && $session->isNew()))
+		{
+			$this->checkSession();
+		}
+
+		return $session;
+	}
+
+	/**
+	 * Checks the user session.
+	 *
+	 * If the session record doesn't exist, initialise it.
+	 * If session is new, create session variables
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2
+	 */
+	public function checkSession()
+	{
+		$db = JFactory::getDbo();
+		$session = JFactory::getSession();
+		$user = JFactory::getUser();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('session_id'))
+			->from($db->quoteName('#__session'))
+			->where($db->quoteName('session_id') . ' = ' . $db->quote($session->getId()));
+
+		$db->setQuery($query, 0, 1);
+		$exists = $db->loadResult();
+
+		// If the session record doesn't exist initialise it.
+		if (!$exists)
+		{
+			$query->clear();
+
+			if ($session->isNew())
+			{
+				$query->insert($db->quoteName('#__session'))
+					->columns($db->quoteName('session_id') . ', ' . $db->quoteName('client_id') . ', ' . $db->quoteName('time'))
+					->values($db->quote($session->getId()) . ', ' . (int) $this->getClientId() . ', ' . $db->quote((int) time()));
+				$db->setQuery($query);
+			}
+			else
+			{
+				$query->insert($db->quoteName('#__session'))
+					->columns(
+						$db->quoteName('session_id') . ', ' . $db->quoteName('client_id') . ', ' . $db->quoteName('guest') . ', ' .
+						$db->quoteName('time') . ', ' . $db->quoteName('userid') . ', ' . $db->quoteName('username')
+					)
+					->values(
+						$db->quote($session->getId()) . ', ' . (int) $this->getClientId() . ', ' . (int) $user->get('guest') . ', ' .
+						$db->quote((int) $session->get('session.timer.start')) . ', ' . (int) $user->get('id') . ', ' . $db->quote($user->get('username'))
+					);
+
+				$db->setQuery($query);
+			}
+
+			// If the insert failed, exit the application.
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				jexit($e->getMessage());
+			}
+		}
+	}
+
+	/**
+	 * After the session has been started we need to populate it with some default values.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  3.2
+	 */
+	public function afterSessionStart()
+	{
+		$session = JFactory::getSession();
+
+		if ($session->isNew())
+		{
+			$session->set('registry', new Registry);
+			$session->set('user', new JUser);
+		}
+	}
+
+	/**
+	 * Gets the client id of the current running application.
+	 *
+	 * @return  integer  A client identifier.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function getClientId()
+	{
+		return $this->_clientId;
+	}
+
+	/**
+	 * Is admin interface?
+	 *
+	 * @return  boolean  True if this application is administrator.
+	 *
+	 * @since   1.0.2
+	 * @deprecated  3.2
+	 */
+	public function isAdmin()
+	{
+		return $this->isClient('administrator');
+	}
+
+	/**
+	 * Is site interface?
+	 *
+	 * @return  boolean  True if this application is site.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2
+	 */
+	public function isSite()
+	{
+		return $this->isClient('site');
+	}
+
+	/**
+	 * Check the client interface by name.
+	 *
+	 * @param   string  $identifier  String identifier for the application interface
+	 *
+	 * @return  boolean  True if this application is of the given type client interface.
+	 *
+	 * @since   3.7.0
+	 */
+	public function isClient($identifier)
+	{
+		return $this->getName() == $identifier;
+	}
+
+	/**
+	 * Method to determine if the host OS is  Windows
+	 *
+	 * @return  boolean  True if Windows OS
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0 Use the IS_WIN constant instead.
+	 */
+	public static function isWinOs()
+	{
+		JLog::add('JApplication::isWinOS() is deprecated. Use the IS_WIN constant instead.', JLog::WARNING, 'deprecated');
+
+		return IS_WIN;
+	}
+
+	/**
+	 * Determine if we are using a secure (SSL) connection.
+	 *
+	 * @return  boolean  True if using SSL, false if not.
+	 *
+	 * @since   3.0
+	 * @deprecated  3.2
+	 */
+	public function isSSLConnection()
+	{
+		return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') || getenv('SSL_PROTOCOL_VERSION');
+	}
+
+	/**
+	 * Returns the response as a string.
+	 *
+	 * @return  string  The response
+	 *
+	 * @since   1.6
+	 * @deprecated  3.2
+	 */
+	public function __toString()
+	{
+		$compress = $this->get('gzip', false);
+
+		return JResponse::toString($compress);
+	}
+}
diff --git a/core/libraries/legacy/base/node.php b/core/libraries/legacy/base/node.php
new file mode 100644
index 00000000..78f43456
--- /dev/null
+++ b/core/libraries/legacy/base/node.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Tree Node Class.
+ *
+ * @since       1.5
+ * @deprecated  3.0
+ */
+class JNode extends JObject
+{
+	/**
+	 * Parent node
+	 *
+	 * @var    JNode
+	 * @since  1.5
+	 * @deprecated  3.0
+	 */
+	protected $_parent = null;
+
+	/**
+	 * Array of Children
+	 *
+	 * @var    JNode[]
+	 * @since  1.5
+	 * @deprecated  3.0
+	 */
+	protected $_children = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @since  1.5
+	 * @deprecated  3.0
+	 */
+	public function __construct()
+	{
+		JLog::add('JNode::__construct() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return true;
+	}
+
+	/**
+	 * Add child to this node
+	 *
+	 * If the child already has a parent, the link is unset
+	 *
+	 * @param   JNode  &$child  The child to be added
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function addChild(&$child)
+	{
+		JLog::add('JNode::addChild() is deprecated.', JLog::WARNING, 'deprecated');
+
+		if ($child instanceof Jnode)
+		{
+			$child->setParent($this);
+		}
+	}
+
+	/**
+	 * Set the parent of a this node
+	 *
+	 * If the node already has a parent, the link is unset
+	 *
+	 * @param   JNode|null  &$parent  The JNode for parent to be set or null
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function setParent(&$parent)
+	{
+		JLog::add('JNode::setParent() is deprecated.', JLog::WARNING, 'deprecated');
+
+		if ($parent instanceof JNode || $parent === null)
+		{
+			$hash = spl_object_hash($this);
+
+			if ($this->_parent !== null)
+			{
+				unset($this->_parent->children[$hash]);
+			}
+
+			if ($parent !== null)
+			{
+				$parent->_children[$hash] = & $this;
+			}
+
+			$this->_parent = & $parent;
+		}
+	}
+
+	/**
+	 * Get the children of this node
+	 *
+	 * @return  JNode[]  The children
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function &getChildren()
+	{
+		JLog::add('JNode::getChildren() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $this->_children;
+	}
+
+	/**
+	 * Get the parent of this node
+	 *
+	 * @return  JNode|null  JNode object with the parent or null for no parent
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function &getParent()
+	{
+		JLog::add('JNode::getParent() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $this->_parent;
+	}
+
+	/**
+	 * Test if this node has children
+	 *
+	 * @return  boolean  True if there are children
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function hasChildren()
+	{
+		JLog::add('JNode::hasChildren() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return (bool) count($this->_children);
+	}
+
+	/**
+	 * Test if this node has a parent
+	 *
+	 * @return  boolean  True if there is a parent
+	 *
+	 * @since   1.6
+	 * @deprecated  3.0
+	 */
+	public function hasParent()
+	{
+		JLog::add('JNode::hasParent() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $this->getParent() != null;
+	}
+}
diff --git a/core/libraries/legacy/base/observable.php b/core/libraries/legacy/base/observable.php
new file mode 100644
index 00000000..93075b7b
--- /dev/null
+++ b/core/libraries/legacy/base/observable.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Abstract observable class to implement the observer design pattern
+ *
+ * @since       1.5
+ * @deprecated  2.5
+ */
+class JObservable extends JObject
+{
+	/**
+	 * An array of Observer objects to notify
+	 *
+	 * @var    array
+	 * @since  1.5
+	 * @deprecated  2.5
+	 */
+	protected $_observers = array();
+
+	/**
+	 * The state of the observable object
+	 *
+	 * @var    mixed
+	 * @since  1.5
+	 * @deprecated  2.5
+	 */
+	protected $_state = null;
+
+	/**
+	 * A multi dimensional array of [function][] = key for observers
+	 *
+	 * @var    array
+	 * @since  1.6
+	 * @deprecated  2.5
+	 */
+	protected $_methods = array();
+
+	/**
+	 * Constructor
+	 *
+	 * Note: Make Sure it's not directly instantiated
+	 *
+	 * @since  1.5
+	 * @deprecated  2.5
+	 */
+	public function __construct()
+	{
+		$this->_observers = array();
+	}
+
+	/**
+	 * Get the state of the JObservable object
+	 *
+	 * @return  mixed  The state of the object.
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5
+	 */
+	public function getState()
+	{
+		return $this->_state;
+	}
+
+	/**
+	 * Update each attached observer object and return an array of their return values
+	 *
+	 * @return  array  Array of return values from the observers
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5
+	 */
+	public function notify()
+	{
+		// Iterate through the _observers array
+		foreach ($this->_observers as $observer)
+		{
+			$return[] = $observer->update();
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Attach an observer object
+	 *
+	 * @param   object  $observer  An observer object to attach
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5
+	 */
+	public function attach($observer)
+	{
+		if (is_array($observer))
+		{
+			if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this array as an observer
+			foreach ($this->_observers as $check)
+			{
+				if (is_array($check) && $check['event'] == $observer['event'] && $check['handler'] == $observer['handler'])
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			end($this->_observers);
+			$methods = array($observer['event']);
+		}
+		else
+		{
+			if (!($observer instanceof JObserver))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this object as an observer
+			$class = get_class($observer);
+
+			foreach ($this->_observers as $check)
+			{
+				if ($check instanceof $class)
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			$methods = array_diff(get_class_methods($observer), get_class_methods('JPlugin'));
+		}
+
+		$key = key($this->_observers);
+
+		foreach ($methods as $method)
+		{
+			$method = strtolower($method);
+
+			if (!isset($this->_methods[$method]))
+			{
+				$this->_methods[$method] = array();
+			}
+
+			$this->_methods[$method][] = $key;
+		}
+	}
+
+	/**
+	 * Detach an observer object
+	 *
+	 * @param   object  $observer  An observer object to detach.
+	 *
+	 * @return  boolean  True if the observer object was detached.
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5
+	 */
+	public function detach($observer)
+	{
+		$retval = false;
+
+		$key = array_search($observer, $this->_observers);
+
+		if ($key !== false)
+		{
+			unset($this->_observers[$key]);
+			$retval = true;
+
+			foreach ($this->_methods as &$method)
+			{
+				$k = array_search($key, $method);
+
+				if ($k !== false)
+				{
+					unset($method[$k]);
+				}
+			}
+		}
+
+		return $retval;
+	}
+}
diff --git a/core/libraries/legacy/base/observer.php b/core/libraries/legacy/base/observer.php
new file mode 100644
index 00000000..fa5dc7e9
--- /dev/null
+++ b/core/libraries/legacy/base/observer.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Abstract observer class to implement the observer design pattern
+ *
+ * @since       1.5
+ * @deprecated  2.5
+ */
+abstract class JObserver extends JObject
+{
+	/**
+	 * Event object to observe.
+	 *
+	 * @var    object
+	 * @since  1.5
+	 * @deprecated  2.5
+	 */
+	protected $_subject = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5
+	 */
+	public function __construct(&$subject)
+	{
+		// Register the observer ($this) so we can be notified
+		$subject->attach($this);
+
+		// Set the subject to observe
+		$this->_subject = &$subject;
+	}
+
+	/**
+	 * Method to update the state of observable objects
+	 *
+	 * @param   array  &$args  An array of arguments to pass to the listener.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5
+	 */
+	abstract public function update(&$args);
+}
diff --git a/core/libraries/legacy/base/tree.php b/core/libraries/legacy/base/tree.php
new file mode 100644
index 00000000..6fafbf5c
--- /dev/null
+++ b/core/libraries/legacy/base/tree.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Base
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Tree Class.
+ *
+ * @since       1.5
+ * @deprecated  3.0
+ */
+class JTree extends JObject
+{
+	/**
+	 * Root node
+	 *
+	 * @var    JNode
+	 * @since  1.5
+	 * @deprecated  3.0
+	 */
+	protected $_root = null;
+
+	/**
+	 * Current working node
+	 *
+	 * @var    JNode
+	 * @since  1.5
+	 * @deprecated  3.0
+	 */
+	protected $_current = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function __construct()
+	{
+		JLog::add('JTree::__construct() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$this->_root = new JNode('ROOT');
+		$this->_current = & $this->_root;
+	}
+
+	/**
+	 * Method to add a child
+	 *
+	 * @param   array    &$node       The node to process
+	 * @param   boolean  $setCurrent  True to set as current working node
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function addChild(&$node, $setCurrent = false)
+	{
+		JLog::add('JTree::addChild() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$this->_current->addChild($node);
+
+		if ($setCurrent)
+		{
+			$this->_current = &$node;
+		}
+	}
+
+	/**
+	 * Method to get the parent
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function getParent()
+	{
+		JLog::add('JTree::getParent() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$this->_current = &$this->_current->getParent();
+	}
+
+	/**
+	 * Method to get the parent
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.0
+	 */
+	public function reset()
+	{
+		JLog::add('JTree::reset() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$this->_current = &$this->_root;
+	}
+}
diff --git a/core/libraries/legacy/database/exception.php b/core/libraries/legacy/database/exception.php
new file mode 100644
index 00000000..1c282433
--- /dev/null
+++ b/core/libraries/legacy/database/exception.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JDatabaseException is deprecated, use SPL Exceptions instead.', JLog::WARNING, 'deprecated');
+
+/**
+ * Exception class definition for the Database subpackage.
+ *
+ * @since       1.7
+ * @deprecated  2.5.5
+ */
+class JDatabaseException extends RuntimeException
+{
+}
diff --git a/core/libraries/legacy/database/mysql.php b/core/libraries/legacy/database/mysql.php
new file mode 100644
index 00000000..24965c87
--- /dev/null
+++ b/core/libraries/legacy/database/mysql.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JDatabaseMysql is deprecated, use JDatabaseDriverMysql instead.', JLog::WARNING, 'deprecated');
+
+/**
+ * MySQL database driver
+ *
+ * @link        http://dev.mysql.com/doc/
+ * @since       1.5
+ * @deprecated  3.0 Use JDatabaseDriverMysql instead.
+ */
+class JDatabaseMysql extends JDatabaseDriverMysql
+{
+}
diff --git a/core/libraries/legacy/database/mysqli.php b/core/libraries/legacy/database/mysqli.php
new file mode 100644
index 00000000..a53a4c60
--- /dev/null
+++ b/core/libraries/legacy/database/mysqli.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JDatabaseMysqli is deprecated, use JDatabaseDriverMysqli instead.', JLog::WARNING, 'deprecated');
+
+/**
+ * MySQLi database driver
+ *
+ * @link        https://secure.php.net/manual/en/book.mysqli.php
+ * @since       1.5
+ * @deprecated  3.0 Use JDatabaseDriverMysqli instead.
+ */
+class JDatabaseMysqli extends JDatabaseDriverMysqli
+{
+}
diff --git a/core/libraries/legacy/database/sqlazure.php b/core/libraries/legacy/database/sqlazure.php
new file mode 100644
index 00000000..5f74baf3
--- /dev/null
+++ b/core/libraries/legacy/database/sqlazure.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JDatabaseSqlazure is deprecated, use JDatabaseDriverSqlazure instead.', JLog::WARNING, 'deprecated');
+
+/**
+ * SQL Server database driver
+ *
+ * @link        https://azure.microsoft.com/en-us/documentation/services/sql-database/
+ * @since       1.7
+ * @deprecated  3.0 Use JDatabaseDriverSqlazure instead.
+ */
+class JDatabaseSqlazure extends JDatabaseDriverSqlazure
+{
+}
diff --git a/core/libraries/legacy/database/sqlsrv.php b/core/libraries/legacy/database/sqlsrv.php
new file mode 100644
index 00000000..a577b9c1
--- /dev/null
+++ b/core/libraries/legacy/database/sqlsrv.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Database
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JDatabaseSqlsrv is deprecated, use JDatabaseDriverSqlsrv instead.', JLog::WARNING, 'deprecated');
+
+/**
+ * SQL Server database driver
+ *
+ * @link        https://msdn.microsoft.com/en-us/library/cc296152(SQL.90).aspx
+ * @since       1.7
+ * @deprecated  3.0 Use JDatabaseDriverSqlsrv instead.
+ */
+class JDatabaseSqlsrv extends JDatabaseDriverSqlsrv
+{
+}
diff --git a/core/libraries/legacy/dispatcher/dispatcher.php b/core/libraries/legacy/dispatcher/dispatcher.php
new file mode 100644
index 00000000..126c040a
--- /dev/null
+++ b/core/libraries/legacy/dispatcher/dispatcher.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Dispatcher
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Deprecated class placeholder.  You should use JEventDispatcher instead.
+ *
+ * @since       1.5
+ * @deprecated  3.0
+ */
+class JDispatcher extends JEventDispatcher
+{
+	/**
+	 * Constructor.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct()
+	{
+		JLog::add('JDispatcher is deprecated. Use JEventDispatcher instead.', JLog::WARNING, 'deprecated');
+		parent::__construct();
+	}
+}
diff --git a/core/libraries/legacy/error/error.php b/core/libraries/legacy/error/error.php
new file mode 100644
index 00000000..9e79d0a9
--- /dev/null
+++ b/core/libraries/legacy/error/error.php
@@ -0,0 +1,836 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Error
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Error Definition: Illegal Options
+ *
+ * @var    integer
+ * @since  1.5
+ * @deprecated  4.0
+ */
+const JERROR_ILLEGAL_OPTIONS = 1;
+
+/**
+ * Error Definition: Callback does not exist
+ *
+ * @var    integer
+ * @since  1.5
+ * @deprecated  4.0
+ */
+const JERROR_CALLBACK_NOT_CALLABLE = 2;
+
+/**
+ * Error Definition: Illegal Handler
+ *
+ * @var    integer
+ * @since  1.5
+ * @deprecated  4.0
+ */
+const JERROR_ILLEGAL_MODE = 3;
+
+/**
+ * Error Handling Class
+ *
+ * This class is inspired in design and concept by patErrorManager <http://www.php-tools.net>
+ *
+ * patErrorManager contributors include:
+ * - gERD Schaufelberger	<gerd@php-tools.net>
+ * - Sebastian Mordziol	<argh@php-tools.net>
+ * - Stephan Schmidt		<scst@php-tools.net>
+ *
+ * @since       1.5
+ * @deprecated  4.0 Will be removed without replacement
+ */
+abstract class JError
+{
+	/**
+	 * Legacy error handling marker
+	 *
+	 * @var    boolean  True to enable legacy error handling using JError, false to use exception handling.  This flag
+	 *                  is present to allow an easy transition into exception handling for code written against the
+	 *                  existing JError API in Joomla.
+	 * @since  1.7
+	 * @deprecated  4.0
+	 */
+	public static $legacy = false;
+
+	/**
+	 * Array of message levels
+	 *
+	 * @var    array
+	 * @since  1.6
+	 * @deprecated  4.0
+	 */
+	protected static $levels = array(E_NOTICE => 'Notice', E_WARNING => 'Warning', E_ERROR => 'Error');
+
+	/**
+	 * Array of message handlers
+	 *
+	 * @var    array
+	 * @since  1.6
+	 * @deprecated  4.0
+	 */
+	protected static $handlers = array(
+		E_NOTICE => array('mode' => 'ignore'),
+		E_WARNING => array('mode' => 'ignore'),
+		E_ERROR => array('mode' => 'ignore'),
+	);
+
+	/**
+	 * Array containing the error stack
+	 *
+	 * @var    JException[]
+	 * @since  1.6
+	 * @deprecated  4.0
+	 */
+	protected static $stack = array();
+
+	/**
+	 * Method to determine if a value is an exception object.
+	 *
+	 * @param   mixed  $object  Object to check.
+	 *
+	 * @return  boolean  True if argument is an exception, false otherwise.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function isError($object)
+	{
+		JLog::add('JError::isError() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $object instanceof Exception;
+	}
+
+	/**
+	 * Method for retrieving the last exception object in the error stack
+	 *
+	 * @param   boolean  $unset  True to remove the error from the stack.
+	 *
+	 * @return  JException|boolean  Last JException object in the error stack or boolean false if none exist
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function getError($unset = false)
+	{
+		JLog::add('JError::getError() is deprecated.', JLog::WARNING, 'deprecated');
+
+		if (!isset(self::$stack[0]))
+		{
+			return false;
+		}
+
+		if ($unset)
+		{
+			$error = array_shift(self::$stack);
+		}
+		else
+		{
+			$error = &self::$stack[0];
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Method for retrieving the exception stack
+	 *
+	 * @return  JException[]  Chronological array of errors that have been stored during script execution
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function getErrors()
+	{
+		JLog::add('JError::getErrors() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return self::$stack;
+	}
+
+	/**
+	 * Method to add non-JError thrown JExceptions to the JError stack for debugging purposes
+	 *
+	 * @param   JException  $e  Add an exception to the stack.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0
+	 */
+	public static function addToStack(JException $e)
+	{
+		JLog::add('JError::addToStack() is deprecated.', JLog::WARNING, 'deprecated');
+
+		self::$stack[] = &$e;
+	}
+
+	/**
+	 * Create a new JException object given the passed arguments
+	 *
+	 * @param   integer  $level      The error level - use any of PHP's own error levels for
+	 *                               this: E_ERROR, E_WARNING, E_NOTICE, E_USER_ERROR,
+	 *                               E_USER_WARNING, E_USER_NOTICE.
+	 * @param   string   $code       The application-internal error code for this error
+	 * @param   string   $msg        The error message, which may also be shown the user if need be.
+	 * @param   mixed    $info       Optional: Additional error information (usually only
+	 *                               developer-relevant information that the user should never see,
+	 *                               like a database DSN).
+	 * @param   boolean  $backtrace  Add a stack backtrace to the exception.
+	 *
+	 * @return  JException
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see         JException
+	 */
+	public static function raise($level, $code, $msg, $info = null, $backtrace = false)
+	{
+		JLog::add('JError::raise() is deprecated.', JLog::WARNING, 'deprecated');
+
+		// Build error object
+		$exception = new JException($msg, $code, $level, $info, $backtrace);
+
+		return self::throwError($exception);
+	}
+
+	/**
+	 * Throw an error
+	 *
+	 * @param   JException  &$exception  An exception to throw.
+	 *
+	 * @return  JException  A reference to the handled JException object
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0 Just throw an Exception
+	 * @see     JException
+	 */
+	public static function throwError(&$exception)
+	{
+		JLog::add('JError::throwError() is deprecated.', JLog::WARNING, 'deprecated');
+
+		static $thrown = false;
+
+		// If thrown is hit again, we've come back to JError in the middle of throwing another JError, so die!
+		if ($thrown)
+		{
+			self::handleEcho($exception, array());
+
+			// Inifite loop.
+			jexit();
+		}
+
+		$thrown = true;
+		$level = $exception->get('level');
+
+		// See what to do with this kind of error
+		$handler = self::getErrorHandling($level);
+
+		$function = 'handle' . ucfirst($handler['mode']);
+
+		if (is_callable(array('JError', $function)))
+		{
+			$reference = call_user_func_array(array('JError', $function), array(&$exception, isset($handler['options']) ? $handler['options'] : array()));
+		}
+		else
+		{
+			// This is required to prevent a very unhelpful white-screen-of-death
+			jexit(
+				'JError::raise -> Static method JError::' . $function . ' does not exist. Contact a developer to debug' .
+				'<br /><strong>Error was</strong> <br />' . $exception->getMessage()
+			);
+		}
+		// We don't need to store the error, since JException already does that for us!
+		// Remove loop check
+		$thrown = false;
+
+		return $reference;
+	}
+
+	/**
+	 * Wrapper method for the raise() method with predefined error level of E_ERROR and backtrace set to true.
+	 *
+	 * @param   string  $code  The application-internal error code for this error
+	 * @param   string  $msg   The error message, which may also be shown the user if need be.
+	 * @param   mixed   $info  Optional: Additional error information (usually only
+	 *                         developer-relevant information that the user should
+	 *                         never see, like a database DSN).
+	 *
+	 * @return  JException  $error  The thrown JException object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0 Just throw an Exception
+	 * @see     JError::raise()
+	 */
+	public static function raiseError($code, $msg, $info = null)
+	{
+		JLog::add('JError::raiseError() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return self::raise(E_ERROR, $code, $msg, $info, true);
+	}
+
+	/**
+	 * Wrapper method for the {@link raise()} method with predefined error level of E_WARNING and backtrace set to false.
+	 *
+	 * @param   string  $code  The application-internal error code for this error
+	 * @param   string  $msg   The error message, which may also be shown the user if need be.
+	 * @param   mixed   $info  Optional: Additional error information (usually only
+	 *                         developer-relevant information that
+	 *                         the user should never see, like a database DSN).
+	 *
+	 * @return  JException  $error  The thrown JException object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0 Use \Joomla\CMS\Factory::getApplication()->enqueueMessage($msg, 'warning') when wou want to notify the UI
+	 * @see     JError::raise()
+	 */
+	public static function raiseWarning($code, $msg, $info = null)
+	{
+		JLog::add('JError::raiseWarning() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return self::raise(E_WARNING, $code, $msg, $info);
+	}
+
+	/**
+	 * Wrapper method for the {@link raise()} method with predefined error level of E_NOTICE and backtrace set to false.
+	 *
+	 * @param   string  $code  The application-internal error code for this error
+	 * @param   string  $msg   The error message, which may also be shown the user if need be.
+	 * @param   mixed   $info  Optional: Additional error information (usually only
+	 *                         developer-relevant information that the user
+	 *                         should never see, like a database DSN).
+	 *
+	 * @return  JException  $error  The thrown JException object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0 Use \Joomla\CMS\Factory::getApplication()->enqueueMessage($msg, 'notice') when wou want to notify the UI
+	 * @see     JError::raise()
+	 */
+	public static function raiseNotice($code, $msg, $info = null)
+	{
+		JLog::add('JError::raiseNotice() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return self::raise(E_NOTICE, $code, $msg, $info);
+	}
+
+	/**
+	 * Method to get the current error handler settings for a specified error level.
+	 *
+	 * @param   integer  $level  The error level to retrieve. This can be any of PHP's
+	 *                           own error levels, e.g. E_ALL, E_NOTICE...
+	 *
+	 * @return  array    All error handling details
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function getErrorHandling($level)
+	{
+		JLog::add('JError::getErrorHandling() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return self::$handlers[$level];
+	}
+
+	/**
+	 * Method to set the way the JError will handle different error levels. Use this if you want to override the default settings.
+	 *
+	 * Error handling modes:
+	 * - ignore
+	 * - echo
+	 * - verbose
+	 * - die
+	 * - message
+	 * - log
+	 * - callback
+	 *
+	 * You may also set the error handling for several modes at once using PHP's bit operations.
+	 * Examples:
+	 * - E_ALL = Set the handling for all levels
+	 * - E_ERROR | E_WARNING = Set the handling for errors and warnings
+	 * - E_ALL ^ E_ERROR = Set the handling for all levels except errors
+	 *
+	 * @param   integer  $level    The error level for which to set the error handling
+	 * @param   string   $mode     The mode to use for the error handling.
+	 * @param   mixed    $options  Optional: Any options needed for the given mode.
+	 *
+	 * @return  boolean|JException  True on success or a JException object if failed.
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function setErrorHandling($level, $mode, $options = null)
+	{
+		JLog::add('JError::setErrorHandling() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$levels = self::$levels;
+
+		$function = 'handle' . ucfirst($mode);
+
+		if (!is_callable(array('JError', $function)))
+		{
+			return self::raiseError(E_ERROR, 'JError:' . JERROR_ILLEGAL_MODE, 'Error Handling mode is not known', 'Mode: ' . $mode . ' is not implemented.');
+		}
+
+		foreach ($levels as $eLevel => $eTitle)
+		{
+			if (($level & $eLevel) !== $eLevel)
+			{
+				continue;
+			}
+
+			// Set callback options
+			if ($mode === 'callback')
+			{
+				if (!is_array($options))
+				{
+					return self::raiseError(E_ERROR, 'JError:' . JERROR_ILLEGAL_OPTIONS, 'Options for callback not valid');
+				}
+
+				if (!is_callable($options))
+				{
+					$tmp = array('GLOBAL');
+
+					if (is_array($options))
+					{
+						$tmp[0] = $options[0];
+						$tmp[1] = $options[1];
+					}
+					else
+					{
+						$tmp[1] = $options;
+					}
+
+					return self::raiseError(
+						E_ERROR,
+						'JError:' . JERROR_CALLBACK_NOT_CALLABLE,
+						'Function is not callable',
+						'Function:' . $tmp[1] . ' scope ' . $tmp[0] . '.'
+					);
+				}
+			}
+
+			// Save settings
+			self::$handlers[$eLevel] = array('mode' => $mode);
+
+			if ($options != null)
+			{
+				self::$handlers[$eLevel]['options'] = $options;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method that attaches the error handler to JError
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see     set_error_handler
+	 */
+	public static function attachHandler()
+	{
+		JLog::add('JError::getErrorHandling() is deprecated.', JLog::WARNING, 'deprecated');
+
+		set_error_handler(array('JError', 'customErrorHandler'));
+	}
+
+	/**
+	 * Method that detaches the error handler from JError
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see     restore_error_handler
+	 */
+	public static function detachHandler()
+	{
+		JLog::add('JError::detachHandler() is deprecated.', JLog::WARNING, 'deprecated');
+
+		restore_error_handler();
+	}
+
+	/**
+	 * Method to register a new error level for handling errors
+	 *
+	 * This allows you to add custom error levels to the built-in
+	 * - E_NOTICE
+	 * - E_WARNING
+	 * - E_NOTICE
+	 *
+	 * @param   integer  $level    Error level to register
+	 * @param   string   $name     Human readable name for the error level
+	 * @param   string   $handler  Error handler to set for the new error level [optional]
+	 *
+	 * @return  boolean  True on success; false if the level already has been registered
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function registerErrorLevel($level, $name, $handler = 'ignore')
+	{
+		JLog::add('JError::registerErrorLevel() is deprecated.', JLog::WARNING, 'deprecated');
+
+		if (isset(self::$levels[$level]))
+		{
+			return false;
+		}
+
+		self::$levels[$level] = $name;
+		self::setErrorHandling($level, $handler);
+
+		return true;
+	}
+
+	/**
+	 * Translate an error level integer to a human readable string
+	 * e.g. E_ERROR will be translated to 'Error'
+	 *
+	 * @param   integer  $level  Error level to translate
+	 *
+	 * @return  string|boolean  Human readable error level name or boolean false if it doesn't exist
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public static function translateErrorLevel($level)
+	{
+		JLog::add('JError::translateErrorLevel() is deprecated.', JLog::WARNING, 'deprecated');
+
+		if (isset(self::$levels[$level]))
+		{
+			return self::$levels[$level];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Ignore error handler
+	 * - Ignores the error
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  JException   The exception object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see     JError::raise()
+	 */
+	public static function handleIgnore(&$error, $options)
+	{
+		JLog::add('JError::handleIgnore() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $error;
+	}
+
+	/**
+	 * Echo error handler
+	 * - Echos the error message to output
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  JException  The exception object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see    JError::raise()
+	 */
+	public static function handleEcho(&$error, $options)
+	{
+		JLog::add('JError::handleEcho() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$level_human = self::translateErrorLevel($error->get('level'));
+
+		// If system debug is set, then output some more information.
+		if (JDEBUG)
+		{
+			$backtrace = $error->getTrace();
+			$trace = '';
+
+			for ($i = count($backtrace) - 1; $i >= 0; $i--)
+			{
+				if (isset($backtrace[$i]['class']))
+				{
+					$trace .= sprintf("\n%s %s %s()", $backtrace[$i]['class'], $backtrace[$i]['type'], $backtrace[$i]['function']);
+				}
+				else
+				{
+					$trace .= sprintf("\n%s()", $backtrace[$i]['function']);
+				}
+
+				if (isset($backtrace[$i]['file']))
+				{
+					$trace .= sprintf(' @ %s:%d', $backtrace[$i]['file'], $backtrace[$i]['line']);
+				}
+			}
+		}
+
+		if (isset($_SERVER['HTTP_HOST']))
+		{
+			// Output as html
+			echo "<br /><b>jos-$level_human</b>: "
+				. $error->get('message') . "<br />\n"
+				. (JDEBUG ? nl2br($trace) : '');
+		}
+		else
+		{
+			// Output as simple text
+			if (defined('STDERR'))
+			{
+				fwrite(STDERR, "J$level_human: " . $error->get('message') . "\n");
+
+				if (JDEBUG)
+				{
+					fwrite(STDERR, $trace);
+				}
+			}
+			else
+			{
+				echo "J$level_human: " . $error->get('message') . "\n";
+
+				if (JDEBUG)
+				{
+					echo $trace;
+				}
+			}
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Verbose error handler
+	 * - Echos the error message to output as well as related info
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  JException  The exception object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see    JError::raise()
+	 */
+	public static function handleVerbose(&$error, $options)
+	{
+		JLog::add('JError::handleVerbose() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$level_human = self::translateErrorLevel($error->get('level'));
+		$info = $error->get('info');
+
+		if (isset($_SERVER['HTTP_HOST']))
+		{
+			// Output as html
+			echo "<br /><b>J$level_human</b>: " . $error->get('message') . "<br />\n";
+
+			if ($info != null)
+			{
+				echo '&#160;&#160;&#160;' . $info . "<br />\n";
+			}
+
+			echo $error->getBacktrace(true);
+		}
+		else
+		{
+			// Output as simple text
+			echo "J$level_human: " . $error->get('message') . "\n";
+
+			if ($info != null)
+			{
+				echo "\t" . $info . "\n";
+			}
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Die error handler
+	 * - Echos the error message to output and then dies
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  void  Calls die()
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see    JError::raise()
+	 */
+	public static function handleDie(&$error, $options)
+	{
+		JLog::add('JError::handleDie() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$level_human = self::translateErrorLevel($error->get('level'));
+
+		if (isset($_SERVER['HTTP_HOST']))
+		{
+			// Output as html
+			jexit("<br /><b>J$level_human</b>: " . $error->get('message') . "<br />\n");
+		}
+		else
+		{
+			// Output as simple text
+			if (defined('STDERR'))
+			{
+				fwrite(STDERR, "J$level_human: " . $error->get('message') . "\n");
+				jexit();
+			}
+			else
+			{
+				jexit("J$level_human: " . $error->get('message') . "\n");
+			}
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Message error handler
+	 * Enqueues the error message into the system queue
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  JException  The exception object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see    JError::raise()
+	 */
+	public static function handleMessage(&$error, $options)
+	{
+		JLog::add('JError::hanleMessage() is deprecated.', JLog::WARNING, 'deprecated');
+
+		$appl = JFactory::getApplication();
+		$type = ($error->get('level') == E_NOTICE) ? 'notice' : 'error';
+		$appl->enqueueMessage($error->get('message'), $type);
+
+		return $error;
+	}
+
+	/**
+	 * Log error handler
+	 * Logs the error message to a system log file
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  JException  The exception object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see    JError::raise()
+	 */
+	public static function handleLog(&$error, $options)
+	{
+		JLog::add('JError::handleLog() is deprecated.', JLog::WARNING, 'deprecated');
+
+		static $log;
+
+		if ($log == null)
+		{
+			$options['text_file'] = date('Y-m-d') . '.error.log';
+			$options['format'] = "{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}";
+			JLog::addLogger($options, JLog::ALL, array('error'));
+		}
+
+		$entry = new JLogEntry(
+			str_replace(array("\r", "\n"), array('', '\\n'), $error->get('message')),
+			$error->get('level'),
+			'error'
+		);
+		$entry->code = $error->get('code');
+		JLog::add($entry);
+
+		return $error;
+	}
+
+	/**
+	 * Callback error handler
+	 * - Send the error object to a callback method for error handling
+	 *
+	 * @param   JException  &$error   Exception object to handle
+	 * @param   array       $options  Handler options
+	 *
+	 * @return  JException  The exception object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 * @see    JError::raise()
+	 */
+	public static function handleCallback(&$error, $options)
+	{
+		JLog::add('JError::handleCallback() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return call_user_func_array($options, array(&$error));
+	}
+
+	/**
+	 * Display a custom error page and exit gracefully
+	 *
+	 * @param   JException  $error  Exception object
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0 Use \Joomla\CMS\Exception\ExceptionHandler::render() instead
+	 */
+	public static function customErrorPage($error)
+	{
+		JLog::add('JError::customErrorPage() is deprecated, use JErrorPage::render() instead.', JLog::WARNING, 'deprecated');
+
+		\Joomla\CMS\Exception\ExceptionHandler::render($error);
+	}
+
+	/**
+	 * Display a message to the user
+	 *
+	 * @param   integer  $level  The error level - use any of PHP's own error levels
+	 *                   for this: E_ERROR, E_WARNING, E_NOTICE, E_USER_ERROR,
+	 *                   E_USER_WARNING, E_USER_NOTICE.
+	 * @param   string   $msg    Error message, shown to user if need be.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0 Throw an Exception or enqueue the message to the application, eg. \Joomla\CMS\Factory::getApplication()->enqueueMessage($msg)
+	 */
+	public static function customErrorHandler($level, $msg)
+	{
+		JLog::add('JError::customErrorHandler() is deprecated.', JLog::WARNING, 'deprecated');
+
+		self::raise($level, '', $msg);
+	}
+
+	/**
+	 * Render the backtrace
+	 *
+	 * @param   Exception  $error  The error
+	 *
+	 * @return  string  Contents of the backtrace
+	 *
+	 * @since   1.6
+	 * @deprecated  4.0 Use JLayoutHelper::render('joomla.error.backtrace', array('backtrace' => $error->getTrace())) instead
+	 */
+	public static function renderBacktrace($error)
+	{
+		JLog::add('JError::renderBacktrace() is deprecated.', JLog::WARNING, 'deprecated');
+
+		return \Joomla\CMS\Layout\LayoutHelper::render('joomla.error.backtrace', array('backtrace' => $error->getTrace()));
+	}
+}
diff --git a/core/libraries/legacy/exception/exception.php b/core/libraries/legacy/exception/exception.php
new file mode 100644
index 00000000..01c4fe07
--- /dev/null
+++ b/core/libraries/legacy/exception/exception.php
@@ -0,0 +1,412 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Exception
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Exception object.
+ *
+ * @since       1.5
+ * @deprecated  1.7
+ */
+class JException extends Exception
+{
+	/**
+	 * Error level.
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $level = null;
+
+	/**
+	 * Error code.
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $code = null;
+
+	/**
+	 * Error message.
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $message = null;
+
+	/**
+	 * Additional info about the error relevant to the developer,
+	 * for example, if a database connect fails, the dsn used
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $info = '';
+
+	/**
+	 * Name of the file the error occurred in [Available if backtrace is enabled]
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $file = null;
+
+	/**
+	 * Line number the error occurred in [Available if backtrace is enabled]
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $line = 0;
+
+	/**
+	 * Name of the method the error occurred in [Available if backtrace is enabled]
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $function = null;
+
+	/**
+	 * Name of the class the error occurred in [Available if backtrace is enabled]
+	 *
+	 * @var    string
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $class = null;
+
+	/**
+	 * @var    string  Error type.
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $type = null;
+
+	/**
+	 * Arguments received by the method the error occurred in [Available if backtrace is enabled]
+	 *
+	 * @var    array
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $args = array();
+
+	/**
+	 * Backtrace information.
+	 *
+	 * @var    mixed
+	 * @since  1.5
+	 * @deprecated  1.7
+	 */
+	protected $backtrace = null;
+
+	/**
+	 * Container holding the error messages
+	 *
+	 * @var    string[]
+	 * @since  1.6
+	 * @deprecated  1.7
+	 */
+	protected $_errors = array();
+
+	/**
+	 * Constructor
+	 * - used to set up the error with all needed error details.
+	 *
+	 * @param   string   $msg        The error message
+	 * @param   integer  $code       The error code from the application
+	 * @param   integer  $level      The error level (use the PHP constants E_ALL, E_NOTICE etc.).
+	 * @param   string   $info       Optional: The additional error information.
+	 * @param   boolean  $backtrace  True if backtrace information is to be collected
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public function __construct($msg, $code = 0, $level = null, $info = null, $backtrace = false)
+	{
+		JLog::add('JException is deprecated.', JLog::WARNING, 'deprecated');
+
+		$this->level = $level;
+		$this->code = $code;
+		$this->message = $msg;
+
+		if ($info != null)
+		{
+			$this->info = $info;
+		}
+
+		if ($backtrace && function_exists('debug_backtrace'))
+		{
+			$this->backtrace = debug_backtrace();
+
+			for ($i = count($this->backtrace) - 1; $i >= 0; --$i)
+			{
+				++$i;
+
+				if (isset($this->backtrace[$i]['file']))
+				{
+					$this->file = $this->backtrace[$i]['file'];
+				}
+
+				if (isset($this->backtrace[$i]['line']))
+				{
+					$this->line = $this->backtrace[$i]['line'];
+				}
+
+				if (isset($this->backtrace[$i]['class']))
+				{
+					$this->class = $this->backtrace[$i]['class'];
+				}
+
+				if (isset($this->backtrace[$i]['function']))
+				{
+					$this->function = $this->backtrace[$i]['function'];
+				}
+
+				if (isset($this->backtrace[$i]['type']))
+				{
+					$this->type = $this->backtrace[$i]['type'];
+				}
+
+				$this->args = false;
+
+				if (isset($this->backtrace[$i]['args']))
+				{
+					$this->args = $this->backtrace[$i]['args'];
+				}
+
+				break;
+			}
+		}
+
+		// Store exception for debugging purposes!
+		JError::addToStack($this);
+
+		parent::__construct($msg, (int) $code);
+	}
+
+	/**
+	 * Returns to error message
+	 *
+	 * @return  string  Error message
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 */
+	public function __toString()
+	{
+		JLog::add('JException::__toString is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $this->message;
+	}
+
+	/**
+	 * Returns to error message
+	 *
+	 * @return  string   Error message
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public function toString()
+	{
+		JLog::add('JException::toString is deprecated.', JLog::WARNING, 'deprecated');
+
+		return (string) $this;
+	}
+
+	/**
+	 * Returns a property of the object or the default value if the property is not set.
+	 *
+	 * @param   string  $property  The name of the property
+	 * @param   mixed   $default   The default value
+	 *
+	 * @return  mixed  The value of the property or null
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 * @see     JException::getProperties()
+	 */
+	public function get($property, $default = null)
+	{
+		JLog::add('JException::get is deprecated.', JLog::WARNING, 'deprecated');
+
+		if (isset($this->$property))
+		{
+			return $this->$property;
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Returns an associative array of object properties
+	 *
+	 * @param   boolean  $public  If true, returns only the public properties
+	 *
+	 * @return  array  Object properties
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 * @see     JException::get()
+	 */
+	public function getProperties($public = true)
+	{
+		JLog::add('JException::getProperties is deprecated.', JLog::WARNING, 'deprecated');
+
+		$vars = get_object_vars($this);
+
+		if ($public)
+		{
+			foreach ($vars as $key => $value)
+			{
+				if (strpos($key, '_') === 0)
+				{
+					unset($vars[$key]);
+				}
+			}
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Get the most recent error message
+	 *
+	 * @param   integer  $i         Option error index
+	 * @param   boolean  $toString  Indicates if JError objects should return their error message
+	 *
+	 * @return  string  Error message
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 */
+	public function getError($i = null, $toString = true)
+	{
+		JLog::add('JException::getError is deprecated.', JLog::WARNING, 'deprecated');
+
+		// Find the error
+		if ($i === null)
+		{
+			// Default, return the last message
+			$error = end($this->_errors);
+		}
+		elseif (!array_key_exists($i, $this->_errors))
+		{
+			// If $i has been specified but does not exist, return false
+			return false;
+		}
+		else
+		{
+			$error = $this->_errors[$i];
+		}
+
+		// Check if only the string is requested
+		if ($error instanceof Exception && $toString)
+		{
+			return (string) $error;
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Return all errors, if any
+	 *
+	 * @return  array  Array of error messages or JErrors
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 */
+	public function getErrors()
+	{
+		JLog::add('JException::getErrors is deprecated.', JLog::WARNING, 'deprecated');
+
+		return $this->_errors;
+	}
+
+	/**
+	 * Modifies a property of the object, creating it if it does not already exist.
+	 *
+	 * @param   string  $property  The name of the property
+	 * @param   mixed   $value     The value of the property to set
+	 *
+	 * @return  mixed  Previous value of the property
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 * @see     JException::setProperties()
+	 */
+	public function set($property, $value = null)
+	{
+		JLog::add('JException::set is deprecated.', JLog::WARNING, 'deprecated');
+
+		$previous = isset($this->$property) ? $this->$property : null;
+		$this->$property = $value;
+
+		return $previous;
+	}
+
+	/**
+	 * Set the object properties based on a named array/hash
+	 *
+	 * @param   mixed  $properties  Either and associative array or another object
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 * @see     JException::set()
+	 */
+	public function setProperties($properties)
+	{
+		JLog::add('JException::setProperties is deprecated.', JLog::WARNING, 'deprecated');
+
+		// Cast to an array
+		$properties = (array) $properties;
+
+		if (is_array($properties))
+		{
+			foreach ($properties as $k => $v)
+			{
+				$this->$k = $v;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add an error message
+	 *
+	 * @param   string  $error  Error message
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecated  1.7
+	 */
+	public function setError($error)
+	{
+		JLog::add('JException::setErrors is deprecated.', JLog::WARNING, 'deprecated');
+
+		$this->_errors[] = $error;
+	}
+}
diff --git a/core/libraries/legacy/form/field/category.php b/core/libraries/legacy/form/field/category.php
new file mode 100644
index 00000000..46a3da78
--- /dev/null
+++ b/core/libraries/legacy/form/field/category.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Supports an HTML select list of categories
+ *
+ * @since  1.6
+ */
+class JFormFieldCategory extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'Category';
+
+	/**
+	 * Method to get the field options for category
+	 * Use the extension attribute in a form to specify the.specific extension for
+	 * which categories should be displayed.
+	 * Use the show_root attribute to specify whether to show the global category root in the list.
+	 *
+	 * @return  array    The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+		$extension = $this->element['extension'] ? (string) $this->element['extension'] : (string) $this->element['scope'];
+		$published = (string) $this->element['published'];
+		$language  = (string) $this->element['language'];
+
+		// Load the category options for a given extension.
+		if (!empty($extension))
+		{
+			// Filter over published state or not depending upon if it is present.
+			$filters = array();
+			if ($published)
+			{
+				$filters['filter.published'] = explode(',', $published);
+			}
+
+			// Filter over language depending upon if it is present.
+			if ($language)
+			{
+				$filters['filter.language'] = explode(',', $language);
+			}
+
+			if ($filters === array())
+			{
+				$options = JHtml::_('category.options', $extension);
+			}
+			else
+			{
+				$options = JHtml::_('category.options', $extension, $filters);
+			}
+
+			// Verify permissions.  If the action attribute is set, then we scan the options.
+			if ((string) $this->element['action'])
+			{
+				// Get the current user object.
+				$user = JFactory::getUser();
+
+				foreach ($options as $i => $option)
+				{
+					/*
+					 * To take save or create in a category you need to have create rights for that category
+					 * unless the item is already in that category.
+					 * Unset the option if the user isn't authorised for it. In this field assets are always categories.
+					 */
+					if ($user->authorise('core.create', $extension . '.category.' . $option->value) === false)
+					{
+						unset($options[$i]);
+					}
+				}
+			}
+
+			if (isset($this->element['show_root']))
+			{
+				array_unshift($options, JHtml::_('select.option', '0', JText::_('JGLOBAL_ROOT')));
+			}
+		}
+		else
+		{
+			JLog::add(JText::_('JLIB_FORM_ERROR_FIELDS_CATEGORY_ERROR_EXTENSION_EMPTY'), JLog::WARNING, 'jerror');
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/legacy/form/field/componentlayout.php b/core/libraries/legacy/form/field/componentlayout.php
new file mode 100644
index 00000000..5877b1dd
--- /dev/null
+++ b/core/libraries/legacy/form/field/componentlayout.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Form Field to display a list of the layouts for a component view from
+ * the extension or template overrides.
+ *
+ * @since  1.6
+ */
+class JFormFieldComponentlayout extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'ComponentLayout';
+
+	/**
+	 * Method to get the field input for a component layout field.
+	 *
+	 * @return  string   The field input.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		// Get the client id.
+		$clientId = $this->element['client_id'];
+
+		if ($clientId === null && $this->form instanceof JForm)
+		{
+			$clientId = $this->form->getValue('client_id');
+		}
+
+		$clientId = (int) $clientId;
+
+		$client = JApplicationHelper::getClientInfo($clientId);
+
+		// Get the extension.
+		$extension = (string) $this->element['extension'];
+
+		if (empty($extension) && ($this->form instanceof JForm))
+		{
+			$extension = $this->form->getValue('extension');
+		}
+
+		$extension = preg_replace('#\W#', '', $extension);
+
+		$template = (string) $this->element['template'];
+		$template = preg_replace('#\W#', '', $template);
+
+		$template_style_id = '';
+		if ($this->form instanceof JForm)
+		{
+			$template_style_id = $this->form->getValue('template_style_id');
+			$template_style_id = preg_replace('#\W#', '', $template_style_id);
+		}
+
+		$view = (string) $this->element['view'];
+		$view = preg_replace('#\W#', '', $view);
+
+		// If a template, extension and view are present build the options.
+		if ($extension && $view && $client)
+		{
+			// Load language file
+			$lang = JFactory::getLanguage();
+			$lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load($extension . '.sys', JPATH_ADMINISTRATOR . '/components/' . $extension, null, false, true);
+
+			// Get the database object and a new query object.
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			// Build the query.
+			$query->select('e.element, e.name')
+				->from('#__extensions as e')
+				->where('e.client_id = ' . (int) $clientId)
+				->where('e.type = ' . $db->quote('template'))
+				->where('e.enabled = 1');
+
+			if ($template)
+			{
+				$query->where('e.element = ' . $db->quote($template));
+			}
+
+			if ($template_style_id)
+			{
+				$query->join('LEFT', '#__template_styles as s on s.template=e.element')
+					->where('s.id=' . (int) $template_style_id);
+			}
+
+			// Set the query and load the templates.
+			$db->setQuery($query);
+			$templates = $db->loadObjectList('element');
+
+			// Build the search paths for component layouts.
+			$component_path = JPath::clean($client->path . '/components/' . $extension . '/views/' . $view . '/tmpl');
+
+			// Prepare array of component layouts
+			$component_layouts = array();
+
+			// Prepare the grouped list
+			$groups = array();
+
+			// Add a Use Global option if useglobal="true" in XML file
+			if ((string) $this->element['useglobal'] === 'true')
+			{
+				$groups[JText::_('JOPTION_FROM_STANDARD')]['items'][] = JHtml::_('select.option', '', JText::_('JGLOBAL_USE_GLOBAL'));
+			}
+
+			// Add the layout options from the component path.
+			if (is_dir($component_path) && ($component_layouts = JFolder::files($component_path, '^[^_]*\.xml$', false, true)))
+			{
+				// Create the group for the component
+				$groups['_'] = array();
+				$groups['_']['id'] = $this->id . '__';
+				$groups['_']['text'] = JText::sprintf('JOPTION_FROM_COMPONENT');
+				$groups['_']['items'] = array();
+
+				foreach ($component_layouts as $i => $file)
+				{
+					// Attempt to load the XML file.
+					if (!$xml = simplexml_load_file($file))
+					{
+						unset($component_layouts[$i]);
+
+						continue;
+					}
+
+					// Get the help data from the XML file if present.
+					if (!$menu = $xml->xpath('layout[1]'))
+					{
+						unset($component_layouts[$i]);
+
+						continue;
+					}
+
+					$menu = $menu[0];
+
+					// Add an option to the component group
+					$value = basename($file, '.xml');
+					$component_layouts[$i] = $value;
+					$text = isset($menu['option']) ? JText::_($menu['option']) : (isset($menu['title']) ? JText::_($menu['title']) : $value);
+					$groups['_']['items'][] = JHtml::_('select.option', '_:' . $value, $text);
+				}
+			}
+
+			// Loop on all templates
+			if ($templates)
+			{
+				foreach ($templates as $template)
+				{
+					// Load language file
+					$lang->load('tpl_' . $template->element . '.sys', $client->path, null, false, true)
+						|| $lang->load('tpl_' . $template->element . '.sys', $client->path . '/templates/' . $template->element, null, false, true);
+
+					$template_path = JPath::clean(
+						$client->path
+						. '/templates/'
+						. $template->element
+						. '/html/'
+						. $extension
+						. '/'
+						. $view
+					);
+
+					// Add the layout options from the template path.
+					if (is_dir($template_path) && ($files = JFolder::files($template_path, '^[^_]*\.php$', false, true)))
+					{
+						foreach ($files as $i => $file)
+						{
+							// Remove layout files that exist in the component folder
+							if (in_array(basename($file, '.php'), $component_layouts))
+							{
+								unset($files[$i]);
+							}
+						}
+
+						if (count($files))
+						{
+							// Create the group for the template
+							$groups[$template->name] = array();
+							$groups[$template->name]['id'] = $this->id . '_' . $template->element;
+							$groups[$template->name]['text'] = JText::sprintf('JOPTION_FROM_TEMPLATE', $template->name);
+							$groups[$template->name]['items'] = array();
+
+							foreach ($files as $file)
+							{
+								// Add an option to the template group
+								$value = basename($file, '.php');
+								$text = $lang
+									->hasKey(
+										$key = strtoupper(
+											'TPL_'
+											. $template->name
+											. '_'
+											. $extension
+											. '_'
+											. $view
+											. '_LAYOUT_'
+											. $value
+										)
+									)
+									? JText::_($key) : $value;
+								$groups[$template->name]['items'][] = JHtml::_('select.option', $template->element . ':' . $value, $text);
+							}
+						}
+					}
+				}
+			}
+
+			// Compute attributes for the grouped list
+			$attr = $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+			$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+			// Prepare HTML code
+			$html = array();
+
+			// Compute the current selected values
+			$selected = array($this->value);
+
+			// Add a grouped list
+			$html[] = JHtml::_(
+				'select.groupedlist', $groups, $this->name,
+				array('id' => $this->id, 'group.id' => 'id', 'list.attr' => $attr, 'list.select' => $selected)
+			);
+
+			return implode($html);
+		}
+		else
+		{
+			return '';
+		}
+	}
+}
diff --git a/core/libraries/legacy/form/field/modulelayout.php b/core/libraries/legacy/form/field/modulelayout.php
new file mode 100644
index 00000000..de0ff075
--- /dev/null
+++ b/core/libraries/legacy/form/field/modulelayout.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Form
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Form Field to display a list of the layouts for module display from the module or template overrides.
+ *
+ * @since  1.6
+ */
+class JFormFieldModulelayout extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'ModuleLayout';
+
+	/**
+	 * Method to get the field input for module layouts.
+	 *
+	 * @return  string  The field input.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		// Get the client id.
+		$clientId = $this->element['client_id'];
+
+		if ($clientId === null && $this->form instanceof JForm)
+		{
+			$clientId = $this->form->getValue('client_id');
+		}
+
+		$clientId = (int) $clientId;
+
+		$client = JApplicationHelper::getClientInfo($clientId);
+
+		// Get the module.
+		$module = (string) $this->element['module'];
+
+		if (empty($module) && ($this->form instanceof JForm))
+		{
+			$module = $this->form->getValue('module');
+		}
+
+		$module = preg_replace('#\W#', '', $module);
+
+		// Get the template.
+		$template = (string) $this->element['template'];
+		$template = preg_replace('#\W#', '', $template);
+
+		// Get the style.
+		$template_style_id = '';
+		if ($this->form instanceof JForm)
+		{
+			$template_style_id = $this->form->getValue('template_style_id');
+			$template_style_id = preg_replace('#\W#', '', $template_style_id);
+		}
+
+		// If an extension and view are present build the options.
+		if ($module && $client)
+		{
+			// Load language file
+			$lang = JFactory::getLanguage();
+			$lang->load($module . '.sys', $client->path, null, false, true)
+				|| $lang->load($module . '.sys', $client->path . '/modules/' . $module, null, false, true);
+
+			// Get the database object and a new query object.
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			// Build the query.
+			$query->select('element, name')
+				->from('#__extensions as e')
+				->where('e.client_id = ' . (int) $clientId)
+				->where('e.type = ' . $db->quote('template'))
+				->where('e.enabled = 1');
+
+			if ($template)
+			{
+				$query->where('e.element = ' . $db->quote($template));
+			}
+
+			if ($template_style_id)
+			{
+				$query->join('LEFT', '#__template_styles as s on s.template=e.element')
+					->where('s.id=' . (int) $template_style_id);
+			}
+
+			// Set the query and load the templates.
+			$db->setQuery($query);
+			$templates = $db->loadObjectList('element');
+
+			// Build the search paths for module layouts.
+			$module_path = JPath::clean($client->path . '/modules/' . $module . '/tmpl');
+
+			// Prepare array of component layouts
+			$module_layouts = array();
+
+			// Prepare the grouped list
+			$groups = array();
+
+			// Add the layout options from the module path.
+			if (is_dir($module_path) && ($module_layouts = JFolder::files($module_path, '^[^_]*\.php$')))
+			{
+				// Create the group for the module
+				$groups['_'] = array();
+				$groups['_']['id'] = $this->id . '__';
+				$groups['_']['text'] = JText::sprintf('JOPTION_FROM_MODULE');
+				$groups['_']['items'] = array();
+
+				foreach ($module_layouts as $file)
+				{
+					// Add an option to the module group
+					$value = basename($file, '.php');
+					$text = $lang->hasKey($key = strtoupper($module . '_LAYOUT_' . $value)) ? JText::_($key) : $value;
+					$groups['_']['items'][] = JHtml::_('select.option', '_:' . $value, $text);
+				}
+			}
+
+			// Loop on all templates
+			if ($templates)
+			{
+				foreach ($templates as $template)
+				{
+					// Load language file
+					$lang->load('tpl_' . $template->element . '.sys', $client->path, null, false, true)
+						|| $lang->load('tpl_' . $template->element . '.sys', $client->path . '/templates/' . $template->element, null, false, true);
+
+					$template_path = JPath::clean($client->path . '/templates/' . $template->element . '/html/' . $module);
+
+					// Add the layout options from the template path.
+					if (is_dir($template_path) && ($files = JFolder::files($template_path, '^[^_]*\.php$')))
+					{
+						foreach ($files as $i => $file)
+						{
+							// Remove layout that already exist in component ones
+							if (in_array($file, $module_layouts))
+							{
+								unset($files[$i]);
+							}
+						}
+
+						if (count($files))
+						{
+							// Create the group for the template
+							$groups[$template->element] = array();
+							$groups[$template->element]['id'] = $this->id . '_' . $template->element;
+							$groups[$template->element]['text'] = JText::sprintf('JOPTION_FROM_TEMPLATE', $template->name);
+							$groups[$template->element]['items'] = array();
+
+							foreach ($files as $file)
+							{
+								// Add an option to the template group
+								$value = basename($file, '.php');
+								$text = $lang->hasKey($key = strtoupper('TPL_' . $template->element . '_' . $module . '_LAYOUT_' . $value))
+									? JText::_($key) : $value;
+								$groups[$template->element]['items'][] = JHtml::_('select.option', $template->element . ':' . $value, $text);
+							}
+						}
+					}
+				}
+			}
+			// Compute attributes for the grouped list
+			$attr = $this->element['size'] ? ' size="' . (int) $this->element['size'] . '"' : '';
+			$attr .= $this->element['class'] ? ' class="' . (string) $this->element['class'] . '"' : '';
+
+			// Prepare HTML code
+			$html = array();
+
+			// Compute the current selected values
+			$selected = array($this->value);
+
+			// Add a grouped list
+			$html[] = JHtml::_(
+				'select.groupedlist', $groups, $this->name,
+				array('id' => $this->id, 'group.id' => 'id', 'list.attr' => $attr, 'list.select' => $selected)
+			);
+
+			return implode($html);
+		}
+		else
+		{
+			return '';
+		}
+	}
+}
diff --git a/core/libraries/legacy/log/logexception.php b/core/libraries/legacy/log/logexception.php
new file mode 100644
index 00000000..dd21f275
--- /dev/null
+++ b/core/libraries/legacy/log/logexception.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Log
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('LogException is deprecated, use SPL Exceptions instead.', JLog::WARNING, 'deprecated');
+
+/**
+ * Exception class definition for the Log subpackage.
+ *
+ * @since       1.7
+ * @deprecated  2.5.5 Use semantic exceptions instead
+ */
+class LogException extends RuntimeException
+{
+}
diff --git a/core/libraries/legacy/request/request.php b/core/libraries/legacy/request/request.php
new file mode 100644
index 00000000..01528dc8
--- /dev/null
+++ b/core/libraries/legacy/request/request.php
@@ -0,0 +1,546 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Request
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Create the request global object
+ */
+$GLOBALS['_JREQUEST'] = array();
+
+/**
+ * Set the available masks for cleaning variables
+ */
+const JREQUEST_NOTRIM    = 1;
+const JREQUEST_ALLOWRAW  = 2;
+const JREQUEST_ALLOWHTML = 4;
+
+JLog::add('JRequest is deprecated.', JLog::WARNING, 'deprecated');
+
+/**
+ * JRequest Class
+ *
+ * This class serves to provide the Joomla Platform with a common interface to access
+ * request variables.  This includes $_POST, $_GET, and naturally $_REQUEST.  Variables
+ * can be passed through an input filter to avoid injection or returned raw.
+ *
+ * @since       1.5
+ * @deprecated  1.7 Get the JInput object from the application instead
+ */
+class JRequest
+{
+	/**
+	 * Gets the full request path.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getUri()
+	{
+		$uri = JUri::getInstance();
+
+		return $uri->toString(array('path', 'query'));
+	}
+
+	/**
+	 * Gets the request method.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7 Use JInput::getMethod() instead
+	 */
+	public static function getMethod()
+	{
+		return strtoupper($_SERVER['REQUEST_METHOD']);
+	}
+
+	/**
+	 * Fetches and returns a given variable.
+	 *
+	 * The default behaviour is fetching variables depending on the
+	 * current request method: GET and HEAD will result in returning
+	 * an entry from $_GET, POST and PUT will result in returning an
+	 * entry from $_POST.
+	 *
+	 * You can force the source by setting the $hash parameter:
+	 *
+	 * post    $_POST
+	 * get     $_GET
+	 * files   $_FILES
+	 * cookie  $_COOKIE
+	 * env     $_ENV
+	 * server  $_SERVER
+	 * method  via current $_SERVER['REQUEST_METHOD']
+	 * default $_REQUEST
+	 *
+	 * @param   string   $name     Variable name.
+	 * @param   mixed    $default  Default value if the variable does not exist.
+	 * @param   string   $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD).
+	 * @param   string   $type     Return type for the variable, for valid values see {@link JFilterInput::clean()}.
+	 * @param   integer  $mask     Filter mask for the variable.
+	 *
+	 * @return  mixed  Requested variable.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7  Use JInput::get()
+	 */
+	public static function getVar($name, $default = null, $hash = 'default', $type = 'none', $mask = 0)
+	{
+		// Ensure hash and type are uppercase
+		$hash = strtoupper($hash);
+
+		if ($hash === 'METHOD')
+		{
+			$hash = strtoupper($_SERVER['REQUEST_METHOD']);
+		}
+
+		$type = strtoupper($type);
+		$sig = $hash . $type . $mask;
+
+		// Get the input hash
+		switch ($hash)
+		{
+			case 'GET':
+				$input = &$_GET;
+				break;
+			case 'POST':
+				$input = &$_POST;
+				break;
+			case 'FILES':
+				$input = &$_FILES;
+				break;
+			case 'COOKIE':
+				$input = &$_COOKIE;
+				break;
+			case 'ENV':
+				$input = &$_ENV;
+				break;
+			case 'SERVER':
+				$input = &$_SERVER;
+				break;
+			default:
+				$input = &$_REQUEST;
+				$hash = 'REQUEST';
+				break;
+		}
+
+		if (isset($GLOBALS['_JREQUEST'][$name]['SET.' . $hash]) && ($GLOBALS['_JREQUEST'][$name]['SET.' . $hash] === true))
+		{
+			// Get the variable from the input hash
+			$var = (isset($input[$name]) && $input[$name] !== null) ? $input[$name] : $default;
+			$var = self::_cleanVar($var, $mask, $type);
+		}
+		elseif (!isset($GLOBALS['_JREQUEST'][$name][$sig]))
+		{
+			if (isset($input[$name]))
+			{
+				// Get the variable from the input hash and clean it
+				$var = self::_cleanVar($input[$name], $mask, $type);
+
+				$GLOBALS['_JREQUEST'][$name][$sig] = $var;
+			}
+			elseif ($default !== null)
+			{
+				// Clean the default value
+				$var = self::_cleanVar($default, $mask, $type);
+			}
+			else
+			{
+				$var = $default;
+			}
+		}
+		else
+		{
+			$var = $GLOBALS['_JREQUEST'][$name][$sig];
+		}
+
+		return $var;
+	}
+
+	/**
+	 * Fetches and returns a given filtered variable. The integer
+	 * filter will allow only digits and the - sign to be returned. This is currently
+	 * only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string   $name     Variable name.
+	 * @param   integer  $default  Default value if the variable does not exist.
+	 * @param   string   $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD).
+	 *
+	 * @return  integer  Requested variable.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getInt($name, $default = 0, $hash = 'default')
+	{
+		return self::getVar($name, $default, $hash, 'int');
+	}
+
+	/**
+	 * Fetches and returns a given filtered variable. The unsigned integer
+	 * filter will allow only digits to be returned. This is currently
+	 * only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string   $name     Variable name.
+	 * @param   integer  $default  Default value if the variable does not exist.
+	 * @param   string   $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD).
+	 *
+	 * @return  integer  Requested variable.
+	 *
+	 * @since   1.7
+	 * @deprecated  1.7
+	 */
+	public static function getUInt($name, $default = 0, $hash = 'default')
+	{
+		return self::getVar($name, $default, $hash, 'uint');
+	}
+
+	/**
+	 * Fetches and returns a given filtered variable.  The float
+	 * filter only allows digits and periods.  This is currently
+	 * only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string  $name     Variable name.
+	 * @param   float   $default  Default value if the variable does not exist.
+	 * @param   string  $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD).
+	 *
+	 * @return  float  Requested variable.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getFloat($name, $default = 0.0, $hash = 'default')
+	{
+		return self::getVar($name, $default, $hash, 'float');
+	}
+
+	/**
+	 * Fetches and returns a given filtered variable. The bool
+	 * filter will only return true/false bool values. This is
+	 * currently only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string   $name     Variable name.
+	 * @param   boolean  $default  Default value if the variable does not exist.
+	 * @param   string   $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD).
+	 *
+	 * @return  boolean  Requested variable.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getBool($name, $default = false, $hash = 'default')
+	{
+		return self::getVar($name, $default, $hash, 'bool');
+	}
+
+	/**
+	 * Fetches and returns a given filtered variable. The word
+	 * filter only allows the characters [A-Za-z_]. This is currently
+	 * only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string  $name     Variable name.
+	 * @param   string  $default  Default value if the variable does not exist.
+	 * @param   string  $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD).
+	 *
+	 * @return  string  Requested variable.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getWord($name, $default = '', $hash = 'default')
+	{
+		return self::getVar($name, $default, $hash, 'word');
+	}
+
+	/**
+	 * Cmd (Word and Integer) filter
+	 *
+	 * Fetches and returns a given filtered variable. The cmd
+	 * filter only allows the characters [A-Za-z0-9.-_]. This is
+	 * currently only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string  $name     Variable name
+	 * @param   string  $default  Default value if the variable does not exist
+	 * @param   string  $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+	 *
+	 * @return  string  Requested variable
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getCmd($name, $default = '', $hash = 'default')
+	{
+		return self::getVar($name, $default, $hash, 'cmd');
+	}
+
+	/**
+	 * Fetches and returns a given filtered variable. The string
+	 * filter deletes 'bad' HTML code, if not overridden by the mask.
+	 * This is currently only a proxy function for getVar().
+	 *
+	 * See getVar() for more in-depth documentation on the parameters.
+	 *
+	 * @param   string   $name     Variable name
+	 * @param   string   $default  Default value if the variable does not exist
+	 * @param   string   $hash     Where the var should come from (POST, GET, FILES, COOKIE, METHOD)
+	 * @param   integer  $mask     Filter mask for the variable
+	 *
+	 * @return  string   Requested variable
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function getString($name, $default = '', $hash = 'default', $mask = 0)
+	{
+		// Cast to string, in case JREQUEST_ALLOWRAW was specified for mask
+		return (string) self::getVar($name, $default, $hash, 'string', $mask);
+	}
+
+	/**
+	 * Set a variable in one of the request variables.
+	 *
+	 * @param   string   $name       Name
+	 * @param   string   $value      Value
+	 * @param   string   $hash       Hash
+	 * @param   boolean  $overwrite  Boolean
+	 *
+	 * @return  string   Previous value
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	public static function setVar($name, $value = null, $hash = 'method', $overwrite = true)
+	{
+		// If overwrite is true, makes sure the variable hasn't been set yet
+		if (!$overwrite && array_key_exists($name, $_REQUEST))
+		{
+			return $_REQUEST[$name];
+		}
+
+		// Clean global request var
+		$GLOBALS['_JREQUEST'][$name] = array();
+
+		// Get the request hash value
+		$hash = strtoupper($hash);
+
+		if ($hash === 'METHOD')
+		{
+			$hash = strtoupper($_SERVER['REQUEST_METHOD']);
+		}
+
+		$previous = array_key_exists($name, $_REQUEST) ? $_REQUEST[$name] : null;
+
+		switch ($hash)
+		{
+			case 'GET':
+				$_GET[$name] = $value;
+				$_REQUEST[$name] = $value;
+				break;
+			case 'POST':
+				$_POST[$name] = $value;
+				$_REQUEST[$name] = $value;
+				break;
+			case 'COOKIE':
+				$_COOKIE[$name] = $value;
+				$_REQUEST[$name] = $value;
+				break;
+			case 'FILES':
+				$_FILES[$name] = $value;
+				break;
+			case 'ENV':
+				$_ENV[$name] = $value;
+				break;
+			case 'SERVER':
+				$_SERVER[$name] = $value;
+				break;
+		}
+
+		// Mark this variable as 'SET'
+		$GLOBALS['_JREQUEST'][$name]['SET.' . $hash] = true;
+		$GLOBALS['_JREQUEST'][$name]['SET.REQUEST'] = true;
+
+		return $previous;
+	}
+
+	/**
+	 * Fetches and returns a request array.
+	 *
+	 * The default behaviour is fetching variables depending on the
+	 * current request method: GET and HEAD will result in returning
+	 * $_GET, POST and PUT will result in returning $_POST.
+	 *
+	 * You can force the source by setting the $hash parameter:
+	 *
+	 * post     $_POST
+	 * get      $_GET
+	 * files    $_FILES
+	 * cookie   $_COOKIE
+	 * env      $_ENV
+	 * server   $_SERVER
+	 * method   via current $_SERVER['REQUEST_METHOD']
+	 * default  $_REQUEST
+	 *
+	 * @param   string   $hash  to get (POST, GET, FILES, METHOD).
+	 * @param   integer  $mask  Filter mask for the variable.
+	 *
+	 * @return  mixed    Request hash.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7  Use JInput::get()
+	 * @see     JInput
+	 */
+	public static function get($hash = 'default', $mask = 0)
+	{
+		$hash = strtoupper($hash);
+
+		if ($hash === 'METHOD')
+		{
+			$hash = strtoupper($_SERVER['REQUEST_METHOD']);
+		}
+
+		switch ($hash)
+		{
+			case 'GET':
+				$input = $_GET;
+				break;
+
+			case 'POST':
+				$input = $_POST;
+				break;
+
+			case 'FILES':
+				$input = $_FILES;
+				break;
+
+			case 'COOKIE':
+				$input = $_COOKIE;
+				break;
+
+			case 'ENV':
+				$input = &$_ENV;
+				break;
+
+			case 'SERVER':
+				$input = &$_SERVER;
+				break;
+
+			default:
+				$input = $_REQUEST;
+				break;
+		}
+
+		return self::_cleanVar($input, $mask);
+	}
+
+	/**
+	 * Sets a request variable.
+	 *
+	 * @param   array    $array      An associative array of key-value pairs.
+	 * @param   string   $hash       The request variable to set (POST, GET, FILES, METHOD).
+	 * @param   boolean  $overwrite  If true and an existing key is found, the value is overwritten, otherwise it is ignored.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7  Use JInput::set()
+	 */
+	public static function set($array, $hash = 'default', $overwrite = true)
+	{
+		foreach ($array as $key => $value)
+		{
+			self::setVar($key, $value, $hash, $overwrite);
+		}
+	}
+
+	/**
+	 * Checks for a form token in the request.
+	 *
+	 * Use in conjunction with JHtml::_('form.token').
+	 *
+	 * @param   string  $method  The request method in which to look for the token key.
+	 *
+	 * @return  boolean  True if found and valid, false otherwise.
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7 Use JSession::checkToken() instead. Note that 'default' has to become 'request'.
+	 */
+	public static function checkToken($method = 'post')
+	{
+		if ($method === 'default')
+		{
+			$method = 'request';
+		}
+
+		return JSession::checkToken($method);
+	}
+
+	/**
+	 * Clean up an input variable.
+	 *
+	 * @param   mixed    $var   The input variable.
+	 * @param   integer  $mask  Filter bit mask.
+	 *                           1 = no trim: If this flag is cleared and the input is a string, the string will have leading and trailing
+	 *                               whitespace trimmed.
+	 *                           2 = allow_raw: If set, no more filtering is performed, higher bits are ignored.
+	 *                           4 = allow_html: HTML is allowed, but passed through a safe HTML filter first. If set, no more filtering
+	 *                               is performed. If no bits other than the 1 bit is set, a strict filter is applied.
+	 * @param   string   $type  The variable type {@see JFilterInput::clean()}.
+	 *
+	 * @return  mixed  Same as $var
+	 *
+	 * @since   1.5
+	 * @deprecated  1.7
+	 */
+	protected static function _cleanVar($var, $mask = 0, $type = null)
+	{
+		$mask = (int) $mask;
+
+		// If the no trim flag is not set, trim the variable
+		if (!($mask & 1) && is_string($var))
+		{
+			$var = trim($var);
+		}
+
+		// Now we handle input filtering
+		if ($mask & 2)
+		{
+			// If the allow raw flag is set, do not modify the variable
+		}
+		elseif ($mask & 4)
+		{
+			// If the allow HTML flag is set, apply a safe HTML filter to the variable
+			$safeHtmlFilter = JFilterInput::getInstance(null, null, 1, 1);
+			$var = $safeHtmlFilter->clean($var, $type);
+		}
+		else
+		{
+			// Since no allow flags were set, we will apply the most strict filter to the variable
+			// $tags, $attr, $tag_method, $attr_method, $xss_auto use defaults.
+			$noHtmlFilter = JFilterInput::getInstance();
+			$var = $noHtmlFilter->clean($var, $type);
+		}
+
+		return $var;
+	}
+}
diff --git a/core/libraries/legacy/response/response.php b/core/libraries/legacy/response/response.php
new file mode 100644
index 00000000..9003bc1f
--- /dev/null
+++ b/core/libraries/legacy/response/response.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Response
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JResponse is deprecated.', JLog::WARNING, 'deprecated');
+
+/**
+ * JResponse Class.
+ *
+ * This class serves to provide the Joomla Platform with a common interface to access
+ * response variables.  This includes header and body.
+ *
+ * @since       11.1
+ * @deprecated  1.5  Use JApplicationWeb instead
+ */
+class JResponse
+{
+	/**
+	 * Response body
+	 *
+	 * @var    array
+	 * @since  1.6
+	 * @deprecated  3.2
+	 */
+	protected static $body = array();
+
+	/**
+	 * Flag if the response is cachable
+	 *
+	 * @var    boolean
+	 * @since  1.6
+	 * @deprecated  3.2
+	 */
+	protected static $cachable = false;
+
+	/**
+	 * Response headers
+	 *
+	 * @var    array
+	 * @since  1.6
+	 * @deprecated  3.2
+	 */
+	protected static $headers = array();
+
+	/**
+	 * Set/get cachable state for the response.
+	 *
+	 * If $allow is set, sets the cachable state of the response.  Always returns current state.
+	 *
+	 * @param   boolean  $allow  True to allow browser caching.
+	 *
+	 * @return  boolean  True if browser caching should be allowed
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::allowCache() instead
+	 */
+	public static function allowCache($allow = null)
+	{
+		return JFactory::getApplication()->allowCache($allow);
+	}
+
+	/**
+	 * Set a header.
+	 *
+	 * If $replace is true, replaces any headers already defined with that $name.
+	 *
+	 * @param   string   $name     The name of the header to set.
+	 * @param   string   $value    The value of the header to set.
+	 * @param   boolean  $replace  True to replace any existing headers by name.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::setHeader() instead
+	 */
+	public static function setHeader($name, $value, $replace = false)
+	{
+		JFactory::getApplication()->setHeader($name, $value, $replace);
+	}
+
+	/**
+	 * Return array of headers.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::getHeaders() instead
+	 */
+	public static function getHeaders()
+	{
+		return JFactory::getApplication()->getHeaders();
+	}
+
+	/**
+	 * Clear headers.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::clearHeaders() instead
+	 */
+	public static function clearHeaders()
+	{
+		JFactory::getApplication()->clearHeaders();
+	}
+
+	/**
+	 * Send all headers.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::sendHeaders() instead
+	 */
+	public static function sendHeaders()
+	{
+		JFactory::getApplication()->sendHeaders();
+	}
+
+	/**
+	 * Set body content.
+	 *
+	 * If body content already defined, this will replace it.
+	 *
+	 * @param   string  $content  The content to set to the response body.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::setBody() instead
+	 */
+	public static function setBody($content)
+	{
+		JFactory::getApplication()->setBody($content);
+	}
+
+	/**
+	 * Prepend content to the body content
+	 *
+	 * @param   string  $content  The content to prepend to the response body.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::prependBody() instead
+	 */
+	public static function prependBody($content)
+	{
+		JFactory::getApplication()->prependBody($content);
+	}
+
+	/**
+	 * Append content to the body content
+	 *
+	 * @param   string  $content  The content to append to the response body.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::appendBody() instead
+	 */
+	public static function appendBody($content)
+	{
+		JFactory::getApplication()->appendBody($content);
+	}
+
+	/**
+	 * Return the body content
+	 *
+	 * @param   boolean  $toArray  Whether or not to return the body content as an array of strings or as a single string; defaults to false.
+	 *
+	 * @return  string  array
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationWeb::getBody() instead
+	 */
+	public static function getBody($toArray = false)
+	{
+		return JFactory::getApplication()->getBody($toArray);
+	}
+
+	/**
+	 * Sends all headers prior to returning the string
+	 *
+	 * @param   boolean  $compress  If true, compress the data
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use JApplicationCms::toString() instead
+	 */
+	public static function toString($compress = false)
+	{
+		return JFactory::getApplication()->toString($compress);
+	}
+
+	/**
+	 * Compress the data
+	 *
+	 * Checks the accept encoding of the browser and compresses the data before
+	 * sending it to the client.
+	 *
+	 * @param   string  $data  Content to compress for output.
+	 *
+	 * @return  string  compressed data
+	 *
+	 * @note    Replaces _compress method from 1.5
+	 * @since   1.7
+	 * @deprecated  3.2  Use JApplicationWeb::compress() instead
+	 */
+	protected static function compress($data)
+	{
+		$encoding = self::clientEncoding();
+
+		if (!$encoding)
+		{
+			return $data;
+		}
+
+		if (!extension_loaded('zlib') || ini_get('zlib.output_compression'))
+		{
+			return $data;
+		}
+
+		if (headers_sent())
+		{
+			return $data;
+		}
+
+		if (connection_status() !== 0)
+		{
+			return $data;
+		}
+
+		// Ideal level
+		$level = 4;
+
+		/*
+		$size    = strlen($data);
+		$crc     = crc32($data);
+		$gzdata  = "\x1f\x8b\x08\x00\x00\x00\x00\x00";
+		$gzdata .= gzcompress($data, $level);
+		$gzdata  = substr($gzdata, 0, strlen($gzdata) - 4);
+		$gzdata .= pack("V",$crc) . pack("V", $size);
+		*/
+
+		$gzdata = gzencode($data, $level);
+
+		self::setHeader('Content-Encoding', $encoding);
+
+		// Header will be removed at 4.0
+		if (defined('JVERSION') && JFactory::getConfig()->get('MetaVersion', 0))
+		{
+			self::setHeader('X-Content-Encoded-By', 'Joomla! ' . JVERSION);
+		}
+
+		return $gzdata;
+	}
+
+	/**
+	 * Check, whether client supports compressed data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.7
+	 * @note    Replaces _clientEncoding method from 1.5
+	 * @deprecated  3.2  Use JApplicationWebClient instead
+	 */
+	protected static function clientEncoding()
+	{
+		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+		{
+			return false;
+		}
+
+		$encoding = false;
+
+		if (false !== strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'))
+		{
+			$encoding = 'gzip';
+		}
+
+		if (false !== strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'x-gzip'))
+		{
+			$encoding = 'x-gzip';
+		}
+
+		return $encoding;
+	}
+}
diff --git a/core/libraries/legacy/simplecrypt/simplecrypt.php b/core/libraries/legacy/simplecrypt/simplecrypt.php
new file mode 100644
index 00000000..d0a7a299
--- /dev/null
+++ b/core/libraries/legacy/simplecrypt/simplecrypt.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Simplecrypt
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JSimpleCrypt is a very simple encryption algorithm for encrypting/decrypting strings
+ *
+ * @since       1.5
+ * @deprecated  2.5.5 Use JCrypt instead.
+ */
+class JSimplecrypt
+{
+	/**
+	 * Encryption/Decryption Key
+	 *
+	 * @var         JCrypt
+	 * @since       3.0
+	 * @deprecated  3.0  Use JCrypt instead.
+	 */
+	private $_crypt;
+
+	/**
+	 * Object Constructor takes an optional key to be used for encryption/decryption. If no key is given then the
+	 * secret word from the configuration object is used.
+	 *
+	 * @param   string  $privateKey  Optional encryption key
+	 *
+	 * @since       1.5
+	 * @deprecated  2.5.5  Use JCrypt instead.
+	 */
+	public function __construct($privateKey = null)
+	{
+		JLog::add('JSimpleCrypt is deprecated. Use JCrypt instead.', JLog::WARNING, 'deprecated');
+
+		if (empty($privateKey))
+		{
+			$privateKey = md5(JFactory::getConfig()->get('secret'));
+		}
+
+		// Build the JCryptKey object.
+		$key = new JCryptKey('simple', $privateKey, $privateKey);
+
+		// Setup the JCrypt object.
+		$this->_crypt = new JCrypt(new JCryptCipherSimple, $key);
+	}
+
+	/**
+	 * Decrypt a string
+	 *
+	 * @param   string  $s  String to decrypt
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5.5  Use JCrypt instead.
+	 */
+	public function decrypt($s)
+	{
+		return $this->_crypt->decrypt($s);
+	}
+
+	/**
+	 * Encrypt a string
+	 *
+	 * @param   string  $s  String to encrypt
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @deprecated  2.5.5  Use JCrypt instead.
+	 */
+	public function encrypt($s)
+	{
+		return $this->_crypt->encrypt($s);
+	}
+}
diff --git a/core/libraries/legacy/simplepie/factory.php b/core/libraries/legacy/simplepie/factory.php
new file mode 100644
index 00000000..2154ee68
--- /dev/null
+++ b/core/libraries/legacy/simplepie/factory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Simplepie
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('simplepie.simplepie');
+
+/**
+ * Class to maintain a pathway.
+ *
+ * The user's navigated path within the application.
+ *
+ * @since       3.0
+ * @deprecated  3.0 Use JFeed or supply your own methods
+ */
+class JSimplepieFactory
+{
+	/**
+	 * Get a parsed XML Feed Source
+	 *
+	 * @param   string   $url         URL for feed source.
+	 * @param   integer  $cache_time  Time to cache feed for (using internal cache mechanism).
+	 *
+	 * @return  SimplePie|boolean  SimplePie parsed object on success, false on failure.
+	 *
+	 * @since   3.0
+	 * @deprecated  3.0  Use JFeedFactory($url) instead.
+	 */
+	public static function getFeedParser($url, $cache_time = 0)
+	{
+		JLog::add(__METHOD__ . ' is deprecated.   Use JFeedFactory() or supply Simple Pie instead.', JLog::WARNING, 'deprecated');
+
+		$cache = JFactory::getCache('feed_parser', 'callback');
+
+		if ($cache_time > 0)
+		{
+			$cache->setLifeTime($cache_time);
+		}
+
+		$simplepie = new SimplePie(null, null, 0);
+
+		$simplepie->enable_cache(false);
+		$simplepie->set_feed_url($url);
+		$simplepie->force_feed(true);
+
+		$contents = $cache->get(array($simplepie, 'init'), null, false, false);
+
+		if ($contents)
+		{
+			return $simplepie;
+		}
+
+		JLog::add(JText::_('JLIB_UTIL_ERROR_LOADING_FEED_DATA'), JLog::WARNING, 'jerror');
+
+		return false;
+	}
+}
diff --git a/core/libraries/legacy/table/session.php b/core/libraries/legacy/table/session.php
new file mode 100644
index 00000000..ea1dec00
--- /dev/null
+++ b/core/libraries/legacy/table/session.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Table
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Session table
+ *
+ * @since       1.5
+ * @deprecated  3.2  Use SQL queries to interact with the session table.
+ */
+class JTableSession extends JTable
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function __construct(JDatabaseDriver $db)
+	{
+		JLog::add('JTableSession is deprecated. Use SQL queries directly to interact with the session table.', JLog::WARNING, 'deprecated');
+		parent::__construct('#__session', 'session_id', $db);
+
+		$this->guest = 1;
+		$this->username = '';
+	}
+
+	/**
+	 * Insert a session
+	 *
+	 * @param   string   $sessionId  The session id
+	 * @param   integer  $clientId   The id of the client application
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function insert($sessionId, $clientId)
+	{
+		$this->session_id = $sessionId;
+		$this->client_id = $clientId;
+
+		$this->time = time();
+		$ret = $this->_db->insertObject($this->_tbl, $this, 'session_id');
+
+		if (!$ret)
+		{
+			$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_STORE_FAILED', strtolower(get_class($this)), $this->_db->stderr()));
+
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Updates the session
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function update($updateNulls = false)
+	{
+		$this->time = time();
+		$ret = $this->_db->updateObject($this->_tbl, $this, 'session_id', $updateNulls);
+
+		if (!$ret)
+		{
+			$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_STORE_FAILED', strtolower(get_class($this)), $this->_db->stderr()));
+
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Destroys the pre-existing session
+	 *
+	 * @param   integer  $userId     Identifier of the user for this session.
+	 * @param   array    $clientIds  Array of client ids for which session(s) will be destroyed
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function destroy($userId, $clientIds = array())
+	{
+		$clientIds = implode(',', $clientIds);
+
+		$query = $this->_db->getQuery(true)
+			->delete($this->_db->quoteName($this->_tbl))
+			->where($this->_db->quoteName('userid') . ' = ' . $this->_db->quote($userId))
+			->where($this->_db->quoteName('client_id') . ' IN (' . $clientIds . ')');
+		$this->_db->setQuery($query);
+
+		if (!$this->_db->execute())
+		{
+			$this->setError($this->_db->stderr());
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Purge old sessions
+	 *
+	 * @param   integer  $maxLifetime  Session age in seconds
+	 *
+	 * @return  mixed  Resource on success, null on fail
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function purge($maxLifetime = 1440)
+	{
+		$past = time() - $maxLifetime;
+		$query = $this->_db->getQuery(true)
+			->delete($this->_db->quoteName($this->_tbl))
+			->where($this->_db->quoteName('time') . ' < ' . (int) $past);
+		$this->_db->setQuery($query);
+
+		return $this->_db->execute();
+	}
+
+	/**
+	 * Find out if a user has one or more active sessions
+	 *
+	 * @param   integer  $userid  The identifier of the user
+	 *
+	 * @return  boolean  True if a session for this user exists
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function exists($userid)
+	{
+		$query = $this->_db->getQuery(true)
+			->select('COUNT(userid)')
+			->from($this->_db->quoteName($this->_tbl))
+			->where($this->_db->quoteName('userid') . ' = ' . $this->_db->quote($userid));
+		$this->_db->setQuery($query);
+
+		if (!$result = $this->_db->loadResult())
+		{
+			$this->setError($this->_db->stderr());
+
+			return false;
+		}
+
+		return (boolean) $result;
+	}
+
+	/**
+	 * Overloaded delete method
+	 *
+	 * We must override it because of the non-integer primary key
+	 *
+	 * @param   integer  $oid  The object id (optional).
+	 *
+	 * @return  mixed  True if successful otherwise an error message
+	 *
+	 * @since   1.5
+	 * @deprecated  3.2  Use SQL queries to interact with the session table.
+	 */
+	public function delete($oid = null)
+	{
+		$k = $this->_tbl_key;
+
+		if ($oid)
+		{
+			$this->$k = $oid;
+		}
+
+		$query = $this->_db->getQuery(true)
+			->delete($this->_db->quoteName($this->_tbl))
+			->where($this->_db->quoteName($this->_tbl_key) . ' = ' . $this->_db->quote($this->$k));
+		$this->_db->setQuery($query);
+
+		$this->_db->execute();
+
+		return true;
+	}
+}
diff --git a/core/libraries/legacy/utilities/xmlelement.php b/core/libraries/legacy/utilities/xmlelement.php
new file mode 100644
index 00000000..729420d7
--- /dev/null
+++ b/core/libraries/legacy/utilities/xmlelement.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Legacy
+ * @subpackage  Utilities
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JLog::add('JXMLElement is deprecated. Use SimpleXMLElement.', JLog::WARNING, 'deprecated');
+
+/**
+ * Wrapper class for php SimpleXMLElement.
+ *
+ * @since       1.6
+ * @deprecated  3.0  Use SimpleXMLElement instead.
+ */
+class JXMLElement extends SimpleXMLElement
+{
+	/**
+	 * Get the name of the element.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.0  Use SimpleXMLElement::getName() instead.
+	 */
+	public function name()
+	{
+		JLog::add('JXMLElement::name() is deprecated, use SimpleXMLElement::getName() instead.', JLog::WARNING, 'deprecated');
+
+		return (string) $this->getName();
+	}
+
+	/**
+	 * Return a well-formed XML string based on SimpleXML element
+	 *
+	 * @param   boolean  $compressed  Should we use indentation and newlines ?
+	 * @param   string   $indent      Indention character.
+	 * @param   integer  $level       The level within the document which informs the indentation.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.0  Use SimpleXMLElement::asXml() instead.
+	 */
+	public function asFormattedXml($compressed = false, $indent = "\t", $level = 0)
+	{
+		JLog::add('JXMLElement::asFormattedXml() is deprecated, use SimpleXMLElement::asXml() instead.', JLog::WARNING, 'deprecated');
+		$out = '';
+
+		// Start a new line, indent by the number indicated in $level
+		$out .= $compressed ? '' : "\n" . str_repeat($indent, $level);
+
+		// Add a <, and add the name of the tag
+		$out .= '<' . $this->getName();
+
+		// For each attribute, add attr="value"
+		foreach ($this->attributes() as $attr)
+		{
+			$out .= ' ' . $attr->getName() . '="' . htmlspecialchars((string) $attr, ENT_COMPAT, 'UTF-8') . '"';
+		}
+
+		// If there are no children and it contains no data, end it off with a />
+		if (!(string) $this && !count($this->children()))
+		{
+			$out .= ' />';
+		}
+		else
+		{
+			// If there are children
+			if (count($this->children()))
+			{
+				// Close off the start tag
+				$out .= '>';
+
+				$level++;
+
+				// For each child, call the asFormattedXML function (this will ensure that all children are added recursively)
+				foreach ($this->children() as $child)
+				{
+					$out .= $child->asFormattedXml($compressed, $indent, $level);
+				}
+
+				$level--;
+
+				// Add the newline and indentation to go along with the close tag
+				$out .= $compressed ? '' : "\n" . str_repeat($indent, $level);
+			}
+			elseif ((string) $this)
+			{
+				// If there is data, close off the start tag and add the data
+				$out .= '>' . htmlspecialchars((string) $this, ENT_COMPAT, 'UTF-8');
+			}
+
+			// Add the end tag
+			$out .= '</' . $this->getName() . '>';
+		}
+
+		return $out;
+	}
+}
diff --git a/core/libraries/loader.php b/core/libraries/loader.php
new file mode 100644
index 00000000..d8450425
--- /dev/null
+++ b/core/libraries/loader.php
@@ -0,0 +1,846 @@
+<?php
+/**
+ * @package    Joomla.Platform
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Static class to handle loading of libraries.
+ *
+ * @package  Joomla.Platform
+ * @since    11.1
+ */
+abstract class JLoader
+{
+	/**
+	 * Container for already imported library paths.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $classes = array();
+
+	/**
+	 * Container for already imported library paths.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $imported = array();
+
+	/**
+	 * Container for registered library class prefixes and path lookups.
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected static $prefixes = array();
+
+	/**
+	 * Holds proxy classes and the class names the proxy.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $classAliases = array();
+
+	/**
+	 * Holds the inverse lookup for proxy classes and the class names the proxy.
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected static $classAliasesInverse = array();
+
+	/**
+	 * Container for namespace => path map.
+	 *
+	 * @var    array
+	 * @since  12.3
+	 */
+	protected static $namespaces = array('psr0' => array(), 'psr4' => array());
+
+	/**
+	 * Holds a reference for all deprecated aliases (mainly for use by a logging platform).
+	 *
+	 * @var    array
+	 * @since  3.6.3
+	 */
+	protected static $deprecatedAliases = array();
+
+	/**
+	 * Method to discover classes of a given type in a given path.
+	 *
+	 * @param   string   $classPrefix  The class name prefix to use for discovery.
+	 * @param   string   $parentPath   Full path to the parent folder for the classes to discover.
+	 * @param   boolean  $force        True to overwrite the autoload path value for the class if it already exists.
+	 * @param   boolean  $recurse      Recurse through all child directories as well as the parent path.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public static function discover($classPrefix, $parentPath, $force = true, $recurse = false)
+	{
+		try
+		{
+			if ($recurse)
+			{
+				$iterator = new RecursiveIteratorIterator(
+					new RecursiveDirectoryIterator($parentPath),
+					RecursiveIteratorIterator::SELF_FIRST
+				);
+			}
+			else
+			{
+				$iterator = new DirectoryIterator($parentPath);
+			}
+
+			/** @type  $file  DirectoryIterator */
+			foreach ($iterator as $file)
+			{
+				$fileName = $file->getFilename();
+
+				// Only load for php files.
+				if ($file->isFile() && $file->getExtension() === 'php')
+				{
+					// Get the class name and full path for each file.
+					$class = strtolower($classPrefix . preg_replace('#\.php$#', '', $fileName));
+
+					// Register the class with the autoloader if not already registered or the force flag is set.
+					if ($force || empty(self::$classes[$class]))
+					{
+						self::register($class, $file->getPath() . '/' . $fileName);
+					}
+				}
+			}
+		}
+		catch (UnexpectedValueException $e)
+		{
+			// Exception will be thrown if the path is not a directory. Ignore it.
+		}
+	}
+
+	/**
+	 * Method to get the list of registered classes and their respective file paths for the autoloader.
+	 *
+	 * @return  array  The array of class => path values for the autoloader.
+	 *
+	 * @since   11.1
+	 */
+	public static function getClassList()
+	{
+		return self::$classes;
+	}
+
+	/**
+	 * Method to get the list of deprecated class aliases.
+	 *
+	 * @return  array  An associative array with deprecated class alias data.
+	 *
+	 * @since   3.6.3
+	 */
+	public static function getDeprecatedAliases()
+	{
+		return self::$deprecatedAliases;
+	}
+
+	/**
+	 * Method to get the list of registered namespaces.
+	 *
+	 * @param   string  $type  Defines the type of namespace, can be prs0 or psr4.
+	 *
+	 * @return  array  The array of namespace => path values for the autoloader.
+	 *
+	 * @since   12.3
+	 */
+	public static function getNamespaces($type = 'psr0')
+	{
+		if ($type !== 'psr0' && $type !== 'psr4')
+		{
+			throw new InvalidArgumentException('Type needs to be prs0 or psr4!');
+		}
+
+		return self::$namespaces[$type];
+	}
+
+	/**
+	 * Loads a class from specified directories.
+	 *
+	 * @param   string  $key   The class name to look for (dot notation).
+	 * @param   string  $base  Search this directory for the class.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public static function import($key, $base = null)
+	{
+		// Only import the library if not already attempted.
+		if (!isset(self::$imported[$key]))
+		{
+			// Setup some variables.
+			$success = false;
+			$parts   = explode('.', $key);
+			$class   = array_pop($parts);
+			$base    = (!empty($base)) ? $base : __DIR__;
+			$path    = str_replace('.', DIRECTORY_SEPARATOR, $key);
+
+			// Handle special case for helper classes.
+			if ($class === 'helper')
+			{
+				$class = ucfirst(array_pop($parts)) . ucfirst($class);
+			}
+			// Standard class.
+			else
+			{
+				$class = ucfirst($class);
+			}
+
+			// If we are importing a library from the Joomla namespace set the class to autoload.
+			if (strpos($path, 'joomla') === 0)
+			{
+				// Since we are in the Joomla namespace prepend the classname with J.
+				$class = 'J' . $class;
+
+				// Only register the class for autoloading if the file exists.
+				if (is_file($base . '/' . $path . '.php'))
+				{
+					self::$classes[strtolower($class)] = $base . '/' . $path . '.php';
+					$success = true;
+				}
+			}
+			/*
+			 * If we are not importing a library from the Joomla namespace directly include the
+			 * file since we cannot assert the file/folder naming conventions.
+			 */
+			else
+			{
+				// If the file exists attempt to include it.
+				if (is_file($base . '/' . $path . '.php'))
+				{
+					$success = (bool) include_once $base . '/' . $path . '.php';
+				}
+			}
+
+			// Add the import key to the memory cache container.
+			self::$imported[$key] = $success;
+		}
+
+		return self::$imported[$key];
+	}
+
+	/**
+	 * Load the file for a class.
+	 *
+	 * @param   string  $class  The class to be loaded.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function load($class)
+	{
+		// Sanitize class name.
+		$key = strtolower($class);
+
+		// If the class already exists do nothing.
+		if (class_exists($class, false))
+		{
+			return true;
+		}
+
+		// If the class is registered include the file.
+		if (isset(self::$classes[$key]))
+		{
+			$found = (bool) include_once self::$classes[$key];
+
+			if ($found)
+			{
+				self::loadAliasFor($class);
+			}
+
+			// If the class doesn't exists, we probably have a class alias available
+			if (!class_exists($class, false))
+			{
+				// Search the alias class, first none namespaced and then namespaced
+				$original = array_search($class, self::$classAliases) ? : array_search('\\' . $class, self::$classAliases);
+
+				// When we have an original and the class exists an alias should be created
+				if ($original && class_exists($original, false))
+				{
+					class_alias($original, $class);
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Directly register a class to the autoload list.
+	 *
+	 * @param   string   $class  The class name to register.
+	 * @param   string   $path   Full path to the file that holds the class to register.
+	 * @param   boolean  $force  True to overwrite the autoload path value for the class if it already exists.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public static function register($class, $path, $force = true)
+	{
+		// When an alias exists, register it as well
+		if (key_exists(strtolower($class), self::$classAliases))
+		{
+			self::register(self::stripFirstBackslash(self::$classAliases[strtolower($class)]), $path, $force);
+		}
+
+		// Sanitize class name.
+		$class = strtolower($class);
+
+		// Only attempt to register the class if the name and file exist.
+		if (!empty($class) && is_file($path))
+		{
+			// Register the class with the autoloader if not already registered or the force flag is set.
+			if ($force || empty(self::$classes[$class]))
+			{
+				self::$classes[$class] = $path;
+			}
+		}
+	}
+
+	/**
+	 * Register a class prefix with lookup path.  This will allow developers to register library
+	 * packages with different class prefixes to the system autoloader.  More than one lookup path
+	 * may be registered for the same class prefix, but if this method is called with the reset flag
+	 * set to true then any registered lookups for the given prefix will be overwritten with the current
+	 * lookup path. When loaded, prefix paths are searched in a "last in, first out" order.
+	 *
+	 * @param   string   $prefix   The class prefix to register.
+	 * @param   string   $path     Absolute file path to the library root where classes with the given prefix can be found.
+	 * @param   boolean  $reset    True to reset the prefix with only the given lookup path.
+	 * @param   boolean  $prepend  If true, push the path to the beginning of the prefix lookup paths array.
+	 *
+	 * @return  void
+	 *
+	 * @throws  RuntimeException
+	 *
+	 * @since   12.1
+	 */
+	public static function registerPrefix($prefix, $path, $reset = false, $prepend = false)
+	{
+		// Verify the library path exists.
+		if (!file_exists($path))
+		{
+			$path = (str_replace(JPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(JPATH_ROOT, '', $path);
+
+			throw new RuntimeException('Library path ' . $path . ' cannot be found.', 500);
+		}
+
+		// If the prefix is not yet registered or we have an explicit reset flag then set set the path.
+		if ($reset || !isset(self::$prefixes[$prefix]))
+		{
+			self::$prefixes[$prefix] = array($path);
+		}
+		// Otherwise we want to simply add the path to the prefix.
+		else
+		{
+			if ($prepend)
+			{
+				array_unshift(self::$prefixes[$prefix], $path);
+			}
+			else
+			{
+				self::$prefixes[$prefix][] = $path;
+			}
+		}
+	}
+
+	/**
+	 * Offers the ability for "just in time" usage of `class_alias()`.
+	 * You cannot overwrite an existing alias.
+	 *
+	 * @param   string          $alias     The alias name to register.
+	 * @param   string          $original  The original class to alias.
+	 * @param   string|boolean  $version   The version in which the alias will no longer be present.
+	 *
+	 * @return  boolean  True if registration was successful. False if the alias already exists.
+	 *
+	 * @since   3.2
+	 */
+	public static function registerAlias($alias, $original, $version = false)
+	{
+		// PHP is case insensitive so support all kind of alias combination
+		$lowercasedAlias = strtolower($alias);
+
+		if (!isset(self::$classAliases[$lowercasedAlias]))
+		{
+			self::$classAliases[$lowercasedAlias] = $original;
+
+			$original = self::stripFirstBackslash($original);
+
+			if (!isset(self::$classAliasesInverse[$original]))
+			{
+				self::$classAliasesInverse[$original] = array($lowercasedAlias);
+			}
+			else
+			{
+				self::$classAliasesInverse[$original][] = $lowercasedAlias;
+			}
+
+			// If given a version, log this alias as deprecated
+			if ($version)
+			{
+				self::$deprecatedAliases[] = array('old' => $alias, 'new' => $original, 'version' => $version);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Register a namespace to the autoloader. When loaded, namespace paths are searched in a "last in, first out" order.
+	 *
+	 * @param   string   $namespace  A case sensitive Namespace to register.
+	 * @param   string   $path       A case sensitive absolute file path to the library root where classes of the given namespace can be found.
+	 * @param   boolean  $reset      True to reset the namespace with only the given lookup path.
+	 * @param   boolean  $prepend    If true, push the path to the beginning of the namespace lookup paths array.
+	 * @param   string   $type       Defines the type of namespace, can be prs0 or psr4.
+	 *
+	 * @return  void
+	 *
+	 * @throws  RuntimeException
+	 *
+	 * @note    The default argument of $type will be changed in J4 to be 'psr4'
+	 * @since   12.3
+	 */
+	public static function registerNamespace($namespace, $path, $reset = false, $prepend = false, $type = 'psr0')
+	{
+		if ($type !== 'psr0' && $type !== 'psr4')
+		{
+			throw new InvalidArgumentException('Type needs to be prs0 or psr4!');
+		}
+
+		// Verify the library path exists.
+		if (!file_exists($path))
+		{
+			$path = (str_replace(JPATH_ROOT, '', $path) == $path) ? basename($path) : str_replace(JPATH_ROOT, '', $path);
+
+			throw new RuntimeException('Library path ' . $path . ' cannot be found.', 500);
+		}
+
+		// Trim leading and trailing backslashes from namespace, allowing "\Parent\Child", "Parent\Child\" and "\Parent\Child\" to be treated the same way.
+		$namespace = trim($namespace, '\\');
+
+		// If the namespace is not yet registered or we have an explicit reset flag then set the path.
+		if ($reset || !isset(self::$namespaces[$type][$namespace]))
+		{
+			self::$namespaces[$type][$namespace] = array($path);
+		}
+
+		// Otherwise we want to simply add the path to the namespace.
+		else
+		{
+			if ($prepend)
+			{
+				array_unshift(self::$namespaces[$type][$namespace], $path);
+			}
+			else
+			{
+				self::$namespaces[$type][$namespace][] = $path;
+			}
+		}
+	}
+
+	/**
+	 * Method to setup the autoloaders for the Joomla Platform.
+	 * Since the SPL autoloaders are called in a queue we will add our explicit
+	 * class-registration based loader first, then fall back on the autoloader based on conventions.
+	 * This will allow people to register a class in a specific location and override platform libraries
+	 * as was previously possible.
+	 *
+	 * @param   boolean  $enablePsr       True to enable autoloading based on PSR-0.
+	 * @param   boolean  $enablePrefixes  True to enable prefix based class loading (needed to auto load the Joomla core).
+	 * @param   boolean  $enableClasses   True to enable class map based class loading (needed to auto load the Joomla core).
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public static function setup($enablePsr = true, $enablePrefixes = true, $enableClasses = true)
+	{
+		if ($enableClasses)
+		{
+			// Register the class map based autoloader.
+			spl_autoload_register(array('JLoader', 'load'));
+		}
+
+		if ($enablePrefixes)
+		{
+			// Register the J prefix and base path for Joomla platform libraries.
+			self::registerPrefix('J', JPATH_PLATFORM . '/joomla');
+
+			// Register the prefix autoloader.
+			spl_autoload_register(array('JLoader', '_autoload'));
+		}
+
+		if ($enablePsr)
+		{
+			// Register the PSR based autoloader.
+			spl_autoload_register(array('JLoader', 'loadByPsr0'));
+			spl_autoload_register(array('JLoader', 'loadByPsr4'));
+			spl_autoload_register(array('JLoader', 'loadByAlias'));
+		}
+	}
+
+	/**
+	 * Method to autoload classes that are namespaced to the PSR-4 standard.
+	 *
+	 * @param   string  $class  The fully qualified class name to autoload.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function loadByPsr4($class)
+	{
+		$class = self::stripFirstBackslash($class);
+
+		// Find the location of the last NS separator.
+		$pos = strrpos($class, '\\');
+
+		// If one is found, we're dealing with a NS'd class.
+		if ($pos !== false)
+		{
+			$classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
+			$className = substr($class, $pos + 1);
+		}
+		// If not, no need to parse path.
+		else
+		{
+			$classPath = null;
+			$className = $class;
+		}
+
+		$classPath .= $className . '.php';
+
+		// Loop through registered namespaces until we find a match.
+		foreach (self::$namespaces['psr4'] as $ns => $paths)
+		{
+			if (strpos($class, "{$ns}\\") === 0)
+			{
+				$nsPath = trim(str_replace('\\', DIRECTORY_SEPARATOR, $ns), DIRECTORY_SEPARATOR);
+
+				// Loop through paths registered to this namespace until we find a match.
+				foreach ($paths as $path)
+				{
+					$classFilePath = realpath($path . DIRECTORY_SEPARATOR . substr_replace($classPath, '', 0, strlen($nsPath) + 1));
+
+					// We do not allow files outside the namespace root to be loaded
+					if (strpos($classFilePath, realpath($path)) !== 0)
+					{
+						continue;
+					}
+
+					// We check for class_exists to handle case-sensitive file systems
+					if (file_exists($classFilePath) && !class_exists($class, false))
+					{
+						$found = (bool) include_once $classFilePath;
+
+						if ($found)
+						{
+							self::loadAliasFor($class);
+						}
+
+						return $found;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to autoload classes that are namespaced to the PSR-0 standard.
+	 *
+	 * @param   string  $class  The fully qualified class name to autoload.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   13.1
+	 *
+	 * @deprecated 4.0 this method will be removed
+	 */
+	public static function loadByPsr0($class)
+	{
+		$class = self::stripFirstBackslash($class);
+
+		// Find the location of the last NS separator.
+		$pos = strrpos($class, '\\');
+
+		// If one is found, we're dealing with a NS'd class.
+		if ($pos !== false)
+		{
+			$classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
+			$className = substr($class, $pos + 1);
+		}
+		// If not, no need to parse path.
+		else
+		{
+			$classPath = null;
+			$className = $class;
+		}
+
+		$classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+
+		// Loop through registered namespaces until we find a match.
+		foreach (self::$namespaces['psr0'] as $ns => $paths)
+		{
+			if (strpos($class, $ns) === 0)
+			{
+				// Loop through paths registered to this namespace until we find a match.
+				foreach ($paths as $path)
+				{
+					$classFilePath = realpath($path . DIRECTORY_SEPARATOR . $classPath);
+
+					// We do not allow files outside the namespace root to be loaded
+					if (strpos($classFilePath, realpath($path)) !== 0)
+					{
+						continue;
+					}
+
+					// We check for class_exists to handle case-sensitive file systems
+					if (file_exists($classFilePath) && !class_exists($class, false))
+					{
+						$found = (bool) include_once $classFilePath;
+
+						if ($found)
+						{
+							self::loadAliasFor($class);
+						}
+
+						return $found;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to autoload classes that have been aliased using the registerAlias method.
+	 *
+	 * @param   string  $class  The fully qualified class name to autoload.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public static function loadByAlias($class)
+	{
+		$class = strtolower(self::stripFirstBackslash($class));
+
+		if (isset(self::$classAliases[$class]))
+		{
+			// Force auto-load of the regular class
+			class_exists(self::$classAliases[$class], true);
+
+			// Normally this shouldn't execute as the autoloader will execute applyAliasFor when the regular class is
+			// auto-loaded above.
+			if (!class_exists($class, false) && !interface_exists($class, false))
+			{
+				class_alias(self::$classAliases[$class], $class);
+			}
+		}
+	}
+
+	/**
+	 * Applies a class alias for an already loaded class, if a class alias was created for it.
+	 *
+	 * @param   string  $class  We'll look for and register aliases for this (real) class name
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public static function applyAliasFor($class)
+	{
+		$class = self::stripFirstBackslash($class);
+
+		if (isset(self::$classAliasesInverse[$class]))
+		{
+			foreach (self::$classAliasesInverse[$class] as $alias)
+			{
+				class_alias($class, $alias);
+			}
+		}
+	}
+
+	/**
+	 * Autoload a class based on name.
+	 *
+	 * @param   string  $class  The class to be loaded.
+	 *
+	 * @return  boolean  True if the class was loaded, false otherwise.
+	 *
+	 * @since   11.3
+	 */
+	public static function _autoload($class)
+	{
+		foreach (self::$prefixes as $prefix => $lookup)
+		{
+			$chr = strlen($prefix) < strlen($class) ? $class[strlen($prefix)] : 0;
+
+			if (strpos($class, $prefix) === 0 && ($chr === strtoupper($chr)))
+			{
+				return self::_load(substr($class, strlen($prefix)), $lookup);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Load a class based on name and lookup array.
+	 *
+	 * @param   string  $class   The class to be loaded (without prefix).
+	 * @param   array   $lookup  The array of base paths to use for finding the class file.
+	 *
+	 * @return  boolean  True if the class was loaded, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	private static function _load($class, $lookup)
+	{
+		// Split the class name into parts separated by camelCase.
+		$parts = preg_split('/(?<=[a-z0-9])(?=[A-Z])/x', $class);
+		$partsCount = count($parts);
+
+		foreach ($lookup as $base)
+		{
+			// Generate the path based on the class name parts.
+			$path = realpath($base . '/' . implode('/', array_map('strtolower', $parts)) . '.php');
+
+			// Load the file if it exists and is in the lookup path.
+			if (strpos($path, realpath($base)) === 0 && file_exists($path))
+			{
+				$found = (bool) include_once $path;
+
+				if ($found)
+				{
+					self::loadAliasFor($class);
+				}
+
+				return $found;
+			}
+
+			// Backwards compatibility patch
+
+			// If there is only one part we want to duplicate that part for generating the path.
+			if ($partsCount === 1)
+			{
+				// Generate the path based on the class name parts.
+				$path = realpath($base . '/' . implode('/', array_map('strtolower', array($parts[0], $parts[0]))) . '.php');
+
+				// Load the file if it exists and is in the lookup path.
+				if (strpos($path, realpath($base)) === 0 && file_exists($path))
+				{
+					$found = (bool) include_once $path;
+
+					if ($found)
+					{
+						self::loadAliasFor($class);
+					}
+
+					return $found;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Loads the aliases for the given class.
+	 *
+	 * @param   string  $class  The class.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	private static function loadAliasFor($class)
+	{
+		if (!key_exists($class, self::$classAliasesInverse))
+		{
+			return;
+		}
+
+		foreach (self::$classAliasesInverse[$class] as $alias)
+		{
+			// Force auto-load of the alias class
+			class_exists($alias, true);
+		}
+	}
+
+	/**
+	 * Strips the first backslash from the given class if present.
+	 *
+	 * @param   string  $class  The class to strip the first prefix from.
+	 *
+	 * @return  string  The striped class name.
+	 *
+	 * @since   3.8.0
+	 */
+	private static function stripFirstBackslash($class)
+	{
+		return $class && $class[0] === '\\' ? substr($class, 1) : $class;
+	}
+}
+
+// Check if jexit is defined first (our unit tests mock this)
+if (!function_exists('jexit'))
+{
+	/**
+	 * Global application exit.
+	 *
+	 * This function provides a single exit point for the platform.
+	 *
+	 * @param   mixed  $message  Exit code or string. Defaults to zero.
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   11.1
+	 */
+	function jexit($message = 0)
+	{
+		exit($message);
+	}
+}
+
+/**
+ * Intelligent file importer.
+ *
+ * @param   string  $path  A dot syntax path.
+ * @param   string  $base  Search this directory for the class.
+ *
+ * @return  boolean  True on success.
+ *
+ * @since   11.1
+ */
+function jimport($path, $base = null)
+{
+	return JLoader::import($path, $base);
+}
diff --git a/core/libraries/php-encryption/Crypto.php b/core/libraries/php-encryption/Crypto.php
new file mode 100644
index 00000000..1d7586f4
--- /dev/null
+++ b/core/libraries/php-encryption/Crypto.php
@@ -0,0 +1,676 @@
+<?php
+
+/*
+ * PHP Encryption Library
+ * Copyright (c) 2014, Taylor Hornby
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Web: https://defuse.ca/secure-php-encryption.htm
+ * GitHub: https://github.com/defuse/php-encryption 
+ *
+ * WARNING: This encryption library is not a silver bullet. It only provides
+ * symmetric encryption given a uniformly random key. This means you MUST NOT
+ * use an ASCII string like a password as the key parameter, it MUST be
+ * a uniformly random key generated by CreateNewRandomKey(). If you want to
+ * encrypt something with a password, apply a password key derivation function
+ * like PBKDF2 or scrypt with a random salt to generate a key.
+ *
+ * WARNING: Error handling is very important, especially for crypto code! 
+ *
+ * How to use this code:
+ *
+ *     Generating a Key
+ *     ----------------
+ *       try {
+ *           $key = Crypto::CreateNewRandomKey();
+ *           // WARNING: Do NOT encode $key with bin2hex() or base64_encode(),
+ *           // they may leak the key to the attacker through side channels.
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely create a key');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely create a key');
+ *       }
+ *
+ *     Encrypting a Message
+ *     --------------------
+ *       $message = "ATTACK AT DAWN";
+ *       try {
+ *           $ciphertext = Crypto::Encrypt($message, $key);
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely perform encryption');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely perform decryption');
+ *       }
+ *
+ *     Decrypting a Message
+ *     --------------------
+ *       try {
+ *           $decrypted = Crypto::Decrypt($ciphertext, $key);
+ *       } catch (InvalidCiphertextException $ex) { // VERY IMPORTANT
+ *           // Either:
+ *           //   1. The ciphertext was modified by the attacker,
+ *           //   2. The key is wrong, or
+ *           //   3. $ciphertext is not a valid ciphertext or was corrupted.
+ *           // Assume the worst.
+ *           die('DANGER! DANGER! The ciphertext has been tampered with!');
+ *       } catch (CryptoTestFailedException $ex) {
+ *           die('Cannot safely perform encryption');
+ *       } catch (CannotPerformOperationException $ex) {
+ *           die('Cannot safely perform decryption');
+ *       }
+ */
+
+/* 
+ * Raised by Decrypt() when one of the following conditions are met:
+ *  - The key is wrong.
+ *  - The ciphertext is invalid or not in the correct format.
+ *  - The attacker modified the ciphertext.
+ */
+class InvalidCiphertextException extends Exception {}
+/* If you see these, it means it is NOT SAFE to do encryption on your system. */
+class CannotPerformOperationException extends Exception {}
+class CryptoTestFailedException extends Exception {}
+
+class Crypto
+{
+    // Ciphertext format: [____HMAC____][____IV____][____CIPHERTEXT____].
+
+    /* Do not change these constants! */
+    const CIPHER = MCRYPT_RIJNDAEL_128;
+    const KEY_BYTE_SIZE = 16;
+    const CIPHER_MODE = 'cbc';
+    const HASH_FUNCTION = 'sha256';
+    const MAC_BYTE_SIZE = 32;
+    const ENCRYPTION_INFO = 'DefusePHP|KeyForEncryption';
+    const AUTHENTICATION_INFO = 'DefusePHP|KeyForAuthentication';
+
+    /*
+     * Use this to generate a random encryption key.
+     */
+    public static function CreateNewRandomKey()
+    {
+        Crypto::RuntimeTest();
+        return self::SecureRandom(self::KEY_BYTE_SIZE);
+    }
+
+    /*
+     * Encrypts a message.
+     * $plaintext is the message to encrypt.
+     * $key is the encryption key, a value generated by CreateNewRandomKey().
+     * You MUST catch exceptions thrown by this function. See docs above.
+     */
+    public static function Encrypt($plaintext, $key)
+    {
+        Crypto::RuntimeTest();
+
+        if (self::our_strlen($key) !== self::KEY_BYTE_SIZE)
+        {
+            throw new CannotPerformOperationException("Bad key.");
+        }
+
+        // Generate a sub-key for encryption.
+        $keysize = self::KEY_BYTE_SIZE;
+        $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+        // Generate a random initialization vector.
+        self::EnsureFunctionExists("mcrypt_get_iv_size");
+        $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+        if ($ivsize === FALSE || $ivsize <= 0) {
+            throw new CannotPerformOperationException();
+        }
+        $iv = self::SecureRandom($ivsize);
+
+        $ciphertext = $iv . self::PlainEncrypt($plaintext, $ekey, $iv);
+
+        // Generate a sub-key for authentication and apply the HMAC.
+        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+        $auth = hash_hmac(self::HASH_FUNCTION, $ciphertext, $akey, true);
+        $ciphertext = $auth . $ciphertext;
+
+        return $ciphertext;
+    }
+
+    /*
+     * Decrypts a ciphertext.
+     * $ciphertext is the ciphertext to decrypt.
+     * $key is the key that the ciphertext was encrypted with.
+     * You MUST catch exceptions thrown by this function. See docs above.
+     */
+    public static function Decrypt($ciphertext, $key)
+    {
+        Crypto::RuntimeTest();
+
+        // Extract the HMAC from the front of the ciphertext.
+        if (self::our_strlen($ciphertext) <= self::MAC_BYTE_SIZE) {
+            throw new InvalidCiphertextException();
+        }
+        $hmac = self::our_substr($ciphertext, 0, self::MAC_BYTE_SIZE);
+        if ($hmac === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+        $ciphertext = self::our_substr($ciphertext, self::MAC_BYTE_SIZE);
+        if ($ciphertext === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Regenerate the same authentication sub-key.
+        $akey = self::HKDF(self::HASH_FUNCTION, $key, self::KEY_BYTE_SIZE, self::AUTHENTICATION_INFO);
+
+        if (self::VerifyHMAC($hmac, $ciphertext, $akey))
+        {
+            // Regenerate the same encryption sub-key.
+            $keysize = self::KEY_BYTE_SIZE;
+            $ekey = self::HKDF(self::HASH_FUNCTION, $key, $keysize, self::ENCRYPTION_INFO);
+
+            // Extract the initialization vector from the ciphertext.
+            self::EnsureFunctionExists("mcrypt_get_iv_size");
+            $ivsize = mcrypt_get_iv_size(self::CIPHER, self::CIPHER_MODE);
+            if ($ivsize === FALSE || $ivsize <= 0) {
+                throw new CannotPerformOperationException();
+            }
+            if (self::our_strlen($ciphertext) <= $ivsize) {
+                throw new InvalidCiphertextException();
+            }
+            $iv = self::our_substr($ciphertext, 0, $ivsize);
+            if ($iv === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            $ciphertext = self::our_substr($ciphertext, $ivsize);
+            if ($ciphertext === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            
+            $plaintext = self::PlainDecrypt($ciphertext, $ekey, $iv);
+
+            return $plaintext;
+        }
+        else
+        {
+            /*
+             * We throw an exception instead of returning FALSE because we want
+             * a script that doesn't handle this condition to CRASH, instead
+             * of thinking the ciphertext decrypted to the value FALSE.
+             */
+             throw new InvalidCiphertextException();
+        }
+    }
+
+    /*
+     * Runs tests.
+     * Raises CannotPerformOperationException or CryptoTestFailedException if
+     * one of the tests fail. If any tests fails, your system is not capable of
+     * performing encryption, so make sure you fail safe in that case.
+     */
+    public static function RuntimeTest()
+    {
+        // 0: Tests haven't been run yet.
+        // 1: Tests have passed.
+        // 2: Tests are running right now.
+        // 3: Tests have failed.
+        static $test_state = 0;
+
+        if ($test_state === 1 || $test_state === 2) {
+            return;
+        }
+
+        try {
+            $test_state = 2;
+            self::AESTestVector();
+            self::HMACTestVector();
+            self::HKDFTestVector();
+
+            self::TestEncryptDecrypt();
+            if (self::our_strlen(Crypto::CreateNewRandomKey()) != self::KEY_BYTE_SIZE) {
+                throw new CryptoTestFailedException();
+            }
+
+            if (self::ENCRYPTION_INFO == self::AUTHENTICATION_INFO) {
+                throw new CryptoTestFailedException();
+            }
+        } catch (CryptoTestFailedException $ex) {
+            // Do this, otherwise it will stay in the "tests are running" state.
+            $test_state = 3;
+            throw $ex;
+        }
+
+        // Change this to '0' make the tests always re-run (for benchmarking).
+        $test_state = 1;
+    }
+
+    /*
+     * Never call this method directly!
+     */
+    private static function PlainEncrypt($plaintext, $key, $iv)
+    {
+        self::EnsureFunctionExists("mcrypt_module_open");
+        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+        if ($crypt === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Pad the plaintext to a multiple of the block size.
+        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+        $block = mcrypt_enc_get_block_size($crypt);
+        $pad = $block - (self::our_strlen($plaintext) % $block);
+        $plaintext .= str_repeat(chr($pad), $pad);
+
+        self::EnsureFunctionExists("mcrypt_generic_init");
+        $ret = mcrypt_generic_init($crypt, $key, $iv);
+        if ($ret !== 0) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_generic");
+        $ciphertext = mcrypt_generic($crypt, $plaintext);
+        self::EnsureFunctionExists("mcrypt_generic_deinit");
+        $ret = mcrypt_generic_deinit($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_module_close");
+        $ret = mcrypt_module_close($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+
+        return $ciphertext;
+    }
+
+    /*
+     * Never call this method directly!
+     */
+    private static function PlainDecrypt($ciphertext, $key, $iv)
+    {
+        self::EnsureFunctionExists("mcrypt_module_open");
+        $crypt = mcrypt_module_open(self::CIPHER, "", self::CIPHER_MODE, "");
+        if ($crypt === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        self::EnsureFunctionExists("mcrypt_enc_get_block_size");
+        $block = mcrypt_enc_get_block_size($crypt);
+        self::EnsureFunctionExists("mcrypt_generic_init");
+        $ret = mcrypt_generic_init($crypt, $key, $iv);
+        if ($ret !== 0) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mdecrypt_generic");
+        $plaintext = mdecrypt_generic($crypt, $ciphertext);
+        self::EnsureFunctionExists("mcrypt_generic_deinit");
+        $ret = mcrypt_generic_deinit($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+        self::EnsureFunctionExists("mcrypt_module_close");
+        $ret = mcrypt_module_close($crypt);
+        if ($ret !== TRUE) {
+            throw new CannotPerformOperationException();
+        }
+
+        // Remove the padding.
+        $pad = ord($plaintext[self::our_strlen($plaintext) - 1]);
+        if ($pad <= 0 || $pad > $block) {
+            throw new CannotPerformOperationException();
+        }
+        $plaintext = self::our_substr($plaintext, 0, self::our_strlen($plaintext) - $pad);
+        if ($plaintext === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+
+        return $plaintext;
+    }
+
+    /*
+     * Returns a random binary string of length $octets bytes.
+     */
+    private static function SecureRandom($octets)
+    {
+        self::EnsureFunctionExists("mcrypt_create_iv");
+        $random = mcrypt_create_iv($octets, MCRYPT_DEV_URANDOM);
+        if ($random === FALSE) {
+            throw new CannotPerformOperationException();
+        } else {
+            return $random;
+        }
+    }
+
+    /*
+     * Use HKDF to derive multiple keys from one.
+     * http://tools.ietf.org/html/rfc5869
+     */
+    private static function HKDF($hash, $ikm, $length, $info = '', $salt = NULL)
+    {
+        // Find the correct digest length as quickly as we can.
+        $digest_length = self::MAC_BYTE_SIZE;
+        if ($hash != self::HASH_FUNCTION) {
+            $digest_length = self::our_strlen(hash_hmac($hash, '', '', true));
+        }
+
+        // Sanity-check the desired output length.
+        if (empty($length) || !is_int($length) ||
+            $length < 0 || $length > 255 * $digest_length) {
+            throw new CannotPerformOperationException();
+        }
+
+        // "if [salt] not provided, is set to a string of HashLen zeroes."
+        if (is_null($salt)) {
+            $salt = str_repeat("\x00", $digest_length);
+        }
+
+        // HKDF-Extract:
+        // PRK = HMAC-Hash(salt, IKM)
+        // The salt is the HMAC key.
+        $prk = hash_hmac($hash, $ikm, $salt, true);
+
+        // HKDF-Expand:
+
+        // This check is useless, but it serves as a reminder to the spec.
+        if (self::our_strlen($prk) < $digest_length) {
+            throw new CannotPerformOperationException();
+        }
+
+        // T(0) = ''
+        $t = '';
+        $last_block = '';
+        for ($block_index = 1; self::our_strlen($t) < $length; $block_index++) {
+            // T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
+            $last_block = hash_hmac(
+                $hash,
+                $last_block . $info . chr($block_index),
+                $prk,
+                true
+            );
+            // T = T(1) | T(2) | T(3) | ... | T(N)
+            $t .= $last_block;
+        }
+
+        // ORM = first L octets of T
+        $orm = self::our_substr($t, 0, $length);
+        if ($orm === FALSE) {
+            throw new CannotPerformOperationException();
+        }
+        return $orm;
+    }
+
+    private static function VerifyHMAC($correct_hmac, $message, $key)
+    {
+        $message_hmac = hash_hmac(self::HASH_FUNCTION, $message, $key, true);
+
+        // We can't just compare the strings with '==', since it would make
+        // timing attacks possible. We could use the XOR-OR constant-time
+        // comparison algorithm, but I'm not sure if that's good enough way up
+        // here in an interpreted language. So we use the method of HMACing the 
+        // strings we want to compare with a random key, then comparing those.
+
+        // NOTE: This leaks information when the strings are not the same
+        // length, but they should always be the same length here. Enforce it:
+        if (self::our_strlen($correct_hmac) !== self::our_strlen($message_hmac)) {
+            throw new CannotPerformOperationException();
+        }
+
+        $blind = self::CreateNewRandomKey();
+        $message_compare = hash_hmac(self::HASH_FUNCTION, $message_hmac, $blind);
+        $correct_compare = hash_hmac(self::HASH_FUNCTION, $correct_hmac, $blind);
+        return $correct_compare === $message_compare;
+    }
+
+    private static function TestEncryptDecrypt()
+    {
+        $key = Crypto::CreateNewRandomKey();
+        $data = "EnCrYpT EvErYThInG\x00\x00";
+
+        // Make sure encrypting then decrypting doesn't change the message.
+        $ciphertext = Crypto::Encrypt($data, $key);
+        try {
+            $decrypted = Crypto::Decrypt($ciphertext, $key);
+        } catch (InvalidCiphertextException $ex) {
+            // It's important to catch this and change it into a 
+            // CryptoTestFailedException, otherwise a test failure could trick
+            // the user into thinking it's just an invalid ciphertext!
+            throw new CryptoTestFailedException();
+        }
+        if($decrypted !== $data)
+        {
+            throw new CryptoTestFailedException();
+        }
+
+        // Modifying the ciphertext: Appending a string.
+        try {
+            Crypto::Decrypt($ciphertext . "a", $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Modifying the ciphertext: Changing an IV byte.
+        try {
+            $ciphertext[0] = chr((ord($ciphertext[0]) + 1) % 256);
+            Crypto::Decrypt($ciphertext, $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Decrypting with the wrong key.
+        $key = Crypto::CreateNewRandomKey();
+        $data = "abcdef";
+        $ciphertext = Crypto::Encrypt($data, $key);
+        $wrong_key = Crypto::CreateNewRandomKey();
+        try {
+            Crypto::Decrypt($ciphertext, $wrong_key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+
+        // Ciphertext too small (shorter than HMAC).
+        $key = Crypto::CreateNewRandomKey();
+        $ciphertext = str_repeat("A", self::MAC_BYTE_SIZE - 1);
+        try {
+            Crypto::Decrypt($ciphertext, $key);
+            throw new CryptoTestFailedException();
+        } catch (InvalidCiphertextException $e) { /* expected */ }
+    }
+
+    private static function HKDFTestVector()
+    {
+        // HKDF test vectors from RFC 5869
+
+        // Test Case 1
+        $ikm = str_repeat("\x0b", 22);
+        $salt = self::hexToBytes("000102030405060708090a0b0c");
+        $info = self::hexToBytes("f0f1f2f3f4f5f6f7f8f9");
+        $length = 42;
+        $okm = self::hexToBytes(
+            "3cb25f25faacd57a90434f64d0362f2a" .
+            "2d2d0a90cf1a5a4c5db02d56ecc4c5bf" .
+            "34007208d5b887185865"
+        );
+        $computed_okm = self::HKDF("sha256", $ikm, $length, $info, $salt);
+        if ($computed_okm !== $okm) {
+            throw new CryptoTestFailedException();
+        }
+
+        // Test Case 7
+        $ikm = str_repeat("\x0c", 22);
+        $length = 42;
+        $okm = self::hexToBytes(
+            "2c91117204d745f3500d636a62f64f0a" .
+            "b3bae548aa53d423b0d1f27ebba6f5e5" .
+            "673a081d70cce7acfc48"
+        );
+        $computed_okm = self::HKDF("sha1", $ikm, $length);
+        if ($computed_okm !== $okm) {
+            throw new CryptoTestFailedException();
+        }
+
+    }
+
+    private static function HMACTestVector()
+    {
+        // HMAC test vector From RFC 4231 (Test Case 1)
+        $key = str_repeat("\x0b", 20);
+        $data = "Hi There";
+        $correct = "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7";
+        if (hash_hmac(self::HASH_FUNCTION, $data, $key) != $correct) {
+            throw new CryptoTestFailedException();
+        }
+    }
+
+    private static function AESTestVector()
+    {
+        // AES CBC mode test vector from NIST SP 800-38A
+        $key = self::hexToBytes("2b7e151628aed2a6abf7158809cf4f3c");
+        $iv = self::hexToBytes("000102030405060708090a0b0c0d0e0f");
+        $plaintext = self::hexToBytes(
+            "6bc1bee22e409f96e93d7e117393172a" . 
+            "ae2d8a571e03ac9c9eb76fac45af8e51" .
+            "30c81c46a35ce411e5fbc1191a0a52ef" .
+            "f69f2445df4f9b17ad2b417be66c3710"
+        );
+        $ciphertext = self::hexToBytes(
+            "7649abac8119b246cee98e9b12e9197d" .
+            "5086cb9b507219ee95db113a917678b2" .
+            "73bed6b8e3c1743b7116e69e22229516" .
+            "3ff1caa1681fac09120eca307586e1a7" .
+            /* Block due to padding. Not from NIST test vector. 
+                Padding Block: 10101010101010101010101010101010
+                Ciphertext:    3ff1caa1681fac09120eca307586e1a7
+                           (+) 2fe1dab1780fbc19021eda206596f1b7 
+                           AES 8cb82807230e1321d3fae00d18cc2012
+             
+             */
+            "8cb82807230e1321d3fae00d18cc2012"
+        );
+
+        $computed_ciphertext = self::PlainEncrypt($plaintext, $key, $iv);
+        if ($computed_ciphertext !== $ciphertext) {
+            throw new CryptoTestFailedException();
+        }
+
+        $computed_plaintext = self::PlainDecrypt($ciphertext, $key, $iv);
+        if ($computed_plaintext !== $plaintext) {
+            throw new CryptoTestFailedException();
+        }
+    }
+
+    /* WARNING: Do not call this function on secrets. It creates side channels. */
+    private static function hexToBytes($hex_string)
+    {
+        return pack("H*", $hex_string);
+    }
+
+    private static function EnsureFunctionExists($name)
+    {
+        if (!function_exists($name)) {
+            throw new CannotPerformOperationException();
+        }
+    }
+
+    /*
+     * We need these strlen() and substr() functions because when
+     * 'mbstring.func_overload' is set in php.ini, the standard strlen() and
+     * substr() are replaced by mb_strlen() and mb_substr().
+     */
+
+    private static function our_strlen($str)
+    {
+        if (function_exists('mb_strlen')) {
+            $length = mb_strlen($str, '8bit');
+            if ($length === FALSE) {
+                throw new CannotPerformOperationException();
+            }
+            return $length;
+        } else {
+            return strlen($str);
+        }
+    }
+
+    private static function our_substr($str, $start, $length = NULL)
+    {
+        if (function_exists('mb_substr'))
+        {
+            // mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
+            // 5.3, so we have to find the length ourselves.
+            if (!isset($length)) {
+                if ($start >= 0) {
+                    $length = self::our_strlen($str) - $start;
+                } else {
+                    $length = -$start;
+                }
+            }
+
+            return mb_substr($str, $start, $length, '8bit');
+        }
+
+        // Unlike mb_substr(), substr() doesn't accept NULL for length
+        if (isset($length)) {
+            return substr($str, $start, $length);
+        } else {
+            return substr($str, $start);
+        }
+    }
+
+}
+
+/*
+ * We want to catch all uncaught exceptions that come from the Crypto class,
+ * since by default, PHP will leak the key in the stack trace from an uncaught
+ * exception. This is a really ugly hack, but I think it's justified.
+ *
+ * Everything up to handler() getting called should be reliable, so this should
+ * reliably suppress the stack traces. The rest is just a bonus so that we don't
+ * make it impossible to debug other exceptions.
+ *
+ * This bit of code was adapted from: http://stackoverflow.com/a/7939492
+ */
+
+class CryptoExceptionHandler
+{
+    private $rethrow = NULL;
+
+    public function __construct()
+    {
+        set_exception_handler(array($this, "handler"));
+    }
+
+    public function handler($ex)
+    {
+        if (
+            $ex instanceof InvalidCiphertextException ||
+            $ex instanceof CannotPerformOperationException ||
+            $ex instanceof CryptoTestFailedException
+        ) {
+            echo "FATAL ERROR: Uncaught crypto exception. Suppresssing output.\n";
+        } else {
+            /* Re-throw the exception in the destructor. */
+            $this->rethrow = $ex;
+        }
+    }
+
+    public function __destruct() {
+        if ($this->rethrow) {
+            throw $this->rethrow;
+        }
+    }
+}
+
+$crypto_exception_handler_object_dont_touch_me = new CryptoExceptionHandler();
+
diff --git a/core/libraries/phpass/PasswordHash.php b/core/libraries/phpass/PasswordHash.php
new file mode 100644
index 00000000..3f341b00
--- /dev/null
+++ b/core/libraries/phpass/PasswordHash.php
@@ -0,0 +1,227 @@
+<?php
+#
+# Portable PHP password hashing framework.
+#
+# Version 0.5 / genuine.
+#
+# Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
+# the public domain.  Revised in subsequent years, still public domain.
+#
+# There's absolutely no warranty.
+#
+# The homepage URL for this framework is:
+#
+#	http://www.openwall.com/phpass/
+#
+# Please be sure to update the Version line if you edit this file in any way.
+# It is suggested that you leave the main version number intact, but indicate
+# your project name (after the slash) and add your own revision information.
+#
+# Please do not change the "private" password hashing method implemented in
+# here, thereby making your hashes incompatible.  However, if you must, please
+# change the hash type identifier (the "$P$") to something different.
+#
+# Obviously, since this code is in the public domain, the above are not
+# requirements (there can be none), but merely suggestions.
+#
+class PasswordHash {
+	var $itoa64;
+	var $iteration_count_log2;
+	var $portable_hashes;
+	var $random_state;
+
+	function __construct($iteration_count_log2, $portable_hashes)
+	{
+		$this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+		if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
+			$iteration_count_log2 = 8;
+		$this->iteration_count_log2 = $iteration_count_log2;
+
+		$this->portable_hashes = $portable_hashes;
+
+		$this->random_state = microtime();
+		if (function_exists('getmypid'))
+			$this->random_state .= getmypid();
+	}
+
+	function PasswordHash($iteration_count_log2, $portable_hashes)
+	{
+		self::__construct($iteration_count_log2, $portable_hashes);
+	}
+
+	function get_random_bytes($count)
+	{
+		$output = '';
+		if (@is_readable('/dev/urandom') &&
+		    ($fh = @fopen('/dev/urandom', 'rb'))) {
+			$output = fread($fh, $count);
+			fclose($fh);
+		}
+
+		if (strlen($output) < $count) {
+			$output = '';
+			for ($i = 0; $i < $count; $i += 16) {
+				$this->random_state =
+				    md5(microtime() . $this->random_state);
+				$output .= md5($this->random_state, TRUE);
+			}
+			$output = substr($output, 0, $count);
+		}
+
+		return $output;
+	}
+
+	function encode64($input, $count)
+	{
+		$output = '';
+		$i = 0;
+		do {
+			$value = ord($input[$i++]);
+			$output .= $this->itoa64[$value & 0x3f];
+			if ($i < $count)
+				$value |= ord($input[$i]) << 8;
+			$output .= $this->itoa64[($value >> 6) & 0x3f];
+			if ($i++ >= $count)
+				break;
+			if ($i < $count)
+				$value |= ord($input[$i]) << 16;
+			$output .= $this->itoa64[($value >> 12) & 0x3f];
+			if ($i++ >= $count)
+				break;
+			$output .= $this->itoa64[($value >> 18) & 0x3f];
+		} while ($i < $count);
+
+		return $output;
+	}
+
+	function gensalt_private($input)
+	{
+		$output = '$P$';
+		$output .= $this->itoa64[min($this->iteration_count_log2 +
+			((PHP_VERSION >= '5') ? 5 : 3), 30)];
+		$output .= $this->encode64($input, 6);
+
+		return $output;
+	}
+
+	function crypt_private($password, $setting)
+	{
+		$output = '*0';
+		if (substr($setting, 0, 2) === $output)
+			$output = '*1';
+
+		$id = substr($setting, 0, 3);
+		# We use "$P$", phpBB3 uses "$H$" for the same thing
+		if ($id !== '$P$' && $id !== '$H$')
+			return $output;
+
+		$count_log2 = strpos($this->itoa64, $setting[3]);
+		if ($count_log2 < 7 || $count_log2 > 30)
+			return $output;
+
+		$count = 1 << $count_log2;
+
+		$salt = substr($setting, 4, 8);
+		if (strlen($salt) !== 8)
+			return $output;
+
+		# We were kind of forced to use MD5 here since it's the only
+		# cryptographic primitive that was available in all versions
+		# of PHP in use.  To implement our own low-level crypto in PHP
+		# would have resulted in much worse performance and
+		# consequently in lower iteration counts and hashes that are
+		# quicker to crack (by non-PHP code).
+		$hash = md5($salt . $password, TRUE);
+		do {
+			$hash = md5($hash . $password, TRUE);
+		} while (--$count);
+
+		$output = substr($setting, 0, 12);
+		$output .= $this->encode64($hash, 16);
+
+		return $output;
+	}
+
+	function gensalt_blowfish($input)
+	{
+		# This one needs to use a different order of characters and a
+		# different encoding scheme from the one in encode64() above.
+		# We care because the last character in our encoded string will
+		# only represent 2 bits.  While two known implementations of
+		# bcrypt will happily accept and correct a salt string which
+		# has the 4 unused bits set to non-zero, we do not want to take
+		# chances and we also do not want to waste an additional byte
+		# of entropy.
+		$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+		$output = '$2a$';
+		$output .= chr(ord('0') + $this->iteration_count_log2 / 10);
+		$output .= chr(ord('0') + $this->iteration_count_log2 % 10);
+		$output .= '$';
+
+		$i = 0;
+		do {
+			$c1 = ord($input[$i++]);
+			$output .= $itoa64[$c1 >> 2];
+			$c1 = ($c1 & 0x03) << 4;
+			if ($i >= 16) {
+				$output .= $itoa64[$c1];
+				break;
+			}
+
+			$c2 = ord($input[$i++]);
+			$c1 |= $c2 >> 4;
+			$output .= $itoa64[$c1];
+			$c1 = ($c2 & 0x0f) << 2;
+
+			$c2 = ord($input[$i++]);
+			$c1 |= $c2 >> 6;
+			$output .= $itoa64[$c1];
+			$output .= $itoa64[$c2 & 0x3f];
+		} while (1);
+
+		return $output;
+	}
+
+	function HashPassword($password)
+	{
+		$random = '';
+
+		if (CRYPT_BLOWFISH === 1 && !$this->portable_hashes) {
+			$random = $this->get_random_bytes(16);
+			$hash =
+			    crypt($password, $this->gensalt_blowfish($random));
+			if (strlen($hash) === 60)
+				return $hash;
+		}
+
+		if (strlen($random) < 6)
+			$random = $this->get_random_bytes(6);
+		$hash =
+		    $this->crypt_private($password,
+		    $this->gensalt_private($random));
+		if (strlen($hash) === 34)
+			return $hash;
+
+		# Returning '*' on error is safe here, but would _not_ be safe
+		# in a crypt(3)-like function used _both_ for generating new
+		# hashes and for validating passwords against existing hashes.
+		return '*';
+	}
+
+	function CheckPassword($password, $stored_hash)
+	{
+		$hash = $this->crypt_private($password, $stored_hash);
+		if ($hash[0] === '*')
+			$hash = crypt($password, $stored_hash);
+
+		# This is not constant-time.  In order to keep the code simple,
+		# for timing safety we currently rely on the salts being
+		# unpredictable, which they are at least in the non-fallback
+		# cases (that is, when we use /dev/urandom and bcrypt).
+		return $hash === $stored_hash;
+	}
+}
+
+?>
diff --git a/core/libraries/phputf8/LICENSE b/core/libraries/phputf8/LICENSE
new file mode 100644
index 00000000..28f18896
--- /dev/null
+++ b/core/libraries/phputf8/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/core/libraries/phputf8/README b/core/libraries/phputf8/README
new file mode 100644
index 00000000..02c66a18
--- /dev/null
+++ b/core/libraries/phputf8/README
@@ -0,0 +1,82 @@
+++PHP UTF-8++
+
+Version 0.5
+
+++DOCUMENTATION++
+
+Documentation in progress in ./docs dir
+
+http://www.phpwact.org/php/i18n/charsets
+http://www.phpwact.org/php/i18n/utf-8
+
+Important Note: DO NOT use these functions without understanding WHY
+you are using them. In particular, do not blindly replace all use of PHP's
+string functions which functions found here - most of the time you will
+not need to, and you will be introducing a significant performance
+overhead to your application. You can get a good idea of when to use what
+from reading: http://www.phpwact.org/php/i18n/utf-8
+
+Important Note: For sake of performance most of the functions here are
+not "defensive" (e.g. there is not extensive parameter checking, well
+formed UTF-8 is assumed). This is particularily relevant when is comes to
+catching badly formed UTF-8 - you should screen input on the "outer
+perimeter" with help from functions in the utf8_validation.php and
+utf8_bad.php files.
+
+Important Note: this library treats ALL ASCII characters as valid, including ASCII control characters. But if you use some ASCII control characters in XML, it will render the XML ill-formed. Don't be a bozo: http://hsivonen.iki.fi/producing-xml/#controlchar
+
+++BUGS / SUPPORT / FEATURE REQUESTS ++
+
+Please report bugs to:
+http://sourceforge.net/tracker/?group_id=142846&atid=753842
+- if you are able, please submit a failing unit test
+(http://www.lastcraft.com/simple_test.php) with your bug report.
+
+For feature requests / faster implementation of functions found here,
+please drop them in via the RFE tracker: http://sourceforge.net/tracker/?group_id=142846&atid=753845
+Particularily interested in faster implementations!
+
+For general support / help, use:
+http://sourceforge.net/tracker/?group_id=142846&atid=753843
+
+In the VERY WORST case, you can email me: hfuecks gmail com - I tend to be slow to respond though so be warned.
+
+Important Note: when reporting bugs, please provide the following
+information;
+
+PHP version, whether the iconv extension is loaded (in PHP5 it's
+there by default), whether the mbstring extension is loaded. The
+following PHP script can be used to determine this information;
+
+<?php
+print "PHP Version: " .phpversion()."<br>";
+if ( extension_loaded('mbstring') ) {
+    print "mbstring available<br>";
+} else {
+    print "mbstring not available<br>";
+}
+if ( extension_loaded('iconv') ) {
+    print "iconv available<br>";
+} else {
+    print "iconv not available<br>";
+}
+?>
+
+++LICENSING++
+
+Parts of the code in this library come from other places, under different
+licenses.
+The authors involved have been contacted (see below). Attribution for
+which code came from elsewhere can be found in the source code itself.
+
++Andreas Gohr / Chris Smith - Dokuwiki
+There is a fair degree of collaboration / exchange of ideas and code
+beteen Dokuwiki's UTF-8 library;
+http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+and phputf8. Although Dokuwiki is released under GPL, its UTF-8
+library is released under LGPL, hence no conflict with phputf8
+
++Henri Sivonen (http://hsivonen.iki.fi/php-utf8/ /
+http://hsivonen.iki.fi/php-utf8/) has also given permission for his
+code to be released under the terms of the LGPL. He ported a Unicode / UTF-8
+converter from the Mozilla codebase to PHP, which is re-used in phputf8
diff --git a/core/libraries/phputf8/mbstring/core.php b/core/libraries/phputf8/mbstring/core.php
new file mode 100644
index 00000000..099fbec3
--- /dev/null
+++ b/core/libraries/phputf8/mbstring/core.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/mbstring/core.php';
diff --git a/core/libraries/phputf8/native/core.php b/core/libraries/phputf8/native/core.php
new file mode 100644
index 00000000..58b0522d
--- /dev/null
+++ b/core/libraries/phputf8/native/core.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/native/core.php';
diff --git a/core/libraries/phputf8/ord.php b/core/libraries/phputf8/ord.php
new file mode 100644
index 00000000..730010e7
--- /dev/null
+++ b/core/libraries/phputf8/ord.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/ord.php';
diff --git a/core/libraries/phputf8/str_ireplace.php b/core/libraries/phputf8/str_ireplace.php
new file mode 100644
index 00000000..692af3de
--- /dev/null
+++ b/core/libraries/phputf8/str_ireplace.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/str_ireplace.php';
diff --git a/core/libraries/phputf8/str_pad.php b/core/libraries/phputf8/str_pad.php
new file mode 100644
index 00000000..8474b641
--- /dev/null
+++ b/core/libraries/phputf8/str_pad.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/str_pad.php';
diff --git a/core/libraries/phputf8/str_split.php b/core/libraries/phputf8/str_split.php
new file mode 100644
index 00000000..ba12d826
--- /dev/null
+++ b/core/libraries/phputf8/str_split.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/str_split.php';
diff --git a/core/libraries/phputf8/strcasecmp.php b/core/libraries/phputf8/strcasecmp.php
new file mode 100644
index 00000000..e39d9482
--- /dev/null
+++ b/core/libraries/phputf8/strcasecmp.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/strcasecmp.php';
diff --git a/core/libraries/phputf8/strcspn.php b/core/libraries/phputf8/strcspn.php
new file mode 100644
index 00000000..72a37071
--- /dev/null
+++ b/core/libraries/phputf8/strcspn.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/strcspn.php';
diff --git a/core/libraries/phputf8/stristr.php b/core/libraries/phputf8/stristr.php
new file mode 100644
index 00000000..1441e9af
--- /dev/null
+++ b/core/libraries/phputf8/stristr.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/stristr.php';
diff --git a/core/libraries/phputf8/strrev.php b/core/libraries/phputf8/strrev.php
new file mode 100644
index 00000000..b7a321c7
--- /dev/null
+++ b/core/libraries/phputf8/strrev.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/strrev.php';
diff --git a/core/libraries/phputf8/strspn.php b/core/libraries/phputf8/strspn.php
new file mode 100644
index 00000000..2eb5b379
--- /dev/null
+++ b/core/libraries/phputf8/strspn.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/strspn.php';
diff --git a/core/libraries/phputf8/substr_replace.php b/core/libraries/phputf8/substr_replace.php
new file mode 100644
index 00000000..2996eb28
--- /dev/null
+++ b/core/libraries/phputf8/substr_replace.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/substr_replace.php';
diff --git a/core/libraries/phputf8/trim.php b/core/libraries/phputf8/trim.php
new file mode 100644
index 00000000..bd904442
--- /dev/null
+++ b/core/libraries/phputf8/trim.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/trim.php';
diff --git a/core/libraries/phputf8/ucfirst.php b/core/libraries/phputf8/ucfirst.php
new file mode 100644
index 00000000..6c7df9c9
--- /dev/null
+++ b/core/libraries/phputf8/ucfirst.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/ucfirst.php';
diff --git a/core/libraries/phputf8/ucwords.php b/core/libraries/phputf8/ucwords.php
new file mode 100644
index 00000000..02584509
--- /dev/null
+++ b/core/libraries/phputf8/ucwords.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/ucwords.php';
diff --git a/core/libraries/phputf8/utf8.php b/core/libraries/phputf8/utf8.php
new file mode 100644
index 00000000..bafe0759
--- /dev/null
+++ b/core/libraries/phputf8/utf8.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			__DIR__,
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utf8.php';
diff --git a/core/libraries/phputf8/utils/ascii.php b/core/libraries/phputf8/utils/ascii.php
new file mode 100644
index 00000000..66e076b8
--- /dev/null
+++ b/core/libraries/phputf8/utils/ascii.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/ascii.php';
diff --git a/core/libraries/phputf8/utils/bad.php b/core/libraries/phputf8/utils/bad.php
new file mode 100644
index 00000000..5276d716
--- /dev/null
+++ b/core/libraries/phputf8/utils/bad.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/bad.php';
diff --git a/core/libraries/phputf8/utils/patterns.php b/core/libraries/phputf8/utils/patterns.php
new file mode 100644
index 00000000..828e2782
--- /dev/null
+++ b/core/libraries/phputf8/utils/patterns.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/patterns.php';
diff --git a/core/libraries/phputf8/utils/position.php b/core/libraries/phputf8/utils/position.php
new file mode 100644
index 00000000..3e02184c
--- /dev/null
+++ b/core/libraries/phputf8/utils/position.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/position.php';
diff --git a/core/libraries/phputf8/utils/specials.php b/core/libraries/phputf8/utils/specials.php
new file mode 100644
index 00000000..56a9ac83
--- /dev/null
+++ b/core/libraries/phputf8/utils/specials.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/specials.php';
diff --git a/core/libraries/phputf8/utils/unicode.php b/core/libraries/phputf8/utils/unicode.php
new file mode 100644
index 00000000..eb2c6987
--- /dev/null
+++ b/core/libraries/phputf8/utils/unicode.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/unicode.php';
diff --git a/core/libraries/phputf8/utils/validation.php b/core/libraries/phputf8/utils/validation.php
new file mode 100644
index 00000000..65c27336
--- /dev/null
+++ b/core/libraries/phputf8/utils/validation.php
@@ -0,0 +1,15 @@
+<?php
+if (class_exists('JLog'))
+{
+	JLog::add(
+		sprintf(
+			'Using the phputf8 library through files located in %1$s is deprecated, load the files from %2$s instead.',
+			dirname(__DIR__),
+			JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8'
+		),
+		JLog::WARNING,
+		'deprecated'
+	);
+}
+
+require_once JPATH_LIBRARIES . '/vendor/joomla/string/src/phputf8/utils/validation.php';
diff --git a/core/libraries/src/Access/Access.php b/core/libraries/src/Access/Access.php
new file mode 100644
index 00000000..b6e6d2ef
--- /dev/null
+++ b/core/libraries/src/Access/Access.php
@@ -0,0 +1,1236 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Access;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Table\Asset;
+
+/**
+ * Class that handles all access authorisation routines.
+ *
+ * @since  11.1
+ */
+class Access
+{
+	/**
+	 * Array of view levels
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $viewLevels = array();
+
+	/**
+	 * Array of rules for the asset
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $assetRules = array();
+
+	/**
+	 * Array of identities for asset rules
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $assetRulesIdentities = array();
+
+	/**
+	 * Array of permissions for an asset type
+	 * (Array Key = Asset ID)
+	 * Also includes the rules string for the asset
+	 *
+	 * @var    array
+	 * @since  11.1
+	 * @deprecated  3.7.0  No replacement. Will be removed in 4.0.
+	 */
+	protected static $assetPermissionsById = array();
+
+	/**
+	 * Array of permissions for an asset type
+	 * (Array Key = Asset Name)
+	 *
+	 * @var    array
+	 * @since  11.1
+	 * @deprecated  3.7.0  No replacement. Will be removed in 4.0.
+	 */
+	protected static $assetPermissionsByName = array();
+
+	/**
+	 * Array of the permission parent ID mappings
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $assetPermissionsParentIdMapping = array();
+
+	/**
+	 * Array of asset types that have been preloaded
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $preloadedAssetTypes = array();
+
+	/**
+	 * Array of loaded user identities
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $identities = array();
+
+	/**
+	 * Array of user groups.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $userGroups = array();
+
+	/**
+	 * Array of user group paths.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $userGroupPaths = array();
+
+	/**
+	 * Array of cached groups by user.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $groupsByUser = array();
+
+	/**
+	 * Array of preloaded asset names and ids (key is the asset id).
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	protected static $preloadedAssets = array();
+
+	/**
+	 * The root asset id.
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	protected static $rootAssetId = null;
+
+	/**
+	 * Method for clearing static caches.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public static function clearStatics()
+	{
+		self::$viewLevels                      = array();
+		self::$assetRules                      = array();
+		self::$assetRulesIdentities            = array();
+		self::$assetPermissionsParentIdMapping = array();
+		self::$preloadedAssetTypes             = array();
+		self::$identities                      = array();
+		self::$userGroups                      = array();
+		self::$userGroupPaths                  = array();
+		self::$groupsByUser                    = array();
+		self::$preloadedAssets                 = array();
+		self::$rootAssetId                     = null;
+
+		// The following properties are deprecated since 3.7.0 and will be removed in 4.0.
+		self::$assetPermissionsById   = array();
+		self::$assetPermissionsByName = array();
+	}
+
+	/**
+	 * Method to check if a user is authorised to perform an action, optionally on an asset.
+	 *
+	 * @param   integer         $userId    Id of the user for which to check authorisation.
+	 * @param   string          $action    The name of the action to authorise.
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name). null fallback to root asset.
+	 * @param   boolean         $preload   Indicates whether preloading should be used.
+	 *
+	 * @return  boolean|null  True if allowed, false for an explicit deny, null for an implicit deny.
+	 *
+	 * @since   11.1
+	 */
+	public static function check($userId, $action, $assetKey = null, $preload = true)
+	{
+		// Sanitise inputs.
+		$userId = (int) $userId;
+		$action = strtolower(preg_replace('#[\s\-]+#', '.', trim($action)));
+
+		if (!isset(self::$identities[$userId]))
+		{
+			// Get all groups against which the user is mapped.
+			self::$identities[$userId] = self::getGroupsByUser($userId);
+			array_unshift(self::$identities[$userId], $userId * -1);
+		}
+
+		return self::getAssetRules($assetKey, true, true, $preload)->allow($action, self::$identities[$userId]);
+	}
+
+	/**
+	 * Method to preload the Rules object for the given asset type.
+	 *
+	 * @param   integer|string|array  $assetTypes  The type or name of the asset (e.g. 'com_content.article', 'com_menus.menu.2').
+	 *                                             Also accepts the asset id. An array of asset type or a special
+	 *                                             'components' string to load all component assets.
+	 * @param   boolean               $reload      Set to true to reload from database.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 * @note    This method will return void in 4.0.
+	 */
+	public static function preload($assetTypes = 'components', $reload = false)
+	{
+		// If sent an asset id, we first get the asset type for that asset id.
+		if (is_numeric($assetTypes))
+		{
+			$assetTypes = self::getAssetType($assetTypes);
+		}
+
+		// Check for default case:
+		$isDefault = is_string($assetTypes) && in_array($assetTypes, array('components', 'component'));
+
+		// Preload the rules for all of the components.
+		if ($isDefault)
+		{
+			self::preloadComponents();
+
+			return true;
+		}
+
+		// If we get to this point, this is a regular asset type and we'll proceed with the preloading process.
+		if (!is_array($assetTypes))
+		{
+			$assetTypes = (array) $assetTypes;
+		}
+
+		foreach ($assetTypes as $assetType)
+		{
+			self::preloadPermissions($assetType, $reload);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to recursively retrieve the list of parent Asset IDs
+	 * for a particular Asset.
+	 *
+	 * @param   string   $assetType  The asset type, or the asset name, or the extension of the asset
+	 *                               (e.g. 'com_content.article', 'com_menus.menu.2', 'com_contact').
+	 * @param   integer  $assetId    The numeric asset id.
+	 *
+	 * @return  array  List of ancestor ids (includes original $assetId).
+	 *
+	 * @since   1.6
+	 */
+	protected static function getAssetAncestors($assetType, $assetId)
+	{
+		// Get the extension name from the $assetType provided
+		$extensionName = self::getExtensionNameFromAsset($assetType);
+
+		// Holds the list of ancestors for the Asset ID:
+		$ancestors = array();
+
+		// Add in our starting Asset ID:
+		$ancestors[] = (int) $assetId;
+
+		// Initialize the variable we'll use in the loop:
+		$id = (int) $assetId;
+
+		while ($id !== 0)
+		{
+			if (isset(self::$assetPermissionsParentIdMapping[$extensionName][$id]))
+			{
+				$id = (int) self::$assetPermissionsParentIdMapping[$extensionName][$id]->parent_id;
+
+				if ($id !== 0)
+				{
+					$ancestors[] = $id;
+				}
+			}
+			else
+			{
+				// Add additional case to break out of the while loop automatically in
+				// the case that the ID is non-existent in our mapping variable above.
+				break;
+			}
+		}
+
+		return $ancestors;
+	}
+
+	/**
+	 * Method to retrieve the list of Asset IDs and their Parent Asset IDs
+	 * and store them for later usage in getAssetRules().
+	 *
+	 * @param   string  $assetType  The asset type, or the asset name, or the extension of the asset
+	 *                              (e.g. 'com_content.article', 'com_menus.menu.2', 'com_contact').
+	 *
+	 * @return  array  List of asset ids (includes parent asset id information).
+	 *
+	 * @since   1.6
+	 * @deprecated  3.7.0  No replacement. Will be removed in 4.0.
+	 */
+	protected static function &preloadPermissionsParentIdMapping($assetType)
+	{
+		// Get the extension name from the $assetType provided
+		$extensionName = self::getExtensionNameFromAsset($assetType);
+
+		if (!isset(self::$assetPermissionsParentIdMapping[$extensionName]))
+		{
+			// Get the database connection object.
+			$db = \JFactory::getDbo();
+
+			// Get a fresh query object:
+			$query    = $db->getQuery(true);
+
+			// Build the database query:
+			$query->select('a.id, a.parent_id');
+			$query->from('#__assets AS a');
+			$query->where('(a.name LIKE ' . $db->quote($extensionName . '.%') . ' OR a.name = ' . $db->quote($extensionName) . ' OR a.id = 1)');
+
+			// Get the Name Permission Map List
+			$db->setQuery($query);
+			$parentIdMapping = $db->loadObjectList('id');
+
+			self::$assetPermissionsParentIdMapping[$extensionName] = &$parentIdMapping;
+		}
+
+		return self::$assetPermissionsParentIdMapping[$extensionName];
+	}
+
+	/**
+	 * Method to retrieve the Asset Rule strings for this particular
+	 * Asset Type and stores them for later usage in getAssetRules().
+	 * Stores 2 arrays: one where the list has the Asset ID as the key
+	 * and a second one where the Asset Name is the key.
+	 *
+	 * @param   string   $assetType  The asset type, or the asset name, or the extension of the asset
+	 *                               (e.g. 'com_content.article', 'com_menus.menu.2', 'com_contact').
+	 * @param   boolean  $reload     Reload the preloaded assets.
+	 *
+	 * @return  boolean  True
+	 *
+	 * @since   1.6
+	 * @note    This function will return void in 4.0.
+	 */
+	protected static function preloadPermissions($assetType, $reload = false)
+	{
+		// Get the extension name from the $assetType provided
+		$extensionName = self::getExtensionNameFromAsset($assetType);
+
+		// If asset is a component, make sure that all the component assets are preloaded.
+		if ((isset(self::$preloadedAssetTypes[$extensionName]) || isset(self::$preloadedAssetTypes[$assetType])) && !$reload)
+		{
+			return true;
+		}
+
+		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::preloadPermissions (' . $extensionName . ')');
+
+		// Get the database connection object.
+		$db         = \JFactory::getDbo();
+		$extraQuery = $db->qn('name') . ' = ' . $db->q($extensionName) . ' OR ' . $db->qn('parent_id') . ' = 0';
+
+		// Get a fresh query object.
+		$query = $db->getQuery(true)
+			->select($db->qn(array('id', 'name', 'rules', 'parent_id')))
+			->from($db->qn('#__assets'))
+			->where($db->qn('name') . ' LIKE ' . $db->q($extensionName . '.%') . ' OR ' . $extraQuery);
+
+		// Get the permission map for all assets in the asset extension.
+		$assets = $db->setQuery($query)->loadObjectList();
+
+		self::$assetPermissionsParentIdMapping[$extensionName] = array();
+
+		// B/C Populate the old class properties. They are deprecated since 3.7.0 and will be removed in 4.0.
+		self::$assetPermissionsById[$assetType]   = array();
+		self::$assetPermissionsByName[$assetType] = array();
+
+		foreach ($assets as $asset)
+		{
+			self::$assetPermissionsParentIdMapping[$extensionName][$asset->id] = $asset;
+			self::$preloadedAssets[$asset->id]                                 = $asset->name;
+
+			// B/C Populate the old class properties. They are deprecated since 3.7.0 and will be removed in 4.0.
+			self::$assetPermissionsById[$assetType][$asset->id]     = $asset;
+			self::$assetPermissionsByName[$assetType][$asset->name] = $asset;
+		}
+
+		// Mark asset type and it's extension name as preloaded.
+		self::$preloadedAssetTypes[$assetType]     = true;
+		self::$preloadedAssetTypes[$extensionName] = true;
+
+		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('After Access::preloadPermissions (' . $extensionName . ')');
+
+		return true;
+	}
+
+	/**
+	 * Method to preload the Rules objects for all components.
+	 *
+	 * Note: This will only get the base permissions for the component.
+	 * e.g. it will get 'com_content', but not 'com_content.article.1' or
+	 * any more specific asset type rules.
+	 *
+	 * @return   array  Array of component names that were preloaded.
+	 *
+	 * @since    1.6
+	 */
+	protected static function preloadComponents()
+	{
+		// If the components already been preloaded do nothing.
+		if (isset(self::$preloadedAssetTypes['components']))
+		{
+			return array();
+		}
+
+		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::preloadComponents (all components)');
+
+		// Add root to asset names list.
+		$components = array('root.1');
+
+		// Add enabled components to asset names list.
+		foreach (\JComponentHelper::getComponents() as $component)
+		{
+			if ($component->enabled)
+			{
+				$components[] = $component->option;
+			}
+		}
+
+		// Get the database connection object.
+		$db = \JFactory::getDbo();
+
+		// Get the asset info for all assets in asset names list.
+		$query = $db->getQuery(true)
+			->select($db->qn(array('id', 'name', 'rules', 'parent_id')))
+			->from($db->qn('#__assets'))
+			->where($db->qn('name') . ' IN (' . implode(',', $db->quote($components)) . ')');
+
+		// Get the Name Permission Map List
+		$assets = $db->setQuery($query)->loadObjectList();
+
+		$rootAsset = null;
+
+		// First add the root asset and save it to preload memory and mark it as preloaded.
+		foreach ($assets as &$asset)
+		{
+			if ((int) $asset->parent_id === 0)
+			{
+				$rootAsset                                                       = $asset;
+				self::$rootAssetId                                               = $asset->id;
+				self::$preloadedAssetTypes[$asset->name]                         = true;
+				self::$preloadedAssets[$asset->id]                               = $asset->name;
+				self::$assetPermissionsParentIdMapping[$asset->name][$asset->id] = $asset;
+
+				unset($asset);
+				break;
+			}
+		}
+
+		// Now create save the components asset tree to preload memory.
+		foreach ($assets as $asset)
+		{
+			if (!isset(self::$assetPermissionsParentIdMapping[$asset->name]))
+			{
+				self::$assetPermissionsParentIdMapping[$asset->name] = array($rootAsset->id => $rootAsset, $asset->id => $asset);
+				self::$preloadedAssets[$asset->id]                   = $asset->name;
+			}
+		}
+
+		// Mark all components asset type as preloaded.
+		self::$preloadedAssetTypes['components'] = true;
+
+		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('After Access::preloadComponents (all components)');
+
+		return $components;
+	}
+
+	/**
+	 * Method to check if a group is authorised to perform an action, optionally on an asset.
+	 *
+	 * @param   integer         $groupId   The path to the group for which to check authorisation.
+	 * @param   string          $action    The name of the action to authorise.
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name). null fallback to root asset.
+	 * @param   boolean         $preload   Indicates whether preloading should be used.
+	 *
+	 * @return  boolean  True if authorised.
+	 *
+	 * @since   11.1
+	 */
+	public static function checkGroup($groupId, $action, $assetKey = null, $preload = true)
+	{
+		// Sanitize input.
+		$groupId = (int) $groupId;
+		$action  = strtolower(preg_replace('#[\s\-]+#', '.', trim($action)));
+
+		return self::getAssetRules($assetKey, true, true, $preload)->allow($action, self::getGroupPath($groupId));
+	}
+
+	/**
+	 * Gets the parent groups that a leaf group belongs to in its branch back to the root of the tree
+	 * (including the leaf group id).
+	 *
+	 * @param   mixed  $groupId  An integer or array of integers representing the identities to check.
+	 *
+	 * @return  mixed  True if allowed, false for an explicit deny, null for an implicit deny.
+	 *
+	 * @since   11.1
+	 */
+	protected static function getGroupPath($groupId)
+	{
+		// Load all the groups to improve performance on intensive groups checks
+		$groups = \JHelperUsergroups::getInstance()->getAll();
+
+		if (!isset($groups[$groupId]))
+		{
+			return array();
+		}
+
+		return $groups[$groupId]->path;
+	}
+
+	/**
+	 * Method to return the Rules object for an asset. The returned object can optionally hold
+	 * only the rules explicitly set for the asset or the summation of all inherited rules from
+	 * parent assets and explicit rules.
+	 *
+	 * @param   integer|string  $assetKey              The asset key (asset id or asset name). null fallback to root asset.
+	 * @param   boolean         $recursive             True to return the rules object with inherited rules.
+	 * @param   boolean         $recursiveParentAsset  True to calculate the rule also based on inherited component/extension rules.
+	 * @param   boolean         $preload               Indicates whether preloading should be used.
+	 *
+	 * @return  Rules  Rules object for the asset.
+	 *
+	 * @since   11.1
+	 * @note    The non preloading code will be removed in 4.0. All asset rules should use asset preloading.
+	 */
+	public static function getAssetRules($assetKey, $recursive = false, $recursiveParentAsset = true, $preload = true)
+	{
+		// Auto preloads the components assets and root asset (if chosen).
+		if ($preload)
+		{
+			self::preload('components');
+		}
+
+		// When asset key is null fallback to root asset.
+		$assetKey = self::cleanAssetKey($assetKey);
+
+		// Auto preloads assets for the asset type (if chosen).
+		if ($preload)
+		{
+			self::preload(self::getAssetType($assetKey));
+		}
+
+		// Get the asset id and name.
+		$assetId = self::getAssetId($assetKey);
+
+		// If asset rules already cached em memory return it (only in full recursive mode).
+		if ($recursive && $recursiveParentAsset && $assetId && isset(self::$assetRules[$assetId]))
+		{
+			return self::$assetRules[$assetId];
+		}
+
+		// Get the asset name and the extension name.
+		$assetName     = self::getAssetName($assetKey);
+		$extensionName = self::getExtensionNameFromAsset($assetName);
+
+		// If asset id does not exist fallback to extension asset, then root asset.
+		if (!$assetId)
+		{
+			if ($extensionName && $assetName !== $extensionName)
+			{
+				\JLog::add('No asset found for ' . $assetName . ', falling back to ' . $extensionName, \JLog::WARNING, 'assets');
+
+				return self::getAssetRules($extensionName, $recursive, $recursiveParentAsset, $preload);
+			}
+
+			if (self::$rootAssetId !== null && $assetName !== self::$preloadedAssets[self::$rootAssetId])
+			{
+				\JLog::add('No asset found for ' . $assetName . ', falling back to ' . self::$preloadedAssets[self::$rootAssetId], \JLog::WARNING, 'assets');
+
+				return self::getAssetRules(self::$preloadedAssets[self::$rootAssetId], $recursive, $recursiveParentAsset, $preload);
+			}
+		}
+
+		// Almost all calls can take advantage of preloading.
+		if ($assetId && isset(self::$preloadedAssets[$assetId]))
+		{
+			!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
+
+			// Collects permissions for each asset
+			$collected = array();
+
+			// If not in any recursive mode. We only want the asset rules.
+			if (!$recursive && !$recursiveParentAsset)
+			{
+				$collected = array(self::$assetPermissionsParentIdMapping[$extensionName][$assetId]->rules);
+			}
+			// If there is any type of recursive mode.
+			else
+			{
+				$ancestors = array_reverse(self::getAssetAncestors($extensionName, $assetId));
+
+				foreach ($ancestors as $id)
+				{
+					// If full recursive mode, but not recursive parent mode, do not add the extension asset rules.
+					if ($recursive && !$recursiveParentAsset && self::$assetPermissionsParentIdMapping[$extensionName][$id]->name === $extensionName)
+					{
+						continue;
+					}
+
+					// If not full recursive mode, but recursive parent mode, do not add other recursion rules.
+					if (!$recursive && $recursiveParentAsset && self::$assetPermissionsParentIdMapping[$extensionName][$id]->name !== $extensionName
+						&& self::$assetPermissionsParentIdMapping[$extensionName][$id]->id !== $assetId)
+					{
+						continue;
+					}
+
+					// If empty asset to not add to rules.
+					if (self::$assetPermissionsParentIdMapping[$extensionName][$id]->rules === '{}')
+					{
+						continue;
+					}
+
+					$collected[] = self::$assetPermissionsParentIdMapping[$extensionName][$id]->rules;
+				}
+			}
+
+			/**
+			* Hashing the collected rules allows us to store
+			* only one instance of the Rules object for
+			* Assets that have the same exact permissions...
+			* it's a great way to save some memory.
+			*/
+			$hash = md5(implode(',', $collected));
+
+			if (!isset(self::$assetRulesIdentities[$hash]))
+			{
+				$rules = new Rules;
+				$rules->mergeCollection($collected);
+
+				self::$assetRulesIdentities[$hash] = $rules;
+			}
+
+			// Save asset rules to memory cache(only in full recursive mode).
+			if ($recursive && $recursiveParentAsset)
+			{
+				self::$assetRules[$assetId] = self::$assetRulesIdentities[$hash];
+			}
+
+			!JDEBUG ?: \JProfiler::getInstance('Application')->mark('After Access::getAssetRules (id:' . $assetId . ' name:' . $assetName . ')');
+
+			return self::$assetRulesIdentities[$hash];
+		}
+
+		// Non preloading code. Use old slower method, slower. Only used in rare cases (if any) or without preloading chosen.
+		\JLog::add('Asset ' . $assetKey . ' permissions fetch without preloading (slower method).', \JLog::INFO, 'assets');
+
+		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::getAssetRules (assetKey:' . $assetKey . ')');
+
+		// There's no need to process it with the recursive method for the Root Asset ID.
+		if ((int) $assetKey === 1)
+		{
+			$recursive = false;
+		}
+
+		// Get the database connection object.
+		$db = \JFactory::getDbo();
+
+		// Build the database query to get the rules for the asset.
+		$query = $db->getQuery(true)
+			->select($db->qn(($recursive ? 'b.rules' : 'a.rules'), 'rules'))
+			->select($db->qn(($recursive ? array('b.id', 'b.name', 'b.parent_id') : array('a.id', 'a.name', 'a.parent_id'))))
+			->from($db->qn('#__assets', 'a'));
+
+		// If the asset identifier is numeric assume it is a primary key, else lookup by name.
+		$assetString     = is_numeric($assetKey) ? $db->qn('a.id') . ' = ' . $assetKey : $db->qn('a.name') . ' = ' . $db->q($assetKey);
+		$extensionString = '';
+
+		if ($recursiveParentAsset && ($extensionName !== $assetKey || is_numeric($assetKey)))
+		{
+			$extensionString = ' OR ' . $db->qn('a.name') . ' = ' . $db->q($extensionName);
+		}
+
+		$recursiveString = $recursive ? ' OR ' . $db->qn('a.parent_id') . ' = 0' : '';
+
+		$query->where('(' . $assetString . $extensionString . $recursiveString . ')');
+
+		// If we want the rules cascading up to the global asset node we need a self-join.
+		if ($recursive)
+		{
+			$query->join('LEFT', $db->qn('#__assets', 'b') . ' ON b.lft <= a.lft AND b.rgt >= a.rgt')
+				->order($db->qn('b.lft'));
+		}
+
+		// Execute the query and load the rules from the result.
+		$result = $db->setQuery($query)->loadObjectList();
+
+		// Get the root even if the asset is not found and in recursive mode
+		if (empty($result))
+		{
+			$assets = new Asset($db);
+
+			$query->clear()
+				->select($db->qn(array('id', 'name', 'parent_id', 'rules')))
+				->from($db->qn('#__assets'))
+				->where($db->qn('id') . ' = ' . $db->q($assets->getRootId()));
+
+			$result = $db->setQuery($query)->loadObjectList();
+		}
+
+		$collected = array();
+
+		foreach ($result as $asset)
+		{
+			$collected[] = $asset->rules;
+		}
+
+		// Instantiate and return the Rules object for the asset rules.
+		$rules = new Rules;
+		$rules->mergeCollection($collected);
+
+		!JDEBUG ?: \JProfiler::getInstance('Application')->mark('Before Access::getAssetRules <strong>Slower</strong> (assetKey:' . $assetKey . ')');
+
+		return $rules;
+	}
+
+	/**
+	 * Method to clean the asset key to make sure we always have something.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name). null fallback to root asset.
+	 *
+	 * @return  integer|string  Asset id or asset name.
+	 *
+	 * @since   3.7.0
+	 */
+	protected static function cleanAssetKey($assetKey = null)
+	{
+		// If it's a valid asset key, clean it and return it.
+		if ($assetKey)
+		{
+			return strtolower(preg_replace('#[\s\-]+#', '.', trim($assetKey)));
+		}
+
+		// Return root asset id if already preloaded.
+		if (self::$rootAssetId !== null)
+		{
+			return self::$rootAssetId;
+		}
+
+		// No preload. Return root asset id from Assets.
+		$assets = new Asset(\JFactory::getDbo());
+
+		return $assets->getRootId();
+	}
+
+	/**
+	 * Method to get the asset id from the asset key.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  integer  The asset id.
+	 *
+	 * @since   3.7.0
+	 */
+	protected static function getAssetId($assetKey)
+	{
+		static $loaded = array();
+
+		// If the asset is already an id return it.
+		if (is_numeric($assetKey))
+		{
+			return (int) $assetKey;
+		}
+
+		if (!isset($loaded[$assetKey]))
+		{
+			// It's the root asset.
+			if (self::$rootAssetId !== null && $assetKey === self::$preloadedAssets[self::$rootAssetId])
+			{
+				$loaded[$assetKey] = self::$rootAssetId;
+			}
+			else
+			{
+				$preloadedAssetsByName = array_flip(self::$preloadedAssets);
+
+				// If we already have the asset name stored in preloading, example, a component, no need to fetch it from table.
+				if (isset($preloadedAssetsByName[$assetKey]))
+				{
+					$loaded[$assetKey] = $preloadedAssetsByName[$assetKey];
+				}
+				// Else we have to do an extra db query to fetch it from the table fetch it from table.
+				else
+				{
+					$table = new Asset(\JFactory::getDbo());
+					$table->load(array('name' => $assetKey));
+					$loaded[$assetKey] = $table->id;
+				}
+			}
+		}
+
+		return (int) $loaded[$assetKey];
+	}
+
+	/**
+	 * Method to get the asset name from the asset key.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  string  The asset name (ex: com_content.article.8).
+	 *
+	 * @since   3.7.0
+	 */
+	protected static function getAssetName($assetKey)
+	{
+		static $loaded = array();
+
+		// If the asset is already a string return it.
+		if (!is_numeric($assetKey))
+		{
+			return $assetKey;
+		}
+
+		if (!isset($loaded[$assetKey]))
+		{
+			// It's the root asset.
+			if (self::$rootAssetId !== null && $assetKey === self::$rootAssetId)
+			{
+				$loaded[$assetKey] = self::$preloadedAssets[self::$rootAssetId];
+			}
+			// If we already have the asset name stored in preloading, example, a component, no need to fetch it from table.
+			elseif (isset(self::$preloadedAssets[$assetKey]))
+			{
+				$loaded[$assetKey] = self::$preloadedAssets[$assetKey];
+			}
+			// Else we have to do an extra db query to fetch it from the table fetch it from table.
+			else
+			{
+				$table = new Asset(\JFactory::getDbo());
+				$table->load($assetKey);
+				$loaded[$assetKey] = $table->name;
+			}
+		}
+
+		return $loaded[$assetKey];
+	}
+
+	/**
+	 * Method to get the extension name from the asset name.
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  string  The extension name (ex: com_content).
+	 *
+	 * @since    1.6
+	 */
+	public static function getExtensionNameFromAsset($assetKey)
+	{
+		static $loaded = array();
+
+		if (!isset($loaded[$assetKey]))
+		{
+			$assetName = self::getAssetName($assetKey);
+			$firstDot  = strpos($assetName, '.');
+
+			if ($assetName !== 'root.1' && $firstDot !== false)
+			{
+				$assetName = substr($assetName, 0, $firstDot);
+			}
+
+			$loaded[$assetKey] = $assetName;
+		}
+
+		return $loaded[$assetKey];
+	}
+
+	/**
+	 * Method to get the asset type from the asset name.
+	 *
+	 * For top level components this returns "components":
+	 * 'com_content' returns 'components'
+	 *
+	 * For other types:
+	 * 'com_content.article.1' returns 'com_content.article'
+	 * 'com_content.category.1' returns 'com_content.category'
+	 *
+	 * @param   integer|string  $assetKey  The asset key (asset id or asset name).
+	 *
+	 * @return  string  The asset type (ex: com_content.article).
+	 *
+	 * @since    1.6
+	 */
+	public static function getAssetType($assetKey)
+	{
+		// If the asset is already a string return it.
+		$assetName = self::getAssetName($assetKey);
+		$lastDot   = strrpos($assetName, '.');
+
+		if ($assetName !== 'root.1' && $lastDot !== false)
+		{
+			return substr($assetName, 0, $lastDot);
+		}
+
+		return 'components';
+	}
+
+	/**
+	 * Method to return the title of a user group
+	 *
+	 * @param   integer  $groupId  Id of the group for which to get the title of.
+	 *
+	 * @return  string  Tthe title of the group
+	 *
+	 * @since   3.5
+	 */
+	public static function getGroupTitle($groupId)
+	{
+		// Fetch the group title from the database
+		$db    = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select('title')
+			->from('#__usergroups')
+			->where('id = ' . $db->quote($groupId));
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Method to return a list of user groups mapped to a user. The returned list can optionally hold
+	 * only the groups explicitly mapped to the user or all groups both explicitly mapped and inherited
+	 * by the user.
+	 *
+	 * @param   integer  $userId     Id of the user for which to get the list of groups.
+	 * @param   boolean  $recursive  True to include inherited user groups.
+	 *
+	 * @return  array    List of user group ids to which the user is mapped.
+	 *
+	 * @since   11.1
+	 */
+	public static function getGroupsByUser($userId, $recursive = true)
+	{
+		// Creates a simple unique string for each parameter combination:
+		$storeId = $userId . ':' . (int) $recursive;
+
+		if (!isset(self::$groupsByUser[$storeId]))
+		{
+			// TODO: Uncouple this from \JComponentHelper and allow for a configuration setting or value injection.
+			if (class_exists('\JComponentHelper'))
+			{
+				$guestUsergroup = \JComponentHelper::getParams('com_users')->get('guest_usergroup', 1);
+			}
+			else
+			{
+				$guestUsergroup = 1;
+			}
+
+			// Guest user (if only the actually assigned group is requested)
+			if (empty($userId) && !$recursive)
+			{
+				$result = array($guestUsergroup);
+			}
+			// Registered user and guest if all groups are requested
+			else
+			{
+				$db = \JFactory::getDbo();
+
+				// Build the database query to get the rules for the asset.
+				$query = $db->getQuery(true)
+					->select($recursive ? 'b.id' : 'a.id');
+
+				if (empty($userId))
+				{
+					$query->from('#__usergroups AS a')
+						->where('a.id = ' . (int) $guestUsergroup);
+				}
+				else
+				{
+					$query->from('#__user_usergroup_map AS map')
+						->where('map.user_id = ' . (int) $userId)
+						->join('LEFT', '#__usergroups AS a ON a.id = map.group_id');
+				}
+
+				// If we want the rules cascading up to the global asset node we need a self-join.
+				if ($recursive)
+				{
+					$query->join('LEFT', '#__usergroups AS b ON b.lft <= a.lft AND b.rgt >= a.rgt');
+				}
+
+				// Execute the query and load the rules from the result.
+				$db->setQuery($query);
+				$result = $db->loadColumn();
+
+				// Clean up any NULL or duplicate values, just in case
+				$result = ArrayHelper::toInteger($result);
+
+				if (empty($result))
+				{
+					$result = array('1');
+				}
+				else
+				{
+					$result = array_unique($result);
+				}
+			}
+
+			self::$groupsByUser[$storeId] = $result;
+		}
+
+		return self::$groupsByUser[$storeId];
+	}
+
+	/**
+	 * Method to return a list of user Ids contained in a Group
+	 *
+	 * @param   integer  $groupId    The group Id
+	 * @param   boolean  $recursive  Recursively include all child groups (optional)
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 * @todo    This method should move somewhere else
+	 */
+	public static function getUsersByGroup($groupId, $recursive = false)
+	{
+		// Get a database object.
+		$db = \JFactory::getDbo();
+
+		$test = $recursive ? '>=' : '=';
+
+		// First find the users contained in the group
+		$query = $db->getQuery(true)
+			->select('DISTINCT(user_id)')
+			->from('#__usergroups as ug1')
+			->join('INNER', '#__usergroups AS ug2 ON ug2.lft' . $test . 'ug1.lft AND ug1.rgt' . $test . 'ug2.rgt')
+			->join('INNER', '#__user_usergroup_map AS m ON ug2.id=m.group_id')
+			->where('ug1.id=' . $db->quote($groupId));
+
+		$db->setQuery($query);
+
+		$result = $db->loadColumn();
+
+		// Clean up any NULL values, just in case
+		$result = ArrayHelper::toInteger($result);
+
+		return $result;
+	}
+
+	/**
+	 * Method to return a list of view levels for which the user is authorised.
+	 *
+	 * @param   integer  $userId  Id of the user for which to get the list of authorised view levels.
+	 *
+	 * @return  array    List of view levels for which the user is authorised.
+	 *
+	 * @since   11.1
+	 */
+	public static function getAuthorisedViewLevels($userId)
+	{
+		// Only load the view levels once.
+		if (empty(self::$viewLevels))
+		{
+			// Get a database object.
+			$db = \JFactory::getDbo();
+
+			// Build the base query.
+			$query = $db->getQuery(true)
+				->select('id, rules')
+				->from($db->quoteName('#__viewlevels'));
+
+			// Set the query for execution.
+			$db->setQuery($query);
+
+			// Build the view levels array.
+			foreach ($db->loadAssocList() as $level)
+			{
+				self::$viewLevels[$level['id']] = (array) json_decode($level['rules']);
+			}
+		}
+
+		// Initialise the authorised array.
+		$authorised = array(1);
+
+		// Check for the recovery mode setting and return early.
+		$user      = \JUser::getInstance($userId);
+		$root_user = \JFactory::getConfig()->get('root_user');
+
+		if (($user->username && $user->username == $root_user) || (is_numeric($root_user) && $user->id > 0 && $user->id == $root_user))
+		{
+			// Find the super user levels.
+			foreach (self::$viewLevels as $level => $rule)
+			{
+				foreach ($rule as $id)
+				{
+					if ($id > 0 && self::checkGroup($id, 'core.admin'))
+					{
+						$authorised[] = $level;
+						break;
+					}
+				}
+			}
+
+			return $authorised;
+		}
+
+		// Get all groups that the user is mapped to recursively.
+		$groups = self::getGroupsByUser($userId);
+
+		// Find the authorised levels.
+		foreach (self::$viewLevels as $level => $rule)
+		{
+			foreach ($rule as $id)
+			{
+				if (($id < 0) && (($id * -1) == $userId))
+				{
+					$authorised[] = $level;
+					break;
+				}
+				// Check to see if the group is mapped to the level.
+				elseif (($id >= 0) && in_array($id, $groups))
+				{
+					$authorised[] = $level;
+					break;
+				}
+			}
+		}
+
+		return $authorised;
+	}
+
+	/**
+	 * Method to return a list of actions for which permissions can be set given a component and section.
+	 *
+	 * @param   string  $component  The component from which to retrieve the actions.
+	 * @param   string  $section    The name of the section within the component from which to retrieve the actions.
+	 *
+	 * @return  array  List of actions available for the given component and section.
+	 *
+	 * @since       11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS)  Use Access::getActionsFromFile or Access::getActionsFromData instead.
+	 * @codeCoverageIgnore
+	 */
+	public static function getActions($component, $section = 'component')
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Use Access::getActionsFromFile or Access::getActionsFromData instead.', \JLog::WARNING, 'deprecated');
+
+		$actions = self::getActionsFromFile(
+			JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml',
+			"/access/section[@name='" . $section . "']/"
+		);
+
+		if (empty($actions))
+		{
+			return array();
+		}
+		else
+		{
+			return $actions;
+		}
+	}
+
+	/**
+	 * Method to return a list of actions from a file for which permissions can be set.
+	 *
+	 * @param   string  $file   The path to the XML file.
+	 * @param   string  $xpath  An optional xpath to search for the fields.
+	 *
+	 * @return  boolean|array   False if case of error or the list of actions available.
+	 *
+	 * @since   12.1
+	 */
+	public static function getActionsFromFile($file, $xpath = "/access/section[@name='component']/")
+	{
+		if (!is_file($file) || !is_readable($file))
+		{
+			// If unable to find the file return false.
+			return false;
+		}
+		else
+		{
+			// Else return the actions from the xml.
+			$xml = simplexml_load_file($file);
+
+			return self::getActionsFromData($xml, $xpath);
+		}
+	}
+
+	/**
+	 * Method to return a list of actions from a string or from an xml for which permissions can be set.
+	 *
+	 * @param   string|\SimpleXMLElement  $data   The XML string or an XML element.
+	 * @param   string                    $xpath  An optional xpath to search for the fields.
+	 *
+	 * @return  boolean|array   False if case of error or the list of actions available.
+	 *
+	 * @since   12.1
+	 */
+	public static function getActionsFromData($data, $xpath = "/access/section[@name='component']/")
+	{
+		// If the data to load isn't already an XML element or string return false.
+		if ((!($data instanceof \SimpleXMLElement)) && (!is_string($data)))
+		{
+			return false;
+		}
+
+		// Attempt to load the XML if a string.
+		if (is_string($data))
+		{
+			try
+			{
+				$data = new \SimpleXMLElement($data);
+			}
+			catch (\Exception $e)
+			{
+				return false;
+			}
+
+			// Make sure the XML loaded correctly.
+			if (!$data)
+			{
+				return false;
+			}
+		}
+
+		// Initialise the actions array
+		$actions = array();
+
+		// Get the elements from the xpath
+		$elements = $data->xpath($xpath . 'action[@name][@title][@description]');
+
+		// If there some elements, analyse them
+		if (!empty($elements))
+		{
+			foreach ($elements as $action)
+			{
+				// Add the action to the actions array
+				$actions[] = (object) array(
+					'name' => (string) $action['name'],
+					'title' => (string) $action['title'],
+					'description' => (string) $action['description'],
+				);
+			}
+		}
+
+		// Finally return the actions array
+		return $actions;
+	}
+}
diff --git a/core/libraries/src/Access/Exception/NotAllowed.php b/core/libraries/src/Access/Exception/NotAllowed.php
new file mode 100644
index 00000000..789f2e1c
--- /dev/null
+++ b/core/libraries/src/Access/Exception/NotAllowed.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Access\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining a not allowed access
+ *
+ * @since  3.6.3
+ */
+class NotAllowed extends \RuntimeException
+{
+}
diff --git a/core/libraries/src/Access/Rule.php b/core/libraries/src/Access/Rule.php
new file mode 100644
index 00000000..a688c65e
--- /dev/null
+++ b/core/libraries/src/Access/Rule.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Access;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Rule class.
+ *
+ * @since  11.4
+ */
+class Rule
+{
+	/**
+	 * A named array
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $data = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * The input array must be in the form: array(-42 => true, 3 => true, 4 => false)
+	 * or an equivalent JSON encoded string.
+	 *
+	 * @param   mixed  $identities  A JSON format string (probably from the database) or a named array.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($identities)
+	{
+		// Convert string input to an array.
+		if (is_string($identities))
+		{
+			$identities = json_decode($identities, true);
+		}
+
+		$this->mergeIdentities($identities);
+	}
+
+	/**
+	 * Get the data for the action.
+	 *
+	 * @return  array  A named array
+	 *
+	 * @since   11.1
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Merges the identities
+	 *
+	 * @param   mixed  $identities  An integer or array of integers representing the identities to check.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function mergeIdentities($identities)
+	{
+		if ($identities instanceof Rule)
+		{
+			$identities = $identities->getData();
+		}
+
+		if (is_array($identities))
+		{
+			foreach ($identities as $identity => $allow)
+			{
+				$this->mergeIdentity($identity, $allow);
+			}
+		}
+	}
+
+	/**
+	 * Merges the values for an identity.
+	 *
+	 * @param   integer  $identity  The identity.
+	 * @param   boolean  $allow     The value for the identity (true == allow, false == deny).
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function mergeIdentity($identity, $allow)
+	{
+		$identity = (int) $identity;
+		$allow = (int) ((boolean) $allow);
+
+		// Check that the identity exists.
+		if (isset($this->data[$identity]))
+		{
+			// Explicit deny always wins a merge.
+			if ($this->data[$identity] !== 0)
+			{
+				$this->data[$identity] = $allow;
+			}
+		}
+		else
+		{
+			$this->data[$identity] = $allow;
+		}
+	}
+
+	/**
+	 * Checks that this action can be performed by an identity.
+	 *
+	 * The identity is an integer where +ve represents a user group,
+	 * and -ve represents a user.
+	 *
+	 * @param   mixed  $identities  An integer or array of integers representing the identities to check.
+	 *
+	 * @return  mixed  True if allowed, false for an explicit deny, null for an implicit deny.
+	 *
+	 * @since   11.1
+	 */
+	public function allow($identities)
+	{
+		// Implicit deny by default.
+		$result = null;
+
+		// Check that the inputs are valid.
+		if (!empty($identities))
+		{
+			if (!is_array($identities))
+			{
+				$identities = array($identities);
+			}
+
+			foreach ($identities as $identity)
+			{
+				// Technically the identity just needs to be unique.
+				$identity = (int) $identity;
+
+				// Check if the identity is known.
+				if (isset($this->data[$identity]))
+				{
+					$result = (boolean) $this->data[$identity];
+
+					// An explicit deny wins.
+					if ($result === false)
+					{
+						break;
+					}
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Convert this object into a JSON encoded string.
+	 *
+	 * @return  string  JSON encoded string
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		return json_encode($this->data);
+	}
+}
diff --git a/core/libraries/src/Access/Rules.php b/core/libraries/src/Access/Rules.php
new file mode 100644
index 00000000..bd14986e
--- /dev/null
+++ b/core/libraries/src/Access/Rules.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Access;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Access rules class.
+ *
+ * @since  11.4
+ */
+class Rules
+{
+	/**
+	 * A named array.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $data = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * The input array must be in the form: array('action' => array(-42 => true, 3 => true, 4 => false))
+	 * or an equivalent JSON encoded string, or an object where properties are arrays.
+	 *
+	 * @param   mixed  $input  A JSON format string (probably from the database) or a nested array.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($input = '')
+	{
+		// Convert in input to an array.
+		if (is_string($input))
+		{
+			$input = json_decode($input, true);
+		}
+		elseif (is_object($input))
+		{
+			$input = (array) $input;
+		}
+
+		if (is_array($input))
+		{
+			// Top level keys represent the actions.
+			foreach ($input as $action => $identities)
+			{
+				$this->mergeAction($action, $identities);
+			}
+		}
+	}
+
+	/**
+	 * Get the data for the action.
+	 *
+	 * @return  array  A named array of Rule objects.
+	 *
+	 * @since   11.1
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Method to merge a collection of Rules.
+	 *
+	 * @param   mixed  $input  Rule or array of Rules
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function mergeCollection($input)
+	{
+		// Check if the input is an array.
+		if (is_array($input))
+		{
+			foreach ($input as $actions)
+			{
+				$this->merge($actions);
+			}
+		}
+	}
+
+	/**
+	 * Method to merge actions with this object.
+	 *
+	 * @param   mixed  $actions  Rule object, an array of actions or a JSON string array of actions.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function merge($actions)
+	{
+		if (is_string($actions))
+		{
+			$actions = json_decode($actions, true);
+		}
+
+		if (is_array($actions))
+		{
+			foreach ($actions as $action => $identities)
+			{
+				$this->mergeAction($action, $identities);
+			}
+		}
+		elseif ($actions instanceof Rules)
+		{
+			$data = $actions->getData();
+
+			foreach ($data as $name => $identities)
+			{
+				$this->mergeAction($name, $identities);
+			}
+		}
+	}
+
+	/**
+	 * Merges an array of identities for an action.
+	 *
+	 * @param   string  $action      The name of the action.
+	 * @param   array   $identities  An array of identities
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function mergeAction($action, $identities)
+	{
+		if (isset($this->data[$action]))
+		{
+			// If exists, merge the action.
+			$this->data[$action]->mergeIdentities($identities);
+		}
+		else
+		{
+			// If new, add the action.
+			$this->data[$action] = new Rule($identities);
+		}
+	}
+
+	/**
+	 * Checks that an action can be performed by an identity.
+	 *
+	 * The identity is an integer where +ve represents a user group,
+	 * and -ve represents a user.
+	 *
+	 * @param   string  $action    The name of the action.
+	 * @param   mixed   $identity  An integer representing the identity, or an array of identities
+	 *
+	 * @return  mixed   Object or null if there is no information about the action.
+	 *
+	 * @since   11.1
+	 */
+	public function allow($action, $identity)
+	{
+		// Check we have information about this action.
+		if (isset($this->data[$action]))
+		{
+			return $this->data[$action]->allow($identity);
+		}
+
+		return;
+	}
+
+	/**
+	 * Get the allowed actions for an identity.
+	 *
+	 * @param   mixed  $identity  An integer representing the identity or an array of identities
+	 *
+	 * @return  \JObject  Allowed actions for the identity or identities
+	 *
+	 * @since   11.1
+	 */
+	public function getAllowed($identity)
+	{
+		// Sweep for the allowed actions.
+		$allowed = new \JObject;
+
+		foreach ($this->data as $name => &$action)
+		{
+			if ($action->allow($identity))
+			{
+				$allowed->set($name, true);
+			}
+		}
+
+		return $allowed;
+	}
+
+	/**
+	 * Magic method to convert the object to JSON string representation.
+	 *
+	 * @return  string  JSON representation of the actions array
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		$temp = array();
+
+		foreach ($this->data as $name => $rule)
+		{
+			if ($data = $rule->getData())
+			{
+				$temp[$name] = $data;
+			}
+		}
+
+		return json_encode($temp, JSON_FORCE_OBJECT);
+	}
+}
diff --git a/core/libraries/src/Access/Wrapper/Access.php b/core/libraries/src/Access/Wrapper/Access.php
new file mode 100644
index 00000000..56c79921
--- /dev/null
+++ b/core/libraries/src/Access/Wrapper/Access.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Access\Wrapper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access as StaticAccess;
+use Joomla\CMS\Access\Rules as AccessRules;
+
+/**
+ * Wrapper class for Access
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+ */
+class Access
+{
+	/**
+	 * Helper wrapper method for addUserToGroup
+	 *
+	 * @return void
+	 *
+	 * @see     StaticAccess::clearStatics
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function clearStatics()
+	{
+		return StaticAccess::clearStatics();
+	}
+
+	/**
+	 * Helper wrapper method for check
+	 *
+	 * @param   integer  $userId  Id of the user for which to check authorisation.
+	 * @param   string   $action  The name of the action to authorise.
+	 * @param   mixed    $asset   Integer asset id or the name of the asset as a string.  Defaults to the global asset node.
+	 *
+	 * @return boolean  True if authorised.
+	 *
+	 * @see     StaticAccess::check()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function check($userId, $action, $asset = null)
+	{
+		return StaticAccess::check($userId, $action, $asset);
+	}
+
+	/**
+	 * Helper wrapper method for checkGroup
+	 *
+	 * @param   integer  $groupId  The path to the group for which to check authorisation.
+	 * @param   string   $action   The name of the action to authorise.
+	 * @param   mixed    $asset    Integer asset id or the name of the asset as a string.  Defaults to the global asset node.
+	 *
+	 * @return  boolean  True if authorised.
+	 *
+	 * @see     StaticAccess::checkGroup()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function checkGroup($groupId, $action, $asset = null)
+	{
+		return StaticAccess::checkGroup($groupId, $action, $asset);
+	}
+
+	/**
+	 * Helper wrapper method for getAssetRules
+	 *
+	 * @param   mixed    $asset      Integer asset id or the name of the asset as a string.
+	 * @param   boolean  $recursive  True to return the rules object with inherited rules.
+	 *
+	 * @return  AccessRules   AccessRules object for the asset.
+	 *
+	 * @see     StaticAccess::getAssetRules
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function getAssetRules($asset, $recursive = false)
+	{
+		return StaticAccess::getAssetRules($asset, $recursive);
+	}
+
+	/**
+	 * Helper wrapper method for getGroupsByUser
+	 *
+	 * @param   integer  $userId     Id of the user for which to get the list of groups.
+	 * @param   boolean  $recursive  True to include inherited user groups.
+	 *
+	 * @return  array    List of user group ids to which the user is mapped.
+	 *
+	 * @see     StaticAccess::getGroupsByUser()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function getGroupsByUser($userId, $recursive = true)
+	{
+		return StaticAccess::getGroupsByUser($userId, $recursive);
+	}
+
+	/**
+	 * Helper wrapper method for getUsersByGroup
+	 *
+	 * @param   integer  $groupId    The group Id
+	 * @param   boolean  $recursive  Recursively include all child groups (optional)
+	 *
+	 * @return  array
+	 *
+	 * @see     StaticAccess::getUsersByGroup()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function getUsersByGroup($groupId, $recursive = false)
+	{
+		return StaticAccess::getUsersByGroup($groupId, $recursive);
+	}
+
+	/**
+	 * Helper wrapper method for getAuthorisedViewLevels
+	 *
+	 * @param   integer  $userId  Id of the user for which to get the list of authorised view levels.
+	 *
+	 * @return  array    List of view levels for which the user is authorised.
+	 *
+	 * @see     StaticAccess::getAuthorisedViewLevels()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function getAuthorisedViewLevels($userId)
+	{
+		return StaticAccess::getAuthorisedViewLevels($userId);
+	}
+
+	/**
+	 * Helper wrapper method for getActions
+	 *
+	 * @param   string  $component  The component from which to retrieve the actions.
+	 * @param   string  $section    The name of the section within the component from which to retrieve the actions.
+	 *
+	 * @return array  List of actions available for the given component and section.
+	 *
+	 * @see     StaticAccess::getActions()
+	 * @since   3.4
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS)  Use StaticAccess::getActionsFromFile or StaticAccess::getActionsFromData instead.
+	 */
+	public function getActions($component, $section = 'component')
+	{
+		return StaticAccess::getActions($component, $section);
+	}
+
+	/**
+	 * Helper wrapper method for getActionsFromFile
+	 *
+	 * @param   string  $file   The path to the XML file.
+	 * @param   string  $xpath  An optional xpath to search for the fields.
+	 *
+	 * @return  boolean|array   False if case of error or the list of actions available.
+	 *
+	 * @see     StaticAccess::getActionsFromFile()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function getActionsFromFile($file, $xpath = '/access/section[@name=\'component\']/')
+	{
+		return StaticAccess::getActionsFromFile($file, $xpath);
+	}
+
+	/**
+	 * Helper wrapper method for getActionsFromData
+	 *
+	 * @param   string|\SimpleXMLElement  $data   The XML string or an XML element.
+	 * @param   string                    $xpath  An optional xpath to search for the fields.
+	 *
+	 * @return  boolean|array   False if case of error or the list of actions available.
+	 *
+	 * @see     StaticAccess::getActionsFromData()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Access\Access` directly
+	 */
+	public function getActionsFromData($data, $xpath = '/access/section[@name=\'component\']/')
+	{
+		return StaticAccess::getActionsFromData($data, $xpath);
+	}
+}
diff --git a/core/libraries/src/Application/AdministratorApplication.php b/core/libraries/src/Application/AdministratorApplication.php
new file mode 100644
index 00000000..6d2d8277
--- /dev/null
+++ b/core/libraries/src/Application/AdministratorApplication.php
@@ -0,0 +1,480 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Input\Input;
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla! Administrator Application class
+ *
+ * @since  3.2
+ */
+class AdministratorApplication extends CMSApplication
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input                   $input   An optional argument to provide dependency injection for the application's
+	 *                                           input object.  If the argument is a \JInput object that object will become
+	 *                                           the application's input object, otherwise a default input object is created.
+	 * @param   Registry                $config  An optional argument to provide dependency injection for the application's
+	 *                                           config object.  If the argument is a Registry object that object will become
+	 *                                           the application's config object, otherwise a default config object is created.
+	 * @param   \JApplicationWebClient  $client  An optional argument to provide dependency injection for the application's
+	 *                                           client object.  If the argument is a \JApplicationWebClient object that object will become
+	 *                                           the application's client object, otherwise a default client object is created.
+	 *
+	 * @since   3.2
+	 */
+	public function __construct(Input $input = null, Registry $config = null, \JApplicationWebClient $client = null)
+	{
+		// Register the application name
+		$this->_name = 'administrator';
+
+		// Register the client ID
+		$this->_clientId = 1;
+
+		// Execute the parent constructor
+		parent::__construct($input, $config, $client);
+
+		// Set the root in the URI based on the application name
+		\JUri::root(null, rtrim(dirname(\JUri::base(true)), '/\\'));
+	}
+
+	/**
+	 * Dispatch the application
+	 *
+	 * @param   string  $component  The component which is being rendered.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function dispatch($component = null)
+	{
+		if ($component === null)
+		{
+			$component = \JAdministratorHelper::findOption();
+		}
+
+		// Load the document to the API
+		$this->loadDocument();
+
+		// Set up the params
+		$document = \JFactory::getDocument();
+
+		// Register the document object with \JFactory
+		\JFactory::$document = $document;
+
+		switch ($document->getType())
+		{
+			case 'html':
+				$document->setMetaData('keywords', $this->get('MetaKeys'));
+
+				// Get the template
+				$template = $this->getTemplate(true);
+
+				// Store the template and its params to the config
+				$this->set('theme', $template->template);
+				$this->set('themeParams', $template->params);
+
+				break;
+
+			default:
+				break;
+		}
+
+		$document->setTitle($this->get('sitename') . ' - ' . \JText::_('JADMINISTRATION'));
+		$document->setDescription($this->get('MetaDesc'));
+		$document->setGenerator('Joomla! - Open Source Content Management');
+
+		$contents = ComponentHelper::renderComponent($component);
+		$document->setBuffer($contents, 'component');
+
+		// Trigger the onAfterDispatch event.
+		\JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterDispatch');
+	}
+
+	/**
+	 * Method to run the Web application routines.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function doExecute()
+	{
+		// Get the language from the (login) form or user state
+		$login_lang = ($this->input->get('option') == 'com_login') ? $this->input->get('lang') : '';
+		$options    = array('language' => $login_lang ?: $this->getUserState('application.lang'));
+
+		// Initialise the application
+		$this->initialiseApp($options);
+
+		// Test for magic quotes
+		if (get_magic_quotes_gpc())
+		{
+			$lang = $this->getLanguage();
+
+			if ($lang->hasKey('JERROR_MAGIC_QUOTES'))
+			{
+				$this->enqueueMessage(\JText::_('JERROR_MAGIC_QUOTES'), 'error');
+			}
+			else
+			{
+				$this->enqueueMessage('Your host needs to disable magic_quotes_gpc to run this version of Joomla!', 'error');
+			}
+		}
+
+		// Mark afterInitialise in the profiler.
+		JDEBUG ? $this->profiler->mark('afterInitialise') : null;
+
+		// Route the application
+		$this->route();
+
+		// Mark afterRoute in the profiler.
+		JDEBUG ? $this->profiler->mark('afterRoute') : null;
+
+		/*
+		 * Check if the user is required to reset their password
+		 *
+		 * Before $this->route(); "option" and "view" can't be safely read using:
+		 * $this->input->getCmd('option'); or $this->input->getCmd('view');
+		 * ex: due of the sef urls
+		 */
+		$this->checkUserRequireReset('com_admin', 'profile', 'edit', 'com_admin/profile.save,com_admin/profile.apply,com_login/logout');
+
+		// Dispatch the application
+		$this->dispatch();
+
+		// Mark afterDispatch in the profiler.
+		JDEBUG ? $this->profiler->mark('afterDispatch') : null;
+	}
+
+	/**
+	 * Return a reference to the \JRouter object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  \JRouter
+	 *
+	 * @since	3.2
+	 */
+	public static function getRouter($name = 'administrator', array $options = array())
+	{
+		return parent::getRouter($name, $options);
+	}
+
+	/**
+	 * Gets the name of the current template.
+	 *
+	 * @param   boolean  $params  True to return the template parameters
+	 *
+	 * @return  string  The name of the template.
+	 *
+	 * @since   3.2
+	 * @throws  \InvalidArgumentException
+	 */
+	public function getTemplate($params = false)
+	{
+		if (is_object($this->template))
+		{
+			if ($params)
+			{
+				return $this->template;
+			}
+
+			return $this->template->template;
+		}
+
+		$admin_style = \JFactory::getUser()->getParam('admin_style');
+
+		// Load the template name from the database
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('template, s.params')
+			->from('#__template_styles as s')
+			->join('LEFT', '#__extensions as e ON e.type=' . $db->quote('template') . ' AND e.element=s.template AND e.client_id=s.client_id');
+
+		if ($admin_style)
+		{
+			$query->where('s.client_id = 1 AND id = ' . (int) $admin_style . ' AND e.enabled = 1', 'OR');
+		}
+
+		$query->where('s.client_id = 1 AND home = ' . $db->quote('1'), 'OR')
+			->order('home');
+		$db->setQuery($query);
+		$template = $db->loadObject();
+
+		$template->template = \JFilterInput::getInstance()->clean($template->template, 'cmd');
+		$template->params = new Registry($template->params);
+
+		if (!file_exists(JPATH_THEMES . '/' . $template->template . '/index.php'))
+		{
+			$this->enqueueMessage(\JText::_('JERROR_ALERTNOTEMPLATE'), 'error');
+			$template->params = new Registry;
+			$template->template = 'isis';
+		}
+
+		// Cache the result
+		$this->template = $template;
+
+		if (!file_exists(JPATH_THEMES . '/' . $template->template . '/index.php'))
+		{
+			throw new \InvalidArgumentException(\JText::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $template->template));
+		}
+
+		if ($params)
+		{
+			return $template;
+		}
+
+		return $template->template;
+	}
+
+	/**
+	 * Initialise the application.
+	 *
+	 * @param   array  $options  An optional associative array of configuration settings.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function initialiseApp($options = array())
+	{
+		$user = \JFactory::getUser();
+
+		// If the user is a guest we populate it with the guest user group.
+		if ($user->guest)
+		{
+			$guestUsergroup = ComponentHelper::getParams('com_users')->get('guest_usergroup', 1);
+			$user->groups = array($guestUsergroup);
+		}
+
+		// If a language was specified it has priority, otherwise use user or default language settings
+		if (empty($options['language']))
+		{
+			$lang = $user->getParam('admin_language');
+
+			// Make sure that the user's language exists
+			if ($lang && \JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+			else
+			{
+				$params = ComponentHelper::getParams('com_languages');
+				$options['language'] = $params->get('administrator', $this->get('language', 'en-GB'));
+			}
+		}
+
+		// One last check to make sure we have something
+		if (!\JLanguageHelper::exists($options['language']))
+		{
+			$lang = $this->get('language', 'en-GB');
+
+			if (\JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+			else
+			{
+				// As a last ditch fail to english
+				$options['language'] = 'en-GB';
+			}
+		}
+
+		// Finish initialisation
+		parent::initialiseApp($options);
+	}
+
+	/**
+	 * Login authentication function
+	 *
+	 * @param   array  $credentials  Array('username' => string, 'password' => string)
+	 * @param   array  $options      Array('remember' => boolean)
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function login($credentials, $options = array())
+	{
+		// The minimum group
+		$options['group'] = 'Public Backend';
+
+		// Make sure users are not auto-registered
+		$options['autoregister'] = false;
+
+		// Set the application login entry point
+		if (!array_key_exists('entry_url', $options))
+		{
+			$options['entry_url'] = \JUri::base() . 'index.php?option=com_users&task=login';
+		}
+
+		// Set the access control action to check.
+		$options['action'] = 'core.login.admin';
+
+		$result = parent::login($credentials, $options);
+
+		if (!($result instanceof \Exception))
+		{
+			$lang = $this->input->getCmd('lang');
+			$lang = preg_replace('/[^A-Z-]/i', '', $lang);
+
+			if ($lang)
+			{
+				$this->setUserState('application.lang', $lang);
+			}
+
+			static::purgeMessages();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Purge the jos_messages table of old messages
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public static function purgeMessages()
+	{
+		$user = \JFactory::getUser();
+		$userid = $user->get('id');
+
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__messages_cfg'))
+			->where($db->quoteName('user_id') . ' = ' . (int) $userid, 'AND')
+			->where($db->quoteName('cfg_name') . ' = ' . $db->quote('auto_purge'), 'AND');
+		$db->setQuery($query);
+		$config = $db->loadObject();
+
+		// Check if auto_purge value set
+		if (is_object($config) && $config->cfg_name === 'auto_purge')
+		{
+			$purge = $config->cfg_value;
+		}
+		else
+		{
+			// If no value set, default is 7 days
+			$purge = 7;
+		}
+
+		// If purge value is not 0, then allow purging of old messages
+		if ($purge > 0)
+		{
+			// Purge old messages at day set in message configuration
+			$past = \JFactory::getDate(time() - $purge * 86400);
+			$pastStamp = $past->toSql();
+
+			$query->clear()
+				->delete($db->quoteName('#__messages'))
+				->where($db->quoteName('date_time') . ' < ' . $db->quote($pastStamp), 'AND')
+				->where($db->quoteName('user_id_to') . ' = ' . (int) $userid, 'AND');
+			$db->setQuery($query);
+			$db->execute();
+		}
+	}
+
+	/**
+	 * Rendering is the process of pushing the document buffers into the template
+	 * placeholders, retrieving data from the document and pushing it into
+	 * the application response buffer.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function render()
+	{
+		// Get the \JInput object
+		$input = $this->input;
+
+		$component = $input->getCmd('option', 'com_login');
+		$file      = $input->getCmd('tmpl', 'index');
+
+		if ($component === 'com_login')
+		{
+			$file = 'login';
+		}
+
+		$this->set('themeFile', $file . '.php');
+
+		// Safety check for when configuration.php root_user is in use.
+		$rootUser = $this->get('root_user');
+
+		if (property_exists('\JConfig', 'root_user'))
+		{
+			if (\JFactory::getUser()->get('username') === $rootUser || \JFactory::getUser()->id === (string) $rootUser)
+			{
+				$this->enqueueMessage(
+					\JText::sprintf(
+						'JWARNING_REMOVE_ROOT_USER',
+						'index.php?option=com_config&task=config.removeroot&' . \JSession::getFormToken() . '=1'
+					),
+					'error'
+				);
+			}
+			// Show this message to superusers too
+			elseif (\JFactory::getUser()->authorise('core.admin'))
+			{
+				$this->enqueueMessage(
+					\JText::sprintf(
+						'JWARNING_REMOVE_ROOT_USER_ADMIN',
+						$rootUser,
+						'index.php?option=com_config&task=config.removeroot&' . \JSession::getFormToken() . '=1'
+					),
+					'error'
+				);
+			}
+		}
+
+		parent::render();
+	}
+
+	/**
+	 * Route the application.
+	 *
+	 * Routing is the process of examining the request environment to determine which
+	 * component should receive the request. The component optional parameters
+	 * are then set in the request object to be processed when the application is being
+	 * dispatched.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function route()
+	{
+		$uri = \JUri::getInstance();
+
+		if ($this->get('force_ssl') >= 1 && strtolower($uri->getScheme()) !== 'https')
+		{
+			// Forward to https
+			$uri->setScheme('https');
+			$this->redirect((string) $uri, 301);
+		}
+
+		// Trigger the onAfterRoute event.
+		\JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterRoute');
+	}
+}
diff --git a/core/libraries/src/Application/ApplicationHelper.php b/core/libraries/src/Application/ApplicationHelper.php
new file mode 100644
index 00000000..00d81319
--- /dev/null
+++ b/core/libraries/src/Application/ApplicationHelper.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+/**
+ * Application helper functions
+ *
+ * @since  1.5
+ */
+class ApplicationHelper
+{
+	/**
+	 * Client information array
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected static $_clients = array();
+
+	/**
+	 * Return the name of the request component [main component]
+	 *
+	 * @param   string  $default  The default option
+	 *
+	 * @return  string  Option (e.g. com_something)
+	 *
+	 * @since   1.6
+	 */
+	public static function getComponentName($default = null)
+	{
+		static $option;
+
+		if ($option)
+		{
+			return $option;
+		}
+
+		$input = \JFactory::getApplication()->input;
+		$option = strtolower($input->get('option'));
+
+		if (empty($option))
+		{
+			$option = $default;
+		}
+
+		$input->set('option', $option);
+
+		return $option;
+	}
+
+	/**
+	 * Provides a secure hash based on a seed
+	 *
+	 * @param   string  $seed  Seed string.
+	 *
+	 * @return  string  A secure hash
+	 *
+	 * @since   3.2
+	 */
+	public static function getHash($seed)
+	{
+		return md5(\JFactory::getConfig()->get('secret') . $seed);
+	}
+
+	/**
+	 * This method transliterates a string into a URL
+	 * safe string or returns a URL safe UTF-8 string
+	 * based on the global configuration
+	 *
+	 * @param   string  $string    String to process
+	 * @param   string  $language  Language to transliterate to if unicode slugs are disabled
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   3.2
+	 */
+	public static function stringURLSafe($string, $language = '')
+	{
+		if (\JFactory::getConfig()->get('unicodeslugs') == 1)
+		{
+			$output = \JFilterOutput::stringURLUnicodeSlug($string);
+		}
+		else
+		{
+			if ($language === '*' || $language === '')
+			{
+				$languageParams = ComponentHelper::getParams('com_languages');
+				$language = $languageParams->get('site');
+			}
+
+			$output = \JFilterOutput::stringURLSafe($string, $language);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Gets information on a specific client id.  This method will be useful in
+	 * future versions when we start mapping applications in the database.
+	 *
+	 * This method will return a client information array if called
+	 * with no arguments which can be used to add custom application information.
+	 *
+	 * @param   integer  $id      A client identifier
+	 * @param   boolean  $byName  If True, find the client by its name
+	 *
+	 * @return  mixed  Object describing the client or false if not known
+	 *
+	 * @since   1.5
+	 */
+	public static function getClientInfo($id = null, $byName = false)
+	{
+		// Only create the array if it is empty
+		if (empty(self::$_clients))
+		{
+			$obj = new \stdClass;
+
+			// Site Client
+			$obj->id = 0;
+			$obj->name = 'site';
+			$obj->path = JPATH_SITE;
+			self::$_clients[0] = clone $obj;
+
+			// Administrator Client
+			$obj->id = 1;
+			$obj->name = 'administrator';
+			$obj->path = JPATH_ADMINISTRATOR;
+			self::$_clients[1] = clone $obj;
+
+			// Installation Client
+			$obj->id = 2;
+			$obj->name = 'installation';
+			$obj->path = JPATH_INSTALLATION;
+			self::$_clients[2] = clone $obj;
+		}
+
+		// If no client id has been passed return the whole array
+		if ($id === null)
+		{
+			return self::$_clients;
+		}
+
+		// Are we looking for client information by id or by name?
+		if (!$byName)
+		{
+			if (isset(self::$_clients[$id]))
+			{
+				return self::$_clients[$id];
+			}
+		}
+		else
+		{
+			foreach (self::$_clients as $client)
+			{
+				if ($client->name == strtolower($id))
+				{
+					return $client;
+				}
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * Adds information for a client.
+	 *
+	 * @param   mixed  $client  A client identifier either an array or object
+	 *
+	 * @return  boolean  True if the information is added. False on error
+	 *
+	 * @since   1.6
+	 */
+	public static function addClientInfo($client)
+	{
+		if (is_array($client))
+		{
+			$client = (object) $client;
+		}
+
+		if (!is_object($client))
+		{
+			return false;
+		}
+
+		$info = self::getClientInfo();
+
+		if (!isset($client->id))
+		{
+			$client->id = count($info);
+		}
+
+		self::$_clients[$client->id] = clone $client;
+
+		return true;
+	}
+
+	/**
+	 * Parse a XML install manifest file.
+	 *
+	 * XML Root tag should be 'install' except for languages which use meta file.
+	 *
+	 * @param   string  $path  Full path to XML file.
+	 *
+	 * @return  array  XML metadata.
+	 *
+	 * @since       1.5
+	 * @deprecated  4.0 Use \JInstaller::parseXMLInstallFile instead.
+	 */
+	public static function parseXMLInstallFile($path)
+	{
+		\JLog::add('ApplicationHelper::parseXMLInstallFile is deprecated. Use \JInstaller::parseXMLInstallFile instead.', \JLog::WARNING, 'deprecated');
+
+		return \JInstaller::parseXMLInstallFile($path);
+	}
+
+	/**
+	 * Parse a XML language meta file.
+	 *
+	 * XML Root tag  for languages which is meta file.
+	 *
+	 * @param   string  $path  Full path to XML file.
+	 *
+	 * @return  array  XML metadata.
+	 *
+	 * @since       1.5
+	 * @deprecated  4.0 Use \JInstaller::parseXMLInstallFile instead.
+	 */
+	public static function parseXMLLangMetaFile($path)
+	{
+		\JLog::add('ApplicationHelper::parseXMLLangMetaFile is deprecated. Use \JInstaller::parseXMLInstallFile instead.', \JLog::WARNING, 'deprecated');
+
+		// Check if meta file exists.
+		if (!file_exists($path))
+		{
+			return false;
+		}
+
+		// Read the file to see if it's a valid component XML file
+		$xml = simplexml_load_file($path);
+
+		if (!$xml)
+		{
+			return false;
+		}
+
+		/*
+		 * Check for a valid XML root tag.
+		 *
+		 * Should be 'metafile'.
+		 */
+		if ($xml->getName() !== 'metafile')
+		{
+			unset($xml);
+
+			return false;
+		}
+
+		$data = array();
+
+		$data['name'] = (string) $xml->name;
+		$data['type'] = $xml->attributes()->type;
+
+		$data['creationDate'] = ((string) $xml->creationDate) ?: \JText::_('JLIB_UNKNOWN');
+		$data['author'] = ((string) $xml->author) ?: \JText::_('JLIB_UNKNOWN');
+
+		$data['copyright'] = (string) $xml->copyright;
+		$data['authorEmail'] = (string) $xml->authorEmail;
+		$data['authorUrl'] = (string) $xml->authorUrl;
+		$data['version'] = (string) $xml->version;
+		$data['description'] = (string) $xml->description;
+		$data['group'] = (string) $xml->group;
+
+		return $data;
+	}
+}
diff --git a/core/libraries/src/Application/BaseApplication.php b/core/libraries/src/Application/BaseApplication.php
new file mode 100644
index 00000000..15dfe911
--- /dev/null
+++ b/core/libraries/src/Application/BaseApplication.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\AbstractApplication;
+use Joomla\CMS\Input\Input;
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform Base Application Class
+ *
+ * @property-read  \JInput  $input  The application input object
+ *
+ * @since  12.1
+ */
+abstract class BaseApplication extends AbstractApplication
+{
+	/**
+	 * The application dispatcher object.
+	 *
+	 * @var    \JEventDispatcher
+	 * @since  12.1
+	 */
+	protected $dispatcher;
+
+	/**
+	 * The application identity object.
+	 *
+	 * @var    \JUser
+	 * @since  12.1
+	 */
+	protected $identity;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input     $input   An optional argument to provide dependency injection for the application's
+	 *                             input object.  If the argument is a \JInput object that object will become
+	 *                             the application's input object, otherwise a default input object is created.
+	 * @param   Registry  $config  An optional argument to provide dependency injection for the application's
+	 *                             config object.  If the argument is a Registry object that object will become
+	 *                             the application's config object, otherwise a default config object is created.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(Input $input = null, Registry $config = null)
+	{
+		$this->input = $input instanceof Input ? $input : new Input;
+		$this->config = $config instanceof Registry ? $config : new Registry;
+
+		$this->initialise();
+	}
+
+	/**
+	 * Get the application identity.
+	 *
+	 * @return  mixed  A \JUser object or null.
+	 *
+	 * @since   12.1
+	 */
+	public function getIdentity()
+	{
+		return $this->identity;
+	}
+
+	/**
+	 * Registers a handler to a particular event group.
+	 *
+	 * @param   string    $event    The event name.
+	 * @param   callable  $handler  The handler, a function or an instance of an event object.
+	 *
+	 * @return  BaseApplication  The application to allow chaining.
+	 *
+	 * @since   12.1
+	 */
+	public function registerEvent($event, $handler)
+	{
+		if ($this->dispatcher instanceof \JEventDispatcher)
+		{
+			$this->dispatcher->register($event, $handler);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Calls all handlers associated with an event group.
+	 *
+	 * @param   string  $event  The event name.
+	 * @param   array   $args   An array of arguments (optional).
+	 *
+	 * @return  array   An array of results from each function call, or null if no dispatcher is defined.
+	 *
+	 * @since   12.1
+	 */
+	public function triggerEvent($event, array $args = null)
+	{
+		if ($this->dispatcher instanceof \JEventDispatcher)
+		{
+			return $this->dispatcher->trigger($event, $args);
+		}
+
+		return;
+	}
+
+	/**
+	 * Allows the application to load a custom or default dispatcher.
+	 *
+	 * The logic and options for creating this object are adequately generic for default cases
+	 * but for many applications it will make sense to override this method and create event
+	 * dispatchers, if required, based on more specific needs.
+	 *
+	 * @param   \JEventDispatcher  $dispatcher  An optional dispatcher object. If omitted, the factory dispatcher is created.
+	 *
+	 * @return  BaseApplication This method is chainable.
+	 *
+	 * @since   12.1
+	 */
+	public function loadDispatcher(\JEventDispatcher $dispatcher = null)
+	{
+		$this->dispatcher = ($dispatcher === null) ? \JEventDispatcher::getInstance() : $dispatcher;
+
+		return $this;
+	}
+
+	/**
+	 * Allows the application to load a custom or default identity.
+	 *
+	 * The logic and options for creating this object are adequately generic for default cases
+	 * but for many applications it will make sense to override this method and create an identity,
+	 * if required, based on more specific needs.
+	 *
+	 * @param   \JUser  $identity  An optional identity object. If omitted, the factory user is created.
+	 *
+	 * @return  BaseApplication This method is chainable.
+	 *
+	 * @since   12.1
+	 */
+	public function loadIdentity(\JUser $identity = null)
+	{
+		$this->identity = ($identity === null) ? \JFactory::getUser() : $identity;
+
+		return $this;
+	}
+
+	/**
+	 * Method to run the application routines.  Most likely you will want to instantiate a controller
+	 * and execute it, or perform some sort of task directly.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4 (CMS)
+	 * @deprecated  4.0  The default concrete implementation of doExecute() will be removed, subclasses will need to provide their own implementation.
+	 */
+	protected function doExecute()
+	{
+		return;
+	}
+}
diff --git a/core/libraries/src/Application/CMSApplication.php b/core/libraries/src/Application/CMSApplication.php
new file mode 100644
index 00000000..8ee5682a
--- /dev/null
+++ b/core/libraries/src/Application/CMSApplication.php
@@ -0,0 +1,1135 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Input\Input;
+use Joomla\CMS\Session\MetadataManager;
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla! CMS Application class
+ *
+ * @since  3.2
+ */
+class CMSApplication extends WebApplication
+{
+	/**
+	 * Array of options for the \JDocument object
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $docOptions = array();
+
+	/**
+	 * Application instances container.
+	 *
+	 * @var    CMSApplication[]
+	 * @since  3.2
+	 */
+	protected static $instances = array();
+
+	/**
+	 * The scope of the application.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $scope = null;
+
+	/**
+	 * The client identifier.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 * @deprecated  4.0  Will be renamed $clientId
+	 */
+	protected $_clientId = null;
+
+	/**
+	 * The application message queue.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 * @deprecated  4.0  Will be renamed $messageQueue
+	 */
+	protected $_messageQueue = array();
+
+	/**
+	 * The name of the application.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 * @deprecated  4.0  Will be renamed $name
+	 */
+	protected $_name = null;
+
+	/**
+	 * The profiler instance
+	 *
+	 * @var    \JProfiler
+	 * @since  3.2
+	 */
+	protected $profiler = null;
+
+	/**
+	 * Currently active template
+	 *
+	 * @var    object
+	 * @since  3.2
+	 */
+	protected $template = null;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input                   $input   An optional argument to provide dependency injection for the application's
+	 *                                           input object.  If the argument is a \JInput object that object will become
+	 *                                           the application's input object, otherwise a default input object is created.
+	 * @param   Registry                $config  An optional argument to provide dependency injection for the application's
+	 *                                           config object.  If the argument is a Registry object that object will become
+	 *                                           the application's config object, otherwise a default config object is created.
+	 * @param   \JApplicationWebClient  $client  An optional argument to provide dependency injection for the application's
+	 *                                           client object.  If the argument is a \JApplicationWebClient object that object will become
+	 *                                           the application's client object, otherwise a default client object is created.
+	 *
+	 * @since   3.2
+	 */
+	public function __construct(Input $input = null, Registry $config = null, \JApplicationWebClient $client = null)
+	{
+		parent::__construct($input, $config, $client);
+
+		// Load and set the dispatcher
+		$this->loadDispatcher();
+
+		// If JDEBUG is defined, load the profiler instance
+		if (defined('JDEBUG') && JDEBUG)
+		{
+			$this->profiler = \JProfiler::getInstance('Application');
+		}
+
+		// Enable sessions by default.
+		if ($this->config->get('session') === null)
+		{
+			$this->config->set('session', true);
+		}
+
+		// Set the session default name.
+		if ($this->config->get('session_name') === null)
+		{
+			$this->config->set('session_name', $this->getName());
+		}
+
+		// Create the session if a session name is passed.
+		if ($this->config->get('session') !== false)
+		{
+			$this->loadSession();
+		}
+	}
+
+	/**
+	 * Checks the user session.
+	 *
+	 * If the session record doesn't exist, initialise it.
+	 * If session is new, create session variables
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @throws  \RuntimeException
+	 */
+	public function checkSession()
+	{
+		$metadataManager = new MetadataManager($this, \JFactory::getDbo());
+		$metadataManager->createRecordIfNonExisting(\JFactory::getSession(), \JFactory::getUser());
+	}
+
+	/**
+	 * Enqueue a system message.
+	 *
+	 * @param   string  $msg   The message to enqueue.
+	 * @param   string  $type  The message type. Default is message.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function enqueueMessage($msg, $type = 'message')
+	{
+		// Don't add empty messages.
+		if (trim($msg) === '')
+		{
+			return;
+		}
+
+		// For empty queue, if messages exists in the session, enqueue them first.
+		$messages = $this->getMessageQueue();
+
+		$message = array('message' => $msg, 'type' => strtolower($type));
+
+		if (!in_array($message, $this->_messageQueue))
+		{
+			// Enqueue the message.
+			$this->_messageQueue[] = $message;
+		}
+	}
+
+	/**
+	 * Execute the application.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function execute()
+	{
+		// Perform application routines.
+		$this->doExecute();
+
+		// If we have an application document object, render it.
+		if ($this->document instanceof \JDocument)
+		{
+			// Render the application output.
+			$this->render();
+		}
+
+		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
+		if ($this->get('gzip') && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler')
+		{
+			$this->compress();
+
+			// Trigger the onAfterCompress event.
+			$this->triggerEvent('onAfterCompress');
+		}
+
+		// Send the application response.
+		$this->respond();
+
+		// Trigger the onAfterRespond event.
+		$this->triggerEvent('onAfterRespond');
+	}
+
+	/**
+	 * Check if the user is required to reset their password.
+	 *
+	 * If the user is required to reset their password will be redirected to the page that manage the password reset.
+	 *
+	 * @param   string  $option  The option that manage the password reset
+	 * @param   string  $view    The view that manage the password reset
+	 * @param   string  $layout  The layout of the view that manage the password reset
+	 * @param   string  $tasks   Permitted tasks
+	 *
+	 * @return  void
+	 */
+	protected function checkUserRequireReset($option, $view, $layout, $tasks)
+	{
+		if (\JFactory::getUser()->get('requireReset', 0))
+		{
+			$redirect = false;
+
+			/*
+			 * By default user profile edit page is used.
+			 * That page allows you to change more than just the password and might not be the desired behavior.
+			 * This allows a developer to override the page that manage the password reset.
+			 * (can be configured using the file: configuration.php, or if extended, through the global configuration form)
+			 */
+			$name = $this->getName();
+
+			if ($this->get($name . '_reset_password_override', 0))
+			{
+				$option = $this->get($name . '_reset_password_option', '');
+				$view = $this->get($name . '_reset_password_view', '');
+				$layout = $this->get($name . '_reset_password_layout', '');
+				$tasks = $this->get($name . '_reset_password_tasks', '');
+			}
+
+			$task = $this->input->getCmd('task', '');
+
+			// Check task or option/view/layout
+			if (!empty($task))
+			{
+				$tasks = explode(',', $tasks);
+
+				// Check full task version "option/task"
+				if (array_search($this->input->getCmd('option', '') . '/' . $task, $tasks) === false)
+				{
+					// Check short task version, must be on the same option of the view
+					if ($this->input->getCmd('option', '') !== $option || array_search($task, $tasks) === false)
+					{
+						// Not permitted task
+						$redirect = true;
+					}
+				}
+			}
+			else
+			{
+				if ($this->input->getCmd('option', '') !== $option || $this->input->getCmd('view', '') !== $view
+					|| $this->input->getCmd('layout', '') !== $layout)
+				{
+					// Requested a different option/view/layout
+					$redirect = true;
+				}
+			}
+
+			if ($redirect)
+			{
+				// Redirect to the profile edit page
+				$this->enqueueMessage(\JText::_('JGLOBAL_PASSWORD_RESET_REQUIRED'), 'notice');
+				$this->redirect(\JRoute::_('index.php?option=' . $option . '&view=' . $view . '&layout=' . $layout, false));
+			}
+		}
+	}
+
+	/**
+	 * Gets a configuration value.
+	 *
+	 * @param   string  $varname  The name of the value to get.
+	 * @param   string  $default  Default value to return
+	 *
+	 * @return  mixed  The user state.
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Use get() instead
+	 */
+	public function getCfg($varname, $default = null)
+	{
+		return $this->get($varname, $default);
+	}
+
+	/**
+	 * Gets the client id of the current running application.
+	 *
+	 * @return  integer  A client identifier.
+	 *
+	 * @since   3.2
+	 */
+	public function getClientId()
+	{
+		return $this->_clientId;
+	}
+
+	/**
+	 * Returns a reference to the global CMSApplication object, only creating it if it doesn't already exist.
+	 *
+	 * This method must be invoked as: $web = CMSApplication::getInstance();
+	 *
+	 * @param   string  $name  The name (optional) of the CMSApplication class to instantiate.
+	 *
+	 * @return  CMSApplication
+	 *
+	 * @since   3.2
+	 * @throws  \RuntimeException
+	 */
+	public static function getInstance($name = null)
+	{
+		if (empty(static::$instances[$name]))
+		{
+			// Create a CMSApplication object.
+			$classname = '\JApplication' . ucfirst($name);
+
+			if (!class_exists($classname))
+			{
+				throw new \RuntimeException(\JText::sprintf('JLIB_APPLICATION_ERROR_APPLICATION_LOAD', $name), 500);
+			}
+
+			static::$instances[$name] = new $classname;
+		}
+
+		return static::$instances[$name];
+	}
+
+	/**
+	 * Returns the application \JMenu object.
+	 *
+	 * @param   string  $name     The name of the application/client.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  \JMenu|null
+	 *
+	 * @since   3.2
+	 */
+	public function getMenu($name = null, $options = array())
+	{
+		if (!isset($name))
+		{
+			$name = $this->getName();
+		}
+
+		// Inject this application object into the \JMenu tree if one isn't already specified
+		if (!isset($options['app']))
+		{
+			$options['app'] = $this;
+		}
+
+		try
+		{
+			$menu = \JMenu::getInstance($name, $options);
+		}
+		catch (\Exception $e)
+		{
+			return;
+		}
+
+		return $menu;
+	}
+
+	/**
+	 * Get the system message queue.
+	 *
+	 * @param   boolean  $clear  Clear the messages currently attached to the application object
+	 *
+	 * @return  array  The system message queue.
+	 *
+	 * @since   3.2
+	 */
+	public function getMessageQueue($clear = false)
+	{
+		// For empty queue, if messages exists in the session, enqueue them.
+		if (!$this->_messageQueue)
+		{
+			$session = \JFactory::getSession();
+			$sessionQueue = $session->get('application.queue', array());
+
+			if ($sessionQueue)
+			{
+				$this->_messageQueue = $sessionQueue;
+				$session->set('application.queue', array());
+			}
+		}
+
+		$messageQueue = $this->_messageQueue;
+
+		if ($clear)
+		{
+			$this->_messageQueue = array();
+		}
+
+		return $messageQueue;
+	}
+
+	/**
+	 * Gets the name of the current running application.
+	 *
+	 * @return  string  The name of the application.
+	 *
+	 * @since   3.2
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Returns the application \JPathway object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  \JPathway|null
+	 *
+	 * @since   3.2
+	 */
+	public function getPathway($name = null, $options = array())
+	{
+		if (!isset($name))
+		{
+			$name = $this->getName();
+		}
+		else
+		{
+			// Name should not be used
+			$this->getLogger()->warning(
+				'Name attribute is deprecated, in the future fetch the pathway '
+				. 'through the respective application.',
+				array('category' => 'deprecated')
+			);
+		}
+
+		try
+		{
+			$pathway = \JPathway::getInstance($name, $options);
+		}
+		catch (\Exception $e)
+		{
+			return;
+		}
+
+		return $pathway;
+	}
+
+	/**
+	 * Returns the application \JRouter object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  \JRouter|null
+	 *
+	 * @since   3.2
+	 */
+	public static function getRouter($name = null, array $options = array())
+	{
+		if (!isset($name))
+		{
+			$app = \JFactory::getApplication();
+			$name = $app->getName();
+		}
+
+		try
+		{
+			$router = \JRouter::getInstance($name, $options);
+		}
+		catch (\Exception $e)
+		{
+			return;
+		}
+
+		return $router;
+	}
+
+	/**
+	 * Gets the name of the current template.
+	 *
+	 * @param   boolean  $params  An optional associative array of configuration settings
+	 *
+	 * @return  mixed  System is the fallback.
+	 *
+	 * @since   3.2
+	 */
+	public function getTemplate($params = false)
+	{
+		$template = new \stdClass;
+
+		$template->template = 'system';
+		$template->params   = new Registry;
+
+		if ($params)
+		{
+			return $template;
+		}
+
+		return $template->template;
+	}
+
+	/**
+	 * Gets a user state.
+	 *
+	 * @param   string  $key      The path of the state.
+	 * @param   mixed   $default  Optional default value, returned if the internal value is null.
+	 *
+	 * @return  mixed  The user state or null.
+	 *
+	 * @since   3.2
+	 */
+	public function getUserState($key, $default = null)
+	{
+		$session = \JFactory::getSession();
+		$registry = $session->get('registry');
+
+		if ($registry !== null)
+		{
+			return $registry->get($key, $default);
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Gets the value of a user state variable.
+	 *
+	 * @param   string  $key      The key of the user state variable.
+	 * @param   string  $request  The name of the variable passed in a request.
+	 * @param   string  $default  The default value for the variable if not found. Optional.
+	 * @param   string  $type     Filter for the variable, for valid values see {@link \JFilterInput::clean()}. Optional.
+	 *
+	 * @return  mixed  The request user state.
+	 *
+	 * @since   3.2
+	 */
+	public function getUserStateFromRequest($key, $request, $default = null, $type = 'none')
+	{
+		$cur_state = $this->getUserState($key, $default);
+		$new_state = $this->input->get($request, null, $type);
+
+		if ($new_state === null)
+		{
+			return $cur_state;
+		}
+
+		// Save the new value only if it was set in this request.
+		$this->setUserState($key, $new_state);
+
+		return $new_state;
+	}
+
+	/**
+	 * Initialise the application.
+	 *
+	 * @param   array  $options  An optional associative array of configuration settings.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function initialiseApp($options = array())
+	{
+		// Set the configuration in the API.
+		$this->config = \JFactory::getConfig();
+
+		// Check that we were given a language in the array (since by default may be blank).
+		if (isset($options['language']))
+		{
+			$this->set('language', $options['language']);
+		}
+
+		// Build our language object
+		$lang = \JLanguage::getInstance($this->get('language'), $this->get('debug_lang'));
+
+		// Load the language to the API
+		$this->loadLanguage($lang);
+
+		// Register the language object with \JFactory
+		\JFactory::$language = $this->getLanguage();
+
+		// Load the library language files
+		$this->loadLibraryLanguage();
+
+		// Set user specific editor.
+		$user = \JFactory::getUser();
+		$editor = $user->getParam('editor', $this->get('editor'));
+
+		if (!\JPluginHelper::isEnabled('editors', $editor))
+		{
+			$editor = $this->get('editor');
+
+			if (!\JPluginHelper::isEnabled('editors', $editor))
+			{
+				$editor = 'none';
+			}
+		}
+
+		$this->set('editor', $editor);
+
+		// Trigger the onAfterInitialise event.
+		\JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterInitialise');
+	}
+
+	/**
+	 * Is admin interface?
+	 *
+	 * @return  boolean  True if this application is administrator.
+	 *
+	 * @since   3.2
+	 * @deprecated  Use isClient('administrator') instead.
+	 */
+	public function isAdmin()
+	{
+		return $this->isClient('administrator');
+	}
+
+	/**
+	 * Is site interface?
+	 *
+	 * @return  boolean  True if this application is site.
+	 *
+	 * @since   3.2
+	 * @deprecated  Use isClient('site') instead.
+	 */
+	public function isSite()
+	{
+		return $this->isClient('site');
+	}
+
+	/**
+	 * Checks if HTTPS is forced in the client configuration.
+	 *
+	 * @param   integer  $clientId  An optional client id (defaults to current application client).
+	 *
+	 * @return  boolean  True if is forced for the client, false otherwise.
+	 *
+	 * @since   3.7.3
+	 */
+	public function isHttpsForced($clientId = null)
+	{
+		$clientId = (int) ($clientId !== null ? $clientId : $this->getClientId());
+		$forceSsl = (int) $this->get('force_ssl');
+
+		if ($clientId === 0 && $forceSsl === 2)
+		{
+			return true;
+		}
+
+		if ($clientId === 1 && $forceSsl >= 1)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check the client interface by name.
+	 *
+	 * @param   string  $identifier  String identifier for the application interface
+	 *
+	 * @return  boolean  True if this application is of the given type client interface.
+	 *
+	 * @since   3.7.0
+	 */
+	public function isClient($identifier)
+	{
+		return $this->getName() === $identifier;
+	}
+
+	/**
+	 * Load the library language files for the application
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.3
+	 */
+	protected function loadLibraryLanguage()
+	{
+		$this->getLanguage()->load('lib_joomla', JPATH_ADMINISTRATOR);
+	}
+
+	/**
+	 * Allows the application to load a custom or default session.
+	 *
+	 * The logic and options for creating this object are adequately generic for default cases
+	 * but for many applications it will make sense to override this method and create a session,
+	 * if required, based on more specific needs.
+	 *
+	 * @param   \JSession  $session  An optional session object. If omitted, the session is created.
+	 *
+	 * @return  CMSApplication  This method is chainable.
+	 *
+	 * @since   3.2
+	 */
+	public function loadSession(\JSession $session = null)
+	{
+		if ($session !== null)
+		{
+			$this->session = $session;
+
+			return $this;
+		}
+
+		$this->registerEvent('onAfterSessionStart', array($this, 'afterSessionStart'));
+
+		/*
+		 * Note: The below code CANNOT change from instantiating a session via \JFactory until there is a proper dependency injection container supported
+		 * by the application. The current default behaviours result in this method being called each time an application class is instantiated.
+		 * https://github.com/joomla/joomla-cms/issues/12108 explains why things will crash and burn if you ever attempt to make this change
+		 * without a proper dependency injection container.
+		 */
+
+		$session = \JFactory::getSession(
+			array(
+				'name'      => \JApplicationHelper::getHash($this->get('session_name', get_class($this))),
+				'expire'    => $this->get('lifetime') ? $this->get('lifetime') * 60 : 900,
+				'force_ssl' => $this->isHttpsForced(),
+			)
+		);
+
+		$session->initialise($this->input, $this->dispatcher);
+
+		// Get the session handler from the configuration.
+		$handler = $this->get('session_handler', 'none');
+
+		/*
+		 * Check for extra session metadata when:
+		 *
+		 * 1) The database handler is in use and the session is new
+		 * 2) The database handler is not in use and the time is an even numbered second or the session is new
+		 */
+		if (($handler !== 'database' && (time() % 2 || $session->isNew())) || ($handler === 'database' && $session->isNew()))
+		{
+			$this->checkSession();
+		}
+
+		// Set the session object.
+		$this->session = $session;
+
+		return $this;
+	}
+
+	/**
+	 * Login authentication function.
+	 *
+	 * Username and encoded password are passed the onUserLogin event which
+	 * is responsible for the user validation. A successful validation updates
+	 * the current session record with the user's details.
+	 *
+	 * Username and encoded password are sent as credentials (along with other
+	 * possibilities) to each observer (authentication plugin) for user
+	 * validation.  Successful validation will update the current session with
+	 * the user details.
+	 *
+	 * @param   array  $credentials  Array('username' => string, 'password' => string)
+	 * @param   array  $options      Array('remember' => boolean)
+	 *
+	 * @return  boolean|\JException  True on success, false if failed or silent handling is configured, or a \JException object on authentication error.
+	 *
+	 * @since   3.2
+	 */
+	public function login($credentials, $options = array())
+	{
+		// Get the global \JAuthentication object.
+		$authenticate = \JAuthentication::getInstance();
+		$response = $authenticate->authenticate($credentials, $options);
+
+		// Import the user plugin group.
+		\JPluginHelper::importPlugin('user');
+
+		if ($response->status === \JAuthentication::STATUS_SUCCESS)
+		{
+			/*
+			 * Validate that the user should be able to login (different to being authenticated).
+			 * This permits authentication plugins blocking the user.
+			 */
+			$authorisations = $authenticate->authorise($response, $options);
+			$denied_states = \JAuthentication::STATUS_EXPIRED | \JAuthentication::STATUS_DENIED;
+
+			foreach ($authorisations as $authorisation)
+			{
+				if ((int) $authorisation->status & $denied_states)
+				{
+					// Trigger onUserAuthorisationFailure Event.
+					$this->triggerEvent('onUserAuthorisationFailure', array((array) $authorisation));
+
+					// If silent is set, just return false.
+					if (isset($options['silent']) && $options['silent'])
+					{
+						return false;
+					}
+
+					// Return the error.
+					switch ($authorisation->status)
+					{
+						case \JAuthentication::STATUS_EXPIRED:
+							return \JError::raiseWarning('102002', \JText::_('JLIB_LOGIN_EXPIRED'));
+
+						case \JAuthentication::STATUS_DENIED:
+							return \JError::raiseWarning('102003', \JText::_('JLIB_LOGIN_DENIED'));
+
+						default:
+							return \JError::raiseWarning('102004', \JText::_('JLIB_LOGIN_AUTHORISATION'));
+					}
+				}
+			}
+
+			// OK, the credentials are authenticated and user is authorised.  Let's fire the onLogin event.
+			$results = $this->triggerEvent('onUserLogin', array((array) $response, $options));
+
+			/*
+			 * If any of the user plugins did not successfully complete the login routine
+			 * then the whole method fails.
+			 *
+			 * Any errors raised should be done in the plugin as this provides the ability
+			 * to provide much more information about why the routine may have failed.
+			 */
+			$user = \JFactory::getUser();
+
+			if ($response->type === 'Cookie')
+			{
+				$user->set('cookieLogin', true);
+			}
+
+			if (in_array(false, $results, true) == false)
+			{
+				$options['user'] = $user;
+				$options['responseType'] = $response->type;
+
+				// The user is successfully logged in. Run the after login events
+				$this->triggerEvent('onUserAfterLogin', array($options));
+			}
+
+			return true;
+		}
+
+		// Trigger onUserLoginFailure Event.
+		$this->triggerEvent('onUserLoginFailure', array((array) $response));
+
+		// If silent is set, just return false.
+		if (isset($options['silent']) && $options['silent'])
+		{
+			return false;
+		}
+
+		// If status is success, any error will have been raised by the user plugin
+		if ($response->status !== \JAuthentication::STATUS_SUCCESS)
+		{
+			$this->getLogger()->warning($response->error_message, array('category' => 'jerror'));
+		}
+
+		return false;
+	}
+
+	/**
+	 * Logout authentication function.
+	 *
+	 * Passed the current user information to the onUserLogout event and reverts the current
+	 * session record back to 'anonymous' parameters.
+	 * If any of the authentication plugins did not successfully complete
+	 * the logout routine then the whole method fails. Any errors raised
+	 * should be done in the plugin as this provides the ability to give
+	 * much more information about why the routine may have failed.
+	 *
+	 * @param   integer  $userid   The user to load - Can be an integer or string - If string, it is converted to ID automatically
+	 * @param   array    $options  Array('clientid' => array of client id's)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 */
+	public function logout($userid = null, $options = array())
+	{
+		// Get a user object from the \JApplication.
+		$user = \JFactory::getUser($userid);
+
+		// Build the credentials array.
+		$parameters['username'] = $user->get('username');
+		$parameters['id'] = $user->get('id');
+
+		// Set clientid in the options array if it hasn't been set already and shared sessions are not enabled.
+		if (!$this->get('shared_session', '0') && !isset($options['clientid']))
+		{
+			$options['clientid'] = $this->getClientId();
+		}
+
+		// Import the user plugin group.
+		\JPluginHelper::importPlugin('user');
+
+		// OK, the credentials are built. Lets fire the onLogout event.
+		$results = $this->triggerEvent('onUserLogout', array($parameters, $options));
+
+		// Check if any of the plugins failed. If none did, success.
+		if (!in_array(false, $results, true))
+		{
+			$options['username'] = $user->get('username');
+			$this->triggerEvent('onUserAfterLogout', array($options));
+
+			return true;
+		}
+
+		// Trigger onUserLoginFailure Event.
+		$this->triggerEvent('onUserLogoutFailure', array($parameters));
+
+		return false;
+	}
+
+	/**
+	 * Redirect to another URL.
+	 *
+	 * If the headers have not been sent the redirect will be accomplished using a "301 Moved Permanently"
+	 * or "303 See Other" code in the header pointing to the new location. If the headers have already been
+	 * sent this will be accomplished using a JavaScript statement.
+	 *
+	 * @param   string   $url     The URL to redirect to. Can only be http/https URL
+	 * @param   integer  $status  The HTTP 1.1 status code to be provided. 303 is assumed by default.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function redirect($url, $status = 303)
+	{
+		// Handle B/C by checking if a message was passed to the method, will be removed at 4.0
+		if (func_num_args() > 1)
+		{
+			$args = func_get_args();
+
+			/*
+			 * Do some checks on the $args array, values below correspond to legacy redirect() method
+			 *
+			 * $args[0] = $url
+			 * $args[1] = Message to enqueue
+			 * $args[2] = Message type
+			 * $args[3] = $status (previously moved)
+			 */
+			if (isset($args[1]) && !empty($args[1]) && (!is_bool($args[1]) && !is_int($args[1])))
+			{
+				$this->getLogger()->warning(
+					'Passing a message and message type to ' . __METHOD__ . '() is deprecated. '
+					. 'Please set your message via ' . __CLASS__ . '::enqueueMessage() prior to calling ' . __CLASS__
+					. '::redirect().',
+					array('category' => 'deprecated')
+				);
+
+				$message = $args[1];
+
+				// Set the message type if present
+				if (isset($args[2]) && !empty($args[2]))
+				{
+					$type = $args[2];
+				}
+				else
+				{
+					$type = 'message';
+				}
+
+				// Enqueue the message
+				$this->enqueueMessage($message, $type);
+
+				// Reset the $moved variable
+				$status = isset($args[3]) ? (boolean) $args[3] : false;
+			}
+		}
+
+		// Persist messages if they exist.
+		if ($this->_messageQueue)
+		{
+			$session = \JFactory::getSession();
+			$session->set('application.queue', $this->_messageQueue);
+		}
+
+		// Hand over processing to the parent now
+		parent::redirect($url, $status);
+	}
+
+	/**
+	 * Rendering is the process of pushing the document buffers into the template
+	 * placeholders, retrieving data from the document and pushing it into
+	 * the application response buffer.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function render()
+	{
+		// Setup the document options.
+		$this->docOptions['template'] = $this->get('theme');
+		$this->docOptions['file']     = $this->get('themeFile', 'index.php');
+		$this->docOptions['params']   = $this->get('themeParams');
+
+		if ($this->get('themes.base'))
+		{
+			$this->docOptions['directory'] = $this->get('themes.base');
+		}
+		// Fall back to constants.
+		else
+		{
+			$this->docOptions['directory'] = defined('JPATH_THEMES') ? JPATH_THEMES : (defined('JPATH_BASE') ? JPATH_BASE : __DIR__) . '/themes';
+		}
+
+		// Parse the document.
+		$this->document->parse($this->docOptions);
+
+		// Trigger the onBeforeRender event.
+		\JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onBeforeRender');
+
+		$caching = false;
+
+		if ($this->isClient('site') && $this->get('caching') && $this->get('caching', 2) == 2 && !\JFactory::getUser()->get('id'))
+		{
+			$caching = true;
+		}
+
+		// Render the document.
+		$data = $this->document->render($caching, $this->docOptions);
+
+		// Set the application output data.
+		$this->setBody($data);
+
+		// Trigger the onAfterRender event.
+		$this->triggerEvent('onAfterRender');
+
+		// Mark afterRender in the profiler.
+		JDEBUG ? $this->profiler->mark('afterRender') : null;
+	}
+
+	/**
+	 * Route the application.
+	 *
+	 * Routing is the process of examining the request environment to determine which
+	 * component should receive the request. The component optional parameters
+	 * are then set in the request object to be processed when the application is being
+	 * dispatched.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function route()
+	{
+		// Get the full request URI.
+		$uri = clone \JUri::getInstance();
+
+		$router = static::getRouter();
+		$result = $router->parse($uri);
+
+		foreach ($result as $key => $value)
+		{
+			$this->input->def($key, $value);
+		}
+
+		// Trigger the onAfterRoute event.
+		\JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterRoute');
+	}
+
+	/**
+	 * Sets the value of a user state variable.
+	 *
+	 * @param   string  $key    The path of the state.
+	 * @param   mixed   $value  The value of the variable.
+	 *
+	 * @return  mixed  The previous state, if one existed.
+	 *
+	 * @since   3.2
+	 */
+	public function setUserState($key, $value)
+	{
+		$session = \JFactory::getSession();
+		$registry = $session->get('registry');
+
+		if ($registry !== null)
+		{
+			return $registry->set($key, $value);
+		}
+
+		return;
+	}
+
+	/**
+	 * Sends all headers prior to returning the string
+	 *
+	 * @param   boolean  $compress  If true, compress the data
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function toString($compress = false)
+	{
+		// Don't compress something if the server is going to do it anyway. Waste of time.
+		if ($compress && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler')
+		{
+			$this->compress();
+		}
+
+		if ($this->allowCache() === false)
+		{
+			$this->setHeader('Cache-Control', 'no-cache', false);
+
+			// HTTP 1.0
+			$this->setHeader('Pragma', 'no-cache');
+		}
+
+		$this->sendHeaders();
+
+		return $this->getBody();
+	}
+}
diff --git a/core/libraries/src/Application/CliApplication.php b/core/libraries/src/Application/CliApplication.php
new file mode 100644
index 00000000..f74f9ac8
--- /dev/null
+++ b/core/libraries/src/Application/CliApplication.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\Cli\CliOutput;
+use Joomla\CMS\Input\Cli;
+use Joomla\CMS\Input\Input;
+use Joomla\Registry\Registry;
+
+/**
+ * Base class for a Joomla! command line application.
+ *
+ * @since  11.4
+ * @note   As of 4.0 this class will be abstract
+ */
+class CliApplication extends BaseApplication
+{
+	/**
+	 * @var    CliOutput  The output type.
+	 * @since  3.3
+	 */
+	protected $output;
+
+	/**
+	 * @var    CliApplication  The application instance.
+	 * @since  11.1
+	 */
+	protected static $instance;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Cli                $input       An optional argument to provide dependency injection for the application's
+	 *                                          input object.  If the argument is a \JInputCli object that object will become
+	 *                                          the application's input object, otherwise a default input object is created.
+	 * @param   Registry           $config      An optional argument to provide dependency injection for the application's
+	 *                                          config object.  If the argument is a Registry object that object will become
+	 *                                          the application's config object, otherwise a default config object is created.
+	 * @param   \JEventDispatcher  $dispatcher  An optional argument to provide dependency injection for the application's
+	 *                                          event dispatcher.  If the argument is a \JEventDispatcher object that object will become
+	 *                                          the application's event dispatcher, if it is null then the default event dispatcher
+	 *                                          will be created based on the application's loadDispatcher() method.
+	 *
+	 * @see     BaseApplication::loadDispatcher()
+	 * @since   11.1
+	 */
+	public function __construct(Cli $input = null, Registry $config = null, \JEventDispatcher $dispatcher = null)
+	{
+		// Close the application if we are not executed from the command line.
+		if (!defined('STDOUT') || !defined('STDIN') || !isset($_SERVER['argv']))
+		{
+			$this->close();
+		}
+
+		// If an input object is given use it.
+		if ($input instanceof Input)
+		{
+			$this->input = $input;
+		}
+		// Create the input based on the application logic.
+		else
+		{
+			if (class_exists('\\Joomla\\CMS\\Input\\Cli'))
+			{
+				$this->input = new Cli;
+			}
+		}
+
+		// If a config object is given use it.
+		if ($config instanceof Registry)
+		{
+			$this->config = $config;
+		}
+		// Instantiate a new configuration object.
+		else
+		{
+			$this->config = new Registry;
+		}
+
+		$this->loadDispatcher($dispatcher);
+
+		// Load the configuration object.
+		$this->loadConfiguration($this->fetchConfigurationData());
+
+		// Set the execution datetime and timestamp;
+		$this->set('execution.datetime', gmdate('Y-m-d H:i:s'));
+		$this->set('execution.timestamp', time());
+
+		// Set the current directory.
+		$this->set('cwd', getcwd());
+	}
+
+	/**
+	 * Returns a reference to the global CliApplication object, only creating it if it doesn't already exist.
+	 *
+	 * This method must be invoked as: $cli = CliApplication::getInstance();
+	 *
+	 * @param   string  $name  The name (optional) of the JApplicationCli class to instantiate.
+	 *
+	 * @return  CliApplication
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($name = null)
+	{
+		// Only create the object if it doesn't exist.
+		if (empty(self::$instance))
+		{
+			if (class_exists($name) && (is_subclass_of($name, '\\Joomla\\CMS\\Application\\CliApplication')))
+			{
+				self::$instance = new $name;
+			}
+			else
+			{
+				self::$instance = new CliApplication;
+			}
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Execute the application.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function execute()
+	{
+		// Trigger the onBeforeExecute event.
+		$this->triggerEvent('onBeforeExecute');
+
+		// Perform application routines.
+		$this->doExecute();
+
+		// Trigger the onAfterExecute event.
+		$this->triggerEvent('onAfterExecute');
+	}
+
+	/**
+	 * Load an object or array into the application configuration object.
+	 *
+	 * @param   mixed  $data  Either an array or object to be loaded into the configuration object.
+	 *
+	 * @return  CliApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function loadConfiguration($data)
+	{
+		// Load the data into the configuration object.
+		if (is_array($data))
+		{
+			$this->config->loadArray($data);
+		}
+		elseif (is_object($data))
+		{
+			$this->config->loadObject($data);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Write a string to standard output.
+	 *
+	 * @param   string   $text  The text to display.
+	 * @param   boolean  $nl    True (default) to append a new line at the end of the output string.
+	 *
+	 * @return  CliApplication  Instance of $this to allow chaining.
+	 *
+	 * @codeCoverageIgnore
+	 * @since   11.1
+	 */
+	public function out($text = '', $nl = true)
+	{
+		$output = $this->getOutput();
+		$output->out($text, $nl);
+
+		return $this;
+	}
+
+	/**
+	 * Get an output object.
+	 *
+	 * @return  CliOutput
+	 *
+	 * @since   3.3
+	 */
+	public function getOutput()
+	{
+		if (!$this->output)
+		{
+			// In 4.0, this will convert to throwing an exception and you will expected to
+			// initialize this in the constructor. Until then set a default.
+			$default = new \Joomla\Application\Cli\Output\Xml;
+			$this->setOutput($default);
+		}
+
+		return $this->output;
+	}
+
+	/**
+	 * Set an output object.
+	 *
+	 * @param   CliOutput  $output  CliOutput object
+	 *
+	 * @return  CliApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   3.3
+	 */
+	public function setOutput(CliOutput $output)
+	{
+		$this->output = $output;
+
+		return $this;
+	}
+
+	/**
+	 * Get a value from standard input.
+	 *
+	 * @return  string  The input string from standard input.
+	 *
+	 * @codeCoverageIgnore
+	 * @since   11.1
+	 */
+	public function in()
+	{
+		return rtrim(fread(STDIN, 8192), "\n");
+	}
+
+	/**
+	 * Method to load a PHP configuration class file based on convention and return the instantiated data object.  You
+	 * will extend this method in child classes to provide configuration data from whatever data source is relevant
+	 * for your specific application.
+	 *
+	 * @param   string  $file   The path and filename of the configuration file. If not provided, configuration.php
+	 *                          in JPATH_CONFIGURATION will be used.
+	 * @param   string  $class  The class name to instantiate.
+	 *
+	 * @return  mixed   Either an array or object to be loaded into the configuration object.
+	 *
+	 * @since   11.1
+	 */
+	protected function fetchConfigurationData($file = '', $class = '\JConfig')
+	{
+		// Instantiate variables.
+		$config = array();
+
+		if (empty($file))
+		{
+			$file = JPATH_CONFIGURATION . '/configuration.php';
+
+			// Applications can choose not to have any configuration data by not implementing this method and not having a config file.
+			if (!file_exists($file))
+			{
+				$file = '';
+			}
+		}
+
+		if (!empty($file))
+		{
+			\JLoader::register($class, $file);
+
+			if (class_exists($class))
+			{
+				$config = new $class;
+			}
+			else
+			{
+				throw new \RuntimeException('Configuration class does not exist.');
+			}
+		}
+
+		return $config;
+	}
+}
diff --git a/core/libraries/src/Application/DaemonApplication.php b/core/libraries/src/Application/DaemonApplication.php
new file mode 100644
index 00000000..069f88e7
--- /dev/null
+++ b/core/libraries/src/Application/DaemonApplication.php
@@ -0,0 +1,906 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+
+use Joomla\Registry\Registry;
+
+/**
+ * Class to turn CliApplication applications into daemons.  It requires CLI and PCNTL support built into PHP.
+ *
+ * @link   https://secure.php.net/manual/en/book.pcntl.php
+ * @link   https://secure.php.net/manual/en/features.commandline.php
+ * @since  11.1
+ */
+class DaemonApplication extends CliApplication
+{
+	/**
+	 * @var    array  The available POSIX signals to be caught by default.
+	 * @link   https://secure.php.net/manual/pcntl.constants.php
+	 * @since  11.1
+	 */
+	protected static $signals = array(
+		'SIGHUP',
+		'SIGINT',
+		'SIGQUIT',
+		'SIGILL',
+		'SIGTRAP',
+		'SIGABRT',
+		'SIGIOT',
+		'SIGBUS',
+		'SIGFPE',
+		'SIGUSR1',
+		'SIGSEGV',
+		'SIGUSR2',
+		'SIGPIPE',
+		'SIGALRM',
+		'SIGTERM',
+		'SIGSTKFLT',
+		'SIGCLD',
+		'SIGCHLD',
+		'SIGCONT',
+		'SIGTSTP',
+		'SIGTTIN',
+		'SIGTTOU',
+		'SIGURG',
+		'SIGXCPU',
+		'SIGXFSZ',
+		'SIGVTALRM',
+		'SIGPROF',
+		'SIGWINCH',
+		'SIGPOLL',
+		'SIGIO',
+		'SIGPWR',
+		'SIGSYS',
+		'SIGBABY',
+		'SIG_BLOCK',
+		'SIG_UNBLOCK',
+		'SIG_SETMASK',
+	);
+
+	/**
+	 * @var    boolean  True if the daemon is in the process of exiting.
+	 * @since  11.1
+	 */
+	protected $exiting = false;
+
+	/**
+	 * @var    integer  The parent process id.
+	 * @since  12.1
+	 */
+	protected $parentId = 0;
+
+	/**
+	 * @var    integer  The process id of the daemon.
+	 * @since  11.1
+	 */
+	protected $processId = 0;
+
+	/**
+	 * @var    boolean  True if the daemon is currently running.
+	 * @since  11.1
+	 */
+	protected $running = false;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   \JInputCli         $input       An optional argument to provide dependency injection for the application's
+	 *                                         input object.  If the argument is a \JInputCli object that object will become
+	 *                                         the application's input object, otherwise a default input object is created.
+	 * @param   Registry           $config      An optional argument to provide dependency injection for the application's
+	 *                                         config object.  If the argument is a Registry object that object will become
+	 *                                         the application's config object, otherwise a default config object is created.
+	 * @param   \JEventDispatcher  $dispatcher  An optional argument to provide dependency injection for the application's
+	 *                                         event dispatcher.  If the argument is a \JEventDispatcher object that object will become
+	 *                                         the application's event dispatcher, if it is null then the default event dispatcher
+	 *                                         will be created based on the application's loadDispatcher() method.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public function __construct(\JInputCli $input = null, Registry $config = null, \JEventDispatcher $dispatcher = null)
+	{
+		// Verify that the process control extension for PHP is available.
+		if (!defined('SIGHUP'))
+		{
+			\JLog::add('The PCNTL extension for PHP is not available.', \JLog::ERROR);
+			throw new \RuntimeException('The PCNTL extension for PHP is not available.');
+		}
+
+		// Verify that POSIX support for PHP is available.
+		if (!function_exists('posix_getpid'))
+		{
+			\JLog::add('The POSIX extension for PHP is not available.', \JLog::ERROR);
+			throw new \RuntimeException('The POSIX extension for PHP is not available.');
+		}
+
+		// Call the parent constructor.
+		parent::__construct($input, $config, $dispatcher);
+
+		// Set some system limits.
+		@set_time_limit($this->config->get('max_execution_time', 0));
+
+		if ($this->config->get('max_memory_limit') !== null)
+		{
+			ini_set('memory_limit', $this->config->get('max_memory_limit', '256M'));
+		}
+
+		// Flush content immediately.
+		ob_implicit_flush();
+	}
+
+	/**
+	 * Method to handle POSIX signals.
+	 *
+	 * @param   integer  $signal  The received POSIX signal.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @see     pcntl_signal()
+	 * @throws  \RuntimeException
+	 */
+	public static function signal($signal)
+	{
+		// Log all signals sent to the daemon.
+		\JLog::add('Received signal: ' . $signal, \JLog::DEBUG);
+
+		// Let's make sure we have an application instance.
+		if (!is_subclass_of(static::$instance, 'CliApplication'))
+		{
+			\JLog::add('Cannot find the application instance.', \JLog::EMERGENCY);
+			throw new \RuntimeException('Cannot find the application instance.');
+		}
+
+		// Fire the onReceiveSignal event.
+		static::$instance->triggerEvent('onReceiveSignal', array($signal));
+
+		switch ($signal)
+		{
+			case SIGINT:
+			case SIGTERM:
+				// Handle shutdown tasks
+				if (static::$instance->running && static::$instance->isActive())
+				{
+					static::$instance->shutdown();
+				}
+				else
+				{
+					static::$instance->close();
+				}
+				break;
+			case SIGHUP:
+				// Handle restart tasks
+				if (static::$instance->running && static::$instance->isActive())
+				{
+					static::$instance->shutdown(true);
+				}
+				else
+				{
+					static::$instance->close();
+				}
+				break;
+			case SIGCHLD:
+				// A child process has died
+				while (static::$instance->pcntlWait($signal, WNOHANG || WUNTRACED) > 0)
+				{
+					usleep(1000);
+				}
+				break;
+			case SIGCLD:
+				while (static::$instance->pcntlWait($signal, WNOHANG) > 0)
+				{
+					$signal = static::$instance->pcntlChildExitStatus($signal);
+				}
+				break;
+			default:
+				break;
+		}
+	}
+
+	/**
+	 * Check to see if the daemon is active.  This does not assume that $this daemon is active, but
+	 * only if an instance of the application is active as a daemon.
+	 *
+	 * @return  boolean  True if daemon is active.
+	 *
+	 * @since   11.1
+	 */
+	public function isActive()
+	{
+		// Get the process id file location for the application.
+		$pidFile = $this->config->get('application_pid_file');
+
+		// If the process id file doesn't exist then the daemon is obviously not running.
+		if (!is_file($pidFile))
+		{
+			return false;
+		}
+
+		// Read the contents of the process id file as an integer.
+		$fp = fopen($pidFile, 'r');
+		$pid = fread($fp, filesize($pidFile));
+		$pid = (int) $pid;
+		fclose($fp);
+
+		// Check to make sure that the process id exists as a positive integer.
+		if (!$pid)
+		{
+			return false;
+		}
+
+		// Check to make sure the process is active by pinging it and ensure it responds.
+		if (!posix_kill($pid, 0))
+		{
+			// No response so remove the process id file and log the situation.
+			@ unlink($pidFile);
+			\JLog::add('The process found based on PID file was unresponsive.', \JLog::WARNING);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Load an object or array into the application configuration object.
+	 *
+	 * @param   mixed  $data  Either an array or object to be loaded into the configuration object.
+	 *
+	 * @return  DaemonApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function loadConfiguration($data)
+	{
+		// Execute the parent load method.
+		parent::loadConfiguration($data);
+
+		/*
+		 * Setup some application metadata options.  This is useful if we ever want to write out startup scripts
+		 * or just have some sort of information available to share about things.
+		 */
+
+		// The application author name.  This string is used in generating startup scripts and has
+		// a maximum of 50 characters.
+		$tmp = (string) $this->config->get('author_name', 'Joomla Platform');
+		$this->config->set('author_name', (strlen($tmp) > 50) ? substr($tmp, 0, 50) : $tmp);
+
+		// The application author email.  This string is used in generating startup scripts.
+		$tmp = (string) $this->config->get('author_email', 'admin@joomla.org');
+		$this->config->set('author_email', filter_var($tmp, FILTER_VALIDATE_EMAIL));
+
+		// The application name.  This string is used in generating startup scripts.
+		$tmp = (string) $this->config->get('application_name', 'DaemonApplication');
+		$this->config->set('application_name', (string) preg_replace('/[^A-Z0-9_-]/i', '', $tmp));
+
+		// The application description.  This string is used in generating startup scripts.
+		$tmp = (string) $this->config->get('application_description', 'A generic Joomla Platform application.');
+		$this->config->set('application_description', filter_var($tmp, FILTER_SANITIZE_STRING));
+
+		/*
+		 * Setup the application path options.  This defines the default executable name, executable directory,
+		 * and also the path to the daemon process id file.
+		 */
+
+		// The application executable daemon.  This string is used in generating startup scripts.
+		$tmp = (string) $this->config->get('application_executable', basename($this->input->executable));
+		$this->config->set('application_executable', $tmp);
+
+		// The home directory of the daemon.
+		$tmp = (string) $this->config->get('application_directory', dirname($this->input->executable));
+		$this->config->set('application_directory', $tmp);
+
+		// The pid file location.  This defaults to a path inside the /tmp directory.
+		$name = $this->config->get('application_name');
+		$tmp = (string) $this->config->get('application_pid_file', strtolower('/tmp/' . $name . '/' . $name . '.pid'));
+		$this->config->set('application_pid_file', $tmp);
+
+		/*
+		 * Setup the application identity options.  It is important to remember if the default of 0 is set for
+		 * either UID or GID then changing that setting will not be attempted as there is no real way to "change"
+		 * the identity of a process from some user to root.
+		 */
+
+		// The user id under which to run the daemon.
+		$tmp = (int) $this->config->get('application_uid', 0);
+		$options = array('options' => array('min_range' => 0, 'max_range' => 65000));
+		$this->config->set('application_uid', filter_var($tmp, FILTER_VALIDATE_INT, $options));
+
+		// The group id under which to run the daemon.
+		$tmp = (int) $this->config->get('application_gid', 0);
+		$options = array('options' => array('min_range' => 0, 'max_range' => 65000));
+		$this->config->set('application_gid', filter_var($tmp, FILTER_VALIDATE_INT, $options));
+
+		// Option to kill the daemon if it cannot switch to the chosen identity.
+		$tmp = (bool) $this->config->get('application_require_identity', 1);
+		$this->config->set('application_require_identity', $tmp);
+
+		/*
+		 * Setup the application runtime options.  By default our execution time limit is infinite obviously
+		 * because a daemon should be constantly running unless told otherwise.  The default limit for memory
+		 * usage is 256M, which admittedly is a little high, but remember it is a "limit" and PHP's memory
+		 * management leaves a bit to be desired :-)
+		 */
+
+		// The maximum execution time of the application in seconds.  Zero is infinite.
+		$tmp = $this->config->get('max_execution_time');
+
+		if ($tmp !== null)
+		{
+			$this->config->set('max_execution_time', (int) $tmp);
+		}
+
+		// The maximum amount of memory the application can use.
+		$tmp = $this->config->get('max_memory_limit', '256M');
+
+		if ($tmp !== null)
+		{
+			$this->config->set('max_memory_limit', (string) $tmp);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Execute the daemon.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function execute()
+	{
+		// Trigger the onBeforeExecute event.
+		$this->triggerEvent('onBeforeExecute');
+
+		// Enable basic garbage collection.
+		gc_enable();
+
+		\JLog::add('Starting ' . $this->name, \JLog::INFO);
+
+		// Set off the process for becoming a daemon.
+		if ($this->daemonize())
+		{
+			// Declare ticks to start signal monitoring. When you declare ticks, PCNTL will monitor
+			// incoming signals after each tick and call the relevant signal handler automatically.
+			declare (ticks = 1);
+
+			// Start the main execution loop.
+			while (true)
+			{
+				// Perform basic garbage collection.
+				$this->gc();
+
+				// Don't completely overload the CPU.
+				usleep(1000);
+
+				// Execute the main application logic.
+				$this->doExecute();
+			}
+		}
+		// We were not able to daemonize the application so log the failure and die gracefully.
+		else
+		{
+			\JLog::add('Starting ' . $this->name . ' failed', \JLog::INFO);
+		}
+
+		// Trigger the onAfterExecute event.
+		$this->triggerEvent('onAfterExecute');
+	}
+
+	/**
+	 * Restart daemon process.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function restart()
+	{
+		\JLog::add('Stopping ' . $this->name, \JLog::INFO);
+		$this->shutdown(true);
+	}
+
+	/**
+	 * Stop daemon process.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function stop()
+	{
+		\JLog::add('Stopping ' . $this->name, \JLog::INFO);
+		$this->shutdown();
+	}
+
+	/**
+	 * Method to change the identity of the daemon process and resources.
+	 *
+	 * @return  boolean  True if identity successfully changed
+	 *
+	 * @since   11.1
+	 * @see     posix_setuid()
+	 */
+	protected function changeIdentity()
+	{
+		// Get the group and user ids to set for the daemon.
+		$uid = (int) $this->config->get('application_uid', 0);
+		$gid = (int) $this->config->get('application_gid', 0);
+
+		// Get the application process id file path.
+		$file = $this->config->get('application_pid_file');
+
+		// Change the user id for the process id file if necessary.
+		if ($uid && (fileowner($file) != $uid) && (!@ chown($file, $uid)))
+		{
+			\JLog::add('Unable to change user ownership of the process id file.', \JLog::ERROR);
+
+			return false;
+		}
+
+		// Change the group id for the process id file if necessary.
+		if ($gid && (filegroup($file) != $gid) && (!@ chgrp($file, $gid)))
+		{
+			\JLog::add('Unable to change group ownership of the process id file.', \JLog::ERROR);
+
+			return false;
+		}
+
+		// Set the correct home directory for the process.
+		if ($uid && ($info = posix_getpwuid($uid)) && is_dir($info['dir']))
+		{
+			system('export HOME="' . $info['dir'] . '"');
+		}
+
+		// Change the user id for the process necessary.
+		if ($uid && (posix_getuid($file) != $uid) && (!@ posix_setuid($uid)))
+		{
+			\JLog::add('Unable to change user ownership of the proccess.', \JLog::ERROR);
+
+			return false;
+		}
+
+		// Change the group id for the process necessary.
+		if ($gid && (posix_getgid($file) != $gid) && (!@ posix_setgid($gid)))
+		{
+			\JLog::add('Unable to change group ownership of the proccess.', \JLog::ERROR);
+
+			return false;
+		}
+
+		// Get the user and group information based on uid and gid.
+		$user = posix_getpwuid($uid);
+		$group = posix_getgrgid($gid);
+
+		\JLog::add('Changed daemon identity to ' . $user['name'] . ':' . $group['name'], \JLog::INFO);
+
+		return true;
+	}
+
+	/**
+	 * Method to put the application into the background.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function daemonize()
+	{
+		// Is there already an active daemon running?
+		if ($this->isActive())
+		{
+			\JLog::add($this->name . ' daemon is still running. Exiting the application.', \JLog::EMERGENCY);
+
+			return false;
+		}
+
+		// Reset Process Information
+		$this->safeMode = !!@ ini_get('safe_mode');
+		$this->processId = 0;
+		$this->running = false;
+
+		// Detach process!
+		try
+		{
+			// Check if we should run in the foreground.
+			if (!$this->input->get('f'))
+			{
+				// Detach from the terminal.
+				$this->detach();
+			}
+			else
+			{
+				// Setup running values.
+				$this->exiting = false;
+				$this->running = true;
+
+				// Set the process id.
+				$this->processId = (int) posix_getpid();
+				$this->parentId = $this->processId;
+			}
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add('Unable to fork.', \JLog::EMERGENCY);
+
+			return false;
+		}
+
+		// Verify the process id is valid.
+		if ($this->processId < 1)
+		{
+			\JLog::add('The process id is invalid; the fork failed.', \JLog::EMERGENCY);
+
+			return false;
+		}
+
+		// Clear the umask.
+		@ umask(0);
+
+		// Write out the process id file for concurrency management.
+		if (!$this->writeProcessIdFile())
+		{
+			\JLog::add('Unable to write the pid file at: ' . $this->config->get('application_pid_file'), \JLog::EMERGENCY);
+
+			return false;
+		}
+
+		// Attempt to change the identity of user running the process.
+		if (!$this->changeIdentity())
+		{
+			// If the identity change was required then we need to return false.
+			if ($this->config->get('application_require_identity'))
+			{
+				\JLog::add('Unable to change process owner.', \JLog::CRITICAL);
+
+				return false;
+			}
+			else
+			{
+				\JLog::add('Unable to change process owner.', \JLog::WARNING);
+			}
+		}
+
+		// Setup the signal handlers for the daemon.
+		if (!$this->setupSignalHandlers())
+		{
+			return false;
+		}
+
+		// Change the current working directory to the application working directory.
+		@ chdir($this->config->get('application_directory'));
+
+		return true;
+	}
+
+	/**
+	 * This is truly where the magic happens.  This is where we fork the process and kill the parent
+	 * process, which is essentially what turns the application into a daemon.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  \RuntimeException
+	 */
+	protected function detach()
+	{
+		\JLog::add('Detaching the ' . $this->name . ' daemon.', \JLog::DEBUG);
+
+		// Attempt to fork the process.
+		$pid = $this->fork();
+
+		// If the pid is positive then we successfully forked, and can close this application.
+		if ($pid)
+		{
+			// Add the log entry for debugging purposes and exit gracefully.
+			\JLog::add('Ending ' . $this->name . ' parent process', \JLog::DEBUG);
+			$this->close();
+		}
+		// We are in the forked child process.
+		else
+		{
+			// Setup some protected values.
+			$this->exiting = false;
+			$this->running = true;
+
+			// Set the parent to self.
+			$this->parentId = $this->processId;
+		}
+	}
+
+	/**
+	 * Method to fork the process.
+	 *
+	 * @return  integer  The child process id to the parent process, zero to the child process.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function fork()
+	{
+		// Attempt to fork the process.
+		$pid = $this->pcntlFork();
+
+		// If the fork failed, throw an exception.
+		if ($pid === -1)
+		{
+			throw new \RuntimeException('The process could not be forked.');
+		}
+		// Update the process id for the child.
+		elseif ($pid === 0)
+		{
+			$this->processId = (int) posix_getpid();
+		}
+		// Log the fork in the parent.
+		else
+		{
+			// Log the fork.
+			\JLog::add('Process forked ' . $pid, \JLog::DEBUG);
+		}
+
+		// Trigger the onFork event.
+		$this->postFork();
+
+		return $pid;
+	}
+
+	/**
+	 * Method to perform basic garbage collection and memory management in the sense of clearing the
+	 * stat cache.  We will probably call this method pretty regularly in our main loop.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function gc()
+	{
+		// Perform generic garbage collection.
+		gc_collect_cycles();
+
+		// Clear the stat cache so it doesn't blow up memory.
+		clearstatcache();
+	}
+
+	/**
+	 * Method to attach the DaemonApplication signal handler to the known signals.  Applications
+	 * can override these handlers by using the pcntl_signal() function and attaching a different
+	 * callback method.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @see     pcntl_signal()
+	 */
+	protected function setupSignalHandlers()
+	{
+		// We add the error suppression for the loop because on some platforms some constants are not defined.
+		foreach (self::$signals as $signal)
+		{
+			// Ignore signals that are not defined.
+			if (!defined($signal) || !is_int(constant($signal)) || (constant($signal) === 0))
+			{
+				// Define the signal to avoid notices.
+				\JLog::add('Signal "' . $signal . '" not defined. Defining it as null.', \JLog::DEBUG);
+				define($signal, null);
+
+				// Don't listen for signal.
+				continue;
+			}
+
+			// Attach the signal handler for the signal.
+			if (!$this->pcntlSignal(constant($signal), array('DaemonApplication', 'signal')))
+			{
+				\JLog::add(sprintf('Unable to reroute signal handler: %s', $signal), \JLog::EMERGENCY);
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to shut down the daemon and optionally restart it.
+	 *
+	 * @param   boolean  $restart  True to restart the daemon on exit.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function shutdown($restart = false)
+	{
+		// If we are already exiting, chill.
+		if ($this->exiting)
+		{
+			return;
+		}
+		// If not, now we are.
+		else
+		{
+			$this->exiting = true;
+		}
+
+		// If we aren't already daemonized then just kill the application.
+		if (!$this->running && !$this->isActive())
+		{
+			\JLog::add('Process was not daemonized yet, just halting current process', \JLog::INFO);
+			$this->close();
+		}
+
+		// Only read the pid for the parent file.
+		if ($this->parentId == $this->processId)
+		{
+			// Read the contents of the process id file as an integer.
+			$fp = fopen($this->config->get('application_pid_file'), 'r');
+			$pid = fread($fp, filesize($this->config->get('application_pid_file')));
+			$pid = (int) $pid;
+			fclose($fp);
+
+			// Remove the process id file.
+			@ unlink($this->config->get('application_pid_file'));
+
+			// If we are supposed to restart the daemon we need to execute the same command.
+			if ($restart)
+			{
+				$this->close(exec(implode(' ', $GLOBALS['argv']) . ' > /dev/null &'));
+			}
+			// If we are not supposed to restart the daemon let's just kill -9.
+			else
+			{
+				passthru('kill -9 ' . $pid);
+				$this->close();
+			}
+		}
+	}
+
+	/**
+	 * Method to write the process id file out to disk.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	protected function writeProcessIdFile()
+	{
+		// Verify the process id is valid.
+		if ($this->processId < 1)
+		{
+			\JLog::add('The process id is invalid.', \JLog::EMERGENCY);
+
+			return false;
+		}
+
+		// Get the application process id file path.
+		$file = $this->config->get('application_pid_file');
+
+		if (empty($file))
+		{
+			\JLog::add('The process id file path is empty.', \JLog::ERROR);
+
+			return false;
+		}
+
+		// Make sure that the folder where we are writing the process id file exists.
+		$folder = dirname($file);
+
+		if (!is_dir($folder) && !\JFolder::create($folder))
+		{
+			\JLog::add('Unable to create directory: ' . $folder, \JLog::ERROR);
+
+			return false;
+		}
+
+		// Write the process id file out to disk.
+		if (!file_put_contents($file, $this->processId))
+		{
+			\JLog::add('Unable to write proccess id file: ' . $file, \JLog::ERROR);
+
+			return false;
+		}
+
+		// Make sure the permissions for the proccess id file are accurate.
+		if (!chmod($file, 0644))
+		{
+			\JLog::add('Unable to adjust permissions for the proccess id file: ' . $file, \JLog::ERROR);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to handle post-fork triggering of the onFork event.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	protected function postFork()
+	{
+		// Trigger the onFork event.
+		$this->triggerEvent('onFork');
+	}
+
+	/**
+	 * Method to return the exit code of a terminated child process.
+	 *
+	 * @param   integer  $status  The status parameter is the status parameter supplied to a successful call to pcntl_waitpid().
+	 *
+	 * @return  integer  The child process exit code.
+	 *
+	 * @see     pcntl_wexitstatus()
+	 * @since   11.3
+	 */
+	protected function pcntlChildExitStatus($status)
+	{
+		return pcntl_wexitstatus($status);
+	}
+
+	/**
+	 * Method to return the exit code of a terminated child process.
+	 *
+	 * @return  integer  On success, the PID of the child process is returned in the parent's thread
+	 *                   of execution, and a 0 is returned in the child's thread of execution. On
+	 *                   failure, a -1 will be returned in the parent's context, no child process
+	 *                   will be created, and a PHP error is raised.
+	 *
+	 * @see     pcntl_fork()
+	 * @since   11.3
+	 */
+	protected function pcntlFork()
+	{
+		return pcntl_fork();
+	}
+
+	/**
+	 * Method to install a signal handler.
+	 *
+	 * @param   integer   $signal   The signal number.
+	 * @param   callable  $handler  The signal handler which may be the name of a user created function,
+	 *                              or method, or either of the two global constants SIG_IGN or SIG_DFL.
+	 * @param   boolean   $restart  Specifies whether system call restarting should be used when this
+	 *                              signal arrives.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     pcntl_signal()
+	 * @since   11.3
+	 */
+	protected function pcntlSignal($signal, $handler, $restart = true)
+	{
+		return pcntl_signal($signal, $handler, $restart);
+	}
+
+	/**
+	 * Method to wait on or return the status of a forked child.
+	 *
+	 * @param   integer  &$status  Status information.
+	 * @param   integer  $options  If wait3 is available on your system (mostly BSD-style systems),
+	 *                             you can provide the optional options parameter.
+	 *
+	 * @return  integer  The process ID of the child which exited, -1 on error or zero if WNOHANG
+	 *                   was provided as an option (on wait3-available systems) and no child was available.
+	 *
+	 * @see     pcntl_wait()
+	 * @since   11.3
+	 */
+	protected function pcntlWait(&$status, $options = 0)
+	{
+		return pcntl_wait($status, $options);
+	}
+}
diff --git a/core/libraries/src/Application/SiteApplication.php b/core/libraries/src/Application/SiteApplication.php
new file mode 100644
index 00000000..d6790102
--- /dev/null
+++ b/core/libraries/src/Application/SiteApplication.php
@@ -0,0 +1,869 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Input\Input;
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla! Site Application class
+ *
+ * @since  3.2
+ */
+final class SiteApplication extends CMSApplication
+{
+	/**
+	 * Option to filter by language
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 * @deprecated  4.0  Will be renamed $language_filter
+	 */
+	protected $_language_filter = false;
+
+	/**
+	 * Option to detect language by the browser
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 * @deprecated  4.0  Will be renamed $detect_browser
+	 */
+	protected $_detect_browser = false;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input                   $input   An optional argument to provide dependency injection for the application's
+	 *                                           input object.  If the argument is a \JInput object that object will become
+	 *                                           the application's input object, otherwise a default input object is created.
+	 * @param   Registry                $config  An optional argument to provide dependency injection for the application's
+	 *                                           config object.  If the argument is a Registry object that object will become
+	 *                                           the application's config object, otherwise a default config object is created.
+	 * @param   \JApplicationWebClient  $client  An optional argument to provide dependency injection for the application's
+	 *                                           client object.  If the argument is a \JApplicationWebClient object that object will become
+	 *                                           the application's client object, otherwise a default client object is created.
+	 *
+	 * @since   3.2
+	 */
+	public function __construct(Input $input = null, Registry $config = null, \JApplicationWebClient $client = null)
+	{
+		// Register the application name
+		$this->_name = 'site';
+
+		// Register the client ID
+		$this->_clientId = 0;
+
+		// Execute the parent constructor
+		parent::__construct($input, $config, $client);
+	}
+
+	/**
+	 * Check if the user can access the application
+	 *
+	 * @param   integer  $itemid  The item ID to check authorisation for
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 *
+	 * @throws  \Exception When you are not authorised to view the home page menu item
+	 */
+	protected function authorise($itemid)
+	{
+		$menus = $this->getMenu();
+		$user = \JFactory::getUser();
+
+		if (!$menus->authorise($itemid))
+		{
+			if ($user->get('id') == 0)
+			{
+				// Set the data
+				$this->setUserState('users.login.form.data', array('return' => \JUri::getInstance()->toString()));
+
+				$url = \JRoute::_('index.php?option=com_users&view=login', false);
+
+				$this->enqueueMessage(\JText::_('JGLOBAL_YOU_MUST_LOGIN_FIRST'));
+				$this->redirect($url);
+			}
+			else
+			{
+				// Get the home page menu item
+				$home_item = $menus->getDefault($this->getLanguage()->getTag());
+
+				// If we are already in the homepage raise an exception
+				if ($menus->getActive()->id == $home_item->id)
+				{
+					throw new \Exception(\JText::_('JERROR_ALERTNOAUTHOR'), 403);
+				}
+
+				// Otherwise redirect to the homepage and show an error
+				$this->enqueueMessage(\JText::_('JERROR_ALERTNOAUTHOR'), 'error');
+				$this->redirect(\JRoute::_('index.php?Itemid=' . $home_item->id, false));
+			}
+		}
+	}
+
+	/**
+	 * Dispatch the application
+	 *
+	 * @param   string  $component  The component which is being rendered.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function dispatch($component = null)
+	{
+		// Get the component if not set.
+		if (!$component)
+		{
+			$component = $this->input->getCmd('option', null);
+		}
+
+		// Load the document to the API
+		$this->loadDocument();
+
+		// Set up the params
+		$document = $this->getDocument();
+		$router   = static::getRouter();
+		$params   = $this->getParams();
+
+		// Register the document object with \JFactory
+		\JFactory::$document = $document;
+
+		switch ($document->getType())
+		{
+			case 'html':
+				// Get language
+				$lang_code = $this->getLanguage()->getTag();
+				$languages = \JLanguageHelper::getLanguages('lang_code');
+
+				// Set metadata
+				if (isset($languages[$lang_code]) && $languages[$lang_code]->metakey)
+				{
+					$document->setMetaData('keywords', $languages[$lang_code]->metakey);
+				}
+				else
+				{
+					$document->setMetaData('keywords', $this->get('MetaKeys'));
+				}
+
+				$document->setMetaData('rights', $this->get('MetaRights'));
+
+				if ($router->getMode() == JROUTER_MODE_SEF)
+				{
+					$document->setBase(htmlspecialchars(\JUri::current()));
+				}
+
+				// Get the template
+				$template = $this->getTemplate(true);
+
+				// Store the template and its params to the config
+				$this->set('theme', $template->template);
+				$this->set('themeParams', $template->params);
+
+				break;
+
+			case 'feed':
+				$document->setBase(htmlspecialchars(\JUri::current()));
+				break;
+		}
+
+		$document->setTitle($params->get('page_title'));
+		$document->setDescription($params->get('page_description'));
+
+		// Add version number or not based on global configuration
+		if ($this->get('MetaVersion', 0))
+		{
+			$document->setGenerator('Joomla! - Open Source Content Management - Version ' . JVERSION);
+		}
+		else
+		{
+			$document->setGenerator('Joomla! - Open Source Content Management');
+		}
+
+		$contents = ComponentHelper::renderComponent($component);
+		$document->setBuffer($contents, 'component');
+
+		// Trigger the onAfterDispatch event.
+		\JPluginHelper::importPlugin('system');
+		$this->triggerEvent('onAfterDispatch');
+	}
+
+	/**
+	 * Method to run the Web application routines.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function doExecute()
+	{
+		// Initialise the application
+		$this->initialiseApp();
+
+		// Mark afterInitialise in the profiler.
+		JDEBUG ? $this->profiler->mark('afterInitialise') : null;
+
+		// Route the application
+		$this->route();
+
+		// Mark afterRoute in the profiler.
+		JDEBUG ? $this->profiler->mark('afterRoute') : null;
+
+		/*
+		 * Check if the user is required to reset their password
+		 *
+		 * Before $this->route(); "option" and "view" can't be safely read using:
+		 * $this->input->getCmd('option'); or $this->input->getCmd('view');
+		 * ex: due of the sef urls
+		 */
+		$this->checkUserRequireReset('com_users', 'profile', 'edit', 'com_users/profile.save,com_users/profile.apply,com_users/user.logout');
+
+		// Dispatch the application
+		$this->dispatch();
+
+		// Mark afterDispatch in the profiler.
+		JDEBUG ? $this->profiler->mark('afterDispatch') : null;
+	}
+
+	/**
+	 * Return the current state of the detect browser option.
+	 *
+	 * @return	boolean
+	 *
+	 * @since	3.2
+	 */
+	public function getDetectBrowser()
+	{
+		return $this->_detect_browser;
+	}
+
+	/**
+	 * Return the current state of the language filter.
+	 *
+	 * @return	boolean
+	 *
+	 * @since	3.2
+	 */
+	public function getLanguageFilter()
+	{
+		return $this->_language_filter;
+	}
+
+	/**
+	 * Return a reference to the \JMenu object.
+	 *
+	 * @param   string  $name     The name of the application/client.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  \JMenu  \JMenu object.
+	 *
+	 * @since   3.2
+	 */
+	public function getMenu($name = 'site', $options = array())
+	{
+		return parent::getMenu($name, $options);
+	}
+
+	/**
+	 * Get the application parameters
+	 *
+	 * @param   string  $option  The component option
+	 *
+	 * @return  Registry  The parameters object
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Use getParams() instead
+	 */
+	public function getPageParameters($option = null)
+	{
+		return $this->getParams($option);
+	}
+
+	/**
+	 * Get the application parameters
+	 *
+	 * @param   string  $option  The component option
+	 *
+	 * @return  Registry  The parameters object
+	 *
+	 * @since   3.2
+	 */
+	public function getParams($option = null)
+	{
+		static $params = array();
+
+		$hash = '__default';
+
+		if (!empty($option))
+		{
+			$hash = $option;
+		}
+
+		if (!isset($params[$hash]))
+		{
+			// Get component parameters
+			if (!$option)
+			{
+				$option = $this->input->getCmd('option', null);
+			}
+
+			// Get new instance of component global parameters
+			$params[$hash] = clone ComponentHelper::getParams($option);
+
+			// Get menu parameters
+			$menus = $this->getMenu();
+			$menu  = $menus->getActive();
+
+			// Get language
+			$lang_code = $this->getLanguage()->getTag();
+			$languages = \JLanguageHelper::getLanguages('lang_code');
+
+			$title = $this->get('sitename');
+
+			if (isset($languages[$lang_code]) && $languages[$lang_code]->metadesc)
+			{
+				$description = $languages[$lang_code]->metadesc;
+			}
+			else
+			{
+				$description = $this->get('MetaDesc');
+			}
+
+			$rights = $this->get('MetaRights');
+			$robots = $this->get('robots');
+
+			// Retrieve com_menu global settings
+			$temp = clone ComponentHelper::getParams('com_menus');
+
+			// Lets cascade the parameters if we have menu item parameters
+			if (is_object($menu))
+			{
+				// Get show_page_heading from com_menu global settings
+				$params[$hash]->def('show_page_heading', $temp->get('show_page_heading'));
+
+				$params[$hash]->merge($menu->params);
+				$title = $menu->title;
+			}
+			else
+			{
+				// Merge com_menu global settings
+				$params[$hash]->merge($temp);
+
+				// If supplied, use page title
+				$title = $temp->get('page_title', $title);
+			}
+
+			$params[$hash]->def('page_title', $title);
+			$params[$hash]->def('page_description', $description);
+			$params[$hash]->def('page_rights', $rights);
+			$params[$hash]->def('robots', $robots);
+		}
+
+		return $params[$hash];
+	}
+
+	/**
+	 * Return a reference to the \JPathway object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return  \JPathway  A \JPathway object
+	 *
+	 * @since   3.2
+	 */
+	public function getPathway($name = 'site', $options = array())
+	{
+		return parent::getPathway($name, $options);
+	}
+
+	/**
+	 * Return a reference to the \JRouter object.
+	 *
+	 * @param   string  $name     The name of the application.
+	 * @param   array   $options  An optional associative array of configuration settings.
+	 *
+	 * @return	\JRouter
+	 *
+	 * @since	3.2
+	 */
+	public static function getRouter($name = 'site', array $options = array())
+	{
+		$options['mode'] = \JFactory::getConfig()->get('sef');
+
+		return parent::getRouter($name, $options);
+	}
+
+	/**
+	 * Gets the name of the current template.
+	 *
+	 * @param   boolean  $params  True to return the template parameters
+	 *
+	 * @return  string  The name of the template.
+	 *
+	 * @since   3.2
+	 * @throws  \InvalidArgumentException
+	 */
+	public function getTemplate($params = false)
+	{
+		if (is_object($this->template))
+		{
+			if (!file_exists(JPATH_THEMES . '/' . $this->template->template . '/index.php'))
+			{
+				throw new \InvalidArgumentException(\JText::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $this->template->template));
+			}
+
+			if ($params)
+			{
+				return $this->template;
+			}
+
+			return $this->template->template;
+		}
+
+		// Get the id of the active menu item
+		$menu = $this->getMenu();
+		$item = $menu->getActive();
+
+		if (!$item)
+		{
+			$item = $menu->getItem($this->input->getInt('Itemid', null));
+		}
+
+		$id = 0;
+
+		if (is_object($item))
+		{
+			// Valid item retrieved
+			$id = $item->template_style_id;
+		}
+
+		$tid = $this->input->getUint('templateStyle', 0);
+
+		if (is_numeric($tid) && (int) $tid > 0)
+		{
+			$id = (int) $tid;
+		}
+
+		$cache = \JFactory::getCache('com_templates', '');
+
+		if ($this->_language_filter)
+		{
+			$tag = $this->getLanguage()->getTag();
+		}
+		else
+		{
+			$tag = '';
+		}
+
+		$cacheId = 'templates0' . $tag;
+
+		if ($cache->contains($cacheId))
+		{
+			$templates = $cache->get($cacheId);
+		}
+		else
+		{
+			// Load styles
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('id, home, template, s.params')
+				->from('#__template_styles as s')
+				->where('s.client_id = 0')
+				->where('e.enabled = 1')
+				->join('LEFT', '#__extensions as e ON e.element=s.template AND e.type=' . $db->quote('template') . ' AND e.client_id=s.client_id');
+
+			$db->setQuery($query);
+			$templates = $db->loadObjectList('id');
+
+			foreach ($templates as &$template)
+			{
+				// Create home element
+				if ($template->home == 1 && !isset($template_home) || $this->_language_filter && $template->home == $tag)
+				{
+					$template_home = clone $template;
+				}
+
+				$template->params = new Registry($template->params);
+			}
+
+			// Unset the $template reference to the last $templates[n] item cycled in the foreach above to avoid editing it later
+			unset($template);
+
+			// Add home element, after loop to avoid double execution
+			if (isset($template_home))
+			{
+				$template_home->params = new Registry($template_home->params);
+				$templates[0] = $template_home;
+			}
+
+			$cache->store($templates, $cacheId);
+		}
+
+		if (isset($templates[$id]))
+		{
+			$template = $templates[$id];
+		}
+		else
+		{
+			$template = $templates[0];
+		}
+
+		// Allows for overriding the active template from the request
+		$template_override = $this->input->getCmd('template', '');
+
+		// Only set template override if it is a valid template (= it exists and is enabled)
+		if (!empty($template_override))
+		{
+			if (file_exists(JPATH_THEMES . '/' . $template_override . '/index.php'))
+			{
+				foreach ($templates as $tmpl)
+				{
+					if ($tmpl->template === $template_override)
+					{
+						$template = $tmpl;
+						break;
+					}
+				}
+			}
+		}
+
+		// Need to filter the default value as well
+		$template->template = \JFilterInput::getInstance()->clean($template->template, 'cmd');
+
+		// Fallback template
+		if (!file_exists(JPATH_THEMES . '/' . $template->template . '/index.php'))
+		{
+			$this->enqueueMessage(\JText::_('JERROR_ALERTNOTEMPLATE'), 'error');
+
+			// Try to find data for 'beez3' template
+			$original_tmpl = $template->template;
+
+			foreach ($templates as $tmpl)
+			{
+				if ($tmpl->template === 'beez3')
+				{
+					$template = $tmpl;
+					break;
+				}
+			}
+
+			// Check, the data were found and if template really exists
+			if (!file_exists(JPATH_THEMES . '/' . $template->template . '/index.php'))
+			{
+				throw new \InvalidArgumentException(\JText::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $original_tmpl));
+			}
+		}
+
+		// Cache the result
+		$this->template = $template;
+
+		if ($params)
+		{
+			return $template;
+		}
+
+		return $template->template;
+	}
+
+	/**
+	 * Initialise the application.
+	 *
+	 * @param   array  $options  An optional associative array of configuration settings.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function initialiseApp($options = array())
+	{
+		$user = \JFactory::getUser();
+
+		// If the user is a guest we populate it with the guest user group.
+		if ($user->guest)
+		{
+			$guestUsergroup = ComponentHelper::getParams('com_users')->get('guest_usergroup', 1);
+			$user->groups = array($guestUsergroup);
+		}
+
+		/*
+		 * If a language was specified it has priority, otherwise use user or default language settings
+		 * Check this only if the languagefilter plugin is enabled
+		 *
+		 * @TODO - Remove the hardcoded dependency to the languagefilter plugin
+		 */
+		if (\JPluginHelper::isEnabled('system', 'languagefilter'))
+		{
+			$plugin = \JPluginHelper::getPlugin('system', 'languagefilter');
+
+			$pluginParams = new Registry($plugin->params);
+
+			$this->setLanguageFilter(true);
+			$this->setDetectBrowser($pluginParams->get('detect_browser', '1') == '1');
+		}
+
+		if (empty($options['language']))
+		{
+			// Detect the specified language
+			$lang = $this->input->getString('language', null);
+
+			// Make sure that the user's language exists
+			if ($lang && \JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+		}
+
+		if (empty($options['language']) && $this->getLanguageFilter())
+		{
+			// Detect cookie language
+			$lang = $this->input->cookie->get(md5($this->get('secret') . 'language'), null, 'string');
+
+			// Make sure that the user's language exists
+			if ($lang && \JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+		}
+
+		if (empty($options['language']))
+		{
+			// Detect user language
+			$lang = $user->getParam('language');
+
+			// Make sure that the user's language exists
+			if ($lang && \JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+		}
+
+		if (empty($options['language']) && $this->getDetectBrowser())
+		{
+			// Detect browser language
+			$lang = \JLanguageHelper::detectLanguage();
+
+			// Make sure that the user's language exists
+			if ($lang && \JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+		}
+
+		if (empty($options['language']))
+		{
+			// Detect default language
+			$params = ComponentHelper::getParams('com_languages');
+			$options['language'] = $params->get('site', $this->get('language', 'en-GB'));
+		}
+
+		// One last check to make sure we have something
+		if (!\JLanguageHelper::exists($options['language']))
+		{
+			$lang = $this->config->get('language', 'en-GB');
+
+			if (\JLanguageHelper::exists($lang))
+			{
+				$options['language'] = $lang;
+			}
+			else
+			{
+				// As a last ditch fail to english
+				$options['language'] = 'en-GB';
+			}
+		}
+
+		// Finish initialisation
+		parent::initialiseApp($options);
+	}
+
+	/**
+	 * Load the library language files for the application
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.3
+	 */
+	protected function loadLibraryLanguage()
+	{
+		/*
+		 * Try the lib_joomla file in the current language (without allowing the loading of the file in the default language)
+		 * Fallback to the default language if necessary
+		 */
+		$this->getLanguage()->load('lib_joomla', JPATH_SITE, null, false, true)
+			|| $this->getLanguage()->load('lib_joomla', JPATH_ADMINISTRATOR, null, false, true);
+	}
+
+	/**
+	 * Login authentication function
+	 *
+	 * @param   array  $credentials  Array('username' => string, 'password' => string)
+	 * @param   array  $options      Array('remember' => boolean)
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function login($credentials, $options = array())
+	{
+		// Set the application login entry point
+		if (!array_key_exists('entry_url', $options))
+		{
+			$options['entry_url'] = \JUri::base() . 'index.php?option=com_users&task=user.login';
+		}
+
+		// Set the access control action to check.
+		$options['action'] = 'core.login.site';
+
+		return parent::login($credentials, $options);
+	}
+
+	/**
+	 * Rendering is the process of pushing the document buffers into the template
+	 * placeholders, retrieving data from the document and pushing it into
+	 * the application response buffer.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function render()
+	{
+		switch ($this->document->getType())
+		{
+			case 'feed':
+				// No special processing for feeds
+				break;
+
+			case 'html':
+			default:
+				$template = $this->getTemplate(true);
+				$file     = $this->input->get('tmpl', 'index');
+
+				if ($file === 'offline' && !$this->get('offline'))
+				{
+					$this->set('themeFile', 'index.php');
+				}
+
+				if ($this->get('offline') && !\JFactory::getUser()->authorise('core.login.offline'))
+				{
+					$this->setUserState('users.login.form.data', array('return' => \JUri::getInstance()->toString()));
+					$this->set('themeFile', 'offline.php');
+					$this->setHeader('Status', '503 Service Temporarily Unavailable', 'true');
+				}
+
+				if (!is_dir(JPATH_THEMES . '/' . $template->template) && !$this->get('offline'))
+				{
+					$this->set('themeFile', 'component.php');
+				}
+
+				// Ensure themeFile is set by now
+				if ($this->get('themeFile') == '')
+				{
+					$this->set('themeFile', $file . '.php');
+				}
+
+				break;
+		}
+
+		parent::render();
+	}
+
+	/**
+	 * Route the application.
+	 *
+	 * Routing is the process of examining the request environment to determine which
+	 * component should receive the request. The component optional parameters
+	 * are then set in the request object to be processed when the application is being
+	 * dispatched.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function route()
+	{
+		// Execute the parent method
+		parent::route();
+
+		$Itemid = $this->input->getInt('Itemid', null);
+		$this->authorise($Itemid);
+	}
+
+	/**
+	 * Set the current state of the detect browser option.
+	 *
+	 * @param   boolean  $state  The new state of the detect browser option
+	 *
+	 * @return	boolean	 The previous state
+	 *
+	 * @since	3.2
+	 */
+	public function setDetectBrowser($state = false)
+	{
+		$old = $this->_detect_browser;
+		$this->_detect_browser = $state;
+
+		return $old;
+	}
+
+	/**
+	 * Set the current state of the language filter.
+	 *
+	 * @param   boolean  $state  The new state of the language filter
+	 *
+	 * @return	boolean	 The previous state
+	 *
+	 * @since	3.2
+	 */
+	public function setLanguageFilter($state = false)
+	{
+		$old = $this->_language_filter;
+		$this->_language_filter = $state;
+
+		return $old;
+	}
+
+	/**
+	 * Overrides the default template that would be used
+	 *
+	 * @param   string  $template     The template name
+	 * @param   mixed   $styleParams  The template style parameters
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function setTemplate($template, $styleParams = null)
+	{
+		if (is_dir(JPATH_THEMES . '/' . $template))
+		{
+			$this->template = new \stdClass;
+			$this->template->template = $template;
+
+			if ($styleParams instanceof Registry)
+			{
+				$this->template->params = $styleParams;
+			}
+			else
+			{
+				$this->template->params = new Registry($styleParams);
+			}
+
+			// Store the template and its params to the config
+			$this->set('theme', $this->template->template);
+			$this->set('themeParams', $this->template->params);
+		}
+	}
+}
diff --git a/core/libraries/src/Application/WebApplication.php b/core/libraries/src/Application/WebApplication.php
new file mode 100644
index 00000000..afac65da
--- /dev/null
+++ b/core/libraries/src/Application/WebApplication.php
@@ -0,0 +1,1312 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Input\Input;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * Base class for a Joomla! Web application.
+ *
+ * @since  11.4
+ * @note   As of 4.0 this class will be abstract
+ */
+class WebApplication extends BaseApplication
+{
+	/**
+	 * @var    string  Character encoding string.
+	 * @since  11.3
+	 */
+	public $charSet = 'utf-8';
+
+	/**
+	 * @var    string  Response mime type.
+	 * @since  11.3
+	 */
+	public $mimeType = 'text/html';
+
+	/**
+	 * @var    \JDate  The body modified date for response headers.
+	 * @since  11.3
+	 */
+	public $modifiedDate;
+
+	/**
+	 * @var    \JApplicationWebClient  The application client object.
+	 * @since  11.3
+	 */
+	public $client;
+
+	/**
+	 * @var    \JDocument  The application document object.
+	 * @since  11.3
+	 */
+	protected $document;
+
+	/**
+	 * @var    \JLanguage  The application language object.
+	 * @since  11.3
+	 */
+	protected $language;
+
+	/**
+	 * @var    \JSession  The application session object.
+	 * @since  11.3
+	 */
+	protected $session;
+
+	/**
+	 * @var    object  The application response object.
+	 * @since  11.3
+	 */
+	protected $response;
+
+	/**
+	 * @var    WebApplication  The application instance.
+	 * @since  11.3
+	 */
+	protected static $instance;
+
+	/**
+	 * A map of integer HTTP 1.1 response codes to the full HTTP Status for the headers.
+	 *
+	 * @var    object
+	 * @since  3.4
+	 * @link   http://tools.ietf.org/pdf/rfc7231.pdf
+	 */
+	private $responseMap = array(
+		100 => 'HTTP/1.1 100 Continue',
+		101 => 'HTTP/1.1 101 Switching Protocols',
+		102 => 'HTTP/1.1 102 Processing',
+		200 => 'HTTP/1.1 200 OK',
+		201 => 'HTTP/1.1 201 Created',
+		202 => 'HTTP/1.1 202 Accepted',
+		203 => 'HTTP/1.1 203 Non-Authoritative Information',
+		204 => 'HTTP/1.1 204 No Content',
+		205 => 'HTTP/1.1 205 Reset Content',
+		206 => 'HTTP/1.1 206 Partial Content',
+		207 => 'HTTP/1.1 207 Multi-Status',
+		208 => 'HTTP/1.1 208 Already Reported',
+		226 => 'HTTP/1.1 226 IM Used',
+		300 => 'HTTP/1.1 300 Multiple Choices',
+		301 => 'HTTP/1.1 301 Moved Permanently',
+		302 => 'HTTP/1.1 302 Found',
+		303 => 'HTTP/1.1 303 See other',
+		304 => 'HTTP/1.1 304 Not Modified',
+		305 => 'HTTP/1.1 305 Use Proxy',
+		306 => 'HTTP/1.1 306 (Unused)',
+		307 => 'HTTP/1.1 307 Temporary Redirect',
+		308 => 'HTTP/1.1 308 Permanent Redirect',
+		400 => 'HTTP/1.1 400 Bad Request',
+		401 => 'HTTP/1.1 401 Unauthorized',
+		402 => 'HTTP/1.1 402 Payment Required',
+		403 => 'HTTP/1.1 403 Forbidden',
+		404 => 'HTTP/1.1 404 Not Found',
+		405 => 'HTTP/1.1 405 Method Not Allowed',
+		406 => 'HTTP/1.1 406 Not Acceptable',
+		407 => 'HTTP/1.1 407 Proxy Authentication Required',
+		408 => 'HTTP/1.1 408 Request Timeout',
+		409 => 'HTTP/1.1 409 Conflict',
+		410 => 'HTTP/1.1 410 Gone',
+		411 => 'HTTP/1.1 411 Length Required',
+		412 => 'HTTP/1.1 412 Precondition Failed',
+		413 => 'HTTP/1.1 413 Payload Too Large',
+		414 => 'HTTP/1.1 414 URI Too Long',
+		415 => 'HTTP/1.1 415 Unsupported Media Type',
+		416 => 'HTTP/1.1 416 Range Not Satisfiable',
+		417 => 'HTTP/1.1 417 Expectation Failed',
+		418 => 'HTTP/1.1 418 I\'m a teapot',
+		421 => 'HTTP/1.1 421 Misdirected Request',
+		422 => 'HTTP/1.1 422 Unprocessable Entity',
+		423 => 'HTTP/1.1 423 Locked',
+		424 => 'HTTP/1.1 424 Failed Dependency',
+		426 => 'HTTP/1.1 426 Upgrade Required',
+		428 => 'HTTP/1.1 428 Precondition Required',
+		429 => 'HTTP/1.1 429 Too Many Requests',
+		431 => 'HTTP/1.1 431 Request Header Fields Too Large',
+		451 => 'HTTP/1.1 451 Unavailable For Legal Reasons',
+		500 => 'HTTP/1.1 500 Internal Server Error',
+		501 => 'HTTP/1.1 501 Not Implemented',
+		502 => 'HTTP/1.1 502 Bad Gateway',
+		503 => 'HTTP/1.1 503 Service Unavailable',
+		504 => 'HTTP/1.1 504 Gateway Timeout',
+		505 => 'HTTP/1.1 505 HTTP Version Not Supported',
+		506 => 'HTTP/1.1 506 Variant Also Negotiates',
+		507 => 'HTTP/1.1 507 Insufficient Storage',
+		508 => 'HTTP/1.1 508 Loop Detected',
+		510 => 'HTTP/1.1 510 Not Extended',
+		511 => 'HTTP/1.1 511 Network Authentication Required',
+	);
+
+	/**
+	 * A map of HTTP Response headers which may only send a single value, all others
+	 * are considered to allow multiple
+	 *
+	 * @var    object
+	 * @since  3.5.2
+	 * @link   https://tools.ietf.org/html/rfc7230
+	 */
+	private $singleValueResponseHeaders = array(
+		'status', // This is not a valid header name, but the representation used by Joomla to identify the HTTP Response Code
+		'Content-Length',
+		'Host',
+		'Content-Type',
+		'Content-Location',
+		'Date',
+		'Location',
+		'Retry-After',
+		'Server',
+		'Mime-Version',
+		'Last-Modified',
+		'ETag',
+		'Accept-Ranges',
+		'Content-Range',
+		'Age',
+		'Expires',
+		'Clear-Site-Data',
+	);
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input                   $input   An optional argument to provide dependency injection for the application's
+	 *                                           input object.  If the argument is a \JInput object that object will become
+	 *                                           the application's input object, otherwise a default input object is created.
+	 * @param   Registry                $config  An optional argument to provide dependency injection for the application's
+	 *                                           config object.  If the argument is a Registry object that object will become
+	 *                                           the application's config object, otherwise a default config object is created.
+	 * @param   \JApplicationWebClient  $client  An optional argument to provide dependency injection for the application's
+	 *                                           client object.  If the argument is a \JApplicationWebClient object that object will become
+	 *                                           the application's client object, otherwise a default client object is created.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(Input $input = null, Registry $config = null, \JApplicationWebClient $client = null)
+	{
+		// If an input object is given use it.
+		if ($input instanceof Input)
+		{
+			$this->input = $input;
+		}
+		// Create the input based on the application logic.
+		else
+		{
+			$this->input = new Input;
+		}
+
+		// If a config object is given use it.
+		if ($config instanceof Registry)
+		{
+			$this->config = $config;
+		}
+		// Instantiate a new configuration object.
+		else
+		{
+			$this->config = new Registry;
+		}
+
+		// If a client object is given use it.
+		if ($client instanceof \JApplicationWebClient)
+		{
+			$this->client = $client;
+		}
+		// Instantiate a new web client object.
+		else
+		{
+			$this->client = new \JApplicationWebClient;
+		}
+
+		// Load the configuration object.
+		$this->loadConfiguration($this->fetchConfigurationData());
+
+		// Set the execution datetime and timestamp;
+		$this->set('execution.datetime', gmdate('Y-m-d H:i:s'));
+		$this->set('execution.timestamp', time());
+
+		// Setup the response object.
+		$this->response = new \stdClass;
+		$this->response->cachable = false;
+		$this->response->headers = array();
+		$this->response->body = array();
+
+		// Set the system URIs.
+		$this->loadSystemUris();
+	}
+
+	/**
+	 * Returns a reference to the global WebApplication object, only creating it if it doesn't already exist.
+	 *
+	 * This method must be invoked as: $web = WebApplication::getInstance();
+	 *
+	 * @param   string  $name  The name (optional) of the JApplicationWeb class to instantiate.
+	 *
+	 * @return  WebApplication
+	 *
+	 * @since   11.3
+	 */
+	public static function getInstance($name = null)
+	{
+		// Only create the object if it doesn't exist.
+		if (empty(self::$instance))
+		{
+			if (class_exists($name) && (is_subclass_of($name, '\\Joomla\\CMS\\Application\\WebApplication')))
+			{
+				self::$instance = new $name;
+			}
+			else
+			{
+				self::$instance = new WebApplication;
+			}
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Initialise the application.
+	 *
+	 * @param   mixed  $session     An optional argument to provide dependency injection for the application's
+	 *                              session object.  If the argument is a \JSession object that object will become
+	 *                              the application's session object, if it is false then there will be no session
+	 *                              object, and if it is null then the default session object will be created based
+	 *                              on the application's loadSession() method.
+	 * @param   mixed  $document    An optional argument to provide dependency injection for the application's
+	 *                              document object.  If the argument is a \JDocument object that object will become
+	 *                              the application's document object, if it is false then there will be no document
+	 *                              object, and if it is null then the default document object will be created based
+	 *                              on the application's loadDocument() method.
+	 * @param   mixed  $language    An optional argument to provide dependency injection for the application's
+	 *                              language object.  If the argument is a \JLanguage object that object will become
+	 *                              the application's language object, if it is false then there will be no language
+	 *                              object, and if it is null then the default language object will be created based
+	 *                              on the application's loadLanguage() method.
+	 * @param   mixed  $dispatcher  An optional argument to provide dependency injection for the application's
+	 *                              event dispatcher.  If the argument is a \JEventDispatcher object that object will become
+	 *                              the application's event dispatcher, if it is null then the default event dispatcher
+	 *                              will be created based on the application's loadDispatcher() method.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @deprecated  13.1 (Platform) & 4.0 (CMS)
+	 * @see     WebApplication::loadSession()
+	 * @see     WebApplication::loadDocument()
+	 * @see     WebApplication::loadLanguage()
+	 * @see     WebApplication::loadDispatcher()
+	 * @since   11.3
+	 */
+	public function initialise($session = null, $document = null, $language = null, $dispatcher = null)
+	{
+		// Create the session based on the application logic.
+		if ($session !== false)
+		{
+			$this->loadSession($session);
+		}
+
+		// Create the document based on the application logic.
+		if ($document !== false)
+		{
+			$this->loadDocument($document);
+		}
+
+		// Create the language based on the application logic.
+		if ($language !== false)
+		{
+			$this->loadLanguage($language);
+		}
+
+		$this->loadDispatcher($dispatcher);
+
+		return $this;
+	}
+
+	/**
+	 * Execute the application.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function execute()
+	{
+		// Trigger the onBeforeExecute event.
+		$this->triggerEvent('onBeforeExecute');
+
+		// Perform application routines.
+		$this->doExecute();
+
+		// Trigger the onAfterExecute event.
+		$this->triggerEvent('onAfterExecute');
+
+		// If we have an application document object, render it.
+		if ($this->document instanceof \JDocument)
+		{
+			// Trigger the onBeforeRender event.
+			$this->triggerEvent('onBeforeRender');
+
+			// Render the application output.
+			$this->render();
+
+			// Trigger the onAfterRender event.
+			$this->triggerEvent('onAfterRender');
+		}
+
+		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
+		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler'))
+		{
+			$this->compress();
+		}
+
+		// Trigger the onBeforeRespond event.
+		$this->triggerEvent('onBeforeRespond');
+
+		// Send the application response.
+		$this->respond();
+
+		// Trigger the onAfterRespond event.
+		$this->triggerEvent('onAfterRespond');
+	}
+
+	/**
+	 * Rendering is the process of pushing the document buffers into the template
+	 * placeholders, retrieving data from the document and pushing it into
+	 * the application response buffer.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	protected function render()
+	{
+		// Setup the document options.
+		$options = array(
+			'template' => $this->get('theme'),
+			'file' => $this->get('themeFile', 'index.php'),
+			'params' => $this->get('themeParams'),
+		);
+
+		if ($this->get('themes.base'))
+		{
+			$options['directory'] = $this->get('themes.base');
+		}
+		// Fall back to constants.
+		else
+		{
+			$options['directory'] = defined('JPATH_THEMES') ? JPATH_THEMES : (defined('JPATH_BASE') ? JPATH_BASE : __DIR__) . '/themes';
+		}
+
+		// Parse the document.
+		$this->document->parse($options);
+
+		// Render the document.
+		$data = $this->document->render($this->get('cache_enabled'), $options);
+
+		// Set the application output data.
+		$this->setBody($data);
+	}
+
+	/**
+	 * Checks the accept encoding of the browser and compresses the data before
+	 * sending it to the client if possible.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	protected function compress()
+	{
+		// Supported compression encodings.
+		$supported = array(
+			'x-gzip' => 'gz',
+			'gzip' => 'gz',
+			'deflate' => 'deflate',
+		);
+
+		// Get the supported encoding.
+		$encodings = array_intersect($this->client->encodings, array_keys($supported));
+
+		// If no supported encoding is detected do nothing and return.
+		if (empty($encodings))
+		{
+			return;
+		}
+
+		// Verify that headers have not yet been sent, and that our connection is still alive.
+		if ($this->checkHeadersSent() || !$this->checkConnectionAlive())
+		{
+			return;
+		}
+
+		// Iterate through the encodings and attempt to compress the data using any found supported encodings.
+		foreach ($encodings as $encoding)
+		{
+			if (($supported[$encoding] == 'gz') || ($supported[$encoding] == 'deflate'))
+			{
+				// Verify that the server supports gzip compression before we attempt to gzip encode the data.
+				if (!extension_loaded('zlib') || ini_get('zlib.output_compression'))
+				{
+					continue;
+				}
+
+				// Attempt to gzip encode the data with an optimal level 4.
+				$data = $this->getBody();
+				$gzdata = gzencode($data, 4, ($supported[$encoding] == 'gz') ? FORCE_GZIP : FORCE_DEFLATE);
+
+				// If there was a problem encoding the data just try the next encoding scheme.
+				if ($gzdata === false)
+				{
+					continue;
+				}
+
+				// Set the encoding headers.
+				$this->setHeader('Content-Encoding', $encoding);
+
+				// Header will be removed at 4.0
+				if ($this->get('MetaVersion'))
+				{
+					$this->setHeader('X-Content-Encoded-By', 'Joomla');
+				}
+
+				// Replace the output with the encoded data.
+				$this->setBody($gzdata);
+
+				// Compression complete, let's break out of the loop.
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Method to send the application response to the client.  All headers will be sent prior to the main
+	 * application output data.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	protected function respond()
+	{
+		// Send the content-type header.
+		$this->setHeader('Content-Type', $this->mimeType . '; charset=' . $this->charSet);
+
+		// If the response is set to uncachable, we need to set some appropriate headers so browsers don't cache the response.
+		if (!$this->response->cachable)
+		{
+			// Expires in the past.
+			$this->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
+
+			// Always modified.
+			$this->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+			$this->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+
+			// HTTP 1.0
+			$this->setHeader('Pragma', 'no-cache');
+		}
+		else
+		{
+			// Expires.
+			$this->setHeader('Expires', gmdate('D, d M Y H:i:s', time() + 900) . ' GMT');
+
+			// Last modified.
+			if ($this->modifiedDate instanceof \JDate)
+			{
+				$this->setHeader('Last-Modified', $this->modifiedDate->format('D, d M Y H:i:s'));
+			}
+		}
+
+		$this->sendHeaders();
+
+		echo $this->getBody();
+	}
+
+	/**
+	 * Redirect to another URL.
+	 *
+	 * If the headers have not been sent the redirect will be accomplished using a "301 Moved Permanently"
+	 * or "303 See Other" code in the header pointing to the new location. If the headers have already been
+	 * sent this will be accomplished using a JavaScript statement.
+	 *
+	 * @param   string   $url     The URL to redirect to. Can only be http/https URL.
+	 * @param   integer  $status  The HTTP 1.1 status code to be provided. 303 is assumed by default.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	public function redirect($url, $status = 303)
+	{
+		// Check for relative internal links.
+		if (preg_match('#^index\.php#', $url))
+		{
+			// We changed this from "$this->get('uri.base.full') . $url" due to the inability to run the system tests with the original code
+			$url = \JUri::base() . $url;
+		}
+
+		// Perform a basic sanity check to make sure we don't have any CRLF garbage.
+		$url = preg_split("/[\r\n]/", $url);
+		$url = $url[0];
+
+		/*
+		 * Here we need to check and see if the URL is relative or absolute.  Essentially, do we need to
+		 * prepend the URL with our base URL for a proper redirect.  The rudimentary way we are looking
+		 * at this is to simply check whether or not the URL string has a valid scheme or not.
+		 */
+		if (!preg_match('#^[a-z]+\://#i', $url))
+		{
+			// Get a \JUri instance for the requested URI.
+			$uri = \JUri::getInstance($this->get('uri.request'));
+
+			// Get a base URL to prepend from the requested URI.
+			$prefix = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+
+			// We just need the prefix since we have a path relative to the root.
+			if ($url[0] == '/')
+			{
+				$url = $prefix . $url;
+			}
+			// It's relative to where we are now, so lets add that.
+			else
+			{
+				$parts = explode('/', $uri->toString(array('path')));
+				array_pop($parts);
+				$path = implode('/', $parts) . '/';
+				$url = $prefix . $path . $url;
+			}
+		}
+
+		// If the headers have already been sent we need to send the redirect statement via JavaScript.
+		if ($this->checkHeadersSent())
+		{
+			echo "<script>document.location.href=" . json_encode(str_replace("'", '&apos;', $url)) . ";</script>\n";
+		}
+		else
+		{
+			// We have to use a JavaScript redirect here because MSIE doesn't play nice with utf-8 URLs.
+			if (($this->client->engine == \JApplicationWebClient::TRIDENT) && !StringHelper::is_ascii($url))
+			{
+				$html = '<html><head>';
+				$html .= '<meta http-equiv="content-type" content="text/html; charset=' . $this->charSet . '" />';
+				$html .= '<script>document.location.href=' . json_encode(str_replace("'", '&apos;', $url)) . ';</script>';
+				$html .= '</head><body></body></html>';
+
+				echo $html;
+			}
+			else
+			{
+				// Check if we have a boolean for the status variable for compatibility with old $move parameter
+				// @deprecated 4.0
+				if (is_bool($status))
+				{
+					$status = $status ? 301 : 303;
+				}
+
+				// Now check if we have an integer status code that maps to a valid redirect. If we don't then set a 303
+				// @deprecated 4.0 From 4.0 if no valid status code is given an InvalidArgumentException will be thrown
+				if (!is_int($status) || !$this->isRedirectState($status))
+				{
+					$status = 303;
+				}
+
+				// All other cases use the more efficient HTTP header for redirection.
+				$this->setHeader('Status', $status, true);
+				$this->setHeader('Location', $url, true);
+			}
+		}
+
+		// Set appropriate headers
+		$this->respond();
+
+		//  Close the application after the redirect.
+		$this->close();
+	}
+
+	/**
+	 * Checks if a state is a redirect state
+	 *
+	 * @param   integer  $state  The HTTP 1.1 status code.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.8.0
+	 */
+	protected function isRedirectState($state)
+	{
+		$state = (int) $state;
+
+		return ($state > 299 && $state < 400);
+	}
+
+	/**
+	 * Load an object or array into the application configuration object.
+	 *
+	 * @param   mixed  $data  Either an array or object to be loaded into the configuration object.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function loadConfiguration($data)
+	{
+		// Load the data into the configuration object.
+		if (is_array($data))
+		{
+			$this->config->loadArray($data);
+		}
+		elseif (is_object($data))
+		{
+			$this->config->loadObject($data);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set/get cachable state for the response.  If $allow is set, sets the cachable state of the
+	 * response.  Always returns the current state.
+	 *
+	 * @param   boolean  $allow  True to allow browser caching.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.3
+	 */
+	public function allowCache($allow = null)
+	{
+		if ($allow !== null)
+		{
+			$this->response->cachable = (bool) $allow;
+		}
+
+		return $this->response->cachable;
+	}
+
+	/**
+	 * Method to set a response header.  If the replace flag is set then all headers
+	 * with the given name will be replaced by the new one.  The headers are stored
+	 * in an internal array to be sent when the site is sent to the browser.
+	 *
+	 * @param   string   $name     The name of the header to set.
+	 * @param   string   $value    The value of the header to set.
+	 * @param   boolean  $replace  True to replace any headers with the same name.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function setHeader($name, $value, $replace = false)
+	{
+		// Sanitize the input values.
+		$name = (string) $name;
+		$value = (string) $value;
+
+		// Create an array of duplicate header names
+		$keys = false;
+
+		if ($this->response->headers)
+		{
+			$names = array();
+
+			foreach ($this->response->headers as $key => $header)
+			{
+				$names[$key] = $header['name'];
+			}
+
+			// Find existing headers by name
+			$keys = array_keys($names, $name);
+		}
+
+		// Remove if $replace is true and there are duplicate names
+		if ($replace && $keys)
+		{
+			$this->response->headers = array_diff_key($this->response->headers, array_flip($keys));
+		}
+
+		/*
+		 * If no keys found, safe to insert (!$keys)
+		 * If ($keys && $replace) it's a replacement and previous have been deleted
+		 * If ($keys && !in_array...) it's a multiple value header
+		 */
+		$single = in_array($name, $this->singleValueResponseHeaders);
+
+		if ($value && (!$keys || ($keys && ($replace || !$single))))
+		{
+			// Add the header to the internal array.
+			$this->response->headers[] = array('name' => $name, 'value' => $value);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the array of response headers to be sent when the response is sent
+	 * to the client.
+	 *
+	 * @return  array	 *
+	 *
+	 * @since   11.3
+	 */
+	public function getHeaders()
+	{
+		return $this->response->headers;
+	}
+
+	/**
+	 * Method to clear any set response headers.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function clearHeaders()
+	{
+		$this->response->headers = array();
+
+		return $this;
+	}
+
+	/**
+	 * Send the response headers.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function sendHeaders()
+	{
+		if (!$this->checkHeadersSent())
+		{
+			// Creating an array of headers, making arrays of headers with multiple values
+			$val = array();
+
+			foreach ($this->response->headers as $header)
+			{
+				if ('status' == strtolower($header['name']))
+				{
+					// 'status' headers indicate an HTTP status, and need to be handled slightly differently
+					$status = $this->getHttpStatusValue($header['value']);
+					$this->header($status, true, (int) $header['value']);
+				}
+				else
+				{
+					$val[$header['name']] = !isset($val[$header['name']]) ? $header['value'] : implode(', ', array($val[$header['name']], $header['value']));
+					$this->header($header['name'] . ': ' . $val[$header['name']], true);
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Check if a given value can be successfully mapped to a valid http status value
+	 *
+	 * @param   string  $value  The given status as int or string
+	 *
+	 * @return  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected function getHttpStatusValue($value)
+	{
+		$code = (int) $value;
+
+		if (array_key_exists($code, $this->responseMap))
+		{
+			return $this->responseMap[$code];
+		}
+
+		return 'HTTP/1.1 ' . $code;
+	}
+
+	/**
+	 * Set body content.  If body content already defined, this will replace it.
+	 *
+	 * @param   string  $content  The content to set as the response body.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function setBody($content)
+	{
+		$this->response->body = array((string) $content);
+
+		return $this;
+	}
+
+	/**
+	 * Prepend content to the body content
+	 *
+	 * @param   string  $content  The content to prepend to the response body.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function prependBody($content)
+	{
+		array_unshift($this->response->body, (string) $content);
+
+		return $this;
+	}
+
+	/**
+	 * Append content to the body content
+	 *
+	 * @param   string  $content  The content to append to the response body.
+	 *
+	 * @return  WebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function appendBody($content)
+	{
+		$this->response->body[] = (string) $content;
+
+		return $this;
+	}
+
+	/**
+	 * Return the body content
+	 *
+	 * @param   boolean  $asArray  True to return the body as an array of strings.
+	 *
+	 * @return  mixed  The response body either as an array or concatenated string.
+	 *
+	 * @since   11.3
+	 */
+	public function getBody($asArray = false)
+	{
+		return $asArray ? $this->response->body : implode((array) $this->response->body);
+	}
+
+	/**
+	 * Method to get the application document object.
+	 *
+	 * @return  \JDocument  The document object
+	 *
+	 * @since   11.3
+	 */
+	public function getDocument()
+	{
+		return $this->document;
+	}
+
+	/**
+	 * Method to get the application language object.
+	 *
+	 * @return  \JLanguage  The language object
+	 *
+	 * @since   11.3
+	 */
+	public function getLanguage()
+	{
+		return $this->language;
+	}
+
+	/**
+	 * Method to get the application session object.
+	 *
+	 * @return  \JSession  The session object
+	 *
+	 * @since   11.3
+	 */
+	public function getSession()
+	{
+		return $this->session;
+	}
+
+	/**
+	 * Method to check the current client connection status to ensure that it is alive.  We are
+	 * wrapping this to isolate the connection_status() function from our code base for testing reasons.
+	 *
+	 * @return  boolean  True if the connection is valid and normal.
+	 *
+	 * @see     connection_status()
+	 * @since   11.3
+	 */
+	protected function checkConnectionAlive()
+	{
+		return connection_status() === CONNECTION_NORMAL;
+	}
+
+	/**
+	 * Method to check to see if headers have already been sent.  We are wrapping this to isolate the
+	 * headers_sent() function from our code base for testing reasons.
+	 *
+	 * @return  boolean  True if the headers have already been sent.
+	 *
+	 * @see     headers_sent()
+	 * @since   11.3
+	 */
+	protected function checkHeadersSent()
+	{
+		return headers_sent();
+	}
+
+	/**
+	 * Method to detect the requested URI from server environment variables.
+	 *
+	 * @return  string  The requested URI
+	 *
+	 * @since   11.3
+	 */
+	protected function detectRequestUri()
+	{
+		// First we need to detect the URI scheme.
+		if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off'))
+		{
+			$scheme = 'https://';
+		}
+		else
+		{
+			$scheme = 'http://';
+		}
+
+		/*
+		 * There are some differences in the way that Apache and IIS populate server environment variables.  To
+		 * properly detect the requested URI we need to adjust our algorithm based on whether or not we are getting
+		 * information from Apache or IIS.
+		 */
+		// Define variable to return
+		$uri = '';
+
+		// If PHP_SELF and REQUEST_URI are both populated then we will assume "Apache Mode".
+		if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI']))
+		{
+			// The URI is built from the HTTP_HOST and REQUEST_URI environment variables in an Apache environment.
+			$uri = $scheme . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+		}
+		// If not in "Apache Mode" we will assume that we are in an IIS environment and proceed.
+		elseif (isset($_SERVER['HTTP_HOST']))
+		{
+			// IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS
+			$uri = $scheme . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'];
+
+			// If the QUERY_STRING variable exists append it to the URI string.
+			if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']))
+			{
+				$uri .= '?' . $_SERVER['QUERY_STRING'];
+			}
+		}
+
+		return trim($uri);
+	}
+
+	/**
+	 * Method to load a PHP configuration class file based on convention and return the instantiated data object.  You
+	 * will extend this method in child classes to provide configuration data from whatever data source is relevant
+	 * for your specific application.
+	 *
+	 * @param   string  $file   The path and filename of the configuration file. If not provided, configuration.php
+	 *                          in JPATH_CONFIGURATION will be used.
+	 * @param   string  $class  The class name to instantiate.
+	 *
+	 * @return  mixed   Either an array or object to be loaded into the configuration object.
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	protected function fetchConfigurationData($file = '', $class = '\JConfig')
+	{
+		// Instantiate variables.
+		$config = array();
+
+		if (empty($file))
+		{
+			$file = JPATH_CONFIGURATION . '/configuration.php';
+
+			// Applications can choose not to have any configuration data
+			// by not implementing this method and not having a config file.
+			if (!file_exists($file))
+			{
+				$file = '';
+			}
+		}
+
+		if (!empty($file))
+		{
+			\JLoader::register($class, $file);
+
+			if (class_exists($class))
+			{
+				$config = new $class;
+			}
+			else
+			{
+				throw new \RuntimeException('Configuration class does not exist.');
+			}
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Flush the media version to refresh versionable assets
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function flushAssets()
+	{
+		$version = new \JVersion;
+		$version->refreshMediaVersion();
+	}
+
+	/**
+	 * Method to send a header to the client.  We are wrapping this to isolate the header() function
+	 * from our code base for testing reasons.
+	 *
+	 * @param   string   $string   The header string.
+	 * @param   boolean  $replace  The optional replace parameter indicates whether the header should
+	 *                             replace a previous similar header, or add a second header of the same type.
+	 * @param   integer  $code     Forces the HTTP response code to the specified value. Note that
+	 *                             this parameter only has an effect if the string is not empty.
+	 *
+	 * @return  void
+	 *
+	 * @see     header()
+	 * @since   11.3
+	 */
+	protected function header($string, $replace = true, $code = null)
+	{
+		$string = str_replace(chr(0), '', $string);
+		header($string, $replace, $code);
+	}
+
+	/**
+	 * Determine if we are using a secure (SSL) connection.
+	 *
+	 * @return  boolean  True if using SSL, false if not.
+	 *
+	 * @since   12.2
+	 */
+	public function isSSLConnection()
+	{
+		return (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) || getenv('SSL_PROTOCOL_VERSION');
+	}
+
+	/**
+	 * Allows the application to load a custom or default document.
+	 *
+	 * The logic and options for creating this object are adequately generic for default cases
+	 * but for many applications it will make sense to override this method and create a document,
+	 * if required, based on more specific needs.
+	 *
+	 * @param   \JDocument  $document  An optional document object. If omitted, the factory document is created.
+	 *
+	 * @return  WebApplication This method is chainable.
+	 *
+	 * @since   11.3
+	 */
+	public function loadDocument(\JDocument $document = null)
+	{
+		$this->document = ($document === null) ? \JFactory::getDocument() : $document;
+
+		return $this;
+	}
+
+	/**
+	 * Allows the application to load a custom or default language.
+	 *
+	 * The logic and options for creating this object are adequately generic for default cases
+	 * but for many applications it will make sense to override this method and create a language,
+	 * if required, based on more specific needs.
+	 *
+	 * @param   \JLanguage  $language  An optional language object. If omitted, the factory language is created.
+	 *
+	 * @return  WebApplication This method is chainable.
+	 *
+	 * @since   11.3
+	 */
+	public function loadLanguage(\JLanguage $language = null)
+	{
+		$this->language = ($language === null) ? \JFactory::getLanguage() : $language;
+
+		return $this;
+	}
+
+	/**
+	 * Allows the application to load a custom or default session.
+	 *
+	 * The logic and options for creating this object are adequately generic for default cases
+	 * but for many applications it will make sense to override this method and create a session,
+	 * if required, based on more specific needs.
+	 *
+	 * @param   \JSession  $session  An optional session object. If omitted, the session is created.
+	 *
+	 * @return  WebApplication This method is chainable.
+	 *
+	 * @since   11.3
+	 */
+	public function loadSession(\JSession $session = null)
+	{
+		if ($session !== null)
+		{
+			$this->session = $session;
+
+			return $this;
+		}
+
+		// Generate a session name.
+		$name = md5($this->get('secret') . $this->get('session_name', get_class($this)));
+
+		// Calculate the session lifetime.
+		$lifetime = (($this->get('sess_lifetime')) ? $this->get('sess_lifetime') * 60 : 900);
+
+		// Get the session handler from the configuration.
+		$handler = $this->get('sess_handler', 'none');
+
+		// Initialize the options for \JSession.
+		$options = array(
+			'name' => $name,
+			'expire' => $lifetime,
+			'force_ssl' => $this->get('force_ssl'),
+		);
+
+		$this->registerEvent('onAfterSessionStart', array($this, 'afterSessionStart'));
+
+		// Instantiate the session object.
+		$session = \JSession::getInstance($handler, $options);
+		$session->initialise($this->input, $this->dispatcher);
+
+		if ($session->getState() == 'expired')
+		{
+			$session->restart();
+		}
+		else
+		{
+			$session->start();
+		}
+
+		// Set the session object.
+		$this->session = $session;
+
+		return $this;
+	}
+
+	/**
+	 * After the session has been started we need to populate it with some default values.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function afterSessionStart()
+	{
+		$session = \JFactory::getSession();
+
+		if ($session->isNew())
+		{
+			$session->set('registry', new Registry);
+			$session->set('user', new \JUser);
+		}
+	}
+
+	/**
+	 * Method to load the system URI strings for the application.
+	 *
+	 * @param   string  $requestUri  An optional request URI to use instead of detecting one from the
+	 *                               server environment variables.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.3
+	 */
+	protected function loadSystemUris($requestUri = null)
+	{
+		// Set the request URI.
+		if (!empty($requestUri))
+		{
+			$this->set('uri.request', $requestUri);
+		}
+		else
+		{
+			$this->set('uri.request', $this->detectRequestUri());
+		}
+
+		// Check to see if an explicit base URI has been set.
+		$siteUri = trim($this->get('site_uri'));
+
+		if ($siteUri != '')
+		{
+			$uri = \JUri::getInstance($siteUri);
+			$path = $uri->toString(array('path'));
+		}
+		// No explicit base URI was set so we need to detect it.
+		else
+		{
+			// Start with the requested URI.
+			$uri = \JUri::getInstance($this->get('uri.request'));
+
+			// If we are working from a CGI SAPI with the 'cgi.fix_pathinfo' directive disabled we use PHP_SELF.
+			if (strpos(php_sapi_name(), 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
+			{
+				// We aren't expecting PATH_INFO within PHP_SELF so this should work.
+				$path = dirname($_SERVER['PHP_SELF']);
+			}
+			// Pretty much everything else should be handled with SCRIPT_NAME.
+			else
+			{
+				$path = dirname($_SERVER['SCRIPT_NAME']);
+			}
+		}
+
+		$host = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+
+		// Check if the path includes "index.php".
+		if (strpos($path, 'index.php') !== false)
+		{
+			// Remove the index.php portion of the path.
+			$path = substr_replace($path, '', strpos($path, 'index.php'), 9);
+		}
+
+		$path = rtrim($path, '/\\');
+
+		// Set the base URI both as just a path and as the full URI.
+		$this->set('uri.base.full', $host . $path . '/');
+		$this->set('uri.base.host', $host);
+		$this->set('uri.base.path', $path . '/');
+
+		// Set the extended (non-base) part of the request URI as the route.
+		if (stripos($this->get('uri.request'), $this->get('uri.base.full')) === 0)
+		{
+			$this->set('uri.route', substr_replace($this->get('uri.request'), '', 0, strlen($this->get('uri.base.full'))));
+		}
+
+		// Get an explicitly set media URI is present.
+		$mediaURI = trim($this->get('media_uri'));
+
+		if ($mediaURI)
+		{
+			if (strpos($mediaURI, '://') !== false)
+			{
+				$this->set('uri.media.full', $mediaURI);
+				$this->set('uri.media.path', $mediaURI);
+			}
+			else
+			{
+				// Normalise slashes.
+				$mediaURI = trim($mediaURI, '/\\');
+				$mediaURI = !empty($mediaURI) ? '/' . $mediaURI . '/' : '/';
+				$this->set('uri.media.full', $this->get('uri.base.host') . $mediaURI);
+				$this->set('uri.media.path', $mediaURI);
+			}
+		}
+		// No explicit media URI was set, build it dynamically from the base uri.
+		else
+		{
+			$this->set('uri.media.full', $this->get('uri.base.full') . 'media/');
+			$this->set('uri.media.path', $this->get('uri.base.path') . 'media/');
+		}
+	}
+}
diff --git a/core/libraries/src/Association/AssociationExtensionHelper.php b/core/libraries/src/Association/AssociationExtensionHelper.php
new file mode 100644
index 00000000..dbc786bd
--- /dev/null
+++ b/core/libraries/src/Association/AssociationExtensionHelper.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Association;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Association Extension Helper
+ *
+ * @since  3.7.0
+ */
+abstract class AssociationExtensionHelper  implements AssociationExtensionInterface
+{
+	/**
+	 * The extension name
+	 *
+	 * @var     array  $extension
+	 *
+	 * @since   3.7.0
+	 */
+	protected $extension = 'com_??';
+
+	/**
+	 * Array of item types
+	 *
+	 * @var     array  $itemTypes
+	 *
+	 * @since   3.7.0
+	 */
+	protected $itemTypes = array();
+
+	/**
+	 * Has the extension association support
+	 *
+	 * @var     boolean  $associationsSupport
+	 *
+	 * @since   3.7.0
+	 */
+	protected $associationsSupport = false;
+
+	/**
+	 * Checks if the extension supports associations
+	 *
+	 * @return  boolean  Supports the extension associations
+	 *
+	 * @since   3.7.0
+	 */
+	public function hasAssociationsSupport()
+	{
+		return $this->associationsSupport;
+	}
+
+	/**
+	 * Get the item types
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  3.7.0
+	 */
+	public function getItemTypes()
+	{
+		return $this->itemTypes;
+	}
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $itemId    The id of item for which we need the associated items
+	 *
+	 * @return   array
+	 *
+	 * @since    3.7.0
+	 */
+	public function getAssociationList($typeName, $itemId)
+	{
+		$items = array();
+
+		$associations = $this->getAssociations($typeName, $itemId);
+
+		foreach ($associations as $key => $association)
+		{
+			$items[$key] = ArrayHelper::fromObject($this->getItem($typeName, (int) $association->id), false);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since   3.7.0
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+
+	/**
+	 * Get information about the fields the type provides
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since   3.7.0
+	 */
+	public function getTypeFields($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'fields');
+	}
+
+	/**
+	 * Get information about the fields the type provides
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since   3.7.0
+	 */
+	public function getTypeSupport($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'support');
+	}
+
+	/**
+	 * Get information about the tables the type use
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since   3.7.0
+	 */
+	public function getTypeTables($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'tables');
+	}
+
+	/**
+	 * Get information about the table joins for the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since   3.7.0
+	 */
+	public function getTypeJoins($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'joins');
+	}
+
+	/**
+	 * Get the type title
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since   3.7.0
+	 */
+	public function getTypeTitle($typeName)
+	{
+		$type = $this->getType($typeName);
+
+		if (!array_key_exists('title', $type))
+		{
+			return '';
+		}
+
+		return $type['title'];
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   string  $part      part of the information
+	 *
+	 * @return  array Array of support information
+	 *
+	 * @since   3.7.0
+	 */
+	private function getTypeInformation($typeName, $part = 'support')
+	{
+		$type = $this->getType($typeName);
+
+		if (!array_key_exists($part, $type))
+		{
+			return array();
+		}
+
+		return $type[$part];
+	}
+
+	/**
+	 * Get a table field name for a type
+	 *
+	 * @param   string  $typeName   The item type
+	 * @param   string  $fieldName  The item type
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	public function getTypeFieldName($typeName, $fieldName)
+	{
+		$fields = $this->getTypeFields($typeName);
+
+		if (!array_key_exists($fieldName, $fields))
+		{
+			return '';
+		}
+
+		$tmp = $fields[$fieldName];
+		$pos = strpos($tmp, '.');
+
+		if ($pos === false)
+		{
+			return $tmp;
+		}
+
+		return substr($tmp, $pos + 1);
+	}
+
+	/**
+	 * Get default values for support array
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getSupportTemplate()
+	{
+		return array(
+			'state'    => false,
+			'acl'      => false,
+			'checkout' => false
+		);
+	}
+
+	/**
+	 * Get default values for fields array
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getFieldsTemplate()
+	{
+		return array(
+			'id'                  => 'a.id',
+			'title'               => 'a.title',
+			'alias'               => 'a.alias',
+			'ordering'            => 'a.ordering',
+			'menutype'            => '',
+			'level'               => '',
+			'catid'               => 'a.catid',
+			'language'            => 'a.language',
+			'access'              => 'a.access',
+			'state'               => 'a.state',
+			'created_user_id'     => 'a.created_by',
+			'checked_out'         => 'a.checked_out',
+			'checked_out_time'    => 'a.checked_out_time'
+		);
+	}
+}
diff --git a/core/libraries/src/Association/AssociationExtensionInterface.php b/core/libraries/src/Association/AssociationExtensionInterface.php
new file mode 100644
index 00000000..599b8718
--- /dev/null
+++ b/core/libraries/src/Association/AssociationExtensionInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Association;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Association Extension Interface for the helper classes
+ *
+ * @since  3.7.0
+ */
+interface AssociationExtensionInterface
+{
+	/**
+	 * Checks if the extension supports associations
+	 *
+	 * @return  boolean  Supports the extension associations
+	 *
+	 * @since   3.7.0
+	 */
+	public function hasAssociationsSupport();
+}
diff --git a/core/libraries/src/Authentication/Authentication.php b/core/libraries/src/Authentication/Authentication.php
new file mode 100644
index 00000000..bdff7ed4
--- /dev/null
+++ b/core/libraries/src/Authentication/Authentication.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Authentication;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Plugin\PluginHelper;
+
+/**
+ * Authentication class, provides an interface for the Joomla authentication system
+ *
+ * @since  11.1
+ */
+class Authentication extends \JObject
+{
+	// Shared success status
+	/**
+	 * This is the status code returned when the authentication is success (permit login)
+	 * @const  STATUS_SUCCESS successful response
+	 * @since  11.2
+	 */
+	const STATUS_SUCCESS = 1;
+
+	// These are for authentication purposes (username and password is valid)
+	/**
+	 * Status to indicate cancellation of authentication (unused)
+	 * @const  STATUS_CANCEL cancelled request (unused)
+	 * @since  11.2
+	 */
+	const STATUS_CANCEL = 2;
+
+	/**
+	 * This is the status code returned when the authentication failed (prevent login if no success)
+	 * @const  STATUS_FAILURE failed request
+	 * @since  11.2
+	 */
+	const STATUS_FAILURE = 4;
+
+	// These are for authorisation purposes (can the user login)
+	/**
+	 * This is the status code returned when the account has expired (prevent login)
+	 * @const  STATUS_EXPIRED an expired account (will prevent login)
+	 * @since  11.2
+	 */
+	const STATUS_EXPIRED = 8;
+
+	/**
+	 * This is the status code returned when the account has been denied (prevent login)
+	 * @const  STATUS_DENIED denied request (will prevent login)
+	 * @since  11.2
+	 */
+	const STATUS_DENIED = 16;
+
+	/**
+	 * This is the status code returned when the account doesn't exist (not an error)
+	 * @const  STATUS_UNKNOWN unknown account (won't permit or prevent login)
+	 * @since  11.2
+	 */
+	const STATUS_UNKNOWN = 32;
+
+	/**
+	 * An array of Observer objects to notify
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $observers = array();
+
+	/**
+	 * The state of the observable object
+	 *
+	 * @var    mixed
+	 * @since  12.1
+	 */
+	protected $state = null;
+
+	/**
+	 * A multi dimensional array of [function][] = key for observers
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $methods = array();
+
+	/**
+	 * @var    Authentication  Authentication instances container.
+	 * @since  11.3
+	 */
+	protected static $instance;
+
+	/**
+	 * Constructor
+	 *
+	 * @since   11.1
+	 */
+	public function __construct()
+	{
+		$isLoaded = PluginHelper::importPlugin('authentication');
+
+		if (!$isLoaded)
+		{
+			\JLog::add(\JText::_('JLIB_USER_ERROR_AUTHENTICATION_LIBRARIES'), \JLog::WARNING, 'jerror');
+		}
+	}
+
+	/**
+	 * Returns the global authentication object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @return  Authentication  The global Authentication object
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance()
+	{
+		if (empty(self::$instance))
+		{
+			self::$instance = new Authentication;
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Get the state of the Authentication object
+	 *
+	 * @return  mixed    The state of the object.
+	 *
+	 * @since   11.1
+	 */
+	public function getState()
+	{
+		return $this->state;
+	}
+
+	/**
+	 * Attach an observer object
+	 *
+	 * @param   object  $observer  An observer object to attach
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function attach($observer)
+	{
+		if (is_array($observer))
+		{
+			if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this array as an observer
+			foreach ($this->observers as $check)
+			{
+				if (is_array($check) && $check['event'] == $observer['event'] && $check['handler'] == $observer['handler'])
+				{
+					return;
+				}
+			}
+
+			$this->observers[] = $observer;
+			end($this->observers);
+			$methods = array($observer['event']);
+		}
+		else
+		{
+			if (!($observer instanceof Authentication))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this object as an observer
+			$class = get_class($observer);
+
+			foreach ($this->observers as $check)
+			{
+				if ($check instanceof $class)
+				{
+					return;
+				}
+			}
+
+			$this->observers[] = $observer;
+			$methods = array_diff(get_class_methods($observer), get_class_methods('\\JPlugin'));
+		}
+
+		$key = key($this->observers);
+
+		foreach ($methods as $method)
+		{
+			$method = strtolower($method);
+
+			if (!isset($this->methods[$method]))
+			{
+				$this->methods[$method] = array();
+			}
+
+			$this->methods[$method][] = $key;
+		}
+	}
+
+	/**
+	 * Detach an observer object
+	 *
+	 * @param   object  $observer  An observer object to detach.
+	 *
+	 * @return  boolean  True if the observer object was detached.
+	 *
+	 * @since   11.1
+	 */
+	public function detach($observer)
+	{
+		$retval = false;
+
+		$key = array_search($observer, $this->observers);
+
+		if ($key !== false)
+		{
+			unset($this->observers[$key]);
+			$retval = true;
+
+			foreach ($this->methods as &$method)
+			{
+				$k = array_search($key, $method);
+
+				if ($k !== false)
+				{
+					unset($method[$k]);
+				}
+			}
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Finds out if a set of login credentials are valid by asking all observing
+	 * objects to run their respective authentication routines.
+	 *
+	 * @param   array  $credentials  Array holding the user credentials.
+	 * @param   array  $options      Array holding user options.
+	 *
+	 * @return  AuthenticationResponse  Response object with status variable filled in for last plugin or first successful plugin.
+	 *
+	 * @see     AuthenticationResponse
+	 * @since   11.1
+	 */
+	public function authenticate($credentials, $options = array())
+	{
+		// Get plugins
+		$plugins = PluginHelper::getPlugin('authentication');
+
+		// Create authentication response
+		$response = new AuthenticationResponse;
+
+		/*
+		 * Loop through the plugins and check if the credentials can be used to authenticate
+		 * the user
+		 *
+		 * Any errors raised in the plugin should be returned via the AuthenticationResponse
+		 * and handled appropriately.
+		 */
+		foreach ($plugins as $plugin)
+		{
+			$className = 'plg' . $plugin->type . $plugin->name;
+
+			if (class_exists($className))
+			{
+				$plugin = new $className($this, (array) $plugin);
+			}
+			else
+			{
+				// Bail here if the plugin can't be created
+				\JLog::add(\JText::sprintf('JLIB_USER_ERROR_AUTHENTICATION_FAILED_LOAD_PLUGIN', $className), \JLog::WARNING, 'jerror');
+				continue;
+			}
+
+			// Try to authenticate
+			$plugin->onUserAuthenticate($credentials, $options, $response);
+
+			// If authentication is successful break out of the loop
+			if ($response->status === self::STATUS_SUCCESS)
+			{
+				if (empty($response->type))
+				{
+					$response->type = isset($plugin->_name) ? $plugin->_name : $plugin->name;
+				}
+
+				break;
+			}
+		}
+
+		if (empty($response->username))
+		{
+			$response->username = $credentials['username'];
+		}
+
+		if (empty($response->fullname))
+		{
+			$response->fullname = $credentials['username'];
+		}
+
+		if (empty($response->password) && isset($credentials['password']))
+		{
+			$response->password = $credentials['password'];
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Authorises that a particular user should be able to login
+	 *
+	 * @param   AuthenticationResponse  $response  response including username of the user to authorise
+	 * @param   array                   $options   list of options
+	 *
+	 * @return  AuthenticationResponse[]  Array of authentication response objects
+	 *
+	 * @since  11.2
+	 */
+	public static function authorise($response, $options = array())
+	{
+		// Get plugins in case they haven't been imported already
+		PluginHelper::importPlugin('user');
+
+		PluginHelper::importPlugin('authentication');
+		$dispatcher = \JEventDispatcher::getInstance();
+		$results = $dispatcher->trigger('onUserAuthorisation', array($response, $options));
+
+		return $results;
+	}
+}
diff --git a/core/libraries/src/Authentication/AuthenticationResponse.php b/core/libraries/src/Authentication/AuthenticationResponse.php
new file mode 100644
index 00000000..62bfbea6
--- /dev/null
+++ b/core/libraries/src/Authentication/AuthenticationResponse.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Authentication;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Authentication response class, provides an object for storing user and error details
+ *
+ * @since  11.1
+ */
+class AuthenticationResponse
+{
+	/**
+	 * Response status (see status codes)
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $status = Authentication::STATUS_FAILURE;
+
+	/**
+	 * The type of authentication that was successful
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = '';
+
+	/**
+	 *  The error message
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $error_message = '';
+
+	/**
+	 * Any UTF-8 string that the End User wants to use as a username.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $username = '';
+
+	/**
+	 * Any UTF-8 string that the End User wants to use as a password.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $password = '';
+
+	/**
+	 * The email address of the End User as specified in section 3.4.1 of [RFC2822]
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $email = '';
+
+	/**
+	 * UTF-8 string free text representation of the End User's full name.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $fullname = '';
+
+	/**
+	 * The End User's date of birth as YYYY-MM-DD. Any values whose representation uses
+	 * fewer than the specified number of digits should be zero-padded. The length of this
+	 * value MUST always be 10. If the End User user does not want to reveal any particular
+	 * component of this value, it MUST be set to zero.
+	 *
+	 * For instance, if an End User wants to specify that their date of birth is in 1980, but
+	 * not the month or day, the value returned SHALL be "1980-00-00".
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $birthdate = '';
+
+	/**
+	 * The End User's gender, "M" for male, "F" for female.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $gender = '';
+
+	/**
+	 * UTF-8 string free text that SHOULD conform to the End User's country's postal system.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $postcode = '';
+
+	/**
+	 * The End User's country of residence as specified by ISO3166.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $country = '';
+
+	/**
+	 * End User's preferred language as specified by ISO639.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $language = '';
+
+	/**
+	 * ASCII string from TimeZone database
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $timezone = '';
+}
diff --git a/core/libraries/src/Cache/Cache.php b/core/libraries/src/Cache/Cache.php
new file mode 100644
index 00000000..787f31af
--- /dev/null
+++ b/core/libraries/src/Cache/Cache.php
@@ -0,0 +1,843 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\Web\WebClient;
+use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
+use Joomla\String\StringHelper;
+
+/**
+ * Joomla! Cache base object
+ *
+ * @since  11.1
+ */
+class Cache
+{
+	/**
+	 * Storage handler
+	 *
+	 * @var    CacheStorage[]
+	 * @since  11.1
+	 */
+	public static $_handler = array();
+
+	/**
+	 * Cache options
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_options;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Cache options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options)
+	{
+		$conf = \JFactory::getConfig();
+
+		$this->_options = array(
+			'cachebase'    => $conf->get('cache_path', JPATH_CACHE),
+			'lifetime'     => (int) $conf->get('cachetime'),
+			'language'     => $conf->get('language', 'en-GB'),
+			'storage'      => $conf->get('cache_handler', ''),
+			'defaultgroup' => 'default',
+			'locking'      => true,
+			'locktime'     => 15,
+			'checkTime'    => true,
+			'caching'      => ($conf->get('caching') >= 1) ? true : false,
+		);
+
+		// Overwrite default options with given options
+		foreach ($options as $option => $value)
+		{
+			if (isset($options[$option]) && $options[$option] !== '')
+			{
+				$this->_options[$option] = $options[$option];
+			}
+		}
+
+		if (empty($this->_options['storage']))
+		{
+			$this->setCaching(false);
+		}
+	}
+
+	/**
+	 * Returns a reference to a cache adapter object, always creating it
+	 *
+	 * @param   string  $type     The cache object type to instantiate
+	 * @param   array   $options  The array of options
+	 *
+	 * @return  CacheController
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($type = 'output', $options = array())
+	{
+		return CacheController::getInstance($type, $options);
+	}
+
+	/**
+	 * Get the storage handlers
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public static function getStores()
+	{
+		$handlers = array();
+
+		// Get an iterator and loop trough the driver classes.
+		$iterator = new \DirectoryIterator(__DIR__ . '/Storage');
+
+		/** @type  $file  \DirectoryIterator */
+		foreach ($iterator as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() != 'php' || $fileName == 'CacheStorageHelper.php')
+			{
+				continue;
+			}
+
+			// Derive the class name from the type.
+			$class = str_ireplace('.php', '', __NAMESPACE__ . '\\Storage\\' . ucfirst(trim($fileName)));
+
+			// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+			if (!class_exists($class))
+			{
+				continue;
+			}
+
+			// Sweet!  Our class exists, so now we just need to know if it passes its test method.
+			if ($class::isSupported())
+			{
+				// Connector names should not have file extensions.
+				$handler = str_ireplace('Storage.php', '', $fileName);
+				$handler = str_ireplace('.php', '', $handler);
+				$handlers[] = strtolower($handler);
+			}
+		}
+
+		return $handlers;
+	}
+
+	/**
+	 * Set caching enabled state
+	 *
+	 * @param   boolean  $enabled  True to enable caching
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function setCaching($enabled)
+	{
+		$this->_options['caching'] = $enabled;
+	}
+
+	/**
+	 * Get caching state
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function getCaching()
+	{
+		return $this->_options['caching'];
+	}
+
+	/**
+	 * Set cache lifetime
+	 *
+	 * @param   integer  $lt  Cache lifetime
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function setLifeTime($lt)
+	{
+		$this->_options['lifetime'] = $lt;
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group = null)
+	{
+		if (!$this->getCaching())
+		{
+			return false;
+		}
+
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		return $this->_getStorage()->contains($id, $group);
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group = null)
+	{
+		if (!$this->getCaching())
+		{
+			return false;
+		}
+
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		return $this->_getStorage()->get($id, $group, $this->_options['checkTime']);
+	}
+
+	/**
+	 * Get a list of all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or an object with a list of cache groups and data
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		if (!$this->getCaching())
+		{
+			return false;
+		}
+
+		return $this->_getStorage()->getAll();
+	}
+
+	/**
+	 * Store the cached data by ID and group
+	 *
+	 * @param   mixed   $data   The data to store
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($data, $id, $group = null)
+	{
+		if (!$this->getCaching())
+		{
+			return false;
+		}
+
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		// Get the storage and store the cached data
+		return $this->_getStorage()->store($id, $group, $data);
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group = null)
+	{
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		try
+		{
+			return $this->_getStorage()->remove($id, $group);
+		}
+		catch (CacheExceptionInterface $e)
+		{
+			if (!$this->getCaching())
+			{
+				return false;
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean  True on success, false otherwise
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group = null, $mode = 'group')
+	{
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		try
+		{
+			return $this->_getStorage()->clean($group, $mode);
+		}
+		catch (CacheExceptionInterface $e)
+		{
+			if (!$this->getCaching())
+			{
+				return false;
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function gc()
+	{
+		try
+		{
+			return $this->_getStorage()->gc();
+		}
+		catch (CacheExceptionInterface $e)
+		{
+			if (!$this->getCaching())
+			{
+				return false;
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * Set lock flag on cached item
+	 *
+	 * @param   string  $id        The cache data ID
+	 * @param   string  $group     The cache data group
+	 * @param   string  $locktime  The default locktime for locking the cache.
+	 *
+	 * @return  \stdClass  Object with properties of lock and locklooped
+	 *
+	 * @since   11.1
+	 */
+	public function lock($id, $group = null, $locktime = null)
+	{
+		$returning = new \stdClass;
+		$returning->locklooped = false;
+
+		if (!$this->getCaching())
+		{
+			$returning->locked = false;
+
+			return $returning;
+		}
+
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		// Get the default locktime
+		$locktime = $locktime ?: $this->_options['locktime'];
+
+		/*
+		 * Allow storage handlers to perform locking on their own
+		 * NOTE drivers with lock need also unlock or unlocking will fail because of false $id
+		 */
+		$handler = $this->_getStorage();
+
+		if ($this->_options['locking'] == true)
+		{
+			$locked = $handler->lock($id, $group, $locktime);
+
+			if ($locked !== false)
+			{
+				return $locked;
+			}
+		}
+
+		// Fallback
+		$curentlifetime = $this->_options['lifetime'];
+
+		// Set lifetime to locktime for storing in children
+		$this->_options['lifetime'] = $locktime;
+
+		$looptime = $locktime * 10;
+		$id2      = $id . '_lock';
+
+		if ($this->_options['locking'] == true)
+		{
+			$data_lock = $handler->get($id2, $group, $this->_options['checkTime']);
+		}
+		else
+		{
+			$data_lock         = false;
+			$returning->locked = false;
+		}
+
+		if ($data_lock !== false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released. That implies that data get from other thread has finished
+			while ($data_lock !== false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					$returning->locked = false;
+					$returning->locklooped = true;
+					break;
+				}
+
+				usleep(100);
+				$data_lock = $handler->get($id2, $group, $this->_options['checkTime']);
+				$lock_counter++;
+			}
+		}
+
+		if ($this->_options['locking'] == true)
+		{
+			$returning->locked = $handler->store($id2, $group, 1);
+		}
+
+		// Revert lifetime to previous one
+		$this->_options['lifetime'] = $curentlifetime;
+
+		return $returning;
+	}
+
+	/**
+	 * Unset lock flag on cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function unlock($id, $group = null)
+	{
+		if (!$this->getCaching())
+		{
+			return false;
+		}
+
+		// Get the default group
+		$group = $group ?: $this->_options['defaultgroup'];
+
+		// Allow handlers to perform unlocking on their own
+		$handler = $this->_getStorage();
+
+		$unlocked = $handler->unlock($id, $group);
+
+		if ($unlocked !== false)
+		{
+			return $unlocked;
+		}
+
+		// Fallback
+		return $handler->remove($id . '_lock', $group);
+	}
+
+	/**
+	 * Get the cache storage handler
+	 *
+	 * @return  CacheStorage
+	 *
+	 * @since   11.1
+	 */
+	public function &_getStorage()
+	{
+		$hash = md5(serialize($this->_options));
+
+		if (isset(self::$_handler[$hash]))
+		{
+			return self::$_handler[$hash];
+		}
+
+		self::$_handler[$hash] = CacheStorage::getInstance($this->_options['storage'], $this->_options);
+
+		return self::$_handler[$hash];
+	}
+
+	/**
+	 * Perform workarounds on retrieved cached data
+	 *
+	 * @param   string  $data     Cached data
+	 * @param   array   $options  Array of options
+	 *
+	 * @return  string  Body of cached data
+	 *
+	 * @since   11.1
+	 */
+	public static function getWorkarounds($data, $options = array())
+	{
+		$app      = \JFactory::getApplication();
+		$document = \JFactory::getDocument();
+		$body     = null;
+
+		// Get the document head out of the cache.
+		if (isset($options['mergehead']) && $options['mergehead'] == 1 && isset($data['head']) && !empty($data['head'])
+			&& method_exists($document, 'mergeHeadData'))
+		{
+			$document->mergeHeadData($data['head']);
+		}
+		elseif (isset($data['head']) && method_exists($document, 'setHeadData'))
+		{
+			$document->setHeadData($data['head']);
+		}
+
+		// Get the document MIME encoding out of the cache
+		if (isset($data['mime_encoding']))
+		{
+			$document->setMimeEncoding($data['mime_encoding'], true);
+		}
+
+		// If the pathway buffer is set in the cache data, get it.
+		if (isset($data['pathway']) && is_array($data['pathway']))
+		{
+			// Push the pathway data into the pathway object.
+			$app->getPathway()->setPathway($data['pathway']);
+		}
+
+		// @todo check if the following is needed, seems like it should be in page cache
+		// If a module buffer is set in the cache data, get it.
+		if (isset($data['module']) && is_array($data['module']))
+		{
+			// Iterate through the module positions and push them into the document buffer.
+			foreach ($data['module'] as $name => $contents)
+			{
+				$document->setBuffer($contents, 'module', $name);
+			}
+		}
+
+		// Set cached headers.
+		if (isset($data['headers']) && $data['headers'])
+		{
+			foreach ($data['headers'] as $header)
+			{
+				$app->setHeader($header['name'], $header['value']);
+			}
+		}
+
+		// The following code searches for a token in the cached page and replaces it with the proper token.
+		if (isset($data['body']))
+		{
+			$token       = \JSession::getFormToken();
+			$search      = '#<input type="hidden" name="[0-9a-f]{32}" value="1" />#';
+			$replacement = '<input type="hidden" name="' . $token . '" value="1" />';
+
+			$data['body'] = preg_replace($search, $replacement, $data['body']);
+			$body         = $data['body'];
+		}
+
+		// Get the document body out of the cache.
+		return $body;
+	}
+
+	/**
+	 * Create workarounds for data to be cached
+	 *
+	 * @param   string  $data     Cached data
+	 * @param   array   $options  Array of options
+	 *
+	 * @return  string  Data to be cached
+	 *
+	 * @since   11.1
+	 */
+	public static function setWorkarounds($data, $options = array())
+	{
+		$loptions = array(
+			'nopathway'  => 0,
+			'nohead'     => 0,
+			'nomodules'  => 0,
+			'modulemode' => 0,
+		);
+
+		if (isset($options['nopathway']))
+		{
+			$loptions['nopathway'] = $options['nopathway'];
+		}
+
+		if (isset($options['nohead']))
+		{
+			$loptions['nohead'] = $options['nohead'];
+		}
+
+		if (isset($options['nomodules']))
+		{
+			$loptions['nomodules'] = $options['nomodules'];
+		}
+
+		if (isset($options['modulemode']))
+		{
+			$loptions['modulemode'] = $options['modulemode'];
+		}
+
+		$app      = \JFactory::getApplication();
+		$document = \JFactory::getDocument();
+
+		if ($loptions['nomodules'] != 1)
+		{
+			// Get the modules buffer before component execution.
+			$buffer1 = $document->getBuffer();
+
+			if (!is_array($buffer1))
+			{
+				$buffer1 = array();
+			}
+
+			// Make sure the module buffer is an array.
+			if (!isset($buffer1['module']) || !is_array($buffer1['module']))
+			{
+				$buffer1['module'] = array();
+			}
+		}
+
+		// View body data
+		$cached['body'] = $data;
+
+		// Document head data
+		if ($loptions['nohead'] != 1 && method_exists($document, 'getHeadData'))
+		{
+			if ($loptions['modulemode'] == 1)
+			{
+				$headnow = $document->getHeadData();
+				$unset   = array('title', 'description', 'link', 'links', 'metaTags');
+
+				foreach ($unset as $un)
+				{
+					unset($headnow[$un]);
+					unset($options['headerbefore'][$un]);
+				}
+
+				$cached['head'] = array();
+
+				// Only store what this module has added
+				foreach ($headnow as $now => $value)
+				{
+					if (isset($options['headerbefore'][$now]))
+					{
+						// We have to serialize the content of the arrays because the may contain other arrays which is a notice in PHP 5.4 and newer
+						$nowvalue    = array_map('serialize', $headnow[$now]);
+						$beforevalue = array_map('serialize', $options['headerbefore'][$now]);
+
+						$newvalue = array_diff_assoc($nowvalue, $beforevalue);
+						$newvalue = array_map('unserialize', $newvalue);
+
+						// Special treatment for script and style declarations.
+						if (($now == 'script' || $now == 'style') && is_array($newvalue) && is_array($options['headerbefore'][$now]))
+						{
+							foreach ($newvalue as $type => $currentScriptStr)
+							{
+								if (isset($options['headerbefore'][$now][strtolower($type)]))
+								{
+									$oldScriptStr = $options['headerbefore'][$now][strtolower($type)];
+
+									if ($oldScriptStr != $currentScriptStr)
+									{
+										// Save only the appended declaration.
+										$newvalue[strtolower($type)] = StringHelper::substr($currentScriptStr, StringHelper::strlen($oldScriptStr));
+									}
+								}
+							}
+						}
+					}
+					else
+					{
+						$newvalue = $headnow[$now];
+					}
+
+					if (!empty($newvalue))
+					{
+						$cached['head'][$now] = $newvalue;
+					}
+				}
+			}
+			else
+			{
+				$cached['head'] = $document->getHeadData();
+			}
+		}
+
+		// Document MIME encoding
+		$cached['mime_encoding'] = $document->getMimeEncoding();
+
+		// Pathway data
+		if ($app->isClient('site') && $loptions['nopathway'] != 1)
+		{
+			$cached['pathway'] = is_array($data) && isset($data['pathway']) ? $data['pathway'] : $app->getPathway()->getPathway();
+		}
+
+		if ($loptions['nomodules'] != 1)
+		{
+			// @todo Check if the following is needed, seems like it should be in page cache
+			// Get the module buffer after component execution.
+			$buffer2 = $document->getBuffer();
+
+			if (!is_array($buffer2))
+			{
+				$buffer2 = array();
+			}
+
+			// Make sure the module buffer is an array.
+			if (!isset($buffer2['module']) || !is_array($buffer2['module']))
+			{
+				$buffer2['module'] = array();
+			}
+
+			// Compare the second module buffer against the first buffer.
+			$cached['module'] = array_diff_assoc($buffer2['module'], $buffer1['module']);
+		}
+
+		// Headers data
+		if (isset($options['headers']) && $options['headers'])
+		{
+			$cached['headers'] = $app->getHeaders();
+		}
+
+		return $cached;
+	}
+
+	/**
+	 * Create a safe ID for cached data from URL parameters
+	 *
+	 * @return  string  MD5 encoded cache ID
+	 *
+	 * @since   11.1
+	 */
+	public static function makeId()
+	{
+		$app = \JFactory::getApplication();
+
+		$registeredurlparams = new \stdClass;
+
+		// Get url parameters set by plugins
+		if (!empty($app->registeredurlparams))
+		{
+			$registeredurlparams = $app->registeredurlparams;
+		}
+
+		// Platform defaults
+		$defaulturlparams = array(
+			'format' => 'WORD',
+			'option' => 'WORD',
+			'view'   => 'WORD',
+			'layout' => 'WORD',
+			'tpl'    => 'CMD',
+			'id'     => 'INT',
+		);
+
+		// Use platform defaults if parameter doesn't already exist.
+		foreach ($defaulturlparams as $param => $type)
+		{
+			if (!property_exists($registeredurlparams, $param))
+			{
+				$registeredurlparams->$param = $type;
+			}
+		}
+
+		$safeuriaddon = new \stdClass;
+
+		foreach ($registeredurlparams as $key => $value)
+		{
+			$safeuriaddon->$key = $app->input->get($key, null, $value);
+		}
+
+		return md5(serialize($safeuriaddon));
+	}
+
+	/**
+	 * Set a prefix cache key if device calls for separate caching
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public static function getPlatformPrefix()
+	{
+		// No prefix when Global Config is set to no platfom specific prefix
+		if (!\JFactory::getConfig()->get('cache_platformprefix', '0'))
+		{
+			return '';
+		}
+
+		$webclient = new WebClient;
+
+		if ($webclient->mobile)
+		{
+			return 'M-';
+		}
+
+		return '';
+	}
+
+	/**
+	 * Add a directory where Cache should search for handlers. You may either pass a string or an array of directories.
+	 *
+	 * @param   array|string  $path  A path to search.
+	 *
+	 * @return  array   An array with directory elements
+	 *
+	 * @since   11.1
+	 */
+	public static function addIncludePath($path = '')
+	{
+		static $paths;
+
+		if (!isset($paths))
+		{
+			$paths = array();
+		}
+
+		if (!empty($path) && !in_array($path, $paths))
+		{
+			\JLoader::import('joomla.filesystem.path');
+			array_unshift($paths, \JPath::clean($path));
+		}
+
+		return $paths;
+	}
+}
diff --git a/core/libraries/src/Cache/CacheController.php b/core/libraries/src/Cache/CacheController.php
new file mode 100644
index 00000000..21f043ae
--- /dev/null
+++ b/core/libraries/src/Cache/CacheController.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Public cache handler
+ *
+ * @since  11.1
+ * @note   As of 4.0 this class will be abstract
+ */
+class CacheController
+{
+	/**
+	 * Cache object
+	 *
+	 * @var    Cache
+	 * @since  11.1
+	 */
+	public $cache;
+
+	/**
+	 * Array of options
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $options;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options)
+	{
+		$this->cache = new Cache($options);
+		$this->options = & $this->cache->_options;
+
+		// Overwrite default options with given options
+		foreach ($options as $option => $value)
+		{
+			if (isset($options[$option]))
+			{
+				$this->options[$option] = $options[$option];
+			}
+		}
+	}
+
+	/**
+	 * Magic method to proxy CacheController method calls to Cache
+	 *
+	 * @param   string  $name       Name of the function
+	 * @param   array   $arguments  Array of arguments for the function
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function __call($name, $arguments)
+	{
+		return call_user_func_array(array($this->cache, $name), $arguments);
+	}
+
+	/**
+	 * Returns a reference to a cache adapter object, always creating it
+	 *
+	 * @param   string  $type     The cache object type to instantiate; default is output.
+	 * @param   array   $options  Array of options
+	 *
+	 * @return  CacheController
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public static function getInstance($type = 'output', $options = array())
+	{
+		self::addIncludePath(__DIR__ . '/Controller');
+
+		$type = strtolower(preg_replace('/[^A-Z0-9_\.-]/i', '', $type));
+
+		$class = __NAMESPACE__ . '\\Controller\\' . ucfirst($type) . 'Controller';
+
+		if (!class_exists($class))
+		{
+			$class = 'JCacheController' . ucfirst($type);
+		}
+
+		if (!class_exists($class))
+		{
+			// Search for the class file in the Cache include paths.
+			\JLoader::import('joomla.filesystem.path');
+
+			$path = \JPath::find(self::addIncludePath(), strtolower($type) . '.php');
+
+			if ($path !== false)
+			{
+				\JLoader::register($class, $path);
+			}
+
+			// The class should now be loaded
+			if (!class_exists($class))
+			{
+				throw new \RuntimeException('Unable to load Cache Controller: ' . $type, 500);
+			}
+		}
+
+		return new $class($options);
+	}
+
+	/**
+	 * Add a directory where Cache should search for controllers. You may either pass a string or an array of directories.
+	 *
+	 * @param   array|string  $path  A path to search.
+	 *
+	 * @return  array  An array with directory elements
+	 *
+	 * @since   11.1
+	 */
+	public static function addIncludePath($path = '')
+	{
+		static $paths;
+
+		if (!isset($paths))
+		{
+			$paths = array();
+		}
+
+		if (!empty($path) && !in_array($path, $paths))
+		{
+			\JLoader::import('joomla.filesystem.path');
+			array_unshift($paths, \JPath::clean($path));
+		}
+
+		return $paths;
+	}
+
+	/**
+	 * Get stored cached data by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  mixed  Boolean false on no result, cached object otherwise
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0  Implement own method in subclass
+	 */
+	public function get($id, $group = null)
+	{
+		$data = $this->cache->get($id, $group);
+
+		if ($data === false)
+		{
+			$locktest = $this->cache->lock($id, $group);
+
+			// If locklooped is true try to get the cached data again; it could exist now.
+			if ($locktest->locked === true && $locktest->locklooped === true)
+			{
+				$data = $this->cache->get($id, $group);
+			}
+
+			if ($locktest->locked === true)
+			{
+				$this->cache->unlock($id, $group);
+			}
+		}
+
+		// Check again because we might get it from second attempt
+		if ($data !== false)
+		{
+			// Trim to fix unserialize errors
+			$data = unserialize(trim($data));
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store data to cache by ID and group
+	 *
+	 * @param   mixed    $data        The data to store
+	 * @param   string   $id          The cache data ID
+	 * @param   string   $group       The cache data group
+	 * @param   boolean  $wrkarounds  True to use wrkarounds
+	 *
+	 * @return  boolean  True if cache stored
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0  Implement own method in subclass
+	 */
+	public function store($data, $id, $group = null, $wrkarounds = true)
+	{
+		$locktest = $this->cache->lock($id, $group);
+
+		if ($locktest->locked === false && $locktest->locklooped === true)
+		{
+			// We can not store data because another process is in the middle of saving
+			return false;
+		}
+
+		$result = $this->cache->store(serialize($data), $id, $group);
+
+		if ($locktest->locked === true)
+		{
+			$this->cache->unlock($id, $group);
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Cache/CacheStorage.php b/core/libraries/src/Cache/CacheStorage.php
new file mode 100644
index 00000000..d923f6af
--- /dev/null
+++ b/core/libraries/src/Cache/CacheStorage.php
@@ -0,0 +1,406 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Exception\UnsupportedCacheException;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Abstract cache storage handler
+ *
+ * @since  11.1
+ * @note   As of 4.0 this class will be abstract
+ */
+class CacheStorage
+{
+	/**
+	 * The raw object name
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $rawname;
+
+	/**
+	 * Time that the cache storage handler was instantiated
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $_now;
+
+	/**
+	 * Cache lifetime
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $_lifetime;
+
+	/**
+	 * Flag if locking is enabled
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	public $_locking;
+
+	/**
+	 * Language code
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_language;
+
+	/**
+	 * Application name
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_application;
+
+	/**
+	 * Object hash
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_hash;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		$config = \JFactory::getConfig();
+
+		$this->_hash        = md5($config->get('secret'));
+		$this->_application = (isset($options['application'])) ? $options['application'] : null;
+		$this->_language    = (isset($options['language'])) ? $options['language'] : 'en-GB';
+		$this->_locking     = (isset($options['locking'])) ? $options['locking'] : true;
+		$this->_lifetime    = (isset($options['lifetime'])) ? $options['lifetime'] * 60 : $config->get('cachetime') * 60;
+		$this->_now         = (isset($options['now'])) ? $options['now'] : time();
+
+		// Set time threshold value.  If the lifetime is not set, default to 60 (0 is BAD)
+		// _threshold is now available ONLY as a legacy (it's deprecated).  It's no longer used in the core.
+		if (empty($this->_lifetime))
+		{
+			$this->_threshold = $this->_now - 60;
+			$this->_lifetime = 60;
+		}
+		else
+		{
+			$this->_threshold = $this->_now - $this->_lifetime;
+		}
+	}
+
+	/**
+	 * Returns a cache storage handler object.
+	 *
+	 * @param   string  $handler  The cache storage handler to instantiate
+	 * @param   array   $options  Array of handler options
+	 *
+	 * @return  CacheStorage
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 * @throws  UnsupportedCacheException
+	 */
+	public static function getInstance($handler = null, $options = array())
+	{
+		static $now = null;
+
+		// @deprecated  4.0  This class path is autoloaded, manual inclusion is no longer necessary
+		self::addIncludePath(__DIR__ . '/Storage');
+
+		if (!isset($handler))
+		{
+			$handler = \JFactory::getConfig()->get('cache_handler');
+
+			if (empty($handler))
+			{
+				throw new \UnexpectedValueException('Cache Storage Handler not set.');
+			}
+		}
+
+		if (is_null($now))
+		{
+			$now = time();
+		}
+
+		$options['now'] = $now;
+
+		// We can't cache this since options may change...
+		$handler = strtolower(preg_replace('/[^A-Z0-9_\.-]/i', '', $handler));
+
+		/** @var CacheStorage $class */
+		$class = __NAMESPACE__ . '\\Storage\\' . ucfirst($handler) . 'Storage';
+
+		if (!class_exists($class))
+		{
+			$class = 'JCacheStorage' . ucfirst($handler);
+		}
+
+		if (!class_exists($class))
+		{
+			// Search for the class file in the JCacheStorage include paths.
+			\JLoader::import('joomla.filesystem.path');
+
+			$path = \JPath::find(self::addIncludePath(), strtolower($handler) . '.php');
+
+			if ($path === false)
+			{
+				throw new UnsupportedCacheException(sprintf('Unable to load Cache Storage: %s', $handler));
+			}
+
+			\JLoader::register($class, $path);
+
+			// The class should now be loaded
+			if (!class_exists($class))
+			{
+				throw new UnsupportedCacheException(sprintf('Unable to load Cache Storage: %s', $handler));
+			}
+		}
+
+		// Validate the cache storage is supported on this platform
+		if (!$class::isSupported())
+		{
+			throw new UnsupportedCacheException(sprintf('The %s Cache Storage is not supported on this platform.', $handler));
+		}
+
+		return new $class($options);
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return false;
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		return false;
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		return false;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		return true;
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		return true;
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		return true;
+	}
+
+	/**
+	 * Flush all existing items in storage.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.3
+	 */
+	public function flush()
+	{
+		return true;
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function gc()
+	{
+		return true;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return true;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS)
+	 */
+	public static function test()
+	{
+		Log::add(__METHOD__ . '() is deprecated. Use CacheStorage::isSupported() instead.', Log::WARNING, 'deprecated');
+
+		return static::isSupported();
+	}
+
+	/**
+	 * Lock cached item
+	 *
+	 * @param   string   $id        The cache data ID
+	 * @param   string   $group     The cache data group
+	 * @param   integer  $locktime  Cached item max lock time
+	 *
+	 * @return  mixed  Boolean false if locking failed or an object containing properties lock and locklooped
+	 *
+	 * @since   11.1
+	 */
+	public function lock($id, $group, $locktime)
+	{
+		return false;
+	}
+
+	/**
+	 * Unlock cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function unlock($id, $group = null)
+	{
+		return false;
+	}
+
+	/**
+	 * Get a cache ID string from an ID/group pair
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function _getCacheId($id, $group)
+	{
+		$name          = md5($this->_application . '-' . $id . '-' . $this->_language);
+		$this->rawname = $this->_hash . '-' . $name;
+
+		return Cache::getPlatformPrefix() . $this->_hash . '-cache-' . $group . '-' . $name;
+	}
+
+	/**
+	 * Add a directory where CacheStorage should search for handlers. You may either pass a string or an array of directories.
+	 *
+	 * @param   array|string  $path  A path to search.
+	 *
+	 * @return  array  An array with directory elements
+	 *
+	 * @since   11.1
+	 */
+	public static function addIncludePath($path = '')
+	{
+		static $paths;
+
+		if (!isset($paths))
+		{
+			$paths = array();
+		}
+
+		if (!empty($path) && !in_array($path, $paths))
+		{
+			\JLoader::import('joomla.filesystem.path');
+			array_unshift($paths, \JPath::clean($path));
+		}
+
+		return $paths;
+	}
+}
diff --git a/core/libraries/src/Cache/Controller/CallbackController.php b/core/libraries/src/Cache/Controller/CallbackController.php
new file mode 100644
index 00000000..e070a758
--- /dev/null
+++ b/core/libraries/src/Cache/Controller/CallbackController.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Cache\CacheController;
+
+/**
+ * Joomla! Cache callback type object
+ *
+ * @since  11.1
+ */
+class CallbackController extends CacheController
+{
+	/**
+	 * Executes a cacheable callback if not found in cache else returns cached output and result
+	 *
+	 * Since arguments to this function are read with func_get_args you can pass any number of arguments to this method
+	 * as long as the first argument passed is the callback definition.
+	 *
+	 * The callback definition can be in several forms:
+	 * - Standard PHP Callback array see <https://secure.php.net/callback> [recommended]
+	 * - Function name as a string eg. 'foo' for function foo()
+	 * - Static method name as a string eg. 'MyClass::myMethod' for method myMethod() of class MyClass
+	 *
+	 * @return  mixed  Result of the callback
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0
+	 */
+	public function call()
+	{
+		// Get callback and arguments
+		$args     = func_get_args();
+		$callback = array_shift($args);
+
+		return $this->get($callback, $args);
+	}
+
+	/**
+	 * Executes a cacheable callback if not found in cache else returns cached output and result
+	 *
+	 * @param   mixed    $callback    Callback or string shorthand for a callback
+	 * @param   array    $args        Callback arguments
+	 * @param   mixed    $id          Cache ID
+	 * @param   boolean  $wrkarounds  True to use wrkarounds
+	 * @param   array    $woptions    Workaround options
+	 *
+	 * @return  mixed  Result of the callback
+	 *
+	 * @since   11.1
+	 */
+	public function get($callback, $args = array(), $id = false, $wrkarounds = false, $woptions = array())
+	{
+		// Normalize callback
+		if (is_array($callback) || is_callable($callback))
+		{
+			// We have a standard php callback array -- do nothing
+		}
+		elseif (strstr($callback, '::'))
+		{
+			// This is shorthand for a static method callback classname::methodname
+			list ($class, $method) = explode('::', $callback);
+			$callback = array(trim($class), trim($method));
+		}
+		elseif (strstr($callback, '->'))
+		{
+			/*
+			 * This is a really not so smart way of doing this... we provide this for backward compatability but this
+			 * WILL! disappear in a future version.  If you are using this syntax change your code to use the standard
+			 * PHP callback array syntax: <https://secure.php.net/callback>
+			 *
+			 * We have to use some silly global notation to pull it off and this is very unreliable
+			 */
+			list ($object_123456789, $method) = explode('->', $callback);
+			global $$object_123456789;
+			$callback = array($$object_123456789, $method);
+		}
+
+		if (!$id)
+		{
+			// Generate an ID
+			$id = $this->_makeId($callback, $args);
+		}
+
+		$data = $this->cache->get($id);
+
+		$locktest = (object) array('locked' => null, 'locklooped' => null);
+
+		if ($data === false)
+		{
+			$locktest = $this->cache->lock($id);
+
+			// If locklooped is true try to get the cached data again; it could exist now.
+			if ($locktest->locked === true && $locktest->locklooped === true)
+			{
+				$data = $this->cache->get($id);
+			}
+		}
+
+		if ($data !== false)
+		{
+			if ($locktest->locked === true)
+			{
+				$this->cache->unlock($id);
+			}
+
+			$data = unserialize(trim($data));
+
+			if ($wrkarounds)
+			{
+				echo Cache::getWorkarounds(
+					$data['output'],
+					array('mergehead' => isset($woptions['mergehead']) ? $woptions['mergehead'] : 0)
+				);
+			}
+			else
+			{
+				echo $data['output'];
+			}
+
+			return $data['result'];
+		}
+
+		if (!is_array($args))
+		{
+			$referenceArgs = !empty($args) ? array(&$args) : array();
+		}
+		else
+		{
+			$referenceArgs = &$args;
+		}
+
+		if ($locktest->locked === false && $locktest->locklooped === true)
+		{
+			// We can not store data because another process is in the middle of saving
+			return call_user_func_array($callback, $referenceArgs);
+		}
+
+		$coptions = array();
+
+		if (isset($woptions['modulemode']) && $woptions['modulemode'] == 1)
+		{
+			$document = \JFactory::getDocument();
+
+			if (method_exists($document, 'getHeadData'))
+			{
+				$coptions['headerbefore'] = $document->getHeadData();
+			}
+
+			$coptions['modulemode'] = 1;
+		}
+		else
+		{
+			$coptions['modulemode'] = 0;
+		}
+
+		$coptions['nopathway'] = isset($woptions['nopathway']) ? $woptions['nopathway'] : 1;
+		$coptions['nohead']    = isset($woptions['nohead'])    ? $woptions['nohead'] : 1;
+		$coptions['nomodules'] = isset($woptions['nomodules']) ? $woptions['nomodules'] : 1;
+
+		ob_start();
+		ob_implicit_flush(false);
+
+		$result = call_user_func_array($callback, $referenceArgs);
+		$output = ob_get_clean();
+
+		$data = array('result' => $result);
+
+		if ($wrkarounds)
+		{
+			$data['output'] = Cache::setWorkarounds($output, $coptions);
+		}
+		else
+		{
+			$data['output'] = $output;
+		}
+
+		// Store the cache data
+		$this->cache->store(serialize($data), $id);
+
+		if ($locktest->locked === true)
+		{
+			$this->cache->unlock($id);
+		}
+
+		echo $output;
+
+		return $result;
+	}
+
+	/**
+	 * Generate a callback cache ID
+	 *
+	 * @param   callback  $callback  Callback to cache
+	 * @param   array     $args      Arguments to the callback method to cache
+	 *
+	 * @return  string  MD5 Hash
+	 *
+	 * @since   11.1
+	 */
+	protected function _makeId($callback, $args)
+	{
+		if (is_array($callback) && is_object($callback[0]))
+		{
+			$vars        = get_object_vars($callback[0]);
+			$vars[]      = strtolower(get_class($callback[0]));
+			$callback[0] = $vars;
+		}
+
+		// A Closure can't be serialized, so to generate the ID we'll need to get its hash
+		if (is_a($callback, 'closure'))
+		{
+			$hash = spl_object_hash($callback);
+
+			return md5($hash . serialize(array($args)));
+		}
+
+		return md5(serialize(array($callback, $args)));
+	}
+}
diff --git a/core/libraries/src/Cache/Controller/OutputController.php b/core/libraries/src/Cache/Controller/OutputController.php
new file mode 100644
index 00000000..f04d8ae0
--- /dev/null
+++ b/core/libraries/src/Cache/Controller/OutputController.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheController;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Joomla Cache output type object
+ *
+ * @since  11.1
+ */
+class OutputController extends CacheController
+{
+	/**
+	 * Cache data ID
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_id;
+
+	/**
+	 * Cache data group
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_group;
+
+	/**
+	 * Object to test locked state
+	 *
+	 * @var    \stdClass
+	 * @since  11.1
+	 * @deprecated  4.0
+	 */
+	protected $_locktest = null;
+
+	/**
+	 * Start the cache
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0
+	 */
+	public function start($id, $group = null)
+	{
+		Log::add(
+			__METHOD__ . '() is deprecated.',
+			Log::WARNING,
+			'deprecated'
+		);
+
+		// If we have data in cache use that.
+		$data = $this->cache->get($id, $group);
+
+		$this->_locktest             = new \stdClass;
+		$this->_locktest->locked     = null;
+		$this->_locktest->locklooped = null;
+
+		if ($data === false)
+		{
+			$this->_locktest = $this->cache->lock($id, $group);
+
+			if ($this->_locktest->locked == true && $this->_locktest->locklooped == true)
+			{
+				$data = $this->cache->get($id, $group);
+			}
+		}
+
+		if ($data !== false)
+		{
+			$data = unserialize(trim($data));
+			echo $data;
+
+			if ($this->_locktest->locked == true)
+			{
+				$this->cache->unlock($id, $group);
+			}
+
+			return true;
+		}
+
+		// Nothing in cache... let's start the output buffer and start collecting data for next time.
+		if ($this->_locktest->locked == false)
+		{
+			$this->_locktest = $this->cache->lock($id, $group);
+		}
+
+		ob_start();
+		ob_implicit_flush(false);
+
+		// Set id and group placeholders
+		$this->_id = $id;
+		$this->_group = $group;
+
+		return false;
+	}
+
+	/**
+	 * Stop the cache buffer and store the cached data
+	 *
+	 * @return  boolean  True if the cache data was stored
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0
+	 */
+	public function end()
+	{
+		Log::add(
+			__METHOD__ . '() is deprecated.',
+			Log::WARNING,
+			'deprecated'
+		);
+
+		// Get data from output buffer and echo it
+		$data = ob_get_clean();
+		echo $data;
+
+		// Get the ID and group and reset the placeholders
+		$id           = $this->_id;
+		$group        = $this->_group;
+		$this->_id    = null;
+		$this->_group = null;
+
+		// Get the storage handler and store the cached data
+		$ret = $this->cache->store(serialize($data), $id, $group);
+
+		if ($this->_locktest->locked == true)
+		{
+			$this->cache->unlock($id, $group);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Get stored cached data by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  mixed  Boolean false on no result, cached object otherwise
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group = null)
+	{
+		$data = $this->cache->get($id, $group);
+
+		if ($data === false)
+		{
+			$locktest = $this->cache->lock($id, $group);
+
+			// If locklooped is true try to get the cached data again; it could exist now.
+			if ($locktest->locked === true && $locktest->locklooped === true)
+			{
+				$data = $this->cache->get($id, $group);
+			}
+
+			if ($locktest->locked === true)
+			{
+				$this->cache->unlock($id, $group);
+			}
+		}
+
+		// Check again because we might get it from second attempt
+		if ($data !== false)
+		{
+			// Trim to fix unserialize errors
+			$data = unserialize(trim($data));
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store data to cache by ID and group
+	 *
+	 * @param   mixed    $data        The data to store
+	 * @param   string   $id          The cache data ID
+	 * @param   string   $group       The cache data group
+	 * @param   boolean  $wrkarounds  True to use wrkarounds
+	 *
+	 * @return  boolean  True if cache stored
+	 *
+	 * @since   11.1
+	 */
+	public function store($data, $id, $group = null, $wrkarounds = true)
+	{
+		$locktest = $this->cache->lock($id, $group);
+
+		if ($locktest->locked === false && $locktest->locklooped === true)
+		{
+			// We can not store data because another process is in the middle of saving
+			return false;
+		}
+
+		$result = $this->cache->store(serialize($data), $id, $group);
+
+		if ($locktest->locked === true)
+		{
+			$this->cache->unlock($id, $group);
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Cache/Controller/PageController.php b/core/libraries/src/Cache/Controller/PageController.php
new file mode 100644
index 00000000..d4c08c8e
--- /dev/null
+++ b/core/libraries/src/Cache/Controller/PageController.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Cache\CacheController;
+
+/**
+ * Joomla! Cache page type object
+ *
+ * @since  11.1
+ */
+class PageController extends CacheController
+{
+	/**
+	 * ID property for the cache page object.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $_id;
+
+	/**
+	 * Cache group
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_group;
+
+	/**
+	 * Cache lock test
+	 *
+	 * @var    \stdClass
+	 * @since  11.1
+	 */
+	protected $_locktest = null;
+
+	/**
+	 * Get the cached page data
+	 *
+	 * @param   boolean  $id     The cache data ID
+	 * @param   string   $group  The cache data group
+	 *
+	 * @return  mixed  Boolean false on no result, cached object otherwise
+	 *
+	 * @since   11.1
+	 */
+	public function get($id = false, $group = 'page')
+	{
+		// If an id is not given, generate it from the request
+		if (!$id)
+		{
+			$id = $this->_makeId();
+		}
+
+		// If the etag matches the page id ... set a no change header and exit : utilize browser cache
+		if (!headers_sent() && isset($_SERVER['HTTP_IF_NONE_MATCH']))
+		{
+			$etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+
+			if ($etag == $id)
+			{
+				$browserCache = isset($this->options['browsercache']) ? $this->options['browsercache'] : false;
+
+				if ($browserCache)
+				{
+					$this->_noChange();
+				}
+			}
+		}
+
+		// We got a cache hit... set the etag header and echo the page data
+		$data = $this->cache->get($id, $group);
+
+		$this->_locktest = (object) array('locked' => null, 'locklooped' => null);
+
+		if ($data === false)
+		{
+			$this->_locktest = $this->cache->lock($id, $group);
+
+			// If locklooped is true try to get the cached data again; it could exist now.
+			if ($this->_locktest->locked === true && $this->_locktest->locklooped === true)
+			{
+				$data = $this->cache->get($id, $group);
+			}
+		}
+
+		if ($data !== false)
+		{
+			if ($this->_locktest->locked === true)
+			{
+				$this->cache->unlock($id, $group);
+			}
+
+			$data = unserialize(trim($data));
+			$data = Cache::getWorkarounds($data);
+
+			$this->_setEtag($id);
+
+			return $data;
+		}
+
+		// Set ID and group placeholders
+		$this->_id    = $id;
+		$this->_group = $group;
+
+		return false;
+	}
+
+	/**
+	 * Stop the cache buffer and store the cached data
+	 *
+	 * @param   mixed    $data        The data to store
+	 * @param   string   $id          The cache data ID
+	 * @param   string   $group       The cache data group
+	 * @param   boolean  $wrkarounds  True to use wrkarounds
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($data, $id, $group = null, $wrkarounds = true)
+	{
+		if ($this->_locktest->locked === false && $this->_locktest->locklooped === true)
+		{
+			// We can not store data because another process is in the middle of saving
+			return false;
+		}
+
+		// Get page data from the application object
+		if (!$data)
+		{
+			$data = \JFactory::getApplication()->getBody();
+
+			// Only attempt to store if page data exists.
+			if (!$data)
+			{
+				return false;
+			}
+		}
+
+		// Get id and group and reset the placeholders
+		if (!$id)
+		{
+			$id = $this->_id;
+		}
+
+		if (!$group)
+		{
+			$group = $this->_group;
+		}
+
+		if ($wrkarounds)
+		{
+			$data = Cache::setWorkarounds(
+				$data,
+				array(
+					'nopathway' => 1,
+					'nohead'    => 1,
+					'nomodules' => 1,
+					'headers'   => true,
+				)
+			);
+		}
+
+		$result = $this->cache->store(serialize($data), $id, $group);
+
+		if ($this->_locktest->locked === true)
+		{
+			$this->cache->unlock($id, $group);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Generate a page cache id
+	 *
+	 * @return  string  MD5 Hash
+	 *
+	 * @since   11.1
+	 * @todo    Discuss whether this should be coupled to a data hash or a request hash ... perhaps hashed with a serialized request
+	 */
+	protected function _makeId()
+	{
+		return Cache::makeId();
+	}
+
+	/**
+	 * There is no change in page data so send an unmodified header and die gracefully
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function _noChange()
+	{
+		$app = \JFactory::getApplication();
+
+		// Send not modified header and exit gracefully
+		$app->setHeader('Status', 304, true);
+		$app->sendHeaders();
+		$app->close();
+	}
+
+	/**
+	 * Set the ETag header in the response
+	 *
+	 * @param   string  $etag  The entity tag (etag) to set
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function _setEtag($etag)
+	{
+		\JFactory::getApplication()->setHeader('ETag', '"' . $etag . '"', true);
+	}
+}
diff --git a/core/libraries/src/Cache/Controller/ViewController.php b/core/libraries/src/Cache/Controller/ViewController.php
new file mode 100644
index 00000000..dce4b6d8
--- /dev/null
+++ b/core/libraries/src/Cache/Controller/ViewController.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Cache\CacheController;
+
+/**
+ * Joomla! Cache view type object
+ *
+ * @since  11.1
+ */
+class ViewController extends CacheController
+{
+	/**
+	 * Get the cached view data
+	 *
+	 * @param   object   $view        The view object to cache output for
+	 * @param   string   $method      The method name of the view method to cache output for
+	 * @param   mixed    $id          The cache data ID
+	 * @param   boolean  $wrkarounds  True to enable workarounds.
+	 *
+	 * @return  boolean  True if the cache is hit (false else)
+	 *
+	 * @since   11.1
+	 */
+	public function get($view, $method = 'display', $id = false, $wrkarounds = true)
+	{
+		// If an id is not given generate it from the request
+		if (!$id)
+		{
+			$id = $this->_makeId($view, $method);
+		}
+
+		$data = $this->cache->get($id);
+
+		$locktest = (object) array('locked' => null, 'locklooped' => null);
+
+		if ($data === false)
+		{
+			$locktest = $this->cache->lock($id);
+
+			/*
+			 * If the loop is completed and returned true it means the lock has been set.
+			 * If looped is true try to get the cached data again; it could exist now.
+			 */
+			if ($locktest->locked === true && $locktest->locklooped === true)
+			{
+				$data = $this->cache->get($id);
+			}
+
+			// False means that locking is either turned off or maxtime has been exceeded. Execute the view.
+		}
+
+		if ($data !== false)
+		{
+			if ($locktest->locked === true)
+			{
+				$this->cache->unlock($id);
+			}
+
+			$data = unserialize(trim($data));
+
+			if ($wrkarounds)
+			{
+				echo Cache::getWorkarounds($data);
+			}
+			else
+			{
+				// No workarounds, so all data is stored in one piece
+				echo $data;
+			}
+
+			return true;
+		}
+
+		// No hit so we have to execute the view
+		if (!method_exists($view, $method))
+		{
+			return false;
+		}
+
+		if ($locktest->locked === false && $locktest->locklooped === true)
+		{
+			// We can not store data because another process is in the middle of saving
+			$view->$method();
+
+			return false;
+		}
+
+		// Capture and echo output
+		ob_start();
+		ob_implicit_flush(false);
+		$view->$method();
+		$data = ob_get_clean();
+		echo $data;
+
+		/*
+		 * For a view we have a special case.  We need to cache not only the output from the view, but the state
+		 * of the document head after the view has been rendered.  This will allow us to properly cache any attached
+		 * scripts or stylesheets or links or any other modifications that the view has made to the document object
+		 */
+		if ($wrkarounds)
+		{
+			$data = Cache::setWorkarounds($data);
+		}
+
+		// Store the cache data
+		$this->cache->store(serialize($data), $id);
+
+		if ($locktest->locked === true)
+		{
+			$this->cache->unlock($id);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Generate a view cache ID.
+	 *
+	 * @param   object  $view    The view object to cache output for
+	 * @param   string  $method  The method name to cache for the view object
+	 *
+	 * @return  string  MD5 Hash
+	 *
+	 * @since   11.1
+	 */
+	protected function _makeId($view, $method)
+	{
+		return md5(serialize(array(Cache::makeId(), get_class($view), $method)));
+	}
+}
diff --git a/core/libraries/src/Cache/Exception/CacheConnectingException.php b/core/libraries/src/Cache/Exception/CacheConnectingException.php
new file mode 100644
index 00000000..9d0288ca
--- /dev/null
+++ b/core/libraries/src/Cache/Exception/CacheConnectingException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an error connecting to the cache storage engine
+ *
+ * @since  3.6.3
+ */
+class CacheConnectingException extends \RuntimeException implements CacheExceptionInterface
+{
+}
diff --git a/core/libraries/src/Cache/Exception/CacheExceptionInterface.php b/core/libraries/src/Cache/Exception/CacheExceptionInterface.php
new file mode 100644
index 00000000..b396ddd3
--- /dev/null
+++ b/core/libraries/src/Cache/Exception/CacheExceptionInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception interface defining a cache storage error
+ *
+ * @since  3.7.0
+ */
+interface CacheExceptionInterface
+{
+}
diff --git a/core/libraries/src/Cache/Exception/UnsupportedCacheException.php b/core/libraries/src/Cache/Exception/UnsupportedCacheException.php
new file mode 100644
index 00000000..5607bcd2
--- /dev/null
+++ b/core/libraries/src/Cache/Exception/UnsupportedCacheException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an unsupported cache storage object
+ *
+ * @since  3.6.3
+ */
+class UnsupportedCacheException extends \RuntimeException implements CacheExceptionInterface
+{
+}
diff --git a/core/libraries/src/Cache/Storage/ApcStorage.php b/core/libraries/src/Cache/Storage/ApcStorage.php
new file mode 100644
index 00000000..ea299b12
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/ApcStorage.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+
+/**
+ * APC cache storage handler
+ *
+ * @link   https://secure.php.net/manual/en/book.apc.php
+ * @since  11.1
+ */
+class ApcStorage extends CacheStorage
+{
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return apc_exists($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		return apc_fetch($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		$allinfo = apc_cache_info('user');
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		$data = array();
+
+		foreach ($keys as $key)
+		{
+			if (isset($key['info']))
+			{
+				// If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info
+				$name = $key['info'];
+			}
+			elseif (isset($key['entry_name']))
+			{
+				// Some APC modules changed the internal key name from key to entry_name, HHVM is one such case
+				$name = $key['entry_name'];
+			}
+			else
+			{
+				// A fall back for the old internal key name
+				$name = $key['key'];
+			}
+
+			$namearr = explode('-', $name);
+
+			if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+			{
+				$group = $namearr[2];
+
+				if (!isset($data[$group]))
+				{
+					$item = new CacheStorageHelper($group);
+				}
+				else
+				{
+					$item = $data[$group];
+				}
+
+				$item->updateSize($key['mem_size']);
+
+				$data[$group] = $item;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		return apc_store($this->_getCacheId($id, $group), $data, $this->_lifetime);
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		return apc_delete($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		$allinfo = apc_cache_info('user');
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (isset($key['info']))
+			{
+				// If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info
+				$internalKey = $key['info'];
+			}
+			elseif (isset($key['entry_name']))
+			{
+				// Some APC modules changed the internal key name from key to entry_name, HHVM is one such case
+				$internalKey = $key['entry_name'];
+			}
+			else
+			{
+				// A fall back for the old internal key name
+				$internalKey = $key['key'];
+			}
+
+			if (strpos($internalKey, $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
+			{
+				apc_delete($internalKey);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function gc()
+	{
+		$allinfo = apc_cache_info('user');
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (isset($key['info']))
+			{
+				// If APCu is being used for this adapter, the internal key name changed with APCu 4.0.7 from key to info
+				$internalKey = $key['info'];
+			}
+			elseif (isset($key['entry_name']))
+			{
+				// Some APC modules changed the internal key name from key to entry_name, HHVM is one such case
+				$internalKey = $key['entry_name'];
+			}
+			else
+			{
+				// A fall back for the old internal key name
+				$internalKey = $key['key'];
+			}
+
+			if (strpos($internalKey, $secret . '-cache-'))
+			{
+				apc_fetch($internalKey);
+			}
+		}
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		$supported = extension_loaded('apc') && ini_get('apc.enabled');
+
+		// If on the CLI interface, the `apc.enable_cli` option must also be enabled
+		if ($supported && php_sapi_name() === 'cli')
+		{
+			$supported = ini_get('apc.enable_cli');
+		}
+
+		return (bool) $supported;
+	}
+
+	/**
+	 * Lock cached item
+	 *
+	 * @param   string   $id        The cache data ID
+	 * @param   string   $group     The cache data group
+	 * @param   integer  $locktime  Cached item max lock time
+	 *
+	 * @return  mixed  Boolean false if locking failed or an object containing properties lock and locklooped
+	 *
+	 * @since   11.1
+	 */
+	public function lock($id, $group, $locktime)
+	{
+		$returning             = new \stdClass;
+		$returning->locklooped = false;
+
+		$looptime = $locktime * 10;
+
+		$cache_id = $this->_getCacheId($id, $group) . '_lock';
+
+		$data_lock = apc_add($cache_id, 1, $locktime);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released. That implies that data get from other thread has finished
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					$returning->locked     = false;
+					$returning->locklooped = true;
+					break;
+				}
+
+				usleep(100);
+				$data_lock = apc_add($cache_id, 1, $locktime);
+				$lock_counter++;
+			}
+		}
+
+		$returning->locked = $data_lock;
+
+		return $returning;
+	}
+
+	/**
+	 * Unlock cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function unlock($id, $group = null)
+	{
+		return apc_delete($this->_getCacheId($id, $group) . '_lock');
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/ApcuStorage.php b/core/libraries/src/Cache/Storage/ApcuStorage.php
new file mode 100644
index 00000000..2dd4e6df
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/ApcuStorage.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+
+/**
+ * APCu cache storage handler
+ *
+ * @link   https://secure.php.net/manual/en/ref.apcu.php
+ * @since  3.5
+ */
+class ApcuStorage extends CacheStorage
+{
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return apcu_exists($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   3.5
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		return apcu_fetch($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   3.5
+	 */
+	public function getAll()
+	{
+		$allinfo = apcu_cache_info();
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		$data = array();
+
+		foreach ($keys as $key)
+		{
+			if (isset($key['info']))
+			{
+				// The internal key name changed with APCu 4.0.7 from key to info
+				$name = $key['info'];
+			}
+			elseif (isset($key['entry_name']))
+			{
+				// Some APCu modules changed the internal key name from key to entry_name
+				$name = $key['entry_name'];
+			}
+			else
+			{
+				// A fall back for the old internal key name
+				$name = $key['key'];
+			}
+
+			$namearr = explode('-', $name);
+
+			if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+			{
+				$group = $namearr[2];
+
+				if (!isset($data[$group]))
+				{
+					$item = new CacheStorageHelper($group);
+				}
+				else
+				{
+					$item = $data[$group];
+				}
+
+				$item->updateSize($key['mem_size']);
+
+				$data[$group] = $item;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function store($id, $group, $data)
+	{
+		return apcu_store($this->_getCacheId($id, $group), $data, $this->_lifetime);
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function remove($id, $group)
+	{
+		$cache_id = $this->_getCacheId($id, $group);
+
+		// The apcu_delete function returns false if the ID does not exist
+		if (apcu_exists($cache_id))
+		{
+			return apcu_delete($cache_id);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function clean($group, $mode = null)
+	{
+		$allinfo = apcu_cache_info();
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (isset($key['info']))
+			{
+				// The internal key name changed with APCu 4.0.7 from key to info
+				$internalKey = $key['info'];
+			}
+			elseif (isset($key['entry_name']))
+			{
+				// Some APCu modules changed the internal key name from key to entry_name
+				$internalKey = $key['entry_name'];
+			}
+			else
+			{
+				// A fall back for the old internal key name
+				$internalKey = $key['key'];
+			}
+
+			if (strpos($internalKey, $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
+			{
+				apcu_delete($internalKey);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function gc()
+	{
+		$allinfo = apcu_cache_info();
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (isset($key['info']))
+			{
+				// The internal key name changed with APCu 4.0.7 from key to info
+				$internalKey = $key['info'];
+			}
+			elseif (isset($key['entry_name']))
+			{
+				// Some APCu modules changed the internal key name from key to entry_name
+				$internalKey = $key['entry_name'];
+			}
+			else
+			{
+				// A fall back for the old internal key name
+				$internalKey = $key['key'];
+			}
+
+			if (strpos($internalKey, $secret . '-cache-'))
+			{
+				apcu_fetch($internalKey);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public static function isSupported()
+	{
+		$supported = extension_loaded('apcu') && ini_get('apc.enabled');
+
+		// If on the CLI interface, the `apc.enable_cli` option must also be enabled
+		if ($supported && php_sapi_name() === 'cli')
+		{
+			$supported = ini_get('apc.enable_cli');
+		}
+
+		return (bool) $supported;
+	}
+
+	/**
+	 * Lock cached item
+	 *
+	 * @param   string   $id        The cache data ID
+	 * @param   string   $group     The cache data group
+	 * @param   integer  $locktime  Cached item max lock time
+	 *
+	 * @return  mixed  Boolean false if locking failed or an object containing properties lock and locklooped
+	 *
+	 * @since   3.5
+	 */
+	public function lock($id, $group, $locktime)
+	{
+		$returning = new \stdClass;
+		$returning->locklooped = false;
+
+		$looptime = $locktime * 10;
+
+		$cache_id = $this->_getCacheId($id, $group) . '_lock';
+
+		$data_lock = apcu_add($cache_id, 1, $locktime);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released.
+			// That implies that data get from other thread has finished
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					$returning->locked = false;
+					$returning->locklooped = true;
+					break;
+				}
+
+				usleep(100);
+				$data_lock = apcu_add($cache_id, 1, $locktime);
+				$lock_counter++;
+			}
+		}
+
+		$returning->locked = $data_lock;
+
+		return $returning;
+	}
+
+	/**
+	 * Unlock cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function unlock($id, $group = null)
+	{
+		$cache_id = $this->_getCacheId($id, $group) . '_lock';
+
+		// The apcu_delete function returns false if the ID does not exist
+		if (apcu_exists($cache_id))
+		{
+			return apcu_delete($cache_id);
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/CacheStorageHelper.php b/core/libraries/src/Cache/Storage/CacheStorageHelper.php
new file mode 100644
index 00000000..c293034c
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/CacheStorageHelper.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Cache storage helper functions.
+ *
+ * @since  11.1
+ */
+class CacheStorageHelper
+{
+	/**
+	 * Cache data group
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $group = '';
+
+	/**
+	 * Cached item size
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $size = 0;
+
+	/**
+	 * Counter
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $count = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $group  The cache data group
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($group)
+	{
+		$this->group = $group;
+	}
+
+	/**
+	 * Increase cache items count.
+	 *
+	 * @param   string  $size  Cached item size
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function updateSize($size)
+	{
+		$this->size += $size;
+		$this->count++;
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/CacheliteStorage.php b/core/libraries/src/Cache/Storage/CacheliteStorage.php
new file mode 100644
index 00000000..6bf605aa
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/CacheliteStorage.php
@@ -0,0 +1,351 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+
+/**
+ * Cache lite storage handler
+ *
+ * @link   http://pear.php.net/package/Cache_Lite/
+ * @since  11.1
+ * @deprecated  4.0 Deprecated without replacement
+ */
+class CacheliteStorage extends CacheStorage
+{
+	/**
+	 * Singleton Cache_Lite instance
+	 *
+	 * @var    \Cache_Lite
+	 * @since  11.1
+	 */
+	protected static $CacheLiteInstance = null;
+
+	/**
+	 * Root path
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_root;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		$this->_root = $options['cachebase'];
+
+		$cloptions = array(
+			'cacheDir'                => $this->_root . '/',
+			'lifeTime'                => $this->_lifetime,
+			'fileLocking'             => $this->_locking,
+			'automaticCleaningFactor' => isset($options['autoclean']) ? $options['autoclean'] : 200,
+			'fileNameProtection'      => false,
+			'hashedDirectoryLevel'    => 0,
+			'caching'                 => $options['caching'],
+		);
+
+		if (static::$CacheLiteInstance === null)
+		{
+			$this->initCache($cloptions);
+		}
+	}
+
+	/**
+	 * Instantiates the Cache_Lite object. Only initializes the engine if it does not already exist.
+	 *
+	 * @param   array  $cloptions  optional parameters
+	 *
+	 * @return  \Cache_Lite
+	 *
+	 * @since   11.1
+	 */
+	protected function initCache($cloptions)
+	{
+		if (!class_exists('\\Cache_Lite'))
+		{
+			require_once 'Cache/Lite.php';
+		}
+
+		static::$CacheLiteInstance = new \Cache_Lite($cloptions);
+
+		return static::$CacheLiteInstance;
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return $this->get($id, $group) !== false;
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		static::$CacheLiteInstance->setOption('cacheDir', $this->_root . '/' . $group . '/');
+
+		// This call is needed to ensure $this->rawname is set
+		$this->_getCacheId($id, $group);
+
+		return static::$CacheLiteInstance->get($this->rawname, $group);
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		$path    = $this->_root;
+		$folders = new \DirectoryIterator($path);
+		$data    = array();
+
+		foreach ($folders as $folder)
+		{
+			if (!$folder->isDir() || $folder->isDot())
+			{
+				continue;
+			}
+
+			$foldername = $folder->getFilename();
+
+			$files = new \DirectoryIterator($path . '/' . $foldername);
+			$item  = new CacheStorageHelper($foldername);
+
+			foreach ($files as $file)
+			{
+				if (!$file->isFile())
+				{
+					continue;
+				}
+
+				$filename = $file->getFilename();
+
+				$item->updateSize(filesize($path . '/' . $foldername . '/' . $filename));
+			}
+
+			$data[$foldername] = $item;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		$dir = $this->_root . '/' . $group;
+
+		// If the folder doesn't exist try to create it
+		if (!is_dir($dir))
+		{
+			// Make sure the index file is there
+			$indexFile = $dir . '/index.html';
+			@mkdir($dir) && file_put_contents($indexFile, '<!DOCTYPE html><title></title>');
+		}
+
+		// Make sure the folder exists
+		if (!is_dir($dir))
+		{
+			return false;
+		}
+
+		static::$CacheLiteInstance->setOption('cacheDir', $this->_root . '/' . $group . '/');
+
+		// This call is needed to ensure $this->rawname is set
+		$this->_getCacheId($id, $group);
+
+		return static::$CacheLiteInstance->save($data, $this->rawname, $group);
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		static::$CacheLiteInstance->setOption('cacheDir', $this->_root . '/' . $group . '/');
+
+		// This call is needed to ensure $this->rawname is set
+		$this->_getCacheId($id, $group);
+
+		return static::$CacheLiteInstance->remove($this->rawname, $group);
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		\JLoader::import('joomla.filesystem.folder');
+		\JLoader::import('joomla.filesystem.file');
+
+		switch ($mode)
+		{
+			case 'notgroup':
+				$clmode  = 'notingroup';
+				$success = static::$CacheLiteInstance->clean($group, $clmode);
+				break;
+
+			case 'group':
+				if (is_dir($this->_root . '/' . $group))
+				{
+					$clmode = $group;
+					static::$CacheLiteInstance->setOption('cacheDir', $this->_root . '/' . $group . '/');
+					$success = static::$CacheLiteInstance->clean($group, $clmode);
+
+					// Remove sub-folders of folder; disable all filtering
+					$folders = \JFolder::folders($this->_root . '/' . $group, '.', false, true, array(), array());
+
+					foreach ($folders as $folder)
+					{
+						if (is_link($folder))
+						{
+							if (\JFile::delete($folder) !== true)
+							{
+								return false;
+							}
+						}
+						elseif (\JFolder::delete($folder) !== true)
+						{
+							return false;
+						}
+					}
+				}
+				else
+				{
+					$success = true;
+				}
+
+				break;
+
+			default:
+				if (is_dir($this->_root . '/' . $group))
+				{
+					$clmode = $group;
+					static::$CacheLiteInstance->setOption('cacheDir', $this->_root . '/' . $group . '/');
+					$success = static::$CacheLiteInstance->clean($group, $clmode);
+				}
+				else
+				{
+					$success = true;
+				}
+
+				break;
+		}
+
+		return $success;
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function gc()
+	{
+		$result = true;
+		static::$CacheLiteInstance->setOption('automaticCleaningFactor', 1);
+		static::$CacheLiteInstance->setOption('hashedDirectoryLevel', 1);
+		$success1 = static::$CacheLiteInstance->_cleanDir($this->_root . '/', false, 'old');
+
+		if (!($dh = opendir($this->_root . '/')))
+		{
+			return false;
+		}
+
+		while ($file = readdir($dh))
+		{
+			if (($file != '.') && ($file != '..') && ($file != '.svn'))
+			{
+				$file2 = $this->_root . '/' . $file;
+
+				if (is_dir($file2))
+				{
+					$result = ($result && (static::$CacheLiteInstance->_cleanDir($file2 . '/', false, 'old')));
+				}
+			}
+		}
+
+		$success = ($success1 && $result);
+
+		return $success;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		@include_once 'Cache/Lite.php';
+
+		return class_exists('\Cache_Lite');
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/FileStorage.php b/core/libraries/src/Cache/Storage/FileStorage.php
new file mode 100644
index 00000000..5384bcbe
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/FileStorage.php
@@ -0,0 +1,793 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+use Joomla\CMS\Log\Log;
+
+/**
+ * File cache storage handler
+ *
+ * @since  11.1
+ * @note   For performance reasons this class does not use the Filesystem package's API
+ */
+class FileStorage extends CacheStorage
+{
+	/**
+	 * Root path
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_root;
+
+	/**
+	 * Locked resources
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 *
+	 */
+	protected $_locked_files = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+		$this->_root = $options['cachebase'];
+
+		// Workaround for php 5.3
+		$locked_files = &$this->_locked_files;
+
+		// Remove empty locked files at script shutdown.
+		$clearAtShutdown = function () use (&$locked_files)
+		{
+			foreach ($locked_files as $path => $handle)
+			{
+				if (is_resource($handle))
+				{
+					@flock($handle, LOCK_UN);
+					@fclose($handle);
+				}
+
+				// Delete only the existing file if it is empty.
+				if (@filesize($path) === 0)
+				{
+					@unlink($path);
+				}
+
+				unset($locked_files[$path]);
+			}
+		};
+
+		register_shutdown_function($clearAtShutdown);
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return $this->_checkExpire($id, $group);
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		$path  = $this->_getFilePath($id, $group);
+		$close = false;
+
+		if ($checkTime == false || ($checkTime == true && $this->_checkExpire($id, $group) === true))
+		{
+			if (file_exists($path))
+			{
+				if (isset($this->_locked_files[$path]))
+				{
+					$_fileopen = $this->_locked_files[$path];
+				}
+				else
+				{
+					$_fileopen = @fopen($path, 'rb');
+
+					// There is no lock, we have to close file after store data
+					$close = true;
+				}
+
+				if ($_fileopen)
+				{
+					// On Windows system we can not use file_get_contents on the file locked by yourself
+					$data = stream_get_contents($_fileopen);
+
+					if ($close)
+					{
+						@fclose($_fileopen);
+					}
+
+					if ($data !== false)
+					{
+						// Remove the initial die() statement
+						return str_replace('<?php die("Access Denied"); ?>#x#', '', $data);
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		$path    = $this->_root;
+		$folders = $this->_folders($path);
+		$data    = array();
+
+		foreach ($folders as $folder)
+		{
+			$files = $this->_filesInFolder($path . '/' . $folder);
+			$item  = new CacheStorageHelper($folder);
+
+			foreach ($files as $file)
+			{
+				$item->updateSize(filesize($path . '/' . $folder . '/' . $file));
+			}
+
+			$data[$folder] = $item;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		$path  = $this->_getFilePath($id, $group);
+		$close = false;
+
+		// Prepend a die string
+		$data = '<?php die("Access Denied"); ?>#x#' . $data;
+
+		if (isset($this->_locked_files[$path]))
+		{
+			$_fileopen = $this->_locked_files[$path];
+
+			// Because lock method uses flag c+b we have to truncate it manually
+			@ftruncate($_fileopen, 0);
+		}
+		else
+		{
+			$_fileopen = @fopen($path, 'wb');
+
+			// There is no lock, we have to close file after store data
+			$close = true;
+		}
+
+		if ($_fileopen)
+		{
+			$length = strlen($data);
+			$result = @fwrite($_fileopen, $data, $length);
+
+			if ($close)
+			{
+				@fclose($_fileopen);
+			}
+
+			return $result === $length;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		$path = $this->_getFilePath($id, $group);
+
+		if (!@unlink($path))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		$return = true;
+		$folder = $group;
+
+		if (trim($folder) == '')
+		{
+			$mode = 'notgroup';
+		}
+
+		switch ($mode)
+		{
+			case 'notgroup' :
+				$folders = $this->_folders($this->_root);
+
+				for ($i = 0, $n = count($folders); $i < $n; $i++)
+				{
+					if ($folders[$i] != $folder)
+					{
+						$return |= $this->_deleteFolder($this->_root . '/' . $folders[$i]);
+					}
+				}
+
+				break;
+
+			case 'group' :
+			default :
+				if (is_dir($this->_root . '/' . $folder))
+				{
+					$return = $this->_deleteFolder($this->_root . '/' . $folder);
+				}
+
+				break;
+		}
+
+		return (bool) $return;
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function gc()
+	{
+		$result = true;
+
+		// Files older than lifeTime get deleted from cache
+		$files = $this->_filesInFolder($this->_root, '', true, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX', 'index.html'));
+
+		foreach ($files as $file)
+		{
+			$time = @filemtime($file);
+
+			if (($time + $this->_lifetime) < $this->_now || empty($time))
+			{
+				$result |= @unlink($file);
+			}
+		}
+
+		return (bool) $result;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return is_writable(\JFactory::getConfig()->get('cache_path', JPATH_CACHE));
+	}
+
+	/**
+	 * Lock cached item
+	 *
+	 * @param   string   $id        The cache data ID
+	 * @param   string   $group     The cache data group
+	 * @param   integer  $locktime  Cached item max lock time
+	 *
+	 * @return  mixed  Boolean false if locking failed or an object containing properties lock and locklooped
+	 *
+	 * @since   11.1
+	 */
+	public function lock($id, $group, $locktime)
+	{
+		$returning             = new \stdClass;
+		$returning->locklooped = false;
+
+		$looptime  = $locktime * 10;
+		$path      = $this->_getFilePath($id, $group);
+		$_fileopen = @fopen($path, 'c+b');
+
+		if (!$_fileopen)
+		{
+			$returning->locked = false;
+
+			return $returning;
+		}
+
+		$data_lock = (bool) @flock($_fileopen, LOCK_EX|LOCK_NB);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released.
+			// That implies that data get from other thread has finished
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					break;
+				}
+
+				usleep(100);
+				$data_lock = (bool) @flock($_fileopen, LOCK_EX|LOCK_NB);
+				$lock_counter++;
+			}
+
+			$returning->locklooped = true;
+		}
+
+		if ($data_lock === true)
+		{
+			// Remember resource, flock release lock if you unset/close resource
+			$this->_locked_files[$path] = $_fileopen;
+		}
+
+		$returning->locked = $data_lock;
+
+		return $returning;
+	}
+
+	/**
+	 * Unlock cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function unlock($id, $group = null)
+	{
+		$path = $this->_getFilePath($id, $group);
+
+		if (isset($this->_locked_files[$path]))
+		{
+			$ret = (bool) @flock($this->_locked_files[$path], LOCK_UN);
+			@fclose($this->_locked_files[$path]);
+			unset($this->_locked_files[$path]);
+
+			return $ret;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if a cache object has expired
+	 *
+	 * Using @ error suppressor here because between if we did a file_exists() and then filemsize() there will
+	 * be a little time space when another process can delete the file and then you get PHP Warning
+	 *
+	 * @param   string  $id     Cache ID to check
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean  True if the cache ID is valid
+	 *
+	 * @since   11.1
+	 */
+	protected function _checkExpire($id, $group)
+	{
+		$path = $this->_getFilePath($id, $group);
+
+		// Check prune period
+		if (file_exists($path))
+		{
+			$time = @filemtime($path);
+
+			if (($time + $this->_lifetime) < $this->_now || empty($time))
+			{
+				@unlink($path);
+
+				return false;
+			}
+
+			// If, right now, the file does not exist then return false
+			if (@filesize($path) == 0)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get a cache file path from an ID/group pair
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean|string  The path to the data object or boolean false if the cache directory does not exist
+	 *
+	 * @since   11.1
+	 */
+	protected function _getFilePath($id, $group)
+	{
+		$name = $this->_getCacheId($id, $group);
+		$dir  = $this->_root . '/' . $group;
+
+		// If the folder doesn't exist try to create it
+		if (!is_dir($dir))
+		{
+			// Make sure the index file is there
+			$indexFile = $dir . '/index.html';
+			@mkdir($dir) && file_put_contents($indexFile, '<!DOCTYPE html><title></title>');
+		}
+
+		// Make sure the folder exists
+		if (!is_dir($dir))
+		{
+			return false;
+		}
+
+		return $dir . '/' . $name . '.php';
+	}
+
+	/**
+	 * Quickly delete a folder of files
+	 *
+	 * @param   string  $path  The path to the folder to delete.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	protected function _deleteFolder($path)
+	{
+		// Sanity check
+		if (!$path || !is_dir($path) || empty($this->_root))
+		{
+			// Bad programmer! Bad, bad programmer!
+			Log::add(__METHOD__ . ' ' . \JText::_('JLIB_FILESYSTEM_ERROR_DELETE_BASE_DIRECTORY'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$path = $this->_cleanPath($path);
+
+		// Check to make sure path is inside cache folder, we do not want to delete Joomla root!
+		$pos = strpos($path, $this->_cleanPath($this->_root));
+
+		if ($pos === false || $pos > 0)
+		{
+			Log::add(__METHOD__ . ' ' . \JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Remove all the files in folder if they exist; disable all filtering
+		$files = $this->_filesInFolder($path, '.', false, true, array(), array());
+
+		if (!empty($files) && !is_array($files))
+		{
+			if (@unlink($files) !== true)
+			{
+				return false;
+			}
+		}
+		elseif (!empty($files) && is_array($files))
+		{
+			foreach ($files as $file)
+			{
+				$file = $this->_cleanPath($file);
+
+				// In case of restricted permissions we zap it one way or the other as long as the owner is either the webserver or the ftp
+				if (@unlink($file) !== true)
+				{
+					Log::add(__METHOD__ . ' ' . \JText::sprintf('JLIB_FILESYSTEM_DELETE_FAILED', basename($file)), Log::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+		}
+
+		// Remove sub-folders of folder; disable all filtering
+		$folders = $this->_folders($path, '.', false, true, array(), array());
+
+		foreach ($folders as $folder)
+		{
+			if (is_link($folder))
+			{
+				// Don't descend into linked directories, just delete the link.
+				if (@unlink($folder) !== true)
+				{
+					return false;
+				}
+			}
+			elseif ($this->_deleteFolder($folder) !== true)
+			{
+				return false;
+			}
+		}
+
+		// In case of restricted permissions we zap it one way or the other as long as the owner is either the webserver or the ftp
+		if (@rmdir($path))
+		{
+			return true;
+		}
+
+		Log::add(__METHOD__ . ' ' . \JText::sprintf('JLIB_FILESYSTEM_ERROR_FOLDER_DELETE', $path), Log::WARNING, 'jerror');
+
+		return false;
+	}
+
+	/**
+	 * Function to strip additional / or \ in a path name
+	 *
+	 * @param   string  $path  The path to clean
+	 * @param   string  $ds    Directory separator (optional)
+	 *
+	 * @return  string  The cleaned path
+	 *
+	 * @since   11.1
+	 */
+	protected function _cleanPath($path, $ds = DIRECTORY_SEPARATOR)
+	{
+		$path = trim($path);
+
+		if (empty($path))
+		{
+			return $this->_root;
+		}
+
+		// Remove double slashes and backslahses and convert all slashes and backslashes to DIRECTORY_SEPARATOR
+		$path = preg_replace('#[/\\\\]+#', $ds, $path);
+
+		return $path;
+	}
+
+	/**
+	 * Utility function to quickly read the files in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for file names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $fullpath       True to return the full path to the file.
+	 * @param   array    $exclude        Array with names of files which should not be shown in the result.
+	 * @param   array    $excludefilter  Array of folder names to exclude
+	 *
+	 * @return  array  Files in the given folder.
+	 *
+	 * @since   11.1
+	 */
+	protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullpath = false,
+		$exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'), $excludefilter = array('^\..*', '.*~'))
+	{
+		$arr = array();
+
+		// Check to make sure the path valid and clean
+		$path = $this->_cleanPath($path);
+
+		// Is the path a folder?
+		if (!is_dir($path))
+		{
+			Log::add(__METHOD__ . ' ' . \JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Read the source directory.
+		if (!($handle = @opendir($path)))
+		{
+			return $arr;
+		}
+
+		if (count($excludefilter))
+		{
+			$excludefilter = '/(' . implode('|', $excludefilter) . ')/';
+		}
+		else
+		{
+			$excludefilter = '';
+		}
+
+		while (($file = readdir($handle)) !== false)
+		{
+			if (($file != '.') && ($file != '..') && (!in_array($file, $exclude)) && (!$excludefilter || !preg_match($excludefilter, $file)))
+			{
+				$dir   = $path . '/' . $file;
+				$isDir = is_dir($dir);
+
+				if ($isDir)
+				{
+					if ($recurse)
+					{
+						if (is_int($recurse))
+						{
+							$arr2 = $this->_filesInFolder($dir, $filter, $recurse - 1, $fullpath);
+						}
+						else
+						{
+							$arr2 = $this->_filesInFolder($dir, $filter, $recurse, $fullpath);
+						}
+
+						$arr = array_merge($arr, $arr2);
+					}
+				}
+				else
+				{
+					if (preg_match("/$filter/", $file))
+					{
+						if ($fullpath)
+						{
+							$arr[] = $path . '/' . $file;
+						}
+						else
+						{
+							$arr[] = $file;
+						}
+					}
+				}
+			}
+		}
+
+		closedir($handle);
+
+		return $arr;
+	}
+
+	/**
+	 * Utility function to read the folders in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for folder names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $fullpath       True to return the full path to the folders.
+	 * @param   array    $exclude        Array with names of folders which should not be shown in the result.
+	 * @param   array    $excludefilter  Array with regular expressions matching folders which should not be shown in the result.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @since   11.1
+	 */
+	protected function _folders($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*'))
+	{
+		$arr = array();
+
+		// Check to make sure the path valid and clean
+		$path = $this->_cleanPath($path);
+
+		// Is the path a folder?
+		if (!is_dir($path))
+		{
+			Log::add(__METHOD__ . ' ' . \JText::sprintf('JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER', $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Read the source directory
+		if (!($handle = @opendir($path)))
+		{
+			return $arr;
+		}
+
+		if (count($excludefilter))
+		{
+			$excludefilter_string = '/(' . implode('|', $excludefilter) . ')/';
+		}
+		else
+		{
+			$excludefilter_string = '';
+		}
+
+		while (($file = readdir($handle)) !== false)
+		{
+			if (($file != '.') && ($file != '..')
+				&& (!in_array($file, $exclude))
+				&& (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
+			{
+				$dir   = $path . '/' . $file;
+				$isDir = is_dir($dir);
+
+				if ($isDir)
+				{
+					// Removes filtered directories
+					if (preg_match("/$filter/", $file))
+					{
+						if ($fullpath)
+						{
+							$arr[] = $dir;
+						}
+						else
+						{
+							$arr[] = $file;
+						}
+					}
+
+					if ($recurse)
+					{
+						if (is_int($recurse))
+						{
+							$arr2 = $this->_folders($dir, $filter, $recurse - 1, $fullpath, $exclude, $excludefilter);
+						}
+						else
+						{
+							$arr2 = $this->_folders($dir, $filter, $recurse, $fullpath, $exclude, $excludefilter);
+						}
+
+						$arr = array_merge($arr, $arr2);
+					}
+				}
+			}
+		}
+
+		closedir($handle);
+
+		return $arr;
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/MemcacheStorage.php b/core/libraries/src/Cache/Storage/MemcacheStorage.php
new file mode 100644
index 00000000..22be41b7
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/MemcacheStorage.php
@@ -0,0 +1,464 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Cache\CacheStorage;
+use Joomla\CMS\Cache\Exception\CacheConnectingException;
+
+/**
+ * Memcache cache storage handler
+ *
+ * @link   https://secure.php.net/manual/en/book.memcache.php
+ * @since  11.1
+ */
+class MemcacheStorage extends CacheStorage
+{
+	/**
+	 * Memcache connection object
+	 *
+	 * @var    \Memcache
+	 * @since  11.1
+	 */
+	protected static $_db = null;
+
+	/**
+	 * Payload compression level
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $_compress = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		$this->_compress = \JFactory::getConfig()->get('memcache_compress', false) ? MEMCACHE_COMPRESSED : 0;
+
+		if (static::$_db === null)
+		{
+			$this->getConnection();
+		}
+	}
+
+	/**
+	 * Create the Memcache connection
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function getConnection()
+	{
+		if (!static::isSupported())
+		{
+			throw new \RuntimeException('Memcache Extension is not available');
+		}
+
+		$config = \JFactory::getConfig();
+
+		$host = $config->get('memcache_server_host', 'localhost');
+		$port = $config->get('memcache_server_port', 11211);
+
+		// Create the memcache connection
+		static::$_db = new \Memcache;
+
+		if ($config->get('memcache_persist', true))
+		{
+			$result = @static::$_db->pconnect($host, $port);
+		}
+		else
+		{
+			$result = @static::$_db->connect($host, $port);
+		}
+
+		if (!$result)
+		{
+			// Null out the connection to inform the constructor it will need to attempt to connect if this class is instantiated again
+			static::$_db = null;
+
+			throw new CacheConnectingException('Could not connect to memcache server');
+		}
+	}
+
+	/**
+	 * Get a cache_id string from an id/group pair
+	 *
+	 * @param   string  $id     The cache data id
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  string   The cache_id string
+	 *
+	 * @since   11.1
+	 */
+	protected function _getCacheId($id, $group)
+	{
+		$prefix   = Cache::getPlatformPrefix();
+		$length   = strlen($prefix);
+		$cache_id = parent::_getCacheId($id, $group);
+
+		if ($length)
+		{
+			// Memcache use suffix instead of prefix
+			$cache_id = substr($cache_id, $length) . strrev($prefix);
+		}
+
+		return $cache_id;
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return $this->get($id, $group) !== false;
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		return static::$_db->get($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		$keys   = static::$_db->get($this->_hash . '-index');
+		$secret = $this->_hash;
+
+		$data = array();
+
+		if (is_array($keys))
+		{
+			foreach ($keys as $key)
+			{
+				if (empty($key))
+				{
+					continue;
+				}
+
+				$namearr = explode('-', $key->name);
+
+				if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+				{
+					$group = $namearr[2];
+
+					if (!isset($data[$group]))
+					{
+						$item = new CacheStorageHelper($group);
+					}
+					else
+					{
+						$item = $data[$group];
+					}
+
+					$item->updateSize($key->size);
+
+					$data[$group] = $item;
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		$cache_id = $this->_getCacheId($id, $group);
+
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		$index = static::$_db->get($this->_hash . '-index');
+
+		if (!is_array($index))
+		{
+			$index = array();
+		}
+
+		$tmparr       = new \stdClass;
+		$tmparr->name = $cache_id;
+		$tmparr->size = strlen($data);
+
+		$index[] = $tmparr;
+		static::$_db->set($this->_hash . '-index', $index, 0, 0);
+		$this->unlockindex();
+
+		static::$_db->set($cache_id, $data, $this->_compress, $this->_lifetime);
+
+		return true;
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		$cache_id = $this->_getCacheId($id, $group);
+
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		$index = static::$_db->get($this->_hash . '-index');
+
+		if (is_array($index))
+		{
+			foreach ($index as $key => $value)
+			{
+				if ($value->name == $cache_id)
+				{
+					unset($index[$key]);
+					static::$_db->set($this->_hash . '-index', $index, 0, 0);
+					break;
+				}
+			}
+		}
+
+		$this->unlockindex();
+
+		return static::$_db->delete($cache_id);
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		$index = static::$_db->get($this->_hash . '-index');
+
+		if (is_array($index))
+		{
+			$prefix = $this->_hash . '-cache-' . $group . '-';
+
+			foreach ($index as $key => $value)
+			{
+				if (strpos($value->name, $prefix) === 0 xor $mode != 'group')
+				{
+					static::$_db->delete($value->name);
+					unset($index[$key]);
+				}
+			}
+
+			static::$_db->set($this->_hash . '-index', $index, 0, 0);
+		}
+
+		$this->unlockindex();
+
+		return true;
+	}
+
+	/**
+	 * Flush all existing items in storage.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.3
+	 */
+	public function flush()
+	{
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		return static::$_db->flush();
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('memcache') && class_exists('\\Memcache');
+	}
+
+	/**
+	 * Lock cached item
+	 *
+	 * @param   string   $id        The cache data ID
+	 * @param   string   $group     The cache data group
+	 * @param   integer  $locktime  Cached item max lock time
+	 *
+	 * @return  mixed  Boolean false if locking failed or an object containing properties lock and locklooped
+	 *
+	 * @since   11.1
+	 */
+	public function lock($id, $group, $locktime)
+	{
+		$returning = new \stdClass;
+		$returning->locklooped = false;
+
+		$looptime = $locktime * 10;
+
+		$cache_id = $this->_getCacheId($id, $group);
+
+		$data_lock = static::$_db->add($cache_id . '_lock', 1, 0, $locktime);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released.
+			// That implies that data get from other thread has finished.
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					break;
+				}
+
+				usleep(100);
+				$data_lock = static::$_db->add($cache_id . '_lock', 1, 0, $locktime);
+				$lock_counter++;
+			}
+
+			$returning->locklooped = true;
+		}
+
+		$returning->locked = $data_lock;
+
+		return $returning;
+	}
+
+	/**
+	 * Unlock cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function unlock($id, $group = null)
+	{
+		$cache_id = $this->_getCacheId($id, $group) . '_lock';
+		return static::$_db->delete($cache_id);
+	}
+
+	/**
+	 * Lock cache index
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	protected function lockindex()
+	{
+		$looptime  = 300;
+		$data_lock = static::$_db->add($this->_hash . '-index_lock', 1, 0, 30);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released.  that implies that data get from other thread has finished
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					return false;
+				}
+
+				usleep(100);
+				$data_lock = static::$_db->add($this->_hash . '-index_lock', 1, 0, 30);
+				$lock_counter++;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Unlock cache index
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	protected function unlockindex()
+	{
+		return static::$_db->delete($this->_hash . '-index_lock');
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/MemcachedStorage.php b/core/libraries/src/Cache/Storage/MemcachedStorage.php
new file mode 100644
index 00000000..382b8671
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/MemcachedStorage.php
@@ -0,0 +1,487 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Cache\CacheStorage;
+use Joomla\CMS\Cache\Exception\CacheConnectingException;
+
+/**
+ * Memcached cache storage handler
+ *
+ * @link   https://secure.php.net/manual/en/book.memcached.php
+ * @since  12.1
+ */
+class MemcachedStorage extends CacheStorage
+{
+	/**
+	 * Memcached connection object
+	 *
+	 * @var    \Memcached
+	 * @since  12.1
+	 */
+	protected static $_db = null;
+
+	/**
+	 * Payload compression level
+	 *
+	 * @var    integer
+	 * @since  12.1
+	 */
+	protected $_compress = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		$this->_compress = \JFactory::getConfig()->get('memcached_compress', false) ? \Memcached::OPT_COMPRESSION : 0;
+
+		if (static::$_db === null)
+		{
+			$this->getConnection();
+		}
+	}
+
+	/**
+	 * Create the Memcached connection
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 * @throws  \RuntimeException
+	 */
+	protected function getConnection()
+	{
+		if (!static::isSupported())
+		{
+			throw new \RuntimeException('Memcached Extension is not available');
+		}
+
+		$config = \JFactory::getConfig();
+
+		$host = $config->get('memcached_server_host', 'localhost');
+		$port = $config->get('memcached_server_port', 11211);
+
+
+		// Create the memcached connection
+		if ($config->get('memcached_persist', true))
+		{
+			static::$_db = new \Memcached($this->_hash);
+			$servers = static::$_db->getServerList();
+
+			if ($servers && ($servers[0]['host'] != $host || $servers[0]['port'] != $port))
+			{
+				static::$_db->resetServerList();
+				$servers = array();
+			}
+
+			if (!$servers)
+			{
+				static::$_db->addServer($host, $port);
+			}
+		}
+		else
+		{
+			static::$_db = new \Memcached;
+			static::$_db->addServer($host, $port);
+		}
+
+		static::$_db->setOption(\Memcached::OPT_COMPRESSION, $this->_compress);
+
+		$stats  = static::$_db->getStats();
+		$result = !empty($stats["$host:$port"]) && $stats["$host:$port"]['pid'] > 0;
+
+		if (!$result)
+		{
+			// Null out the connection to inform the constructor it will need to attempt to connect if this class is instantiated again
+			static::$_db = null;
+
+			throw new CacheConnectingException('Could not connect to memcached server');
+		}
+	}
+
+	/**
+	 * Get a cache_id string from an id/group pair
+	 *
+	 * @param   string  $id     The cache data id
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  string   The cache_id string
+	 *
+	 * @since   11.1
+	 */
+	protected function _getCacheId($id, $group)
+	{
+		$prefix   = Cache::getPlatformPrefix();
+		$length   = strlen($prefix);
+		$cache_id = parent::_getCacheId($id, $group);
+
+		if ($length)
+		{
+			// Memcached use suffix instead of prefix
+			$cache_id = substr($cache_id, $length) . strrev($prefix);
+		}
+
+		return $cache_id;
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		static::$_db->get($this->_getCacheId($id, $group));
+
+		return static::$_db->getResultCode() !== \Memcached::RES_NOTFOUND;
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   12.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		return static::$_db->get($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   12.1
+	 */
+	public function getAll()
+	{
+		$keys   = static::$_db->get($this->_hash . '-index');
+		$secret = $this->_hash;
+
+		$data = array();
+
+		if (is_array($keys))
+		{
+			foreach ($keys as $key)
+			{
+				if (empty($key))
+				{
+					continue;
+				}
+
+				$namearr = explode('-', $key->name);
+
+				if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+				{
+					$group = $namearr[2];
+
+					if (!isset($data[$group]))
+					{
+						$item = new CacheStorageHelper($group);
+					}
+					else
+					{
+						$item = $data[$group];
+					}
+
+					$item->updateSize($key->size);
+
+					$data[$group] = $item;
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public function store($id, $group, $data)
+	{
+		$cache_id = $this->_getCacheId($id, $group);
+
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		$index = static::$_db->get($this->_hash . '-index');
+
+		if (!is_array($index))
+		{
+			$index = array();
+		}
+
+		$tmparr       = new \stdClass;
+		$tmparr->name = $cache_id;
+		$tmparr->size = strlen($data);
+
+		$index[] = $tmparr;
+		static::$_db->set($this->_hash . '-index', $index, 0);
+		$this->unlockindex();
+
+		static::$_db->set($cache_id, $data, $this->_lifetime);
+
+		return true;
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public function remove($id, $group)
+	{
+		$cache_id = $this->_getCacheId($id, $group);
+
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		$index = static::$_db->get($this->_hash . '-index');
+
+		if (is_array($index))
+		{
+			foreach ($index as $key => $value)
+			{
+				if ($value->name == $cache_id)
+				{
+					unset($index[$key]);
+					static::$_db->set($this->_hash . '-index', $index, 0);
+					break;
+				}
+			}
+		}
+
+		$this->unlockindex();
+
+		return static::$_db->delete($cache_id);
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		$index = static::$_db->get($this->_hash . '-index');
+
+		if (is_array($index))
+		{
+			$prefix = $this->_hash . '-cache-' . $group . '-';
+
+			foreach ($index as $key => $value)
+			{
+				if (strpos($value->name, $prefix) === 0 xor $mode != 'group')
+				{
+					static::$_db->delete($value->name);
+					unset($index[$key]);
+				}
+			}
+
+			static::$_db->set($this->_hash . '-index', $index, 0);
+		}
+
+		$this->unlockindex();
+
+		return true;
+	}
+
+	/**
+	 * Flush all existing items in storage.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.3
+	 */
+	public function flush()
+	{
+		if (!$this->lockindex())
+		{
+			return false;
+		}
+
+		return static::$_db->flush();
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		/*
+		 * GAE and HHVM have both had instances where Memcached the class was defined but no extension was loaded.
+		 * If the class is there, we can assume support.
+		 */
+		return class_exists('Memcached');
+	}
+
+	/**
+	 * Lock cached item
+	 *
+	 * @param   string   $id        The cache data ID
+	 * @param   string   $group     The cache data group
+	 * @param   integer  $locktime  Cached item max lock time
+	 *
+	 * @return  mixed  Boolean false if locking failed or an object containing properties lock and locklooped
+	 *
+	 * @since   12.1
+	 */
+	public function lock($id, $group, $locktime)
+	{
+		$returning = new \stdClass;
+		$returning->locklooped = false;
+
+		$looptime = $locktime * 10;
+
+		$cache_id = $this->_getCacheId($id, $group);
+
+		$data_lock = static::$_db->add($cache_id . '_lock', 1, $locktime);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released.
+			// That implies that data get from other thread has finished.
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					break;
+				}
+
+				usleep(100);
+				$data_lock = static::$_db->add($cache_id . '_lock', 1, $locktime);
+				$lock_counter++;
+			}
+
+			$returning->locklooped = true;
+		}
+
+		$returning->locked = $data_lock;
+
+		return $returning;
+	}
+
+	/**
+	 * Unlock cached item
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public function unlock($id, $group = null)
+	{
+		$cache_id = $this->_getCacheId($id, $group) . '_lock';
+		return static::$_db->delete($cache_id);
+	}
+
+	/**
+	 * Lock cache index
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	protected function lockindex()
+	{
+		$looptime  = 300;
+		$data_lock = static::$_db->add($this->_hash . '-index_lock', 1, 30);
+
+		if ($data_lock === false)
+		{
+			$lock_counter = 0;
+
+			// Loop until you find that the lock has been released.  that implies that data get from other thread has finished
+			while ($data_lock === false)
+			{
+				if ($lock_counter > $looptime)
+				{
+					return false;
+				}
+
+				usleep(100);
+				$data_lock = static::$_db->add($this->_hash . '-index_lock', 1, 30);
+				$lock_counter++;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Unlock cache index
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	protected function unlockindex()
+	{
+		return static::$_db->delete($this->_hash . '-index_lock');
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/RedisStorage.php b/core/libraries/src/Cache/Storage/RedisStorage.php
new file mode 100644
index 00000000..68c2eb8b
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/RedisStorage.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Redis cache storage handler for PECL
+ *
+ * @since  3.4
+ */
+class RedisStorage extends CacheStorage
+{
+	/**
+	 * Redis connection object
+	 *
+	 * @var    \Redis
+	 * @since  3.4
+	 */
+	protected static $_redis = null;
+
+	/**
+	 * Persistent session flag
+	 *
+	 * @var    boolean
+	 * @since  3.4
+	 */
+	protected $_persistent = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		if (static::$_redis === null)
+		{
+			$this->getConnection();
+		}
+	}
+
+	/**
+	 * Create the Redis connection
+	 *
+	 * @return  \Redis|boolean  Redis connection object on success, boolean on failure
+	 *
+	 * @since   3.4
+	 * @note    As of 4.0 this method will throw a JCacheExceptionConnecting object on connection failure
+	 */
+	protected function getConnection()
+	{
+		if (static::isSupported() == false)
+		{
+			return false;
+		}
+
+		$config = \JFactory::getConfig();
+
+		$this->_persistent = $config->get('redis_persist', true);
+
+		$server = array(
+			'host' => $config->get('redis_server_host', 'localhost'),
+			'port' => $config->get('redis_server_port', 6379),
+			'auth' => $config->get('redis_server_auth', null),
+			'db'   => (int) $config->get('redis_server_db', null),
+		);
+
+		// If you are trying to connect to a socket file, ignore the supplied port
+		if ($server['host'][0] === '/')
+		{
+			$server['port'] = 0;
+		}
+
+		static::$_redis = new \Redis;
+
+		try
+		{
+			if ($this->_persistent)
+			{
+				$connection = static::$_redis->pconnect($server['host'], $server['port']);
+			}
+			else
+			{
+				$connection = static::$_redis->connect($server['host'], $server['port']);
+			}
+		}
+		catch (\RedisException $e)
+		{
+			Log::add($e->getMessage(), Log::DEBUG);
+		}
+
+		if ($connection == false)
+		{
+			static::$_redis = null;
+
+			// Because the application instance may not be available on cli script, use it only if needed
+			if (\JFactory::getApplication()->isClient('administrator'))
+			{
+				\JError::raiseWarning(500, 'Redis connection failed');
+			}
+
+			return false;
+		}
+
+		try
+		{
+			$auth = $server['auth'] ? static::$_redis->auth($server['auth']) : true;
+		}
+		catch (\RedisException $e)
+		{
+			$auth = false;
+			Log::add($e->getMessage(), Log::DEBUG);
+		}
+
+		if ($auth === false)
+		{
+			static::$_redis = null;
+
+			// Because the application instance may not be available on cli script, use it only if needed
+			if (\JFactory::getApplication()->isClient('administrator'))
+			{
+				\JError::raiseWarning(500, 'Redis authentication failed');
+			}
+
+			return false;
+		}
+
+		$select = static::$_redis->select($server['db']);
+
+		if ($select == false)
+		{
+			static::$_redis = null;
+
+			// Because the application instance may not be available on cli script, use it only if needed
+			if (\JFactory::getApplication()->isClient('administrator'))
+			{
+				\JError::raiseWarning(500, 'Redis failed to select database');
+			}
+
+			return false;
+		}
+
+		try
+		{
+			static::$_redis->ping();
+		}
+		catch (\RedisException $e)
+		{
+			static::$_redis = null;
+
+			// Because the application instance may not be available on cli script, use it only if needed
+			if (\JFactory::getApplication()->isClient('administrator'))
+			{
+				\JError::raiseWarning(500, 'Redis ping failed');
+			}
+
+			return false;
+		}
+
+		return static::$_redis;
+	}
+
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		if (static::isConnected() == false)
+		{
+			return false;
+		}
+
+		// Redis exists returns integer values lets convert that to boolean see: https://redis.io/commands/exists
+		return (bool) static::$_redis->exists($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   3.4
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		if (static::isConnected() == false)
+		{
+			return false;
+		}
+
+		return static::$_redis->get($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   3.4
+	 */
+	public function getAll()
+	{
+		if (static::isConnected() == false)
+		{
+			return false;
+		}
+
+		$allKeys = static::$_redis->keys('*');
+		$data    = array();
+		$secret  = $this->_hash;
+
+		if (!empty($allKeys))
+		{
+			foreach ($allKeys as $key)
+			{
+				$namearr = explode('-', $key);
+
+				if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+				{
+					$group = $namearr[2];
+
+					if (!isset($data[$group]))
+					{
+						$item = new CacheStorageHelper($group);
+					}
+					else
+					{
+						$item = $data[$group];
+					}
+
+					$item->updateSize(strlen($key)*8);
+					$data[$group] = $item;
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public function store($id, $group, $data)
+	{
+		if (static::isConnected() == false)
+		{
+			return false;
+		}
+
+		static::$_redis->setex($this->_getCacheId($id, $group), $this->_lifetime, $data);
+
+		return true;
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public function remove($id, $group)
+	{
+		if (static::isConnected() == false)
+		{
+			return false;
+		}
+
+		return (bool) static::$_redis->delete($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public function clean($group, $mode = null)
+	{
+		if (static::isConnected() == false)
+		{
+			return false;
+		}
+
+		$allKeys = static::$_redis->keys('*');
+
+		if ($allKeys === false)
+		{
+			$allKeys = array();
+		}
+
+		$secret = $this->_hash;
+
+		foreach ($allKeys as $key)
+		{
+			if (strpos($key, $secret . '-cache-' . $group . '-') === 0 && $mode == 'group')
+			{
+				static::$_redis->delete($key);
+			}
+
+			if (strpos($key, $secret . '-cache-' . $group . '-') !== 0 && $mode != 'group')
+			{
+				static::$_redis->delete($key);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public static function isSupported()
+	{
+		return class_exists('\\Redis');
+	}
+
+	/**
+	 * Test to see if the Redis connection is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public static function isConnected()
+	{
+		return static::$_redis instanceof \Redis;
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/WincacheStorage.php b/core/libraries/src/Cache/Storage/WincacheStorage.php
new file mode 100644
index 00000000..6b8ff2d9
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/WincacheStorage.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+
+/**
+ * WinCache cache storage handler
+ *
+ * @link   https://secure.php.net/manual/en/book.wincache.php
+ * @since  11.1
+ */
+class WincacheStorage extends CacheStorage
+{
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return wincache_ucache_exists($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		return wincache_ucache_get($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function getAll()
+	{
+		$allinfo = wincache_ucache_info();
+		$keys    = $allinfo['ucache_entries'];
+		$secret  = $this->_hash;
+		$data    = array();
+
+		foreach ($keys as $key)
+		{
+			$name    = $key['key_name'];
+			$namearr = explode('-', $name);
+
+			if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+			{
+				$group = $namearr[2];
+
+				if (!isset($data[$group]))
+				{
+					$item = new CacheStorageHelper($group);
+				}
+				else
+				{
+					$item = $data[$group];
+				}
+
+				if (isset($key['value_size']))
+				{
+					$item->updateSize($key['value_size']);
+				}
+				else
+				{
+					// Dummy, WINCACHE version is too low.
+					$item->updateSize(1);
+				}
+
+				$data[$group] = $item;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		return wincache_ucache_set($this->_getCacheId($id, $group), $data, $this->_lifetime);
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		return wincache_ucache_delete($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		$allinfo = wincache_ucache_info();
+		$keys    = $allinfo['ucache_entries'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (strpos($key['key_name'], $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
+			{
+				wincache_ucache_delete($key['key_name']);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Garbage collect expired cache data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function gc()
+	{
+		$allinfo = wincache_ucache_info();
+		$keys    = $allinfo['ucache_entries'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (strpos($key['key_name'], $secret . '-cache-'))
+			{
+				wincache_ucache_get($key['key_name']);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('wincache') && function_exists('wincache_ucache_get') && !strcmp(ini_get('wincache.ucenabled'), '1');
+	}
+}
diff --git a/core/libraries/src/Cache/Storage/XcacheStorage.php b/core/libraries/src/Cache/Storage/XcacheStorage.php
new file mode 100644
index 00000000..a2cfadeb
--- /dev/null
+++ b/core/libraries/src/Cache/Storage/XcacheStorage.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Cache\Storage;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\CacheStorage;
+
+/**
+ * XCache cache storage handler
+ *
+ * @link   http://xcache.lighttpd.net/
+ * @since  11.1
+ */
+class XcacheStorage extends CacheStorage
+{
+	/**
+	 * Check if the cache contains data stored by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function contains($id, $group)
+	{
+		return xcache_isset($this->_getCacheId($id, $group));
+	}
+
+	/**
+	 * Get cached data by ID and group
+	 *
+	 * @param   string   $id         The cache data ID
+	 * @param   string   $group      The cache data group
+	 * @param   boolean  $checkTime  True to verify cache time expiration threshold
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 */
+	public function get($id, $group, $checkTime = true)
+	{
+		// Make sure XCache is configured properly
+		if (static::isSupported() == false)
+		{
+			return false;
+		}
+
+		$cache_id = $this->_getCacheId($id, $group);
+		$cache_content = xcache_get($cache_id);
+
+		if ($cache_content === null)
+		{
+			return false;
+		}
+
+		return $cache_content;
+	}
+
+	/**
+	 * Get all cached data
+	 *
+	 * @return  mixed  Boolean false on failure or a cached data object
+	 *
+	 * @since   11.1
+	 * @note    This requires the php.ini setting xcache.admin.enable_auth = Off.
+	 */
+	public function getAll()
+	{
+		// Make sure XCache is configured properly
+		if (static::isSupported() == false)
+		{
+			return array();
+		}
+
+		$allinfo = xcache_list(XC_TYPE_VAR, 0);
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		$data = array();
+
+		foreach ($keys as $key)
+		{
+			$namearr = explode('-', $key['name']);
+
+			if ($namearr !== false && $namearr[0] == $secret && $namearr[1] == 'cache')
+			{
+				$group = $namearr[2];
+
+				if (!isset($data[$group]))
+				{
+					$item = new CacheStorageHelper($group);
+				}
+				else
+				{
+					$item = $data[$group];
+				}
+
+				$item->updateSize($key['size']);
+
+				$data[$group] = $item;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Store the data to cache by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 * @param   string  $data   The data to store in cache
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function store($id, $group, $data)
+	{
+		// Make sure XCache is configured properly
+		if (static::isSupported() == false)
+		{
+			return false;
+		}
+
+		return xcache_set($this->_getCacheId($id, $group), $data, $this->_lifetime);
+	}
+
+	/**
+	 * Remove a cached data entry by ID and group
+	 *
+	 * @param   string  $id     The cache data ID
+	 * @param   string  $group  The cache data group
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function remove($id, $group)
+	{
+		// Make sure XCache is configured properly
+		if (static::isSupported() == false)
+		{
+			return false;
+		}
+
+		$cache_id = $this->_getCacheId($id, $group);
+
+		if (!xcache_isset($cache_id))
+		{
+			return true;
+		}
+
+		return xcache_unset($cache_id);
+	}
+
+	/**
+	 * Clean cache for a group given a mode.
+	 *
+	 * group mode    : cleans all cache in the group
+	 * notgroup mode : cleans all cache not in the group
+	 *
+	 * @param   string  $group  The cache data group
+	 * @param   string  $mode   The mode for cleaning cache [group|notgroup]
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function clean($group, $mode = null)
+	{
+		// Make sure XCache is configured properly
+		if (static::isSupported() == false)
+		{
+			return true;
+		}
+
+		$allinfo = xcache_list(XC_TYPE_VAR, 0);
+		$keys    = $allinfo['cache_list'];
+		$secret  = $this->_hash;
+
+		foreach ($keys as $key)
+		{
+			if (strpos($key['name'], $secret . '-cache-' . $group . '-') === 0 xor $mode != 'group')
+			{
+				xcache_unset($key['name']);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Test to see if the storage handler is available.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		if (extension_loaded('xcache'))
+		{
+			// XCache Admin must be disabled for Joomla to use XCache
+			$xcache_admin_enable_auth = ini_get('xcache.admin.enable_auth');
+
+			// Some extensions ini variables are reported as strings
+			if ($xcache_admin_enable_auth == 'Off')
+			{
+				return true;
+			}
+
+			// We require a string with contents 0, not a null value because it is not set since that then defaults to On/True
+			if ($xcache_admin_enable_auth === '0')
+			{
+				return true;
+			}
+
+			// In some enviorments empty is equivalent to Off; See JC: #34044 && Github: #4083
+			if ($xcache_admin_enable_auth === '')
+			{
+				return true;
+			}
+		}
+
+		// If the settings are not correct, give up
+		return false;
+	}
+}
diff --git a/core/libraries/src/Captcha/Captcha.php b/core/libraries/src/Captcha/Captcha.php
new file mode 100644
index 00000000..396efad2
--- /dev/null
+++ b/core/libraries/src/Captcha/Captcha.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Captcha;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Editor\Editor;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla! Captcha base object
+ *
+ * @abstract
+ * @package     Joomla.Libraries
+ * @subpackage  Captcha
+ * @since       2.5
+ */
+class Captcha extends \JObject
+{
+	/**
+	 * An array of Observer objects to notify
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $_observers = array();
+
+	/**
+	 * The state of the observable object
+	 *
+	 * @var    mixed
+	 * @since  2.5
+	 */
+	protected $_state = null;
+
+	/**
+	 * A multi dimensional array of [function][] = key for observers
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $_methods = array();
+
+	/**
+	 * Captcha Plugin object
+	 *
+	 * @var	   CMSPlugin
+	 * @since  2.5
+	 */
+	private $_captcha;
+
+	/**
+	 * Editor Plugin name
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	private $_name;
+
+	/**
+	 * Array of instances of this class.
+	 *
+	 * @var	   Captcha[]
+	 * @since  2.5
+	 */
+	private static $_instances = array();
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   string  $captcha  The editor to use.
+	 * @param   array   $options  Associative array of options.
+	 *
+	 * @since   2.5
+	 */
+	public function __construct($captcha, $options)
+	{
+		$this->_name = $captcha;
+		$this->_load($options);
+	}
+
+	/**
+	 * Returns the global Captcha object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $captcha  The plugin to use.
+	 * @param   array   $options  Associative array of options.
+	 *
+	 * @return  Captcha|null  Instance of this class.
+	 *
+	 * @since   2.5
+	 */
+	public static function getInstance($captcha, array $options = array())
+	{
+		$signature = md5(serialize(array($captcha, $options)));
+
+		if (empty(self::$_instances[$signature]))
+		{
+			try
+			{
+				self::$_instances[$signature] = new Captcha($captcha, $options);
+			}
+			catch (\RuntimeException $e)
+			{
+				\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+				return;
+			}
+		}
+
+		return self::$_instances[$signature];
+	}
+
+	/**
+	 * Fire the onInit event to initialise the captcha plugin.
+	 *
+	 * @param   string  $id  The id of the field.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since	2.5
+	 */
+	public function initialise($id)
+	{
+		$args['id']    = $id;
+		$args['event'] = 'onInit';
+
+		try
+		{
+			$this->_captcha->update($args);
+		}
+		catch (\Exception $e)
+		{
+			\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the HTML for the captcha.
+	 *
+	 * @param   string  $name   The control name.
+	 * @param   string  $id     The id for the control.
+	 * @param   string  $class  Value for the HTML class attribute
+	 *
+	 * @return  mixed  The return value of the function "onDisplay" of the selected Plugin.
+	 *
+	 * @since   2.5
+	 */
+	public function display($name, $id, $class = '')
+	{
+		// Check if captcha is already loaded.
+		if ($this->_captcha === null)
+		{
+			return;
+		}
+
+		// Initialise the Captcha.
+		if (!$this->initialise($id))
+		{
+			return;
+		}
+
+		$args['name']  = $name;
+		$args['id']    = $id ?: $name;
+		$args['class'] = $class ? 'class="' . $class . '"' : '';
+		$args['event'] = 'onDisplay';
+
+		return $this->_captcha->update($args);
+	}
+
+	/**
+	 * Checks if the answer is correct.
+	 *
+	 * @param   string  $code  The answer.
+	 *
+	 * @return  mixed   The return value of the function "onCheckAnswer" of the selected Plugin.
+	 *
+	 * @since	2.5
+	 */
+	public function checkAnswer($code)
+	{
+		// Check if captcha is already loaded
+		if ($this->_captcha === null)
+		{
+			return;
+		}
+
+		$args['code']  = $code;
+		$args['event'] = 'onCheckAnswer';
+
+		return $this->_captcha->update($args);
+	}
+
+	/**
+	 * Load the Captcha plugin.
+	 *
+	 * @param   array  $options  Associative array of options.
+	 *
+	 * @return  void
+	 *
+	 * @since	2.5
+	 * @throws  \RuntimeException
+	 */
+	private function _load(array $options = array())
+	{
+		// Build the path to the needed captcha plugin
+		$name = \JFilterInput::getInstance()->clean($this->_name, 'cmd');
+		$path = JPATH_PLUGINS . '/captcha/' . $name . '/' . $name . '.php';
+
+		if (!is_file($path))
+		{
+			throw new \RuntimeException(\JText::sprintf('JLIB_CAPTCHA_ERROR_PLUGIN_NOT_FOUND', $name));
+		}
+
+		// Require plugin file
+		require_once $path;
+
+		// Get the plugin
+		$plugin = PluginHelper::getPlugin('captcha', $this->_name);
+
+		if (!$plugin)
+		{
+			throw new \RuntimeException(\JText::sprintf('JLIB_CAPTCHA_ERROR_PLUGIN_NOT_FOUND', $name));
+		}
+
+		// Check for already loaded params
+		if (!($plugin->params instanceof Registry))
+		{
+			$params = new Registry($plugin->params);
+			$plugin->params = $params;
+		}
+
+		// Build captcha plugin classname
+		$name = 'PlgCaptcha' . $this->_name;
+		$this->_captcha = new $name($this, (array) $plugin, $options);
+	}
+
+	/**
+	 * Get the state of the Captcha object
+	 *
+	 * @return  mixed  The state of the object.
+	 *
+	 * @since   2.5
+	 */
+	public function getState()
+	{
+		return $this->_state;
+	}
+
+	/**
+	 * Attach an observer object
+	 *
+	 * @param   object  $observer  An observer object to attach
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function attach($observer)
+	{
+		if (is_array($observer))
+		{
+			if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this array as an observer
+			foreach ($this->_observers as $check)
+			{
+				if (is_array($check) && $check['event'] == $observer['event'] && $check['handler'] == $observer['handler'])
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			end($this->_observers);
+			$methods = array($observer['event']);
+		}
+		else
+		{
+			if (!($observer instanceof Editor))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this object as an observer
+			$class = get_class($observer);
+
+			foreach ($this->_observers as $check)
+			{
+				if ($check instanceof $class)
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			$methods = array_diff(get_class_methods($observer), get_class_methods('\JPlugin'));
+		}
+
+		$key = key($this->_observers);
+
+		foreach ($methods as $method)
+		{
+			$method = strtolower($method);
+
+			if (!isset($this->_methods[$method]))
+			{
+				$this->_methods[$method] = array();
+			}
+
+			$this->_methods[$method][] = $key;
+		}
+	}
+
+	/**
+	 * Detach an observer object
+	 *
+	 * @param   object  $observer  An observer object to detach.
+	 *
+	 * @return  boolean  True if the observer object was detached.
+	 *
+	 * @since   2.5
+	 */
+	public function detach($observer)
+	{
+		$retval = false;
+
+		$key = array_search($observer, $this->_observers);
+
+		if ($key !== false)
+		{
+			unset($this->_observers[$key]);
+			$retval = true;
+
+			foreach ($this->_methods as &$method)
+			{
+				$k = array_search($key, $method);
+
+				if ($k !== false)
+				{
+					unset($method[$k]);
+				}
+			}
+		}
+
+		return $retval;
+	}
+}
diff --git a/core/libraries/src/Categories/Categories.php b/core/libraries/src/Categories/Categories.php
new file mode 100644
index 00000000..d9bf9032
--- /dev/null
+++ b/core/libraries/src/Categories/Categories.php
@@ -0,0 +1,391 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Categories;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Multilanguage;
+
+/**
+ * Categories Class.
+ *
+ * @since  1.6
+ */
+class Categories
+{
+	/**
+	 * Array to hold the object instances
+	 *
+	 * @var    Categories[]
+	 * @since  1.6
+	 */
+	public static $instances = array();
+
+	/**
+	 * Array of category nodes
+	 *
+	 * @var    CategoryNode[]
+	 * @since  1.6
+	 */
+	protected $_nodes;
+
+	/**
+	 * Array of checked categories -- used to save values when _nodes are null
+	 *
+	 * @var    boolean[]
+	 * @since  1.6
+	 */
+	protected $_checkedCategories;
+
+	/**
+	 * Name of the extension the categories belong to
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $_extension = null;
+
+	/**
+	 * Name of the linked content table to get category content count
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $_table = null;
+
+	/**
+	 * Name of the category field
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $_field = null;
+
+	/**
+	 * Name of the key field
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $_key = null;
+
+	/**
+	 * Name of the items state field
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $_statefield = null;
+
+	/**
+	 * Array of options
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $_options = null;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($options)
+	{
+		$this->_extension  = $options['extension'];
+		$this->_table      = $options['table'];
+		$this->_field      = isset($options['field']) && $options['field'] ? $options['field'] : 'catid';
+		$this->_key        = isset($options['key']) && $options['key'] ? $options['key'] : 'id';
+		$this->_statefield = isset($options['statefield']) ? $options['statefield'] : 'state';
+
+		$options['access']      = isset($options['access']) ? $options['access'] : 'true';
+		$options['published']   = isset($options['published']) ? $options['published'] : 1;
+		$options['countItems']  = isset($options['countItems']) ? $options['countItems'] : 0;
+		$options['currentlang'] = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : 0;
+
+		$this->_options = $options;
+	}
+
+	/**
+	 * Returns a reference to a Categories object
+	 *
+	 * @param   string  $extension  Name of the categories extension
+	 * @param   array   $options    An array of options
+	 *
+	 * @return  Categories|boolean  Categories object on success, boolean false if an object does not exist
+	 *
+	 * @since   1.6
+	 */
+	public static function getInstance($extension, $options = array())
+	{
+		$hash = md5(strtolower($extension) . serialize($options));
+
+		if (isset(self::$instances[$hash]))
+		{
+			return self::$instances[$hash];
+		}
+
+		$parts = explode('.', $extension);
+		$component = 'com_' . strtolower($parts[0]);
+		$section = count($parts) > 1 ? $parts[1] : '';
+		$classname = ucfirst(substr($component, 4)) . ucfirst($section) . 'Categories';
+
+		if (!class_exists($classname))
+		{
+			$path = JPATH_SITE . '/components/' . $component . '/helpers/category.php';
+
+			\JLoader::register($classname, $path);
+
+			if (!class_exists($classname))
+			{
+				return false;
+			}
+		}
+
+		self::$instances[$hash] = new $classname($options);
+
+		return self::$instances[$hash];
+	}
+
+	/**
+	 * Loads a specific category and all its children in a CategoryNode object
+	 *
+	 * @param   mixed    $id         an optional id integer or equal to 'root'
+	 * @param   boolean  $forceload  True to force  the _load method to execute
+	 *
+	 * @return  CategoryNode|null|boolean  CategoryNode object or null if $id is not valid
+	 *
+	 * @since   1.6
+	 */
+	public function get($id = 'root', $forceload = false)
+	{
+		if ($id !== 'root')
+		{
+			$id = (int) $id;
+
+			if ($id == 0)
+			{
+				$id = 'root';
+			}
+		}
+
+		// If this $id has not been processed yet, execute the _load method
+		if ((!isset($this->_nodes[$id]) && !isset($this->_checkedCategories[$id])) || $forceload)
+		{
+			$this->_load($id);
+		}
+
+		// If we already have a value in _nodes for this $id, then use it.
+		if (isset($this->_nodes[$id]))
+		{
+			return $this->_nodes[$id];
+		}
+		// If we processed this $id already and it was not valid, then return null.
+		elseif (isset($this->_checkedCategories[$id]))
+		{
+			return;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Load method
+	 *
+	 * @param   integer  $id  Id of category to load
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function _load($id)
+	{
+		/** @var JDatabaseDriver */
+		$db   = Factory::getDbo();
+		$app  = Factory::getApplication();
+		$user = Factory::getUser();
+		$extension = $this->_extension;
+
+		// Record that has this $id has been checked
+		$this->_checkedCategories[$id] = true;
+
+		$query = $db->getQuery(true)
+			->select('c.id, c.asset_id, c.access, c.alias, c.checked_out, c.checked_out_time,
+				c.created_time, c.created_user_id, c.description, c.extension, c.hits, c.language, c.level,
+				c.lft, c.metadata, c.metadesc, c.metakey, c.modified_time, c.note, c.params, c.parent_id,
+				c.path, c.published, c.rgt, c.title, c.modified_user_id, c.version'
+			);
+
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('c.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $c_id . ' END as slug';
+
+		$query->select($case_when)
+			->where('(c.extension=' . $db->quote($extension) . ' OR c.extension=' . $db->quote('system') . ')');
+
+		if ($this->_options['access'])
+		{
+			$query->where('c.access IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')');
+		}
+
+		if ($this->_options['published'] == 1)
+		{
+			$query->where('c.published = 1');
+		}
+
+		$query->order('c.lft');
+
+		// Note: s for selected id
+		if ($id != 'root')
+		{
+			// Get the selected category
+			$query->from($db->quoteName('#__categories', 's'))
+				->where('s.id = ' . (int) $id);
+
+			if ($app->isClient('site') && Multilanguage::isEnabled())
+			{
+				// For the most part, we use c.lft column, which index is properly used instead of c.rgt
+				$query->innerJoin(
+					$db->quoteName('#__categories', 'c')
+					. ' ON (s.lft < c.lft AND c.lft < s.rgt AND c.language IN ('
+					. $db->quote(Factory::getLanguage()->getTag()) . ',' . $db->quote('*') . '))'
+					. ' OR (c.lft <= s.lft AND s.rgt <= c.rgt)'
+				);
+			}
+			else
+			{
+				$query->innerJoin(
+					$db->quoteName('#__categories', 'c')
+					. ' ON (s.lft <= c.lft AND c.lft < s.rgt)'
+					. ' OR (c.lft < s.lft AND s.rgt < c.rgt)'
+				);
+			}
+		}
+		else
+		{
+			$query->from($db->quoteName('#__categories', 'c'));
+
+			if ($app->isClient('site') && Multilanguage::isEnabled())
+			{
+				$query->where('c.language IN (' . $db->quote(Factory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+			}
+		}
+
+		// Note: i for item
+		if ($this->_options['countItems'] == 1)
+		{
+			$subQuery = $db->getQuery(true)
+				->select('COUNT(i.' . $db->quoteName($this->_key) . ')')
+				->from($db->quoteName($this->_table, 'i'))
+				->where('i.' . $db->quoteName($this->_field) . ' = c.id');
+
+			if ($this->_options['published'] == 1)
+			{
+				$subQuery->where('i.' . $this->_statefield . ' = 1');
+			}
+
+			if ($this->_options['currentlang'] !== 0)
+			{
+				$subQuery->where('(i.language = ' . $db->quote('*')
+					. ' OR i.language = ' . $db->quote($this->_options['currentlang']) . ')'
+				);
+			}
+
+			$query->select('(' . $subQuery . ') AS numitems');
+		}
+
+		// Get the results
+		$db->setQuery($query);
+		$results = $db->loadObjectList('id');
+		$childrenLoaded = false;
+
+		if (count($results))
+		{
+			// Foreach categories
+			foreach ($results as $result)
+			{
+				// Deal with root category
+				if ($result->id == 1)
+				{
+					$result->id = 'root';
+				}
+
+				// Deal with parent_id
+				if ($result->parent_id == 1)
+				{
+					$result->parent_id = 'root';
+				}
+
+				// Create the node
+				if (!isset($this->_nodes[$result->id]))
+				{
+					// Create the CategoryNode and add to _nodes
+					$this->_nodes[$result->id] = new CategoryNode($result, $this);
+
+					// If this is not root and if the current node's parent is in the list or the current node parent is 0
+					if ($result->id != 'root' && (isset($this->_nodes[$result->parent_id]) || $result->parent_id == 1))
+					{
+						// Compute relationship between node and its parent - set the parent in the _nodes field
+						$this->_nodes[$result->id]->setParent($this->_nodes[$result->parent_id]);
+					}
+
+					// If the node's parent id is not in the _nodes list and the node is not root (doesn't have parent_id == 0),
+					// then remove the node from the list
+					if (!(isset($this->_nodes[$result->parent_id]) || $result->parent_id == 0))
+					{
+						unset($this->_nodes[$result->id]);
+						continue;
+					}
+
+					if ($result->id == $id || $childrenLoaded)
+					{
+						$this->_nodes[$result->id]->setAllLoaded();
+						$childrenLoaded = true;
+					}
+				}
+				elseif ($result->id == $id || $childrenLoaded)
+				{
+					// Create the CategoryNode
+					$this->_nodes[$result->id] = new CategoryNode($result, $this);
+
+					if ($result->id != 'root' && (isset($this->_nodes[$result->parent_id]) || $result->parent_id))
+					{
+						// Compute relationship between node and its parent
+						$this->_nodes[$result->id]->setParent($this->_nodes[$result->parent_id]);
+					}
+
+					// If the node's parent id is not in the _nodes list and the node is not root (doesn't have parent_id == 0),
+					// then remove the node from the list
+					if (!(isset($this->_nodes[$result->parent_id]) || $result->parent_id == 0))
+					{
+						unset($this->_nodes[$result->id]);
+						continue;
+					}
+
+					if ($result->id == $id || $childrenLoaded)
+					{
+						$this->_nodes[$result->id]->setAllLoaded();
+						$childrenLoaded = true;
+					}
+				}
+			}
+		}
+		else
+		{
+			$this->_nodes[$id] = null;
+		}
+	}
+}
diff --git a/core/libraries/src/Categories/CategoryNode.php b/core/libraries/src/Categories/CategoryNode.php
new file mode 100644
index 00000000..d72ad071
--- /dev/null
+++ b/core/libraries/src/Categories/CategoryNode.php
@@ -0,0 +1,643 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Categories;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Helper class to load Categorytree
+ *
+ * @since  1.6
+ */
+class CategoryNode extends \JObject
+{
+	/**
+	 * Primary key
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $id = null;
+
+	/**
+	 * The id of the category in the asset table
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $asset_id = null;
+
+	/**
+	 * The id of the parent of category in the asset table, 0 for category root
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $parent_id = null;
+
+	/**
+	 * The lft value for this category in the category tree
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $lft = null;
+
+	/**
+	 * The rgt value for this category in the category tree
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $rgt = null;
+
+	/**
+	 * The depth of this category's position in the category tree
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $level = null;
+
+	/**
+	 * The extension this category is associated with
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $extension = null;
+
+	/**
+	 * The menu title for the category (a short name)
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $title = null;
+
+	/**
+	 * The the alias for the category
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $alias = null;
+
+	/**
+	 * Description of the category.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $description = null;
+
+	/**
+	 * The publication status of the category
+	 *
+	 * @var    boolean
+	 * @since  1.6
+	 */
+	public $published = null;
+
+	/**
+	 * Whether the category is or is not checked out
+	 *
+	 * @var    boolean
+	 * @since  1.6
+	 */
+	public $checked_out = 0;
+
+	/**
+	 * The time at which the category was checked out
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $checked_out_time = 0;
+
+	/**
+	 * Access level for the category
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $access = null;
+
+	/**
+	 * JSON string of parameters
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $params = null;
+
+	/**
+	 * Metadata description
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $metadesc = null;
+
+	/**
+	 * Key words for metadata
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $metakey = null;
+
+	/**
+	 * JSON string of other metadata
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $metadata = null;
+
+	/**
+	 * The ID of the user who created the category
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $created_user_id = null;
+
+	/**
+	 * The time at which the category was created
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $created_time = null;
+
+	/**
+	 * The ID of the user who last modified the category
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $modified_user_id = null;
+
+	/**
+	 * The time at which the category was modified
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $modified_time = null;
+
+	/**
+	 * Nmber of times the category has been viewed
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $hits = null;
+
+	/**
+	 * The language for the category in xx-XX format
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $language = null;
+
+	/**
+	 * Number of items in this category or descendants of this category
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $numitems = null;
+
+	/**
+	 * Number of children items
+	 *
+	 * @var    integer
+	 * @since  1.6
+	 */
+	public $childrennumitems = null;
+
+	/**
+	 * Slug fo the category (used in URL)
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $slug = null;
+
+	/**
+	 * Array of  assets
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	public $assets = null;
+
+	/**
+	 * Parent Category object
+	 *
+	 * @var    CategoryNode
+	 * @since  1.6
+	 */
+	protected $_parent = null;
+
+	/**
+	 * Array of Children
+	 *
+	 * @var    CategoryNode[]
+	 * @since  1.6
+	 */
+	protected $_children = array();
+
+	/**
+	 * Path from root to this category
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $_path = array();
+
+	/**
+	 * Category left of this one
+	 *
+	 * @var    CategoryNode
+	 * @since  1.6
+	 */
+	protected $_leftSibling = null;
+
+	/**
+	 * Category right of this one
+	 *
+	 * @var    CategoryNode
+	 * @since  1.6
+	 */
+	protected $_rightSibling = null;
+
+	/**
+	 * Flag if all children have been loaded
+	 *
+	 * @var    boolean
+	 * @since  1.6
+	 */
+	protected $_allChildrenloaded = false;
+
+	/**
+	 * Constructor of this tree
+	 *
+	 * @var    CategoryNode
+	 * @since  1.6
+	 */
+	protected $_constructor = null;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array         $category     The category data.
+	 * @param   CategoryNode  $constructor  The tree constructor.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct($category = null, $constructor = null)
+	{
+		if ($category)
+		{
+			$this->setProperties($category);
+
+			if ($constructor)
+			{
+				$this->_constructor = $constructor;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set the parent of this category
+	 *
+	 * If the category already has a parent, the link is unset
+	 *
+	 * @param   CategoryNode|null  $parent  CategoryNode for the parent to be set or null
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function setParent($parent)
+	{
+		if ($parent instanceof CategoryNode || is_null($parent))
+		{
+			if (!is_null($this->_parent))
+			{
+				$key = array_search($this, $this->_parent->_children);
+				unset($this->_parent->_children[$key]);
+			}
+
+			if (!is_null($parent))
+			{
+				$parent->_children[] = & $this;
+			}
+
+			$this->_parent = $parent;
+
+			if ($this->id != 'root')
+			{
+				if ($this->parent_id != 1)
+				{
+					$this->_path = $parent->getPath();
+				}
+
+				$this->_path[$this->id] = $this->id . ':' . $this->alias;
+			}
+
+			if (count($parent->_children) > 1)
+			{
+				end($parent->_children);
+				$this->_leftSibling = prev($parent->_children);
+				$this->_leftSibling->_rightsibling = & $this;
+			}
+		}
+	}
+
+	/**
+	 * Add child to this node
+	 *
+	 * If the child already has a parent, the link is unset
+	 *
+	 * @param   CategoryNode  $child  The child to be added.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function addChild($child)
+	{
+		if ($child instanceof CategoryNode)
+		{
+			$child->setParent($this);
+		}
+	}
+
+	/**
+	 * Remove a specific child
+	 *
+	 * @param   integer  $id  ID of a category
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function removeChild($id)
+	{
+		$key = array_search($this, $this->_parent->_children);
+		unset($this->_parent->_children[$key]);
+	}
+
+	/**
+	 * Get the children of this node
+	 *
+	 * @param   boolean  $recursive  False by default
+	 *
+	 * @return  CategoryNode[]  The children
+	 *
+	 * @since   1.6
+	 */
+	public function &getChildren($recursive = false)
+	{
+		if (!$this->_allChildrenloaded)
+		{
+			$temp = $this->_constructor->get($this->id, true);
+
+			if ($temp)
+			{
+				$this->_children = $temp->getChildren();
+				$this->_leftSibling = $temp->getSibling(false);
+				$this->_rightSibling = $temp->getSibling(true);
+				$this->setAllLoaded();
+			}
+		}
+
+		if ($recursive)
+		{
+			$items = array();
+
+			foreach ($this->_children as $child)
+			{
+				$items[] = $child;
+				$items = array_merge($items, $child->getChildren(true));
+			}
+
+			return $items;
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Get the parent of this node
+	 *
+	 * @return  CategoryNode
+	 *
+	 * @since   1.6
+	 */
+	public function getParent()
+	{
+		return $this->_parent;
+	}
+
+	/**
+	 * Test if this node has children
+	 *
+	 * @return  boolean  True if there is a child
+	 *
+	 * @since   1.6
+	 */
+	public function hasChildren()
+	{
+		return count($this->_children);
+	}
+
+	/**
+	 * Test if this node has a parent
+	 *
+	 * @return  boolean  True if there is a parent
+	 *
+	 * @since   1.6
+	 */
+	public function hasParent()
+	{
+		return $this->getParent() != null;
+	}
+
+	/**
+	 * Function to set the left or right sibling of a category
+	 *
+	 * @param   CategoryNode  $sibling  CategoryNode object for the sibling
+	 * @param   boolean       $right    If set to false, the sibling is the left one
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function setSibling($sibling, $right = true)
+	{
+		if ($right)
+		{
+			$this->_rightSibling = $sibling;
+		}
+		else
+		{
+			$this->_leftSibling = $sibling;
+		}
+	}
+
+	/**
+	 * Returns the right or left sibling of a category
+	 *
+	 * @param   boolean  $right  If set to false, returns the left sibling
+	 *
+	 * @return  CategoryNode|null  CategoryNode object with the sibling information or null if there is no sibling on that side.
+	 *
+	 * @since   1.6
+	 */
+	public function getSibling($right = true)
+	{
+		if (!$this->_allChildrenloaded)
+		{
+			$temp = $this->_constructor->get($this->id, true);
+			$this->_children = $temp->getChildren();
+			$this->_leftSibling = $temp->getSibling(false);
+			$this->_rightSibling = $temp->getSibling(true);
+			$this->setAllLoaded();
+		}
+
+		if ($right)
+		{
+			return $this->_rightSibling;
+		}
+		else
+		{
+			return $this->_leftSibling;
+		}
+	}
+
+	/**
+	 * Returns the category parameters
+	 *
+	 * @return  Registry
+	 *
+	 * @since   1.6
+	 */
+	public function getParams()
+	{
+		if (!($this->params instanceof Registry))
+		{
+			$this->params = new Registry($this->params);
+		}
+
+		return $this->params;
+	}
+
+	/**
+	 * Returns the category metadata
+	 *
+	 * @return  Registry  A Registry object containing the metadata
+	 *
+	 * @since   1.6
+	 */
+	public function getMetadata()
+	{
+		if (!($this->metadata instanceof Registry))
+		{
+			$this->metadata = new Registry($this->metadata);
+		}
+
+		return $this->metadata;
+	}
+
+	/**
+	 * Returns the category path to the root category
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getPath()
+	{
+		return $this->_path;
+	}
+
+	/**
+	 * Returns the user that created the category
+	 *
+	 * @param   boolean  $modified_user  Returns the modified_user when set to true
+	 *
+	 * @return  \JUser  A \JUser object containing a userid
+	 *
+	 * @since   1.6
+	 */
+	public function getAuthor($modified_user = false)
+	{
+		if ($modified_user)
+		{
+			return \JFactory::getUser($this->modified_user_id);
+		}
+
+		return \JFactory::getUser($this->created_user_id);
+	}
+
+	/**
+	 * Set to load all children
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function setAllLoaded()
+	{
+		$this->_allChildrenloaded = true;
+
+		foreach ($this->_children as $child)
+		{
+			$child->setAllLoaded();
+		}
+	}
+
+	/**
+	 * Returns the number of items.
+	 *
+	 * @param   boolean  $recursive  If false number of children, if true number of descendants
+	 *
+	 * @return  integer  Number of children or descendants
+	 *
+	 * @since   1.6
+	 */
+	public function getNumItems($recursive = false)
+	{
+		if ($recursive)
+		{
+			$count = $this->numitems;
+
+			foreach ($this->getChildren() as $child)
+			{
+				$count = $count + $child->getNumItems(true);
+			}
+
+			return $count;
+		}
+
+		return $this->numitems;
+	}
+}
diff --git a/core/libraries/src/Client/ClientHelper.php b/core/libraries/src/Client/ClientHelper.php
new file mode 100644
index 00000000..37983fd3
--- /dev/null
+++ b/core/libraries/src/Client/ClientHelper.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Client;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Client helper class
+ *
+ * @since  11.1
+ */
+class ClientHelper
+{
+	/**
+	 * Method to return the array of client layer configuration options
+	 *
+	 * @param   string   $client  Client name, currently only 'ftp' is supported
+	 * @param   boolean  $force   Forces re-creation of the login credentials. Set this to
+	 *                            true if login credentials in the session storage have changed
+	 *
+	 * @return  array    Client layer configuration options, consisting of at least
+	 *                   these fields: enabled, host, port, user, pass, root
+	 *
+	 * @since   11.1
+	 */
+	public static function getCredentials($client, $force = false)
+	{
+		static $credentials = array();
+
+		$client = strtolower($client);
+
+		if (!isset($credentials[$client]) || $force)
+		{
+			$config = \JFactory::getConfig();
+
+			// Fetch the client layer configuration options for the specific client
+			switch ($client)
+			{
+				case 'ftp':
+					$options = array(
+						'enabled' => $config->get('ftp_enable'),
+						'host' => $config->get('ftp_host'),
+						'port' => $config->get('ftp_port'),
+						'user' => $config->get('ftp_user'),
+						'pass' => $config->get('ftp_pass'),
+						'root' => $config->get('ftp_root'),
+					);
+					break;
+
+				default:
+					$options = array('enabled' => false, 'host' => '', 'port' => '', 'user' => '', 'pass' => '', 'root' => '');
+					break;
+			}
+
+			// If user and pass are not set in global config lets see if they are in the session
+			if ($options['enabled'] == true && ($options['user'] == '' || $options['pass'] == ''))
+			{
+				$session = \JFactory::getSession();
+				$options['user'] = $session->get($client . '.user', null, 'JClientHelper');
+				$options['pass'] = $session->get($client . '.pass', null, 'JClientHelper');
+			}
+
+			// If user or pass are missing, disable this client
+			if ($options['user'] == '' || $options['pass'] == '')
+			{
+				$options['enabled'] = false;
+			}
+
+			// Save the credentials for later use
+			$credentials[$client] = $options;
+		}
+
+		return $credentials[$client];
+	}
+
+	/**
+	 * Method to set client login credentials
+	 *
+	 * @param   string  $client  Client name, currently only 'ftp' is supported
+	 * @param   string  $user    Username
+	 * @param   string  $pass    Password
+	 *
+	 * @return  boolean  True if the given login credentials have been set and are valid
+	 *
+	 * @since   11.1
+	 */
+	public static function setCredentials($client, $user, $pass)
+	{
+		$return = false;
+		$client = strtolower($client);
+
+		// Test if the given credentials are valid
+		switch ($client)
+		{
+			case 'ftp':
+				$config = \JFactory::getConfig();
+				$options = array('enabled' => $config->get('ftp_enable'), 'host' => $config->get('ftp_host'), 'port' => $config->get('ftp_port'));
+
+				if ($options['enabled'])
+				{
+					$ftp = FtpClient::getInstance($options['host'], $options['port']);
+
+					// Test the connection and try to log in
+					if ($ftp->isConnected())
+					{
+						if ($ftp->login($user, $pass))
+						{
+							$return = true;
+						}
+
+						$ftp->quit();
+					}
+				}
+				break;
+
+			default:
+				break;
+		}
+
+		if ($return)
+		{
+			// Save valid credentials to the session
+			$session = \JFactory::getSession();
+			$session->set($client . '.user', $user, 'JClientHelper');
+			$session->set($client . '.pass', $pass, 'JClientHelper');
+
+			// Force re-creation of the data saved within JClientHelper::getCredentials()
+			self::getCredentials($client, true);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to determine if client login credentials are present
+	 *
+	 * @param   string  $client  Client name, currently only 'ftp' is supported
+	 *
+	 * @return  boolean  True if login credentials are available
+	 *
+	 * @since   11.1
+	 */
+	public static function hasCredentials($client)
+	{
+		$return = false;
+		$client = strtolower($client);
+
+		// Get (unmodified) credentials for this client
+		switch ($client)
+		{
+			case 'ftp':
+				$config = \JFactory::getConfig();
+				$options = array('enabled' => $config->get('ftp_enable'), 'user' => $config->get('ftp_user'), 'pass' => $config->get('ftp_pass'));
+				break;
+
+			default:
+				$options = array('enabled' => false, 'user' => '', 'pass' => '');
+				break;
+		}
+
+		if ($options['enabled'] == false)
+		{
+			// The client is disabled in global config, so let's pretend we are OK
+			$return = true;
+		}
+		elseif ($options['user'] != '' && $options['pass'] != '')
+		{
+			// Login credentials are available in global config
+			$return = true;
+		}
+		else
+		{
+			// Check if login credentials are available in the session
+			$session = \JFactory::getSession();
+			$user = $session->get($client . '.user', null, 'JClientHelper');
+			$pass = $session->get($client . '.pass', null, 'JClientHelper');
+
+			if ($user != '' && $pass != '')
+			{
+				$return = true;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Determine whether input fields for client settings need to be shown
+	 *
+	 * If valid credentials were passed along with the request, they are saved to the session.
+	 * This functions returns an exception if invalid credentials have been given or if the
+	 * connection to the server failed for some other reason.
+	 *
+	 * @param   string  $client  The name of the client.
+	 *
+	 * @return  mixed  True, if FTP settings; JError if using legacy tree.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException if credentials invalid
+	 */
+	public static function setCredentialsFromRequest($client)
+	{
+		// Determine whether FTP credentials have been passed along with the current request
+		$input = \JFactory::getApplication()->input;
+		$user = $input->post->getString('username', null);
+		$pass = $input->post->getString('password', null);
+
+		if ($user != '' && $pass != '')
+		{
+			// Add credentials to the session
+			if (self::setCredentials($client, $user, $pass))
+			{
+				$return = false;
+			}
+			else
+			{
+				if (class_exists('JError'))
+				{
+					$return = \JError::raiseWarning(500, \JText::_('JLIB_CLIENT_ERROR_HELPER_SETCREDENTIALSFROMREQUEST_FAILED'));
+				}
+				else
+				{
+					throw new \InvalidArgumentException('Invalid user credentials');
+				}
+			}
+		}
+		else
+		{
+			// Just determine if the FTP input fields need to be shown
+			$return = !self::hasCredentials('ftp');
+		}
+
+		return $return;
+	}
+}
diff --git a/core/libraries/src/Client/ClientWrapper.php b/core/libraries/src/Client/ClientWrapper.php
new file mode 100644
index 00000000..cc332ac9
--- /dev/null
+++ b/core/libraries/src/Client/ClientWrapper.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Client;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for ClientHelper
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Client
+ * @since       3.4
+ * @deprecated  4.0 Will be removed without replacement
+ */
+class ClientWrapper
+{
+	/**
+	 * Helper wrapper method for getCredentials
+	 *
+	 * @param   string   $client  Client name, currently only 'ftp' is supported
+	 * @param   boolean  $force   Forces re-creation of the login credentials. Set this to
+	 *
+	 * @return  array    Client layer configuration options, consisting of at least
+	 *
+	 * @see     ClientHelper::getCredentials()
+	 * @since   3.4
+	 */
+	public function getCredentials($client, $force = false)
+	{
+		return ClientHelper::getCredentials($client, $force);
+	}
+
+	/**
+	 * Helper wrapper method for setCredentials
+	 *
+	 * @param   string  $client  Client name, currently only 'ftp' is supported
+	 * @param   string  $user    Username
+	 * @param   string  $pass    Password
+	 *
+	 * @return boolean  True if the given login credentials have been set and are valid
+	 *
+	 * @see     ClientHelper::setCredentials()
+	 * @since   3.4
+	 */
+	public function setCredentials($client, $user, $pass)
+	{
+		return ClientHelper::setCredentials($client, $user, $pass);
+	}
+
+	/**
+	 * Helper wrapper method for hasCredentials
+	 *
+	 * @param   string  $client  Client name, currently only 'ftp' is supported
+	 *
+	 * @return boolean  True if login credentials are available
+	 *
+	 * @see     ClientHelper::hasCredentials()
+	 * @since   3.4
+	 */
+	public function hasCredentials($client)
+	{
+		return ClientHelper::hasCredentials($client);
+	}
+
+	/**
+	 * Helper wrapper method for setCredentialsFromRequest
+	 *
+	 * @param   string  $client  The name of the client.
+	 *
+	 * @return  mixed  True, if FTP settings; JError if using legacy tree
+	 *
+	 * @see     UserHelper::setCredentialsFromRequest()
+	 * @since   3.4
+	 * @throws  \InvalidArgumentException if credentials invalid
+	 */
+	public function setCredentialsFromRequest($client)
+	{
+		return ClientHelper::setCredentialsFromRequest($client);
+	}
+}
diff --git a/core/libraries/src/Client/FtpClient.php b/core/libraries/src/Client/FtpClient.php
new file mode 100644
index 00000000..d740fbbc
--- /dev/null
+++ b/core/libraries/src/Client/FtpClient.php
@@ -0,0 +1,1943 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Client;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Utility\BufferStreamHandler;
+
+/** Error Codes:
+ * - 30 : Unable to connect to host
+ * - 31 : Not connected
+ * - 32 : Unable to send command to server
+ * - 33 : Bad username
+ * - 34 : Bad password
+ * - 35 : Bad response
+ * - 36 : Passive mode failed
+ * - 37 : Data transfer error
+ * - 38 : Local filesystem error
+ */
+
+if (!defined('CRLF'))
+{
+	define('CRLF', "\r\n");
+}
+
+if (!defined('FTP_AUTOASCII'))
+{
+	define('FTP_AUTOASCII', -1);
+}
+
+if (!defined('FTP_BINARY'))
+{
+	define('FTP_BINARY', 1);
+}
+
+if (!defined('FTP_ASCII'))
+{
+	define('FTP_ASCII', 0);
+}
+
+if (!defined('FTP_NATIVE'))
+{
+	define('FTP_NATIVE', (function_exists('ftp_connect')) ? 1 : 0);
+}
+
+/**
+ * FTP client class
+ *
+ * @since  12.1
+ */
+class FtpClient
+{
+	/**
+	 * @var    resource  Socket resource
+	 * @since  12.1
+	 */
+	protected $_conn = null;
+
+	/**
+	 * @var    resource  Data port connection resource
+	 * @since  12.1
+	 */
+	protected $_dataconn = null;
+
+	/**
+	 * @var    array  Passive connection information
+	 * @since  12.1
+	 */
+	protected $_pasv = null;
+
+	/**
+	 * @var    string  Response Message
+	 * @since  12.1
+	 */
+	protected $_response = null;
+
+	/**
+	 * @var    integer  Timeout limit
+	 * @since  12.1
+	 */
+	protected $_timeout = 15;
+
+	/**
+	 * @var    integer  Transfer Type
+	 * @since  12.1
+	 */
+	protected $_type = null;
+
+	/**
+	 * @var    array  Array to hold ascii format file extensions
+	 * @since  12.1
+	 */
+	protected $_autoAscii = array(
+		'asp',
+		'bat',
+		'c',
+		'cpp',
+		'csv',
+		'h',
+		'htm',
+		'html',
+		'shtml',
+		'ini',
+		'inc',
+		'log',
+		'php',
+		'php3',
+		'pl',
+		'perl',
+		'sh',
+		'sql',
+		'txt',
+		'xhtml',
+		'xml',
+	);
+
+	/**
+	 * Array to hold native line ending characters
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $_lineEndings = array('UNIX' => "\n", 'WIN' => "\r\n");
+
+	/**
+	 * @var    array  FtpClient instances container.
+	 * @since  12.1
+	 */
+	protected static $instances = array();
+
+	/**
+	 * FtpClient object constructor
+	 *
+	 * @param   array  $options  Associative array of options to set
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(array $options = array())
+	{
+		// If default transfer type is not set, set it to autoascii detect
+		if (!isset($options['type']))
+		{
+			$options['type'] = FTP_BINARY;
+		}
+
+		$this->setOptions($options);
+
+		if (FTP_NATIVE)
+		{
+			BufferStreamHandler::stream_register();
+		}
+	}
+
+	/**
+	 * FtpClient object destructor
+	 *
+	 * Closes an existing connection, if we have one
+	 *
+	 * @since   12.1
+	 */
+	public function __destruct()
+	{
+		if (is_resource($this->_conn))
+		{
+			$this->quit();
+		}
+	}
+
+	/**
+	 * Returns the global FTP connector object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * You may optionally specify a username and password in the parameters. If you do so,
+	 * you may not login() again with different credentials using the same object.
+	 * If you do not use this option, you must quit() the current connection when you
+	 * are done, to free it for use by others.
+	 *
+	 * @param   string  $host     Host to connect to
+	 * @param   string  $port     Port to connect to
+	 * @param   array   $options  Array with any of these options: type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY], timeout=>(int)
+	 * @param   string  $user     Username to use for a connection
+	 * @param   string  $pass     Password to use for a connection
+	 *
+	 * @return  FtpClient        The FTP Client object.
+	 *
+	 * @since   12.1
+	 */
+	public static function getInstance($host = '127.0.0.1', $port = '21', array $options = array(), $user = null, $pass = null)
+	{
+		$signature = $user . ':' . $pass . '@' . $host . ':' . $port;
+
+		// Create a new instance, or set the options of an existing one
+		if (!isset(static::$instances[$signature]) || !is_object(static::$instances[$signature]))
+		{
+			static::$instances[$signature] = new static($options);
+		}
+		else
+		{
+			static::$instances[$signature]->setOptions($options);
+		}
+
+		// Connect to the server, and login, if requested
+		if (!static::$instances[$signature]->isConnected())
+		{
+			$return = static::$instances[$signature]->connect($host, $port);
+
+			if ($return && $user !== null && $pass !== null)
+			{
+				static::$instances[$signature]->login($user, $pass);
+			}
+		}
+
+		return static::$instances[$signature];
+	}
+
+	/**
+	 * Set client options
+	 *
+	 * @param   array  $options  Associative array of options to set
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function setOptions(array $options)
+	{
+		if (isset($options['type']))
+		{
+			$this->_type = $options['type'];
+		}
+
+		if (isset($options['timeout']))
+		{
+			$this->_timeout = $options['timeout'];
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to connect to a FTP server
+	 *
+	 * @param   string  $host  Host to connect to [Default: 127.0.0.1]
+	 * @param   string  $port  Port to connect on [Default: port 21]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function connect($host = '127.0.0.1', $port = 21)
+	{
+		$errno = null;
+		$err = null;
+
+		// If already connected, return
+		if (is_resource($this->_conn))
+		{
+			return true;
+		}
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			$this->_conn = @ftp_connect($host, $port, $this->_timeout);
+
+			if ($this->_conn === false)
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_NO_CONNECT', $host, $port), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			// Set the timeout for this connection
+			ftp_set_option($this->_conn, FTP_TIMEOUT_SEC, $this->_timeout);
+
+			return true;
+		}
+
+		// Connect to the FTP server.
+		$this->_conn = @ fsockopen($host, $port, $errno, $err, $this->_timeout);
+
+		if (!$this->_conn)
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_NO_CONNECT_SOCKET', $host, $port, $errno, $err), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Set the timeout for this connection
+		socket_set_timeout($this->_conn, $this->_timeout, 0);
+
+		// Check for welcome response code
+		if (!$this->_verifyResponse(220))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_BAD_RESPONSE', $this->_response), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to determine if the object is connected to an FTP server
+	 *
+	 * @return  boolean  True if connected
+	 *
+	 * @since   12.1
+	 */
+	public function isConnected()
+	{
+		return is_resource($this->_conn);
+	}
+
+	/**
+	 * Method to login to a server once connected
+	 *
+	 * @param   string  $user  Username to login to the server
+	 * @param   string  $pass  Password to login to the server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_login($this->_conn, $user, $pass) === false)
+			{
+				Log::add('JFtp::login: Unable to login', Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send the username
+		if (!$this->_putCmd('USER ' . $user, array(331, 503)))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_BAD_USERNAME', $this->_response, $user), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// If we are already logged in, continue :)
+		if ($this->_responseCode == 503)
+		{
+			return true;
+		}
+
+		// Send the password
+		if (!$this->_putCmd('PASS ' . $pass, 230))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_BAD_PASSWORD', $this->_response, str_repeat('*', strlen($pass))), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to quit and close the connection
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function quit()
+	{
+		// If native FTP support is enabled lets use it...
+		if (FTP_NATIVE)
+		{
+			@ftp_close($this->_conn);
+
+			return true;
+		}
+
+		// Logout and close connection
+		@fwrite($this->_conn, "QUIT\r\n");
+		@fclose($this->_conn);
+
+		return true;
+	}
+
+	/**
+	 * Method to retrieve the current working directory on the FTP server
+	 *
+	 * @return  string   Current working directory
+	 *
+	 * @since   12.1
+	 */
+	public function pwd()
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (($ret = @ftp_pwd($this->_conn)) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_PWD_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return $ret;
+		}
+
+		$match = array(null);
+
+		// Send print working directory command and verify success
+		if (!$this->_putCmd('PWD', 257))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_PWD_BAD_RESPONSE', $this->_response), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Match just the path
+		preg_match('/"[^"\r\n]*"/', $this->_response, $match);
+
+		// Return the cleaned path
+		return preg_replace("/\"/", '', $match[0]);
+	}
+
+	/**
+	 * Method to system string from the FTP server
+	 *
+	 * @return  string   System identifier string
+	 *
+	 * @since   12.1
+	 */
+	public function syst()
+	{
+		// If native FTP support is enabled lets use it...
+		if (FTP_NATIVE)
+		{
+			if (($ret = @ftp_systype($this->_conn)) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_SYST_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+		else
+		{
+			// Send print working directory command and verify success
+			if (!$this->_putCmd('SYST', 215))
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_SYST_BAD_RESPONSE', $this->_response), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$ret = $this->_response;
+		}
+
+		// Match the system string to an OS
+		if (strpos(strtoupper($ret), 'MAC') !== false)
+		{
+			$ret = 'MAC';
+		}
+		elseif (strpos(strtoupper($ret), 'WIN') !== false)
+		{
+			$ret = 'WIN';
+		}
+		else
+		{
+			$ret = 'UNIX';
+		}
+
+		// Return the os type
+		return $ret;
+	}
+
+	/**
+	 * Method to change the current working directory on the FTP server
+	 *
+	 * @param   string  $path  Path to change into on the server
+	 *
+	 * @return  boolean True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function chdir($path)
+	{
+		// If native FTP support is enabled lets use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_chdir($this->_conn, $path) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_CHDIR_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send change directory command and verify success
+		if (!$this->_putCmd('CWD ' . $path, 250))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_CHDIR_BAD_RESPONSE', $this->_response, $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to reinitialise the server, ie. need to login again
+	 *
+	 * NOTE: This command not available on all servers
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function reinit()
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_site($this->_conn, 'REIN') === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_REINIT_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send reinitialise command to the server
+		if (!$this->_putCmd('REIN', 220))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_REINIT_BAD_RESPONSE', $this->_response), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to rename a file/folder on the FTP server
+	 *
+	 * @param   string  $from  Path to change file/folder from
+	 * @param   string  $to    Path to change file/folder to
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function rename($from, $to)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_rename($this->_conn, $from, $to) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send rename from command to the server
+		if (!$this->_putCmd('RNFR ' . $from, 350))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_FROM', $this->_response, $from), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Send rename to command to the server
+		if (!$this->_putCmd('RNTO ' . $to, 250))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_RENAME_BAD_RESPONSE_TO', $this->_response, $to), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to change mode for a path on the FTP server
+	 *
+	 * @param   string  $path  Path to change mode on
+	 * @param   mixed   $mode  Octal value to change mode to, e.g. '0777', 0777 or 511 (string or integer)
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function chmod($path, $mode)
+	{
+		// If no filename is given, we assume the current directory is the target
+		if ($path == '')
+		{
+			$path = '.';
+		}
+
+		// Convert the mode to a string
+		if (is_int($mode))
+		{
+			$mode = decoct($mode);
+		}
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_site($this->_conn, 'CHMOD ' . $mode . ' ' . $path) === false)
+			{
+				if (!IS_WIN)
+				{
+					Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+				}
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send change mode command and verify success [must convert mode from octal]
+		if (!$this->_putCmd('SITE CHMOD ' . $mode . ' ' . $path, array(200, 250)))
+		{
+			if (!IS_WIN)
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_CHMOD_BAD_RESPONSE', $this->_response, $path, $mode), Log::WARNING, 'jerror');
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to delete a path [file/folder] on the FTP server
+	 *
+	 * @param   string  $path  Path to delete
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function delete($path)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_delete($this->_conn, $path) === false)
+			{
+				if (@ftp_rmdir($this->_conn, $path) === false)
+				{
+					Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_DELETE_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		// Send delete file command and if that doesn't work, try to remove a directory
+		if (!$this->_putCmd('DELE ' . $path, 250))
+		{
+			if (!$this->_putCmd('RMD ' . $path, 250))
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_DELETE_BAD_RESPONSE', $this->_response, $path), Log::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to create a directory on the FTP server
+	 *
+	 * @param   string  $path  Directory to create
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function mkdir($path)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_mkdir($this->_conn, $path) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_MKDIR_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send change directory command and verify success
+		if (!$this->_putCmd('MKD ' . $path, 257))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_MKDIR_BAD_RESPONSE', $this->_response, $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to restart data transfer at a given byte
+	 *
+	 * @param   integer  $point  Byte to restart transfer at
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function restart($point)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_site($this->_conn, 'REST ' . $point) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_RESTART_BAD_RESPONSE_NATIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send restart command and verify success
+		if (!$this->_putCmd('REST ' . $point, 350))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_RESTART_BAD_RESPONSE', $this->_response, $point), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to create an empty file on the FTP server
+	 *
+	 * @param   string  $path  Path local file to store on the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function create($path)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$buffer = fopen('buffer://tmp', 'r');
+
+			if (@ftp_fput($this->_conn, $path, $buffer, FTP_ASCII) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_BUFFER'), Log::WARNING, 'jerror');
+				fclose($buffer);
+
+				return false;
+			}
+
+			fclose($buffer);
+
+			return true;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_PASSIVE'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (!$this->_putCmd('STOR ' . $path, array(150, 125)))
+		{
+			@ fclose($this->_dataconn);
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE', $this->_response, $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// To create a zero byte upload close the data port connection
+		fclose($this->_dataconn);
+
+		if (!$this->_verifyResponse(226))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_CREATE_BAD_RESPONSE_TRANSFER', $this->_response, $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to read a file from the FTP server's contents into a buffer
+	 *
+	 * @param   string  $remote   Path to remote file to read on the FTP server
+	 * @param   string  &$buffer  Buffer variable to read file contents into
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function read($remote, &$buffer)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$tmp = fopen('buffer://tmp', 'br+');
+
+			if (@ftp_fget($this->_conn, $tmp, $remote, $mode) === false)
+			{
+				fclose($tmp);
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_BUFFER'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			// Read tmp buffer contents
+			rewind($tmp);
+			$buffer = '';
+
+			while (!feof($tmp))
+			{
+				$buffer .= fread($tmp, 8192);
+			}
+
+			fclose($tmp);
+
+			return true;
+		}
+
+		$this->_mode($mode);
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_PASSIVE'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (!$this->_putCmd('RETR ' . $remote, array(150, 125)))
+		{
+			@ fclose($this->_dataconn);
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Read data from data port connection and add to the buffer
+		$buffer = '';
+
+		while (!feof($this->_dataconn))
+		{
+			$buffer .= fread($this->_dataconn, 4096);
+		}
+
+		// Close the data port connection
+		fclose($this->_dataconn);
+
+		// Let's try to cleanup some line endings if it is ascii
+		if ($mode == FTP_ASCII)
+		{
+			$os = 'UNIX';
+
+			if (IS_WIN)
+			{
+				$os = 'WIN';
+			}
+
+			$buffer = preg_replace('/' . CRLF . '/', $this->_lineEndings[$os], $buffer);
+		}
+
+		if (!$this->_verifyResponse(226))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_READ_BAD_RESPONSE_TRANSFER', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get a file from the FTP server and save it to a local file
+	 *
+	 * @param   string  $local   Local path to save remote file to
+	 * @param   string  $remote  Path to remote file to get on the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function get($local, $remote)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_GET_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			if (@ftp_get($this->_conn, $local, $remote, $mode) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		$this->_mode($mode);
+
+		// Check to see if the local file can be opened for writing
+		$fp = fopen($local, 'wb');
+
+		if (!$fp)
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_GET_WRITING_LOCAL', $local), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_GET_PASSIVE'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (!$this->_putCmd('RETR ' . $remote, array(150, 125)))
+		{
+			@ fclose($this->_dataconn);
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE_RETR', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Read data from data port connection and add to the buffer
+		while (!feof($this->_dataconn))
+		{
+			$buffer = fread($this->_dataconn, 4096);
+			fwrite($fp, $buffer, 4096);
+		}
+
+		// Close the data port connection and file pointer
+		fclose($this->_dataconn);
+		fclose($fp);
+
+		if (!$this->_verifyResponse(226))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_GET_BAD_RESPONSE_TRANSFER', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to store a file to the FTP server
+	 *
+	 * @param   string  $local   Path to local file to store on the FTP server
+	 * @param   string  $remote  FTP path to file to create
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function store($local, $remote = null)
+	{
+		// If remote file is not given, use the filename of the local file in the current
+		// working directory.
+		if ($remote == null)
+		{
+			$remote = basename($local);
+		}
+
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_STORE_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			if (@ftp_put($this->_conn, $remote, $local, $mode) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			return true;
+		}
+
+		$this->_mode($mode);
+
+		// Check to see if the local file exists and if so open it for reading
+		if (@ file_exists($local))
+		{
+			$fp = fopen($local, 'rb');
+
+			if (!$fp)
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_STORE_READING_LOCAL', $local), Log::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+		else
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_STORE_FIND_LOCAL', $local), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			@ fclose($fp);
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_STORE_PASSIVE'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Send store command to the FTP server
+		if (!$this->_putCmd('STOR ' . $remote, array(150, 125)))
+		{
+			@ fclose($fp);
+			@ fclose($this->_dataconn);
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE_STOR', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Do actual file transfer, read local file and write to data port connection
+		while (!feof($fp))
+		{
+			$line = fread($fp, 4096);
+
+			do
+			{
+				if (($result = @ fwrite($this->_dataconn, $line)) === false)
+				{
+					Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_STORE_DATA_PORT'), Log::WARNING, 'jerror');
+
+					return false;
+				}
+
+				$line = substr($line, $result);
+			}
+			while ($line != '');
+		}
+
+		fclose($fp);
+		fclose($this->_dataconn);
+
+		if (!$this->_verifyResponse(226))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_STORE_BAD_RESPONSE_TRANSFER', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to write a string to the FTP server
+	 *
+	 * @param   string  $remote  FTP path to file to write to
+	 * @param   string  $buffer  Contents to write to the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	public function write($remote, $buffer)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_WRITE_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$tmp = fopen('buffer://tmp', 'br+');
+			fwrite($tmp, $buffer);
+			rewind($tmp);
+
+			if (@ftp_fput($this->_conn, $remote, $tmp, $mode) === false)
+			{
+				fclose($tmp);
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			fclose($tmp);
+
+			return true;
+		}
+
+		// First we need to set the transfer mode
+		$this->_mode($mode);
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_WRITE_PASSIVE'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Send store command to the FTP server
+		if (!$this->_putCmd('STOR ' . $remote, array(150, 125)))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE_STOR', $this->_response, $remote), Log::WARNING, 'jerror');
+			@ fclose($this->_dataconn);
+
+			return false;
+		}
+
+		// Write buffer to the data connection port
+		do
+		{
+			if (($result = @ fwrite($this->_dataconn, $buffer)) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_WRITE_DATA_PORT'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$buffer = substr($buffer, $result);
+		}
+		while ($buffer != '');
+
+		// Close the data connection port [Data transfer complete]
+		fclose($this->_dataconn);
+
+		// Verify that the server received the transfer
+		if (!$this->_verifyResponse(226))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_WRITE_BAD_RESPONSE_TRANSFER', $this->_response, $remote), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to append a string to the FTP server
+	 *
+	 * @param   string  $remote  FTP path to file to append to
+	 * @param   string  $buffer  Contents to append to the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.6.0
+	 */
+	public function append($remote, $buffer)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				throw new \RuntimeException(\JText::_('JLIB_CLIENT_ERROR_JFTP_APPEND_PASSIVE'), 36);
+			}
+
+			$tmp = fopen('buffer://tmp', 'bw+');
+			fwrite($tmp, $buffer);
+			rewind($tmp);
+
+			$size = $this->size($remote);
+
+			if ($size === false)
+			{
+			}
+
+			if (@ftp_fput($this->_conn, $remote, $tmp, $mode, $size) === false)
+			{
+				fclose($tmp);
+
+				throw new \RuntimeException(\JText::_('JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE'), 35);
+			}
+
+			fclose($tmp);
+
+			return true;
+		}
+
+		// First we need to set the transfer mode
+		$this->_mode($mode);
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new \RuntimeException(\JText::_('JLIB_CLIENT_ERROR_JFTP_APPEND_PASSIVE'), 36);
+		}
+
+		// Send store command to the FTP server
+		if (!$this->_putCmd('APPE ' . $remote, array(150, 125)))
+		{
+			@fclose($this->_dataconn);
+
+			throw new \RuntimeException(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE_APPE', $this->_response, $remote), 35);
+		}
+
+		// Write buffer to the data connection port
+		do
+		{
+			if (($result = @ fwrite($this->_dataconn, $buffer)) === false)
+			{
+				throw new \RuntimeException(\JText::_('JLIB_CLIENT_ERROR_JFTP_APPEND_DATA_PORT'), 37);
+			}
+
+			$buffer = substr($buffer, $result);
+		}
+		while ($buffer != '');
+
+		// Close the data connection port [Data transfer complete]
+		fclose($this->_dataconn);
+
+		// Verify that the server received the transfer
+		if (!$this->_verifyResponse(226))
+		{
+			throw new \RuntimeException(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_APPEND_BAD_RESPONSE_TRANSFER', $this->_response, $remote), 37);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the size of the remote file.
+	 *
+	 * @param   string  $remote  FTP path to file whose size to get
+	 *
+	 * @return  mixed  number of bytes or false on error
+	 *
+	 * @since   3.6.0
+	 */
+	public function size($remote)
+	{
+		if (FTP_NATIVE)
+		{
+			$size = ftp_size($this->_conn, $remote);
+
+			// In case ftp_size fails, try the SIZE command directly.
+			if ($size === -1)
+			{
+				$response = ftp_raw($this->_conn, 'SIZE ' . $remote);
+				$responseCode = substr($response[0], 0, 3);
+				$responseMessage = substr($response[0], 4);
+
+				if ($responseCode != '213')
+				{
+					throw new \RuntimeException(\JText::_('JLIB_CLIENT_ERROR_JFTP_SIZE_BAD_RESPONSE'), 35);
+				}
+
+				$size = (int) $responseMessage;
+			}
+
+			return $size;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new \RuntimeException(\JText::_('JLIB_CLIENT_ERROR_JFTP_SIZE_PASSIVE'), 36);
+		}
+
+		// Send size command to the FTP server
+		if (!$this->_putCmd('SIZE ' . $remote, array(213)))
+		{
+			@fclose($this->_dataconn);
+
+			throw new \RuntimeException(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_SIZE_BAD_RESPONSE', $this->_response, $remote), 35);
+		}
+
+		return (int) substr($this->_responseMsg, 4);
+	}
+
+	/**
+	 * Method to list the filenames of the contents of a directory on the FTP server
+	 *
+	 * Note: Some servers also return folder names. However, to be sure to list folders on all
+	 * servers, you should use listDetails() instead if you also need to deal with folders
+	 *
+	 * @param   string  $path  Path local file to store on the FTP server
+	 *
+	 * @return  string  Directory listing
+	 *
+	 * @since   12.1
+	 */
+	public function listNames($path = null)
+	{
+		$data = null;
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			if (($list = @ftp_nlist($this->_conn, $path)) === false)
+			{
+				// Workaround for empty directories on some servers
+				if ($this->listDetails($path, 'files') === array())
+				{
+					return array();
+				}
+
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$list = preg_replace('#^' . preg_quote($path, '#') . '[/\\\\]?#', '', $list);
+
+			if ($keys = array_merge(array_keys($list, '.'), array_keys($list, '..')))
+			{
+				foreach ($keys as $key)
+				{
+					unset($list[$key]);
+				}
+			}
+
+			return $list;
+		}
+
+		// If a path exists, prepend a space
+		if ($path != null)
+		{
+			$path = ' ' . $path;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_PASSIVE'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (!$this->_putCmd('NLST' . $path, array(150, 125)))
+		{
+			@ fclose($this->_dataconn);
+
+			// Workaround for empty directories on some servers
+			if ($this->listDetails($path, 'files') === array())
+			{
+				return array();
+			}
+
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_NLST', $this->_response, $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Read in the file listing.
+		while (!feof($this->_dataconn))
+		{
+			$data .= fread($this->_dataconn, 4096);
+		}
+
+		fclose($this->_dataconn);
+
+		// Everything go okay?
+		if (!$this->_verifyResponse(226))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_LISTNAMES_BAD_RESPONSE_TRANSFER', $this->_response, $path), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$data = preg_split('/[' . CRLF . ']+/', $data, -1, PREG_SPLIT_NO_EMPTY);
+		$data = preg_replace('#^' . preg_quote(substr($path, 1), '#') . '[/\\\\]?#', '', $data);
+
+		if ($keys = array_merge(array_keys($data, '.'), array_keys($data, '..')))
+		{
+			foreach ($keys as $key)
+			{
+				unset($data[$key]);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to list the contents of a directory on the FTP server
+	 *
+	 * @param   string  $path  Path to the local file to be stored on the FTP server
+	 * @param   string  $type  Return type [raw|all|folders|files]
+	 *
+	 * @return  mixed  If $type is raw: string Directory listing, otherwise array of string with file-names
+	 *
+	 * @since   12.1
+	 */
+	public function listDetails($path = null, $type = 'all')
+	{
+		$dir_list = array();
+		$data = null;
+		$regs = null;
+
+		// TODO: Deal with recurse -- nightmare
+		// For now we will just set it to false
+		$recurse = false;
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->_conn, true) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			if (($contents = @ftp_rawlist($this->_conn, $path)) === false)
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+		else
+		{
+			// Non Native mode
+
+			// Start passive mode
+			if (!$this->_passive())
+			{
+				Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_PASSIVE'), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			// If a path exists, prepend a space
+			if ($path != null)
+			{
+				$path = ' ' . $path;
+			}
+
+			// Request the file listing
+			if (!$this->_putCmd(($recurse == true) ? 'LIST -R' : 'LIST' . $path, array(150, 125)))
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE_LIST', $this->_response, $path), Log::WARNING, 'jerror');
+				@ fclose($this->_dataconn);
+
+				return false;
+			}
+
+			// Read in the file listing.
+			while (!feof($this->_dataconn))
+			{
+				$data .= fread($this->_dataconn, 4096);
+			}
+
+			fclose($this->_dataconn);
+
+			// Everything go okay?
+			if (!$this->_verifyResponse(226))
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_BAD_RESPONSE_TRANSFER', $this->_response, $path), Log::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$contents = explode(CRLF, $data);
+		}
+
+		// If only raw output is requested we are done
+		if ($type == 'raw')
+		{
+			return $data;
+		}
+
+		// If we received the listing of an empty directory, we are done as well
+		if (empty($contents[0]))
+		{
+			return $dir_list;
+		}
+
+		// If the server returned the number of results in the first response, let's dump it
+		if (strtolower(substr($contents[0], 0, 6)) == 'total ')
+		{
+			array_shift($contents);
+
+			if (!isset($contents[0]) || empty($contents[0]))
+			{
+				return $dir_list;
+			}
+		}
+
+		// Regular expressions for the directory listing parsing.
+		$regexps = array(
+			'UNIX' => '#([-dl][rwxstST-]+).* ([0-9]*) ([a-zA-Z0-9]+).* ([a-zA-Z0-9]+).* ([0-9]*)'
+				. ' ([a-zA-Z]+[0-9: ]*[0-9])[ ]+(([0-9]{1,2}:[0-9]{2})|[0-9]{4}) (.+)#',
+			'MAC' => '#([-dl][rwxstST-]+).* ?([0-9 ]*)?([a-zA-Z0-9]+).* ([a-zA-Z0-9]+).* ([0-9]*)'
+				. ' ([a-zA-Z]+[0-9: ]*[0-9])[ ]+(([0-9]{2}:[0-9]{2})|[0-9]{4}) (.+)#',
+			'WIN' => '#([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)#',
+		);
+
+		// Find out the format of the directory listing by matching one of the regexps
+		$osType = null;
+
+		foreach ($regexps as $k => $v)
+		{
+			if (@preg_match($v, $contents[0]))
+			{
+				$osType = $k;
+				$regexp = $v;
+				break;
+			}
+		}
+
+		if (!$osType)
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_LISTDETAILS_UNRECOGNISED'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Here is where it is going to get dirty....
+		if ($osType == 'UNIX' || $osType == 'MAC')
+		{
+			foreach ($contents as $file)
+			{
+				$tmp_array = null;
+
+				if (@preg_match($regexp, $file, $regs))
+				{
+					$fType = (int) strpos('-dl', $regs[1]{0});
+
+					// $tmp_array['line'] = $regs[0];
+					$tmp_array['type']   = $fType;
+					$tmp_array['rights'] = $regs[1];
+
+					// $tmp_array['number'] = $regs[2];
+					$tmp_array['user']  = $regs[3];
+					$tmp_array['group'] = $regs[4];
+					$tmp_array['size']  = $regs[5];
+					$tmp_array['date']  = @date('m-d', strtotime($regs[6]));
+					$tmp_array['time']  = $regs[7];
+					$tmp_array['name']  = $regs[9];
+				}
+
+				// If we just want files, do not add a folder
+				if ($type == 'files' && $tmp_array['type'] == 1)
+				{
+					continue;
+				}
+
+				// If we just want folders, do not add a file
+				if ($type == 'folders' && $tmp_array['type'] == 0)
+				{
+					continue;
+				}
+
+				if (is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..')
+				{
+					$dir_list[] = $tmp_array;
+				}
+			}
+		}
+		else
+		{
+			foreach ($contents as $file)
+			{
+				$tmp_array = null;
+
+				if (@preg_match($regexp, $file, $regs))
+				{
+					$fType = (int) ($regs[7] == '<DIR>');
+					$timestamp = strtotime("$regs[3]-$regs[1]-$regs[2] $regs[4]:$regs[5]$regs[6]");
+
+					// $tmp_array['line'] = $regs[0];
+					$tmp_array['type'] = $fType;
+					$tmp_array['rights'] = '';
+
+					// $tmp_array['number'] = 0;
+					$tmp_array['user'] = '';
+					$tmp_array['group'] = '';
+					$tmp_array['size'] = (int) $regs[7];
+					$tmp_array['date'] = date('m-d', $timestamp);
+					$tmp_array['time'] = date('H:i', $timestamp);
+					$tmp_array['name'] = $regs[8];
+				}
+
+				// If we just want files, do not add a folder
+				if ($type == 'files' && $tmp_array['type'] == 1)
+				{
+					continue;
+				}
+
+				// If we just want folders, do not add a file
+				if ($type == 'folders' && $tmp_array['type'] == 0)
+				{
+					continue;
+				}
+
+				if (is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..')
+				{
+					$dir_list[] = $tmp_array;
+				}
+			}
+		}
+
+		return $dir_list;
+	}
+
+	/**
+	 * Send command to the FTP server and validate an expected response code
+	 *
+	 * @param   string  $cmd               Command to send to the FTP server
+	 * @param   mixed   $expectedResponse  Integer response code or array of integer response codes
+	 *
+	 * @return  boolean  True if command executed successfully
+	 *
+	 * @since   12.1
+	 */
+	protected function _putCmd($cmd, $expectedResponse)
+	{
+		// Make sure we have a connection to the server
+		if (!is_resource($this->_conn))
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_PUTCMD_UNCONNECTED'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Send the command to the server
+		if (!fwrite($this->_conn, $cmd . "\r\n"))
+		{
+			Log::add(\JText::sprintf('DDD', \JText::sprintf('JLIB_CLIENT_ERROR_JFTP_PUTCMD_SEND', $cmd)), Log::WARNING, 'jerror');
+		}
+
+		return $this->_verifyResponse($expectedResponse);
+	}
+
+	/**
+	 * Verify the response code from the server and log response if flag is set
+	 *
+	 * @param   mixed  $expected  Integer response code or array of integer response codes
+	 *
+	 * @return  boolean  True if response code from the server is expected
+	 *
+	 * @since   12.1
+	 */
+	protected function _verifyResponse($expected)
+	{
+		$parts = null;
+
+		// Wait for a response from the server, but timeout after the set time limit
+		$endTime = time() + $this->_timeout;
+		$this->_response = '';
+
+		do
+		{
+			$this->_response .= fgets($this->_conn, 4096);
+		}
+		while (!preg_match('/^([0-9]{3})(-(.*' . CRLF . ')+\1)? [^' . CRLF . ']+' . CRLF . "$/", $this->_response, $parts) && time() < $endTime);
+
+		// Catch a timeout or bad response
+		if (!isset($parts[1]))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_VERIFYRESPONSE', $this->_response), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Separate the code from the message
+		$this->_responseCode = $parts[1];
+		$this->_responseMsg = $parts[0];
+
+		// Did the server respond with the code we wanted?
+		if (is_array($expected))
+		{
+			if (in_array($this->_responseCode, $expected))
+			{
+				$retval = true;
+			}
+			else
+			{
+				$retval = false;
+			}
+		}
+		else
+		{
+			if ($this->_responseCode == $expected)
+			{
+				$retval = true;
+			}
+			else
+			{
+				$retval = false;
+			}
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Set server to passive mode and open a data port connection
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	protected function _passive()
+	{
+		$match = array();
+		$parts = array();
+		$errno = null;
+		$err = null;
+
+		// Make sure we have a connection to the server
+		if (!is_resource($this->_conn))
+		{
+			Log::add(\JText::_('JLIB_CLIENT_ERROR_JFTP_PASSIVE_CONNECT_PORT'), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
+		@ fwrite($this->_conn, "PASV\r\n");
+
+		// Wait for a response from the server, but timeout after the set time limit
+		$endTime = time() + $this->_timeout;
+		$this->_response = '';
+
+		do
+		{
+			$this->_response .= fgets($this->_conn, 4096);
+		}
+		while (!preg_match('/^([0-9]{3})(-(.*' . CRLF . ')+\1)? [^' . CRLF . ']+' . CRLF . "$/", $this->_response, $parts) && time() < $endTime);
+
+		// Catch a timeout or bad response
+		if (!isset($parts[1]))
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_PASSIVE_RESPONSE', $this->_response), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Separate the code from the message
+		$this->_responseCode = $parts[1];
+		$this->_responseMsg = $parts[0];
+
+		// If it's not 227, we weren't given an IP and port, which means it failed.
+		if ($this->_responseCode != '227')
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_PASSIVE_IP_OBTAIN', $this->_responseMsg), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Snatch the IP and port information, or die horribly trying...
+		if (preg_match('~\((\d+),\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))\)~', $this->_responseMsg, $match) == 0)
+		{
+			Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_PASSIVE_IP_VALID', $this->_responseMsg), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// This is pretty simple - store it for later use ;).
+		$this->_pasv = array('ip' => $match[1] . '.' . $match[2] . '.' . $match[3] . '.' . $match[4], 'port' => $match[5] * 256 + $match[6]);
+
+		// Connect, assuming we've got a connection.
+		$this->_dataconn = @fsockopen($this->_pasv['ip'], $this->_pasv['port'], $errno, $err, $this->_timeout);
+
+		if (!$this->_dataconn)
+		{
+			Log::add(
+				\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_PASSIVE_CONNECT', $this->_pasv['ip'], $this->_pasv['port'], $errno, $err),
+				Log::WARNING,
+				'jerror'
+			);
+
+			return false;
+		}
+
+		// Set the timeout for this connection
+		socket_set_timeout($this->_conn, $this->_timeout, 0);
+
+		return true;
+	}
+
+	/**
+	 * Method to find out the correct transfer mode for a specific file
+	 *
+	 * @param   string  $fileName  Name of the file
+	 *
+	 * @return  integer Transfer-mode for this filetype [FTP_ASCII|FTP_BINARY]
+	 *
+	 * @since   12.1
+	 */
+	protected function _findMode($fileName)
+	{
+		if ($this->_type == FTP_AUTOASCII)
+		{
+			$dot = strrpos($fileName, '.') + 1;
+			$ext = substr($fileName, $dot);
+
+			if (in_array($ext, $this->_autoAscii))
+			{
+				$mode = FTP_ASCII;
+			}
+			else
+			{
+				$mode = FTP_BINARY;
+			}
+		}
+		elseif ($this->_type == FTP_ASCII)
+		{
+			$mode = FTP_ASCII;
+		}
+		else
+		{
+			$mode = FTP_BINARY;
+		}
+
+		return $mode;
+	}
+
+	/**
+	 * Set transfer mode
+	 *
+	 * @param   integer  $mode  Integer representation of data transfer mode [1:Binary|0:Ascii]
+	 * Defined constants can also be used [FTP_BINARY|FTP_ASCII]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   12.1
+	 */
+	protected function _mode($mode)
+	{
+		if ($mode == FTP_BINARY)
+		{
+			if (!$this->_putCmd('TYPE I', 200))
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_MODE_BINARY', $this->_response), Log::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+		else
+		{
+			if (!$this->_putCmd('TYPE A', 200))
+			{
+				Log::add(\JText::sprintf('JLIB_CLIENT_ERROR_JFTP_MODE_ASCII', $this->_response), Log::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Component/ComponentHelper.php b/core/libraries/src/Component/ComponentHelper.php
new file mode 100644
index 00000000..9baa593d
--- /dev/null
+++ b/core/libraries/src/Component/ComponentHelper.php
@@ -0,0 +1,502 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Component\Exception\MissingComponentException;
+use Joomla\Registry\Registry;
+
+/**
+ * Component helper class
+ *
+ * @since  1.5
+ */
+class ComponentHelper
+{
+	/**
+	 * The component list cache
+	 *
+	 * @var    ComponentRecord[]
+	 * @since  1.6
+	 */
+	protected static $components = array();
+
+	/**
+	 * Get the component information.
+	 *
+	 * @param   string   $option  The component option.
+	 * @param   boolean  $strict  If set and the component does not exist, the enabled attribute will be set to false.
+	 *
+	 * @return  ComponentRecord  An object with the information for the component.
+	 *
+	 * @since   1.5
+	 */
+	public static function getComponent($option, $strict = false)
+	{
+		$components = static::getComponents();
+
+		if (isset($components[$option]))
+		{
+			return $components[$option];
+		}
+
+		$result = new ComponentRecord;
+		$result->enabled = $strict ? false : true;
+		$result->setParams(new Registry);
+
+		return $result;
+	}
+
+	/**
+	 * Checks if the component is enabled
+	 *
+	 * @param   string  $option  The component option.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public static function isEnabled($option)
+	{
+		$components = static::getComponents();
+
+		return isset($components[$option]) && $components[$option]->enabled;
+	}
+
+	/**
+	 * Checks if a component is installed
+	 *
+	 * @param   string  $option  The component option.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.4
+	 */
+	public static function isInstalled($option)
+	{
+		$components = static::getComponents();
+
+		return isset($components[$option]) ? 1 : 0;
+	}
+
+	/**
+	 * Gets the parameter object for the component
+	 *
+	 * @param   string   $option  The option for the component.
+	 * @param   boolean  $strict  If set and the component does not exist, false will be returned
+	 *
+	 * @return  Registry  A Registry object.
+	 *
+	 * @see     Registry
+	 * @since   1.5
+	 */
+	public static function getParams($option, $strict = false)
+	{
+		return static::getComponent($option, $strict)->getParams();
+	}
+
+	/**
+	 * Applies the global text filters to arbitrary text as per settings for current user groups
+	 *
+	 * @param   string  $text  The string to filter
+	 *
+	 * @return  string  The filtered string
+	 *
+	 * @since   2.5
+	 */
+	public static function filterText($text)
+	{
+		// Punyencoding utf8 email addresses
+		$text = \JFilterInput::getInstance()->emailToPunycode($text);
+
+		// Filter settings
+		$config     = static::getParams('com_config');
+		$user       = \JFactory::getUser();
+		$userGroups = Access::getGroupsByUser($user->get('id'));
+
+		$filters = $config->get('filters');
+
+		$blackListTags       = array();
+		$blackListAttributes = array();
+
+		$customListTags       = array();
+		$customListAttributes = array();
+
+		$whiteListTags       = array();
+		$whiteListAttributes = array();
+
+		$whiteList  = false;
+		$blackList  = false;
+		$customList = false;
+		$unfiltered = false;
+
+		// Cycle through each of the user groups the user is in.
+		// Remember they are included in the Public group as well.
+		foreach ($userGroups as $groupId)
+		{
+			// May have added a group by not saved the filters.
+			if (!isset($filters->$groupId))
+			{
+				continue;
+			}
+
+			// Each group the user is in could have different filtering properties.
+			$filterData = $filters->$groupId;
+			$filterType = strtoupper($filterData->filter_type);
+
+			if ($filterType === 'NH')
+			{
+				// Maximum HTML filtering.
+			}
+			elseif ($filterType === 'NONE')
+			{
+				// No HTML filtering.
+				$unfiltered = true;
+			}
+			else
+			{
+				// Blacklist or whitelist.
+				// Preprocess the tags and attributes.
+				$tags           = explode(',', $filterData->filter_tags);
+				$attributes     = explode(',', $filterData->filter_attributes);
+				$tempTags       = array();
+				$tempAttributes = array();
+
+				foreach ($tags as $tag)
+				{
+					$tag = trim($tag);
+
+					if ($tag)
+					{
+						$tempTags[] = $tag;
+					}
+				}
+
+				foreach ($attributes as $attribute)
+				{
+					$attribute = trim($attribute);
+
+					if ($attribute)
+					{
+						$tempAttributes[] = $attribute;
+					}
+				}
+
+				// Collect the blacklist or whitelist tags and attributes.
+				// Each list is cummulative.
+				if ($filterType === 'BL')
+				{
+					$blackList           = true;
+					$blackListTags       = array_merge($blackListTags, $tempTags);
+					$blackListAttributes = array_merge($blackListAttributes, $tempAttributes);
+				}
+				elseif ($filterType === 'CBL')
+				{
+					// Only set to true if Tags or Attributes were added
+					if ($tempTags || $tempAttributes)
+					{
+						$customList           = true;
+						$customListTags       = array_merge($customListTags, $tempTags);
+						$customListAttributes = array_merge($customListAttributes, $tempAttributes);
+					}
+				}
+				elseif ($filterType === 'WL')
+				{
+					$whiteList           = true;
+					$whiteListTags       = array_merge($whiteListTags, $tempTags);
+					$whiteListAttributes = array_merge($whiteListAttributes, $tempAttributes);
+				}
+			}
+		}
+
+		// Remove duplicates before processing (because the blacklist uses both sets of arrays).
+		$blackListTags        = array_unique($blackListTags);
+		$blackListAttributes  = array_unique($blackListAttributes);
+		$customListTags       = array_unique($customListTags);
+		$customListAttributes = array_unique($customListAttributes);
+		$whiteListTags        = array_unique($whiteListTags);
+		$whiteListAttributes  = array_unique($whiteListAttributes);
+
+		if (!$unfiltered)
+		{
+			// Custom blacklist precedes Default blacklist
+			if ($customList)
+			{
+				$filter = \JFilterInput::getInstance(array(), array(), 1, 1);
+
+				// Override filter's default blacklist tags and attributes
+				if ($customListTags)
+				{
+					$filter->tagBlacklist = $customListTags;
+				}
+
+				if ($customListAttributes)
+				{
+					$filter->attrBlacklist = $customListAttributes;
+				}
+			}
+			// Blacklists take second precedence.
+			elseif ($blackList)
+			{
+				// Remove the whitelisted tags and attributes from the black-list.
+				$blackListTags       = array_diff($blackListTags, $whiteListTags);
+				$blackListAttributes = array_diff($blackListAttributes, $whiteListAttributes);
+
+				$filter = \JFilterInput::getInstance($blackListTags, $blackListAttributes, 1, 1);
+
+				// Remove whitelisted tags from filter's default blacklist
+				if ($whiteListTags)
+				{
+					$filter->tagBlacklist = array_diff($filter->tagBlacklist, $whiteListTags);
+				}
+
+				// Remove whitelisted attributes from filter's default blacklist
+				if ($whiteListAttributes)
+				{
+					$filter->attrBlacklist = array_diff($filter->attrBlacklist, $whiteListAttributes);
+				}
+			}
+			// Whitelists take third precedence.
+			elseif ($whiteList)
+			{
+				// Turn off XSS auto clean
+				$filter = \JFilterInput::getInstance($whiteListTags, $whiteListAttributes, 0, 0, 0);
+			}
+			// No HTML takes last place.
+			else
+			{
+				$filter = \JFilterInput::getInstance();
+			}
+
+			$text = $filter->clean($text, 'html');
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Render the component.
+	 *
+	 * @param   string  $option  The component option.
+	 * @param   array   $params  The component parameters
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @throws  MissingComponentException
+	 */
+	public static function renderComponent($option, $params = array())
+	{
+		$app = \JFactory::getApplication();
+
+		// Load template language files.
+		$template = $app->getTemplate(true)->template;
+		$lang = \JFactory::getLanguage();
+		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+			|| $lang->load('tpl_' . $template, JPATH_THEMES . "/$template", null, false, true);
+
+		if (empty($option))
+		{
+			throw new MissingComponentException(\JText::_('JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND'), 404);
+		}
+
+		if (JDEBUG)
+		{
+			\JProfiler::getInstance('Application')->mark('beforeRenderComponent ' . $option);
+		}
+
+		// Record the scope
+		$scope = $app->scope;
+
+		// Set scope to component name
+		$app->scope = $option;
+
+		// Build the component path.
+		$option = preg_replace('/[^A-Z0-9_\.-]/i', '', $option);
+		$file = substr($option, 4);
+
+		// Define component path.
+		if (!defined('JPATH_COMPONENT'))
+		{
+			define('JPATH_COMPONENT', JPATH_BASE . '/components/' . $option);
+		}
+
+		if (!defined('JPATH_COMPONENT_SITE'))
+		{
+			define('JPATH_COMPONENT_SITE', JPATH_SITE . '/components/' . $option);
+		}
+
+		if (!defined('JPATH_COMPONENT_ADMINISTRATOR'))
+		{
+			define('JPATH_COMPONENT_ADMINISTRATOR', JPATH_ADMINISTRATOR . '/components/' . $option);
+		}
+
+		$path = JPATH_COMPONENT . '/' . $file . '.php';
+
+		// If component is disabled throw error
+		if (!static::isEnabled($option) || !file_exists($path))
+		{
+			throw new MissingComponentException(\JText::_('JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND'), 404);
+		}
+
+		// Load common and local language files.
+		$lang->load($option, JPATH_BASE, null, false, true) || $lang->load($option, JPATH_COMPONENT, null, false, true);
+
+		// Handle template preview outlining.
+		$contents = null;
+
+		// Execute the component.
+		$contents = static::executeComponent($path);
+
+		// Revert the scope
+		$app->scope = $scope;
+
+		if (JDEBUG)
+		{
+			\JProfiler::getInstance('Application')->mark('afterRenderComponent ' . $option);
+		}
+
+		return $contents;
+	}
+
+	/**
+	 * Execute the component.
+	 *
+	 * @param   string  $path  The component path.
+	 *
+	 * @return  string  The component output
+	 *
+	 * @since   1.7
+	 */
+	protected static function executeComponent($path)
+	{
+		ob_start();
+		require_once $path;
+
+		return ob_get_clean();
+	}
+
+	/**
+	 * Load the installed components into the components property.
+	 *
+	 * @param   string  $option  The element value for the extension
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use JComponentHelper::load() instead
+	 */
+	protected static function _load($option)
+	{
+		return static::load($option);
+	}
+
+	/**
+	 * Load the installed components into the components property.
+	 *
+	 * @param   string  $option  The element value for the extension
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 * @note    As of 4.0 this method will be restructured to only load the data into memory
+	 */
+	protected static function load($option)
+	{
+		$loader = function ()
+		{
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName(array('extension_id', 'element', 'params', 'enabled'), array('id', 'option', null, null)))
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('type') . ' = ' . $db->quote('component'));
+			$db->setQuery($query);
+
+			return $db->loadObjectList('option', '\JComponentRecord');
+		};
+
+		/** @var \JCacheControllerCallback $cache */
+		$cache = \JFactory::getCache('_system', 'callback');
+
+		try
+		{
+			static::$components = $cache->get($loader, array(), __METHOD__);
+		}
+		catch (\JCacheException $e)
+		{
+			static::$components = $loader();
+		}
+
+		// Core CMS will use '*' as a placeholder for required parameter in this method. In 4.0 this will not be passed at all.
+		if (isset($option) && $option != '*')
+		{
+			// Log deprecated warning and display missing component warning only if using deprecated format.
+			try
+			{
+				\JLog::add(
+					sprintf(
+						'Passing a parameter into %s() is deprecated and will be removed in 4.0. Read %s::$components directly after loading the data.',
+						__METHOD__,
+						__CLASS__
+					),
+					\JLog::WARNING,
+					'deprecated'
+				);
+			}
+			catch (\RuntimeException $e)
+			{
+				// Informational log only
+			}
+
+			if (empty(static::$components[$option]))
+			{
+				/*
+				 * Fatal error
+				 *
+				 * It is possible for this error to be reached before the global \JLanguage instance has been loaded so we check for its presence
+				 * before logging the error to ensure a human friendly message is always given
+				 */
+
+				if (\JFactory::$language)
+				{
+					$msg = \JText::sprintf('JLIB_APPLICATION_ERROR_COMPONENT_NOT_LOADING', $option, \JText::_('JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND'));
+				}
+				else
+				{
+					$msg = sprintf('Error loading component: %1$s, %2$s', $option, 'Component not found.');
+				}
+
+				\JLog::add($msg, \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get installed components
+	 *
+	 * @return  ComponentRecord[]  The components property
+	 *
+	 * @since   3.6.3
+	 */
+	public static function getComponents()
+	{
+		if (empty(static::$components))
+		{
+			static::load('*');
+		}
+
+		return static::$components;
+	}
+}
diff --git a/core/libraries/src/Component/ComponentRecord.php b/core/libraries/src/Component/ComponentRecord.php
new file mode 100644
index 00000000..d5b9bfe9
--- /dev/null
+++ b/core/libraries/src/Component/ComponentRecord.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Object representing a component extension record
+ *
+ * @since  3.7.0
+ * @note   As of 4.0 this class will no longer extend JObject
+ */
+class ComponentRecord extends \JObject
+{
+	/**
+	 * Primary key
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $id;
+
+	/**
+	 * The component name
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $option;
+
+	/**
+	 * The component parameters
+	 *
+	 * @var    string|Registry
+	 * @since  3.7.0
+	 * @note   This field is protected to require reading this field to proxy through the getter to convert the params to a Registry instance
+	 */
+	protected $params;
+
+	/**
+	 * Indicates if this component is enabled
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $enabled;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $data  The component record data to load
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($data = array())
+	{
+		foreach ((array) $data as $key => $value)
+		{
+			$this->$key = $value;
+		}
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.7.0
+	 * @deprecated  4.0  Access the item parameters through the `getParams()` method
+	 */
+	public function __get($name)
+	{
+		if ($name === 'params')
+		{
+			return $this->getParams();
+		}
+
+		return $this->get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 * @deprecated  4.0  Set the item parameters through the `setParams()` method
+	 */
+	public function __set($name, $value)
+	{
+		if ($name === 'params')
+		{
+			$this->setParams($value);
+
+			return;
+		}
+
+		$this->set($name, $value);
+	}
+
+	/**
+	 * Returns the menu item parameters
+	 *
+	 * @return  Registry
+	 *
+	 * @since   3.7.0
+	 */
+	public function getParams()
+	{
+		if (!($this->params instanceof Registry))
+		{
+			$this->params = new Registry($this->params);
+		}
+
+		return $this->params;
+	}
+
+	/**
+	 * Sets the menu item parameters
+	 *
+	 * @param   Registry|string  $params  The data to be stored as the parameters
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function setParams($params)
+	{
+		$this->params = $params;
+	}
+}
diff --git a/core/libraries/src/Component/Exception/MissingComponentException.php b/core/libraries/src/Component/Exception/MissingComponentException.php
new file mode 100644
index 00000000..3f0caac7
--- /dev/null
+++ b/core/libraries/src/Component/Exception/MissingComponentException.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+
+/**
+ * Exception class defining an error for a missing component
+ *
+ * @since  3.7.0
+ */
+class MissingComponentException extends RouteNotFoundException
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   string      $message   The Exception message to throw.
+	 * @param   integer     $code      The Exception code.
+	 * @param   \Exception  $previous  The previous exception used for the exception chaining.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($message = '', $code = 404, \Exception $previous = null)
+	{
+		parent::__construct($message, $code, $previous);
+	}
+}
diff --git a/core/libraries/src/Component/Router/RouterBase.php b/core/libraries/src/Component/Router/RouterBase.php
new file mode 100644
index 00000000..94b526f6
--- /dev/null
+++ b/core/libraries/src/Component/Router/RouterBase.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Base component routing class
+ *
+ * @since  3.3
+ */
+abstract class RouterBase implements RouterInterface
+{
+	/**
+	 * Application object to use in the router
+	 *
+	 * @var    \JApplicationCms
+	 * @since  3.4
+	 */
+	public $app;
+
+	/**
+	 * Menu object to use in the router
+	 *
+	 * @var    \JMenu
+	 * @since  3.4
+	 */
+	public $menu;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   \JApplicationCms  $app   Application-object that the router should use
+	 * @param   \JMenu            $menu  Menu-object that the router should use
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($app = null, $menu = null)
+	{
+		if ($app)
+		{
+			$this->app = $app;
+		}
+		else
+		{
+			$this->app = \JFactory::getApplication('site');
+		}
+
+		if ($menu)
+		{
+			$this->menu = $menu;
+		}
+		else
+		{
+			$this->menu = $this->app->getMenu();
+		}
+	}
+
+	/**
+	 * Generic method to preprocess a URL
+	 *
+	 * @param   array  $query  An associative array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function preprocess($query)
+	{
+		return $query;
+	}
+}
diff --git a/core/libraries/src/Component/Router/RouterInterface.php b/core/libraries/src/Component/Router/RouterInterface.php
new file mode 100644
index 00000000..de1b4d6b
--- /dev/null
+++ b/core/libraries/src/Component/Router/RouterInterface.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Component routing interface
+ *
+ * @since  3.3
+ */
+interface RouterInterface
+{
+	/**
+	 * Prepare-method for URLs
+	 * This method is meant to validate and complete the URL parameters.
+	 * For example it can add the Itemid or set a language parameter.
+	 * This method is executed on each URL, regardless of SEF mode switched
+	 * on or not.
+	 *
+	 * @param   array  $query  An associative array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function preprocess($query);
+
+	/**
+	 * Build method for URLs
+	 * This method is meant to transform the query parameters into a more human
+	 * readable form. It is only executed when SEF mode is switched on.
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query);
+
+	/**
+	 * Parse method for URLs
+	 * This method is meant to transform the human readable URL back into
+	 * query parameters. It is only executed when SEF mode is switched on.
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments);
+}
diff --git a/core/libraries/src/Component/Router/RouterLegacy.php b/core/libraries/src/Component/Router/RouterLegacy.php
new file mode 100644
index 00000000..6ad38baf
--- /dev/null
+++ b/core/libraries/src/Component/Router/RouterLegacy.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Default routing class for missing or legacy component routers
+ *
+ * @since  3.3
+ */
+class RouterLegacy implements RouterInterface
+{
+	/**
+	 * Name of the component
+	 *
+	 * @var    string
+	 * @since  3.3
+	 */
+	protected $component;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $component  Component name without the com_ prefix this router should react upon
+	 *
+	 * @since   3.3
+	 */
+	public function __construct($component)
+	{
+		$this->component = $component;
+	}
+
+	/**
+	 * Generic preprocess function for missing or legacy component router
+	 *
+	 * @param   array  $query  An associative array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function preprocess($query)
+	{
+		return $query;
+	}
+
+	/**
+	 * Generic build function for missing or legacy component router
+	 *
+	 * @param   array  &$query  An array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.3
+	 */
+	public function build(&$query)
+	{
+		$function = $this->component . 'BuildRoute';
+
+		if (function_exists($function))
+		{
+			$segments = $function($query);
+			$total    = count($segments);
+
+			for ($i = 0; $i < $total; $i++)
+			{
+				$segments[$i] = str_replace(':', '-', $segments[$i]);
+			}
+
+			return $segments;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Generic parse function for missing or legacy component router
+	 *
+	 * @param   array  &$segments  The segments of the URL to parse.
+	 *
+	 * @return  array  The URL attributes to be used by the application.
+	 *
+	 * @since   3.3
+	 */
+	public function parse(&$segments)
+	{
+		$function = $this->component . 'ParseRoute';
+
+		if (function_exists($function))
+		{
+			$total = count($segments);
+
+			for ($i = 0; $i < $total; $i++)
+			{
+				$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+			}
+
+			return $function($segments);
+		}
+
+		return array();
+	}
+}
diff --git a/core/libraries/src/Component/Router/RouterView.php b/core/libraries/src/Component/Router/RouterView.php
new file mode 100644
index 00000000..e463d064
--- /dev/null
+++ b/core/libraries/src/Component/Router/RouterView.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\Router\Rules\RulesInterface;
+
+/**
+ * View-based component routing class
+ *
+ * @since  3.5
+ */
+abstract class RouterView extends RouterBase
+{
+	/**
+	 * Name of the router of the component
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $name;
+
+	/**
+	 * Array of rules
+	 *
+	 * @var    RulesInterface[]
+	 * @since  3.5
+	 */
+	protected $rules = array();
+
+	/**
+	 * Views of the component
+	 *
+	 * @var    RouterViewConfiguration[]
+	 * @since  3.5
+	 */
+	protected $views = array();
+
+	/**
+	 * Register the views of a component
+	 *
+	 * @param   RouterViewConfiguration  $view  View configuration object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function registerView(RouterViewConfiguration $view)
+	{
+		$this->views[$view->name] = $view;
+	}
+
+	/**
+	 * Return an array of registered view objects
+	 *
+	 * @return  RouterViewConfiguration[] Array of registered view objects
+	 *
+	 * @since   3.5
+	 */
+	public function getViews()
+	{
+		return $this->views;
+	}
+
+	/**
+	 * Get the path of views from target view to root view
+	 * including content items of a nestable view
+	 *
+	 * @param   array  $query  Array of query elements
+	 *
+	 * @return  array List of views including IDs of content items
+	 *
+	 * @since   3.5
+	 */
+	public function getPath($query)
+	{
+		$views  = $this->getViews();
+		$result = array();
+
+		// Get the right view object
+		if (isset($query['view']) && isset($views[$query['view']]))
+		{
+			$viewobj = $views[$query['view']];
+		}
+
+		// Get the path from the current item to the root view with all IDs
+		if (isset($viewobj))
+		{
+			$path     = array_reverse($viewobj->path);
+			$start    = true;
+			$childkey = false;
+
+			foreach ($path as $element)
+			{
+				$view = $views[$element];
+
+				if ($start)
+				{
+					$key   = $view->key;
+					$start = false;
+				}
+				else
+				{
+					$key = $childkey;
+				}
+
+				$childkey = $view->parent_key;
+
+				if (($key || $view->key) && is_callable(array($this, 'get' . ucfirst($view->name) . 'Segment')))
+				{
+					if (isset($query[$key]))
+					{
+						$result[$view->name] = call_user_func_array(array($this, 'get' . ucfirst($view->name) . 'Segment'), array($query[$key], $query));
+					}
+					elseif (isset($query[$view->key]))
+					{
+						$result[$view->name] = call_user_func_array(array($this, 'get' . ucfirst($view->name) . 'Segment'), array($query[$view->key], $query));
+					}
+					else
+					{
+						$result[$view->name] = array();
+					}
+				}
+				else
+				{
+					$result[$view->name] = true;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get all currently attached rules
+	 *
+	 * @return  RulesInterface[]  All currently attached rules in an array
+	 *
+	 * @since   3.5
+	 */
+	public function getRules()
+	{
+		return $this->rules;
+	}
+
+	/**
+	 * Add a number of router rules to the object
+	 *
+	 * @param   RulesInterface[]  $rules  Array of JComponentRouterRulesInterface objects
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function attachRules($rules)
+	{
+		foreach ($rules as $rule)
+		{
+			$this->attachRule($rule);
+		}
+	}
+
+	/**
+	 * Attach a build rule
+	 *
+	 * @param   RulesInterface  $rule  The function to be called.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function attachRule(RulesInterface $rule)
+	{
+		$this->rules[] = $rule;
+	}
+
+	/**
+	 * Remove a build rule
+	 *
+	 * @param   RulesInterface  $rule  The rule to be removed.
+	 *
+	 * @return   boolean  Was a rule removed?
+	 *
+	 * @since   3.5
+	 */
+	public function detachRule(RulesInterface $rule)
+	{
+		foreach ($this->rules as $id => $r)
+		{
+			if ($r == $rule)
+			{
+				unset($this->rules[$id]);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Generic method to preprocess a URL
+	 *
+	 * @param   array  $query  An associative array of URL arguments
+	 *
+	 * @return  array  The URL arguments to use to assemble the subsequent URL.
+	 *
+	 * @since   3.5
+	 */
+	public function preprocess($query)
+	{
+		// Process the parsed variables based on custom defined rules
+		foreach ($this->rules as $rule)
+		{
+			$rule->preprocess($query);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Build method for URLs
+	 *
+	 * @param   array  &$query  Array of query elements
+	 *
+	 * @return  array  Array of URL segments
+	 *
+	 * @since   3.5
+	 */
+	public function build(&$query)
+	{
+		$segments = array();
+
+		// Process the parsed variables based on custom defined rules
+		foreach ($this->rules as $rule)
+		{
+			$rule->build($query, $segments);
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Parse method for URLs
+	 *
+	 * @param   array  &$segments  Array of URL string-segments
+	 *
+	 * @return  array  Associative array of query values
+	 *
+	 * @since   3.5
+	 */
+	public function parse(&$segments)
+	{
+		$vars = array();
+
+		// Process the parsed variables based on custom defined rules
+		foreach ($this->rules as $rule)
+		{
+			$rule->parse($segments, $vars);
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Method to return the name of the router
+	 *
+	 * @return  string  Name of the router
+	 *
+	 * @since   3.5
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Router/i', get_class($this), $r))
+			{
+				throw new \Exception('JLIB_APPLICATION_ERROR_ROUTER_GET_NAME', 500);
+			}
+
+			$this->name = strtolower($r[1]);
+		}
+
+		return $this->name;
+	}
+}
diff --git a/core/libraries/src/Component/Router/RouterViewConfiguration.php b/core/libraries/src/Component/Router/RouterViewConfiguration.php
new file mode 100644
index 00000000..e3a4128c
--- /dev/null
+++ b/core/libraries/src/Component/Router/RouterViewConfiguration.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * View-configuration class for the view-based component router
+ *
+ * @since  3.5
+ */
+class RouterViewConfiguration
+{
+	/**
+	 * Name of the view
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	public $name;
+
+	/**
+	 * Key of the view
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	public $key = false;
+
+	/**
+	 * Parentview of this one
+	 *
+	 * @var    RouterViewconfiguration
+	 * @since  3.5
+	 */
+	public $parent = false;
+
+	/**
+	 * Key of the parent view
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	public $parent_key = false;
+
+	/**
+	 * Is this view nestable?
+	 *
+	 * @var    bool
+	 * @since  3.5
+	 */
+	public $nestable = false;
+
+	/**
+	 * Layouts that are supported by this view
+	 *
+	 * @var    array
+	 * @since  3.5
+	 */
+	public $layouts = array('default');
+
+	/**
+	 * Child-views of this view
+	 *
+	 * @var    RouterViewconfiguration[]
+	 * @since  3.5
+	 */
+	public $children = array();
+
+	/**
+	 * Keys used for this parent view by the child views
+	 *
+	 * @var    array
+	 * @since  3.5
+	 */
+	public $child_keys = array();
+
+	/**
+	 * Path of views from this one to the root view
+	 *
+	 * @var    array
+	 * @since  3.5
+	 */
+	public $path = array();
+
+	/**
+	 * Constructor for the View-configuration class
+	 *
+	 * @param   string  $name  Name of the view
+	 *
+	 * @since   3.5
+	 */
+	public function __construct($name)
+	{
+		$this->name   = $name;
+		$this->path[] = $name;
+	}
+
+	/**
+	 * Set the name of the view
+	 *
+	 * @param   string  $name  Name of the view
+	 *
+	 * @return  RouterViewconfiguration  This object for chaining
+	 *
+	 * @since   3.5
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+
+		array_pop($this->path);
+		$this->path[] = $name;
+
+		return $this;
+	}
+
+	/**
+	 * Set the key-identifier for the view
+	 *
+	 * @param   string  $key  Key of the view
+	 *
+	 * @return  RouterViewconfiguration  This object for chaining
+	 *
+	 * @since   3.5
+	 */
+	public function setKey($key)
+	{
+		$this->key = $key;
+
+		return $this;
+	}
+
+	/**
+	 * Set the parent view of this view
+	 *
+	 * @param   RouterViewconfiguration  $parent      Parent view object
+	 * @param   string                   $parent_key  Key of the parent view in this context
+	 *
+	 * @return  RouterViewconfiguration  This object for chaining
+	 *
+	 * @since   3.5
+	 */
+	public function setParent(RouterViewconfiguration $parent, $parent_key = false)
+	{
+		if ($this->parent)
+		{
+			$key = array_search($this, $this->parent->children);
+
+			if ($key !== false)
+			{
+				unset($this->parent->children[$key]);
+			}
+
+			if ($this->parent_key)
+			{
+				$child_key = array_search($this->parent_key, $this->parent->child_keys);
+				unset($this->parent->child_keys[$child_key]);
+			}
+		}
+
+		$this->parent       = $parent;
+		$parent->children[] = $this;
+
+		$this->path   = $parent->path;
+		$this->path[] = $this->name;
+
+		$this->parent_key = $parent_key;
+
+		if ($parent_key)
+		{
+			$parent->child_keys[] = $parent_key;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set if this view is nestable or not
+	 *
+	 * @param   bool  $isNestable  If set to true, the view is nestable
+	 *
+	 * @return  RouterViewconfiguration  This object for chaining
+	 *
+	 * @since   3.5
+	 */
+	public function setNestable($isNestable = true)
+	{
+		$this->nestable = (bool) $isNestable;
+
+		return $this;
+	}
+
+	/**
+	 * Add a layout to this view
+	 *
+	 * @param   string  $layout  Layouts that this view supports
+	 *
+	 * @return  RouterViewconfiguration  This object for chaining
+	 *
+	 * @since   3.5
+	 */
+	public function addLayout($layout)
+	{
+		$this->layouts[] = $layout;
+		$this->layouts   = array_unique($this->layouts);
+
+		return $this;
+	}
+
+	/**
+	 * Remove a layout from this view
+	 *
+	 * @param   string  $layout  Layouts that this view supports
+	 *
+	 * @return  RouterViewconfiguration  This object for chaining
+	 *
+	 * @since   3.5
+	 */
+	public function removeLayout($layout)
+	{
+		$key = array_search($layout, $this->layouts);
+
+		if ($key !== false)
+		{
+			unset($this->layouts[$key]);
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Component/Router/Rules/MenuRules.php b/core/libraries/src/Component/Router/Rules/MenuRules.php
new file mode 100644
index 00000000..bb730650
--- /dev/null
+++ b/core/libraries/src/Component/Router/Rules/MenuRules.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router\Rules;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Component\Router\RouterView;
+
+/**
+ * Rule to identify the right Itemid for a view in a component
+ *
+ * @since  3.4
+ */
+class MenuRules implements RulesInterface
+{
+	/**
+	 * Router this rule belongs to
+	 *
+	 * @var   RouterView
+	 * @since 3.4
+	 */
+	protected $router;
+
+	/**
+	 * Lookup array of the menu items
+	 *
+	 * @var   array
+	 * @since 3.4
+	 */
+	protected $lookup = array();
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   RouterView  $router  Router this rule belongs to
+	 *
+	 * @since   3.4
+	 */
+	public function __construct(RouterView $router)
+	{
+		$this->router = $router;
+
+		$this->buildLookup();
+	}
+
+	/**
+	 * Finds the right Itemid for this query
+	 *
+	 * @param   array  &$query  The query array to process
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function preprocess(&$query)
+	{
+		$active = $this->router->menu->getActive();
+
+		/**
+		 * If the active item id is not the same as the supplied item id or we have a supplied item id and no active
+		 * menu item then we just use the supplied menu item and continue
+		 */
+		if (isset($query['Itemid']) && ($active === null || $query['Itemid'] != $active->id))
+		{
+			return;
+		}
+
+		// Get query language
+		$language = isset($query['lang']) ? $query['lang'] : '*';
+
+		if (!isset($this->lookup[$language]))
+		{
+			$this->buildLookup($language);
+		}
+
+		// Check if the active menu item matches the requested query
+		if ($active !== null && isset($query['Itemid']))
+		{
+			// Check if active->query and supplied query are the same
+			$match = true;
+
+			foreach ($active->query as $k => $v)
+			{
+				if (isset($query[$k]) && $v !== $query[$k])
+				{
+					// Compare again without alias
+					if (is_string($v) && $v == current(explode(':', $query[$k], 2)))
+					{
+						continue;
+					}
+
+					$match = false;
+					break;
+				}
+			}
+
+			if ($match)
+			{
+				// Just use the supplied menu item
+				return;
+			}
+		}
+
+		$needles = $this->router->getPath($query);
+
+		$layout = isset($query['layout']) && $query['layout'] !== 'default' ? ':' . $query['layout'] : '';
+
+		if ($needles)
+		{
+			foreach ($needles as $view => $ids)
+			{
+				$viewLayout = $view . $layout;
+
+				if ($layout && isset($this->lookup[$language][$viewLayout]))
+				{
+					if (is_bool($ids))
+					{
+						$query['Itemid'] = $this->lookup[$language][$viewLayout];
+
+						return;
+					}
+
+					foreach ($ids as $id => $segment)
+					{
+						if (isset($this->lookup[$language][$viewLayout][(int) $id]))
+						{
+							$query['Itemid'] = $this->lookup[$language][$viewLayout][(int) $id];
+
+							return;
+						}
+					}
+				}
+
+				if (isset($this->lookup[$language][$view]))
+				{
+					if (is_bool($ids))
+					{
+						$query['Itemid'] = $this->lookup[$language][$view];
+
+						return;
+					}
+
+					foreach ($ids as $id => $segment)
+					{
+						if (isset($this->lookup[$language][$view][(int) $id]))
+						{
+							$query['Itemid'] = $this->lookup[$language][$view][(int) $id];
+
+							return;
+						}
+					}
+				}
+			}
+		}
+
+		// Check if the active menuitem matches the requested language
+		if ($active && $active->component === 'com_' . $this->router->getName()
+			&& ($language === '*' || in_array($active->language, array('*', $language)) || !\JLanguageMultilang::isEnabled()))
+		{
+			$query['Itemid'] = $active->id;
+			return;
+		}
+
+		// If not found, return language specific home link
+		$default = $this->router->menu->getDefault($language);
+
+		if (!empty($default->id))
+		{
+			$query['Itemid'] = $default->id;
+		}
+	}
+
+	/**
+	 * Method to build the lookup array
+	 *
+	 * @param   string  $language  The language that the lookup should be built up for
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function buildLookup($language = '*')
+	{
+		// Prepare the reverse lookup array.
+		if (!isset($this->lookup[$language]))
+		{
+			$this->lookup[$language] = array();
+
+			$component  = ComponentHelper::getComponent('com_' . $this->router->getName());
+			$views = $this->router->getViews();
+
+			$attributes = array('component_id');
+			$values     = array((int) $component->id);
+
+			$attributes[] = 'language';
+			$values[]     = array($language, '*');
+
+			$items = $this->router->menu->getItems($attributes, $values);
+
+			foreach ($items as $item)
+			{
+				if (isset($item->query['view'], $views[$item->query['view']]))
+				{
+					$view = $item->query['view'];
+
+					$layout = '';
+
+					if (isset($item->query['layout']))
+					{
+						$layout = ':' . $item->query['layout'];
+					}
+
+					if ($views[$view]->key)
+					{
+						if (!isset($this->lookup[$language][$view . $layout]))
+						{
+							$this->lookup[$language][$view . $layout] = array();
+						}
+
+						if (!isset($this->lookup[$language][$view]))
+						{
+							$this->lookup[$language][$view] = array();
+						}
+
+						// If menuitem has no key set, we assume 0.
+						if (!isset($item->query[$views[$view]->key]))
+						{
+							$item->query[$views[$view]->key] = 0;
+						}
+
+						/**
+						 * Here it will become a bit tricky
+						 * language != * can override existing entries
+						 * language == * cannot override existing entries
+						 */
+						if (!isset($this->lookup[$language][$view . $layout][$item->query[$views[$view]->key]]) || $item->language !== '*')
+						{
+							$this->lookup[$language][$view . $layout][$item->query[$views[$view]->key]] = $item->id;
+							$this->lookup[$language][$view][$item->query[$views[$view]->key]] = $item->id;
+						}
+					}
+					else
+					{
+						/**
+						 * Here it will become a bit tricky
+						 * language != * can override existing entries
+						 * language == * cannot override existing entries
+						 */
+						if (!isset($this->lookup[$language][$view . $layout]) || $item->language !== '*')
+						{
+							$this->lookup[$language][$view . $layout] = $item->id;
+							$this->lookup[$language][$view] = $item->id;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Dummymethod to fullfill the interface requirements
+	 *
+	 * @param   array  &$segments  The URL segments to parse
+	 * @param   array  &$vars      The vars that result from the segments
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @codeCoverageIgnore
+	 */
+	public function parse(&$segments, &$vars)
+	{
+	}
+
+	/**
+	 * Dummymethod to fullfill the interface requirements
+	 *
+	 * @param   array  &$query     The vars that should be converted
+	 * @param   array  &$segments  The URL segments to create
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @codeCoverageIgnore
+	 */
+	public function build(&$query, &$segments)
+	{
+	}
+}
diff --git a/core/libraries/src/Component/Router/Rules/NomenuRules.php b/core/libraries/src/Component/Router/Rules/NomenuRules.php
new file mode 100644
index 00000000..5ddb16db
--- /dev/null
+++ b/core/libraries/src/Component/Router/Rules/NomenuRules.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router\Rules;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\Router\RouterView;
+
+/**
+ * Rule to process URLs without a menu item
+ *
+ * @since  3.4
+ */
+class NomenuRules implements RulesInterface
+{
+	/**
+	 * Router this rule belongs to
+	 *
+	 * @var RouterView
+	 * @since 3.4
+	 */
+	protected $router;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   RouterView  $router  Router this rule belongs to
+	 *
+	 * @since   3.4
+	 */
+	public function __construct(RouterView $router)
+	{
+		$this->router = $router;
+	}
+
+	/**
+	 * Dummymethod to fullfill the interface requirements
+	 *
+	 * @param   array  &$query  The query array to process
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @codeCoverageIgnore
+	 */
+	public function preprocess(&$query)
+	{
+	}
+
+	/**
+	 * Parse a menu-less URL
+	 *
+	 * @param   array  &$segments  The URL segments to parse
+	 * @param   array  &$vars      The vars that result from the segments
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function parse(&$segments, &$vars)
+	{
+		$active = $this->router->menu->getActive();
+
+		if (!is_object($active))
+		{
+			$views = $this->router->getViews();
+
+			if (isset($views[$segments[0]]))
+			{
+				$vars['view'] = array_shift($segments);
+
+				if (isset($views[$vars['view']]->key) && isset($segments[0]))
+				{
+					$vars[$views[$vars['view']]->key] = preg_replace('/-/', ':', array_shift($segments), 1);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Build a menu-less URL
+	 *
+	 * @param   array  &$query     The vars that should be converted
+	 * @param   array  &$segments  The URL segments to create
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function build(&$query, &$segments)
+	{
+		$menu_found = false;
+
+		if (isset($query['Itemid']))
+		{
+			$item = $this->router->menu->getItem($query['Itemid']);
+
+			if (!isset($query['option']) || ($item && $item->query['option'] === $query['option']))
+			{
+				$menu_found = true;
+			}
+		}
+
+		if (!$menu_found && isset($query['view']))
+		{
+			$views = $this->router->getViews();
+
+			if (isset($views[$query['view']]))
+			{
+				$view = $views[$query['view']];
+				$segments[] = $query['view'];
+
+				if ($view->key && isset($query[$view->key]))
+				{
+					if (is_callable(array($this->router, 'get' . ucfirst($view->name) . 'Segment')))
+					{
+						$result = call_user_func_array(array($this->router, 'get' . ucfirst($view->name) . 'Segment'), array($query[$view->key], $query));
+						$segments[] = str_replace(':', '-', array_shift($result));
+					}
+					else
+					{
+						$segments[] = str_replace(':', '-', $query[$view->key]);
+					}
+
+					unset($query[$views[$query['view']]->key]);
+				}
+
+				unset($query['view']);
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Component/Router/Rules/RulesInterface.php b/core/libraries/src/Component/Router/Rules/RulesInterface.php
new file mode 100644
index 00000000..c4ceae2c
--- /dev/null
+++ b/core/libraries/src/Component/Router/Rules/RulesInterface.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router\Rules;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * RouterRules interface for Joomla
+ *
+ * @since  3.4
+ */
+interface RulesInterface
+{
+	/**
+	 * Prepares a query set to be handed over to the build() method.
+	 * This should complete a partial query set to work as a complete non-SEFed
+	 * URL and in general make sure that all information is present and properly
+	 * formatted. For example, the Itemid should be retrieved and set here.
+	 *
+	 * @param   array  &$query  The query array to process
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function preprocess(&$query);
+
+	/**
+	 * Parses a URI to retrieve informations for the right route through
+	 * the component.
+	 * This method should retrieve all its input from its method arguments.
+	 *
+	 * @param   array  &$segments  The URL segments to parse
+	 * @param   array  &$vars      The vars that result from the segments
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function parse(&$segments, &$vars);
+
+	/**
+	 * Builds URI segments from a query to encode the necessary informations
+	 * for a route in a human-readable URL.
+	 * This method should retrieve all its input from its method arguments.
+	 *
+	 * @param   array  &$query     The vars that should be converted
+	 * @param   array  &$segments  The URL segments to create
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function build(&$query, &$segments);
+}
diff --git a/core/libraries/src/Component/Router/Rules/StandardRules.php b/core/libraries/src/Component/Router/Rules/StandardRules.php
new file mode 100644
index 00000000..5298bec1
--- /dev/null
+++ b/core/libraries/src/Component/Router/Rules/StandardRules.php
@@ -0,0 +1,318 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Component\Router\Rules;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\Router\RouterView;
+
+/**
+ * Rule for the standard handling of component routing
+ *
+ * @since  3.4
+ */
+class StandardRules implements RulesInterface
+{
+	/**
+	 * Router this rule belongs to
+	 *
+	 * @var    RouterView
+	 * @since  3.4
+	 */
+	protected $router;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   RouterView  $router  Router this rule belongs to
+	 *
+	 * @since   3.4
+	 */
+	public function __construct(RouterView $router)
+	{
+		$this->router = $router;
+	}
+
+	/**
+	 * Dummymethod to fullfill the interface requirements
+	 *
+	 * @param   array  &$query  The query array to process
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function preprocess(&$query)
+	{
+	}
+
+	/**
+	 * Parse the URL
+	 *
+	 * @param   array  &$segments  The URL segments to parse
+	 * @param   array  &$vars      The vars that result from the segments
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function parse(&$segments, &$vars)
+	{
+		// Get the views and the currently active query vars
+		$views  = $this->router->getViews();
+		$active = $this->router->menu->getActive();
+
+		if ($active)
+		{
+			$vars = array_merge($active->query, $vars);
+		}
+
+		// We don't have a view or its not a view of this component! We stop here
+		if (!isset($vars['view']) || !isset($views[$vars['view']]))
+		{
+			return;
+		}
+
+		// Copy the segments, so that we can iterate over all of them and at the same time modify the original segments
+		$tempSegments = $segments;
+
+		// Iterate over the segments as long as a segment fits
+		foreach ($tempSegments as $segment)
+		{
+			// Our current view is nestable. We need to check first if the segment fits to that
+			if ($views[$vars['view']]->nestable)
+			{
+				if (is_callable(array($this->router, 'get' . ucfirst($views[$vars['view']]->name) . 'Id')))
+				{
+					$key = call_user_func_array(array($this->router, 'get' . ucfirst($views[$vars['view']]->name) . 'Id'), array($segment, $vars));
+
+					// Did we get a proper key? If not, we need to look in the child-views
+					if ($key)
+					{
+						$vars[$views[$vars['view']]->key] = $key;
+
+						array_shift($segments);
+
+						continue;
+					}
+				}
+				else
+				{
+					// The router is not complete. The get<View>Id() method is missing.
+					return;
+				}
+			}
+
+			// Lets find the right view that belongs to this segment
+			$found = false;
+
+			foreach ($views[$vars['view']]->children as $view)
+			{
+				if (!$view->key)
+				{
+					if ($view->name === $segment)
+					{
+						// The segment is a view name
+						$parent       = $views[$vars['view']];
+						$vars['view'] = $view->name;
+						$found        = true;
+
+						if ($view->parent_key && isset($vars[$parent->key]))
+						{
+							$parent_key              = $vars[$parent->key];
+							$vars[$view->parent_key] = $parent_key;
+
+							unset($vars[$parent->key]);
+						}
+
+						break;
+					}
+				}
+				elseif (is_callable(array($this->router, 'get' . ucfirst($view->name) . 'Id')))
+				{
+					// Hand the data over to the router specific method and see if there is a content item that fits
+					$key = call_user_func_array(array($this->router, 'get' . ucfirst($view->name) . 'Id'), array($segment, $vars));
+
+					if ($key)
+					{
+						// Found the right view and the right item
+						$parent       = $views[$vars['view']];
+						$vars['view'] = $view->name;
+						$found        = true;
+
+						if ($view->parent_key && isset($vars[$parent->key]))
+						{
+							$parent_key              = $vars[$parent->key];
+							$vars[$view->parent_key] = $parent_key;
+
+							unset($vars[$parent->key]);
+						}
+
+						$vars[$view->key] = $key;
+
+						break;
+					}
+				}
+			}
+
+			if (!$found)
+			{
+				return;
+			}
+
+			array_shift($segments);
+		}
+	}
+
+	/**
+	 * Build a standard URL
+	 *
+	 * @param   array  &$query     The vars that should be converted
+	 * @param   array  &$segments  The URL segments to create
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function build(&$query, &$segments)
+	{
+		if (!isset($query['Itemid'], $query['view']))
+		{
+			return;
+		}
+
+		// Get the menu item belonging to the Itemid that has been found
+		$item = $this->router->menu->getItem($query['Itemid']);
+
+		if ($item === null
+			|| $item->component !== 'com_' . $this->router->getName()
+			|| !isset($item->query['view']))
+		{
+			return;
+		}
+
+		// Get menu item layout
+		$mLayout = isset($item->query['layout']) ? $item->query['layout'] : null;
+
+		// Get all views for this component
+		$views = $this->router->getViews();
+
+		// Return directly when the URL of the Itemid is identical with the URL to build
+		if ($item->query['view'] === $query['view'])
+		{
+			$view = $views[$query['view']];
+
+			if (!$view->key)
+			{
+				unset($query['view']);
+
+				if (isset($query['layout']) && $mLayout === $query['layout'])
+				{
+					unset($query['layout']);
+				}
+
+				return;
+			}
+
+			if (isset($query[$view->key]) && $item->query[$view->key] == (int) $query[$view->key])
+			{
+				unset($query[$view->key]);
+
+				while ($view)
+				{
+					unset($query[$view->parent_key]);
+
+					$view = $view->parent;
+				}
+
+				unset($query['view']);
+
+				if (isset($query['layout']) && $mLayout === $query['layout'])
+				{
+					unset($query['layout']);
+				}
+
+				return;
+			}
+		}
+
+		// Get the path from the view of the current URL and parse it to the menu item
+		$path  = array_reverse($this->router->getPath($query), true);
+		$found = false;
+
+		foreach ($path as $element => $ids)
+		{
+			$view = $views[$element];
+
+			if ($found === false && $item->query['view'] === $element)
+			{
+				if ($view->nestable)
+				{
+					$found = true;
+				}
+				elseif ($view->children)
+				{
+					$found = true;
+
+					continue;
+				}
+			}
+
+			if ($found === false)
+			{
+				// Jump to the next view
+				continue;
+			}
+
+			if ($ids)
+			{
+				if ($view->nestable)
+				{
+					$found2 = false;
+
+					foreach (array_reverse($ids, true) as $id => $segment)
+					{
+						if ($found2)
+						{
+							$segments[] = str_replace(':', '-', $segment);
+						}
+						elseif ((int) $item->query[$view->key] === (int) $id)
+						{
+							$found2 = true;
+						}
+					}
+				}
+				elseif ($ids === true)
+				{
+					$segments[] = $element;
+				}
+				else
+				{
+					$segments[] = str_replace(':', '-', current($ids));
+				}
+			}
+
+			if ($view->parent_key)
+			{
+				// Remove parent key from query
+				unset($query[$view->parent_key]);
+			}
+		}
+
+		if ($found)
+		{
+			unset($query[$views[$query['view']]->key], $query['view']);
+
+			if (isset($query['layout']) && $mLayout === $query['layout'])
+			{
+				unset($query['layout']);
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Crypt/Cipher/BlowfishCipher.php b/core/libraries/src/Crypt/Cipher/BlowfishCipher.php
new file mode 100644
index 00000000..f695c483
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/BlowfishCipher.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Crypt cipher for Blowfish encryption, decryption and key generation.
+ *
+ * @since       12.1
+ * @deprecated  4.0   Without replacment use CryptoCipher
+ */
+class BlowfishCipher extends McryptCipher
+{
+	/**
+	 * @var    integer  The mcrypt cipher constant.
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @since  12.1
+	 */
+	protected $type = MCRYPT_BLOWFISH;
+
+	/**
+	 * @var    integer  The mcrypt block cipher mode.
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @since  12.1
+	 */
+	protected $mode = MCRYPT_MODE_CBC;
+
+	/**
+	 * @var    string  The JCrypt key type for validation.
+	 * @since  12.1
+	 */
+	protected $keyType = 'blowfish';
+}
diff --git a/core/libraries/src/Crypt/Cipher/CryptoCipher.php b/core/libraries/src/Crypt/Cipher/CryptoCipher.php
new file mode 100644
index 00000000..0d663289
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/CryptoCipher.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Crypt\CipherInterface;
+use Joomla\CMS\Crypt\Key;
+
+/**
+ * Crypt cipher for encryption, decryption and key generation via the php-encryption library.
+ *
+ * @since  3.5
+ */
+class CryptoCipher implements CipherInterface
+{
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string  $data  The encrypted string to decrypt.
+	 * @param   Key     $key   The key object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   3.5
+	 * @throws  \RuntimeException
+	 */
+	public function decrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type != 'crypto')
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected crypto.');
+		}
+
+		// Decrypt the data.
+		try
+		{
+			return \Crypto::Decrypt($data, $key->public);
+		}
+		catch (\InvalidCiphertextException $ex)
+		{
+			throw new \RuntimeException('DANGER! DANGER! The ciphertext has been tampered with!', $ex->getCode(), $ex);
+		}
+		catch (\CryptoTestFailedException $ex)
+		{
+			throw new \RuntimeException('Cannot safely perform decryption', $ex->getCode(), $ex);
+		}
+		catch (\CannotPerformOperationException $ex)
+		{
+			throw new \RuntimeException('Cannot safely perform decryption', $ex->getCode(), $ex);
+		}
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string  $data  The data string to encrypt.
+	 * @param   Key     $key   The key object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   3.5
+	 * @throws  \RuntimeException
+	 */
+	public function encrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type != 'crypto')
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected crypto.');
+		}
+
+		// Encrypt the data.
+		try
+		{
+			return \Crypto::Encrypt($data, $key->public);
+		}
+		catch (\CryptoTestFailedException $ex)
+		{
+			throw new \RuntimeException('Cannot safely perform encryption', $ex->getCode(), $ex);
+		}
+		catch (\CannotPerformOperationException $ex)
+		{
+			throw new \RuntimeException('Cannot safely perform encryption', $ex->getCode(), $ex);
+		}
+	}
+
+	/**
+	 * Method to generate a new encryption key object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  Key
+	 *
+	 * @since   3.5
+	 * @throws  \RuntimeException
+	 */
+	public function generateKey(array $options = array())
+	{
+		// Create the new encryption key object.
+		$key = new Key('crypto');
+
+		// Generate the encryption key.
+		try
+		{
+			$key->public = \Crypto::CreateNewRandomKey();
+		}
+		catch (\CryptoTestFailedException $ex)
+		{
+			throw new \RuntimeException('Cannot safely create a key', $ex->getCode(), $ex);
+		}
+		catch (\CannotPerformOperationException $ex)
+		{
+			throw new \RuntimeException('Cannot safely create a key', $ex->getCode(), $ex);
+		}
+
+		// Explicitly flag the private as unused in this cipher.
+		$key->private = 'unused';
+
+		return $key;
+	}
+}
diff --git a/core/libraries/src/Crypt/Cipher/McryptCipher.php b/core/libraries/src/Crypt/Cipher/McryptCipher.php
new file mode 100644
index 00000000..4a7da80f
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/McryptCipher.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Crypt\CipherInterface;
+use Joomla\CMS\Crypt\Crypt;
+use Joomla\CMS\Crypt\Key;
+
+/**
+ * Crypt cipher for mcrypt algorithm encryption, decryption and key generation.
+ *
+ * @since       12.1
+ * @deprecated  4.0   Without replacment use CryptoCipher
+ */
+abstract class McryptCipher implements CipherInterface
+{
+	/**
+	 * @var    integer  The mcrypt cipher constant.
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @since  12.1
+	 */
+	protected $type;
+
+	/**
+	 * @var    integer  The mcrypt block cipher mode.
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @since  12.1
+	 */
+	protected $mode;
+
+	/**
+	 * @var    string  The Crypt key type for validation.
+	 * @since  12.1
+	 */
+	protected $keyType;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since   12.1
+	 * @throws  \RuntimeException
+	 */
+	public function __construct()
+	{
+		if (!is_callable('mcrypt_encrypt'))
+		{
+			throw new \RuntimeException('The mcrypt extension is not available.');
+		}
+	}
+
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string  $data  The encrypted string to decrypt.
+	 * @param   Key     $key   The key object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   12.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function decrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type != $this->keyType)
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected ' . $this->keyType . '.');
+		}
+
+		// Decrypt the data.
+		$decrypted = trim(mcrypt_decrypt($this->type, $key->private, $data, $this->mode, $key->public));
+
+		return $decrypted;
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string  $data  The data string to encrypt.
+	 * @param   Key     $key   The key object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   12.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function encrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type != $this->keyType)
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected ' . $this->keyType . '.');
+		}
+
+		// Encrypt the data.
+		$encrypted = mcrypt_encrypt($this->type, $key->private, $data, $this->mode, $key->public);
+
+		return $encrypted;
+	}
+
+	/**
+	 * Method to generate a new encryption key object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  Key
+	 *
+	 * @since   12.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function generateKey(array $options = array())
+	{
+		// Create the new encryption key object.
+		$key = new Key($this->keyType);
+
+		// Generate an initialisation vector based on the algorithm.
+		$key->public = mcrypt_create_iv(mcrypt_get_iv_size($this->type, $this->mode), MCRYPT_DEV_URANDOM);
+
+		// Get the salt and password setup.
+		$salt = (isset($options['salt'])) ? $options['salt'] : substr(pack('h*', md5(Crypt::genRandomBytes())), 0, 16);
+
+		if (!isset($options['password']))
+		{
+			throw new \InvalidArgumentException('Password is not set.');
+		}
+
+		// Generate the derived key.
+		$key->private = $this->pbkdf2($options['password'], $salt, mcrypt_get_key_size($this->type, $this->mode));
+
+		return $key;
+	}
+
+	/**
+	 * PBKDF2 Implementation for deriving keys.
+	 *
+	 * @param   string   $p   Password
+	 * @param   string   $s   Salt
+	 * @param   integer  $kl  Key length
+	 * @param   integer  $c   Iteration count
+	 * @param   string   $a   Hash algorithm
+	 *
+	 * @return  string  The derived key.
+	 *
+	 * @link    https://en.wikipedia.org/wiki/PBKDF2
+	 * @link    http://www.ietf.org/rfc/rfc2898.txt
+	 * @since   12.1
+	 */
+	public function pbkdf2($p, $s, $kl, $c = 10000, $a = 'sha256')
+	{
+		// Hash length.
+		$hl = strlen(hash($a, null, true));
+
+		// Key blocks to compute.
+		$kb = ceil($kl / $hl);
+
+		// Derived key.
+		$dk = '';
+
+		// Create the key.
+		for ($block = 1; $block <= $kb; $block++)
+		{
+			// Initial hash for this block.
+			$ib = $b = hash_hmac($a, $s . pack('N', $block), $p, true);
+
+			// Perform block iterations.
+			for ($i = 1; $i < $c; $i++)
+			{
+				$ib ^= ($b = hash_hmac($a, $b, $p, true));
+			}
+
+			// Append the iterated block.
+			$dk .= $ib;
+		}
+
+		// Return derived key of correct length.
+		return substr($dk, 0, $kl);
+	}
+}
diff --git a/core/libraries/src/Crypt/Cipher/Rijndael256Cipher.php b/core/libraries/src/Crypt/Cipher/Rijndael256Cipher.php
new file mode 100644
index 00000000..7ee467bf
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/Rijndael256Cipher.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Crypt cipher for Rijndael 256 encryption, decryption and key generation.
+ *
+ * @since       12.1
+ * @deprecated  4.0   Without replacment use CryptoCipher
+ */
+class Rijndael256Cipher extends McryptCipher
+{
+	/**
+	 * @var    integer  The mcrypt cipher constant.
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @since  12.1
+	 */
+	protected $type = MCRYPT_RIJNDAEL_256;
+
+	/**
+	 * @var    integer  The mcrypt block cipher mode.
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @since  12.1
+	 */
+	protected $mode = MCRYPT_MODE_CBC;
+
+	/**
+	 * @var    string  The JCrypt key type for validation.
+	 * @since  12.1
+	 */
+	protected $keyType = 'rijndael256';
+}
diff --git a/core/libraries/src/Crypt/Cipher/SimpleCipher.php b/core/libraries/src/Crypt/Cipher/SimpleCipher.php
new file mode 100644
index 00000000..4468b307
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/SimpleCipher.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Crypt\CipherInterface;
+use Joomla\CMS\Crypt\Crypt;
+use Joomla\CMS\Crypt\Key;
+
+/**
+ * Crypt cipher for Simple encryption, decryption and key generation.
+ *
+ * @since       12.1
+ * @deprecated  4.0 (CMS)
+ */
+class SimpleCipher implements CipherInterface
+{
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string  $data  The encrypted string to decrypt.
+	 * @param   Key     $key   The key[/pair] object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   12.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function decrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type != 'simple')
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected simple.');
+		}
+
+		$decrypted = '';
+		$tmp = $key->public;
+
+		// Convert the HEX input into an array of integers and get the number of characters.
+		$chars = $this->_hexToIntArray($data);
+		$charCount = count($chars);
+
+		// Repeat the key as many times as necessary to ensure that the key is at least as long as the input.
+		for ($i = 0; $i < $charCount; $i = strlen($tmp))
+		{
+			$tmp = $tmp . $tmp;
+		}
+
+		// Get the XOR values between the ASCII values of the input and key characters for all input offsets.
+		for ($i = 0; $i < $charCount; $i++)
+		{
+			$decrypted .= chr($chars[$i] ^ ord($tmp[$i]));
+		}
+
+		return $decrypted;
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string  $data  The data string to encrypt.
+	 * @param   Key     $key   The key[/pair] object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   12.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function encrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type != 'simple')
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected simple.');
+		}
+
+		$encrypted = '';
+		$tmp = $key->private;
+
+		// Split up the input into a character array and get the number of characters.
+		$chars = preg_split('//', $data, -1, PREG_SPLIT_NO_EMPTY);
+		$charCount = count($chars);
+
+		// Repeat the key as many times as necessary to ensure that the key is at least as long as the input.
+		for ($i = 0; $i < $charCount; $i = strlen($tmp))
+		{
+			$tmp = $tmp . $tmp;
+		}
+
+		// Get the XOR values between the ASCII values of the input and key characters for all input offsets.
+		for ($i = 0; $i < $charCount; $i++)
+		{
+			$encrypted .= $this->_intToHex(ord($tmp[$i]) ^ ord($chars[$i]));
+		}
+
+		return $encrypted;
+	}
+
+	/**
+	 * Method to generate a new encryption key[/pair] object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  Key
+	 *
+	 * @since   12.1
+	 */
+	public function generateKey(array $options = array())
+	{
+		// Create the new encryption key[/pair] object.
+		$key = new Key('simple');
+
+		// Just a random key of a given length.
+		$key->private = Crypt::genRandomBytes(256);
+		$key->public  = $key->private;
+
+		return $key;
+	}
+
+	/**
+	 * Convert hex to an integer
+	 *
+	 * @param   string   $s  The hex string to convert.
+	 * @param   integer  $i  The offset?
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	private function _hexToInt($s, $i)
+	{
+		$j = (int) $i * 2;
+		$k = 0;
+		$s1 = (string) $s;
+
+		// Get the character at position $j.
+		$c = substr($s1, $j, 1);
+
+		// Get the character at position $j + 1.
+		$c1 = substr($s1, $j + 1, 1);
+
+		switch ($c)
+		{
+			case 'A':
+				$k += 160;
+				break;
+			case 'B':
+				$k += 176;
+				break;
+			case 'C':
+				$k += 192;
+				break;
+			case 'D':
+				$k += 208;
+				break;
+			case 'E':
+				$k += 224;
+				break;
+			case 'F':
+				$k += 240;
+				break;
+			case ' ':
+				$k += 0;
+				break;
+			default:
+				(int) $k = $k + (16 * (int) $c);
+				break;
+		}
+
+		switch ($c1)
+		{
+			case 'A':
+				$k += 10;
+				break;
+			case 'B':
+				$k += 11;
+				break;
+			case 'C':
+				$k += 12;
+				break;
+			case 'D':
+				$k += 13;
+				break;
+			case 'E':
+				$k += 14;
+				break;
+			case 'F':
+				$k += 15;
+				break;
+			case ' ':
+				$k += 0;
+				break;
+			default:
+				$k += (int) $c1;
+				break;
+		}
+
+		return $k;
+	}
+
+	/**
+	 * Convert hex to an array of integers
+	 *
+	 * @param   string  $hex  The hex string to convert to an integer array.
+	 *
+	 * @return  array  An array of integers.
+	 *
+	 * @since   11.1
+	 */
+	private function _hexToIntArray($hex)
+	{
+		$array = array();
+
+		$j = (int) strlen($hex) / 2;
+
+		for ($i = 0; $i < $j; $i++)
+		{
+			$array[$i] = (int) $this->_hexToInt($hex, $i);
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Convert an integer to a hexadecimal string.
+	 *
+	 * @param   integer  $i  An integer value to convert to a hex string.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	private function _intToHex($i)
+	{
+		// Sanitize the input.
+		$i = (int) $i;
+
+		// Get the first character of the hexadecimal string if there is one.
+		$j = (int) ($i / 16);
+
+		if ($j === 0)
+		{
+			$s = ' ';
+		}
+		else
+		{
+			$s = strtoupper(dechex($j));
+		}
+
+		// Get the second character of the hexadecimal string.
+		$k = $i - $j * 16;
+		$s = $s . strtoupper(dechex($k));
+
+		return $s;
+	}
+}
diff --git a/core/libraries/src/Crypt/Cipher/SodiumCipher.php b/core/libraries/src/Crypt/Cipher/SodiumCipher.php
new file mode 100644
index 00000000..55006233
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/SodiumCipher.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Crypt\CipherInterface;
+use Joomla\CMS\Crypt\Key;
+use ParagonIE\Sodium\Compat;
+
+/**
+ * JCrypt cipher for sodium algorithm encryption, decryption and key generation.
+ *
+ * @since  3.8.0
+ */
+class SodiumCipher implements CipherInterface
+{
+	/**
+	 * The message nonce to be used with encryption/decryption
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	private $nonce;
+
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string  $data  The encrypted string to decrypt.
+	 * @param   Key     $key   The key object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   3.8.0
+	 * @throws  \RuntimeException
+	 */
+	public function decrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type !== 'sodium')
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
+		}
+
+		if (!$this->nonce)
+		{
+			throw new \RuntimeException('Missing nonce to decrypt data');
+		}
+
+		$decrypted = Compat::crypto_box_open(
+			$data,
+			$this->nonce,
+			Compat::crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
+		);
+
+		if ($decrypted === false)
+		{
+			throw new \RuntimeException('Malformed message or invalid MAC');
+		}
+
+		return $decrypted;
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string  $data  The data string to encrypt.
+	 * @param   Key     $key   The key object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   3.8.0
+	 * @throws  \RuntimeException
+	 */
+	public function encrypt($data, Key $key)
+	{
+		// Validate key.
+		if ($key->type !== 'sodium')
+		{
+			throw new \InvalidArgumentException('Invalid key of type: ' . $key->type . '.  Expected sodium.');
+		}
+
+		if (!$this->nonce)
+		{
+			throw new \RuntimeException('Missing nonce to decrypt data');
+		}
+
+		return Compat::crypto_box(
+			$data,
+			$this->nonce,
+			Compat::crypto_box_keypair_from_secretkey_and_publickey($key->private, $key->public)
+		);
+	}
+
+	/**
+	 * Method to generate a new encryption key object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  Key
+	 *
+	 * @since   3.8.0
+	 * @throws  RuntimeException
+	 */
+	public function generateKey(array $options = array())
+	{
+		// Create the new encryption key object.
+		$key = new Key('sodium');
+
+		// Generate the encryption key.
+		$pair = Compat::crypto_box_keypair();
+
+		$key->public  = Compat::crypto_box_publickey($pair);
+		$key->private = Compat::crypto_box_secretkey($pair);
+
+		return $key;
+	}
+
+	/**
+	 * Set the nonce to use for encrypting/decrypting messages
+	 *
+	 * @param   string  $nonce  The message nonce
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function setNonce($nonce)
+	{
+		$this->nonce = $nonce;
+	}
+}
diff --git a/core/libraries/src/Crypt/Cipher/TripleDesCipher.php b/core/libraries/src/Crypt/Cipher/TripleDesCipher.php
new file mode 100644
index 00000000..1026e7c2
--- /dev/null
+++ b/core/libraries/src/Crypt/Cipher/TripleDesCipher.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Cipher;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JCrypt cipher for Triple DES encryption, decryption and key generation.
+ *
+ * @since       12.1
+ * @deprecated  4.0   Without replacement use CryptoCipher
+ */
+class TripleDesCipher extends McryptCipher
+{
+	/**
+	 * @var    integer  The mcrypt cipher constant.
+	 * @link   https://secure.php.net/manual/en/mcrypt.ciphers.php
+	 * @since  12.1
+	 */
+	protected $type = MCRYPT_3DES;
+
+	/**
+	 * @var    integer  The mcrypt block cipher mode.
+	 * @link   https://secure.php.net/manual/en/mcrypt.constants.php
+	 * @since  12.1
+	 */
+	protected $mode = MCRYPT_MODE_CBC;
+
+	/**
+	 * @var    string  The Crypt key type for validation.
+	 * @since  12.1
+	 */
+	protected $keyType = '3des';
+}
diff --git a/core/libraries/src/Crypt/CipherInterface.php b/core/libraries/src/Crypt/CipherInterface.php
new file mode 100644
index 00000000..609bda42
--- /dev/null
+++ b/core/libraries/src/Crypt/CipherInterface.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Crypt cipher interface.
+ *
+ * @since  12.1
+ */
+interface CipherInterface
+{
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string  $data  The encrypted string to decrypt.
+	 * @param   Key     $key   The key[/pair] object to use for decryption.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   12.1
+	 */
+	public function decrypt($data, Key $key);
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string  $data  The data string to encrypt.
+	 * @param   Key     $key   The key[/pair] object to use for encryption.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   12.1
+	 */
+	public function encrypt($data, Key $key);
+
+	/**
+	 * Method to generate a new encryption key[/pair] object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  Key
+	 *
+	 * @since   12.1
+	 */
+	public function generateKey(array $options = array());
+}
diff --git a/core/libraries/src/Crypt/Crypt.php b/core/libraries/src/Crypt/Crypt.php
new file mode 100644
index 00000000..340eedfc
--- /dev/null
+++ b/core/libraries/src/Crypt/Crypt.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Crypt\Cipher\SimpleCipher;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Crypt is a Joomla Platform class for handling basic encryption/decryption of data.
+ *
+ * @since  12.1
+ */
+class Crypt
+{
+	/**
+	 * @var    CipherInterface  The encryption cipher object.
+	 * @since  12.1
+	 */
+	private $_cipher;
+
+	/**
+	 * @var    Key  The encryption key[/pair)].
+	 * @since  12.1
+	 */
+	private $_key;
+
+	/**
+	 * Object Constructor takes an optional key to be used for encryption/decryption. If no key is given then the
+	 * secret word from the configuration object is used.
+	 *
+	 * @param   CipherInterface  $cipher  The encryption cipher object.
+	 * @param   Key              $key     The encryption key[/pair)].
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(CipherInterface $cipher = null, Key $key = null)
+	{
+		// Set the encryption key[/pair)].
+		$this->_key = $key;
+
+		// Set the encryption cipher.
+		$this->_cipher = isset($cipher) ? $cipher : new SimpleCipher;
+	}
+
+	/**
+	 * Method to decrypt a data string.
+	 *
+	 * @param   string  $data  The encrypted string to decrypt.
+	 *
+	 * @return  string  The decrypted data string.
+	 *
+	 * @since   12.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function decrypt($data)
+	{
+		try
+		{
+			return $this->_cipher->decrypt($data, $this->_key);
+		}
+		catch (\InvalidArgumentException $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to encrypt a data string.
+	 *
+	 * @param   string  $data  The data string to encrypt.
+	 *
+	 * @return  string  The encrypted data string.
+	 *
+	 * @since   12.1
+	 */
+	public function encrypt($data)
+	{
+		return $this->_cipher->encrypt($data, $this->_key);
+	}
+
+	/**
+	 * Method to generate a new encryption key[/pair] object.
+	 *
+	 * @param   array  $options  Key generation options.
+	 *
+	 * @return  Key
+	 *
+	 * @since   12.1
+	 */
+	public function generateKey(array $options = array())
+	{
+		return $this->_cipher->generateKey($options);
+	}
+
+	/**
+	 * Method to set the encryption key[/pair] object.
+	 *
+	 * @param   Key  $key  The key object to set.
+	 *
+	 * @return  Crypt
+	 *
+	 * @since   12.1
+	 */
+	public function setKey(Key $key)
+	{
+		$this->_key = $key;
+
+		return $this;
+	}
+
+	/**
+	 * Generate random bytes.
+	 *
+	 * @param   integer  $length  Length of the random data to generate
+	 *
+	 * @return  string  Random binary data
+	 *
+	 * @since   12.1
+	 */
+	public static function genRandomBytes($length = 16)
+	{
+		return random_bytes($length);
+	}
+
+	/**
+	 * A timing safe comparison method.
+	 *
+	 * This defeats hacking attempts that use timing based attack vectors.
+	 *
+	 * NOTE: Length will leak.
+	 *
+	 * @param   string  $known    A known string to check against.
+	 * @param   string  $unknown  An unknown string to check.
+	 *
+	 * @return  boolean  True if the two strings are exactly the same.
+	 *
+	 * @since   3.2
+	 */
+	public static function timingSafeCompare($known, $unknown)
+	{
+		// This function is native in PHP as of 5.6 and backported via the symfony/polyfill-56 library
+		return hash_equals((string) $known, (string) $unknown);
+	}
+
+	/**
+	 * Tests for the availability of updated crypt().
+	 * Based on a method by Anthony Ferrera
+	 *
+	 * @return  boolean  Always returns true since 3.3
+	 *
+	 * @note    To be removed when PHP 5.3.7 or higher is the minimum supported version.
+	 * @link    https://github.com/ircmaxell/password_compat/blob/master/version-test.php
+	 * @since   3.2
+	 * @deprecated  4.0
+	 */
+	public static function hasStrongPasswordSupport()
+	{
+		// Log usage of deprecated function
+		Log::add(__METHOD__ . '() is deprecated without replacement.', Log::WARNING, 'deprecated');
+
+		if (!defined('PASSWORD_DEFAULT'))
+		{
+			// Always make sure that the password hashing API has been defined.
+			include_once JPATH_ROOT . '/vendor/ircmaxell/password-compat/lib/password.php';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Safely detect a string's length
+	 *
+	 * This method is derived from \ParagonIE\Halite\Util::safeStrlen()
+	 *
+	 * @param   string  $str  String to check the length of
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.5
+	 * @ref     mbstring.func_overload
+	 * @throws  \RuntimeException
+	 */
+	public static function safeStrlen($str)
+	{
+		static $exists = null;
+
+		if ($exists === null)
+		{
+			$exists = function_exists('mb_strlen');
+		}
+
+		if ($exists)
+		{
+			$length = mb_strlen($str, '8bit');
+
+			if ($length === false)
+			{
+				throw new \RuntimeException('mb_strlen() failed unexpectedly');
+			}
+
+			return $length;
+		}
+
+		// If we reached here, we can rely on strlen to count bytes:
+		return \strlen($str);
+	}
+
+	/**
+	 * Safely extract a substring
+	 *
+	 * This method is derived from \ParagonIE\Halite\Util::safeSubstr()
+	 *
+	 * @param   string   $str     The string to extract the substring from
+	 * @param   integer  $start   The starting position to extract from
+	 * @param   integer  $length  The length of the string to return
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public static function safeSubstr($str, $start, $length = null)
+	{
+		static $exists = null;
+
+		if ($exists === null)
+		{
+			$exists = function_exists('mb_substr');
+		}
+
+		if ($exists)
+		{
+			// In PHP 5.3 mb_substr($str, 0, NULL, '8bit') returns an empty string, so we have to find the length ourselves.
+			if ($length === null)
+			{
+				if ($start >= 0)
+				{
+					$length = static::safeStrlen($str) - $start;
+				}
+				else
+				{
+					$length = -$start;
+				}
+			}
+
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		// Unlike mb_substr(), substr() doesn't accept NULL for length
+		if ($length !== null)
+		{
+			return substr($str, $start, $length);
+		}
+
+		return substr($str, $start);
+	}
+}
diff --git a/core/libraries/src/Crypt/CryptPassword.php b/core/libraries/src/Crypt/CryptPassword.php
new file mode 100644
index 00000000..0c5fa204
--- /dev/null
+++ b/core/libraries/src/Crypt/CryptPassword.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Password Hashing Interface
+ *
+ * @since       12.2
+ * @deprecated  4.0  Use PHP 5.5's native password hashing API
+ */
+interface CryptPassword
+{
+	const BLOWFISH = '$2y$';
+
+	const JOOMLA = 'Joomla';
+
+	const PBKDF = '$pbkdf$';
+
+	const MD5 = '$1$';
+
+	/**
+	 * Creates a password hash
+	 *
+	 * @param   string  $password  The password to hash.
+	 * @param   string  $type      The type of hash. This determines the prefix of the hashing function.
+	 *
+	 * @return  string  The hashed password.
+	 *
+	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function create($password, $type = null);
+
+	/**
+	 * Verifies a password hash
+	 *
+	 * @param   string  $password  The password to verify.
+	 * @param   string  $hash      The password hash to check.
+	 *
+	 * @return  boolean  True if the password is valid, false otherwise.
+	 *
+	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function verify($password, $hash);
+
+	/**
+	 * Sets a default prefix
+	 *
+	 * @param   string  $type  The prefix to set as default
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function setDefaultType($type);
+
+	/**
+	 * Gets the default type
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function getDefaultType();
+}
diff --git a/core/libraries/src/Crypt/Key.php b/core/libraries/src/Crypt/Key.php
new file mode 100644
index 00000000..c87c466f
--- /dev/null
+++ b/core/libraries/src/Crypt/Key.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Encryption key object for the Joomla Platform.
+ *
+ * @property-read  string  $type  The key type.
+ *
+ * @since  12.1
+ */
+class Key
+{
+	/**
+	 * @var    string  The private key.
+	 * @since  12.1
+	 */
+	public $private;
+
+	/**
+	 * @var    string  The public key.
+	 * @since  12.1
+	 */
+	public $public;
+
+	/**
+	 * @var    string  The key type.
+	 * @since  12.1
+	 */
+	protected $type;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $type     The key type.
+	 * @param   string  $private  The private key.
+	 * @param   string  $public   The public key.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($type, $private = null, $public = null)
+	{
+		// Set the key type.
+		$this->type = (string) $type;
+
+		// Set the optional public/private key strings.
+		$this->private = isset($private) ? (string) $private : null;
+		$this->public  = isset($public) ? (string) $public : null;
+	}
+
+	/**
+	 * Magic method to return some protected property values.
+	 *
+	 * @param   string  $name  The name of the property to return.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.1
+	 */
+	public function __get($name)
+	{
+		if ($name == 'type')
+		{
+			return $this->type;
+		}
+
+		trigger_error('Cannot access property ' . __CLASS__ . '::' . $name, E_USER_WARNING);
+	}
+}
diff --git a/core/libraries/src/Crypt/Password/SimpleCryptPassword.php b/core/libraries/src/Crypt/Password/SimpleCryptPassword.php
new file mode 100644
index 00000000..e285f8fd
--- /dev/null
+++ b/core/libraries/src/Crypt/Password/SimpleCryptPassword.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Crypt\Password;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Crypt\Crypt;
+use Joomla\CMS\Crypt\CryptPassword;
+
+/**
+ * Joomla Platform Password Crypter
+ *
+ * @since       12.2
+ * @deprecated  4.0  Use PHP 5.5's native password hashing API
+ */
+class SimpleCryptPassword implements CryptPassword
+{
+	/**
+	 * @var    integer  The cost parameter for hashing algorithms.
+	 * @since  12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	protected $cost = 10;
+
+	/**
+	 * @var    string   The default hash type
+	 * @since  12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	protected $defaultType = '$2y$';
+
+	/**
+	 * Creates a password hash
+	 *
+	 * @param   string  $password  The password to hash.
+	 * @param   string  $type      The hash type.
+	 *
+	 * @return  mixed  The hashed password or false if the password is too long.
+	 *
+	 * @since   12.2
+	 * @throws  \InvalidArgumentException
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function create($password, $type = null)
+	{
+		if (empty($type))
+		{
+			$type = $this->defaultType;
+		}
+
+		switch ($type)
+		{
+			case '$2a$':
+			case CryptPassword::BLOWFISH:
+
+				$type = '$2a$';
+
+				if (Crypt::hasStrongPasswordSupport())
+				{
+					$type = '$2y$';
+				}
+
+				$salt = $type . str_pad($this->cost, 2, '0', STR_PAD_LEFT) . '$' . $this->getSalt(22);
+
+				return crypt($password, $salt);
+
+			case CryptPassword::MD5:
+				$salt = $this->getSalt(12);
+
+				$salt = '$1$' . $salt;
+
+				return crypt($password, $salt);
+
+			case CryptPassword::JOOMLA:
+				$salt = $this->getSalt(32);
+
+				return md5($password . $salt) . ':' . $salt;
+
+			default:
+				throw new \InvalidArgumentException(sprintf('Hash type %s is not supported', $type));
+				break;
+		}
+	}
+
+	/**
+	 * Sets the cost parameter for the generated hash for algorithms that use a cost factor.
+	 *
+	 * @param   integer  $cost  The new cost value.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function setCost($cost)
+	{
+		$this->cost = $cost;
+	}
+
+	/**
+	 * Generates a salt of specified length. The salt consists of characters in the set [./0-9A-Za-z].
+	 *
+	 * @param   integer  $length  The number of characters to return.
+	 *
+	 * @return  string  The string of random characters.
+	 *
+	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	protected function getSalt($length)
+	{
+		$bytes = ceil($length * 6 / 8);
+
+		$randomData = str_replace('+', '.', base64_encode(Crypt::genRandomBytes($bytes)));
+
+		return substr($randomData, 0, $length);
+	}
+
+	/**
+	 * Verifies a password hash
+	 *
+	 * @param   string  $password  The password to verify.
+	 * @param   string  $hash      The password hash to check.
+	 *
+	 * @return  boolean  True if the password is valid, false otherwise.
+	 *
+	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function verify($password, $hash)
+	{
+		// Check if the hash is a blowfish hash.
+		if (substr($hash, 0, 4) == '$2a$' || substr($hash, 0, 4) == '$2y$')
+		{
+			$type = '$2a$';
+
+			if (Crypt::hasStrongPasswordSupport())
+			{
+				$type = '$2y$';
+			}
+
+			return password_verify($password, $hash);
+		}
+
+		// Check if the hash is an MD5 hash.
+		if (substr($hash, 0, 3) == '$1$')
+		{
+			return Crypt::timingSafeCompare(crypt($password, $hash), $hash);
+		}
+
+		// Check if the hash is a Joomla hash.
+		if (preg_match('#[a-z0-9]{32}:[A-Za-z0-9]{32}#', $hash) === 1)
+		{
+			// Check the password
+			$parts = explode(':', $hash);
+			$salt  = @$parts[1];
+
+			// Compile the hash to compare
+			// If the salt is empty AND there is a ':' in the original hash, we must append ':' at the end
+			$testcrypt = md5($password . $salt) . ($salt ? ':' . $salt : (strpos($hash, ':') !== false ? ':' : ''));
+
+			return Crypt::timingSafeCompare($hash, $testcrypt);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets a default type
+	 *
+	 * @param   string  $type  The value to set as default.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function setDefaultType($type)
+	{
+		if (!empty($type))
+		{
+			$this->defaultType = $type;
+		}
+	}
+
+	/**
+	 * Gets the default type
+	 *
+	 * @return   string  $type  The default type
+	 *
+	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
+	 */
+	public function getDefaultType()
+	{
+		return $this->defaultType;
+	}
+}
diff --git a/core/libraries/src/Crypt/README.md b/core/libraries/src/Crypt/README.md
new file mode 100644
index 00000000..d3b07a69
--- /dev/null
+++ b/core/libraries/src/Crypt/README.md
@@ -0,0 +1,70 @@
+# Important Security Information
+
+If you're going to use JCrypt in any of your extensions, make *sure* you use **CryptoCipher** or **SodiumCipher**; These are the only two which are cryptographically secure.
+
+```php
+use Joomla\CMS\Crypt\Cipher\SodiumCipher;
+
+$cipher = new SodiumCipher;
+$key    = $cipher->generateKey();
+$data   = 'My encrypted data.';
+
+$cipher->setNonce(\Sodium\randombytes_buf(\Sodium\CRYPTO_BOX_NONCEBYTES));
+
+$encrypted = $cipher->encrypt($data, $key);
+$decrypted = $cipher->decrypt($encrypted, $key);
+
+if ($decrypted !== $data)
+{
+	throw new RuntimeException('The data was not decrypted correctly.');
+}
+```
+
+```php
+use Joomla\CMS\Crypt\Cipher\CryptoCipher;
+
+$cipher = new CryptoCipher();
+$key = $cipher->generateKey(); // Store this for long-term use
+
+$message = "We're all living on a yellow submarine!";
+$ciphertext = $cipher->encrypt($message, $key);
+$decrypted = $cipher->decrypt($ciphertext, $key);
+```
+
+## Avoid these Ciphers if Possible
+
+* `JCryptCipher3Des`
+* `JCryptCipherBlowfish`
+* `JCryptCipherMcrypt`
+* `JCryptCipherRijndael256`
+
+All of these ciphers are vulnerable to something called a [chosen-ciphertext attack](https://en.wikipedia.org/wiki/Chosen-ciphertext_attack). The only provable way to prevent chosen-ciphertext attacks is to [use authenticated encryption](https://paragonie.com/blog/2015/05/using-encryption-and-authentication-correctly), preferrably in an [Encrypt-then-MAC construction](http://www.thoughtcrime.org/blog/the-cryptographic-doom-principle/).
+
+The only JCrypt cipher that meets the *authenticated encryption* criteria is **`JCryptCipherCrypto`**.
+
+## Absolutely Avoid JCryptCipherSimple
+
+`JCryptCipherSimple` is deprecated and will be removed in Joomla 4. It's vulnerable to a known plaintext attack: If you know any information about the plaintext (e.g. the first character is '<'), an attacker can recover bits of the encryption key with ease.
+
+If an attacker can influence the message, they can actually steal your encryption key. Here's how:
+
+1. Feed `str_repeat('A', 256)` into your application, towards `JCryptCipherSimple`.
+2. Observe the output of the cipher (the ciphertext).
+3. Run it through this code:
+
+```php
+function recoverJcryptCipherSimpleKey($ciphertext, $knownPlaintext)
+{
+    $key = '';
+    for ($i = 0; $i < strlen($knownPlaintext); ++$i) {
+      $key.= chr(ord($ciphertext[$i]) ^ ord($knownPlaintext[$i]));
+    }
+}
+
+$key = recoverJcryptCipherSimpleKey(
+    $someEncryptedTextOutput,
+    str_repeat('A', 256)
+);
+```
+
+Given how trivial it is to steal the encryption key from this cipher, you absolutely should not use it.
diff --git a/core/libraries/src/Date/Date.php b/core/libraries/src/Date/Date.php
new file mode 100644
index 00000000..9751af8f
--- /dev/null
+++ b/core/libraries/src/Date/Date.php
@@ -0,0 +1,469 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Date;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JDate is a class that stores a date and provides logic to manipulate
+ * and render that date in a variety of formats.
+ *
+ * @method  Date|bool  add(\DateInterval $interval)  Adds an amount of days, months, years, hours, minutes and seconds to a JDate object.
+ * @method  Date|bool  sub(\DateInterval $interval)  Subtracts an amount of days, months, years, hours, minutes and seconds from a JDate object.
+ * @method  Date|bool  modify(string $modify)       Alter the timestamp of this object by incre/decre-menting in a format accepted by strtotime().
+ *
+ * @property-read  string   $daysinmonth   t - Number of days in the given month.
+ * @property-read  string   $dayofweek     N - ISO-8601 numeric representation of the day of the week.
+ * @property-read  string   $dayofyear     z - The day of the year (starting from 0).
+ * @property-read  boolean  $isleapyear    L - Whether it's a leap year.
+ * @property-read  string   $day           d - Day of the month, 2 digits with leading zeros.
+ * @property-read  string   $hour          H - 24-hour format of an hour with leading zeros.
+ * @property-read  string   $minute        i - Minutes with leading zeros.
+ * @property-read  string   $second        s - Seconds with leading zeros.
+ * @property-read  string   $microsecond   u - Microseconds with leading zeros.
+ * @property-read  string   $month         m - Numeric representation of a month, with leading zeros.
+ * @property-read  string   $ordinal       S - English ordinal suffix for the day of the month, 2 characters.
+ * @property-read  string   $week          W - ISO-8601 week number of year, weeks starting on Monday.
+ * @property-read  string   $year          Y - A full numeric representation of a year, 4 digits.
+ *
+ * @since  11.1
+ */
+class Date extends \DateTime
+{
+	const DAY_ABBR = "\x021\x03";
+	const DAY_NAME = "\x022\x03";
+	const MONTH_ABBR = "\x023\x03";
+	const MONTH_NAME = "\x024\x03";
+
+	/**
+	 * The format string to be applied when using the __toString() magic method.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public static $format = 'Y-m-d H:i:s';
+
+	/**
+	 * Placeholder for a \DateTimeZone object with GMT as the time zone.
+	 *
+	 * @var    object
+	 * @since  11.1
+	 */
+	protected static $gmt;
+
+	/**
+	 * Placeholder for a \DateTimeZone object with the default server
+	 * time zone as the time zone.
+	 *
+	 * @var    object
+	 * @since  11.1
+	 */
+	protected static $stz;
+
+	/**
+	 * The \DateTimeZone object for usage in rending dates as strings.
+	 *
+	 * @var    \DateTimeZone
+	 * @since  12.1
+	 */
+	protected $tz;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $date  String in a format accepted by strtotime(), defaults to "now".
+	 * @param   mixed   $tz    Time zone to be used for the date. Might be a string or a DateTimeZone object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($date = 'now', $tz = null)
+	{
+		// Create the base GMT and server time zone objects.
+		if (empty(self::$gmt) || empty(self::$stz))
+		{
+			self::$gmt = new \DateTimeZone('GMT');
+			self::$stz = new \DateTimeZone(@date_default_timezone_get());
+		}
+
+		// If the time zone object is not set, attempt to build it.
+		if (!($tz instanceof \DateTimeZone))
+		{
+			if ($tz === null)
+			{
+				$tz = self::$gmt;
+			}
+			elseif (is_string($tz))
+			{
+				$tz = new \DateTimeZone($tz);
+			}
+		}
+
+		// If the date is numeric assume a unix timestamp and convert it.
+		date_default_timezone_set('UTC');
+		$date = is_numeric($date) ? date('c', $date) : $date;
+
+		// Call the DateTime constructor.
+		parent::__construct($date, $tz);
+
+		// Reset the timezone for 3rd party libraries/extension that does not use JDate
+		date_default_timezone_set(self::$stz->getName());
+
+		// Set the timezone object for access later.
+		$this->tz = $tz;
+	}
+
+	/**
+	 * Magic method to access properties of the date given by class to the format method.
+	 *
+	 * @param   string  $name  The name of the property.
+	 *
+	 * @return  mixed   A value if the property name is valid, null otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function __get($name)
+	{
+		$value = null;
+
+		switch ($name)
+		{
+			case 'daysinmonth':
+				$value = $this->format('t', true);
+				break;
+
+			case 'dayofweek':
+				$value = $this->format('N', true);
+				break;
+
+			case 'dayofyear':
+				$value = $this->format('z', true);
+				break;
+
+			case 'isleapyear':
+				$value = (boolean) $this->format('L', true);
+				break;
+
+			case 'day':
+				$value = $this->format('d', true);
+				break;
+
+			case 'hour':
+				$value = $this->format('H', true);
+				break;
+
+			case 'minute':
+				$value = $this->format('i', true);
+				break;
+
+			case 'second':
+				$value = $this->format('s', true);
+				break;
+
+			case 'month':
+				$value = $this->format('m', true);
+				break;
+
+			case 'ordinal':
+				$value = $this->format('S', true);
+				break;
+
+			case 'week':
+				$value = $this->format('W', true);
+				break;
+
+			case 'year':
+				$value = $this->format('Y', true);
+				break;
+
+			default:
+				$trace = debug_backtrace();
+				trigger_error(
+					'Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'],
+					E_USER_NOTICE
+				);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Magic method to render the date object in the format specified in the public
+	 * static member Date::$format.
+	 *
+	 * @return  string  The date as a formatted string.
+	 *
+	 * @since   11.1
+	 */
+	public function __toString()
+	{
+		return (string) parent::format(self::$format);
+	}
+
+	/**
+	 * Proxy for new JDate().
+	 *
+	 * @param   string  $date  String in a format accepted by strtotime(), defaults to "now".
+	 * @param   mixed   $tz    Time zone to be used for the date.
+	 *
+	 * @return  Date
+	 *
+	 * @since   11.3
+	 */
+	public static function getInstance($date = 'now', $tz = null)
+	{
+		return new Date($date, $tz);
+	}
+
+	/**
+	 * Translates day of week number to a string.
+	 *
+	 * @param   integer  $day   The numeric day of the week.
+	 * @param   boolean  $abbr  Return the abbreviated day string?
+	 *
+	 * @return  string  The day of the week.
+	 *
+	 * @since   11.1
+	 */
+	public function dayToString($day, $abbr = false)
+	{
+		switch ($day)
+		{
+			case 0:
+				return $abbr ? \JText::_('SUN') : \JText::_('SUNDAY');
+			case 1:
+				return $abbr ? \JText::_('MON') : \JText::_('MONDAY');
+			case 2:
+				return $abbr ? \JText::_('TUE') : \JText::_('TUESDAY');
+			case 3:
+				return $abbr ? \JText::_('WED') : \JText::_('WEDNESDAY');
+			case 4:
+				return $abbr ? \JText::_('THU') : \JText::_('THURSDAY');
+			case 5:
+				return $abbr ? \JText::_('FRI') : \JText::_('FRIDAY');
+			case 6:
+				return $abbr ? \JText::_('SAT') : \JText::_('SATURDAY');
+		}
+	}
+
+	/**
+	 * Gets the date as a formatted string in a local calendar.
+	 *
+	 * @param   string   $format     The date format specification string (see {@link PHP_MANUAL#date})
+	 * @param   boolean  $local      True to return the date string in the local time zone, false to return it in GMT.
+	 * @param   boolean  $translate  True to translate localised strings
+	 *
+	 * @return  string   The date string in the specified format format.
+	 *
+	 * @since   11.1
+	 */
+	public function calendar($format, $local = false, $translate = true)
+	{
+		return $this->format($format, $local, $translate);
+	}
+
+	/**
+	 * Gets the date as a formatted string.
+	 *
+	 * @param   string   $format     The date format specification string (see {@link PHP_MANUAL#date})
+	 * @param   boolean  $local      True to return the date string in the local time zone, false to return it in GMT.
+	 * @param   boolean  $translate  True to translate localised strings
+	 *
+	 * @return  string   The date string in the specified format format.
+	 *
+	 * @since   11.1
+	 */
+	public function format($format, $local = false, $translate = true)
+	{
+		if ($translate)
+		{
+			// Do string replacements for date format options that can be translated.
+			$format = preg_replace('/(^|[^\\\])D/', "\\1" . self::DAY_ABBR, $format);
+			$format = preg_replace('/(^|[^\\\])l/', "\\1" . self::DAY_NAME, $format);
+			$format = preg_replace('/(^|[^\\\])M/', "\\1" . self::MONTH_ABBR, $format);
+			$format = preg_replace('/(^|[^\\\])F/', "\\1" . self::MONTH_NAME, $format);
+		}
+
+		// If the returned time should not be local use GMT.
+		if ($local == false && !empty(self::$gmt))
+		{
+			parent::setTimezone(self::$gmt);
+		}
+
+		// Format the date.
+		$return = parent::format($format);
+
+		if ($translate)
+		{
+			// Manually modify the month and day strings in the formatted time.
+			if (strpos($return, self::DAY_ABBR) !== false)
+			{
+				$return = str_replace(self::DAY_ABBR, $this->dayToString(parent::format('w'), true), $return);
+			}
+
+			if (strpos($return, self::DAY_NAME) !== false)
+			{
+				$return = str_replace(self::DAY_NAME, $this->dayToString(parent::format('w')), $return);
+			}
+
+			if (strpos($return, self::MONTH_ABBR) !== false)
+			{
+				$return = str_replace(self::MONTH_ABBR, $this->monthToString(parent::format('n'), true), $return);
+			}
+
+			if (strpos($return, self::MONTH_NAME) !== false)
+			{
+				$return = str_replace(self::MONTH_NAME, $this->monthToString(parent::format('n')), $return);
+			}
+		}
+
+		if ($local == false && !empty($this->tz))
+		{
+			parent::setTimezone($this->tz);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Get the time offset from GMT in hours or seconds.
+	 *
+	 * @param   boolean  $hours  True to return the value in hours.
+	 *
+	 * @return  float  The time offset from GMT either in hours or in seconds.
+	 *
+	 * @since   11.1
+	 */
+	public function getOffsetFromGmt($hours = false)
+	{
+		return (float) $hours ? ($this->tz->getOffset($this) / 3600) : $this->tz->getOffset($this);
+	}
+
+	/**
+	 * Translates month number to a string.
+	 *
+	 * @param   integer  $month  The numeric month of the year.
+	 * @param   boolean  $abbr   If true, return the abbreviated month string
+	 *
+	 * @return  string  The month of the year.
+	 *
+	 * @since   11.1
+	 */
+	public function monthToString($month, $abbr = false)
+	{
+		switch ($month)
+		{
+			case 1:
+				return $abbr ? \JText::_('JANUARY_SHORT') : \JText::_('JANUARY');
+			case 2:
+				return $abbr ? \JText::_('FEBRUARY_SHORT') : \JText::_('FEBRUARY');
+			case 3:
+				return $abbr ? \JText::_('MARCH_SHORT') : \JText::_('MARCH');
+			case 4:
+				return $abbr ? \JText::_('APRIL_SHORT') : \JText::_('APRIL');
+			case 5:
+				return $abbr ? \JText::_('MAY_SHORT') : \JText::_('MAY');
+			case 6:
+				return $abbr ? \JText::_('JUNE_SHORT') : \JText::_('JUNE');
+			case 7:
+				return $abbr ? \JText::_('JULY_SHORT') : \JText::_('JULY');
+			case 8:
+				return $abbr ? \JText::_('AUGUST_SHORT') : \JText::_('AUGUST');
+			case 9:
+				return $abbr ? \JText::_('SEPTEMBER_SHORT') : \JText::_('SEPTEMBER');
+			case 10:
+				return $abbr ? \JText::_('OCTOBER_SHORT') : \JText::_('OCTOBER');
+			case 11:
+				return $abbr ? \JText::_('NOVEMBER_SHORT') : \JText::_('NOVEMBER');
+			case 12:
+				return $abbr ? \JText::_('DECEMBER_SHORT') : \JText::_('DECEMBER');
+		}
+	}
+
+	/**
+	 * Method to wrap the setTimezone() function and set the internal time zone object.
+	 *
+	 * @param   \DateTimeZone  $tz  The new \DateTimeZone object.
+	 *
+	 * @return  Date
+	 *
+	 * @since   11.1
+	 * @note    This method can't be type hinted due to a PHP bug: https://bugs.php.net/bug.php?id=61483
+	 */
+	public function setTimezone($tz)
+	{
+		$this->tz = $tz;
+
+		return parent::setTimezone($tz);
+	}
+
+	/**
+	 * Gets the date as an ISO 8601 string.  IETF RFC 3339 defines the ISO 8601 format
+	 * and it can be found at the IETF Web site.
+	 *
+	 * @param   boolean  $local  True to return the date string in the local time zone, false to return it in GMT.
+	 *
+	 * @return  string  The date string in ISO 8601 format.
+	 *
+	 * @link    http://www.ietf.org/rfc/rfc3339.txt
+	 * @since   11.1
+	 */
+	public function toISO8601($local = false)
+	{
+		return $this->format(\DateTime::RFC3339, $local, false);
+	}
+
+	/**
+	 * Gets the date as an SQL datetime string.
+	 *
+	 * @param   boolean           $local  True to return the date string in the local time zone, false to return it in GMT.
+	 * @param   \JDatabaseDriver  $db     The database driver or null to use \JFactory::getDbo()
+	 *
+	 * @return  string     The date string in SQL datetime format.
+	 *
+	 * @link    http://dev.mysql.com/doc/refman/5.0/en/datetime.html
+	 * @since   11.4
+	 */
+	public function toSql($local = false, \JDatabaseDriver $db = null)
+	{
+		if ($db === null)
+		{
+			$db = \JFactory::getDbo();
+		}
+
+		return $this->format($db->getDateFormat(), $local, false);
+	}
+
+	/**
+	 * Gets the date as an RFC 822 string.  IETF RFC 2822 supercedes RFC 822 and its definition
+	 * can be found at the IETF Web site.
+	 *
+	 * @param   boolean  $local  True to return the date string in the local time zone, false to return it in GMT.
+	 *
+	 * @return  string   The date string in RFC 822 format.
+	 *
+	 * @link    http://www.ietf.org/rfc/rfc2822.txt
+	 * @since   11.1
+	 */
+	public function toRFC822($local = false)
+	{
+		return $this->format(\DateTime::RFC2822, $local, false);
+	}
+
+	/**
+	 * Gets the date as UNIX time stamp.
+	 *
+	 * @return  integer  The date as a UNIX timestamp.
+	 *
+	 * @since   11.1
+	 */
+	public function toUnix()
+	{
+		return (int) parent::format('U');
+	}
+}
diff --git a/core/libraries/src/Document/Document.php b/core/libraries/src/Document/Document.php
new file mode 100644
index 00000000..270a87de
--- /dev/null
+++ b/core/libraries/src/Document/Document.php
@@ -0,0 +1,1282 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Date\Date;
+
+/**
+ * Document class, provides an easy interface to parse and display a document
+ *
+ * @since  11.1
+ */
+class Document
+{
+	/**
+	 * Document title
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $title = '';
+
+	/**
+	 * Document description
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $description = '';
+
+	/**
+	 * Document full URL
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $link = '';
+
+	/**
+	 * Document base URL
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $base = '';
+
+	/**
+	 * Contains the document language setting
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $language = 'en-gb';
+
+	/**
+	 * Contains the document direction setting
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $direction = 'ltr';
+
+	/**
+	 * Document generator
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_generator = 'Joomla! - Open Source Content Management';
+
+	/**
+	 * Document modified date
+	 *
+	 * @var    string|Date
+	 * @since  11.1
+	 */
+	public $_mdate = '';
+
+	/**
+	 * Tab string
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_tab = "\11";
+
+	/**
+	 * Contains the line end string
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_lineEnd = "\12";
+
+	/**
+	 * Contains the character encoding string
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_charset = 'utf-8';
+
+	/**
+	 * Document mime type
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_mime = '';
+
+	/**
+	 * Document namespace
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_namespace = '';
+
+	/**
+	 * Document profile
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_profile = '';
+
+	/**
+	 * Array of linked scripts
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_scripts = array();
+
+	/**
+	 * Array of scripts placed in the header
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_script = array();
+
+	/**
+	 * Array of scripts options
+	 *
+	 * @var    array
+	 */
+	protected $scriptOptions = array();
+
+	/**
+	 * Array of linked style sheets
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_styleSheets = array();
+
+	/**
+	 * Array of included style declarations
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_style = array();
+
+	/**
+	 * Array of meta tags
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_metaTags = array();
+
+	/**
+	 * The rendering engine
+	 *
+	 * @var    object
+	 * @since  11.1
+	 */
+	public $_engine = null;
+
+	/**
+	 * The document type
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $_type = null;
+
+	/**
+	 * Array of buffered output
+	 *
+	 * @var    mixed (depends on the renderer)
+	 * @since  11.1
+	 */
+	public static $_buffer = null;
+
+	/**
+	 * Document instances container.
+	 *
+	 * @var    array
+	 * @since  11.3
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Media version added to assets
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $mediaVersion = null;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		if (array_key_exists('lineend', $options))
+		{
+			$this->setLineEnd($options['lineend']);
+		}
+
+		if (array_key_exists('charset', $options))
+		{
+			$this->setCharset($options['charset']);
+		}
+
+		if (array_key_exists('language', $options))
+		{
+			$this->setLanguage($options['language']);
+		}
+
+		if (array_key_exists('direction', $options))
+		{
+			$this->setDirection($options['direction']);
+		}
+
+		if (array_key_exists('tab', $options))
+		{
+			$this->setTab($options['tab']);
+		}
+
+		if (array_key_exists('link', $options))
+		{
+			$this->setLink($options['link']);
+		}
+
+		if (array_key_exists('base', $options))
+		{
+			$this->setBase($options['base']);
+		}
+
+		if (array_key_exists('mediaversion', $options))
+		{
+			$this->setMediaVersion($options['mediaversion']);
+		}
+	}
+
+	/**
+	 * Returns the global Document object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $type        The document type to instantiate
+	 * @param   array   $attributes  Array of attributes
+	 *
+	 * @return  object  The document object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($type = 'html', $attributes = array())
+	{
+		$signature = serialize(array($type, $attributes));
+
+		if (empty(self::$instances[$signature]))
+		{
+			$type  = preg_replace('/[^A-Z0-9_\.-]/i', '', $type);
+			$ntype = null;
+
+			// Determine the path and class
+			$class = __NAMESPACE__ . '\\' . ucfirst($type) . 'Document';
+
+			if (!class_exists($class))
+			{
+				$class = 'JDocument' . ucfirst($type);
+			}
+
+			if (!class_exists($class))
+			{
+				// @deprecated 4.0 - Document objects should be autoloaded instead
+				$path = __DIR__ . '/' . $type . '/' . $type . '.php';
+
+				\JLoader::register($class, $path);
+
+				if (class_exists($class))
+				{
+					\JLog::add('Non-autoloadable Document subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
+				}
+				// Default to the raw format
+				else
+				{
+					$ntype = $type;
+					$class = 'JDocumentRaw';
+				}
+			}
+
+			$instance = new $class($attributes);
+			self::$instances[$signature] = $instance;
+
+			if (!is_null($ntype))
+			{
+				// Set the type to the Document type originally requested
+				$instance->setType($ntype);
+			}
+		}
+
+		return self::$instances[$signature];
+	}
+
+	/**
+	 * Set the document type
+	 *
+	 * @param   string  $type  Type document is to set to
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setType($type)
+	{
+		$this->_type = $type;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document type
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getType()
+	{
+		return $this->_type;
+	}
+
+	/**
+	 * Get the contents of the document buffer
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function getBuffer()
+	{
+		return self::$_buffer;
+	}
+
+	/**
+	 * Set the contents of the document buffer
+	 *
+	 * @param   string  $content  The content to be set in the buffer.
+	 * @param   array   $options  Array of optional elements.
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setBuffer($content, $options = array())
+	{
+		self::$_buffer = $content;
+
+		return $this;
+	}
+
+	/**
+	 * Gets a meta tag.
+	 *
+	 * @param   string  $name       Name of the meta HTML tag
+	 * @param   string  $attribute  Attribute to use in the meta HTML tag
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getMetaData($name, $attribute = 'name')
+	{
+		// B/C old http_equiv parameter.
+		if (!is_string($attribute))
+		{
+			$attribute = $attribute == true ? 'http-equiv' : 'name';
+		}
+
+		if ($name == 'generator')
+		{
+			$result = $this->getGenerator();
+		}
+		elseif ($name == 'description')
+		{
+			$result = $this->getDescription();
+		}
+		else
+		{
+			$result = isset($this->_metaTags[$attribute]) && isset($this->_metaTags[$attribute][$name]) ? $this->_metaTags[$attribute][$name] : '';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Sets or alters a meta tag.
+	 *
+	 * @param   string  $name       Name of the meta HTML tag
+	 * @param   mixed   $content    Value of the meta HTML tag as array or string
+	 * @param   string  $attribute  Attribute to use in the meta HTML tag
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setMetaData($name, $content, $attribute = 'name')
+	{
+		// Pop the element off the end of array if target function expects a string or this http_equiv parameter.
+		if (is_array($content) && (in_array($name, array('generator', 'description')) || !is_string($attribute)))
+		{
+			$content = array_pop($content);
+		}
+
+		// B/C old http_equiv parameter.
+		if (!is_string($attribute))
+		{
+			$attribute = $attribute == true ? 'http-equiv' : 'name';
+		}
+
+		if ($name == 'generator')
+		{
+			$this->setGenerator($content);
+		}
+		elseif ($name == 'description')
+		{
+			$this->setDescription($content);
+		}
+		else
+		{
+			$this->_metaTags[$attribute][$name] = $content;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds a linked script to the page
+	 *
+	 * @param   string  $url      URL to the linked script.
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 * @deprecated 4.0  The (url, mime, defer, async) method signature is deprecated, use (url, options, attributes) instead.
+	 */
+	public function addScript($url, $options = array(), $attribs = array())
+	{
+		// B/C before 3.7.0
+		if (!is_array($options) && (!is_array($attribs) || $attribs === array()))
+		{
+			\JLog::add('The addScript method signature used has changed, use (url, options, attributes) instead.', \JLog::WARNING, 'deprecated');
+
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old mime type parameter.
+			if (!empty($argList[1]))
+			{
+				$attribs['mime'] = $argList[1];
+			}
+
+			// Old defer parameter.
+			if (isset($argList[2]) && $argList[2])
+			{
+				$attribs['defer'] = true;
+			}
+
+			// Old async parameter.
+			if (isset($argList[3]) && $argList[3])
+			{
+				$attribs['async'] = true;
+			}
+		}
+
+		// Default value for type.
+		if (!isset($attribs['type']) && !isset($attribs['mime']))
+		{
+			$attribs['type'] = 'text/javascript';
+		}
+
+		$this->_scripts[$url]            = isset($this->_scripts[$url]) ? array_replace($this->_scripts[$url], $attribs) : $attribs;
+		$this->_scripts[$url]['options'] = isset($this->_scripts[$url]['options']) ? array_replace($this->_scripts[$url]['options'], $options) : $options;
+
+		return $this;
+	}
+
+	/**
+	 * Adds a linked script to the page with a version to allow to flush it. Ex: myscript.js?54771616b5bceae9df03c6173babf11d
+	 * If not specified Joomla! automatically handles versioning
+	 *
+	 * @param   string  $url      URL to the linked script.
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   3.2
+	 * @deprecated 4.0  This method is deprecated, use addScript(url, options, attributes) instead.
+	 */
+	public function addScriptVersion($url, $options = array(), $attribs = array())
+	{
+		\JLog::add('The method is deprecated, use addScript(url, attributes, options) instead.', \JLog::WARNING, 'deprecated');
+
+		// B/C before 3.7.0
+		if (!is_array($options) && (!is_array($attribs) || $attribs === array()))
+		{
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old version parameter.
+			$options['version'] = isset($argList[1]) && !is_null($argList[1]) ? $argList[1] : 'auto';
+
+			// Old mime type parameter.
+			if (!empty($argList[2]))
+			{
+				$attribs['mime'] = $argList[2];
+			}
+
+			// Old defer parameter.
+			if (isset($argList[3]) && $argList[3])
+			{
+				$attribs['defer'] = true;
+			}
+
+			// Old async parameter.
+			if (isset($argList[4]) && $argList[4])
+			{
+				$attribs['async'] = true;
+			}
+		}
+		// Default value for version.
+		else
+		{
+			$options['version'] = 'auto';
+		}
+
+		return $this->addScript($url, $options, $attribs);
+	}
+
+	/**
+	 * Adds a script to the page
+	 *
+	 * @param   string  $content  Script
+	 * @param   string  $type     Scripting mime (defaults to 'text/javascript')
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addScriptDeclaration($content, $type = 'text/javascript')
+	{
+		if (!isset($this->_script[strtolower($type)]))
+		{
+			$this->_script[strtolower($type)] = $content;
+		}
+		else
+		{
+			$this->_script[strtolower($type)] .= chr(13) . $content;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add option for script
+	 *
+	 * @param   string  $key      Name in Storage
+	 * @param   mixed   $options  Scrip options as array or string
+	 * @param   bool    $merge    Whether merge with existing (true) or replace (false)
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   3.5
+	 */
+	public function addScriptOptions($key, $options, $merge = true)
+	{
+		if (empty($this->scriptOptions[$key]))
+		{
+			$this->scriptOptions[$key] = array();
+		}
+
+		if ($merge && is_array($options))
+		{
+			$this->scriptOptions[$key] = array_merge($this->scriptOptions[$key], $options);
+		}
+		else
+		{
+			$this->scriptOptions[$key] = $options;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get script(s) options
+	 *
+	 * @param   string  $key  Name in Storage
+	 *
+	 * @return  array  Options for given $key, or all script options
+	 *
+	 * @since   3.5
+	 */
+	public function getScriptOptions($key = null)
+	{
+		if ($key)
+		{
+			return (empty($this->scriptOptions[$key])) ? array() : $this->scriptOptions[$key];
+		}
+		else
+		{
+			return $this->scriptOptions;
+		}
+	}
+
+	/**
+	 * Adds a linked stylesheet to the page
+	 *
+	 * @param   string  $url      URL to the linked style sheet
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'stylesheet', 'data-test' => 1)
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 * @deprecated 4.0  The (url, mime, media, attribs) method signature is deprecated, use (url, options, attributes) instead.
+	 */
+	public function addStyleSheet($url, $options = array(), $attribs = array())
+	{
+		// B/C before 3.7.0
+		if (is_string($options))
+		{
+			\JLog::add('The addStyleSheet method signature used has changed, use (url, options, attributes) instead.', \JLog::WARNING, 'deprecated');
+
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old mime type parameter.
+			if (!empty($argList[1]))
+			{
+				$attribs['type'] = $argList[1];
+			}
+
+			// Old media parameter.
+			if (isset($argList[2]) && $argList[2])
+			{
+				$attribs['media'] = $argList[2];
+			}
+
+			// Old attribs parameter.
+			if (isset($argList[3]) && $argList[3])
+			{
+				$attribs = array_replace($attribs, $argList[3]);
+			}
+		}
+
+		// Default value for type.
+		if (!isset($attribs['type']) && !isset($attribs['mime']))
+		{
+			$attribs['type'] = 'text/css';
+		}
+
+		$this->_styleSheets[$url] = isset($this->_styleSheets[$url]) ? array_replace($this->_styleSheets[$url], $attribs) : $attribs;
+
+		if (isset($this->_styleSheets[$url]['options']))
+		{
+			$this->_styleSheets[$url]['options'] = array_replace($this->_styleSheets[$url]['options'], $options);
+		}
+		else
+		{
+			$this->_styleSheets[$url]['options'] = $options;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds a linked stylesheet version to the page. Ex: template.css?54771616b5bceae9df03c6173babf11d
+	 * If not specified Joomla! automatically handles versioning
+	 *
+	 * @param   string  $url      URL to the linked style sheet
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'stylesheet', 'data-test' => 1)
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   3.2
+	 * @deprecated 4.0  This method is deprecated, use addStyleSheet(url, options, attributes) instead.
+	 */
+	public function addStyleSheetVersion($url, $options = array(), $attribs = array())
+	{
+		\JLog::add('The method is deprecated, use addStyleSheet(url, attributes, options) instead.', \JLog::WARNING, 'deprecated');
+
+		// B/C before 3.7.0
+		if (!is_array($options) && (!is_array($attribs) || $attribs === array()))
+		{
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old version parameter.
+			$options['version'] = isset($argList[1]) && !is_null($argList[1]) ? $argList[1] : 'auto';
+
+			// Old mime type parameter.
+			if (!empty($argList[2]))
+			{
+				$attribs['mime'] = $argList[2];
+			}
+
+			// Old media parameter.
+			if (isset($argList[3]) && $argList[3])
+			{
+				$attribs['media'] = $argList[3];
+			}
+
+			// Old attribs parameter.
+			if (isset($argList[4]) && $argList[4])
+			{
+				$attribs = array_replace($attribs, $argList[4]);
+			}
+		}
+		// Default value for version.
+		else
+		{
+			$options['version'] = 'auto';
+		}
+
+		return $this->addStyleSheet($url, $options, $attribs);
+	}
+
+	/**
+	 * Adds a stylesheet declaration to the page
+	 *
+	 * @param   string  $content  Style declarations
+	 * @param   string  $type     Type of stylesheet (defaults to 'text/css')
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addStyleDeclaration($content, $type = 'text/css')
+	{
+		if (!isset($this->_style[strtolower($type)]))
+		{
+			$this->_style[strtolower($type)] = $content;
+		}
+		else
+		{
+			$this->_style[strtolower($type)] .= chr(13) . $content;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Sets the document charset
+	 *
+	 * @param   string  $type  Charset encoding string
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setCharset($type = 'utf-8')
+	{
+		$this->_charset = $type;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document charset encoding.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getCharset()
+	{
+		return $this->_charset;
+	}
+
+	/**
+	 * Sets the global document language declaration. Default is English (en-gb).
+	 *
+	 * @param   string  $lang  The language to be set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setLanguage($lang = 'en-gb')
+	{
+		$this->language = strtolower($lang);
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document language.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getLanguage()
+	{
+		return $this->language;
+	}
+
+	/**
+	 * Sets the global document direction declaration. Default is left-to-right (ltr).
+	 *
+	 * @param   string  $dir  The language direction to be set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setDirection($dir = 'ltr')
+	{
+		$this->direction = strtolower($dir);
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document direction declaration.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getDirection()
+	{
+		return $this->direction;
+	}
+
+	/**
+	 * Sets the title of the document
+	 *
+	 * @param   string  $title  The title to be set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setTitle($title)
+	{
+		$this->title = $title;
+
+		return $this;
+	}
+
+	/**
+	 * Return the title of the document.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Set the assets version
+	 *
+	 * @param   string  $mediaVersion  Media version to use
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   3.2
+	 */
+	public function setMediaVersion($mediaVersion)
+	{
+		$this->mediaVersion = strtolower($mediaVersion);
+
+		return $this;
+	}
+
+	/**
+	 * Return the media version
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function getMediaVersion()
+	{
+		return $this->mediaVersion;
+	}
+
+	/**
+	 * Sets the base URI of the document
+	 *
+	 * @param   string  $base  The base URI to be set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setBase($base)
+	{
+		$this->base = $base;
+
+		return $this;
+	}
+
+	/**
+	 * Return the base URI of the document.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getBase()
+	{
+		return $this->base;
+	}
+
+	/**
+	 * Sets the description of the document
+	 *
+	 * @param   string  $description  The description to set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setDescription($description)
+	{
+		$this->description = $description;
+
+		return $this;
+	}
+
+	/**
+	 * Return the description of the document.
+	 *
+	 * @return  string
+	 *
+	 * @since    11.1
+	 */
+	public function getDescription()
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Sets the document link
+	 *
+	 * @param   string  $url  A url
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setLink($url)
+	{
+		$this->link = $url;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document base url
+	 *
+	 * @return string
+	 *
+	 * @since   11.1
+	 */
+	public function getLink()
+	{
+		return $this->link;
+	}
+
+	/**
+	 * Sets the document generator
+	 *
+	 * @param   string  $generator  The generator to be set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setGenerator($generator)
+	{
+		$this->_generator = $generator;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document generator
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getGenerator()
+	{
+		return $this->_generator;
+	}
+
+	/**
+	 * Sets the document modified date
+	 *
+	 * @param   string|Date  $date  The date to be set
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function setModifiedDate($date)
+	{
+		if (!is_string($date) && !($date instanceof Date))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'The $date parameter of %1$s must be a string or a %2$s instance, a %3$s was given.',
+					__METHOD__ . '()',
+					'Joomla\\CMS\\Date\\Date',
+					gettype($date) === 'object' ? (get_class($date) . ' instance') : gettype($date)
+				)
+			);
+		}
+
+		$this->_mdate = $date;
+
+		return $this;
+	}
+
+	/**
+	 * Returns the document modified date
+	 *
+	 * @return  string|Date
+	 *
+	 * @since   11.1
+	 */
+	public function getModifiedDate()
+	{
+		return $this->_mdate;
+	}
+
+	/**
+	 * Sets the document MIME encoding that is sent to the browser.
+	 *
+	 * This usually will be text/html because most browsers cannot yet
+	 * accept the proper mime settings for XHTML: application/xhtml+xml
+	 * and to a lesser extent application/xml and text/xml. See the W3C note
+	 * ({@link http://www.w3.org/TR/xhtml-media-types/
+	 * http://www.w3.org/TR/xhtml-media-types/}) for more details.
+	 *
+	 * @param   string   $type  The document type to be sent
+	 * @param   boolean  $sync  Should the type be synced with HTML?
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 *
+	 * @link    http://www.w3.org/TR/xhtml-media-types
+	 */
+	public function setMimeEncoding($type = 'text/html', $sync = true)
+	{
+		$this->_mime = strtolower($type);
+
+		// Syncing with metadata
+		if ($sync)
+		{
+			$this->setMetaData('content-type', $type . '; charset=' . $this->_charset, true);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Return the document MIME encoding that is sent to the browser.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function getMimeEncoding()
+	{
+		return $this->_mime;
+	}
+
+	/**
+	 * Sets the line end style to Windows, Mac, Unix or a custom string.
+	 *
+	 * @param   string  $style  "win", "mac", "unix" or custom string.
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setLineEnd($style)
+	{
+		switch ($style)
+		{
+			case 'win':
+				$this->_lineEnd = "\15\12";
+				break;
+			case 'unix':
+				$this->_lineEnd = "\12";
+				break;
+			case 'mac':
+				$this->_lineEnd = "\15";
+				break;
+			default:
+				$this->_lineEnd = $style;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns the lineEnd
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function _getLineEnd()
+	{
+		return $this->_lineEnd;
+	}
+
+	/**
+	 * Sets the string used to indent HTML
+	 *
+	 * @param   string  $string  String used to indent ("\11", "\t", '  ', etc.).
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setTab($string)
+	{
+		$this->_tab = $string;
+
+		return $this;
+	}
+
+	/**
+	 * Returns a string containing the unit for indenting HTML
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function _getTab()
+	{
+		return $this->_tab;
+	}
+
+	/**
+	 * Load a renderer
+	 *
+	 * @param   string  $type  The renderer type
+	 *
+	 * @return  DocumentRenderer
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public function loadRenderer($type)
+	{
+		// Determine the path and class
+		$class = __NAMESPACE__ . '\\Renderer\\' . ucfirst($this->getType()) . '\\' . ucfirst($type) . 'Renderer';
+
+		if (!class_exists($class))
+		{
+			$class = 'JDocumentRenderer' . ucfirst($this->getType()) . ucfirst($type);
+		}
+
+		if (!class_exists($class))
+		{
+			// "Legacy" class name structure
+			$class = 'JDocumentRenderer' . $type;
+
+			if (!class_exists($class))
+			{
+				// @deprecated 4.0 - Non-autoloadable class support is deprecated, only log a message though if a file is found
+				$path = __DIR__ . '/' . $this->getType() . '/renderer/' . $type . '.php';
+
+				if (!file_exists($path))
+				{
+					throw new \RuntimeException('Unable to load renderer class', 500);
+				}
+
+				\JLoader::register($class, $path);
+
+				\JLog::add('Non-autoloadable JDocumentRenderer subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
+
+				// If the class still doesn't exist after including the path, we've got issues
+				if (!class_exists($class))
+				{
+					throw new \RuntimeException('Unable to load renderer class', 500);
+				}
+			}
+		}
+
+		return new $class($this);
+	}
+
+	/**
+	 * Parses the document and prepares the buffers
+	 *
+	 * @param   array  $params  The array of parameters
+	 *
+	 * @return  Document instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function parse($params = array())
+	{
+		return $this;
+	}
+
+	/**
+	 * Outputs the document
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  void  The rendered data
+	 *
+	 * @since   11.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		$app = \JFactory::getApplication();
+
+		if ($mdate = $this->getModifiedDate())
+		{
+			if (!($mdate instanceof Date))
+			{
+				$mdate = new Date($mdate);
+			}
+
+			$app->modifiedDate = $mdate;
+		}
+
+		$app->mimeType = $this->_mime;
+		$app->charSet  = $this->_charset;
+	}
+}
diff --git a/core/libraries/src/Document/DocumentRenderer.php b/core/libraries/src/Document/DocumentRenderer.php
new file mode 100644
index 00000000..be0521ab
--- /dev/null
+++ b/core/libraries/src/Document/DocumentRenderer.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Abstract class for a renderer
+ *
+ * @since  11.1
+ */
+class DocumentRenderer
+{
+	/**
+	 * Reference to the Document object that instantiated the renderer
+	 *
+	 * @var    Document
+	 * @since  11.1
+	 */
+	protected $_doc = null;
+
+	/**
+	 * Renderer mime type
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_mime = 'text/html';
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   Document  $doc  A reference to the Document object that instantiated the renderer
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(Document $doc)
+	{
+		$this->_doc = $doc;
+	}
+
+	/**
+	 * Renders a script and returns the results as a string
+	 *
+	 * @param   string  $name     The name of the element to render
+	 * @param   array   $params   Array of values
+	 * @param   string  $content  Override the output of the renderer
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @since   11.1
+	 */
+	public function render($name, $params = null, $content = null)
+	{
+	}
+
+	/**
+	 * Return the content type of the renderer
+	 *
+	 * @return  string  The contentType
+	 *
+	 * @since   11.1
+	 */
+	public function getContentType()
+	{
+		return $this->_mime;
+	}
+
+	/**
+	 * Convert links in a text from relative to absolute
+	 *
+	 * @param   string  $text  The text processed
+	 *
+	 * @return  string   Text with converted links
+	 *
+	 * @since   11.1
+	 */
+	protected function _relToAbs($text)
+	{
+		$base = Uri::base();
+		$text = preg_replace("/(href|src)=\"(?!http|ftp|https|mailto|data|\/\/)([^\"]*)\"/", "$1=\"$base\$2\"", $text);
+
+		return $text;
+	}
+}
diff --git a/core/libraries/src/Document/ErrorDocument.php b/core/libraries/src/Document/ErrorDocument.php
new file mode 100644
index 00000000..c089ae58
--- /dev/null
+++ b/core/libraries/src/Document/ErrorDocument.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * ErrorDocument class, provides an easy interface to parse and display an error page
+ *
+ * @since  11.1
+ */
+class ErrorDocument extends Document
+{
+	/**
+	 * Document base URL
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $baseurl = '';
+
+	/**
+	 * Flag if debug mode has been enabled
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	public $debug = false;
+
+	/**
+	 * Error Object
+	 *
+	 * @var    \Exception|\Throwable
+	 * @since  11.1
+	 */
+	public $error;
+
+	/**
+	 * Name of the template
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $template = null;
+
+	/**
+	 * File name
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_file = null;
+
+	/**
+	 * Error Object
+	 *
+	 * @var    \Exception|\Throwable
+	 * @since  11.1
+	 */
+	protected $_error;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of attributes
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set mime type
+		$this->_mime = 'text/html';
+
+		// Set document type
+		$this->_type = 'error';
+	}
+
+	/**
+	 * Set error object
+	 *
+	 * @param   \Exception|\Throwable  $error  Error object to set
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function setError($error)
+	{
+		$expectedClass = PHP_MAJOR_VERSION >= 7 ? '\\Throwable' : '\\Exception';
+
+		if ($error instanceof $expectedClass)
+		{
+			$this->_error = & $error;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Render the document
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string   The rendered data
+	 *
+	 * @since   11.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		// If no error object is set return null
+		if (!isset($this->_error))
+		{
+			return;
+		}
+
+		// Set the status header
+		$status = $this->_error->getCode();
+
+		if ($status < 400 || $status > 599)
+		{
+			$status = 500;
+		}
+
+		$errorReporting = \JFactory::getConfig()->get('error_reporting');
+
+		if ($errorReporting === "development" || $errorReporting === "maximum")
+		{
+			$status .= ' ' . str_replace("\n", ' ', $this->_error->getMessage());
+		}
+
+		\JFactory::getApplication()->setHeader('status', $status);
+
+		$file = 'error.php';
+
+		// Check template
+		$directory = isset($params['directory']) ? $params['directory'] : 'templates';
+		$template = isset($params['template']) ? \JFilterInput::getInstance()->clean($params['template'], 'cmd') : 'system';
+
+		if (!file_exists($directory . '/' . $template . '/' . $file))
+		{
+			$template = 'system';
+		}
+
+		// Set variables
+		$this->baseurl = Uri::base(true);
+		$this->template = $template;
+		$this->debug = isset($params['debug']) ? $params['debug'] : false;
+		$this->error = $this->_error;
+
+		// Load the language file for the template if able
+		if (\JFactory::$language)
+		{
+			$lang = \JFactory::getLanguage();
+
+			// 1.5 or core then 1.6
+			$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+				|| $lang->load('tpl_' . $template, $directory . '/' . $template, null, false, true);
+		}
+
+		// Load
+		$data = $this->_loadTemplate($directory . '/' . $template, $file);
+
+		parent::render();
+
+		return $data;
+	}
+
+	/**
+	 * Load a template file
+	 *
+	 * @param   string  $directory  The name of the template
+	 * @param   string  $filename   The actual filename
+	 *
+	 * @return  string  The contents of the template
+	 *
+	 * @since   11.1
+	 */
+	public function _loadTemplate($directory, $filename)
+	{
+		$contents = '';
+
+		// Check to see if we have a valid template file
+		if (file_exists($directory . '/' . $filename))
+		{
+			// Store the file path
+			$this->_file = $directory . '/' . $filename;
+
+			// Get the file content
+			ob_start();
+			require_once $directory . '/' . $filename;
+			$contents = ob_get_contents();
+			ob_end_clean();
+		}
+
+		return $contents;
+	}
+
+	/**
+	 * Render the backtrace
+	 *
+	 * @return  string  The contents of the backtrace
+	 *
+	 * @since   11.1
+	 */
+	public function renderBacktrace()
+	{
+		// If no error object is set return null
+		if (!isset($this->_error))
+		{
+			return;
+		}
+
+		// The back trace
+		$backtrace = $this->_error->getTrace();
+
+		// Add the position of the actual file
+		array_unshift($backtrace, array('file' => $this->_error->getFile(), 'line' => $this->_error->getLine(), 'function' => ''));
+
+		return LayoutHelper::render('joomla.error.backtrace', array('backtrace' => $backtrace));
+	}
+}
diff --git a/core/libraries/src/Document/Feed/FeedEnclosure.php b/core/libraries/src/Document/Feed/FeedEnclosure.php
new file mode 100644
index 00000000..1419ea7b
--- /dev/null
+++ b/core/libraries/src/Document/Feed/FeedEnclosure.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Data object representing a feed enclosure
+ *
+ * @since  11.1
+ */
+class FeedEnclosure
+{
+	/**
+	 * URL enclosure element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $url = '';
+
+	/**
+	 * Length enclosure element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $length = '';
+
+	/**
+	 * Type enclosure element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = '';
+}
diff --git a/core/libraries/src/Document/Feed/FeedImage.php b/core/libraries/src/Document/Feed/FeedImage.php
new file mode 100644
index 00000000..f9f34db3
--- /dev/null
+++ b/core/libraries/src/Document/Feed/FeedImage.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Data object representing a feed image
+ *
+ * @since  11.1
+ */
+class FeedImage
+{
+	/**
+	 * Title image attribute
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $title = '';
+
+	/**
+	 * URL image attribute
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $url = '';
+
+	/**
+	 * Link image attribute
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $link = '';
+
+	/**
+	 * Width image attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $width;
+
+	/**
+	 * Title feed attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $height;
+
+	/**
+	 * Title feed attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $description;
+}
diff --git a/core/libraries/src/Document/Feed/FeedItem.php b/core/libraries/src/Document/Feed/FeedItem.php
new file mode 100644
index 00000000..d6edf486
--- /dev/null
+++ b/core/libraries/src/Document/Feed/FeedItem.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Data object representing a feed item
+ *
+ * @since  11.1
+ */
+class FeedItem
+{
+	/**
+	 * Title item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $title;
+
+	/**
+	 * Link item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $link;
+
+	/**
+	 * Description item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $description;
+
+	/**
+	 * Author item element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $author;
+
+	/**
+	 * Author email element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $authorEmail;
+
+	/**
+	 * Category element
+	 *
+	 * optional
+	 *
+	 * @var    array or string
+	 * @since  11.1
+	 */
+	public $category;
+
+	/**
+	 * Comments element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $comments;
+
+	/**
+	 * Enclosure element
+	 *
+	 * @var    FeedEnclosure
+	 * @since  11.1
+	 */
+	public $enclosure = null;
+
+	/**
+	 * Guid element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $guid;
+
+	/**
+	 * Published date
+	 *
+	 * optional
+	 *
+	 * May be in one of the following formats:
+	 *
+	 * RFC 822:
+	 * "Mon, 20 Jan 03 18:05:41 +0400"
+	 * "20 Jan 03 18:05:41 +0000"
+	 *
+	 * ISO 8601:
+	 * "2003-01-20T18:05:41+04:00"
+	 *
+	 * Unix:
+	 * 1043082341
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $date;
+
+	/**
+	 * Source element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $source;
+
+	/**
+	 * Set the FeedEnclosure for this item
+	 *
+	 * @param   FeedEnclosure  $enclosure  The FeedEnclosure to add to the feed.
+	 *
+	 * @return  FeedItem instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setEnclosure(FeedEnclosure $enclosure)
+	{
+		$this->enclosure = $enclosure;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Document/FeedDocument.php b/core/libraries/src/Document/FeedDocument.php
new file mode 100644
index 00000000..c25295f8
--- /dev/null
+++ b/core/libraries/src/Document/FeedDocument.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\Feed\FeedImage;
+use Joomla\CMS\Document\Feed\FeedItem;
+
+/**
+ * FeedDocument class, provides an easy interface to parse and display any feed document
+ *
+ * @since  11.1
+ */
+class FeedDocument extends Document
+{
+	/**
+	 * Syndication URL feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $syndicationURL = '';
+
+	/**
+	 * Image feed element
+	 *
+	 * optional
+	 *
+	 * @var    FeedImage
+	 * @since  11.1
+	 */
+	public $image = null;
+
+	/**
+	 * Copyright feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $copyright = '';
+
+	/**
+	 * Published date feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $pubDate = '';
+
+	/**
+	 * Lastbuild date feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $lastBuildDate = '';
+
+	/**
+	 * Editor feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $editor = '';
+
+	/**
+	 * Docs feed element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $docs = '';
+
+	/**
+	 * Editor email feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $editorEmail = '';
+
+	/**
+	 * Webmaster email feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $webmaster = '';
+
+	/**
+	 * Category feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $category = '';
+
+	/**
+	 * TTL feed attribute
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $ttl = '';
+
+	/**
+	 * Rating feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $rating = '';
+
+	/**
+	 * Skiphours feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $skipHours = '';
+
+	/**
+	 * Skipdays feed element
+	 *
+	 * optional
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $skipDays = '';
+
+	/**
+	 * The feed items collection
+	 *
+	 * @var    FeedItem[]
+	 * @since  11.1
+	 */
+	public $items = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since  11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set document type
+		$this->_type = 'feed';
+	}
+
+	/**
+	 * Render the document
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string The rendered data
+	 *
+	 * @since   11.1
+	 * @throws  \Exception
+	 * @todo    Make this cacheable
+	 */
+	public function render($cache = false, $params = array())
+	{
+		// Get the feed type
+		$type = \JFactory::getApplication()->input->get('type', 'rss');
+
+		// Instantiate feed renderer and set the mime encoding
+		$renderer = $this->loadRenderer(($type) ? $type : 'rss');
+
+		if (!($renderer instanceof DocumentRenderer))
+		{
+			throw new \Exception(JText::_('JGLOBAL_RESOURCE_NOT_FOUND'), 404);
+		}
+
+		$this->setMimeEncoding($renderer->getContentType());
+
+		// Output
+		// Generate prolog
+		$data = "<?xml version=\"1.0\" encoding=\"" . $this->_charset . "\"?>\n";
+		$data .= "<!-- generator=\"" . $this->getGenerator() . "\" -->\n";
+
+		// Generate stylesheet links
+		foreach ($this->_styleSheets as $src => $attr)
+		{
+			$data .= "<?xml-stylesheet href=\"$src\" type=\"" . $attr['type'] . "\"?>\n";
+		}
+
+		// Render the feed
+		$data .= $renderer->render();
+
+		parent::render();
+
+		return $data;
+	}
+
+	/**
+	 * Adds a FeedItem to the feed.
+	 *
+	 * @param   FeedItem  $item  The feeditem to add to the feed.
+	 *
+	 * @return  FeedDocument  instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addItem(FeedItem $item)
+	{
+		$item->source = $this->link;
+		$this->items[] = $item;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Document/HtmlDocument.php b/core/libraries/src/Document/HtmlDocument.php
new file mode 100644
index 00000000..becac5bf
--- /dev/null
+++ b/core/libraries/src/Document/HtmlDocument.php
@@ -0,0 +1,788 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Registry\Registry;
+
+jimport('joomla.utilities.utility');
+
+/**
+ * HtmlDocument class, provides an easy interface to parse and display a HTML document
+ *
+ * @since  11.1
+ */
+class HtmlDocument extends Document
+{
+	/**
+	 * Array of Header `<link>` tags
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_links = array();
+
+	/**
+	 * Array of custom tags
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_custom = array();
+
+	/**
+	 * Name of the template
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $template = null;
+
+	/**
+	 * Base url
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $baseurl = null;
+
+	/**
+	 * Array of template parameters
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $params = null;
+
+	/**
+	 * File name
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $_file = null;
+
+	/**
+	 * String holding parsed template
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_template = '';
+
+	/**
+	 * Array of parsed template JDoc tags
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_template_tags = array();
+
+	/**
+	 * Integer with caching setting
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $_caching = null;
+
+	/**
+	 * Set to true when the document should be output as HTML5
+	 *
+	 * @var    boolean
+	 * @since  12.1
+	 *
+	 * @note  4.0  Will be replaced by $html5 and the default value will be true.
+	 */
+	private $_html5 = null;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set document type
+		$this->_type = 'html';
+
+		// Set default mime type and document metadata (metadata syncs with mime type by default)
+		$this->setMimeEncoding('text/html');
+	}
+
+	/**
+	 * Get the HTML document head data
+	 *
+	 * @return  array  The document head data in array form
+	 *
+	 * @since   11.1
+	 */
+	public function getHeadData()
+	{
+		$data = array();
+		$data['title']       = $this->title;
+		$data['description'] = $this->description;
+		$data['link']        = $this->link;
+		$data['metaTags']    = $this->_metaTags;
+		$data['links']       = $this->_links;
+		$data['styleSheets'] = $this->_styleSheets;
+		$data['style']       = $this->_style;
+		$data['scripts']     = $this->_scripts;
+		$data['script']      = $this->_script;
+		$data['custom']      = $this->_custom;
+		$data['scriptText']  = \JText::getScriptStrings();
+
+		return $data;
+	}
+
+	/**
+	 * Reset the HTML document head data
+	 *
+	 * @param   mixed  $types  type or types of the heads elements to reset
+	 *
+	 * @return  HtmlDocument  instance of $this to allow chaining
+	 *
+	 * @since   3.7.0
+	 */
+	public function resetHeadData($types = null)
+	{
+		if (is_null($types))
+		{
+			$this->title        = '';
+			$this->description  = '';
+			$this->link         = '';
+			$this->_metaTags    = array();
+			$this->_links       = array();
+			$this->_styleSheets = array();
+			$this->_style       = array();
+			$this->_scripts     = array();
+			$this->_script      = array();
+			$this->_custom      = array();
+		}
+
+		if (is_array($types))
+		{
+			foreach ($types as $type)
+			{
+				$this->resetHeadDatum($type);
+			}
+		}
+
+		if (is_string($types))
+		{
+			$this->resetHeadDatum($types);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Reset a part the HTML document head data
+	 *
+	 * @param   string  $type  type of the heads elements to reset
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	private function resetHeadDatum($type)
+	{
+		switch ($type)
+		{
+			case 'title':
+			case 'description':
+			case 'link':
+				$this->{$type} = '';
+				break;
+
+			case 'metaTags':
+			case 'links':
+			case 'styleSheets':
+			case 'style':
+			case 'scripts':
+			case 'script':
+			case 'custom':
+				$realType = '_' . $type;
+				$this->{$realType} = array();
+				break;
+		}
+	}
+
+	/**
+	 * Set the HTML document head data
+	 *
+	 * @param   array  $data  The document head data in array form
+	 *
+	 * @return  HtmlDocument|null instance of $this to allow chaining or null for empty input data
+	 *
+	 * @since   11.1
+	 */
+	public function setHeadData($data)
+	{
+		if (empty($data) || !is_array($data))
+		{
+			return;
+		}
+
+		$this->title        = (isset($data['title']) && !empty($data['title'])) ? $data['title'] : $this->title;
+		$this->description  = (isset($data['description']) && !empty($data['description'])) ? $data['description'] : $this->description;
+		$this->link         = (isset($data['link']) && !empty($data['link'])) ? $data['link'] : $this->link;
+		$this->_metaTags    = (isset($data['metaTags']) && !empty($data['metaTags'])) ? $data['metaTags'] : $this->_metaTags;
+		$this->_links       = (isset($data['links']) && !empty($data['links'])) ? $data['links'] : $this->_links;
+		$this->_styleSheets = (isset($data['styleSheets']) && !empty($data['styleSheets'])) ? $data['styleSheets'] : $this->_styleSheets;
+		$this->_style       = (isset($data['style']) && !empty($data['style'])) ? $data['style'] : $this->_style;
+		$this->_scripts     = (isset($data['scripts']) && !empty($data['scripts'])) ? $data['scripts'] : $this->_scripts;
+		$this->_script      = (isset($data['script']) && !empty($data['script'])) ? $data['script'] : $this->_script;
+		$this->_custom      = (isset($data['custom']) && !empty($data['custom'])) ? $data['custom'] : $this->_custom;
+
+		if (isset($data['scriptText']) && !empty($data['scriptText']))
+		{
+			foreach ($data['scriptText'] as $key => $string)
+			{
+				\JText::script($key, $string);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Merge the HTML document head data
+	 *
+	 * @param   array  $data  The document head data in array form
+	 *
+	 * @return  HtmlDocument|null instance of $this to allow chaining or null for empty input data
+	 *
+	 * @since   11.1
+	 */
+	public function mergeHeadData($data)
+	{
+		if (empty($data) || !is_array($data))
+		{
+			return;
+		}
+
+		$this->title = (isset($data['title']) && !empty($data['title']) && !stristr($this->title, $data['title']))
+			? $this->title . $data['title']
+			: $this->title;
+		$this->description = (isset($data['description']) && !empty($data['description']) && !stristr($this->description, $data['description']))
+			? $this->description . $data['description']
+			: $this->description;
+		$this->link = (isset($data['link'])) ? $data['link'] : $this->link;
+
+		if (isset($data['metaTags']))
+		{
+			foreach ($data['metaTags'] as $type1 => $data1)
+			{
+				$booldog = $type1 == 'http-equiv' ? true : false;
+
+				foreach ($data1 as $name2 => $data2)
+				{
+					$this->setMetaData($name2, $data2, $booldog);
+				}
+			}
+		}
+
+		$this->_links = (isset($data['links']) && !empty($data['links']) && is_array($data['links']))
+			? array_unique(array_merge($this->_links, $data['links']), SORT_REGULAR)
+			: $this->_links;
+		$this->_styleSheets = (isset($data['styleSheets']) && !empty($data['styleSheets']) && is_array($data['styleSheets']))
+			? array_merge($this->_styleSheets, $data['styleSheets'])
+			: $this->_styleSheets;
+
+		if (isset($data['style']))
+		{
+			foreach ($data['style'] as $type => $stdata)
+			{
+				if (!isset($this->_style[strtolower($type)]) || !stristr($this->_style[strtolower($type)], $stdata))
+				{
+					$this->addStyleDeclaration($stdata, $type);
+				}
+			}
+		}
+
+		$this->_scripts = (isset($data['scripts']) && !empty($data['scripts']) && is_array($data['scripts']))
+			? array_merge($this->_scripts, $data['scripts'])
+			: $this->_scripts;
+
+		if (isset($data['script']))
+		{
+			foreach ($data['script'] as $type => $sdata)
+			{
+				if (!isset($this->_script[strtolower($type)]) || !stristr($this->_script[strtolower($type)], $sdata))
+				{
+					$this->addScriptDeclaration($sdata, $type);
+				}
+			}
+		}
+
+		$this->_custom = (isset($data['custom']) && !empty($data['custom']) && is_array($data['custom']))
+			? array_unique(array_merge($this->_custom, $data['custom']))
+			: $this->_custom;
+
+		return $this;
+	}
+
+	/**
+	 * Adds `<link>` tags to the head of the document
+	 *
+	 * $relType defaults to 'rel' as it is the most common relation type used.
+	 * ('rev' refers to reverse relation, 'rel' indicates normal, forward relation.)
+	 * Typical tag: `<link href="index.php" rel="Start">`
+	 *
+	 * @param   string  $href      The link that is being related.
+	 * @param   string  $relation  Relation of link.
+	 * @param   string  $relType   Relation type attribute.  Either rel or rev (default: 'rel').
+	 * @param   array   $attribs   Associative array of remaining attributes.
+	 *
+	 * @return  HtmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addHeadLink($href, $relation, $relType = 'rel', $attribs = array())
+	{
+		$this->_links[$href]['relation'] = $relation;
+		$this->_links[$href]['relType'] = $relType;
+		$this->_links[$href]['attribs'] = $attribs;
+
+		return $this;
+	}
+
+	/**
+	 * Adds a shortcut icon (favicon)
+	 *
+	 * This adds a link to the icon shown in the favorites list or on
+	 * the left of the url in the address bar. Some browsers display
+	 * it on the tab, as well.
+	 *
+	 * @param   string  $href      The link that is being related.
+	 * @param   string  $type      File type
+	 * @param   string  $relation  Relation of link
+	 *
+	 * @return  HtmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addFavicon($href, $type = 'image/vnd.microsoft.icon', $relation = 'shortcut icon')
+	{
+		$href = str_replace('\\', '/', $href);
+		$this->addHeadLink($href, $relation, 'rel', array('type' => $type));
+
+		return $this;
+	}
+
+	/**
+	 * Adds a custom HTML string to the head block
+	 *
+	 * @param   string  $html  The HTML to add to the head
+	 *
+	 * @return  HtmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addCustomTag($html)
+	{
+		$this->_custom[] = trim($html);
+
+		return $this;
+	}
+
+	/**
+	 * Returns whether the document is set up to be output as HTML5
+	 *
+	 * @return  boolean true when HTML5 is used
+	 *
+	 * @since   12.1
+	 */
+	public function isHtml5()
+	{
+		return $this->_html5;
+	}
+
+	/**
+	 * Sets whether the document should be output as HTML5
+	 *
+	 * @param   bool  $state  True when HTML5 should be output
+	 *
+	 * @return  void
+	 *
+	 * @since   12.1
+	 */
+	public function setHtml5($state)
+	{
+		if (is_bool($state))
+		{
+			$this->_html5 = $state;
+		}
+	}
+
+	/**
+	 * Get the contents of a document include
+	 *
+	 * @param   string  $type     The type of renderer
+	 * @param   string  $name     The name of the element to render
+	 * @param   array   $attribs  Associative array of remaining attributes.
+	 *
+	 * @return  mixed|string The output of the renderer
+	 *
+	 * @since   11.1
+	 */
+	public function getBuffer($type = null, $name = null, $attribs = array())
+	{
+		// If no type is specified, return the whole buffer
+		if ($type === null)
+		{
+			return parent::$_buffer;
+		}
+
+		$title = (isset($attribs['title'])) ? $attribs['title'] : null;
+
+		if (isset(parent::$_buffer[$type][$name][$title]))
+		{
+			return parent::$_buffer[$type][$name][$title];
+		}
+
+		$renderer = $this->loadRenderer($type);
+
+		if ($this->_caching == true && $type == 'modules')
+		{
+			$cache = \JFactory::getCache('com_modules', '');
+			$hash = md5(serialize(array($name, $attribs, null, $renderer)));
+			$cbuffer = $cache->get('cbuffer_' . $type);
+
+			if (isset($cbuffer[$hash]))
+			{
+				return Cache::getWorkarounds($cbuffer[$hash], array('mergehead' => 1));
+			}
+			else
+			{
+				$options = array();
+				$options['nopathway'] = 1;
+				$options['nomodules'] = 1;
+				$options['modulemode'] = 1;
+
+				$this->setBuffer($renderer->render($name, $attribs, null), $type, $name);
+				$data = parent::$_buffer[$type][$name][$title];
+
+				$tmpdata = Cache::setWorkarounds($data, $options);
+
+				$cbuffer[$hash] = $tmpdata;
+
+				$cache->store($cbuffer, 'cbuffer_' . $type);
+			}
+		}
+		else
+		{
+			$this->setBuffer($renderer->render($name, $attribs, null), $type, $name, $title);
+		}
+
+		return parent::$_buffer[$type][$name][$title];
+	}
+
+	/**
+	 * Set the contents a document includes
+	 *
+	 * @param   string  $content  The content to be set in the buffer.
+	 * @param   array   $options  Array of optional elements.
+	 *
+	 * @return  HtmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setBuffer($content, $options = array())
+	{
+		// The following code is just for backward compatibility.
+		if (func_num_args() > 1 && !is_array($options))
+		{
+			$args = func_get_args();
+			$options = array();
+			$options['type'] = $args[1];
+			$options['name'] = (isset($args[2])) ? $args[2] : null;
+			$options['title'] = (isset($args[3])) ? $args[3] : null;
+		}
+
+		parent::$_buffer[$options['type']][$options['name']][$options['title']] = $content;
+
+		return $this;
+	}
+
+	/**
+	 * Parses the template and populates the buffer
+	 *
+	 * @param   array  $params  Parameters for fetching the template
+	 *
+	 * @return  HtmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function parse($params = array())
+	{
+		return $this->_fetchTemplate($params)->_parseTemplate();
+	}
+
+	/**
+	 * Outputs the template to the browser.
+	 *
+	 * @param   boolean  $caching  If true, cache the output
+	 * @param   array    $params   Associative array of attributes
+	 *
+	 * @return  string The rendered data
+	 *
+	 * @since   11.1
+	 */
+	public function render($caching = false, $params = array())
+	{
+		$this->_caching = $caching;
+
+		if (empty($this->_template))
+		{
+			$this->parse($params);
+		}
+
+		$data = $this->_renderTemplate();
+		parent::render();
+
+		return $data;
+	}
+
+	/**
+	 * Count the modules based on the given condition
+	 *
+	 * @param   string  $condition  The condition to use
+	 *
+	 * @return  integer  Number of modules found
+	 *
+	 * @since   11.1
+	 */
+	public function countModules($condition)
+	{
+		$operators = '(\+|\-|\*|\/|==|\!=|\<\>|\<|\>|\<=|\>=|and|or|xor)';
+		$words = preg_split('# ' . $operators . ' #', $condition, null, PREG_SPLIT_DELIM_CAPTURE);
+
+		if (count($words) === 1)
+		{
+			$name = strtolower($words[0]);
+			$result = ((isset(parent::$_buffer['modules'][$name])) && (parent::$_buffer['modules'][$name] === false))
+				? 0 : count(ModuleHelper::getModules($name));
+
+			return $result;
+		}
+
+		Log::add('Using an expression in HtmlDocument::countModules() is deprecated.', Log::WARNING, 'deprecated');
+
+		for ($i = 0, $n = count($words); $i < $n; $i += 2)
+		{
+			// Odd parts (modules)
+			$name = strtolower($words[$i]);
+			$words[$i] = ((isset(parent::$_buffer['modules'][$name])) && (parent::$_buffer['modules'][$name] === false))
+				? 0
+				: count(ModuleHelper::getModules($name));
+		}
+
+		$str = 'return ' . implode(' ', $words) . ';';
+
+		return eval($str);
+	}
+
+	/**
+	 * Count the number of child menu items of the current active menu item
+	 *
+	 * @return  integer  Number of child menu items
+	 *
+	 * @since   11.1
+	 */
+	public function countMenuChildren()
+	{
+		static $children;
+
+		if (!isset($children))
+		{
+			$db = \JFactory::getDbo();
+			$app = \JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$children = 0;
+
+			if ($active)
+			{
+				$query = $db->getQuery(true)
+					->select('COUNT(*)')
+					->from('#__menu')
+					->where('parent_id = ' . $active->id)
+					->where('published = 1');
+				$db->setQuery($query);
+				$children = $db->loadResult();
+			}
+		}
+
+		return $children;
+	}
+
+	/**
+	 * Load a template file
+	 *
+	 * @param   string  $directory  The name of the template
+	 * @param   string  $filename   The actual filename
+	 *
+	 * @return  string  The contents of the template
+	 *
+	 * @since   11.1
+	 */
+	protected function _loadTemplate($directory, $filename)
+	{
+		$contents = '';
+
+		// Check to see if we have a valid template file
+		if (file_exists($directory . '/' . $filename))
+		{
+			// Store the file path
+			$this->_file = $directory . '/' . $filename;
+
+			// Get the file content
+			ob_start();
+			require $directory . '/' . $filename;
+			$contents = ob_get_contents();
+			ob_end_clean();
+		}
+
+		// Try to find a favicon by checking the template and root folder
+		$icon = '/favicon.ico';
+
+		foreach (array($directory, JPATH_BASE) as $dir)
+		{
+			if (file_exists($dir . $icon))
+			{
+				$path = str_replace(JPATH_BASE, '', $dir);
+				$path = str_replace('\\', '/', $path);
+				$this->addFavicon(Uri::base(true) . $path . $icon);
+				break;
+			}
+		}
+
+		return $contents;
+	}
+
+	/**
+	 * Fetch the template, and initialise the params
+	 *
+	 * @param   array  $params  Parameters to determine the template
+	 *
+	 * @return  HtmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	protected function _fetchTemplate($params = array())
+	{
+		// Check
+		$directory = isset($params['directory']) ? $params['directory'] : 'templates';
+		$filter = \JFilterInput::getInstance();
+		$template = $filter->clean($params['template'], 'cmd');
+		$file = $filter->clean($params['file'], 'cmd');
+
+		if (!file_exists($directory . '/' . $template . '/' . $file))
+		{
+			$template = 'system';
+		}
+
+		if (!file_exists($directory . '/' . $template . '/' . $file))
+		{
+			$file = 'index.php';
+		}
+
+		// Load the language file for the template
+		$lang = \JFactory::getLanguage();
+
+		// 1.5 or core then 1.6
+		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+			|| $lang->load('tpl_' . $template, $directory . '/' . $template, null, false, true);
+
+		// Assign the variables
+		$this->template = $template;
+		$this->baseurl = Uri::base(true);
+		$this->params = isset($params['params']) ? $params['params'] : new Registry;
+
+		// Load
+		$this->_template = $this->_loadTemplate($directory . '/' . $template, $file);
+
+		return $this;
+	}
+
+	/**
+	 * Parse a document template
+	 *
+	 * @return  HtmlDocument  instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	protected function _parseTemplate()
+	{
+		$matches = array();
+
+		if (preg_match_all('#<jdoc:include\ type="([^"]+)"(.*)\/>#iU', $this->_template, $matches))
+		{
+			$template_tags_first = array();
+			$template_tags_last = array();
+
+			// Step through the jdocs in reverse order.
+			for ($i = count($matches[0]) - 1; $i >= 0; $i--)
+			{
+				$type = $matches[1][$i];
+				$attribs = empty($matches[2][$i]) ? array() : \JUtility::parseAttributes($matches[2][$i]);
+				$name = isset($attribs['name']) ? $attribs['name'] : null;
+
+				// Separate buffers to be executed first and last
+				if ($type == 'module' || $type == 'modules')
+				{
+					$template_tags_first[$matches[0][$i]] = array('type' => $type, 'name' => $name, 'attribs' => $attribs);
+				}
+				else
+				{
+					$template_tags_last[$matches[0][$i]] = array('type' => $type, 'name' => $name, 'attribs' => $attribs);
+				}
+			}
+
+			// Reverse the last array so the jdocs are in forward order.
+			$template_tags_last = array_reverse($template_tags_last);
+
+			$this->_template_tags = $template_tags_first + $template_tags_last;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Render pre-parsed template
+	 *
+	 * @return string rendered template
+	 *
+	 * @since   11.1
+	 */
+	protected function _renderTemplate()
+	{
+		$replace = array();
+		$with = array();
+
+		foreach ($this->_template_tags as $jdoc => $args)
+		{
+			$replace[] = $jdoc;
+			$with[] = $this->getBuffer($args['type'], $args['name'], $args['attribs']);
+		}
+
+		return str_replace($replace, $with, $this->_template);
+	}
+}
diff --git a/core/libraries/src/Document/ImageDocument.php b/core/libraries/src/Document/ImageDocument.php
new file mode 100644
index 00000000..275a4a4e
--- /dev/null
+++ b/core/libraries/src/Document/ImageDocument.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * ImageDocument class, provides an easy interface to output image data
+ *
+ * @since  12.1
+ */
+class ImageDocument extends Document
+{
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since   12.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set mime type
+		$this->_mime = 'image/png';
+
+		// Set document type
+		$this->_type = 'image';
+	}
+
+	/**
+	 * Render the document.
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string  The rendered data
+	 *
+	 * @since   12.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		// Get the image type
+		$type = \JFactory::getApplication()->input->get('type', 'png');
+
+		switch ($type)
+		{
+			case 'jpg':
+			case 'jpeg':
+				$this->_mime = 'image/jpeg';
+				break;
+			case 'gif':
+				$this->_mime = 'image/gif';
+				break;
+			case 'png':
+			default:
+				$this->_mime = 'image/png';
+				break;
+		}
+
+		$this->_charset = null;
+
+		parent::render();
+
+		return $this->getBuffer();
+	}
+}
diff --git a/core/libraries/src/Document/JsonDocument.php b/core/libraries/src/Document/JsonDocument.php
new file mode 100644
index 00000000..5edfd10c
--- /dev/null
+++ b/core/libraries/src/Document/JsonDocument.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JsonDocument class, provides an easy interface to parse and display JSON output
+ *
+ * @link   http://www.json.org/
+ * @since  11.1
+ */
+class JsonDocument extends Document
+{
+	/**
+	 * Document name
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_name = 'joomla';
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since  11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set mime type
+		if (isset($_SERVER['HTTP_ACCEPT'])
+			&& strpos($_SERVER['HTTP_ACCEPT'], 'application/json') === false
+			&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false)
+		{
+			// Internet Explorer < 10
+			$this->_mime = 'text/plain';
+		}
+		else
+		{
+			$this->_mime = 'application/json';
+		}
+
+		// Set document type
+		$this->_type = 'json';
+	}
+
+	/**
+	 * Render the document.
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string  The rendered data
+	 *
+	 * @since  11.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		$app = \JFactory::getApplication();
+
+		$app->allowCache(false);
+
+		if ($this->_mime == 'application/json')
+		{
+			// Browser other than Internet Explorer < 10
+			$app->setHeader('Content-Disposition', 'attachment; filename="' . $this->getName() . '.json"', true);
+		}
+
+		parent::render();
+
+		return $this->getBuffer();
+	}
+
+	/**
+	 * Returns the document name
+	 *
+	 * @return  string
+	 *
+	 * @since  11.1
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Sets the document name
+	 *
+	 * @param   string  $name  Document name
+	 *
+	 * @return  JsonDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setName($name = 'joomla')
+	{
+		$this->_name = $name;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Document/Opensearch/OpensearchImage.php b/core/libraries/src/Document/Opensearch/OpensearchImage.php
new file mode 100644
index 00000000..daa049f3
--- /dev/null
+++ b/core/libraries/src/Document/Opensearch/OpensearchImage.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Opensearch;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Data object representing an OpenSearch image
+ *
+ * @since  11.1
+ */
+class OpensearchImage
+{
+	/**
+	 * The images MIME type
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = '';
+
+	/**
+	 * URL of the image or the image as base64 encoded value
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $data = '';
+
+	/**
+	 * The image's width
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $width;
+
+	/**
+	 * The image's height
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $height;
+}
diff --git a/core/libraries/src/Document/Opensearch/OpensearchUrl.php b/core/libraries/src/Document/Opensearch/OpensearchUrl.php
new file mode 100644
index 00000000..fb93375e
--- /dev/null
+++ b/core/libraries/src/Document/Opensearch/OpensearchUrl.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Opensearch;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Data object representing an OpenSearch URL
+ *
+ * @since  11.1
+ */
+class OpensearchUrl
+{
+	/**
+	 * Type item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $type = 'text/html';
+
+	/**
+	 * Rel item element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $rel = 'results';
+
+	/**
+	 * Template item element. Has to contain the {searchTerms} parameter to work.
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $template;
+}
diff --git a/core/libraries/src/Document/OpensearchDocument.php b/core/libraries/src/Document/OpensearchDocument.php
new file mode 100644
index 00000000..33c73425
--- /dev/null
+++ b/core/libraries/src/Document/OpensearchDocument.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\Opensearch\OpensearchImage;
+use Joomla\CMS\Document\Opensearch\OpensearchUrl;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Opensearch class, provides an easy interface to display an Opensearch document
+ *
+ * @link   http://www.opensearch.org/
+ * @since  11.1
+ */
+class OpensearchDocument extends Document
+{
+	/**
+	 * ShortName element
+	 *
+	 * required
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	private $_shortName = '';
+
+	/**
+	 * Images collection
+	 *
+	 * optional
+	 *
+	 * @var    object
+	 * @since  11.1
+	 */
+	private $_images = array();
+
+	/**
+	 * The url collection
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	private $_urls = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since  11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set document type
+		$this->_type = 'opensearch';
+
+		// Set mime type
+		$this->_mime = 'application/opensearchdescription+xml';
+
+		// Add the URL for self updating
+		$update = new OpensearchUrl;
+		$update->type = 'application/opensearchdescription+xml';
+		$update->rel = 'self';
+		$update->template = \JRoute::_(Uri::getInstance());
+		$this->addUrl($update);
+
+		// Add the favicon as the default image
+		// Try to find a favicon by checking the template and root folder
+		$app = \JFactory::getApplication();
+		$dirs = array(JPATH_THEMES . '/' . $app->getTemplate(), JPATH_BASE);
+
+		foreach ($dirs as $dir)
+		{
+			if (file_exists($dir . '/favicon.ico'))
+			{
+				$path = str_replace(JPATH_BASE, '', $dir);
+				$path = str_replace('\\', '/', $path);
+				$favicon = new OpensearchImage;
+
+				if ($path == '')
+				{
+					$favicon->data = Uri::base() . 'favicon.ico';
+				}
+				else
+				{
+					if ($path[0] == '/')
+					{
+						$path = substr($path, 1);
+					}
+
+					$favicon->data = Uri::base() . $path . '/favicon.ico';
+				}
+
+				$favicon->height = '16';
+				$favicon->width = '16';
+				$favicon->type = 'image/vnd.microsoft.icon';
+
+				$this->addImage($favicon);
+
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Render the document
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string  The rendered data
+	 *
+	 * @since   11.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		$xml = new \DOMDocument('1.0', 'utf-8');
+
+		if (defined('JDEBUG') && JDEBUG)
+		{
+			$xml->formatOutput = true;
+		}
+
+		// The Opensearch Namespace
+		$osns = 'http://a9.com/-/spec/opensearch/1.1/';
+
+		// Create the root element
+		$elOs = $xml->createElementNs($osns, 'OpenSearchDescription');
+
+		$elShortName = $xml->createElementNs($osns, 'ShortName');
+		$elShortName->appendChild($xml->createTextNode(htmlspecialchars($this->_shortName)));
+		$elOs->appendChild($elShortName);
+
+		$elDescription = $xml->createElementNs($osns, 'Description');
+		$elDescription->appendChild($xml->createTextNode(htmlspecialchars($this->description)));
+		$elOs->appendChild($elDescription);
+
+		// Always set the accepted input encoding to UTF-8
+		$elInputEncoding = $xml->createElementNs($osns, 'InputEncoding');
+		$elInputEncoding->appendChild($xml->createTextNode('UTF-8'));
+		$elOs->appendChild($elInputEncoding);
+
+		foreach ($this->_images as $image)
+		{
+			$elImage = $xml->createElementNs($osns, 'Image');
+			$elImage->setAttribute('type', $image->type);
+			$elImage->setAttribute('width', $image->width);
+			$elImage->setAttribute('height', $image->height);
+			$elImage->appendChild($xml->createTextNode(htmlspecialchars($image->data)));
+			$elOs->appendChild($elImage);
+		}
+
+		foreach ($this->_urls as $url)
+		{
+			$elUrl = $xml->createElementNs($osns, 'Url');
+			$elUrl->setAttribute('type', $url->type);
+
+			// Results is the default value so we don't need to add it
+			if ($url->rel != 'results')
+			{
+				$elUrl->setAttribute('rel', $url->rel);
+			}
+
+			$elUrl->setAttribute('template', $url->template);
+			$elOs->appendChild($elUrl);
+		}
+
+		$xml->appendChild($elOs);
+		parent::render();
+
+		return $xml->saveXml();
+	}
+
+	/**
+	 * Sets the short name
+	 *
+	 * @param   string  $name  The name.
+	 *
+	 * @return  OpensearchDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setShortName($name)
+	{
+		$this->_shortName = $name;
+
+		return $this;
+	}
+
+	/**
+	 * Adds a URL to the Opensearch description.
+	 *
+	 * @param   OpensearchUrl  $url  The url to add to the description.
+	 *
+	 * @return  OpensearchDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addUrl(OpensearchUrl $url)
+	{
+		$this->_urls[] = $url;
+
+		return $this;
+	}
+
+	/**
+	 * Adds an image to the Opensearch description.
+	 *
+	 * @param   OpensearchImage  $image  The image to add to the description.
+	 *
+	 * @return  OpensearchDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function addImage(OpensearchImage $image)
+	{
+		$this->_images[] = $image;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Document/RawDocument.php b/core/libraries/src/Document/RawDocument.php
new file mode 100644
index 00000000..124a9b13
--- /dev/null
+++ b/core/libraries/src/Document/RawDocument.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * RawDocument class, provides an easy interface to parse and display raw output
+ *
+ * @since  11.1
+ */
+class RawDocument extends Document
+{
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set mime type
+		$this->_mime = 'text/html';
+
+		// Set document type
+		$this->_type = 'raw';
+	}
+
+	/**
+	 * Render the document.
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string  The rendered data
+	 *
+	 * @since   11.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		parent::render();
+
+		return $this->getBuffer();
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Feed/AtomRenderer.php b/core/libraries/src/Document/Renderer/Feed/AtomRenderer.php
new file mode 100644
index 00000000..5c77ab7b
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Feed/AtomRenderer.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * AtomRenderer is a feed that implements the atom specification
+ *
+ * Please note that just by using this class you won't automatically
+ * produce valid atom files. For example, you have to specify either an editor
+ * for the feed or an author for every single feed item.
+ *
+ * @link   http://www.atomenabled.org/developers/syndication/atom-format-spec.php
+ * @since  3.5
+ *
+ * @property-read  \Joomla\CMS\Document\FeedDocument  $_doc  Reference to the Document object that instantiated the renderer
+ */
+class AtomRenderer extends DocumentRenderer
+{
+	/**
+	 * Document mime type
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $_mime = 'application/atom+xml';
+
+	/**
+	 * Render the feed.
+	 *
+	 * @param   string  $name     The name of the element to render
+	 * @param   array   $params   Array of values
+	 * @param   string  $content  Override the output of the renderer
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @see     DocumentRenderer::render()
+	 * @since   3.5
+	 */
+	public function render($name = '', $params = null, $content = null)
+	{
+		$app = \JFactory::getApplication();
+
+		// Gets and sets timezone offset from site configuration
+		$tz  = new \DateTimeZone($app->get('offset'));
+		$now = \JFactory::getDate();
+		$now->setTimeZone($tz);
+
+		$data = $this->_doc;
+
+		$url = Uri::getInstance()->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+		$syndicationURL = \JRoute::_('&format=feed&type=atom');
+
+		$title = $data->getTitle();
+
+		if ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $app->get('sitename'), $data->getTitle());
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $data->getTitle(), $app->get('sitename'));
+		}
+
+		$feed_title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
+
+		$feed = "<feed xmlns=\"http://www.w3.org/2005/Atom\" ";
+
+		if ($data->getLanguage() != '')
+		{
+			$feed .= " xml:lang=\"" . $data->getLanguage() . "\"";
+		}
+
+		$feed .= ">\n";
+		$feed .= "	<title type=\"text\">" . $feed_title . "</title>\n";
+		$feed .= "	<subtitle type=\"text\">" . htmlspecialchars($data->getDescription(), ENT_COMPAT, 'UTF-8') . "</subtitle>\n";
+
+		if (!empty($data->category))
+		{
+			if (is_array($data->category))
+			{
+				foreach ($data->category as $cat)
+				{
+					$feed .= "	<category term=\"" . htmlspecialchars($cat, ENT_COMPAT, 'UTF-8') . "\" />\n";
+				}
+			}
+			else
+			{
+				$feed .= "	<category term=\"" . htmlspecialchars($data->category, ENT_COMPAT, 'UTF-8') . "\" />\n";
+			}
+		}
+
+		$feed .= "	<link rel=\"alternate\" type=\"text/html\" href=\"" . $url . "\"/>\n";
+		$feed .= "	<id>" . str_replace(' ', '%20', $data->getBase()) . "</id>\n";
+		$feed .= "	<updated>" . htmlspecialchars($now->toISO8601(true), ENT_COMPAT, 'UTF-8') . "</updated>\n";
+
+		if ($data->editor != '')
+		{
+			$feed .= "	<author>\n";
+			$feed .= "		<name>" . $data->editor . "</name>\n";
+
+			if ($data->editorEmail != '')
+			{
+				$feed .= "		<email>" . htmlspecialchars($data->editorEmail, ENT_COMPAT, 'UTF-8') . "</email>\n";
+			}
+
+			$feed .= "	</author>\n";
+		}
+
+		$versionHtmlEscaped = '';
+
+		if ($app->get('MetaVersion', 0))
+		{
+			$minorVersion       = \JVersion::MAJOR_VERSION . '.' . \JVersion::MINOR_VERSION;
+			$versionHtmlEscaped = ' version="' . htmlspecialchars($minorVersion, ENT_COMPAT, 'UTF-8') . '"';
+		}
+
+		$feed .= "	<generator uri=\"https://www.joomla.org\"" . $versionHtmlEscaped . ">" . $data->getGenerator() . "</generator>\n";
+		$feed .= "	<link rel=\"self\" type=\"application/atom+xml\" href=\"" . str_replace(' ', '%20', $url . $syndicationURL) . "\"/>\n";
+
+		for ($i = 0, $count = count($data->items); $i < $count; $i++)
+		{
+			$itemlink = $data->items[$i]->link;
+
+			if (preg_match('/[\x80-\xFF]/', $itemlink))
+			{
+				$itemlink = implode('/', array_map('rawurlencode', explode('/', $itemlink)));
+			}
+
+			$feed .= "	<entry>\n";
+			$feed .= "		<title>" . htmlspecialchars(strip_tags($data->items[$i]->title), ENT_COMPAT, 'UTF-8') . "</title>\n";
+			$feed .= "		<link rel=\"alternate\" type=\"text/html\" href=\"" . $url . $itemlink . "\"/>\n";
+
+			if ($data->items[$i]->date == '')
+			{
+				$data->items[$i]->date = $now->toUnix();
+			}
+
+			$itemDate = \JFactory::getDate($data->items[$i]->date);
+			$itemDate->setTimeZone($tz);
+			$feed .= "		<published>" . htmlspecialchars($itemDate->toISO8601(true), ENT_COMPAT, 'UTF-8') . "</published>\n";
+			$feed .= "		<updated>" . htmlspecialchars($itemDate->toISO8601(true), ENT_COMPAT, 'UTF-8') . "</updated>\n";
+
+			if (empty($data->items[$i]->guid))
+			{
+				$itemGuid = str_replace(' ', '%20', $url . $itemlink);
+			}
+			else
+			{
+				$itemGuid = htmlspecialchars($data->items[$i]->guid, ENT_COMPAT, 'UTF-8');
+			}
+
+			$feed .= "		<id>" . $itemGuid . "</id>\n";
+
+			if ($data->items[$i]->author != '')
+			{
+				$feed .= "		<author>\n";
+				$feed .= "			<name>" . htmlspecialchars($data->items[$i]->author, ENT_COMPAT, 'UTF-8') . "</name>\n";
+
+				if (!empty($data->items[$i]->authorEmail))
+				{
+					$feed .= "			<email>" . htmlspecialchars($data->items[$i]->authorEmail, ENT_COMPAT, 'UTF-8') . "</email>\n";
+				}
+
+				$feed .= "		</author>\n";
+			}
+
+			if (!empty($data->items[$i]->description))
+			{
+				$feed .= "		<summary type=\"html\">" . htmlspecialchars($this->_relToAbs($data->items[$i]->description), ENT_COMPAT, 'UTF-8') . "</summary>\n";
+				$feed .= "		<content type=\"html\">" . htmlspecialchars($this->_relToAbs($data->items[$i]->description), ENT_COMPAT, 'UTF-8') . "</content>\n";
+			}
+
+			if (!empty($data->items[$i]->category))
+			{
+				if (is_array($data->items[$i]->category))
+				{
+					foreach ($data->items[$i]->category as $cat)
+					{
+						$feed .= "		<category term=\"" . htmlspecialchars($cat, ENT_COMPAT, 'UTF-8') . "\" />\n";
+					}
+				}
+				else
+				{
+					$feed .= "		<category term=\"" . htmlspecialchars($data->items[$i]->category, ENT_COMPAT, 'UTF-8') . "\" />\n";
+				}
+			}
+
+			if ($data->items[$i]->enclosure != null)
+			{
+				$feed .= "		<link rel=\"enclosure\" href=\"" . $data->items[$i]->enclosure->url . "\" type=\""
+					. $data->items[$i]->enclosure->type . "\"  length=\"" . $data->items[$i]->enclosure->length . "\" />\n";
+			}
+
+			$feed .= "	</entry>\n";
+		}
+
+		$feed .= "</feed>\n";
+
+		return $feed;
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Feed/RssRenderer.php b/core/libraries/src/Document/Renderer/Feed/RssRenderer.php
new file mode 100644
index 00000000..0c983b3b
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Feed/RssRenderer.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * RssRenderer is a feed that implements RSS 2.0 Specification
+ *
+ * @link   http://www.rssboard.org/rss-specification
+ * @since  3.5
+ *
+ * @property-read  \Joomla\CMS\Document\FeedDocument  $_doc  Reference to the Document object that instantiated the renderer
+ */
+class RssRenderer extends DocumentRenderer
+{
+	/**
+	 * Renderer mime type
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $_mime = 'application/rss+xml';
+
+	/**
+	 * Render the feed.
+	 *
+	 * @param   string  $name     The name of the element to render
+	 * @param   array   $params   Array of values
+	 * @param   string  $content  Override the output of the renderer
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @see     DocumentRenderer::render()
+	 * @since   3.5
+	 */
+	public function render($name = '', $params = null, $content = null)
+	{
+		$app = \JFactory::getApplication();
+
+		// Gets and sets timezone offset from site configuration
+		$tz  = new \DateTimeZone($app->get('offset'));
+		$now = \JFactory::getDate();
+		$now->setTimeZone($tz);
+
+		$data = $this->_doc;
+
+		$url = Uri::getInstance()->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+		$syndicationURL = \JRoute::_('&format=feed&type=rss');
+
+		$title = $data->getTitle();
+
+		if ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $app->get('sitename'), $data->getTitle());
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $data->getTitle(), $app->get('sitename'));
+		}
+
+		$feed_title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
+
+		$datalink = $data->getLink();
+
+		if (preg_match('/[\x80-\xFF]/', $datalink))
+		{
+			$datalink = implode('/', array_map('rawurlencode', explode('/', $datalink)));
+		}
+
+		$feed = "<rss version=\"2.0\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n";
+		$feed .= "	<channel>\n";
+		$feed .= "		<title>" . $feed_title . "</title>\n";
+		$feed .= "		<description><![CDATA[" . $data->getDescription() . "]]></description>\n";
+		$feed .= "		<link>" . str_replace(' ', '%20', $url . $datalink) . "</link>\n";
+		$feed .= "		<lastBuildDate>" . htmlspecialchars($now->toRFC822(true), ENT_COMPAT, 'UTF-8') . "</lastBuildDate>\n";
+		$feed .= "		<generator>" . $data->getGenerator() . "</generator>\n";
+		$feed .= "		<atom:link rel=\"self\" type=\"application/rss+xml\" href=\"" . str_replace(' ', '%20', $url . $syndicationURL) . "\"/>\n";
+
+		if ($data->image != null)
+		{
+			$feed .= "		<image>\n";
+			$feed .= "			<url>" . $data->image->url . "</url>\n";
+			$feed .= "			<title>" . htmlspecialchars($data->image->title, ENT_COMPAT, 'UTF-8') . "</title>\n";
+			$feed .= "			<link>" . str_replace(' ', '%20', $data->image->link) . "</link>\n";
+
+			if ($data->image->width != '')
+			{
+				$feed .= "			<width>" . $data->image->width . "</width>\n";
+			}
+
+			if ($data->image->height != '')
+			{
+				$feed .= "			<height>" . $data->image->height . "</height>\n";
+			}
+
+			if ($data->image->description != '')
+			{
+				$feed .= "			<description><![CDATA[" . $data->image->description . "]]></description>\n";
+			}
+
+			$feed .= "		</image>\n";
+		}
+
+		if ($data->getLanguage() !== '')
+		{
+			$feed .= "		<language>" . $data->getLanguage() . "</language>\n";
+		}
+
+		if ($data->copyright != '')
+		{
+			$feed .= "		<copyright>" . htmlspecialchars($data->copyright, ENT_COMPAT, 'UTF-8') . "</copyright>\n";
+		}
+
+		if ($data->editorEmail != '')
+		{
+			$feed .= "		<managingEditor>" . htmlspecialchars($data->editorEmail, ENT_COMPAT, 'UTF-8') . ' ('
+				. htmlspecialchars($data->editor, ENT_COMPAT, 'UTF-8') . ")</managingEditor>\n";
+		}
+
+		if ($data->webmaster != '')
+		{
+			$feed .= "		<webMaster>" . htmlspecialchars($data->webmaster, ENT_COMPAT, 'UTF-8') . "</webMaster>\n";
+		}
+
+		if ($data->pubDate != '')
+		{
+			$pubDate = \JFactory::getDate($data->pubDate);
+			$pubDate->setTimeZone($tz);
+			$feed .= "		<pubDate>" . htmlspecialchars($pubDate->toRFC822(true), ENT_COMPAT, 'UTF-8') . "</pubDate>\n";
+		}
+
+		if (!empty($data->category))
+		{
+			if (is_array($data->category))
+			{
+				foreach ($data->category as $cat)
+				{
+					$feed .= "		<category>" . htmlspecialchars($cat, ENT_COMPAT, 'UTF-8') . "</category>\n";
+				}
+			}
+			else
+			{
+				$feed .= "		<category>" . htmlspecialchars($data->category, ENT_COMPAT, 'UTF-8') . "</category>\n";
+			}
+		}
+
+		if ($data->docs != '')
+		{
+			$feed .= "		<docs>" . htmlspecialchars($data->docs, ENT_COMPAT, 'UTF-8') . "</docs>\n";
+		}
+
+		if ($data->ttl != '')
+		{
+			$feed .= "		<ttl>" . htmlspecialchars($data->ttl, ENT_COMPAT, 'UTF-8') . "</ttl>\n";
+		}
+
+		if ($data->rating != '')
+		{
+			$feed .= "		<rating>" . htmlspecialchars($data->rating, ENT_COMPAT, 'UTF-8') . "</rating>\n";
+		}
+
+		if ($data->skipHours != '')
+		{
+			$feed .= "		<skipHours>" . htmlspecialchars($data->skipHours, ENT_COMPAT, 'UTF-8') . "</skipHours>\n";
+		}
+
+		if ($data->skipDays != '')
+		{
+			$feed .= "		<skipDays>" . htmlspecialchars($data->skipDays, ENT_COMPAT, 'UTF-8') . "</skipDays>\n";
+		}
+
+		for ($i = 0, $count = count($data->items); $i < $count; $i++)
+		{
+			$itemlink = $data->items[$i]->link;
+
+			if (preg_match('/[\x80-\xFF]/', $itemlink))
+			{
+				$itemlink = implode('/', array_map('rawurlencode', explode('/', $itemlink)));
+			}
+
+			if ((strpos($itemlink, 'http://') === false) && (strpos($itemlink, 'https://') === false))
+			{
+				$itemlink = str_replace(' ', '%20', $url . $itemlink);
+			}
+
+			$feed .= "		<item>\n";
+			$feed .= "			<title>" . htmlspecialchars(strip_tags($data->items[$i]->title), ENT_COMPAT, 'UTF-8') . "</title>\n";
+			$feed .= "			<link>" . str_replace(' ', '%20', $itemlink) . "</link>\n";
+
+			if (empty($data->items[$i]->guid))
+			{
+				$feed .= "			<guid isPermaLink=\"true\">" . str_replace(' ', '%20', $itemlink) . "</guid>\n";
+			}
+			else
+			{
+				$feed .= "			<guid isPermaLink=\"false\">" . htmlspecialchars($data->items[$i]->guid, ENT_COMPAT, 'UTF-8') . "</guid>\n";
+			}
+
+			$feed .= "			<description><![CDATA[" . $this->_relToAbs($data->items[$i]->description) . "]]></description>\n";
+
+			if ($data->items[$i]->authorEmail != '')
+			{
+				$feed .= '			<author>'
+					. htmlspecialchars($data->items[$i]->authorEmail . ' (' . $data->items[$i]->author . ')', ENT_COMPAT, 'UTF-8') . "</author>\n";
+			}
+
+			/*
+			 * @todo: On hold
+			 * if ($data->items[$i]->source!='')
+			 * {
+			 *   $data.= "			<source>" . htmlspecialchars($data->items[$i]->source, ENT_COMPAT, 'UTF-8') . "</source>\n";
+			 * }
+			 */
+
+			if (empty($data->items[$i]->category) === false)
+			{
+				if (is_array($data->items[$i]->category))
+				{
+					foreach ($data->items[$i]->category as $cat)
+					{
+						$feed .= "			<category>" . htmlspecialchars($cat, ENT_COMPAT, 'UTF-8') . "</category>\n";
+					}
+				}
+				else
+				{
+					$feed .= "			<category>" . htmlspecialchars($data->items[$i]->category, ENT_COMPAT, 'UTF-8') . "</category>\n";
+				}
+			}
+
+			if ($data->items[$i]->comments != '')
+			{
+				$feed .= "			<comments>" . htmlspecialchars($data->items[$i]->comments, ENT_COMPAT, 'UTF-8') . "</comments>\n";
+			}
+
+			if ($data->items[$i]->date != '')
+			{
+				$itemDate = \JFactory::getDate($data->items[$i]->date);
+				$itemDate->setTimeZone($tz);
+				$feed .= "			<pubDate>" . htmlspecialchars($itemDate->toRFC822(true), ENT_COMPAT, 'UTF-8') . "</pubDate>\n";
+			}
+
+			if ($data->items[$i]->enclosure != null)
+			{
+				$feed .= "			<enclosure url=\"";
+				$feed .= $data->items[$i]->enclosure->url;
+				$feed .= "\" length=\"";
+				$feed .= $data->items[$i]->enclosure->length;
+				$feed .= "\" type=\"";
+				$feed .= $data->items[$i]->enclosure->type;
+				$feed .= "\"/>\n";
+			}
+
+			$feed .= "		</item>\n";
+		}
+
+		$feed .= "	</channel>\n";
+		$feed .= "</rss>\n";
+
+		return $feed;
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Html/ComponentRenderer.php b/core/libraries/src/Document/Renderer/Html/ComponentRenderer.php
new file mode 100644
index 00000000..725b70c0
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Html/ComponentRenderer.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Html;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+
+/**
+ * HTML document renderer for the component output
+ *
+ * @since  3.5
+ */
+class ComponentRenderer extends DocumentRenderer
+{
+	/**
+	 * Renders a component script and returns the results as a string
+	 *
+	 * @param   string  $component  The name of the component to render
+	 * @param   array   $params     Associative array of values
+	 * @param   string  $content    Content script
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @since   3.5
+	 */
+	public function render($component = null, $params = array(), $content = null)
+	{
+		return $content;
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Html/HeadRenderer.php b/core/libraries/src/Document/Renderer/Html/HeadRenderer.php
new file mode 100644
index 00000000..c9f12de1
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Html/HeadRenderer.php
@@ -0,0 +1,378 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Html;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Helper\TagsHelper;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * HTML document renderer for the document `<head>` element
+ *
+ * @since  3.5
+ */
+class HeadRenderer extends DocumentRenderer
+{
+	/**
+	 * Renders the document head and returns the results as a string
+	 *
+	 * @param   string  $head     (unused)
+	 * @param   array   $params   Associative array of values
+	 * @param   string  $content  The script
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @since   3.5
+	 */
+	public function render($head, $params = array(), $content = null)
+	{
+		return $this->fetchHead($this->_doc);
+	}
+
+	/**
+	 * Generates the head HTML and return the results as a string
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  string  The head hTML
+	 *
+	 * @since   3.5
+	 * @deprecated  4.0  Method code will be moved into the render method
+	 */
+	public function fetchHead($document)
+	{
+		// Convert the tagids to titles
+		if (isset($document->_metaTags['name']['tags']))
+		{
+			$tagsHelper = new TagsHelper;
+			$document->_metaTags['name']['tags'] = implode(', ', $tagsHelper->getTagNames($document->_metaTags['name']['tags']));
+		}
+
+		if ($document->getScriptOptions())
+		{
+			\JHtml::_('behavior.core');
+		}
+
+		// Trigger the onBeforeCompileHead event
+		$app = \JFactory::getApplication();
+		$app->triggerEvent('onBeforeCompileHead');
+
+		// Get line endings
+		$lnEnd        = $document->_getLineEnd();
+		$tab          = $document->_getTab();
+		$tagEnd       = ' />';
+		$buffer       = '';
+		$mediaVersion = $document->getMediaVersion();
+
+		// Generate charset when using HTML5 (should happen first)
+		if ($document->isHtml5())
+		{
+			$buffer .= $tab . '<meta charset="' . $document->getCharset() . '" />' . $lnEnd;
+		}
+
+		// Generate base tag (need to happen early)
+		$base = $document->getBase();
+
+		if (!empty($base))
+		{
+			$buffer .= $tab . '<base href="' . $base . '" />' . $lnEnd;
+		}
+
+		// Generate META tags (needs to happen as early as possible in the head)
+		foreach ($document->_metaTags as $type => $tag)
+		{
+			foreach ($tag as $name => $content)
+			{
+				if ($type == 'http-equiv' && !($document->isHtml5() && $name == 'content-type'))
+				{
+					$buffer .= $tab . '<meta http-equiv="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+				}
+				elseif ($type != 'http-equiv' && !empty($content))
+				{
+					if (is_array($content))
+					{
+						foreach ($content as $value)
+						{
+							$buffer .= $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+						}
+					}
+					else
+					{
+						$buffer .= $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+					}
+				}
+			}
+		}
+
+		// Don't add empty descriptions
+		$documentDescription = $document->getDescription();
+
+		if ($documentDescription)
+		{
+			$buffer .= $tab . '<meta name="description" content="' . htmlspecialchars($documentDescription, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+		}
+
+		// Don't add empty generators
+		$generator = $document->getGenerator();
+
+		if ($generator)
+		{
+			$buffer .= $tab . '<meta name="generator" content="' . htmlspecialchars($generator, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+		}
+
+		$buffer .= $tab . '<title>' . htmlspecialchars($document->getTitle(), ENT_COMPAT, 'UTF-8') . '</title>' . $lnEnd;
+
+		// Generate link declarations
+		foreach ($document->_links as $link => $linkAtrr)
+		{
+			$buffer .= $tab . '<link href="' . $link . '" ' . $linkAtrr['relType'] . '="' . $linkAtrr['relation'] . '"';
+
+			if (is_array($linkAtrr['attribs']))
+			{
+				if ($temp = ArrayHelper::toString($linkAtrr['attribs']))
+				{
+					$buffer .= ' ' . $temp;
+				}
+			}
+
+			$buffer .= ' />' . $lnEnd;
+		}
+
+		$defaultCssMimes = array('text/css');
+
+		// Generate stylesheet links
+		foreach ($document->_styleSheets as $src => $attribs)
+		{
+			// Check if stylesheet uses IE conditional statements.
+			$conditional = isset($attribs['options']) && isset($attribs['options']['conditional']) ? $attribs['options']['conditional'] : null;
+
+			// Check if script uses media version.
+			if (isset($attribs['options']['version']) && $attribs['options']['version'] && strpos($src, '?') === false
+				&& ($mediaVersion || $attribs['options']['version'] !== 'auto'))
+			{
+				$src .= '?' . ($attribs['options']['version'] === 'auto' ? $mediaVersion : $attribs['options']['version']);
+			}
+
+			$buffer .= $tab;
+
+			// This is for IE conditional statements support.
+			if (!is_null($conditional))
+			{
+				$buffer .= '<!--[if ' . $conditional . ']>';
+			}
+
+			$buffer .= '<link href="' . $src . '" rel="stylesheet"';
+
+			// Add script tag attributes.
+			foreach ($attribs as $attrib => $value)
+			{
+				// Don't add the 'options' attribute. This attribute is for internal use (version, conditional, etc).
+				if ($attrib === 'options')
+				{
+					continue;
+				}
+
+				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
+				if (in_array($attrib, array('type', 'mime')) && $document->isHtml5() && in_array($value, $defaultCssMimes))
+				{
+					continue;
+				}
+
+				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
+				if ($attrib === 'mime')
+				{
+					$attrib = 'type';
+				}
+
+				// Add attribute to script tag output.
+				$buffer .= ' ' . htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8');
+
+				// Json encode value if it's an array.
+				$value = !is_scalar($value) ? json_encode($value) : $value;
+
+				$buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
+			}
+
+			$buffer .= $tagEnd;
+
+			// This is for IE conditional statements support.
+			if (!is_null($conditional))
+			{
+				$buffer .= '<![endif]-->';
+			}
+
+			$buffer .= $lnEnd;
+		}
+
+		// Generate stylesheet declarations
+		foreach ($document->_style as $type => $content)
+		{
+			$buffer .= $tab . '<style';
+
+			if (!is_null($type) && (!$document->isHtml5() || !in_array($type, $defaultCssMimes)))
+			{
+				$buffer .= ' type="' . $type . '"';
+			}
+
+			$buffer .= '>' . $lnEnd;
+
+			// This is for full XHTML support.
+			if ($document->_mime != 'text/html')
+			{
+				$buffer .= $tab . $tab . '/*<![CDATA[*/' . $lnEnd;
+			}
+
+			$buffer .= $content . $lnEnd;
+
+			// See above note
+			if ($document->_mime != 'text/html')
+			{
+				$buffer .= $tab . $tab . '/*]]>*/' . $lnEnd;
+			}
+
+			$buffer .= $tab . '</style>' . $lnEnd;
+		}
+
+		// Generate scripts options
+		$scriptOptions = $document->getScriptOptions();
+
+		if (!empty($scriptOptions))
+		{
+			$buffer .= $tab . '<script type="application/json" class="joomla-script-options new">';
+
+			$prettyPrint = (JDEBUG && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false);
+			$jsonOptions = json_encode($scriptOptions, $prettyPrint);
+			$jsonOptions = $jsonOptions ? $jsonOptions : '{}';
+
+			$buffer .= $jsonOptions;
+			$buffer .= '</script>' . $lnEnd;
+		}
+
+		$defaultJsMimes         = array('text/javascript', 'application/javascript', 'text/x-javascript', 'application/x-javascript');
+		$html5NoValueAttributes = array('defer', 'async');
+
+		// Generate script file links
+		foreach ($document->_scripts as $src => $attribs)
+		{
+			// Check if script uses IE conditional statements.
+			$conditional = isset($attribs['options']) && isset($attribs['options']['conditional']) ? $attribs['options']['conditional'] : null;
+
+			// Check if script uses media version.
+			if (isset($attribs['options']['version']) && $attribs['options']['version'] && strpos($src, '?') === false
+				&& ($mediaVersion || $attribs['options']['version'] !== 'auto'))
+			{
+				$src .= '?' . ($attribs['options']['version'] === 'auto' ? $mediaVersion : $attribs['options']['version']);
+			}
+
+			$buffer .= $tab;
+
+			// This is for IE conditional statements support.
+			if (!is_null($conditional))
+			{
+				$buffer .= '<!--[if ' . $conditional . ']>';
+			}
+
+			$buffer .= '<script src="' . $src . '"';
+
+			// Add script tag attributes.
+			foreach ($attribs as $attrib => $value)
+			{
+				// Don't add the 'options' attribute. This attribute is for internal use (version, conditional, etc).
+				if ($attrib === 'options')
+				{
+					continue;
+				}
+
+				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
+				if (in_array($attrib, array('type', 'mime')) && $document->isHtml5() && in_array($value, $defaultJsMimes))
+				{
+					continue;
+				}
+
+				// B/C: If defer and async is false or empty don't render the attribute.
+				if (in_array($attrib, array('defer', 'async')) && !$value)
+				{
+					continue;
+				}
+
+				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
+				if ($attrib === 'mime')
+				{
+					$attrib = 'type';
+				}
+				// B/C defer and async can be set to yes when using the old method.
+				elseif (in_array($attrib, array('defer', 'async')) && $value === true)
+				{
+					$value = $attrib;
+				}
+
+				// Add attribute to script tag output.
+				$buffer .= ' ' . htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8');
+
+				if (!($document->isHtml5() && in_array($attrib, $html5NoValueAttributes)))
+				{
+					// Json encode value if it's an array.
+					$value = !is_scalar($value) ? json_encode($value) : $value;
+
+					$buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
+				}
+			}
+
+			$buffer .= '></script>';
+
+			// This is for IE conditional statements support.
+			if (!is_null($conditional))
+			{
+				$buffer .= '<![endif]-->';
+			}
+
+			$buffer .= $lnEnd;
+		}
+
+		// Generate script declarations
+		foreach ($document->_script as $type => $content)
+		{
+			$buffer .= $tab . '<script';
+
+			if (!is_null($type) && (!$document->isHtml5() || !in_array($type, $defaultJsMimes)))
+			{
+				$buffer .= ' type="' . $type . '"';
+			}
+
+			$buffer .= '>' . $lnEnd;
+
+			// This is for full XHTML support.
+			if ($document->_mime != 'text/html')
+			{
+				$buffer .= $tab . $tab . '//<![CDATA[' . $lnEnd;
+			}
+
+			$buffer .= $content . $lnEnd;
+
+			// See above note
+			if ($document->_mime != 'text/html')
+			{
+				$buffer .= $tab . $tab . '//]]>' . $lnEnd;
+			}
+
+			$buffer .= $tab . '</script>' . $lnEnd;
+		}
+
+		// Output the custom tags - array_unique makes sure that we don't output the same tags twice
+		foreach (array_unique($document->_custom) as $custom)
+		{
+			$buffer .= $tab . $custom . $lnEnd;
+		}
+
+		return ltrim($buffer, $tab);
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Html/MessageRenderer.php b/core/libraries/src/Document/Renderer/Html/MessageRenderer.php
new file mode 100644
index 00000000..7f27e665
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Html/MessageRenderer.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Html;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Layout\LayoutHelper;
+
+/**
+ * HTML document renderer for the system message queue
+ *
+ * @since  3.5
+ */
+class MessageRenderer extends DocumentRenderer
+{
+	/**
+	 * Renders the error stack and returns the results as a string
+	 *
+	 * @param   string  $name     Not used.
+	 * @param   array   $params   Associative array of values
+	 * @param   string  $content  Not used.
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @since   3.5
+	 */
+	public function render($name, $params = array(), $content = null)
+	{
+		$msgList     = $this->getData();
+		$displayData = array(
+			'msgList' => $msgList,
+			'name'    => $name,
+			'params'  => $params,
+			'content' => $content,
+		);
+
+		$app        = \JFactory::getApplication();
+		$chromePath = JPATH_THEMES . '/' . $app->getTemplate() . '/html/message.php';
+
+		if (file_exists($chromePath))
+		{
+			include_once $chromePath;
+		}
+
+		if (function_exists('renderMessage'))
+		{
+			Log::add('renderMessage() is deprecated. Override system message rendering with layouts instead.', Log::WARNING, 'deprecated');
+
+			return renderMessage($msgList);
+		}
+
+		return LayoutHelper::render('joomla.system.message', $displayData);
+	}
+
+	/**
+	 * Get and prepare system message data for output
+	 *
+	 * @return  array  An array contains system message
+	 *
+	 * @since   3.5
+	 */
+	private function getData()
+	{
+		// Initialise variables.
+		$lists = array();
+
+		// Get the message queue
+		$messages = \JFactory::getApplication()->getMessageQueue();
+
+		// Build the sorted message list
+		if (is_array($messages) && !empty($messages))
+		{
+			foreach ($messages as $msg)
+			{
+				if (isset($msg['type']) && isset($msg['message']))
+				{
+					$lists[$msg['type']][] = $msg['message'];
+				}
+			}
+		}
+
+		return $lists;
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Html/ModuleRenderer.php b/core/libraries/src/Document/Renderer/Html/ModuleRenderer.php
new file mode 100644
index 00000000..92e9d630
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Html/ModuleRenderer.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Html;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\Registry\Registry;
+
+/**
+ * HTML document renderer for a single module
+ *
+ * @since  3.5
+ */
+class ModuleRenderer extends DocumentRenderer
+{
+	/**
+	 * Renders a module script and returns the results as a string
+	 *
+	 * @param   string  $module   The name of the module to render
+	 * @param   array   $attribs  Associative array of values
+	 * @param   string  $content  If present, module information from the buffer will be used
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @since   3.5
+	 */
+	public function render($module, $attribs = array(), $content = null)
+	{
+		if (!is_object($module))
+		{
+			$title = isset($attribs['title']) ? $attribs['title'] : null;
+
+			$module = ModuleHelper::getModule($module, $title);
+
+			if (!is_object($module))
+			{
+				if (is_null($content))
+				{
+					return '';
+				}
+
+				/**
+				 * If module isn't found in the database but data has been pushed in the buffer
+				 * we want to render it
+				 */
+				$tmp = $module;
+				$module = new \stdClass;
+				$module->params = null;
+				$module->module = $tmp;
+				$module->id = 0;
+				$module->user = 0;
+			}
+		}
+
+		// Set the module content
+		if (!is_null($content))
+		{
+			$module->content = $content;
+		}
+
+		// Get module parameters
+		$params = new Registry($module->params);
+
+		// Use parameters from template
+		if (isset($attribs['params']))
+		{
+			$template_params = new Registry(html_entity_decode($attribs['params'], ENT_COMPAT, 'UTF-8'));
+			$params->merge($template_params);
+			$module = clone $module;
+			$module->params = (string) $params;
+		}
+
+		// Default for compatibility purposes. Set cachemode parameter or use JModuleHelper::moduleCache from within the module instead
+		$cachemode = $params->get('cachemode', 'oldstatic');
+
+		if ($params->get('cache', 0) == 1 && \JFactory::getConfig()->get('caching') >= 1 && $cachemode != 'id' && $cachemode != 'safeuri')
+		{
+			// Default to itemid creating method and workarounds on
+			$cacheparams = new \stdClass;
+			$cacheparams->cachemode = $cachemode;
+			$cacheparams->class = 'JModuleHelper';
+			$cacheparams->method = 'renderModule';
+			$cacheparams->methodparams = array($module, $attribs);
+
+			return ModuleHelper::ModuleCache($module, $params, $cacheparams);
+		}
+
+		return ModuleHelper::renderModule($module, $attribs);
+	}
+}
diff --git a/core/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/core/libraries/src/Document/Renderer/Html/ModulesRenderer.php
new file mode 100644
index 00000000..fa51205f
--- /dev/null
+++ b/core/libraries/src/Document/Renderer/Html/ModulesRenderer.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document\Renderer\Html;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Document\DocumentRenderer;
+use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Layout\LayoutHelper;
+
+/**
+ * HTML document renderer for a module position
+ *
+ * @since  3.5
+ */
+class ModulesRenderer extends DocumentRenderer
+{
+	/**
+	 * Renders multiple modules script and returns the results as a string
+	 *
+	 * @param   string  $position  The position of the modules to render
+	 * @param   array   $params    Associative array of values
+	 * @param   string  $content   Module content
+	 *
+	 * @return  string  The output of the script
+	 *
+	 * @since   3.5
+	 */
+	public function render($position, $params = array(), $content = null)
+	{
+		$renderer = $this->_doc->loadRenderer('module');
+		$buffer   = '';
+
+		$app          = \JFactory::getApplication();
+		$user         = \JFactory::getUser();
+		$frontediting = ($app->isClient('site') && $app->get('frontediting', 1) && !$user->guest);
+		$menusEditing = ($app->get('frontediting', 1) == 2) && $user->authorise('core.edit', 'com_menus');
+
+		foreach (ModuleHelper::getModules($position) as $mod)
+		{
+			$moduleHtml = $renderer->render($mod, $params, $content);
+
+			if ($frontediting && trim($moduleHtml) != '' && $user->authorise('module.edit.frontend', 'com_modules.module.' . $mod->id))
+			{
+				$displayData = array('moduleHtml' => &$moduleHtml, 'module' => $mod, 'position' => $position, 'menusediting' => $menusEditing);
+				LayoutHelper::render('joomla.edit.frontediting_modules', $displayData);
+			}
+
+			$buffer .= $moduleHtml;
+		}
+
+		\JEventDispatcher::getInstance()->trigger('onAfterRenderModules', array(&$buffer, &$params));
+
+		return $buffer;
+	}
+}
diff --git a/core/libraries/src/Document/XmlDocument.php b/core/libraries/src/Document/XmlDocument.php
new file mode 100644
index 00000000..1ed2a73f
--- /dev/null
+++ b/core/libraries/src/Document/XmlDocument.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Document;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * XmlDocument class, provides an easy interface to parse and display XML output
+ *
+ * @since  11.1
+ */
+class XmlDocument extends Document
+{
+	/**
+	 * Document name
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $name = 'joomla';
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Associative array of options
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($options = array())
+	{
+		parent::__construct($options);
+
+		// Set mime type
+		$this->_mime = 'application/xml';
+
+		// Set document type
+		$this->_type = 'xml';
+	}
+
+	/**
+	 * Render the document.
+	 *
+	 * @param   boolean  $cache   If true, cache the output
+	 * @param   array    $params  Associative array of attributes
+	 *
+	 * @return  string  The rendered data
+	 *
+	 * @since  11.1
+	 */
+	public function render($cache = false, $params = array())
+	{
+		parent::render();
+
+		\JFactory::getApplication()->setHeader('Content-disposition', 'inline; filename="' . $this->getName() . '.xml"', true);
+
+		return $this->getBuffer();
+	}
+
+	/**
+	 * Returns the document name
+	 *
+	 * @return  string
+	 *
+	 * @since  11.1
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Sets the document name
+	 *
+	 * @param   string  $name  Document name
+	 *
+	 * @return  XmlDocument instance of $this to allow chaining
+	 *
+	 * @since   11.1
+	 */
+	public function setName($name = 'joomla')
+	{
+		$this->name = $name;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Editor/Editor.php b/core/libraries/src/Editor/Editor.php
new file mode 100644
index 00000000..8412de08
--- /dev/null
+++ b/core/libraries/src/Editor/Editor.php
@@ -0,0 +1,563 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Editor;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Editor class to handle WYSIWYG editors
+ *
+ * @since  1.5
+ */
+class Editor extends \JObject
+{
+	/**
+	 * An array of Observer objects to notify
+	 *
+	 * @var    array
+	 * @since  1.5
+	 */
+	protected $_observers = array();
+
+	/**
+	 * The state of the observable object
+	 *
+	 * @var    mixed
+	 * @since  1.5
+	 */
+	protected $_state = null;
+
+	/**
+	 * A multi dimensional array of [function][] = key for observers
+	 *
+	 * @var    array
+	 * @since  1.5
+	 */
+	protected $_methods = array();
+
+	/**
+	 * Editor Plugin object
+	 *
+	 * @var    object
+	 * @since  1.5
+	 */
+	protected $_editor = null;
+
+	/**
+	 * Editor Plugin name
+	 *
+	 * @var    string
+	 * @since  1.5
+	 */
+	protected $_name = null;
+
+	/**
+	 * Object asset
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $asset = null;
+
+	/**
+	 * Object author
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $author = null;
+
+	/**
+	 * Editor instances container.
+	 *
+	 * @var    Editor[]
+	 * @since  2.5
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $editor  The editor name
+	 */
+	public function __construct($editor = 'none')
+	{
+		$this->_name = $editor;
+	}
+
+	/**
+	 * Returns the global Editor object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $editor  The editor to use.
+	 *
+	 * @return  Editor The Editor object.
+	 *
+	 * @since   1.5
+	 */
+	public static function getInstance($editor = 'none')
+	{
+		$signature = serialize($editor);
+
+		if (empty(self::$instances[$signature]))
+		{
+			self::$instances[$signature] = new Editor($editor);
+		}
+
+		return self::$instances[$signature];
+	}
+
+	/**
+	 * Get the state of the Editor object
+	 *
+	 * @return  mixed    The state of the object.
+	 *
+	 * @since   1.5
+	 */
+	public function getState()
+	{
+		return $this->_state;
+	}
+
+	/**
+	 * Attach an observer object
+	 *
+	 * @param   array|object  $observer  An observer object to attach or an array with handler and event keys
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function attach($observer)
+	{
+		if (is_array($observer))
+		{
+			if (!isset($observer['handler']) || !isset($observer['event']) || !is_callable($observer['handler']))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this array as an observer
+			foreach ($this->_observers as $check)
+			{
+				if (is_array($check) && $check['event'] == $observer['event'] && $check['handler'] == $observer['handler'])
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+			end($this->_observers);
+			$methods = array($observer['event']);
+		}
+		else
+		{
+			if (!($observer instanceof Editor))
+			{
+				return;
+			}
+
+			// Make sure we haven't already attached this object as an observer
+			$class = get_class($observer);
+
+			foreach ($this->_observers as $check)
+			{
+				if ($check instanceof $class)
+				{
+					return;
+				}
+			}
+
+			$this->_observers[] = $observer;
+
+			// @todo We require a Editor object above but get the methods from \JPlugin - something isn't right here!
+			$methods = array_diff(get_class_methods($observer), get_class_methods('\JPlugin'));
+		}
+
+		$key = key($this->_observers);
+
+		foreach ($methods as $method)
+		{
+			$method = strtolower($method);
+
+			if (!isset($this->_methods[$method]))
+			{
+				$this->_methods[$method] = array();
+			}
+
+			$this->_methods[$method][] = $key;
+		}
+	}
+
+	/**
+	 * Detach an observer object
+	 *
+	 * @param   object  $observer  An observer object to detach.
+	 *
+	 * @return  boolean  True if the observer object was detached.
+	 *
+	 * @since   1.5
+	 */
+	public function detach($observer)
+	{
+		$retval = false;
+
+		$key = array_search($observer, $this->_observers);
+
+		if ($key !== false)
+		{
+			unset($this->_observers[$key]);
+			$retval = true;
+
+			foreach ($this->_methods as &$method)
+			{
+				$k = array_search($key, $method);
+
+				if ($k !== false)
+				{
+					unset($method[$k]);
+				}
+			}
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Initialise the editor
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function initialise()
+	{
+		// Check if editor is already loaded
+		if ($this->_editor === null)
+		{
+			return;
+		}
+
+		$args['event'] = 'onInit';
+
+		$return    = '';
+		$results[] = $this->_editor->update($args);
+
+		foreach ($results as $result)
+		{
+			if (trim($result))
+			{
+				// @todo remove code: $return .= $result;
+				$return = $result;
+			}
+		}
+
+		$document = \JFactory::getDocument();
+
+		if (!empty($return) && method_exists($document, 'addCustomTag'))
+		{
+			$document->addCustomTag($return);
+		}
+	}
+
+	/**
+	 * Display the editor area.
+	 *
+	 * @param   string   $name     The control name.
+	 * @param   string   $html     The contents of the text area.
+	 * @param   string   $width    The width of the text area (px or %).
+	 * @param   string   $height   The height of the text area (px or %).
+	 * @param   integer  $col      The number of columns for the textarea.
+	 * @param   integer  $row      The number of rows for the textarea.
+	 * @param   boolean  $buttons  True and the editor buttons will be displayed.
+	 * @param   string   $id       An optional ID for the textarea (note: since 1.6). If not supplied the name is used.
+	 * @param   string   $asset    The object asset
+	 * @param   object   $author   The author.
+	 * @param   array    $params   Associative array of editor parameters.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public function display($name, $html, $width, $height, $col, $row, $buttons = true, $id = null, $asset = null, $author = null, $params = array())
+	{
+		$this->asset = $asset;
+		$this->author = $author;
+		$this->_loadEditor($params);
+
+		// Check whether editor is already loaded
+		if ($this->_editor === null)
+		{
+			\JFactory::getApplication()->enqueueMessage(\JText::_('JLIB_NO_EDITOR_PLUGIN_PUBLISHED'), 'error');
+
+			return;
+		}
+
+		// Backwards compatibility. Width and height should be passed without a semicolon from now on.
+		// If editor plugins need a unit like "px" for CSS styling, they need to take care of that
+		$width = str_replace(';', '', $width);
+		$height = str_replace(';', '', $height);
+
+		$return = null;
+
+		$args['name'] = $name;
+		$args['content'] = $html;
+		$args['width'] = $width;
+		$args['height'] = $height;
+		$args['col'] = $col;
+		$args['row'] = $row;
+		$args['buttons'] = $buttons;
+		$args['id'] = $id ?: $name;
+		$args['asset'] = $asset;
+		$args['author'] = $author;
+		$args['params'] = $params;
+		$args['event'] = 'onDisplay';
+
+		$results[] = $this->_editor->update($args);
+
+		foreach ($results as $result)
+		{
+			if (trim($result))
+			{
+				$return .= $result;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Save the editor content
+	 *
+	 * @param   string  $editor  The name of the editor control
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 *
+	 * @deprecated 4.0 Bind functionality to form submit through javascript
+	 */
+	public function save($editor)
+	{
+		$this->_loadEditor();
+
+		// Check whether editor is already loaded
+		if ($this->_editor === null)
+		{
+			return;
+		}
+
+		$args[] = $editor;
+		$args['event'] = 'onSave';
+
+		$return = '';
+		$results[] = $this->_editor->update($args);
+
+		foreach ($results as $result)
+		{
+			if (trim($result))
+			{
+				$return .= $result;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Get the editor contents
+	 *
+	 * @param   string  $editor  The name of the editor control
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 *
+	 * @deprecated 4.0 Use Joomla.editors API, see core.js
+	 */
+	public function getContent($editor)
+	{
+		$this->_loadEditor();
+
+		$args['name'] = $editor;
+		$args['event'] = 'onGetContent';
+
+		$return = '';
+		$results[] = $this->_editor->update($args);
+
+		foreach ($results as $result)
+		{
+			if (trim($result))
+			{
+				$return .= $result;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Set the editor contents
+	 *
+	 * @param   string  $editor  The name of the editor control
+	 * @param   string  $html    The contents of the text area
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 *
+	 * @deprecated 4.0 Use Joomla.editors API, see core.js
+	 */
+	public function setContent($editor, $html)
+	{
+		$this->_loadEditor();
+
+		$args['name'] = $editor;
+		$args['html'] = $html;
+		$args['event'] = 'onSetContent';
+
+		$return = '';
+		$results[] = $this->_editor->update($args);
+
+		foreach ($results as $result)
+		{
+			if (trim($result))
+			{
+				$return .= $result;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Get the editor extended buttons (usually from plugins)
+	 *
+	 * @param   string  $editor   The name of the editor.
+	 * @param   mixed   $buttons  Can be boolean or array, if boolean defines if the buttons are
+	 *                            displayed, if array defines a list of buttons not to show.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function getButtons($editor, $buttons = true)
+	{
+		$result = array();
+
+		if (is_bool($buttons) && !$buttons)
+		{
+			return $result;
+		}
+
+		// Get plugins
+		$plugins = \JPluginHelper::getPlugin('editors-xtd');
+
+		foreach ($plugins as $plugin)
+		{
+			if (is_array($buttons) && in_array($plugin->name, $buttons))
+			{
+				continue;
+			}
+
+			\JPluginHelper::importPlugin('editors-xtd', $plugin->name, false);
+			$className = 'PlgEditorsXtd' . $plugin->name;
+
+			if (!class_exists($className))
+			{
+				$className = 'PlgButton' . $plugin->name;
+			}
+
+			if (class_exists($className))
+			{
+				$plugin = new $className($this, (array) $plugin);
+			}
+
+			// Try to authenticate
+			if (!method_exists($plugin, 'onDisplay'))
+			{
+				continue;
+			}
+
+			$button = $plugin->onDisplay($editor, $this->asset, $this->author);
+
+			if (empty($button))
+			{
+				continue;
+			}
+
+			if (is_array($button))
+			{
+				$result = array_merge($result, $button);
+				continue;
+			}
+
+			$result[] = $button;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Load the editor
+	 *
+	 * @param   array  $config  Associative array of editor config parameters
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.5
+	 */
+	protected function _loadEditor($config = array())
+	{
+		// Check whether editor is already loaded
+		if ($this->_editor !== null)
+		{
+			return;
+		}
+
+		// Build the path to the needed editor plugin
+		$name = \JFilterInput::getInstance()->clean($this->_name, 'cmd');
+		$path = JPATH_PLUGINS . '/editors/' . $name . '/' . $name . '.php';
+
+		if (!is_file($path))
+		{
+			\JLog::add(\JText::_('JLIB_HTML_EDITOR_CANNOT_LOAD'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Require plugin file
+		require_once $path;
+
+		// Get the plugin
+		$plugin = \JPluginHelper::getPlugin('editors', $this->_name);
+
+		// If no plugin is published we get an empty array and there not so much to do with it
+		if (empty($plugin))
+		{
+			return false;
+		}
+
+		$params = new Registry($plugin->params);
+		$params->loadArray($config);
+		$plugin->params = $params;
+
+		// Build editor plugin classname
+		$name = 'PlgEditor' . $this->_name;
+
+		if ($this->_editor = new $name($this, (array) $plugin))
+		{
+			// Load plugin parameters
+			$this->initialise();
+			\JPluginHelper::importPlugin('editors-xtd');
+		}
+	}
+}
diff --git a/core/libraries/src/Environment/Browser.php b/core/libraries/src/Environment/Browser.php
new file mode 100644
index 00000000..f0acb284
--- /dev/null
+++ b/core/libraries/src/Environment/Browser.php
@@ -0,0 +1,702 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Environment;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Browser class, provides capability information about the current web client.
+ *
+ * Browser identification is performed by examining the HTTP_USER_AGENT
+ * environment variable provided by the web server.
+ *
+ * This class has many influences from the lib/Browser.php code in
+ * version 3 of Horde by Chuck Hagenbuch and Jon Parise.
+ *
+ * @since  11.1
+ */
+class Browser
+{
+	/**
+	 * @var    integer  Major version number
+	 * @since  12.1
+	 */
+	protected $majorVersion = 0;
+
+	/**
+	 * @var    integer  Minor version number
+	 * @since  12.1
+	 */
+	protected $minorVersion = 0;
+
+	/**
+	 * @var    string  Browser name.
+	 * @since  12.1
+	 */
+	protected $browser = '';
+
+	/**
+	 * @var    string  Full user agent string.
+	 * @since  12.1
+	 */
+	protected $agent = '';
+
+	/**
+	 * @var    string  Lower-case user agent string
+	 * @since  12.1
+	 */
+	protected $lowerAgent = '';
+
+	/**
+	 * @var    string  HTTP_ACCEPT string.
+	 * @since  12.1
+	 */
+	protected $accept = '';
+
+	/**
+	 * @var    array  Parsed HTTP_ACCEPT string
+	 * @since  12.1
+	 */
+	protected $acceptParsed = array();
+
+	/**
+	 * @var    string  Platform the browser is running on
+	 * @since  12.1
+	 */
+	protected $platform = '';
+
+	/**
+	 * @var    array  Known robots.
+	 * @since  12.1
+	 */
+	protected $robots = array(
+		// The most common ones.
+		'Googlebot',
+		'msnbot',
+		'Slurp',
+		'Yahoo',
+		// The rest alphabetically.
+		'Arachnoidea',
+		'ArchitextSpider',
+		'Ask Jeeves',
+		'B-l-i-t-z-Bot',
+		'Baiduspider',
+		'BecomeBot',
+		'cfetch',
+		'ConveraCrawler',
+		'ExtractorPro',
+		'FAST-WebCrawler',
+		'FDSE robot',
+		'fido',
+		'geckobot',
+		'Gigabot',
+		'Girafabot',
+		'grub-client',
+		'Gulliver',
+		'HTTrack',
+		'ia_archiver',
+		'InfoSeek',
+		'kinjabot',
+		'KIT-Fireball',
+		'larbin',
+		'LEIA',
+		'lmspider',
+		'Lycos_Spider',
+		'Mediapartners-Google',
+		'MuscatFerret',
+		'NaverBot',
+		'OmniExplorer_Bot',
+		'polybot',
+		'Pompos',
+		'Scooter',
+		'Teoma',
+		'TheSuBot',
+		'TurnitinBot',
+		'Ultraseek',
+		'ViolaBot',
+		'webbandit',
+		'www.almaden.ibm.com/cs/crawler',
+		'ZyBorg',
+	);
+
+	/**
+	 * @var    boolean  Is this a mobile browser?
+	 * @since  12.1
+	 */
+	protected $mobile = false;
+
+	/**
+	 * List of viewable image MIME subtypes.
+	 * This list of viewable images works for IE and Netscape/Mozilla.
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $images = array('jpeg', 'gif', 'png', 'pjpeg', 'x-png', 'bmp');
+
+	/**
+	 * @var    array  Browser instances container.
+	 * @since  11.3
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Create a browser instance (constructor).
+	 *
+	 * @param   string  $userAgent  The browser string to parse.
+	 * @param   string  $accept     The HTTP_ACCEPT settings to use.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($userAgent = null, $accept = null)
+	{
+		$this->match($userAgent, $accept);
+	}
+
+	/**
+	 * Returns the global Browser object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $userAgent  The browser string to parse.
+	 * @param   string  $accept     The HTTP_ACCEPT settings to use.
+	 *
+	 * @return  Browser  The Browser object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($userAgent = null, $accept = null)
+	{
+		$signature = serialize(array($userAgent, $accept));
+
+		if (empty(self::$instances[$signature]))
+		{
+			self::$instances[$signature] = new Browser($userAgent, $accept);
+		}
+
+		return self::$instances[$signature];
+	}
+
+	/**
+	 * Parses the user agent string and inititializes the object with
+	 * all the known features and quirks for the given browser.
+	 *
+	 * @param   string  $userAgent  The browser string to parse.
+	 * @param   string  $accept     The HTTP_ACCEPT settings to use.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function match($userAgent = null, $accept = null)
+	{
+		// Set our agent string.
+		if (is_null($userAgent))
+		{
+			if (isset($_SERVER['HTTP_USER_AGENT']))
+			{
+				$this->agent = trim($_SERVER['HTTP_USER_AGENT']);
+			}
+		}
+		else
+		{
+			$this->agent = $userAgent;
+		}
+
+		$this->lowerAgent = strtolower($this->agent);
+
+		// Set our accept string.
+		if (is_null($accept))
+		{
+			if (isset($_SERVER['HTTP_ACCEPT']))
+			{
+				$this->accept = strtolower(trim($_SERVER['HTTP_ACCEPT']));
+			}
+		}
+		else
+		{
+			$this->accept = strtolower($accept);
+		}
+
+		if (!empty($this->agent))
+		{
+			$this->_setPlatform();
+
+			/*
+			 * Determine if mobile. Note: Some Handhelds have their screen resolution in the
+			 * user agent string, which we can use to look for mobile agents.
+			 */
+			if (strpos($this->agent, 'MOT-') !== false
+				|| strpos($this->lowerAgent, 'j-') !== false
+				|| preg_match('/(mobileexplorer|openwave|opera mini|opera mobi|operamini|avantgo|wap|elaine)/i', $this->agent)
+				|| preg_match('/(iPhone|iPod|iPad|Android|Mobile|Phone|BlackBerry|Xiino|Palmscape|palmsource)/i', $this->agent)
+				|| preg_match('/(Nokia|Ericsson|docomo|digital paths|portalmmm|CriOS[\/ ]([0-9.]+))/i', $this->agent)
+				|| preg_match('/(UP|UP.B|UP.L)/', $this->agent)
+				|| preg_match('/; (120x160|240x280|240x320|320x320)\)/', $this->agent))
+			{
+				$this->mobile = true;
+			}
+
+			/*
+			 * We have to check for Edge as the first browser, because Edge has something like:
+			 * Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393
+			 */
+			if (preg_match('|Edge\/([0-9.]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('edge');
+
+				if (strpos($version[1], '.') !== false)
+				{
+					list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+				}
+				else
+				{
+					$this->majorVersion = $version[1];
+					$this->minorVersion = 0;
+				}
+			}
+			elseif (preg_match('|Opera[\/ ]([0-9.]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('opera');
+
+				list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+
+				/*
+				 * Due to changes in Opera UA, we need to check Version/xx.yy,
+				 * but only if version is > 9.80. See: http://dev.opera.com/articles/view/opera-ua-string-changes/
+				 */
+				if ($this->majorVersion == 9 && $this->minorVersion >= 80)
+				{
+					$this->identifyBrowserVersion();
+				}
+			}
+
+			// Opera 15+
+			elseif (preg_match('/OPR[\/ ]([0-9.]+)/', $this->agent, $version))
+			{
+				$this->setBrowser('opera');
+
+				list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+			}
+			elseif (preg_match('/Chrome[\/ ]([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/CrMo[\/ ]([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/CriOS[\/ ]([0-9.]+)/i', $this->agent, $version))
+			{
+				$this->setBrowser('chrome');
+
+				list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+			}
+			elseif (strpos($this->lowerAgent, 'elaine/') !== false
+				|| strpos($this->lowerAgent, 'palmsource') !== false
+				|| strpos($this->lowerAgent, 'digital paths') !== false)
+			{
+				$this->setBrowser('palm');
+			}
+			elseif (preg_match('/MSIE ([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/IE ([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/Internet Explorer[\/ ]([0-9.]+)/i', $this->agent, $version)
+				|| preg_match('/Trident\/.*rv:([0-9.]+)/i', $this->agent, $version))
+			{
+				$this->setBrowser('msie');
+
+				// Special case for IE 11+
+				if (strpos($version[0], 'Trident') !== false && strpos($version[0], 'rv:') !== false)
+				{
+					preg_match('|rv:([0-9.]+)|', $this->agent, $version);
+				}
+
+				if (strpos($version[1], '.') !== false)
+				{
+					list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+				}
+				else
+				{
+					$this->majorVersion = $version[1];
+					$this->minorVersion = 0;
+				}
+			}
+			elseif (preg_match('|amaya\/([0-9.]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('amaya');
+				$this->majorVersion = $version[1];
+
+				if (isset($version[2]))
+				{
+					$this->minorVersion = $version[2];
+				}
+			}
+			elseif (preg_match('|ANTFresco\/([0-9]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('fresco');
+			}
+			elseif (strpos($this->lowerAgent, 'avantgo') !== false)
+			{
+				$this->setBrowser('avantgo');
+			}
+			elseif (preg_match('|[Kk]onqueror\/([0-9]+)|', $this->agent, $version) || preg_match('|Safari/([0-9]+)\.?([0-9]+)?|', $this->agent, $version))
+			{
+				// Konqueror and Apple's Safari both use the KHTML rendering engine.
+				$this->setBrowser('konqueror');
+				$this->majorVersion = $version[1];
+
+				if (isset($version[2]))
+				{
+					$this->minorVersion = $version[2];
+				}
+
+				if (strpos($this->agent, 'Safari') !== false && $this->majorVersion >= 60)
+				{
+					// Safari.
+					$this->setBrowser('safari');
+					$this->identifyBrowserVersion();
+				}
+			}
+			elseif (preg_match('|Firefox\/([0-9.]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('firefox');
+
+				list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+			}
+			elseif (preg_match('|Lynx\/([0-9]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('lynx');
+			}
+			elseif (preg_match('|Links \(([0-9]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('links');
+			}
+			elseif (preg_match('|HotJava\/([0-9]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('hotjava');
+			}
+			elseif (strpos($this->agent, 'UP/') !== false || strpos($this->agent, 'UP.B') !== false || strpos($this->agent, 'UP.L') !== false)
+			{
+				$this->setBrowser('up');
+			}
+			elseif (strpos($this->agent, 'Xiino/') !== false)
+			{
+				$this->setBrowser('xiino');
+			}
+			elseif (strpos($this->agent, 'Palmscape/') !== false)
+			{
+				$this->setBrowser('palmscape');
+			}
+			elseif (strpos($this->agent, 'Nokia') !== false)
+			{
+				$this->setBrowser('nokia');
+			}
+			elseif (strpos($this->agent, 'Ericsson') !== false)
+			{
+				$this->setBrowser('ericsson');
+			}
+			elseif (strpos($this->lowerAgent, 'wap') !== false)
+			{
+				$this->setBrowser('wap');
+			}
+			elseif (strpos($this->lowerAgent, 'docomo') !== false || strpos($this->lowerAgent, 'portalmmm') !== false)
+			{
+				$this->setBrowser('imode');
+			}
+			elseif (strpos($this->agent, 'BlackBerry') !== false)
+			{
+				$this->setBrowser('blackberry');
+			}
+			elseif (strpos($this->agent, 'MOT-') !== false)
+			{
+				$this->setBrowser('motorola');
+			}
+			elseif (strpos($this->lowerAgent, 'j-') !== false)
+			{
+				$this->setBrowser('mml');
+			}
+			elseif (preg_match('|Mozilla\/([0-9.]+)|', $this->agent, $version))
+			{
+				$this->setBrowser('mozilla');
+
+				list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+			}
+		}
+	}
+
+	/**
+	 * Match the platform of the browser.
+	 *
+	 * This is a pretty simplistic implementation, but it's intended
+	 * to let us tell what line breaks to send, so it's good enough
+	 * for its purpose.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function _setPlatform()
+	{
+		if (strpos($this->lowerAgent, 'wind') !== false)
+		{
+			$this->platform = 'win';
+		}
+		elseif (strpos($this->lowerAgent, 'mac') !== false)
+		{
+			$this->platform = 'mac';
+		}
+		else
+		{
+			$this->platform = 'unix';
+		}
+	}
+
+	/**
+	 * Return the currently matched platform.
+	 *
+	 * @return  string  The user's platform.
+	 *
+	 * @since   11.1
+	 */
+	public function getPlatform()
+	{
+		return $this->platform;
+	}
+
+	/**
+	 * Set browser version, not by engine version
+	 * Fallback to use when no other method identify the engine version
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function identifyBrowserVersion()
+	{
+		if (preg_match('|Version[/ ]([0-9.]+)|', $this->agent, $version))
+		{
+			list($this->majorVersion, $this->minorVersion) = explode('.', $version[1]);
+
+			return;
+		}
+
+		// Can't identify browser version
+		$this->majorVersion = 0;
+		$this->minorVersion = 0;
+	}
+
+	/**
+	 * Sets the current browser.
+	 *
+	 * @param   string  $browser  The browser to set as current.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function setBrowser($browser)
+	{
+		$this->browser = $browser;
+	}
+
+	/**
+	 * Retrieve the current browser.
+	 *
+	 * @return  string  The current browser.
+	 *
+	 * @since   11.1
+	 */
+	public function getBrowser()
+	{
+		return $this->browser;
+	}
+
+	/**
+	 * Retrieve the current browser's major version.
+	 *
+	 * @return  integer  The current browser's major version
+	 *
+	 * @since   11.1
+	 */
+	public function getMajor()
+	{
+		return $this->majorVersion;
+	}
+
+	/**
+	 * Retrieve the current browser's minor version.
+	 *
+	 * @return  integer  The current browser's minor version.
+	 *
+	 * @since   11.1
+	 */
+	public function getMinor()
+	{
+		return $this->minorVersion;
+	}
+
+	/**
+	 * Retrieve the current browser's version.
+	 *
+	 * @return  string  The current browser's version.
+	 *
+	 * @since   11.1
+	 */
+	public function getVersion()
+	{
+		return $this->majorVersion . '.' . $this->minorVersion;
+	}
+
+	/**
+	 * Return the full browser agent string.
+	 *
+	 * @return  string  The browser agent string
+	 *
+	 * @since   11.1
+	 */
+	public function getAgentString()
+	{
+		return $this->agent;
+	}
+
+	/**
+	 * Returns the server protocol in use on the current server.
+	 *
+	 * @return  string  The HTTP server protocol version.
+	 *
+	 * @since   11.1
+	 */
+	public function getHTTPProtocol()
+	{
+		if (isset($_SERVER['SERVER_PROTOCOL']))
+		{
+			if (($pos = strrpos($_SERVER['SERVER_PROTOCOL'], '/')))
+			{
+				return substr($_SERVER['SERVER_PROTOCOL'], $pos + 1);
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * Determines if a browser can display a given MIME type.
+	 *
+	 * Note that  image/jpeg and image/pjpeg *appear* to be the same
+	 * entity, but Mozilla doesn't seem to want to accept the latter.
+	 * For our purposes, we will treat them the same.
+	 *
+	 * @param   string  $mimetype  The MIME type to check.
+	 *
+	 * @return  boolean  True if the browser can display the MIME type.
+	 *
+	 * @since   11.1
+	 */
+	public function isViewable($mimetype)
+	{
+		$mimetype = strtolower($mimetype);
+		list($type, $subtype) = explode('/', $mimetype);
+
+		if (!empty($this->accept))
+		{
+			$wildcard_match = false;
+
+			if (strpos($this->accept, $mimetype) !== false)
+			{
+				return true;
+			}
+
+			if (strpos($this->accept, '*/*') !== false)
+			{
+				$wildcard_match = true;
+
+				if ($type != 'image')
+				{
+					return true;
+				}
+			}
+
+			// Deal with Mozilla pjpeg/jpeg issue
+			if ($this->isBrowser('mozilla') && ($mimetype == 'image/pjpeg') && (strpos($this->accept, 'image/jpeg') !== false))
+			{
+				return true;
+			}
+
+			if (!$wildcard_match)
+			{
+				return false;
+			}
+		}
+
+		if ($type != 'image')
+		{
+			return false;
+		}
+
+		return in_array($subtype, $this->images);
+	}
+
+	/**
+	 * Determine if the given browser is the same as the current.
+	 *
+	 * @param   string  $browser  The browser to check.
+	 *
+	 * @return  boolean  Is the given browser the same as the current?
+	 *
+	 * @since   11.1
+	 */
+	public function isBrowser($browser)
+	{
+		return $this->browser === $browser;
+	}
+
+	/**
+	 * Determines if the browser is a robot or not.
+	 *
+	 * @return  boolean  True if browser is a known robot.
+	 *
+	 * @since   11.1
+	 */
+	public function isRobot()
+	{
+		foreach ($this->robots as $robot)
+		{
+			if (strpos($this->agent, $robot) !== false)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Determines if the browser is mobile version or not.
+	 *
+	 * @return boolean  True if browser is a known mobile version.
+	 *
+	 * @since   11.1
+	 */
+	public function isMobile()
+	{
+		return $this->mobile;
+	}
+
+	/**
+	 * Determine if we are using a secure (SSL) connection.
+	 *
+	 * @return  boolean  True if using SSL, false if not.
+	 *
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use the isSSLConnection method on the application object.
+	 */
+	public function isSSLConnection()
+	{
+		\JLog::add(
+			'Browser::isSSLConnection() is deprecated. Use the isSSLConnection method on the application object instead.',
+			\JLog::WARNING,
+			'deprecated'
+		);
+
+		return (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) || getenv('SSL_PROTOCOL_VERSION');
+	}
+}
diff --git a/core/libraries/src/Exception/ExceptionHandler.php b/core/libraries/src/Exception/ExceptionHandler.php
new file mode 100644
index 00000000..b3cfc2b8
--- /dev/null
+++ b/core/libraries/src/Exception/ExceptionHandler.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Displays the custom error page when an uncaught exception occurs.
+ *
+ * @since  3.0
+ */
+class ExceptionHandler
+{
+	/**
+	 * Render the error page based on an exception.
+	 *
+	 * @param   \Exception|\Throwable  $error  An Exception or Throwable (PHP 7+) object for which to render the error page.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function render($error)
+	{
+		$expectedClass = PHP_MAJOR_VERSION >= 7 ? '\Throwable' : '\Exception';
+		$isException   = $error instanceof $expectedClass;
+
+		// In PHP 5, the $error object should be an instance of \Exception; PHP 7 should be a Throwable implementation
+		if ($isException)
+		{
+			try
+			{
+				// Try to log the error, but don't let the logging cause a fatal error
+				try
+				{
+					\JLog::add(
+						sprintf(
+							'Uncaught %1$s of type %2$s thrown. Stack trace: %3$s',
+							$expectedClass,
+							get_class($error),
+							$error->getTraceAsString()
+						),
+						\JLog::CRITICAL,
+						'error'
+					);
+				}
+				catch (\Throwable $e)
+				{
+					// Logging failed, don't make a stink about it though
+				}
+				catch (\Exception $e)
+				{
+					// Logging failed, don't make a stink about it though
+				}
+
+				$app = \JFactory::getApplication();
+
+				// If site is offline and it's a 404 error, just go to index (to see offline message, instead of 404)
+				if ($error->getCode() == '404' && $app->get('offline') == 1)
+				{
+					$app->redirect('index.php');
+				}
+
+				$attributes = array(
+					'charset'   => 'utf-8',
+					'lineend'   => 'unix',
+					'tab'       => "\t",
+					'language'  => 'en-GB',
+					'direction' => 'ltr',
+				);
+
+				// If there is a \JLanguage instance in \JFactory then let's pull the language and direction from its metadata
+				if (\JFactory::$language)
+				{
+					$attributes['language']  = \JFactory::getLanguage()->getTag();
+					$attributes['direction'] = \JFactory::getLanguage()->isRtl() ? 'rtl' : 'ltr';
+				}
+
+				$document = \JDocument::getInstance('error', $attributes);
+
+				if (!$document)
+				{
+					// We're probably in an CLI environment
+					jexit($error->getMessage());
+				}
+
+				// Get the current template from the application
+				$template = $app->getTemplate();
+
+				// Push the error object into the document
+				$document->setError($error);
+
+				if (ob_get_contents())
+				{
+					ob_end_clean();
+				}
+
+				$document->setTitle(\JText::_('ERROR') . ': ' . $error->getCode());
+
+				$data = $document->render(
+					false,
+					array(
+						'template'  => $template,
+						'directory' => JPATH_THEMES,
+						'debug'     => JDEBUG,
+					)
+				);
+
+				// Do not allow cache
+				$app->allowCache(false);
+
+				// If nothing was rendered, just use the message from the Exception
+				if (empty($data))
+				{
+					$data = $error->getMessage();
+				}
+
+				$app->setBody($data);
+
+				echo $app->toString();
+
+				$app->close(0);
+
+				// This return is needed to ensure the test suite does not trigger the non-Exception handling below
+				return;
+			}
+			catch (\Throwable $e)
+			{
+				// Pass the error down
+			}
+			catch (\Exception $e)
+			{
+				// Pass the error down
+			}
+		}
+
+		// This isn't an Exception, we can't handle it.
+		if (!headers_sent())
+		{
+			header('HTTP/1.1 500 Internal Server Error');
+		}
+
+		$message = 'Error';
+
+		if ($isException)
+		{
+			// Make sure we do not display sensitive data in production environments
+			if (ini_get('display_errors'))
+			{
+				$message .= ': ';
+
+				if (isset($e))
+				{
+					$message .= $e->getMessage() . ': ';
+				}
+
+				$message .= $error->getMessage();
+			}
+		}
+
+		echo $message;
+
+		jexit(1);
+	}
+}
diff --git a/core/libraries/src/Extension/ExtensionHelper.php b/core/libraries/src/Extension/ExtensionHelper.php
new file mode 100644
index 00000000..373fd1b6
--- /dev/null
+++ b/core/libraries/src/Extension/ExtensionHelper.php
@@ -0,0 +1,278 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Extension;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Extension Helper class.
+ *
+ * @since       3.7.4
+ *
+ * @deprecated  4.0  Replace class with a non static methods for better testing
+ */
+class ExtensionHelper
+{
+	/**
+	 * Array of core extensions
+	 * Each element is an array with elements "type", "element", "folder" and
+	 * "client_id".
+	 *
+	 * @var    array
+	 * @since  3.7.4
+	 */
+	protected static $coreExtensions = array(
+		// Format: `type`, `element`, `folder`, `client_id`
+
+		// Core component extensions
+		array('component', 'com_admin', '', 1),
+		array('component', 'com_ajax', '', 1),
+		array('component', 'com_associations', '', 1),
+		array('component', 'com_banners', '', 1),
+		array('component', 'com_cache', '', 1),
+		array('component', 'com_categories', '', 1),
+		array('component', 'com_checkin', '', 1),
+		array('component', 'com_config', '', 1),
+		array('component', 'com_contact', '', 1),
+		array('component', 'com_content', '', 1),
+		array('component', 'com_contenthistory', '', 1),
+		array('component', 'com_cpanel', '', 1),
+		array('component', 'com_fields', '', 1),
+		array('component', 'com_finder', '', 1),
+		array('component', 'com_installer', '', 1),
+		array('component', 'com_joomlaupdate', '', 1),
+		array('component', 'com_languages', '', 1),
+		array('component', 'com_login', '', 1),
+		array('component', 'com_mailto', '', 0),
+		array('component', 'com_media', '', 1),
+		array('component', 'com_menus', '', 1),
+		array('component', 'com_messages', '', 1),
+		array('component', 'com_modules', '', 1),
+		array('component', 'com_newsfeeds', '', 1),
+		array('component', 'com_plugins', '', 1),
+		array('component', 'com_postinstall', '', 1),
+		array('component', 'com_redirect', '', 1),
+		array('component', 'com_search', '', 1),
+		array('component', 'com_tags', '', 1),
+		array('component', 'com_templates', '', 1),
+		array('component', 'com_users', '', 1),
+		array('component', 'com_wrapper', '', 0),
+
+		// Core file extensions
+		array('file', 'joomla', '', 0),
+
+		// Core language extensions - administrator
+		array('language', 'en-GB', '', 1),
+
+		// Core language extensions - site
+		array('language', 'en-GB', '', 0),
+
+		// Core library extensions
+		array('library', 'fof', '', 0),
+		array('library', 'idna_convert', '', 0),
+		array('library', 'joomla', '', 0),
+		array('library', 'phpass', '', 0),
+		array('library', 'phputf8', '', 0),
+
+		// Core module extensions - administrator
+		array('module', 'mod_custom', '', 1),
+		array('module', 'mod_feed', '', 1),
+		array('module', 'mod_latest', '', 1),
+		array('module', 'mod_logged', '', 1),
+		array('module', 'mod_login', '', 1),
+		array('module', 'mod_menu', '', 1),
+		array('module', 'mod_multilangstatus', '', 1),
+		array('module', 'mod_popular', '', 1),
+		array('module', 'mod_quickicon', '', 1),
+		array('module', 'mod_sampledata', '', 1),
+		array('module', 'mod_stats_admin', '', 1),
+		array('module', 'mod_status', '', 1),
+		array('module', 'mod_submenu', '', 1),
+		array('module', 'mod_title', '', 1),
+		array('module', 'mod_toolbar', '', 1),
+		array('module', 'mod_version', '', 1),
+
+		// Core module extensions - site
+		array('module', 'mod_articles_archive', '', 0),
+		array('module', 'mod_articles_categories', '', 0),
+		array('module', 'mod_articles_category', '', 0),
+		array('module', 'mod_articles_latest', '', 0),
+		array('module', 'mod_articles_news', '', 0),
+		array('module', 'mod_articles_popular', '', 0),
+		array('module', 'mod_banners', '', 0),
+		array('module', 'mod_breadcrumbs', '', 0),
+		array('module', 'mod_custom', '', 0),
+		array('module', 'mod_feed', '', 0),
+		array('module', 'mod_finder', '', 0),
+		array('module', 'mod_footer', '', 0),
+		array('module', 'mod_languages', '', 0),
+		array('module', 'mod_login', '', 0),
+		array('module', 'mod_menu', '', 0),
+		array('module', 'mod_random_image', '', 0),
+		array('module', 'mod_related_items', '', 0),
+		array('module', 'mod_search', '', 0),
+		array('module', 'mod_stats', '', 0),
+		array('module', 'mod_syndicate', '', 0),
+		array('module', 'mod_tags_popular', '', 0),
+		array('module', 'mod_tags_similar', '', 0),
+		array('module', 'mod_users_latest', '', 0),
+		array('module', 'mod_whosonline', '', 0),
+		array('module', 'mod_wrapper', '', 0),
+
+		// Core package extensions
+		array('package', 'pkg_en-GB', '', 0),
+
+		// Core plugin extensions - authentication
+		array('plugin', 'cookie', 'authentication', 0),
+		array('plugin', 'gmail', 'authentication', 0),
+		array('plugin', 'joomla', 'authentication', 0),
+		array('plugin', 'ldap', 'authentication', 0),
+
+		// Core plugin extensions - captcha
+		array('plugin', 'recaptcha', 'captcha', 0),
+
+		// Core plugin extensions - content
+		array('plugin', 'contact', 'content', 0),
+		array('plugin', 'emailcloak', 'content', 0),
+		array('plugin', 'fields', 'content', 0),
+		array('plugin', 'finder', 'content', 0),
+		array('plugin', 'joomla', 'content', 0),
+		array('plugin', 'loadmodule', 'content', 0),
+		array('plugin', 'pagebreak', 'content', 0),
+		array('plugin', 'pagenavigation', 'content', 0),
+		array('plugin', 'vote', 'content', 0),
+
+		// Core plugin extensions - editors
+		array('plugin', 'codemirror', 'editors', 0),
+		array('plugin', 'none', 'editors', 0),
+		array('plugin', 'tinymce', 'editors', 0),
+
+		// Core plugin extensions - editors xtd
+		array('plugin', 'article', 'editors-xtd', 0),
+		array('plugin', 'contact', 'editors-xtd', 0),
+		array('plugin', 'fields', 'editors-xtd', 0),
+		array('plugin', 'image', 'editors-xtd', 0),
+		array('plugin', 'menu', 'editors-xtd', 0),
+		array('plugin', 'module', 'editors-xtd', 0),
+		array('plugin', 'pagebreak', 'editors-xtd', 0),
+		array('plugin', 'readmore', 'editors-xtd', 0),
+
+		// Core plugin extensions - extension
+		array('plugin', 'joomla', 'extension', 0),
+
+		// Core plugin extensions - fields
+		array('plugin', 'calendar', 'fields', 0),
+		array('plugin', 'checkboxes', 'fields', 0),
+		array('plugin', 'color', 'fields', 0),
+		array('plugin', 'editor', 'fields', 0),
+		array('plugin', 'imagelist', 'fields', 0),
+		array('plugin', 'integer', 'fields', 0),
+		array('plugin', 'list', 'fields', 0),
+		array('plugin', 'media', 'fields', 0),
+		array('plugin', 'radio', 'fields', 0),
+		array('plugin', 'sql', 'fields', 0),
+		array('plugin', 'text', 'fields', 0),
+		array('plugin', 'textarea', 'fields', 0),
+		array('plugin', 'url', 'fields', 0),
+		array('plugin', 'user', 'fields', 0),
+		array('plugin', 'usergrouplist', 'fields', 0),
+
+		// Core plugin extensions - finder
+		array('plugin', 'categories', 'finder', 0),
+		array('plugin', 'contacts', 'finder', 0),
+		array('plugin', 'content', 'finder', 0),
+		array('plugin', 'newsfeeds', 'finder', 0),
+		array('plugin', 'tags', 'finder', 0),
+
+		// Core plugin extensions - installer
+		array('plugin', 'folderinstaller', 'installer', 0),
+		array('plugin', 'packageinstaller', 'installer', 0),
+		array('plugin', 'urlinstaller', 'installer', 0),
+
+		// Core plugin extensions - quick icon
+		array('plugin', 'extensionupdate', 'quickicon', 0),
+		array('plugin', 'joomlaupdate', 'quickicon', 0),
+		array('plugin', 'phpversioncheck', 'quickicon', 0),
+
+		// Core plugin extensions - sample data
+		array('plugin', 'blog', 'sampledata', 0),
+
+		// Core plugin extensions - search
+		array('plugin', 'categories', 'search', 0),
+		array('plugin', 'contacts', 'search', 0),
+		array('plugin', 'content', 'search', 0),
+		array('plugin', 'newsfeeds', 'search', 0),
+		array('plugin', 'tags', 'search', 0),
+
+		// Core plugin extensions - system
+		array('plugin', 'cache', 'system', 0),
+		array('plugin', 'debug', 'system', 0),
+		array('plugin', 'fields', 'system', 0),
+		array('plugin', 'highlight', 'system', 0),
+		array('plugin', 'languagecode', 'system', 0),
+		array('plugin', 'languagefilter', 'system', 0),
+		array('plugin', 'log', 'system', 0),
+		array('plugin', 'logout', 'system', 0),
+		array('plugin', 'p3p', 'system', 0),
+		array('plugin', 'redirect', 'system', 0),
+		array('plugin', 'remember', 'system', 0),
+		array('plugin', 'sef', 'system', 0),
+		array('plugin', 'sessiongc', 'system', 0),
+		array('plugin', 'stats', 'system', 0),
+		array('plugin', 'updatenotification', 'system', 0),
+
+		// Core plugin extensions - two factor authentication
+		array('plugin', 'totp', 'twofactorauth', 0),
+		array('plugin', 'yubikey', 'twofactorauth', 0),
+
+		// Core plugin extensions - user
+		array('plugin', 'contactcreator', 'user', 0),
+		array('plugin', 'joomla', 'user', 0),
+		array('plugin', 'profile', 'user', 0),
+
+		// Core template extensions - administrator
+		array('template', 'hathor', '', 1),
+		array('template', 'isis', '', 1),
+
+		// Core template extensions - site
+		array('template', 'beez3', '', 0),
+		array('template', 'protostar', '', 0),
+	);
+
+	/**
+	 * Gets the core extensions.
+	 *
+	 * @return  array  Array with core extensions.
+	 *                 Each extension is an array with following format:
+	 *                 `type`, `element`, `folder`, `client_id`.
+	 *
+	 * @since   3.7.4
+	 */
+	public static function getCoreExtensions()
+	{
+		return self::$coreExtensions;
+	}
+
+	/**
+	 * Check if an extension is core or not
+	 *
+	 * @param   string   $type       The extension's type.
+	 * @param   string   $element    The extension's element name.
+	 * @param   integer  $client_id  The extension's client ID. Default 0.
+	 * @param   string   $folder     The extension's folder. Default ''.
+	 *
+	 * @return  boolean  True if core, false if not.
+	 *
+	 * @since   3.7.4
+	 */
+	public static function checkIfCoreExtension($type, $element, $client_id = 0, $folder = '')
+	{
+		return in_array(array($type, $element, $folder, $client_id), self::$coreExtensions);
+	}
+}
diff --git a/core/libraries/src/Factory.php b/core/libraries/src/Factory.php
new file mode 100644
index 00000000..db99147a
--- /dev/null
+++ b/core/libraries/src/Factory.php
@@ -0,0 +1,840 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Editor\Editor;
+use Joomla\CMS\Input\Input;
+use Joomla\CMS\Language\Language;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\Mail;
+use Joomla\CMS\Mail\MailHelper;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\User;
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla Platform Factory class.
+ *
+ * @since  11.1
+ */
+abstract class Factory
+{
+	/**
+	 * Global application object
+	 *
+	 * @var    CMSApplication
+	 * @since  11.1
+	 */
+	public static $application = null;
+
+	/**
+	 * Global cache object
+	 *
+	 * @var    Cache
+	 * @since  11.1
+	 */
+	public static $cache = null;
+
+	/**
+	 * Global configuraiton object
+	 *
+	 * @var    \JConfig
+	 * @since  11.1
+	 */
+	public static $config = null;
+
+	/**
+	 * Container for Date instances
+	 *
+	 * @var    array
+	 * @since  11.3
+	 */
+	public static $dates = array();
+
+	/**
+	 * Global session object
+	 *
+	 * @var    Session
+	 * @since  11.1
+	 */
+	public static $session = null;
+
+	/**
+	 * Global language object
+	 *
+	 * @var   Language
+	 * @since  11.1
+	 */
+	public static $language = null;
+
+	/**
+	 * Global document object
+	 *
+	 * @var    \JDocument
+	 * @since  11.1
+	 */
+	public static $document = null;
+
+	/**
+	 * Global ACL object
+	 *
+	 * @var    Access
+	 * @since  11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS)
+	 */
+	public static $acl = null;
+
+	/**
+	 * Global database object
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  11.1
+	 */
+	public static $database = null;
+
+	/**
+	 * Global mailer object
+	 *
+	 * @var    Mail
+	 * @since  11.1
+	 */
+	public static $mailer = null;
+
+	/**
+	 * Get an application object.
+	 *
+	 * Returns the global {@link CMSApplication} object, only creating it if it doesn't already exist.
+	 *
+	 * @param   mixed   $id      A client identifier or name.
+	 * @param   array   $config  An optional associative array of configuration settings.
+	 * @param   string  $prefix  Application prefix
+	 *
+	 * @return  CMSApplication object
+	 *
+	 * @see     JApplication
+	 * @since   11.1
+	 * @throws  \Exception
+	 */
+	public static function getApplication($id = null, array $config = array(), $prefix = 'J')
+	{
+		if (!self::$application)
+		{
+			if (!$id)
+			{
+				throw new \Exception('Failed to start application', 500);
+			}
+
+			self::$application = CMSApplication::getInstance($id);
+
+			// Attach a delegated JLog object to the application
+			self::$application->setLogger(Log::createDelegatedLogger());
+		}
+
+		return self::$application;
+	}
+
+	/**
+	 * Get a configuration object
+	 *
+	 * Returns the global {@link \JConfig} object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $file       The path to the configuration file
+	 * @param   string  $type       The type of the configuration file
+	 * @param   string  $namespace  The namespace of the configuration file
+	 *
+	 * @return  Registry
+	 *
+	 * @see     Registry
+	 * @since   11.1
+	 */
+	public static function getConfig($file = null, $type = 'PHP', $namespace = '')
+	{
+		if (!self::$config)
+		{
+			if ($file === null)
+			{
+				$file = JPATH_CONFIGURATION . '/configuration.php';
+			}
+
+			self::$config = self::createConfig($file, $type, $namespace);
+		}
+
+		return self::$config;
+	}
+
+	/**
+	 * Get a session object.
+	 *
+	 * Returns the global {@link Session} object, only creating it if it doesn't already exist.
+	 *
+	 * @param   array  $options  An array containing session options
+	 *
+	 * @return  Session object
+	 *
+	 * @see     Session
+	 * @since   11.1
+	 */
+	public static function getSession(array $options = array())
+	{
+		if (!self::$session)
+		{
+			self::$session = self::createSession($options);
+		}
+
+		return self::$session;
+	}
+
+	/**
+	 * Get a language object.
+	 *
+	 * Returns the global {@link Language} object, only creating it if it doesn't already exist.
+	 *
+	 * @return  Language object
+	 *
+	 * @see     Language
+	 * @since   11.1
+	 */
+	public static function getLanguage()
+	{
+		if (!self::$language)
+		{
+			self::$language = self::createLanguage();
+		}
+
+		return self::$language;
+	}
+
+	/**
+	 * Get a document object.
+	 *
+	 * Returns the global {@link \JDocument} object, only creating it if it doesn't already exist.
+	 *
+	 * @return  \JDocument object
+	 *
+	 * @see     \JDocument
+	 * @since   11.1
+	 */
+	public static function getDocument()
+	{
+		if (!self::$document)
+		{
+			self::$document = self::createDocument();
+		}
+
+		return self::$document;
+	}
+
+	/**
+	 * Get a user object.
+	 *
+	 * Returns the global {@link User} object, only creating it if it doesn't already exist.
+	 *
+	 * @param   integer  $id  The user to load - Can be an integer or string - If string, it is converted to ID automatically.
+	 *
+	 * @return  User object
+	 *
+	 * @see     User
+	 * @since   11.1
+	 */
+	public static function getUser($id = null)
+	{
+		$instance = self::getSession()->get('user');
+
+		if (is_null($id))
+		{
+			if (!($instance instanceof User))
+			{
+				$instance = User::getInstance();
+			}
+		}
+		// Check if we have a string as the id or if the numeric id is the current instance
+		elseif (!($instance instanceof User) || is_string($id) || $instance->id !== $id)
+		{
+			$instance = User::getInstance($id);
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * Get a cache object
+	 *
+	 * Returns the global {@link CacheController} object
+	 *
+	 * @param   string  $group    The cache group name
+	 * @param   string  $handler  The handler to use
+	 * @param   string  $storage  The storage method
+	 *
+	 * @return  \Joomla\CMS\Cache\CacheController object
+	 *
+	 * @see     JCache
+	 * @since   11.1
+	 */
+	public static function getCache($group = '', $handler = 'callback', $storage = null)
+	{
+		$hash = md5($group . $handler . $storage);
+
+		if (isset(self::$cache[$hash]))
+		{
+			return self::$cache[$hash];
+		}
+
+		$handler = ($handler == 'function') ? 'callback' : $handler;
+
+		$options = array('defaultgroup' => $group);
+
+		if (isset($storage))
+		{
+			$options['storage'] = $storage;
+		}
+
+		$cache = Cache::getInstance($handler, $options);
+
+		self::$cache[$hash] = $cache;
+
+		return self::$cache[$hash];
+	}
+
+	/**
+	 * Get an authorization object
+	 *
+	 * Returns the global {@link Access} object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @return  Access object
+	 *
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use JAccess directly.
+	 */
+	public static function getAcl()
+	{
+		Log::add(__METHOD__ . ' is deprecated. Use Access directly.', Log::WARNING, 'deprecated');
+
+		if (!self::$acl)
+		{
+			self::$acl = new Access;
+		}
+
+		return self::$acl;
+	}
+
+	/**
+	 * Get a database object.
+	 *
+	 * Returns the global {@link \JDatabaseDriver} object, only creating it if it doesn't already exist.
+	 *
+	 * @return  \JDatabaseDriver
+	 *
+	 * @see     \JDatabaseDriver
+	 * @since   11.1
+	 */
+	public static function getDbo()
+	{
+		if (!self::$database)
+		{
+			self::$database = self::createDbo();
+		}
+
+		return self::$database;
+	}
+
+	/**
+	 * Get a mailer object.
+	 *
+	 * Returns the global {@link \JMail} object, only creating it if it doesn't already exist.
+	 *
+	 * @return  \JMail object
+	 *
+	 * @see     JMail
+	 * @since   11.1
+	 */
+	public static function getMailer()
+	{
+		if (!self::$mailer)
+		{
+			self::$mailer = self::createMailer();
+		}
+
+		$copy = clone self::$mailer;
+
+		return $copy;
+	}
+
+	/**
+	 * Get a parsed XML Feed Source
+	 *
+	 * @param   string   $url         Url for feed source.
+	 * @param   integer  $cache_time  Time to cache feed for (using internal cache mechanism).
+	 *
+	 * @return  mixed  SimplePie parsed object on success, false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  \BadMethodCallException
+	 * @deprecated  4.0  Use directly JFeedFactory or supply SimplePie instead. Mehod will be proxied to JFeedFactory beginning in 3.2
+	 */
+	public static function getFeedParser($url, $cache_time = 0)
+	{
+		if (!class_exists('JSimplepieFactory'))
+		{
+			throw new \BadMethodCallException('JSimplepieFactory not found');
+		}
+
+		Log::add(__METHOD__ . ' is deprecated.   Use JFeedFactory() or supply SimplePie instead.', Log::WARNING, 'deprecated');
+
+		return \JSimplepieFactory::getFeedParser($url, $cache_time);
+	}
+
+	/**
+	 * Reads a XML file.
+	 *
+	 * @param   string   $data    Full path and file name.
+	 * @param   boolean  $isFile  true to load a file or false to load a string.
+	 *
+	 * @return  mixed    JXMLElement or SimpleXMLElement on success or false on error.
+	 *
+	 * @see     JXMLElement
+	 * @since   11.1
+	 * @note    When JXMLElement is not present a SimpleXMLElement will be returned.
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use SimpleXML directly.
+	 */
+	public static function getXml($data, $isFile = true)
+	{
+		Log::add(__METHOD__ . ' is deprecated. Use SimpleXML directly.', Log::WARNING, 'deprecated');
+
+		$class = 'SimpleXMLElement';
+
+		if (class_exists('JXMLElement'))
+		{
+			$class = 'JXMLElement';
+		}
+
+		// Disable libxml errors and allow to fetch error information as needed
+		libxml_use_internal_errors(true);
+
+		if ($isFile)
+		{
+			// Try to load the XML file
+			$xml = simplexml_load_file($data, $class);
+		}
+		else
+		{
+			// Try to load the XML string
+			$xml = simplexml_load_string($data, $class);
+		}
+
+		if ($xml === false)
+		{
+			Log::add(\JText::_('JLIB_UTIL_ERROR_XML_LOAD'), Log::WARNING, 'jerror');
+
+			if ($isFile)
+			{
+				Log::add($data, Log::WARNING, 'jerror');
+			}
+
+			foreach (libxml_get_errors() as $error)
+			{
+				Log::add($error->message, Log::WARNING, 'jerror');
+			}
+		}
+
+		return $xml;
+	}
+
+	/**
+	 * Get an editor object.
+	 *
+	 * @param   string  $editor  The editor to load, depends on the editor plugins that are installed
+	 *
+	 * @return  Editor instance of Editor
+	 *
+	 * @since   11.1
+	 * @throws  \BadMethodCallException
+	 * @deprecated 12.3 (Platform) & 4.0 (CMS) - Use Editor directly
+	 */
+	public static function getEditor($editor = null)
+	{
+		Log::add(__METHOD__ . ' is deprecated. Use JEditor directly.', Log::WARNING, 'deprecated');
+
+		if (!class_exists('JEditor'))
+		{
+			throw new \BadMethodCallException('JEditor not found');
+		}
+
+		// Get the editor configuration setting
+		if (is_null($editor))
+		{
+			$conf = self::getConfig();
+			$editor = $conf->get('editor');
+		}
+
+		return Editor::getInstance($editor);
+	}
+
+	/**
+	 * Return a reference to the {@link Uri} object
+	 *
+	 * @param   string  $uri  Uri name.
+	 *
+	 * @return  Uri object
+	 *
+	 * @see     Uri
+	 * @since   11.1
+	 * @deprecated  13.3 (Platform) & 4.0 (CMS) - Use JUri directly.
+	 */
+	public static function getUri($uri = 'SERVER')
+	{
+		Log::add(__METHOD__ . ' is deprecated. Use JUri directly.', Log::WARNING, 'deprecated');
+
+		return Uri::getInstance($uri);
+	}
+
+	/**
+	 * Return the {@link Date} object
+	 *
+	 * @param   mixed  $time      The initial time for the JDate object
+	 * @param   mixed  $tzOffset  The timezone offset.
+	 *
+	 * @return  Date object
+	 *
+	 * @see     Date
+	 * @since   11.1
+	 */
+	public static function getDate($time = 'now', $tzOffset = null)
+	{
+		static $classname;
+		static $mainLocale;
+
+		$language = self::getLanguage();
+		$locale = $language->getTag();
+
+		if (!isset($classname) || $locale != $mainLocale)
+		{
+			// Store the locale for future reference
+			$mainLocale = $locale;
+
+			if ($mainLocale !== false)
+			{
+				$classname = str_replace('-', '_', $mainLocale) . 'Date';
+
+				if (!class_exists($classname))
+				{
+					// The class does not exist, default to Date
+					$classname = 'Joomla\\CMS\\Date\\Date';
+				}
+			}
+			else
+			{
+				// No tag, so default to Date
+				$classname = 'Joomla\\CMS\\Date\\Date';
+			}
+		}
+
+		$key = $time . '-' . ($tzOffset instanceof \DateTimeZone ? $tzOffset->getName() : (string) $tzOffset);
+
+		if (!isset(self::$dates[$classname][$key]))
+		{
+			self::$dates[$classname][$key] = new $classname($time, $tzOffset);
+		}
+
+		$date = clone self::$dates[$classname][$key];
+
+		return $date;
+	}
+
+	/**
+	 * Create a configuration object
+	 *
+	 * @param   string  $file       The path to the configuration file.
+	 * @param   string  $type       The type of the configuration file.
+	 * @param   string  $namespace  The namespace of the configuration file.
+	 *
+	 * @return  Registry
+	 *
+	 * @see     Registry
+	 * @since   11.1
+	 */
+	protected static function createConfig($file, $type = 'PHP', $namespace = '')
+	{
+		if (is_file($file))
+		{
+			include_once $file;
+		}
+
+		// Create the registry with a default namespace of config
+		$registry = new Registry;
+
+		// Sanitize the namespace.
+		$namespace = ucfirst((string) preg_replace('/[^A-Z_]/i', '', $namespace));
+
+		// Build the config name.
+		$name = 'JConfig' . $namespace;
+
+		// Handle the PHP configuration type.
+		if ($type == 'PHP' && class_exists($name))
+		{
+			// Create the JConfig object
+			$config = new $name;
+
+			// Load the configuration values into the registry
+			$registry->loadObject($config);
+		}
+
+		return $registry;
+	}
+
+	/**
+	 * Create a session object
+	 *
+	 * @param   array  $options  An array containing session options
+	 *
+	 * @return  Session object
+	 *
+	 * @since   11.1
+	 */
+	protected static function createSession(array $options = array())
+	{
+		// Get the Joomla configuration settings
+		$conf    = self::getConfig();
+		$handler = $conf->get('session_handler', 'none');
+
+		// Config time is in minutes
+		$options['expire'] = ($conf->get('lifetime')) ? $conf->get('lifetime') * 60 : 900;
+
+		// The session handler needs a JInput object, we can inject it without having a hard dependency to an application instance
+		$input = self::$application ? self::getApplication()->input : new Input;
+
+		$sessionHandler = new \JSessionHandlerJoomla($options);
+		$sessionHandler->input = $input;
+
+		$session = Session::getInstance($handler, $options, $sessionHandler);
+
+		if ($session->getState() == 'expired')
+		{
+			$session->restart();
+		}
+
+		return $session;
+	}
+
+	/**
+	 * Create a database object
+	 *
+	 * @return  \JDatabaseDriver
+	 *
+	 * @see     \JDatabaseDriver
+	 * @since   11.1
+	 */
+	protected static function createDbo()
+	{
+		$conf = self::getConfig();
+
+		$host = $conf->get('host');
+		$user = $conf->get('user');
+		$password = $conf->get('password');
+		$database = $conf->get('db');
+		$prefix = $conf->get('dbprefix');
+		$driver = $conf->get('dbtype');
+		$debug = $conf->get('debug');
+
+		$options = array('driver' => $driver, 'host' => $host, 'user' => $user, 'password' => $password, 'database' => $database, 'prefix' => $prefix);
+
+		try
+		{
+			$db = \JDatabaseDriver::getInstance($options);
+		}
+		catch (\RuntimeException $e)
+		{
+			if (!headers_sent())
+			{
+				header('HTTP/1.1 500 Internal Server Error');
+			}
+
+			jexit('Database Error: ' . $e->getMessage());
+		}
+
+		$db->setDebug($debug);
+
+		return $db;
+	}
+
+	/**
+	 * Create a mailer object
+	 *
+	 * @return  \JMail object
+	 *
+	 * @see     \JMail
+	 * @since   11.1
+	 */
+	protected static function createMailer()
+	{
+		$conf = self::getConfig();
+
+		$smtpauth = ($conf->get('smtpauth') == 0) ? null : 1;
+		$smtpuser = $conf->get('smtpuser');
+		$smtppass = $conf->get('smtppass');
+		$smtphost = $conf->get('smtphost');
+		$smtpsecure = $conf->get('smtpsecure');
+		$smtpport = $conf->get('smtpport');
+		$mailfrom = $conf->get('mailfrom');
+		$fromname = $conf->get('fromname');
+		$mailer = $conf->get('mailer');
+
+		// Create a Mail object
+		$mail = Mail::getInstance();
+
+		// Clean the email address
+		$mailfrom = MailHelper::cleanLine($mailfrom);
+
+		// Set default sender without Reply-to if the mailfrom is a valid address
+		if (MailHelper::isEmailAddress($mailfrom))
+		{
+			// Wrap in try/catch to catch phpmailerExceptions if it is throwing them
+			try
+			{
+				// Check for a false return value if exception throwing is disabled
+				if ($mail->setFrom($mailfrom, MailHelper::cleanLine($fromname), false) === false)
+				{
+					Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
+				}
+			}
+			catch (\phpmailerException $e)
+			{
+				Log::add(__METHOD__ . '() could not set the sender data.', Log::WARNING, 'mail');
+			}
+		}
+
+		// Default mailer is to use PHP's mail function
+		switch ($mailer)
+		{
+			case 'smtp':
+				$mail->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
+				break;
+
+			case 'sendmail':
+				$mail->isSendmail();
+				break;
+
+			default:
+				$mail->isMail();
+				break;
+		}
+
+		return $mail;
+	}
+
+	/**
+	 * Create a language object
+	 *
+	 * @return  Language object
+	 *
+	 * @see     Language
+	 * @since   11.1
+	 */
+	protected static function createLanguage()
+	{
+		$conf = self::getConfig();
+		$locale = $conf->get('language');
+		$debug = $conf->get('debug_lang');
+		$lang = Language::getInstance($locale, $debug);
+
+		return $lang;
+	}
+
+	/**
+	 * Create a document object
+	 *
+	 * @return  \JDocument object
+	 *
+	 * @see     \JDocument
+	 * @since   11.1
+	 */
+	protected static function createDocument()
+	{
+		$lang = self::getLanguage();
+
+		$input = self::getApplication()->input;
+		$type = $input->get('format', 'html', 'cmd');
+
+		$version = new Version;
+
+		$attributes = array(
+			'charset'      => 'utf-8',
+			'lineend'      => 'unix',
+			'tab'          => "\t",
+			'language'     => $lang->getTag(),
+			'direction'    => $lang->isRtl() ? 'rtl' : 'ltr',
+			'mediaversion' => $version->getMediaVersion(),
+		);
+
+		return \JDocument::getInstance($type, $attributes);
+	}
+
+	/**
+	 * Creates a new stream object with appropriate prefix
+	 *
+	 * @param   boolean  $use_prefix   Prefix the connections for writing
+	 * @param   boolean  $use_network  Use network if available for writing; use false to disable (e.g. FTP, SCP)
+	 * @param   string   $ua           UA User agent to use
+	 * @param   boolean  $uamask       User agent masking (prefix Mozilla)
+	 *
+	 * @return  \JStream
+	 *
+	 * @see     \JStream
+	 * @since   11.1
+	 */
+	public static function getStream($use_prefix = true, $use_network = true, $ua = null, $uamask = false)
+	{
+		\JLoader::import('joomla.filesystem.stream');
+
+		// Setup the context; Joomla! UA and overwrite
+		$context = array();
+		$version = new Version;
+
+		// Set the UA for HTTP and overwrite for FTP
+		$context['http']['user_agent'] = $version->getUserAgent($ua, $uamask);
+		$context['ftp']['overwrite'] = true;
+
+		if ($use_prefix)
+		{
+			$FTPOptions = \JClientHelper::getCredentials('ftp');
+			$SCPOptions = \JClientHelper::getCredentials('scp');
+
+			if ($FTPOptions['enabled'] == 1 && $use_network)
+			{
+				$prefix = 'ftp://' . $FTPOptions['user'] . ':' . $FTPOptions['pass'] . '@' . $FTPOptions['host'];
+				$prefix .= $FTPOptions['port'] ? ':' . $FTPOptions['port'] : '';
+				$prefix .= $FTPOptions['root'];
+			}
+			elseif ($SCPOptions['enabled'] == 1 && $use_network)
+			{
+				$prefix = 'ssh2.sftp://' . $SCPOptions['user'] . ':' . $SCPOptions['pass'] . '@' . $SCPOptions['host'];
+				$prefix .= $SCPOptions['port'] ? ':' . $SCPOptions['port'] : '';
+				$prefix .= $SCPOptions['root'];
+			}
+			else
+			{
+				$prefix = JPATH_ROOT . '/';
+			}
+
+			$retval = new \JStream($prefix, JPATH_ROOT, $context);
+		}
+		else
+		{
+			$retval = new \JStream('', '', $context);
+		}
+
+		return $retval;
+	}
+}
diff --git a/core/libraries/src/Feed/Feed.php b/core/libraries/src/Feed/Feed.php
new file mode 100644
index 00000000..1340c72f
--- /dev/null
+++ b/core/libraries/src/Feed/Feed.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed;
+
+defined('JPATH_PLATFORM') or die();
+
+use Joomla\CMS\Date\Date;
+
+/**
+ * Class to encapsulate a feed for the Joomla Platform.
+ *
+ * @property  FeedPerson  $author         Person responsible for feed content.
+ * @property  array       $categories     Categories to which the feed belongs.
+ * @property  array       $contributors   People who contributed to the feed content.
+ * @property  string      $copyright      Information about rights, e.g. copyrights, held in and over the feed.
+ * @property  string      $description    A phrase or sentence describing the feed.
+ * @property  string      $generator      A string indicating the program used to generate the feed.
+ * @property  string      $image          Specifies a GIF, JPEG or PNG image that should be displayed with the feed.
+ * @property  Date        $publishedDate  The publication date for the feed content.
+ * @property  string      $title          A human readable title for the feed.
+ * @property  Date        $updatedDate    The last time the content of the feed changed.
+ * @property  string      $uri            Universal, permanent identifier for the feed.
+ *
+ * @since  12.3
+ */
+class Feed implements \ArrayAccess, \Countable
+{
+	/**
+	 * @var    array  The entry properties.
+	 * @since  12.3
+	 */
+	protected $properties = array(
+		'uri' => '',
+		'title' => '',
+		'updatedDate' => '',
+		'description' => '',
+		'categories' => array(),
+		'contributors' => array(),
+	);
+
+	/**
+	 * @var    array  The list of feed entry objects.
+	 * @since  12.3
+	 */
+	protected $entries = array();
+
+	/**
+	 * Magic method to return values for feed properties.
+	 *
+	 * @param   string  $name  The name of the property.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.3
+	 */
+	public function __get($name)
+	{
+		return isset($this->properties[$name]) ? $this->properties[$name] : null;
+	}
+
+	/**
+	 * Magic method to set values for feed properties.
+	 *
+	 * @param   string  $name   The name of the property.
+	 * @param   mixed   $value  The value to set for the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function __set($name, $value)
+	{
+		// Ensure that setting a date always sets a JDate instance.
+		if ((($name == 'updatedDate') || ($name == 'publishedDate')) && !($value instanceof Date))
+		{
+			$value = new Date($value);
+		}
+
+		// Validate that any authors that are set are instances of JFeedPerson or null.
+		if (($name == 'author') && (!($value instanceof FeedPerson) || ($value === null)))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s "author" must be an instance of Joomla\\CMS\\Feed\\FeedPerson. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
+		}
+
+		// Disallow setting categories or contributors directly.
+		if (in_array($name, array('categories', 'contributors')))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'Cannot directly set %1$s property "%2$s".',
+					get_class($this),
+					$name
+				)
+			);
+		}
+
+		$this->properties[$name] = $value;
+	}
+
+	/**
+	 * Method to add a category to the feed object.
+	 *
+	 * @param   string  $name  The name of the category to add.
+	 * @param   string  $uri   The optional URI for the category to add.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function addCategory($name, $uri = '')
+	{
+		$this->properties['categories'][$name] = $uri;
+
+		return $this;
+	}
+
+	/**
+	 * Method to add a contributor to the feed object.
+	 *
+	 * @param   string  $name   The full name of the person to add.
+	 * @param   string  $email  The email address of the person to add.
+	 * @param   string  $uri    The optional URI for the person to add.
+	 * @param   string  $type   The optional type of person to add.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function addContributor($name, $email, $uri = null, $type = null)
+	{
+		$contributor = new FeedPerson($name, $email, $uri, $type);
+
+		// If the new contributor already exists then there is nothing to do, so just return.
+		foreach ($this->properties['contributors'] as $c)
+		{
+			if ($c == $contributor)
+			{
+				return $this;
+			}
+		}
+
+		// Add the new contributor.
+		$this->properties['contributors'][] = $contributor;
+
+		return $this;
+	}
+
+	/**
+	 * Method to add an entry to the feed object.
+	 *
+	 * @param   FeedEntry  $entry  The entry object to add.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function addEntry(FeedEntry $entry)
+	{
+		// If the new entry already exists then there is nothing to do, so just return.
+		foreach ($this->entries as $e)
+		{
+			if ($e == $entry)
+			{
+				return $this;
+			}
+		}
+
+		// Add the new entry.
+		$this->entries[] = $entry;
+
+		return $this;
+	}
+
+	/**
+	 * Returns a count of the number of entries in the feed.
+	 *
+	 * This method is here to implement the Countable interface.
+	 * You can call it by doing count($feed) rather than $feed->count();
+	 *
+	 * @return  integer number of entries in the feed.
+	 */
+	public function count()
+	{
+		return count($this->entries);
+	}
+
+	/**
+	 * Whether or not an offset exists.  This method is executed when using isset() or empty() on
+	 * objects implementing ArrayAccess.
+	 *
+	 * @param   mixed  $offset  An offset to check for.
+	 *
+	 * @return  boolean
+	 *
+	 * @see     ArrayAccess::offsetExists()
+	 * @since   12.3
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->entries[$offset]);
+	}
+
+	/**
+	 * Returns the value at specified offset.
+	 *
+	 * @param   mixed  $offset  The offset to retrieve.
+	 *
+	 * @return  mixed  The value at the offset.
+	 *
+	 * @see     ArrayAccess::offsetGet()
+	 * @since   12.3
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->entries[$offset];
+	}
+
+	/**
+	 * Assigns a value to the specified offset.
+	 *
+	 * @param   mixed      $offset  The offset to assign the value to.
+	 * @param   FeedEntry  $value   The JFeedEntry to set.
+	 *
+	 * @return  boolean
+	 *
+	 * @see     ArrayAccess::offsetSet()
+	 * @since   12.3
+	 * @throws  \InvalidArgumentException
+	 */
+	public function offsetSet($offset, $value)
+	{
+		if (!($value instanceof FeedEntry))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s entries must be an instance of Joomla\\CMS\\Feed\\FeedPerson. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
+		}
+
+		$this->entries[$offset] = $value;
+
+		return true;
+	}
+
+	/**
+	 * Unsets an offset.
+	 *
+	 * @param   mixed  $offset  The offset to unset.
+	 *
+	 * @return  void
+	 *
+	 * @see     ArrayAccess::offsetUnset()
+	 * @since   12.3
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->entries[$offset]);
+	}
+
+	/**
+	 * Method to remove a category from the feed object.
+	 *
+	 * @param   string  $name  The name of the category to remove.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function removeCategory($name)
+	{
+		unset($this->properties['categories'][$name]);
+
+		return $this;
+	}
+
+	/**
+	 * Method to remove a contributor from the feed object.
+	 *
+	 * @param   FeedPerson  $contributor  The person object to remove.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function removeContributor(FeedPerson $contributor)
+	{
+		// If the contributor exists remove it.
+		foreach ($this->properties['contributors'] as $k => $c)
+		{
+			if ($c == $contributor)
+			{
+				unset($this->properties['contributors'][$k]);
+				$this->properties['contributors'] = array_values($this->properties['contributors']);
+
+				return $this;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to remove an entry from the feed object.
+	 *
+	 * @param   FeedEntry  $entry  The entry object to remove.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function removeEntry(FeedEntry $entry)
+	{
+		// If the entry exists remove it.
+		foreach ($this->entries as $k => $e)
+		{
+			if ($e == $entry)
+			{
+				unset($this->entries[$k]);
+				$this->entries = array_values($this->entries);
+
+				return $this;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Shortcut method to set the author for the feed object.
+	 *
+	 * @param   string  $name   The full name of the person to set.
+	 * @param   string  $email  The email address of the person to set.
+	 * @param   string  $uri    The optional URI for the person to set.
+	 * @param   string  $type   The optional type of person to set.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function setAuthor($name, $email, $uri = null, $type = null)
+	{
+		$author = new FeedPerson($name, $email, $uri, $type);
+
+		$this->properties['author'] = $author;
+
+		return $this;
+	}
+
+	/**
+	 * Method to reverse the items if display is set to 'oldest first'
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function reverseItems()
+	{
+		if (is_array($this->entries) && !empty($this->entries))
+		{
+			$this->entries = array_reverse($this->entries);
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Feed/FeedEntry.php b/core/libraries/src/Feed/FeedEntry.php
new file mode 100644
index 00000000..f1eb017a
--- /dev/null
+++ b/core/libraries/src/Feed/FeedEntry.php
@@ -0,0 +1,281 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Date\Date;
+
+/**
+ * Class to encapsulate a feed entry for the Joomla Platform.
+ *
+ * @property  FeedPerson  $author         Person responsible for feed entry content.
+ * @property  array       $categories     Categories to which the feed entry belongs.
+ * @property  string      $content        The content of the feed entry.
+ * @property  array       $contributors   People who contributed to the feed entry content.
+ * @property  string      $copyright      Information about rights, e.g. copyrights, held in and over the feed entry.
+ * @property  array       $links          Links associated with the feed entry.
+ * @property  Date        $publishedDate  The publication date for the feed entry.
+ * @property  Feed        $source         The feed from which the entry is sourced.
+ * @property  string      $title          A human readable title for the feed entry.
+ * @property  Date        $updatedDate    The last time the content of the feed entry changed.
+ * @property  string      $uri            Universal, permanent identifier for the feed entry.
+ *
+ * @since  12.3
+ */
+class FeedEntry
+{
+	/**
+	 * @var    array  The entry properties.
+	 * @since  12.3
+	 */
+	protected $properties = array(
+		'uri'  => '',
+		'title' => '',
+		'updatedDate' => '',
+		'content' => '',
+		'categories' => array(),
+		'contributors' => array(),
+		'links' => array(),
+	);
+
+	/**
+	 * Magic method to return values for feed entry properties.
+	 *
+	 * @param   string  $name  The name of the property.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   12.3
+	 */
+	public function __get($name)
+	{
+		return (isset($this->properties[$name])) ? $this->properties[$name] : null;
+	}
+
+	/**
+	 * Magic method to set values for feed properties.
+	 *
+	 * @param   string  $name   The name of the property.
+	 * @param   mixed   $value  The value to set for the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function __set($name, $value)
+	{
+		// Ensure that setting a date always sets a JDate instance.
+		if ((($name == 'updatedDate') || ($name == 'publishedDate')) && !($value instanceof Date))
+		{
+			$value = new Date($value);
+		}
+
+		// Validate that any authors that are set are instances of JFeedPerson or null.
+		if (($name == 'author') && (!($value instanceof FeedPerson) || ($value === null)))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s "author" must be an instance of Joomla\\CMS\\Feed\\FeedPerson. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
+		}
+
+		// Validate that any sources that are set are instances of JFeed or null.
+		if (($name == 'source') && (!($value instanceof Feed) || ($value === null)))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s "source" must be an instance of Joomla\\CMS\\Feed\\Feed. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
+		}
+
+		// Disallow setting categories, contributors, or links directly.
+		if (in_array($name, array('categories', 'contributors', 'links')))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'Cannot directly set %1$s property "%2$s".',
+					get_class($this),
+					$name
+				)
+			);
+		}
+
+		$this->properties[$name] = $value;
+	}
+
+	/**
+	 * Method to add a category to the feed entry object.
+	 *
+	 * @param   string  $name  The name of the category to add.
+	 * @param   string  $uri   The optional URI for the category to add.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function addCategory($name, $uri = '')
+	{
+		$this->properties['categories'][$name] = $uri;
+
+		return $this;
+	}
+
+	/**
+	 * Method to add a contributor to the feed entry object.
+	 *
+	 * @param   string  $name   The full name of the person to add.
+	 * @param   string  $email  The email address of the person to add.
+	 * @param   string  $uri    The optional URI for the person to add.
+	 * @param   string  $type   The optional type of person to add.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function addContributor($name, $email, $uri = null, $type = null)
+	{
+		$contributor = new FeedPerson($name, $email, $uri, $type);
+
+		// If the new contributor already exists then there is nothing to do, so just return.
+		foreach ($this->properties['contributors'] as $c)
+		{
+			if ($c == $contributor)
+			{
+				return $this;
+			}
+		}
+
+		// Add the new contributor.
+		$this->properties['contributors'][] = $contributor;
+
+		return $this;
+	}
+
+	/**
+	 * Method to add a link to the feed entry object.
+	 *
+	 * @param   FeedLink  $link  The link object to add.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function addLink(FeedLink $link)
+	{
+		// If the new link already exists then there is nothing to do, so just return.
+		foreach ($this->properties['links'] as $l)
+		{
+			if ($l == $link)
+			{
+				return $this;
+			}
+		}
+
+		// Add the new link.
+		$this->properties['links'][] = $link;
+
+		return $this;
+	}
+
+	/**
+	 * Method to remove a category from the feed entry object.
+	 *
+	 * @param   string  $name  The name of the category to remove.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function removeCategory($name)
+	{
+		unset($this->properties['categories'][$name]);
+
+		return $this;
+	}
+
+	/**
+	 * Method to remove a contributor from the feed entry object.
+	 *
+	 * @param   FeedPerson  $contributor  The person object to remove.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function removeContributor(FeedPerson $contributor)
+	{
+		// If the contributor exists remove it.
+		foreach ($this->properties['contributors'] as $k => $c)
+		{
+			if ($c == $contributor)
+			{
+				unset($this->properties['contributors'][$k]);
+				$this->properties['contributors'] = array_values($this->properties['contributors']);
+
+				return $this;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to remove a link from the feed entry object.
+	 *
+	 * @param   FeedLink  $link  The link object to remove.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function removeLink(FeedLink $link)
+	{
+		// If the link exists remove it.
+		foreach ($this->properties['links'] as $k => $l)
+		{
+			if ($l == $link)
+			{
+				unset($this->properties['links'][$k]);
+				$this->properties['links'] = array_values($this->properties['links']);
+
+				return $this;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Shortcut method to set the author for the feed entry object.
+	 *
+	 * @param   string  $name   The full name of the person to set.
+	 * @param   string  $email  The email address of the person to set.
+	 * @param   string  $uri    The optional URI for the person to set.
+	 * @param   string  $type   The optional type of person to set.
+	 *
+	 * @return  FeedEntry
+	 *
+	 * @since   12.3
+	 */
+	public function setAuthor($name, $email, $uri = null, $type = null)
+	{
+		$author = new FeedPerson($name, $email, $uri, $type);
+
+		$this->properties['author'] = $author;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Feed/FeedFactory.php b/core/libraries/src/Feed/FeedFactory.php
new file mode 100644
index 00000000..a9a31d4e
--- /dev/null
+++ b/core/libraries/src/Feed/FeedFactory.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\Registry\Registry;
+
+/**
+ * Feed factory class.
+ *
+ * @since  12.3
+ */
+class FeedFactory
+{
+	/**
+	 * @var    array  The list of registered parser classes for feeds.
+	 * @since  12.3
+	 */
+	protected $parsers = array('rss' => 'Joomla\\CMS\\Feed\\Parser\\RssParser', 'feed' => 'Joomla\\CMS\\Feed\\Parser\\AtomParser');
+
+	/**
+	 * Method to load a URI into the feed reader for parsing.
+	 *
+	 * @param   string  $uri  The URI of the feed to load. Idn uris must be passed already converted to punycode.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 * @throws  \InvalidArgumentException
+	 * @throws  \RuntimeException
+	 */
+	public function getFeed($uri)
+	{
+		// Create the XMLReader object.
+		$reader = new \XMLReader;
+
+		// Open the URI within the stream reader.
+		if (!@$reader->open($uri, null, LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING))
+		{
+			// Retry with JHttpFactory that allow using CURL and Sockets as alternative method when available
+
+			// Adding a valid user agent string, otherwise some feed-servers returning an error
+			$options = new Registry;
+			$options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
+
+			try
+			{
+				$response = HttpFactory::getHttp($options)->get($uri);
+			}
+			catch (RuntimeException $e)
+			{
+				throw new \RuntimeException('Unable to open the feed.', $e->getCode(), $e);
+			}
+
+			if ($response->code != 200)
+			{
+				throw new \RuntimeException('Unable to open the feed.');
+			}
+
+			// Set the value to the XMLReader parser
+			if (!$reader->xml($response->body, null, LIBXML_NOERROR | LIBXML_ERR_NONE | LIBXML_NOWARNING))
+			{
+				throw new \RuntimeException('Unable to parse the feed.');
+			}
+		}
+
+		try
+		{
+			// Skip ahead to the root node.
+			while ($reader->read())
+			{
+				if ($reader->nodeType == \XMLReader::ELEMENT)
+				{
+					break;
+				}
+			}
+		}
+		catch (\Exception $e)
+		{
+			throw new \RuntimeException('Error reading feed.', $e->getCode(), $e);
+		}
+
+		// Setup the appropriate feed parser for the feed.
+		$parser = $this->_fetchFeedParser($reader->name, $reader);
+
+		return $parser->parse();
+	}
+
+	/**
+	 * Method to register a FeedParser class for a given root tag name.
+	 *
+	 * @param   string   $tagName    The root tag name for which to register the parser class.
+	 * @param   string   $className  The FeedParser class name to register for a root tag name.
+	 * @param   boolean  $overwrite  True to overwrite the parser class if one is already registered.
+	 *
+	 * @return  FeedFactory
+	 *
+	 * @since   12.3
+	 * @throws  \InvalidArgumentException
+	 */
+	public function registerParser($tagName, $className, $overwrite = false)
+	{
+		// Verify that the class exists.
+		if (!class_exists($className))
+		{
+			throw new \InvalidArgumentException('The feed parser class ' . $className . ' does not exist.');
+		}
+
+		// Validate that the tag name is valid.
+		if (!preg_match('/\A(?!XML)[a-z][\w0-9-]*/i', $tagName))
+		{
+			throw new \InvalidArgumentException('The tag name ' . $tagName . ' is not valid.');
+		}
+
+		// Register the given parser class for the tag name if nothing registered or the overwrite flag set.
+		if (empty($this->parsers[$tagName]) || (bool) $overwrite)
+		{
+			$this->parsers[(string) $tagName] = (string) $className;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Method to return a new JFeedParser object based on the registered parsers and a given type.
+	 *
+	 * @param   string      $type    The name of parser to return.
+	 * @param   \XMLReader  $reader  The XMLReader instance for the feed.
+	 *
+	 * @return  FeedParser
+	 *
+	 * @since   12.3
+	 * @throws  \LogicException
+	 */
+	private function _fetchFeedParser($type, \XMLReader $reader)
+	{
+		// Look for a registered parser for the feed type.
+		if (empty($this->parsers[$type]))
+		{
+			throw new \LogicException('No registered feed parser for type ' . $type . '.');
+		}
+
+		return new $this->parsers[$type]($reader);
+	}
+}
diff --git a/core/libraries/src/Feed/FeedLink.php b/core/libraries/src/Feed/FeedLink.php
new file mode 100644
index 00000000..82275a54
--- /dev/null
+++ b/core/libraries/src/Feed/FeedLink.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Feed Link class.
+ *
+ * @since  12.3
+ */
+class FeedLink
+{
+	/**
+	 * The URI to the linked resource.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $uri;
+
+	/**
+	 * The relationship between the feed and the linked resource.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $relation;
+
+	/**
+	 * The resource type.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $type;
+
+	/**
+	 * The language of the resource found at the given URI.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $language;
+
+	/**
+	 * The title of the resource.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $title;
+
+	/**
+	 * The length of the resource in bytes.
+	 *
+	 * @var    integer
+	 * @since  12.3
+	 */
+	public $length;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string   $uri       The URI to the linked resource.
+	 * @param   string   $relation  The relationship between the feed and the linked resource.
+	 * @param   string   $type      The resource type.
+	 * @param   string   $language  The language of the resource found at the given URI.
+	 * @param   string   $title     The title of the resource.
+	 * @param   integer  $length    The length of the resource in bytes.
+	 *
+	 * @since   12.3
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($uri = null, $relation = null, $type = null, $language = null, $title = null, $length = null)
+	{
+		$this->uri = $uri;
+		$this->relation = $relation;
+		$this->type = $type;
+		$this->language = $language;
+		$this->title = $title;
+
+		// Validate the length input.
+		if (isset($length) && !is_numeric($length))
+		{
+			throw new \InvalidArgumentException('Length must be numeric.');
+		}
+
+		$this->length = (int) $length;
+	}
+}
diff --git a/core/libraries/src/Feed/FeedParser.php b/core/libraries/src/Feed/FeedParser.php
new file mode 100644
index 00000000..e30633f8
--- /dev/null
+++ b/core/libraries/src/Feed/FeedParser.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+
+/**
+ * Feed Parser class.
+ *
+ * @since  12.3
+ */
+abstract class FeedParser
+{
+	/**
+	 * The feed element name for the entry elements.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	protected $entryElementName = 'entry';
+
+	/**
+	 * Array of NamespaceParserInterface objects
+	 *
+	 * @var    array
+	 * @since  12.3
+	 */
+	protected $namespaces = array();
+
+	/**
+	 * The XMLReader stream object for the feed.
+	 *
+	 * @var    \XMLReader
+	 * @since  12.3
+	 */
+	protected $stream;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   \XMLReader  $stream  The XMLReader stream object for the feed.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct(\XMLReader $stream)
+	{
+		$this->stream  = $stream;
+	}
+
+	/**
+	 * Method to parse the feed into a JFeed object.
+	 *
+	 * @return  Feed
+	 *
+	 * @since   12.3
+	 */
+	public function parse()
+	{
+		$feed = new Feed;
+
+		// Detect the feed version.
+		$this->initialise();
+
+		// Let's get this party started...
+		do
+		{
+			// Expand the element for processing.
+			$el = new \SimpleXMLElement($this->stream->readOuterXml());
+
+			// Get the list of namespaces used within this element.
+			$ns = $el->getNamespaces(true);
+
+			// Get an array of available namespace objects for the element.
+			$namespaces = array();
+
+			foreach ($ns as $prefix => $uri)
+			{
+				// Ignore the empty namespace prefix.
+				if (empty($prefix))
+				{
+					continue;
+				}
+
+				// Get the necessary namespace objects for the element.
+				$namespace = $this->fetchNamespace($prefix);
+
+				if ($namespace)
+				{
+					$namespaces[] = $namespace;
+				}
+			}
+
+			// Process the element.
+			$this->processElement($feed, $el, $namespaces);
+
+			// Skip over this element's children since it has been processed.
+			$this->moveToClosingElement();
+		}
+
+		while ($this->moveToNextElement());
+
+		return $feed;
+	}
+
+	/**
+	 * Method to register a namespace handler object.
+	 *
+	 * @param   string                    $prefix     The XML namespace prefix for which to register the namespace object.
+	 * @param   NamespaceParserInterface  $namespace  The namespace object to register.
+	 *
+	 * @return  JFeed
+	 *
+	 * @since   12.3
+	 */
+	public function registerNamespace($prefix, NamespaceParserInterface $namespace)
+	{
+		$this->namespaces[$prefix] = $namespace;
+
+		return $this;
+	}
+
+	/**
+	 * Method to initialise the feed for parsing.  If child parsers need to detect versions or other
+	 * such things this is where you'll want to implement that logic.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	abstract protected function initialise();
+
+	/**
+	 * Method to parse a specific feed element.
+	 *
+	 * @param   Feed               $feed        The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el          The current XML element object to handle.
+	 * @param   array              $namespaces  The array of relevant namespace objects to process for the element.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function processElement(Feed $feed, \SimpleXMLElement $el, array $namespaces)
+	{
+		// Build the internal method name.
+		$method = 'handle' . ucfirst($el->getName());
+
+		// If we are dealing with an item then it is feed entry time.
+		if ($el->getName() == $this->entryElementName)
+		{
+			// Create a new feed entry for the item.
+			$entry = new FeedEntry;
+
+			// First call the internal method.
+			$this->processFeedEntry($entry, $el);
+
+			foreach ($namespaces as $namespace)
+			{
+				if ($namespace instanceof NamespaceParserInterface)
+				{
+					$namespace->processElementForFeedEntry($entry, $el);
+				}
+			}
+
+			// Add the new entry to the feed.
+			$feed->addEntry($entry);
+
+			return;
+		}
+
+		// Otherwise we treat it like any other element.
+
+		// First call the internal method.
+		if (is_callable(array($this, $method)))
+		{
+			$this->$method($feed, $el);
+		}
+
+		foreach ($namespaces as $namespace)
+		{
+			if ($namespace instanceof NamespaceParserInterface)
+			{
+				$namespace->processElementForFeed($feed, $el);
+			}
+		}
+	}
+
+	/**
+	 * Method to get a namespace object for a given namespace prefix.
+	 *
+	 * @param   string  $prefix  The XML prefix for which to fetch the namespace object.
+	 *
+	 * @return  mixed  NamespaceParserInterface or false if none exists.
+	 *
+	 * @since   12.3
+	 */
+	protected function fetchNamespace($prefix)
+	{
+		if (isset($this->namespaces[$prefix]))
+		{
+			return $this->namespaces[$prefix];
+		}
+
+		$className = get_class($this) . ucfirst($prefix);
+
+		if (class_exists($className))
+		{
+			$this->namespaces[$prefix] = new $className;
+
+			return $this->namespaces[$prefix];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to move the stream parser to the next XML element node.
+	 *
+	 * @param   string  $name  The name of the element for which to move the stream forward until is found.
+	 *
+	 * @return  boolean  True if the stream parser is on an XML element node.
+	 *
+	 * @since   12.3
+	 */
+	protected function moveToNextElement($name = null)
+	{
+		// Only keep looking until the end of the stream.
+		while ($this->stream->read())
+		{
+			// As soon as we get to the next ELEMENT node we are done.
+			if ($this->stream->nodeType == \XMLReader::ELEMENT)
+			{
+				// If we are looking for a specific name make sure we have it.
+				if (isset($name) && ($this->stream->name != $name))
+				{
+					continue;
+				}
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to move the stream parser to the closing XML node of the current element.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 * @throws  \RuntimeException  If the closing tag cannot be found.
+	 */
+	protected function moveToClosingElement()
+	{
+		// If we are on a self-closing tag then there is nothing to do.
+		if ($this->stream->isEmptyElement)
+		{
+			return;
+		}
+
+		// Get the name and depth for the current node so that we can match the closing node.
+		$name  = $this->stream->name;
+		$depth = $this->stream->depth;
+
+		// Only keep looking until the end of the stream.
+		while ($this->stream->read())
+		{
+			// If we have an END_ELEMENT node with the same name and depth as the node we started with we have a bingo. :-)
+			if (($this->stream->name == $name) && ($this->stream->depth == $depth) && ($this->stream->nodeType == \XMLReader::END_ELEMENT))
+			{
+				return;
+			}
+		}
+
+		throw new \RuntimeException('Unable to find the closing XML node.');
+	}
+}
diff --git a/core/libraries/src/Feed/FeedPerson.php b/core/libraries/src/Feed/FeedPerson.php
new file mode 100644
index 00000000..93610728
--- /dev/null
+++ b/core/libraries/src/Feed/FeedPerson.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Feed Person class.
+ *
+ * @since  12.3
+ */
+class FeedPerson
+{
+	/**
+	 * The email address of the person.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $email;
+
+	/**
+	 * The full name of the person.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $name;
+
+	/**
+	 * The type of person.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $type;
+
+	/**
+	 * The URI for the person.
+	 *
+	 * @var    string
+	 * @since  12.3
+	 */
+	public $uri;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $name   The full name of the person.
+	 * @param   string  $email  The email address of the person.
+	 * @param   string  $uri    The URI for the person.
+	 * @param   string  $type   The type of person.
+	 *
+	 * @since   12.3
+	 */
+	public function __construct($name = null, $email = null, $uri = null, $type = null)
+	{
+		$this->name = $name;
+		$this->email = $email;
+		$this->uri = $uri;
+		$this->type = $type;
+	}
+}
diff --git a/core/libraries/src/Feed/Parser/AtomParser.php b/core/libraries/src/Feed/Parser/AtomParser.php
new file mode 100644
index 00000000..29cb2b40
--- /dev/null
+++ b/core/libraries/src/Feed/Parser/AtomParser.php
@@ -0,0 +1,259 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\FeedParser;
+
+/**
+ * ATOM Feed Parser class.
+ *
+ * @link   http://www.atomenabled.org/developers/syndication/
+ * @since  12.3
+ */
+class AtomParser extends FeedParser
+{
+	/**
+	 * @var    string  The feed format version.
+	 * @since  12.3
+	 */
+	protected $version;
+
+	/**
+	 * Method to handle the `<author>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleAuthor(Feed $feed, \SimpleXMLElement $el)
+	{
+		// Set the author information from the XML element.
+		$feed->setAuthor((string) $el->name, (string) $el->email, (string) $el->uri);
+	}
+
+	/**
+	 * Method to handle the `<contributor>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleContributor(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->addContributor((string) $el->name, (string) $el->email, (string) $el->uri);
+	}
+
+	/**
+	 * Method to handle the `<generator>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleGenerator(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->generator = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<id>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleId(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->uri = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<link>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleLink(Feed $feed, \SimpleXMLElement $el)
+	{
+		$link = new FeedLink;
+		$link->uri      = (string) $el['href'];
+		$link->language = (string) $el['hreflang'];
+		$link->length   = (int) $el['length'];
+		$link->relation = (string) $el['rel'];
+		$link->title    = (string) $el['title'];
+		$link->type     = (string) $el['type'];
+
+		$feed->link = $link;
+	}
+
+	/**
+	 * Method to handle the `<rights>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleRights(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->copyright = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<subtitle>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleSubtitle(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->description = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<title>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleTitle(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->title = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<updated>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleUpdated(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->updatedDate = (string) $el;
+	}
+
+	/**
+	 * Method to initialise the feed for parsing.  Here we detect the version and advance the stream
+	 * reader so that it is ready to parse feed elements.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function initialise()
+	{
+		// Read the version attribute.
+		$this->version = ($this->stream->getAttribute('version') == '0.3') ? '0.3' : '1.0';
+
+		// We want to move forward to the first element after the root element.
+		$this->moveToNextElement();
+	}
+
+	/**
+	 * Method to handle a `<entry>` element for the feed.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function processFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
+	{
+		$entry->uri         = (string) $el->id;
+		$entry->title       = (string) $el->title;
+		$entry->updatedDate = (string) $el->updated;
+		$entry->content     = (string) $el->summary;
+
+		if (!$entry->content)
+		{
+			$entry->content = (string) $el->content;
+		}
+
+		if (filter_var($entry->uri, FILTER_VALIDATE_URL) === false && !is_null($el->link) && $el->link)
+		{
+			$link = $el->link;
+
+			if (is_array($link))
+			{
+				$link = $this->bestLinkForUri($link);
+			}
+
+			$uri = (string) $link['href'];
+
+			if ($uri)
+			{
+				$entry->uri = $uri;
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one <link> in the feed entry, find the most appropriate one and return it.
+	 *
+	 * @param   array  $links  Array of <link> elements from the feed entry.
+	 *
+	 * @return  \SimpleXMLElement
+	 */
+	private function bestLinkForUri(array $links)
+	{
+		$linkPrefs = array('', 'self', 'alternate');
+
+		foreach ($linkPrefs as $pref)
+		{
+			foreach ($links as $link)
+			{
+				$rel = (string) $link['rel'];
+
+				if ($rel === $pref)
+				{
+					return $link;
+				}
+			}
+		}
+
+		return array_shift($links);
+	}
+}
diff --git a/core/libraries/src/Feed/Parser/NamespaceParserInterface.php b/core/libraries/src/Feed/Parser/NamespaceParserInterface.php
new file mode 100644
index 00000000..2e89a57c
--- /dev/null
+++ b/core/libraries/src/Feed/Parser/NamespaceParserInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+
+/**
+ * Feed Namespace interface.
+ *
+ * @since  12.3
+ */
+interface NamespaceParserInterface
+{
+	/**
+	 * Method to handle an element for the feed given that a certain namespace is present.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeed(Feed $feed, \SimpleXMLElement $el);
+
+	/**
+	 * Method to handle the feed entry element for the feed given that a certain namespace is present.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el);
+}
diff --git a/core/libraries/src/Feed/Parser/Rss/ItunesRssParser.php b/core/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
new file mode 100644
index 00000000..13b5f785
--- /dev/null
+++ b/core/libraries/src/Feed/Parser/Rss/ItunesRssParser.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser\Rss;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+
+/**
+ * RSS Feed Parser Namespace handler for iTunes.
+ *
+ * @link   https://itunespartner.apple.com/en/podcasts/overview
+ * @since  12.3
+ */
+class ItunesRssParser implements NamespaceParserInterface
+{
+	/**
+	 * Method to handle an element for the feed given that the itunes namespace is present.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeed(Feed $feed, \SimpleXMLElement $el)
+	{
+		return;
+	}
+
+	/**
+	 * Method to handle the feed entry element for the feed given that the itunes namespace is present.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
+	{
+		return;
+	}
+}
diff --git a/core/libraries/src/Feed/Parser/Rss/MediaRssParser.php b/core/libraries/src/Feed/Parser/Rss/MediaRssParser.php
new file mode 100644
index 00000000..fc3081a1
--- /dev/null
+++ b/core/libraries/src/Feed/Parser/Rss/MediaRssParser.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser\Rss;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\Parser\NamespaceParserInterface;
+
+/**
+ * RSS Feed Parser Namespace handler for MediaRSS.
+ *
+ * @link   http://video.search.yahoo.com/mrss
+ * @since  12.3
+ */
+class MediaRssParser implements NamespaceParserInterface
+{
+	/**
+	 * Method to handle an element for the feed given that the media namespace is present.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeed(Feed $feed, \SimpleXMLElement $el)
+	{
+		return;
+	}
+
+	/**
+	 * Method to handle the feed entry element for the feed given that the media namespace is present.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function processElementForFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
+	{
+		return;
+	}
+}
diff --git a/core/libraries/src/Feed/Parser/RssParser.php b/core/libraries/src/Feed/Parser/RssParser.php
new file mode 100644
index 00000000..129ea35c
--- /dev/null
+++ b/core/libraries/src/Feed/Parser/RssParser.php
@@ -0,0 +1,435 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Feed\Parser;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Feed\Feed;
+use Joomla\CMS\Feed\FeedEntry;
+use Joomla\CMS\Feed\FeedLink;
+use Joomla\CMS\Feed\FeedParser;
+use Joomla\CMS\Feed\FeedPerson;
+
+/**
+ * RSS Feed Parser class.
+ *
+ * @link   http://cyber.law.harvard.edu/rss/rss.html
+ * @since  12.3
+ */
+class RssParser extends FeedParser
+{
+	/**
+	 * @var    string  The feed element name for the entry elements.
+	 * @since  12.3
+	 */
+	protected $entryElementName = 'item';
+
+	/**
+	 * @var    string  The feed format version.
+	 * @since  12.3
+	 */
+	protected $version;
+
+	/**
+	 * Method to handle the `<category>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleCategory(Feed $feed, \SimpleXMLElement $el)
+	{
+		// Get the data from the element.
+		$domain    = (string) $el['domain'];
+		$category  = (string) $el;
+
+		$feed->addCategory($category, $domain);
+	}
+
+	/**
+	 * Method to handle the `<cloud>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleCloud(Feed $feed, \SimpleXMLElement $el)
+	{
+		$cloud = new \stdClass;
+		$cloud->domain            = (string) $el['domain'];
+		$cloud->port              = (string) $el['port'];
+		$cloud->path              = (string) $el['path'];
+		$cloud->protocol          = (string) $el['protocol'];
+		$cloud->registerProcedure = (string) $el['registerProcedure'];
+
+		$feed->cloud = $cloud;
+	}
+
+	/**
+	 * Method to handle the `<copyright>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleCopyright(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->copyright = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<description>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleDescription(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->description = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<generator>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleGenerator(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->generator = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<image>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleImage(Feed $feed, \SimpleXMLElement $el)
+	{
+		// Create a feed link object for the image.
+		$image = new FeedLink(
+			(string) $el->url,
+			null,
+			'logo',
+			null,
+			(string) $el->title
+		);
+
+		// Populate extra fields if they exist.
+		$image->link         = (string) $el->link;
+		$image->description  = (string) $el->description;
+		$image->height       = (string) $el->height;
+		$image->width        = (string) $el->width;
+
+		$feed->image = $image;
+	}
+
+	/**
+	 * Method to handle the `<language>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleLanguage(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->language = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<lastBuildDate>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleLastBuildDate(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->updatedDate = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<link>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleLink(Feed $feed, \SimpleXMLElement $el)
+	{
+		$link = new FeedLink;
+		$link->uri = (string) $el['href'];
+		$feed->link = $link;
+	}
+
+	/**
+	 * Method to handle the `<managingEditor>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleManagingEditor(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->author = $this->processPerson((string) $el);
+	}
+
+	/**
+	 * Method to handle the `<skipDays>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleSkipDays(Feed $feed, \SimpleXMLElement $el)
+	{
+		// Initialise the array.
+		$days = array();
+
+		// Add all of the day values from the feed to the array.
+		foreach ($el->day as $day)
+		{
+			$days[] = (string) $day;
+		}
+
+		$feed->skipDays = $days;
+	}
+
+	/**
+	 * Method to handle the `<skipHours>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleSkipHours(Feed $feed, \SimpleXMLElement $el)
+	{
+		// Initialise the array.
+		$hours = array();
+
+		// Add all of the day values from the feed to the array.
+		foreach ($el->hour as $hour)
+		{
+			$hours[] = (int) $hour;
+		}
+
+		$feed->skipHours = $hours;
+	}
+
+	/**
+	 * Method to handle the `<pubDate>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handlePubDate(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->publishedDate = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<title>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleTitle(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->title = (string) $el;
+	}
+
+	/**
+	 * Method to handle the `<ttl>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleTtl(Feed $feed, \SimpleXMLElement $el)
+	{
+		$feed->ttl = (integer) $el;
+	}
+
+	/**
+	 * Method to handle the `<webmaster>` element for the feed.
+	 *
+	 * @param   Feed               $feed  The Feed object being built from the parsed feed.
+	 * @param   \SimpleXMLElement  $el    The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function handleWebmaster(Feed $feed, \SimpleXMLElement $el)
+	{
+		// Get the tag contents and split it over the first space.
+		$tmp = (string) $el;
+		$tmp = explode(' ', $tmp, 2);
+
+		// This is really cheap parsing.  Probably need to create a method to do this more robustly.
+		$name = null;
+
+		if (isset($tmp[1]))
+		{
+			$name = trim($tmp[1], ' ()');
+		}
+
+		$email = trim($tmp[0]);
+
+		$feed->addContributor($name, $email, null, 'webmaster');
+	}
+
+	/**
+	 * Method to initialise the feed for parsing.  Here we detect the version and advance the stream
+	 * reader so that it is ready to parse feed elements.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function initialise()
+	{
+		// Read the version attribute.
+		$this->version = $this->stream->getAttribute('version');
+
+		// We want to move forward to the first element after the <channel> element.
+		$this->moveToNextElement('channel');
+		$this->moveToNextElement();
+	}
+
+	/**
+	 * Method to handle a `<item>` element for the feed.
+	 *
+	 * @param   FeedEntry          $entry  The FeedEntry object being built from the parsed feed entry.
+	 * @param   \SimpleXMLElement  $el     The current XML element object to handle.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	protected function processFeedEntry(FeedEntry $entry, \SimpleXMLElement $el)
+	{
+		$entry->uri           = (string) $el->link;
+		$entry->title         = (string) $el->title;
+		$entry->publishedDate = (string) $el->pubDate;
+		$entry->updatedDate   = (string) $el->pubDate;
+		$entry->content       = (string) $el->description;
+		$entry->guid          = (string) $el->guid;
+		$entry->isPermaLink   = $entry->guid === '' || (string) $el->guid['isPermaLink'] === 'false' ? false : true;
+		$entry->comments      = (string) $el->comments;
+
+		// Add the feed entry author if available.
+		$author = (string) $el->author;
+
+		if (!empty($author))
+		{
+			$entry->author = $this->processPerson($author);
+		}
+
+		// Add any categories to the entry.
+		foreach ($el->category as $category)
+		{
+			$entry->addCategory((string) $category, (string) $category['domain']);
+		}
+
+		// Add any enclosures to the entry.
+		foreach ($el->enclosure as $enclosure)
+		{
+			$link = new FeedLink(
+				(string) $enclosure['url'],
+				null,
+				(string) $enclosure['type'],
+				null,
+				null,
+				(int) $enclosure['length']
+			);
+
+			$entry->addLink($link);
+		}
+	}
+
+	/**
+	 * Method to parse a string with person data and return a FeedPerson object.
+	 *
+	 * @param   string  $data  The string to parse for a person.
+	 *
+	 * @return  FeedPerson
+	 *
+	 * @since   12.3
+	 */
+	protected function processPerson($data)
+	{
+		// Create a new person object.
+		$person = new FeedPerson;
+
+		// This is really cheap parsing, but so far good enough. :)
+		$data = explode(' ', $data, 2);
+
+		if (isset($data[1]))
+		{
+			$person->name = trim($data[1], ' ()');
+		}
+
+		// Set the email for the person.
+		$person->email = trim($data[0]);
+
+		return $person;
+	}
+}
diff --git a/core/libraries/src/Filter/InputFilter.php b/core/libraries/src/Filter/InputFilter.php
new file mode 100644
index 00000000..3f80fc28
--- /dev/null
+++ b/core/libraries/src/Filter/InputFilter.php
@@ -0,0 +1,1271 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Filter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Filter\InputFilter as BaseInputFilter;
+use Joomla\String\StringHelper;
+
+/**
+ * InputFilter is a class for filtering input from any data source
+ *
+ * Forked from the php input filter library by: Daniel Morris <dan@rootcube.com>
+ * Original Contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
+ *
+ * @since  11.1
+ */
+class InputFilter extends BaseInputFilter
+{
+	/**
+	 * A flag for Unicode Supplementary Characters (4-byte Unicode character) stripping.
+	 *
+	 * @var    integer
+	 *
+	 * @since  3.5
+	 */
+	public $stripUSC = 0;
+
+	/**
+	 * Constructor for inputFilter class. Only first parameter is required.
+	 *
+	 * @param   array    $tagsArray   List of user-defined tags
+	 * @param   array    $attrArray   List of user-defined attributes
+	 * @param   integer  $tagsMethod  WhiteList method = 0, BlackList method = 1
+	 * @param   integer  $attrMethod  WhiteList method = 0, BlackList method = 1
+	 * @param   integer  $xssAuto     Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
+	 * @param   integer  $stripUSC    Strip 4-byte unicode characters = 1, no strip = 0, ask the database driver = -1
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1, $stripUSC = -1)
+	{
+		// Make sure user defined arrays are in lowercase
+		$tagsArray = array_map('strtolower', (array) $tagsArray);
+		$attrArray = array_map('strtolower', (array) $attrArray);
+
+		// Assign member variables
+		$this->tagsArray = $tagsArray;
+		$this->attrArray = $attrArray;
+		$this->tagsMethod = $tagsMethod;
+		$this->attrMethod = $attrMethod;
+		$this->xssAuto = $xssAuto;
+		$this->stripUSC = $stripUSC;
+		/**
+		 * If Unicode Supplementary Characters stripping is not set we have to check with the database driver. If the
+		 * driver does not support USCs (i.e. there is no utf8mb4 support) we will enable USC stripping.
+		 */
+		if ($this->stripUSC === -1)
+		{
+			try
+			{
+				// Get the database driver
+				$db = \JFactory::getDbo();
+
+				// This trick is required to let the driver determine the utf-8 multibyte support
+				$db->connect();
+
+				// And now we can decide if we should strip USCs
+				$this->stripUSC = $db->hasUTF8mb4Support() ? 0 : 1;
+			}
+			catch (\RuntimeException $e)
+			{
+				// Could not connect to MySQL. Strip USC to be on the safe side.
+				$this->stripUSC = 1;
+			}
+		}
+	}
+
+	/**
+	 * Returns an input filter object, only creating it if it doesn't already exist.
+	 *
+	 * @param   array    $tagsArray   List of user-defined tags
+	 * @param   array    $attrArray   List of user-defined attributes
+	 * @param   integer  $tagsMethod  WhiteList method = 0, BlackList method = 1
+	 * @param   integer  $attrMethod  WhiteList method = 0, BlackList method = 1
+	 * @param   integer  $xssAuto     Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
+	 * @param   integer  $stripUSC    Strip 4-byte unicode characters = 1, no strip = 0, ask the database driver = -1
+	 *
+	 * @return  InputFilter  The InputFilter object.
+	 *
+	 * @since   11.1
+	 */
+	public static function &getInstance($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1, $stripUSC = -1)
+	{
+		$sig = md5(serialize(array($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto)));
+
+		if (empty(self::$instances[$sig]))
+		{
+			self::$instances[$sig] = new InputFilter($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto, $stripUSC);
+		}
+
+		return self::$instances[$sig];
+	}
+
+	/**
+	 * Method to be called by another php script. Processes for XSS and
+	 * specified bad code.
+	 *
+	 * @param   mixed   $source  Input string/array-of-string to be 'cleaned'
+	 * @param   string  $type    The return type for the variable:
+	 *                           INT:       An integer, or an array of integers,
+	 *                           UINT:      An unsigned integer, or an array of unsigned integers,
+	 *                           FLOAT:     A floating point number, or an array of floating point numbers,
+	 *                           BOOLEAN:   A boolean value,
+	 *                           WORD:      A string containing A-Z or underscores only (not case sensitive),
+	 *                           ALNUM:     A string containing A-Z or 0-9 only (not case sensitive),
+	 *                           CMD:       A string containing A-Z, 0-9, underscores, periods or hyphens (not case sensitive),
+	 *                           BASE64:    A string containing A-Z, 0-9, forward slashes, plus or equals (not case sensitive),
+	 *                           STRING:    A fully decoded and sanitised string (default),
+	 *                           HTML:      A sanitised string,
+	 *                           ARRAY:     An array,
+	 *                           PATH:      A sanitised file path, or an array of sanitised file paths,
+	 *                           TRIM:      A string trimmed from normal, non-breaking and multibyte spaces
+	 *                           USERNAME:  Do not use (use an application specific filter),
+	 *                           RAW:       The raw string is returned with no filtering,
+	 *                           unknown:   An unknown filter will act like STRING. If the input is an array it will return an
+	 *                                      array of fully decoded and sanitised strings.
+	 *
+	 * @return  mixed  'Cleaned' version of input parameter
+	 *
+	 * @since   11.1
+	 */
+	public function clean($source, $type = 'string')
+	{
+		// Strip Unicode Supplementary Characters when requested to do so
+		if ($this->stripUSC)
+		{
+			// Alternatively: preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xE2\xAF\x91", $source) but it'd be slower.
+			$source = $this->stripUSC($source);
+		}
+
+		// Handle the type constraint cases
+		switch (strtoupper($type))
+		{
+			case 'INT':
+			case 'INTEGER':
+				$pattern = '/[-+]?[0-9]+/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? (int) $matches[0] : 0;
+					}
+				}
+				else
+				{
+					preg_match($pattern, (string) $source, $matches);
+					$result = isset($matches[0]) ? (int) $matches[0] : 0;
+				}
+
+				break;
+			case 'UINT':
+				$pattern = '/[-+]?[0-9]+/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? abs((int) $matches[0]) : 0;
+					}
+				}
+				else
+				{
+					preg_match($pattern, (string) $source, $matches);
+					$result = isset($matches[0]) ? abs((int) $matches[0]) : 0;
+				}
+
+				break;
+			case 'FLOAT':
+			case 'DOUBLE':
+				$pattern = '/[-+]?[0-9]+(\.[0-9]+)?([eE][-+]?[0-9]+)?/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? (float) $matches[0] : 0;
+					}
+				}
+				else
+				{
+					preg_match($pattern, (string) $source, $matches);
+					$result = isset($matches[0]) ? (float) $matches[0] : 0;
+				}
+
+				break;
+			case 'BOOL':
+			case 'BOOLEAN':
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (bool) $eachString;
+					}
+				}
+				else
+				{
+					$result = (bool) $source;
+				}
+
+				break;
+			case 'WORD':
+				$pattern = '/[^A-Z_]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+			case 'ALNUM':
+				$pattern = '/[^A-Z0-9]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+			case 'CMD':
+				$pattern = '/[^A-Z0-9_\.-]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$cleaned  = (string) preg_replace($pattern, '', $eachString);
+						$result[] = ltrim($cleaned, '.');
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+					$result = ltrim($result, '.');
+				}
+
+				break;
+			case 'BASE64':
+				$pattern = '/[^A-Z0-9\/+=]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+			case 'STRING':
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) $this->remove($this->decode((string) $eachString));
+					}
+				}
+				else
+				{
+					$result = (string) $this->remove($this->decode((string) $source));
+				}
+
+				break;
+			case 'HTML':
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) $this->remove((string) $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) $this->remove((string) $source);
+				}
+
+				break;
+			case 'ARRAY':
+				$result = (array) $source;
+
+				break;
+			case 'PATH':
+				$pattern = '/^[A-Za-z0-9_\/-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? (string) $matches[0] : '';
+					}
+				}
+				else
+				{
+					preg_match($pattern, $source, $matches);
+					$result = isset($matches[0]) ? (string) $matches[0] : '';
+				}
+
+				break;
+			case 'TRIM':
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$cleaned  = (string) trim($eachString);
+						$cleaned  = StringHelper::trim($cleaned, chr(0xE3) . chr(0x80) . chr(0x80));
+						$result[] = StringHelper::trim($cleaned, chr(0xC2) . chr(0xA0));
+					}
+				}
+				else
+				{
+					$result = (string) trim($source);
+					$result = StringHelper::trim($result, chr(0xE3) . chr(0x80) . chr(0x80));
+					$result = StringHelper::trim($result, chr(0xC2) . chr(0xA0));
+				}
+
+				break;
+			case 'USERNAME':
+				$pattern = '/[\x00-\x1F\x7F<>"\'%&]/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+			case 'RAW':
+				$result = $source;
+
+				break;
+			default:
+
+				// Are we dealing with an array?
+				if (is_array($source))
+				{
+					foreach ($source as $key => $value)
+					{
+						// Filter element for XSS and other 'bad' code etc.
+						if (is_string($value))
+						{
+							$source[$key] = $this->_remove($this->_decode($value));
+						}
+					}
+
+					$result = $source;
+				}
+				else
+				{
+					// Or a string?
+					if (is_string($source) && !empty($source))
+					{
+						// Filter source for XSS and other 'bad' code etc.
+						$result = $this->_remove($this->_decode($source));
+					}
+					else
+					{
+						// Not an array or string... return the passed parameter
+						$result = $source;
+					}
+				}
+
+				break;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Function to punyencode utf8 mail when saving content
+	 *
+	 * @param   string  $text  The strings to encode
+	 *
+	 * @return  string  The punyencoded mail
+	 *
+	 * @since   3.5
+	 */
+	public function emailToPunycode($text)
+	{
+		$pattern = '/(("mailto:)+[\w\.\-\+]+\@[^"?]+\.+[^."?]+("|\?))/';
+
+		if (preg_match_all($pattern, $text, $matches))
+		{
+			foreach ($matches[0] as $match)
+			{
+				$match  = (string) str_replace(array('?', '"'), '', $match);
+				$text   = (string) str_replace($match, \JStringPunycode::emailToPunycode($match), $text);
+			}
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Checks an uploaded for suspicious naming and potential PHP contents which could indicate a hacking attempt.
+	 *
+	 * The options you can define are:
+	 * null_byte                   Prevent files with a null byte in their name (buffer overflow attack)
+	 * forbidden_extensions        Do not allow these strings anywhere in the file's extension
+	 * php_tag_in_content          Do not allow `<?php` tag in content
+	 * shorttag_in_content         Do not allow short tag `<?` in content
+	 * shorttag_extensions         Which file extensions to scan for short tags in content
+	 * fobidden_ext_in_content     Do not allow forbidden_extensions anywhere in content
+	 * php_ext_content_extensions  Which file extensions to scan for .php in content
+	 *
+	 * This code is an adaptation and improvement of Admin Tools' UploadShield feature,
+	 * relicensed and contributed by its author.
+	 *
+	 * @param   array  $file     An uploaded file descriptor
+	 * @param   array  $options  The scanner options (see the code for details)
+	 *
+	 * @return  boolean  True of the file is safe
+	 *
+	 * @since   3.4
+	 */
+	public static function isSafeFile($file, $options = array())
+	{
+		$defaultOptions = array(
+
+			// Null byte in file name
+			'null_byte'                  => true,
+
+			// Forbidden string in extension (e.g. php matched .php, .xxx.php, .php.xxx and so on)
+			'forbidden_extensions'       => array(
+				'php', 'phps', 'pht', 'phtml', 'php3', 'php4', 'php5', 'php6', 'php7', 'phar', 'inc', 'pl', 'cgi', 'fcgi', 'java', 'jar', 'py',
+			),
+
+			// <?php tag in file contents
+			'php_tag_in_content'         => true,
+
+			// <? tag in file contents
+			'shorttag_in_content'        => true,
+
+			// Which file extensions to scan for short tags
+			'shorttag_extensions'        => array(
+				'inc', 'phps', 'class', 'php3', 'php4', 'php5', 'txt', 'dat', 'tpl', 'tmpl',
+			),
+
+			// Forbidden extensions anywhere in the content
+			'fobidden_ext_in_content'    => true,
+
+			// Which file extensions to scan for .php in the content
+			'php_ext_content_extensions' => array('zip', 'rar', 'tar', 'gz', 'tgz', 'bz2', 'tbz', 'jpa'),
+		);
+
+		$options = array_merge($defaultOptions, $options);
+
+		// Make sure we can scan nested file descriptors
+		$descriptors = $file;
+
+		if (isset($file['name']) && isset($file['tmp_name']))
+		{
+			$descriptors = self::decodeFileData(
+				array(
+					$file['name'],
+					$file['type'],
+					$file['tmp_name'],
+					$file['error'],
+					$file['size'],
+				)
+			);
+		}
+
+		// Handle non-nested descriptors (single files)
+		if (isset($descriptors['name']))
+		{
+			$descriptors = array($descriptors);
+		}
+
+		// Scan all descriptors detected
+		foreach ($descriptors as $fileDescriptor)
+		{
+			if (!isset($fileDescriptor['name']))
+			{
+				// This is a nested descriptor. We have to recurse.
+				if (!self::isSafeFile($fileDescriptor, $options))
+				{
+					return false;
+				}
+
+				continue;
+			}
+
+			$tempNames     = $fileDescriptor['tmp_name'];
+			$intendedNames = $fileDescriptor['name'];
+
+			if (!is_array($tempNames))
+			{
+				$tempNames = array($tempNames);
+			}
+
+			if (!is_array($intendedNames))
+			{
+				$intendedNames = array($intendedNames);
+			}
+
+			$len = count($tempNames);
+
+			for ($i = 0; $i < $len; $i++)
+			{
+				$tempName     = array_shift($tempNames);
+				$intendedName = array_shift($intendedNames);
+
+				// 1. Null byte check
+				if ($options['null_byte'])
+				{
+					if (strstr($intendedName, "\x00"))
+					{
+						return false;
+					}
+				}
+
+				// 2. PHP-in-extension check (.php, .php.xxx[.yyy[.zzz[...]]], .xxx[.yyy[.zzz[...]]].php)
+				if (!empty($options['forbidden_extensions']))
+				{
+					$explodedName = explode('.', $intendedName);
+					$explodedName =	array_reverse($explodedName);
+					array_pop($explodedName);
+					$explodedName = array_map('strtolower', $explodedName);
+
+					/*
+					 * DO NOT USE array_intersect HERE! array_intersect expects the two arrays to
+					 * be set, i.e. they should have unique values.
+					 */
+					foreach ($options['forbidden_extensions'] as $ext)
+					{
+						if (in_array($ext, $explodedName))
+						{
+							return false;
+						}
+					}
+				}
+
+				// 3. File contents scanner (PHP tag in file contents)
+				if ($options['php_tag_in_content']
+					|| $options['shorttag_in_content']
+					|| ($options['fobidden_ext_in_content'] && !empty($options['forbidden_extensions'])))
+				{
+					$fp = @fopen($tempName, 'r');
+
+					if ($fp !== false)
+					{
+						$data = '';
+
+						while (!feof($fp))
+						{
+							$data .= @fread($fp, 131072);
+
+							if ($options['php_tag_in_content'] && stristr($data, '<?php'))
+							{
+								return false;
+							}
+
+							if ($options['shorttag_in_content'])
+							{
+								$suspiciousExtensions = $options['shorttag_extensions'];
+
+								if (empty($suspiciousExtensions))
+								{
+									$suspiciousExtensions = array(
+										'inc', 'phps', 'class', 'php3', 'php4', 'txt', 'dat', 'tpl', 'tmpl',
+									);
+								}
+
+								/*
+								 * DO NOT USE array_intersect HERE! array_intersect expects the two arrays to
+								 * be set, i.e. they should have unique values.
+								 */
+								$collide = false;
+
+								foreach ($suspiciousExtensions as $ext)
+								{
+									if (in_array($ext, $explodedName))
+									{
+										$collide = true;
+
+										break;
+									}
+								}
+
+								if ($collide)
+								{
+									// These are suspicious text files which may have the short tag (<?) in them
+									if (strstr($data, '<?'))
+									{
+										return false;
+									}
+								}
+							}
+
+							if ($options['fobidden_ext_in_content'] && !empty($options['forbidden_extensions']))
+							{
+								$suspiciousExtensions = $options['php_ext_content_extensions'];
+
+								if (empty($suspiciousExtensions))
+								{
+									$suspiciousExtensions = array(
+										'zip', 'rar', 'tar', 'gz', 'tgz', 'bz2', 'tbz', 'jpa',
+									);
+								}
+
+								/*
+								 * DO NOT USE array_intersect HERE! array_intersect expects the two arrays to
+								 * be set, i.e. they should have unique values.
+								 */
+								$collide = false;
+
+								foreach ($suspiciousExtensions as $ext)
+								{
+									if (in_array($ext, $explodedName))
+									{
+										$collide = true;
+
+										break;
+									}
+								}
+
+								if ($collide)
+								{
+									/*
+									 * These are suspicious text files which may have an executable
+									 * file extension in them
+									 */
+									foreach ($options['forbidden_extensions'] as $ext)
+									{
+										if (strstr($data, '.' . $ext))
+										{
+											return false;
+										}
+									}
+								}
+							}
+
+							/*
+							 * This makes sure that we don't accidentally skip a <?php tag if it's across
+							 * a read boundary, even on multibyte strings
+							 */
+							$data = substr($data, -10);
+						}
+
+						fclose($fp);
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to decode a file data array.
+	 *
+	 * @param   array  $data  The data array to decode.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.4
+	 */
+	protected static function decodeFileData(array $data)
+	{
+		$result = array();
+
+		if (is_array($data[0]))
+		{
+			foreach ($data[0] as $k => $v)
+			{
+				$result[$k] = self::decodeFileData(array($data[0][$k], $data[1][$k], $data[2][$k], $data[3][$k], $data[4][$k]));
+			}
+
+			return $result;
+		}
+
+		return array('name' => $data[0], 'type' => $data[1], 'tmp_name' => $data[2], 'error' => $data[3], 'size' => $data[4]);
+	}
+
+	/**
+	 * Internal method to iteratively remove all unwanted tags and attributes
+	 *
+	 * @param   string  $source  Input string to be 'cleaned'
+	 *
+	 * @return  string  'Cleaned' version of input parameter
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use InputFilter::remove() instead
+	 */
+	protected function _remove($source)
+	{
+		return $this->remove($source);
+	}
+
+	/**
+	 * Internal method to iteratively remove all unwanted tags and attributes
+	 *
+	 * @param   string  $source  Input string to be 'cleaned'
+	 *
+	 * @return  string  'Cleaned' version of input parameter
+	 *
+	 * @since   3.5
+	 */
+	protected function remove($source)
+	{
+		// Check for invalid UTF-8 byte sequence
+		if (!preg_match('//u', $source))
+		{
+			// String contains invalid byte sequence, remove it
+			$source = htmlspecialchars_decode(htmlspecialchars($source, ENT_IGNORE, 'UTF-8'));
+		}
+
+		// Iteration provides nested tag protection
+		do
+		{
+			$temp = $source;
+			$source = $this->_cleanTags($source);
+		}
+		while ($temp !== $source);
+
+		return $source;
+	}
+
+	/**
+	 * Internal method to strip a string of certain tags
+	 *
+	 * @param   string  $source  Input string to be 'cleaned'
+	 *
+	 * @return  string  'Cleaned' version of input parameter
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use InputFilter::cleanTags() instead
+	 */
+	protected function _cleanTags($source)
+	{
+		return $this->cleanTags($source);
+	}
+
+	/**
+	 * Internal method to strip a string of certain tags
+	 *
+	 * @param   string  $source  Input string to be 'cleaned'
+	 *
+	 * @return  string  'Cleaned' version of input parameter
+	 *
+	 * @since   3.5
+	 */
+	protected function cleanTags($source)
+	{
+		// First, pre-process this for illegal characters inside attribute values
+		$source = $this->_escapeAttributeValues($source);
+
+		// In the beginning we don't really have a tag, so result is empty
+		$result = '';
+		$offset = 0;
+		$length = strlen($source);
+
+		// Is there a tag? If so it will certainly start with a '<'.
+		$tagOpenStartOffset = strpos($source, '<');
+
+		// Is there any close tag
+		$tagOpenEndOffset = strpos($source, '>');
+
+		while ($offset < $length)
+		{
+			// Preserve '>' character which exists before related '<'
+			if ($tagOpenEndOffset !== false && ($tagOpenStartOffset === false || $tagOpenEndOffset < $tagOpenStartOffset))
+			{
+				$result .= substr($source, $offset, $tagOpenEndOffset - $offset) . '>';
+				$offset  = $tagOpenEndOffset + 1;
+
+				// Search for a new closing indicator
+				$tagOpenEndOffset = strpos($source, '>', $offset);
+
+				continue;
+			}
+
+			// Add safe text appearing before the '<'
+			if ($tagOpenStartOffset > $offset)
+			{
+				$result .= substr($source, $offset, $tagOpenStartOffset - $offset);
+				$offset  = $tagOpenStartOffset;
+			}
+
+			// There is no more tags
+			if ($tagOpenStartOffset === false && $tagOpenEndOffset === false)
+			{
+				$result .= substr($source, $offset, $length - $offset);
+				$offset  = $length;
+
+				break;
+			}
+
+			// Remove every '<' character if '>' does not exists or we have '<>'
+			if ($tagOpenStartOffset !== false && $tagOpenEndOffset === false || $tagOpenStartOffset + 1 == $tagOpenEndOffset)
+			{
+				$offset++;
+
+				// Search for a new opening indicator
+				$tagOpenStartOffset = strpos($source, '<', $offset);
+
+				continue;
+			}
+
+			// Check for mal-formed tag where we have a second '<' before the '>'
+			$nextOpenStartOffset = strpos($source, '<', $tagOpenStartOffset + 1);
+
+			if ($nextOpenStartOffset !== false && $nextOpenStartOffset < $tagOpenEndOffset)
+			{
+				// At this point we have a mal-formed tag, skip previous '<'
+				$offset++;
+
+				// Set a new opening indicator position
+				$tagOpenStartOffset = $nextOpenStartOffset;
+
+				continue;
+			}
+
+			// Let's get some information about our tag and setup attribute pairs
+			// Now we have something like 'span class="" style=""', '/span', 'br/', 'br /' or 'hr disabled /'
+			$tagContent = substr($source, $offset + 1, $tagOpenEndOffset - 1 - $offset);
+
+			// All ASCII whitespaces replace by 0x20
+			$tagNormalized = preg_replace('/\s/', ' ', $tagContent);
+			$tagLength     = strlen($tagContent);
+			$spaceOffset   = strpos($tagNormalized, ' ');
+
+			// Are we an open tag or a close tag?
+			$isClosingTag     = $tagContent[0] === '/' ? 1 : 0;
+			$isSelfClosingTag = substr($tagContent, -1) === '/' ? 1 : 0;
+
+			if ($spaceOffset !== false)
+			{
+				$tagName = substr($tagContent, $isClosingTag, $spaceOffset - $isClosingTag);
+			}
+			else
+			{
+				$tagName = substr($tagContent, $isClosingTag, $tagLength - $isClosingTag - $isSelfClosingTag);
+			}
+
+			/*
+			 * Exclude all "non-regular" tagnames
+			 * OR no tagname
+			 * OR remove if xssauto is on and tag is blacklisted
+			 */
+			if (!$tagName
+				|| !preg_match("/^[a-z][a-z0-9]*$/i", $tagName)
+				|| ($this->xssAuto && in_array(strtolower($tagName), $this->tagBlacklist)))
+			{
+				$offset += $tagLength + 2;
+
+				$tagOpenStartOffset = strpos($source, '<', $offset);
+				$tagOpenEndOffset   = strpos($source, '>', $offset);
+
+				// Strip tag
+				continue;
+			}
+
+			$attrSet = array();
+
+			/*
+			 * Time to grab any attributes from the tag... need this section in
+			 * case attributes have spaces in the values.
+			 */
+			while ($spaceOffset !== false && $spaceOffset + 1 < $tagLength)
+			{
+				$attrStartOffset = $spaceOffset + 1;
+
+				// Find position of equal and open quote
+				if (preg_match('#= *(")[^"]*(")#', $tagNormalized, $matches, PREG_OFFSET_CAPTURE, $attrStartOffset))
+				{
+					$equalOffset     = $matches[0][1];
+					$quote1Offset    = $matches[1][1];
+					$quote2Offset    = $matches[2][1];
+					$nextSpaceOffset = strpos($tagNormalized, ' ', $quote2Offset);
+				}
+				else
+				{
+					$equalOffset     = strpos($tagNormalized, '=', $attrStartOffset);
+					$quote1Offset    = strpos($tagNormalized, '"', $attrStartOffset);
+					$nextSpaceOffset = strpos($tagNormalized, ' ', $attrStartOffset);
+
+					if ($quote1Offset !== false)
+					{
+						$quote2Offset = strpos($tagNormalized, '"', $quote1Offset + 1);
+					}
+					else
+					{
+						$quote2Offset = false;
+					}
+				}
+
+				// Do we have an attribute to process? [check for equal sign]
+				if ($tagContent[$attrStartOffset] !== '/'
+					&& ($equalOffset && $nextSpaceOffset && $nextSpaceOffset < $equalOffset || !$equalOffset))
+				{
+					// Search for attribute without value, ex: 'checked/' or 'checked '
+					if ($nextSpaceOffset)
+					{
+						$attrEndOffset = $nextSpaceOffset;
+					}
+					else
+					{
+						$attrEndOffset = strpos($tagContent, '/', $attrStartOffset);
+
+						if ($attrEndOffset === false)
+						{
+							$attrEndOffset = $tagLength;
+						}
+					}
+
+					// If there is an ending, use this, if not, do not worry.
+					if ($attrEndOffset > $attrStartOffset)
+					{
+						$attrSet[] = substr($tagContent, $attrStartOffset, $attrEndOffset - $attrStartOffset);
+					}
+				}
+				elseif ($equalOffset !== false)
+				{
+					/*
+					 * If the attribute value is wrapped in quotes we need to grab the substring from
+					 * the closing quote, otherwise grab until the next space.
+					 */
+					if ($quote1Offset !== false && $quote2Offset !== false)
+					{
+						// Add attribute, ex: 'class="body abc"'
+						$attrSet[] = substr($tagContent, $attrStartOffset, $quote2Offset + 1 - $attrStartOffset);
+					}
+					else
+					{
+						if ($nextSpaceOffset)
+						{
+							$attrEndOffset = $nextSpaceOffset;
+						}
+						else
+						{
+							$attrEndOffset = $tagLength;
+						}
+
+						// Add attribute, ex: 'class=body'
+						$attrSet[] = substr($tagContent, $attrStartOffset, $attrEndOffset - $attrStartOffset);
+					}
+				}
+
+				$spaceOffset = $nextSpaceOffset;
+			}
+
+			// Is our tag in the user input array?
+			$tagFound = in_array(strtolower($tagName), $this->tagsArray);
+
+			// If the tag is allowed let's append it to the output string.
+			if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod))
+			{
+				// Reconstruct tag with allowed attributes
+				if ($isClosingTag)
+				{
+					$result .= "</$tagName>";
+				}
+				else
+				{
+					$attrSet = $this->_cleanAttributes($attrSet);
+
+					// Open or single tag
+					$result .= '<' . $tagName;
+
+					if ($attrSet)
+					{
+						$result .= ' ' . implode(' ', $attrSet);
+					}
+
+					// Reformat single tags to XHTML
+					if (strpos($source, "</$tagName>", $tagOpenStartOffset) !== false)
+					{
+						$result .= '>';
+					}
+					else
+					{
+						$result .= ' />';
+					}
+				}
+			}
+
+			$offset += $tagLength + 2;
+
+			if ($offset < $length)
+			{
+				// Find next tag's start and continue iteration
+				$tagOpenStartOffset = strpos($source, '<', $offset);
+				$tagOpenEndOffset   = strpos($source, '>', $offset);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Internal method to strip a tag of certain attributes
+	 *
+	 * @param   array  $attrSet  Array of attribute pairs to filter
+	 *
+	 * @return  array  Filtered array of attribute pairs
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use InputFilter::cleanAttributes() instead
+	 */
+	protected function _cleanAttributes($attrSet)
+	{
+		return $this->cleanAttributes($attrSet);
+	}
+
+	/**
+	 * Escape < > and " inside attribute values
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Filtered string
+	 *
+	 * @since    3.5
+	 */
+	protected function escapeAttributeValues($source)
+	{
+		$alreadyFiltered = '';
+		$remainder = $source;
+		$badChars = array('<', '"', '>');
+		$escapedChars = array('&lt;', '&quot;', '&gt;');
+
+		/*
+		 * Process each portion based on presence of =" and "<space>, "/>, or ">
+		 * See if there are any more attributes to process
+		 */
+		while (preg_match('#<[^>]*?=\s*?(\"|\')#s', $remainder, $matches, PREG_OFFSET_CAPTURE))
+		{
+			// Get the portion before the attribute value
+			$quotePosition = $matches[0][1];
+			$nextBefore = $quotePosition + strlen($matches[0][0]);
+
+			/*
+			 * Figure out if we have a single or double quote and look for the matching closing quote
+			 * Closing quote should be "/>, ">, "<space>, or " at the end of the string
+			 */
+			$quote = substr($matches[0][0], -1);
+			$pregMatch = ($quote == '"') ? '#(\"\s*/\s*>|\"\s*>|\"\s+|\"$)#' : "#(\'\s*/\s*>|\'\s*>|\'\s+|\'$)#";
+
+			// Get the portion after attribute value
+			if (preg_match($pregMatch, substr($remainder, $nextBefore), $matches, PREG_OFFSET_CAPTURE))
+			{
+				// We have a closing quote
+				$nextAfter = $nextBefore + $matches[0][1];
+			}
+			else
+			{
+				// No closing quote
+				$nextAfter = strlen($remainder);
+			}
+
+			// Get the actual attribute value
+			$attributeValue = substr($remainder, $nextBefore, $nextAfter - $nextBefore);
+
+			// Escape bad chars
+			$attributeValue = str_replace($badChars, $escapedChars, $attributeValue);
+			$attributeValue = $this->_stripCSSExpressions($attributeValue);
+			$alreadyFiltered .= substr($remainder, 0, $nextBefore) . $attributeValue . $quote;
+			$remainder = substr($remainder, $nextAfter + 1);
+		}
+
+		// At this point, we just have to return the $alreadyFiltered and the $remainder
+		return $alreadyFiltered . $remainder;
+	}
+
+	/**
+	 * Try to convert to plaintext
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Plaintext string
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use InputFilter::decode() instead
+	 */
+	protected function _decode($source)
+	{
+		return $this->decode($source);
+	}
+
+	/**
+	 * Try to convert to plaintext
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Plaintext string
+	 *
+	 * @since   3.5
+	 */
+	protected function decode($source)
+	{
+		static $ttr;
+
+		if (!is_array($ttr))
+		{
+			// Entity decode
+			$trans_tbl = get_html_translation_table(HTML_ENTITIES, ENT_COMPAT, 'ISO-8859-1');
+
+			foreach ($trans_tbl as $k => $v)
+			{
+				$ttr[$v] = utf8_encode($k);
+			}
+		}
+
+		$source = strtr($source, $ttr);
+
+		// Convert decimal
+		$source = preg_replace_callback('/&#(\d+);/m', function($m)
+		{
+			return utf8_encode(chr($m[1]));
+		}, $source
+		);
+
+		// Convert hex
+		$source = preg_replace_callback('/&#x([a-f0-9]+);/mi', function($m)
+		{
+			return utf8_encode(chr(hexdec($m[1])));
+		}, $source
+		);
+
+		return $source;
+	}
+
+	/**
+	 * Escape < > and " inside attribute values
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Filtered string
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use InputFilter::escapeAttributeValues() instead
+	 */
+	protected function _escapeAttributeValues($source)
+	{
+		return $this->escapeAttributeValues($source);
+	}
+
+	/**
+	 * Remove CSS Expressions in the form of `<property>:expression(...)`
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Filtered string
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use InputFilter::stripCSSExpressions() instead
+	 */
+	protected function _stripCSSExpressions($source)
+	{
+		return $this->stripCSSExpressions($source);
+	}
+
+	/**
+	 * Recursively strip Unicode Supplementary Characters from the source. Not: objects cannot be filtered.
+	 *
+	 * @param   mixed  $source  The data to filter
+	 *
+	 * @return  mixed  The filtered result
+	 *
+	 * @since  3.5
+	 */
+	protected function stripUSC($source)
+	{
+		if (is_object($source))
+		{
+			return $source;
+		}
+
+		if (is_array($source))
+		{
+			$filteredArray = array();
+
+			foreach ($source as $k => $v)
+			{
+				$filteredArray[$k] = $this->stripUSC($v);
+			}
+
+			return $filteredArray;
+		}
+
+		return preg_replace('/[\xF0-\xF7].../s', "\xE2\xAF\x91", $source);
+	}
+}
diff --git a/core/libraries/src/Filter/OutputFilter.php b/core/libraries/src/Filter/OutputFilter.php
new file mode 100644
index 00000000..3028df22
--- /dev/null
+++ b/core/libraries/src/Filter/OutputFilter.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Filter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Filter\OutputFilter as BaseOutputFilter;
+use Joomla\String\StringHelper;
+use Joomla\CMS\Language\Language;
+
+/**
+ * OutputFilter
+ *
+ * @since  11.1
+ */
+class OutputFilter extends BaseOutputFilter
+{
+	/**
+	 * This method processes a string and replaces all instances of & with &amp; in links only.
+	 *
+	 * @param   string  $input  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   11.1
+	 */
+	public static function linkXHTMLSafe($input)
+	{
+		$regex = 'href="([^"]*(&(amp;){0})[^"]*)*?"';
+
+		return preg_replace_callback("#$regex#i", array('\\Joomla\\CMS\\Filter\\OutputFilter', '_ampReplaceCallback'), $input);
+	}
+
+	/**
+	 * This method processes a string and escapes it for use in JavaScript
+	 *
+	 * @param   string  $string  String to process
+	 *
+	 * @return  string  Processed text
+	 */
+	public static function stringJSSafe($string)
+	{
+		for ($i = 0, $l = strlen($string), $new_str = ''; $i < $l; $i++)
+		{
+			$new_str .= (ord(substr($string, $i, 1)) < 16 ? '\\x0' : '\\x') . dechex(ord(substr($string, $i, 1)));
+		}
+
+		return $new_str;
+	}
+
+	/**
+	 * This method processes a string and replaces all accented UTF-8 characters by unaccented
+	 * ASCII-7 "equivalents", whitespaces are replaced by hyphens and the string is lowercase.
+	 *
+	 * @param   string  $string    String to process
+	 * @param   string  $language  Language to transilterate to
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   11.1
+	 */
+	public static function stringURLSafe($string, $language = '')
+	{
+		// Remove any '-' from the string since they will be used as concatenaters
+		$str = str_replace('-', ' ', $string);
+
+		// Transliterate on the language requested (fallback to current language if not specified)
+		$lang = $language == '' || $language == '*' ? \JFactory::getLanguage() : Language::getInstance($language);
+		$str = $lang->transliterate($str);
+
+		// Trim white spaces at beginning and end of alias and make lowercase
+		$str = trim(StringHelper::strtolower($str));
+
+		// Remove any duplicate whitespace, and ensure all characters are alphanumeric
+		$str = preg_replace('/(\s|[^A-Za-z0-9\-])+/', '-', $str);
+
+		// Trim dashes at beginning and end of alias
+		$str = trim($str, '-');
+
+		return $str;
+	}
+
+	/**
+	 * Callback method for replacing & with &amp; in a string
+	 *
+	 * @param   string  $m  String to process
+	 *
+	 * @return  string  Replaced string
+	 *
+	 * @since   3.5
+	 */
+	public static function ampReplaceCallback($m)
+	{
+		$rx = '&(?!amp;)';
+
+		return preg_replace('#' . $rx . '#', '&amp;', $m[0]);
+	}
+
+	/**
+	 * Callback method for replacing & with &amp; in a string
+	 *
+	 * @param   string  $m  String to process
+	 *
+	 * @return  string  Replaced string
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0 Use OutputFilter::ampReplaceCallback() instead
+	 */
+	public static function _ampReplaceCallback($m)
+	{
+		return static::ampReplaceCallback($m);
+	}
+}
diff --git a/core/libraries/src/Filter/Wrapper/OutputFilterWrapper.php b/core/libraries/src/Filter/Wrapper/OutputFilterWrapper.php
new file mode 100644
index 00000000..5097e0a3
--- /dev/null
+++ b/core/libraries/src/Filter/Wrapper/OutputFilterWrapper.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Filter\Wrapper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Filter\OutputFilter;
+
+/**
+ * Wrapper class for OutputFilter
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+ */
+class OutputFilterWrapper
+{
+	/**
+	 * Helper wrapper method for objectHTMLSafe
+	 *
+	 * @param   object   &$mixed        An object to be parsed.
+	 * @param   integer  $quote_style   The optional quote style for the htmlspecialchars function.
+	 * @param   mixed    $exclude_keys  An optional string single field name or array of field names not.
+	 *
+	 * @return  void
+	 *
+	 * @see     OutputFilter::objectHTMLSafe()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function objectHTMLSafe(&$mixed, $quote_style = 3, $exclude_keys = '')
+	{
+		return OutputFilter::objectHTMLSafe($mixed, $quote_style, $exclude_keys);
+	}
+
+	/**
+	 * Helper wrapper method for linkXHTMLSafe
+	 *
+	 * @param   string  $input  String to process.
+	 *
+	 * @return  string  Processed string.
+	 *
+	 * @see     OutputFilter::linkXHTMLSafe()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function linkXHTMLSafe($input)
+	{
+		return OutputFilter::linkXHTMLSafe($input);
+	}
+
+	/**
+	 * Helper wrapper method for stringURLSafe
+	 *
+	 * @param   string  $string  String to process.
+	 *
+	 * @return  string  Processed string.
+	 *
+	 * @see     OutputFilter::stringURLSafe()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function stringURLSafe($string)
+	{
+		return OutputFilter::stringURLSafe($string);
+	}
+
+	/**
+	 * Helper wrapper method for stringURLUnicodeSlug
+	 *
+	 * @param   string  $string  String to process.
+	 *
+	 * @return  string  Processed string.
+	 *
+	 * @see     OutputFilter::stringURLUnicodeSlug()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function stringURLUnicodeSlug($string)
+	{
+		return OutputFilter::stringURLUnicodeSlug($string);
+	}
+
+	/**
+	 * Helper wrapper method for ampReplace
+	 *
+	 * @param   string  $text  Text to process.
+	 *
+	 * @return  string  Processed string.
+	 *
+	 * @see     OutputFilter::ampReplace()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function ampReplace($text)
+	{
+		return OutputFilter::ampReplace($text);
+	}
+
+	/**
+	 * Helper wrapper method for _ampReplaceCallback
+	 *
+	 * @param   string  $m  String to process.
+	 *
+	 * @return  string  Replaced string.
+	 *
+	 * @see     OutputFilter::_ampReplaceCallback()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function _ampReplaceCallback($m)
+	{
+		return OutputFilter::_ampReplaceCallback($m);
+	}
+
+	/**
+	 * Helper wrapper method for cleanText
+	 *
+	 * @param   string  &$text  Text to clean.
+	 *
+	 * @return  string  Cleaned text.
+	 *
+	 * @see     OutputFilter::cleanText()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function cleanText(&$text)
+	{
+		return OutputFilter::cleanText($text);
+	}
+
+	/**
+	 * Helper wrapper method for stripImages
+	 *
+	 * @param   string  $string  Sting to be cleaned.
+	 *
+	 * @return  string  Cleaned string.
+	 *
+	 * @see     OutputFilter::stripImages()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function stripImages($string)
+	{
+		return OutputFilter::stripImages($string);
+	}
+
+	/**
+	 * Helper wrapper method for stripIframes
+	 *
+	 * @param   string  $string  Sting to be cleaned.
+	 *
+	 * @return  string  Cleaned string.
+	 *
+	 * @see     OutputFilter::stripIframes()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Filter\OutputFilter` directly
+	 */
+	public function stripIframes($string)
+	{
+		return OutputFilter::stripIframes($string);
+	}
+}
diff --git a/core/libraries/src/Form/Field/AuthorField.php b/core/libraries/src/Form/Field/AuthorField.php
new file mode 100644
index 00000000..3289d0ab
--- /dev/null
+++ b/core/libraries/src/Form/Field/AuthorField.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Form Field to load a list of content authors
+ *
+ * @since  3.2
+ */
+class AuthorField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $type = 'Author';
+
+	/**
+	 * Cached array of the category items.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $options = array();
+
+	/**
+	 * Method to get the options to populate list
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.2
+	 */
+	protected function getOptions()
+	{
+		// Accepted modifiers
+		$hash = md5($this->element);
+
+		if (!isset(static::$options[$hash]))
+		{
+			static::$options[$hash] = parent::getOptions();
+
+			$db = Factory::getDbo();
+
+			// Construct the query
+			$query = $db->getQuery(true)
+				->select('u.id AS value, u.name AS text')
+				->from('#__users AS u')
+				->join('INNER', '#__content AS c ON c.created_by = u.id')
+				->group('u.id, u.name')
+				->order('u.name');
+
+			// Setup the query
+			$db->setQuery($query);
+
+			// Return the result
+			if ($options = $db->loadObjectList())
+			{
+				static::$options[$hash] = array_merge(static::$options[$hash], $options);
+			}
+		}
+
+		return static::$options[$hash];
+	}
+}
diff --git a/core/libraries/src/Form/Field/CaptchaField.php b/core/libraries/src/Form/Field/CaptchaField.php
new file mode 100644
index 00000000..9e0646c1
--- /dev/null
+++ b/core/libraries/src/Form/Field/CaptchaField.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Captcha\Captcha;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Captcha field.
+ *
+ * @since  2.5
+ */
+class CaptchaField extends FormField
+{
+	/**
+	 * The field type.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type = 'Captcha';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'plugin':
+			case 'namespace':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'plugin':
+			case 'namespace':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		$app = Factory::getApplication();
+
+		$default = $app->get('captcha');
+
+		if ($app->isClient('site'))
+		{
+			$default = $app->getParams()->get('captcha', $default);
+		}
+
+		$plugin = $this->element['plugin'] ?
+			(string) $this->element['plugin'] :
+			$default;
+
+		$this->plugin = $plugin;
+
+		if ($plugin === 0 || $plugin === '0' || $plugin === '' || $plugin === null)
+		{
+			$this->hidden = true;
+		}
+		else
+		{
+			// Force field to be required. There's no reason to have a captcha if it is not required.
+			// Obs: Don't put required="required" in the xml file, you just need to have validate="captcha"
+			$this->required = true;
+
+			if (strpos($this->class, 'required') === false)
+			{
+				$this->class .= ' required';
+			}
+		}
+
+		$this->namespace = $this->element['namespace'] ? (string) $this->element['namespace'] : $this->form->getName();
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field input.
+	 *
+	 * @return  string  The field input.
+	 *
+	 * @since   2.5
+	 */
+	protected function getInput()
+	{
+		if ($this->hidden)
+		{
+			return '';
+		}
+		else
+		{
+			if (($captcha = Captcha::getInstance($this->plugin, array('namespace' => $this->namespace))) == null)
+			{
+				return '';
+			}
+		}
+
+		return $captcha->display($this->name, $this->id, $this->class);
+	}
+}
diff --git a/core/libraries/src/Form/Field/ChromestyleField.php b/core/libraries/src/Form/Field/ChromestyleField.php
new file mode 100644
index 00000000..39a79bd9
--- /dev/null
+++ b/core/libraries/src/Form/Field/ChromestyleField.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('groupedlist');
+
+/**
+ * Chrome Styles field.
+ *
+ * @since  3.0
+ */
+class ChromestyleField extends \JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	public $type = 'ChromeStyle';
+
+	/**
+	 * The client ID.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $clientId;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'clientId':
+				return $this->clientId;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to get the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'clientId':
+				$this->clientId = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			// Get the client id.
+			$clientId = $this->element['client_id'];
+
+			if (!isset($clientId))
+			{
+				$clientName = $this->element['client'];
+
+				if (isset($clientName))
+				{
+					$client = \JApplicationHelper::getClientInfo($clientName, true);
+					$clientId = $client->id;
+				}
+			}
+
+			if (!isset($clientId) && $this->form instanceof \JForm)
+			{
+				$clientId = $this->form->getValue('client_id');
+			}
+
+			$this->clientId = (int) $clientId;
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 * Method to get the list of template chrome style options
+	 * grouped by template.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   3.0
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		// Add Module Style Field
+		$tmp = '---' . \JText::_('JLIB_FORM_VALUE_FROM_TEMPLATE') . '---';
+		$groups[$tmp][] = \JHtml::_('select.option', '0', \JText::_('JLIB_FORM_VALUE_INHERITED'));
+
+		$templateStyles = $this->getTemplateModuleStyles();
+
+		// Create one new option object for each available style, grouped by templates
+		foreach ($templateStyles as $template => $styles)
+		{
+			$template = ucfirst($template);
+			$groups[$template] = array();
+
+			foreach ($styles as $style)
+			{
+				$tmp = \JHtml::_('select.option', $template . '-' . $style, $style);
+				$groups[$template][] = $tmp;
+			}
+		}
+
+		reset($groups);
+
+		return $groups;
+	}
+
+	/**
+	 * Method to get the templates module styles.
+	 *
+	 * @return  array  The array of styles, grouped by templates.
+	 *
+	 * @since   3.0
+	 */
+	protected function getTemplateModuleStyles()
+	{
+		$moduleStyles = array();
+
+		$templates = array($this->getSystemTemplate());
+		$templates = array_merge($templates, $this->getTemplates());
+		$path      = JPATH_ADMINISTRATOR;
+
+		if ($this->clientId === 0)
+		{
+			$path = JPATH_SITE;
+		}
+
+		foreach ($templates as $template)
+		{
+			$modulesFilePath = $path . '/templates/' . $template->element . '/html/modules.php';
+
+			// Is there modules.php for that template?
+			if (file_exists($modulesFilePath))
+			{
+				$modulesFileData = file_get_contents($modulesFilePath);
+
+				preg_match_all('/function[\s\t]*modChrome\_([a-z0-9\-\_]*)[\s\t]*\(/i', $modulesFileData, $styles);
+
+				if (!array_key_exists($template->element, $moduleStyles))
+				{
+					$moduleStyles[$template->element] = array();
+				}
+
+				$moduleStyles[$template->element] = $styles[1];
+			}
+		}
+
+		return $moduleStyles;
+	}
+
+	/**
+	 * Method to get the system template as an object.
+	 *
+	 * @return  \stdClass  The object of system template.
+	 *
+	 * @since   3.0
+	 */
+	protected function getSystemTemplate()
+	{
+		$template = new \stdClass;
+		$template->element = 'system';
+		$template->name    = 'system';
+		$template->enabled = 1;
+
+		return $template;
+	}
+
+	/**
+	 * Return a list of templates
+	 *
+	 * @return  array  List of templates
+	 *
+	 * @since   3.2.1
+	 */
+	protected function getTemplates()
+	{
+		$db = Factory::getDbo();
+
+		// Get the database object and a new query object.
+		$query = $db->getQuery(true);
+
+		// Build the query.
+		$query->select('element, name, enabled')
+			->from('#__extensions')
+			->where('client_id = ' . $this->clientId)
+			->where('type = ' . $db->quote('template'));
+
+		// Set the query and load the templates.
+		$db->setQuery($query);
+
+		return $db->loadObjectList('element');
+	}
+}
diff --git a/core/libraries/src/Form/Field/ContenthistoryField.php b/core/libraries/src/Form/Field/ContenthistoryField.php
new file mode 100644
index 00000000..611ad627
--- /dev/null
+++ b/core/libraries/src/Form/Field/ContenthistoryField.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Table;
+
+/**
+ * Field to select Content History from a modal list.
+ *
+ * @since  3.2
+ */
+class ContenthistoryField extends FormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $type = 'ContentHistory';
+
+	/**
+	 * Layout to render the label
+	 *
+	 * @var  string
+	 */
+	protected $layout = 'joomla.form.field.contenthistory';
+
+	/**
+	 * Get the data that is going to be passed to the layout
+	 *
+	 * @return  array
+	 */
+	public function getLayoutData()
+	{
+		// Get the basic field data
+		$data = parent::getLayoutData();
+
+		$typeId = Table::getInstance('Contenttype')->getTypeId($this->element['data-typeAlias']);
+		$itemId = $this->form->getValue('id');
+		$label  = \JText::_('JTOOLBAR_VERSIONS');
+
+		$link   = 'index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;field='
+			. $this->id . '&amp;item_id=' . $itemId . '&amp;type_id=' . $typeId . '&amp;type_alias='
+			. $this->element['data-typeAlias'] . '&amp;' . Session::getFormToken() . '=1';
+
+		$extraData = array(
+				'type' => $typeId,
+				'item' => $itemId,
+				'label' => $label,
+				'link' => $link,
+		);
+
+		return array_merge($data, $extraData);
+	}
+
+	/**
+	 * Method to get the content history field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+}
diff --git a/core/libraries/src/Form/Field/ContentlanguageField.php b/core/libraries/src/Form/Field/ContentlanguageField.php
new file mode 100644
index 00000000..79b00117
--- /dev/null
+++ b/core/libraries/src/Form/Field/ContentlanguageField.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Provides a list of content languages
+ *
+ * @see    JFormFieldLanguage for a select list of application languages.
+ * @since  1.6
+ */
+class ContentlanguageField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'ContentLanguage';
+
+	/**
+	 * Method to get the field options for content languages.
+	 *
+	 * @return  array  The options the field is going to show.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		return array_merge(parent::getOptions(), \JHtml::_('contentlanguage.existing'));
+	}
+}
diff --git a/core/libraries/src/Form/Field/ContenttypeField.php b/core/libraries/src/Form/Field/ContenttypeField.php
new file mode 100644
index 00000000..2b8e12b7
--- /dev/null
+++ b/core/libraries/src/Form/Field/ContenttypeField.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Content Type field.
+ *
+ * @since  3.1
+ */
+class ContenttypeField extends \JFormFieldList
+{
+	/**
+	 * A flexible tag list that respects access controls
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $type = 'Contenttype';
+
+	/**
+	 * Method to get the field input for a list of content types.
+	 *
+	 * @return  string  The field input.
+	 *
+	 * @since   3.1
+	 */
+	protected function getInput()
+	{
+		if (!is_array($this->value))
+		{
+			if (is_object($this->value))
+			{
+				$this->value = $this->value->tags;
+			}
+
+			if (is_string($this->value))
+			{
+				$this->value = explode(',', $this->value);
+			}
+		}
+
+		return parent::getInput();
+	}
+
+	/**
+	 * Method to get a list of content types
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.1
+	 */
+	protected function getOptions()
+	{
+		$lang = Factory::getLanguage();
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.type_id AS value, a.type_title AS text, a.type_alias AS alias')
+			->from('#__content_types AS a')
+
+			->order('a.type_title ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (\RuntimeException $e)
+		{
+			return array();
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		foreach ($options as $option)
+		{
+			// Make up the string from the component sys.ini file
+			$parts = explode('.', $option->alias);
+			$comp = array_shift($parts);
+
+			// Make sure the component sys.ini is loaded
+			$lang->load($comp . '.sys', JPATH_ADMINISTRATOR, null, false, true)
+			|| $lang->load($comp . '.sys', JPATH_ADMINISTRATOR . '/components/' . $comp, null, false, true);
+
+			$option->string = implode('_', $parts);
+			$option->string = $comp . '_CONTENT_TYPE_' . $option->string;
+
+			if ($lang->hasKey($option->string))
+			{
+				$option->text = \JText::_($option->string);
+			}
+		}
+
+		return $options;
+	}
+}
diff --git a/core/libraries/src/Form/Field/EditorField.php b/core/libraries/src/Form/Field/EditorField.php
new file mode 100644
index 00000000..762e77a8
--- /dev/null
+++ b/core/libraries/src/Form/Field/EditorField.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Editor\Editor;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('textarea');
+
+/**
+ * A textarea field for content creation
+ *
+ * @see    JEditor
+ * @since  1.6
+ */
+class EditorField extends \JFormFieldTextarea
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'Editor';
+
+	/**
+	 * The Editor object.
+	 *
+	 * @var    Editor
+	 * @since  1.6
+	 */
+	protected $editor;
+
+	/**
+	 * The height of the editor.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $height;
+
+	/**
+	 * The width of the editor.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $width;
+
+	/**
+	 * The assetField of the editor.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $assetField;
+
+	/**
+	 * The authorField of the editor.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $authorField;
+
+	/**
+	 * The asset of the editor.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $asset;
+
+	/**
+	 * The buttons of the editor.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $buttons;
+
+	/**
+	 * The hide of the editor.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $hide;
+
+	/**
+	 * The editorType of the editor.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $editorType;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'height':
+			case 'width':
+			case 'assetField':
+			case 'authorField':
+			case 'asset':
+			case 'buttons':
+			case 'hide':
+			case 'editorType':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'height':
+			case 'width':
+			case 'assetField':
+			case 'authorField':
+			case 'asset':
+				$this->$name = (string) $value;
+				break;
+
+			case 'buttons':
+				$value = (string) $value;
+
+				if ($value === 'true' || $value === 'yes' || $value === '1')
+				{
+					$this->buttons = true;
+				}
+				elseif ($value === 'false' || $value === 'no' || $value === '0')
+				{
+					$this->buttons = false;
+				}
+				else
+				{
+					$this->buttons = explode(',', $value);
+				}
+				break;
+
+			case 'hide':
+				$value = (string) $value;
+				$this->hide = $value ? explode(',', $value) : array();
+				break;
+
+			case 'editorType':
+				// Can be in the form of: editor="desired|alternative".
+				$this->editorType  = explode('|', trim((string) $value));
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     FormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			$this->height      = $this->element['height'] ? (string) $this->element['height'] : '500';
+			$this->width       = $this->element['width'] ? (string) $this->element['width'] : '100%';
+			$this->assetField  = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
+			$this->authorField = $this->element['created_by_field'] ? (string) $this->element['created_by_field'] : 'created_by';
+			$this->asset       = $this->form->getValue($this->assetField) ?: (string) $this->element['asset_id'];
+
+			$buttons    = (string) $this->element['buttons'];
+			$hide       = (string) $this->element['hide'];
+			$editorType = (string) $this->element['editor'];
+
+			if ($buttons === 'true' || $buttons === 'yes' || $buttons === '1')
+			{
+				$this->buttons = true;
+			}
+			elseif ($buttons === 'false' || $buttons === 'no' || $buttons === '0')
+			{
+				$this->buttons = false;
+			}
+			else
+			{
+				$this->buttons = !empty($hide) ? explode(',', $buttons) : array();
+			}
+
+			$this->hide        = !empty($hide) ? explode(',', (string) $this->element['hide']) : array();
+			$this->editorType  = !empty($editorType) ? explode('|', trim($editorType)) : array();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field input markup for the editor area
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		// Get an editor object.
+		$editor = $this->getEditor();
+		$params = array(
+			'autofocus' => $this->autofocus,
+			'readonly'  => $this->readonly || $this->disabled,
+			'syntax'    => (string) $this->element['syntax'],
+		);
+
+		return $editor->display(
+			$this->name,
+			htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8'),
+			$this->width,
+			$this->height,
+			$this->columns,
+			$this->rows,
+			$this->buttons ? (is_array($this->buttons) ? array_merge($this->buttons, $this->hide) : $this->hide) : false,
+			$this->id,
+			$this->asset,
+			$this->form->getValue($this->authorField),
+			$params
+		);
+	}
+
+	/**
+	 * Method to get a Editor object based on the form field.
+	 *
+	 * @return  Editor  The Editor object.
+	 *
+	 * @since   1.6
+	 */
+	protected function getEditor()
+	{
+		// Only create the editor if it is not already created.
+		if (empty($this->editor))
+		{
+			$editor = null;
+
+			if ($this->editorType)
+			{
+				// Get the list of editor types.
+				$types = $this->editorType;
+
+				// Get the database object.
+				$db = Factory::getDbo();
+
+				// Iterate over the types looking for an existing editor.
+				foreach ($types as $element)
+				{
+					// Build the query.
+					$query = $db->getQuery(true)
+						->select('element')
+						->from('#__extensions')
+						->where('element = ' . $db->quote($element))
+						->where('folder = ' . $db->quote('editors'))
+						->where('enabled = 1');
+
+					// Check of the editor exists.
+					$db->setQuery($query, 0, 1);
+					$editor = $db->loadResult();
+
+					// If an editor was found stop looking.
+					if ($editor)
+					{
+						break;
+					}
+				}
+			}
+
+			// Create the JEditor instance based on the given editor.
+			if ($editor === null)
+			{
+				$editor = Factory::getConfig()->get('editor');
+			}
+
+			$this->editor = Editor::getInstance($editor);
+		}
+
+		return $this->editor;
+	}
+
+	/**
+	 * Method to get the JEditor output for an onSave event.
+	 *
+	 * @return  string  The JEditor object output.
+	 *
+	 * @since   1.6
+	 */
+	public function save()
+	{
+		return $this->getEditor()->save($this->id);
+	}
+}
diff --git a/core/libraries/src/Form/Field/FrontendlanguageField.php b/core/libraries/src/Form/Field/FrontendlanguageField.php
new file mode 100644
index 00000000..f529e1f7
--- /dev/null
+++ b/core/libraries/src/Form/Field/FrontendlanguageField.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Provides a list of published content languages with home pages
+ *
+ * @see    JFormFieldLanguage for a select list of application languages.
+ * @since  3.5
+ */
+class FrontendlanguageField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	public $type = 'Frontend_Language';
+
+	/**
+	 * Method to get the field options for frontend published content languages with homes.
+	 *
+	 * @return  array  The options the field is going to show.
+	 *
+	 * @since   3.5
+	 */
+	protected function getOptions()
+	{
+		// Get the database object and a new query object.
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('a.lang_code AS value, a.title AS text')
+			->from($db->quoteName('#__languages') . ' AS a')
+			->where('a.published = 1')
+			->order('a.title');
+
+		// Select the language home pages.
+		$query->select('l.home, l.language')
+			->innerJoin($db->quoteName('#__menu') . ' AS l ON l.language=a.lang_code AND l.home=1 AND l.published=1 AND l.language <> ' . $db->quote('*'))
+			->innerJoin($db->quoteName('#__extensions') . ' AS e ON e.element = a.lang_code')
+			->where('e.client_id = 0')
+			->where('e.enabled = 1')
+			->where('e.state = 0');
+
+		$db->setQuery($query);
+
+		try
+		{
+			$languages = $db->loadObjectList();
+		}
+		catch (\RuntimeException $e)
+		{
+			$languages = array();
+
+			if (Factory::getUser()->authorise('core.admin'))
+			{
+				Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getOptions(), $languages);
+	}
+}
diff --git a/core/libraries/src/Form/Field/HeadertagField.php b/core/libraries/src/Form/Field/HeadertagField.php
new file mode 100644
index 00000000..0ddb7833
--- /dev/null
+++ b/core/libraries/src/Form/Field/HeadertagField.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla! CMS.
+ *
+ * @since  3.0
+ */
+class HeadertagField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $type = 'HeaderTag';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.0
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+		$tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'div');
+
+		// Create one new option object for each tag
+		foreach ($tags as $tag)
+		{
+			$tmp = \JHtml::_('select.option', $tag, $tag);
+			$options[] = $tmp;
+		}
+
+		reset($options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/src/Form/Field/HelpsiteField.php b/core/libraries/src/Form/Field/HelpsiteField.php
new file mode 100644
index 00000000..90c72b2d
--- /dev/null
+++ b/core/libraries/src/Form/Field/HelpsiteField.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Help\Help;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Platform.
+ * Provides a select list of help sites.
+ *
+ * @since  1.6
+ */
+class HelpsiteField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'Helpsite';
+
+	/**
+	 * Method to get the help site field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   1.6
+	 */
+	protected function getOptions()
+	{
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), Help::createSiteList(JPATH_ADMINISTRATOR . '/help/helpsites.xml', $this->value));
+
+		return $options;
+	}
+
+	/**
+	 * Override to add refresh button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		\JHtml::_('script', 'system/helpsite.js', array('version' => 'auto', 'relative' => true));
+
+		$showDefault = (string) $this->getAttribute('showDefault') === 'false' ? 'false' : 'true';
+
+		$html = parent::getInput();
+		$button = '<button
+						type="button"
+						class="btn btn-small"
+						id="helpsite-refresh"
+						rel="' . $this->id . '"
+						showDefault="' . $showDefault . '"
+					>
+					<span>' . \JText::_('JGLOBAL_HELPREFRESH_BUTTON') . '</span>
+					</button>';
+
+		return $html . $button;
+	}
+}
diff --git a/core/libraries/src/Form/Field/LastvisitdaterangeField.php b/core/libraries/src/Form/Field/LastvisitdaterangeField.php
new file mode 100644
index 00000000..334f69d5
--- /dev/null
+++ b/core/libraries/src/Form/Field/LastvisitdaterangeField.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Field to show a list of available date ranges to filter on last visit date.
+ *
+ * @since  3.6
+ */
+class LastvisitdaterangeField extends \JFormFieldPredefinedList
+{
+	/**
+	 * Method to instantiate the form field object.
+	 *
+	 * @param   Form  $form  The form to attach to the form field object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($form = null)
+	{
+		parent::__construct($form);
+
+		// Set the type
+		$this->type = 'LastvisitDateRange';
+
+		// Load the required language
+		$lang = Factory::getLanguage();
+		$lang->load('com_users', JPATH_ADMINISTRATOR);
+
+		// Set the pre-defined options
+		$this->predefinedOptions = array(
+			'today'       => 'COM_USERS_OPTION_RANGE_TODAY',
+			'past_week'   => 'COM_USERS_OPTION_RANGE_PAST_WEEK',
+			'past_1month' => 'COM_USERS_OPTION_RANGE_PAST_1MONTH',
+			'past_3month' => 'COM_USERS_OPTION_RANGE_PAST_3MONTH',
+			'past_6month' => 'COM_USERS_OPTION_RANGE_PAST_6MONTH',
+			'past_year'   => 'COM_USERS_OPTION_RANGE_PAST_YEAR',
+			'post_year'   => 'COM_USERS_OPTION_RANGE_POST_YEAR',
+			'never'       => 'COM_USERS_OPTION_RANGE_NEVER',
+		);
+	}
+}
diff --git a/core/libraries/src/Form/Field/LimitboxField.php b/core/libraries/src/Form/Field/LimitboxField.php
new file mode 100644
index 00000000..77e1c271
--- /dev/null
+++ b/core/libraries/src/Form/Field/LimitboxField.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Field to load a list of posible item count limits
+ *
+ * @since  3.2
+ */
+class LimitboxField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $type = 'Limitbox';
+
+	/**
+	 * Cached array of the category items.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $options = array();
+
+	/**
+	 * Default options
+	 *
+	 * @var  array
+	 */
+	protected $defaultLimits = array(5, 10, 15, 20, 25, 30, 50, 100, 200, 500);
+
+	/**
+	 * Method to get the options to populate to populate list
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.2
+	 */
+	protected function getOptions()
+	{
+		// Accepted modifiers
+		$hash = md5($this->element);
+
+		if (!isset(static::$options[$hash]))
+		{
+			static::$options[$hash] = parent::getOptions();
+
+			$options = array();
+			$limits = $this->defaultLimits;
+
+			// Limits manually specified
+			if (isset($this->element['limits']))
+			{
+				$limits = explode(',', $this->element['limits']);
+			}
+
+			// User wants to add custom limits
+			if (isset($this->element['append']))
+			{
+				$limits = array_unique(array_merge($limits, explode(',', $this->element['append'])));
+			}
+
+			// User wants to remove some default limits
+			if (isset($this->element['remove']))
+			{
+				$limits = array_diff($limits, explode(',', $this->element['remove']));
+			}
+
+			// Order the options
+			asort($limits);
+
+			// Add an option to show all?
+			$showAll = isset($this->element['showall']) ? (string) $this->element['showall'] === 'true' : true;
+
+			if ($showAll)
+			{
+				$limits[] = 0;
+			}
+
+			if (!empty($limits))
+			{
+				foreach ($limits as $value)
+				{
+					$options[] = (object) array(
+						'value' => $value,
+						'text' => ($value != 0) ? \JText::_('J' . $value) : \JText::_('JALL'),
+					);
+				}
+
+				static::$options[$hash] = array_merge(static::$options[$hash], $options);
+			}
+		}
+
+		return static::$options[$hash];
+	}
+}
diff --git a/core/libraries/src/Form/Field/MediaField.php b/core/libraries/src/Form/Field/MediaField.php
new file mode 100644
index 00000000..c3a0a599
--- /dev/null
+++ b/core/libraries/src/Form/Field/MediaField.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Provides a modal media selector including upload mechanism
+ *
+ * @since  1.6
+ */
+class MediaField extends FormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'Media';
+
+	/**
+	 * The authorField.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $authorField;
+
+	/**
+	 * The asset.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $asset;
+
+	/**
+	 * The link.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $link;
+
+	/**
+	 * Modal width.
+	 *
+	 * @var    integer
+	 * @since  3.4.5
+	 */
+	protected $width;
+
+	/**
+	 * Modal height.
+	 *
+	 * @var    integer
+	 * @since  3.4.5
+	 */
+	protected $height;
+
+	/**
+	 * The authorField.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $preview;
+
+	/**
+	 * The preview.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $directory;
+
+	/**
+	 * The previewWidth.
+	 *
+	 * @var    int
+	 * @since  3.2
+	 */
+	protected $previewWidth;
+
+	/**
+	 * The previewHeight.
+	 *
+	 * @var    int
+	 * @since  3.2
+	 */
+	protected $previewHeight;
+
+	/**
+	 * Layout to render
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout = 'joomla.form.field.media';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'authorField':
+			case 'asset':
+			case 'link':
+			case 'width':
+			case 'height':
+			case 'preview':
+			case 'directory':
+			case 'previewWidth':
+			case 'previewHeight':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'authorField':
+			case 'asset':
+			case 'link':
+			case 'width':
+			case 'height':
+			case 'preview':
+			case 'directory':
+				$this->$name = (string) $value;
+				break;
+
+			case 'previewWidth':
+			case 'previewHeight':
+				$this->$name = (int) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see 	FormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			$assetField = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
+
+			$this->authorField   = $this->element['created_by_field'] ? (string) $this->element['created_by_field'] : 'created_by';
+			$this->asset         = $this->form->getValue($assetField) ?: (string) $this->element['asset_id'];
+			$this->link          = (string) $this->element['link'];
+			$this->width  	     = isset($this->element['width']) ? (int) $this->element['width'] : 800;
+			$this->height 	     = isset($this->element['height']) ? (int) $this->element['height'] : 500;
+			$this->preview       = (string) $this->element['preview'];
+			$this->directory     = (string) $this->element['directory'];
+			$this->previewWidth  = isset($this->element['preview_width']) ? (int) $this->element['preview_width'] : 200;
+			$this->previewHeight = isset($this->element['preview_height']) ? (int) $this->element['preview_height'] : 200;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field input markup for a media selector.
+	 * Use attributes to identify specific created_by and asset_id fields
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Get the data that is going to be passed to the layout
+	 *
+	 * @return  array
+	 */
+	public function getLayoutData()
+	{
+		// Get the basic field data
+		$data = parent::getLayoutData();
+
+		$asset = $this->asset;
+
+		if ($asset === '')
+		{
+			$asset = \JFactory::getApplication()->input->get('option');
+		}
+
+		if ($this->value && file_exists(JPATH_ROOT . '/' . $this->value))
+		{
+			$this->folder = explode('/', $this->value);
+			$this->folder = array_diff_assoc($this->folder, explode('/', ComponentHelper::getParams('com_media')->get('image_path', 'images')));
+			array_pop($this->folder);
+			$this->folder = implode('/', $this->folder);
+		}
+		elseif (file_exists(JPATH_ROOT . '/' . ComponentHelper::getParams('com_media')->get('image_path', 'images') . '/' . $this->directory))
+		{
+			$this->folder = $this->directory;
+		}
+		else
+		{
+			$this->folder = '';
+		}
+
+		$extraData = array(
+			'asset'         => $asset,
+			'authorField'   => $this->authorField,
+			'authorId'      => $this->form->getValue($this->authorField),
+			'folder'        => $this->folder,
+			'link'          => $this->link,
+			'preview'       => $this->preview,
+			'previewHeight' => $this->previewHeight,
+			'previewWidth'  => $this->previewWidth,
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/src/Form/Field/MenuField.php b/core/libraries/src/Form/Field/MenuField.php
new file mode 100644
index 00000000..1c3ba326
--- /dev/null
+++ b/core/libraries/src/Form/Field/MenuField.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+// Import the com_menus helper.
+require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+FormHelper::loadFieldClass('GroupedList');
+
+/**
+ * Supports an HTML select list of menus
+ *
+ * @since  1.6
+ */
+class MenuField extends \JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'Menu';
+
+	/**
+	 * Method to get the field option groups.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	protected function getGroups()
+	{
+		$clientId   = (string) $this->element['clientid'];
+		$accessType = (string) $this->element['accesstype'];
+		$showAll    = (string) $this->element['showAll'] == 'true';
+
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn(array('id', 'menutype', 'title', 'client_id'), array('id', 'value', 'text', 'client_id')))
+			->from($db->quoteName('#__menu_types'))
+			->order('client_id, title');
+
+		if (strlen($clientId))
+		{
+			$query->where('client_id = ' . (int) $clientId);
+		}
+
+		$menus = $db->setQuery($query)->loadObjectList();
+
+		if ($accessType)
+		{
+			$user = Factory::getUser();
+
+			foreach ($menus as $key => $menu)
+			{
+				switch ($accessType)
+				{
+					case 'create':
+					case 'manage':
+						if (!$user->authorise('core.' . $accessType, 'com_menus.menu.' . (int) $menu->id))
+						{
+							unset($menus[$key]);
+						}
+						break;
+
+					// Editing a menu item is a bit tricky, we have to check the current menutype for core.edit and all others for core.create
+					case 'edit':
+						$check = $this->value == $menu->value ? 'edit' : 'create';
+
+						if (!$user->authorise('core.' . $check, 'com_menus.menu.' . (int) $menu->id))
+						{
+							unset($menus[$key]);
+						}
+						break;
+				}
+			}
+		}
+
+		$opts = array();
+
+		// Protected menutypes can be shown if requested
+		if ($clientId == 1 && $showAll)
+		{
+			$opts[] = (object) array(
+				'value'     => 'main',
+				'text'      => \JText::_('COM_MENUS_MENU_TYPE_PROTECTED_MAIN_LABEL'),
+				'client_id' => 1,
+			);
+		}
+
+		$options = array_merge($opts, $menus);
+		$groups  = array();
+
+		if (strlen($clientId))
+		{
+			$groups[0] = $options;
+		}
+		else
+		{
+			foreach ($options as $option)
+			{
+				// If client id is not specified we group the items.
+				$label = ($option->client_id == 1 ? \JText::_('JADMINISTRATOR') : \JText::_('JSITE'));
+
+				$groups[$label][] = $option;
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getGroups(), $groups);
+	}
+}
diff --git a/core/libraries/src/Form/Field/MenuitemField.php b/core/libraries/src/Form/Field/MenuitemField.php
new file mode 100644
index 00000000..3d63d59c
--- /dev/null
+++ b/core/libraries/src/Form/Field/MenuitemField.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('groupedlist');
+
+// Import the com_menus helper.
+require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Supports an HTML grouped select list of menu item grouped by menu
+ *
+ * @since  1.6
+ */
+class MenuitemField extends \JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'MenuItem';
+
+	/**
+	 * The menu type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $menuType;
+
+	/**
+	 * The client id.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $clientId;
+
+	/**
+	 * The language.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $language;
+
+	/**
+	 * The published status.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $published;
+
+	/**
+	 * The disabled status.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $disable;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'menuType':
+			case 'clientId':
+			case 'language':
+			case 'published':
+			case 'disable':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'menuType':
+				$this->menuType = (string) $value;
+				break;
+
+			case 'clientId':
+				$this->clientId = (int) $value;
+				break;
+
+			case 'language':
+			case 'published':
+			case 'disable':
+				$value = (string) $value;
+				$this->$name = $value ? explode(',', $value) : array();
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     FormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			$this->menuType  = (string) $this->element['menu_type'];
+			$this->clientId  = (int) $this->element['client_id'];
+			$this->published = $this->element['published'] ? explode(',', (string) $this->element['published']) : array();
+			$this->disable   = $this->element['disable'] ? explode(',', (string) $this->element['disable']) : array();
+			$this->language  = $this->element['language'] ? explode(',', (string) $this->element['language']) : array();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field option groups.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   1.6
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+
+		$menuType = $this->menuType;
+
+		// Get the menu items.
+		$items = \MenusHelper::getMenuLinks($menuType, 0, 0, $this->published, $this->language, $this->clientId);
+
+		// Build group for a specific menu type.
+		if ($menuType)
+		{
+			// If the menutype is empty, group the items by menutype.
+			$db    = Factory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__menu_types'))
+				->where($db->quoteName('menutype') . ' = ' . $db->quote($menuType));
+			$db->setQuery($query);
+
+			try
+			{
+				$menuTitle = $db->loadResult();
+			}
+			catch (\RuntimeException $e)
+			{
+				$menuTitle = $menuType;
+			}
+
+			// Initialize the group.
+			$groups[$menuTitle] = array();
+
+			// Build the options array.
+			foreach ($items as $link)
+			{
+				$levelPrefix = str_repeat('- ', max(0, $link->level - 1));
+
+				// Displays language code if not set to All
+				if ($link->language !== '*')
+				{
+					$lang = ' (' . $link->language . ')';
+				}
+				else
+				{
+					$lang = '';
+				}
+
+				$groups[$menuTitle][] = \JHtml::_('select.option',
+								$link->value, $levelPrefix . $link->text . $lang,
+								'value',
+								'text',
+								in_array($link->type, $this->disable)
+							);
+			}
+		}
+		// Build groups for all menu types.
+		else
+		{
+			// Build the groups arrays.
+			foreach ($items as $menu)
+			{
+				// Initialize the group.
+				$groups[$menu->title] = array();
+
+				// Build the options array.
+				foreach ($menu->links as $link)
+				{
+					$levelPrefix = str_repeat('- ', max(0, $link->level - 1));
+
+					// Displays language code if not set to All
+					if ($link->language !== '*')
+					{
+						$lang = ' (' . $link->language . ')';
+					}
+					else
+					{
+						$lang = '';
+					}
+
+					$groups[$menu->title][] = \JHtml::_('select.option',
+										$link->value, $levelPrefix . $link->text . $lang,
+										'value',
+										'text',
+										in_array($link->type, $this->disable)
+									);
+				}
+			}
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}
diff --git a/core/libraries/src/Form/Field/ModuleorderField.php b/core/libraries/src/Form/Field/ModuleorderField.php
new file mode 100644
index 00000000..915e7ac1
--- /dev/null
+++ b/core/libraries/src/Form/Field/ModuleorderField.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Session\Session;
+
+/**
+ * Module Order field.
+ *
+ * @since  1.6
+ */
+class ModuleorderField extends FormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   1.6
+	 */
+	protected $type = 'ModuleOrder';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.6.3
+	 */
+	protected $layout = 'joomla.form.field.moduleorder';
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.6.3
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'linked':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.3
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'linked':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     FormField::setup()
+	 * @since   3.6.3
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		if ($return)
+		{
+			$this->linked    = isset($this->element['linked']) ? (int) $this->element['linked'] : 'position';
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the field input markup for the moduleorder field.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since  3.6.3
+	 */
+	protected function getLayoutData()
+	{
+		$data = parent::getLayoutData();
+
+		$extraData = array(
+			'ordering' => $this->form->getValue('ordering'),
+			'clientId' => $this->form->getValue('client_id'),
+			'name'     => $this->name,
+			'token'    => Session::getFormToken() . '=1',
+			'element'  => $this->form->getName() . '_' . $this->linked
+		);
+
+		return array_merge($data, $extraData);
+	}
+}
diff --git a/core/libraries/src/Form/Field/ModulepositionField.php b/core/libraries/src/Form/Field/ModulepositionField.php
new file mode 100644
index 00000000..16054853
--- /dev/null
+++ b/core/libraries/src/Form/Field/ModulepositionField.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('text');
+
+/**
+ * Module Position field.
+ *
+ * @since  1.6
+ */
+class ModulepositionField extends \JFormFieldText
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $type = 'ModulePosition';
+
+	/**
+	 * The client ID.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $clientId;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'clientId':
+				return $this->clientId;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'clientId':
+				$this->clientId = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     FormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			// Get the client id.
+			$clientId = $this->element['client_id'];
+
+			if (!isset($clientId))
+			{
+				$clientName = $this->element['client'];
+
+				if (isset($clientName))
+				{
+					$client = ApplicationHelper::getClientInfo($clientName, true);
+					$clientId = $client->id;
+				}
+			}
+
+			if (!isset($clientId) && $this->form instanceof Form)
+			{
+				$clientId = $this->form->getValue('client_id');
+			}
+
+			$this->clientId = (int) $clientId;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		// Load the modal behavior script.
+		\JHtml::_('behavior.modal', 'a.modal');
+
+		// Build the script.
+		$script = array();
+		$script[] = '	function jSelectPosition_' . $this->id . '(name) {';
+		$script[] = '		document.getElementById("' . $this->id . '").value = name;';
+		$script[] = '		jModalClose();';
+		$script[] = '	}';
+
+		// Add the script to the document head.
+		Factory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+		// Setup variables for display.
+		$html = array();
+		$link = 'index.php?option=com_modules&view=positions&layout=modal&tmpl=component&function=jSelectPosition_' . $this->id
+			. '&amp;client_id=' . $this->clientId;
+
+		// The current user display field.
+		$html[] = '<div class="input-append">';
+		$html[] = parent::getInput()
+			. '<a class="btn modal" title="' . \JText::_('COM_MODULES_CHANGE_POSITION_TITLE') . '"  href="' . $link
+			. '" rel="{handler: \'iframe\', size: {x: 800, y: 450}}">'
+			. \JText::_('COM_MODULES_CHANGE_POSITION_BUTTON') . '</a>';
+		$html[] = '</div>';
+
+		return implode("\n", $html);
+	}
+}
diff --git a/core/libraries/src/Form/Field/ModuletagField.php b/core/libraries/src/Form/Field/ModuletagField.php
new file mode 100644
index 00000000..e442a195
--- /dev/null
+++ b/core/libraries/src/Form/Field/ModuletagField.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Module Tag field.
+ *
+ * @since  3.0
+ */
+class ModuletagField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $type = 'ModuleTag';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.0
+	 */
+	protected function getOptions()
+	{
+		$options = array();
+		$tags    = array('address', 'article', 'aside', 'details', 'div', 'footer', 'header', 'main', 'nav', 'section', 'summary');
+
+		// Create one new option object for each tag
+		foreach ($tags as $tag)
+		{
+			$tmp = \JHtml::_('select.option', $tag, $tag);
+			$options[] = $tmp;
+		}
+
+		reset($options);
+
+		return $options;
+	}
+}
diff --git a/core/libraries/src/Form/Field/OrderingField.php b/core/libraries/src/Form/Field/OrderingField.php
new file mode 100644
index 00000000..c358961b
--- /dev/null
+++ b/core/libraries/src/Form/Field/OrderingField.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\UCM\UCMType;
+
+/**
+ * Ordering field.
+ *
+ * @since  3.2
+ */
+class OrderingField extends FormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $type = 'Ordering';
+
+	/**
+	 * The form field content type.
+	 *
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $contentType;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'contentType':
+				return $this->contentType;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'contentType':
+				$this->contentType = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     FormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			$this->contentType = (string) $this->element['content_type'];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string	The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		$html = array();
+		$attr = '';
+
+		// Initialize some field attributes.
+		$attr .= !empty($this->class) ? ' class="' . $this->class . '"' : '';
+		$attr .= $this->disabled ? ' disabled' : '';
+		$attr .= !empty($this->size) ? ' size="' . $this->size . '"' : '';
+
+		// Initialize JavaScript field attributes.
+		$attr .= !empty($this->onchange) ? ' onchange="' . $this->onchange . '"' : '';
+
+		$itemId = (int) $this->getItemId();
+
+		$query = $this->getQuery();
+
+		// Create a read-only list (no name) with a hidden input to store the value.
+		if ($this->readonly)
+		{
+			$html[] = \JHtml::_('list.ordering', '', $query, trim($attr), $this->value, $itemId ? 0 : 1);
+			$html[] = '<input type="hidden" name="' . $this->name . '" value="' . $this->value . '"/>';
+		}
+		else
+		{
+			// Create a regular list.
+			$html[] = \JHtml::_('list.ordering', $this->name, $query, trim($attr), $this->value, $itemId ? 0 : 1);
+		}
+
+		return implode($html);
+	}
+
+	/**
+	 * Builds the query for the ordering list.
+	 *
+	 * @return  \JDatabaseQuery  The query for the ordering form field
+	 *
+	 * @since   3.2
+	 */
+	protected function getQuery()
+	{
+		$categoryId   = (int) $this->form->getValue('catid');
+		$ucmType      = new UCMType;
+		$ucmRow       = $ucmType->getType($ucmType->getTypeId($this->contentType));
+		$ucmMapCommon = json_decode($ucmRow->field_mappings)->common;
+
+		if (is_object($ucmMapCommon))
+		{
+			$ordering = $ucmMapCommon->core_ordering;
+			$title    = $ucmMapCommon->core_title;
+		}
+		elseif (is_array($ucmMapCommon))
+		{
+			$ordering = $ucmMapCommon[0]->core_ordering;
+			$title    = $ucmMapCommon[0]->core_title;
+		}
+
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select(array($db->quoteName($ordering, 'value'), $db->quoteName($title, 'text')))
+			->from($db->quoteName(json_decode($ucmRow->table)->special->dbtable))
+			->where($db->quoteName('catid') . ' = ' . (int) $categoryId)
+			->order('ordering');
+
+		return $query;
+	}
+
+	/**
+	 * Retrieves the current Item's Id.
+	 *
+	 * @return  integer  The current item ID
+	 *
+	 * @since   3.2
+	 */
+	protected function getItemId()
+	{
+		return (int) $this->form->getValue('id');
+	}
+}
diff --git a/core/libraries/src/Form/Field/PluginstatusField.php b/core/libraries/src/Form/Field/PluginstatusField.php
new file mode 100644
index 00000000..0fe9ce75
--- /dev/null
+++ b/core/libraries/src/Form/Field/PluginstatusField.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Plugin Status field.
+ *
+ * @since  3.5
+ */
+class PluginstatusField extends \JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	public $type = 'Plugin_Status';
+
+	/**
+	 * Available statuses
+	 *
+	 * @var  array
+	 * @since  3.5
+	 */
+	protected $predefinedOptions = array(
+		'0'  => 'JDISABLED',
+		'1'  => 'JENABLED',
+	);
+}
diff --git a/core/libraries/src/Form/Field/RedirectStatusField.php b/core/libraries/src/Form/Field/RedirectStatusField.php
new file mode 100644
index 00000000..47f40b19
--- /dev/null
+++ b/core/libraries/src/Form/Field/RedirectStatusField.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Redirect Status field.
+ *
+ * @since  3.8.0
+ */
+class RedirectStatusField extends \JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	public $type = 'Redirect_Status';
+
+	/**
+	 * Available statuses
+	 *
+	 * @var  array
+	 * @since  3.8.0
+	 */
+	protected $predefinedOptions = array(
+		'-2' => 'JTRASHED',
+		'0'  => 'JDISABLED',
+		'1'  => 'JENABLED',
+		'*'  => 'JALL',
+	);
+}
diff --git a/core/libraries/src/Form/Field/RegistrationdaterangeField.php b/core/libraries/src/Form/Field/RegistrationdaterangeField.php
new file mode 100644
index 00000000..36cc4078
--- /dev/null
+++ b/core/libraries/src/Form/Field/RegistrationdaterangeField.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Registration Date Range field.
+ *
+ * @since  3.2
+ */
+class RegistrationdaterangeField extends \JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $type = 'RegistrationDateRange';
+
+	/**
+	 * Available options
+	 *
+	 * @var  array
+	 * @since  3.2
+	 */
+	protected $predefinedOptions = array(
+		'today'       => 'COM_USERS_OPTION_RANGE_TODAY',
+		'past_week'   => 'COM_USERS_OPTION_RANGE_PAST_WEEK',
+		'past_1month' => 'COM_USERS_OPTION_RANGE_PAST_1MONTH',
+		'past_3month' => 'COM_USERS_OPTION_RANGE_PAST_3MONTH',
+		'past_6month' => 'COM_USERS_OPTION_RANGE_PAST_6MONTH',
+		'past_year'   => 'COM_USERS_OPTION_RANGE_PAST_YEAR',
+		'post_year'   => 'COM_USERS_OPTION_RANGE_POST_YEAR',
+	);
+
+	/**
+	 * Method to instantiate the form field object.
+	 *
+	 * @param   Form  $form  The form to attach to the form field object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($form = null)
+	{
+		parent::__construct($form);
+
+		// Load the required language
+		$lang = Factory::getLanguage();
+		$lang->load('com_users', JPATH_ADMINISTRATOR);
+	}
+}
diff --git a/core/libraries/src/Form/Field/StatusField.php b/core/libraries/src/Form/Field/StatusField.php
new file mode 100644
index 00000000..2aed50f3
--- /dev/null
+++ b/core/libraries/src/Form/Field/StatusField.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Form Field to load a list of states
+ *
+ * @since  3.2
+ */
+class StatusField extends \JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $type = 'Status';
+
+	/**
+	 * Available statuses
+	 *
+	 * @var  array
+	 * @since  3.2
+	 */
+	protected $predefinedOptions = array(
+		'-2' =>	'JTRASHED',
+		'0'  => 'JUNPUBLISHED',
+		'1'  => 'JPUBLISHED',
+		'2'  => 'JARCHIVED',
+		'*'  => 'JALL',
+	);
+}
diff --git a/core/libraries/src/Form/Field/TagField.php b/core/libraries/src/Form/Field/TagField.php
new file mode 100644
index 00000000..ecd7326b
--- /dev/null
+++ b/core/libraries/src/Form/Field/TagField.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Helper\TagsHelper;
+use Joomla\CMS\Language\Multilanguage;
+use Joomla\Utilities\ArrayHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * List of Tags field.
+ *
+ * @since  3.1
+ */
+class TagField extends \JFormFieldList
+{
+	/**
+	 * A flexible tag list that respects access controls
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $type = 'Tag';
+
+	/**
+	 * Flag to work with nested tag field
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	public $isNested = null;
+
+	/**
+	 * com_tags parameters
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  3.1
+	 */
+	protected $comParams = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @since  3.1
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load com_tags config
+		$this->comParams = ComponentHelper::getParams('com_tags');
+	}
+
+	/**
+	 * Method to get the field input for a tag field.
+	 *
+	 * @return  string  The field input.
+	 *
+	 * @since   3.1
+	 */
+	protected function getInput()
+	{
+		// AJAX mode requires ajax-chosen
+		if (!$this->isNested())
+		{
+			// Get the field id
+			$id    = isset($this->element['id']) ? $this->element['id'] : null;
+			$cssId = '#' . $this->getId($id, $this->element['name']);
+
+			// Load the ajax-chosen customised field
+			\JHtml::_('tag.ajaxfield', $cssId, $this->allowCustom());
+		}
+
+		if (!is_array($this->value) && !empty($this->value))
+		{
+			if ($this->value instanceof TagsHelper)
+			{
+				if (empty($this->value->tags))
+				{
+					$this->value = array();
+				}
+				else
+				{
+					$this->value = $this->value->tags;
+				}
+			}
+
+			// String in format 2,5,4
+			if (is_string($this->value))
+			{
+				$this->value = explode(',', $this->value);
+			}
+		}
+
+		return parent::getInput();
+	}
+
+	/**
+	 * Method to get a list of tags
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.1
+	 */
+	protected function getOptions()
+	{
+		$published = $this->element['published'] ?: array(0, 1);
+		$app       = Factory::getApplication();
+		$tag       = $app->getLanguage()->getTag();
+
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select('DISTINCT a.id AS value, a.path, a.title AS text, a.level, a.published, a.lft')
+			->from('#__tags AS a')
+			->join('LEFT', $db->qn('#__tags') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
+
+		// Limit Options in multilanguage
+		if ($app->isClient('site') && Multilanguage::isEnabled())
+		{
+			$lang = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter');
+
+			if ($lang == 'current_language')
+			{
+				$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+			}
+		}
+		// Filter language
+		elseif (!empty($this->element['language']))
+		{
+			if (strpos($this->element['language'], ',') !== false)
+			{
+				$language = implode(',', $db->quote(explode(',', $this->element['language'])));
+			}
+			else
+			{
+				$language = $db->quote($this->element['language']);
+			}
+
+			$query->where($db->quoteName('a.language') . ' IN (' . $language . ')');
+		}
+
+		$query->where($db->qn('a.lft') . ' > 0');
+
+		// Filter on the published state
+		if (is_numeric($published))
+		{
+			$query->where('a.published = ' . (int) $published);
+		}
+		elseif (is_array($published))
+		{
+			$published = ArrayHelper::toInteger($published);
+			$query->where('a.published IN (' . implode(',', $published) . ')');
+		}
+
+		$query->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$options = $db->loadObjectList();
+		}
+		catch (\RuntimeException $e)
+		{
+			return array();
+		}
+
+		// Block the possibility to set a tag as it own parent
+		if ($this->form->getName() === 'com_tags.tag')
+		{
+			$id   = (int) $this->form->getValue('id', 0);
+
+			foreach ($options as $option)
+			{
+				if ($option->value == $id)
+				{
+					$option->disable = true;
+				}
+			}
+		}
+
+		// Merge any additional options in the XML definition.
+		$options = array_merge(parent::getOptions(), $options);
+
+		// Prepare nested data
+		if ($this->isNested())
+		{
+			$this->prepareOptionsNested($options);
+		}
+		else
+		{
+			$options = TagsHelper::convertPathsToNames($options);
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Add "-" before nested tags, depending on level
+	 *
+	 * @param   array  &$options  Array of tags
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.1
+	 */
+	protected function prepareOptionsNested(&$options)
+	{
+		if ($options)
+		{
+			foreach ($options as &$option)
+			{
+				$repeat = (isset($option->level) && $option->level - 1 >= 0) ? $option->level - 1 : 0;
+				$option->text = str_repeat('- ', $repeat) . $option->text;
+			}
+		}
+
+		return $options;
+	}
+
+	/**
+	 * Determine if the field has to be tagnested
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	public function isNested()
+	{
+		if ($this->isNested === null)
+		{
+			// If mode="nested" || ( mode not set & config = nested )
+			if (isset($this->element['mode']) && (string) $this->element['mode'] === 'nested'
+				|| !isset($this->element['mode']) && $this->comParams->get('tag_field_ajax_mode', 1) == 0)
+			{
+				$this->isNested = true;
+			}
+		}
+
+		return $this->isNested;
+	}
+
+	/**
+	 * Determines if the field allows or denies custom values
+	 *
+	 * @return  boolean
+	 */
+	public function allowCustom()
+	{
+		if (isset($this->element['custom']) && (string) $this->element['custom'] === 'deny')
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Field/TemplatestyleField.php b/core/libraries/src/Form/Field/TemplatestyleField.php
new file mode 100644
index 00000000..16f99d5c
--- /dev/null
+++ b/core/libraries/src/Form/Field/TemplatestyleField.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('groupedlist');
+
+/**
+ * Supports a select grouped list of template styles
+ *
+ * @since  1.6
+ */
+class TemplatestyleField extends \JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'TemplateStyle';
+
+	/**
+	 * The client name.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $clientName;
+
+	/**
+	 * The template.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $template;
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.2
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'clientName':
+			case 'template':
+				return $this->$name;
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'clientName':
+			case 'template':
+				$this->$name = (string) $value;
+				break;
+
+			default:
+				parent::__set($name, $value);
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     FormField::setup()
+	 * @since   3.2
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$result = parent::setup($element, $value, $group);
+
+		if ($result === true)
+		{
+			// Get the clientName template.
+			$this->clientName = $this->element['client'] ? (string) $this->element['client'] : 'site';
+			$this->template = (string) $this->element['template'];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the list of template style options grouped by template.
+	 * Use the client attribute to specify a specific client.
+	 * Use the template attribute to specify a specific template
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   1.6
+	 */
+	protected function getGroups()
+	{
+		$groups = array();
+		$lang = Factory::getLanguage();
+
+		// Get the client and client_id.
+		$client = ApplicationHelper::getClientInfo($this->clientName, true);
+
+		// Get the template.
+		$template = $this->template;
+
+		// Get the database object and a new query object.
+		$db = Factory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Build the query.
+		$query->select('s.id, s.title, e.name as name, s.template')
+			->from('#__template_styles as s')
+			->where('s.client_id = ' . (int) $client->id)
+			->order('template')
+			->order('title');
+
+		if ($template)
+		{
+			$query->where('s.template = ' . $db->quote($template));
+		}
+
+		$query->join('LEFT', '#__extensions as e on e.element=s.template')
+			->where('e.enabled = 1')
+			->where($db->quoteName('e.type') . ' = ' . $db->quote('template'));
+
+		// Set the query and load the styles.
+		$db->setQuery($query);
+		$styles = $db->loadObjectList();
+
+		// Build the grouped list array.
+		if ($styles)
+		{
+			foreach ($styles as $style)
+			{
+				$template = $style->template;
+				$lang->load('tpl_' . $template . '.sys', $client->path, null, false, true)
+					|| $lang->load('tpl_' . $template . '.sys', $client->path . '/templates/' . $template, null, false, true);
+				$name = \JText::_($style->name);
+
+				// Initialize the group if necessary.
+				if (!isset($groups[$name]))
+				{
+					$groups[$name] = array();
+				}
+
+				$groups[$name][] = \JHtml::_('select.option', $style->id, $style->title);
+			}
+		}
+
+		// Merge any additional groups in the XML definition.
+		$groups = array_merge(parent::getGroups(), $groups);
+
+		return $groups;
+	}
+}
diff --git a/core/libraries/src/Form/Field/UserField.php b/core/libraries/src/Form/Field/UserField.php
new file mode 100644
index 00000000..b3bd9cb9
--- /dev/null
+++ b/core/libraries/src/Form/Field/UserField.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\User\User;
+
+/**
+ * Field to select a user ID from a modal list.
+ *
+ * @since  1.6
+ */
+class UserField extends FormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	public $type = 'User';
+
+	/**
+	 * Filtering groups
+	 *
+	 * @var   array
+	 * @since 3.5
+	 */
+	protected $groups = null;
+
+	/**
+	 * Users to exclude from the list of users
+	 *
+	 * @var   array
+	 * @since 3.5
+	 */
+	protected $excluded = null;
+
+	/**
+	 * Layout to render
+	 *
+	 * @var   string
+	 * @since 3.5
+	 */
+	protected $layout = 'joomla.form.field.user';
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 *
+	 * @see     JFormField::setup()
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		// If user can't access com_users the field should be readonly.
+		if ($return && !$this->readonly)
+		{
+			$this->readonly = !Factory::getUser()->authorise('core.manage', 'com_users');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the user field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   1.6
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+
+	}
+
+	/**
+	 * Get the data that is going to be passed to the layout
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getLayoutData()
+	{
+		// Get the basic field data
+		$data = parent::getLayoutData();
+
+		// Initialize value
+		$name = \JText::_('JLIB_FORM_SELECT_USER');
+
+		if (is_numeric($this->value))
+		{
+			$name = User::getInstance($this->value)->name;
+		}
+		// Handle the special case for "current".
+		elseif (strtoupper($this->value) === 'CURRENT')
+		{
+			// 'CURRENT' is not a reasonable value to be placed in the html
+			$current = Factory::getUser();
+
+			$this->value = $current->id;
+
+			$data['value'] = $this->value;
+
+			$name = $current->name;
+		}
+
+		// User lookup went wrong, we assign the value instead.
+		if ($name === null && $this->value)
+		{
+			$name = $this->value;
+		}
+
+		$extraData = array(
+			'userName'  => $name,
+			'groups'    => $this->getGroups(),
+			'excluded'  => $this->getExcluded(),
+		);
+
+		return array_merge($data, $extraData);
+	}
+
+	/**
+	 * Method to get the filtering groups (null means no filtering)
+	 *
+	 * @return  mixed  Array of filtering groups or null.
+	 *
+	 * @since   1.6
+	 */
+	protected function getGroups()
+	{
+		if (isset($this->element['groups']))
+		{
+			return explode(',', $this->element['groups']);
+		}
+
+		return;
+	}
+
+	/**
+	 * Method to get the users to exclude from the list of users
+	 *
+	 * @return  mixed  Array of users to exclude or null to to not exclude them
+	 *
+	 * @since   1.6
+	 */
+	protected function getExcluded()
+	{
+		if (isset($this->element['exclude']))
+		{
+			return explode(',', $this->element['exclude']);
+		}
+
+		return;
+	}
+}
diff --git a/core/libraries/src/Form/Field/UseractiveField.php b/core/libraries/src/Form/Field/UseractiveField.php
new file mode 100644
index 00000000..19bd2928
--- /dev/null
+++ b/core/libraries/src/Form/Field/UseractiveField.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Field to show a list of available user active statuses
+ *
+ * @since  3.2
+ */
+class UseractiveField extends \JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $type = 'UserActive';
+
+	/**
+	 * Available statuses
+	 *
+	 * @var  array
+	 * @since  3.2
+	 */
+	protected $predefinedOptions = array(
+		'0'  => 'COM_USERS_ACTIVATED',
+		'1'  => 'COM_USERS_UNACTIVATED',
+	);
+
+	/**
+	 * Method to instantiate the form field object.
+	 *
+	 * @param   Form  $form  The form to attach to the form field object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($form = null)
+	{
+		parent::__construct($form);
+
+		// Load the required language
+		$lang = Factory::getLanguage();
+		$lang->load('com_users', JPATH_ADMINISTRATOR);
+	}
+}
diff --git a/core/libraries/src/Form/Field/UsergrouplistField.php b/core/libraries/src/Form/Field/UsergrouplistField.php
new file mode 100644
index 00000000..d01f1ab0
--- /dev/null
+++ b/core/libraries/src/Form/Field/UsergrouplistField.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormHelper;
+use Joomla\CMS\Helper\UserGroupsHelper;
+
+FormHelper::loadFieldClass('list');
+
+/**
+ * Field to load a dropdown list of available user groups
+ *
+ * @since  3.2
+ */
+class UsergrouplistField extends \JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $type = 'UserGroupList';
+
+	/**
+	 * Cached array of the category items.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $options = array();
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		if (is_string($value) && strpos($value, ',') !== false)
+		{
+			$value = explode(',', $value);
+		}
+
+		return parent::setup($element, $value, $group);
+	}
+
+	/**
+	 * Method to get the options to populate list
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.2
+	 */
+	protected function getOptions()
+	{
+		// Hash for caching
+		$hash = md5($this->element);
+
+		if (!isset(static::$options[$hash]))
+		{
+			static::$options[$hash] = parent::getOptions();
+
+			$groups         = UserGroupsHelper::getInstance()->getAll();
+			$checkSuperUser = (int) $this->getAttribute('checksuperusergroup', 0);
+			$isSuperUser    = Factory::getUser()->authorise('core.admin');
+			$options        = array();
+
+			foreach ($groups as $group)
+			{
+				// Don't show super user groups to non super users.
+				if ($checkSuperUser && !$isSuperUser && Access::checkGroup($group->id, 'core.admin'))
+				{
+					continue;
+				}
+
+				$options[] = (object) array(
+					'text'  => str_repeat('- ', $group->level) . $group->title,
+					'value' => $group->id,
+					'level' => $group->level
+				);
+			}
+
+			static::$options[$hash] = array_merge(static::$options[$hash], $options);
+		}
+
+		return static::$options[$hash];
+	}
+}
diff --git a/core/libraries/src/Form/Field/UserstateField.php b/core/libraries/src/Form/Field/UserstateField.php
new file mode 100644
index 00000000..6059ec66
--- /dev/null
+++ b/core/libraries/src/Form/Field/UserstateField.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormHelper;
+
+FormHelper::loadFieldClass('predefinedlist');
+
+/**
+ * Field to load a list of available users statuses
+ *
+ * @since  3.2
+ */
+class UserstateField extends \JFormFieldPredefinedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var		string
+	 * @since   3.2
+	 */
+	protected $type = 'UserState';
+
+	/**
+	 * Available statuses
+	 *
+	 * @var  array
+	 * @since  3.2
+	 */
+	protected $predefinedOptions = array(
+		'0'  => 'JENABLED',
+		'1'  => 'JDISABLED',
+	);
+}
diff --git a/core/libraries/src/Form/Form.php b/core/libraries/src/Form/Form.php
new file mode 100644
index 00000000..c2af7618
--- /dev/null
+++ b/core/libraries/src/Form/Form.php
@@ -0,0 +1,2415 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Factory\LegacyFormFactory;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+\JLoader::import('joomla.filesystem.path');
+
+/**
+ * Form Class for the Joomla Platform.
+ *
+ * This class implements a robust API for constructing, populating, filtering, and validating forms.
+ * It uses XML definitions to construct form fields and a variety of field and rule classes to
+ * render and validate the form.
+ *
+ * @link   http://www.w3.org/TR/html4/interact/forms.html
+ * @link   http://www.w3.org/TR/html5/forms.html
+ * @since  11.1
+ */
+class Form
+{
+	/**
+	 * The Registry data store for form fields during display.
+	 *
+	 * @var    Registry
+	 * @since  11.1
+	 */
+	protected $data;
+
+	/**
+	 * The form object errors array.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $errors = array();
+
+	/**
+	 * The name of the form instance.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $name;
+
+	/**
+	 * The form object options for use in rendering and validation.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $options = array();
+
+	/**
+	 * The form XML definition.
+	 *
+	 * @var    \SimpleXMLElement
+	 * @since  11.1
+	 */
+	protected $xml;
+
+	/**
+	 * Form instances.
+	 *
+	 * @var    Form[]
+	 * @since  11.1
+	 */
+	protected static $forms = array();
+
+	/**
+	 * Alows extensions to implement repeating elements
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	public $repeat = false;
+
+	/**
+	 * Method to instantiate the form object.
+	 *
+	 * @param   string  $name     The name of the form.
+	 * @param   array   $options  An array of form options.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($name, array $options = array())
+	{
+		// Set the name for the form.
+		$this->name = $name;
+
+		// Initialise the Registry data.
+		$this->data = new Registry;
+
+		// Set the options if specified.
+		$this->options['control'] = isset($options['control']) ? $options['control'] : false;
+	}
+
+	/**
+	 * Method to bind data to the form.
+	 *
+	 * @param   mixed  $data  An array or object of data to bind to the form.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function bind($data)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// The data must be an object or array.
+		if (!is_object($data) && !is_array($data))
+		{
+			return false;
+		}
+
+		$this->bindLevel(null, $data);
+
+		return true;
+	}
+
+	/**
+	 * Method to bind data to the form for the group level.
+	 *
+	 * @param   string  $group  The dot-separated form group path on which to bind the data.
+	 * @param   mixed   $data   An array or object of data to bind to the form for the group level.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function bindLevel($group, $data)
+	{
+		// Ensure the input data is an array.
+		if (is_object($data))
+		{
+			if ($data instanceof Registry)
+			{
+				// Handle a Registry.
+				$data = $data->toArray();
+			}
+			elseif ($data instanceof \JObject)
+			{
+				// Handle a JObject.
+				$data = $data->getProperties();
+			}
+			else
+			{
+				// Handle other types of objects.
+				$data = (array) $data;
+			}
+		}
+
+		// Process the input data.
+		foreach ($data as $k => $v)
+		{
+			$level = $group ? $group . '.' . $k : $k;
+
+			if ($this->findField($k, $group))
+			{
+				// If the field exists set the value.
+				$this->data->set($level, $v);
+			}
+			elseif (is_object($v) || ArrayHelper::isAssociative($v))
+			{
+				// If the value is an object or an associative array, hand it off to the recursive bind level method.
+				$this->bindLevel($level, $v);
+			}
+		}
+	}
+
+	/**
+	 * Method to filter the form data.
+	 *
+	 * @param   array   $data   An array of field values to filter.
+	 * @param   string  $group  The dot-separated form group path on which to filter the fields.
+	 *
+	 * @return  mixed  Array or false.
+	 *
+	 * @since   11.1
+	 */
+	public function filter($data, $group = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		$input = new Registry($data);
+		$output = new Registry;
+
+		// Get the fields for which to filter the data.
+		$fields = $this->findFieldsByGroup($group);
+
+		if (!$fields)
+		{
+			// PANIC!
+			return false;
+		}
+
+		// Filter the fields.
+		foreach ($fields as $field)
+		{
+			$name = (string) $field['name'];
+
+			// Get the field groups for the element.
+			$attrs = $field->xpath('ancestor::fields[@name]/@name');
+			$groups = array_map('strval', $attrs ? $attrs : array());
+			$group = implode('.', $groups);
+
+			$key = $group ? $group . '.' . $name : $name;
+
+			// Filter the value if it exists.
+			if ($input->exists($key))
+			{
+				$output->set($key, $this->filterField($field, $input->get($key, (string) $field['default'])));
+			}
+		}
+
+		return $output->toArray();
+	}
+
+	/**
+	 * Return all errors, if any.
+	 *
+	 * @return  array  Array of error messages or RuntimeException objects.
+	 *
+	 * @since   11.1
+	 */
+	public function getErrors()
+	{
+		return $this->errors;
+	}
+
+	/**
+	 * Method to get a form field represented as a JFormField object.
+	 *
+	 * @param   string  $name   The name of the form field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 * @param   mixed   $value  The optional value to use as the default for the field.
+	 *
+	 * @return  \JFormField|boolean  The JFormField object for the field or boolean false on error.
+	 *
+	 * @since   11.1
+	 */
+	public function getField($name, $group = null, $value = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Attempt to find the field by name and group.
+		$element = $this->findField($name, $group);
+
+		// If the field element was not found return false.
+		if (!$element)
+		{
+			return false;
+		}
+
+		return $this->loadField($element, $group, $value);
+	}
+
+	/**
+	 * Method to get an attribute value from a field XML element.  If the attribute doesn't exist or
+	 * is null then the optional default value will be used.
+	 *
+	 * @param   string  $name       The name of the form field for which to get the attribute value.
+	 * @param   string  $attribute  The name of the attribute for which to get a value.
+	 * @param   mixed   $default    The optional default value to use if no attribute value exists.
+	 * @param   string  $group      The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  mixed  The attribute value for the field.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function getFieldAttribute($name, $attribute, $default = null, $group = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			throw new \UnexpectedValueException(sprintf('%s::getFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Find the form field element from the definition.
+		$element = $this->findField($name, $group);
+
+		// If the element exists and the attribute exists for the field return the attribute value.
+		if (($element instanceof \SimpleXMLElement) && strlen((string) $element[$attribute]))
+		{
+			return (string) $element[$attribute];
+		}
+
+		// Otherwise return the given default value.
+		else
+		{
+			return $default;
+		}
+	}
+
+	/**
+	 * Method to get an array of JFormField objects in a given fieldset by name.  If no name is
+	 * given then all fields are returned.
+	 *
+	 * @param   string  $set  The optional name of the fieldset.
+	 *
+	 * @return  array  The array of JFormField objects in the fieldset.
+	 *
+	 * @since   11.1
+	 */
+	public function getFieldset($set = null)
+	{
+		$fields = array();
+
+		// Get all of the field elements in the fieldset.
+		if ($set)
+		{
+			$elements = $this->findFieldsByFieldset($set);
+		}
+
+		// Get all fields.
+		else
+		{
+			$elements = $this->findFieldsByGroup();
+		}
+
+		// If no field elements were found return empty.
+		if (empty($elements))
+		{
+			return $fields;
+		}
+
+		// Build the result array from the found field elements.
+		foreach ($elements as $element)
+		{
+			// Get the field groups for the element.
+			$attrs = $element->xpath('ancestor::fields[@name]/@name');
+			$groups = array_map('strval', $attrs ? $attrs : array());
+			$group = implode('.', $groups);
+
+			// If the field is successfully loaded add it to the result array.
+			if ($field = $this->loadField($element, $group))
+			{
+				$fields[$field->id] = $field;
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get an array of fieldset objects optionally filtered over a given field group.
+	 *
+	 * @param   string  $group  The dot-separated form group path on which to filter the fieldsets.
+	 *
+	 * @return  array  The array of fieldset objects.
+	 *
+	 * @since   11.1
+	 */
+	public function getFieldsets($group = null)
+	{
+		$fieldsets = array();
+		$sets = array();
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return $fieldsets;
+		}
+
+		if ($group)
+		{
+			// Get the fields elements for a given group.
+			$elements = &$this->findGroup($group);
+
+			foreach ($elements as &$element)
+			{
+				// Get an array of <fieldset /> elements and fieldset attributes within the fields element.
+				if ($tmp = $element->xpath('descendant::fieldset[@name] | descendant::field[@fieldset]/@fieldset'))
+				{
+					$sets = array_merge($sets, (array) $tmp);
+				}
+			}
+		}
+		else
+		{
+			// Get an array of <fieldset /> elements and fieldset attributes.
+			$sets = $this->xml->xpath('//fieldset[@name and not(ancestor::field/form/*)] | //field[@fieldset and not(ancestor::field/form/*)]/@fieldset');
+		}
+
+		// If no fieldsets are found return empty.
+		if (empty($sets))
+		{
+			return $fieldsets;
+		}
+
+		// Process each found fieldset.
+		foreach ($sets as $set)
+		{
+			if ((string) $set['hidden'] == 'true')
+			{
+				continue;
+			}
+
+			// Are we dealing with a fieldset element?
+			if ((string) $set['name'])
+			{
+				// Only create it if it doesn't already exist.
+				if (empty($fieldsets[(string) $set['name']]))
+				{
+					// Build the fieldset object.
+					$fieldset = (object) array('name' => '', 'label' => '', 'description' => '');
+
+					foreach ($set->attributes() as $name => $value)
+					{
+						$fieldset->$name = (string) $value;
+					}
+
+					// Add the fieldset object to the list.
+					$fieldsets[$fieldset->name] = $fieldset;
+				}
+			}
+
+			// Must be dealing with a fieldset attribute.
+			else
+			{
+				// Only create it if it doesn't already exist.
+				if (empty($fieldsets[(string) $set]))
+				{
+					// Attempt to get the fieldset element for data (throughout the entire form document).
+					$tmp = $this->xml->xpath('//fieldset[@name="' . (string) $set . '"]');
+
+					// If no element was found, build a very simple fieldset object.
+					if (empty($tmp))
+					{
+						$fieldset = (object) array('name' => (string) $set, 'label' => '', 'description' => '');
+					}
+
+					// Build the fieldset object from the element.
+					else
+					{
+						$fieldset = (object) array('name' => '', 'label' => '', 'description' => '');
+
+						foreach ($tmp[0]->attributes() as $name => $value)
+						{
+							$fieldset->$name = (string) $value;
+						}
+					}
+
+					// Add the fieldset object to the list.
+					$fieldsets[$fieldset->name] = $fieldset;
+				}
+			}
+		}
+
+		return $fieldsets;
+	}
+
+	/**
+	 * Method to get the form control. This string serves as a container for all form fields. For
+	 * example, if there is a field named 'foo' and a field named 'bar' and the form control is
+	 * empty the fields will be rendered like: `<input name="foo" />` and `<input name="bar" />`.  If
+	 * the form control is set to 'joomla' however, the fields would be rendered like:
+	 * `<input name="joomla[foo]" />` and `<input name="joomla[bar]" />`.
+	 *
+	 * @return  string  The form control string.
+	 *
+	 * @since   11.1
+	 */
+	public function getFormControl()
+	{
+		return (string) $this->options['control'];
+	}
+
+	/**
+	 * Method to get an array of JFormField objects in a given field group by name.
+	 *
+	 * @param   string   $group   The dot-separated form group path for which to get the form fields.
+	 * @param   boolean  $nested  True to also include fields in nested groups that are inside of the
+	 *                            group for which to find fields.
+	 *
+	 * @return  array    The array of JFormField objects in the field group.
+	 *
+	 * @since   11.1
+	 */
+	public function getGroup($group, $nested = false)
+	{
+		$fields = array();
+
+		// Get all of the field elements in the field group.
+		$elements = $this->findFieldsByGroup($group, $nested);
+
+		// If no field elements were found return empty.
+		if (empty($elements))
+		{
+			return $fields;
+		}
+
+		// Build the result array from the found field elements.
+		foreach ($elements as $element)
+		{
+			// Get the field groups for the element.
+			$attrs  = $element->xpath('ancestor::fields[@name]/@name');
+			$groups = array_map('strval', $attrs ? $attrs : array());
+			$group  = implode('.', $groups);
+
+			// If the field is successfully loaded add it to the result array.
+			if ($field = $this->loadField($element, $group))
+			{
+				$fields[$field->id] = $field;
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get a form field markup for the field input.
+	 *
+	 * @param   string  $name   The name of the form field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 * @param   mixed   $value  The optional value to use as the default for the field.
+	 *
+	 * @return  string  The form field markup.
+	 *
+	 * @since   11.1
+	 */
+	public function getInput($name, $group = null, $value = null)
+	{
+		// Attempt to get the form field.
+		if ($field = $this->getField($name, $group, $value))
+		{
+			return $field->input;
+		}
+
+		return '';
+	}
+
+	/**
+	 * Method to get the label for a field input.
+	 *
+	 * @param   string  $name   The name of the form field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  string  The form field label.
+	 *
+	 * @since   11.1
+	 */
+	public function getLabel($name, $group = null)
+	{
+		// Attempt to get the form field.
+		if ($field = $this->getField($name, $group))
+		{
+			return $field->label;
+		}
+
+		return '';
+	}
+
+	/**
+	 * Method to get the form name.
+	 *
+	 * @return  string  The name of the form.
+	 *
+	 * @since   11.1
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Method to get the value of a field.
+	 *
+	 * @param   string  $name     The name of the field for which to get the value.
+	 * @param   string  $group    The optional dot-separated form group path on which to get the value.
+	 * @param   mixed   $default  The optional default value of the field value is empty.
+	 *
+	 * @return  mixed  The value of the field or the default value if empty.
+	 *
+	 * @since   11.1
+	 */
+	public function getValue($name, $group = null, $default = null)
+	{
+		// If a group is set use it.
+		if ($group)
+		{
+			$return = $this->data->get($group . '.' . $name, $default);
+		}
+		else
+		{
+			$return = $this->data->get($name, $default);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get a control group with label and input.
+	 *
+	 * @param   string  $name     The name of the field for which to get the value.
+	 * @param   string  $group    The optional dot-separated form group path on which to get the value.
+	 * @param   mixed   $default  The optional default value of the field value is empty.
+	 *
+	 * @return  string  A string containing the html for the control goup
+	 *
+	 * @since      3.2
+	 * @deprecated 3.2.3  Use renderField() instead of getControlGroup
+	 */
+	public function getControlGroup($name, $group = null, $default = null)
+	{
+		\JLog::add('Form->getControlGroup() is deprecated use Form->renderField().', \JLog::WARNING, 'deprecated');
+
+		return $this->renderField($name, $group, $default);
+	}
+
+	/**
+	 * Method to get all control groups with label and input of a fieldset.
+	 *
+	 * @param   string  $name  The name of the fieldset for which to get the values.
+	 *
+	 * @return  string  A string containing the html for the control goups
+	 *
+	 * @since      3.2
+	 * @deprecated 3.2.3 Use renderFieldset() instead of getControlGroups
+	 */
+	public function getControlGroups($name)
+	{
+		\JLog::add('Form->getControlGroups() is deprecated use Form->renderFieldset().', \JLog::WARNING, 'deprecated');
+
+		return $this->renderFieldset($name);
+	}
+
+	/**
+	 * Method to get a control group with label and input.
+	 *
+	 * @param   string  $name     The name of the field for which to get the value.
+	 * @param   string  $group    The optional dot-separated form group path on which to get the value.
+	 * @param   mixed   $default  The optional default value of the field value is empty.
+	 * @param   array   $options  Any options to be passed into the rendering of the field
+	 *
+	 * @return  string  A string containing the html for the control goup
+	 *
+	 * @since   3.2.3
+	 */
+	public function renderField($name, $group = null, $default = null, $options = array())
+	{
+		$field = $this->getField($name, $group, $default);
+
+		if ($field)
+		{
+			return $field->renderField($options);
+		}
+
+		return '';
+	}
+
+	/**
+	 * Method to get all control groups with label and input of a fieldset.
+	 *
+	 * @param   string  $name     The name of the fieldset for which to get the values.
+	 * @param   array   $options  Any options to be passed into the rendering of the field
+	 *
+	 * @return  string  A string containing the html for the control goups
+	 *
+	 * @since   3.2.3
+	 */
+	public function renderFieldset($name, $options = array())
+	{
+		$fields = $this->getFieldset($name);
+		$html = array();
+
+		foreach ($fields as $field)
+		{
+			$html[] = $field->renderField($options);
+		}
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Method to load the form description from an XML string or object.
+	 *
+	 * The replace option works per field.  If a field being loaded already exists in the current
+	 * form definition then the behavior or load will vary depending upon the replace flag.  If it
+	 * is set to true, then the existing field will be replaced in its exact location by the new
+	 * field being loaded.  If it is false, then the new field being loaded will be ignored and the
+	 * method will move on to the next field to load.
+	 *
+	 * @param   string  $data     The name of an XML string or object.
+	 * @param   string  $replace  Flag to toggle whether form fields should be replaced if a field
+	 *                            already exists with the same group/name.
+	 * @param   string  $xpath    An optional xpath to search for the fields.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function load($data, $replace = true, $xpath = false)
+	{
+		// If the data to load isn't already an XML element or string return false.
+		if ((!($data instanceof \SimpleXMLElement)) && (!is_string($data)))
+		{
+			return false;
+		}
+
+		// Attempt to load the XML if a string.
+		if (is_string($data))
+		{
+			try
+			{
+				$data = new \SimpleXMLElement($data);
+			}
+			catch (\Exception $e)
+			{
+				return false;
+			}
+
+			// Make sure the XML loaded correctly.
+			if (!$data)
+			{
+				return false;
+			}
+		}
+
+		// If we have no XML definition at this point let's make sure we get one.
+		if (empty($this->xml))
+		{
+			// If no XPath query is set to search for fields, and we have a <form />, set it and return.
+			if (!$xpath && ($data->getName() == 'form'))
+			{
+				$this->xml = $data;
+
+				// Synchronize any paths found in the load.
+				$this->syncPaths();
+
+				return true;
+			}
+
+			// Create a root element for the form.
+			else
+			{
+				$this->xml = new \SimpleXMLElement('<form></form>');
+			}
+		}
+
+		// Get the XML elements to load.
+		$elements = array();
+
+		if ($xpath)
+		{
+			$elements = $data->xpath($xpath);
+		}
+		elseif ($data->getName() == 'form')
+		{
+			$elements = $data->children();
+		}
+
+		// If there is nothing to load return true.
+		if (empty($elements))
+		{
+			return true;
+		}
+
+		// Load the found form elements.
+		foreach ($elements as $element)
+		{
+			// Get an array of fields with the correct name.
+			$fields = $element->xpath('descendant-or-self::field');
+
+			foreach ($fields as $field)
+			{
+				// Get the group names as strings for ancestor fields elements.
+				$attrs = $field->xpath('ancestor::fields[@name]/@name');
+				$groups = array_map('strval', $attrs ? $attrs : array());
+
+				// Check to see if the field exists in the current form.
+				if ($current = $this->findField((string) $field['name'], implode('.', $groups)))
+				{
+					// If set to replace found fields, replace the data and remove the field so we don't add it twice.
+					if ($replace)
+					{
+						$olddom = dom_import_simplexml($current);
+						$loadeddom = dom_import_simplexml($field);
+						$addeddom = $olddom->ownerDocument->importNode($loadeddom, true);
+						$olddom->parentNode->replaceChild($addeddom, $olddom);
+						$loadeddom->parentNode->removeChild($loadeddom);
+					}
+					else
+					{
+						unset($field);
+					}
+				}
+			}
+
+			// Merge the new field data into the existing XML document.
+			self::addNode($this->xml, $element);
+		}
+
+		// Synchronize any paths found in the load.
+		$this->syncPaths();
+
+		return true;
+	}
+
+	/**
+	 * Method to load the form description from an XML file.
+	 *
+	 * The reset option works on a group basis. If the XML file references
+	 * groups that have already been created they will be replaced with the
+	 * fields in the new XML file unless the $reset parameter has been set
+	 * to false.
+	 *
+	 * @param   string  $file   The filesystem path of an XML file.
+	 * @param   string  $reset  Flag to toggle whether form fields should be replaced if a field
+	 *                          already exists with the same group/name.
+	 * @param   string  $xpath  An optional xpath to search for the fields.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function loadFile($file, $reset = true, $xpath = false)
+	{
+		// Check to see if the path is an absolute path.
+		if (!is_file($file))
+		{
+			// Not an absolute path so let's attempt to find one using JPath.
+			$file = \JPath::find(self::addFormPath(), strtolower($file) . '.xml');
+
+			// If unable to find the file return false.
+			if (!$file)
+			{
+				return false;
+			}
+		}
+
+		// Attempt to load the XML file.
+		$xml = simplexml_load_file($file);
+
+		return $this->load($xml, $reset, $xpath);
+	}
+
+	/**
+	 * Method to remove a field from the form definition.
+	 *
+	 * @param   string  $name   The name of the form field for which remove.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function removeField($name, $group = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			throw new \UnexpectedValueException(sprintf('%s::removeField `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Find the form field element from the definition.
+		$element = $this->findField($name, $group);
+
+		// If the element exists remove it from the form definition.
+		if ($element instanceof \SimpleXMLElement)
+		{
+			$dom = dom_import_simplexml($element);
+			$dom->parentNode->removeChild($dom);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to remove a group from the form definition.
+	 *
+	 * @param   string  $group  The dot-separated form group path for the group to remove.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function removeGroup($group)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			throw new \UnexpectedValueException(sprintf('%s::removeGroup `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Get the fields elements for a given group.
+		$elements = &$this->findGroup($group);
+
+		foreach ($elements as &$element)
+		{
+			$dom = dom_import_simplexml($element);
+			$dom->parentNode->removeChild($dom);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to reset the form data store and optionally the form XML definition.
+	 *
+	 * @param   boolean  $xml  True to also reset the XML form definition.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function reset($xml = false)
+	{
+		unset($this->data);
+		$this->data = new Registry;
+
+		if ($xml)
+		{
+			unset($this->xml);
+			$this->xml = new \SimpleXMLElement('<form></form>');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to set a field XML element to the form definition.  If the replace flag is set then
+	 * the field will be set whether it already exists or not.  If it isn't set, then the field
+	 * will not be replaced if it already exists.
+	 *
+	 * @param   \SimpleXMLElement  $element   The XML element object representation of the form field.
+	 * @param   string             $group     The optional dot-separated form group path on which to set the field.
+	 * @param   boolean            $replace   True to replace an existing field if one already exists.
+	 * @param   string             $fieldset  The name of the fieldset we are adding the field to.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function setField(\SimpleXMLElement $element, $group = null, $replace = true, $fieldset = 'default')
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			throw new \UnexpectedValueException(sprintf('%s::setField `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Find the form field element from the definition.
+		$old = $this->findField((string) $element['name'], $group);
+
+		// If an existing field is found and replace flag is false do nothing and return true.
+		if (!$replace && !empty($old))
+		{
+			return true;
+		}
+
+		// If an existing field is found and replace flag is true remove the old field.
+		if ($replace && !empty($old) && ($old instanceof \SimpleXMLElement))
+		{
+			$dom = dom_import_simplexml($old);
+
+			// Get the parent element, this should be the fieldset
+			$parent   = $dom->parentNode;
+			$fieldset = $parent->getAttribute('name');
+
+			$parent->removeChild($dom);
+		}
+
+		// Create the search path
+		$path = '//';
+
+		if (!empty($group))
+		{
+			$path .= 'fields[@name="' . $group . '"]/';
+		}
+
+		$path .= 'fieldset[@name="' . $fieldset . '"]';
+
+		$fs = $this->xml->xpath($path);
+
+		if (isset($fs[0]) && ($fs[0] instanceof \SimpleXMLElement))
+		{
+			// Add field to the form.
+			self::addNode($fs[0], $element);
+
+			// Synchronize any paths found in the load.
+			$this->syncPaths();
+
+			return true;
+		}
+
+		// We couldn't find a fieldset to add the field. Now we are checking, if we have set only a group
+		if (!empty($group))
+		{
+			$fields = &$this->findGroup($group);
+
+			// If an appropriate fields element was found for the group, add the element.
+			if (isset($fields[0]) && ($fields[0] instanceof \SimpleXMLElement))
+			{
+				self::addNode($fields[0], $element);
+			}
+
+			// Synchronize any paths found in the load.
+			$this->syncPaths();
+
+			return true;
+		}
+
+		// We couldn't find a parent so we are adding it at root level
+
+		// Add field to the form.
+		self::addNode($this->xml, $element);
+
+		// Synchronize any paths found in the load.
+		$this->syncPaths();
+
+		return true;
+	}
+
+	/**
+	 * Method to set an attribute value for a field XML element.
+	 *
+	 * @param   string  $name       The name of the form field for which to set the attribute value.
+	 * @param   string  $attribute  The name of the attribute for which to set a value.
+	 * @param   mixed   $value      The value to set for the attribute.
+	 * @param   string  $group      The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function setFieldAttribute($name, $attribute, $value, $group = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			throw new \UnexpectedValueException(sprintf('%s::setFieldAttribute `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Find the form field element from the definition.
+		$element = $this->findField($name, $group);
+
+		// If the element doesn't exist return false.
+		if (!($element instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Otherwise set the attribute and return true.
+		else
+		{
+			$element[$attribute] = $value;
+
+			// Synchronize any paths found in the load.
+			$this->syncPaths();
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to set some field XML elements to the form definition.  If the replace flag is set then
+	 * the fields will be set whether they already exists or not.  If it isn't set, then the fields
+	 * will not be replaced if they already exist.
+	 *
+	 * @param   array    &$elements  The array of XML element object representations of the form fields.
+	 * @param   string   $group      The optional dot-separated form group path on which to set the fields.
+	 * @param   boolean  $replace    True to replace existing fields if they already exist.
+	 * @param   string   $fieldset   The name of the fieldset we are adding the field to.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function setFields(&$elements, $group = null, $replace = true, $fieldset = 'default')
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			throw new \UnexpectedValueException(sprintf('%s::setFields `xml` is not an instance of SimpleXMLElement', get_class($this)));
+		}
+
+		// Make sure the elements to set are valid.
+		foreach ($elements as $element)
+		{
+			if (!($element instanceof \SimpleXMLElement))
+			{
+				throw new \UnexpectedValueException(sprintf('$element not SimpleXMLElement in %s::setFields', get_class($this)));
+			}
+		}
+
+		// Set the fields.
+		$return = true;
+
+		foreach ($elements as $element)
+		{
+			if (!$this->setField($element, $group, $replace, $fieldset))
+			{
+				$return = false;
+			}
+		}
+
+		// Synchronize any paths found in the load.
+		$this->syncPaths();
+
+		return $return;
+	}
+
+	/**
+	 * Method to set the value of a field. If the field does not exist in the form then the method
+	 * will return false.
+	 *
+	 * @param   string  $name   The name of the field for which to set the value.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 * @param   mixed   $value  The value to set for the field.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function setValue($name, $group = null, $value = null)
+	{
+		// If the field does not exist return false.
+		if (!$this->findField($name, $group))
+		{
+			return false;
+		}
+
+		// If a group is set use it.
+		if ($group)
+		{
+			$this->data->set($group . '.' . $name, $value);
+		}
+		else
+		{
+			$this->data->set($name, $value);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to validate form data.
+	 *
+	 * Validation warnings will be pushed into JForm::errors and should be
+	 * retrieved with JForm::getErrors() when validate returns boolean false.
+	 *
+	 * @param   array   $data   An array of field values to validate.
+	 * @param   string  $group  The optional dot-separated form group path on which to filter the
+	 *                          fields to be validated.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function validate($data, $group = null)
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		$return = true;
+
+		// Create an input registry object from the data to validate.
+		$input = new Registry($data);
+
+		// Get the fields for which to validate the data.
+		$fields = $this->findFieldsByGroup($group);
+
+		if (!$fields)
+		{
+			// PANIC!
+			return false;
+		}
+
+		// Validate the fields.
+		foreach ($fields as $field)
+		{
+			$value = null;
+			$name = (string) $field['name'];
+
+			// Get the group names as strings for ancestor fields elements.
+			$attrs = $field->xpath('ancestor::fields[@name]/@name');
+			$groups = array_map('strval', $attrs ? $attrs : array());
+			$group = implode('.', $groups);
+
+			// Get the value from the input data.
+			if ($group)
+			{
+				$value = $input->get($group . '.' . $name);
+			}
+			else
+			{
+				$value = $input->get($name);
+			}
+
+			// Validate the field.
+			$valid = $this->validateField($field, $group, $value, $input);
+
+			// Check for an error.
+			if ($valid instanceof \Exception)
+			{
+				$this->errors[] = $valid;
+				$return         = false;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to apply an input filter to a value based on field data.
+	 *
+	 * @param   string  $element  The XML element object representation of the form field.
+	 * @param   mixed   $value    The value to filter for the field.
+	 *
+	 * @return  mixed   The filtered value.
+	 *
+	 * @since   11.1
+	 */
+	protected function filterField($element, $value)
+	{
+		// Make sure there is a valid SimpleXMLElement.
+		if (!($element instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Get the field filter type.
+		$filter = (string) $element['filter'];
+
+		// Process the input value based on the filter.
+		$return = null;
+
+		switch (strtoupper($filter))
+		{
+			// Access Control Rules.
+			case 'RULES':
+				$return = array();
+
+				foreach ((array) $value as $action => $ids)
+				{
+					// Build the rules array.
+					$return[$action] = array();
+
+					foreach ($ids as $id => $p)
+					{
+						if ($p !== '')
+						{
+							$return[$action][$id] = ($p == '1' || $p == 'true') ? true : false;
+						}
+					}
+				}
+				break;
+
+			// Do nothing, thus leaving the return value as null.
+			case 'UNSET':
+				break;
+
+			// No Filter.
+			case 'RAW':
+				$return = $value;
+				break;
+
+			// Filter the input as an array of integers.
+			case 'INT_ARRAY':
+				// Make sure the input is an array.
+				if (is_object($value))
+				{
+					$value = get_object_vars($value);
+				}
+
+				$value = is_array($value) ? $value : array($value);
+
+				$value = ArrayHelper::toInteger($value);
+				$return = $value;
+				break;
+
+			// Filter safe HTML.
+			case 'SAFEHTML':
+				$return = \JFilterInput::getInstance(null, null, 1, 1)->clean($value, 'html');
+				break;
+
+			// Convert a date to UTC based on the server timezone offset.
+			case 'SERVER_UTC':
+				if ((int) $value > 0)
+				{
+					// Check if we have a localised date format
+					$translateFormat = (string) $element['translateformat'];
+
+					if ($translateFormat && $translateFormat != 'false')
+					{
+						$showTime = (string) $element['showtime'];
+						$showTime = ($showTime && $showTime != 'false');
+						$format   = ($showTime) ? \JText::_('DATE_FORMAT_FILTER_DATETIME') : \JText::_('DATE_FORMAT_FILTER_DATE');
+						$date     = date_parse_from_format($format, $value);
+						$value    = (int) $date['year'] . '-' . (int) $date['month'] . '-' . (int) $date['day'];
+
+						if ($showTime)
+						{
+							$value .= ' ' . (int) $date['hour'] . ':' . (int) $date['minute'] . ':' . (int) $date['second'];
+						}
+					}
+
+					// Get the server timezone setting.
+					$offset = \JFactory::getConfig()->get('offset');
+
+					// Return an SQL formatted datetime string in UTC.
+					try
+					{
+						$return = \JFactory::getDate($value, $offset)->toSql();
+					}
+					catch (\Exception $e)
+					{
+						\JFactory::getApplication()->enqueueMessage(
+							\JText::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', \JText::_((string) $element['label'])),
+							'warning'
+						);
+
+						$return = '';
+					}
+				}
+				else
+				{
+					$return = '';
+				}
+				break;
+
+			// Convert a date to UTC based on the user timezone offset.
+			case 'USER_UTC':
+				if ((int) $value > 0)
+				{
+					// Check if we have a localised date format
+					$translateFormat = (string) $element['translateformat'];
+
+					if ($translateFormat && $translateFormat != 'false')
+					{
+						$showTime = (string) $element['showtime'];
+						$showTime = ($showTime && $showTime != 'false');
+						$format   = ($showTime) ? \JText::_('DATE_FORMAT_FILTER_DATETIME') : \JText::_('DATE_FORMAT_FILTER_DATE');
+						$date     = date_parse_from_format($format, $value);
+						$value    = (int) $date['year'] . '-' . (int) $date['month'] . '-' . (int) $date['day'];
+
+						if ($showTime)
+						{
+							$value .= ' ' . (int) $date['hour'] . ':' . (int) $date['minute'] . ':' . (int) $date['second'];
+						}
+					}
+
+					// Get the user timezone setting defaulting to the server timezone setting.
+					$offset = \JFactory::getUser()->getTimezone();
+
+					// Return a MySQL formatted datetime string in UTC.
+					try
+					{
+						$return = \JFactory::getDate($value, $offset)->toSql();
+					}
+					catch (\Exception $e)
+					{
+						\JFactory::getApplication()->enqueueMessage(
+							\JText::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', \JText::_((string) $element['label'])),
+							'warning'
+						);
+
+						$return = '';
+					}
+				}
+				else
+				{
+					$return = '';
+				}
+				break;
+
+			/*
+			 * Ensures a protocol is present in the saved field unless the relative flag is set.
+			 * Only use when the only permitted protocols require '://'.
+			 * See JFormRuleUrl for list of these.
+			 */
+
+			case 'URL':
+				if (empty($value))
+				{
+					return false;
+				}
+
+				// This cleans some of the more dangerous characters but leaves special characters that are valid.
+				$value = \JFilterInput::getInstance()->clean($value, 'html');
+				$value = trim($value);
+
+				// <>" are never valid in a uri see http://www.ietf.org/rfc/rfc1738.txt.
+				$value = str_replace(array('<', '>', '"'), '', $value);
+
+				// Check for a protocol
+				$protocol = parse_url($value, PHP_URL_SCHEME);
+
+				// If there is no protocol and the relative option is not specified,
+				// we assume that it is an external URL and prepend http://.
+				if (($element['type'] == 'url' && !$protocol &&  !$element['relative'])
+					|| (!$element['type'] == 'url' && !$protocol))
+				{
+					$protocol = 'http';
+
+					// If it looks like an internal link, then add the root.
+					if (substr($value, 0, 9) == 'index.php')
+					{
+						$value = \JUri::root() . $value;
+					}
+
+					// Otherwise we treat it as an external link.
+					else
+					{
+						// Put the url back together.
+						$value = $protocol . '://' . $value;
+					}
+				}
+
+				// If relative URLS are allowed we assume that URLs without protocols are internal.
+				elseif (!$protocol && $element['relative'])
+				{
+					$host = \JUri::getInstance('SERVER')->gethost();
+
+					// If it starts with the host string, just prepend the protocol.
+					if (substr($value, 0) == $host)
+					{
+						$value = 'http://' . $value;
+					}
+
+					// Otherwise if it doesn't start with "/" prepend the prefix of the current site.
+					elseif (substr($value, 0, 1) != '/')
+					{
+						$value = \JUri::root(true) . '/' . $value;
+					}
+				}
+
+				$value = \JStringPunycode::urlToPunycode($value);
+				$return = $value;
+				break;
+
+			case 'TEL':
+				$value = trim($value);
+
+				// Does it match the NANP pattern?
+				if (preg_match('/^(?:\+?1[-. ]?)?\(?([2-9][0-8][0-9])\)?[-. ]?([2-9][0-9]{2})[-. ]?([0-9]{4})$/', $value) == 1)
+				{
+					$number = (string) preg_replace('/[^\d]/', '', $value);
+
+					if (substr($number, 0, 1) == 1)
+					{
+						$number = substr($number, 1);
+					}
+
+					if (substr($number, 0, 2) == '+1')
+					{
+						$number = substr($number, 2);
+					}
+
+					$result = '1.' . $number;
+				}
+
+				// If not, does it match ITU-T?
+				elseif (preg_match('/^\+(?:[0-9] ?){6,14}[0-9]$/', $value) == 1)
+				{
+					$countrycode = substr($value, 0, strpos($value, ' '));
+					$countrycode = (string) preg_replace('/[^\d]/', '', $countrycode);
+					$number = strstr($value, ' ');
+					$number = (string) preg_replace('/[^\d]/', '', $number);
+					$result = $countrycode . '.' . $number;
+				}
+
+				// If not, does it match EPP?
+				elseif (preg_match('/^\+[0-9]{1,3}\.[0-9]{4,14}(?:x.+)?$/', $value) == 1)
+				{
+					if (strstr($value, 'x'))
+					{
+						$xpos = strpos($value, 'x');
+						$value = substr($value, 0, $xpos);
+					}
+
+					$result = str_replace('+', '', $value);
+				}
+
+				// Maybe it is already ccc.nnnnnnn?
+				elseif (preg_match('/[0-9]{1,3}\.[0-9]{4,14}$/', $value) == 1)
+				{
+					$result = $value;
+				}
+
+				// If not, can we make it a string of digits?
+				else
+				{
+					$value = (string) preg_replace('/[^\d]/', '', $value);
+
+					if ($value != null && strlen($value) <= 15)
+					{
+						$length = strlen($value);
+
+						// If it is fewer than 13 digits assume it is a local number
+						if ($length <= 12)
+						{
+							$result = '.' . $value;
+						}
+						else
+						{
+							// If it has 13 or more digits let's make a country code.
+							$cclen = $length - 12;
+							$result = substr($value, 0, $cclen) . '.' . substr($value, $cclen);
+						}
+					}
+
+					// If not let's not save anything.
+					else
+					{
+						$result = '';
+					}
+				}
+
+				$return = $result;
+
+				break;
+			default:
+				// Check for a callback filter.
+				if (strpos($filter, '::') !== false && is_callable(explode('::', $filter)))
+				{
+					$return = call_user_func(explode('::', $filter), $value);
+				}
+
+				// Filter using a callback function if specified.
+				elseif (function_exists($filter))
+				{
+					$return = call_user_func($filter, $value);
+				}
+
+				// Check for empty value and return empty string if no value is required,
+				// otherwise filter using JFilterInput. All HTML code is filtered by default.
+				else
+				{
+					$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+					if (($value === '' || $value === null) && ! $required)
+					{
+						$return = '';
+					}
+					else
+					{
+						$return = \JFilterInput::getInstance()->clean($value, $filter);
+					}
+				}
+				break;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to get a form field represented as an XML element object.
+	 *
+	 * @param   string  $name   The name of the form field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  \SimpleXMLElement|boolean  The XML element object for the field or boolean false on error.
+	 *
+	 * @since   11.1
+	 */
+	protected function findField($name, $group = null)
+	{
+		$element = false;
+		$fields = array();
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Let's get the appropriate field element based on the method arguments.
+		if ($group)
+		{
+			// Get the fields elements for a given group.
+			$elements = &$this->findGroup($group);
+
+			// Get all of the field elements with the correct name for the fields elements.
+			foreach ($elements as $el)
+			{
+				// If there are matching field elements add them to the fields array.
+				if ($tmp = $el->xpath('descendant::field[@name="' . $name . '" and not(ancestor::field/form/*)]'))
+				{
+					$fields = array_merge($fields, $tmp);
+				}
+			}
+
+			// Make sure something was found.
+			if (!$fields)
+			{
+				return false;
+			}
+
+			// Use the first correct match in the given group.
+			$groupNames = explode('.', $group);
+
+			foreach ($fields as &$field)
+			{
+				// Get the group names as strings for ancestor fields elements.
+				$attrs = $field->xpath('ancestor::fields[@name]/@name');
+				$names = array_map('strval', $attrs ? $attrs : array());
+
+				// If the field is in the exact group use it and break out of the loop.
+				if ($names == (array) $groupNames)
+				{
+					$element = &$field;
+					break;
+				}
+			}
+		}
+		else
+		{
+			// Get an array of fields with the correct name.
+			$fields = $this->xml->xpath('//field[@name="' . $name . '" and not(ancestor::field/form/*)]');
+
+			// Make sure something was found.
+			if (!$fields)
+			{
+				return false;
+			}
+
+			// Search through the fields for the right one.
+			foreach ($fields as &$field)
+			{
+				// If we find an ancestor fields element with a group name then it isn't what we want.
+				if ($field->xpath('ancestor::fields[@name]'))
+				{
+					continue;
+				}
+
+				// Found it!
+				else
+				{
+					$element = &$field;
+					break;
+				}
+			}
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Method to get an array of `<field>` elements from the form XML document which are in a specified fieldset by name.
+	 *
+	 * @param   string  $name  The name of the fieldset.
+	 *
+	 * @return  \SimpleXMLElement[]|boolean  Boolean false on error or array of SimpleXMLElement objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function &findFieldsByFieldset($name)
+	{
+		$false = false;
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return $false;
+		}
+
+		/*
+		 * Get an array of <field /> elements that are underneath a <fieldset /> element
+		 * with the appropriate name attribute, and also any <field /> elements with
+		 * the appropriate fieldset attribute. To allow repeatable elements only fields
+		 * which are not descendants of other fields are selected.
+		 */
+		$fields = $this->xml->xpath('(//fieldset[@name="' . $name . '"]//field | //field[@fieldset="' . $name . '"])[not(ancestor::field)]');
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get an array of `<field>` elements from the form XML document which are in a control group by name.
+	 *
+	 * @param   mixed    $group   The optional dot-separated form group path on which to find the fields.
+	 *                            Null will return all fields. False will return fields not in a group.
+	 * @param   boolean  $nested  True to also include fields in nested groups that are inside of the
+	 *                            group for which to find fields.
+	 *
+	 * @return  \SimpleXMLElement[]|boolean  Boolean false on error or array of SimpleXMLElement objects.
+	 *
+	 * @since   11.1
+	 */
+	protected function &findFieldsByGroup($group = null, $nested = false)
+	{
+		$false = false;
+		$fields = array();
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return $false;
+		}
+
+		// Get only fields in a specific group?
+		if ($group)
+		{
+			// Get the fields elements for a given group.
+			$elements = &$this->findGroup($group);
+
+			// Get all of the field elements for the fields elements.
+			foreach ($elements as $element)
+			{
+				// If there are field elements add them to the return result.
+				if ($tmp = $element->xpath('descendant::field'))
+				{
+					// If we also want fields in nested groups then just merge the arrays.
+					if ($nested)
+					{
+						$fields = array_merge($fields, $tmp);
+					}
+
+					// If we want to exclude nested groups then we need to check each field.
+					else
+					{
+						$groupNames = explode('.', $group);
+
+						foreach ($tmp as $field)
+						{
+							// Get the names of the groups that the field is in.
+							$attrs = $field->xpath('ancestor::fields[@name]/@name');
+							$names = array_map('strval', $attrs ? $attrs : array());
+
+							// If the field is in the specific group then add it to the return list.
+							if ($names == (array) $groupNames)
+							{
+								$fields = array_merge($fields, array($field));
+							}
+						}
+					}
+				}
+			}
+		}
+		elseif ($group === false)
+		{
+			// Get only field elements not in a group.
+			$fields = $this->xml->xpath('descendant::fields[not(@name)]/field | descendant::fields[not(@name)]/fieldset/field ');
+		}
+		else
+		{
+			// Get an array of all the <field /> elements.
+			$fields = $this->xml->xpath('//field[not(ancestor::field/form/*)]');
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Method to get a form field group represented as an XML element object.
+	 *
+	 * @param   string  $group  The dot-separated form group path on which to find the group.
+	 *
+	 * @return  \SimpleXMLElement[]|boolean  An array of XML element objects for the group or boolean false on error.
+	 *
+	 * @since   11.1
+	 */
+	protected function &findGroup($group)
+	{
+		$false = false;
+		$groups = array();
+		$tmp = array();
+
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return $false;
+		}
+
+		// Make sure there is actually a group to find.
+		$group = explode('.', $group);
+
+		if (!empty($group))
+		{
+			// Get any fields elements with the correct group name.
+			$elements = $this->xml->xpath('//fields[@name="' . (string) $group[0] . '" and not(ancestor::field/form/*)]');
+
+			// Check to make sure that there are no parent groups for each element.
+			foreach ($elements as $element)
+			{
+				if (!$element->xpath('ancestor::fields[@name]'))
+				{
+					$tmp[] = $element;
+				}
+			}
+
+			// Iterate through the nested groups to find any matching form field groups.
+			for ($i = 1, $n = count($group); $i < $n; $i++)
+			{
+				// Initialise some loop variables.
+				$validNames = array_slice($group, 0, $i + 1);
+				$current = $tmp;
+				$tmp = array();
+
+				// Check to make sure that there are no parent groups for each element.
+				foreach ($current as $element)
+				{
+					// Get any fields elements with the correct group name.
+					$children = $element->xpath('descendant::fields[@name="' . (string) $group[$i] . '"]');
+
+					// For the found fields elements validate that they are in the correct groups.
+					foreach ($children as $fields)
+					{
+						// Get the group names as strings for ancestor fields elements.
+						$attrs = $fields->xpath('ancestor-or-self::fields[@name]/@name');
+						$names = array_map('strval', $attrs ? $attrs : array());
+
+						// If the group names for the fields element match the valid names at this
+						// level add the fields element.
+						if ($validNames == $names)
+						{
+							$tmp[] = $fields;
+						}
+					}
+				}
+			}
+
+			// Only include valid XML objects.
+			foreach ($tmp as $element)
+			{
+				if ($element instanceof \SimpleXMLElement)
+				{
+					$groups[] = $element;
+				}
+			}
+		}
+
+		return $groups;
+	}
+
+	/**
+	 * Method to load, setup and return a JFormField object based on field data.
+	 *
+	 * @param   string  $element  The XML element object representation of the form field.
+	 * @param   string  $group    The optional dot-separated form group path on which to find the field.
+	 * @param   mixed   $value    The optional value to use as the default for the field.
+	 *
+	 * @return  \JFormField|boolean  The JFormField object for the field or boolean false on error.
+	 *
+	 * @since   11.1
+	 */
+	protected function loadField($element, $group = null, $value = null)
+	{
+		// Make sure there is a valid SimpleXMLElement.
+		if (!($element instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Get the field type.
+		$type = $element['type'] ? (string) $element['type'] : 'text';
+
+		// Load the JFormField object for the field.
+		$field = $this->loadFieldType($type);
+
+		// If the object could not be loaded, get a text field object.
+		if ($field === false)
+		{
+			$field = $this->loadFieldType('text');
+		}
+
+		/*
+		 * Get the value for the form field if not set.
+		 * Default to the translated version of the 'default' attribute
+		 * if 'translate_default' attribute if set to 'true' or '1'
+		 * else the value of the 'default' attribute for the field.
+		 */
+		if ($value === null)
+		{
+			$default = (string) ($element['default'] ? $element['default'] : $element->default);
+
+			if (($translate = $element['translate_default']) && ((string) $translate == 'true' || (string) $translate == '1'))
+			{
+				$lang = \JFactory::getLanguage();
+
+				if ($lang->hasKey($default))
+				{
+					$debug = $lang->setDebug(false);
+					$default = \JText::_($default);
+					$lang->setDebug($debug);
+				}
+				else
+				{
+					$default = \JText::_($default);
+				}
+			}
+
+			$value = $this->getValue((string) $element['name'], $group, $default);
+		}
+
+		// Setup the JFormField object.
+		$field->setForm($this);
+
+		if ($field->setup($element, $value, $group))
+		{
+			return $field;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Proxy for {@link FormHelper::loadFieldType()}.
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  FormField|boolean  FormField object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	protected function loadFieldType($type, $new = true)
+	{
+		return FormHelper::loadFieldType($type, $new);
+	}
+
+	/**
+	 * Proxy for FormHelper::loadRuleType().
+	 *
+	 * @param   string   $type  The rule type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  FormRule|boolean  FormRule object on success, false otherwise.
+	 *
+	 * @see     FormHelper::loadRuleType()
+	 * @since   11.1
+	 */
+	protected function loadRuleType($type, $new = true)
+	{
+		return FormHelper::loadRuleType($type, $new);
+	}
+
+	/**
+	 * Method to synchronize any field, form or rule paths contained in the XML document.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @todo    Maybe we should receive all addXXXpaths attributes at once?
+	 */
+	protected function syncPaths()
+	{
+		// Make sure there is a valid JForm XML document.
+		if (!($this->xml instanceof \SimpleXMLElement))
+		{
+			return false;
+		}
+
+		// Get any addfieldpath attributes from the form definition.
+		$paths = $this->xml->xpath('//*[@addfieldpath]/@addfieldpath');
+		$paths = array_map('strval', $paths ? $paths : array());
+
+		// Add the field paths.
+		foreach ($paths as $path)
+		{
+			$path = JPATH_ROOT . '/' . ltrim($path, '/\\');
+			self::addFieldPath($path);
+		}
+
+		// Get any addformpath attributes from the form definition.
+		$paths = $this->xml->xpath('//*[@addformpath]/@addformpath');
+		$paths = array_map('strval', $paths ? $paths : array());
+
+		// Add the form paths.
+		foreach ($paths as $path)
+		{
+			$path = JPATH_ROOT . '/' . ltrim($path, '/\\');
+			self::addFormPath($path);
+		}
+
+		// Get any addrulepath attributes from the form definition.
+		$paths = $this->xml->xpath('//*[@addrulepath]/@addrulepath');
+		$paths = array_map('strval', $paths ? $paths : array());
+
+		// Add the rule paths.
+		foreach ($paths as $path)
+		{
+			$path = JPATH_ROOT . '/' . ltrim($path, '/\\');
+			self::addRulePath($path);
+		}
+
+		// Get any addfieldprefix attributes from the form definition.
+		$prefixes = $this->xml->xpath('//*[@addfieldprefix]/@addfieldprefix');
+		$prefixes = array_map('strval', $prefixes ? $prefixes : array());
+
+		// Add the field prefixes.
+		foreach ($prefixes as $prefix)
+		{
+			FormHelper::addFieldPrefix($prefix);
+		}
+
+		// Get any addformprefix attributes from the form definition.
+		$prefixes = $this->xml->xpath('//*[@addformprefix]/@addformprefix');
+		$prefixes = array_map('strval', $prefixes ? $prefixes : array());
+
+		// Add the field prefixes.
+		foreach ($prefixes as $prefix)
+		{
+			FormHelper::addFormPrefix($prefix);
+		}
+
+		// Get any addruleprefix attributes from the form definition.
+		$prefixes = $this->xml->xpath('//*[@addruleprefix]/@addruleprefix');
+		$prefixes = array_map('strval', $prefixes ? $prefixes : array());
+
+		// Add the field prefixes.
+		foreach ($prefixes as $prefix)
+		{
+			FormHelper::addRulePrefix($prefix);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to validate a JFormField object based on field data.
+	 *
+	 * @param   \SimpleXMLElement  $element  The XML element object representation of the form field.
+	 * @param   string             $group    The optional dot-separated form group path on which to find the field.
+	 * @param   mixed              $value    The optional value to use as the default for the field.
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate
+	 *                                      against the entire form.
+	 *
+	 * @return  boolean  Boolean true if field value is valid, Exception on failure.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 * @throws  \UnexpectedValueException
+	 */
+	protected function validateField(\SimpleXMLElement $element, $group = null, $value = null, Registry $input = null)
+	{
+		$valid = true;
+
+		// Check if the field is required.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if ($required)
+		{
+			// If the field is required and the value is empty return an error message.
+			if (($value === '') || ($value === null))
+			{
+				if ($element['label'])
+				{
+					$message = \JText::_($element['label']);
+				}
+				else
+				{
+					$message = \JText::_($element['name']);
+				}
+
+				$message = \JText::sprintf('JLIB_FORM_VALIDATE_FIELD_REQUIRED', $message);
+
+				return new \RuntimeException($message);
+			}
+		}
+
+		// Get the field validation rule.
+		if ($type = (string) $element['validate'])
+		{
+			// Load the JFormRule object for the field.
+			$rule = $this->loadRuleType($type);
+
+			// If the object could not be loaded return an error message.
+			if ($rule === false)
+			{
+				throw new \UnexpectedValueException(sprintf('%s::validateField() rule `%s` missing.', get_class($this), $type));
+			}
+
+			// Run the field validation rule test.
+			$valid = $rule->test($element, $value, $group, $input, $this);
+
+			// Check for an error in the validation test.
+			if ($valid instanceof \Exception)
+			{
+				return $valid;
+			}
+		}
+
+		// Check if the field is valid.
+		if ($valid === false)
+		{
+			// Does the field have a defined error message?
+			$message = (string) $element['message'];
+
+			if ($message)
+			{
+				$message = \JText::_($element['message']);
+
+				return new \UnexpectedValueException($message);
+			}
+			else
+			{
+				$message = \JText::_($element['label']);
+				$message = \JText::sprintf('JLIB_FORM_VALIDATE_FIELD_INVALID', $message);
+
+				return new \UnexpectedValueException($message);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Proxy for {@link FormHelper::addFieldPath()}.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   11.1
+	 */
+	public static function addFieldPath($new = null)
+	{
+		return FormHelper::addFieldPath($new);
+	}
+
+	/**
+	 * Proxy for FormHelper::addFormPath().
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see     FormHelper::addFormPath()
+	 * @since   11.1
+	 */
+	public static function addFormPath($new = null)
+	{
+		return FormHelper::addFormPath($new);
+	}
+
+	/**
+	 * Proxy for FormHelper::addRulePath().
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see     FormHelper::addRulePath()
+	 * @since   11.1
+	 */
+	public static function addRulePath($new = null)
+	{
+		return FormHelper::addRulePath($new);
+	}
+
+	/**
+	 * Method to get an instance of a form.
+	 *
+	 * @param   string          $name     The name of the form.
+	 * @param   string          $data     The name of an XML file or string to load as the form definition.
+	 * @param   array           $options  An array of form options.
+	 * @param   boolean         $replace  Flag to toggle whether form fields should be replaced if a field
+	 *                                    already exists with the same group/name.
+	 * @param   string|boolean  $xpath    An optional xpath to search for the fields.
+	 *
+	 * @return  Form  JForm instance.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException if no data provided.
+	 * @throws  \RuntimeException if the form could not be loaded.
+	 */
+	public static function getInstance($name, $data = null, $options = array(), $replace = true, $xpath = false)
+	{
+		// Reference to array with form instances
+		$forms = &self::$forms;
+
+		// Only instantiate the form if it does not already exist.
+		if (!isset($forms[$name]))
+		{
+			$data = trim($data);
+
+			if (empty($data))
+			{
+				throw new \InvalidArgumentException(sprintf('%1$s(%2$s, *%3$s*)', __METHOD__, $name, gettype($data)));
+			}
+
+			// Instantiate the form.
+			$forms[$name] = new static($name, $options);
+
+			// Load the data.
+			if (substr($data, 0, 1) == '<')
+			{
+				if ($forms[$name]->load($data, $replace, $xpath) == false)
+				{
+					throw new \RuntimeException(sprintf('%s() could not load form', __METHOD__));
+				}
+			}
+			else
+			{
+				if ($forms[$name]->loadFile($data, $replace, $xpath) == false)
+				{
+					throw new \RuntimeException(sprintf('%s() could not load file', __METHOD__));
+				}
+			}
+		}
+
+		return $forms[$name];
+	}
+
+	/**
+	 * Adds a new child SimpleXMLElement node to the source.
+	 *
+	 * @param   \SimpleXMLElement  $source  The source element on which to append.
+	 * @param   \SimpleXMLElement  $new     The new element to append.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected static function addNode(\SimpleXMLElement $source, \SimpleXMLElement $new)
+	{
+		// Add the new child node.
+		$node = $source->addChild($new->getName(), htmlspecialchars(trim($new)));
+
+		// Add the attributes of the child node.
+		foreach ($new->attributes() as $name => $value)
+		{
+			$node->addAttribute($name, $value);
+		}
+
+		// Add any children of the new node.
+		foreach ($new->children() as $child)
+		{
+			self::addNode($node, $child);
+		}
+	}
+
+	/**
+	 * Update the attributes of a child node
+	 *
+	 * @param   \SimpleXMLElement  $source  The source element on which to append the attributes
+	 * @param   \SimpleXMLElement  $new     The new element to append
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected static function mergeNode(\SimpleXMLElement $source, \SimpleXMLElement $new)
+	{
+		// Update the attributes of the child node.
+		foreach ($new->attributes() as $name => $value)
+		{
+			if (isset($source[$name]))
+			{
+				$source[$name] = (string) $value;
+			}
+			else
+			{
+				$source->addAttribute($name, $value);
+			}
+		}
+	}
+
+	/**
+	 * Merges new elements into a source `<fields>` element.
+	 *
+	 * @param   \SimpleXMLElement  $source  The source element.
+	 * @param   \SimpleXMLElement  $new     The new element to merge.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected static function mergeNodes(\SimpleXMLElement $source, \SimpleXMLElement $new)
+	{
+		// The assumption is that the inputs are at the same relative level.
+		// So we just have to scan the children and deal with them.
+
+		// Update the attributes of the child node.
+		foreach ($new->attributes() as $name => $value)
+		{
+			if (isset($source[$name]))
+			{
+				$source[$name] = (string) $value;
+			}
+			else
+			{
+				$source->addAttribute($name, $value);
+			}
+		}
+
+		foreach ($new->children() as $child)
+		{
+			$type = $child->getName();
+			$name = $child['name'];
+
+			// Does this node exist?
+			$fields = $source->xpath($type . '[@name="' . $name . '"]');
+
+			if (empty($fields))
+			{
+				// This node does not exist, so add it.
+				self::addNode($source, $child);
+			}
+			else
+			{
+				// This node does exist.
+				switch ($type)
+				{
+					case 'field':
+						self::mergeNode($fields[0], $child);
+						break;
+
+					default:
+						self::mergeNodes($fields[0], $child);
+						break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns the value of an attribute of the form itself
+	 *
+	 * @param   string  $name     Name of the attribute to get
+	 * @param   mixed   $default  Optional value to return if attribute not found
+	 *
+	 * @return  mixed             Value of the attribute / default
+	 *
+	 * @since   3.2
+	 */
+	public function getAttribute($name, $default = null)
+	{
+		if ($this->xml instanceof \SimpleXMLElement)
+		{
+			$attributes = $this->xml->attributes();
+
+			// Ensure that the attribute exists
+			if (property_exists($attributes, $name))
+			{
+				$value = $attributes->$name;
+
+				if ($value !== null)
+				{
+					return (string) $value;
+				}
+			}
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Getter for the form data
+	 *
+	 * @return   Registry  Object with the data
+	 *
+	 * @since    3.2
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Method to get the XML form object
+	 *
+	 * @return  \SimpleXMLElement  The form XML object
+	 *
+	 * @since   3.2
+	 */
+	public function getXml()
+	{
+		return $this->xml;
+	}
+
+	/**
+	 * Method to get a form field represented as an XML element object.
+	 *
+	 * @param   string  $name   The name of the form field.
+	 * @param   string  $group  The optional dot-separated form group path on which to find the field.
+	 *
+	 * @return  \SimpleXMLElement|boolean  The XML element object for the field or boolean false on error.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getFieldXml($name, $group = null)
+	{
+		return $this->findField($name, $group);
+	}
+}
diff --git a/core/libraries/src/Form/FormField.php b/core/libraries/src/Form/FormField.php
new file mode 100644
index 00000000..96dd3fd3
--- /dev/null
+++ b/core/libraries/src/Form/FormField.php
@@ -0,0 +1,1079 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\String\Normalise;
+use Joomla\String\StringHelper;
+
+/**
+ * Abstract Form Field class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+abstract class FormField
+{
+	/**
+	 * The description text for the form field. Usually used in tooltips.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $description;
+
+	/**
+	 * The hint text for the form field used to display hint inside the field.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $hint;
+
+	/**
+	 * The autocomplete state for the form field.  If 'off' element will not be automatically
+	 * completed by browser.
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $autocomplete = 'on';
+
+	/**
+	 * The spellcheck state for the form field.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $spellcheck = true;
+
+	/**
+	 * The autofocus request for the form field.  If true element will be automatically
+	 * focused on document load.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $autofocus = false;
+
+	/**
+	 * The SimpleXMLElement object of the `<field>` XML element that describes the form field.
+	 *
+	 * @var    \SimpleXMLElement
+	 * @since  11.1
+	 */
+	protected $element;
+
+	/**
+	 * The Form object of the form attached to the form field.
+	 *
+	 * @var    Form
+	 * @since  11.1
+	 */
+	protected $form;
+
+	/**
+	 * The form control prefix for field names from the JForm object attached to the form field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $formControl;
+
+	/**
+	 * The hidden state for the form field.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $hidden = false;
+
+	/**
+	 * True to translate the field label string.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $translateLabel = true;
+
+	/**
+	 * True to translate the field description string.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $translateDescription = true;
+
+	/**
+	 * True to translate the field hint string.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $translateHint = true;
+
+	/**
+	 * The document id for the form field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $id;
+
+	/**
+	 * The input for the form field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $input;
+
+	/**
+	 * The label for the form field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $label;
+
+	/**
+	 * The multiple state for the form field.  If true then multiple values are allowed for the
+	 * field.  Most often used for list field types.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $multiple = false;
+
+	/**
+	 * Allows extensions to create repeat elements
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	public $repeat = false;
+
+	/**
+	 * The pattern (Reg Ex) of value of the form field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $pattern;
+
+	/**
+	 * The validation text of invalid value of the form field.
+	 *
+	 * @var    string
+	 * @since  4.0
+	 */
+	protected $validationtext;
+
+	/**
+	 * The name of the form field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $name;
+
+	/**
+	 * The name of the field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $fieldname;
+
+	/**
+	 * The group of the field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $group;
+
+	/**
+	 * The required state for the form field.  If true then there must be a value for the field to
+	 * be considered valid.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $required = false;
+
+	/**
+	 * The disabled state for the form field.  If true then the field will be disabled and user can't
+	 * interact with the field.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $disabled = false;
+
+	/**
+	 * The readonly state for the form field.  If true then the field will be readonly.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $readonly = false;
+
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type;
+
+	/**
+	 * The validation method for the form field.  This value will determine which method is used
+	 * to validate the value for a field.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $validate;
+
+	/**
+	 * The value of the form field.
+	 *
+	 * @var    mixed
+	 * @since  11.1
+	 */
+	protected $value;
+
+	/**
+	 * The default value of the form field.
+	 *
+	 * @var    mixed
+	 * @since  11.1
+	 */
+	protected $default;
+
+	/**
+	 * The size of the form field.
+	 *
+	 * @var    integer
+	 * @since  3.2
+	 */
+	protected $size;
+
+	/**
+	 * The class of the form field
+	 *
+	 * @var    mixed
+	 * @since  3.2
+	 */
+	protected $class;
+
+	/**
+	 * The label's CSS class of the form field
+	 *
+	 * @var    mixed
+	 * @since  11.1
+	 */
+	protected $labelclass;
+
+	/**
+	 * The javascript onchange of the form field.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $onchange;
+
+	/**
+	 * The javascript onclick of the form field.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $onclick;
+
+	/**
+	 * The conditions to show/hide the field.
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $showon;
+
+	/**
+	 * The count value for generated name field
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected static $count = 0;
+
+	/**
+	 * The string used for generated fields names
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected static $generated_fieldname = '__field';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout;
+
+	/**
+	 * Layout to render the form field
+	 *
+	 * @var  string
+	 */
+	protected $renderLayout = 'joomla.form.renderfield';
+
+	/**
+	 * Layout to render the label
+	 *
+	 * @var  string
+	 */
+	protected $renderLabelLayout = 'joomla.form.renderlabel';
+
+	/**
+	 * Method to instantiate the form field object.
+	 *
+	 * @param   Form  $form  The form to attach to the form field object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($form = null)
+	{
+		// If there is a form passed into the constructor set the form and form control properties.
+		if ($form instanceof Form)
+		{
+			$this->form = $form;
+			$this->formControl = $form->getFormControl();
+		}
+
+		// Detect the field type if not set
+		if (!isset($this->type))
+		{
+			$parts = Normalise::fromCamelCase(get_called_class(), true);
+
+			if ($parts[0] == 'J')
+			{
+				$this->type = StringHelper::ucfirst($parts[count($parts) - 1], '_');
+			}
+			else
+			{
+				$this->type = StringHelper::ucfirst($parts[0], '_') . StringHelper::ucfirst($parts[count($parts) - 1], '_');
+			}
+		}
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   11.1
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'description':
+			case 'hint':
+			case 'formControl':
+			case 'hidden':
+			case 'id':
+			case 'multiple':
+			case 'name':
+			case 'required':
+			case 'type':
+			case 'validate':
+			case 'value':
+			case 'class':
+			case 'layout':
+			case 'labelclass':
+			case 'size':
+			case 'onchange':
+			case 'onclick':
+			case 'fieldname':
+			case 'group':
+			case 'disabled':
+			case 'readonly':
+			case 'autofocus':
+			case 'autocomplete':
+			case 'spellcheck':
+			case 'validationtext':
+			case 'showon':
+				return $this->$name;
+
+			case 'input':
+				// If the input hasn't yet been generated, generate it.
+				if (empty($this->input))
+				{
+					$this->input = $this->getInput();
+				}
+
+				return $this->input;
+
+			case 'label':
+				// If the label hasn't yet been generated, generate it.
+				if (empty($this->label))
+				{
+					$this->label = $this->getLabel();
+				}
+
+				return $this->label;
+
+			case 'title':
+				return $this->getTitle();
+		}
+
+		return;
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function __set($name, $value)
+	{
+		switch ($name)
+		{
+			case 'class':
+				// Removes spaces from left & right and extra spaces from middle
+				$value = preg_replace('/\s+/', ' ', trim((string) $value));
+
+			case 'description':
+			case 'hint':
+			case 'value':
+			case 'labelclass':
+			case 'layout':
+			case 'onchange':
+			case 'onclick':
+			case 'validate':
+			case 'pattern':
+			case 'validationtext':
+			case 'group':
+			case 'showon':
+			case 'default':
+				$this->$name = (string) $value;
+				break;
+
+			case 'id':
+				$this->id = $this->getId((string) $value, $this->fieldname);
+				break;
+
+			case 'fieldname':
+				$this->fieldname = $this->getFieldName((string) $value);
+				break;
+
+			case 'name':
+				$this->fieldname = $this->getFieldName((string) $value);
+				$this->name = $this->getName($this->fieldname);
+				break;
+
+			case 'multiple':
+				// Allow for field classes to force the multiple values option.
+				$value = (string) $value;
+				$value = $value === '' && isset($this->forceMultiple) ? (string) $this->forceMultiple : $value;
+
+			case 'required':
+			case 'disabled':
+			case 'readonly':
+			case 'autofocus':
+			case 'hidden':
+				$value = (string) $value;
+				$this->$name = ($value === 'true' || $value === $name || $value === '1');
+				break;
+
+			case 'autocomplete':
+				$value = (string) $value;
+				$value = ($value == 'on' || $value == '') ? 'on' : $value;
+				$this->$name = ($value === 'false' || $value === 'off' || $value === '0') ? false : $value;
+				break;
+
+			case 'spellcheck':
+			case 'translateLabel':
+			case 'translateDescription':
+			case 'translateHint':
+				$value = (string) $value;
+				$this->$name = !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
+			case 'translate_label':
+				$value = (string) $value;
+				$this->translateLabel = $this->translateLabel && !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
+			case 'translate_description':
+				$value = (string) $value;
+				$this->translateDescription = $this->translateDescription && !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
+			case 'size':
+				$this->$name = (int) $value;
+				break;
+
+			default:
+				if (property_exists(__CLASS__, $name))
+				{
+					\JLog::add("Cannot access protected / private property $name of " . __CLASS__);
+				}
+				else
+				{
+					$this->$name = $value;
+				}
+		}
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   Form  $form  The JForm object to attach to the form field.
+	 *
+	 * @return  FormField  The form field object so that the method can be used in a chain.
+	 *
+	 * @since   11.1
+	 */
+	public function setForm(Form $form)
+	{
+		$this->form = $form;
+		$this->formControl = $form->getFormControl();
+
+		return $this;
+	}
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		// Make sure there is a valid JFormField XML element.
+		if ((string) $element->getName() != 'field')
+		{
+			return false;
+		}
+
+		// Reset the input and label values.
+		$this->input = null;
+		$this->label = null;
+
+		// Set the XML element object.
+		$this->element = $element;
+
+		// Set the group of the field.
+		$this->group = $group;
+
+		$attributes = array(
+			'multiple', 'name', 'id', 'hint', 'class', 'description', 'labelclass', 'onchange', 'onclick', 'validate', 'pattern', 'validationtext', 'default',
+			'required', 'disabled', 'readonly', 'autofocus', 'hidden', 'autocomplete', 'spellcheck', 'translateHint', 'translateLabel',
+			'translate_label', 'translateDescription', 'translate_description', 'size', 'showon');
+
+		$this->default = isset($element['value']) ? (string) $element['value'] : $this->default;
+
+		// Set the field default value.
+		if ($element['multiple'] && is_string($value) && is_array(json_decode($value, true)))
+		{
+			$this->value = (array) json_decode($value);
+		}
+		else 
+		{
+			$this->value = $value;
+		}
+
+		foreach ($attributes as $attributeName)
+		{
+			$this->__set($attributeName, $element[$attributeName]);
+		}
+
+		// Allow for repeatable elements
+		$repeat = (string) $element['repeat'];
+		$this->repeat = ($repeat == 'true' || $repeat == 'multiple' || (!empty($this->form->repeat) && $this->form->repeat == 1));
+
+		// Set the visibility.
+		$this->hidden = ($this->hidden || (string) $element['type'] == 'hidden');
+
+		$this->layout = !empty($this->element['layout']) ? (string) $this->element['layout'] : $this->layout;
+
+		// Add required to class list if field is required.
+		if ($this->required)
+		{
+			$this->class = trim($this->class . ' required');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Simple method to set the value
+	 *
+	 * @param   mixed  $value  Value to set
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+	}
+
+	/**
+	 * Method to get the id used for the field input tag.
+	 *
+	 * @param   string  $fieldId    The field element id.
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The id to be used for the field input tag.
+	 *
+	 * @since   11.1
+	 */
+	protected function getId($fieldId, $fieldName)
+	{
+		$id = '';
+
+		// If there is a form control set for the attached form add it first.
+		if ($this->formControl)
+		{
+			$id .= $this->formControl;
+		}
+
+		// If the field is in a group add the group control to the field id.
+		if ($this->group)
+		{
+			// If we already have an id segment add the group control as another level.
+			if ($id)
+			{
+				$id .= '_' . str_replace('.', '_', $this->group);
+			}
+			else
+			{
+				$id .= str_replace('.', '_', $this->group);
+			}
+		}
+
+		// If we already have an id segment add the field id/name as another level.
+		if ($id)
+		{
+			$id .= '_' . ($fieldId ? $fieldId : $fieldName);
+		}
+		else
+		{
+			$id .= ($fieldId ? $fieldId : $fieldName);
+		}
+
+		// Clean up any invalid characters.
+		$id = preg_replace('#\W#', '_', $id);
+
+		// If this is a repeatable element, add the repeat count to the ID
+		if ($this->repeat)
+		{
+			$repeatCounter = empty($this->form->repeatCounter) ? 0 : $this->form->repeatCounter;
+			$id .= '-' . $repeatCounter;
+
+			if (strtolower($this->type) == 'radio')
+			{
+				$id .= '-';
+			}
+		}
+
+		return $id;
+	}
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getInput()
+	{
+		if (empty($this->layout))
+		{
+			throw new \UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
+	}
+
+	/**
+	 * Method to get the field title.
+	 *
+	 * @return  string  The field title.
+	 *
+	 * @since   11.1
+	 */
+	protected function getTitle()
+	{
+		$title = '';
+
+		if ($this->hidden)
+		{
+			return $title;
+		}
+
+		// Get the label text from the XML element, defaulting to the element name.
+		$title = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
+		$title = $this->translateLabel ? \JText::_($title) : $title;
+
+		return $title;
+	}
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   11.1
+	 */
+	protected function getLabel()
+	{
+		if ($this->hidden)
+		{
+			return '';
+		}
+
+		$data = $this->getLayoutData();
+
+		// Forcing the Alias field to display the tip below
+		$position = $this->element['name'] == 'alias' ? ' data-placement="bottom" ' : '';
+
+		// Here mainly for B/C with old layouts. This can be done in the layouts directly
+		$extraData = array(
+			'text'        => $data['label'],
+			'for'         => $this->id,
+			'classes'     => explode(' ', $data['labelclass']),
+			'position'    => $position,
+		);
+
+		return $this->getRenderer($this->renderLabelLayout)->render(array_merge($data, $extraData));
+	}
+
+	/**
+	 * Method to get the name used for the field input tag.
+	 *
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The name to be used for the field input tag.
+	 *
+	 * @since   11.1
+	 */
+	protected function getName($fieldName)
+	{
+		// To support repeated element, extensions can set this in plugin->onRenderSettings
+
+		$name = '';
+
+		// If there is a form control set for the attached form add it first.
+		if ($this->formControl)
+		{
+			$name .= $this->formControl;
+		}
+
+		// If the field is in a group add the group control to the field name.
+		if ($this->group)
+		{
+			// If we already have a name segment add the group control as another level.
+			$groups = explode('.', $this->group);
+
+			if ($name)
+			{
+				foreach ($groups as $group)
+				{
+					$name .= '[' . $group . ']';
+				}
+			}
+			else
+			{
+				$name .= array_shift($groups);
+
+				foreach ($groups as $group)
+				{
+					$name .= '[' . $group . ']';
+				}
+			}
+		}
+
+		// If we already have a name segment add the field name as another level.
+		if ($name)
+		{
+			$name .= '[' . $fieldName . ']';
+		}
+		else
+		{
+			$name .= $fieldName;
+		}
+
+		// If the field should support multiple values add the final array segment.
+		if ($this->multiple)
+		{
+			switch (strtolower((string) $this->element['type']))
+			{
+				case 'text':
+				case 'textarea':
+				case 'email':
+				case 'password':
+				case 'radio':
+				case 'calendar':
+				case 'editor':
+				case 'hidden':
+					break;
+				default:
+					$name .= '[]';
+			}
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Method to get the field name used.
+	 *
+	 * @param   string  $fieldName  The field element name.
+	 *
+	 * @return  string  The field name
+	 *
+	 * @since   11.1
+	 */
+	protected function getFieldName($fieldName)
+	{
+		if ($fieldName)
+		{
+			return $fieldName;
+		}
+		else
+		{
+			self::$count = self::$count + 1;
+
+			return self::$generated_fieldname . self::$count;
+		}
+	}
+
+	/**
+	 * Method to get an attribute of the field
+	 *
+	 * @param   string  $name     Name of the attribute to get
+	 * @param   mixed   $default  Optional value to return if attribute not found
+	 *
+	 * @return  mixed             Value of the attribute / default
+	 *
+	 * @since   3.2
+	 */
+	public function getAttribute($name, $default = null)
+	{
+		if ($this->element instanceof \SimpleXMLElement)
+		{
+			$attributes = $this->element->attributes();
+
+			// Ensure that the attribute exists
+			if ($attributes->$name !== null)
+			{
+				return (string) $attributes->$name;
+			}
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Method to get a control group with label and input.
+	 *
+	 * @return  string  A string containing the html for the control group
+	 *
+	 * @since      3.2
+	 * @deprecated 3.2.3 Use renderField() instead
+	 */
+	public function getControlGroup()
+	{
+		\JLog::add('FormField->getControlGroup() is deprecated use FormField->renderField().', \JLog::WARNING, 'deprecated');
+
+		return $this->renderField();
+	}
+
+	/**
+	 * Render a layout of this field
+	 *
+	 * @param   string  $layoutId  Layout identifier
+	 * @param   array   $data      Optional data for the layout
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public function render($layoutId, $data = array())
+	{
+		$data = array_merge($this->getLayoutData(), $data);
+
+		return $this->getRenderer($layoutId)->render($data);
+	}
+
+	/**
+	 * Method to get a control group with label and input.
+	 *
+	 * @param   array  $options  Options to be passed into the rendering of the field
+	 *
+	 * @return  string  A string containing the html for the control group
+	 *
+	 * @since   3.2
+	 */
+	public function renderField($options = array())
+	{
+		if ($this->hidden)
+		{
+			return $this->getInput();
+		}
+
+		if (!isset($options['class']))
+		{
+			$options['class'] = '';
+		}
+
+		$options['rel'] = '';
+
+		if (empty($options['hiddenLabel']) && $this->getAttribute('hiddenLabel'))
+		{
+			$options['hiddenLabel'] = true;
+		}
+
+		if ($this->showon)
+		{
+			$options['rel']           = ' data-showon=\'' .
+				json_encode(FormHelper::parseShowOnConditions($this->showon, $this->formControl, $this->group)) . '\'';
+			$options['showonEnabled'] = true;
+		}
+
+		$data = array(
+			'input'   => $this->getInput(),
+			'label'   => $this->getLabel(),
+			'options' => $options,
+		);
+
+		return $this->getRenderer($this->renderLayout)->render($data);
+	}
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since 3.5
+	 */
+	protected function getLayoutData()
+	{
+		// Label preprocess
+		$label = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
+		$label = $this->translateLabel ? \JText::_($label) : $label;
+
+		// Description preprocess
+		$description = !empty($this->description) ? $this->description : null;
+		$description = !empty($description) && $this->translateDescription ? \JText::_($description) : $description;
+
+		$alt = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $this->fieldname);
+
+		return array(
+			'autocomplete'   => $this->autocomplete,
+			'autofocus'      => $this->autofocus,
+			'class'          => $this->class,
+			'description'    => $description,
+			'disabled'       => $this->disabled,
+			'field'          => $this,
+			'group'          => $this->group,
+			'hidden'         => $this->hidden,
+			'hint'           => $this->translateHint ? \JText::alt($this->hint, $alt) : $this->hint,
+			'id'             => $this->id,
+			'label'          => $label,
+			'labelclass'     => $this->labelclass,
+			'multiple'       => $this->multiple,
+			'name'           => $this->name,
+			'onchange'       => $this->onchange,
+			'onclick'        => $this->onclick,
+			'pattern'        => $this->pattern,
+			'validationtext' => $this->validationtext,
+			'readonly'       => $this->readonly,
+			'repeat'         => $this->repeat,
+			'required'       => (bool) $this->required,
+			'size'           => $this->size,
+			'spellcheck'     => $this->spellcheck,
+			'validate'       => $this->validate,
+			'value'          => $this->value,
+		);
+	}
+
+	/**
+	 * Allow to override renderer include paths in child fields
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutPaths()
+	{
+		return array();
+	}
+
+	/**
+	 * Get the renderer
+	 *
+	 * @param   string  $layoutId  Id to load
+	 *
+	 * @return  FileLayout
+	 *
+	 * @since   3.5
+	 */
+	protected function getRenderer($layoutId = 'default')
+	{
+		$renderer = new FileLayout($layoutId);
+
+		$renderer->setDebug($this->isDebugEnabled());
+
+		$layoutPaths = $this->getLayoutPaths();
+
+		if ($layoutPaths)
+		{
+			$renderer->setIncludePaths($layoutPaths);
+		}
+
+		return $renderer;
+	}
+
+	/**
+	 * Is debug enabled for this field
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	protected function isDebugEnabled()
+	{
+		return $this->getAttribute('debug', 'false') === 'true';
+	}
+}
diff --git a/core/libraries/src/Form/FormHelper.php b/core/libraries/src/Form/FormHelper.php
new file mode 100644
index 00000000..86e3cada
--- /dev/null
+++ b/core/libraries/src/Form/FormHelper.php
@@ -0,0 +1,500 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\String\Normalise;
+use Joomla\String\StringHelper;
+
+\JLoader::import('joomla.filesystem.path');
+
+/**
+ * Form's helper class.
+ * Provides a storage for filesystem's paths where Form's entities reside and methods for creating those entities.
+ * Also stores objects with entities' prototypes for further reusing.
+ *
+ * @since  11.1
+ */
+class FormHelper
+{
+	/**
+	 * Array with paths where entities(field, rule, form) can be found.
+	 *
+	 * Array's structure:
+	 *
+	 * paths:
+	 * {ENTITY_NAME}:
+	 * - /path/1
+	 * - /path/2
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $paths;
+
+	/**
+	 * The class namespaces.
+	 *
+	 * @var   string
+	 * @since 3.8.0
+	 */
+	protected static $prefixes = array('field' => array(), 'form' => array(), 'rule' => array());
+
+	/**
+	 * Static array of Form's entity objects for re-use.
+	 * Prototypes for all fields and rules are here.
+	 *
+	 * Array's structure:
+	 * entities:
+	 * {ENTITY_NAME}:
+	 * {KEY}: {OBJECT}
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $entities = array('field' => array(), 'form' => array(), 'rule' => array());
+
+	/**
+	 * Method to load a form field object given a type.
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  FormField|boolean  FormField object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadFieldType($type, $new = true)
+	{
+		return self::loadType('field', $type, $new);
+	}
+
+	/**
+	 * Method to load a form rule object given a type.
+	 *
+	 * @param   string   $type  The rule type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  FormRule|boolean  FormRule object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadRuleType($type, $new = true)
+	{
+		return self::loadType('rule', $type, $new);
+	}
+
+	/**
+	 * Method to load a form entity object given a type.
+	 * Each type is loaded only once and then used as a prototype for other objects of same type.
+	 * Please, use this method only with those entities which support types (forms don't support them).
+	 *
+	 * @param   string   $entity  The entity.
+	 * @param   string   $type    The entity type.
+	 * @param   boolean  $new     Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  Entity object on success, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	protected static function loadType($entity, $type, $new = true)
+	{
+		// Reference to an array with current entity's type instances
+		$types = &self::$entities[$entity];
+
+		$key = md5($type);
+
+		// Return an entity object if it already exists and we don't need a new one.
+		if (isset($types[$key]) && $new === false)
+		{
+			return $types[$key];
+		}
+
+		$class = self::loadClass($entity, $type);
+
+		if ($class === false)
+		{
+			return false;
+		}
+
+		// Instantiate a new type object.
+		$types[$key] = new $class;
+
+		return $types[$key];
+	}
+
+	/**
+	 * Attempt to import the JFormField class file if it isn't already imported.
+	 * You can use this method outside of JForm for loading a field for inheritance or composition.
+	 *
+	 * @param   string  $type  Type of a field whose class should be loaded.
+	 *
+	 * @return  string|boolean  Class name on success or false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadFieldClass($type)
+	{
+		return self::loadClass('field', $type);
+	}
+
+	/**
+	 * Attempt to import the JFormRule class file if it isn't already imported.
+	 * You can use this method outside of JForm for loading a rule for inheritance or composition.
+	 *
+	 * @param   string  $type  Type of a rule whose class should be loaded.
+	 *
+	 * @return  string|boolean  Class name on success or false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function loadRuleClass($type)
+	{
+		return self::loadClass('rule', $type);
+	}
+
+	/**
+	 * Load a class for one of the form's entities of a particular type.
+	 * Currently, it makes sense to use this method for the "field" and "rule" entities
+	 * (but you can support more entities in your subclass).
+	 *
+	 * @param   string  $entity  One of the form entities (field or rule).
+	 * @param   string  $type    Type of an entity.
+	 *
+	 * @return  string|boolean  Class name on success or false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	protected static function loadClass($entity, $type)
+	{
+		// Check if there is a class in the registered namespaces
+		foreach (self::addPrefix($entity) as $prefix)
+		{
+			// Treat underscores as namespace
+			$name = Normalise::toSpaceSeparated($type);
+			$name = str_ireplace(' ', '\\', ucwords($name));
+
+			// Compile the classname
+			$class = rtrim($prefix, '\\') . '\\' . ucfirst($name) . ucfirst($entity);
+
+			// Check if the class exists
+			if (class_exists($class))
+			{
+				return $class;
+			}
+		}
+
+		$prefix = 'J';
+
+		if (strpos($type, '.'))
+		{
+			list($prefix, $type) = explode('.', $type);
+		}
+
+		$class = StringHelper::ucfirst($prefix, '_') . 'Form' . StringHelper::ucfirst($entity, '_') . StringHelper::ucfirst($type, '_');
+
+		if (class_exists($class))
+		{
+			return $class;
+		}
+
+		// Get the field search path array.
+		$paths = self::addPath($entity);
+
+		// If the type is complex, add the base type to the paths.
+		if ($pos = strpos($type, '_'))
+		{
+			// Add the complex type prefix to the paths.
+			for ($i = 0, $n = count($paths); $i < $n; $i++)
+			{
+				// Derive the new path.
+				$path = $paths[$i] . '/' . strtolower(substr($type, 0, $pos));
+
+				// If the path does not exist, add it.
+				if (!in_array($path, $paths))
+				{
+					$paths[] = $path;
+				}
+			}
+
+			// Break off the end of the complex type.
+			$type = substr($type, $pos + 1);
+		}
+
+		// Try to find the class file.
+		$type = strtolower($type) . '.php';
+
+		foreach ($paths as $path)
+		{
+			$file = \JPath::find($path, $type);
+
+			if (!$file)
+			{
+				continue;
+			}
+
+			require_once $file;
+
+			if (class_exists($class))
+			{
+				break;
+			}
+		}
+
+		// Check for all if the class exists.
+		return class_exists($class) ? $class : false;
+	}
+
+	/**
+	 * Method to add a path to the list of field include paths.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   11.1
+	 */
+	public static function addFieldPath($new = null)
+	{
+		return self::addPath('field', $new);
+	}
+
+	/**
+	 * Method to add a path to the list of form include paths.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   11.1
+	 */
+	public static function addFormPath($new = null)
+	{
+		return self::addPath('form', $new);
+	}
+
+	/**
+	 * Method to add a path to the list of rule include paths.
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   11.1
+	 */
+	public static function addRulePath($new = null)
+	{
+		return self::addPath('rule', $new);
+	}
+
+	/**
+	 * Method to add a path to the list of include paths for one of the form's entities.
+	 * Currently supported entities: field, rule and form. You are free to support your own in a subclass.
+	 *
+	 * @param   string  $entity  Form's entity name for which paths will be added.
+	 * @param   mixed   $new     A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @since   11.1
+	 */
+	protected static function addPath($entity, $new = null)
+	{
+		// Reference to an array with paths for current entity
+		$paths = &self::$paths[$entity];
+
+		// Add the default entity's search path if not set.
+		if (empty($paths))
+		{
+			// While we support limited number of entities (form, field and rule)
+			// we can do this simple pluralisation:
+			$entity_plural = $entity . 's';
+
+			/*
+			 * But when someday we would want to support more entities, then we should consider adding
+			 * an inflector class to "libraries/joomla/utilities" and use it here (or somebody can use a real inflector in his subclass).
+			 * See also: pluralization snippet by Paul Osman in JControllerForm's constructor.
+			 */
+			$paths[] = __DIR__ . '/' . $entity_plural;
+		}
+
+		// Force the new path(s) to an array.
+		settype($new, 'array');
+
+		// Add the new paths to the stack if not already there.
+		foreach ($new as $path)
+		{
+			if (!in_array($path, $paths))
+			{
+				array_unshift($paths, trim($path));
+			}
+
+			if (!is_dir($path))
+			{
+				array_unshift($paths, trim($path));
+			}
+		}
+
+		return $paths;
+	}
+
+	/**
+	 * Method to add a namespace prefix to the list of field lookups.
+	 *
+	 * @param   mixed  $new  A namespaces or array of namespaces to add.
+	 *
+	 * @return  array  The list of namespaces that have been added.
+	 *
+	 * @since   3.8.0
+	 */
+	public static function addFieldPrefix($new = null)
+	{
+		return self::addPrefix('field', $new);
+	}
+
+	/**
+	 * Method to add a namespace to the list of form lookups.
+	 *
+	 * @param   mixed  $new  A namespace or array of namespaces to add.
+	 *
+	 * @return  array  The list of namespaces that have been added.
+	 *
+	 * @since   3.8.0
+	 */
+	public static function addFormPrefix($new = null)
+	{
+		return self::addPrefix('form', $new);
+	}
+
+	/**
+	 * Method to add a namespace to the list of rule lookups.
+	 *
+	 * @param   mixed  $new  A namespace or array of namespaces to add.
+	 *
+	 * @return  array  The list of namespaces that have been added.
+	 *
+	 * @since   3.8.0
+	 */
+	public static function addRulePrefix($new = null)
+	{
+		return self::addPrefix('rule', $new);
+	}
+
+	/**
+	 * Method to add a namespace to the list of namespaces for one of the form's entities.
+	 * Currently supported entities: field, rule and form. You are free to support your own in a subclass.
+	 *
+	 * @param   string  $entity  Form's entity name for which paths will be added.
+	 * @param   mixed   $new     A namespace or array of namespaces to add.
+	 *
+	 * @return  array  The list of namespaces that have been added.
+	 *
+	 * @since   3.8.0
+	 */
+	protected static function addPrefix($entity, $new = null)
+	{
+		// Reference to an array with namespaces for current entity
+		$prefixes = &self::$prefixes[$entity];
+
+		// Add the default entity's search namespace if not set.
+		if (empty($prefixes))
+		{
+			$prefixes[] = __NAMESPACE__ . '\\' . ucfirst($entity);
+		}
+
+		// Force the new namespace(s) to an array.
+		settype($new, 'array');
+
+		// Add the new paths to the stack if not already there.
+		foreach ($new as $prefix)
+		{
+			$prefix = trim($prefix);
+
+			if (in_array($prefix, $prefixes))
+			{
+				continue;
+			}
+
+			array_unshift($prefixes, $prefix);
+		}
+
+		return $prefixes;
+	}
+
+	/**
+	 * Parse the show on conditions
+	 *
+	 * @param   string  $showOn       Show on conditions.
+	 * @param   string  $formControl  Form name.
+	 * @param   string  $group        The dot-separated form group path.
+	 *
+	 * @return  array   Array with show on conditions.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function parseShowOnConditions($showOn, $formControl = null, $group = null)
+	{
+		// Process the showon data.
+		if (!$showOn)
+		{
+			return array();
+		}
+
+		$formPath = $formControl ?: '';
+
+		if ($group)
+		{
+			$groups = explode('.', $group);
+
+			// An empty formControl leads to invalid shown property
+			// Use the 1st part of the group instead to avoid.
+			if (empty($formPath) && isset($groups[0]))
+			{
+				$formPath = $groups[0];
+				array_shift($groups);
+			}
+
+			foreach ($groups as $group)
+			{
+				$formPath .= '[' . $group . ']';
+			}
+		}
+
+		$showOnData  = array();
+		$showOnParts = preg_split('#(\[AND\]|\[OR\])#', $showOn, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$op          = '';
+
+		foreach ($showOnParts as $showOnPart)
+		{
+			if (($showOnPart === '[AND]') || $showOnPart === '[OR]')
+			{
+				$op = trim($showOnPart, '[]');
+				continue;
+			}
+
+			$compareEqual     = strpos($showOnPart, '!:') === false;
+			$showOnPartBlocks = explode(($compareEqual ? ':' : '!:'), $showOnPart, 2);
+
+			$showOnData[] = array(
+				'field'  => $formPath ? $formPath . '[' . $showOnPartBlocks[0] . ']' : $showOnPartBlocks[0],
+				'values' => explode(',', $showOnPartBlocks[1]),
+				'sign'   => $compareEqual === true ? '=' : '!=',
+				'op'     => $op,
+			);
+
+			if ($op !== '')
+			{
+				$op = '';
+			}
+		}
+
+		return $showOnData;
+	}
+}
diff --git a/core/libraries/src/Form/FormRule.php b/core/libraries/src/Form/FormRule.php
new file mode 100644
index 00000000..e29e40c8
--- /dev/null
+++ b/core/libraries/src/Form/FormRule.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+// Detect if we have full UTF-8 and unicode PCRE support.
+if (!defined('JCOMPAT_UNICODE_PROPERTIES'))
+{
+	define('JCOMPAT_UNICODE_PROPERTIES', (bool) @preg_match('/\pL/u', 'a'));
+}
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class FormRule
+{
+	/**
+	 * The regular expression to use in testing a form field value.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $regex;
+
+	/**
+	 * The regular expression modifiers to use when testing a form field value.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $modifiers;
+
+	/**
+	 * Method to test the value.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException if rule is invalid.
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// Check for a valid regex.
+		if (empty($this->regex))
+		{
+			throw new \UnexpectedValueException(sprintf('%s has invalid regex.', get_class($this)));
+		}
+
+		// Add unicode property support if available.
+		if (JCOMPAT_UNICODE_PROPERTIES)
+		{
+			$this->modifiers = (strpos($this->modifiers, 'u') !== false) ? $this->modifiers : $this->modifiers . 'u';
+		}
+
+		// Test the value against the regular expression.
+		if (preg_match(chr(1) . $this->regex . chr(1) . $this->modifiers, $value))
+		{
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/src/Form/FormWrapper.php b/core/libraries/src/Form/FormWrapper.php
new file mode 100644
index 00000000..44435770
--- /dev/null
+++ b/core/libraries/src/Form/FormWrapper.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for FormHelper
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+ */
+class FormWrapper
+{
+	/**
+	 * Helper wrapper method for loadFieldType
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  JFormField object on success, false otherwise.
+	 *
+	 * @see     FormHelper::loadFieldType()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function loadFieldType($type, $new = true)
+	{
+		return FormHelper::loadFieldType($type, $new);
+	}
+
+	/**
+	 * Helper wrapper method for loadRuleType
+	 *
+	 * @param   string   $type  The field type.
+	 * @param   boolean  $new   Flag to toggle whether we should get a new instance of the object.
+	 *
+	 * @return  mixed  JFormField object on success, false otherwise.
+	 *
+	 * @see     FormHelper::loadRuleType()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function loadRuleType($type, $new = true)
+	{
+		return FormHelper::loadRuleType($type, $new);
+	}
+
+	/**
+	 * Helper wrapper method for loadFieldClass
+	 *
+	 * @param   string  $type  Type of a field whose class should be loaded.
+	 *
+	 * @return  mixed  Class name on success or false otherwise.
+	 *
+	 * @see     FormHelper::loadFieldClass()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function loadFieldClass($type)
+	{
+		return FormHelper::loadFieldClass($type);
+	}
+
+	/**
+	 * Helper wrapper method for loadRuleClass
+	 *
+	 * @param   string  $type  Type of a rule whose class should be loaded.
+	 *
+	 * @return  mixed  Class name on success or false otherwise.
+	 *
+	 * @see     FormHelper::loadRuleClass()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function loadRuleClass($type)
+	{
+		return FormHelper::loadRuleClass($type);
+	}
+
+	/**
+	 * Helper wrapper method for addFieldPath
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see     FormHelper::addFieldPath()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function addFieldPath($new = null)
+	{
+		return FormHelper::addFieldPath($new);
+	}
+
+	/**
+	 * Helper wrapper method for addFormPath
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see     FormHelper::addFormPath()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function addFormPath($new = null)
+	{
+		return FormHelper::addFormPath($new);
+	}
+
+	/**
+	 * Helper wrapper method for addRulePath
+	 *
+	 * @param   mixed  $new  A path or array of paths to add.
+	 *
+	 * @return  array  The list of paths that have been added.
+	 *
+	 * @see     FormHelper::addRulePath()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Form\FormHelper` directly
+	 */
+	public function addRulePath($new = null)
+	{
+		return FormHelper::addRulePath($new);
+	}
+}
diff --git a/core/libraries/src/Form/Rule/BooleanRule.php b/core/libraries/src/Form/Rule/BooleanRule.php
new file mode 100644
index 00000000..ac578850
--- /dev/null
+++ b/core/libraries/src/Form/Rule/BooleanRule.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\FormRule;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class BooleanRule extends FormRule
+{
+	/**
+	 * The regular expression to use in testing a form field value.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $regex = '^(?:[01]|true|false)$';
+
+	/**
+	 * The regular expression modifiers to use when testing a form field value.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $modifiers = 'i';
+}
diff --git a/core/libraries/src/Form/Rule/CalendarRule.php b/core/libraries/src/Form/Rule/CalendarRule.php
new file mode 100644
index 00000000..4fc70c50
--- /dev/null
+++ b/core/libraries/src/Form/Rule/CalendarRule.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform
+ *
+ * @since  3.7.0
+ */
+class CalendarRule extends FormRule
+{
+	/**
+	 * Method to test the calendar value for a valid parts.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   3.7.0
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		if (strtolower($value) == 'now')
+		{
+			return true;
+		}
+
+		try
+		{
+			return \JFactory::getDate($value) instanceof Date;
+		}
+		catch (\Exception $e)
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Form/Rule/CaptchaRule.php b/core/libraries/src/Form/Rule/CaptchaRule.php
new file mode 100644
index 00000000..8de64ab3
--- /dev/null
+++ b/core/libraries/src/Form/Rule/CaptchaRule.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Captcha\Captcha;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Framework.
+ *
+ * @since  2.5
+ */
+class CaptchaRule extends FormRule
+{
+	/**
+	 * Method to test if the Captcha is correct.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   2.5
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$app    = \JFactory::getApplication();
+		$plugin = $app->get('captcha');
+
+		if ($app->isClient('site'))
+		{
+			$plugin = $app->getParams()->get('captcha', $plugin);
+		}
+
+		$namespace = $element['namespace'] ?: $form->getName();
+
+		// Use 0 for none
+		if ($plugin === 0 || $plugin === '0')
+		{
+			return true;
+		}
+		else
+		{
+			$captcha = Captcha::getInstance((string) $plugin, array('namespace' => (string) $namespace));
+		}
+
+		// Test the value.
+		if (!$captcha->checkAnswer($value))
+		{
+			$error = $captcha->getError();
+
+			if ($error instanceof \Exception)
+			{
+				return $error;
+			}
+			else
+			{
+				return new \JException($error);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/ColorRule.php b/core/libraries/src/Form/Rule/ColorRule.php
new file mode 100644
index 00000000..85527dcf
--- /dev/null
+++ b/core/libraries/src/Form/Rule/ColorRule.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.2
+ */
+class ColorRule extends FormRule
+{
+	/**
+	 * Method to test for a valid color in hexadecimal.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.2
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$value = trim($value);
+
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		if ($value[0] != '#')
+		{
+			return false;
+		}
+
+		// Remove the leading # if present to validate the numeric part
+		$value = ltrim($value, '#');
+
+		// The value must be 6 or 3 characters long
+		if (!((strlen($value) == 6 || strlen($value) == 3) && ctype_xdigit($value)))
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/EmailRule.php b/core/libraries/src/Form/Rule/EmailRule.php
new file mode 100644
index 00000000..7043bef0
--- /dev/null
+++ b/core/libraries/src/Form/Rule/EmailRule.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class EmailRule extends FormRule
+{
+	/**
+	 * The regular expression to use in testing a form field value.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 * @link   http://www.w3.org/TR/html-markup/input.email.html
+	 */
+	protected $regex = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$";
+
+	/**
+	 * Method to test the email address and optionally check for uniqueness.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		// If the tld attribute is present, change the regular expression to require at least 2 characters for it.
+		$tld = ((string) $element['tld'] == 'tld' || (string) $element['tld'] == 'required');
+
+		if ($tld)
+		{
+			$this->regex = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])"
+				. '?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$';
+		}
+
+		// Determine if the multiple attribute is present
+		$multiple = ((string) $element['multiple'] == 'true' || (string) $element['multiple'] == 'multiple');
+
+		if (!$multiple)
+		{
+			// Handle idn email addresses by converting to punycode.
+			$value = \JStringPunycode::emailToPunycode($value);
+
+			// Test the value against the regular expression.
+			if (!parent::test($element, $value, $group, $input, $form))
+			{
+				return false;
+			}
+		}
+		else
+		{
+			$values = explode(',', $value);
+
+			foreach ($values as $value)
+			{
+				// Handle idn email addresses by converting to punycode.
+				$value = \JStringPunycode::emailToPunycode($value);
+
+				// Test the value against the regular expression.
+				if (!parent::test($element, $value, $group, $input, $form))
+				{
+					return false;
+				}
+			}
+		}
+
+		// Check if we should test for uniqueness. This only can be used if multiple is not true
+		$unique = ((string) $element['unique'] == 'true' || (string) $element['unique'] == 'unique');
+
+		if ($unique && !$multiple)
+		{
+			// Get the database object and a new query object.
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true);
+
+			// Build the query.
+			$query->select('COUNT(*)')
+				->from('#__users')
+				->where('email = ' . $db->quote($value));
+
+			// Get the extra field check attribute.
+			$userId = ($form instanceof Form) ? $form->getValue('id') : '';
+			$query->where($db->quoteName('id') . ' <> ' . (int) $userId);
+
+			// Set and query the database.
+			$db->setQuery($query);
+			$duplicate = (bool) $db->loadResult();
+
+			if ($duplicate)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/EqualsRule.php b/core/libraries/src/Form/Rule/EqualsRule.php
new file mode 100644
index 00000000..cfeeca3d
--- /dev/null
+++ b/core/libraries/src/Form/Rule/EqualsRule.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class EqualsRule extends FormRule
+{
+	/**
+	 * Method to test if two values are equal. To use this rule, the form
+	 * XML needs a validate attribute of equals and a field attribute
+	 * that is equal to the field to test against.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 * @throws  \UnexpectedValueException
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$field = (string) $element['field'];
+
+		// Check that a validation field is set.
+		if (!$field)
+		{
+			throw new \UnexpectedValueException(sprintf('$field empty in %s::test', get_class($this)));
+		}
+
+		if (is_null($form))
+		{
+			throw new \InvalidArgumentException(sprintf('The value for $form must not be null in %s', get_class($this)));
+		}
+
+		if (is_null($input))
+		{
+			throw new \InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
+		}
+
+		$test = $input->get($field);
+
+		if (isset($group) && $group !== '')
+		{
+			$test = $input->get($group . '.' . $field);
+		}
+
+		// Test the two values against each other.
+		return $value == $test;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/NotequalsRule.php b/core/libraries/src/Form/Rule/NotequalsRule.php
new file mode 100644
index 00000000..2e0cf538
--- /dev/null
+++ b/core/libraries/src/Form/Rule/NotequalsRule.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class NotequalsRule extends FormRule
+{
+	/**
+	 * Method to test if two values are not equal. To use this rule, the form
+	 * XML needs a validate attribute of equals and a field attribute
+	 * that is equal to the field to test against.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 * @throws  \UnexpectedValueException
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$field = (string) $element['field'];
+
+		// Check that a validation field is set.
+		if (!$field)
+		{
+			throw new \UnexpectedValueException(sprintf('$field empty in %s::test', get_class($this)));
+		}
+
+		if ($input === null)
+		{
+			throw new \InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
+		}
+
+		// Test the two values against each other.
+		if ($value != $input->get($field))
+		{
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/NumberRule.php b/core/libraries/src/Form/Rule/NumberRule.php
new file mode 100644
index 00000000..bdbbc113
--- /dev/null
+++ b/core/libraries/src/Form/Rule/NumberRule.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  3.5
+ */
+class NumberRule extends FormRule
+{
+	/**
+	 * Method to test the range for a number value using min and max attributes.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   3.5
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// Check if the field is required.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		// If the value is empty and the field is not required return True.
+		if (($value === '' || $value === null) && ! $required)
+		{
+			return true;
+		}
+
+		$float_value = (float) $value;
+
+		if (isset($element['min']))
+		{
+			$min = (float) $element['min'];
+
+			if ($min > $float_value)
+			{
+				return false;
+			}
+		}
+
+		if (isset($element['max']))
+		{
+			$max = (float) $element['max'];
+
+			if ($max < $float_value)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/OptionsRule.php b/core/libraries/src/Form/Rule/OptionsRule.php
new file mode 100644
index 00000000..c0ffee80
--- /dev/null
+++ b/core/libraries/src/Form/Rule/OptionsRule.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ * Requires the value entered be one of the options in a field of type="list"
+ *
+ * @since  11.1
+ */
+class OptionsRule extends FormRule
+{
+	/**
+	 * Method to test the value.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// Check if the field is required.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		// Make an array of all available option values.
+		$options = array();
+
+		// Create the field
+		$field = null;
+
+		if ($form)
+		{
+			$field = $form->getField((string) $element->attributes()->name, $group);
+		}
+
+		// When the field exists, the real options are fetched.
+		// This is needed for fields which do have dynamic options like from a database.
+		if ($field && is_array($field->options))
+		{
+			foreach ($field->options as $opt)
+			{
+				$options[] = $opt->value;
+			}
+		}
+		else
+		{
+			foreach ($element->option as $opt)
+			{
+				$options[] = $opt->attributes()->value;
+			}
+		}
+
+		// There may be multiple values in the form of an array (if the element is checkboxes, for example).
+		if (is_array($value))
+		{
+			// If all values are in the $options array, $diff will be empty and the options valid.
+			$diff = array_diff($value, $options);
+
+			return empty($diff);
+		}
+		else
+		{
+			// In this case value must be a string
+			return in_array((string) $value, $options);
+		}
+	}
+}
diff --git a/core/libraries/src/Form/Rule/PasswordRule.php b/core/libraries/src/Form/Rule/PasswordRule.php
new file mode 100644
index 00000000..abf9a443
--- /dev/null
+++ b/core/libraries/src/Form/Rule/PasswordRule.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  3.1.2
+ */
+class PasswordRule extends FormRule
+{
+	/**
+	 * Method to test if two values are not equal. To use this rule, the form
+	 * XML needs a validate attribute of equals and a field attribute
+	 * that is equal to the field to test against.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   3.1.2
+	 * @throws  \InvalidArgumentException
+	 * @throws  \UnexpectedValueException
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		$meter            = isset($element['strengthmeter']) ? ' meter="0"' : '1';
+		$threshold        = isset($element['threshold']) ? (int) $element['threshold'] : 66;
+		$minimumLength    = isset($element['minimum_length']) ? (int) $element['minimum_length'] : 4;
+		$minimumIntegers  = isset($element['minimum_integers']) ? (int) $element['minimum_integers'] : 0;
+		$minimumSymbols   = isset($element['minimum_symbols']) ? (int) $element['minimum_symbols'] : 0;
+		$minimumUppercase = isset($element['minimum_uppercase']) ? (int) $element['minimum_uppercase'] : 0;
+
+		// If we have parameters from com_users, use those instead.
+		// Some of these may be empty for legacy reasons.
+		$params = ComponentHelper::getParams('com_users');
+
+		if (!empty($params))
+		{
+			$minimumLengthp    = $params->get('minimum_length');
+			$minimumIntegersp  = $params->get('minimum_integers');
+			$minimumSymbolsp   = $params->get('minimum_symbols');
+			$minimumUppercasep = $params->get('minimum_uppercase');
+			$meterp            = $params->get('meter');
+			$thresholdp        = $params->get('threshold');
+
+			empty($minimumLengthp) ? : $minimumLength = (int) $minimumLengthp;
+			empty($minimumIntegersp) ? : $minimumIntegers = (int) $minimumIntegersp;
+			empty($minimumSymbolsp) ? : $minimumSymbols = (int) $minimumSymbolsp;
+			empty($minimumUppercasep) ? : $minimumUppercase = (int) $minimumUppercasep;
+			empty($meterp) ? : $meter = $meterp;
+			empty($thresholdp) ? : $threshold = $thresholdp;
+		}
+
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] === 'true' || (string) $element['required'] === 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		$valueLength = strlen($value);
+
+		// Load language file of com_users component
+		\JFactory::getLanguage()->load('com_users');
+
+		// We set a maximum length to prevent abuse since it is unfiltered.
+		if ($valueLength > 4096)
+		{
+			\JFactory::getApplication()->enqueueMessage(\JText::_('COM_USERS_MSG_PASSWORD_TOO_LONG'), 'warning');
+		}
+
+		// We don't allow white space inside passwords
+		$valueTrim = trim($value);
+
+		// Set a variable to check if any errors are made in password
+		$validPassword = true;
+
+		if (strlen($valueTrim) !== $valueLength)
+		{
+			\JFactory::getApplication()->enqueueMessage(
+				\JText::_('COM_USERS_MSG_SPACES_IN_PASSWORD'),
+				'warning'
+			);
+
+			$validPassword = false;
+		}
+
+		// Minimum number of integers required
+		if (!empty($minimumIntegers))
+		{
+			$nInts = preg_match_all('/[0-9]/', $value, $imatch);
+
+			if ($nInts < $minimumIntegers)
+			{
+				\JFactory::getApplication()->enqueueMessage(
+					\JText::plural('COM_USERS_MSG_NOT_ENOUGH_INTEGERS_N', $minimumIntegers),
+					'warning'
+				);
+
+				$validPassword = false;
+			}
+		}
+
+		// Minimum number of symbols required
+		if (!empty($minimumSymbols))
+		{
+			$nsymbols = preg_match_all('[\W]', $value, $smatch);
+
+			if ($nsymbols < $minimumSymbols)
+			{
+				\JFactory::getApplication()->enqueueMessage(
+					\JText::plural('COM_USERS_MSG_NOT_ENOUGH_SYMBOLS_N', $minimumSymbols),
+					'warning'
+				);
+
+				$validPassword = false;
+			}
+		}
+
+		// Minimum number of upper case ASCII characters required
+		if (!empty($minimumUppercase))
+		{
+			$nUppercase = preg_match_all('/[A-Z]/', $value, $umatch);
+
+			if ($nUppercase < $minimumUppercase)
+			{
+				\JFactory::getApplication()->enqueueMessage(
+					\JText::plural('COM_USERS_MSG_NOT_ENOUGH_UPPERCASE_LETTERS_N', $minimumUppercase),
+					'warning'
+				);
+
+				$validPassword = false;
+			}
+		}
+
+		// Minimum length option
+		if (!empty($minimumLength))
+		{
+			if (strlen((string) $value) < $minimumLength)
+			{
+				\JFactory::getApplication()->enqueueMessage(
+					\JText::plural('COM_USERS_MSG_PASSWORD_TOO_SHORT_N', $minimumLength),
+					'warning'
+				);
+
+				$validPassword = false;
+			}
+		}
+
+		// If valid has violated any rules above return false.
+		if (!$validPassword)
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/RulesRule.php b/core/libraries/src/Form/Rule/RulesRule.php
new file mode 100644
index 00000000..8d9ad831
--- /dev/null
+++ b/core/libraries/src/Form/Rule/RulesRule.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class RulesRule extends FormRule
+{
+	/**
+	 * Method to test the value.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// Get the possible field actions and the ones posted to validate them.
+		$fieldActions = self::getFieldActions($element);
+		$valueActions = self::getValueActions($value);
+
+		// Make sure that all posted actions are in the list of possible actions for the field.
+		foreach ($valueActions as $action)
+		{
+			if (!in_array($action, $fieldActions))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get the list of permission action names from the form field value.
+	 *
+	 * @param   mixed  $value  The form field value to validate.
+	 *
+	 * @return  array  A list of permission action names from the form field value.
+	 *
+	 * @since   11.1
+	 */
+	protected function getValueActions($value)
+	{
+		$actions = array();
+
+		// Iterate over the asset actions and add to the actions.
+		foreach ((array) $value as $name => $rules)
+		{
+			$actions[] = $name;
+		}
+
+		return $actions;
+	}
+
+	/**
+	 * Method to get the list of possible permission action names for the form field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The \SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 *
+	 * @return  array  A list of permission action names from the form field element definition.
+	 *
+	 * @since   11.1
+	 */
+	protected function getFieldActions(\SimpleXMLElement $element)
+	{
+		$actions = array();
+
+		// Initialise some field attributes.
+		$section = $element['section'] ? (string) $element['section'] : '';
+		$component = $element['component'] ? (string) $element['component'] : '';
+
+		// Get the asset actions for the element.
+		$elActions = Access::getActions($component, $section);
+
+		// Iterate over the asset actions and add to the actions.
+		foreach ($elActions as $item)
+		{
+			$actions[] = $item->name;
+		}
+
+		// Iterate over the children and add to the actions.
+		foreach ($element->children() as $el)
+		{
+			if ($el->getName() == 'action')
+			{
+				$actions[] = (string) $el['name'];
+			}
+		}
+
+		return $actions;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/TelRule.php b/core/libraries/src/Form/Rule/TelRule.php
new file mode 100644
index 00000000..eb2bb19a
--- /dev/null
+++ b/core/libraries/src/Form/Rule/TelRule.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform
+ *
+ * @since  11.1
+ */
+class TelRule extends FormRule
+{
+	/**
+	 * Method to test the url for a valid parts.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		/*
+		 * @link http://www.nanpa.com/
+		 * @link http://tools.ietf.org/html/rfc4933
+		 * @link http://www.itu.int/rec/T-REC-E.164/en
+		 *
+		 * Regex by Steve Levithan
+		 * @link http://blog.stevenlevithan.com/archives/validate-phone-number
+		 * @note that valid ITU-T and EPP must begin with +.
+		 */
+		$regexarray = array(
+			'NANP' => '/^(?:\+?1[-. ]?)?\(?([2-9][0-8][0-9])\)?[-. ]?([2-9][0-9]{2})[-. ]?([0-9]{4})$/',
+			'ITU-T' => '/^\+(?:[0-9] ?){6,14}[0-9]$/',
+			'EPP' => '/^\+[0-9]{1,3}\.[0-9]{4,14}(?:x.+)?$/',
+		);
+
+		if (isset($element['plan']))
+		{
+			$plan = (string) $element['plan'];
+
+			if ($plan == 'northamerica' || $plan == 'us')
+			{
+				$plan = 'NANP';
+			}
+			elseif ($plan == 'International' || $plan == 'int' || $plan == 'missdn' || !$plan)
+			{
+				$plan = 'ITU-T';
+			}
+			elseif ($plan == 'IETF')
+			{
+				$plan = 'EPP';
+			}
+
+			$regex = $regexarray[$plan];
+
+			// Test the value against the regular expression.
+			if (preg_match($regex, $value) == false)
+			{
+				return false;
+			}
+		}
+		else
+		{
+			/*
+			 * If the rule is set but no plan is selected just check that there are between
+			 * 7 and 15 digits inclusive and no illegal characters (but common number separators
+			 * are allowed).
+			 */
+			$cleanvalue = preg_replace('/[+. \-(\)]/', '', $value);
+			$regex = '/^[0-9]{7,15}?$/';
+
+			if (preg_match($regex, $cleanvalue) == true)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/UrlRule.php b/core/libraries/src/Form/Rule/UrlRule.php
new file mode 100644
index 00000000..d6f95004
--- /dev/null
+++ b/core/libraries/src/Form/Rule/UrlRule.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Uri\UriHelper;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class UrlRule extends FormRule
+{
+	/**
+	 * Method to test an external or internal url for all valid parts.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 * @link    http://www.w3.org/Addressing/URL/url-spec.txt
+	 * @see	    JString
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
+		$urlParts = UriHelper::parse_url($value);
+
+		// See http://www.w3.org/Addressing/URL/url-spec.txt
+		// Use the full list or optionally specify a list of permitted schemes.
+		if ($element['schemes'] == '')
+		{
+			$scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'mailto', 'news', 'prospero', 'telnet', 'rlogin', 'sftp', 'tn3270', 'wais',
+				'mid', 'cid', 'nntp', 'tel', 'urn', 'ldap', 'file', 'fax', 'modem', 'git');
+		}
+		else
+		{
+			$scheme = explode(',', $element['schemes']);
+		}
+
+		/*
+		 * Note that parse_url() does not always parse accurately without a scheme,
+		 * but at least the path should be set always. Note also that parse_url()
+		 * returns False for seriously malformed URLs instead of an associative array.
+		 * @link https://secure.php.net/manual/en/function.parse-url.php
+		 */
+		if ($urlParts === false || !array_key_exists('scheme', $urlParts))
+		{
+			/*
+			 * The function parse_url() returned false (seriously malformed URL) or no scheme
+			 * was found and the relative option is not set: in both cases the field is not valid.
+			 */
+			if ($urlParts === false || !$element['relative'])
+			{
+				$element->addAttribute('message', \JText::sprintf('JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING', $value, implode(', ', $scheme)));
+
+				return false;
+			}
+
+			// The best we can do for the rest is make sure that the path exists and is valid UTF-8.
+			if (!array_key_exists('path', $urlParts) || !StringHelper::valid((string) $urlParts['path']))
+			{
+				return false;
+			}
+
+			// The internal URL seems to be good.
+			return true;
+		}
+
+		// Scheme found, check all parts found.
+		$urlScheme = (string) $urlParts['scheme'];
+		$urlScheme = strtolower($urlScheme);
+
+		if (in_array($urlScheme, $scheme) == false)
+		{
+			return false;
+		}
+
+		// For some schemes here must be two slashes.
+		$scheme = array('http', 'https', 'ftp', 'ftps', 'gopher', 'wais', 'prospero', 'sftp', 'telnet', 'git');
+
+		if (in_array($urlScheme, $scheme) && substr($value, strlen($urlScheme), 3) !== '://')
+		{
+			return false;
+		}
+
+		// The best we can do for the rest is make sure that the strings are valid UTF-8
+		// and the port is an integer.
+		if (array_key_exists('host', $urlParts) && !StringHelper::valid((string) $urlParts['host']))
+		{
+			return false;
+		}
+
+		if (array_key_exists('port', $urlParts) && !is_int((int) $urlParts['port']))
+		{
+			return false;
+		}
+
+		if (array_key_exists('path', $urlParts) && !StringHelper::valid((string) $urlParts['path']))
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Form/Rule/UsernameRule.php b/core/libraries/src/Form/Rule/UsernameRule.php
new file mode 100644
index 00000000..096f4ee4
--- /dev/null
+++ b/core/libraries/src/Form/Rule/UsernameRule.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Rule;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Form\FormRule;
+use Joomla\Registry\Registry;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  11.1
+ */
+class UsernameRule extends FormRule
+{
+	/**
+	 * Method to test the username for uniqueness.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 * @param   Registry           $input    An optional Registry object with the entire data set to validate against the entire form.
+	 * @param   Form               $form     The form object for which the field is being tested.
+	 *
+	 * @return  boolean  True if the value is valid, false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
+	{
+		// Get the database object and a new query object.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Build the query.
+		$query->select('COUNT(*)')
+			->from('#__users')
+			->where('username = ' . $db->quote($value));
+
+		// Get the extra field check attribute.
+		$userId = ($form instanceof Form) ? $form->getValue('id') : '';
+		$query->where($db->quoteName('id') . ' <> ' . (int) $userId);
+
+		// Set and query the database.
+		$db->setQuery($query);
+		$duplicate = (bool) $db->loadResult();
+
+		if ($duplicate)
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/HTML/HTMLHelper.php b/core/libraries/src/HTML/HTMLHelper.php
new file mode 100644
index 00000000..190a45ea
--- /dev/null
+++ b/core/libraries/src/HTML/HTMLHelper.php
@@ -0,0 +1,1177 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\HTML;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Environment\Browser;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Utilities\ArrayHelper;
+
+\JLoader::import('joomla.environment.browser');
+\JLoader::import('joomla.filesystem.file');
+\JLoader::import('joomla.filesystem.path');
+
+/**
+ * Utility class for all HTML drawing classes
+ *
+ * @since  1.5
+ */
+abstract class HTMLHelper
+{
+	/**
+	 * Option values related to the generation of HTML output. Recognized
+	 * options are:
+	 *     fmtDepth, integer. The current indent depth.
+	 *     fmtEol, string. The end of line string, default is linefeed.
+	 *     fmtIndent, string. The string to use for indentation, default is
+	 *     tab.
+	 *
+	 * @var    array
+	 * @since  1.5
+	 */
+	public static $formatOptions = array('format.depth' => 0, 'format.eol' => "\n", 'format.indent' => "\t");
+
+	/**
+	 * An array to hold included paths
+	 *
+	 * @var    string[]
+	 * @since  1.5
+	 */
+	protected static $includePaths = array();
+
+	/**
+	 * An array to hold method references
+	 *
+	 * @var    callable[]
+	 * @since  1.6
+	 */
+	protected static $registry = array();
+
+	/**
+	 * Method to extract a key
+	 *
+	 * @param   string  $key  The name of helper method to load, (prefix).(class).function
+	 *                        prefix and class are optional and can be used to load custom html helpers.
+	 *
+	 * @return  array  Contains lowercase key, prefix, file, function.
+	 *
+	 * @since   1.6
+	 */
+	protected static function extract($key)
+	{
+		$key = preg_replace('#[^A-Z0-9_\.]#i', '', $key);
+
+		// Check to see whether we need to load a helper file
+		$parts = explode('.', $key);
+
+		$prefix = count($parts) === 3 ? array_shift($parts) : 'JHtml';
+		$file   = count($parts) === 2 ? array_shift($parts) : '';
+		$func   = array_shift($parts);
+
+		return array(strtolower($prefix . '.' . $file . '.' . $func), $prefix, $file, $func);
+	}
+
+	/**
+	 * Class loader method
+	 *
+	 * Additional arguments may be supplied and are passed to the sub-class.
+	 * Additional include paths are also able to be specified for third-party use
+	 *
+	 * @param   string  $key  The name of helper method to load, (prefix).(class).function
+	 *                        prefix and class are optional and can be used to load custom
+	 *                        html helpers.
+	 *
+	 * @return  mixed  Result of HTMLHelper::call($function, $args)
+	 *
+	 * @since   1.5
+	 * @throws  \InvalidArgumentException
+	 */
+	public static function _($key)
+	{
+		list($key, $prefix, $file, $func) = static::extract($key);
+
+		if (array_key_exists($key, static::$registry))
+		{
+			$function = static::$registry[$key];
+			$args     = func_get_args();
+
+			// Remove function name from arguments
+			array_shift($args);
+
+			return static::call($function, $args);
+		}
+
+		$className = $prefix . ucfirst($file);
+
+		if (!class_exists($className))
+		{
+			$path = \JPath::find(static::$includePaths, strtolower($file) . '.php');
+
+			if (!$path)
+			{
+				throw new \InvalidArgumentException(sprintf('%s %s not found.', $prefix, $file), 500);
+			}
+
+			\JLoader::register($className, $path);
+
+			if (!class_exists($className))
+			{
+				throw new \InvalidArgumentException(sprintf('%s not found.', $className), 500);
+			}
+		}
+
+		$toCall = array($className, $func);
+
+		if (!is_callable($toCall))
+		{
+			throw new \InvalidArgumentException(sprintf('%s::%s not found.', $className, $func), 500);
+		}
+
+		static::register($key, $toCall);
+		$args = func_get_args();
+
+		// Remove function name from arguments
+		array_shift($args);
+
+		return static::call($toCall, $args);
+	}
+
+	/**
+	 * Registers a function to be called with a specific key
+	 *
+	 * @param   string  $key       The name of the key
+	 * @param   string  $function  Function or method
+	 *
+	 * @return  boolean  True if the function is callable
+	 *
+	 * @since   1.6
+	 */
+	public static function register($key, $function)
+	{
+		list($key) = static::extract($key);
+
+		if (is_callable($function))
+		{
+			static::$registry[$key] = $function;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Removes a key for a method from registry.
+	 *
+	 * @param   string  $key  The name of the key
+	 *
+	 * @return  boolean  True if a set key is unset
+	 *
+	 * @since   1.6
+	 */
+	public static function unregister($key)
+	{
+		list($key) = static::extract($key);
+
+		if (isset(static::$registry[$key]))
+		{
+			unset(static::$registry[$key]);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Test if the key is registered.
+	 *
+	 * @param   string  $key  The name of the key
+	 *
+	 * @return  boolean  True if the key is registered.
+	 *
+	 * @since   1.6
+	 */
+	public static function isRegistered($key)
+	{
+		list($key) = static::extract($key);
+
+		return isset(static::$registry[$key]);
+	}
+
+	/**
+	 * Function caller method
+	 *
+	 * @param   callable  $function  Function or method to call
+	 * @param   array     $args      Arguments to be passed to function
+	 *
+	 * @return  mixed   Function result or false on error.
+	 *
+	 * @link    https://secure.php.net/manual/en/function.call-user-func-array.php
+	 * @since   1.6
+	 * @throws  \InvalidArgumentException
+	 */
+	protected static function call($function, $args)
+	{
+		if (!is_callable($function))
+		{
+			throw new \InvalidArgumentException('Function not supported', 500);
+		}
+
+		// PHP 5.3 workaround
+		$temp = array();
+
+		foreach ($args as &$arg)
+		{
+			$temp[] = &$arg;
+		}
+
+		return call_user_func_array($function, $temp);
+	}
+
+	/**
+	 * Write a `<a>` element
+	 *
+	 * @param   string        $url      The relative URL to use for the href attribute
+	 * @param   string        $text     The target attribute to use
+	 * @param   array|string  $attribs  Attributes to be added to the `<a>` element
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function link($url, $text, $attribs = null)
+	{
+		if (is_array($attribs))
+		{
+			$attribs = ArrayHelper::toString($attribs);
+		}
+
+		return '<a href="' . $url . '" ' . $attribs . '>' . $text . '</a>';
+	}
+
+	/**
+	 * Write a `<iframe>` element
+	 *
+	 * @param   string        $url       The relative URL to use for the src attribute.
+	 * @param   string        $name      The target attribute to use.
+	 * @param   array|string  $attribs   Attributes to be added to the `<iframe>` element
+	 * @param   string        $noFrames  The message to display if the iframe tag is not supported.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function iframe($url, $name, $attribs = null, $noFrames = '')
+	{
+		if (is_array($attribs))
+		{
+			$attribs = ArrayHelper::toString($attribs);
+		}
+
+		return '<iframe src="' . $url . '" ' . $attribs . ' name="' . $name . '">' . $noFrames . '</iframe>';
+	}
+
+	/**
+	 * Include version with MD5SUM file in path.
+	 *
+	 * @param   string  $path  Folder name to search into (images, css, js, ...).
+	 *
+	 * @return  string  Query string to add.
+	 *
+	 * @since   3.7.0
+	 *
+	 * @deprecated   4.0  Usage of MD5SUM files is deprecated, use version instead.
+	 */
+	protected static function getMd5Version($path)
+	{
+		$md5 = dirname($path) . '/MD5SUM';
+
+		if (file_exists($md5))
+		{
+			Log::add('Usage of MD5SUM files is deprecated, use version instead.', Log::WARNING, 'deprecated');
+
+			return '?' . file_get_contents($md5);
+		}
+
+		return '';
+	}
+
+	/**
+	 * Compute the files to be included
+	 *
+	 * @param   string   $folder          Folder name to search in (i.e. images, css, js).
+	 * @param   string   $file            Path to file.
+	 * @param   boolean  $relative        Flag if the path to the file is relative to the /media folder (and searches in template).
+	 * @param   boolean  $detect_browser  Flag if the browser should be detected to include specific browser files.
+	 * @param   boolean  $detect_debug    Flag if debug mode is enabled to include uncompressed files if debug is on.
+	 *
+	 * @return  array    files to be included.
+	 *
+	 * @see     JBrowser
+	 * @since   1.6
+	 */
+	protected static function includeRelativeFiles($folder, $file, $relative, $detect_browser, $detect_debug)
+	{
+		// If http is present in filename just return it as an array
+		if (strpos($file, 'http') === 0 || strpos($file, '//') === 0)
+		{
+			return array($file);
+		}
+
+		// Extract extension and strip the file
+		$strip = \JFile::stripExt($file);
+		$ext   = \JFile::getExt($file);
+
+		// Prepare array of files
+		$includes = array();
+
+		// Detect browser and compute potential files
+		if ($detect_browser)
+		{
+			$navigator = Browser::getInstance();
+			$browser   = $navigator->getBrowser();
+			$major     = $navigator->getMajor();
+			$minor     = $navigator->getMinor();
+
+			// Try to include files named filename.ext, filename_browser.ext, filename_browser_major.ext, filename_browser_major_minor.ext
+			// where major and minor are the browser version names
+			$potential = array(
+				$strip,
+				$strip . '_' . $browser,
+				$strip . '_' . $browser . '_' . $major,
+				$strip . '_' . $browser . '_' . $major . '_' . $minor,
+			);
+		}
+		else
+		{
+			$potential = array($strip);
+		}
+
+		// If relative search in template directory or media directory
+		if ($relative)
+		{
+			// Get the template
+			$template = Factory::getApplication()->getTemplate();
+
+			// For each potential files
+			foreach ($potential as $strip)
+			{
+				$files = array();
+
+				// Detect debug mode
+				if ($detect_debug && Factory::getConfig()->get('debug'))
+				{
+					/*
+					 * Detect if we received a file in the format name.min.ext
+					 * If so, strip the .min part out, otherwise append -uncompressed
+					 */
+					if (strlen($strip) > 4 && preg_match('#\.min$#', $strip))
+					{
+						$files[] = preg_replace('#\.min$#', '.', $strip) . $ext;
+					}
+					else
+					{
+						$files[] = $strip . '-uncompressed.' . $ext;
+					}
+				}
+
+				$files[] = $strip . '.' . $ext;
+
+				/*
+				 * Loop on 1 or 2 files and break on first found.
+				 * Add the content of the MD5SUM file located in the same folder to URL to ensure cache browser refresh
+				 * This MD5SUM file must represent the signature of the folder content
+				 */
+				foreach ($files as $file)
+				{
+					// If the file is in the template folder
+					$path = JPATH_THEMES . "/$template/$folder/$file";
+
+					if (file_exists($path))
+					{
+						$includes[] = Uri::base(true) . "/templates/$template/$folder/$file" . static::getMd5Version($path);
+
+						break;
+					}
+					else
+					{
+						// If the file contains any /: it can be in a media extension subfolder
+						if (strpos($file, '/'))
+						{
+							// Divide the file extracting the extension as the first part before /
+							list($extension, $file) = explode('/', $file, 2);
+
+							// If the file yet contains any /: it can be a plugin
+							if (strpos($file, '/'))
+							{
+								// Divide the file extracting the element as the first part before /
+								list($element, $file) = explode('/', $file, 2);
+
+								// Try to deal with plugins group in the media folder
+								$path = JPATH_ROOT . "/media/$extension/$element/$folder/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/media/$extension/$element/$folder/$file" . static::getMd5Version($path);
+
+									break;
+								}
+
+								// Try to deal with classical file in a media subfolder called element
+								$path = JPATH_ROOT . "/media/$extension/$folder/$element/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/media/$extension/$folder/$element/$file" . static::getMd5Version($path);
+
+									break;
+								}
+
+								// Try to deal with system files in the template folder
+								$path = JPATH_THEMES . "/$template/$folder/system/$element/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/templates/$template/$folder/system/$element/$file" . static::getMd5Version($path);
+
+									break;
+								}
+
+								// Try to deal with system files in the media folder
+								$path = JPATH_ROOT . "/media/system/$folder/$element/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/media/system/$folder/$element/$file" . static::getMd5Version($path);
+
+									break;
+								}
+							}
+							else
+							{
+								// Try to deals in the extension media folder
+								$path = JPATH_ROOT . "/media/$extension/$folder/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/media/$extension/$folder/$file" . static::getMd5Version($path);
+
+									break;
+								}
+
+								// Try to deal with system files in the template folder
+								$path = JPATH_THEMES . "/$template/$folder/system/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/templates/$template/$folder/system/$file" . static::getMd5Version($path);
+
+									break;
+								}
+
+								// Try to deal with system files in the media folder
+								$path = JPATH_ROOT . "/media/system/$folder/$file";
+
+								if (file_exists($path))
+								{
+									$includes[] = Uri::root(true) . "/media/system/$folder/$file" . static::getMd5Version($path);
+
+									break;
+								}
+							}
+						}
+						// Try to deal with system files in the media folder
+						else
+						{
+							$path = JPATH_ROOT . "/media/system/$folder/$file";
+
+							if (file_exists($path))
+							{
+								$includes[] = Uri::root(true) . "/media/system/$folder/$file" . static::getMd5Version($path);
+
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		// If not relative and http is not present in filename
+		else
+		{
+			foreach ($potential as $strip)
+			{
+				$files = array();
+
+				// Detect debug mode
+				if ($detect_debug && Factory::getConfig()->get('debug'))
+				{
+					/*
+					 * Detect if we received a file in the format name.min.ext
+					 * If so, strip the .min part out, otherwise append -uncompressed
+					 */
+					if (strlen($strip) > 4 && preg_match('#\.min$#', $strip))
+					{
+						$files[] = preg_replace('#\.min$#', '.', $strip) . $ext;
+					}
+					else
+					{
+						$files[] = $strip . '-uncompressed.' . $ext;
+					}
+				}
+
+				$files[] = $strip . '.' . $ext;
+
+				/*
+				 * Loop on 1 or 2 files and break on first found.
+				 * Add the content of the MD5SUM file located in the same folder to URL to ensure cache browser refresh
+				 * This MD5SUM file must represent the signature of the folder content
+				 */
+				foreach ($files as $file)
+				{
+					$path = JPATH_ROOT . "/$file";
+
+					if (file_exists($path))
+					{
+						$includes[] = Uri::root(true) . "/$file" . static::getMd5Version($path);
+
+						break;
+					}
+				}
+			}
+		}
+
+		return $includes;
+	}
+
+	/**
+	 * Write a `<img>` element
+	 *
+	 * @param   string        $file        The relative or absolute URL to use for the src attribute.
+	 * @param   string        $alt         The alt text.
+	 * @param   array|string  $attribs     Attributes to be added to the `<img>` element
+	 * @param   boolean       $relative    Flag if the path to the file is relative to the /media folder (and searches in template).
+	 * @param   integer       $returnPath  Defines the return value for the method:
+	 *                                     -1: Returns a `<img>` tag without looking for relative files
+	 *                                     0: Returns a `<img>` tag while searching for relative files
+	 *                                     1: Returns the file path to the image while searching for relative files
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function image($file, $alt, $attribs = null, $relative = false, $returnPath = 0)
+	{
+		$returnPath = (int) $returnPath;
+
+		if ($returnPath !== -1)
+		{
+			$includes = static::includeRelativeFiles('images', $file, $relative, false, false);
+			$file = count($includes) ? $includes[0] : null;
+		}
+
+		// If only path is required
+		if ($returnPath === 1)
+		{
+			return $file;
+		}
+
+		return '<img src="' . $file . '" alt="' . $alt . '" ' . trim((is_array($attribs) ? ArrayHelper::toString($attribs) : $attribs) . ' /') . '>';
+	}
+
+	/**
+	 * Write a `<link>` element to load a CSS file
+	 *
+	 * @param   string  $file     Path to file
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
+	 *
+	 * @return  array|string|null  nothing if $returnPath is false, null, path or array of path if specific CSS browser files were detected
+	 *
+	 * @see     Browser
+	 * @since   1.5
+	 * @deprecated 4.0  The (file, attribs, relative, pathOnly, detectBrowser, detectDebug) method signature is deprecated,
+	 *                  use (file, options, attributes) instead.
+	 */
+	public static function stylesheet($file, $options = array(), $attribs = array())
+	{
+		// B/C before 3.7.0
+		if (!is_array($attribs))
+		{
+			Log::add('The stylesheet method signature used has changed, use (file, options, attributes) instead.', Log::WARNING, 'deprecated');
+
+			$argList = func_get_args();
+			$options = array();
+
+			// Old parameters.
+			$attribs                  = isset($argList[1]) ? $argList[1] : array();
+			$options['relative']      = isset($argList[2]) ? $argList[2] : false;
+			$options['pathOnly']      = isset($argList[3]) ? $argList[3] : false;
+			$options['detectBrowser'] = isset($argList[4]) ? $argList[4] : true;
+			$options['detectDebug']   = isset($argList[5]) ? $argList[5] : true;
+		}
+		else
+		{
+			$options['relative']      = isset($options['relative']) ? $options['relative'] : false;
+			$options['pathOnly']      = isset($options['pathOnly']) ? $options['pathOnly'] : false;
+			$options['detectBrowser'] = isset($options['detectBrowser']) ? $options['detectBrowser'] : true;
+			$options['detectDebug']   = isset($options['detectDebug']) ? $options['detectDebug'] : true;
+		}
+
+		$includes = static::includeRelativeFiles('css', $file, $options['relative'], $options['detectBrowser'], $options['detectDebug']);
+
+		// If only path is required
+		if ($options['pathOnly'])
+		{
+			if (count($includes) === 0)
+			{
+				return;
+			}
+
+			if (count($includes) === 1)
+			{
+				return $includes[0];
+			}
+
+			return $includes;
+		}
+
+		// If inclusion is required
+		$document = Factory::getDocument();
+
+		foreach ($includes as $include)
+		{
+			// If there is already a version hash in the script reference (by using deprecated MD5SUM).
+			if ($pos = strpos($include, '?') !== false)
+			{
+				$options['version'] = substr($include, $pos + 1);
+			}
+
+			$document->addStyleSheet($include, $options, $attribs);
+		}
+	}
+
+	/**
+	 * Write a `<script>` element to load a JavaScript file
+	 *
+	 * @param   string  $file     Path to file.
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
+	 *
+	 * @return  array|string|null  Nothing if $returnPath is false, null, path or array of path if specific JavaScript browser files were detected
+	 *
+	 * @see     HTMLHelper::stylesheet()
+	 * @since   1.5
+	 * @deprecated 4.0  The (file, framework, relative, pathOnly, detectBrowser, detectDebug) method signature is deprecated,
+	 *                  use (file, options, attributes) instead.
+	 */
+	public static function script($file, $options = array(), $attribs = array())
+	{
+		// B/C before 3.7.0
+		if (!is_array($options))
+		{
+			Log::add('The script method signature used has changed, use (file, options, attributes) instead.', Log::WARNING, 'deprecated');
+
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old parameters.
+			$options['framework']     = isset($argList[1]) ? $argList[1] : false;
+			$options['relative']      = isset($argList[2]) ? $argList[2] : false;
+			$options['pathOnly']      = isset($argList[3]) ? $argList[3] : false;
+			$options['detectBrowser'] = isset($argList[4]) ? $argList[4] : true;
+			$options['detectDebug']   = isset($argList[5]) ? $argList[5] : true;
+		}
+		else
+		{
+			$options['framework']     = isset($options['framework']) ? $options['framework'] : false;
+			$options['relative']      = isset($options['relative']) ? $options['relative'] : false;
+			$options['pathOnly']      = isset($options['pathOnly']) ? $options['pathOnly'] : false;
+			$options['detectBrowser'] = isset($options['detectBrowser']) ? $options['detectBrowser'] : true;
+			$options['detectDebug']   = isset($options['detectDebug']) ? $options['detectDebug'] : true;
+		}
+
+		// Include MooTools framework
+		if ($options['framework'])
+		{
+			static::_('behavior.framework');
+		}
+
+		$includes = static::includeRelativeFiles('js', $file, $options['relative'], $options['detectBrowser'], $options['detectDebug']);
+
+		// If only path is required
+		if ($options['pathOnly'])
+		{
+			if (count($includes) === 0)
+			{
+				return;
+			}
+
+			if (count($includes) === 1)
+			{
+				return $includes[0];
+			}
+
+			return $includes;
+		}
+
+		// If inclusion is required
+		$document = Factory::getDocument();
+
+		foreach ($includes as $include)
+		{
+			// If there is already a version hash in the script reference (by using deprecated MD5SUM).
+			if ($pos = strpos($include, '?') !== false)
+			{
+				$options['version'] = substr($include, $pos + 1);
+			}
+
+			$document->addScript($include, $options, $attribs);
+		}
+	}
+
+	/**
+	 * Set format related options.
+	 *
+	 * Updates the formatOptions array with all valid values in the passed array.
+	 *
+	 * @param   array  $options  Option key/value pairs.
+	 *
+	 * @return  void
+	 *
+	 * @see     HTMLHelper::$formatOptions
+	 * @since   1.5
+	 */
+	public static function setFormatOptions($options)
+	{
+		foreach ($options as $key => $val)
+		{
+			if (isset(static::$formatOptions[$key]))
+			{
+				static::$formatOptions[$key] = $val;
+			}
+		}
+	}
+
+	/**
+	 * Returns formated date according to a given format and time zone.
+	 *
+	 * @param   string   $input      String in a format accepted by date(), defaults to "now".
+	 * @param   string   $format     The date format specification string (see {@link PHP_MANUAL#date}).
+	 * @param   mixed    $tz         Time zone to be used for the date.  Special cases: boolean true for user
+	 *                               setting, boolean false for server setting.
+	 * @param   boolean  $gregorian  True to use Gregorian calendar.
+	 *
+	 * @return  string    A date translated by the given format and time zone.
+	 *
+	 * @see     strftime
+	 * @since   1.5
+	 */
+	public static function date($input = 'now', $format = null, $tz = true, $gregorian = false)
+	{
+		// Get some system objects.
+		$config = Factory::getConfig();
+		$user   = Factory::getUser();
+
+		// UTC date converted to user time zone.
+		if ($tz === true)
+		{
+			// Get a date object based on UTC.
+			$date = Factory::getDate($input, 'UTC');
+
+			// Set the correct time zone based on the user configuration.
+			$date->setTimezone($user->getTimezone());
+		}
+		// UTC date converted to server time zone.
+		elseif ($tz === false)
+		{
+			// Get a date object based on UTC.
+			$date = Factory::getDate($input, 'UTC');
+
+			// Set the correct time zone based on the server configuration.
+			$date->setTimezone(new \DateTimeZone($config->get('offset')));
+		}
+		// No date conversion.
+		elseif ($tz === null)
+		{
+			$date = Factory::getDate($input);
+		}
+		// UTC date converted to given time zone.
+		else
+		{
+			// Get a date object based on UTC.
+			$date = Factory::getDate($input, 'UTC');
+
+			// Set the correct time zone based on the server configuration.
+			$date->setTimezone(new \DateTimeZone($tz));
+		}
+
+		// If no format is given use the default locale based format.
+		if (!$format)
+		{
+			$format = \JText::_('DATE_FORMAT_LC1');
+		}
+		// $format is an existing language key
+		elseif (Factory::getLanguage()->hasKey($format))
+		{
+			$format = \JText::_($format);
+		}
+
+		if ($gregorian)
+		{
+			return $date->format($format, true);
+		}
+
+		return $date->calendar($format, true);
+	}
+
+	/**
+	 * Creates a tooltip with an image as button
+	 *
+	 * @param   string  $tooltip  The tip string.
+	 * @param   mixed   $title    The title of the tooltip or an associative array with keys contained in
+	 *                            {'title','image','text','href','alt'} and values corresponding to parameters of the same name.
+	 * @param   string  $image    The image for the tip, if no text is provided.
+	 * @param   string  $text     The text for the tip.
+	 * @param   string  $href     A URL that will be used to create the link.
+	 * @param   string  $alt      The alt attribute for img tag.
+	 * @param   string  $class    CSS class for the tool tip.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function tooltip($tooltip, $title = '', $image = 'tooltip.png', $text = '', $href = '', $alt = 'Tooltip', $class = 'hasTooltip')
+	{
+		if (is_array($title))
+		{
+			foreach (array('image', 'text', 'href', 'alt', 'class') as $param)
+			{
+				if (isset($title[$param]))
+				{
+					$$param = $title[$param];
+				}
+			}
+
+			if (isset($title['title']))
+			{
+				$title = $title['title'];
+			}
+			else
+			{
+				$title = '';
+			}
+		}
+
+		if (!$text)
+		{
+			$alt = htmlspecialchars($alt, ENT_COMPAT, 'UTF-8');
+			$text = static::image($image, $alt, null, true);
+		}
+
+		if ($href)
+		{
+			$tip = '<a href="' . $href . '">' . $text . '</a>';
+		}
+		else
+		{
+			$tip = $text;
+		}
+
+		if ($class === 'hasTip')
+		{
+			// Still using MooTools tooltips!
+			$tooltip = htmlspecialchars($tooltip, ENT_COMPAT, 'UTF-8');
+
+			if ($title)
+			{
+				$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
+				$tooltip = $title . '::' . $tooltip;
+			}
+		}
+		else
+		{
+			$tooltip = self::tooltipText($title, $tooltip, 0);
+		}
+
+		return '<span class="' . $class . '" title="' . $tooltip . '">' . $tip . '</span>';
+	}
+
+	/**
+	 * Converts a double colon separated string or 2 separate strings to a string ready for bootstrap tooltips
+	 *
+	 * @param   string   $title      The title of the tooltip (or combined '::' separated string).
+	 * @param   string   $content    The content to tooltip.
+	 * @param   boolean  $translate  If true will pass texts through JText.
+	 * @param   boolean  $escape     If true will pass texts through htmlspecialchars.
+	 *
+	 * @return  string  The tooltip string
+	 *
+	 * @since   3.1.2
+	 */
+	public static function tooltipText($title = '', $content = '', $translate = true, $escape = true)
+	{
+		// Initialise return value.
+		$result = '';
+
+		// Don't process empty strings
+		if ($content !== '' || $title !== '')
+		{
+			// Split title into title and content if the title contains '::' (old Mootools format).
+			if ($content === '' && !(strpos($title, '::') === false))
+			{
+				list($title, $content) = explode('::', $title, 2);
+			}
+
+			// Pass texts through JText if required.
+			if ($translate)
+			{
+				$title = \JText::_($title);
+				$content = \JText::_($content);
+			}
+
+			// Use only the content if no title is given.
+			if ($title === '')
+			{
+				$result = $content;
+			}
+			// Use only the title, if title and text are the same.
+			elseif ($title === $content)
+			{
+				$result = '<strong>' . $title . '</strong>';
+			}
+			// Use a formatted string combining the title and content.
+			elseif ($content !== '')
+			{
+				$result = '<strong>' . $title . '</strong><br />' . $content;
+			}
+			else
+			{
+				$result = $title;
+			}
+
+			// Escape everything, if required.
+			if ($escape)
+			{
+				$result = htmlspecialchars($result);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Displays a calendar control field
+	 *
+	 * @param   string  $value    The date value
+	 * @param   string  $name     The name of the text field
+	 * @param   string  $id       The id of the text field
+	 * @param   string  $format   The date format
+	 * @param   mixed   $attribs  Additional HTML attributes
+	 *                            The array can have the following keys:
+	 *                            readonly      Sets the readonly parameter for the input tag
+	 *                            disabled      Sets the disabled parameter for the input tag
+	 *                            autofocus     Sets the autofocus parameter for the input tag
+	 *                            autocomplete  Sets the autocomplete parameter for the input tag
+	 *                            filter        Sets the filter for the input tag
+	 *
+	 * @return  string  HTML markup for a calendar field
+	 *
+	 * @since   1.5
+	 *
+	 */
+	public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attribs = array())
+	{
+		$tag       = Factory::getLanguage()->getTag();
+		$calendar  = Factory::getLanguage()->getCalendar();
+		$direction = strtolower(Factory::getDocument()->getDirection());
+
+		// Get the appropriate file for the current language date helper
+		$helperPath = 'system/fields/calendar-locales/date/gregorian/date-helper.min.js';
+
+		if (!empty($calendar) && is_dir(JPATH_ROOT . '/media/system/js/fields/calendar-locales/date/' . strtolower($calendar)))
+		{
+			$helperPath = 'system/fields/calendar-locales/date/' . strtolower($calendar) . '/date-helper.min.js';
+		}
+
+		// Get the appropriate locale file for the current language
+		$localesPath = 'system/fields/calendar-locales/en.js';
+
+		if (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower($tag) . '.js'))
+		{
+			$localesPath = 'system/fields/calendar-locales/' . strtolower($tag) . '.js';
+		}
+		elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . $tag . '.js'))
+		{
+			$localesPath = 'system/fields/calendar-locales/' . $tag . '.js';
+		}
+		elseif (is_file(JPATH_ROOT . '/media/system/js/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js'))
+		{
+			$localesPath = 'system/fields/calendar-locales/' . strtolower(substr($tag, 0, -3)) . '.js';
+		}
+
+		$readonly     = isset($attribs['readonly']) && $attribs['readonly'] === 'readonly';
+		$disabled     = isset($attribs['disabled']) && $attribs['disabled'] === 'disabled';
+		$autocomplete = isset($attribs['autocomplete']) && $attribs['autocomplete'] === '';
+		$autofocus    = isset($attribs['autofocus']) && $attribs['autofocus'] === '';
+		$required     = isset($attribs['required']) && $attribs['required'] === '';
+		$filter       = isset($attribs['filter']) && $attribs['filter'] === '';
+		$todayBtn     = isset($attribs['todayBtn']) ? $attribs['todayBtn'] : true;
+		$weekNumbers  = isset($attribs['weekNumbers']) ? $attribs['weekNumbers'] : true;
+		$showTime     = isset($attribs['showTime']) ? $attribs['showTime'] : false;
+		$fillTable    = isset($attribs['fillTable']) ? $attribs['fillTable'] : true;
+		$timeFormat   = isset($attribs['timeFormat']) ? $attribs['timeFormat'] : 24;
+		$singleHeader = isset($attribs['singleHeader']) ? $attribs['singleHeader'] : false;
+		$hint         = isset($attribs['placeholder']) ? $attribs['placeholder'] : '';
+		$class        = isset($attribs['class']) ? $attribs['class'] : '';
+		$onchange     = isset($attribs['onChange']) ? $attribs['onChange'] : '';
+		$minYear      = isset($attribs['minYear']) ? $attribs['minYear'] : null;
+		$maxYear      = isset($attribs['maxYear']) ? $attribs['maxYear'] : null;
+
+		$showTime     = ($showTime) ? "1" : "0";
+		$todayBtn     = ($todayBtn) ? "1" : "0";
+		$weekNumbers  = ($weekNumbers) ? "1" : "0";
+		$fillTable    = ($fillTable) ? "1" : "0";
+		$singleHeader = ($singleHeader) ? "1" : "0";
+
+		// Format value when not nulldate ('0000-00-00 00:00:00'), otherwise blank it as it would result in 1970-01-01.
+		if ($value && $value !== Factory::getDbo()->getNullDate() && strtotime($value) !== false)
+		{
+			$tz = date_default_timezone_get();
+			date_default_timezone_set('UTC');
+			$inputvalue = strftime($format, strtotime($value));
+			date_default_timezone_set($tz);
+		}
+		else
+		{
+			$inputvalue = '';
+		}
+
+		$data = array(
+			'id'           => $id,
+			'name'         => $name,
+			'class'        => $class,
+			'value'        => $inputvalue,
+			'format'       => $format,
+			'filter'       => $filter,
+			'required'     => $required,
+			'readonly'     => $readonly,
+			'disabled'     => $disabled,
+			'hint'         => $hint,
+			'autofocus'    => $autofocus,
+			'autocomplete' => $autocomplete,
+			'todaybutton'  => $todayBtn,
+			'weeknumbers'  => $weekNumbers,
+			'showtime'     => $showTime,
+			'filltable'    => $fillTable,
+			'timeformat'   => $timeFormat,
+			'singleheader' => $singleHeader,
+			'tag'          => $tag,
+			'helperPath'   => $helperPath,
+			'localesPath'  => $localesPath,
+			'direction'    => $direction,
+			'onchange'     => $onchange,
+			'minYear'      => $minYear,
+			'maxYear'      => $maxYear,
+		);
+
+		return LayoutHelper::render('joomla.form.field.calendar', $data, null, null);
+	}
+
+	/**
+	 * Add a directory where HTMLHelper should search for helpers. You may
+	 * either pass a string or an array of directories.
+	 *
+	 * @param   string  $path  A path to search.
+	 *
+	 * @return  array  An array with directory elements
+	 *
+	 * @since   1.5
+	 */
+	public static function addIncludePath($path = '')
+	{
+		// Loop through the path directories
+		foreach ((array) $path as $dir)
+		{
+			if (!empty($dir) && !in_array($dir, static::$includePaths))
+			{
+				array_unshift(static::$includePaths, \JPath::clean($dir));
+			}
+		}
+
+		return static::$includePaths;
+	}
+
+	/**
+	 * Internal method to get a JavaScript object notation string from an array
+	 *
+	 * @param   array  $array  The array to convert to JavaScript object notation
+	 *
+	 * @return  string  JavaScript object notation representation of the array
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0 Use `json_encode()` or `Joomla\Registry\Registry::toString('json')` instead
+	 */
+	public static function getJSObject(array $array = array())
+	{
+		Log::add(
+			__METHOD__ . " is deprecated. Use json_encode() or \\Joomla\\Registry\\Registry::toString('json') instead.",
+			Log::WARNING,
+			'deprecated'
+		);
+
+		$elements = array();
+
+		foreach ($array as $k => $v)
+		{
+			// Don't encode either of these types
+			if ($v === null || is_resource($v))
+			{
+				continue;
+			}
+
+			// Safely encode as a Javascript string
+			$key = json_encode((string) $k);
+
+			if (is_bool($v))
+			{
+				$elements[] = $key . ': ' . ($v ? 'true' : 'false');
+			}
+			elseif (is_numeric($v))
+			{
+				$elements[] = $key . ': ' . ($v + 0);
+			}
+			elseif (is_string($v))
+			{
+				if (strpos($v, '\\') === 0)
+				{
+					// Items such as functions and JSON objects are prefixed with \, strip the prefix and don't encode them
+					$elements[] = $key . ': ' . substr($v, 1);
+				}
+				else
+				{
+					// The safest way to insert a string
+					$elements[] = $key . ': ' . json_encode((string) $v);
+				}
+			}
+			else
+			{
+				$elements[] = $key . ': ' . static::getJSObject(is_object($v) ? get_object_vars($v) : $v);
+			}
+		}
+
+		return '{' . implode(',', $elements) . '}';
+	}
+}
diff --git a/core/libraries/src/Help/Help.php b/core/libraries/src/Help/Help.php
new file mode 100644
index 00000000..6dbb0654
--- /dev/null
+++ b/core/libraries/src/Help/Help.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Help;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Help system class
+ *
+ * @since  1.5
+ */
+class Help
+{
+	/**
+	 * Create a URL for a given help key reference
+	 *
+	 * @param   string   $ref           The name of the help screen (its key reference)
+	 * @param   boolean  $useComponent  Use the help file in the component directory
+	 * @param   string   $override      Use this URL instead of any other
+	 * @param   string   $component     Name of component (or null for current component)
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public static function createUrl($ref, $useComponent = false, $override = null, $component = null)
+	{
+		$local = false;
+		$app   = \JFactory::getApplication();
+
+		if ($component === null)
+		{
+			$component = \JApplicationHelper::getComponentName();
+		}
+
+		//  Determine the location of the help file.  At this stage the URL
+		//  can contain substitution codes that will be replaced later.
+
+		if ($override)
+		{
+			$url = $override;
+		}
+		else
+		{
+			// Get the user help URL.
+			$user = \JFactory::getUser();
+			$url  = $user->getParam('helpsite');
+
+			// If user hasn't specified a help URL, then get the global one.
+			if ($url == '')
+			{
+				$url = $app->get('helpurl');
+			}
+
+			// Component help URL overrides user and global.
+			if ($useComponent)
+			{
+				// Look for help URL in component parameters.
+				$params = \JComponentHelper::getParams($component);
+				$url    = $params->get('helpURL');
+
+				if ($url == '')
+				{
+					$local = true;
+					$url   = 'components/{component}/help/{language}/{keyref}';
+				}
+			}
+
+			// Set up a local help URL.
+			if (!$url)
+			{
+				$local = true;
+				$url   = 'help/{language}/{keyref}';
+			}
+		}
+
+		// If the URL is local then make sure we have a valid file extension on the URL.
+		if ($local)
+		{
+			if (!preg_match('#\.html$|\.xml$#i', $ref))
+			{
+				$url .= '.html';
+			}
+		}
+
+		/*
+		 *  Replace substitution codes in the URL.
+		 */
+		$lang    = \JFactory::getLanguage();
+		$version = new \JVersion;
+		$jver    = explode('.', $version->getShortVersion());
+		$jlang   = explode('-', $lang->getTag());
+
+		$debug  = $lang->setDebug(false);
+		$keyref = \JText::_($ref);
+		$lang->setDebug($debug);
+
+		// Replace substitution codes in help URL.
+		$search = array(
+			// Application name (eg. 'Administrator')
+			'{app}',
+			// Component name (eg. 'com_content')
+			'{component}',
+			// Help screen key reference
+			'{keyref}',
+			// Full language code (eg. 'en-GB')
+			'{language}',
+			// Short language code (eg. 'en')
+			'{langcode}',
+			// Region code (eg. 'GB')
+			'{langregion}',
+			// Joomla major version number
+			'{major}',
+			// Joomla minor version number
+			'{minor}',
+			// Joomla maintenance version number
+			'{maintenance}',
+		);
+
+		$replace = array(
+			// {app}
+			$app->getName(),
+			// {component}
+			$component,
+			// {keyref}
+			$keyref,
+			// {language}
+			$lang->getTag(),
+			// {langcode}
+			$jlang[0],
+			// {langregion}
+			$jlang[1],
+			// {major}
+			$jver[0],
+			// {minor}
+			$jver[1],
+			// {maintenance}
+			$jver[2],
+		);
+
+		// If the help file is local then check it exists.
+		// If it doesn't then fallback to English.
+		if ($local)
+		{
+			$try = str_replace($search, $replace, $url);
+
+			if (!is_file(JPATH_BASE . '/' . $try))
+			{
+				$replace[3] = 'en-GB';
+				$replace[4] = 'en';
+				$replace[5] = 'GB';
+			}
+		}
+
+		$url = str_replace($search, $replace, $url);
+
+		return $url;
+	}
+
+	/**
+	 * Builds a list of the help sites which can be used in a select option.
+	 *
+	 * @param   string  $pathToXml  Path to an XML file.
+	 *
+	 * @return  array  An array of arrays (text, value, selected).
+	 *
+	 * @since   1.5
+	 */
+	public static function createSiteList($pathToXml)
+	{
+		$list = array();
+		$xml  = false;
+
+		if (!empty($pathToXml))
+		{
+			$xml = simplexml_load_file($pathToXml);
+		}
+
+		if (!$xml)
+		{
+			$option['text']  = 'English (GB) help.joomla.org';
+			$option['value'] = 'http://help.joomla.org';
+
+			$list[] = $option;
+		}
+		else
+		{
+			$option = array();
+
+			foreach ($xml->sites->site as $site)
+			{
+				$option['text']  = (string) $site;
+				$option['value'] = (string) $site->attributes()->url;
+
+				$list[] = $option;
+			}
+		}
+
+		return $list;
+	}
+}
diff --git a/core/libraries/src/Helper/AuthenticationHelper.php b/core/libraries/src/Helper/AuthenticationHelper.php
new file mode 100644
index 00000000..eeeb1f17
--- /dev/null
+++ b/core/libraries/src/Helper/AuthenticationHelper.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Authentication helper class
+ *
+ * @since  3.6.3
+ */
+abstract class AuthenticationHelper
+{
+	/**
+	 * Get the Two Factor Authentication Methods available.
+	 *
+	 * @return  array  Two factor authentication methods.
+	 *
+	 * @since   3.6.3
+	 */
+	public static function getTwoFactorMethods()
+	{
+		// Get all the Two Factor Authentication plugins.
+		\JPluginHelper::importPlugin('twofactorauth');
+
+		// Trigger onUserTwofactorIdentify event and return the two factor enabled plugins.
+		$identities = \JEventDispatcher::getInstance()->trigger('onUserTwofactorIdentify', array());
+
+		// Generate array with two factor auth methods.
+		$options = array(
+			\JHtml::_('select.option', 'none', \JText::_('JGLOBAL_OTPMETHOD_NONE'), 'value', 'text'),
+		);
+
+		if (!empty($identities))
+		{
+			foreach ($identities as $identity)
+			{
+				if (!is_object($identity))
+				{
+					continue;
+				}
+
+				$options[] = \JHtml::_('select.option', $identity->method, $identity->title, 'value', 'text');
+			}
+		}
+
+		return $options;
+	}
+}
diff --git a/core/libraries/src/Helper/CMSHelper.php b/core/libraries/src/Helper/CMSHelper.php
new file mode 100644
index 00000000..f8e9aecd
--- /dev/null
+++ b/core/libraries/src/Helper/CMSHelper.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Multilanguage;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\TableInterface;
+use Joomla\Registry\Registry;
+
+/**
+ * Base Helper class.
+ *
+ * @since  3.2
+ */
+class CMSHelper
+{
+	/**
+	 * Gets the current language
+	 *
+	 * @param   boolean  $detectBrowser  Flag indicating whether to use the browser language as a fallback.
+	 *
+	 * @return  string  The language string
+	 *
+	 * @since   3.2
+	 */
+	public function getCurrentLanguage($detectBrowser = true)
+	{
+		$app = Factory::getApplication();
+		$langCode = null;
+
+		// Get the languagefilter parameters
+		if (Multilanguage::isEnabled())
+		{
+			$plugin       = PluginHelper::getPlugin('system', 'languagefilter');
+			$pluginParams = new Registry($plugin->params);
+
+			if ((int) $pluginParams->get('lang_cookie', 1) === 1)
+			{
+				$langCode = $app->input->cookie->getString(ApplicationHelper::getHash('language'));
+			}
+			else
+			{
+				$langCode = Factory::getSession()->get('plg_system_languagefilter.language');
+			}
+		}
+
+		// No cookie - let's try to detect browser language or use site default
+		if (!$langCode)
+		{
+			if ($detectBrowser)
+			{
+				$langCode = LanguageHelper::detectLanguage();
+			}
+			else
+			{
+				$langCode = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+			}
+		}
+
+		return $langCode;
+	}
+
+	/**
+	 * Gets the associated language ID
+	 *
+	 * @param   string  $langCode  The language code to look up
+	 *
+	 * @return  integer  The language ID
+	 *
+	 * @since   3.2
+	 */
+	public function getLanguageId($langCode)
+	{
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select('lang_id')
+			->from('#__languages')
+			->where($db->quoteName('lang_code') . ' = ' . $db->quote($langCode));
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Gets a row of data from a table
+	 *
+	 * @param   TableInterface  $table  Table instance for a row.
+	 *
+	 * @return  array  Associative array of all columns and values for a row in a table.
+	 *
+	 * @since   3.2
+	 */
+	public function getRowData(TableInterface $table)
+	{
+		$fields = $table->getFields();
+		$data = array();
+
+		foreach ($fields as &$field)
+		{
+			$columnName = $field->Field;
+			$value = $table->$columnName;
+			$data[$columnName] = $value;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to get an object containing all of the table columns and values.
+	 *
+	 * @param   TableInterface  $table  Table object.
+	 *
+	 * @return  \stdClass  Contains all of the columns and values.
+	 *
+	 * @since   3.2
+	 */
+	public function getDataObject(TableInterface $table)
+	{
+		$fields = $table->getFields();
+		$dataObject = new \stdClass;
+
+		foreach ($fields as $field)
+		{
+			$fieldName = $field->Field;
+			$dataObject->$fieldName = $table->get($fieldName);
+		}
+
+		return $dataObject;
+	}
+}
diff --git a/core/libraries/src/Helper/ContentHelper.php b/core/libraries/src/Helper/ContentHelper.php
new file mode 100644
index 00000000..cc951414
--- /dev/null
+++ b/core/libraries/src/Helper/ContentHelper.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Multilanguage;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
+
+/**
+ * Helper for standard content style extensions.
+ * This class mainly simplifies static helper methods often repeated in individual components
+ *
+ * @since  3.1
+ */
+class ContentHelper
+{
+	/**
+	 * Configure the Linkbar. Must be implemented by each extension.
+	 *
+	 * @param   string  $vName  The name of the active view.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public static function addSubmenu($vName)
+	{
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @param   integer  $categoryId  The category ID.
+	 * @param   integer  $id          The item ID.
+	 * @param   string   $assetName   The asset name
+	 *
+	 * @return  \JObject
+	 *
+	 * @since   3.1
+	 * @deprecated  3.2  Use ContentHelper::getActions() instead
+	 */
+	public static function _getActions($categoryId = 0, $id = 0, $assetName = '')
+	{
+		// Log usage of deprecated function
+		Log::add(__METHOD__ . '() is deprecated, use ContentHelper::getActions() with new arguments order instead.', Log::WARNING, 'deprecated');
+
+		// Reverted a change for version 2.5.6
+		$user   = Factory::getUser();
+		$result = new \JObject;
+
+		$path = JPATH_ADMINISTRATOR . '/components/' . $assetName . '/access.xml';
+
+		if (empty($id) && empty($categoryId))
+		{
+			$section = 'component';
+		}
+		elseif (empty($id))
+		{
+			$section = 'category';
+			$assetName .= '.category.' . (int) $categoryId;
+		}
+		else
+		{
+			// Used only in com_content
+			$section = 'article';
+			$assetName .= '.article.' . (int) $id;
+		}
+
+		$actions = Access::getActionsFromFile($path, "/access/section[@name='" . $section . "']/");
+
+		foreach ($actions as $action)
+		{
+			$result->set($action->name, $user->authorise($action->name, $assetName));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @param   string   $component  The component name.
+	 * @param   string   $section    The access section name.
+	 * @param   integer  $id         The item ID.
+	 *
+	 * @return  \JObject
+	 *
+	 * @since   3.2
+	 */
+	public static function getActions($component = '', $section = '', $id = 0)
+	{
+		// Check for deprecated arguments order
+		if (is_int($component) || $component === null)
+		{
+			$result = self::_getActions($component, $section, $id);
+
+			return $result;
+		}
+
+		$assetName = $component;
+
+		if ($section && $id)
+		{
+			$assetName .= '.' . $section . '.' . (int) $id;
+		}
+
+		$result = new \JObject;
+
+		$user = Factory::getUser();
+
+		$actions = Access::getActionsFromFile(
+			JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml', '/access/section[@name="component"]/'
+		);
+
+		if ($actions === false)
+		{
+			Log::add(
+				\JText::sprintf('JLIB_ERROR_COMPONENTS_ACL_CONFIGURATION_FILE_MISSING_OR_IMPROPERLY_STRUCTURED', $component), Log::ERROR, 'jerror'
+			);
+
+			return $result;
+		}
+
+		foreach ($actions as $action)
+		{
+			$result->set($action->name, $user->authorise($action->name, $assetName));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets the current language
+	 *
+	 * @param   boolean  $detectBrowser  Flag indicating whether to use the browser language as a fallback.
+	 *
+	 * @return  string  The language string
+	 *
+	 * @since   3.1
+	 * @note    CmsHelper::getCurrentLanguage is the preferred method
+	 */
+	public static function getCurrentLanguage($detectBrowser = true)
+	{
+		$app = Factory::getApplication();
+		$langCode = null;
+
+		// Get the languagefilter parameters
+		if (Multilanguage::isEnabled())
+		{
+			$plugin       = PluginHelper::getPlugin('system', 'languagefilter');
+			$pluginParams = new Registry($plugin->params);
+
+			if ((int) $pluginParams->get('lang_cookie', 1) === 1)
+			{
+				$langCode = $app->input->cookie->getString(ApplicationHelper::getHash('language'));
+			}
+			else
+			{
+				$langCode = Factory::getSession()->get('plg_system_languagefilter.language');
+			}
+		}
+
+		// No cookie - let's try to detect browser language or use site default
+		if (!$langCode)
+		{
+			if ($detectBrowser)
+			{
+				$langCode = LanguageHelper::detectLanguage();
+			}
+			else
+			{
+				$langCode = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+			}
+		}
+
+		return $langCode;
+	}
+
+	/**
+	 * Gets the associated language ID
+	 *
+	 * @param   string  $langCode  The language code to look up
+	 *
+	 * @return  integer  The language ID
+	 *
+	 * @since   3.1
+	 * @note    CmsHelper::getLanguage() is the preferred method.
+	 */
+	public static function getLanguageId($langCode)
+	{
+		$db    = Factory::getDbo();
+		$query = $db->getQuery(true)
+			->select('lang_id')
+			->from('#__languages')
+			->where($db->quoteName('lang_code') . ' = ' . $db->quote($langCode));
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Gets a row of data from a table
+	 *
+	 * @param   Table  $table  Table instance for a row.
+	 *
+	 * @return  array  Associative array of all columns and values for a row in a table.
+	 *
+	 * @since   3.1
+	 */
+	public function getRowData(Table $table)
+	{
+		$data = new CMSHelper;
+
+		return $data->getRowData($table);
+	}
+}
diff --git a/core/libraries/src/Helper/ContentHistoryHelper.php b/core/libraries/src/Helper/ContentHistoryHelper.php
new file mode 100644
index 00000000..87353ec8
--- /dev/null
+++ b/core/libraries/src/Helper/ContentHistoryHelper.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Table\Table;
+
+/**
+ * Versions helper class, provides methods to perform various tasks relevant
+ * versioning of content.
+ *
+ * @since  3.2
+ */
+class ContentHistoryHelper extends CMSHelper
+{
+	/**
+	 * Alias for storing type in versions table
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	public $typeAlias = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $typeAlias  The type of content to be versioned (for example, 'com_content.article').
+	 *
+	 * @since   3.2
+	 */
+	public function __construct($typeAlias = null)
+	{
+		$this->typeAlias = $typeAlias;
+	}
+
+	/**
+	 * Method to delete the history for an item.
+	 *
+	 * @param   Table  $table  Table object being versioned
+	 *
+	 * @return  boolean  true on success, otherwise false.
+	 *
+	 * @since   3.2
+	 */
+	public function deleteHistory($table)
+	{
+		$key = $table->getKeyName();
+		$id = $table->$key;
+		$typeTable = Table::getInstance('Contenttype', 'JTable');
+		$typeId = $typeTable->getTypeId($this->typeAlias);
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->delete($db->quoteName('#__ucm_history'))
+			->where($db->quoteName('ucm_item_id') . ' = ' . (int) $id)
+			->where($db->quoteName('ucm_type_id') . ' = ' . (int) $typeId);
+		$db->setQuery($query);
+
+		return $db->execute();
+	}
+
+	/**
+	 * Method to get a list of available versions of this item.
+	 *
+	 * @param   integer  $typeId  Type id for this component item.
+	 * @param   mixed    $id      Primary key of row to get history for.
+	 *
+	 * @return  mixed   The return value or null if the query failed.
+	 *
+	 * @since   3.2
+	 */
+	public function getHistory($typeId, $id)
+	{
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('h.version_note') . ',' . $db->quoteName('h.save_date') . ',' . $db->quoteName('u.name'))
+			->from($db->quoteName('#__ucm_history') . ' AS h ')
+			->leftJoin($db->quoteName('#__users') . ' AS u ON ' . $db->quoteName('u.id') . ' = ' . $db->quoteName('h.editor_user_id'))
+			->where($db->quoteName('ucm_item_id') . ' = ' . $db->quote($id))
+			->where($db->quoteName('ucm_type_id') . ' = ' . (int) $typeId)
+			->order($db->quoteName('save_date') . ' DESC ');
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Method to save a version snapshot to the content history table.
+	 *
+	 * @param   Table  $table  Table object being versioned
+	 *
+	 * @return  boolean  True on success, otherwise false.
+	 *
+	 * @since   3.2
+	 */
+	public function store($table)
+	{
+		$dataObject = $this->getDataObject($table);
+		$historyTable = Table::getInstance('Contenthistory', 'JTable');
+		$typeTable = Table::getInstance('Contenttype', 'JTable');
+		$typeTable->load(array('type_alias' => $this->typeAlias));
+		$historyTable->set('ucm_type_id', $typeTable->type_id);
+
+		$key = $table->getKeyName();
+		$historyTable->set('ucm_item_id', $table->$key);
+
+		// Don't store unless we have a non-zero item id
+		if (!$historyTable->ucm_item_id)
+		{
+			return true;
+		}
+
+		$historyTable->set('version_data', json_encode($dataObject));
+		$input = \JFactory::getApplication()->input;
+		$data = $input->get('jform', array(), 'array');
+		$versionName = false;
+
+		if (isset($data['version_note']))
+		{
+			$versionName = \JFilterInput::getInstance()->clean($data['version_note'], 'string');
+			$historyTable->set('version_note', $versionName);
+		}
+
+		// Don't save if hash already exists and same version note
+		$historyTable->set('sha1_hash', $historyTable->getSha1($dataObject, $typeTable));
+
+		if ($historyRow = $historyTable->getHashMatch())
+		{
+			if (!$versionName || ($historyRow->version_note === $versionName))
+			{
+				return true;
+			}
+			else
+			{
+				// Update existing row to set version note
+				$historyTable->set('version_id', $historyRow->version_id);
+			}
+		}
+
+		$result = $historyTable->store();
+
+		// Load history_limit config from extension.
+		$aliasParts = explode('.', $this->typeAlias);
+
+		$context = isset($aliasParts[1]) ? $aliasParts[1] : '';
+
+		$maxVersionsContext = ComponentHelper::getParams($aliasParts[0])->get('history_limit' . '_' . $context, 0);
+
+		if ($maxVersionsContext)
+		{
+			$historyTable->deleteOldVersions($maxVersionsContext);
+		}
+		elseif ($maxVersions = ComponentHelper::getParams($aliasParts[0])->get('history_limit', 0))
+		{
+			$historyTable->deleteOldVersions($maxVersions);
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Helper/LibraryHelper.php b/core/libraries/src/Helper/LibraryHelper.php
new file mode 100644
index 00000000..c8b4efe6
--- /dev/null
+++ b/core/libraries/src/Helper/LibraryHelper.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Library helper class
+ *
+ * @since  3.2
+ */
+class LibraryHelper
+{
+	/**
+	 * The component list cache
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $libraries = array();
+
+	/**
+	 * Get the library information.
+	 *
+	 * @param   string   $element  Element of the library in the extensions table.
+	 * @param   boolean  $strict   If set and the library does not exist, the enabled attribute will be set to false.
+	 *
+	 * @return  \stdClass   An object with the library's information.
+	 *
+	 * @since   3.2
+	 */
+	public static function getLibrary($element, $strict = false)
+	{
+		// Is already cached?
+		if (isset(static::$libraries[$element]) || static::loadLibrary($element))
+		{
+			$result = static::$libraries[$element];
+
+			// Convert the params to an object.
+			if (is_string($result->params))
+			{
+				$result->params = new Registry($result->params);
+			}
+		}
+		else
+		{
+			$result = new \stdClass;
+			$result->enabled = $strict ? false : true;
+			$result->params = new Registry;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Checks if a library is enabled
+	 *
+	 * @param   string  $element  Element of the library in the extensions table.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public static function isEnabled($element)
+	{
+		return static::getLibrary($element, true)->enabled;
+	}
+
+	/**
+	 * Gets the parameter object for the library
+	 *
+	 * @param   string   $element  Element of the library in the extensions table.
+	 * @param   boolean  $strict   If set and the library does not exist, false will be returned
+	 *
+	 * @return  Registry  A Registry object.
+	 *
+	 * @see     Registry
+	 * @since   3.2
+	 */
+	public static function getParams($element, $strict = false)
+	{
+		return static::getLibrary($element, $strict)->params;
+	}
+
+	/**
+	 * Save the parameters object for the library
+	 *
+	 * @param   string    $element  Element of the library in the extensions table.
+	 * @param   Registry  $params   Params to save
+	 *
+	 * @return  Registry  A Registry object.
+	 *
+	 * @see     Registry
+	 * @since   3.2
+	 */
+	public static function saveParams($element, $params)
+	{
+		if (static::isEnabled($element))
+		{
+			// Save params in DB
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->update($db->quoteName('#__extensions'))
+				->set($db->quoteName('params') . ' = ' . $db->quote($params->toString()))
+				->where($db->quoteName('type') . ' = ' . $db->quote('library'))
+				->where($db->quoteName('element') . ' = ' . $db->quote($element));
+			$db->setQuery($query);
+
+			$result = $db->execute();
+
+			// Update params in libraries cache
+			if ($result && isset(static::$libraries[$element]))
+			{
+				static::$libraries[$element]->params = $params;
+			}
+
+			return $result;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Load the installed library into the libraries property.
+	 *
+	 * @param   string  $element  The element value for the extension
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Use LibraryHelper::loadLibrary() instead
+	 */
+	protected static function _load($element)
+	{
+		return static::loadLibrary($element);
+	}
+
+	/**
+	 * Load the installed library into the libraries property.
+	 *
+	 * @param   string  $element  The element value for the extension
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.7.0
+	 */
+	protected static function loadLibrary($element)
+	{
+		$loader = function($element)
+		{
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName(array('extension_id', 'element', 'params', 'enabled'), array('id', 'option', null, null)))
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('type') . ' = ' . $db->quote('library'))
+				->where($db->quoteName('element') . ' = ' . $db->quote($element));
+			$db->setQuery($query);
+
+			return $db->loadObject();
+		};
+
+		/** @var \JCacheControllerCallback $cache */
+		$cache = \JFactory::getCache('_system', 'callback');
+
+		try
+		{
+			static::$libraries[$element] = $cache->get($loader, array($element), __METHOD__ . $element);
+		}
+		catch (\JCacheException $e)
+		{
+			static::$libraries[$element] = $loader($element);
+		}
+
+		if (empty(static::$libraries[$element]))
+		{
+			// Fatal error.
+			$error = \JText::_('JLIB_APPLICATION_ERROR_LIBRARY_NOT_FOUND');
+			\JLog::add(\JText::sprintf('JLIB_APPLICATION_ERROR_LIBRARY_NOT_LOADING', $element, $error), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Helper/MediaHelper.php b/core/libraries/src/Helper/MediaHelper.php
new file mode 100644
index 00000000..4e4d7d5b
--- /dev/null
+++ b/core/libraries/src/Helper/MediaHelper.php
@@ -0,0 +1,412 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+/**
+ * Media helper class
+ *
+ * @since  3.2
+ */
+class MediaHelper
+{
+	/**
+	 * Checks if the file is an image
+	 *
+	 * @param   string  $fileName  The filename
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public function isImage($fileName)
+	{
+		static $imageTypes = 'xcf|odg|gif|jpg|png|bmp';
+
+		return preg_match("/\.(?:$imageTypes)$/i", $fileName);
+	}
+
+	/**
+	 * Gets the file extension for purposed of using an icon
+	 *
+	 * @param   string  $fileName  The filename
+	 *
+	 * @return  string  File extension to determine icon
+	 *
+	 * @since   3.2
+	 */
+	public static function getTypeIcon($fileName)
+	{
+		return strtolower(substr($fileName, strrpos($fileName, '.') + 1));
+	}
+
+	/**
+	 * Get the Mime type
+	 *
+	 * @param   string   $file     The link to the file to be checked
+	 * @param   boolean  $isImage  True if the passed file is an image else false
+	 *
+	 * @return  mixed    the mime type detected false on error
+	 *
+	 * @since   3.7.2
+	 */
+	private function getMimeType($file, $isImage = false)
+	{
+		// If we can't detect anything mime is false
+		$mime = false;
+
+		try
+		{
+			if ($isImage && function_exists('exif_imagetype'))
+			{
+				$mime = image_type_to_mime_type(exif_imagetype($file));
+			}
+			elseif ($isImage && function_exists('getimagesize'))
+			{
+				$imagesize = getimagesize($file);
+				$mime      = isset($imagesize['mime']) ? $imagesize['mime'] : false;
+			}
+			elseif (function_exists('mime_content_type'))
+			{
+				// We have mime magic.
+				$mime = mime_content_type($file);
+			}
+			elseif (function_exists('finfo_open'))
+			{
+				// We have fileinfo
+				$finfo = finfo_open(FILEINFO_MIME_TYPE);
+				$mime  = finfo_file($finfo, $file);
+				finfo_close($finfo);
+			}
+		}
+		catch (\Exception $e)
+		{
+			// If we have any kind of error here => false;
+			return false;
+		}
+
+		// If we can't detect the mime try it again
+		if ($mime === 'application/octet-stream' && $isImage === true)
+		{
+			$mime = $this->getMimeType($file, false);
+		}
+
+		// We have a mime here
+		return $mime;
+	}
+
+	/**
+	 * Checks the Mime type
+	 *
+	 * @param   string  $mime       The mime to be checked
+	 * @param   string  $component  The optional name for the component storing the parameters
+	 *
+	 * @return  boolean  true if mime type checking is disabled or it passes the checks else false
+	 *
+	 * @since   3.7
+	 */
+	private function checkMimeType($mime, $component = 'com_media')
+	{
+		$params = ComponentHelper::getParams($component);
+
+		if ($params->get('check_mime', 1))
+		{
+			// Get the mime type configuration
+			$allowedMime = array_map('trim', explode(',', $params->get('upload_mime')));
+
+			// Mime should be available and in the whitelist
+			return !empty($mime) && in_array($mime, $allowedMime);
+		}
+
+		// We don't check mime at all or it passes the checks
+		return true;
+	}
+
+	/**
+	 * Checks if the file can be uploaded
+	 *
+	 * @param   array   $file       File information
+	 * @param   string  $component  The option name for the component storing the parameters
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public function canUpload($file, $component = 'com_media')
+	{
+		$app    = \JFactory::getApplication();
+		$params = ComponentHelper::getParams($component);
+
+		if (empty($file['name']))
+		{
+			$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_UPLOAD_INPUT'), 'error');
+
+			return false;
+		}
+
+		jimport('joomla.filesystem.file');
+
+		if (str_replace(' ', '', $file['name']) !== $file['name'] || $file['name'] !== \JFile::makeSafe($file['name']))
+		{
+			$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNFILENAME'), 'error');
+
+			return false;
+		}
+
+		$filetypes = explode('.', $file['name']);
+
+		if (count($filetypes) < 2)
+		{
+			// There seems to be no extension
+			$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error');
+
+			return false;
+		}
+
+		array_shift($filetypes);
+
+		// Media file names should never have executable extensions buried in them.
+		$executable = array(
+			'php', 'js', 'exe', 'phtml', 'java', 'perl', 'py', 'asp', 'dll', 'go', 'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta', 'ins', 'isp',
+			'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb', 'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh',
+		);
+
+		$check = array_intersect($filetypes, $executable);
+
+		if (!empty($check))
+		{
+			$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error');
+
+			return false;
+		}
+
+		$filetype  = array_pop($filetypes);
+		$allowable = array_map('trim', explode(',', $params->get('upload_extensions')));
+		$ignored   = array_map('trim', explode(',', $params->get('ignore_extensions')));
+
+		if ($filetype == '' || $filetype == false || (!in_array($filetype, $allowable) && !in_array($filetype, $ignored)))
+		{
+			$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNFILETYPE'), 'error');
+
+			return false;
+		}
+
+		$maxSize = (int) ($params->get('upload_maxsize', 0) * 1024 * 1024);
+
+		if ($maxSize > 0 && (int) $file['size'] > $maxSize)
+		{
+			$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'error');
+
+			return false;
+		}
+
+		if ($params->get('restrict_uploads', 1))
+		{
+			$images = array_map('trim', explode(',', $params->get('image_extensions')));
+
+			if (in_array($filetype, $images))
+			{
+				// If tmp_name is empty, then the file was bigger than the PHP limit
+				if (!empty($file['tmp_name']))
+				{
+					// Get the mime type this is an image file
+					$mime = $this->getMimeType($file['tmp_name'], true);
+
+					// Did we get anything useful?
+					if ($mime != false)
+					{
+						$result = $this->checkMimeType($mime, $component);
+
+						// If the mime type is not allowed we don't upload it and show the mime code error to the user
+						if ($result === false)
+						{
+							$app->enqueueMessage(\JText::sprintf('JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE', $mime), 'error');
+
+							return false;
+						}
+					}
+					// We can't detect the mime type so it looks like an invalid image
+					else
+					{
+						$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNINVALID_IMG'), 'error');
+
+						return false;
+					}
+				}
+				else
+				{
+					$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNFILETOOLARGE'), 'error');
+
+					return false;
+				}
+			}
+			elseif (!in_array($filetype, $ignored))
+			{
+				// Get the mime type this is not an image file
+				$mime = $this->getMimeType($file['tmp_name'], false);
+
+				// Did we get anything useful?
+				if ($mime != false)
+				{
+					$result = $this->checkMimeType($mime, $component);
+
+					// If the mime type is not allowed we don't upload it and show the mime code error to the user
+					if ($result === false)
+					{
+						$app->enqueueMessage(\JText::sprintf('JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE', $mime), 'error');
+
+						return false;
+					}
+				}
+				// We can't detect the mime type so it looks like an invalid file
+				else
+				{
+					$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'error');
+
+					return false;
+				}
+
+				if (!\JFactory::getUser()->authorise('core.manage', $component))
+				{
+					$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNNOTADMIN'), 'error');
+
+					return false;
+				}
+			}
+		}
+
+		$xss_check = file_get_contents($file['tmp_name'], false, null, -1, 256);
+
+		$html_tags = array(
+			'abbr', 'acronym', 'address', 'applet', 'area', 'audioscope', 'base', 'basefont', 'bdo', 'bgsound', 'big', 'blackface', 'blink',
+			'blockquote', 'body', 'bq', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'comment', 'custom', 'dd', 'del',
+			'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'fn', 'font', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+			'head', 'hr', 'html', 'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'keygen', 'kbd', 'label', 'layer', 'legend', 'li', 'limittext',
+			'link', 'listing', 'map', 'marquee', 'menu', 'meta', 'multicol', 'nobr', 'noembed', 'noframes', 'noscript', 'nosmartquotes', 'object',
+			'ol', 'optgroup', 'option', 'param', 'plaintext', 'pre', 'rt', 'ruby', 's', 'samp', 'script', 'select', 'server', 'shadow', 'sidebar',
+			'small', 'spacer', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title',
+			'tr', 'tt', 'ul', 'var', 'wbr', 'xml', 'xmp', '!DOCTYPE', '!--',
+		);
+
+		foreach ($html_tags as $tag)
+		{
+			// A tag is '<tagname ', so we need to add < and a space or '<tagname>'
+			if (stripos($xss_check, '<' . $tag . ' ') !== false || stripos($xss_check, '<' . $tag . '>') !== false)
+			{
+				$app->enqueueMessage(\JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'error');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Calculate the size of a resized image
+	 *
+	 * @param   integer  $width   Image width
+	 * @param   integer  $height  Image height
+	 * @param   integer  $target  Target size
+	 *
+	 * @return  array  The new width and height
+	 *
+	 * @since   3.2
+	 */
+	public static function imageResize($width, $height, $target)
+	{
+		/*
+		 * Takes the larger size of the width and height and applies the
+		 * formula accordingly. This is so this script will work
+		 * dynamically with any size image
+		 */
+		if ($width > $height)
+		{
+			$percentage = ($target / $width);
+		}
+		else
+		{
+			$percentage = ($target / $height);
+		}
+
+		// Gets the new value and applies the percentage, then rounds the value
+		$width  = round($width * $percentage);
+		$height = round($height * $percentage);
+
+		return array($width, $height);
+	}
+
+	/**
+	 * Counts the files and directories in a directory that are not php or html files.
+	 *
+	 * @param   string  $dir  Directory name
+	 *
+	 * @return  array  The number of media files and directories in the given directory
+	 *
+	 * @since   3.2
+	 */
+	public function countFiles($dir)
+	{
+		$total_file = 0;
+		$total_dir  = 0;
+
+		if (is_dir($dir))
+		{
+			$d = dir($dir);
+
+			while (($entry = $d->read()) !== false)
+			{
+				if ($entry[0] !== '.' && strpos($entry, '.html') === false && strpos($entry, '.php') === false && is_file($dir . DIRECTORY_SEPARATOR . $entry))
+				{
+					$total_file++;
+				}
+
+				if ($entry[0] !== '.' && is_dir($dir . DIRECTORY_SEPARATOR . $entry))
+				{
+					$total_dir++;
+				}
+			}
+
+			$d->close();
+		}
+
+		return array($total_file, $total_dir);
+	}
+
+	/**
+	 * Small helper function that properly converts any
+	 * configuration options to their byte representation.
+	 *
+	 * @param   string|integer  $val  The value to be converted to bytes.
+	 *
+	 * @return integer The calculated bytes value from the input.
+	 *
+	 * @since 3.3
+	 */
+	public function toBytes($val)
+	{
+		switch ($val[strlen($val) - 1])
+		{
+			case 'M':
+			case 'm':
+				return (int) $val * 1048576;
+			case 'K':
+			case 'k':
+				return (int) $val * 1024;
+			case 'G':
+			case 'g':
+				return (int) $val * 1073741824;
+			default:
+				return $val;
+		}
+	}
+}
diff --git a/core/libraries/src/Helper/ModuleHelper.php b/core/libraries/src/Helper/ModuleHelper.php
new file mode 100644
index 00000000..8e999efa
--- /dev/null
+++ b/core/libraries/src/Helper/ModuleHelper.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\Registry\Registry;
+
+/**
+ * Module helper class
+ *
+ * @since  1.5
+ */
+abstract class ModuleHelper
+{
+	/**
+	 * Get module by name (real, eg 'Breadcrumbs' or folder, eg 'mod_breadcrumbs')
+	 *
+	 * @param   string  $name   The name of the module
+	 * @param   string  $title  The title of the module, optional
+	 *
+	 * @return  \stdClass  The Module object
+	 *
+	 * @since   1.5
+	 */
+	public static function &getModule($name, $title = null)
+	{
+		$result = null;
+		$modules =& static::load();
+		$total = count($modules);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			// Match the name of the module
+			if ($modules[$i]->name === $name || $modules[$i]->module === $name)
+			{
+				// Match the title if we're looking for a specific instance of the module
+				if (!$title || $modules[$i]->title === $title)
+				{
+					// Found it
+					$result = &$modules[$i];
+					break;
+				}
+			}
+		}
+
+		// If we didn't find it, and the name is mod_something, create a dummy object
+		if ($result === null && strpos($name, 'mod_') === 0)
+		{
+			$result            = new \stdClass;
+			$result->id        = 0;
+			$result->title     = '';
+			$result->module    = $name;
+			$result->position  = '';
+			$result->content   = '';
+			$result->showtitle = 0;
+			$result->control   = '';
+			$result->params    = '';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get modules by position
+	 *
+	 * @param   string  $position  The position of the module
+	 *
+	 * @return  array  An array of module objects
+	 *
+	 * @since   1.5
+	 */
+	public static function &getModules($position)
+	{
+		$position = strtolower($position);
+		$result = array();
+		$input  = \JFactory::getApplication()->input;
+
+		$modules =& static::load();
+
+		$total = count($modules);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			if ($modules[$i]->position === $position)
+			{
+				$result[] = &$modules[$i];
+			}
+		}
+
+		if (count($result) === 0)
+		{
+			if ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
+			{
+				$result[0] = static::getModule('mod_' . $position);
+				$result[0]->title = $position;
+				$result[0]->content = $position;
+				$result[0]->position = $position;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Checks if a module is enabled. A given module will only be returned
+	 * if it meets the following criteria: it is enabled, it is assigned to
+	 * the current menu item or all items, and the user meets the access level
+	 * requirements.
+	 *
+	 * @param   string  $module  The module name
+	 *
+	 * @return  boolean See description for conditions.
+	 *
+	 * @since   1.5
+	 */
+	public static function isEnabled($module)
+	{
+		$result = static::getModule($module);
+
+		return $result !== null && $result->id !== 0;
+	}
+
+	/**
+	 * Render the module.
+	 *
+	 * @param   object  $module   A module object.
+	 * @param   array   $attribs  An array of attributes for the module (probably from the XML).
+	 *
+	 * @return  string  The HTML content of the module output.
+	 *
+	 * @since   1.5
+	 */
+	public static function renderModule($module, $attribs = array())
+	{
+		static $chrome;
+
+		// Check that $module is a valid module object
+		if (!is_object($module) || !isset($module->module) || !isset($module->params))
+		{
+			if (JDEBUG)
+			{
+				\JLog::addLogger(array('text_file' => 'jmodulehelper.log.php'), \JLog::ALL, array('modulehelper'));
+				\JLog::add('ModuleHelper::renderModule($module) expects a module object', \JLog::DEBUG, 'modulehelper');
+			}
+
+			return;
+		}
+
+		if (JDEBUG)
+		{
+			\JProfiler::getInstance('Application')->mark('beforeRenderModule ' . $module->module . ' (' . $module->title . ')');
+		}
+
+		$app = \JFactory::getApplication();
+
+		// Record the scope.
+		$scope = $app->scope;
+
+		// Set scope to component name
+		$app->scope = $module->module;
+
+		// Get module parameters
+		$params = new Registry($module->params);
+
+		// Get the template
+		$template = $app->getTemplate();
+
+		// Get module path
+		$module->module = preg_replace('/[^A-Z0-9_\.-]/i', '', $module->module);
+		$path = JPATH_BASE . '/modules/' . $module->module . '/' . $module->module . '.php';
+
+		// Load the module
+		if (file_exists($path))
+		{
+			$lang = \JFactory::getLanguage();
+
+			$coreLanguageDirectory      = JPATH_BASE;
+			$extensionLanguageDirectory = dirname($path);
+
+			$langPaths = $lang->getPaths();
+
+			// Only load the module's language file if it hasn't been already
+			if (!$langPaths || (!isset($langPaths[$coreLanguageDirectory]) && !isset($langPaths[$extensionLanguageDirectory])))
+			{
+				// 1.5 or Core then 1.6 3PD
+				$lang->load($module->module, $coreLanguageDirectory, null, false, true) ||
+					$lang->load($module->module, $extensionLanguageDirectory, null, false, true);
+			}
+
+			$content = '';
+			ob_start();
+			include $path;
+			$module->content = ob_get_contents() . $content;
+			ob_end_clean();
+		}
+
+		// Load the module chrome functions
+		if (!$chrome)
+		{
+			$chrome = array();
+		}
+
+		include_once JPATH_THEMES . '/system/html/modules.php';
+		$chromePath = JPATH_THEMES . '/' . $template . '/html/modules.php';
+
+		if (!isset($chrome[$chromePath]))
+		{
+			if (file_exists($chromePath))
+			{
+				include_once $chromePath;
+			}
+
+			$chrome[$chromePath] = true;
+		}
+
+		// Check if the current module has a style param to override template module style
+		$paramsChromeStyle = $params->get('style');
+
+		if ($paramsChromeStyle)
+		{
+			$attribs['style'] = preg_replace('/^(system|' . $template . ')\-/i', '', $paramsChromeStyle);
+		}
+
+		// Make sure a style is set
+		if (!isset($attribs['style']))
+		{
+			$attribs['style'] = 'none';
+		}
+
+		// Dynamically add outline style
+		if ($app->input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
+		{
+			$attribs['style'] .= ' outline';
+		}
+
+		// If the $module is nulled it will return an empty content, otherwise it will render the module normally.
+		$app->triggerEvent('onRenderModule', array(&$module, &$attribs));
+
+		if ($module === null || !isset($module->content))
+		{
+			return '';
+		}
+
+		foreach (explode(' ', $attribs['style']) as $style)
+		{
+			$chromeMethod = 'modChrome_' . $style;
+
+			// Apply chrome and render module
+			if (function_exists($chromeMethod))
+			{
+				$module->style = $attribs['style'];
+
+				ob_start();
+				$chromeMethod($module, $params, $attribs);
+				$module->content = ob_get_contents();
+				ob_end_clean();
+			}
+		}
+
+		// Revert the scope
+		$app->scope = $scope;
+
+		$app->triggerEvent('onAfterRenderModule', array(&$module, &$attribs));
+
+		if (JDEBUG)
+		{
+			\JProfiler::getInstance('Application')->mark('afterRenderModule ' . $module->module . ' (' . $module->title . ')');
+		}
+
+		return $module->content;
+	}
+
+	/**
+	 * Get the path to a layout for a module
+	 *
+	 * @param   string  $module  The name of the module
+	 * @param   string  $layout  The name of the module layout. If alternative layout, in the form template:filename.
+	 *
+	 * @return  string  The path to the module layout
+	 *
+	 * @since   1.5
+	 */
+	public static function getLayoutPath($module, $layout = 'default')
+	{
+		$template = \JFactory::getApplication()->getTemplate();
+		$defaultLayout = $layout;
+
+		if (strpos($layout, ':') !== false)
+		{
+			// Get the template and file name from the string
+			$temp = explode(':', $layout);
+			$template = $temp[0] === '_' ? $template : $temp[0];
+			$layout = $temp[1];
+			$defaultLayout = $temp[1] ?: 'default';
+		}
+
+		// Build the template and base path for the layout
+		$tPath = JPATH_THEMES . '/' . $template . '/html/' . $module . '/' . $layout . '.php';
+		$bPath = JPATH_BASE . '/modules/' . $module . '/tmpl/' . $defaultLayout . '.php';
+		$dPath = JPATH_BASE . '/modules/' . $module . '/tmpl/default.php';
+
+		// If the template has a layout override use it
+		if (file_exists($tPath))
+		{
+			return $tPath;
+		}
+
+		if (file_exists($bPath))
+		{
+			return $bPath;
+		}
+
+		return $dPath;
+	}
+
+	/**
+	 * Load published modules.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use ModuleHelper::load() instead
+	 */
+	protected static function &_load()
+	{
+		return static::load();
+	}
+
+	/**
+	 * Load published modules.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	protected static function &load()
+	{
+		static $modules;
+
+		if (isset($modules))
+		{
+			return $modules;
+		}
+
+		$app = \JFactory::getApplication();
+
+		$modules = null;
+
+		$app->triggerEvent('onPrepareModuleList', array(&$modules));
+
+		// If the onPrepareModuleList event returns an array of modules, then ignore the default module list creation
+		if (!is_array($modules))
+		{
+			$modules = static::getModuleList();
+		}
+
+		$app->triggerEvent('onAfterModuleList', array(&$modules));
+
+		$modules = static::cleanModuleList($modules);
+
+		$app->triggerEvent('onAfterCleanModuleList', array(&$modules));
+
+		return $modules;
+	}
+
+	/**
+	 * Module list
+	 *
+	 * @return  array
+	 */
+	public static function getModuleList()
+	{
+		$app = \JFactory::getApplication();
+		$Itemid = $app->input->getInt('Itemid', 0);
+		$groups = implode(',', \JFactory::getUser()->getAuthorisedViewLevels());
+		$lang = \JFactory::getLanguage()->getTag();
+		$clientId = (int) $app->getClientId();
+
+		// Build a cache ID for the resulting data object
+		$cacheId = $groups . '.' . $clientId . '.' . $Itemid;
+
+		$db = \JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('m.id, m.title, m.module, m.position, m.content, m.showtitle, m.params, mm.menuid')
+			->from('#__modules AS m')
+			->join('LEFT', '#__modules_menu AS mm ON mm.moduleid = m.id')
+			->where('m.published = 1')
+			->join('LEFT', '#__extensions AS e ON e.element = m.module AND e.client_id = m.client_id')
+			->where('e.enabled = 1');
+
+		$date = \JFactory::getDate();
+		$now = $date->toSql();
+		$nullDate = $db->getNullDate();
+		$query->where('(m.publish_up = ' . $db->quote($nullDate) . ' OR m.publish_up <= ' . $db->quote($now) . ')')
+			->where('(m.publish_down = ' . $db->quote($nullDate) . ' OR m.publish_down >= ' . $db->quote($now) . ')')
+			->where('m.access IN (' . $groups . ')')
+			->where('m.client_id = ' . $clientId)
+			->where('(mm.menuid = ' . $Itemid . ' OR mm.menuid <= 0)');
+
+		// Filter by language
+		if ($app->isClient('site') && $app->getLanguageFilter())
+		{
+			$query->where('m.language IN (' . $db->quote($lang) . ',' . $db->quote('*') . ')');
+			$cacheId .= $lang . '*';
+		}
+
+		if ($app->isClient('administrator') && static::isAdminMultilang())
+		{
+			$query->where('m.language IN (' . $db->quote($lang) . ',' . $db->quote('*') . ')');
+			$cacheId .= $lang . '*';
+		}
+
+		$query->order('m.position, m.ordering');
+
+		// Set the query
+		$db->setQuery($query);
+
+		try
+		{
+			/** @var \JCacheControllerCallback $cache */
+			$cache = \JFactory::getCache('com_modules', 'callback');
+
+			$modules = $cache->get(array($db, 'loadObjectList'), array(), md5($cacheId), false);
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::sprintf('JLIB_APPLICATION_ERROR_MODULE_LOAD', $e->getMessage()), \JLog::WARNING, 'jerror');
+
+			return array();
+		}
+
+		return $modules;
+	}
+
+	/**
+	 * Clean the module list
+	 *
+	 * @param   array  $modules  Array with module objects
+	 *
+	 * @return  array
+	 */
+	public static function cleanModuleList($modules)
+	{
+		// Apply negative selections and eliminate duplicates
+		$Itemid = \JFactory::getApplication()->input->getInt('Itemid');
+		$negId = $Itemid ? -(int) $Itemid : false;
+		$clean = array();
+		$dupes = array();
+
+		foreach ($modules as $i => $module)
+		{
+			// The module is excluded if there is an explicit prohibition
+			$negHit = ($negId === (int) $module->menuid);
+
+			if (isset($dupes[$module->id]))
+			{
+				// If this item has been excluded, keep the duplicate flag set,
+				// but remove any item from the modules array.
+				if ($negHit)
+				{
+					unset($clean[$module->id]);
+				}
+
+				continue;
+			}
+
+			$dupes[$module->id] = true;
+
+			// Only accept modules without explicit exclusions.
+			if ($negHit)
+			{
+				continue;
+			}
+
+			$module->name = substr($module->module, 4);
+			$module->style = null;
+			$module->position = strtolower($module->position);
+
+			$clean[$module->id] = $module;
+		}
+
+		unset($dupes);
+
+		// Return to simple indexing that matches the query order.
+		return array_values($clean);
+	}
+
+	/**
+	 * Module cache helper
+	 *
+	 * Caching modes:
+	 * To be set in XML:
+	 * 'static'      One cache file for all pages with the same module parameters
+	 * 'oldstatic'   1.5 definition of module caching, one cache file for all pages
+	 *               with the same module id and user aid,
+	 * 'itemid'      Changes on itemid change, to be called from inside the module:
+	 * 'safeuri'     Id created from $cacheparams->modeparams array,
+	 * 'id'          Module sets own cache id's
+	 *
+	 * @param   object  $module        Module object
+	 * @param   object  $moduleparams  Module parameters
+	 * @param   object  $cacheparams   Module cache parameters - id or URL parameters, depending on the module cache mode
+	 *
+	 * @return  string
+	 *
+	 * @see     \JFilterInput::clean()
+	 * @since   1.6
+	 */
+	public static function moduleCache($module, $moduleparams, $cacheparams)
+	{
+		if (!isset($cacheparams->modeparams))
+		{
+			$cacheparams->modeparams = null;
+		}
+
+		if (!isset($cacheparams->cachegroup))
+		{
+			$cacheparams->cachegroup = $module->module;
+		}
+
+		$user = \JFactory::getUser();
+		$conf = \JFactory::getConfig();
+
+		/** @var \JCacheControllerCallback $cache */
+		$cache = \JFactory::getCache($cacheparams->cachegroup, 'callback');
+
+		// Turn cache off for internal callers if parameters are set to off and for all logged in users
+		if ($moduleparams->get('owncache') === 0 || $moduleparams->get('owncache') === '0' || $conf->get('caching') == 0 || $user->get('id'))
+		{
+			$cache->setCaching(false);
+		}
+
+		// Module cache is set in seconds, global cache in minutes, setLifeTime works in minutes
+		$cache->setLifeTime($moduleparams->get('cache_time', $conf->get('cachetime') * 60) / 60);
+
+		$wrkaroundoptions = array('nopathway' => 1, 'nohead' => 0, 'nomodules' => 1, 'modulemode' => 1, 'mergehead' => 1);
+
+		$wrkarounds = true;
+		$view_levels = md5(serialize($user->getAuthorisedViewLevels()));
+
+		switch ($cacheparams->cachemode)
+		{
+			case 'id':
+				$ret = $cache->get(
+					array($cacheparams->class, $cacheparams->method),
+					$cacheparams->methodparams,
+					$cacheparams->modeparams,
+					$wrkarounds,
+					$wrkaroundoptions
+				);
+				break;
+
+			case 'safeuri':
+				$secureid = null;
+
+				if (is_array($cacheparams->modeparams))
+				{
+					$input   = \JFactory::getApplication()->input;
+					$uri     = $input->getArray();
+					$safeuri = new \stdClass;
+					$noHtmlFilter = \JFilterInput::getInstance();
+
+					foreach ($cacheparams->modeparams as $key => $value)
+					{
+						// Use int filter for id/catid to clean out spamy slugs
+						if (isset($uri[$key]))
+						{
+							$safeuri->$key = $noHtmlFilter->clean($uri[$key], $value);
+						}
+					}
+				}
+
+				$secureid = md5(serialize(array($safeuri, $cacheparams->method, $moduleparams)));
+				$ret = $cache->get(
+					array($cacheparams->class, $cacheparams->method),
+					$cacheparams->methodparams,
+					$module->id . $view_levels . $secureid,
+					$wrkarounds,
+					$wrkaroundoptions
+				);
+				break;
+
+			case 'static':
+				$ret = $cache->get(
+					array($cacheparams->class, $cacheparams->method),
+					$cacheparams->methodparams,
+					$module->module . md5(serialize($cacheparams->methodparams)),
+					$wrkarounds,
+					$wrkaroundoptions
+				);
+				break;
+
+			// Provided for backward compatibility, not really useful.
+			case 'oldstatic':
+				$ret = $cache->get(
+					array($cacheparams->class, $cacheparams->method),
+					$cacheparams->methodparams,
+					$module->id . $view_levels,
+					$wrkarounds,
+					$wrkaroundoptions
+				);
+				break;
+
+			case 'itemid':
+			default:
+				$ret = $cache->get(
+					array($cacheparams->class, $cacheparams->method),
+					$cacheparams->methodparams,
+					$module->id . $view_levels . \JFactory::getApplication()->input->getInt('Itemid', null),
+					$wrkarounds,
+					$wrkaroundoptions
+				);
+				break;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Method to determine if filtering by language is enabled in back-end for modules.
+	 *
+	 * @return  boolean  True if enabled; false otherwise.
+	 *
+	 * @since   3.8.0
+	 */
+	public static function isAdminMultilang()
+	{
+		static $enabled = false;
+
+		if (count(LanguageHelper::getInstalledLanguages(1)) > 1)
+		{
+			$enabled = (bool) ComponentHelper::getParams('com_modules')->get('adminlangfilter', 0);
+		}
+
+		return $enabled;
+	}
+}
diff --git a/core/libraries/src/Helper/RouteHelper.php b/core/libraries/src/Helper/RouteHelper.php
new file mode 100644
index 00000000..09e26fe3
--- /dev/null
+++ b/core/libraries/src/Helper/RouteHelper.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Language\Multilanguage;
+
+/**
+ * Route Helper
+ *
+ * A class providing basic routing for urls that are for content types found in
+ * the #__content_types table and rows found in the #__ucm_content table.
+ *
+ * @since  3.1
+ */
+class RouteHelper
+{
+	/**
+	 * @var    array  Holds the reverse lookup
+	 * @since  3.1
+	 */
+	protected static $lookup;
+
+	/**
+	 * @var    string  Option for the extension (such as com_content)
+	 * @since  3.1
+	 */
+	protected $extension;
+
+	/**
+	 * @var    string  Value of the primary key in the content type table
+	 * @since  3.1
+	 */
+	protected $id;
+
+	/**
+	 * @var    string  Name of the view for the url
+	 * @since  3.1
+	 */
+	protected $view;
+
+	/**
+	 * A method to get the route for a specific item
+	 *
+	 * @param   integer  $id         Value of the primary key for the item in its content table
+	 * @param   string   $typealias  The type_alias for the item being routed. Of the form extension.view.
+	 * @param   string   $link       The link to be routed
+	 * @param   string   $language   The language of the content for multilingual sites
+	 * @param   integer  $catid      Optional category id
+	 *
+	 * @return  string  The route of the item
+	 *
+	 * @since   3.1
+	 */
+	public function getRoute($id, $typealias, $link = '', $language = null, $catid = null)
+	{
+		$typeExploded = explode('.', $typealias);
+
+		if (isset($typeExploded[1]))
+		{
+			$this->view = $typeExploded[1];
+			$this->extension = $typeExploded[0];
+		}
+		else
+		{
+			$this->view = \JFactory::getApplication()->input->getCmd('view');
+			$this->extension = \JFactory::getApplication()->input->getCmd('option');
+		}
+
+		$name = ucfirst(substr_replace($this->extension, '', 0, 4));
+
+		$needles = array();
+
+		if (isset($this->view))
+		{
+			$needles[$this->view] = array((int) $id);
+		}
+
+		if (empty($link))
+		{
+			// Create the link
+			$link = 'index.php?option=' . $this->extension . '&view=' . $this->view . '&id=' . $id;
+		}
+
+		if ($catid > 1)
+		{
+			$categories = \JCategories::getInstance($name);
+
+			if ($categories)
+			{
+				$category = $categories->get((int) $catid);
+
+				if ($category)
+				{
+					$needles['category'] = array_reverse($category->getPath());
+					$needles['categories'] = $needles['category'];
+					$link .= '&catid=' . $catid;
+				}
+			}
+		}
+
+		// Deal with languages only if needed
+		if (!empty($language) && $language !== '*' && Multilanguage::isEnabled())
+		{
+			$link .= '&lang=' . $language;
+			$needles['language'] = $language;
+		}
+
+		if ($item = $this->findItem($needles))
+		{
+			$link .= '&Itemid=' . $item;
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Method to find the item in the menu structure
+	 *
+	 * @param   array  $needles  Array of lookup values
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.1
+	 */
+	protected function findItem($needles = array())
+	{
+		$app      = \JFactory::getApplication();
+		$menus    = $app->getMenu('site');
+		$language = isset($needles['language']) ? $needles['language'] : '*';
+
+		// $this->extension may not be set if coming from a static method, check it
+		if ($this->extension === null)
+		{
+			$this->extension = $app->input->getCmd('option');
+		}
+
+		// Prepare the reverse lookup array.
+		if (!isset(static::$lookup[$language]))
+		{
+			static::$lookup[$language] = array();
+
+			$component = ComponentHelper::getComponent($this->extension);
+
+			$attributes = array('component_id');
+			$values     = array($component->id);
+
+			if ($language !== '*')
+			{
+				$attributes[] = 'language';
+				$values[]     = array($needles['language'], '*');
+			}
+
+			$items = $menus->getItems($attributes, $values);
+
+			foreach ($items as $item)
+			{
+				if (isset($item->query) && isset($item->query['view']))
+				{
+					$view = $item->query['view'];
+
+					if (!isset(static::$lookup[$language][$view]))
+					{
+						static::$lookup[$language][$view] = array();
+					}
+
+					if (isset($item->query['id']))
+					{
+						if (is_array($item->query['id']))
+						{
+							$item->query['id'] = $item->query['id'][0];
+						}
+
+						/*
+						 * Here it will become a bit tricky
+						 * $language != * can override existing entries
+						 * $language == * cannot override existing entries
+						 */
+						if ($item->language !== '*' || !isset(static::$lookup[$language][$view][$item->query['id']]))
+						{
+							static::$lookup[$language][$view][$item->query['id']] = $item->id;
+						}
+					}
+				}
+			}
+		}
+
+		if ($needles)
+		{
+			foreach ($needles as $view => $ids)
+			{
+				if (isset(static::$lookup[$language][$view]))
+				{
+					foreach ($ids as $id)
+					{
+						if (isset(static::$lookup[$language][$view][(int) $id]))
+						{
+							return static::$lookup[$language][$view][(int) $id];
+						}
+					}
+				}
+			}
+		}
+
+		$active = $menus->getActive();
+
+		if ($active && $active->component === $this->extension && ($active->language === '*' || !Multilanguage::isEnabled()))
+		{
+			return $active->id;
+		}
+
+		// If not found, return language specific home link
+		$default = $menus->getDefault($language);
+
+		return !empty($default->id) ? $default->id : null;
+	}
+
+	/**
+	 * Fetches the category route
+	 *
+	 * @param   mixed   $catid      Category ID or \JCategoryNode instance
+	 * @param   mixed   $language   Language code
+	 * @param   string  $extension  Extension to lookup
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 *
+	 * @throws  \InvalidArgumentException
+	 */
+	public static function getCategoryRoute($catid, $language = 0, $extension = '')
+	{
+		// Note: $extension is required but has to be an optional argument in the function call due to argument order
+		if (empty($extension))
+		{
+			throw new \InvalidArgumentException(sprintf('$extension is a required argument in %s()', __METHOD__));
+		}
+
+		if ($catid instanceof \JCategoryNode)
+		{
+			$id       = $catid->id;
+			$category = $catid;
+		}
+		else
+		{
+			$extensionName = ucfirst(substr($extension, 4));
+			$id            = (int) $catid;
+			$category      = \JCategories::getInstance($extensionName)->get($id);
+		}
+
+		if ($id < 1)
+		{
+			$link = '';
+		}
+		else
+		{
+			$link = 'index.php?option=' . $extension . '&view=category&id=' . $id;
+
+			$needles = array(
+				'category' => array($id),
+			);
+
+			if ($language && $language !== '*' && Multilanguage::isEnabled())
+			{
+				$link .= '&lang=' . $language;
+				$needles['language'] = $language;
+			}
+
+			// Create the link
+			if ($category)
+			{
+				$catids                = array_reverse($category->getPath());
+				$needles['category']   = $catids;
+				$needles['categories'] = $catids;
+			}
+
+			if ($item = static::lookupItem($needles))
+			{
+				$link .= '&Itemid=' . $item;
+			}
+		}
+
+		return $link;
+	}
+
+	/**
+	 * Static alias to findItem() used to find the item in the menu structure
+	 *
+	 * @param   array  $needles  Array of lookup values
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.2
+	 */
+	protected static function lookupItem($needles = array())
+	{
+		$instance = new static;
+
+		return $instance->findItem($needles);
+	}
+}
diff --git a/core/libraries/src/Helper/SearchHelper.php b/core/libraries/src/Helper/SearchHelper.php
new file mode 100644
index 00000000..6faba185
--- /dev/null
+++ b/core/libraries/src/Helper/SearchHelper.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+/**
+ * Helper class for Joomla! Search components
+ *
+ * @since  3.0
+ */
+class SearchHelper
+{
+	/**
+	 * Method to log search terms to the database
+	 *
+	 * @param   string  $term       The term being searched
+	 * @param   string  $component  The component being used for the search
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function logSearch($term, $component)
+	{
+		// Initialise our variables
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$enable_log_searches = ComponentHelper::getParams($component)->get('enabled');
+
+		// Sanitise the term for the database
+		$search_term = $db->escape(trim(strtolower($term)));
+
+		if ($enable_log_searches)
+		{
+			// Query the table to determine if the term has been searched previously
+			$query->select($db->quoteName('hits'))
+				->from($db->quoteName('#__core_log_searches'))
+				->where($db->quoteName('search_term') . ' = ' . $db->quote($search_term));
+			$db->setQuery($query);
+			$hits = (int) $db->loadResult();
+
+			// Reset the $query object
+			$query->clear();
+
+			// Update the table based on the results
+			if ($hits)
+			{
+				$query->update($db->quoteName('#__core_log_searches'))
+					->set('hits = (hits + 1)')
+					->where($db->quoteName('search_term') . ' = ' . $db->quote($search_term));
+			}
+			else
+			{
+				$query->insert($db->quoteName('#__core_log_searches'))
+					->columns(array($db->quoteName('search_term'), $db->quoteName('hits')))
+					->values($db->quote($search_term) . ', 1');
+			}
+
+			// Execute the update query
+			$db->setQuery($query);
+			$db->execute();
+		}
+	}
+}
diff --git a/core/libraries/src/Helper/TagsHelper.php b/core/libraries/src/Helper/TagsHelper.php
new file mode 100644
index 00000000..fd13ed2f
--- /dev/null
+++ b/core/libraries/src/Helper/TagsHelper.php
@@ -0,0 +1,1093 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\TableInterface;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Tags helper class, provides methods to perform various tasks relevant
+ * tagging of content.
+ *
+ * @since  3.1
+ */
+class TagsHelper extends CMSHelper
+{
+	/**
+	 * Helper object for storing and deleting tag information.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $tagsChanged = false;
+
+	/**
+	 * Whether up replace all tags or just add tags
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $replaceTags = false;
+
+	/**
+	 * Alias for querying mapping and content type table.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $typeAlias = null;
+
+	/**
+	 * Method to add tag rows to mapping table.
+	 *
+	 * @param   integer         $ucmId  ID of the #__ucm_content item being tagged
+	 * @param   TableInterface  $table  Table object being tagged
+	 * @param   array           $tags   Array of tags to be applied.
+	 *
+	 * @return  boolean  true on success, otherwise false.
+	 *
+	 * @since   3.1
+	 */
+	public function addTagMapping($ucmId, TableInterface $table, $tags = array())
+	{
+		$db = $table->getDbo();
+		$key = $table->getKeyName();
+		$item = $table->$key;
+		$typeId = $this->getTypeId($this->typeAlias);
+
+		// Insert the new tag maps
+		if (strpos('#', implode(',', $tags)) === false)
+		{
+			$tags = self::createTagsFromField($tags);
+		}
+
+		// Prevent saving duplicate tags
+		$tags = array_unique($tags);
+
+		$query = $db->getQuery(true);
+		$query->insert('#__contentitem_tag_map');
+		$query->columns(
+			array(
+				$db->quoteName('type_alias'),
+				$db->quoteName('core_content_id'),
+				$db->quoteName('content_item_id'),
+				$db->quoteName('tag_id'),
+				$db->quoteName('tag_date'),
+				$db->quoteName('type_id'),
+			)
+		);
+
+		foreach ($tags as $tag)
+		{
+			$query->values(
+				$db->quote($this->typeAlias)
+				. ', ' . (int) $ucmId
+				. ', ' . (int) $item
+				. ', ' . $db->quote($tag)
+				. ', ' . $query->currentTimestamp()
+				. ', ' . (int) $typeId
+			);
+		}
+
+		$db->setQuery($query);
+
+		return (boolean) $db->execute();
+	}
+
+	/**
+	 * Function that converts tags paths into paths of names
+	 *
+	 * @param   array  $tags  Array of tags
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public static function convertPathsToNames($tags)
+	{
+		// We will replace path aliases with tag names
+		if ($tags)
+		{
+			// Create an array with all the aliases of the results
+			$aliases = array();
+
+			foreach ($tags as $tag)
+			{
+				if (!empty($tag->path))
+				{
+					if ($pathParts = explode('/', $tag->path))
+					{
+						$aliases = array_merge($aliases, $pathParts);
+					}
+				}
+			}
+
+			// Get the aliases titles in one single query and map the results
+			if ($aliases)
+			{
+				// Remove duplicates
+				$aliases = array_unique($aliases);
+
+				$db = \JFactory::getDbo();
+
+				$query = $db->getQuery(true)
+					->select('alias, title')
+					->from('#__tags')
+					->where('alias IN (' . implode(',', array_map(array($db, 'quote'), $aliases)) . ')');
+				$db->setQuery($query);
+
+				try
+				{
+					$aliasesMapper = $db->loadAssocList('alias');
+				}
+				catch (\RuntimeException $e)
+				{
+					return false;
+				}
+
+				// Rebuild the items path
+				if ($aliasesMapper)
+				{
+					foreach ($tags as $tag)
+					{
+						$namesPath = array();
+
+						if (!empty($tag->path))
+						{
+							if ($pathParts = explode('/', $tag->path))
+							{
+								foreach ($pathParts as $alias)
+								{
+									if (isset($aliasesMapper[$alias]))
+									{
+										$namesPath[] = $aliasesMapper[$alias]['title'];
+									}
+									else
+									{
+										$namesPath[] = $alias;
+									}
+								}
+
+								$tag->text = implode('/', $namesPath);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $tags;
+	}
+
+	/**
+	 * Create any new tags by looking for #new# in the strings
+	 *
+	 * @param   array  $tags  Tags text array from the field
+	 *
+	 * @return  mixed   If successful, metadata with new tag titles replaced by tag ids. Otherwise false.
+	 *
+	 * @since   3.1
+	 */
+	public function createTagsFromField($tags)
+	{
+		if (empty($tags) || $tags[0] == '')
+		{
+			return;
+		}
+		else
+		{
+			// We will use the tags table to store them
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tags/tables');
+			$tagTable  = Table::getInstance('Tag', 'TagsTable');
+			$newTags   = array();
+			$canCreate = \JFactory::getUser()->authorise('core.create', 'com_tags');
+
+			foreach ($tags as $key => $tag)
+			{
+				// User is not allowed to create tags, so don't create.
+				if (!$canCreate && strpos($tag, '#new#') !== false)
+				{
+					continue;
+				}
+
+				// Remove the #new# prefix that identifies new tags
+				$tagText = str_replace('#new#', '', $tag);
+
+				if ($tagText === $tag)
+				{
+					$newTags[] = (int) $tag;
+				}
+				else
+				{
+					// Clear old data if exist
+					$tagTable->reset();
+
+					// Try to load the selected tag
+					if ($tagTable->load(array('title' => $tagText)))
+					{
+						$newTags[] = (int) $tagTable->id;
+					}
+					else
+					{
+						// Prepare tag data
+						$tagTable->id = 0;
+						$tagTable->title = $tagText;
+						$tagTable->published = 1;
+
+						// $tagTable->language = property_exists ($item, 'language') ? $item->language : '*';
+						$tagTable->language = '*';
+						$tagTable->access = 1;
+
+						// Make this item a child of the root tag
+						$tagTable->setLocation($tagTable->getRootId(), 'last-child');
+
+						// Try to store tag
+						if ($tagTable->check())
+						{
+							// Assign the alias as path (autogenerated tags have always level 1)
+							$tagTable->path = $tagTable->alias;
+
+							if ($tagTable->store())
+							{
+								$newTags[] = (int) $tagTable->id;
+							}
+						}
+					}
+				}
+			}
+
+			// At this point $tags is an array of all tag ids
+			$this->tags = $newTags;
+			$result = $newTags;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Create any new tags by looking for #new# in the metadata
+	 *
+	 * @param   string  $metadata  Metadata JSON string
+	 *
+	 * @return  mixed   If successful, metadata with new tag titles replaced by tag ids. Otherwise false.
+	 *
+	 * @since   3.1
+	 * @deprecated  4.0  This method is no longer used in the CMS and will not be replaced.
+	 */
+	public function createTagsFromMetadata($metadata)
+	{
+		$metaObject = json_decode($metadata);
+
+		if (empty($metaObject->tags))
+		{
+			return $metadata;
+		}
+
+		$tags = $metaObject->tags;
+
+		if (empty($tags) || !is_array($tags))
+		{
+			$result = $metadata;
+		}
+		else
+		{
+			// We will use the tags table to store them
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tags/tables');
+			$tagTable = Table::getInstance('Tag', 'TagsTable');
+			$newTags = array();
+
+			foreach ($tags as $tag)
+			{
+				// Remove the #new# prefix that identifies new tags
+				$tagText = str_replace('#new#', '', $tag);
+
+				if ($tagText === $tag)
+				{
+					$newTags[] = (int) $tag;
+				}
+				else
+				{
+					// Clear old data if exist
+					$tagTable->reset();
+
+					// Try to load the selected tag
+					if ($tagTable->load(array('title' => $tagText)))
+					{
+						$newTags[] = (int) $tagTable->id;
+					}
+					else
+					{
+						// Prepare tag data
+						$tagTable->id = 0;
+						$tagTable->title = $tagText;
+						$tagTable->published = 1;
+
+						// $tagTable->language = property_exists ($item, 'language') ? $item->language : '*';
+						$tagTable->language = '*';
+						$tagTable->access = 1;
+
+						// Make this item a child of the root tag
+						$tagTable->setLocation($tagTable->getRootId(), 'last-child');
+
+						// Try to store tag
+						if ($tagTable->check())
+						{
+							// Assign the alias as path (autogenerated tags have always level 1)
+							$tagTable->path = $tagTable->alias;
+
+							if ($tagTable->store())
+							{
+								$newTags[] = (int) $tagTable->id;
+							}
+						}
+					}
+				}
+			}
+
+			// At this point $tags is an array of all tag ids
+			$metaObject->tags = $newTags;
+			$result = json_encode($metaObject);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to delete the tag mappings and #__ucm_content record for for an item
+	 *
+	 * @param   TableInterface  $table          Table object of content table where delete occurred
+	 * @param   integer|array   $contentItemId  ID of the content item. Or an array of key/value pairs with array key
+	 *                                          being a primary key name and value being the content item ID. Note
+	 *                                          multiple primary keys are not supported
+	 *
+	 * @return  boolean  true on success, false on failure
+	 *
+	 * @since   3.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function deleteTagData(TableInterface $table, $contentItemId)
+	{
+		$key = $table->getKeyName();
+
+		if (!is_array($contentItemId))
+		{
+			$contentItemId = array($key => $contentItemId);
+		}
+
+		// If we have multiple items for the content item primary key we currently don't support this so
+		// throw an InvalidArgumentException for now
+		if (count($contentItemId) != 1)
+		{
+			throw new \InvalidArgumentException('Multiple primary keys are not supported as a content item id');
+		}
+
+		$result = $this->unTagItem($contentItemId[$key], $table);
+
+		/** @var  \JTableCorecontent $ucmContentTable */
+		$ucmContentTable = Table::getInstance('Corecontent');
+
+		return $result && $ucmContentTable->deleteByContentId($contentItemId[$key], $this->typeAlias);
+	}
+
+	/**
+	 * Method to get a list of tags for an item, optionally with the tag data.
+	 *
+	 * @param   string   $contentType  Content type alias. Dot separated.
+	 * @param   integer  $id           Id of the item to retrieve tags for.
+	 * @param   boolean  $getTagData   If true, data from the tags table will be included, defaults to true.
+	 *
+	 * @return  array    Array of of tag objects
+	 *
+	 * @since   3.1
+	 */
+	public function getItemTags($contentType, $id, $getTagData = true)
+	{
+		// Initialize some variables.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('m.tag_id'))
+			->from($db->quoteName('#__contentitem_tag_map') . ' AS m ')
+			->where(
+				array(
+					$db->quoteName('m.type_alias') . ' = ' . $db->quote($contentType),
+					$db->quoteName('m.content_item_id') . ' = ' . (int) $id,
+					$db->quoteName('t.published') . ' = 1',
+				)
+			);
+
+		$user = \JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		$query->where('t.access IN (' . $groups . ')');
+
+		// Optionally filter on language
+		$language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
+
+		if ($language !== 'all')
+		{
+			if ($language === 'current_language')
+			{
+				$language = $this->getCurrentLanguage();
+			}
+
+			$query->where($db->quoteName('language') . ' IN (' . $db->quote($language) . ', ' . $db->quote('*') . ')');
+		}
+
+		if ($getTagData)
+		{
+			$query->select($db->quoteName('t') . '.*');
+		}
+
+		$query->join('INNER', $db->quoteName('#__tags') . ' AS t ' . ' ON ' . $db->quoteName('m.tag_id') . ' = ' . $db->quoteName('t.id'));
+
+		$db->setQuery($query);
+		$this->itemTags = $db->loadObjectList();
+
+		return $this->itemTags;
+	}
+
+	/**
+	 * Method to get a list of tags for a given item.
+	 * Normally used for displaying a list of tags within a layout
+	 *
+	 * @param   mixed   $ids     The id or array of ids (primary key) of the item to be tagged.
+	 * @param   string  $prefix  Dot separated string with the option and view to be used for a url.
+	 *
+	 * @return  string   Comma separated list of tag Ids.
+	 *
+	 * @since   3.1
+	 */
+	public function getTagIds($ids, $prefix)
+	{
+		if (empty($ids))
+		{
+			return;
+		}
+
+		/**
+		 * Ids possible formats:
+		 * ---------------------
+		 * 	$id = 1;
+		 *  $id = array(1,2);
+		 *  $id = array('1,3,4,19');
+		 *  $id = '1,3';
+		 */
+		$ids = (array) $ids;
+		$ids = implode(',', $ids);
+		$ids = explode(',', $ids);
+		$ids = ArrayHelper::toInteger($ids);
+
+		$db = \JFactory::getDbo();
+
+		// Load the tags.
+		$query = $db->getQuery(true)
+			->select($db->quoteName('t.id'))
+			->from($db->quoteName('#__tags') . ' AS t ')
+			->join(
+				'INNER', $db->quoteName('#__contentitem_tag_map') . ' AS m'
+				. ' ON ' . $db->quoteName('m.tag_id') . ' = ' . $db->quoteName('t.id')
+				. ' AND ' . $db->quoteName('m.type_alias') . ' = ' . $db->quote($prefix)
+				. ' AND ' . $db->quoteName('m.content_item_id') . ' IN ( ' . implode(',', $ids) . ')'
+			);
+
+		$db->setQuery($query);
+
+		// Add the tags to the content data.
+		$tagsList = $db->loadColumn();
+		$this->tags = implode(',', $tagsList);
+
+		return $this->tags;
+	}
+
+	/**
+	 * Method to get a query to retrieve a detailed list of items for a tag.
+	 *
+	 * @param   mixed    $tagId            Tag or array of tags to be matched
+	 * @param   mixed    $typesr           Null, type or array of type aliases for content types to be included in the results
+	 * @param   boolean  $includeChildren  True to include the results from child tags
+	 * @param   string   $orderByOption    Column to order the results by
+	 * @param   string   $orderDir         Direction to sort the results in
+	 * @param   boolean  $anyOrAll         True to include items matching at least one tag, false to include
+	 *                                     items all tags in the array.
+	 * @param   string   $languageFilter   Optional filter on language. Options are 'all', 'current' or any string.
+	 * @param   string   $stateFilter      Optional filtering on publication state, defaults to published or unpublished.
+	 *
+	 * @return  \JDatabaseQuery  Query to retrieve a list of tags
+	 *
+	 * @since   3.1
+	 */
+	public function getTagItemsQuery($tagId, $typesr = null, $includeChildren = false, $orderByOption = 'c.core_title', $orderDir = 'ASC',
+		$anyOrAll = true, $languageFilter = 'all', $stateFilter = '0,1')
+	{
+		// Create a new query object.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$user = \JFactory::getUser();
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate = $db->quote(\JFactory::getDate()->toSql());
+
+		// Force ids to array and sanitize
+		$tagIds = (array) $tagId;
+		$tagIds = implode(',', $tagIds);
+		$tagIds = explode(',', $tagIds);
+		$tagIds = ArrayHelper::toInteger($tagIds);
+
+		$ntagsr = count($tagIds);
+
+		// If we want to include children we have to adjust the list of tags.
+		// We do not search child tags when the match all option is selected.
+		if ($includeChildren)
+		{
+			$tagTreeArray = array();
+
+			foreach ($tagIds as $tag)
+			{
+				$this->getTagTreeArray($tag, $tagTreeArray);
+			}
+
+			$tagIds = array_unique(array_merge($tagIds, $tagTreeArray));
+		}
+
+		// Sanitize filter states
+		$stateFilters = explode(',', $stateFilter);
+		$stateFilters = ArrayHelper::toInteger($stateFilters);
+
+		// M is the mapping table. C is the core_content table. Ct is the content_types table.
+		$query
+			->select(
+				'm.type_alias'
+				. ', ' . 'm.content_item_id'
+				. ', ' . 'm.core_content_id'
+				. ', ' . 'count(m.tag_id) AS match_count'
+				. ', ' . 'MAX(m.tag_date) as tag_date'
+				. ', ' . 'MAX(c.core_title) AS core_title'
+				. ', ' . 'MAX(c.core_params) AS core_params'
+			)
+			->select('MAX(c.core_alias) AS core_alias, MAX(c.core_body) AS core_body, MAX(c.core_state) AS core_state, MAX(c.core_access) AS core_access')
+			->select(
+				'MAX(c.core_metadata) AS core_metadata'
+				. ', ' . 'MAX(c.core_created_user_id) AS core_created_user_id'
+				. ', ' . 'MAX(c.core_created_by_alias) AS core_created_by_alias'
+			)
+			->select('MAX(c.core_created_time) as core_created_time, MAX(c.core_images) as core_images')
+			->select('CASE WHEN c.core_modified_time = ' . $nullDate . ' THEN c.core_created_time ELSE c.core_modified_time END as core_modified_time')
+			->select('MAX(c.core_language) AS core_language, MAX(c.core_catid) AS core_catid')
+			->select('MAX(c.core_publish_up) AS core_publish_up, MAX(c.core_publish_down) as core_publish_down')
+			->select('MAX(ct.type_title) AS content_type_title, MAX(ct.router) AS router')
+
+			->from('#__contentitem_tag_map AS m')
+			->join(
+				'INNER',
+				'#__ucm_content AS c ON m.type_alias = c.core_type_alias AND m.core_content_id = c.core_content_id AND c.core_state IN ('
+					. implode(',', $stateFilters) . ')'
+					. (in_array('0', $stateFilters) ? '' : ' AND (c.core_publish_up = ' . $nullDate
+					. ' OR c.core_publish_up <= ' . $nowDate . ') '
+					. ' AND (c.core_publish_down = ' . $nullDate . ' OR  c.core_publish_down >= ' . $nowDate . ')')
+			)
+			->join('INNER', '#__content_types AS ct ON ct.type_alias = m.type_alias')
+
+			// Join over categories for get only tags from published categories
+			->join('LEFT', '#__categories AS tc ON tc.id = c.core_catid')
+
+			// Join over the users for the author and email
+			->select("CASE WHEN c.core_created_by_alias > ' ' THEN c.core_created_by_alias ELSE ua.name END AS author")
+			->select('ua.email AS author_email')
+
+			->join('LEFT', '#__users AS ua ON ua.id = c.core_created_user_id')
+
+			->where('m.tag_id IN (' . implode(',', $tagIds) . ')')
+			->where('(c.core_catid = 0 OR tc.published = 1)');
+
+		// Optionally filter on language
+		if (empty($language))
+		{
+			$language = $languageFilter;
+		}
+
+		if ($language !== 'all')
+		{
+			if ($language === 'current_language')
+			{
+				$language = $this->getCurrentLanguage();
+			}
+
+			$query->where($db->quoteName('c.core_language') . ' IN (' . $db->quote($language) . ', ' . $db->quote('*') . ')');
+		}
+
+		// Get the type data, limited to types in the request if there are any specified.
+		$typesarray = self::getTypes('assocList', $typesr, false);
+
+		$typeAliases = array();
+
+		foreach ($typesarray as $type)
+		{
+			$typeAliases[] = $db->quote($type['type_alias']);
+		}
+
+		$query->where('m.type_alias IN (' . implode(',', $typeAliases) . ')');
+
+		$groups = '0,' . implode(',', array_unique($user->getAuthorisedViewLevels()));
+		$query->where('c.core_access IN (' . $groups . ')')
+			->group('m.type_alias, m.content_item_id, m.core_content_id, core_modified_time, core_created_time, core_created_by_alias, author, author_email');
+
+		// Use HAVING if matching all tags and we are matching more than one tag.
+		if ($ntagsr > 1 && $anyOrAll != 1 && $includeChildren != 1)
+		{
+			// The number of results should equal the number of tags requested.
+			$query->having("COUNT('m.tag_id') = " . (int) $ntagsr);
+		}
+
+		// Set up the order by using the option chosen
+		if ($orderByOption === 'match_count')
+		{
+			$orderBy = 'COUNT(m.tag_id)';
+		}
+		else
+		{
+			$orderBy = 'MAX(' . $db->quoteName($orderByOption) . ')';
+		}
+
+		$query->order($orderBy . ' ' . $orderDir);
+
+		return $query;
+	}
+
+	/**
+	 * Function that converts tag ids to their tag names
+	 *
+	 * @param   array  $tagIds  Array of integer tag ids.
+	 *
+	 * @return  array  An array of tag names.
+	 *
+	 * @since   3.1
+	 */
+	public function getTagNames($tagIds)
+	{
+		$tagNames = array();
+
+		if (is_array($tagIds) && count($tagIds) > 0)
+		{
+			$tagIds = ArrayHelper::toInteger($tagIds);
+
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('title'))
+				->from($db->quoteName('#__tags'))
+				->where($db->quoteName('id') . ' IN (' . implode(',', $tagIds) . ')');
+			$query->order($db->quoteName('title'));
+
+			$db->setQuery($query);
+			$tagNames = $db->loadColumn();
+		}
+
+		return $tagNames;
+	}
+
+	/**
+	 * Method to get an array of tag ids for the current tag and its children
+	 *
+	 * @param   integer  $id             An optional ID
+	 * @param   array    &$tagTreeArray  Array containing the tag tree
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.1
+	 */
+	public function getTagTreeArray($id, &$tagTreeArray = array())
+	{
+		// Get a level row instance.
+		Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tags/tables');
+		$table = Table::getInstance('Tag', 'TagsTable');
+
+		if ($table->isLeaf($id))
+		{
+			$tagTreeArray[] = $id;
+
+			return $tagTreeArray;
+		}
+
+		$tagTree = $table->getTree($id);
+
+		// Attempt to load the tree
+		if ($tagTree)
+		{
+			foreach ($tagTree as $tag)
+			{
+				$tagTreeArray[] = $tag->id;
+			}
+
+			return $tagTreeArray;
+		}
+	}
+
+	/**
+	 * Method to get the type id for a type alias.
+	 *
+	 * @param   string  $typeAlias  A type alias.
+	 *
+	 * @return  string  Name of the table for a type
+	 *
+	 * @since   3.1
+	 * @deprecated  4.0  Use \JUcmType::getTypeId() instead
+	 */
+	public function getTypeId($typeAlias)
+	{
+		$contentType = new \JUcmType;
+
+		return $contentType->getTypeId($typeAlias);
+	}
+
+	/**
+	 * Method to get a list of types with associated data.
+	 *
+	 * @param   string   $arrayType    Optionally specify that the returned list consist of objects, associative arrays, or arrays.
+	 *                                 Options are: rowList, assocList, and objectList
+	 * @param   array    $selectTypes  Optional array of type ids to limit the results to. Often from a request.
+	 * @param   boolean  $useAlias     If true, the alias is used to match, if false the type_id is used.
+	 *
+	 * @return  array   Array of of types
+	 *
+	 * @since   3.1
+	 */
+	public static function getTypes($arrayType = 'objectList', $selectTypes = null, $useAlias = true)
+	{
+		// Initialize some variables.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('*');
+
+		if (!empty($selectTypes))
+		{
+			$selectTypes = (array) $selectTypes;
+
+			if ($useAlias)
+			{
+				$selectTypes = array_map(array($db, 'quote'), $selectTypes);
+
+				$query->where($db->quoteName('type_alias') . ' IN (' . implode(',', $selectTypes) . ')');
+			}
+			else
+			{
+				$selectTypes = ArrayHelper::toInteger($selectTypes);
+
+				$query->where($db->quoteName('type_id') . ' IN (' . implode(',', $selectTypes) . ')');
+			}
+		}
+
+		$query->from($db->quoteName('#__content_types'));
+
+		$db->setQuery($query);
+
+		switch ($arrayType)
+		{
+			case 'assocList':
+				$types = $db->loadAssocList();
+				break;
+
+			case 'rowList':
+				$types = $db->loadRowList();
+				break;
+
+			case 'objectList':
+			default:
+				$types = $db->loadObjectList();
+				break;
+		}
+
+		return $types;
+	}
+
+	/**
+	 * Function that handles saving tags used in a table class after a store()
+	 *
+	 * @param   TableInterface  $table    Table being processed
+	 * @param   array           $newTags  Array of new tags
+	 * @param   boolean         $replace  Flag indicating if all exising tags should be replaced
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	public function postStoreProcess(TableInterface $table, $newTags = array(), $replace = true)
+	{
+		if (!empty($table->newTags) && empty($newTags))
+		{
+			$newTags = $table->newTags;
+		}
+
+		// If existing row, check to see if tags have changed.
+		$newTable = clone $table;
+		$newTable->reset();
+
+		$result = true;
+
+		// Process ucm_content and ucm_base if either tags have changed or we have some tags.
+		if ($this->tagsChanged || (!empty($newTags) && $newTags[0] != ''))
+		{
+			if (!$newTags && $replace == true)
+			{
+				// Delete all tags data
+				$key = $table->getKeyName();
+				$result = $this->deleteTagData($table, $table->$key);
+			}
+			else
+			{
+				// Process the tags
+				$data = $this->getRowData($table);
+				$ucmContentTable = Table::getInstance('Corecontent');
+
+				$ucm = new \JUcmContent($table, $this->typeAlias);
+				$ucmData = $data ? $ucm->mapData($data) : $ucm->ucmData;
+
+				$primaryId = $ucm->getPrimaryKey($ucmData['common']['core_type_id'], $ucmData['common']['core_content_item_id']);
+				$result = $ucmContentTable->load($primaryId);
+				$result = $result && $ucmContentTable->bind($ucmData['common']);
+				$result = $result && $ucmContentTable->check();
+				$result = $result && $ucmContentTable->store();
+				$ucmId = $ucmContentTable->core_content_id;
+
+				// Store the tag data if the article data was saved and run related methods.
+				$result = $result && $this->tagItem($ucmId, $table, $newTags, $replace);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Function that preProcesses data from a table prior to a store() to ensure proper tag handling
+	 *
+	 * @param   TableInterface  $table    Table being processed
+	 * @param   array           $newTags  Array of new tags
+	 *
+	 * @return  null
+	 *
+	 * @since   3.1
+	 */
+	public function preStoreProcess(TableInterface $table, $newTags = array())
+	{
+		if ($newTags != array())
+		{
+			$this->newTags = $newTags;
+		}
+
+		// If existing row, check to see if tags have changed.
+		$oldTable = clone $table;
+		$oldTable->reset();
+		$key = $oldTable->getKeyName();
+		$typeAlias = $this->typeAlias;
+
+		if ($oldTable->$key && $oldTable->load())
+		{
+			$this->oldTags = $this->getTagIds($oldTable->$key, $typeAlias);
+		}
+
+		// New items with no tags bypass this step.
+		if ((!empty($newTags) && is_string($newTags) || (isset($newTags[0]) && $newTags[0] != '')) || isset($this->oldTags))
+		{
+			if (is_array($newTags))
+			{
+				$newTags = implode(',', $newTags);
+			}
+
+			// We need to process tags if the tags have changed or if we have a new row
+			$this->tagsChanged = (empty($this->oldTags) && !empty($newTags)) ||(!empty($this->oldTags) && $this->oldTags != $newTags) || !$table->$key;
+		}
+	}
+
+	/**
+	 * Function to search tags
+	 *
+	 * @param   array  $filters  Filter to apply to the search
+	 *
+	 * @return  array
+	 *
+	 * @since   3.1
+	 */
+	public static function searchTags($filters = array())
+	{
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('a.id AS value')
+			->select('a.path AS text')
+			->select('a.path')
+			->from('#__tags AS a')
+			->join('LEFT', $db->quoteName('#__tags', 'b') . ' ON a.lft > b.lft AND a.rgt < b.rgt');
+
+		// Filter language
+		if (!empty($filters['flanguage']))
+		{
+			$query->where('a.language IN (' . $db->quote($filters['flanguage']) . ',' . $db->quote('*') . ') ');
+		}
+
+		// Do not return root
+		$query->where($db->quoteName('a.alias') . ' <> ' . $db->quote('root'));
+
+		// Search in title or path
+		if (!empty($filters['like']))
+		{
+			$query->where(
+				'(' . $db->quoteName('a.title') . ' LIKE ' . $db->quote('%' . $filters['like'] . '%')
+					. ' OR ' . $db->quoteName('a.path') . ' LIKE ' . $db->quote('%' . $filters['like'] . '%') . ')'
+			);
+		}
+
+		// Filter title
+		if (!empty($filters['title']))
+		{
+			$query->where($db->quoteName('a.title') . ' = ' . $db->quote($filters['title']));
+		}
+
+		// Filter on the published state
+		if (isset($filters['published']) && is_numeric($filters['published']))
+		{
+			$query->where('a.published = ' . (int) $filters['published']);
+		}
+
+		// Filter by parent_id
+		if (isset($filters['parent_id']) && is_numeric($filters['parent_id']))
+		{
+			Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tags/tables');
+			$tagTable = Table::getInstance('Tag', 'TagsTable');
+
+			if ($children = $tagTable->getTree($filters['parent_id']))
+			{
+				foreach ($children as $child)
+				{
+					$childrenIds[] = $child->id;
+				}
+
+				$query->where('a.id IN (' . implode(',', $childrenIds) . ')');
+			}
+		}
+
+		$query->group('a.id, a.title, a.level, a.lft, a.rgt, a.parent_id, a.published, a.path')
+			->order('a.lft ASC');
+
+		// Get the options.
+		$db->setQuery($query);
+
+		try
+		{
+			$results = $db->loadObjectList();
+		}
+		catch (\RuntimeException $e)
+		{
+			return array();
+		}
+
+		// We will replace path aliases with tag names
+		return self::convertPathsToNames($results);
+	}
+
+	/**
+	 * Method to delete all instances of a tag from the mapping table. Generally used when a tag is deleted.
+	 *
+	 * @param   integer  $tag_id  The tag_id (primary key) for the deleted tag.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function tagDeleteInstances($tag_id)
+	{
+		// Delete the old tag maps.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__contentitem_tag_map'))
+			->where($db->quoteName('tag_id') . ' = ' . (int) $tag_id);
+		$db->setQuery($query);
+		$db->execute();
+	}
+
+	/**
+	 * Method to add or update tags associated with an item.
+	 *
+	 * @param   integer         $ucmId    Id of the #__ucm_content item being tagged
+	 * @param   TableInterface  $table    Table object being tagged
+	 * @param   array           $tags     Array of tags to be applied.
+	 * @param   boolean         $replace  Flag indicating if all exising tags should be replaced
+	 *
+	 * @return  boolean  true on success, otherwise false.
+	 *
+	 * @since   3.1
+	 */
+	public function tagItem($ucmId, TableInterface $table, $tags = array(), $replace = true)
+	{
+		$key = $table->get('_tbl_key');
+		$oldTags = $this->getTagIds((int) $table->$key, $this->typeAlias);
+		$oldTags = explode(',', $oldTags);
+		$result = $this->unTagItem($ucmId, $table);
+
+		if ($replace)
+		{
+			$newTags = $tags;
+		}
+		else
+		{
+			if ($tags == array())
+			{
+				$newTags = $table->newTags;
+			}
+			else
+			{
+				$newTags = $tags;
+			}
+
+			if ($oldTags[0] != '')
+			{
+				$newTags = array_unique(array_merge($newTags, $oldTags));
+			}
+		}
+
+		if (is_array($newTags) && count($newTags) > 0 && $newTags[0] != '')
+		{
+			$result = $result && $this->addTagMapping($ucmId, $table, $newTags);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to untag an item
+	 *
+	 * @param   integer         $contentId  ID of the content item being untagged
+	 * @param   TableInterface  $table      Table object being untagged
+	 * @param   array           $tags       Array of tags to be untagged. Use an empty array to untag all existing tags.
+	 *
+	 * @return  boolean  true on success, otherwise false.
+	 *
+	 * @since   3.1
+	 */
+	public function unTagItem($contentId, TableInterface $table, $tags = array())
+	{
+		$key = $table->getKeyName();
+		$id = $table->$key;
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->delete('#__contentitem_tag_map')
+			->where($db->quoteName('type_alias') . ' = ' . $db->quote($this->typeAlias))
+			->where($db->quoteName('content_item_id') . ' = ' . (int) $id);
+
+		if (is_array($tags) && count($tags) > 0)
+		{
+			$tags = ArrayHelper::toInteger($tags);
+
+			$query->where($db->quoteName('tag_id') . ' IN (' . implode(',', $tags) . ')');
+		}
+
+		$db->setQuery($query);
+
+		return (boolean) $db->execute();
+	}
+}
diff --git a/core/libraries/src/Helper/UserGroupsHelper.php b/core/libraries/src/Helper/UserGroupsHelper.php
new file mode 100644
index 00000000..71606c8e
--- /dev/null
+++ b/core/libraries/src/Helper/UserGroupsHelper.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Helper to deal with user groups.
+ *
+ * @since  3.6.3
+ */
+final class UserGroupsHelper
+{
+	/**
+	 * @const  integer
+	 * @since  3.6.3
+	 */
+	const MODE_SINGLETON = 1;
+
+	/**
+	 * @const  integer
+	 * @since  3.6.3
+	 */
+	const MODE_INSTANCE = 2;
+
+	/**
+	 * Singleton instance.
+	 *
+	 * @var    array
+	 * @since  3.6.3
+	 */
+	private static $instance;
+
+	/**
+	 * Available user groups
+	 *
+	 * @var    array
+	 * @since  3.6.3
+	 */
+	private $groups = array();
+
+	/**
+	 * Mode this class is working: singleton or std instance
+	 *
+	 * @var    integer
+	 * @since  3.6.3
+	 */
+	private $mode;
+
+	/**
+	 * Total available groups
+	 *
+	 * @var    integer
+	 * @since  3.6.3
+	 */
+	private $total;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array    $groups  Array of groups
+	 * @param   integer  $mode    Working mode for this class
+	 *
+	 * @since   3.6.3
+	 */
+	public function __construct(array $groups = array(), $mode = self::MODE_INSTANCE)
+	{
+		$this->mode = (int) $mode;
+
+		if ($groups)
+		{
+			$this->setGroups($groups);
+		}
+	}
+
+	/**
+	 * Count loaded user groups.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.6.3
+	 */
+	public function count()
+	{
+		return count($this->groups);
+	}
+
+	/**
+	 * Get the helper instance.
+	 *
+	 * @return  self
+	 *
+	 * @since   3.6.3
+	 */
+	public static function getInstance()
+	{
+		if (static::$instance === null)
+		{
+			// Only here to avoid code style issues...
+			$groups = array();
+
+			static::$instance = new static($groups, static::MODE_SINGLETON);
+		}
+
+		return static::$instance;
+	}
+
+	/**
+	 * Get a user group by its id.
+	 *
+	 * @param   integer  $id  Group identifier
+	 *
+	 * @return  mixed  stdClass on success. False otherwise
+	 *
+	 * @since   3.6.3
+	 */
+	public function get($id)
+	{
+		if ($this->has($id))
+		{
+			return $this->groups[$id];
+		}
+
+		// Singleton will load groups as they are requested
+		if ($this->isSingleton())
+		{
+			$this->groups[$id] = $this->load($id);
+
+			return $this->groups[$id];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the list of existing user groups.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.3
+	 */
+	public function getAll()
+	{
+		if ($this->isSingleton() && $this->total() !== $this->count())
+		{
+			$this->loadAll();
+		}
+
+		return $this->groups;
+	}
+
+	/**
+	 * Check if a group is in the list.
+	 *
+	 * @param   integer  $id  Group identifier
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.3
+	 */
+	public function has($id)
+	{
+		return (array_key_exists($id, $this->groups) && $this->groups[$id] !== false);
+	}
+
+	/**
+	 * Check if this instance is a singleton.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.6.3
+	 */
+	private function isSingleton()
+	{
+		return $this->mode === static::MODE_SINGLETON;
+	}
+
+	/**
+	 * Get total available user groups in database.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.6.3
+	 */
+	public function total()
+	{
+		if ($this->total === null)
+		{
+			$db = \JFactory::getDbo();
+
+			$query = $db->getQuery(true)
+				->select('count(id)')
+				->from('#__usergroups');
+
+			$db->setQuery($query);
+
+			$this->total = (int) $db->loadResult();
+		}
+
+		return $this->total;
+	}
+
+	/**
+	 * Load a group from database.
+	 *
+	 * @param   integer  $id  Group identifier
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.6.3
+	 */
+	public function load($id)
+	{
+		$db = \JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('*')
+			->from('#__usergroups')
+			->where('id = ' . (int) $id);
+
+		$db->setQuery($query);
+
+		$group = $db->loadObject();
+
+		if (!$group)
+		{
+			return false;
+		}
+
+		return $this->populateGroupData($group);
+	}
+
+	/**
+	 * Load all user groups from the database.
+	 *
+	 * @return  self
+	 *
+	 * @since   3.6.3
+	 */
+	public function loadAll()
+	{
+		$this->groups = array();
+
+		$db = \JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('*')
+			->from('#__usergroups')
+			->order('lft ASC');
+
+		$db->setQuery($query);
+
+		$groups = $db->loadObjectList('id');
+
+		$this->groups = $groups ?: array();
+		$this->populateGroupsData();
+
+		return $this;
+	}
+
+	/**
+	 * Populates extra information for groups.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.3
+	 */
+	private function populateGroupsData()
+	{
+		foreach ($this->groups as $group)
+		{
+			$this->populateGroupData($group);
+		}
+
+		return $this->groups;
+	}
+
+	/**
+	 * Populate data for a specific user group.
+	 *
+	 * @param   \stdClass  $group  Group
+	 *
+	 * @return  \stdClass
+	 *
+	 * @since   3.6.3
+	 */
+	public function populateGroupData($group)
+	{
+		if (!$group || property_exists($group, 'path'))
+		{
+			return $group;
+		}
+
+		$parentId = (int) $group->parent_id;
+
+		if ($parentId === 0)
+		{
+			$group->path = array($group->id);
+			$group->level = 0;
+
+			return $group;
+		}
+
+		$parentGroup = $this->has($parentId) ? $this->get($parentId) : $this->load($parentId);
+
+		if (!property_exists($parentGroup, 'path'))
+		{
+			$parentGroup = $this->populateGroupData($parentGroup);
+		}
+
+		$group->path = array_merge($parentGroup->path, array($group->id));
+		$group->level = count($group->path) - 1;
+
+		return $group;
+	}
+
+	/**
+	 * Set the groups to be used as source.
+	 *
+	 * @param   array  $groups  Array of user groups.
+	 *
+	 * @return  self
+	 *
+	 * @since   3.6.3
+	 */
+	public function setGroups(array $groups)
+	{
+		$this->groups = $groups;
+		$this->populateGroupsData();
+		$this->total  = count($groups);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Http/Http.php b/core/libraries/src/Http/Http.php
new file mode 100644
index 00000000..680c9f85
--- /dev/null
+++ b/core/libraries/src/Http/Http.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Http\TransportInterface;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * HTTP client class.
+ *
+ * @since  11.3
+ */
+class Http
+{
+	/**
+	 * @var    Registry  Options for the HTTP client.
+	 * @since  11.3
+	 */
+	protected $options;
+
+	/**
+	 * @var    TransportInterface  The HTTP transport object to use in sending HTTP requests.
+	 * @since  11.3
+	 */
+	protected $transport;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry            $options    Client options object. If the registry contains any headers.* elements,
+	 *                                          these will be added to the request headers.
+	 * @param   TransportInterface  $transport  The HTTP transport object.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(Registry $options = null, TransportInterface $transport = null)
+	{
+		$this->options   = isset($options) ? $options : new Registry;
+		$this->transport = isset($transport) ? $transport : HttpFactory::getAvailableDriver($this->options);
+	}
+
+	/**
+	 * Get an option from the HTTP client.
+	 *
+	 * @param   string  $key  The name of the option to get.
+	 *
+	 * @return  mixed  The option value.
+	 *
+	 * @since   11.3
+	 */
+	public function getOption($key)
+	{
+		return $this->options->get($key);
+	}
+
+	/**
+	 * Set an option for the HTTP client.
+	 *
+	 * @param   string  $key    The name of the option to set.
+	 * @param   mixed   $value  The option value to set.
+	 *
+	 * @return  Http  This object for method chaining.
+	 *
+	 * @since   11.3
+	 */
+	public function setOption($key, $value)
+	{
+		$this->options->set($key, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Method to send the OPTIONS command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function options($url, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('OPTIONS', new Uri($url), null, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the HEAD command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function head($url, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('HEAD', new Uri($url), null, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the GET command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function get($url, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('GET', new Uri($url), null, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the POST command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   mixed    $data     Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function post($url, $data, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('POST', new Uri($url), $data, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the PUT command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   mixed    $data     Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function put($url, $data, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('PUT', new Uri($url), $data, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the DELETE command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function delete($url, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('DELETE', new Uri($url), null, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the TRACE command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function trace($url, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('TRACE', new Uri($url), null, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+
+	/**
+	 * Method to send the PATCH command to the server.
+	 *
+	 * @param   string   $url      Path to the resource.
+	 * @param   mixed    $data     Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers  An array of name-value pairs to include in the header of the request.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  Response
+	 *
+	 * @since   12.2
+	 */
+	public function patch($url, $data, array $headers = null, $timeout = null)
+	{
+		// Look for headers set in the options.
+		$temp = (array) $this->options->get('headers');
+
+		foreach ($temp as $key => $val)
+		{
+			if (!isset($headers[$key]))
+			{
+				$headers[$key] = $val;
+			}
+		}
+
+		// Look for timeout set in the options.
+		if ($timeout === null && $this->options->exists('timeout'))
+		{
+			$timeout = $this->options->get('timeout');
+		}
+
+		return $this->transport->request('PATCH', new Uri($url), $data, $headers, $timeout, $this->options->get('userAgent', null));
+	}
+}
diff --git a/core/libraries/src/Http/HttpFactory.php b/core/libraries/src/Http/HttpFactory.php
new file mode 100644
index 00000000..7e6f1222
--- /dev/null
+++ b/core/libraries/src/Http/HttpFactory.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\CMS\Http\Http;
+use Joomla\CMS\Http\TransportInterface;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * HTTP factory class.
+ *
+ * @since  12.1
+ */
+class HttpFactory
+{
+	/**
+	 * method to receive Http instance.
+	 *
+	 * @param   Registry  $options   Client options object.
+	 * @param   mixed     $adapters  Adapter (string) or queue of adapters (array) to use for communication.
+	 *
+	 * @return  Http      Joomla Http class
+	 *
+	 * @throws  \RuntimeException
+	 *
+	 * @since   12.1
+	 */
+	public static function getHttp(Registry $options = null, $adapters = null)
+	{
+		if (empty($options))
+		{
+			$options = new Registry;
+		}
+
+		if (!$driver = self::getAvailableDriver($options, $adapters))
+		{
+			throw new \RuntimeException('No transport driver available.');
+		}
+
+		return new Http($options, $driver);
+	}
+
+	/**
+	 * Finds an available http transport object for communication
+	 *
+	 * @param   Registry  $options  Option for creating http transport object
+	 * @param   mixed     $default  Adapter (string) or queue of adapters (array) to use
+	 *
+	 * @return  TransportInterface Interface sub-class
+	 *
+	 * @since   12.1
+	 */
+	public static function getAvailableDriver(Registry $options, $default = null)
+	{
+		if (is_null($default))
+		{
+			$availableAdapters = self::getHttpTransports();
+		}
+		else
+		{
+			settype($default, 'array');
+			$availableAdapters = $default;
+		}
+
+		// Check if there is at least one available http transport adapter
+		if (!count($availableAdapters))
+		{
+			return false;
+		}
+
+		foreach ($availableAdapters as $adapter)
+		{
+			$class = __NAMESPACE__ . '\\Transport\\' . ucfirst($adapter) . 'Transport';
+
+			if (!class_exists($class))
+			{
+				$class = 'JHttpTransport' . ucfirst($adapter);
+			}
+
+			if (class_exists($class) && $class::isSupported())
+			{
+				return new $class($options);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the http transport handlers
+	 *
+	 * @return  array  An array of available transport handlers
+	 *
+	 * @since   12.1
+	 */
+	public static function getHttpTransports()
+	{
+		$names = array();
+		$iterator = new \DirectoryIterator(__DIR__ . '/Transport');
+
+		/** @type  $file  \DirectoryIterator */
+		foreach ($iterator as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if ($file->isFile() && $file->getExtension() == 'php')
+			{
+				$names[] = substr($fileName, 0, strrpos($fileName, 'Transport.'));
+			}
+		}
+
+		// Keep alphabetical order across all environments
+		sort($names);
+
+		// If curl is available set it to the first position
+		if ($key = array_search('Curl', $names))
+		{
+			unset($names[$key]);
+			array_unshift($names, 'Curl');
+		}
+
+		return $names;
+	}
+}
diff --git a/core/libraries/src/Http/Response.php b/core/libraries/src/Http/Response.php
new file mode 100644
index 00000000..d98f4da9
--- /dev/null
+++ b/core/libraries/src/Http/Response.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTTP response data object class.
+ *
+ * @since  11.3
+ */
+class Response
+{
+	/**
+	 * @var    integer  The server response code.
+	 * @since  11.3
+	 */
+	public $code;
+
+	/**
+	 * @var    array  Response headers.
+	 * @since  11.3
+	 */
+	public $headers = array();
+
+	/**
+	 * @var    string  Server response body.
+	 * @since  11.3
+	 */
+	public $body;
+}
diff --git a/core/libraries/src/Http/Transport/CurlTransport.php b/core/libraries/src/Http/Transport/CurlTransport.php
new file mode 100644
index 00000000..15658292
--- /dev/null
+++ b/core/libraries/src/Http/Transport/CurlTransport.php
@@ -0,0 +1,372 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http\Transport;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Http\Response;
+use Joomla\CMS\Http\TransportInterface;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Registry\Registry;
+
+/**
+ * HTTP transport class for using cURL.
+ *
+ * @since  11.3
+ */
+class CurlTransport implements TransportInterface
+{
+	/**
+	 * @var    Registry  The client options.
+	 * @since  11.3
+	 */
+	protected $options;
+
+	/**
+	 * Constructor. CURLOPT_FOLLOWLOCATION must be disabled when open_basedir or safe_mode are enabled.
+	 *
+	 * @param   Registry  $options  Client options object.
+	 *
+	 * @link    https://secure.php.net/manual/en/function.curl-setopt.php
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function __construct(Registry $options)
+	{
+		if (!function_exists('curl_init') || !is_callable('curl_init'))
+		{
+			throw new \RuntimeException('Cannot use a cURL transport when curl_init() is not available.');
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Send a request to the server and return a HttpResponse object with the response.
+	 *
+	 * @param   string   $method     The HTTP method for sending the request.
+	 * @param   Uri      $uri        The URI to the resource to request.
+	 * @param   mixed    $data       Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers    An array of request headers to send with the request.
+	 * @param   integer  $timeout    Read timeout in seconds.
+	 * @param   string   $userAgent  The optional user agent string to send with the request.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null)
+	{
+		// Setup the cURL handle.
+		$ch = curl_init();
+
+		$options = array();
+
+		// Set the request method.
+		switch (strtoupper($method))
+		{
+			case 'GET':
+				$options[CURLOPT_HTTPGET] = true;
+				break;
+
+			case 'POST':
+				$options[CURLOPT_POST] = true;
+				break;
+
+			case 'PUT':
+			default:
+				$options[CURLOPT_CUSTOMREQUEST] = strtoupper($method);
+				break;
+		}
+
+		// Don't wait for body when $method is HEAD
+		$options[CURLOPT_NOBODY] = ($method === 'HEAD');
+
+		// Initialize the certificate store
+		$options[CURLOPT_CAINFO] = $this->options->get('curl.certpath', __DIR__ . '/cacert.pem');
+
+		// If data exists let's encode it and make sure our Content-type header is set.
+		if (isset($data))
+		{
+			// If the data is a scalar value simply add it to the cURL post fields.
+			if (is_scalar($data) || (isset($headers['Content-Type']) && strpos($headers['Content-Type'], 'multipart/form-data') === 0))
+			{
+				$options[CURLOPT_POSTFIELDS] = $data;
+			}
+
+			// Otherwise we need to encode the value first.
+			else
+			{
+				$options[CURLOPT_POSTFIELDS] = http_build_query($data);
+			}
+
+			if (!isset($headers['Content-Type']))
+			{
+				$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+			}
+
+			// Add the relevant headers.
+			if (is_scalar($options[CURLOPT_POSTFIELDS]))
+			{
+				$headers['Content-Length'] = strlen($options[CURLOPT_POSTFIELDS]);
+			}
+		}
+
+		// Build the headers string for the request.
+		$headerArray = array();
+
+		if (isset($headers))
+		{
+			foreach ($headers as $key => $value)
+			{
+				$headerArray[] = $key . ': ' . $value;
+			}
+
+			// Add the headers string into the stream context options array.
+			$options[CURLOPT_HTTPHEADER] = $headerArray;
+		}
+
+		// Curl needs the accepted encoding header as option
+		if (isset($headers['Accept-Encoding']))
+		{
+			$options[CURLOPT_ENCODING] = $headers['Accept-Encoding'];
+		}
+
+		// If an explicit timeout is given user it.
+		if (isset($timeout))
+		{
+			$options[CURLOPT_TIMEOUT] = (int) $timeout;
+			$options[CURLOPT_CONNECTTIMEOUT] = (int) $timeout;
+		}
+
+		// If an explicit user agent is given use it.
+		if (isset($userAgent))
+		{
+			$options[CURLOPT_USERAGENT] = $userAgent;
+		}
+
+		// Set the request URL.
+		$options[CURLOPT_URL] = (string) $uri;
+
+		// We want our headers. :-)
+		$options[CURLOPT_HEADER] = true;
+
+		// Return it... echoing it would be tacky.
+		$options[CURLOPT_RETURNTRANSFER] = true;
+
+		// Override the Expect header to prevent cURL from confusing itself in its own stupidity.
+		// Link: http://the-stickman.com/web-development/php-and-curl-disabling-100-continue-header/
+		$options[CURLOPT_HTTPHEADER][] = 'Expect:';
+
+		// Follow redirects if server config allows
+		if ($this->redirectsAllowed())
+		{
+			$options[CURLOPT_FOLLOWLOCATION] = (bool) $this->options->get('follow_location', true);
+		}
+
+		// Proxy configuration
+		$config = \JFactory::getConfig();
+
+		if ($config->get('proxy_enable'))
+		{
+			$options[CURLOPT_PROXY] = $config->get('proxy_host') . ':' . $config->get('proxy_port');
+
+			if ($user = $config->get('proxy_user'))
+			{
+				$options[CURLOPT_PROXYUSERPWD] = $user . ':' . $config->get('proxy_pass');
+			}
+		}
+
+		// Set any custom transport options
+		foreach ($this->options->get('transport.curl', array()) as $key => $value)
+		{
+			$options[$key] = $value;
+		}
+
+		// Authentification, if needed
+		if ($this->options->get('userauth') && $this->options->get('passwordauth'))
+		{
+			$options[CURLOPT_USERPWD] = $this->options->get('userauth') . ':' . $this->options->get('passwordauth');
+			$options[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
+		}
+
+		// Set the cURL options.
+		curl_setopt_array($ch, $options);
+
+		// Execute the request and close the connection.
+		$content = curl_exec($ch);
+
+		// Check if the content is a string. If it is not, it must be an error.
+		if (!is_string($content))
+		{
+			$message = curl_error($ch);
+
+			if (empty($message))
+			{
+				// Error but nothing from cURL? Create our own
+				$message = 'No HTTP response received';
+			}
+
+			throw new \RuntimeException($message);
+		}
+
+		// Get the request information.
+		$info = curl_getinfo($ch);
+
+		// Close the connection.
+		curl_close($ch);
+
+		$response = $this->getResponse($content, $info);
+
+		// Manually follow redirects if server doesn't allow to follow location using curl
+		if ($response->code >= 301 && $response->code < 400 && isset($response->headers['Location']) && (bool) $this->options->get('follow_location', true))
+		{
+			$redirect_uri = new Uri($response->headers['Location']);
+
+			if (in_array($redirect_uri->getScheme(), array('file', 'scp')))
+			{
+				throw new \RuntimeException('Curl redirect cannot be used in file or scp requests.');
+			}
+
+			$response = $this->request($method, $redirect_uri, $data, $headers, $timeout, $userAgent);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Method to get a response object from a server response.
+	 *
+	 * @param   string  $content  The complete server response, including headers
+	 *                            as a string if the response has no errors.
+	 * @param   array   $info     The cURL request information.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 * @throws  \UnexpectedValueException
+	 */
+	protected function getResponse($content, $info)
+	{
+		// Create the response object.
+		$return = new Response;
+
+		// Try to get header size
+		if (isset($info['header_size']))
+		{
+			$headerString = trim(substr($content, 0, $info['header_size']));
+			$headerArray  = explode("\r\n\r\n", $headerString);
+
+			// Get the last set of response headers as an array.
+			$headers = explode("\r\n", array_pop($headerArray));
+
+			// Set the body for the response.
+			$return->body = substr($content, $info['header_size']);
+		}
+		// Fallback and try to guess header count by redirect count
+		else
+		{
+			// Get the number of redirects that occurred.
+			$redirects = isset($info['redirect_count']) ? $info['redirect_count'] : 0;
+
+			/*
+			 * Split the response into headers and body. If cURL encountered redirects, the headers for the redirected requests will
+			 * also be included. So we split the response into header + body + the number of redirects and only use the last two
+			 * sections which should be the last set of headers and the actual body.
+			 */
+			$response = explode("\r\n\r\n", $content, 2 + $redirects);
+
+			// Set the body for the response.
+			$return->body = array_pop($response);
+
+			// Get the last set of response headers as an array.
+			$headers = explode("\r\n", array_pop($response));
+		}
+
+		// Get the response code from the first offset of the response headers.
+		preg_match('/[0-9]{3}/', array_shift($headers), $matches);
+
+		$code = count($matches) ? $matches[0] : null;
+
+		if (is_numeric($code))
+		{
+			$return->code = (int) $code;
+		}
+
+		// No valid response code was detected.
+		else
+		{
+			throw new \UnexpectedValueException('No HTTP response code found.');
+		}
+
+		// Add the response headers to the response object.
+		foreach ($headers as $header)
+		{
+			$pos = strpos($header, ':');
+			$return->headers[trim(substr($header, 0, $pos))] = trim(substr($header, ($pos + 1)));
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to check if HTTP transport cURL is available for use
+	 *
+	 * @return boolean true if available, else false
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return function_exists('curl_version') && curl_version();
+	}
+
+	/**
+	 * Check if redirects are allowed
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.1
+	 */
+	private function redirectsAllowed()
+	{
+		$curlVersion = curl_version();
+
+		// In PHP 5.6.0 or later there are no issues with curl redirects
+		if (version_compare(PHP_VERSION, '5.6', '>='))
+		{
+			// But if open_basedir is enabled we also need to check if libcurl version is 7.19.4 or higher
+			if (!ini_get('open_basedir') || version_compare($curlVersion['version'], '7.19.4', '>='))
+			{
+				return true;
+			}
+		}
+
+		// From PHP 5.4.0 to 5.5.30 curl redirects are only allowed if open_basedir is disabled
+		elseif (version_compare(PHP_VERSION, '5.4', '>='))
+		{
+			if (!ini_get('open_basedir'))
+			{
+				return true;
+			}
+		}
+
+		// From PHP 5.1.5 to 5.3.30 curl redirects are only allowed if safe_mode and open_basedir are disabled
+		else
+		{
+			if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/src/Http/Transport/SocketTransport.php b/core/libraries/src/Http/Transport/SocketTransport.php
new file mode 100644
index 00000000..946b6ead
--- /dev/null
+++ b/core/libraries/src/Http/Transport/SocketTransport.php
@@ -0,0 +1,335 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http\Transport;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Http\Response;
+use Joomla\CMS\Http\TransportInterface;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Registry\Registry;
+
+/**
+ * HTTP transport class for using sockets directly.
+ *
+ * @since  11.3
+ */
+class SocketTransport implements TransportInterface
+{
+	/**
+	 * @var    array  Reusable socket connections.
+	 * @since  11.3
+	 */
+	protected $connections;
+
+	/**
+	 * @var    Registry  The client options.
+	 * @since  11.3
+	 */
+	protected $options;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  Client options object.
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function __construct(Registry $options)
+	{
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('Cannot use a socket transport when fsockopen() is not available.');
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Send a request to the server and return a HttpResponse object with the response.
+	 *
+	 * @param   string   $method     The HTTP method for sending the request.
+	 * @param   Uri      $uri        The URI to the resource to request.
+	 * @param   mixed    $data       Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers    An array of request headers to send with the request.
+	 * @param   integer  $timeout    Read timeout in seconds.
+	 * @param   string   $userAgent  The optional user agent string to send with the request.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null)
+	{
+		$connection = $this->connect($uri, $timeout);
+
+		// Make sure the connection is alive and valid.
+		if (is_resource($connection))
+		{
+			// Make sure the connection has not timed out.
+			$meta = stream_get_meta_data($connection);
+
+			if ($meta['timed_out'])
+			{
+				throw new \RuntimeException('Server connection timed out.');
+			}
+		}
+		else
+		{
+			throw new \RuntimeException('Not connected to server.');
+		}
+
+		// Get the request path from the URI object.
+		$path = $uri->toString(array('path', 'query'));
+
+		// If we have data to send make sure our request is setup for it.
+		if (!empty($data))
+		{
+			// If the data is not a scalar value encode it to be sent with the request.
+			if (!is_scalar($data))
+			{
+				$data = http_build_query($data);
+			}
+
+			if (!isset($headers['Content-Type']))
+			{
+				$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+			}
+
+			// Add the relevant headers.
+			$headers['Content-Length'] = strlen($data);
+		}
+
+		// Build the request payload.
+		$request = array();
+		$request[] = strtoupper($method) . ' ' . ((empty($path)) ? '/' : $path) . ' HTTP/1.0';
+		$request[] = 'Host: ' . $uri->getHost();
+
+		// If an explicit user agent is given use it.
+		if (isset($userAgent))
+		{
+			$headers['User-Agent'] = $userAgent;
+		}
+
+		// If there are custom headers to send add them to the request payload.
+		if (is_array($headers))
+		{
+			foreach ($headers as $k => $v)
+			{
+				$request[] = $k . ': ' . $v;
+			}
+		}
+
+		// Set any custom transport options
+		foreach ($this->options->get('transport.socket', array()) as $value)
+		{
+			$request[] = $value;
+		}
+
+		// If we have data to send add it to the request payload.
+		if (!empty($data))
+		{
+			$request[] = null;
+			$request[] = $data;
+		}
+
+		// Authentification, if needed
+		if ($this->options->get('userauth') && $this->options->get('passwordauth'))
+		{
+			$request[] = 'Authorization: Basic ' . base64_encode($this->options->get('userauth') . ':' . $this->options->get('passwordauth'));
+		}
+
+		// Send the request to the server.
+		fwrite($connection, implode("\r\n", $request) . "\r\n\r\n");
+
+		// Get the response data from the server.
+		$content = '';
+
+		while (!feof($connection))
+		{
+			$content .= fgets($connection, 4096);
+		}
+
+		$content = $this->getResponse($content);
+
+		// Follow Http redirects
+		if ($content->code >= 301 && $content->code < 400 && isset($content->headers['Location']))
+		{
+			return $this->request($method, new Uri($content->headers['Location']), $data, $headers, $timeout, $userAgent);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Method to get a response object from a server response.
+	 *
+	 * @param   string  $content  The complete server response, including headers.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 * @throws  \UnexpectedValueException
+	 */
+	protected function getResponse($content)
+	{
+		// Create the response object.
+		$return = new Response;
+
+		if (empty($content))
+		{
+			throw new \UnexpectedValueException('No content in response.');
+		}
+
+		// Split the response into headers and body.
+		$response = explode("\r\n\r\n", $content, 2);
+
+		// Get the response headers as an array.
+		$headers = explode("\r\n", $response[0]);
+
+		// Set the body for the response.
+		$return->body = empty($response[1]) ? '' : $response[1];
+
+		// Get the response code from the first offset of the response headers.
+		preg_match('/[0-9]{3}/', array_shift($headers), $matches);
+		$code = $matches[0];
+
+		if (is_numeric($code))
+		{
+			$return->code = (int) $code;
+		}
+
+		// No valid response code was detected.
+		else
+		{
+			throw new \UnexpectedValueException('No HTTP response code found.');
+		}
+
+		// Add the response headers to the response object.
+		foreach ($headers as $header)
+		{
+			$pos = strpos($header, ':');
+			$return->headers[trim(substr($header, 0, $pos))] = trim(substr($header, ($pos + 1)));
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to connect to a server and get the resource.
+	 *
+	 * @param   Uri      $uri      The URI to connect with.
+	 * @param   integer  $timeout  Read timeout in seconds.
+	 *
+	 * @return  resource  Socket connection resource.
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	protected function connect(Uri $uri, $timeout = null)
+	{
+		$errno = null;
+		$err = null;
+
+		// Get the host from the uri.
+		$host = ($uri->isSsl()) ? 'ssl://' . $uri->getHost() : $uri->getHost();
+
+		// If the port is not explicitly set in the URI detect it.
+		if (!$uri->getPort())
+		{
+			$port = ($uri->getScheme() == 'https') ? 443 : 80;
+		}
+
+		// Use the set port.
+		else
+		{
+			$port = $uri->getPort();
+		}
+
+		// Build the connection key for resource memory caching.
+		$key = md5($host . $port);
+
+		// If the connection already exists, use it.
+		if (!empty($this->connections[$key]) && is_resource($this->connections[$key]))
+		{
+			// Connection reached EOF, cannot be used anymore
+			$meta = stream_get_meta_data($this->connections[$key]);
+
+			if ($meta['eof'])
+			{
+				if (!fclose($this->connections[$key]))
+				{
+					throw new \RuntimeException('Cannot close connection');
+				}
+			}
+
+			// Make sure the connection has not timed out.
+			elseif (!$meta['timed_out'])
+			{
+				return $this->connections[$key];
+			}
+		}
+
+		if (!is_numeric($timeout))
+		{
+			$timeout = ini_get('default_socket_timeout');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		// PHP sends a warning if the uri does not exists; we silence it and throw an exception instead.
+		// Attempt to connect to the server
+		$connection = @fsockopen($host, $port, $errno, $err, $timeout);
+
+		if (!$connection)
+		{
+			if (!$php_errormsg)
+			{
+				// Error but nothing from php? Create our own
+				$php_errormsg = sprintf('Could not connect to resource: %s', $uri, $err, $errno);
+			}
+
+			// Restore error tracking to give control to the exception handler
+			ini_set('track_errors', $track_errors);
+
+			throw new \RuntimeException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Since the connection was successful let's store it in case we need to use it later.
+		$this->connections[$key] = $connection;
+
+		// If an explicit timeout is set, set it.
+		if (isset($timeout))
+		{
+			stream_set_timeout($this->connections[$key], (int) $timeout);
+		}
+
+		return $this->connections[$key];
+	}
+
+	/**
+	 * Method to check if http transport socket available for use
+	 *
+	 * @return  boolean   True if available else false
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return function_exists('fsockopen') && is_callable('fsockopen') && !\JFactory::getConfig()->get('proxy_enable');
+	}
+}
diff --git a/core/libraries/src/Http/Transport/StreamTransport.php b/core/libraries/src/Http/Transport/StreamTransport.php
new file mode 100644
index 00000000..b51bd748
--- /dev/null
+++ b/core/libraries/src/Http/Transport/StreamTransport.php
@@ -0,0 +1,285 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http\Transport;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Http\Response;
+use Joomla\CMS\Http\TransportInterface;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Registry\Registry;
+
+/**
+ * HTTP transport class for using PHP streams.
+ *
+ * @since  11.3
+ */
+class StreamTransport implements TransportInterface
+{
+	/**
+	 * @var    Registry  The client options.
+	 * @since  11.3
+	 */
+	protected $options;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  Client options object.
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function __construct(Registry $options)
+	{
+		// Verify that URLs can be used with fopen();
+		if (!ini_get('allow_url_fopen'))
+		{
+			throw new \RuntimeException('Cannot use a stream transport when "allow_url_fopen" is disabled.');
+		}
+
+		// Verify that fopen() is available.
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('Cannot use a stream transport when fopen() is not available or "allow_url_fopen" is disabled.');
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Send a request to the server and return a HttpResponse object with the response.
+	 *
+	 * @param   string   $method     The HTTP method for sending the request.
+	 * @param   Uri      $uri        The URI to the resource to request.
+	 * @param   mixed    $data       Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers    An array of request headers to send with the request.
+	 * @param   integer  $timeout    Read timeout in seconds.
+	 * @param   string   $userAgent  The optional user agent string to send with the request.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null)
+	{
+		// Create the stream context options array with the required method offset.
+		$options = array('method' => strtoupper($method));
+
+		// If data exists let's encode it and make sure our Content-Type header is set.
+		if (isset($data))
+		{
+			// If the data is a scalar value simply add it to the stream context options.
+			if (is_scalar($data))
+			{
+				$options['content'] = $data;
+			}
+			// Otherwise we need to encode the value first.
+			else
+			{
+				$options['content'] = http_build_query($data);
+			}
+
+			if (!isset($headers['Content-Type']))
+			{
+				$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8';
+			}
+
+			// Add the relevant headers.
+			$headers['Content-Length'] = strlen($options['content']);
+		}
+
+		// If an explicit timeout is given user it.
+		if (isset($timeout))
+		{
+			$options['timeout'] = (int) $timeout;
+		}
+
+		// If an explicit user agent is given use it.
+		if (isset($userAgent))
+		{
+			$options['user_agent'] = $userAgent;
+		}
+
+		// Ignore HTTP errors so that we can capture them.
+		$options['ignore_errors'] = 1;
+
+		// Follow redirects.
+		$options['follow_location'] = (int) $this->options->get('follow_location', 1);
+
+		// Set any custom transport options
+		foreach ($this->options->get('transport.stream', array()) as $key => $value)
+		{
+			$options[$key] = $value;
+		}
+
+		// Add the proxy configuration, if any.
+		$config = \JFactory::getConfig();
+
+		if ($config->get('proxy_enable'))
+		{
+			$options['proxy'] = $config->get('proxy_host') . ':' . $config->get('proxy_port');
+			$options['request_fulluri'] = true;
+
+			// Put any required authorization into the headers array to be handled later
+			// TODO: do we need to support any auth type other than Basic?
+			if ($user = $config->get('proxy_user'))
+			{
+				$auth = base64_encode($config->get('proxy_user') . ':' . $config->get('proxy_pass'));
+
+				$headers['Proxy-Authorization'] = 'Basic ' . $auth;
+			}
+		}
+
+		// Build the headers string for the request.
+		$headerEntries = array();
+
+		if (isset($headers))
+		{
+			foreach ($headers as $key => $value)
+			{
+				$headerEntries[] = $key . ': ' . $value;
+			}
+
+			// Add the headers string into the stream context options array.
+			$options['header'] = implode("\r\n", $headerEntries);
+		}
+
+		// Get the current context options.
+		$contextOptions = stream_context_get_options(stream_context_get_default());
+
+		// Add our options to the current ones, if any.
+		$contextOptions['http'] = isset($contextOptions['http']) ? array_merge($contextOptions['http'], $options) : $options;
+
+		// Create the stream context for the request.
+		$context = stream_context_create(
+			array(
+				'http' => $options,
+				'ssl' => array(
+					'verify_peer'   => true,
+					'cafile'        => $this->options->get('stream.certpath', __DIR__ . '/cacert.pem'),
+					'verify_depth'  => 5,
+				),
+			)
+		);
+
+		// Authentification, if needed
+		if ($this->options->get('userauth') && $this->options->get('passwordauth'))
+		{
+			$uri->setUser($this->options->get('userauth'));
+			$uri->setPass($this->options->get('passwordauth'));
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		// Open the stream for reading.
+		$stream = @fopen((string) $uri, 'r', false, $context);
+
+		if (!$stream)
+		{
+			if (!$php_errormsg)
+			{
+				// Error but nothing from php? Create our own
+				$php_errormsg = sprintf('Could not connect to resource: %s', $uri, $err, $errno);
+			}
+
+			// Restore error tracking to give control to the exception handler
+			ini_set('track_errors', $track_errors);
+
+			throw new \RuntimeException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Get the metadata for the stream, including response headers.
+		$metadata = stream_get_meta_data($stream);
+
+		// Get the contents from the stream.
+		$content = stream_get_contents($stream);
+
+		// Close the stream.
+		fclose($stream);
+
+		if (isset($metadata['wrapper_data']['headers']))
+		{
+			$headers = $metadata['wrapper_data']['headers'];
+		}
+		elseif (isset($metadata['wrapper_data']))
+		{
+			$headers = $metadata['wrapper_data'];
+		}
+		else
+		{
+			$headers = array();
+		}
+
+		return $this->getResponse($headers, $content);
+	}
+
+	/**
+	 * Method to get a response object from a server response.
+	 *
+	 * @param   array   $headers  The response headers as an array.
+	 * @param   string  $body     The response body as a string.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 * @throws  \UnexpectedValueException
+	 */
+	protected function getResponse(array $headers, $body)
+	{
+		// Create the response object.
+		$return = new Response;
+
+		// Set the body for the response.
+		$return->body = $body;
+
+		// Get the response code from the first offset of the response headers.
+		preg_match('/[0-9]{3}/', array_shift($headers), $matches);
+		$code = $matches[0];
+
+		if (is_numeric($code))
+		{
+			$return->code = (int) $code;
+		}
+
+		// No valid response code was detected.
+		else
+		{
+			throw new \UnexpectedValueException('No HTTP response code found.');
+		}
+
+		// Add the response headers to the response object.
+		foreach ($headers as $header)
+		{
+			$pos = strpos($header, ':');
+			$return->headers[trim(substr($header, 0, $pos))] = trim(substr($header, ($pos + 1)));
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to check if http transport stream available for use
+	 *
+	 * @return  boolean  true if available else false
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported()
+	{
+		return function_exists('fopen') && is_callable('fopen') && ini_get('allow_url_fopen');
+	}
+}
diff --git a/core/libraries/src/Http/Transport/cacert.pem b/core/libraries/src/Http/Transport/cacert.pem
new file mode 100644
index 00000000..617d83a7
--- /dev/null
+++ b/core/libraries/src/Http/Transport/cacert.pem
@@ -0,0 +1,4312 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from CentOS 7 as of Mar 3 2017
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from CentOS /etc/pki/tls/certs/ca-bundle.crt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB
+zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
+d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
+cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow
+gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT
+CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV
+BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo
+YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z
+ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560
+ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j
++ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI
+CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH
+IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga
+WuFg3GQjPEIuTQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
+AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
+CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
+BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
+VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
+qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
+HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
+G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
+lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
+IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
+0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
+k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
+4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
+m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
+cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
+uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
+KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
+ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
+AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
+VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
+CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
+cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
+QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
+7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
+cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
+QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
+czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
+aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
+aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
+DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
+BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
+D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
+JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
+AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
+vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
+tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
+7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
+h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
+d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
+pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
+BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UE
+AwwVQXRvcyBUcnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQG
+EwJERTAeFw0xMTA3MDcxNDU4MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMM
+FUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMC
+REUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVhTuXbyo7LjvPpvMp
+Nb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr54rM
+VD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+
+SZFhyBH+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ
+4J7sVaE3IqKHBAUsR320HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0L
+cp2AMBYHlT8oDv3FdU9T1nSatCQujgKRz3bFmx5VdJx4IbHwLfELn8LVlhgf8FQi
+eowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7Rl+lwrrw7GWzbITAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZbNshMBgG
+A1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3
+DQEBCwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8j
+vZfza1zv7v1Apt+hk6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kP
+DpFrdRbhIfzYJsdHt6bPWHJxfrrhTZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pc
+maHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a961qn8FYiqTxlVMYVqL2Gns2D
+lmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G3mB/ufNPRJLv
+KrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
+MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
+D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
+OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
+fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
+IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
+oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
+/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
+rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
+3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
+7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
+yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
+qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
+hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
+SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
+HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
+emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
+AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
+7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
+DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
+F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
+a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
+Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
+MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
+NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
+PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
+x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
+QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
+yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
+QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
+H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
+QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
+i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
+nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
+rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
+hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
+GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
+lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
+TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
+nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
+gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
+G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
+zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
+L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQsw
+CQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMT
+EkNBIFdvU2lnbiBFQ0MgUm9vdDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4
+NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEb
+MBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZIzj0CAQYFK4EEACID
+YgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiUt5v8
+KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES
+1ns2o0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUqv3VWqP2h4syhf3RMluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB
+1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0Daupn75OcsqF1NnstTJFGG+rrQIwfcf3
+aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYua/GRspBl9JrmkO5K
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJD
+TjEwMC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkx
+MjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEwMC4GA1UECgwnQ2hpbmEgRmluYW5j
+aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJP
+T1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnVBU03
+sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpL
+TIpTUnrD7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5
+/ZOkVIBMUtRSqy5J35DNuF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp
+7hZZLDRJGqgG16iI0gNyejLi6mhNbiyWZXvKWfry4t3uMCz7zEasxGPrb382KzRz
+EpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7xzbh72fROdOXW3NiGUgt
+hxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9fpy25IGvP
+a931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqot
+aK8KgWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNg
+TnYGmE69g60dWIolhdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfV
+PKPtl8MeNPo4+QgO48BdK4PRVmrJtqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hv
+cWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAfBgNVHSMEGDAWgBTj/i39KNAL
+tbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAd
+BgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObT
+ej/tUxPQ4i9qecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdL
+jOztUmCypAbqTuv0axn96/Ua4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBS
+ESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sGE5uPhnEFtC+NiWYzKXZUmhH4J/qy
+P5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfXBDrDMlI1Dlb4pd19
+xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjnaH9d
+Ci77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN
+5mydLIhyPDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe
+/v5WOaHIz16eGWRGENoXkbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+Z
+AAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ
+5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
+ZQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
+hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
+6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
+pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
+9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
+/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
+Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
+qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
+SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
+u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
+Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
+crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
+/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
+wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
+4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
+2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
+FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
+CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
+boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
+jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
+S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
+QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
+0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
+NVOFBkpdn627G190
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBY
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNV
+BAMTJENlcnRpZmljYXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDEx
+MDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgxCzAJBgNVBAYTAkNOMRowGAYDVQQK
+ExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPX
+JYY1kBaiXW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgO
+gHzKtB0TiGsOqCR3A9DuW/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg
+5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg95k4ot+vElbGs/V6r+kHLXZ1L3PR8du9n
+fwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BKv0mUYQs4kI9dJGwlezt5
+2eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJ
+KoZIhvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8
+fHulwqZm46qwtyeYP0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G
+3CE4Q3RM+zD4F3LBMvzIkRfEzFg3TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yy
+SrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu+sif/a+RZQp4OBXllxcU3fng
+LDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+7Q9LGOHSJDy7
+XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
+DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
+BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
+QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
+gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
+zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
+130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
+JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
+ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
+AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
+9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
+bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
+fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
+HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
+t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
+BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
+Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
+cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
+aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
+F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
+8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
+rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
+/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
+7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
+28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
+lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
+nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
+0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
+5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
+WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
+jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
+ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
+OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
+619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
+2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
+o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
+nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
+5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
+pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
+dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
+BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAb
+BgNVBAMTFENlcnRpbm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMz
+MTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMx
+FzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0g
+Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQosP5L2
+fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJfl
+LieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQV
+WZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF
+TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb
+5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLSc
+CbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6Ri
+wsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJ
+wx3tFvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SG
+m/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4
+F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZng
+WVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0
+2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/
+0KGRHCwPT5iVWVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWw
+F6YSjNRieOpWauwK0kDDPAUwPk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZS
+g081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAXlCOotQqSD7J6wWAsOMwaplv/8gzj
+qh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJy29SWwNyhlCVCNSN
+h4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9Iff/
+ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8V
+btaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj
+Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ
+8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvW
+gQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
+Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
+aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
+Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
+SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
+aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
+ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
+7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
+DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
+zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
+hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
+4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
+gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
+NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
+j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
+52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
+echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
+zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
+wy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA
+n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc
+biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp
+EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA
+bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu
+YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW
+BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI
+QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I
+0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni
+lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9
+B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv
+ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQsw
+CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
+ZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3Qg
+RzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJf
+Zn4f5dwbRXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17Q
+RSAPWXYQ1qAk8C3eNvJsKTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgFUaFNN6KDec6NHSrkhDAKBggqhkjOPQQD
+AwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5FyYZ5eEJJZVrmDxxDnOOlY
+JjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy1vUhZscv
+6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQsw
+CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
+ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe
+Fw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUw
+EwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20x
+IDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0CAQYF
+K4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FG
+fp4tn+6OYwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPO
+Z9wj/wMco+I+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAd
+BgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNpYim8S8YwCgYIKoZIzj0EAwMDaAAwZQIx
+AK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y3maTD/HMsQmP3Wyr+mt/
+oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34VOKa5Vt8
+sycX
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
+RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
+ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
+xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
+ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
+DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
+jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
+CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
+EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
+fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
+uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
+chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
+9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
+SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
++SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
+fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
+sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
+cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
+0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
+4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
+r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
+/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
+gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV
+BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC
+aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV
+BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1
+Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz
+MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+
+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp
+em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY
+B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH
+D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF
+Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo
+q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D
+k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH
+fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut
+dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM
+ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8
+zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX
+U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6
+Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5
+XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF
+Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR
+HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY
+GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c
+77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3
++GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK
+vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6
+FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl
+yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P
+AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD
+y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d
+NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
+8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
+dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
+YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
+dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
+IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
+LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
+EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
+KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
+ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
+bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
+ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
+85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
+4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
+HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
+QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
+lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
+o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
+opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
+dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
+ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
+AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
+/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
+SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
+Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
+Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
+nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
+czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
+CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
+MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
+ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
+b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
+euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
+bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
+WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
+MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
+1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
+zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
+BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
+v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
+E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
+iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
+GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
+A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
+d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
+dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
+RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
+MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
+VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
+L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
+Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
+A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
+ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
+Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
+R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
+hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
+cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
+IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
+dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
+NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
+dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
+dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
+aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
+RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
+cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
+wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
+U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
+jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
+BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
+jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
+1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
+nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
+VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEk
+MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpH
+bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
+QSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprlOQcJ
+FspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61F
+uOJAf/sKbvu+M8k8o4TVMAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGX
+kPoUVy0D7O48027KqGx2vKLeuwIgJ6iFJzWbVsaj8kfSt24bAgAXqmemFZHe+pTs
+ewv4n4Q=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEk
+MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpH
+bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
+QSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6SFkc
+8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8ke
+hOvRnkmSh5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYI
+KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg
+515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7yFz9SO8NdCKoCOJuxUnO
+xwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
+RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
+dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
+YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
+NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
+EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
+cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
+dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
+fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
+bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
+75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
+FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
+HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
+5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
+b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
+A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
+6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
+dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
+Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
+l7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
+0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu
+VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw
+MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw
+JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT
+3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU
++ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp
+S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1
+bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi
+T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL
+vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK
+Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK
+dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT
+c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv
+l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N
+iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD
+ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt
+LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93
+nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3
++wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK
+W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT
+AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq
+l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG
+4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ
+mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A
+7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVu
+VHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcN
+MzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0
+MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTyP4o7
+ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGy
+RBb06tD6Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlS
+bdsHyo+1W/CD80/HLaXIrcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF
+/YTLNiCBWS2ab21ISGHKTN9T0a9SvESfqy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R
+3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoSmJxZZoY+rfGwyj4GD3vw
+EUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFnol57plzy
+9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9V
+GxyhLrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ
+2fjXctscvG29ZV/viDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsV
+WaFHVCkugyhfHMKiq3IXAAaOReyL4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gD
+W/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMwDQYJKoZIhvcN
+AQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHV
+DRDtfULAj+7AmgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9
+TaDKQGXSc3z1i9kKlT/YPyNtGtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8G
+lwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFtm6/n6J91eEyrRjuazr8FGF1NFTwW
+mhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMxNRF4eKLg6TCMf4Df
+WN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4Mhn5
++bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJ
+tshquDDIajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhA
+GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
+8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
+cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
+b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
+ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
+NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
+TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
+Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
+uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
+vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
+Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
+62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
+AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
+LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
+BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
+AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
+MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
+ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
+AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
+ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
+AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
+AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
+bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
+Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
+PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
+Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
+EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
+w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
+cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
+HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
+VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
+BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
+b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
+8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
+ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
+7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
+hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
+MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBt
+MQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUg
+Rm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9i
+YWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAwMzJaFw0zOTEyMDExNTEwMzFaMG0x
+CzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQLExlPSVNURSBG
+b3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3
+HEokKtaXscriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGx
+WuR51jIjK+FTzJlFXHtPrby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX
+1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNk
+u7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4oQnc/nSMbsrY9gBQHTC5P
+99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvgGUpuuy9r
+M2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUB
+BAMCAQAwDQYJKoZIhvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrgh
+cViXfa43FK8+5/ea4n32cZiZBKpDdHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5
+gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0VQreUGdNZtGn//3ZwLWoo4rO
+ZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEuiHZeeevJuQHHf
+aPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
+MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
+b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
+KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
+A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
+aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
+7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
+BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
+ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
+JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
+PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
+0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
+6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
+v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
+K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
+bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
+MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
+MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
+gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
+b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
+bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
+cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
+ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
+ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
+hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
+AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
+MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
+RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
+UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
+cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
+AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
+AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
+1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
+3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
+Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
+HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
+pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
+sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
+qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
+mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
+opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
+YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00
+MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakEPBtV
+wedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWe
+rNrwU8lmPNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF341
+68Xfuw6cwI2H44g4hWf6Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh
+4Pw5qlPafX7PGglTvF0FBM+hSo+LdoINofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXp
+UhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/lg6AnhF4EwfWQvTA9xO+o
+abw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV7qJZjqlc
+3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/G
+KubX9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSt
+hfbZxbGL0eUQMk1fiyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KO
+Tk0k+17kBL5yG6YnLUlamXrXXAkgt3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOt
+zCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZIhvcNAQELBQAD
+ggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2
+cDMT/uFPpiN3GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUN
+qXsCHKnQO18LwIE6PWThv6ctTr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5
+YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP+V04ikkwj+3x6xn0dxoxGE1nVGwv
+b2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh3jRJjehZrJ3ydlo2
+8hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fawx/k
+NSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNj
+ZgKAvQU6O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhp
+q1467HxpvMc7hU6eFbm0FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFt
+nh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOVhMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
+MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
+qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
+n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
+c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
+o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
+IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
+IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
+8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
+vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
+7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
+cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
+ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
+roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
+W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
+lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
++V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
+csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
+dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
+KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
+HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
+WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00
+MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286IxSR
+/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNu
+FoM7pmRLMon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXR
+U7Ox7sWTaYI+FrUoRqHe6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+c
+ra1AdHkrAj80//ogaX3T7mH1urPnMNA3I4ZyYUUpSFlob3emLoG+B01vr87ERROR
+FHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3UVDmrJqMz6nWB2i3ND0/k
+A9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f75li59wzw
+eyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634Ryl
+sSqiMd5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBp
+VzgeAVuNVejH38DMdyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0Q
+A4XN8f+MFrXBsj6IbGB/kE+V9/YtrQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+
+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZIhvcNAQELBQAD
+ggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnI
+FUBhynLWcKzSt/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5Wvv
+oxXqA/4Ti2Tk08HS6IT7SdEQTXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFg
+u/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9DuDcpmvJRPpq3t/O5jrFc/ZSXPsoaP
+0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGibIh6BJpsQBJFxwAYf
+3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmDhPbl
+8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+
+DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN
+PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/
+ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
+7CAFYd4=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
+UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
+R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
+MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
+JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
+WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
+SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
+u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
+A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
+Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
+MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
+aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
+IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
+cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
+YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
+bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
+bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
+aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
+ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
+YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
+ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
+LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
+Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
+eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
+CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
+A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
+Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
+lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
+b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
+9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
+ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
+IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
+MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
+IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
+bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
+RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
+zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
+bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
+MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
+VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
+OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
+tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
+q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
+EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
+VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gRVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0y
+MjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIg
+TmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRlcmxhbmRlbiBFViBS
+b290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkkSzrS
+M4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nC
+UiY4iKTWO0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3d
+Z//BYY1jTw+bbRcwJu+r0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46p
+rfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13l
+pJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gVXJrm0w912fxBmJc+qiXb
+j5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr08C+eKxC
+KFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS
+/ZbV0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0X
+cgOPvZuM5l5Tnrmd74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH
+1vI4gnPah1vlPNOePqc7nvQDs/nxfRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrP
+px9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwaivsnuL8wbqg7
+MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u
+2dfOWBfoqSmuc0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHS
+v4ilf0X8rLiltTMMgsT7B/Zq5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTC
+wPTxGfARKbalGAKb12NMcIxHowNDXLldRqANb/9Zjr7dn3LDWyvfjFvO5QxGbJKy
+CqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tNf1zuacpzEPuKqf2e
+vTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi5Dp6
+Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIa
+Gl6I6lD4WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeL
+eG9QgkRQP2YGiqtDhFZKDyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8
+FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGyeUN51q1veieQA6TqJIc/2b3Z6fJfUEkc
+7uzXLg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloX
+DTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4yolQP
+cPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WW
+IkYFsO2tx1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqX
+xz8ecAgwoNzFs21v0IJyEavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFy
+KJLZWyNtZrVtB0LrpjPOktvA9mxjeM3KTj215VKb8b475lRgsGYeCasH/lSJEULR
+9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUurmkVLoR9BvUhTFXFkC4az
+5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU51nus6+N8
+6U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7
+Ngzp07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHP
+bMk7ccHViLVlvMDoFxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXt
+BznaqB16nzaeErAMZRKQFWDZJkBE41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTt
+XUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMBAAGjQjBAMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleuyjWcLhL75Lpd
+INyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwp
+LiniyMMB8jPqKqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8
+Ipf3YF3qKS9Ysr1YvY2WTxB1v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixp
+gZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA8KCWAg8zxXHzniN9lLf9OtMJgwYh
+/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b8KKaa8MFSu1BYBQw
+0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0rmj1A
+fsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq
+4BZ+Extq1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR
+1VmiiXTTn74eS9fGbbeIJG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/
+QFH1T/U67cjF68IeHRaVesd+QnGTbksVtzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM
+94B7IWcnMFk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
+OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
+A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
+JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
+vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
+D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
+Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
+RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
+HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
+nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
+0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
+UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
+Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
+TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
+BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
+UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
+6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
+9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
+HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
+wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
+XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
+IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
+hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
+so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
+MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
+jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
+0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
+2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
+ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
+y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
+tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
+6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
+uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
+acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
+k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
+VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
+b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
+fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
+/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
+REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
+srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
+aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
+woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
+Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
+t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
+8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
+9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
+wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
+ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
+dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
+IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
+VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
+dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
+MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
+UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
+1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
+oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
+HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
+5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
+idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
+OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
+NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
+46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
+UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
+7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
+A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
+bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
+XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
+PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
+Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
+WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
+Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
+7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
+nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
+vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
+WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
+fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
+I+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgxMDAxMTA0MDE0WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUd
+AqSzm1nzHoqvNK38DcLZSBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiC
+FoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/FvudocP05l03Sx5iRUKrERLMjfTlH6VJi
+1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx9702cu+fjOlbpSD8DT6Iavq
+jnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGVWOHAD3bZ
+wI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/
+WSA2AHmgoCJrjNXyYdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhy
+NsZt+U2e+iKo4YFWz827n+qrkRk4r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPAC
+uvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNfvNoBYimipidx5joifsFvHZVw
+IEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR3p1m0IvVVGb6
+g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlP
+BSeOE6Fuwg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
+OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
+b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
+VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
+sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
+ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
+KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
+HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
+IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
+733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
+Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
+AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
+mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
+XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
+qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
+EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
+VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
+NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
+B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
+10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
+0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
+MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
+zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
+46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
+yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
+laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
+oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
+BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
+qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
+4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
+1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
+H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
+RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
+15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
+6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
+nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
+wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
+aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
+KwbQBM0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
+MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
+V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
+WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
+LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
+AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
+K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
+RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
+rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
+3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
+hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
+MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
+XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
+lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
+aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
+YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
+pYYsfPQS
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
+NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv
+b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD
+VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F
+VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1
+7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X
+Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+
+/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs
+81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm
+dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe
+Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu
+sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4
+pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs
+slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ
+arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG
+9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl
+dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj
+TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed
+Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7
+Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI
+OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7
+vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW
+t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn
+HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx
+SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
+ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
+MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
+MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
+iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
+vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
+0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
+OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
+BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
+FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
+GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
+zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
+1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
+f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
+jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
+ZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UE
+BhMCVFIxDzANBgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxn
+aSDEsGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkg
+QS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1QgRWxla3Ryb25payBTZXJ0aWZpa2Eg
+SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAwODA3MDFaFw0yMzA0
+MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0wSwYD
+VQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCUZ4WWe60ghUEoI5RHwWrom
+/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537jVJp45wnEFPzpALFp/kR
+Gml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1mep5Fimh3
+4khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z
+5UNP9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0
+hO8EuPbJbKoCPrZV4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QID
+AQABo0IwQDAdBgNVHQ4EFgQUVpkHHtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ5FdnsX
+SDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPoBP5yCccLqh0l
+VX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nf
+peYVhDfwwvJllpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CF
+Yv4HAqGEVka+lgqaE9chTLd8B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW
++qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQG
+EwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdp
+IMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBB
+LsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBI
+aXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5MDQxMFoXDTIzMTIx
+NjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBLBgNV
+BAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2
+ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVs
+ZWt0cm9uaWsgU2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdsGjW6L0UlqMACprx9MfMkU1x
+eHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a2uqsxgbPJQ1BgfbBOCK9
++bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EEDwnS3/faA
+z1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0p
+u5FbHH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6p
+lVxiSvgNZ1GpryHV+DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMB
+AAGjQjBAMB0GA1UdDgQWBBTdVRcT9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAb1gNl0Oq
+FlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3RfdCaqaXKGDsC
+QC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKID
+gI6tflEATseWhvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm
+9ocJV612ph1jmv3XZch4gyt1O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsG
+tAuYSyher4hYyw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
+eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
+JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
+VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
+I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
+o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
+A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
+zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
+RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
+MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
+3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
+tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
+Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
+VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
+79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
+c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
+Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
+c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
+UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
+Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
+Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
+VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
+ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
+8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
+iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
+Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
+XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
+qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
+VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
+L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
+jjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
+2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBV
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNV
+BAMTIUNlcnRpZmljYXRpb24gQXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgw
+MTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFX
+b1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvcqN
+rLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1U
+fcIiePyOCbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcScc
+f+Hb0v1naMQFXQoOXXDX2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2
+ZjC1vt7tj/id07sBMOby8w7gLJKA84X5KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4M
+x1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR+ScPewavVIMYe+HdVHpR
+aG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ezEC8wQjch
+zDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDar
+uHqklWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221K
+mYo0SLwX3OSACCK28jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvA
+Sh0JWzko/amrzgD5LkhLJuYwTKVYyrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWv
+HYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0CAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R8bNLtwYgFP6H
+EtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJ
+MuYhOZO9sxXqT2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2e
+JXLOC62qx1ViC777Y7NhRCOjy+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VN
+g64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC2nz4SNAzqfkHx5Xh9T71XXG68pWp
+dIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes5cVAWubXbHssw1ab
+R80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/EaEQ
+PkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGce
+xGATVdVhmVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+
+J7x6v+Db9NpSvd4MVHAxkUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMl
+OtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGikpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWT
+ee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBG
+MQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNV
+BAMMEkNBIOayg+mAmuagueivgeS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgw
+MTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRl
+ZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k8H/r
+D195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld1
+9AXbbQs5uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExf
+v5RxadmWPgxDT74wwJ85dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnk
+UkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+L
+NVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFyb7Ao65vh4YOhn0pdr8yb
++gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc76DbT52V
+qyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6K
+yX2m+Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0G
+AbQOXDBGVWCvOGU6yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaK
+J/kR8slC/k7e3x9cxKSGhxYzoacXGKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwEC
+AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUAA4ICAQBqinA4
+WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
+yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj
+/feTZU7n85iYr83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6
+jBAyvd0zaziGfjk9DgNyp115j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2
+ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0AkLppRQjbbpCBhqcqBT/mhDn4t/lX
+X0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97qA4bLJyuQHCH2u2n
+FoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Yjj4D
+u9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10l
+O1Hm13ZBONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Le
+ie2uPAmvylezkolwQOQvT8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR1
+2KvxAmLBsX5VYc8T1yaw15zLKYs4SgsOkI26oQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
diff --git a/core/libraries/src/Http/TransportInterface.php b/core/libraries/src/Http/TransportInterface.php
new file mode 100644
index 00000000..0c7b3eaa
--- /dev/null
+++ b/core/libraries/src/Http/TransportInterface.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * HTTP transport class interface.
+ *
+ * @since  11.3
+ */
+interface TransportInterface
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   Registry  $options  Client options object.
+	 *
+	 * @since   11.3
+	 */
+	public function __construct(Registry $options);
+
+	/**
+	 * Send a request to the server and return a HttpResponse object with the response.
+	 *
+	 * @param   string   $method     The HTTP method for sending the request.
+	 * @param   Uri      $uri        The URI to the resource to request.
+	 * @param   mixed    $data       Either an associative array or a string to be sent with the request.
+	 * @param   array    $headers    An array of request headers to send with the request.
+	 * @param   integer  $timeout    Read timeout in seconds.
+	 * @param   string   $userAgent  The optional user agent string to send with the request.
+	 *
+	 * @return  Response
+	 *
+	 * @since   11.3
+	 */
+	public function request($method, Uri $uri, $data = null, array $headers = null, $timeout = null, $userAgent = null);
+
+	/**
+	 * Method to check if HTTP transport is available for use
+	 *
+	 * @return  boolean  True if available else false
+	 *
+	 * @since   12.1
+	 */
+	public static function isSupported();
+}
diff --git a/core/libraries/src/Http/Wrapper/FactoryWrapper.php b/core/libraries/src/Http/Wrapper/FactoryWrapper.php
new file mode 100644
index 00000000..4432ed15
--- /dev/null
+++ b/core/libraries/src/Http/Wrapper/FactoryWrapper.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Http\Wrapper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\CMS\Http\Http;
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Http\TransportInterface;
+
+/**
+ * Wrapper class for HttpFactory
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Http
+ * @since       3.4
+ */
+class FactoryWrapper
+{
+	/**
+	 * Helper wrapper method for getHttp
+	 *
+	 * @param   Registry  $options   Client options object.
+	 * @param   mixed     $adapters  Adapter (string) or queue of adapters (array) to use for communication.
+	 *
+	 * @return  Http      Joomla Http class
+	 *
+	 * @see     HttpFactory::getHttp()
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	public function getHttp(Registry $options = null, $adapters = null)
+	{
+		return HttpFactory::getHttp($options, $adapters);
+	}
+
+	/**
+	 * Helper wrapper method for getAvailableDriver
+	 *
+	 * @param   Registry  $options  Option for creating http transport object.
+	 * @param   mixed     $default  Adapter (string) or queue of adapters (array) to use.
+	 *
+	 * @return  TransportInterface  Interface sub-class
+	 *
+	 * @see     HttpFactory::getAvailableDriver()
+	 * @since   3.4
+	 */
+	public function getAvailableDriver(Registry $options, $default = null)
+	{
+		return HttpFactory::getAvailableDriver($options, $default);
+	}
+
+	/**
+	 * Helper wrapper method for getHttpTransports
+	 *
+	 * @return array  An array of available transport handlers
+	 *
+	 * @see     HttpFactory::getHttpTransports()
+	 * @since   3.4
+	 */
+	public function getHttpTransports()
+	{
+		return HttpFactory::getHttpTransports();
+	}
+}
diff --git a/core/libraries/src/Image/Image.php b/core/libraries/src/Image/Image.php
new file mode 100644
index 00000000..12350195
--- /dev/null
+++ b/core/libraries/src/Image/Image.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Image;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\Log;
+
+/**
+ * Class to manipulate an image.
+ *
+ * @since       11.3
+ * @deprecated  5.0 Use the class \Joomla\Image\Image instead
+ */
+class Image extends \Joomla\Image\Image
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   mixed  $source  Either a file path for a source image or a GD resource handler for an image.
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	public function __construct($source = null)
+	{
+		Log::add('Joomla\CMS\Image\Image is deprecated, use Joomla\Image\Image instead.', Log::WARNING, 'deprecated');
+
+		// Inject the PSR-3 compatible logger in for forward compatibility
+		$this->setLogger(Log::createDelegatedLogger());
+
+		parent::__construct($source);
+	}
+
+	/**
+	 * Method to get an image filter instance of a specified type.
+	 *
+	 * @param   string  $type  The image filter type to get.
+	 *
+	 * @return  ImageFilter
+	 *
+	 * @since   11.3
+	 * @throws  \RuntimeException
+	 */
+	protected function getFilterInstance($type)
+	{
+		try
+		{
+			return parent::getFilterInstance($type);
+		}
+		catch (\RuntimeException $e)
+		{
+			// Ignore, filter is probably not namespaced
+		}
+
+		// Sanitize the filter type.
+		$type = strtolower(preg_replace('#[^A-Z0-9_]#i', '', $type));
+
+		// Verify that the filter type exists.
+		$className = 'JImageFilter' . ucfirst($type);
+
+		if (!class_exists($className))
+		{
+			Log::add('The ' . ucfirst($type) . ' image filter is not available.', Log::ERROR);
+			throw new \RuntimeException('The ' . ucfirst($type) . ' image filter is not available.');
+		}
+
+		// Instantiate the filter object.
+		$instance = new $className($this->getHandle());
+
+		// Verify that the filter type is valid.
+		if (!($instance instanceof ImageFilter))
+		{
+			// @codeCoverageIgnoreStart
+			Log::add('The ' . ucfirst($type) . ' image filter is not valid.', Log::ERROR);
+			throw new \RuntimeException('The ' . ucfirst($type) . ' image filter is not valid.');
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		return $instance;
+	}
+}
diff --git a/core/libraries/src/Image/ImageFilter.php b/core/libraries/src/Image/ImageFilter.php
new file mode 100644
index 00000000..5d494165
--- /dev/null
+++ b/core/libraries/src/Image/ImageFilter.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Image;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\Log;
+
+/**
+ * Class to manipulate an image.
+ *
+ * @since       11.3
+ * @deprecated  5.0  Use Joomla\Image\ImageFilter instead.
+ */
+abstract class ImageFilter extends \Joomla\Image\ImageFilter
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   resource  $handle  The image resource on which to apply the filter.
+	 *
+	 * @since   11.3
+	 * @deprecated  5.0  Use Joomla\Image\ImageFilter instead.
+	 */
+	public function __construct($handle)
+	{
+		Log::add('Joomla\CMS\Image\ImageFilter is deprecated, use Joomla\Image\ImageFilter instead.', Log::WARNING, 'deprecated');
+
+		// Inject the PSR-3 compatible logger in for forward compatibility
+		$this->setLogger(Log::createDelegatedLogger());
+
+		parent::__construct($handle);
+	}
+}
diff --git a/core/libraries/src/Input/Cli.php b/core/libraries/src/Input/Cli.php
new file mode 100644
index 00000000..ad7c9f54
--- /dev/null
+++ b/core/libraries/src/Input/Cli.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Input;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Filter\InputFilter;
+
+/**
+ * Joomla! Input CLI Class
+ *
+ * @since       11.1
+ * @deprecated  5.0  Use Joomla\Input\Cli instead
+ */
+class Cli extends Input
+{
+	/**
+	 * The executable that was called to run the CLI script.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 * @deprecated  5.0  Use Joomla\Input\Cli instead
+	 */
+	public $executable;
+
+	/**
+	 * The additional arguments passed to the script that are not associated
+	 * with a specific argument name.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 * @deprecated  5.0  Use Joomla\Input\Cli instead
+	 */
+	public $args = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Cli instead
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+
+		// Get the command line options
+		$this->parseArguments();
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Method to serialize the input.
+	 *
+	 * @return  string  The serialized input.
+	 *
+	 * @since   12.1
+	 * @deprecated  5.0  Use Joomla\Input\Cli instead
+	 */
+	public function serialize()
+	{
+		// Load all of the inputs.
+		$this->loadAllInputs();
+
+		// Remove $_ENV and $_SERVER from the inputs.
+		$inputs = $this->inputs;
+		unset($inputs['env']);
+		unset($inputs['server']);
+
+		// Serialize the executable, args, options, data, and inputs.
+		return serialize(array($this->executable, $this->args, $this->options, $this->data, $inputs));
+	}
+
+	/**
+	 * Method to unserialize the input.
+	 *
+	 * @param   string  $input  The serialized input.
+	 *
+	 * @return  Input  The input object.
+	 *
+	 * @since   12.1
+	 * @deprecated  5.0  Use Joomla\Input\Cli instead
+	 */
+	public function unserialize($input)
+	{
+		// Unserialize the executable, args, options, data, and inputs.
+		list($this->executable, $this->args, $this->options, $this->data, $this->inputs) = unserialize($input);
+
+		// Load the filter.
+		if (isset($this->options['filter']))
+		{
+			$this->filter = $this->options['filter'];
+		}
+		else
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+	}
+
+	/**
+	 * Initialise the options and arguments
+	 *
+	 * Not supported: -abc c-value
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Cli instead
+	 */
+	protected function parseArguments()
+	{
+		$argv = $_SERVER['argv'];
+
+		$this->executable = array_shift($argv);
+
+		$out = array();
+
+		for ($i = 0, $j = count($argv); $i < $j; $i++)
+		{
+			$arg = $argv[$i];
+
+			// --foo --bar=baz
+			if (substr($arg, 0, 2) === '--')
+			{
+				$eqPos = strpos($arg, '=');
+
+				// --foo
+				if ($eqPos === false)
+				{
+					$key = substr($arg, 2);
+
+					// --foo value
+					if ($i + 1 < $j && $argv[$i + 1][0] !== '-')
+					{
+						$value = $argv[$i + 1];
+						$i++;
+					}
+					else
+					{
+						$value = isset($out[$key]) ? $out[$key] : true;
+					}
+
+					$out[$key] = $value;
+				}
+
+				// --bar=baz
+				else
+				{
+					$key = substr($arg, 2, $eqPos - 2);
+					$value = substr($arg, $eqPos + 1);
+					$out[$key] = $value;
+				}
+			}
+			elseif (substr($arg, 0, 1) === '-')
+			// -k=value -abc
+			{
+				// -k=value
+				if (substr($arg, 2, 1) === '=')
+				{
+					$key = substr($arg, 1, 1);
+					$value = substr($arg, 3);
+					$out[$key] = $value;
+				}
+				else
+				// -abc
+				{
+					$chars = str_split(substr($arg, 1));
+
+					foreach ($chars as $char)
+					{
+						$key = $char;
+						$value = isset($out[$key]) ? $out[$key] : true;
+						$out[$key] = $value;
+					}
+
+					// -a a-value
+					if ((count($chars) === 1) && ($i + 1 < $j) && ($argv[$i + 1][0] !== '-'))
+					{
+						$out[$key] = $argv[$i + 1];
+						$i++;
+					}
+				}
+			}
+			else
+			{
+				// Plain-arg
+				$this->args[] = $arg;
+			}
+		}
+
+		$this->data = $out;
+	}
+}
diff --git a/core/libraries/src/Input/Cookie.php b/core/libraries/src/Input/Cookie.php
new file mode 100644
index 00000000..a5cad0a1
--- /dev/null
+++ b/core/libraries/src/Input/Cookie.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Input;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Filter\InputFilter;
+
+/**
+ * Joomla! Input Cookie Class
+ *
+ * @since       11.1
+ * @deprecated  5.0  Use Joomla\Input\Cookie instead
+ */
+class Cookie extends Input
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Ignored.
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Cookie instead
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+
+		// Set the data source.
+		$this->data = & $_COOKIE;
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Sets a value
+	 *
+	 * @param   string   $name      Name of the value to set.
+	 * @param   mixed    $value     Value to assign to the input.
+	 * @param   integer  $expire    The time the cookie expires. This is a Unix timestamp so is in number
+	 *                              of seconds since the epoch. In other words, you'll most likely set this
+	 *                              with the time() function plus the number of seconds before you want it
+	 *                              to expire. Or you might use mktime(). time()+60*60*24*30 will set the
+	 *                              cookie to expire in 30 days. If set to 0, or omitted, the cookie will
+	 *                              expire at the end of the session (when the browser closes).
+	 * @param   string   $path      The path on the server in which the cookie will be available on. If set
+	 *                              to '/', the cookie will be available within the entire domain. If set to
+	 *                              '/foo/', the cookie will only be available within the /foo/ directory and
+	 *                              all sub-directories such as /foo/bar/ of domain. The default value is the
+	 *                              current directory that the cookie is being set in.
+	 * @param   string   $domain    The domain that the cookie is available to. To make the cookie available
+	 *                              on all subdomains of example.com (including example.com itself) then you'd
+	 *                              set it to '.example.com'. Although some browsers will accept cookies without
+	 *                              the initial ., RFC 2109 requires it to be included. Setting the domain to
+	 *                              'www.example.com' or '.www.example.com' will make the cookie only available
+	 *                              in the www subdomain.
+	 * @param   boolean  $secure    Indicates that the cookie should only be transmitted over a secure HTTPS
+	 *                              connection from the client. When set to TRUE, the cookie will only be set
+	 *                              if a secure connection exists. On the server-side, it's on the programmer
+	 *                              to send this kind of cookie only on secure connection (e.g. with respect
+	 *                              to $_SERVER["HTTPS"]).
+	 * @param   boolean  $httpOnly  When TRUE the cookie will be made accessible only through the HTTP protocol.
+	 *                              This means that the cookie won't be accessible by scripting languages, such
+	 *                              as JavaScript. This setting can effectively help to reduce identity theft
+	 *                              through XSS attacks (although it is not supported by all browsers).
+	 *
+	 * @return  void
+	 *
+	 * @link    http://www.ietf.org/rfc/rfc2109.txt
+	 * @see     setcookie()
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Cookie instead
+	 */
+	public function set($name, $value, $expire = 0, $path = '', $domain = '', $secure = false, $httpOnly = false)
+	{
+		if (is_array($value))
+		{
+			foreach ($value as $key => $val)
+			{
+				setcookie($name . "[$key]", $val, $expire, $path, $domain, $secure, $httpOnly);
+			}
+		}
+		else
+		{
+			setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+		}
+
+		$this->data[$name] = $value;
+	}
+}
diff --git a/core/libraries/src/Input/Files.php b/core/libraries/src/Input/Files.php
new file mode 100644
index 00000000..a76e760a
--- /dev/null
+++ b/core/libraries/src/Input/Files.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Input;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Filter\InputFilter;
+
+/**
+ * Joomla! Input Files Class
+ *
+ * @since       11.1
+ * @deprecated  5.0  Use Joomla\Input\Files instead
+ */
+class Files extends Input
+{
+	/**
+	 * The pivoted data from a $_FILES or compatible array.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 * @deprecated  5.0  Use Joomla\Input\Files instead
+	 */
+	protected $decodedData = array();
+
+	/**
+	 * The class constructor.
+	 *
+	 * @param   array  $source   The source argument is ignored. $_FILES is always used.
+	 * @param   array  $options  An optional array of configuration options:
+	 *                           filter : a custom JFilterInput object.
+	 *
+	 * @since   12.1
+	 * @deprecated  5.0  Use Joomla\Input\Files instead
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+
+		// Set the data source.
+		$this->data = & $_FILES;
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Gets a value from the input data.
+	 *
+	 * @param   string  $name     The name of the input property (usually the name of the files INPUT tag) to get.
+	 * @param   mixed   $default  The default value to return if the named property does not exist.
+	 * @param   string  $filter   The filter to apply to the value.
+	 *
+	 * @return  mixed  The filtered input value.
+	 *
+	 * @see     JFilterInput::clean()
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Files instead
+	 */
+	public function get($name, $default = null, $filter = 'cmd')
+	{
+		if (isset($this->data[$name]))
+		{
+			$results = $this->decodeData(
+				array(
+					$this->data[$name]['name'],
+					$this->data[$name]['type'],
+					$this->data[$name]['tmp_name'],
+					$this->data[$name]['error'],
+					$this->data[$name]['size'],
+				)
+			);
+
+			// Prevent returning an unsafe file unless speciffically requested
+			if ($filter != 'raw')
+			{
+				$isSafe = InputFilter::isSafeFile($results);
+
+				if (!$isSafe)
+				{
+					return $default;
+				}
+			}
+
+			return $results;
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Method to decode a data array.
+	 *
+	 * @param   array  $data  The data array to decode.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Files instead
+	 */
+	protected function decodeData(array $data)
+	{
+		$result = array();
+
+		if (is_array($data[0]))
+		{
+			foreach ($data[0] as $k => $v)
+			{
+				$result[$k] = $this->decodeData(array($data[0][$k], $data[1][$k], $data[2][$k], $data[3][$k], $data[4][$k]));
+			}
+
+			return $result;
+		}
+
+		return array('name' => $data[0], 'type' => $data[1], 'tmp_name' => $data[2], 'error' => $data[3], 'size' => $data[4]);
+	}
+
+	/**
+	 * Sets a value.
+	 *
+	 * @param   string  $name   The name of the input property to set.
+	 * @param   mixed   $value  The value to assign to the input property.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Files instead
+	 */
+	public function set($name, $value)
+	{
+	}
+}
diff --git a/core/libraries/src/Input/Input.php b/core/libraries/src/Input/Input.php
new file mode 100644
index 00000000..b560e8ca
--- /dev/null
+++ b/core/libraries/src/Input/Input.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Input;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Filter\InputFilter;
+
+/**
+ * Joomla! Input Base Class
+ *
+ * This is an abstracted input class used to manage retrieving data from the application environment.
+ *
+ * @since       11.1
+ * @deprecated  5.0  Use Joomla\Input\Input instead
+ *
+ * @property-read   Input   $get
+ * @property-read   Input   $post
+ * @property-read   Input   $request
+ * @property-read   Input   $server
+ * @property-read   Input   $env
+ * @property-read   Files   $files
+ * @property-read   Cookie  $cookie
+ */
+class Input extends \Joomla\Input\Input
+{
+	/**
+	 * Container with allowed superglobals
+	 *
+	 * @var    array
+	 * @since  3.8.9
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	private static $allowedGlobals = array('REQUEST', 'GET', 'POST', 'FILES', 'SERVER', 'ENV');
+
+	/**
+	 * Input objects
+	 *
+	 * @var    Input[]
+	 * @since  11.1
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	protected $inputs = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (!isset($options['filter']))
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+
+		parent::__construct($source, $options);
+	}
+
+	/**
+	 * Magic method to get an input object
+	 *
+	 * @param   mixed  $name  Name of the input object to retrieve.
+	 *
+	 * @return  Input  The request input object
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	public function __get($name)
+	{
+		if (isset($this->inputs[$name]))
+		{
+			return $this->inputs[$name];
+		}
+
+		$className = '\\Joomla\\CMS\\Input\\' . ucfirst($name);
+
+		if (class_exists($className))
+		{
+			$this->inputs[$name] = new $className(null, $this->options);
+
+			return $this->inputs[$name];
+		}
+
+		$superGlobal = '_' . strtoupper($name);
+
+		if (in_array(strtoupper($name), self::$allowedGlobals, true) && isset($GLOBALS[$superGlobal]))
+		{
+			$this->inputs[$name] = new Input($GLOBALS[$superGlobal], $this->options);
+
+			return $this->inputs[$name];
+		}
+
+		// Try using the parent class
+		return parent::__get($name);
+	}
+
+	/**
+	 * Gets an array of values from the request.
+	 *
+	 * @param   array   $vars           Associative array of keys and filter types to apply.
+	 *                                  If empty and datasource is null, all the input data will be returned
+	 *                                  but filtered using the filter given by the parameter defaultFilter in
+	 *                                  JFilterInput::clean.
+	 * @param   mixed   $datasource     Array to retrieve data from, or null.
+	 * @param   string  $defaultFilter  Default filter used in JFilterInput::clean if vars is empty and
+	 *                                  datasource is null. If 'unknown', the default case is used in
+	 *                                  JFilterInput::clean.
+	 *
+	 * @return  mixed  The filtered input data.
+	 *
+	 * @since   11.1
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	public function getArray(array $vars = array(), $datasource = null, $defaultFilter = 'unknown')
+	{
+		return $this->getArrayRecursive($vars, $datasource, $defaultFilter, false);
+	}
+
+	/**
+	 * Gets an array of values from the request.
+	 *
+	 * @param   array   $vars           Associative array of keys and filter types to apply.
+	 *                                  If empty and datasource is null, all the input data will be returned
+	 *                                  but filtered using the filter given by the parameter defaultFilter in
+	 *                                  JFilterInput::clean.
+	 * @param   mixed   $datasource     Array to retrieve data from, or null.
+	 * @param   string  $defaultFilter  Default filter used in JFilterInput::clean if vars is empty and
+	 *                                  datasource is null. If 'unknown', the default case is used in
+	 *                                  JFilterInput::clean.
+	 * @param   bool    $recursion      Flag to indicate a recursive function call.
+	 *
+	 * @return  mixed  The filtered input data.
+	 *
+	 * @since   3.4.2
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	protected function getArrayRecursive(array $vars = array(), $datasource = null, $defaultFilter = 'unknown', $recursion = false)
+	{
+		if (empty($vars) && is_null($datasource))
+		{
+			$vars = $this->data;
+		}
+		else
+		{
+			if (!$recursion)
+			{
+				$defaultFilter = null;
+			}
+		}
+
+		$results = array();
+
+		foreach ($vars as $k => $v)
+		{
+			if (is_array($v))
+			{
+				if (is_null($datasource))
+				{
+					$results[$k] = $this->getArrayRecursive($v, $this->get($k, null, 'array'), $defaultFilter, true);
+				}
+				else
+				{
+					$results[$k] = $this->getArrayRecursive($v, $datasource[$k], $defaultFilter, true);
+				}
+			}
+			else
+			{
+				$filter = isset($defaultFilter) ? $defaultFilter : $v;
+
+				if (is_null($datasource))
+				{
+					$results[$k] = $this->get($k, null, $filter);
+				}
+				elseif (isset($datasource[$k]))
+				{
+					$results[$k] = $this->filter->clean($datasource[$k], $filter);
+				}
+				else
+				{
+					$results[$k] = $this->filter->clean(null, $filter);
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Method to unserialize the input.
+	 *
+	 * @param   string  $input  The serialized input.
+	 *
+	 * @return  Input  The input object.
+	 *
+	 * @since   12.1
+	 * @deprecated  5.0  Use Joomla\Input\Input instead
+	 */
+	public function unserialize($input)
+	{
+		// Unserialize the options, data, and inputs.
+		list($this->options, $this->data, $this->inputs) = unserialize($input);
+
+		// Load the filter.
+		if (isset($this->options['filter']))
+		{
+			$this->filter = $this->options['filter'];
+		}
+		else
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+	}
+}
diff --git a/core/libraries/src/Input/Json.php b/core/libraries/src/Input/Json.php
new file mode 100644
index 00000000..e1dd3e20
--- /dev/null
+++ b/core/libraries/src/Input/Json.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Input;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Filter\InputFilter;
+
+/**
+ * Joomla! Input JSON Class
+ *
+ * This class decodes a JSON string from the raw request data and makes it available via
+ * the standard JInput interface.
+ *
+ * @since       12.2
+ * @deprecated  5.0  Use Joomla\Input\Json instead
+ */
+class Json extends Input
+{
+	/**
+	 * @var    string  The raw JSON string from the request.
+	 * @since  12.2
+	 * @deprecated  5.0  Use Joomla\Input\Json instead
+	 */
+	private $_raw;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is the raw HTTP input decoded from JSON)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   12.2
+	 * @deprecated  5.0  Use Joomla\Input\Json instead
+	 */
+	public function __construct(array $source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = InputFilter::getInstance();
+		}
+
+		if (is_null($source))
+		{
+			$this->_raw = file_get_contents('php://input');
+			$this->data = json_decode($this->_raw, true);
+		}
+		else
+		{
+			$this->data = & $source;
+		}
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Gets the raw JSON string from the request.
+	 *
+	 * @return  string  The raw JSON string from the request.
+	 *
+	 * @since   12.2
+	 * @deprecated  5.0  Use Joomla\Input\Json instead
+	 */
+	public function getRaw()
+	{
+		return $this->_raw;
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/ComponentAdapter.php b/core/libraries/src/Installer/Adapter/ComponentAdapter.php
new file mode 100644
index 00000000..88341c9f
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/ComponentAdapter.php
@@ -0,0 +1,1380 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Table\Asset;
+use Joomla\CMS\Table\Extension;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Component installer
+ *
+ * @since  3.1
+ */
+class ComponentAdapter extends InstallerAdapter
+{
+	/**
+	 * The list of current files fo the Joomla! CMS administrator that are installed and is read
+	 * from the manifest on disk in the update area to handle doing a diff
+	 * and deleting files that are in the old files list and not in the new
+	 * files list.
+	 *
+	 * @var    array
+	 * @since  3.1
+	 * */
+	protected $oldAdminFiles = null;
+
+	/**
+	 * The list of current files that are installed and is read
+	 * from the manifest on disk in the update area to handle doing a diff
+	 * and deleting files that are in the old files list and not in the new
+	 * files list.
+	 *
+	 * @var    array
+	 * @since  3.1
+	 * */
+	protected $oldFiles = null;
+
+	/**
+	 * A path to the PHP file that the scriptfile declaration in
+	 * the manifest refers to.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 * */
+	protected $manifest_script = null;
+
+	/**
+	 * For legacy installations this is a path to the PHP file that the scriptfile declaration in the
+	 * manifest refers to.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 * */
+	protected $install_script = null;
+
+	/**
+	 * Method to check if the extension is present in the filesystem
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExtensionInFilesystem()
+	{
+		/*
+		 * If the component site or admin directory already exists, then we will assume that the component is already
+		 * installed or another component is using that directory.
+		 */
+		if (file_exists($this->parent->getPath('extension_site')) || file_exists($this->parent->getPath('extension_administrator')))
+		{
+			// Look for an update function or update tag
+			$updateElement = $this->getManifest()->update;
+
+			// Upgrade manually set or update function available or update tag detected
+			if ($updateElement || $this->parent->isUpgrade()
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update')))
+			{
+				// If there is a matching extension mark this as an update
+				$this->setRoute('update');
+			}
+			elseif (!$this->parent->isOverwrite())
+			{
+				// We didn't have overwrite set, find an update function or find an update tag so lets call it safe
+				if (file_exists($this->parent->getPath('extension_site')))
+				{
+					// If the site exists say so.
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_SITE',
+							$this->parent->getPath('extension_site')
+						)
+					);
+				}
+
+				// If the admin exists say so
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ERROR_COMP_INSTALL_DIR_ADMIN',
+						$this->parent->getPath('extension_administrator')
+					)
+				);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		// Copy site files
+		if ($this->getManifest()->files)
+		{
+			if ($this->route === 'update')
+			{
+				$result = $this->parent->parseFiles($this->getManifest()->files, 0, $this->oldFiles);
+			}
+			else
+			{
+				$result = $this->parent->parseFiles($this->getManifest()->files);
+			}
+
+			if ($result === false)
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_COMP_FAIL_SITE_FILES',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+					)
+				);
+			}
+		}
+
+		// Copy admin files
+		if ($this->getManifest()->administration->files)
+		{
+			if ($this->route === 'update')
+			{
+				$result = $this->parent->parseFiles($this->getManifest()->administration->files, 1, $this->oldAdminFiles);
+			}
+			else
+			{
+				$result = $this->parent->parseFiles($this->getManifest()->administration->files, 1);
+			}
+
+			if ($result === false)
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_COMP_FAIL_ADMIN_FILES',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+					)
+				);
+			}
+		}
+
+		// If there is a manifest script, let's copy it.
+		if ($this->manifest_script)
+		{
+			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
+			$path['dest'] = $this->parent->getPath('extension_administrator') . '/' . $this->manifest_script;
+
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+			{
+				if (!$this->parent->copyFiles(array($path)))
+				{
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_COMP_COPY_MANIFEST',
+							\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to create the extension root path if necessary
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function createExtensionRoot()
+	{
+		// If the component directory does not exist, let's create it
+		$created = false;
+
+		if (!file_exists($this->parent->getPath('extension_site')))
+		{
+			if (!$created = \JFolder::create($this->parent->getPath('extension_site')))
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ERROR_COMP_FAILED_TO_CREATE_DIRECTORY',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->parent->getPath('extension_site')
+					)
+				);
+			}
+		}
+
+		/*
+		 * Since we created the component directory and we will want to remove it if we have to roll back
+		 * the installation, let's add it to the installation step stack
+		 */
+		if ($created)
+		{
+			$this->parent->pushStep(
+				array(
+					'type' => 'folder',
+					'path' => $this->parent->getPath('extension_site'),
+				)
+			);
+		}
+
+		// If the component admin directory does not exist, let's create it
+		$created = false;
+
+		if (!file_exists($this->parent->getPath('extension_administrator')))
+		{
+			if (!$created = \JFolder::create($this->parent->getPath('extension_administrator')))
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ERROR_COMP_FAILED_TO_CREATE_DIRECTORY',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->parent->getPath('extension_site')
+					)
+				);
+			}
+		}
+
+		/*
+		 * Since we created the component admin directory and we will want to remove it if we have to roll
+		 * back the installation, let's add it to the installation step stack
+		 */
+		if ($created)
+		{
+			$this->parent->pushStep(
+				array(
+					'type' => 'folder',
+					'path' => $this->parent->getPath('extension_administrator'),
+				)
+			);
+		}
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		/** @var Update $update */
+		$update = Table::getInstance('update');
+
+		// Clobber any possible pending updates
+		$uid = $update->find(
+			array(
+				'element'   => $this->element,
+				'type'      => $this->extension->type,
+				'client_id' => 1,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// We will copy the manifest file to its appropriate place.
+		if ($this->route !== 'discover_install')
+		{
+			if (!$this->parent->copyManifest())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_COMP_COPY_SETUP',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+					)
+				);
+			}
+		}
+
+		// Time to build the admin menus
+		if (!$this->_buildAdminMenus($this->extension->extension_id))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ABORT_COMP_BUILDADMINMENUS_FAILED'), \JLog::WARNING, 'jerror');
+		}
+
+		// Make sure that menu items pointing to the component have correct component id assigned to them.
+		// Prevents message "Component 'com_extension' does not exist." after uninstalling / re-installing component.
+		if (!$this->_updateMenus($this->extension->extension_id))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ABORT_COMP_UPDATESITEMENUS_FAILED'), \JLog::WARNING, 'jerror');
+		}
+
+		/** @var Asset $asset */
+		$asset = Table::getInstance('Asset');
+
+		// Check if an asset already exists for this extension and create it if not
+		if (!$asset->loadByName($this->extension->element))
+		{
+			// Register the component container just under root in the assets table.
+			$asset->name      = $this->extension->element;
+			$asset->parent_id = 1;
+			$asset->rules     = '{}';
+			$asset->title     = $this->extension->name;
+			$asset->setLocation(1, 'last-child');
+
+			if (!$asset->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_ROLLBACK',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->extension->getError()
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		$element = parent::getElement($element);
+
+		if (strpos($element, 'com_') !== 0)
+		{
+			$element = 'com_' . $element;
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Custom loadLanguage method
+	 *
+	 * @param   string  $path  The path language files are on.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function loadLanguage($path = null)
+	{
+		$source = $this->parent->getPath('source');
+		$client = $this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+		if (!$source)
+		{
+			$this->parent->setPath('source', $client . '/components/' . $this->parent->extension->element);
+		}
+
+		$extension = $this->getElement();
+		$source    = $path ?: $client . '/components/' . $extension;
+
+		if ($this->getManifest()->administration->files)
+		{
+			$element = $this->getManifest()->administration->files;
+		}
+		elseif ($this->getManifest()->files)
+		{
+			$element = $this->getManifest()->files;
+		}
+		else
+		{
+			$element = null;
+		}
+
+		if ($element)
+		{
+			$folder = (string) $element->attributes()->folder;
+
+			if ($folder && file_exists($path . '/' . $folder))
+			{
+				$source = $path . '/' . $folder;
+			}
+		}
+
+		$this->doLoadLanguage($extension, $source);
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		// Parse optional tags
+		$this->parent->parseMedia($this->getManifest()->media);
+		$this->parent->parseLanguages($this->getManifest()->languages);
+		$this->parent->parseLanguages($this->getManifest()->administration->languages, 1);
+	}
+
+	/**
+	 * Prepares the adapter for a discover_install task
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	public function prepareDiscoverInstall()
+	{
+		// Need to find to find where the XML file is since we don't store this normally
+		$client = ApplicationHelper::getClientInfo($this->extension->client_id);
+		$short_element = str_replace('com_', '', $this->extension->element);
+		$manifestPath = $client->path . '/components/' . $this->extension->element . '/' . $short_element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$this->parent->setPath('source', $client->path . '/components/' . $this->extension->element);
+		$this->parent->setPath('extension_root', $this->parent->getPath('source'));
+		$this->setManifest($this->parent->getManifest());
+
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->extension->manifest_cache = json_encode($manifest_details);
+		$this->extension->state = 0;
+		$this->extension->name = $manifest_details['name'];
+		$this->extension->enabled = 1;
+		$this->extension->params = $this->parent->getParams();
+
+		$stored = false;
+
+		try
+		{
+			$this->extension->store();
+			$stored = true;
+		}
+		catch (\RuntimeException $e)
+		{
+			// Try to delete existing failed records before retrying
+			$db = $this->db;
+
+			$query = $db->getQuery(true)
+				->select($db->qn('extension_id'))
+				->from($db->qn('#__extensions'))
+				->where($db->qn('name') . ' = ' . $db->q($this->extension->name))
+				->where($db->qn('type') . ' = ' . $db->q($this->extension->type))
+				->where($db->qn('element') . ' = ' . $db->q($this->extension->element));
+
+			$db->setQuery($query);
+
+			$extension_ids = $db->loadColumn();
+
+			if (!empty($extension_ids))
+			{
+				foreach ($extension_ids as $eid)
+				{
+					// Remove leftover admin menus for this extension ID
+					$this->_removeAdminMenus($eid);
+
+					// Remove the extension record itself
+					/** @var Extension $extensionTable */
+					$extensionTable = Table::getInstance('extension');
+					$extensionTable->delete($eid);
+				}
+			}
+		}
+
+		if (!$stored)
+		{
+			try
+			{
+				$this->extension->store();
+			}
+			catch (\RuntimeException $e)
+			{
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ERROR_COMP_DISCOVER_STORE_DETAILS'), $e->getCode(), $e);
+			}
+		}
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function setupInstallPaths()
+	{
+		// Set the installation target paths
+		$this->parent->setPath('extension_site', \JPath::clean(JPATH_SITE . '/components/' . $this->element));
+		$this->parent->setPath('extension_administrator', \JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $this->element));
+
+		// Copy the admin path as it's used as a common base
+		$this->parent->setPath('extension_root', $this->parent->getPath('extension_administrator'));
+
+		// Make sure that we have an admin element
+		if (!$this->getManifest()->administration)
+		{
+			throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ERROR_COMP_INSTALL_ADMIN_ELEMENT'));
+		}
+	}
+
+	/**
+	 * Method to setup the update routine for the adapter
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function setupUpdates()
+	{
+		// Hunt for the original XML file
+		$old_manifest = null;
+
+		// Use a temporary instance due to side effects; start in the administrator first
+		$tmpInstaller = new Installer;
+		$tmpInstaller->setPath('source', $this->parent->getPath('extension_administrator'));
+
+		if (!$tmpInstaller->findManifest())
+		{
+			// Then the site
+			$tmpInstaller->setPath('source', $this->parent->getPath('extension_site'));
+
+			if ($tmpInstaller->findManifest())
+			{
+				$old_manifest = $tmpInstaller->getManifest();
+			}
+		}
+		else
+		{
+			$old_manifest = $tmpInstaller->getManifest();
+		}
+
+		if ($old_manifest)
+		{
+			$this->oldAdminFiles = $old_manifest->administration->files;
+			$this->oldFiles = $old_manifest->files;
+		}
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @param   bool  $deleteExisting  Should I try to delete existing records of the same component?
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension($deleteExisting = false)
+	{
+		// The extension is stored during prepareDiscoverInstall for discover installs
+		if ($this->route === 'discover_install')
+		{
+			return;
+		}
+
+		// Add or update an entry to the extension table
+		$this->extension->name    = $this->name;
+		$this->extension->type    = 'component';
+		$this->extension->element = $this->element;
+
+		// If we are told to delete existing extension entries then do so.
+		if ($deleteExisting)
+		{
+			$db = $this->parent->getDbo();
+
+			$query = $db->getQuery(true)
+				->select($db->qn('extension_id'))
+				->from($db->qn('#__extensions'))
+				->where($db->qn('name') . ' = ' . $db->q($this->extension->name))
+				->where($db->qn('type') . ' = ' . $db->q($this->extension->type))
+				->where($db->qn('element') . ' = ' . $db->q($this->extension->element));
+
+			$db->setQuery($query);
+
+			$extension_ids = $db->loadColumn();
+
+			if (!empty($extension_ids))
+			{
+				foreach ($extension_ids as $eid)
+				{
+					// Remove leftover admin menus for this extension ID
+					$this->_removeAdminMenus($eid);
+
+					// Remove the extension record itself
+					/** @var Extension $extensionTable */
+					$extensionTable = Table::getInstance('extension');
+					$extensionTable->delete($eid);
+				}
+			}
+		}
+
+		// If there is not already a row, generate a heap of defaults
+		if (!$this->currentExtensionId)
+		{
+			$this->extension->folder    = '';
+			$this->extension->enabled   = 1;
+			$this->extension->protected = 0;
+			$this->extension->access    = 0;
+			$this->extension->client_id = 1;
+			$this->extension->params    = $this->parent->getParams();
+			$this->extension->custom_data = '';
+			$this->extension->system_data = '';
+		}
+
+		$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+		$couldStore = $this->extension->store();
+
+		if (!$couldStore && $deleteExisting)
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_COMP_INSTALL_ROLLBACK',
+					$this->extension->getError()
+				)
+			);
+		}
+
+		if (!$couldStore && !$deleteExisting)
+		{
+			// Maybe we have a failed installation (e.g. timeout). Let's retry after deleting old records.
+			$this->storeExtension(true);
+		}
+	}
+
+	/**
+	 * Custom uninstall method for components
+	 *
+	 * @param   integer  $id  The unique extension id of the component to uninstall
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		$db     = $this->db;
+		$retval = true;
+
+		// First order of business will be to load the component object table from the database.
+		// This should give us the necessary information to proceed.
+		if (!$this->extension->load((int) $id))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_ERRORUNKOWNEXTENSION'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Is the component we are trying to uninstall a core one?
+		// Because that is not a good idea...
+		if ($this->extension->protected)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_WARNCORECOMPONENT'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($this->extension->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($this->extension->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $this->extension->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Get the admin and site paths for the component
+		$this->parent->setPath('extension_administrator', \JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $this->extension->element));
+		$this->parent->setPath('extension_site', \JPath::clean(JPATH_SITE . '/components/' . $this->extension->element));
+
+		// Copy the admin path as it's used as a common base
+		$this->parent->setPath('extension_root', $this->parent->getPath('extension_administrator'));
+
+		/**
+		 * ---------------------------------------------------------------------------------------------
+		 * Manifest Document Setup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Find and load the XML install file for the component
+		$this->parent->setPath('source', $this->parent->getPath('extension_administrator'));
+
+		// Get the package manifest object
+		// We do findManifest to avoid problem when uninstalling a list of extension: getManifest cache its manifest file
+		$this->parent->findManifest();
+		$this->setManifest($this->parent->getManifest());
+
+		if (!$this->getManifest())
+		{
+			// Make sure we delete the folders if no manifest exists
+			\JFolder::delete($this->parent->getPath('extension_administrator'));
+			\JFolder::delete($this->parent->getPath('extension_site'));
+
+			// Remove the menu
+			$this->_removeAdminMenus($this->extension->extension_id);
+
+			// Raise a warning
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_ERRORREMOVEMANUALLY'), \JLog::WARNING, 'jerror');
+
+			// Return
+			return false;
+		}
+
+		// Set the extensions name
+		$this->set('name', $this->getName());
+		$this->set('element', $this->getElement());
+
+		// Attempt to load the admin language file; might have uninstall strings
+		$this->loadLanguage(JPATH_ADMINISTRATOR . '/components/' . $this->element);
+
+		/**
+		 * ---------------------------------------------------------------------------------------------
+		 * Installer Trigger Loading and Uninstall
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		$this->setupScriptfile();
+
+		try
+		{
+			$this->triggerManifestScript('uninstall');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Ignore errors for now
+		}
+
+		/**
+		 * ---------------------------------------------------------------------------------------------
+		 * Database Processing Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Let's run the uninstall queries for the component
+		try
+		{
+			$this->parseQueries();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add($e->getMessage(), \JLog::WARNING, 'jerror');
+
+			$retval = false;
+		}
+
+		$this->_removeAdminMenus($this->extension->extension_id);
+
+		/**
+		 * ---------------------------------------------------------------------------------------------
+		 * Filesystem Processing Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Let's remove those language files and media in the JROOT/images/ folder that are
+		// associated with the component we are uninstalling
+		$this->parent->removeFiles($this->getManifest()->media);
+		$this->parent->removeFiles($this->getManifest()->languages);
+		$this->parent->removeFiles($this->getManifest()->administration->languages, 1);
+
+		// Remove the schema version
+		$query = $db->getQuery(true)
+			->delete('#__schemas')
+			->where('extension_id = ' . $id);
+		$db->setQuery($query);
+		$db->execute();
+
+		// Remove the component container in the assets table.
+		$asset = Table::getInstance('Asset');
+
+		if ($asset->loadByName($this->element))
+		{
+			$asset->delete();
+		}
+
+		// Remove categories for this component
+		$query->clear()
+			->delete('#__categories')
+			->where('extension=' . $db->quote($this->element), 'OR')
+			->where('extension LIKE ' . $db->quote($this->element . '.%'));
+		$db->setQuery($query);
+		$db->execute();
+
+		// Rebuild the categories for correct lft/rgt
+		$category = Table::getInstance('category');
+		$category->rebuild();
+
+		// Clobber any possible pending updates
+		$update = Table::getInstance('update');
+		$uid = $update->find(
+			array(
+				'element'   => $this->extension->element,
+				'type'      => 'component',
+				'client_id' => 1,
+				'folder'    => '',
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Now we need to delete the installation directories. This is the final step in uninstalling the component.
+		if (trim($this->extension->element))
+		{
+			// Delete the component site directory
+			if (is_dir($this->parent->getPath('extension_site')))
+			{
+				if (!\JFolder::delete($this->parent->getPath('extension_site')))
+				{
+					\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_SITE'), \JLog::WARNING, 'jerror');
+					$retval = false;
+				}
+			}
+
+			// Delete the component admin directory
+			if (is_dir($this->parent->getPath('extension_administrator')))
+			{
+				if (!\JFolder::delete($this->parent->getPath('extension_administrator')))
+				{
+					\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_FAILED_REMOVE_DIRECTORY_ADMIN'), \JLog::WARNING, 'jerror');
+					$retval = false;
+				}
+			}
+
+			// Now we will no longer need the extension object, so let's delete it
+			$this->extension->delete($this->extension->extension_id);
+
+			return $retval;
+		}
+		else
+		{
+			// No component option defined... cannot delete what we don't know about
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_UNINSTALL_NO_OPTION'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Method to build menu database entries for a component
+	 *
+	 * @param   int|null  $component_id  The component ID for which I'm building menus
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.1
+	 */
+	protected function _buildAdminMenus($component_id = null)
+	{
+		$db     = $this->parent->getDbo();
+
+		$option = $this->get('element');
+
+		// If a component exists with this option in the table within the protected menutype 'main' then we don't need to add menus
+		$query = $db->getQuery(true)
+			->select('m.id, e.extension_id')
+			->from('#__menu AS m')
+			->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+			->where('m.parent_id = 1')
+			->where('m.client_id = 1')
+			->where('m.menutype = ' . $db->quote('main'))
+			->where('e.element = ' . $db->quote($option));
+
+		$db->setQuery($query);
+
+		// In case of a failed installation (e.g. timeout error) we may have duplicate menu item and extension records.
+		$componentrows = $db->loadObjectList();
+
+		// Check if menu items exist
+		if (!empty($componentrows))
+		{
+			// Don't do anything if overwrite has not been enabled
+			if (!$this->parent->isOverwrite())
+			{
+				return true;
+			}
+
+			// Remove all menu items
+			foreach ($componentrows as $componentrow)
+			{
+				// Remove existing menu items if overwrite has been enabled
+				if ($option)
+				{
+					// If something goes wrong, there's no way to rollback TODO: Search for better solution
+					$this->_removeAdminMenus($componentrow->extension_id);
+				}
+			}
+		}
+
+		// Only try to detect the component ID if it's not provided
+		if (empty($component_id))
+		{
+			// Lets find the extension id
+			$query->clear()
+				->select('e.extension_id')
+				->from('#__extensions AS e')
+				->where('e.type = ' . $db->quote('component'))
+				->where('e.element = ' . $db->quote($option));
+
+			$db->setQuery($query);
+			$component_id = $db->loadResult();
+		}
+
+		// Ok, now its time to handle the menus.  Start with the component root menu, then handle submenus.
+		$menuElement = $this->getManifest()->administration->menu;
+
+		// Just do not create the menu if $menuElement not exist
+		if (!$menuElement)
+		{
+			return true;
+		}
+
+		// If the menu item is hidden do nothing more, just return
+		if (in_array((string) $menuElement['hidden'], array('true', 'hidden')))
+		{
+			return true;
+		}
+
+		// Let's figure out what the menu item data should look like
+		$data = array();
+
+		if ($menuElement)
+		{
+			// I have a menu element, use this information
+			$data['menutype'] = 'main';
+			$data['client_id'] = 1;
+			$data['title'] = (string) trim($menuElement);
+			$data['alias'] = (string) $menuElement;
+			$data['link'] = 'index.php?option=' . $option;
+			$data['type'] = 'component';
+			$data['published'] = 1;
+			$data['parent_id'] = 1;
+			$data['component_id'] = $component_id;
+			$data['img'] = ((string) $menuElement->attributes()->img) ?: 'class:component';
+			$data['home'] = 0;
+			$data['path'] = '';
+			$data['params'] = '';
+		}
+		else
+		{
+			// No menu element was specified, Let's make a generic menu item
+			$data = array();
+			$data['menutype'] = 'main';
+			$data['client_id'] = 1;
+			$data['title'] = $option;
+			$data['alias'] = $option;
+			$data['link'] = 'index.php?option=' . $option;
+			$data['type'] = 'component';
+			$data['published'] = 1;
+			$data['parent_id'] = 1;
+			$data['component_id'] = $component_id;
+			$data['img'] = 'class:component';
+			$data['home'] = 0;
+			$data['path'] = '';
+			$data['params'] = '';
+		}
+
+		// Try to create the menu item in the database
+		$parent_id = $this->_createAdminMenuItem($data, 1);
+
+		if ($parent_id === false)
+		{
+			return false;
+		}
+
+		/*
+		 * Process SubMenus
+		 */
+
+		if (!$this->getManifest()->administration->submenu)
+		{
+			// No submenu? We're done.
+			return true;
+		}
+
+		foreach ($this->getManifest()->administration->submenu->menu as $child)
+		{
+			$data = array();
+			$data['menutype'] = 'main';
+			$data['client_id'] = 1;
+			$data['title'] = (string) trim($child);
+			$data['alias'] = (string) $child;
+			$data['type'] = 'component';
+			$data['published'] = 1;
+			$data['parent_id'] = $parent_id;
+			$data['component_id'] = $component_id;
+			$data['img'] = ((string) $child->attributes()->img) ?: 'class:component';
+			$data['home'] = 0;
+
+			// Set the sub menu link
+			if ((string) $child->attributes()->link)
+			{
+				$data['link'] = 'index.php?' . $child->attributes()->link;
+			}
+			else
+			{
+				$request = array();
+
+				if ((string) $child->attributes()->act)
+				{
+					$request[] = 'act=' . $child->attributes()->act;
+				}
+
+				if ((string) $child->attributes()->task)
+				{
+					$request[] = 'task=' . $child->attributes()->task;
+				}
+
+				if ((string) $child->attributes()->controller)
+				{
+					$request[] = 'controller=' . $child->attributes()->controller;
+				}
+
+				if ((string) $child->attributes()->view)
+				{
+					$request[] = 'view=' . $child->attributes()->view;
+				}
+
+				if ((string) $child->attributes()->layout)
+				{
+					$request[] = 'layout=' . $child->attributes()->layout;
+				}
+
+				if ((string) $child->attributes()->sub)
+				{
+					$request[] = 'sub=' . $child->attributes()->sub;
+				}
+
+				$qstring = count($request) ? '&' . implode('&', $request) : '';
+				$data['link'] = 'index.php?option=' . $option . $qstring;
+			}
+
+			$submenuId = $this->_createAdminMenuItem($data, $parent_id);
+
+			if ($submenuId === false)
+			{
+				return false;
+			}
+
+			/*
+			 * Since we have created a menu item, we add it to the installation step stack
+			 * so that if we have to rollback the changes we can undo it.
+			 */
+			$this->parent->pushStep(array('type' => 'menu', 'id' => $component_id));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to remove admin menu references to a component
+	 *
+	 * @param   int  $id  The ID of the extension whose admin menus will be removed
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @since   3.1
+	 */
+	protected function _removeAdminMenus($id)
+	{
+		$db = $this->parent->getDbo();
+
+		/** @var  \JTableMenu  $table */
+		$table = Table::getInstance('menu');
+
+		// Get the ids of the menu items
+		$query = $db->getQuery(true)
+			->select('id')
+			->from('#__menu')
+			->where($db->quoteName('client_id') . ' = 1')
+			->where($db->quoteName('menutype') . ' = ' . $db->q('main'))
+			->where($db->quoteName('component_id') . ' = ' . (int) $id);
+
+		$db->setQuery($query);
+
+		$ids = $db->loadColumn();
+
+		$result = true;
+
+		// Check for error
+		if (!empty($ids))
+		{
+			// Iterate the items to delete each one.
+			foreach ($ids as $menuid)
+			{
+				if (!$table->delete((int) $menuid, false))
+				{
+					$this->setError($table->getError());
+
+					$result = false;
+				}
+			}
+
+			// Rebuild the whole tree
+			$table->rebuild();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to update menu database entries for a component in case the component has been uninstalled before.
+	 * NOTE: This will not update admin menus. Use _updateMenus() instead to update admin menus ase well.
+	 *
+	 * @param   int|null  $component_id  The component ID.
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.4.2
+	 */
+	protected function _updateSiteMenus($component_id = null)
+	{
+		return $this->_updateMenus($component_id, 0);
+	}
+
+	/**
+	 * Method to update menu database entries for a component in case if the component has been uninstalled before.
+	 *
+	 * @param   int|null  $component_id  The component ID.
+	 * @param   int       $clientId      The client id
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.7.0
+	 */
+	protected function _updateMenus($component_id, $clientId = null)
+	{
+		$db     = $this->parent->getDbo();
+		$option = $this->get('element');
+
+		// Update all menu items which contain 'index.php?option=com_extension' or 'index.php?option=com_extension&...'
+		// to use the new component id.
+		$query = $db->getQuery(true)
+			->update('#__menu')
+			->set('component_id = ' . $db->quote($component_id))
+			->where('type = ' . $db->quote('component'))
+			->where('('
+				. 'link LIKE ' . $db->quote('index.php?option=' . $option) . ' OR '
+				. 'link LIKE ' . $db->q($db->escape('index.php?option=' . $option . '&') . '%', false)
+				. ')');
+
+		if (isset($clientId))
+		{
+			$query->where('client_id = ' . (int) $clientId);
+		}
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Custom rollback method
+	 * - Roll back the component menu item
+	 *
+	 * @param   array  $step  Installation step to rollback.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	protected function _rollback_menu($step)
+	{
+		return $this->_removeAdminMenus($step['id']);
+	}
+
+	/**
+	 * Discover unregistered extensions.
+	 *
+	 * @return  array  A list of extensions.
+	 *
+	 * @since   3.1
+	 */
+	public function discover()
+	{
+		$results = array();
+		$site_components = \JFolder::folders(JPATH_SITE . '/components');
+		$admin_components = \JFolder::folders(JPATH_ADMINISTRATOR . '/components');
+
+		foreach ($site_components as $component)
+		{
+			if (file_exists(JPATH_SITE . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(
+					JPATH_SITE . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'
+				);
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'component');
+				$extension->set('client_id', 0);
+				$extension->set('element', $component);
+				$extension->set('folder', '');
+				$extension->set('name', $component);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
+		foreach ($admin_components as $component)
+		{
+			if (file_exists(JPATH_ADMINISTRATOR . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(
+					JPATH_ADMINISTRATOR . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'
+				);
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'component');
+				$extension->set('client_id', 1);
+				$extension->set('element', $component);
+				$extension->set('folder', '');
+				$extension->set('name', $component);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean  Result of operation, true if updated, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		// Need to find to find where the XML file is since we don't store this normally
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$short_element = str_replace('com_', '', $this->parent->extension->element);
+		$manifestPath = $client->path . '/components/' . $this->parent->extension->element . '/' . $short_element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		try
+		{
+			return $this->parent->extension->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_COMP_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Creates the menu item in the database. If the item already exists it tries to remove it and create it afresh.
+	 *
+	 * @param   array    &$data     The menu item data to create
+	 * @param   integer  $parentId  The parent menu item ID
+	 *
+	 * @return  boolean|integer  Menu item ID on success, false on failure
+	 */
+	protected function _createAdminMenuItem(array &$data, $parentId)
+	{
+		$db = $this->parent->getDbo();
+
+		/** @var  \JTableMenu  $table */
+		$table  = Table::getInstance('menu');
+
+		try
+		{
+			$table->setLocation($parentId, 'last-child');
+		}
+		catch (\InvalidArgumentException $e)
+		{
+			\JLog::add($e->getMessage(), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (!$table->bind($data) || !$table->check() || !$table->store())
+		{
+			// The menu item already exists. Delete it and retry instead of throwing an error.
+			$query = $db->getQuery(true)
+				->select('id')
+				->from('#__menu')
+				->where('menutype = ' . $db->q($data['menutype']))
+				->where('client_id = 1')
+				->where('link = ' . $db->q($data['link']))
+				->where('type = ' . $db->q($data['type']))
+				->where('parent_id = ' . $db->q($data['parent_id']))
+				->where('home = ' . $db->q($data['home']));
+
+			$db->setQuery($query);
+			$menu_id = $db->loadResult();
+
+			if (!$menu_id)
+			{
+				// Oops! Could not get the menu ID. Go back and rollback changes.
+				\JError::raiseWarning(1, $table->getError());
+
+				return false;
+			}
+			else
+			{
+				/** @var  \JTableMenu $temporaryTable */
+				$temporaryTable = Table::getInstance('menu');
+				$temporaryTable->delete($menu_id, true);
+				$temporaryTable->rebuild($data['parent_id']);
+
+				// Retry creating the menu item
+				$table->setLocation($parentId, 'last-child');
+
+				if (!$table->bind($data) || !$table->check() || !$table->store())
+				{
+					// Install failed, warn user and rollback changes
+					\JError::raiseWarning(1, $table->getError());
+
+					return false;
+				}
+			}
+		}
+
+		return $table->id;
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/FileAdapter.php b/core/libraries/src/Installer/Adapter/FileAdapter.php
new file mode 100644
index 00000000..2eefbcdc
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/FileAdapter.php
@@ -0,0 +1,652 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Table\Table;
+
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * File installer
+ *
+ * @since  3.1
+ */
+class FileAdapter extends InstallerAdapter
+{
+	/**
+	 * `<scriptfile>` element of the extension manifest
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	protected $scriptElement = null;
+
+	/**
+	 * Flag if the adapter supports discover installs
+	 *
+	 * Adapters should override this and set to false if discover install is unsupported
+	 *
+	 * @var    boolean
+	 * @since  3.4
+	 */
+	protected $supportsDiscoverInstall = false;
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		// Populate File and Folder List to copy
+		$this->populateFilesAndFolderList();
+
+		// Now that we have folder list, lets start creating them
+		foreach ($this->folderList as $folder)
+		{
+			if (!\JFolder::exists($folder))
+			{
+				if (!$created = \JFolder::create($folder))
+				{
+					throw new \RuntimeException(
+						\JText::sprintf('JLIB_INSTALLER_ABORT_FILE_INSTALL_FAIL_SOURCE_DIRECTORY', $folder)
+					);
+				}
+
+				// Since we created a directory and will want to remove it if we have to roll back.
+				// The installation due to some errors, let's add it to the installation step stack.
+				if ($created)
+				{
+					$this->parent->pushStep(array('type' => 'folder', 'path' => $folder));
+				}
+			}
+		}
+
+		// Now that we have file list, let's start copying them
+		$this->parent->copyFiles($this->fileList);
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		// Clobber any possible pending updates
+		$update = Table::getInstance('update');
+
+		$uid = $update->find(
+			array(
+				'element' => $this->element,
+				'type' => $this->type,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Lastly, we will copy the manifest file to its appropriate place.
+		$manifest = array();
+		$manifest['src'] = $this->parent->getPath('manifest');
+		$manifest['dest'] = JPATH_MANIFESTS . '/files/' . basename($this->parent->getPath('manifest'));
+
+		if (!$this->parent->copyFiles(array($manifest), true))
+		{
+			// Install failed, rollback changes
+			throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_FILE_INSTALL_COPY_SETUP'));
+		}
+
+		// If there is a manifest script, let's copy it.
+		if ($this->manifest_script)
+		{
+			// First, we have to create a folder for the script if one isn't present
+			if (!file_exists($this->parent->getPath('extension_root')))
+			{
+				\JFolder::create($this->parent->getPath('extension_root'));
+			}
+
+			$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
+			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
+
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+			{
+				if (!$this->parent->copyFiles(array($path)))
+				{
+					// Install failed, rollback changes
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_MANIFEST',
+							\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		if (!$element)
+		{
+			$manifestPath = \JPath::clean($this->parent->getPath('manifest'));
+			$element = preg_replace('/\.xml/', '', basename($manifestPath));
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Custom loadLanguage method
+	 *
+	 * @param   string  $path  The path on which to find language files.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function loadLanguage($path)
+	{
+		$extension = 'files_' . strtolower(str_replace('files_', '', $this->getElement()));
+
+		$this->doLoadLanguage($extension, $path, JPATH_SITE);
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		// Parse optional tags
+		$this->parent->parseLanguages($this->getManifest()->languages);
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function setupInstallPaths()
+	{
+		// Set the file root path
+		if ($this->name === 'files_joomla')
+		{
+			// If we are updating the Joomla core, set the root path to the root of Joomla
+			$this->parent->setPath('extension_root', JPATH_ROOT);
+		}
+		else
+		{
+			$this->parent->setPath('extension_root', JPATH_MANIFESTS . '/files/' . $this->element);
+		}
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		if ($this->currentExtensionId)
+		{
+			// Load the entry and update the manifest_cache
+			$this->extension->load($this->currentExtensionId);
+
+			// Update name
+			$this->extension->name = $this->name;
+
+			// Update manifest
+			$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_ROLLBACK',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->extension->getError()
+					)
+				);
+			}
+		}
+		else
+		{
+			// Add an entry to the extension table with a whole heap of defaults
+			$this->extension->name = $this->name;
+			$this->extension->type = 'file';
+			$this->extension->element = $this->element;
+
+			// There is no folder for files so leave it blank
+			$this->extension->folder = '';
+			$this->extension->enabled = 1;
+			$this->extension->protected = 0;
+			$this->extension->access = 0;
+			$this->extension->client_id = 0;
+			$this->extension->params = '';
+			$this->extension->system_data = '';
+			$this->extension->manifest_cache = $this->parent->generateManifestCache();
+			$this->extension->custom_data = '';
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_ROLLBACK',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->extension->getError()
+					)
+				);
+			}
+
+			// Since we have created a module item, we add it to the installation step stack
+			// so that if we have to rollback the changes we can undo it.
+			$this->parent->pushStep(array('type' => 'extension', 'extension_id' => $this->extension->extension_id));
+		}
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   string  $id  The id of the file to uninstall
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		$row = Table::getInstance('extension');
+
+		if (!$row->load($id))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_ENTRY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if ($row->protected)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_WARNCOREFILE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($row->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($row->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$retval = true;
+		$manifestFile = JPATH_MANIFESTS . '/files/' . $row->element . '.xml';
+
+		// Because files may not have their own folders we cannot use the standard method of finding an installation manifest
+		if (file_exists($manifestFile))
+		{
+			// Set the files root path
+			$this->parent->setPath('extension_root', JPATH_MANIFESTS . '/files/' . $row->element);
+
+			$xml = simplexml_load_file($manifestFile);
+
+			// If we cannot load the XML file return null
+			if (!$xml)
+			{
+				\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_MANIFEST'), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			// Check for a valid XML root tag.
+			if ($xml->getName() !== 'extension')
+			{
+				\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_MANIFEST'), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$this->setManifest($xml);
+
+			// If there is a manifest class file, let's load it
+			$this->scriptElement = $this->getManifest()->scriptfile;
+			$manifestScript = (string) $this->getManifest()->scriptfile;
+
+			if ($manifestScript)
+			{
+				$manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript;
+
+				// Set the class name
+				$classname = $row->element . 'InstallerScript';
+
+				\JLoader::register($classname, $manifestScriptFile);
+
+				if (class_exists($classname))
+				{
+					// Create a new instance
+					$this->parent->manifestClass = new $classname($this);
+
+					// And set this so we can copy it later
+					$this->set('manifest_script', $manifestScript);
+				}
+			}
+
+			ob_start();
+			ob_implicit_flush(false);
+
+			// Run uninstall if possible
+			if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'uninstall'))
+			{
+				$this->parent->manifestClass->uninstall($this);
+			}
+
+			$msg = ob_get_contents();
+			ob_end_clean();
+
+			if ($msg != '')
+			{
+				$this->parent->set('extension_message', $msg);
+			}
+
+			$db = \JFactory::getDbo();
+
+			// Let's run the uninstall queries for the extension
+			$result = $this->parent->parseSQLFiles($this->getManifest()->uninstall->sql);
+
+			if ($result === false)
+			{
+				// Install failed, rollback changes
+				\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_SQL_ERROR', $db->stderr(true)), \JLog::WARNING, 'jerror');
+				$retval = false;
+			}
+
+			// Remove the schema version
+			$query = $db->getQuery(true)
+				->delete('#__schemas')
+				->where('extension_id = ' . $row->extension_id);
+			$db->setQuery($query);
+			$db->execute();
+
+			// Loop through all elements and get list of files and folders
+			foreach ($xml->fileset->files as $eFiles)
+			{
+				$target = (string) $eFiles->attributes()->target;
+
+				// Create folder path
+				if (empty($target))
+				{
+					$targetFolder = JPATH_ROOT;
+				}
+				else
+				{
+					$targetFolder = JPATH_ROOT . '/' . $target;
+				}
+
+				$folderList = array();
+
+				// Check if all children exists
+				if (count($eFiles->children()) > 0)
+				{
+					// Loop through all filenames elements
+					foreach ($eFiles->children() as $eFileName)
+					{
+						if ($eFileName->getName() === 'folder')
+						{
+							$folderList[] = $targetFolder . '/' . $eFileName;
+						}
+						else
+						{
+							$fileName = $targetFolder . '/' . $eFileName;
+							\JFile::delete($fileName);
+						}
+					}
+				}
+
+				// Delete any folders that don't have any content in them.
+				foreach ($folderList as $folder)
+				{
+					$files = \JFolder::files($folder);
+
+					if ($files !== false && !count($files))
+					{
+						\JFolder::delete($folder);
+					}
+				}
+			}
+
+			\JFile::delete($manifestFile);
+
+			// Lastly, remove the extension_root
+			$folder = $this->parent->getPath('extension_root');
+
+			if (\JFolder::exists($folder))
+			{
+				\JFolder::delete($folder);
+			}
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_NOTFOUND_MANIFEST'), \JLog::WARNING, 'jerror');
+
+			// Delete the row because its broken
+			$row->delete();
+
+			return false;
+		}
+
+		$this->parent->removeFiles($xml->languages);
+
+		$row->delete();
+
+		return $retval;
+	}
+
+	/**
+	 * Function used to check if extension is already installed
+	 *
+	 * @param   string  $extension  The element name of the extension to install
+	 *
+	 * @return  boolean  True if extension exists
+	 *
+	 * @since   3.1
+	 */
+	protected function extensionExistsInSystem($extension = null)
+	{
+		// Get a database connector object
+		$db = $this->parent->getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('file'))
+			->where($db->quoteName('element') . ' = ' . $db->quote($extension));
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT_FILE_ROLLBACK', $db->stderr(true)));
+
+			return false;
+		}
+
+		$id = $db->loadResult();
+
+		if (empty($id))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Function used to populate files and folder list
+	 *
+	 * @return  boolean  none
+	 *
+	 * @since   3.1
+	 */
+	protected function populateFilesAndFolderList()
+	{
+		// Initialise variable
+		$this->folderList = array();
+		$this->fileList = array();
+
+		// Set root folder names
+		$packagePath = $this->parent->getPath('source');
+		$jRootPath = \JPath::clean(JPATH_ROOT);
+
+		// Loop through all elements and get list of files and folders
+		foreach ($this->getManifest()->fileset->files as $eFiles)
+		{
+			// Check if the element is files element
+			$folder = (string) $eFiles->attributes()->folder;
+			$target = (string) $eFiles->attributes()->target;
+
+			// Split folder names into array to get folder names. This will help in creating folders
+			$arrList = preg_split("#/|\\/#", $target);
+
+			$folderName = $jRootPath;
+
+			foreach ($arrList as $dir)
+			{
+				if (empty($dir))
+				{
+					continue;
+				}
+
+				$folderName .= '/' . $dir;
+
+				// Check if folder exists, if not then add to the array for folder creation
+				if (!\JFolder::exists($folderName))
+				{
+					$this->folderList[] = $folderName;
+				}
+			}
+
+			// Create folder path
+			$sourceFolder = empty($folder) ? $packagePath : $packagePath . '/' . $folder;
+			$targetFolder = empty($target) ? $jRootPath : $jRootPath . '/' . $target;
+
+			// Check if source folder exists
+			if (!\JFolder::exists($sourceFolder))
+			{
+				\JLog::add(\JText::sprintf('JLIB_INSTALLER_ABORT_FILE_INSTALL_FAIL_SOURCE_DIRECTORY', $sourceFolder), \JLog::WARNING, 'jerror');
+
+				// If installation fails, rollback
+				$this->parent->abort();
+
+				return false;
+			}
+
+			// Check if all children exists
+			if (count($eFiles->children()))
+			{
+				// Loop through all filenames elements
+				foreach ($eFiles->children() as $eFileName)
+				{
+					$path['src'] = $sourceFolder . '/' . $eFileName;
+					$path['dest'] = $targetFolder . '/' . $eFileName;
+					$path['type'] = 'file';
+
+					if ($eFileName->getName() === 'folder')
+					{
+						$folderName         = $targetFolder . '/' . $eFileName;
+						$this->folderList[] = $folderName;
+						$path['type']       = 'folder';
+					}
+
+					$this->fileList[] = $path;
+				}
+			}
+			else
+			{
+				$files = \JFolder::files($sourceFolder);
+
+				foreach ($files as $file)
+				{
+					$path['src'] = $sourceFolder . '/' . $file;
+					$path['dest'] = $targetFolder . '/' . $file;
+
+					$this->fileList[] = $path;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean result of operation, true if updated, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		// Need to find to find where the XML file is since we don't store this normally
+		$manifestPath = JPATH_MANIFESTS . '/files/' . $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		try
+		{
+			return $this->parent->extension->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/LanguageAdapter.php b/core/libraries/src/Installer/Adapter/LanguageAdapter.php
new file mode 100644
index 00000000..7cc84a8d
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -0,0 +1,851 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Language installer
+ *
+ * @since  3.1
+ */
+class LanguageAdapter extends InstallerAdapter
+{
+	/**
+	 * Core language pack flag
+	 *
+	 * @var    boolean
+	 * @since  12.1
+	 */
+	protected $core = false;
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		// TODO - Refactor adapter to use common code
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function setupInstallPaths()
+	{
+		// TODO - Refactor adapter to use common code
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		// TODO - Refactor adapter to use common code
+	}
+
+	/**
+	 * Custom install method
+	 *
+	 * Note: This behaves badly due to hacks made in the middle of 1.5.x to add
+	 * the ability to install multiple distinct packs in one install. The
+	 * preferred method is to use a package to install multiple language packs.
+	 *
+	 * @return  boolean|integer  The extension ID on success, boolean false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function install()
+	{
+		$source = $this->parent->getPath('source');
+
+		if (!$source)
+		{
+			$this->parent
+				->setPath(
+				'source',
+				($this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/language/' . $this->parent->extension->element
+			);
+		}
+
+		$this->setManifest($this->parent->getManifest());
+
+		// Get the client application target
+		if ($cname = (string) $this->getManifest()->attributes()->client)
+		{
+			// Attempt to map the client to a base path
+			$client = ApplicationHelper::getClientInfo($cname, true);
+
+			if ($client === null)
+			{
+				$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT', \JText::sprintf('JLIB_INSTALLER_ERROR_UNKNOWN_CLIENT_TYPE', $cname)));
+
+				return false;
+			}
+
+			$basePath = $client->path;
+			$clientId = $client->id;
+			$element  = $this->getManifest()->files;
+
+			return $this->_install($cname, $basePath, $clientId, $element);
+		}
+		else
+		{
+			// No client attribute was found so we assume the site as the client
+			$cname    = 'site';
+			$basePath = JPATH_SITE;
+			$clientId = 0;
+			$element  = $this->getManifest()->files;
+
+			return $this->_install($cname, $basePath, $clientId, $element);
+		}
+	}
+
+	/**
+	 * Install function that is designed to handle individual clients
+	 *
+	 * @param   string   $cname     Cname @todo: not used
+	 * @param   string   $basePath  The base name.
+	 * @param   integer  $clientId  The client id.
+	 * @param   object   &$element  The XML element.
+	 *
+	 * @return  boolean|integer  The extension ID on success, boolean false on failure
+	 *
+	 * @since   3.1
+	 */
+	protected function _install($cname, $basePath, $clientId, &$element)
+	{
+		$this->setManifest($this->parent->getManifest());
+
+		// Get the language name
+		// Set the extensions name
+		$name = \JFilterInput::getInstance()->clean((string) $this->getManifest()->name, 'cmd');
+		$this->set('name', $name);
+
+		// Get the Language tag [ISO tag, eg. en-GB]
+		$tag = (string) $this->getManifest()->tag;
+
+		// Check if we found the tag - if we didn't, we may be trying to install from an older language package
+		if (!$tag)
+		{
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT', \JText::_('JLIB_INSTALLER_ERROR_NO_LANGUAGE_TAG')));
+
+			return false;
+		}
+
+		$this->set('tag', $tag);
+
+		// Set the language installation path
+		$this->parent->setPath('extension_site', $basePath . '/language/' . $tag);
+
+		// Do we have a meta file in the file list?  In other words... is this a core language pack?
+		if ($element && count($element->children()))
+		{
+			$files = $element->children();
+
+			foreach ($files as $file)
+			{
+				if ((string) $file->attributes()->file === 'meta')
+				{
+					$this->core = true;
+					break;
+				}
+			}
+		}
+
+		// If the language directory does not exist, let's create it
+		$created = false;
+
+		if (!file_exists($this->parent->getPath('extension_site')))
+		{
+			if (!$created = \JFolder::create($this->parent->getPath('extension_site')))
+			{
+				$this->parent
+					->abort(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT',
+						\JText::sprintf('JLIB_INSTALLER_ERROR_CREATE_FOLDER_FAILED', $this->parent->getPath('extension_site'))
+					)
+				);
+
+				return false;
+			}
+		}
+		else
+		{
+			// Look for an update function or update tag
+			$updateElement = $this->getManifest()->update;
+
+			// Upgrade manually set or update tag detected
+			if ($updateElement || $this->parent->isUpgrade())
+			{
+				// Transfer control to the update function
+				return $this->update();
+			}
+			elseif (!$this->parent->isOverwrite())
+			{
+				// Overwrite is set
+				// We didn't have overwrite set, find an update function or find an update tag so lets call it safe
+				if (file_exists($this->parent->getPath('extension_site')))
+				{
+					// If the site exists say so.
+					\JLog::add(
+						\JText::sprintf('JLIB_INSTALLER_ABORT', \JText::sprintf('JLIB_INSTALLER_ERROR_FOLDER_IN_USE', $this->parent->getPath('extension_site'))),
+						\JLog::WARNING, 'jerror'
+					);
+				}
+				else
+				{
+					// If the admin exists say so.
+					\JLog::add(
+						\JText::sprintf('JLIB_INSTALLER_ABORT',
+							\JText::sprintf('JLIB_INSTALLER_ERROR_FOLDER_IN_USE', $this->parent->getPath('extension_administrator'))
+						),
+						\JLog::WARNING, 'jerror'
+					);
+				}
+
+				return false;
+			}
+		}
+
+		/*
+		 * If we created the language directory we will want to remove it if we
+		 * have to roll back the installation, so let's add it to the installation
+		 * step stack
+		 */
+		if ($created)
+		{
+			$this->parent->pushStep(array('type' => 'folder', 'path' => $this->parent->getPath('extension_site')));
+		}
+
+		// Copy all the necessary files
+		if ($this->parent->parseFiles($element) === false)
+		{
+			// Install failed, rollback changes
+			$this->parent->abort();
+
+			return false;
+		}
+
+		// Parse optional tags
+		$this->parent->parseMedia($this->getManifest()->media);
+
+		// Copy all the necessary font files to the common pdf_fonts directory
+		$this->parent->setPath('extension_site', $basePath . '/language/pdf_fonts');
+		$overwrite = $this->parent->setOverwrite(true);
+
+		if ($this->parent->parseFiles($this->getManifest()->fonts) === false)
+		{
+			// Install failed, rollback changes
+			$this->parent->abort();
+
+			return false;
+		}
+
+		$this->parent->setOverwrite($overwrite);
+
+		// Get the language description
+		$description = (string) $this->getManifest()->description;
+
+		if ($description)
+		{
+			$this->parent->set('message', \JText::_($description));
+		}
+		else
+		{
+			$this->parent->set('message', '');
+		}
+
+		// Add an entry to the extension table with a whole heap of defaults
+		$row = Table::getInstance('extension');
+		$row->set('name', $this->get('name'));
+		$row->set('type', 'language');
+		$row->set('element', $this->get('tag'));
+
+		// There is no folder for languages
+		$row->set('folder', '');
+		$row->set('enabled', 1);
+		$row->set('protected', 0);
+		$row->set('access', 0);
+		$row->set('client_id', $clientId);
+		$row->set('params', $this->parent->getParams());
+		$row->set('manifest_cache', $this->parent->generateManifestCache());
+
+		if (!$row->check() || !$row->store())
+		{
+			// Install failed, roll back changes
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT', $row->getError()));
+
+			return false;
+		}
+
+		// Create an unpublished content language.
+		if ((int) $clientId === 0)
+		{
+			// Load the site language manifest.
+			$siteLanguageManifest = LanguageHelper::parseXMLLanguageFile(JPATH_SITE . '/language/' . $this->tag . '/' . $this->tag . '.xml');
+
+			// Set the content language title as the language metadata name.
+			$contentLanguageTitle = $siteLanguageManifest['name'];
+
+			// Set, as fallback, the content language native title to the language metadata name.
+			$contentLanguageNativeTitle = $contentLanguageTitle;
+
+			// If exist, load the native title from the language xml metadata.
+			if (isset($siteLanguageManifest['nativeName']) && $siteLanguageManifest['nativeName'])
+			{
+				$contentLanguageNativeTitle = $siteLanguageManifest['nativeName'];
+			}
+
+			// Try to load a language string from the installation language var. Will be removed in 4.0.
+			if ($contentLanguageNativeTitle === $contentLanguageTitle)
+			{
+				if (file_exists(JPATH_INSTALLATION . '/language/' . $this->tag . '/' . $this->tag . '.xml'))
+				{
+					$installationLanguage = new Language($this->tag);
+					$installationLanguage->load('', JPATH_INSTALLATION);
+
+					if ($installationLanguage->hasKey('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME'))
+					{
+						// Make sure it will not use the en-GB fallback.
+						$defaultLanguage = new Language('en-GB');
+						$defaultLanguage->load('', JPATH_INSTALLATION);
+
+						$defaultLanguageNativeTitle      = $defaultLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+						$installationLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+
+						if ($defaultLanguageNativeTitle !== $installationLanguageNativeTitle)
+						{
+							$contentLanguageNativeTitle = $installationLanguage->_('INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME');
+						}
+					}
+				}
+			}
+
+			// Prepare language data for store.
+			$languageData = array(
+				'lang_id'      => 0,
+				'lang_code'    => $this->tag,
+				'title'        => $contentLanguageTitle,
+				'title_native' => $contentLanguageNativeTitle,
+				'sef'          => $this->getSefString($this->tag),
+				'image'        => strtolower(str_replace('-', '_', $this->tag)),
+				'published'    => 0,
+				'ordering'     => 0,
+				'access'       => (int) \JFactory::getConfig()->get('access', 1),
+				'description'  => '',
+				'metakey'      => '',
+				'metadesc'     => '',
+				'sitename'     => '',
+			);
+
+			$tableLanguage = Table::getInstance('language');
+
+			if (!$tableLanguage->bind($languageData) || !$tableLanguage->check() || !$tableLanguage->store() || !$tableLanguage->reorder())
+			{
+				\JLog::add(
+					\JText::sprintf('JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE', $siteLanguageManifest['name'], $tableLanguage->getError()),
+					\JLog::NOTICE,
+					'jerror'
+				);
+			}
+		}
+
+		// Clobber any possible pending updates
+		$update = Table::getInstance('update');
+		$uid = $update->find(array('element' => $this->get('tag'), 'type' => 'language', 'folder' => ''));
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Clean installed languages cache.
+		\JFactory::getCache()->clean('com_languages');
+
+		return $row->get('extension_id');
+	}
+
+
+	/**
+	 * Gets a unique language SEF string.
+	 *
+	 * This function checks other existing language with the same code, if they exist provides a unique SEF name.
+	 * For instance: en-GB, en-US and en-AU will share the same SEF code by default: www.mywebsite.com/en/
+	 * To avoid this conflict, this function creates an specific SEF in case of existing conflict:
+	 * For example: www.mywebsite.com/en-au/
+	 *
+	 * @param   string  $itemLanguageTag  Language Tag.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getSefString($itemLanguageTag)
+	{
+		$langs               = explode('-', $itemLanguageTag);
+		$prefixToFind        = $langs[0];
+		$numberPrefixesFound = 0;
+
+		// Get the sef value of all current content languages.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn('sef'))
+			->from($db->qn('#__languages'));
+		$db->setQuery($query);
+
+		$siteLanguages = $db->loadObjectList();
+
+		foreach ($siteLanguages as $siteLang)
+		{
+			if ($siteLang->sef === $prefixToFind)
+			{
+				$numberPrefixesFound++;
+			}
+		}
+
+		return $numberPrefixesFound === 0 ? $prefixToFind : strtolower($itemLanguageTag);
+	}
+
+	/**
+	 * Custom update method
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function update()
+	{
+		$xml = $this->parent->getManifest();
+
+		$this->setManifest($xml);
+
+		$cname = $xml->attributes()->client;
+
+		// Attempt to map the client to a base path
+		$client = ApplicationHelper::getClientInfo($cname, true);
+
+		if ($client === null || (empty($cname) && $cname !== 0))
+		{
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT', \JText::sprintf('JLIB_INSTALLER_ERROR_UNKNOWN_CLIENT_TYPE', $cname)));
+
+			return false;
+		}
+
+		$basePath = $client->path;
+		$clientId = $client->id;
+
+		// Get the language name
+		// Set the extensions name
+		$name = (string) $this->getManifest()->name;
+		$name = \JFilterInput::getInstance()->clean($name, 'cmd');
+		$this->set('name', $name);
+
+		// Get the Language tag [ISO tag, eg. en-GB]
+		$tag = (string) $xml->tag;
+
+		// Check if we found the tag - if we didn't, we may be trying to install from an older language package
+		if (!$tag)
+		{
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT', \JText::_('JLIB_INSTALLER_ERROR_NO_LANGUAGE_TAG')));
+
+			return false;
+		}
+
+		$this->set('tag', $tag);
+
+		// Set the language installation path
+		$this->parent->setPath('extension_site', $basePath . '/language/' . $tag);
+
+		// Do we have a meta file in the file list?  In other words... is this a core language pack?
+		if (count($xml->files->children()))
+		{
+			foreach ($xml->files->children() as $file)
+			{
+				if ((string) $file->attributes()->file === 'meta')
+				{
+					$this->core = true;
+					break;
+				}
+			}
+		}
+
+		// Copy all the necessary files
+		if ($this->parent->parseFiles($xml->files) === false)
+		{
+			// Install failed, rollback changes
+			$this->parent->abort();
+
+			return false;
+		}
+
+		// Parse optional tags
+		$this->parent->parseMedia($xml->media);
+
+		// Copy all the necessary font files to the common pdf_fonts directory
+		$this->parent->setPath('extension_site', $basePath . '/language/pdf_fonts');
+		$overwrite = $this->parent->setOverwrite(true);
+
+		if ($this->parent->parseFiles($xml->fonts) === false)
+		{
+			// Install failed, rollback changes
+			$this->parent->abort();
+
+			return false;
+		}
+
+		$this->parent->setOverwrite($overwrite);
+
+		// Get the language description and set it as message
+		$this->parent->set('message', (string) $xml->description);
+
+		/**
+		 * ---------------------------------------------------------------------------------------------
+		 * Finalization and Cleanup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Clobber any possible pending updates
+		$update = Table::getInstance('update');
+		$uid = $update->find(array('element' => $this->get('tag'), 'type' => 'language', 'client_id' => $clientId));
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Update an entry to the extension table
+		$row = Table::getInstance('extension');
+		$eid = $row->find(array('element' => $this->get('tag'), 'type' => 'language', 'client_id' => $clientId));
+
+		if ($eid)
+		{
+			$row->load($eid);
+		}
+		else
+		{
+			// Set the defaults
+
+			// There is no folder for language
+			$row->set('folder', '');
+			$row->set('enabled', 1);
+			$row->set('protected', 0);
+			$row->set('access', 0);
+			$row->set('client_id', $clientId);
+			$row->set('params', $this->parent->getParams());
+		}
+
+		$row->set('name', $this->get('name'));
+		$row->set('type', 'language');
+		$row->set('element', $this->get('tag'));
+		$row->set('manifest_cache', $this->parent->generateManifestCache());
+
+		// Clean installed languages cache.
+		\JFactory::getCache()->clean('com_languages');
+
+		if (!$row->check() || !$row->store())
+		{
+			// Install failed, roll back changes
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT', $row->getError()));
+
+			return false;
+		}
+
+		return $row->get('extension_id');
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   string  $eid  The tag of the language to uninstall
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($eid)
+	{
+		// Load up the extension details
+		$extension = Table::getInstance('extension');
+		$extension->load($eid);
+
+		// Grab a copy of the client details
+		$client = ApplicationHelper::getClientInfo($extension->get('client_id'));
+
+		// Check the element isn't blank to prevent nuking the languages directory...just in case
+		$element = $extension->get('element');
+
+		if (empty($element))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LANG_UNINSTALL_ELEMENT_EMPTY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Check that the language is not protected, Normally en-GB.
+		$protected = $extension->get('protected');
+
+		if ($protected == 1)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LANG_UNINSTALL_PROTECTED'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Verify that it's not the default language for that client
+		$params = ComponentHelper::getParams('com_languages');
+
+		if ($params->get($client->name) === $element)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LANG_UNINSTALL_DEFAULT'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($extension->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($extension->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $extension->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Construct the path from the client, the language and the extension element name
+		$path = $client->path . '/language/' . $element;
+
+		// Get the package manifest object and remove media
+		$this->parent->setPath('source', $path);
+
+		// We do findManifest to avoid problem when uninstalling a list of extension: getManifest cache its manifest file
+		$this->parent->findManifest();
+		$this->setManifest($this->parent->getManifest());
+		$this->parent->removeFiles($this->getManifest()->media);
+
+		// Check it exists
+		if (!\JFolder::exists($path))
+		{
+			// If the folder doesn't exist lets just nuke the row as well and presume the user killed it for us
+			$extension->delete();
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LANG_UNINSTALL_PATH_EMPTY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (!\JFolder::delete($path))
+		{
+			// If deleting failed we'll leave the extension entry in tact just in case
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LANG_UNINSTALL_DIRECTORY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Remove the extension table entry
+		$extension->delete();
+
+		// Setting the language of users which have this language as the default language
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->from('#__users')
+			->select('*');
+		$db->setQuery($query);
+		$users = $db->loadObjectList();
+
+		if ($client->name === 'administrator')
+		{
+			$param_name = 'admin_language';
+		}
+		else
+		{
+			$param_name = 'language';
+		}
+
+		$count = 0;
+
+		foreach ($users as $user)
+		{
+			$registry = new Registry($user->params);
+
+			if ($registry->get($param_name) === $element)
+			{
+				$registry->set($param_name, '');
+				$query->clear()
+					->update('#__users')
+					->set('params=' . $db->quote($registry))
+					->where('id=' . (int) $user->id);
+				$db->setQuery($query);
+				$db->execute();
+				$count++;
+			}
+		}
+
+		// Clean installed languages cache.
+		\JFactory::getCache()->clean('com_languages');
+
+		if (!empty($count))
+		{
+			\JLog::add(\JText::plural('JLIB_INSTALLER_NOTICE_LANG_RESET_USERS', $count), \JLog::NOTICE, 'jerror');
+		}
+
+		// All done!
+		return true;
+	}
+
+	/**
+	 * Custom discover method
+	 * Finds language files
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since  3.1
+	 */
+	public function discover()
+	{
+		$results = array();
+		$site_languages = \JFolder::folders(JPATH_SITE . '/language');
+		$admin_languages = \JFolder::folders(JPATH_ADMINISTRATOR . '/language');
+
+		foreach ($site_languages as $language)
+		{
+			if (file_exists(JPATH_SITE . '/language/' . $language . '/' . $language . '.xml'))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_SITE . '/language/' . $language . '/' . $language . '.xml');
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'language');
+				$extension->set('client_id', 0);
+				$extension->set('element', $language);
+				$extension->set('folder', '');
+				$extension->set('name', $language);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
+		foreach ($admin_languages as $language)
+		{
+			if (file_exists(JPATH_ADMINISTRATOR . '/language/' . $language . '/' . $language . '.xml'))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_ADMINISTRATOR . '/language/' . $language . '/' . $language . '.xml');
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'language');
+				$extension->set('client_id', 1);
+				$extension->set('element', $language);
+				$extension->set('folder', '');
+				$extension->set('name', $language);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Custom discover install method
+	 * Basically updates the manifest cache and leaves everything alone
+	 *
+	 * @return  integer  The extension id
+	 *
+	 * @since   3.1
+	 */
+	public function discover_install()
+	{
+		// Need to find to find where the XML file is since we don't store this normally
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$short_element = $this->parent->extension->element;
+		$manifestPath = $client->path . '/language/' . $short_element . '/' . $short_element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$this->parent->setPath('source', $client->path . '/language/' . $short_element);
+		$this->parent->setPath('extension_root', $this->parent->getPath('source'));
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->state = 0;
+		$this->parent->extension->name = $manifest_details['name'];
+		$this->parent->extension->enabled = 1;
+
+		// @todo remove code: $this->parent->extension->params = $this->parent->getParams();
+		try
+		{
+			$this->parent->extension->check();
+			$this->parent->extension->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LANG_DISCOVER_STORE_DETAILS'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Clean installed languages cache.
+		\JFactory::getCache()->clean('com_languages');
+
+		return $this->parent->extension->get('extension_id');
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean result of operation, true if updated, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath = $client->path . '/language/' . $this->parent->extension->element . '/' . $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		if ($this->parent->extension->store())
+		{
+			return true;
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_MOD_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/LibraryAdapter.php b/core/libraries/src/Installer/Adapter/LibraryAdapter.php
new file mode 100644
index 00000000..61b75b7a
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/LibraryAdapter.php
@@ -0,0 +1,526 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Installer\Manifest\LibraryManifest;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
+
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * Library installer
+ *
+ * @since  3.1
+ */
+class LibraryAdapter extends InstallerAdapter
+{
+	/**
+	 * Method to check if the extension is present in the filesystem, flags the route as update if so
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExtensionInFilesystem()
+	{
+		if ($this->currentExtensionId)
+		{
+			// Already installed, can we upgrade?
+			if ($this->parent->isOverwrite() || $this->parent->isUpgrade())
+			{
+				// We can upgrade, so uninstall the old one
+				$installer = new Installer; // we don't want to compromise this instance!
+				$installer->setPackageUninstall(true);
+				$installer->uninstall('library', $this->currentExtensionId);
+
+				// Clear the cached data
+				$this->currentExtensionId = null;
+				$this->extension = Table::getInstance('Extension', 'JTable', array('dbo' => $this->db));
+
+				// From this point we'll consider this an update
+				$this->setRoute('update');
+			}
+			else
+			{
+				// Abort the install, no upgrade possible
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_ALREADY_INSTALLED'));
+			}
+		}
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		if ($this->parent->parseFiles($this->getManifest()->files, -1) === false)
+		{
+			throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_LIB_COPY_FILES'));
+		}
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		// Clobber any possible pending updates
+		/** @var Update $update */
+		$update = Table::getInstance('update');
+		$uid = $update->find(
+			array(
+				'element' => $this->element,
+				'type' => $this->type,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Lastly, we will copy the manifest file to its appropriate place.
+		if ($this->route !== 'discover_install')
+		{
+			$manifest = array();
+			$manifest['src'] = $this->parent->getPath('manifest');
+			$manifest['dest'] = JPATH_MANIFESTS . '/libraries/' . basename($this->parent->getPath('manifest'));
+
+			if (!$this->parent->copyFiles(array($manifest), true))
+			{
+				// Install failed, rollback changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_COPY_SETUP'));
+			}
+
+			// If there is a manifest script, let's copy it.
+			if ($this->manifest_script)
+			{
+				$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
+				$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
+
+				if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+				{
+					if (!$this->parent->copyFiles(array($path)))
+					{
+						// Install failed, rollback changes
+						throw new \RuntimeException(
+							\JText::sprintf(
+								'JLIB_INSTALLER_ABORT_MANIFEST',
+								\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+							)
+						);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		if (!$element)
+		{
+			$manifestPath = \JPath::clean($this->parent->getPath('manifest'));
+			$element = preg_replace('/\.xml/', '', basename($manifestPath));
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Custom loadLanguage method
+	 *
+	 * @param   string  $path  The path where to find language files.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function loadLanguage($path = null)
+	{
+		$source = $this->parent->getPath('source');
+
+		if (!$source)
+		{
+			$this->parent->setPath('source', JPATH_PLATFORM . '/' . $this->getElement());
+		}
+
+		$extension = 'lib_' . $this->getElement();
+		$librarypath = (string) $this->getManifest()->libraryname;
+		$source = $path ?: JPATH_PLATFORM . '/' . $librarypath;
+
+		$this->doLoadLanguage($extension, $source, JPATH_SITE);
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		$this->parent->parseLanguages($this->getManifest()->languages);
+		$this->parent->parseMedia($this->getManifest()->media);
+	}
+
+	/**
+	 * Prepares the adapter for a discover_install task
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function prepareDiscoverInstall()
+	{
+		$manifestPath = JPATH_MANIFESTS . '/libraries/' . $this->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$this->setManifest($this->parent->getManifest());
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function setupInstallPaths()
+	{
+		$group = (string) $this->getManifest()->libraryname;
+
+		if (!$group)
+		{
+			throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_LIB_INSTALL_NOFILE'));
+		}
+
+		$this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . implode(DIRECTORY_SEPARATOR, explode('/', $group)));
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		// Discover installs are stored a little differently
+		if ($this->route === 'discover_install')
+		{
+			$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+
+			$this->extension->manifest_cache = json_encode($manifest_details);
+			$this->extension->state = 0;
+			$this->extension->name = $manifest_details['name'];
+			$this->extension->enabled = 1;
+			$this->extension->params = $this->parent->getParams();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ERROR_LIB_DISCOVER_STORE_DETAILS'));
+			}
+
+			return;
+		}
+
+		$this->extension->name = $this->name;
+		$this->extension->type = 'library';
+		$this->extension->element = $this->element;
+
+		// There is no folder for libraries
+		$this->extension->folder = '';
+		$this->extension->enabled = 1;
+		$this->extension->protected = 0;
+		$this->extension->access = 1;
+		$this->extension->client_id = 0;
+		$this->extension->params = $this->parent->getParams();
+
+		// Custom data
+		$this->extension->custom_data = '';
+		$this->extension->system_data = '';
+
+		// Update the manifest cache for the entry
+		$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+		if (!$this->extension->store())
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_LIB_INSTALL_ROLLBACK',
+					$this->extension->getError()
+				)
+			);
+		}
+
+		// Since we have created a library item, we add it to the installation step stack
+		// so that if we have to rollback the changes we can undo it.
+		$this->parent->pushStep(array('type' => 'extension', 'id' => $this->extension->extension_id));
+	}
+
+	/**
+	 * Custom update method
+	 *
+	 * @return  boolean|integer  The extension ID on success, boolean false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function update()
+	{
+		// Since this is just files, an update removes old files
+		// Get the extension manifest object
+		$this->setManifest($this->parent->getManifest());
+
+		// Set the overwrite setting
+		$this->parent->setOverwrite(true);
+		$this->parent->setUpgrade(true);
+
+		// And make sure the route is set correctly
+		$this->setRoute('update');
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Manifest Document Setup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Set the extensions name
+		$name = (string) $this->getManifest()->name;
+		$name = \JFilterInput::getInstance()->clean($name, 'string');
+		$element = str_replace('.xml', '', basename($this->parent->getPath('manifest')));
+		$this->set('name', $name);
+		$this->set('element', $element);
+
+		// We don't want to compromise this instance!
+		$installer = new Installer;
+		$db = $this->parent->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('library'))
+			->where($db->quoteName('element') . ' = ' . $db->quote($element));
+		$db->setQuery($query);
+		$result = $db->loadResult();
+
+		if ($result)
+		{
+			// Already installed, which would make sense
+			$installer->setPackageUninstall(true);
+			$installer->uninstall('library', $result);
+
+			// Clear the cached data
+			$this->currentExtensionId = null;
+			$this->extension = Table::getInstance('Extension', 'JTable', array('dbo' => $this->db));
+		}
+
+		// Now create the new files
+		return $this->install();
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   string  $id  The id of the library to uninstall.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		$retval = true;
+
+		// First order of business will be to load the module object table from the database.
+		// This should give us the necessary information to proceed.
+		$row = Table::getInstance('extension');
+
+		if (!$row->load((int) $id) || $row->element === '')
+		{
+			\JLog::add(\JText::_('ERRORUNKOWNEXTENSION'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Is the library we are trying to uninstall a core one?
+		// Because that is not a good idea...
+		if ($row->protected)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LIB_UNINSTALL_WARNCORELIBRARY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($row->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($row->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$manifestFile = JPATH_MANIFESTS . '/libraries/' . $row->element . '.xml';
+
+		// Because libraries may not have their own folders we cannot use the standard method of finding an installation manifest
+		if (file_exists($manifestFile))
+		{
+			$manifest = new LibraryManifest($manifestFile);
+
+			// Set the library root path
+			$this->parent->setPath('extension_root', JPATH_PLATFORM . '/' . $manifest->libraryname);
+
+			$xml = simplexml_load_file($manifestFile);
+
+			// If we cannot load the XML file return null
+			if (!$xml)
+			{
+				\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LIB_UNINSTALL_LOAD_MANIFEST'), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			// Check for a valid XML root tag.
+			if ($xml->getName() !== 'extension')
+			{
+				\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_MANIFEST'), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$this->parent->removeFiles($xml->files, -1);
+			\JFile::delete($manifestFile);
+		}
+		else
+		{
+			// Remove this row entry since its invalid
+			$row->delete($row->extension_id);
+			unset($row);
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_NOTFOUND_MANIFEST'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// TODO: Change this so it walked up the path backwards so we clobber multiple empties
+		// If the folder is empty, let's delete it
+		if (\JFolder::exists($this->parent->getPath('extension_root')))
+		{
+			if (is_dir($this->parent->getPath('extension_root')))
+			{
+				$files = \JFolder::files($this->parent->getPath('extension_root'));
+
+				if (!count($files))
+				{
+					\JFolder::delete($this->parent->getPath('extension_root'));
+				}
+			}
+		}
+
+		$this->parent->removeFiles($xml->media);
+		$this->parent->removeFiles($xml->languages);
+
+		$row->delete($row->extension_id);
+		unset($row);
+
+		return $retval;
+	}
+
+	/**
+	 * Custom discover method
+	 *
+	 * @return  array  Extension  list of extensions available
+	 *
+	 * @since   3.1
+	 */
+	public function discover()
+	{
+		$results = array();
+		$file_list = \JFolder::files(JPATH_MANIFESTS . '/libraries', '\.xml$');
+
+		foreach ($file_list as $file)
+		{
+			$manifest_details = Installer::parseXMLInstallFile(JPATH_MANIFESTS . '/libraries/' . $file);
+			$file = \JFile::stripExt($file);
+			$extension = Table::getInstance('extension');
+			$extension->set('type', 'library');
+			$extension->set('client_id', 0);
+			$extension->set('element', $file);
+			$extension->set('folder', '');
+			$extension->set('name', $file);
+			$extension->set('state', -1);
+			$extension->set('manifest_cache', json_encode($manifest_details));
+			$extension->set('params', '{}');
+			$results[] = $extension;
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean  Result of operation, true if updated, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		// Need to find to find where the XML file is since we don't store this normally
+		$manifestPath = JPATH_MANIFESTS . '/libraries/' . $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		try
+		{
+			return $this->parent->extension->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_LIB_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/ModuleAdapter.php b/core/libraries/src/Installer/Adapter/ModuleAdapter.php
new file mode 100644
index 00000000..7007b4d5
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/ModuleAdapter.php
@@ -0,0 +1,789 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Table\Table;
+use Joomla\Utilities\ArrayHelper;
+
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * Module installer
+ *
+ * @since  3.1
+ */
+class ModuleAdapter extends InstallerAdapter
+{
+	/**
+	 * The install client ID
+	 *
+	 * @var    integer
+	 * @since  3.4
+	 */
+	protected $clientId;
+
+	/**
+	 * `<scriptfile>` element of the extension manifest
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	protected $scriptElement = null;
+
+	/**
+	 * Method to check if the extension is already present in the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExistingExtension()
+	{
+		try
+		{
+			$this->currentExtensionId = $this->extension->find(
+				array(
+					'element'   => $this->element,
+					'type'      => $this->type,
+					'client_id' => $this->clientId,
+				)
+			);
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_ROLLBACK',
+					\JText::_('JLIB_INSTALLER_' . $this->route),
+					$e->getMessage()
+				),
+				$e->getCode(),
+				$e
+			);
+		}
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		// Copy all necessary files
+		if ($this->parent->parseFiles($this->getManifest()->files, -1) === false)
+		{
+			throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_MOD_COPY_FILES'));
+		}
+
+		// If there is a manifest script, let's copy it.
+		if ($this->manifest_script)
+		{
+			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
+			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
+
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+			{
+				if (!$this->parent->copyFiles(array($path)))
+				{
+					// Install failed, rollback changes
+					throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_MOD_INSTALL_MANIFEST'));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		// Clobber any possible pending updates
+		$update = Table::getInstance('update');
+		$uid    = $update->find(
+			array(
+				'element'   => $this->element,
+				'type'      => 'module',
+				'client_id' => $this->clientId,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Lastly, we will copy the manifest file to its appropriate place.
+		if ($this->route !== 'discover_install')
+		{
+			if (!$this->parent->copyManifest(-1))
+			{
+				// Install failed, rollback changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_MOD_INSTALL_COPY_SETUP'));
+			}
+		}
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		if (!$element)
+		{
+			if (count($this->getManifest()->files->children()))
+			{
+				foreach ($this->getManifest()->files->children() as $file)
+				{
+					if ((string) $file->attributes()->module)
+					{
+						$element = strtolower((string) $file->attributes()->module);
+
+						break;
+					}
+				}
+			}
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Custom loadLanguage method
+	 *
+	 * @param   string  $path  The path where we find language files
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function loadLanguage($path = null)
+	{
+		$source = $this->parent->getPath('source');
+		$client = $this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+		if (!$source)
+		{
+			$this->parent->setPath('source', $client . '/modules/' . $this->parent->extension->element);
+		}
+
+		$this->setManifest($this->parent->getManifest());
+
+		if ($this->getManifest()->files)
+		{
+			$extension = $this->getElement();
+
+			if ($extension)
+			{
+				$source = $path ?: ($this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/modules/' . $extension;
+				$folder = (string) $this->getManifest()->files->attributes()->folder;
+
+				if ($folder && file_exists($path . '/' . $folder))
+				{
+					$source = $path . '/' . $folder;
+				}
+
+				$client = (string) $this->getManifest()->attributes()->client;
+				$this->doLoadLanguage($extension, $source, constant('JPATH_' . strtoupper($client)));
+			}
+		}
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		// Parse optional tags
+		$this->parent->parseMedia($this->getManifest()->media, $this->clientId);
+		$this->parent->parseLanguages($this->getManifest()->languages, $this->clientId);
+	}
+
+	/**
+	 * Prepares the adapter for a discover_install task
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function prepareDiscoverInstall()
+	{
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath = $client->path . '/modules/' . $this->parent->extension->element . '/' . $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$this->setManifest($this->parent->getManifest());
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function setupInstallPaths()
+	{
+		// Get the target application
+		$cname = (string) $this->getManifest()->attributes()->client;
+
+		if ($cname)
+		{
+			// Attempt to map the client to a base path
+			$client = ApplicationHelper::getClientInfo($cname, true);
+
+			if ($client === false)
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_MOD_UNKNOWN_CLIENT',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$client->name
+					)
+				);
+			}
+
+			$basePath = $client->path;
+			$this->clientId = $client->id;
+		}
+		else
+		{
+			// No client attribute was found so we assume the site as the client
+			$basePath = JPATH_SITE;
+			$this->clientId = 0;
+		}
+
+		// Set the installation path
+		if (empty($this->element))
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_MOD_INSTALL_NOFILE',
+					\JText::_('JLIB_INSTALLER_' . $this->route)
+				)
+			);
+		}
+
+		$this->parent->setPath('extension_root', $basePath . '/modules/' . $this->element);
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		// Discover installs are stored a little differently
+		if ($this->route === 'discover_install')
+		{
+			$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+
+			$this->extension->manifest_cache = json_encode($manifest_details);
+			$this->extension->state = 0;
+			$this->extension->name = $manifest_details['name'];
+			$this->extension->enabled = 1;
+			$this->extension->params = $this->parent->getParams();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ERROR_MOD_DISCOVER_STORE_DETAILS'));
+			}
+
+			return;
+		}
+
+		// Was there a module already installed with the same name?
+		if ($this->currentExtensionId)
+		{
+			if (!$this->parent->isOverwrite())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_MOD_INSTALL_ALLREADY_EXISTS',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->name
+					)
+				);
+			}
+
+			// Load the entry and update the manifest_cache
+			$this->extension->load($this->currentExtensionId);
+
+			// Update name
+			$this->extension->name = $this->name;
+
+			// Update manifest
+			$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_MOD_ROLLBACK',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->extension->getError()
+					)
+				);
+			}
+		}
+		else
+		{
+			$this->extension->name    = $this->name;
+			$this->extension->type    = 'module';
+			$this->extension->element = $this->element;
+
+			// There is no folder for modules
+			$this->extension->folder    = '';
+			$this->extension->enabled   = 1;
+			$this->extension->protected = 0;
+			$this->extension->access    = $this->clientId == 1 ? 2 : 0;
+			$this->extension->client_id = $this->clientId;
+			$this->extension->params    = $this->parent->getParams();
+
+			// Custom data
+			$this->extension->custom_data    = '';
+			$this->extension->system_data    = '';
+			$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_MOD_ROLLBACK',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->extension->getError()
+					)
+				);
+			}
+
+			// Since we have created a module item, we add it to the installation step stack
+			// so that if we have to rollback the changes we can undo it.
+			$this->parent->pushStep(
+				array(
+					'type' => 'extension',
+					'extension_id' => $this->extension->extension_id,
+				)
+			);
+
+			// Create unpublished module
+			$name = preg_replace('#[\*?]#', '', \JText::_($this->name));
+
+			/** @var \JTableModule $module */
+			$module            = Table::getInstance('module');
+			$module->title     = $name;
+			$module->content   = '';
+			$module->module    = $this->element;
+			$module->access    = '1';
+			$module->showtitle = '1';
+			$module->params    = '';
+			$module->client_id = $this->clientId;
+			$module->language  = '*';
+
+			$module->store();
+		}
+	}
+
+	/**
+	 * Custom discover method
+	 *
+	 * @return  array  Extension list of extensions available
+	 *
+	 * @since   3.1
+	 */
+	public function discover()
+	{
+		$results = array();
+		$site_list = \JFolder::folders(JPATH_SITE . '/modules');
+		$admin_list = \JFolder::folders(JPATH_ADMINISTRATOR . '/modules');
+		$site_info = ApplicationHelper::getClientInfo('site', true);
+		$admin_info = ApplicationHelper::getClientInfo('administrator', true);
+
+		foreach ($site_list as $module)
+		{
+			if (file_exists(JPATH_SITE . "/modules/$module/$module.xml"))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_SITE . "/modules/$module/$module.xml");
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'module');
+				$extension->set('client_id', $site_info->id);
+				$extension->set('element', $module);
+				$extension->set('folder', '');
+				$extension->set('name', $module);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = clone $extension;
+			}
+		}
+
+		foreach ($admin_list as $module)
+		{
+			if (file_exists(JPATH_ADMINISTRATOR . "/modules/$module/$module.xml"))
+			{
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_ADMINISTRATOR . "/modules/$module/$module.xml");
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'module');
+				$extension->set('client_id', $admin_info->id);
+				$extension->set('element', $module);
+				$extension->set('folder', '');
+				$extension->set('name', $module);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = clone $extension;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean  Result of operation, true if updated, false on failure.
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath = $client->path . '/modules/' . $this->parent->extension->element . '/' . $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		if ($this->parent->extension->store())
+		{
+			return true;
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_MOD_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   integer  $id  The id of the module to uninstall
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		$retval = true;
+		$db     = $this->db;
+
+		// First order of business will be to load the module object table from the database.
+		// This should give us the necessary information to proceed.
+		if (!$this->extension->load((int) $id) || $this->extension->element === '')
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_ERRORUNKOWNEXTENSION'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Is the module we are trying to uninstall a core one?
+		// Because that is not a good idea...
+		if ($this->extension->protected)
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_WARNCOREMODULE', $this->extension->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($this->extension->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($this->extension->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $this->extension->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Get the extension root path
+		$element = $this->extension->element;
+		$client  = ApplicationHelper::getClientInfo($this->extension->client_id);
+
+		if ($client === false)
+		{
+			$this->parent->abort(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ERROR_MOD_UNINSTALL_UNKNOWN_CLIENT',
+					$this->extension->client_id
+				)
+			);
+
+			return false;
+		}
+
+		$this->parent->setPath('extension_root', $client->path . '/modules/' . $element);
+
+		$this->parent->setPath('source', $this->parent->getPath('extension_root'));
+
+		// Get the module's manifest objecct
+		// We do findManifest to avoid problem when uninstalling a list of extensions: getManifest cache its manifest file.
+		$this->parent->findManifest();
+		$this->setManifest($this->parent->getManifest());
+
+		// Attempt to load the language file; might have uninstall strings
+		$this->loadLanguage(($this->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/modules/' . $element);
+
+		// If there is a manifest class file, let's load it
+		$this->scriptElement = $this->getManifest()->scriptfile;
+		$manifestScript      = (string) $this->getManifest()->scriptfile;
+
+		if ($manifestScript)
+		{
+			$manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript;
+
+			// Set the class name
+			$classname = $element . 'InstallerScript';
+
+			\JLoader::register($classname, $manifestScriptFile);
+
+			if (class_exists($classname))
+			{
+				// Create a new instance
+				$this->parent->manifestClass = new $classname($this);
+
+				// And set this so we can copy it later
+				$this->set('manifest_script', $manifestScript);
+			}
+		}
+
+		try
+		{
+			$this->triggerManifestScript('uninstall');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Ignore errors for now
+		}
+
+		if (!($this->getManifest() instanceof \SimpleXMLElement))
+		{
+			// Make sure we delete the folders
+			\JFolder::delete($this->parent->getPath('extension_root'));
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_INVALID_NOTFOUND_MANIFEST'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Let's run the uninstall queries for the module
+		try
+		{
+			$this->parseQueries();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, rollback changes
+			\JLog::add($e->getMessage(), \JLog::WARNING, 'jerror');
+			$retval = false;
+		}
+
+		// Remove the schema version
+		$query = $db->getQuery(true)
+			->delete('#__schemas')
+			->where('extension_id = ' . $this->extension->extension_id);
+		$db->setQuery($query);
+		$db->execute();
+
+		// Remove other files
+		$this->parent->removeFiles($this->getManifest()->media);
+		$this->parent->removeFiles($this->getManifest()->languages, $this->extension->client_id);
+
+		// Let's delete all the module copies for the type we are uninstalling
+		$query->clear()
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__modules'))
+			->where($db->quoteName('module') . ' = ' . $db->quote($this->extension->element))
+			->where($db->quoteName('client_id') . ' = ' . (int) $this->extension->client_id);
+		$db->setQuery($query);
+
+		try
+		{
+			$modules = $db->loadColumn();
+		}
+		catch (\RuntimeException $e)
+		{
+			$modules = array();
+		}
+
+		// Do we have any module copies?
+		if (count($modules))
+		{
+			// Ensure the list is sane
+			$modules = ArrayHelper::toInteger($modules);
+			$modID = implode(',', $modules);
+
+			// Wipe out any items assigned to menus
+			$query = $db->getQuery(true)
+				->delete($db->quoteName('#__modules_menu'))
+				->where($db->quoteName('moduleid') . ' IN (' . $modID . ')');
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (\RuntimeException $e)
+			{
+				\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_EXCEPTION', $db->stderr(true)), \JLog::WARNING, 'jerror');
+				$retval = false;
+			}
+
+			// Wipe out any instances in the modules table
+			/** @var \JTableModule $module */
+			$module = Table::getInstance('Module');
+
+			foreach ($modules as $modInstanceId)
+			{
+				$module->load($modInstanceId);
+
+				if (!$module->delete())
+				{
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_EXCEPTION', $module->getError()), \JLog::WARNING, 'jerror');
+					$retval = false;
+				}
+			}
+		}
+
+		// Now we will no longer need the module object, so let's delete it and free up memory
+		$this->extension->delete($this->extension->extension_id);
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__modules'))
+			->where($db->quoteName('module') . ' = ' . $db->quote($this->extension->element))
+			->where($db->quote('client_id') . ' = ' . $this->extension->client_id);
+		$db->setQuery($query);
+
+		try
+		{
+			// Clean up any other ones that might exist as well
+			$db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Ignore the error...
+		}
+
+		// Remove the installation folder
+		if (!\JFolder::delete($this->parent->getPath('extension_root')))
+		{
+			// \JFolder should raise an error
+			$retval = false;
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Custom rollback method
+	 * - Roll back the menu item
+	 *
+	 * @param   array  $arg  Installation step to rollback
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	protected function _rollback_menu($arg)
+	{
+		// Get database connector object
+		$db = $this->parent->getDbo();
+
+		// Remove the entry from the #__modules_menu table
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__modules_menu'))
+			->where($db->quoteName('moduleid') . ' = ' . (int) $arg['id']);
+		$db->setQuery($query);
+
+		try
+		{
+			return $db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Custom rollback method
+	 * - Roll back the module item
+	 *
+	 * @param   array  $arg  Installation step to rollback
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	protected function _rollback_module($arg)
+	{
+		// Get database connector object
+		$db = $this->parent->getDbo();
+
+		// Remove the entry from the #__modules table
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__modules'))
+			->where($db->quoteName('id') . ' = ' . (int) $arg['id']);
+		$db->setQuery($query);
+
+		try
+		{
+			return $db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/PackageAdapter.php b/core/libraries/src/Installer/Adapter/PackageAdapter.php
new file mode 100644
index 00000000..93b7bdeb
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/PackageAdapter.php
@@ -0,0 +1,769 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Installer\InstallerHelper;
+use Joomla\CMS\Installer\Manifest\PackageManifest;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
+
+/**
+ * Package installer
+ *
+ * @since  3.1
+ */
+class PackageAdapter extends InstallerAdapter
+{
+	/**
+	 * Flag if the internal event callback has been registered
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	private static $eventRegistered = false;
+
+	/**
+	 * An array of extension IDs for each installed extension
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	protected $installedIds = array();
+
+	/**
+	 * The results of each installed extensions
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $results = array();
+
+	/**
+	 * Flag if the adapter supports discover installs
+	 *
+	 * Adapters should override this and set to false if discover install is unsupported
+	 *
+	 * @var    boolean
+	 * @since  3.4
+	 */
+	protected $supportsDiscoverInstall = false;
+
+	/**
+	 * Method to check if the extension is present in the filesystem, flags the route as update if so
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExtensionInFilesystem()
+	{
+		// If the package manifest already exists, then we will assume that the package is already installed.
+		if (file_exists(JPATH_MANIFESTS . '/packages/' . basename($this->parent->getPath('manifest'))))
+		{
+			// Look for an update function or update tag
+			$updateElement = $this->manifest->update;
+
+			// Upgrade manually set or update function available or update tag detected
+			if ($updateElement || $this->parent->isUpgrade()
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update')))
+			{
+				// Force this one
+				$this->parent->setOverwrite(true);
+				$this->parent->setUpgrade(true);
+
+				if ($this->currentExtensionId)
+				{
+					// If there is a matching extension mark this as an update
+					$this->setRoute('update');
+				}
+			}
+			elseif (!$this->parent->isOverwrite())
+			{
+				// We didn't have overwrite set, find an update function or find an update tag so lets call it safe
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_DIRECTORY',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->type,
+						$this->parent->getPath('extension_root')
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		$folder = (string) $this->getManifest()->files->attributes()->folder;
+		$source = $this->parent->getPath('source');
+
+		if ($folder)
+		{
+			$source .= '/' . $folder;
+		}
+
+		// Install all necessary files
+		if (!count($this->getManifest()->files->children()))
+		{
+			throw new \RuntimeException(
+				\JText::sprintf('JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES',
+					\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+				)
+			);
+		}
+
+		// Add a callback for the `onExtensionAfterInstall` event so we can receive the installed extension ID
+		if (!self::$eventRegistered)
+		{
+			self::$eventRegistered = true;
+			\JEventDispatcher::getInstance()->register('onExtensionAfterInstall', array($this, 'onExtensionAfterInstall'));
+		}
+
+		foreach ($this->getManifest()->files->children() as $child)
+		{
+			$file = $source . '/' . (string) $child;
+
+			if (is_dir($file))
+			{
+				// If it's actually a directory then fill it up
+				$package = array();
+				$package['dir'] = $file;
+				$package['type'] = InstallerHelper::detectType($file);
+			}
+			else
+			{
+				// If it's an archive
+				$package = InstallerHelper::unpack($file);
+			}
+
+			$tmpInstaller  = new Installer;
+			$installResult = $tmpInstaller->install($package['dir']);
+
+			if (!$installResult)
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						basename($file)
+					)
+				);
+			}
+
+			$this->results[] = array(
+				'name'   => (string) $tmpInstaller->manifest->name,
+				'result' => $installResult,
+			);
+		}
+	}
+
+	/**
+	 * Method to create the extension root path if necessary
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function createExtensionRoot()
+	{
+		/*
+		 * For packages, we only need the extension root if copying manifest files; this step will be handled
+		 * at that point if necessary
+		 */
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		// Clobber any possible pending updates
+		/** @var Update $update */
+		$update = Table::getInstance('update');
+		$uid = $update->find(
+			array(
+				'element' => $this->element,
+				'type' => $this->type,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Set the package ID for each of the installed extensions to track the relationship
+		if (!empty($this->installedIds))
+		{
+			$db = $this->db;
+			$query = $db->getQuery(true)
+				->update('#__extensions')
+				->set($db->quoteName('package_id') . ' = ' . (int) $this->extension->extension_id)
+				->where($db->quoteName('extension_id') . ' IN (' . implode(', ', $this->installedIds) . ')');
+
+			try
+			{
+				$db->setQuery($query)->execute();
+			}
+			catch (\JDatabaseExceptionExecuting $e)
+			{
+				\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_SETTING_PACKAGE_ID'), \JLog::WARNING, 'jerror');
+			}
+		}
+
+		// Lastly, we will copy the manifest file to its appropriate place.
+		$manifest = array();
+		$manifest['src'] = $this->parent->getPath('manifest');
+		$manifest['dest'] = JPATH_MANIFESTS . '/packages/' . basename($this->parent->getPath('manifest'));
+
+		if (!$this->parent->copyFiles(array($manifest), true))
+		{
+			// Install failed, rollback changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_PACK_INSTALL_COPY_SETUP',
+					\JText::_('JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES')
+				)
+			);
+		}
+
+		// If there is a manifest script, let's copy it.
+		if ($this->manifest_script)
+		{
+			// First, we have to create a folder for the script if one isn't present
+			if (!file_exists($this->parent->getPath('extension_root')))
+			{
+				if (!\JFolder::create($this->parent->getPath('extension_root')))
+				{
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_CREATE_DIRECTORY',
+							\JText::_('JLIB_INSTALLER_' . $this->route),
+							$this->parent->getPath('extension_root')
+						)
+					);
+				}
+
+				/*
+				 * Since we created the extension directory and will want to remove it if
+				 * we have to roll back the installation, let's add it to the
+				 * installation step stack
+				 */
+
+				$this->parent->pushStep(
+					array(
+						'type' => 'folder',
+						'path' => $this->parent->getPath('extension_root'),
+					)
+				);
+			}
+
+			$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
+			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
+
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+			{
+				if (!$this->parent->copyFiles(array($path)))
+				{
+					// Install failed, rollback changes
+					throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_PACKAGE_INSTALL_MANIFEST'));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		if (!$element)
+		{
+			// Ensure the element is a string
+			$element = (string) $this->getManifest()->packagename;
+
+			// Filter the name for illegal characters
+			$element = 'pkg_' . \JFilterInput::getInstance()->clean($element, 'cmd');
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Load language from a path
+	 *
+	 * @param   string  $path  The path of the language.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function loadLanguage($path)
+	{
+		$this->doLoadLanguage($this->getElement(), $path);
+	}
+
+	/**
+	 * Handler for the `onExtensionAfterInstall` event
+	 *
+	 * @param   Installer        $installer  Installer instance managing the extension's installation
+	 * @param   integer|boolean  $eid        The extension ID of the installed extension on success, boolean false on install failure
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function onExtensionAfterInstall(Installer $installer, $eid)
+	{
+		if ($eid !== false)
+		{
+			$this->installedIds[] = $eid;
+		}
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		$this->parent->parseLanguages($this->getManifest()->languages);
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function setupInstallPaths()
+	{
+		$packagepath = (string) $this->getManifest()->packagename;
+
+		if (empty($packagepath))
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_PACK',
+					\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+				)
+			);
+		}
+
+		$this->parent->setPath('extension_root', JPATH_MANIFESTS . '/packages/' . $packagepath);
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		if ($this->currentExtensionId)
+		{
+			if (!$this->parent->isOverwrite())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_ALREADY_EXISTS',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->name
+					)
+				);
+			}
+
+			$this->extension->load($this->currentExtensionId);
+			$this->extension->name = $this->name;
+		}
+		else
+		{
+			$this->extension->name = $this->name;
+			$this->extension->type = 'package';
+			$this->extension->element = $this->element;
+
+			// There is no folder for packages
+			$this->extension->folder = '';
+			$this->extension->enabled = 1;
+			$this->extension->protected = 0;
+			$this->extension->access = 1;
+			$this->extension->client_id = 0;
+
+			// Custom data
+			$this->extension->custom_data = '';
+			$this->extension->system_data = '';
+			$this->extension->params = $this->parent->getParams();
+		}
+
+		// Update the manifest cache for the entry
+		$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+		if (!$this->extension->store())
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_PACK_INSTALL_ROLLBACK',
+					$this->extension->getError()
+				)
+			);
+		}
+
+		// Since we have created a package item, we add it to the installation step stack
+		// so that if we have to rollback the changes we can undo it.
+		$this->parent->pushStep(array('type' => 'extension', 'id' => $this->extension->extension_id));
+	}
+
+	/**
+	 * Executes a custom install script method
+	 *
+	 * @param   string  $method  The install method to execute
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.4
+	 */
+	protected function triggerManifestScript($method)
+	{
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, $method))
+		{
+			switch ($method)
+			{
+				// The preflight method takes the route as a param
+				case 'preflight':
+					if ($this->parent->manifestClass->$method($this->route, $this) === false)
+					{
+						// The script failed, rollback changes
+						throw new \RuntimeException(
+							\JText::sprintf(
+								'JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE',
+								\JText::_('JLIB_INSTALLER_' . $this->route)
+							)
+						);
+					}
+
+					break;
+
+				// The postflight method takes the route and a results array as params
+				case 'postflight':
+					$this->parent->manifestClass->$method($this->route, $this, $this->results);
+
+					break;
+
+				// The install, uninstall, and update methods only pass this object as a param
+				case 'install':
+				case 'uninstall':
+				case 'update':
+					if ($this->parent->manifestClass->$method($this) === false)
+					{
+						if ($method !== 'uninstall')
+						{
+							// The script failed, rollback changes
+							throw new \RuntimeException(
+								\JText::sprintf(
+									'JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE',
+									\JText::_('JLIB_INSTALLER_' . $this->route)
+								)
+							);
+						}
+					}
+
+					break;
+			}
+		}
+
+		// Append to the message object
+		$this->extensionMessage .= ob_get_clean();
+
+		// If in postflight or uninstall, set the message for display
+		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage !== '')
+		{
+			$this->parent->set('extension_message', $this->extensionMessage);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   integer  $id  The id of the package to uninstall.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		$row = null;
+		$retval = true;
+
+		$row = Table::getInstance('extension');
+		$row->load($id);
+
+		if ($row->protected)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($row->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($row->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$manifestFile = JPATH_MANIFESTS . '/packages/' . $row->get('element') . '.xml';
+		$manifest = new PackageManifest($manifestFile);
+
+		// Set the package root path
+		$this->parent->setPath('extension_root', JPATH_MANIFESTS . '/packages/' . $manifest->packagename);
+
+		// Because packages may not have their own folders we cannot use the standard method of finding an installation manifest
+		if (!file_exists($manifestFile))
+		{
+			// TODO: Fail?
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$xml = simplexml_load_file($manifestFile);
+
+		// If we cannot load the XML file return false
+		if (!$xml)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_LOAD_MANIFEST'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Check for a valid XML root tag.
+		if ($xml->getName() !== 'extension')
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_MANIFEST'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// If there is a manifest class file, let's load it
+		$manifestScript = (string) $manifest->scriptfile;
+
+		if ($manifestScript)
+		{
+			$manifestScriptFile = $this->parent->getPath('extension_root') . '/' . $manifestScript;
+
+			// Set the class name
+			$classname = $row->element . 'InstallerScript';
+
+			\JLoader::register($classname, $manifestScriptFile);
+
+			if (class_exists($classname))
+			{
+				// Create a new instance
+				$this->parent->manifestClass = new $classname($this);
+
+				// And set this so we can copy it later
+				$this->set('manifest_script', $manifestScript);
+			}
+		}
+
+		ob_start();
+		ob_implicit_flush(false);
+
+		// Run uninstall if possible
+		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'uninstall'))
+		{
+			$this->parent->manifestClass->uninstall($this);
+		}
+
+		$msg = ob_get_contents();
+		ob_end_clean();
+
+		if ($msg != '')
+		{
+			$this->parent->set('extension_message', $msg);
+		}
+
+		$error = false;
+
+		foreach ($manifest->filelist as $extension)
+		{
+			$tmpInstaller = new Installer;
+			$tmpInstaller->setPackageUninstall(true);
+
+			$id = $this->_getExtensionId($extension->type, $extension->id, $extension->client, $extension->group);
+			$client = ApplicationHelper::getClientInfo($extension->client, true);
+
+			if ($id)
+			{
+				if (!$tmpInstaller->uninstall($extension->type, $id, $client->id))
+				{
+					$error = true;
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER', basename($extension->filename)), \JLog::WARNING, 'jerror');
+				}
+			}
+			else
+			{
+				\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION'), \JLog::WARNING, 'jerror');
+			}
+		}
+
+		// Remove any language files
+		$this->parent->removeFiles($xml->languages);
+
+		// Clean up manifest file after we're done if there were no errors
+		if (!$error)
+		{
+			\JFile::delete($manifestFile);
+			$folder = $this->parent->getPath('extension_root');
+
+			if (\JFolder::exists($folder))
+			{
+				\JFolder::delete($folder);
+			}
+
+			$row->delete();
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED'), \JLog::WARNING, 'jerror');
+		}
+
+		// Return the result up the line
+		return $retval;
+	}
+
+	/**
+	 * Gets the extension id.
+	 *
+	 * @param   string   $type    The extension type.
+	 * @param   string   $id      The name of the extension (the element field).
+	 * @param   integer  $client  The application id (0: Joomla CMS site; 1: Joomla CMS administrator).
+	 * @param   string   $group   The extension group (mainly for plugins).
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.1
+	 */
+	protected function _getExtensionId($type, $id, $client, $group)
+	{
+		$db = $this->parent->getDbo();
+
+		$query = $db->getQuery(true)
+			->select('extension_id')
+			->from('#__extensions')
+			->where('type = ' . $db->quote($type))
+			->where('element = ' . $db->quote($id));
+
+		switch ($type)
+		{
+			case 'plugin':
+				// Plugins have a folder but not a client
+				$query->where('folder = ' . $db->quote($group));
+				break;
+
+			case 'library':
+			case 'package':
+			case 'component':
+				// Components, packages and libraries don't have a folder or client.
+				// Included for completeness.
+				break;
+
+			case 'language':
+			case 'module':
+			case 'template':
+				// Languages, modules and templates have a client but not a folder
+				$client = ApplicationHelper::getClientInfo($client, true);
+				$query->where('client_id = ' . (int) $client->id);
+				break;
+		}
+
+		$db->setQuery($query);
+
+		// Note: For templates, libraries and packages their unique name is their key.
+		// This means they come out the same way they came in.
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean  Result of operation, true if updated, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		// Need to find to find where the XML file is since we don't store this normally
+		$manifestPath = JPATH_MANIFESTS . '/packages/' . $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		try
+		{
+			return $this->parent->extension->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PACK_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/PluginAdapter.php b/core/libraries/src/Installer/Adapter/PluginAdapter.php
new file mode 100644
index 00000000..50f80229
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/PluginAdapter.php
@@ -0,0 +1,740 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
+
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * Plugin installer
+ *
+ * @since  3.1
+ */
+class PluginAdapter extends InstallerAdapter
+{
+	/**
+	 * `<scriptfile>` element of the extension manifest
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	protected $scriptElement = null;
+
+	/**
+	 * `<files>` element of the old extension manifest
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	protected $oldFiles = null;
+
+	/**
+	 * Method to check if the extension is already present in the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExistingExtension()
+	{
+		try
+		{
+			$this->currentExtensionId = $this->extension->find(
+				array('type' => $this->type, 'element' => $this->element, 'folder' => $this->group)
+			);
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_ROLLBACK',
+					\JText::_('JLIB_INSTALLER_' . $this->route),
+					$e->getMessage()
+				),
+				$e->getCode(),
+				$e
+			);
+		}
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		// Copy all necessary files
+		if ($this->parent->parseFiles($this->getManifest()->files, -1, $this->oldFiles) === false)
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_PLG_COPY_FILES',
+					\JText::_('JLIB_INSTALLER_' . $this->route)
+				)
+			);
+		}
+
+		// If there is a manifest script, let's copy it.
+		if ($this->manifest_script)
+		{
+			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
+			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
+
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+			{
+				if (!$this->parent->copyFiles(array($path)))
+				{
+					// Install failed, rollback changes
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_PLG_INSTALL_MANIFEST',
+							\JText::_('JLIB_INSTALLER_' . $this->route)
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to create the extension root path if necessary
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function createExtensionRoot()
+	{
+		// Run the common create code first
+		parent::createExtensionRoot();
+
+		// If we're updating at this point when there is always going to be an extension_root find the old XML files
+		if ($this->route === 'update')
+		{
+			// Create a new installer because findManifest sets stuff; side effects!
+			$tmpInstaller = new Installer;
+
+			// Look in the extension root
+			$tmpInstaller->setPath('source', $this->parent->getPath('extension_root'));
+
+			if ($tmpInstaller->findManifest())
+			{
+				$old_manifest   = $tmpInstaller->getManifest();
+				$this->oldFiles = $old_manifest->files;
+			}
+		}
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		// Clobber any possible pending updates
+		/** @var Update $update */
+		$update = Table::getInstance('update');
+		$uid = $update->find(
+			array(
+				'element' => $this->element,
+				'type'    => $this->type,
+				'folder'  => $this->group,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Lastly, we will copy the manifest file to its appropriate place.
+		if ($this->route !== 'discover_install')
+		{
+			if (!$this->parent->copyManifest(-1))
+			{
+				// Install failed, rollback changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_PLG_INSTALL_COPY_SETUP',
+						\JText::_('JLIB_INSTALLER_' . $this->route)
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		if (!$element)
+		{
+			// Backward Compatibility
+			// @todo Deprecate in future version
+			if (count($this->getManifest()->files->children()))
+			{
+				$type = (string) $this->getManifest()->attributes()->type;
+
+				foreach ($this->getManifest()->files->children() as $file)
+				{
+					if ((string) $file->attributes()->$type)
+					{
+						$element = (string) $file->attributes()->$type;
+
+						break;
+					}
+				}
+			}
+		}
+
+		return $element;
+	}
+
+	/**
+	 * Get the class name for the install adapter script.
+	 *
+	 * @return  string  The class name.
+	 *
+	 * @since   3.4
+	 */
+	protected function getScriptClassName()
+	{
+		return 'Plg' . str_replace('-', '', $this->group) . $this->element . 'InstallerScript';
+	}
+
+	/**
+	 * Custom loadLanguage method
+	 *
+	 * @param   string  $path  The path where to find language files.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function loadLanguage($path = null)
+	{
+		$source = $this->parent->getPath('source');
+
+		if (!$source)
+		{
+			$this->parent->setPath(
+				'source',
+				JPATH_PLUGINS . '/' . $this->parent->extension->folder . '/' . $this->parent->extension->element
+			);
+		}
+
+		$element = $this->getManifest()->files;
+
+		if ($element)
+		{
+			$group = strtolower((string) $this->getManifest()->attributes()->group);
+			$name = '';
+
+			if (count($element->children()))
+			{
+				foreach ($element->children() as $file)
+				{
+					if ((string) $file->attributes()->plugin)
+					{
+						$name = strtolower((string) $file->attributes()->plugin);
+						break;
+					}
+				}
+			}
+
+			if ($name)
+			{
+				$extension = "plg_${group}_${name}";
+				$source = $path ?: JPATH_PLUGINS . "/$group/$name";
+				$folder = (string) $element->attributes()->folder;
+
+				if ($folder && file_exists("$path/$folder"))
+				{
+					$source = "$path/$folder";
+				}
+
+				$this->doLoadLanguage($extension, $source, JPATH_ADMINISTRATOR);
+			}
+		}
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		// Parse optional tags -- media and language files for plugins go in admin app
+		$this->parent->parseMedia($this->getManifest()->media, 1);
+		$this->parent->parseLanguages($this->getManifest()->languages, 1);
+	}
+
+	/**
+	 * Prepares the adapter for a discover_install task
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function prepareDiscoverInstall()
+	{
+		$client   = ApplicationHelper::getClientInfo($this->extension->client_id);
+		$basePath = $client->path . '/plugins/' . $this->extension->folder;
+
+		if (is_dir($basePath . '/' . $this->extension->element))
+		{
+			$manifestPath = $basePath . '/' . $this->extension->element . '/' . $this->extension->element . '.xml';
+		}
+		else
+		{
+			// @deprecated 4.0 - This path supports Joomla! 1.5 plugin folder layouts
+			$manifestPath = $basePath . '/' . $this->extension->element . '.xml';
+		}
+
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$this->setManifest($this->parent->getManifest());
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function setupInstallPaths()
+	{
+		$this->group = (string) $this->getManifest()->attributes()->group;
+
+		if (empty($this->element) && empty($this->group))
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_PLG_INSTALL_NO_FILE',
+					\JText::_('JLIB_INSTALLER_' . $this->route)
+				)
+			);
+		}
+
+		$this->parent->setPath('extension_root', JPATH_PLUGINS . '/' . $this->group . '/' . $this->element);
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		// Discover installs are stored a little differently
+		if ($this->route === 'discover_install')
+		{
+			$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+
+			$this->extension->manifest_cache = json_encode($manifest_details);
+			$this->extension->state = 0;
+			$this->extension->name = $manifest_details['name'];
+			$this->extension->enabled = 'editors' === $this->extension->folder ? 1 : 0;
+			$this->extension->params = $this->parent->getParams();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS'));
+			}
+
+			return;
+		}
+
+		// Was there a plugin with the same name already installed?
+		if ($this->currentExtensionId)
+		{
+			if (!$this->parent->isOverwrite())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_PLG_INSTALL_ALLREADY_EXISTS',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->name
+					)
+				);
+			}
+
+			$this->extension->load($this->currentExtensionId);
+			$this->extension->name = $this->name;
+			$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+			// Update the manifest cache and name
+			$this->extension->store();
+		}
+		else
+		{
+			// Store in the extensions table (1.6)
+			$this->extension->name = $this->name;
+			$this->extension->type = 'plugin';
+			$this->extension->ordering = 0;
+			$this->extension->element = $this->element;
+			$this->extension->folder = $this->group;
+			$this->extension->enabled = 0;
+			$this->extension->protected = 0;
+			$this->extension->access = 1;
+			$this->extension->client_id = 0;
+			$this->extension->params = $this->parent->getParams();
+
+			// Custom data
+			$this->extension->custom_data = '';
+
+			// System data
+			$this->extension->system_data = '';
+			$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+			// Editor plugins are published by default
+			if ($this->group === 'editors')
+			{
+				$this->extension->enabled = 1;
+			}
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_PLG_INSTALL_ROLLBACK',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->extension->getError()
+					)
+				);
+			}
+
+			// Since we have created a plugin item, we add it to the installation step stack
+			// so that if we have to rollback the changes we can undo it.
+			$this->parent->pushStep(array('type' => 'extension', 'id' => $this->extension->extension_id));
+		}
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   integer  $id  The id of the plugin to uninstall
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		$this->route = 'uninstall';
+
+		$row = null;
+		$retval = true;
+		$db = $this->parent->getDbo();
+
+		// First order of business will be to load the plugin object table from the database.
+		// This should give us the necessary information to proceed.
+		$row = Table::getInstance('extension');
+
+		if (!$row->load((int) $id))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PLG_UNINSTALL_ERRORUNKOWNEXTENSION'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Is the plugin we are trying to uninstall a core one?
+		// Because that is not a good idea...
+		if ($row->protected)
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_PLG_UNINSTALL_WARNCOREPLUGIN', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($row->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($row->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Get the plugin folder so we can properly build the plugin path
+		if (trim($row->folder) === '')
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PLG_UNINSTALL_FOLDER_FIELD_EMPTY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Set the plugin root path
+		$this->parent->setPath('extension_root', JPATH_PLUGINS . '/' . $row->folder . '/' . $row->element);
+
+		$this->parent->setPath('source', $this->parent->getPath('extension_root'));
+
+		$this->parent->findManifest();
+		$this->setManifest($this->parent->getManifest());
+
+		// Attempt to load the language file; might have uninstall strings
+		$this->parent->setPath('source', JPATH_PLUGINS . '/' . $row->folder . '/' . $row->element);
+		$this->loadLanguage(JPATH_PLUGINS . '/' . $row->folder . '/' . $row->element);
+
+		/**
+		 * ---------------------------------------------------------------------------------------------
+		 * Installer Trigger Loading
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// If there is a manifest class file, let's load it; we'll copy it later (don't have dest yet)
+		$manifestScript = (string) $this->getManifest()->scriptfile;
+
+		if ($manifestScript)
+		{
+			$manifestScriptFile = $this->parent->getPath('source') . '/' . $manifestScript;
+
+			// If a dash is present in the folder, remove it
+			$folderClass = str_replace('-', '', $row->folder);
+
+			// Set the class name
+			$classname = 'Plg' . $folderClass . $row->element . 'InstallerScript';
+
+			\JLoader::register($classname, $manifestScriptFile);
+
+			if (class_exists($classname))
+			{
+				// Create a new instance
+				$this->parent->manifestClass = new $classname($this);
+
+				// And set this so we can copy it later
+				$this->set('manifest_script', $manifestScript);
+			}
+		}
+
+		// Run preflight if possible (since we know we're not an update)
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'preflight'))
+		{
+			if ($this->parent->manifestClass->preflight($this->route, $this) === false)
+			{
+				// Preflight failed, rollback changes
+				$this->parent->abort(\JText::_('JLIB_INSTALLER_ABORT_PLG_INSTALL_CUSTOM_INSTALL_FAILURE'));
+
+				return false;
+			}
+		}
+
+		// Create the $msg object and append messages from preflight
+		$msg = ob_get_contents();
+		ob_end_clean();
+
+		// Let's run the queries for the plugin
+		$utfresult = $this->parent->parseSQLFiles($this->getManifest()->uninstall->sql);
+
+		if ($utfresult === false)
+		{
+			// Install failed, rollback changes
+			$this->parent->abort(\JText::sprintf('JLIB_INSTALLER_ABORT_PLG_UNINSTALL_SQL_ERROR', $db->stderr(true)));
+
+			return false;
+		}
+
+		// Run the custom uninstall method if possible
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'uninstall'))
+		{
+			$this->parent->manifestClass->uninstall($this);
+		}
+
+		// Append messages
+		$msg .= ob_get_contents();
+		ob_end_clean();
+
+		// Remove the plugin files
+		$this->parent->removeFiles($this->getManifest()->files, -1);
+
+		// Remove all media and languages as well
+		$this->parent->removeFiles($this->getManifest()->media);
+		$this->parent->removeFiles($this->getManifest()->languages, 1);
+
+		// Remove the schema version
+		$query = $db->getQuery(true)
+			->delete('#__schemas')
+			->where('extension_id = ' . $row->extension_id);
+		$db->setQuery($query);
+		$db->execute();
+
+		// Now we will no longer need the plugin object, so let's delete it
+		$row->delete($row->extension_id);
+		unset($row);
+
+		// Remove the plugin's folder
+		\JFolder::delete($this->parent->getPath('extension_root'));
+
+		if ($msg != '')
+		{
+			$this->parent->set('extension_message', $msg);
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Custom discover method
+	 *
+	 * @return  array  Extension) list of extensions available
+	 *
+	 * @since   3.1
+	 */
+	public function discover()
+	{
+		$results = array();
+		$folder_list = \JFolder::folders(JPATH_SITE . '/plugins');
+
+		foreach ($folder_list as $folder)
+		{
+			$file_list = \JFolder::files(JPATH_SITE . '/plugins/' . $folder, '\.xml$');
+
+			foreach ($file_list as $file)
+			{
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_SITE . '/plugins/' . $folder . '/' . $file);
+				$file = \JFile::stripExt($file);
+
+				// Ignore example plugins
+				if ($file === 'example' || $manifest_details === false)
+				{
+					continue;
+				}
+
+				$element = empty($manifest_details['filename']) ? $file : $manifest_details['filename'];
+
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'plugin');
+				$extension->set('client_id', 0);
+				$extension->set('element', $element);
+				$extension->set('folder', $folder);
+				$extension->set('name', $manifest_details['name']);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+
+			$folder_list = \JFolder::folders(JPATH_SITE . '/plugins/' . $folder);
+
+			foreach ($folder_list as $plugin_folder)
+			{
+				$file_list = \JFolder::files(JPATH_SITE . '/plugins/' . $folder . '/' . $plugin_folder, '\.xml$');
+
+				foreach ($file_list as $file)
+				{
+					$manifest_details = Installer::parseXMLInstallFile(
+						JPATH_SITE . '/plugins/' . $folder . '/' . $plugin_folder . '/' . $file
+					);
+					$file = \JFile::stripExt($file);
+
+					if ($file === 'example' || $manifest_details === false)
+					{
+						continue;
+					}
+
+					$element = empty($manifest_details['filename']) ? $file : $manifest_details['filename'];
+
+					// Ignore example plugins
+					$extension = Table::getInstance('extension');
+					$extension->set('type', 'plugin');
+					$extension->set('client_id', 0);
+					$extension->set('element', $element);
+					$extension->set('folder', $folder);
+					$extension->set('name', $manifest_details['name']);
+					$extension->set('state', -1);
+					$extension->set('manifest_cache', json_encode($manifest_details));
+					$extension->set('params', '{}');
+					$results[] = $extension;
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Refreshes the extension table cache.
+	 *
+	 * @return  boolean  Result of operation, true if updated, false on failure.
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		/*
+		 * Plugins use the extensions table as their primary store
+		 * Similar to modules and templates, rather easy
+		 * If it's not in the extensions table we just add it
+		 */
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath = $client->path . '/plugins/' . $this->parent->extension->folder . '/' . $this->parent->extension->element . '/'
+			. $this->parent->extension->element . '.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+
+		$this->parent->extension->name = $manifest_details['name'];
+
+		if ($this->parent->extension->store())
+		{
+			return true;
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Adapter/TemplateAdapter.php b/core/libraries/src/Installer/Adapter/TemplateAdapter.php
new file mode 100644
index 00000000..eee6a50e
--- /dev/null
+++ b/core/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -0,0 +1,639 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Installer\InstallerAdapter;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
+
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * Template installer
+ *
+ * @since  3.1
+ */
+class TemplateAdapter extends InstallerAdapter
+{
+	/**
+	 * The install client ID
+	 *
+	 * @var    integer
+	 * @since  3.4
+	 */
+	protected $clientId;
+
+	/**
+	 * Method to check if the extension is already present in the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExistingExtension()
+	{
+		try
+		{
+			$this->currentExtensionId = $this->extension->find(
+				array(
+					'element'   => $this->element,
+					'type'      => $this->type,
+					'client_id' => $this->clientId,
+				)
+			);
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_ROLLBACK',
+					\JText::_('JLIB_INSTALLER_' . $this->route),
+					$e->getMessage()
+				),
+				$e->getCode(),
+				$e
+			);
+		}
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function copyBaseFiles()
+	{
+		// Copy all the necessary files
+		if ($this->parent->parseFiles($this->getManifest()->files, -1) === false)
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_FILES',
+					'files'
+				)
+			);
+		}
+
+		if ($this->parent->parseFiles($this->getManifest()->images, -1) === false)
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_FILES',
+					'images'
+				)
+			);
+		}
+
+		if ($this->parent->parseFiles($this->getManifest()->css, -1) === false)
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_FILES',
+					'css'
+				)
+			);
+		}
+
+		// If there is a manifest script, let's copy it.
+		if ($this->manifest_script)
+		{
+			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
+			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
+
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
+			{
+				if (!$this->parent->copyFiles(array($path)))
+				{
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_MANIFEST',
+							\JText::_('JLIB_INSTALLER_' . strtoupper($this->getRoute()))
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to finalise the installation processing
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 * @throws  \RuntimeException
+	 */
+	protected function finaliseInstall()
+	{
+		// Clobber any possible pending updates
+		/** @var Update $update */
+		$update = Table::getInstance('update');
+
+		$uid = $update->find(
+			array(
+				'element'   => $this->element,
+				'type'      => $this->type,
+				'client_id' => $this->clientId,
+			)
+		);
+
+		if ($uid)
+		{
+			$update->delete($uid);
+		}
+
+		// Lastly, we will copy the manifest file to its appropriate place.
+		if ($this->route !== 'discover_install')
+		{
+			if (!$this->parent->copyManifest(-1))
+			{
+				// Install failed, rollback changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_SETUP'));
+			}
+		}
+	}
+
+	/**
+	 * Custom loadLanguage method
+	 *
+	 * @param   string  $path  The path where to find language files.
+	 *
+	 * @return  InstallerTemplate
+	 *
+	 * @since   3.1
+	 */
+	public function loadLanguage($path = null)
+	{
+		$source   = $this->parent->getPath('source');
+		$basePath = $this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE;
+
+		if (!$source)
+		{
+			$this->parent->setPath('source', $basePath . '/templates/' . $this->parent->extension->element);
+		}
+
+		$this->setManifest($this->parent->getManifest());
+
+		$client = (string) $this->getManifest()->attributes()->client;
+
+		// Load administrator language if not set.
+		if (!$client)
+		{
+			$client = 'ADMINISTRATOR';
+		}
+
+		$base = constant('JPATH_' . strtoupper($client));
+		$extension = 'tpl_' . $this->getName();
+		$source    = $path ?: $base . '/templates/' . $this->getName();
+
+		$this->doLoadLanguage($extension, $source, $base);
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function parseOptionalTags()
+	{
+		$this->parent->parseMedia($this->getManifest()->media);
+		$this->parent->parseLanguages($this->getManifest()->languages, $this->clientId);
+	}
+
+	/**
+	 * Overloaded method to parse queries for template installations
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function parseQueries()
+	{
+		if (in_array($this->route, array('install', 'discover_install')))
+		{
+			$db    = $this->db;
+			$lang  = \JFactory::getLanguage();
+			$debug = $lang->setDebug(false);
+
+			$columns = array(
+				$db->quoteName('template'),
+				$db->quoteName('client_id'),
+				$db->quoteName('home'),
+				$db->quoteName('title'),
+				$db->quoteName('params'),
+			);
+
+			$values = array(
+				$db->quote($this->extension->element), $this->extension->client_id, $db->quote(0),
+				$db->quote(\JText::sprintf('JLIB_INSTALLER_DEFAULT_STYLE', \JText::_($this->extension->name))),
+				$db->quote($this->extension->params),
+			);
+
+			$lang->setDebug($debug);
+
+			// Insert record in #__template_styles
+			$query = $db->getQuery(true);
+			$query->insert($db->quoteName('#__template_styles'))
+				->columns($columns)
+				->values(implode(',', $values));
+
+			// There is a chance this could fail but we don't care...
+			$db->setQuery($query)->execute();
+		}
+	}
+
+	/**
+	 * Prepares the adapter for a discover_install task
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function prepareDiscoverInstall()
+	{
+		$client = ApplicationHelper::getClientInfo($this->extension->client_id);
+		$manifestPath = $client->path . '/templates/' . $this->extension->element . '/templateDetails.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+		$this->setManifest($this->parent->getManifest());
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function setupInstallPaths()
+	{
+		// Get the client application target
+		$cname = (string) $this->getManifest()->attributes()->client;
+
+		if ($cname)
+		{
+			// Attempt to map the client to a base path
+			$client = ApplicationHelper::getClientInfo($cname, true);
+
+			if ($client === false)
+			{
+				throw new \RuntimeException(\JText::sprintf('JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT', $cname));
+			}
+
+			$basePath = $client->path;
+			$this->clientId = $client->id;
+		}
+		else
+		{
+			// No client attribute was found so we assume the site as the client
+			$basePath = JPATH_SITE;
+			$this->clientId = 0;
+		}
+
+		// Set the template root path
+		if (empty($this->element))
+		{
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_MOD_INSTALL_NOFILE',
+					\JText::_('JLIB_INSTALLER_' . strtoupper($this->route))
+				)
+			);
+		}
+
+		$this->parent->setPath('extension_root', $basePath . '/templates/' . $this->element);
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function storeExtension()
+	{
+		// Discover installs are stored a little differently
+		if ($this->route === 'discover_install')
+		{
+			$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+
+			$this->extension->manifest_cache = json_encode($manifest_details);
+			$this->extension->state = 0;
+			$this->extension->name = $manifest_details['name'];
+			$this->extension->enabled = 1;
+			$this->extension->params = $this->parent->getParams();
+
+			if (!$this->extension->store())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(\JText::_('JLIB_INSTALLER_ERROR_TPL_DISCOVER_STORE_DETAILS'));
+			}
+
+			return;
+		}
+
+		// Was there a template already installed with the same name?
+		if ($this->currentExtensionId)
+		{
+			if (!$this->parent->isOverwrite())
+			{
+				// Install failed, roll back changes
+				throw new \RuntimeException(
+					\JText::_('JLIB_INSTALLER_ABORT_TPL_INSTALL_ALREADY_INSTALLED')
+				);
+			}
+
+			// Load the entry and update the manifest_cache
+			$this->extension->load($this->currentExtensionId);
+		}
+		else
+		{
+			$this->extension->type = 'template';
+			$this->extension->element = $this->element;
+
+			// There is no folder for templates
+			$this->extension->folder = '';
+			$this->extension->enabled = 1;
+			$this->extension->protected = 0;
+			$this->extension->access = 1;
+			$this->extension->client_id = $this->clientId;
+			$this->extension->params = $this->parent->getParams();
+
+			// Custom data
+			$this->extension->custom_data = '';
+			$this->extension->system_data = '';
+		}
+
+		// Name might change in an update
+		$this->extension->name = $this->name;
+		$this->extension->manifest_cache = $this->parent->generateManifestCache();
+
+		if (!$this->extension->store())
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_ROLLBACK',
+					\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+					$this->extension->getError()
+				)
+			);
+		}
+	}
+
+	/**
+	 * Custom uninstall method
+	 *
+	 * @param   integer  $id  The extension ID
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($id)
+	{
+		// First order of business will be to load the template object table from the database.
+		// This should give us the necessary information to proceed.
+		$row = Table::getInstance('extension');
+
+		if (!$row->load((int) $id) || $row->element === '')
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_ERRORUNKOWNEXTENSION'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Is the template we are trying to uninstall a core one?
+		// Because that is not a good idea...
+		if ($row->protected)
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_WARNCORETEMPLATE', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Does this extension have a parent package?
+		 * If so, check if the package disallows individual extensions being uninstalled if the package is not being uninstalled
+		 */
+		if ($row->package_id && !$this->parent->isPackageUninstall() && !$this->canUninstallPackageChild($row->package_id))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CANNOT_UNINSTALL_CHILD_OF_PACKAGE', $row->name), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$name = $row->element;
+		$clientId = $row->client_id;
+
+		// For a template the id will be the template name which represents the subfolder of the templates folder that the template resides in.
+		if (!$name)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_ID_EMPTY'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Deny remove default template
+		$db = $this->parent->getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from($db->qn('#__template_styles'))
+			->where($db->qn('home') . ' = ' . $db->q('1'))
+			->where($db->qn('template') . ' = ' . $db->q($name));
+		$db->setQuery($query);
+
+		if ($db->loadResult() != 0)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DEFAULT'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Get the template root path
+		$client = ApplicationHelper::getClientInfo($clientId);
+
+		if (!$client)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_INVALID_CLIENT'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$this->parent->setPath('extension_root', $client->path . '/templates/' . strtolower($name));
+		$this->parent->setPath('source', $this->parent->getPath('extension_root'));
+
+		// We do findManifest to avoid problem when uninstalling a list of extensions: getManifest cache its manifest file
+		$this->parent->findManifest();
+		$manifest = $this->parent->getManifest();
+
+		if (!($manifest instanceof \SimpleXMLElement))
+		{
+			// Kill the extension entry
+			$row->delete($row->extension_id);
+			unset($row);
+
+			// Make sure we delete the folders
+			\JFolder::delete($this->parent->getPath('extension_root'));
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_INVALID_NOTFOUND_MANIFEST'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Remove files
+		$this->parent->removeFiles($manifest->media);
+		$this->parent->removeFiles($manifest->languages, $clientId);
+
+		// Delete the template directory
+		if (\JFolder::exists($this->parent->getPath('extension_root')))
+		{
+			$retval = \JFolder::delete($this->parent->getPath('extension_root'));
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DIRECTORY'), \JLog::WARNING, 'jerror');
+			$retval = false;
+		}
+
+		// Set menu that assigned to the template back to default template
+		$subQuery = $db->getQuery(true)
+			->select('s.id')
+			->from($db->qn('#__template_styles', 's'))
+			->where($db->qn('s.template') . ' = ' . $db->q(strtolower($name)))
+			->where($db->qn('s.client_id') . ' = ' . $clientId);
+		$query->clear()
+			->update($db->qn('#__menu'))
+			->set($db->qn('template_style_id') . ' = 0')
+			->where($db->qn('template_style_id') . ' IN (' . (string) $subQuery . ')');
+		$db->setQuery($query);
+		$db->execute();
+
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__template_styles'))
+			->where($db->quoteName('template') . ' = ' . $db->quote($name))
+			->where($db->quoteName('client_id') . ' = ' . $clientId);
+		$db->setQuery($query);
+		$db->execute();
+
+		$row->delete($row->extension_id);
+		unset($row);
+
+		return $retval;
+	}
+
+	/**
+	 * Discover existing but uninstalled templates
+	 *
+	 * @return  array  Extension list
+	 */
+	public function discover()
+	{
+		$results = array();
+		$site_list = \JFolder::folders(JPATH_SITE . '/templates');
+		$admin_list = \JFolder::folders(JPATH_ADMINISTRATOR . '/templates');
+		$site_info = ApplicationHelper::getClientInfo('site', true);
+		$admin_info = ApplicationHelper::getClientInfo('administrator', true);
+
+		foreach ($site_list as $template)
+		{
+			if (file_exists(JPATH_SITE . "/templates/$template/templateDetails.xml"))
+			{
+				if ($template === 'system')
+				{
+					// Ignore special system template
+					continue;
+				}
+
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_SITE . "/templates/$template/templateDetails.xml");
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'template');
+				$extension->set('client_id', $site_info->id);
+				$extension->set('element', $template);
+				$extension->set('folder', '');
+				$extension->set('name', $template);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
+		foreach ($admin_list as $template)
+		{
+			if (file_exists(JPATH_ADMINISTRATOR . "/templates/$template/templateDetails.xml"))
+			{
+				if ($template === 'system')
+				{
+					// Ignore special system template
+					continue;
+				}
+
+				$manifest_details = Installer::parseXMLInstallFile(JPATH_ADMINISTRATOR . "/templates/$template/templateDetails.xml");
+				$extension = Table::getInstance('extension');
+				$extension->set('type', 'template');
+				$extension->set('client_id', $admin_info->id);
+				$extension->set('element', $template);
+				$extension->set('folder', '');
+				$extension->set('name', $template);
+				$extension->set('state', -1);
+				$extension->set('manifest_cache', json_encode($manifest_details));
+				$extension->set('params', '{}');
+				$results[] = $extension;
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Refreshes the extension table cache
+	 *
+	 * @return  boolean  Result of operation, true if updated, false on failure
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache()
+	{
+		// Need to find to find where the XML file is since we don't store this normally.
+		$client = ApplicationHelper::getClientInfo($this->parent->extension->client_id);
+		$manifestPath = $client->path . '/templates/' . $this->parent->extension->element . '/templateDetails.xml';
+		$this->parent->manifest = $this->parent->isManifest($manifestPath);
+		$this->parent->setPath('manifest', $manifestPath);
+
+		$manifest_details = Installer::parseXMLInstallFile($this->parent->getPath('manifest'));
+		$this->parent->extension->manifest_cache = json_encode($manifest_details);
+		$this->parent->extension->name = $manifest_details['name'];
+
+		try
+		{
+			return $this->parent->extension->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_TPL_REFRESH_MANIFEST_CACHE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Installer.php b/core/libraries/src/Installer/Installer.php
new file mode 100644
index 00000000..bcabdc0a
--- /dev/null
+++ b/core/libraries/src/Installer/Installer.php
@@ -0,0 +1,2441 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\Extension;
+use Joomla\CMS\Table\Table;
+
+\JLoader::import('joomla.filesystem.file');
+\JLoader::import('joomla.filesystem.folder');
+\JLoader::import('joomla.filesystem.path');
+\JLoader::import('joomla.base.adapter');
+
+/**
+ * Joomla base installer class
+ *
+ * @since  3.1
+ */
+class Installer extends \JAdapter
+{
+	/**
+	 * Array of paths needed by the installer
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $paths = array();
+
+	/**
+	 * True if package is an upgrade
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $upgrade = null;
+
+	/**
+	 * The manifest trigger class
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	public $manifestClass = null;
+
+	/**
+	 * True if existing files can be overwritten
+	 *
+	 * @var    boolean
+	 * @since  12.1
+	 */
+	protected $overwrite = false;
+
+	/**
+	 * Stack of installation steps
+	 * - Used for installation rollback
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	protected $stepStack = array();
+
+	/**
+	 * Extension Table Entry
+	 *
+	 * @var    Extension
+	 * @since  3.1
+	 */
+	public $extension = null;
+
+	/**
+	 * The output from the install/uninstall scripts
+	 *
+	 * @var    string
+	 * @since  3.1
+	 * */
+	public $message = null;
+
+	/**
+	 * The installation manifest XML object
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	public $manifest = null;
+
+	/**
+	 * The extension message that appears
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $extension_message = null;
+
+	/**
+	 * The redirect URL if this extension (can be null if no redirect)
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $redirect_url = null;
+
+	/**
+	 * Flag if the uninstall process was triggered by uninstalling a package
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	protected $packageUninstall = false;
+
+	/**
+	 * Installer instance container.
+	 *
+	 * @var    Installer
+	 * @since  3.1
+	 * @deprecated  4.0
+	 */
+	protected static $instance;
+
+	/**
+	 * Installer instances container.
+	 *
+	 * @var    Installer[]
+	 * @since  3.4
+	 */
+	protected static $instances;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $basepath       Base Path of the adapters
+	 * @param   string  $classprefix    Class prefix of adapters
+	 * @param   string  $adapterfolder  Name of folder to append to base path
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($basepath = __DIR__, $classprefix = '\\Joomla\\CMS\\Installer\\Adapter', $adapterfolder = 'Adapter')
+	{
+		parent::__construct($basepath, $classprefix, $adapterfolder);
+
+		$this->extension = Table::getInstance('extension');
+	}
+
+	/**
+	 * Returns the global Installer object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $basepath       Base Path of the adapters
+	 * @param   string  $classprefix    Class prefix of adapters
+	 * @param   string  $adapterfolder  Name of folder to append to base path
+	 *
+	 * @return  Installer  An installer object
+	 *
+	 * @since   3.1
+	 */
+	public static function getInstance($basepath = __DIR__, $classprefix = '\\Joomla\\CMS\\Installer\\Adapter', $adapterfolder = 'Adapter')
+	{
+		if (!isset(self::$instances[$basepath]))
+		{
+			self::$instances[$basepath] = new Installer($basepath, $classprefix, $adapterfolder);
+
+			// For B/C, we load the first instance into the static $instance container, remove at 4.0
+			if (!isset(self::$instance))
+			{
+				self::$instance = self::$instances[$basepath];
+			}
+		}
+
+		return self::$instances[$basepath];
+	}
+
+	/**
+	 * Get the allow overwrite switch
+	 *
+	 * @return  boolean  Allow overwrite switch
+	 *
+	 * @since   3.1
+	 */
+	public function isOverwrite()
+	{
+		return $this->overwrite;
+	}
+
+	/**
+	 * Set the allow overwrite switch
+	 *
+	 * @param   boolean  $state  Overwrite switch state
+	 *
+	 * @return  boolean  True it state is set, false if it is not
+	 *
+	 * @since   3.1
+	 */
+	public function setOverwrite($state = false)
+	{
+		$tmp = $this->overwrite;
+
+		if ($state)
+		{
+			$this->overwrite = true;
+		}
+		else
+		{
+			$this->overwrite = false;
+		}
+
+		return $tmp;
+	}
+
+	/**
+	 * Get the redirect location
+	 *
+	 * @return  string  Redirect location (or null)
+	 *
+	 * @since   3.1
+	 */
+	public function getRedirectUrl()
+	{
+		return $this->redirect_url;
+	}
+
+	/**
+	 * Set the redirect location
+	 *
+	 * @param   string  $newurl  New redirect location
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function setRedirectUrl($newurl)
+	{
+		$this->redirect_url = $newurl;
+	}
+
+	/**
+	 * Get whether this installer is uninstalling extensions which are part of a package
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function isPackageUninstall()
+	{
+		return $this->packageUninstall;
+	}
+
+	/**
+	 * Set whether this installer is uninstalling extensions which are part of a package
+	 *
+	 * @param   boolean  $uninstall  True if a package triggered the uninstall, false otherwise
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function setPackageUninstall($uninstall)
+	{
+		$this->packageUninstall = $uninstall;
+	}
+
+	/**
+	 * Get the upgrade switch
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	public function isUpgrade()
+	{
+		return $this->upgrade;
+	}
+
+	/**
+	 * Set the upgrade switch
+	 *
+	 * @param   boolean  $state  Upgrade switch state
+	 *
+	 * @return  boolean  True if upgrade, false otherwise
+	 *
+	 * @since   3.1
+	 */
+	public function setUpgrade($state = false)
+	{
+		$tmp = $this->upgrade;
+
+		if ($state)
+		{
+			$this->upgrade = true;
+		}
+		else
+		{
+			$this->upgrade = false;
+		}
+
+		return $tmp;
+	}
+
+	/**
+	 * Get the installation manifest object
+	 *
+	 * @return  \SimpleXMLElement  Manifest object
+	 *
+	 * @since   3.1
+	 */
+	public function getManifest()
+	{
+		if (!is_object($this->manifest))
+		{
+			$this->findManifest();
+		}
+
+		return $this->manifest;
+	}
+
+	/**
+	 * Get an installer path by name
+	 *
+	 * @param   string  $name     Path name
+	 * @param   string  $default  Default value
+	 *
+	 * @return  string  Path
+	 *
+	 * @since   3.1
+	 */
+	public function getPath($name, $default = null)
+	{
+		return (!empty($this->paths[$name])) ? $this->paths[$name] : $default;
+	}
+
+	/**
+	 * Sets an installer path by name
+	 *
+	 * @param   string  $name   Path name
+	 * @param   string  $value  Path
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function setPath($name, $value)
+	{
+		$this->paths[$name] = $value;
+	}
+
+	/**
+	 * Pushes a step onto the installer stack for rolling back steps
+	 *
+	 * @param   array  $step  Installer step
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function pushStep($step)
+	{
+		$this->stepStack[] = $step;
+	}
+
+	/**
+	 * Installation abort method
+	 *
+	 * @param   string  $msg   Abort message from the installer
+	 * @param   string  $type  Package type if defined
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.1
+	 */
+	public function abort($msg = null, $type = null)
+	{
+		$retval = true;
+		$step = array_pop($this->stepStack);
+
+		// Raise abort warning
+		if ($msg)
+		{
+			\JLog::add($msg, \JLog::WARNING, 'jerror');
+		}
+
+		while ($step != null)
+		{
+			switch ($step['type'])
+			{
+				case 'file':
+					// Remove the file
+					$stepval = \JFile::delete($step['path']);
+					break;
+
+				case 'folder':
+					// Remove the folder
+					$stepval = \JFolder::delete($step['path']);
+					break;
+
+				case 'query':
+					// Execute the query.
+					$stepval = $this->parseSQLFiles($step['script']);
+					break;
+
+				case 'extension':
+					// Get database connector object
+					$db = $this->getDbo();
+					$query = $db->getQuery(true);
+
+					// Remove the entry from the #__extensions table
+					$query->delete($db->quoteName('#__extensions'))
+						->where($db->quoteName('extension_id') . ' = ' . (int) $step['id']);
+					$db->setQuery($query);
+
+					try
+					{
+						$db->execute();
+
+						$stepval = true;
+					}
+					catch (\JDatabaseExceptionExecuting $e)
+					{
+						// The database API will have already logged the error it caught, we just need to alert the user to the issue
+						\JLog::add(\JText::_('JLIB_INSTALLER_ABORT_ERROR_DELETING_EXTENSIONS_RECORD'), \JLog::WARNING, 'jerror');
+
+						$stepval = false;
+					}
+
+					break;
+
+				default:
+					if ($type && is_object($this->_adapters[$type]))
+					{
+						// Build the name of the custom rollback method for the type
+						$method = '_rollback_' . $step['type'];
+
+						// Custom rollback method handler
+						if (method_exists($this->_adapters[$type], $method))
+						{
+							$stepval = $this->_adapters[$type]->$method($step);
+						}
+					}
+					else
+					{
+						// Set it to false
+						$stepval = false;
+					}
+					break;
+			}
+
+			// Only set the return value if it is false
+			if ($stepval === false)
+			{
+				$retval = false;
+			}
+
+			// Get the next step and continue
+			$step = array_pop($this->stepStack);
+		}
+
+		return $retval;
+	}
+
+	// Adapter functions
+
+	/**
+	 * Package installation method
+	 *
+	 * @param   string  $path  Path to package source folder
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.1
+	 */
+	public function install($path = null)
+	{
+		if ($path && \JFolder::exists($path))
+		{
+			$this->setPath('source', $path);
+		}
+		else
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_NOINSTALLPATH'));
+
+			return false;
+		}
+
+		if (!$adapter = $this->setupInstall('install', true))
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_DETECTMANIFEST'));
+
+			return false;
+		}
+
+		if (!is_object($adapter))
+		{
+			return false;
+		}
+
+		// Add the languages from the package itself
+		if (method_exists($adapter, 'loadLanguage'))
+		{
+			$adapter->loadLanguage($path);
+		}
+
+		// Fire the onExtensionBeforeInstall event.
+		PluginHelper::importPlugin('extension');
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger(
+			'onExtensionBeforeInstall',
+			array(
+				'method' => 'install',
+				'type' => $this->manifest->attributes()->type,
+				'manifest' => $this->manifest,
+				'extension' => 0,
+			)
+		);
+
+		// Run the install
+		$result = $adapter->install();
+
+		// Fire the onExtensionAfterInstall
+		$dispatcher->trigger(
+			'onExtensionAfterInstall',
+			array('installer' => clone $this, 'eid' => $result)
+		);
+
+		if ($result !== false)
+		{
+			// Refresh versionable assets cache
+			\JFactory::getApplication()->flushAssets();
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Discovered package installation method
+	 *
+	 * @param   integer  $eid  Extension ID
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.1
+	 */
+	public function discover_install($eid = null)
+	{
+		if (!$eid)
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_EXTENSIONNOTVALID'));
+
+			return false;
+		}
+
+		if (!$this->extension->load($eid))
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_LOAD_DETAILS'));
+
+			return false;
+		}
+
+		if ($this->extension->state != -1)
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_ALREADYINSTALLED'));
+
+			return false;
+		}
+
+		// Load the adapter(s) for the install manifest
+		$type   = $this->extension->type;
+		$params = array('extension' => $this->extension, 'route' => 'discover_install');
+
+		$adapter = $this->getAdapter($type, $params);
+
+		if (!is_object($adapter))
+		{
+			return false;
+		}
+
+		if (!method_exists($adapter, 'discover_install') || !$adapter->getDiscoverInstallSupported())
+		{
+			$this->abort(\JText::sprintf('JLIB_INSTALLER_ERROR_DISCOVER_INSTALL_UNSUPPORTED', $type));
+
+			return false;
+		}
+
+		// The adapter needs to prepare itself
+		if (method_exists($adapter, 'prepareDiscoverInstall'))
+		{
+			try
+			{
+				$adapter->prepareDiscoverInstall();
+			}
+			catch (\RuntimeException $e)
+			{
+				$this->abort($e->getMessage());
+
+				return false;
+			}
+		}
+
+		// Add the languages from the package itself
+		if (method_exists($adapter, 'loadLanguage'))
+		{
+			$adapter->loadLanguage();
+		}
+
+		// Fire the onExtensionBeforeInstall event.
+		PluginHelper::importPlugin('extension');
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger(
+			'onExtensionBeforeInstall',
+			array(
+				'method' => 'discover_install',
+				'type' => $this->extension->get('type'),
+				'manifest' => null,
+				'extension' => $this->extension->get('extension_id'),
+			)
+		);
+
+		// Run the install
+		$result = $adapter->discover_install();
+
+		// Fire the onExtensionAfterInstall
+		$dispatcher->trigger(
+			'onExtensionAfterInstall',
+			array('installer' => clone $this, 'eid' => $result)
+		);
+
+		if ($result !== false)
+		{
+			// Refresh versionable assets cache
+			\JFactory::getApplication()->flushAssets();
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Extension discover method
+	 *
+	 * Asks each adapter to find extensions
+	 *
+	 * @return  InstallerExtension[]
+	 *
+	 * @since   3.1
+	 */
+	public function discover()
+	{
+		$this->loadAllAdapters();
+		$results = array();
+
+		foreach ($this->_adapters as $adapter)
+		{
+			// Joomla! 1.5 installation adapter legacy support
+			if (method_exists($adapter, 'discover'))
+			{
+				$tmp = $adapter->discover();
+
+				// If its an array and has entries
+				if (is_array($tmp) && count($tmp))
+				{
+					// Merge it into the system
+					$results = array_merge($results, $tmp);
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Package update method
+	 *
+	 * @param   string  $path  Path to package source folder
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.1
+	 */
+	public function update($path = null)
+	{
+		if ($path && \JFolder::exists($path))
+		{
+			$this->setPath('source', $path);
+		}
+		else
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_NOUPDATEPATH'));
+
+			return false;
+		}
+
+		if (!$adapter = $this->setupInstall('update', true))
+		{
+			$this->abort(\JText::_('JLIB_INSTALLER_ABORT_DETECTMANIFEST'));
+
+			return false;
+		}
+
+		if (!is_object($adapter))
+		{
+			return false;
+		}
+
+		// Add the languages from the package itself
+		if (method_exists($adapter, 'loadLanguage'))
+		{
+			$adapter->loadLanguage($path);
+		}
+
+		// Fire the onExtensionBeforeUpdate event.
+		PluginHelper::importPlugin('extension');
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger('onExtensionBeforeUpdate', array('type' => $this->manifest->attributes()->type, 'manifest' => $this->manifest));
+
+		// Run the update
+		$result = $adapter->update();
+
+		// Fire the onExtensionAfterUpdate
+		$dispatcher->trigger(
+			'onExtensionAfterUpdate',
+			array('installer' => clone $this, 'eid' => $result)
+		);
+
+		if ($result !== false)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Package uninstallation method
+	 *
+	 * @param   string   $type        Package type
+	 * @param   mixed    $identifier  Package identifier for adapter
+	 * @param   integer  $cid         Application ID; deprecated in 1.6
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   3.1
+	 */
+	public function uninstall($type, $identifier, $cid = 0)
+	{
+		$params = array('extension' => $this->extension, 'route' => 'uninstall');
+
+		$adapter = $this->getAdapter($type, $params);
+
+		if (!is_object($adapter))
+		{
+			return false;
+		}
+
+		// We don't load languages here, we get the extension adapter to work it out
+		// Fire the onExtensionBeforeUninstall event.
+		PluginHelper::importPlugin('extension');
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger('onExtensionBeforeUninstall', array('eid' => $identifier));
+
+		// Run the uninstall
+		$result = $adapter->uninstall($identifier);
+
+		// Fire the onExtensionAfterInstall
+		$dispatcher->trigger(
+			'onExtensionAfterUninstall',
+			array('installer' => clone $this, 'eid' => $identifier, 'result' => $result)
+		);
+
+		// Refresh versionable assets cache
+		\JFactory::getApplication()->flushAssets();
+
+		return $result;
+	}
+
+	/**
+	 * Refreshes the manifest cache stored in #__extensions
+	 *
+	 * @param   integer  $eid  Extension ID
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	public function refreshManifestCache($eid)
+	{
+		if ($eid)
+		{
+			if (!$this->extension->load($eid))
+			{
+				$this->abort(\JText::_('JLIB_INSTALLER_ABORT_LOAD_DETAILS'));
+
+				return false;
+			}
+
+			if ($this->extension->state == -1)
+			{
+				$this->abort(\JText::sprintf('JLIB_INSTALLER_ABORT_REFRESH_MANIFEST_CACHE', $this->extension->name));
+
+				return false;
+			}
+
+			// Fetch the adapter
+			$adapter = $this->getAdapter($this->extension->type);
+
+			if (!is_object($adapter))
+			{
+				return false;
+			}
+
+			if (!method_exists($adapter, 'refreshManifestCache'))
+			{
+				$this->abort(\JText::sprintf('JLIB_INSTALLER_ABORT_METHODNOTSUPPORTED_TYPE', $this->extension->type));
+
+				return false;
+			}
+
+			$result = $adapter->refreshManifestCache();
+
+			if ($result !== false)
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		$this->abort(\JText::_('JLIB_INSTALLER_ABORT_REFRESH_MANIFEST_CACHE_VALID'));
+
+		return false;
+	}
+
+	// Utility functions
+
+	/**
+	 * Prepare for installation: this method sets the installation directory, finds
+	 * and checks the installation file and verifies the installation type.
+	 *
+	 * @param   string   $route          The install route being followed
+	 * @param   boolean  $returnAdapter  Flag to return the instantiated adapter
+	 *
+	 * @return  boolean|InstallerAdapter  InstallerAdapter object if explicitly requested otherwise boolean
+	 *
+	 * @since   3.1
+	 */
+	public function setupInstall($route = 'install', $returnAdapter = false)
+	{
+		// We need to find the installation manifest file
+		if (!$this->findManifest())
+		{
+			return false;
+		}
+
+		// Load the adapter(s) for the install manifest
+		$type   = (string) $this->manifest->attributes()->type;
+		$params = array('route' => $route, 'manifest' => $this->getManifest());
+
+		// Load the adapter
+		$adapter = $this->getAdapter($type, $params);
+
+		if ($returnAdapter)
+		{
+			return $adapter;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Backward compatible method to parse through a queries element of the
+	 * installation manifest file and take appropriate action.
+	 *
+	 * @param   \SimpleXMLElement  $element  The XML node to process
+	 *
+	 * @return  mixed  Number of queries processed or False on error
+	 *
+	 * @since   3.1
+	 */
+	public function parseQueries(\SimpleXMLElement $element)
+	{
+		// Get the database connector object
+		$db = & $this->_db;
+
+		if (!$element || !count($element->children()))
+		{
+			// Either the tag does not exist or has no children therefore we return zero files processed.
+			return 0;
+		}
+
+		// Get the array of query nodes to process
+		$queries = $element->children();
+
+		if (count($queries) === 0)
+		{
+			// No queries to process
+			return 0;
+		}
+
+		$update_count = 0;
+
+		// Process each query in the $queries array (children of $tagName).
+		foreach ($queries as $query)
+		{
+			$db->setQuery($db->convertUtf8mb4QueryToUtf8($query));
+
+			try
+			{
+				$db->execute();
+			}
+			catch (\JDatabaseExceptionExecuting $e)
+			{
+				\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $e->getMessage()), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$update_count++;
+		}
+
+		return $update_count;
+	}
+
+	/**
+	 * Method to extract the name of a discreet installation sql file from the installation manifest file.
+	 *
+	 * @param   object  $element  The XML node to process
+	 *
+	 * @return  mixed  Number of queries processed or False on error
+	 *
+	 * @since   3.1
+	 */
+	public function parseSQLFiles($element)
+	{
+		if (!$element || !count($element->children()))
+		{
+			// The tag does not exist.
+			return 0;
+		}
+
+		$db = & $this->_db;
+
+		// TODO - At 4.0 we can change this to use `getServerType()` since SQL Server will not be supported
+		$dbDriver = strtolower($db->name);
+
+		if ($db->getServerType() === 'mysql')
+		{
+			$dbDriver = 'mysql';
+		}
+
+		$update_count = 0;
+
+		// Get the name of the sql file to process
+		foreach ($element->children() as $file)
+		{
+			$fCharset = strtolower($file->attributes()->charset) === 'utf8' ? 'utf8' : '';
+			$fDriver  = strtolower($file->attributes()->driver);
+
+			if ($fDriver === 'mysqli' || $fDriver === 'pdomysql')
+			{
+				$fDriver = 'mysql';
+			}
+
+			if ($fCharset === 'utf8' && $fDriver == $dbDriver)
+			{
+				$sqlfile = $this->getPath('extension_root') . '/' . trim($file);
+
+				// Check that sql files exists before reading. Otherwise raise error for rollback
+				if (!file_exists($sqlfile))
+				{
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_SQL_FILENOTFOUND', $sqlfile), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+
+				$buffer = file_get_contents($sqlfile);
+
+				// Graceful exit and rollback if read not successful
+				if ($buffer === false)
+				{
+					\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_SQL_READBUFFER'), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+
+				// Create an array of queries from the sql file
+				$queries = \JDatabaseDriver::splitSql($buffer);
+
+				if (count($queries) === 0)
+				{
+					// No queries to process
+					continue;
+				}
+
+				// Process each query in the $queries array (split out of sql file).
+				foreach ($queries as $query)
+				{
+					$db->setQuery($db->convertUtf8mb4QueryToUtf8($query));
+
+					try
+					{
+						$db->execute();
+					}
+					catch (\JDatabaseExceptionExecuting $e)
+					{
+						\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $e->getMessage()), \JLog::WARNING, 'jerror');
+
+						return false;
+					}
+
+					$update_count++;
+				}
+			}
+		}
+
+		return $update_count;
+	}
+
+	/**
+	 * Set the schema version for an extension by looking at its latest update
+	 *
+	 * @param   \SimpleXMLElement  $schema  Schema Tag
+	 * @param   integer            $eid     Extension ID
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function setSchemaVersion(\SimpleXMLElement $schema, $eid)
+	{
+		if ($eid && $schema)
+		{
+			$db = \JFactory::getDbo();
+			$schemapaths = $schema->children();
+
+			if (!$schemapaths)
+			{
+				return;
+			}
+
+			if (count($schemapaths))
+			{
+				$dbDriver = strtolower($db->name);
+
+				if ($db->getServerType() === 'mysql')
+				{
+					$dbDriver = 'mysql';
+				}
+
+				$schemapath = '';
+
+				foreach ($schemapaths as $entry)
+				{
+					$attrs = $entry->attributes();
+
+					if ($attrs['type'] == $dbDriver)
+					{
+						$schemapath = $entry;
+						break;
+					}
+				}
+
+				if ($schemapath !== '')
+				{
+					$files = str_replace('.sql', '', \JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$'));
+					usort($files, 'version_compare');
+
+					// Update the database
+					$query = $db->getQuery(true)
+						->delete('#__schemas')
+						->where('extension_id = ' . $eid);
+					$db->setQuery($query);
+
+					if ($db->execute())
+					{
+						$query->clear()
+							->insert($db->quoteName('#__schemas'))
+							->columns(array($db->quoteName('extension_id'), $db->quoteName('version_id')))
+							->values($eid . ', ' . $db->quote(end($files)));
+						$db->setQuery($query);
+						$db->execute();
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to process the updates for an item
+	 *
+	 * @param   \SimpleXMLElement  $schema  The XML node to process
+	 * @param   integer            $eid     Extension Identifier
+	 *
+	 * @return  boolean           Result of the operations
+	 *
+	 * @since   3.1
+	 */
+	public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid)
+	{
+		$update_count = 0;
+
+		// Ensure we have an XML element and a valid extension id
+		if ($eid && $schema)
+		{
+			$db = \JFactory::getDbo();
+			$schemapaths = $schema->children();
+
+			if (count($schemapaths))
+			{
+				// TODO - At 4.0 we can change this to use `getServerType()` since SQL Server will not be supported
+				$dbDriver = strtolower($db->name);
+
+				if ($db->getServerType() === 'mysql')
+				{
+					$dbDriver = 'mysql';
+				}
+
+				$schemapath = '';
+
+				foreach ($schemapaths as $entry)
+				{
+					$attrs = $entry->attributes();
+
+					// Assuming that the type is a mandatory attribute but if it is not mandatory then there should be a discussion for it.
+					$uDriver = strtolower($attrs['type']);
+
+					if ($uDriver === 'mysqli' || $uDriver === 'pdomysql')
+					{
+						$uDriver = 'mysql';
+					}
+
+					if ($uDriver == $dbDriver)
+					{
+						$schemapath = $entry;
+						break;
+					}
+				}
+
+				if ($schemapath !== '')
+				{
+					$files = \JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$');
+
+					if (empty($files))
+					{
+						return $update_count;
+					}
+
+					$files = str_replace('.sql', '', $files);
+					usort($files, 'version_compare');
+
+					$query = $db->getQuery(true)
+						->select('version_id')
+						->from('#__schemas')
+						->where('extension_id = ' . $eid);
+					$db->setQuery($query);
+					$version = $db->loadResult();
+
+					// No version - use initial version.
+					if (!$version)
+					{
+						$version = '0.0.0';
+					}
+
+					foreach ($files as $file)
+					{
+						if (version_compare($file, $version) > 0)
+						{
+							$buffer = file_get_contents($this->getPath('extension_root') . '/' . $schemapath . '/' . $file . '.sql');
+
+							// Graceful exit and rollback if read not successful
+							if ($buffer === false)
+							{
+								\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_SQL_READBUFFER'), \JLog::WARNING, 'jerror');
+
+								return false;
+							}
+
+							// Create an array of queries from the sql file
+							$queries = \JDatabaseDriver::splitSql($buffer);
+
+							if (count($queries) === 0)
+							{
+								// No queries to process
+								continue;
+							}
+
+							// Process each query in the $queries array (split out of sql file).
+							foreach ($queries as $query)
+							{
+								$db->setQuery($db->convertUtf8mb4QueryToUtf8($query));
+
+								try
+								{
+									$db->execute();
+								}
+								catch (\JDatabaseExceptionExecuting $e)
+								{
+									\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $e->getMessage()), \JLog::WARNING, 'jerror');
+
+									return false;
+								}
+
+								$queryString = (string) $query;
+								$queryString = str_replace(array("\r", "\n"), array('', ' '), substr($queryString, 0, 80));
+								\JLog::add(\JText::sprintf('JLIB_INSTALLER_UPDATE_LOG_QUERY', $file, $queryString), \JLog::INFO, 'Update');
+
+								$update_count++;
+							}
+						}
+					}
+
+					// Update the database
+					$query = $db->getQuery(true)
+						->delete('#__schemas')
+						->where('extension_id = ' . $eid);
+					$db->setQuery($query);
+
+					if ($db->execute())
+					{
+						$query->clear()
+							->insert($db->quoteName('#__schemas'))
+							->columns(array($db->quoteName('extension_id'), $db->quoteName('version_id')))
+							->values($eid . ', ' . $db->quote(end($files)));
+						$db->setQuery($query);
+						$db->execute();
+					}
+				}
+			}
+		}
+
+		return $update_count;
+	}
+
+	/**
+	 * Method to parse through a files element of the installation manifest and take appropriate
+	 * action.
+	 *
+	 * @param   \SimpleXMLElement  $element   The XML node to process
+	 * @param   integer            $cid       Application ID of application to install to
+	 * @param   array              $oldFiles  List of old files (SimpleXMLElement's)
+	 * @param   array              $oldMD5    List of old MD5 sums (indexed by filename with value as MD5)
+	 *
+	 * @return  boolean      True on success
+	 *
+	 * @since   3.1
+	 */
+	public function parseFiles(\SimpleXMLElement $element, $cid = 0, $oldFiles = null, $oldMD5 = null)
+	{
+		// Get the array of file nodes to process; we checked whether this had children above.
+		if (!$element || !count($element->children()))
+		{
+			// Either the tag does not exist or has no children (hence no files to process) therefore we return zero files processed.
+			return 0;
+		}
+
+		$copyfiles = array();
+
+		// Get the client info
+		$client = ApplicationHelper::getClientInfo($cid);
+
+		/*
+		 * Here we set the folder we are going to remove the files from.
+		 */
+		if ($client)
+		{
+			$pathname = 'extension_' . $client->name;
+			$destination = $this->getPath($pathname);
+		}
+		else
+		{
+			$pathname = 'extension_root';
+			$destination = $this->getPath($pathname);
+		}
+
+		/*
+		 * Here we set the folder we are going to copy the files from.
+		 *
+		 * Does the element have a folder attribute?
+		 *
+		 * If so this indicates that the files are in a subdirectory of the source
+		 * folder and we should append the folder attribute to the source path when
+		 * copying files.
+		 */
+
+		$folder = (string) $element->attributes()->folder;
+
+		if ($folder && file_exists($this->getPath('source') . '/' . $folder))
+		{
+			$source = $this->getPath('source') . '/' . $folder;
+		}
+		else
+		{
+			$source = $this->getPath('source');
+		}
+
+		// Work out what files have been deleted
+		if ($oldFiles && ($oldFiles instanceof \SimpleXMLElement))
+		{
+			$oldEntries = $oldFiles->children();
+
+			if (count($oldEntries))
+			{
+				$deletions = $this->findDeletedFiles($oldEntries, $element->children());
+
+				foreach ($deletions['folders'] as $deleted_folder)
+				{
+					\JFolder::delete($destination . '/' . $deleted_folder);
+				}
+
+				foreach ($deletions['files'] as $deleted_file)
+				{
+					\JFile::delete($destination . '/' . $deleted_file);
+				}
+			}
+		}
+
+		$path = array();
+
+		// Copy the MD5SUMS file if it exists
+		if (file_exists($source . '/MD5SUMS'))
+		{
+			$path['src'] = $source . '/MD5SUMS';
+			$path['dest'] = $destination . '/MD5SUMS';
+			$path['type'] = 'file';
+			$copyfiles[] = $path;
+		}
+
+		// Process each file in the $files array (children of $tagName).
+		foreach ($element->children() as $file)
+		{
+			$path['src'] = $source . '/' . $file;
+			$path['dest'] = $destination . '/' . $file;
+
+			// Is this path a file or folder?
+			$path['type'] = $file->getName() === 'folder' ? 'folder' : 'file';
+
+			/*
+			 * Before we can add a file to the copyfiles array we need to ensure
+			 * that the folder we are copying our file to exits and if it doesn't,
+			 * we need to create it.
+			 */
+
+			if (basename($path['dest']) !== $path['dest'])
+			{
+				$newdir = dirname($path['dest']);
+
+				if (!\JFolder::create($newdir))
+				{
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CREATE_DIRECTORY', $newdir), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+
+			// Add the file to the copyfiles array
+			$copyfiles[] = $path;
+		}
+
+		return $this->copyFiles($copyfiles);
+	}
+
+	/**
+	 * Method to parse through a languages element of the installation manifest and take appropriate
+	 * action.
+	 *
+	 * @param   \SimpleXMLElement  $element  The XML node to process
+	 * @param   integer            $cid      Application ID of application to install to
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function parseLanguages(\SimpleXMLElement $element, $cid = 0)
+	{
+		// TODO: work out why the below line triggers 'node no longer exists' errors with files
+		if (!$element || !count($element->children()))
+		{
+			// Either the tag does not exist or has no children therefore we return zero files processed.
+			return 0;
+		}
+
+		$copyfiles = array();
+
+		// Get the client info
+		$client = ApplicationHelper::getClientInfo($cid);
+
+		// Here we set the folder we are going to copy the files to.
+		// 'languages' Files are copied to JPATH_BASE/language/ folder
+
+		$destination = $client->path . '/language';
+
+		/*
+		 * Here we set the folder we are going to copy the files from.
+		 *
+		 * Does the element have a folder attribute?
+		 *
+		 * If so this indicates that the files are in a subdirectory of the source
+		 * folder and we should append the folder attribute to the source path when
+		 * copying files.
+		 */
+
+		$folder = (string) $element->attributes()->folder;
+
+		if ($folder && file_exists($this->getPath('source') . '/' . $folder))
+		{
+			$source = $this->getPath('source') . '/' . $folder;
+		}
+		else
+		{
+			$source = $this->getPath('source');
+		}
+
+		// Process each file in the $files array (children of $tagName).
+		foreach ($element->children() as $file)
+		{
+			/*
+			 * Language files go in a subfolder based on the language code, ie.
+			 * <language tag="en-US">en-US.mycomponent.ini</language>
+			 * would go in the en-US subdirectory of the language folder.
+			 */
+
+			// We will only install language files where a core language pack
+			// already exists.
+
+			if ((string) $file->attributes()->tag !== '')
+			{
+				$path['src'] = $source . '/' . $file;
+
+				if ((string) $file->attributes()->client !== '')
+				{
+					// Override the client
+					$langclient = ApplicationHelper::getClientInfo((string) $file->attributes()->client, true);
+					$path['dest'] = $langclient->path . '/language/' . $file->attributes()->tag . '/' . basename((string) $file);
+				}
+				else
+				{
+					// Use the default client
+					$path['dest'] = $destination . '/' . $file->attributes()->tag . '/' . basename((string) $file);
+				}
+
+				// If the language folder is not present, then the core pack hasn't been installed... ignore
+				if (!\JFolder::exists(dirname($path['dest'])))
+				{
+					continue;
+				}
+			}
+			else
+			{
+				$path['src'] = $source . '/' . $file;
+				$path['dest'] = $destination . '/' . $file;
+			}
+
+			/*
+			 * Before we can add a file to the copyfiles array we need to ensure
+			 * that the folder we are copying our file to exits and if it doesn't,
+			 * we need to create it.
+			 */
+
+			if (basename($path['dest']) !== $path['dest'])
+			{
+				$newdir = dirname($path['dest']);
+
+				if (!\JFolder::create($newdir))
+				{
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CREATE_DIRECTORY', $newdir), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+
+			// Add the file to the copyfiles array
+			$copyfiles[] = $path;
+		}
+
+		return $this->copyFiles($copyfiles);
+	}
+
+	/**
+	 * Method to parse through a media element of the installation manifest and take appropriate
+	 * action.
+	 *
+	 * @param   \SimpleXMLElement  $element  The XML node to process
+	 * @param   integer            $cid      Application ID of application to install to
+	 *
+	 * @return  boolean     True on success
+	 *
+	 * @since   3.1
+	 */
+	public function parseMedia(\SimpleXMLElement $element, $cid = 0)
+	{
+		if (!$element || !count($element->children()))
+		{
+			// Either the tag does not exist or has no children therefore we return zero files processed.
+			return 0;
+		}
+
+		$copyfiles = array();
+
+		// Here we set the folder we are going to copy the files to.
+		// Default 'media' Files are copied to the JPATH_BASE/media folder
+
+		$folder = ((string) $element->attributes()->destination) ? '/' . $element->attributes()->destination : null;
+		$destination = \JPath::clean(JPATH_ROOT . '/media' . $folder);
+
+		// Here we set the folder we are going to copy the files from.
+
+		/*
+		 * Does the element have a folder attribute?
+		 * If so this indicates that the files are in a subdirectory of the source
+		 * folder and we should append the folder attribute to the source path when
+		 * copying files.
+		 */
+
+		$folder = (string) $element->attributes()->folder;
+
+		if ($folder && file_exists($this->getPath('source') . '/' . $folder))
+		{
+			$source = $this->getPath('source') . '/' . $folder;
+		}
+		else
+		{
+			$source = $this->getPath('source');
+		}
+
+		// Process each file in the $files array (children of $tagName).
+		foreach ($element->children() as $file)
+		{
+			$path['src'] = $source . '/' . $file;
+			$path['dest'] = $destination . '/' . $file;
+
+			// Is this path a file or folder?
+			$path['type'] = $file->getName() === 'folder' ? 'folder' : 'file';
+
+			/*
+			 * Before we can add a file to the copyfiles array we need to ensure
+			 * that the folder we are copying our file to exits and if it doesn't,
+			 * we need to create it.
+			 */
+
+			if (basename($path['dest']) !== $path['dest'])
+			{
+				$newdir = dirname($path['dest']);
+
+				if (!\JFolder::create($newdir))
+				{
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_CREATE_DIRECTORY', $newdir), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+			}
+
+			// Add the file to the copyfiles array
+			$copyfiles[] = $path;
+		}
+
+		return $this->copyFiles($copyfiles);
+	}
+
+	/**
+	 * Method to parse the parameters of an extension, build the JSON string for its default parameters, and return the JSON string.
+	 *
+	 * @return  string  JSON string of parameter values
+	 *
+	 * @since   3.1
+	 * @note    This method must always return a JSON compliant string
+	 */
+	public function getParams()
+	{
+		// Validate that we have a fieldset to use
+		if (!isset($this->manifest->config->fields->fieldset))
+		{
+			return '{}';
+		}
+
+		// Getting the fieldset tags
+		$fieldsets = $this->manifest->config->fields->fieldset;
+
+		// Creating the data collection variable:
+		$ini = array();
+
+		// Iterating through the fieldsets:
+		foreach ($fieldsets as $fieldset)
+		{
+			if (!count($fieldset->children()))
+			{
+				// Either the tag does not exist or has no children therefore we return zero files processed.
+				return '{}';
+			}
+
+			// Iterating through the fields and collecting the name/default values:
+			foreach ($fieldset as $field)
+			{
+				// Check against the null value since otherwise default values like "0"
+				// cause entire parameters to be skipped.
+
+				if (($name = $field->attributes()->name) === null)
+				{
+					continue;
+				}
+
+				if (($value = $field->attributes()->default) === null)
+				{
+					continue;
+				}
+
+				$ini[(string) $name] = (string) $value;
+			}
+		}
+
+		return json_encode($ini);
+	}
+
+	/**
+	 * Copyfiles
+	 *
+	 * Copy files from source directory to the target directory
+	 *
+	 * @param   array    $files      Array with filenames
+	 * @param   boolean  $overwrite  True if existing files can be replaced
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function copyFiles($files, $overwrite = null)
+	{
+		/*
+		 * To allow for manual override on the overwriting flag, we check to see if
+		 * the $overwrite flag was set and is a boolean value.  If not, use the object
+		 * allowOverwrite flag.
+		 */
+
+		if ($overwrite === null || !is_bool($overwrite))
+		{
+			$overwrite = $this->overwrite;
+		}
+
+		/*
+		 * $files must be an array of filenames.  Verify that it is an array with
+		 * at least one file to copy.
+		 */
+		if (is_array($files) && count($files) > 0)
+		{
+			foreach ($files as $file)
+			{
+				// Get the source and destination paths
+				$filesource = \JPath::clean($file['src']);
+				$filedest = \JPath::clean($file['dest']);
+				$filetype = array_key_exists('type', $file) ? $file['type'] : 'file';
+
+				if (!file_exists($filesource))
+				{
+					/*
+					 * The source file does not exist.  Nothing to copy so set an error
+					 * and return false.
+					 */
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_NO_FILE', $filesource), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+				elseif (($exists = file_exists($filedest)) && !$overwrite)
+				{
+					// It's okay if the manifest already exists
+					if ($this->getPath('manifest') === $filesource)
+					{
+						continue;
+					}
+
+					// The destination file already exists and the overwrite flag is false.
+					// Set an error and return false.
+					\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_FILE_EXISTS', $filedest), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+				else
+				{
+					// Copy the folder or file to the new location.
+					if ($filetype === 'folder')
+					{
+						if (!\JFolder::copy($filesource, $filedest, null, $overwrite))
+						{
+							\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_FAIL_COPY_FOLDER', $filesource, $filedest), \JLog::WARNING, 'jerror');
+
+							return false;
+						}
+
+						$step = array('type' => 'folder', 'path' => $filedest);
+					}
+					else
+					{
+						if (!\JFile::copy($filesource, $filedest, null))
+						{
+							\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_FAIL_COPY_FILE', $filesource, $filedest), \JLog::WARNING, 'jerror');
+
+							// In 3.2, TinyMCE language handling changed.  Display a special notice in case an older language pack is installed.
+							if (strpos($filedest, 'media/editors/tinymce/jscripts/tiny_mce/langs'))
+							{
+								\JLog::add(\JText::_('JLIB_INSTALLER_NOT_ERROR'), \JLog::WARNING, 'jerror');
+							}
+
+							return false;
+						}
+
+						$step = array('type' => 'file', 'path' => $filedest);
+					}
+
+					/*
+					 * Since we copied a file/folder, we want to add it to the installation step stack so that
+					 * in case we have to roll back the installation we can remove the files copied.
+					 */
+					if (!$exists)
+					{
+						$this->stepStack[] = $step;
+					}
+				}
+			}
+		}
+		else
+		{
+			// The $files variable was either not an array or an empty array
+			return false;
+		}
+
+		return count($files);
+	}
+
+	/**
+	 * Method to parse through a files element of the installation manifest and remove
+	 * the files that were installed
+	 *
+	 * @param   object   $element  The XML node to process
+	 * @param   integer  $cid      Application ID of application to remove from
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public function removeFiles($element, $cid = 0)
+	{
+		if (!$element || !count($element->children()))
+		{
+			// Either the tag does not exist or has no children therefore we return zero files processed.
+			return true;
+		}
+
+		$retval = true;
+
+		// Get the client info if we're using a specific client
+		if ($cid > -1)
+		{
+			$client = ApplicationHelper::getClientInfo($cid);
+		}
+		else
+		{
+			$client = null;
+		}
+
+		// Get the array of file nodes to process
+		$files = $element->children();
+
+		if (count($files) === 0)
+		{
+			// No files to process
+			return true;
+		}
+
+		$folder = '';
+
+		/*
+		 * Here we set the folder we are going to remove the files from.  There are a few
+		 * special cases that need to be considered for certain reserved tags.
+		 */
+		switch ($element->getName())
+		{
+			case 'media':
+				if ((string) $element->attributes()->destination)
+				{
+					$folder = (string) $element->attributes()->destination;
+				}
+				else
+				{
+					$folder = '';
+				}
+
+				$source = $client->path . '/media/' . $folder;
+
+				break;
+
+			case 'languages':
+				$lang_client = (string) $element->attributes()->client;
+
+				if ($lang_client)
+				{
+					$client = ApplicationHelper::getClientInfo($lang_client, true);
+					$source = $client->path . '/language';
+				}
+				else
+				{
+					if ($client)
+					{
+						$source = $client->path . '/language';
+					}
+					else
+					{
+						$source = '';
+					}
+				}
+
+				break;
+
+			default:
+				if ($client)
+				{
+					$pathname = 'extension_' . $client->name;
+					$source = $this->getPath($pathname);
+				}
+				else
+				{
+					$pathname = 'extension_root';
+					$source = $this->getPath($pathname);
+				}
+
+				break;
+		}
+
+		// Process each file in the $files array (children of $tagName).
+		foreach ($files as $file)
+		{
+			/*
+			 * If the file is a language, we must handle it differently.  Language files
+			 * go in a subdirectory based on the language code, ie.
+			 * <language tag="en_US">en_US.mycomponent.ini</language>
+			 * would go in the en_US subdirectory of the languages directory.
+			 */
+
+			if ($file->getName() === 'language' && (string) $file->attributes()->tag !== '')
+			{
+				if ($source)
+				{
+					$path = $source . '/' . $file->attributes()->tag . '/' . basename((string) $file);
+				}
+				else
+				{
+					$target_client = ApplicationHelper::getClientInfo((string) $file->attributes()->client, true);
+					$path = $target_client->path . '/language/' . $file->attributes()->tag . '/' . basename((string) $file);
+				}
+
+				// If the language folder is not present, then the core pack hasn't been installed... ignore
+				if (!\JFolder::exists(dirname($path)))
+				{
+					continue;
+				}
+			}
+			else
+			{
+				$path = $source . '/' . $file;
+			}
+
+			// Actually delete the files/folders
+
+			if (is_dir($path))
+			{
+				$val = \JFolder::delete($path);
+			}
+			else
+			{
+				$val = \JFile::delete($path);
+			}
+
+			if ($val === false)
+			{
+				\JLog::add('Failed to delete ' . $path, \JLog::WARNING, 'jerror');
+				$retval = false;
+			}
+		}
+
+		if (!empty($folder))
+		{
+			\JFolder::delete($source);
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Copies the installation manifest file to the extension folder in the given client
+	 *
+	 * @param   integer  $cid  Where to copy the installfile [optional: defaults to 1 (admin)]
+	 *
+	 * @return  boolean  True on success, False on error
+	 *
+	 * @since   3.1
+	 */
+	public function copyManifest($cid = 1)
+	{
+		// Get the client info
+		$client = ApplicationHelper::getClientInfo($cid);
+
+		$path['src'] = $this->getPath('manifest');
+
+		if ($client)
+		{
+			$pathname = 'extension_' . $client->name;
+			$path['dest'] = $this->getPath($pathname) . '/' . basename($this->getPath('manifest'));
+		}
+		else
+		{
+			$pathname = 'extension_root';
+			$path['dest'] = $this->getPath($pathname) . '/' . basename($this->getPath('manifest'));
+		}
+
+		return $this->copyFiles(array($path), true);
+	}
+
+	/**
+	 * Tries to find the package manifest file
+	 *
+	 * @return  boolean  True on success, False on error
+	 *
+	 * @since   3.1
+	 */
+	public function findManifest()
+	{
+		// Do nothing if folder does not exist for some reason
+		if (!\JFolder::exists($this->getPath('source')))
+		{
+			return false;
+		}
+
+		// Main folder manifests (higher priority)
+		$parentXmlfiles = \JFolder::files($this->getPath('source'), '.xml$', false, true);
+
+		// Search for children manifests (lower priority)
+		$allXmlFiles    = \JFolder::files($this->getPath('source'), '.xml$', 1, true);
+
+		// Create an unique array of files ordered by priority
+		$xmlfiles = array_unique(array_merge($parentXmlfiles, $allXmlFiles));
+
+		// If at least one XML file exists
+		if (!empty($xmlfiles))
+		{
+			foreach ($xmlfiles as $file)
+			{
+				// Is it a valid Joomla installation manifest file?
+				$manifest = $this->isManifest($file);
+
+				if ($manifest !== null)
+				{
+					// If the root method attribute is set to upgrade, allow file overwrite
+					if ((string) $manifest->attributes()->method === 'upgrade')
+					{
+						$this->upgrade = true;
+						$this->overwrite = true;
+					}
+
+					// If the overwrite option is set, allow file overwriting
+					if ((string) $manifest->attributes()->overwrite === 'true')
+					{
+						$this->overwrite = true;
+					}
+
+					// Set the manifest object and path
+					$this->manifest = $manifest;
+					$this->setPath('manifest', $file);
+
+					// Set the installation source path to that of the manifest file
+					$this->setPath('source', dirname($file));
+
+					return true;
+				}
+			}
+
+			// None of the XML files found were valid install files
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+		else
+		{
+			// No XML files were found in the install folder
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_NOTFINDXMLSETUPFILE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Is the XML file a valid Joomla installation manifest file.
+	 *
+	 * @param   string  $file  An xmlfile path to check
+	 *
+	 * @return  \SimpleXMLElement|null  A \SimpleXMLElement, or null if the file failed to parse
+	 *
+	 * @since   3.1
+	 */
+	public function isManifest($file)
+	{
+		$xml = simplexml_load_file($file);
+
+		// If we cannot load the XML file return null
+		if (!$xml)
+		{
+			return;
+		}
+
+		// Check for a valid XML root tag.
+		if ($xml->getName() !== 'extension')
+		{
+			return;
+		}
+
+		// Valid manifest file return the object
+		return $xml;
+	}
+
+	/**
+	 * Generates a manifest cache
+	 *
+	 * @return string serialised manifest data
+	 *
+	 * @since   3.1
+	 */
+	public function generateManifestCache()
+	{
+		return json_encode(self::parseXMLInstallFile($this->getPath('manifest')));
+	}
+
+	/**
+	 * Cleans up discovered extensions if they're being installed some other way
+	 *
+	 * @param   string   $type     The type of extension (component, etc)
+	 * @param   string   $element  Unique element identifier (e.g. com_content)
+	 * @param   string   $folder   The folder of the extension (plugins; e.g. system)
+	 * @param   integer  $client   The client application (administrator or site)
+	 *
+	 * @return  object    Result of query
+	 *
+	 * @since   3.1
+	 */
+	public function cleanDiscoveredExtension($type, $element, $folder = '', $client = 0)
+	{
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->delete($db->quoteName('#__extensions'))
+			->where('type = ' . $db->quote($type))
+			->where('element = ' . $db->quote($element))
+			->where('folder = ' . $db->quote($folder))
+			->where('client_id = ' . (int) $client)
+			->where('state = -1');
+		$db->setQuery($query);
+
+		return $db->execute();
+	}
+
+	/**
+	 * Compares two "files" entries to find deleted files/folders
+	 *
+	 * @param   array  $old_files  An array of \SimpleXMLElement objects that are the old files
+	 * @param   array  $new_files  An array of \SimpleXMLElement objects that are the new files
+	 *
+	 * @return  array  An array with the delete files and folders in findDeletedFiles[files] and findDeletedFiles[folders] respectively
+	 *
+	 * @since   3.1
+	 */
+	public function findDeletedFiles($old_files, $new_files)
+	{
+		// The magic find deleted files function!
+		// The files that are new
+		$files = array();
+
+		// The folders that are new
+		$folders = array();
+
+		// The folders of the files that are new
+		$containers = array();
+
+		// A list of files to delete
+		$files_deleted = array();
+
+		// A list of folders to delete
+		$folders_deleted = array();
+
+		foreach ($new_files as $file)
+		{
+			switch ($file->getName())
+			{
+				case 'folder':
+					// Add any folders to the list
+					$folders[] = (string) $file; // add any folders to the list
+					break;
+
+				case 'file':
+				default:
+					// Add any files to the list
+					$files[] = (string) $file;
+
+					// Now handle the folder part of the file to ensure we get any containers
+					// Break up the parts of the directory
+					$container_parts = explode('/', dirname((string) $file));
+
+					// Make sure this is clean and empty
+					$container = '';
+
+					foreach ($container_parts as $part)
+					{
+						// Iterate through each part
+						// Add a slash if its not empty
+						if (!empty($container))
+						{
+							$container .= '/';
+						}
+
+						// Aappend the folder part
+						$container .= $part;
+
+						if (!in_array($container, $containers))
+						{
+							// Add the container if it doesn't already exist
+							$containers[] = $container;
+						}
+					}
+					break;
+			}
+		}
+
+		foreach ($old_files as $file)
+		{
+			switch ($file->getName())
+			{
+				case 'folder':
+					if (!in_array((string) $file, $folders))
+					{
+						// See whether the folder exists in the new list
+						if (!in_array((string) $file, $containers))
+						{
+							// Check if the folder exists as a container in the new list
+							// If it's not in the new list or a container then delete it
+							$folders_deleted[] = (string) $file;
+						}
+					}
+					break;
+
+				case 'file':
+				default:
+					if (!in_array((string) $file, $files))
+					{
+						// Look if the file exists in the new list
+						if (!in_array(dirname((string) $file), $folders))
+						{
+							// Look if the file is now potentially in a folder
+							$files_deleted[] = (string) $file; // not in a folder, doesn't exist, wipe it out!
+						}
+					}
+					break;
+			}
+		}
+
+		return array('files' => $files_deleted, 'folders' => $folders_deleted);
+	}
+
+	/**
+	 * Loads an MD5SUMS file into an associative array
+	 *
+	 * @param   string  $filename  Filename to load
+	 *
+	 * @return  array  Associative array with filenames as the index and the MD5 as the value
+	 *
+	 * @since   3.1
+	 */
+	public function loadMD5Sum($filename)
+	{
+		if (!file_exists($filename))
+		{
+			// Bail if the file doesn't exist
+			return false;
+		}
+
+		$data = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+		$retval = array();
+
+		foreach ($data as $row)
+		{
+			// Split up the data
+			$results = explode('  ', $row);
+
+			// Cull any potential prefix
+			$results[1] = str_replace('./', '', $results[1]);
+
+			// Throw into the array
+			$retval[$results[1]] = $results[0];
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Parse a XML install manifest file.
+	 *
+	 * XML Root tag should be 'install' except for languages which use meta file.
+	 *
+	 * @param   string  $path  Full path to XML file.
+	 *
+	 * @return  array  XML metadata.
+	 *
+	 * @since   12.1
+	 */
+	public static function parseXMLInstallFile($path)
+	{
+		// Check if xml file exists.
+		if (!file_exists($path))
+		{
+			return false;
+		}
+
+		// Read the file to see if it's a valid component XML file
+		$xml = simplexml_load_file($path);
+
+		if (!$xml)
+		{
+			return false;
+		}
+
+		// Check for a valid XML root tag.
+
+		// Extensions use 'extension' as the root tag.  Languages use 'metafile' instead
+
+		$name = $xml->getName();
+
+		if ($name !== 'extension' && $name !== 'metafile')
+		{
+			unset($xml);
+
+			return false;
+		}
+
+		$data = array();
+
+		$data['name'] = (string) $xml->name;
+
+		// Check if we're a language. If so use metafile.
+		$data['type'] = $xml->getName() === 'metafile' ? 'language' : (string) $xml->attributes()->type;
+
+		$data['creationDate'] = ((string) $xml->creationDate) ?: \JText::_('JLIB_UNKNOWN');
+		$data['author'] = ((string) $xml->author) ?: \JText::_('JLIB_UNKNOWN');
+
+		$data['copyright'] = (string) $xml->copyright;
+		$data['authorEmail'] = (string) $xml->authorEmail;
+		$data['authorUrl'] = (string) $xml->authorUrl;
+		$data['version'] = (string) $xml->version;
+		$data['description'] = (string) $xml->description;
+		$data['group'] = (string) $xml->group;
+
+		if ($xml->files && count($xml->files->children()))
+		{
+			$filename = \JFile::getName($path);
+			$data['filename'] = \JFile::stripExt($filename);
+
+			foreach ($xml->files->children() as $oneFile)
+			{
+				if ((string) $oneFile->attributes()->plugin)
+				{
+					$data['filename'] = (string) $oneFile->attributes()->plugin;
+					break;
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Fetches an adapter and adds it to the internal storage if an instance is not set
+	 * while also ensuring its a valid adapter name
+	 *
+	 * @param   string  $name     Name of adapter to return
+	 * @param   array   $options  Adapter options
+	 *
+	 * @return  InstallerAdapter
+	 *
+	 * @since       3.4
+	 * @deprecated  4.0  The internal adapter cache will no longer be supported,
+	 *                   use loadAdapter() to fetch an adapter instance
+	 */
+	public function getAdapter($name, $options = array())
+	{
+		$this->getAdapters($options);
+
+		if (!$this->setAdapter($name, $this->_adapters[$name]))
+		{
+			return false;
+		}
+
+		return $this->_adapters[$name];
+	}
+
+	/**
+	 * Gets a list of available install adapters.
+	 *
+	 * @param   array  $options  An array of options to inject into the adapter
+	 * @param   array  $custom   Array of custom install adapters
+	 *
+	 * @return  array  An array of available install adapters.
+	 *
+	 * @since   3.4
+	 * @note    As of 4.0, this method will only return the names of available adapters and will not
+	 *          instantiate them and store to the $_adapters class var.
+	 */
+	public function getAdapters($options = array(), array $custom = array())
+	{
+		$files = new \DirectoryIterator($this->_basepath . '/' . $this->_adapterfolder);
+
+		// Process the core adapters
+		foreach ($files as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() !== 'php')
+			{
+				continue;
+			}
+
+			// Derive the class name from the filename.
+			$name  = str_ireplace('.php', '', trim($fileName));
+			$name  = str_ireplace('adapter', '', trim($name));
+			$class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name) . 'Adapter';
+
+			if (!class_exists($class))
+			{
+				// Not namespaced
+				$class = $this->_classprefix . ucfirst($name);
+			}
+
+			// Core adapters should autoload based on classname, keep this fallback just in case
+			if (!class_exists($class))
+			{
+				// Try to load the adapter object
+				\JLoader::register($class, $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName);
+
+				if (!class_exists($class))
+				{
+					// Skip to next one
+					continue;
+				}
+			}
+
+			$this->_adapters[strtolower($name)] = $this->loadAdapter($name, $options);
+		}
+
+		// Add any custom adapters if specified
+		if (count($custom) >= 1)
+		{
+			foreach ($custom as $adapter)
+			{
+				// Setup the class name
+				// TODO - Can we abstract this to not depend on the Joomla class namespace without PHP namespaces?
+				$class = $this->_classprefix . ucfirst(trim($adapter));
+
+				// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+				if (!class_exists($class))
+				{
+					continue;
+				}
+
+				$this->_adapters[$name] = $this->loadAdapter($name, $options);
+			}
+		}
+
+		return $this->_adapters;
+	}
+
+	/**
+	 * Method to load an adapter instance
+	 *
+	 * @param   string  $adapter  Adapter name
+	 * @param   array   $options  Adapter options
+	 *
+	 * @return  InstallerAdapter
+	 *
+	 * @since   3.4
+	 * @throws  \InvalidArgumentException
+	 */
+	public function loadAdapter($adapter, $options = array())
+	{
+		$class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($adapter) . 'Adapter';
+
+		if (!class_exists($class))
+		{
+			// Not namespaced
+			$class = $this->_classprefix . ucfirst($adapter);
+		}
+
+		if (!class_exists($class))
+		{
+			// @deprecated 4.0 - The adapter should be autoloaded or manually included by the caller
+			$path = $this->_basepath . '/' . $this->_adapterfolder . '/' . $adapter . '.php';
+
+			// Try to load the adapter object
+			if (!file_exists($path))
+			{
+				throw new \InvalidArgumentException(sprintf('The %s install adapter does not exist.', $adapter));
+			}
+
+			// Try once more to find the class
+			\JLoader::register($class, $path);
+
+			if (!class_exists($class))
+			{
+				throw new \InvalidArgumentException(sprintf('The %s install adapter does not exist.', $adapter));
+			}
+		}
+
+		// Ensure the adapter type is part of the options array
+		$options['type'] = $adapter;
+
+		return new $class($this, $this->getDbo(), $options);
+	}
+
+	/**
+	 * Loads all adapters.
+	 *
+	 * @param   array  $options  Adapter options
+	 *
+	 * @return  void
+	 *
+	 * @since       3.4
+	 * @deprecated  4.0  Individual adapters should be instantiated as needed
+	 * @note        This method is serving as a proxy of the legacy \JAdapter API into the preferred API
+	 */
+	public function loadAllAdapters($options = array())
+	{
+		$this->getAdapters($options);
+	}
+}
diff --git a/core/libraries/src/Installer/InstallerAdapter.php b/core/libraries/src/Installer/InstallerAdapter.php
new file mode 100644
index 00000000..cf03eedc
--- /dev/null
+++ b/core/libraries/src/Installer/InstallerAdapter.php
@@ -0,0 +1,1099 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Installer\Manifest\PackageManifest;
+use Joomla\CMS\Table\Extension;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\TableInterface;
+
+\JLoader::import('joomla.base.adapterinstance');
+
+/**
+ * Abstract adapter for the installer.
+ *
+ * @method         Installer  getParent()  Retrieves the parent object.
+ * @property-read  Installer  $parent      Parent object
+ *
+ * @since  3.4
+ * @note   As of 4.0, this class will no longer extend from JAdapterInstance
+ */
+abstract class InstallerAdapter extends \JAdapterInstance
+{
+	/**
+	 * ID for the currently installed extension if present
+	 *
+	 * @var    integer
+	 * @since  3.4
+	 */
+	protected $currentExtensionId = null;
+
+	/**
+	 * The unique identifier for the extension (e.g. mod_login)
+	 *
+	 * @var    string
+	 * @since  3.4
+	 * */
+	protected $element = null;
+
+	/**
+	 * Extension object.
+	 *
+	 * @var    Extension
+	 * @since  3.4
+	 * */
+	protected $extension = null;
+
+	/**
+	 * Messages rendered by custom scripts
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $extensionMessage = '';
+
+	/**
+	 * Copy of the XML manifest file.
+	 *
+	 * Making this object public allows extensions to customize the manifest in custom scripts.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	public $manifest = null;
+
+	/**
+	 * A path to the PHP file that the scriptfile declaration in the manifest refers to.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $manifest_script = null;
+
+	/**
+	 * Name of the extension
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $name = null;
+
+	/**
+	 * Install function routing
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $route = 'install';
+
+	/**
+	 * Flag if the adapter supports discover installs
+	 *
+	 * Adapters should override this and set to false if discover install is unsupported
+	 *
+	 * @var    boolean
+	 * @since  3.4
+	 */
+	protected $supportsDiscoverInstall = true;
+
+	/**
+	 * The type of adapter in use
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $type;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   Installer         $parent   Parent object
+	 * @param   \JDatabaseDriver  $db       Database object
+	 * @param   array             $options  Configuration Options
+	 *
+	 * @since   3.4
+	 */
+	public function __construct(Installer $parent, \JDatabaseDriver $db, array $options = array())
+	{
+		parent::__construct($parent, $db, $options);
+
+		// Get a generic TableExtension instance for use if not already loaded
+		if (!($this->extension instanceof TableInterface))
+		{
+			$this->extension = Table::getInstance('extension');
+		}
+
+		// Sanity check, make sure the type is set by taking the adapter name from the class name
+		if (!$this->type)
+		{
+			// This assumes the adapter short class name in its namespace is `<foo>Adapter`, replace this logic in subclasses if needed
+			$reflection = new \ReflectionClass(get_called_class());
+			$this->type = strtolower(str_replace('Adapter', '', $reflection->getShortName()));
+		}
+	}
+
+	/**
+	 * Check if a package extension allows its child extensions to be uninstalled individually
+	 *
+	 * @param   integer  $packageId  The extension ID of the package to check
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 * @note    This method defaults to true to emulate the behavior of 3.6 and earlier which did not support this lookup
+	 */
+	protected function canUninstallPackageChild($packageId)
+	{
+		$package = Table::getInstance('extension');
+
+		// If we can't load this package ID, we have a corrupt database
+		if (!$package->load((int) $packageId))
+		{
+			return true;
+		}
+
+		$manifestFile = JPATH_MANIFESTS . '/packages/' . $package->element . '.xml';
+
+		$xml = $this->parent->isManifest($manifestFile);
+
+		// If the manifest doesn't exist, we've got some major issues
+		if (!$xml)
+		{
+			return true;
+		}
+
+		$manifest = new PackageManifest($manifestFile);
+
+		return $manifest->blockChildUninstall === false;
+	}
+
+	/**
+	 * Method to check if the extension is already present in the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExistingExtension()
+	{
+		// Extension type is stored as lowercase on the #__extensions table field type
+		$this->type = strtolower($this->type);
+
+		try
+		{
+			$this->currentExtensionId = $this->extension->find(
+				array('element' => $this->element, 'type' => $this->type)
+			);
+
+			// If it does exist, load it
+			if ($this->currentExtensionId)
+			{
+				$this->extension->load(array('element' => $this->element, 'type' => $this->type));
+			}
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			throw new \RuntimeException(
+				\JText::sprintf(
+					'JLIB_INSTALLER_ABORT_ROLLBACK',
+					\JText::_('JLIB_INSTALLER_' . $this->route),
+					$e->getMessage()
+				),
+				$e->getCode(),
+				$e
+			);
+		}
+	}
+
+	/**
+	 * Method to check if the extension is present in the filesystem, flags the route as update if so
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function checkExtensionInFilesystem()
+	{
+		if (file_exists($this->parent->getPath('extension_root')) && (!$this->parent->isOverwrite() || $this->parent->isUpgrade()))
+		{
+			// Look for an update function or update tag
+			$updateElement = $this->getManifest()->update;
+
+			// Upgrade manually set or update function available or update tag detected
+			if ($updateElement || $this->parent->isUpgrade()
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update')))
+			{
+				// Force this one
+				$this->parent->setOverwrite(true);
+				$this->parent->setUpgrade(true);
+
+				if ($this->currentExtensionId)
+				{
+					// If there is a matching extension mark this as an update
+					$this->setRoute('update');
+				}
+			}
+			elseif (!$this->parent->isOverwrite())
+			{
+				// We didn't have overwrite set, find an update function or find an update tag so lets call it safe
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_DIRECTORY',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->type,
+						$this->parent->getPath('extension_root')
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	abstract protected function copyBaseFiles();
+
+	/**
+	 * Method to create the extension root path if necessary
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function createExtensionRoot()
+	{
+		// If the extension directory does not exist, lets create it
+		$created = false;
+
+		if (!file_exists($this->parent->getPath('extension_root')))
+		{
+			if (!$created = \JFolder::create($this->parent->getPath('extension_root')))
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_CREATE_DIRECTORY',
+						\JText::_('JLIB_INSTALLER_' . $this->route),
+						$this->parent->getPath('extension_root')
+					)
+				);
+			}
+		}
+
+		/*
+		 * Since we created the extension directory and will want to remove it if
+		 * we have to roll back the installation, let's add it to the
+		 * installation step stack
+		 */
+
+		if ($created)
+		{
+			$this->parent->pushStep(
+				array(
+					'type' => 'folder',
+					'path' => $this->parent->getPath('extension_root'),
+				)
+			);
+		}
+	}
+
+	/**
+	 * Generic discover_install method for extensions
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.4
+	 */
+	public function discover_install()
+	{
+		// Get the extension's description
+		$description = (string) $this->getManifest()->description;
+
+		if ($description)
+		{
+			$this->parent->message = \JText::_($description);
+		}
+		else
+		{
+			$this->parent->message = '';
+		}
+
+		// Set the extension's name and element
+		$this->name    = $this->getName();
+		$this->element = $this->getElement();
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Extension Precheck and Setup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Setup the install paths and perform other prechecks as necessary
+		try
+		{
+			$this->setupInstallPaths();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Installer Trigger Loading
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		$this->setupScriptfile();
+
+		try
+		{
+			$this->triggerManifestScript('preflight');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Database Processing Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		try
+		{
+			$this->storeExtension();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		try
+		{
+			$this->parseQueries();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// Run the custom install method
+		try
+		{
+			$this->triggerManifestScript('install');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Finalization and Cleanup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		try
+		{
+			$this->finaliseInstall();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// And now we run the postflight
+		try
+		{
+			$this->triggerManifestScript('postflight');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		return $this->extension->extension_id;
+	}
+
+	/**
+	 * Method to handle database transactions for the installer
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function doDatabaseTransactions()
+	{
+		$route = $this->route === 'discover_install' ? 'install' : $this->route;
+
+		// Let's run the install queries for the component
+		if (isset($this->getManifest()->{$route}->sql))
+		{
+			$result = $this->parent->parseSQLFiles($this->getManifest()->{$route}->sql);
+
+			if ($result === false)
+			{
+				// Only rollback if installing
+				if ($route === 'install')
+				{
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_SQL_ERROR',
+							\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+							$this->parent->getDbo()->stderr(true)
+						)
+					);
+				}
+
+				return false;
+			}
+
+			// If installing with success and there is an uninstall script, add a installer rollback step to rollback if needed
+			if ($route === 'install' && isset($this->getManifest()->uninstall->sql))
+			{
+				$this->parent->pushStep(array('type' => 'query', 'script' => $this->getManifest()->uninstall->sql));
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Load language files
+	 *
+	 * @param   string  $extension  The name of the extension
+	 * @param   string  $source     Path to the extension
+	 * @param   string  $base       Base path for the extension language
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function doLoadLanguage($extension, $source, $base = JPATH_ADMINISTRATOR)
+	{
+		$lang = \JFactory::getLanguage();
+		$lang->load($extension . '.sys', $source, null, false, true) || $lang->load($extension . '.sys', $base, null, false, true);
+	}
+
+	/**
+	 * Checks if the adapter supports discover_install
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4
+	 */
+	public function getDiscoverInstallSupported()
+	{
+		return $this->supportsDiscoverInstall;
+	}
+
+	/**
+	 * Get the filtered extension element from the manifest
+	 *
+	 * @param   string  $element  Optional element name to be converted
+	 *
+	 * @return  string  The filtered element
+	 *
+	 * @since   3.4
+	 */
+	public function getElement($element = null)
+	{
+		if (!$element)
+		{
+			// Ensure the element is a string
+			$element = (string) $this->getManifest()->element;
+		}
+
+		if (!$element)
+		{
+			$element = $this->getName();
+		}
+
+		// Filter the name for illegal characters
+		return strtolower(\JFilterInput::getInstance()->clean($element, 'cmd'));
+	}
+
+	/**
+	 * Get the manifest object.
+	 *
+	 * @return  \SimpleXMLElement  Manifest object
+	 *
+	 * @since   3.4
+	 */
+	public function getManifest()
+	{
+		return $this->manifest;
+	}
+
+	/**
+	 * Get the filtered component name from the manifest
+	 *
+	 * @return  string  The filtered name
+	 *
+	 * @since   3.4
+	 */
+	public function getName()
+	{
+		// Ensure the name is a string
+		$name = (string) $this->getManifest()->name;
+
+		// Filter the name for illegal characters
+		$name = \JFilterInput::getInstance()->clean($name, 'string');
+
+		return $name;
+	}
+
+	/**
+	 * Get the install route being followed
+	 *
+	 * @return  string  The install route
+	 *
+	 * @since   3.4
+	 */
+	public function getRoute()
+	{
+		return $this->route;
+	}
+
+	/**
+	 * Get the class name for the install adapter script.
+	 *
+	 * @return  string  The class name.
+	 *
+	 * @since   3.4
+	 */
+	protected function getScriptClassName()
+	{
+		// Support element names like 'en-GB'
+		$className = \JFilterInput::getInstance()->clean($this->element, 'cmd') . 'InstallerScript';
+
+		// Cannot have - in class names
+		$className = str_replace('-', '', $className);
+
+		return $className;
+	}
+
+	/**
+	 * Generic install method for extensions
+	 *
+	 * @return  boolean|integer  The extension ID on success, boolean false on failure
+	 *
+	 * @since   3.4
+	 */
+	public function install()
+	{
+		// Get the extension's description
+		$description = (string) $this->getManifest()->description;
+
+		if ($description)
+		{
+			$this->parent->message = \JText::_($description);
+		}
+		else
+		{
+			$this->parent->message = '';
+		}
+
+		// Set the extension's name and element
+		$this->name    = $this->getName();
+		$this->element = $this->getElement();
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Extension Precheck and Setup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// Setup the install paths and perform other prechecks as necessary
+		try
+		{
+			$this->setupInstallPaths();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// Check to see if an extension by the same name is already installed.
+		try
+		{
+			$this->checkExistingExtension();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// Check if the extension is present in the filesystem
+		try
+		{
+			$this->checkExtensionInFilesystem();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// If we are on the update route, run any custom setup routines
+		if ($this->route === 'update')
+		{
+			try
+			{
+				$this->setupUpdates();
+			}
+			catch (\RuntimeException $e)
+			{
+				// Install failed, roll back changes
+				$this->parent->abort($e->getMessage());
+
+				return false;
+			}
+		}
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Installer Trigger Loading
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		$this->setupScriptfile();
+
+		try
+		{
+			$this->triggerManifestScript('preflight');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Filesystem Processing Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		// If the extension directory does not exist, lets create it
+		try
+		{
+			$this->createExtensionRoot();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// Copy all necessary files
+		try
+		{
+			$this->copyBaseFiles();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// Parse optional tags
+		$this->parseOptionalTags();
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Database Processing Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		try
+		{
+			$this->storeExtension();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		try
+		{
+			$this->parseQueries();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// Run the custom method based on the route
+		try
+		{
+			$this->triggerManifestScript($this->route);
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		/*
+		 * ---------------------------------------------------------------------------------------------
+		 * Finalization and Cleanup Section
+		 * ---------------------------------------------------------------------------------------------
+		 */
+
+		try
+		{
+			$this->finaliseInstall();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		// And now we run the postflight
+		try
+		{
+			$this->triggerManifestScript('postflight');
+		}
+		catch (\RuntimeException $e)
+		{
+			// Install failed, roll back changes
+			$this->parent->abort($e->getMessage());
+
+			return false;
+		}
+
+		return $this->extension->extension_id;
+	}
+
+	/**
+	 * Method to parse the queries specified in the `<sql>` tags
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function parseQueries()
+	{
+		// Let's run the queries for the extension
+		if (in_array($this->route, array('install', 'discover_install', 'uninstall')))
+		{
+			// This method may throw an exception, but it is caught by the parent caller
+			if (!$this->doDatabaseTransactions())
+			{
+				throw new \RuntimeException(
+					\JText::sprintf(
+						'JLIB_INSTALLER_ABORT_SQL_ERROR',
+						\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+						$this->db->stderr(true)
+					)
+				);
+			}
+
+			// Set the schema version to be the latest update version
+			if ($this->getManifest()->update)
+			{
+				$this->parent->setSchemaVersion($this->getManifest()->update->schemas, $this->extension->extension_id);
+			}
+		}
+		elseif ($this->route === 'update')
+		{
+			if ($this->getManifest()->update)
+			{
+				$result = $this->parent->parseSchemaUpdates($this->getManifest()->update->schemas, $this->extension->extension_id);
+
+				if ($result === false)
+				{
+					// Install failed, rollback changes
+					throw new \RuntimeException(
+						\JText::sprintf(
+							'JLIB_INSTALLER_ABORT_SQL_ERROR',
+							\JText::_('JLIB_INSTALLER_' . strtoupper($this->route)),
+							$this->db->stderr(true)
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to parse optional tags in the manifest
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function parseOptionalTags()
+	{
+		// Some extensions may not have optional tags
+	}
+
+	/**
+	 * Prepares the adapter for a discover_install task
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function prepareDiscoverInstall()
+	{
+		// Adapters may not support discover install or may have overridden the default task and aren't using this
+	}
+
+	/**
+	 * Set the manifest object.
+	 *
+	 * @param   object  $manifest  The manifest object
+	 *
+	 * @return  InstallerAdapter  Instance of this class to support chaining
+	 *
+	 * @since   3.4
+	 */
+	public function setManifest($manifest)
+	{
+		$this->manifest = $manifest;
+
+		return $this;
+	}
+
+	/**
+	 * Set the install route being followed
+	 *
+	 * @param   string  $route  The install route being followed
+	 *
+	 * @return  InstallerAdapter  Instance of this class to support chaining
+	 *
+	 * @since   3.4
+	 */
+	public function setRoute($route)
+	{
+		$this->route = $route;
+
+		return $this;
+	}
+
+	/**
+	 * Method to do any prechecks and setup the install paths for the extension
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	abstract protected function setupInstallPaths();
+
+	/**
+	 * Setup the manifest script file for those adapters that use it.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function setupScriptfile()
+	{
+		// If there is a manifest class file, lets load it; we'll copy it later (don't have dest yet)
+		$manifestScript = (string) $this->getManifest()->scriptfile;
+
+		if ($manifestScript)
+		{
+			$manifestScriptFile = $this->parent->getPath('source') . '/' . $manifestScript;
+
+			$classname = $this->getScriptClassName();
+
+			\JLoader::register($classname, $manifestScriptFile);
+
+			if (class_exists($classname))
+			{
+				// Create a new instance
+				$this->parent->manifestClass = new $classname($this);
+
+				// And set this so we can copy it later
+				$this->manifest_script = $manifestScript;
+			}
+		}
+	}
+
+	/**
+	 * Method to setup the update routine for the adapter
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	protected function setupUpdates()
+	{
+		// Some extensions may not have custom setup routines for updates
+	}
+
+	/**
+	 * Method to store the extension to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	abstract protected function storeExtension();
+
+	/**
+	 * Executes a custom install script method
+	 *
+	 * @param   string  $method  The install method to execute
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 */
+	protected function triggerManifestScript($method)
+	{
+		ob_start();
+		ob_implicit_flush(false);
+
+		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, $method))
+		{
+			switch ($method)
+			{
+				// The preflight and postflight take the route as a param
+				case 'preflight' :
+				case 'postflight' :
+					if ($this->parent->manifestClass->$method($this->route, $this) === false)
+					{
+						if ($method !== 'postflight')
+						{
+							// Clean and close the output buffer
+							ob_end_clean();
+
+							// The script failed, rollback changes
+							throw new \RuntimeException(
+								\JText::sprintf(
+									'JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE',
+									\JText::_('JLIB_INSTALLER_' . $this->route)
+								)
+							);
+						}
+					}
+					break;
+
+				// The install, uninstall, and update methods only pass this object as a param
+				case 'install' :
+				case 'uninstall' :
+				case 'update' :
+					if ($this->parent->manifestClass->$method($this) === false)
+					{
+						if ($method !== 'uninstall')
+						{
+							// Clean and close the output buffer
+							ob_end_clean();
+
+							// The script failed, rollback changes
+							throw new \RuntimeException(
+								\JText::sprintf(
+									'JLIB_INSTALLER_ABORT_INSTALL_CUSTOM_INSTALL_FAILURE',
+									\JText::_('JLIB_INSTALLER_' . $this->route)
+								)
+							);
+						}
+					}
+					break;
+			}
+		}
+
+		// Append to the message object
+		$this->extensionMessage .= ob_get_clean();
+
+		// If in postflight or uninstall, set the message for display
+		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage !== '')
+		{
+			$this->parent->set('extension_message', $this->extensionMessage);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Generic update method for extensions
+	 *
+	 * @return  boolean|integer  The extension ID on success, boolean false on failure
+	 *
+	 * @since   3.4
+	 */
+	public function update()
+	{
+		// Set the overwrite setting
+		$this->parent->setOverwrite(true);
+		$this->parent->setUpgrade(true);
+
+		// And make sure the route is set correctly
+		$this->setRoute('update');
+
+		// Now jump into the install method to run the update
+		return $this->install();
+	}
+}
diff --git a/core/libraries/src/Installer/InstallerExtension.php b/core/libraries/src/Installer/InstallerExtension.php
new file mode 100644
index 00000000..db5d4a73
--- /dev/null
+++ b/core/libraries/src/Installer/InstallerExtension.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+
+/**
+ * Extension object
+ *
+ * @since  3.1
+ */
+class InstallerExtension extends \JObject
+{
+	/**
+	 * Filename of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $filename = '';
+
+	/**
+	 * Type of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $type = '';
+
+	/**
+	 * Unique Identifier for the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $id = '';
+
+	/**
+	 * The status of the extension
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	public $published = false;
+
+	/**
+	 * String representation of client. Valid for modules, templates and languages.
+	 * Set by default to site.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $client = 'site';
+
+	/**
+	 * The group name of the plugin. Not used for other known extension types (only plugins)
+	 *
+	 * @var string
+	 * @since  3.1
+	 */
+	public $group = '';
+
+	/**
+	 * An object representation of the manifest file stored metadata
+	 *
+	 * @var object
+	 * @since  3.1
+	 */
+	public $manifest_cache = null;
+
+	/**
+	 * An object representation of the extension params
+	 *
+	 * @var    object
+	 * @since  3.1
+	 */
+	public $params = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   \SimpleXMLElement  $element  A SimpleXMLElement from which to load data from
+	 *
+	 * @since  3.1
+	 */
+	public function __construct(\SimpleXMLElement $element = null)
+	{
+		if ($element)
+		{
+			$this->type = (string) $element->attributes()->type;
+			$this->id = (string) $element->attributes()->id;
+
+			switch ($this->type)
+			{
+				case 'component':
+					// By default a component doesn't have anything
+					break;
+
+				case 'module':
+				case 'template':
+				case 'language':
+					$this->client = (string) $element->attributes()->client;
+					$tmp_client_id = ApplicationHelper::getClientInfo($this->client, 1);
+
+					if ($tmp_client_id == null)
+					{
+						\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_EXTENSION_INVALID_CLIENT_IDENTIFIER'), \JLog::WARNING, 'jerror');
+					}
+					else
+					{
+						$this->client_id = $tmp_client_id->id;
+					}
+					break;
+
+				case 'plugin':
+					$this->group = (string) $element->attributes()->group;
+					break;
+
+				default:
+					// Catch all
+					// Get and set client and group if we don't recognise the extension
+					if ($element->attributes()->client)
+					{
+						$this->client_id = ApplicationHelper::getClientInfo($this->client, 1);
+						$this->client_id = $this->client_id->id;
+					}
+
+					if ($element->attributes()->group)
+					{
+						$this->group = (string) $element->attributes()->group;
+					}
+					break;
+			}
+
+			$this->filename = (string) $element;
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/InstallerHelper.php b/core/libraries/src/Installer/InstallerHelper.php
new file mode 100644
index 00000000..cc8d9ade
--- /dev/null
+++ b/core/libraries/src/Installer/InstallerHelper.php
@@ -0,0 +1,336 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Archive\Archive;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Version;
+
+\JLoader::import('joomla.filesystem.file');
+\JLoader::import('joomla.filesystem.folder');
+\JLoader::import('joomla.filesystem.path');
+
+/**
+ * Installer helper class
+ *
+ * @since  3.1
+ */
+abstract class InstallerHelper
+{
+	/**
+	 * Downloads a package
+	 *
+	 * @param   string  $url     URL of file to download
+	 * @param   mixed   $target  Download target filename or false to get the filename from the URL
+	 *
+	 * @return  string|boolean  Path to downloaded package or boolean false on failure
+	 *
+	 * @since   3.1
+	 */
+	public static function downloadPackage($url, $target = false)
+	{
+		// Capture PHP errors
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		// Set user agent
+		$version = new Version;
+		ini_set('user_agent', $version->getUserAgent('Installer'));
+
+		// Load installer plugins, and allow URL and headers modification
+		$headers = array();
+		PluginHelper::importPlugin('installer');
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger('onInstallerBeforePackageDownload', array(&$url, &$headers));
+
+		try
+		{
+			$response = \JHttpFactory::getHttp()->get($url, $headers);
+		}
+		catch (\RuntimeException $exception)
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', $exception->getMessage()), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		if (302 == $response->code && isset($response->headers['Location']))
+		{
+			return self::downloadPackage($response->headers['Location']);
+		}
+		elseif (200 != $response->code)
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', $response->code), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Parse the Content-Disposition header to get the file name
+		if (isset($response->headers['Content-Disposition'])
+			&& preg_match("/\s*filename\s?=\s?(.*)/", $response->headers['Content-Disposition'], $parts))
+		{
+			$flds = explode(';', $parts[1]);
+			$target = trim($flds[0], '"');
+		}
+
+		$tmpPath = \JFactory::getConfig()->get('tmp_path');
+
+		// Set the target path if not given
+		if (!$target)
+		{
+			$target = $tmpPath . '/' . self::getFilenameFromUrl($url);
+		}
+		else
+		{
+			$target = $tmpPath . '/' . basename($target);
+		}
+
+		// Write buffer to file
+		\JFile::write($target, $response->body);
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Bump the max execution time because not using built in php zip libs are slow
+		@set_time_limit(ini_get('max_execution_time'));
+
+		// Return the name of the downloaded package
+		return basename($target);
+	}
+
+	/**
+	 * Unpacks a file and verifies it as a Joomla element package
+	 * Supports .gz .tar .tar.gz and .zip
+	 *
+	 * @param   string   $p_filename         The uploaded package filename or install directory
+	 * @param   boolean  $alwaysReturnArray  If should return false (and leave garbage behind) or return $retval['type']=false
+	 *
+	 * @return  array|boolean  Array on success or boolean false on failure
+	 *
+	 * @since   3.1
+	 */
+	public static function unpack($p_filename, $alwaysReturnArray = false)
+	{
+		// Path to the archive
+		$archivename = $p_filename;
+
+		// Temporary folder to extract the archive into
+		$tmpdir = uniqid('install_');
+
+		// Clean the paths to use for archive extraction
+		$extractdir = \JPath::clean(dirname($p_filename) . '/' . $tmpdir);
+		$archivename = \JPath::clean($archivename);
+
+		// Do the unpacking of the archive
+		try
+		{
+			$archive = new Archive(array('tmp_path' => \JFactory::getConfig()->get('tmp_path')));
+			$extract = $archive->extract($archivename, $extractdir);
+		}
+		catch (\Exception $e)
+		{
+			if ($alwaysReturnArray)
+			{
+				return array(
+					'extractdir'  => null,
+					'packagefile' => $archivename,
+					'type'        => false,
+				);
+			}
+
+			return false;
+		}
+
+		if (!$extract)
+		{
+			if ($alwaysReturnArray)
+			{
+				return array(
+					'extractdir'  => null,
+					'packagefile' => $archivename,
+					'type'        => false,
+				);
+			}
+
+			return false;
+		}
+
+		/*
+		 * Let's set the extraction directory and package file in the result array so we can
+		 * cleanup everything properly later on.
+		 */
+		$retval['extractdir'] = $extractdir;
+		$retval['packagefile'] = $archivename;
+
+		/*
+		 * Try to find the correct install directory.  In case the package is inside a
+		 * subdirectory detect this and set the install directory to the correct path.
+		 *
+		 * List all the items in the installation directory.  If there is only one, and
+		 * it is a folder, then we will set that folder to be the installation folder.
+		 */
+		$dirList = array_merge((array) \JFolder::files($extractdir, ''), (array) \JFolder::folders($extractdir, ''));
+
+		if (count($dirList) === 1)
+		{
+			if (\JFolder::exists($extractdir . '/' . $dirList[0]))
+			{
+				$extractdir = \JPath::clean($extractdir . '/' . $dirList[0]);
+			}
+		}
+
+		/*
+		 * We have found the install directory so lets set it and then move on
+		 * to detecting the extension type.
+		 */
+		$retval['dir'] = $extractdir;
+
+		/*
+		 * Get the extension type and return the directory/type array on success or
+		 * false on fail.
+		 */
+		$retval['type'] = self::detectType($extractdir);
+
+		if ($alwaysReturnArray || $retval['type'])
+		{
+			return $retval;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to detect the extension type from a package directory
+	 *
+	 * @param   string  $p_dir  Path to package directory
+	 *
+	 * @return  mixed  Extension type string or boolean false on fail
+	 *
+	 * @since   3.1
+	 */
+	public static function detectType($p_dir)
+	{
+		// Search the install dir for an XML file
+		$files = \JFolder::files($p_dir, '\.xml$', 1, true);
+
+		if (!$files || !count($files))
+		{
+			\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_NOTFINDXMLSETUPFILE'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		foreach ($files as $file)
+		{
+			$xml = simplexml_load_file($file);
+
+			if (!$xml)
+			{
+				continue;
+			}
+
+			if ($xml->getName() !== 'extension')
+			{
+				unset($xml);
+				continue;
+			}
+
+			$type = (string) $xml->attributes()->type;
+
+			// Free up memory
+			unset($xml);
+
+			return $type;
+		}
+
+		\JLog::add(\JText::_('JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE'), \JLog::WARNING, 'jerror');
+
+		// Free up memory.
+		unset($xml);
+
+		return false;
+	}
+
+	/**
+	 * Gets a file name out of a url
+	 *
+	 * @param   string  $url  URL to get name from
+	 *
+	 * @return  mixed   String filename or boolean false if failed
+	 *
+	 * @since   3.1
+	 */
+	public static function getFilenameFromUrl($url)
+	{
+		if (is_string($url))
+		{
+			$parts = explode('/', $url);
+
+			return $parts[count($parts) - 1];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Clean up temporary uploaded package and unpacked extension
+	 *
+	 * @param   string  $package    Path to the uploaded package file
+	 * @param   string  $resultdir  Path to the unpacked extension
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 */
+	public static function cleanupInstall($package, $resultdir)
+	{
+		$config = \JFactory::getConfig();
+
+		// Does the unpacked extension directory exist?
+		if ($resultdir && is_dir($resultdir))
+		{
+			\JFolder::delete($resultdir);
+		}
+
+		// Is the package file a valid file?
+		if (is_file($package))
+		{
+			\JFile::delete($package);
+		}
+		elseif (is_file(\JPath::clean($config->get('tmp_path') . '/' . $package)))
+		{
+			// It might also be just a base filename
+			\JFile::delete(\JPath::clean($config->get('tmp_path') . '/' . $package));
+		}
+	}
+
+	/**
+	 * Splits contents of a sql file into array of discreet queries.
+	 * Queries need to be delimited with end of statement marker ';'
+	 *
+	 * @param   string  $query  The SQL statement.
+	 *
+	 * @return  array  Array of queries
+	 *
+	 * @since   3.1
+	 * @deprecated  13.3  Use \JDatabaseDriver::splitSql() directly
+	 * @codeCoverageIgnore
+	 */
+	public static function splitSql($query)
+	{
+		\JLog::add('JInstallerHelper::splitSql() is deprecated. Use JDatabaseDriver::splitSql() instead.', \JLog::WARNING, 'deprecated');
+		$db = \JFactory::getDbo();
+
+		return $db->splitSql($query);
+	}
+}
diff --git a/core/libraries/src/Installer/InstallerScript.php b/core/libraries/src/Installer/InstallerScript.php
new file mode 100644
index 00000000..a3ecb19c
--- /dev/null
+++ b/core/libraries/src/Installer/InstallerScript.php
@@ -0,0 +1,358 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+defined('_JEXEC') or die;
+
+\JLoader::import('joomla.filesystem.file');
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * Base install script for use by extensions providing helper methods for common behaviours.
+ *
+ * @since  3.6
+ */
+class InstallerScript
+{
+	/**
+	 * The version number of the extension.
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $release;
+
+	/**
+	 * The table the parameters are stored in.
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $paramTable;
+
+	/**
+	 * The extension name. This should be set in the installer script.
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $extension;
+
+	/**
+	 * A list of files to be deleted
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected $deleteFiles = array();
+
+	/**
+	 * A list of folders to be deleted
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected $deleteFolders = array();
+
+	/**
+	 * A list of CLI script files to be copied to the cli directory
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected $cliScriptFiles = array();
+
+	/**
+	 * Minimum PHP version required to install the extension
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $minimumPhp;
+
+	/**
+	 * Minimum Joomla! version required to install the extension
+	 *
+	 * @var    string
+	 * @since  3.6
+	 */
+	protected $minimumJoomla;
+
+	/**
+	 * Allow downgrades of your extension
+	 *
+	 * Use at your own risk as if there is a change in functionality people may wish to downgrade.
+	 *
+	 * @var    boolean
+	 * @since  3.6
+	 */
+	protected $allowDowngrades = false;
+
+	/**
+	 * Function called before extension installation/update/removal procedure commences
+	 *
+	 * @param   string            $type    The type of change (install, update or discover_install, not uninstall)
+	 * @param   InstallerAdapter  $parent  The class calling this method
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.6
+	 */
+	public function preflight($type, $parent)
+	{
+		// Check for the minimum PHP version before continuing
+		if (!empty($this->minimumPhp) && version_compare(PHP_VERSION, $this->minimumPhp, '<'))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_MINIMUM_PHP', $this->minimumPhp), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Check for the minimum Joomla version before continuing
+		if (!empty($this->minimumJoomla) && version_compare(JVERSION, $this->minimumJoomla, '<'))
+		{
+			\JLog::add(\JText::sprintf('JLIB_INSTALLER_MINIMUM_JOOMLA', $this->minimumJoomla), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		// Extension manifest file version
+		$this->release = $parent->get('manifest')->version;
+		$extensionType = substr($this->extension, 0, 3);
+
+		// Modules parameters are located in the module table - else in the extension table
+		if ($extensionType === 'mod')
+		{
+			$this->paramTable = '#__modules';
+		}
+		else
+		{
+			$this->paramTable = '#__extensions';
+		}
+
+		// Abort if the extension being installed is not newer than the currently installed version
+		if (!$this->allowDowngrades && strtolower($type) === 'update')
+		{
+			$manifest = $this->getItemArray('manifest_cache', '#__extensions', 'element', \JFactory::getDbo()->quote($this->extension));
+			$oldRelease = $manifest['version'];
+
+			if (version_compare($this->release, $oldRelease, '<'))
+			{
+				\JFactory::getApplication()->enqueueMessage(\JText::sprintf('JLIB_INSTALLER_INCORRECT_SEQUENCE', $oldRelease, $this->release), 'error');
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets each instance of a module in the #__modules table
+	 *
+	 * @param   boolean  $isModule  True if the extension is a module as this can have multiple instances
+	 *
+	 * @return  array  An array of ID's of the extension
+	 *
+	 * @since   3.6
+	 */
+	public function getInstances($isModule)
+	{
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the item(s) and retrieve the id
+		$query->select($db->quoteName('id'));
+
+		if ($isModule)
+		{
+			$query->from($db->quoteName('#__modules'))
+				->where($db->quoteName('module') . ' = ' . $db->quote($this->extension));
+		}
+		else
+		{
+			$query->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('element') . ' = ' . $db->quote($this->extension));
+		}
+
+		// Set the query and obtain an array of id's
+		return $db->setQuery($query)->loadColumn();
+	}
+
+	/**
+	 * Gets parameter value in the extensions row of the extension table
+	 *
+	 * @param   string   $name  The name of the parameter to be retrieved
+	 * @param   integer  $id    The id of the item in the Param Table
+	 *
+	 * @return  string  The parameter desired
+	 *
+	 * @since   3.6
+	 */
+	public function getParam($name, $id = 0)
+	{
+		if (!is_int($id) || $id == 0)
+		{
+			// Return false if there is no item given
+			return false;
+		}
+
+		$params = $this->getItemArray('params', $this->paramTable, 'id', $id);
+
+		return $params[$name];
+	}
+
+	/**
+	 * Sets parameter values in the extensions row of the extension table. Note that the
+	 * this must be called separately for deleting and editing. Note if edit is called as a
+	 * type then if the param doesn't exist it will be created
+	 *
+	 * @param   array    $param_array  The array of parameters to be added/edited/removed
+	 * @param   string   $type         The type of change to be made to the param (edit/remove)
+	 * @param   integer  $id           The id of the item in the relevant table
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.6
+	 */
+	public function setParams($param_array = null, $type = 'edit', $id = 0)
+	{
+		if (!is_int($id) || $id == 0)
+		{
+			// Return false if there is no valid item given
+			return false;
+		}
+
+		$params = $this->getItemArray('params', $this->paramTable, 'id', $id);
+
+		if ($param_array)
+		{
+			foreach ($param_array as $name => $value)
+			{
+				if ($type === 'edit')
+				{
+					// Add or edit the new variable(s) to the existing params
+					if (is_array($value))
+					{
+						// Convert an array into a json encoded string
+						$params[(string) $name] = array_values($value);
+					}
+					else
+					{
+						$params[(string) $name] = (string) $value;
+					}
+				}
+				elseif ($type === 'remove')
+				{
+					// Unset the parameter from the array
+					unset($params[(string) $name]);
+				}
+			}
+		}
+
+		// Store the combined new and existing values back as a JSON string
+		$paramsString = json_encode($params);
+
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->update($db->quoteName($this->paramTable))
+			->set('params = ' . $db->quote($paramsString))
+			->where('id = ' . $id);
+
+		// Update table
+		$db->setQuery($query)->execute();
+
+		return true;
+	}
+
+	/**
+	 * Builds a standard select query to produce better DRY code in this script.
+	 * This should produce a single unique cell which is json encoded - it will then
+	 * return an associated array with this data in.
+	 *
+	 * @param   string  $element     The element to get from the query
+	 * @param   string  $table       The table to search for the data in
+	 * @param   string  $column      The column of the database to search from
+	 * @param   mixed   $identifier  The integer id or the already quoted string
+	 *
+	 * @return  array  Associated array containing data from the cell
+	 *
+	 * @since   3.6
+	 */
+	public function getItemArray($element, $table, $column, $identifier)
+	{
+		// Get the DB and query objects
+		$db = \JFactory::getDbo();
+
+		// Build the query
+		$query = $db->getQuery(true)
+			->select($db->quoteName($element))
+			->from($db->quoteName($table))
+			->where($db->quoteName($column) . ' = ' . $identifier);
+		$db->setQuery($query);
+
+		// Load the single cell and json_decode data
+		return json_decode($db->loadResult(), true);
+	}
+
+	/**
+	 * Remove the files and folders in the given array from
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 */
+	public function removeFiles()
+	{
+		if (!empty($this->deleteFiles))
+		{
+			foreach ($this->deleteFiles as $file)
+			{
+				if (file_exists(JPATH_ROOT . $file) && !\JFile::delete(JPATH_ROOT . $file))
+				{
+					echo \JText::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '<br />';
+				}
+			}
+		}
+
+		if (!empty($this->deleteFolders))
+		{
+			foreach ($this->deleteFolders as $folder)
+			{
+				if (\JFolder::exists(JPATH_ROOT . $folder) && !\JFolder::delete(JPATH_ROOT . $folder))
+				{
+					echo \JText::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '<br />';
+				}
+			}
+		}
+	}
+
+	/**
+	 * Moves the CLI scripts into the CLI folder in the CMS
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 */
+	public function moveCliFiles()
+	{
+		if (!empty($this->cliScriptFiles))
+		{
+			foreach ($this->cliScriptFiles as $file)
+			{
+				$name = basename($file);
+
+				if (file_exists(JPATH_ROOT . $file) && !\JFile::move(JPATH_ROOT . $file, JPATH_ROOT . '/cli/' . $name))
+				{
+					echo \JText::sprintf('JLIB_INSTALLER_FILE_ERROR_MOVE', $name);
+				}
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Manifest.php b/core/libraries/src/Installer/Manifest.php
new file mode 100644
index 00000000..4bf31ace
--- /dev/null
+++ b/core/libraries/src/Installer/Manifest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+defined('JPATH_PLATFORM') or die;
+
+\JLoader::import('joomla.filesystem.file');
+
+/**
+ * Joomla! Package Manifest File
+ *
+ * @since  3.1
+ */
+abstract class Manifest
+{
+	/**
+	 * Path to the manifest file
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $manifest_file = '';
+
+	/**
+	 * Name of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $name = '';
+
+	/**
+	 * Version of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $version = '';
+
+	/**
+	 * Description of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $description = '';
+
+	/**
+	 * Packager of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $packager = '';
+
+	/**
+	 * Packager's URL of the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $packagerurl = '';
+
+	/**
+	 * Update site for the extension
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $update = '';
+
+	/**
+	 * List of files in the extension
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	public $filelist = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $xmlpath  Path to XML manifest file.
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($xmlpath = '')
+	{
+		if ($xmlpath !== '')
+		{
+			$this->loadManifestFromXml($xmlpath);
+		}
+	}
+
+	/**
+	 * Load a manifest from a file
+	 *
+	 * @param   string  $xmlfile  Path to file to load
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	public function loadManifestFromXml($xmlfile)
+	{
+		$this->manifest_file = basename($xmlfile, '.xml');
+
+		$xml = simplexml_load_file($xmlfile);
+
+		if (!$xml)
+		{
+			$this->_errors[] = \JText::sprintf('JLIB_INSTALLER_ERROR_LOAD_XML', $xmlfile);
+
+			return false;
+		}
+		else
+		{
+			$this->loadManifestFromData($xml);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Apply manifest data from a \SimpleXMLElement to the object.
+	 *
+	 * @param   \SimpleXMLElement  $xml  Data to load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	abstract protected function loadManifestFromData(\SimpleXmlElement $xml);
+}
diff --git a/core/libraries/src/Installer/Manifest/LibraryManifest.php b/core/libraries/src/Installer/Manifest/LibraryManifest.php
new file mode 100644
index 00000000..3ad2da4e
--- /dev/null
+++ b/core/libraries/src/Installer/Manifest/LibraryManifest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Manifest;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Installer\Manifest;
+
+/**
+ * Joomla! Library Manifest File
+ *
+ * @since  3.1
+ */
+class LibraryManifest extends Manifest
+{
+	/**
+	 * File system name of the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $libraryname = '';
+
+	/**
+	 * Creation Date of the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $creationDate = '';
+
+	/**
+	 * Copyright notice for the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $copyright = '';
+
+	/**
+	 * License for the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $license = '';
+
+	/**
+	 * Author for the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $author = '';
+
+	/**
+	 * Author email for the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $authoremail = '';
+
+	/**
+	 * Author URL for the library
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $authorurl = '';
+
+	/**
+	 * Apply manifest data from a \SimpleXMLElement to the object.
+	 *
+	 * @param   \SimpleXMLElement  $xml  Data to load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function loadManifestFromData(\SimpleXMLElement $xml)
+	{
+		$this->name         = (string) $xml->name;
+		$this->libraryname  = (string) $xml->libraryname;
+		$this->version      = (string) $xml->version;
+		$this->description  = (string) $xml->description;
+		$this->creationdate = (string) $xml->creationDate;
+		$this->author       = (string) $xml->author;
+		$this->authoremail  = (string) $xml->authorEmail;
+		$this->authorurl    = (string) $xml->authorUrl;
+		$this->packager     = (string) $xml->packager;
+		$this->packagerurl  = (string) $xml->packagerurl;
+		$this->update       = (string) $xml->update;
+
+		if (isset($xml->files) && isset($xml->files->file) && count($xml->files->file))
+		{
+			foreach ($xml->files->file as $file)
+			{
+				$this->filelist[] = (string) $file;
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Installer/Manifest/PackageManifest.php b/core/libraries/src/Installer/Manifest/PackageManifest.php
new file mode 100644
index 00000000..2cd4b4c8
--- /dev/null
+++ b/core/libraries/src/Installer/Manifest/PackageManifest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer\Manifest;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Installer\InstallerExtension;
+use Joomla\CMS\Installer\Manifest;
+
+/**
+ * Joomla! Package Manifest File
+ *
+ * @since  3.1
+ */
+class PackageManifest extends Manifest
+{
+	/**
+	 * Unique name of the package
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $packagename = '';
+
+	/**
+	 * Website for the package
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $url = '';
+
+	/**
+	 * Scriptfile for the package
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $scriptfile = '';
+
+	/**
+	 * Flag if the package blocks individual child extensions from being uninstalled
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	public $blockChildUninstall = false;
+
+	/**
+	 * Apply manifest data from a \SimpleXMLElement to the object.
+	 *
+	 * @param   \SimpleXMLElement  $xml  Data to load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function loadManifestFromData(\SimpleXMLElement $xml)
+	{
+		$this->name        = (string) $xml->name;
+		$this->packagename = (string) $xml->packagename;
+		$this->update      = (string) $xml->update;
+		$this->authorurl   = (string) $xml->authorUrl;
+		$this->author      = (string) $xml->author;
+		$this->authoremail = (string) $xml->authorEmail;
+		$this->description = (string) $xml->description;
+		$this->packager    = (string) $xml->packager;
+		$this->packagerurl = (string) $xml->packagerurl;
+		$this->scriptfile  = (string) $xml->scriptfile;
+		$this->version     = (string) $xml->version;
+
+		if (isset($xml->blockChildUninstall))
+		{
+			$value = (string) $xml->blockChildUninstall;
+
+			if ($value === '1' || $value === 'true')
+			{
+				$this->blockChildUninstall = true;
+			}
+		}
+
+		if (isset($xml->files->file) && count($xml->files->file))
+		{
+			foreach ($xml->files->file as $file)
+			{
+				// NOTE: JInstallerExtension doesn't expect a string.
+				// DO NOT CAST $file
+				$this->filelist[] = new InstallerExtension($file);
+			}
+		}
+
+		// Handle cases where package contains folders
+		if (isset($xml->files->folder) && count($xml->files->folder))
+		{
+			foreach ($xml->files->folder as $folder)
+			{
+				// NOTE: JInstallerExtension doesn't expect a string.
+				// DO NOT CAST $folder
+				$this->filelist[] = new InstallerExtension($folder);
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Language/Associations.php b/core/libraries/src/Language/Associations.php
new file mode 100644
index 00000000..50e06657
--- /dev/null
+++ b/core/libraries/src/Language/Associations.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Utitlity class for associations in multilang
+ *
+ * @since  3.1
+ */
+class Associations
+{
+	/**
+	 * Get the associations.
+	 *
+	 * @param   string   $extension   The name of the component.
+	 * @param   string   $tablename   The name of the table.
+	 * @param   string   $context     The context
+	 * @param   integer  $id          The primary key value.
+	 * @param   string   $pk          The name of the primary key in the given $table.
+	 * @param   string   $aliasField  If the table has an alias field set it here. Null to not use it
+	 * @param   string   $catField    If the table has a catid field set it here. Null to not use it
+	 * @param   array    $advClause   Additional advanced 'where' clause; use c as parent column key, c2 as associations column key
+	 *
+	 * @return  array  The associated items
+	 *
+	 * @since   3.1
+	 *
+	 * @throws  \Exception
+	 */
+	public static function getAssociations($extension, $tablename, $context, $id, $pk = 'id', $aliasField = 'alias', $catField = 'catid',
+		$advClause = array())
+	{
+		// To avoid doing duplicate database queries.
+		static $multilanguageAssociations = array();
+
+		// Multilanguage association array key. If the key is already in the array we don't need to run the query again, just return it.
+		$queryKey = md5(serialize(array_merge(array($extension, $tablename, $context, $id), $advClause)));
+
+		if (!isset($multilanguageAssociations[$queryKey]))
+		{
+			$multilanguageAssociations[$queryKey] = array();
+
+			$db = \JFactory::getDbo();
+			$categoriesExtraSql = (($tablename === '#__categories') ? ' AND c2.extension = ' . $db->quote($extension) : '');
+			$query = $db->getQuery(true)
+				->select($db->quoteName('c2.language'))
+				->from($db->quoteName($tablename, 'c'))
+				->join('INNER', $db->quoteName('#__associations', 'a') . ' ON a.id = c.' . $db->quoteName($pk) . ' AND a.context=' . $db->quote($context))
+				->join('INNER', $db->quoteName('#__associations', 'a2') . ' ON a.key = a2.key')
+				->join('INNER', $db->quoteName($tablename, 'c2') . ' ON a2.id = c2.' . $db->quoteName($pk) . $categoriesExtraSql);
+
+			// Use alias field ?
+			if (!empty($aliasField))
+			{
+				$query->select(
+					$query->concatenate(
+						array(
+							$db->quoteName('c2.' . $pk),
+							$db->quoteName('c2.' . $aliasField),
+						),
+						':'
+					) . ' AS ' . $db->quoteName($pk)
+				);
+			}
+			else
+			{
+				$query->select($db->quoteName('c2.' . $pk));
+			}
+
+			// Use catid field ?
+			if (!empty($catField))
+			{
+				$query->join(
+						'INNER',
+						$db->quoteName('#__categories', 'ca') . ' ON ' . $db->quoteName('c2.' . $catField) . ' = ca.id AND ca.extension = ' . $db->quote($extension)
+					)
+					->select(
+						$query->concatenate(
+							array('ca.id', 'ca.alias'),
+							':'
+						) . ' AS ' . $db->quoteName($catField)
+					);
+			}
+
+			$query->where('c.' . $pk . ' = ' . (int) $id);
+
+			if ($tablename === '#__categories')
+			{
+				$query->where('c.extension = ' . $db->quote($extension));
+			}
+
+			// Advanced where clause
+			if (!empty($advClause))
+			{
+				foreach ($advClause as $clause)
+				{
+					$query->where($clause);
+				}
+			}
+
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadObjectList('language');
+			}
+			catch (\RuntimeException $e)
+			{
+				throw new \Exception($e->getMessage(), 500, $e);
+			}
+
+			if ($items)
+			{
+				foreach ($items as $tag => $item)
+				{
+					// Do not return itself as result
+					if ((int) $item->{$pk} !== $id)
+					{
+						$multilanguageAssociations[$queryKey][$tag] = $item;
+					}
+				}
+			}
+		}
+
+		return $multilanguageAssociations[$queryKey];
+	}
+
+	/**
+	 * Method to determine if the language filter Associations parameter is enabled.
+	 * This works for both site and administrator.
+	 *
+	 * @return  boolean  True if the parameter is implemented; false otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public static function isEnabled()
+	{
+		// Flag to avoid doing multiple database queries.
+		static $tested = false;
+
+		// Status of language filter parameter.
+		static $enabled = false;
+
+		if (Multilanguage::isEnabled())
+		{
+			// If already tested, don't test again.
+			if (!$tested)
+			{
+				$plugin = \JPluginHelper::getPlugin('system', 'languagefilter');
+
+				if (!empty($plugin))
+				{
+					$params = new Registry($plugin->params);
+					$enabled  = (boolean) $params->get('item_associations', true);
+				}
+
+				$tested = true;
+			}
+		}
+
+		return $enabled;
+	}
+}
diff --git a/core/libraries/src/Language/Language.php b/core/libraries/src/Language/Language.php
new file mode 100644
index 00000000..72acb92a
--- /dev/null
+++ b/core/libraries/src/Language/Language.php
@@ -0,0 +1,1382 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Allows for quoting in language .ini files.
+ */
+define('_QQ_', '"');
+
+/**
+ * Languages/translation handler class
+ *
+ * @since  11.1
+ */
+class Language
+{
+	/**
+	 * Array of Language objects
+	 *
+	 * @var    Language[]
+	 * @since  11.1
+	 */
+	protected static $languages = array();
+
+	/**
+	 * Debug language, If true, highlights if string isn't found.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $debug = false;
+
+	/**
+	 * The default language, used when a language file in the requested language does not exist.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $default = 'en-GB';
+
+	/**
+	 * An array of orphaned text.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $orphans = array();
+
+	/**
+	 * Array holding the language metadata.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $metadata = null;
+
+	/**
+	 * Array holding the language locale or boolean null if none.
+	 *
+	 * @var    array|boolean
+	 * @since  11.1
+	 */
+	protected $locale = null;
+
+	/**
+	 * The language to load.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $lang = null;
+
+	/**
+	 * A nested array of language files that have been loaded
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $paths = array();
+
+	/**
+	 * List of language files that are in error state
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $errorfiles = array();
+
+	/**
+	 * Translations
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $strings = array();
+
+	/**
+	 * An array of used text, used during debugging.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $used = array();
+
+	/**
+	 * Counter for number of loads.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $counter = 0;
+
+	/**
+	 * An array used to store overrides.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $override = array();
+
+	/**
+	 * Name of the transliterator function for this language.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $transliterator = null;
+
+	/**
+	 * Name of the pluralSuffixesCallback function for this language.
+	 *
+	 * @var    callable
+	 * @since  11.1
+	 */
+	protected $pluralSuffixesCallback = null;
+
+	/**
+	 * Name of the ignoredSearchWordsCallback function for this language.
+	 *
+	 * @var    callable
+	 * @since  11.1
+	 */
+	protected $ignoredSearchWordsCallback = null;
+
+	/**
+	 * Name of the lowerLimitSearchWordCallback function for this language.
+	 *
+	 * @var    callable
+	 * @since  11.1
+	 */
+	protected $lowerLimitSearchWordCallback = null;
+
+	/**
+	 * Name of the upperLimitSearchWordCallback function for this language.
+	 *
+	 * @var    callable
+	 * @since  11.1
+	 */
+	protected $upperLimitSearchWordCallback = null;
+
+	/**
+	 * Name of the searchDisplayedCharactersNumberCallback function for this language.
+	 *
+	 * @var    callable
+	 * @since  11.1
+	 */
+	protected $searchDisplayedCharactersNumberCallback = null;
+
+	/**
+	 * Constructor activating the default information of the language.
+	 *
+	 * @param   string   $lang   The language
+	 * @param   boolean  $debug  Indicates if language debugging is enabled.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($lang = null, $debug = false)
+	{
+		$this->strings = array();
+
+		if ($lang == null)
+		{
+			$lang = $this->default;
+		}
+
+		$this->lang = $lang;
+		$this->metadata = LanguageHelper::getMetadata($this->lang);
+		$this->setDebug($debug);
+
+		$filename = JPATH_BASE . "/language/overrides/$lang.override.ini";
+
+		if (file_exists($filename) && $contents = $this->parse($filename))
+		{
+			if (is_array($contents))
+			{
+				// Sort the underlying heap by key values to optimize merging
+				ksort($contents, SORT_STRING);
+				$this->override = $contents;
+			}
+
+			unset($contents);
+		}
+
+		// Look for a language specific localise class
+		$class = str_replace('-', '_', $lang . 'Localise');
+		$paths = array();
+
+		if (defined('JPATH_SITE'))
+		{
+			// Note: Manual indexing to enforce load order.
+			$paths[0] = JPATH_SITE . "/language/overrides/$lang.localise.php";
+			$paths[2] = JPATH_SITE . "/language/$lang/$lang.localise.php";
+		}
+
+		if (defined('JPATH_ADMINISTRATOR'))
+		{
+			// Note: Manual indexing to enforce load order.
+			$paths[1] = JPATH_ADMINISTRATOR . "/language/overrides/$lang.localise.php";
+			$paths[3] = JPATH_ADMINISTRATOR . "/language/$lang/$lang.localise.php";
+		}
+
+		ksort($paths);
+		$path = reset($paths);
+
+		while (!class_exists($class) && $path)
+		{
+			if (file_exists($path))
+			{
+				require_once $path;
+			}
+
+			$path = next($paths);
+		}
+
+		if (class_exists($class))
+		{
+			/**
+			 * Class exists. Try to find
+			 * -a transliterate method,
+			 * -a getPluralSuffixes method,
+			 * -a getIgnoredSearchWords method
+			 * -a getLowerLimitSearchWord method
+			 * -a getUpperLimitSearchWord method
+			 * -a getSearchDisplayCharactersNumber method
+			 */
+			if (method_exists($class, 'transliterate'))
+			{
+				$this->transliterator = array($class, 'transliterate');
+			}
+
+			if (method_exists($class, 'getPluralSuffixes'))
+			{
+				$this->pluralSuffixesCallback = array($class, 'getPluralSuffixes');
+			}
+
+			if (method_exists($class, 'getIgnoredSearchWords'))
+			{
+				$this->ignoredSearchWordsCallback = array($class, 'getIgnoredSearchWords');
+			}
+
+			if (method_exists($class, 'getLowerLimitSearchWord'))
+			{
+				$this->lowerLimitSearchWordCallback = array($class, 'getLowerLimitSearchWord');
+			}
+
+			if (method_exists($class, 'getUpperLimitSearchWord'))
+			{
+				$this->upperLimitSearchWordCallback = array($class, 'getUpperLimitSearchWord');
+			}
+
+			if (method_exists($class, 'getSearchDisplayedCharactersNumber'))
+			{
+				$this->searchDisplayedCharactersNumberCallback = array($class, 'getSearchDisplayedCharactersNumber');
+			}
+		}
+
+		$this->load();
+	}
+
+	/**
+	 * Returns a language object.
+	 *
+	 * @param   string   $lang   The language to use.
+	 * @param   boolean  $debug  The debug mode.
+	 *
+	 * @return  Language  The Language object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($lang, $debug = false)
+	{
+		if (!isset(self::$languages[$lang . $debug]))
+		{
+			self::$languages[$lang . $debug] = new Language($lang, $debug);
+		}
+
+		return self::$languages[$lang . $debug];
+	}
+
+	/**
+	 * Translate function, mimics the php gettext (alias _) function.
+	 *
+	 * The function checks if $jsSafe is true, then if $interpretBackslashes is true.
+	 *
+	 * @param   string   $string                The string to translate
+	 * @param   boolean  $jsSafe                Make the result javascript safe
+	 * @param   boolean  $interpretBackSlashes  Interpret \t and \n
+	 *
+	 * @return  string  The translation of the string
+	 *
+	 * @since   11.1
+	 */
+	public function _($string, $jsSafe = false, $interpretBackSlashes = true)
+	{
+		// Detect empty string
+		if ($string == '')
+		{
+			return '';
+		}
+
+		$key = strtoupper($string);
+
+		if (isset($this->strings[$key]))
+		{
+			$string = $this->debug ? '**' . $this->strings[$key] . '**' : $this->strings[$key];
+
+			// Store debug information
+			if ($this->debug)
+			{
+				$caller = $this->getCallerInfo();
+
+				if (!array_key_exists($key, $this->used))
+				{
+					$this->used[$key] = array();
+				}
+
+				$this->used[$key][] = $caller;
+			}
+		}
+		else
+		{
+			if ($this->debug)
+			{
+				$caller = $this->getCallerInfo();
+				$caller['string'] = $string;
+
+				if (!array_key_exists($key, $this->orphans))
+				{
+					$this->orphans[$key] = array();
+				}
+
+				$this->orphans[$key][] = $caller;
+
+				$string = '??' . $string . '??';
+			}
+		}
+
+		if ($jsSafe)
+		{
+			// Javascript filter
+			$string = addslashes($string);
+		}
+		elseif ($interpretBackSlashes)
+		{
+			if (strpos($string, '\\') !== false)
+			{
+				// Interpret \n and \t characters
+				$string = str_replace(array('\\\\', '\t', '\n'), array("\\", "\t", "\n"), $string);
+			}
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Transliterate function
+	 *
+	 * This method processes a string and replaces all accented UTF-8 characters by unaccented
+	 * ASCII-7 "equivalents".
+	 *
+	 * @param   string  $string  The string to transliterate.
+	 *
+	 * @return  string  The transliteration of the string.
+	 *
+	 * @since   11.1
+	 */
+	public function transliterate($string)
+	{
+		if ($this->transliterator !== null)
+		{
+			return call_user_func($this->transliterator, $string);
+		}
+
+		$string = Transliterate::utf8_latin_to_ascii($string);
+		$string = StringHelper::strtolower($string);
+
+		return $string;
+	}
+
+	/**
+	 * Getter for transliteration function
+	 *
+	 * @return  callable  The transliterator function
+	 *
+	 * @since   11.1
+	 */
+	public function getTransliterator()
+	{
+		return $this->transliterator;
+	}
+
+	/**
+	 * Set the transliteration function.
+	 *
+	 * @param   callable  $function  Function name or the actual function.
+	 *
+	 * @return  callable  The previous function.
+	 *
+	 * @since   11.1
+	 */
+	public function setTransliterator($function)
+	{
+		$previous = $this->transliterator;
+		$this->transliterator = $function;
+
+		return $previous;
+	}
+
+	/**
+	 * Returns an array of suffixes for plural rules.
+	 *
+	 * @param   integer  $count  The count number the rule is for.
+	 *
+	 * @return  array    The array of suffixes.
+	 *
+	 * @since   11.1
+	 */
+	public function getPluralSuffixes($count)
+	{
+		if ($this->pluralSuffixesCallback !== null)
+		{
+			return call_user_func($this->pluralSuffixesCallback, $count);
+		}
+		else
+		{
+			return array((string) $count);
+		}
+	}
+
+	/**
+	 * Getter for pluralSuffixesCallback function.
+	 *
+	 * @return  callable  Function name or the actual function.
+	 *
+	 * @since   11.1
+	 */
+	public function getPluralSuffixesCallback()
+	{
+		return $this->pluralSuffixesCallback;
+	}
+
+	/**
+	 * Set the pluralSuffixes function.
+	 *
+	 * @param   callable  $function  Function name or actual function.
+	 *
+	 * @return  callable  The previous function.
+	 *
+	 * @since   11.1
+	 */
+	public function setPluralSuffixesCallback($function)
+	{
+		$previous = $this->pluralSuffixesCallback;
+		$this->pluralSuffixesCallback = $function;
+
+		return $previous;
+	}
+
+	/**
+	 * Returns an array of ignored search words
+	 *
+	 * @return  array  The array of ignored search words.
+	 *
+	 * @since   11.1
+	 */
+	public function getIgnoredSearchWords()
+	{
+		if ($this->ignoredSearchWordsCallback !== null)
+		{
+			return call_user_func($this->ignoredSearchWordsCallback);
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Getter for ignoredSearchWordsCallback function.
+	 *
+	 * @return  callable  Function name or the actual function.
+	 *
+	 * @since   11.1
+	 */
+	public function getIgnoredSearchWordsCallback()
+	{
+		return $this->ignoredSearchWordsCallback;
+	}
+
+	/**
+	 * Setter for the ignoredSearchWordsCallback function
+	 *
+	 * @param   callable  $function  Function name or actual function.
+	 *
+	 * @return  callable  The previous function.
+	 *
+	 * @since   11.1
+	 */
+	public function setIgnoredSearchWordsCallback($function)
+	{
+		$previous = $this->ignoredSearchWordsCallback;
+		$this->ignoredSearchWordsCallback = $function;
+
+		return $previous;
+	}
+
+	/**
+	 * Returns a lower limit integer for length of search words
+	 *
+	 * @return  integer  The lower limit integer for length of search words (3 if no value was set for a specific language).
+	 *
+	 * @since   11.1
+	 */
+	public function getLowerLimitSearchWord()
+	{
+		if ($this->lowerLimitSearchWordCallback !== null)
+		{
+			return call_user_func($this->lowerLimitSearchWordCallback);
+		}
+		else
+		{
+			return 3;
+		}
+	}
+
+	/**
+	 * Getter for lowerLimitSearchWordCallback function
+	 *
+	 * @return  callable  Function name or the actual function.
+	 *
+	 * @since   11.1
+	 */
+	public function getLowerLimitSearchWordCallback()
+	{
+		return $this->lowerLimitSearchWordCallback;
+	}
+
+	/**
+	 * Setter for the lowerLimitSearchWordCallback function.
+	 *
+	 * @param   callable  $function  Function name or actual function.
+	 *
+	 * @return  callable  The previous function.
+	 *
+	 * @since   11.1
+	 */
+	public function setLowerLimitSearchWordCallback($function)
+	{
+		$previous = $this->lowerLimitSearchWordCallback;
+		$this->lowerLimitSearchWordCallback = $function;
+
+		return $previous;
+	}
+
+	/**
+	 * Returns an upper limit integer for length of search words
+	 *
+	 * @return  integer  The upper limit integer for length of search words (200 if no value was set or if default value is < 200).
+	 *
+	 * @since   11.1
+	 */
+	public function getUpperLimitSearchWord()
+	{
+		if ($this->upperLimitSearchWordCallback !== null && call_user_func($this->upperLimitSearchWordCallback) > 200)
+		{
+			return call_user_func($this->upperLimitSearchWordCallback);
+		}
+
+		return 200;
+	}
+
+	/**
+	 * Getter for upperLimitSearchWordCallback function
+	 *
+	 * @return  callable  Function name or the actual function.
+	 *
+	 * @since   11.1
+	 */
+	public function getUpperLimitSearchWordCallback()
+	{
+		return $this->upperLimitSearchWordCallback;
+	}
+
+	/**
+	 * Setter for the upperLimitSearchWordCallback function
+	 *
+	 * @param   callable  $function  Function name or the actual function.
+	 *
+	 * @return  callable  The previous function.
+	 *
+	 * @since   11.1
+	 */
+	public function setUpperLimitSearchWordCallback($function)
+	{
+		$previous = $this->upperLimitSearchWordCallback;
+		$this->upperLimitSearchWordCallback = $function;
+
+		return $previous;
+	}
+
+	/**
+	 * Returns the number of characters displayed in search results.
+	 *
+	 * @return  integer  The number of characters displayed (200 if no value was set for a specific language).
+	 *
+	 * @since   11.1
+	 */
+	public function getSearchDisplayedCharactersNumber()
+	{
+		if ($this->searchDisplayedCharactersNumberCallback !== null)
+		{
+			return call_user_func($this->searchDisplayedCharactersNumberCallback);
+		}
+		else
+		{
+			return 200;
+		}
+	}
+
+	/**
+	 * Getter for searchDisplayedCharactersNumberCallback function
+	 *
+	 * @return  callable  Function name or the actual function.
+	 *
+	 * @since   11.1
+	 */
+	public function getSearchDisplayedCharactersNumberCallback()
+	{
+		return $this->searchDisplayedCharactersNumberCallback;
+	}
+
+	/**
+	 * Setter for the searchDisplayedCharactersNumberCallback function.
+	 *
+	 * @param   callable  $function  Function name or the actual function.
+	 *
+	 * @return  callable  The previous function.
+	 *
+	 * @since   11.1
+	 */
+	public function setSearchDisplayedCharactersNumberCallback($function)
+	{
+		$previous = $this->searchDisplayedCharactersNumberCallback;
+		$this->searchDisplayedCharactersNumberCallback = $function;
+
+		return $previous;
+	}
+
+	/**
+	 * Checks if a language exists.
+	 *
+	 * This is a simple, quick check for the directory that should contain language files for the given user.
+	 *
+	 * @param   string  $lang      Language to check.
+	 * @param   string  $basePath  Optional path to check.
+	 *
+	 * @return  boolean  True if the language exists.
+	 *
+	 * @since   11.1
+	 * @deprecated   3.7.0, use LanguageHelper::exists() instead.
+	 */
+	public static function exists($lang, $basePath = JPATH_BASE)
+	{
+		\JLog::add(__METHOD__ . '() is deprecated, use LanguageHelper::exists() instead.', \JLog::WARNING, 'deprecated');
+
+		return LanguageHelper::exists($lang, $basePath);
+	}
+
+	/**
+	 * Loads a single language file and appends the results to the existing strings
+	 *
+	 * @param   string   $extension  The extension for which a language file should be loaded.
+	 * @param   string   $basePath   The basepath to use.
+	 * @param   string   $lang       The language to load, default null for the current language.
+	 * @param   boolean  $reload     Flag that will force a language to be reloaded if set to true.
+	 * @param   boolean  $default    Flag that force the default language to be loaded if the current does not exist.
+	 *
+	 * @return  boolean  True if the file has successfully loaded.
+	 *
+	 * @since   11.1
+	 */
+	public function load($extension = 'joomla', $basePath = JPATH_BASE, $lang = null, $reload = false, $default = true)
+	{
+		// If language is null set as the current language.
+		if (!$lang)
+		{
+			$lang = $this->lang;
+		}
+
+		// Load the default language first if we're not debugging and a non-default language is requested to be loaded
+		// with $default set to true
+		if (!$this->debug && ($lang != $this->default) && $default)
+		{
+			$this->load($extension, $basePath, $this->default, false, true);
+		}
+
+		$path = LanguageHelper::getLanguagePath($basePath, $lang);
+
+		$internal = $extension == 'joomla' || $extension == '';
+		$filename = $internal ? $lang : $lang . '.' . $extension;
+		$filename = "$path/$filename.ini";
+
+		if (isset($this->paths[$extension][$filename]) && !$reload)
+		{
+			// This file has already been tested for loading.
+			$result = $this->paths[$extension][$filename];
+		}
+		else
+		{
+			// Load the language file
+			$result = $this->loadLanguage($filename, $extension);
+
+			// Check whether there was a problem with loading the file
+			if ($result === false && $default)
+			{
+				// No strings, so either file doesn't exist or the file is invalid
+				$oldFilename = $filename;
+
+				// Check the standard file name
+				if (!$this->debug)
+				{
+					$path = LanguageHelper::getLanguagePath($basePath, $this->default);
+
+					$filename = $internal ? $this->default : $this->default . '.' . $extension;
+					$filename = "$path/$filename.ini";
+
+					// If the one we tried is different than the new name, try again
+					if ($oldFilename != $filename)
+					{
+						$result = $this->loadLanguage($filename, $extension, false);
+					}
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Loads a language file.
+	 *
+	 * This method will not note the successful loading of a file - use load() instead.
+	 *
+	 * @param   string  $filename   The name of the file.
+	 * @param   string  $extension  The name of the extension.
+	 *
+	 * @return  boolean  True if new strings have been added to the language
+	 *
+	 * @see     Language::load()
+	 * @since   11.1
+	 */
+	protected function loadLanguage($filename, $extension = 'unknown')
+	{
+		$this->counter++;
+
+		$result = false;
+		$strings = false;
+
+		if (file_exists($filename))
+		{
+			$strings = $this->parse($filename);
+		}
+
+		if (is_array($strings) && count($strings))
+		{
+			$this->strings = array_replace($this->strings, $strings, $this->override);
+			$result = true;
+		}
+
+		// Record the result of loading the extension's file.
+		if (!isset($this->paths[$extension]))
+		{
+			$this->paths[$extension] = array();
+		}
+
+		$this->paths[$extension][$filename] = $result;
+
+		return $result;
+	}
+
+	/**
+	 * Parses a language file.
+	 *
+	 * @param   string  $filename  The name of the file.
+	 *
+	 * @return  array  The array of parsed strings.
+	 *
+	 * @since   11.1
+	 */
+	protected function parse($filename)
+	{
+		// Capture hidden PHP errors from the parsing.
+		if ($this->debug)
+		{
+			// See https://secure.php.net/manual/en/reserved.variables.phperrormsg.php
+			$php_errormsg = null;
+
+			$trackErrors = ini_get('track_errors');
+			ini_set('track_errors', true);
+		}
+
+		// This was required for https://github.com/joomla/joomla-cms/issues/17198 but not sure what server setup
+		// issue it is solving
+		$disabledFunctions = explode(',', ini_get('disable_functions'));
+		$isParseIniFileDisabled = in_array('parse_ini_file', array_map('trim', $disabledFunctions));
+
+		if (!function_exists('parse_ini_file') || $isParseIniFileDisabled)
+		{
+			$contents = file_get_contents($filename);
+			$contents = str_replace('_QQ_', '"\""', $contents);
+			$strings = @parse_ini_string($contents);
+		}
+		else
+		{
+			$strings = @parse_ini_file($filename);
+		}
+
+		if (!is_array($strings))
+		{
+			$strings = array();
+		}
+
+		// Restore error tracking to what it was before.
+		if ($this->debug)
+		{
+			ini_set('track_errors', $trackErrors);
+
+			$this->debugFile($filename);
+		}
+
+		return $strings;
+	}
+
+	/**
+	 * Debugs a language file
+	 *
+	 * @param   string  $filename  Absolute path to the file to debug
+	 *
+	 * @return  integer  A count of the number of parsing errors
+	 *
+	 * @since   3.6.3
+	 * @throws  \InvalidArgumentException
+	 */
+	public function debugFile($filename)
+	{
+		// Make sure our file actually exists
+		if (!file_exists($filename))
+		{
+			throw new \InvalidArgumentException(
+				sprintf('Unable to locate file "%s" for debugging', $filename)
+			);
+		}
+
+		// Initialise variables for manually parsing the file for common errors.
+		$blacklist = array('YES', 'NO', 'NULL', 'FALSE', 'ON', 'OFF', 'NONE', 'TRUE');
+		$debug = $this->getDebug();
+		$this->debug = false;
+		$errors = array();
+		$php_errormsg = null;
+
+		// Open the file as a stream.
+		$file = new \SplFileObject($filename);
+
+		foreach ($file as $lineNumber => $line)
+		{
+			// Avoid BOM error as BOM is OK when using parse_ini.
+			if ($lineNumber == 0)
+			{
+				$line = str_replace("\xEF\xBB\xBF", '', $line);
+			}
+
+			$line = trim($line);
+
+			// Ignore comment lines.
+			if (!strlen($line) || $line['0'] == ';')
+			{
+				continue;
+			}
+
+			// Ignore grouping tag lines, like: [group]
+			if (preg_match('#^\[[^\]]*\](\s*;.*)?$#', $line))
+			{
+				continue;
+			}
+
+			// Remove the "_QQ_" from the equation
+			$line = str_replace('"_QQ_"', '', $line);
+			$realNumber = $lineNumber + 1;
+
+			// Check for any incorrect uses of _QQ_.
+			if (strpos($line, '_QQ_') !== false)
+			{
+				$errors[] = $realNumber;
+				continue;
+			}
+
+			// Check for odd number of double quotes.
+			if (substr_count($line, '"') % 2 != 0)
+			{
+				$errors[] = $realNumber;
+				continue;
+			}
+
+			// Check that the line passes the necessary format.
+			if (!preg_match('#^[A-Z][A-Z0-9_\*\-\.]*\s*=\s*".*"(\s*;.*)?$#', $line))
+			{
+				$errors[] = $realNumber;
+				continue;
+			}
+
+			// Check that the key is not in the blacklist.
+			$key = strtoupper(trim(substr($line, 0, strpos($line, '='))));
+
+			if (in_array($key, $blacklist))
+			{
+				$errors[] = $realNumber;
+			}
+		}
+
+		// Check if we encountered any errors.
+		if (count($errors))
+		{
+			$this->errorfiles[$filename] = $filename . ' : error(s) in line(s) ' . implode(', ', $errors);
+		}
+		elseif ($php_errormsg)
+		{
+			// We didn't find any errors but there's probably a parse notice.
+			$this->errorfiles['PHP' . $filename] = 'PHP parser errors :' . $php_errormsg;
+		}
+
+		$this->debug = $debug;
+
+		return count($errors);
+	}
+
+	/**
+	 * Get a metadata language property.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $default   The default value.
+	 *
+	 * @return  mixed  The value of the property.
+	 *
+	 * @since   11.1
+	 */
+	public function get($property, $default = null)
+	{
+		if (isset($this->metadata[$property]))
+		{
+			return $this->metadata[$property];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Determine who called Language or JText.
+	 *
+	 * @return  array  Caller information.
+	 *
+	 * @since   11.1
+	 */
+	protected function getCallerInfo()
+	{
+		// Try to determine the source if none was provided
+		if (!function_exists('debug_backtrace'))
+		{
+			return;
+		}
+
+		$backtrace = debug_backtrace();
+		$info = array();
+
+		// Search through the backtrace to our caller
+		$continue = true;
+
+		while ($continue && next($backtrace))
+		{
+			$step = current($backtrace);
+			$class = @ $step['class'];
+
+			// We're looking for something outside of language.php
+			if ($class != '\\Joomla\\CMS\\Language\\Language' && $class != 'JText')
+			{
+				$info['function'] = @ $step['function'];
+				$info['class'] = $class;
+				$info['step'] = prev($backtrace);
+
+				// Determine the file and name of the file
+				$info['file'] = @ $step['file'];
+				$info['line'] = @ $step['line'];
+
+				$continue = false;
+			}
+		}
+
+		return $info;
+	}
+
+	/**
+	 * Getter for Name.
+	 *
+	 * @return  string  Official name element of the language.
+	 *
+	 * @since   11.1
+	 */
+	public function getName()
+	{
+		return $this->metadata['name'];
+	}
+
+	/**
+	 * Get a list of language files that have been loaded.
+	 *
+	 * @param   string  $extension  An optional extension name.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function getPaths($extension = null)
+	{
+		if (isset($extension))
+		{
+			if (isset($this->paths[$extension]))
+			{
+				return $this->paths[$extension];
+			}
+
+			return;
+		}
+		else
+		{
+			return $this->paths;
+		}
+	}
+
+	/**
+	 * Get a list of language files that are in error state.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function getErrorFiles()
+	{
+		return $this->errorfiles;
+	}
+
+	/**
+	 * Getter for the language tag (as defined in RFC 3066)
+	 *
+	 * @return  string  The language tag.
+	 *
+	 * @since   11.1
+	 */
+	public function getTag()
+	{
+		return $this->metadata['tag'];
+	}
+
+	/**
+	 * Getter for the calendar type
+	 *
+	 * @return  string  The calendar type.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getCalendar()
+	{
+		if (isset($this->metadata['calendar']))
+		{
+			return $this->metadata['calendar'];
+		}
+		else
+		{
+			return 'gregorian';
+		}
+	}
+
+	/**
+	 * Get the RTL property.
+	 *
+	 * @return  boolean  True is it an RTL language.
+	 *
+	 * @since   11.1
+	 */
+	public function isRtl()
+	{
+		return (bool) $this->metadata['rtl'];
+	}
+
+	/**
+	 * Set the Debug property.
+	 *
+	 * @param   boolean  $debug  The debug setting.
+	 *
+	 * @return  boolean  Previous value.
+	 *
+	 * @since   11.1
+	 */
+	public function setDebug($debug)
+	{
+		$previous = $this->debug;
+		$this->debug = (boolean) $debug;
+
+		return $previous;
+	}
+
+	/**
+	 * Get the Debug property.
+	 *
+	 * @return  boolean  True is in debug mode.
+	 *
+	 * @since   11.1
+	 */
+	public function getDebug()
+	{
+		return $this->debug;
+	}
+
+	/**
+	 * Get the default language code.
+	 *
+	 * @return  string  Language code.
+	 *
+	 * @since   11.1
+	 */
+	public function getDefault()
+	{
+		return $this->default;
+	}
+
+	/**
+	 * Set the default language code.
+	 *
+	 * @param   string  $lang  The language code.
+	 *
+	 * @return  string  Previous value.
+	 *
+	 * @since   11.1
+	 */
+	public function setDefault($lang)
+	{
+		$previous = $this->default;
+		$this->default = $lang;
+
+		return $previous;
+	}
+
+	/**
+	 * Get the list of orphaned strings if being tracked.
+	 *
+	 * @return  array  Orphaned text.
+	 *
+	 * @since   11.1
+	 */
+	public function getOrphans()
+	{
+		return $this->orphans;
+	}
+
+	/**
+	 * Get the list of used strings.
+	 *
+	 * Used strings are those strings requested and found either as a string or a constant.
+	 *
+	 * @return  array  Used strings.
+	 *
+	 * @since   11.1
+	 */
+	public function getUsed()
+	{
+		return $this->used;
+	}
+
+	/**
+	 * Determines is a key exists.
+	 *
+	 * @param   string  $string  The key to check.
+	 *
+	 * @return  boolean  True, if the key exists.
+	 *
+	 * @since   11.1
+	 */
+	public function hasKey($string)
+	{
+		$key = strtoupper($string);
+
+		return isset($this->strings[$key]);
+	}
+
+	/**
+	 * Returns an associative array holding the metadata.
+	 *
+	 * @param   string  $lang  The name of the language.
+	 *
+	 * @return  mixed  If $lang exists return key/value pair with the language metadata, otherwise return NULL.
+	 *
+	 * @since   11.1
+	 * @deprecated   3.7.0, use LanguageHelper::getMetadata() instead.
+	 */
+	public static function getMetadata($lang)
+	{
+		\JLog::add(__METHOD__ . '() is deprecated, use LanguageHelper::getMetadata() instead.', \JLog::WARNING, 'deprecated');
+
+		return LanguageHelper::getMetadata($lang);
+	}
+
+	/**
+	 * Returns a list of known languages for an area
+	 *
+	 * @param   string  $basePath  The basepath to use
+	 *
+	 * @return  array  key/value pair with the language file and real name.
+	 *
+	 * @since   11.1
+	 * @deprecated   3.7.0, use LanguageHelper::getKnownLanguages() instead.
+	 */
+	public static function getKnownLanguages($basePath = JPATH_BASE)
+	{
+		\JLog::add(__METHOD__ . '() is deprecated, use LanguageHelper::getKnownLanguages() instead.', \JLog::WARNING, 'deprecated');
+
+		return LanguageHelper::getKnownLanguages($basePath);
+	}
+
+	/**
+	 * Get the path to a language
+	 *
+	 * @param   string  $basePath  The basepath to use.
+	 * @param   string  $language  The language tag.
+	 *
+	 * @return  string  language related path or null.
+	 *
+	 * @since   11.1
+	 * @deprecated   3.7.0, use LanguageHelper::getLanguagePath() instead.
+	 */
+	public static function getLanguagePath($basePath = JPATH_BASE, $language = null)
+	{
+		\JLog::add(__METHOD__ . '() is deprecated, use LanguageHelper::getLanguagePath() instead.', \JLog::WARNING, 'deprecated');
+
+		return LanguageHelper::getLanguagePath($basePath, $language);
+	}
+
+	/**
+	 * Set the language attributes to the given language.
+	 *
+	 * Once called, the language still needs to be loaded using Language::load().
+	 *
+	 * @param   string  $lang  Language code.
+	 *
+	 * @return  string  Previous value.
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0 (CMS) - Instantiate a new Language object instead
+	 */
+	public function setLanguage($lang)
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Instantiate a new Language object instead.', \JLog::WARNING, 'deprecated');
+
+		$previous = $this->lang;
+		$this->lang = $lang;
+		$this->metadata = LanguageHelper::getMetadata($this->lang);
+
+		return $previous;
+	}
+
+	/**
+	 * Get the language locale based on current language.
+	 *
+	 * @return  array  The locale according to the language.
+	 *
+	 * @since   11.1
+	 */
+	public function getLocale()
+	{
+		if (!isset($this->locale))
+		{
+			$locale = str_replace(' ', '', isset($this->metadata['locale']) ? $this->metadata['locale'] : '');
+
+			if ($locale)
+			{
+				$this->locale = explode(',', $locale);
+			}
+			else
+			{
+				$this->locale = false;
+			}
+		}
+
+		return $this->locale;
+	}
+
+	/**
+	 * Get the first day of the week for this language.
+	 *
+	 * @return  integer  The first day of the week according to the language
+	 *
+	 * @since   11.1
+	 */
+	public function getFirstDay()
+	{
+		return (int) (isset($this->metadata['firstDay']) ? $this->metadata['firstDay'] : 0);
+	}
+
+	/**
+	 * Get the weekends days for this language.
+	 *
+	 * @return  string  The weekend days of the week separated by a comma according to the language
+	 *
+	 * @since   3.2
+	 */
+	public function getWeekEnd()
+	{
+		return (isset($this->metadata['weekEnd']) && $this->metadata['weekEnd']) ? $this->metadata['weekEnd'] : '0,6';
+	}
+
+	/**
+	 * Searches for language directories within a certain base dir.
+	 *
+	 * @param   string  $dir  directory of files.
+	 *
+	 * @return  array  Array holding the found languages as filename => real name pairs.
+	 *
+	 * @since   11.1
+	 * @deprecated   3.7.0, use LanguageHelper::parseLanguageFiles() instead.
+	 */
+	public static function parseLanguageFiles($dir = null)
+	{
+		\JLog::add(__METHOD__ . '() is deprecated, use LanguageHelper::parseLanguageFiles() instead.', \JLog::WARNING, 'deprecated');
+
+		return LanguageHelper::parseLanguageFiles($dir);
+	}
+
+	/**
+	 * Parse XML file for language information.
+	 *
+	 * @param   string  $path  Path to the XML files.
+	 *
+	 * @return  array  Array holding the found metadata as a key => value pair.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 * @deprecated   3.7.0, use LanguageHelper::parseXMLLanguageFile() instead.
+	 */
+	public static function parseXMLLanguageFile($path)
+	{
+		\JLog::add(__METHOD__ . '() is deprecated, use LanguageHelper::parseXMLLanguageFile() instead.', \JLog::WARNING, 'deprecated');
+
+		return LanguageHelper::parseXMLLanguageFile($path);
+	}
+}
diff --git a/core/libraries/src/Language/LanguageHelper.php b/core/libraries/src/Language/LanguageHelper.php
new file mode 100644
index 00000000..16a78953
--- /dev/null
+++ b/core/libraries/src/Language/LanguageHelper.php
@@ -0,0 +1,612 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Language helper class
+ *
+ * @since  11.1
+ */
+class LanguageHelper
+{
+	/**
+	 * Builds a list of the system languages which can be used in a select option
+	 *
+	 * @param   string   $actualLanguage  Client key for the area
+	 * @param   string   $basePath        Base path to use
+	 * @param   boolean  $caching         True if caching is used
+	 * @param   boolean  $installed       Get only installed languages
+	 *
+	 * @return  array  List of system languages
+	 *
+	 * @since   11.1
+	 */
+	public static function createLanguageList($actualLanguage, $basePath = JPATH_BASE, $caching = false, $installed = false)
+	{
+		$list      = array();
+		$clientId  = $basePath === JPATH_ADMINISTRATOR ? 1 : 0;
+		$languages = $installed ? static::getInstalledLanguages($clientId, true) : self::getKnownLanguages($basePath);
+
+		foreach ($languages as $languageCode => $language)
+		{
+			$metadata = $installed ? $language->metadata : $language;
+
+			$list[] = array(
+				'text'     => isset($metadata['nativeName']) ? $metadata['nativeName'] : $metadata['name'],
+				'value'    => $languageCode,
+				'selected' => $languageCode === $actualLanguage ? 'selected="selected"' : null,
+			);
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Tries to detect the language.
+	 *
+	 * @return  string  locale or null if not found
+	 *
+	 * @since   11.1
+	 */
+	public static function detectLanguage()
+	{
+		if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		{
+			$browserLangs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+			$systemLangs = self::getLanguages();
+
+			foreach ($browserLangs as $browserLang)
+			{
+				// Slice out the part before ; on first step, the part before - on second, place into array
+				$browserLang = substr($browserLang, 0, strcspn($browserLang, ';'));
+				$primary_browserLang = substr($browserLang, 0, 2);
+
+				foreach ($systemLangs as $systemLang)
+				{
+					// Take off 3 letters iso code languages as they can't match browsers' languages and default them to en
+					$Jinstall_lang = $systemLang->lang_code;
+
+					if (strlen($Jinstall_lang) < 6)
+					{
+						if (strtolower($browserLang) == strtolower(substr($systemLang->lang_code, 0, strlen($browserLang))))
+						{
+							return $systemLang->lang_code;
+						}
+						elseif ($primary_browserLang == substr($systemLang->lang_code, 0, 2))
+						{
+							$primaryDetectedLang = $systemLang->lang_code;
+						}
+					}
+				}
+
+				if (isset($primaryDetectedLang))
+				{
+					return $primaryDetectedLang;
+				}
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * Get available languages
+	 *
+	 * @param   string  $key  Array key
+	 *
+	 * @return  array  An array of published languages
+	 *
+	 * @since   11.1
+	 */
+	public static function getLanguages($key = 'default')
+	{
+		static $languages;
+
+		if (empty($languages))
+		{
+			// Installation uses available languages
+			if (\JFactory::getApplication()->getClientId() == 2)
+			{
+				$languages[$key] = array();
+				$knownLangs = self::getKnownLanguages(JPATH_BASE);
+
+				foreach ($knownLangs as $metadata)
+				{
+					// Take off 3 letters iso code languages as they can't match browsers' languages and default them to en
+					$obj = new \stdClass;
+					$obj->lang_code = $metadata['tag'];
+					$languages[$key][] = $obj;
+				}
+			}
+			else
+			{
+				$cache = \JFactory::getCache('com_languages', '');
+
+				if ($cache->contains('languages'))
+				{
+					$languages = $cache->get('languages');
+				}
+				else
+				{
+					$db = \JFactory::getDbo();
+					$query = $db->getQuery(true)
+						->select('*')
+						->from('#__languages')
+						->where('published=1')
+						->order('ordering ASC');
+					$db->setQuery($query);
+
+					$languages['default'] = $db->loadObjectList();
+					$languages['sef'] = array();
+					$languages['lang_code'] = array();
+
+					if (isset($languages['default'][0]))
+					{
+						foreach ($languages['default'] as $lang)
+						{
+							$languages['sef'][$lang->sef] = $lang;
+							$languages['lang_code'][$lang->lang_code] = $lang;
+						}
+					}
+
+					$cache->store($languages, 'languages');
+				}
+			}
+		}
+
+		return $languages[$key];
+	}
+
+	/**
+	 * Get a list of installed languages.
+	 *
+	 * @param   integer  $clientId         The client app id.
+	 * @param   boolean  $processMetaData  Fetch Language metadata.
+	 * @param   boolean  $processManifest  Fetch Language manifest.
+	 * @param   string   $pivot            The pivot of the returning array.
+	 * @param   string   $orderField       Field to order the results.
+	 * @param   string   $orderDirection   Direction to order the results.
+	 *
+	 * @return  array  Array with the installed languages.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getInstalledLanguages($clientId = null, $processMetaData = false, $processManifest = false, $pivot = 'element',
+		$orderField = null, $orderDirection = null)
+	{
+		static $installedLanguages = null;
+
+		if ($installedLanguages === null)
+		{
+			$cache = \JFactory::getCache('com_languages', '');
+
+			if ($cache->contains('installedlanguages'))
+			{
+				$installedLanguages = $cache->get('installedlanguages');
+			}
+			else
+			{
+				$db = \JFactory::getDbo();
+
+				$query = $db->getQuery(true)
+					->select($db->quoteName(array('element', 'name', 'client_id', 'extension_id')))
+					->from($db->quoteName('#__extensions'))
+					->where($db->quoteName('type') . ' = ' . $db->quote('language'))
+					->where($db->quoteName('state') . ' = 0')
+					->where($db->quoteName('enabled') . ' = 1');
+
+				$installedLanguages = $db->setQuery($query)->loadObjectList();
+
+				$cache->store($installedLanguages, 'installedlanguages');
+			}
+		}
+
+		$clients   = $clientId === null ? array(0, 1) : array((int) $clientId);
+		$languages = array(
+			0 => array(),
+			1 => array(),
+		);
+
+		foreach ($installedLanguages as $language)
+		{
+			// If the language client is not needed continue cycle. Drop for performance.
+			if (!in_array((int) $language->client_id, $clients))
+			{
+				continue;
+			}
+
+			$lang = $language;
+
+			if ($processMetaData || $processManifest)
+			{
+				$clientPath = (int) $language->client_id === 0 ? JPATH_SITE : JPATH_ADMINISTRATOR;
+				$metafile   = self::getLanguagePath($clientPath, $language->element) . '/' . $language->element . '.xml';
+
+				// Process the language metadata.
+				if ($processMetaData)
+				{
+					try
+					{
+						$lang->metadata = self::parseXMLLanguageFile($metafile);
+					}
+
+					// Not able to process xml language file. Fail silently.
+					catch (\Exception $e)
+					{
+						\JLog::add(\JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE', $language->element, $metafile), \JLog::WARNING, 'language');
+
+						continue;
+					}
+
+					// No metadata found, not a valid language. Fail silently.
+					if (!is_array($lang->metadata))
+					{
+						\JLog::add(\JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA', $language->element, $metafile), \JLog::WARNING, 'language');
+
+						continue;
+					}
+				}
+
+				// Process the language manifest.
+				if ($processManifest)
+				{
+					try
+					{
+						$lang->manifest = \JInstaller::parseXMLInstallFile($metafile);
+					}
+
+					// Not able to process xml language file. Fail silently.
+					catch (\Exception $e)
+					{
+						\JLog::add(\JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE', $language->element, $metafile), \JLog::WARNING, 'language');
+
+						continue;
+					}
+
+					// No metadata found, not a valid language. Fail silently.
+					if (!is_array($lang->manifest))
+					{
+						\JLog::add(\JText::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA', $language->element, $metafile), \JLog::WARNING, 'language');
+
+						continue;
+					}
+				}
+			}
+
+			$languages[$language->client_id][] = $lang;
+		}
+
+		// Order the list, if needed.
+		if ($orderField !== null && $orderDirection !== null)
+		{
+			$orderDirection = strtolower($orderDirection) === 'desc' ? -1 : 1;
+
+			foreach ($languages as $cId => $language)
+			{
+				// If the language client is not needed continue cycle. Drop for performance.
+				if (!in_array($cId, $clients))
+				{
+					continue;
+				}
+
+				$languages[$cId] = ArrayHelper::sortObjects($languages[$cId], $orderField, $orderDirection, true, true);
+			}
+		}
+
+		// Add the pivot, if needed.
+		if ($pivot !== null)
+		{
+			foreach ($languages as $cId => $language)
+			{
+				// If the language client is not needed continue cycle. Drop for performance.
+				if (!in_array($cId, $clients))
+				{
+					continue;
+				}
+
+				$languages[$cId] = ArrayHelper::pivot($languages[$cId], $pivot);
+			}
+		}
+
+		return $clientId !== null ? $languages[$clientId] : $languages;
+	}
+
+	/**
+	 * Get a list of content languages.
+	 *
+	 * @param   array    $publishedStates  Array with the content language published states. Empty array for all.
+	 * @param   boolean  $checkInstalled   Check if the content language is installed.
+	 * @param   string   $pivot            The pivot of the returning array.
+	 * @param   string   $orderField       Field to order the results.
+	 * @param   string   $orderDirection   Direction to order the results.
+	 *
+	 * @return  array  Array of the content languages.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getContentLanguages($publishedStates = array(1), $checkInstalled = true, $pivot = 'lang_code', $orderField = null,
+		$orderDirection = null)
+	{
+		static $contentLanguages = null;
+
+		if ($contentLanguages === null)
+		{
+			$cache = \JFactory::getCache('com_languages', '');
+
+			if ($cache->contains('contentlanguages'))
+			{
+				$contentLanguages = $cache->get('contentlanguages');
+			}
+			else
+			{
+				$db = \JFactory::getDbo();
+
+				$query = $db->getQuery(true)
+					->select('*')
+					->from($db->quoteName('#__languages'));
+
+				$contentLanguages = $db->setQuery($query)->loadObjectList();
+
+				$cache->store($contentLanguages, 'contentlanguages');
+			}
+		}
+
+		$languages = $contentLanguages;
+
+		// B/C layer. Before 3.8.3.
+		if ($publishedStates === true)
+		{
+			$publishedStates = array(1);
+		}
+		elseif ($publishedStates === false)
+		{
+			$publishedStates = array();
+		}
+
+		// Check the language published state, if needed.
+		if (count($publishedStates) > 0)
+		{
+			foreach ($languages as $key => $language)
+			{
+				if (!in_array((int) $language->published, $publishedStates, true))
+				{
+					unset($languages[$key]);
+				}
+			}
+		}
+
+		// Check if the language is installed, if needed.
+		if ($checkInstalled)
+		{
+			$languages = array_values(array_intersect_key(ArrayHelper::pivot($languages, 'lang_code'), static::getInstalledLanguages(0)));
+		}
+
+		// Order the list, if needed.
+		if ($orderField !== null && $orderDirection !== null)
+		{
+			$languages = ArrayHelper::sortObjects($languages, $orderField, strtolower($orderDirection) === 'desc' ? -1 : 1, true, true);
+		}
+
+		// Add the pivot, if needed.
+		if ($pivot !== null)
+		{
+			$languages = ArrayHelper::pivot($languages, $pivot);
+		}
+
+		return $languages;
+	}
+
+	/**
+	 * Save strings to a language file.
+	 *
+	 * @param   string  $filename  The language ini file path.
+	 * @param   array   $strings   The array of strings.
+	 *
+	 * @return  boolean  True if saved, false otherwise.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function saveToIniFile($filename, array $strings)
+	{
+		\JLoader::register('\JFile', JPATH_LIBRARIES . '/joomla/filesystem/file.php');
+
+		// Escape double quotes.
+		foreach ($strings as $key => $string)
+		{
+			$strings[$key] = addcslashes($string, '"');
+		}
+
+		// Write override.ini file with the strings.
+		$registry = new Registry($strings);
+
+		return \JFile::write($filename, $registry->toString('INI'));
+	}
+
+	/**
+	 * Checks if a language exists.
+	 *
+	 * This is a simple, quick check for the directory that should contain language files for the given user.
+	 *
+	 * @param   string  $lang      Language to check.
+	 * @param   string  $basePath  Optional path to check.
+	 *
+	 * @return  boolean  True if the language exists.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function exists($lang, $basePath = JPATH_BASE)
+	{
+		static $paths = array();
+
+		// Return false if no language was specified
+		if (!$lang)
+		{
+			return false;
+		}
+
+		$path = $basePath . '/language/' . $lang;
+
+		// Return previous check results if it exists
+		if (isset($paths[$path]))
+		{
+			return $paths[$path];
+		}
+
+		// Check if the language exists
+		$paths[$path] = is_dir($path);
+
+		return $paths[$path];
+	}
+
+	/**
+	 * Returns an associative array holding the metadata.
+	 *
+	 * @param   string  $lang  The name of the language.
+	 *
+	 * @return  mixed  If $lang exists return key/value pair with the language metadata, otherwise return NULL.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getMetadata($lang)
+	{
+		$file   = self::getLanguagePath(JPATH_BASE, $lang) . '/' . $lang . '.xml';
+		$result = null;
+
+		if (is_file($file))
+		{
+			$result = self::parseXMLLanguageFile($file);
+		}
+
+		if (empty($result))
+		{
+			return;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns a list of known languages for an area
+	 *
+	 * @param   string  $basePath  The basepath to use
+	 *
+	 * @return  array  key/value pair with the language file and real name.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getKnownLanguages($basePath = JPATH_BASE)
+	{
+		return self::parseLanguageFiles(self::getLanguagePath($basePath));
+	}
+
+	/**
+	 * Get the path to a language
+	 *
+	 * @param   string  $basePath  The basepath to use.
+	 * @param   string  $language  The language tag.
+	 *
+	 * @return  string  language related path or null.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getLanguagePath($basePath = JPATH_BASE, $language = null)
+	{
+		return $basePath . '/language' . (!empty($language) ? '/' . $language : '');
+	}
+
+	/**
+	 * Searches for language directories within a certain base dir.
+	 *
+	 * @param   string  $dir  directory of files.
+	 *
+	 * @return  array  Array holding the found languages as filename => real name pairs.
+	 *
+	 * @since   3.7.0
+	 */
+	public static function parseLanguageFiles($dir = null)
+	{
+		$languages = array();
+
+		// Search main language directory for subdirectories
+		foreach (glob($dir . '/*', GLOB_NOSORT | GLOB_ONLYDIR) as $directory)
+		{
+			// But only directories with lang code format
+			if (preg_match('#/[a-z]{2,3}-[A-Z]{2}$#', $directory))
+			{
+				$dirPathParts = pathinfo($directory);
+				$file         = $directory . '/' . $dirPathParts['filename'] . '.xml';
+
+				if (!is_file($file))
+				{
+					continue;
+				}
+
+				try
+				{
+					// Get installed language metadata from xml file and merge it with lang array
+					if ($metadata = self::parseXMLLanguageFile($file))
+					{
+						$languages = array_replace($languages, array($dirPathParts['filename'] => $metadata));
+					}
+				}
+				catch (\RuntimeException $e)
+				{
+				}
+			}
+		}
+
+		return $languages;
+	}
+
+	/**
+	 * Parse XML file for language information.
+	 *
+	 * @param   string  $path  Path to the XML files.
+	 *
+	 * @return  array  Array holding the found metadata as a key => value pair.
+	 *
+	 * @since   3.7.0
+	 * @throws  \RuntimeException
+	 */
+	public static function parseXMLLanguageFile($path)
+	{
+		if (!is_readable($path))
+		{
+			throw new \RuntimeException('File not found or not readable');
+		}
+
+		// Try to load the file
+		$xml = simplexml_load_file($path);
+
+		if (!$xml)
+		{
+			return;
+		}
+
+		// Check that it's a metadata file
+		if ((string) $xml->getName() != 'metafile')
+		{
+			return;
+		}
+
+		$metadata = array();
+
+		foreach ($xml->metadata->children() as $child)
+		{
+			$metadata[$child->getName()] = (string) $child;
+		}
+
+		return $metadata;
+	}
+}
diff --git a/core/libraries/src/Language/LanguageStemmer.php b/core/libraries/src/Language/LanguageStemmer.php
new file mode 100644
index 00000000..20c6fb20
--- /dev/null
+++ b/core/libraries/src/Language/LanguageStemmer.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Stemmer base class.
+ *
+ * @since  12.1
+ */
+abstract class LanguageStemmer
+{
+	/**
+	 * An internal cache of stemmed tokens.
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $cache = array();
+
+	/**
+	 * @var    array  LanguageStemmer instances.
+	 * @since  12.1
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Method to get a stemmer, creating it if necessary.
+	 *
+	 * @param   string  $adapter  The type of stemmer to load.
+	 *
+	 * @return  LanguageStemmer  A LanguageStemmer instance.
+	 *
+	 * @since   12.1
+	 * @throws  \RuntimeException on invalid stemmer.
+	 */
+	public static function getInstance($adapter)
+	{
+		// Only create one stemmer for each adapter.
+		if (isset(self::$instances[$adapter]))
+		{
+			return self::$instances[$adapter];
+		}
+
+		// Setup the adapter for the stemmer.
+		$class = 'Joomla\\CMS\\Language\\Stemmer\\' . ucfirst(trim($adapter));
+
+		// Check if a stemmer exists for the adapter.
+		if (!class_exists($class))
+		{
+			// Throw invalid adapter exception.
+			throw new \RuntimeException(\JText::sprintf('JLIB_STEMMER_INVALID_STEMMER', $adapter));
+		}
+
+		self::$instances[$adapter] = new $class;
+
+		return self::$instances[$adapter];
+	}
+
+	/**
+	 * Method to stem a token and return the root.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   12.1
+	 */
+	abstract public function stem($token, $lang);
+}
diff --git a/core/libraries/src/Language/Multilanguage.php b/core/libraries/src/Language/Multilanguage.php
new file mode 100644
index 00000000..d3d18cd5
--- /dev/null
+++ b/core/libraries/src/Language/Multilanguage.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utitlity class for multilang
+ *
+ * @since  2.5.4
+ */
+class Multilanguage
+{
+	/**
+	 * Method to determine if the language filter plugin is enabled.
+	 * This works for both site and administrator.
+	 *
+	 * @return  boolean  True if site is supporting multiple languages; false otherwise.
+	 *
+	 * @since   2.5.4
+	 */
+	public static function isEnabled()
+	{
+		// Flag to avoid doing multiple database queries.
+		static $tested = false;
+
+		// Status of language filter plugin.
+		static $enabled = false;
+
+		// Get application object.
+		$app = \JFactory::getApplication();
+
+		// If being called from the frontend, we can avoid the database query.
+		if ($app->isClient('site'))
+		{
+			$enabled = $app->getLanguageFilter();
+
+			return $enabled;
+		}
+
+		// If already tested, don't test again.
+		if (!$tested)
+		{
+			// Determine status of language filter plugin.
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('enabled')
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+				->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('languagefilter'));
+			$db->setQuery($query);
+
+			$enabled = $db->loadResult();
+			$tested = true;
+		}
+
+		return (bool) $enabled;
+	}
+
+	/**
+	 * Method to return a list of published site languages.
+	 *
+	 * @return  array of language extension objects.
+	 *
+	 * @since   3.5
+	 * @deprecated   3.7.0  Use \JLanguageHelper::getInstalledLanguages(0) instead.
+	 */
+	public static function getSiteLangs()
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Use \JLanguageHelper::getInstalledLanguages(0) instead.', \JLog::WARNING, 'deprecated');
+
+		return \JLanguageHelper::getInstalledLanguages(0);
+	}
+
+	/**
+	 * Method to return a list of language home page menu items.
+	 *
+	 * @return  array of menu objects.
+	 *
+	 * @since   3.5
+	 */
+	public static function getSiteHomePages()
+	{
+		// To avoid doing duplicate database queries.
+		static $multilangSiteHomePages = null;
+
+		if (!isset($multilangSiteHomePages))
+		{
+			// Check for Home pages languages.
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select('language')
+				->select('id')
+				->from($db->quoteName('#__menu'))
+				->where('home = 1')
+				->where('published = 1')
+				->where('client_id = 0');
+			$db->setQuery($query);
+
+			$multilangSiteHomePages = $db->loadObjectList('language');
+		}
+
+		return $multilangSiteHomePages;
+	}
+}
diff --git a/core/libraries/src/Language/Stemmer/Porteren.php b/core/libraries/src/Language/Stemmer/Porteren.php
new file mode 100644
index 00000000..8dce9537
--- /dev/null
+++ b/core/libraries/src/Language/Stemmer/Porteren.php
@@ -0,0 +1,452 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 Richard Heyes (http://www.phpguru.org/). All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language\Stemmer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Language\LanguageStemmer;
+
+/**
+ * Porter English stemmer class.
+ *
+ * This class was adapted from one written by Richard Heyes.
+ * See copyright and link information above.
+ *
+ * @since  12.1
+ */
+class Porteren extends LanguageStemmer
+{
+	/**
+	 * Regex for matching a consonant.
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	private static $_regex_consonant = '(?:[bcdfghjklmnpqrstvwxz]|(?<=[aeiou])y|^y)';
+
+	/**
+	 * Regex for matching a vowel
+	 * @var    string
+	 * @since  12.1
+	 */
+	private static $_regex_vowel = '(?:[aeiou]|(?<![aeiou])y)';
+
+	/**
+	 * Method to stem a token and return the root.
+	 *
+	 * @param   string  $token  The token to stem.
+	 * @param   string  $lang   The language of the token.
+	 *
+	 * @return  string  The root token.
+	 *
+	 * @since   12.1
+	 */
+	public function stem($token, $lang)
+	{
+		// Check if the token is long enough to merit stemming.
+		if (strlen($token) <= 2)
+		{
+			return $token;
+		}
+
+		// Check if the language is English or All.
+		if ($lang !== 'en')
+		{
+			return $token;
+		}
+
+		// Stem the token if it is not in the cache.
+		if (!isset($this->cache[$lang][$token]))
+		{
+			// Stem the token.
+			$result = $token;
+			$result = self::_step1ab($result);
+			$result = self::_step1c($result);
+			$result = self::_step2($result);
+			$result = self::_step3($result);
+			$result = self::_step4($result);
+			$result = self::_step5($result);
+
+			// Add the token to the cache.
+			$this->cache[$lang][$token] = $result;
+		}
+
+		return $this->cache[$lang][$token];
+	}
+
+	/**
+	 * Step 1
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	private static function _step1ab($word)
+	{
+		// Part a
+		if (substr($word, -1) == 's')
+		{
+				self::_replace($word, 'sses', 'ss')
+			|| self::_replace($word, 'ies', 'i')
+			|| self::_replace($word, 'ss', 'ss')
+			|| self::_replace($word, 's', '');
+		}
+
+		// Part b
+		if (substr($word, -2, 1) != 'e' || !self::_replace($word, 'eed', 'ee', 0))
+		{
+			// First rule
+			$v = self::$_regex_vowel;
+
+			// Check ing and ed
+			// Note use of && and OR, for precedence reasons
+			if (preg_match("#$v+#", substr($word, 0, -3)) && self::_replace($word, 'ing', '')
+				|| preg_match("#$v+#", substr($word, 0, -2)) && self::_replace($word, 'ed', ''))
+			{
+				// If one of above two test successful
+				if (!self::_replace($word, 'at', 'ate') && !self::_replace($word, 'bl', 'ble') && !self::_replace($word, 'iz', 'ize'))
+				{
+					// Double consonant ending
+					if (self::_doubleConsonant($word) && substr($word, -2) != 'll' && substr($word, -2) != 'ss' && substr($word, -2) != 'zz')
+					{
+						$word = substr($word, 0, -1);
+					}
+					elseif (self::_m($word) == 1 && self::_cvc($word))
+					{
+						$word .= 'e';
+					}
+				}
+			}
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 1c
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	private static function _step1c($word)
+	{
+		$v = self::$_regex_vowel;
+
+		if (substr($word, -1) == 'y' && preg_match("#$v+#", substr($word, 0, -1)))
+		{
+			self::_replace($word, 'y', 'i');
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 2
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	private static function _step2($word)
+	{
+		switch (substr($word, -2, 1))
+		{
+			case 'a':
+					self::_replace($word, 'ational', 'ate', 0)
+				|| self::_replace($word, 'tional', 'tion', 0);
+				break;
+			case 'c':
+					self::_replace($word, 'enci', 'ence', 0)
+				|| self::_replace($word, 'anci', 'ance', 0);
+				break;
+			case 'e':
+				self::_replace($word, 'izer', 'ize', 0);
+				break;
+			case 'g':
+				self::_replace($word, 'logi', 'log', 0);
+				break;
+			case 'l':
+					self::_replace($word, 'entli', 'ent', 0)
+				|| self::_replace($word, 'ousli', 'ous', 0)
+				|| self::_replace($word, 'alli', 'al', 0)
+				|| self::_replace($word, 'bli', 'ble', 0)
+				|| self::_replace($word, 'eli', 'e', 0);
+				break;
+			case 'o':
+					self::_replace($word, 'ization', 'ize', 0)
+				|| self::_replace($word, 'ation', 'ate', 0)
+				|| self::_replace($word, 'ator', 'ate', 0);
+				break;
+			case 's':
+					self::_replace($word, 'iveness', 'ive', 0)
+				|| self::_replace($word, 'fulness', 'ful', 0)
+				|| self::_replace($word, 'ousness', 'ous', 0)
+				|| self::_replace($word, 'alism', 'al', 0);
+				break;
+			case 't':
+					self::_replace($word, 'biliti', 'ble', 0)
+				|| self::_replace($word, 'aliti', 'al', 0)
+				|| self::_replace($word, 'iviti', 'ive', 0);
+				break;
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 3
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	private static function _step3($word)
+	{
+		switch (substr($word, -2, 1))
+		{
+			case 'a':
+				self::_replace($word, 'ical', 'ic', 0);
+				break;
+			case 's':
+				self::_replace($word, 'ness', '', 0);
+				break;
+			case 't':
+					self::_replace($word, 'icate', 'ic', 0)
+				|| self::_replace($word, 'iciti', 'ic', 0);
+				break;
+			case 'u':
+				self::_replace($word, 'ful', '', 0);
+				break;
+			case 'v':
+				self::_replace($word, 'ative', '', 0);
+				break;
+			case 'z':
+				self::_replace($word, 'alize', 'al', 0);
+				break;
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 4
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	private static function _step4($word)
+	{
+		switch (substr($word, -2, 1))
+		{
+			case 'a':
+				self::_replace($word, 'al', '', 1);
+				break;
+			case 'c':
+					self::_replace($word, 'ance', '', 1)
+				|| self::_replace($word, 'ence', '', 1);
+				break;
+			case 'e':
+				self::_replace($word, 'er', '', 1);
+				break;
+			case 'i':
+				self::_replace($word, 'ic', '', 1);
+				break;
+			case 'l':
+					self::_replace($word, 'able', '', 1)
+				|| self::_replace($word, 'ible', '', 1);
+				break;
+			case 'n':
+					self::_replace($word, 'ant', '', 1)
+				|| self::_replace($word, 'ement', '', 1)
+				|| self::_replace($word, 'ment', '', 1)
+				|| self::_replace($word, 'ent', '', 1);
+				break;
+			case 'o':
+				if (substr($word, -4) == 'tion' || substr($word, -4) == 'sion')
+				{
+					self::_replace($word, 'ion', '', 1);
+				}
+				else
+				{
+					self::_replace($word, 'ou', '', 1);
+				}
+				break;
+			case 's':
+				self::_replace($word, 'ism', '', 1);
+				break;
+			case 't':
+					self::_replace($word, 'ate', '', 1)
+				|| self::_replace($word, 'iti', '', 1);
+				break;
+			case 'u':
+				self::_replace($word, 'ous', '', 1);
+				break;
+			case 'v':
+				self::_replace($word, 'ive', '', 1);
+				break;
+			case 'z':
+				self::_replace($word, 'ize', '', 1);
+				break;
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Step 5
+	 *
+	 * @param   string  $word  The token to stem.
+	 *
+	 * @return  string
+	 *
+	 * @since   12.1
+	 */
+	private static function _step5($word)
+	{
+		// Part a
+		if (substr($word, -1) == 'e')
+		{
+			if (self::_m(substr($word, 0, -1)) > 1)
+			{
+				self::_replace($word, 'e', '');
+			}
+			elseif (self::_m(substr($word, 0, -1)) == 1)
+			{
+				if (!self::_cvc(substr($word, 0, -1)))
+				{
+					self::_replace($word, 'e', '');
+				}
+			}
+		}
+
+		// Part b
+		if (self::_m($word) > 1 && self::_doubleConsonant($word) && substr($word, -1) == 'l')
+		{
+			$word = substr($word, 0, -1);
+		}
+
+		return $word;
+	}
+
+	/**
+	 * Replaces the first string with the second, at the end of the string. If third
+	 * arg is given, then the preceding string must match that m count at least.
+	 *
+	 * @param   string   &$str   String to check
+	 * @param   string   $check  Ending to check for
+	 * @param   string   $repl   Replacement string
+	 * @param   integer  $m      Optional minimum number of m() to meet
+	 *
+	 * @return  boolean  Whether the $check string was at the end
+	 *                   of the $str string. True does not necessarily mean
+	 *                   that it was replaced.
+	 *
+	 * @since   12.1
+	 */
+	private static function _replace(&$str, $check, $repl, $m = null)
+	{
+		$len = 0 - strlen($check);
+
+		if (substr($str, $len) == $check)
+		{
+			$substr = substr($str, 0, $len);
+
+			if (is_null($m) || self::_m($substr) > $m)
+			{
+				$str = $substr . $repl;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * m() measures the number of consonant sequences in $str. if c is
+	 * a consonant sequence and v a vowel sequence, and <..> indicates arbitrary
+	 * presence,
+	 *
+	 * <c><v>       gives 0
+	 * <c>vc<v>     gives 1
+	 * <c>vcvc<v>   gives 2
+	 * <c>vcvcvc<v> gives 3
+	 *
+	 * @param   string  $str  The string to return the m count for
+	 *
+	 * @return  integer  The m count
+	 *
+	 * @since   12.1
+	 */
+	private static function _m($str)
+	{
+		$c = self::$_regex_consonant;
+		$v = self::$_regex_vowel;
+
+		$str = preg_replace("#^$c+#", '', $str);
+		$str = preg_replace("#$v+$#", '', $str);
+
+		preg_match_all("#($v+$c+)#", $str, $matches);
+
+		return count($matches[1]);
+	}
+
+	/**
+	 * Returns true/false as to whether the given string contains two
+	 * of the same consonant next to each other at the end of the string.
+	 *
+	 * @param   string  $str  String to check
+	 *
+	 * @return  boolean  Result
+	 *
+	 * @since   12.1
+	 */
+	private static function _doubleConsonant($str)
+	{
+		$c = self::$_regex_consonant;
+
+		return preg_match("#$c{2}$#", $str, $matches) && $matches[0]{0} == $matches[0]{1};
+	}
+
+	/**
+	 * Checks for ending CVC sequence where second C is not W, X or Y
+	 *
+	 * @param   string  $str  String to check
+	 *
+	 * @return  boolean  Result
+	 *
+	 * @since   12.1
+	 */
+	private static function _cvc($str)
+	{
+		$c = self::$_regex_consonant;
+		$v = self::$_regex_vowel;
+
+		$result = preg_match("#($c$v$c)$#", $str, $matches)
+			&& strlen($matches[1]) == 3
+			&& $matches[1]{2} != 'w'
+			&& $matches[1]{2} != 'x'
+			&& $matches[1]{2} != 'y';
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Language/Text.php b/core/libraries/src/Language/Text.php
new file mode 100644
index 00000000..6814f177
--- /dev/null
+++ b/core/libraries/src/Language/Text.php
@@ -0,0 +1,426 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Text handling class.
+ *
+ * @since  11.1
+ */
+class Text
+{
+	/**
+	 * JavaScript strings
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected static $strings = array();
+
+	/**
+	 * Translates a string into the current language.
+	 *
+	 * Examples:
+	 * `<script>alert(Joomla.JText._('<?php echo Text::_("JDEFAULT", array("script"=>true)); ?>'));</script>`
+	 * will generate an alert message containing 'Default'
+	 * `<?php echo Text::_("JDEFAULT"); ?>` will generate a 'Default' string
+	 *
+	 * @param   string   $string                The string to translate.
+	 * @param   mixed    $jsSafe                Boolean: Make the result javascript safe.
+	 * @param   boolean  $interpretBackSlashes  To interpret backslashes (\\=\, \n=carriage return, \t=tabulation)
+	 * @param   boolean  $script                To indicate that the string will be push in the javascript language store
+	 *
+	 * @return  string  The translated string or the key if $script is true
+	 *
+	 * @since   11.1
+	 */
+	public static function _($string, $jsSafe = false, $interpretBackSlashes = true, $script = false)
+	{
+		if (is_array($jsSafe))
+		{
+			if (array_key_exists('interpretBackSlashes', $jsSafe))
+			{
+				$interpretBackSlashes = (boolean) $jsSafe['interpretBackSlashes'];
+			}
+
+			if (array_key_exists('script', $jsSafe))
+			{
+				$script = (boolean) $jsSafe['script'];
+			}
+
+			$jsSafe = array_key_exists('jsSafe', $jsSafe) ? (boolean) $jsSafe['jsSafe'] : false;
+		}
+
+		if (self::passSprintf($string, $jsSafe, $interpretBackSlashes, $script))
+		{
+			return $string;
+		}
+
+		$lang = Factory::getLanguage();
+
+		if ($script)
+		{
+			static::$strings[$string] = $lang->_($string, $jsSafe, $interpretBackSlashes);
+
+			return $string;
+		}
+
+		return $lang->_($string, $jsSafe, $interpretBackSlashes);
+	}
+
+	/**
+	 * Checks the string if it should be interpreted as sprintf and runs sprintf over it.
+	 *
+	 * @param   string   &$string               The string to translate.
+	 * @param   mixed    $jsSafe                Boolean: Make the result javascript safe.
+	 * @param   boolean  $interpretBackSlashes  To interpret backslashes (\\=\, \n=carriage return, \t=tabulation)
+	 * @param   boolean  $script                To indicate that the string will be push in the javascript language store
+	 *
+	 * @return  boolean  Whether the string be interpreted as sprintf
+	 *
+	 * @since   3.4.4
+	 */
+	private static function passSprintf(&$string, $jsSafe = false, $interpretBackSlashes = true, $script = false)
+	{
+		// Check if string contains a comma
+		if (strpos($string, ',') === false)
+		{
+			return false;
+		}
+
+		$lang = Factory::getLanguage();
+		$string_parts = explode(',', $string);
+
+		// Pass all parts through the Text translator
+		foreach ($string_parts as $i => $str)
+		{
+			$string_parts[$i] = $lang->_($str, $jsSafe, $interpretBackSlashes);
+		}
+
+		$first_part = array_shift($string_parts);
+
+		// Replace custom named placeholders with sprinftf style placeholders
+		$first_part = preg_replace('/\[\[%([0-9]+):[^\]]*\]\]/', '%\1$s', $first_part);
+
+		// Check if string contains sprintf placeholders
+		if (!preg_match('/%([0-9]+\$)?s/', $first_part))
+		{
+			return false;
+		}
+
+		$final_string = vsprintf($first_part, $string_parts);
+
+		// Return false if string hasn't changed
+		if ($first_part === $final_string)
+		{
+			return false;
+		}
+
+		$string = $final_string;
+
+		if ($script)
+		{
+			foreach ($string_parts as $i => $str)
+			{
+				static::$strings[$str] = $string_parts[$i];
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Translates a string into the current language.
+	 *
+	 * Examples:
+	 * `<?php echo Text::alt('JALL', 'language'); ?>` will generate a 'All' string in English but a "Toutes" string in French
+	 * `<?php echo Text::alt('JALL', 'module'); ?>` will generate a 'All' string in English but a "Tous" string in French
+	 *
+	 * @param   string   $string                The string to translate.
+	 * @param   string   $alt                   The alternate option for global string
+	 * @param   mixed    $jsSafe                Boolean: Make the result javascript safe.
+	 * @param   boolean  $interpretBackSlashes  To interpret backslashes (\\=\, \n=carriage return, \t=tabulation)
+	 * @param   boolean  $script                To indicate that the string will be pushed in the javascript language store
+	 *
+	 * @return  string  The translated string or the key if $script is true
+	 *
+	 * @since   11.1
+	 */
+	public static function alt($string, $alt, $jsSafe = false, $interpretBackSlashes = true, $script = false)
+	{
+		if (Factory::getLanguage()->hasKey($string . '_' . $alt))
+		{
+			$string .= '_' . $alt;
+		}
+
+		return static::_($string, $jsSafe, $interpretBackSlashes, $script);
+	}
+
+	/**
+	 * Like Text::sprintf but tries to pluralise the string.
+	 *
+	 * Note that this method can take a mixed number of arguments as for the sprintf function.
+	 *
+	 * The last argument can take an array of options:
+	 *
+	 * array('jsSafe'=>boolean, 'interpretBackSlashes'=>boolean, 'script'=>boolean)
+	 *
+	 * where:
+	 *
+	 * jsSafe is a boolean to generate a javascript safe strings.
+	 * interpretBackSlashes is a boolean to interpret backslashes \\->\, \n->new line, \t->tabulation.
+	 * script is a boolean to indicate that the string will be push in the javascript language store.
+	 *
+	 * Examples:
+	 * `<script>alert(Joomla.JText._('<?php echo Text::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1, array("script"=>true)); ?>'));</script>`
+	 * will generate an alert message containing '1 plugin successfully disabled'
+	 * `<?php echo Text::plural('COM_PLUGINS_N_ITEMS_UNPUBLISHED', 1); ?>` will generate a '1 plugin successfully disabled' string
+	 *
+	 * @param   string   $string  The format string.
+	 * @param   integer  $n       The number of items
+	 *
+	 * @return  string  The translated strings or the key if 'script' is true in the array of options
+	 *
+	 * @since   11.1
+	 */
+	public static function plural($string, $n)
+	{
+		$lang = Factory::getLanguage();
+		$args = func_get_args();
+		$count = count($args);
+
+		if ($count < 1)
+		{
+			return '';
+		}
+
+		if ($count == 1)
+		{
+			// Default to the normal sprintf handling.
+			$args[0] = $lang->_($string);
+
+			return call_user_func_array('sprintf', $args);
+		}
+
+		// Try the key from the language plural potential suffixes
+		$found = false;
+		$suffixes = $lang->getPluralSuffixes((int) $n);
+		array_unshift($suffixes, (int) $n);
+
+		foreach ($suffixes as $suffix)
+		{
+			$key = $string . '_' . $suffix;
+
+			if ($lang->hasKey($key))
+			{
+				$found = true;
+				break;
+			}
+		}
+
+		if (!$found)
+		{
+			// Not found so revert to the original.
+			$key = $string;
+		}
+
+		if (is_array($args[$count - 1]))
+		{
+			$args[0] = $lang->_(
+				$key, array_key_exists('jsSafe', $args[$count - 1]) ? $args[$count - 1]['jsSafe'] : false,
+				array_key_exists('interpretBackSlashes', $args[$count - 1]) ? $args[$count - 1]['interpretBackSlashes'] : true
+			);
+
+			if (array_key_exists('script', $args[$count - 1]) && $args[$count - 1]['script'])
+			{
+				static::$strings[$key] = call_user_func_array('sprintf', $args);
+
+				return $key;
+			}
+		}
+		else
+		{
+			$args[0] = $lang->_($key);
+		}
+
+		return call_user_func_array('sprintf', $args);
+	}
+
+	/**
+	 * Passes a string thru a sprintf.
+	 *
+	 * Note that this method can take a mixed number of arguments as for the sprintf function.
+	 *
+	 * The last argument can take an array of options:
+	 *
+	 * array('jsSafe'=>boolean, 'interpretBackSlashes'=>boolean, 'script'=>boolean)
+	 *
+	 * where:
+	 *
+	 * jsSafe is a boolean to generate a javascript safe strings.
+	 * interpretBackSlashes is a boolean to interpret backslashes \\->\, \n->new line, \t->tabulation.
+	 * script is a boolean to indicate that the string will be push in the javascript language store.
+	 *
+	 * @param   string  $string  The format string.
+	 *
+	 * @return  string  The translated strings or the key if 'script' is true in the array of options.
+	 *
+	 * @since   11.1
+	 */
+	public static function sprintf($string)
+	{
+		$lang = Factory::getLanguage();
+		$args = func_get_args();
+		$count = count($args);
+
+		if ($count < 1)
+		{
+			return '';
+		}
+
+		if (is_array($args[$count - 1]))
+		{
+			$args[0] = $lang->_(
+				$string, array_key_exists('jsSafe', $args[$count - 1]) ? $args[$count - 1]['jsSafe'] : false,
+				array_key_exists('interpretBackSlashes', $args[$count - 1]) ? $args[$count - 1]['interpretBackSlashes'] : true
+			);
+
+			if (array_key_exists('script', $args[$count - 1]) && $args[$count - 1]['script'])
+			{
+				static::$strings[$string] = call_user_func_array('sprintf', $args);
+
+				return $string;
+			}
+		}
+		else
+		{
+			$args[0] = $lang->_($string);
+		}
+
+		// Replace custom named placeholders with sprintf style placeholders
+		$args[0] = preg_replace('/\[\[%([0-9]+):[^\]]*\]\]/', '%\1$s', $args[0]);
+
+		return call_user_func_array('sprintf', $args);
+	}
+
+	/**
+	 * Passes a string thru an printf.
+	 *
+	 * Note that this method can take a mixed number of arguments as for the sprintf function.
+	 *
+	 * @param   string  $string  The format string.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public static function printf($string)
+	{
+		$lang = Factory::getLanguage();
+		$args = func_get_args();
+		$count = count($args);
+
+		if ($count < 1)
+		{
+			return '';
+		}
+
+		if (is_array($args[$count - 1]))
+		{
+			$args[0] = $lang->_(
+				$string, array_key_exists('jsSafe', $args[$count - 1]) ? $args[$count - 1]['jsSafe'] : false,
+				array_key_exists('interpretBackSlashes', $args[$count - 1]) ? $args[$count - 1]['interpretBackSlashes'] : true
+			);
+		}
+		else
+		{
+			$args[0] = $lang->_($string);
+		}
+
+		return call_user_func_array('printf', $args);
+	}
+
+	/**
+	 * Translate a string into the current language and stores it in the JavaScript language store.
+	 *
+	 * @param   string   $string                The Text key.
+	 * @param   boolean  $jsSafe                Ensure the output is JavaScript safe.
+	 * @param   boolean  $interpretBackSlashes  Interpret \t and \n.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public static function script($string = null, $jsSafe = false, $interpretBackSlashes = true)
+	{
+		if ($string === null)
+		{
+			Log::add(
+				sprintf(
+					'As of 3.7.0, passing a null value for the first argument of %1$s() is deprecated and will not be supported in 4.0.'
+					. ' Use the %2$s::getScriptStrings() method to get the strings from the JavaScript language store instead.',
+					__METHOD__,
+					__CLASS__
+				),
+				Log::WARNING,
+				'deprecated'
+			);
+		}
+
+		if (is_array($jsSafe))
+		{
+			if (array_key_exists('interpretBackSlashes', $jsSafe))
+			{
+				$interpretBackSlashes = (boolean) $jsSafe['interpretBackSlashes'];
+			}
+
+			if (array_key_exists('jsSafe', $jsSafe))
+			{
+				$jsSafe = (boolean) $jsSafe['jsSafe'];
+			}
+			else
+			{
+				$jsSafe = false;
+			}
+		}
+
+		// Add the string to the array if not null.
+		if ($string !== null)
+		{
+			// Normalize the key and translate the string.
+			static::$strings[strtoupper($string)] = Factory::getLanguage()->_($string, $jsSafe, $interpretBackSlashes);
+
+			// Load core.js dependency
+			HTMLHelper::_('behavior.core');
+
+			// Update Joomla.JText script options
+			Factory::getDocument()->addScriptOptions('joomla.jtext', static::$strings, false);
+		}
+
+		return static::getScriptStrings();
+	}
+
+	/**
+	 * Get the strings that have been loaded to the JavaScript language store.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getScriptStrings()
+	{
+		return static::$strings;
+	}
+}
diff --git a/core/libraries/src/Language/Transliterate.php b/core/libraries/src/Language/Transliterate.php
new file mode 100644
index 00000000..5d65dc6f
--- /dev/null
+++ b/core/libraries/src/Language/Transliterate.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Class to transliterate strings
+ *
+ * @since  11.1
+ * @note   Port of phputf8's utf8_accents_to_ascii()
+ */
+class Transliterate
+{
+	/**
+	 * Returns strings transliterated from UTF-8 to Latin
+	 *
+	 * @param   string   $string  String to transliterate
+	 * @param   integer  $case    Optionally specify upper or lower case. Default to null.
+	 *
+	 * @return  string  Transliterated string
+	 *
+	 * @since   11.1
+	 */
+	public static function utf8_latin_to_ascii($string, $case = 0)
+	{
+		static $UTF8_LOWER_ACCENTS = null;
+		static $UTF8_UPPER_ACCENTS = null;
+
+		if ($case <= 0)
+		{
+			if (is_null($UTF8_LOWER_ACCENTS))
+			{
+				$UTF8_LOWER_ACCENTS = array(
+					'à' => 'a',
+					'ô' => 'o',
+					'ď' => 'd',
+					'ḟ' => 'f',
+					'ë' => 'e',
+					'š' => 's',
+					'ơ' => 'o',
+					'ß' => 'ss',
+					'ă' => 'a',
+					'ř' => 'r',
+					'ț' => 't',
+					'ň' => 'n',
+					'ā' => 'a',
+					'ķ' => 'k',
+					'ŝ' => 's',
+					'ỳ' => 'y',
+					'ņ' => 'n',
+					'ĺ' => 'l',
+					'ħ' => 'h',
+					'ṗ' => 'p',
+					'ó' => 'o',
+					'ú' => 'u',
+					'ě' => 'e',
+					'é' => 'e',
+					'ç' => 'c',
+					'ẁ' => 'w',
+					'ċ' => 'c',
+					'õ' => 'o',
+					'ṡ' => 's',
+					'ø' => 'o',
+					'ģ' => 'g',
+					'ŧ' => 't',
+					'ș' => 's',
+					'ė' => 'e',
+					'ĉ' => 'c',
+					'ś' => 's',
+					'î' => 'i',
+					'ű' => 'u',
+					'ć' => 'c',
+					'ę' => 'e',
+					'ŵ' => 'w',
+					'ṫ' => 't',
+					'ū' => 'u',
+					'č' => 'c',
+					'ö' => 'oe',
+					'è' => 'e',
+					'ŷ' => 'y',
+					'ą' => 'a',
+					'ł' => 'l',
+					'ų' => 'u',
+					'ů' => 'u',
+					'ş' => 's',
+					'ğ' => 'g',
+					'ļ' => 'l',
+					'ƒ' => 'f',
+					'ž' => 'z',
+					'ẃ' => 'w',
+					'ḃ' => 'b',
+					'å' => 'a',
+					'ì' => 'i',
+					'ï' => 'i',
+					'ḋ' => 'd',
+					'ť' => 't',
+					'ŗ' => 'r',
+					'ä' => 'ae',
+					'í' => 'i',
+					'ŕ' => 'r',
+					'ê' => 'e',
+					'ü' => 'ue',
+					'ò' => 'o',
+					'ē' => 'e',
+					'ñ' => 'n',
+					'ń' => 'n',
+					'ĥ' => 'h',
+					'ĝ' => 'g',
+					'đ' => 'd',
+					'ĵ' => 'j',
+					'ÿ' => 'y',
+					'ũ' => 'u',
+					'ŭ' => 'u',
+					'ư' => 'u',
+					'ţ' => 't',
+					'ý' => 'y',
+					'ő' => 'o',
+					'â' => 'a',
+					'ľ' => 'l',
+					'ẅ' => 'w',
+					'ż' => 'z',
+					'ī' => 'i',
+					'ã' => 'a',
+					'ġ' => 'g',
+					'ṁ' => 'm',
+					'ō' => 'o',
+					'ĩ' => 'i',
+					'ù' => 'u',
+					'į' => 'i',
+					'ź' => 'z',
+					'á' => 'a',
+					'û' => 'u',
+					'þ' => 'th',
+					'ð' => 'dh',
+					'æ' => 'ae',
+					'µ' => 'u',
+					'ĕ' => 'e',
+					'œ' => 'oe',
+				);
+			}
+
+			$string = str_replace(array_keys($UTF8_LOWER_ACCENTS), array_values($UTF8_LOWER_ACCENTS), $string);
+		}
+
+		if ($case >= 0)
+		{
+			if (is_null($UTF8_UPPER_ACCENTS))
+			{
+				$UTF8_UPPER_ACCENTS = array(
+					'À' => 'A',
+					'Ô' => 'O',
+					'Ď' => 'D',
+					'Ḟ' => 'F',
+					'Ë' => 'E',
+					'Š' => 'S',
+					'Ơ' => 'O',
+					'Ă' => 'A',
+					'Ř' => 'R',
+					'Ț' => 'T',
+					'Ň' => 'N',
+					'Ā' => 'A',
+					'Ķ' => 'K',
+					'Ŝ' => 'S',
+					'Ỳ' => 'Y',
+					'Ņ' => 'N',
+					'Ĺ' => 'L',
+					'Ħ' => 'H',
+					'Ṗ' => 'P',
+					'Ó' => 'O',
+					'Ú' => 'U',
+					'Ě' => 'E',
+					'É' => 'E',
+					'Ç' => 'C',
+					'Ẁ' => 'W',
+					'Ċ' => 'C',
+					'Õ' => 'O',
+					'Ṡ' => 'S',
+					'Ø' => 'O',
+					'Ģ' => 'G',
+					'Ŧ' => 'T',
+					'Ș' => 'S',
+					'Ė' => 'E',
+					'Ĉ' => 'C',
+					'Ś' => 'S',
+					'Î' => 'I',
+					'Ű' => 'U',
+					'Ć' => 'C',
+					'Ę' => 'E',
+					'Ŵ' => 'W',
+					'Ṫ' => 'T',
+					'Ū' => 'U',
+					'Č' => 'C',
+					'Ö' => 'Oe',
+					'È' => 'E',
+					'Ŷ' => 'Y',
+					'Ą' => 'A',
+					'Ł' => 'L',
+					'Ų' => 'U',
+					'Ů' => 'U',
+					'Ş' => 'S',
+					'Ğ' => 'G',
+					'Ļ' => 'L',
+					'Ƒ' => 'F',
+					'Ž' => 'Z',
+					'Ẃ' => 'W',
+					'Ḃ' => 'B',
+					'Å' => 'A',
+					'Ì' => 'I',
+					'Ï' => 'I',
+					'Ḋ' => 'D',
+					'Ť' => 'T',
+					'Ŗ' => 'R',
+					'Ä' => 'Ae',
+					'Í' => 'I',
+					'Ŕ' => 'R',
+					'Ê' => 'E',
+					'Ü' => 'Ue',
+					'Ò' => 'O',
+					'Ē' => 'E',
+					'Ñ' => 'N',
+					'Ń' => 'N',
+					'Ĥ' => 'H',
+					'Ĝ' => 'G',
+					'Đ' => 'D',
+					'Ĵ' => 'J',
+					'Ÿ' => 'Y',
+					'Ũ' => 'U',
+					'Ŭ' => 'U',
+					'Ư' => 'U',
+					'Ţ' => 'T',
+					'Ý' => 'Y',
+					'Ő' => 'O',
+					'Â' => 'A',
+					'Ľ' => 'L',
+					'Ẅ' => 'W',
+					'Ż' => 'Z',
+					'Ī' => 'I',
+					'Ã' => 'A',
+					'Ġ' => 'G',
+					'Ṁ' => 'M',
+					'Ō' => 'O',
+					'Ĩ' => 'I',
+					'Ù' => 'U',
+					'Į' => 'I',
+					'Ź' => 'Z',
+					'Á' => 'A',
+					'Û' => 'U',
+					'Þ' => 'Th',
+					'Ð' => 'Dh',
+					'Æ' => 'Ae',
+					'Ĕ' => 'E',
+					'Œ' => 'Oe',
+				);
+			}
+
+			$string = str_replace(array_keys($UTF8_UPPER_ACCENTS), array_values($UTF8_UPPER_ACCENTS), $string);
+		}
+
+		return $string;
+	}
+}
diff --git a/core/libraries/src/Language/Wrapper/JTextWrapper.php b/core/libraries/src/Language/Wrapper/JTextWrapper.php
new file mode 100644
index 00000000..796dde0a
--- /dev/null
+++ b/core/libraries/src/Language/Wrapper/JTextWrapper.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language\Wrapper;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for JText
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `JText` directly
+ */
+class JTextWrapper
+{
+	/**
+	 * Helper wrapper method for _
+	 *
+	 * @param   string   $string                The string to translate.
+	 * @param   mixed    $jsSafe                Boolean: Make the result javascript safe.
+	 * @param   boolean  $interpretBackSlashes  To interpret backslashes (\\=\, \n=carriage return, \t=tabulation).
+	 * @param   boolean  $script                To indicate that the string will be push in the javascript language store.
+	 *
+	 * @return  string  The translated string or the key if $script is true.
+	 *
+	 * @see     \JText::_
+	 * @since   3.4
+	 * @deprecated  4.0  Use `JText` directly
+	 */
+	public function _($string, $jsSafe = false, $interpretBackSlashes = true, $script = false)
+	{
+		return \JText::_($string, $jsSafe, $interpretBackSlashes, $script);
+	}
+
+	/**
+	 * Helper wrapper method for alt
+	 *
+	 * @param   string   $string                The string to translate.
+	 * @param   string   $alt                   The alternate option for global string.
+	 * @param   mixed    $jsSafe                Boolean: Make the result javascript safe.
+	 * @param   boolean  $interpretBackSlashes  To interpret backslashes (\\=\, \n=carriage return, \t=tabulation).
+	 * @param   boolean  $script                To indicate that the string will be pushed in the javascript language store.
+	 *
+	 * @return  string  The translated string or the key if $script is true.
+	 *
+	 * @see     \JText::alt
+	 * @since   3.4
+	 * @deprecated  4.0  Use `JText` directly
+	 */
+	public function alt($string, $alt, $jsSafe = false, $interpretBackSlashes = true, $script = false)
+	{
+		return \JText::alt($string, $alt, $jsSafe, $interpretBackSlashes, $script);
+	}
+
+	/**
+	 * Helper wrapper method for plural
+	 *
+	 * @param   string   $string  The format string.
+	 * @param   integer  $n       The number of items.
+	 *
+	 * @return  string  The translated strings or the key if 'script' is true in the array of options.
+	 *
+	 * @see     \JText::plural
+	 * @since   3.4
+	 * @deprecated  4.0  Use `JText` directly
+	 */
+	public function plural($string, $n)
+	{
+		return \JText::plural($string, $n);
+	}
+
+	/**
+	 * Helper wrapper method for sprintf
+	 *
+	 * @param   string  $string  The format string.
+	 *
+	 * @return  string  The translated strings or the key if 'script' is true in the array of options.
+	 *
+	 * @see     \JText::sprintf
+	 * @since   3.4
+	 * @deprecated  4.0  Use `JText` directly
+	 */
+	public function sprintf($string)
+	{
+		return \JText::sprintf($string);
+	}
+
+	/**
+	 * Helper wrapper method for printf
+	 *
+	 * @param   string  $string  The format string.
+	 *
+	 * @return  mixed
+	 *
+	 * @see     \JText::printf
+	 * @since   3.4
+	 * @deprecated  4.0  Use `JText` directly
+	 */
+	public function printf($string)
+	{
+		return \JText::printf($string);
+	}
+
+	/**
+	 * Helper wrapper method for script
+	 *
+	 * @param   string   $string                The \JText key.
+	 * @param   boolean  $jsSafe                Ensure the output is JavaScript safe.
+	 * @param   boolean  $interpretBackSlashes  Interpret \t and \n.
+	 *
+	 * @return  string
+	 *
+	 * @see     \JText::script
+	 * @since   3.4
+	 * @deprecated  4.0  Use `JText` directly
+	 */
+	public function script($string = null, $jsSafe = false, $interpretBackSlashes = true)
+	{
+		return \JText::script($string, $jsSafe, $interpretBackSlashes);
+	}
+}
diff --git a/core/libraries/src/Language/Wrapper/LanguageHelperWrapper.php b/core/libraries/src/Language/Wrapper/LanguageHelperWrapper.php
new file mode 100644
index 00000000..f614fbfb
--- /dev/null
+++ b/core/libraries/src/Language/Wrapper/LanguageHelperWrapper.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language\Wrapper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Language\LanguageHelper;
+
+/**
+ * Wrapper class for LanguageHelper
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `Joomla\CMS\Language\LanguageHelper` directly
+ */
+class LanguageHelperWrapper
+{
+	/**
+	 * Helper wrapper method for createLanguageList
+	 *
+	 * @param   string   $actualLanguage  Client key for the area.
+	 * @param   string   $basePath        Base path to use.
+	 * @param   boolean  $caching         True if caching is used.
+	 * @param   boolean  $installed       Get only installed languages.
+	 *
+	 * @return  array  List of system languages.
+	 *
+	 * @see     LanguageHelper::createLanguageList
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Language\LanguageHelper` directly
+	 */
+	public function createLanguageList($actualLanguage, $basePath = JPATH_BASE, $caching = false, $installed = false)
+	{
+		return LanguageHelper::createLanguageList($actualLanguage, $basePath, $caching, $installed);
+	}
+
+	/**
+	 * Helper wrapper method for detectLanguage
+	 *
+	 * @return  string  locale or null if not found.
+	 *
+	 * @see     LanguageHelper::detectLanguage
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Language\LanguageHelper` directly
+	 */
+	public function detectLanguage()
+	{
+		return LanguageHelper::detectLanguage();
+	}
+
+	/**
+	 * Helper wrapper method for getLanguages
+	 *
+	 * @param   string  $key  Array key
+	 *
+	 * @return  array  An array of published languages.
+	 *
+	 * @see     LanguageHelper::getLanguages
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Language\LanguageHelper` directly
+	 */
+	public function getLanguages($key = 'default')
+	{
+		return LanguageHelper::getLanguages($key);
+	}
+}
diff --git a/core/libraries/src/Language/Wrapper/TransliterateWrapper.php b/core/libraries/src/Language/Wrapper/TransliterateWrapper.php
new file mode 100644
index 00000000..5bed5923
--- /dev/null
+++ b/core/libraries/src/Language/Wrapper/TransliterateWrapper.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language\Wrapper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Language\Transliterate;
+
+/**
+ * Wrapper class for Transliterate
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `Joomla\CMS\Language\Transliterate` directly
+ */
+class TransliterateWrapper
+{
+	/**
+	 * Helper wrapper method for utf8_latin_to_ascii
+	 *
+	 * @param   string   $string  String to transliterate.
+	 * @param   integer  $case    Optionally specify upper or lower case. Default to null.
+	 *
+	 * @return  string  Transliterated string.
+	 *
+	 * @see     Transliterate::utf8_latin_to_ascii()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\Language\Transliterate` directly
+	 */
+	public function utf8_latin_to_ascii($string, $case = 0)
+	{
+		return Transliterate::utf8_latin_to_ascii($string, $case);
+	}
+}
diff --git a/core/libraries/src/Layout/BaseLayout.php b/core/libraries/src/Layout/BaseLayout.php
new file mode 100644
index 00000000..622d6b61
--- /dev/null
+++ b/core/libraries/src/Layout/BaseLayout.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Layout;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Base class for rendering a display layout
+ *
+ * @link   https://docs.joomla.org/Special:MyLanguage/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since  3.0
+ */
+class BaseLayout implements LayoutInterface
+{
+	/**
+	 * Options object
+	 *
+	 * @var    Registry
+	 * @since  3.2
+	 */
+	protected $options = null;
+
+	/**
+	 * Data for the layout
+	 *
+	 * @var    array
+	 * @since  3.5
+	 */
+	protected $data = array();
+
+	/**
+	 * Debug information messages
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $debugMessages = array();
+
+	/**
+	 * Set the options
+	 *
+	 * @param   array|Registry  $options  Array / Registry object with the options to load
+	 *
+	 * @return  BaseLayout  Instance of $this to allow chaining.
+	 *
+	 * @since   3.2
+	 */
+	public function setOptions($options = null)
+	{
+		// Received Registry
+		if ($options instanceof Registry)
+		{
+			$this->options = $options;
+		}
+		// Received array
+		elseif (is_array($options))
+		{
+			$this->options = new Registry($options);
+		}
+		else
+		{
+			$this->options = new Registry;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the options
+	 *
+	 * @return  Registry  Object with the options
+	 *
+	 * @since   3.2
+	 */
+	public function getOptions()
+	{
+		// Always return a Registry instance
+		if (!($this->options instanceof Registry))
+		{
+			$this->resetOptions();
+		}
+
+		return $this->options;
+	}
+
+	/**
+	 * Function to empty all the options
+	 *
+	 * @return  BaseLayout  Instance of $this to allow chaining.
+	 *
+	 * @since   3.2
+	 */
+	public function resetOptions()
+	{
+		return $this->setOptions(null);
+	}
+
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @since   3.0
+	 */
+	public function escape($output)
+	{
+		return htmlspecialchars($output, ENT_COMPAT, 'UTF-8');
+	}
+
+	/**
+	 * Get the debug messages array
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public function getDebugMessages()
+	{
+		return $this->debugMessages;
+	}
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   array  $displayData  Array of properties available for use inside the layout file to build the displayed output
+	 *
+	 * @return  string  The necessary HTML to display the layout
+	 *
+	 * @since   3.0
+	 */
+	public function render($displayData)
+	{
+		// Automatically merge any previously data set if $displayData is an array
+		if (is_array($displayData))
+		{
+			$displayData = array_merge($this->data, $displayData);
+		}
+
+		return '';
+	}
+
+	/**
+	 * Render the list of debug messages
+	 *
+	 * @return  string  Output text/HTML code
+	 *
+	 * @since   3.2
+	 */
+	public function renderDebugMessages()
+	{
+		return implode($this->debugMessages, "\n");
+	}
+
+	/**
+	 * Add a debug message to the debug messages array
+	 *
+	 * @param   string  $message  Message to save
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 */
+	public function addDebugMessage($message)
+	{
+		$this->debugMessages[] = $message;
+
+		return $this;
+	}
+
+	/**
+	 * Clear the debug messages array
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function clearDebugMessages()
+	{
+		$this->debugMessages = array();
+
+		return $this;
+	}
+
+	/**
+	 * Render a layout with debug info
+	 *
+	 * @param   mixed  $data  Data passed to the layout
+	 *
+	 * @return  string
+	 *
+	 * @since    3.5
+	 */
+	public function debug($data = array())
+	{
+		$this->setDebug(true);
+
+		$output = $this->render($data);
+
+		$this->setDebug(false);
+
+		return $output;
+	}
+
+	/**
+	 * Method to get the value from the data array
+	 *
+	 * @param   string  $key           Key to search for in the data array
+	 * @param   mixed   $defaultValue  Default value to return if the key is not set
+	 *
+	 * @return  mixed   Value from the data array | defaultValue if doesn't exist
+	 *
+	 * @since   3.5
+	 */
+	public function get($key, $defaultValue = null)
+	{
+		return isset($this->data[$key]) ? $this->data[$key] : $defaultValue;
+	}
+
+	/**
+	 * Get the data being rendered
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getData()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Check if debug mode is enabled
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	public function isDebugEnabled()
+	{
+		return $this->getOptions()->get('debug', false) === true;
+	}
+
+	/**
+	 * Method to set a value in the data array. Example: $layout->set('items', $items);
+	 *
+	 * @param   string  $key    Key for the data array
+	 * @param   mixed   $value  Value to assign to the key
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function set($key, $value)
+	{
+		$this->data[(string) $key] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Set the the data passed the layout
+	 *
+	 * @param   array  $data  Array with the data for the layout
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function setData(array $data)
+	{
+		$this->data = $data;
+
+		return $this;
+	}
+
+	/**
+	 * Change the debug mode
+	 *
+	 * @param   boolean  $debug  Enable / Disable debug
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function setDebug($debug)
+	{
+		$this->options->set('debug', (boolean) $debug);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Layout/FileLayout.php b/core/libraries/src/Layout/FileLayout.php
new file mode 100644
index 00000000..e864f9c7
--- /dev/null
+++ b/core/libraries/src/Layout/FileLayout.php
@@ -0,0 +1,667 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Layout;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Component\ComponentHelper;
+
+/**
+ * Base class for rendering a display layout
+ * loaded from from a layout file
+ *
+ * @link   https://docs.joomla.org/Special:MyLanguage/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since  3.0
+ */
+class FileLayout extends BaseLayout
+{
+	/**
+	 * Cached layout paths
+	 *
+	 * @var    array
+	 * @since  3.5
+	 */
+	protected static $cache = array();
+
+	/**
+	 * Dot separated path to the layout file, relative to base path
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $layoutId = '';
+
+	/**
+	 * Base path to use when loading layout files
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $basePath = null;
+
+	/**
+	 * Full path to actual layout files, after possible template override check
+	 *
+	 * @var    string
+	 * @since  3.0.3
+	 */
+	protected $fullPath = null;
+
+	/**
+	 * Paths to search for layouts
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $includePaths = array();
+
+	/**
+	 * Method to instantiate the file-based layout.
+	 *
+	 * @param   string  $layoutId  Dot separated path to the layout file, relative to base path
+	 * @param   string  $basePath  Base path to use when loading layout files
+	 * @param   mixed   $options   Optional custom options to load. Registry or array format [@since 3.2]
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($layoutId, $basePath = null, $options = null)
+	{
+		// Initialise / Load options
+		$this->setOptions($options);
+
+		// Main properties
+		$this->setLayout($layoutId);
+		$this->basePath = $basePath;
+
+		// Init Enviroment
+		$this->setComponent($this->options->get('component', 'auto'));
+		$this->setClient($this->options->get('client', 'auto'));
+	}
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   array  $displayData  Array of properties available for use inside the layout file to build the displayed output
+	 *
+	 * @return  string  The necessary HTML to display the layout
+	 *
+	 * @since   3.0
+	 */
+	public function render($displayData = array())
+	{
+		$this->clearDebugMessages();
+
+		// Inherit base output from parent class
+		$layoutOutput = '';
+
+		// Automatically merge any previously data set if $displayData is an array
+		if (is_array($displayData))
+		{
+			$displayData = array_merge($this->data, $displayData);
+		}
+
+		// Check possible overrides, and build the full path to layout file
+		$path = $this->getPath();
+
+		if ($this->isDebugEnabled())
+		{
+			echo '<pre>' . $this->renderDebugMessages() . '</pre>';
+		}
+
+		// Nothing to show
+		if (empty($path))
+		{
+			return $layoutOutput;
+		}
+
+		ob_start();
+		include $path;
+		$layoutOutput .= ob_get_contents();
+		ob_end_clean();
+
+		return $layoutOutput;
+	}
+
+	/**
+	 * Method to finds the full real file path, checking possible overrides
+	 *
+	 * @return  string  The full path to the layout file
+	 *
+	 * @since   3.0
+	 */
+	protected function getPath()
+	{
+		\JLoader::import('joomla.filesystem.path');
+
+		$layoutId     = $this->getLayoutId();
+		$includePaths = $this->getIncludePaths();
+		$suffixes     = $this->getSuffixes();
+
+		$this->addDebugMessage('<strong>Layout:</strong> ' . $this->layoutId);
+
+		if (!$layoutId)
+		{
+			$this->addDebugMessage('<strong>There is no active layout</strong>');
+
+			return;
+		}
+
+		if (!$includePaths)
+		{
+			$this->addDebugMessage('<strong>There are no folders to search for layouts:</strong> ' . $layoutId);
+
+			return;
+		}
+
+		$hash = md5(
+			json_encode(
+				array(
+					'paths'    => $includePaths,
+					'suffixes' => $suffixes,
+				)
+			)
+		);
+
+		if (!empty(static::$cache[$layoutId][$hash]))
+		{
+			$this->addDebugMessage('<strong>Cached path:</strong> ' . static::$cache[$layoutId][$hash]);
+
+			return static::$cache[$layoutId][$hash];
+		}
+
+		$this->addDebugMessage('<strong>Include Paths:</strong> ' . print_r($includePaths, true));
+
+		// Search for suffixed versions. Example: tags.j31.php
+		if ($suffixes)
+		{
+			$this->addDebugMessage('<strong>Suffixes:</strong> ' . print_r($suffixes, true));
+
+			foreach ($suffixes as $suffix)
+			{
+				$rawPath  = str_replace('.', '/', $this->layoutId) . '.' . $suffix . '.php';
+				$this->addDebugMessage('<strong>Searching layout for:</strong> ' . $rawPath);
+
+				if ($foundLayout = \JPath::find($this->includePaths, $rawPath))
+				{
+					$this->addDebugMessage('<strong>Found layout:</strong> ' . $this->fullPath);
+
+					static::$cache[$layoutId][$hash] = $foundLayout;
+
+					return static::$cache[$layoutId][$hash];
+				}
+			}
+		}
+
+		// Standard version
+		$rawPath  = str_replace('.', '/', $this->layoutId) . '.php';
+		$this->addDebugMessage('<strong>Searching layout for:</strong> ' . $rawPath);
+
+		$foundLayout = \JPath::find($this->includePaths, $rawPath);
+
+		if (!$foundLayout)
+		{
+			$this->addDebugMessage('<strong>Unable to find layout: </strong> ' . $layoutId);
+
+			return;
+		}
+
+		$this->addDebugMessage('<strong>Found layout:</strong> ' . $foundLayout);
+
+		static::$cache[$layoutId][$hash] = $foundLayout;
+
+		return static::$cache[$layoutId][$hash];
+	}
+
+	/**
+	 * Add one path to include in layout search. Proxy of addIncludePaths()
+	 *
+	 * @param   string  $path  The path to search for layouts
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 */
+	public function addIncludePath($path)
+	{
+		$this->addIncludePaths($path);
+
+		return $this;
+	}
+
+	/**
+	 * Add one or more paths to include in layout search
+	 *
+	 * @param   string  $paths  The path or array of paths to search for layouts
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 */
+	public function addIncludePaths($paths)
+	{
+		if (empty($paths))
+		{
+			return $this;
+		}
+
+		$includePaths = $this->getIncludePaths();
+
+		if (is_array($paths))
+		{
+			$includePaths = array_unique(array_merge($paths, $includePaths));
+		}
+		else
+		{
+			array_unshift($includePaths, $paths);
+		}
+
+		$this->setIncludePaths($includePaths);
+
+		return $this;
+	}
+
+	/**
+	 * Clear the include paths
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function clearIncludePaths()
+	{
+		$this->includePaths = array();
+
+		return $this;
+	}
+
+	/**
+	 * Get the active include paths
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getIncludePaths()
+	{
+		if (empty($this->includePaths))
+		{
+			$this->includePaths = $this->getDefaultIncludePaths();
+		}
+
+		return $this->includePaths;
+	}
+
+	/**
+	 * Get the active layout id
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public function getLayoutId()
+	{
+		return $this->layoutId;
+	}
+
+	/**
+	 * Get the active suffixes
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getSuffixes()
+	{
+		return $this->getOptions()->get('suffixes', array());
+	}
+
+	/**
+	 * Load the automatically generated language suffixes.
+	 * Example: array('es-ES', 'es', 'ltr')
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function loadLanguageSuffixes()
+	{
+		$lang = \JFactory::getLanguage();
+
+		$langTag = $lang->getTag();
+		$langParts = explode('-', $langTag);
+
+		$suffixes = array($langTag, $langParts[0]);
+		$suffixes[] = $lang->isRTL() ? 'rtl' : 'ltr';
+
+		$this->setSuffixes($suffixes);
+
+		return $this;
+	}
+
+	/**
+	 * Load the automatically generated version suffixes.
+	 * Example: array('j311', 'j31', 'j3')
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function loadVersionSuffixes()
+	{
+		$cmsVersion = new \JVersion;
+
+		// Example j311
+		$fullVersion = 'j' . str_replace('.', '', $cmsVersion->getShortVersion());
+
+		// Create suffixes like array('j311', 'j31', 'j3')
+		$suffixes = array(
+			$fullVersion,
+			substr($fullVersion, 0, 3),
+			substr($fullVersion, 0, 2),
+		);
+
+		$this->setSuffixes(array_unique($suffixes));
+
+		return $this;
+	}
+
+	/**
+	 * Remove one path from the layout search
+	 *
+	 * @param   string  $path  The path to remove from the layout search
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 */
+	public function removeIncludePath($path)
+	{
+		$this->removeIncludePaths($path);
+
+		return $this;
+	}
+
+	/**
+	 * Remove one or more paths to exclude in layout search
+	 *
+	 * @param   string  $paths  The path or array of paths to remove for the layout search
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 */
+	public function removeIncludePaths($paths)
+	{
+		if (!empty($paths))
+		{
+			$paths = (array) $paths;
+
+			$this->includePaths = array_diff($this->includePaths, $paths);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Validate that the active component is valid
+	 *
+	 * @param   string  $option  URL Option of the component. Example: com_content
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	protected function validComponent($option = null)
+	{
+		// By default we will validate the active component
+		$component = ($option !== null) ? $option : $this->options->get('component', null);
+
+		// Valid option format
+		if (!empty($component) && substr_count($component, 'com_'))
+		{
+			// Latest check: component exists and is enabled
+			return ComponentHelper::isEnabled($component);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to change the component where search for layouts
+	 *
+	 * @param   string  $option  URL Option of the component. Example: com_content
+	 *
+	 * @return  mixed  Component option string | null for none
+	 *
+	 * @since   3.2
+	 */
+	public function setComponent($option)
+	{
+		$component = null;
+
+		switch ((string) $option)
+		{
+			case 'none':
+				$component = null;
+				break;
+
+			case 'auto':
+				$component = ApplicationHelper::getComponentName();
+				break;
+
+			default:
+				$component = $option;
+				break;
+		}
+
+		// Extra checks
+		if (!$this->validComponent($component))
+		{
+			$component = null;
+		}
+
+		$this->options->set('component', $component);
+
+		// Refresh include paths
+		$this->refreshIncludePaths();
+	}
+
+	/**
+	 * Function to initialise the application client
+	 *
+	 * @param   mixed  $client  Frontend: 'site' or 0 | Backend: 'admin' or 1
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function setClient($client)
+	{
+		// Force string conversion to avoid unexpected states
+		switch ((string) $client)
+		{
+			case 'site':
+			case '0':
+				$client = 0;
+				break;
+
+			case 'admin':
+			case '1':
+				$client = 1;
+				break;
+
+			default:
+				$client = (int) \JFactory::getApplication()->isClient('administrator');
+				break;
+		}
+
+		$this->options->set('client', $client);
+
+		// Refresh include paths
+		$this->refreshIncludePaths();
+	}
+
+	/**
+	 * Change the layout
+	 *
+	 * @param   string  $layoutId  Layout to render
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 *
+	 * @deprecated  3.5  Use setLayoutId()
+	 */
+	public function setLayout($layoutId)
+	{
+		// Log usage of deprecated function
+		\JLog::add(__METHOD__ . '() is deprecated, use FileLayout::setLayoutId() instead.', \JLog::WARNING, 'deprecated');
+
+		return $this->setLayoutId($layoutId);
+	}
+
+	/**
+	 * Set the active layout id
+	 *
+	 * @param   string  $layoutId  Layout identifier
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function setLayoutId($layoutId)
+	{
+		$this->layoutId = $layoutId;
+		$this->fullPath = null;
+
+		return $this;
+	}
+
+	/**
+	 * Refresh the list of include paths
+	 *
+	 * @return  self
+	 *
+	 * @since   3.2
+	 *
+	 * @deprecated  3.5  Use FileLayout::clearIncludePaths()
+	 */
+	protected function refreshIncludePaths()
+	{
+		// Log usage of deprecated function
+		\JLog::add(__METHOD__ . '() is deprecated, use FileLayout::clearIncludePaths() instead.', \JLog::WARNING, 'deprecated');
+
+		$this->clearIncludePaths();
+
+		return $this;
+	}
+
+	/**
+	 * Get the default array of include paths
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function getDefaultIncludePaths()
+	{
+		// Reset includePaths
+		$paths = array();
+
+		// (1 - highest priority) Received a custom high priority path
+		if ($this->basePath !== null)
+		{
+			$paths[] = rtrim($this->basePath, DIRECTORY_SEPARATOR);
+		}
+
+		// Component layouts & overrides if exist
+		$component = $this->options->get('component', null);
+
+		if (!empty($component))
+		{
+			// (2) Component template overrides path
+			$paths[] = JPATH_THEMES . '/' . \JFactory::getApplication()->getTemplate() . '/html/layouts/' . $component;
+
+			// (3) Component path
+			if ($this->options->get('client') == 0)
+			{
+				$paths[] = JPATH_SITE . '/components/' . $component . '/layouts';
+			}
+			else
+			{
+				$paths[] = JPATH_ADMINISTRATOR . '/components/' . $component . '/layouts';
+			}
+		}
+
+		// (4) Standard Joomla! layouts overriden
+		$paths[] = JPATH_THEMES . '/' . \JFactory::getApplication()->getTemplate() . '/html/layouts';
+
+		// (5 - lower priority) Frontend base layouts
+		$paths[] = JPATH_ROOT . '/layouts';
+
+		return $paths;
+	}
+
+	/**
+	 * Set the include paths to search for layouts
+	 *
+	 * @param   array  $paths  Array with paths to search in
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function setIncludePaths($paths)
+	{
+		$this->includePaths = (array) $paths;
+
+		return $this;
+	}
+
+	/**
+	 * Set suffixes to search layouts
+	 *
+	 * @param   mixed  $suffixes  String with a single suffix or 'auto' | 'none' or array of suffixes
+	 *
+	 * @return  self
+	 *
+	 * @since   3.5
+	 */
+	public function setSuffixes(array $suffixes)
+	{
+		$this->options->set('suffixes', $suffixes);
+
+		return $this;
+	}
+
+	/**
+	 * Render a layout with the same include paths & options
+	 *
+	 * @param   string  $layoutId     The identifier for the sublayout to be searched in a subfolder with the name of the current layout
+	 * @param   mixed   $displayData  Data to be rendered
+	 *
+	 * @return  string  The necessary HTML to display the layout
+	 *
+	 * @since   3.2
+	 */
+	public function sublayout($layoutId, $displayData)
+	{
+		// Sublayouts are searched in a subfolder with the name of the current layout
+		if (!empty($this->layoutId))
+		{
+			$layoutId = $this->layoutId . '.' . $layoutId;
+		}
+
+		$sublayout = new static($layoutId, $this->basePath, $this->options);
+		$sublayout->includePaths = $this->includePaths;
+
+		return $sublayout->render($displayData);
+	}
+}
diff --git a/core/libraries/src/Layout/LayoutHelper.php b/core/libraries/src/Layout/LayoutHelper.php
new file mode 100644
index 00000000..0d63586e
--- /dev/null
+++ b/core/libraries/src/Layout/LayoutHelper.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Layout;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Helper to render a Layout object, storing a base path
+ *
+ * @link   https://docs.joomla.org/Special:MyLanguage/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since  3.1
+ */
+class LayoutHelper
+{
+	/**
+	 * A default base path that will be used if none is provided when calling the render method.
+	 * Note that FileLayout itself will defaults to JPATH_ROOT . '/layouts' if no basePath is supplied at all
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public static $defaultBasePath = '';
+
+	/**
+	 * Method to render a layout with debug info
+	 *
+	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 * @param   string  $basePath     Base path to use when loading layout files
+	 * @param   mixed   $options      Optional custom options to load. Registry or array format
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public static function debug($layoutFile, $displayData = null, $basePath = '', $options = null)
+	{
+		$basePath = empty($basePath) ? self::$defaultBasePath : $basePath;
+
+		// Make sure we send null to FileLayout if no path set
+		$basePath = empty($basePath) ? null : $basePath;
+		$layout = new FileLayout($layoutFile, $basePath, $options);
+
+		return $layout->debug($displayData);
+	}
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 * @param   string  $basePath     Base path to use when loading layout files
+	 * @param   mixed   $options      Optional custom options to load. Registry or array format
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1
+	 */
+	public static function render($layoutFile, $displayData = null, $basePath = '', $options = null)
+	{
+		$basePath = empty($basePath) ? self::$defaultBasePath : $basePath;
+
+		// Make sure we send null to FileLayout if no path set
+		$basePath = empty($basePath) ? null : $basePath;
+		$layout = new FileLayout($layoutFile, $basePath, $options);
+
+		return $layout->render($displayData);
+	}
+}
diff --git a/core/libraries/src/Layout/LayoutInterface.php b/core/libraries/src/Layout/LayoutInterface.php
new file mode 100644
index 00000000..0001c4f2
--- /dev/null
+++ b/core/libraries/src/Layout/LayoutInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Layout;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Interface to handle display layout
+ *
+ * @link   https://docs.joomla.org/Special:MyLanguage/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since  3.0
+ */
+interface LayoutInterface
+{
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @since   3.0
+	 */
+	public function escape($output);
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   array  $displayData  Array of properties available for use inside the layout file to build the displayed output
+	 *
+	 * @return  string  The rendered layout.
+	 *
+	 * @since   3.0
+	 */
+	public function render($displayData);
+}
diff --git a/core/libraries/src/Log/DelegatingPsrLogger.php b/core/libraries/src/Log/DelegatingPsrLogger.php
new file mode 100644
index 00000000..2026194c
--- /dev/null
+++ b/core/libraries/src/Log/DelegatingPsrLogger.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log;
+
+use Psr\Log\AbstractLogger;
+use Psr\Log\InvalidArgumentException;
+use Psr\Log\LogLevel;
+
+/**
+ * Delegating logger which delegates log messages received from the PSR-3 interface to the Joomla! Log object.
+ *
+ * @since  3.8.0
+ */
+class DelegatingPsrLogger extends AbstractLogger
+{
+	/**
+	 * The Log instance to delegate messages to.
+	 *
+	 * @var    Log
+	 * @since  3.8.0
+	 */
+	protected $logger;
+
+	/**
+	 * Mapping array to map a PSR-3 level to a Joomla priority.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	protected $priorityMap = array(
+		LogLevel::EMERGENCY => Log::EMERGENCY,
+		LogLevel::ALERT     => Log::ALERT,
+		LogLevel::CRITICAL  => Log::CRITICAL,
+		LogLevel::ERROR     => Log::ERROR,
+		LogLevel::WARNING   => Log::WARNING,
+		LogLevel::NOTICE    => Log::NOTICE,
+		LogLevel::INFO      => Log::INFO,
+		LogLevel::DEBUG     => Log::DEBUG
+	);
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   Log  $logger  The Log instance to delegate messages to.
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct(Log $logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param   mixed   $level    The log level.
+	 * @param   string  $message  The log message.
+	 * @param   array   $context  Additional message context.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function log($level, $message, array $context = array())
+	{
+		// Make sure the log level is valid
+		if (!array_key_exists($level, $this->priorityMap))
+		{
+			throw new \InvalidArgumentException('An invalid log level has been given.');
+		}
+
+		// Map the level to Joomla's priority
+		$priority = $this->priorityMap[$level];
+
+		$category = null;
+		$date     = null;
+
+		// If a message category is given, map it
+		if (!empty($context['category']))
+		{
+			$category = $context['category'];
+		}
+
+		// If a message timestamp is given, map it
+		if (!empty($context['date']))
+		{
+			$date = $context['date'];
+		}
+
+		// Joomla's logging API will only process a string or a LogEntry object, if $message is an object without __toString() we can't use it
+		if (!is_string($message) && !($message instanceof LogEntry))
+		{
+			if (!is_object($message) || !method_exists($message, '__toString'))
+			{
+				throw new \InvalidArgumentException(
+					'The message must be a string, a LogEntry object, or an object implementing the __toString() method.'
+				);
+			}
+
+			$message = (string) $message;
+		}
+
+		$this->logger->add($message, $priority, $category, $date, $context);
+	}
+}
diff --git a/core/libraries/src/Log/Log.php b/core/libraries/src/Log/Log.php
new file mode 100644
index 00000000..32500c96
--- /dev/null
+++ b/core/libraries/src/Log/Log.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Log Class
+ *
+ * This class hooks into the global log configuration settings to allow for user configured
+ * logging events to be sent to where the user wishes them to be sent. On high load sites
+ * Syslog is probably the best (pure PHP function), then the text file based loggers (CSV, W3c
+ * or plain Formattedtext) and finally MySQL offers the most features (e.g. rapid searching)
+ * but will incur a performance hit due to INSERT being issued.
+ *
+ * @since  11.1
+ */
+class Log
+{
+	/**
+	 * All log priorities.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const ALL = 30719;
+
+	/**
+	 * The system is unusable.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const EMERGENCY = 1;
+
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const ALERT = 2;
+
+	/**
+	 * Critical conditions.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const CRITICAL = 4;
+
+	/**
+	 * Error conditions.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const ERROR = 8;
+
+	/**
+	 * Warning conditions.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const WARNING = 16;
+
+	/**
+	 * Normal, but significant condition.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const NOTICE = 32;
+
+	/**
+	 * Informational message.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const INFO = 64;
+
+	/**
+	 * Debugging message.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	const DEBUG = 128;
+
+	/**
+	 * The global Log instance.
+	 *
+	 * @var    Log
+	 * @since  11.1
+	 */
+	protected static $instance;
+
+	/**
+	 * Container for Logger configurations.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $configurations = array();
+
+	/**
+	 * Container for Logger objects.
+	 *
+	 * @var    Logger[]
+	 * @since  11.1
+	 */
+	protected $loggers = array();
+
+	/**
+	 * Lookup array for loggers.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $lookup = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @since   11.1
+	 */
+	protected function __construct()
+	{
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   mixed    $entry     The LogEntry object to add to the log or the message for a new LogEntry object.
+	 * @param   integer  $priority  Message priority.
+	 * @param   string   $category  Type of entry
+	 * @param   string   $date      Date of entry (defaults to now if not specified or blank)
+	 * @param   array    $context   An optional array with additional message context.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public static function add($entry, $priority = self::INFO, $category = '', $date = null, array $context = array())
+	{
+		// Automatically instantiate the singleton object if not already done.
+		if (empty(static::$instance))
+		{
+			static::setInstance(new Log);
+		}
+
+		// If the entry object isn't a LogEntry object let's make one.
+		if (!($entry instanceof LogEntry))
+		{
+			$entry = new LogEntry((string) $entry, $priority, $category, $date, $context);
+		}
+
+		static::$instance->addLogEntry($entry);
+	}
+
+	/**
+	 * Add a logger to the Log instance.  Loggers route log entries to the correct files/systems to be logged.
+	 *
+	 * @param   array    $options     The object configuration array.
+	 * @param   integer  $priorities  Message priority
+	 * @param   array    $categories  Types of entry
+	 * @param   boolean  $exclude     If true, all categories will be logged except those in the $categories array
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public static function addLogger(array $options, $priorities = self::ALL, $categories = array(), $exclude = false)
+	{
+		// Automatically instantiate the singleton object if not already done.
+		if (empty(static::$instance))
+		{
+			static::setInstance(new Log);
+		}
+
+		static::$instance->addLoggerInternal($options, $priorities, $categories, $exclude);
+	}
+
+	/**
+	 * Add a logger to the Log instance.  Loggers route log entries to the correct files/systems to be logged.
+	 * This method allows you to extend Log completely.
+	 *
+	 * @param   array    $options     The object configuration array.
+	 * @param   integer  $priorities  Message priority
+	 * @param   array    $categories  Types of entry
+	 * @param   boolean  $exclude     If true, all categories will be logged except those in the $categories array
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function addLoggerInternal(array $options, $priorities = self::ALL, $categories = array(), $exclude = false)
+	{
+		// The default logger is the formatted text log file.
+		if (empty($options['logger']))
+		{
+			$options['logger'] = 'formattedtext';
+		}
+
+		$options['logger'] = strtolower($options['logger']);
+
+		// Special case - if a Closure object is sent as the callback (in case of CallbackLogger)
+		// Closure objects are not serializable so swap it out for a unique id first then back again later
+		if (isset($options['callback']))
+		{
+			if (is_a($options['callback'], 'closure'))
+			{
+				$callback = $options['callback'];
+				$options['callback'] = spl_object_hash($options['callback']);
+			}
+			elseif (is_array($options['callback']) && count($options['callback']) == 2 && is_object($options['callback'][0]))
+			{
+				$callback = $options['callback'];
+				$options['callback'] = spl_object_hash($options['callback'][0]) . '::' . $options['callback'][1];
+			}
+		}
+
+		// Generate a unique signature for the Log instance based on its options.
+		$signature = md5(serialize($options));
+
+		// Now that the options array has been serialized, swap the callback back in
+		if (isset($callback))
+		{
+			$options['callback'] = $callback;
+		}
+
+		// Register the configuration if it doesn't exist.
+		if (empty($this->configurations[$signature]))
+		{
+			$this->configurations[$signature] = $options;
+		}
+
+		$this->lookup[$signature] = (object) array(
+			'priorities' => $priorities,
+			'categories' => array_map('strtolower', (array) $categories),
+			'exclude' => (bool) $exclude,
+		);
+	}
+
+	/**
+	 * Creates a delegated PSR-3 compatible logger from the current singleton instance. This method always returns a new delegated logger.
+	 *
+	 * @return  DelegatingPsrLogger
+	 *
+	 * @since   3.8.0
+	 */
+	public static function createDelegatedLogger()
+	{
+		// Ensure a singleton instance has been created first
+		if (empty(static::$instance))
+		{
+			static::setInstance(new static);
+		}
+
+		return new DelegatingPsrLogger(static::$instance);
+	}
+
+	/**
+	 * Returns a reference to the a Log object, only creating it if it doesn't already exist.
+	 * Note: This is principally made available for testing and internal purposes.
+	 *
+	 * @param   Log  $instance  The logging object instance to be used by the static methods.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public static function setInstance($instance)
+	{
+		if (($instance instanceof Log) || $instance === null)
+		{
+			static::$instance = & $instance;
+		}
+	}
+
+	/**
+	 * Method to add an entry to the appropriate loggers.
+	 *
+	 * @param   LogEntry  $entry  The LogEntry object to send to the loggers.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function addLogEntry(LogEntry $entry)
+	{
+		// Find all the appropriate loggers based on priority and category for the entry.
+		$loggers = $this->findLoggers($entry->priority, $entry->category);
+
+		foreach ((array) $loggers as $signature)
+		{
+			// Attempt to instantiate the logger object if it doesn't already exist.
+			if (empty($this->loggers[$signature]))
+			{
+				$class = __NAMESPACE__ . '\\Logger\\' . ucfirst($this->configurations[$signature]['logger']) . 'Logger';
+
+				if (!class_exists($class))
+				{
+					throw new \RuntimeException('Unable to create a Logger instance: ' . $class);
+				}
+
+				$this->loggers[$signature] = new $class($this->configurations[$signature]);
+			}
+
+			// Add the entry to the logger.
+			$this->loggers[$signature]->addEntry(clone $entry);
+		}
+	}
+
+	/**
+	 * Method to find the loggers to use based on priority and category values.
+	 *
+	 * @param   integer  $priority  Message priority.
+	 * @param   string   $category  Type of entry
+	 *
+	 * @return  array  The array of loggers to use for the given priority and category values.
+	 *
+	 * @since   11.1
+	 */
+	protected function findLoggers($priority, $category)
+	{
+		$loggers = array();
+
+		// Sanitize inputs.
+		$priority = (int) $priority;
+		$category = strtolower($category);
+
+		// Let's go iterate over the loggers and get all the ones we need.
+		foreach ((array) $this->lookup as $signature => $rules)
+		{
+			// Check to make sure the priority matches the logger.
+			if ($priority & $rules->priorities)
+			{
+				if ($rules->exclude)
+				{
+					// If either there are no set categories or the category (including the empty case) is not in the list of excluded categories, add this logger.
+					if (empty($rules->categories) || !in_array($category, $rules->categories))
+					{
+						$loggers[] = $signature;
+					}
+				}
+				else
+				{
+					// If either there are no set categories (meaning all) or the specific category is set, add this logger.
+					if (empty($rules->categories) || in_array($category, $rules->categories))
+					{
+						$loggers[] = $signature;
+					}
+				}
+			}
+		}
+
+		return $loggers;
+	}
+}
diff --git a/core/libraries/src/Log/LogEntry.php b/core/libraries/src/Log/LogEntry.php
new file mode 100644
index 00000000..457ce955
--- /dev/null
+++ b/core/libraries/src/Log/LogEntry.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Date\Date;
+
+/**
+ * Joomla! Log Entry class
+ *
+ * This class is designed to hold log entries for either writing to an engine, or for
+ * supported engines, retrieving lists and building in memory (PHP based) search operations.
+ *
+ * @since  11.1
+ */
+class LogEntry
+{
+	/**
+	 * Application responsible for log entry.
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $category;
+
+	/**
+	 * The message context.
+	 *
+	 * @var    array
+	 * @since  3.8.0
+	 */
+	public $context;
+
+	/**
+	 * The date the message was logged.
+	 * @var    Date
+	 * @since  11.1
+	 */
+	public $date;
+
+	/**
+	 * Message to be logged.
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $message;
+
+	/**
+	 * The priority of the message to be logged.
+	 * @var    string
+	 * @since  11.1
+	 * @see    LogEntry::$priorities
+	 */
+	public $priority = Log::INFO;
+
+	/**
+	 * List of available log priority levels [Based on the Syslog default levels].
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $priorities = array(
+		Log::EMERGENCY,
+		Log::ALERT,
+		Log::CRITICAL,
+		Log::ERROR,
+		Log::WARNING,
+		Log::NOTICE,
+		Log::INFO,
+		Log::DEBUG,
+	);
+
+	/**
+	 * Call stack and back trace of the logged call.
+	 * @var    array
+	 * @since  12.3
+	 */
+	public $callStack = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $message   The message to log.
+	 * @param   int     $priority  Message priority based on {$this->priorities}.
+	 * @param   string  $category  Type of entry
+	 * @param   string  $date      Date of entry (defaults to now if not specified or blank)
+	 * @param   array   $context   An optional array with additional message context.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($message, $priority = Log::INFO, $category = '', $date = null, array $context = array())
+	{
+		$this->message = (string) $message;
+
+		// Sanitize the priority.
+		if (!in_array($priority, $this->priorities, true))
+		{
+			$priority = Log::INFO;
+		}
+
+		$this->priority = $priority;
+		$this->context  = $context;
+
+		// Sanitize category if it exists.
+		if (!empty($category))
+		{
+			$this->category = (string) strtolower(preg_replace('/[^A-Z0-9_\.-]/i', '', $category));
+		}
+
+		// Get the current call stack and back trace (without args to save memory).
+		$this->callStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+
+		// Get the date as a Date object.
+		$this->date = new Date($date ? $date : 'now');
+	}
+}
diff --git a/core/libraries/src/Log/Logger.php b/core/libraries/src/Log/Logger.php
new file mode 100644
index 00000000..5ad8306b
--- /dev/null
+++ b/core/libraries/src/Log/Logger.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! Logger Base Class
+ *
+ * This class is used to be the basis of logger classes to allow for defined functions
+ * to exist regardless of the child class.
+ *
+ * @since  12.2
+ */
+abstract class Logger
+{
+	/**
+	 * Options array for the JLog instance.
+	 *
+	 * @var    array
+	 * @since  12.2
+	 */
+	protected $options = array();
+
+	/**
+	 * Translation array for LogEntry priorities to text strings.
+	 *
+	 * @var    array
+	 * @since  12.2
+	 */
+	protected $priorities = array(
+		Log::EMERGENCY => 'EMERGENCY',
+		Log::ALERT     => 'ALERT',
+		Log::CRITICAL  => 'CRITICAL',
+		Log::ERROR     => 'ERROR',
+		Log::WARNING   => 'WARNING',
+		Log::NOTICE    => 'NOTICE',
+		Log::INFO      => 'INFO',
+		Log::DEBUG     => 'DEBUG',
+	);
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   12.2
+	 */
+	public function __construct(array &$options)
+	{
+		// Set the options for the class.
+		$this->options = & $options;
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  \RuntimeException
+	 */
+	abstract public function addEntry(LogEntry $entry);
+}
diff --git a/core/libraries/src/Log/Logger/CallbackLogger.php b/core/libraries/src/Log/Logger/CallbackLogger.php
new file mode 100644
index 00000000..763855e6
--- /dev/null
+++ b/core/libraries/src/Log/Logger/CallbackLogger.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger;
+
+/**
+ * Joomla! Callback Log class
+ *
+ * This class allows logging to be handled by a callback function.
+ * This allows unprecedented flexibility in the way logging can be handled.
+ *
+ * @since  12.2
+ */
+class CallbackLogger extends Logger
+{
+	/**
+	 * The function to call when an entry is added
+	 *
+	 * @var    callable
+	 * @since  12.2
+	 */
+	protected $callback;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   12.2
+	 * @throws  \RuntimeException
+	 */
+	public function __construct(array &$options)
+	{
+		// Call the parent constructor.
+		parent::__construct($options);
+
+		// Throw an exception if there is not a valid callback
+		if (!isset($this->options['callback']) || !is_callable($this->options['callback']))
+		{
+			throw new \RuntimeException(sprintf('%s created without valid callback function.', get_class($this)));
+		}
+
+		$this->callback = $this->options['callback'];
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 * @throws  \RuntimeException
+	 */
+	public function addEntry(LogEntry $entry)
+	{
+		// Pass the log entry to the callback function
+		call_user_func($this->callback, $entry);
+	}
+}
diff --git a/core/libraries/src/Log/Logger/DatabaseLogger.php b/core/libraries/src/Log/Logger/DatabaseLogger.php
new file mode 100644
index 00000000..7eac79e5
--- /dev/null
+++ b/core/libraries/src/Log/Logger/DatabaseLogger.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger;
+
+/**
+ * Joomla! MySQL Database Log class
+ *
+ * This class is designed to output logs to a specific MySQL database table. Fields in this
+ * table are based on the Syslog style of log output. This is designed to allow quick and
+ * easy searching.
+ *
+ * @since  11.1
+ */
+class DatabaseLogger extends Logger
+{
+	/**
+	 * The name of the database driver to use for connecting to the database.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $driver = 'mysqli';
+
+	/**
+	 * The host name (or IP) of the server with which to connect for the logger.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $host = '127.0.0.1';
+
+	/**
+	 * The database server user to connect as for the logger.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $user = 'root';
+
+	/**
+	 * The password to use for connecting to the database server.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $password = '';
+
+	/**
+	 * The name of the database table to use for the logger.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $database = 'logging';
+
+	/**
+	 * The database table to use for logging entries.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $table = 'jos_';
+
+	/**
+	 * The database driver object for the logger.
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  11.1
+	 */
+	protected $db;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(array &$options)
+	{
+		// Call the parent constructor.
+		parent::__construct($options);
+
+		// If both the database object and driver options are empty we want to use the system database connection.
+		if (empty($this->options['db_driver']))
+		{
+			$this->db = \JFactory::getDbo();
+			$this->driver = null;
+			$this->host = null;
+			$this->user = null;
+			$this->password = null;
+			$this->database = null;
+			$this->prefix = null;
+		}
+		else
+		{
+			$this->db = null;
+			$this->driver = (empty($this->options['db_driver'])) ? 'mysqli' : $this->options['db_driver'];
+			$this->host = (empty($this->options['db_host'])) ? '127.0.0.1' : $this->options['db_host'];
+			$this->user = (empty($this->options['db_user'])) ? 'root' : $this->options['db_user'];
+			$this->password = (empty($this->options['db_pass'])) ? '' : $this->options['db_pass'];
+			$this->database = (empty($this->options['db_database'])) ? 'logging' : $this->options['db_database'];
+			$this->prefix = (empty($this->options['db_prefix'])) ? 'jos_' : $this->options['db_prefix'];
+		}
+
+		// The table name is independent of how we arrived at the connection object.
+		$this->table = (empty($this->options['db_table'])) ? '#__log_entries' : $this->options['db_table'];
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public function addEntry(LogEntry $entry)
+	{
+		// Connect to the database if not connected.
+		if (empty($this->db))
+		{
+			$this->connect();
+		}
+
+		// Convert the date.
+		$entry->date = $entry->date->toSql(false, $this->db);
+
+		$this->db->insertObject($this->table, $entry);
+	}
+
+	/**
+	 * Method to connect to the database server based on object properties.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function connect()
+	{
+		// Build the configuration object to use for JDatabaseDriver.
+		$options = array(
+			'driver' => $this->driver,
+			'host' => $this->host,
+			'user' => $this->user,
+			'password' => $this->password,
+			'database' => $this->database,
+			'prefix' => $this->prefix,
+		);
+
+		$this->db = \JDatabaseDriver::getInstance($options);
+	}
+}
diff --git a/core/libraries/src/Log/Logger/EchoLogger.php b/core/libraries/src/Log/Logger/EchoLogger.php
new file mode 100644
index 00000000..412012d6
--- /dev/null
+++ b/core/libraries/src/Log/Logger/EchoLogger.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger;
+
+/**
+ * Joomla Echo logger class.
+ *
+ * @since  11.1
+ */
+class EchoLogger extends Logger
+{
+	/**
+	 * Value to use at the end of an echoed log entry to separate lines.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $line_separator = "\n";
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   12.1
+	 */
+	public function __construct(array &$options)
+	{
+		parent::__construct($options);
+
+		if (!empty($this->options['line_separator']))
+		{
+			$this->line_separator = $this->options['line_separator'];
+		}
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function addEntry(LogEntry $entry)
+	{
+		echo $this->priorities[$entry->priority] . ': '
+			. $entry->message . (empty($entry->category) ? '' : ' [' . $entry->category . ']')
+			. $this->line_separator;
+	}
+}
diff --git a/core/libraries/src/Log/Logger/FormattedtextLogger.php b/core/libraries/src/Log/Logger/FormattedtextLogger.php
new file mode 100644
index 00000000..158935a0
--- /dev/null
+++ b/core/libraries/src/Log/Logger/FormattedtextLogger.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger;
+
+\JLoader::import('joomla.filesystem.file');
+\JLoader::import('joomla.filesystem.folder');
+
+/**
+ * Joomla! Formatted Text File Log class
+ *
+ * This class is designed to use as a base for building formatted text files for output. By
+ * default it emulates the Syslog style format output. This is a disk based output format.
+ *
+ * @since  11.1
+ */
+class FormattedtextLogger extends Logger
+{
+	/**
+	 * The format which each entry follows in the log file.
+	 *
+	 * All fields must be named in all caps and be within curly brackets eg. {FOOBAR}.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $format = '{DATETIME}	{PRIORITY} {CLIENTIP}	{CATEGORY}	{MESSAGE}';
+
+	/**
+	 * The parsed fields from the format string.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $fields = array();
+
+	/**
+	 * The full filesystem path for the log file.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $path;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(array &$options)
+	{
+		// Call the parent constructor.
+		parent::__construct($options);
+
+		// The name of the text file defaults to 'error.php' if not explicitly given.
+		if (empty($this->options['text_file']))
+		{
+			$this->options['text_file'] = 'error.php';
+		}
+
+		// The name of the text file path defaults to that which is set in configuration if not explicitly given.
+		if (empty($this->options['text_file_path']))
+		{
+			$this->options['text_file_path'] = \JFactory::getConfig()->get('log_path');
+		}
+
+		// False to treat the log file as a php file.
+		if (empty($this->options['text_file_no_php']))
+		{
+			$this->options['text_file_no_php'] = false;
+		}
+
+		// Build the full path to the log file.
+		$this->path = $this->options['text_file_path'] . '/' . $this->options['text_file'];
+
+		// Use the default entry format unless explicitly set otherwise.
+		if (!empty($this->options['text_entry_format']))
+		{
+			$this->format = (string) $this->options['text_entry_format'];
+		}
+
+		// Build the fields array based on the format string.
+		$this->parseFields();
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public function addEntry(LogEntry $entry)
+	{
+		// Initialise the file if not already done.
+		$this->initFile();
+
+		// Set some default field values if not already set.
+		if (!isset($entry->clientIP))
+		{
+			// Check for proxies as well.
+			if (isset($_SERVER['REMOTE_ADDR']))
+			{
+				$entry->clientIP = $_SERVER['REMOTE_ADDR'];
+			}
+			elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+			{
+				$entry->clientIP = $_SERVER['HTTP_X_FORWARDED_FOR'];
+			}
+			elseif (isset($_SERVER['HTTP_CLIENT_IP']))
+			{
+				$entry->clientIP = $_SERVER['HTTP_CLIENT_IP'];
+			}
+		}
+
+		// If the time field is missing or the date field isn't only the date we need to rework it.
+		if ((strlen($entry->date) != 10) || !isset($entry->time))
+		{
+			// Get the date and time strings in GMT.
+			$entry->datetime = $entry->date->toISO8601();
+			$entry->time = $entry->date->format('H:i:s', false);
+			$entry->date = $entry->date->format('Y-m-d', false);
+		}
+
+		// Get a list of all the entry keys and make sure they are upper case.
+		$tmp = array_change_key_case(get_object_vars($entry), CASE_UPPER);
+
+		// Decode the entry priority into an English string.
+		$tmp['PRIORITY'] = $this->priorities[$entry->priority];
+
+		// Fill in field data for the line.
+		$line = $this->format;
+
+		foreach ($this->fields as $field)
+		{
+			$line = str_replace('{' . $field . '}', (isset($tmp[$field])) ? $tmp[$field] : '-', $line);
+		}
+
+		// Write the new entry to the file.
+		$line .= "\n";
+
+		if (!\JFile::append($this->path, $line))
+		{
+			throw new \RuntimeException('Cannot write to log file.');
+		}
+	}
+
+	/**
+	 * Method to generate the log file header.
+	 *
+	 * @return  string  The log file header
+	 *
+	 * @since   11.1
+	 */
+	protected function generateFileHeader()
+	{
+		$head = array();
+
+		// Build the log file header.
+
+		// If the no php flag is not set add the php die statement.
+		if (empty($this->options['text_file_no_php']))
+		{
+			// Blank line to prevent information disclose: https://bugs.php.net/bug.php?id=60677
+			$head[] = '#';
+			$head[] = '#<?php die(\'Forbidden.\'); ?>';
+		}
+
+		$head[] = '#Date: ' . gmdate('Y-m-d H:i:s') . ' UTC';
+		$head[] = '#Software: ' . \JPlatform::getLongVersion();
+		$head[] = '';
+
+		// Prepare the fields string
+		$head[] = '#Fields: ' . strtolower(str_replace('}', '', str_replace('{', '', $this->format)));
+		$head[] = '';
+
+		return implode("\n", $head);
+	}
+
+	/**
+	 * Method to initialise the log file.  This will create the folder path to the file if it doesn't already
+	 * exist and also get a new file header if the file doesn't already exist.  If the file already exists it
+	 * will simply open it for writing.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function initFile()
+	{
+		// We only need to make sure the file exists
+		if (\JFile::exists($this->path))
+		{
+			return;
+		}
+
+		// Make sure the folder exists in which to create the log file.
+		\JFolder::create(dirname($this->path));
+
+		// Build the log file header.
+		$head = $this->generateFileHeader();
+
+		if (!\JFile::write($this->path, $head))
+		{
+			throw new \RuntimeException('Cannot write to log file.');
+		}
+	}
+
+	/**
+	 * Method to parse the format string into an array of fields.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function parseFields()
+	{
+		$this->fields = array();
+		$matches = array();
+
+		// Get all of the available fields in the format string.
+		preg_match_all('/{(.*?)}/i', $this->format, $matches);
+
+		// Build the parsed fields list based on the found fields.
+		foreach ($matches[1] as $match)
+		{
+			$this->fields[] = strtoupper($match);
+		}
+	}
+}
diff --git a/core/libraries/src/Log/Logger/MessagequeueLogger.php b/core/libraries/src/Log/Logger/MessagequeueLogger.php
new file mode 100644
index 00000000..7e53f228
--- /dev/null
+++ b/core/libraries/src/Log/Logger/MessagequeueLogger.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger;
+
+/**
+ * Joomla MessageQueue logger class.
+ *
+ * This class is designed to output logs to a specific MySQL database table. Fields in this
+ * table are based on the Syslog style of log output. This is designed to allow quick and
+ * easy searching.
+ *
+ * @since  11.1
+ */
+class MessagequeueLogger extends Logger
+{
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function addEntry(LogEntry $entry)
+	{
+		switch ($entry->priority)
+		{
+			case Log::EMERGENCY:
+			case Log::ALERT:
+			case Log::CRITICAL:
+			case Log::ERROR:
+				\JFactory::getApplication()->enqueueMessage($entry->message, 'error');
+				break;
+			case Log::WARNING:
+				\JFactory::getApplication()->enqueueMessage($entry->message, 'warning');
+				break;
+			case Log::NOTICE:
+				\JFactory::getApplication()->enqueueMessage($entry->message, 'notice');
+				break;
+			case Log::INFO:
+				\JFactory::getApplication()->enqueueMessage($entry->message, 'message');
+				break;
+			default:
+				// Ignore other priorities.
+				break;
+		}
+	}
+}
diff --git a/core/libraries/src/Log/Logger/SyslogLogger.php b/core/libraries/src/Log/Logger/SyslogLogger.php
new file mode 100644
index 00000000..f6886cd7
--- /dev/null
+++ b/core/libraries/src/Log/Logger/SyslogLogger.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Log\LogEntry;
+use Joomla\CMS\Log\Logger;
+
+/**
+ * Joomla! Syslog Log class
+ *
+ * This class is designed to call the PHP Syslog function call which is then sent to the
+ * system wide log system. For Linux/Unix based systems this is the syslog subsystem, for
+ * the Windows based implementations this can be found in the Event Log. For Windows,
+ * permissions may prevent PHP from properly outputting messages.
+ *
+ * @since  11.1
+ */
+class SyslogLogger extends Logger
+{
+	/**
+	 * Translation array for LogEntry priorities to SysLog priority names.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $priorities = array(
+		Log::EMERGENCY => 'EMERG',
+		Log::ALERT => 'ALERT',
+		Log::CRITICAL => 'CRIT',
+		Log::ERROR => 'ERR',
+		Log::WARNING => 'WARNING',
+		Log::NOTICE => 'NOTICE',
+		Log::INFO => 'INFO',
+		Log::DEBUG => 'DEBUG',
+	);
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(array &$options)
+	{
+		// Call the parent constructor.
+		parent::__construct($options);
+
+		// Ensure that we have an identity string for the Syslog entries.
+		if (empty($this->options['sys_ident']))
+		{
+			$this->options['sys_ident'] = 'Joomla Platform';
+		}
+
+		// If the option to add the process id to Syslog entries is set use it, otherwise default to true.
+		if (isset($this->options['sys_add_pid']))
+		{
+			$this->options['sys_add_pid'] = (bool) $this->options['sys_add_pid'];
+		}
+		else
+		{
+			$this->options['sys_add_pid'] = true;
+		}
+
+		// If the option to also send Syslog entries to STDERR is set use it, otherwise default to false.
+		if (isset($this->options['sys_use_stderr']))
+		{
+			$this->options['sys_use_stderr'] = (bool) $this->options['sys_use_stderr'];
+		}
+		else
+		{
+			$this->options['sys_use_stderr'] = false;
+		}
+
+		// Build the Syslog options from our log object options.
+		$sysOptions = 0;
+
+		if ($this->options['sys_add_pid'])
+		{
+			$sysOptions = $sysOptions | LOG_PID;
+		}
+
+		if ($this->options['sys_use_stderr'])
+		{
+			$sysOptions = $sysOptions | LOG_PERROR;
+		}
+
+		// Default logging facility is LOG_USER for Windows compatibility.
+		$sysFacility = LOG_USER;
+
+		// If we have a facility passed in and we're not on Windows, reset it.
+		if (isset($this->options['sys_facility']) && !IS_WIN)
+		{
+			$sysFacility = $this->options['sys_facility'];
+		}
+
+		// Open the Syslog connection.
+		openlog((string) $this->options['sys_ident'], $sysOptions, $sysFacility);
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since   11.1
+	 */
+	public function __destruct()
+	{
+		closelog();
+	}
+
+	/**
+	 * Method to add an entry to the log.
+	 *
+	 * @param   LogEntry  $entry  The log entry object to add to the log.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function addEntry(LogEntry $entry)
+	{
+		// Generate the value for the priority based on predefined constants.
+		$priority = constant(strtoupper('LOG_' . $this->priorities[$entry->priority]));
+
+		// Send the entry to Syslog.
+		syslog($priority, '[' . $entry->category . '] ' . $entry->message);
+	}
+}
diff --git a/core/libraries/src/Log/Logger/W3cLogger.php b/core/libraries/src/Log/Logger/W3cLogger.php
new file mode 100644
index 00000000..53dc41a6
--- /dev/null
+++ b/core/libraries/src/Log/Logger/W3cLogger.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Log\Logger;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla! W3C Logging class
+ *
+ * This class is designed to build log files based on the W3C specification.
+ *
+ * @link   https://www.w3.org/TR/WD-logfile.html
+ * @since  11.1
+ */
+class W3cLogger extends FormattedtextLogger
+{
+	/**
+	 * The format which each entry follows in the log file.
+	 *
+	 * All fields must be named in all caps and be within curly brackets eg. {FOOBAR}.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $format = '{DATE}	{TIME}	{PRIORITY}	{CLIENTIP}	{CATEGORY}	{MESSAGE}';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  &$options  Log object options.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct(array &$options)
+	{
+		// The name of the text file defaults to 'error.w3c.php' if not explicitly given.
+		if (empty($options['text_file']))
+		{
+			$options['text_file'] = 'error.w3c.php';
+		}
+
+		// Call the parent constructor.
+		parent::__construct($options);
+	}
+}
diff --git a/core/libraries/src/MVC/Controller/AdminController.php b/core/libraries/src/MVC/Controller/AdminController.php
new file mode 100644
index 00000000..cc058024
--- /dev/null
+++ b/core/libraries/src/MVC/Controller/AdminController.php
@@ -0,0 +1,401 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Base class for a Joomla Administrator Controller
+ *
+ * Controller (controllers are where you put all the actual code) Provides basic
+ * functionality, such as rendering views (aka displaying templates).
+ *
+ * @since  1.6
+ */
+class AdminController extends BaseController
+{
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $option;
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix;
+
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_list;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     \JControllerLegacy
+	 * @since   1.6
+	 * @throws  \Exception
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Define standard task mappings.
+
+		// Value = 0
+		$this->registerTask('unpublish', 'publish');
+
+		// Value = 2
+		$this->registerTask('archive', 'publish');
+
+		// Value = -2
+		$this->registerTask('trash', 'publish');
+
+		// Value = -3
+		$this->registerTask('report', 'publish');
+		$this->registerTask('orderup', 'reorder');
+		$this->registerTask('orderdown', 'reorder');
+
+		// Guess the option as com_NameOfController.
+		if (empty($this->option))
+		{
+			$this->option = 'com_' . strtolower($this->getName());
+		}
+
+		// Guess the \JText message prefix. Defaults to the option.
+		if (empty($this->text_prefix))
+		{
+			$this->text_prefix = strtoupper($this->option);
+		}
+
+		// Guess the list view as the suffix, eg: OptionControllerSuffix.
+		if (empty($this->view_list))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Controller(.*)/i', get_class($this), $r))
+			{
+				throw new \Exception(\JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
+			}
+
+			$this->view_list = strtolower($r[2]);
+		}
+	}
+
+	/**
+	 * Removes an item.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function delete()
+	{
+		// Check for request forgeries
+		\JSession::checkToken() or die(\JText::_('JINVALID_TOKEN'));
+
+		// Get items to remove from the request.
+		$cid = $this->input->get('cid', array(), 'array');
+
+		if (!is_array($cid) || count($cid) < 1)
+		{
+			\JLog::add(\JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), \JLog::WARNING, 'jerror');
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Remove the items.
+			if ($model->delete($cid))
+			{
+				$this->setMessage(\JText::plural($this->text_prefix . '_N_ITEMS_DELETED', count($cid)));
+			}
+			else
+			{
+				$this->setMessage($model->getError(), 'error');
+			}
+
+			// Invoke the postDelete method to allow for the child class to access the model.
+			$this->postDeleteHook($model, $cid);
+		}
+
+		$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the item has been deleted.
+	 *
+	 * @param   \JModelLegacy  $model  The data model object.
+	 * @param   integer        $id     The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function postDeleteHook(\JModelLegacy $model, $id = null)
+	{
+	}
+
+	/**
+	 * Display is not supported by this controller.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+	 *
+	 * @return  \JControllerLegacy  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   1.6
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		return $this;
+	}
+
+	/**
+	 * Method to publish a list of items
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function publish()
+	{
+		// Check for request forgeries
+		\JSession::checkToken() or die(\JText::_('JINVALID_TOKEN'));
+
+		// Get items to publish from the request.
+		$cid = $this->input->get('cid', array(), 'array');
+		$data = array('publish' => 1, 'unpublish' => 0, 'archive' => 2, 'trash' => -2, 'report' => -3);
+		$task = $this->getTask();
+		$value = ArrayHelper::getValue($data, $task, 0, 'int');
+
+		if (empty($cid))
+		{
+			\JLog::add(\JText::_($this->text_prefix . '_NO_ITEM_SELECTED'), \JLog::WARNING, 'jerror');
+		}
+		else
+		{
+			// Get the model.
+			$model = $this->getModel();
+
+			// Make sure the item ids are integers
+			$cid = ArrayHelper::toInteger($cid);
+
+			// Publish the items.
+			try
+			{
+				$model->publish($cid, $value);
+				$errors = $model->getErrors();
+				$ntext = null;
+
+				if ($value === 1)
+				{
+					if ($errors)
+					{
+						\JFactory::getApplication()->enqueueMessage(\JText::plural($this->text_prefix . '_N_ITEMS_FAILED_PUBLISHING', count($cid)), 'error');
+					}
+					else
+					{
+						$ntext = $this->text_prefix . '_N_ITEMS_PUBLISHED';
+					}
+				}
+				elseif ($value === 0)
+				{
+					$ntext = $this->text_prefix . '_N_ITEMS_UNPUBLISHED';
+				}
+				elseif ($value === 2)
+				{
+					$ntext = $this->text_prefix . '_N_ITEMS_ARCHIVED';
+				}
+				else
+				{
+					$ntext = $this->text_prefix . '_N_ITEMS_TRASHED';
+				}
+
+				if ($ntext !== null)
+				{
+					$this->setMessage(\JText::plural($ntext, count($cid)));
+				}
+			}
+			catch (\Exception $e)
+			{
+				$this->setMessage($e->getMessage(), 'error');
+			}
+		}
+
+		$extension = $this->input->get('extension');
+		$extensionURL = $extension ? '&extension=' . $extension : '';
+		$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $extensionURL, false));
+	}
+
+	/**
+	 * Changes the order of one or more records.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function reorder()
+	{
+		// Check for request forgeries.
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		$ids = $this->input->post->get('cid', array(), 'array');
+		$inc = $this->getTask() === 'orderup' ? -1 : 1;
+
+		$model = $this->getModel();
+		$return = $model->reorder($ids, $inc);
+
+		if ($return === false)
+		{
+			// Reorder failed.
+			$message = \JText::sprintf('JLIB_APPLICATION_ERROR_REORDER_FAILED', $model->getError());
+			$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message, 'error');
+
+			return false;
+		}
+		else
+		{
+			// Reorder succeeded.
+			$message = \JText::_('JLIB_APPLICATION_SUCCESS_ITEM_REORDERED');
+			$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to save the submitted ordering values for records.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function saveorder()
+	{
+		// Check for request forgeries.
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		// Get the input
+		$pks = $this->input->post->get('cid', array(), 'array');
+		$order = $this->input->post->get('order', array(), 'array');
+
+		// Sanitize the input
+		$pks = ArrayHelper::toInteger($pks);
+		$order = ArrayHelper::toInteger($order);
+
+		// Get the model
+		$model = $this->getModel();
+
+		// Save the ordering
+		$return = $model->saveorder($pks, $order);
+
+		if ($return === false)
+		{
+			// Reorder failed
+			$message = \JText::sprintf('JLIB_APPLICATION_ERROR_REORDER_FAILED', $model->getError());
+			$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message, 'error');
+
+			return false;
+		}
+		else
+		{
+			// Reorder succeeded.
+			$this->setMessage(\JText::_('JLIB_APPLICATION_SUCCESS_ORDERING_SAVED'));
+			$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+
+			return true;
+		}
+	}
+
+	/**
+	 * Check in of one or more records.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.6
+	 */
+	public function checkin()
+	{
+		// Check for request forgeries.
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		$ids = $this->input->post->get('cid', array(), 'array');
+
+		$model = $this->getModel();
+		$return = $model->checkin($ids);
+
+		if ($return === false)
+		{
+			// Checkin failed.
+			$message = \JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError());
+			$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message, 'error');
+
+			return false;
+		}
+		else
+		{
+			// Checkin succeeded.
+			$message = \JText::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', count($ids));
+			$this->setRedirect(\JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false), $message);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to save the submitted ordering values for records via AJAX.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function saveOrderAjax()
+	{
+		// Get the input
+		$pks = $this->input->post->get('cid', array(), 'array');
+		$order = $this->input->post->get('order', array(), 'array');
+
+		// Sanitize the input
+		$pks = ArrayHelper::toInteger($pks);
+		$order = ArrayHelper::toInteger($order);
+
+		// Get the model
+		$model = $this->getModel();
+
+		// Save the ordering
+		$return = $model->saveorder($pks, $order);
+
+		if ($return)
+		{
+			echo '1';
+		}
+
+		// Close the application
+		\JFactory::getApplication()->close();
+	}
+}
diff --git a/core/libraries/src/MVC/Controller/BaseController.php b/core/libraries/src/MVC/Controller/BaseController.php
new file mode 100644
index 00000000..26678094
--- /dev/null
+++ b/core/libraries/src/MVC/Controller/BaseController.php
@@ -0,0 +1,1115 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Base class for a Joomla Controller
+ *
+ * Controller (Controllers are where you put all the actual code.) Provides basic
+ * functionality, such as rendering views (aka displaying templates).
+ *
+ * @since  2.5.5
+ */
+class BaseController extends \JObject
+{
+	/**
+	 * The base path of the controller
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $basePath;
+
+	/**
+	 * The default view for the display method.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $default_view;
+
+	/**
+	 * The mapped task that was performed.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $doTask;
+
+	/**
+	 * Redirect message.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $message;
+
+	/**
+	 * Redirect message type.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $messageType;
+
+	/**
+	 * Array of class methods
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $methods;
+
+	/**
+	 * The name of the controller
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $name;
+
+	/**
+	 * The prefix of the models
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $model_prefix;
+
+	/**
+	 * The set of search directories for resources (views).
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $paths;
+
+	/**
+	 * URL for redirection.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $redirect;
+
+	/**
+	 * Current or most recently performed task.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $task;
+
+	/**
+	 * Array of class methods to call for a given task.
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $taskMap;
+
+	/**
+	 * Hold a JInput object for easier access to the input variables.
+	 *
+	 * @var    \JInput
+	 * @since  3.0
+	 */
+	protected $input;
+
+	/**
+	 * Instance container.
+	 *
+	 * @var    \JControllerLegacy
+	 * @since  3.0
+	 */
+	protected static $instance;
+
+	/**
+	 * Instance container containing the views.
+	 *
+	 * @var    \JViewLegacy[]
+	 * @since  3.4
+	 */
+	protected static $views;
+
+	/**
+	 * Adds to the stack of model paths in LIFO order.
+	 *
+	 * @param   mixed   $path    The directory (string), or list of directories (array) to add.
+	 * @param   string  $prefix  A prefix for models
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function addModelPath($path, $prefix = '')
+	{
+		\JModelLegacy::addIncludePath($path, $prefix);
+	}
+
+	/**
+	 * Create the filename for a resource.
+	 *
+	 * @param   string  $type   The resource type to create the filename for.
+	 * @param   array   $parts  An associative array of filename information. Optional.
+	 *
+	 * @return  string  The filename.
+	 *
+	 * @since   3.0
+	 */
+	protected static function createFileName($type, $parts = array())
+	{
+		$filename = '';
+
+		switch ($type)
+		{
+			case 'controller':
+				if (!empty($parts['format']))
+				{
+					if ($parts['format'] === 'html')
+					{
+						$parts['format'] = '';
+					}
+					else
+					{
+						$parts['format'] = '.' . $parts['format'];
+					}
+				}
+				else
+				{
+					$parts['format'] = '';
+				}
+
+				$filename = strtolower($parts['name'] . $parts['format'] . '.php');
+				break;
+
+			case 'view':
+				if (!empty($parts['type']))
+				{
+					$parts['type'] = '.' . $parts['type'];
+				}
+				else
+				{
+					$parts['type'] = '';
+				}
+
+				$filename = strtolower($parts['name'] . '/view' . $parts['type'] . '.php');
+				break;
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Method to get a singleton controller instance.
+	 *
+	 * @param   string  $prefix  The prefix for the controller.
+	 * @param   array   $config  An array of optional constructor options.
+	 *
+	 * @return  \JControllerLegacy
+	 *
+	 * @since   3.0
+	 * @throws  \Exception if the controller cannot be loaded.
+	 */
+	public static function getInstance($prefix, $config = array())
+	{
+		if (is_object(self::$instance))
+		{
+			return self::$instance;
+		}
+
+		$input = \JFactory::getApplication()->input;
+
+		// Get the environment configuration.
+		$basePath = array_key_exists('base_path', $config) ? $config['base_path'] : JPATH_COMPONENT;
+		$format   = $input->getWord('format');
+		$command  = $input->get('task', 'display');
+
+		// Check for array format.
+		$filter = \JFilterInput::getInstance();
+
+		if (is_array($command))
+		{
+			$command = $filter->clean(array_pop(array_keys($command)), 'cmd');
+		}
+		else
+		{
+			$command = $filter->clean($command, 'cmd');
+		}
+
+		// Check for a controller.task command.
+		if (strpos($command, '.') !== false)
+		{
+			// Explode the controller.task command.
+			list ($type, $task) = explode('.', $command);
+
+			// Define the controller filename and path.
+			$file = self::createFileName('controller', array('name' => $type, 'format' => $format));
+			$path = $basePath . '/controllers/' . $file;
+			$backuppath = $basePath . '/controller/' . $file;
+
+			// Reset the task without the controller context.
+			$input->set('task', $task);
+		}
+		else
+		{
+			// Base controller.
+			$type = null;
+
+			// Define the controller filename and path.
+			$file       = self::createFileName('controller', array('name' => 'controller', 'format' => $format));
+			$path       = $basePath . '/' . $file;
+			$backupfile = self::createFileName('controller', array('name' => 'controller'));
+			$backuppath = $basePath . '/' . $backupfile;
+		}
+
+		// Get the controller class name.
+		$class = ucfirst($prefix) . 'Controller' . ucfirst($type);
+
+		// Include the class if not present.
+		if (!class_exists($class))
+		{
+			// If the controller file path exists, include it.
+			if (file_exists($path))
+			{
+				require_once $path;
+			}
+			elseif (isset($backuppath) && file_exists($backuppath))
+			{
+				require_once $backuppath;
+			}
+			else
+			{
+				throw new \InvalidArgumentException(\JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER', $type, $format));
+			}
+		}
+
+		// Instantiate the class.
+		if (!class_exists($class))
+		{
+			throw new \InvalidArgumentException(\JText::sprintf('JLIB_APPLICATION_ERROR_INVALID_CONTROLLER_CLASS', $class));
+		}
+
+		// Instantiate the class, store it to the static container, and return it
+		return self::$instance = new $class($config);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array())
+	{
+		$this->methods = array();
+		$this->message = null;
+		$this->messageType = 'message';
+		$this->paths = array();
+		$this->redirect = null;
+		$this->taskMap = array();
+
+		if (defined('JDEBUG') && JDEBUG)
+		{
+			\JLog::addLogger(array('text_file' => 'jcontroller.log.php'), \JLog::ALL, array('controller'));
+		}
+
+		$this->input = \JFactory::getApplication()->input;
+
+		// Determine the methods to exclude from the base class.
+		$xMethods = get_class_methods('\JControllerLegacy');
+
+		// Get the public methods in this class using reflection.
+		$r = new \ReflectionClass($this);
+		$rMethods = $r->getMethods(\ReflectionMethod::IS_PUBLIC);
+
+		foreach ($rMethods as $rMethod)
+		{
+			$mName = $rMethod->getName();
+
+			// Add default display method if not explicitly declared.
+			if ($mName === 'display' || !in_array($mName, $xMethods))
+			{
+				$this->methods[] = strtolower($mName);
+
+				// Auto register the methods as tasks.
+				$this->taskMap[strtolower($mName)] = $mName;
+			}
+		}
+
+		// Set the view name
+		if (empty($this->name))
+		{
+			if (array_key_exists('name', $config))
+			{
+				$this->name = $config['name'];
+			}
+			else
+			{
+				$this->name = $this->getName();
+			}
+		}
+
+		// Set a base path for use by the controller
+		if (array_key_exists('base_path', $config))
+		{
+			$this->basePath = $config['base_path'];
+		}
+		else
+		{
+			$this->basePath = JPATH_COMPONENT;
+		}
+
+		// If the default task is set, register it as such
+		if (array_key_exists('default_task', $config))
+		{
+			$this->registerDefaultTask($config['default_task']);
+		}
+		else
+		{
+			$this->registerDefaultTask('display');
+		}
+
+		// Set the models prefix
+		if (empty($this->model_prefix))
+		{
+			if (array_key_exists('model_prefix', $config))
+			{
+				// User-defined prefix
+				$this->model_prefix = $config['model_prefix'];
+			}
+			else
+			{
+				$this->model_prefix = ucfirst($this->name) . 'Model';
+			}
+		}
+
+		// Set the default model search path
+		if (array_key_exists('model_path', $config))
+		{
+			// User-defined dirs
+			$this->addModelPath($config['model_path'], $this->model_prefix);
+		}
+		else
+		{
+			$this->addModelPath($this->basePath . '/models', $this->model_prefix);
+		}
+
+		// Set the default view search path
+		if (array_key_exists('view_path', $config))
+		{
+			// User-defined dirs
+			$this->setPath('view', $config['view_path']);
+		}
+		else
+		{
+			$this->setPath('view', $this->basePath . '/views');
+		}
+
+		// Set the default view.
+		if (array_key_exists('default_view', $config))
+		{
+			$this->default_view = $config['default_view'];
+		}
+		elseif (empty($this->default_view))
+		{
+			$this->default_view = $this->getName();
+		}
+	}
+
+	/**
+	 * Adds to the search path for templates and resources.
+	 *
+	 * @param   string  $type  The path type (e.g. 'model', 'view').
+	 * @param   mixed   $path  The directory string  or stream array to search.
+	 *
+	 * @return  \JControllerLegacy  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	protected function addPath($type, $path)
+	{
+		if (!isset($this->paths[$type]))
+		{
+			$this->paths[$type] = array();
+		}
+
+		// Loop through the path directories
+		foreach ((array) $path as $dir)
+		{
+			// No surrounding spaces allowed!
+			$dir = rtrim(\JPath::check($dir), '/') . '/';
+
+			// Add to the top of the search dirs
+			array_unshift($this->paths[$type], $dir);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add one or more view paths to the controller's stack, in LIFO order.
+	 *
+	 * @param   mixed  $path  The directory (string) or list of directories (array) to add.
+	 *
+	 * @return  \JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	public function addViewPath($path)
+	{
+		return $this->addPath('view', $path);
+	}
+
+	/**
+	 * Authorisation check
+	 *
+	 * @param   string  $task  The ACO Section Value to check access on.
+	 *
+	 * @return  boolean  True if authorised
+	 *
+	 * @since   3.0
+	 * @deprecated  3.0  Use \JAccess instead.
+	 */
+	public function authorise($task)
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Use \JAccess instead.', \JLog::WARNING, 'deprecated');
+
+		return true;
+	}
+
+	/**
+	 * Method to check whether an ID is in the edit list.
+	 *
+	 * @param   string   $context  The context for the session storage.
+	 * @param   integer  $id       The ID of the record to add to the edit list.
+	 *
+	 * @return  boolean  True if the ID is in the edit list.
+	 *
+	 * @since   3.0
+	 */
+	protected function checkEditId($context, $id)
+	{
+		if ($id)
+		{
+			$values = (array) \JFactory::getApplication()->getUserState($context . '.id');
+
+			$result = in_array((int) $id, $values);
+
+			if (defined('JDEBUG') && JDEBUG)
+			{
+				\JLog::add(
+					sprintf(
+						'Checking edit ID %s.%s: %d %s',
+						$context,
+						$id,
+						(int) $result,
+						str_replace("\n", ' ', print_r($values, 1))
+					),
+					\JLog::INFO,
+					'controller'
+				);
+			}
+
+			return $result;
+		}
+
+		// No id for a new item.
+		return true;
+	}
+
+	/**
+	 * Method to load and return a model object.
+	 *
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  Optional model prefix.
+	 * @param   array   $config  Configuration array for the model. Optional.
+	 *
+	 * @return  \JModelLegacy|boolean   Model object on success; otherwise false on failure.
+	 *
+	 * @since   3.0
+	 */
+	protected function createModel($name, $prefix = '', $config = array())
+	{
+		// Clean the model name
+		$modelName = preg_replace('/[^A-Z0-9_]/i', '', $name);
+		$classPrefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
+
+		return \JModelLegacy::getInstance($modelName, $classPrefix, $config);
+	}
+
+	/**
+	 * Method to load and return a view object. This method first looks in the
+	 * current template directory for a match and, failing that, uses a default
+	 * set path to load the view class file.
+	 *
+	 * Note the "name, prefix, type" order of parameters, which differs from the
+	 * "name, type, prefix" order used in related public methods.
+	 *
+	 * @param   string  $name    The name of the view.
+	 * @param   string  $prefix  Optional prefix for the view class name.
+	 * @param   string  $type    The type of view.
+	 * @param   array   $config  Configuration array for the view. Optional.
+	 *
+	 * @return  \JViewLegacy|null  View object on success; null or error result on failure.
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	protected function createView($name, $prefix = '', $type = '', $config = array())
+	{
+		// Clean the view name
+		$viewName = preg_replace('/[^A-Z0-9_]/i', '', $name);
+		$classPrefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
+		$viewType = preg_replace('/[^A-Z0-9_]/i', '', $type);
+
+		// Build the view class name
+		$viewClass = $classPrefix . $viewName;
+
+		if (!class_exists($viewClass))
+		{
+			jimport('joomla.filesystem.path');
+			$path = \JPath::find($this->paths['view'], $this->createFileName('view', array('name' => $viewName, 'type' => $viewType)));
+
+			if (!$path)
+			{
+				return null;
+			}
+
+			require_once $path;
+
+			if (!class_exists($viewClass))
+			{
+				throw new \Exception(\JText::sprintf('JLIB_APPLICATION_ERROR_VIEW_CLASS_NOT_FOUND', $viewClass, $path), 500);
+			}
+		}
+
+		return new $viewClass($config);
+	}
+
+	/**
+	 * Typical view method for MVC based architecture
+	 *
+	 * This function is provide as a default implementation, in most cases
+	 * you will need to override it in your own controllers.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}.
+	 *
+	 * @return  \JControllerLegacy  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	public function display($cachable = false, $urlparams = array())
+	{
+		$document = \JFactory::getDocument();
+		$viewType = $document->getType();
+		$viewName = $this->input->get('view', $this->default_view);
+		$viewLayout = $this->input->get('layout', 'default', 'string');
+
+		$view = $this->getView($viewName, $viewType, '', array('base_path' => $this->basePath, 'layout' => $viewLayout));
+
+		// Get/Create the model
+		if ($model = $this->getModel($viewName))
+		{
+			// Push the model into the view (as default)
+			$view->setModel($model, true);
+		}
+
+		$view->document = $document;
+
+		// Display the view
+		if ($cachable && $viewType !== 'feed' && \JFactory::getConfig()->get('caching') >= 1)
+		{
+			$option = $this->input->get('option');
+
+			if (is_array($urlparams))
+			{
+				$app = \JFactory::getApplication();
+
+				if (!empty($app->registeredurlparams))
+				{
+					$registeredurlparams = $app->registeredurlparams;
+				}
+				else
+				{
+					$registeredurlparams = new \stdClass;
+				}
+
+				foreach ($urlparams as $key => $value)
+				{
+					// Add your safe URL parameters with variable type as value {@see \JFilterInput::clean()}.
+					$registeredurlparams->$key = $value;
+				}
+
+				$app->registeredurlparams = $registeredurlparams;
+			}
+
+			try
+			{
+				/** @var \JCacheControllerView $cache */
+				$cache = \JFactory::getCache($option, 'view');
+				$cache->get($view, 'display');
+			}
+			catch (\JCacheException $exception)
+			{
+				$view->display();
+			}
+		}
+		else
+		{
+			$view->display();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Execute a task by triggering a method in the derived class.
+	 *
+	 * @param   string  $task  The task to perform. If no matching task is found, the '__default' task is executed, if defined.
+	 *
+	 * @return  mixed   The value returned by the called method.
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function execute($task)
+	{
+		$this->task = $task;
+
+		$task = strtolower($task);
+
+		if (isset($this->taskMap[$task]))
+		{
+			$doTask = $this->taskMap[$task];
+		}
+		elseif (isset($this->taskMap['__default']))
+		{
+			$doTask = $this->taskMap['__default'];
+		}
+		else
+		{
+			throw new \Exception(\JText::sprintf('JLIB_APPLICATION_ERROR_TASK_NOT_FOUND', $task), 404);
+		}
+
+		// Record the actual task being fired
+		$this->doTask = $doTask;
+
+		return $this->$doTask();
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  \JModelLegacy|boolean  Model object on success; otherwise false on failure.
+	 *
+	 * @since   3.0
+	 */
+	public function getModel($name = '', $prefix = '', $config = array())
+	{
+		if (empty($name))
+		{
+			$name = $this->getName();
+		}
+
+		if (empty($prefix))
+		{
+			$prefix = $this->model_prefix;
+		}
+
+		if ($model = $this->createModel($name, $prefix, $config))
+		{
+			// Task is a reserved state
+			$model->setState('task', $this->task);
+
+			// Let's get the application object and set menu information if it's available
+			$menu = \JFactory::getApplication()->getMenu();
+
+			if (is_object($menu) && $item = $menu->getActive())
+			{
+				$params = $menu->getParams($item->id);
+
+				// Set default state data
+				$model->setState('parameters.menu', $params);
+			}
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Method to get the controller name
+	 *
+	 * The dispatcher name is set by default parsed using the classname, or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the dispatcher
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Controller/i', get_class($this), $r))
+			{
+				throw new \Exception(\JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
+			}
+
+			$this->name = strtolower($r[1]);
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Get the last task that is being performed or was most recently performed.
+	 *
+	 * @return  string  The task that is being performed or was most recently performed.
+	 *
+	 * @since   3.0
+	 */
+	public function getTask()
+	{
+		return $this->task;
+	}
+
+	/**
+	 * Gets the available tasks in the controller.
+	 *
+	 * @return  array  Array[i] of task names.
+	 *
+	 * @since   3.0
+	 */
+	public function getTasks()
+	{
+		return $this->methods;
+	}
+
+	/**
+	 * Method to get a reference to the current view and load it if necessary.
+	 *
+	 * @param   string  $name    The view name. Optional, defaults to the controller name.
+	 * @param   string  $type    The view type. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for view. Optional.
+	 *
+	 * @return  \JViewLegacy  Reference to the view or an error.
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function getView($name = '', $type = '', $prefix = '', $config = array())
+	{
+		// @note We use self so we only access stuff in this class rather than in all classes.
+		if (!isset(self::$views))
+		{
+			self::$views = array();
+		}
+
+		if (empty($name))
+		{
+			$name = $this->getName();
+		}
+
+		if (empty($prefix))
+		{
+			$prefix = $this->getName() . 'View';
+		}
+
+		if (empty(self::$views[$name][$type][$prefix]))
+		{
+			if ($view = $this->createView($name, $prefix, $type, $config))
+			{
+				self::$views[$name][$type][$prefix] = & $view;
+			}
+			else
+			{
+				throw new \Exception(\JText::sprintf('JLIB_APPLICATION_ERROR_VIEW_NOT_FOUND', $name, $type, $prefix), 404);
+			}
+		}
+
+		return self::$views[$name][$type][$prefix];
+	}
+
+	/**
+	 * Method to add a record ID to the edit list.
+	 *
+	 * @param   string   $context  The context for the session storage.
+	 * @param   integer  $id       The ID of the record to add to the edit list.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function holdEditId($context, $id)
+	{
+		$app = \JFactory::getApplication();
+		$values = (array) $app->getUserState($context . '.id');
+
+		// Add the id to the list if non-zero.
+		if (!empty($id))
+		{
+			$values[] = (int) $id;
+			$values   = array_unique($values);
+			$app->setUserState($context . '.id', $values);
+
+			if (defined('JDEBUG') && JDEBUG)
+			{
+				\JLog::add(
+					sprintf(
+						'Holding edit ID %s.%s %s',
+						$context,
+						$id,
+						str_replace("\n", ' ', print_r($values, 1))
+					),
+					\JLog::INFO,
+					'controller'
+				);
+			}
+		}
+	}
+
+	/**
+	 * Redirects the browser or returns false if no redirect is set.
+	 *
+	 * @return  boolean  False if no redirect exists.
+	 *
+	 * @since   3.0
+	 */
+	public function redirect()
+	{
+		if ($this->redirect)
+		{
+			$app = \JFactory::getApplication();
+
+			// Enqueue the redirect message
+			$app->enqueueMessage($this->message, $this->messageType);
+
+			// Execute the redirect
+			$app->redirect($this->redirect);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Register the default task to perform if a mapping is not found.
+	 *
+	 * @param   string  $method  The name of the method in the derived class to perform if a named task is not found.
+	 *
+	 * @return  \JControllerLegacy  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	public function registerDefaultTask($method)
+	{
+		$this->registerTask('__default', $method);
+
+		return $this;
+	}
+
+	/**
+	 * Register (map) a task to a method in the class.
+	 *
+	 * @param   string  $task    The task.
+	 * @param   string  $method  The name of the method in the derived class to perform for this task.
+	 *
+	 * @return  \JControllerLegacy  A \JControllerLegacy object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	public function registerTask($task, $method)
+	{
+		if (in_array(strtolower($method), $this->methods))
+		{
+			$this->taskMap[strtolower($task)] = $method;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Unregister (unmap) a task in the class.
+	 *
+	 * @param   string  $task  The task.
+	 *
+	 * @return  \JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	public function unregisterTask($task)
+	{
+		unset($this->taskMap[strtolower($task)]);
+
+		return $this;
+	}
+
+	/**
+	 * Method to check whether an ID is in the edit list.
+	 *
+	 * @param   string   $context  The context for the session storage.
+	 * @param   integer  $id       The ID of the record to add to the edit list.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function releaseEditId($context, $id)
+	{
+		$app = \JFactory::getApplication();
+		$values = (array) $app->getUserState($context . '.id');
+
+		// Do a strict search of the edit list values.
+		$index = array_search((int) $id, $values, true);
+
+		if (is_int($index))
+		{
+			unset($values[$index]);
+			$app->setUserState($context . '.id', $values);
+
+			if (defined('JDEBUG') && JDEBUG)
+			{
+				\JLog::add(
+					sprintf(
+						'Releasing edit ID %s.%s %s',
+						$context,
+						$id,
+						str_replace("\n", ' ', print_r($values, 1))
+					),
+					\JLog::INFO,
+					'controller'
+				);
+			}
+		}
+	}
+
+	/**
+	 * Sets the internal message that is passed with a redirect
+	 *
+	 * @param   string  $text  Message to display on redirect.
+	 * @param   string  $type  Message type. Optional, defaults to 'message'.
+	 *
+	 * @return  string  Previous message
+	 *
+	 * @since   3.0
+	 */
+	public function setMessage($text, $type = 'message')
+	{
+		$previous = $this->message;
+		$this->message = $text;
+		$this->messageType = $type;
+
+		return $previous;
+	}
+
+	/**
+	 * Sets an entire array of search paths for resources.
+	 *
+	 * @param   string  $type  The type of path to set, typically 'view' or 'model'.
+	 * @param   string  $path  The new set of search paths. If null or false, resets to the current directory only.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function setPath($type, $path)
+	{
+		// Clear out the prior search dirs
+		$this->paths[$type] = array();
+
+		// Actually add the user-specified directories
+		$this->addPath($type, $path);
+	}
+
+	/**
+	 * Checks for a form token in the request.
+	 *
+	 * Use in conjunction with \JHtml::_('form.token') or \JSession::getFormToken.
+	 *
+	 * @param   string   $method    The request method in which to look for the token key.
+	 * @param   boolean  $redirect  Whether to implicitly redirect user to the referrer page on failure or simply return false.
+	 *
+	 * @return  boolean  True if found and valid, otherwise return false or redirect to referrer page.
+	 *
+	 * @since   3.7.0
+	 * @see     \JSession::checkToken()
+	 */
+	public function checkToken($method = 'post', $redirect = true)
+	{
+		$valid = \JSession::checkToken($method);
+
+		if (!$valid && $redirect)
+		{
+			$referrer = $this->input->server->getString('HTTP_REFERER');
+
+			if (!\JUri::isInternal($referrer))
+			{
+				$referrer = 'index.php';
+			}
+
+			$app = \JFactory::getApplication();
+			$app->enqueueMessage(\JText::_('JINVALID_TOKEN_NOTICE'), 'warning');
+			$app->redirect($referrer);
+		}
+
+		return $valid;
+	}
+
+	/**
+	 * Set a URL for browser redirection.
+	 *
+	 * @param   string  $url   URL to redirect to.
+	 * @param   string  $msg   Message to display on redirect. Optional, defaults to value set internally by controller, if any.
+	 * @param   string  $type  Message type. Optional, defaults to 'message' or the type set by a previous call to setMessage.
+	 *
+	 * @return  \JControllerLegacy  This object to support chaining.
+	 *
+	 * @since   3.0
+	 */
+	public function setRedirect($url, $msg = null, $type = null)
+	{
+		$this->redirect = $url;
+
+		if ($msg !== null)
+		{
+			// Controller may have set this directly
+			$this->message = $msg;
+		}
+
+		// Ensure the type is not overwritten by a previous call to setMessage.
+		if (empty($type))
+		{
+			if (empty($this->messageType))
+			{
+				$this->messageType = 'message';
+			}
+		}
+		// If the type is explicitly set, set it.
+		else
+		{
+			$this->messageType = $type;
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/MVC/Controller/FormController.php b/core/libraries/src/MVC/Controller/FormController.php
new file mode 100644
index 00000000..27d532a5
--- /dev/null
+++ b/core/libraries/src/MVC/Controller/FormController.php
@@ -0,0 +1,924 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Controller;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Controller tailored to suit most form-based admin operations.
+ *
+ * @since  1.6
+ * @todo   Add ability to set redirect manually to better cope with frontend usage.
+ */
+class FormController extends BaseController
+{
+	/**
+	 * The context for storing internal data, e.g. record.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $context;
+
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $option;
+
+	/**
+	 * The URL view item variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_item;
+
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_list;
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     \JControllerLegacy
+	 * @since   1.6
+	 * @throws  \Exception
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Guess the option as com_NameOfController
+		if (empty($this->option))
+		{
+			$this->option = 'com_' . strtolower($this->getName());
+		}
+
+		// Guess the \JText message prefix. Defaults to the option.
+		if (empty($this->text_prefix))
+		{
+			$this->text_prefix = strtoupper($this->option);
+		}
+
+		// Guess the context as the suffix, eg: OptionControllerContent.
+		if (empty($this->context))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Controller(.*)/i', get_class($this), $r))
+			{
+				throw new \Exception(\JText::_('JLIB_APPLICATION_ERROR_CONTROLLER_GET_NAME'), 500);
+			}
+
+			$this->context = strtolower($r[2]);
+		}
+
+		// Guess the item view as the context.
+		if (empty($this->view_item))
+		{
+			$this->view_item = $this->context;
+		}
+
+		// Guess the list view as the plural of the item view.
+		if (empty($this->view_list))
+		{
+			// @TODO Probably worth moving to an inflector class based on
+			// http://kuwamoto.org/2007/12/17/improved-pluralizing-in-php-actionscript-and-ror/
+
+			// Simple pluralisation based on public domain snippet by Paul Osman
+			// For more complex types, just manually set the variable in your class.
+			$plural = array(
+				array('/(x|ch|ss|sh)$/i', "$1es"),
+				array('/([^aeiouy]|qu)y$/i', "$1ies"),
+				array('/([^aeiouy]|qu)ies$/i', "$1y"),
+				array('/(bu)s$/i', "$1ses"),
+				array('/s$/i', 's'),
+				array('/$/', 's'),
+			);
+
+			// Check for matches using regular expressions
+			foreach ($plural as $pattern)
+			{
+				if (preg_match($pattern[0], $this->view_item))
+				{
+					$this->view_list = preg_replace($pattern[0], $pattern[1], $this->view_item);
+					break;
+				}
+			}
+		}
+
+		// Apply, Save & New, and Save As copy should be standard on forms.
+		$this->registerTask('apply', 'save');
+		$this->registerTask('save2new', 'save');
+		$this->registerTask('save2copy', 'save');
+	}
+
+	/**
+	 * Method to add a new record.
+	 *
+	 * @return  boolean  True if the record can be added, false if not.
+	 *
+	 * @since   1.6
+	 */
+	public function add()
+	{
+		$context = "$this->option.edit.$this->context";
+
+		// Access check.
+		if (!$this->allowAdd())
+		{
+			// Set the internal error and also the redirect error.
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+
+			return false;
+		}
+
+		// Clear the record edit information from the session.
+		\JFactory::getApplication()->setUserState($context . '.data', null);
+
+		// Redirect to the edit screen.
+		$this->setRedirect(
+			\JRoute::_(
+				'index.php?option=' . $this->option . '&view=' . $this->view_item
+				. $this->getRedirectToItemAppend(), false
+			)
+		);
+
+		return true;
+	}
+
+	/**
+	 * Method to check if you can add a new record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user = \JFactory::getUser();
+
+		return $user->authorise('core.create', $this->option) || count($user->getAuthorisedCategories($this->option, 'core.create'));
+	}
+
+	/**
+	 * Method to check if you can edit an existing record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key; default is id.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		return \JFactory::getUser()->authorise('core.edit', $this->option);
+	}
+
+	/**
+	 * Method to check if you can save a new or existing record.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowSave($data, $key = 'id')
+	{
+		$recordId = isset($data[$key]) ? $data[$key] : '0';
+
+		if ($recordId)
+		{
+			return $this->allowEdit($data, $key);
+		}
+		else
+		{
+			return $this->allowAdd($data);
+		}
+	}
+
+	/**
+	 * Method to run batch operations.
+	 *
+	 * @param   \JModelLegacy  $model  The model of the component being processed.
+	 *
+	 * @return	boolean	 True if successful, false otherwise and internal error is set.
+	 *
+	 * @since	1.7
+	 */
+	public function batch($model)
+	{
+		$vars = $this->input->post->get('batch', array(), 'array');
+		$cid  = $this->input->post->get('cid', array(), 'array');
+
+		// Build an array of item contexts to check
+		$contexts = array();
+
+		$option = isset($this->extension) ? $this->extension : $this->option;
+
+		foreach ($cid as $id)
+		{
+			// If we're coming from com_categories, we need to use extension vs. option
+			$contexts[$id] = $option . '.' . $this->context . '.' . $id;
+		}
+
+		// Attempt to run the batch operation.
+		if ($model->batch($vars, $cid, $contexts))
+		{
+			$this->setMessage(\JText::_('JLIB_APPLICATION_SUCCESS_BATCH'));
+
+			return true;
+		}
+		else
+		{
+			$this->setMessage(\JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_FAILED', $model->getError()), 'warning');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = null)
+	{
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel();
+		$table = $model->getTable();
+		$context = "$this->option.edit.$this->context";
+
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		$recordId = $this->input->getInt($key);
+
+		// Attempt to check-in the current record.
+		if ($recordId && property_exists($table, 'checked_out') && $model->checkin($recordId) === false)
+		{
+			// Check-in failed, go back to the record and display a notice.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $key), false
+				)
+			);
+
+			return false;
+		}
+
+		// Clean the session data and redirect.
+		$this->releaseEditId($context, $recordId);
+		\JFactory::getApplication()->setUserState($context . '.data', null);
+
+		$this->setRedirect(
+			\JRoute::_(
+				'index.php?option=' . $this->option . '&view=' . $this->view_list
+				. $this->getRedirectToListAppend(), false
+			)
+		);
+
+		return true;
+	}
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *                           (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		// Do not cache the response to this, its a redirect, and mod_expires and google chrome browser bugs cache it forever!
+		\JFactory::getApplication()->allowCache(false);
+
+		$model = $this->getModel();
+		$table = $model->getTable();
+		$cid   = $this->input->post->get('cid', array(), 'array');
+		$context = "$this->option.edit.$this->context";
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		// Get the previous record id (if any) and the current record id.
+		$recordId = (int) (count($cid) ? $cid[0] : $this->input->getInt($urlVar));
+		$checkin = property_exists($table, $table->getColumnAlias('checked_out'));
+
+		// Access check.
+		if (!$this->allowEdit(array($key => $recordId), $key))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+
+			return false;
+		}
+
+		// Attempt to check-out the new record for editing and redirect.
+		if ($checkin && !$model->checkout($recordId))
+		{
+			// Check-out failed, display a notice but allow the user to see the record.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKOUT_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $urlVar), false
+				)
+			);
+
+			return false;
+		}
+		else
+		{
+			// Check-out succeeded, push the new record id into the session.
+			$this->holdEditId($context, $recordId);
+			\JFactory::getApplication()->setUserState($context . '.data', null);
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $urlVar), false
+				)
+			);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  \JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = '', $prefix = '', $config = array('ignore_request' => true))
+	{
+		if (empty($name))
+		{
+			$name = $this->context;
+		}
+
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+	{
+		$append = '';
+
+		// Setup redirect info.
+		if ($tmpl = $this->input->get('tmpl', '', 'string'))
+		{
+			$append .= '&tmpl=' . $tmpl;
+		}
+
+		if ($layout = $this->input->get('layout', 'edit', 'string'))
+		{
+			$append .= '&layout=' . $layout;
+		}
+
+		if ($forcedLanguage = $this->input->get('forcedLanguage', '', 'cmd'))
+		{
+			$append .= '&forcedLanguage=' . $forcedLanguage;
+		}
+
+		if ($recordId)
+		{
+			$append .= '&' . $urlVar . '=' . $recordId;
+		}
+
+		$return = $this->input->get('return', null, 'base64');
+
+		if ($return)
+		{
+			$append .= '&return=' . $return;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Gets the URL arguments to append to a list redirect.
+	 *
+	 * @return  string  The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToListAppend()
+	{
+		$append = '';
+
+		// Setup redirect info.
+		if ($tmpl = $this->input->get('tmpl', '', 'string'))
+		{
+			$append .= '&tmpl=' . $tmpl;
+		}
+
+		if ($forcedLanguage = $this->input->get('forcedLanguage', '', 'cmd'))
+		{
+			$append .= '&forcedLanguage=' . $forcedLanguage;
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Function that allows child controller access to model data
+	 * after the data has been saved.
+	 *
+	 * @param   \JModelLegacy  $model      The data model object.
+	 * @param   array          $validData  The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function postSaveHook(\JModelLegacy $model, $validData = array())
+	{
+	}
+
+	/**
+	 * Method to load a row from version history
+	 *
+	 * @return  mixed  True if the record can be added, an error object if not.
+	 *
+	 * @since   3.2
+	 */
+	public function loadhistory()
+	{
+		$model = $this->getModel();
+		$table = $model->getTable();
+		$historyId = $this->input->getInt('version_id', null);
+
+		if (!$model->loadhistory($historyId, $table))
+		{
+			$this->setMessage($model->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+
+			return false;
+		}
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		$recordId = $table->$key;
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		$urlVar = empty($this->urlVar) ? $key : $this->urlVar;
+
+		// Access check.
+		if (!$this->allowEdit(array($key => $recordId), $key))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+			$table->checkin();
+
+			return false;
+		}
+
+		$table->store();
+		$this->setRedirect(
+			\JRoute::_(
+				'index.php?option=' . $this->option . '&view=' . $this->view_item
+				. $this->getRedirectToItemAppend($recordId, $urlVar), false
+			)
+		);
+
+		$this->setMessage(
+			\JText::sprintf(
+				'JLIB_APPLICATION_SUCCESS_LOAD_HISTORY', $model->getState('save_date'), $model->getState('version_note')
+			)
+		);
+
+		// Invoke the postSave method to allow for the child class to access the model.
+		$this->postSaveHook($model);
+
+		return true;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		$app   = \JFactory::getApplication();
+		$model = $this->getModel();
+		$table = $model->getTable();
+		$data  = $this->input->post->get('jform', array(), 'array');
+		$checkin = property_exists($table, $table->getColumnAlias('checked_out'));
+		$context = "$this->option.edit.$this->context";
+		$task = $this->getTask();
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $table->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		$recordId = $this->input->getInt($urlVar);
+
+		// Populate the row id from the session.
+		$data[$key] = $recordId;
+
+		// The save2copy task needs to be handled slightly differently.
+		if ($task === 'save2copy')
+		{
+			// Check-in the original row.
+			if ($checkin && $model->checkin($data[$key]) === false)
+			{
+				// Check-in failed. Go back to the item and display a notice.
+				$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
+				$this->setMessage($this->getError(), 'error');
+
+				$this->setRedirect(
+					\JRoute::_(
+						'index.php?option=' . $this->option . '&view=' . $this->view_item
+						. $this->getRedirectToItemAppend($recordId, $urlVar), false
+					)
+				);
+
+				return false;
+			}
+
+			// Reset the ID, the multilingual associations and then treat the request as for Apply.
+			$data[$key] = 0;
+			$data['associations'] = array();
+			$task = 'apply';
+		}
+
+		// Access check.
+		if (!$this->allowSave($data, $key))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+
+			return false;
+		}
+
+		// Validate the posted data.
+		// Sometimes the form needs some posted data, such as for plugins and modules.
+		$form = $model->getForm($data, false);
+
+		if (!$form)
+		{
+			$app->enqueueMessage($model->getError(), 'error');
+
+			return false;
+		}
+
+		// Send an object which can be modified through the plugin event
+		$objData = (object) $data;
+		$app->triggerEvent(
+			'onContentNormaliseRequestData',
+			array($this->option . '.' . $this->context, $objData, $form)
+		);
+		$data = (array) $objData;
+
+		// Test whether the data is valid.
+		$validData = $model->validate($form, $data);
+
+		// Check for validation errors.
+		if ($validData === false)
+		{
+			// Get the validation messages.
+			$errors = $model->getErrors();
+
+			// Push up to three validation messages out to the user.
+			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
+			{
+				if ($errors[$i] instanceof \Exception)
+				{
+					$app->enqueueMessage($errors[$i]->getMessage(), 'warning');
+				}
+				else
+				{
+					$app->enqueueMessage($errors[$i], 'warning');
+				}
+			}
+
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $data);
+
+			// Redirect back to the edit screen.
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $urlVar), false
+				)
+			);
+
+			return false;
+		}
+
+		if (!isset($validData['tags']))
+		{
+			$validData['tags'] = null;
+		}
+
+		// Attempt to save the data.
+		if (!$model->save($validData))
+		{
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $validData);
+
+			// Redirect back to the edit screen.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $urlVar), false
+				)
+			);
+
+			return false;
+		}
+
+		// Save succeeded, so check-in the record.
+		if ($checkin && $model->checkin($validData[$key]) === false)
+		{
+			// Save the data in the session.
+			$app->setUserState($context . '.data', $validData);
+
+			// Check-in failed, so go back to the record and display a notice.
+			$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()));
+			$this->setMessage($this->getError(), 'error');
+
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_item
+					. $this->getRedirectToItemAppend($recordId, $urlVar), false
+				)
+			);
+
+			return false;
+		}
+
+		$langKey = $this->text_prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS';
+		$prefix  = \JFactory::getLanguage()->hasKey($langKey) ? $this->text_prefix : 'JLIB_APPLICATION';
+
+		$this->setMessage(\JText::_($prefix . ($recordId === 0 && $app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
+
+		// Redirect the user and adjust session state based on the chosen task.
+		switch ($task)
+		{
+			case 'apply':
+				// Set the record data in the session.
+				$recordId = $model->getState($this->context . '.id');
+				$this->holdEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+				$model->checkout($recordId);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(
+					\JRoute::_(
+						'index.php?option=' . $this->option . '&view=' . $this->view_item
+						. $this->getRedirectToItemAppend($recordId, $urlVar), false
+					)
+				);
+				break;
+
+			case 'save2new':
+				// Clear the record id and data from the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+
+				// Redirect back to the edit screen.
+				$this->setRedirect(
+					\JRoute::_(
+						'index.php?option=' . $this->option . '&view=' . $this->view_item
+						. $this->getRedirectToItemAppend(null, $urlVar), false
+					)
+				);
+				break;
+
+			default:
+				// Clear the record id and data from the session.
+				$this->releaseEditId($context, $recordId);
+				$app->setUserState($context . '.data', null);
+
+				$url = 'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend();
+
+				// Check if there is a return value
+				$return = $this->input->get('return', null, 'base64');
+
+				if (!is_null($return) && \JUri::isInternal(base64_decode($return)))
+				{
+					$url = base64_decode($return);
+				}
+
+				// Redirect to the list screen.
+				$this->setRedirect(\JRoute::_($url, false));
+				break;
+		}
+
+		// Invoke the postSave method to allow for the child class to access the model.
+		$this->postSaveHook($model, $validData);
+
+		return true;
+	}
+
+	/**
+	 * Method to reload a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.4
+	 */
+	public function reload($key = null, $urlVar = null)
+	{
+		// Check for request forgeries.
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		$app     = \JFactory::getApplication();
+		$model   = $this->getModel();
+		$data    = $this->input->post->get('jform', array(), 'array');
+
+		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$key = $model->getTable()->getKeyName();
+		}
+
+		// To avoid data collisions the urlVar may be different from the primary key.
+		if (empty($urlVar))
+		{
+			$urlVar = $key;
+		}
+
+		$recordId = $this->input->getInt($urlVar);
+
+		// Populate the row id from the session.
+		$data[$key] = $recordId;
+
+		// Check if it is allowed to edit or create the data
+		if (($recordId && !$this->allowEdit($data, $key)) || (!$recordId && !$this->allowAdd($data)))
+		{
+			$this->setRedirect(
+				\JRoute::_(
+					'index.php?option=' . $this->option . '&view=' . $this->view_list
+					. $this->getRedirectToListAppend(), false
+				)
+			);
+			$this->redirect();
+		}
+
+		// The redirect url
+		$redirectUrl = \JRoute::_(
+			'index.php?option=' . $this->option . '&view=' . $this->view_item .
+			$this->getRedirectToItemAppend($recordId, $urlVar),
+			false
+		);
+
+		// Validate the posted data.
+		// Sometimes the form needs some posted data, such as for plugins and modules.
+		$form = $model->getForm($data, false);
+
+		if (!$form)
+		{
+			$app->enqueueMessage($model->getError(), 'error');
+
+			$this->setRedirect($redirectUrl);
+			$this->redirect();
+		}
+
+		// Save the data in the session.
+		$app->setUserState($this->option . '.edit.' . $this->context . '.data', $form->filter($data));
+
+		$this->setRedirect($redirectUrl);
+		$this->redirect();
+	}
+}
diff --git a/core/libraries/src/MVC/Model/AdminModel.php b/core/libraries/src/MVC/Model/AdminModel.php
new file mode 100644
index 00000000..1055717b
--- /dev/null
+++ b/core/libraries/src/MVC/Model/AdminModel.php
@@ -0,0 +1,1534 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Model;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Prototype admin model.
+ *
+ * @since  1.6
+ */
+abstract class AdminModel extends FormModel
+{
+	/**
+	 * The type alias for this content type (for example, 'com_content.article').
+	 *
+	 * @var    string
+	 * @since  3.8.6
+	 */
+	public $typeAlias;
+
+	/**
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $text_prefix = null;
+
+	/**
+	 * The event to trigger after deleting the data.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $event_after_delete = null;
+
+	/**
+	 * The event to trigger after saving the data.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $event_after_save = null;
+
+	/**
+	 * The event to trigger before deleting the data.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $event_before_delete = null;
+
+	/**
+	 * The event to trigger before saving the data.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $event_before_save = null;
+
+	/**
+	 * The event to trigger after changing the published state of the data.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $event_change_state = null;
+
+	/**
+	 * Batch copy/move command. If set to false,
+	 * the batch copy/move command is not supported
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $batch_copymove = 'category_id';
+
+	/**
+	 * Allowed batch commands
+	 *
+	 * @var    array
+	 * @since  3.4
+	 */
+	protected $batch_commands = array(
+		'assetgroup_id' => 'batchAccess',
+		'language_id' => 'batchLanguage',
+		'tag' => 'batchTag',
+	);
+
+	/**
+	 * The context used for the associations table
+	 *
+	 * @var     string
+	 * @since   3.4.4
+	 */
+	protected $associationsContext = null;
+
+	/**
+	 * A flag to indicate if member variables for batch actions (and saveorder) have been initialized
+	 *
+	 * @var     object
+	 * @since   3.8.2
+	 */
+	protected $batchSet = null;
+
+	/**
+	 * The user performing the actions (re-usable in batch methods & saveorder(), initialized via initBatch())
+	 *
+	 * @var     object
+	 * @since   3.8.2
+	 */
+	protected $user = null;
+
+	/**
+	 * A JTable instance (of appropropriate type) to manage the DB records (re-usable in batch methods & saveorder(), initialized via initBatch())
+	 *
+	 * @var     object
+	 * @since   3.8.2
+	 */
+	protected $table = null;
+
+	/**
+	 * The class name of the JTable instance managing the DB records (re-usable in batch methods & saveorder(), initialized via initBatch())
+	 *
+	 * @var     string
+	 * @since   3.8.2
+	 */
+	protected $tableClassName = null;
+
+	/**
+	 * UCM Type corresponding to the current model class (re-usable in batch action methods, initialized via initBatch())
+	 *
+	 * @var     object
+	 * @since   3.8.2
+	 */
+	protected $contentType = null;
+
+	/**
+	 * DB data of UCM Type corresponding to the current model class (re-usable in batch action methods, initialized via initBatch())
+	 *
+	 * @var     object
+	 * @since   3.8.2
+	 */
+	protected $type = null;
+
+	/**
+	 * A tags Observer instance to handle assigned tags (re-usable in batch action methods, initialized via initBatch())
+	 *
+	 * @var     object
+	 * @since   3.8.2
+	 */
+	protected $tagsObserver = null;
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     \JModelLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		if (isset($config['event_after_delete']))
+		{
+			$this->event_after_delete = $config['event_after_delete'];
+		}
+		elseif (empty($this->event_after_delete))
+		{
+			$this->event_after_delete = 'onContentAfterDelete';
+		}
+
+		if (isset($config['event_after_save']))
+		{
+			$this->event_after_save = $config['event_after_save'];
+		}
+		elseif (empty($this->event_after_save))
+		{
+			$this->event_after_save = 'onContentAfterSave';
+		}
+
+		if (isset($config['event_before_delete']))
+		{
+			$this->event_before_delete = $config['event_before_delete'];
+		}
+		elseif (empty($this->event_before_delete))
+		{
+			$this->event_before_delete = 'onContentBeforeDelete';
+		}
+
+		if (isset($config['event_before_save']))
+		{
+			$this->event_before_save = $config['event_before_save'];
+		}
+		elseif (empty($this->event_before_save))
+		{
+			$this->event_before_save = 'onContentBeforeSave';
+		}
+
+		if (isset($config['event_change_state']))
+		{
+			$this->event_change_state = $config['event_change_state'];
+		}
+		elseif (empty($this->event_change_state))
+		{
+			$this->event_change_state = 'onContentChangeState';
+		}
+
+		$config['events_map'] = isset($config['events_map']) ? $config['events_map'] : array();
+
+		$this->events_map = array_merge(
+			array(
+				'delete'       => 'content',
+				'save'         => 'content',
+				'change_state' => 'content',
+				'validate'     => 'content',
+			), $config['events_map']
+		);
+
+		// Guess the \JText message prefix. Defaults to the option.
+		if (isset($config['text_prefix']))
+		{
+			$this->text_prefix = strtoupper($config['text_prefix']);
+		}
+		elseif (empty($this->text_prefix))
+		{
+			$this->text_prefix = strtoupper($this->option);
+		}
+	}
+
+	/**
+	 * Method to perform batch operations on an item or a set of items.
+	 *
+	 * @param   array  $commands  An array of commands to perform.
+	 * @param   array  $pks       An array of item ids.
+	 * @param   array  $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  Returns true on success, false on failure.
+	 *
+	 * @since   1.7
+	 */
+	public function batch($commands, $pks, $contexts)
+	{
+		// Sanitize ids.
+		$pks = array_unique($pks);
+		$pks = ArrayHelper::toInteger($pks);
+
+		// Remove any values of zero.
+		if (array_search(0, $pks, true))
+		{
+			unset($pks[array_search(0, $pks, true)]);
+		}
+
+		if (empty($pks))
+		{
+			$this->setError(\JText::_('JGLOBAL_NO_ITEM_SELECTED'));
+
+			return false;
+		}
+
+		$done = false;
+
+		// Initialize re-usable member properties
+		$this->initBatch();
+
+		if ($this->batch_copymove && !empty($commands[$this->batch_copymove]))
+		{
+			$cmd = ArrayHelper::getValue($commands, 'move_copy', 'c');
+
+			if ($cmd === 'c')
+			{
+				$result = $this->batchCopy($commands[$this->batch_copymove], $pks, $contexts);
+
+				if (is_array($result))
+				{
+					foreach ($result as $old => $new)
+					{
+						$contexts[$new] = $contexts[$old];
+					}
+
+					$pks = array_values($result);
+				}
+				else
+				{
+					return false;
+				}
+			}
+			elseif ($cmd === 'm' && !$this->batchMove($commands[$this->batch_copymove], $pks, $contexts))
+			{
+				return false;
+			}
+
+			$done = true;
+		}
+
+		foreach ($this->batch_commands as $identifier => $command)
+		{
+			if (!empty($commands[$identifier]))
+			{
+				if (!$this->$command($commands[$identifier], $pks, $contexts))
+				{
+					return false;
+				}
+
+				$done = true;
+			}
+		}
+
+		if (!$done)
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+
+			return false;
+		}
+
+		// Clear the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch access level changes for a group of rows.
+	 *
+	 * @param   integer  $value     The new value matching an Asset Group ID.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   1.7
+	 */
+	protected function batchAccess($value, $pks, $contexts)
+	{
+		// Initialize re-usable member properties, and re-usable local variables
+		$this->initBatch();
+
+		foreach ($pks as $pk)
+		{
+			if ($this->user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->table->reset();
+				$this->table->load($pk);
+				$this->table->access = (int) $value;
+
+				if (!empty($this->type))
+				{
+					$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+				}
+
+				if (!$this->table->store())
+				{
+					$this->setError($this->table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch copy items to a new category or current.
+	 *
+	 * @param   integer  $value     The new category.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  array|boolean  An array of new IDs on success, boolean false on failure.
+	 *
+	 * @since	1.7
+	 */
+	protected function batchCopy($value, $pks, $contexts)
+	{
+		// Initialize re-usable member properties, and re-usable local variables
+		$this->initBatch();
+
+		$categoryId = $value;
+
+		if (!$this->checkCategoryId($categoryId))
+		{
+			return false;
+		}
+
+		$newIds = array();
+
+		// Parent exists so let's proceed
+		while (!empty($pks))
+		{
+			// Pop the first ID off the stack
+			$pk = array_shift($pks);
+
+			$this->table->reset();
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			$this->generateTitle($categoryId, $this->table);
+
+			// Reset the ID because we are making a copy
+			$this->table->id = 0;
+
+			// Unpublish because we are making a copy
+			if (isset($this->table->published))
+			{
+				$this->table->published = 0;
+			}
+			elseif (isset($this->table->state))
+			{
+				$this->table->state = 0;
+			}
+
+			$hitsAlias = $this->table->getColumnAlias('hits');
+
+			if (isset($this->table->$hitsAlias))
+			{
+				$this->table->$hitsAlias = 0;
+			}
+
+			// New category ID
+			$this->table->catid = $categoryId;
+
+			// TODO: Deal with ordering?
+			// $this->table->ordering = 1;
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			if (!empty($this->type))
+			{
+				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+			}
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			// Get the new item ID
+			$newId = $this->table->get('id');
+
+			// Add the new ID to the array
+			$newIds[$pk] = $newId;
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return $newIds;
+	}
+
+	/**
+	 * Batch language changes for a group of rows.
+	 *
+	 * @param   string  $value     The new value matching a language.
+	 * @param   array   $pks       An array of row IDs.
+	 * @param   array   $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   2.5
+	 */
+	protected function batchLanguage($value, $pks, $contexts)
+	{
+		// Initialize re-usable member properties, and re-usable local variables
+		$this->initBatch();
+
+		foreach ($pks as $pk)
+		{
+			if ($this->user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->table->reset();
+				$this->table->load($pk);
+				$this->table->language = $value;
+
+				if (!empty($this->type))
+				{
+					$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+				}
+
+				if (!$this->table->store())
+				{
+					$this->setError($this->table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch move items to a new category
+	 *
+	 * @param   integer  $value     The new category ID.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since	1.7
+	 */
+	protected function batchMove($value, $pks, $contexts)
+	{
+		// Initialize re-usable member properties, and re-usable local variables
+		$this->initBatch();
+
+		$categoryId = (int) $value;
+
+		if (!$this->checkCategoryId($categoryId))
+		{
+			return false;
+		}
+
+		// Parent exists so we proceed
+		foreach ($pks as $pk)
+		{
+			if (!$this->user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+
+			// Check that the row actually exists
+			if (!$this->table->load($pk))
+			{
+				if ($error = $this->table->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					// Not fatal error
+					$this->setError(\JText::sprintf('JLIB_APPLICATION_ERROR_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+					continue;
+				}
+			}
+
+			// Set the new category ID
+			$this->table->catid = $categoryId;
+
+			// Check the row.
+			if (!$this->table->check())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+
+			if (!empty($this->type))
+			{
+				$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+			}
+
+			// Store the row.
+			if (!$this->table->store())
+			{
+				$this->setError($this->table->getError());
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Batch tag a list of item.
+	 *
+	 * @param   integer  $value     The value of the new tag.
+	 * @param   array    $pks       An array of row IDs.
+	 * @param   array    $contexts  An array of item contexts.
+	 *
+	 * @return  boolean  True if successful, false otherwise and internal error is set.
+	 *
+	 * @since   3.1
+	 */
+	protected function batchTag($value, $pks, $contexts)
+	{
+		// Initialize re-usable member properties, and re-usable local variables
+		$this->initBatch();
+		$tags = array($value);
+
+		foreach ($pks as $pk)
+		{
+			if ($this->user->authorise('core.edit', $contexts[$pk]))
+			{
+				$this->table->reset();
+				$this->table->load($pk);
+
+				// Add new tags, keeping existing ones
+				$result = $this->tagsObserver->setNewTags($tags, false);
+
+				if (!$result)
+				{
+					$this->setError($this->table->getError());
+
+					return false;
+				}
+			}
+			else
+			{
+				$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+				return false;
+			}
+		}
+
+		// Clean the cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to test whether a record can be deleted.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to delete the record. Defaults to the permission for the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canDelete($record)
+	{
+		return \JFactory::getUser()->authorise('core.delete', $this->option);
+	}
+
+	/**
+	 * Method to test whether a record can have its state changed.
+	 *
+	 * @param   object  $record  A record object.
+	 *
+	 * @return  boolean  True if allowed to change the state of the record. Defaults to the permission for the component.
+	 *
+	 * @since   1.6
+	 */
+	protected function canEditState($record)
+	{
+		return \JFactory::getUser()->authorise('core.edit.state', $this->option);
+	}
+
+	/**
+	 * Method override to check-in a record or an array of record
+	 *
+	 * @param   mixed  $pks  The ID of the primary key or an array of IDs
+	 *
+	 * @return  integer|boolean  Boolean false if there is an error, otherwise the count of records checked in.
+	 *
+	 * @since   1.6
+	 */
+	public function checkin($pks = array())
+	{
+		$pks = (array) $pks;
+		$table = $this->getTable();
+		$count = 0;
+
+		if (empty($pks))
+		{
+			$pks = array((int) $this->getState($this->getName() . '.id'));
+		}
+
+		$checkedOutField = $table->getColumnAlias('checked_out');
+
+		// Check in all items.
+		foreach ($pks as $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($table->{$checkedOutField} > 0)
+				{
+					if (!parent::checkin($pk))
+					{
+						return false;
+					}
+
+					$count++;
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Method override to check-out a record.
+	 *
+	 * @param   integer  $pk  The ID of the primary key.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   1.6
+	 */
+	public function checkout($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState($this->getName() . '.id');
+
+		return parent::checkout($pk);
+	}
+
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  &$pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   1.6
+	 */
+	public function delete(&$pks)
+	{
+		$dispatcher = \JEventDispatcher::getInstance();
+		$pks = (array) $pks;
+		$table = $this->getTable();
+
+		// Include the plugins for the delete events.
+		\JPluginHelper::importPlugin($this->events_map['delete']);
+
+		// Iterate the items to delete each one.
+		foreach ($pks as $i => $pk)
+		{
+			if ($table->load($pk))
+			{
+				if ($this->canDelete($table))
+				{
+					$context = $this->option . '.' . $this->name;
+
+					// Trigger the before delete event.
+					$result = $dispatcher->trigger($this->event_before_delete, array($context, $table));
+
+					if (in_array(false, $result, true))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+
+					// Multilanguage: if associated, delete the item in the _associations table
+					if ($this->associationsContext && \JLanguageAssociations::isEnabled())
+					{
+						$db = $this->getDbo();
+						$query = $db->getQuery(true)
+							->select('COUNT(*) as count, ' . $db->quoteName('as1.key'))
+							->from($db->quoteName('#__associations') . ' AS as1')
+							->join('LEFT', $db->quoteName('#__associations') . ' AS as2 ON ' . $db->quoteName('as1.key') . ' =  ' . $db->quoteName('as2.key'))
+							->where($db->quoteName('as1.context') . ' = ' . $db->quote($this->associationsContext))
+							->where($db->quoteName('as1.id') . ' = ' . (int) $pk)
+							->group($db->quoteName('as1.key'));
+
+						$db->setQuery($query);
+						$row = $db->loadAssoc();
+
+						if (!empty($row['count']))
+						{
+							$query = $db->getQuery(true)
+								->delete($db->quoteName('#__associations'))
+								->where($db->quoteName('context') . ' = ' . $db->quote($this->associationsContext))
+								->where($db->quoteName('key') . ' = ' . $db->quote($row['key']));
+
+							if ($row['count'] > 2)
+							{
+								$query->where($db->quoteName('id') . ' = ' . (int) $pk);
+							}
+
+							$db->setQuery($query);
+							$db->execute();
+						}
+					}
+
+					if (!$table->delete($pk))
+					{
+						$this->setError($table->getError());
+
+						return false;
+					}
+
+					// Trigger the after event.
+					$dispatcher->trigger($this->event_after_delete, array($context, $table));
+				}
+				else
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					$error = $this->getError();
+
+					if ($error)
+					{
+						\JLog::add($error, \JLog::WARNING, 'jerror');
+
+						return false;
+					}
+					else
+					{
+						\JLog::add(\JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), \JLog::WARNING, 'jerror');
+
+						return false;
+					}
+				}
+			}
+			else
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to change the title & alias.
+	 *
+	 * @param   integer  $category_id  The id of the category.
+	 * @param   string   $alias        The alias.
+	 * @param   string   $title        The title.
+	 *
+	 * @return	array  Contains the modified title and alias.
+	 *
+	 * @since	1.7
+	 */
+	protected function generateNewTitle($category_id, $alias, $title)
+	{
+		// Alter the title & alias
+		$table = $this->getTable();
+
+		while ($table->load(array('alias' => $alias, 'catid' => $category_id)))
+		{
+			$title = StringHelper::increment($title);
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($title, $alias);
+	}
+
+	/**
+	 * Method to get a single record.
+	 *
+	 * @param   integer  $pk  The id of the primary key.
+	 *
+	 * @return  \JObject|boolean  Object on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState($this->getName() . '.id');
+		$table = $this->getTable();
+
+		if ($pk > 0)
+		{
+			// Attempt to load the row.
+			$return = $table->load($pk);
+
+			// Check for a table object error.
+			if ($return === false && $table->getError())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		// Convert to the \JObject before adding other data.
+		$properties = $table->getProperties(1);
+		$item = ArrayHelper::toObject($properties, '\JObject');
+
+		if (property_exists($item, 'params'))
+		{
+			$registry = new Registry($item->params);
+			$item->params = $registry->toArray();
+		}
+
+		return $item;
+	}
+
+	/**
+	 * A protected method to get a set of ordering conditions.
+	 *
+	 * @param   \JTable  $table  A \JTable object.
+	 *
+	 * @return  array  An array of conditions to add to ordering queries.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReorderConditions($table)
+	{
+		return array();
+	}
+
+	/**
+	 * Stock method to auto-populate the model state.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$table = $this->getTable();
+		$key = $table->getKeyName();
+
+		// Get the pk of the record from the request.
+		$pk = \JFactory::getApplication()->input->getInt($key);
+		$this->setState($this->getName() . '.id', $pk);
+
+		// Load the parameters.
+		$value = \JComponentHelper::getParams($this->option);
+		$this->setState('params', $value);
+	}
+
+	/**
+	 * Prepare and sanitise the table data prior to saving.
+	 *
+	 * @param   \JTable  $table  A reference to a \JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function prepareTable($table)
+	{
+		// Derived class will provide its own implementation if required.
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function publish(&$pks, $value = 1)
+	{
+		$dispatcher = \JEventDispatcher::getInstance();
+		$user = \JFactory::getUser();
+		$table = $this->getTable();
+		$pks = (array) $pks;
+
+		// Include the plugins for the change of state event.
+		\JPluginHelper::importPlugin($this->events_map['change_state']);
+
+		// Access checks.
+		foreach ($pks as $i => $pk)
+		{
+			$table->reset();
+
+			if ($table->load($pk))
+			{
+				if (!$this->canEditState($table))
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+
+					\JLog::add(\JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), \JLog::WARNING, 'jerror');
+
+					return false;
+				}
+
+				// If the table is checked out by another user, drop it and report to the user trying to change its state.
+				if (property_exists($table, 'checked_out') && $table->checked_out && ($table->checked_out != $user->id))
+				{
+					\JLog::add(\JText::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'), \JLog::WARNING, 'jerror');
+
+					// Prune items that you can't change.
+					unset($pks[$i]);
+
+					return false;
+				}
+			}
+		}
+
+		// Attempt to change the state of the records.
+		if (!$table->publish($pks, $value, $user->get('id')))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		$context = $this->option . '.' . $this->name;
+
+		// Trigger the change state event.
+		$result = $dispatcher->trigger($this->event_change_state, array($context, $pks, $value));
+
+		if (in_array(false, $result, true))
+		{
+			$this->setError($table->getError());
+
+			return false;
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to adjust the ordering of a row.
+	 *
+	 * Returns NULL if the user did not have edit
+	 * privileges for any of the selected primary keys.
+	 *
+	 * @param   integer  $pks    The ID of the primary key to move.
+	 * @param   integer  $delta  Increment, usually +1 or -1
+	 *
+	 * @return  boolean|null  False on failure or error, true on success, null if the $pk is empty (no items selected).
+	 *
+	 * @since   1.6
+	 */
+	public function reorder($pks, $delta = 0)
+	{
+		$table = $this->getTable();
+		$pks = (array) $pks;
+		$result = true;
+
+		$allowed = true;
+
+		foreach ($pks as $i => $pk)
+		{
+			$table->reset();
+
+			if ($table->load($pk) && $this->checkout($pk))
+			{
+				// Access checks.
+				if (!$this->canEditState($table))
+				{
+					// Prune items that you can't change.
+					unset($pks[$i]);
+					$this->checkin($pk);
+					\JLog::add(\JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), \JLog::WARNING, 'jerror');
+					$allowed = false;
+					continue;
+				}
+
+				$where = $this->getReorderConditions($table);
+
+				if (!$table->move($delta, $where))
+				{
+					$this->setError($table->getError());
+					unset($pks[$i]);
+					$result = false;
+				}
+
+				$this->checkin($pk);
+			}
+			else
+			{
+				$this->setError($table->getError());
+				unset($pks[$i]);
+				$result = false;
+			}
+		}
+
+		if ($allowed === false && empty($pks))
+		{
+			$result = null;
+		}
+
+		// Clear the component's cache
+		if ($result == true)
+		{
+			$this->cleanCache();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success, False on error.
+	 *
+	 * @since   1.6
+	 */
+	public function save($data)
+	{
+		$dispatcher = \JEventDispatcher::getInstance();
+		$table      = $this->getTable();
+		$context    = $this->option . '.' . $this->name;
+
+		if (!empty($data['tags']) && $data['tags'][0] != '')
+		{
+			$table->newTags = $data['tags'];
+		}
+
+		$key = $table->getKeyName();
+		$pk = (!empty($data[$key])) ? $data[$key] : (int) $this->getState($this->getName() . '.id');
+		$isNew = true;
+
+		// Include the plugins for the save events.
+		\JPluginHelper::importPlugin($this->events_map['save']);
+
+		// Allow an exception to be thrown.
+		try
+		{
+			// Load the row if saving an existing record.
+			if ($pk > 0)
+			{
+				$table->load($pk);
+				$isNew = false;
+			}
+
+			// Bind the data.
+			if (!$table->bind($data))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Prepare the row for saving
+			$this->prepareTable($table);
+
+			// Check the data.
+			if (!$table->check())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Trigger the before save event.
+			$result = $dispatcher->trigger($this->event_before_save, array($context, $table, $isNew, $data));
+
+			if (in_array(false, $result, true))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Store the data.
+			if (!$table->store())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// Clean the cache.
+			$this->cleanCache();
+
+			// Trigger the after save event.
+			$dispatcher->trigger($this->event_after_save, array($context, $table, $isNew, $data));
+		}
+		catch (\Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		if (isset($table->$key))
+		{
+			$this->setState($this->getName() . '.id', $table->$key);
+		}
+
+		$this->setState($this->getName() . '.new', $isNew);
+
+		if ($this->associationsContext && \JLanguageAssociations::isEnabled() && !empty($data['associations']))
+		{
+			$associations = $data['associations'];
+
+			// Unset any invalid associations
+			$associations = ArrayHelper::toInteger($associations);
+
+			// Unset any invalid associations
+			foreach ($associations as $tag => $id)
+			{
+				if (!$id)
+				{
+					unset($associations[$tag]);
+				}
+			}
+
+			// Show a warning if the item isn't assigned to a language but we have associations.
+			if ($associations && $table->language === '*')
+			{
+				\JFactory::getApplication()->enqueueMessage(
+					\JText::_(strtoupper($this->option) . '_ERROR_ALL_LANGUAGE_ASSOCIATED'),
+					'warning'
+				);
+			}
+
+			// Get associationskey for edited item
+			$db    = $this->getDbo();
+			$query = $db->getQuery(true)
+				->select($db->qn('key'))
+				->from($db->qn('#__associations'))
+				->where($db->qn('context') . ' = ' . $db->quote($this->associationsContext))
+				->where($db->qn('id') . ' = ' . (int) $table->$key);
+			$db->setQuery($query);
+			$old_key = $db->loadResult();
+
+			// Deleting old associations for the associated items
+			$query = $db->getQuery(true)
+				->delete($db->qn('#__associations'))
+				->where($db->qn('context') . ' = ' . $db->quote($this->associationsContext));
+
+			if ($associations)
+			{
+				$query->where('(' . $db->qn('id') . ' IN (' . implode(',', $associations) . ') OR '
+					. $db->qn('key') . ' = ' . $db->q($old_key) . ')');
+			}
+			else
+			{
+				$query->where($db->qn('key') . ' = ' . $db->q($old_key));
+			}
+
+			$db->setQuery($query);
+			$db->execute();
+
+			// Adding self to the association
+			if ($table->language !== '*')
+			{
+				$associations[$table->language] = (int) $table->$key;
+			}
+
+			if (count($associations) > 1)
+			{
+				// Adding new association for these items
+				$key   = md5(json_encode($associations));
+				$query = $db->getQuery(true)
+					->insert('#__associations');
+
+				foreach ($associations as $id)
+				{
+					$query->values(((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key));
+				}
+
+				$db->setQuery($query);
+				$db->execute();
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Saves the manually set order of records.
+	 *
+	 * @param   array    $pks    An array of primary key ids.
+	 * @param   integer  $order  +1 or -1
+	 *
+	 * @return  boolean|\JException  Boolean true on success, false on failure, or \JException if no items are selected
+	 *
+	 * @since   1.6
+	 */
+	public function saveorder($pks = array(), $order = null)
+	{
+		// Initialize re-usable member properties
+		$this->initBatch();
+
+		$conditions = array();
+
+		if (empty($pks))
+		{
+			return \JError::raiseWarning(500, \JText::_($this->text_prefix . '_ERROR_NO_ITEMS_SELECTED'));
+		}
+
+		$orderingField = $this->table->getColumnAlias('ordering');
+
+		// Update ordering values
+		foreach ($pks as $i => $pk)
+		{
+			$this->table->load((int) $pk);
+
+			// Access checks.
+			if (!$this->canEditState($this->table))
+			{
+				// Prune items that you can't change.
+				unset($pks[$i]);
+				\JLog::add(\JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), \JLog::WARNING, 'jerror');
+			}
+			elseif ($this->table->$orderingField != $order[$i])
+			{
+				$this->table->$orderingField = $order[$i];
+
+				if ($this->type)
+				{
+					$this->createTagsHelper($this->tagsObserver, $this->type, $pk, $this->typeAlias, $this->table);
+				}
+
+				if (!$this->table->store())
+				{
+					$this->setError($this->table->getError());
+
+					return false;
+				}
+
+				// Remember to reorder within position and client_id
+				$condition = $this->getReorderConditions($this->table);
+				$found = false;
+
+				foreach ($conditions as $cond)
+				{
+					if ($cond[1] == $condition)
+					{
+						$found = true;
+						break;
+					}
+				}
+
+				if (!$found)
+				{
+					$key = $this->table->getKeyName();
+					$conditions[] = array($this->table->$key, $condition);
+				}
+			}
+		}
+
+		// Execute reorder for each category.
+		foreach ($conditions as $cond)
+		{
+			$this->table->load($cond[0]);
+			$this->table->reorder($cond[1]);
+		}
+
+		// Clear the component's cache
+		$this->cleanCache();
+
+		return true;
+	}
+
+	/**
+	 * Method to create a tags helper to ensure proper management of tags
+	 *
+	 * @param   \JTableObserverTags  $tagsObserver  The tags observer for this table
+	 * @param   \JUcmType            $type          The type for the table being processed
+	 * @param   integer              $pk            Primary key of the item bing processed
+	 * @param   string               $typeAlias     The type alias for this table
+	 * @param   \JTable              $table         The \JTable object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function createTagsHelper($tagsObserver, $type, $pk, $typeAlias, $table)
+	{
+		if (!empty($tagsObserver) && !empty($type))
+		{
+			$table->tagsHelper = new \JHelperTags;
+			$table->tagsHelper->typeAlias = $typeAlias;
+			$table->tagsHelper->tags = explode(',', $table->tagsHelper->getTagIds($pk, $typeAlias));
+		}
+	}
+
+	/**
+	 * Method to check the validity of the category ID for batch copy and move
+	 *
+	 * @param   integer  $categoryId  The category ID to check
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	protected function checkCategoryId($categoryId)
+	{
+		// Check that the category exists
+		if ($categoryId)
+		{
+			$categoryTable = \JTable::getInstance('Category');
+
+			if (!$categoryTable->load($categoryId))
+			{
+				if ($error = $categoryTable->getError())
+				{
+					// Fatal error
+					$this->setError($error);
+
+					return false;
+				}
+				else
+				{
+					$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
+					return false;
+				}
+			}
+		}
+
+		if (empty($categoryId))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
+			return false;
+		}
+
+		// Check that the user has create permission for the component
+		$extension = \JFactory::getApplication()->input->get('option', '');
+		$user = \JFactory::getUser();
+
+		if (!$user->authorise('core.create', $extension . '.category.' . $categoryId))
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * A method to preprocess generating a new title in order to allow tables with alternative names
+	 * for alias and title to use the batch move and copy methods
+	 *
+	 * @param   integer  $categoryId  The target category id
+	 * @param   \JTable  $table       The \JTable within which move or copy is taking place
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function generateTitle($categoryId, $table)
+	{
+		// Alter the title & alias
+		$data = $this->generateNewTitle($categoryId, $table->alias, $table->title);
+		$table->title = $data['0'];
+		$table->alias = $data['1'];
+	}
+
+	/**
+	 * Method to initialize member variables used by batch methods and other methods like saveorder()
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.2
+	 */
+	public function initBatch()
+	{
+		if ($this->batchSet === null)
+		{
+			$this->batchSet = true;
+
+			// Get current user
+			$this->user = \JFactory::getUser();
+
+			// Get table
+			$this->table = $this->getTable();
+
+			// Get table class name
+			$tc = explode('\\', get_class($this->table));
+			$this->tableClassName = end($tc);
+
+			// Get UCM Type data
+			$this->contentType = new \JUcmType;
+			$this->type = $this->contentType->getTypeByTable($this->tableClassName)
+				?: $this->contentType->getTypeByAlias($this->typeAlias);
+
+			// Get tabs observer
+			$this->tagsObserver = $this->table->getObserverOfClass('Joomla\CMS\Table\Observer\Tags');
+		}
+	}
+}
diff --git a/core/libraries/src/MVC/Model/BaseDatabaseModel.php b/core/libraries/src/MVC/Model/BaseDatabaseModel.php
new file mode 100644
index 00000000..ceb4a7f1
--- /dev/null
+++ b/core/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -0,0 +1,601 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Model;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Base class for a database aware Joomla Model
+ *
+ * Acts as a Factory class for application specific objects and provides many supporting API functions.
+ *
+ * @since  2.5.5
+ */
+abstract class BaseDatabaseModel extends \JObject
+{
+	/**
+	 * Indicates if the internal state has been set
+	 *
+	 * @var    boolean
+	 * @since  3.0
+	 */
+	protected $__state_set = null;
+
+	/**
+	 * Database Connector
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  3.0
+	 */
+	protected $_db;
+
+	/**
+	 * The model (base) name
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $name;
+
+	/**
+	 * The URL option for the component.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $option = null;
+
+	/**
+	 * A state object
+	 *
+	 * @var    \JObject
+	 * @since  3.0
+	 */
+	protected $state;
+
+	/**
+	 * The event to trigger when cleaning cache.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $event_clean_cache = null;
+
+	/**
+	 * Add a directory where \JModelLegacy should search for models. You may
+	 * either pass a string or an array of directories.
+	 *
+	 * @param   mixed   $path    A path or array[sting] of paths to search.
+	 * @param   string  $prefix  A prefix for models.
+	 *
+	 * @return  array  An array with directory elements. If prefix is equal to '', all directories are returned.
+	 *
+	 * @since   3.0
+	 */
+	public static function addIncludePath($path = '', $prefix = '')
+	{
+		static $paths;
+
+		if (!isset($paths))
+		{
+			$paths = array();
+		}
+
+		if (!isset($paths[$prefix]))
+		{
+			$paths[$prefix] = array();
+		}
+
+		if (!isset($paths['']))
+		{
+			$paths[''] = array();
+		}
+
+		if (!empty($path))
+		{
+			jimport('joomla.filesystem.path');
+
+			foreach ((array) $path as $includePath)
+			{
+				if (!in_array($includePath, $paths[$prefix]))
+				{
+					array_unshift($paths[$prefix], \JPath::clean($includePath));
+				}
+
+				if (!in_array($includePath, $paths['']))
+				{
+					array_unshift($paths[''], \JPath::clean($includePath));
+				}
+			}
+		}
+
+		return $paths[$prefix];
+	}
+
+	/**
+	 * Adds to the stack of model table paths in LIFO order.
+	 *
+	 * @param   mixed  $path  The directory as a string or directories as an array to add.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public static function addTablePath($path)
+	{
+		\JTable::addIncludePath($path);
+	}
+
+	/**
+	 * Create the filename for a resource
+	 *
+	 * @param   string  $type   The resource type to create the filename for.
+	 * @param   array   $parts  An associative array of filename information.
+	 *
+	 * @return  string  The filename
+	 *
+	 * @since   3.0
+	 */
+	protected static function _createFileName($type, $parts = array())
+	{
+		$filename = '';
+
+		switch ($type)
+		{
+			case 'model':
+				$filename = strtolower($parts['name']) . '.php';
+				break;
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Returns a Model object, always creating it
+	 *
+	 * @param   string  $type    The model type to instantiate
+	 * @param   string  $prefix  Prefix for the model class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  \JModelLegacy|boolean   A \JModelLegacy instance or false on failure
+	 *
+	 * @since   3.0
+	 */
+	public static function getInstance($type, $prefix = '', $config = array())
+	{
+		$type = preg_replace('/[^A-Z0-9_\.-]/i', '', $type);
+		$modelClass = $prefix . ucfirst($type);
+
+		if (!class_exists($modelClass))
+		{
+			jimport('joomla.filesystem.path');
+			$path = \JPath::find(self::addIncludePath(null, $prefix), self::_createFileName('model', array('name' => $type)));
+
+			if (!$path)
+			{
+				$path = \JPath::find(self::addIncludePath(null, ''), self::_createFileName('model', array('name' => $type)));
+			}
+
+			if (!$path)
+			{
+				return false;
+			}
+
+			require_once $path;
+
+			if (!class_exists($modelClass))
+			{
+				\JLog::add(\JText::sprintf('JLIB_APPLICATION_ERROR_MODELCLASS_NOT_FOUND', $modelClass), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+
+		return new $modelClass($config);
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  An array of configuration options (name, state, dbo, table_path, ignore_request).
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function __construct($config = array())
+	{
+		// Guess the option from the class name (Option)Model(View).
+		if (empty($this->option))
+		{
+			$r = null;
+
+			if (!preg_match('/(.*)Model/i', get_class($this), $r))
+			{
+				throw new \Exception(\JText::_('JLIB_APPLICATION_ERROR_MODEL_GET_NAME'), 500);
+			}
+
+			$this->option = 'com_' . strtolower($r[1]);
+		}
+
+		// Set the view name
+		if (empty($this->name))
+		{
+			if (array_key_exists('name', $config))
+			{
+				$this->name = $config['name'];
+			}
+			else
+			{
+				$this->name = $this->getName();
+			}
+		}
+
+		// Set the model state
+		if (array_key_exists('state', $config))
+		{
+			$this->state = $config['state'];
+		}
+		else
+		{
+			$this->state = new \JObject;
+		}
+
+		// Set the model dbo
+		if (array_key_exists('dbo', $config))
+		{
+			$this->_db = $config['dbo'];
+		}
+		else
+		{
+			$this->_db = \JFactory::getDbo();
+		}
+
+		// Set the default view search path
+		if (array_key_exists('table_path', $config))
+		{
+			$this->addTablePath($config['table_path']);
+		}
+		// @codeCoverageIgnoreStart
+		elseif (defined('JPATH_COMPONENT_ADMINISTRATOR'))
+		{
+			$this->addTablePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables');
+			$this->addTablePath(JPATH_COMPONENT_ADMINISTRATOR . '/table');
+		}
+
+		// @codeCoverageIgnoreEnd
+
+		// Set the internal state marker - used to ignore setting state from the request
+		if (!empty($config['ignore_request']))
+		{
+			$this->__state_set = true;
+		}
+
+		// Set the clean cache event
+		if (isset($config['event_clean_cache']))
+		{
+			$this->event_clean_cache = $config['event_clean_cache'];
+		}
+		elseif (empty($this->event_clean_cache))
+		{
+			$this->event_clean_cache = 'onContentCleanCache';
+		}
+	}
+
+	/**
+	 * Gets an array of objects from the results of database query.
+	 *
+	 * @param   string   $query       The query.
+	 * @param   integer  $limitstart  Offset.
+	 * @param   integer  $limit       The number of records.
+	 *
+	 * @return  object[]  An array of results.
+	 *
+	 * @since   3.0
+	 * @throws  \RuntimeException
+	 */
+	protected function _getList($query, $limitstart = 0, $limit = 0)
+	{
+		$this->getDbo()->setQuery($query, $limitstart, $limit);
+
+		return $this->getDbo()->loadObjectList();
+	}
+
+	/**
+	 * Returns a record count for the query.
+	 *
+	 * @param   \JDatabaseQuery|string  $query  The query.
+	 *
+	 * @return  integer  Number of rows for query.
+	 *
+	 * @since   3.0
+	 */
+	protected function _getListCount($query)
+	{
+		// Use fast COUNT(*) on \JDatabaseQuery objects if there is no GROUP BY or HAVING clause:
+		if ($query instanceof \JDatabaseQuery
+			&& $query->type == 'select'
+			&& $query->group === null
+			&& $query->union === null
+			&& $query->unionAll === null
+			&& $query->having === null)
+		{
+			$query = clone $query;
+			$query->clear('select')->clear('order')->clear('limit')->clear('offset')->select('COUNT(*)');
+
+			$this->getDbo()->setQuery($query);
+
+			return (int) $this->getDbo()->loadResult();
+		}
+
+		// Otherwise fall back to inefficient way of counting all results.
+
+		// Remove the limit and offset part if it's a \JDatabaseQuery object
+		if ($query instanceof \JDatabaseQuery)
+		{
+			$query = clone $query;
+			$query->clear('limit')->clear('offset');
+		}
+
+		$this->getDbo()->setQuery($query);
+		$this->getDbo()->execute();
+
+		return (int) $this->getDbo()->getNumRows();
+	}
+
+	/**
+	 * Method to load and return a model object.
+	 *
+	 * @param   string  $name    The name of the view
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration settings to pass to \JTable::getInstance
+	 *
+	 * @return  \JTable|boolean  Table object or boolean false if failed
+	 *
+	 * @since   3.0
+	 * @see     \JTable::getInstance()
+	 */
+	protected function _createTable($name, $prefix = 'Table', $config = array())
+	{
+		// Clean the model name
+		$name = preg_replace('/[^A-Z0-9_]/i', '', $name);
+		$prefix = preg_replace('/[^A-Z0-9_]/i', '', $prefix);
+
+		// Make sure we are returning a DBO object
+		if (!array_key_exists('dbo', $config))
+		{
+			$config['dbo'] = $this->getDbo();
+		}
+
+		return \JTable::getInstance($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to get the database driver object
+	 *
+	 * @return  \JDatabaseDriver
+	 *
+	 * @since   3.0
+	 */
+	public function getDbo()
+	{
+		return $this->_db;
+	}
+
+	/**
+	 * Method to get the model name
+	 *
+	 * The model name. By default parsed using the classname or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the model
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function getName()
+	{
+		if (empty($this->name))
+		{
+			$r = null;
+
+			if (!preg_match('/Model(.*)/i', get_class($this), $r))
+			{
+				throw new \Exception(\JText::_('JLIB_APPLICATION_ERROR_MODEL_GET_NAME'), 500);
+			}
+
+			$this->name = strtolower($r[1]);
+		}
+
+		return $this->name;
+	}
+
+	/**
+	 * Method to get model state variables
+	 *
+	 * @param   string  $property  Optional parameter name
+	 * @param   mixed   $default   Optional default value
+	 *
+	 * @return  mixed  The property where specified, the state object where omitted
+	 *
+	 * @since   3.0
+	 */
+	public function getState($property = null, $default = null)
+	{
+		if (!$this->__state_set)
+		{
+			// Protected method to auto-populate the model state.
+			$this->populateState();
+
+			// Set the model state set flag to true.
+			$this->__state_set = true;
+		}
+
+		return $property === null ? $this->state : $this->state->get($property, $default);
+	}
+
+	/**
+	 * Method to get a table object, load it if necessary.
+	 *
+	 * @param   string  $name     The table name. Optional.
+	 * @param   string  $prefix   The class prefix. Optional.
+	 * @param   array   $options  Configuration array for model. Optional.
+	 *
+	 * @return  \JTable  A \JTable object
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function getTable($name = '', $prefix = 'Table', $options = array())
+	{
+		if (empty($name))
+		{
+			$name = $this->getName();
+		}
+
+		if ($table = $this->_createTable($name, $prefix, $options))
+		{
+			return $table;
+		}
+
+		throw new \Exception(\JText::sprintf('JLIB_APPLICATION_ERROR_TABLE_NAME_NOT_SUPPORTED', $name), 0);
+	}
+
+	/**
+	 * Method to load a row for editing from the version history table.
+	 *
+	 * @param   integer  $version_id  Key to the version history table.
+	 * @param   \JTable  &$table      Content table object being loaded.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   3.2
+	 */
+	public function loadHistory($version_id, \JTable &$table)
+	{
+		// Only attempt to check the row in if it exists, otherwise do an early exit.
+		if (!$version_id)
+		{
+			return false;
+		}
+
+		// Get an instance of the row to checkout.
+		$historyTable = \JTable::getInstance('Contenthistory');
+
+		if (!$historyTable->load($version_id))
+		{
+			$this->setError($historyTable->getError());
+
+			return false;
+		}
+
+		$rowArray = ArrayHelper::fromObject(json_decode($historyTable->version_data));
+		$typeId   = \JTable::getInstance('Contenttype')->getTypeId($this->typeAlias);
+
+		if ($historyTable->ucm_type_id != $typeId)
+		{
+			$this->setError(\JText::_('JLIB_APPLICATION_ERROR_HISTORY_ID_MISMATCH'));
+
+			$key = $table->getKeyName();
+
+			if (isset($rowArray[$key]))
+			{
+				$table->checkIn($rowArray[$key]);
+			}
+
+			return false;
+		}
+
+		$this->setState('save_date', $historyTable->save_date);
+		$this->setState('version_note', $historyTable->version_note);
+
+		return $table->bind($rowArray);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * @return  void
+	 *
+	 * @note    Calling getState in this method will result in recursion.
+	 * @since   3.0
+	 */
+	protected function populateState()
+	{
+	}
+
+	/**
+	 * Method to set the database driver object
+	 *
+	 * @param   \JDatabaseDriver  $db  A \JDatabaseDriver based object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function setDbo($db)
+	{
+		$this->_db = $db;
+	}
+
+	/**
+	 * Method to set model state variables
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value of the property to set or null.
+	 *
+	 * @return  mixed  The previous value of the property or null if not set.
+	 *
+	 * @since   3.0
+	 */
+	public function setState($property, $value = null)
+	{
+		return $this->state->set($property, $value);
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * @param   string   $group      The cache group
+	 * @param   integer  $client_id  The ID of the client
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function cleanCache($group = null, $client_id = 0)
+	{
+		$conf = \JFactory::getConfig();
+
+		$options = array(
+			'defaultgroup' => $group ?: (isset($this->option) ? $this->option : \JFactory::getApplication()->input->get('option')),
+			'cachebase' => $client_id ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache'),
+			'result' => true,
+		);
+
+		try
+		{
+			/** @var \JCacheControllerCallback $cache */
+			$cache = \JCache::getInstance('callback', $options);
+			$cache->clean();
+		}
+		catch (\JCacheException $exception)
+		{
+			$options['result'] = false;
+		}
+
+		// Trigger the onContentCleanCache event.
+		\JEventDispatcher::getInstance()->trigger($this->event_clean_cache, $options);
+	}
+}
diff --git a/core/libraries/src/MVC/Model/FormModel.php b/core/libraries/src/MVC/Model/FormModel.php
new file mode 100644
index 00000000..6953311b
--- /dev/null
+++ b/core/libraries/src/MVC/Model/FormModel.php
@@ -0,0 +1,389 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Model;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Prototype form model.
+ *
+ * @see    \JForm
+ * @see    \JFormField
+ * @see    \JFormRule
+ * @since  1.6
+ */
+abstract class FormModel extends BaseDatabaseModel
+{
+	/**
+	 * Array of form objects.
+	 *
+	 * @var    \JForm[]
+	 * @since  1.6
+	 */
+	protected $_forms = array();
+
+	/**
+	 * Maps events to plugin groups.
+	 *
+	 * @var    array
+	 * @since  3.6
+	 */
+	protected $events_map = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     \JModelLegacy
+	 * @since   3.6
+	 */
+	public function __construct($config = array())
+	{
+		$config['events_map'] = isset($config['events_map']) ? $config['events_map'] : array();
+
+		$this->events_map = array_merge(
+			array(
+				'validate' => 'content',
+			),
+			$config['events_map']
+		);
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to checkin a row.
+	 *
+	 * @param   integer  $pk  The numeric id of the primary key.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function checkin($pk = null)
+	{
+		// Only attempt to check the row in if it exists.
+		if ($pk)
+		{
+			$user = \JFactory::getUser();
+
+			// Get an instance of the row to checkin.
+			$table = $this->getTable();
+
+			if (!$table->load($pk))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			$checkedOutField = $table->getColumnAlias('checked_out');
+			$checkedOutTimeField = $table->getColumnAlias('checked_out_time');
+
+			// If there is no checked_out or checked_out_time field, just return true.
+			if (!property_exists($table, $checkedOutField) || !property_exists($table, $checkedOutTimeField))
+			{
+				return true;
+			}
+
+			// Check if this is the user having previously checked out the row.
+			if ($table->{$checkedOutField} > 0 && $table->{$checkedOutField} != $user->get('id') && !$user->authorise('core.admin', 'com_checkin'))
+			{
+				$this->setError(\JText::_('JLIB_APPLICATION_ERROR_CHECKIN_USER_MISMATCH'));
+
+				return false;
+			}
+
+			// Attempt to check the row in.
+			if (!$table->checkIn($pk))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to check-out a row for editing.
+	 *
+	 * @param   integer  $pk  The numeric id of the primary key.
+	 *
+	 * @return  boolean  False on failure or error, true otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function checkout($pk = null)
+	{
+		// Only attempt to check the row in if it exists.
+		if ($pk)
+		{
+			// Get an instance of the row to checkout.
+			$table = $this->getTable();
+
+			if (!$table->load($pk))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			$checkedOutField = $table->getColumnAlias('checked_out');
+			$checkedOutTimeField = $table->getColumnAlias('checked_out_time');
+
+			// If there is no checked_out or checked_out_time field, just return true.
+			if (!property_exists($table, $checkedOutField) || !property_exists($table, $checkedOutTimeField))
+			{
+				return true;
+			}
+
+			$user = \JFactory::getUser();
+
+			// Check if this is the user having previously checked out the row.
+			if ($table->{$checkedOutField} > 0 && $table->{$checkedOutField} != $user->get('id'))
+			{
+				$this->setError(\JText::_('JLIB_APPLICATION_ERROR_CHECKOUT_USER_MISMATCH'));
+
+				return false;
+			}
+
+			// Attempt to check the row out.
+			if (!$table->checkOut($user->get('id'), $pk))
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Abstract method for getting the form from the model.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  \JForm|boolean  A \JForm object on success, false on failure
+	 *
+	 * @since   1.6
+	 */
+	abstract public function getForm($data = array(), $loadData = true);
+
+	/**
+	 * Method to get a form object.
+	 *
+	 * @param   string   $name     The name of the form.
+	 * @param   string   $source   The form source. Can be XML string if file flag is set to false.
+	 * @param   array    $options  Optional array of options for the form creation.
+	 * @param   boolean  $clear    Optional argument to force load a new form.
+	 * @param   string   $xpath    An optional xpath to search for the fields.
+	 *
+	 * @return  \JForm|boolean  \JForm object on success, false on error.
+	 *
+	 * @see     \JForm
+	 * @since   1.6
+	 */
+	protected function loadForm($name, $source = null, $options = array(), $clear = false, $xpath = false)
+	{
+		// Handle the optional arguments.
+		$options['control'] = ArrayHelper::getValue((array) $options, 'control', false);
+
+		// Create a signature hash. But make sure, that loading the data does not create a new instance
+		$sigoptions = $options;
+
+		if (isset($sigoptions['load_data']))
+		{
+			unset($sigoptions['load_data']);
+		}
+
+		$hash = md5($source . serialize($sigoptions));
+
+		// Check if we can use a previously loaded form.
+		if (!$clear && isset($this->_forms[$hash]))
+		{
+			return $this->_forms[$hash];
+		}
+
+		// Get the form.
+		\JForm::addFormPath(JPATH_COMPONENT . '/models/forms');
+		\JForm::addFieldPath(JPATH_COMPONENT . '/models/fields');
+		\JForm::addFormPath(JPATH_COMPONENT . '/model/form');
+		\JForm::addFieldPath(JPATH_COMPONENT . '/model/field');
+
+		try
+		{
+			$form = \JForm::getInstance($name, $source, $options, false, $xpath);
+
+			if (isset($options['load_data']) && $options['load_data'])
+			{
+				// Get the data for the form.
+				$data = $this->loadFormData();
+			}
+			else
+			{
+				$data = array();
+			}
+
+			// Allow for additional modification of the form, and events to be triggered.
+			// We pass the data because plugins may require it.
+			$this->preprocessForm($form, $data);
+
+			// Load the data into the form after the plugins have operated.
+			$form->bind($data);
+		}
+		catch (\Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Store the form for later.
+		$this->_forms[$hash] = $form;
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return  array  The default data is an empty array.
+	 *
+	 * @since   1.6
+	 */
+	protected function loadFormData()
+	{
+		return array();
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the data.
+	 *
+	 * @param   string  $context  The context identifier.
+	 * @param   mixed   &$data    The data to be processed. It gets altered directly.
+	 * @param   string  $group    The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	protected function preprocessData($context, &$data, $group = 'content')
+	{
+		// Get the dispatcher and load the users plugins.
+		$dispatcher = \JEventDispatcher::getInstance();
+		\JPluginHelper::importPlugin($group);
+
+		// Trigger the data preparation event.
+		$results = $dispatcher->trigger('onContentPrepareData', array($context, &$data));
+
+		// Check for errors encountered while preparing the data.
+		if (count($results) > 0 && in_array(false, $results, true))
+		{
+			$this->setError($dispatcher->getError());
+		}
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   \JForm  $form   A \JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @see     \JFormField
+	 * @since   1.6
+	 * @throws  \Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(\JForm $form, $data, $group = 'content')
+	{
+		// Import the appropriate plugin group.
+		\JPluginHelper::importPlugin($group);
+
+		// Get the dispatcher.
+		$dispatcher = \JEventDispatcher::getInstance();
+
+		// Trigger the form preparation event.
+		$results = $dispatcher->trigger('onContentPrepareForm', array($form, $data));
+
+		// Check for errors encountered while preparing the form.
+		if (count($results) && in_array(false, $results, true))
+		{
+			// Get the last error.
+			$error = $dispatcher->getError();
+
+			if (!($error instanceof \Exception))
+			{
+				throw new \Exception($error);
+			}
+		}
+	}
+
+	/**
+	 * Method to validate the form data.
+	 *
+	 * @param   \JForm  $form   The form to validate against.
+	 * @param   array   $data   The data to validate.
+	 * @param   string  $group  The name of the field group to validate.
+	 *
+	 * @return  array|boolean  Array of filtered data if valid, false otherwise.
+	 *
+	 * @see     \JFormRule
+	 * @see     \JFilterInput
+	 * @since   1.6
+	 */
+	public function validate($form, $data, $group = null)
+	{
+		// Include the plugins for the delete events.
+		\JPluginHelper::importPlugin($this->events_map['validate']);
+
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger('onUserBeforeDataValidation', array($form, &$data));
+
+		// Filter and validate the form data.
+		$data = $form->filter($data);
+		$return = $form->validate($data, $group);
+
+		// Check for an error.
+		if ($return instanceof \Exception)
+		{
+			$this->setError($return->getMessage());
+
+			return false;
+		}
+
+		// Check the validation results.
+		if ($return === false)
+		{
+			// Get the validation messages from the form.
+			foreach ($form->getErrors() as $message)
+			{
+				$this->setError($message);
+			}
+
+			return false;
+		}
+
+		// Tags B/C break at 3.1.2
+		if (!isset($data['tags']) && isset($data['metadata']['tags']))
+		{
+			$data['tags'] = $data['metadata']['tags'];
+		}
+
+		return $data;
+	}
+}
diff --git a/core/libraries/src/MVC/Model/ItemModel.php b/core/libraries/src/MVC/Model/ItemModel.php
new file mode 100644
index 00000000..00bf57a0
--- /dev/null
+++ b/core/libraries/src/MVC/Model/ItemModel.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Model;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Prototype item model.
+ *
+ * @since  1.6
+ */
+abstract class ItemModel extends BaseDatabaseModel
+{
+	/**
+	 * An item.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $_item = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $_context = 'group.type';
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		return md5($id);
+	}
+}
diff --git a/core/libraries/src/MVC/Model/ListModel.php b/core/libraries/src/MVC/Model/ListModel.php
new file mode 100644
index 00000000..13631200
--- /dev/null
+++ b/core/libraries/src/MVC/Model/ListModel.php
@@ -0,0 +1,762 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\Model;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Model class for handling lists of items.
+ *
+ * @since  1.6
+ */
+class ListModel extends BaseDatabaseModel
+{
+	/**
+	 * Internal memory based cache array of data.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $cache = array();
+
+	/**
+	 * Context string for the model type.  This is used to handle uniqueness
+	 * when dealing with the getStoreId() method and caching data structures.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $context = null;
+
+	/**
+	 * Valid filter fields or ordering.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $filter_fields = array();
+
+	/**
+	 * An internal cache for the last query used.
+	 *
+	 * @var    \JDatabaseQuery[]
+	 * @since  1.6
+	 */
+	protected $query = array();
+
+	/**
+	 * Name of the filter form to load
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $filterFormName = null;
+
+	/**
+	 * Associated HTML form
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $htmlFormName = 'adminForm';
+
+	/**
+	 * A blacklist of filter variables to not merge into the model's state
+	 *
+	 * @var    array
+	 * @since  3.4.5
+	 */
+	protected $filterBlacklist = array();
+
+	/**
+	 * A blacklist of list variables to not merge into the model's state
+	 *
+	 * @var    array
+	 * @since  3.4.5
+	 */
+	protected $listBlacklist = array('select');
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @see     \JModelLegacy
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Add the ordering filtering fields whitelist.
+		if (isset($config['filter_fields']))
+		{
+			$this->filter_fields = $config['filter_fields'];
+		}
+
+		// Guess the context as Option.ModelName.
+		if (empty($this->context))
+		{
+			$this->context = strtolower($this->option . '.' . $this->getName());
+		}
+	}
+
+	/**
+	 * Method to cache the last query constructed.
+	 *
+	 * This method ensures that the query is constructed only once for a given state of the model.
+	 *
+	 * @return  \JDatabaseQuery  A \JDatabaseQuery object
+	 *
+	 * @since   1.6
+	 */
+	protected function _getListQuery()
+	{
+		// Capture the last store id used.
+		static $lastStoreId;
+
+		// Compute the current store id.
+		$currentStoreId = $this->getStoreId();
+
+		// If the last store id is different from the current, refresh the query.
+		if ($lastStoreId != $currentStoreId || empty($this->query))
+		{
+			$lastStoreId = $currentStoreId;
+			$this->query = $this->getListQuery();
+		}
+
+		return $this->query;
+	}
+
+	/**
+	 * Function to get the active filters
+	 *
+	 * @return  array  Associative array in the format: array('filter_published' => 0)
+	 *
+	 * @since   3.2
+	 */
+	public function getActiveFilters()
+	{
+		$activeFilters = array();
+
+		if (!empty($this->filter_fields))
+		{
+			foreach ($this->filter_fields as $filter)
+			{
+				$filterName = 'filter.' . $filter;
+
+				if (property_exists($this->state, $filterName) && (!empty($this->state->{$filterName}) || is_numeric($this->state->{$filterName})))
+				{
+					$activeFilters[$filter] = $this->state->get($filterName);
+				}
+			}
+		}
+
+		return $activeFilters;
+	}
+
+	/**
+	 * Method to get an array of data items.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId();
+
+		// Try to load the data from internal storage.
+		if (isset($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		try
+		{
+			// Load the list items and add the items to the internal cache.
+			$this->cache[$store] = $this->_getList($this->_getListQuery(), $this->getStart(), $this->getState('list.limit'));
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Method to get a \JDatabaseQuery object for retrieving the data set from a database.
+	 *
+	 * @return  \JDatabaseQuery  A \JDatabaseQuery object to retrieve the data set.
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		return $this->getDbo()->getQuery(true);
+	}
+
+	/**
+	 * Method to get a \JPagination object for the data set.
+	 *
+	 * @return  \JPagination  A \JPagination object for the data set.
+	 *
+	 * @since   1.6
+	 */
+	public function getPagination()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId('getPagination');
+
+		// Try to load the data from internal storage.
+		if (isset($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		$limit = (int) $this->getState('list.limit') - (int) $this->getState('list.links');
+
+		// Create the pagination object and add the object to the internal cache.
+		$this->cache[$store] = new \JPagination($this->getTotal(), $this->getStart(), $limit);
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Method to get a store id based on the model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  An identifier string to generate the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Add the list state to the store id.
+		$id .= ':' . $this->getState('list.start');
+		$id .= ':' . $this->getState('list.limit');
+		$id .= ':' . $this->getState('list.ordering');
+		$id .= ':' . $this->getState('list.direction');
+
+		return md5($this->context . ':' . $id);
+	}
+
+	/**
+	 * Method to get the total number of items for the data set.
+	 *
+	 * @return  integer  The total number of items available in the data set.
+	 *
+	 * @since   1.6
+	 */
+	public function getTotal()
+	{
+		// Get a storage key.
+		$store = $this->getStoreId('getTotal');
+
+		// Try to load the data from internal storage.
+		if (isset($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		try
+		{
+			// Load the total and add the total to the internal cache.
+			$this->cache[$store] = (int) $this->_getListCount($this->_getListQuery());
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Method to get the starting number of items for the data set.
+	 *
+	 * @return  integer  The starting number of items available in the data set.
+	 *
+	 * @since   1.6
+	 */
+	public function getStart()
+	{
+		$store = $this->getStoreId('getstart');
+
+		// Try to load the data from internal storage.
+		if (isset($this->cache[$store]))
+		{
+			return $this->cache[$store];
+		}
+
+		$start = $this->getState('list.start');
+
+		if ($start > 0)
+		{
+			$limit = $this->getState('list.limit');
+			$total = $this->getTotal();
+
+			if ($start > $total - $limit)
+			{
+				$start = max(0, (int) (ceil($total / $limit) - 1) * $limit);
+			}
+		}
+
+		// Add the total to the internal cache.
+		$this->cache[$store] = $start;
+
+		return $this->cache[$store];
+	}
+
+	/**
+	 * Get the filter form
+	 *
+	 * @param   array    $data      data
+	 * @param   boolean  $loadData  load current data
+	 *
+	 * @return  \JForm|boolean  The \JForm object or false on error
+	 *
+	 * @since   3.2
+	 */
+	public function getFilterForm($data = array(), $loadData = true)
+	{
+		$form = null;
+
+		// Try to locate the filter form automatically. Example: ContentModelArticles => "filter_articles"
+		if (empty($this->filterFormName))
+		{
+			$classNameParts = explode('Model', get_called_class());
+
+			if (count($classNameParts) == 2)
+			{
+				$this->filterFormName = 'filter_' . strtolower($classNameParts[1]);
+			}
+		}
+
+		if (!empty($this->filterFormName))
+		{
+			// Get the form.
+			$form = $this->loadForm($this->context . '.filter', $this->filterFormName, array('control' => '', 'load_data' => $loadData));
+		}
+
+		return $form;
+	}
+
+	/**
+	 * Method to get a form object.
+	 *
+	 * @param   string          $name     The name of the form.
+	 * @param   string          $source   The form source. Can be XML string if file flag is set to false.
+	 * @param   array           $options  Optional array of options for the form creation.
+	 * @param   boolean         $clear    Optional argument to force load a new form.
+	 * @param   string|boolean  $xpath    An optional xpath to search for the fields.
+	 *
+	 * @return  \JForm|boolean  \JForm object on success, False on error.
+	 *
+	 * @see     \JForm
+	 * @since   3.2
+	 */
+	protected function loadForm($name, $source = null, $options = array(), $clear = false, $xpath = false)
+	{
+		// Handle the optional arguments.
+		$options['control'] = ArrayHelper::getValue((array) $options, 'control', false);
+
+		// Create a signature hash.
+		$hash = md5($source . serialize($options));
+
+		// Check if we can use a previously loaded form.
+		if (!$clear && isset($this->_forms[$hash]))
+		{
+			return $this->_forms[$hash];
+		}
+
+		// Get the form.
+		\JForm::addFormPath(JPATH_COMPONENT . '/models/forms');
+		\JForm::addFieldPath(JPATH_COMPONENT . '/models/fields');
+
+		try
+		{
+			$form = \JForm::getInstance($name, $source, $options, false, $xpath);
+
+			if (isset($options['load_data']) && $options['load_data'])
+			{
+				// Get the data for the form.
+				$data = $this->loadFormData();
+			}
+			else
+			{
+				$data = array();
+			}
+
+			// Allow for additional modification of the form, and events to be triggered.
+			// We pass the data because plugins may require it.
+			$this->preprocessForm($form, $data);
+
+			// Load the data into the form after the plugins have operated.
+			$form->bind($data);
+		}
+		catch (\Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// Store the form for later.
+		$this->_forms[$hash] = $form;
+
+		return $form;
+	}
+
+	/**
+	 * Method to get the data that should be injected in the form.
+	 *
+	 * @return	mixed	The data for the form.
+	 *
+	 * @since	3.2
+	 */
+	protected function loadFormData()
+	{
+		// Check the session for previously entered form data.
+		$data = \JFactory::getApplication()->getUserState($this->context, new \stdClass);
+
+		// Pre-fill the list options
+		if (!property_exists($data, 'list'))
+		{
+			$data->list = array(
+				'direction' => $this->getState('list.direction'),
+				'limit'     => $this->getState('list.limit'),
+				'ordering'  => $this->getState('list.ordering'),
+				'start'     => $this->getState('list.start'),
+			);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * This method should only be called once per instantiation and is designed
+	 * to be called on the first call to the getState() method unless the model
+	 * configuration flag to ignore the request is set.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		// If the context is set, assume that stateful lists are used.
+		if ($this->context)
+		{
+			$app         = \JFactory::getApplication();
+			$inputFilter = \JFilterInput::getInstance();
+
+			// Receive & set filters
+			if ($filters = $app->getUserStateFromRequest($this->context . '.filter', 'filter', array(), 'array'))
+			{
+				foreach ($filters as $name => $value)
+				{
+					// Exclude if blacklisted
+					if (!in_array($name, $this->filterBlacklist))
+					{
+						$this->setState('filter.' . $name, $value);
+					}
+				}
+			}
+
+			$limit = 0;
+
+			// Receive & set list options
+			if ($list = $app->getUserStateFromRequest($this->context . '.list', 'list', array(), 'array'))
+			{
+				foreach ($list as $name => $value)
+				{
+					// Exclude if blacklisted
+					if (!in_array($name, $this->listBlacklist))
+					{
+						// Extra validations
+						switch ($name)
+						{
+							case 'fullordering':
+								$orderingParts = explode(' ', $value);
+
+								if (count($orderingParts) >= 2)
+								{
+									// Latest part will be considered the direction
+									$fullDirection = end($orderingParts);
+
+									if (in_array(strtoupper($fullDirection), array('ASC', 'DESC', '')))
+									{
+										$this->setState('list.direction', $fullDirection);
+									}
+									else
+									{
+										$this->setState('list.direction', $direction);
+
+										// Fallback to the default value
+										$value = $ordering . ' ' . $direction;
+									}
+
+									unset($orderingParts[count($orderingParts) - 1]);
+
+									// The rest will be the ordering
+									$fullOrdering = implode(' ', $orderingParts);
+
+									if (in_array($fullOrdering, $this->filter_fields))
+									{
+										$this->setState('list.ordering', $fullOrdering);
+									}
+									else
+									{
+										$this->setState('list.ordering', $ordering);
+
+										// Fallback to the default value
+										$value = $ordering . ' ' . $direction;
+									}
+								}
+								else
+								{
+									$this->setState('list.ordering', $ordering);
+									$this->setState('list.direction', $direction);
+
+									// Fallback to the default value
+									$value = $ordering . ' ' . $direction;
+								}
+								break;
+
+							case 'ordering':
+								if (!in_array($value, $this->filter_fields))
+								{
+									$value = $ordering;
+								}
+								break;
+
+							case 'direction':
+								if (!in_array(strtoupper($value), array('ASC', 'DESC', '')))
+								{
+									$value = $direction;
+								}
+								break;
+
+							case 'limit':
+								$value = $inputFilter->clean($value, 'int');
+								$limit = $value;
+								break;
+
+							case 'select':
+								$explodedValue = explode(',', $value);
+
+								foreach ($explodedValue as &$field)
+								{
+									$field = $inputFilter->clean($field, 'cmd');
+								}
+
+								$value = implode(',', $explodedValue);
+								break;
+						}
+
+						$this->setState('list.' . $name, $value);
+					}
+				}
+			}
+			else
+			// Keep B/C for components previous to jform forms for filters
+			{
+				// Pre-fill the limits
+				$limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $app->get('list_limit'), 'uint');
+				$this->setState('list.limit', $limit);
+
+				// Check if the ordering field is in the whitelist, otherwise use the incoming value.
+				$value = $app->getUserStateFromRequest($this->context . '.ordercol', 'filter_order', $ordering);
+
+				if (!in_array($value, $this->filter_fields))
+				{
+					$value = $ordering;
+					$app->setUserState($this->context . '.ordercol', $value);
+				}
+
+				$this->setState('list.ordering', $value);
+
+				// Check if the ordering direction is valid, otherwise use the incoming value.
+				$value = $app->getUserStateFromRequest($this->context . '.orderdirn', 'filter_order_Dir', $direction);
+
+				if (!in_array(strtoupper($value), array('ASC', 'DESC', '')))
+				{
+					$value = $direction;
+					$app->setUserState($this->context . '.orderdirn', $value);
+				}
+
+				$this->setState('list.direction', $value);
+			}
+
+			// Support old ordering field
+			$oldOrdering = $app->input->get('filter_order');
+
+			if (!empty($oldOrdering) && in_array($oldOrdering, $this->filter_fields))
+			{
+				$this->setState('list.ordering', $oldOrdering);
+			}
+
+			// Support old direction field
+			$oldDirection = $app->input->get('filter_order_Dir');
+
+			if (!empty($oldDirection) && in_array(strtoupper($oldDirection), array('ASC', 'DESC', '')))
+			{
+				$this->setState('list.direction', $oldDirection);
+			}
+
+			$value = $app->getUserStateFromRequest($this->context . '.limitstart', 'limitstart', 0, 'int');
+			$limitstart = ($limit != 0 ? (floor($value / $limit) * $limit) : 0);
+			$this->setState('list.start', $limitstart);
+		}
+		else
+		{
+			$this->setState('list.start', 0);
+			$this->setState('list.limit', 0);
+		}
+	}
+
+	/**
+	 * Method to allow derived classes to preprocess the form.
+	 *
+	 * @param   \JForm  $form   A \JForm object.
+	 * @param   mixed   $data   The data expected for the form.
+	 * @param   string  $group  The name of the plugin group to import (defaults to "content").
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @throws  \Exception if there is an error in the form event.
+	 */
+	protected function preprocessForm(\JForm $form, $data, $group = 'content')
+	{
+		// Import the appropriate plugin group.
+		\JPluginHelper::importPlugin($group);
+
+		// Get the dispatcher.
+		$dispatcher = \JEventDispatcher::getInstance();
+
+		// Trigger the form preparation event.
+		$results = $dispatcher->trigger('onContentPrepareForm', array($form, $data));
+
+		// Check for errors encountered while preparing the form.
+		if (count($results) && in_array(false, $results, true))
+		{
+			// Get the last error.
+			$error = $dispatcher->getError();
+
+			if (!($error instanceof \Exception))
+			{
+				throw new \Exception($error);
+			}
+		}
+	}
+
+	/**
+	 * Gets the value of a user state variable and sets it in the session
+	 *
+	 * This is the same as the method in \JApplication except that this also can optionally
+	 * force you back to the first page when a filter has changed
+	 *
+	 * @param   string   $key        The key of the user state variable.
+	 * @param   string   $request    The name of the variable passed in a request.
+	 * @param   string   $default    The default value for the variable if not found. Optional.
+	 * @param   string   $type       Filter for the variable, for valid values see {@link \JFilterInput::clean()}. Optional.
+	 * @param   boolean  $resetPage  If true, the limitstart in request is set to zero
+	 *
+	 * @return  mixed  The request user state.
+	 *
+	 * @since   1.6
+	 */
+	public function getUserStateFromRequest($key, $request, $default = null, $type = 'none', $resetPage = true)
+	{
+		$app       = \JFactory::getApplication();
+		$input     = $app->input;
+		$old_state = $app->getUserState($key);
+		$cur_state = $old_state !== null ? $old_state : $default;
+		$new_state = $input->get($request, null, $type);
+
+		// BC for Search Tools which uses different naming
+		if ($new_state === null && strpos($request, 'filter_') === 0)
+		{
+			$name    = substr($request, 7);
+			$filters = $app->input->get('filter', array(), 'array');
+
+			if (isset($filters[$name]))
+			{
+				$new_state = $filters[$name];
+			}
+		}
+
+		if ($cur_state != $new_state && $new_state !== null && $resetPage)
+		{
+			$input->set('limitstart', 0);
+		}
+
+		// Save the new value only if it is set in this request.
+		if ($new_state !== null)
+		{
+			$app->setUserState($key, $new_state);
+		}
+		else
+		{
+			$new_state = $cur_state;
+		}
+
+		return $new_state;
+	}
+
+	/**
+	 * Parse and transform the search string into a string fit for regex-ing arbitrary strings against
+	 *
+	 * @param   string  $search          The search string
+	 * @param   string  $regexDelimiter  The regex delimiter to use for the quoting
+	 *
+	 * @return  string  Search string escaped for regex
+	 *
+	 * @since   3.4
+	 */
+	protected function refineSearchStringToRegex($search, $regexDelimiter = '/')
+	{
+		$searchArr = explode('|', trim($search, ' |'));
+
+		foreach ($searchArr as $key => $searchString)
+		{
+			if (trim($searchString) === '')
+			{
+				unset($searchArr[$key]);
+				continue;
+			}
+
+			$searchArr[$key] = str_replace(' ', '.*', preg_quote(trim($searchString), $regexDelimiter));
+		}
+
+		return implode('|', $searchArr);
+	}
+}
diff --git a/core/libraries/src/MVC/View/CategoriesView.php b/core/libraries/src/MVC/View/CategoriesView.php
new file mode 100644
index 00000000..3e57e521
--- /dev/null
+++ b/core/libraries/src/MVC/View/CategoriesView.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\View;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Categories view base class.
+ *
+ * @since  3.2
+ */
+class CategoriesView extends HtmlView
+{
+	/**
+	 * State data
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  3.2
+	 */
+	protected $state;
+
+	/**
+	 * Category items data
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $items;
+
+	/**
+	 * Language key for default page heading
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $pageHeading;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.2
+	 */
+	public function display($tpl = null)
+	{
+		$state  = $this->get('State');
+		$items  = $this->get('Items');
+		$parent = $this->get('Parent');
+
+		$app = \JFactory::getApplication();
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			$app->enqueueMessage($errors, 'error');
+
+			return false;
+		}
+
+		if ($items === false)
+		{
+			$app->enqueueMessage(\JText::_('JGLOBAL_CATEGORY_NOT_FOUND'), 'error');
+
+			return false;
+		}
+
+		if ($parent == false)
+		{
+			$app->enqueueMessage(\JText::_('JGLOBAL_CATEGORY_NOT_FOUND'), 'error');
+
+			return false;
+		}
+
+		$params = &$state->params;
+
+		$items = array($parent->id => $items);
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+		$this->maxLevelcat = $params->get('maxLevelcat', -1) < 0 ? PHP_INT_MAX : $params->get('maxLevelcat', PHP_INT_MAX);
+		$this->params      = &$params;
+		$this->parent      = &$parent;
+		$this->items       = &$items;
+
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function prepareDocument()
+	{
+		$app   = \JFactory::getApplication();
+		$menus = $app->getMenu();
+
+		// Because the application sets a default page title, we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', \JText::_($this->pageHeading));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}
diff --git a/core/libraries/src/MVC/View/CategoryFeedView.php b/core/libraries/src/MVC/View/CategoryFeedView.php
new file mode 100644
index 00000000..c9bb0aab
--- /dev/null
+++ b/core/libraries/src/MVC/View/CategoryFeedView.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\View;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Base feed View class for a category
+ *
+ * @since  3.2
+ */
+class CategoryFeedView extends HtmlView
+{
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.2
+	 */
+	public function display($tpl = null)
+	{
+		$app      = \JFactory::getApplication();
+		$document = \JFactory::getDocument();
+
+		$extension      = $app->input->getString('option');
+		$contentType = $extension . '.' . $this->viewName;
+
+		$ucmType = new \JUcmType;
+		$ucmRow = $ucmType->getTypeByAlias($contentType);
+		$ucmMapCommon = json_decode($ucmRow->field_mappings)->common;
+		$createdField = null;
+		$titleField = null;
+
+		if (is_object($ucmMapCommon))
+		{
+			$createdField = $ucmMapCommon->core_created_time;
+			$titleField = $ucmMapCommon->core_title;
+		}
+		elseif (is_array($ucmMapCommon))
+		{
+			$createdField = $ucmMapCommon[0]->core_created_time;
+			$titleField = $ucmMapCommon[0]->core_title;
+		}
+
+		$document->link = \JRoute::_(\JHelperRoute::getCategoryRoute($app->input->getInt('id'), $language = 0, $extension));
+
+		$app->input->set('limit', $app->get('feed_limit'));
+		$siteEmail        = $app->get('mailfrom');
+		$fromName         = $app->get('fromname');
+		$feedEmail        = $app->get('feed_email', 'none');
+		$document->editor = $fromName;
+
+		if ($feedEmail !== 'none')
+		{
+			$document->editorEmail = $siteEmail;
+		}
+
+		// Get some data from the model
+		$items    = $this->get('Items');
+		$category = $this->get('Category');
+
+		// Don't display feed if category id missing or non existent
+		if ($category == false || $category->alias === 'root')
+		{
+			return \JError::raiseError(404, \JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
+		}
+
+		foreach ($items as $item)
+		{
+			$this->reconcileNames($item);
+
+			// Strip html from feed item title
+			if ($titleField)
+			{
+				$title = $this->escape($item->$titleField);
+				$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+			}
+			else
+			{
+				$title = '';
+			}
+
+			// URL link to article
+			$router = new \JHelperRoute;
+			$link   = \JRoute::_($router->getRoute($item->id, $contentType, null, null, $item->catid));
+
+			// Strip HTML from feed item description text.
+			$description = $item->description;
+			$author      = $item->created_by_alias ?: $item->author;
+
+			if ($createdField)
+			{
+				$date = isset($item->$createdField) ? date('r', strtotime($item->$createdField)) : '';
+			}
+			else
+			{
+				$date = '';
+			}
+
+			// Load individual item creator class.
+			$feeditem              = new \JFeedItem;
+			$feeditem->title       = $title;
+			$feeditem->link        = $link;
+			$feeditem->description = $description;
+			$feeditem->date        = $date;
+			$feeditem->category    = $category->title;
+			$feeditem->author      = $author;
+
+			// We don't have the author email so we have to use site in both cases.
+			if ($feedEmail === 'site')
+			{
+				$feeditem->authorEmail = $siteEmail;
+			}
+			elseif ($feedEmail === 'author')
+			{
+				$feeditem->authorEmail = $item->author_email;
+			}
+
+			// Loads item information into RSS array
+			$document->addItem($feeditem);
+		}
+	}
+
+	/**
+	 * Method to reconcile non standard names from components to usage in this class.
+	 * Typically overriden in the component feed view class.
+	 *
+	 * @param   object  $item  The item for a feed, an element of the $items array.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function reconcileNames($item)
+	{
+		if (!property_exists($item, 'title') && property_exists($item, 'name'))
+		{
+			$item->title = $item->name;
+		}
+	}
+}
diff --git a/core/libraries/src/MVC/View/CategoryView.php b/core/libraries/src/MVC/View/CategoryView.php
new file mode 100644
index 00000000..2e2e5620
--- /dev/null
+++ b/core/libraries/src/MVC/View/CategoryView.php
@@ -0,0 +1,325 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\View;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Base HTML View class for the a Category list
+ *
+ * @since  3.2
+ */
+class CategoryView extends HtmlView
+{
+	/**
+	 * State data
+	 *
+	 * @var    \Joomla\Registry\Registry
+	 * @since  3.2
+	 */
+	protected $state;
+
+	/**
+	 * Category items data
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $items;
+
+	/**
+	 * The category model object for this category
+	 *
+	 * @var    \JModelCategory
+	 * @since  3.2
+	 */
+	protected $category;
+
+	/**
+	 * The list of other categories for this extension.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $categories;
+
+	/**
+	 * Pagination object
+	 *
+	 * @var    \JPagination
+	 * @since  3.2
+	 */
+	protected $pagination;
+
+	/**
+	 * Child objects
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $children;
+
+	/**
+	 * The name of the extension for the category
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $extension;
+
+	/**
+	 * The name of the view to link individual items to
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $viewName;
+
+	/**
+	 * Default title to use for page title
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $defaultPageTitle;
+
+	/**
+	 * Whether to run the standard Joomla plugin events.
+	 * Off by default for b/c
+	 *
+	 * @var    bool
+	 * @since  3.5
+	 */
+	protected $runPlugins = false;
+
+	/**
+	 * Method with common display elements used in category list displays
+	 *
+	 * @return  boolean|\JException|void  Boolean false or \JException instance on error, nothing otherwise
+	 *
+	 * @since   3.2
+	 */
+	public function commonCategoryDisplay()
+	{
+		$app    = \JFactory::getApplication();
+		$user   = \JFactory::getUser();
+		$params = $app->getParams();
+
+		// Get some data from the models
+		$model       = $this->getModel();
+		$paramsModel = $model->getState('params');
+
+		$paramsModel->set('check_access_rights', 0);
+		$model->setState('params', $paramsModel);
+
+		$state       = $this->get('State');
+		$category    = $this->get('Category');
+		$children    = $this->get('Children');
+		$parent      = $this->get('Parent');
+
+		if ($category == false)
+		{
+			return \JError::raiseError(404, \JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
+		}
+
+		if ($parent == false)
+		{
+			return \JError::raiseError(404, \JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
+		}
+
+		// Check whether category access level allows access.
+		$groups = $user->getAuthorisedViewLevels();
+
+		if (!in_array($category->access, $groups))
+		{
+			return \JError::raiseError(403, \JText::_('JERROR_ALERTNOAUTHOR'));
+		}
+
+		$items      = $this->get('Items');
+		$pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			\JError::raiseError(500, implode("\n", $errors));
+
+			return false;
+		}
+
+		// Setup the category parameters.
+		$cparams          = $category->getParams();
+		$category->params = clone $params;
+		$category->params->merge($cparams);
+
+		$children = array($category->id => $children);
+
+		// Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		if ($this->runPlugins)
+		{
+			\JPluginHelper::importPlugin('content');
+
+			foreach ($items as $itemElement)
+			{
+				$itemElement = (object) $itemElement;
+				$itemElement->event = new \stdClass;
+
+				// For some plugins.
+				!empty($itemElement->description) ? $itemElement->text = $itemElement->description : $itemElement->text = null;
+
+				$dispatcher = \JEventDispatcher::getInstance();
+
+				$dispatcher->trigger('onContentPrepare', array($this->extension . '.category', &$itemElement, &$itemElement->params, 0));
+
+				$results = $dispatcher->trigger('onContentAfterTitle', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
+				$itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
+
+				$results = $dispatcher->trigger('onContentBeforeDisplay', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
+				$itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
+
+				$results = $dispatcher->trigger('onContentAfterDisplay', array($this->extension . '.category', &$itemElement, &$itemElement->core_params, 0));
+				$itemElement->event->afterDisplayContent = trim(implode("\n", $results));
+
+				if ($itemElement->text)
+				{
+					$itemElement->description = $itemElement->text;
+				}
+			}
+		}
+
+		$maxLevel         = $params->get('maxLevel', -1) < 0 ? PHP_INT_MAX : $params->get('maxLevel', PHP_INT_MAX);
+		$this->maxLevel   = &$maxLevel;
+		$this->state      = &$state;
+		$this->items      = &$items;
+		$this->category   = &$category;
+		$this->children   = &$children;
+		$this->params     = &$params;
+		$this->parent     = &$parent;
+		$this->pagination = &$pagination;
+		$this->user       = &$user;
+
+		// Check for layout override only if this is not the active menu item
+		// If it is the active menu item, then the view and category id will match
+		$active = $app->getMenu()->getActive();
+
+		if ($active
+			&& $active->component == $this->extension
+			&& isset($active->query['view'], $active->query['id'])
+			&& $active->query['view'] == 'category'
+			&& $active->query['id'] == $this->category->id)
+		{
+			if (isset($active->query['layout']))
+			{
+				$this->setLayout($active->query['layout']);
+			}
+		}
+		elseif ($layout = $category->params->get('category_layout'))
+		{
+			$this->setLayout($layout);
+		}
+
+		$this->category->tags = new \JHelperTags;
+		$this->category->tags->getItemTags($this->extension . '.category', $this->category->id);
+	}
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @since   3.2
+	 */
+	public function display($tpl = null)
+	{
+		$this->prepareDocument();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Method to prepares the document
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function prepareDocument()
+	{
+		$app           = \JFactory::getApplication();
+		$menus         = $app->getMenu();
+		$this->pathway = $app->getPathway();
+		$title         = null;
+
+		// Because the application sets a default page title, we need to get it from the menu item itself
+		$this->menu = $menus->getActive();
+
+		if ($this->menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $this->menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', \JText::_($this->defaultPageTitle));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+
+	/**
+	 * Method to add an alternative feed link to a category layout.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function addFeed()
+	{
+		if ($this->params->get('show_feed_link', 1) == 1)
+		{
+			$link    = '&format=feed&limitstart=';
+			$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$this->document->addHeadLink(\JRoute::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+			$attribs = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$this->document->addHeadLink(\JRoute::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+		}
+	}
+}
diff --git a/core/libraries/src/MVC/View/HtmlView.php b/core/libraries/src/MVC/View/HtmlView.php
new file mode 100644
index 00000000..b5950212
--- /dev/null
+++ b/core/libraries/src/MVC/View/HtmlView.php
@@ -0,0 +1,875 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\MVC\View;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Base class for a Joomla View
+ *
+ * Class holding methods for displaying presentation data.
+ *
+ * @since  2.5.5
+ */
+class HtmlView extends \JObject
+{
+	/**
+	 * The active document object
+	 *
+	 * @var    \JDocument
+	 * @since  3.0
+	 */
+	public $document;
+
+	/**
+	 * The name of the view
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $_name = null;
+
+	/**
+	 * Registered models
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $_models = array();
+
+	/**
+	 * The base path of the view
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_basePath = null;
+
+	/**
+	 * The default model
+	 *
+	 * @var	   string
+	 * @since  3.0
+	 */
+	protected $_defaultModel = null;
+
+	/**
+	 * Layout name
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_layout = 'default';
+
+	/**
+	 * Layout extension
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_layoutExt = 'php';
+
+	/**
+	 * Layout template
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_layoutTemplate = '_';
+
+	/**
+	 * The set of search directories for resources (templates)
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $_path = array('template' => array(), 'helper' => array());
+
+	/**
+	 * The name of the default template source file.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_template = null;
+
+	/**
+	 * The output of the template script.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_output = null;
+
+	/**
+	 * Callback for escaping.
+	 *
+	 * @var    string
+	 * @since  3.0
+	 * @deprecated  3.0
+	 */
+	protected $_escape = 'htmlspecialchars';
+
+	/**
+	 * Charset to use in escaping mechanisms; defaults to urf8 (UTF-8)
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	protected $_charset = 'UTF-8';
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  A named configuration array for object construction.
+	 *                          name: the name (optional) of the view (defaults to the view class name suffix).
+	 *                          charset: the character set to use for display
+	 *                          escape: the name (optional) of the function to use for escaping strings
+	 *                          base_path: the parent path (optional) of the views directory (defaults to the component folder)
+	 *                          template_plath: the path (optional) of the layout directory (defaults to base_path + /views/ + view name
+	 *                          helper_path: the path (optional) of the helper files (defaults to base_path + /helpers/)
+	 *                          layout: the layout (optional) to use to display the view
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array())
+	{
+		// Set the view name
+		if (empty($this->_name))
+		{
+			if (array_key_exists('name', $config))
+			{
+				$this->_name = $config['name'];
+			}
+			else
+			{
+				$this->_name = $this->getName();
+			}
+		}
+
+		// Set the charset (used by the variable escaping functions)
+		if (array_key_exists('charset', $config))
+		{
+			\JLog::add('Setting a custom charset for escaping is deprecated. Override \JViewLegacy::escape() instead.', \JLog::WARNING, 'deprecated');
+			$this->_charset = $config['charset'];
+		}
+
+		// User-defined escaping callback
+		if (array_key_exists('escape', $config))
+		{
+			$this->setEscape($config['escape']);
+		}
+
+		// Set a base path for use by the view
+		if (array_key_exists('base_path', $config))
+		{
+			$this->_basePath = $config['base_path'];
+		}
+		else
+		{
+			$this->_basePath = JPATH_COMPONENT;
+		}
+
+		// Set the default template search path
+		if (array_key_exists('template_path', $config))
+		{
+			// User-defined dirs
+			$this->_setPath('template', $config['template_path']);
+		}
+		elseif (is_dir($this->_basePath . '/view'))
+		{
+			$this->_setPath('template', $this->_basePath . '/view/' . $this->getName() . '/tmpl');
+		}
+		else
+		{
+			$this->_setPath('template', $this->_basePath . '/views/' . $this->getName() . '/tmpl');
+		}
+
+		// Set the default helper search path
+		if (array_key_exists('helper_path', $config))
+		{
+			// User-defined dirs
+			$this->_setPath('helper', $config['helper_path']);
+		}
+		else
+		{
+			$this->_setPath('helper', $this->_basePath . '/helpers');
+		}
+
+		// Set the layout
+		if (array_key_exists('layout', $config))
+		{
+			$this->setLayout($config['layout']);
+		}
+		else
+		{
+			$this->setLayout('default');
+		}
+
+		$this->baseurl = \JUri::base(true);
+	}
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @see     \JViewLegacy::loadTemplate()
+	 * @since   3.0
+	 */
+	public function display($tpl = null)
+	{
+		$result = $this->loadTemplate($tpl);
+
+		if ($result instanceof \Exception)
+		{
+			return $result;
+		}
+
+		echo $result;
+	}
+
+	/**
+	 * Assigns variables to the view script via differing strategies.
+	 *
+	 * This method is overloaded; you can assign all the properties of
+	 * an object, an associative array, or a single value by name.
+	 *
+	 * You are not allowed to set variables that begin with an underscore;
+	 * these are either private properties for \JView or private variables
+	 * within the template script itself.
+	 *
+	 * <code>
+	 * $view = new \Joomla\CMS\View\HtmlView;
+	 *
+	 * // Assign directly
+	 * $view->var1 = 'something';
+	 * $view->var2 = 'else';
+	 *
+	 * // Assign by name and value
+	 * $view->assign('var1', 'something');
+	 * $view->assign('var2', 'else');
+	 *
+	 * // Assign by assoc-array
+	 * $ary = array('var1' => 'something', 'var2' => 'else');
+	 * $view->assign($obj);
+	 *
+	 * // Assign by object
+	 * $obj = new \stdClass;
+	 * $obj->var1 = 'something';
+	 * $obj->var2 = 'else';
+	 * $view->assign($obj);
+	 *
+	 * </code>
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.0
+	 * @deprecated  3.0 Use native PHP syntax.
+	 */
+	public function assign()
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Use native PHP syntax.', \JLog::WARNING, 'deprecated');
+
+		// Get the arguments; there may be 1 or 2.
+		$arg0 = @func_get_arg(0);
+		$arg1 = @func_get_arg(1);
+
+		// Assign by object
+		if (is_object($arg0))
+		{
+			// Assign public properties
+			foreach (get_object_vars($arg0) as $key => $val)
+			{
+				if (strpos($key, '_') !== 0)
+				{
+					$this->$key = $val;
+				}
+			}
+
+			return true;
+		}
+
+		// Assign by associative array
+		if (is_array($arg0))
+		{
+			foreach ($arg0 as $key => $val)
+			{
+				if (strpos($key, '_') !== 0)
+				{
+					$this->$key = $val;
+				}
+			}
+
+			return true;
+		}
+
+		// Assign by string name and mixed value.
+
+		// We use array_key_exists() instead of isset() because isset()
+		// fails if the value is set to null.
+		if (is_string($arg0) && strpos($arg0, '_') !== 0 && func_num_args() > 1)
+		{
+			$this->$arg0 = $arg1;
+
+			return true;
+		}
+
+		// $arg0 was not object, array, or string.
+		return false;
+	}
+
+	/**
+	 * Assign variable for the view (by reference).
+	 *
+	 * You are not allowed to set variables that begin with an underscore;
+	 * these are either private properties for \JView or private variables
+	 * within the template script itself.
+	 *
+	 * <code>
+	 * $view = new \JView;
+	 *
+	 * // Assign by name and value
+	 * $view->assignRef('var1', $ref);
+	 *
+	 * // Assign directly
+	 * $view->var1 = &$ref;
+	 * </code>
+	 *
+	 * @param   string  $key   The name for the reference in the view.
+	 * @param   mixed   &$val  The referenced variable.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.0
+	 * @deprecated  3.0  Use native PHP syntax.
+	 */
+	public function assignRef($key, &$val)
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Use native PHP syntax.', \JLog::WARNING, 'deprecated');
+
+		if (is_string($key) && strpos($key, '_') !== 0)
+		{
+			$this->$key = &$val;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Escapes a value for output in a view script.
+	 *
+	 * If escaping mechanism is either htmlspecialchars or htmlentities, uses
+	 * {@link $_encoding} setting.
+	 *
+	 * @param   mixed  $var  The output to escape.
+	 *
+	 * @return  mixed  The escaped value.
+	 *
+	 * @since   3.0
+	 */
+	public function escape($var)
+	{
+		if (in_array($this->_escape, array('htmlspecialchars', 'htmlentities')))
+		{
+			return call_user_func($this->_escape, $var, ENT_COMPAT, $this->_charset);
+		}
+
+		return call_user_func($this->_escape, $var);
+	}
+
+	/**
+	 * Method to get data from a registered model or a property of the view
+	 *
+	 * @param   string  $property  The name of the method to call on the model or the property to get
+	 * @param   string  $default   The name of the model to reference or the default value [optional]
+	 *
+	 * @return  mixed  The return value of the method
+	 *
+	 * @since   3.0
+	 */
+	public function get($property, $default = null)
+	{
+		// If $model is null we use the default model
+		if ($default === null)
+		{
+			$model = $this->_defaultModel;
+		}
+		else
+		{
+			$model = strtolower($default);
+		}
+
+		// First check to make sure the model requested exists
+		if (isset($this->_models[$model]))
+		{
+			// Model exists, let's build the method name
+			$method = 'get' . ucfirst($property);
+
+			// Does the method exist?
+			if (method_exists($this->_models[$model], $method))
+			{
+				// The method exists, let's call it and return what we get
+				$result = $this->_models[$model]->$method();
+
+				return $result;
+			}
+		}
+
+		// Degrade to \JObject::get
+		$result = parent::get($property, $default);
+
+		return $result;
+	}
+
+	/**
+	 * Method to get the model object
+	 *
+	 * @param   string  $name  The name of the model (optional)
+	 *
+	 * @return  mixed  \JModelLegacy object
+	 *
+	 * @since   3.0
+	 */
+	public function getModel($name = null)
+	{
+		if ($name === null)
+		{
+			$name = $this->_defaultModel;
+		}
+
+		return $this->_models[strtolower($name)];
+	}
+
+	/**
+	 * Get the layout.
+	 *
+	 * @return  string  The layout name
+	 *
+	 * @since   3.0
+	 */
+	public function getLayout()
+	{
+		return $this->_layout;
+	}
+
+	/**
+	 * Get the layout template.
+	 *
+	 * @return  string  The layout template name
+	 *
+	 * @since   3.0
+	 */
+	public function getLayoutTemplate()
+	{
+		return $this->_layoutTemplate;
+	}
+
+	/**
+	 * Method to get the view name
+	 *
+	 * The model name by default parsed using the classname, or it can be set
+	 * by passing a $config['name'] in the class constructor
+	 *
+	 * @return  string  The name of the model
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function getName()
+	{
+		if (empty($this->_name))
+		{
+			$classname = get_class($this);
+			$viewpos = strpos($classname, 'View');
+
+			if ($viewpos === false)
+			{
+				throw new \Exception(\JText::_('JLIB_APPLICATION_ERROR_VIEW_GET_NAME'), 500);
+			}
+
+			$this->_name = strtolower(substr($classname, $viewpos + 4));
+		}
+
+		return $this->_name;
+	}
+
+	/**
+	 * Method to add a model to the view.  We support a multiple model single
+	 * view system by which models are referenced by classname.  A caveat to the
+	 * classname referencing is that any classname prepended by \JModel will be
+	 * referenced by the name without \JModel, eg. \JModelCategory is just
+	 * Category.
+	 *
+	 * @param   \JModelLegacy  $model    The model to add to the view.
+	 * @param   boolean        $default  Is this the default model?
+	 *
+	 * @return  \JModelLegacy  The added model.
+	 *
+	 * @since   3.0
+	 */
+	public function setModel($model, $default = false)
+	{
+		$name = strtolower($model->getName());
+		$this->_models[$name] = $model;
+
+		if ($default)
+		{
+			$this->_defaultModel = $name;
+		}
+
+		return $model;
+	}
+
+	/**
+	 * Sets the layout name to use
+	 *
+	 * @param   string  $layout  The layout name or a string in format <template>:<layout file>
+	 *
+	 * @return  string  Previous value.
+	 *
+	 * @since   3.0
+	 */
+	public function setLayout($layout)
+	{
+		$previous = $this->_layout;
+
+		if (strpos($layout, ':') === false)
+		{
+			$this->_layout = $layout;
+		}
+		else
+		{
+			// Convert parameter to array based on :
+			$temp = explode(':', $layout);
+			$this->_layout = $temp[1];
+
+			// Set layout template
+			$this->_layoutTemplate = $temp[0];
+		}
+
+		return $previous;
+	}
+
+	/**
+	 * Allows a different extension for the layout files to be used
+	 *
+	 * @param   string  $value  The extension.
+	 *
+	 * @return  string  Previous value
+	 *
+	 * @since   3.0
+	 */
+	public function setLayoutExt($value)
+	{
+		$previous = $this->_layoutExt;
+
+		if ($value = preg_replace('#[^A-Za-z0-9]#', '', trim($value)))
+		{
+			$this->_layoutExt = $value;
+		}
+
+		return $previous;
+	}
+
+	/**
+	 * Sets the _escape() callback.
+	 *
+	 * @param   mixed  $spec  The callback for _escape() to use.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  3.0  Override \JViewLegacy::escape() instead.
+	 */
+	public function setEscape($spec)
+	{
+		\JLog::add(__METHOD__ . ' is deprecated. Override \JViewLegacy::escape() instead.', \JLog::WARNING, 'deprecated');
+
+		$this->_escape = $spec;
+	}
+
+	/**
+	 * Adds to the stack of view script paths in LIFO order.
+	 *
+	 * @param   mixed  $path  A directory path or an array of paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function addTemplatePath($path)
+	{
+		$this->_addPath('template', $path);
+	}
+
+	/**
+	 * Adds to the stack of helper script paths in LIFO order.
+	 *
+	 * @param   mixed  $path  A directory path or an array of paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function addHelperPath($path)
+	{
+		$this->_addPath('helper', $path);
+	}
+
+	/**
+	 * Load a template file -- first look in the templates folder for an override
+	 *
+	 * @param   string  $tpl  The name of the template source file; automatically searches the template paths and compiles as needed.
+	 *
+	 * @return  string  The output of the the template script.
+	 *
+	 * @since   3.0
+	 * @throws  \Exception
+	 */
+	public function loadTemplate($tpl = null)
+	{
+		// Clear prior output
+		$this->_output = null;
+
+		$template = \JFactory::getApplication()->getTemplate();
+		$layout = $this->getLayout();
+		$layoutTemplate = $this->getLayoutTemplate();
+
+		// Create the template file name based on the layout
+		$file = isset($tpl) ? $layout . '_' . $tpl : $layout;
+
+		// Clean the file name
+		$file = preg_replace('/[^A-Z0-9_\.-]/i', '', $file);
+		$tpl = isset($tpl) ? preg_replace('/[^A-Z0-9_\.-]/i', '', $tpl) : $tpl;
+
+		// Load the language file for the template
+		$lang = \JFactory::getLanguage();
+		$lang->load('tpl_' . $template, JPATH_BASE, null, false, true)
+			|| $lang->load('tpl_' . $template, JPATH_THEMES . "/$template", null, false, true);
+
+		// Change the template folder if alternative layout is in different template
+		if (isset($layoutTemplate) && $layoutTemplate !== '_' && $layoutTemplate != $template)
+		{
+			$this->_path['template'] = str_replace($template, $layoutTemplate, $this->_path['template']);
+		}
+
+		// Load the template script
+		jimport('joomla.filesystem.path');
+		$filetofind = $this->_createFileName('template', array('name' => $file));
+		$this->_template = \JPath::find($this->_path['template'], $filetofind);
+
+		// If alternate layout can't be found, fall back to default layout
+		if ($this->_template == false)
+		{
+			$filetofind = $this->_createFileName('', array('name' => 'default' . (isset($tpl) ? '_' . $tpl : $tpl)));
+			$this->_template = \JPath::find($this->_path['template'], $filetofind);
+		}
+
+		if ($this->_template != false)
+		{
+			// Unset so as not to introduce into template scope
+			unset($tpl, $file);
+
+			// Never allow a 'this' property
+			if (isset($this->this))
+			{
+				unset($this->this);
+			}
+
+			// Start capturing output into a buffer
+			ob_start();
+
+			// Include the requested template filename in the local scope
+			// (this will execute the view logic).
+			include $this->_template;
+
+			// Done with the requested template; get the buffer and
+			// clear it.
+			$this->_output = ob_get_contents();
+			ob_end_clean();
+
+			return $this->_output;
+		}
+		else
+		{
+			throw new \Exception(\JText::sprintf('JLIB_APPLICATION_ERROR_LAYOUTFILE_NOT_FOUND', $file), 500);
+		}
+	}
+
+	/**
+	 * Load a helper file
+	 *
+	 * @param   string  $hlp  The name of the helper source file automatically searches the helper paths and compiles as needed.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function loadHelper($hlp = null)
+	{
+		// Clean the file name
+		$file = preg_replace('/[^A-Z0-9_\.-]/i', '', $hlp);
+
+		// Load the template script
+		jimport('joomla.filesystem.path');
+		$helper = \JPath::find($this->_path['helper'], $this->_createFileName('helper', array('name' => $file)));
+
+		if ($helper != false)
+		{
+			// Include the requested template filename in the local scope
+			include_once $helper;
+		}
+	}
+
+	/**
+	 * Sets an entire array of search paths for templates or resources.
+	 *
+	 * @param   string  $type  The type of path to set, typically 'template'.
+	 * @param   mixed   $path  The new search path, or an array of search paths.  If null or false, resets to the current directory only.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function _setPath($type, $path)
+	{
+		$component = \JApplicationHelper::getComponentName();
+		$app = \JFactory::getApplication();
+
+		// Clear out the prior search dirs
+		$this->_path[$type] = array();
+
+		// Actually add the user-specified directories
+		$this->_addPath($type, $path);
+
+		// Always add the fallback directories as last resort
+		switch (strtolower($type))
+		{
+			case 'template':
+				// Set the alternative template search dir
+				if (isset($app))
+				{
+					$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $component);
+					$fallback = JPATH_THEMES . '/' . $app->getTemplate() . '/html/' . $component . '/' . $this->getName();
+					$this->_addPath('template', $fallback);
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Adds to the search path for templates and resources.
+	 *
+	 * @param   string  $type  The type of path to add.
+	 * @param   mixed   $path  The directory or stream, or an array of either, to search.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	protected function _addPath($type, $path)
+	{
+		jimport('joomla.filesystem.path');
+
+		// Loop through the path directories
+		foreach ((array) $path as $dir)
+		{
+			// Clean up the path
+			$dir = \JPath::clean($dir);
+
+			// Add trailing separators as needed
+			if (substr($dir, -1) != DIRECTORY_SEPARATOR)
+			{
+				// Directory
+				$dir .= DIRECTORY_SEPARATOR;
+			}
+
+			// Add to the top of the search dirs
+			array_unshift($this->_path[$type], $dir);
+		}
+	}
+
+	/**
+	 * Create the filename for a resource
+	 *
+	 * @param   string  $type   The resource type to create the filename for
+	 * @param   array   $parts  An associative array of filename information
+	 *
+	 * @return  string  The filename
+	 *
+	 * @since   3.0
+	 */
+	protected function _createFileName($type, $parts = array())
+	{
+		switch ($type)
+		{
+			case 'template':
+				$filename = strtolower($parts['name']) . '.' . $this->_layoutExt;
+				break;
+
+			default:
+				$filename = strtolower($parts['name']) . '.php';
+				break;
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Returns the form object
+	 *
+	 * @return  mixed  A \JForm object on success, false on failure
+	 *
+	 * @since   3.2
+	 */
+	public function getForm()
+	{
+		if (!is_object($this->form))
+		{
+			$this->form = $this->get('Form');
+		}
+
+		return $this->form;
+	}
+
+	/**
+	 * Sets the document title according to Global Configuration options
+	 *
+	 * @param   string  $title  The page title
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6
+	 */
+	public function setDocumentTitle($title)
+	{
+		$app = \JFactory::getApplication();
+
+		// Check for empty title and add site name if param is set
+		if (empty($title))
+		{
+			$title = $app->get('sitename');
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 1)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $app->get('sitename'), $title);
+		}
+		elseif ($app->get('sitename_pagetitles', 0) == 2)
+		{
+			$title = \JText::sprintf('JPAGETITLE', $title, $app->get('sitename'));
+		}
+
+		$this->document->setTitle($title);
+	}
+}
diff --git a/core/libraries/src/Mail/Mail.php b/core/libraries/src/Mail/Mail.php
new file mode 100644
index 00000000..b886fbdb
--- /dev/null
+++ b/core/libraries/src/Mail/Mail.php
@@ -0,0 +1,786 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Mail;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Log\Log;
+
+/**
+ * Email Class.  Provides a common interface to send email from the Joomla! Platform
+ *
+ * @since  11.1
+ */
+class Mail extends \PHPMailer
+{
+	/**
+	 * Mail instances container.
+	 *
+	 * @var    Mail[]
+	 * @since  11.3
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Charset of the message.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $CharSet = 'utf-8';
+
+	/**
+	 * Constructor
+	 *
+	 * @param   boolean  $exceptions  Flag if Exceptions should be thrown
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($exceptions = true)
+	{
+		parent::__construct($exceptions);
+
+		// PHPMailer has an issue using the relative path for its language files
+		$this->setLanguage('en_gb', __DIR__ . '/language/');
+
+		// Configure a callback function to handle errors when $this->edebug() is called
+		$this->Debugoutput = function ($message, $level)
+		{
+			Log::add(sprintf('Error in Mail API: %s', $message), Log::ERROR, 'mail');
+		};
+
+		// If debug mode is enabled then set SMTPDebug to the maximum level
+		if (defined('JDEBUG') && JDEBUG)
+		{
+			$this->SMTPDebug = 4;
+		}
+
+		// Don't disclose the PHPMailer version
+		$this->XMailer = ' ';
+	}
+
+	/**
+	 * Returns the global email object, only creating it if it doesn't already exist.
+	 *
+	 * NOTE: If you need an instance to use that does not have the global configuration
+	 * values, use an id string that is not 'Joomla'.
+	 *
+	 * @param   string   $id          The id string for the Mail instance [optional]
+	 * @param   boolean  $exceptions  Flag if Exceptions should be thrown [optional]
+	 *
+	 * @return  Mail  The global Mail object
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($id = 'Joomla', $exceptions = true)
+	{
+		if (empty(self::$instances[$id]))
+		{
+			self::$instances[$id] = new Mail($exceptions);
+		}
+
+		return self::$instances[$id];
+	}
+
+	/**
+	 * Send the mail
+	 *
+	 * @return  boolean|\JException  Boolean true if successful, boolean false if the `mailonline` configuration is set to 0,
+	 *                              or a JException object if the mail function does not exist or sending the message fails.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public function Send()
+	{
+		if (Factory::getConfig()->get('mailonline', 1))
+		{
+			if (($this->Mailer == 'mail') && !function_exists('mail'))
+			{
+				return \JError::raiseNotice(500, \JText::_('JLIB_MAIL_FUNCTION_DISABLED'));
+			}
+
+			try
+			{
+				// Try sending with default settings
+				$result = parent::send();
+			}
+			catch (\phpmailerException $e)
+			{
+				$result = false;
+
+				if ($this->SMTPAutoTLS)
+				{
+					/**
+					 * PHPMailer has an issue with servers with invalid certificates
+					 *
+					 * See: https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting#opportunistic-tls
+					 */
+					$this->SMTPAutoTLS = false;
+
+					try
+					{
+						// Try it again with TLS turned off
+						$result = parent::send();
+					}
+					catch (\phpmailerException $e)
+					{
+						// Keep false for B/C compatibility
+						$result = false;
+					}
+				}
+			}
+
+			if ($result == false)
+			{
+				$result = \JError::raiseNotice(500, \JText::_($this->ErrorInfo));
+			}
+
+			return $result;
+		}
+
+		Factory::getApplication()->enqueueMessage(\JText::_('JLIB_MAIL_FUNCTION_OFFLINE'));
+
+		return false;
+	}
+
+	/**
+	 * Set the From and FromName properties.
+	 *
+	 * @param   string   $address  The sender email address
+	 * @param   string   $name     The sender name
+	 * @param   boolean  $auto     Whether to also set the Sender address, defaults to true
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function setFrom($address, $name = '', $auto = true)
+	{
+		try
+		{
+			if (parent::setFrom($address, $name, $auto) === false)
+			{
+				return false;
+			}
+		}
+		catch (\phpmailerException $e)
+		{
+			// The parent method will have already called the logging callback, just log our deprecated error handling message
+			Log::add(__METHOD__ . '() will not catch phpmailerException objects as of 4.0.', Log::WARNING, 'deprecated');
+
+			return false;
+		}
+	}
+
+	/**
+	 * Set the email sender
+	 *
+	 * @param   mixed  $from  email address and Name of sender
+	 *                        <code>array([0] => email Address, [1] => Name)</code>
+	 *                        or as a string
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function setSender($from)
+	{
+		// Wrapped in try/catch if PHPMailer is configured to throw exceptions
+		try
+		{
+			if (is_array($from))
+			{
+				// If $from is an array we assume it has an address and a name
+				if (isset($from[2]))
+				{
+					// If it is an array with entries, use them
+					$result = $this->setFrom(MailHelper::cleanLine($from[0]), MailHelper::cleanLine($from[1]), (bool) $from[2]);
+				}
+				else
+				{
+					$result = $this->setFrom(MailHelper::cleanLine($from[0]), MailHelper::cleanLine($from[1]));
+				}
+			}
+			elseif (is_string($from))
+			{
+				// If it is a string we assume it is just the address
+				$result = $this->setFrom(MailHelper::cleanLine($from));
+			}
+			else
+			{
+				// If it is neither, we log a message and throw an exception
+				Log::add(\JText::sprintf('JLIB_MAIL_INVALID_EMAIL_SENDER', $from), Log::WARNING, 'jerror');
+
+				throw new \UnexpectedValueException(sprintf('Invalid email Sender: %s, Mail::setSender(%s)', $from));
+			}
+
+			// Check for boolean false return if exception handling is disabled
+			if ($result === false)
+			{
+				return false;
+			}
+		}
+		catch (\phpmailerException $e)
+		{
+			// The parent method will have already called the logging callback, just log our deprecated error handling message
+			Log::add(__METHOD__ . '() will not catch phpmailerException objects as of 4.0.', Log::WARNING, 'deprecated');
+
+			return false;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the email subject
+	 *
+	 * @param   string  $subject  Subject of the email
+	 *
+	 * @return  Mail  Returns this object for chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function setSubject($subject)
+	{
+		$this->Subject = MailHelper::cleanLine($subject);
+
+		return $this;
+	}
+
+	/**
+	 * Set the email body
+	 *
+	 * @param   string  $content  Body of the email
+	 *
+	 * @return  Mail  Returns this object for chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function setBody($content)
+	{
+		/*
+		 * Filter the Body
+		 * TODO: Check for XSS
+		 */
+		$this->Body = MailHelper::cleanText($content);
+
+		return $this;
+	}
+
+	/**
+	 * Add recipients to the email.
+	 *
+	 * @param   mixed   $recipient  Either a string or array of strings [email address(es)]
+	 * @param   mixed   $name       Either a string or array of strings [name(s)]
+	 * @param   string  $method     The parent method's name.
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 */
+	protected function add($recipient, $name = '', $method = 'addAddress')
+	{
+		$method = lcfirst($method);
+
+		// If the recipient is an array, add each recipient... otherwise just add the one
+		if (is_array($recipient))
+		{
+			if (is_array($name))
+			{
+				$combined = array_combine($recipient, $name);
+
+				if ($combined === false)
+				{
+					throw new \InvalidArgumentException("The number of elements for each array isn't equal.");
+				}
+
+				foreach ($combined as $recipientEmail => $recipientName)
+				{
+					$recipientEmail = MailHelper::cleanLine($recipientEmail);
+					$recipientName = MailHelper::cleanLine($recipientName);
+
+					// Wrapped in try/catch if PHPMailer is configured to throw exceptions
+					try
+					{
+						// Check for boolean false return if exception handling is disabled
+						if (call_user_func('parent::' . $method, $recipientEmail, $recipientName) === false)
+						{
+							return false;
+						}
+					}
+					catch (\phpmailerException $e)
+					{
+						// The parent method will have already called the logging callback, just log our deprecated error handling message
+						Log::add(__METHOD__ . '() will not catch phpmailerException objects as of 4.0.', Log::WARNING, 'deprecated');
+
+						return false;
+					}
+				}
+			}
+			else
+			{
+				$name = MailHelper::cleanLine($name);
+
+				foreach ($recipient as $to)
+				{
+					$to = MailHelper::cleanLine($to);
+
+					// Wrapped in try/catch if PHPMailer is configured to throw exceptions
+					try
+					{
+						// Check for boolean false return if exception handling is disabled
+						if (call_user_func('parent::' . $method, $to, $name) === false)
+						{
+							return false;
+						}
+					}
+					catch (\phpmailerException $e)
+					{
+						// The parent method will have already called the logging callback, just log our deprecated error handling message
+						Log::add(__METHOD__ . '() will not catch phpmailerException objects as of 4.0.', Log::WARNING, 'deprecated');
+
+						return false;
+					}
+				}
+			}
+		}
+		else
+		{
+			$recipient = MailHelper::cleanLine($recipient);
+
+			// Wrapped in try/catch if PHPMailer is configured to throw exceptions
+			try
+			{
+				// Check for boolean false return if exception handling is disabled
+				if (call_user_func('parent::' . $method, $recipient, $name) === false)
+				{
+					return false;
+				}
+			}
+			catch (\phpmailerException $e)
+			{
+				// The parent method will have already called the logging callback, just log our deprecated error handling message
+				Log::add(__METHOD__ . '() will not catch phpmailerException objects as of 4.0.', Log::WARNING, 'deprecated');
+
+				return false;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add recipients to the email
+	 *
+	 * @param   mixed  $recipient  Either a string or array of strings [email address(es)]
+	 * @param   mixed  $name       Either a string or array of strings [name(s)]
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining.
+	 *
+	 * @since   11.1
+	 */
+	public function addRecipient($recipient, $name = '')
+	{
+		return $this->add($recipient, $name, 'addAddress');
+	}
+
+	/**
+	 * Add carbon copy recipients to the email
+	 *
+	 * @param   mixed  $cc    Either a string or array of strings [email address(es)]
+	 * @param   mixed  $name  Either a string or array of strings [name(s)]
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function addCc($cc, $name = '')
+	{
+		// If the carbon copy recipient is an array, add each recipient... otherwise just add the one
+		if (isset($cc))
+		{
+			return $this->add($cc, $name, 'addCC');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add blind carbon copy recipients to the email
+	 *
+	 * @param   mixed  $bcc   Either a string or array of strings [email address(es)]
+	 * @param   mixed  $name  Either a string or array of strings [name(s)]
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function addBcc($bcc, $name = '')
+	{
+		// If the blind carbon copy recipient is an array, add each recipient... otherwise just add the one
+		if (isset($bcc))
+		{
+			return $this->add($bcc, $name, 'addBCC');
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add file attachment to the email
+	 *
+	 * @param   mixed   $path         Either a string or array of strings [filenames]
+	 * @param   mixed   $name         Either a string or array of strings [names]
+	 * @param   mixed   $encoding     The encoding of the attachment
+	 * @param   mixed   $type         The mime type
+	 * @param   string  $disposition  The disposition of the attachment
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
+	 *
+	 * @since   12.2
+	 * @throws  \InvalidArgumentException
+	 */
+	public function addAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream', $disposition = 'attachment')
+	{
+		// If the file attachments is an array, add each file... otherwise just add the one
+		if (isset($path))
+		{
+			// Wrapped in try/catch if PHPMailer is configured to throw exceptions
+			try
+			{
+				$result = true;
+
+				if (is_array($path))
+				{
+					if (!empty($name) && count($path) != count($name))
+					{
+						throw new \InvalidArgumentException('The number of attachments must be equal with the number of name');
+					}
+
+					foreach ($path as $key => $file)
+					{
+						if (!empty($name))
+						{
+							$result = parent::addAttachment($file, $name[$key], $encoding, $type, $disposition);
+						}
+						else
+						{
+							$result = parent::addAttachment($file, $name, $encoding, $type, $disposition);
+						}
+					}
+				}
+				else
+				{
+					$result = parent::addAttachment($path, $name, $encoding, $type, $disposition);
+				}
+
+				// Check for boolean false return if exception handling is disabled
+				if ($result === false)
+				{
+					return false;
+				}
+			}
+			catch (\phpmailerException $e)
+			{
+				// The parent method will have already called the logging callback, just log our deprecated error handling message
+				Log::add(__METHOD__ . '() will not catch phpmailerException objects as of 4.0.', Log::WARNING, 'deprecated');
+
+				return false;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Unset all file attachments from the email
+	 *
+	 * @return  Mail  Returns this object for chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function clearAttachments()
+	{
+		parent::clearAttachments();
+
+		return $this;
+	}
+
+	/**
+	 * Unset file attachments specified by array index.
+	 *
+	 * @param   integer  $index  The numerical index of the attachment to remove
+	 *
+	 * @return  Mail  Returns this object for chaining.
+	 *
+	 * @since   12.2
+	 */
+	public function removeAttachment($index = 0)
+	{
+		if (isset($this->attachment[$index]))
+		{
+			unset($this->attachment[$index]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add Reply to email address(es) to the email
+	 *
+	 * @param   mixed  $replyto  Either a string or array of strings [email address(es)]
+	 * @param   mixed  $name     Either a string or array of strings [name(s)]
+	 *
+	 * @return  Mail|boolean  Returns this object for chaining on success or boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function addReplyTo($replyto, $name = '')
+	{
+		return $this->add($replyto, $name, 'addReplyTo');
+	}
+
+	/**
+	 * Sets message type to HTML
+	 *
+	 * @param   boolean  $ishtml  Boolean true or false.
+	 *
+	 * @return  Mail  Returns this object for chaining.
+	 *
+	 * @since   12.3
+	 */
+	public function isHtml($ishtml = true)
+	{
+		parent::isHTML($ishtml);
+
+		return $this;
+	}
+
+	/**
+	 * Send messages using $Sendmail.
+	 *
+	 * This overrides the parent class to remove the restriction on the executable's name containing the word "sendmail"
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function isSendmail()
+	{
+		// Prefer the Joomla configured sendmail path and default to the configured PHP path otherwise
+		$sendmail = Factory::getConfig()->get('sendmail', ini_get('sendmail_path'));
+
+		// And if we still don't have a path, then use the system default for Linux
+		if (empty($sendmail))
+		{
+			$sendmail = '/usr/sbin/sendmail';
+		}
+
+		$this->Sendmail = $sendmail;
+		$this->Mailer   = 'sendmail';
+	}
+
+	/**
+	 * Use sendmail for sending the email
+	 *
+	 * @param   string  $sendmail  Path to sendmail [optional]
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function useSendmail($sendmail = null)
+	{
+		$this->Sendmail = $sendmail;
+
+		if (!empty($this->Sendmail))
+		{
+			$this->isSendmail();
+
+			return true;
+		}
+		else
+		{
+			$this->isMail();
+
+			return false;
+		}
+	}
+
+	/**
+	 * Use SMTP for sending the email
+	 *
+	 * @param   string   $auth    SMTP Authentication [optional]
+	 * @param   string   $host    SMTP Host [optional]
+	 * @param   string   $user    SMTP Username [optional]
+	 * @param   string   $pass    SMTP Password [optional]
+	 * @param   string   $secure  Use secure methods
+	 * @param   integer  $port    The SMTP port
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function useSmtp($auth = null, $host = null, $user = null, $pass = null, $secure = null, $port = 25)
+	{
+		$this->SMTPAuth = $auth;
+		$this->Host = $host;
+		$this->Username = $user;
+		$this->Password = $pass;
+		$this->Port = $port;
+
+		if ($secure == 'ssl' || $secure == 'tls')
+		{
+			$this->SMTPSecure = $secure;
+		}
+
+		if (($this->SMTPAuth !== null && $this->Host !== null && $this->Username !== null && $this->Password !== null)
+			|| ($this->SMTPAuth === null && $this->Host !== null))
+		{
+			$this->isSMTP();
+
+			return true;
+		}
+		else
+		{
+			$this->isMail();
+
+			return false;
+		}
+	}
+
+	/**
+	 * Function to send an email
+	 *
+	 * @param   string   $from         From email address
+	 * @param   string   $fromName     From name
+	 * @param   mixed    $recipient    Recipient email address(es)
+	 * @param   string   $subject      email subject
+	 * @param   string   $body         Message body
+	 * @param   boolean  $mode         false = plain text, true = HTML
+	 * @param   mixed    $cc           CC email address(es)
+	 * @param   mixed    $bcc          BCC email address(es)
+	 * @param   mixed    $attachment   Attachment file name(s)
+	 * @param   mixed    $replyTo      Reply to email address(es)
+	 * @param   mixed    $replyToName  Reply to name(s)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function sendMail($from, $fromName, $recipient, $subject, $body, $mode = false, $cc = null, $bcc = null, $attachment = null,
+		$replyTo = null, $replyToName = null)
+	{
+		// Create config object
+		$config = Factory::getConfig();
+
+		$this->setSubject($subject);
+		$this->setBody($body);
+
+		// Are we sending the email as HTML?
+		$this->isHtml($mode);
+
+		/*
+		 * Do not send the message if adding any of the below items fails
+		 */
+
+		if ($this->addRecipient($recipient) === false)
+		{
+			return false;
+		}
+
+		if ($this->addCc($cc) === false)
+		{
+			return false;
+		}
+
+		if ($this->addBcc($bcc) === false)
+		{
+			return false;
+		}
+
+		if ($this->addAttachment($attachment) === false)
+		{
+			return false;
+		}
+
+		// Take care of reply email addresses
+		if (is_array($replyTo))
+		{
+			$numReplyTo = count($replyTo);
+
+			for ($i = 0; $i < $numReplyTo; $i++)
+			{
+				if ($this->addReplyTo($replyTo[$i], $replyToName[$i]) === false)
+				{
+					return false;
+				}
+			}
+		}
+		elseif (isset($replyTo))
+		{
+			if ($this->addReplyTo($replyTo, $replyToName) === false)
+			{
+				return false;
+			}
+		}
+		elseif ($config->get('replyto'))
+		{
+			$this->addReplyTo($config->get('replyto'), $config->get('replytoname'));
+		}
+
+		// Add sender to replyTo only if no replyTo received
+		$autoReplyTo = (empty($this->ReplyTo)) ? true : false;
+
+		if ($this->setSender(array($from, $fromName, $autoReplyTo)) === false)
+		{
+			return false;
+		}
+
+		return $this->Send();
+	}
+
+	/**
+	 * Sends mail to administrator for approval of a user submission
+	 *
+	 * @param   string  $adminName   Name of administrator
+	 * @param   string  $adminEmail  Email address of administrator
+	 * @param   string  $email       [NOT USED TODO: Deprecate?]
+	 * @param   string  $type        Type of item to approve
+	 * @param   string  $title       Title of item to approve
+	 * @param   string  $author      Author of item to approve
+	 * @param   string  $url         A URL to included in the mail
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0  Without replacement please implement it in your own code
+	 */
+	public function sendAdminMail($adminName, $adminEmail, $email, $type, $title, $author, $url = null)
+	{
+		$subject = \JText::sprintf('JLIB_MAIL_USER_SUBMITTED', $type);
+
+		$message = sprintf(\JText::_('JLIB_MAIL_MSG_ADMIN'), $adminName, $type, $title, $author, $url, $url, 'administrator', $type);
+		$message .= \JText::_('JLIB_MAIL_MSG') . "\n";
+
+		if ($this->addRecipient($adminEmail) === false)
+		{
+			return false;
+		}
+
+		$this->setSubject($subject);
+		$this->setBody($message);
+
+		return $this->Send();
+	}
+}
diff --git a/core/libraries/src/Mail/MailHelper.php b/core/libraries/src/Mail/MailHelper.php
new file mode 100644
index 00000000..041819bc
--- /dev/null
+++ b/core/libraries/src/Mail/MailHelper.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Mail;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Email helper class, provides static methods to perform various tasks relevant
+ * to the Joomla email routines.
+ *
+ * TODO: Test these methods as the regex work is first run and not tested thoroughly
+ *
+ * @since  11.1
+ */
+abstract class MailHelper
+{
+	/**
+	 * Cleans single line inputs.
+	 *
+	 * @param   string  $value  String to be cleaned.
+	 *
+	 * @return  string  Cleaned string.
+	 *
+	 * @since   11.1
+	 */
+	public static function cleanLine($value)
+	{
+		$value = \JStringPunycode::emailToPunycode($value);
+
+		return trim(preg_replace('/(%0A|%0D|\n+|\r+)/i', '', $value));
+	}
+
+	/**
+	 * Cleans multi-line inputs.
+	 *
+	 * @param   string  $value  Multi-line string to be cleaned.
+	 *
+	 * @return  string  Cleaned multi-line string.
+	 *
+	 * @since   11.1
+	 */
+	public static function cleanText($value)
+	{
+		return trim(preg_replace('/(%0A|%0D|\n+|\r+)(content-type:|to:|cc:|bcc:)/i', '', $value));
+	}
+
+	/**
+	 * Cleans any injected headers from the email body.
+	 *
+	 * @param   string  $body  email body string.
+	 *
+	 * @return  string  Cleaned email body string.
+	 *
+	 * @since   11.1
+	 */
+	public static function cleanBody($body)
+	{
+		// Strip all email headers from a string
+		return preg_replace("/((From:|To:|Cc:|Bcc:|Subject:|Content-type:) ([\S]+))/", '', $body);
+	}
+
+	/**
+	 * Cleans any injected headers from the subject string.
+	 *
+	 * @param   string  $subject  email subject string.
+	 *
+	 * @return  string  Cleaned email subject string.
+	 *
+	 * @since   11.1
+	 */
+	public static function cleanSubject($subject)
+	{
+		return preg_replace("/((From:|To:|Cc:|Bcc:|Content-type:) ([\S]+))/", '', $subject);
+	}
+
+	/**
+	 * Verifies that an email address does not have any extra headers injected into it.
+	 *
+	 * @param   string  $address  email address.
+	 *
+	 * @return  mixed   email address string or boolean false if injected headers are present.
+	 *
+	 * @since   11.1
+	 */
+	public static function cleanAddress($address)
+	{
+		if (preg_match("[\s;,]", $address))
+		{
+			return false;
+		}
+
+		return $address;
+	}
+
+	/**
+	 * Verifies that the string is in a proper email address format.
+	 *
+	 * @param   string  $email  String to be verified.
+	 *
+	 * @return  boolean  True if string has the correct format; false otherwise.
+	 *
+	 * @since   11.1
+	 */
+	public static function isEmailAddress($email)
+	{
+		// Split the email into a local and domain
+		$atIndex = strrpos($email, '@');
+		$domain = substr($email, $atIndex + 1);
+		$local = substr($email, 0, $atIndex);
+
+		// Check Length of domain
+		$domainLen = strlen($domain);
+
+		if ($domainLen < 1 || $domainLen > 255)
+		{
+			return false;
+		}
+
+		/*
+		 * Check the local address
+		 * We're a bit more conservative about what constitutes a "legal" address, that is, a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-
+		 * The first and last character in local cannot be a period ('.')
+		 * Also, period should not appear 2 or more times consecutively
+		 */
+		$allowed = "a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-";
+		$regex = "/^[$allowed][\.$allowed]{0,63}$/";
+
+		if (!preg_match($regex, $local) || substr($local, -1) == '.' || $local[0] == '.' || preg_match('/\.\./', $local))
+		{
+			return false;
+		}
+
+		// No problem if the domain looks like an IP address, ish
+		$regex = '/^[0-9\.]+$/';
+
+		if (preg_match($regex, $domain))
+		{
+			return true;
+		}
+
+		// Check Lengths
+		$localLen = strlen($local);
+
+		if ($localLen < 1 || $localLen > 64)
+		{
+			return false;
+		}
+
+		// Check the domain
+		$domain_array = explode('.', $domain);
+		$regex = '/^[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/';
+
+		foreach ($domain_array as $domain)
+		{
+			// Convert domain to punycode
+			$domain = \JStringPunycode::toPunycode($domain);
+
+			// Must be something
+			if (!$domain)
+			{
+				return false;
+			}
+
+			// Check for invalid characters
+			if (!preg_match($regex, $domain))
+			{
+				return false;
+			}
+
+			// Check for a dash at the beginning of the domain
+			if (strpos($domain, '-') === 0)
+			{
+				return false;
+			}
+
+			// Check for a dash at the end of the domain
+			$length = strlen($domain) - 1;
+
+			if (strpos($domain, '-', $length) === $length)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Mail/MailWrapper.php b/core/libraries/src/Mail/MailWrapper.php
new file mode 100644
index 00000000..ac0ba204
--- /dev/null
+++ b/core/libraries/src/Mail/MailWrapper.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Mail;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for MailHelper
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Mail
+ * @since       3.4
+ * @deprecated  4.0 Will be removed without replacement
+ */
+class MailWrapper
+{
+	/**
+	 * Helper wrapper method for cleanLine
+	 *
+	 * @param   string  $value  String to be cleaned.
+	 *
+	 * @return  string  Cleaned string.
+	 *
+	 * @see     MailHelper::cleanLine()
+	 * @since   3.4
+	 */
+	public function cleanLine($value)
+	{
+		return MailHelper::cleanLine($value);
+	}
+
+	/**
+	 * Helper wrapper method for cleanText
+	 *
+	 * @param   string  $value  Multi-line string to be cleaned.
+	 *
+	 * @return  string  Cleaned multi-line string.
+	 *
+	 * @see     MailHelper::cleanText()
+	 * @since   3.4
+	 */
+	public function cleanText($value)
+	{
+		return MailHelper::cleanText($value);
+	}
+
+	/**
+	 * Helper wrapper method for cleanBody
+	 *
+	 * @param   string  $body  email body string.
+	 *
+	 * @return  string  Cleaned email body string.
+	 *
+	 * @see     MailHelper::cleanBody()
+	 * @since   3.4
+	 */
+	public function cleanBody($body)
+	{
+		return MailHelper::cleanBody($body);
+	}
+
+	/**
+	 * Helper wrapper method for cleanSubject
+	 *
+	 * @param   string  $subject  email subject string.
+	 *
+	 * @return  string  Cleaned email subject string.
+	 *
+	 * @see     MailHelper::cleanSubject()
+	 * @since   3.4
+	 */
+	public function cleanSubject($subject)
+	{
+		return MailHelper::cleanSubject($subject);
+	}
+
+	/**
+	 * Helper wrapper method for cleanAddress
+	 *
+	 * @param   string  $address  email address.
+	 *
+	 * @return  mixed   email address string or boolean false if injected headers are present
+	 *
+	 * @see     MailHelper::cleanAddress()
+	 * @since   3.4
+	 */
+	public function cleanAddress($address)
+	{
+		return MailHelper::cleanAddress($address);
+	}
+
+	/**
+	 * Helper wrapper method for isEmailAddress
+	 *
+	 * @param   string  $email  String to be verified.
+	 *
+	 * @return boolean  True if string has the correct format; false otherwise.
+	 *
+	 * @see     MailHelper::isEmailAddress()
+	 * @since   3.4
+	 */
+	public function isEmailAddress($email)
+	{
+		return MailHelper::isEmailAddress($email);
+	}
+}
diff --git a/core/libraries/src/Mail/language/phpmailer.lang-en_gb.php b/core/libraries/src/Mail/language/phpmailer.lang-en_gb.php
new file mode 100644
index 00000000..4aa3ff93
--- /dev/null
+++ b/core/libraries/src/Mail/language/phpmailer.lang-en_gb.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Mail
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+$PHPMAILER_LANG['authenticate']         = JText::_('PHPMAILER_AUTHENTICATE');
+$PHPMAILER_LANG['connect_host']         = JText::_('PHPMAILER_CONNECT_HOST');
+$PHPMAILER_LANG['data_not_accepted']    = JText::_('PHPMAILER_DATA_NOT_ACCEPTED');
+$PHPMAILER_LANG['empty_message']        = JText::_('PHPMAILER_EMPTY_MESSAGE');
+$PHPMAILER_LANG['encoding']             = JText::_('PHPMAILER_ENCODING');
+$PHPMAILER_LANG['execute']              = JText::_('PHPMAILER_EXECUTE');
+$PHPMAILER_LANG['file_access']          = JText::_('PHPMAILER_FILE_ACCESS');
+$PHPMAILER_LANG['file_open']            = JText::_('PHPMAILER_FILE_OPEN');
+$PHPMAILER_LANG['from_failed']          = JText::_('PHPMAILER_FROM_FAILED');
+$PHPMAILER_LANG['instantiate']          = JText::_('PHPMAILER_INSTANTIATE');
+$PHPMAILER_LANG['invalid_address']      = JText::_('PHPMAILER_INVALID_ADDRESS');
+$PHPMAILER_LANG['mailer_not_supported'] = JText::_('PHPMAILER_MAILER_IS_NOT_SUPPORTED');
+$PHPMAILER_LANG['provide_address']      = JText::_('PHPMAILER_PROVIDE_ADDRESS');
+$PHPMAILER_LANG['recipients_failed']    = JText::_('PHPMAILER_RECIPIENTS_FAILED');
+$PHPMAILER_LANG['signing']              = JText::_('PHPMAILER_SIGNING_ERROR');
+$PHPMAILER_LANG['smtp_connect_failed']  = JText::_('PHPMAILER_SMTP_CONNECT_FAILED');
+$PHPMAILER_LANG['smtp_error']           = JText::_('PHPMAILER_SMTP_ERROR');
+$PHPMAILER_LANG['variable_set']         = JText::_('PHPMAILER_VARIABLE_SET');
+$PHPMAILER_LANG['extension_missing']    = JText::_('PHPMAILER_EXTENSION_MISSING');
diff --git a/core/libraries/src/Menu/AbstractMenu.php b/core/libraries/src/Menu/AbstractMenu.php
new file mode 100644
index 00000000..577cdd5e
--- /dev/null
+++ b/core/libraries/src/Menu/AbstractMenu.php
@@ -0,0 +1,367 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Menu class
+ *
+ * @since  1.5
+ * @note   Will become abstract in Joomla 4
+ */
+class AbstractMenu
+{
+	/**
+	 * Array to hold the menu items
+	 *
+	 * @var    MenuItem[]
+	 * @since  1.5
+	 * @deprecated  4.0  Will convert to $items
+	 */
+	protected $_items = array();
+
+	/**
+	 * Identifier of the default menu item
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 * @deprecated  4.0  Will convert to $default
+	 */
+	protected $_default = array();
+
+	/**
+	 * Identifier of the active menu item
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 * @deprecated  4.0  Will convert to $active
+	 */
+	protected $_active = 0;
+
+	/**
+	 * Menu instances container.
+	 *
+	 * @var    AbstractMenu[]
+	 * @since  1.7
+	 */
+	protected static $instances = array();
+
+	/**
+	 * User object to check access levels for
+	 *
+	 * @var    \JUser
+	 * @since  3.5
+	 */
+	protected $user;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  An array of configuration options.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($options = array())
+	{
+		// Load the menu items
+		$this->load();
+
+		foreach ($this->_items as $item)
+		{
+			if ($item->home)
+			{
+				$this->_default[trim($item->language)] = $item->id;
+			}
+		}
+
+		$this->user = isset($options['user']) && $options['user'] instanceof \JUser ? $options['user'] : \JFactory::getUser();
+	}
+
+	/**
+	 * Returns a Menu object
+	 *
+	 * @param   string  $client   The name of the client
+	 * @param   array   $options  An associative array of options
+	 *
+	 * @return  AbstractMenu  A menu object.
+	 *
+	 * @since   1.5
+	 * @throws  \Exception
+	 */
+	public static function getInstance($client, $options = array())
+	{
+		if (empty(self::$instances[$client]))
+		{
+			// Create a Menu object
+			$classname = 'JMenu' . ucfirst($client);
+
+			if (!class_exists($classname))
+			{
+				// @deprecated 4.0 Everything in this block is deprecated but the warning is only logged after the file_exists
+				// Load the menu object
+				$info = \JApplicationHelper::getClientInfo($client, true);
+
+				if (is_object($info))
+				{
+					$path = $info->path . '/includes/menu.php';
+
+					\JLoader::register($classname, $path);
+
+					if (class_exists($classname))
+					{
+						\JLog::add('Non-autoloadable Menu subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
+					}
+				}
+			}
+
+			if (!class_exists($classname))
+			{
+				throw new \Exception(\JText::sprintf('JLIB_APPLICATION_ERROR_MENU_LOAD', $client), 500);
+			}
+
+			self::$instances[$client] = new $classname($options);
+		}
+
+		return self::$instances[$client];
+	}
+
+	/**
+	 * Get menu item by id
+	 *
+	 * @param   integer  $id  The item id
+	 *
+	 * @return  MenuItem|null  The item object if the ID exists or null if not found
+	 *
+	 * @since   1.5
+	 */
+	public function getItem($id)
+	{
+		$result = null;
+
+		if (isset($this->_items[$id]))
+		{
+			$result = &$this->_items[$id];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Set the default item by id and language code.
+	 *
+	 * @param   integer  $id        The menu item id.
+	 * @param   string   $language  The language code (since 1.6).
+	 *
+	 * @return  boolean  True if a menu item with the given ID exists
+	 *
+	 * @since   1.5
+	 */
+	public function setDefault($id, $language = '*')
+	{
+		if (isset($this->_items[$id]))
+		{
+			$this->_default[$language] = $id;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the default item by language code.
+	 *
+	 * @param   string  $language  The language code, default value of * means all.
+	 *
+	 * @return  MenuItem|null  The item object or null when not found for given language
+	 *
+	 * @since   1.5
+	 */
+	public function getDefault($language = '*')
+	{
+		if (array_key_exists($language, $this->_default))
+		{
+			return $this->_items[$this->_default[$language]];
+		}
+
+		if (array_key_exists('*', $this->_default))
+		{
+			return $this->_items[$this->_default['*']];
+		}
+
+		return;
+	}
+
+	/**
+	 * Set the default item by id
+	 *
+	 * @param   integer  $id  The item id
+	 *
+	 * @return  MenuItem|null  The menu item representing the given ID if present or null otherwise
+	 *
+	 * @since   1.5
+	 */
+	public function setActive($id)
+	{
+		if (isset($this->_items[$id]))
+		{
+			$this->_active = $id;
+
+			return $this->_items[$id];
+		}
+
+		return;
+	}
+
+	/**
+	 * Get menu item by id.
+	 *
+	 * @return  MenuItem|null  The item object if an active menu item has been set or null
+	 *
+	 * @since   1.5
+	 */
+	public function getActive()
+	{
+		if ($this->_active)
+		{
+			return $this->_items[$this->_active];
+		}
+
+		return;
+	}
+
+	/**
+	 * Gets menu items by attribute
+	 *
+	 * @param   mixed    $attributes  The field name(s).
+	 * @param   mixed    $values      The value(s) of the field. If an array, need to match field names
+	 *                                each attribute may have multiple values to lookup for.
+	 * @param   boolean  $firstonly   If true, only returns the first item found
+	 *
+	 * @return  MenuItem|MenuItem[]  An array of menu item objects or a single object if the $firstonly parameter is true
+	 *
+	 * @since   1.5
+	 */
+	public function getItems($attributes, $values, $firstonly = false)
+	{
+		$items = array();
+		$attributes = (array) $attributes;
+		$values = (array) $values;
+		$count = count($attributes);
+
+		foreach ($this->_items as $item)
+		{
+			if (!is_object($item))
+			{
+				continue;
+			}
+
+			$test = true;
+
+			for ($i = 0; $i < $count; $i++)
+			{
+				if (is_array($values[$i]))
+				{
+					if (!in_array($item->{$attributes[$i]}, $values[$i]))
+					{
+						$test = false;
+						break;
+					}
+				}
+				else
+				{
+					if ($item->{$attributes[$i]} != $values[$i])
+					{
+						$test = false;
+						break;
+					}
+				}
+			}
+
+			if ($test)
+			{
+				if ($firstonly)
+				{
+					return $item;
+				}
+
+				$items[] = $item;
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Gets the parameter object for a certain menu item
+	 *
+	 * @param   integer  $id  The item id
+	 *
+	 * @return  Registry
+	 *
+	 * @since   1.5
+	 */
+	public function getParams($id)
+	{
+		if ($menu = $this->getItem($id))
+		{
+			return $menu->params;
+		}
+
+		return new Registry;
+	}
+
+	/**
+	 * Getter for the menu array
+	 *
+	 * @return  MenuItem[]
+	 *
+	 * @since   1.5
+	 */
+	public function getMenu()
+	{
+		return $this->_items;
+	}
+
+	/**
+	 * Method to check Menu object authorization against an access control object and optionally an access extension object
+	 *
+	 * @param   integer  $id  The menu id
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function authorise($id)
+	{
+		$menu = $this->getItem($id);
+
+		if ($menu)
+		{
+			return in_array((int) $menu->access, $this->user->getAuthorisedViewLevels());
+		}
+
+		return true;
+	}
+
+	/**
+	 * Loads the menu items
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function load()
+	{
+		return array();
+	}
+}
diff --git a/core/libraries/src/Menu/AdministratorMenu.php b/core/libraries/src/Menu/AdministratorMenu.php
new file mode 100644
index 00000000..17cac565
--- /dev/null
+++ b/core/libraries/src/Menu/AdministratorMenu.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Menu class.
+ *
+ * @since  1.5
+ */
+class AdministratorMenu extends AbstractMenu
+{
+}
diff --git a/core/libraries/src/Menu/MenuHelper.php b/core/libraries/src/Menu/MenuHelper.php
new file mode 100644
index 00000000..eafce772
--- /dev/null
+++ b/core/libraries/src/Menu/MenuHelper.php
@@ -0,0 +1,388 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Menu Helper utility
+ *
+ * @since  3.8.0
+ */
+class MenuHelper
+{
+	/**
+	 * List of preset include paths
+	 *
+	 * @var  array
+	 *
+	 * @since   3.8.0
+	 */
+	protected static $presets = null;
+
+	/**
+	 * Private constructor
+	 *
+	 * @since   3.8.0
+	 */
+	private function __construct()
+	{
+	}
+
+	/**
+	 * Add a custom preset externally via plugin or any other means.
+	 * WARNING: Presets with same name will replace previously added preset *except* Joomla's default preset (joomla)
+	 *
+	 * @param   string  $name     The unique identifier for the preset.
+	 * @param   string  $title    The display label for the preset.
+	 * @param   string  $path     The path to the preset file.
+	 * @param   bool    $replace  Whether to replace the preset with the same name if any (except 'joomla').
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public static function addPreset($name, $title, $path, $replace = true)
+	{
+		if (static::$presets === null)
+		{
+			static::getPresets();
+		}
+
+		if ($name == 'joomla')
+		{
+			$replace = false;
+		}
+
+		if (($replace || !array_key_exists($name, static::$presets)) && is_file($path))
+		{
+			$preset = new \stdClass;
+
+			$preset->name  = $name;
+			$preset->title = $title;
+			$preset->path  = $path;
+
+			static::$presets[$name] = $preset;
+		}
+	}
+
+	/**
+	 * Get a list of available presets.
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   3.8.0
+	 */
+	public static function getPresets()
+	{
+		if (static::$presets === null)
+		{
+			// Important: 'null' will cause infinite recursion.
+			static::$presets = array();
+
+			static::addPreset('joomla', 'JLIB_MENUS_PRESET_JOOMLA', JPATH_ADMINISTRATOR . '/components/com_menus/presets/joomla.xml');
+			static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml');
+
+			// Load from template folder automatically
+			$app = \JFactory::getApplication();
+			$tpl = JPATH_THEMES . '/' . $app->getTemplate() . '/html/com_menus/presets';
+
+			if (is_dir($tpl))
+			{
+				jimport('joomla.filesystem.folder');
+
+				$files = \JFolder::files($tpl, '\.xml$');
+
+				foreach ($files as $file)
+				{
+					$name  = substr($file, 0, -4);
+					$title = str_replace('-', ' ', $name);
+
+					static::addPreset(strtolower($name), ucwords($title), $tpl . '/' . $file);
+				}
+			}
+		}
+
+		return static::$presets;
+	}
+
+	/**
+	 * Load the menu items from a preset file into a hierarchical list of objects
+	 *
+	 * @param   string  $name      The preset name
+	 * @param   bool    $fallback  Fallback to default (joomla) preset if the specified one could not be loaded?
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   3.8.0
+	 */
+	public static function loadPreset($name, $fallback = true)
+	{
+		$items   = array();
+		$presets = static::getPresets();
+
+		if (isset($presets[$name]) && ($xml = simplexml_load_file($presets[$name]->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
+		{
+			static::loadXml($xml, $items);
+		}
+		elseif ($fallback && isset($presets['joomla']))
+		{
+			if (($xml = simplexml_load_file($presets['joomla']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
+			{
+				static::loadXml($xml, $items);
+			}
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to resolve the menu item alias type menu item
+	 *
+	 * @param   \stdClass  &$item  The alias object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public static function resolveAlias(&$item)
+	{
+		$obj = $item;
+
+		while ($obj->type == 'alias')
+		{
+			$params  = new Registry($obj->params);
+			$aliasTo = $params->get('aliasoptions');
+
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('a.id, a.link, a.type, e.element')
+				->from('#__menu a')
+				->where('a.id = ' . (int) $aliasTo)
+				->join('left', '#__extensions e ON e.id = a.component_id = e.id');
+
+			try
+			{
+				$obj = $db->setQuery($query)->loadObject();
+
+				if (!$obj)
+				{
+					$item->link = '';
+
+					return;
+				}
+			}
+			catch (\Exception $e)
+			{
+				$item->link = '';
+
+				return;
+			}
+		}
+
+		$item->id      = $obj->id;
+		$item->link    = $obj->link;
+		$item->type    = $obj->type;
+		$item->element = $obj->element;
+	}
+
+	/**
+	 * Parse the flat list of menu items and prepare the hierarchy of them using parent-child relationship.
+	 *
+	 * @param   \stdClass[]  $menuItems  List of menu items loaded from database
+	 *
+	 * @return  \stdClass[]
+	 *
+	 * @since   3.8.0
+	 */
+	public static function createLevels($menuItems)
+	{
+		$result    = array();
+		$result[1] = array();
+
+		foreach ($menuItems as $i => &$item)
+		{
+			// Resolve the alias item to get the original item
+			if ($item->type == 'alias')
+			{
+				static::resolveAlias($item);
+			}
+
+			if ($item->link = in_array($item->type, array('separator', 'heading', 'container')) ? '#' : trim($item->link))
+			{
+				$item->submenu    = array();
+				$item->class      = isset($item->img) ? $item->img : '';
+				$item->scope      = isset($item->scope) ? $item->scope : null;
+				$item->browserNav = $item->browserNav ? '_blank' : '';
+
+				$result[$item->parent_id][$item->id] = $item;
+			}
+		}
+
+		// Move each of the items under respective parent menu items.
+		if (count($result[1]))
+		{
+			foreach ($result as $parentId => &$mItems)
+			{
+				foreach ($mItems as &$mItem)
+				{
+					if (isset($result[$mItem->id]))
+					{
+						$mItem->submenu = &$result[$mItem->id];
+					}
+				}
+			}
+		}
+
+		// Return only top level items, subtree follows
+		return $result[1];
+	}
+
+	/**
+	 * Load a menu tree from an XML file
+	 *
+	 * @param   \SimpleXMLElement[]  $elements  The xml menuitem nodes
+	 * @param   \stdClass[]          &$items    The menu hierarchy list to be populated
+	 * @param   string[]             $replace   The substring replacements for iterator type items
+	 *
+	 * @return  void
+	 *
+	 * @since  3.8.0
+	 */
+	protected static function loadXml($elements, &$items, $replace = array())
+	{
+		foreach ($elements as $element)
+		{
+			if ($element->getName() != 'menuitem')
+			{
+				continue;
+			}
+
+			$select = (string) $element['sql_select'];
+			$from   = (string) $element['sql_from'];
+
+			/**
+			 * Following is a repeatable group based on simple database query. This requires sql_* attributes (sql_select and sql_from are required)
+			 * The values can be used like - "{sql:columnName}" in any attribute of repeated elements.
+			 * The repeated elements are place inside this xml node but they will be populated in the same level in the rendered menu
+			 */
+			if ($select && $from)
+			{
+				$hidden = $element['hidden'] == 'true';
+				$where  = (string) $element['sql_where'];
+				$order  = (string) $element['sql_order'];
+				$group  = (string) $element['sql_group'];
+				$lJoin  = (string) $element['sql_leftjoin'];
+				$iJoin  = (string) $element['sql_innerjoin'];
+
+				$db    = \JFactory::getDbo();
+				$query = $db->getQuery(true);
+				$query->select($select)->from($from);
+
+				if ($where)
+				{
+					$query->where($where);
+				}
+
+				if ($order)
+				{
+					$query->order($order);
+				}
+
+				if ($group)
+				{
+					$query->group($group);
+				}
+
+				if ($lJoin)
+				{
+					$query->leftJoin($lJoin);
+				}
+
+				if ($iJoin)
+				{
+					$query->innerJoin($iJoin);
+				}
+
+				$results = $db->setQuery($query)->loadObjectList();
+
+				// Skip the entire group if no items to iterate over.
+				if ($results)
+				{
+					// Show the repeatable group heading node only if not set as hidden.
+					if (!$hidden)
+					{
+						$items[] = static::parseXmlNode($element, $replace);
+					}
+
+					// Iterate over the matching records, items goes in the same level (not $item->submenu) as this node.
+					foreach ($results as $result)
+					{
+						static::loadXml($element->menuitem, $items, $result);
+					}
+				}
+			}
+			else
+			{
+				$item = static::parseXmlNode($element, $replace);
+
+				// Process the child nodes
+				static::loadXml($element->menuitem, $item->submenu, $replace);
+
+				$items[] = $item;
+			}
+		}
+	}
+
+	/**
+	 * Create a menu item node from an xml element
+	 *
+	 * @param   \SimpleXMLElement  $node     A menuitem element from preset xml
+	 * @param   string[]           $replace  The values to substitute in the title, link and element texts
+	 *
+	 * @return  \stdClass
+	 *
+	 * @since   3.8.0
+	 */
+	protected static function parseXmlNode($node, $replace = array())
+	{
+		$item = new \stdClass;
+
+		$item->id         = null;
+		$item->type       = (string) $node['type'];
+		$item->title      = (string) $node['title'];
+		$item->link       = (string) $node['link'];
+		$item->element    = (string) $node['element'];
+		$item->class      = (string) $node['class'];
+		$item->icon       = (string) $node['icon'];
+		$item->browserNav = (string) $node['target'];
+		$item->access     = (int) $node['access'];
+		$item->params     = new Registry(trim($node->params));
+		$item->scope      = (string) $node['scope'] ?: 'default';
+		$item->submenu    = array();
+
+		if ($item->type == 'separator' && trim($item->title, '- '))
+		{
+			$item->params->set('text_separator', 1);
+		}
+
+		// Translate attributes for iterator values
+		foreach ($replace as $var => $val)
+		{
+			$item->title   = str_replace("{sql:$var}", $val, $item->title);
+			$item->element = str_replace("{sql:$var}", $val, $item->element);
+			$item->link    = str_replace("{sql:$var}", $val, $item->link);
+			$item->class   = str_replace("{sql:$var}", $val, $item->class);
+			$item->icon    = str_replace("{sql:$var}", $val, $item->icon);
+		}
+
+		return $item;
+	}
+}
diff --git a/core/libraries/src/Menu/MenuItem.php b/core/libraries/src/Menu/MenuItem.php
new file mode 100644
index 00000000..6dc55cf7
--- /dev/null
+++ b/core/libraries/src/Menu/MenuItem.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Object representing a menu item
+ *
+ * @since  3.7.0
+ * @note   This class will no longer extend stdClass in Joomla 4
+ */
+class MenuItem extends \stdClass
+{
+	/**
+	 * Primary key
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $id;
+
+	/**
+	 * The type of menu this item belongs to
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $menutype;
+
+	/**
+	 * The display title of the menu item
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $title;
+
+	/**
+	 * The SEF alias of the menu item
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $alias;
+
+	/**
+	 * A note associated with the menu item
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $note;
+
+	/**
+	 * The computed path of the menu item based on the alias field, this is populated from the `path` field in the `#__menu` table
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $route;
+
+	/**
+	 * The actual link the menu item refers to
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $link;
+
+	/**
+	 * The type of link
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $type;
+
+	/**
+	 * The relative level in the tree
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $level;
+
+	/**
+	 * The assigned language for this item
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $language;
+
+	/**
+	 * The click behaviour of the link
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $browserNav;
+
+	/**
+	 * The access level required to view the menu item
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $access;
+
+	/**
+	 * The menu item parameters
+	 *
+	 * @var    string|Registry
+	 * @since  3.7.0
+	 * @note   This field is protected to require reading this field to proxy through the getter to convert the params to a Registry instance
+	 */
+	protected $params;
+
+	/**
+	 * Indicates if this menu item is the home or default page
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $home;
+
+	/**
+	 * The image of the menu item
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $img;
+
+	/**
+	 * The optional template style applied to this menu item
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $template_style_id;
+
+	/**
+	 * The extension ID of the component this menu item is for
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $component_id;
+
+	/**
+	 * The parent menu item in the menu tree
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	public $parent_id;
+
+	/**
+	 * The name of the component this menu item is for
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	public $component;
+
+	/**
+	 * The tree of parent menu items
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	public $tree = array();
+
+	/**
+	 * An array of the query string values for this item
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	public $query = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $data  The menu item data to load
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct($data = array())
+	{
+		foreach ((array) $data as $key => $value)
+		{
+			$this->$key = $value;
+		}
+	}
+
+	/**
+	 * Method to get certain otherwise inaccessible properties from the form field object.
+	 *
+	 * @param   string  $name  The property name for which to get the value.
+	 *
+	 * @return  mixed  The property value or null.
+	 *
+	 * @since   3.7.0
+	 * @deprecated  4.0  Access the item parameters through the `getParams()` method
+	 */
+	public function __get($name)
+	{
+		if ($name === 'params')
+		{
+			return $this->getParams();
+		}
+
+		return $this->get($name);
+	}
+
+	/**
+	 * Method to set certain otherwise inaccessible properties of the form field object.
+	 *
+	 * @param   string  $name   The property name for which to set the value.
+	 * @param   mixed   $value  The value of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 * @deprecated  4.0  Set the item parameters through the `setParams()` method
+	 */
+	public function __set($name, $value)
+	{
+		if ($name === 'params')
+		{
+			$this->setParams($value);
+
+			return;
+		}
+
+		$this->set($name, $value);
+	}
+
+	/**
+	 * Method check if a certain otherwise inaccessible properties of the form field object is set.
+	 *
+	 * @param   string  $name  The property name to check.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.1
+	 * @deprecated  4.0 Deprecated without replacement
+	 */
+	public function __isset($name)
+	{
+		if ($name === 'params')
+		{
+			return !($this->params instanceof Registry);
+		}
+
+		return $this->get($name) !== null;
+	}
+
+	/**
+	 * Returns the menu item parameters
+	 *
+	 * @return  Registry
+	 *
+	 * @since   3.7.0
+	 */
+	public function getParams()
+	{
+		if (!($this->params instanceof Registry))
+		{
+			try
+			{
+				$this->params = new Registry($this->params);
+			}
+			catch (\RuntimeException $e)
+			{
+				/*
+				 * Joomla shipped with a broken sample json string for 4 years which caused fatals with new
+				 * error checks. So for now we catch the exception here - but one day we should remove it and require
+				 * valid JSON.
+				 */
+				$this->params = new Registry;
+			}
+		}
+
+		return $this->params;
+	}
+
+	/**
+	 * Sets the menu item parameters
+	 *
+	 * @param   Registry|string  $params  The data to be stored as the parameters
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function setParams($params)
+	{
+		$this->params = $params;
+	}
+
+	/**
+	 * Returns a property of the object or the default value if the property is not set.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $default   The default value.
+	 *
+	 * @return  mixed    The value of the property.
+	 *
+	 * @since   3.7.0
+	 * @deprecated  4.0
+	 */
+	public function get($property, $default = null)
+	{
+		if (isset($this->$property))
+		{
+			return $this->$property;
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Modifies a property of the object, creating it if it does not already exist.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value of the property to set.
+	 *
+	 * @return  mixed  Previous value of the property.
+	 *
+	 * @since   3.7.0
+	 * @deprecated  4.0
+	 */
+	public function set($property, $value = null)
+	{
+		$previous = isset($this->$property) ? $this->$property : null;
+		$this->$property = $value;
+
+		return $previous;
+	}
+}
diff --git a/core/libraries/src/Menu/Node.php b/core/libraries/src/Menu/Node.php
new file mode 100644
index 00000000..c1e9a5dc
--- /dev/null
+++ b/core/libraries/src/Menu/Node.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * A Node for MenuTree
+ *
+ * @see    Tree
+ *
+ * @since  3.8.0
+ */
+class Node
+{
+	/**
+	 * Node Id
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $id = null;
+
+	/**
+	 * CSS Class for node
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $class = null;
+
+	/**
+	 * Whether this node is active
+	 *
+	 * @var  bool
+	 *
+	 * @since   3.8.0
+	 */
+	protected $active = false;
+
+	/**
+	 * Additional custom node params
+	 *
+	 * @var  Registry
+	 *
+	 * @since   3.8.0
+	 */
+	protected $params;
+
+	/**
+	 * Parent node object
+	 *
+	 * @var  Node
+	 *
+	 * @since   3.8.0
+	 */
+	protected $parent = null;
+
+	/**
+	 * Array of Children node objects
+	 *
+	 * @var  Node[]
+	 *
+	 * @since   3.8.0
+	 */
+	protected $children = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct()
+	{
+		$this->params = new Registry;
+	}
+
+	/**
+	 * Add child to this node
+	 *
+	 * If the child already has a parent, the link is unset
+	 *
+	 * @param   Node  $child  The child to be added
+	 *
+	 * @return  Node  The new added child
+	 *
+	 * @since   3.8.0
+	 */
+	public function addChild(Node $child)
+	{
+		$hash = spl_object_hash($child);
+
+		if (isset($child->parent))
+		{
+			$child->parent->removeChild($child);
+		}
+
+		$child->parent         = $this;
+		$this->children[$hash] = $child;
+
+		return $child;
+	}
+
+	/**
+	 * Remove a child from this node
+	 *
+	 * If the child exists it is unset
+	 *
+	 * @param   Node  $child  The child to be added
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function removeChild(Node $child)
+	{
+		$hash = spl_object_hash($child);
+
+		if (isset($this->children[$hash]))
+		{
+			$child->parent = null;
+
+			unset($this->children[$hash]);
+		}
+	}
+
+	/**
+	 * Test if this node has a parent
+	 *
+	 * @return  boolean  True if there is a parent
+	 *
+	 * @since   3.8.0
+	 */
+	public function hasParent()
+	{
+		return isset($this->parent);
+	}
+
+	/**
+	 * Get the parent of this node
+	 *
+	 * @return  Node  The Node object's parent or null for no parent
+	 *
+	 * @since   3.8.0
+	 */
+	public function getParent()
+	{
+		return $this->parent;
+	}
+
+	/**
+	 * Test if this node has children
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.8.0
+	 */
+	public function hasChildren()
+	{
+		return count($this->children) > 0;
+	}
+
+	/**
+	 * Get the children of this node
+	 *
+	 * @return  Node[]  The children
+	 *
+	 * @since   3.8.0
+	 */
+	public function getChildren()
+	{
+		return $this->children;
+	}
+
+	/**
+	 * Find the current node depth in the tree hierarchy
+	 *
+	 * @return  integer  The node level in the hierarchy, where ROOT == 0, First level menu item == 1, and so on.
+	 *
+	 * @since   3.8.0
+	 */
+	public function getLevel()
+	{
+		return $this->hasParent() ? $this->getParent()->getLevel() + 1 : 0;
+	}
+
+	/**
+	 * Check whether the object instance node is the root node
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.8.0
+	 */
+	public function isRoot()
+	{
+		return !$this->hasParent();
+	}
+
+	/**
+	 * Set the active state on or off
+	 *
+	 * @param   bool  $active  The new active state
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function setActive($active)
+	{
+		$this->active = (bool) $active;
+	}
+
+	/**
+	 * set the params array
+	 *
+	 * @param   Registry  $params  The params attributes
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function setParams(Registry $params)
+	{
+		$this->params = $params;
+	}
+
+	/**
+	 * Get the param value from the node params
+	 *
+	 * @param   string  $key  The param name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.8.0
+	 */
+	public function getParam($key)
+	{
+		return isset($this->params[$key]) ? $this->params[$key] : null;
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.8.0
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'id':
+			case 'class':
+			case 'active':
+			case 'params':
+				return $this->$name;
+		}
+
+		return null;
+	}
+}
diff --git a/core/libraries/src/Menu/Node/Component.php b/core/libraries/src/Menu/Node/Component.php
new file mode 100644
index 00000000..dd49bbb1
--- /dev/null
+++ b/core/libraries/src/Menu/Node/Component.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * A Component type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  3.8.0
+ */
+class Component extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $title = null;
+
+	/**
+	 * The component name for this node link
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $element = null;
+
+	/**
+	 * Node Link
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $link = null;
+
+	/**
+	 * Link Target
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $target = null;
+
+	/**
+	 * Link title icon
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $icon = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title    The title of the node
+	 * @param   string  $element  The component name
+	 * @param   string  $link     The node link
+	 * @param   string  $target   The link target
+	 * @param   string  $class    The CSS class for the node
+	 * @param   string  $id       The node id
+	 * @param   string  $icon     The title icon for the node
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct($title, $element, $link, $target = null, $class = null, $id = null, $icon = null)
+	{
+		$this->title   = $title;
+		$this->element = $element;
+		$this->link    = $link ? \JFilterOutput::ampReplace($link) : 'index.php?option=' . $element;
+		$this->target  = $target;
+		$this->class   = $class;
+		$this->id      = $id;
+		$this->icon    = $icon;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.8.0
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+			case 'element':
+			case 'link':
+			case 'target':
+			case 'icon':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/core/libraries/src/Menu/Node/Container.php b/core/libraries/src/Menu/Node/Container.php
new file mode 100644
index 00000000..506fa504
--- /dev/null
+++ b/core/libraries/src/Menu/Node/Container.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * A Container type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  3.8.0
+ */
+class Container extends Heading
+{
+}
diff --git a/core/libraries/src/Menu/Node/Heading.php b/core/libraries/src/Menu/Node/Heading.php
new file mode 100644
index 00000000..2010c48c
--- /dev/null
+++ b/core/libraries/src/Menu/Node/Heading.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * A Heading type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  3.8.0
+ */
+class Heading extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $title = null;
+
+	/**
+	 * Node Link
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $link = '#';
+
+	/**
+	 * Link title icon
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $icon = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title  The title of the node
+	 * @param   string  $class  The CSS class for the node
+	 * @param   string  $id     The node id
+	 * @param   string  $icon   The title icon for the node
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct($title, $class = null, $id = null, $icon = null)
+	{
+		$this->title = $title;
+		$this->class = $class;
+		$this->id    = $id;
+		$this->icon  = $icon;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.8.0
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+			case 'link':
+			case 'icon':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/core/libraries/src/Menu/Node/Separator.php b/core/libraries/src/Menu/Node/Separator.php
new file mode 100644
index 00000000..c5eb1f44
--- /dev/null
+++ b/core/libraries/src/Menu/Node/Separator.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * A Separator type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  3.8.0
+ */
+class Separator extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $title = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title  The title of the node
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct($title = null)
+	{
+		$this->title = trim($title, '- ') ? $title : null;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.8.0
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/core/libraries/src/Menu/Node/Url.php b/core/libraries/src/Menu/Node/Url.php
new file mode 100644
index 00000000..249159eb
--- /dev/null
+++ b/core/libraries/src/Menu/Node/Url.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu\Node;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Menu\Node;
+
+/**
+ * An external Url type of node for MenuTree
+ *
+ * @see    Node
+ *
+ * @since  3.8.0
+ */
+class Url extends Node
+{
+	/**
+	 * Node Title
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $title = null;
+
+	/**
+	 * Node Link
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $link = null;
+
+	/**
+	 * Link Target
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $target = null;
+
+	/**
+	 * Link title icon
+	 *
+	 * @var  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected $icon = null;
+
+	/**
+	 * Constructor for the class.
+	 *
+	 * @param   string  $title   The title of the node
+	 * @param   string  $link    The node link
+	 * @param   string  $target  The link target
+	 * @param   string  $class   The CSS class for the node
+	 * @param   string  $id      The node id
+	 * @param   string  $icon    The title icon for the node
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct($title, $link, $target = null, $class = null, $id = null, $icon = null)
+	{
+		$this->title  = $title;
+		$this->link   =	\JFilterOutput::ampReplace($link);
+		$this->target = $target;
+		$this->class  = $class;
+		$this->id     = $id;
+		$this->icon   = $icon;
+
+		parent::__construct();
+	}
+
+	/**
+	 * Get an attribute value
+	 *
+	 * @param   string  $name  The attribute name
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.8.0
+	 */
+	public function get($name)
+	{
+		switch ($name)
+		{
+			case 'title':
+			case 'link':
+			case 'target':
+			case 'icon':
+				return $this->$name;
+		}
+
+		return parent::get($name);
+	}
+}
diff --git a/core/libraries/src/Menu/SiteMenu.php b/core/libraries/src/Menu/SiteMenu.php
new file mode 100644
index 00000000..40098262
--- /dev/null
+++ b/core/libraries/src/Menu/SiteMenu.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\Multilanguage;
+
+/**
+ * Menu class
+ *
+ * @since  1.5
+ */
+class SiteMenu extends AbstractMenu
+{
+	/**
+	 * Application object
+	 *
+	 * @var    CMSApplication
+	 * @since  3.5
+	 */
+	protected $app;
+
+	/**
+	 * Database driver
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  3.5
+	 */
+	protected $db;
+
+	/**
+	 * Language object
+	 *
+	 * @var    Language
+	 * @since  3.5
+	 */
+	protected $language;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  An array of configuration options.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($options = array())
+	{
+		// Extract the internal dependencies before calling the parent constructor since it calls $this->load()
+		$this->app      = isset($options['app']) && $options['app'] instanceof CMSApplication ? $options['app'] : \JFactory::getApplication();
+		$this->db       = isset($options['db']) && $options['db'] instanceof \JDatabaseDriver ? $options['db'] : \JFactory::getDbo();
+		$this->language = isset($options['language']) && $options['language'] instanceof Language ? $options['language'] : \JFactory::getLanguage();
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Loads the entire menu table into memory.
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @since   1.5
+	 */
+	public function load()
+	{
+		// For PHP 5.3 compat we can't use $this in the lambda function below
+		$db = $this->db;
+
+		$loader = function () use ($db)
+		{
+			$query = $db->getQuery(true)
+				->select('m.id, m.menutype, m.title, m.alias, m.note, m.path AS route, m.link, m.type, m.level, m.language')
+				->select($db->quoteName('m.browserNav') . ', m.access, m.params, m.home, m.img, m.template_style_id, m.component_id, m.parent_id')
+				->select('e.element as component')
+				->from('#__menu AS m')
+				->join('LEFT', '#__extensions AS e ON m.component_id = e.extension_id')
+				->where('m.published = 1')
+				->where('m.parent_id > 0')
+				->where('m.client_id = 0')
+				->order('m.lft');
+
+			// Set the query
+			$db->setQuery($query);
+
+			return $db->loadObjectList('id', 'Joomla\\CMS\\Menu\\MenuItem');
+		};
+
+		try
+		{
+			/** @var \JCacheControllerCallback $cache */
+			$cache = \JFactory::getCache('com_menus', 'callback');
+
+			$this->_items = $cache->get($loader, array(), md5(get_class($this)), false);
+		}
+		catch (\JCacheException $e)
+		{
+			try
+			{
+				$this->_items = $loader();
+			}
+			catch (\JDatabaseExceptionExecuting $databaseException)
+			{
+				\JError::raiseWarning(500, \JText::sprintf('JERROR_LOADING_MENUS', $databaseException->getMessage()));
+
+				return false;
+			}
+		}
+		catch (\JDatabaseExceptionExecuting $e)
+		{
+			\JError::raiseWarning(500, \JText::sprintf('JERROR_LOADING_MENUS', $e->getMessage()));
+
+			return false;
+		}
+
+		foreach ($this->_items as &$item)
+		{
+			// Get parent information.
+			$parent_tree = array();
+
+			if (isset($this->_items[$item->parent_id]))
+			{
+				$parent_tree  = $this->_items[$item->parent_id]->tree;
+			}
+
+			// Create tree.
+			$parent_tree[] = $item->id;
+			$item->tree = $parent_tree;
+
+			// Create the query array.
+			$url = str_replace('index.php?', '', $item->link);
+			$url = str_replace('&amp;', '&', $url);
+
+			parse_str($url, $item->query);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets menu items by attribute
+	 *
+	 * @param   string   $attributes  The field name
+	 * @param   string   $values      The value of the field
+	 * @param   boolean  $firstonly   If true, only returns the first item found
+	 *
+	 * @return  MenuItem|MenuItem[]  An array of menu item objects or a single object if the $firstonly parameter is true
+	 *
+	 * @since   1.6
+	 */
+	public function getItems($attributes, $values, $firstonly = false)
+	{
+		$attributes = (array) $attributes;
+		$values     = (array) $values;
+
+		if ($this->app->isClient('site'))
+		{
+			// Filter by language if not set
+			if (($key = array_search('language', $attributes)) === false)
+			{
+				if (Multilanguage::isEnabled())
+				{
+					$attributes[] = 'language';
+					$values[]     = array(\JFactory::getLanguage()->getTag(), '*');
+				}
+			}
+			elseif ($values[$key] === null)
+			{
+				unset($attributes[$key], $values[$key]);
+			}
+
+			// Filter by access level if not set
+			if (($key = array_search('access', $attributes)) === false)
+			{
+				$attributes[] = 'access';
+				$values[] = $this->user->getAuthorisedViewLevels();
+			}
+			elseif ($values[$key] === null)
+			{
+				unset($attributes[$key], $values[$key]);
+			}
+		}
+
+		// Reset arrays or we get a notice if some values were unset
+		$attributes = array_values($attributes);
+		$values = array_values($values);
+
+		return parent::getItems($attributes, $values, $firstonly);
+	}
+
+	/**
+	 * Get menu item by id
+	 *
+	 * @param   string  $language  The language code.
+	 *
+	 * @return  MenuItem|null  The item object or null when not found for given language
+	 *
+	 * @since   1.6
+	 */
+	public function getDefault($language = '*')
+	{
+		if (array_key_exists($language, $this->_default) && $this->app->isClient('site') && $this->app->getLanguageFilter())
+		{
+			return $this->_items[$this->_default[$language]];
+		}
+
+		if (array_key_exists('*', $this->_default))
+		{
+			return $this->_items[$this->_default['*']];
+		}
+
+		return;
+	}
+}
diff --git a/core/libraries/src/Menu/Tree.php b/core/libraries/src/Menu/Tree.php
new file mode 100644
index 00000000..c5f0a7a6
--- /dev/null
+++ b/core/libraries/src/Menu/Tree.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\CMS\Menu;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Menu Tree class to represent a menu tree hierarchy
+ *
+ * @since  3.8.0
+ */
+class Tree
+{
+	/**
+	 * The root menu node
+	 *
+	 * @var  Node
+	 *
+	 * @since   3.8.0
+	 */
+	protected $root = null;
+
+	/**
+	 * The current working menu node
+	 *
+	 * @var  Node
+	 *
+	 * @since   3.8.0
+	 */
+	protected $current = null;
+
+	/**
+	 * The CSS style array
+	 *
+	 * @var  string[]
+	 *
+	 * @since   3.8.0
+	 */
+	protected $css = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct()
+	{
+		$this->root    = new Node;
+		$this->current = $this->root;
+	}
+
+	/**
+	 * Get the root node
+	 *
+	 * @return  Node
+	 *
+	 * @since   3.8.0
+	 */
+	public function getRoot()
+	{
+		return $this->root;
+	}
+
+	/**
+	 * Get the current node
+	 *
+	 * @return  Node
+	 *
+	 * @since   3.8.0
+	 */
+	public function getCurrent()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Get the current node
+	 *
+	 * @param   Node  $node  The node to be set as current
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.0
+	 */
+	public function setCurrent($node)
+	{
+		if ($node)
+		{
+			$this->current = $node;
+		}
+	}
+
+	/**
+	 * Method to get the parent and set it as active optionally
+	 *
+	 * @param   bool  $setCurrent  Set that parent as the current node for further working
+	 *
+	 * @return  Node
+	 *
+	 * @since   3.8.0
+	 */
+	public function getParent($setCurrent = true)
+	{
+		$parent = $this->current->getParent();
+
+		if ($setCurrent)
+		{
+			$this->setCurrent($parent);
+		}
+
+		return $parent;
+	}
+
+	/**
+	 * Method to reset the working pointer to the root node and optionally clear all menu nodes
+	 *
+	 * @param   bool  $clear  Whether to clear the existing menu items or just reset the pointer to root element
+	 *
+	 * @return  Node  The root node
+	 *
+	 * @since   3.8.0
+	 */
+	public function reset($clear = false)
+	{
+		if ($clear)
+		{
+			$this->root = new Node;
+			$this->css  = array();
+		}
+
+		$this->current = $this->root;
+
+		return  $this->current;
+	}
+
+	/**
+	 * Method to add a child
+	 *
+	 * @param   Node  $node        The node to process
+	 * @param   bool  $setCurrent  Set this new child as the current node for further working
+	 *
+	 * @return  Node  The newly added node
+	 *
+	 * @since   3.8.0
+	 */
+	public function addChild(Node $node, $setCurrent = false)
+	{
+		$this->current->addChild($node);
+
+		if ($setCurrent)
+		{
+			$this->setCurrent($node);
+		}
+
+		return $node;
+	}
+
+	/**
+	 * Method to get the CSS class name for an icon identifier or create one if
+	 * a custom image path is passed as the identifier
+	 *
+	 * @return  string	CSS class name
+	 *
+	 * @since   3.8.0
+	 */
+	public function getIconClass()
+	{
+		static $classes = array();
+
+		$identifier = $this->current->get('class');
+
+		// Top level is special
+		if (trim($identifier) == '' || !$this->current->hasParent())
+		{
+			return null;
+		}
+
+		if (!isset($classes[$identifier]))
+		{
+			// We were passed a class name
+			if (substr($identifier, 0, 6) == 'class:')
+			{
+				$class = substr($identifier, 6);
+			}
+			// We were passed background icon url. Build the CSS class for the icon
+			else
+			{
+				$class = preg_replace('#\.[^.]*$#', '', basename($identifier));
+				$class = preg_replace('#\.\.[^A-Za-z0-9\.\_\- ]#', '', $class);
+
+				if ($class)
+				{
+					$this->css[] = ".menu-$class {background: url($identifier) no-repeat;}";
+				}
+			}
+
+			$classes[$identifier] = "menu-$class";
+		}
+
+		return $classes[$identifier];
+	}
+
+	/**
+	 * Get the CSS declarations for this tree
+	 *
+	 * @return  string[]
+	 *
+	 * @since   3.8.0
+	 */
+	public function getCss()
+	{
+		return $this->css;
+	}
+}
diff --git a/core/libraries/src/Microdata/Microdata.php b/core/libraries/src/Microdata/Microdata.php
new file mode 100644
index 00000000..936eb2b6
--- /dev/null
+++ b/core/libraries/src/Microdata/Microdata.php
@@ -0,0 +1,899 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Microdata;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform class for interacting with Microdata semantics.
+ *
+ * @since  3.2
+ */
+class Microdata
+{
+	/**
+	 * Array with all available Types and Properties from the http://schema.org vocabulary
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected static $types = null;
+
+	/**
+	 * The Type
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $type = null;
+
+	/**
+	 * The Property
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $property = null;
+
+	/**
+	 * The Human content
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $content = null;
+
+	/**
+	 * The Machine content
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $machineContent = null;
+
+	/**
+	 * The Fallback Type
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $fallbackType = null;
+
+	/**
+	 * The Fallback Property
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $fallbackProperty = null;
+
+	/**
+	 * Used for checking if the library output is enabled or disabled
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $enabled = true;
+
+	/**
+	 * Initialize the class and setup the default $Type
+	 *
+	 * @param   string   $type  Optional, fallback to 'Thing' Type
+	 * @param   boolean  $flag  Enable or disable the library output
+	 *
+	 * @since   3.2
+	 */
+	public function __construct($type = '', $flag = true)
+	{
+		if ($this->enabled = (boolean) $flag)
+		{
+			// Fallback to 'Thing' Type
+			if (!$type)
+			{
+				$type = 'Thing';
+			}
+
+			$this->setType($type);
+		}
+	}
+
+	/**
+	 * Load all available Types and Properties from the http://schema.org vocabulary contained in the types.json file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected static function loadTypes()
+	{
+		// Load the JSON
+		if (!static::$types)
+		{
+			$path = __DIR__ . '/types.json';
+			static::$types = json_decode(file_get_contents($path), true);
+		}
+	}
+
+	/**
+	 * Reset all params
+	 *
+	 * @return void
+	 *
+	 * @since   3.2
+	 */
+	protected function resetParams()
+	{
+		$this->content          = null;
+		$this->machineContent   = null;
+		$this->property         = null;
+		$this->fallbackProperty = null;
+		$this->fallbackType     = null;
+	}
+
+	/**
+	 * Enable or Disable the library output
+	 *
+	 * @param   boolean  $flag  Enable or disable the library output
+	 *
+	 * @return  Microdata  Instance of $this
+	 *
+	 * @since   3.2
+	 */
+	public function enable($flag = true)
+	{
+		$this->enabled = (boolean) $flag;
+
+		return $this;
+	}
+
+	/**
+	 * Return 'true' if the library output is enabled
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public function isEnabled()
+	{
+		return $this->enabled;
+	}
+
+	/**
+	 * Set a new http://schema.org Type
+	 *
+	 * @param   string  $type  The $Type to be setup
+	 *
+	 * @return  Microdata  Instance of $this
+	 *
+	 * @since   3.2
+	 */
+	public function setType($type)
+	{
+		if (!$this->enabled)
+		{
+			return $this;
+		}
+
+		// Sanitize the Type
+		$this->type = static::sanitizeType($type);
+
+		// If the given $Type isn't available, fallback to 'Thing' Type
+		if (!static::isTypeAvailable($this->type))
+		{
+			$this->type = 'Thing';
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Return the current $Type name
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * Setup a $Property
+	 *
+	 * @param   string  $property  The Property
+	 *
+	 * @return  Microdata  Instance of $this
+	 *
+	 * @since   3.2
+	 */
+	public function property($property)
+	{
+		if (!$this->enabled)
+		{
+			return $this;
+		}
+
+		// Sanitize the $Property
+		$property = static::sanitizeProperty($property);
+
+		// Control if the $Property exists in the given $Type and setup it, otherwise leave it 'NULL'
+		if (static::isPropertyInType($this->type, $property))
+		{
+			$this->property = $property;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Return the current $Property name
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function getProperty()
+	{
+		return $this->property;
+	}
+
+	/**
+	 * Setup a Human content or content for the Machines
+	 *
+	 * @param   string  $content         The human content or machine content to be used
+	 * @param   string  $machineContent  The machine content
+	 *
+	 * @return  Microdata  Instance of $this
+	 *
+	 * @since   3.2
+	 */
+	public function content($content, $machineContent = null)
+	{
+		$this->content = $content;
+		$this->machineContent = $machineContent;
+
+		return $this;
+	}
+
+	/**
+	 * Return the current $content
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function getContent()
+	{
+		return $this->content;
+	}
+
+	/**
+	 * Return the current $machineContent
+	 *
+	 * @return  string
+	 *
+	 * @since   3.3
+	 */
+	public function getMachineContent()
+	{
+		return $this->machineContent;
+	}
+
+	/**
+	 * Setup a Fallback Type and Property
+	 *
+	 * @param   string  $type      The Fallback Type
+	 * @param   string  $property  The Fallback Property
+	 *
+	 * @return  Microdata  Instance of $this
+	 *
+	 * @since   3.2
+	 */
+	public function fallback($type, $property)
+	{
+		if (!$this->enabled)
+		{
+			return $this;
+		}
+
+		// Sanitize the $Type
+		$this->fallbackType = static::sanitizeType($type);
+
+		// If the given $Type isn't available, fallback to 'Thing' Type
+		if (!static::isTypeAvailable($this->fallbackType))
+		{
+			$this->fallbackType = 'Thing';
+		}
+
+		// Control if the $Property exist in the given $Type and setup it, otherwise leave it 'NULL'
+		if (static::isPropertyInType($this->fallbackType, $property))
+		{
+			$this->fallbackProperty = $property;
+		}
+		else
+		{
+			$this->fallbackProperty = null;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Return the current $fallbackType
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function getFallbackType()
+	{
+		return $this->fallbackType;
+	}
+
+	/**
+	 * Return the current $fallbackProperty
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function getFallbackProperty()
+	{
+		return $this->fallbackProperty;
+	}
+
+	/**
+	 * This function handles the display logic.
+	 * It checks if the Type, Property are available, if not check for a Fallback,
+	 * then reset all params for the next use and return the HTML.
+	 *
+	 * @param   string   $displayType  Optional, 'inline', available options ['inline'|'span'|'div'|meta]
+	 * @param   boolean  $emptyOutput  Return an empty string if the library output is disabled and there is a $content value
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function display($displayType = '', $emptyOutput = false)
+	{
+		// Initialize the HTML to output
+		$html = ($this->content !== null && !$emptyOutput) ? $this->content : '';
+
+		// Control if the library output is enabled, otherwise return the $content or an empty string
+		if (!$this->enabled)
+		{
+			// Reset params
+			$this->resetParams();
+
+			return $html;
+		}
+
+		// If the $property is wrong for the current $Type check if a Fallback is available, otherwise return an empty HTML
+		if ($this->property)
+		{
+			// Process and return the HTML the way the user expects to
+			if ($displayType)
+			{
+				switch ($displayType)
+				{
+					case 'span':
+						$html = static::htmlSpan($html, $this->property);
+						break;
+
+					case 'div':
+						$html = static::htmlDiv($html, $this->property);
+						break;
+
+					case 'meta':
+						$html = ($this->machineContent !== null) ? $this->machineContent : $html;
+						$html = static::htmlMeta($html, $this->property);
+						break;
+
+					default:
+						// Default $displayType = 'inline'
+						$html = static::htmlProperty($this->property);
+						break;
+				}
+			}
+			else
+			{
+				/*
+				 * Process and return the HTML in an automatic way,
+				 * with the $Property expected Types and display everything in the right way,
+				 * check if the $Property is 'normal', 'nested' or must be rendered in a metadata tag
+				 */
+				switch (static::getExpectedDisplayType($this->type, $this->property))
+				{
+					case 'nested':
+						// Retrieve the expected 'nested' Type of the $Property
+						$nestedType = static::getExpectedTypes($this->type, $this->property);
+						$nestedProperty = '';
+
+						// If there is a Fallback Type then probably it could be the expectedType
+						if (in_array($this->fallbackType, $nestedType))
+						{
+							$nestedType = $this->fallbackType;
+
+							if ($this->fallbackProperty)
+							{
+								$nestedProperty = $this->fallbackProperty;
+							}
+						}
+						else
+						{
+							$nestedType = $nestedType[0];
+						}
+
+						// Check if a $content is available, otherwise fallback to an 'inline' display type
+						if ($this->content !== null)
+						{
+							if ($nestedProperty)
+							{
+								$html = static::htmlSpan(
+									$this->content,
+									$nestedProperty
+								);
+							}
+
+							$html = static::htmlSpan(
+								$html,
+								$this->property,
+								$nestedType,
+								true
+							);
+						}
+						else
+						{
+							$html = static::htmlProperty($this->property) . ' ' . static::htmlScope($nestedType);
+
+							if ($nestedProperty)
+							{
+								$html .= ' ' . static::htmlProperty($nestedProperty);
+							}
+						}
+
+						break;
+
+					case 'meta':
+						// Check if a $content is available, otherwise fallback to an 'inline' display type
+						if ($this->content !== null)
+						{
+							$html = ($this->machineContent !== null) ? $this->machineContent : $this->content;
+							$html = static::htmlMeta($html, $this->property) . $this->content;
+						}
+						else
+						{
+							$html = static::htmlProperty($this->property);
+						}
+
+						break;
+
+					default:
+						/*
+						 * Default expected display type = 'normal'
+						 * Check if a $content is available,
+						 * otherwise fallback to an 'inline' display type
+						 */
+						if ($this->content !== null)
+						{
+							$html = static::htmlSpan($this->content, $this->property);
+						}
+						else
+						{
+							$html = static::htmlProperty($this->property);
+						}
+
+						break;
+				}
+			}
+		}
+		elseif ($this->fallbackProperty)
+		{
+			// Process and return the HTML the way the user expects to
+			if ($displayType)
+			{
+				switch ($displayType)
+				{
+					case 'span':
+						$html = static::htmlSpan($html, $this->fallbackProperty, $this->fallbackType);
+						break;
+
+					case 'div':
+						$html = static::htmlDiv($html, $this->fallbackProperty, $this->fallbackType);
+						break;
+
+					case 'meta':
+						$html = ($this->machineContent !== null) ? $this->machineContent : $html;
+						$html = static::htmlMeta($html, $this->fallbackProperty, $this->fallbackType);
+						break;
+
+					default:
+						// Default $displayType = 'inline'
+						$html = static::htmlScope($this->fallbackType) . ' ' . static::htmlProperty($this->fallbackProperty);
+						break;
+				}
+			}
+			else
+			{
+				/*
+				 * Process and return the HTML in an automatic way,
+				 * with the $Property expected Types an display everything in the right way,
+				 * check if the Property is 'nested' or must be rendered in a metadata tag
+				 */
+				switch (static::getExpectedDisplayType($this->fallbackType, $this->fallbackProperty))
+				{
+					case 'meta':
+						// Check if a $content is available, otherwise fallback to an 'inline' display Type
+						if ($this->content !== null)
+						{
+							$html = ($this->machineContent !== null) ? $this->machineContent : $this->content;
+							$html = static::htmlMeta($html, $this->fallbackProperty, $this->fallbackType);
+						}
+						else
+						{
+							$html = static::htmlScope($this->fallbackType) . ' ' . static::htmlProperty($this->fallbackProperty);
+						}
+
+						break;
+
+					default:
+						/*
+						 * Default expected display type = 'normal'
+						 * Check if a $content is available,
+						 * otherwise fallback to an 'inline' display Type
+						 */
+						if ($this->content !== null)
+						{
+							$html = static::htmlSpan($this->content, $this->fallbackProperty);
+							$html = static::htmlSpan($html, '', $this->fallbackType);
+						}
+						else
+						{
+							$html = static::htmlScope($this->fallbackType) . ' ' . static::htmlProperty($this->fallbackProperty);
+						}
+
+						break;
+				}
+			}
+		}
+		elseif (!$this->fallbackProperty && $this->fallbackType !== null)
+		{
+			$html = static::htmlScope($this->fallbackType);
+		}
+
+		// Reset params
+		$this->resetParams();
+
+		return $html;
+	}
+
+	/**
+	 * Return the HTML of the current Scope
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function displayScope()
+	{
+		// Control if the library output is enabled, otherwise return the $content or empty string
+		if (!$this->enabled)
+		{
+			return '';
+		}
+
+		return static::htmlScope($this->type);
+	}
+
+	/**
+	 * Return the sanitized $Type
+	 *
+	 * @param   string  $type  The Type to sanitize
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function sanitizeType($type)
+	{
+		return ucfirst(trim($type));
+	}
+
+	/**
+	 * Return the sanitized $Property
+	 *
+	 * @param   string  $property  The Property to sanitize
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function sanitizeProperty($property)
+	{
+		return lcfirst(trim($property));
+	}
+
+	/**
+	 * Return an array with all available Types and Properties from the http://schema.org vocabulary
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public static function getTypes()
+	{
+		static::loadTypes();
+
+		return static::$types;
+	}
+
+	/**
+	 * Return an array with all available Types from the http://schema.org vocabulary
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public static function getAvailableTypes()
+	{
+		static::loadTypes();
+
+		return array_keys(static::$types);
+	}
+
+	/**
+	 * Return the expected Types of the given Property
+	 *
+	 * @param   string  $type      The Type to process
+	 * @param   string  $property  The Property to process
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public static function getExpectedTypes($type, $property)
+	{
+		static::loadTypes();
+
+		$tmp = static::$types[$type]['properties'];
+
+		// Check if the $Property is in the $Type
+		if (isset($tmp[$property]))
+		{
+			return $tmp[$property]['expectedTypes'];
+		}
+
+		// Check if the $Property is inherit
+		$extendedType = static::$types[$type]['extends'];
+
+		// Recursive
+		if (!empty($extendedType))
+		{
+			return static::getExpectedTypes($extendedType, $property);
+		}
+
+		return array();
+	}
+
+	/**
+	 * Return the expected display type: [normal|nested|meta]
+	 * In which way to display the Property:
+	 * normal -> itemprop="name"
+	 * nested -> itemprop="director" itemscope itemtype="https://schema.org/Person"
+	 * meta   -> `<meta itemprop="datePublished" content="1991-05-01">`
+	 *
+	 * @param   string  $type      The Type where to find the Property
+	 * @param   string  $property  The Property to process
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	protected static function getExpectedDisplayType($type, $property)
+	{
+		$expectedTypes = static::getExpectedTypes($type, $property);
+
+		// Retrieve the first expected type
+		$type = $expectedTypes[0];
+
+		// Check if it's a 'meta' display
+		if ($type === 'Date' || $type === 'DateTime' || $property === 'interactionCount')
+		{
+			return 'meta';
+		}
+
+		// Check if it's a 'normal' display
+		if ($type === 'Text' || $type === 'URL' || $type === 'Boolean' || $type === 'Number')
+		{
+			return 'normal';
+		}
+
+		// Otherwise it's a 'nested' display
+		return 'nested';
+	}
+
+	/**
+	 * Recursive function, control if the given Type has the given Property
+	 *
+	 * @param   string  $type      The Type where to check
+	 * @param   string  $property  The Property to check
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public static function isPropertyInType($type, $property)
+	{
+		if (!static::isTypeAvailable($type))
+		{
+			return false;
+		}
+
+		// Control if the $Property exists, and return 'true'
+		if (array_key_exists($property, static::$types[$type]['properties']))
+		{
+			return true;
+		}
+
+		// Recursive: Check if the $Property is inherit
+		$extendedType = static::$types[$type]['extends'];
+
+		if (!empty($extendedType))
+		{
+			return static::isPropertyInType($extendedType, $property);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Control if the given Type class is available
+	 *
+	 * @param   string  $type  The Type to check
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public static function isTypeAvailable($type)
+	{
+		static::loadTypes();
+
+		return (array_key_exists($type, static::$types)) ? true : false;
+	}
+
+	/**
+	 * Return Microdata semantics in a `<meta>` tag with content for machines.
+	 *
+	 * @param   string   $content   The machine content to display
+	 * @param   string   $property  The Property
+	 * @param   string   $scope     Optional, the Type scope to display
+	 * @param   boolean  $invert    Optional, default = false, invert the $scope with the $property
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function htmlMeta($content, $property, $scope = '', $invert = false)
+	{
+		return static::htmlTag('meta', $content, $property, $scope, $invert);
+	}
+
+	/**
+	 * Return Microdata semantics in a `<span>` tag.
+	 *
+	 * @param   string   $content   The human content
+	 * @param   string   $property  Optional, the human content to display
+	 * @param   string   $scope     Optional, the Type scope to display
+	 * @param   boolean  $invert    Optional, default = false, invert the $scope with the $property
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function htmlSpan($content, $property = '', $scope = '', $invert = false)
+	{
+		return static::htmlTag('span', $content, $property, $scope, $invert);
+	}
+
+	/**
+	 * Return Microdata semantics in a `<div>` tag.
+	 *
+	 * @param   string   $content   The human content
+	 * @param   string   $property  Optional, the human content to display
+	 * @param   string   $scope     Optional, the Type scope to display
+	 * @param   boolean  $invert    Optional, default = false, invert the $scope with the $property
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function htmlDiv($content, $property = '', $scope = '', $invert = false)
+	{
+		return static::htmlTag('div', $content, $property, $scope, $invert);
+	}
+
+	/**
+	 * Return Microdata semantics in a specified tag.
+	 *
+	 * @param   string   $tag       The HTML tag
+	 * @param   string   $content   The human content
+	 * @param   string   $property  Optional, the human content to display
+	 * @param   string   $scope     Optional, the Type scope to display
+	 * @param   boolean  $invert    Optional, default = false, invert the $scope with the $property
+	 *
+	 * @return  string
+	 *
+	 * @since   3.3
+	 */
+	public static function htmlTag($tag, $content, $property = '', $scope = '', $invert = false)
+	{
+		// Control if the $Property has already the 'itemprop' prefix
+		if (!empty($property) && stripos($property, 'itemprop') !== 0)
+		{
+			$property = static::htmlProperty($property);
+		}
+
+		// Control if the $Scope have already the 'itemscope' prefix
+		if (!empty($scope) && stripos($scope, 'itemscope') !== 0)
+		{
+			$scope = static::htmlScope($scope);
+		}
+
+		// Depending on the case, the $scope must precede the $property, or otherwise
+		if ($invert)
+		{
+			$tmp = implode(' ', array($property, $scope));
+		}
+		else
+		{
+			$tmp = implode(' ', array($scope, $property));
+		}
+
+		$tmp = trim($tmp);
+		$tmp = ($tmp) ? ' ' . $tmp : '';
+
+		// Control if it is an empty element without a closing tag
+		if ($tag === 'meta')
+		{
+			return "<meta$tmp content='$content'/>";
+		}
+
+		return '<' . $tag . $tmp . '>' . $content . '</' . $tag . '>';
+	}
+
+	/**
+	 * Return the HTML Scope
+	 *
+	 * @param   string  $scope  The Scope to process
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function htmlScope($scope)
+	{
+		return "itemscope itemtype='https://schema.org/" . static::sanitizeType($scope) . "'";
+	}
+
+	/**
+	 * Return the HTML Property
+	 *
+	 * @param   string  $property  The Property to process
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public static function htmlProperty($property)
+	{
+		return "itemprop='$property'";
+	}
+}
diff --git a/core/libraries/src/Microdata/types.json b/core/libraries/src/Microdata/types.json
new file mode 100644
index 00000000..03e74a5a
--- /dev/null
+++ b/core/libraries/src/Microdata/types.json
@@ -0,0 +1 @@
+{"DataType":{"extends":"","properties":[]},"Boolean":{"extends":"DataType","properties":[]},"False":{"extends":"Boolean","properties":[]},"True":{"extends":"Boolean","properties":[]},"Date":{"extends":"DataType","properties":[]},"DateTime":{"extends":"DataType","properties":[]},"Number":{"extends":"DataType","properties":[]},"Float":{"extends":"Number","properties":[]},"Integer":{"extends":"Number","properties":[]},"Text":{"extends":"DataType","properties":[]},"URL":{"extends":"Text","properties":[]},"Time":{"extends":"DataType","properties":[]},"Thing":{"extends":"","properties":{"additionalType":{"expectedTypes":["URL"]},"alternateName":{"expectedTypes":["Text"]},"description":{"expectedTypes":["Text"]},"image":{"expectedTypes":["URL","ImageObject"]},"name":{"expectedTypes":["Text"]},"potentialAction":{"expectedTypes":["Action"]},"sameAs":{"expectedTypes":["URL"]},"url":{"expectedTypes":["URL"]}}},"Action":{"extends":"Thing","properties":{"actionStatus":{"expectedTypes":["ActionStatusType"]},"agent":{"expectedTypes":["Organization","Person"]},"endTime":{"expectedTypes":["DateTime"]},"error":{"expectedTypes":["Thing"]},"instrument":{"expectedTypes":["Thing"]},"location":{"expectedTypes":["PostalAddress","Place"]},"object":{"expectedTypes":["Thing"]},"participant":{"expectedTypes":["Organization","Person"]},"result":{"expectedTypes":["Thing"]},"startTime":{"expectedTypes":["DateTime"]},"target":{"expectedTypes":["EntryPoint"]}}},"AchieveAction":{"extends":"Action","properties":[]},"LoseAction":{"extends":"AchieveAction","properties":{"winner":{"expectedTypes":["Person"]}}},"TieAction":{"extends":"AchieveAction","properties":[]},"WinAction":{"extends":"AchieveAction","properties":{"loser":{"expectedTypes":["Person"]}}},"AssessAction":{"extends":"Action","properties":[]},"ChooseAction":{"extends":"AssessAction","properties":{"option":{"expectedTypes":["Text","Thing"]}}},"VoteAction":{"extends":"ChooseAction","properties":{"candidate":{"expectedTypes":["Person"]}}},"IgnoreAction":{"extends":"AssessAction","properties":[]},"ReactAction":{"extends":"AssessAction","properties":[]},"AgreeAction":{"extends":"ReactAction","properties":[]},"DisagreeAction":{"extends":"ReactAction","properties":[]},"DislikeAction":{"extends":"ReactAction","properties":[]},"EndorseAction":{"extends":"ReactAction","properties":{"endorsee":{"expectedTypes":["Organization","Person"]}}},"LikeAction":{"extends":"ReactAction","properties":[]},"WantAction":{"extends":"ReactAction","properties":[]},"ReviewAction":{"extends":"AssessAction","properties":{"resultReview":{"expectedTypes":["Review"]}}},"ConsumeAction":{"extends":"Action","properties":{"expectsAcceptanceOf":{"expectedTypes":["Offer"]}}},"DrinkAction":{"extends":"ConsumeAction","properties":[]},"EatAction":{"extends":"ConsumeAction","properties":[]},"InstallAction":{"extends":"ConsumeAction","properties":[]},"ListenAction":{"extends":"ConsumeAction","properties":[]},"ReadAction":{"extends":"ConsumeAction","properties":[]},"UseAction":{"extends":"ConsumeAction","properties":[]},"WearAction":{"extends":"UseAction","properties":[]},"ViewAction":{"extends":"ConsumeAction","properties":[]},"WatchAction":{"extends":"ConsumeAction","properties":[]},"ControlAction":{"extends":"Action","properties":[]},"ActivateAction":{"extends":"ControlAction","properties":[]},"DeactivateAction":{"extends":"ControlAction","properties":[]},"ResumeAction":{"extends":"ControlAction","properties":[]},"SuspendAction":{"extends":"ControlAction","properties":[]},"CreateAction":{"extends":"Action","properties":[]},"CookAction":{"extends":"CreateAction","properties":{"foodEstablishment":{"expectedTypes":["FoodEstablishment","Place"]},"foodEvent":{"expectedTypes":["FoodEvent"]},"recipe":{"expectedTypes":["Recipe"]}}},"DrawAction":{"extends":"CreateAction","properties":[]},"FilmAction":{"extends":"CreateAction","properties":[]},"PaintAction":{"extends":"CreateAction","properties":[]},"PhotographAction":{"extends":"CreateAction","properties":[]},"WriteAction":{"extends":"CreateAction","properties":{"language":{"expectedTypes":["Language"]}}},"FindAction":{"extends":"Action","properties":[]},"CheckAction":{"extends":"FindAction","properties":[]},"DiscoverAction":{"extends":"FindAction","properties":[]},"TrackAction":{"extends":"FindAction","properties":{"deliveryMethod":{"expectedTypes":["DeliveryMethod"]}}},"InteractAction":{"extends":"Action","properties":[]},"BefriendAction":{"extends":"InteractAction","properties":[]},"CommunicateAction":{"extends":"InteractAction","properties":{"about":{"expectedTypes":["Thing"]},"language":{"expectedTypes":["Language"]},"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"AskAction":{"extends":"CommunicateAction","properties":{"question":{"expectedTypes":["Text"]}}},"CheckInAction":{"extends":"CommunicateAction","properties":[]},"CheckOutAction":{"extends":"CommunicateAction","properties":[]},"CommentAction":{"extends":"CommunicateAction","properties":[]},"InformAction":{"extends":"CommunicateAction","properties":{"event":{"expectedTypes":["Event"]}}},"ConfirmAction":{"extends":"InformAction","properties":[]},"RsvpAction":{"extends":"InformAction","properties":{"additionalNumberOfGuests":{"expectedTypes":["Number"]},"rsvpResponse":{"expectedTypes":["RsvpResponseType"]}}},"InviteAction":{"extends":"CommunicateAction","properties":{"event":{"expectedTypes":["Event"]}}},"ReplyAction":{"extends":"CommunicateAction","properties":[]},"ShareAction":{"extends":"CommunicateAction","properties":[]},"FollowAction":{"extends":"InteractAction","properties":{"followee":{"expectedTypes":["Organization","Person"]}}},"JoinAction":{"extends":"InteractAction","properties":{"event":{"expectedTypes":["Event"]}}},"LeaveAction":{"extends":"InteractAction","properties":{"event":{"expectedTypes":["Event"]}}},"MarryAction":{"extends":"InteractAction","properties":[]},"RegisterAction":{"extends":"InteractAction","properties":[]},"SubscribeAction":{"extends":"InteractAction","properties":[]},"UnRegisterAction":{"extends":"InteractAction","properties":[]},"MoveAction":{"extends":"Action","properties":{"fromLocation":{"expectedTypes":["Place"]},"toLocation":{"expectedTypes":["Place"]}}},"ArriveAction":{"extends":"MoveAction","properties":[]},"DepartAction":{"extends":"MoveAction","properties":[]},"TravelAction":{"extends":"MoveAction","properties":{"distance":{"expectedTypes":["Distance"]}}},"OrganizeAction":{"extends":"Action","properties":[]},"AllocateAction":{"extends":"OrganizeAction","properties":{"purpose":{"expectedTypes":["MedicalDevicePurpose","Thing"]}}},"AcceptAction":{"extends":"AllocateAction","properties":[]},"AssignAction":{"extends":"AllocateAction","properties":[]},"AuthorizeAction":{"extends":"AllocateAction","properties":{"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"RejectAction":{"extends":"AllocateAction","properties":[]},"ApplyAction":{"extends":"OrganizeAction","properties":[]},"BookmarkAction":{"extends":"OrganizeAction","properties":[]},"PlanAction":{"extends":"OrganizeAction","properties":{"scheduledTime":{"expectedTypes":["DateTime"]}}},"CancelAction":{"extends":"PlanAction","properties":[]},"ReserveAction":{"extends":"PlanAction","properties":[]},"ScheduleAction":{"extends":"PlanAction","properties":[]},"PlayAction":{"extends":"Action","properties":{"audience":{"expectedTypes":["Audience"]},"event":{"expectedTypes":["Event"]}}},"ExerciseAction":{"extends":"PlayAction","properties":{"course":{"expectedTypes":["Place"]},"diet":{"expectedTypes":["Diet"]},"distance":{"expectedTypes":["Distance"]},"exercisePlan":{"expectedTypes":["ExercisePlan"]},"exerciseType":{"expectedTypes":["Text"]},"fromLocation":{"expectedTypes":["Place"]},"opponent":{"expectedTypes":["Person"]},"sportsActivityLocation":{"expectedTypes":["SportsActivityLocation"]},"sportsEvent":{"expectedTypes":["SportsEvent"]},"sportsTeam":{"expectedTypes":["SportsTeam"]},"toLocation":{"expectedTypes":["Place"]}}},"PerformAction":{"extends":"PlayAction","properties":{"entertainmentBusiness":{"expectedTypes":["EntertainmentBusiness"]}}},"SearchAction":{"extends":"Action","properties":{"query":{"expectedTypes":["Text","Class"]}}},"TradeAction":{"extends":"Action","properties":{"price":{"expectedTypes":["Text","Number"]},"priceSpecification":{"expectedTypes":["PriceSpecification"]}}},"BuyAction":{"extends":"TradeAction","properties":{"seller":{"expectedTypes":["Organization","Person"]},"warrantyPromise":{"expectedTypes":["WarrantyPromise"]}}},"DonateAction":{"extends":"TradeAction","properties":{"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"OrderAction":{"extends":"TradeAction","properties":{"deliveryMethod":{"expectedTypes":["DeliveryMethod"]}}},"PayAction":{"extends":"TradeAction","properties":{"purpose":{"expectedTypes":["MedicalDevicePurpose","Thing"]},"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"QuoteAction":{"extends":"TradeAction","properties":[]},"RentAction":{"extends":"TradeAction","properties":{"landlord":{"expectedTypes":["Organization","Person"]},"realEstateAgent":{"expectedTypes":["RealEstateAgent"]}}},"SellAction":{"extends":"TradeAction","properties":{"buyer":{"expectedTypes":["Person"]},"warrantyPromise":{"expectedTypes":["WarrantyPromise"]}}},"TipAction":{"extends":"TradeAction","properties":{"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"TransferAction":{"extends":"Action","properties":{"fromLocation":{"expectedTypes":["Place"]},"toLocation":{"expectedTypes":["Place"]}}},"BorrowAction":{"extends":"TransferAction","properties":{"lender":{"expectedTypes":["Person"]}}},"DownloadAction":{"extends":"TransferAction","properties":[]},"GiveAction":{"extends":"TransferAction","properties":{"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"LendAction":{"extends":"TransferAction","properties":{"borrower":{"expectedTypes":["Person"]}}},"ReceiveAction":{"extends":"TransferAction","properties":{"deliveryMethod":{"expectedTypes":["DeliveryMethod"]},"sender":{"expectedTypes":["Organization","Person","Audience"]}}},"ReturnAction":{"extends":"TransferAction","properties":{"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"SendAction":{"extends":"TransferAction","properties":{"deliveryMethod":{"expectedTypes":["DeliveryMethod"]},"recipient":{"expectedTypes":["Organization","Person","Audience"]}}},"TakeAction":{"extends":"TransferAction","properties":[]},"UpdateAction":{"extends":"Action","properties":{"collection":{"expectedTypes":["Thing"]}}},"AddAction":{"extends":"UpdateAction","properties":[]},"InsertAction":{"extends":"AddAction","properties":{"toLocation":{"expectedTypes":["Place"]}}},"AppendAction":{"extends":"InsertAction","properties":[]},"PrependAction":{"extends":"InsertAction","properties":[]},"DeleteAction":{"extends":"UpdateAction","properties":[]},"ReplaceAction":{"extends":"UpdateAction","properties":{"replacee":{"expectedTypes":["Thing"]},"replacer":{"expectedTypes":["Thing"]}}},"BroadcastService":{"extends":"Thing","properties":{"area":{"expectedTypes":["Place"]},"broadcaster":{"expectedTypes":["Organization"]},"parentService":{"expectedTypes":["BroadcastService"]}}},"CreativeWork":{"extends":"Thing","properties":{"about":{"expectedTypes":["Thing"]},"accessibilityAPI":{"expectedTypes":["Text"]},"accessibilityControl":{"expectedTypes":["Text"]},"accessibilityFeature":{"expectedTypes":["Text"]},"accessibilityHazard":{"expectedTypes":["Text"]},"accountablePerson":{"expectedTypes":["Person"]},"aggregateRating":{"expectedTypes":["AggregateRating"]},"alternativeHeadline":{"expectedTypes":["Text"]},"associatedMedia":{"expectedTypes":["MediaObject"]},"audience":{"expectedTypes":["Audience"]},"audio":{"expectedTypes":["AudioObject"]},"author":{"expectedTypes":["Organization","Person"]},"award":{"expectedTypes":["Text"]},"character":{"expectedTypes":["Person"]},"citation":{"expectedTypes":["CreativeWork","Text"]},"comment":{"expectedTypes":["UserComments","Comment"]},"commentCount":{"expectedTypes":["Integer"]},"contentLocation":{"expectedTypes":["Place"]},"contentRating":{"expectedTypes":["Text"]},"contributor":{"expectedTypes":["Organization","Person"]},"copyrightHolder":{"expectedTypes":["Organization","Person"]},"copyrightYear":{"expectedTypes":["Number"]},"creator":{"expectedTypes":["Organization","Person"]},"dateCreated":{"expectedTypes":["Date"]},"dateModified":{"expectedTypes":["Date"]},"datePublished":{"expectedTypes":["Date"]},"discussionUrl":{"expectedTypes":["URL"]},"editor":{"expectedTypes":["Person"]},"educationalAlignment":{"expectedTypes":["AlignmentObject"]},"educationalUse":{"expectedTypes":["Text"]},"encoding":{"expectedTypes":["MediaObject"]},"exampleOfWork":{"expectedTypes":["CreativeWork"]},"genre":{"expectedTypes":["Text"]},"hasPart":{"expectedTypes":["CreativeWork"]},"headline":{"expectedTypes":["Text"]},"inLanguage":{"expectedTypes":["Text"]},"interactionCount":{"expectedTypes":["Text"]},"interactivityType":{"expectedTypes":["Text"]},"isBasedOnUrl":{"expectedTypes":["URL"]},"isFamilyFriendly":{"expectedTypes":["Boolean"]},"isPartOf":{"expectedTypes":["CreativeWork"]},"keywords":{"expectedTypes":["Text"]},"learningResourceType":{"expectedTypes":["Text"]},"license":{"expectedTypes":["CreativeWork","URL"]},"mentions":{"expectedTypes":["Thing"]},"offers":{"expectedTypes":["Offer"]},"position":{"expectedTypes":["Integer","Text"]},"producer":{"expectedTypes":["Organization","Person"]},"provider":{"expectedTypes":["Organization","Person"]},"publisher":{"expectedTypes":["Organization"]},"publishingPrinciples":{"expectedTypes":["URL"]},"recordedAt":{"expectedTypes":["Event"]},"releasedEvent":{"expectedTypes":["PublicationEvent"]},"review":{"expectedTypes":["Review"]},"sourceOrganization":{"expectedTypes":["Organization"]},"text":{"expectedTypes":["Text"]},"thumbnailUrl":{"expectedTypes":["URL"]},"timeRequired":{"expectedTypes":["Duration"]},"translator":{"expectedTypes":["Organization","Person"]},"typicalAgeRange":{"expectedTypes":["Text"]},"version":{"expectedTypes":["Number"]},"video":{"expectedTypes":["VideoObject"]},"workExample":{"expectedTypes":["CreativeWork"]}}},"Answer":{"extends":"CreativeWork","properties":{"downvoteCount":{"expectedTypes":["Integer"]},"parentItem":{"expectedTypes":["Question"]},"upvoteCount":{"expectedTypes":["Integer"]}}},"Article":{"extends":"CreativeWork","properties":{"articleBody":{"expectedTypes":["Text"]},"articleSection":{"expectedTypes":["Text"]},"pageEnd":{"expectedTypes":["Integer","Text"]},"pageStart":{"expectedTypes":["Integer","Text"]},"pagination":{"expectedTypes":["Text"]},"wordCount":{"expectedTypes":["Integer"]}}},"BlogPosting":{"extends":"Article","properties":[]},"NewsArticle":{"extends":"Article","properties":{"dateline":{"expectedTypes":["Text"]},"printColumn":{"expectedTypes":["Text"]},"printEdition":{"expectedTypes":["Text"]},"printPage":{"expectedTypes":["Text"]},"printSection":{"expectedTypes":["Text"]}}},"ScholarlyArticle":{"extends":"Article","properties":[]},"MedicalScholarlyArticle":{"extends":"ScholarlyArticle","properties":{"publicationType":{"expectedTypes":["Text"]}}},"TechArticle":{"extends":"Article","properties":{"dependencies":{"expectedTypes":["Text"]},"proficiencyLevel":{"expectedTypes":["Text"]}}},"APIReference":{"extends":"TechArticle","properties":{"assembly":{"expectedTypes":["Text"]},"assemblyVersion":{"expectedTypes":["Text"]},"programmingModel":{"expectedTypes":["Text"]},"targetPlatform":{"expectedTypes":["Text"]}}},"Blog":{"extends":"CreativeWork","properties":{"blogPost":{"expectedTypes":["BlogPosting"]}}},"Book":{"extends":"CreativeWork","properties":{"bookEdition":{"expectedTypes":["Text"]},"bookFormat":{"expectedTypes":["BookFormatType"]},"illustrator":{"expectedTypes":["Person"]},"isbn":{"expectedTypes":["Text"]},"numberOfPages":{"expectedTypes":["Integer"]}}},"Clip":{"extends":"CreativeWork","properties":{"actor":{"expectedTypes":["Person"]},"clipNumber":{"expectedTypes":["Integer","Text"]},"director":{"expectedTypes":["Person"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"partOfEpisode":{"expectedTypes":["Episode"]},"partOfSeason":{"expectedTypes":["Season"]},"partOfSeries":{"expectedTypes":["Series"]},"publication":{"expectedTypes":["PublicationEvent"]}}},"RadioClip":{"extends":"Clip","properties":[]},"TVClip":{"extends":"Clip","properties":[]},"Code":{"extends":"CreativeWork","properties":{"codeRepository":{"expectedTypes":["URL"]},"programmingLanguage":{"expectedTypes":["Thing"]},"runtime":{"expectedTypes":["Text"]},"sampleType":{"expectedTypes":["Text"]},"targetProduct":{"expectedTypes":["SoftwareApplication"]}}},"Comment":{"extends":"CreativeWork","properties":{"downvoteCount":{"expectedTypes":["Integer"]},"parentItem":{"expectedTypes":["Question"]},"upvoteCount":{"expectedTypes":["Integer"]}}},"DataCatalog":{"extends":"CreativeWork","properties":{"dataset":{"expectedTypes":["Dataset"]}}},"Dataset":{"extends":"CreativeWork","properties":{"catalog":{"expectedTypes":["DataCatalog"]},"distribution":{"expectedTypes":["DataDownload"]},"spatial":{"expectedTypes":["Place"]},"temporal":{"expectedTypes":["DateTime"]}}},"Diet":{"extends":"CreativeWork","properties":{"dietFeatures":{"expectedTypes":["Text"]},"endorsers":{"expectedTypes":["Organization","Person"]},"expertConsiderations":{"expectedTypes":["Text"]},"overview":{"expectedTypes":["Text"]},"physiologicalBenefits":{"expectedTypes":["Text"]},"proprietaryName":{"expectedTypes":["Text"]},"risks":{"expectedTypes":["Text"]}}},"EmailMessage":{"extends":"CreativeWork","properties":[]},"Episode":{"extends":"CreativeWork","properties":{"actor":{"expectedTypes":["Person"]},"director":{"expectedTypes":["Person"]},"episodeNumber":{"expectedTypes":["Integer","Text"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"partOfSeason":{"expectedTypes":["Season"]},"partOfSeries":{"expectedTypes":["Series"]},"productionCompany":{"expectedTypes":["Organization"]},"publication":{"expectedTypes":["PublicationEvent"]},"trailer":{"expectedTypes":["VideoObject"]}}},"RadioEpisode":{"extends":"Episode","properties":[]},"TVEpisode":{"extends":"Episode","properties":[]},"ExercisePlan":{"extends":"CreativeWork","properties":{"activityDuration":{"expectedTypes":["Duration"]},"activityFrequency":{"expectedTypes":["Text"]},"additionalVariable":{"expectedTypes":["Text"]},"exerciseType":{"expectedTypes":["Text"]},"intensity":{"expectedTypes":["Text"]},"repetitions":{"expectedTypes":["Number"]},"restPeriods":{"expectedTypes":["Text"]},"workload":{"expectedTypes":["Energy"]}}},"Game":{"extends":"CreativeWork","properties":{"characterAttribute":{"expectedTypes":["Thing"]},"gameItem":{"expectedTypes":["Thing"]},"gameLocation":{"expectedTypes":["PostalAddress","URL","Place"]},"numberOfPlayers":{"expectedTypes":["QuantitativeValue"]},"quest":{"expectedTypes":["Thing"]}}},"VideoGame":{"extends":"Game","properties":{"actor":{"expectedTypes":["Person"]},"cheatCode":{"expectedTypes":["CreativeWork"]},"director":{"expectedTypes":["Person"]},"gamePlatform":{"expectedTypes":["Thing","Text","URL"]},"gameServer":{"expectedTypes":["GameServer"]},"gameTip":{"expectedTypes":["CreativeWork"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"playMode":{"expectedTypes":["GamePlayMode"]},"trailer":{"expectedTypes":["VideoObject"]}}},"Map":{"extends":"CreativeWork","properties":{"mapType":{"expectedTypes":["MapCategoryType"]}}},"MediaObject":{"extends":"CreativeWork","properties":{"associatedArticle":{"expectedTypes":["NewsArticle"]},"bitrate":{"expectedTypes":["Text"]},"contentSize":{"expectedTypes":["Text"]},"contentUrl":{"expectedTypes":["URL"]},"duration":{"expectedTypes":["Duration"]},"embedUrl":{"expectedTypes":["URL"]},"encodesCreativeWork":{"expectedTypes":["CreativeWork"]},"encodingFormat":{"expectedTypes":["Text"]},"expires":{"expectedTypes":["Date"]},"height":{"expectedTypes":["QuantitativeValue","Distance"]},"playerType":{"expectedTypes":["Text"]},"productionCompany":{"expectedTypes":["Organization"]},"publication":{"expectedTypes":["PublicationEvent"]},"regionsAllowed":{"expectedTypes":["Place"]},"requiresSubscription":{"expectedTypes":["Boolean"]},"uploadDate":{"expectedTypes":["Date"]},"width":{"expectedTypes":["QuantitativeValue","Distance"]}}},"AudioObject":{"extends":"MediaObject","properties":{"transcript":{"expectedTypes":["Text"]}}},"DataDownload":{"extends":"MediaObject","properties":[]},"ImageObject":{"extends":"MediaObject","properties":{"caption":{"expectedTypes":["Text"]},"exifData":{"expectedTypes":["Text"]},"representativeOfPage":{"expectedTypes":["Boolean"]},"thumbnail":{"expectedTypes":["ImageObject"]}}},"MusicVideoObject":{"extends":"MediaObject","properties":[]},"VideoObject":{"extends":"MediaObject","properties":{"actor":{"expectedTypes":["Person"]},"caption":{"expectedTypes":["Text"]},"director":{"expectedTypes":["Person"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"thumbnail":{"expectedTypes":["ImageObject"]},"transcript":{"expectedTypes":["Text"]},"videoFrameSize":{"expectedTypes":["Text"]},"videoQuality":{"expectedTypes":["Text"]}}},"Movie":{"extends":"CreativeWork","properties":{"actor":{"expectedTypes":["Person"]},"director":{"expectedTypes":["Person"]},"duration":{"expectedTypes":["Duration"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"productionCompany":{"expectedTypes":["Organization"]},"trailer":{"expectedTypes":["VideoObject"]}}},"MusicComposition":{"extends":"CreativeWork","properties":{"composer":{"expectedTypes":["Person","Organization"]},"firstPerformance":{"expectedTypes":["Event"]},"includedComposition":{"expectedTypes":["MusicComposition"]},"iswcCode":{"expectedTypes":["Text"]},"lyricist":{"expectedTypes":["Person"]},"musicArrangement":{"expectedTypes":["MusicComposition"]},"musicCompositionForm":{"expectedTypes":["Text"]},"musicalKey":{"expectedTypes":["Text"]},"recordedAs":{"expectedTypes":["MusicRecording"]}}},"MusicPlaylist":{"extends":"CreativeWork","properties":{"numTracks":{"expectedTypes":["Integer"]},"track":{"expectedTypes":["MusicRecording","ItemList"]}}},"MusicAlbum":{"extends":"MusicPlaylist","properties":{"albumProductionType":{"expectedTypes":["MusicAlbumProductionType"]},"albumRelease":{"expectedTypes":["MusicRelease"]},"albumReleaseType":{"expectedTypes":["MusicAlbumReleaseType"]},"byArtist":{"expectedTypes":["MusicGroup"]}}},"MusicRelease":{"extends":"MusicPlaylist","properties":{"catalogNumber":{"expectedTypes":["Text"]},"creditedTo":{"expectedTypes":["Organization","Person"]},"duration":{"expectedTypes":["Duration"]},"musicReleaseFormat":{"expectedTypes":["MusicReleaseFormatType"]},"recordLabel":{"expectedTypes":["Organization"]},"releaseOf":{"expectedTypes":["MusicAlbum"]}}},"MusicRecording":{"extends":"CreativeWork","properties":{"byArtist":{"expectedTypes":["MusicGroup"]},"duration":{"expectedTypes":["Duration"]},"inAlbum":{"expectedTypes":["MusicAlbum"]},"inPlaylist":{"expectedTypes":["MusicPlaylist"]},"isrcCode":{"expectedTypes":["Text"]},"recordingOf":{"expectedTypes":["MusicComposition"]}}},"Painting":{"extends":"CreativeWork","properties":[]},"Photograph":{"extends":"CreativeWork","properties":[]},"PublicationIssue":{"extends":"CreativeWork","properties":{"issueNumber":{"expectedTypes":["Integer","Text"]},"pageEnd":{"expectedTypes":["Integer","Text"]},"pageStart":{"expectedTypes":["Integer","Text"]},"pagination":{"expectedTypes":["Text"]}}},"PublicationVolume":{"extends":"CreativeWork","properties":{"pageEnd":{"expectedTypes":["Integer","Text"]},"pageStart":{"expectedTypes":["Integer","Text"]},"pagination":{"expectedTypes":["Text"]},"volumeNumber":{"expectedTypes":["Integer","Text"]}}},"Question":{"extends":"CreativeWork","properties":{"acceptedAnswer":{"expectedTypes":["Answer"]},"answerCount":{"expectedTypes":["Integer"]},"downvoteCount":{"expectedTypes":["Integer"]},"suggestedAnswer":{"expectedTypes":["Answer"]},"upvoteCount":{"expectedTypes":["Integer"]}}},"Recipe":{"extends":"CreativeWork","properties":{"cookTime":{"expectedTypes":["Duration"]},"cookingMethod":{"expectedTypes":["Text"]},"ingredients":{"expectedTypes":["Text"]},"nutrition":{"expectedTypes":["NutritionInformation"]},"prepTime":{"expectedTypes":["Duration"]},"recipeCategory":{"expectedTypes":["Text"]},"recipeCuisine":{"expectedTypes":["Text"]},"recipeInstructions":{"expectedTypes":["Text"]},"recipeYield":{"expectedTypes":["Text"]},"totalTime":{"expectedTypes":["Duration"]}}},"Review":{"extends":"CreativeWork","properties":{"itemReviewed":{"expectedTypes":["Thing"]},"reviewBody":{"expectedTypes":["Text"]},"reviewRating":{"expectedTypes":["Rating"]}}},"Sculpture":{"extends":"CreativeWork","properties":[]},"Season":{"extends":"CreativeWork","properties":{"endDate":{"expectedTypes":["Date"]},"episode":{"expectedTypes":["Episode"]},"numberOfEpisodes":{"expectedTypes":["Number"]},"partOfSeries":{"expectedTypes":["Series"]},"productionCompany":{"expectedTypes":["Organization"]},"seasonNumber":{"expectedTypes":["Integer","Text"]},"startDate":{"expectedTypes":["Date"]},"trailer":{"expectedTypes":["VideoObject"]}}},"RadioSeason":{"extends":"Season","properties":[]},"TVSeason":{"extends":"CreativeWork","properties":[]},"Series":{"extends":"CreativeWork","properties":{"endDate":{"expectedTypes":["Date"]},"startDate":{"expectedTypes":["Date"]}}},"BookSeries":{"extends":"Series","properties":[]},"MovieSeries":{"extends":"Series","properties":{"actor":{"expectedTypes":["Person"]},"director":{"expectedTypes":["Person"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"productionCompany":{"expectedTypes":["Organization"]},"trailer":{"expectedTypes":["VideoObject"]}}},"Periodical":{"extends":"Series","properties":{"issn":{"expectedTypes":["Text"]}}},"RadioSeries":{"extends":"Series","properties":{"actor":{"expectedTypes":["Person"]},"director":{"expectedTypes":["Person"]},"episode":{"expectedTypes":["Episode"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"numberOfEpisodes":{"expectedTypes":["Number"]},"numberOfSeasons":{"expectedTypes":["Number"]},"productionCompany":{"expectedTypes":["Organization"]},"season":{"expectedTypes":["Season"]},"trailer":{"expectedTypes":["VideoObject"]}}},"TVSeries":{"extends":"CreativeWork","properties":{"actor":{"expectedTypes":["Person"]},"director":{"expectedTypes":["Person"]},"episode":{"expectedTypes":["Episode"]},"musicBy":{"expectedTypes":["MusicGroup","Person"]},"numberOfEpisodes":{"expectedTypes":["Number"]},"numberOfSeasons":{"expectedTypes":["Number"]},"productionCompany":{"expectedTypes":["Organization"]},"season":{"expectedTypes":["Season"]},"trailer":{"expectedTypes":["VideoObject"]}}},"VideoGameSeries":{"extends":"Series","properties":{"actor":{"expectedTypes":["Person"]},"characterAttribute":{"expectedTypes":["Thing"]},"cheatCode":{"expectedTypes":["CreativeWork"]},"director":{"expectedTypes":["Person"]},"episode":{"expectedTypes":["Episode"]},"gameItem":{"expectedTypes":["Thing"]},"gamePlatform":{"expectedTypes":["Text","Thing","URL"]},"musicBy":{"expectedTypes":["Person","MusicGroup"]},"numberOfEpisodes":{"expectedTypes":["Number"]},"numberOfPlayers":{"expectedTypes":["QuantitativeValue"]},"numberOfSeasons":{"expectedTypes":["Number"]},"playMode":{"expectedTypes":["GamePlayMode"]},"productionCompany":{"expectedTypes":["Organization"]},"quest":{"expectedTypes":["Thing"]},"season":{"expectedTypes":["Season"]},"trailer":{"expectedTypes":["VideoObject"]}}},"SoftwareApplication":{"extends":"CreativeWork","properties":{"applicationCategory":{"expectedTypes":["Text","URL"]},"applicationSubCategory":{"expectedTypes":["Text","URL"]},"applicationSuite":{"expectedTypes":["Text"]},"countriesNotSupported":{"expectedTypes":["Text"]},"countriesSupported":{"expectedTypes":["Text"]},"device":{"expectedTypes":["Text"]},"downloadUrl":{"expectedTypes":["URL"]},"featureList":{"expectedTypes":["Text","URL"]},"fileFormat":{"expectedTypes":["Text"]},"fileSize":{"expectedTypes":["Integer"]},"installUrl":{"expectedTypes":["URL"]},"memoryRequirements":{"expectedTypes":["Text","URL"]},"operatingSystem":{"expectedTypes":["Text"]},"permissions":{"expectedTypes":["Text"]},"processorRequirements":{"expectedTypes":["Text"]},"releaseNotes":{"expectedTypes":["Text","URL"]},"requirements":{"expectedTypes":["Text","URL"]},"screenshot":{"expectedTypes":["ImageObject","URL"]},"softwareAddOn":{"expectedTypes":["SoftwareApplication"]},"softwareHelp":{"expectedTypes":["CreativeWork"]},"softwareVersion":{"expectedTypes":["Text"]},"storageRequirements":{"expectedTypes":["Text","URL"]}}},"MobileApplication":{"extends":"SoftwareApplication","properties":{"carrierRequirements":{"expectedTypes":["Text"]}}},"WebApplication":{"extends":"SoftwareApplication","properties":{"browserRequirements":{"expectedTypes":["Text"]}}},"VisualArtwork":{"extends":"CreativeWork","properties":{"artEdition":{"expectedTypes":["Integer","Text"]},"artform":{"expectedTypes":["Text","URL"]},"depth":{"expectedTypes":["Distance","QuantitativeValue"]},"height":{"expectedTypes":["Distance","QuantitativeValue"]},"material":{"expectedTypes":["Text","URL"]},"surface":{"expectedTypes":["Text","URL"]},"width":{"expectedTypes":["Distance","QuantitativeValue"]}}},"WebPage":{"extends":"CreativeWork","properties":{"breadcrumb":{"expectedTypes":["Text","BreadcrumbList"]},"lastReviewed":{"expectedTypes":["Date"]},"mainContentOfPage":{"expectedTypes":["WebPageElement"]},"primaryImageOfPage":{"expectedTypes":["ImageObject"]},"relatedLink":{"expectedTypes":["URL"]},"reviewedBy":{"expectedTypes":["Person","Organization"]},"significantLink":{"expectedTypes":["URL"]},"specialty":{"expectedTypes":["Specialty"]}}},"AboutPage":{"extends":"WebPage","properties":[]},"CheckoutPage":{"extends":"WebPage","properties":[]},"CollectionPage":{"extends":"WebPage","properties":[]},"ImageGallery":{"extends":"CollectionPage","properties":[]},"VideoGallery":{"extends":"CollectionPage","properties":[]},"ContactPage":{"extends":"WebPage","properties":[]},"ItemPage":{"extends":"WebPage","properties":[]},"MedicalWebPage":{"extends":"WebPage","properties":{"aspect":{"expectedTypes":["Text"]}}},"ProfilePage":{"extends":"WebPage","properties":[]},"QAPage":{"extends":"WebPage","properties":[]},"SearchResultsPage":{"extends":"WebPage","properties":[]},"WebPageElement":{"extends":"CreativeWork","properties":[]},"SiteNavigationElement":{"extends":"WebPageElement","properties":[]},"Table":{"extends":"WebPageElement","properties":[]},"WPAdBlock":{"extends":"WebPageElement","properties":[]},"WPFooter":{"extends":"WebPageElement","properties":[]},"WPHeader":{"extends":"WebPageElement","properties":[]},"WPSideBar":{"extends":"WebPageElement","properties":[]},"WebSite":{"extends":"CreativeWork","properties":[]},"Event":{"extends":"Thing","properties":{"attendee":{"expectedTypes":["Organization","Person"]},"doorTime":{"expectedTypes":["DateTime"]},"duration":{"expectedTypes":["Duration"]},"endDate":{"expectedTypes":["Date"]},"eventStatus":{"expectedTypes":["EventStatusType"]},"location":{"expectedTypes":["PostalAddress","Place"]},"offers":{"expectedTypes":["Offer"]},"organizer":{"expectedTypes":["Organization","Person"]},"performer":{"expectedTypes":["Organization","Person"]},"previousStartDate":{"expectedTypes":["Date"]},"recordedIn":{"expectedTypes":["CreativeWork"]},"startDate":{"expectedTypes":["Date"]},"subEvent":{"expectedTypes":["Event"]},"superEvent":{"expectedTypes":["Event"]},"typicalAgeRange":{"expectedTypes":["Text"]},"workPerformed":{"expectedTypes":["CreativeWork"]}}},"BusinessEvent":{"extends":"Event","properties":[]},"ChildrensEvent":{"extends":"Event","properties":[]},"ComedyEvent":{"extends":"Event","properties":[]},"DanceEvent":{"extends":"Event","properties":[]},"DeliveryEvent":{"extends":"Event","properties":{"accessCode":{"expectedTypes":["Text"]},"availableFrom":{"expectedTypes":["DateTime"]},"availableThrough":{"expectedTypes":["DateTime"]},"hasDeliveryMethod":{"expectedTypes":["DeliveryMethod"]}}},"EducationEvent":{"extends":"Event","properties":[]},"Festival":{"extends":"Event","properties":[]},"FoodEvent":{"extends":"Event","properties":[]},"LiteraryEvent":{"extends":"Event","properties":[]},"MusicEvent":{"extends":"Event","properties":[]},"PublicationEvent":{"extends":"Event","properties":{"free":{"expectedTypes":["Boolean"]},"publishedOn":{"expectedTypes":["BroadcastService"]}}},"BroadcastEvent":{"extends":"PublicationEvent","properties":[]},"OnDemandEvent":{"extends":"PublicationEvent","properties":[]},"SaleEvent":{"extends":"Event","properties":[]},"SocialEvent":{"extends":"Event","properties":[]},"SportsEvent":{"extends":"Event","properties":{"awayTeam":{"expectedTypes":["Person","SportsTeam"]},"competitor":{"expectedTypes":["Person","SportsTeam"]},"homeTeam":{"expectedTypes":["Person","SportsTeam"]}}},"TheaterEvent":{"extends":"Event","properties":[]},"UserInteraction":{"extends":"Event","properties":[]},"UserBlocks":{"extends":"UserInteraction","properties":[]},"UserCheckins":{"extends":"UserInteraction","properties":[]},"UserComments":{"extends":"UserInteraction","properties":{"commentText":{"expectedTypes":["Text"]},"commentTime":{"expectedTypes":["Date"]},"creator":{"expectedTypes":["Organization","Person"]},"discusses":{"expectedTypes":["CreativeWork"]},"replyToUrl":{"expectedTypes":["URL"]}}},"UserDownloads":{"extends":"UserInteraction","properties":[]},"UserLikes":{"extends":"UserInteraction","properties":[]},"UserPageVisits":{"extends":"UserInteraction","properties":[]},"UserPlays":{"extends":"UserInteraction","properties":[]},"UserPlusOnes":{"extends":"UserInteraction","properties":[]},"UserTweets":{"extends":"UserInteraction","properties":[]},"VisualArtsEvent":{"extends":"Event","properties":[]},"Intangible":{"extends":"Thing","properties":[]},"AlignmentObject":{"extends":"Intangible","properties":{"alignmentType":{"expectedTypes":["Text"]},"educationalFramework":{"expectedTypes":["Text"]},"targetDescription":{"expectedTypes":["Text"]},"targetName":{"expectedTypes":["Text"]},"targetUrl":{"expectedTypes":["URL"]}}},"Audience":{"extends":"Intangible","properties":{"audienceType":{"expectedTypes":["Text"]},"geographicArea":{"expectedTypes":["AdministrativeArea"]}}},"BusinessAudience":{"extends":"Audience","properties":{"numberOfEmployees":{"expectedTypes":["QuantitativeValue"]},"yearlyRevenue":{"expectedTypes":["QuantitativeValue"]},"yearsInOperation":{"expectedTypes":["QuantitativeValue"]}}},"EducationalAudience":{"extends":"Audience","properties":{"educationalRole":{"expectedTypes":["Text"]}}},"MedicalAudience":{"extends":"Audience","properties":[]},"PeopleAudience":{"extends":"Audience","properties":{"healthCondition":{"expectedTypes":["MedicalCondition"]},"requiredGender":{"expectedTypes":["Text"]},"requiredMaxAge":{"expectedTypes":["Integer"]},"requiredMinAge":{"expectedTypes":["Integer"]},"suggestedGender":{"expectedTypes":["Text"]},"suggestedMaxAge":{"expectedTypes":["Number"]},"suggestedMinAge":{"expectedTypes":["Number"]}}},"ParentAudience":{"extends":"PeopleAudience","properties":{"childMaxAge":{"expectedTypes":["Number"]},"childMinAge":{"expectedTypes":["Number"]}}},"Brand":{"extends":"Intangible","properties":{"logo":{"expectedTypes":["ImageObject","URL"]}}},"BusTrip":{"extends":"Intangible","properties":{"arrivalBusStop":{"expectedTypes":["BusStation","BusStop"]},"arrivalTime":{"expectedTypes":["DateTime"]},"busName":{"expectedTypes":["Text"]},"busNumber":{"expectedTypes":["Text"]},"departureBusStop":{"expectedTypes":["BusStation","BusStop"]},"departureTime":{"expectedTypes":["DateTime"]},"provider":{"expectedTypes":["Person","Organization"]}}},"Class":{"extends":"Intangible","properties":[]},"Demand":{"extends":"Intangible","properties":{"acceptedPaymentMethod":{"expectedTypes":["PaymentMethod"]},"advanceBookingRequirement":{"expectedTypes":["QuantitativeValue"]},"availability":{"expectedTypes":["ItemAvailability"]},"availabilityEnds":{"expectedTypes":["DateTime"]},"availabilityStarts":{"expectedTypes":["DateTime"]},"availableAtOrFrom":{"expectedTypes":["Place"]},"availableDeliveryMethod":{"expectedTypes":["DeliveryMethod"]},"businessFunction":{"expectedTypes":["BusinessFunction"]},"deliveryLeadTime":{"expectedTypes":["QuantitativeValue"]},"eligibleCustomerType":{"expectedTypes":["BusinessEntityType"]},"eligibleDuration":{"expectedTypes":["QuantitativeValue"]},"eligibleQuantity":{"expectedTypes":["QuantitativeValue"]},"eligibleRegion":{"expectedTypes":["GeoShape","Text"]},"eligibleTransactionVolume":{"expectedTypes":["PriceSpecification"]},"gtin13":{"expectedTypes":["Text"]},"gtin14":{"expectedTypes":["Text"]},"gtin8":{"expectedTypes":["Text"]},"includesObject":{"expectedTypes":["TypeAndQuantityNode"]},"inventoryLevel":{"expectedTypes":["QuantitativeValue"]},"itemCondition":{"expectedTypes":["OfferItemCondition"]},"itemOffered":{"expectedTypes":["Product"]},"mpn":{"expectedTypes":["Text"]},"priceSpecification":{"expectedTypes":["PriceSpecification"]},"seller":{"expectedTypes":["Organization","Person"]},"serialNumber":{"expectedTypes":["Text"]},"sku":{"expectedTypes":["Text"]},"validFrom":{"expectedTypes":["DateTime"]},"validThrough":{"expectedTypes":["DateTime"]},"warranty":{"expectedTypes":["WarrantyPromise"]}}},"EntryPoint":{"extends":"Intangible","properties":{"application":{"expectedTypes":["SoftwareApplication"]},"contentType":{"expectedTypes":["Text"]},"encodingType":{"expectedTypes":["Text"]},"httpMethod":{"expectedTypes":["Text"]},"urlTemplate":{"expectedTypes":["Text"]}}},"Enumeration":{"extends":"Intangible","properties":[]},"ActionStatusType":{"extends":"Enumeration","properties":[]},"BookFormatType":{"extends":"Enumeration","properties":[]},"BusinessEntityType":{"extends":"Enumeration","properties":[]},"BusinessFunction":{"extends":"Enumeration","properties":[]},"ContactPointOption":{"extends":"Enumeration","properties":[]},"DayOfWeek":{"extends":"Enumeration","properties":[]},"DeliveryMethod":{"extends":"Enumeration","properties":[]},"LockerDelivery":{"extends":"DeliveryMethod","properties":[]},"ParcelService":{"extends":"DeliveryMethod","properties":[]},"DrugCostCategory":{"extends":"Enumeration","properties":[]},"DrugPregnancyCategory":{"extends":"MedicalEnumeration","properties":[]},"DrugPrescriptionStatus":{"extends":"Enumeration","properties":[]},"EventStatusType":{"extends":"Enumeration","properties":[]},"GamePlayMode":{"extends":"Enumeration","properties":[]},"GameServerStatus":{"extends":"Enumeration","properties":[]},"InfectiousAgentClass":{"extends":"MedicalEnumeration","properties":[]},"ItemAvailability":{"extends":"Enumeration","properties":[]},"ItemListOrderType":{"extends":"Enumeration","properties":[]},"MapCategoryType":{"extends":"Enumeration","properties":[]},"MedicalDevicePurpose":{"extends":"Enumeration","properties":[]},"MedicalEnumeration":{"extends":"Enumeration","properties":[]},"MedicalEvidenceLevel":{"extends":"Enumeration","properties":[]},"MedicalImagingTechnique":{"extends":"Enumeration","properties":[]},"MedicalObservationalStudyDesign":{"extends":"Enumeration","properties":[]},"MedicalProcedureType":{"extends":"MedicalEnumeration","properties":[]},"MedicalSpecialty":{"extends":"Enumeration","properties":[]},"MedicalStudyStatus":{"extends":"Enumeration","properties":[]},"MedicalTrialDesign":{"extends":"Enumeration","properties":[]},"MedicineSystem":{"extends":"Enumeration","properties":[]},"PhysicalActivityCategory":{"extends":"MedicalEnumeration","properties":[]},"PhysicalExam":{"extends":"Enumeration","properties":[]},"MusicAlbumProductionType":{"extends":"Enumeration","properties":[]},"MusicAlbumReleaseType":{"extends":"Enumeration","properties":[]},"MusicReleaseFormatType":{"extends":"Enumeration","properties":[]},"OfferItemCondition":{"extends":"Enumeration","properties":[]},"OrderStatus":{"extends":"Enumeration","properties":[]},"PaymentMethod":{"extends":"Enumeration","properties":[]},"CreditCard":{"extends":"PaymentMethod","properties":[]},"QualitativeValue":{"extends":"Enumeration","properties":{"equal":{"expectedTypes":["QualitativeValue"]},"greater":{"expectedTypes":["QualitativeValue"]},"greaterOrEqual":{"expectedTypes":["QualitativeValue"]},"lesser":{"expectedTypes":["QualitativeValue"]},"lesserOrEqual":{"expectedTypes":["QualitativeValue"]},"nonEqual":{"expectedTypes":["QualitativeValue"]},"valueReference":{"expectedTypes":["Enumeration","StructuredValue"]}}},"ReservationStatusType":{"extends":"Enumeration","properties":[]},"RsvpResponseType":{"extends":"Enumeration","properties":[]},"Specialty":{"extends":"Enumeration","properties":[]},"WarrantyScope":{"extends":"Enumeration","properties":[]},"Flight":{"extends":"Intangible","properties":{"aircraft":{"expectedTypes":["Vehicle","Text"]},"arrivalAirport":{"expectedTypes":["Airport"]},"arrivalGate":{"expectedTypes":["Text"]},"arrivalTerminal":{"expectedTypes":["Text"]},"arrivalTime":{"expectedTypes":["DateTime"]},"departureAirport":{"expectedTypes":["Airport"]},"departureGate":{"expectedTypes":["Text"]},"departureTerminal":{"expectedTypes":["Text"]},"departureTime":{"expectedTypes":["DateTime"]},"estimatedFlightDuration":{"expectedTypes":["Duration","Text"]},"flightDistance":{"expectedTypes":["Text","Distance"]},"flightNumber":{"expectedTypes":["Text"]},"mealService":{"expectedTypes":["Text"]},"provider":{"expectedTypes":["Organization","Person"]},"seller":{"expectedTypes":["Organization","Person"]},"webCheckinTime":{"expectedTypes":["DateTime"]}}},"GameServer":{"extends":"Intangible","properties":{"game":{"expectedTypes":["VideoGame"]},"playersOnline":{"expectedTypes":["Number"]},"serverStatus":{"expectedTypes":["GameServerStatus"]}}},"Invoice":{"extends":"Intangible","properties":{"accountId":{"expectedTypes":["Text"]},"billingPeriod":{"expectedTypes":["Duration"]},"broker":{"expectedTypes":["Person","Organization"]},"category":{"expectedTypes":["Text","PhysicalActivityCategory","Thing"]},"confirmationNumber":{"expectedTypes":["Text"]},"customer":{"expectedTypes":["Person","Organization"]},"minimumPaymentDue":{"expectedTypes":["PriceSpecification"]},"paymentDue":{"expectedTypes":["DateTime"]},"paymentMethod":{"expectedTypes":["PaymentMethod"]},"paymentMethodId":{"expectedTypes":["Text"]},"paymentStatus":{"expectedTypes":["Text"]},"provider":{"expectedTypes":["Person","Organization"]},"referencesOrder":{"expectedTypes":["Order"]},"scheduledPaymentDate":{"expectedTypes":["Date"]},"totalPaymentDue":{"expectedTypes":["PriceSpecification"]}}},"ItemList":{"extends":"Intangible","properties":{"itemListElement":{"expectedTypes":["Text","ListItem","Thing"]},"itemListOrder":{"expectedTypes":["Text","ItemListOrderType"]},"numberOfItems":{"expectedTypes":["Number"]}}},"BreadcrumbList":{"extends":"ItemList","properties":[]},"JobPosting":{"extends":"Intangible","properties":{"baseSalary":{"expectedTypes":["Number","PriceSpecification"]},"benefits":{"expectedTypes":["Text"]},"datePosted":{"expectedTypes":["Date"]},"educationRequirements":{"expectedTypes":["Text"]},"employmentType":{"expectedTypes":["Text"]},"experienceRequirements":{"expectedTypes":["Text"]},"hiringOrganization":{"expectedTypes":["Organization"]},"incentives":{"expectedTypes":["Text"]},"industry":{"expectedTypes":["Text"]},"jobLocation":{"expectedTypes":["Place"]},"occupationalCategory":{"expectedTypes":["Text"]},"qualifications":{"expectedTypes":["Text"]},"responsibilities":{"expectedTypes":["Text"]},"salaryCurrency":{"expectedTypes":["Text"]},"skills":{"expectedTypes":["Text"]},"specialCommitments":{"expectedTypes":["Text"]},"title":{"expectedTypes":["Text"]},"workHours":{"expectedTypes":["Text"]}}},"Language":{"extends":"Intangible","properties":[]},"ListItem":{"extends":"Intangible","properties":{"item":{"expectedTypes":["Thing"]},"nextItem":{"expectedTypes":["ListItem"]},"position":{"expectedTypes":["Text","Integer"]},"previousItem":{"expectedTypes":["ListItem"]}}},"Offer":{"extends":"Intangible","properties":{"acceptedPaymentMethod":{"expectedTypes":["PaymentMethod"]},"addOn":{"expectedTypes":["Offer"]},"advanceBookingRequirement":{"expectedTypes":["QuantitativeValue"]},"aggregateRating":{"expectedTypes":["AggregateRating"]},"availability":{"expectedTypes":["ItemAvailability"]},"availabilityEnds":{"expectedTypes":["DateTime"]},"availabilityStarts":{"expectedTypes":["DateTime"]},"availableAtOrFrom":{"expectedTypes":["Place"]},"availableDeliveryMethod":{"expectedTypes":["DeliveryMethod"]},"businessFunction":{"expectedTypes":["BusinessFunction"]},"category":{"expectedTypes":["PhysicalActivityCategory","Thing","Text"]},"deliveryLeadTime":{"expectedTypes":["QuantitativeValue"]},"eligibleCustomerType":{"expectedTypes":["BusinessEntityType"]},"eligibleDuration":{"expectedTypes":["QuantitativeValue"]},"eligibleQuantity":{"expectedTypes":["QuantitativeValue"]},"eligibleRegion":{"expectedTypes":["GeoShape","Text"]},"eligibleTransactionVolume":{"expectedTypes":["PriceSpecification"]},"gtin13":{"expectedTypes":["Text"]},"gtin14":{"expectedTypes":["Text"]},"gtin8":{"expectedTypes":["Text"]},"includesObject":{"expectedTypes":["TypeAndQuantityNode"]},"ineligibleRegion":{"expectedTypes":["Place"]},"inventoryLevel":{"expectedTypes":["QuantitativeValue"]},"itemCondition":{"expectedTypes":["OfferItemCondition"]},"itemOffered":{"expectedTypes":["Product"]},"mpn":{"expectedTypes":["Text"]},"price":{"expectedTypes":["Number","Text"]},"priceCurrency":{"expectedTypes":["Text"]},"priceSpecification":{"expectedTypes":["PriceSpecification"]},"priceValidUntil":{"expectedTypes":["Date"]},"review":{"expectedTypes":["Review"]},"seller":{"expectedTypes":["Organization","Person"]},"serialNumber":{"expectedTypes":["Text"]},"sku":{"expectedTypes":["Text"]},"validFrom":{"expectedTypes":["DateTime"]},"validThrough":{"expectedTypes":["DateTime"]},"warranty":{"expectedTypes":["WarrantyPromise"]}}},"AggregateOffer":{"extends":"Offer","properties":{"highPrice":{"expectedTypes":["Text","Number"]},"lowPrice":{"expectedTypes":["Text","Number"]},"offerCount":{"expectedTypes":["Integer"]},"offers":{"expectedTypes":["Offer"]}}},"Order":{"extends":"Intangible","properties":{"acceptedOffer":{"expectedTypes":["Offer"]},"billingAddress":{"expectedTypes":["PostalAddress"]},"broker":{"expectedTypes":["Person","Organization"]},"confirmationNumber":{"expectedTypes":["Text"]},"customer":{"expectedTypes":["Person","Organization"]},"discount":{"expectedTypes":["Text","Number"]},"discountCode":{"expectedTypes":["Text"]},"discountCurrency":{"expectedTypes":["Text"]},"isGift":{"expectedTypes":["Boolean"]},"orderDate":{"expectedTypes":["DateTime"]},"orderNumber":{"expectedTypes":["Text"]},"orderStatus":{"expectedTypes":["OrderStatus"]},"orderedItem":{"expectedTypes":["Product"]},"partOfInvoice":{"expectedTypes":["Invoice"]},"paymentDue":{"expectedTypes":["DateTime"]},"paymentMethod":{"expectedTypes":["PaymentMethod"]},"paymentMethodId":{"expectedTypes":["Text"]},"paymentUrl":{"expectedTypes":["URL"]},"seller":{"expectedTypes":["Person","Organization"]}}},"ParcelDelivery":{"extends":"Intangible","properties":{"deliveryAddress":{"expectedTypes":["PostalAddress"]},"deliveryStatus":{"expectedTypes":["DeliveryEvent"]},"expectedArrivalFrom":{"expectedTypes":["DateTime"]},"expectedArrivalUntil":{"expectedTypes":["DateTime"]},"hasDeliveryMethod":{"expectedTypes":["DeliveryMethod"]},"itemShipped":{"expectedTypes":["Product"]},"originAddress":{"expectedTypes":["PostalAddress"]},"partOfOrder":{"expectedTypes":["Order"]},"provider":{"expectedTypes":["Person","Organization"]},"trackingNumber":{"expectedTypes":["Text"]},"trackingUrl":{"expectedTypes":["URL"]}}},"Permit":{"extends":"Intangible","properties":{"issuedBy":{"expectedTypes":["Organization"]},"issuedThrough":{"expectedTypes":["Service"]},"permitAudience":{"expectedTypes":["Audience"]},"validFor":{"expectedTypes":["Duration"]},"validFrom":{"expectedTypes":["DateTime"]},"validIn":{"expectedTypes":["AdministrativeArea"]},"validUntil":{"expectedTypes":["Date"]}}},"GovernmentPermit":{"extends":"Permit","properties":[]},"ProgramMembership":{"extends":"Intangible","properties":{"hostingOrganization":{"expectedTypes":["Organization"]},"member":{"expectedTypes":["Person","Organization"]},"membershipNumber":{"expectedTypes":["Text"]},"programName":{"expectedTypes":["Text"]}}},"Property":{"extends":"Intangible","properties":{"domainIncludes":{"expectedTypes":["Class"]},"inverseOf":{"expectedTypes":["Property"]},"rangeIncludes":{"expectedTypes":["Class"]},"supersededBy":{"expectedTypes":["Property"]}}},"PropertyValueSpecification":{"extends":"Intangible","properties":{"defaultValue":{"expectedTypes":["Text","Thing"]},"maxValue":{"expectedTypes":["Number"]},"minValue":{"expectedTypes":["Number"]},"multipleValues":{"expectedTypes":["Boolean"]},"readonlyValue":{"expectedTypes":["Boolean"]},"stepValue":{"expectedTypes":["Number"]},"valueMaxLength":{"expectedTypes":["Number"]},"valueMinLength":{"expectedTypes":["Number"]},"valueName":{"expectedTypes":["Text"]},"valuePattern":{"expectedTypes":["Text"]},"valueRequired":{"expectedTypes":["Boolean"]}}},"Quantity":{"extends":"Intangible","properties":[]},"Distance":{"extends":"Quantity","properties":[]},"Duration":{"extends":"Quantity","properties":[]},"Energy":{"extends":"Quantity","properties":[]},"Mass":{"extends":"Quantity","properties":[]},"Rating":{"extends":"Intangible","properties":{"bestRating":{"expectedTypes":["Number","Text"]},"ratingValue":{"expectedTypes":["Text"]},"worstRating":{"expectedTypes":["Number","Text"]}}},"AggregateRating":{"extends":"Rating","properties":{"itemReviewed":{"expectedTypes":["Thing"]},"ratingCount":{"expectedTypes":["Number"]},"reviewCount":{"expectedTypes":["Number"]}}},"Reservation":{"extends":"Intangible","properties":{"bookingTime":{"expectedTypes":["DateTime"]},"broker":{"expectedTypes":["Organization","Person"]},"modifiedTime":{"expectedTypes":["DateTime"]},"priceCurrency":{"expectedTypes":["Text"]},"programMembershipUsed":{"expectedTypes":["ProgramMembership"]},"provider":{"expectedTypes":["Organization","Person"]},"reservationFor":{"expectedTypes":["Thing"]},"reservationId":{"expectedTypes":["Text"]},"reservationStatus":{"expectedTypes":["ReservationStatusType"]},"reservedTicket":{"expectedTypes":["Ticket"]},"totalPrice":{"expectedTypes":["Number","PriceSpecification","Text"]},"underName":{"expectedTypes":["Organization","Person"]}}},"BusReservation":{"extends":"Reservation","properties":[]},"EventReservation":{"extends":"Reservation","properties":[]},"FlightReservation":{"extends":"Reservation","properties":{"boardingGroup":{"expectedTypes":["Text"]}}},"FoodEstablishmentReservation":{"extends":"Reservation","properties":{"endTime":{"expectedTypes":["DateTime"]},"partySize":{"expectedTypes":["Number","QuantitativeValue"]},"startTime":{"expectedTypes":["DateTime"]}}},"LodgingReservation":{"extends":"Reservation","properties":{"checkinTime":{"expectedTypes":["DateTime"]},"checkoutTime":{"expectedTypes":["DateTime"]},"lodgingUnitDescription":{"expectedTypes":["Text"]},"lodgingUnitType":{"expectedTypes":["Text","QualitativeValue"]},"numAdults":{"expectedTypes":["QuantitativeValue","Number"]},"numChildren":{"expectedTypes":["QuantitativeValue","Number"]}}},"RentalCarReservation":{"extends":"Reservation","properties":{"dropoffLocation":{"expectedTypes":["Place"]},"dropoffTime":{"expectedTypes":["DateTime"]},"pickupLocation":{"expectedTypes":["Place"]},"pickupTime":{"expectedTypes":["DateTime"]}}},"ReservationPackage":{"extends":"Reservation","properties":{"subReservation":{"expectedTypes":["Reservation"]}}},"TaxiReservation":{"extends":"Reservation","properties":{"partySize":{"expectedTypes":["Number","QuantitativeValue"]},"pickupLocation":{"expectedTypes":["Place"]},"pickupTime":{"expectedTypes":["DateTime"]}}},"TrainReservation":{"extends":"Reservation","properties":[]},"Role":{"extends":"Intangible","properties":{"endDate":{"expectedTypes":["Date"]},"roleName":{"expectedTypes":["Text","URL"]},"startDate":{"expectedTypes":["Date"]}}},"OrganizationRole":{"extends":"Role","properties":{"numberedPosition":{"expectedTypes":["Number"]}}},"EmployeeRole":{"extends":"OrganizationRole","properties":{"baseSalary":{"expectedTypes":["Number","PriceSpecification"]},"salaryCurrency":{"expectedTypes":["Text"]}}},"PerformanceRole":{"extends":"Role","properties":{"characterName":{"expectedTypes":["Text"]}}},"Seat":{"extends":"Intangible","properties":{"seatNumber":{"expectedTypes":["Text"]},"seatRow":{"expectedTypes":["Text"]},"seatSection":{"expectedTypes":["Text"]},"seatingType":{"expectedTypes":["Text","QualitativeValue"]}}},"Service":{"extends":"Intangible","properties":{"availableChannel":{"expectedTypes":["ServiceChannel"]},"produces":{"expectedTypes":["Thing"]},"provider":{"expectedTypes":["Person","Organization"]},"serviceArea":{"expectedTypes":["AdministrativeArea"]},"serviceAudience":{"expectedTypes":["Audience"]},"serviceType":{"expectedTypes":["Text"]}}},"GovernmentService":{"extends":"Service","properties":{"serviceOperator":{"expectedTypes":["Organization"]}}},"Taxi":{"extends":"Service","properties":[]},"ServiceChannel":{"extends":"Intangible","properties":{"availableLanguage":{"expectedTypes":["Language"]},"processingTime":{"expectedTypes":["Duration"]},"providesService":{"expectedTypes":["Service"]},"serviceLocation":{"expectedTypes":["Place"]},"servicePhone":{"expectedTypes":["ContactPoint"]},"servicePostalAddress":{"expectedTypes":["PostalAddress"]},"serviceSmsNumber":{"expectedTypes":["ContactPoint"]},"serviceUrl":{"expectedTypes":["URL"]}}},"StructuredValue":{"extends":"Intangible","properties":[]},"ContactPoint":{"extends":"StructuredValue","properties":{"areaServed":{"expectedTypes":["AdministrativeArea"]},"availableLanguage":{"expectedTypes":["Language"]},"contactOption":{"expectedTypes":["ContactPointOption"]},"contactType":{"expectedTypes":["Text"]},"email":{"expectedTypes":["Text"]},"faxNumber":{"expectedTypes":["Text"]},"hoursAvailable":{"expectedTypes":["OpeningHoursSpecification"]},"productSupported":{"expectedTypes":["Product","Text"]},"telephone":{"expectedTypes":["Text"]}}},"PostalAddress":{"extends":"ContactPoint","properties":{"addressCountry":{"expectedTypes":["Country"]},"addressLocality":{"expectedTypes":["Text"]},"addressRegion":{"expectedTypes":["Text"]},"postOfficeBoxNumber":{"expectedTypes":["Text"]},"postalCode":{"expectedTypes":["Text"]},"streetAddress":{"expectedTypes":["Text"]}}},"DatedMoneySpecification":{"extends":"StructuredValue","properties":{"amount":{"expectedTypes":["Number"]},"currency":{"expectedTypes":["Text"]},"endDate":{"expectedTypes":["Date"]},"startDate":{"expectedTypes":["Date"]}}},"GeoCoordinates":{"extends":"StructuredValue","properties":{"elevation":{"expectedTypes":["Text","Number"]},"latitude":{"expectedTypes":["Text","Number"]},"longitude":{"expectedTypes":["Text","Number"]}}},"GeoShape":{"extends":"StructuredValue","properties":{"box":{"expectedTypes":["Text"]},"circle":{"expectedTypes":["Text"]},"elevation":{"expectedTypes":["Number","Text"]},"line":{"expectedTypes":["Text"]},"polygon":{"expectedTypes":["Text"]}}},"NutritionInformation":{"extends":"StructuredValue","properties":{"calories":{"expectedTypes":["Energy"]},"carbohydrateContent":{"expectedTypes":["Mass"]},"cholesterolContent":{"expectedTypes":["Mass"]},"fatContent":{"expectedTypes":["Mass"]},"fiberContent":{"expectedTypes":["Mass"]},"proteinContent":{"expectedTypes":["Mass"]},"saturatedFatContent":{"expectedTypes":["Mass"]},"servingSize":{"expectedTypes":["Text"]},"sodiumContent":{"expectedTypes":["Mass"]},"sugarContent":{"expectedTypes":["Mass"]},"transFatContent":{"expectedTypes":["Mass"]},"unsaturatedFatContent":{"expectedTypes":["Mass"]}}},"OpeningHoursSpecification":{"extends":"StructuredValue","properties":{"closes":{"expectedTypes":["Time"]},"dayOfWeek":{"expectedTypes":["DayOfWeek"]},"opens":{"expectedTypes":["Time"]},"validFrom":{"expectedTypes":["DateTime"]},"validThrough":{"expectedTypes":["DateTime"]}}},"OwnershipInfo":{"extends":"StructuredValue","properties":{"acquiredFrom":{"expectedTypes":["Organization","Person"]},"ownedFrom":{"expectedTypes":["DateTime"]},"ownedThrough":{"expectedTypes":["DateTime"]},"typeOfGood":{"expectedTypes":["Product"]}}},"PriceSpecification":{"extends":"StructuredValue","properties":{"eligibleQuantity":{"expectedTypes":["QuantitativeValue"]},"eligibleTransactionVolume":{"expectedTypes":["PriceSpecification"]},"maxPrice":{"expectedTypes":["Number"]},"minPrice":{"expectedTypes":["Number"]},"price":{"expectedTypes":["Number","Text"]},"priceCurrency":{"expectedTypes":["Text"]},"validFrom":{"expectedTypes":["DateTime"]},"validThrough":{"expectedTypes":["DateTime"]},"valueAddedTaxIncluded":{"expectedTypes":["Boolean"]}}},"DeliveryChargeSpecification":{"extends":"PriceSpecification","properties":{"appliesToDeliveryMethod":{"expectedTypes":["DeliveryMethod"]},"eligibleRegion":{"expectedTypes":["Text","GeoShape"]}}},"PaymentChargeSpecification":{"extends":"PriceSpecification","properties":{"appliesToDeliveryMethod":{"expectedTypes":["DeliveryMethod"]},"appliesToPaymentMethod":{"expectedTypes":["PaymentMethod"]}}},"UnitPriceSpecification":{"extends":"PriceSpecification","properties":{"billingIncrement":{"expectedTypes":["Number"]},"priceType":{"expectedTypes":["Text"]},"unitCode":{"expectedTypes":["Text"]}}},"QuantitativeValue":{"extends":"StructuredValue","properties":{"maxValue":{"expectedTypes":["Number"]},"minValue":{"expectedTypes":["Number"]},"unitCode":{"expectedTypes":["Text"]},"value":{"expectedTypes":["Number"]},"valueReference":{"expectedTypes":["StructuredValue","Enumeration"]}}},"TypeAndQuantityNode":{"extends":"StructuredValue","properties":{"amountOfThisGood":{"expectedTypes":["Number"]},"businessFunction":{"expectedTypes":["BusinessFunction"]},"typeOfGood":{"expectedTypes":["Product"]},"unitCode":{"expectedTypes":["Text"]}}},"WarrantyPromise":{"extends":"StructuredValue","properties":{"durationOfWarranty":{"expectedTypes":["QuantitativeValue"]},"warrantyScope":{"expectedTypes":["WarrantyScope"]}}},"Ticket":{"extends":"Intangible","properties":{"dateIssued":{"expectedTypes":["DateTime"]},"issuedBy":{"expectedTypes":["Organization"]},"priceCurrency":{"expectedTypes":["Text"]},"ticketNumber":{"expectedTypes":["Text"]},"ticketToken":{"expectedTypes":["Text","URL"]},"ticketedSeat":{"expectedTypes":["Seat"]},"totalPrice":{"expectedTypes":["Text","Number","PriceSpecification"]},"underName":{"expectedTypes":["Person","Organization"]}}},"TrainTrip":{"extends":"Intangible","properties":{"arrivalPlatform":{"expectedTypes":["Text"]},"arrivalStation":{"expectedTypes":["TrainStation"]},"arrivalTime":{"expectedTypes":["DateTime"]},"departurePlatform":{"expectedTypes":["Text"]},"departureStation":{"expectedTypes":["TrainStation"]},"departureTime":{"expectedTypes":["DateTime"]},"provider":{"expectedTypes":["Person","Organization"]},"trainName":{"expectedTypes":["Text"]},"trainNumber":{"expectedTypes":["Text"]}}},"MedicalEntity":{"extends":"Thing","properties":{"code":{"expectedTypes":["MedicalCode"]},"guideline":{"expectedTypes":["MedicalGuideline"]},"medicineSystem":{"expectedTypes":["MedicineSystem"]},"recognizingAuthority":{"expectedTypes":["Organization"]},"relevantSpecialty":{"expectedTypes":["MedicalSpecialty"]},"study":{"expectedTypes":["MedicalStudy"]}}},"AnatomicalStructure":{"extends":"MedicalEntity","properties":{"associatedPathophysiology":{"expectedTypes":["Text"]},"bodyLocation":{"expectedTypes":["Text"]},"connectedTo":{"expectedTypes":["AnatomicalStructure"]},"diagram":{"expectedTypes":["ImageObject"]},"function":{"expectedTypes":["Text"]},"partOfSystem":{"expectedTypes":["AnatomicalSystem"]},"relatedCondition":{"expectedTypes":["MedicalCondition"]},"relatedTherapy":{"expectedTypes":["MedicalTherapy"]},"subStructure":{"expectedTypes":["AnatomicalStructure"]}}},"Bone":{"extends":"AnatomicalStructure","properties":[]},"BrainStructure":{"extends":"AnatomicalStructure","properties":[]},"Joint":{"extends":"AnatomicalStructure","properties":{"biomechnicalClass":{"expectedTypes":["Text"]},"functionalClass":{"expectedTypes":["Text"]},"structuralClass":{"expectedTypes":["Text"]}}},"Ligament":{"extends":"AnatomicalStructure","properties":[]},"Muscle":{"extends":"AnatomicalStructure","properties":{"antagonist":{"expectedTypes":["Muscle"]},"bloodSupply":{"expectedTypes":["Vessel"]},"insertion":{"expectedTypes":["AnatomicalStructure"]},"muscleAction":{"expectedTypes":["Text"]},"nerve":{"expectedTypes":["Nerve"]},"origin":{"expectedTypes":["AnatomicalStructure"]}}},"Nerve":{"extends":"AnatomicalStructure","properties":{"branch":{"expectedTypes":["AnatomicalStructure"]},"nerveMotor":{"expectedTypes":["Muscle"]},"sensoryUnit":{"expectedTypes":["SuperficialAnatomy","AnatomicalStructure"]},"sourcedFrom":{"expectedTypes":["BrainStructure"]}}},"Vessel":{"extends":"AnatomicalStructure","properties":[]},"Artery":{"extends":"Vessel","properties":{"arterialBranch":{"expectedTypes":["AnatomicalStructure"]},"source":{"expectedTypes":["AnatomicalStructure"]},"supplyTo":{"expectedTypes":["AnatomicalStructure"]}}},"LymphaticVessel":{"extends":"Vessel","properties":{"originatesFrom":{"expectedTypes":["Vessel"]},"regionDrained":{"expectedTypes":["AnatomicalSystem","AnatomicalStructure"]},"runsTo":{"expectedTypes":["Vessel"]}}},"Vein":{"extends":"Vessel","properties":{"drainsTo":{"expectedTypes":["Vessel"]},"regionDrained":{"expectedTypes":["AnatomicalSystem","AnatomicalStructure"]},"tributary":{"expectedTypes":["AnatomicalStructure"]}}},"AnatomicalSystem":{"extends":"MedicalEntity","properties":{"associatedPathophysiology":{"expectedTypes":["Text"]},"comprisedOf":{"expectedTypes":["AnatomicalSystem","AnatomicalStructure"]},"relatedCondition":{"expectedTypes":["MedicalCondition"]},"relatedStructure":{"expectedTypes":["AnatomicalStructure"]},"relatedTherapy":{"expectedTypes":["MedicalTherapy"]}}},"MedicalCause":{"extends":"MedicalEntity","properties":{"causeOf":{"expectedTypes":["MedicalEntity"]}}},"MedicalCondition":{"extends":"MedicalEntity","properties":{"associatedAnatomy":{"expectedTypes":["AnatomicalSystem","SuperficialAnatomy","AnatomicalStructure"]},"cause":{"expectedTypes":["MedicalCause"]},"differentialDiagnosis":{"expectedTypes":["DDxElement"]},"epidemiology":{"expectedTypes":["Text"]},"expectedPrognosis":{"expectedTypes":["Text"]},"naturalProgression":{"expectedTypes":["Text"]},"pathophysiology":{"expectedTypes":["Text"]},"possibleComplication":{"expectedTypes":["Text"]},"possibleTreatment":{"expectedTypes":["MedicalTherapy"]},"primaryPrevention":{"expectedTypes":["MedicalTherapy"]},"riskFactor":{"expectedTypes":["MedicalRiskFactor"]},"secondaryPrevention":{"expectedTypes":["MedicalTherapy"]},"signOrSymptom":{"expectedTypes":["MedicalSignOrSymptom"]},"stage":{"expectedTypes":["MedicalConditionStage"]},"subtype":{"expectedTypes":["Text"]},"typicalTest":{"expectedTypes":["MedicalTest"]}}},"InfectiousDisease":{"extends":"MedicalCondition","properties":{"infectiousAgent":{"expectedTypes":["Text"]},"infectiousAgentClass":{"expectedTypes":["InfectiousAgentClass"]},"transmissionMethod":{"expectedTypes":["Text"]}}},"MedicalContraindication":{"extends":"MedicalEntity","properties":[]},"MedicalDevice":{"extends":"MedicalEntity","properties":{"adverseOutcome":{"expectedTypes":["MedicalEntity"]},"contraindication":{"expectedTypes":["MedicalContraindication"]},"indication":{"expectedTypes":["MedicalIndication"]},"postOp":{"expectedTypes":["Text"]},"preOp":{"expectedTypes":["Text"]},"procedure":{"expectedTypes":["Text"]},"purpose":{"expectedTypes":["MedicalDevicePurpose","Thing"]},"seriousAdverseOutcome":{"expectedTypes":["MedicalEntity"]}}},"MedicalGuideline":{"extends":"MedicalEntity","properties":{"evidenceLevel":{"expectedTypes":["MedicalEvidenceLevel"]},"evidenceOrigin":{"expectedTypes":["Text"]},"guidelineDate":{"expectedTypes":["Date"]},"guidelineSubject":{"expectedTypes":["MedicalEntity"]}}},"MedicalGuidelineContraindication":{"extends":"MedicalGuideline","properties":[]},"MedicalGuidelineRecommendation":{"extends":"MedicalGuideline","properties":{"recommendationStrength":{"expectedTypes":["Text"]}}},"MedicalIndication":{"extends":"MedicalEntity","properties":[]},"ApprovedIndication":{"extends":"MedicalIndication","properties":[]},"PreventionIndication":{"extends":"MedicalIndication","properties":[]},"TreatmentIndication":{"extends":"MedicalIndication","properties":[]},"MedicalIntangible":{"extends":"MedicalEntity","properties":[]},"DDxElement":{"extends":"MedicalIntangible","properties":{"diagnosis":{"expectedTypes":["MedicalCondition"]},"distinguishingSign":{"expectedTypes":["MedicalSignOrSymptom"]}}},"DoseSchedule":{"extends":"MedicalIntangible","properties":{"doseUnit":{"expectedTypes":["Text"]},"doseValue":{"expectedTypes":["Number"]},"frequency":{"expectedTypes":["Text"]},"targetPopulation":{"expectedTypes":["Text"]}}},"MaximumDoseSchedule":{"extends":"DoseSchedule","properties":[]},"RecommendedDoseSchedule":{"extends":"DoseSchedule","properties":[]},"ReportedDoseSchedule":{"extends":"DoseSchedule","properties":[]},"DrugCost":{"extends":"MedicalIntangible","properties":{"applicableLocation":{"expectedTypes":["AdministrativeArea"]},"costCategory":{"expectedTypes":["DrugCostCategory"]},"costCurrency":{"expectedTypes":["Text"]},"costOrigin":{"expectedTypes":["Text"]},"costPerUnit":{"expectedTypes":["Text","Number"]},"drugUnit":{"expectedTypes":["Text"]}}},"DrugLegalStatus":{"extends":"MedicalIntangible","properties":{"applicableLocation":{"expectedTypes":["AdministrativeArea"]}}},"DrugStrength":{"extends":"MedicalIntangible","properties":{"activeIngredient":{"expectedTypes":["Text"]},"availableIn":{"expectedTypes":["AdministrativeArea"]},"strengthUnit":{"expectedTypes":["Text"]},"strengthValue":{"expectedTypes":["Number"]}}},"MedicalCode":{"extends":"MedicalIntangible","properties":{"codeValue":{"expectedTypes":["Text"]},"codingSystem":{"expectedTypes":["Text"]}}},"MedicalConditionStage":{"extends":"MedicalIntangible","properties":{"stageAsNumber":{"expectedTypes":["Number"]},"subStageSuffix":{"expectedTypes":["Text"]}}},"":{"extends":"","properties":[]},"MedicalProcedure":{"extends":"MedicalEntity","properties":{"followup":{"expectedTypes":["Text"]},"howPerformed":{"expectedTypes":["Text"]},"preparation":{"expectedTypes":["Text"]},"procedureType":{"expectedTypes":["MedicalProcedureType"]}}},"DiagnosticProcedure":{"extends":"MedicalProcedure","properties":[]},"PalliativeProcedure":{"extends":"MedicalTherapy","properties":[]},"TherapeuticProcedure":{"extends":"MedicalTherapy","properties":[]},"MedicalRiskEstimator":{"extends":"MedicalEntity","properties":{"estimatesRiskOf":{"expectedTypes":["MedicalEntity"]},"includedRiskFactor":{"expectedTypes":["MedicalRiskFactor"]}}},"MedicalRiskCalculator":{"extends":"MedicalRiskEstimator","properties":[]},"MedicalRiskScore":{"extends":"MedicalRiskEstimator","properties":{"algorithm":{"expectedTypes":["Text"]}}},"MedicalRiskFactor":{"extends":"MedicalEntity","properties":{"increasesRiskOf":{"expectedTypes":["MedicalEntity"]}}},"MedicalSignOrSymptom":{"extends":"MedicalEntity","properties":{"cause":{"expectedTypes":["MedicalCause"]},"possibleTreatment":{"expectedTypes":["MedicalTherapy"]}}},"MedicalSign":{"extends":"MedicalSignOrSymptom","properties":{"identifyingExam":{"expectedTypes":["PhysicalExam"]},"identifyingTest":{"expectedTypes":["MedicalTest"]}}},"MedicalSymptom":{"extends":"MedicalSignOrSymptom","properties":[]},"MedicalStudy":{"extends":"MedicalEntity","properties":{"outcome":{"expectedTypes":["Text"]},"population":{"expectedTypes":["Text"]},"sponsor":{"expectedTypes":["Organization"]},"status":{"expectedTypes":["MedicalStudyStatus"]},"studyLocation":{"expectedTypes":["AdministrativeArea"]},"studySubject":{"expectedTypes":["MedicalEntity"]}}},"MedicalObservationalStudy":{"extends":"MedicalStudy","properties":{"studyDesign":{"expectedTypes":["MedicalObservationalStudyDesign"]}}},"MedicalTrial":{"extends":"MedicalStudy","properties":{"phase":{"expectedTypes":["Text"]},"trialDesign":{"expectedTypes":["MedicalTrialDesign"]}}},"MedicalTest":{"extends":"MedicalEntity","properties":{"affectedBy":{"expectedTypes":["Drug"]},"normalRange":{"expectedTypes":["Text"]},"signDetected":{"expectedTypes":["MedicalSign"]},"usedToDiagnose":{"expectedTypes":["MedicalCondition"]},"usesDevice":{"expectedTypes":["MedicalDevice"]}}},"BloodTest":{"extends":"MedicalTest","properties":[]},"ImagingTest":{"extends":"MedicalTest","properties":{"imagingTechnique":{"expectedTypes":["MedicalImagingTechnique"]}}},"MedicalTestPanel":{"extends":"MedicalTest","properties":{"subTest":{"expectedTypes":["MedicalTest"]}}},"PathologyTest":{"extends":"MedicalTest","properties":{"tissueSample":{"expectedTypes":["Text"]}}},"MedicalTherapy":{"extends":"MedicalEntity","properties":{"adverseOutcome":{"expectedTypes":["MedicalEntity"]},"contraindication":{"expectedTypes":["MedicalContraindication"]},"duplicateTherapy":{"expectedTypes":["MedicalTherapy"]},"indication":{"expectedTypes":["MedicalIndication"]},"seriousAdverseOutcome":{"expectedTypes":["MedicalEntity"]}}},"DietarySupplement":{"extends":"MedicalTherapy","properties":{"activeIngredient":{"expectedTypes":["Text"]},"background":{"expectedTypes":["Text"]},"dosageForm":{"expectedTypes":["Text"]},"isProprietary":{"expectedTypes":["Boolean"]},"legalStatus":{"expectedTypes":["DrugLegalStatus"]},"manufacturer":{"expectedTypes":["Organization"]},"maximumIntake":{"expectedTypes":["MaximumDoseSchedule"]},"mechanismOfAction":{"expectedTypes":["Text"]},"nonProprietaryName":{"expectedTypes":["Text"]},"recommendedIntake":{"expectedTypes":["RecommendedDoseSchedule"]},"safetyConsideration":{"expectedTypes":["Text"]},"targetPopulation":{"expectedTypes":["Text"]}}},"Drug":{"extends":"MedicalTherapy","properties":{"activeIngredient":{"expectedTypes":["Text"]},"administrationRoute":{"expectedTypes":["Text"]},"alcoholWarning":{"expectedTypes":["Text"]},"availableStrength":{"expectedTypes":["DrugStrength"]},"breastfeedingWarning":{"expectedTypes":["Text"]},"clinicalPharmacology":{"expectedTypes":["Text"]},"cost":{"expectedTypes":["DrugCost"]},"dosageForm":{"expectedTypes":["Text"]},"doseSchedule":{"expectedTypes":["DoseSchedule"]},"drugClass":{"expectedTypes":["DrugClass"]},"foodWarning":{"expectedTypes":["Text"]},"interactingDrug":{"expectedTypes":["Drug"]},"isAvailableGenerically":{"expectedTypes":["Boolean"]},"isProprietary":{"expectedTypes":["Boolean"]},"labelDetails":{"expectedTypes":["URL"]},"legalStatus":{"expectedTypes":["DrugLegalStatus"]},"manufacturer":{"expectedTypes":["Organization"]},"mechanismOfAction":{"expectedTypes":["Text"]},"nonProprietaryName":{"expectedTypes":["Text"]},"overdosage":{"expectedTypes":["Text"]},"pregnancyCategory":{"expectedTypes":["DrugPregnancyCategory"]},"pregnancyWarning":{"expectedTypes":["Text"]},"prescribingInfo":{"expectedTypes":["URL"]},"prescriptionStatus":{"expectedTypes":["DrugPrescriptionStatus"]},"relatedDrug":{"expectedTypes":["Drug"]},"warning":{"expectedTypes":["Text","URL"]}}},"DrugClass":{"extends":"MedicalTherapy","properties":{"drug":{"expectedTypes":["Drug"]}}},"LifestyleModification":{"extends":"MedicalTherapy","properties":[]},"PhysicalActivity":{"extends":"LifestyleModification","properties":{"associatedAnatomy":{"expectedTypes":["AnatomicalSystem","SuperficialAnatomy","AnatomicalStructure"]},"category":{"expectedTypes":["PhysicalActivityCategory","Thing","Text"]},"epidemiology":{"expectedTypes":["Text"]},"pathophysiology":{"expectedTypes":["Text"]}}},"PhysicalTherapy":{"extends":"MedicalTherapy","properties":[]},"PsychologicalTreatment":{"extends":"MedicalTherapy","properties":[]},"RadiationTherapy":{"extends":"MedicalTherapy","properties":[]},"SuperficialAnatomy":{"extends":"MedicalEntity","properties":{"associatedPathophysiology":{"expectedTypes":["Text"]},"relatedAnatomy":{"expectedTypes":["AnatomicalSystem","AnatomicalStructure"]},"relatedCondition":{"expectedTypes":["MedicalCondition"]},"relatedTherapy":{"expectedTypes":["MedicalTherapy"]},"significance":{"expectedTypes":["Text"]}}},"Organization":{"extends":"Thing","properties":{"address":{"expectedTypes":["PostalAddress"]},"aggregateRating":{"expectedTypes":["AggregateRating"]},"brand":{"expectedTypes":["Brand","Organization"]},"contactPoint":{"expectedTypes":["ContactPoint"]},"department":{"expectedTypes":["Organization"]},"dissolutionDate":{"expectedTypes":["Date"]},"duns":{"expectedTypes":["Text"]},"email":{"expectedTypes":["Text"]},"employee":{"expectedTypes":["Person"]},"event":{"expectedTypes":["Event"]},"faxNumber":{"expectedTypes":["Text"]},"founder":{"expectedTypes":["Person"]},"foundingDate":{"expectedTypes":["Date"]},"foundingLocation":{"expectedTypes":["Place"]},"globalLocationNumber":{"expectedTypes":["Text"]},"hasPOS":{"expectedTypes":["Place"]},"interactionCount":{"expectedTypes":["Text"]},"isicV4":{"expectedTypes":["Text"]},"legalName":{"expectedTypes":["Text"]},"location":{"expectedTypes":["Place","PostalAddress"]},"logo":{"expectedTypes":["ImageObject","URL"]},"makesOffer":{"expectedTypes":["Offer"]},"member":{"expectedTypes":["Person","Organization"]},"memberOf":{"expectedTypes":["ProgramMembership","Organization"]},"naics":{"expectedTypes":["Text"]},"owns":{"expectedTypes":["Product","OwnershipInfo"]},"review":{"expectedTypes":["Review"]},"seeks":{"expectedTypes":["Demand"]},"subOrganization":{"expectedTypes":["Organization"]},"taxID":{"expectedTypes":["Text"]},"telephone":{"expectedTypes":["Text"]},"vatID":{"expectedTypes":["Text"]}}},"Airline":{"extends":"Organization","properties":{"iataCode":{"expectedTypes":["Text"]}}},"Corporation":{"extends":"Organization","properties":{"tickerSymbol":{"expectedTypes":["Text"]}}},"EducationalOrganization":{"extends":"Organization","properties":{"alumni":{"expectedTypes":["Person"]}}},"CollegeOrUniversity":{"extends":"EducationalOrganization","properties":[]},"ElementarySchool":{"extends":"EducationalOrganization","properties":[]},"HighSchool":{"extends":"EducationalOrganization","properties":[]},"MiddleSchool":{"extends":"EducationalOrganization","properties":[]},"Preschool":{"extends":"EducationalOrganization","properties":[]},"School":{"extends":"EducationalOrganization","properties":[]},"GovernmentOrganization":{"extends":"Organization","properties":[]},"LocalBusiness":{"extends":"Organization","properties":{"branchOf":{"expectedTypes":["Organization"]},"currenciesAccepted":{"expectedTypes":["Text"]},"openingHours":{"expectedTypes":["Duration"]},"paymentAccepted":{"expectedTypes":["Text"]},"priceRange":{"expectedTypes":["Text"]}}},"AnimalShelter":{"extends":"LocalBusiness","properties":[]},"AutomotiveBusiness":{"extends":"LocalBusiness","properties":[]},"AutoBodyShop":{"extends":"AutomotiveBusiness","properties":[]},"AutoDealer":{"extends":"AutomotiveBusiness","properties":[]},"AutoPartsStore":{"extends":"Store","properties":[]},"AutoRental":{"extends":"AutomotiveBusiness","properties":[]},"AutoRepair":{"extends":"AutomotiveBusiness","properties":[]},"AutoWash":{"extends":"AutomotiveBusiness","properties":[]},"GasStation":{"extends":"AutomotiveBusiness","properties":[]},"MotorcycleDealer":{"extends":"AutomotiveBusiness","properties":[]},"MotorcycleRepair":{"extends":"AutomotiveBusiness","properties":[]},"ChildCare":{"extends":"LocalBusiness","properties":[]},"DryCleaningOrLaundry":{"extends":"LocalBusiness","properties":[]},"EmergencyService":{"extends":"LocalBusiness","properties":[]},"FireStation":{"extends":"CivicStructure","properties":[]},"Hospital":{"extends":"MedicalOrganization","properties":{"availableService":{"expectedTypes":["MedicalTest","MedicalTherapy","MedicalProcedure"]},"medicalSpecialty":{"expectedTypes":["MedicalSpecialty"]}}},"PoliceStation":{"extends":"CivicStructure","properties":[]},"EmploymentAgency":{"extends":"LocalBusiness","properties":[]},"EntertainmentBusiness":{"extends":"LocalBusiness","properties":[]},"AdultEntertainment":{"extends":"EntertainmentBusiness","properties":[]},"AmusementPark":{"extends":"EntertainmentBusiness","properties":[]},"ArtGallery":{"extends":"EntertainmentBusiness","properties":[]},"Casino":{"extends":"EntertainmentBusiness","properties":[]},"ComedyClub":{"extends":"EntertainmentBusiness","properties":[]},"MovieTheater":{"extends":"EntertainmentBusiness","properties":[]},"NightClub":{"extends":"EntertainmentBusiness","properties":[]},"FinancialService":{"extends":"LocalBusiness","properties":[]},"AccountingService":{"extends":"FinancialService","properties":[]},"AutomatedTeller":{"extends":"FinancialService","properties":[]},"BankOrCreditUnion":{"extends":"FinancialService","properties":[]},"InsuranceAgency":{"extends":"FinancialService","properties":[]},"FoodEstablishment":{"extends":"LocalBusiness","properties":{"acceptsReservations":{"expectedTypes":["Text","Boolean","URL"]},"menu":{"expectedTypes":["Text","URL"]},"servesCuisine":{"expectedTypes":["Text"]}}},"Bakery":{"extends":"FoodEstablishment","properties":[]},"BarOrPub":{"extends":"FoodEstablishment","properties":[]},"Brewery":{"extends":"FoodEstablishment","properties":[]},"CafeOrCoffeeShop":{"extends":"FoodEstablishment","properties":[]},"FastFoodRestaurant":{"extends":"FoodEstablishment","properties":[]},"IceCreamShop":{"extends":"FoodEstablishment","properties":[]},"Restaurant":{"extends":"FoodEstablishment","properties":[]},"Winery":{"extends":"FoodEstablishment","properties":[]},"GovernmentOffice":{"extends":"LocalBusiness","properties":[]},"PostOffice":{"extends":"GovernmentOffice","properties":[]},"HealthAndBeautyBusiness":{"extends":"LocalBusiness","properties":[]},"BeautySalon":{"extends":"HealthAndBeautyBusiness","properties":[]},"DaySpa":{"extends":"HealthAndBeautyBusiness","properties":[]},"HairSalon":{"extends":"HealthAndBeautyBusiness","properties":[]},"HealthClub":{"extends":"HealthAndBeautyBusiness","properties":[]},"NailSalon":{"extends":"HealthAndBeautyBusiness","properties":[]},"TattooParlor":{"extends":"HealthAndBeautyBusiness","properties":[]},"HomeAndConstructionBusiness":{"extends":"LocalBusiness","properties":[]},"Electrician":{"extends":"HomeAndConstructionBusiness","properties":[]},"GeneralContractor":{"extends":"HomeAndConstructionBusiness","properties":[]},"HVACBusiness":{"extends":"HomeAndConstructionBusiness","properties":[]},"HousePainter":{"extends":"HomeAndConstructionBusiness","properties":[]},"Locksmith":{"extends":"HomeAndConstructionBusiness","properties":[]},"MovingCompany":{"extends":"HomeAndConstructionBusiness","properties":[]},"Plumber":{"extends":"HomeAndConstructionBusiness","properties":[]},"RoofingContractor":{"extends":"HomeAndConstructionBusiness","properties":[]},"InternetCafe":{"extends":"LocalBusiness","properties":[]},"Library":{"extends":"LocalBusiness","properties":[]},"LodgingBusiness":{"extends":"LocalBusiness","properties":[]},"BedAndBreakfast":{"extends":"LodgingBusiness","properties":[]},"Hostel":{"extends":"LodgingBusiness","properties":[]},"Hotel":{"extends":"LodgingBusiness","properties":[]},"Motel":{"extends":"LodgingBusiness","properties":[]},"MedicalOrganization":{"extends":"LocalBusiness","properties":[]},"Dentist":{"extends":"MedicalOrganization","properties":[]},"DiagnosticLab":{"extends":"MedicalOrganization","properties":{"availableTest":{"expectedTypes":["MedicalTest"]}}},"MedicalClinic":{"extends":"MedicalOrganization","properties":{"availableService":{"expectedTypes":["MedicalTherapy","MedicalProcedure","MedicalTest"]},"medicalSpecialty":{"expectedTypes":["MedicalSpecialty"]}}},"Optician":{"extends":"MedicalOrganization","properties":[]},"Pharmacy":{"extends":"MedicalOrganization","properties":[]},"Physician":{"extends":"MedicalOrganization","properties":{"availableService":{"expectedTypes":["MedicalTherapy","MedicalProcedure","MedicalTest"]},"hospitalAffiliation":{"expectedTypes":["Hospital"]},"medicalSpecialty":{"expectedTypes":["MedicalSpecialty"]}}},"VeterinaryCare":{"extends":"MedicalOrganization","properties":[]},"ProfessionalService":{"extends":"LocalBusiness","properties":[]},"Attorney":{"extends":"ProfessionalService","properties":[]},"Notary":{"extends":"ProfessionalService","properties":[]},"RadioStation":{"extends":"LocalBusiness","properties":[]},"RealEstateAgent":{"extends":"LocalBusiness","properties":[]},"RecyclingCenter":{"extends":"LocalBusiness","properties":[]},"SelfStorage":{"extends":"LocalBusiness","properties":[]},"ShoppingCenter":{"extends":"LocalBusiness","properties":[]},"SportsActivityLocation":{"extends":"LocalBusiness","properties":[]},"BowlingAlley":{"extends":"SportsActivityLocation","properties":[]},"ExerciseGym":{"extends":"SportsActivityLocation","properties":[]},"GolfCourse":{"extends":"SportsActivityLocation","properties":[]},"PublicSwimmingPool":{"extends":"SportsActivityLocation","properties":[]},"SkiResort":{"extends":"SportsActivityLocation","properties":[]},"SportsClub":{"extends":"SportsActivityLocation","properties":[]},"StadiumOrArena":{"extends":"CivicStructure","properties":[]},"TennisComplex":{"extends":"SportsActivityLocation","properties":[]},"Store":{"extends":"LocalBusiness","properties":[]},"BikeStore":{"extends":"Store","properties":[]},"BookStore":{"extends":"Store","properties":[]},"ClothingStore":{"extends":"Store","properties":[]},"ComputerStore":{"extends":"Store","properties":[]},"ConvenienceStore":{"extends":"Store","properties":[]},"DepartmentStore":{"extends":"Store","properties":[]},"ElectronicsStore":{"extends":"Store","properties":[]},"Florist":{"extends":"Store","properties":[]},"FurnitureStore":{"extends":"Store","properties":[]},"GardenStore":{"extends":"Store","properties":[]},"GroceryStore":{"extends":"Store","properties":[]},"HardwareStore":{"extends":"Store","properties":[]},"HobbyShop":{"extends":"Store","properties":[]},"HomeGoodsStore":{"extends":"Store","properties":[]},"JewelryStore":{"extends":"Store","properties":[]},"LiquorStore":{"extends":"Store","properties":[]},"MensClothingStore":{"extends":"Store","properties":[]},"MobilePhoneStore":{"extends":"Store","properties":[]},"MovieRentalStore":{"extends":"Store","properties":[]},"MusicStore":{"extends":"Store","properties":[]},"OfficeEquipmentStore":{"extends":"Store","properties":[]},"OutletStore":{"extends":"Store","properties":[]},"PawnShop":{"extends":"Store","properties":[]},"PetStore":{"extends":"Store","properties":[]},"ShoeStore":{"extends":"Store","properties":[]},"SportingGoodsStore":{"extends":"Store","properties":[]},"TireShop":{"extends":"Store","properties":[]},"ToyStore":{"extends":"Store","properties":[]},"WholesaleStore":{"extends":"Store","properties":[]},"TelevisionStation":{"extends":"LocalBusiness","properties":[]},"TouristInformationCenter":{"extends":"LocalBusiness","properties":[]},"TravelAgency":{"extends":"LocalBusiness","properties":[]},"NGO":{"extends":"Organization","properties":[]},"PerformingGroup":{"extends":"Organization","properties":[]},"DanceGroup":{"extends":"PerformingGroup","properties":[]},"MusicGroup":{"extends":"PerformingGroup","properties":{"album":{"expectedTypes":["MusicAlbum"]},"genre":{"expectedTypes":["Text"]},"track":{"expectedTypes":["ItemList","MusicRecording"]}}},"TheaterGroup":{"extends":"PerformingGroup","properties":[]},"SportsOrganization":{"extends":"Organization","properties":{"sport":{"expectedTypes":["Text","URL"]}}},"SportsTeam":{"extends":"SportsOrganization","properties":{"athlete":{"expectedTypes":["Person"]},"coach":{"expectedTypes":["Person"]}}},"Person":{"extends":"Thing","properties":{"additionalName":{"expectedTypes":["Text"]},"address":{"expectedTypes":["PostalAddress"]},"affiliation":{"expectedTypes":["Organization"]},"alumniOf":{"expectedTypes":["EducationalOrganization"]},"award":{"expectedTypes":["Text"]},"birthDate":{"expectedTypes":["Date"]},"birthPlace":{"expectedTypes":["Place"]},"brand":{"expectedTypes":["Brand","Organization"]},"children":{"expectedTypes":["Person"]},"colleague":{"expectedTypes":["Person"]},"contactPoint":{"expectedTypes":["ContactPoint"]},"deathDate":{"expectedTypes":["Date"]},"deathPlace":{"expectedTypes":["Place"]},"duns":{"expectedTypes":["Text"]},"email":{"expectedTypes":["Text"]},"familyName":{"expectedTypes":["Text"]},"faxNumber":{"expectedTypes":["Text"]},"follows":{"expectedTypes":["Person"]},"gender":{"expectedTypes":["Text"]},"givenName":{"expectedTypes":["Text"]},"globalLocationNumber":{"expectedTypes":["Text"]},"hasPOS":{"expectedTypes":["Place"]},"height":{"expectedTypes":["Distance","QuantitativeValue"]},"homeLocation":{"expectedTypes":["ContactPoint","Place"]},"honorificPrefix":{"expectedTypes":["Text"]},"honorificSuffix":{"expectedTypes":["Text"]},"interactionCount":{"expectedTypes":["Text"]},"isicV4":{"expectedTypes":["Text"]},"jobTitle":{"expectedTypes":["Text"]},"knows":{"expectedTypes":["Person"]},"makesOffer":{"expectedTypes":["Offer"]},"memberOf":{"expectedTypes":["ProgramMembership","Organization"]},"naics":{"expectedTypes":["Text"]},"nationality":{"expectedTypes":["Country"]},"netWorth":{"expectedTypes":["PriceSpecification"]},"owns":{"expectedTypes":["Product","OwnershipInfo"]},"parent":{"expectedTypes":["Person"]},"performerIn":{"expectedTypes":["Event"]},"relatedTo":{"expectedTypes":["Person"]},"seeks":{"expectedTypes":["Demand"]},"sibling":{"expectedTypes":["Person"]},"spouse":{"expectedTypes":["Person"]},"taxID":{"expectedTypes":["Text"]},"telephone":{"expectedTypes":["Text"]},"vatID":{"expectedTypes":["Text"]},"weight":{"expectedTypes":["QuantitativeValue"]},"workLocation":{"expectedTypes":["ContactPoint","Place"]},"worksFor":{"expectedTypes":["Organization"]}}},"Place":{"extends":"Thing","properties":{"address":{"expectedTypes":["PostalAddress"]},"aggregateRating":{"expectedTypes":["AggregateRating"]},"containedIn":{"expectedTypes":["Place"]},"event":{"expectedTypes":["Event"]},"faxNumber":{"expectedTypes":["Text"]},"geo":{"expectedTypes":["GeoCoordinates","GeoShape"]},"globalLocationNumber":{"expectedTypes":["Text"]},"hasMap":{"expectedTypes":["Map","URL"]},"interactionCount":{"expectedTypes":["Text"]},"isicV4":{"expectedTypes":["Text"]},"logo":{"expectedTypes":["ImageObject","URL"]},"openingHoursSpecification":{"expectedTypes":["OpeningHoursSpecification"]},"photo":{"expectedTypes":["ImageObject","Photograph"]},"review":{"expectedTypes":["Review"]},"telephone":{"expectedTypes":["Text"]}}},"AdministrativeArea":{"extends":"Place","properties":[]},"City":{"extends":"AdministrativeArea","properties":[]},"Country":{"extends":"AdministrativeArea","properties":[]},"State":{"extends":"AdministrativeArea","properties":[]},"CivicStructure":{"extends":"Place","properties":{"openingHours":{"expectedTypes":["Duration"]}}},"Airport":{"extends":"CivicStructure","properties":{"iataCode":{"expectedTypes":["Text"]},"icaoCode":{"expectedTypes":["Text"]}}},"Aquarium":{"extends":"CivicStructure","properties":[]},"Beach":{"extends":"CivicStructure","properties":[]},"BusStation":{"extends":"CivicStructure","properties":[]},"BusStop":{"extends":"CivicStructure","properties":[]},"Campground":{"extends":"CivicStructure","properties":[]},"Cemetery":{"extends":"CivicStructure","properties":[]},"Crematorium":{"extends":"CivicStructure","properties":[]},"EventVenue":{"extends":"CivicStructure","properties":[]},"GovernmentBuilding":{"extends":"CivicStructure","properties":[]},"CityHall":{"extends":"GovernmentBuilding","properties":[]},"Courthouse":{"extends":"GovernmentBuilding","properties":[]},"DefenceEstablishment":{"extends":"GovernmentBuilding","properties":[]},"Embassy":{"extends":"GovernmentBuilding","properties":[]},"LegislativeBuilding":{"extends":"GovernmentBuilding","properties":[]},"Museum":{"extends":"CivicStructure","properties":[]},"MusicVenue":{"extends":"CivicStructure","properties":[]},"Park":{"extends":"CivicStructure","properties":[]},"ParkingFacility":{"extends":"CivicStructure","properties":[]},"PerformingArtsTheater":{"extends":"CivicStructure","properties":[]},"PlaceOfWorship":{"extends":"CivicStructure","properties":[]},"BuddhistTemple":{"extends":"PlaceOfWorship","properties":[]},"CatholicChurch":{"extends":"PlaceOfWorship","properties":[]},"Church":{"extends":"PlaceOfWorship","properties":[]},"HinduTemple":{"extends":"PlaceOfWorship","properties":[]},"Mosque":{"extends":"PlaceOfWorship","properties":[]},"Synagogue":{"extends":"PlaceOfWorship","properties":[]},"Playground":{"extends":"CivicStructure","properties":[]},"RVPark":{"extends":"CivicStructure","properties":[]},"SubwayStation":{"extends":"CivicStructure","properties":[]},"TaxiStand":{"extends":"CivicStructure","properties":[]},"TrainStation":{"extends":"CivicStructure","properties":[]},"Zoo":{"extends":"CivicStructure","properties":[]},"Landform":{"extends":"Place","properties":[]},"BodyOfWater":{"extends":"Landform","properties":[]},"Canal":{"extends":"BodyOfWater","properties":[]},"LakeBodyOfWater":{"extends":"BodyOfWater","properties":[]},"OceanBodyOfWater":{"extends":"BodyOfWater","properties":[]},"Pond":{"extends":"BodyOfWater","properties":[]},"Reservoir":{"extends":"BodyOfWater","properties":[]},"RiverBodyOfWater":{"extends":"BodyOfWater","properties":[]},"SeaBodyOfWater":{"extends":"BodyOfWater","properties":[]},"Waterfall":{"extends":"BodyOfWater","properties":[]},"Continent":{"extends":"Landform","properties":[]},"Mountain":{"extends":"Landform","properties":[]},"Volcano":{"extends":"Landform","properties":[]},"LandmarksOrHistoricalBuildings":{"extends":"Place","properties":[]},"Residence":{"extends":"Place","properties":[]},"ApartmentComplex":{"extends":"Residence","properties":[]},"GatedResidenceCommunity":{"extends":"Residence","properties":[]},"SingleFamilyResidence":{"extends":"Residence","properties":[]},"TouristAttraction":{"extends":"Place","properties":[]},"Product":{"extends":"Thing","properties":{"aggregateRating":{"expectedTypes":["AggregateRating"]},"audience":{"expectedTypes":["Audience"]},"brand":{"expectedTypes":["Brand","Organization"]},"color":{"expectedTypes":["Text"]},"depth":{"expectedTypes":["Distance","QuantitativeValue"]},"gtin13":{"expectedTypes":["Text"]},"gtin14":{"expectedTypes":["Text"]},"gtin8":{"expectedTypes":["Text"]},"height":{"expectedTypes":["Distance","QuantitativeValue"]},"isAccessoryOrSparePartFor":{"expectedTypes":["Product"]},"isConsumableFor":{"expectedTypes":["Product"]},"isRelatedTo":{"expectedTypes":["Product"]},"isSimilarTo":{"expectedTypes":["Product"]},"itemCondition":{"expectedTypes":["OfferItemCondition"]},"logo":{"expectedTypes":["ImageObject","URL"]},"manufacturer":{"expectedTypes":["Organization"]},"model":{"expectedTypes":["Text","ProductModel"]},"mpn":{"expectedTypes":["Text"]},"offers":{"expectedTypes":["Offer"]},"productID":{"expectedTypes":["Text"]},"releaseDate":{"expectedTypes":["Date"]},"review":{"expectedTypes":["Review"]},"sku":{"expectedTypes":["Text"]},"weight":{"expectedTypes":["QuantitativeValue"]},"width":{"expectedTypes":["Distance","QuantitativeValue"]}}},"IndividualProduct":{"extends":"Product","properties":{"serialNumber":{"expectedTypes":["Text"]}}},"ProductModel":{"extends":"Product","properties":{"isVariantOf":{"expectedTypes":["ProductModel"]},"predecessorOf":{"expectedTypes":["ProductModel"]},"successorOf":{"expectedTypes":["ProductModel"]}}},"SomeProducts":{"extends":"Product","properties":{"inventoryLevel":{"expectedTypes":["QuantitativeValue"]}}},"Vehicle":{"extends":"Product","properties":[]},"Car":{"extends":"Vehicle","properties":[]}}
\ No newline at end of file
diff --git a/core/libraries/src/Object/CMSObject.php b/core/libraries/src/Object/CMSObject.php
new file mode 100644
index 00000000..05d095f0
--- /dev/null
+++ b/core/libraries/src/Object/CMSObject.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Object;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Joomla Platform Object Class
+ *
+ * This class allows for simple but smart objects with get and set methods
+ * and an internal error handler.
+ *
+ * @since       11.1
+ * @deprecated  4.0
+ */
+class CMSObject
+{
+	/**
+	 * An array of error messages or Exception objects.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 * @see    JError
+	 * @deprecated  12.3  JError has been deprecated
+	 */
+	protected $_errors = array();
+
+	/**
+	 * Class constructor, overridden in descendant classes.
+	 *
+	 * @param   mixed  $properties  Either and associative array or another
+	 *                              object to set the initial properties of the object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($properties = null)
+	{
+		if ($properties !== null)
+		{
+			$this->setProperties($properties);
+		}
+	}
+
+	/**
+	 * Magic method to convert the object to a string gracefully.
+	 *
+	 * @return  string  The classname.
+	 *
+	 * @since   11.1
+	 * @deprecated 12.3  Classes should provide their own __toString() implementation.
+	 */
+	public function __toString()
+	{
+		return get_class($this);
+	}
+
+	/**
+	 * Sets a default value if not already assigned
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $default   The default value.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   11.1
+	 */
+	public function def($property, $default = null)
+	{
+		$value = $this->get($property, $default);
+
+		return $this->set($property, $value);
+	}
+
+	/**
+	 * Returns a property of the object or the default value if the property is not set.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $default   The default value.
+	 *
+	 * @return  mixed    The value of the property.
+	 *
+	 * @since   11.1
+	 *
+	 * @see     CMSObject::getProperties()
+	 */
+	public function get($property, $default = null)
+	{
+		if (isset($this->$property))
+		{
+			return $this->$property;
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Returns an associative array of object properties.
+	 *
+	 * @param   boolean  $public  If true, returns only the public properties.
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 *
+	 * @see     CMSObject::get()
+	 */
+	public function getProperties($public = true)
+	{
+		$vars = get_object_vars($this);
+
+		if ($public)
+		{
+			foreach ($vars as $key => $value)
+			{
+				if ('_' == substr($key, 0, 1))
+				{
+					unset($vars[$key]);
+				}
+			}
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Get the most recent error message.
+	 *
+	 * @param   integer  $i         Option error index.
+	 * @param   boolean  $toString  Indicates if JError objects should return their error message.
+	 *
+	 * @return  string   Error message
+	 *
+	 * @since   11.1
+	 * @see     JError
+	 * @deprecated 12.3  JError has been deprecated
+	 */
+	public function getError($i = null, $toString = true)
+	{
+		// Find the error
+		if ($i === null)
+		{
+			// Default, return the last message
+			$error = end($this->_errors);
+		}
+		elseif (!array_key_exists($i, $this->_errors))
+		{
+			// If $i has been specified but does not exist, return false
+			return false;
+		}
+		else
+		{
+			$error = $this->_errors[$i];
+		}
+
+		// Check if only the string is requested
+		if ($error instanceof \Exception && $toString)
+		{
+			return $error->getMessage();
+		}
+
+		return $error;
+	}
+
+	/**
+	 * Return all errors, if any.
+	 *
+	 * @return  array  Array of error messages or JErrors.
+	 *
+	 * @since   11.1
+	 * @see     JError
+	 * @deprecated 12.3  JError has been deprecated
+	 */
+	public function getErrors()
+	{
+		return $this->_errors;
+	}
+
+	/**
+	 * Modifies a property of the object, creating it if it does not already exist.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value of the property to set.
+	 *
+	 * @return  mixed  Previous value of the property.
+	 *
+	 * @since   11.1
+	 */
+	public function set($property, $value = null)
+	{
+		$previous = isset($this->$property) ? $this->$property : null;
+		$this->$property = $value;
+
+		return $previous;
+	}
+
+	/**
+	 * Set the object properties based on a named array/hash.
+	 *
+	 * @param   mixed  $properties  Either an associative array or another object.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 *
+	 * @see     CMSObject::set()
+	 */
+	public function setProperties($properties)
+	{
+		if (is_array($properties) || is_object($properties))
+		{
+			foreach ((array) $properties as $k => $v)
+			{
+				// Use the set function which might be overridden.
+				$this->set($k, $v);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add an error message.
+	 *
+	 * @param   string  $error  Error message.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 * @see     JError
+	 * @deprecated 12.3  JError has been deprecated
+	 */
+	public function setError($error)
+	{
+		$this->_errors[] = $error;
+	}
+}
diff --git a/core/libraries/src/Pagination/Pagination.php b/core/libraries/src/Pagination/Pagination.php
new file mode 100644
index 00000000..568ff4d3
--- /dev/null
+++ b/core/libraries/src/Pagination/Pagination.php
@@ -0,0 +1,893 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Pagination;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\CMSApplication;
+
+/**
+ * Pagination Class. Provides a common interface for content pagination for the Joomla! CMS.
+ *
+ * @since  1.5
+ */
+class Pagination
+{
+	/**
+	 * @var    integer  The record number to start displaying from.
+	 * @since  1.5
+	 */
+	public $limitstart = null;
+
+	/**
+	 * @var    integer  Number of rows to display per page.
+	 * @since  1.5
+	 */
+	public $limit = null;
+
+	/**
+	 * @var    integer  Total number of rows.
+	 * @since  1.5
+	 */
+	public $total = null;
+
+	/**
+	 * @var    integer  Prefix used for request variables.
+	 * @since  1.6
+	 */
+	public $prefix = null;
+
+	/**
+	 * @var    integer  Value pagination object begins at
+	 * @since  3.0
+	 */
+	public $pagesStart;
+
+	/**
+	 * @var    integer  Value pagination object ends at
+	 * @since  3.0
+	 */
+	public $pagesStop;
+
+	/**
+	 * @var    integer  Current page
+	 * @since  3.0
+	 */
+	public $pagesCurrent;
+
+	/**
+	 * @var    integer  Total number of pages
+	 * @since  3.0
+	 */
+	public $pagesTotal;
+
+	/**
+	 * @var    boolean  View all flag
+	 * @since  3.0
+	 */
+	protected $viewall = false;
+
+	/**
+	 * Additional URL parameters to be added to the pagination URLs generated by the class.  These
+	 * may be useful for filters and extra values when dealing with lists and GET requests.
+	 *
+	 * @var    array
+	 * @since  3.0
+	 */
+	protected $additionalUrlParams = array();
+
+	/**
+	 * @var    CMSApplication  The application object
+	 * @since  3.4
+	 */
+	protected $app = null;
+
+	/**
+	 * Pagination data object
+	 *
+	 * @var    object
+	 * @since  3.4
+	 */
+	protected $data;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   integer         $total       The total number of items.
+	 * @param   integer         $limitstart  The offset of the item to start at.
+	 * @param   integer         $limit       The number of items to display per page.
+	 * @param   string          $prefix      The prefix used for request variables.
+	 * @param   CMSApplication  $app         The application object
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($total, $limitstart, $limit, $prefix = '', CMSApplication $app = null)
+	{
+		// Value/type checking.
+		$this->total = (int) $total;
+		$this->limitstart = (int) max($limitstart, 0);
+		$this->limit = (int) max($limit, 0);
+		$this->prefix = $prefix;
+		$this->app = $app ?: \JFactory::getApplication();
+
+		if ($this->limit > $this->total)
+		{
+			$this->limitstart = 0;
+		}
+
+		if (!$this->limit)
+		{
+			$this->limit = $total;
+			$this->limitstart = 0;
+		}
+
+		/*
+		 * If limitstart is greater than total (i.e. we are asked to display records that don't exist)
+		 * then set limitstart to display the last natural page of results
+		 */
+		if ($this->limitstart > $this->total - $this->limit)
+		{
+			$this->limitstart = max(0, (int) (ceil($this->total / $this->limit) - 1) * $this->limit);
+		}
+
+		// Set the total pages and current page values.
+		if ($this->limit > 0)
+		{
+			$this->pagesTotal = ceil($this->total / $this->limit);
+			$this->pagesCurrent = ceil(($this->limitstart + 1) / $this->limit);
+		}
+
+		// Set the pagination iteration loop values.
+		$displayedPages = 10;
+		$this->pagesStart = $this->pagesCurrent - ($displayedPages / 2);
+
+		if ($this->pagesStart < 1)
+		{
+			$this->pagesStart = 1;
+		}
+
+		if ($this->pagesStart + $displayedPages > $this->pagesTotal)
+		{
+			$this->pagesStop = $this->pagesTotal;
+
+			if ($this->pagesTotal < $displayedPages)
+			{
+				$this->pagesStart = 1;
+			}
+			else
+			{
+				$this->pagesStart = $this->pagesTotal - $displayedPages + 1;
+			}
+		}
+		else
+		{
+			$this->pagesStop = $this->pagesStart + $displayedPages - 1;
+		}
+
+		// If we are viewing all records set the view all flag to true.
+		if ($limit === 0)
+		{
+			$this->viewall = true;
+		}
+	}
+
+	/**
+	 * Method to set an additional URL parameter to be added to all pagination class generated
+	 * links.
+	 *
+	 * @param   string  $key    The name of the URL parameter for which to set a value.
+	 * @param   mixed   $value  The value to set for the URL parameter.
+	 *
+	 * @return  mixed  The old value for the parameter.
+	 *
+	 * @since   1.6
+	 */
+	public function setAdditionalUrlParam($key, $value)
+	{
+		// Get the old value to return and set the new one for the URL parameter.
+		$result = isset($this->additionalUrlParams[$key]) ? $this->additionalUrlParams[$key] : null;
+
+		// If the passed parameter value is null unset the parameter, otherwise set it to the given value.
+		if ($value === null)
+		{
+			unset($this->additionalUrlParams[$key]);
+		}
+		else
+		{
+			$this->additionalUrlParams[$key] = $value;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get an additional URL parameter (if it exists) to be added to
+	 * all pagination class generated links.
+	 *
+	 * @param   string  $key  The name of the URL parameter for which to get the value.
+	 *
+	 * @return  mixed  The value if it exists or null if it does not.
+	 *
+	 * @since   1.6
+	 */
+	public function getAdditionalUrlParam($key)
+	{
+		$result = isset($this->additionalUrlParams[$key]) ? $this->additionalUrlParams[$key] : null;
+
+		return $result;
+	}
+
+	/**
+	 * Return the rationalised offset for a row with a given index.
+	 *
+	 * @param   integer  $index  The row index
+	 *
+	 * @return  integer  Rationalised offset for a row with a given index.
+	 *
+	 * @since   1.5
+	 */
+	public function getRowOffset($index)
+	{
+		return $index + 1 + $this->limitstart;
+	}
+
+	/**
+	 * Return the pagination data object, only creating it if it doesn't already exist.
+	 *
+	 * @return  \stdClass  Pagination data object.
+	 *
+	 * @since   1.5
+	 */
+	public function getData()
+	{
+		if (!$this->data)
+		{
+			$this->data = $this->_buildDataObject();
+		}
+
+		return $this->data;
+	}
+
+	/**
+	 * Create and return the pagination pages counter string, ie. Page 2 of 4.
+	 *
+	 * @return  string   Pagination pages counter string.
+	 *
+	 * @since   1.5
+	 */
+	public function getPagesCounter()
+	{
+		$html = null;
+
+		if ($this->pagesTotal > 1)
+		{
+			$html .= \JText::sprintf('JLIB_HTML_PAGE_CURRENT_OF_TOTAL', $this->pagesCurrent, $this->pagesTotal);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Create and return the pagination result set counter string, e.g. Results 1-10 of 42
+	 *
+	 * @return  string   Pagination result set counter string.
+	 *
+	 * @since   1.5
+	 */
+	public function getResultsCounter()
+	{
+		$html = null;
+		$fromResult = $this->limitstart + 1;
+
+		// If the limit is reached before the end of the list.
+		if ($this->limitstart + $this->limit < $this->total)
+		{
+			$toResult = $this->limitstart + $this->limit;
+		}
+		else
+		{
+			$toResult = $this->total;
+		}
+
+		// If there are results found.
+		if ($this->total > 0)
+		{
+			$msg = \JText::sprintf('JLIB_HTML_RESULTS_OF', $fromResult, $toResult, $this->total);
+			$html .= "\n" . $msg;
+		}
+		else
+		{
+			$html .= "\n" . \JText::_('JLIB_HTML_NO_RECORDS_FOUND');
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Create and return the pagination page list string, ie. Previous, Next, 1 2 3 ... x.
+	 *
+	 * @return  string  Pagination page list string.
+	 *
+	 * @since   1.5
+	 */
+	public function getPagesLinks()
+	{
+		// Build the page navigation list.
+		$data = $this->_buildDataObject();
+
+		$list           = array();
+		$list['prefix'] = $this->prefix;
+
+		$itemOverride = false;
+		$listOverride = false;
+
+		$chromePath = JPATH_THEMES . '/' . $this->app->getTemplate() . '/html/pagination.php';
+
+		if (file_exists($chromePath))
+		{
+			include_once $chromePath;
+
+			/*
+			 * @deprecated 4.0 Item rendering should use a layout
+			 */
+			if (function_exists('pagination_item_active') && function_exists('pagination_item_inactive'))
+			{
+				\JLog::add(
+					'pagination_item_active and pagination_item_inactive are deprecated. Use the layout joomla.pagination.link instead.',
+					\JLog::WARNING,
+					'deprecated'
+				);
+
+				$itemOverride = true;
+			}
+
+			/*
+			 * @deprecated 4.0 The list rendering is now a layout.
+			 * @see Pagination::_list_render()
+			 */
+			if (function_exists('pagination_list_render'))
+			{
+				\JLog::add('pagination_list_render is deprecated. Use the layout joomla.pagination.list instead.', \JLog::WARNING, 'deprecated');
+				$listOverride = true;
+			}
+		}
+
+		// Build the select list
+		if ($data->all->base !== null)
+		{
+			$list['all']['active'] = true;
+			$list['all']['data']   = $itemOverride ? pagination_item_active($data->all) : $this->_item_active($data->all);
+		}
+		else
+		{
+			$list['all']['active'] = false;
+			$list['all']['data']   = $itemOverride ? pagination_item_inactive($data->all) : $this->_item_inactive($data->all);
+		}
+
+		if ($data->start->base !== null)
+		{
+			$list['start']['active'] = true;
+			$list['start']['data']   = $itemOverride ? pagination_item_active($data->start) : $this->_item_active($data->start);
+		}
+		else
+		{
+			$list['start']['active'] = false;
+			$list['start']['data']   = $itemOverride ? pagination_item_inactive($data->start) : $this->_item_inactive($data->start);
+		}
+
+		if ($data->previous->base !== null)
+		{
+			$list['previous']['active'] = true;
+			$list['previous']['data']   = $itemOverride ? pagination_item_active($data->previous) : $this->_item_active($data->previous);
+		}
+		else
+		{
+			$list['previous']['active'] = false;
+			$list['previous']['data']   = $itemOverride ? pagination_item_inactive($data->previous) : $this->_item_inactive($data->previous);
+		}
+
+		// Make sure it exists
+		$list['pages'] = array();
+
+		foreach ($data->pages as $i => $page)
+		{
+			if ($page->base !== null)
+			{
+				$list['pages'][$i]['active'] = true;
+				$list['pages'][$i]['data']   = $itemOverride ? pagination_item_active($page) : $this->_item_active($page);
+			}
+			else
+			{
+				$list['pages'][$i]['active'] = false;
+				$list['pages'][$i]['data']   = $itemOverride ? pagination_item_inactive($page) : $this->_item_inactive($page);
+			}
+		}
+
+		if ($data->next->base !== null)
+		{
+			$list['next']['active'] = true;
+			$list['next']['data']   = $itemOverride ? pagination_item_active($data->next) : $this->_item_active($data->next);
+		}
+		else
+		{
+			$list['next']['active'] = false;
+			$list['next']['data']   = $itemOverride ? pagination_item_inactive($data->next) : $this->_item_inactive($data->next);
+		}
+
+		if ($data->end->base !== null)
+		{
+			$list['end']['active'] = true;
+			$list['end']['data']   = $itemOverride ? pagination_item_active($data->end) : $this->_item_active($data->end);
+		}
+		else
+		{
+			$list['end']['active'] = false;
+			$list['end']['data']   = $itemOverride ? pagination_item_inactive($data->end) : $this->_item_inactive($data->end);
+		}
+
+		if ($this->total > $this->limit)
+		{
+			return $listOverride ? pagination_list_render($list) : $this->_list_render($list);
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	/**
+	 * Get the pagination links
+	 *
+	 * @param   string  $layoutId  Layout to render the links
+	 * @param   array   $options   Optional array with settings for the layout
+	 *
+	 * @return  string  Pagination links.
+	 *
+	 * @since   3.3
+	 */
+	public function getPaginationLinks($layoutId = 'joomla.pagination.links', $options = array())
+	{
+		// Allow to receive a null layout
+		$layoutId = $layoutId === null ? 'joomla.pagination.links' : $layoutId;
+
+		$list = array(
+			'prefix'       => $this->prefix,
+			'limit'        => $this->limit,
+			'limitstart'   => $this->limitstart,
+			'total'        => $this->total,
+			'limitfield'   => $this->getLimitBox(),
+			'pagescounter' => $this->getPagesCounter(),
+			'pages'        => $this->getPaginationPages(),
+			'pagesTotal'   => $this->pagesTotal,
+		);
+
+		return \JLayoutHelper::render($layoutId, array('list' => $list, 'options' => $options));
+	}
+
+	/**
+	 * Create and return the pagination pages list, ie. Previous, Next, 1 2 3 ... x.
+	 *
+	 * @return  array  Pagination pages list.
+	 *
+	 * @since   3.3
+	 */
+	public function getPaginationPages()
+	{
+		$list = array();
+
+		if ($this->total > $this->limit)
+		{
+			// Build the page navigation list.
+			$data = $this->_buildDataObject();
+
+			// All
+			$list['all']['active'] = $data->all->base !== null;
+			$list['all']['data']   = $data->all;
+
+			// Start
+			$list['start']['active'] = $data->start->base !== null;
+			$list['start']['data']   = $data->start;
+
+			// Previous link
+			$list['previous']['active'] = $data->previous->base !== null;
+			$list['previous']['data']   = $data->previous;
+
+			// Make sure it exists
+			$list['pages'] = array();
+
+			foreach ($data->pages as $i => $page)
+			{
+				$list['pages'][$i]['active'] = $page->base !== null;
+				$list['pages'][$i]['data']   = $page;
+			}
+
+			$list['next']['active'] = $data->next->base !== null;
+			$list['next']['data']   = $data->next;
+
+			$list['end']['active'] = $data->end->base !== null;
+			$list['end']['data']   = $data->end;
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Return the pagination footer.
+	 *
+	 * @return  string  Pagination footer.
+	 *
+	 * @since   1.5
+	 */
+	public function getListFooter()
+	{
+		// Keep B/C for overrides done with chromes
+		$chromePath = JPATH_THEMES . '/' . $this->app->getTemplate() . '/html/pagination.php';
+
+		if (file_exists($chromePath))
+		{
+			include_once $chromePath;
+
+			if (function_exists('pagination_list_footer'))
+			{
+				\JLog::add('pagination_list_footer is deprecated. Use the layout joomla.pagination.links instead.', \JLog::WARNING, 'deprecated');
+
+				$list = array(
+					'prefix'       => $this->prefix,
+					'limit'        => $this->limit,
+					'limitstart'   => $this->limitstart,
+					'total'        => $this->total,
+					'limitfield'   => $this->getLimitBox(),
+					'pagescounter' => $this->getPagesCounter(),
+					'pageslinks'   => $this->getPagesLinks(),
+				);
+
+				return pagination_list_footer($list);
+			}
+		}
+
+		return $this->getPaginationLinks();
+	}
+
+	/**
+	 * Creates a dropdown box for selecting how many records to show per page.
+	 *
+	 * @return  string  The HTML for the limit # input box.
+	 *
+	 * @since   1.5
+	 */
+	public function getLimitBox()
+	{
+		$limits = array();
+
+		// Make the option list.
+		for ($i = 5; $i <= 30; $i += 5)
+		{
+			$limits[] = \JHtml::_('select.option', "$i");
+		}
+
+		$limits[] = \JHtml::_('select.option', '50', \JText::_('J50'));
+		$limits[] = \JHtml::_('select.option', '100', \JText::_('J100'));
+		$limits[] = \JHtml::_('select.option', '0', \JText::_('JALL'));
+
+		$selected = $this->viewall ? 0 : $this->limit;
+
+		// Build the select list.
+		if ($this->app->isClient('administrator'))
+		{
+			$html = \JHtml::_(
+				'select.genericlist',
+				$limits,
+				$this->prefix . 'limit',
+				'class="inputbox input-mini" size="1" onchange="Joomla.submitform();"',
+				'value',
+				'text',
+				$selected
+			);
+		}
+		else
+		{
+			$html = \JHtml::_(
+				'select.genericlist',
+				$limits,
+				$this->prefix . 'limit',
+				'class="inputbox input-mini" size="1" onchange="this.form.submit()"',
+				'value',
+				'text',
+				$selected
+			);
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Return the icon to move an item UP.
+	 *
+	 * @param   integer  $i          The row index.
+	 * @param   boolean  $condition  True to show the icon.
+	 * @param   string   $task       The task to fire.
+	 * @param   string   $alt        The image alternative text string.
+	 * @param   boolean  $enabled    An optional setting for access control on the action.
+	 * @param   string   $checkbox   An optional prefix for checkboxes.
+	 *
+	 * @return  string   Either the icon to move an item up or a space.
+	 *
+	 * @since   1.5
+	 */
+	public function orderUpIcon($i, $condition = true, $task = 'orderup', $alt = 'JLIB_HTML_MOVE_UP', $enabled = true, $checkbox = 'cb')
+	{
+		if (($i > 0 || ($i + $this->limitstart > 0)) && $condition)
+		{
+			return \JHtml::_('jgrid.orderUp', $i, $task, '', $alt, $enabled, $checkbox);
+		}
+		else
+		{
+			return '&#160;';
+		}
+	}
+
+	/**
+	 * Return the icon to move an item DOWN.
+	 *
+	 * @param   integer  $i          The row index.
+	 * @param   integer  $n          The number of items in the list.
+	 * @param   boolean  $condition  True to show the icon.
+	 * @param   string   $task       The task to fire.
+	 * @param   string   $alt        The image alternative text string.
+	 * @param   boolean  $enabled    An optional setting for access control on the action.
+	 * @param   string   $checkbox   An optional prefix for checkboxes.
+	 *
+	 * @return  string   Either the icon to move an item down or a space.
+	 *
+	 * @since   1.5
+	 */
+	public function orderDownIcon($i, $n, $condition = true, $task = 'orderdown', $alt = 'JLIB_HTML_MOVE_DOWN', $enabled = true, $checkbox = 'cb')
+	{
+		if (($i < $n - 1 || $i + $this->limitstart < $this->total - 1) && $condition)
+		{
+			return \JHtml::_('jgrid.orderDown', $i, $task, '', $alt, $enabled, $checkbox);
+		}
+		else
+		{
+			return '&#160;';
+		}
+	}
+
+	/**
+	 * Create the HTML for a list footer
+	 *
+	 * @param   array  $list  Pagination list data structure.
+	 *
+	 * @return  string  HTML for a list footer
+	 *
+	 * @since   1.5
+	 */
+	protected function _list_footer($list)
+	{
+		$html = "<div class=\"list-footer\">\n";
+
+		$html .= "\n<div class=\"limit\">" . \JText::_('JGLOBAL_DISPLAY_NUM') . $list['limitfield'] . "</div>";
+		$html .= $list['pageslinks'];
+		$html .= "\n<div class=\"counter\">" . $list['pagescounter'] . "</div>";
+
+		$html .= "\n<input type=\"hidden\" name=\"" . $list['prefix'] . "limitstart\" value=\"" . $list['limitstart'] . "\" />";
+		$html .= "\n</div>";
+
+		return $html;
+	}
+
+	/**
+	 * Create the html for a list footer
+	 *
+	 * @param   array  $list  Pagination list data structure.
+	 *
+	 * @return  string  HTML for a list start, previous, next,end
+	 *
+	 * @since   1.5
+	 */
+	protected function _list_render($list)
+	{
+		return \JLayoutHelper::render('joomla.pagination.list', array('list' => $list));
+	}
+
+	/**
+	 * Method to create an active pagination link to the item
+	 *
+	 * @param   PaginationObject  $item  The object with which to make an active link.
+	 *
+	 * @return  string  HTML link
+	 *
+	 * @since   1.5
+	 * @note    As of 4.0 this method will proxy to `\JLayoutHelper::render('joomla.pagination.link', ['data' => $item, 'active' => true])`
+	 */
+	protected function _item_active(PaginationObject $item)
+	{
+		$title = '';
+		$class = '';
+
+		if (!is_numeric($item->text))
+		{
+			\JHtml::_('bootstrap.tooltip');
+			$title = ' title="' . $item->text . '"';
+			$class = 'hasTooltip ';
+		}
+
+		if ($this->app->isClient('administrator'))
+		{
+			return '<a' . $title . ' href="#" onclick="document.adminForm.' . $this->prefix
+			. 'limitstart.value=' . ($item->base > 0 ? $item->base : '0') . '; Joomla.submitform();return false;">' . $item->text . '</a>';
+		}
+		else
+		{
+			return '<a' . $title . ' href="' . $item->link . '" class="' . $class . 'pagenav">' . $item->text . '</a>';
+		}
+	}
+
+	/**
+	 * Method to create an inactive pagination string
+	 *
+	 * @param   PaginationObject  $item  The item to be processed
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 * @note    As of 4.0 this method will proxy to `\JLayoutHelper::render('joomla.pagination.link', ['data' => $item, 'active' => false])`
+	 */
+	protected function _item_inactive(PaginationObject $item)
+	{
+		if ($this->app->isClient('administrator'))
+		{
+			return '<span>' . $item->text . '</span>';
+		}
+		else
+		{
+			return '<span class="pagenav">' . $item->text . '</span>';
+		}
+	}
+
+	/**
+	 * Create and return the pagination data object.
+	 *
+	 * @return  \stdClass  Pagination data object.
+	 *
+	 * @since   1.5
+	 */
+	protected function _buildDataObject()
+	{
+		$data = new \stdClass;
+
+		// Build the additional URL parameters string.
+		$params = '';
+
+		if (!empty($this->additionalUrlParams))
+		{
+			foreach ($this->additionalUrlParams as $key => $value)
+			{
+				$params .= '&' . $key . '=' . $value;
+			}
+		}
+
+		$data->all = new PaginationObject(\JText::_('JLIB_HTML_VIEW_ALL'), $this->prefix);
+
+		if (!$this->viewall)
+		{
+			$data->all->base = '0';
+			$data->all->link = \JRoute::_($params . '&' . $this->prefix . 'limitstart=');
+		}
+
+		// Set the start and previous data objects.
+		$data->start    = new PaginationObject(\JText::_('JLIB_HTML_START'), $this->prefix);
+		$data->previous = new PaginationObject(\JText::_('JPREV'), $this->prefix);
+
+		if ($this->pagesCurrent > 1)
+		{
+			$page = ($this->pagesCurrent - 2) * $this->limit;
+
+			// Set the empty for removal from route
+			// @todo remove code: $page = $page == 0 ? '' : $page;
+
+			$data->start->base    = '0';
+			$data->start->link    = \JRoute::_($params . '&' . $this->prefix . 'limitstart=0');
+			$data->previous->base = $page;
+			$data->previous->link = \JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $page);
+		}
+
+		// Set the next and end data objects.
+		$data->next = new PaginationObject(\JText::_('JNEXT'), $this->prefix);
+		$data->end  = new PaginationObject(\JText::_('JLIB_HTML_END'), $this->prefix);
+
+		if ($this->pagesCurrent < $this->pagesTotal)
+		{
+			$next = $this->pagesCurrent * $this->limit;
+			$end  = ($this->pagesTotal - 1) * $this->limit;
+
+			$data->next->base = $next;
+			$data->next->link = \JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $next);
+			$data->end->base  = $end;
+			$data->end->link  = \JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $end);
+		}
+
+		$data->pages = array();
+		$stop        = $this->pagesStop;
+
+		for ($i = $this->pagesStart; $i <= $stop; $i++)
+		{
+			$offset = ($i - 1) * $this->limit;
+
+			$data->pages[$i] = new PaginationObject($i, $this->prefix);
+
+			if ($i != $this->pagesCurrent || $this->viewall)
+			{
+				$data->pages[$i]->base = $offset;
+				$data->pages[$i]->link = \JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $offset);
+			}
+			else
+			{
+				$data->pages[$i]->active = true;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Modifies a property of the object, creating it if it does not already exist.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value of the property to set.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Access the properties directly.
+	 */
+	public function set($property, $value = null)
+	{
+		\JLog::add('Pagination::set() is deprecated. Access the properties directly.', \JLog::WARNING, 'deprecated');
+
+		if (strpos($property, '.'))
+		{
+			$prop     = explode('.', $property);
+			$prop[1]  = ucfirst($prop[1]);
+			$property = implode($prop);
+		}
+
+		$this->$property = $value;
+	}
+
+	/**
+	 * Returns a property of the object or the default value if the property is not set.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $default   The default value.
+	 *
+	 * @return  mixed    The value of the property.
+	 *
+	 * @since   3.0
+	 * @deprecated  4.0  Access the properties directly.
+	 */
+	public function get($property, $default = null)
+	{
+		\JLog::add('Pagination::get() is deprecated. Access the properties directly.', \JLog::WARNING, 'deprecated');
+
+		if (strpos($property, '.'))
+		{
+			$prop     = explode('.', $property);
+			$prop[1]  = ucfirst($prop[1]);
+			$property = implode($prop);
+		}
+
+		if (isset($this->$property))
+		{
+			return $this->$property;
+		}
+
+		return $default;
+	}
+}
diff --git a/core/libraries/src/Pagination/PaginationObject.php b/core/libraries/src/Pagination/PaginationObject.php
new file mode 100644
index 00000000..1d3526f1
--- /dev/null
+++ b/core/libraries/src/Pagination/PaginationObject.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Pagination;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Pagination object representing a particular item in the pagination lists.
+ *
+ * @since  1.5
+ */
+class PaginationObject
+{
+	/**
+	 * @var    string  The link text.
+	 * @since  1.5
+	 */
+	public $text;
+
+	/**
+	 * @var    integer  The number of rows as a base offset.
+	 * @since  1.5
+	 */
+	public $base;
+
+	/**
+	 * @var    string  The link URL.
+	 * @since  1.5
+	 */
+	public $link;
+
+	/**
+	 * @var    integer  The prefix used for request variables.
+	 * @since  1.6
+	 */
+	public $prefix;
+
+	/**
+	 * @var    boolean  Flag whether the object is the 'active' page
+	 * @since  3.0
+	 */
+	public $active;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   string   $text    The link text.
+	 * @param   string   $prefix  The prefix used for request variables.
+	 * @param   integer  $base    The number of rows as a base offset.
+	 * @param   string   $link    The link URL.
+	 * @param   boolean  $active  Flag whether the object is the 'active' page
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($text, $prefix = '', $base = null, $link = null, $active = false)
+	{
+		$this->text   = $text;
+		$this->prefix = $prefix;
+		$this->base   = $base;
+		$this->link   = $link;
+		$this->active = $active;
+	}
+}
diff --git a/core/libraries/src/Pathway/Pathway.php b/core/libraries/src/Pathway/Pathway.php
new file mode 100644
index 00000000..c6641f67
--- /dev/null
+++ b/core/libraries/src/Pathway/Pathway.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Pathway;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+
+/**
+ * Class to maintain a pathway.
+ *
+ * The user's navigated path within the application.
+ *
+ * @since  1.5
+ */
+class Pathway
+{
+	/**
+	 * @var    array  Array to hold the pathway item objects
+	 * @since  1.5
+	 * @deprecated  4.0  Will convert to $pathway
+	 */
+	protected $_pathway = array();
+
+	/**
+	 * @var    integer  Integer number of items in the pathway
+	 * @since  1.5
+	 * @deprecated  4.0  Will convert to $count
+	 */
+	protected $_count = 0;
+
+	/**
+	 * JPathway instances container.
+	 *
+	 * @var    Pathway[]
+	 * @since  1.7
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  The class options.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($options = array())
+	{
+	}
+
+	/**
+	 * Returns a Pathway object
+	 *
+	 * @param   string  $client   The name of the client
+	 * @param   array   $options  An associative array of options
+	 *
+	 * @return  Pathway  A Pathway object.
+	 *
+	 * @since   1.5
+	 * @throws  \RuntimeException
+	 */
+	public static function getInstance($client, $options = array())
+	{
+		if (empty(self::$instances[$client]))
+		{
+			// Create a Pathway object
+			$classname = 'JPathway' . ucfirst($client);
+
+			if (!class_exists($classname))
+			{
+				// @deprecated 4.0 Everything in this block is deprecated but the warning is only logged after the file_exists
+				// Load the pathway object
+				$info = ApplicationHelper::getClientInfo($client, true);
+
+				if (is_object($info))
+				{
+					$path = $info->path . '/includes/pathway.php';
+
+					\JLoader::register($classname, $path);
+
+					if (class_exists($classname))
+					{
+						\JLog::add('Non-autoloadable Pathway subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
+					}
+				}
+			}
+
+			if (class_exists($classname))
+			{
+				self::$instances[$client] = new $classname($options);
+			}
+			else
+			{
+				throw new \RuntimeException(\JText::sprintf('JLIB_APPLICATION_ERROR_PATHWAY_LOAD', $client), 500);
+			}
+		}
+
+		return self::$instances[$client];
+	}
+
+	/**
+	 * Return the Pathway items array
+	 *
+	 * @return  array  Array of pathway items
+	 *
+	 * @since   1.5
+	 */
+	public function getPathway()
+	{
+		$pw = $this->_pathway;
+
+		// Use array_values to reset the array keys numerically
+		return array_values($pw);
+	}
+
+	/**
+	 * Set the Pathway items array.
+	 *
+	 * @param   array  $pathway  An array of pathway objects.
+	 *
+	 * @return  array  The previous pathway data.
+	 *
+	 * @since   1.5
+	 */
+	public function setPathway($pathway)
+	{
+		$oldPathway = $this->_pathway;
+
+		// Set the new pathway.
+		$this->_pathway = array_values((array) $pathway);
+
+		return array_values($oldPathway);
+	}
+
+	/**
+	 * Create and return an array of the pathway names.
+	 *
+	 * @return  array  Array of names of pathway items
+	 *
+	 * @since   1.5
+	 */
+	public function getPathwayNames()
+	{
+		$names = array();
+
+		// Build the names array using just the names of each pathway item
+		foreach ($this->_pathway as $item)
+		{
+			$names[] = $item->name;
+		}
+
+		// Use array_values to reset the array keys numerically
+		return array_values($names);
+	}
+
+	/**
+	 * Create and add an item to the pathway.
+	 *
+	 * @param   string  $name  The name of the item.
+	 * @param   string  $link  The link to the item.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function addItem($name, $link = '')
+	{
+		$ret = false;
+
+		if ($this->_pathway[] = $this->makeItem($name, $link))
+		{
+			$ret = true;
+			$this->_count++;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Set item name.
+	 *
+	 * @param   integer  $id    The id of the item on which to set the name.
+	 * @param   string   $name  The name to set.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function setItemName($id, $name)
+	{
+		$ret = false;
+
+		if (isset($this->_pathway[$id]))
+		{
+			$this->_pathway[$id]->name = $name;
+			$ret = true;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Create and return a new pathway object.
+	 *
+	 * @param   string  $name  Name of the item
+	 * @param   string  $link  Link to the item
+	 *
+	 * @return  Pathway  Pathway item object
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use makeItem() instead
+	 * @codeCoverageIgnore
+	 */
+	protected function _makeItem($name, $link)
+	{
+		return $this->makeItem($name, $link);
+	}
+
+	/**
+	 * Create and return a new pathway object.
+	 *
+	 * @param   string  $name  Name of the item
+	 * @param   string  $link  Link to the item
+	 *
+	 * @return  Pathway  Pathway item object
+	 *
+	 * @since   3.1
+	 */
+	protected function makeItem($name, $link)
+	{
+		$item = new \stdClass;
+		$item->name = html_entity_decode($name, ENT_COMPAT, 'UTF-8');
+		$item->link = $link;
+
+		return $item;
+	}
+}
diff --git a/core/libraries/src/Pathway/SitePathway.php b/core/libraries/src/Pathway/SitePathway.php
new file mode 100644
index 00000000..0643b3ff
--- /dev/null
+++ b/core/libraries/src/Pathway/SitePathway.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Pathway;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Language\Multilanguage;
+
+/**
+ * Class to manage the site application pathway.
+ *
+ * @since  1.5
+ */
+class SitePathway extends Pathway
+{
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $options  The class options.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($options = array())
+	{
+		$this->_pathway = array();
+
+		$app  = CMSApplication::getInstance('site');
+		$menu = $app->getMenu();
+		$lang = \JFactory::getLanguage();
+
+		if ($item = $menu->getActive())
+		{
+			$menus = $menu->getMenu();
+
+			// Look for the home menu
+			if (Multilanguage::isEnabled())
+			{
+				$home = $menu->getDefault($lang->getTag());
+			}
+			else
+			{
+				$home  = $menu->getDefault();
+			}
+
+			if (is_object($home) && ($item->id != $home->id))
+			{
+				foreach ($item->tree as $menupath)
+				{
+					$link = $menu->getItem($menupath);
+
+					switch ($link->type)
+					{
+						case 'separator':
+						case 'heading':
+							$url = null;
+							break;
+
+						case 'url':
+							if ((strpos($link->link, 'index.php?') === 0) && (strpos($link->link, 'Itemid=') === false))
+							{
+								// If this is an internal Joomla link, ensure the Itemid is set.
+								$url = $link->link . '&Itemid=' . $link->id;
+							}
+							else
+							{
+								$url = $link->link;
+							}
+							break;
+
+						case 'alias':
+							// If this is an alias use the item id stored in the parameters to make the link.
+							$url = 'index.php?Itemid=' . $link->params->get('aliasoptions');
+							break;
+
+						default:
+							$url = $link->link . '&Itemid=' . $link->id;
+							break;
+					}
+
+					$this->addItem($menus[$menupath]->title, $url);
+				}
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Plugin/CMSPlugin.php b/core/libraries/src/Plugin/CMSPlugin.php
new file mode 100644
index 00000000..552e2661
--- /dev/null
+++ b/core/libraries/src/Plugin/CMSPlugin.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Plugin;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Plugin Class
+ *
+ * @since  1.5
+ */
+abstract class CMSPlugin extends \JEvent
+{
+	/**
+	 * A Registry object holding the parameters for the plugin
+	 *
+	 * @var    Registry
+	 * @since  1.5
+	 */
+	public $params = null;
+
+	/**
+	 * The name of the plugin
+	 *
+	 * @var    string
+	 * @since  1.5
+	 */
+	protected $_name = null;
+
+	/**
+	 * The plugin type
+	 *
+	 * @var    string
+	 * @since  1.5
+	 */
+	protected $_type = null;
+
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *                             Recognized key values include 'name', 'group', 'params', 'language'
+	 *                             (this list is not meant to be comprehensive).
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(&$subject, $config = array())
+	{
+		// Get the parameters.
+		if (isset($config['params']))
+		{
+			if ($config['params'] instanceof Registry)
+			{
+				$this->params = $config['params'];
+			}
+			else
+			{
+				$this->params = new Registry($config['params']);
+			}
+		}
+
+		// Get the plugin name.
+		if (isset($config['name']))
+		{
+			$this->_name = $config['name'];
+		}
+
+		// Get the plugin type.
+		if (isset($config['type']))
+		{
+			$this->_type = $config['type'];
+		}
+
+		// Load the language files if needed.
+		if ($this->autoloadLanguage)
+		{
+			$this->loadLanguage();
+		}
+
+		if (property_exists($this, 'app'))
+		{
+			$reflection = new \ReflectionClass($this);
+
+			if ($reflection->getProperty('app')->isPrivate() === false && $this->app === null)
+			{
+				$this->app = \JFactory::getApplication();
+			}
+		}
+
+		if (property_exists($this, 'db'))
+		{
+			$reflection = new \ReflectionClass($this);
+
+			if ($reflection->getProperty('db')->isPrivate() === false && $this->db === null)
+			{
+				$this->db = \JFactory::getDbo();
+			}
+		}
+
+		parent::__construct($subject);
+	}
+
+	/**
+	 * Loads the plugin language file
+	 *
+	 * @param   string  $extension  The extension for which a language file should be loaded
+	 * @param   string  $basePath   The basepath to use
+	 *
+	 * @return  boolean  True, if the file has successfully loaded.
+	 *
+	 * @since   1.5
+	 */
+	public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
+	{
+		if (empty($extension))
+		{
+			$extension = 'Plg_' . $this->_type . '_' . $this->_name;
+		}
+
+		$extension = strtolower($extension);
+		$lang      = \JFactory::getLanguage();
+
+		// If language already loaded, don't load it again.
+		if ($lang->getPaths($extension))
+		{
+			return true;
+		}
+
+		return $lang->load($extension, $basePath, null, false, true)
+			|| $lang->load($extension, JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name, null, false, true);
+	}
+}
diff --git a/core/libraries/src/Plugin/PluginHelper.php b/core/libraries/src/Plugin/PluginHelper.php
new file mode 100644
index 00000000..64772714
--- /dev/null
+++ b/core/libraries/src/Plugin/PluginHelper.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Plugin;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Plugin helper class
+ *
+ * @since  1.5
+ */
+abstract class PluginHelper
+{
+	/**
+	 * A persistent cache of the loaded plugins.
+	 *
+	 * @var    array
+	 * @since  1.7
+	 */
+	protected static $plugins = null;
+
+	/**
+	 * Get the path to a layout from a Plugin
+	 *
+	 * @param   string  $type    Plugin type
+	 * @param   string  $name    Plugin name
+	 * @param   string  $layout  Layout name
+	 *
+	 * @return  string  Layout path
+	 *
+	 * @since   3.0
+	 */
+	public static function getLayoutPath($type, $name, $layout = 'default')
+	{
+		$template = \JFactory::getApplication()->getTemplate();
+		$defaultLayout = $layout;
+
+		if (strpos($layout, ':') !== false)
+		{
+			// Get the template and file name from the string
+			$temp = explode(':', $layout);
+			$template = $temp[0] === '_' ? $template : $temp[0];
+			$layout = $temp[1];
+			$defaultLayout = $temp[1] ?: 'default';
+		}
+
+		// Build the template and base path for the layout
+		$tPath = JPATH_THEMES . '/' . $template . '/html/plg_' . $type . '_' . $name . '/' . $layout . '.php';
+		$bPath = JPATH_PLUGINS . '/' . $type . '/' . $name . '/tmpl/' . $defaultLayout . '.php';
+		$dPath = JPATH_PLUGINS . '/' . $type . '/' . $name . '/tmpl/default.php';
+
+		// If the template has a layout override use it
+		if (file_exists($tPath))
+		{
+			return $tPath;
+		}
+		elseif (file_exists($bPath))
+		{
+			return $bPath;
+		}
+		else
+		{
+			return $dPath;
+		}
+	}
+
+	/**
+	 * Get the plugin data of a specific type if no specific plugin is specified
+	 * otherwise only the specific plugin data is returned.
+	 *
+	 * @param   string  $type    The plugin type, relates to the subdirectory in the plugins directory.
+	 * @param   string  $plugin  The plugin name.
+	 *
+	 * @return  mixed  An array of plugin data objects, or a plugin data object.
+	 *
+	 * @since   1.5
+	 */
+	public static function getPlugin($type, $plugin = null)
+	{
+		$result = array();
+		$plugins = static::load();
+
+		// Find the correct plugin(s) to return.
+		if (!$plugin)
+		{
+			foreach ($plugins as $p)
+			{
+				// Is this the right plugin?
+				if ($p->type === $type)
+				{
+					$result[] = $p;
+				}
+			}
+		}
+		else
+		{
+			foreach ($plugins as $p)
+			{
+				// Is this plugin in the right group?
+				if ($p->type === $type && $p->name === $plugin)
+				{
+					$result = $p;
+					break;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Checks if a plugin is enabled.
+	 *
+	 * @param   string  $type    The plugin type, relates to the subdirectory in the plugins directory.
+	 * @param   string  $plugin  The plugin name.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public static function isEnabled($type, $plugin = null)
+	{
+		$result = static::getPlugin($type, $plugin);
+
+		return !empty($result);
+	}
+
+	/**
+	 * Loads all the plugin files for a particular type if no specific plugin is specified
+	 * otherwise only the specific plugin is loaded.
+	 *
+	 * @param   string             $type        The plugin type, relates to the subdirectory in the plugins directory.
+	 * @param   string             $plugin      The plugin name.
+	 * @param   boolean            $autocreate  Autocreate the plugin.
+	 * @param   \JEventDispatcher  $dispatcher  Optionally allows the plugin to use a different dispatcher.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.5
+	 */
+	public static function importPlugin($type, $plugin = null, $autocreate = true, \JEventDispatcher $dispatcher = null)
+	{
+		static $loaded = array();
+
+		// Check for the default args, if so we can optimise cheaply
+		$defaults = false;
+
+		if ($plugin === null && $autocreate === true && $dispatcher === null)
+		{
+			$defaults = true;
+		}
+
+		// Ensure we have a dispatcher now so we can correctly track the loaded plugins
+		$dispatcher = $dispatcher ?: \JEventDispatcher::getInstance();
+
+		// Get the dispatcher's hash to allow plugins to be registered to unique dispatchers
+		$dispatcherHash = spl_object_hash($dispatcher);
+
+		if (!isset($loaded[$dispatcherHash]))
+		{
+			$loaded[$dispatcherHash] = array();
+		}
+
+		if (!$defaults || !isset($loaded[$dispatcherHash][$type]))
+		{
+			$results = null;
+
+			// Load the plugins from the database.
+			$plugins = static::load();
+
+			// Get the specified plugin(s).
+			for ($i = 0, $t = count($plugins); $i < $t; $i++)
+			{
+				if ($plugins[$i]->type === $type && ($plugin === null || $plugins[$i]->name === $plugin))
+				{
+					static::import($plugins[$i], $autocreate, $dispatcher);
+					$results = true;
+				}
+			}
+
+			// Bail out early if we're not using default args
+			if (!$defaults)
+			{
+				return $results;
+			}
+
+			$loaded[$dispatcherHash][$type] = $results;
+		}
+
+		return $loaded[$dispatcherHash][$type];
+	}
+
+	/**
+	 * Loads the plugin file.
+	 *
+	 * @param   object             $plugin      The plugin.
+	 * @param   boolean            $autocreate  True to autocreate.
+	 * @param   \JEventDispatcher  $dispatcher  Optionally allows the plugin to use a different dispatcher.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use PluginHelper::import() instead
+	 */
+	protected static function _import($plugin, $autocreate = true, \JEventDispatcher $dispatcher = null)
+	{
+		static::import($plugin, $autocreate, $dispatcher);
+	}
+
+	/**
+	 * Loads the plugin file.
+	 *
+	 * @param   object             $plugin      The plugin.
+	 * @param   boolean            $autocreate  True to autocreate.
+	 * @param   \JEventDispatcher  $dispatcher  Optionally allows the plugin to use a different dispatcher.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected static function import($plugin, $autocreate = true, \JEventDispatcher $dispatcher = null)
+	{
+		static $paths = array();
+
+		// Ensure we have a dispatcher now so we can correctly track the loaded paths
+		$dispatcher = $dispatcher ?: \JEventDispatcher::getInstance();
+
+		// Get the dispatcher's hash to allow paths to be tracked against unique dispatchers
+		$dispatcherHash = spl_object_hash($dispatcher);
+
+		if (!isset($paths[$dispatcherHash]))
+		{
+			$paths[$dispatcherHash] = array();
+		}
+
+		$plugin->type = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->type);
+		$plugin->name = preg_replace('/[^A-Z0-9_\.-]/i', '', $plugin->name);
+
+		$path = JPATH_PLUGINS . '/' . $plugin->type . '/' . $plugin->name . '/' . $plugin->name . '.php';
+
+		if (!isset($paths[$dispatcherHash][$path]))
+		{
+			if (file_exists($path))
+			{
+				if (!isset($paths[$dispatcherHash][$path]))
+				{
+					require_once $path;
+				}
+
+				$paths[$dispatcherHash][$path] = true;
+
+				if ($autocreate)
+				{
+					$className = 'Plg' . str_replace('-', '', $plugin->type) . $plugin->name;
+
+					if ($plugin->type == 'editors-xtd')
+					{
+						// This type doesn't follow the convention
+						$className = 'PlgEditorsXtd' . $plugin->name;
+
+						if (!class_exists($className))
+						{
+							$className = 'PlgButton' . $plugin->name;
+						}
+					}
+
+					if (class_exists($className))
+					{
+						// Load the plugin from the database.
+						if (!isset($plugin->params))
+						{
+							// Seems like this could just go bye bye completely
+							$plugin = static::getPlugin($plugin->type, $plugin->name);
+						}
+
+						// Instantiate and register the plugin.
+						new $className($dispatcher, (array) $plugin);
+					}
+				}
+			}
+			else
+			{
+				$paths[$dispatcherHash][$path] = false;
+			}
+		}
+	}
+
+	/**
+	 * Loads the published plugins.
+	 *
+	 * @return  array  An array of published plugins
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use PluginHelper::load() instead
+	 */
+	protected static function _load()
+	{
+		return static::load();
+	}
+
+	/**
+	 * Loads the published plugins.
+	 *
+	 * @return  array  An array of published plugins
+	 *
+	 * @since   3.2
+	 */
+	protected static function load()
+	{
+		if (static::$plugins !== null)
+		{
+			return static::$plugins;
+		}
+
+		$levels = implode(',', \JFactory::getUser()->getAuthorisedViewLevels());
+
+		/** @var \JCacheControllerCallback $cache */
+		$cache = \JFactory::getCache('com_plugins', 'callback');
+
+		$loader = function () use ($levels)
+		{
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select(
+					$db->quoteName(
+						array(
+							'folder',
+							'element',
+							'params',
+							'extension_id'
+						),
+						array(
+							'type',
+							'name',
+							'params',
+							'id'
+						)
+					)
+				)
+				->from('#__extensions')
+				->where('enabled = 1')
+				->where('type = ' . $db->quote('plugin'))
+				->where('state IN (0,1)')
+				->where('access IN (' . $levels . ')')
+				->order('ordering');
+			$db->setQuery($query);
+
+			return $db->loadObjectList();
+		};
+
+		try
+		{
+			static::$plugins = $cache->get($loader, array(), md5($levels), false);
+		}
+		catch (\JCacheException $cacheException)
+		{
+			static::$plugins = $loader();
+		}
+
+		return static::$plugins;
+	}
+}
diff --git a/core/libraries/src/Profiler/Profiler.php b/core/libraries/src/Profiler/Profiler.php
new file mode 100644
index 00000000..50bafeb2
--- /dev/null
+++ b/core/libraries/src/Profiler/Profiler.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Profiler;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Utility class to assist in the process of benchmarking the execution
+ * of sections of code to understand where time is being spent.
+ *
+ * @since  11.1
+ */
+class Profiler
+{
+	/**
+	 * @var    integer  The start time.
+	 * @since  12.1
+	 */
+	protected $start = 0;
+
+	/**
+	 * @var    string  The prefix to use in the output
+	 * @since  12.1
+	 */
+	protected $prefix = '';
+
+	/**
+	 * @var    array  The buffer of profiling messages.
+	 * @since  12.1
+	 */
+	protected $buffer = null;
+
+	/**
+	 * @var    array  The profiling messages.
+	 * @since  12.1
+	 */
+	protected $marks = null;
+
+	/**
+	 * @var    float  The previous time marker
+	 * @since  12.1
+	 */
+	protected $previousTime = 0.0;
+
+	/**
+	 * @var    float  The previous memory marker
+	 * @since  12.1
+	 */
+	protected $previousMem = 0.0;
+
+	/**
+	 * @var    array  JProfiler instances container.
+	 * @since  11.3
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $prefix  Prefix for mark messages
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($prefix = '')
+	{
+		$this->start = microtime(1);
+		$this->prefix = $prefix;
+		$this->marks = array();
+		$this->buffer = array();
+	}
+
+	/**
+	 * Returns the global Profiler object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $prefix  Prefix used to distinguish profiler objects.
+	 *
+	 * @return  Profiler  The Profiler object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($prefix = '')
+	{
+		if (empty(self::$instances[$prefix]))
+		{
+			self::$instances[$prefix] = new Profiler($prefix);
+		}
+
+		return self::$instances[$prefix];
+	}
+
+	/**
+	 * Output a time mark
+	 *
+	 * @param   string  $label  A label for the time mark
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public function mark($label)
+	{
+		$current = microtime(1) - $this->start;
+		$currentMem = memory_get_usage() / 1048576;
+
+		$m = (object) array(
+			'prefix' => $this->prefix,
+			'time' => ($current > $this->previousTime ? '+' : '-') . (($current - $this->previousTime) * 1000),
+			'totalTime' => ($current * 1000),
+			'memory' => ($currentMem > $this->previousMem ? '+' : '-') . ($currentMem - $this->previousMem),
+			'totalMemory' => $currentMem,
+			'label' => $label,
+		);
+		$this->marks[] = $m;
+
+		$mark = sprintf(
+			'%s %.3f seconds (%.3f); %0.2f MB (%0.3f) - %s',
+			$m->prefix,
+			$m->totalTime / 1000,
+			$m->time / 1000,
+			$m->totalMemory,
+			$m->memory,
+			$m->label
+		);
+		$this->buffer[] = $mark;
+
+		$this->previousTime = $current;
+		$this->previousMem = $currentMem;
+
+		return $mark;
+	}
+
+	/**
+	 * Get the current time.
+	 *
+	 * @return  float The current time
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use PHP's microtime(1)
+	 */
+	public static function getmicrotime()
+	{
+		list ($usec, $sec) = explode(' ', microtime());
+
+		return (float) $usec + (float) $sec;
+	}
+
+	/**
+	 * Get information about current memory usage.
+	 *
+	 * @return  integer  The memory usage
+	 *
+	 * @link    PHP_MANUAL#memory_get_usage
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Use PHP's native memory_get_usage()
+	 */
+	public function getMemory()
+	{
+		return memory_get_usage();
+	}
+
+	/**
+	 * Get all profiler marks.
+	 *
+	 * Returns an array of all marks created since the Profiler object
+	 * was instantiated.  Marks are objects as per {@link JProfiler::mark()}.
+	 *
+	 * @return  array  Array of profiler marks
+	 *
+	 * @since   11.1
+	 */
+	public function getMarks()
+	{
+		return $this->marks;
+	}
+
+	/**
+	 * Get all profiler mark buffers.
+	 *
+	 * Returns an array of all mark buffers created since the Profiler object
+	 * was instantiated.  Marks are strings as per {@link Profiler::mark()}.
+	 *
+	 * @return  array  Array of profiler marks
+	 *
+	 * @since   11.1
+	 */
+	public function getBuffer()
+	{
+		return $this->buffer;
+	}
+
+	/**
+	 * Sets the start time.
+	 *
+	 * @param   double  $startTime  Unix timestamp in microseconds for setting the Profiler start time.
+	 * @param   int     $startMem   Memory amount in bytes for setting the Profiler start memory.
+	 *
+	 * @return  $this   For chaining
+	 *
+	 * @since   12.1
+	 */
+	public function setStart($startTime = 0, $startMem = 0)
+	{
+		$this->start       = (double) $startTime;
+		$this->previousMem = (int) $startMem / 1048576;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/src/Response/JsonResponse.php b/core/libraries/src/Response/JsonResponse.php
new file mode 100644
index 00000000..cfe335d5
--- /dev/null
+++ b/core/libraries/src/Response/JsonResponse.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Response;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JSON Response class.
+ *
+ * This class serves to provide the Joomla Platform with a common interface to access
+ * response variables for e.g. Ajax requests.
+ *
+ * @since  3.1
+ */
+class JsonResponse
+{
+	/**
+	 * Determines whether the request was successful
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	public $success = true;
+
+	/**
+	 * The main response message
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public $message = null;
+
+	/**
+	 * Array of messages gathered in the \JApplication object
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	public $messages = null;
+
+	/**
+	 * The response data
+	 *
+	 * @var    mixed
+	 * @since  3.1
+	 */
+	public $data = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   mixed    $response        The Response data
+	 * @param   string   $message         The main response message
+	 * @param   boolean  $error           True, if the success flag shall be set to false, defaults to false
+	 * @param   boolean  $ignoreMessages  True, if the message queue shouldn't be included, defaults to false
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($response = null, $message = null, $error = false, $ignoreMessages = false)
+	{
+		$this->message = $message;
+
+		// Get the message queue if requested and available
+		$app = \JFactory::getApplication();
+
+		if (!$ignoreMessages && $app !== null && is_callable(array($app, 'getMessageQueue')))
+		{
+			$messages = $app->getMessageQueue();
+
+			// Build the sorted messages list
+			if (is_array($messages) && count($messages))
+			{
+				foreach ($messages as $message)
+				{
+					if (isset($message['type']) && isset($message['message']))
+					{
+						$lists[$message['type']][] = $message['message'];
+					}
+				}
+			}
+
+			// If messages exist add them to the output
+			if (isset($lists) && is_array($lists))
+			{
+				$this->messages = $lists;
+			}
+		}
+
+		// Check if we are dealing with an error
+		if ($response instanceof \Exception || $response instanceof \Throwable)
+		{
+			// Prepare the error response
+			$this->success = false;
+			$this->message = $response->getMessage();
+		}
+		else
+		{
+			// Prepare the response data
+			$this->success = !$error;
+			$this->data    = $response;
+		}
+	}
+
+	/**
+	 * Magic toString method for sending the response in JSON format
+	 *
+	 * @return  string  The response in JSON format
+	 *
+	 * @since   3.1
+	 */
+	public function __toString()
+	{
+		return json_encode($this);
+	}
+}
diff --git a/core/libraries/src/Router/AdministratorRouter.php b/core/libraries/src/Router/AdministratorRouter.php
new file mode 100644
index 00000000..d7e74be0
--- /dev/null
+++ b/core/libraries/src/Router/AdministratorRouter.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Class to create and parse routes
+ *
+ * @since  1.5
+ */
+class AdministratorRouter extends Router
+{
+	/**
+	 * Function to convert a route to an internal URI.
+	 *
+	 * @param   \JUri  &$uri  The uri.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function parse(&$uri)
+	{
+		return array();
+	}
+
+	/**
+	 * Function to convert an internal URI to a route
+	 *
+	 * @param   string  $url  The internal URL
+	 *
+	 * @return  string  The absolute search engine friendly URL
+	 *
+	 * @since   1.5
+	 */
+	public function build($url)
+	{
+		// Create the URI object
+		$uri = parent::build($url);
+
+		// Get the path data
+		$route = $uri->getPath();
+
+		// Add basepath to the uri
+		$uri->setPath(\JUri::base(true) . '/' . $route);
+
+		return $uri;
+	}
+}
diff --git a/core/libraries/src/Router/Exception/RouteNotFoundException.php b/core/libraries/src/Router/Exception/RouteNotFoundException.php
new file mode 100644
index 00000000..59007166
--- /dev/null
+++ b/core/libraries/src/Router/Exception/RouteNotFoundException.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Router\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an error for a missing route
+ *
+ * @since  3.8.0
+ */
+class RouteNotFoundException extends \InvalidArgumentException
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   string      $message   The Exception message to throw.
+	 * @param   integer     $code      The Exception code.
+	 * @param   \Exception  $previous  The previous exception used for the exception chaining.
+	 *
+	 * @since   3.8.0
+	 */
+	public function __construct($message = '', $code = 404, \Exception $previous = null)
+	{
+		if (empty($message))
+		{
+			$message = 'URL was not found';
+		}
+
+		parent::__construct($message, $code, $previous);
+	}
+}
diff --git a/core/libraries/src/Router/Route.php b/core/libraries/src/Router/Route.php
new file mode 100644
index 00000000..eaa6b03a
--- /dev/null
+++ b/core/libraries/src/Router/Route.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Route handling class
+ *
+ * @since  11.1
+ */
+class Route
+{
+	/**
+	 * The route object so we don't have to keep fetching it.
+	 *
+	 * @var    Router
+	 * @since  12.2
+	 */
+	private static $_router = null;
+
+	/**
+	 * Translates an internal Joomla URL to a humanly readable URL.
+	 *
+	 * @param   string   $url    Absolute or Relative URI to Joomla resource.
+	 * @param   boolean  $xhtml  Replace & by &amp; for XML compliance.
+	 * @param   integer  $ssl    Secure state for the resolved URI.
+	 *                             0: (default) No change, use the protocol currently used in the request
+	 *                             1: Make URI secure using global secure site URI.
+	 *                             2: Make URI unsecure using the global unsecure site URI.
+	 *
+	 * @return string The translated humanly readable URL.
+	 *
+	 * @since   11.1
+	 */
+	public static function _($url, $xhtml = true, $ssl = null)
+	{
+		if (!self::$_router)
+		{
+			// Get the router.
+			$app = Factory::getApplication();
+			self::$_router = $app::getRouter();
+
+			// Make sure that we have our router
+			if (!self::$_router)
+			{
+				return;
+			}
+		}
+
+		if (!is_array($url) && (strpos($url, '&') !== 0) && (strpos($url, 'index.php') !== 0))
+		{
+			return $url;
+		}
+
+		// Build route.
+		$uri = self::$_router->build($url);
+
+		$scheme = array('path', 'query', 'fragment');
+
+		/*
+		 * Get the secure/unsecure URLs.
+		 *
+		 * If the first 5 characters of the BASE are 'https', then we are on an ssl connection over
+		 * https and need to set our secure URL to the current request URL, if not, and the scheme is
+		 * 'http', then we need to do a quick string manipulation to switch schemes.
+		 */
+		if ((int) $ssl || $uri->isSsl())
+		{
+			static $host_port;
+
+			if (!is_array($host_port))
+			{
+				$uri2 = Uri::getInstance();
+				$host_port = array($uri2->getHost(), $uri2->getPort());
+			}
+
+			// Determine which scheme we want.
+			$uri->setScheme(((int) $ssl === 1 || $uri->isSsl()) ? 'https' : 'http');
+			$uri->setHost($host_port[0]);
+			$uri->setPort($host_port[1]);
+			$scheme = array_merge($scheme, array('host', 'port', 'scheme'));
+		}
+
+		$url = $uri->toString($scheme);
+
+		// Replace spaces.
+		$url = preg_replace('/\s/u', '%20', $url);
+
+		if ($xhtml)
+		{
+			$url = htmlspecialchars($url, ENT_COMPAT, 'UTF-8');
+		}
+
+		return $url;
+	}
+}
diff --git a/core/libraries/src/Router/Router.php b/core/libraries/src/Router/Router.php
new file mode 100644
index 00000000..c7c426fb
--- /dev/null
+++ b/core/libraries/src/Router/Router.php
@@ -0,0 +1,782 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Router\Exception\RouteNotFoundException;
+
+/**
+ * Class to create and parse routes
+ *
+ * @since  1.5
+ */
+class Router
+{
+	/**
+	 * Mask for the before process stage
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	const PROCESS_BEFORE = 'preprocess';
+
+	/**
+	 * Mask for the during process stage
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	const PROCESS_DURING = '';
+
+	/**
+	 * Mask for the after process stage
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	const PROCESS_AFTER = 'postprocess';
+
+	/**
+	 * The rewrite mode
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 * @deprecated  4.0
+	 */
+	protected $mode = null;
+
+	/**
+	 * The rewrite mode
+	 *
+	 * @var    integer
+	 * @since  1.5
+	 * @deprecated  4.0
+	 */
+	protected $_mode = null;
+
+	/**
+	 * An array of variables
+	 *
+	 * @var     array
+	 * @since   1.5
+	 */
+	protected $vars = array();
+
+	/**
+	 * An array of variables
+	 *
+	 * @var     array
+	 * @since  1.5
+	 * @deprecated  4.0 Will convert to $vars
+	 */
+	protected $_vars = array();
+
+	/**
+	 * An array of rules
+	 *
+	 * @var    array
+	 * @since  1.5
+	 */
+	protected $rules = array(
+		'buildpreprocess' => array(),
+		'build' => array(),
+		'buildpostprocess' => array(),
+		'parsepreprocess' => array(),
+		'parse' => array(),
+		'parsepostprocess' => array(),
+	);
+
+	/**
+	 * An array of rules
+	 *
+	 * @var    array
+	 * @since  1.5
+	 * @deprecated  4.0 Will convert to $rules
+	 */
+	protected $_rules = array(
+		'buildpreprocess' => array(),
+		'build' => array(),
+		'buildpostprocess' => array(),
+		'parsepreprocess' => array(),
+		'parse' => array(),
+		'parsepostprocess' => array(),
+	);
+
+	/**
+	 * Caching of processed URIs
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	protected $cache = array();
+
+	/**
+	 * Router instances container.
+	 *
+	 * @var    Router[]
+	 * @since  1.7
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($options = array())
+	{
+		if (array_key_exists('mode', $options))
+		{
+			$this->_mode = $options['mode'];
+		}
+		else
+		{
+			$this->_mode = JROUTER_MODE_RAW;
+		}
+	}
+
+	/**
+	 * Returns the global Router object, only creating it if it
+	 * doesn't already exist.
+	 *
+	 * @param   string  $client   The name of the client
+	 * @param   array   $options  An associative array of options
+	 *
+	 * @return  Router  A Router object.
+	 *
+	 * @since   1.5
+	 * @throws  \RuntimeException
+	 */
+	public static function getInstance($client, $options = array())
+	{
+		if (empty(self::$instances[$client]))
+		{
+			// Create a Router object
+			$classname = 'JRouter' . ucfirst($client);
+
+			if (!class_exists($classname))
+			{
+				// @deprecated 4.0 Everything in this block is deprecated but the warning is only logged after the file_exists
+				// Load the router object
+				$info = ApplicationHelper::getClientInfo($client, true);
+
+				if (is_object($info))
+				{
+					$path = $info->path . '/includes/router.php';
+
+					\JLoader::register($classname, $path);
+
+					if (class_exists($classname))
+					{
+						\JLog::add('Non-autoloadable Router subclasses are deprecated, support will be removed in 4.0.', \JLog::WARNING, 'deprecated');
+					}
+				}
+			}
+
+			if (class_exists($classname))
+			{
+				self::$instances[$client] = new $classname($options);
+			}
+			else
+			{
+				throw new \RuntimeException(\JText::sprintf('JLIB_APPLICATION_ERROR_ROUTER_LOAD', $client), 500);
+			}
+		}
+
+		return self::$instances[$client];
+	}
+
+	/**
+	 * Function to convert a route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The uri.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function parse(&$uri)
+	{
+		// Do the preprocess stage of the URL build process
+		$vars = $this->processParseRules($uri, self::PROCESS_BEFORE);
+
+		// Process the parsed variables based on custom defined rules
+		// This is the main parse stage
+		$vars += $this->_processParseRules($uri);
+
+		// Parse RAW URL
+		if ($this->_mode == JROUTER_MODE_RAW)
+		{
+			$vars += $this->_parseRawRoute($uri);
+		}
+
+		// Parse SEF URL
+		if ($this->_mode == JROUTER_MODE_SEF)
+		{
+			$vars += $this->_parseSefRoute($uri);
+		}
+
+		// Do the postprocess stage of the URL build process
+		$vars += $this->processParseRules($uri, self::PROCESS_AFTER);
+
+		// Check if all parts of the URL have been parsed.
+		// Otherwise we have an invalid URL
+		if (strlen($uri->getPath()) > 0 && array_key_exists('option', $vars)
+			&& ComponentHelper::getParams($vars['option'])->get('sef_advanced', 0))
+		{
+			throw new RouteNotFoundException('URL invalid');
+		}
+
+		return array_merge($this->getVars(), $vars);
+	}
+
+	/**
+	 * Function to convert an internal URI to a route
+	 *
+	 * @param   string  $url  The internal URL or an associative array
+	 *
+	 * @return  \JUri  The absolute search engine friendly URL object
+	 *
+	 * @since   1.5
+	 */
+	public function build($url)
+	{
+		$key = md5(serialize($url));
+
+		if (isset($this->cache[$key]))
+		{
+			return clone $this->cache[$key];
+		}
+
+		// Create the URI object
+		$uri = $this->createUri($url);
+
+		// Do the preprocess stage of the URL build process
+		$this->processBuildRules($uri, self::PROCESS_BEFORE);
+
+		// Process the uri information based on custom defined rules.
+		// This is the main build stage
+		$this->_processBuildRules($uri);
+
+		// Build RAW URL
+		if ($this->_mode == JROUTER_MODE_RAW)
+		{
+			$this->_buildRawRoute($uri);
+		}
+
+		// Build SEF URL : mysite/route/index.php?var=x
+		if ($this->_mode == JROUTER_MODE_SEF)
+		{
+			$this->_buildSefRoute($uri);
+		}
+
+		// Do the postprocess stage of the URL build process
+		$this->processBuildRules($uri, self::PROCESS_AFTER);
+
+		$this->cache[$key] = clone $uri;
+
+		return $uri;
+	}
+
+	/**
+	 * Get the router mode
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public function getMode()
+	{
+		return $this->_mode;
+	}
+
+	/**
+	 * Set the router mode
+	 *
+	 * @param   integer  $mode  The routing mode.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0
+	 */
+	public function setMode($mode)
+	{
+		$this->_mode = $mode;
+	}
+
+	/**
+	 * Set a router variable, creating it if it doesn't exist
+	 *
+	 * @param   string   $key     The name of the variable
+	 * @param   mixed    $value   The value of the variable
+	 * @param   boolean  $create  If True, the variable will be created if it doesn't exist yet
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function setVar($key, $value, $create = true)
+	{
+		if ($create || array_key_exists($key, $this->_vars))
+		{
+			$this->_vars[$key] = $value;
+		}
+	}
+
+	/**
+	 * Set the router variable array
+	 *
+	 * @param   array    $vars   An associative array with variables
+	 * @param   boolean  $merge  If True, the array will be merged instead of overwritten
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function setVars($vars = array(), $merge = true)
+	{
+		if ($merge)
+		{
+			$this->_vars = array_merge($this->_vars, $vars);
+		}
+		else
+		{
+			$this->_vars = $vars;
+		}
+	}
+
+	/**
+	 * Get a router variable
+	 *
+	 * @param   string  $key  The name of the variable
+	 *
+	 * @return  mixed  Value of the variable
+	 *
+	 * @since   1.5
+	 */
+	public function getVar($key)
+	{
+		$result = null;
+
+		if (isset($this->_vars[$key]))
+		{
+			$result = $this->_vars[$key];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get the router variable array
+	 *
+	 * @return  array  An associative array of router variables
+	 *
+	 * @since   1.5
+	 */
+	public function getVars()
+	{
+		return $this->_vars;
+	}
+
+	/**
+	 * Attach a build rule
+	 *
+	 * @param   callable  $callback  The function to be called
+	 * @param   string    $stage     The stage of the build process that
+	 *                               this should be added to. Possible values:
+	 *                               'preprocess', '' for the main build process,
+	 *                               'postprocess'
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function attachBuildRule($callback, $stage = self::PROCESS_DURING)
+	{
+		if (!array_key_exists('build' . $stage, $this->_rules))
+		{
+			throw new \InvalidArgumentException(sprintf('The %s stage is not registered. (%s)', $stage, __METHOD__));
+		}
+
+		$this->_rules['build' . $stage][] = $callback;
+	}
+
+	/**
+	 * Attach a parse rule
+	 *
+	 * @param   callable  $callback  The function to be called.
+	 * @param   string    $stage     The stage of the parse process that
+	 *                               this should be added to. Possible values:
+	 *                               'preprocess', '' for the main parse process,
+	 *                               'postprocess'
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function attachParseRule($callback, $stage = self::PROCESS_DURING)
+	{
+		if (!array_key_exists('parse' . $stage, $this->_rules))
+		{
+			throw new \InvalidArgumentException(sprintf('The %s stage is not registered. (%s)', $stage, __METHOD__));
+		}
+
+		$this->_rules['parse' . $stage][] = $callback;
+	}
+
+	/**
+	 * Function to convert a raw route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The raw route
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Attach your logic as rule to the main parse stage
+	 */
+	protected function _parseRawRoute(&$uri)
+	{
+		return $this->parseRawRoute($uri);
+	}
+
+	/**
+	 * Function to convert a raw route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The raw route
+	 *
+	 * @return  array  Array of variables
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main parse stage
+	 */
+	protected function parseRawRoute(&$uri)
+	{
+		return array();
+	}
+
+	/**
+	 * Function to convert a sef route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The sef URI
+	 *
+	 * @return  string  Internal URI
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Attach your logic as rule to the main parse stage
+	 */
+	protected function _parseSefRoute(&$uri)
+	{
+		return $this->parseSefRoute($uri);
+	}
+
+	/**
+	 * Function to convert a sef route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The sef URI
+	 *
+	 * @return  array  Array of variables
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main parse stage
+	 */
+	protected function parseSefRoute(&$uri)
+	{
+		return array();
+	}
+
+	/**
+	 * Function to build a raw route
+	 *
+	 * @param   \JUri  &$uri  The internal URL
+	 *
+	 * @return  string  Raw Route
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 */
+	protected function _buildRawRoute(&$uri)
+	{
+		return $this->buildRawRoute($uri);
+	}
+
+	/**
+	 * Function to build a raw route
+	 *
+	 * @param   \JUri  &$uri  The internal URL
+	 *
+	 * @return  string  Raw Route
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 */
+	protected function buildRawRoute(&$uri)
+	{
+	}
+
+	/**
+	 * Function to build a sef route
+	 *
+	 * @param   \JUri  &$uri  The uri
+	 *
+	 * @return  string  The SEF route
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 */
+	protected function _buildSefRoute(&$uri)
+	{
+		return $this->buildSefRoute($uri);
+	}
+
+	/**
+	 * Function to build a sef route
+	 *
+	 * @param   \JUri  &$uri  The uri
+	 *
+	 * @return  string  The SEF route
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 */
+	protected function buildSefRoute(&$uri)
+	{
+	}
+
+	/**
+	 * Process the parsed router variables based on custom defined rules
+	 *
+	 * @param   \JUri  &$uri  The URI to parse
+	 *
+	 * @return  array  The array of processed URI variables
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use processParseRules() instead
+	 */
+	protected function _processParseRules(&$uri)
+	{
+		return $this->processParseRules($uri);
+	}
+
+	/**
+	 * Process the parsed router variables based on custom defined rules
+	 *
+	 * @param   \JUri   &$uri   The URI to parse
+	 * @param   string  $stage  The stage that should be processed.
+	 *                          Possible values: 'preprocess', 'postprocess'
+	 *                          and '' for the main parse stage
+	 *
+	 * @return  array  The array of processed URI variables
+	 *
+	 * @since   3.2
+	 */
+	protected function processParseRules(&$uri, $stage = self::PROCESS_DURING)
+	{
+		if (!array_key_exists('parse' . $stage, $this->_rules))
+		{
+			throw new \InvalidArgumentException(sprintf('The %s stage is not registered. (%s)', $stage, __METHOD__));
+		}
+
+		$vars = array();
+
+		foreach ($this->_rules['parse' . $stage] as $rule)
+		{
+			$vars += (array) call_user_func_array($rule, array(&$this, &$uri));
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Process the build uri query data based on custom defined rules
+	 *
+	 * @param   \JUri  &$uri  The URI
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use processBuildRules() instead
+	 */
+	protected function _processBuildRules(&$uri)
+	{
+		$this->processBuildRules($uri);
+	}
+
+	/**
+	 * Process the build uri query data based on custom defined rules
+	 *
+	 * @param   \JUri   &$uri   The URI
+	 * @param   string  $stage  The stage that should be processed.
+	 *                          Possible values: 'preprocess', 'postprocess'
+	 *                          and '' for the main build stage
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function processBuildRules(&$uri, $stage = self::PROCESS_DURING)
+	{
+		if (!array_key_exists('build' . $stage, $this->_rules))
+		{
+			throw new \InvalidArgumentException(sprintf('The %s stage is not registered. (%s)', $stage, __METHOD__));
+		}
+
+		foreach ($this->_rules['build' . $stage] as $rule)
+		{
+			call_user_func_array($rule, array(&$this, &$uri));
+		}
+	}
+
+	/**
+	 * Create a uri based on a full or partial URL string
+	 *
+	 * @param   string  $url  The URI
+	 *
+	 * @return  \JUri
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Use createUri() instead
+	 * @codeCoverageIgnore
+	 */
+	protected function _createUri($url)
+	{
+		return $this->createUri($url);
+	}
+
+	/**
+	 * Create a uri based on a full or partial URL string
+	 *
+	 * @param   string  $url  The URI or an associative array
+	 *
+	 * @return  \JUri
+	 *
+	 * @since   3.2
+	 */
+	protected function createUri($url)
+	{
+		if (!is_array($url) && substr($url, 0, 1) !== '&')
+		{
+			return new \JUri($url);
+		}
+
+		$uri = new \JUri('index.php');
+
+		if (is_string($url))
+		{
+			$vars = array();
+
+			if (strpos($url, '&amp;') !== false)
+			{
+				$url = str_replace('&amp;', '&', $url);
+			}
+
+			parse_str($url, $vars);
+		}
+		else
+		{
+			$vars = $url;
+		}
+
+		$vars = array_merge($this->getVars(), $vars);
+
+		foreach ($vars as $key => $var)
+		{
+			if ($var == '')
+			{
+				unset($vars[$key]);
+			}
+		}
+
+		$uri->setQuery($vars);
+
+		return $uri;
+	}
+
+	/**
+	 * Encode route segments
+	 *
+	 * @param   array  $segments  An array of route segments
+	 *
+	 * @return  array  Array of encoded route segments
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  This should be performed in the component router instead
+	 * @codeCoverageIgnore
+	 */
+	protected function _encodeSegments($segments)
+	{
+		return $this->encodeSegments($segments);
+	}
+
+	/**
+	 * Encode route segments
+	 *
+	 * @param   array  $segments  An array of route segments
+	 *
+	 * @return  array  Array of encoded route segments
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  This should be performed in the component router instead
+	 */
+	protected function encodeSegments($segments)
+	{
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = str_replace(':', '-', $segments[$i]);
+		}
+
+		return $segments;
+	}
+
+	/**
+	 * Decode route segments
+	 *
+	 * @param   array  $segments  An array of route segments
+	 *
+	 * @return  array  Array of decoded route segments
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  This should be performed in the component router instead
+	 * @codeCoverageIgnore
+	 */
+	protected function _decodeSegments($segments)
+	{
+		return $this->decodeSegments($segments);
+	}
+
+	/**
+	 * Decode route segments
+	 *
+	 * @param   array  $segments  An array of route segments
+	 *
+	 * @return  array  Array of decoded route segments
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  This should be performed in the component router instead
+	 */
+	protected function decodeSegments($segments)
+	{
+		$total = count($segments);
+
+		for ($i = 0; $i < $total; $i++)
+		{
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+		}
+
+		return $segments;
+	}
+}
diff --git a/core/libraries/src/Router/SiteRouter.php b/core/libraries/src/Router/SiteRouter.php
new file mode 100644
index 00000000..e4ed7654
--- /dev/null
+++ b/core/libraries/src/Router/SiteRouter.php
@@ -0,0 +1,823 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Router;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Component\Router\RouterInterface;
+use Joomla\CMS\Component\Router\RouterLegacy;
+use Joomla\String\StringHelper;
+
+/**
+ * Class to create and parse routes for the site application
+ *
+ * @since  1.5
+ */
+class SiteRouter extends Router
+{
+	/**
+	 * Component-router objects
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	protected $componentRouters = array();
+
+	/**
+	 * Current Application-Object
+	 *
+	 * @var    CMSApplication
+	 * @since  3.4
+	 */
+	protected $app;
+
+	/**
+	 * Current \JMenu-Object
+	 *
+	 * @var    \JMenu
+	 * @since  3.4
+	 */
+	protected $menu;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   array           $options  Array of options
+	 * @param   CMSApplication  $app      CMSApplication Object
+	 * @param   \JMenu          $menu     \JMenu object
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($options = array(), CMSApplication $app = null, \JMenu $menu = null)
+	{
+		parent::__construct($options);
+
+		$this->app  = $app ?: CMSApplication::getInstance('site');
+		$this->menu = $menu ?: $this->app->getMenu();
+	}
+
+	/**
+	 * Function to convert a route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The uri.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public function parse(&$uri)
+	{
+		$vars = array();
+
+		if ($this->app->get('force_ssl') == 2 && strtolower($uri->getScheme()) !== 'https')
+		{
+			// Forward to https
+			$uri->setScheme('https');
+			$this->app->redirect((string) $uri, 301);
+		}
+
+		// Get the path
+		// Decode URL to convert percent-encoding to unicode so that strings match when routing.
+		$path = urldecode($uri->getPath());
+
+		// Remove the base URI path.
+		$path = substr_replace($path, '', 0, strlen(\JUri::base(true)));
+
+		// Check to see if a request to a specific entry point has been made.
+		if (preg_match("#.*?\.php#u", $path, $matches))
+		{
+			// Get the current entry point path relative to the site path.
+			$scriptPath         = realpath($_SERVER['SCRIPT_FILENAME'] ?: str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']));
+			$relativeScriptPath = str_replace('\\', '/', str_replace(JPATH_SITE, '', $scriptPath));
+
+			// If a php file has been found in the request path, check to see if it is a valid file.
+			// Also verify that it represents the same file from the server variable for entry script.
+			if (file_exists(JPATH_SITE . $matches[0]) && ($matches[0] === $relativeScriptPath))
+			{
+				// Remove the entry point segments from the request path for proper routing.
+				$path = str_replace($matches[0], '', $path);
+			}
+		}
+
+		// Identify format
+		if ($this->_mode == JROUTER_MODE_SEF)
+		{
+			if ($this->app->get('sef_suffix') && !(substr($path, -9) === 'index.php' || substr($path, -1) === '/'))
+			{
+				if ($suffix = pathinfo($path, PATHINFO_EXTENSION))
+				{
+					$vars['format'] = $suffix;
+				}
+			}
+		}
+
+		// Set the route
+		$uri->setPath(trim($path, '/'));
+
+		// Set the parsepreprocess components methods
+		$components = ComponentHelper::getComponents();
+
+		foreach ($components as $component)
+		{
+			$componentRouter = $this->getComponentRouter($component->option);
+
+			if (method_exists($componentRouter, 'parsepreprocess'))
+			{
+				$this->attachParseRule(array($componentRouter, 'parsepreprocess'), static::PROCESS_BEFORE);
+			}
+		}
+
+		$vars += parent::parse($uri);
+
+		return $vars;
+	}
+
+	/**
+	 * Function to convert an internal URI to a route
+	 *
+	 * @param   string  $url  The internal URL
+	 *
+	 * @return  string  The absolute search engine friendly URL
+	 *
+	 * @since   1.5
+	 */
+	public function build($url)
+	{
+		$uri = parent::build($url);
+
+		// Get the path data
+		$route = $uri->getPath();
+
+		// Add the suffix to the uri
+		if ($this->_mode == JROUTER_MODE_SEF && $route)
+		{
+			if ($this->app->get('sef_suffix') && !(substr($route, -9) === 'index.php' || substr($route, -1) === '/'))
+			{
+				if ($format = $uri->getVar('format', 'html'))
+				{
+					$route .= '.' . $format;
+					$uri->delVar('format');
+				}
+			}
+
+			if ($this->app->get('sef_rewrite'))
+			{
+				// Transform the route
+				if ($route === 'index.php')
+				{
+					$route = '';
+				}
+				else
+				{
+					$route = str_replace('index.php/', '', $route);
+				}
+			}
+		}
+
+		// Add basepath to the uri
+		$uri->setPath(\JUri::base(true) . '/' . $route);
+
+		return $uri;
+	}
+
+	/**
+	 * Function to convert a raw route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The raw route
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main parse stage
+	 */
+	protected function parseRawRoute(&$uri)
+	{
+		$vars = array();
+
+		// Handle an empty URL (special case)
+		if (!$uri->getVar('Itemid') && !$uri->getVar('option'))
+		{
+			$item = $this->menu->getDefault($this->app->getLanguage()->getTag());
+
+			if (!is_object($item))
+			{
+				// No default item set
+				return $vars;
+			}
+
+			// Set the information in the request
+			$vars = $item->query;
+
+			// Get the itemid
+			$vars['Itemid'] = $item->id;
+
+			// Set the active menu item
+			$this->menu->setActive($vars['Itemid']);
+
+			return $vars;
+		}
+
+		// Get the variables from the uri
+		$this->setVars($uri->getQuery(true));
+
+		// Get the itemid, if it hasn't been set force it to null
+		$this->setVar('Itemid', $this->app->input->getInt('Itemid', null));
+
+		// Only an Itemid  OR if filter language plugin set? Get the full information from the itemid
+		if (count($this->getVars()) === 1 || ($this->app->getLanguageFilter() && count($this->getVars()) === 2))
+		{
+			$item = $this->menu->getItem($this->getVar('Itemid'));
+
+			if ($item && $item->type == 'alias')
+			{
+				$newItem = $this->menu->getItem($item->params->get('aliasoptions'));
+
+				if ($newItem)
+				{
+					$item->query     = array_merge($item->query, $newItem->query);
+					$item->component = $newItem->component;
+				}
+			}
+
+			if ($item !== null && is_array($item->query))
+			{
+				$vars += $item->query;
+			}
+		}
+
+		// Set the active menu item
+		$this->menu->setActive($this->getVar('Itemid'));
+
+		return $vars;
+	}
+
+	/**
+	 * Function to convert a sef route to an internal URI
+	 *
+	 * @param   \JUri  &$uri  The sef URI
+	 *
+	 * @return  string  Internal URI
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main parse stage
+	 */
+	protected function parseSefRoute(&$uri)
+	{
+		$route = $uri->getPath();
+
+		// Remove the suffix
+		if ($this->app->get('sef_suffix'))
+		{
+			if ($suffix = pathinfo($route, PATHINFO_EXTENSION))
+			{
+				$route = str_replace('.' . $suffix, '', $route);
+			}
+		}
+
+		// Get the variables from the uri
+		$vars = $uri->getQuery(true);
+
+		// Handle an empty URL (special case)
+		if (empty($route))
+		{
+			// If route is empty AND option is set in the query, assume it's non-sef url, and parse apropriately
+			if (isset($vars['option']) || isset($vars['Itemid']))
+			{
+				return $this->parseRawRoute($uri);
+			}
+
+			$item = $this->menu->getDefault($this->app->getLanguage()->getTag());
+
+			// If user not allowed to see default menu item then avoid notices
+			if (is_object($item))
+			{
+				// Set query variables of default menu item into the request, but keep existing request variables
+				$vars = array_merge($vars, $item->query);
+
+				// Get the itemid
+				$vars['Itemid'] = $item->id;
+
+				// Set the active menu item
+				$this->menu->setActive($vars['Itemid']);
+
+				$this->setVars($vars);
+			}
+
+			return $vars;
+		}
+
+		// Parse the application route
+		$segments = explode('/', $route);
+
+		if (count($segments) > 1 && $segments[0] === 'component')
+		{
+			$vars['option'] = 'com_' . $segments[1];
+			$vars['Itemid'] = null;
+			$route = implode('/', array_slice($segments, 2));
+		}
+		else
+		{
+			// Get menu items.
+			$items = $this->menu->getMenu();
+
+			$found           = false;
+			$route_lowercase = StringHelper::strtolower($route);
+			$lang_tag        = $this->app->getLanguage()->getTag();
+
+			// Iterate through all items and check route matches.
+			foreach ($items as $item)
+			{
+				if ($item->route && StringHelper::strpos($route_lowercase . '/', $item->route . '/') === 0 && $item->type !== 'menulink')
+				{
+					// Usual method for non-multilingual site.
+					if (!$this->app->getLanguageFilter())
+					{
+						// Exact route match. We can break iteration because exact item was found.
+						if ($item->route === $route_lowercase)
+						{
+							$found = $item;
+							break;
+						}
+
+						// Partial route match. Item with highest level takes priority.
+						if (!$found || $found->level < $item->level)
+						{
+							$found = $item;
+						}
+					}
+					// Multilingual site.
+					elseif ($item->language === '*' || $item->language === $lang_tag)
+					{
+						// Exact route match.
+						if ($item->route === $route_lowercase)
+						{
+							$found = $item;
+
+							// Break iteration only if language is matched.
+							if ($item->language === $lang_tag)
+							{
+								break;
+							}
+						}
+
+						// Partial route match. Item with highest level or same language takes priority.
+						if (!$found || $found->level < $item->level || $item->language === $lang_tag)
+						{
+							$found = $item;
+						}
+					}
+				}
+			}
+
+			if (!$found)
+			{
+				$found = $this->menu->getDefault($lang_tag);
+			}
+			else
+			{
+				$route = substr($route, strlen($found->route));
+
+				if ($route)
+				{
+					$route = substr($route, 1);
+				}
+			}
+
+			if ($found)
+			{
+				if ($found->type == 'alias')
+				{
+					$newItem = $this->menu->getItem($found->params->get('aliasoptions'));
+
+					if ($newItem)
+					{
+						$found->query     = array_merge($found->query, $newItem->query);
+						$found->component = $newItem->component;
+					}
+				}
+
+				$vars['Itemid'] = $found->id;
+				$vars['option'] = $found->component;
+			}
+		}
+
+		// Set the active menu item
+		if (isset($vars['Itemid']))
+		{
+			$this->menu->setActive($vars['Itemid']);
+		}
+
+		// Set the variables
+		$this->setVars($vars);
+
+		// Parse the component route
+		if (!empty($route) && isset($this->_vars['option']))
+		{
+			$segments = explode('/', $route);
+
+			if (empty($segments[0]))
+			{
+				array_shift($segments);
+			}
+
+			// Handle component route
+			$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $this->_vars['option']);
+
+			if (count($segments))
+			{
+				$crouter = $this->getComponentRouter($component);
+				$vars = $crouter->parse($segments);
+
+				$this->setVars($vars);
+			}
+
+			$route = implode('/', $segments);
+		}
+		else
+		{
+			// Set active menu item
+			if ($item = $this->menu->getActive())
+			{
+				$vars = $item->query;
+			}
+		}
+
+		$uri->setPath($route);
+
+		return $vars;
+	}
+
+	/**
+	 * Function to build a raw route
+	 *
+	 * @param   \JUri  &$uri  The internal URL
+	 *
+	 * @return  string  Raw Route
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 */
+	protected function buildRawRoute(&$uri)
+	{
+		// Get the query data
+		$query = $uri->getQuery(true);
+
+		if (!isset($query['option']))
+		{
+			return;
+		}
+
+		$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $query['option']);
+		$crouter   = $this->getComponentRouter($component);
+		$query     = $crouter->preprocess($query);
+
+		$uri->setQuery($query);
+	}
+
+	/**
+	 * Function to build a sef route
+	 *
+	 * @param   \JUri  &$uri  The internal URL
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 * @codeCoverageIgnore
+	 */
+	protected function _buildSefRoute(&$uri)
+	{
+		$this->buildSefRoute($uri);
+	}
+
+	/**
+	 * Function to build a sef route
+	 *
+	 * @param   \JUri  &$uri  The uri
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  Attach your logic as rule to the main build stage
+	 */
+	protected function buildSefRoute(&$uri)
+	{
+		// Get the route
+		$route = $uri->getPath();
+
+		// Get the query data
+		$query = $uri->getQuery(true);
+
+		if (!isset($query['option']))
+		{
+			return;
+		}
+
+		// Build the component route
+		$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $query['option']);
+		$itemID    = !empty($query['Itemid']) ? $query['Itemid'] : null;
+		$crouter   = $this->getComponentRouter($component);
+		$parts     = $crouter->build($query);
+		$result    = implode('/', $parts);
+		$tmp       = ($result !== '') ? $result : '';
+
+		// Build the application route
+		$built = false;
+
+		if (!empty($query['Itemid']))
+		{
+			$item = $this->menu->getItem($query['Itemid']);
+
+			if (is_object($item) && $query['option'] === $item->component)
+			{
+				if (!$item->home)
+				{
+					$tmp = !empty($tmp) ? $item->route . '/' . $tmp : $item->route;
+				}
+
+				$built = true;
+			}
+		}
+
+		if (empty($query['Itemid']) && !empty($itemID))
+		{
+			$query['Itemid'] = $itemID;
+		}
+
+		if (!$built)
+		{
+			$tmp = 'component/' . substr($query['option'], 4) . '/' . $tmp;
+		}
+
+		if ($tmp)
+		{
+			$route .= '/' . $tmp;
+		}
+
+		// Unset unneeded query information
+		if (isset($item) && $query['option'] === $item->component)
+		{
+			unset($query['Itemid']);
+		}
+
+		unset($query['option']);
+
+		// Set query again in the URI
+		$uri->setQuery($query);
+		$uri->setPath($route);
+	}
+
+	/**
+	 * Process the parsed router variables based on custom defined rules
+	 *
+	 * @param   \JUri   &$uri   The URI to parse
+	 * @param   string  $stage  The stage that should be processed.
+	 *                          Possible values: 'preprocess', 'postprocess'
+	 *                          and '' for the main parse stage
+	 *
+	 * @return  array  The array of processed URI variables
+	 *
+	 * @since   3.2
+	 */
+	protected function processParseRules(&$uri, $stage = self::PROCESS_DURING)
+	{
+		// Process the attached parse rules
+		$vars = parent::processParseRules($uri, $stage);
+
+		if ($stage === self::PROCESS_DURING)
+		{
+			// Process the pagination support
+			if ($this->_mode == JROUTER_MODE_SEF)
+			{
+				$start = $uri->getVar('start');
+
+				if ($start !== null)
+				{
+					$uri->delVar('start');
+					$vars['limitstart'] = $start;
+				}
+			}
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * Process the build uri query data based on custom defined rules
+	 *
+	 * @param   \JUri   &$uri   The URI
+	 * @param   string  $stage  The stage that should be processed.
+	 *                          Possible values: 'preprocess', 'postprocess'
+	 *                          and '' for the main build stage
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  The special logic should be implemented as rule
+	 */
+	protected function processBuildRules(&$uri, $stage = self::PROCESS_DURING)
+	{
+		if ($stage === self::PROCESS_DURING)
+		{
+			// Make sure any menu vars are used if no others are specified
+			$query = $uri->getQuery(true);
+
+			if ($this->_mode != 1
+				&& isset($query['Itemid'])
+				&& (count($query) === 2 || (count($query) === 3 && isset($query['lang']))))
+			{
+				// Get the active menu item
+				$itemid = $uri->getVar('Itemid');
+				$lang = $uri->getVar('lang');
+				$item = $this->menu->getItem($itemid);
+
+				if ($item)
+				{
+					$uri->setQuery($item->query);
+				}
+
+				$uri->setVar('Itemid', $itemid);
+
+				if ($lang)
+				{
+					$uri->setVar('lang', $lang);
+				}
+			}
+		}
+
+		// Process the attached build rules
+		parent::processBuildRules($uri, $stage);
+
+		if ($stage === self::PROCESS_BEFORE)
+		{
+			// Get the query data
+			$query = $uri->getQuery(true);
+
+			if (!isset($query['option']))
+			{
+				return;
+			}
+
+			// Build the component route
+			$component = preg_replace('/[^A-Z0-9_\.-]/i', '', $query['option']);
+			$router   = $this->getComponentRouter($component);
+			$query     = $router->preprocess($query);
+			$uri->setQuery($query);
+		}
+
+		if ($stage === self::PROCESS_DURING)
+		{
+			// Get the path data
+			$route = $uri->getPath();
+
+			if ($this->_mode == JROUTER_MODE_SEF && $route)
+			{
+				$limitstart = $uri->getVar('limitstart');
+
+				if ($limitstart !== null)
+				{
+					$uri->setVar('start', (int) $limitstart);
+					$uri->delVar('limitstart');
+				}
+			}
+
+			$uri->setPath($route);
+		}
+	}
+
+	/**
+	 * Create a uri based on a full or partial URL string
+	 *
+	 * @param   string  $url  The URI
+	 *
+	 * @return  \JUri
+	 *
+	 * @since   3.2
+	 */
+	protected function createUri($url)
+	{
+		// Create the URI
+		$uri = parent::createUri($url);
+
+		// Get the itemid form the URI
+		$itemid = $uri->getVar('Itemid');
+
+		if ($itemid === null)
+		{
+			if ($option = $uri->getVar('option'))
+			{
+				$item = $this->menu->getItem($this->getVar('Itemid'));
+
+				if ($item !== null && $item->component === $option)
+				{
+					$uri->setVar('Itemid', $item->id);
+				}
+			}
+			else
+			{
+				if ($option = $this->getVar('option'))
+				{
+					$uri->setVar('option', $option);
+				}
+
+				if ($itemid = $this->getVar('Itemid'))
+				{
+					$uri->setVar('Itemid', $itemid);
+				}
+			}
+		}
+		else
+		{
+			if (!$uri->getVar('option'))
+			{
+				if ($item = $this->menu->getItem($itemid))
+				{
+					$uri->setVar('option', $item->component);
+				}
+			}
+		}
+
+		return $uri;
+	}
+
+	/**
+	 * Get component router
+	 *
+	 * @param   string  $component  Name of the component including com_ prefix
+	 *
+	 * @return  RouterInterface  Component router
+	 *
+	 * @since   3.3
+	 */
+	public function getComponentRouter($component)
+	{
+		if (!isset($this->componentRouters[$component]))
+		{
+			$compname = ucfirst(substr($component, 4));
+			$class = $compname . 'Router';
+
+			if (!class_exists($class))
+			{
+				// Use the component routing handler if it exists
+				$path = JPATH_SITE . '/components/' . $component . '/router.php';
+
+				// Use the custom routing handler if it exists
+				if (file_exists($path))
+				{
+					require_once $path;
+				}
+			}
+
+			if (class_exists($class))
+			{
+				$reflection = new \ReflectionClass($class);
+
+				if (in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames()))
+				{
+					$this->componentRouters[$component] = new $class($this->app, $this->menu);
+				}
+			}
+
+			if (!isset($this->componentRouters[$component]))
+			{
+				$this->componentRouters[$component] = new RouterLegacy($compname);
+			}
+		}
+
+		return $this->componentRouters[$component];
+	}
+
+	/**
+	 * Set a router for a component
+	 *
+	 * @param   string  $component  Component name with com_ prefix
+	 * @param   object  $router     Component router
+	 *
+	 * @return  boolean  True if the router was accepted, false if not
+	 *
+	 * @since   3.3
+	 */
+	public function setComponentRouter($component, $router)
+	{
+		$reflection = new \ReflectionClass($router);
+
+		if (in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames()))
+		{
+			$this->componentRouters[$component] = $router;
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/src/Schema/ChangeItem.php b/core/libraries/src/Schema/ChangeItem.php
new file mode 100644
index 00000000..97cc0548
--- /dev/null
+++ b/core/libraries/src/Schema/ChangeItem.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Schema;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Each object represents one query, which is one line from a DDL SQL query.
+ * This class is used to check the site's database to see if the DDL query has been run.
+ * If not, it provides the ability to fix the database by re-running the DDL query.
+ * The queries are parsed from the update files in the folder
+ * `administrator/components/com_admin/sql/updates/<database>`.
+ * These updates are run automatically if the site was updated using com_installer.
+ * However, it is possible that the program files could be updated without udpating
+ * the database (for example, if a user just copies the new files over the top of an
+ * existing installation).
+ *
+ * This is an abstract class. We need to extend it for each database and add a
+ * buildCheckQuery() method that creates the query to check that a DDL query has been run.
+ *
+ * @since  2.5
+ */
+abstract class ChangeItem
+{
+	/**
+	 * Update file: full path file name where query was found
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $file = null;
+
+	/**
+	 * Update query: query used to change the db schema (one line from the file)
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $updateQuery = null;
+
+	/**
+	 * Check query: query used to check the db schema
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $checkQuery = null;
+
+	/**
+	 * Check query result: expected result of check query if database is up to date
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $checkQueryExpected = 1;
+
+	/**
+	 * \JDatabaseDriver object
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  2.5
+	 */
+	public $db = null;
+
+	/**
+	 * Query type: To be used in building a language key for a
+	 * message to tell user what was checked / changed
+	 * Possible values: ADD_TABLE, ADD_COLUMN, CHANGE_COLUMN_TYPE, ADD_INDEX
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	public $queryType = null;
+
+	/**
+	 * Array with values for use in a \JText::sprintf statment indicating what was checked
+	 *
+	 * Tells you what the message should be, based on which elements are defined, as follows:
+	 *     For ADD_TABLE: table
+	 *     For ADD_COLUMN: table, column
+	 *     For CHANGE_COLUMN_TYPE: table, column, type
+	 *     For ADD_INDEX: table, index
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	public $msgElements = array();
+
+	/**
+	 * Checked status
+	 *
+	 * @var    integer   0=not checked, -1=skipped, -2=failed, 1=succeeded
+	 * @since  2.5
+	 */
+	public $checkStatus = 0;
+
+	/**
+	 * Rerun status
+	 *
+	 * @var    int   0=not rerun, -1=skipped, -2=failed, 1=succeeded
+	 * @since  2.5
+	 */
+	public $rerunStatus = 0;
+
+	/**
+	 * Constructor: builds check query and message from $updateQuery
+	 *
+	 * @param   \JDatabaseDriver  $db     Database connector object
+	 * @param   string            $file   Full path name of the sql file
+	 * @param   string            $query  Text of the sql query (one line of the file)
+	 *
+	 * @since   2.5
+	 */
+	public function __construct($db, $file, $query)
+	{
+		$this->updateQuery = $query;
+		$this->file = $file;
+		$this->db = $db;
+		$this->buildCheckQuery();
+	}
+
+	/**
+	 * Returns a reference to the ChangeItem object.
+	 *
+	 * @param   \JDatabaseDriver  $db     Database connector object
+	 * @param   string            $file   Full path name of the sql file
+	 * @param   string            $query  Text of the sql query (one line of the file)
+	 *
+	 * @return  ChangeItem  instance based on the database driver
+	 *
+	 * @since   2.5
+	 * @throws  \RuntimeException if class for database driver not found
+	 */
+	public static function getInstance($db, $file, $query)
+	{
+		// Get the class name
+		$serverType = $db->getServerType();
+
+		// For `mssql` server types, convert the type to `sqlsrv`
+		if ($serverType === 'mssql')
+		{
+			$serverType = 'sqlsrv';
+		}
+
+		$class = '\\Joomla\\CMS\\Schema\\ChangeItem\\' . ucfirst($serverType) . 'ChangeItem';
+
+		// If the class exists, return it.
+		if (class_exists($class))
+		{
+			return new $class($db, $file, $query);
+		}
+
+		throw new \RuntimeException(sprintf('ChangeItem child class not found for the %s database driver', $serverType), 500);
+	}
+
+	/**
+	 * Checks a DDL query to see if it is a known type
+	 * If yes, build a check query to see if the DDL has been run on the database.
+	 * If successful, the $msgElements, $queryType, $checkStatus and $checkQuery fields are populated.
+	 * The $msgElements contains the text to create the user message.
+	 * The $checkQuery contains the SQL query to check whether the schema change has
+	 * been run against the current database. The $queryType contains the type of
+	 * DDL query that was run (for example, CREATE_TABLE, ADD_COLUMN, CHANGE_COLUMN_TYPE, ADD_INDEX).
+	 * The $checkStatus field is set to zero if the query is created
+	 *
+	 * If not successful, $checkQuery is empty and , and $checkStatus is -1.
+	 * For example, this will happen if the current line is a non-DDL statement.
+	 *
+	 * @return void
+	 *
+	 * @since  2.5
+	 */
+	abstract protected function buildCheckQuery();
+
+	/**
+	 * Runs the check query and checks that 1 row is returned
+	 * If yes, return true, otherwise return false
+	 *
+	 * @return  boolean  true on success, false otherwise
+	 *
+	 * @since  2.5
+	 */
+	public function check()
+	{
+		$this->checkStatus = -1;
+
+		if ($this->checkQuery)
+		{
+			$this->db->setQuery($this->checkQuery);
+
+			try
+			{
+				$rows = $this->db->loadRowList(0);
+			}
+			catch (\RuntimeException $e)
+			{
+				// Still render the error message from the Exception object
+				\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+				$this->checkStatus = -2;
+
+				return $this->checkStatus;
+			}
+
+			if (count($rows) === $this->checkQueryExpected)
+			{
+				$this->checkStatus = 1;
+
+				return $this->checkStatus;
+			}
+
+			$this->checkStatus = -2;
+		}
+
+		return $this->checkStatus;
+	}
+
+	/**
+	 * Runs the update query to apply the change to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function fix()
+	{
+		if ($this->checkStatus === -2)
+		{
+			// At this point we have a failed query
+			$query = $this->db->convertUtf8mb4QueryToUtf8($this->updateQuery);
+			$this->db->setQuery($query);
+
+			if ($this->db->execute())
+			{
+				if ($this->check())
+				{
+					$this->checkStatus = 1;
+					$this->rerunStatus = 1;
+				}
+				else
+				{
+					$this->rerunStatus = -2;
+				}
+			}
+			else
+			{
+				$this->rerunStatus = -2;
+			}
+		}
+	}
+}
diff --git a/core/libraries/src/Schema/ChangeItem/MysqlChangeItem.php b/core/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
new file mode 100644
index 00000000..665c6fa9
--- /dev/null
+++ b/core/libraries/src/Schema/ChangeItem/MysqlChangeItem.php
@@ -0,0 +1,392 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Schema\ChangeItem;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Schema\ChangeItem;
+
+/**
+ * Checks the database schema against one MySQL DDL query to see if it has been run.
+ *
+ * @since  2.5
+ */
+class MysqlChangeItem extends ChangeItem
+{
+	/**
+	 * Checks a DDL query to see if it is a known type
+	 * If yes, build a check query to see if the DDL has been run on the database.
+	 * If successful, the $msgElements, $queryType, $checkStatus and $checkQuery fields are populated.
+	 * The $msgElements contains the text to create the user message.
+	 * The $checkQuery contains the SQL query to check whether the schema change has
+	 * been run against the current database. The $queryType contains the type of
+	 * DDL query that was run (for example, CREATE_TABLE, ADD_COLUMN, CHANGE_COLUMN_TYPE, ADD_INDEX).
+	 * The $checkStatus field is set to zero if the query is created
+	 *
+	 * If not successful, $checkQuery is empty and , and $checkStatus is -1.
+	 * For example, this will happen if the current line is a non-DDL statement.
+	 *
+	 * @return void
+	 *
+	 * @since  2.5
+	 */
+	protected function buildCheckQuery()
+	{
+		// Initialize fields in case we can't create a check query
+		$this->checkStatus = -1; // change status to skipped
+		$result = null;
+
+		// Remove any newlines
+		$this->updateQuery = str_replace("\n", '', $this->updateQuery);
+
+		// Fix up extra spaces around () and in general
+		$find = array('#((\s*)\(\s*([^)\s]+)\s*)(\))#', '#(\s)(\s*)#');
+		$replace = array('($3)', '$1');
+		$updateQuery = preg_replace($find, $replace, $this->updateQuery);
+		$wordArray = preg_split("~'[^']*'(*SKIP)(*F)|\s+~u", trim($updateQuery, "; \t\n\r\0\x0B"));
+
+		// First, make sure we have an array of at least 6 elements
+		// if not, we can't make a check query for this one
+		if (count($wordArray) < 6)
+		{
+			// Done with method
+			return;
+		}
+
+		// We can only make check queries for alter table and create table queries
+		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
+
+		// Check for special update statement to reset utf8mb4 conversion status
+		if (($command === 'UPDATE `#__UTF8_CONVERSION`'
+			|| $command === 'UPDATE #__UTF8_CONVERSION')
+			&& strtoupper($wordArray[2]) === 'SET'
+			&& strtolower(substr(str_replace('`', '', $wordArray[3]), 0, 9)) === 'converted')
+		{
+			// Statement is special statement to reset conversion status
+			$this->queryType = 'UTF8CNV';
+
+			// Done with method
+			return;
+		}
+
+		if ($command === 'ALTER TABLE')
+		{
+			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
+
+			if ($alterCommand === 'ADD COLUMN')
+			{
+				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE field = ' . $this->fixQuote($wordArray[5]);
+				$this->queryType = 'ADD_COLUMN';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
+			}
+			elseif ($alterCommand === 'ADD INDEX' || $alterCommand === 'ADD KEY')
+			{
+				if ($pos = strpos($wordArray[5], '('))
+				{
+					$index = $this->fixQuote(substr($wordArray[5], 0, $pos));
+				}
+				else
+				{
+					$index = $this->fixQuote($wordArray[5]);
+				}
+
+				$result = 'SHOW INDEXES IN ' . $wordArray[2] . ' WHERE Key_name = ' . $index;
+				$this->queryType = 'ADD_INDEX';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
+			}
+			elseif ($alterCommand === 'ADD UNIQUE')
+			{
+				$idxIndexName = 5;
+
+				if (isset($wordArray[6]))
+				{
+					$addCmdCheck = strtoupper($wordArray[5]);
+
+					if ($addCmdCheck === 'INDEX' || $addCmdCheck === 'KEY')
+					{
+						$idxIndexName = 6;
+					}
+				}
+
+				if ($pos = strpos($wordArray[$idxIndexName], '('))
+				{
+					$index = $this->fixQuote(substr($wordArray[$idxIndexName], 0, $pos));
+				}
+				else
+				{
+					$index = $this->fixQuote($wordArray[$idxIndexName]);
+				}
+
+				$result = 'SHOW INDEXES IN ' . $wordArray[2] . ' WHERE Key_name = ' . $index;
+				$this->queryType = 'ADD_INDEX';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
+			}
+			elseif ($alterCommand === 'DROP INDEX' || $alterCommand === 'DROP KEY')
+			{
+				$index = $this->fixQuote($wordArray[5]);
+				$result = 'SHOW INDEXES IN ' . $wordArray[2] . ' WHERE Key_name = ' . $index;
+				$this->queryType = 'DROP_INDEX';
+				$this->checkQueryExpected = 0;
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
+			}
+			elseif ($alterCommand === 'DROP COLUMN')
+			{
+				$index = $this->fixQuote($wordArray[5]);
+				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE Field = ' . $index;
+				$this->queryType = 'DROP_COLUMN';
+				$this->checkQueryExpected = 0;
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
+			}
+			elseif (strtoupper($wordArray[3]) === 'MODIFY')
+			{
+				// Kludge to fix problem with "integer unsigned"
+				$type = $wordArray[5];
+
+				if (isset($wordArray[6]))
+				{
+					$type = $this->fixInteger($wordArray[5], $wordArray[6]);
+				}
+
+				// Detect changes in NULL and in DEFAULT column attributes
+				$changesArray = array_slice($wordArray, 6);
+				$defaultCheck = $this->checkDefault($changesArray, $type);
+				$nullCheck = $this->checkNull($changesArray);
+
+				/**
+				 * When we made the UTF8MB4 conversion then text becomes medium text - so loosen the checks to these two types
+				 * otherwise (for example) the profile fields profile_value check fails - see https://github.com/joomla/joomla-cms/issues/9258
+				 */
+				$typeCheck = $this->fixUtf8mb4TypeChecks($type);
+
+				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE field = ' . $this->fixQuote($wordArray[4])
+					. ' AND ' . $typeCheck
+					. ($defaultCheck ? ' AND ' . $defaultCheck : '')
+					. ($nullCheck ? ' AND ' . $nullCheck : '');
+				$this->queryType = 'CHANGE_COLUMN_TYPE';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[4]), $type);
+			}
+			elseif (strtoupper($wordArray[3]) === 'CHANGE')
+			{
+				// Kludge to fix problem with "integer unsigned"
+				$type = $wordArray[6];
+
+				if (isset($wordArray[7]))
+				{
+					$type = $this->fixInteger($wordArray[6], $wordArray[7]);
+				}
+				
+				// Detect changes in NULL and in DEFAULT column attributes
+				$changesArray = array_slice($wordArray, 6);
+				$defaultCheck = $this->checkDefault($changesArray, $type);
+				$nullCheck = $this->checkNull($changesArray);
+
+				/**
+				 * When we made the UTF8MB4 conversion then text becomes medium text - so loosen the checks to these two types
+				 * otherwise (for example) the profile fields profile_value check fails - see https://github.com/joomla/joomla-cms/issues/9258
+				 */
+				$typeCheck = $this->fixUtf8mb4TypeChecks($type);
+
+				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE field = ' . $this->fixQuote($wordArray[5])
+					. ' AND ' . $typeCheck
+					. ($defaultCheck ? ' AND ' . $defaultCheck : '')
+					. ($nullCheck ? ' AND ' . $nullCheck : '');
+				$this->queryType = 'CHANGE_COLUMN_TYPE';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $type);
+			}
+		}
+
+		if ($command === 'CREATE TABLE')
+		{
+			if (strtoupper($wordArray[2] . $wordArray[3] . $wordArray[4]) === 'IFNOTEXISTS')
+			{
+				$table = $wordArray[5];
+			}
+			else
+			{
+				$table = $wordArray[2];
+			}
+
+			$result = 'SHOW TABLES LIKE ' . $this->fixQuote($table);
+			$this->queryType = 'CREATE_TABLE';
+			$this->msgElements = array($this->fixQuote($table));
+		}
+
+		// Set fields based on results
+		if ($this->checkQuery = $result)
+		{
+			// Unchecked status
+			$this->checkStatus = 0;
+		}
+		else
+		{
+			// Skipped
+			$this->checkStatus = -1;
+		}
+	}
+
+	/**
+	 * Fix up integer. Fixes problem with MySQL integer descriptions.
+	 * If you change a column to "integer unsigned" it shows
+	 * as "int(10) unsigned" in the check query.
+	 *
+	 * @param   string  $type1  the column type
+	 * @param   string  $type2  the column attributes
+	 *
+	 * @return  string  The original or changed column type.
+	 *
+	 * @since   2.5
+	 */
+	private function fixInteger($type1, $type2)
+	{
+		$result = $type1;
+
+		if (strtolower($type1) === 'integer' && strtolower(substr($type2, 0, 8)) === 'unsigned')
+		{
+			$result = 'int(10) unsigned';
+		}
+		elseif (strtolower(substr($type2, 0, 8)) === 'unsigned')
+		{
+			$result = $type1 . ' unsigned';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Fixes up a string for inclusion in a query.
+	 * Replaces name quote character with normal quote for literal.
+	 * Drops trailing semicolon. Injects the database prefix.
+	 *
+	 * @param   string  $string  The input string to be cleaned up.
+	 *
+	 * @return  string  The modified string.
+	 *
+	 * @since   2.5
+	 */
+	private function fixQuote($string)
+	{
+		$string = str_replace('`', '', $string);
+		$string = str_replace(';', '', $string);
+		$string = str_replace('#__', $this->db->getPrefix(), $string);
+
+		return $this->db->quote($string);
+	}
+
+	/**
+	 * Make check query for column changes/modifications tolerant
+	 * for automatic type changes of text columns, e.g. from TEXT
+	 * to MEDIUMTEXT, after comnversion from utf8 to utf8mb4
+	 *
+	 * @param   string  $type  The column type found in the update query
+	 *
+	 * @return  string  The condition for type check in the check query
+	 *
+	 * @since   3.5
+	 */
+	private function fixUtf8mb4TypeChecks($type)
+	{
+		$fixedType = str_replace(';', '', $type);
+
+		if ($this->db->hasUTF8mb4Support())
+		{
+			$uType = strtoupper($fixedType);
+
+			if ($uType === 'TINYTEXT')
+			{
+				$typeCheck = 'type IN (' . $this->db->quote('TINYTEXT') . ',' . $this->db->quote('TEXT') . ')';
+			}
+			elseif ($uType === 'TEXT')
+			{
+				$typeCheck = 'type IN (' . $this->db->quote('TEXT') . ',' . $this->db->quote('MEDIUMTEXT') . ')';
+			}
+			elseif ($uType === 'MEDIUMTEXT')
+			{
+				$typeCheck = 'type IN (' . $this->db->quote('MEDIUMTEXT') . ',' . $this->db->quote('LONGTEXT') . ')';
+			}
+			else
+			{
+				$typeCheck = 'type = ' . $this->db->quote($fixedType);
+			}
+		}
+		else
+		{
+			$typeCheck = 'type = ' . $this->db->quote($fixedType);
+		}
+
+		return $typeCheck;
+	}
+
+	/**
+	 * Create query clause for column changes/modifications for NULL attribute
+	 *
+	 * @param   array  $changesArray  The array of words after COLUMN name
+	 *
+	 * @return  string  The query clause for NULL check in the check query
+	 *
+	 * @since   3.8.6
+	 */
+	private function checkNull($changesArray)
+	{
+		// Find NULL keyword
+		$index = array_search('null', array_map('strtolower', $changesArray));
+
+		// Create the check
+		if ($index !== false)
+		{
+			if ($index == 0 || strtolower($changesArray[$index - 1]) !== 'not')
+			{
+				return ' `null` = ' . $this->db->quote('YES');
+			}
+			else
+			{
+				return ' `null` = ' . $this->db->quote('NO');
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Create query clause for column changes/modifications for DEFAULT attribute
+	 *
+	 * @param   array   $changesArray  The array of words after COLUMN name
+	 * @param   string  $type          The type of the COLUMN
+	 *
+	 * @return  string  The query clause for DEFAULT check in the check query
+	 *
+	 * @since   3.8.6
+	 */
+	private function checkDefault($changesArray, $type)
+	{
+		// Skip types that do not support default values
+		$type = strtolower($type);
+		if (substr($type, -4) === 'text' || substr($type, -4) === 'blob')
+		{
+			return false;
+		}
+
+		// Find DEFAULT keyword
+		$index = array_search('default', array_map('strtolower', $changesArray));
+	
+		// Create the check
+		if ($index !== false)
+		{
+			if (strtolower($changesArray[$index + 1]) === 'null')
+			{
+				return ' `default` IS NULL';
+			}
+			else
+			{
+				return ' `default` = ' . $changesArray[$index + 1];
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php b/core/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
new file mode 100644
index 00000000..14be04f9
--- /dev/null
+++ b/core/libraries/src/Schema/ChangeItem/PostgresqlChangeItem.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Schema\ChangeItem;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Schema\ChangeItem;
+
+/**
+ * Checks the database schema against one PostgreSQL DDL query to see if it has been run.
+ *
+ * @since  3.0
+ */
+class PostgresqlChangeItem extends ChangeItem
+{
+	/**
+	 * Checks a DDL query to see if it is a known type
+	 * If yes, build a check query to see if the DDL has been run on the database.
+	 * If successful, the $msgElements, $queryType, $checkStatus and $checkQuery fields are populated.
+	 * The $msgElements contains the text to create the user message.
+	 * The $checkQuery contains the SQL query to check whether the schema change has
+	 * been run against the current database. The $queryType contains the type of
+	 * DDL query that was run (for example, CREATE_TABLE, ADD_COLUMN, CHANGE_COLUMN_TYPE, ADD_INDEX).
+	 * The $checkStatus field is set to zero if the query is created
+	 *
+	 * If not successful, $checkQuery is empty and , and $checkStatus is -1.
+	 * For example, this will happen if the current line is a non-DDL statement.
+	 *
+	 * @return void
+	 *
+	 * @since  3.0
+	 */
+	protected function buildCheckQuery()
+	{
+		// Initialize fields in case we can't create a check query
+		$this->checkStatus = -1; // change status to skipped
+		$result = null;
+
+		// Remove any newlines
+		$this->updateQuery = str_replace("\n", '', $this->updateQuery);
+
+		// Fix up extra spaces around () and in general
+		$find = array('#((\s*)\(\s*([^)\s]+)\s*)(\))#', '#(\s)(\s*)#');
+		$replace = array('($3)', '$1');
+		$updateQuery = preg_replace($find, $replace, $this->updateQuery);
+		$wordArray = explode(' ', $updateQuery);
+
+		// First, make sure we have an array of at least 6 elements
+		// if not, we can't make a check query for this one
+		if (count($wordArray) < 6)
+		{
+			// Done with method
+			return;
+		}
+
+		// We can only make check queries for alter table and create table queries
+		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
+
+		if ($command === 'ALTER TABLE')
+		{
+			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
+
+			if ($alterCommand === 'ADD COLUMN')
+			{
+				$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
+				. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5]);
+
+				$this->queryType = 'ADD_COLUMN';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
+			}
+			elseif ($alterCommand === 'DROP COLUMN')
+			{
+				$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
+				. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5]);
+
+				$this->queryType = 'DROP_COLUMN';
+				$this->checkQueryExpected = 0;
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
+			}
+			elseif ($alterCommand === 'ALTER COLUMN')
+			{
+				if (strtoupper($wordArray[6]) === 'TYPE')
+				{
+					$type = '';
+
+					for ($i = 7, $iMax = count($wordArray); $i < $iMax; $i++)
+					{
+						$type .= $wordArray[$i] . ' ';
+					}
+
+					if ($pos = strpos($type, '('))
+					{
+						$type = substr($type, 0, $pos);
+					}
+
+					if ($pos = strpos($type, ';'))
+					{
+						$type = substr($type, 0, $pos);
+					}
+
+					$result = 'SELECT column_name, data_type FROM information_schema.columns WHERE table_name='
+						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
+						. ' AND data_type=' . $this->fixQuote($type);
+
+					$this->queryType = 'CHANGE_COLUMN_TYPE';
+					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $type);
+				}
+				elseif (strtoupper($wordArray[7] . ' ' . $wordArray[8]) === 'NOT NULL')
+				{
+					if (strtoupper($wordArray[6]) === 'SET')
+					{
+						// SET NOT NULL
+						$isNullable = $this->fixQuote('NO');
+					}
+					else
+					{
+						// DROP NOT NULL
+						$isNullable = $this->fixQuote('YES');
+					}
+
+					$result = 'SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_name='
+						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
+						. ' AND is_nullable=' . $isNullable;
+
+					$this->queryType = 'CHANGE_COLUMN_TYPE';
+					$this->checkQueryExpected = 1;
+					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $isNullable);
+				}
+				elseif (strtoupper($wordArray[7]) === 'DEFAULT')
+				{
+					if (strtoupper($wordArray[6]) === 'SET')
+					{
+						$isNullDef = 'IS NOT NULL';
+					}
+					else
+					{
+						// DROP DEFAULT
+						$isNullDef = 'IS NULL';
+					}
+
+					$result = 'SELECT column_name, data_type, column_default FROM information_schema.columns WHERE table_name='
+						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
+						. ' AND column_default ' . $isNullDef;
+
+					$this->queryType = 'CHANGE_COLUMN_TYPE';
+					$this->checkQueryExpected = 1;
+					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $isNullDef);
+				}
+			}
+		}
+		elseif ($command === 'DROP INDEX')
+		{
+			if (strtoupper($wordArray[2] . $wordArray[3]) === 'IFEXISTS')
+			{
+				$idx = $this->fixQuote($wordArray[4]);
+			}
+			else
+			{
+				$idx = $this->fixQuote($wordArray[2]);
+			}
+
+			$result = 'SELECT * FROM pg_indexes WHERE indexname=' . $idx;
+			$this->queryType = 'DROP_INDEX';
+			$this->checkQueryExpected = 0;
+			$this->msgElements = array($this->fixQuote($idx));
+		}
+		elseif ($command === 'CREATE INDEX' || (strtoupper($command . $wordArray[2]) === 'CREATE UNIQUE INDEX'))
+		{
+			if ($wordArray[1] === 'UNIQUE')
+			{
+				$idx = $this->fixQuote($wordArray[3]);
+				$table = $this->fixQuote($wordArray[5]);
+			}
+			else
+			{
+				$idx = $this->fixQuote($wordArray[2]);
+				$table = $this->fixQuote($wordArray[4]);
+			}
+
+			$result = 'SELECT * FROM pg_indexes WHERE indexname=' . $idx . ' AND tablename=' . $table;
+			$this->queryType = 'ADD_INDEX';
+			$this->checkQueryExpected = 1;
+			$this->msgElements = array($table, $idx);
+		}
+
+		if ($command === 'CREATE TABLE')
+		{
+			if (strtoupper($wordArray[2] . $wordArray[3] . $wordArray[4]) === 'IFNOTEXISTS')
+			{
+				$table = $this->fixQuote($wordArray[5]);
+			}
+			else
+			{
+				$table = $this->fixQuote($wordArray[2]);
+			}
+
+			$result = 'SELECT table_name FROM information_schema.tables WHERE table_name=' . $table;
+			$this->queryType = 'CREATE_TABLE';
+			$this->checkQueryExpected = 1;
+			$this->msgElements = array($table);
+		}
+
+		// Set fields based on results
+		if ($this->checkQuery = $result)
+		{
+			// Unchecked status
+			$this->checkStatus = 0;
+		}
+		else
+		{
+			// Skipped
+			$this->checkStatus = -1;
+		}
+	}
+
+	/**
+	 * Fix up integer. Fixes problem with PostgreSQL integer descriptions.
+	 * If you change a column to "integer unsigned" it shows
+	 * as "int(10) unsigned" in the check query.
+	 *
+	 * @param   string  $type1  the column type
+	 * @param   string  $type2  the column attributes
+	 *
+	 * @return  string  The original or changed column type.
+	 *
+	 * @since   3.0
+	 */
+	private function fixInteger($type1, $type2)
+	{
+		$result = $type1;
+
+		if (strtolower($type1) === 'integer' && strtolower(substr($type2, 0, 8)) === 'unsigned')
+		{
+			$result = 'unsigned int(10)';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Fixes up a string for inclusion in a query.
+	 * Replaces name quote character with normal quote for literal.
+	 * Drops trailing semicolon. Injects the database prefix.
+	 *
+	 * @param   string  $string  The input string to be cleaned up.
+	 *
+	 * @return  string  The modified string.
+	 *
+	 * @since   3.0
+	 */
+	private function fixQuote($string)
+	{
+		$string = str_replace('"', '', $string);
+		$string = str_replace(';', '', $string);
+		$string = str_replace('#__', $this->db->getPrefix(), $string);
+
+		return $this->db->quote($string);
+	}
+}
diff --git a/core/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php b/core/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
new file mode 100644
index 00000000..cb3ad019
--- /dev/null
+++ b/core/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Schema\ChangeItem;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Schema\ChangeItem;
+
+/**
+ * Checks the database schema against one SQL Server DDL query to see if it has been run.
+ *
+ * @since  2.5
+ */
+class SqlsrvChangeItem extends ChangeItem
+{
+	/**
+	 * Checks a DDL query to see if it is a known type
+	 * If yes, build a check query to see if the DDL has been run on the database.
+	 * If successful, the $msgElements, $queryType, $checkStatus and $checkQuery fields are populated.
+	 * The $msgElements contains the text to create the user message.
+	 * The $checkQuery contains the SQL query to check whether the schema change has
+	 * been run against the current database. The $queryType contains the type of
+	 * DDL query that was run (for example, CREATE_TABLE, ADD_COLUMN, CHANGE_COLUMN_TYPE, ADD_INDEX).
+	 * The $checkStatus field is set to zero if the query is created
+	 *
+	 * If not successful, $checkQuery is empty and , and $checkStatus is -1.
+	 * For example, this will happen if the current line is a non-DDL statement.
+	 *
+	 * @return void
+	 *
+	 * @since  2.5
+	 */
+	protected function buildCheckQuery()
+	{
+		// Initialize fields in case we can't create a check query
+		$this->checkStatus = -1; // change status to skipped
+		$result = null;
+
+		// Remove any newlines
+		$this->updateQuery = str_replace("\n", '', $this->updateQuery);
+
+		// Fix up extra spaces around () and in general
+		$find = array('#((\s*)\(\s*([^)\s]+)\s*)(\))#', '#(\s)(\s*)#');
+		$replace = array('($3)', '$1');
+		$updateQuery = preg_replace($find, $replace, $this->updateQuery);
+		$wordArray = explode(' ', $updateQuery);
+
+		// First, make sure we have an array of at least 6 elements
+		// if not, we can't make a check query for this one
+		if (count($wordArray) < 6)
+		{
+			// Done with method
+			return;
+		}
+
+		// We can only make check queries for alter table and create table queries
+		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
+
+		if ($command === 'ALTER TABLE')
+		{
+			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
+
+			if ($alterCommand === 'ADD')
+			{
+				$result = 'SELECT * FROM INFORMATION_SCHEMA.Columns ' . $wordArray[2] . ' WHERE COLUMN_NAME = ' . $this->fixQuote($wordArray[5]);
+				$this->queryType = 'ADD';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
+			}
+			elseif ($alterCommand === 'CREATE INDEX')
+			{
+				$index = $this->fixQuote(substr($wordArray[5], 0, strpos($wordArray[5], '(')));
+				$result = 'SELECT * FROM SYS.INDEXES ' . $wordArray[2] . ' WHERE name = ' . $index;
+				$this->queryType = 'CREATE INDEX';
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
+			}
+			elseif (strtoupper($wordArray[3]) === 'MODIFY' || strtoupper($wordArray[3]) === 'CHANGE')
+			{
+				$result = 'SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS  WHERE table_name = ' . $this->fixQuote($wordArray[2]);
+				$this->queryType = 'ALTER COLUMN COLUMN_NAME =' . $this->fixQuote($wordArray[4]);
+				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[4]));
+			}
+		}
+
+		if ($command === 'CREATE TABLE')
+		{
+			$table = $wordArray[2];
+			$result = 'SELECT * FROM sys.TABLES WHERE NAME = ' . $this->fixQuote($table);
+			$this->queryType = 'CREATE_TABLE';
+			$this->msgElements = array($this->fixQuote($table));
+		}
+
+		// Set fields based on results
+		if ($this->checkQuery = $result)
+		{
+			// Unchecked status
+			$this->checkStatus = 0;
+		}
+		else
+		{
+			// Skipped
+			$this->checkStatus = -1;
+		}
+	}
+
+	/**
+	 * Fix up integer. Fixes problem with MySQL integer descriptions.
+	 * If you change a column to "integer unsigned" it shows
+	 * as "int(10) unsigned" in the check query.
+	 *
+	 * @param   string  $type1  the column type
+	 * @param   string  $type2  the column attributes
+	 *
+	 * @return  string  The original or changed column type.
+	 *
+	 * @since   2.5
+	 */
+	private function fixInteger($type1, $type2)
+	{
+		$result = $type1;
+
+		if (strtolower($type1) === 'integer' && strtolower(substr($type2, 0, 8)) === 'unsigned')
+		{
+			$result = 'int';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Fixes up a string for inclusion in a query.
+	 * Replaces name quote character with normal quote for literal.
+	 * Drops trailing semicolon. Injects the database prefix.
+	 *
+	 * @param   string  $string  The input string to be cleaned up.
+	 *
+	 * @return  string  The modified string.
+	 *
+	 * @since   2.5
+	 */
+	private function fixQuote($string)
+	{
+		$string = str_replace('[', '', $string);
+		$string = str_replace(']', '', $string);
+		$string = str_replace('`', '', $string);
+		$string = str_replace(';', '', $string);
+		$string = str_replace('#__', $this->db->getPrefix(), $string);
+
+		return $this->db->quote($string);
+	}
+}
diff --git a/core/libraries/src/Schema/ChangeSet.php b/core/libraries/src/Schema/ChangeSet.php
new file mode 100644
index 00000000..4b9d647c
--- /dev/null
+++ b/core/libraries/src/Schema/ChangeSet.php
@@ -0,0 +1,311 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Schema;
+
+defined('JPATH_PLATFORM') or die;
+
+jimport('joomla.filesystem.folder');
+
+/**
+ * Contains a set of JSchemaChange objects for a particular instance of Joomla.
+ * Each of these objects contains a DDL query that should have been run against
+ * the database when this database was created or updated. This enables the
+ * Installation Manager to check that the current database schema is up to date.
+ *
+ * @since  2.5
+ */
+class ChangeSet
+{
+	/**
+	 * Array of ChangeItem objects
+	 *
+	 * @var    ChangeItem[]
+	 * @since  2.5
+	 */
+	protected $changeItems = array();
+
+	/**
+	 * \JDatabaseDriver object
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  2.5
+	 */
+	protected $db = null;
+
+	/**
+	 * Folder where SQL update files will be found
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $folder = null;
+
+	/**
+	 * The singleton instance of this object
+	 *
+	 * @var    ChangeSet
+	 * @since  3.5.1
+	 */
+	protected static $instance;
+
+	/**
+	 * Constructor: builds array of $changeItems by processing the .sql files in a folder.
+	 * The folder for the Joomla core updates is `administrator/components/com_admin/sql/updates/<database>`.
+	 *
+	 * @param   \JDatabaseDriver  $db      The current database object
+	 * @param   string            $folder  The full path to the folder containing the update queries
+	 *
+	 * @since   2.5
+	 */
+	public function __construct($db, $folder = null)
+	{
+		$this->db = $db;
+		$this->folder = $folder;
+		$updateFiles = $this->getUpdateFiles();
+		$updateQueries = $this->getUpdateQueries($updateFiles);
+
+		foreach ($updateQueries as $obj)
+		{
+			$changeItem = ChangeItem::getInstance($db, $obj->file, $obj->updateQuery);
+
+			if ($changeItem->queryType === 'UTF8CNV')
+			{
+				// Execute the special update query for utf8mb4 conversion status reset
+				try
+				{
+					$this->db->setQuery($changeItem->updateQuery)->execute();
+				}
+				catch (\RuntimeException $e)
+				{
+					\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+				}
+			}
+			else
+			{
+				// Normal change item
+				$this->changeItems[] = $changeItem;
+			}
+		}
+
+		// If on mysql, add a query at the end to check for utf8mb4 conversion status
+		if ($this->db->getServerType() === 'mysql')
+		{
+			// Let the update query be something harmless which should always succeed
+			$tmpSchemaChangeItem = ChangeItem::getInstance(
+				$db,
+				'database.php',
+				'UPDATE ' . $this->db->quoteName('#__utf8_conversion')
+				. ' SET ' . $this->db->quoteName('converted') . ' = 0;');
+
+			// Set to not skipped
+			$tmpSchemaChangeItem->checkStatus = 0;
+
+			// Set the check query
+			if ($this->db->hasUTF8mb4Support())
+			{
+				$converted = 2;
+				$tmpSchemaChangeItem->queryType = 'UTF8_CONVERSION_UTF8MB4';
+			}
+			else
+			{
+				$converted = 1;
+				$tmpSchemaChangeItem->queryType = 'UTF8_CONVERSION_UTF8';
+			}
+
+			$tmpSchemaChangeItem->checkQuery = 'SELECT '
+				. $this->db->quoteName('converted')
+				. ' FROM ' . $this->db->quoteName('#__utf8_conversion')
+				. ' WHERE ' . $this->db->quoteName('converted') . ' = ' . $converted;
+
+			// Set expected records from check query
+			$tmpSchemaChangeItem->checkQueryExpected = 1;
+
+			$tmpSchemaChangeItem->msgElements = array();
+
+			$this->changeItems[] = $tmpSchemaChangeItem;
+		}
+	}
+
+	/**
+	 * Returns a reference to the ChangeSet object, only creating it if it doesn't already exist.
+	 *
+	 * @param   \JDatabaseDriver  $db      The current database object
+	 * @param   string            $folder  The full path to the folder containing the update queries
+	 *
+	 * @return  ChangeSet
+	 *
+	 * @since   2.5
+	 */
+	public static function getInstance($db, $folder = null)
+	{
+		if (!is_object(static::$instance))
+		{
+			static::$instance = new ChangeSet($db, $folder);
+		}
+
+		return static::$instance;
+	}
+
+	/**
+	 * Checks the database and returns an array of any errors found.
+	 * Note these are not database errors but rather situations where
+	 * the current schema is not up to date.
+	 *
+	 * @return   array Array of errors if any.
+	 *
+	 * @since    2.5
+	 */
+	public function check()
+	{
+		$errors = array();
+
+		foreach ($this->changeItems as $item)
+		{
+			if ($item->check() === -2)
+			{
+				// Error found
+				$errors[] = $item;
+			}
+		}
+
+		return $errors;
+	}
+
+	/**
+	 * Runs the update query to apply the change to the database
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function fix()
+	{
+		$this->check();
+
+		foreach ($this->changeItems as $item)
+		{
+			$item->fix();
+		}
+	}
+
+	/**
+	 * Returns an array of results for this set
+	 *
+	 * @return  array  associative array of changeitems grouped by unchecked, ok, error, and skipped
+	 *
+	 * @since   2.5
+	 */
+	public function getStatus()
+	{
+		$result = array('unchecked' => array(), 'ok' => array(), 'error' => array(), 'skipped' => array());
+
+		foreach ($this->changeItems as $item)
+		{
+			switch ($item->checkStatus)
+			{
+				case 0:
+					$result['unchecked'][] = $item;
+					break;
+				case 1:
+					$result['ok'][] = $item;
+					break;
+				case -2:
+					$result['error'][] = $item;
+					break;
+				case -1:
+					$result['skipped'][] = $item;
+					break;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets the current database schema, based on the highest version number.
+	 * Note that the .sql files are named based on the version and date, so
+	 * the file name of the last file should match the database schema version
+	 * in the #__schemas table.
+	 *
+	 * @return  string  the schema version for the database
+	 *
+	 * @since   2.5
+	 */
+	public function getSchema()
+	{
+		$updateFiles = $this->getUpdateFiles();
+		$result = new \SplFileInfo(array_pop($updateFiles));
+
+		return $result->getBasename('.sql');
+	}
+
+	/**
+	 * Get list of SQL update files for this database
+	 *
+	 * @return  array  list of sql update full-path names
+	 *
+	 * @since   2.5
+	 */
+	private function getUpdateFiles()
+	{
+		// Get the folder from the database name
+		$sqlFolder = $this->db->getServerType();
+
+		// For `mssql` server types, convert the type to `sqlazure`
+		if ($sqlFolder === 'mssql')
+		{
+			$sqlFolder = 'sqlazure';
+		}
+
+		// Default folder to core com_admin
+		if (!$this->folder)
+		{
+			$this->folder = JPATH_ADMINISTRATOR . '/components/com_admin/sql/updates/';
+		}
+
+		return \JFolder::files(
+			$this->folder . '/' . $sqlFolder, '\.sql$', 1, true, array('.svn', 'CVS', '.DS_Store', '__MACOSX'), array('^\..*', '.*~'), true
+		);
+	}
+
+	/**
+	 * Get array of SQL queries
+	 *
+	 * @param   array  $sqlfiles  Array of .sql update filenames.
+	 *
+	 * @return  array  Array of \stdClass objects where:
+	 *                    file=filename,
+	 *                    update_query = text of SQL update query
+	 *
+	 * @since   2.5
+	 */
+	private function getUpdateQueries(array $sqlfiles)
+	{
+		// Hold results as array of objects
+		$result = array();
+
+		foreach ($sqlfiles as $file)
+		{
+			$buffer = file_get_contents($file);
+
+			// Create an array of queries from the sql file
+			$queries = \JDatabaseDriver::splitSql($buffer);
+
+			foreach ($queries as $query)
+			{
+				$fileQueries = new \stdClass;
+				$fileQueries->file = $file;
+				$fileQueries->updateQuery = $query;
+				$result[] = $fileQueries;
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Session/Exception/UnsupportedStorageException.php b/core/libraries/src/Session/Exception/UnsupportedStorageException.php
new file mode 100644
index 00000000..9bd89e1a
--- /dev/null
+++ b/core/libraries/src/Session/Exception/UnsupportedStorageException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Session\Exception;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Exception class defining an unsupported session storage object
+ *
+ * @since  3.6.3
+ */
+class UnsupportedStorageException extends \RuntimeException
+{
+}
diff --git a/core/libraries/src/Session/MetadataManager.php b/core/libraries/src/Session/MetadataManager.php
new file mode 100644
index 00000000..ef025c37
--- /dev/null
+++ b/core/libraries/src/Session/MetadataManager.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Session;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Application\AbstractApplication;
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\User\User;
+
+/**
+ * Manager for optional session metadata.
+ *
+ * @since  3.8.6
+ * @internal
+ */
+final class MetadataManager
+{
+	/**
+	 * Application object.
+	 *
+	 * @var    AbstractApplication
+	 * @since  3.8.6
+	 */
+	private $app;
+
+	/**
+	 * Database driver.
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  3.8.6
+	 */
+	private $db;
+
+	/**
+	 * MetadataManager constructor.
+	 *
+	 * @param   AbstractApplication  $app  Application object.
+	 * @param   \JDatabaseDriver     $db   Database driver.
+	 *
+	 * @since   3.8.6
+	 */
+	public function __construct(AbstractApplication $app, \JDatabaseDriver $db)
+	{
+		$this->app = $app;
+		$this->db  = $db;
+	}
+
+	/**
+	 * Create the metadata record if it does not exist.
+	 *
+	 * @param   Session  $session  The session to create the metadata record for.
+	 * @param   User     $user     The user to associate with the record.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.6
+	 * @throws  \RuntimeException
+	 */
+	public function createRecordIfNonExisting(Session $session, User $user)
+	{
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('session_id'))
+			->from($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = ' . $this->db->quote($session->getId()));
+
+		$this->db->setQuery($query, 0, 1);
+		$exists = $this->db->loadResult();
+
+		// If the session record doesn't exist initialise it.
+		if ($exists)
+		{
+			return;
+		}
+
+		$query->clear();
+
+		$time = $session->isNew() ? time() : $session->get('session.timer.start');
+
+		$columns = array(
+			$this->db->quoteName('session_id'),
+			$this->db->quoteName('guest'),
+			$this->db->quoteName('time'),
+			$this->db->quoteName('userid'),
+			$this->db->quoteName('username'),
+		);
+
+		$values = array(
+			$this->db->quote($session->getId()),
+			(int) $user->guest,
+			$this->db->quote((int) $time),
+			(int) $user->id,
+			$this->db->quote($user->username),
+		);
+
+		if ($this->app instanceof CMSApplication && !$this->app->get('shared_session', '0'))
+		{
+			$columns[] = $this->db->quoteName('client_id');
+			$values[] = (int) $this->app->getClientId();
+		}
+
+		$query->insert($this->db->quoteName('#__session'))
+			->columns($columns)
+			->values(implode(', ', $values));
+
+		$this->db->setQuery($query);
+
+		try
+		{
+			$this->db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			/*
+			 * Because of how our session handlers are structured, we must abort the request if this insert query fails,
+			 * especially in the case of the database handler which does not support "INSERT or UPDATE" logic. With the
+			 * change to the `joomla/session` Framework package in 4.0, where the required logic is implemented in the
+			 * handlers, we can change this catch block so that the error is gracefully handled and does not result
+			 * in a fatal error for the request.
+			 */
+			throw new \RuntimeException(\JText::_('JERROR_SESSION_STARTUP'), $e->getCode(), $e);
+		}
+	}
+
+	/**
+	 * Delete records with a timestamp prior to the given time.
+	 *
+	 * @param   integer  $time  The time records should be deleted if expired before.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.6
+	 */
+	public function deletePriorTo($time)
+	{
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('time') . ' < ' . $this->db->quote($time));
+
+		$this->db->setQuery($query);
+
+		try
+		{
+			$this->db->execute();
+		}
+		catch (\JDatabaseExceptionExecuting $exception)
+		{
+			/*
+			 * The database API logs errors on failures so we don't need to add any error handling mechanisms here.
+			 * Since garbage collection does not result in a fatal error when run in the session API, we don't allow it here either.
+			 */
+		}
+	}
+}
diff --git a/core/libraries/src/Session/Session.php b/core/libraries/src/Session/Session.php
new file mode 100644
index 00000000..85970ac3
--- /dev/null
+++ b/core/libraries/src/Session/Session.php
@@ -0,0 +1,1020 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Session;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Input\Input;
+use Joomla\CMS\User\UserHelper;
+
+/**
+ * Class for managing HTTP sessions
+ *
+ * Provides access to session-state values as well as session-level
+ * settings and lifetime management methods.
+ * Based on the standard PHP session handling mechanism it provides
+ * more advanced features such as expire timeouts.
+ *
+ * @since  11.1
+ */
+class Session implements \IteratorAggregate
+{
+	/**
+	 * Internal state.
+	 * One of 'inactive'|'active'|'expired'|'destroyed'|'error'
+	 *
+	 * @var    string
+	 * @see    Session::getState()
+	 * @since  11.1
+	 */
+	protected $_state = 'inactive';
+
+	/**
+	 * Maximum age of unused session in seconds
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_expire = 900;
+
+	/**
+	 * The session store object.
+	 *
+	 * @var    \JSessionStorage
+	 * @since  11.1
+	 */
+	protected $_store = null;
+
+	/**
+	 * Security policy.
+	 * List of checks that will be done.
+	 *
+	 * Default values:
+	 * - fix_browser
+	 * - fix_adress
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_security = array('fix_browser');
+
+	/**
+	 * Session instances container.
+	 *
+	 * @var    Session
+	 * @since  11.3
+	 */
+	protected static $instance;
+
+	/**
+	 * The type of storage for the session.
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	protected $storeName;
+
+	/**
+	 * Holds the \JInput object
+	 *
+	 * @var    \JInput
+	 * @since  12.2
+	 */
+	private $_input = null;
+
+	/**
+	 * Holds the event dispatcher object
+	 *
+	 * @var    \JEventDispatcher
+	 * @since  12.2
+	 */
+	private $_dispatcher = null;
+
+	/**
+	 * Holds the event dispatcher object
+	 *
+	 * @var    \JSessionHandlerInterface
+	 * @since  3.5
+	 */
+	protected $_handler = null;
+
+	/**
+	 * Internal data store for the session data
+	 *
+	 * @var  \Joomla\Registry\Registry
+	 */
+	protected $data;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string                     $store             The type of storage for the session.
+	 * @param   array                      $options           Optional parameters
+	 * @param   \JSessionHandlerInterface  $handlerInterface  The session handler
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($store = 'none', array $options = array(), \JSessionHandlerInterface $handlerInterface = null)
+	{
+		// Set the session handler
+		$this->_handler = $handlerInterface instanceof \JSessionHandlerInterface ? $handlerInterface : new \JSessionHandlerJoomla($options);
+
+		// Initialize the data variable, let's avoid fatal error if the session is not corretly started (ie in CLI).
+		$this->data = new \Joomla\Registry\Registry;
+
+		// Clear any existing sessions
+		if ($this->_handler->getId())
+		{
+			$this->_handler->clear();
+		}
+
+		// Create handler
+		$this->_store = \JSessionStorage::getInstance($store, $options);
+
+		$this->storeName = $store;
+
+		$this->_setOptions($options);
+
+		$this->_state = 'inactive';
+	}
+
+	/**
+	 * Magic method to get read-only access to properties.
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  mixed   The value of the property
+	 *
+	 * @since   12.2
+	 */
+	public function __get($name)
+	{
+		if ($name === 'storeName')
+		{
+			return $this->$name;
+		}
+
+		if ($name === 'state' || $name === 'expire')
+		{
+			$property = '_' . $name;
+
+			return $this->$property;
+		}
+	}
+
+	/**
+	 * Returns the global Session object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string                     $store             The type of storage for the session.
+	 * @param   array                      $options           An array of configuration options.
+	 * @param   \JSessionHandlerInterface  $handlerInterface  The session handler
+	 *
+	 * @return  Session  The Session object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($store, $options, \JSessionHandlerInterface $handlerInterface = null)
+	{
+		if (!is_object(self::$instance))
+		{
+			self::$instance = new Session($store, $options, $handlerInterface);
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Get current state of session
+	 *
+	 * @return  string  The session state
+	 *
+	 * @since   11.1
+	 */
+	public function getState()
+	{
+		return $this->_state;
+	}
+
+	/**
+	 * Get expiration time in seconds
+	 *
+	 * @return  integer  The session expiration time in seconds
+	 *
+	 * @since   11.1
+	 */
+	public function getExpire()
+	{
+		return $this->_expire;
+	}
+
+	/**
+	 * Get a session token, if a token isn't set yet one will be generated.
+	 *
+	 * Tokens are used to secure forms from spamming attacks. Once a token
+	 * has been generated the system will check the post request to see if
+	 * it is present, if not it will invalidate the session.
+	 *
+	 * @param   boolean  $forceNew  If true, force a new token to be created
+	 *
+	 * @return  string  The session token
+	 *
+	 * @since   11.1
+	 */
+	public function getToken($forceNew = false)
+	{
+		$token = $this->get('session.token');
+
+		// Create a token
+		if ($token === null || $forceNew)
+		{
+			$token = $this->_createToken();
+			$this->set('session.token', $token);
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Method to determine if a token exists in the session. If not the
+	 * session will be set to expired
+	 *
+	 * @param   string   $tCheck       Hashed token to be verified
+	 * @param   boolean  $forceExpire  If true, expires the session
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 */
+	public function hasToken($tCheck, $forceExpire = true)
+	{
+		// Check if a token exists in the session
+		$tStored = $this->get('session.token');
+
+		// Check token
+		if (($tStored !== $tCheck))
+		{
+			if ($forceExpire)
+			{
+				$this->_state = 'expired';
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to determine a hash for anti-spoofing variable names
+	 *
+	 * @param   boolean  $forceNew  If true, force a new token to be created
+	 *
+	 * @return  string  Hashed var name
+	 *
+	 * @since   11.1
+	 */
+	public static function getFormToken($forceNew = false)
+	{
+		$user    = \JFactory::getUser();
+		$session = \JFactory::getSession();
+
+		return ApplicationHelper::getHash($user->get('id', 0) . $session->getToken($forceNew));
+	}
+
+	/**
+	 * Retrieve an external iterator.
+	 *
+	 * @return  \ArrayIterator
+	 *
+	 * @since   12.2
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->getData());
+	}
+
+	/**
+	 * Checks for a form token in the request.
+	 *
+	 * Use in conjunction with \JHtml::_('form.token') or Session::getFormToken.
+	 *
+	 * @param   string  $method  The request method in which to look for the token key.
+	 *
+	 * @return  boolean  True if found and valid, false otherwise.
+	 *
+	 * @since   12.1
+	 */
+	public static function checkToken($method = 'post')
+	{
+		$token = self::getFormToken();
+		$app = \JFactory::getApplication();
+
+		// Check from header first
+		if ($token === $app->input->server->get('HTTP_X_CSRF_TOKEN', '', 'alnum'))
+		{
+			return true;
+		}
+
+		// Then fallback to HTTP query
+		if (!$app->input->$method->get($token, '', 'alnum'))
+		{
+			if (\JFactory::getSession()->isNew())
+			{
+				// Redirect to login screen.
+				$app->enqueueMessage(\JText::_('JLIB_ENVIRONMENT_SESSION_EXPIRED'), 'warning');
+				$app->redirect(\JRoute::_('index.php'));
+
+				return true;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get session name
+	 *
+	 * @return  string  The session name
+	 *
+	 * @since   11.1
+	 */
+	public function getName()
+	{
+		if ($this->getState() === 'destroyed')
+		{
+			// @TODO : raise error
+			return;
+		}
+
+		return $this->_handler->getName();
+	}
+
+	/**
+	 * Get session id
+	 *
+	 * @return  string  The session name
+	 *
+	 * @since   11.1
+	 */
+	public function getId()
+	{
+		if ($this->getState() === 'destroyed')
+		{
+			// @TODO : raise error
+			return;
+		}
+
+		return $this->_handler->getId();
+	}
+
+	/**
+	 * Returns a clone of the internal data pointer
+	 *
+	 * @return  \Joomla\Registry\Registry
+	 */
+	public function getData()
+	{
+		return clone $this->data;
+	}
+
+	/**
+	 * Get the session handlers
+	 *
+	 * @return  array  An array of available session handlers
+	 *
+	 * @since   11.1
+	 */
+	public static function getStores()
+	{
+		$connectors = array();
+
+		// Get an iterator and loop trough the driver classes.
+		$iterator = new \DirectoryIterator(JPATH_LIBRARIES . '/joomla/session/storage');
+
+		/** @type  $file  \DirectoryIterator */
+		foreach ($iterator as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() != 'php')
+			{
+				continue;
+			}
+
+			// Derive the class name from the type.
+			$class = str_ireplace('.php', '', 'JSessionStorage' . ucfirst(trim($fileName)));
+
+			// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+			if (!class_exists($class))
+			{
+				continue;
+			}
+
+			// Sweet!  Our class exists, so now we just need to know if it passes its test method.
+			if ($class::isSupported())
+			{
+				// Connector names should not have file extensions.
+				$connectors[] = str_ireplace('.php', '', $fileName);
+			}
+		}
+
+		return $connectors;
+	}
+
+	/**
+	 * Shorthand to check if the session is active
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.2
+	 */
+	public function isActive()
+	{
+		return (bool) ($this->getState() == 'active');
+	}
+
+	/**
+	 * Check whether this session is currently created
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function isNew()
+	{
+		return (bool) ($this->get('session.counter') === 1);
+	}
+
+	/**
+	 * Check whether this session is currently created
+	 *
+	 * @param   Input              $input       Input object for the session to use.
+	 * @param   \JEventDispatcher  $dispatcher  Dispatcher object for the session to use.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function initialise(Input $input, \JEventDispatcher $dispatcher = null)
+	{
+		// With the introduction of the handler class this variable is no longer required
+		// however we keep setting it for b/c
+		$this->_input      = $input;
+
+		// Nasty workaround to deal in a b/c way with JInput being required in the 3.4+ Handler class.
+		if ($this->_handler instanceof \JSessionHandlerJoomla)
+		{
+			$this->_handler->input = $input;
+		}
+
+		$this->_dispatcher = $dispatcher;
+	}
+
+	/**
+	 * Get data from the session store
+	 *
+	 * @param   string  $name       Name of a variable
+	 * @param   mixed   $default    Default value of a variable if not set
+	 * @param   string  $namespace  Namespace to use, default to 'default'
+	 *
+	 * @return  mixed  Value of a variable
+	 *
+	 * @since   11.1
+	 */
+	public function get($name, $default = null, $namespace = 'default')
+	{
+		if (!$this->isActive())
+		{
+			$this->start();
+		}
+
+		// Add prefix to namespace to avoid collisions
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() === 'destroyed')
+		{
+			// @TODO :: generated error here
+			$error = null;
+
+			return $error;
+		}
+
+		return $this->data->get($namespace . '.' . $name, $default);
+	}
+
+	/**
+	 * Set data into the session store.
+	 *
+	 * @param   string  $name       Name of a variable.
+	 * @param   mixed   $value      Value of a variable.
+	 * @param   string  $namespace  Namespace to use, default to 'default'.
+	 *
+	 * @return  mixed  Old value of a variable.
+	 *
+	 * @since   11.1
+	 */
+	public function set($name, $value = null, $namespace = 'default')
+	{
+		if (!$this->isActive())
+		{
+			$this->start();
+		}
+
+		// Add prefix to namespace to avoid collisions
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return;
+		}
+
+		$prev = $this->data->get($namespace . '.' . $name, null);
+		$this->data->set($namespace . '.' . $name, $value);
+
+		return $prev;
+	}
+
+	/**
+	 * Check whether data exists in the session store
+	 *
+	 * @param   string  $name       Name of variable
+	 * @param   string  $namespace  Namespace to use, default to 'default'
+	 *
+	 * @return  boolean  True if the variable exists
+	 *
+	 * @since   11.1
+	 */
+	public function has($name, $namespace = 'default')
+	{
+		if (!$this->isActive())
+		{
+			$this->start();
+		}
+
+		// Add prefix to namespace to avoid collisions.
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return;
+		}
+
+		return !is_null($this->data->get($namespace . '.' . $name, null));
+	}
+
+	/**
+	 * Unset data from the session store
+	 *
+	 * @param   string  $name       Name of variable
+	 * @param   string  $namespace  Namespace to use, default to 'default'
+	 *
+	 * @return  mixed   The value from session or NULL if not set
+	 *
+	 * @since   11.1
+	 */
+	public function clear($name, $namespace = 'default')
+	{
+		if (!$this->isActive())
+		{
+			$this->start();
+		}
+
+		// Add prefix to namespace to avoid collisions
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return;
+		}
+
+		return $this->data->set($namespace . '.' . $name, null);
+	}
+
+	/**
+	 * Start a session.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.2
+	 */
+	public function start()
+	{
+		if ($this->getState() === 'active')
+		{
+			return;
+		}
+
+		$this->_start();
+
+		$this->_state = 'active';
+
+		// Initialise the session
+		$this->_setCounter();
+		$this->_setTimers();
+
+		// Perform security checks
+		if (!$this->_validate())
+		{
+			// If the session isn't valid because it expired try to restart it
+			// else destroy it.
+			if ($this->_state === 'expired')
+			{
+				$this->restart();
+			}
+			else
+			{
+				$this->destroy();
+			}
+		}
+
+		if ($this->_dispatcher instanceof \JEventDispatcher)
+		{
+			$this->_dispatcher->trigger('onAfterSessionStart');
+		}
+	}
+
+	/**
+	 * Start a session.
+	 *
+	 * Creates a session (or resumes the current one based on the state of the session)
+	 *
+	 * @return  boolean  true on success
+	 *
+	 * @since   11.1
+	 */
+	protected function _start()
+	{
+		$this->_handler->start();
+
+		// Ok let's unserialize the whole thing
+		// Try loading data from the session
+		if (isset($_SESSION['joomla']) && !empty($_SESSION['joomla']))
+		{
+			$data = $_SESSION['joomla'];
+
+			$data = base64_decode($data);
+
+			$this->data = unserialize($data);
+		}
+
+		// Temporary, PARTIAL, data migration of existing session data to avoid logout on update from J < 3.4.7
+		if (isset($_SESSION['__default']) && !empty($_SESSION['__default']))
+		{
+			$migratableKeys = array(
+				'user',
+				'session.token',
+				'session.counter',
+				'session.timer.start',
+				'session.timer.last',
+				'session.timer.now'
+			);
+
+			foreach ($migratableKeys as $migratableKey)
+			{
+				if (!empty($_SESSION['__default'][$migratableKey]))
+				{
+					// Don't overwrite existing session data
+					if (!is_null($this->data->get('__default.' . $migratableKey, null)))
+					{
+						continue;
+					}
+
+					$this->data->set('__default.' . $migratableKey, $_SESSION['__default'][$migratableKey]);
+					unset($_SESSION['__default'][$migratableKey]);
+				}
+			}
+
+			/**
+			 * Finally, empty the __default key since we no longer need it. Don't unset it completely, we need this
+			 * for the administrator/components/com_admin/script.php to detect upgraded sessions and perform a full
+			 * session cleanup.
+			 */
+			$_SESSION['__default'] = array();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Frees all session variables and destroys all data registered to a session
+	 *
+	 * This method resets the data pointer and destroys all of the data associated
+	 * with the current session in its storage. It forces a new session to be
+	 * started after this method is called. It does not unset the session cookie.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     session_destroy()
+	 * @see     session_unset()
+	 * @since   11.1
+	 */
+	public function destroy()
+	{
+		// Session was already destroyed
+		if ($this->getState() === 'destroyed')
+		{
+			return true;
+		}
+
+		// Kill session
+		$this->_handler->clear();
+
+		// Create new data storage
+		$this->data = new \Joomla\Registry\Registry;
+
+		$this->_state = 'destroyed';
+
+		return true;
+	}
+
+	/**
+	 * Restart an expired or locked session.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     Session::destroy()
+	 * @since   11.1
+	 */
+	public function restart()
+	{
+		$this->destroy();
+
+		if ($this->getState() !== 'destroyed')
+		{
+			// @TODO :: generated error here
+			return false;
+		}
+
+		// Re-register the session handler after a session has been destroyed, to avoid PHP bug
+		$this->_store->register();
+
+		$this->_state = 'restart';
+
+		// Regenerate session id
+		$this->_start();
+		$this->_handler->regenerate(true, null);
+		$this->_state = 'active';
+
+		if (!$this->_validate())
+		{
+			/**
+			 * Destroy the session if it's not valid - we can't restart the session here unlike in the start method
+			 * else we risk recursion.
+			 */
+			$this->destroy();
+		}
+
+		$this->_setCounter();
+
+		return true;
+	}
+
+	/**
+	 * Create a new session and copy variables from the old one
+	 *
+	 * @return  boolean $result true on success
+	 *
+	 * @since   11.1
+	 */
+	public function fork()
+	{
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return false;
+		}
+
+		// Restart session with new id
+		$this->_handler->regenerate(true, null);
+
+		return true;
+	}
+
+	/**
+	 * Writes session data and ends session
+	 *
+	 * Session data is usually stored after your script terminated without the need
+	 * to call Session::close(), but as session data is locked to prevent concurrent
+	 * writes only one script may operate on a session at any time. When using
+	 * framesets together with sessions you will experience the frames loading one
+	 * by one due to this locking. You can reduce the time needed to load all the
+	 * frames by ending the session as soon as all changes to session variables are
+	 * done.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function close()
+	{
+		$this->_handler->save();
+		$this->_state = 'inactive';
+	}
+
+	/**
+	 * Delete expired session data
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   3.8.6
+	 */
+	public function gc()
+	{
+		return $this->_store->gc($this->getExpire());
+	}
+
+	/**
+	 * Set the session handler
+	 *
+	 * @param   \JSessionHandlerInterface  $handler  The session handler
+	 *
+	 * @return  void
+	 */
+	public function setHandler(\JSessionHandlerInterface $handler)
+	{
+		$this->_handler = $handler;
+	}
+
+	/**
+	 * Create a token-string
+	 *
+	 * @param   integer  $length  Length of string
+	 *
+	 * @return  string  Generated token
+	 *
+	 * @since   11.1
+	 */
+	protected function _createToken($length = 32)
+	{
+		return UserHelper::genRandomPassword($length);
+	}
+
+	/**
+	 * Set counter of session usage
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	protected function _setCounter()
+	{
+		$counter = $this->get('session.counter', 0);
+		++$counter;
+
+		$this->set('session.counter', $counter);
+
+		return true;
+	}
+
+	/**
+	 * Set the session timers
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	protected function _setTimers()
+	{
+		if (!$this->has('session.timer.start'))
+		{
+			$start = time();
+
+			$this->set('session.timer.start', $start);
+			$this->set('session.timer.last', $start);
+			$this->set('session.timer.now', $start);
+		}
+
+		$this->set('session.timer.last', $this->get('session.timer.now'));
+		$this->set('session.timer.now', time());
+
+		return true;
+	}
+
+	/**
+	 * Set additional session options
+	 *
+	 * @param   array  $options  List of parameter
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	protected function _setOptions(array $options)
+	{
+		// Set name
+		if (isset($options['name']))
+		{
+			$this->_handler->setName(md5($options['name']));
+		}
+
+		// Set id
+		if (isset($options['id']))
+		{
+			$this->_handler->setId($options['id']);
+		}
+
+		// Set expire time
+		if (isset($options['expire']))
+		{
+			$this->_expire = $options['expire'];
+		}
+
+		// Get security options
+		if (isset($options['security']))
+		{
+			$this->_security = explode(',', $options['security']);
+		}
+
+		// Sync the session maxlifetime
+		if (!headers_sent())
+		{
+			ini_set('session.gc_maxlifetime', $this->_expire);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Do some checks for security reason
+	 *
+	 * - timeout check (expire)
+	 * - ip-fixiation
+	 * - browser-fixiation
+	 *
+	 * If one check failed, session data has to be cleaned.
+	 *
+	 * @param   boolean  $restart  Reactivate session
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @link    http://shiflett.org/articles/the-truth-about-sessions
+	 * @since   11.1
+	 */
+	protected function _validate($restart = false)
+	{
+		// Allow to restart a session
+		if ($restart)
+		{
+			$this->_state = 'active';
+
+			$this->set('session.client.address', null);
+			$this->set('session.client.forwarded', null);
+			$this->set('session.client.browser', null);
+			$this->set('session.token', null);
+		}
+
+		// Check if session has expired
+		if ($this->getExpire())
+		{
+			$curTime = $this->get('session.timer.now', 0);
+			$maxTime = $this->get('session.timer.last', 0) + $this->getExpire();
+
+			// Empty session variables
+			if ($maxTime < $curTime)
+			{
+				$this->_state = 'expired';
+
+				return false;
+			}
+		}
+
+		// Check for client address
+		if (in_array('fix_adress', $this->_security) && isset($_SERVER['REMOTE_ADDR'])
+			&& filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP) !== false)
+		{
+			$ip = $this->get('session.client.address');
+
+			if ($ip === null)
+			{
+				$this->set('session.client.address', $_SERVER['REMOTE_ADDR']);
+			}
+			elseif ($_SERVER['REMOTE_ADDR'] !== $ip)
+			{
+				$this->_state = 'error';
+
+				return false;
+			}
+		}
+
+		// Record proxy forwarded for in the session in case we need it later
+		if (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && filter_var($_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP) !== false)
+		{
+			$this->set('session.client.forwarded', $_SERVER['HTTP_X_FORWARDED_FOR']);
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/String/PunycodeHelper.php b/core/libraries/src/String/PunycodeHelper.php
new file mode 100644
index 00000000..29165d7e
--- /dev/null
+++ b/core/libraries/src/String/PunycodeHelper.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\String;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Uri\UriHelper;
+
+\JLoader::register('idna_convert', JPATH_LIBRARIES . '/idna_convert/idna_convert.class.php');
+
+/**
+ * Joomla Platform String Punycode Class
+ *
+ * Class for handling UTF-8 URLs
+ * Wraps the Punycode library
+ * All functions assume the validity of utf-8 URLs.
+ *
+ * @since  3.1.2
+ */
+abstract class PunycodeHelper
+{
+	/**
+	 * Transforms a UTF-8 string to a Punycode string
+	 *
+	 * @param   string  $utfString  The UTF-8 string to transform
+	 *
+	 * @return  string  The punycode string
+	 *
+	 * @since   3.1.2
+	 */
+	public static function toPunycode($utfString)
+	{
+		$idn = new \idna_convert;
+
+		return $idn->encode($utfString);
+	}
+
+	/**
+	 * Transforms a Punycode string to a UTF-8 string
+	 *
+	 * @param   string  $punycodeString  The Punycode string to transform
+	 *
+	 * @return  string  The UF-8 URL
+	 *
+	 * @since   3.1.2
+	 */
+	public static function fromPunycode($punycodeString)
+	{
+		$idn = new \idna_convert;
+
+		return $idn->decode($punycodeString);
+	}
+
+	/**
+	 * Transforms a UTF-8 URL to a Punycode URL
+	 *
+	 * @param   string  $uri  The UTF-8 URL to transform
+	 *
+	 * @return  string  The punycode URL
+	 *
+	 * @since   3.1.2
+	 */
+	public static function urlToPunycode($uri)
+	{
+		$parsed = UriHelper::parse_url($uri);
+
+		if (!isset($parsed['host']) || $parsed['host'] == '')
+		{
+			// If there is no host we do not need to convert it.
+			return $uri;
+		}
+
+		$host = $parsed['host'];
+		$hostExploded = explode('.', $host);
+		$newhost = '';
+
+		foreach ($hostExploded as $hostex)
+		{
+			$hostex = static::toPunycode($hostex);
+			$newhost .= $hostex . '.';
+		}
+
+		$newhost = substr($newhost, 0, -1);
+		$newuri = '';
+
+		if (!empty($parsed['scheme']))
+		{
+			// Assume :// is required although it is not always.
+			$newuri .= $parsed['scheme'] . '://';
+		}
+
+		if (!empty($newhost))
+		{
+			$newuri .= $newhost;
+		}
+
+		if (!empty($parsed['port']))
+		{
+			$newuri .= ':' . $parsed['port'];
+		}
+
+		if (!empty($parsed['path']))
+		{
+			$newuri .= $parsed['path'];
+		}
+
+		if (!empty($parsed['query']))
+		{
+			$newuri .= '?' . $parsed['query'];
+		}
+
+		if (!empty($parsed['fragment']))
+		{
+			$newuri .= '#' . $parsed['fragment'];
+		}
+
+		return $newuri;
+	}
+
+	/**
+	 * Transforms a Punycode URL to a UTF-8 URL
+	 *
+	 * @param   string  $uri  The Punycode URL to transform
+	 *
+	 * @return  string  The UTF-8 URL
+	 *
+	 * @since   3.1.2
+	 */
+	public static function urlToUTF8($uri)
+	{
+		if (empty($uri))
+		{
+			return;
+		}
+
+		$parsed = UriHelper::parse_url($uri);
+
+		if (!isset($parsed['host']) || $parsed['host'] == '')
+		{
+			// If there is no host we do not need to convert it.
+			return $uri;
+		}
+
+		$host = $parsed['host'];
+		$hostExploded = explode('.', $host);
+		$newhost = '';
+
+		foreach ($hostExploded as $hostex)
+		{
+			$hostex = self::fromPunycode($hostex);
+			$newhost .= $hostex . '.';
+		}
+
+		$newhost = substr($newhost, 0, -1);
+		$newuri = '';
+
+		if (!empty($parsed['scheme']))
+		{
+			// Assume :// is required although it is not always.
+			$newuri .= $parsed['scheme'] . '://';
+		}
+
+		if (!empty($newhost))
+		{
+			$newuri .= $newhost;
+		}
+
+		if (!empty($parsed['port']))
+		{
+			$newuri .= ':' . $parsed['port'];
+		}
+
+		if (!empty($parsed['path']))
+		{
+			$newuri .= $parsed['path'];
+		}
+
+		if (!empty($parsed['query']))
+		{
+			$newuri .= '?' . $parsed['query'];
+		}
+
+		if (!empty($parsed['fragment']))
+		{
+			$newuri .= '#' . $parsed['fragment'];
+		}
+
+		return $newuri;
+	}
+
+	/**
+	 * Transforms a UTF-8 email to a Punycode email
+	 * This assumes a valid email address
+	 *
+	 * @param   string  $email  The UTF-8 email to transform
+	 *
+	 * @return  string  The punycode email
+	 *
+	 * @since   3.1.2
+	 */
+	public static function emailToPunycode($email)
+	{
+		$explodedAddress = explode('@', $email);
+
+		// Not addressing UTF-8 user names
+		$newEmail = $explodedAddress[0];
+
+		if (!empty($explodedAddress[1]))
+		{
+			$domainExploded = explode('.', $explodedAddress[1]);
+			$newdomain = '';
+
+			foreach ($domainExploded as $domainex)
+			{
+				$domainex = static::toPunycode($domainex);
+				$newdomain .= $domainex . '.';
+			}
+
+			$newdomain = substr($newdomain, 0, -1);
+			$newEmail = $newEmail . '@' . $newdomain;
+		}
+
+		return $newEmail;
+	}
+
+	/**
+	 * Transforms a Punycode email to a UTF-8 email
+	 * This assumes a valid email address
+	 *
+	 * @param   string  $email  The punycode email to transform
+	 *
+	 * @return  string  The punycode email
+	 *
+	 * @since   3.1.2
+	 */
+	public static function emailToUTF8($email)
+	{
+		$explodedAddress = explode('@', $email);
+
+		// Not addressing UTF-8 user names
+		$newEmail = $explodedAddress[0];
+
+		if (!empty($explodedAddress[1]))
+		{
+			$domainExploded = explode('.', $explodedAddress[1]);
+			$newdomain = '';
+
+			foreach ($domainExploded as $domainex)
+			{
+				$domainex = static::fromPunycode($domainex);
+				$newdomain .= $domainex . '.';
+			}
+
+			$newdomain = substr($newdomain, 0, -1);
+			$newEmail = $newEmail . '@' . $newdomain;
+		}
+
+		return $newEmail;
+	}
+}
diff --git a/core/libraries/src/Table/Asset.php b/core/libraries/src/Table/Asset.php
new file mode 100644
index 00000000..9bf3af28
--- /dev/null
+++ b/core/libraries/src/Table/Asset.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Table class supporting modified pre-order tree traversal behavior.
+ *
+ * @since  11.1
+ */
+class Asset extends Nested
+{
+	/**
+	 * The primary key of the asset.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $id = null;
+
+	/**
+	 * The unique name of the asset.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $name = null;
+
+	/**
+	 * The human readable title of the asset.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $title = null;
+
+	/**
+	 * The rules for the asset stored in a JSON string
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $rules = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__assets', 'id', $db);
+	}
+
+	/**
+	 * Method to load an asset by its name.
+	 *
+	 * @param   string  $name  The name of the asset.
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	public function loadByName($name)
+	{
+		return $this->load(array('name' => $name));
+	}
+
+	/**
+	 * Assert that the nested set data is valid.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		$this->parent_id = (int) $this->parent_id;
+
+		if (empty($this->rules))
+		{
+			$this->rules = '{}';
+		}
+
+		// Nested does not allow parent_id = 0, override this.
+		if ($this->parent_id > 0)
+		{
+			// Get the \JDatabaseQuery object
+			$query = $this->_db->getQuery(true)
+				->select('1')
+				->from($this->_db->quoteName($this->_tbl))
+				->where($this->_db->quoteName('id') . ' = ' . $this->parent_id);
+
+			if ($this->_db->setQuery($query, 0, 1)->loadResult())
+			{
+				return true;
+			}
+
+			$this->setError('Invalid Parent ID');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to recursively rebuild the whole nested set tree.
+	 *
+	 * @param   integer  $parentId  The root of the tree to rebuild.
+	 * @param   integer  $leftId    The left id to start with in building the tree.
+	 * @param   integer  $level     The level to assign to the current nodes.
+	 * @param   string   $path      The path to the current nodes.
+	 *
+	 * @return  integer  1 + value of root rgt on success, false on failure
+	 *
+	 * @since   3.5
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = null)
+	{
+		// If no parent is provided, try to find it.
+		if ($parentId === null)
+		{
+			// Get the root item.
+			$parentId = $this->getRootId();
+
+			if ($parentId === false)
+			{
+				return false;
+			}
+		}
+
+		$query = $this->_db->getQuery(true);
+
+		// Build the structure of the recursive query.
+		if (!isset($this->_cache['rebuild.sql']))
+		{
+			$query->clear()
+				->select($this->_tbl_key)
+				->from($this->_tbl)
+				->where('parent_id = %d');
+
+			// If the table has an ordering field, use that for ordering.
+			if (property_exists($this, 'ordering'))
+			{
+				$query->order('parent_id, ordering, lft');
+			}
+			else
+			{
+				$query->order('parent_id, lft');
+			}
+
+			$this->_cache['rebuild.sql'] = (string) $query;
+		}
+
+		// Make a shortcut to database object.
+
+		// Assemble the query to find all children of this node.
+		$this->_db->setQuery(sprintf($this->_cache['rebuild.sql'], (int) $parentId));
+
+		$children = $this->_db->loadObjectList();
+
+		// The right value of this node is the left value + 1
+		$rightId = $leftId + 1;
+
+		// Execute this function recursively over all children
+		foreach ($children as $node)
+		{
+			/*
+			 * $rightId is the current right value, which is incremented on recursion return.
+			 * Increment the level for the children.
+			 * Add this item's alias to the path (but avoid a leading /)
+			 */
+			$rightId = $this->rebuild($node->{$this->_tbl_key}, $rightId, $level + 1);
+
+			// If there is an update failure, return false to break out of the recursion.
+			if ($rightId === false)
+			{
+				return false;
+			}
+		}
+
+		// We've got the left value, and now that we've processed
+		// the children of this node we also know the right value.
+		$query->clear()
+			->update($this->_tbl)
+			->set('lft = ' . (int) $leftId)
+			->set('rgt = ' . (int) $rightId)
+			->set('level = ' . (int) $level)
+			->where($this->_tbl_key . ' = ' . (int) $parentId);
+		$this->_db->setQuery($query)->execute();
+
+		// Return the right value of this node + 1.
+		return $rightId + 1;
+	}
+}
diff --git a/core/libraries/src/Table/Category.php b/core/libraries/src/Table/Category.php
new file mode 100644
index 00000000..7d8cf20a
--- /dev/null
+++ b/core/libraries/src/Table/Category.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Rules;
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Table\Observer\ContentHistory;
+use Joomla\CMS\Table\Observer\Tags;
+use Joomla\Registry\Registry;
+
+/**
+ * Category table
+ *
+ * @since  1.5
+ */
+class Category extends Nested
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(\JDatabaseDriver $db)
+	{
+		parent::__construct('#__categories', 'id', $db);
+
+		Tags::createObserver($this, array('typeAlias' => '{extension}.category'));
+		ContentHistory::createObserver($this, array('typeAlias' => '{extension}.category'));
+
+		$this->access = (int) \JFactory::getConfig()->get('access');
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 */
+	protected function _getAssetName()
+	{
+		$k = $this->_tbl_key;
+
+		return $this->extension . '.category.' . (int) $this->$k;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Get the parent asset id for the record
+	 *
+	 * @param   Table    $table  A JTable object for the asset parent.
+	 * @param   integer  $id     The id for the asset
+	 *
+	 * @return  integer  The id of the asset's parent
+	 *
+	 * @since   1.6
+	 */
+	protected function _getAssetParentId(Table $table = null, $id = null)
+	{
+		$assetId = null;
+
+		// This is a category under a category.
+		if ($this->parent_id > 1)
+		{
+			// Build the query to get the asset id for the parent category.
+			$query = $this->_db->getQuery(true)
+				->select($this->_db->quoteName('asset_id'))
+				->from($this->_db->quoteName('#__categories'))
+				->where($this->_db->quoteName('id') . ' = ' . $this->parent_id);
+
+			// Get the asset id from the database.
+			$this->_db->setQuery($query);
+
+			if ($result = $this->_db->loadResult())
+			{
+				$assetId = (int) $result;
+			}
+		}
+		// This is a category that needs to parent with the extension.
+		elseif ($assetId === null)
+		{
+			// Build the query to get the asset id for the parent category.
+			$query = $this->_db->getQuery(true)
+				->select($this->_db->quoteName('id'))
+				->from($this->_db->quoteName('#__assets'))
+				->where($this->_db->quoteName('name') . ' = ' . $this->_db->quote($this->extension));
+
+			// Get the asset id from the database.
+			$this->_db->setQuery($query);
+
+			if ($result = $this->_db->loadResult())
+			{
+				$assetId = (int) $result;
+			}
+		}
+
+		// Return the asset id.
+		if ($assetId)
+		{
+			return $assetId;
+		}
+		else
+		{
+			return parent::_getAssetParentId($table, $id);
+		}
+	}
+
+	/**
+	 * Override check function
+	 *
+	 * @return  boolean
+	 *
+	 * @see     Table::check()
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		// Check for a title.
+		if (trim($this->title) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_CATEGORY'));
+
+			return false;
+		}
+
+		$this->alias = trim($this->alias);
+
+		if (empty($this->alias))
+		{
+			$this->alias = $this->title;
+		}
+
+		$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = \JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded bind function.
+	 *
+	 * @param   array   $array   named array
+	 * @param   string  $ignore  An optional array or space separated list of properties
+	 *                           to ignore while binding.
+	 *
+	 * @return  mixed   Null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @see     Table::bind()
+	 * @since   1.6
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		if (isset($array['metadata']) && is_array($array['metadata']))
+		{
+			$registry = new Registry($array['metadata']);
+			$array['metadata'] = (string) $registry;
+		}
+
+		// Bind the rules.
+		if (isset($array['rules']) && is_array($array['rules']))
+		{
+			$rules = new Rules($array['rules']);
+			$this->setRules($rules);
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overridden Table::store to set created/modified and user id.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = \JFactory::getDate();
+		$user = \JFactory::getUser();
+
+		$this->modified_time = $date->toSql();
+
+		if ($this->id)
+		{
+			// Existing category
+			$this->modified_user_id = $user->get('id');
+		}
+		else
+		{
+			// New category. A category created_time and created_user_id field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created_time)
+			{
+				$this->created_time = $date->toSql();
+			}
+
+			if (empty($this->created_user_id))
+			{
+				$this->created_user_id = $user->get('id');
+			}
+		}
+
+		// Verify that the alias is unique
+		$table = Table::getInstance('Category', 'JTable', array('dbo' => $this->getDbo()));
+
+		if ($table->load(array('alias' => $this->alias, 'parent_id' => (int) $this->parent_id, 'extension' => $this->extension))
+			&& ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_CATEGORY_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/core/libraries/src/Table/Content.php b/core/libraries/src/Table/Content.php
new file mode 100644
index 00000000..f600549c
--- /dev/null
+++ b/core/libraries/src/Table/Content.php
@@ -0,0 +1,357 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Access\Rules;
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Table\Observer\Tags;
+use Joomla\CMS\Table\Observer\ContentHistory as ContentHistoryObserver;
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * Content table
+ *
+ * @since       1.5
+ * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+ */
+class Content extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  A database connector object
+	 *
+	 * @since   1.5
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	public function __construct(\JDatabaseDriver $db)
+	{
+		parent::__construct('#__content', 'id', $db);
+
+		Tags::createObserver($this, array('typeAlias' => 'com_content.article'));
+		ContentHistoryObserver::createObserver($this, array('typeAlias' => 'com_content.article'));
+
+		// Set the alias since the column is called state
+		$this->setColumnAlias('published', 'state');
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	protected function _getAssetName()
+	{
+		$k = $this->_tbl_key;
+
+		return 'com_content.article.' . (int) $this->$k;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Method to get the parent asset id for the record
+	 *
+	 * @param   Table    $table  A Table object (optional) for the asset parent
+	 * @param   integer  $id     The id (optional) of the content.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.6
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	protected function _getAssetParentId(Table $table = null, $id = null)
+	{
+		$assetId = null;
+
+		// This is an article under a category.
+		if ($this->catid)
+		{
+			// Build the query to get the asset id for the parent category.
+			$query = $this->_db->getQuery(true)
+				->select($this->_db->quoteName('asset_id'))
+				->from($this->_db->quoteName('#__categories'))
+				->where($this->_db->quoteName('id') . ' = ' . (int) $this->catid);
+
+			// Get the asset id from the database.
+			$this->_db->setQuery($query);
+
+			if ($result = $this->_db->loadResult())
+			{
+				$assetId = (int) $result;
+			}
+		}
+
+		// Return the asset id.
+		if ($assetId)
+		{
+			return $assetId;
+		}
+		else
+		{
+			return parent::_getAssetParentId($table, $id);
+		}
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties
+	 *                          to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error string
+	 *
+	 * @see     Table::bind()
+	 * @since   1.6
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	public function bind($array, $ignore = '')
+	{
+		// Search for the {readmore} tag and split the text up accordingly.
+		if (isset($array['articletext']))
+		{
+			$pattern = '#<hr\s+id=("|\')system-readmore("|\')\s*\/*>#i';
+			$tagPos = preg_match($pattern, $array['articletext']);
+
+			if ($tagPos == 0)
+			{
+				$this->introtext = $array['articletext'];
+				$this->fulltext = '';
+			}
+			else
+			{
+				list ($this->introtext, $this->fulltext) = preg_split($pattern, $array['articletext'], 2);
+			}
+		}
+
+		if (isset($array['attribs']) && is_array($array['attribs']))
+		{
+			$registry = new Registry($array['attribs']);
+			$array['attribs'] = (string) $registry;
+		}
+
+		if (isset($array['metadata']) && is_array($array['metadata']))
+		{
+			$registry = new Registry($array['metadata']);
+			$array['metadata'] = (string) $registry;
+		}
+
+		// Bind the rules.
+		if (isset($array['rules']) && is_array($array['rules']))
+		{
+			$rules = new Rules($array['rules']);
+			$this->setRules($rules);
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @see     Table::check()
+	 * @since   1.5
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	public function check()
+	{
+		if (trim($this->title) == '')
+		{
+			$this->setError(\JText::_('COM_CONTENT_WARNING_PROVIDE_VALID_NAME'));
+
+			return false;
+		}
+
+		if (trim($this->alias) == '')
+		{
+			$this->alias = $this->title;
+		}
+
+		$this->alias = ApplicationHelper::stringURLSafe($this->alias, $this->language);
+
+		if (trim(str_replace('-', '', $this->alias)) == '')
+		{
+			$this->alias = \JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		if (trim(str_replace('&nbsp;', '', $this->fulltext)) == '')
+		{
+			$this->fulltext = '';
+		}
+
+		/**
+		 * Ensure any new items have compulsory fields set. This is needed for things like
+		 * frontend editing where we don't show all the fields or using some kind of API
+		 */
+		if (!$this->id)
+		{
+			// Images can be an empty json string
+			if (!isset($this->images))
+			{
+				$this->images = '{}';
+			}
+
+			// URLs can be an empty json string
+			if (!isset($this->urls))
+			{
+				$this->urls = '{}';
+			}
+
+			// Attributes (article params) can be an empty json string
+			if (!isset($this->attribs))
+			{
+				$this->attribs = '{}';
+			}
+
+			// Metadata can be an empty json string
+			if (!isset($this->metadata))
+			{
+				$this->metadata = '{}';
+			}
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ($this->publish_down < $this->publish_up && $this->publish_down > $this->_db->getNullDate())
+		{
+			// Swap the dates.
+			$temp = $this->publish_up;
+			$this->publish_up = $this->publish_down;
+			$this->publish_down = $temp;
+		}
+
+		// Clean up keywords -- eliminate extra spaces between phrases
+		// and cr (\r) and lf (\n) characters from string
+		if (!empty($this->metakey))
+		{
+			// Only process if not empty
+
+			// Array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->metakey);
+
+			// Create array using commas as delimiter
+			$keys = explode(',', $after_clean);
+
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				if (trim($key))
+				{
+					// Ignore blank keywords
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->metakey = implode(', ', $clean_keys);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the default asset values for a component.
+	 *
+	 * @param   string  $component  The component asset name to search for
+	 *
+	 * @return  Rules  The Rules object for the asset
+	 *
+	 * @since   3.4
+	 * @deprecated  3.4 Class will be removed upon completion of transition to UCM
+	 */
+	protected function getDefaultAssetValues($component)
+	{
+		// Need to find the asset id by the name of the component.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__assets'))
+			->where($db->quoteName('name') . ' = ' . $db->quote($component));
+		$db->setQuery($query);
+		$assetId = (int) $db->loadResult();
+
+		return Access::getAssetRules($assetId);
+	}
+
+	/**
+	 * Overrides Table::store to set modified data and user id.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 * @deprecated  3.1.4 Class will be removed upon completion of transition to UCM
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = \JFactory::getDate();
+		$user = \JFactory::getUser();
+
+		$this->modified = $date->toSql();
+
+		if ($this->id)
+		{
+			// Existing item
+			$this->modified_by = $user->get('id');
+		}
+		else
+		{
+			// New article. An article created and created_by field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->created)
+			{
+				$this->created = $date->toSql();
+			}
+
+			if (empty($this->created_by))
+			{
+				$this->created_by = $user->get('id');
+			}
+		}
+
+		// Verify that the alias is unique
+		$table = Table::getInstance('Content', 'JTable', array('dbo' => $this->getDbo()));
+
+		if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_ARTICLE_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/core/libraries/src/Table/ContentHistory.php b/core/libraries/src/Table/ContentHistory.php
new file mode 100644
index 00000000..1617a27b
--- /dev/null
+++ b/core/libraries/src/Table/ContentHistory.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Content History table.
+ *
+ * @since  3.2
+ */
+class ContentHistory extends Table
+{
+	/**
+	 * Array of object fields to unset from the data object before calculating SHA1 hash. This allows us to detect a meaningful change
+	 * in the database row using the hash. This can be read from the #__content_types content_history_options column.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	public $ignoreChanges = array();
+
+	/**
+	 * Array of object fields to convert to integers before calculating SHA1 hash. Some values are stored differently
+	 * when an item is created than when the item is changed and saved. This works around that issue.
+	 * This can be read from the #__content_types content_history_options column.
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	public $convertToInt = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  A database connector object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__ucm_history', 'version_id', $db);
+		$this->ignoreChanges = array(
+			'modified_by',
+			'modified_user_id',
+			'modified',
+			'modified_time',
+			'checked_out',
+			'checked_out_time',
+			'version',
+			'hits',
+			'path',
+		);
+		$this->convertToInt  = array('publish_up', 'publish_down', 'ordering', 'featured');
+	}
+
+	/**
+	 * Overrides Table::store to set modified hash, user id, and save date.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function store($updateNulls = false)
+	{
+		$this->set('character_count', strlen($this->get('version_data')));
+		$typeTable = Table::getInstance('ContentType', 'JTable', array('dbo' => $this->getDbo()));
+		$typeTable->load($this->ucm_type_id);
+
+		if (!isset($this->sha1_hash))
+		{
+			$this->set('sha1_hash', $this->getSha1($this->get('version_data'), $typeTable));
+		}
+
+		// Modify author and date only when not toggling Keep Forever
+		if ($this->get('keep_forever') === null)
+		{
+			$this->set('editor_user_id', \JFactory::getUser()->id);
+			$this->set('save_date', \JFactory::getDate()->toSql());
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Utility method to get the hash after removing selected values. This lets us detect changes other than
+	 * modified date (which will change on every save).
+	 *
+	 * @param   mixed        $jsonData   Either an object or a string with json-encoded data
+	 * @param   ContentType  $typeTable  Table object with data for this content type
+	 *
+	 * @return  string  SHA1 hash on success. Empty string on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function getSha1($jsonData, ContentType $typeTable)
+	{
+		$object = is_object($jsonData) ? $jsonData : json_decode($jsonData);
+
+		if (isset($typeTable->content_history_options) && is_object(json_decode($typeTable->content_history_options)))
+		{
+			$options = json_decode($typeTable->content_history_options);
+			$this->ignoreChanges = isset($options->ignoreChanges) ? $options->ignoreChanges : $this->ignoreChanges;
+			$this->convertToInt = isset($options->convertToInt) ? $options->convertToInt : $this->convertToInt;
+		}
+
+		foreach ($this->ignoreChanges as $remove)
+		{
+			if (property_exists($object, $remove))
+			{
+				unset($object->$remove);
+			}
+		}
+
+		// Convert integers, booleans, and nulls to strings to get a consistent hash value
+		foreach ($object as $name => $value)
+		{
+			if (is_object($value))
+			{
+				// Go one level down for JSON column values
+				foreach ($value as $subName => $subValue)
+				{
+					$object->$subName = is_int($subValue) || is_bool($subValue) || $subValue === null ? (string) $subValue : $subValue;
+				}
+			}
+			else
+			{
+				$object->$name = is_int($value) || is_bool($value) || $value === null ? (string) $value : $value;
+			}
+		}
+
+		// Work around empty values
+		foreach ($this->convertToInt as $convert)
+		{
+			if (isset($object->$convert))
+			{
+				$object->$convert = (int) $object->$convert;
+			}
+		}
+
+		if (isset($object->review_time))
+		{
+			$object->review_time = (int) $object->review_time;
+		}
+
+		return sha1(json_encode($object));
+	}
+
+	/**
+	 * Utility method to get a matching row based on the hash value and id columns.
+	 * This lets us check to make sure we don't save duplicate versions.
+	 *
+	 * @return  string  SHA1 hash on success. Empty string on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function getHashMatch()
+	{
+		$db    = $this->_db;
+		$query = $db->getQuery(true);
+		$query->select('*')
+			->from($db->quoteName('#__ucm_history'))
+			->where($db->quoteName('ucm_item_id') . ' = ' . (int) $this->get('ucm_item_id'))
+			->where($db->quoteName('ucm_type_id') . ' = ' . (int) $this->get('ucm_type_id'))
+			->where($db->quoteName('sha1_hash') . ' = ' . $db->quote($this->get('sha1_hash')));
+		$db->setQuery($query, 0, 1);
+
+		return $db->loadObject();
+	}
+
+	/**
+	 * Utility method to remove the oldest versions of an item, saving only the most recent versions.
+	 *
+	 * @param   integer  $maxVersions  The maximum number of versions to save. All others will be deleted.
+	 *
+	 * @return  boolean   true on success, false on failure.
+	 *
+	 * @since   3.2
+	 */
+	public function deleteOldVersions($maxVersions)
+	{
+		$result = true;
+
+		// Get the list of version_id values we want to save
+		$db    = $this->_db;
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('version_id'))
+			->from($db->quoteName('#__ucm_history'))
+			->where($db->quoteName('ucm_item_id') . ' = ' . (int) $this->get('ucm_item_id'))
+			->where($db->quoteName('ucm_type_id') . ' = ' . (int) $this->get('ucm_type_id'))
+			->where($db->quoteName('keep_forever') . ' != 1')
+			->order($db->quoteName('save_date') . ' DESC ');
+		$db->setQuery($query, 0, (int) $maxVersions);
+		$idsToSave = $db->loadColumn(0);
+
+		// Don't process delete query unless we have at least the maximum allowed versions
+		if (count($idsToSave) === (int) $maxVersions)
+		{
+			// Delete any rows not in our list and and not flagged to keep forever.
+			$query = $db->getQuery(true);
+			$query->delete($db->quoteName('#__ucm_history'))
+				->where($db->quoteName('ucm_item_id') . ' = ' . (int) $this->get('ucm_item_id'))
+				->where($db->quoteName('ucm_type_id') . ' = ' . (int) $this->get('ucm_type_id'))
+				->where($db->quoteName('version_id') . ' NOT IN (' . implode(',', $idsToSave) . ')')
+				->where($db->quoteName('keep_forever') . ' != 1');
+			$db->setQuery($query);
+			$result = (boolean) $db->execute();
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Table/ContentType.php b/core/libraries/src/Table/ContentType.php
new file mode 100644
index 00000000..e289ef8b
--- /dev/null
+++ b/core/libraries/src/Table/ContentType.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Tags table
+ *
+ * @since  3.1
+ */
+class ContentType extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  A database connector object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__content_types', 'type_id', $db);
+	}
+
+	/**
+	 * Overloaded check method to ensure data integrity.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function check()
+	{
+		// Check for valid name.
+		if (trim($this->type_title) === '')
+		{
+			throw new \UnexpectedValueException(sprintf('The title is empty'));
+		}
+
+		$this->type_title = ucfirst($this->type_title);
+
+		if (empty($this->type_alias))
+		{
+			throw new \UnexpectedValueException(sprintf('The type_alias is empty'));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overridden Table::store.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function store($updateNulls = false)
+	{
+		// Verify that the alias is unique
+		$table = Table::getInstance('Contenttype', 'JTable', array('dbo' => $this->getDbo()));
+
+		if ($table->load(array('type_alias' => $this->type_alias)) && ($table->type_id != $this->type_id || $this->type_id == 0))
+		{
+			$this->setError(\JText::_('COM_TAGS_ERROR_UNIQUE_ALIAS'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Method to expand the field mapping
+	 *
+	 * @param   boolean  $assoc  True to return an associative array.
+	 *
+	 * @return  mixed  Array or object with field mappings. Defaults to object.
+	 *
+	 * @since   3.1
+	 */
+	public function fieldmapExpand($assoc = true)
+	{
+		return $this->fieldmap = json_decode($this->fieldmappings, $assoc);
+	}
+
+	/**
+	 * Method to get the id given the type alias
+	 *
+	 * @param   string  $typeAlias  Content type alias (for example, 'com_content.article').
+	 *
+	 * @return  mixed  type_id for this alias if successful, otherwise null.
+	 *
+	 * @since   3.2
+	 */
+	public function getTypeId($typeAlias)
+	{
+		$db = $this->_db;
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('type_id'))
+			->from($db->quoteName($this->_tbl))
+			->where($db->quoteName('type_alias') . ' = ' . $db->quote($typeAlias));
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Method to get the Table object for the content type from the table object.
+	 *
+	 * @return  mixed  Table object on success, otherwise false.
+	 *
+	 * @since   3.2
+	 *
+	 * @throws  \RuntimeException
+	 */
+	public function getContentTable()
+	{
+		$result = false;
+		$tableInfo = json_decode($this->table);
+
+		if (is_object($tableInfo) && isset($tableInfo->special))
+		{
+			if (is_object($tableInfo->special) && isset($tableInfo->special->type) && isset($tableInfo->special->prefix))
+			{
+				$class = isset($tableInfo->special->class) ? $tableInfo->special->class : 'Joomla\\CMS\\Table\\Table';
+
+				if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface'))
+				{
+					// This isn't an instance of TableInterface. Abort.
+					throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
+				}
+
+				$result = $class::getInstance($tableInfo->special->type, $tableInfo->special->prefix);
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/src/Table/CoreContent.php b/core/libraries/src/Table/CoreContent.php
new file mode 100644
index 00000000..41e8f035
--- /dev/null
+++ b/core/libraries/src/Table/CoreContent.php
@@ -0,0 +1,415 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Core content table
+ *
+ * @since  3.1
+ */
+class CoreContent extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  A database connector object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__ucm_content', 'core_content_id', $db);
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties
+	 *                          to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error string
+	 *
+	 * @see     Table::bind()
+	 * @since   3.1
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['core_params']) && is_array($array['core_params']))
+		{
+			$registry = new Registry($array['core_params']);
+			$array['core_params'] = (string) $registry;
+		}
+
+		if (isset($array['core_metadata']) && is_array($array['core_metadata']))
+		{
+			$registry = new Registry($array['core_metadata']);
+			$array['core_metadata'] = (string) $registry;
+		}
+
+		if (isset($array['core_images']) && is_array($array['core_images']))
+		{
+			$registry = new Registry($array['core_images']);
+			$array['core_images'] = (string) $registry;
+		}
+
+		if (isset($array['core_urls']) && is_array($array['core_urls']))
+		{
+			$registry = new Registry($array['core_urls']);
+			$array['core_urls'] = (string) $registry;
+		}
+
+		if (isset($array['core_body']) && is_array($array['core_body']))
+		{
+			$registry = new Registry($array['core_body']);
+			$array['core_body'] = (string) $registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @see     Table::check()
+	 * @since   3.1
+	 */
+	public function check()
+	{
+		if (trim($this->core_title) === '')
+		{
+			$this->setError(\JText::_('JLIB_CMS_WARNING_PROVIDE_VALID_NAME'));
+
+			return false;
+		}
+
+		if (trim($this->core_alias) === '')
+		{
+			$this->core_alias = $this->core_title;
+		}
+
+		$this->core_alias = \JApplicationHelper::stringURLSafe($this->core_alias);
+
+		if (trim(str_replace('-', '', $this->core_alias)) === '')
+		{
+			$this->core_alias = \JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+
+		// Not Null sanity check
+		if (empty($this->core_images))
+		{
+			$this->core_images = '{}';
+		}
+
+		if (empty($this->core_urls))
+		{
+			$this->core_urls = '{}';
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ($this->core_publish_down < $this->core_publish_up && $this->core_publish_down > $this->_db->getNullDate())
+		{
+			// Swap the dates.
+			$temp = $this->core_publish_up;
+			$this->core_publish_up = $this->core_publish_down;
+			$this->core_publish_down = $temp;
+		}
+
+		// Clean up keywords -- eliminate extra spaces between phrases
+		// and cr (\r) and lf (\n) characters from string
+		if (!empty($this->core_metakey))
+		{
+			// Only process if not empty
+
+			// Array of characters to remove
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
+
+			// Remove bad characters
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->core_metakey);
+
+			// Create array using commas as delimiter
+			$keys = explode(',', $after_clean);
+
+			$clean_keys = array();
+
+			foreach ($keys as $key)
+			{
+				if (trim($key))
+				{
+					// Ignore blank keywords
+					$clean_keys[] = trim($key);
+				}
+			}
+
+			// Put array back together delimited by ", "
+			$this->core_metakey = implode(', ', $clean_keys);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Override JTable delete method to include deleting corresponding row from #__ucm_base.
+	 *
+	 * @param   integer  $pk  primary key value to delete. Must be set or throws an exception.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function delete($pk = null)
+	{
+		$baseTable = Table::getInstance('Ucm', 'JTable', array('dbo' => $this->getDbo()));
+
+		return parent::delete($pk) && $baseTable->delete($pk);
+	}
+
+	/**
+	 * Method to delete a row from the #__ucm_content table by content_item_id.
+	 *
+	 * @param   integer  $contentItemId  value of the core_content_item_id to delete. Corresponds to the primary key of the content table.
+	 * @param   string   $typeAlias      Alias for the content type
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function deleteByContentId($contentItemId = null, $typeAlias = null)
+	{
+		if ($contentItemId === null || ((int) $contentItemId) === 0)
+		{
+			throw new \UnexpectedValueException('Null content item key not allowed.');
+		}
+
+		if ($typeAlias === null)
+		{
+			throw new \UnexpectedValueException('Null type alias not allowed.');
+		}
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName('core_content_id'))
+			->from($db->quoteName('#__ucm_content'))
+			->where($db->quoteName('core_content_item_id') . ' = ' . (int) $contentItemId)
+			->where($db->quoteName('core_type_alias') . ' = ' . $db->quote($typeAlias));
+		$db->setQuery($query);
+
+		if ($ucmId = $db->loadResult())
+		{
+			return $this->delete($ucmId);
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Overrides Table::store to set modified data and user id.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function store($updateNulls = false)
+	{
+		$date = \JFactory::getDate();
+		$user = \JFactory::getUser();
+
+		if ($this->core_content_id)
+		{
+			// Existing item
+			$this->core_modified_time = $date->toSql();
+			$this->core_modified_user_id = $user->get('id');
+			$isNew = false;
+		}
+		else
+		{
+			// New content item. A content item core_created_time and core_created_user_id field can be set by the user,
+			// so we don't touch either of these if they are set.
+			if (!(int) $this->core_created_time)
+			{
+				$this->core_created_time = $date->toSql();
+			}
+
+			if (empty($this->core_created_user_id))
+			{
+				$this->core_created_user_id = $user->get('id');
+			}
+
+			$isNew = true;
+		}
+
+		$oldRules = $this->getRules();
+
+		if (empty($oldRules))
+		{
+			$this->setRules('{}');
+		}
+
+		$result = parent::store($updateNulls);
+
+		return $result && $this->storeUcmBase($updateNulls, $isNew);
+	}
+
+	/**
+	 * Insert or update row in ucm_base table
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 * @param   boolean  $isNew        if true, need to insert. Otherwise update.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	protected function storeUcmBase($updateNulls = false, $isNew = false)
+	{
+		// Store the ucm_base row
+		$db         = $this->getDbo();
+		$query      = $db->getQuery(true);
+		$languageId = \JHelperContent::getLanguageId($this->core_language);
+
+		// Selecting "all languages" doesn't give a language id - we can't store a blank string in non mysql databases, so save 0 (the default value)
+		if (!$languageId)
+		{
+			$languageId = '0';
+		}
+
+		if ($isNew)
+		{
+			$query->insert($db->quoteName('#__ucm_base'))
+				->columns(array($db->quoteName('ucm_id'), $db->quoteName('ucm_item_id'), $db->quoteName('ucm_type_id'), $db->quoteName('ucm_language_id')))
+				->values(
+					$db->quote($this->core_content_id) . ', '
+					. $db->quote($this->core_content_item_id) . ', '
+					. $db->quote($this->core_type_id) . ', '
+					. $db->quote($languageId)
+			);
+		}
+		else
+		{
+			$query->update($db->quoteName('#__ucm_base'))
+				->set($db->quoteName('ucm_item_id') . ' = ' . $db->quote($this->core_content_item_id))
+				->set($db->quoteName('ucm_type_id') . ' = ' . $db->quote($this->core_type_id))
+				->set($db->quoteName('ucm_language_id') . ' = ' . $db->quote($languageId))
+				->where($db->quoteName('ucm_id') . ' = ' . $db->quote($this->core_content_id));
+		}
+
+		$db->setQuery($query);
+
+		return $db->execute();
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table. The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks    = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		$pksImploded = implode(',', $pks);
+
+		// Get the JDatabaseQuery object
+		$query = $this->_db->getQuery(true);
+
+		// Update the publishing state for rows with the given primary keys.
+		$query->update($this->_db->quoteName($this->_tbl))
+			->set($this->_db->quoteName('core_state') . ' = ' . (int) $state)
+			->where($this->_db->quoteName($k) . 'IN (' . $pksImploded . ')');
+
+		// Determine if there is checkin support for the table.
+		$checkin = false;
+
+		if (property_exists($this, 'core_checked_out_user_id') && property_exists($this, 'core_checked_out_time'))
+		{
+			$checkin = true;
+			$query->where(
+				' ('
+				. $this->_db->quoteName('core_checked_out_user_id') . ' = 0 OR ' . $this->_db->quoteName('core_checked_out_user_id') . ' = ' . (int) $userId
+				. ')'
+			);
+		}
+
+		$this->_db->setQuery($query);
+
+		try
+		{
+			$this->_db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && count($pks) === $this->_db->getAffectedRows())
+		{
+			// Checkin the rows.
+			foreach ($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the JTable instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->core_state = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Table/Extension.php b/core/libraries/src/Table/Extension.php
new file mode 100644
index 00000000..418ba258
--- /dev/null
+++ b/core/libraries/src/Table/Extension.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Extension table
+ *
+ * @since  11.1
+ */
+class Extension extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__extensions', 'extension_id', $db);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True if the object is ok
+	 *
+	 * @see     Table::check()
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		// Check for valid name
+		if (trim($this->name) == '' || trim($this->element) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_EXTENSION'));
+
+			return false;
+		}
+
+		if (!$this->extension_id)
+		{
+			if (!$this->custom_data)
+			{
+				$this->custom_data = '';
+			}
+
+			if (!$this->system_data)
+			{
+				$this->system_data = '';
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties
+	 * to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @see     Table::bind()
+	 * @since   11.1
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		if (isset($array['control']) && is_array($array['control']))
+		{
+			$registry = new Registry($array['control']);
+			$array['control'] = (string) $registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Method to create and execute a SELECT WHERE query.
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @return  string  The database query result
+	 *
+	 * @since   11.1
+	 */
+	public function find($options = array())
+	{
+		// Get the \JDatabaseQuery object
+		$query = $this->_db->getQuery(true);
+
+		foreach ($options as $col => $val)
+		{
+			$query->where($col . ' = ' . $this->_db->quote($val));
+		}
+
+		$query->select($this->_db->quoteName('extension_id'))
+			->from($this->_db->quoteName('#__extensions'));
+		$this->_db->setQuery($query);
+
+		return $this->_db->loadResult();
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database
+	 * table.  The method respects checked out rows by other users and will attempt
+	 * to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not
+	 *                            set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		// Sanitize input.
+		$pks = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state = (int) $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = array($this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+				return false;
+			}
+		}
+
+		// Build the WHERE clause for the primary keys.
+		$where = $k . '=' . implode(' OR ' . $k . '=', $pks);
+
+		// Determine if there is checkin support for the table.
+		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
+		{
+			$checkin = '';
+		}
+		else
+		{
+			$checkin = ' AND (checked_out = 0 OR checked_out = ' . (int) $userId . ')';
+		}
+
+		// Update the publishing state for rows with the given primary keys.
+		$query = $this->_db->getQuery(true)
+			->update($this->_db->quoteName($this->_tbl))
+			->set($this->_db->quoteName('enabled') . ' = ' . (int) $state)
+			->where('(' . $where . ')' . $checkin);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		// If checkin is supported and all rows were adjusted, check them in.
+		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		{
+			// Checkin the rows.
+			foreach ($pks as $pk)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the Table instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->enabled = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Table/Language.php b/core/libraries/src/Table/Language.php
new file mode 100644
index 00000000..c7ef802d
--- /dev/null
+++ b/core/libraries/src/Table/Language.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Languages table.
+ *
+ * @since  11.1
+ */
+class Language extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__languages', 'lang_id', $db);
+	}
+
+	/**
+	 * Overloaded check method to ensure data integrity
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		if (trim($this->title) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_LANGUAGE_NO_TITLE'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overrides Table::store to check unique fields.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.4
+	 */
+	public function store($updateNulls = false)
+	{
+		$table = Table::getInstance('Language', 'JTable', array('dbo' => $this->getDbo()));
+
+		// Verify that the language code is unique
+		if ($table->load(array('lang_code' => $this->lang_code)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_LANG_CODE'));
+
+			return false;
+		}
+
+		// Verify that the sef field is unique
+		if ($table->load(array('sef' => $this->sef)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE'));
+
+			return false;
+		}
+
+		// Verify that the image field is unique
+		if ($this->image && $table->load(array('image' => $this->image)) && ($table->lang_id != $this->lang_id || $this->lang_id == 0))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_LANGUAGE_UNIQUE_IMAGE'));
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected function _getAssetName()
+	{
+		return 'com_languages.language.' . $this->lang_id;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.8.0
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Method to get the parent asset under which to register this one.
+	 * By default, all assets are registered to the ROOT node with ID,
+	 * which will default to 1 if none exists.
+	 * The extended class can define a table and id to lookup.  If the
+	 * asset does not exist it will be created.
+	 *
+	 * @param   Table    $table  A Table object for the asset parent.
+	 * @param   integer  $id     Id to look up
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.8.0
+	 */
+	protected function _getAssetParentId(Table $table = null, $id = null)
+	{
+		$assetId = null;
+		$asset   = Table::getInstance('asset');
+
+		if ($asset->loadByName('com_languages'))
+		{
+			$assetId = $asset->id;
+		}
+
+		return $assetId === null ? parent::_getAssetParentId($table, $id) : $assetId;
+	}
+}
diff --git a/core/libraries/src/Table/Menu.php b/core/libraries/src/Table/Menu.php
new file mode 100644
index 00000000..d85c6922
--- /dev/null
+++ b/core/libraries/src/Table/Menu.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Language\Multilanguage;
+use Joomla\Registry\Registry;
+
+/**
+ * Menu table
+ *
+ * @since  1.5
+ */
+class Menu extends Nested
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(\JDatabaseDriver $db)
+	{
+		parent::__construct('#__menu', 'id', $db);
+
+		// Set the default access level.
+		$this->access = (int) \JFactory::getConfig()->get('access');
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @see     Table::bind()
+	 * @since   1.5
+	 */
+	public function bind($array, $ignore = '')
+	{
+		// Verify that the default home menu is not unset
+		if ($this->home == '1' && $this->language === '*' && $array['home'] == '0')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT_DEFAULT'));
+
+			return false;
+		}
+
+		// Verify that the default home menu set to "all" languages" is not unset
+		if ($this->home == '1' && $this->language === '*' && $array['language'] !== '*')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_CANNOT_UNSET_DEFAULT'));
+
+			return false;
+		}
+
+		// Verify that the default home menu is not unpublished
+		if ($this->home == '1' && $this->language === '*' && $array['published'] != '1')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_UNPUBLISH_DEFAULT_HOME'));
+
+			return false;
+		}
+
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     Table::check()
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		// Check for a title.
+		if (trim($this->title) === '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MENUITEM'));
+
+			return false;
+		}
+
+		// Check for a path.
+		if (trim($this->path) === '')
+		{
+			$this->path = $this->alias;
+		}
+
+		// Check for params.
+		if (trim($this->params) === '')
+		{
+			$this->params = '{}';
+		}
+
+		// Check for img.
+		if (trim($this->img) === '')
+		{
+			$this->img = ' ';
+		}
+
+		// Cast the home property to an int for checking.
+		$this->home = (int) $this->home;
+
+		// Verify that the home item is a component.
+		if ($this->home && $this->type !== 'component')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_HOME_NOT_COMPONENT'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded store function
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  mixed  False on failure, positive integer on success.
+	 *
+	 * @see     Table::store()
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		$db = $this->getDbo();
+
+		// Verify that the alias is unique
+		$table = Table::getInstance('Menu', 'JTable', array('dbo' => $db));
+
+		$originalAlias = trim($this->alias);
+		$this->alias   = !$originalAlias ? $this->title : $originalAlias;
+		$this->alias   = ApplicationHelper::stringURLSafe(trim($this->alias), $this->language);
+
+		if ($this->parent_id == 1 && $this->client_id == 0)
+		{
+			// Verify that a first level menu item alias is not 'component'.
+			if ($this->alias == 'component')
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_COMPONENT'));
+
+				return false;
+			}
+
+			// Verify that a first level menu item alias is not the name of a folder.
+			jimport('joomla.filesystem.folder');
+
+			if (in_array($this->alias, \JFolder::folders(JPATH_ROOT)))
+			{
+				$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_MENU_ROOT_ALIAS_FOLDER', $this->alias, $this->alias));
+
+				return false;
+			}
+		}
+
+		// If alias still empty (for instance, new menu item with chinese characters with no unicode alias setting).
+		if (empty($this->alias))
+		{
+			$this->alias = \JFactory::getDate()->format('Y-m-d-H-i-s');
+		}
+		else
+		{
+			$itemSearch = array('alias' => $this->alias, 'parent_id' => $this->parent_id, 'client_id' => (int) $this->client_id);
+			$error      = false;
+
+			// Check if the alias already exists. For multilingual site.
+			if (Multilanguage::isEnabled() && (int) $this->client_id == 0)
+			{
+				// If there is a menu item at the same level with the same alias (in the All or the same language).
+				if (($table->load(array_replace($itemSearch, array('language' => '*'))) && ($table->id != $this->id || $this->id == 0))
+					|| ($table->load(array_replace($itemSearch, array('language' => $this->language))) && ($table->id != $this->id || $this->id == 0))
+					|| ($this->language === '*' && $this->id == 0 && $table->load($itemSearch)))
+				{
+					$error = true;
+				}
+				// When editing an item with All language check if there are more menu items with the same alias in any language.
+				elseif ($this->language === '*' && $this->id != 0)
+				{
+					$query = $db->getQuery(true)
+						->select('id')
+						->from($db->quoteName('#__menu'))
+						->where($db->quoteName('parent_id') . ' = 1')
+						->where($db->quoteName('client_id') . ' = 0')
+						->where($db->quoteName('id') . ' != ' . (int) $this->id)
+						->where($db->quoteName('alias') . ' = ' . $db->quote($this->alias));
+
+					$otherMenuItemId = (int) $db->setQuery($query)->loadResult();
+
+					if ($otherMenuItemId)
+					{
+						$table->load(array('id' => $otherMenuItemId));
+						$error = true;
+					}
+				}
+			}
+			// Check if the alias already exists. For monolingual site.
+			else
+			{
+				// If there is a menu item at the same level with the same alias (in any language).
+				if ($table->load($itemSearch) && ($table->id != $this->id || $this->id == 0))
+				{
+					$error = true;
+				}
+			}
+
+			// The alias already exists. Enqueue an error message.
+			if ($error)
+			{
+				$menuTypeTable = Table::getInstance('MenuType', 'JTable', array('dbo' => $db));
+				$menuTypeTable->load(array('menutype' => $table->menutype));
+				$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_MENU_UNIQUE_ALIAS', $this->alias, $table->title, $menuTypeTable->title));
+
+				return false;
+			}
+		}
+
+		if ($this->home == '1')
+		{
+			// Verify that the home page for this menu is unique.
+			if ($table->load(
+					array(
+					'menutype' => $this->menutype,
+					'client_id' => (int) $this->client_id,
+					'home' => '1',
+					)
+				)
+				&& ($table->language != $this->language))
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_HOME_NOT_UNIQUE_IN_MENU'));
+
+				return false;
+			}
+
+			// Verify that the home page for this language is unique per client id
+			if ($table->load(array('home' => '1', 'language' => $this->language, 'client_id' => (int) $this->client_id)))
+			{
+				if ($table->checked_out && $table->checked_out != $this->checked_out)
+				{
+					$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENU_DEFAULT_CHECKIN_USER_MISMATCH'));
+
+					return false;
+				}
+
+				$table->home = 0;
+				$table->checked_out = 0;
+				$table->checked_out_time = $db->getNullDate();
+				$table->store();
+			}
+		}
+
+		if (!parent::store($updateNulls))
+		{
+			return false;
+		}
+
+		// Get the new path in case the node was moved
+		$pathNodes = $this->getPath();
+		$segments = array();
+
+		foreach ($pathNodes as $node)
+		{
+			// Don't include root in path
+			if ($node->alias !== 'root')
+			{
+				$segments[] = $node->alias;
+			}
+		}
+
+		$newPath = trim(implode('/', $segments), ' /\\');
+
+		// Use new path for partial rebuild of table
+		// Rebuild will return positive integer on success, false on failure
+		return $this->rebuild($this->{$this->_tbl_key}, $this->lft, $this->level, $newPath) > 0;
+	}
+}
diff --git a/core/libraries/src/Table/MenuType.php b/core/libraries/src/Table/MenuType.php
new file mode 100644
index 00000000..607faede
--- /dev/null
+++ b/core/libraries/src/Table/MenuType.php
@@ -0,0 +1,288 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+
+/**
+ * Menu Types table
+ *
+ * @since  1.6
+ */
+class MenuType extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct(\JDatabaseDriver $db)
+	{
+		parent::__construct('#__menu_types', 'id', $db);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @see     Table::check()
+	 * @since   1.6
+	 */
+	public function check()
+	{
+		$this->menutype = ApplicationHelper::stringURLSafe($this->menutype);
+
+		if (empty($this->menutype))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MENUTYPE_EMPTY'));
+
+			return false;
+		}
+
+		// Sanitise data.
+		if (trim($this->title) === '')
+		{
+			$this->title = $this->menutype;
+		}
+
+		// Check for unique menutype.
+		$query = $this->_db->getQuery(true)
+			->select('COUNT(id)')
+			->from($this->_db->quoteName('#__menu_types'))
+			->where($this->_db->quoteName('menutype') . ' = ' . $this->_db->quote($this->menutype))
+			->where($this->_db->quoteName('id') . ' <> ' . (int) $this->id);
+		$this->_db->setQuery($query);
+
+		if ($this->_db->loadResult())
+		{
+			$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_MENUTYPE_EXISTS', $this->menutype));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to store a row in the database from the Table instance properties.
+	 *
+	 * If a primary key value is set the row with that primary key value will be updated with the instance property values.
+	 * If no primary key value is set a new row will be inserted into the database with the properties from the Table instance.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function store($updateNulls = false)
+	{
+		if ($this->id)
+		{
+			// Get the user id
+			$userId = \JFactory::getUser()->id;
+
+			// Get the old value of the table
+			$table = Table::getInstance('Menutype', 'JTable', array('dbo' => $this->getDbo()));
+			$table->load($this->id);
+
+			// Verify that no items are checked out
+			$query = $this->_db->getQuery(true)
+				->select('id')
+				->from('#__menu')
+				->where('menutype=' . $this->_db->quote($table->menutype))
+				->where('checked_out !=' . (int) $userId)
+				->where('checked_out !=0');
+			$this->_db->setQuery($query);
+
+			if ($this->_db->loadRowList())
+			{
+				$this->setError(
+					\JText::sprintf('JLIB_DATABASE_ERROR_STORE_FAILED', get_class($this), \JText::_('JLIB_DATABASE_ERROR_MENUTYPE_CHECKOUT'))
+				);
+
+				return false;
+			}
+
+			// Verify that no module for this menu are checked out
+			$query->clear()
+				->select('id')
+				->from('#__modules')
+				->where('module=' . $this->_db->quote('mod_menu'))
+				->where('params LIKE ' . $this->_db->quote('%"menutype":' . json_encode($table->menutype) . '%'))
+				->where('checked_out !=' . (int) $userId)
+				->where('checked_out !=0');
+			$this->_db->setQuery($query);
+
+			if ($this->_db->loadRowList())
+			{
+				$this->setError(
+					\JText::sprintf('JLIB_DATABASE_ERROR_STORE_FAILED', get_class($this), \JText::_('JLIB_DATABASE_ERROR_MENUTYPE_CHECKOUT'))
+				);
+
+				return false;
+			}
+
+			// Update the menu items
+			$query->clear()
+				->update('#__menu')
+				->set('menutype=' . $this->_db->quote($this->menutype))
+				->where('menutype=' . $this->_db->quote($table->menutype));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+
+			// Update the module items
+			$query->clear()
+				->update('#__modules')
+				->set(
+				'params=REPLACE(params,' . $this->_db->quote('"menutype":' . json_encode($table->menutype)) . ',' .
+				$this->_db->quote('"menutype":' . json_encode($this->menutype)) . ')'
+			);
+			$query->where('module=' . $this->_db->quote('mod_menu'))
+				->where('params LIKE ' . $this->_db->quote('%"menutype":' . json_encode($table->menutype) . '%'));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+		}
+
+		return parent::store($updateNulls);
+	}
+
+	/**
+	 * Method to delete a row from the database table by primary key value.
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.6
+	 */
+	public function delete($pk = null)
+	{
+		$k = $this->_tbl_key;
+		$pk = $pk === null ? $this->$k : $pk;
+
+		// If no primary key is given, return false.
+		if ($pk !== null)
+		{
+			// Get the user id
+			$userId = \JFactory::getUser()->id;
+
+			// Get the old value of the table
+			$table = Table::getInstance('Menutype', 'JTable', array('dbo' => $this->getDbo()));
+			$table->load($pk);
+
+			// Verify that no items are checked out
+			$query = $this->_db->getQuery(true)
+				->select('id')
+				->from('#__menu')
+				->where('menutype=' . $this->_db->quote($table->menutype))
+				->where('(checked_out NOT IN (0,' . (int) $userId . ') OR home=1 AND language=' . $this->_db->quote('*') . ')');
+			$this->_db->setQuery($query);
+
+			if ($this->_db->loadRowList())
+			{
+				$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_DELETE_FAILED', get_class($this), \JText::_('JLIB_DATABASE_ERROR_MENUTYPE')));
+
+				return false;
+			}
+
+			// Verify that no module for this menu are checked out
+			$query->clear()
+				->select('id')
+				->from('#__modules')
+				->where('module=' . $this->_db->quote('mod_menu'))
+				->where('params LIKE ' . $this->_db->quote('%"menutype":' . json_encode($table->menutype) . '%'))
+				->where('checked_out !=' . (int) $userId)
+				->where('checked_out !=0');
+			$this->_db->setQuery($query);
+
+			if ($this->_db->loadRowList())
+			{
+				$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_DELETE_FAILED', get_class($this), \JText::_('JLIB_DATABASE_ERROR_MENUTYPE')));
+
+				return false;
+			}
+
+			// Delete the menu items
+			$query->clear()
+				->delete('#__menu')
+				->where('menutype=' . $this->_db->quote($table->menutype));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+
+			// Update the module items
+			$query->clear()
+				->delete('#__modules')
+				->where('module=' . $this->_db->quote('mod_menu'))
+				->where('params LIKE ' . $this->_db->quote('%"menutype":' . json_encode($table->menutype) . '%'));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+		}
+
+		return parent::delete($pk);
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.6
+	 */
+	protected function _getAssetName()
+	{
+		return 'com_menus.menu.' . $this->id;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.6
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Method to get the parent asset under which to register this one.
+	 * By default, all assets are registered to the ROOT node with ID,
+	 * which will default to 1 if none exists.
+	 * The extended class can define a table and id to lookup.  If the
+	 * asset does not exist it will be created.
+	 *
+	 * @param   Table    $table  A Table object for the asset parent.
+	 * @param   integer  $id     Id to look up
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.6
+	 */
+	protected function _getAssetParentId(Table $table = null, $id = null)
+	{
+		$assetId = null;
+		$asset = Table::getInstance('asset');
+
+		if ($asset->loadByName('com_menus'))
+		{
+			$assetId = $asset->id;
+		}
+
+		return $assetId === null ? parent::_getAssetParentId($table, $id) : $assetId;
+	}
+}
diff --git a/core/libraries/src/Table/Module.php b/core/libraries/src/Table/Module.php
new file mode 100644
index 00000000..49c31c82
--- /dev/null
+++ b/core/libraries/src/Table/Module.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Rules;
+use Joomla\Registry\Registry;
+
+/**
+ * Module table
+ *
+ * @since  1.5
+ */
+class Module extends Table
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(\JDatabaseDriver $db)
+	{
+		parent::__construct('#__modules', 'id', $db);
+
+		$this->access = (int) \JFactory::getConfig()->get('access');
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	protected function _getAssetName()
+	{
+		$k = $this->_tbl_key;
+
+		return 'com_modules.module.' . (int) $this->$k;
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->title;
+	}
+
+	/**
+	 * Method to get the parent asset id for the record
+	 *
+	 * @param   Table    $table  A Table object (optional) for the asset parent
+	 * @param   integer  $id     The id (optional) of the content.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.2
+	 */
+	protected function _getAssetParentId(Table $table = null, $id = null)
+	{
+		$assetId = null;
+
+		// This is a module that needs to parent with the extension.
+		if ($assetId === null)
+		{
+			// Build the query to get the asset id of the parent component.
+			$query = $this->_db->getQuery(true)
+				->select($this->_db->quoteName('id'))
+				->from($this->_db->quoteName('#__assets'))
+				->where($this->_db->quoteName('name') . ' = ' . $this->_db->quote('com_modules'));
+
+			// Get the asset id from the database.
+			$this->_db->setQuery($query);
+
+			if ($result = $this->_db->loadResult())
+			{
+				$assetId = (int) $result;
+			}
+		}
+
+		// Return the asset id.
+		if ($assetId)
+		{
+			return $assetId;
+		}
+		else
+		{
+			return parent::_getAssetParentId($table, $id);
+		}
+	}
+
+	/**
+	 * Overloaded check function.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @see     Table::check()
+	 * @since   1.5
+	 */
+	public function check()
+	{
+		// Check for valid name
+		if (trim($this->title) === '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_MODULE'));
+
+			return false;
+		}
+
+		// Check the publish down date is not earlier than publish up.
+		if ((int) $this->publish_down > 0 && $this->publish_down < $this->publish_up)
+		{
+			// Swap the dates.
+			$temp = $this->publish_up;
+			$this->publish_up = $this->publish_down;
+			$this->publish_down = $temp;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded bind function.
+	 *
+	 * @param   array  $array   Named array.
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @see     Table::bind()
+	 * @since   1.5
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		// Bind the rules.
+		if (isset($array['rules']) && is_array($array['rules']))
+		{
+			$rules = new Rules($array['rules']);
+			$this->setRules($rules);
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Stores a module.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   3.7.0
+	 */
+	public function store($updateNulls = false)
+	{
+		// Set publish_up, publish_down and checked_out_time to null date if not set
+		if (!$this->publish_up)
+		{
+			$this->publish_up = $this->_db->getNullDate();
+		}
+
+		if (!$this->publish_down)
+		{
+			$this->publish_down = $this->_db->getNullDate();
+		}
+
+		return parent::store($updateNulls);
+	}
+}
diff --git a/core/libraries/src/Table/Nested.php b/core/libraries/src/Table/Nested.php
new file mode 100644
index 00000000..b29417cf
--- /dev/null
+++ b/core/libraries/src/Table/Nested.php
@@ -0,0 +1,1794 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Table class supporting modified pre-order tree traversal behavior.
+ *
+ * @since  11.1
+ */
+class Nested extends Table
+{
+	/**
+	 * Object property holding the primary key of the parent node.  Provides adjacency list data for nodes.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $parent_id;
+
+	/**
+	 * Object property holding the depth level of the node in the tree.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $level;
+
+	/**
+	 * Object property holding the left value of the node for managing its placement in the nested sets tree.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $lft;
+
+	/**
+	 * Object property holding the right value of the node for managing its placement in the nested sets tree.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $rgt;
+
+	/**
+	 * Object property holding the alias of this node used to constuct the full text path, forward-slash delimited.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $alias;
+
+	/**
+	 * Object property to hold the location type to use when storing the row.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 * @see    Nested::$_validLocations
+	 */
+	protected $_location;
+
+	/**
+	 * Object property to hold the primary key of the location reference node to use when storing the row.
+	 *
+	 * A combination of location type and reference node describes where to store the current node in the tree.
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $_location_id;
+
+	/**
+	 * An array to cache values in recursive processes.
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_cache = array();
+
+	/**
+	 * Debug level
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	protected $_debug = 0;
+
+	/**
+	 * Cache for the root ID
+	 *
+	 * @var    integer
+	 * @since  3.3
+	 */
+	protected static $root_id = 0;
+
+	/**
+	 * Array declaring the valid location values for moving a node
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	private $_validLocations = array('before', 'after', 'first-child', 'last-child');
+
+	/**
+	 * Sets the debug level on or off
+	 *
+	 * @param   integer  $level  0 = off, 1 = on
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function debug($level)
+	{
+		$this->_debug = (int) $level;
+	}
+
+	/**
+	 * Method to get an array of nodes from a given node to its root.
+	 *
+	 * @param   integer  $pk          Primary key of the node for which to get the path.
+	 * @param   boolean  $diagnostic  Only select diagnostic data for the nested sets.
+	 *
+	 * @return  mixed    An array of node objects including the start node.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error
+	 */
+	public function getPath($pk = null, $diagnostic = false)
+	{
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Get the path from the node to the root.
+		$select = ($diagnostic) ? 'p.' . $k . ', p.parent_id, p.level, p.lft, p.rgt' : 'p.*';
+		$query = $this->_db->getQuery(true)
+			->select($select)
+			->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
+			->where('n.lft BETWEEN p.lft AND p.rgt')
+			->where('n.' . $k . ' = ' . (int) $pk)
+			->order('p.lft');
+
+		$this->_db->setQuery($query);
+
+		return $this->_db->loadObjectList();
+	}
+
+	/**
+	 * Method to get a node and all its child nodes.
+	 *
+	 * @param   integer  $pk          Primary key of the node for which to get the tree.
+	 * @param   boolean  $diagnostic  Only select diagnostic data for the nested sets.
+	 *
+	 * @return  mixed    Boolean false on failure or array of node objects on success.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function getTree($pk = null, $diagnostic = false)
+	{
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Get the node and children as a tree.
+		$select = ($diagnostic) ? 'n.' . $k . ', n.parent_id, n.level, n.lft, n.rgt' : 'n.*';
+		$query = $this->_db->getQuery(true)
+			->select($select)
+			->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
+			->where('n.lft BETWEEN p.lft AND p.rgt')
+			->where('p.' . $k . ' = ' . (int) $pk)
+			->order('n.lft');
+
+		return $this->_db->setQuery($query)->loadObjectList();
+	}
+
+	/**
+	 * Method to determine if a node is a leaf node in the tree (has no children).
+	 *
+	 * @param   integer  $pk  Primary key of the node to check.
+	 *
+	 * @return  boolean  True if a leaf node, false if not or null if the node does not exist.
+	 *
+	 * @note    Since 12.1 this method returns null if the node does not exist.
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function isLeaf($pk = null)
+	{
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+		$node = $this->_getNode($pk);
+
+		// Get the node by primary key.
+		if (empty($node))
+		{
+			// Error message set in getNode method.
+			return;
+		}
+
+		// The node is a leaf node.
+		return ($node->rgt - $node->lft) == 1;
+	}
+
+	/**
+	 * Method to set the location of a node in the tree object.  This method does not
+	 * save the new location to the database, but will set it in the object so
+	 * that when the node is stored it will be stored in the new location.
+	 *
+	 * @param   integer  $referenceId  The primary key of the node to reference new location by.
+	 * @param   string   $position     Location type string.
+	 *
+	 * @return  void
+	 *
+	 * @note    Since 12.1 this method returns void and throws an \InvalidArgumentException when an invalid position is passed.
+	 * @see     Nested::$_validLocations
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function setLocation($referenceId, $position = 'after')
+	{
+		// Make sure the location is valid.
+		if (!in_array($position, $this->_validLocations))
+		{
+			throw new \InvalidArgumentException(
+				sprintf('Invalid location "%1$s" given, valid values are %2$s', $position, implode(', ', $this->_validLocations))
+			);
+		}
+
+		// Set the location properties.
+		$this->_location = $position;
+		$this->_location_id = $referenceId;
+	}
+
+	/**
+	 * Method to move a row in the ordering sequence of a group of rows defined by an SQL WHERE clause.
+	 * Negative numbers move the row up in the sequence and positive numbers move it down.
+	 *
+	 * @param   integer  $delta  The direction and magnitude to move the row in the ordering sequence.
+	 * @param   string   $where  WHERE clause to use for limiting the selection of rows to compact the
+	 *                           ordering values.
+	 *
+	 * @return  mixed    Boolean true on success.
+	 *
+	 * @since   11.1
+	 */
+	public function move($delta, $where = '')
+	{
+		$k = $this->_tbl_key;
+		$pk = $this->$k;
+
+		$query = $this->_db->getQuery(true)
+			->select($k)
+			->from($this->_tbl)
+			->where('parent_id = ' . $this->parent_id);
+
+		if ($where)
+		{
+			$query->where($where);
+		}
+
+		if ($delta > 0)
+		{
+			$query->where('rgt > ' . $this->rgt)
+				->order('rgt ASC');
+			$position = 'after';
+		}
+		else
+		{
+			$query->where('lft < ' . $this->lft)
+				->order('lft DESC');
+			$position = 'before';
+		}
+
+		$this->_db->setQuery($query);
+		$referenceId = $this->_db->loadResult();
+
+		if ($referenceId)
+		{
+			return $this->moveByReference($referenceId, $position, $pk);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to move a node and its children to a new location in the tree.
+	 *
+	 * @param   integer  $referenceId      The primary key of the node to reference new location by.
+	 * @param   string   $position         Location type string. ['before', 'after', 'first-child', 'last-child']
+	 * @param   integer  $pk               The primary key of the node to move.
+	 * @param   boolean  $recursiveUpdate  Flag indicate that method recursiveUpdatePublishedColumn should be call.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function moveByReference($referenceId, $position = 'after', $pk = null, $recursiveUpdate = true)
+	{
+		if ($this->_debug)
+		{
+			echo "\nMoving ReferenceId:$referenceId, Position:$position, PK:$pk";
+		}
+
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Get the node by id.
+		if (!$node = $this->_getNode($pk))
+		{
+			// Error message set in getNode method.
+			return false;
+		}
+
+		// Get the ids of child nodes.
+		$query = $this->_db->getQuery(true)
+			->select($k)
+			->from($this->_tbl)
+			->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+
+		$children = $this->_db->setQuery($query)->loadColumn();
+
+		if ($this->_debug)
+		{
+			$this->_logtable(false);
+		}
+
+		// Cannot move the node to be a child of itself.
+		if (in_array($referenceId, $children))
+		{
+			$this->setError(
+				new \UnexpectedValueException(
+					sprintf('%1$s::moveByReference() is trying to make record ID %2$d a child of itself.', get_class($this), $pk)
+				)
+			);
+
+			return false;
+		}
+
+		// Lock the table for writing.
+		if (!$this->_lock())
+		{
+			return false;
+		}
+
+		/*
+		 * Move the sub-tree out of the nested sets by negating its left and right values.
+		 */
+		$query->clear()
+			->update($this->_tbl)
+			->set('lft = lft * (-1), rgt = rgt * (-1)')
+			->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+		$this->_db->setQuery($query);
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+
+		/*
+		 * Close the hole in the tree that was opened by removing the sub-tree from the nested sets.
+		 */
+		// Compress the left values.
+		$query->clear()
+			->update($this->_tbl)
+			->set('lft = lft - ' . (int) $node->width)
+			->where('lft > ' . (int) $node->rgt);
+		$this->_db->setQuery($query);
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+
+		// Compress the right values.
+		$query->clear()
+			->update($this->_tbl)
+			->set('rgt = rgt - ' . (int) $node->width)
+			->where('rgt > ' . (int) $node->rgt);
+		$this->_db->setQuery($query);
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+
+		// We are moving the tree relative to a reference node.
+		if ($referenceId)
+		{
+			// Get the reference node by primary key.
+			if (!$reference = $this->_getNode($referenceId))
+			{
+				// Error message set in getNode method.
+				$this->_unlock();
+
+				return false;
+			}
+
+			// Get the reposition data for shifting the tree and re-inserting the node.
+			if (!$repositionData = $this->_getTreeRepositionData($reference, $node->width, $position))
+			{
+				// Error message set in getNode method.
+				$this->_unlock();
+
+				return false;
+			}
+		}
+		// We are moving the tree to be the last child of the root node
+		else
+		{
+			// Get the last root node as the reference node.
+			$query->clear()
+				->select($this->_tbl_key . ', parent_id, level, lft, rgt')
+				->from($this->_tbl)
+				->where('parent_id = 0')
+				->order('lft DESC');
+			$this->_db->setQuery($query, 0, 1);
+			$reference = $this->_db->loadObject();
+
+			if ($this->_debug)
+			{
+				$this->_logtable(false);
+			}
+
+			// Get the reposition data for re-inserting the node after the found root.
+			if (!$repositionData = $this->_getTreeRepositionData($reference, $node->width, 'last-child'))
+			{
+				// Error message set in getNode method.
+				$this->_unlock();
+
+				return false;
+			}
+		}
+
+		/*
+		 * Create space in the nested sets at the new location for the moved sub-tree.
+		 */
+
+		// Shift left values.
+		$query->clear()
+			->update($this->_tbl)
+			->set('lft = lft + ' . (int) $node->width)
+			->where($repositionData->left_where);
+		$this->_db->setQuery($query);
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+
+		// Shift right values.
+		$query->clear()
+			->update($this->_tbl)
+			->set('rgt = rgt + ' . (int) $node->width)
+			->where($repositionData->right_where);
+		$this->_db->setQuery($query);
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+
+		/*
+		 * Calculate the offset between where the node used to be in the tree and
+		 * where it needs to be in the tree for left ids (also works for right ids).
+		 */
+		$offset = $repositionData->new_lft - $node->lft;
+		$levelOffset = $repositionData->new_level - $node->level;
+
+		// Move the nodes back into position in the tree using the calculated offsets.
+		$query->clear()
+			->update($this->_tbl)
+			->set('rgt = ' . (int) $offset . ' - rgt')
+			->set('lft = ' . (int) $offset . ' - lft')
+			->set('level = level + ' . (int) $levelOffset)
+			->where('lft < 0');
+		$this->_db->setQuery($query);
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+
+		// Set the correct parent id for the moved node if required.
+		if ($node->parent_id != $repositionData->new_parent_id)
+		{
+			$query = $this->_db->getQuery(true)
+				->update($this->_tbl);
+
+			// Update the title and alias fields if they exist for the table.
+			$fields = $this->getFields();
+
+			if (property_exists($this, 'title') && $this->title !== null)
+			{
+				$query->set('title = ' . $this->_db->quote($this->title));
+			}
+
+			if (array_key_exists('alias', $fields)  && $this->alias !== null)
+			{
+				$query->set('alias = ' . $this->_db->quote($this->alias));
+			}
+
+			$query->set('parent_id = ' . (int) $repositionData->new_parent_id)
+				->where($this->_tbl_key . ' = ' . (int) $node->$k);
+			$this->_db->setQuery($query);
+
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_MOVE_FAILED');
+		}
+
+		// Unlock the table for writing.
+		$this->_unlock();
+
+		if (property_exists($this, 'published') && $recursiveUpdate)
+		{
+			$this->recursiveUpdatePublishedColumn($node->$k);
+		}
+
+		// Set the object values.
+		$this->parent_id = $repositionData->new_parent_id;
+		$this->level = $repositionData->new_level;
+		$this->lft = $repositionData->new_lft;
+		$this->rgt = $repositionData->new_rgt;
+
+		return true;
+	}
+
+	/**
+	 * Method to delete a node and, optionally, its child nodes from the table.
+	 *
+	 * @param   integer  $pk        The primary key of the node to delete.
+	 * @param   boolean  $children  True to delete child nodes, false to move them up a level.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function delete($pk = null, $children = true)
+	{
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Implement \JObservableInterface: Pre-processing by observers
+		$this->_observers->update('onBeforeDelete', array($pk));
+
+		// Lock the table for writing.
+		if (!$this->_lock())
+		{
+			// Error message set in lock method.
+			return false;
+		}
+
+		// If tracking assets, remove the asset first.
+		if ($this->_trackAssets)
+		{
+			$name = $this->_getAssetName();
+			$asset = Table::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
+
+			// Lock the table for writing.
+			if (!$asset->_lock())
+			{
+				// Error message set in lock method.
+				return false;
+			}
+
+			if ($asset->loadByName($name))
+			{
+				// Delete the node in assets table.
+				if (!$asset->delete(null, $children))
+				{
+					$this->setError($asset->getError());
+					$asset->_unlock();
+
+					return false;
+				}
+
+				$asset->_unlock();
+			}
+			else
+			{
+				$this->setError($asset->getError());
+				$asset->_unlock();
+
+				return false;
+			}
+		}
+
+		// Get the node by id.
+		$node = $this->_getNode($pk);
+
+		if (empty($node))
+		{
+			// Error message set in getNode method.
+			$this->_unlock();
+
+			return false;
+		}
+
+		$query = $this->_db->getQuery(true);
+
+		// Should we delete all children along with the node?
+		if ($children)
+		{
+			// Delete the node and all of its children.
+			$query->clear()
+				->delete($this->_tbl)
+				->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+
+			// Compress the left values.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft - ' . (int) $node->width)
+				->where('lft > ' . (int) $node->rgt);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+
+			// Compress the right values.
+			$query->clear()
+				->update($this->_tbl)
+				->set('rgt = rgt - ' . (int) $node->width)
+				->where('rgt > ' . (int) $node->rgt);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+		}
+		// Leave the children and move them up a level.
+		else
+		{
+			// Delete the node.
+			$query->clear()
+				->delete($this->_tbl)
+				->where('lft = ' . (int) $node->lft);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+
+			// Shift all node's children up a level.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft - 1')
+				->set('rgt = rgt - 1')
+				->set('level = level - 1')
+				->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+
+			// Adjust all the parent values for direct children of the deleted node.
+			$query->clear()
+				->update($this->_tbl)
+				->set('parent_id = ' . (int) $node->parent_id)
+				->where('parent_id = ' . (int) $node->$k);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+
+			// Shift all of the left values that are right of the node.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft - 2')
+				->where('lft > ' . (int) $node->rgt);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+
+			// Shift all of the right values that are right of the node.
+			$query->clear()
+				->update($this->_tbl)
+				->set('rgt = rgt - 2')
+				->where('rgt > ' . (int) $node->rgt);
+			$this->_runQuery($query, 'JLIB_DATABASE_ERROR_DELETE_FAILED');
+		}
+
+		// Unlock the table for writing.
+		$this->_unlock();
+
+		// Implement \JObservableInterface: Post-processing by observers
+		$this->_observers->update('onAfterDelete', array($pk));
+
+		return true;
+	}
+
+	/**
+	 * Checks that the object is valid and able to be stored.
+	 *
+	 * This method checks that the parent_id is non-zero and exists in the database.
+	 * Note that the root node (parent_id = 0) cannot be manipulated with this class.
+	 *
+	 * @return  boolean  True if all checks pass.
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		$this->parent_id = (int) $this->parent_id;
+
+		// Set up a mini exception handler.
+		try
+		{
+			// Check that the parent_id field is valid.
+			if ($this->parent_id == 0)
+			{
+				throw new \UnexpectedValueException(sprintf('Invalid `parent_id` [%1$d] in %2$s::check()', $this->parent_id, get_class($this)));
+			}
+
+			$query = $this->_db->getQuery(true)
+				->select('1')
+				->from($this->_tbl)
+				->where($this->_tbl_key . ' = ' . $this->parent_id);
+
+			if (!$this->_db->setQuery($query)->loadResult())
+			{
+				throw new \UnexpectedValueException(sprintf('Invalid `parent_id` [%1$d] in %2$s::check()', $this->parent_id, get_class($this)));
+			}
+		}
+		catch (\UnexpectedValueException $e)
+		{
+			// Validation error - record it and return false.
+			$this->setError($e);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to store a node in the database table.
+	 *
+	 * @param   boolean  $updateNulls  True to update null values as well.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function store($updateNulls = false)
+	{
+		$k = $this->_tbl_key;
+
+		// Implement \JObservableInterface: Pre-processing by observers
+		// 2.5 upgrade issue - check if property_exists before executing
+		if (property_exists($this, '_observers'))
+		{
+			$this->_observers->update('onBeforeStore', array($updateNulls, $k));
+		}
+
+		if ($this->_debug)
+		{
+			echo "\n" . get_class($this) . "::store\n";
+			$this->_logtable(true, false);
+		}
+
+		/*
+		 * If the primary key is empty, then we assume we are inserting a new node into the
+		 * tree.  From this point we would need to determine where in the tree to insert it.
+		 */
+		if (empty($this->$k))
+		{
+			/*
+			 * We are inserting a node somewhere in the tree with a known reference
+			 * node.  We have to make room for the new node and set the left and right
+			 * values before we insert the row.
+			 */
+			if ($this->_location_id >= 0)
+			{
+				// Lock the table for writing.
+				if (!$this->_lock())
+				{
+					// Error message set in lock method.
+					return false;
+				}
+
+				// We are inserting a node relative to the last root node.
+				if ($this->_location_id == 0)
+				{
+					// Get the last root node as the reference node.
+					$query = $this->_db->getQuery(true)
+						->select($this->_tbl_key . ', parent_id, level, lft, rgt')
+						->from($this->_tbl)
+						->where('parent_id = 0')
+						->order('lft DESC');
+					$this->_db->setQuery($query, 0, 1);
+					$reference = $this->_db->loadObject();
+
+					if ($this->_debug)
+					{
+						$this->_logtable(false);
+					}
+				}
+				// We have a real node set as a location reference.
+				else
+				{
+					// Get the reference node by primary key.
+					if (!$reference = $this->_getNode($this->_location_id))
+					{
+						// Error message set in getNode method.
+						$this->_unlock();
+
+						return false;
+					}
+				}
+
+				// Get the reposition data for shifting the tree and re-inserting the node.
+				if (!($repositionData = $this->_getTreeRepositionData($reference, 2, $this->_location)))
+				{
+					// Error message set in getNode method.
+					$this->_unlock();
+
+					return false;
+				}
+
+				// Create space in the tree at the new location for the new node in left ids.
+				$query = $this->_db->getQuery(true)
+					->update($this->_tbl)
+					->set('lft = lft + 2')
+					->where($repositionData->left_where);
+				$this->_runQuery($query, 'JLIB_DATABASE_ERROR_STORE_FAILED');
+
+				// Create space in the tree at the new location for the new node in right ids.
+				$query->clear()
+					->update($this->_tbl)
+					->set('rgt = rgt + 2')
+					->where($repositionData->right_where);
+				$this->_runQuery($query, 'JLIB_DATABASE_ERROR_STORE_FAILED');
+
+				// Set the object values.
+				$this->parent_id = $repositionData->new_parent_id;
+				$this->level = $repositionData->new_level;
+				$this->lft = $repositionData->new_lft;
+				$this->rgt = $repositionData->new_rgt;
+			}
+			else
+			{
+				// Negative parent ids are invalid
+				$e = new \UnexpectedValueException(sprintf('%s::store() used a negative _location_id', get_class($this)));
+				$this->setError($e);
+
+				return false;
+			}
+		}
+		/*
+		 * If we have a given primary key then we assume we are simply updating this
+		 * node in the tree.  We should assess whether or not we are moving the node
+		 * or just updating its data fields.
+		 */
+		else
+		{
+			// If the location has been set, move the node to its new location.
+			if ($this->_location_id > 0)
+			{
+				// Skip recursiveUpdatePublishedColumn method, it will be called later.
+				if (!$this->moveByReference($this->_location_id, $this->_location, $this->$k, false))
+				{
+					// Error message set in move method.
+					return false;
+				}
+			}
+
+			// Lock the table for writing.
+			if (!$this->_lock())
+			{
+				// Error message set in lock method.
+				return false;
+			}
+		}
+
+		// Implement \JObservableInterface: We do not want parent::store to update observers,
+		// since tables are locked and we are updating it from this level of store():
+
+		// 2.5 upgrade issue - check if property_exists before executing
+		if (property_exists($this, '_observers'))
+		{
+			$oldCallObservers = $this->_observers->doCallObservers(false);
+		}
+
+		$result = parent::store($updateNulls);
+
+		// Implement \JObservableInterface: Restore previous callable observers state:
+		// 2.5 upgrade issue - check if property_exists before executing
+		if (property_exists($this, '_observers'))
+		{
+			$this->_observers->doCallObservers($oldCallObservers);
+		}
+
+		if ($result)
+		{
+			if ($this->_debug)
+			{
+				$this->_logtable();
+			}
+		}
+
+		// Unlock the table for writing.
+		$this->_unlock();
+
+		if (property_exists($this, 'published'))
+		{
+			$this->recursiveUpdatePublishedColumn($this->$k);
+		}
+
+		// Implement \JObservableInterface: Post-processing by observers
+		// 2.5 upgrade issue - check if property_exists before executing
+		if (property_exists($this, '_observers'))
+		{
+			$this->_observers->update('onAfterStore', array(&$result));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to set the publishing state for a node or list of nodes in the database
+	 * table.  The method respects rows checked out by other users and will attempt
+	 * to checkin rows that it can after adjustments are made. The method will not
+	 * allow you to set a publishing state higher than any ancestor node and will
+	 * not allow you to set a publishing state on a node with a checked out child.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not
+	 *                            set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		$k = $this->_tbl_key;
+
+		$query     = $this->_db->getQuery(true);
+		$table     = $this->_db->quoteName($this->_tbl);
+		$published = $this->_db->quoteName($this->getColumnAlias('published'));
+		$key       = $this->_db->quoteName($k);
+
+		// Sanitize input.
+		$pks    = ArrayHelper::toInteger($pks);
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		// If $state > 1, then we allow state changes even if an ancestor has lower state
+		// (for example, can change a child state to Archived (2) if an ancestor is Published (1)
+		$compareState = ($state > 1) ? 1 : $state;
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			if ($this->$k)
+			{
+				$pks = explode(',', $this->$k);
+			}
+			// Nothing to set publishing state on, return false.
+			else
+			{
+				$e = new \UnexpectedValueException(sprintf('%s::publish(%s, %d, %d) empty.', get_class($this), $pks[0], $state, $userId));
+				$this->setError($e);
+
+				return false;
+			}
+		}
+
+		// Determine if there is checkout support for the table.
+		$checkoutSupport = (property_exists($this, 'checked_out') || property_exists($this, 'checked_out_time'));
+
+		// Iterate over the primary keys to execute the publish action if possible.
+		foreach ($pks as $pk)
+		{
+			// Get the node by primary key.
+			if (!$node = $this->_getNode($pk))
+			{
+				// Error message set in getNode method.
+				return false;
+			}
+
+			// If the table has checkout support, verify no children are checked out.
+			if ($checkoutSupport)
+			{
+				// Ensure that children are not checked out.
+				$query->clear()
+					->select('COUNT(' . $k . ')')
+					->from($this->_tbl)
+					->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt)
+					->where('(checked_out <> 0 AND checked_out <> ' . (int) $userId . ')');
+				$this->_db->setQuery($query);
+
+				// Check for checked out children.
+				if ($this->_db->loadResult())
+				{
+					// TODO Convert to a conflict exception when available.
+					$e = new \RuntimeException(sprintf('%s::publish(%s, %d, %d) checked-out conflict.', get_class($this), $pks[0], $state, $userId));
+
+					$this->setError($e);
+
+					return false;
+				}
+			}
+
+			// If any parent nodes have lower published state values, we cannot continue.
+			if ($node->parent_id)
+			{
+				// Get any ancestor nodes that have a lower publishing state.
+				$query->clear()
+					->select('1')
+					->from($table)
+					->where('lft < ' . (int) $node->lft)
+					->where('rgt > ' . (int) $node->rgt)
+					->where('parent_id > 0')
+					->where($published . ' < ' . (int) $compareState);
+
+				// Just fetch one row (one is one too many).
+				$this->_db->setQuery($query, 0, 1);
+
+				if ($this->_db->loadResult())
+				{
+					$e = new \UnexpectedValueException(
+						sprintf('%s::publish(%s, %d, %d) ancestors have lower state.', get_class($this), $pks[0], $state, $userId)
+					);
+					$this->setError($e);
+
+					return false;
+				}
+			}
+
+			$this->recursiveUpdatePublishedColumn($pk, $state);
+
+			// If checkout support exists for the object, check the row in.
+			if ($checkoutSupport)
+			{
+				$this->checkin($pk);
+			}
+		}
+
+		// If the Table instance value is in the list of primary keys that were set, set the instance.
+		if (in_array($this->$k, $pks))
+		{
+			$this->published = $state;
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+
+	/**
+	 * Method to move a node one position to the left in the same level.
+	 *
+	 * @param   integer  $pk  Primary key of the node to move.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function orderUp($pk)
+	{
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Lock the table for writing.
+		if (!$this->_lock())
+		{
+			// Error message set in lock method.
+			return false;
+		}
+
+		// Get the node by primary key.
+		$node = $this->_getNode($pk);
+
+		if (empty($node))
+		{
+			// Error message set in getNode method.
+			$this->_unlock();
+
+			return false;
+		}
+
+		// Get the left sibling node.
+		$sibling = $this->_getNode($node->lft - 1, 'right');
+
+		if (empty($sibling))
+		{
+			// Error message set in getNode method.
+			$this->_unlock();
+
+			return false;
+		}
+
+		try
+		{
+			// Get the primary keys of child nodes.
+			$query = $this->_db->getQuery(true)
+				->select($this->_tbl_key)
+				->from($this->_tbl)
+				->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+
+			$children = $this->_db->setQuery($query)->loadColumn();
+
+			// Shift left and right values for the node and its children.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft - ' . (int) $sibling->width)
+				->set('rgt = rgt - ' . (int) $sibling->width)
+				->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+			$this->_db->setQuery($query)->execute();
+
+			// Shift left and right values for the sibling and its children.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft + ' . (int) $node->width)
+				->set('rgt = rgt + ' . (int) $node->width)
+				->where('lft BETWEEN ' . (int) $sibling->lft . ' AND ' . (int) $sibling->rgt)
+				->where($this->_tbl_key . ' NOT IN (' . implode(',', $children) . ')');
+			$this->_db->setQuery($query)->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->_unlock();
+			throw $e;
+		}
+
+		// Unlock the table for writing.
+		$this->_unlock();
+
+		return true;
+	}
+
+	/**
+	 * Method to move a node one position to the right in the same level.
+	 *
+	 * @param   integer  $pk  Primary key of the node to move.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function orderDown($pk)
+	{
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Lock the table for writing.
+		if (!$this->_lock())
+		{
+			// Error message set in lock method.
+			return false;
+		}
+
+		// Get the node by primary key.
+		$node = $this->_getNode($pk);
+
+		if (empty($node))
+		{
+			// Error message set in getNode method.
+			$this->_unlock();
+
+			return false;
+		}
+
+		$query = $this->_db->getQuery(true);
+
+		// Get the right sibling node.
+		$sibling = $this->_getNode($node->rgt + 1, 'left');
+
+		if (empty($sibling))
+		{
+			// Error message set in getNode method.
+			$query->_unlock($this->_db);
+			$this->_locked = false;
+
+			return false;
+		}
+
+		try
+		{
+			// Get the primary keys of child nodes.
+			$query->clear()
+				->select($this->_tbl_key)
+				->from($this->_tbl)
+				->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+			$this->_db->setQuery($query);
+			$children = $this->_db->loadColumn();
+
+			// Shift left and right values for the node and its children.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft + ' . (int) $sibling->width)
+				->set('rgt = rgt + ' . (int) $sibling->width)
+				->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
+			$this->_db->setQuery($query)->execute();
+
+			// Shift left and right values for the sibling and its children.
+			$query->clear()
+				->update($this->_tbl)
+				->set('lft = lft - ' . (int) $node->width)
+				->set('rgt = rgt - ' . (int) $node->width)
+				->where('lft BETWEEN ' . (int) $sibling->lft . ' AND ' . (int) $sibling->rgt)
+				->where($this->_tbl_key . ' NOT IN (' . implode(',', $children) . ')');
+			$this->_db->setQuery($query)->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->_unlock();
+			throw $e;
+		}
+
+		// Unlock the table for writing.
+		$this->_unlock();
+
+		return true;
+	}
+
+	/**
+	 * Gets the ID of the root item in the tree
+	 *
+	 * @return  mixed  The primary id of the root row, or false if not found and the internal error is set.
+	 *
+	 * @since   11.1
+	 */
+	public function getRootId()
+	{
+		if ((int) self::$root_id > 0)
+		{
+			return self::$root_id;
+		}
+
+		// Get the root item.
+		$k = $this->_tbl_key;
+
+		// Test for a unique record with parent_id = 0
+		$query = $this->_db->getQuery(true)
+			->select($k)
+			->from($this->_tbl)
+			->where('parent_id = 0');
+
+		$result = $this->_db->setQuery($query)->loadColumn();
+
+		if (count($result) == 1)
+		{
+			self::$root_id = $result[0];
+
+			return self::$root_id;
+		}
+
+		// Test for a unique record with lft = 0
+		$query->clear()
+			->select($k)
+			->from($this->_tbl)
+			->where('lft = 0');
+
+		$result = $this->_db->setQuery($query)->loadColumn();
+
+		if (count($result) == 1)
+		{
+			self::$root_id = $result[0];
+
+			return self::$root_id;
+		}
+
+		$fields = $this->getFields();
+
+		if (array_key_exists('alias', $fields))
+		{
+			// Test for a unique record alias = root
+			$query->clear()
+				->select($k)
+				->from($this->_tbl)
+				->where('alias = ' . $this->_db->quote('root'));
+
+			$result = $this->_db->setQuery($query)->loadColumn();
+
+			if (count($result) == 1)
+			{
+				self::$root_id = $result[0];
+
+				return self::$root_id;
+			}
+		}
+
+		$e = new \UnexpectedValueException(sprintf('%s::getRootId', get_class($this)));
+		$this->setError($e);
+		self::$root_id = false;
+
+		return false;
+	}
+
+	/**
+	 * Method to recursively rebuild the whole nested set tree.
+	 *
+	 * @param   integer  $parentId  The root of the tree to rebuild.
+	 * @param   integer  $leftId    The left id to start with in building the tree.
+	 * @param   integer  $level     The level to assign to the current nodes.
+	 * @param   string   $path      The path to the current nodes.
+	 *
+	 * @return  integer  1 + value of root rgt on success, false on failure
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = '')
+	{
+		// If no parent is provided, try to find it.
+		if ($parentId === null)
+		{
+			// Get the root item.
+			$parentId = $this->getRootId();
+
+			if ($parentId === false)
+			{
+				return false;
+			}
+		}
+
+		$query = $this->_db->getQuery(true);
+
+		// Build the structure of the recursive query.
+		if (!isset($this->_cache['rebuild.sql']))
+		{
+			$query->clear()
+				->select($this->_tbl_key . ', alias')
+				->from($this->_tbl)
+				->where('parent_id = %d');
+
+			// If the table has an ordering field, use that for ordering.
+			$orderingField = $this->getColumnAlias('ordering');
+
+			if (property_exists($this, $orderingField))
+			{
+				$query->order('parent_id, ' . $this->_db->quoteName($orderingField) . ', lft');
+			}
+			else
+			{
+				$query->order('parent_id, lft');
+			}
+
+			$this->_cache['rebuild.sql'] = (string) $query;
+		}
+
+		// Make a shortcut to database object.
+
+		// Assemble the query to find all children of this node.
+		$this->_db->setQuery(sprintf($this->_cache['rebuild.sql'], (int) $parentId));
+
+		$children = $this->_db->loadObjectList();
+
+		// The right value of this node is the left value + 1
+		$rightId = $leftId + 1;
+
+		// Execute this function recursively over all children
+		foreach ($children as $node)
+		{
+			/*
+			 * $rightId is the current right value, which is incremented on recursion return.
+			 * Increment the level for the children.
+			 * Add this item's alias to the path (but avoid a leading /)
+			 */
+			$rightId = $this->rebuild($node->{$this->_tbl_key}, $rightId, $level + 1, $path . (empty($path) ? '' : '/') . $node->alias);
+
+			// If there is an update failure, return false to break out of the recursion.
+			if ($rightId === false)
+			{
+				return false;
+			}
+		}
+
+		// We've got the left value, and now that we've processed
+		// the children of this node we also know the right value.
+		$query->clear()
+			->update($this->_tbl)
+			->set('lft = ' . (int) $leftId)
+			->set('rgt = ' . (int) $rightId)
+			->set('level = ' . (int) $level)
+			->set('path = ' . $this->_db->quote($path))
+			->where($this->_tbl_key . ' = ' . (int) $parentId);
+		$this->_db->setQuery($query)->execute();
+
+		// Return the right value of this node + 1.
+		return $rightId + 1;
+	}
+
+	/**
+	 * Method to rebuild the node's path field from the alias values of the nodes from the current node to the root node of the tree.
+	 *
+	 * @param   integer  $pk  Primary key of the node for which to get the path.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function rebuildPath($pk = null)
+	{
+		$fields = $this->getFields();
+
+		// If there is no alias or path field, just return true.
+		if (!array_key_exists('alias', $fields) || !array_key_exists('path', $fields))
+		{
+			return true;
+		}
+
+		$k = $this->_tbl_key;
+		$pk = (is_null($pk)) ? $this->$k : $pk;
+
+		// Get the aliases for the path from the node to the root node.
+		$query = $this->_db->getQuery(true)
+			->select('p.alias')
+			->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
+			->where('n.lft BETWEEN p.lft AND p.rgt')
+			->where('n.' . $this->_tbl_key . ' = ' . (int) $pk)
+			->order('p.lft');
+		$this->_db->setQuery($query);
+
+		$segments = $this->_db->loadColumn();
+
+		// Make sure to remove the root path if it exists in the list.
+		if ($segments[0] == 'root')
+		{
+			array_shift($segments);
+		}
+
+		// Build the path.
+		$path = trim(implode('/', $segments), ' /\\');
+
+		// Update the path field for the node.
+		$query->clear()
+			->update($this->_tbl)
+			->set('path = ' . $this->_db->quote($path))
+			->where($this->_tbl_key . ' = ' . (int) $pk);
+
+		$this->_db->setQuery($query)->execute();
+
+		// Update the current record's path to the new one:
+		$this->path = $path;
+
+		return true;
+	}
+
+	/**
+	 * Method to reset class properties to the defaults set in the class
+	 * definition. It will ignore the primary key as well as any private class
+	 * properties (except $_errors).
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2.1
+	 */
+	public function reset()
+	{
+		parent::reset();
+
+		// Reset the location properties.
+		$this->setLocation(0);
+	}
+
+	/**
+	 * Method to update order of table rows
+	 *
+	 * @param   array  $idArray    id numbers of rows to be reordered.
+	 * @param   array  $lft_array  lft values of rows to be reordered.
+	 *
+	 * @return  integer  1 + value of root rgt on success, false on failure.
+	 *
+	 * @since   11.1
+	 * @throws  \Exception on database error.
+	 */
+	public function saveorder($idArray = null, $lft_array = null)
+	{
+		try
+		{
+			$query = $this->_db->getQuery(true);
+
+			// Validate arguments
+			if (is_array($idArray) && is_array($lft_array) && count($idArray) == count($lft_array))
+			{
+				for ($i = 0, $count = count($idArray); $i < $count; $i++)
+				{
+					// Do an update to change the lft values in the table for each id
+					$query->clear()
+						->update($this->_tbl)
+						->where($this->_tbl_key . ' = ' . (int) $idArray[$i])
+						->set('lft = ' . (int) $lft_array[$i]);
+
+					$this->_db->setQuery($query)->execute();
+
+					if ($this->_debug)
+					{
+						$this->_logtable();
+					}
+				}
+
+				return $this->rebuild();
+			}
+			else
+			{
+				return false;
+			}
+		}
+		catch (\Exception $e)
+		{
+			$this->_unlock();
+			throw $e;
+		}
+	}
+
+	/**
+	 * Method to recursive update published column for children rows.
+	 *
+	 * @param   integer  $pk        Id number of row which published column was changed.
+	 * @param   integer  $newState  An optional value for published column of row identified by $pk.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.7.0
+	 * @throws  \RuntimeException on database error.
+	 */
+	protected function recursiveUpdatePublishedColumn($pk, $newState = null)
+	{
+		$query     = $this->_db->getQuery(true);
+		$table     = $this->_db->quoteName($this->_tbl);
+		$key       = $this->_db->quoteName($this->_tbl_key);
+		$published = $this->_db->quoteName($this->getColumnAlias('published'));
+
+		if ($newState !== null)
+		{
+			// Use a new published state in changed row.
+			$newState = "(CASE WHEN p2.$key = " . (int) $pk . " THEN " . (int) $newState . " ELSE p2.$published END)";
+		}
+		else
+		{
+			$newState = "p2.$published";
+		}
+
+		/**
+		 * We have to calculate the correct value for c2.published
+		 * based on p2.published and own c2.published column,
+		 * where (p2) is parent category is and (c2) current category
+		 *
+		 * p2.published <= c2.published AND p2.published > 0 THEN c2.published
+		 *            2 <=  2 THEN  2 (If archived in archived then archived)
+		 *            1 <=  2 THEN  2 (If archived in published then archived)
+		 *            1 <=  1 THEN  1 (If published in published then published)
+		 *
+		 * p2.published >  c2.published AND c2.published > 0 THEN p2.published
+		 *            2 >   1 THEN  2 (If published in archived then archived)
+		 *
+		 * p2.published >  c2.published THEN c2.published ELSE p2.published
+		 *            2 >  -2 THEN -2 (If trashed in archived then trashed)
+		 *            2 >   0 THEN  0 (If unpublished in archived then unpublished)
+		 *            1 >   0 THEN  0 (If unpublished in published then unpublished)
+		 *            0 >  -2 THEN -2 (If trashed in unpublished then trashed)
+		 * ELSE
+		 *            0 <=  2 THEN  0 (If archived in unpublished then unpublished)
+		 *            0 <=  1 THEN  0 (If published in unpublished then unpublished)
+		 *            0 <=  0 THEN  0 (If unpublished in unpublished then unpublished)
+		 *           -2 <= -2 THEN -2 (If trashed in trashed then trashed)
+		 *           -2 <=  0 THEN -2 (If unpublished in trashed then trashed)
+		 *           -2 <=  1 THEN -2 (If published in trashed then trashed)
+		 *           -2 <=  2 THEN -2 (If archived in trashed then trashed)
+		 */
+
+		// Find node and all children keys
+		$query->select("c.$key")
+			->from("$table AS node")
+			->leftJoin("$table AS c ON node.lft <= c.lft AND c.rgt <= node.rgt")
+			->where("node.$key = " . (int) $pk);
+
+		$pks = $this->_db->setQuery($query)->loadColumn();
+
+		// Prepare a list of correct published states.
+		$subquery = (string) $query->clear()
+			->select("c2.$key AS newId")
+			->select("CASE WHEN MIN($newState) > 0 THEN MAX($newState) ELSE MIN($newState) END AS newPublished")
+			->from("$table AS c2")
+			->innerJoin("$table AS p2 ON p2.lft <= c2.lft AND c2.rgt <= p2.rgt")
+			->where("c2.$key IN (" . implode(',', $pks) . ")")
+			->group("c2.$key");
+
+		// Update and cascade the publishing state.
+		$query->clear()
+			->update("$table AS c")
+			->innerJoin("($subquery) AS c2 ON c2.newId = c.$key")
+			->set("$published = c2.newPublished")
+			->where("c.$key IN (" . implode(',', $pks) . ")");
+
+		$this->_runQuery($query, 'JLIB_DATABASE_ERROR_STORE_FAILED');
+
+		return true;
+	}
+
+	/**
+	 * Method to get nested set properties for a node in the tree.
+	 *
+	 * @param   integer  $id   Value to look up the node by.
+	 * @param   string   $key  An optional key to look up the node by (parent | left | right).
+	 *                         If omitted, the primary key of the table is used.
+	 *
+	 * @return  mixed    Boolean false on failure or node object on success.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 */
+	protected function _getNode($id, $key = null)
+	{
+		// Determine which key to get the node base on.
+		switch ($key)
+		{
+			case 'parent':
+				$k = 'parent_id';
+				break;
+
+			case 'left':
+				$k = 'lft';
+				break;
+
+			case 'right':
+				$k = 'rgt';
+				break;
+
+			default:
+				$k = $this->_tbl_key;
+				break;
+		}
+
+		// Get the node data.
+		$query = $this->_db->getQuery(true)
+			->select($this->_tbl_key . ', parent_id, level, lft, rgt')
+			->from($this->_tbl)
+			->where($k . ' = ' . (int) $id);
+
+		$row = $this->_db->setQuery($query, 0, 1)->loadObject();
+
+		// Check for no $row returned
+		if (empty($row))
+		{
+			$e = new \UnexpectedValueException(sprintf('%s::_getNode(%d, %s) failed.', get_class($this), $id, $key));
+			$this->setError($e);
+
+			return false;
+		}
+
+		// Do some simple calculations.
+		$row->numChildren = (int) ($row->rgt - $row->lft - 1) / 2;
+		$row->width = (int) $row->rgt - $row->lft + 1;
+
+		return $row;
+	}
+
+	/**
+	 * Method to get various data necessary to make room in the tree at a location
+	 * for a node and its children.  The returned data object includes conditions
+	 * for SQL WHERE clauses for updating left and right id values to make room for
+	 * the node as well as the new left and right ids for the node.
+	 *
+	 * @param   object   $referenceNode  A node object with at least a 'lft' and 'rgt' with
+	 *                                   which to make room in the tree around for a new node.
+	 * @param   integer  $nodeWidth      The width of the node for which to make room in the tree.
+	 * @param   string   $position       The position relative to the reference node where the room
+	 *                                   should be made.
+	 *
+	 * @return  mixed    Boolean false on failure or data object on success.
+	 *
+	 * @since   11.1
+	 */
+	protected function _getTreeRepositionData($referenceNode, $nodeWidth, $position = 'before')
+	{
+		// Make sure the reference an object with a left and right id.
+		if (!is_object($referenceNode) || !(isset($referenceNode->lft) && isset($referenceNode->rgt)))
+		{
+			return false;
+		}
+
+		// A valid node cannot have a width less than 2.
+		if ($nodeWidth < 2)
+		{
+			return false;
+		}
+
+		$k = $this->_tbl_key;
+		$data = new \stdClass;
+
+		// Run the calculations and build the data object by reference position.
+		switch ($position)
+		{
+			case 'first-child':
+				$data->left_where = 'lft > ' . $referenceNode->lft;
+				$data->right_where = 'rgt >= ' . $referenceNode->lft;
+
+				$data->new_lft = $referenceNode->lft + 1;
+				$data->new_rgt = $referenceNode->lft + $nodeWidth;
+				$data->new_parent_id = $referenceNode->$k;
+				$data->new_level = $referenceNode->level + 1;
+				break;
+
+			case 'last-child':
+				$data->left_where = 'lft > ' . ($referenceNode->rgt);
+				$data->right_where = 'rgt >= ' . ($referenceNode->rgt);
+
+				$data->new_lft = $referenceNode->rgt;
+				$data->new_rgt = $referenceNode->rgt + $nodeWidth - 1;
+				$data->new_parent_id = $referenceNode->$k;
+				$data->new_level = $referenceNode->level + 1;
+				break;
+
+			case 'before':
+				$data->left_where = 'lft >= ' . $referenceNode->lft;
+				$data->right_where = 'rgt >= ' . $referenceNode->lft;
+
+				$data->new_lft = $referenceNode->lft;
+				$data->new_rgt = $referenceNode->lft + $nodeWidth - 1;
+				$data->new_parent_id = $referenceNode->parent_id;
+				$data->new_level = $referenceNode->level;
+				break;
+
+			default:
+			case 'after':
+				$data->left_where = 'lft > ' . $referenceNode->rgt;
+				$data->right_where = 'rgt > ' . $referenceNode->rgt;
+
+				$data->new_lft = $referenceNode->rgt + 1;
+				$data->new_rgt = $referenceNode->rgt + $nodeWidth;
+				$data->new_parent_id = $referenceNode->parent_id;
+				$data->new_level = $referenceNode->level;
+				break;
+		}
+
+		if ($this->_debug)
+		{
+			echo "\nRepositioning Data for $position" . "\n-----------------------------------" . "\nLeft Where:    $data->left_where"
+				. "\nRight Where:   $data->right_where" . "\nNew Lft:       $data->new_lft" . "\nNew Rgt:       $data->new_rgt"
+				. "\nNew Parent ID: $data->new_parent_id" . "\nNew Level:     $data->new_level" . "\n";
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to create a log table in the buffer optionally showing the query and/or data.
+	 *
+	 * @param   boolean  $showData   True to show data
+	 * @param   boolean  $showQuery  True to show query
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   11.1
+	 */
+	protected function _logtable($showData = true, $showQuery = true)
+	{
+		$sep = "\n" . str_pad('', 40, '-');
+		$buffer = '';
+
+		if ($showQuery)
+		{
+			$buffer .= "\n" . htmlspecialchars($this->_db->getQuery(), ENT_QUOTES, 'UTF-8') . $sep;
+		}
+
+		if ($showData)
+		{
+			$query = $this->_db->getQuery(true)
+				->select($this->_tbl_key . ', parent_id, lft, rgt, level')
+				->from($this->_tbl)
+				->order($this->_tbl_key);
+			$this->_db->setQuery($query);
+
+			$rows = $this->_db->loadRowList();
+			$buffer .= sprintf("\n| %4s | %4s | %4s | %4s |", $this->_tbl_key, 'par', 'lft', 'rgt');
+			$buffer .= $sep;
+
+			foreach ($rows as $row)
+			{
+				$buffer .= sprintf("\n| %4s | %4s | %4s | %4s |", $row[0], $row[1], $row[2], $row[3]);
+			}
+
+			$buffer .= $sep;
+		}
+
+		echo $buffer;
+	}
+
+	/**
+	 * Runs a query and unlocks the database on an error.
+	 *
+	 * @param   mixed   $query         A string or \JDatabaseQuery object.
+	 * @param   string  $errorMessage  Unused.
+	 *
+	 * @return  boolean  void
+	 *
+	 * @note    Since 12.1 this method returns void and will rethrow the database exception.
+	 * @since   11.1
+	 * @throws  \Exception on database error.
+	 */
+	protected function _runQuery($query, $errorMessage)
+	{
+		// Prepare to catch an exception.
+		try
+		{
+			$this->_db->setQuery($query)->execute();
+
+			if ($this->_debug)
+			{
+				$this->_logtable();
+			}
+		}
+		catch (\Exception $e)
+		{
+			// Unlock the tables and rethrow.
+			$this->_unlock();
+
+			throw $e;
+		}
+	}
+}
diff --git a/core/libraries/src/Table/Observer/AbstractObserver.php b/core/libraries/src/Table/Observer/AbstractObserver.php
new file mode 100644
index 00000000..8ecc4156
--- /dev/null
+++ b/core/libraries/src/Table/Observer/AbstractObserver.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table\Observer;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Table\TableInterface;
+use Joomla\CMS\Table\Table;
+
+/**
+ * Table class supporting modified pre-order tree traversal behavior.
+ *
+ * @since  3.1.2
+ */
+abstract class AbstractObserver implements \JObserverInterface
+{
+	/**
+	 * The observed table
+	 *
+	 * @var    Table
+	 * @since  3.1.2
+	 */
+	protected $table;
+
+	/**
+	 * Constructor: Associates to $table $this observer
+	 *
+	 * @param   TableInterface  $table  Table to be observed
+	 *
+	 * @since   3.1.2
+	 */
+	public function __construct(TableInterface $table)
+	{
+		$table->attachObserver($this);
+		$this->table = $table;
+	}
+
+	/**
+	 * Pre-processor for $table->load($keys, $reset)
+	 *
+	 * @param   mixed    $keys   An optional primary key value to load the row by, or an array of fields to match.  If not
+	 *                           set the instance property value is used.
+	 * @param   boolean  $reset  True to reset the default values before loading the new row.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onBeforeLoad($keys, $reset)
+	{
+	}
+
+	/**
+	 * Post-processor for $table->load($keys, $reset)
+	 *
+	 * @param   boolean  &$result  The result of the load
+	 * @param   array    $row      The loaded (and already binded to $this->table) row of the database table
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onAfterLoad(&$result, $row)
+	{
+	}
+
+	/**
+	 * Pre-processor for $table->store($updateNulls)
+	 *
+	 * @param   boolean  $updateNulls  The result of the load
+	 * @param   string   $tableKey     The key of the table
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onBeforeStore($updateNulls, $tableKey)
+	{
+	}
+
+	/**
+	 * Post-processor for $table->store($updateNulls)
+	 *
+	 * @param   boolean  &$result  The result of the store
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onAfterStore(&$result)
+	{
+	}
+
+	/**
+	 * Pre-processor for $table->delete($pk)
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 * @throws  \UnexpectedValueException
+	 */
+	public function onBeforeDelete($pk)
+	{
+	}
+
+	/**
+	 * Post-processor for $table->delete($pk)
+	 *
+	 * @param   mixed  $pk  The deleted primary key value.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onAfterDelete($pk)
+	{
+	}
+}
diff --git a/core/libraries/src/Table/Observer/ContentHistory.php b/core/libraries/src/Table/Observer/ContentHistory.php
new file mode 100644
index 00000000..3d1efe12
--- /dev/null
+++ b/core/libraries/src/Table/Observer/ContentHistory.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table\Observer;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Table class supporting modified pre-order tree traversal behavior.
+ *
+ * @since  3.2
+ */
+class ContentHistory extends AbstractObserver
+{
+	/**
+	 * Helper object for storing and deleting version history information associated with this table observer
+	 *
+	 * @var    \JHelperContenthistory
+	 * @since  3.2
+	 */
+	protected $contenthistoryHelper;
+
+	/**
+	 * The pattern for this table's TypeAlias
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $typeAliasPattern = null;
+
+	/**
+	 * Not public, so marking private and deprecated, but needed internally in parseTypeAlias for
+	 * PHP < 5.4.0 as it's not passing context $this to closure function.
+	 *
+	 * @var         ContentHistory
+	 * @since       3.2
+	 * @deprecated  Never use this
+	 * @private
+	 */
+	public static $_myTableForPregreplaceOnly;
+
+	/**
+	 * Creates the associated observer instance and attaches it to the $observableObject
+	 * Creates the associated content history helper class instance
+	 * $typeAlias can be of the form "{variableName}.type", automatically replacing {variableName} with table-instance variables variableName
+	 *
+	 * @param   \JObservableInterface  $observableObject  The subject object to be observed
+	 * @param   array                  $params            ( 'typeAlias' => $typeAlias )
+	 *
+	 * @return  ContentHistory
+	 *
+	 * @since   3.2
+	 */
+	public static function createObserver(\JObservableInterface $observableObject, $params = array())
+	{
+		$typeAlias = $params['typeAlias'];
+
+		$observer = new self($observableObject);
+
+		$observer->contenthistoryHelper = new \JHelperContenthistory($typeAlias);
+		$observer->typeAliasPattern = $typeAlias;
+
+		return $observer;
+	}
+
+	/**
+	 * Post-processor for $table->store($updateNulls)
+	 *
+	 * @param   boolean  &$result  The result of the load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function onAfterStore(&$result)
+	{
+		if ($result)
+		{
+			$this->parseTypeAlias();
+			$aliasParts = explode('.', $this->contenthistoryHelper->typeAlias);
+
+			if (\JComponentHelper::getParams($aliasParts[0])->get('save_history', 0))
+			{
+				$this->contenthistoryHelper->store($this->table);
+			}
+		}
+	}
+
+	/**
+	 * Pre-processor for $table->delete($pk)
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 * @throws  \UnexpectedValueException
+	 */
+	public function onBeforeDelete($pk)
+	{
+		$this->parseTypeAlias();
+		$aliasParts = explode('.', $this->contenthistoryHelper->typeAlias);
+
+		if (\JComponentHelper::getParams($aliasParts[0])->get('save_history', 0))
+		{
+			$this->parseTypeAlias();
+			$this->contenthistoryHelper->deleteHistory($this->table);
+		}
+	}
+
+	/**
+	 * Internal method
+	 * Parses a TypeAlias of the form "{variableName}.type", replacing {variableName} with table-instance variables variableName
+	 * Storing result into $this->contenthistoryHelper->typeAlias
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function parseTypeAlias()
+	{
+		// Needed for PHP < 5.4.0 as it's not passing context $this to closure function
+		static::$_myTableForPregreplaceOnly = $this->table;
+
+		$this->contenthistoryHelper->typeAlias = preg_replace_callback('/{([^}]+)}/',
+			function($matches)
+			{
+				return ContentHistory::$_myTableForPregreplaceOnly->{$matches[1]};
+			},
+			$this->typeAliasPattern
+		);
+	}
+}
diff --git a/core/libraries/src/Table/Observer/Tags.php b/core/libraries/src/Table/Observer/Tags.php
new file mode 100644
index 00000000..09a92c17
--- /dev/null
+++ b/core/libraries/src/Table/Observer/Tags.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table\Observer;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Abstract class defining methods that can be
+ * implemented by an Observer class of a Table class (which is an Observable).
+ * Attaches $this Observer to the $table in the constructor.
+ * The classes extending this class should not be instanciated directly, as they
+ * are automatically instanciated by the \JObserverMapper
+ *
+ * @since  3.1.2
+ */
+class Tags extends AbstractObserver
+{
+	/**
+	 * Helper object for managing tags
+	 *
+	 * @var    \JHelperTags
+	 * @since  3.1.2
+	 */
+	protected $tagsHelper;
+
+	/**
+	 * The pattern for this table's TypeAlias
+	 *
+	 * @var    string
+	 * @since  3.1.2
+	 */
+	protected $typeAliasPattern = null;
+
+	/**
+	 * Override for postStoreProcess param newTags, Set by setNewTags, used by onAfterStore and onBeforeStore
+	 *
+	 * @var    array
+	 * @since  3.1.2
+	 */
+	protected $newTags = false;
+
+	/**
+	 * Override for postStoreProcess param replaceTags. Set by setNewTags, used by onAfterStore
+	 *
+	 * @var    boolean
+	 * @since  3.1.2
+	 */
+	protected $replaceTags = true;
+
+	/**
+	 * Not public, so marking private and deprecated, but needed internally in parseTypeAlias for
+	 * PHP < 5.4.0 as it's not passing context $this to closure function.
+	 *
+	 * @var         Tags
+	 * @since       3.1.2
+	 * @deprecated  Never use this
+	 * @private
+	 */
+	public static $_myTableForPregreplaceOnly;
+
+	/**
+	 * Creates the associated observer instance and attaches it to the $observableObject
+	 * Creates the associated tags helper class instance
+	 * $typeAlias can be of the form "{variableName}.type", automatically replacing {variableName} with table-instance variables variableName
+	 *
+	 * @param   \JObservableInterface  $observableObject  The subject object to be observed
+	 * @param   array                  $params            ( 'typeAlias' => $typeAlias )
+	 *
+	 * @return  Tags
+	 *
+	 * @since   3.1.2
+	 */
+	public static function createObserver(\JObservableInterface $observableObject, $params = array())
+	{
+		$typeAlias = $params['typeAlias'];
+
+		$observer = new self($observableObject);
+
+		$observer->tagsHelper = new \JHelperTags;
+		$observer->typeAliasPattern = $typeAlias;
+
+		return $observer;
+	}
+
+	/**
+	 * Pre-processor for $table->store($updateNulls)
+	 *
+	 * @param   boolean  $updateNulls  The result of the load
+	 * @param   string   $tableKey     The key of the table
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onBeforeStore($updateNulls, $tableKey)
+	{
+		$this->parseTypeAlias();
+
+		if (empty($this->table->tagsHelper->tags))
+		{
+			$this->tagsHelper->preStoreProcess($this->table);
+		}
+		else
+		{
+			$this->tagsHelper->preStoreProcess($this->table, (array) $this->table->tagsHelper->tags);
+		}
+	}
+
+	/**
+	 * Post-processor for $table->store($updateNulls)
+	 * You can change optional params newTags and replaceTags of tagsHelper with method setNewTagsToAdd
+	 *
+	 * @param   boolean  &$result  The result of the load
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function onAfterStore(&$result)
+	{
+		if ($result)
+		{
+			if (empty($this->table->tagsHelper->tags))
+			{
+				$result = $this->tagsHelper->postStoreProcess($this->table);
+			}
+			else
+			{
+				$result = $this->tagsHelper->postStoreProcess($this->table, $this->table->tagsHelper->tags);
+			}
+
+			// Restore default values for the optional params:
+			$this->newTags = array();
+			$this->replaceTags = true;
+		}
+	}
+
+	/**
+	 * Pre-processor for $table->delete($pk)
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 * @throws  \UnexpectedValueException
+	 */
+	public function onBeforeDelete($pk)
+	{
+		$this->parseTypeAlias();
+		$this->tagsHelper->deleteTagData($this->table, $pk);
+	}
+
+	/**
+	 * Sets the new tags to be added or to replace existing tags
+	 *
+	 * @param   array    $newTags      New tags to be added to or replace current tags for an item
+	 * @param   boolean  $replaceTags  Replace tags (true) or add them (false)
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1.2
+	 */
+	public function setNewTags($newTags, $replaceTags)
+	{
+		$this->parseTypeAlias();
+
+		return $this->tagsHelper->postStoreProcess($this->table, $newTags, $replaceTags);
+	}
+
+	/**
+	 * Internal method
+	 * Parses a TypeAlias of the form "{variableName}.type", replacing {variableName} with table-instance variables variableName
+	 * Storing result into $this->tagsHelper->typeAlias
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	protected function parseTypeAlias()
+	{
+		// Needed for PHP < 5.4.0 as it's not passing context $this to closure function
+		static::$_myTableForPregreplaceOnly = $this->table;
+
+		$this->tagsHelper->typeAlias = preg_replace_callback('/{([^}]+)}/',
+			function($matches)
+			{
+				return Tags::$_myTableForPregreplaceOnly->{$matches[1]};
+			},
+			$this->typeAliasPattern
+		);
+	}
+}
diff --git a/core/libraries/src/Table/Table.php b/core/libraries/src/Table/Table.php
new file mode 100644
index 00000000..1fbb4034
--- /dev/null
+++ b/core/libraries/src/Table/Table.php
@@ -0,0 +1,1722 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+\JLoader::import('joomla.filesystem.path');
+
+/**
+ * Abstract Table class
+ *
+ * Parent class to all tables.
+ *
+ * @since  11.1
+ * @tutorial  Joomla.Platform/jtable.cls
+ */
+abstract class Table extends \JObject implements \JObservableInterface, \JTableInterface
+{
+	/**
+	 * Include paths for searching for Table classes.
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	private static $_includePaths = array();
+
+	/**
+	 * Name of the database table to model.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_tbl = '';
+
+	/**
+	 * Name of the primary key field in the table.
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_tbl_key = '';
+
+	/**
+	 * Name of the primary key fields in the table.
+	 *
+	 * @var    array
+	 * @since  12.2
+	 */
+	protected $_tbl_keys = array();
+
+	/**
+	 * \JDatabaseDriver object.
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  11.1
+	 */
+	protected $_db;
+
+	/**
+	 * Should rows be tracked as ACL assets?
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $_trackAssets = false;
+
+	/**
+	 * The rules associated with this record.
+	 *
+	 * @var    \JAccessRules  A \JAccessRules object.
+	 * @since  11.1
+	 */
+	protected $_rules;
+
+	/**
+	 * Indicator that the tables have been locked.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $_locked = false;
+
+	/**
+	 * Indicates that the primary keys autoincrement.
+	 *
+	 * @var    boolean
+	 * @since  12.3
+	 */
+	protected $_autoincrement = true;
+
+	/**
+	 * Generic observers for this Table (Used e.g. for tags Processing)
+	 *
+	 * @var    \JObserverUpdater
+	 * @since  3.1.2
+	 */
+	protected $_observers;
+
+	/**
+	 * Array with alias for "special" columns such as ordering, hits etc etc
+	 *
+	 * @var    array
+	 * @since  3.4.0
+	 */
+	protected $_columnAlias = array();
+
+	/**
+	 * An array of key names to be json encoded in the bind function
+	 *
+	 * @var    array
+	 * @since  3.3
+	 */
+	protected $_jsonEncode = array();
+
+	/**
+	 * Object constructor to set table and key fields.  In most cases this will
+	 * be overridden by child classes to explicitly set the table and key fields
+	 * for a particular database table.
+	 *
+	 * @param   string            $table  Name of the table to model.
+	 * @param   mixed             $key    Name of the primary key field in the table or array of field names that compose the primary key.
+	 * @param   \JDatabaseDriver  $db     \JDatabaseDriver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($table, $key, $db)
+	{
+		// Set internal variables.
+		$this->_tbl = $table;
+
+		// Set the key to be an array.
+		if (is_string($key))
+		{
+			$key = array($key);
+		}
+		elseif (is_object($key))
+		{
+			$key = (array) $key;
+		}
+
+		$this->_tbl_keys = $key;
+
+		if (count($key) == 1)
+		{
+			$this->_autoincrement = true;
+		}
+		else
+		{
+			$this->_autoincrement = false;
+		}
+
+		// Set the singular table key for backwards compatibility.
+		$this->_tbl_key = $this->getKeyName();
+
+		$this->_db = $db;
+
+		// Initialise the table properties.
+		$fields = $this->getFields();
+
+		if ($fields)
+		{
+			foreach ($fields as $name => $v)
+			{
+				// Add the field if it is not already present.
+				if (!property_exists($this, $name))
+				{
+					$this->$name = null;
+				}
+			}
+		}
+
+		// If we are tracking assets, make sure an access field exists and initially set the default.
+		if (property_exists($this, 'asset_id'))
+		{
+			$this->_trackAssets = true;
+		}
+
+		// If the access property exists, set the default.
+		if (property_exists($this, 'access'))
+		{
+			$this->access = (int) \JFactory::getConfig()->get('access');
+		}
+
+		// Implement \JObservableInterface:
+		// Create observer updater and attaches all observers interested by $this class:
+		$this->_observers = new \JObserverUpdater($this);
+		\JObserverMapper::attachAllObservers($this);
+	}
+
+	/**
+	 * Implement \JObservableInterface:
+	 * Adds an observer to this instance.
+	 * This method will be called fron the constructor of classes implementing \JObserverInterface
+	 * which is instanciated by the constructor of $this with \JObserverMapper::attachAllObservers($this)
+	 *
+	 * @param   \JObserverInterface|\JTableObserver  $observer  The observer object
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function attachObserver(\JObserverInterface $observer)
+	{
+		$this->_observers->attachObserver($observer);
+	}
+
+	/**
+	 * Gets the instance of the observer of class $observerClass
+	 *
+	 * @param   string  $observerClass  The observer class-name to return the object of
+	 *
+	 * @return  \JTableObserver|null
+	 *
+	 * @since   3.1.2
+	 */
+	public function getObserverOfClass($observerClass)
+	{
+		return $this->_observers->getObserverOfClass($observerClass);
+	}
+
+	/**
+	 * Get the columns from database table.
+	 *
+	 * @param   bool  $reload  flag to reload cache
+	 *
+	 * @return  mixed  An array of the field names, or false if an error occurs.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function getFields($reload = false)
+	{
+		static $cache = null;
+
+		if ($cache === null || $reload)
+		{
+			// Lookup the fields for this table only once.
+			$name   = $this->_tbl;
+			$fields = $this->_db->getTableColumns($name, false);
+
+			if (empty($fields))
+			{
+				throw new \UnexpectedValueException(sprintf('No columns found for %s table', $name));
+			}
+
+			$cache = $fields;
+		}
+
+		return $cache;
+	}
+
+	/**
+	 * Static method to get an instance of a Table class if it can be found in the table include paths.
+	 *
+	 * To add include paths for searching for Table classes see Table::addIncludePath().
+	 *
+	 * @param   string  $type    The type (name) of the Table class to get an instance of.
+	 * @param   string  $prefix  An optional prefix for the table class name.
+	 * @param   array   $config  An optional array of configuration values for the Table object.
+	 *
+	 * @return  Table|boolean   A Table object if found or boolean false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($type, $prefix = 'JTable', $config = array())
+	{
+		// Sanitize and prepare the table class name.
+		$type       = preg_replace('/[^A-Z0-9_\.-]/i', '', $type);
+		$tableClass = $prefix . ucfirst($type);
+
+		// Only try to load the class if it doesn't already exist.
+		if (!class_exists($tableClass))
+		{
+			// Search for the class file in the JTable include paths.
+			jimport('joomla.filesystem.path');
+
+			$paths = self::addIncludePath();
+			$pathIndex = 0;
+
+			while (!class_exists($tableClass) && $pathIndex < count($paths))
+			{
+				if ($tryThis = \JPath::find($paths[$pathIndex++], strtolower($type) . '.php'))
+				{
+					// Import the class file.
+					include_once $tryThis;
+				}
+			}
+
+			if (!class_exists($tableClass))
+			{
+				/*
+				* If unable to find the class file in the Table include paths. Return false.
+				* The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in 3.6.3.
+				* In 4.0 an Exception (type to be determined) will be thrown.
+				* For more info see https://github.com/joomla/joomla-cms/issues/11570
+				*/
+
+				return false;
+			}
+		}
+
+		// If a database object was passed in the configuration array use it, otherwise get the global one from \JFactory.
+		$db = isset($config['dbo']) ? $config['dbo'] : \JFactory::getDbo();
+
+		// Instantiate a new table class and return it.
+		return new $tableClass($db);
+	}
+
+	/**
+	 * Add a filesystem path where Table should search for table class files.
+	 *
+	 * @param   array|string  $path  A filesystem path or array of filesystem paths to add.
+	 *
+	 * @return  array  An array of filesystem paths to find Table classes in.
+	 *
+	 * @since   11.1
+	 */
+	public static function addIncludePath($path = null)
+	{
+		// If the internal paths have not been initialised, do so with the base table path.
+		if (empty(self::$_includePaths))
+		{
+			self::$_includePaths = array(__DIR__);
+		}
+
+		// Convert the passed path(s) to add to an array.
+		settype($path, 'array');
+
+		// If we have new paths to add, do so.
+		if (!empty($path))
+		{
+			// Check and add each individual new path.
+			foreach ($path as $dir)
+			{
+				// Sanitize path.
+				$dir = trim($dir);
+
+				// Add to the front of the list so that custom paths are searched first.
+				if (!in_array($dir, self::$_includePaths))
+				{
+					array_unshift(self::$_includePaths, $dir);
+				}
+			}
+		}
+
+		return self::$_includePaths;
+	}
+
+	/**
+	 * Method to compute the default name of the asset.
+	 * The default name is in the form table_name.id
+	 * where id is the value of the primary key of the table.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function _getAssetName()
+	{
+		$keys = array();
+
+		foreach ($this->_tbl_keys as $k)
+		{
+			$keys[] = (int) $this->$k;
+		}
+
+		return $this->_tbl . '.' . implode('.', $keys);
+	}
+
+	/**
+	 * Method to return the title to use for the asset table.
+	 *
+	 * In tracking the assets a title is kept for each asset so that there is some context available in a unified access manager.
+	 * Usually this would just return $this->title or $this->name or whatever is being used for the primary name of the row.
+	 * If this method is not overridden, the asset name is used.
+	 *
+	 * @return  string  The string to use as the title in the asset table.
+	 *
+	 * @since   11.1
+	 */
+	protected function _getAssetTitle()
+	{
+		return $this->_getAssetName();
+	}
+
+	/**
+	 * Method to get the parent asset under which to register this one.
+	 *
+	 * By default, all assets are registered to the ROOT node with ID, which will default to 1 if none exists.
+	 * An extended class can define a table and ID to lookup.  If the asset does not exist it will be created.
+	 *
+	 * @param   Table    $table  A Table object for the asset parent.
+	 * @param   integer  $id     Id to look up
+	 *
+	 * @return  integer
+	 *
+	 * @since   11.1
+	 */
+	protected function _getAssetParentId(Table $table = null, $id = null)
+	{
+		// For simple cases, parent to the asset root.
+		/** @var  \JTableAsset  $assets */
+		$assets = self::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
+		$rootId = $assets->getRootId();
+
+		if (!empty($rootId))
+		{
+			return $rootId;
+		}
+
+		return 1;
+	}
+
+	/**
+	 * Method to append the primary keys for this table to a query.
+	 *
+	 * @param   \JDatabaseQuery  $query  A query object to append.
+	 * @param   mixed            $pk     Optional primary key parameter.
+	 *
+	 * @return  void
+	 *
+	 * @since   12.3
+	 */
+	public function appendPrimaryKeys($query, $pk = null)
+	{
+		if (is_null($pk))
+		{
+			foreach ($this->_tbl_keys as $k)
+			{
+				$query->where($this->_db->quoteName($k) . ' = ' . $this->_db->quote($this->$k));
+			}
+		}
+		else
+		{
+			if (is_string($pk))
+			{
+				$pk = array($this->_tbl_key => $pk);
+			}
+
+			$pk = (object) $pk;
+
+			foreach ($this->_tbl_keys as $k)
+			{
+				$query->where($this->_db->quoteName($k) . ' = ' . $this->_db->quote($pk->$k));
+			}
+		}
+	}
+
+	/**
+	 * Method to get the database table name for the class.
+	 *
+	 * @return  string  The name of the database table being modeled.
+	 *
+	 * @since   11.1
+	 */
+	public function getTableName()
+	{
+		return $this->_tbl;
+	}
+
+	/**
+	 * Method to get the primary key field name for the table.
+	 *
+	 * @param   boolean  $multiple  True to return all primary keys (as an array) or false to return just the first one (as a string).
+	 *
+	 * @return  mixed  Array of primary key field names or string containing the first primary key field.
+	 *
+	 * @since   11.1
+	 */
+	public function getKeyName($multiple = false)
+	{
+		// Count the number of keys
+		if (count($this->_tbl_keys))
+		{
+			if ($multiple)
+			{
+				// If we want multiple keys, return the raw array.
+				return $this->_tbl_keys;
+			}
+			else
+			{
+				// If we want the standard method, just return the first key.
+				return $this->_tbl_keys[0];
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * Method to get the \JDatabaseDriver object.
+	 *
+	 * @return  \JDatabaseDriver  The internal database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function getDbo()
+	{
+		return $this->_db;
+	}
+
+	/**
+	 * Method to set the \JDatabaseDriver object.
+	 *
+	 * @param   \JDatabaseDriver  $db  A \JDatabaseDriver object to be used by the table object.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function setDbo($db)
+	{
+		$this->_db = $db;
+
+		return true;
+	}
+
+	/**
+	 * Method to set rules for the record.
+	 *
+	 * @param   mixed  $input  A \JAccessRules object, JSON string, or array.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function setRules($input)
+	{
+		if ($input instanceof \JAccessRules)
+		{
+			$this->_rules = $input;
+		}
+		else
+		{
+			$this->_rules = new \JAccessRules($input);
+		}
+	}
+
+	/**
+	 * Method to get the rules for the record.
+	 *
+	 * @return  \JAccessRules object
+	 *
+	 * @since   11.1
+	 */
+	public function getRules()
+	{
+		return $this->_rules;
+	}
+
+	/**
+	 * Method to reset class properties to the defaults set in the class
+	 * definition. It will ignore the primary key as well as any private class
+	 * properties (except $_errors).
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function reset()
+	{
+		// Get the default values for the class from the table.
+		foreach ($this->getFields() as $k => $v)
+		{
+			// If the property is not the primary key or private, reset it.
+			if (!in_array($k, $this->_tbl_keys) && (strpos($k, '_') !== 0))
+			{
+				$this->$k = $v->Default;
+			}
+		}
+
+		// Reset table errors
+		$this->_errors = array();
+	}
+
+	/**
+	 * Method to bind an associative array or object to the Table instance.This
+	 * method only binds properties that are publicly accessible and optionally
+	 * takes an array of properties to ignore when binding.
+	 *
+	 * @param   array|object  $src     An associative array or object to bind to the Table instance.
+	 * @param   array|string  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 */
+	public function bind($src, $ignore = array())
+	{
+		// JSON encode any fields required
+		if (!empty($this->_jsonEncode))
+		{
+			foreach ($this->_jsonEncode as $field)
+			{
+				if (isset($src[$field]) && is_array($src[$field]))
+				{
+					$src[$field] = json_encode($src[$field]);
+				}
+			}
+		}
+
+		// Check if the source value is an array or object
+		if (!is_object($src) && !is_array($src))
+		{
+			throw new \InvalidArgumentException(
+				sprintf(
+					'Could not bind the data source in %1$s::bind(), the source must be an array or object but a "%2$s" was given.',
+					get_class($this),
+					gettype($src)
+				)
+			);
+		}
+
+		// If the source value is an object, get its accessible properties.
+		if (is_object($src))
+		{
+			$src = get_object_vars($src);
+		}
+
+		// If the ignore value is a string, explode it over spaces.
+		if (!is_array($ignore))
+		{
+			$ignore = explode(' ', $ignore);
+		}
+
+		// Bind the source value, excluding the ignored fields.
+		foreach ($this->getProperties() as $k => $v)
+		{
+			// Only process fields not in the ignore array.
+			if (!in_array($k, $ignore))
+			{
+				if (isset($src[$k]))
+				{
+					$this->$k = $src[$k];
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to load a row from the database by primary key and bind the fields to the Table instance properties.
+	 *
+	 * @param   mixed    $keys   An optional primary key value to load the row by, or an array of fields to match.
+	 *                           If not set the instance property value is used.
+	 * @param   boolean  $reset  True to reset the default values before loading the new row.
+	 *
+	 * @return  boolean  True if successful. False if row not found.
+	 *
+	 * @since   11.1
+	 * @throws  \InvalidArgumentException
+	 * @throws  \RuntimeException
+	 * @throws  \UnexpectedValueException
+	 */
+	public function load($keys = null, $reset = true)
+	{
+		// Implement \JObservableInterface: Pre-processing by observers
+		$this->_observers->update('onBeforeLoad', array($keys, $reset));
+
+		if (empty($keys))
+		{
+			$empty = true;
+			$keys  = array();
+
+			// If empty, use the value of the current key
+			foreach ($this->_tbl_keys as $key)
+			{
+				$empty      = $empty && empty($this->$key);
+				$keys[$key] = $this->$key;
+			}
+
+			// If empty primary key there's is no need to load anything
+			if ($empty)
+			{
+				return true;
+			}
+		}
+		elseif (!is_array($keys))
+		{
+			// Load by primary key.
+			$keyCount = count($this->_tbl_keys);
+
+			if ($keyCount)
+			{
+				if ($keyCount > 1)
+				{
+					throw new \InvalidArgumentException('Table has multiple primary keys specified, only one primary key value provided.');
+				}
+
+				$keys = array($this->getKeyName() => $keys);
+			}
+			else
+			{
+				throw new \RuntimeException('No table keys defined.');
+			}
+		}
+
+		if ($reset)
+		{
+			$this->reset();
+		}
+
+		// Initialise the query.
+		$query = $this->_db->getQuery(true)
+			->select('*')
+			->from($this->_tbl);
+		$fields = array_keys($this->getProperties());
+
+		foreach ($keys as $field => $value)
+		{
+			// Check that $field is in the table.
+			if (!in_array($field, $fields))
+			{
+				throw new \UnexpectedValueException(sprintf('Missing field in database: %s &#160; %s.', get_class($this), $field));
+			}
+
+			// Add the search tuple to the query.
+			$query->where($this->_db->quoteName($field) . ' = ' . $this->_db->quote($value));
+		}
+
+		$this->_db->setQuery($query);
+
+		$row = $this->_db->loadAssoc();
+
+		// Check that we have a result.
+		if (empty($row))
+		{
+			$result = false;
+		}
+		else
+		{
+			// Bind the object with the row and return.
+			$result = $this->bind($row);
+		}
+
+		// Implement \JObservableInterface: Post-processing by observers
+		$this->_observers->update('onAfterLoad', array(&$result, $row));
+
+		return $result;
+	}
+
+	/**
+	 * Method to perform sanity checks on the Table instance properties to ensure they are safe to store in the database.
+	 *
+	 * Child classes should override this method to make sure the data they are storing in the database is safe and as expected before storage.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		return true;
+	}
+
+	/**
+	 * Method to store a row in the database from the Table instance properties.
+	 *
+	 * If a primary key value is set the row with that primary key value will be updated with the instance property values.
+	 * If no primary key value is set a new row will be inserted into the database with the properties from the Table instance.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function store($updateNulls = false)
+	{
+		$result = true;
+
+		$k = $this->_tbl_keys;
+
+		// Implement \JObservableInterface: Pre-processing by observers
+		$this->_observers->update('onBeforeStore', array($updateNulls, $k));
+
+		$currentAssetId = 0;
+
+		if (!empty($this->asset_id))
+		{
+			$currentAssetId = $this->asset_id;
+		}
+
+		// The asset id field is managed privately by this class.
+		if ($this->_trackAssets)
+		{
+			unset($this->asset_id);
+		}
+
+		// If a primary key exists update the object, otherwise insert it.
+		if ($this->hasPrimaryKey())
+		{
+			$this->_db->updateObject($this->_tbl, $this, $this->_tbl_keys, $updateNulls);
+		}
+		else
+		{
+			$this->_db->insertObject($this->_tbl, $this, $this->_tbl_keys[0]);
+		}
+
+		// If the table is not set to track assets return true.
+		if ($this->_trackAssets)
+		{
+			if ($this->_locked)
+			{
+				$this->_unlock();
+			}
+
+			/*
+			 * Asset Tracking
+			 */
+			$parentId = $this->_getAssetParentId();
+			$name     = $this->_getAssetName();
+			$title    = $this->_getAssetTitle();
+
+			/** @var  \JTableAsset  $asset */
+			$asset = self::getInstance('Asset', 'JTable', array('dbo' => $this->getDbo()));
+			$asset->loadByName($name);
+
+			// Re-inject the asset id.
+			$this->asset_id = $asset->id;
+
+			// Check for an error.
+			$error = $asset->getError();
+
+			if ($error)
+			{
+				$this->setError($error);
+
+				return false;
+			}
+			else
+			{
+				// Specify how a new or moved node asset is inserted into the tree.
+				if (empty($this->asset_id) || $asset->parent_id != $parentId)
+				{
+					$asset->setLocation($parentId, 'last-child');
+				}
+
+				// Prepare the asset to be stored.
+				$asset->parent_id = $parentId;
+				$asset->name      = $name;
+				$asset->title     = $title;
+
+				if ($this->_rules instanceof \JAccessRules)
+				{
+					$asset->rules = (string) $this->_rules;
+				}
+
+				if (!$asset->check() || !$asset->store($updateNulls))
+				{
+					$this->setError($asset->getError());
+
+					return false;
+				}
+				else
+				{
+					// Create an asset_id or heal one that is corrupted.
+					if (empty($this->asset_id) || ($currentAssetId != $this->asset_id && !empty($this->asset_id)))
+					{
+						// Update the asset_id field in this table.
+						$this->asset_id = (int) $asset->id;
+
+						$query = $this->_db->getQuery(true)
+							->update($this->_db->quoteName($this->_tbl))
+							->set('asset_id = ' . (int) $this->asset_id);
+						$this->appendPrimaryKeys($query);
+						$this->_db->setQuery($query)->execute();
+					}
+				}
+			}
+		}
+
+		// Implement \JObservableInterface: Post-processing by observers
+		$this->_observers->update('onAfterStore', array(&$result));
+
+		return $result;
+	}
+
+	/**
+	 * Method to provide a shortcut to binding, checking and storing a Table instance to the database table.
+	 *
+	 * The method will check a row in once the data has been stored and if an ordering filter is present will attempt to reorder
+	 * the table rows based on the filter.  The ordering filter is an instance property name.  The rows that will be reordered
+	 * are those whose value matches the Table instance for the property specified.
+	 *
+	 * @param   array|object  $src             An associative array or object to bind to the Table instance.
+	 * @param   string        $orderingFilter  Filter for the order updating
+	 * @param   array|string  $ignore          An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function save($src, $orderingFilter = '', $ignore = '')
+	{
+		// Attempt to bind the source to the instance.
+		if (!$this->bind($src, $ignore))
+		{
+			return false;
+		}
+
+		// Run any sanity checks on the instance and verify that it is ready for storage.
+		if (!$this->check())
+		{
+			return false;
+		}
+
+		// Attempt to store the properties to the database table.
+		if (!$this->store())
+		{
+			return false;
+		}
+
+		// Attempt to check the row in, just in case it was checked out.
+		if (!$this->checkin())
+		{
+			return false;
+		}
+
+		// If an ordering filter is set, attempt reorder the rows in the table based on the filter and value.
+		if ($orderingFilter)
+		{
+			$filterValue = $this->$orderingFilter;
+			$this->reorder($orderingFilter ? $this->_db->quoteName($orderingFilter) . ' = ' . $this->_db->quote($filterValue) : '');
+		}
+
+		// Set the error to empty and return true.
+		$this->setError('');
+
+		return true;
+	}
+
+	/**
+	 * Method to delete a row from the database table by primary key value.
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function delete($pk = null)
+	{
+		if (is_null($pk))
+		{
+			$pk = array();
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				$pk[$key] = $this->$key;
+			}
+		}
+		elseif (!is_array($pk))
+		{
+			$pk = array($this->_tbl_key => $pk);
+		}
+
+		foreach ($this->_tbl_keys as $key)
+		{
+			$pk[$key] = is_null($pk[$key]) ? $this->$key : $pk[$key];
+
+			if ($pk[$key] === null)
+			{
+				throw new \UnexpectedValueException('Null primary key not allowed.');
+			}
+
+			$this->$key = $pk[$key];
+		}
+
+		// Implement \JObservableInterface: Pre-processing by observers
+		$this->_observers->update('onBeforeDelete', array($pk));
+
+		// If tracking assets, remove the asset first.
+		if ($this->_trackAssets)
+		{
+			// Get the asset name
+			$name  = $this->_getAssetName();
+			/** @var  \JTableAsset  $asset */
+			$asset = self::getInstance('Asset');
+
+			if ($asset->loadByName($name))
+			{
+				if (!$asset->delete())
+				{
+					$this->setError($asset->getError());
+
+					return false;
+				}
+			}
+		}
+
+		// Delete the row by primary key.
+		$query = $this->_db->getQuery(true)
+			->delete($this->_tbl);
+		$this->appendPrimaryKeys($query, $pk);
+
+		$this->_db->setQuery($query);
+
+		// Check for a database error.
+		$this->_db->execute();
+
+		// Implement \JObservableInterface: Post-processing by observers
+		$this->_observers->update('onAfterDelete', array($pk));
+
+		return true;
+	}
+
+	/**
+	 * Method to check a row out if the necessary properties/fields exist.
+	 *
+	 * To prevent race conditions while editing rows in a database, a row can be checked out if the fields 'checked_out' and 'checked_out_time'
+	 * are available. While a row is checked out, any attempt to store the row by a user other than the one who checked the row out should be
+	 * held until the row is checked in again.
+	 *
+	 * @param   integer  $userId  The Id of the user checking out the row.
+	 * @param   mixed    $pk      An optional primary key value to check out.  If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function checkOut($userId, $pk = null)
+	{
+		$checkedOutField = $this->getColumnAlias('checked_out');
+		$checkedOutTimeField = $this->getColumnAlias('checked_out_time');
+
+		// If there is no checked_out or checked_out_time field, just return true.
+		if (!property_exists($this, $checkedOutField) || !property_exists($this, $checkedOutTimeField))
+		{
+			return true;
+		}
+
+		if (is_null($pk))
+		{
+			$pk = array();
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				$pk[$key] = $this->$key;
+			}
+		}
+		elseif (!is_array($pk))
+		{
+			$pk = array($this->_tbl_key => $pk);
+		}
+
+		foreach ($this->_tbl_keys as $key)
+		{
+			$pk[$key] = is_null($pk[$key]) ? $this->$key : $pk[$key];
+
+			if ($pk[$key] === null)
+			{
+				throw new \UnexpectedValueException('Null primary key not allowed.');
+			}
+		}
+
+		// Get the current time in the database format.
+		$time = \JFactory::getDate()->toSql();
+
+		// Check the row out by primary key.
+		$query = $this->_db->getQuery(true)
+			->update($this->_tbl)
+			->set($this->_db->quoteName($checkedOutField) . ' = ' . (int) $userId)
+			->set($this->_db->quoteName($checkedOutTimeField) . ' = ' . $this->_db->quote($time));
+		$this->appendPrimaryKeys($query, $pk);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		// Set table values in the object.
+		$this->$checkedOutField      = (int) $userId;
+		$this->$checkedOutTimeField = $time;
+
+		return true;
+	}
+
+	/**
+	 * Method to check a row in if the necessary properties/fields exist.
+	 *
+	 * Checking a row in will allow other users the ability to edit the row.
+	 *
+	 * @param   mixed  $pk  An optional primary key value to check out.  If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function checkIn($pk = null)
+	{
+		$checkedOutField = $this->getColumnAlias('checked_out');
+		$checkedOutTimeField = $this->getColumnAlias('checked_out_time');
+
+		// If there is no checked_out or checked_out_time field, just return true.
+		if (!property_exists($this, $checkedOutField) || !property_exists($this, $checkedOutTimeField))
+		{
+			return true;
+		}
+
+		if (is_null($pk))
+		{
+			$pk = array();
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				$pk[$this->$key] = $this->$key;
+			}
+		}
+		elseif (!is_array($pk))
+		{
+			$pk = array($this->_tbl_key => $pk);
+		}
+
+		foreach ($this->_tbl_keys as $key)
+		{
+			$pk[$key] = empty($pk[$key]) ? $this->$key : $pk[$key];
+
+			if ($pk[$key] === null)
+			{
+				throw new \UnexpectedValueException('Null primary key not allowed.');
+			}
+		}
+
+		// Check the row in by primary key.
+		$query = $this->_db->getQuery(true)
+			->update($this->_tbl)
+			->set($this->_db->quoteName($checkedOutField) . ' = 0')
+			->set($this->_db->quoteName($checkedOutTimeField) . ' = ' . $this->_db->quote($this->_db->getNullDate()));
+		$this->appendPrimaryKeys($query, $pk);
+		$this->_db->setQuery($query);
+
+		// Check for a database error.
+		$this->_db->execute();
+
+		// Set table values in the object.
+		$this->$checkedOutField      = 0;
+		$this->$checkedOutTimeField = '';
+
+		return true;
+	}
+
+	/**
+	 * Validate that the primary key has been set.
+	 *
+	 * @return  boolean  True if the primary key(s) have been set.
+	 *
+	 * @since   12.3
+	 */
+	public function hasPrimaryKey()
+	{
+		if ($this->_autoincrement)
+		{
+			$empty = true;
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				$empty = $empty && empty($this->$key);
+			}
+		}
+		else
+		{
+			$query = $this->_db->getQuery(true)
+				->select('COUNT(*)')
+				->from($this->_tbl);
+			$this->appendPrimaryKeys($query);
+
+			$this->_db->setQuery($query);
+			$count = $this->_db->loadResult();
+
+			if ($count == 1)
+			{
+				$empty = false;
+			}
+			else
+			{
+				$empty = true;
+			}
+		}
+
+		return !$empty;
+	}
+
+	/**
+	 * Method to increment the hits for a row if the necessary property/field exists.
+	 *
+	 * @param   mixed  $pk  An optional primary key value to increment. If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function hit($pk = null)
+	{
+		$hitsField = $this->getColumnAlias('hits');
+
+		// If there is no hits field, just return true.
+		if (!property_exists($this, $hitsField))
+		{
+			return true;
+		}
+
+		if (is_null($pk))
+		{
+			$pk = array();
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				$pk[$key] = $this->$key;
+			}
+		}
+		elseif (!is_array($pk))
+		{
+			$pk = array($this->_tbl_key => $pk);
+		}
+
+		foreach ($this->_tbl_keys as $key)
+		{
+			$pk[$key] = is_null($pk[$key]) ? $this->$key : $pk[$key];
+
+			if ($pk[$key] === null)
+			{
+				throw new \UnexpectedValueException('Null primary key not allowed.');
+			}
+		}
+
+		// Check the row in by primary key.
+		$query = $this->_db->getQuery(true)
+			->update($this->_tbl)
+			->set($this->_db->quoteName($hitsField) . ' = (' . $this->_db->quoteName($hitsField) . ' + 1)');
+		$this->appendPrimaryKeys($query, $pk);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		// Set table values in the object.
+		$this->hits++;
+
+		return true;
+	}
+
+	/**
+	 * Method to determine if a row is checked out and therefore uneditable by a user.
+	 *
+	 * If the row is checked out by the same user, then it is considered not checked out -- as the user can still edit it.
+	 *
+	 * @param   integer  $with     The user ID to preform the match with, if an item is checked out by this user the function will return false.
+	 * @param   integer  $against  The user ID to perform the match against when the function is used as a static function.
+	 *
+	 * @return  boolean  True if checked out.
+	 *
+	 * @since   11.1
+	 */
+	public function isCheckedOut($with = 0, $against = null)
+	{
+		// Handle the non-static case.
+		if (isset($this) && ($this instanceof Table) && is_null($against))
+		{
+			$checkedOutField = $this->getColumnAlias('checked_out');
+			$against = $this->get($checkedOutField);
+		}
+
+		// The item is not checked out or is checked out by the same user.
+		if (!$against || ($against == $with))
+		{
+			return false;
+		}
+
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('COUNT(userid)')
+			->from($db->quoteName('#__session'))
+			->where($db->quoteName('userid') . ' = ' . (int) $against);
+		$db->setQuery($query);
+		$checkedOut = (boolean) $db->loadResult();
+
+		// If a session exists for the user then it is checked out.
+		return $checkedOut;
+	}
+
+	/**
+	 * Method to get the next ordering value for a group of rows defined by an SQL WHERE clause.
+	 *
+	 * This is useful for placing a new item last in a group of items in the table.
+	 *
+	 * @param   string  $where  WHERE clause to use for selecting the MAX(ordering) for the table.
+	 *
+	 * @return  integer  The next ordering value.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function getNextOrder($where = '')
+	{
+		// Check if there is an ordering field set
+		$orderingField = $this->getColumnAlias('ordering');
+
+		if (!property_exists($this, $orderingField))
+		{
+			throw new \UnexpectedValueException(sprintf('%s does not support ordering.', get_class($this)));
+		}
+
+		// Get the largest ordering value for a given where clause.
+		$query = $this->_db->getQuery(true)
+			->select('MAX(' . $this->_db->quoteName($orderingField) . ')')
+			->from($this->_tbl);
+
+		if ($where)
+		{
+			$query->where($where);
+		}
+
+		$this->_db->setQuery($query);
+		$max = (int) $this->_db->loadResult();
+
+		// Return the largest ordering value + 1.
+		return $max + 1;
+	}
+
+	/**
+	 * Get the primary key values for this table using passed in values as a default.
+	 *
+	 * @param   array  $keys  Optional primary key values to use.
+	 *
+	 * @return  array  An array of primary key names and values.
+	 *
+	 * @since   12.3
+	 */
+	public function getPrimaryKey(array $keys = array())
+	{
+		foreach ($this->_tbl_keys as $key)
+		{
+			if (!isset($keys[$key]))
+			{
+				if (!empty($this->$key))
+				{
+					$keys[$key] = $this->$key;
+				}
+			}
+		}
+
+		return $keys;
+	}
+
+	/**
+	 * Method to compact the ordering values of rows in a group of rows defined by an SQL WHERE clause.
+	 *
+	 * @param   string  $where  WHERE clause to use for limiting the selection of rows to compact the ordering values.
+	 *
+	 * @return  mixed  Boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function reorder($where = '')
+	{
+		// Check if there is an ordering field set
+		$orderingField = $this->getColumnAlias('ordering');
+
+		if (!property_exists($this, $orderingField))
+		{
+			throw new \UnexpectedValueException(sprintf('%s does not support ordering.', get_class($this)));
+		}
+
+		$quotedOrderingField = $this->_db->quoteName($orderingField);
+
+		$subquery = $this->_db->getQuery(true)
+			->from($this->_tbl)
+			->selectRowNumber($quotedOrderingField, 'new_ordering');
+
+		$query = $this->_db->getQuery(true)
+			->update($this->_tbl)
+			->set($quotedOrderingField . ' = sq.new_ordering');
+
+		$innerOn = array();
+
+		// Get the primary keys for the selection.
+		foreach ($this->_tbl_keys as $i => $k)
+		{
+			$subquery->select($this->_db->quoteName($k, 'pk__' . $i));
+			$innerOn[] = $this->_db->quoteName($k) . ' = sq.' . $this->_db->quoteName('pk__' . $i);
+		}
+
+		// Setup the extra where and ordering clause data.
+		if ($where)
+		{
+			$subquery->where($where);
+			$query->where($where);
+		}
+
+		$subquery->where($quotedOrderingField . ' >= 0');
+		$query->where($quotedOrderingField . ' >= 0');
+
+		$query->innerJoin('(' . (string) $subquery . ') AS sq ON ' . implode(' AND ', $innerOn));
+
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		return true;
+	}
+
+	/**
+	 * Method to move a row in the ordering sequence of a group of rows defined by an SQL WHERE clause.
+	 *
+	 * Negative numbers move the row up in the sequence and positive numbers move it down.
+	 *
+	 * @param   integer  $delta  The direction and magnitude to move the row in the ordering sequence.
+	 * @param   string   $where  WHERE clause to use for limiting the selection of rows to compact the ordering values.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \UnexpectedValueException
+	 */
+	public function move($delta, $where = '')
+	{
+		// Check if there is an ordering field set
+		$orderingField = $this->getColumnAlias('ordering');
+
+		if (!property_exists($this, $orderingField))
+		{
+			throw new \UnexpectedValueException(sprintf('%s does not support ordering.', get_class($this)));
+		}
+
+		$quotedOrderingField = $this->_db->quoteName($orderingField);
+
+		// If the change is none, do nothing.
+		if (empty($delta))
+		{
+			return true;
+		}
+
+		$row   = null;
+		$query = $this->_db->getQuery(true);
+
+		// Select the primary key and ordering values from the table.
+		$query->select(implode(',', $this->_tbl_keys) . ', ' . $quotedOrderingField)
+			->from($this->_tbl);
+
+		// If the movement delta is negative move the row up.
+		if ($delta < 0)
+		{
+			$query->where($quotedOrderingField . ' < ' . (int) $this->$orderingField)
+				->order($quotedOrderingField . ' DESC');
+		}
+		// If the movement delta is positive move the row down.
+		elseif ($delta > 0)
+		{
+			$query->where($quotedOrderingField . ' > ' . (int) $this->$orderingField)
+				->order($quotedOrderingField . ' ASC');
+		}
+
+		// Add the custom WHERE clause if set.
+		if ($where)
+		{
+			$query->where($where);
+		}
+
+		// Select the first row with the criteria.
+		$this->_db->setQuery($query, 0, 1);
+		$row = $this->_db->loadObject();
+
+		// If a row is found, move the item.
+		if (!empty($row))
+		{
+			// Update the ordering field for this instance to the row's ordering value.
+			$query->clear()
+				->update($this->_tbl)
+				->set($quotedOrderingField . ' = ' . (int) $row->$orderingField);
+			$this->appendPrimaryKeys($query);
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+
+			// Update the ordering field for the row to this instance's ordering value.
+			$query->clear()
+				->update($this->_tbl)
+				->set($quotedOrderingField . ' = ' . (int) $this->$orderingField);
+			$this->appendPrimaryKeys($query, $row);
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+
+			// Update the instance value.
+			$this->$orderingField = $row->$orderingField;
+		}
+		else
+		{
+			// Update the ordering field for this instance.
+			$query->clear()
+				->update($this->_tbl)
+				->set($quotedOrderingField . ' = ' . (int) $this->$orderingField);
+			$this->appendPrimaryKeys($query);
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to set the publishing state for a row or list of rows in the database table.
+	 *
+	 * The method respects checked out rows by other users and will attempt to checkin rows that it can after adjustments are made.
+	 *
+	 * @param   mixed    $pks     An optional array of primary key values to update. If not set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published]
+	 * @param   integer  $userId  The user ID of the user performing the operation.
+	 *
+	 * @return  boolean  True on success; false if $pks is empty.
+	 *
+	 * @since   11.1
+	 */
+	public function publish($pks = null, $state = 1, $userId = 0)
+	{
+		// Sanitize input
+		$userId = (int) $userId;
+		$state  = (int) $state;
+
+		if (!is_null($pks))
+		{
+			if (!is_array($pks))
+			{
+				$pks = array($pks);
+			}
+
+			foreach ($pks as $key => $pk)
+			{
+				if (!is_array($pk))
+				{
+					$pks[$key] = array($this->_tbl_key => $pk);
+				}
+			}
+		}
+
+		// If there are no primary keys set check to see if the instance key is set.
+		if (empty($pks))
+		{
+			$pk = array();
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				if ($this->$key)
+				{
+					$pk[$key] = $this->$key;
+				}
+				// We don't have a full primary key - return false
+				else
+				{
+					$this->setError(\JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
+					return false;
+				}
+			}
+
+			$pks = array($pk);
+		}
+
+		$publishedField = $this->getColumnAlias('published');
+		$checkedOutField = $this->getColumnAlias('checked_out');
+
+		foreach ($pks as $pk)
+		{
+			// Update the publishing state for rows with the given primary keys.
+			$query = $this->_db->getQuery(true)
+				->update($this->_tbl)
+				->set($this->_db->quoteName($publishedField) . ' = ' . (int) $state);
+
+			// If publishing, set published date/time if not previously set
+			if ($state && property_exists($this, 'publish_up') && (int) $this->publish_up == 0)
+			{
+				$nowDate = $this->_db->quote(\JFactory::getDate()->toSql());
+				$query->set($this->_db->quoteName($this->getColumnAlias('publish_up')) . ' = ' . $nowDate);
+			}
+
+			// Determine if there is checkin support for the table.
+			if (property_exists($this, 'checked_out') || property_exists($this, 'checked_out_time'))
+			{
+				$query->where(
+					'('
+						. $this->_db->quoteName($checkedOutField) . ' = 0'
+						. ' OR ' . $this->_db->quoteName($checkedOutField) . ' = ' . (int) $userId
+						. ' OR ' . $this->_db->quoteName($checkedOutField) . ' IS NULL'
+					. ')'
+				);
+				$checkin = true;
+			}
+			else
+			{
+				$checkin = false;
+			}
+
+			// Build the WHERE clause for the primary keys.
+			$this->appendPrimaryKeys($query, $pk);
+
+			$this->_db->setQuery($query);
+
+			try
+			{
+				$this->_db->execute();
+			}
+			catch (\RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+
+				return false;
+			}
+
+			// If checkin is supported and all rows were adjusted, check them in.
+			if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+			{
+				$this->checkin($pk);
+			}
+
+			// If the Table instance value is in the list of primary keys that were set, set the instance.
+			$ours = true;
+
+			foreach ($this->_tbl_keys as $key)
+			{
+				if ($this->$key != $pk[$key])
+				{
+					$ours = false;
+				}
+			}
+
+			if ($ours)
+			{
+				$this->$publishedField = $state;
+			}
+		}
+
+		$this->setError('');
+
+		return true;
+	}
+
+	/**
+	 * Method to lock the database table for writing.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	protected function _lock()
+	{
+		$this->_db->lockTable($this->_tbl);
+		$this->_locked = true;
+
+		return true;
+	}
+
+	/**
+	 * Method to return the real name of a "special" column such as ordering, hits, published
+	 * etc etc. In this way you are free to follow your db naming convention and use the
+	 * built in \Joomla functions.
+	 *
+	 * @param   string  $column  Name of the "special" column (ie ordering, hits)
+	 *
+	 * @return  string  The string that identify the special
+	 *
+	 * @since   3.4
+	 */
+	public function getColumnAlias($column)
+	{
+		// Get the column data if set
+		if (isset($this->_columnAlias[$column]))
+		{
+			$return = $this->_columnAlias[$column];
+		}
+		else
+		{
+			$return = $column;
+		}
+
+		// Sanitize the name
+		$return = preg_replace('#[^A-Z0-9_]#i', '', $return);
+
+		return $return;
+	}
+
+	/**
+	 * Method to register a column alias for a "special" column.
+	 *
+	 * @param   string  $column       The "special" column (ie ordering)
+	 * @param   string  $columnAlias  The real column name (ie foo_ordering)
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function setColumnAlias($column, $columnAlias)
+	{
+		// Santize the column name alias
+		$column = strtolower($column);
+		$column = preg_replace('#[^A-Z0-9_]#i', '', $column);
+
+		// Set the column alias internally
+		$this->_columnAlias[$column] = $columnAlias;
+	}
+
+	/**
+	 * Method to unlock the database table for writing.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	protected function _unlock()
+	{
+		$this->_db->unlockTables();
+		$this->_locked = false;
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Table/TableInterface.php b/core/libraries/src/Table/TableInterface.php
new file mode 100644
index 00000000..632f3997
--- /dev/null
+++ b/core/libraries/src/Table/TableInterface.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Table class interface.
+ *
+ * @since  3.2
+ */
+interface TableInterface
+{
+	/**
+	 * Method to bind an associative array or object to the TableInterface instance.
+	 *
+	 * This method only binds properties that are publicly accessible and optionally takes an array of properties to ignore when binding.
+	 *
+	 * @param   mixed  $src     An associative array or object to bind to the TableInterface instance.
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 * @throws  \UnexpectedValueException
+	 */
+	public function bind($src, $ignore = array());
+
+	/**
+	 * Method to perform sanity checks on the TableInterface instance properties to ensure they are safe to store in the database.
+	 *
+	 * Implementations of this interface should use this method to make sure the data they are storing in the database is safe and
+	 * as expected before storage.
+	 *
+	 * @return  boolean  True if the instance is sane and able to be stored in the database.
+	 *
+	 * @since   3.2
+	 */
+	public function check();
+
+	/**
+	 * Method to delete a record.
+	 *
+	 * @param   mixed  $pk  An optional primary key value to delete.  If not set the instance property value is used.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 * @throws  \UnexpectedValueException
+	 */
+	public function delete($pk = null);
+
+	/**
+	 * Method to get the \JDatabaseDriver object.
+	 *
+	 * @return  \JDatabaseDriver  The internal database driver object.
+	 *
+	 * @since   3.2
+	 */
+	public function getDbo();
+
+	/**
+	 * Method to get the primary key field name for the table.
+	 *
+	 * @return  string  The name of the primary key for the table.
+	 *
+	 * @since   3.2
+	 */
+	public function getKeyName();
+
+	/**
+	 * Method to load a row from the database by primary key and bind the fields to the TableInterface instance properties.
+	 *
+	 * @param   mixed    $keys   An optional primary key value to load the row by, or an array of fields to match.  If not
+	 *                           set the instance property value is used.
+	 * @param   boolean  $reset  True to reset the default values before loading the new row.
+	 *
+	 * @return  boolean  True if successful. False if row not found.
+	 *
+	 * @since   3.2
+	 * @throws  \RuntimeException
+	 * @throws  \UnexpectedValueException
+	 */
+	public function load($keys = null, $reset = true);
+
+	/**
+	 * Method to reset class properties to the defaults set in the class definition.
+	 *
+	 * It will ignore the primary key as well as any private class properties.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function reset();
+
+	/**
+	 * Method to store a row in the database from the TableInterface instance properties.
+	 *
+	 * If a primary key value is set the row with that primary key value will be updated with the instance property values.
+	 * If no primary key value is set a new row will be inserted into the database with the properties from the TableInterface instance.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function store($updateNulls = false);
+}
diff --git a/core/libraries/src/Table/Ucm.php b/core/libraries/src/Table/Ucm.php
new file mode 100644
index 00000000..bf9444f0
--- /dev/null
+++ b/core/libraries/src/Table/Ucm.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * UCM map table
+ *
+ * @since  3.1
+ */
+class Ucm extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  A database connector object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__ucm_base', 'ucm_id', $db);
+	}
+}
diff --git a/core/libraries/src/Table/Update.php b/core/libraries/src/Table/Update.php
new file mode 100644
index 00000000..5897b2c9
--- /dev/null
+++ b/core/libraries/src/Table/Update.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Update table
+ * Stores updates temporarily
+ *
+ * @since  11.1
+ */
+class Update extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__updates', 'update_id', $db);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True if the object is ok
+	 *
+	 * @see     Table::check()
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		// Check for valid name
+		if (trim($this->name) == '' || trim($this->element) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_EXTENSION'));
+
+			return false;
+		}
+
+		if (!$this->update_id && !$this->data)
+		{
+			$this->data = '';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Overloaded bind function
+	 *
+	 * @param   array  $array   Named array
+	 * @param   mixed  $ignore  An optional array or space separated list of properties
+	 *                          to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @see     Table::bind()
+	 * @since   11.1
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (isset($array['params']) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		if (isset($array['control']) && is_array($array['control']))
+		{
+			$registry = new Registry($array['control']);
+			$array['control'] = (string) $registry;
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Method to create and execute a SELECT WHERE query.
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 * @return  string  Results of query
+	 *
+	 * @since   11.1
+	 */
+	public function find($options = array())
+	{
+		$where = array();
+
+		foreach ($options as $col => $val)
+		{
+			$where[] = $col . ' = ' . $this->_db->quote($val);
+		}
+
+		$query = $this->_db->getQuery(true)
+			->select($this->_db->quoteName($this->_tbl_key))
+			->from($this->_db->quoteName($this->_tbl))
+			->where(implode(' AND ', $where));
+		$this->_db->setQuery($query);
+
+		return $this->_db->loadResult();
+	}
+}
diff --git a/core/libraries/src/Table/UpdateSite.php b/core/libraries/src/Table/UpdateSite.php
new file mode 100644
index 00000000..ae489118
--- /dev/null
+++ b/core/libraries/src/Table/UpdateSite.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Update site table
+ * Stores the update sites for extensions
+ *
+ * @package     Joomla.Platform
+ * @subpackage  Table
+ * @since       3.4
+ */
+class UpdateSite extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   3.4
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__update_sites', 'update_site_id', $db);
+	}
+
+	/**
+	 * Overloaded check function
+	 *
+	 * @return  boolean  True if the object is ok
+	 *
+	 * @see     Table::check()
+	 * @since   3.4
+	 */
+	public function check()
+	{
+		// Check for valid name
+		if (trim($this->name) == '' || trim($this->location) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_MUSTCONTAIN_A_TITLE_EXTENSION'));
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Table/User.php b/core/libraries/src/Table/User.php
new file mode 100644
index 00000000..e74667c5
--- /dev/null
+++ b/core/libraries/src/Table/User.php
@@ -0,0 +1,492 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Users table
+ *
+ * @since  11.1
+ */
+class User extends Table
+{
+	/**
+	 * Associative array of group ids => group ids for the user
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $groups;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since  11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__users', 'id', $db);
+
+		// Initialise.
+		$this->id = 0;
+		$this->sendEmail = 0;
+	}
+
+	/**
+	 * Method to load a user, user groups, and any other necessary data
+	 * from the database so that it can be bound to the user object.
+	 *
+	 * @param   integer  $userId  An optional user id.
+	 * @param   boolean  $reset   False if row not found or on error
+	 *                           (internal error state set in that case).
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function load($userId = null, $reset = true)
+	{
+		// Get the id to load.
+		if ($userId !== null)
+		{
+			$this->id = $userId;
+		}
+		else
+		{
+			$userId = $this->id;
+		}
+
+		// Check for a valid id to load.
+		if ($userId === null)
+		{
+			return false;
+		}
+
+		// Reset the table.
+		$this->reset();
+
+		// Load the user data.
+		$query = $this->_db->getQuery(true)
+			->select('*')
+			->from($this->_db->quoteName('#__users'))
+			->where($this->_db->quoteName('id') . ' = ' . (int) $userId);
+		$this->_db->setQuery($query);
+		$data = (array) $this->_db->loadAssoc();
+
+		if (!count($data))
+		{
+			return false;
+		}
+
+		// Convert email from punycode
+		$data['email'] = \JStringPunycode::emailToUTF8($data['email']);
+
+		// Bind the data to the table.
+		$return = $this->bind($data);
+
+		if ($return !== false)
+		{
+			// Load the user groups.
+			$query->clear()
+				->select($this->_db->quoteName('g.id'))
+				->select($this->_db->quoteName('g.title'))
+				->from($this->_db->quoteName('#__usergroups') . ' AS g')
+				->join('INNER', $this->_db->quoteName('#__user_usergroup_map') . ' AS m ON m.group_id = g.id')
+				->where($this->_db->quoteName('m.user_id') . ' = ' . (int) $userId);
+			$this->_db->setQuery($query);
+
+			// Add the groups to the user data.
+			$this->groups = $this->_db->loadAssocList('id', 'id');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to bind the user, user groups, and any other necessary data.
+	 *
+	 * @param   array  $array   The data to bind.
+	 * @param   mixed  $ignore  An array or space separated list of fields to ignore.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function bind($array, $ignore = '')
+	{
+		if (array_key_exists('params', $array) && is_array($array['params']))
+		{
+			$registry = new Registry($array['params']);
+			$array['params'] = (string) $registry;
+		}
+
+		// Attempt to bind the data.
+		$return = parent::bind($array, $ignore);
+
+		// Load the real group data based on the bound ids.
+		if ($return && !empty($this->groups))
+		{
+			// Set the group ids.
+			$this->groups = ArrayHelper::toInteger($this->groups);
+
+			// Get the titles for the user groups.
+			$query = $this->_db->getQuery(true)
+				->select($this->_db->quoteName('id'))
+				->select($this->_db->quoteName('title'))
+				->from($this->_db->quoteName('#__usergroups'))
+				->where($this->_db->quoteName('id') . ' = ' . implode(' OR ' . $this->_db->quoteName('id') . ' = ', $this->groups));
+			$this->_db->setQuery($query);
+
+			// Set the titles for the user groups.
+			$this->groups = $this->_db->loadAssocList('id', 'id');
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Validation and filtering
+	 *
+	 * @return  boolean  True if satisfactory
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		// Set user id to null istead of 0, if needed
+		if ($this->id === 0)
+		{
+			$this->id = null;
+		}
+
+		$filterInput = \JFilterInput::getInstance();
+
+		// Validate user information
+		if ($filterInput->clean($this->name, 'TRIM') == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_YOUR_NAME'));
+
+			return false;
+		}
+
+		if ($filterInput->clean($this->username, 'TRIM') == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_PLEASE_ENTER_A_USER_NAME'));
+
+			return false;
+		}
+
+		if (preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $this->username) || strlen(utf8_decode($this->username)) < 2
+			|| $filterInput->clean($this->username, 'TRIM') !== $this->username)
+		{
+			$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_VALID_AZ09', 2));
+
+			return false;
+		}
+
+		if (($filterInput->clean($this->email, 'TRIM') == '') || !\JMailHelper::isEmailAddress($this->email))
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_VALID_MAIL'));
+
+			return false;
+		}
+
+		// Convert email to punycode for storage
+		$this->email = \JStringPunycode::emailToPunycode($this->email);
+
+		// Set the registration timestamp
+		if (empty($this->registerDate) || $this->registerDate == $this->_db->getNullDate())
+		{
+			$this->registerDate = \JFactory::getDate()->toSql();
+		}
+
+		// Set the lastvisitDate timestamp
+		if (empty($this->lastvisitDate))
+		{
+			$this->lastvisitDate = $this->_db->getNullDate();
+		}
+
+		// Set the lastResetTime timestamp
+		if (empty($this->lastResetTime))
+		{
+			$this->lastResetTime = $this->_db->getNullDate();
+		}
+
+		// Check for existing username
+		$query = $this->_db->getQuery(true)
+			->select($this->_db->quoteName('id'))
+			->from($this->_db->quoteName('#__users'))
+			->where($this->_db->quoteName('username') . ' = ' . $this->_db->quote($this->username))
+			->where($this->_db->quoteName('id') . ' != ' . (int) $this->id);
+		$this->_db->setQuery($query);
+
+		$xid = (int) $this->_db->loadResult();
+
+		if ($xid && $xid != (int) $this->id)
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERNAME_INUSE'));
+
+			return false;
+		}
+
+		// Check for existing email
+		$query->clear()
+			->select($this->_db->quoteName('id'))
+			->from($this->_db->quoteName('#__users'))
+			->where($this->_db->quoteName('email') . ' = ' . $this->_db->quote($this->email))
+			->where($this->_db->quoteName('id') . ' != ' . (int) $this->id);
+		$this->_db->setQuery($query);
+		$xid = (int) $this->_db->loadResult();
+
+		if ($xid && $xid != (int) $this->id)
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_EMAIL_INUSE'));
+
+			return false;
+		}
+
+		// Check for root_user != username
+		$config = \JFactory::getConfig();
+		$rootUser = $config->get('root_user');
+
+		if (!is_numeric($rootUser))
+		{
+			$query->clear()
+				->select($this->_db->quoteName('id'))
+				->from($this->_db->quoteName('#__users'))
+				->where($this->_db->quoteName('username') . ' = ' . $this->_db->quote($rootUser));
+			$this->_db->setQuery($query);
+			$xid = (int) $this->_db->loadResult();
+
+			if ($rootUser == $this->username && (!$xid || $xid && $xid != (int) $this->id)
+				|| $xid && $xid == (int) $this->id && $rootUser != $this->username)
+			{
+				$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERNAME_CANNOT_CHANGE'));
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to store a row in the database from the Table instance properties.
+	 *
+	 * If a primary key value is set the row with that primary key value will be updated with the instance property values.
+	 * If no primary key value is set a new row will be inserted into the database with the properties from the Table instance.
+	 *
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function store($updateNulls = false)
+	{
+		// Get the table key and key value.
+		$k = $this->_tbl_key;
+		$key = $this->$k;
+
+		// TODO: This is a dumb way to handle the groups.
+		// Store groups locally so as to not update directly.
+		$groups = $this->groups;
+		unset($this->groups);
+
+		// Insert or update the object based on presence of a key value.
+		if ($key)
+		{
+			// Already have a table key, update the row.
+			$this->_db->updateObject($this->_tbl, $this, $this->_tbl_key, $updateNulls);
+		}
+		else
+		{
+			// Don't have a table key, insert the row.
+			$this->_db->insertObject($this->_tbl, $this, $this->_tbl_key);
+		}
+
+		// Reset groups to the local object.
+		$this->groups = $groups;
+
+		$query = $this->_db->getQuery(true);
+
+		// Store the group data if the user data was saved.
+		if (is_array($this->groups) && count($this->groups))
+		{
+			// Grab all usergroup entries for the user
+			$query -> clear()
+				-> select($this->_db->quoteName('group_id'))
+				-> from($this->_db->quoteName('#__user_usergroup_map'))
+				-> where($this->_db->quoteName('user_id') . ' = ' . (int) $this->id);
+
+			$this->_db->setQuery($query);
+			$result = $this->_db->loadObjectList();
+
+			// Loop through them and check if database contains something $this->groups does not
+			if (count($result))
+			{
+				foreach ($result as $map)
+				{
+					if (array_key_exists($map->group_id, $this->groups))
+					{
+						// It already exists, no action required
+						unset($groups[$map->group_id]);
+					}
+					else
+					{
+						// It should be removed
+						$query -> clear()
+							-> delete($this->_db->quoteName('#__user_usergroup_map'))
+							-> where($this->_db->quoteName('user_id') . ' = ' . (int) $this->id)
+							-> where($this->_db->quoteName('group_id') . ' = ' . (int) $map->group_id);
+
+						$this->_db->setQuery($query);
+						$this->_db->execute();
+					}
+				}
+			}
+
+			// If there is anything left in this->groups it needs to be inserted
+			if (count($groups))
+			{
+				// Set the new user group maps.
+				$query->clear()
+					->insert($this->_db->quoteName('#__user_usergroup_map'))
+					->columns(array($this->_db->quoteName('user_id'), $this->_db->quoteName('group_id')));
+
+				// Have to break this up into individual queries for cross-database support.
+				foreach ($groups as $group)
+				{
+					$query->clear('values')
+						->values($this->id . ', ' . $group);
+					$this->_db->setQuery($query);
+					$this->_db->execute();
+				}
+			}
+
+			unset($groups);
+		}
+
+		// If a user is blocked, delete the cookie login rows
+		if ($this->block == (int) 1)
+		{
+			$query->clear()
+				->delete($this->_db->quoteName('#__user_keys'))
+				->where($this->_db->quoteName('user_id') . ' = ' . $this->_db->quote($this->username));
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to delete a user, user groups, and any other necessary data from the database.
+	 *
+	 * @param   integer  $userId  An optional user id.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function delete($userId = null)
+	{
+		// Set the primary key to delete.
+		$k = $this->_tbl_key;
+
+		if ($userId)
+		{
+			$this->$k = (int) $userId;
+		}
+
+		// Delete the user.
+		$query = $this->_db->getQuery(true)
+			->delete($this->_db->quoteName($this->_tbl))
+			->where($this->_db->quoteName($this->_tbl_key) . ' = ' . (int) $this->$k);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		// Delete the user group maps.
+		$query->clear()
+			->delete($this->_db->quoteName('#__user_usergroup_map'))
+			->where($this->_db->quoteName('user_id') . ' = ' . (int) $this->$k);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		/*
+		 * Clean Up Related Data.
+		 */
+
+		$query->clear()
+			->delete($this->_db->quoteName('#__messages_cfg'))
+			->where($this->_db->quoteName('user_id') . ' = ' . (int) $this->$k);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		$query->clear()
+			->delete($this->_db->quoteName('#__messages'))
+			->where($this->_db->quoteName('user_id_to') . ' = ' . (int) $this->$k);
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		$query->clear()
+			->delete($this->_db->quoteName('#__user_keys'))
+			->where($this->_db->quoteName('user_id') . ' = ' . $this->_db->quote($this->username));
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+
+		return true;
+	}
+
+	/**
+	 * Updates last visit time of user
+	 *
+	 * @param   integer  $timeStamp  The timestamp, defaults to 'now'.
+	 * @param   integer  $userId     The user id (optional).
+	 *
+	 * @return  boolean  False if an error occurs
+	 *
+	 * @since   11.1
+	 */
+	public function setLastVisit($timeStamp = null, $userId = null)
+	{
+		// Check for User ID
+		if (is_null($userId))
+		{
+			if (isset($this))
+			{
+				$userId = $this->id;
+			}
+			else
+			{
+				jexit('No userid in setLastVisit');
+			}
+		}
+
+		// If no timestamp value is passed to function, than current time is used.
+		$date = \JFactory::getDate($timeStamp);
+
+		// Update the database row for the user.
+		$db = $this->_db;
+		$query = $db->getQuery(true)
+			->update($db->quoteName($this->_tbl))
+			->set($db->quoteName('lastvisitDate') . '=' . $db->quote($date->toSql()))
+			->where($db->quoteName('id') . '=' . (int) $userId);
+		$db->setQuery($query);
+		$db->execute();
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Table/Usergroup.php b/core/libraries/src/Table/Usergroup.php
new file mode 100644
index 00000000..d171de9d
--- /dev/null
+++ b/core/libraries/src/Table/Usergroup.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Usergroup table class.
+ *
+ * @since  11.1
+ */
+class Usergroup extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__usergroups', 'id', $db);
+	}
+
+	/**
+	 * Method to check the current record to save
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		// Validate the title.
+		if ((trim($this->title)) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERGROUP_TITLE'));
+
+			return false;
+		}
+
+		// Check for a duplicate parent_id, title.
+		// There is a unique index on the (parent_id, title) field in the table.
+		$db = $this->_db;
+		$query = $db->getQuery(true)
+			->select('COUNT(title)')
+			->from($this->_tbl)
+			->where('title = ' . $db->quote(trim($this->title)))
+			->where('parent_id = ' . (int) $this->parent_id)
+			->where('id <> ' . (int) $this->id);
+		$db->setQuery($query);
+
+		if ($db->loadResult() > 0)
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_USERGROUP_TITLE_EXISTS'));
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to recursively rebuild the nested set tree.
+	 *
+	 * @param   integer  $parent_id  The root of the tree to rebuild.
+	 * @param   integer  $left       The left id to start with in building the tree.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function rebuild($parent_id = 0, $left = 0)
+	{
+		// Get the database object
+		$db = $this->_db;
+
+		// Get all children of this node
+		$db->setQuery('SELECT id FROM ' . $this->_tbl . ' WHERE parent_id=' . (int) $parent_id . ' ORDER BY parent_id, title');
+		$children = $db->loadColumn();
+
+		// The right value of this node is the left value + 1
+		$right = $left + 1;
+
+		// Execute this function recursively over all children
+		for ($i = 0, $n = count($children); $i < $n; $i++)
+		{
+			// $right is the current right value, which is incremented on recursion return
+			$right = $this->rebuild($children[$i], $right);
+
+			// If there is an update failure, return false to break out of the recursion
+			if ($right === false)
+			{
+				return false;
+			}
+		}
+
+		// We've got the left value, and now that we've processed
+		// the children of this node we also know the right value
+		$db->setQuery('UPDATE ' . $this->_tbl . ' SET lft=' . (int) $left . ', rgt=' . (int) $right . ' WHERE id=' . (int) $parent_id);
+
+		// If there is an update failure, return false to break out of the recursion
+		try
+		{
+			$db->execute();
+		}
+		catch (\JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		// Return the right value of this node + 1
+		return $right + 1;
+	}
+
+	/**
+	 * Inserts a new row if id is zero or updates an existing row in the database table
+	 *
+	 * @param   boolean  $updateNulls  If false, null object variables are not updated
+	 *
+	 * @return  boolean  True if successful, false otherwise and an internal error message is set
+	 *
+	 * @since   11.1
+	 */
+	public function store($updateNulls = false)
+	{
+		if ($result = parent::store($updateNulls))
+		{
+			// Rebuild the nested set tree.
+			$this->rebuild();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Delete this object and its dependencies
+	 *
+	 * @param   integer  $oid  The primary key of the user group to delete.
+	 *
+	 * @return  mixed  Boolean or Exception.
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException on database error.
+	 * @throws  \UnexpectedValueException on data error.
+	 */
+	public function delete($oid = null)
+	{
+		if ($oid)
+		{
+			$this->load($oid);
+		}
+
+		if ($this->id == 0)
+		{
+			throw new \UnexpectedValueException('Usergroup not found');
+		}
+
+		if ($this->parent_id == 0)
+		{
+			throw new \UnexpectedValueException('Root usergroup cannot be deleted.');
+		}
+
+		if ($this->lft == 0 || $this->rgt == 0)
+		{
+			throw new \UnexpectedValueException('Left-Right data inconsistency. Cannot delete usergroup.');
+		}
+
+		$db = $this->_db;
+
+		// Select the usergroup ID and its children
+		$query = $db->getQuery(true)
+			->select($db->quoteName('c.id'))
+			->from($db->quoteName($this->_tbl) . 'AS c')
+			->where($db->quoteName('c.lft') . ' >= ' . (int) $this->lft)
+			->where($db->quoteName('c.rgt') . ' <= ' . (int) $this->rgt);
+		$db->setQuery($query);
+		$ids = $db->loadColumn();
+
+		if (empty($ids))
+		{
+			throw new \UnexpectedValueException('Left-Right data inconsistency. Cannot delete usergroup.');
+		}
+
+		// Delete the usergroup and its children
+		$query->clear()
+			->delete($db->quoteName($this->_tbl))
+			->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')');
+		$db->setQuery($query);
+		$db->execute();
+
+		// Delete the usergroup in view levels
+		$replace = array();
+
+		foreach ($ids as $id)
+		{
+			$replace[] = ',' . $db->quote("[$id,") . ',' . $db->quote('[') . ')';
+			$replace[] = ',' . $db->quote(",$id,") . ',' . $db->quote(',') . ')';
+			$replace[] = ',' . $db->quote(",$id]") . ',' . $db->quote(']') . ')';
+			$replace[] = ',' . $db->quote("[$id]") . ',' . $db->quote('[]') . ')';
+		}
+
+		$query->clear()
+			->select('id, rules')
+			->from('#__viewlevels');
+		$db->setQuery($query);
+		$rules = $db->loadObjectList();
+
+		$match_ids = array();
+
+		foreach ($rules as $rule)
+		{
+			foreach ($ids as $id)
+			{
+				if (strstr($rule->rules, '[' . $id) || strstr($rule->rules, ',' . $id) || strstr($rule->rules, $id . ']'))
+				{
+					$match_ids[] = $rule->id;
+				}
+			}
+		}
+
+		if (!empty($match_ids))
+		{
+			$query->clear()
+				->set('rules=' . str_repeat('replace(', 4 * count($ids)) . 'rules' . implode('', $replace))
+				->update('#__viewlevels')
+				->where('id IN (' . implode(',', $match_ids) . ')');
+			$db->setQuery($query);
+			$db->execute();
+		}
+
+		// Delete the user to usergroup mappings for the group(s) from the database.
+		$query->clear()
+			->delete($db->quoteName('#__user_usergroup_map'))
+			->where($db->quoteName('group_id') . ' IN (' . implode(',', $ids) . ')');
+		$db->setQuery($query);
+		$db->execute();
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Table/ViewLevel.php b/core/libraries/src/Table/ViewLevel.php
new file mode 100644
index 00000000..a5515e7e
--- /dev/null
+++ b/core/libraries/src/Table/ViewLevel.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Table;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Viewlevels table class.
+ *
+ * @since  11.1
+ */
+class ViewLevel extends Table
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   \JDatabaseDriver  $db  Database driver object.
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($db)
+	{
+		parent::__construct('#__viewlevels', 'id', $db);
+	}
+
+	/**
+	 * Method to bind the data.
+	 *
+	 * @param   array  $array   The data to bind.
+	 * @param   mixed  $ignore  An array or space separated list of fields to ignore.
+	 *
+	 * @return  boolean  True on success, false on failure.
+	 *
+	 * @since   11.1
+	 */
+	public function bind($array, $ignore = '')
+	{
+		// Bind the rules as appropriate.
+		if (isset($array['rules']))
+		{
+			if (is_array($array['rules']))
+			{
+				$array['rules'] = json_encode($array['rules']);
+			}
+		}
+
+		return parent::bind($array, $ignore);
+	}
+
+	/**
+	 * Method to check the current record to save
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function check()
+	{
+		// Validate the title.
+		if ((trim($this->title)) == '')
+		{
+			$this->setError(\JText::_('JLIB_DATABASE_ERROR_VIEWLEVEL'));
+
+			return false;
+		}
+
+		// Check for a duplicate title.
+		$db = $this->_db;
+		$query = $db->getQuery(true)
+			->select('COUNT(title)')
+			->from($db->quoteName('#__viewlevels'))
+			->where($db->quoteName('title') . ' = ' . $db->quote($this->title))
+			->where($db->quoteName('id') . ' != ' . (int) $this->id);
+		$db->setQuery($query);
+
+		if ($db->loadResult() > 0)
+		{
+			$this->setError(\JText::sprintf('JLIB_DATABASE_ERROR_USERLEVEL_NAME_EXISTS', $this->title));
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/ConfirmButton.php b/core/libraries/src/Toolbar/Button/ConfirmButton.php
new file mode 100644
index 00000000..cc8d7b35
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/ConfirmButton.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a standard button with a confirm dialog
+ *
+ * @since  3.0
+ */
+class ConfirmButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 *
+	 * @var    string
+	 */
+	protected $_name = 'Confirm';
+
+	/**
+	 * Fetch the HTML for the button
+	 *
+	 * @param   string   $type      Unused string.
+	 * @param   string   $msg       Message to render
+	 * @param   string   $name      Name to be used as apart of the id
+	 * @param   string   $text      Button text
+	 * @param   string   $task      The task associated with the button
+	 * @param   boolean  $list      True to allow use of lists
+	 * @param   boolean  $hideMenu  True to hide the menu on click
+	 *
+	 * @return  string   HTML string for the button
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Confirm', $msg = '', $name = '', $text = '', $task = '', $list = true, $hideMenu = false)
+	{
+		// Store all data to the options array for use with JLayout
+		$options = array();
+		$options['text'] = \JText::_($text);
+		$options['msg'] = \JText::_($msg, true);
+		$options['class'] = $this->fetchIconClass($name);
+		$options['doTask'] = $this->_getCommand($options['msg'], $name, $task, $list);
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.confirm');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Get the button CSS Id
+	 *
+	 * @param   string   $type      Button type
+	 * @param   string   $msg       Message to display
+	 * @param   string   $name      Name to be used as apart of the id
+	 * @param   string   $text      Button text
+	 * @param   string   $task      The task associated with the button
+	 * @param   boolean  $list      True to allow use of lists
+	 * @param   boolean  $hideMenu  True to hide the menu on click
+	 *
+	 * @return  string  Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId($type = 'Confirm', $msg = '', $name = '', $text = '', $task = '', $list = true, $hideMenu = false)
+	{
+		return $this->_parent->getName() . '-' . $name;
+	}
+
+	/**
+	 * Get the JavaScript command for the button
+	 *
+	 * @param   object   $msg   The message to display.
+	 * @param   string   $name  Not used.
+	 * @param   string   $task  The task used by the application
+	 * @param   boolean  $list  True is requires a list confirmation.
+	 *
+	 * @return  string  JavaScript command string
+	 *
+	 * @since   3.0
+	 */
+	protected function _getCommand($msg, $name, $task, $list)
+	{
+		\JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+
+		$cmd = "if (confirm('" . $msg . "')) { Joomla.submitbutton('" . $task . "'); }";
+
+		if ($list)
+		{
+			$alert = "alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));";
+			$cmd   = "if (document.adminForm.boxchecked.value == 0) { " . $alert . " } else { " . $cmd . " }";
+		}
+
+		return $cmd;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/CustomButton.php b/core/libraries/src/Toolbar/Button/CustomButton.php
new file mode 100644
index 00000000..0b97b026
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/CustomButton.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a custom button
+ *
+ * @since  3.0
+ */
+class CustomButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 *
+	 * @var    string
+	 */
+	protected $_name = 'Custom';
+
+	/**
+	 * Fetch the HTML for the button
+	 *
+	 * @param   string  $type  Button type, unused string.
+	 * @param   string  $html  HTML strng for the button
+	 * @param   string  $id    CSS id for the button
+	 *
+	 * @return  string   HTML string for the button
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Custom', $html = '', $id = 'custom')
+	{
+		return $html;
+	}
+
+	/**
+	 * Get the button CSS Id
+	 *
+	 * @param   string  $type  Not used.
+	 * @param   string  $html  Not used.
+	 * @param   string  $id    The id prefix for the button.
+	 *
+	 * @return  string  Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId($type = 'Custom', $html = '', $id = 'custom')
+	{
+		return $this->_parent->getName() . '-' . $id;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/HelpButton.php b/core/libraries/src/Toolbar/Button/HelpButton.php
new file mode 100644
index 00000000..45848af9
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/HelpButton.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Help\Help;
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a help popup window button
+ *
+ * @since  3.0
+ */
+class HelpButton extends ToolbarButton
+{
+	/**
+	 * @var    string	Button type
+	 */
+	protected $_name = 'Help';
+
+	/**
+	 * Fetches the button HTML code.
+	 *
+	 * @param   string   $type       Unused string.
+	 * @param   string   $ref        The name of the help screen (its key reference).
+	 * @param   boolean  $com        Use the help file in the component directory.
+	 * @param   string   $override   Use this URL instead of any other.
+	 * @param   string   $component  Name of component to get Help (null for current component)
+	 *
+	 * @return  string
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Help', $ref = '', $com = false, $override = null, $component = null)
+	{
+		// Store all data to the options array for use with JLayout
+		$options = array();
+		$options['text']   = \JText::_('JTOOLBAR_HELP');
+		$options['doTask'] = $this->_getCommand($ref, $com, $override, $component);
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.help');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Get the button id
+	 *
+	 * Redefined from JButton class
+	 *
+	 * @return  string	Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId()
+	{
+		return $this->_parent->getName() . '-help';
+	}
+
+	/**
+	 * Get the JavaScript command for the button
+	 *
+	 * @param   string   $ref        The name of the help screen (its key reference).
+	 * @param   boolean  $com        Use the help file in the component directory.
+	 * @param   string   $override   Use this URL instead of any other.
+	 * @param   string   $component  Name of component to get Help (null for current component)
+	 *
+	 * @return  string   JavaScript command string
+	 *
+	 * @since   3.0
+	 */
+	protected function _getCommand($ref, $com, $override, $component)
+	{
+		// Get Help URL
+		$url = Help::createUrl($ref, $com, $override, $component);
+		$url = htmlspecialchars($url, ENT_QUOTES);
+		$cmd = "Joomla.popupWindow('$url', '" . \JText::_('JHELP', true) . "', 700, 500, 1)";
+
+		return $cmd;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/LinkButton.php b/core/libraries/src/Toolbar/Button/LinkButton.php
new file mode 100644
index 00000000..1820e03a
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/LinkButton.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a link button
+ *
+ * @since  3.0
+ */
+class LinkButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 * @var    string
+	 */
+	protected $_name = 'Link';
+
+	/**
+	 * Fetch the HTML for the button
+	 *
+	 * @param   string  $type  Unused string.
+	 * @param   string  $name  Name to be used as apart of the id
+	 * @param   string  $text  Button text
+	 * @param   string  $url   The link url
+	 *
+	 * @return  string  HTML string for the button
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Link', $name = 'back', $text = '', $url = null)
+	{
+		// Store all data to the options array for use with JLayout
+		$options = array();
+		$options['text'] = \JText::_($text);
+		$options['class'] = $this->fetchIconClass($name);
+		$options['doTask'] = $this->_getCommand($url);
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.link');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Get the button CSS Id
+	 *
+	 * @param   string  $type  The button type.
+	 * @param   string  $name  The name of the button.
+	 *
+	 * @return  string  Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId($type = 'Link', $name = '')
+	{
+		return $this->_parent->getName() . '-' . $name;
+	}
+
+	/**
+	 * Get the JavaScript command for the button
+	 *
+	 * @param   object  $url  Button definition
+	 *
+	 * @return  string  JavaScript command string
+	 *
+	 * @since   3.0
+	 */
+	protected function _getCommand($url)
+	{
+		return $url;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/PopupButton.php b/core/libraries/src/Toolbar/Button/PopupButton.php
new file mode 100644
index 00000000..295e3153
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/PopupButton.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a modal window button
+ *
+ * @since  3.0
+ */
+class PopupButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 *
+	 * @var    string
+	 */
+	protected $_name = 'Popup';
+
+	/**
+	 * Fetch the HTML for the button
+	 *
+	 * @param   string   $type     Unused string, formerly button type.
+	 * @param   string   $name     Modal name, used to generate element ID
+	 * @param   string   $text     The link text
+	 * @param   string   $url      URL for popup
+	 * @param   integer  $width    Width of popup
+	 * @param   integer  $height   Height of popup
+	 * @param   integer  $top      Top attribute.  [@deprecated  Unused, will be removed in 4.0]
+	 * @param   integer  $left     Left attribute. [@deprecated  Unused, will be removed in 4.0]
+	 * @param   string   $onClose  JavaScript for the onClose event.
+	 * @param   string   $title    The title text
+	 * @param   string   $footer   The footer html
+	 *
+	 * @return  string  HTML string for the button
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Modal', $name = '', $text = '', $url = '', $width = 640, $height = 480, $top = 0, $left = 0,
+		$onClose = '', $title = '', $footer = null)
+	{
+		// If no $title is set, use the $text element
+		if ($title === '')
+		{
+			$title = $text;
+		}
+
+		// Store all data to the options array for use with JLayout
+		$options = array();
+		$options['name'] = $name;
+		$options['text'] = \JText::_($text);
+		$options['title'] = \JText::_($title);
+		$options['class'] = $this->fetchIconClass($name);
+		$options['doTask'] = $this->_getCommand($url);
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.popup');
+
+		$html = array();
+		$html[] = $layout->render($options);
+
+		// Place modal div and scripts in a new div
+		$html[] = '<div class="btn-group" style="width: 0; margin: 0">';
+
+		// Build the options array for the modal
+		$params = array();
+		$params['title']  = $options['title'];
+		$params['url']    = $options['doTask'];
+		$params['height'] = $height;
+		$params['width']  = $width;
+
+		if (isset($footer))
+		{
+			$params['footer'] = $footer;
+		}
+
+		$html[] = \JHtml::_('bootstrap.renderModal', 'modal-' . $name, $params);
+
+		// If an $onClose event is passed, add it to the modal JS object
+		if ($onClose !== '')
+		{
+			$html[] = '<script>'
+				. 'jQuery(\'#modal-' . $name . '\').on(\'hide\', function () {' . $onClose . ';});'
+				. '</script>';
+		}
+
+		$html[] = '</div>';
+
+		return implode("\n", $html);
+	}
+
+	/**
+	 * Get the button id
+	 *
+	 * @param   string  $type  Button type
+	 * @param   string  $name  Button name
+	 *
+	 * @return  string	Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId($type, $name)
+	{
+		return $this->_parent->getName() . '-popup-' . $name;
+	}
+
+	/**
+	 * Get the JavaScript command for the button
+	 *
+	 * @param   string  $url  URL for popup
+	 *
+	 * @return  string  JavaScript command string
+	 *
+	 * @since   3.0
+	 */
+	private function _getCommand($url)
+	{
+		if (strpos($url, 'http') !== 0)
+		{
+			$url = \JUri::base() . $url;
+		}
+
+		return $url;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/SeparatorButton.php b/core/libraries/src/Toolbar/Button/SeparatorButton.php
new file mode 100644
index 00000000..a657bf2e
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/SeparatorButton.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a button separator
+ *
+ * @since  3.0
+ */
+class SeparatorButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 *
+	 * @var   string
+	 */
+	protected $_name = 'Separator';
+
+	/**
+	 * Get the HTML for a separator in the toolbar
+	 *
+	 * @param   array  &$definition  Class name and custom width
+	 *
+	 * @return  string  The HTML for the separator
+	 *
+	 * @see     ToolbarButton::render()
+	 * @since   3.0
+	 */
+	public function render(&$definition)
+	{
+		// Store all data to the options array for use with JLayout
+		$options = array();
+
+		// Separator class name
+		$options['class'] = empty($definition[1]) ? '' : $definition[1];
+
+		// Custom width
+		$options['style'] = empty($definition[2]) ? '' : ' style="width:' . (int) $definition[2] . 'px;"';
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.separator');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Empty implementation (not required for separator)
+	 *
+	 * @return  void
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton()
+	{
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/SliderButton.php b/core/libraries/src/Toolbar/Button/SliderButton.php
new file mode 100644
index 00000000..80d8ba42
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/SliderButton.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a button to render an HTML element in a slider container
+ *
+ * @since  3.0
+ */
+class SliderButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 *
+	 * @var    string
+	 */
+	protected $_name = 'Slider';
+
+	/**
+	 * Fetch the HTML for the button
+	 *
+	 * @param   string   $type     Unused string, formerly button type.
+	 * @param   string   $name     Button name
+	 * @param   string   $text     The link text
+	 * @param   string   $url      URL for popup
+	 * @param   integer  $width    Width of popup
+	 * @param   integer  $height   Height of popup
+	 * @param   string   $onClose  JavaScript for the onClose event.
+	 *
+	 * @return  string  HTML string for the button
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Slider', $name = '', $text = '', $url = '', $width = 640, $height = 480, $onClose = '')
+	{
+		\JHtml::_('script', 'jui/cms.js', array('version' => 'auto', 'relative' => true));
+
+		// Store all data to the options array for use with JLayout
+		$options = array();
+		$options['text'] = \JText::_($text);
+		$options['name'] = $name;
+		$options['class'] = $this->fetchIconClass($name);
+		$options['onClose'] = '';
+
+		$doTask = $this->_getCommand($url);
+		$options['doTask'] = 'Joomla.setcollapse(\'' . $doTask . '\', \'' . $name . '\', \'' . $height . '\');';
+
+		if ($onClose)
+		{
+			$options['onClose'] = ' rel="{onClose: function() {' . $onClose . '}}"';
+		}
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.slider');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Get the button id
+	 *
+	 * @param   string  $type  Button type
+	 * @param   string  $name  Button name
+	 *
+	 * @return  string	Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId($type, $name)
+	{
+		return $this->_parent->getName() . '-slider-' . $name;
+	}
+
+	/**
+	 * Get the JavaScript command for the button
+	 *
+	 * @param   string  $url  URL for popup
+	 *
+	 * @return  string  JavaScript command string
+	 *
+	 * @since   3.0
+	 */
+	private function _getCommand($url)
+	{
+		if (strpos($url, 'http') !== 0)
+		{
+			$url = \JUri::base() . $url;
+		}
+
+		return $url;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Button/StandardButton.php b/core/libraries/src/Toolbar/Button/StandardButton.php
new file mode 100644
index 00000000..4d897aac
--- /dev/null
+++ b/core/libraries/src/Toolbar/Button/StandardButton.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar\Button;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Toolbar\ToolbarButton;
+
+/**
+ * Renders a standard button
+ *
+ * @since  3.0
+ */
+class StandardButton extends ToolbarButton
+{
+	/**
+	 * Button type
+	 *
+	 * @var    string
+	 */
+	protected $_name = 'Standard';
+
+	/**
+	 * Fetch the HTML for the button
+	 *
+	 * @param   string   $type  Unused string.
+	 * @param   string   $name  The name of the button icon class.
+	 * @param   string   $text  Button text.
+	 * @param   string   $task  Task associated with the button.
+	 * @param   boolean  $list  True to allow lists
+	 *
+	 * @return  string  HTML string for the button
+	 *
+	 * @since   3.0
+	 */
+	public function fetchButton($type = 'Standard', $name = '', $text = '', $task = '', $list = true)
+	{
+		// Store all data to the options array for use with JLayout
+		$options = array();
+		$options['text']     = \JText::_($text);
+		$options['class']    = $this->fetchIconClass($name);
+		$options['doTask']   = $this->_getCommand($options['text'], $task, $list);
+		$options['btnClass'] = 'btn btn-small button-' . $name;
+
+		if ($name === 'apply' || $name === 'new')
+		{
+			$options['btnClass'] .= ' btn-success';
+			$options['class'] .= ' icon-white';
+		}
+
+		// Instantiate a new JLayoutFile instance and render the layout
+		$layout = new FileLayout('joomla.toolbar.standard');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Get the button CSS Id
+	 *
+	 * @param   string   $type      Unused string.
+	 * @param   string   $name      Name to be used as apart of the id
+	 * @param   string   $text      Button text
+	 * @param   string   $task      The task associated with the button
+	 * @param   boolean  $list      True to allow use of lists
+	 * @param   boolean  $hideMenu  True to hide the menu on click
+	 *
+	 * @return  string  Button CSS Id
+	 *
+	 * @since   3.0
+	 */
+	public function fetchId($type = 'Standard', $name = '', $text = '', $task = '', $list = true, $hideMenu = false)
+	{
+		return $this->_parent->getName() . '-' . $name;
+	}
+
+	/**
+	 * Get the JavaScript command for the button
+	 *
+	 * @param   string   $name  The task name as seen by the user
+	 * @param   string   $task  The task used by the application
+	 * @param   boolean  $list  True is requires a list confirmation.
+	 *
+	 * @return  string   JavaScript command string
+	 *
+	 * @since   3.0
+	 */
+	protected function _getCommand($name, $task, $list)
+	{
+		\JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
+
+		$cmd = "Joomla.submitbutton('" . $task . "');";
+
+		if ($list)
+		{
+			$alert = "alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));";
+			$cmd   = "if (document.adminForm.boxchecked.value == 0) { " . $alert . " } else { " . $cmd . " }";
+		}
+
+		return $cmd;
+	}
+}
diff --git a/core/libraries/src/Toolbar/Toolbar.php b/core/libraries/src/Toolbar/Toolbar.php
new file mode 100644
index 00000000..57033d3e
--- /dev/null
+++ b/core/libraries/src/Toolbar/Toolbar.php
@@ -0,0 +1,337 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+
+/**
+ * ToolBar handler
+ *
+ * @since  1.5
+ */
+class Toolbar
+{
+	/**
+	 * Toolbar name
+	 *
+	 * @var    string
+	 */
+	protected $_name = array();
+
+	/**
+	 * Toolbar array
+	 *
+	 * @var    array
+	 */
+	protected $_bar = array();
+
+	/**
+	 * Loaded buttons
+	 *
+	 * @var    array
+	 */
+	protected $_buttons = array();
+
+	/**
+	 * Directories, where button types can be stored.
+	 *
+	 * @var    array
+	 */
+	protected $_buttonPath = array();
+
+	/**
+	 * Stores the singleton instances of various toolbar.
+	 *
+	 * @var    Toolbar
+	 * @since  2.5
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $name  The toolbar name.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct($name = 'toolbar')
+	{
+		$this->_name = $name;
+
+		// Set base path to find buttons.
+		$this->_buttonPath[] = __DIR__ . '/button';
+	}
+
+	/**
+	 * Returns the global Toolbar object, only creating it if it
+	 * doesn't already exist.
+	 *
+	 * @param   string  $name  The name of the toolbar.
+	 *
+	 * @return  \JToolbar  The JToolbar object.
+	 *
+	 * @since   1.5
+	 */
+	public static function getInstance($name = 'toolbar')
+	{
+		if (empty(self::$instances[$name]))
+		{
+			self::$instances[$name] = new Toolbar($name);
+		}
+
+		return self::$instances[$name];
+	}
+
+	/**
+	 * Set a value
+	 *
+	 * @return  string  The set value.
+	 *
+	 * @since   1.5
+	 */
+	public function appendButton()
+	{
+		// Push button onto the end of the toolbar array.
+		$btn          = func_get_args();
+		$this->_bar[] = $btn;
+
+		return true;
+	}
+
+	/**
+	 * Get the list of toolbar links.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		return $this->_bar;
+	}
+
+	/**
+	 * Get the name of the toolbar.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.6
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Get a value.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public function prependButton()
+	{
+		// Insert button into the front of the toolbar array.
+		$btn = func_get_args();
+		array_unshift($this->_bar, $btn);
+
+		return true;
+	}
+
+	/**
+	 * Render a toolbar.
+	 *
+	 * @return  string  HTML for the toolbar.
+	 *
+	 * @since   1.5
+	 */
+	public function render()
+	{
+		$html = array();
+
+		// Start toolbar div.
+		$layout = new FileLayout('joomla.toolbar.containeropen');
+
+		$html[] = $layout->render(array('id' => $this->_name));
+
+		// Render each button in the toolbar.
+		foreach ($this->_bar as $button)
+		{
+			$html[] = $this->renderButton($button);
+		}
+
+		// End toolbar div.
+		$layout = new FileLayout('joomla.toolbar.containerclose');
+
+		$html[] = $layout->render(array());
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Render a button.
+	 *
+	 * @param   object  &$node  A toolbar node.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.5
+	 */
+	public function renderButton(&$node)
+	{
+		// Get the button type.
+		$type = $node[0];
+
+		$button = $this->loadButtonType($type);
+
+		// Check for error.
+		if ($button === false)
+		{
+			return \JText::sprintf('JLIB_HTML_BUTTON_NOT_DEFINED', $type);
+		}
+
+		return $button->render($node);
+	}
+
+	/**
+	 * Loads a button type.
+	 *
+	 * @param   string   $type  Button Type
+	 * @param   boolean  $new   False by default
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function loadButtonType($type, $new = false)
+	{
+		$signature = md5($type);
+
+		if ($new === false && isset($this->_buttons[$signature]))
+		{
+			return $this->_buttons[$signature];
+		}
+
+		if (!class_exists('Joomla\\CMS\\Toolbar\\ToolbarButton'))
+		{
+			\JLog::add(\JText::_('JLIB_HTML_BUTTON_BASE_CLASS'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$buttonClass = $this->loadButtonClass($type);
+
+		if (!$buttonClass)
+		{
+			if (isset($this->_buttonPath))
+			{
+				$dirs = $this->_buttonPath;
+			}
+			else
+			{
+				$dirs = array();
+			}
+
+			$file = \JFilterInput::getInstance()->clean(str_replace('_', DIRECTORY_SEPARATOR, strtolower($type)) . '.php', 'path');
+
+			\JLoader::import('joomla.filesystem.path');
+
+			if ($buttonFile = \JPath::find($dirs, $file))
+			{
+				include_once $buttonFile;
+			}
+			else
+			{
+				\JLog::add(\JText::sprintf('JLIB_HTML_BUTTON_NO_LOAD', $buttonClass, $buttonFile), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+
+			$buttonClass = $this->loadButtonClass($type);
+
+			if (!$buttonClass)
+			{
+				return false;
+			}
+		}
+
+		$this->_buttons[$signature] = new $buttonClass($this);
+
+		return $this->_buttons[$signature];
+	}
+
+	/**
+	 * Load the button class including the deprecated ones.
+	 *
+	 * @param   string  $type  Button Type
+	 *
+	 * @return  string|null
+	 *
+	 * @since   3.8.0
+	 */
+	private function loadButtonClass($type)
+	{
+		$buttonClasses = array(
+			'Joomla\\CMS\\Toolbar\\Button\\' . ucfirst($type) . 'Button',
+			// @deprecated 3.8.0
+			'JToolbarButton' . ucfirst($type),
+			// @deprecated 12.3 Remove the acceptance of legacy classes starting with JButton.
+			'JButton' . ucfirst($type)
+		);
+
+		foreach ($buttonClasses as $buttonClass)
+		{
+			if (!class_exists($buttonClass))
+			{
+				continue;
+			}
+
+			return $buttonClass;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Add a directory where Toolbar should search for button types in LIFO order.
+	 *
+	 * You may either pass a string or an array of directories.
+	 *
+	 * Toolbar will be searching for an element type in the same order you
+	 * added them. If the parameter type cannot be found in the custom folders,
+	 * it will look in libraries/joomla/html/toolbar/button.
+	 *
+	 * @param   mixed  $path  Directory or directories to search.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function addButtonPath($path)
+	{
+		// Loop through the path directories.
+		foreach ((array) $path as $dir)
+		{
+			// No surrounding spaces allowed!
+			$dir = trim($dir);
+
+			// Add trailing separators as needed.
+			if (substr($dir, -1) !== DIRECTORY_SEPARATOR)
+			{
+				// Directory
+				$dir .= DIRECTORY_SEPARATOR;
+			}
+
+			// Add to the top of the search dirs.
+			array_unshift($this->_buttonPath, $dir);
+		}
+	}
+}
diff --git a/core/libraries/src/Toolbar/ToolbarButton.php b/core/libraries/src/Toolbar/ToolbarButton.php
new file mode 100644
index 00000000..4e6f31a3
--- /dev/null
+++ b/core/libraries/src/Toolbar/ToolbarButton.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Toolbar;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Layout\FileLayout;
+
+/**
+ * Button base class
+ *
+ * The JButton is the base class for all JButton types
+ *
+ * @since  3.0
+ */
+abstract class ToolbarButton
+{
+	/**
+	 * element name
+	 *
+	 * This has to be set in the final renderer classes.
+	 *
+	 * @var    string
+	 */
+	protected $_name = null;
+
+	/**
+	 * reference to the object that instantiated the element
+	 *
+	 * @var    \JButton
+	 */
+	protected $_parent = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  $parent  The parent
+	 */
+	public function __construct($parent = null)
+	{
+		$this->_parent = $parent;
+	}
+
+	/**
+	 * Get the element name
+	 *
+	 * @return  string   type of the parameter
+	 *
+	 * @since   3.0
+	 */
+	public function getName()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Get the HTML to render the button
+	 *
+	 * @param   array  &$definition  Parameters to be passed
+	 *
+	 * @return  string
+	 *
+	 * @since   3.0
+	 */
+	public function render(&$definition)
+	{
+		/*
+		 * Initialise some variables
+		 */
+		$id = call_user_func_array(array(&$this, 'fetchId'), $definition);
+		$action = call_user_func_array(array(&$this, 'fetchButton'), $definition);
+
+		// Build id attribute
+		if ($id)
+		{
+			$id = ' id="' . $id . '"';
+		}
+
+		// Build the HTML Button
+		$options = array();
+		$options['id'] = $id;
+		$options['action'] = $action;
+
+		$layout = new FileLayout('joomla.toolbar.base');
+
+		return $layout->render($options);
+	}
+
+	/**
+	 * Method to get the CSS class name for an icon identifier
+	 *
+	 * Can be redefined in the final class
+	 *
+	 * @param   string  $identifier  Icon identification string
+	 *
+	 * @return  string  CSS class name
+	 *
+	 * @since   3.0
+	 */
+	public function fetchIconClass($identifier)
+	{
+		// It's an ugly hack, but this allows templates to define the icon classes for the toolbar
+		$layout = new FileLayout('joomla.toolbar.iconclass');
+
+		return $layout->render(array('icon' => $identifier));
+	}
+
+	/**
+	 * Get the button
+	 *
+	 * Defined in the final button class
+	 *
+	 * @return  string
+	 *
+	 * @since   3.0
+	 */
+	abstract public function fetchButton();
+}
diff --git a/core/libraries/src/UCM/UCM.php b/core/libraries/src/UCM/UCM.php
new file mode 100644
index 00000000..b16731bd
--- /dev/null
+++ b/core/libraries/src/UCM/UCM.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\UCM;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Interface to handle UCM
+ *
+ * @since  3.1
+ */
+interface UCM
+{
+}
diff --git a/core/libraries/src/UCM/UCMBase.php b/core/libraries/src/UCM/UCMBase.php
new file mode 100644
index 00000000..e0a9e282
--- /dev/null
+++ b/core/libraries/src/UCM/UCMBase.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\UCM;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\TableInterface;
+
+/**
+ * Base class for implementing UCM
+ *
+ * @since  3.1
+ */
+class UCMBase implements UCM
+{
+	/**
+	 * The UCM type object
+	 *
+	 * @var    UCMType
+	 * @since  3.1
+	 */
+	protected $type;
+
+	/**
+	 * The alias for the content table
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $alias;
+
+	/**
+	 * Instantiate the UCMBase.
+	 *
+	 * @param   string   $alias  The alias string
+	 * @param   UCMType  $type   The type object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($alias = null, UCMType $type = null)
+	{
+		// Setup dependencies.
+		$input = \JFactory::getApplication()->input;
+		$this->alias = isset($alias) ? $alias : $input->get('option') . '.' . $input->get('view');
+
+		$this->type = isset($type) ? $type : $this->getType();
+	}
+
+	/**
+	 * Store data to the appropriate table
+	 *
+	 * @param   array           $data        Data to be stored
+	 * @param   TableInterface  $table       Table Object
+	 * @param   string          $primaryKey  The primary key name
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.1
+	 * @throws  \Exception
+	 */
+	protected function store($data, TableInterface $table = null, $primaryKey = null)
+	{
+		if (!$table)
+		{
+			$table = Table::getInstance('Ucm');
+		}
+
+		$ucmId      = isset($data['ucm_id']) ? $data['ucm_id'] : null;
+		$primaryKey = $primaryKey ?: $ucmId;
+
+		if (isset($primaryKey))
+		{
+			$table->load($primaryKey);
+		}
+
+		try
+		{
+			$table->bind($data);
+		}
+		catch (\RuntimeException $e)
+		{
+			throw new \Exception($e->getMessage(), 500, $e);
+		}
+
+		try
+		{
+			$table->store();
+		}
+		catch (\RuntimeException $e)
+		{
+			throw new \Exception($e->getMessage(), 500, $e);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the UCM Content type.
+	 *
+	 * @return  UCMType  The UCM content type
+	 *
+	 * @since   3.1
+	 */
+	public function getType()
+	{
+		if (!$this->type)
+		{
+			$this->type = new UCMType($this->alias);
+		}
+
+		return $this->type;
+	}
+
+	/**
+	 * Method to map the base ucm fields
+	 *
+	 * @param   array    $original  Data array
+	 * @param   UCMType  $type      UCM Content Type
+	 *
+	 * @return  array  Data array of UCM mappings
+	 *
+	 * @since   3.1
+	 */
+	public function mapBase($original, UCMType $type = null)
+	{
+		$type = $type ?: $this->type;
+
+		$data = array(
+			'ucm_type_id' => $type->id,
+			'ucm_item_id' => $original[$type->primary_key],
+			'ucm_language_id' => ContentHelper::getLanguageId($original['language']),
+		);
+
+		return $data;
+	}
+}
diff --git a/core/libraries/src/UCM/UCMContent.php b/core/libraries/src/UCM/UCMContent.php
new file mode 100644
index 00000000..67cb3a5b
--- /dev/null
+++ b/core/libraries/src/UCM/UCMContent.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\UCM;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\TableInterface;
+
+/**
+ * Base class for implementing UCM
+ *
+ * @since  3.1
+ */
+class UCMContent extends UCMBase
+{
+	/**
+	 * The related table object
+	 *
+	 * @var    Table
+	 * @since  3.1
+	 */
+	protected $table;
+
+	/**
+	 * The UCM data array
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	public $ucmData;
+
+	/**
+	 * Instantiate UCMContent.
+	 *
+	 * @param   TableInterface  $table  The table object
+	 * @param   string          $alias  The type alias
+	 * @param   UCMType         $type   The type object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct(TableInterface $table = null, $alias = null, UCMType $type = null)
+	{
+		parent::__construct($alias, $type);
+
+		if ($table)
+		{
+			$this->table = $table;
+		}
+		else
+		{
+			$tableObject = json_decode($this->type->type->table);
+			$this->table = Table::getInstance($tableObject->special->type, $tableObject->special->prefix, $tableObject->special->config);
+		}
+	}
+
+	/**
+	 * Method to save the data
+	 *
+	 * @param   array    $original  The original data to be saved
+	 * @param   UCMType  $type      The UCM Type object
+	 *
+	 * @return  boolean  true
+	 *
+	 * @since   3.1
+	 */
+	public function save($original = null, UCMType $type = null)
+	{
+		$type    = $type ?: $this->type;
+		$ucmData = $original ? $this->mapData($original, $type) : $this->ucmData;
+
+		// Store the Common fields
+		$this->store($ucmData['common']);
+
+		// Store the special fields
+		if (isset($ucmData['special']))
+		{
+			$table = $this->table;
+			$this->store($ucmData['special'], $table, '');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Delete content from the Core Content table
+	 *
+	 * @param   mixed    $pk    The string/array of id's to delete
+	 * @param   UCMType  $type  The content type object
+	 *
+	 * @return  boolean  True if success
+	 *
+	 * @since   3.1
+	 */
+	public function delete($pk, UCMType $type = null)
+	{
+		$db   = \JFactory::getDbo();
+		$type = $type ?: $this->type;
+
+		if (is_array($pk))
+		{
+			$pk = implode(',', $pk);
+		}
+
+		$query = $db->getQuery(true)
+			->delete('#__ucm_content')
+			->where($db->quoteName('core_type_id') . ' = ' . (int) $type->type_id)
+			->where($db->quoteName('core_content_item_id') . ' IN (' . $pk . ')');
+
+		$db->setQuery($query);
+		$db->execute();
+
+		return true;
+	}
+
+	/**
+	 * Map the original content to the Core Content fields
+	 *
+	 * @param   array    $original  The original data array
+	 * @param   UCMType  $type      Type object for this data
+	 *
+	 * @return  array  $ucmData  The mapped UCM data
+	 *
+	 * @since   3.1
+	 */
+	public function mapData($original, UCMType $type = null)
+	{
+		$contentType = isset($type) ? $type : $this->type;
+
+		$fields = json_decode($contentType->type->field_mappings);
+
+		$ucmData = array();
+
+		$common = is_object($fields->common) ? $fields->common : $fields->common[0];
+
+		foreach ($common as $i => $field)
+		{
+			if ($field && $field !== 'null' && array_key_exists($field, $original))
+			{
+				$ucmData['common'][$i] = $original[$field];
+			}
+		}
+
+		if (array_key_exists('special', $ucmData))
+		{
+			$special = is_object($fields->special) ? $fields->special : $fields->special[0];
+
+			foreach ($special as $i => $field)
+			{
+				if ($field && $field !== 'null' && array_key_exists($field, $original))
+				{
+					$ucmData['special'][$i] = $original[$field];
+				}
+			}
+		}
+
+		$ucmData['common']['core_type_alias'] = $contentType->type->type_alias;
+		$ucmData['common']['core_type_id']    = $contentType->type->type_id;
+
+		if (isset($ucmData['special']))
+		{
+			$ucmData['special']['ucm_id'] = $ucmData['common']['ucm_id'];
+		}
+
+		$this->ucmData = $ucmData;
+
+		return $this->ucmData;
+	}
+
+	/**
+	 * Store data to the appropriate table
+	 *
+	 * @param   array           $data        Data to be stored
+	 * @param   TableInterface  $table       JTable Object
+	 * @param   boolean         $primaryKey  Flag that is true for data that are using #__ucm_content as their primary table
+	 *
+	 * @return  boolean  true on success
+	 *
+	 * @since   3.1
+	 */
+	protected function store($data, TableInterface $table = null, $primaryKey = null)
+	{
+		$table = $table ?: Table::getInstance('Corecontent');
+
+		$typeId     = $this->getType()->type->type_id;
+		$primaryKey = $primaryKey ?: $this->getPrimaryKey($typeId, $data['core_content_item_id']);
+
+		if (!$primaryKey)
+		{
+			// Store the core UCM mappings
+			$baseData = array();
+			$baseData['ucm_type_id']     = $typeId;
+			$baseData['ucm_item_id']     = $data['core_content_item_id'];
+			$baseData['ucm_language_id'] = ContentHelper::getLanguageId($data['core_language']);
+
+			if (parent::store($baseData))
+			{
+				$primaryKey = $this->getPrimaryKey($typeId, $data['core_content_item_id']);
+			}
+		}
+
+		return parent::store($data, $table, $primaryKey);
+	}
+
+	/**
+	 * Get the value of the primary key from #__ucm_base
+	 *
+	 * @param   string   $typeId         The ID for the type
+	 * @param   integer  $contentItemId  Value of the primary key in the legacy or secondary table
+	 *
+	 * @return  integer  The integer of the primary key
+	 *
+	 * @since   3.1
+	 */
+	public function getPrimaryKey($typeId, $contentItemId)
+	{
+		$db = \JFactory::getDbo();
+		$queryccid = $db->getQuery(true);
+		$queryccid->select($db->quoteName('ucm_id'))
+			->from($db->quoteName('#__ucm_base'))
+			->where(
+				array(
+					$db->quoteName('ucm_item_id') . ' = ' . $db->quote($contentItemId),
+					$db->quoteName('ucm_type_id') . ' = ' . $db->quote($typeId),
+				)
+			);
+		$db->setQuery($queryccid);
+
+		return $db->loadResult();
+	}
+}
diff --git a/core/libraries/src/UCM/UCMType.php b/core/libraries/src/UCM/UCMType.php
new file mode 100644
index 00000000..31844b24
--- /dev/null
+++ b/core/libraries/src/UCM/UCMType.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\UCM;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\BaseApplication;
+
+/**
+ * UCM Class for handling content types
+ *
+ * @property-read  string  $core_content_id
+ * @property-read  string  $core_type_alias
+ * @property-read  string  $core_title
+ * @property-read  string  $core_alias
+ * @property-read  string  $core_body
+ * @property-read  string  $core_state
+ *
+ * @property-read  string  $core_checked_out_time
+ * @property-read  string  $core_checked_out_user_id
+ * @property-read  string  $core_access
+ * @property-read  string  $core_params
+ * @property-read  string  $core_featured
+ * @property-read  string  $core_metadata
+ * @property-read  string  $core_created_user_id
+ * @property-read  string  $core_created_by_alias
+ * @property-read  string  $core_created_time
+ * @property-read  string  $core_modified_user_id
+ * @property-read  string  $core_modified_time
+ * @property-read  string  $core_language
+ * @property-read  string  $core_publish_up
+ * @property-read  string  $core_publish_down
+ * @property-read  string  $core_content_item_id
+ * @property-read  string  $asset_id
+ * @property-read  string  $core_images
+ * @property-read  string  $core_urls
+ * @property-read  string  $core_hits
+ * @property-read  string  $core_version
+ * @property-read  string  $core_ordering
+ * @property-read  string  $core_metakey
+ * @property-read  string  $core_metadesc
+ * @property-read  string  $core_catid
+ * @property-read  string  $core_xreference
+ * @property-read  string  $core_typeid
+ *
+ * @since  3.1
+ */
+class UCMType implements UCM
+{
+	/**
+	 * The UCM Type
+	 *
+	 * @var    UCMType
+	 * @since  3.1
+	 */
+	public $type;
+
+	/**
+	 * The Database object
+	 *
+	 * @var    \JDatabaseDriver
+	 * @since  3.1
+	 */
+	protected $db;
+
+	/**
+	 * The alias for the content type
+	 *
+	 * @var	   string
+	 * @since  3.1
+	 */
+	protected $alias;
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   string            $alias        The alias for the item
+	 * @param   \JDatabaseDriver  $database     The database object
+	 * @param   BaseApplication   $application  The application object
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($alias = null, \JDatabaseDriver $database = null, BaseApplication $application = null)
+	{
+		$this->db = $database ?: \JFactory::getDbo();
+		$app      = $application ?: \JFactory::getApplication();
+
+		// Make the best guess we can in the absence of information.
+		$this->alias = $alias ?: $app->input->get('option') . '.' . $app->input->get('view');
+		$this->type  = $this->getTypeByAlias($this->alias);
+	}
+
+	/**
+	 * Get the Content Type
+	 *
+	 * @param   integer  $pk  The primary key of the alias type
+	 *
+	 * @return  object  The UCM Type data
+	 *
+	 * @since   3.1
+	 */
+	public function getType($pk = null)
+	{
+		if (!$pk)
+		{
+			return $this->getTypeByAlias($this->alias);
+		}
+
+		$query = $this->db->getQuery(true);
+		$query->select('ct.*');
+		$query->from($this->db->quoteName('#__content_types', 'ct'));
+
+		$query->where($this->db->quoteName('ct.type_id') . ' = ' . (int) $pk);
+		$this->db->setQuery($query);
+
+		return $this->db->loadObject();
+	}
+
+	/**
+	 * Get the Content Type from the alias
+	 *
+	 * @param   string  $typeAlias  The alias for the type
+	 *
+	 * @return  object  The UCM Type data
+	 *
+	 * @since   3.2
+	 */
+	public function getTypeByAlias($typeAlias = null)
+	{
+		$query = $this->db->getQuery(true);
+		$query->select('ct.*');
+		$query->from($this->db->quoteName('#__content_types', 'ct'));
+		$query->where($this->db->quoteName('ct.type_alias') . ' = ' . $this->db->quote($typeAlias));
+
+		$this->db->setQuery($query);
+
+		return $this->db->loadObject();
+	}
+
+	/**
+	 * Get the Content Type from the table class name
+	 *
+	 * @param   string  $tableName  The table for the type
+	 *
+	 * @return  mixed  The UCM Type data if found, false if no match is found
+	 *
+	 * @since   3.2
+	 */
+	public function getTypeByTable($tableName)
+	{
+		$query = $this->db->getQuery(true);
+		$query->select('ct.*');
+		$query->from($this->db->quoteName('#__content_types', 'ct'));
+
+		// $query->where($this->db->quoteName('ct.type_alias') . ' = ' . (int) $typeAlias);
+		$this->db->setQuery($query);
+
+		$types = $this->db->loadObjectList();
+
+		foreach ($types as $type)
+		{
+			$tableFromType = json_decode($type->table);
+			$tableNameFromType = $tableFromType->special->prefix . $tableFromType->special->type;
+
+			if ($tableNameFromType === $tableName)
+			{
+				return $type;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retrieves the UCM type ID
+	 *
+	 * @param   string  $alias  The string of the type alias
+	 *
+	 * @return  mixed  The ID of the requested type or false if type is not found
+	 *
+	 * @since   3.1
+	 */
+	public function getTypeId($alias = null)
+	{
+		if (!$alias)
+		{
+			$alias = $this->alias;
+		}
+
+		$query = $this->db->getQuery(true);
+		$query->select('ct.type_id');
+		$query->from($this->db->quoteName('#__content_types', 'ct'));
+		$query->where($this->db->quoteName('ct.type_alias') . ' = ' . $this->db->q($alias));
+
+		$this->db->setQuery($query);
+
+		$id = $this->db->loadResult();
+
+		if (!$id)
+		{
+			return false;
+		}
+
+		return $id;
+	}
+
+	/**
+	 * Method to expand the field mapping
+	 *
+	 * @param   boolean  $assoc  True to return an associative array.
+	 *
+	 * @return  mixed  Array or object with field mappings. Defaults to object.
+	 *
+	 * @since   3.2
+	 */
+	public function fieldmapExpand($assoc = false)
+	{
+		if (!empty($this->type->field_mappings))
+		{
+			return $this->fieldmap = json_decode($this->type->field_mappings, $assoc);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Magic method to get the name of the field mapped to a ucm field (core_something).
+	 *
+	 * @param   string  $ucmField  The name of the field in JTableCorecontent
+	 *
+	 * @return  string  The name mapped to the $ucmField for a given content type
+	 *
+	 * @since   3.2
+	 */
+	public function __get($ucmField)
+	{
+		if (!isset($this->fieldmap))
+		{
+			$this->fieldmapExpand(false);
+		}
+
+		return isset($this->fieldmap->common->$ucmField) ? $this->fieldmap->common->$ucmField : null;
+	}
+}
diff --git a/core/libraries/src/Updater/Adapter/CollectionAdapter.php b/core/libraries/src/Updater/Adapter/CollectionAdapter.php
new file mode 100644
index 00000000..501e8e07
--- /dev/null
+++ b/core/libraries/src/Updater/Adapter/CollectionAdapter.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Updater\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Updater\UpdateAdapter;
+use Joomla\CMS\Version;
+
+/**
+ * Collection Update Adapter Class
+ *
+ * @since  11.1
+ */
+class CollectionAdapter extends UpdateAdapter
+{
+	/**
+	 * Root of the tree
+	 *
+	 * @var    object
+	 * @since  11.1
+	 */
+	protected $base;
+
+	/**
+	 * Tree of objects
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $parent = array(0);
+
+	/**
+	 * Used to control if an item has a child or not
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $pop_parent = 0;
+
+	/**
+	 * A list of discovered update sites
+	 *
+	 * @var  array
+	 */
+	protected $update_sites = array();
+
+	/**
+	 * A list of discovered updates
+	 *
+	 * @var  array
+	 */
+	protected $updates = array();
+
+	/**
+	 * Gets the reference to the current direct parent
+	 *
+	 * @return  object
+	 *
+	 * @since   11.1
+	 */
+	protected function _getStackLocation()
+	{
+		return implode('->', $this->stack);
+	}
+
+	/**
+	 * Get the parent tag
+	 *
+	 * @return  string   parent
+	 *
+	 * @since   11.1
+	 */
+	protected function _getParent()
+	{
+		return end($this->parent);
+	}
+
+	/**
+	 * Opening an XML element
+	 *
+	 * @param   object  $parser  Parser object
+	 * @param   string  $name    Name of element that is opened
+	 * @param   array   $attrs   Array of attributes for the element
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function _startElement($parser, $name, $attrs = array())
+	{
+		$this->stack[] = $name;
+		$tag           = $this->_getStackLocation();
+
+		// Reset the data
+		if (isset($this->$tag))
+		{
+			$this->$tag->_data = '';
+		}
+
+		switch ($name)
+		{
+			case 'CATEGORY':
+				if (isset($attrs['REF']))
+				{
+					$this->update_sites[] = array('type' => 'collection', 'location' => $attrs['REF'], 'update_site_id' => $this->updateSiteId);
+				}
+				else
+				{
+					// This item will have children, so prepare to attach them
+					$this->pop_parent = 1;
+				}
+				break;
+			case 'EXTENSION':
+				$update = Table::getInstance('update');
+				$update->set('update_site_id', $this->updateSiteId);
+
+				foreach ($this->updatecols as $col)
+				{
+					// Reset the values if it doesn't exist
+					if (!array_key_exists($col, $attrs))
+					{
+						$attrs[$col] = '';
+
+						if ($col == 'CLIENT')
+						{
+							$attrs[$col] = 'site';
+						}
+					}
+				}
+
+				$client = ApplicationHelper::getClientInfo($attrs['CLIENT'], 1);
+
+				if (isset($client->id))
+				{
+					$attrs['CLIENT_ID'] = $client->id;
+				}
+
+				// Lower case all of the fields
+				foreach ($attrs as $key => $attr)
+				{
+					$values[strtolower($key)] = $attr;
+				}
+
+				// Only add the update if it is on the same platform and release as we are
+				$ver = new Version;
+
+				// Lower case and remove the exclamation mark
+				$product = strtolower(InputFilter::getInstance()->clean($ver::PRODUCT, 'cmd'));
+
+				/*
+				 * Set defaults, the extension file should clarify in case but it may be only available in one version
+				 * This allows an update site to specify a targetplatform
+				 * targetplatformversion can be a regexp, so 1.[56] would be valid for an extension that supports 1.5 and 1.6
+				 * Note: Whilst the version is a regexp here, the targetplatform is not (new extension per platform)
+				 * Additionally, the version is a regexp here and it may also be in an extension file if the extension is
+				 * compatible against multiple versions of the same platform (e.g. a library)
+				 */
+				if (!isset($values['targetplatform']))
+				{
+					$values['targetplatform'] = $product;
+				}
+
+				// Set this to ourself as a default
+				if (!isset($values['targetplatformversion']))
+				{
+					$values['targetplatformversion'] = $ver::RELEASE;
+				}
+
+				// Set this to ourselves as a default
+				// validate that we can install the extension
+				if ($product == $values['targetplatform'] && preg_match('/^' . $values['targetplatformversion'] . '/', JVERSION))
+				{
+					$update->bind($values);
+					$this->updates[] = $update;
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Closing an XML element
+	 * Note: This is a protected function though has to be exposed externally as a callback
+	 *
+	 * @param   object  $parser  Parser object
+	 * @param   string  $name    Name of the element closing
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function _endElement($parser, $name)
+	{
+		array_pop($this->stack);
+
+		switch ($name)
+		{
+			case 'CATEGORY':
+				if ($this->pop_parent)
+				{
+					$this->pop_parent = 0;
+					array_pop($this->parent);
+				}
+				break;
+		}
+	}
+
+	// Note: we don't care about char data in collection because there should be none
+
+	/**
+	 * Finds an update
+	 *
+	 * @param   array  $options  Options to use: update_site_id: the unique ID of the update site to look at
+	 *
+	 * @return  array  Update_sites and updates discovered
+	 *
+	 * @since   11.1
+	 */
+	public function findUpdate($options)
+	{
+		$response = $this->getUpdateSiteResponse($options);
+
+		if ($response === false)
+		{
+			return false;
+		}
+
+		$this->xmlParser = xml_parser_create('');
+		xml_set_object($this->xmlParser, $this);
+		xml_set_element_handler($this->xmlParser, '_startElement', '_endElement');
+
+		if (!xml_parse($this->xmlParser, $response->body))
+		{
+			// If the URL is missing the .xml extension, try appending it and retry loading the update
+			if (!$this->appendExtension && (substr($this->_url, -4) != '.xml'))
+			{
+				$options['append_extension'] = true;
+
+				return $this->findUpdate($options);
+			}
+
+			Log::add('Error parsing url: ' . $this->_url, Log::WARNING, 'updater');
+
+			$app = Factory::getApplication();
+			$app->enqueueMessage(\JText::sprintf('JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL', $this->_url), 'warning');
+
+			return false;
+		}
+
+		// TODO: Decrement the bad counter if non-zero
+		return array('update_sites' => $this->update_sites, 'updates' => $this->updates);
+	}
+}
diff --git a/core/libraries/src/Updater/Adapter/ExtensionAdapter.php b/core/libraries/src/Updater/Adapter/ExtensionAdapter.php
new file mode 100644
index 00000000..730154f7
--- /dev/null
+++ b/core/libraries/src/Updater/Adapter/ExtensionAdapter.php
@@ -0,0 +1,394 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Updater\Adapter;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Table\Table;
+use Joomla\CMS\Updater\UpdateAdapter;
+use Joomla\CMS\Updater\Updater;
+use Joomla\CMS\Version;
+
+/**
+ * Extension class for updater
+ *
+ * @since  11.1
+ */
+class ExtensionAdapter extends UpdateAdapter
+{
+	/**
+	 * Start element parser callback.
+	 *
+	 * @param   object  $parser  The parser object.
+	 * @param   string  $name    The name of the element.
+	 * @param   array   $attrs   The attributes of the element.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function _startElement($parser, $name, $attrs = array())
+	{
+		$this->stack[] = $name;
+		$tag           = $this->_getStackLocation();
+
+		// Reset the data
+		if (isset($this->$tag))
+		{
+			$this->$tag->_data = '';
+		}
+
+		switch ($name)
+		{
+			case 'UPDATE':
+				$this->currentUpdate = Table::getInstance('update');
+				$this->currentUpdate->update_site_id = $this->updateSiteId;
+				$this->currentUpdate->detailsurl = $this->_url;
+				$this->currentUpdate->folder = '';
+				$this->currentUpdate->client_id = 1;
+				break;
+
+			// Don't do anything
+			case 'UPDATES':
+				break;
+
+			default:
+				if (in_array($name, $this->updatecols))
+				{
+					$name = strtolower($name);
+					$this->currentUpdate->$name = '';
+				}
+
+				if ($name == 'TARGETPLATFORM')
+				{
+					$this->currentUpdate->targetplatform = $attrs;
+				}
+
+				if ($name == 'PHP_MINIMUM')
+				{
+					$this->currentUpdate->php_minimum = '';
+				}
+
+				if ($name == 'SUPPORTED_DATABASES')
+				{
+					$this->currentUpdate->supported_databases = $attrs;
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Character Parser Function
+	 *
+	 * @param   object  $parser  Parser object.
+	 * @param   object  $name    The name of the element.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	protected function _endElement($parser, $name)
+	{
+		array_pop($this->stack);
+
+		// @todo remove code: echo 'Closing: '. $name .'<br />';
+		switch ($name)
+		{
+			case 'UPDATE':
+				// Lower case and remove the exclamation mark
+				$product = strtolower(InputFilter::getInstance()->clean(Version::PRODUCT, 'cmd'));
+
+				// Support for the min_dev_level and max_dev_level attributes is deprecated, a regexp should be used instead
+				if (isset($this->currentUpdate->targetplatform->min_dev_level) || isset($this->currentUpdate->targetplatform->max_dev_level))
+				{
+					Log::add(
+						'Support for the min_dev_level and max_dev_level attributes of an update\'s <targetplatform> tag is deprecated and'
+						. ' will be removed in 4.0. The full version should be specified in the version attribute and may optionally be a regexp.',
+						Log::WARNING,
+						'deprecated'
+					);
+				}
+
+				/*
+				 * Check that the product matches and that the version matches (optionally a regexp)
+				 *
+				 * Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1)
+				 */
+				$patchMinimumSupported = !isset($this->currentUpdate->targetplatform->min_dev_level)
+					|| Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->min_dev_level;
+				$patchMaximumSupported = !isset($this->currentUpdate->targetplatform->max_dev_level)
+					|| Version::PATCH_VERSION <= $this->currentUpdate->targetplatform->max_dev_level;
+
+				if ($product == $this->currentUpdate->targetplatform['NAME']
+					&& preg_match('/^' . $this->currentUpdate->targetplatform['VERSION'] . '/', JVERSION)
+					&& $patchMinimumSupported
+					&& $patchMaximumSupported)
+				{
+					// Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present
+					if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum, '>='))
+					{
+						$phpMatch = true;
+					}
+					else
+					{
+						// Notify the user of the potential update
+						$msg = \JText::sprintf(
+							'JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION',
+							$this->currentUpdate->name,
+							$this->currentUpdate->version,
+							$this->currentUpdate->php_minimum,
+							PHP_VERSION
+						);
+
+						Factory::getApplication()->enqueueMessage($msg, 'warning');
+
+						$phpMatch = false;
+					}
+
+					$dbMatch = false;
+
+					// Check if DB & version is supported via <supported_databases> tag, assume supported if tag isn't present
+					if (isset($this->currentUpdate->supported_databases))
+					{
+						$db           = Factory::getDbo();
+						$dbType       = strtoupper($db->getServerType());
+						$dbVersion    = $db->getVersion();
+						$supportedDbs = $this->currentUpdate->supported_databases;
+
+						// Do we have a entry for the database?
+						if (array_key_exists($dbType, $supportedDbs))
+						{
+							$minumumVersion = $supportedDbs[$dbType];
+							$dbMatch        = version_compare($dbVersion, $minumumVersion, '>=');
+
+							if (!$dbMatch)
+							{
+								// Notify the user of the potential update
+								$dbMsg = \JText::sprintf(
+									'JLIB_INSTALLER_AVAILABLE_UPDATE_DB_MINIMUM',
+									$this->currentUpdate->name,
+									$this->currentUpdate->version,
+									\JText::_($db->name),
+									$dbVersion,
+									$minumumVersion
+								);
+
+								Factory::getApplication()->enqueueMessage($dbMsg, 'warning');
+							}
+						}
+						else
+						{
+							// Notify the user of the potential update
+							$dbMsg = \JText::sprintf(
+								'JLIB_INSTALLER_AVAILABLE_UPDATE_DB_TYPE',
+								$this->currentUpdate->name,
+								$this->currentUpdate->version,
+								\JText::_($db->name)
+							);
+
+							Factory::getApplication()->enqueueMessage($dbMsg, 'warning');
+						}
+					}
+					else
+					{
+						// Set to true if the <supported_databases> tag is not set
+						$dbMatch = true;
+					}
+
+					// Check minimum stability
+					$stabilityMatch = true;
+
+					if (isset($this->currentUpdate->stability) && ($this->currentUpdate->stability < $this->minimum_stability))
+					{
+						$stabilityMatch = false;
+					}
+
+					// Some properties aren't valid fields in the update table so unset them to prevent J! from trying to store them
+					unset($this->currentUpdate->targetplatform);
+
+					if (isset($this->currentUpdate->php_minimum))
+					{
+						unset($this->currentUpdate->php_minimum);
+					}
+
+					if (isset($this->currentUpdate->supported_databases))
+					{
+						unset($this->currentUpdate->supported_databases);
+					}
+
+					if (isset($this->currentUpdate->stability))
+					{
+						unset($this->currentUpdate->stability);
+					}
+
+					// If the PHP version and minimum stability checks pass, consider this version as a possible update
+					if ($phpMatch && $stabilityMatch && $dbMatch)
+					{
+						if (isset($this->latest))
+						{
+							// We already have a possible update. Check the version.
+							if (version_compare($this->currentUpdate->version, $this->latest->version, '>') == 1)
+							{
+								$this->latest = $this->currentUpdate;
+							}
+						}
+						else
+						{
+							// We don't have any possible updates yet, assume this is an available update.
+							$this->latest = $this->currentUpdate;
+						}
+					}
+				}
+				break;
+
+			case 'UPDATES':
+				// :D
+				break;
+		}
+	}
+
+	/**
+	 * Character Parser Function
+	 *
+	 * @param   object  $parser  Parser object.
+	 * @param   object  $data    The data.
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because its called externally.
+	 * @since   11.1
+	 */
+	protected function _characterData($parser, $data)
+	{
+		$tag = $this->_getLastTag();
+
+		if (in_array($tag, $this->updatecols))
+		{
+			$tag = strtolower($tag);
+			$this->currentUpdate->$tag .= $data;
+		}
+
+		if ($tag == 'PHP_MINIMUM')
+		{
+			$this->currentUpdate->php_minimum = $data;
+		}
+
+		if ($tag == 'TAG')
+		{
+			$this->currentUpdate->stability = $this->stabilityTagToInteger((string) $data);
+		}
+	}
+
+	/**
+	 * Finds an update.
+	 *
+	 * @param   array  $options  Update options.
+	 *
+	 * @return  array  Array containing the array of update sites and array of updates
+	 *
+	 * @since   11.1
+	 */
+	public function findUpdate($options)
+	{
+		$response = $this->getUpdateSiteResponse($options);
+
+		if ($response === false)
+		{
+			return false;
+		}
+
+		if (array_key_exists('minimum_stability', $options))
+		{
+			$this->minimum_stability = $options['minimum_stability'];
+		}
+
+		$this->xmlParser = xml_parser_create('');
+		xml_set_object($this->xmlParser, $this);
+		xml_set_element_handler($this->xmlParser, '_startElement', '_endElement');
+		xml_set_character_data_handler($this->xmlParser, '_characterData');
+
+		if (!xml_parse($this->xmlParser, $response->body))
+		{
+			// If the URL is missing the .xml extension, try appending it and retry loading the update
+			if (!$this->appendExtension && (substr($this->_url, -4) != '.xml'))
+			{
+				$options['append_extension'] = true;
+
+				return $this->findUpdate($options);
+			}
+
+			Log::add('Error parsing url: ' . $this->_url, Log::WARNING, 'updater');
+
+			$app = Factory::getApplication();
+			$app->enqueueMessage(\JText::sprintf('JLIB_UPDATER_ERROR_EXTENSION_PARSE_URL', $this->_url), 'warning');
+
+			return false;
+		}
+
+		xml_parser_free($this->xmlParser);
+
+		if (isset($this->latest))
+		{
+			if (isset($this->latest->client) && strlen($this->latest->client))
+			{
+				if (is_numeric($this->latest->client))
+				{
+					$byName = false;
+
+					// <client> has to be 'administrator' or 'site', numeric values are deprecated. See https://docs.joomla.org/Special:MyLanguage/Design_of_JUpdate
+					Log::add(
+						'Using numeric values for <client> in the updater xml is deprecated. Use \'administrator\' or \'site\' instead.',
+						Log::WARNING, 'deprecated'
+					);
+				}
+				else
+				{
+					$byName = true;
+				}
+
+				$this->latest->client_id = ApplicationHelper::getClientInfo($this->latest->client, $byName)->id;
+				unset($this->latest->client);
+			}
+
+			$updates = array($this->latest);
+		}
+		else
+		{
+			$updates = array();
+		}
+
+		return array('update_sites' => array(), 'updates' => $updates);
+	}
+
+	/**
+	 * Converts a tag to numeric stability representation. If the tag doesn't represent a known stability level (one of
+	 * dev, alpha, beta, rc, stable) it is ignored.
+	 *
+	 * @param   string  $tag  The tag string, e.g. dev, alpha, beta, rc, stable
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.4
+	 */
+	protected function stabilityTagToInteger($tag)
+	{
+		$constant = '\\Joomla\\CMS\\Updater\\Updater::STABILITY_' . strtoupper($tag);
+
+		if (defined($constant))
+		{
+			return constant($constant);
+		}
+
+		return Updater::STABILITY_STABLE;
+	}
+}
diff --git a/core/libraries/src/Updater/DownloadSource.php b/core/libraries/src/Updater/DownloadSource.php
new file mode 100644
index 00000000..e6d94230
--- /dev/null
+++ b/core/libraries/src/Updater/DownloadSource.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Updater;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Data object representing a download source given as part of an update's `<downloads>` element
+ *
+ * @since  3.8.3
+ */
+class DownloadSource
+{
+	/**
+	 * Defines a BZIP2 download package
+	 *
+	 * @const  string
+	 * @since  3.8.4
+	 */
+	const FORMAT_TAR_BZIP = 'bz2';
+
+	/**
+	 * Defines a TGZ download package
+	 *
+	 * @const  string
+	 * @since  3.8.4
+	 */
+	const FORMAT_TAR_GZ = 'gz';
+
+	/**
+	 * Defines a ZIP download package
+	 *
+	 * @const  string
+	 * @since  3.8.3
+	 */
+	const FORMAT_ZIP = 'zip';
+
+	/**
+	 * Defines a full package download type
+	 *
+	 * @const  string
+	 * @since  3.8.3
+	 */
+	const TYPE_FULL = 'full';
+
+	/**
+	 * Defines a patch package download type
+	 *
+	 * @const  string
+	 * @since  3.8.4
+	 */
+	const TYPE_PATCH = 'patch';
+
+	/**
+	 * Defines an upgrade package download type
+	 *
+	 * @const  string
+	 * @since  3.8.4
+	 */
+	const TYPE_UPGRADE = 'upgrade';
+
+	/**
+	 * The download type
+	 *
+	 * @var    string
+	 * @since  3.8.3
+	 */
+	public $type = self::TYPE_FULL;
+
+	/**
+	 * The download file's format
+	 *
+	 * @var    string
+	 * @since  3.8.3
+	 */
+	public $format = self::FORMAT_ZIP;
+
+	/**
+	 * The URL to retrieve the package from
+	 *
+	 * @var    string
+	 * @since  3.8.3
+	 */
+	public $url;
+}
diff --git a/core/libraries/src/Updater/Update.php b/core/libraries/src/Updater/Update.php
new file mode 100644
index 00000000..dcbbc727
--- /dev/null
+++ b/core/libraries/src/Updater/Update.php
@@ -0,0 +1,557 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Updater;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Version;
+use Joomla\Registry\Registry;
+
+/**
+ * Update class. It is used by Updater::update() to install an update. Use Updater::findUpdates() to find updates for
+ * an extension.
+ *
+ * @since  11.1
+ */
+class Update extends \JObject
+{
+	/**
+	 * Update manifest `<name>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $name;
+
+	/**
+	 * Update manifest `<description>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $description;
+
+	/**
+	 * Update manifest `<element>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $element;
+
+	/**
+	 * Update manifest `<type>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $type;
+
+	/**
+	 * Update manifest `<version>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $version;
+
+	/**
+	 * Update manifest `<infourl>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $infourl;
+
+	/**
+	 * Update manifest `<client>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $client;
+
+	/**
+	 * Update manifest `<group>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $group;
+
+	/**
+	 * Update manifest `<downloads>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $downloads;
+
+	/**
+	 * Update manifest `<downloadsource>` elements
+	 *
+	 * @var    DownloadSource[]
+	 * @since  3.8.3
+	 */
+	protected $downloadSources = array();
+
+	/**
+	 * Update manifest `<tags>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $tags;
+
+	/**
+	 * Update manifest `<maintainer>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $maintainer;
+
+	/**
+	 * Update manifest `<maintainerurl>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $maintainerurl;
+
+	/**
+	 * Update manifest `<category>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $category;
+
+	/**
+	 * Update manifest `<relationships>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $relationships;
+
+	/**
+	 * Update manifest `<targetplatform>` element
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $targetplatform;
+
+	/**
+	 * Extra query for download URLs
+	 *
+	 * @var    string
+	 * @since  13.1
+	 */
+	protected $extra_query;
+
+	/**
+	 * Resource handle for the XML Parser
+	 *
+	 * @var    resource
+	 * @since  12.1
+	 */
+	protected $xmlParser;
+
+	/**
+	 * Element call stack
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $stack = array('base');
+
+	/**
+	 * Unused state array
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $stateStore = array();
+
+	/**
+	 * Object containing the current update data
+	 *
+	 * @var    \stdClass
+	 * @since  12.1
+	 */
+	protected $currentUpdate;
+
+	/**
+	 * Object containing the latest update data
+	 *
+	 * @var    \stdClass
+	 * @since  12.1
+	 */
+	protected $latest;
+
+	/**
+	 * The minimum stability required for updates to be taken into account. The possible values are:
+	 * 0	dev			Development snapshots, nightly builds, pre-release versions and so on
+	 * 1	alpha		Alpha versions (work in progress, things are likely to be broken)
+	 * 2	beta		Beta versions (major functionality in place, show-stopper bugs are likely to be present)
+	 * 3	rc			Release Candidate versions (almost stable, minor bugs might be present)
+	 * 4	stable		Stable versions (production quality code)
+	 *
+	 * @var    int
+	 * @since  14.1
+	 *
+	 * @see    Updater
+	 */
+	protected $minimum_stability = Updater::STABILITY_STABLE;
+
+	/**
+	 * Gets the reference to the current direct parent
+	 *
+	 * @return  object
+	 *
+	 * @since   11.1
+	 */
+	protected function _getStackLocation()
+	{
+		return implode('->', $this->stack);
+	}
+
+	/**
+	 * Get the last position in stack count
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	protected function _getLastTag()
+	{
+		return $this->stack[count($this->stack) - 1];
+	}
+
+	/**
+	 * XML Start Element callback
+	 *
+	 * @param   object  $parser  Parser object
+	 * @param   string  $name    Name of the tag found
+	 * @param   array   $attrs   Attributes of the tag
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because it is called externally
+	 * @since   11.1
+	 */
+	public function _startElement($parser, $name, $attrs = array())
+	{
+		$this->stack[] = $name;
+		$tag           = $this->_getStackLocation();
+
+		// Reset the data
+		if (isset($this->$tag))
+		{
+			$this->$tag->_data = '';
+		}
+
+		switch ($name)
+		{
+			// This is a new update; create a current update
+			case 'UPDATE':
+				$this->currentUpdate = new \stdClass;
+				break;
+
+			// Handle the array of download sources
+			case 'DOWNLOADSOURCE':
+				$source = new DownloadSource;
+
+				foreach ($attrs as $key => $data)
+				{
+					$key = strtolower($key);
+					$source->$key = $data;
+				}
+
+				$this->downloadSources[] = $source;
+
+				break;
+
+			// Don't do anything
+			case 'UPDATES':
+				break;
+
+			// For everything else there's...the default!
+			default:
+				$name = strtolower($name);
+
+				if (!isset($this->currentUpdate->$name))
+				{
+					$this->currentUpdate->$name = new \stdClass;
+				}
+
+				$this->currentUpdate->$name->_data = '';
+
+				foreach ($attrs as $key => $data)
+				{
+					$key = strtolower($key);
+					$this->currentUpdate->$name->$key = $data;
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Callback for closing the element
+	 *
+	 * @param   object  $parser  Parser object
+	 * @param   string  $name    Name of element that was closed
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because it is called externally
+	 * @since   11.1
+	 */
+	public function _endElement($parser, $name)
+	{
+		array_pop($this->stack);
+
+		switch ($name)
+		{
+			// Closing update, find the latest version and check
+			case 'UPDATE':
+				$product = strtolower(InputFilter::getInstance()->clean(Version::PRODUCT, 'cmd'));
+
+				// Support for the min_dev_level and max_dev_level attributes is deprecated, a regexp should be used instead
+				if (isset($this->currentUpdate->targetplatform->min_dev_level) || isset($this->currentUpdate->targetplatform->max_dev_level))
+				{
+					Log::add(
+						'Support for the min_dev_level and max_dev_level attributes of an update\'s <targetplatform> tag is deprecated and'
+						. ' will be removed in 4.0. The full version should be specified in the version attribute and may optionally be a regexp.',
+						Log::WARNING,
+						'deprecated'
+					);
+				}
+
+				/*
+				 * Check that the product matches and that the version matches (optionally a regexp)
+				 *
+				 * Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1)
+				 */
+				$patchVersion = $this->get('jversion.dev_level', Version::PATCH_VERSION);
+				$patchMinimumSupported = !isset($this->currentUpdate->targetplatform->min_dev_level)
+					|| $patchVersion >= $this->currentUpdate->targetplatform->min_dev_level;
+
+				$patchMaximumSupported = !isset($this->currentUpdate->targetplatform->max_dev_level)
+					|| $patchVersion <= $this->currentUpdate->targetplatform->max_dev_level;
+
+				if (isset($this->currentUpdate->targetplatform->name)
+					&& $product == $this->currentUpdate->targetplatform->name
+					&& preg_match('/^' . $this->currentUpdate->targetplatform->version . '/', $this->get('jversion.full', JVERSION))
+					&& $patchMinimumSupported
+					&& $patchMaximumSupported)
+				{
+					$phpMatch = false;
+
+					// Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present
+					if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum->_data, '>='))
+					{
+						$phpMatch = true;
+					}
+
+					$dbMatch = false;
+
+					// Check if DB & version is supported via <supported_databases> tag, assume supported if tag isn't present
+					if (isset($this->currentUpdate->supported_databases))
+					{
+						$db           = Factory::getDbo();
+						$dbType       = strtolower($db->getServerType());
+						$dbVersion    = $db->getVersion();
+						$supportedDbs = $this->currentUpdate->supported_databases;
+
+						// Do we have a entry for the database?
+						if (isset($supportedDbs->$dbType))
+						{
+							$minumumVersion = $supportedDbs->$dbType;
+							$dbMatch        = version_compare($dbVersion, $minumumVersion, '>=');
+						}
+					}
+					else
+					{
+						// Set to true if the <supported_databases> tag is not set
+						$dbMatch = true;
+					}
+
+					// Check minimum stability
+					$stabilityMatch = true;
+
+					if (isset($this->currentUpdate->stability) && ($this->currentUpdate->stability < $this->minimum_stability))
+					{
+						$stabilityMatch = false;
+					}
+
+					if ($phpMatch && $stabilityMatch && $dbMatch)
+					{
+						if (isset($this->latest))
+						{
+							if (version_compare($this->currentUpdate->version->_data, $this->latest->version->_data, '>') == 1)
+							{
+								$this->latest = $this->currentUpdate;
+							}
+						}
+						else
+						{
+							$this->latest = $this->currentUpdate;
+						}
+					}
+				}
+				break;
+			case 'UPDATES':
+				// If the latest item is set then we transfer it to where we want to
+				if (isset($this->latest))
+				{
+					foreach (get_object_vars($this->latest) as $key => $val)
+					{
+						$this->$key = $val;
+					}
+
+					unset($this->latest);
+					unset($this->currentUpdate);
+				}
+				elseif (isset($this->currentUpdate))
+				{
+					// The update might be for an older version of j!
+					unset($this->currentUpdate);
+				}
+				break;
+		}
+	}
+
+	/**
+	 * Character Parser Function
+	 *
+	 * @param   object  $parser  Parser object.
+	 * @param   object  $data    The data.
+	 *
+	 * @return  void
+	 *
+	 * @note    This is public because its called externally.
+	 * @since   11.1
+	 */
+	public function _characterData($parser, $data)
+	{
+		$tag = $this->_getLastTag();
+
+		// Throw the data for this item together
+		$tag = strtolower($tag);
+
+		if ($tag == 'tag')
+		{
+			$this->currentUpdate->stability = $this->stabilityTagToInteger((string) $data);
+
+			return;
+		}
+
+		if ($tag == 'downloadsource')
+		{
+			// Grab the last source so we can append the URL
+			$source = end($this->downloadSources);
+			$source->url = $data;
+
+			return;
+		}
+
+		if (isset($this->currentUpdate->$tag))
+		{
+			$this->currentUpdate->$tag->_data .= $data;
+		}
+	}
+
+	/**
+	 * Loads an XML file from a URL.
+	 *
+	 * @param   string  $url                The URL.
+	 * @param   int     $minimum_stability  The minimum stability required for updating the extension {@see Updater}
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function loadFromXml($url, $minimum_stability = Updater::STABILITY_STABLE)
+	{
+		$version    = new Version;
+		$httpOption = new Registry;
+		$httpOption->set('userAgent', $version->getUserAgent('Joomla', true, false));
+
+		try
+		{
+			$http = HttpFactory::getHttp($httpOption);
+			$response = $http->get($url);
+		}
+		catch (\RuntimeException $e)
+		{
+			$response = null;
+		}
+
+		if ($response === null || $response->code !== 200)
+		{
+			// TODO: Add a 'mark bad' setting here somehow
+			Log::add(\JText::sprintf('JLIB_UPDATER_ERROR_EXTENSION_OPEN_URL', $url), Log::WARNING, 'jerror');
+
+			return false;
+		}
+
+		$this->minimum_stability = $minimum_stability;
+
+		$this->xmlParser = xml_parser_create('');
+		xml_set_object($this->xmlParser, $this);
+		xml_set_element_handler($this->xmlParser, '_startElement', '_endElement');
+		xml_set_character_data_handler($this->xmlParser, '_characterData');
+
+		if (!xml_parse($this->xmlParser, $response->body))
+		{
+			Log::add(
+				sprintf(
+					'XML error: %s at line %d', xml_error_string(xml_get_error_code($this->xmlParser)),
+					xml_get_current_line_number($this->xmlParser)
+				),
+				Log::WARNING, 'updater'
+			);
+
+			return false;
+		}
+
+		xml_parser_free($this->xmlParser);
+
+		return true;
+	}
+
+	/**
+	 * Converts a tag to numeric stability representation. If the tag doesn't represent a known stability level (one of
+	 * dev, alpha, beta, rc, stable) it is ignored.
+	 *
+	 * @param   string  $tag  The tag string, e.g. dev, alpha, beta, rc, stable
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.4
+	 */
+	protected function stabilityTagToInteger($tag)
+	{
+		$constant = '\\Joomla\\CMS\\Update\\Updater::STABILITY_' . strtoupper($tag);
+
+		if (defined($constant))
+		{
+			return constant($constant);
+		}
+
+		return Updater::STABILITY_STABLE;
+	}
+}
diff --git a/core/libraries/src/Updater/UpdateAdapter.php b/core/libraries/src/Updater/UpdateAdapter.php
new file mode 100644
index 00000000..494ace11
--- /dev/null
+++ b/core/libraries/src/Updater/UpdateAdapter.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Updater;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Version;
+use Joomla\Registry\Registry;
+
+\JLoader::import('joomla.base.adapterinstance');
+
+/**
+ * UpdateAdapter class.
+ *
+ * @since  11.1
+ */
+abstract class UpdateAdapter extends \JAdapterInstance
+{
+	/**
+	 * Resource handle for the XML Parser
+	 *
+	 * @var    resource
+	 * @since  12.1
+	 */
+	protected $xmlParser;
+
+	/**
+	 * Element call stack
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $stack = array('base');
+
+	/**
+	 * ID of update site
+	 *
+	 * @var    string
+	 * @since  12.1
+	 */
+	protected $updateSiteId = 0;
+
+	/**
+	 * Columns in the extensions table to be updated
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	protected $updatecols = array('NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'EXTRA_QUERY');
+
+	/**
+	 * Should we try appending a .xml extension to the update site's URL?
+	 *
+	 * @var   bool
+	 */
+	protected $appendExtension = false;
+
+	/**
+	 * The name of the update site (used in logging)
+	 *
+	 * @var   string
+	 */
+	protected $updateSiteName = '';
+
+	/**
+	 * The update site URL from which we will get the update information
+	 *
+	 * @var   string
+	 */
+	protected $_url = '';
+
+	/**
+	 * The minimum stability required for updates to be taken into account. The possible values are:
+	 * 0	dev			Development snapshots, nightly builds, pre-release versions and so on
+	 * 1	alpha		Alpha versions (work in progress, things are likely to be broken)
+	 * 2	beta		Beta versions (major functionality in place, show-stopper bugs are likely to be present)
+	 * 3	rc			Release Candidate versions (almost stable, minor bugs might be present)
+	 * 4	stable		Stable versions (production quality code)
+	 *
+	 * @var    int
+	 * @since  14.1
+	 *
+	 * @see    Updater
+	 */
+	protected $minimum_stability = Updater::STABILITY_STABLE;
+
+	/**
+	 * Gets the reference to the current direct parent
+	 *
+	 * @return  object
+	 *
+	 * @since   11.1
+	 */
+	protected function _getStackLocation()
+	{
+		return implode('->', $this->stack);
+	}
+
+	/**
+	 * Gets the reference to the last tag
+	 *
+	 * @return  object
+	 *
+	 * @since   11.1
+	 */
+	protected function _getLastTag()
+	{
+		return $this->stack[count($this->stack) - 1];
+	}
+
+	/**
+	 * Finds an update
+	 *
+	 * @param   array  $options  Options to use: update_site_id: the unique ID of the update site to look at
+	 *
+	 * @return  array  Update_sites and updates discovered
+	 *
+	 * @since   11.1
+	 */
+	abstract public function findUpdate($options);
+
+	/**
+	 * Toggles the enabled status of an update site. Update sites are disabled before getting the update information
+	 * from their URL and enabled afterwards. If the URL fetch fails with a PHP fatal error (e.g. timeout) the faulty
+	 * update site will remain disabled the next time we attempt to load the update information.
+	 *
+	 * @param   int   $update_site_id  The numeric ID of the update site to enable/disable
+	 * @param   bool  $enabled         Enable the site when true, disable it when false
+	 *
+	 * @return  void
+	 */
+	protected function toggleUpdateSite($update_site_id, $enabled = true)
+	{
+		$update_site_id = (int) $update_site_id;
+		$enabled = (bool) $enabled;
+
+		if (empty($update_site_id))
+		{
+			return;
+		}
+
+		$db = $this->parent->getDbo();
+		$query = $db->getQuery(true)
+			->update($db->qn('#__update_sites'))
+			->set($db->qn('enabled') . ' = ' . $db->q($enabled ? 1 : 0))
+			->where($db->qn('update_site_id') . ' = ' . $db->q($update_site_id));
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Do nothing
+		}
+	}
+
+	/**
+	 * Get the name of an update site. This is used in logging.
+	 *
+	 * @param   int  $updateSiteId  The numeric ID of the update site
+	 *
+	 * @return  string  The name of the update site or an empty string if it's not found
+	 */
+	protected function getUpdateSiteName($updateSiteId)
+	{
+		$updateSiteId = (int) $updateSiteId;
+
+		if (empty($updateSiteId))
+		{
+			return '';
+		}
+
+		$db = $this->parent->getDbo();
+		$query = $db->getQuery(true)
+			->select($db->qn('name'))
+			->from($db->qn('#__update_sites'))
+			->where($db->qn('update_site_id') . ' = ' . $db->q($updateSiteId));
+		$db->setQuery($query);
+
+		$name = '';
+
+		try
+		{
+			$name = $db->loadResult();
+		}
+		catch (\RuntimeException $e)
+		{
+			// Do nothing
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Try to get the raw HTTP response from the update site, hopefully containing the update XML.
+	 *
+	 * @param   array  $options  The update options, see findUpdate() in children classes
+	 *
+	 * @return  boolean|\JHttpResponse  False if we can't connect to the site, JHttpResponse otherwise
+	 *
+	 * @throws  \Exception
+	 */
+	protected function getUpdateSiteResponse($options = array())
+	{
+		$url = trim($options['location']);
+		$this->_url = &$url;
+		$this->updateSiteId = $options['update_site_id'];
+
+		if (!isset($options['update_site_name']))
+		{
+			$options['update_site_name'] = $this->getUpdateSiteName($this->updateSiteId);
+		}
+
+		$this->updateSiteName  = $options['update_site_name'];
+		$this->appendExtension = false;
+
+		if (array_key_exists('append_extension', $options))
+		{
+			$this->appendExtension = $options['append_extension'];
+		}
+
+		if ($this->appendExtension && (substr($url, -4) != '.xml'))
+		{
+			if (substr($url, -1) != '/')
+			{
+				$url .= '/';
+			}
+
+			$url .= 'extension.xml';
+		}
+
+		// Disable the update site. If the get() below fails with a fatal error (e.g. timeout) the faulty update
+		// site will remain disabled
+		$this->toggleUpdateSite($this->updateSiteId, false);
+
+		$startTime = microtime(true);
+
+		$version    = new Version;
+		$httpOption = new Registry;
+		$httpOption->set('userAgent', $version->getUserAgent('Joomla', true, false));
+
+		// JHttp transport throws an exception when there's no response.
+		try
+		{
+			$http = HttpFactory::getHttp($httpOption);
+			$response = $http->get($url, array(), 20);
+		}
+		catch (\RuntimeException $e)
+		{
+			$response = null;
+		}
+
+		// Enable the update site. Since the get() returned the update site should remain enabled
+		$this->toggleUpdateSite($this->updateSiteId, true);
+
+		// Log the time it took to load this update site's information
+		$endTime    = microtime(true);
+		$timeToLoad = sprintf('%0.2f', $endTime - $startTime);
+		Log::add(
+			"Loading information from update site #{$this->updateSiteId} with name " .
+			"\"$this->updateSiteName\" and URL $url took $timeToLoad seconds", Log::INFO, 'updater'
+		);
+
+		if ($response === null || $response->code !== 200)
+		{
+			// If the URL is missing the .xml extension, try appending it and retry loading the update
+			if (!$this->appendExtension && (substr($url, -4) != '.xml'))
+			{
+				$options['append_extension'] = true;
+
+				return $this->getUpdateSiteResponse($options);
+			}
+
+			// Log the exact update site name and URL which could not be loaded
+			Log::add('Error opening url: ' . $url . ' for update site: ' . $this->updateSiteName, Log::WARNING, 'updater');
+			$app = Factory::getApplication();
+			$app->enqueueMessage(\JText::sprintf('JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE', $this->updateSiteId, $this->updateSiteName, $url), 'warning');
+
+			return false;
+		}
+
+		return $response;
+	}
+}
diff --git a/core/libraries/src/Updater/Updater.php b/core/libraries/src/Updater/Updater.php
new file mode 100644
index 00000000..d3376929
--- /dev/null
+++ b/core/libraries/src/Updater/Updater.php
@@ -0,0 +1,440 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Updater;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Table\Table;
+
+\JLoader::import('joomla.filesystem.file');
+\JLoader::import('joomla.filesystem.folder');
+\JLoader::import('joomla.filesystem.path');
+\JLoader::import('joomla.base.adapter');
+
+/**
+ * Updater Class
+ *
+ * @since  11.1
+ */
+class Updater extends \JAdapter
+{
+	/**
+	 * Development snapshots, nightly builds, pre-release versions and so on
+	 *
+	 * @const  integer
+	 * @since  3.4
+	 */
+	const STABILITY_DEV = 0;
+
+	/**
+	 * Alpha versions (work in progress, things are likely to be broken)
+	 *
+	 * @const  integer
+	 * @since  3.4
+	 */
+	const STABILITY_ALPHA = 1;
+
+	/**
+	 * Beta versions (major functionality in place, show-stopper bugs are likely to be present)
+	 *
+	 * @const  integer
+	 * @since  3.4
+	 */
+	const STABILITY_BETA = 2;
+
+	/**
+	 * Release Candidate versions (almost stable, minor bugs might be present)
+	 *
+	 * @const  integer
+	 * @since  3.4
+	 */
+	const STABILITY_RC = 3;
+
+	/**
+	 * Stable versions (production quality code)
+	 *
+	 * @const  integer
+	 * @since  3.4
+	 */
+	const STABILITY_STABLE = 4;
+
+	/**
+	 * @var    Updater  Updater instance container.
+	 * @since  11.3
+	 */
+	protected static $instance;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $basepath       Base Path of the adapters
+	 * @param   string  $classprefix    Class prefix of adapters
+	 * @param   string  $adapterfolder  Name of folder to append to base path
+	 *
+	 * @since   3.1
+	 */
+	public function __construct($basepath = __DIR__, $classprefix = '\\Joomla\\CMS\\Updater\\Adapter', $adapterfolder = 'Adapter')
+	{
+		parent::__construct($basepath, $classprefix, $adapterfolder);
+	}
+
+	/**
+	 * Returns a reference to the global Installer object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @return  Updater  An installer object
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance()
+	{
+		if (!isset(self::$instance))
+		{
+			self::$instance = new Updater;
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Finds the update for an extension. Any discovered updates are stored in the #__updates table.
+	 *
+	 * @param   int|array  $eid                Extension Identifier or list of Extension Identifiers; if zero use all
+	 *                                         sites
+	 * @param   integer    $cacheTimeout       How many seconds to cache update information; if zero, force reload the
+	 *                                         update information
+	 * @param   integer    $minimum_stability  Minimum stability for the updates; 0=dev, 1=alpha, 2=beta, 3=rc,
+	 *                                         4=stable
+	 * @param   boolean    $includeCurrent     Should I include the current version in the results?
+	 *
+	 * @return  boolean True if there are updates
+	 *
+	 * @since   11.1
+	 */
+	public function findUpdates($eid = 0, $cacheTimeout = 0, $minimum_stability = self::STABILITY_STABLE, $includeCurrent = false)
+	{
+		$retval = false;
+
+		$results = $this->getUpdateSites($eid);
+
+		if (empty($results))
+		{
+			return $retval;
+		}
+
+		$now              = time();
+		$earliestTime     = $now - $cacheTimeout;
+		$sitesWithUpdates = array();
+
+		if ($cacheTimeout > 0)
+		{
+			$sitesWithUpdates = $this->getSitesWithUpdates($earliestTime);
+		}
+
+		foreach ($results as $result)
+		{
+			/**
+			 * If we have already checked for updates within the cache timeout period we will report updates available
+			 * only if there are update records matching this update site. Then we skip processing of the update site
+			 * since it's already processed within the cache timeout period.
+			 */
+			if (($cacheTimeout > 0)
+				&& isset($result['last_check_timestamp'])
+				&& ($result['last_check_timestamp'] >= $earliestTime))
+			{
+				$retval = $retval || in_array($result['update_site_id'], $sitesWithUpdates);
+
+				continue;
+			}
+
+			$updateObjects = $this->getUpdateObjectsForSite($result, $minimum_stability, $includeCurrent);
+
+			if (!empty($updateObjects))
+			{
+				$retval = true;
+
+				/** @var \JTableUpdate $update */
+				foreach ($updateObjects as $update)
+				{
+					$update->check();
+					$update->store();
+				}
+			}
+
+			// Finally, update the last update check timestamp
+			$this->updateLastCheckTimestamp($result['update_site_id']);
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Finds an update for an extension
+	 *
+	 * @param   integer  $id  Id of the extension
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.6.0
+	 *
+	 * @deprecated  4.0  No replacement.
+	 */
+	public function update($id)
+	{
+		$updaterow = Table::getInstance('update');
+		$updaterow->load($id);
+		$update = new Update;
+
+		if ($update->loadFromXml($updaterow->detailsurl))
+		{
+			return $update->install();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the update site records for an extension with ID $eid. If $eid is zero all enabled update sites records
+	 * will be returned.
+	 *
+	 * @param   int  $eid  The extension ID to fetch.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.6.0
+	 */
+	private function getUpdateSites($eid = 0)
+	{
+		$db    = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('DISTINCT a.update_site_id, a.type, a.location, a.last_check_timestamp, a.extra_query')
+			->from($db->quoteName('#__update_sites', 'a'))
+			->where('a.enabled = 1');
+
+		if ($eid)
+		{
+			$query->join('INNER', '#__update_sites_extensions AS b ON a.update_site_id = b.update_site_id');
+
+			if (is_array($eid))
+			{
+				$query->where('b.extension_id IN (' . implode(',', $eid) . ')');
+			}
+			elseif ((int) $eid)
+			{
+				$query->where('b.extension_id = ' . $eid);
+			}
+		}
+
+		$db->setQuery($query);
+
+		$result = $db->loadAssocList();
+
+		if (!is_array($result))
+		{
+			return array();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Loads the contents of an update site record $updateSite and returns the update objects
+	 *
+	 * @param   array  $updateSite         The update site record to process
+	 * @param   int    $minimum_stability  Minimum stability for the returned update records
+	 * @param   bool   $includeCurrent     Should I also include the current version?
+	 *
+	 * @return  array  The update records. Empty array if no updates are found.
+	 *
+	 * @since   3.6.0
+	 */
+	private function getUpdateObjectsForSite($updateSite, $minimum_stability = self::STABILITY_STABLE, $includeCurrent = false)
+	{
+		$retVal = array();
+
+		$this->setAdapter($updateSite['type']);
+
+		if (!isset($this->_adapters[$updateSite['type']]))
+		{
+			// Ignore update sites requiring adapters we don't have installed
+			return $retVal;
+		}
+
+		$updateSite['minimum_stability'] = $minimum_stability;
+
+		// Get the update information from the remote update XML document
+		/** @var UpdateAdapter $adapter */
+		$adapter       = $this->_adapters[ $updateSite['type']];
+		$update_result = $adapter->findUpdate($updateSite);
+
+		// Version comparison operator.
+		$operator = $includeCurrent ? 'ge' : 'gt';
+
+		if (is_array($update_result))
+		{
+			// If we have additional update sites in the remote (collection) update XML document, parse them
+			if (array_key_exists('update_sites', $update_result) && count($update_result['update_sites']))
+			{
+				$thisUrl = trim($updateSite['location']);
+				$thisId  = (int) $updateSite['update_site_id'];
+
+				foreach ($update_result['update_sites'] as $extraUpdateSite)
+				{
+					$extraUrl = trim($extraUpdateSite['location']);
+					$extraId  = (int) $extraUpdateSite['update_site_id'];
+
+					// Do not try to fetch the same update site twice
+					if (($thisId == $extraId) || ($thisUrl == $extraUrl))
+					{
+						continue;
+					}
+
+					$extraUpdates = $this->getUpdateObjectsForSite($extraUpdateSite, $minimum_stability);
+
+					if (count($extraUpdates))
+					{
+						$retVal = array_merge($retVal, $extraUpdates);
+					}
+				}
+			}
+
+			if (array_key_exists('updates', $update_result) && count($update_result['updates']))
+			{
+				/** @var \JTableUpdate $current_update */
+				foreach ($update_result['updates'] as $current_update)
+				{
+					$current_update->extra_query = $updateSite['extra_query'];
+
+					/** @var \JTableUpdate $update */
+					$update = Table::getInstance('update');
+
+					/** @var \JTableExtension $extension */
+					$extension = Table::getInstance('extension');
+
+					$uid = $update
+						->find(
+							array(
+								'element'   => $current_update->get('element'),
+								'type'      => $current_update->get('type'),
+								'client_id' => $current_update->get('client_id'),
+								'folder'    => $current_update->get('folder'),
+							)
+						);
+
+					$eid = $extension
+						->find(
+							array(
+								'element'   => $current_update->get('element'),
+								'type'      => $current_update->get('type'),
+								'client_id' => $current_update->get('client_id'),
+								'folder'    => $current_update->get('folder'),
+							)
+						);
+
+					if (!$uid)
+					{
+						// Set the extension id
+						if ($eid)
+						{
+							// We have an installed extension, check the update is actually newer
+							$extension->load($eid);
+							$data = json_decode($extension->manifest_cache, true);
+
+							if (version_compare($current_update->version, $data['version'], $operator) == 1)
+							{
+								$current_update->extension_id = $eid;
+								$retVal[] = $current_update;
+							}
+						}
+						else
+						{
+							// A potentially new extension to be installed
+							$retVal[] = $current_update;
+						}
+					}
+					else
+					{
+						$update->load($uid);
+
+						// If there is an update, check that the version is newer then replaces
+						if (version_compare($current_update->version, $update->version, $operator) == 1)
+						{
+							$retVal[] = $current_update;
+						}
+					}
+				}
+			}
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Returns the IDs of the update sites with cached updates
+	 *
+	 * @param   int  $timestamp  Optional. If set, only update sites checked before $timestamp will be taken into
+	 *                           account.
+	 *
+	 * @return  array  The IDs of the update sites with cached updates
+	 *
+	 * @since   3.6.0
+	 */
+	private function getSitesWithUpdates($timestamp = 0)
+	{
+		$db = Factory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('DISTINCT update_site_id')
+			->from('#__updates');
+
+		if ($timestamp)
+		{
+			$subQuery = $db->getQuery(true)
+				->select('update_site_id')
+				->from('#__update_sites')
+				->where($db->qn('last_check_timestamp') . ' IS NULL', 'OR')
+				->where($db->qn('last_check_timestamp') . ' <= ' . $db->q($timestamp), 'OR');
+
+			$query->where($db->qn('update_site_id') . ' IN (' . $subQuery . ')');
+		}
+
+		$retVal = $db->setQuery($query)->loadColumn(0);
+
+		if (empty($retVal))
+		{
+			return array();
+		}
+
+		return $retVal;
+	}
+
+	/**
+	 * Update the last check timestamp of an update site
+	 *
+	 * @param   int  $updateSiteId  The update site ID to mark as just checked
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	private function updateLastCheckTimestamp($updateSiteId)
+	{
+		$timestamp = time();
+		$db        = Factory::getDbo();
+
+		$query = $db->getQuery(true)
+			->update($db->quoteName('#__update_sites'))
+			->set($db->quoteName('last_check_timestamp') . ' = ' . $db->quote($timestamp))
+			->where($db->quoteName('update_site_id') . ' = ' . $db->quote($updateSiteId));
+		$db->setQuery($query);
+		$db->execute();
+	}
+}
diff --git a/core/libraries/src/Uri/Uri.php b/core/libraries/src/Uri/Uri.php
new file mode 100644
index 00000000..a7047c8c
--- /dev/null
+++ b/core/libraries/src/Uri/Uri.php
@@ -0,0 +1,341 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Uri;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JUri Class
+ *
+ * This class serves two purposes. First it parses a URI and provides a common interface
+ * for the Joomla Platform to access and manipulate a URI.  Second it obtains the URI of
+ * the current executing script from the server regardless of server.
+ *
+ * @since  11.1
+ */
+class Uri extends \Joomla\Uri\Uri
+{
+	/**
+	 * @var    Uri[]  An array of JUri instances.
+	 * @since  11.1
+	 */
+	protected static $instances = array();
+
+	/**
+	 * @var    array  The current calculated base url segments.
+	 * @since  11.1
+	 */
+	protected static $base = array();
+
+	/**
+	 * @var    array  The current calculated root url segments.
+	 * @since  11.1
+	 */
+	protected static $root = array();
+
+	/**
+	 * @var    string  The current url.
+	 * @since  11.1
+	 */
+	protected static $current;
+
+	/**
+	 * Returns the global JUri object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $uri  The URI to parse.  [optional: if null uses script URI]
+	 *
+	 * @return  Uri  The URI object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($uri = 'SERVER')
+	{
+		if (empty(static::$instances[$uri]))
+		{
+			// Are we obtaining the URI from the server?
+			if ($uri == 'SERVER')
+			{
+				// Determine if the request was over SSL (HTTPS).
+				if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off'))
+				{
+					$https = 's://';
+				}
+				elseif ((isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
+					!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
+					(strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) !== 'http')))
+				{
+					$https = 's://';
+				}
+				else
+				{
+					$https = '://';
+				}
+
+				/*
+				 * Since we are assigning the URI from the server variables, we first need
+				 * to determine if we are running on apache or IIS.  If PHP_SELF and REQUEST_URI
+				 * are present, we will assume we are running on apache.
+				 */
+
+				if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI']))
+				{
+					// To build the entire URI we need to prepend the protocol, and the http host
+					// to the URI string.
+					$theURI = 'http' . $https . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+				}
+				else
+				{
+					/*
+					 * Since we do not have REQUEST_URI to work with, we will assume we are
+					 * running on IIS and will therefore need to work some magic with the SCRIPT_NAME and
+					 * QUERY_STRING environment variables.
+					 *
+					 * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS
+					 */
+					$theURI = 'http' . $https . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'];
+
+					// If the query string exists append it to the URI string
+					if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']))
+					{
+						$theURI .= '?' . $_SERVER['QUERY_STRING'];
+					}
+				}
+
+				// Extra cleanup to remove invalid chars in the URL to prevent injections through the Host header
+				$theURI = str_replace(array("'", '"', '<', '>'), array('%27', '%22', '%3C', '%3E'), $theURI);
+			}
+			else
+			{
+				// We were given a URI
+				$theURI = $uri;
+			}
+
+			static::$instances[$uri] = new static($theURI);
+		}
+
+		return static::$instances[$uri];
+	}
+
+	/**
+	 * Returns the base URI for the request.
+	 *
+	 * @param   boolean  $pathonly  If false, prepend the scheme, host and port information. Default is false.
+	 *
+	 * @return  string  The base URI string
+	 *
+	 * @since   11.1
+	 */
+	public static function base($pathonly = false)
+	{
+		// Get the base request path.
+		if (empty(static::$base))
+		{
+			$config = \JFactory::getConfig();
+			$uri = static::getInstance();
+			$live_site = ($uri->isSsl()) ? str_replace('http://', 'https://', $config->get('live_site')) : $config->get('live_site');
+
+			if (trim($live_site) != '')
+			{
+				$uri = static::getInstance($live_site);
+				static::$base['prefix'] = $uri->toString(array('scheme', 'host', 'port'));
+				static::$base['path'] = rtrim($uri->toString(array('path')), '/\\');
+
+				if (defined('JPATH_BASE') && defined('JPATH_ADMINISTRATOR'))
+				{
+					if (JPATH_BASE == JPATH_ADMINISTRATOR)
+					{
+						static::$base['path'] .= '/administrator';
+					}
+				}
+			}
+			else
+			{
+				static::$base['prefix'] = $uri->toString(array('scheme', 'host', 'port'));
+
+				if (strpos(php_sapi_name(), 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($_SERVER['REQUEST_URI']))
+				{
+					// PHP-CGI on Apache with "cgi.fix_pathinfo = 0"
+
+					// We shouldn't have user-supplied PATH_INFO in PHP_SELF in this case
+					// because PHP will not work with PATH_INFO at all.
+					$script_name = $_SERVER['PHP_SELF'];
+				}
+				else
+				{
+					// Others
+					$script_name = $_SERVER['SCRIPT_NAME'];
+				}
+
+				// Extra cleanup to remove invalid chars in the URL to prevent injections through broken server implementation
+				$script_name = str_replace(array("'", '"', '<', '>'), array('%27', '%22', '%3C', '%3E'), $script_name);
+
+				static::$base['path'] = rtrim(dirname($script_name), '/\\');
+			}
+		}
+
+		return $pathonly === false ? static::$base['prefix'] . static::$base['path'] . '/' : static::$base['path'];
+	}
+
+	/**
+	 * Returns the root URI for the request.
+	 *
+	 * @param   boolean  $pathonly  If false, prepend the scheme, host and port information. Default is false.
+	 * @param   string   $path      The path
+	 *
+	 * @return  string  The root URI string.
+	 *
+	 * @since   11.1
+	 */
+	public static function root($pathonly = false, $path = null)
+	{
+		// Get the scheme
+		if (empty(static::$root))
+		{
+			$uri = static::getInstance(static::base());
+			static::$root['prefix'] = $uri->toString(array('scheme', 'host', 'port'));
+			static::$root['path'] = rtrim($uri->toString(array('path')), '/\\');
+		}
+
+		// Get the scheme
+		if (isset($path))
+		{
+			static::$root['path'] = $path;
+		}
+
+		return $pathonly === false ? static::$root['prefix'] . static::$root['path'] . '/' : static::$root['path'];
+	}
+
+	/**
+	 * Returns the URL for the request, minus the query.
+	 *
+	 * @return  string
+	 *
+	 * @since   11.1
+	 */
+	public static function current()
+	{
+		// Get the current URL.
+		if (empty(static::$current))
+		{
+			$uri = static::getInstance();
+			static::$current = $uri->toString(array('scheme', 'host', 'port', 'path'));
+		}
+
+		return static::$current;
+	}
+
+	/**
+	 * Method to reset class static members for testing and other various issues.
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public static function reset()
+	{
+		static::$instances = array();
+		static::$base = array();
+		static::$root = array();
+		static::$current = '';
+	}
+
+	/**
+	 * Set the URI path string. Note we keep this method here so it uses the old _cleanPath function
+	 *
+	 * @param   string  $path  The URI path string.
+	 *
+	 * @return  void
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0  Use {@link \Joomla\Uri\Uri::setPath()}
+	 * @note        Present to proxy calls to the deprecated {@link JUri::_cleanPath()} method.
+	 */
+	public function setPath($path)
+	{
+		$this->path = $this->_cleanPath($path);
+	}
+
+	/**
+	 * Checks if the supplied URL is internal
+	 *
+	 * @param   string  $url  The URL to check.
+	 *
+	 * @return  boolean  True if Internal.
+	 *
+	 * @since   11.1
+	 */
+	public static function isInternal($url)
+	{
+		$uri = static::getInstance($url);
+		$base = $uri->toString(array('scheme', 'host', 'port', 'path'));
+		$host = $uri->toString(array('scheme', 'host', 'port'));
+
+		// @see JUriTest
+		if (empty($host) && strpos($uri->path, 'index.php') === 0
+			|| !empty($host) && preg_match('#' . preg_quote(static::base(), '#') . '#', $base)
+			|| !empty($host) && $host === static::getInstance(static::base())->host && strpos($uri->path, 'index.php') !== false
+			|| !empty($host) && $base === $host && preg_match('#' . preg_quote($base, '#') . '#', static::base()))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Build a query from an array (reverse of the PHP parse_str()).
+	 *
+	 * @param   array  $params  The array of key => value pairs to return as a query string.
+	 *
+	 * @return  string  The resulting query string.
+	 *
+	 * @see     parse_str()
+	 * @since   11.1
+	 * @note    The parent method is protected, this exposes it as public for B/C
+	 */
+	public static function buildQuery(array $params)
+	{
+		return parent::buildQuery($params);
+	}
+
+	/**
+	 * Parse a given URI and populate the class fields.
+	 *
+	 * @param   string  $uri  The URI string to parse.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 * @note    The parent method is protected, this exposes it as public for B/C
+	 */
+	public function parse($uri)
+	{
+		return parent::parse($uri);
+	}
+
+	/**
+	 * Resolves //, ../ and ./ from a path and returns
+	 * the result. Eg:
+	 *
+	 * /foo/bar/../boo.php    => /foo/boo.php
+	 * /foo/bar/../../boo.php => /boo.php
+	 * /foo/bar/.././/boo.php => /foo/boo.php
+	 *
+	 * @param   string  $path  The URI path to clean.
+	 *
+	 * @return  string  Cleaned and resolved URI path.
+	 *
+	 * @since       11.1
+	 * @deprecated  4.0   Use {@link \Joomla\Uri\Uri::cleanPath()} instead
+	 */
+	protected function _cleanPath($path)
+	{
+		return parent::cleanPath($path);
+	}
+}
diff --git a/core/libraries/src/User/User.php b/core/libraries/src/User/User.php
new file mode 100644
index 00000000..b52c4878
--- /dev/null
+++ b/core/libraries/src/User/User.php
@@ -0,0 +1,960 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\User;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\Table;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * User class.  Handles all application interaction with a user
+ *
+ * @since  11.1
+ */
+class User extends \JObject
+{
+	/**
+	 * A cached switch for if this user has root access rights.
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	protected $isRoot = null;
+
+	/**
+	 * Unique id
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $id = null;
+
+	/**
+	 * The user's real name (or nickname)
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $name = null;
+
+	/**
+	 * The login name
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $username = null;
+
+	/**
+	 * The email
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $email = null;
+
+	/**
+	 * MD5 encrypted password
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $password = null;
+
+	/**
+	 * Clear password, only available when a new password is set for a user
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $password_clear = '';
+
+	/**
+	 * Block status
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $block = null;
+
+	/**
+	 * Should this user receive system email
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $sendEmail = null;
+
+	/**
+	 * Date the user was registered
+	 *
+	 * @var    \DateTime
+	 * @since  11.1
+	 */
+	public $registerDate = null;
+
+	/**
+	 * Date of last visit
+	 *
+	 * @var    \DateTime
+	 * @since  11.1
+	 */
+	public $lastvisitDate = null;
+
+	/**
+	 * Activation hash
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $activation = null;
+
+	/**
+	 * User parameters
+	 *
+	 * @var    Registry
+	 * @since  11.1
+	 */
+	public $params = null;
+
+	/**
+	 * Associative array of user names => group ids
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	public $groups = array();
+
+	/**
+	 * Guest status
+	 *
+	 * @var    boolean
+	 * @since  11.1
+	 */
+	public $guest = null;
+
+	/**
+	 * Last Reset Time
+	 *
+	 * @var    string
+	 * @since  12.2
+	 */
+	public $lastResetTime = null;
+
+	/**
+	 * Count since last Reset Time
+	 *
+	 * @var    int
+	 * @since  12.2
+	 */
+	public $resetCount = null;
+
+	/**
+	 * Flag to require the user's password be reset
+	 *
+	 * @var    int
+	 * @since  3.2
+	 */
+	public $requireReset = null;
+
+	/**
+	 * User parameters
+	 *
+	 * @var    Registry
+	 * @since  11.1
+	 */
+	protected $_params = null;
+
+	/**
+	 * Authorised access groups
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_authGroups = null;
+
+	/**
+	 * Authorised access levels
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_authLevels = null;
+
+	/**
+	 * Authorised access actions
+	 *
+	 * @var    array
+	 * @since  11.1
+	 */
+	protected $_authActions = null;
+
+	/**
+	 * Error message
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	protected $_errorMsg = null;
+
+	/**
+	 * UserWrapper object
+	 *
+	 * @var    UserWrapper
+	 * @since  3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	protected $userHelper = null;
+
+	/**
+	 * @var    array  User instances container.
+	 * @since  11.3
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Constructor activating the default information of the language
+	 *
+	 * @param   integer      $identifier  The primary key of the user to load (optional).
+	 * @param   UserWrapper  $userHelper  The UserWrapper for the static methods. [@deprecated 4.0]
+	 *
+	 * @since   11.1
+	 */
+	public function __construct($identifier = 0, UserWrapper $userHelper = null)
+	{
+		if (null === $userHelper)
+		{
+			$userHelper = new UserWrapper;
+		}
+
+		$this->userHelper = $userHelper;
+
+		// Create the user parameters object
+		$this->_params = new Registry;
+
+		// Load the user if it exists
+		if (!empty($identifier))
+		{
+			$this->load($identifier);
+		}
+		else
+		{
+			// Initialise
+			$this->id = 0;
+			$this->sendEmail = 0;
+			$this->aid = 0;
+			$this->guest = 1;
+		}
+	}
+
+	/**
+	 * Returns the global User object, only creating it if it doesn't already exist.
+	 *
+	 * @param   integer      $identifier  The primary key of the user to load (optional).
+	 * @param   UserWrapper  $userHelper  The UserWrapper for the static methods. [@deprecated 4.0]
+	 *
+	 * @return  User  The User object.
+	 *
+	 * @since   11.1
+	 */
+	public static function getInstance($identifier = 0, UserWrapper $userHelper = null)
+	{
+		if (null === $userHelper)
+		{
+			$userHelper = new UserWrapper;
+		}
+
+		// Find the user id
+		if (!is_numeric($identifier))
+		{
+			if (!$id = $userHelper->getUserId($identifier))
+			{
+				// If the $identifier doesn't match with any id, just return an empty User.
+				return new User;
+			}
+		}
+		else
+		{
+			$id = $identifier;
+		}
+
+		// If the $id is zero, just return an empty User.
+		// Note: don't cache this user because it'll have a new ID on save!
+		if ($id === 0)
+		{
+			return new User;
+		}
+
+		// Check if the user ID is already cached.
+		if (empty(self::$instances[$id]))
+		{
+			$user = new User($id, $userHelper);
+			self::$instances[$id] = $user;
+		}
+
+		return self::$instances[$id];
+	}
+
+	/**
+	 * Method to get a parameter value
+	 *
+	 * @param   string  $key      Parameter key
+	 * @param   mixed   $default  Parameter default value
+	 *
+	 * @return  mixed  The value or the default if it did not exist
+	 *
+	 * @since   11.1
+	 */
+	public function getParam($key, $default = null)
+	{
+		return $this->_params->get($key, $default);
+	}
+
+	/**
+	 * Method to set a parameter
+	 *
+	 * @param   string  $key    Parameter key
+	 * @param   mixed   $value  Parameter value
+	 *
+	 * @return  mixed  Set parameter value
+	 *
+	 * @since   11.1
+	 */
+	public function setParam($key, $value)
+	{
+		return $this->_params->set($key, $value);
+	}
+
+	/**
+	 * Method to set a default parameter if it does not exist
+	 *
+	 * @param   string  $key    Parameter key
+	 * @param   mixed   $value  Parameter value
+	 *
+	 * @return  mixed  Set parameter value
+	 *
+	 * @since   11.1
+	 */
+	public function defParam($key, $value)
+	{
+		return $this->_params->def($key, $value);
+	}
+
+	/**
+	 * Method to check User object authorisation against an access control
+	 * object and optionally an access extension object
+	 *
+	 * @param   string  $action     The name of the action to check for permission.
+	 * @param   string  $assetname  The name of the asset on which to perform the action.
+	 *
+	 * @return  boolean  True if authorised
+	 *
+	 * @since   11.1
+	 */
+	public function authorise($action, $assetname = null)
+	{
+		// Make sure we only check for core.admin once during the run.
+		if ($this->isRoot === null)
+		{
+			$this->isRoot = false;
+
+			// Check for the configuration file failsafe.
+			$rootUser = \JFactory::getConfig()->get('root_user');
+
+			// The root_user variable can be a numeric user ID or a username.
+			if (is_numeric($rootUser) && $this->id > 0 && $this->id == $rootUser)
+			{
+				$this->isRoot = true;
+			}
+			elseif ($this->username && $this->username == $rootUser)
+			{
+				$this->isRoot = true;
+			}
+			elseif ($this->id > 0)
+			{
+				// Get all groups against which the user is mapped.
+				$identities = $this->getAuthorisedGroups();
+				array_unshift($identities, $this->id * -1);
+
+				if (Access::getAssetRules(1)->allow('core.admin', $identities))
+				{
+					$this->isRoot = true;
+
+					return true;
+				}
+			}
+		}
+
+		return $this->isRoot ? true : (bool) Access::check($this->id, $action, $assetname);
+	}
+
+	/**
+	 * Method to return a list of all categories that a user has permission for a given action
+	 *
+	 * @param   string  $component  The component from which to retrieve the categories
+	 * @param   string  $action     The name of the section within the component from which to retrieve the actions.
+	 *
+	 * @return  array  List of categories that this group can do this action to (empty array if none). Categories must be published.
+	 *
+	 * @since   11.1
+	 */
+	public function getAuthorisedCategories($component, $action)
+	{
+		// Brute force method: get all published category rows for the component and check each one
+		// TODO: Modify the way permissions are stored in the db to allow for faster implementation and better scaling
+		$db = \JFactory::getDbo();
+
+		$subQuery = $db->getQuery(true)
+			->select('id,asset_id')
+			->from('#__categories')
+			->where('extension = ' . $db->quote($component))
+			->where('published = 1');
+
+		$query = $db->getQuery(true)
+			->select('c.id AS id, a.name AS asset_name')
+			->from('(' . (string) $subQuery . ') AS c')
+			->join('INNER', '#__assets AS a ON c.asset_id = a.id');
+		$db->setQuery($query);
+		$allCategories = $db->loadObjectList('id');
+		$allowedCategories = array();
+
+		foreach ($allCategories as $category)
+		{
+			if ($this->authorise($action, $category->asset_name))
+			{
+				$allowedCategories[] = (int) $category->id;
+			}
+		}
+
+		return $allowedCategories;
+	}
+
+	/**
+	 * Gets an array of the authorised access levels for the user
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function getAuthorisedViewLevels()
+	{
+		if ($this->_authLevels === null)
+		{
+			$this->_authLevels = array();
+		}
+
+		if (empty($this->_authLevels))
+		{
+			$this->_authLevels = Access::getAuthorisedViewLevels($this->id);
+		}
+
+		return $this->_authLevels;
+	}
+
+	/**
+	 * Gets an array of the authorised user groups
+	 *
+	 * @return  array
+	 *
+	 * @since   11.1
+	 */
+	public function getAuthorisedGroups()
+	{
+		if ($this->_authGroups === null)
+		{
+			$this->_authGroups = array();
+		}
+
+		if (empty($this->_authGroups))
+		{
+			$this->_authGroups = Access::getGroupsByUser($this->id);
+		}
+
+		return $this->_authGroups;
+	}
+
+	/**
+	 * Clears the access rights cache of this user
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.0
+	 */
+	public function clearAccessRights()
+	{
+		$this->_authLevels = null;
+		$this->_authGroups = null;
+		$this->isRoot = null;
+		Access::clearStatics();
+	}
+
+	/**
+	 * Pass through method to the table for setting the last visit date
+	 *
+	 * @param   integer  $timestamp  The timestamp, defaults to 'now'.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   11.1
+	 */
+	public function setLastVisit($timestamp = null)
+	{
+		// Create the user table object
+		$table = $this->getTable();
+		$table->load($this->id);
+
+		return $table->setLastVisit($timestamp);
+	}
+
+	/**
+	 * Method to get the user parameters
+	 *
+	 * This method used to load the user parameters from a file.
+	 *
+	 * @return  object   The user parameters object.
+	 *
+	 * @since   11.1
+	 * @deprecated  12.3 (Platform) & 4.0 (CMS) - Instead use User::getParam()
+	 */
+	public function getParameters()
+	{
+		// @codeCoverageIgnoreStart
+		\JLog::add('User::getParameters() is deprecated. User::getParam().', \JLog::WARNING, 'deprecated');
+
+		return $this->_params;
+
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Method to get the user timezone.
+	 *
+	 * If the user didn't set a timezone, it will return the server timezone
+	 *
+	 * @return \DateTimeZone
+	 *
+	 * @since 3.7.0
+	 */
+	public function getTimezone()
+	{
+		$timezone = $this->getParam('timezone', \JFactory::getApplication()->get('offset', 'GMT'));
+
+		return new \DateTimeZone($timezone);
+	}
+
+	/**
+	 * Method to get the user parameters
+	 *
+	 * @param   object  $params  The user parameters object
+	 *
+	 * @return  void
+	 *
+	 * @since   11.1
+	 */
+	public function setParameters($params)
+	{
+		$this->_params = $params;
+	}
+
+	/**
+	 * Method to get the user table object
+	 *
+	 * This function uses a static variable to store the table name of the user table to
+	 * instantiate. You can call this function statically to set the table name if
+	 * needed.
+	 *
+	 * @param   string  $type    The user table name to be used
+	 * @param   string  $prefix  The user table prefix to be used
+	 *
+	 * @return  object  The user table object
+	 *
+	 * @note    At 4.0 this method will no longer be static
+	 * @since   11.1
+	 */
+	public static function getTable($type = null, $prefix = 'JTable')
+	{
+		static $tabletype;
+
+		// Set the default tabletype;
+		if (!isset($tabletype))
+		{
+			$tabletype['name'] = 'user';
+			$tabletype['prefix'] = 'JTable';
+		}
+
+		// Set a custom table type is defined
+		if (isset($type))
+		{
+			$tabletype['name'] = $type;
+			$tabletype['prefix'] = $prefix;
+		}
+
+		// Create the user table object
+		return Table::getInstance($tabletype['name'], $tabletype['prefix']);
+	}
+
+	/**
+	 * Method to bind an associative array of data to a user object
+	 *
+	 * @param   array  &$array  The associative array to bind to the object
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function bind(&$array)
+	{
+		// Let's check to see if the user is new or not
+		if (empty($this->id))
+		{
+			// Check the password and create the crypted password
+			if (empty($array['password']))
+			{
+				$array['password'] = $this->userHelper->genRandomPassword();
+				$array['password2'] = $array['password'];
+			}
+
+			// Not all controllers check the password, although they should.
+			// Hence this code is required:
+			if (isset($array['password2']) && $array['password'] != $array['password2'])
+			{
+				\JFactory::getApplication()->enqueueMessage(\JText::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'), 'error');
+
+				return false;
+			}
+
+			$this->password_clear = ArrayHelper::getValue($array, 'password', '', 'string');
+
+			$array['password'] = $this->userHelper->hashPassword($array['password']);
+
+			// Set the registration timestamp
+			$this->set('registerDate', \JFactory::getDate()->toSql());
+
+			// Check that username is not greater than 150 characters
+			$username = $this->get('username');
+
+			if (strlen($username) > 150)
+			{
+				$username = substr($username, 0, 150);
+				$this->set('username', $username);
+			}
+		}
+		else
+		{
+			// Updating an existing user
+			if (!empty($array['password']))
+			{
+				if ($array['password'] != $array['password2'])
+				{
+					$this->setError(\JText::_('JLIB_USER_ERROR_PASSWORD_NOT_MATCH'));
+
+					return false;
+				}
+
+				$this->password_clear = ArrayHelper::getValue($array, 'password', '', 'string');
+
+				// Check if the user is reusing the current password if required to reset their password
+				if ($this->requireReset == 1 && $this->userHelper->verifyPassword($this->password_clear, $this->password))
+				{
+					$this->setError(\JText::_('JLIB_USER_ERROR_CANNOT_REUSE_PASSWORD'));
+
+					return false;
+				}
+
+				$array['password'] = $this->userHelper->hashPassword($array['password']);
+
+				// Reset the change password flag
+				$array['requireReset'] = 0;
+			}
+			else
+			{
+				$array['password'] = $this->password;
+			}
+		}
+
+		if (array_key_exists('params', $array))
+		{
+			$this->_params->loadArray($array['params']);
+
+			if (is_array($array['params']))
+			{
+				$params = (string) $this->_params;
+			}
+			else
+			{
+				$params = $array['params'];
+			}
+
+			$this->params = $params;
+		}
+
+		// Bind the array
+		if (!$this->setProperties($array))
+		{
+			$this->setError(\JText::_('JLIB_USER_ERROR_BIND_ARRAY'));
+
+			return false;
+		}
+
+		// Make sure its an integer
+		$this->id = (int) $this->id;
+
+		return true;
+	}
+
+	/**
+	 * Method to save the User object to the database
+	 *
+	 * @param   boolean  $updateOnly  Save the object only if not a new user
+	 *                                Currently only used in the user reset password method.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public function save($updateOnly = false)
+	{
+		// Create the user table object
+		$table = $this->getTable();
+		$this->params = (string) $this->_params;
+		$table->bind($this->getProperties());
+
+		// Allow an exception to be thrown.
+		try
+		{
+			// Check and store the object.
+			if (!$table->check())
+			{
+				$this->setError($table->getError());
+
+				return false;
+			}
+
+			// If user is made a Super Admin group and user is NOT a Super Admin
+
+			// @todo ACL - this needs to be acl checked
+
+			$my = \JFactory::getUser();
+
+			// Are we creating a new user
+			$isNew = empty($this->id);
+
+			// If we aren't allowed to create new users return
+			if ($isNew && $updateOnly)
+			{
+				return true;
+			}
+
+			// Get the old user
+			$oldUser = new User($this->id);
+
+			// Access Checks
+
+			// The only mandatory check is that only Super Admins can operate on other Super Admin accounts.
+			// To add additional business rules, use a user plugin and throw an Exception with onUserBeforeSave.
+
+			// Check if I am a Super Admin
+			$iAmSuperAdmin = $my->authorise('core.admin');
+
+			$iAmRehashingSuperadmin = false;
+
+			if (($my->id == 0 && !$isNew) && $this->id == $oldUser->id && $oldUser->authorise('core.admin') && $oldUser->password != $this->password)
+			{
+				$iAmRehashingSuperadmin = true;
+			}
+
+			// We are only worried about edits to this account if I am not a Super Admin.
+			if ($iAmSuperAdmin != true && $iAmRehashingSuperadmin != true)
+			{
+				// I am not a Super Admin, and this one is, so fail.
+				if (!$isNew && Access::check($this->id, 'core.admin'))
+				{
+					throw new \RuntimeException('User not Super Administrator');
+				}
+
+				if ($this->groups != null)
+				{
+					// I am not a Super Admin and I'm trying to make one.
+					foreach ($this->groups as $groupId)
+					{
+						if (Access::checkGroup($groupId, 'core.admin'))
+						{
+							throw new \RuntimeException('User not Super Administrator');
+						}
+					}
+				}
+			}
+
+			// Fire the onUserBeforeSave event.
+			PluginHelper::importPlugin('user');
+			$dispatcher = \JEventDispatcher::getInstance();
+
+			$result = $dispatcher->trigger('onUserBeforeSave', array($oldUser->getProperties(), $isNew, $this->getProperties()));
+
+			if (in_array(false, $result, true))
+			{
+				// Plugin will have to raise its own error or throw an exception.
+				return false;
+			}
+
+			// Store the user data in the database
+			$result = $table->store();
+
+			// Set the id for the User object in case we created a new user.
+			if (empty($this->id))
+			{
+				$this->id = $table->get('id');
+			}
+
+			if ($my->id == $table->id)
+			{
+				$registry = new Registry($table->params);
+				$my->setParameters($registry);
+			}
+
+			// Fire the onUserAfterSave event
+			$dispatcher->trigger('onUserAfterSave', array($this->getProperties(), $isNew, $result, $this->getError()));
+		}
+		catch (\Exception $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to delete the User object from the database
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function delete()
+	{
+		PluginHelper::importPlugin('user');
+
+		// Trigger the onUserBeforeDelete event
+		$dispatcher = \JEventDispatcher::getInstance();
+		$dispatcher->trigger('onUserBeforeDelete', array($this->getProperties()));
+
+		// Create the user table object
+		$table = $this->getTable();
+
+		if (!$result = $table->delete($this->id))
+		{
+			$this->setError($table->getError());
+		}
+
+		// Trigger the onUserAfterDelete event
+		$dispatcher->trigger('onUserAfterDelete', array($this->getProperties(), $result, $this->getError()));
+
+		return $result;
+	}
+
+	/**
+	 * Method to load a User object by user id number
+	 *
+	 * @param   mixed  $id  The user id of the user to load
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public function load($id)
+	{
+		// Create the user table object
+		$table = $this->getTable();
+
+		// Load the UserModel object based on the user id or throw a warning.
+		if (!$table->load($id))
+		{
+			// Reset to guest user
+			$this->guest = 1;
+
+			\JLog::add(\JText::sprintf('JLIB_USER_ERROR_UNABLE_TO_LOAD_USER', $id), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		/*
+		 * Set the user parameters using the default XML file.  We might want to
+		 * extend this in the future to allow for the ability to have custom
+		 * user parameters, but for right now we'll leave it how it is.
+		 */
+
+		if ($table->params)
+		{
+			$this->_params->loadString($table->params);
+		}
+
+		// Assuming all is well at this point let's bind the data
+		$this->setProperties($table->getProperties());
+
+		// The user is no longer a guest
+		if ($this->id != 0)
+		{
+			$this->guest = 0;
+		}
+		else
+		{
+			$this->guest = 1;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to allow serialize the object with minimal properties.
+	 *
+	 * @return  array  The names of the properties to include in serialization.
+	 *
+	 * @since   3.6.0
+	 */
+	public function __sleep()
+	{
+		return array('id');
+	}
+
+	/**
+	 * Method to recover the full object on unserialize.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.6.0
+	 */
+	public function __wakeup()
+	{
+		// Initialise some variables
+		$this->userHelper = new UserWrapper;
+		$this->_params    = new Registry;
+
+		// Load the user if it exists
+		if (!empty($this->id) && $this->load($this->id))
+		{
+			// Push user into cached instances.
+			self::$instances[$this->id] = $this;
+		}
+		else
+		{
+			// Initialise
+			$this->id = 0;
+			$this->sendEmail = 0;
+			$this->aid = 0;
+			$this->guest = 1;
+		}
+	}
+}
diff --git a/core/libraries/src/User/UserHelper.php b/core/libraries/src/User/UserHelper.php
new file mode 100644
index 00000000..a000478a
--- /dev/null
+++ b/core/libraries/src/User/UserHelper.php
@@ -0,0 +1,844 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\User;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Access\Access;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Authorisation helper class, provides static methods to perform various tasks relevant
+ * to the Joomla user and authorisation classes
+ *
+ * This class has influences and some method logic from the Horde Auth package
+ *
+ * @since  11.1
+ */
+abstract class UserHelper
+{
+	/**
+	 * Method to add a user to a group.
+	 *
+	 * @param   integer  $userId   The id of the user.
+	 * @param   integer  $groupId  The id of the group.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 * @throws  \RuntimeException
+	 */
+	public static function addUserToGroup($userId, $groupId)
+	{
+		// Get the user object.
+		$user = new User((int) $userId);
+
+		// Add the user to the group if necessary.
+		if (!in_array($groupId, $user->groups))
+		{
+			// Check whether the group exists.
+			$db = \JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->select($db->quoteName('id'))
+				->from($db->quoteName('#__usergroups'))
+				->where($db->quoteName('id') . ' = ' . (int) $groupId);
+			$db->setQuery($query);
+
+			// If the group does not exist, return an exception.
+			if ($db->loadResult() === null)
+			{
+				throw new \RuntimeException('Access Usergroup Invalid');
+			}
+
+			// Add the group data to the user object.
+			$user->groups[$groupId] = $groupId;
+
+			// Store the user object.
+			$user->save();
+		}
+
+		// Set the group data for any preloaded user objects.
+		$temp         = User::getInstance((int) $userId);
+		$temp->groups = $user->groups;
+
+		if (\JFactory::getSession()->getId())
+		{
+			// Set the group data for the user object in the session.
+			$temp = \JFactory::getUser();
+
+			if ($temp->id == $userId)
+			{
+				$temp->groups = $user->groups;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get a list of groups a user is in.
+	 *
+	 * @param   integer  $userId  The id of the user.
+	 *
+	 * @return  array    List of groups
+	 *
+	 * @since   11.1
+	 */
+	public static function getUserGroups($userId)
+	{
+		// Get the user object.
+		$user = User::getInstance((int) $userId);
+
+		return isset($user->groups) ? $user->groups : array();
+	}
+
+	/**
+	 * Method to remove a user from a group.
+	 *
+	 * @param   integer  $userId   The id of the user.
+	 * @param   integer  $groupId  The id of the group.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function removeUserFromGroup($userId, $groupId)
+	{
+		// Get the user object.
+		$user = User::getInstance((int) $userId);
+
+		// Remove the user from the group if necessary.
+		$key = array_search($groupId, $user->groups);
+
+		if ($key !== false)
+		{
+			// Remove the user from the group.
+			unset($user->groups[$key]);
+
+			// Store the user object.
+			$user->save();
+		}
+
+		// Set the group data for any preloaded user objects.
+		$temp = \JFactory::getUser((int) $userId);
+		$temp->groups = $user->groups;
+
+		// Set the group data for the user object in the session.
+		$temp = \JFactory::getUser();
+
+		if ($temp->id == $userId)
+		{
+			$temp->groups = $user->groups;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to set the groups for a user.
+	 *
+	 * @param   integer  $userId  The id of the user.
+	 * @param   array    $groups  An array of group ids to put the user in.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function setUserGroups($userId, $groups)
+	{
+		// Get the user object.
+		$user = User::getInstance((int) $userId);
+
+		// Set the group ids.
+		$groups = ArrayHelper::toInteger($groups);
+		$user->groups = $groups;
+
+		// Get the titles for the user groups.
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id') . ', ' . $db->quoteName('title'))
+			->from($db->quoteName('#__usergroups'))
+			->where($db->quoteName('id') . ' = ' . implode(' OR ' . $db->quoteName('id') . ' = ', $user->groups));
+		$db->setQuery($query);
+		$results = $db->loadObjectList();
+
+		// Set the titles for the user groups.
+		for ($i = 0, $n = count($results); $i < $n; $i++)
+		{
+			$user->groups[$results[$i]->id] = $results[$i]->id;
+		}
+
+		// Store the user object.
+		$user->save();
+
+		if (session_id())
+		{
+			// Set the group data for any preloaded user objects.
+			$temp = \JFactory::getUser((int) $userId);
+			$temp->groups = $user->groups;
+
+			// Set the group data for the user object in the session.
+			$temp = \JFactory::getUser();
+
+			if ($temp->id == $userId)
+			{
+				$temp->groups = $user->groups;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the user profile information
+	 *
+	 * @param   integer  $userId  The id of the user.
+	 *
+	 * @return  object
+	 *
+	 * @since   11.1
+	 */
+	public static function getProfile($userId = 0)
+	{
+		if ($userId == 0)
+		{
+			$user   = \JFactory::getUser();
+			$userId = $user->id;
+		}
+
+		// Get the dispatcher and load the user's plugins.
+		$dispatcher = \JEventDispatcher::getInstance();
+		PluginHelper::importPlugin('user');
+
+		$data = new \JObject;
+		$data->id = $userId;
+
+		// Trigger the data preparation event.
+		$dispatcher->trigger('onContentPrepareData', array('com_users.profile', &$data));
+
+		return $data;
+	}
+
+	/**
+	 * Method to activate a user
+	 *
+	 * @param   string  $activation  Activation string
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   11.1
+	 */
+	public static function activateUser($activation)
+	{
+		$db = \JFactory::getDbo();
+
+		// Let's get the id of the user we want to activate
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('activation') . ' = ' . $db->quote($activation))
+			->where($db->quoteName('block') . ' = 1')
+			->where($db->quoteName('lastvisitDate') . ' = ' . $db->quote($db->getNullDate()));
+		$db->setQuery($query);
+		$id = (int) $db->loadResult();
+
+		// Is it a valid user to activate?
+		if ($id)
+		{
+			$user = User::getInstance((int) $id);
+
+			$user->set('block', '0');
+			$user->set('activation', '');
+
+			// Time to take care of business.... store the user.
+			if (!$user->save())
+			{
+				\JLog::add($user->getError(), \JLog::WARNING, 'jerror');
+
+				return false;
+			}
+		}
+		else
+		{
+			\JLog::add(\JText::_('JLIB_USER_ERROR_UNABLE_TO_FIND_USER'), \JLog::WARNING, 'jerror');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns userid if a user exists
+	 *
+	 * @param   string  $username  The username to search on.
+	 *
+	 * @return  integer  The user id or 0 if not found.
+	 *
+	 * @since   11.1
+	 */
+	public static function getUserId($username)
+	{
+		// Initialise some variables
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('username') . ' = ' . $db->quote($username));
+		$db->setQuery($query, 0, 1);
+
+		return $db->loadResult();
+	}
+
+	/**
+	 * Hashes a password using the current encryption.
+	 *
+	 * @param   string  $password  The plaintext password to encrypt.
+	 *
+	 * @return  string  The encrypted password.
+	 *
+	 * @since   3.2.1
+	 */
+	public static function hashPassword($password)
+	{
+		// \JCrypt::hasStrongPasswordSupport() includes a fallback for us in the worst case
+		\JCrypt::hasStrongPasswordSupport();
+
+		return password_hash($password, PASSWORD_BCRYPT);
+	}
+
+	/**
+	 * Formats a password using the current encryption. If the user ID is given
+	 * and the hash does not fit the current hashing algorithm, it automatically
+	 * updates the hash.
+	 *
+	 * @param   string   $password  The plaintext password to check.
+	 * @param   string   $hash      The hash to verify against.
+	 * @param   integer  $user_id   ID of the user if the password hash should be updated
+	 *
+	 * @return  boolean  True if the password and hash match, false otherwise
+	 *
+	 * @since   3.2.1
+	 */
+	public static function verifyPassword($password, $hash, $user_id = 0)
+	{
+		// If we are using phpass
+		if (strpos($hash, '$P$') === 0)
+		{
+			// Use PHPass's portable hashes with a cost of 10.
+			$phpass = new \PasswordHash(10, true);
+
+			$match = $phpass->CheckPassword($password, $hash);
+
+			$rehash = true;
+		}
+		// Check for Argon2i hashes
+		elseif (strpos($hash, '$argon2i') === 0)
+		{
+			// This implementation is not supported through any existing polyfills
+			$match = password_verify($password, $hash);
+
+			$rehash = password_needs_rehash($hash, PASSWORD_ARGON2I);
+		}
+		// Check for bcrypt hashes
+		elseif (strpos($hash, '$2') === 0)
+		{
+			// \JCrypt::hasStrongPasswordSupport() includes a fallback for us in the worst case
+			\JCrypt::hasStrongPasswordSupport();
+			$match = password_verify($password, $hash);
+
+			$rehash = password_needs_rehash($hash, PASSWORD_BCRYPT);
+		}
+		elseif (substr($hash, 0, 8) == '{SHA256}')
+		{
+			// Check the password
+			$parts     = explode(':', $hash);
+			$salt      = @$parts[1];
+			$testcrypt = static::getCryptedPassword($password, $salt, 'sha256', true);
+
+			$match = \JCrypt::timingSafeCompare($hash, $testcrypt);
+
+			$rehash = true;
+		}
+		else
+		{
+			// Check the password
+			$parts = explode(':', $hash);
+			$salt  = @$parts[1];
+
+			$rehash = true;
+
+			// Compile the hash to compare
+			// If the salt is empty AND there is a ':' in the original hash, we must append ':' at the end
+			$testcrypt = md5($password . $salt) . ($salt ? ':' . $salt : (strpos($hash, ':') !== false ? ':' : ''));
+
+			$match = \JCrypt::timingSafeCompare($hash, $testcrypt);
+		}
+
+		// If we have a match and rehash = true, rehash the password with the current algorithm.
+		if ((int) $user_id > 0 && $match && $rehash)
+		{
+			$user = new User($user_id);
+			$user->password = static::hashPassword($password);
+			$user->save();
+		}
+
+		return $match;
+	}
+
+	/**
+	 * Formats a password using the old encryption methods.
+	 *
+	 * @param   string   $plaintext     The plaintext password to encrypt.
+	 * @param   string   $salt          The salt to use to encrypt the password. []
+	 *                                  If not present, a new salt will be
+	 *                                  generated.
+	 * @param   string   $encryption    The kind of password encryption to use.
+	 *                                  Defaults to md5-hex.
+	 * @param   boolean  $show_encrypt  Some password systems prepend the kind of
+	 *                                  encryption to the crypted password ({SHA},
+	 *                                  etc). Defaults to false.
+	 *
+	 * @return  string  The encrypted password.
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0
+	 */
+	public static function getCryptedPassword($plaintext, $salt = '', $encryption = 'md5-hex', $show_encrypt = false)
+	{
+		// Get the salt to use.
+		$salt = static::getSalt($encryption, $salt, $plaintext);
+
+		// Encrypt the password.
+		switch ($encryption)
+		{
+			case 'plain':
+				return $plaintext;
+
+			case 'sha':
+				$encrypted = base64_encode(mhash(MHASH_SHA1, $plaintext));
+
+				return ($show_encrypt) ? '{SHA}' . $encrypted : $encrypted;
+
+			case 'crypt':
+			case 'crypt-des':
+			case 'crypt-md5':
+			case 'crypt-blowfish':
+				return ($show_encrypt ? '{crypt}' : '') . crypt($plaintext, $salt);
+
+			case 'md5-base64':
+				$encrypted = base64_encode(mhash(MHASH_MD5, $plaintext));
+
+				return ($show_encrypt) ? '{MD5}' . $encrypted : $encrypted;
+
+			case 'ssha':
+				$encrypted = base64_encode(mhash(MHASH_SHA1, $plaintext . $salt) . $salt);
+
+				return ($show_encrypt) ? '{SSHA}' . $encrypted : $encrypted;
+
+			case 'smd5':
+				$encrypted = base64_encode(mhash(MHASH_MD5, $plaintext . $salt) . $salt);
+
+				return ($show_encrypt) ? '{SMD5}' . $encrypted : $encrypted;
+
+			case 'aprmd5':
+				$length = strlen($plaintext);
+				$context = $plaintext . '$apr1$' . $salt;
+				$binary = static::_bin(md5($plaintext . $salt . $plaintext));
+
+				for ($i = $length; $i > 0; $i -= 16)
+				{
+					$context .= substr($binary, 0, ($i > 16 ? 16 : $i));
+				}
+
+				for ($i = $length; $i > 0; $i >>= 1)
+				{
+					$context .= ($i & 1) ? chr(0) : $plaintext[0];
+				}
+
+				$binary = static::_bin(md5($context));
+
+				for ($i = 0; $i < 1000; $i++)
+				{
+					$new = ($i & 1) ? $plaintext : substr($binary, 0, 16);
+
+					if ($i % 3)
+					{
+						$new .= $salt;
+					}
+
+					if ($i % 7)
+					{
+						$new .= $plaintext;
+					}
+
+					$new .= ($i & 1) ? substr($binary, 0, 16) : $plaintext;
+					$binary = static::_bin(md5($new));
+				}
+
+				$p = array();
+
+				for ($i = 0; $i < 5; $i++)
+				{
+					$k = $i + 6;
+					$j = $i + 12;
+
+					if ($j == 16)
+					{
+						$j = 5;
+					}
+
+					$p[] = static::_toAPRMD5((ord($binary[$i]) << 16) | (ord($binary[$k]) << 8) | (ord($binary[$j])), 5);
+				}
+
+				return '$apr1$' . $salt . '$' . implode('', $p) . static::_toAPRMD5(ord($binary[11]), 3);
+
+			case 'sha256':
+				$encrypted = ($salt) ? hash('sha256', $plaintext . $salt) . ':' . $salt : hash('sha256', $plaintext);
+
+				return ($show_encrypt) ? '{SHA256}' . $encrypted : '{SHA256}' . $encrypted;
+
+			case 'md5-hex':
+			default:
+				$encrypted = ($salt) ? md5($plaintext . $salt) : md5($plaintext);
+
+				return ($show_encrypt) ? '{MD5}' . $encrypted : $encrypted;
+		}
+	}
+
+	/**
+	 * Returns a salt for the appropriate kind of password encryption using the old encryption methods.
+	 * Optionally takes a seed and a plaintext password, to extract the seed
+	 * of an existing password, or for encryption types that use the plaintext
+	 * in the generation of the salt.
+	 *
+	 * @param   string  $encryption  The kind of password encryption to use.
+	 *                               Defaults to md5-hex.
+	 * @param   string  $seed        The seed to get the salt from (probably a
+	 *                               previously generated password). Defaults to
+	 *                               generating a new seed.
+	 * @param   string  $plaintext   The plaintext password that we're generating
+	 *                               a salt for. Defaults to none.
+	 *
+	 * @return  string  The generated or extracted salt.
+	 *
+	 * @since   11.1
+	 * @deprecated  4.0
+	 */
+	public static function getSalt($encryption = 'md5-hex', $seed = '', $plaintext = '')
+	{
+		// Encrypt the password.
+		switch ($encryption)
+		{
+			case 'crypt':
+			case 'crypt-des':
+				if ($seed)
+				{
+					return substr(preg_replace('|^{crypt}|i', '', $seed), 0, 2);
+				}
+				else
+				{
+					return substr(md5(mt_rand()), 0, 2);
+				}
+				break;
+
+			case 'sha256':
+				if ($seed)
+				{
+					return preg_replace('|^{sha256}|i', '', $seed);
+				}
+				else
+				{
+					return static::genRandomPassword(16);
+				}
+				break;
+
+			case 'crypt-md5':
+				if ($seed)
+				{
+					return substr(preg_replace('|^{crypt}|i', '', $seed), 0, 12);
+				}
+				else
+				{
+					return '$1$' . substr(md5(\JCrypt::genRandomBytes()), 0, 8) . '$';
+				}
+				break;
+
+			case 'crypt-blowfish':
+				if ($seed)
+				{
+					return substr(preg_replace('|^{crypt}|i', '', $seed), 0, 30);
+				}
+				else
+				{
+					return '$2y$10$' . substr(md5(\JCrypt::genRandomBytes()), 0, 22) . '$';
+				}
+				break;
+
+			case 'ssha':
+				if ($seed)
+				{
+					return substr(preg_replace('|^{SSHA}|', '', $seed), -20);
+				}
+				else
+				{
+					return mhash_keygen_s2k(MHASH_SHA1, $plaintext, substr(pack('h*', md5(\JCrypt::genRandomBytes())), 0, 8), 4);
+				}
+				break;
+
+			case 'smd5':
+				if ($seed)
+				{
+					return substr(preg_replace('|^{SMD5}|', '', $seed), -16);
+				}
+				else
+				{
+					return mhash_keygen_s2k(MHASH_MD5, $plaintext, substr(pack('h*', md5(\JCrypt::genRandomBytes())), 0, 8), 4);
+				}
+				break;
+
+			case 'aprmd5': // 64 characters that are valid for APRMD5 passwords.
+				$APRMD5 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+				if ($seed)
+				{
+					return substr(preg_replace('/^\$apr1\$(.{8}).*/', '\\1', $seed), 0, 8);
+				}
+				else
+				{
+					$salt = '';
+
+					for ($i = 0; $i < 8; $i++)
+					{
+						$salt .= $APRMD5{mt_rand(0, 63)};
+					}
+
+					return $salt;
+				}
+				break;
+
+			default:
+				$salt = '';
+
+				if ($seed)
+				{
+					$salt = $seed;
+				}
+
+				return $salt;
+				break;
+		}
+	}
+
+	/**
+	 * Generate a random password
+	 *
+	 * @param   integer  $length  Length of the password to generate
+	 *
+	 * @return  string  Random Password
+	 *
+	 * @since   11.1
+	 */
+	public static function genRandomPassword($length = 8)
+	{
+		$salt = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$base = strlen($salt);
+		$makepass = '';
+
+		/*
+		 * Start with a cryptographic strength random string, then convert it to
+		 * a string with the numeric base of the salt.
+		 * Shift the base conversion on each character so the character
+		 * distribution is even, and randomize the start shift so it's not
+		 * predictable.
+		 */
+		$random = \JCrypt::genRandomBytes($length + 1);
+		$shift = ord($random[0]);
+
+		for ($i = 1; $i <= $length; ++$i)
+		{
+			$makepass .= $salt[($shift + ord($random[$i])) % $base];
+			$shift += ord($random[$i]);
+		}
+
+		return $makepass;
+	}
+
+	/**
+	 * Converts to allowed 64 characters for APRMD5 passwords.
+	 *
+	 * @param   string   $value  The value to convert.
+	 * @param   integer  $count  The number of characters to convert.
+	 *
+	 * @return  string  $value converted to the 64 MD5 characters.
+	 *
+	 * @since   11.1
+	 */
+	protected static function _toAPRMD5($value, $count)
+	{
+		// 64 characters that are valid for APRMD5 passwords.
+		$APRMD5 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+		$aprmd5 = '';
+		$count = abs($count);
+
+		while (--$count)
+		{
+			$aprmd5 .= $APRMD5[$value & 0x3f];
+			$value >>= 6;
+		}
+
+		return $aprmd5;
+	}
+
+	/**
+	 * Converts hexadecimal string to binary data.
+	 *
+	 * @param   string  $hex  Hex data.
+	 *
+	 * @return  string  Binary data.
+	 *
+	 * @since   11.1
+	 */
+	private static function _bin($hex)
+	{
+		$bin = '';
+		$length = strlen($hex);
+
+		for ($i = 0; $i < $length; $i += 2)
+		{
+			$tmp = sscanf(substr($hex, $i, 2), '%x');
+			$bin .= chr(array_shift($tmp));
+		}
+
+		return $bin;
+	}
+
+	/**
+	 * Method to remove a cookie record from the database and the browser
+	 *
+	 * @param   string  $userId      User ID for this user
+	 * @param   string  $cookieName  Series id (cookie name decoded)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  This is handled in the authentication plugin itself. The 'invalid' column in the db should be removed as well
+	 */
+	public static function invalidateCookie($userId, $cookieName)
+	{
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Invalidate cookie in the database
+		$query
+			->update($db->quoteName('#__user_keys'))
+			->set($db->quoteName('invalid') . ' = 1')
+			->where($db->quotename('user_id') . ' = ' . $db->quote($userId));
+
+		$db->setQuery($query)->execute();
+
+		// Destroy the cookie in the browser.
+		$app = \JFactory::getApplication();
+		$app->input->cookie->set($cookieName, '', 1, $app->get('cookie_path', '/'), $app->get('cookie_domain', ''));
+
+		return true;
+	}
+
+	/**
+	 * Clear all expired tokens for all users.
+	 *
+	 * @return  mixed  Database query result
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  This is handled in the authentication plugin itself
+	 */
+	public static function clearExpiredTokens()
+	{
+		$now = time();
+
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->delete('#__user_keys')
+			->where($db->quoteName('time') . ' < ' . $db->quote($now));
+
+		return $db->setQuery($query)->execute();
+	}
+
+	/**
+	 * Method to get the remember me cookie data
+	 *
+	 * @return  mixed  An array of information from an authentication cookie or false if there is no cookie
+	 *
+	 * @since   3.2
+	 * @deprecated  4.0  This is handled in the authentication plugin itself
+	 */
+	public static function getRememberCookieData()
+	{
+		// Create the cookie name
+		$cookieName = static::getShortHashedUserAgent();
+
+		// Fetch the cookie value
+		$app = \JFactory::getApplication();
+		$cookieValue = $app->input->cookie->get($cookieName);
+
+		if (!empty($cookieValue))
+		{
+			return explode('.', $cookieValue);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Method to get a hashed user agent string that does not include browser version.
+	 * Used when frequent version changes cause problems.
+	 *
+	 * @return  string  A hashed user agent string with version replaced by 'abcd'
+	 *
+	 * @since   3.2
+	 */
+	public static function getShortHashedUserAgent()
+	{
+		$ua = \JFactory::getApplication()->client;
+		$uaString = $ua->userAgent;
+		$browserVersion = $ua->browserVersion;
+		$uaShort = str_replace($browserVersion, 'abcd', $uaString);
+
+		return md5(\JUri::base() . $uaShort);
+	}
+
+	/**
+	 * Check if there is a super user in the user ids.
+	 *
+	 * @param   array  $userIds  An array of user IDs on which to operate
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @since   3.6.5
+	 */
+	public static function checkSuperUserInUsers(array $userIds)
+	{
+		foreach ($userIds as $userId)
+		{
+			foreach (static::getUserGroups($userId) as $userGroupId)
+			{
+				if (Access::checkGroup($userGroupId, 'core.admin'))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/src/User/UserWrapper.php b/core/libraries/src/User/UserWrapper.php
new file mode 100644
index 00000000..de880407
--- /dev/null
+++ b/core/libraries/src/User/UserWrapper.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\User;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Wrapper class for UserHelper
+ *
+ * @since       3.4
+ * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+ */
+class UserWrapper
+{
+	/**
+	 * Helper wrapper method for addUserToGroup
+	 *
+	 * @param   integer  $userId   The id of the user.
+	 * @param   integer  $groupId  The id of the group.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     UserHelper::addUserToGroup()
+	 * @since   3.4
+	 * @throws  \RuntimeException
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function addUserToGroup($userId, $groupId)
+	{
+		return UserHelper::addUserToGroup($userId, $groupId);
+	}
+
+	/**
+	 * Helper wrapper method for getUserGroups
+	 *
+	 * @param   integer  $userId  The id of the user.
+	 *
+	 * @return  array    List of groups
+	 *
+	 * @see     UserHelper::addUserToGroup()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function getUserGroups($userId)
+	{
+		return UserHelper::getUserGroups($userId);
+	}
+
+	/**
+	 * Helper wrapper method for removeUserFromGroup
+	 *
+	 * @param   integer  $userId   The id of the user.
+	 * @param   integer  $groupId  The id of the group.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     UserHelper::removeUserFromGroup()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function removeUserFromGroup($userId, $groupId)
+	{
+		return UserHelper::removeUserFromGroup($userId, $groupId);
+	}
+
+	/**
+	 * Helper wrapper method for setUserGroups
+	 *
+	 * @param   integer  $userId  The id of the user.
+	 * @param   array    $groups  An array of group ids to put the user in.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     UserHelper::setUserGroups()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function setUserGroups($userId, $groups)
+	{
+		return UserHelper::setUserGroups($userId, $groups);
+	}
+
+	/**
+	 * Helper wrapper method for getProfile
+	 *
+	 * @param   integer  $userId  The id of the user.
+	 *
+	 * @return  object
+	 *
+	 * @see     UserHelper::getProfile()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function getProfile($userId = 0)
+	{
+		return UserHelper::getProfile($userId);
+	}
+
+	/**
+	 * Helper wrapper method for activateUser
+	 *
+	 * @param   string  $activation  Activation string
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     UserHelper::activateUser()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function activateUser($activation)
+	{
+		return UserHelper::activateUser($activation);
+	}
+
+	/**
+	 * Helper wrapper method for getUserId
+	 *
+	 * @param   string  $username  The username to search on.
+	 *
+	 * @return  integer  The user id or 0 if not found.
+	 *
+	 * @see     UserHelper::getUserId()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function getUserId($username)
+	{
+		return UserHelper::getUserId($username);
+	}
+
+	/**
+	 * Helper wrapper method for hashPassword
+	 *
+	 * @param   string  $password  The plaintext password to encrypt.
+	 *
+	 * @return  string  The encrypted password.
+	 *
+	 * @see     UserHelper::hashPassword()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function hashPassword($password)
+	{
+		return UserHelper::hashPassword($password);
+	}
+
+	/**
+	 * Helper wrapper method for verifyPassword
+	 *
+	 * @param   string   $password  The plaintext password to check.
+	 * @param   string   $hash      The hash to verify against.
+	 * @param   integer  $user_id   ID of the user if the password hash should be updated
+	 *
+	 * @return  boolean  True if the password and hash match, false otherwise
+	 *
+	 * @see     UserHelper::verifyPassword()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function verifyPassword($password, $hash, $user_id = 0)
+	{
+		return UserHelper::verifyPassword($password, $hash, $user_id);
+	}
+
+	/**
+	 * Helper wrapper method for getCryptedPassword
+	 *
+	 * @param   string   $plaintext     The plaintext password to encrypt.
+	 * @param   string   $salt          The salt to use to encrypt the password. []
+	 *                                  If not present, a new salt will be
+	 *                                  generated.
+	 * @param   string   $encryption    The kind of password encryption to use.
+	 *                                  Defaults to md5-hex.
+	 * @param   boolean  $show_encrypt  Some password systems prepend the kind of
+	 *                                  encryption to the crypted password ({SHA},
+	 *                                  etc). Defaults to false.
+	 *
+	 * @return  string  The encrypted password.
+	 *
+	 * @see     UserHelper::getCryptedPassword()
+	 * @since   3.4
+	 * @deprecated  4.0
+	 */
+	public function getCryptedPassword($plaintext, $salt = '', $encryption = 'md5-hex', $show_encrypt = false)
+	{
+		return UserHelper::getCryptedPassword($plaintext, $salt, $encryption, $show_encrypt);
+	}
+
+	/**
+	 * Helper wrapper method for getSalt
+	 *
+	 * @param   string  $encryption  The kind of password encryption to use.
+	 *                               Defaults to md5-hex.
+	 * @param   string  $seed        The seed to get the salt from (probably a
+	 *                               previously generated password). Defaults to
+	 *                               generating a new seed.
+	 * @param   string  $plaintext   The plaintext password that we're generating
+	 *                               a salt for. Defaults to none.
+	 *
+	 * @return  string  The generated or extracted salt.
+	 *
+	 * @see     UserHelper::getSalt()
+	 * @since   3.4
+	 * @deprecated  4.0
+	 */
+	public function getSalt($encryption = 'md5-hex', $seed = '', $plaintext = '')
+	{
+		return UserHelper::getSalt($encryption, $seed, $plaintext);
+	}
+
+	/**
+	 * Helper wrapper method for genRandomPassword
+	 *
+	 * @param   integer  $length  Length of the password to generate
+	 *
+	 * @return  string  Random Password
+	 *
+	 * @see     UserHelper::genRandomPassword()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function genRandomPassword($length = 8)
+	{
+		return UserHelper::genRandomPassword($length);
+	}
+
+	/**
+	 * Helper wrapper method for invalidateCookie
+	 *
+	 * @param   string  $userId      User ID for this user
+	 * @param   string  $cookieName  Series id (cookie name decoded)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     UserHelper::invalidateCookie()
+	 * @since   3.4
+	 * @deprecated  4.0
+	 */
+	public function invalidateCookie($userId, $cookieName)
+	{
+		return UserHelper::invalidateCookie($userId, $cookieName);
+	}
+
+	/**
+	 * Helper wrapper method for clearExpiredTokens
+	 *
+	 * @return  mixed  Database query result
+	 *
+	 * @see     UserHelper::clearExpiredTokens()
+	 * @since   3.4
+	 * @deprecated  4.0
+	 */
+	public function clearExpiredTokens()
+	{
+		return UserHelper::clearExpiredTokens();
+	}
+
+	/**
+	 * Helper wrapper method for getRememberCookieData
+	 *
+	 * @return  mixed  An array of information from an authentication cookie or false if there is no cookie
+	 *
+	 * @see     UserHelper::getRememberCookieData()
+	 * @since   3.4
+	 * @deprecated  4.0
+	 */
+	public function getRememberCookieData()
+	{
+		return UserHelper::getRememberCookieData();
+	}
+
+	/**
+	 * Helper wrapper method for getShortHashedUserAgent
+	 *
+	 * @return  string  A hashed user agent string with version replaced by 'abcd'
+	 *
+	 * @see     UserHelper::getShortHashedUserAgent()
+	 * @since   3.4
+	 * @deprecated  4.0  Use `Joomla\CMS\User\UserHelper` directly
+	 */
+	public function getShortHashedUserAgent()
+	{
+		return UserHelper::getShortHashedUserAgent();
+	}
+}
diff --git a/core/libraries/src/Utility/BufferStreamHandler.php b/core/libraries/src/Utility/BufferStreamHandler.php
new file mode 100644
index 00000000..494aff3a
--- /dev/null
+++ b/core/libraries/src/Utility/BufferStreamHandler.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Utility;
+
+defined('JPATH_PLATFORM') or die;
+
+// Workaround for B/C. Will be removed with 4.0
+BufferStreamHandler::stream_register();
+
+/**
+ * Generic Buffer stream handler
+ *
+ * This class provides a generic buffer stream.  It can be used to store/retrieve/manipulate
+ * string buffers with the standard PHP filesystem I/O methods.
+ *
+ * @since  11.1
+ */
+class BufferStreamHandler
+{
+	/**
+	 * Stream position
+	 *
+	 * @var    integer
+	 * @since  11.1
+	 */
+	public $position = 0;
+
+	/**
+	 * Buffer name
+	 *
+	 * @var    string
+	 * @since  11.1
+	 */
+	public $name = null;
+
+	/**
+	 * Buffer hash
+	 *
+	 * @var    array
+	 * @since  12.1
+	 */
+	public $buffers = array();
+
+	/**
+	 * Status of registering the wrapper
+	 *
+	 * @var    boolean
+	 * @since  3.8.2
+	 */
+	static private $registered = false;
+
+	/**
+	 * Function to register the stream wrapper
+	 *
+	 * @return  void
+	 *
+	 * @since  3.8.2
+	 */
+	public static function stream_register()
+	{
+		if (!self::$registered)
+		{
+			stream_wrapper_register('buffer', '\\Joomla\\CMS\\Utility\\BufferStreamHandler');
+
+			self::$registered = true;
+		}
+
+		return;
+	}
+
+	/**
+	 * Function to open file or url
+	 *
+	 * @param   string   $path          The URL that was passed
+	 * @param   string   $mode          Mode used to open the file @see fopen
+	 * @param   integer  $options       Flags used by the API, may be STREAM_USE_PATH and
+	 *                                  STREAM_REPORT_ERRORS
+	 * @param   string   &$opened_path  Full path of the resource. Used with STREAN_USE_PATH option
+	 *
+	 * @return  boolean
+	 *
+	 * @since   11.1
+	 * @see     streamWrapper::stream_open
+	 */
+	public function stream_open($path, $mode, $options, &$opened_path)
+	{
+		$url = parse_url($path);
+		$this->name = $url['host'];
+		$this->buffers[$this->name] = null;
+		$this->position = 0;
+
+		return true;
+	}
+
+	/**
+	 * Read stream
+	 *
+	 * @param   integer  $count  How many bytes of data from the current position should be returned.
+	 *
+	 * @return  mixed    The data from the stream up to the specified number of bytes (all data if
+	 *                   the total number of bytes in the stream is less than $count. Null if
+	 *                   the stream is empty.
+	 *
+	 * @see     streamWrapper::stream_read
+	 * @since   11.1
+	 */
+	public function stream_read($count)
+	{
+		$ret = substr($this->buffers[$this->name], $this->position, $count);
+		$this->position += strlen($ret);
+
+		return $ret;
+	}
+
+	/**
+	 * Write stream
+	 *
+	 * @param   string  $data  The data to write to the stream.
+	 *
+	 * @return  integer
+	 *
+	 * @see     streamWrapper::stream_write
+	 * @since   11.1
+	 */
+	public function stream_write($data)
+	{
+		$left = substr($this->buffers[$this->name], 0, $this->position);
+		$right = substr($this->buffers[$this->name], $this->position + strlen($data));
+		$this->buffers[$this->name] = $left . $data . $right;
+		$this->position += strlen($data);
+
+		return strlen($data);
+	}
+
+	/**
+	 * Function to get the current position of the stream
+	 *
+	 * @return  integer
+	 *
+	 * @see     streamWrapper::stream_tell
+	 * @since   11.1
+	 */
+	public function stream_tell()
+	{
+		return $this->position;
+	}
+
+	/**
+	 * Function to test for end of file pointer
+	 *
+	 * @return  boolean  True if the pointer is at the end of the stream
+	 *
+	 * @see     streamWrapper::stream_eof
+	 * @since   11.1
+	 */
+	public function stream_eof()
+	{
+		return $this->position >= strlen($this->buffers[$this->name]);
+	}
+
+	/**
+	 * The read write position updates in response to $offset and $whence
+	 *
+	 * @param   integer  $offset  The offset in bytes
+	 * @param   integer  $whence  Position the offset is added to
+	 *                            Options are SEEK_SET, SEEK_CUR, and SEEK_END
+	 *
+	 * @return  boolean  True if updated
+	 *
+	 * @see     streamWrapper::stream_seek
+	 * @since   11.1
+	 */
+	public function stream_seek($offset, $whence)
+	{
+		switch ($whence)
+		{
+			case SEEK_SET :
+				return $this->seek_set($offset);
+
+			case SEEK_CUR :
+
+				return $this->seek_cur($offset);
+
+			case SEEK_END :
+
+				return $this->seek_end($offset);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set the position to the offset
+	 *
+	 * @param   integer  $offset  The offset in bytes
+	 *
+	 * @return  boolean
+	 */
+	protected function seek_set($offset)
+	{
+		if ($offset < 0 || $offset > strlen($this->buffers[$this->name]))
+		{
+			return false;
+		}
+
+		$this->position = $offset;
+
+		return true;
+	}
+
+	/**
+	 * Adds the offset to current position
+	 *
+	 * @param   integer  $offset  The offset in bytes
+	 *
+	 * @return  boolean
+	 */
+	protected function seek_cur($offset)
+	{
+		if ($offset < 0)
+		{
+			return false;
+		}
+
+		$this->position += $offset;
+
+		return true;
+	}
+
+	/**
+	 * Sets the position to the end of the current buffer + offset
+	 *
+	 * @param   integer  $offset  The offset in bytes
+	 *
+	 * @return  boolean
+	 */
+	protected function seek_end($offset)
+	{
+		$offset += strlen($this->buffers[$this->name]);
+
+		if ($offset < 0)
+		{
+			return false;
+		}
+
+		$this->position = $offset;
+
+		return true;
+	}
+}
diff --git a/core/libraries/src/Utility/Utility.php b/core/libraries/src/Utility/Utility.php
new file mode 100644
index 00000000..9e4cacc5
--- /dev/null
+++ b/core/libraries/src/Utility/Utility.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Utility;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * JUtility is a utility functions class
+ *
+ * @since  11.1
+ */
+class Utility
+{
+	/**
+	 * Method to extract key/value pairs out of a string with XML style attributes
+	 *
+	 * @param   string  $string  String containing XML style attributes
+	 *
+	 * @return  array  Key/Value pairs for the attributes
+	 *
+	 * @since   11.1
+	 */
+	public static function parseAttributes($string)
+	{
+		$attr = array();
+		$retarray = array();
+
+		// Let's grab all the key/value pairs using a regular expression
+		preg_match_all('/([\w:-]+)[\s]?=[\s]?"([^"]*)"/i', $string, $attr);
+
+		if (is_array($attr))
+		{
+			$numPairs = count($attr[1]);
+
+			for ($i = 0; $i < $numPairs; $i++)
+			{
+				$retarray[$attr[1][$i]] = $attr[2][$i];
+			}
+		}
+
+		return $retarray;
+	}
+
+	/**
+	 * Method to get the maximum allowed file size for the HTTP uploads based on the active PHP configuration
+	 *
+	 * @param   mixed  $custom  A custom upper limit, if the PHP settings are all above this then this will be used
+	 *
+	 * @return  integer  Size in number of bytes
+	 *
+	 * @since   3.7.0
+	 */
+	public static function getMaxUploadSize($custom = null)
+	{
+		if ($custom)
+		{
+			$custom = \JHtml::_('number.bytes', $custom, '');
+
+			if ($custom > 0)
+			{
+				$sizes[] = $custom;
+			}
+		}
+
+		/*
+		 * Read INI settings which affects upload size limits
+		 * and Convert each into number of bytes so that we can compare
+		 */
+		$sizes[] = \JHtml::_('number.bytes', ini_get('post_max_size'), '');
+		$sizes[] = \JHtml::_('number.bytes', ini_get('upload_max_filesize'), '');
+
+		// The minimum of these is the limiting factor
+		return min($sizes);
+	}
+}
diff --git a/core/libraries/src/Version.php b/core/libraries/src/Version.php
new file mode 100644
index 00000000..9cd78c01
--- /dev/null
+++ b/core/libraries/src/Version.php
@@ -0,0 +1,377 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Helper\LibraryHelper;
+
+/**
+ * Version information class for the Joomla CMS.
+ *
+ * @since  1.0
+ */
+final class Version
+{
+	/**
+	 * Product name.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const PRODUCT = 'Joomla!';
+
+	/**
+	 * Major release version.
+	 *
+	 * @var    integer
+	 * @since  3.8.0
+	 */
+	const MAJOR_VERSION = 3;
+
+	/**
+	 * Minor release version.
+	 *
+	 * @var    integer
+	 * @since  3.8.0
+	 */
+	const MINOR_VERSION = 8;
+
+	/**
+	 * Patch release version.
+	 *
+	 * @var    integer
+	 * @since  3.8.0
+	 */
+	const PATCH_VERSION = 11;
+
+	/**
+	 * Extra release version info.
+	 *
+	 * This constant when not empty adds an additional identifier to the version string to reflect the development state.
+	 * For example, for 3.8.0 when this is set to 'dev' the version string will be `3.8.0-dev`.
+	 *
+	 * @var    string
+	 * @since  3.8.0
+	 */
+	const EXTRA_VERSION = '';
+
+	/**
+	 * Release version.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 * @deprecated  4.0  Use separated version constants instead
+	 */
+	const RELEASE = '3.8';
+
+	/**
+	 * Maintenance version.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 * @deprecated  4.0  Use separated version constants instead
+	 */
+	const DEV_LEVEL = '11';
+
+	/**
+	 * Development status.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const DEV_STATUS = 'Stable';
+
+	/**
+	 * Build number.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 * @deprecated  4.0
+	 */
+	const BUILD = '';
+
+	/**
+	 * Code name.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const CODENAME = 'Amani';
+
+	/**
+	 * Release date.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const RELDATE = '31-July-2018';
+
+	/**
+	 * Release time.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const RELTIME = '14:00';
+
+	/**
+	 * Release timezone.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const RELTZ = 'GMT';
+
+	/**
+	 * Copyright Notice.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const COPYRIGHT = 'Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.';
+
+	/**
+	 * Link text.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	const URL = '<a href="https://www.joomla.org">Joomla!</a> is Free Software released under the GNU General Public License.';
+
+	/**
+	 * Magic getter providing access to constants previously defined as class member vars.
+	 *
+	 * @param   string  $name  The name of the property.
+	 *
+	 * @return  mixed   A value if the property name is valid.
+	 *
+	 * @since   3.5
+	 * @deprecated  4.0  Access the constants directly
+	 */
+	public function __get($name)
+	{
+		if (defined("JVersion::$name"))
+		{
+			\JLog::add(
+				'Accessing Version data through class member variables is deprecated, use the corresponding constant instead.',
+				\JLog::WARNING,
+				'deprecated'
+			);
+
+			return constant("\\Joomla\\CMS\\Version::$name");
+		}
+
+		$trace = debug_backtrace();
+		trigger_error(
+			'Undefined constant via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'],
+			E_USER_NOTICE
+		);
+	}
+
+	/**
+	 * Check if we are in development mode
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.4.3
+	 */
+	public function isInDevelopmentState()
+	{
+		return strtolower(self::DEV_STATUS) !== 'stable';
+	}
+
+	/**
+	 * Compares two a "PHP standardized" version number against the current Joomla version.
+	 *
+	 * @param   string  $minimum  The minimum version of the Joomla which is compatible.
+	 *
+	 * @return  boolean True if the version is compatible.
+	 *
+	 * @link    https://secure.php.net/version_compare
+	 * @since   1.0
+	 */
+	public function isCompatible($minimum)
+	{
+		return version_compare(JVERSION, $minimum, 'ge');
+	}
+
+	/**
+	 * Method to get the help file version.
+	 *
+	 * @return  string  Version suffix for help files.
+	 *
+	 * @since   1.0
+	 */
+	public function getHelpVersion()
+	{
+		return '.' . self::MAJOR_VERSION . self::MINOR_VERSION;
+	}
+
+	/**
+	 * Gets a "PHP standardized" version string for the current Joomla.
+	 *
+	 * @return  string  Version string.
+	 *
+	 * @since   1.5
+	 */
+	public function getShortVersion()
+	{
+		$version = self::MAJOR_VERSION . '.' . self::MINOR_VERSION . '.' . self::PATCH_VERSION;
+
+		// Has to be assigned to a variable to support PHP 5.3 and 5.4
+		$extraVersion = self::EXTRA_VERSION;
+
+		if (!empty($extraVersion))
+		{
+			$version .= '-' . $extraVersion;
+		}
+
+		return $version;
+	}
+
+	/**
+	 * Gets a version string for the current Joomla with all release information.
+	 *
+	 * @return  string  Complete version string.
+	 *
+	 * @since   1.5
+	 */
+	public function getLongVersion()
+	{
+		return self::PRODUCT . ' ' . $this->getShortVersion() . ' '
+			. self::DEV_STATUS . ' [ ' . self::CODENAME . ' ] ' . self::RELDATE . ' '
+			. self::RELTIME . ' ' . self::RELTZ;
+	}
+
+	/**
+	 * Returns the user agent.
+	 *
+	 * @param   string  $component    Name of the component.
+	 * @param   bool    $mask         Mask as Mozilla/5.0 or not.
+	 * @param   bool    $add_version  Add version afterwards to component.
+	 *
+	 * @return  string  User Agent.
+	 *
+	 * @since   1.0
+	 */
+	public function getUserAgent($component = null, $mask = false, $add_version = true)
+	{
+		if ($component === null)
+		{
+			$component = 'Framework';
+		}
+
+		if ($add_version)
+		{
+			$component .= '/' . self::RELEASE;
+		}
+
+		// If masked pretend to look like Mozilla 5.0 but still identify ourselves.
+		if ($mask)
+		{
+			return 'Mozilla/5.0 ' . self::PRODUCT . '/' . self::RELEASE . '.' . self::DEV_LEVEL . ($component ? ' ' . $component : '');
+		}
+		else
+		{
+			return self::PRODUCT . '/' . self::RELEASE . '.' . self::DEV_LEVEL . ($component ? ' ' . $component : '');
+		}
+	}
+
+	/**
+	 * Generate a media version string for assets
+	 * Public to allow third party developers to use it
+	 *
+	 * @return  string
+	 *
+	 * @since   3.2
+	 */
+	public function generateMediaVersion()
+	{
+		$date = new \JDate;
+
+		return md5($this->getLongVersion() . \JFactory::getConfig()->get('secret') . $date->toSql());
+	}
+
+	/**
+	 * Gets a media version which is used to append to Joomla core media files.
+	 *
+	 * This media version is used to append to Joomla core media in order to trick browsers into
+	 * reloading the CSS and JavaScript, because they think the files are renewed.
+	 * The media version is renewed after Joomla core update, install, discover_install and uninstallation.
+	 *
+	 * @return  string  The media version.
+	 *
+	 * @since   3.2
+	 */
+	public function getMediaVersion()
+	{
+		// Load the media version and cache it for future use
+		static $mediaVersion = null;
+
+		if ($mediaVersion === null)
+		{
+			// Get the joomla library params
+			$params = LibraryHelper::getParams('joomla');
+
+			// Get the media version
+			$mediaVersion = $params->get('mediaversion', '');
+
+			// Refresh assets in debug mode or when the media version is not set
+			if (JDEBUG || empty($mediaVersion))
+			{
+				$mediaVersion = $this->generateMediaVersion();
+
+				$this->setMediaVersion($mediaVersion);
+			}
+		}
+
+		return $mediaVersion;
+	}
+
+	/**
+	 * Function to refresh the media version
+	 *
+	 * @return  Version  Instance of $this to allow chaining.
+	 *
+	 * @since   3.2
+	 */
+	public function refreshMediaVersion()
+	{
+		$newMediaVersion = $this->generateMediaVersion();
+
+		return $this->setMediaVersion($newMediaVersion);
+	}
+
+	/**
+	 * Sets the media version which is used to append to Joomla core media files.
+	 *
+	 * @param   string  $mediaVersion  The media version.
+	 *
+	 * @return  Version  Instance of $this to allow chaining.
+	 *
+	 * @since   3.2
+	 */
+	public function setMediaVersion($mediaVersion)
+	{
+		// Do not allow empty media versions
+		if (!empty($mediaVersion))
+		{
+			// Get library parameters
+			$params = LibraryHelper::getParams('joomla');
+
+			$params->set('mediaversion', $mediaVersion);
+
+			// Save modified params
+			LibraryHelper::saveParams('joomla', $params);
+		}
+
+		return $this;
+	}
+}
diff --git a/core/libraries/vendor/.htaccess b/core/libraries/vendor/.htaccess
new file mode 100644
index 00000000..9afb1a1b
--- /dev/null
+++ b/core/libraries/vendor/.htaccess
@@ -0,0 +1,9 @@
+# Apache 2.4+
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+
+# Apache 2.0-2.2
+<IfModule !mod_authz_core.c>
+  Deny from all
+</IfModule>
diff --git a/core/libraries/vendor/autoload.php b/core/libraries/vendor/autoload.php
new file mode 100644
index 00000000..01d05014
--- /dev/null
+++ b/core/libraries/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe::getLoader();
diff --git a/core/libraries/vendor/composer/ClassLoader.php b/core/libraries/vendor/composer/ClassLoader.php
new file mode 100644
index 00000000..dc02dfb1
--- /dev/null
+++ b/core/libraries/vendor/composer/ClassLoader.php
@@ -0,0 +1,445 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/core/libraries/vendor/composer/LICENSE b/core/libraries/vendor/composer/LICENSE
new file mode 100644
index 00000000..f27399a0
--- /dev/null
+++ b/core/libraries/vendor/composer/LICENSE
@@ -0,0 +1,21 @@
+
+Copyright (c) Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/core/libraries/vendor/composer/autoload_classmap.php b/core/libraries/vendor/composer/autoload_classmap.php
new file mode 100644
index 00000000..23fd5b4d
--- /dev/null
+++ b/core/libraries/vendor/composer/autoload_classmap.php
@@ -0,0 +1,184 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname(dirname($vendorDir));
+
+return array(
+    'CallbackFilterIterator' => $vendorDir . '/joomla/compat/src/CallbackFilterIterator.php',
+    'EasyPeasyICS' => $vendorDir . '/phpmailer/phpmailer/extras/EasyPeasyICS.php',
+    'Joomla\\Application\\AbstractApplication' => $vendorDir . '/joomla/application/src/AbstractApplication.php',
+    'Joomla\\Application\\AbstractCliApplication' => $vendorDir . '/joomla/application/src/AbstractCliApplication.php',
+    'Joomla\\Application\\AbstractDaemonApplication' => $vendorDir . '/joomla/application/src/AbstractDaemonApplication.php',
+    'Joomla\\Application\\AbstractWebApplication' => $vendorDir . '/joomla/application/src/AbstractWebApplication.php',
+    'Joomla\\Application\\Cli\\CliInput' => $vendorDir . '/joomla/application/src/Cli/CliInput.php',
+    'Joomla\\Application\\Cli\\CliOutput' => $vendorDir . '/joomla/application/src/Cli/CliOutput.php',
+    'Joomla\\Application\\Cli\\ColorProcessor' => $vendorDir . '/joomla/application/src/Cli/ColorProcessor.php',
+    'Joomla\\Application\\Cli\\ColorStyle' => $vendorDir . '/joomla/application/src/Cli/ColorStyle.php',
+    'Joomla\\Application\\Cli\\Output\\Processor\\ColorProcessor' => $vendorDir . '/joomla/application/src/Cli/Output/Processor/ColorProcessor.php',
+    'Joomla\\Application\\Cli\\Output\\Processor\\ProcessorInterface' => $vendorDir . '/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php',
+    'Joomla\\Application\\Cli\\Output\\Stdout' => $vendorDir . '/joomla/application/src/Cli/Output/Stdout.php',
+    'Joomla\\Application\\Cli\\Output\\Xml' => $vendorDir . '/joomla/application/src/Cli/Output/Xml.php',
+    'Joomla\\Application\\Web\\WebClient' => $vendorDir . '/joomla/application/src/Web/WebClient.php',
+    'Joomla\\Archive\\Archive' => $vendorDir . '/joomla/archive/src/Archive.php',
+    'Joomla\\Archive\\Bzip2' => $vendorDir . '/joomla/archive/src/Bzip2.php',
+    'Joomla\\Archive\\ExtractableInterface' => $vendorDir . '/joomla/archive/src/ExtractableInterface.php',
+    'Joomla\\Archive\\Gzip' => $vendorDir . '/joomla/archive/src/Gzip.php',
+    'Joomla\\Archive\\Tar' => $vendorDir . '/joomla/archive/src/Tar.php',
+    'Joomla\\Archive\\Zip' => $vendorDir . '/joomla/archive/src/Zip.php',
+    'Joomla\\DI\\Container' => $vendorDir . '/joomla/di/src/Container.php',
+    'Joomla\\DI\\ContainerAwareInterface' => $vendorDir . '/joomla/di/src/ContainerAwareInterface.php',
+    'Joomla\\DI\\ContainerAwareTrait' => $vendorDir . '/joomla/di/src/ContainerAwareTrait.php',
+    'Joomla\\DI\\Exception\\DependencyResolutionException' => $vendorDir . '/joomla/di/src/Exception/DependencyResolutionException.php',
+    'Joomla\\DI\\Exception\\KeyNotFoundException' => $vendorDir . '/joomla/di/src/Exception/KeyNotFoundException.php',
+    'Joomla\\DI\\Exception\\ProtectedKeyException' => $vendorDir . '/joomla/di/src/Exception/ProtectedKeyException.php',
+    'Joomla\\DI\\ServiceProviderInterface' => $vendorDir . '/joomla/di/src/ServiceProviderInterface.php',
+    'Joomla\\Data\\DataObject' => $vendorDir . '/joomla/data/src/DataObject.php',
+    'Joomla\\Data\\DataSet' => $vendorDir . '/joomla/data/src/DataSet.php',
+    'Joomla\\Data\\DumpableInterface' => $vendorDir . '/joomla/data/src/DumpableInterface.php',
+    'Joomla\\Event\\AbstractEvent' => $vendorDir . '/joomla/event/src/AbstractEvent.php',
+    'Joomla\\Event\\DelegatingDispatcher' => $vendorDir . '/joomla/event/src/DelegatingDispatcher.php',
+    'Joomla\\Event\\Dispatcher' => $vendorDir . '/joomla/event/src/Dispatcher.php',
+    'Joomla\\Event\\DispatcherAwareInterface' => $vendorDir . '/joomla/event/src/DispatcherAwareInterface.php',
+    'Joomla\\Event\\DispatcherAwareTrait' => $vendorDir . '/joomla/event/src/DispatcherAwareTrait.php',
+    'Joomla\\Event\\DispatcherInterface' => $vendorDir . '/joomla/event/src/DispatcherInterface.php',
+    'Joomla\\Event\\Event' => $vendorDir . '/joomla/event/src/Event.php',
+    'Joomla\\Event\\EventImmutable' => $vendorDir . '/joomla/event/src/EventImmutable.php',
+    'Joomla\\Event\\EventInterface' => $vendorDir . '/joomla/event/src/EventInterface.php',
+    'Joomla\\Event\\ListenersPriorityQueue' => $vendorDir . '/joomla/event/src/ListenersPriorityQueue.php',
+    'Joomla\\Event\\Priority' => $vendorDir . '/joomla/event/src/Priority.php',
+    'Joomla\\Filesystem\\Buffer' => $vendorDir . '/joomla/filesystem/src/Buffer.php',
+    'Joomla\\Filesystem\\Clients\\FtpClient' => $vendorDir . '/joomla/filesystem/src/Clients/FtpClient.php',
+    'Joomla\\Filesystem\\Exception\\FilesystemException' => $vendorDir . '/joomla/filesystem/src/Exception/FilesystemException.php',
+    'Joomla\\Filesystem\\File' => $vendorDir . '/joomla/filesystem/src/File.php',
+    'Joomla\\Filesystem\\Folder' => $vendorDir . '/joomla/filesystem/src/Folder.php',
+    'Joomla\\Filesystem\\Helper' => $vendorDir . '/joomla/filesystem/src/Helper.php',
+    'Joomla\\Filesystem\\Patcher' => $vendorDir . '/joomla/filesystem/src/Patcher.php',
+    'Joomla\\Filesystem\\Path' => $vendorDir . '/joomla/filesystem/src/Path.php',
+    'Joomla\\Filesystem\\Stream' => $vendorDir . '/joomla/filesystem/src/Stream.php',
+    'Joomla\\Filesystem\\Stream\\String' => $vendorDir . '/joomla/filesystem/src/Stream/String.php',
+    'Joomla\\Filesystem\\Stream\\StringWrapper' => $vendorDir . '/joomla/filesystem/src/Stream/StringWrapper.php',
+    'Joomla\\Filesystem\\Support\\StringController' => $vendorDir . '/joomla/filesystem/src/Support/StringController.php',
+    'Joomla\\Filter\\InputFilter' => $vendorDir . '/joomla/filter/src/InputFilter.php',
+    'Joomla\\Filter\\OutputFilter' => $vendorDir . '/joomla/filter/src/OutputFilter.php',
+    'Joomla\\Image\\Filter\\Backgroundfill' => $vendorDir . '/joomla/image/src/Filter/Backgroundfill.php',
+    'Joomla\\Image\\Filter\\Brightness' => $vendorDir . '/joomla/image/src/Filter/Brightness.php',
+    'Joomla\\Image\\Filter\\Contrast' => $vendorDir . '/joomla/image/src/Filter/Contrast.php',
+    'Joomla\\Image\\Filter\\Edgedetect' => $vendorDir . '/joomla/image/src/Filter/Edgedetect.php',
+    'Joomla\\Image\\Filter\\Emboss' => $vendorDir . '/joomla/image/src/Filter/Emboss.php',
+    'Joomla\\Image\\Filter\\Grayscale' => $vendorDir . '/joomla/image/src/Filter/Grayscale.php',
+    'Joomla\\Image\\Filter\\Negate' => $vendorDir . '/joomla/image/src/Filter/Negate.php',
+    'Joomla\\Image\\Filter\\Sketchy' => $vendorDir . '/joomla/image/src/Filter/Sketchy.php',
+    'Joomla\\Image\\Filter\\Smooth' => $vendorDir . '/joomla/image/src/Filter/Smooth.php',
+    'Joomla\\Image\\Image' => $vendorDir . '/joomla/image/src/Image.php',
+    'Joomla\\Image\\ImageFilter' => $vendorDir . '/joomla/image/src/ImageFilter.php',
+    'Joomla\\Input\\Cli' => $vendorDir . '/joomla/input/src/Cli.php',
+    'Joomla\\Input\\Cookie' => $vendorDir . '/joomla/input/src/Cookie.php',
+    'Joomla\\Input\\Files' => $vendorDir . '/joomla/input/src/Files.php',
+    'Joomla\\Input\\Input' => $vendorDir . '/joomla/input/src/Input.php',
+    'Joomla\\Input\\Json' => $vendorDir . '/joomla/input/src/Json.php',
+    'Joomla\\Ldap\\LdapClient' => $vendorDir . '/joomla/ldap/src/LdapClient.php',
+    'Joomla\\Registry\\AbstractRegistryFormat' => $vendorDir . '/joomla/registry/src/AbstractRegistryFormat.php',
+    'Joomla\\Registry\\Factory' => $vendorDir . '/joomla/registry/src/Factory.php',
+    'Joomla\\Registry\\FormatInterface' => $vendorDir . '/joomla/registry/src/FormatInterface.php',
+    'Joomla\\Registry\\Format\\Ini' => $vendorDir . '/joomla/registry/src/Format/Ini.php',
+    'Joomla\\Registry\\Format\\Json' => $vendorDir . '/joomla/registry/src/Format/Json.php',
+    'Joomla\\Registry\\Format\\Php' => $vendorDir . '/joomla/registry/src/Format/Php.php',
+    'Joomla\\Registry\\Format\\Xml' => $vendorDir . '/joomla/registry/src/Format/Xml.php',
+    'Joomla\\Registry\\Format\\Yaml' => $vendorDir . '/joomla/registry/src/Format/Yaml.php',
+    'Joomla\\Registry\\Registry' => $vendorDir . '/joomla/registry/src/Registry.php',
+    'Joomla\\Session\\Session' => $vendorDir . '/joomla/session/Joomla/Session/Session.php',
+    'Joomla\\Session\\Storage' => $vendorDir . '/joomla/session/Joomla/Session/Storage.php',
+    'Joomla\\Session\\Storage\\Apc' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Apc.php',
+    'Joomla\\Session\\Storage\\Database' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Database.php',
+    'Joomla\\Session\\Storage\\Memcache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Memcache.php',
+    'Joomla\\Session\\Storage\\Memcached' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Memcached.php',
+    'Joomla\\Session\\Storage\\None' => $vendorDir . '/joomla/session/Joomla/Session/Storage/None.php',
+    'Joomla\\Session\\Storage\\Wincache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Wincache.php',
+    'Joomla\\Session\\Storage\\Xcache' => $vendorDir . '/joomla/session/Joomla/Session/Storage/Xcache.php',
+    'Joomla\\String\\Inflector' => $vendorDir . '/joomla/string/src/Inflector.php',
+    'Joomla\\String\\Normalise' => $vendorDir . '/joomla/string/src/Normalise.php',
+    'Joomla\\String\\String' => $vendorDir . '/joomla/string/src/String.php',
+    'Joomla\\String\\StringHelper' => $vendorDir . '/joomla/string/src/StringHelper.php',
+    'Joomla\\Uri\\AbstractUri' => $vendorDir . '/joomla/uri/src/AbstractUri.php',
+    'Joomla\\Uri\\Uri' => $vendorDir . '/joomla/uri/src/Uri.php',
+    'Joomla\\Uri\\UriHelper' => $vendorDir . '/joomla/uri/src/UriHelper.php',
+    'Joomla\\Uri\\UriImmutable' => $vendorDir . '/joomla/uri/src/UriImmutable.php',
+    'Joomla\\Uri\\UriInterface' => $vendorDir . '/joomla/uri/src/UriInterface.php',
+    'Joomla\\Utilities\\ArrayHelper' => $vendorDir . '/joomla/utilities/src/ArrayHelper.php',
+    'JsonSerializable' => $vendorDir . '/joomla/compat/src/JsonSerializable.php',
+    'PHPMailer' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
+    'PHPMailerOAuth' => $vendorDir . '/phpmailer/phpmailer/class.phpmaileroauth.php',
+    'PHPMailerOAuthGoogle' => $vendorDir . '/phpmailer/phpmailer/class.phpmaileroauthgoogle.php',
+    'POP3' => $vendorDir . '/phpmailer/phpmailer/class.pop3.php',
+    'Psr\\Container\\ContainerExceptionInterface' => $vendorDir . '/psr/container/src/ContainerExceptionInterface.php',
+    'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
+    'Psr\\Container\\NotFoundExceptionInterface' => $vendorDir . '/psr/container/src/NotFoundExceptionInterface.php',
+    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
+    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
+    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
+    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
+    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
+    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
+    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
+    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+    'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php',
+    'SimplePie' => $vendorDir . '/simplepie/simplepie/library/SimplePie.php',
+    'SimplePie_Author' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Author.php',
+    'SimplePie_Cache' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache.php',
+    'SimplePie_Cache_Base' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/Base.php',
+    'SimplePie_Cache_DB' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/DB.php',
+    'SimplePie_Cache_File' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/File.php',
+    'SimplePie_Cache_Memcache' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/Memcache.php',
+    'SimplePie_Cache_MySQL' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/MySQL.php',
+    'SimplePie_Caption' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Caption.php',
+    'SimplePie_Category' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Category.php',
+    'SimplePie_Content_Type_Sniffer' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php',
+    'SimplePie_Copyright' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Copyright.php',
+    'SimplePie_Core' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Core.php',
+    'SimplePie_Credit' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Credit.php',
+    'SimplePie_Decode_HTML_Entities' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php',
+    'SimplePie_Enclosure' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Enclosure.php',
+    'SimplePie_Exception' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Exception.php',
+    'SimplePie_File' => $vendorDir . '/simplepie/simplepie/library/SimplePie/File.php',
+    'SimplePie_HTTP_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/HTTP/Parser.php',
+    'SimplePie_IRI' => $vendorDir . '/simplepie/simplepie/library/SimplePie/IRI.php',
+    'SimplePie_Item' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Item.php',
+    'SimplePie_Locator' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Locator.php',
+    'SimplePie_Misc' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Misc.php',
+    'SimplePie_Net_IPv6' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Net/IPv6.php',
+    'SimplePie_Parse_Date' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Parse/Date.php',
+    'SimplePie_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Parser.php',
+    'SimplePie_Rating' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Rating.php',
+    'SimplePie_Registry' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Registry.php',
+    'SimplePie_Restriction' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Restriction.php',
+    'SimplePie_Sanitize' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Sanitize.php',
+    'SimplePie_Source' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Source.php',
+    'SimplePie_XML_Declaration_Parser' => $vendorDir . '/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php',
+    'SimplePie_gzdecode' => $vendorDir . '/simplepie/simplepie/library/SimplePie/gzdecode.php',
+    'Symfony\\Component\\Yaml\\Dumper' => $vendorDir . '/symfony/yaml/Dumper.php',
+    'Symfony\\Component\\Yaml\\Escaper' => $vendorDir . '/symfony/yaml/Escaper.php',
+    'Symfony\\Component\\Yaml\\Exception\\DumpException' => $vendorDir . '/symfony/yaml/Exception/DumpException.php',
+    'Symfony\\Component\\Yaml\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/yaml/Exception/ExceptionInterface.php',
+    'Symfony\\Component\\Yaml\\Exception\\ParseException' => $vendorDir . '/symfony/yaml/Exception/ParseException.php',
+    'Symfony\\Component\\Yaml\\Exception\\RuntimeException' => $vendorDir . '/symfony/yaml/Exception/RuntimeException.php',
+    'Symfony\\Component\\Yaml\\Inline' => $vendorDir . '/symfony/yaml/Inline.php',
+    'Symfony\\Component\\Yaml\\Parser' => $vendorDir . '/symfony/yaml/Parser.php',
+    'Symfony\\Component\\Yaml\\Unescaper' => $vendorDir . '/symfony/yaml/Unescaper.php',
+    'Symfony\\Component\\Yaml\\Yaml' => $vendorDir . '/symfony/yaml/Yaml.php',
+    'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
+    'Symfony\\Polyfill\\Php55\\Php55' => $vendorDir . '/symfony/polyfill-php55/Php55.php',
+    'Symfony\\Polyfill\\Php55\\Php55ArrayColumn' => $vendorDir . '/symfony/polyfill-php55/Php55ArrayColumn.php',
+    'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
+    'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
+    'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
+    'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
+    'lessc' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+    'lessc_formatter_classic' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+    'lessc_formatter_compressed' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+    'lessc_formatter_lessjs' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+    'lessc_parser' => $vendorDir . '/leafo/lessphp/lessc.inc.php',
+    'ntlm_sasl_client_class' => $vendorDir . '/phpmailer/phpmailer/extras/ntlm_sasl_client.php',
+    'phpmailerException' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
+);
diff --git a/core/libraries/vendor/composer/autoload_files.php b/core/libraries/vendor/composer/autoload_files.php
new file mode 100644
index 00000000..ced1fb56
--- /dev/null
+++ b/core/libraries/vendor/composer/autoload_files.php
@@ -0,0 +1,31 @@
+<?php
+
+// autoload_files.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname(dirname($vendorDir));
+
+return array(
+    '2fb9d6f23c8e8faefc193a4cde0cab4f' => $vendorDir . '/joomla/string/src/phputf8/utf8.php',
+    'e6851e0ae7328fe5412fcec73928f3d9' => $vendorDir . '/joomla/string/src/phputf8/ord.php',
+    'd9ad1b7c85c100a18c404a13824b846e' => $vendorDir . '/joomla/string/src/phputf8/str_ireplace.php',
+    '62bad9b6730d2f83493d2337bf61519d' => $vendorDir . '/joomla/string/src/phputf8/str_pad.php',
+    'c4d521b8d54308532dce032713d4eec0' => $vendorDir . '/joomla/string/src/phputf8/str_split.php',
+    'fa973e71cace925de2afdc692b861b1d' => $vendorDir . '/joomla/string/src/phputf8/strcasecmp.php',
+    '0c98c2f1295d9f4d093cc77d5834bb04' => $vendorDir . '/joomla/string/src/phputf8/strcspn.php',
+    'a52639d843b4094945115c178a91ca86' => $vendorDir . '/joomla/string/src/phputf8/stristr.php',
+    '73ee7d0297e683c4c2e7798ef040fb2f' => $vendorDir . '/joomla/string/src/phputf8/strrev.php',
+    'd55633c05ddb996e0005f35debaa7b5b' => $vendorDir . '/joomla/string/src/phputf8/strspn.php',
+    '944e69d23b93558fc0714353cf0c8beb' => $vendorDir . '/joomla/string/src/phputf8/trim.php',
+    '31264bab20f14a8fc7a9d4265d91ee98' => $vendorDir . '/joomla/string/src/phputf8/ucfirst.php',
+    '05d739a990f75f0c44ebe1f032b33148' => $vendorDir . '/joomla/string/src/phputf8/ucwords.php',
+    '4292e2fa66516089e6006723267587b4' => $vendorDir . '/joomla/string/src/phputf8/utils/ascii.php',
+    '87465e33b7551b401bf051928f220e9a' => $vendorDir . '/joomla/string/src/phputf8/utils/validation.php',
+    '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
+    'e40631d46120a9c38ea139981f8dab26' => $vendorDir . '/ircmaxell/password-compat/lib/password.php',
+    '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+    'edc6464955a37aa4d5fbf39d40fb6ee7' => $vendorDir . '/symfony/polyfill-php55/bootstrap.php',
+    'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+    '3109cb1a231dcd04bee1f9f620d46975' => $vendorDir . '/paragonie/sodium_compat/autoload.php',
+    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
+);
diff --git a/core/libraries/vendor/composer/autoload_namespaces.php b/core/libraries/vendor/composer/autoload_namespaces.php
new file mode 100644
index 00000000..8eaaf39d
--- /dev/null
+++ b/core/libraries/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,11 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname(dirname($vendorDir));
+
+return array(
+    'SimplePie' => array($vendorDir . '/simplepie/simplepie/library'),
+    'Joomla\\Session' => array($vendorDir . '/joomla/session'),
+);
diff --git a/core/libraries/vendor/composer/autoload_psr4.php b/core/libraries/vendor/composer/autoload_psr4.php
new file mode 100644
index 00000000..a08fa71c
--- /dev/null
+++ b/core/libraries/vendor/composer/autoload_psr4.php
@@ -0,0 +1,34 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname(dirname($vendorDir));
+
+return array(
+    'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
+    'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
+    'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
+    'Symfony\\Polyfill\\Php55\\' => array($vendorDir . '/symfony/polyfill-php55'),
+    'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
+    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
+    'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
+    'Joomla\\Utilities\\' => array($vendorDir . '/joomla/utilities/src'),
+    'Joomla\\Uri\\Tests\\' => array($vendorDir . '/joomla/uri/Tests'),
+    'Joomla\\Uri\\' => array($vendorDir . '/joomla/uri/src'),
+    'Joomla\\String\\' => array($vendorDir . '/joomla/string/src'),
+    'Joomla\\Registry\\' => array($vendorDir . '/joomla/registry/src'),
+    'Joomla\\Ldap\\' => array($vendorDir . '/joomla/ldap/src'),
+    'Joomla\\Input\\' => array($vendorDir . '/joomla/input/src'),
+    'Joomla\\Image\\' => array($vendorDir . '/joomla/image/src'),
+    'Joomla\\Filter\\' => array($vendorDir . '/joomla/filter/src'),
+    'Joomla\\Filesystem\\' => array($vendorDir . '/joomla/filesystem/src'),
+    'Joomla\\Event\\Tests\\' => array($vendorDir . '/joomla/event/Tests'),
+    'Joomla\\Event\\' => array($vendorDir . '/joomla/event/src'),
+    'Joomla\\Data\\Tests\\' => array($vendorDir . '/joomla/data/Tests'),
+    'Joomla\\Data\\' => array($vendorDir . '/joomla/data/src'),
+    'Joomla\\DI\\' => array($vendorDir . '/joomla/di/src'),
+    'Joomla\\Archive\\' => array($vendorDir . '/joomla/archive/src'),
+    'Joomla\\Application\\' => array($vendorDir . '/joomla/application/src'),
+);
diff --git a/core/libraries/vendor/composer/autoload_real.php b/core/libraries/vendor/composer/autoload_real.php
new file mode 100644
index 00000000..f3a91b2e
--- /dev/null
+++ b/core/libraries/vendor/composer/autoload_real.php
@@ -0,0 +1,70 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInit205c915b9c7d3e718e7c95793ee67ffe', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->register(true);
+
+        if ($useStaticLoader) {
+            $includeFiles = Composer\Autoload\ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe::$files;
+        } else {
+            $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequire205c915b9c7d3e718e7c95793ee67ffe($fileIdentifier, $file);
+        }
+
+        return $loader;
+    }
+}
+
+function composerRequire205c915b9c7d3e718e7c95793ee67ffe($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        require $file;
+
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+    }
+}
diff --git a/core/libraries/vendor/composer/autoload_static.php b/core/libraries/vendor/composer/autoload_static.php
new file mode 100644
index 00000000..0f1dda49
--- /dev/null
+++ b/core/libraries/vendor/composer/autoload_static.php
@@ -0,0 +1,379 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
+{
+    public static $files = array (
+        '2fb9d6f23c8e8faefc193a4cde0cab4f' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utf8.php',
+        'e6851e0ae7328fe5412fcec73928f3d9' => __DIR__ . '/..' . '/joomla/string/src/phputf8/ord.php',
+        'd9ad1b7c85c100a18c404a13824b846e' => __DIR__ . '/..' . '/joomla/string/src/phputf8/str_ireplace.php',
+        '62bad9b6730d2f83493d2337bf61519d' => __DIR__ . '/..' . '/joomla/string/src/phputf8/str_pad.php',
+        'c4d521b8d54308532dce032713d4eec0' => __DIR__ . '/..' . '/joomla/string/src/phputf8/str_split.php',
+        'fa973e71cace925de2afdc692b861b1d' => __DIR__ . '/..' . '/joomla/string/src/phputf8/strcasecmp.php',
+        '0c98c2f1295d9f4d093cc77d5834bb04' => __DIR__ . '/..' . '/joomla/string/src/phputf8/strcspn.php',
+        'a52639d843b4094945115c178a91ca86' => __DIR__ . '/..' . '/joomla/string/src/phputf8/stristr.php',
+        '73ee7d0297e683c4c2e7798ef040fb2f' => __DIR__ . '/..' . '/joomla/string/src/phputf8/strrev.php',
+        'd55633c05ddb996e0005f35debaa7b5b' => __DIR__ . '/..' . '/joomla/string/src/phputf8/strspn.php',
+        '944e69d23b93558fc0714353cf0c8beb' => __DIR__ . '/..' . '/joomla/string/src/phputf8/trim.php',
+        '31264bab20f14a8fc7a9d4265d91ee98' => __DIR__ . '/..' . '/joomla/string/src/phputf8/ucfirst.php',
+        '05d739a990f75f0c44ebe1f032b33148' => __DIR__ . '/..' . '/joomla/string/src/phputf8/ucwords.php',
+        '4292e2fa66516089e6006723267587b4' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/ascii.php',
+        '87465e33b7551b401bf051928f220e9a' => __DIR__ . '/..' . '/joomla/string/src/phputf8/utils/validation.php',
+        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+        'e40631d46120a9c38ea139981f8dab26' => __DIR__ . '/..' . '/ircmaxell/password-compat/lib/password.php',
+        '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+        'edc6464955a37aa4d5fbf39d40fb6ee7' => __DIR__ . '/..' . '/symfony/polyfill-php55/bootstrap.php',
+        'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+        '3109cb1a231dcd04bee1f9f620d46975' => __DIR__ . '/..' . '/paragonie/sodium_compat/autoload.php',
+        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
+    );
+
+    public static $prefixLengthsPsr4 = array (
+        'S' => 
+        array (
+            'Symfony\\Polyfill\\Util\\' => 22,
+            'Symfony\\Polyfill\\Php73\\' => 23,
+            'Symfony\\Polyfill\\Php56\\' => 23,
+            'Symfony\\Polyfill\\Php55\\' => 23,
+            'Symfony\\Polyfill\\Ctype\\' => 23,
+            'Symfony\\Component\\Yaml\\' => 23,
+        ),
+        'P' => 
+        array (
+            'Psr\\Log\\' => 8,
+            'Psr\\Container\\' => 14,
+        ),
+        'J' => 
+        array (
+            'Joomla\\Utilities\\' => 17,
+            'Joomla\\Uri\\Tests\\' => 17,
+            'Joomla\\Uri\\' => 11,
+            'Joomla\\String\\' => 14,
+            'Joomla\\Registry\\' => 16,
+            'Joomla\\Ldap\\' => 12,
+            'Joomla\\Input\\' => 13,
+            'Joomla\\Image\\' => 13,
+            'Joomla\\Filter\\' => 14,
+            'Joomla\\Filesystem\\' => 18,
+            'Joomla\\Event\\Tests\\' => 19,
+            'Joomla\\Event\\' => 13,
+            'Joomla\\Data\\Tests\\' => 18,
+            'Joomla\\Data\\' => 12,
+            'Joomla\\DI\\' => 10,
+            'Joomla\\Archive\\' => 15,
+            'Joomla\\Application\\' => 19,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'Symfony\\Polyfill\\Util\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-util',
+        ),
+        'Symfony\\Polyfill\\Php73\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php73',
+        ),
+        'Symfony\\Polyfill\\Php56\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php56',
+        ),
+        'Symfony\\Polyfill\\Php55\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php55',
+        ),
+        'Symfony\\Polyfill\\Ctype\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
+        ),
+        'Symfony\\Component\\Yaml\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/yaml',
+        ),
+        'Psr\\Log\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
+        ),
+        'Psr\\Container\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/container/src',
+        ),
+        'Joomla\\Utilities\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/utilities/src',
+        ),
+        'Joomla\\Uri\\Tests\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/uri/Tests',
+        ),
+        'Joomla\\Uri\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/uri/src',
+        ),
+        'Joomla\\String\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/string/src',
+        ),
+        'Joomla\\Registry\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/registry/src',
+        ),
+        'Joomla\\Ldap\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/ldap/src',
+        ),
+        'Joomla\\Input\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/input/src',
+        ),
+        'Joomla\\Image\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/image/src',
+        ),
+        'Joomla\\Filter\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/filter/src',
+        ),
+        'Joomla\\Filesystem\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/filesystem/src',
+        ),
+        'Joomla\\Event\\Tests\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/event/Tests',
+        ),
+        'Joomla\\Event\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/event/src',
+        ),
+        'Joomla\\Data\\Tests\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/data/Tests',
+        ),
+        'Joomla\\Data\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/data/src',
+        ),
+        'Joomla\\DI\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/di/src',
+        ),
+        'Joomla\\Archive\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/archive/src',
+        ),
+        'Joomla\\Application\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/joomla/application/src',
+        ),
+    );
+
+    public static $prefixesPsr0 = array (
+        'S' => 
+        array (
+            'SimplePie' => 
+            array (
+                0 => __DIR__ . '/..' . '/simplepie/simplepie/library',
+            ),
+        ),
+        'J' => 
+        array (
+            'Joomla\\Session' => 
+            array (
+                0 => __DIR__ . '/..' . '/joomla/session',
+            ),
+        ),
+    );
+
+    public static $classMap = array (
+        'CallbackFilterIterator' => __DIR__ . '/..' . '/joomla/compat/src/CallbackFilterIterator.php',
+        'EasyPeasyICS' => __DIR__ . '/..' . '/phpmailer/phpmailer/extras/EasyPeasyICS.php',
+        'Joomla\\Application\\AbstractApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractApplication.php',
+        'Joomla\\Application\\AbstractCliApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractCliApplication.php',
+        'Joomla\\Application\\AbstractDaemonApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractDaemonApplication.php',
+        'Joomla\\Application\\AbstractWebApplication' => __DIR__ . '/..' . '/joomla/application/src/AbstractWebApplication.php',
+        'Joomla\\Application\\Cli\\CliInput' => __DIR__ . '/..' . '/joomla/application/src/Cli/CliInput.php',
+        'Joomla\\Application\\Cli\\CliOutput' => __DIR__ . '/..' . '/joomla/application/src/Cli/CliOutput.php',
+        'Joomla\\Application\\Cli\\ColorProcessor' => __DIR__ . '/..' . '/joomla/application/src/Cli/ColorProcessor.php',
+        'Joomla\\Application\\Cli\\ColorStyle' => __DIR__ . '/..' . '/joomla/application/src/Cli/ColorStyle.php',
+        'Joomla\\Application\\Cli\\Output\\Processor\\ColorProcessor' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Processor/ColorProcessor.php',
+        'Joomla\\Application\\Cli\\Output\\Processor\\ProcessorInterface' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php',
+        'Joomla\\Application\\Cli\\Output\\Stdout' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Stdout.php',
+        'Joomla\\Application\\Cli\\Output\\Xml' => __DIR__ . '/..' . '/joomla/application/src/Cli/Output/Xml.php',
+        'Joomla\\Application\\Web\\WebClient' => __DIR__ . '/..' . '/joomla/application/src/Web/WebClient.php',
+        'Joomla\\Archive\\Archive' => __DIR__ . '/..' . '/joomla/archive/src/Archive.php',
+        'Joomla\\Archive\\Bzip2' => __DIR__ . '/..' . '/joomla/archive/src/Bzip2.php',
+        'Joomla\\Archive\\ExtractableInterface' => __DIR__ . '/..' . '/joomla/archive/src/ExtractableInterface.php',
+        'Joomla\\Archive\\Gzip' => __DIR__ . '/..' . '/joomla/archive/src/Gzip.php',
+        'Joomla\\Archive\\Tar' => __DIR__ . '/..' . '/joomla/archive/src/Tar.php',
+        'Joomla\\Archive\\Zip' => __DIR__ . '/..' . '/joomla/archive/src/Zip.php',
+        'Joomla\\DI\\Container' => __DIR__ . '/..' . '/joomla/di/src/Container.php',
+        'Joomla\\DI\\ContainerAwareInterface' => __DIR__ . '/..' . '/joomla/di/src/ContainerAwareInterface.php',
+        'Joomla\\DI\\ContainerAwareTrait' => __DIR__ . '/..' . '/joomla/di/src/ContainerAwareTrait.php',
+        'Joomla\\DI\\Exception\\DependencyResolutionException' => __DIR__ . '/..' . '/joomla/di/src/Exception/DependencyResolutionException.php',
+        'Joomla\\DI\\Exception\\KeyNotFoundException' => __DIR__ . '/..' . '/joomla/di/src/Exception/KeyNotFoundException.php',
+        'Joomla\\DI\\Exception\\ProtectedKeyException' => __DIR__ . '/..' . '/joomla/di/src/Exception/ProtectedKeyException.php',
+        'Joomla\\DI\\ServiceProviderInterface' => __DIR__ . '/..' . '/joomla/di/src/ServiceProviderInterface.php',
+        'Joomla\\Data\\DataObject' => __DIR__ . '/..' . '/joomla/data/src/DataObject.php',
+        'Joomla\\Data\\DataSet' => __DIR__ . '/..' . '/joomla/data/src/DataSet.php',
+        'Joomla\\Data\\DumpableInterface' => __DIR__ . '/..' . '/joomla/data/src/DumpableInterface.php',
+        'Joomla\\Event\\AbstractEvent' => __DIR__ . '/..' . '/joomla/event/src/AbstractEvent.php',
+        'Joomla\\Event\\DelegatingDispatcher' => __DIR__ . '/..' . '/joomla/event/src/DelegatingDispatcher.php',
+        'Joomla\\Event\\Dispatcher' => __DIR__ . '/..' . '/joomla/event/src/Dispatcher.php',
+        'Joomla\\Event\\DispatcherAwareInterface' => __DIR__ . '/..' . '/joomla/event/src/DispatcherAwareInterface.php',
+        'Joomla\\Event\\DispatcherAwareTrait' => __DIR__ . '/..' . '/joomla/event/src/DispatcherAwareTrait.php',
+        'Joomla\\Event\\DispatcherInterface' => __DIR__ . '/..' . '/joomla/event/src/DispatcherInterface.php',
+        'Joomla\\Event\\Event' => __DIR__ . '/..' . '/joomla/event/src/Event.php',
+        'Joomla\\Event\\EventImmutable' => __DIR__ . '/..' . '/joomla/event/src/EventImmutable.php',
+        'Joomla\\Event\\EventInterface' => __DIR__ . '/..' . '/joomla/event/src/EventInterface.php',
+        'Joomla\\Event\\ListenersPriorityQueue' => __DIR__ . '/..' . '/joomla/event/src/ListenersPriorityQueue.php',
+        'Joomla\\Event\\Priority' => __DIR__ . '/..' . '/joomla/event/src/Priority.php',
+        'Joomla\\Filesystem\\Buffer' => __DIR__ . '/..' . '/joomla/filesystem/src/Buffer.php',
+        'Joomla\\Filesystem\\Clients\\FtpClient' => __DIR__ . '/..' . '/joomla/filesystem/src/Clients/FtpClient.php',
+        'Joomla\\Filesystem\\Exception\\FilesystemException' => __DIR__ . '/..' . '/joomla/filesystem/src/Exception/FilesystemException.php',
+        'Joomla\\Filesystem\\File' => __DIR__ . '/..' . '/joomla/filesystem/src/File.php',
+        'Joomla\\Filesystem\\Folder' => __DIR__ . '/..' . '/joomla/filesystem/src/Folder.php',
+        'Joomla\\Filesystem\\Helper' => __DIR__ . '/..' . '/joomla/filesystem/src/Helper.php',
+        'Joomla\\Filesystem\\Patcher' => __DIR__ . '/..' . '/joomla/filesystem/src/Patcher.php',
+        'Joomla\\Filesystem\\Path' => __DIR__ . '/..' . '/joomla/filesystem/src/Path.php',
+        'Joomla\\Filesystem\\Stream' => __DIR__ . '/..' . '/joomla/filesystem/src/Stream.php',
+        'Joomla\\Filesystem\\Stream\\String' => __DIR__ . '/..' . '/joomla/filesystem/src/Stream/String.php',
+        'Joomla\\Filesystem\\Stream\\StringWrapper' => __DIR__ . '/..' . '/joomla/filesystem/src/Stream/StringWrapper.php',
+        'Joomla\\Filesystem\\Support\\StringController' => __DIR__ . '/..' . '/joomla/filesystem/src/Support/StringController.php',
+        'Joomla\\Filter\\InputFilter' => __DIR__ . '/..' . '/joomla/filter/src/InputFilter.php',
+        'Joomla\\Filter\\OutputFilter' => __DIR__ . '/..' . '/joomla/filter/src/OutputFilter.php',
+        'Joomla\\Image\\Filter\\Backgroundfill' => __DIR__ . '/..' . '/joomla/image/src/Filter/Backgroundfill.php',
+        'Joomla\\Image\\Filter\\Brightness' => __DIR__ . '/..' . '/joomla/image/src/Filter/Brightness.php',
+        'Joomla\\Image\\Filter\\Contrast' => __DIR__ . '/..' . '/joomla/image/src/Filter/Contrast.php',
+        'Joomla\\Image\\Filter\\Edgedetect' => __DIR__ . '/..' . '/joomla/image/src/Filter/Edgedetect.php',
+        'Joomla\\Image\\Filter\\Emboss' => __DIR__ . '/..' . '/joomla/image/src/Filter/Emboss.php',
+        'Joomla\\Image\\Filter\\Grayscale' => __DIR__ . '/..' . '/joomla/image/src/Filter/Grayscale.php',
+        'Joomla\\Image\\Filter\\Negate' => __DIR__ . '/..' . '/joomla/image/src/Filter/Negate.php',
+        'Joomla\\Image\\Filter\\Sketchy' => __DIR__ . '/..' . '/joomla/image/src/Filter/Sketchy.php',
+        'Joomla\\Image\\Filter\\Smooth' => __DIR__ . '/..' . '/joomla/image/src/Filter/Smooth.php',
+        'Joomla\\Image\\Image' => __DIR__ . '/..' . '/joomla/image/src/Image.php',
+        'Joomla\\Image\\ImageFilter' => __DIR__ . '/..' . '/joomla/image/src/ImageFilter.php',
+        'Joomla\\Input\\Cli' => __DIR__ . '/..' . '/joomla/input/src/Cli.php',
+        'Joomla\\Input\\Cookie' => __DIR__ . '/..' . '/joomla/input/src/Cookie.php',
+        'Joomla\\Input\\Files' => __DIR__ . '/..' . '/joomla/input/src/Files.php',
+        'Joomla\\Input\\Input' => __DIR__ . '/..' . '/joomla/input/src/Input.php',
+        'Joomla\\Input\\Json' => __DIR__ . '/..' . '/joomla/input/src/Json.php',
+        'Joomla\\Ldap\\LdapClient' => __DIR__ . '/..' . '/joomla/ldap/src/LdapClient.php',
+        'Joomla\\Registry\\AbstractRegistryFormat' => __DIR__ . '/..' . '/joomla/registry/src/AbstractRegistryFormat.php',
+        'Joomla\\Registry\\Factory' => __DIR__ . '/..' . '/joomla/registry/src/Factory.php',
+        'Joomla\\Registry\\FormatInterface' => __DIR__ . '/..' . '/joomla/registry/src/FormatInterface.php',
+        'Joomla\\Registry\\Format\\Ini' => __DIR__ . '/..' . '/joomla/registry/src/Format/Ini.php',
+        'Joomla\\Registry\\Format\\Json' => __DIR__ . '/..' . '/joomla/registry/src/Format/Json.php',
+        'Joomla\\Registry\\Format\\Php' => __DIR__ . '/..' . '/joomla/registry/src/Format/Php.php',
+        'Joomla\\Registry\\Format\\Xml' => __DIR__ . '/..' . '/joomla/registry/src/Format/Xml.php',
+        'Joomla\\Registry\\Format\\Yaml' => __DIR__ . '/..' . '/joomla/registry/src/Format/Yaml.php',
+        'Joomla\\Registry\\Registry' => __DIR__ . '/..' . '/joomla/registry/src/Registry.php',
+        'Joomla\\Session\\Session' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Session.php',
+        'Joomla\\Session\\Storage' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage.php',
+        'Joomla\\Session\\Storage\\Apc' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Apc.php',
+        'Joomla\\Session\\Storage\\Database' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Database.php',
+        'Joomla\\Session\\Storage\\Memcache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Memcache.php',
+        'Joomla\\Session\\Storage\\Memcached' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Memcached.php',
+        'Joomla\\Session\\Storage\\None' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/None.php',
+        'Joomla\\Session\\Storage\\Wincache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Wincache.php',
+        'Joomla\\Session\\Storage\\Xcache' => __DIR__ . '/..' . '/joomla/session/Joomla/Session/Storage/Xcache.php',
+        'Joomla\\String\\Inflector' => __DIR__ . '/..' . '/joomla/string/src/Inflector.php',
+        'Joomla\\String\\Normalise' => __DIR__ . '/..' . '/joomla/string/src/Normalise.php',
+        'Joomla\\String\\String' => __DIR__ . '/..' . '/joomla/string/src/String.php',
+        'Joomla\\String\\StringHelper' => __DIR__ . '/..' . '/joomla/string/src/StringHelper.php',
+        'Joomla\\Uri\\AbstractUri' => __DIR__ . '/..' . '/joomla/uri/src/AbstractUri.php',
+        'Joomla\\Uri\\Uri' => __DIR__ . '/..' . '/joomla/uri/src/Uri.php',
+        'Joomla\\Uri\\UriHelper' => __DIR__ . '/..' . '/joomla/uri/src/UriHelper.php',
+        'Joomla\\Uri\\UriImmutable' => __DIR__ . '/..' . '/joomla/uri/src/UriImmutable.php',
+        'Joomla\\Uri\\UriInterface' => __DIR__ . '/..' . '/joomla/uri/src/UriInterface.php',
+        'Joomla\\Utilities\\ArrayHelper' => __DIR__ . '/..' . '/joomla/utilities/src/ArrayHelper.php',
+        'JsonSerializable' => __DIR__ . '/..' . '/joomla/compat/src/JsonSerializable.php',
+        'PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmailer.php',
+        'PHPMailerOAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmaileroauth.php',
+        'PHPMailerOAuthGoogle' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmaileroauthgoogle.php',
+        'POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.pop3.php',
+        'Psr\\Container\\ContainerExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerExceptionInterface.php',
+        'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
+        'Psr\\Container\\NotFoundExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/NotFoundExceptionInterface.php',
+        'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
+        'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
+        'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
+        'Psr\\Log\\LoggerAwareInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareInterface.php',
+        'Psr\\Log\\LoggerAwareTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerAwareTrait.php',
+        'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
+        'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
+        'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
+        'SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.smtp.php',
+        'SimplePie' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie.php',
+        'SimplePie_Author' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Author.php',
+        'SimplePie_Cache' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache.php',
+        'SimplePie_Cache_Base' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/Base.php',
+        'SimplePie_Cache_DB' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/DB.php',
+        'SimplePie_Cache_File' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/File.php',
+        'SimplePie_Cache_Memcache' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/Memcache.php',
+        'SimplePie_Cache_MySQL' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/MySQL.php',
+        'SimplePie_Caption' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Caption.php',
+        'SimplePie_Category' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Category.php',
+        'SimplePie_Content_Type_Sniffer' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php',
+        'SimplePie_Copyright' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Copyright.php',
+        'SimplePie_Core' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Core.php',
+        'SimplePie_Credit' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Credit.php',
+        'SimplePie_Decode_HTML_Entities' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php',
+        'SimplePie_Enclosure' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Enclosure.php',
+        'SimplePie_Exception' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Exception.php',
+        'SimplePie_File' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/File.php',
+        'SimplePie_HTTP_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/HTTP/Parser.php',
+        'SimplePie_IRI' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/IRI.php',
+        'SimplePie_Item' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Item.php',
+        'SimplePie_Locator' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Locator.php',
+        'SimplePie_Misc' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Misc.php',
+        'SimplePie_Net_IPv6' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Net/IPv6.php',
+        'SimplePie_Parse_Date' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Parse/Date.php',
+        'SimplePie_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Parser.php',
+        'SimplePie_Rating' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Rating.php',
+        'SimplePie_Registry' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Registry.php',
+        'SimplePie_Restriction' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Restriction.php',
+        'SimplePie_Sanitize' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Sanitize.php',
+        'SimplePie_Source' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Source.php',
+        'SimplePie_XML_Declaration_Parser' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php',
+        'SimplePie_gzdecode' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/gzdecode.php',
+        'Symfony\\Component\\Yaml\\Dumper' => __DIR__ . '/..' . '/symfony/yaml/Dumper.php',
+        'Symfony\\Component\\Yaml\\Escaper' => __DIR__ . '/..' . '/symfony/yaml/Escaper.php',
+        'Symfony\\Component\\Yaml\\Exception\\DumpException' => __DIR__ . '/..' . '/symfony/yaml/Exception/DumpException.php',
+        'Symfony\\Component\\Yaml\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/yaml/Exception/ExceptionInterface.php',
+        'Symfony\\Component\\Yaml\\Exception\\ParseException' => __DIR__ . '/..' . '/symfony/yaml/Exception/ParseException.php',
+        'Symfony\\Component\\Yaml\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/yaml/Exception/RuntimeException.php',
+        'Symfony\\Component\\Yaml\\Inline' => __DIR__ . '/..' . '/symfony/yaml/Inline.php',
+        'Symfony\\Component\\Yaml\\Parser' => __DIR__ . '/..' . '/symfony/yaml/Parser.php',
+        'Symfony\\Component\\Yaml\\Unescaper' => __DIR__ . '/..' . '/symfony/yaml/Unescaper.php',
+        'Symfony\\Component\\Yaml\\Yaml' => __DIR__ . '/..' . '/symfony/yaml/Yaml.php',
+        'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
+        'Symfony\\Polyfill\\Php55\\Php55' => __DIR__ . '/..' . '/symfony/polyfill-php55/Php55.php',
+        'Symfony\\Polyfill\\Php55\\Php55ArrayColumn' => __DIR__ . '/..' . '/symfony/polyfill-php55/Php55ArrayColumn.php',
+        'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
+        'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php',
+        'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
+        'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
+        'lessc' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
+        'lessc_formatter_classic' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
+        'lessc_formatter_compressed' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
+        'lessc_formatter_lessjs' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
+        'lessc_parser' => __DIR__ . '/..' . '/leafo/lessphp/lessc.inc.php',
+        'ntlm_sasl_client_class' => __DIR__ . '/..' . '/phpmailer/phpmailer/extras/ntlm_sasl_client.php',
+        'phpmailerException' => __DIR__ . '/..' . '/phpmailer/phpmailer/class.phpmailer.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/core/libraries/vendor/composer/installed.json b/core/libraries/vendor/composer/installed.json
new file mode 100644
index 00000000..9a581b0f
--- /dev/null
+++ b/core/libraries/vendor/composer/installed.json
@@ -0,0 +1,1615 @@
+[
+    {
+        "name": "ircmaxell/password-compat",
+        "version": "v1.0.4",
+        "version_normalized": "1.0.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/ircmaxell/password_compat.git",
+            "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
+            "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+            "shasum": ""
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.*"
+        },
+        "time": "2014-11-20T16:49:30+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/password.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Anthony Ferrara",
+                "email": "ircmaxell@php.net",
+                "homepage": "http://blog.ircmaxell.com"
+            }
+        ],
+        "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
+        "homepage": "https://github.com/ircmaxell/password_compat",
+        "keywords": [
+            "hashing",
+            "password"
+        ]
+    },
+    {
+        "name": "joomla/application",
+        "version": "1.9.1",
+        "version_normalized": "1.9.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/application.git",
+            "reference": "a0360e578933e20e98da5c8e17cda72e2b5e2024"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/application/zipball/a0360e578933e20e98da5c8e17cda72e2b5e2024",
+            "reference": "a0360e578933e20e98da5c8e17cda72e2b5e2024",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/input": "~1.2|~2.0",
+            "joomla/registry": "^1.4.5|~2.0",
+            "php": "^5.3.10|~7.0",
+            "psr/log": "~1.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "joomla/event": "~1.2|~2.0",
+            "joomla/session": "^1.2.1|~2.0",
+            "joomla/test": "~1.1",
+            "joomla/uri": "~1.1",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
+        },
+        "suggest": {
+            "joomla/session": "To use AbstractWebApplication with session support, install joomla/session",
+            "joomla/uri": "To use AbstractWebApplication, install joomla/uri"
+        },
+        "time": "2018-05-28T15:32:35+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Application\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla Application Package",
+        "homepage": "https://github.com/joomla-framework/application",
+        "keywords": [
+            "application",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/archive",
+        "version": "1.1.5",
+        "version_normalized": "1.1.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/archive.git",
+            "reference": "2b5d645804c6af7c363716ba1956929f8b9665d3"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/archive/zipball/2b5d645804c6af7c363716ba1956929f8b9665d3",
+            "reference": "2b5d645804c6af7c363716ba1956929f8b9665d3",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/filesystem": "~1.3|~2.0",
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/test": "~1.0",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
+            "squizlabs/php_codesniffer": "1.*"
+        },
+        "suggest": {
+            "ext-bz2": "To extract bzip2 compressed packages",
+            "ext-zip": "To extract zip compressed packages",
+            "ext-zlib": "To extract gzip or zip compressed packages"
+        },
+        "time": "2017-06-12T11:32:11+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Archive\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Archive Package",
+        "homepage": "https://github.com/joomla-framework/archive",
+        "keywords": [
+            "archive",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/compat",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/compat.git",
+            "reference": "f23565fe0184517778996226eb4b2333deb369c4"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/compat/zipball/f23565fe0184517778996226eb4b2333deb369c4",
+            "reference": "f23565fe0184517778996226eb4b2333deb369c4",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.10"
+        },
+        "time": "2015-02-24T00:21:06+00:00",
+        "type": "joomla-package",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/JsonSerializable.php",
+                "src/CallbackFilterIterator.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Compat Package",
+        "homepage": "https://github.com/joomla-framework/compat",
+        "keywords": [
+            "compat",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/data",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/data.git",
+            "reference": "57ee292ba23307a6a6059e69b7b19ca5b624ab80"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/data/zipball/57ee292ba23307a6a6059e69b7b19ca5b624ab80",
+            "reference": "57ee292ba23307a6a6059e69b7b19ca5b624ab80",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/compat": "~1.0",
+            "joomla/registry": "~1.0",
+            "php": ">=5.3.10|>=7.0"
+        },
+        "require-dev": {
+            "joomla/test": "~1.0",
+            "phpunit/phpunit": "~4.8|~5.0",
+            "squizlabs/php_codesniffer": "1.*"
+        },
+        "time": "2016-04-02T22:20:43+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Data\\": "src/",
+                "Joomla\\Data\\Tests\\": "Tests/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Data Package",
+        "homepage": "https://github.com/joomla-framework/data",
+        "keywords": [
+            "data",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/di",
+        "version": "1.5.1",
+        "version_normalized": "1.5.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/di.git",
+            "reference": "33c66e4091e4433f33ddf4a0ac36604cf3b73c41"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/di/zipball/33c66e4091e4433f33ddf4a0ac36604cf3b73c41",
+            "reference": "33c66e4091e4433f33ddf4a0ac36604cf3b73c41",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3.10|~7.0",
+            "psr/container": "~1.0"
+        },
+        "provide": {
+            "psr/container-implementation": "~1.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
+        },
+        "time": "2018-02-25T16:30:45+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\DI\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla DI Package",
+        "homepage": "https://github.com/joomla-framework/di",
+        "keywords": [
+            "container",
+            "dependency injection",
+            "di",
+            "framework",
+            "ioc",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/event",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/event.git",
+            "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/event/zipball/d8cc2a4757c4556f0ab12e58903e9d168077018b",
+            "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.10|>=7.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.8|~5.0",
+            "squizlabs/php_codesniffer": "1.*"
+        },
+        "time": "2016-03-13T19:41:09+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Event\\": "src/",
+                "Joomla\\Event\\Tests\\": "Tests/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Event Package",
+        "homepage": "https://github.com/joomla-framework/event",
+        "keywords": [
+            "event",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/filesystem",
+        "version": "1.3.1",
+        "version_normalized": "1.3.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/filesystem.git",
+            "reference": "6e2840a82a3958cf8f23ae869e2292d812cfa5d3"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/6e2840a82a3958cf8f23ae869e2292d812cfa5d3",
+            "reference": "6e2840a82a3958cf8f23ae869e2292d812cfa5d3",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "paragonie/random_compat": "~1.0|~2.0",
+            "phpunit/phpunit": "~4.8|~5.0",
+            "squizlabs/php_codesniffer": "1.*"
+        },
+        "suggest": {
+            "paragonie/random_compat": "Required to use Joomla\\Filesystem\\Path::isOwner()"
+        },
+        "time": "2016-12-10T17:45:15+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Filesystem\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Filesystem Package",
+        "homepage": "https://github.com/joomla/joomla-framework-filesystem",
+        "keywords": [
+            "filesystem",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/filter",
+        "version": "1.3.5",
+        "version_normalized": "1.3.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/filter.git",
+            "reference": "ee1d870b5c188056745e1dd3cece21522e2158b8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/filter/zipball/ee1d870b5c188056745e1dd3cece21522e2158b8",
+            "reference": "ee1d870b5c188056745e1dd3cece21522e2158b8",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/string": "~1.3|~2.0",
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "joomla/language": "~1.3",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
+        },
+        "suggest": {
+            "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
+        },
+        "time": "2018-05-26T15:48:53+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Filter\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla Filter Package",
+        "homepage": "https://github.com/joomla-framework/filter",
+        "keywords": [
+            "filter",
+            "framework",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/image",
+        "version": "1.5.0",
+        "version_normalized": "1.5.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/image.git",
+            "reference": "8885c6db5d5b3653ad30d4ad4f73607925a725a5"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/image/zipball/8885c6db5d5b3653ad30d4ad4f73607925a725a5",
+            "reference": "8885c6db5d5b3653ad30d4ad4f73607925a725a5",
+            "shasum": ""
+        },
+        "require": {
+            "ext-gd": "*",
+            "php": "^5.3.10|~7.0",
+            "psr/log": "~1.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "joomla/test": "~1.0",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
+        },
+        "time": "2018-05-25T02:29:30+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Image\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla Image Package",
+        "homepage": "https://github.com/joomla-framework/image",
+        "keywords": [
+            "framework",
+            "image",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/input",
+        "version": "1.3.0",
+        "version_normalized": "1.3.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/input.git",
+            "reference": "17a9bc63a040f547e9eeda91ee391b15e9865815"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/input/zipball/17a9bc63a040f547e9eeda91ee391b15e9865815",
+            "reference": "17a9bc63a040f547e9eeda91ee391b15e9865815",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/filter": "~1.0",
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "joomla/test": "~1.0",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
+        },
+        "time": "2018-06-26T02:10:46+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Input\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla Input Package",
+        "homepage": "https://github.com/joomla-framework/input",
+        "keywords": [
+            "framework",
+            "input",
+            "joomla"
+        ]
+    },
+    {
+        "name": "joomla/ldap",
+        "version": "1.4.0",
+        "version_normalized": "1.4.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/ldap.git",
+            "reference": "ef1010f8f5a13f804589d3fb8a4eddb65472a557"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/ldap/zipball/ef1010f8f5a13f804589d3fb8a4eddb65472a557",
+            "reference": "ef1010f8f5a13f804589d3fb8a4eddb65472a557",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ldap": "*",
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "joomla/registry": "^1.4.5|~2.0",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
+            "symfony/polyfill-php56": "~1.0"
+        },
+        "suggest": {
+            "symfony/polyfill-php56": "If using PHP 5.5 or earlier to use ldap_escape() function"
+        },
+        "time": "2018-05-25T02:30:42+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Ldap\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla LDAP Package",
+        "homepage": "https://github.com/joomla-framework/ldap",
+        "keywords": [
+            "framework",
+            "joomla",
+            "ldap"
+        ]
+    },
+    {
+        "name": "joomla/registry",
+        "version": "1.6.2",
+        "version_normalized": "1.6.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/registry.git",
+            "reference": "182eed3a56b2b7e14cef11fdbc63c253ddcfd924"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/registry/zipball/182eed3a56b2b7e14cef11fdbc63c253ddcfd924",
+            "reference": "182eed3a56b2b7e14cef11fdbc63c253ddcfd924",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/compat": "~1.0",
+            "joomla/utilities": "^1.4.1|~2.0",
+            "php": "^5.3.10|~7.0",
+            "symfony/polyfill-php55": "~1.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "joomla/test": "~1.0",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0",
+            "symfony/yaml": "~2.0|~3.0|~4.0"
+        },
+        "suggest": {
+            "symfony/yaml": "Install symfony/yaml if you require YAML support."
+        },
+        "time": "2018-06-06T16:48:30+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Registry\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla Registry Package",
+        "homepage": "https://github.com/joomla-framework/registry",
+        "keywords": [
+            "framework",
+            "joomla",
+            "registry"
+        ]
+    },
+    {
+        "name": "joomla/session",
+        "version": "1.3.3",
+        "version_normalized": "1.3.3.0",
+        "target-dir": "Joomla/Session",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/session.git",
+            "reference": "1fb5df818998305fa5d4eaf18e530a388e69edc0"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/session/zipball/1fb5df818998305fa5d4eaf18e530a388e69edc0",
+            "reference": "1fb5df818998305fa5d4eaf18e530a388e69edc0",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/event": "~1.1",
+            "joomla/filter": "~1.0",
+            "paragonie/random_compat": "~1.0|~2.0",
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/database": "~1.0",
+            "joomla/test": "~1.0",
+            "phpunit/dbunit": "~1.3",
+            "phpunit/phpunit": "~4.8|~5.0",
+            "squizlabs/php_codesniffer": "1.*"
+        },
+        "suggest": {
+            "joomla/database": "Install joomla/database if you want to use Database session storage."
+        },
+        "time": "2016-12-21T21:08:20+00:00",
+        "type": "joomla-package",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Joomla\\Session": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Session Package",
+        "homepage": "https://github.com/joomla-framework/session",
+        "keywords": [
+            "framework",
+            "joomla",
+            "session"
+        ]
+    },
+    {
+        "name": "joomla/string",
+        "version": "1.4.1",
+        "version_normalized": "1.4.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/string.git",
+            "reference": "66363d317e6c020f30a70265c129281c77c43ca0"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/string/zipball/66363d317e6c020f30a70265c129281c77c43ca0",
+            "reference": "66363d317e6c020f30a70265c129281c77c43ca0",
+            "shasum": ""
+        },
+        "require": {
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/test": "~1.0",
+            "phpunit/phpunit": "~4.8|~5.0",
+            "squizlabs/php_codesniffer": "1.*"
+        },
+        "suggest": {
+            "ext-mbstring": "For improved processing"
+        },
+        "time": "2016-12-10T18:13:42+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\String\\": "src/"
+            },
+            "files": [
+                "src/phputf8/utf8.php",
+                "src/phputf8/ord.php",
+                "src/phputf8/str_ireplace.php",
+                "src/phputf8/str_pad.php",
+                "src/phputf8/str_split.php",
+                "src/phputf8/strcasecmp.php",
+                "src/phputf8/strcspn.php",
+                "src/phputf8/stristr.php",
+                "src/phputf8/strrev.php",
+                "src/phputf8/strspn.php",
+                "src/phputf8/trim.php",
+                "src/phputf8/ucfirst.php",
+                "src/phputf8/ucwords.php",
+                "src/phputf8/utils/ascii.php",
+                "src/phputf8/utils/validation.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla String Package",
+        "homepage": "https://github.com/joomla-framework/string",
+        "keywords": [
+            "framework",
+            "joomla",
+            "string"
+        ]
+    },
+    {
+        "name": "joomla/uri",
+        "version": "1.1.1",
+        "version_normalized": "1.1.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/uri.git",
+            "reference": "980e532e4235bb8f1ada15b28822abbeb171da3f"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/uri/zipball/980e532e4235bb8f1ada15b28822abbeb171da3f",
+            "reference": "980e532e4235bb8f1ada15b28822abbeb171da3f",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.10"
+        },
+        "time": "2014-02-09T02:57:17+00:00",
+        "type": "joomla-package",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Uri\\": "src/",
+                "Joomla\\Uri\\Tests\\": "Tests/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "description": "Joomla Uri Package",
+        "homepage": "https://github.com/joomla-framework/uri",
+        "keywords": [
+            "framework",
+            "joomla",
+            "uri"
+        ]
+    },
+    {
+        "name": "joomla/utilities",
+        "version": "1.5.0",
+        "version_normalized": "1.5.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/joomla-framework/utilities.git",
+            "reference": "7407add476590c1a8e68d804d50b8911aaa26bcd"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/7407add476590c1a8e68d804d50b8911aaa26bcd",
+            "reference": "7407add476590c1a8e68d804d50b8911aaa26bcd",
+            "shasum": ""
+        },
+        "require": {
+            "joomla/string": "~1.3|~2.0",
+            "php": "^5.3.10|~7.0"
+        },
+        "require-dev": {
+            "joomla/coding-standards": "~2.0@alpha",
+            "phpunit/phpunit": "^4.8.35|^5.4.3|~6.0"
+        },
+        "time": "2018-03-15T00:42:47+00:00",
+        "type": "joomla-package",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Joomla\\Utilities\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-2.0-or-later"
+        ],
+        "description": "Joomla Utilities Package",
+        "homepage": "https://github.com/joomla-framework/utilities",
+        "keywords": [
+            "framework",
+            "joomla",
+            "utilities"
+        ]
+    },
+    {
+        "name": "leafo/lessphp",
+        "version": "v0.5.0",
+        "version_normalized": "0.5.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/leafo/lessphp.git",
+            "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/leafo/lessphp/zipball/0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+            "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283",
+            "shasum": ""
+        },
+        "time": "2014-11-24T18:39:20+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "0.4.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "lessc.inc.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT",
+            "GPL-3.0"
+        ],
+        "authors": [
+            {
+                "name": "Leaf Corcoran",
+                "email": "leafot@gmail.com",
+                "homepage": "http://leafo.net"
+            }
+        ],
+        "description": "lessphp is a compiler for LESS written in PHP.",
+        "homepage": "http://leafo.net/lessphp/"
+    },
+    {
+        "name": "paragonie/random_compat",
+        "version": "v1.4.3",
+        "version_normalized": "1.4.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/paragonie/random_compat.git",
+            "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/paragonie/random_compat/zipball/9b3899e3c3ddde89016f576edb8c489708ad64cd",
+            "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "4.*|5.*"
+        },
+        "suggest": {
+            "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+        },
+        "time": "2018-04-04T21:48:54+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/random.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Paragon Initiative Enterprises",
+                "email": "security@paragonie.com",
+                "homepage": "https://paragonie.com"
+            }
+        ],
+        "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+        "keywords": [
+            "csprng",
+            "pseudorandom",
+            "random"
+        ]
+    },
+    {
+        "name": "paragonie/sodium_compat",
+        "version": "v1.6.2",
+        "version_normalized": "1.6.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/paragonie/sodium_compat.git",
+            "reference": "22f564d068c093c3775552c700553209f9af60f8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/22f564d068c093c3775552c700553209f9af60f8",
+            "reference": "22f564d068c093c3775552c700553209f9af60f8",
+            "shasum": ""
+        },
+        "require": {
+            "paragonie/random_compat": "^1|^2",
+            "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^3|^4|^5"
+        },
+        "suggest": {
+            "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+            "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+        },
+        "time": "2018-05-22T20:15:01+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "autoload.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "ISC"
+        ],
+        "authors": [
+            {
+                "name": "Paragon Initiative Enterprises",
+                "email": "security@paragonie.com"
+            },
+            {
+                "name": "Frank Denis",
+                "email": "jedisct1@pureftpd.org"
+            }
+        ],
+        "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+        "keywords": [
+            "Authentication",
+            "BLAKE2b",
+            "ChaCha20",
+            "ChaCha20-Poly1305",
+            "Chapoly",
+            "Curve25519",
+            "Ed25519",
+            "EdDSA",
+            "Edwards-curve Digital Signature Algorithm",
+            "Elliptic Curve Diffie-Hellman",
+            "Poly1305",
+            "Pure-PHP cryptography",
+            "RFC 7748",
+            "RFC 8032",
+            "Salpoly",
+            "Salsa20",
+            "X25519",
+            "XChaCha20-Poly1305",
+            "XSalsa20-Poly1305",
+            "Xchacha20",
+            "Xsalsa20",
+            "aead",
+            "cryptography",
+            "ecdh",
+            "elliptic curve",
+            "elliptic curve cryptography",
+            "encryption",
+            "libsodium",
+            "php",
+            "public-key cryptography",
+            "secret-key cryptography",
+            "side-channel resistant"
+        ]
+    },
+    {
+        "name": "phpmailer/phpmailer",
+        "version": "v5.2.26",
+        "version_normalized": "5.2.26.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/PHPMailer/PHPMailer.git",
+            "reference": "70362997bda4376378be7d92d81e2200550923f7"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/70362997bda4376378be7d92d81e2200550923f7",
+            "reference": "70362997bda4376378be7d92d81e2200550923f7",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "php": ">=5.0.0"
+        },
+        "require-dev": {
+            "doctrine/annotations": "1.2.*",
+            "jms/serializer": "0.16.*",
+            "phpdocumentor/phpdocumentor": "2.*",
+            "phpunit/phpunit": "4.8.*",
+            "symfony/debug": "2.8.*",
+            "symfony/filesystem": "2.8.*",
+            "symfony/translation": "2.8.*",
+            "symfony/yaml": "2.8.*",
+            "zendframework/zend-cache": "2.5.1",
+            "zendframework/zend-config": "2.5.1",
+            "zendframework/zend-eventmanager": "2.5.1",
+            "zendframework/zend-filter": "2.5.1",
+            "zendframework/zend-i18n": "2.5.1",
+            "zendframework/zend-json": "2.5.1",
+            "zendframework/zend-math": "2.5.1",
+            "zendframework/zend-serializer": "2.5.*",
+            "zendframework/zend-servicemanager": "2.5.*",
+            "zendframework/zend-stdlib": "2.5.1"
+        },
+        "suggest": {
+            "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
+        },
+        "time": "2017-11-04T09:26:05+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "class.phpmailer.php",
+                "class.phpmaileroauth.php",
+                "class.phpmaileroauthgoogle.php",
+                "class.smtp.php",
+                "class.pop3.php",
+                "extras/EasyPeasyICS.php",
+                "extras/ntlm_sasl_client.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "LGPL-2.1"
+        ],
+        "authors": [
+            {
+                "name": "Jim Jagielski",
+                "email": "jimjag@gmail.com"
+            },
+            {
+                "name": "Marcus Bointon",
+                "email": "phpmailer@synchromedia.co.uk"
+            },
+            {
+                "name": "Andy Prevost",
+                "email": "codeworxtech@users.sourceforge.net"
+            },
+            {
+                "name": "Brent R. Matzelle"
+            }
+        ],
+        "description": "PHPMailer is a full-featured email creation and transfer class for PHP"
+    },
+    {
+        "name": "psr/container",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/container.git",
+            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "time": "2017-02-14T16:28:37+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Container\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common Container Interface (PHP FIG PSR-11)",
+        "homepage": "https://github.com/php-fig/container",
+        "keywords": [
+            "PSR-11",
+            "container",
+            "container-interface",
+            "container-interop",
+            "psr"
+        ]
+    },
+    {
+        "name": "psr/log",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "time": "2016-10-10T12:19:37+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Log\\": "Psr/Log/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for logging libraries",
+        "homepage": "https://github.com/php-fig/log",
+        "keywords": [
+            "log",
+            "psr",
+            "psr-3"
+        ]
+    },
+    {
+        "name": "simplepie/simplepie",
+        "version": "1.3.1",
+        "version_normalized": "1.3.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/simplepie/simplepie.git",
+            "reference": "ce53709778bc1e2e4deda1651b66e5081398d5cc"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/simplepie/simplepie/zipball/ce53709778bc1e2e4deda1651b66e5081398d5cc",
+            "reference": "ce53709778bc1e2e4deda1651b66e5081398d5cc",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.0"
+        },
+        "time": "2012-10-30T17:54:03+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "SimplePie": "library"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Ryan Parman",
+                "homepage": "http://ryanparman.com/",
+                "role": "Creator, alumnus developer"
+            },
+            {
+                "name": "Geoffrey Sneddon",
+                "homepage": "http://gsnedders.com/",
+                "role": "Alumnus developer"
+            },
+            {
+                "name": "Ryan McCue",
+                "email": "me@ryanmccue.info",
+                "homepage": "http://ryanmccue.info/",
+                "role": "Developer"
+            }
+        ],
+        "description": "A simple Atom/RSS parsing library for PHP",
+        "homepage": "http://simplepie.org/",
+        "keywords": [
+            "atom",
+            "feeds",
+            "rss"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-ctype",
+        "version": "v1.8.0",
+        "version_normalized": "1.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-ctype.git",
+            "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+            "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2018-04-30T19:57:29+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Ctype\\": ""
+            },
+            "files": [
+                "bootstrap.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            },
+            {
+                "name": "Gert de Pagter",
+                "email": "BackEndTea@gmail.com"
+            }
+        ],
+        "description": "Symfony polyfill for ctype functions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "ctype",
+            "polyfill",
+            "portable"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-php55",
+        "version": "v1.8.0",
+        "version_normalized": "1.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php55.git",
+            "reference": "a39456128377a85f2c5707fcae458678560cba46"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/a39456128377a85f2c5707fcae458678560cba46",
+            "reference": "a39456128377a85f2c5707fcae458678560cba46",
+            "shasum": ""
+        },
+        "require": {
+            "ircmaxell/password-compat": "~1.0",
+            "php": ">=5.3.3"
+        },
+        "time": "2018-04-26T10:06:28+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Php55\\": ""
+            },
+            "files": [
+                "bootstrap.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-php56",
+        "version": "v1.8.0",
+        "version_normalized": "1.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php56.git",
+            "reference": "af98553c84912459db3f636329567809d639a8f6"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/af98553c84912459db3f636329567809d639a8f6",
+            "reference": "af98553c84912459db3f636329567809d639a8f6",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "symfony/polyfill-util": "~1.0"
+        },
+        "time": "2018-04-26T10:06:28+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Php56\\": ""
+            },
+            "files": [
+                "bootstrap.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-php73",
+        "version": "v1.8.0",
+        "version_normalized": "1.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-php73.git",
+            "reference": "9841f6fc047725a8286ea986018355bbc9200383"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9841f6fc047725a8286ea986018355bbc9200383",
+            "reference": "9841f6fc047725a8286ea986018355bbc9200383",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2018-04-26T06:22:38+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Php73\\": ""
+            },
+            "files": [
+                "bootstrap.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
+        ]
+    },
+    {
+        "name": "symfony/polyfill-util",
+        "version": "v1.8.0",
+        "version_normalized": "1.8.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/polyfill-util.git",
+            "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
+            "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2018-04-26T10:06:28+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Polyfill\\Util\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Nicolas Grekas",
+                "email": "p@tchwork.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony utilities for portability of PHP codes",
+        "homepage": "https://symfony.com",
+        "keywords": [
+            "compat",
+            "compatibility",
+            "polyfill",
+            "shim"
+        ]
+    },
+    {
+        "name": "symfony/yaml",
+        "version": "v2.8.41",
+        "version_normalized": "2.8.41.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/yaml.git",
+            "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/yaml/zipball/51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
+            "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/polyfill-ctype": "~1.8"
+        },
+        "time": "2018-05-01T22:52:40+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.8-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Yaml\\": ""
+            },
+            "exclude-from-classmap": [
+                "/Tests/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Yaml Component",
+        "homepage": "https://symfony.com"
+    }
+]
diff --git a/core/libraries/vendor/ircmaxell/password-compat/LICENSE.md b/core/libraries/vendor/ircmaxell/password-compat/LICENSE.md
new file mode 100644
index 00000000..1efc565f
--- /dev/null
+++ b/core/libraries/vendor/ircmaxell/password-compat/LICENSE.md
@@ -0,0 +1,7 @@
+Copyright (c) 2012 Anthony Ferrara
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/core/libraries/vendor/ircmaxell/password-compat/lib/password.php b/core/libraries/vendor/ircmaxell/password-compat/lib/password.php
new file mode 100644
index 00000000..cc6896c1
--- /dev/null
+++ b/core/libraries/vendor/ircmaxell/password-compat/lib/password.php
@@ -0,0 +1,314 @@
+<?php
+/**
+ * A Compatibility library with PHP 5.5's simplified password hashing API.
+ *
+ * @author Anthony Ferrara <ircmaxell@php.net>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @copyright 2012 The Authors
+ */
+
+namespace {
+
+    if (!defined('PASSWORD_BCRYPT')) {
+        /**
+         * PHPUnit Process isolation caches constants, but not function declarations.
+         * So we need to check if the constants are defined separately from 
+         * the functions to enable supporting process isolation in userland
+         * code.
+         */
+        define('PASSWORD_BCRYPT', 1);
+        define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
+        define('PASSWORD_BCRYPT_DEFAULT_COST', 10);
+    }
+
+    if (!function_exists('password_hash')) {
+
+        /**
+         * Hash the password using the specified algorithm
+         *
+         * @param string $password The password to hash
+         * @param int    $algo     The algorithm to use (Defined by PASSWORD_* constants)
+         * @param array  $options  The options for the algorithm to use
+         *
+         * @return string|false The hashed password, or false on error.
+         */
+        function password_hash($password, $algo, array $options = array()) {
+            if (!function_exists('crypt')) {
+                trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING);
+                return null;
+            }
+            if (is_null($password) || is_int($password)) {
+                $password = (string) $password;
+            }
+            if (!is_string($password)) {
+                trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
+                return null;
+            }
+            if (!is_int($algo)) {
+                trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+                return null;
+            }
+            $resultLength = 0;
+            switch ($algo) {
+                case PASSWORD_BCRYPT:
+                    $cost = PASSWORD_BCRYPT_DEFAULT_COST;
+                    if (isset($options['cost'])) {
+                        $cost = $options['cost'];
+                        if ($cost < 4 || $cost > 31) {
+                            trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
+                            return null;
+                        }
+                    }
+                    // The length of salt to generate
+                    $raw_salt_len = 16;
+                    // The length required in the final serialization
+                    $required_salt_len = 22;
+                    $hash_format = sprintf("$2y$%02d$", $cost);
+                    // The expected length of the final crypt() output
+                    $resultLength = 60;
+                    break;
+                default:
+                    trigger_error(sprintf("password_hash(): Unknown password hashing algorithm: %s", $algo), E_USER_WARNING);
+                    return null;
+            }
+            $salt_requires_encoding = false;
+            if (isset($options['salt'])) {
+                switch (gettype($options['salt'])) {
+                    case 'NULL':
+                    case 'boolean':
+                    case 'integer':
+                    case 'double':
+                    case 'string':
+                        $salt = (string) $options['salt'];
+                        break;
+                    case 'object':
+                        if (method_exists($options['salt'], '__tostring')) {
+                            $salt = (string) $options['salt'];
+                            break;
+                        }
+                    case 'array':
+                    case 'resource':
+                    default:
+                        trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
+                        return null;
+                }
+                if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
+                    trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
+                    return null;
+                } elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt)) {
+                    $salt_requires_encoding = true;
+                }
+            } else {
+                $buffer = '';
+                $buffer_valid = false;
+                if (function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
+                    $buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
+                    if ($buffer) {
+                        $buffer_valid = true;
+                    }
+                }
+                if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
+                    $buffer = openssl_random_pseudo_bytes($raw_salt_len);
+                    if ($buffer) {
+                        $buffer_valid = true;
+                    }
+                }
+                if (!$buffer_valid && @is_readable('/dev/urandom')) {
+                    $f = fopen('/dev/urandom', 'r');
+                    $read = PasswordCompat\binary\_strlen($buffer);
+                    while ($read < $raw_salt_len) {
+                        $buffer .= fread($f, $raw_salt_len - $read);
+                        $read = PasswordCompat\binary\_strlen($buffer);
+                    }
+                    fclose($f);
+                    if ($read >= $raw_salt_len) {
+                        $buffer_valid = true;
+                    }
+                }
+                if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
+                    $bl = PasswordCompat\binary\_strlen($buffer);
+                    for ($i = 0; $i < $raw_salt_len; $i++) {
+                        if ($i < $bl) {
+                            $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
+                        } else {
+                            $buffer .= chr(mt_rand(0, 255));
+                        }
+                    }
+                }
+                $salt = $buffer;
+                $salt_requires_encoding = true;
+            }
+            if ($salt_requires_encoding) {
+                // encode string with the Base64 variant used by crypt
+                $base64_digits =
+                    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+                $bcrypt64_digits =
+                    './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+                $base64_string = base64_encode($salt);
+                $salt = strtr(rtrim($base64_string, '='), $base64_digits, $bcrypt64_digits);
+            }
+            $salt = PasswordCompat\binary\_substr($salt, 0, $required_salt_len);
+
+            $hash = $hash_format . $salt;
+
+            $ret = crypt($password, $hash);
+
+            if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength) {
+                return false;
+            }
+
+            return $ret;
+        }
+
+        /**
+         * Get information about the password hash. Returns an array of the information
+         * that was used to generate the password hash.
+         *
+         * array(
+         *    'algo' => 1,
+         *    'algoName' => 'bcrypt',
+         *    'options' => array(
+         *        'cost' => PASSWORD_BCRYPT_DEFAULT_COST,
+         *    ),
+         * )
+         *
+         * @param string $hash The password hash to extract info from
+         *
+         * @return array The array of information about the hash.
+         */
+        function password_get_info($hash) {
+            $return = array(
+                'algo' => 0,
+                'algoName' => 'unknown',
+                'options' => array(),
+            );
+            if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60) {
+                $return['algo'] = PASSWORD_BCRYPT;
+                $return['algoName'] = 'bcrypt';
+                list($cost) = sscanf($hash, "$2y$%d$");
+                $return['options']['cost'] = $cost;
+            }
+            return $return;
+        }
+
+        /**
+         * Determine if the password hash needs to be rehashed according to the options provided
+         *
+         * If the answer is true, after validating the password using password_verify, rehash it.
+         *
+         * @param string $hash    The hash to test
+         * @param int    $algo    The algorithm used for new password hashes
+         * @param array  $options The options array passed to password_hash
+         *
+         * @return boolean True if the password needs to be rehashed.
+         */
+        function password_needs_rehash($hash, $algo, array $options = array()) {
+            $info = password_get_info($hash);
+            if ($info['algo'] != $algo) {
+                return true;
+            }
+            switch ($algo) {
+                case PASSWORD_BCRYPT:
+                    $cost = isset($options['cost']) ? $options['cost'] : PASSWORD_BCRYPT_DEFAULT_COST;
+                    if ($cost != $info['options']['cost']) {
+                        return true;
+                    }
+                    break;
+            }
+            return false;
+        }
+
+        /**
+         * Verify a password against a hash using a timing attack resistant approach
+         *
+         * @param string $password The password to verify
+         * @param string $hash     The hash to verify against
+         *
+         * @return boolean If the password matches the hash
+         */
+        function password_verify($password, $hash) {
+            if (!function_exists('crypt')) {
+                trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING);
+                return false;
+            }
+            $ret = crypt($password, $hash);
+            if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) {
+                return false;
+            }
+
+            $status = 0;
+            for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
+                $status |= (ord($ret[$i]) ^ ord($hash[$i]));
+            }
+
+            return $status === 0;
+        }
+    }
+
+}
+
+namespace PasswordCompat\binary {
+
+    if (!function_exists('PasswordCompat\\binary\\_strlen')) {
+
+        /**
+         * Count the number of bytes in a string
+         *
+         * We cannot simply use strlen() for this, because it might be overwritten by the mbstring extension.
+         * In this case, strlen() will count the number of *characters* based on the internal encoding. A
+         * sequence of bytes might be regarded as a single multibyte character.
+         *
+         * @param string $binary_string The input string
+         *
+         * @internal
+         * @return int The number of bytes
+         */
+        function _strlen($binary_string) {
+            if (function_exists('mb_strlen')) {
+                return mb_strlen($binary_string, '8bit');
+            }
+            return strlen($binary_string);
+        }
+
+        /**
+         * Get a substring based on byte limits
+         *
+         * @see _strlen()
+         *
+         * @param string $binary_string The input string
+         * @param int    $start
+         * @param int    $length
+         *
+         * @internal
+         * @return string The substring
+         */
+        function _substr($binary_string, $start, $length) {
+            if (function_exists('mb_substr')) {
+                return mb_substr($binary_string, $start, $length, '8bit');
+            }
+            return substr($binary_string, $start, $length);
+        }
+
+        /**
+         * Check if current PHP version is compatible with the library
+         *
+         * @return boolean the check result
+         */
+        function check() {
+            static $pass = NULL;
+
+            if (is_null($pass)) {
+                if (function_exists('crypt')) {
+                    $hash = '$2y$04$usesomesillystringfore7hnbRJHxXVLeakoG8K30oukPsA.ztMG';
+                    $test = crypt("password", $hash);
+                    $pass = $test == $hash;
+                } else {
+                    $pass = false;
+                }
+            }
+            return $pass;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/core/libraries/vendor/joomla/application/LICENSE b/core/libraries/vendor/joomla/application/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/application/src/AbstractApplication.php b/core/libraries/vendor/joomla/application/src/AbstractApplication.php
new file mode 100644
index 00000000..7eef7610
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/AbstractApplication.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application;
+
+use Joomla\Input\Input;
+use Joomla\Registry\Registry;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
+/**
+ * Joomla Framework Base Application Class
+ *
+ * @since  1.0
+ */
+abstract class AbstractApplication implements LoggerAwareInterface
+{
+	/**
+	 * The application configuration object.
+	 *
+	 * @var    Registry
+	 * @since  1.0
+	 */
+	protected $config;
+
+	/**
+	 * The application input object.
+	 *
+	 * @var    Input
+	 * @since  1.0
+	 */
+	public $input = null;
+
+	/**
+	 * A logger.
+	 *
+	 * @var    LoggerInterface
+	 * @since  1.0
+	 */
+	private $logger;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input     $input   An optional argument to provide dependency injection for the application's input object.  If the argument is an
+	 *                             Input object that object will become the application's input object, otherwise a default input object is created.
+	 * @param   Registry  $config  An optional argument to provide dependency injection for the application's config object.  If the argument
+	 *                             is a Registry object that object will become the application's config object, otherwise a default config
+	 *                             object is created.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(Input $input = null, Registry $config = null)
+	{
+		$this->input = $input instanceof Input ? $input : new Input;
+		$this->config = $config instanceof Registry ? $config : new Registry;
+
+		// Set the execution datetime and timestamp;
+		$this->set('execution.datetime', gmdate('Y-m-d H:i:s'));
+		$this->set('execution.timestamp', time());
+		$this->set('execution.microtimestamp', microtime(true));
+
+		$this->initialise();
+	}
+
+	/**
+	 * Method to close the application.
+	 *
+	 * @param   integer  $code  The exit code (optional; default is 0).
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	public function close($code = 0)
+	{
+		exit($code);
+	}
+
+	/**
+	 * Method to run the application routines.  Most likely you will want to instantiate a controller
+	 * and execute it, or perform some sort of task directly.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	abstract protected function doExecute();
+
+	/**
+	 * Execute the application.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute()
+	{
+		// @event onBeforeExecute
+
+		// Perform application routines.
+		$this->doExecute();
+
+		// @event onAfterExecute
+	}
+
+	/**
+	 * Returns a property of the object or the default value if the property is not set.
+	 *
+	 * @param   string  $key      The name of the property.
+	 * @param   mixed   $default  The default value (optional) if none is set.
+	 *
+	 * @return  mixed   The value of the configuration.
+	 *
+	 * @since   1.0
+	 */
+	public function get($key, $default = null)
+	{
+		return $this->config->get($key, $default);
+	}
+
+	/**
+	 * Get the logger.
+	 *
+	 * @return  LoggerInterface
+	 *
+	 * @since   1.0
+	 */
+	public function getLogger()
+	{
+		// If a logger hasn't been set, use NullLogger
+		if (! ($this->logger instanceof LoggerInterface))
+		{
+			$this->logger = new NullLogger;
+		}
+
+		return $this->logger;
+	}
+
+	/**
+	 * Custom initialisation method.
+	 *
+	 * Called at the end of the AbstractApplication::__construct method.
+	 * This is for developers to inject initialisation code for their application classes.
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	protected function initialise()
+	{
+	}
+
+	/**
+	 * Modifies a property of the object, creating it if it does not already exist.
+	 *
+	 * @param   string  $key    The name of the property.
+	 * @param   mixed   $value  The value of the property to set (optional).
+	 *
+	 * @return  mixed   Previous value of the property
+	 *
+	 * @since   1.0
+	 */
+	public function set($key, $value = null)
+	{
+		$previous = $this->config->get($key);
+		$this->config->set($key, $value);
+
+		return $previous;
+	}
+
+	/**
+	 * Sets the configuration for the application.
+	 *
+	 * @param   Registry  $config  A registry object holding the configuration.
+	 *
+	 * @return  AbstractApplication  Returns itself to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setConfiguration(Registry $config)
+	{
+		$this->config = $config;
+
+		return $this;
+	}
+
+	/**
+	 * Set the logger.
+	 *
+	 * @param   LoggerInterface  $logger  The logger.
+	 *
+	 * @return  AbstractApplication  Returns itself to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setLogger(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/AbstractCliApplication.php b/core/libraries/vendor/joomla/application/src/AbstractCliApplication.php
new file mode 100644
index 00000000..04998c7f
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/AbstractCliApplication.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application;
+
+use Joomla\Input;
+use Joomla\Registry\Registry;
+
+/**
+ * Base class for a Joomla! command line application.
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+abstract class AbstractCliApplication extends AbstractApplication
+{
+	/**
+	 * Output object
+	 *
+	 * @var    Cli\CliOutput
+	 * @since  1.0
+	 */
+	protected $output;
+
+	/**
+	 * CLI Input object
+	 *
+	 * @var    Cli\CliInput
+	 * @since  1.6.0
+	 */
+	protected $cliInput;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input\Cli      $input     An optional argument to provide dependency injection for the application's input object.  If the
+	 *                                    argument is an Input\Cli object that object will become the application's input object, otherwise
+	 *                                    a default input object is created.
+	 * @param   Registry       $config    An optional argument to provide dependency injection for the application's config object.  If the
+	 *                                    argument is a Registry object that object will become the application's config object, otherwise
+	 *                                    a default config object is created.
+	 * @param   Cli\CliOutput  $output    An optional argument to provide dependency injection for the application's output object.  If the
+	 *                                    argument is a Cli\CliOutput object that object will become the application's input object, otherwise
+	 *                                    a default output object is created.
+	 * @param   Cli\CliInput   $cliInput  An optional argument to provide dependency injection for the application's CLI input object.  If the
+	 *                                    argument is a Cli\CliInput object that object will become the application's input object, otherwise
+	 *                                    a default input object is created.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(Input\Cli $input = null, Registry $config = null, Cli\CliOutput $output = null, Cli\CliInput $cliInput = null)
+	{
+		// Close the application if we are not executed from the command line.
+		// @codeCoverageIgnoreStart
+		if (!defined('STDOUT') || !defined('STDIN') || !isset($_SERVER['argv']))
+		{
+			$this->close();
+		}
+
+		// @codeCoverageIgnoreEnd
+
+		$this->output = ($output instanceof Cli\CliOutput) ? $output : new Cli\Output\Stdout;
+
+		// Set the CLI input object.
+		$this->cliInput = ($cliInput instanceof Cli\CliInput) ? $cliInput : new Cli\CliInput;
+
+		// Call the constructor as late as possible (it runs `initialise`).
+		parent::__construct($input instanceof Input\Input ? $input : new Input\Cli, $config);
+
+		// Set the current directory.
+		$this->set('cwd', getcwd());
+	}
+
+	/**
+	 * Get an output object.
+	 *
+	 * @return  Cli\CliOutput
+	 *
+	 * @since   1.0
+	 */
+	public function getOutput()
+	{
+		return $this->output;
+	}
+
+	/**
+	 * Get a CLI input object.
+	 *
+	 * @return  Cli\CliInput
+	 *
+	 * @since   1.6.0
+	 */
+	public function getCliInput()
+	{
+		return $this->cliInput;
+	}
+
+	/**
+	 * Write a string to standard output.
+	 *
+	 * @param   string   $text  The text to display.
+	 * @param   boolean  $nl    True (default) to append a new line at the end of the output string.
+	 *
+	 * @return  AbstractCliApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function out($text = '', $nl = true)
+	{
+		$this->getOutput()->out($text, $nl);
+
+		return $this;
+	}
+
+	/**
+	 * Get a value from standard input.
+	 *
+	 * @return  string  The input string from standard input.
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	public function in()
+	{
+		return $this->getCliInput()->in();
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/AbstractDaemonApplication.php b/core/libraries/vendor/joomla/application/src/AbstractDaemonApplication.php
new file mode 100644
index 00000000..d09ec74d
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/AbstractDaemonApplication.php
@@ -0,0 +1,926 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application;
+
+use Joomla\Input;
+use Joomla\Registry\Registry;
+use Psr\Log\LoggerAwareInterface;
+
+/**
+ * Class to turn Cli applications into daemons.  It requires CLI and PCNTL support built into PHP.
+ *
+ * @link        https://secure.php.net/manual/en/book.pcntl.php
+ * @link        https://secure.php.net/manual/en/features.commandline.php
+ * @since       1.0
+ * @deprecated  2.0  Deprecated without replacement
+ */
+abstract class AbstractDaemonApplication extends AbstractCliApplication implements LoggerAwareInterface
+{
+	/**
+	 * @var    array  The available POSIX signals to be caught by default.
+	 * @link   https://secure.php.net/manual/pcntl.constants.php
+	 * @since  1.0
+	 */
+	protected static $signals = array(
+		'SIGHUP',
+		'SIGINT',
+		'SIGQUIT',
+		'SIGILL',
+		'SIGTRAP',
+		'SIGABRT',
+		'SIGIOT',
+		'SIGBUS',
+		'SIGFPE',
+		'SIGUSR1',
+		'SIGSEGV',
+		'SIGUSR2',
+		'SIGPIPE',
+		'SIGALRM',
+		'SIGTERM',
+		'SIGSTKFLT',
+		'SIGCLD',
+		'SIGCHLD',
+		'SIGCONT',
+		'SIGTSTP',
+		'SIGTTIN',
+		'SIGTTOU',
+		'SIGURG',
+		'SIGXCPU',
+		'SIGXFSZ',
+		'SIGVTALRM',
+		'SIGPROF',
+		'SIGWINCH',
+		'SIGPOLL',
+		'SIGIO',
+		'SIGPWR',
+		'SIGSYS',
+		'SIGBABY',
+		'SIG_BLOCK',
+		'SIG_UNBLOCK',
+		'SIG_SETMASK'
+	);
+
+	/**
+	 * @var    boolean  True if the daemon is in the process of exiting.
+	 * @since  1.0
+	 */
+	protected $exiting = false;
+
+	/**
+	 * @var    integer  The parent process id.
+	 * @since  1.0
+	 */
+	protected $parentId = 0;
+
+	/**
+	 * @var    integer  The process id of the daemon.
+	 * @since  1.0
+	 */
+	protected $processId = 0;
+
+	/**
+	 * @var    boolean  True if the daemon is currently running.
+	 * @since  1.0
+	 */
+	protected $running = false;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input\Cli      $input     An optional argument to provide dependency injection for the application's input object.  If the
+	 *                                    argument is an Input\Cli object that object will become the application's input object, otherwise
+	 *                                    a default input object is created.
+	 * @param   Registry       $config    An optional argument to provide dependency injection for the application's config object.  If the
+	 *                                    argument is a Registry object that object will become the application's config object, otherwise
+	 *                                    a default config object is created.
+	 * @param   Cli\CliOutput  $output    An optional argument to provide dependency injection for the application's output object.  If the
+	 *                                    argument is a Cli\CliOutput object that object will become the application's input object, otherwise
+	 *                                    a default output object is created.
+	 * @param   Cli\CliInput   $cliInput  An optional argument to provide dependency injection for the application's CLI input object.  If the
+	 *                                    argument is a Cli\CliInput object that object will become the application's input object, otherwise
+	 *                                    a default input object is created.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(Cli $input = null, Registry $config = null, Cli\CliOutput $output = null, Cli\CliInput $cliInput = null)
+	{
+		// Verify that the process control extension for PHP is available.
+		// @codeCoverageIgnoreStart
+		if (!defined('SIGHUP'))
+		{
+			$this->getLogger()->error('The PCNTL extension for PHP is not available.');
+
+			throw new \RuntimeException('The PCNTL extension for PHP is not available.');
+		}
+
+		// Verify that POSIX support for PHP is available.
+		if (!function_exists('posix_getpid'))
+		{
+			$this->getLogger()->error('The POSIX extension for PHP is not available.');
+
+			throw new \RuntimeException('The POSIX extension for PHP is not available.');
+		}
+
+		// @codeCoverageIgnoreEnd
+
+		// Call the parent constructor.
+		parent::__construct($input, $config, $output, $cliInput);
+
+		// Set some system limits.
+		@set_time_limit($this->get('max_execution_time', 0));
+
+		if ($this->get('max_memory_limit') !== null)
+		{
+			ini_set('memory_limit', $this->get('max_memory_limit', '256M'));
+		}
+
+		// Flush content immediately.
+		ob_implicit_flush();
+	}
+
+	/**
+	 * Method to handle POSIX signals.
+	 *
+	 * @param   integer  $signal  The received POSIX signal.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @see     pcntl_signal()
+	 * @throws  \RuntimeException
+	 */
+	public function signal($signal)
+	{
+		// Log all signals sent to the daemon.
+		$this->getLogger()->debug('Received signal: ' . $signal);
+
+		// Let's make sure we have an application instance.
+		if (!is_subclass_of($this, __CLASS__))
+		{
+			$this->getLogger()->emergency('Cannot find the application instance.');
+
+			throw new \RuntimeException('Cannot find the application instance.');
+		}
+
+		// @event onReceiveSignal
+
+		switch ($signal)
+		{
+			case SIGINT:
+			case SIGTERM:
+				// Handle shutdown tasks
+				if ($this->running && $this->isActive())
+				{
+					$this->shutdown();
+				}
+				else
+				{
+					$this->close();
+				}
+
+				break;
+
+			case SIGHUP:
+				// Handle restart tasks
+				if ($this->running && $this->isActive())
+				{
+					$this->shutdown(true);
+				}
+				else
+				{
+					$this->close();
+				}
+
+				break;
+
+			case SIGCHLD:
+				// A child process has died
+				while ($this->pcntlWait($signal, WNOHANG || WUNTRACED) > 0)
+				{
+					usleep(1000);
+				}
+
+				break;
+
+			case SIGCLD:
+				while ($this->pcntlWait($signal, WNOHANG) > 0)
+				{
+					$signal = $this->pcntlChildExitStatus($signal);
+				}
+
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	/**
+	 * Check to see if the daemon is active.  This does not assume that $this daemon is active, but
+	 * only if an instance of the application is active as a daemon.
+	 *
+	 * @return  boolean  True if daemon is active.
+	 *
+	 * @since   1.0
+	 */
+	public function isActive()
+	{
+		// Get the process id file location for the application.
+		$pidFile = $this->get('application_pid_file');
+
+		// If the process id file doesn't exist then the daemon is obviously not running.
+		if (!is_file($pidFile))
+		{
+			return false;
+		}
+
+		// Read the contents of the process id file as an integer.
+		$fp = fopen($pidFile, 'r');
+		$pid = fread($fp, filesize($pidFile));
+		$pid = (int) $pid;
+		fclose($fp);
+
+		// Check to make sure that the process id exists as a positive integer.
+		if (!$pid)
+		{
+			return false;
+		}
+
+		// Check to make sure the process is active by pinging it and ensure it responds.
+		if (!posix_kill($pid, 0))
+		{
+			// No response so remove the process id file and log the situation.
+			@ unlink($pidFile);
+
+			$this->getLogger()->warning('The process found based on PID file was unresponsive.');
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Load an object or array into the application configuration object.
+	 *
+	 * @param   mixed  $data  Either an array or object to be loaded into the configuration object.
+	 *
+	 * @return  AbstractDaemonApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function loadConfiguration($data)
+	{
+		/*
+		 * Setup some application metadata options.  This is useful if we ever want to write out startup scripts
+		 * or just have some sort of information available to share about things.
+		 */
+
+		// The application author name.  This string is used in generating startup scripts and has
+		// a maximum of 50 characters.
+		$tmp = (string) $this->get('author_name', 'Joomla Framework');
+		$this->set('author_name', (strlen($tmp) > 50) ? substr($tmp, 0, 50) : $tmp);
+
+		// The application author email.  This string is used in generating startup scripts.
+		$tmp = (string) $this->get('author_email', 'admin@joomla.org');
+		$this->set('author_email', filter_var($tmp, FILTER_VALIDATE_EMAIL));
+
+		// The application name.  This string is used in generating startup scripts.
+		$tmp = (string) $this->get('application_name', 'JApplicationDaemon');
+		$this->set('application_name', (string) preg_replace('/[^A-Z0-9_-]/i', '', $tmp));
+
+		// The application description.  This string is used in generating startup scripts.
+		$tmp = (string) $this->get('application_description', 'A generic Joomla Framework application.');
+		$this->set('application_description', filter_var($tmp, FILTER_SANITIZE_STRING));
+
+		/*
+		 * Setup the application path options.  This defines the default executable name, executable directory,
+		 * and also the path to the daemon process id file.
+		 */
+
+		// The application executable daemon.  This string is used in generating startup scripts.
+		$tmp = (string) $this->get('application_executable', basename($this->input->executable));
+		$this->set('application_executable', $tmp);
+
+		// The home directory of the daemon.
+		$tmp = (string) $this->get('application_directory', dirname($this->input->executable));
+		$this->set('application_directory', $tmp);
+
+		// The pid file location.  This defaults to a path inside the /tmp directory.
+		$name = $this->get('application_name');
+		$tmp = (string) $this->get('application_pid_file', strtolower('/tmp/' . $name . '/' . $name . '.pid'));
+		$this->set('application_pid_file', $tmp);
+
+		/*
+		 * Setup the application identity options.  It is important to remember if the default of 0 is set for
+		 * either UID or GID then changing that setting will not be attempted as there is no real way to "change"
+		 * the identity of a process from some user to root.
+		 */
+
+		// The user id under which to run the daemon.
+		$tmp = (int) $this->get('application_uid', 0);
+		$options = array('options' => array('min_range' => 0, 'max_range' => 65000));
+		$this->set('application_uid', filter_var($tmp, FILTER_VALIDATE_INT, $options));
+
+		// The group id under which to run the daemon.
+		$tmp = (int) $this->get('application_gid', 0);
+		$options = array('options' => array('min_range' => 0, 'max_range' => 65000));
+		$this->set('application_gid', filter_var($tmp, FILTER_VALIDATE_INT, $options));
+
+		// Option to kill the daemon if it cannot switch to the chosen identity.
+		$tmp = (bool) $this->get('application_require_identity', 1);
+		$this->set('application_require_identity', $tmp);
+
+		/*
+		 * Setup the application runtime options.  By default our execution time limit is infinite obviously
+		 * because a daemon should be constantly running unless told otherwise.  The default limit for memory
+		 * usage is 128M, which admittedly is a little high, but remember it is a "limit" and PHP's memory
+		 * management leaves a bit to be desired :-)
+		 */
+
+		// The maximum execution time of the application in seconds.  Zero is infinite.
+		$tmp = $this->get('max_execution_time');
+
+		if ($tmp !== null)
+		{
+			$this->set('max_execution_time', (int) $tmp);
+		}
+
+		// The maximum amount of memory the application can use.
+		$tmp = $this->get('max_memory_limit', '256M');
+
+		if ($tmp !== null)
+		{
+			$this->set('max_memory_limit', (string) $tmp);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Execute the daemon.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute()
+	{
+		// @event onBeforeExecute
+
+		// Enable basic garbage collection.
+		gc_enable();
+
+		$this->getLogger()->info('Starting ' . $this->name);
+
+		// Set off the process for becoming a daemon.
+		if ($this->daemonize())
+		{
+			// Declare ticks to start signal monitoring. When you declare ticks, PCNTL will monitor
+			// incoming signals after each tick and call the relevant signal handler automatically.
+			declare (ticks = 1);
+
+			// Start the main execution loop.
+			while (true)
+			{
+				// Perform basic garbage collection.
+				$this->gc();
+
+				// Don't completely overload the CPU.
+				usleep(1000);
+
+				// Execute the main application logic.
+				$this->doExecute();
+			}
+		}
+		else
+		// We were not able to daemonize the application so log the failure and die gracefully.
+		{
+			$this->getLogger()->info('Starting ' . $this->name . ' failed');
+		}
+
+		// @event onAfterExecute
+	}
+
+	/**
+	 * Restart daemon process.
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	public function restart()
+	{
+		$this->getLogger()->info('Stopping ' . $this->name);
+
+		$this->shutdown(true);
+	}
+
+	/**
+	 * Stop daemon process.
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	public function stop()
+	{
+		$this->getLogger()->info('Stopping ' . $this->name);
+
+		$this->shutdown();
+	}
+
+	/**
+	 * Method to change the identity of the daemon process and resources.
+	 *
+	 * @return  boolean  True if identity successfully changed
+	 *
+	 * @since   1.0
+	 * @see     posix_setuid()
+	 */
+	protected function changeIdentity()
+	{
+		// Get the group and user ids to set for the daemon.
+		$uid = (int) $this->get('application_uid', 0);
+		$gid = (int) $this->get('application_gid', 0);
+
+		// Get the application process id file path.
+		$file = $this->get('application_pid_file');
+
+		// Change the user id for the process id file if necessary.
+		if ($uid && (fileowner($file) != $uid) && (!@ chown($file, $uid)))
+		{
+			$this->getLogger()->error('Unable to change user ownership of the process id file.');
+
+			return false;
+		}
+
+		// Change the group id for the process id file if necessary.
+		if ($gid && (filegroup($file) != $gid) && (!@ chgrp($file, $gid)))
+		{
+			$this->getLogger()->error('Unable to change group ownership of the process id file.');
+
+			return false;
+		}
+
+		// Set the correct home directory for the process.
+		if ($uid && ($info = posix_getpwuid($uid)) && is_dir($info['dir']))
+		{
+			system('export HOME="' . $info['dir'] . '"');
+		}
+
+		// Change the user id for the process necessary.
+		if ($uid && (posix_getuid($file) != $uid) && (!@ posix_setuid($uid)))
+		{
+			$this->getLogger()->error('Unable to change user ownership of the proccess.');
+
+			return false;
+		}
+
+		// Change the group id for the process necessary.
+		if ($gid && (posix_getgid($file) != $gid) && (!@ posix_setgid($gid)))
+		{
+			$this->getLogger()->error('Unable to change group ownership of the proccess.');
+
+			return false;
+		}
+
+		// Get the user and group information based on uid and gid.
+		$user = posix_getpwuid($uid);
+		$group = posix_getgrgid($gid);
+
+		$this->getLogger()->info('Changed daemon identity to ' . $user['name'] . ':' . $group['name']);
+
+		return true;
+	}
+
+	/**
+	 * Method to put the application into the background.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function daemonize()
+	{
+		// Is there already an active daemon running?
+		if ($this->isActive())
+		{
+			$this->getLogger()->emergency($this->name . ' daemon is still running. Exiting the application.');
+
+			return false;
+		}
+
+		// Reset Process Information
+		$this->safeMode = !!@ ini_get('safe_mode');
+		$this->processId = 0;
+		$this->running = false;
+
+		// Detach process!
+		try
+		{
+			// Check if we should run in the foreground.
+			if (!$this->input->get('f'))
+			{
+				// Detach from the terminal.
+				$this->detach();
+			}
+			else
+			{
+				// Setup running values.
+				$this->exiting = false;
+				$this->running = true;
+
+				// Set the process id.
+				$this->processId = (int) posix_getpid();
+				$this->parentId = $this->processId;
+			}
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->getLogger()->emergency('Unable to fork.');
+
+			return false;
+		}
+
+		// Verify the process id is valid.
+		if ($this->processId < 1)
+		{
+			$this->getLogger()->emergency('The process id is invalid; the fork failed.');
+
+			return false;
+		}
+
+		// Clear the umask.
+		@ umask(0);
+
+		// Write out the process id file for concurrency management.
+		if (!$this->writeProcessIdFile())
+		{
+			$this->getLogger()->emergency('Unable to write the pid file at: ' . $this->get('application_pid_file'));
+
+			return false;
+		}
+
+		// Attempt to change the identity of user running the process.
+		if (!$this->changeIdentity())
+		{
+			// If the identity change was required then we need to return false.
+			if ($this->get('application_require_identity'))
+			{
+				$this->getLogger()->critical('Unable to change process owner.');
+
+				return false;
+			}
+			else
+			{
+				$this->getLogger()->warning('Unable to change process owner.');
+			}
+		}
+
+		// Setup the signal handlers for the daemon.
+		if (!$this->setupSignalHandlers())
+		{
+			return false;
+		}
+
+		// Change the current working directory to the application working directory.
+		@ chdir($this->get('application_directory'));
+
+		return true;
+	}
+
+	/**
+	 * This is truly where the magic happens.  This is where we fork the process and kill the parent
+	 * process, which is essentially what turns the application into a daemon.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function detach()
+	{
+		$this->getLogger()->debug('Detaching the ' . $this->name . ' daemon.');
+
+		// Attempt to fork the process.
+		$pid = $this->fork();
+
+		// If the pid is positive then we successfully forked, and can close this application.
+		if ($pid)
+		{
+			// Add the log entry for debugging purposes and exit gracefully.
+			$this->getLogger()->debug('Ending ' . $this->name . ' parent process');
+
+			$this->close();
+		}
+		else
+		// We are in the forked child process.
+		{
+			// Setup some protected values.
+			$this->exiting = false;
+			$this->running = true;
+
+			// Set the parent to self.
+			$this->parentId = $this->processId;
+		}
+	}
+
+	/**
+	 * Method to fork the process.
+	 *
+	 * @return  integer  The child process id to the parent process, zero to the child process.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function fork()
+	{
+		// Attempt to fork the process.
+		$pid = $this->pcntlFork();
+
+		// If the fork failed, throw an exception.
+		if ($pid === -1)
+		{
+			throw new \RuntimeException('The process could not be forked.');
+		}
+		elseif ($pid === 0)
+		// Update the process id for the child.
+		{
+			$this->processId = (int) posix_getpid();
+		}
+		else
+		// Log the fork in the parent.
+		{
+			// Log the fork.
+			$this->getLogger()->debug('Process forked ' . $pid);
+		}
+
+		// Trigger the onFork event.
+		$this->postFork();
+
+		return $pid;
+	}
+
+	/**
+	 * Method to perform basic garbage collection and memory management in the sense of clearing the
+	 * stat cache.  We will probably call this method pretty regularly in our main loop.
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	protected function gc()
+	{
+		// Perform generic garbage collection.
+		gc_collect_cycles();
+
+		// Clear the stat cache so it doesn't blow up memory.
+		clearstatcache();
+	}
+
+	/**
+	 * Method to attach the AbstractDaemonApplication signal handler to the known signals.  Applications
+	 * can override these handlers by using the pcntl_signal() function and attaching a different
+	 * callback method.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @see     pcntl_signal()
+	 */
+	protected function setupSignalHandlers()
+	{
+		// We add the error suppression for the loop because on some platforms some constants are not defined.
+		foreach (self::$signals as $signal)
+		{
+			// Ignore signals that are not defined.
+			if (!defined($signal) || !is_int(constant($signal)) || (constant($signal) === 0))
+			{
+				// Define the signal to avoid notices.
+				$this->getLogger()->debug('Signal "' . $signal . '" not defined. Defining it as null.');
+
+				define($signal, null);
+
+				// Don't listen for signal.
+				continue;
+			}
+
+			// Attach the signal handler for the signal.
+			if (!$this->pcntlSignal(constant($signal), array($this, 'signal')))
+			{
+				$this->getLogger()->emergency(sprintf('Unable to reroute signal handler: %s', $signal));
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to shut down the daemon and optionally restart it.
+	 *
+	 * @param   boolean  $restart  True to restart the daemon on exit.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function shutdown($restart = false)
+	{
+		// If we are already exiting, chill.
+		if ($this->exiting)
+		{
+			return;
+		}
+		else
+		// If not, now we are.
+		{
+			$this->exiting = true;
+		}
+
+		// If we aren't already daemonized then just kill the application.
+		if (!$this->running && !$this->isActive())
+		{
+			$this->getLogger()->info('Process was not daemonized yet, just halting current process');
+
+			$this->close();
+		}
+
+		// Only read the pid for the parent file.
+		if ($this->parentId == $this->processId)
+		{
+			// Read the contents of the process id file as an integer.
+			$fp = fopen($this->get('application_pid_file'), 'r');
+			$pid = fread($fp, filesize($this->get('application_pid_file')));
+			$pid = (int) $pid;
+			fclose($fp);
+
+			// Remove the process id file.
+			@ unlink($this->get('application_pid_file'));
+
+			// If we are supposed to restart the daemon we need to execute the same command.
+			if ($restart)
+			{
+				$this->close(exec(implode(' ', $GLOBALS['argv']) . ' > /dev/null &'));
+			}
+			else
+			// If we are not supposed to restart the daemon let's just kill -9.
+			{
+				passthru('kill -9 ' . $pid);
+				$this->close();
+			}
+		}
+	}
+
+	/**
+	 * Method to write the process id file out to disk.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	protected function writeProcessIdFile()
+	{
+		// Verify the process id is valid.
+		if ($this->processId < 1)
+		{
+			$this->getLogger()->emergency('The process id is invalid.');
+
+			return false;
+		}
+
+		// Get the application process id file path.
+		$file = $this->get('application_pid_file');
+
+		if (empty($file))
+		{
+			$this->getLogger()->error('The process id file path is empty.');
+
+			return false;
+		}
+
+		// Make sure that the folder where we are writing the process id file exists.
+		$folder = dirname($file);
+
+		if (!is_dir($folder) && !@ mkdir($folder, $this->get('folder_permission', 0755)))
+		{
+			$this->getLogger()->error('Unable to create directory: ' . $folder);
+
+			return false;
+		}
+
+		// Write the process id file out to disk.
+		if (!file_put_contents($file, $this->processId))
+		{
+			$this->getLogger()->error('Unable to write proccess id file: ' . $file);
+
+			return false;
+		}
+
+		// Make sure the permissions for the proccess id file are accurate.
+		if (!chmod($file, $this->get('file_permission', 0644)))
+		{
+			$this->getLogger()->error('Unable to adjust permissions for the proccess id file: ' . $file);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to handle post-fork triggering of the onFork event.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function postFork()
+	{
+		// @event onFork
+	}
+
+	/**
+	 * Method to return the exit code of a terminated child process.
+	 *
+	 * @param   integer  $status  The status parameter is the status parameter supplied to a successful call to pcntl_waitpid().
+	 *
+	 * @return  integer  The child process exit code.
+	 *
+	 * @codeCoverageIgnore
+	 * @see     pcntl_wexitstatus()
+	 * @since   1.0
+	 */
+	protected function pcntlChildExitStatus($status)
+	{
+		return pcntl_wexitstatus($status);
+	}
+
+	/**
+	 * Method to return the exit code of a terminated child process.
+	 *
+	 * @return  integer  On success, the PID of the child process is returned in the parent's thread
+	 *                   of execution, and a 0 is returned in the child's thread of execution. On
+	 *                   failure, a -1 will be returned in the parent's context, no child process
+	 *                   will be created, and a PHP error is raised.
+	 *
+	 * @codeCoverageIgnore
+	 * @see     pcntl_fork()
+	 * @since   1.0
+	 */
+	protected function pcntlFork()
+	{
+		return pcntl_fork();
+	}
+
+	/**
+	 * Method to install a signal handler.
+	 *
+	 * @param   integer   $signal   The signal number.
+	 * @param   callable  $handler  The signal handler which may be the name of a user created function,
+	 *                              or method, or either of the two global constants SIG_IGN or SIG_DFL.
+	 * @param   boolean   $restart  Specifies whether system call restarting should be used when this
+	 *                              signal arrives.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @codeCoverageIgnore
+	 * @see     pcntl_signal()
+	 * @since   1.0
+	 */
+	protected function pcntlSignal($signal , $handler, $restart = true)
+	{
+		return pcntl_signal($signal, $handler, $restart);
+	}
+
+	/**
+	 * Method to wait on or return the status of a forked child.
+	 *
+	 * @param   integer  $status   Status information.
+	 * @param   integer  $options  If wait3 is available on your system (mostly BSD-style systems),
+	 *                             you can provide the optional options parameter.
+	 *
+	 * @return  integer  The process ID of the child which exited, -1 on error or zero if WNOHANG
+	 *                   was provided as an option (on wait3-available systems) and no child was available.
+	 *
+	 * @codeCoverageIgnore
+	 * @see     pcntl_wait()
+	 * @since   1.0
+	 */
+	protected function pcntlWait(&$status, $options = 0)
+	{
+		return pcntl_wait($status, $options);
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/AbstractWebApplication.php b/core/libraries/vendor/joomla/application/src/AbstractWebApplication.php
new file mode 100644
index 00000000..6453ed43
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/AbstractWebApplication.php
@@ -0,0 +1,991 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application;
+
+use Joomla\Uri\Uri;
+use Joomla\Input\Input;
+use Joomla\Session\Session;
+use Joomla\Registry\Registry;
+
+/**
+ * Base class for a Joomla! Web application.
+ *
+ * @since  1.0
+ */
+abstract class AbstractWebApplication extends AbstractApplication
+{
+	/**
+	 * Character encoding string.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $charSet = 'utf-8';
+
+	/**
+	 * Response mime type.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $mimeType = 'text/html';
+
+	/**
+	 * HTTP protocol version.
+	 *
+	 * @var    string
+	 * @since  1.9.0
+	 */
+	public $httpVersion = '1.1';
+
+	/**
+	 * The body modified date for response headers.
+	 *
+	 * @var    \DateTime
+	 * @since  1.0
+	 */
+	public $modifiedDate;
+
+	/**
+	 * The application client object.
+	 *
+	 * @var    Web\WebClient
+	 * @since  1.0
+	 */
+	public $client;
+
+	/**
+	 * The application response object.
+	 *
+	 * @var    object
+	 * @since  1.0
+	 */
+	protected $response;
+
+	/**
+	 * The application session object.
+	 *
+	 * @var    Session
+	 * @since  1.0
+	 */
+	private $session;
+
+	/**
+	 * A map of integer HTTP response codes to the full HTTP Status for the headers.
+	 *
+	 * @var    array
+	 * @since  1.6.0
+	 * @link   https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 */
+	private $responseMap = array(
+		100 => 'HTTP/{version} 100 Continue',
+		101 => 'HTTP/{version} 101 Switching Protocols',
+		102 => 'HTTP/{version} 102 Processing',
+		200 => 'HTTP/{version} 200 OK',
+		201 => 'HTTP/{version} 201 Created',
+		202 => 'HTTP/{version} 202 Accepted',
+		203 => 'HTTP/{version} 203 Non-Authoritative Information',
+		204 => 'HTTP/{version} 204 No Content',
+		205 => 'HTTP/{version} 205 Reset Content',
+		206 => 'HTTP/{version} 206 Partial Content',
+		207 => 'HTTP/{version} 207 Multi-Status',
+		208 => 'HTTP/{version} 208 Already Reported',
+		226 => 'HTTP/{version} 226 IM Used',
+		300 => 'HTTP/{version} 300 Multiple Choices',
+		301 => 'HTTP/{version} 301 Moved Permanently',
+		302 => 'HTTP/{version} 302 Found',
+		303 => 'HTTP/{version} 303 See other',
+		304 => 'HTTP/{version} 304 Not Modified',
+		305 => 'HTTP/{version} 305 Use Proxy',
+		306 => 'HTTP/{version} 306 (Unused)',
+		307 => 'HTTP/{version} 307 Temporary Redirect',
+		308 => 'HTTP/{version} 308 Permanent Redirect',
+		400 => 'HTTP/{version} 400 Bad Request',
+		401 => 'HTTP/{version} 401 Unauthorized',
+		402 => 'HTTP/{version} 402 Payment Required',
+		403 => 'HTTP/{version} 403 Forbidden',
+		404 => 'HTTP/{version} 404 Not Found',
+		405 => 'HTTP/{version} 405 Method Not Allowed',
+		406 => 'HTTP/{version} 406 Not Acceptable',
+		407 => 'HTTP/{version} 407 Proxy Authentication Required',
+		408 => 'HTTP/{version} 408 Request Timeout',
+		409 => 'HTTP/{version} 409 Conflict',
+		410 => 'HTTP/{version} 410 Gone',
+		411 => 'HTTP/{version} 411 Length Required',
+		412 => 'HTTP/{version} 412 Precondition Failed',
+		413 => 'HTTP/{version} 413 Payload Too Large',
+		414 => 'HTTP/{version} 414 URI Too Long',
+		415 => 'HTTP/{version} 415 Unsupported Media Type',
+		416 => 'HTTP/{version} 416 Range Not Satisfiable',
+		417 => 'HTTP/{version} 417 Expectation Failed',
+		418 => 'HTTP/{version} 418 I\'m a teapot',
+		421 => 'HTTP/{version} 421 Misdirected Request',
+		422 => 'HTTP/{version} 422 Unprocessable Entity',
+		423 => 'HTTP/{version} 423 Locked',
+		424 => 'HTTP/{version} 424 Failed Dependency',
+		426 => 'HTTP/{version} 426 Upgrade Required',
+		428 => 'HTTP/{version} 428 Precondition Required',
+		429 => 'HTTP/{version} 429 Too Many Requests',
+		431 => 'HTTP/{version} 431 Request Header Fields Too Large',
+		451 => 'HTTP/{version} 451 Unavailable For Legal Reasons',
+		500 => 'HTTP/{version} 500 Internal Server Error',
+		501 => 'HTTP/{version} 501 Not Implemented',
+		502 => 'HTTP/{version} 502 Bad Gateway',
+		503 => 'HTTP/{version} 503 Service Unavailable',
+		504 => 'HTTP/{version} 504 Gateway Timeout',
+		505 => 'HTTP/{version} 505 HTTP Version Not Supported',
+		506 => 'HTTP/{version} 506 Variant Also Negotiates',
+		507 => 'HTTP/{version} 507 Insufficient Storage',
+		508 => 'HTTP/{version} 508 Loop Detected',
+		510 => 'HTTP/{version} 510 Not Extended',
+		511 => 'HTTP/{version} 511 Network Authentication Required',
+	);
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   Input          $input   An optional argument to provide dependency injection for the application's input object.  If the argument
+	 *                                  is an Input object that object will become the application's input object, otherwise a default input
+	 *                                  object is created.
+	 * @param   Registry       $config  An optional argument to provide dependency injection for the application's config object.  If the argument
+	 *                                  is a Registry object that object will become the application's config object, otherwise a default config
+	 *                                  object is created.
+	 * @param   Web\WebClient  $client  An optional argument to provide dependency injection for the application's client object.  If the argument
+	 *                                  is a Web\WebClient object that object will become the application's client object, otherwise a default client
+	 *                                  object is created.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(Input $input = null, Registry $config = null, Web\WebClient $client = null)
+	{
+		$this->client = $client instanceof Web\WebClient ? $client : new Web\WebClient;
+
+		// Setup the response object.
+		$this->response = new \stdClass;
+		$this->response->cachable = false;
+		$this->response->headers = array();
+		$this->response->body = array();
+
+		// Call the constructor as late as possible (it runs `initialise`).
+		parent::__construct($input, $config);
+
+		// Set the system URIs.
+		$this->loadSystemUris();
+	}
+
+	/**
+	 * Execute the application.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute()
+	{
+		// @event onBeforeExecute
+
+		// Perform application routines.
+		$this->doExecute();
+
+		// @event onAfterExecute
+
+		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
+		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler'))
+		{
+			$this->compress();
+		}
+
+		// @event onBeforeRespond
+
+		// Send the application response.
+		$this->respond();
+
+		// @event onAfterRespond
+	}
+
+	/**
+	 * Checks the accept encoding of the browser and compresses the data before
+	 * sending it to the client if possible.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function compress()
+	{
+		// Supported compression encodings.
+		$supported = array(
+			'x-gzip' => 'gz',
+			'gzip' => 'gz',
+			'deflate' => 'deflate'
+		);
+
+		// Get the supported encoding.
+		$encodings = array_intersect($this->client->encodings, array_keys($supported));
+
+		// If no supported encoding is detected do nothing and return.
+		if (empty($encodings))
+		{
+			return;
+		}
+
+		// Verify that headers have not yet been sent, and that our connection is still alive.
+		if ($this->checkHeadersSent() || !$this->checkConnectionAlive())
+		{
+			return;
+		}
+
+		// Iterate through the encodings and attempt to compress the data using any found supported encodings.
+		foreach ($encodings as $encoding)
+		{
+			if (($supported[$encoding] == 'gz') || ($supported[$encoding] == 'deflate'))
+			{
+				// Verify that the server supports gzip compression before we attempt to gzip encode the data.
+				// @codeCoverageIgnoreStart
+				if (!extension_loaded('zlib') || ini_get('zlib.output_compression'))
+				{
+					continue;
+				}
+
+				// @codeCoverageIgnoreEnd
+
+				// Attempt to gzip encode the data with an optimal level 4.
+				$data = $this->getBody();
+				$gzdata = gzencode($data, 4, ($supported[$encoding] == 'gz') ? FORCE_GZIP : FORCE_DEFLATE);
+
+				// If there was a problem encoding the data just try the next encoding scheme.
+				// @codeCoverageIgnoreStart
+				if ($gzdata === false)
+				{
+					continue;
+				}
+
+				// @codeCoverageIgnoreEnd
+
+				// Set the encoding headers.
+				$this->setHeader('Content-Encoding', $encoding);
+				$this->setHeader('Vary', 'Accept-Encoding');
+				$this->setHeader('X-Content-Encoded-By', 'Joomla');
+
+				// Replace the output with the encoded data.
+				$this->setBody($gzdata);
+
+				// Compression complete, let's break out of the loop.
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Method to send the application response to the client.  All headers will be sent prior to the main
+	 * application output data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function respond()
+	{
+		// Send the content-type header.
+		$this->setHeader('Content-Type', $this->mimeType . '; charset=' . $this->charSet);
+
+		// If the response is set to uncachable, we need to set some appropriate headers so browsers don't cache the response.
+		if (!$this->allowCache())
+		{
+			// Expires in the past.
+			$this->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
+
+			// Always modified.
+			$this->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+			$this->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+
+			// HTTP 1.0
+			$this->setHeader('Pragma', 'no-cache');
+		}
+		else
+		{
+			// Expires.
+			$this->setHeader('Expires', gmdate('D, d M Y H:i:s', time() + 900) . ' GMT');
+
+			// Last modified.
+			if ($this->modifiedDate instanceof \DateTime)
+			{
+				$this->modifiedDate->setTimezone(new \DateTimeZone('UTC'));
+				$this->setHeader('Last-Modified', $this->modifiedDate->format('D, d M Y H:i:s') . ' GMT');
+			}
+		}
+
+		$this->sendHeaders();
+
+		echo $this->getBody();
+	}
+
+	/**
+	 * Redirect to another URL.
+	 *
+	 * If the headers have not been sent the redirect will be accomplished using a "301 Moved Permanently"
+	 * or "303 See Other" code in the header pointing to the new location. If the headers have already been
+	 * sent this will be accomplished using a JavaScript statement.
+	 *
+	 * @param   string   $url     The URL to redirect to. Can only be http/https URL
+	 * @param   integer  $status  The HTTP status code to be provided. 303 is assumed by default.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function redirect($url, $status = 303)
+	{
+		// Check for relative internal links.
+		if (preg_match('#^index\.php#', $url))
+		{
+			$url = $this->get('uri.base.full') . $url;
+		}
+
+		// Perform a basic sanity check to make sure we don't have any CRLF garbage.
+		$url = preg_split("/[\r\n]/", $url);
+		$url = $url[0];
+
+		/*
+		 * Here we need to check and see if the URL is relative or absolute.  Essentially, do we need to
+		 * prepend the URL with our base URL for a proper redirect.  The rudimentary way we are looking
+		 * at this is to simply check whether or not the URL string has a valid scheme or not.
+		 */
+		if (!preg_match('#^[a-z]+\://#i', $url))
+		{
+			// Get a Uri instance for the requested URI.
+			$uri = new Uri($this->get('uri.request'));
+
+			// Get a base URL to prepend from the requested URI.
+			$prefix = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+
+			// We just need the prefix since we have a path relative to the root.
+			if ($url[0] == '/')
+			{
+				$url = $prefix . $url;
+			}
+			else
+			// It's relative to where we are now, so lets add that.
+			{
+				$parts = explode('/', $uri->toString(array('path')));
+				array_pop($parts);
+				$path = implode('/', $parts) . '/';
+				$url = $prefix . $path . $url;
+			}
+		}
+
+		// If the headers have already been sent we need to send the redirect statement via JavaScript.
+		if ($this->checkHeadersSent())
+		{
+			echo "<script>document.location.href=" . json_encode($url) . ";</script>\n";
+		}
+		else
+		{
+			// We have to use a JavaScript redirect here because MSIE doesn't play nice with utf-8 URLs.
+			if (($this->client->engine == Web\WebClient::TRIDENT) && !static::isAscii($url))
+			{
+				$html = '<html><head>';
+				$html .= '<meta http-equiv="content-type" content="text/html; charset=' . $this->charSet . '" />';
+				$html .= '<script>document.location.href=' . json_encode($url) . ';</script>';
+				$html .= '</head><body></body></html>';
+
+				echo $html;
+			}
+			else
+			{
+				// Check if we have a boolean for the status variable for compatability with v1 of the framework
+				// @deprecated 3.0
+				if (is_bool($status))
+				{
+					$status = $status ? 301 : 303;
+				}
+
+				if (!is_int($status) && !$this->isRedirectState($status))
+				{
+					throw new \InvalidArgumentException('You have not supplied a valid HTTP status code');
+				}
+
+				// All other cases use the more efficient HTTP header for redirection.
+				$this->setHeader('Status', $status, true);
+				$this->setHeader('Location', $url, true);
+			}
+		}
+
+		// Set appropriate headers
+		$this->respond();
+
+		// Close the application after the redirect.
+		$this->close();
+	}
+
+	/**
+	 * Set/get cachable state for the response.  If $allow is set, sets the cachable state of the
+	 * response.  Always returns the current state.
+	 *
+	 * @param   boolean  $allow  True to allow browser caching.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function allowCache($allow = null)
+	{
+		if ($allow !== null)
+		{
+			$this->response->cachable = (bool) $allow;
+		}
+
+		return $this->response->cachable;
+	}
+
+	/**
+	 * Method to set a response header.  If the replace flag is set then all headers
+	 * with the given name will be replaced by the new one.  The headers are stored
+	 * in an internal array to be sent when the site is sent to the browser.
+	 *
+	 * @param   string   $name     The name of the header to set.
+	 * @param   string   $value    The value of the header to set.
+	 * @param   boolean  $replace  True to replace any headers with the same name.
+	 *
+	 * @return  AbstractWebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setHeader($name, $value, $replace = false)
+	{
+		// Sanitize the input values.
+		$name = (string) $name;
+		$value = (string) $value;
+
+		// If the replace flag is set, unset all known headers with the given name.
+		if ($replace)
+		{
+			foreach ($this->response->headers as $key => $header)
+			{
+				if ($name == $header['name'])
+				{
+					unset($this->response->headers[$key]);
+				}
+			}
+
+			// Clean up the array as unsetting nested arrays leaves some junk.
+			$this->response->headers = array_values($this->response->headers);
+		}
+
+		// Add the header to the internal array.
+		$this->response->headers[] = array('name' => $name, 'value' => $value);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the array of response headers to be sent when the response is sent
+	 * to the client.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public function getHeaders()
+	{
+		return $this->response->headers;
+	}
+
+	/**
+	 * Method to clear any set response headers.
+	 *
+	 * @return  AbstractWebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function clearHeaders()
+	{
+		$this->response->headers = array();
+
+		return $this;
+	}
+
+	/**
+	 * Send the response headers.
+	 *
+	 * @return  AbstractWebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function sendHeaders()
+	{
+		if (!$this->checkHeadersSent())
+		{
+			foreach ($this->response->headers as $header)
+			{
+				if ('status' == strtolower($header['name']))
+				{
+					// 'status' headers indicate an HTTP status, and need to be handled slightly differently
+					$status = $this->getHttpStatusValue($header['value']);
+
+					$this->header($status, true, (int) $header['value']);
+				}
+				else
+				{
+					$this->header($header['name'] . ': ' . $header['value']);
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set body content.  If body content already defined, this will replace it.
+	 *
+	 * @param   string  $content  The content to set as the response body.
+	 *
+	 * @return  AbstractWebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setBody($content)
+	{
+		$this->response->body = array((string) $content);
+
+		return $this;
+	}
+
+	/**
+	 * Prepend content to the body content
+	 *
+	 * @param   string  $content  The content to prepend to the response body.
+	 *
+	 * @return  AbstractWebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function prependBody($content)
+	{
+		array_unshift($this->response->body, (string) $content);
+
+		return $this;
+	}
+
+	/**
+	 * Append content to the body content
+	 *
+	 * @param   string  $content  The content to append to the response body.
+	 *
+	 * @return  AbstractWebApplication  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function appendBody($content)
+	{
+		$this->response->body[] = (string) $content;
+
+		return $this;
+	}
+
+	/**
+	 * Return the body content
+	 *
+	 * @param   boolean  $asArray  True to return the body as an array of strings.
+	 *
+	 * @return  mixed  The response body either as an array or concatenated string.
+	 *
+	 * @since   1.0
+	 */
+	public function getBody($asArray = false)
+	{
+		return $asArray ? $this->response->body : implode((array) $this->response->body);
+	}
+
+	/**
+	 * Method to get the application session object.
+	 *
+	 * @return  Session  The session object
+	 *
+	 * @since   1.0
+	 */
+	public function getSession()
+	{
+		if ($this->session === null)
+		{
+			throw new \RuntimeException('A \Joomla\Session\Session object has not been set.');
+		}
+
+		return $this->session;
+	}
+
+	/**
+	 * Check if a given value can be successfully mapped to a valid http status value
+	 *
+	 * @param   string|int  $value  The given status as int or string
+	 *
+	 * @return  string
+	 *
+	 * @since   1.8.0
+	 */
+	protected function getHttpStatusValue($value)
+	{
+		$code = (int) $value;
+
+		if (array_key_exists($code, $this->responseMap))
+		{
+			$value = $this->responseMap[$code];
+		}
+		else
+		{
+			$value = 'HTTP/{version} ' . $code;
+		}
+
+		return str_replace('{version}', $this->httpVersion, $value);
+	}
+
+	/**
+	 * Check if the value is a valid HTTP status code
+	 *
+	 * @param   integer  $code  The potential status code
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.8.1
+	 */
+	public function isValidHttpStatus($code)
+	{
+		return array_key_exists($code, $this->responseMap);
+	}
+
+	/**
+	 * Method to check the current client connection status to ensure that it is alive.  We are
+	 * wrapping this to isolate the connection_status() function from our code base for testing reasons.
+	 *
+	 * @return  boolean  True if the connection is valid and normal.
+	 *
+	 * @codeCoverageIgnore
+	 * @see     connection_status()
+	 * @since   1.0
+	 */
+	protected function checkConnectionAlive()
+	{
+		return (connection_status() === CONNECTION_NORMAL);
+	}
+
+	/**
+	 * Method to check to see if headers have already been sent.  We are wrapping this to isolate the
+	 * headers_sent() function from our code base for testing reasons.
+	 *
+	 * @return  boolean  True if the headers have already been sent.
+	 *
+	 * @codeCoverageIgnore
+	 * @see     headers_sent()
+	 * @since   1.0
+	 */
+	protected function checkHeadersSent()
+	{
+		return headers_sent();
+	}
+
+	/**
+	 * Method to detect the requested URI from server environment variables.
+	 *
+	 * @return  string  The requested URI
+	 *
+	 * @since   1.0
+	 */
+	protected function detectRequestUri()
+	{
+		// First we need to detect the URI scheme.
+		if ($this->isSslConnection())
+		{
+			$scheme = 'https://';
+		}
+		else
+		{
+			$scheme = 'http://';
+		}
+
+		/*
+		 * There are some differences in the way that Apache and IIS populate server environment variables.  To
+		 * properly detect the requested URI we need to adjust our algorithm based on whether or not we are getting
+		 * information from Apache or IIS.
+		 */
+
+		$phpSelf = $this->input->server->getString('PHP_SELF', '');
+		$requestUri = $this->input->server->getString('REQUEST_URI', '');
+
+		// If PHP_SELF and REQUEST_URI are both populated then we will assume "Apache Mode".
+		if (!empty($phpSelf) && !empty($requestUri))
+		{
+			// The URI is built from the HTTP_HOST and REQUEST_URI environment variables in an Apache environment.
+			$uri = $scheme . $this->input->server->getString('HTTP_HOST') . $requestUri;
+		}
+		else
+		// If not in "Apache Mode" we will assume that we are in an IIS environment and proceed.
+		{
+			// IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS
+			$uri = $scheme . $this->input->server->getString('HTTP_HOST') . $this->input->server->getString('SCRIPT_NAME');
+			$queryHost = $this->input->server->getString('QUERY_STRING', '');
+
+			// If the QUERY_STRING variable exists append it to the URI string.
+			if (!empty($queryHost))
+			{
+				$uri .= '?' . $queryHost;
+			}
+		}
+
+		return trim($uri);
+	}
+
+	/**
+	 * Method to send a header to the client.  We are wrapping this to isolate the header() function
+	 * from our code base for testing reasons.
+	 *
+	 * @param   string   $string   The header string.
+	 * @param   boolean  $replace  The optional replace parameter indicates whether the header should
+	 *                             replace a previous similar header, or add a second header of the same type.
+	 * @param   integer  $code     Forces the HTTP response code to the specified value. Note that
+	 *                             this parameter only has an effect if the string is not empty.
+	 *
+	 * @return  void
+	 *
+	 * @codeCoverageIgnore
+	 * @see     header()
+	 * @since   1.0
+	 */
+	protected function header($string, $replace = true, $code = null)
+	{
+		header(str_replace(chr(0), '', $string), $replace, $code);
+	}
+
+	/**
+	 * Checks if a state is a redirect state
+	 *
+	 * @param   integer  $state  The HTTP status code.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.8.0
+	 */
+	protected function isRedirectState($state)
+	{
+		$state = (int) $state;
+
+		return ($state > 299 && $state < 400 && array_key_exists($state, $this->responseMap));
+	}
+
+	/**
+	 * Determine if we are using a secure (SSL) connection.
+	 *
+	 * @return  boolean  True if using SSL, false if not.
+	 *
+	 * @since   1.0
+	 */
+	public function isSslConnection()
+	{
+		$serverSSLVar = $this->input->server->getString('HTTPS', '');
+
+		if (!empty($serverSSLVar) && strtolower($serverSSLVar) !== 'off')
+		{
+			return true;
+		}
+
+		$serverForwarderProtoVar = $this->input->server->getString('HTTP_X_FORWARDED_PROTO', '');
+
+		return !empty($serverForwarderProtoVar) && strtolower($serverForwarderProtoVar) === 'https';
+	}
+
+	/**
+	 * Sets the session for the application to use, if required.
+	 *
+	 * @param   Session  $session  A session object.
+	 *
+	 * @return  AbstractWebApplication  Returns itself to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setSession(Session $session)
+	{
+		$this->session = $session;
+
+		return $this;
+	}
+
+	/**
+	 * Method to load the system URI strings for the application.
+	 *
+	 * @param   string  $requestUri  An optional request URI to use instead of detecting one from the
+	 *                               server environment variables.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function loadSystemUris($requestUri = null)
+	{
+		// Set the request URI.
+		// @codeCoverageIgnoreStart
+		if (!empty($requestUri))
+		{
+			$this->set('uri.request', $requestUri);
+		}
+		else
+		{
+			$this->set('uri.request', $this->detectRequestUri());
+		}
+
+		// @codeCoverageIgnoreEnd
+
+		// Check to see if an explicit base URI has been set.
+		$siteUri = trim($this->get('site_uri'));
+
+		if ($siteUri != '')
+		{
+			$uri = new Uri($siteUri);
+			$path = $uri->toString(array('path'));
+		}
+		else
+		// No explicit base URI was set so we need to detect it.
+		{
+			// Start with the requested URI.
+			$uri = new Uri($this->get('uri.request'));
+
+			$requestUri = $this->input->server->getString('REQUEST_URI', '');
+
+			// If we are working from a CGI SAPI with the 'cgi.fix_pathinfo' directive disabled we use PHP_SELF.
+			if (strpos(PHP_SAPI, 'cgi') !== false && !ini_get('cgi.fix_pathinfo') && !empty($requestUri))
+			{
+				// We aren't expecting PATH_INFO within PHP_SELF so this should work.
+				$path = dirname($this->input->server->getString('PHP_SELF', ''));
+			}
+			else
+			// Pretty much everything else should be handled with SCRIPT_NAME.
+			{
+				$path = dirname($this->input->server->getString('SCRIPT_NAME', ''));
+			}
+		}
+
+		// Get the host from the URI.
+		$host = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
+
+		// Check if the path includes "index.php".
+		if (strpos($path, 'index.php') !== false)
+		{
+			// Remove the index.php portion of the path.
+			$path = substr_replace($path, '', strpos($path, 'index.php'), 9);
+		}
+
+		$path = rtrim($path, '/\\');
+
+		// Set the base URI both as just a path and as the full URI.
+		$this->set('uri.base.full', $host . $path . '/');
+		$this->set('uri.base.host', $host);
+		$this->set('uri.base.path', $path . '/');
+
+		// Set the extended (non-base) part of the request URI as the route.
+		if (stripos($this->get('uri.request'), $this->get('uri.base.full')) === 0)
+		{
+			$this->set('uri.route', substr_replace($this->get('uri.request'), '', 0, strlen($this->get('uri.base.full'))));
+		}
+
+		// Get an explicitly set media URI is present.
+		$mediaURI = trim($this->get('media_uri'));
+
+		if ($mediaURI)
+		{
+			if (strpos($mediaURI, '://') !== false)
+			{
+				$this->set('uri.media.full', $mediaURI);
+				$this->set('uri.media.path', $mediaURI);
+			}
+			else
+			{
+				// Normalise slashes.
+				$mediaURI = trim($mediaURI, '/\\');
+				$mediaURI = !empty($mediaURI) ? '/' . $mediaURI . '/' : '/';
+				$this->set('uri.media.full', $this->get('uri.base.host') . $mediaURI);
+				$this->set('uri.media.path', $mediaURI);
+			}
+		}
+		else
+		// No explicit media URI was set, build it dynamically from the base uri.
+		{
+			$this->set('uri.media.full', $this->get('uri.base.full') . 'media/');
+			$this->set('uri.media.path', $this->get('uri.base.path') . 'media/');
+		}
+	}
+
+	/**
+	 * Checks for a form token in the request.
+	 *
+	 * Use in conjunction with getFormToken.
+	 *
+	 * @param   string  $method  The request method in which to look for the token key.
+	 *
+	 * @return  boolean  True if found and valid, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function checkToken($method = 'post')
+	{
+		$token = $this->getFormToken();
+
+		if (!$this->input->$method->get($token, '', 'alnum'))
+		{
+			if ($this->getSession()->isNew())
+			{
+				// Redirect to login screen.
+				$this->redirect('index.php');
+				$this->close();
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	/**
+	 * Method to determine a hash for anti-spoofing variable names
+	 *
+	 * @param   boolean  $forceNew  If true, force a new token to be created
+	 *
+	 * @return  string  Hashed var name
+	 *
+	 * @since   1.0
+	 */
+	public function getFormToken($forceNew = false)
+	{
+		// @todo we need the user id somehow here
+		$userId  = 0;
+
+		return md5($this->get('secret') . $userId . $this->getSession()->getToken($forceNew));
+	}
+
+	/**
+	 * Tests whether a string contains only 7bit ASCII bytes.
+	 *
+	 * You might use this to conditionally check whether a string
+	 * needs handling as UTF-8 or not, potentially offering performance
+	 * benefits by using the native PHP equivalent if it's just ASCII e.g.;
+	 *
+	 * @param   string  $str  The string to test.
+	 *
+	 * @return  boolean True if the string is all ASCII
+	 *
+	 * @since   1.4.0
+	 */
+	public static function isAscii($str)
+	{
+		// Search for any bytes which are outside the ASCII range...
+		return (preg_match('/(?:[^\x00-\x7F])/', $str) !== 1);
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/CliInput.php b/core/libraries/vendor/joomla/application/src/Cli/CliInput.php
new file mode 100644
index 00000000..1ae4e43e
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/CliInput.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli;
+
+/**
+ * Class CliInput
+ *
+ * @since       1.6.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+class CliInput
+{
+	/**
+	 * Get a value from standard input.
+	 *
+	 * @return  string  The input string from standard input.
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.6.0
+	 */
+	public function in()
+	{
+		return rtrim(fread(STDIN, 8192), "\n\r");
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/CliOutput.php b/core/libraries/vendor/joomla/application/src/Cli/CliOutput.php
new file mode 100644
index 00000000..46054545
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/CliOutput.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli;
+
+use Joomla\Application\Cli\Output\Processor\ProcessorInterface;
+
+/**
+ * Class CliOutput
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+abstract class CliOutput
+{
+	/**
+	 * Color processing object
+	 *
+	 * @var    ProcessorInterface
+	 * @since  1.0
+	 */
+	protected $processor;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   ProcessorInterface  $processor  The output processor.
+	 *
+	 * @since   1.1.2
+	 */
+	public function __construct(ProcessorInterface $processor = null)
+	{
+		$this->setProcessor(($processor instanceof ProcessorInterface) ? $processor : new Output\Processor\ColorProcessor);
+	}
+
+	/**
+	 * Set a processor
+	 *
+	 * @param   ProcessorInterface  $processor  The output processor.
+	 *
+	 * @return  Stdout  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setProcessor(ProcessorInterface $processor)
+	{
+		$this->processor = $processor;
+
+		return $this;
+	}
+
+	/**
+	 * Get a processor
+	 *
+	 * @return  ProcessorInterface
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function getProcessor()
+	{
+		if ($this->processor)
+		{
+			return $this->processor;
+		}
+
+		throw new \RuntimeException('A ProcessorInterface object has not been set.');
+	}
+
+	/**
+	 * Write a string to an output handler.
+	 *
+	 * @param   string   $text  The text to display.
+	 * @param   boolean  $nl    True (default) to append a new line at the end of the output string.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @codeCoverageIgnore
+	 */
+	abstract public function out($text = '', $nl = true);
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/ColorProcessor.php b/core/libraries/vendor/joomla/application/src/Cli/ColorProcessor.php
new file mode 100644
index 00000000..1d9f5703
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/ColorProcessor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli;
+
+use \Joomla\Application\Cli\Output\Processor\ColorProcessor as RealColorProcessor;
+
+/**
+ * Class ColorProcessor.
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+class ColorProcessor extends RealColorProcessor
+{
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/ColorStyle.php b/core/libraries/vendor/joomla/application/src/Cli/ColorStyle.php
new file mode 100644
index 00000000..e599c5db
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/ColorStyle.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli;
+
+/**
+ * Class ColorStyle
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+final class ColorStyle
+{
+	/**
+	 * Known colors
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private static $knownColors = array(
+		'black'   => 0,
+		'red'     => 1,
+		'green'   => 2,
+		'yellow'  => 3,
+		'blue'    => 4,
+		'magenta' => 5,
+		'cyan'    => 6,
+		'white'   => 7
+	);
+
+	/**
+	 * Known styles
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private static $knownOptions = array(
+		'bold'       => 1,
+		'underscore' => 4,
+		'blink'      => 5,
+		'reverse'    => 7,
+	);
+
+	/**
+	 * Foreground base value
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	private static $fgBase = 30;
+
+	/**
+	 * Background base value
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	private static $bgBase = 40;
+
+	/**
+	 * Foreground color
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	private $fgColor = 0;
+
+	/**
+	 * Background color
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	private $bgColor = 0;
+
+	/**
+	 * Array of style options
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $options = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $fg       Foreground color.
+	 * @param   string  $bg       Background color.
+	 * @param   array   $options  Style options.
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($fg = '', $bg = '', $options = array())
+	{
+		if ($fg)
+		{
+			if (false == array_key_exists($fg, static::$knownColors))
+			{
+				throw new \InvalidArgumentException(
+					sprintf('Invalid foreground color "%1$s" [%2$s]',
+						$fg,
+						implode(', ', $this->getKnownColors())
+					)
+				);
+			}
+
+			$this->fgColor = static::$fgBase + static::$knownColors[$fg];
+		}
+
+		if ($bg)
+		{
+			if (false == array_key_exists($bg, static::$knownColors))
+			{
+				throw new \InvalidArgumentException(
+					sprintf('Invalid background color "%1$s" [%2$s]',
+						$bg,
+						implode(', ', $this->getKnownColors())
+					)
+				);
+			}
+
+			$this->bgColor = static::$bgBase + static::$knownColors[$bg];
+		}
+
+		foreach ($options as $option)
+		{
+			if (false == array_key_exists($option, static::$knownOptions))
+			{
+				throw new \InvalidArgumentException(
+					sprintf('Invalid option "%1$s" [%2$s]',
+						$option,
+						implode(', ', $this->getKnownOptions())
+					)
+				);
+			}
+
+			$this->options[] = $option;
+		}
+	}
+
+	/**
+	 * Convert to a string.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function __toString()
+	{
+		return $this->getStyle();
+	}
+
+	/**
+	 * Create a color style from a parameter string.
+	 *
+	 * Example: fg=red;bg=blue;options=bold,blink
+	 *
+	 * @param   string  $string  The parameter string.
+	 *
+	 * @return  ColorStyle  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public static function fromString($string)
+	{
+		$fg = '';
+		$bg = '';
+		$options = array();
+
+		$parts = explode(';', $string);
+
+		foreach ($parts as $part)
+		{
+			$subParts = explode('=', $part);
+
+			if (count($subParts) < 2)
+			{
+				continue;
+			}
+
+			switch ($subParts[0])
+			{
+				case 'fg':
+					$fg = $subParts[1];
+					break;
+
+				case 'bg':
+					$bg = $subParts[1];
+					break;
+
+				case 'options':
+					$options = explode(',', $subParts[1]);
+					break;
+
+				default:
+					throw new \RuntimeException('Invalid option');
+					break;
+			}
+		}
+
+		return new self($fg, $bg, $options);
+	}
+
+	/**
+	 * Get the translated color code.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function getStyle()
+	{
+		$values = array();
+
+		if ($this->fgColor)
+		{
+			$values[] = $this->fgColor;
+		}
+
+		if ($this->bgColor)
+		{
+			$values[] = $this->bgColor;
+		}
+
+		foreach ($this->options as $option)
+		{
+			$values[] = static::$knownOptions[$option];
+		}
+
+		return implode(';', $values);
+	}
+
+	/**
+	 * Get the known colors.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function getKnownColors()
+	{
+		return array_keys(static::$knownColors);
+	}
+
+	/**
+	 * Get the known options.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public function getKnownOptions()
+	{
+		return array_keys(static::$knownOptions);
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ColorProcessor.php b/core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ColorProcessor.php
new file mode 100644
index 00000000..b3521ea2
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ColorProcessor.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli\Output\Processor;
+
+use Joomla\Application\Cli\ColorStyle;
+use Joomla\Application\Cli\Output\Stdout;
+
+/**
+ * Class ColorProcessor.
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+class ColorProcessor implements ProcessorInterface
+{
+	/**
+	 * Flag to remove color codes from the output
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	public $noColors = false;
+
+	/**
+	 * Regex to match tags
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected $tagFilter = '/<([a-z=;]+)>(.*?)<\/\\1>/s';
+
+	/**
+	 * Regex used for removing color codes
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected static $stripFilter = '/<[\/]?[a-z=;]+>/';
+
+	/**
+	 * Array of ColorStyle objects
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $styles = array();
+
+	/**
+	 * Class constructor
+	 *
+	 * @param   boolean  $noColors  Defines non-colored mode on construct
+	 *
+	 * @since  1.1.0
+	 */
+	public function __construct($noColors = null)
+	{
+		if ($noColors === null)
+		{
+			/*
+			 * By default windows cmd.exe and PowerShell does not support ANSI-colored output
+			 * if the variable is not set explicitly colors should be disabled on Windows
+			 */
+			$noColors = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
+		}
+
+		$this->noColors = $noColors;
+
+		$this->addPredefinedStyles();
+	}
+
+	/**
+	 * Add a style.
+	 *
+	 * @param   string      $name   The style name.
+	 * @param   ColorStyle  $style  The color style.
+	 *
+	 * @return  ColorProcessor  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function addStyle($name, ColorStyle $style)
+	{
+		$this->styles[$name] = $style;
+
+		return $this;
+	}
+
+	/**
+	 * Strip color tags from a string.
+	 *
+	 * @param   string  $string  The string.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public static function stripColors($string)
+	{
+		return preg_replace(static::$stripFilter, '', $string);
+	}
+
+	/**
+	 * Process a string.
+	 *
+	 * @param   string  $string  The string to process.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function process($string)
+	{
+		preg_match_all($this->tagFilter, $string, $matches);
+
+		if (!$matches)
+		{
+			return $string;
+		}
+
+		foreach ($matches[0] as $i => $m)
+		{
+			if (array_key_exists($matches[1][$i], $this->styles))
+			{
+				$string = $this->replaceColors($string, $matches[1][$i], $matches[2][$i], $this->styles[$matches[1][$i]]);
+			}
+			// Custom format
+			elseif (strpos($matches[1][$i], '='))
+			{
+				$string = $this->replaceColors($string, $matches[1][$i], $matches[2][$i], ColorStyle::fromString($matches[1][$i]));
+			}
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Replace color tags in a string.
+	 *
+	 * @param   string      $text   The original text.
+	 * @param   string      $tag    The matched tag.
+	 * @param   string      $match  The match.
+	 * @param   ColorStyle  $style  The color style to apply.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 */
+	private function replaceColors($text, $tag, $match, Colorstyle $style)
+	{
+		$replace = $this->noColors
+			? $match
+			: "\033[" . $style . "m" . $match . "\033[0m";
+
+		return str_replace('<' . $tag . '>' . $match . '</' . $tag . '>', $replace, $text);
+	}
+
+	/**
+	 * Adds predefined color styles to the ColorProcessor object
+	 *
+	 * @return  Stdout  Instance of $this to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	private function addPredefinedStyles()
+	{
+		$this->addStyle(
+			'info',
+			new ColorStyle('green', '', array('bold'))
+		);
+
+		$this->addStyle(
+			'comment',
+			new ColorStyle('yellow', '', array('bold'))
+		);
+
+		$this->addStyle(
+			'question',
+			new ColorStyle('black', 'cyan')
+		);
+
+		$this->addStyle(
+			'error',
+			new ColorStyle('white', 'red')
+		);
+
+		return $this;
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php b/core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php
new file mode 100644
index 00000000..924543ac
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/Output/Processor/ProcessorInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli\Output\Processor;
+
+/**
+ * Class ProcessorInterface.
+ *
+ * @since       1.1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+interface ProcessorInterface
+{
+	/**
+	 * Process the provided output into a string.
+	 *
+	 * @param   string  $output  The string to process.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.1.0
+	 */
+	public function process($output);
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/Output/Stdout.php b/core/libraries/vendor/joomla/application/src/Cli/Output/Stdout.php
new file mode 100644
index 00000000..82ae6aa9
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/Output/Stdout.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli\Output;
+
+use Joomla\Application\Cli\CliOutput;
+
+/**
+ * Class Stdout.
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+class Stdout extends CliOutput
+{
+	/**
+	 * Write a string to standard output
+	 *
+	 * @param   string   $text  The text to display.
+	 * @param   boolean  $nl    True (default) to append a new line at the end of the output string.
+	 *
+	 * @return  Stdout  Instance of $this to allow chaining.
+	 *
+	 * @codeCoverageIgnore
+	 * @since   1.0
+	 */
+	public function out($text = '', $nl = true)
+	{
+		fwrite(STDOUT, $this->getProcessor()->process($text) . ($nl ? "\n" : null));
+
+		return $this;
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/Cli/Output/Xml.php b/core/libraries/vendor/joomla/application/src/Cli/Output/Xml.php
new file mode 100644
index 00000000..4666cb1a
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Cli/Output/Xml.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Cli\Output;
+
+use Joomla\Application\Cli\CliOutput;
+
+/**
+ * Class Xml.
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use the `joomla/console` package instead
+ */
+class Xml extends CliOutput
+{
+	/**
+	 * Write a string to standard output.
+	 *
+	 * @param   string   $text  The text to display.
+	 * @param   boolean  $nl    True (default) to append a new line at the end of the output string.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @codeCoverageIgnore
+	 */
+	public function out($text = '', $nl = true)
+	{
+		fwrite(STDOUT, $text . ($nl ? "\n" : null));
+	}
+}
diff --git a/core/libraries/vendor/joomla/application/src/Web/WebClient.php b/core/libraries/vendor/joomla/application/src/Web/WebClient.php
new file mode 100644
index 00000000..722653f6
--- /dev/null
+++ b/core/libraries/vendor/joomla/application/src/Web/WebClient.php
@@ -0,0 +1,627 @@
+<?php
+/**
+ * Part of the Joomla Framework Application Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Application\Web;
+
+
+/**
+ * Class to model a Web Client.
+ *
+ * @property-read  integer  $platform        The detected platform on which the web client runs.
+ * @property-read  boolean  $mobile          True if the web client is a mobile device.
+ * @property-read  integer  $engine          The detected rendering engine used by the web client.
+ * @property-read  integer  $browser         The detected browser used by the web client.
+ * @property-read  string   $browserVersion  The detected browser version used by the web client.
+ * @property-read  array    $languages       The priority order detected accepted languages for the client.
+ * @property-read  array    $encodings       The priority order detected accepted encodings for the client.
+ * @property-read  string   $userAgent       The web client's user agent string.
+ * @property-read  string   $acceptEncoding  The web client's accepted encoding string.
+ * @property-read  string   $acceptLanguage  The web client's accepted languages string.
+ * @property-read  array    $detection       An array of flags determining whether or not a detection routine has been run.
+ * @property-read  boolean  $robot           True if the web client is a robot
+ * @property-read  array    $headers         An array of all headers sent by client
+ *
+ * @since  1.0
+ */
+class WebClient
+{
+	const WINDOWS = 1;
+	const WINDOWS_PHONE = 2;
+	const WINDOWS_CE = 3;
+	const IPHONE = 4;
+	const IPAD = 5;
+	const IPOD = 6;
+	const MAC = 7;
+	const BLACKBERRY = 8;
+	const ANDROID = 9;
+	const LINUX = 10;
+	const TRIDENT = 11;
+	const WEBKIT = 12;
+	const GECKO = 13;
+	const PRESTO = 14;
+	const KHTML = 15;
+	const AMAYA = 16;
+	const IE = 17;
+	const FIREFOX = 18;
+	const CHROME = 19;
+	const SAFARI = 20;
+	const OPERA = 21;
+	const ANDROIDTABLET = 22;
+	const EDGE = 23;
+	const BLINK = 24;
+
+	/**
+	 * @var    integer  The detected platform on which the web client runs.
+	 * @since  1.0
+	 */
+	protected $platform;
+
+	/**
+	 * @var    boolean  True if the web client is a mobile device.
+	 * @since  1.0
+	 */
+	protected $mobile = false;
+
+	/**
+	 * @var    integer  The detected rendering engine used by the web client.
+	 * @since  1.0
+	 */
+	protected $engine;
+
+	/**
+	 * @var    integer  The detected browser used by the web client.
+	 * @since  1.0
+	 */
+	protected $browser;
+
+	/**
+	 * @var    string  The detected browser version used by the web client.
+	 * @since  1.0
+	 */
+	protected $browserVersion;
+
+	/**
+	 * @var    array  The priority order detected accepted languages for the client.
+	 * @since  1.0
+	 */
+	protected $languages = array();
+
+	/**
+	 * @var    array  The priority order detected accepted encodings for the client.
+	 * @since  1.0
+	 */
+	protected $encodings = array();
+
+	/**
+	 * @var    string  The web client's user agent string.
+	 * @since  1.0
+	 */
+	protected $userAgent;
+
+	/**
+	 * @var    string  The web client's accepted encoding string.
+	 * @since  1.0
+	 */
+	protected $acceptEncoding;
+
+	/**
+	 * @var    string  The web client's accepted languages string.
+	 * @since  1.0
+	 */
+	protected $acceptLanguage;
+
+	/**
+	 * @var    boolean  True if the web client is a robot.
+	 * @since  1.0
+	 */
+	protected $robot = false;
+
+	/**
+	 * @var    array  An array of flags determining whether or not a detection routine has been run.
+	 * @since  1.0
+	 */
+	protected $detection = array();
+
+	/**
+	 * @var    array  An array of headers sent by client
+	 * @since  1.3.0
+	 */
+	protected $headers;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   string  $userAgent       The optional user-agent string to parse.
+	 * @param   string  $acceptEncoding  The optional client accept encoding string to parse.
+	 * @param   string  $acceptLanguage  The optional client accept language string to parse.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($userAgent = null, $acceptEncoding = null, $acceptLanguage = null)
+	{
+		// If no explicit user agent string was given attempt to use the implicit one from server environment.
+		if (empty($userAgent) && isset($_SERVER['HTTP_USER_AGENT']))
+		{
+			$this->userAgent = $_SERVER['HTTP_USER_AGENT'];
+		}
+		else
+		{
+			$this->userAgent = $userAgent;
+		}
+
+		// If no explicit acceptable encoding string was given attempt to use the implicit one from server environment.
+		if (empty($acceptEncoding) && isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+		{
+			$this->acceptEncoding = $_SERVER['HTTP_ACCEPT_ENCODING'];
+		}
+		else
+		{
+			$this->acceptEncoding = $acceptEncoding;
+		}
+
+		// If no explicit acceptable languages string was given attempt to use the implicit one from server environment.
+		if (empty($acceptLanguage) && isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		{
+			$this->acceptLanguage = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+		}
+		else
+		{
+			$this->acceptLanguage = $acceptLanguage;
+		}
+	}
+
+	/**
+	 * Magic method to get an object property's value by name.
+	 *
+	 * @param   string  $name  Name of the property for which to return a value.
+	 *
+	 * @return  mixed  The requested value if it exists.
+	 *
+	 * @since   1.0
+	 */
+	public function __get($name)
+	{
+		switch ($name)
+		{
+			case 'mobile':
+			case 'platform':
+				if (empty($this->detection['platform']))
+				{
+					$this->detectPlatform($this->userAgent);
+				}
+				break;
+
+			case 'engine':
+				if (empty($this->detection['engine']))
+				{
+					$this->detectEngine($this->userAgent);
+				}
+				break;
+
+			case 'browser':
+			case 'browserVersion':
+				if (empty($this->detection['browser']))
+				{
+					$this->detectBrowser($this->userAgent);
+				}
+				break;
+
+			case 'languages':
+				if (empty($this->detection['acceptLanguage']))
+				{
+					$this->detectLanguage($this->acceptLanguage);
+				}
+				break;
+
+			case 'encodings':
+				if (empty($this->detection['acceptEncoding']))
+				{
+					$this->detectEncoding($this->acceptEncoding);
+				}
+				break;
+
+			case 'robot':
+				if (empty($this->detection['robot']))
+				{
+					$this->detectRobot($this->userAgent);
+				}
+				break;
+			case 'headers':
+				if (empty($this->detection['headers']))
+				{
+					$this->detectHeaders();
+				}
+				break;
+		}
+
+		// Return the property if it exists.
+		if (isset($this->$name))
+		{
+			return $this->$name;
+		}
+	}
+
+	/**
+	 * Detects the client browser and version in a user agent string.
+	 *
+	 * @param   string  $userAgent  The user-agent string to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function detectBrowser($userAgent)
+	{
+		// Attempt to detect the browser type.  Obviously we are only worried about major browsers.
+		if ((stripos($userAgent, 'MSIE') !== false) && (stripos($userAgent, 'Opera') === false))
+		{
+			$this->browser = self::IE;
+			$patternBrowser = 'MSIE';
+		}
+		elseif (stripos($userAgent, 'Trident') !== false)
+		{
+			$this->browser = self::IE;
+			$patternBrowser = ' rv';
+		}
+		elseif (stripos($userAgent, 'Edge') !== false)
+		{
+			$this->browser = self::EDGE;
+			$patternBrowser = 'Edge';
+		}
+		elseif ((stripos($userAgent, 'Firefox') !== false) && (stripos($userAgent, 'like Firefox') === false))
+		{
+			$this->browser = self::FIREFOX;
+			$patternBrowser = 'Firefox';
+		}
+		elseif (stripos($userAgent, 'OPR') !== false)
+		{
+			$this->browser = self::OPERA;
+			$patternBrowser = 'OPR';
+		}
+		elseif (stripos($userAgent, 'Chrome') !== false)
+		{
+			$this->browser = self::CHROME;
+			$patternBrowser = 'Chrome';
+		}
+		elseif (stripos($userAgent, 'Safari') !== false)
+		{
+			$this->browser = self::SAFARI;
+			$patternBrowser = 'Safari';
+		}
+		elseif (stripos($userAgent, 'Opera') !== false)
+		{
+			$this->browser = self::OPERA;
+			$patternBrowser = 'Opera';
+		}
+
+		// If we detected a known browser let's attempt to determine the version.
+		if ($this->browser)
+		{
+			// Build the REGEX pattern to match the browser version string within the user agent string.
+			$pattern = '#(?<browser>Version|' . $patternBrowser . ')[/ :]+(?<version>[0-9.|a-zA-Z.]*)#';
+
+			// Attempt to find version strings in the user agent string.
+			$matches = array();
+
+			if (preg_match_all($pattern, $userAgent, $matches))
+			{
+				// Do we have both a Version and browser match?
+				if (count($matches['browser']) == 2)
+				{
+					// See whether Version or browser came first, and use the number accordingly.
+					if (strripos($userAgent, 'Version') < strripos($userAgent, $patternBrowser))
+					{
+						$this->browserVersion = $matches['version'][0];
+					}
+					else
+					{
+						$this->browserVersion = $matches['version'][1];
+					}
+				}
+				elseif (count($matches['browser']) > 2)
+				{
+					$key = array_search('Version', $matches['browser']);
+
+					if ($key)
+					{
+						$this->browserVersion = $matches['version'][$key];
+					}
+				}
+				else
+				// We only have a Version or a browser so use what we have.
+				{
+					$this->browserVersion = $matches['version'][0];
+				}
+			}
+		}
+
+		// Mark this detection routine as run.
+		$this->detection['browser'] = true;
+	}
+
+	/**
+	 * Method to detect the accepted response encoding by the client.
+	 *
+	 * @param   string  $acceptEncoding  The client accept encoding string to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function detectEncoding($acceptEncoding)
+	{
+		// Parse the accepted encodings.
+		$this->encodings = array_map('trim', (array) explode(',', $acceptEncoding));
+
+		// Mark this detection routine as run.
+		$this->detection['acceptEncoding'] = true;
+	}
+
+	/**
+	 * Detects the client rendering engine in a user agent string.
+	 *
+	 * @param   string  $userAgent  The user-agent string to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function detectEngine($userAgent)
+	{
+		if (stripos($userAgent, 'MSIE') !== false || stripos($userAgent, 'Trident') !== false)
+		{
+			// Attempt to detect the client engine -- starting with the most popular ... for now.
+			$this->engine = self::TRIDENT;
+		}
+		elseif (stripos($userAgent, 'Edge') !== false || stripos($userAgent, 'EdgeHTML') !== false)
+		{
+			$this->engine = self::EDGE;
+		}
+		elseif (stripos($userAgent, 'Chrome') !== false)
+		{
+			$result  = explode('/', stristr($userAgent, 'Chrome'));
+			$version = explode(' ', $result[1]);
+
+			if ($version[0] >= 28)
+			{
+				$this->engine = self::BLINK;
+			}
+			else
+			{
+				$this->engine = self::WEBKIT;
+			}
+		}
+		elseif (stripos($userAgent, 'AppleWebKit') !== false || stripos($userAgent, 'blackberry') !== false)
+		{
+			if (stripos($userAgent, 'AppleWebKit') !== false)
+			{
+				$result  = explode('/', stristr($userAgent, 'AppleWebKit'));
+				$version = explode(' ', $result[1]);
+
+				if ($version[0] === 537.36)
+				{
+					// AppleWebKit/537.36 is Blink engine specific, exception is Blink emulated IEMobile, Trident or Edge
+					$this->engine = self::BLINK;
+				}
+			}
+
+			// Evidently blackberry uses WebKit and doesn't necessarily report it.  Bad RIM.
+			$this->engine = self::WEBKIT;
+		}
+		elseif (stripos($userAgent, 'Gecko') !== false && stripos($userAgent, 'like Gecko') === false)
+		{
+			// We have to check for like Gecko because some other browsers spoof Gecko.
+			$this->engine = self::GECKO;
+		}
+		elseif (stripos($userAgent, 'Opera') !== false || stripos($userAgent, 'Presto') !== false)
+		{
+			$version = false;
+
+			if (preg_match('/Opera[\/| ]?([0-9.]+)/u', $userAgent, $match))
+			{
+				$version = floatval($match[1]);
+			}
+
+			if (preg_match('/Version\/([0-9.]+)/u', $userAgent, $match))
+			{
+				if (floatval($match[1]) >= 10)
+				{
+					$version = floatval($match[1]);
+				}
+			}
+
+			if ($version !== false && $version >= 15)
+			{
+				$this->engine = self::BLINK;
+			}
+			else
+			{
+				$this->engine = self::PRESTO;
+			}
+		}
+		elseif (stripos($userAgent, 'KHTML') !== false)
+		{
+			// *sigh*
+			$this->engine = self::KHTML;
+		}
+		elseif (stripos($userAgent, 'Amaya') !== false)
+		{
+			// Lesser known engine but it finishes off the major list from Wikipedia :-)
+			$this->engine = self::AMAYA;
+		}
+
+		// Mark this detection routine as run.
+		$this->detection['engine'] = true;
+	}
+
+	/**
+	 * Method to detect the accepted languages by the client.
+	 *
+	 * @param   mixed  $acceptLanguage  The client accept language string to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function detectLanguage($acceptLanguage)
+	{
+		// Parse the accepted encodings.
+		$this->languages = array_map('trim', (array) explode(',', $acceptLanguage));
+
+		// Mark this detection routine as run.
+		$this->detection['acceptLanguage'] = true;
+	}
+
+	/**
+	 * Detects the client platform in a user agent string.
+	 *
+	 * @param   string  $userAgent  The user-agent string to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function detectPlatform($userAgent)
+	{
+		// Attempt to detect the client platform.
+		if (stripos($userAgent, 'Windows') !== false)
+		{
+			$this->platform = self::WINDOWS;
+
+			// Let's look at the specific mobile options in the Windows space.
+			if (stripos($userAgent, 'Windows Phone') !== false)
+			{
+				$this->mobile = true;
+				$this->platform = self::WINDOWS_PHONE;
+			}
+			elseif (stripos($userAgent, 'Windows CE') !== false)
+			{
+				$this->mobile = true;
+				$this->platform = self::WINDOWS_CE;
+			}
+		}
+		elseif (stripos($userAgent, 'iPhone') !== false)
+		{
+			// Interestingly 'iPhone' is present in all iOS devices so far including iPad and iPods.
+			$this->mobile = true;
+			$this->platform = self::IPHONE;
+
+			// Let's look at the specific mobile options in the iOS space.
+			if (stripos($userAgent, 'iPad') !== false)
+			{
+				$this->platform = self::IPAD;
+			}
+			elseif (stripos($userAgent, 'iPod') !== false)
+			{
+				$this->platform = self::IPOD;
+			}
+		}
+		elseif (stripos($userAgent, 'iPad') !== false)
+		{
+			// In case where iPhone is not mentioed in iPad user agent string
+			$this->mobile = true;
+			$this->platform = self::IPAD;
+		}
+		elseif (stripos($userAgent, 'iPod') !== false)
+		{
+			// In case where iPhone is not mentioed in iPod user agent string
+			$this->mobile = true;
+			$this->platform = self::IPOD;
+		}
+		elseif (preg_match('/macintosh|mac os x/i', $userAgent))
+		{
+			// This has to come after the iPhone check because mac strings are also present in iOS devices.
+			$this->platform = self::MAC;
+		}
+		elseif (stripos($userAgent, 'Blackberry') !== false)
+		{
+			$this->mobile = true;
+			$this->platform = self::BLACKBERRY;
+		}
+		elseif (stripos($userAgent, 'Android') !== false)
+		{
+			$this->mobile = true;
+			$this->platform = self::ANDROID;
+			/**
+			 * Attempt to distinguish between Android phones and tablets
+			 * There is no totally foolproof method but certain rules almost always hold
+			 *   Android 3.x is only used for tablets
+			 *   Some devices and browsers encourage users to change their UA string to include Tablet.
+			 *   Google encourages manufacturers to exclude the string Mobile from tablet device UA strings.
+			 *   In some modes Kindle Android devices include the string Mobile but they include the string Silk.
+			 */
+			if (stripos($userAgent, 'Android 3') !== false || stripos($userAgent, 'Tablet') !== false
+				|| stripos($userAgent, 'Mobile') === false || stripos($userAgent, 'Silk') !== false )
+			{
+				$this->platform = self::ANDROIDTABLET;
+			}
+		}
+		elseif (stripos($userAgent, 'Linux') !== false)
+		{
+			$this->platform = self::LINUX;
+		}
+
+		// Mark this detection routine as run.
+		$this->detection['platform'] = true;
+	}
+
+	/**
+	 * Determines if the browser is a robot or not.
+	 *
+	 * @param   string  $userAgent  The user-agent string to parse.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function detectRobot($userAgent)
+	{
+		if (preg_match('/http|bot|bingbot|googlebot|robot|spider|slurp|crawler|curl|^$/i', $userAgent))
+		{
+			$this->robot = true;
+		}
+		else
+		{
+			$this->robot = false;
+		}
+
+		$this->detection['robot'] = true;
+	}
+
+	/**
+	 * Fills internal array of headers
+	 *
+	 * @return  void
+	 *
+	 * @since   1.3.0
+	 */
+	protected function detectHeaders()
+	{
+		if (function_exists('getallheaders'))
+		// If php is working under Apache, there is a special function
+		{
+			$this->headers = getallheaders();
+		}
+		else
+		// Else we fill headers from $_SERVER variable
+		{
+			$this->headers = array();
+
+			foreach ($_SERVER as $name => $value)
+			{
+				if (substr($name, 0, 5) == 'HTTP_')
+				{
+					$this->headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
+				}
+			}
+		}
+
+		// Mark this detection routine as run.
+		$this->detection['headers'] = true;
+	}
+}
diff --git a/core/libraries/vendor/joomla/archive/LICENSE b/core/libraries/vendor/joomla/archive/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/archive/src/Archive.php b/core/libraries/vendor/joomla/archive/src/Archive.php
new file mode 100644
index 00000000..c5ef5fdd
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/src/Archive.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Part of the Joomla Framework Archive Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Archive;
+
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
+
+/**
+ * An Archive handling class
+ *
+ * @since  1.0
+ */
+class Archive
+{
+	/**
+	 * The array of instantiated archive adapters.
+	 *
+	 * @var    ExtractableInterface[]
+	 * @since  1.0
+	 */
+	protected $adapters = array();
+
+	/**
+	 * Holds the options array.
+	 *
+	 * @var    array|\ArrayAccess
+	 * @since  1.0
+	 */
+	public $options = array();
+
+	/**
+	 * Create a new Archive object.
+	 *
+	 * @param   array|\ArrayAccess  $options  An array of options
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (!is_array($options) && !($options instanceof \ArrayAccess))
+		{
+			throw new \InvalidArgumentException(
+				'The options param must be an array or implement the ArrayAccess interface.'
+			);
+		}
+
+		// Make sure we have a tmp directory.
+		isset($options['tmp_path']) or $options['tmp_path'] = realpath(sys_get_temp_dir());
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Extract an archive file to a directory.
+	 *
+	 * @param   string  $archivename  The name of the archive file
+	 * @param   string  $extractdir   Directory to unpack into
+	 *
+	 * @return  boolean  True for success
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function extract($archivename, $extractdir)
+	{
+		$ext = pathinfo($archivename, PATHINFO_EXTENSION);
+		$path = pathinfo($archivename, PATHINFO_DIRNAME);
+		$filename = pathinfo($archivename, PATHINFO_FILENAME);
+
+		switch ($ext)
+		{
+			case 'zip':
+				$result = $this->getAdapter('zip')->extract($archivename, $extractdir);
+				break;
+
+			case 'tar':
+				$result = $this->getAdapter('tar')->extract($archivename, $extractdir);
+				break;
+
+			case 'tgz':
+			case 'gz':
+			case 'gzip':
+				// This may just be an individual file (e.g. sql script)
+				$tmpfname = $this->options['tmp_path'] . '/' . uniqid('gzip');
+
+				try
+				{
+					$this->getAdapter('gzip')->extract($archivename, $tmpfname);
+				}
+				catch (\RuntimeException $exception)
+				{
+					@unlink($tmpfname);
+
+					return false;
+				}
+
+				if ($ext === 'tgz' || stripos($filename, '.tar') !== false)
+				{
+					$result = $this->getAdapter('tar')->extract($tmpfname, $extractdir);
+				}
+				else
+				{
+					Folder::create($path);
+					$result = File::copy($tmpfname, $extractdir . '/' . $filename, null, 0);
+				}
+
+				@unlink($tmpfname);
+
+				break;
+
+			case 'tbz2':
+			case 'bz2':
+			case 'bzip2':
+				// This may just be an individual file (e.g. sql script)
+				$tmpfname = $this->options['tmp_path'] . '/' . uniqid('bzip2');
+
+				try
+				{
+					$this->getAdapter('bzip2')->extract($archivename, $tmpfname);
+				}
+				catch (\RuntimeException $exception)
+				{
+					@unlink($tmpfname);
+
+					return false;
+				}
+
+				if ($ext === 'tbz2' || stripos($filename, '.tar') !== false)
+				{
+					$result = $this->getAdapter('tar')->extract($tmpfname, $extractdir);
+				}
+				else
+				{
+					Folder::create($path);
+					$result = File::copy($tmpfname, $extractdir . '/' . $filename, null, 0);
+				}
+
+				@unlink($tmpfname);
+
+				break;
+
+			default:
+				throw new \InvalidArgumentException(sprintf('Unknown archive type: %s', $ext));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to override the provided adapter with your own implementation.
+	 *
+	 * @param   string   $type      Name of the adapter to set.
+	 * @param   string   $class     FQCN of your class which implements ExtractableInterface.
+	 * @param   boolean  $override  True to force override the adapter type.
+	 *
+	 * @return  Archive  This object for chaining.
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function setAdapter($type, $class, $override = true)
+	{
+		if ($override || !isset($this->adapters[$type]))
+		{
+			$error = !is_object($class) && !class_exists($class)
+					? 'Archive adapter "%s" (class "%s") not found.'
+					: '';
+
+			$error = $error == '' && !($class instanceof ExtractableInterface)
+					? 'The provided adapter "%s" (class "%s") must implement Joomla\\Archive\\ExtractableInterface'
+					: $error;
+
+			$error = $error == '' && !$class::isSupported()
+					? 'Archive adapter "%s" (class "%s") not supported.'
+					: $error;
+
+			if ($error != '')
+			{
+				throw new \InvalidArgumentException(
+					sprintf($error, $type, $class)
+				);
+			}
+
+			$this->adapters[$type] = new $class($this->options);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get a file compression adapter.
+	 *
+	 * @param   string  $type  The type of adapter (bzip2|gzip|tar|zip).
+	 *
+	 * @return  ExtractableInterface  Adapter for the requested type
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function getAdapter($type)
+	{
+		$type = strtolower($type);
+
+		if (!isset($this->adapters[$type]))
+		{
+			// Try to load the adapter object
+			/* @var  ExtractableInterface  $class */
+			$class = 'Joomla\\Archive\\' . ucfirst($type);
+
+			if (!class_exists($class) || !$class::isSupported())
+			{
+				throw new \InvalidArgumentException(
+					sprintf(
+						'Archive adapter "%s" (class "%s") not found or supported.',
+						$type,
+						$class
+					)
+				);
+			}
+
+			$this->adapters[$type] = new $class($this->options);
+		}
+
+		return $this->adapters[$type];
+	}
+}
diff --git a/core/libraries/vendor/joomla/archive/src/Bzip2.php b/core/libraries/vendor/joomla/archive/src/Bzip2.php
new file mode 100644
index 00000000..a9195d02
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/src/Bzip2.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Part of the Joomla Framework Archive Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Archive;
+
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Stream;
+
+/**
+ * Bzip2 format adapter for the Archive package
+ *
+ * @since  1.0
+ */
+class Bzip2 implements ExtractableInterface
+{
+	/**
+	 * Bzip2 file data buffer
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $data = null;
+
+	/**
+	 * Holds the options array.
+	 *
+	 * @var    array|\ArrayAccess
+	 * @since  1.0
+	 */
+	protected $options = array();
+
+	/**
+	 * Create a new Archive object.
+	 *
+	 * @param   array|\ArrayAccess  $options  An array of options
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (!is_array($options) && !($options instanceof \ArrayAccess))
+		{
+			throw new \InvalidArgumentException(
+				'The options param must be an array or implement the ArrayAccess interface.'
+			);
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Extract a Bzip2 compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to Bzip2 archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function extract($archive, $destination)
+	{
+		$this->data = null;
+
+		if (!isset($this->options['use_streams']) || $this->options['use_streams'] == false)
+		{
+			// Old style: read the whole file and then parse it
+			$this->data = file_get_contents($archive);
+
+			if (!$this->data)
+			{
+				throw new \RuntimeException('Unable to read archive');
+			}
+
+			$buffer = bzdecompress($this->data);
+			unset($this->data);
+
+			if (empty($buffer))
+			{
+				throw new \RuntimeException('Unable to decompress data');
+			}
+
+			if (!File::write($destination, $buffer))
+			{
+				throw new \RuntimeException('Unable to write archive');
+			}
+		}
+		else
+		{
+			// New style! streams!
+			$input = Stream::getStream();
+
+			// Use bzip
+			$input->set('processingmethod', 'bz');
+
+			if (!$input->open($archive))
+			{
+				throw new \RuntimeException('Unable to read archive (bz2)');
+			}
+
+			$output = Stream::getStream();
+
+			if (!$output->open($destination, 'w'))
+			{
+				$input->close();
+
+				throw new \RuntimeException('Unable to write archive (bz2)');
+			}
+
+			do
+			{
+				$this->data = $input->read($input->get('chunksize', 8196));
+
+				if ($this->data)
+				{
+					if (!$output->write($this->data))
+					{
+						$input->close();
+
+						throw new \RuntimeException('Unable to write archive (bz2)');
+					}
+				}
+			}
+
+			while ($this->data);
+
+			$output->close();
+			$input->close();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   1.0
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('bz2');
+	}
+}
diff --git a/core/libraries/vendor/joomla/archive/src/ExtractableInterface.php b/core/libraries/vendor/joomla/archive/src/ExtractableInterface.php
new file mode 100644
index 00000000..d8967efd
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/src/ExtractableInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Part of the Joomla Framework Archive Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Archive;
+
+/**
+ * Archive class interface
+ *
+ * @since  1.0
+ */
+interface ExtractableInterface
+{
+	/**
+	 * Extract a compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function extract($archive, $destination);
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   1.0
+	 */
+	public static function isSupported();
+}
diff --git a/core/libraries/vendor/joomla/archive/src/Gzip.php b/core/libraries/vendor/joomla/archive/src/Gzip.php
new file mode 100644
index 00000000..59e74b14
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/src/Gzip.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * Part of the Joomla Framework Archive Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Archive;
+
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Stream;
+
+/**
+ * Gzip format adapter for the Archive package
+ *
+ * This class is inspired from and draws heavily in code and concept from the Compress package of
+ * The Horde Project <http://www.horde.org>
+ *
+ * @contributor  Michael Slusarz <slusarz@horde.org>
+ * @contributor  Michael Cochrane <mike@graftonhall.co.nz>
+ *
+ * @since  1.0
+ */
+class Gzip implements ExtractableInterface
+{
+	/**
+	 * Gzip file flags.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $flags = array('FTEXT' => 0x01, 'FHCRC' => 0x02, 'FEXTRA' => 0x04, 'FNAME' => 0x08, 'FCOMMENT' => 0x10);
+
+	/**
+	 * Gzip file data buffer
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $data = null;
+
+	/**
+	 * Holds the options array.
+	 *
+	 * @var    array|\ArrayAccess
+	 * @since  1.0
+	 */
+	protected $options = array();
+
+	/**
+	 * Create a new Archive object.
+	 *
+	 * @param   array|\ArrayAccess  $options  An array of options
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (!is_array($options) && !($options instanceof \ArrayAccess))
+		{
+			throw new \InvalidArgumentException(
+				'The options param must be an array or implement the ArrayAccess interface.'
+			);
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Extract a Gzip compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive to
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function extract($archive, $destination)
+	{
+		$this->data = null;
+
+		if (!isset($this->options['use_streams']) || $this->options['use_streams'] == false)
+		{
+			$this->data = file_get_contents($archive);
+
+			if (!$this->data)
+			{
+				throw new \RuntimeException('Unable to read archive');
+			}
+
+			$position = $this->getFilePosition();
+			$buffer = gzinflate(substr($this->data, $position, strlen($this->data) - $position));
+
+			if (empty($buffer))
+			{
+				throw new \RuntimeException('Unable to decompress data');
+			}
+
+			if (!File::write($destination, $buffer))
+			{
+				throw new \RuntimeException('Unable to write archive');
+			}
+		}
+		else
+		{
+			// New style! streams!
+			$input = Stream::getStream();
+
+			// Use gz
+			$input->set('processingmethod', 'gz');
+
+			if (!$input->open($archive))
+			{
+				throw new \RuntimeException('Unable to read archive (gz)');
+			}
+
+			$output = Stream::getStream();
+
+			if (!$output->open($destination, 'w'))
+			{
+				$input->close();
+
+				throw new \RuntimeException('Unable to write archive (gz)');
+			}
+
+			do
+			{
+				$this->data = $input->read($input->get('chunksize', 8196));
+
+				if ($this->data)
+				{
+					if (!$output->write($this->data))
+					{
+						$input->close();
+
+						throw new \RuntimeException('Unable to write file (gz)');
+					}
+				}
+			}
+
+			while ($this->data);
+
+			$output->close();
+			$input->close();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   1.0
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('zlib');
+	}
+
+	/**
+	 * Get file data offset for archive
+	 *
+	 * @return  integer  Data position marker for archive
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function getFilePosition()
+	{
+		// Gzipped file... unpack it first
+		$position = 0;
+		$info = @ unpack('CCM/CFLG/VTime/CXFL/COS', substr($this->data, $position + 2));
+
+		if (!$info)
+		{
+			throw new \RuntimeException('Unable to decompress data.');
+		}
+
+		$position += 10;
+
+		if ($info['FLG'] & $this->flags['FEXTRA'])
+		{
+			$XLEN = unpack('vLength', substr($this->data, $position + 0, 2));
+			$XLEN = $XLEN['Length'];
+			$position += $XLEN + 2;
+		}
+
+		if ($info['FLG'] & $this->flags['FNAME'])
+		{
+			$filenamePos = strpos($this->data, "\x0", $position);
+			$position = $filenamePos + 1;
+		}
+
+		if ($info['FLG'] & $this->flags['FCOMMENT'])
+		{
+			$commentPos = strpos($this->data, "\x0", $position);
+			$position = $commentPos + 1;
+		}
+
+		if ($info['FLG'] & $this->flags['FHCRC'])
+		{
+			$hcrc = unpack('vCRC', substr($this->data, $position + 0, 2));
+			$hcrc = $hcrc['CRC'];
+			$position += 2;
+		}
+
+		return $position;
+	}
+}
diff --git a/core/libraries/vendor/joomla/archive/src/Tar.php b/core/libraries/vendor/joomla/archive/src/Tar.php
new file mode 100644
index 00000000..55304938
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/src/Tar.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * Part of the Joomla Framework Archive Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Archive;
+
+use Joomla\Filesystem\Path;
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
+
+/**
+ * Tar format adapter for the Archive package
+ *
+ * This class is inspired from and draws heavily in code and concept from the Compress package of
+ * The Horde Project <http://www.horde.org>
+ *
+ * @contributor  Michael Slusarz <slusarz@horde.org>
+ * @contributor  Michael Cochrane <mike@graftonhall.co.nz>
+ *
+ * @since  1.0
+ */
+class Tar implements ExtractableInterface
+{
+	/**
+	 * Tar file types.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $types = array(
+		0x0  => 'Unix file',
+		0x30 => 'File',
+		0x31 => 'Link',
+		0x32 => 'Symbolic link',
+		0x33 => 'Character special file',
+		0x34 => 'Block special file',
+		0x35 => 'Directory',
+		0x36 => 'FIFO special file',
+		0x37 => 'Contiguous file'
+	);
+
+	/**
+	 * Tar file data buffer
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $data = null;
+
+	/**
+	 * Tar file metadata array
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $metadata = null;
+
+	/**
+	 * Holds the options array.
+	 *
+	 * @var    array|\ArrayAccess
+	 * @since  1.0
+	 */
+	protected $options = array();
+
+	/**
+	 * Create a new Archive object.
+	 *
+	 * @param   array|\ArrayAccess  $options  An array of options or an object that implements \ArrayAccess
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (!is_array($options) && !($options instanceof \ArrayAccess))
+		{
+			throw new \InvalidArgumentException(
+				'The options param must be an array or implement the ArrayAccess interface.'
+			);
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive into
+	 *
+	 * @return  boolean True if successful
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function extract($archive, $destination)
+	{
+		$this->data = null;
+		$this->metadata = null;
+
+		$this->data = file_get_contents($archive);
+
+		if (!$this->data)
+		{
+			throw new \RuntimeException('Unable to read archive');
+		}
+
+		$this->getTarInfo($this->data);
+
+		for ($i = 0, $n = count($this->metadata); $i < $n; $i++)
+		{
+			$type = strtolower($this->metadata[$i]['type']);
+
+			if ($type == 'file' || $type == 'unix file')
+			{
+				$buffer = $this->metadata[$i]['data'];
+				$path = Path::clean($destination . '/' . $this->metadata[$i]['name']);
+
+				// Make sure the destination folder exists
+				if (!Folder::create(dirname($path)))
+				{
+					throw new \RuntimeException('Unable to create destination');
+				}
+
+				if (!File::write($path, $buffer))
+				{
+					throw new \RuntimeException('Unable to write entry');
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   1.0
+	 */
+	public static function isSupported()
+	{
+		return true;
+	}
+
+	/**
+	 * Get the list of files/data from a Tar archive buffer.
+	 *
+	 * @param   string  &$data  The Tar archive buffer.
+	 *
+	 * @return  array  Archive metadata array
+	 * <pre>
+	 * KEY: Position in the array
+	 * VALUES: 'attr'  --  File attributes
+	 * 'data'  --  Raw file contents
+	 * 'date'  --  File modification time
+	 * 'name'  --  Filename
+	 * 'size'  --  Original file size
+	 * 'type'  --  File type
+	 * </pre>
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function getTarInfo(&$data)
+	{
+		$position = 0;
+		$return_array = array();
+
+		while ($position < strlen($data))
+		{
+			if (version_compare(PHP_VERSION, '5.5', '>='))
+			{
+				$info = @unpack(
+					"Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/Z8checksum/Ctypeflag/Z100link/Z6magic/Z2version/Z32uname/Z32gname/Z8devmajor/Z8devminor",
+					substr($data, $position)
+				);
+			}
+			else
+			{
+				$info = @unpack(
+					"a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/Ctypeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor",
+					substr($data, $position)
+				);
+			}
+
+			/*
+			 * This variable has been set in the previous loop, meaning that the filename was present in the previous block
+			 * to allow more than 100 characters - see below
+			 */
+			if (isset($longlinkfilename))
+			{
+				$info['filename'] = $longlinkfilename;
+				unset($longlinkfilename);
+			}
+
+			if (!$info)
+			{
+				throw new \RuntimeException('Unable to decompress data');
+			}
+
+			$position += 512;
+			$contents = substr($data, $position, octdec($info['size']));
+			$position += ceil(octdec($info['size']) / 512) * 512;
+
+			if ($info['filename'])
+			{
+				$file = array(
+					'attr' => null,
+					'data' => null,
+					'date' => octdec($info['mtime']),
+					'name' => trim($info['filename']),
+					'size' => octdec($info['size']),
+					'type' => isset($this->types[$info['typeflag']]) ? $this->types[$info['typeflag']] : null);
+
+				if (($info['typeflag'] == 0) || ($info['typeflag'] == 0x30) || ($info['typeflag'] == 0x35))
+				{
+					// File or folder.
+					$file['data'] = $contents;
+
+					$mode = hexdec(substr($info['mode'], 4, 3));
+					$file['attr'] = (($info['typeflag'] == 0x35) ? 'd' : '-') . (($mode & 0x400) ? 'r' : '-') . (($mode & 0x200) ? 'w' : '-') .
+						(($mode & 0x100) ? 'x' : '-') . (($mode & 0x040) ? 'r' : '-') . (($mode & 0x020) ? 'w' : '-') . (($mode & 0x010) ? 'x' : '-') .
+						(($mode & 0x004) ? 'r' : '-') . (($mode & 0x002) ? 'w' : '-') . (($mode & 0x001) ? 'x' : '-');
+				}
+				elseif (chr($info['typeflag']) == 'L' && $info['filename'] == '././@LongLink')
+				{
+					// GNU tar ././@LongLink support - the filename is actually in the contents, set a variable here so we can test in the next loop
+					$longlinkfilename = $contents;
+
+					// And the file contents are in the next block so we'll need to skip this
+					continue;
+				}
+				else
+				{
+					// Some other type.
+				}
+
+				$return_array[] = $file;
+			}
+		}
+
+		$this->metadata = $return_array;
+
+		return true;
+	}
+}
diff --git a/core/libraries/vendor/joomla/archive/src/Zip.php b/core/libraries/vendor/joomla/archive/src/Zip.php
new file mode 100644
index 00000000..341e0b14
--- /dev/null
+++ b/core/libraries/vendor/joomla/archive/src/Zip.php
@@ -0,0 +1,634 @@
+<?php
+/**
+ * Part of the Joomla Framework Archive Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Archive;
+
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Path;
+use Joomla\Filesystem\Folder;
+
+/**
+ * ZIP format adapter for the Archive package
+ *
+ * The ZIP compression code is partially based on code from:
+ * Eric Mueller <eric@themepark.com>
+ * http://www.zend.com/codex.php?id=535&single=1
+ *
+ * Deins125 <webmaster@atlant.ru>
+ * http://www.zend.com/codex.php?id=470&single=1
+ *
+ * The ZIP compression date code is partially based on code from
+ * Peter Listiak <mlady@users.sourceforge.net>
+ *
+ * This class is inspired from and draws heavily in code and concept from the Compress package of
+ * The Horde Project <http://www.horde.org>
+ *
+ * @contributor  Chuck Hagenbuch <chuck@horde.org>
+ * @contributor  Michael Slusarz <slusarz@horde.org>
+ * @contributor  Michael Cochrane <mike@graftonhall.co.nz>
+ *
+ * @since  1.0
+ */
+class Zip implements ExtractableInterface
+{
+	/**
+	 * ZIP compression methods.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $methods = array(
+		0x0 => 'None',
+		0x1 => 'Shrunk',
+		0x2 => 'Super Fast',
+		0x3 => 'Fast',
+		0x4 => 'Normal',
+		0x5 => 'Maximum',
+		0x6 => 'Imploded',
+		0x8 => 'Deflated'
+	);
+
+	/**
+	 * Beginning of central directory record.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $ctrlDirHeader = "\x50\x4b\x01\x02";
+
+	/**
+	 * End of central directory record.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $ctrlDirEnd = "\x50\x4b\x05\x06\x00\x00\x00\x00";
+
+	/**
+	 * Beginning of file contents.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $fileHeader = "\x50\x4b\x03\x04";
+
+	/**
+	 * ZIP file data buffer
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $data = null;
+
+	/**
+	 * ZIP file metadata array
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $metadata = null;
+
+	/**
+	 * Holds the options array.
+	 *
+	 * @var    array|\ArrayAccess
+	 * @since  1.0
+	 */
+	protected $options = array();
+
+	/**
+	 * Create a new Archive object.
+	 *
+	 * @param   array|\ArrayAccess  $options  An array of options or an object that implements \ArrayAccess
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($options = array())
+	{
+		if (!is_array($options) && !($options instanceof \ArrayAccess))
+		{
+			throw new \InvalidArgumentException(
+				'The options param must be an array or implement the ArrayAccess interface.'
+			);
+		}
+
+		$this->options = $options;
+	}
+
+	/**
+	 * Create a ZIP compressed file from an array of file data.
+	 *
+	 * @param   string  $archive  Path to save archive.
+	 * @param   array   $files    Array of files to add to archive.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @since   1.0
+	 * @todo    Finish Implementation
+	 */
+	public function create($archive, $files)
+	{
+		$contents = array();
+		$ctrldir = array();
+
+		foreach ($files as $file)
+		{
+			$this->addToZipFile($file, $contents, $ctrldir);
+		}
+
+		return $this->createZipFile($contents, $ctrldir, $archive);
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive into
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function extract($archive, $destination)
+	{
+		if (!is_file($archive))
+		{
+			throw new \RuntimeException('Archive does not exist');
+		}
+
+		if ($this->hasNativeSupport())
+		{
+			return $this->extractNative($archive, $destination);
+		}
+
+		return $this->extractCustom($archive, $destination);
+	}
+
+	/**
+	 * Tests whether this adapter can unpack files on this computer.
+	 *
+	 * @return  boolean  True if supported
+	 *
+	 * @since   1.0
+	 */
+	public static function isSupported()
+	{
+		return self::hasNativeSupport() || extension_loaded('zlib');
+	}
+
+	/**
+	 * Method to determine if the server has native zip support for faster handling
+	 *
+	 * @return  boolean  True if php has native ZIP support
+	 *
+	 * @since   1.0
+	 */
+	public static function hasNativeSupport()
+	{
+		return extension_loaded('zip');
+	}
+
+	/**
+	 * Checks to see if the data is a valid ZIP file.
+	 *
+	 * @param   string  &$data  ZIP archive data buffer.
+	 *
+	 * @return  boolean  True if valid, false if invalid.
+	 *
+	 * @since   1.0
+	 */
+	public function checkZipData(&$data)
+	{
+		return strpos($data, $this->fileHeader) !== false;
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path using a php based algorithm that only requires zlib support
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract.
+	 * @param   string  $destination  Path to extract archive into.
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function extractCustom($archive, $destination)
+	{
+		$this->data = null;
+		$this->metadata = null;
+
+		$this->data = file_get_contents($archive);
+
+		if (!$this->data)
+		{
+			throw new \RuntimeException('Unable to read archive (zip)');
+		}
+
+		if (!$this->readZipInfo($this->data))
+		{
+			throw new \RuntimeException('Get ZIP Information failed');
+		}
+
+		for ($i = 0, $n = count($this->metadata); $i < $n; $i++)
+		{
+			$lastPathCharacter = substr($this->metadata[$i]['name'], -1, 1);
+
+			if ($lastPathCharacter !== '/' && $lastPathCharacter !== '\\')
+			{
+				$buffer = $this->getFileData($i);
+				$path = Path::clean($destination . '/' . $this->metadata[$i]['name']);
+
+				// Make sure the destination folder exists
+				if (!Folder::create(dirname($path)))
+				{
+					throw new \RuntimeException('Unable to create destination');
+				}
+
+				if (!File::write($path, $buffer))
+				{
+					throw new \RuntimeException('Unable to write entry');
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Extract a ZIP compressed file to a given path using native php api calls for speed
+	 *
+	 * @param   string  $archive      Path to ZIP archive to extract
+	 * @param   string  $destination  Path to extract archive into
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function extractNative($archive, $destination)
+	{
+		$zip = zip_open($archive);
+
+		if (!is_resource($zip))
+		{
+			throw new \RuntimeException('Unable to open archive');
+		}
+
+		// Make sure the destination folder exists
+		if (!Folder::create($destination))
+		{
+			throw new \RuntimeException('Unable to create destination');
+		}
+
+		// Read files in the archive
+		while ($file = @zip_read($zip))
+		{
+			if (!zip_entry_open($zip, $file, "r"))
+			{
+				throw new \RuntimeException('Unable to read entry');
+			}
+
+			if (substr(zip_entry_name($file), strlen(zip_entry_name($file)) - 1) != "/")
+			{
+				$buffer = zip_entry_read($file, zip_entry_filesize($file));
+
+				if (File::write($destination . '/' . zip_entry_name($file), $buffer) === false)
+				{
+					throw new \RuntimeException('Unable to write entry');
+				}
+
+				zip_entry_close($file);
+			}
+		}
+
+		@zip_close($zip);
+
+		return true;
+	}
+
+	/**
+	 * Get the list of files/data from a ZIP archive buffer.
+	 *
+	 * <pre>
+	 * KEY: Position in zipfile
+	 * VALUES: 'attr'  --  File attributes
+	 * 'crc'   --  CRC checksum
+	 * 'csize' --  Compressed file size
+	 * 'date'  --  File modification time
+	 * 'name'  --  Filename
+	 * 'method'--  Compression method
+	 * 'size'  --  Original file size
+	 * 'type'  --  File type
+	 * </pre>
+	 *
+	 * @param   string  &$data  The ZIP archive buffer.
+	 *
+	 * @return  boolean True on success
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	private function readZipInfo(&$data)
+	{
+		$entries = array();
+
+		// Find the last central directory header entry
+		$fhLast = strpos($data, $this->ctrlDirEnd);
+
+		do
+		{
+			$last = $fhLast;
+		}
+
+		while (($fhLast = strpos($data, $this->ctrlDirEnd, $fhLast + 1)) !== false);
+
+		// Find the central directory offset
+		$offset = 0;
+
+		if ($last)
+		{
+			$endOfCentralDirectory = unpack(
+				'vNumberOfDisk/vNoOfDiskWithStartOfCentralDirectory/vNoOfCentralDirectoryEntriesOnDisk/' .
+				'vTotalCentralDirectoryEntries/VSizeOfCentralDirectory/VCentralDirectoryOffset/vCommentLength',
+				substr($data, $last + 4)
+			);
+			$offset = $endOfCentralDirectory['CentralDirectoryOffset'];
+		}
+
+		// Get details from central directory structure.
+		$fhStart = strpos($data, $this->ctrlDirHeader, $offset);
+		$dataLength = strlen($data);
+
+		do
+		{
+			if ($dataLength < $fhStart + 31)
+			{
+				throw new \RuntimeException('Invalid Zip Data');
+			}
+
+			$info = unpack('vMethod/VTime/VCRC32/VCompressed/VUncompressed/vLength', substr($data, $fhStart + 10, 20));
+			$name = substr($data, $fhStart + 46, $info['Length']);
+
+			$entries[$name] = array(
+				'attr' => null,
+				'crc' => sprintf("%08s", dechex($info['CRC32'])),
+				'csize' => $info['Compressed'],
+				'date' => null,
+				'_dataStart' => null,
+				'name' => $name,
+				'method' => $this->methods[$info['Method']],
+				'_method' => $info['Method'],
+				'size' => $info['Uncompressed'],
+				'type' => null
+			);
+
+			$entries[$name]['date'] = mktime(
+				(($info['Time'] >> 11) & 0x1f),
+				(($info['Time'] >> 5) & 0x3f),
+				(($info['Time'] << 1) & 0x3e),
+				(($info['Time'] >> 21) & 0x07),
+				(($info['Time'] >> 16) & 0x1f),
+				((($info['Time'] >> 25) & 0x7f) + 1980)
+			);
+
+			if ($dataLength < $fhStart + 43)
+			{
+				throw new \RuntimeException('Invalid ZIP data');
+			}
+
+			$info = unpack('vInternal/VExternal/VOffset', substr($data, $fhStart + 36, 10));
+
+			$entries[$name]['type'] = ($info['Internal'] & 0x01) ? 'text' : 'binary';
+			$entries[$name]['attr'] = (($info['External'] & 0x10) ? 'D' : '-') . (($info['External'] & 0x20) ? 'A' : '-')
+				. (($info['External'] & 0x03) ? 'S' : '-') . (($info['External'] & 0x02) ? 'H' : '-') . (($info['External'] & 0x01) ? 'R' : '-');
+			$entries[$name]['offset'] = $info['Offset'];
+
+			// Get details from local file header since we have the offset
+			$lfhStart = strpos($data, $this->fileHeader, $entries[$name]['offset']);
+
+			if ($dataLength < $lfhStart + 34)
+			{
+				throw new \RuntimeException('Invalid Zip Data');
+			}
+
+			$info = unpack('vMethod/VTime/VCRC32/VCompressed/VUncompressed/vLength/vExtraLength', substr($data, $lfhStart + 8, 25));
+			$name = substr($data, $lfhStart + 30, $info['Length']);
+			$entries[$name]['_dataStart'] = $lfhStart + 30 + $info['Length'] + $info['ExtraLength'];
+
+			// Bump the max execution time because not using the built in php zip libs makes this process slow.
+			@set_time_limit(ini_get('max_execution_time'));
+		}
+
+		while ((($fhStart = strpos($data, $this->ctrlDirHeader, $fhStart + 46)) !== false));
+
+		$this->metadata = array_values($entries);
+
+		return true;
+	}
+
+	/**
+	 * Returns the file data for a file by offsest in the ZIP archive
+	 *
+	 * @param   integer  $key  The position of the file in the archive.
+	 *
+	 * @return  string  Uncompressed file data buffer.
+	 *
+	 * @since   1.0
+	 */
+	private function getFileData($key)
+	{
+		if ($this->metadata[$key]['_method'] == 0x8)
+		{
+			return gzinflate(substr($this->data, $this->metadata[$key]['_dataStart'], $this->metadata[$key]['csize']));
+		}
+		elseif ($this->metadata[$key]['_method'] == 0x0)
+		{
+			/* Files that aren't compressed. */
+			return substr($this->data, $this->metadata[$key]['_dataStart'], $this->metadata[$key]['csize']);
+		}
+		elseif ($this->metadata[$key]['_method'] == 0x12)
+		{
+			// If bz2 extension is loaded use it
+			if (extension_loaded('bz2'))
+			{
+				return bzdecompress(substr($this->data, $this->metadata[$key]['_dataStart'], $this->metadata[$key]['csize']));
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * Converts a UNIX timestamp to a 4-byte DOS date and time format
+	 * (date in high 2-bytes, time in low 2-bytes allowing magnitude
+	 * comparison).
+	 *
+	 * @param   integer  $unixtime  The current UNIX timestamp.
+	 *
+	 * @return  integer  The current date in a 4-byte DOS format.
+	 *
+	 * @since   1.0
+	 */
+	protected function unix2DosTime($unixtime = null)
+	{
+		$timearray = (is_null($unixtime)) ? getdate() : getdate($unixtime);
+
+		if ($timearray['year'] < 1980)
+		{
+			$timearray['year'] = 1980;
+			$timearray['mon'] = 1;
+			$timearray['mday'] = 1;
+			$timearray['hours'] = 0;
+			$timearray['minutes'] = 0;
+			$timearray['seconds'] = 0;
+		}
+
+		return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) | ($timearray['hours'] << 11) |
+			($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1);
+	}
+
+	/**
+	 * Adds a "file" to the ZIP archive.
+	 *
+	 * @param   array  &$file      File data array to add
+	 * @param   array  &$contents  An array of existing zipped files.
+	 * @param   array  &$ctrldir   An array of central directory information.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @todo    Review and finish implementation
+	 */
+	private function addToZipFile(array &$file, array &$contents, array &$ctrldir)
+	{
+		$data = &$file['data'];
+		$name = str_replace('\\', '/', $file['name']);
+
+		/* See if time/date information has been provided. */
+		$ftime = null;
+
+		if (isset($file['time']))
+		{
+			$ftime = $file['time'];
+		}
+
+		// Get the hex time.
+		$dtime = dechex($this->unix2DosTime($ftime));
+		$hexdtime = chr(hexdec($dtime[6] . $dtime[7])) . chr(hexdec($dtime[4] . $dtime[5])) . chr(hexdec($dtime[2] . $dtime[3]))
+			. chr(hexdec($dtime[0] . $dtime[1]));
+
+		/* Begin creating the ZIP data. */
+		$fr = $this->fileHeader;
+		/* Version needed to extract. */
+		$fr .= "\x14\x00";
+		/* General purpose bit flag. */
+		$fr .= "\x00\x00";
+		/* Compression method. */
+		$fr .= "\x08\x00";
+		/* Last modification time/date. */
+		$fr .= $hexdtime;
+
+		/* "Local file header" segment. */
+		$unc_len = strlen($data);
+		$crc = crc32($data);
+		$zdata = gzcompress($data);
+		$zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2);
+		$c_len = strlen($zdata);
+
+		/* CRC 32 information. */
+		$fr .= pack('V', $crc);
+		/* Compressed filesize. */
+		$fr .= pack('V', $c_len);
+		/* Uncompressed filesize. */
+		$fr .= pack('V', $unc_len);
+		/* Length of filename. */
+		$fr .= pack('v', strlen($name));
+		/* Extra field length. */
+		$fr .= pack('v', 0);
+		/* File name. */
+		$fr .= $name;
+
+		/* "File data" segment. */
+		$fr .= $zdata;
+
+		/* Add this entry to array. */
+		$old_offset = strlen(implode('', $contents));
+		$contents[] = &$fr;
+
+		/* Add to central directory record. */
+		$cdrec = $this->ctrlDirHeader;
+		/* Version made by. */
+		$cdrec .= "\x00\x00";
+		/* Version needed to extract */
+		$cdrec .= "\x14\x00";
+		/* General purpose bit flag */
+		$cdrec .= "\x00\x00";
+		/* Compression method */
+		$cdrec .= "\x08\x00";
+		/* Last mod time/date. */
+		$cdrec .= $hexdtime;
+		/* CRC 32 information. */
+		$cdrec .= pack('V', $crc);
+		/* Compressed filesize. */
+		$cdrec .= pack('V', $c_len);
+		/* Uncompressed filesize. */
+		$cdrec .= pack('V', $unc_len);
+		/* Length of filename. */
+		$cdrec .= pack('v', strlen($name));
+		/* Extra field length. */
+		$cdrec .= pack('v', 0);
+		/* File comment length. */
+		$cdrec .= pack('v', 0);
+		/* Disk number start. */
+		$cdrec .= pack('v', 0);
+		/* Internal file attributes. */
+		$cdrec .= pack('v', 0);
+		/* External file attributes -'archive' bit set. */
+		$cdrec .= pack('V', 32);
+		/* Relative offset of local header. */
+		$cdrec .= pack('V', $old_offset);
+		/* File name. */
+		$cdrec .= $name;
+		/* Optional extra field, file comment goes here. */
+
+		/* Save to central directory array. */
+		$ctrldir[] = &$cdrec;
+	}
+
+	/**
+	 * Creates the ZIP file.
+	 *
+	 * Official ZIP file format: http://www.pkware.com/appnote.txt
+	 *
+	 * @param   array   &$contents  An array of existing zipped files.
+	 * @param   array   &$ctrlDir   An array of central directory information.
+	 * @param   string  $path       The path to store the archive.
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @todo	Review and finish implementation
+	 */
+	private function createZipFile(array &$contents, array &$ctrlDir, $path)
+	{
+		$data = implode('', $contents);
+		$dir = implode('', $ctrlDir);
+
+		$buffer = $data . $dir . $this->ctrlDirEnd . /* Total # of entries "on this disk". */
+		pack('v', count($ctrlDir)) . /* Total # of entries overall. */
+		pack('v', count($ctrlDir)) . /* Size of central directory. */
+		pack('V', strlen($dir)) . /* Offset to start of central dir. */
+		pack('V', strlen($data)) . /* ZIP file comment length. */
+		"\x00\x00";
+
+		return File::write($path, $buffer);
+	}
+}
diff --git a/core/libraries/vendor/joomla/compat/LICENSE b/core/libraries/vendor/joomla/compat/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/compat/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/compat/src/CallbackFilterIterator.php b/core/libraries/vendor/joomla/compat/src/CallbackFilterIterator.php
new file mode 100644
index 00000000..4fb7ffd9
--- /dev/null
+++ b/core/libraries/vendor/joomla/compat/src/CallbackFilterIterator.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Part of the Joomla Framework Compat Package
+ *
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+/**
+ * CallbackFilterIterator using the callback to determine which items are accepted or rejected.
+ *
+ * @link   http://php.net/manual/en/class.callbackfilteriterator.php
+ * @since  1.2.0
+ */
+class CallbackFilterIterator extends \FilterIterator
+{
+	/**
+	 * The callback to check value.
+	 *
+	 * @var    callable
+	 *
+	 * @since  1.2.0
+	 */
+	protected $callback = null;
+
+	/**
+	 * Creates a filtered iterator using the callback to determine
+	 * which items are accepted or rejected.
+	 *
+	 * @param   \Iterator  $iterator  The iterator to be filtered.
+	 * @param   callable   $callback  The callback, which should return TRUE to accept the current item
+	 *                                or FALSE otherwise. May be any valid callable value.
+	 *                                The callback should accept up to three arguments: the current item,
+	 *                                the current key and the iterator, respectively.
+	 *                                ``` php
+	 *                                function my_callback($current, $key, $iterator)
+	 *                                ```
+	 *
+	 * @throws  InvalidArgumentException
+	 *
+	 * @since   1.2.0
+	 */
+	public function __construct(\Iterator $iterator, $callback)
+	{
+		if (!is_callable($callback))
+		{
+			throw new \InvalidArgumentException("Argument 2 of CallbackFilterIterator should be callable.");
+		}
+
+		$this->callback = $callback;
+
+		parent::__construct($iterator);
+	}
+
+	/**
+	 * This method calls the callback with the current value, current key and the inner iterator.
+	 * The callback is expected to return TRUE if the current item is to be accepted, or FALSE otherwise.
+	 *
+	 * @link    http://www.php.net/manual/en/callbackfilteriterator.accept.php
+	 *
+	 * @return  boolean  True if the current element is acceptable, otherwise false.
+	 *
+	 * @since   1.2.0
+	 */
+	public function accept()
+	{
+		$inner = $this->getInnerIterator();
+
+		return call_user_func_array(
+			$this->callback,
+			array(
+				$inner->current(),
+				$inner->key(),
+				$inner
+			)
+		);
+	}
+}
diff --git a/core/libraries/vendor/joomla/compat/src/JsonSerializable.php b/core/libraries/vendor/joomla/compat/src/JsonSerializable.php
new file mode 100644
index 00000000..4f513f62
--- /dev/null
+++ b/core/libraries/vendor/joomla/compat/src/JsonSerializable.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Part of the Joomla Framework Compat Package
+ *
+ * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+/**
+ * JsonSerializable interface. This file provides backwards compatibility to PHP 5.3 and ensures
+ * the interface is present in systems where JSON related code was removed.
+ *
+ * @link   http://www.php.net/manual/en/jsonserializable.jsonserialize.php
+ * @since  1.0
+ */
+interface JsonSerializable
+{
+	/**
+	 * Return data which should be serialized by json_encode().
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 */
+	public function jsonSerialize();
+}
diff --git a/core/libraries/vendor/joomla/data/LICENSE b/core/libraries/vendor/joomla/data/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/data/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/data/src/DataObject.php b/core/libraries/vendor/joomla/data/src/DataObject.php
new file mode 100644
index 00000000..efae36af
--- /dev/null
+++ b/core/libraries/vendor/joomla/data/src/DataObject.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * Part of the Joomla Framework Data Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Data;
+
+use Joomla\Registry\Registry;
+
+/**
+ * DataObject is a class that is used to store data but allowing you to access the data
+ * by mimicking the way PHP handles class properties.
+ *
+ * @since  1.0
+ */
+class DataObject implements DumpableInterface, \IteratorAggregate, \JsonSerializable, \Countable
+{
+	/**
+	 * The data object properties.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $properties = array();
+
+	/**
+	 * The class constructor.
+	 *
+	 * @param   mixed  $properties  Either an associative array or another object
+	 *                              by which to set the initial properties of the new object.
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function __construct($properties = array())
+	{
+		// Check the properties input.
+		if (!empty($properties))
+		{
+			// Bind the properties.
+			$this->bind($properties);
+		}
+	}
+
+	/**
+	 * The magic get method is used to get a data property.
+	 *
+	 * This method is a public proxy for the protected getProperty method.
+	 *
+	 * Note: Magic __get does not allow recursive calls. This can be tricky because the error generated by recursing into
+	 * __get is "Undefined property:  {CLASS}::{PROPERTY}" which is misleading. This is relevant for this class because
+	 * requesting a non-visible property can trigger a call to a sub-function. If that references the property directly in
+	 * the object, it will cause a recursion into __get.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 *
+	 * @return  mixed  The value of the data property, or null if the data property does not exist.
+	 *
+	 * @see     DataObject::getProperty()
+	 * @since   1.0
+	 */
+	public function __get($property)
+	{
+		return $this->getProperty($property);
+	}
+
+	/**
+	 * The magic isset method is used to check the state of an object property.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 *
+	 * @return  boolean  True if set, otherwise false is returned.
+	 *
+	 * @since   1.0
+	 */
+	public function __isset($property)
+	{
+		return isset($this->properties[$property]);
+	}
+
+	/**
+	 * The magic set method is used to set a data property.
+	 *
+	 * This is a public proxy for the protected setProperty method.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 * @param   mixed   $value     The value to give the data property.
+	 *
+	 * @return  void
+	 *
+	 * @see     DataObject::setProperty()
+	 * @since   1.0
+	 */
+	public function __set($property, $value)
+	{
+		$this->setProperty($property, $value);
+	}
+
+	/**
+	 * The magic unset method is used to unset a data property.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function __unset($property)
+	{
+		unset($this->properties[$property]);
+	}
+
+	/**
+	 * Binds an array or object to this object.
+	 *
+	 * @param   mixed    $properties   An associative array of properties or an object.
+	 * @param   boolean  $updateNulls  True to bind null values, false to ignore null values.
+	 *
+	 * @return  DataObject  Returns itself to allow chaining.
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function bind($properties, $updateNulls = true)
+	{
+		// Check the properties data type.
+		if (!is_array($properties) && !is_object($properties))
+		{
+			throw new \InvalidArgumentException(sprintf('%s(%s)', __METHOD__, gettype($properties)));
+		}
+
+		// Check if the object is traversable.
+		if ($properties instanceof \Traversable)
+		{
+			// Convert iterator to array.
+			$properties = iterator_to_array($properties);
+		}
+		elseif (is_object($properties))
+		// Check if the object needs to be converted to an array.
+		{
+			// Convert properties to an array.
+			$properties = (array) $properties;
+		}
+
+		// Bind the properties.
+		foreach ($properties as $property => $value)
+		{
+			// Check if the value is null and should be bound.
+			if ($value === null && !$updateNulls)
+			{
+				continue;
+			}
+
+			// Set the property.
+			$this->setProperty($property, $value);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Dumps the data properties into a stdClass object, recursively if appropriate.
+	 *
+	 * @param   integer            $depth   The maximum depth of recursion (default = 3).
+	 *                                      For example, a depth of 0 will return a stdClass with all the properties in native
+	 *                                      form. A depth of 1 will recurse into the first level of properties only.
+	 * @param   \SplObjectStorage  $dumped  An array of already serialized objects that is used to avoid infinite loops.
+	 *
+	 * @return  \stdClass  The data properties as a simple PHP stdClass object.
+	 *
+	 * @since   1.0
+	 */
+	public function dump($depth = 3, \SplObjectStorage $dumped = null)
+	{
+		// Check if we should initialise the recursion tracker.
+		if ($dumped === null)
+		{
+			$dumped = new \SplObjectStorage;
+		}
+
+		// Add this object to the dumped stack.
+		$dumped->attach($this);
+
+		// Setup a container.
+		$dump = new \stdClass;
+
+		// Dump all object properties.
+		foreach (array_keys($this->properties) as $property)
+		{
+			// Get the property.
+			$dump->$property = $this->dumpProperty($property, $depth, $dumped);
+		}
+
+		return $dump;
+	}
+
+	/**
+	 * Gets this object represented as an ArrayIterator.
+	 *
+	 * This allows the data properties to be access via a foreach statement.
+	 *
+	 * @return  \ArrayIterator  This object represented as an ArrayIterator.
+	 *
+	 * @see     IteratorAggregate::getIterator()
+	 * @since   1.0
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->dump(0));
+	}
+
+	/**
+	 * Gets the data properties in a form that can be serialised to JSON format.
+	 *
+	 * @return  string  An object that can be serialised by json_encode().
+	 *
+	 * @since   1.0
+	 */
+	public function jsonSerialize()
+	{
+		return $this->dump();
+	}
+
+	/**
+	 * Dumps a data property.
+	 *
+	 * If recursion is set, this method will dump any object implementing Data\Dumpable (like Data\Object and Data\Set); it will
+	 * convert a Date object to a string; and it will convert a Registry to an object.
+	 *
+	 * @param   string             $property  The name of the data property.
+	 * @param   integer            $depth     The current depth of recursion (a value of 0 will ignore recursion).
+	 * @param   \SplObjectStorage  $dumped    An array of already serialized objects that is used to avoid infinite loops.
+	 *
+	 * @return  mixed  The value of the dumped property.
+	 *
+	 * @since   1.0
+	 */
+	protected function dumpProperty($property, $depth, \SplObjectStorage $dumped)
+	{
+		$value = $this->getProperty($property);
+
+		if ($depth > 0)
+		{
+			// Check if the object is also an dumpable object.
+			if ($value instanceof DumpableInterface)
+			{
+				// Do not dump the property if it has already been dumped.
+				if (!$dumped->contains($value))
+				{
+					$value = $value->dump($depth - 1, $dumped);
+				}
+			}
+
+			// Check if the object is a date.
+			if ($value instanceof \DateTime)
+			{
+				$value = $value->format('Y-m-d H:i:s');
+			}
+			elseif ($value instanceof Registry)
+			// Check if the object is a registry.
+			{
+				$value = $value->toObject();
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Gets a data property.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 *
+	 * @return  mixed  The value of the data property.
+	 *
+	 * @see     DataObject::__get()
+	 * @since   1.0
+	 */
+	protected function getProperty($property)
+	{
+		// Get the raw value.
+		$value = array_key_exists($property, $this->properties) ? $this->properties[$property] : null;
+
+		return $value;
+	}
+
+	/**
+	 * Sets a data property.
+	 *
+	 * If the name of the property starts with a null byte, this method will return null.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 * @param   mixed   $value     The value to give the data property.
+	 *
+	 * @return  mixed  The value of the data property.
+	 *
+	 * @see     DataObject::__set()
+	 * @since   1.0
+	 */
+	protected function setProperty($property, $value)
+	{
+		/*
+		 * Check if the property starts with a null byte. If so, discard it because a later attempt to try to access it
+		 * can cause a fatal error. See http://us3.php.net/manual/en/language.types.array.php#language.types.array.casting
+		 */
+		if (strpos($property, "\0") === 0)
+		{
+			return null;
+		}
+
+		// Set the value.
+		$this->properties[$property] = $value;
+
+		return $value;
+	}
+
+	/**
+	 * Count the number of data properties.
+	 *
+	 * @return  integer  The number of data properties.
+	 *
+	 * @since   1.0
+	 */
+	public function count()
+	{
+		return count($this->properties);
+	}
+}
diff --git a/core/libraries/vendor/joomla/data/src/DataSet.php b/core/libraries/vendor/joomla/data/src/DataSet.php
new file mode 100644
index 00000000..964d8d0e
--- /dev/null
+++ b/core/libraries/vendor/joomla/data/src/DataSet.php
@@ -0,0 +1,634 @@
+<?php
+/**
+ * Part of the Joomla Framework Data Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Data;
+
+/**
+ * DataSet is a collection class that allows the developer to operate on a set of DataObject objects as if they were in a
+ * typical PHP array.
+ *
+ * @since  1.0
+ */
+class DataSet implements DumpableInterface, \ArrayAccess, \Countable, \Iterator
+{
+	/**
+	 * The current position of the iterator.
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	private $current = false;
+
+	/**
+	 * The iterator objects.
+	 *
+	 * @var    DataObject[]
+	 * @since  1.0
+	 */
+	private $objects = array();
+
+	/**
+	 * The class constructor.
+	 *
+	 * @param   DataObject[]  $objects  An array of DataObject objects to bind to the data set.
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException if an object is not an instance of Data\Object.
+	 */
+	public function __construct(array $objects = array())
+	{
+		// Set the objects.
+		$this->_initialise($objects);
+	}
+
+	/**
+	 * The magic call method is used to call object methods using the iterator.
+	 *
+	 * Example: $array = $objectList->foo('bar');
+	 *
+	 * The object list will iterate over its objects and see if each object has a callable 'foo' method.
+	 * If so, it will pass the argument list and assemble any return values. If an object does not have
+	 * a callable method no return value is recorded.
+	 * The keys of the objects and the result array are maintained.
+	 *
+	 * @param   string  $method     The name of the method called.
+	 * @param   array   $arguments  The arguments of the method called.
+	 *
+	 * @return  array   An array of values returned by the methods called on the objects in the data set.
+	 *
+	 * @since   1.0
+	 */
+	public function __call($method, $arguments = array())
+	{
+		$return = array();
+
+		// Iterate through the objects.
+		foreach ($this->objects as $key => $object)
+		{
+			// Create the object callback.
+			$callback = array($object, $method);
+
+			// Check if the callback is callable.
+			if (is_callable($callback))
+			{
+				// Call the method for the object.
+				$return[$key] = call_user_func_array($callback, $arguments);
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * The magic get method is used to get a list of properties from the objects in the data set.
+	 *
+	 * Example: $array = $dataSet->foo;
+	 *
+	 * This will return a column of the values of the 'foo' property in all the objects
+	 * (or values determined by custom property setters in the individual Data\Object's).
+	 * The result array will contain an entry for each object in the list (compared to __call which may not).
+	 * The keys of the objects and the result array are maintained.
+	 *
+	 * @param   string  $property  The name of the data property.
+	 *
+	 * @return  array  An associative array of the values.
+	 *
+	 * @since   1.0
+	 */
+	public function __get($property)
+	{
+		$return = array();
+
+		// Iterate through the objects.
+		foreach ($this->objects as $key => $object)
+		{
+			// Get the property.
+			$return[$key] = $object->$property;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * The magic isset method is used to check the state of an object property using the iterator.
+	 *
+	 * Example: $array = isset($objectList->foo);
+	 *
+	 * @param   string  $property  The name of the property.
+	 *
+	 * @return  boolean  True if the property is set in any of the objects in the data set.
+	 *
+	 * @since   1.0
+	 */
+	public function __isset($property)
+	{
+		$return = array();
+
+		// Iterate through the objects.
+		foreach ($this->objects as $object)
+		{
+			// Check the property.
+			$return[] = isset($object->$property);
+		}
+
+		return in_array(true, $return, true) ? true : false;
+	}
+
+	/**
+	 * The magic set method is used to set an object property using the iterator.
+	 *
+	 * Example: $objectList->foo = 'bar';
+	 *
+	 * This will set the 'foo' property to 'bar' in all of the objects
+	 * (or a value determined by custom property setters in the Data\Object).
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value to give the data property.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function __set($property, $value)
+	{
+		// Iterate through the objects.
+		foreach ($this->objects as $object)
+		{
+			// Set the property.
+			$object->$property = $value;
+		}
+	}
+
+	/**
+	 * The magic unset method is used to unset an object property using the iterator.
+	 *
+	 * Example: unset($objectList->foo);
+	 *
+	 * This will unset all of the 'foo' properties in the list of Data\Object's.
+	 *
+	 * @param   string  $property  The name of the property.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function __unset($property)
+	{
+		// Iterate through the objects.
+		foreach ($this->objects as $object)
+		{
+			unset($object->$property);
+		}
+	}
+
+	/**
+	 * Gets an array of keys, existing in objects
+	 *
+	 * @param   string  $type  Selection type 'all' or 'common'
+	 *
+	 * @return  array   Array of keys
+	 *
+	 * @since   1.2.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function getObjectsKeys($type = 'all')
+	{
+		$keys = null;
+
+		if ($type == 'all')
+		{
+			$function = 'array_merge';
+		}
+		elseif ($type == 'common')
+		{
+			$function = 'array_intersect_key';
+		}
+		else
+		{
+			throw new \InvalidArgumentException("Unknown selection type: $type");
+		}
+
+		foreach ($this->objects as $object)
+		{
+			if (version_compare(PHP_VERSION, '5.4.0', '<'))
+			{
+				$object_vars = json_decode(json_encode($object->jsonSerialize()), true);
+			}
+			else
+			{
+				$object_vars = json_decode(json_encode($object), true);
+			}
+
+			$keys = (is_null($keys)) ? $object_vars : $function($keys, $object_vars);
+		}
+
+		return array_keys($keys);
+	}
+
+	/**
+	 * Gets all objects as an array
+	 *
+	 * @param   boolean  $associative  Option to set return mode: associative or numeric array.
+	 * @param   string   $k            Unlimited optional property names to extract from objects.
+	 *
+	 * @return  array    Returns an array according to defined options.
+	 *
+	 * @since   1.2.0
+	 */
+	public function toArray($associative = true, $k = null)
+	{
+		$keys        = func_get_args();
+		$associative = array_shift($keys);
+
+		if (empty($keys))
+		{
+			$keys = $this->getObjectsKeys();
+		}
+
+		$return = array();
+
+		$i = 0;
+
+		foreach ($this->objects as $key => $object)
+		{
+			$array_item = array();
+
+			$key = ($associative) ? $key : $i++;
+
+			$j = 0;
+
+			foreach ($keys as $property)
+			{
+				$property_key              = ($associative) ? $property : $j++;
+				$array_item[$property_key] = (isset($object->$property)) ? $object->$property : null;
+			}
+
+			$return[$key] = $array_item;
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Gets the number of data objects in the set.
+	 *
+	 * @return  integer  The number of objects.
+	 *
+	 * @since   1.0
+	 */
+	public function count()
+	{
+		return count($this->objects);
+	}
+
+	/**
+	 * Clears the objects in the data set.
+	 *
+	 * @return  DataSet  Returns itself to allow chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function clear()
+	{
+		$this->objects = array();
+		$this->rewind();
+
+		return $this;
+	}
+
+	/**
+	 * Get the current data object in the set.
+	 *
+	 * @return  DataObject  The current object, or false if the array is empty or the pointer is beyond the end of the elements.
+	 *
+	 * @since   1.0
+	 */
+	public function current()
+	{
+		return is_scalar($this->current) ? $this->objects[$this->current] : false;
+	}
+
+	/**
+	 * Dumps the data object in the set, recursively if appropriate.
+	 *
+	 * @param   integer            $depth   The maximum depth of recursion (default = 3).
+	 *                                      For example, a depth of 0 will return a stdClass with all the properties in native
+	 *                                      form. A depth of 1 will recurse into the first level of properties only.
+	 * @param   \SplObjectStorage  $dumped  An array of already serialized objects that is used to avoid infinite loops.
+	 *
+	 * @return  array  An associative array of the data objects in the set, dumped as a simple PHP stdClass object.
+	 *
+	 * @see     DataObject::dump()
+	 * @since   1.0
+	 */
+	public function dump($depth = 3, \SplObjectStorage $dumped = null)
+	{
+		// Check if we should initialise the recursion tracker.
+		if ($dumped === null)
+		{
+			$dumped = new \SplObjectStorage;
+		}
+
+		// Add this object to the dumped stack.
+		$dumped->attach($this);
+
+		$objects = array();
+
+		// Make sure that we have not reached our maximum depth.
+		if ($depth > 0)
+		{
+			// Handle JSON serialization recursively.
+			foreach ($this->objects as $key => $object)
+			{
+				$objects[$key] = $object->dump($depth, $dumped);
+			}
+		}
+
+		return $objects;
+	}
+
+	/**
+	 * Gets the data set in a form that can be serialised to JSON format.
+	 *
+	 * Note that this method will not return an associative array, otherwise it would be encoded into an object.
+	 * JSON decoders do not consistently maintain the order of associative keys, whereas they do maintain the order of arrays.
+	 *
+	 * @param   mixed  $serialized  An array of objects that have already been serialized that is used to infinite loops
+	 *                              (null on first call).
+	 *
+	 * @return  array  An array that can be serialised by json_encode().
+	 *
+	 * @since   1.0
+	 */
+	public function jsonSerialize($serialized = null)
+	{
+		// Check if we should initialise the recursion tracker.
+		if ($serialized === null)
+		{
+			$serialized = array();
+		}
+
+		// Add this object to the serialized stack.
+		$serialized[] = spl_object_hash($this);
+		$return = array();
+
+		// Iterate through the objects.
+		foreach ($this->objects as $object)
+		{
+			// Call the method for the object.
+			$return[] = $object->jsonSerialize($serialized);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Gets the key of the current object in the iterator.
+	 *
+	 * @return  scalar  The object key on success; null on failure.
+	 *
+	 * @since   1.0
+	 */
+	public function key()
+	{
+		return $this->current;
+	}
+
+	/**
+	 * Gets the array of keys for all the objects in the iterator (emulates array_keys).
+	 *
+	 * @return  array  The array of keys
+	 *
+	 * @since   1.0
+	 */
+	public function keys()
+	{
+		return array_keys($this->objects);
+	}
+
+	/**
+	 * Applies a function to every object in the set (emulates array_walk).
+	 * 
+	 * @param   callable  $funcname  Callback function.  
+	 * 
+	 * @return  boolean
+	 * 
+	 * @since   1.2.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public function walk($funcname)
+	{
+		if (!is_callable($funcname))
+		{
+			$message = __METHOD__ . '() expects parameter 1 to be a valid callback';
+
+			if (is_string($funcname))
+			{
+				$message .= sprintf(', function \'%s\' not found or invalid function name', $funcname);
+			}
+
+			throw new \InvalidArgumentException($message);
+		}
+
+		foreach ($this->objects as $key => $object)
+		{
+			$funcname($object, $key);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Advances the iterator to the next object in the iterator.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function next()
+	{
+		// Get the object offsets.
+		$keys = $this->keys();
+
+		// Check if _current has been set to false but offsetUnset.
+		if ($this->current === false && isset($keys[0]))
+		{
+			// This is a special case where offsetUnset was used in a foreach loop and the first element was unset.
+			$this->current = $keys[0];
+		}
+		else
+		{
+			// Get the current key.
+			$position = array_search($this->current, $keys);
+
+			// Check if there is an object after the current object.
+			if ($position !== false && isset($keys[$position + 1]))
+			{
+				// Get the next id.
+				$this->current = $keys[$position + 1];
+			}
+			else
+			{
+				// That was the last object or the internal properties have become corrupted.
+				$this->current = null;
+			}
+		}
+	}
+
+	/**
+	 * Checks whether an offset exists in the iterator.
+	 *
+	 * @param   mixed  $offset  The object offset.
+	 *
+	 * @return  boolean  True if the object exists, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetExists($offset)
+	{
+		return isset($this->objects[$offset]);
+	}
+
+	/**
+	 * Gets an offset in the iterator.
+	 *
+	 * @param   mixed  $offset  The object offset.
+	 *
+	 * @return  DataObject  The object if it exists, null otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetGet($offset)
+	{
+		return isset($this->objects[$offset]) ? $this->objects[$offset] : null;
+	}
+
+	/**
+	 * Sets an offset in the iterator.
+	 *
+	 * @param   mixed       $offset  The object offset.
+	 * @param   DataObject  $object  The object object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException if an object is not an instance of Data\Object.
+	 */
+	public function offsetSet($offset, $object)
+	{
+		if (!($object instanceof DataObject))
+		{
+			throw new \InvalidArgumentException(sprintf('%s("%s", *%s*)', __METHOD__, $offset, gettype($object)));
+		}
+
+		// Set the offset.
+		$this->objects[$offset] = $object;
+	}
+
+	/**
+	 * Unsets an offset in the iterator.
+	 *
+	 * @param   mixed  $offset  The object offset.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function offsetUnset($offset)
+	{
+		if (!$this->offsetExists($offset))
+		{
+			// Do nothing if the offset does not exist.
+			return;
+		}
+
+		// Check for special handling of unsetting the current position.
+		if ($offset == $this->current)
+		{
+			// Get the current position.
+			$keys = $this->keys();
+			$position = array_search($this->current, $keys);
+
+			// Check if there is an object before the current object.
+			if ($position > 0)
+			{
+				// Move the current position back one.
+				$this->current = $keys[$position - 1];
+			}
+			else
+			{
+				// We are at the start of the keys AND let's assume we are in a foreach loop and `next` is going to be called.
+				$this->current = false;
+			}
+		}
+
+		unset($this->objects[$offset]);
+	}
+
+	/**
+	 * Rewinds the iterator to the first object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function rewind()
+	{
+		// Set the current position to the first object.
+		if (empty($this->objects))
+		{
+			$this->current = false;
+		}
+		else
+		{
+			$keys = $this->keys();
+			$this->current = array_shift($keys);
+		}
+	}
+
+	/**
+	 * Validates the iterator.
+	 *
+	 * @return  boolean  True if valid, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function valid()
+	{
+		// Check the current position.
+		if (!is_scalar($this->current) || !isset($this->objects[$this->current]))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Initialises the list with an array of objects.
+	 *
+	 * @param   array  $input  An array of objects.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException if an object is not an instance of Data\DataObject.
+	 */
+	private function _initialise(array $input = array())
+	{
+		foreach ($input as $key => $object)
+		{
+			if (!is_null($object))
+			{
+				$this->offsetSet($key, $object);
+			}
+		}
+
+		$this->rewind();
+	}
+}
diff --git a/core/libraries/vendor/joomla/data/src/DumpableInterface.php b/core/libraries/vendor/joomla/data/src/DumpableInterface.php
new file mode 100644
index 00000000..c9d3624b
--- /dev/null
+++ b/core/libraries/vendor/joomla/data/src/DumpableInterface.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Part of the Joomla Framework Data Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Data;
+
+/**
+ * An interface to define if an object is dumpable.
+ *
+ * @since  1.0
+ */
+interface DumpableInterface
+{
+	/**
+	 * Dumps the object properties into a stdClass object, recursively if appropriate.
+	 *
+	 * @param   integer            $depth   The maximum depth of recursion.
+	 *                                      For example, a depth of 0 will return a stdClass with all the properties in native
+	 *                                      form. A depth of 1 will recurse into the first level of properties only.
+	 * @param   \SplObjectStorage  $dumped  An array of already serialized objects that is used to avoid infinite loops.
+	 *
+	 * @return  \stdClass  The data properties as a simple PHP stdClass object.
+	 *
+	 * @since   1.0
+	 */
+	public function dump($depth = 3, \SplObjectStorage $dumped = null);
+}
diff --git a/core/libraries/vendor/joomla/di/LICENSE b/core/libraries/vendor/joomla/di/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/di/src/Container.php b/core/libraries/vendor/joomla/di/src/Container.php
new file mode 100644
index 00000000..7eee5a58
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/Container.php
@@ -0,0 +1,595 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI;
+
+use Joomla\DI\Exception\DependencyResolutionException;
+use Joomla\DI\Exception\KeyNotFoundException;
+use Joomla\DI\Exception\ProtectedKeyException;
+use Psr\Container\ContainerInterface;
+
+/**
+ * The Container class.
+ *
+ * @since  1.0
+ */
+class Container implements ContainerInterface
+{
+	/**
+	 * Holds the key aliases.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $aliases = array();
+
+	/**
+	 * Holds the shared instances.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $instances = array();
+
+	/**
+	 * Holds the keys, their callbacks, and whether or not
+	 * the item is meant to be a shared resource.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $dataStore = array();
+
+	/**
+	 * Parent for hierarchical containers.
+	 *
+	 * @var    Container|ContainerInterface
+	 * @since  1.0
+	 */
+	protected $parent;
+
+	/**
+	 * Holds the service tag mapping.
+	 *
+	 * @var    array
+	 * @since  1.5.0
+	 */
+	protected $tags = array();
+
+	/**
+	 * Constructor for the DI Container
+	 *
+	 * @param   ContainerInterface  $parent  Parent for hierarchical containers.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(ContainerInterface $parent = null)
+	{
+		$this->parent = $parent;
+	}
+
+	/**
+	 * Create an alias for a given key for easy access.
+	 *
+	 * @param   string  $alias  The alias name
+	 * @param   string  $key    The key to alias
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function alias($alias, $key)
+	{
+		$this->aliases[$alias] = $key;
+
+		return $this;
+	}
+
+	/**
+	 * Search the aliases property for a matching alias key.
+	 *
+	 * @param   string  $key  The key to search for.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	protected function resolveAlias($key)
+	{
+		if (isset($this->aliases[$key]))
+		{
+			return $this->aliases[$key];
+		}
+
+		if ($this->parent instanceof Container)
+		{
+			return $this->parent->resolveAlias($key);
+		}
+
+		return $key;
+	}
+
+	/**
+	 * Assign a tag to services.
+	 *
+	 * @param   string  $tag   The tag name
+	 * @param   array   $keys  The service keys to tag
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.5.0
+	 */
+	public function tag($tag, array $keys)
+	{
+		foreach ($keys as $key)
+		{
+			$resolvedKey = $this->resolveAlias($key);
+
+			if (!isset($this->tags[$tag]))
+			{
+				$this->tags[$tag] = array();
+			}
+
+			$this->tags[$tag][] = $resolvedKey;
+		}
+
+		// Prune duplicates
+		$this->tags[$tag] = array_unique($this->tags[$tag]);
+
+		return $this;
+	}
+
+	/**
+	 * Fetch all services registered to the given tag.
+	 *
+	 * @param   string  $tag  The tag name
+	 *
+	 * @return  array  The resolved services for the given tag
+	 *
+	 * @since   1.5.0
+	 */
+	public function getTagged($tag)
+	{
+		$services = array();
+
+		if (isset($this->tags[$tag]))
+		{
+			foreach ($this->tags[$tag] as $service)
+			{
+				$services[] = $this->get($service);
+			}
+		}
+
+		return $services;
+	}
+
+	/**
+	 * Build an object of class $key;
+	 *
+	 * @param   string   $key     The class name to build.
+	 * @param   boolean  $shared  True to create a shared resource.
+	 *
+	 * @return  object|false  Instance of class specified by $key with all dependencies injected.
+	 *                        Returns an object if the class exists and false otherwise
+	 *
+	 * @since   1.0
+	 */
+	public function buildObject($key, $shared = false)
+	{
+		static $buildStack = array();
+
+		$resolvedKey = $this->resolveAlias($key);
+
+		if (in_array($resolvedKey, $buildStack, true))
+		{
+			$buildStack = array();
+
+			throw new DependencyResolutionException("Can't resolve circular dependency");
+		}
+
+		$buildStack[] = $resolvedKey;
+
+		if ($this->has($resolvedKey))
+		{
+			$resource = $this->get($resolvedKey);
+			array_pop($buildStack);
+
+			return $resource;
+		}
+
+		try
+		{
+			$reflection = new \ReflectionClass($resolvedKey);
+		}
+		catch (\ReflectionException $e)
+		{
+			array_pop($buildStack);
+
+			return false;
+		}
+
+		if (!$reflection->isInstantiable())
+		{
+			$buildStack = array();
+
+			throw new DependencyResolutionException("$resolvedKey can not be instantiated.");
+		}
+
+		$constructor = $reflection->getConstructor();
+
+		// If there are no parameters, just return a new object.
+		if ($constructor === null)
+		{
+			$callback = function () use ($resolvedKey) {
+				return new $resolvedKey;
+			};
+		}
+		else
+		{
+			$newInstanceArgs = $this->getMethodArgs($constructor);
+
+			// Create a callable for the dataStore
+			$callback = function () use ($reflection, $newInstanceArgs) {
+				return $reflection->newInstanceArgs($newInstanceArgs);
+			};
+		}
+
+		$this->set($resolvedKey, $callback, $shared);
+
+		$resource = $this->get($resolvedKey);
+		array_pop($buildStack);
+
+		return $resource;
+	}
+
+	/**
+	 * Convenience method for building a shared object.
+	 *
+	 * @param   string  $key  The class name to build.
+	 *
+	 * @return  object|false  Instance of class specified by $key with all dependencies injected.
+	 *                        Returns an object if the class exists and false otherwise
+	 *
+	 * @since   1.0
+	 */
+	public function buildSharedObject($key)
+	{
+		return $this->buildObject($key, true);
+	}
+
+	/**
+	 * Create a child Container with a new property scope that
+	 * that has the ability to access the parent scope when resolving.
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function createChild()
+	{
+		return new static($this);
+	}
+
+	/**
+	 * Extend a defined service Closure by wrapping the existing one with a new Closure.  This
+	 * works very similar to a decorator pattern.  Note that this only works on service Closures
+	 * that have been defined in the current Provider, not parent providers.
+	 *
+	 * @param   string    $key       The unique identifier for the Closure or property.
+	 * @param   \Closure  $callable  A Closure to wrap the original service Closure.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  KeyNotFoundException
+	 */
+	public function extend($key, \Closure $callable)
+	{
+		$key = $this->resolveAlias($key);
+		$raw = $this->getRaw($key);
+
+		if ($raw === null)
+		{
+			throw new KeyNotFoundException(sprintf('The requested key %s does not exist to extend.', $key));
+		}
+
+		$closure = function ($c) use ($callable, $raw) {
+			return $callable($raw['callback']($c), $c);
+		};
+
+		$this->set($key, $closure, $raw['shared']);
+	}
+
+	/**
+	 * Build an array of constructor parameters.
+	 *
+	 * @param   \ReflectionMethod  $method  Method for which to build the argument array.
+	 *
+	 * @return  array  Array of arguments to pass to the method.
+	 *
+	 * @since   1.0
+	 * @throws  DependencyResolutionException
+	 */
+	protected function getMethodArgs(\ReflectionMethod $method)
+	{
+		$methodArgs = array();
+
+		foreach ($method->getParameters() as $param)
+		{
+			$dependency = $param->getClass();
+			$dependencyVarName = $param->getName();
+
+			// If we have a dependency, that means it has been type-hinted.
+			if ($dependency !== null)
+			{
+				$dependencyClassName = $dependency->getName();
+
+				// If the dependency class name is registered with this container or a parent, use it.
+				if ($this->getRaw($dependencyClassName) !== null)
+				{
+					$depObject = $this->get($dependencyClassName);
+				}
+				else
+				{
+					$depObject = $this->buildObject($dependencyClassName);
+				}
+
+				if ($depObject instanceof $dependencyClassName)
+				{
+					$methodArgs[] = $depObject;
+					continue;
+				}
+			}
+
+			// Finally, if there is a default parameter, use it.
+			if ($param->isOptional())
+			{
+				$methodArgs[] = $param->getDefaultValue();
+				continue;
+			}
+
+			// Couldn't resolve dependency, and no default was provided.
+			throw new DependencyResolutionException(sprintf('Could not resolve dependency: %s', $dependencyVarName));
+		}
+
+		return $methodArgs;
+	}
+
+	/**
+	 * Method to set the key and callback to the dataStore array.
+	 *
+	 * @param   string   $key        Name of dataStore key to set.
+	 * @param   mixed    $value      Callable function to run or string to retrive when requesting the specified $key.
+	 * @param   boolean  $shared     True to create and store a shared instance.
+	 * @param   boolean  $protected  True to protect this item from being overwritten. Useful for services.
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.0
+	 * @throws  ProtectedKeyException  Thrown if the provided key is already set and is protected.
+	 */
+	public function set($key, $value, $shared = false, $protected = false)
+	{
+		if (isset($this->dataStore[$key]) && $this->dataStore[$key]['protected'] === true)
+		{
+			throw new ProtectedKeyException(sprintf("Key %s is protected and can't be overwritten.", $key));
+		}
+
+		// If the provided $value is not a closure, make it one now for easy resolution.
+		if (!is_callable($value))
+		{
+			$value = function () use ($value) {
+				return $value;
+			};
+		}
+
+		$this->dataStore[$key] = array(
+			'callback' => $value,
+			'shared' => $shared,
+			'protected' => $protected
+		);
+
+		return $this;
+	}
+
+	/**
+	 * Convenience method for creating protected keys.
+	 *
+	 * @param   string   $key     Name of dataStore key to set.
+	 * @param   mixed    $value   Callable function to run or string to retrive when requesting the specified $key.
+	 * @param   boolean  $shared  True to create and store a shared instance.
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function protect($key, $value, $shared = false)
+	{
+		return $this->set($key, $value, $shared, true);
+	}
+
+	/**
+	 * Convenience method for creating shared keys.
+	 *
+	 * @param   string   $key        Name of dataStore key to set.
+	 * @param   mixed    $value      Callable function to run or string to retrive when requesting the specified $key.
+	 * @param   boolean  $protected  True to protect this item from being overwritten. Useful for services.
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function share($key, $value, $protected = false)
+	{
+		return $this->set($key, $value, true, $protected);
+	}
+
+	/**
+	 * Method to retrieve the results of running the $callback for the specified $key;
+	 *
+	 * @param   string   $key       Name of the dataStore key to get.
+	 * @param   boolean  $forceNew  True to force creation and return of a new instance.
+	 *
+	 * @return  mixed   Results of running the $callback for the specified $key.
+	 *
+	 * @since   1.0
+	 * @throws  KeyNotFoundException
+	 */
+	public function get($key, $forceNew = false)
+	{
+		$key = $this->resolveAlias($key);
+		$raw = $this->getRaw($key);
+
+		if ($raw === null)
+		{
+			throw new KeyNotFoundException(sprintf('Key %s has not been registered with the container.', $key));
+		}
+
+		if ($raw['shared'])
+		{
+			if ($forceNew || !isset($this->instances[$key]))
+			{
+				$this->instances[$key] = $raw['callback']($this);
+			}
+
+			return $this->instances[$key];
+		}
+
+		return call_user_func($raw['callback'], $this);
+	}
+
+	/**
+	 * Method to check if specified dataStore key exists.
+	 *
+	 * @param   string  $key  Name of the dataStore key to check.
+	 *
+	 * @return  boolean  True for success
+	 *
+	 * @since   1.5.0
+	 */
+	public function has($key)
+	{
+		$key = $this->resolveAlias($key);
+
+		$exists = (bool) $this->getRaw($key);
+
+		if ($exists === false && $this->parent instanceof ContainerInterface)
+		{
+			$exists = $this->parent->has($key);
+		}
+
+		return $exists;
+	}
+
+	/**
+	 * Method to check if specified dataStore key exists.
+	 *
+	 * @param   string  $key  Name of the dataStore key to check.
+	 *
+	 * @return  boolean  True for success
+	 *
+	 * @since   1.0
+	 * @deprecated  3.0  Use ContainerInterface::has() instead
+	 */
+	public function exists($key)
+	{
+		return $this->has($key);
+	}
+
+	/**
+	 * Get the raw data assigned to a key.
+	 *
+	 * @param   string  $key  The key for which to get the stored item.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 */
+	protected function getRaw($key)
+	{
+		if (isset($this->dataStore[$key]))
+		{
+			return $this->dataStore[$key];
+		}
+
+		$aliasKey = $this->resolveAlias($key);
+
+		if ($aliasKey !== $key && isset($this->dataStore[$aliasKey]))
+		{
+			return $this->dataStore[$aliasKey];
+		}
+
+		if ($this->parent instanceof Container)
+		{
+			return $this->parent->getRaw($key);
+		}
+
+		if ($this->parent instanceof ContainerInterface && $this->parent->has($key))
+		{
+			$callback = $this->parent->get($key);
+
+			if (!is_callable($callback))
+			{
+				$callback = function () use ($callback) {
+					return $callback;
+				};
+			}
+
+			return array(
+				'callback'  => $callback,
+				'shared'    => true,
+				'protected' => true,
+			);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Method to force the container to return a new instance
+	 * of the results of the callback for requested $key.
+	 *
+	 * @param   string  $key  Name of the dataStore key to get.
+	 *
+	 * @return  mixed   Results of running the $callback for the specified $key.
+	 *
+	 * @since   1.0
+	 */
+	public function getNewInstance($key)
+	{
+		return $this->get($key, true);
+	}
+
+	/**
+	 * Register a service provider to the container.
+	 *
+	 * @param   ServiceProviderInterface  $provider  The service provider to register.
+	 *
+	 * @return  Container  This object for chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function registerServiceProvider(ServiceProviderInterface $provider)
+	{
+		$provider->register($this);
+
+		return $this;
+	}
+
+	/**
+	 * Retrieve the keys for services assigned to this container.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5.0
+	 */
+	public function getKeys()
+	{
+		return array_unique(array_merge(array_keys($this->aliases), array_keys($this->dataStore)));
+	}
+}
diff --git a/core/libraries/vendor/joomla/di/src/ContainerAwareInterface.php b/core/libraries/vendor/joomla/di/src/ContainerAwareInterface.php
new file mode 100644
index 00000000..21612211
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/ContainerAwareInterface.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI;
+
+/**
+ * Defines the interface for a Container Aware class.
+ *
+ * @since  1.0
+ */
+interface ContainerAwareInterface
+{
+	/**
+	 * Get the DI container.
+	 *
+	 * @return  Container
+	 *
+	 * @since   1.0
+	 * @throws  \UnexpectedValueException May be thrown if the container has not been set.
+	 * @deprecated  2.0  The getter will no longer be part of the interface.
+	 */
+	public function getContainer();
+
+	/**
+	 * Set the DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 */
+	public function setContainer(Container $container);
+}
diff --git a/core/libraries/vendor/joomla/di/src/ContainerAwareTrait.php b/core/libraries/vendor/joomla/di/src/ContainerAwareTrait.php
new file mode 100644
index 00000000..a4dd2cf1
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/ContainerAwareTrait.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI;
+
+/**
+ * Defines the trait for a Container Aware Class.
+ *
+ * @since  1.2
+ * @note   Traits are available in PHP 5.4+
+ */
+trait ContainerAwareTrait
+{
+	/**
+	 * DI Container
+	 *
+	 * @var    Container
+	 * @since  1.2
+	 */
+	private $container;
+
+	/**
+	 * Get the DI container.
+	 *
+	 * @return  Container
+	 *
+	 * @since   1.2
+	 * @throws  \UnexpectedValueException May be thrown if the container has not been set.
+	 * @note    As of 2.0 this method will be protected.
+	 */
+	public function getContainer()
+	{
+		if ($this->container)
+		{
+			return $this->container;
+		}
+
+		throw new \UnexpectedValueException('Container not set in ' . __CLASS__);
+	}
+
+	/**
+	 * Set the DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  mixed  Returns itself to support chaining.
+	 *
+	 * @since   1.2
+	 */
+	public function setContainer(Container $container)
+	{
+		$this->container = $container;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php b/core/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php
new file mode 100644
index 00000000..1ed46f5f
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/Exception/DependencyResolutionException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI\Exception;
+
+use Psr\Container\ContainerExceptionInterface;
+
+/**
+ * Exception class for handling errors in resolving a dependency
+ *
+ * @since  1.0
+ */
+class DependencyResolutionException extends \RuntimeException implements ContainerExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/joomla/di/src/Exception/KeyNotFoundException.php b/core/libraries/vendor/joomla/di/src/Exception/KeyNotFoundException.php
new file mode 100644
index 00000000..975fb74e
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/Exception/KeyNotFoundException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI\Exception;
+
+use Psr\Container\NotFoundExceptionInterface;
+
+/**
+ * No entry was found in the container.
+ *
+ * @since  1.5.0
+ */
+class KeyNotFoundException extends \InvalidArgumentException implements NotFoundExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/joomla/di/src/Exception/ProtectedKeyException.php b/core/libraries/vendor/joomla/di/src/Exception/ProtectedKeyException.php
new file mode 100644
index 00000000..de315f91
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/Exception/ProtectedKeyException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI\Exception;
+
+use Psr\Container\ContainerExceptionInterface;
+
+/**
+ * Attempt to set the value of a protected key, which already is set
+ *
+ * @since  1.5.0
+ */
+class ProtectedKeyException extends \OutOfBoundsException implements ContainerExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/joomla/di/src/ServiceProviderInterface.php b/core/libraries/vendor/joomla/di/src/ServiceProviderInterface.php
new file mode 100644
index 00000000..fc4a2ab8
--- /dev/null
+++ b/core/libraries/vendor/joomla/di/src/ServiceProviderInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Part of the Joomla Framework DI Package
+ *
+ * @copyright  Copyright (C) 2013 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\DI;
+
+/**
+ * Defines the interface for a Service Provider.
+ *
+ * @since  1.0
+ */
+interface ServiceProviderInterface
+{
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function register(Container $container);
+}
diff --git a/core/libraries/vendor/joomla/event/LICENSE b/core/libraries/vendor/joomla/event/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/event/src/AbstractEvent.php b/core/libraries/vendor/joomla/event/src/AbstractEvent.php
new file mode 100644
index 00000000..59bfef64
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/AbstractEvent.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+use Serializable;
+use ArrayAccess;
+use Countable;
+
+/**
+ * Implementation of EventInterface.
+ *
+ * @since  1.0
+ */
+abstract class AbstractEvent implements EventInterface, ArrayAccess, Serializable, Countable
+{
+	/**
+	 * The event name.
+	 *
+	 * @var    string
+	 *
+	 * @since  1.0
+	 */
+	protected $name;
+
+	/**
+	 * The event arguments.
+	 *
+	 * @var    array
+	 *
+	 * @since  1.0
+	 */
+	protected $arguments;
+
+	/**
+	 * A flag to see if the event propagation is stopped.
+	 *
+	 * @var    boolean
+	 *
+	 * @since  1.0
+	 */
+	protected $stopped = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $name       The event name.
+	 * @param   array   $arguments  The event arguments.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($name, array $arguments = array())
+	{
+		$this->name = $name;
+		$this->arguments = $arguments;
+	}
+
+	/**
+	 * Get the event name.
+	 *
+	 * @return  string  The event name.
+	 *
+	 * @since   1.0
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Get an event argument value.
+	 *
+	 * @param   string  $name     The argument name.
+	 * @param   mixed   $default  The default value if not found.
+	 *
+	 * @return  mixed  The argument value or the default value.
+	 *
+	 * @since   1.0
+	 */
+	public function getArgument($name, $default = null)
+	{
+		if (isset($this->arguments[$name]))
+		{
+			return $this->arguments[$name];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Tell if the given event argument exists.
+	 *
+	 * @param   string  $name  The argument name.
+	 *
+	 * @return  boolean  True if it exists, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function hasArgument($name)
+	{
+		return isset($this->arguments[$name]);
+	}
+
+	/**
+	 * Get all event arguments.
+	 *
+	 * @return  array  An associative array of argument names as keys
+	 *                 and their values as values.
+	 *
+	 * @since   1.0
+	 */
+	public function getArguments()
+	{
+		return $this->arguments;
+	}
+
+	/**
+	 * Tell if the event propagation is stopped.
+	 *
+	 * @return  boolean  True if stopped, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function isStopped()
+	{
+		return true === $this->stopped;
+	}
+
+	/**
+	 * Count the number of arguments.
+	 *
+	 * @return  integer  The number of arguments.
+	 *
+	 * @since   1.0
+	 */
+	public function count()
+	{
+		return count($this->arguments);
+	}
+
+	/**
+	 * Serialize the event.
+	 *
+	 * @return  string  The serialized event.
+	 *
+	 * @since   1.0
+	 */
+	public function serialize()
+	{
+		return serialize(array($this->name, $this->arguments, $this->stopped));
+	}
+
+	/**
+	 * Unserialize the event.
+	 *
+	 * @param   string  $serialized  The serialized event.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function unserialize($serialized)
+	{
+		list($this->name, $this->arguments, $this->stopped) = unserialize($serialized);
+	}
+
+	/**
+	 * Tell if the given event argument exists.
+	 *
+	 * @param   string  $name  The argument name.
+	 *
+	 * @return  boolean  True if it exists, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetExists($name)
+	{
+		return $this->hasArgument($name);
+	}
+
+	/**
+	 * Get an event argument value.
+	 *
+	 * @param   string  $name  The argument name.
+	 *
+	 * @return  mixed  The argument value or null if not existing.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetGet($name)
+	{
+		return $this->getArgument($name);
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/DelegatingDispatcher.php b/core/libraries/vendor/joomla/event/src/DelegatingDispatcher.php
new file mode 100644
index 00000000..600bfd62
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/DelegatingDispatcher.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+/**
+ * A dispatcher delegating its methods to an other dispatcher.
+ *
+ * @since  1.0
+ */
+final class DelegatingDispatcher implements DispatcherInterface
+{
+	/**
+	 * The delegated dispatcher.
+	 *
+	 * @var    DispatcherInterface
+	 *
+	 * @since  1.0
+	 */
+	private $dispatcher;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   DispatcherInterface  $dispatcher  The delegated dispatcher.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(DispatcherInterface $dispatcher)
+	{
+		$this->dispatcher = $dispatcher;
+	}
+
+	/**
+	 * Trigger an event.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  EventInterface  The event after being passed through all listeners.
+	 *
+	 * @since   1.0
+	 */
+	public function triggerEvent($event)
+	{
+		return $this->dispatcher->triggerEvent($event);
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/Dispatcher.php b/core/libraries/vendor/joomla/event/src/Dispatcher.php
new file mode 100644
index 00000000..423abee9
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/Dispatcher.php
@@ -0,0 +1,506 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+use InvalidArgumentException;
+use Closure;
+
+/**
+ * Implementation of a DispatcherInterface supporting
+ * prioritized listeners.
+ *
+ * @since  1.0
+ */
+class Dispatcher implements DispatcherInterface
+{
+	/**
+	 * An array of registered events indexed by
+	 * the event names.
+	 *
+	 * @var    EventInterface[]
+	 *
+	 * @since  1.0
+	 */
+	protected $events = array();
+
+	/**
+	 * A regular expression that will filter listener method names.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 * @deprecated
+	 */
+	protected $listenerFilter;
+
+	/**
+	 * An array of ListenersPriorityQueue indexed
+	 * by the event names.
+	 *
+	 * @var    ListenersPriorityQueue[]
+	 *
+	 * @since  1.0
+	 */
+	protected $listeners = array();
+
+	/**
+	 * Set an event to the dispatcher.
+	 * It will replace any event with the same name.
+	 *
+	 * @param   EventInterface  $event  The event.
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function setEvent(EventInterface $event)
+	{
+		$this->events[$event->getName()] = $event;
+
+		return $this;
+	}
+
+	/**
+	 * Sets a regular expression to filter the class methods when adding a listener.
+	 *
+	 * @param   string  $regex  A regular expression (for example '^on' will only register methods starting with "on").
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @since       1.0
+	 * @deprecated  Incorporate a method in your listener object such as `getEvents` to feed into the `setListener` method.
+	 */
+	public function setListenerFilter($regex)
+	{
+		$this->listenerFilter = $regex;
+
+		return $this;
+	}
+
+	/**
+	 * Add an event to this dispatcher, only if it is not existing.
+	 *
+	 * @param   EventInterface  $event  The event.
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function addEvent(EventInterface $event)
+	{
+		if (!isset($this->events[$event->getName()]))
+		{
+			$this->events[$event->getName()] = $event;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Tell if the given event has been added to this dispatcher.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  boolean  True if the listener has the given event, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function hasEvent($event)
+	{
+		if ($event instanceof EventInterface)
+		{
+			$event = $event->getName();
+		}
+
+		return isset($this->events[$event]);
+	}
+
+	/**
+	 * Get the event object identified by the given name.
+	 *
+	 * @param   string  $name     The event name.
+	 * @param   mixed   $default  The default value if the event was not registered.
+	 *
+	 * @return  EventInterface|mixed  The event of the default value.
+	 *
+	 * @since   1.0
+	 */
+	public function getEvent($name, $default = null)
+	{
+		if (isset($this->events[$name]))
+		{
+			return $this->events[$name];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Remove an event from this dispatcher.
+	 * The registered listeners will remain.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function removeEvent($event)
+	{
+		if ($event instanceof EventInterface)
+		{
+			$event = $event->getName();
+		}
+
+		if (isset($this->events[$event]))
+		{
+			unset($this->events[$event]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the registered events.
+	 *
+	 * @return  EventInterface[]  The registered event.
+	 *
+	 * @since   1.0
+	 */
+	public function getEvents()
+	{
+		return $this->events;
+	}
+
+	/**
+	 * Clear all events.
+	 *
+	 * @return  EventInterface[]  The old events.
+	 *
+	 * @since   1.0
+	 */
+	public function clearEvents()
+	{
+		$events = $this->events;
+		$this->events = array();
+
+		return $events;
+	}
+
+	/**
+	 * Count the number of registered event.
+	 *
+	 * @return  integer  The numer of registered events.
+	 *
+	 * @since   1.0
+	 */
+	public function countEvents()
+	{
+		return count($this->events);
+	}
+
+	/**
+	 * Add a listener to this dispatcher, only if not already registered to these events.
+	 * If no events are specified, it will be registered to all events matching it's methods name.
+	 * In the case of a closure, you must specify at least one event name.
+	 *
+	 * @param   object|Closure  $listener  The listener
+	 * @param   array           $events    An associative array of event names as keys
+	 *                                     and the corresponding listener priority as values.
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @throws  InvalidArgumentException
+	 *
+	 * @since   1.0
+	 */
+	public function addListener($listener, array $events = array())
+	{
+		if (!is_object($listener))
+		{
+			throw new InvalidArgumentException('The given listener is not an object.');
+		}
+
+		// We deal with a closure.
+		if ($listener instanceof Closure)
+		{
+			if (empty($events))
+			{
+				throw new InvalidArgumentException('No event name(s) and priority
+				specified for the Closure listener.');
+			}
+
+			foreach ($events as $name => $priority)
+			{
+				if (!isset($this->listeners[$name]))
+				{
+					$this->listeners[$name] = new ListenersPriorityQueue;
+				}
+
+				$this->listeners[$name]->add($listener, $priority);
+			}
+
+			return $this;
+		}
+
+		// We deal with a "normal" object.
+		$methods = get_class_methods($listener);
+
+		if (!empty($events))
+		{
+			$methods = array_intersect($methods, array_keys($events));
+		}
+
+		// @deprecated
+		$regex = $this->listenerFilter ?: '.*';
+
+		foreach ($methods as $event)
+		{
+			// @deprecated - this outer `if` is deprecated.
+			if (preg_match("#$regex#", $event))
+			{
+				// Retain this inner code after removal of the outer `if`.
+				if (!isset($this->listeners[$event]))
+				{
+					$this->listeners[$event] = new ListenersPriorityQueue;
+				}
+
+				$priority = isset($events[$event]) ? $events[$event] : Priority::NORMAL;
+
+				$this->listeners[$event]->add($listener, $priority);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the priority of the given listener for the given event.
+	 *
+	 * @param   object|Closure         $listener  The listener.
+	 * @param   EventInterface|string  $event     The event object or name.
+	 *
+	 * @return  mixed  The listener priority or null if the listener doesn't exist.
+	 *
+	 * @since   1.0
+	 */
+	public function getListenerPriority($listener, $event)
+	{
+		if ($event instanceof EventInterface)
+		{
+			$event = $event->getName();
+		}
+
+		if (isset($this->listeners[$event]))
+		{
+			return $this->listeners[$event]->getPriority($listener);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get the listeners registered to the given event.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  object[]  An array of registered listeners sorted according to their priorities.
+	 *
+	 * @since   1.0
+	 */
+	public function getListeners($event)
+	{
+		if ($event instanceof EventInterface)
+		{
+			$event = $event->getName();
+		}
+
+		if (isset($this->listeners[$event]))
+		{
+			return $this->listeners[$event]->getAll();
+		}
+
+		return array();
+	}
+
+	/**
+	 * Tell if the given listener has been added.
+	 * If an event is specified, it will tell if the listener is registered for that event.
+	 *
+	 * @param   object|Closure         $listener  The listener.
+	 * @param   EventInterface|string  $event     The event object or name.
+	 *
+	 * @return  boolean  True if the listener is registered, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function hasListener($listener, $event = null)
+	{
+		if ($event)
+		{
+			if ($event instanceof EventInterface)
+			{
+				$event = $event->getName();
+			}
+
+			if (isset($this->listeners[$event]))
+			{
+				return $this->listeners[$event]->has($listener);
+			}
+		}
+		else
+		{
+			foreach ($this->listeners as $queue)
+			{
+				if ($queue->has($listener))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Remove the given listener from this dispatcher.
+	 * If no event is specified, it will be removed from all events it is listening to.
+	 *
+	 * @param   object|Closure         $listener  The listener to remove.
+	 * @param   EventInterface|string  $event     The event object or name.
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function removeListener($listener, $event = null)
+	{
+		if ($event)
+		{
+			if ($event instanceof EventInterface)
+			{
+				$event = $event->getName();
+			}
+
+			if (isset($this->listeners[$event]))
+			{
+				$this->listeners[$event]->remove($listener);
+			}
+		}
+
+		else
+		{
+			foreach ($this->listeners as $queue)
+			{
+				$queue->remove($listener);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Clear the listeners in this dispatcher.
+	 * If an event is specified, the listeners will be cleared only for that event.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  Dispatcher  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function clearListeners($event = null)
+	{
+		if ($event)
+		{
+			if ($event instanceof EventInterface)
+			{
+				$event = $event->getName();
+			}
+
+			if (isset($this->listeners[$event]))
+			{
+				unset($this->listeners[$event]);
+			}
+		}
+
+		else
+		{
+			$this->listeners = array();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Count the number of registered listeners for the given event.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  integer  The number of registered listeners for the given event.
+	 *
+	 * @since   1.0
+	 */
+	public function countListeners($event)
+	{
+		if ($event instanceof EventInterface)
+		{
+			$event = $event->getName();
+		}
+
+		return isset($this->listeners[$event]) ? count($this->listeners[$event]) : 0;
+	}
+
+	/**
+	 * Trigger an event.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  EventInterface  The event after being passed through all listeners.
+	 *
+	 * @since   1.0
+	 */
+	public function triggerEvent($event)
+	{
+		if (!($event instanceof EventInterface))
+		{
+			if (isset($this->events[$event]))
+			{
+				$event = $this->events[$event];
+			}
+
+			else
+			{
+				$event = new Event($event);
+			}
+		}
+
+		if (isset($this->listeners[$event->getName()]))
+		{
+			foreach ($this->listeners[$event->getName()] as $listener)
+			{
+				if ($event->isStopped())
+				{
+					return $event;
+				}
+
+				if ($listener instanceof Closure)
+				{
+					call_user_func($listener, $event);
+				}
+
+				else
+				{
+					call_user_func(array($listener, $event->getName()), $event);
+				}
+			}
+		}
+
+		return $event;
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php b/core/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php
new file mode 100644
index 00000000..b5fecc1c
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/DispatcherAwareInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+/**
+ * Interface to be implemented by classes depending on a dispatcher.
+ *
+ * @since  1.0
+ */
+interface DispatcherAwareInterface
+{
+	/**
+	 * Set the dispatcher to use.
+	 *
+	 * @param   DispatcherInterface  $dispatcher  The dispatcher to use.
+	 *
+	 * @return  DispatcherAwareInterface  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function setDispatcher(DispatcherInterface $dispatcher);
+}
diff --git a/core/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php b/core/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php
new file mode 100644
index 00000000..9bfa0e78
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/DispatcherAwareTrait.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+/**
+ * Defines the trait for a Dispatcher Aware Class.
+ *
+ * @since  1.2.0
+ */
+trait DispatcherAwareTrait
+{
+	/**
+	 * Event Dispatcher
+	 *
+	 * @var    DispatcherInterface
+	 * @since  1.2.0
+	 */
+	private $dispatcher;
+
+	/**
+	 * Get the event dispatcher.
+	 *
+	 * @return  DispatcherInterface
+	 *
+	 * @since   1.2.0
+	 * @throws  \UnexpectedValueException May be thrown if the dispatcher has not been set.
+	 */
+	public function getDispatcher()
+	{
+		if ($this->dispatcher)
+		{
+			return $this->dispatcher;
+		}
+
+		throw new \UnexpectedValueException('Dispatcher not set in ' . __CLASS__);
+	}
+
+	/**
+	 * Set the dispatcher to use.
+	 *
+	 * @param   DispatcherInterface  $dispatcher  The dispatcher to use.
+	 *
+	 * @return  $this
+	 *
+	 * @since   1.2.0
+	 */
+	public function setDispatcher(DispatcherInterface $dispatcher)
+	{
+		$this->dispatcher = $dispatcher;
+
+		return $this;
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/DispatcherInterface.php b/core/libraries/vendor/joomla/event/src/DispatcherInterface.php
new file mode 100644
index 00000000..f77cd818
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/DispatcherInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+/**
+ * Interface for event dispatchers.
+ *
+ * @since  1.0
+ */
+interface DispatcherInterface
+{
+	/**
+	 * Trigger an event.
+	 *
+	 * @param   EventInterface|string  $event  The event object or name.
+	 *
+	 * @return  EventInterface  The event after being passed through all listeners.
+	 *
+	 * @since   1.0
+	 */
+	public function triggerEvent($event);
+}
diff --git a/core/libraries/vendor/joomla/event/src/Event.php b/core/libraries/vendor/joomla/event/src/Event.php
new file mode 100644
index 00000000..f9e831ca
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/Event.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+use InvalidArgumentException;
+
+/**
+ * Default Event class.
+ *
+ * @since  1.0
+ */
+class Event extends AbstractEvent
+{
+	/**
+	 * Add an event argument, only if it is not existing.
+	 *
+	 * @param   string  $name   The argument name.
+	 * @param   mixed   $value  The argument value.
+	 *
+	 * @return  Event  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function addArgument($name, $value)
+	{
+		if (!isset($this->arguments[$name]))
+		{
+			$this->arguments[$name] = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the value of an event argument.
+	 * If the argument already exists, it will be overridden.
+	 *
+	 * @param   string  $name   The argument name.
+	 * @param   mixed   $value  The argument value.
+	 *
+	 * @return  Event  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function setArgument($name, $value)
+	{
+		$this->arguments[$name] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Remove an event argument.
+	 *
+	 * @param   string  $name  The argument name.
+	 *
+	 * @return  mixed  The old argument value or null if it is not existing.
+	 *
+	 * @since   1.0
+	 */
+	public function removeArgument($name)
+	{
+		$return = null;
+
+		if (isset($this->arguments[$name]))
+		{
+			$return = $this->arguments[$name];
+			unset($this->arguments[$name]);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Clear all event arguments.
+	 *
+	 * @return  array  The old arguments.
+	 *
+	 * @since   1.0
+	 */
+	public function clearArguments()
+	{
+		$arguments = $this->arguments;
+		$this->arguments = array();
+
+		return $arguments;
+	}
+
+	/**
+	 * Stop the event propagation.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function stop()
+	{
+		$this->stopped = true;
+	}
+
+	/**
+	 * Set the value of an event argument.
+	 *
+	 * @param   string  $name   The argument name.
+	 * @param   mixed   $value  The argument value.
+	 *
+	 * @return  void
+	 *
+	 * @throws  InvalidArgumentException  If the argument name is null.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetSet($name, $value)
+	{
+		if (is_null($name))
+		{
+			throw new InvalidArgumentException('The argument name cannot be null.');
+		}
+
+		$this->setArgument($name, $value);
+	}
+
+	/**
+	 * Remove an event argument.
+	 *
+	 * @param   string  $name  The argument name.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function offsetUnset($name)
+	{
+		$this->removeArgument($name);
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/EventImmutable.php b/core/libraries/vendor/joomla/event/src/EventImmutable.php
new file mode 100644
index 00000000..46d4b825
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/EventImmutable.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+use BadMethodCallException;
+
+/**
+ * Implementation of an immutable Event.
+ * An immutable event cannot be modified after instanciation :
+ *
+ * - its propagation cannot be stopped
+ * - its arguments cannot be modified
+ *
+ * You may want to use this event when you want to ensure that
+ * the listeners won't manipulate it.
+ *
+ * @since  1.0
+ */
+final class EventImmutable extends AbstractEvent
+{
+	/**
+	 * A flag to see if the constructor has been
+	 * already called.
+	 *
+	 * @var  boolean
+	 */
+	private $constructed = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   string  $name       The event name.
+	 * @param   array   $arguments  The event arguments.
+	 *
+	 * @throws  BadMethodCallException
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($name, array $arguments = array())
+	{
+		if ($this->constructed)
+		{
+			throw new BadMethodCallException(
+				sprintf('Cannot reconstruct the EventImmutable %s.', $this->name)
+			);
+		}
+
+		$this->constructed = true;
+
+		parent::__construct($name, $arguments);
+	}
+
+	/**
+	 * Set the value of an event argument.
+	 *
+	 * @param   string  $name   The argument name.
+	 * @param   mixed   $value  The argument value.
+	 *
+	 * @return  void
+	 *
+	 * @throws  BadMethodCallException
+	 *
+	 * @since   1.0
+	 */
+	public function offsetSet($name, $value)
+	{
+		throw new BadMethodCallException(
+			sprintf(
+				'Cannot set the argument %s of the immutable event %s.',
+				$name,
+				$this->name
+			)
+		);
+	}
+
+	/**
+	 * Remove an event argument.
+	 *
+	 * @param   string  $name  The argument name.
+	 *
+	 * @return  void
+	 *
+	 * @throws  BadMethodCallException
+	 *
+	 * @since   1.0
+	 */
+	public function offsetUnset($name)
+	{
+		throw new BadMethodCallException(
+			sprintf(
+				'Cannot remove the argument %s of the immutable event %s.',
+				$name,
+				$this->name
+			)
+		);
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/EventInterface.php b/core/libraries/vendor/joomla/event/src/EventInterface.php
new file mode 100644
index 00000000..42a7474d
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/EventInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+/**
+ * Interface for events.
+ * An event has a name and its propagation can be stopped (if the implementation supports it).
+ *
+ * @since  1.0
+ */
+interface EventInterface
+{
+	/**
+	 * Get the event name.
+	 *
+	 * @return  string  The event name.
+	 *
+	 * @since   1.0
+	 */
+	public function getName();
+
+	/**
+	 * Tell if the event propagation is stopped.
+	 *
+	 * @return  boolean  True if stopped, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function isStopped();
+}
diff --git a/core/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php b/core/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php
new file mode 100644
index 00000000..22b6ecbe
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/ListenersPriorityQueue.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+use SplPriorityQueue;
+use SplObjectStorage;
+use IteratorAggregate;
+use Countable;
+
+/**
+ * A class containing an inner listeners priority queue that can be iterated multiple times.
+ * One instance of ListenersPriorityQueue is used per Event in the Dispatcher.
+ *
+ * @since  1.0
+ */
+class ListenersPriorityQueue implements IteratorAggregate, Countable
+{
+	/**
+	 * The inner priority queue.
+	 *
+	 * @var    SplPriorityQueue
+	 *
+	 * @since  1.0
+	 */
+	protected $queue;
+
+	/**
+	 * A copy of the listeners contained in the queue
+	 * that is used when detaching them to
+	 * recreate the queue or to see if the queue contains
+	 * a given listener.
+	 *
+	 * @var    SplObjectStorage
+	 *
+	 * @since  1.0
+	 */
+	protected $storage;
+
+	/**
+	 * A decreasing counter used to compute
+	 * the internal priority as an array because
+	 * SplPriorityQueue dequeues elements with the same priority.
+	 *
+	 * @var    integer
+	 *
+	 * @since  1.0
+	 */
+	private $counter = PHP_INT_MAX;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since  1.0
+	 */
+	public function __construct()
+	{
+		$this->queue = new SplPriorityQueue;
+		$this->storage = new SplObjectStorage;
+	}
+
+	/**
+	 * Add a listener with the given priority only if not already present.
+	 *
+	 * @param   \Closure|object  $listener  The listener.
+	 * @param   integer          $priority  The listener priority.
+	 *
+	 * @return  ListenersPriorityQueue  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function add($listener, $priority)
+	{
+		if (!$this->storage->contains($listener))
+		{
+			// Compute the internal priority as an array.
+			$priority = array($priority, $this->counter--);
+
+			$this->storage->attach($listener, $priority);
+			$this->queue->insert($listener, $priority);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Remove a listener from the queue.
+	 *
+	 * @param   \Closure|object  $listener  The listener.
+	 *
+	 * @return  ListenersPriorityQueue  This method is chainable.
+	 *
+	 * @since   1.0
+	 */
+	public function remove($listener)
+	{
+		if ($this->storage->contains($listener))
+		{
+			$this->storage->detach($listener);
+			$this->storage->rewind();
+
+			$this->queue = new SplPriorityQueue;
+
+			foreach ($this->storage as $listener)
+			{
+				$priority = $this->storage->getInfo();
+				$this->queue->insert($listener, $priority);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Tell if the listener exists in the queue.
+	 *
+	 * @param   \Closure|object  $listener  The listener.
+	 *
+	 * @return  boolean  True if it exists, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function has($listener)
+	{
+		return $this->storage->contains($listener);
+	}
+
+	/**
+	 * Get the priority of the given listener.
+	 *
+	 * @param   \Closure|object  $listener  The listener.
+	 * @param   mixed            $default   The default value to return if the listener doesn't exist.
+	 *
+	 * @return  mixed  The listener priority if it exists, null otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function getPriority($listener, $default = null)
+	{
+		if ($this->storage->contains($listener))
+		{
+			return $this->storage[$listener][0];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Get all listeners contained in this queue, sorted according to their priority.
+	 *
+	 * @return  object[]  An array of listeners.
+	 *
+	 * @since   1.0
+	 */
+	public function getAll()
+	{
+		$listeners = array();
+
+		// Get a clone of the queue.
+		$queue = $this->getIterator();
+
+		foreach ($queue as $listener)
+		{
+			$listeners[] = $listener;
+		}
+
+		return $listeners;
+	}
+
+	/**
+	 * Get the inner queue with its cursor on top of the heap.
+	 *
+	 * @return  SplPriorityQueue  The inner queue.
+	 *
+	 * @since   1.0
+	 */
+	public function getIterator()
+	{
+		// SplPriorityQueue queue is a heap.
+		$queue = clone $this->queue;
+
+		if (!$queue->isEmpty())
+		{
+			$queue->top();
+		}
+
+		return $queue;
+	}
+
+	/**
+	 * Count the number of listeners in the queue.
+	 *
+	 * @return  integer  The number of listeners in the queue.
+	 *
+	 * @since   1.0
+	 */
+	public function count()
+	{
+		return count($this->queue);
+	}
+}
diff --git a/core/libraries/vendor/joomla/event/src/Priority.php b/core/libraries/vendor/joomla/event/src/Priority.php
new file mode 100644
index 00000000..9cdcc906
--- /dev/null
+++ b/core/libraries/vendor/joomla/event/src/Priority.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Part of the Joomla Framework Event Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Event;
+
+/**
+ * An enumeration of priorities for event listeners,
+ * that you are encouraged to use when adding them in the Dispatcher.
+ *
+ * @since  1.0
+ */
+final class Priority
+{
+	const MIN = -3;
+	const LOW = -2;
+	const BELOW_NORMAL = -1;
+	const NORMAL = 0;
+	const ABOVE_NORMAL = 1;
+	const HIGH = 2;
+	const MAX = 3;
+}
diff --git a/core/libraries/vendor/joomla/filesystem/LICENSE b/core/libraries/vendor/joomla/filesystem/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini b/core/libraries/vendor/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
new file mode 100644
index 00000000..fb59d5d9
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
@@ -0,0 +1,13 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8 - No BOM
+
+JLIB_FILESYSTEM_PATCHER_FAILED_VERIFY="Failed source verification of file %s at line %d"
+JLIB_FILESYSTEM_PATCHER_INVALID_DIFF="Invalid unified diff block"
+JLIB_FILESYSTEM_PATCHER_INVALID_INPUT="Invalid input"
+JLIB_FILESYSTEM_PATCHER_UNEXISING_SOURCE="Unexisting source file"
+JLIB_FILESYSTEM_PATCHER_UNEXPECTED_ADD_LINE="Unexpected add line at line %d'"
+JLIB_FILESYSTEM_PATCHER_UNEXPECTED_EOF="Unexpected end of file"
+JLIB_FILESYSTEM_PATCHER_UNEXPECTED_REMOVE_LINE="Unexpected remove line at line %d"
+
diff --git a/core/libraries/vendor/joomla/filesystem/src/Buffer.php b/core/libraries/vendor/joomla/filesystem/src/Buffer.php
new file mode 100644
index 00000000..9f9633a2
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Buffer.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+/**
+ * Generic Buffer stream handler
+ *
+ * This class provides a generic buffer stream.  It can be used to store/retrieve/manipulate
+ * string buffers with the standard PHP filesystem I/O methods.
+ *
+ * @since  1.0
+ */
+class Buffer
+{
+	/**
+	 * Stream position
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	public $position = 0;
+
+	/**
+	 * Buffer name
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $name = null;
+
+	/**
+	 * Buffer hash
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	public $buffers = array();
+
+	/**
+	 * Function to open file or url
+	 *
+	 * @param   string   $path          The URL that was passed
+	 * @param   string   $mode          Mode used to open the file @see fopen
+	 * @param   integer  $options       Flags used by the API, may be STREAM_USE_PATH and STREAM_REPORT_ERRORS
+	 * @param   string   &$opened_path  Full path of the resource. Used with STREAN_USE_PATH option
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @see     streamWrapper::stream_open
+	 */
+	public function stream_open($path, $mode, $options, &$opened_path)
+	{
+		$url = parse_url($path);
+		$this->name = $url['host'];
+		$this->buffers[$this->name] = null;
+		$this->position = 0;
+
+		return true;
+	}
+
+	/**
+	 * Read stream
+	 *
+	 * @param   integer  $count  How many bytes of data from the current position should be returned.
+	 *
+	 * @return  mixed    The data from the stream up to the specified number of bytes (all data if
+	 *                   the total number of bytes in the stream is less than $count. Null if
+	 *                   the stream is empty.
+	 *
+	 * @see     streamWrapper::stream_read
+	 * @since   1.0
+	 */
+	public function stream_read($count)
+	{
+		$ret = substr($this->buffers[$this->name], $this->position, $count);
+		$this->position += strlen($ret);
+
+		return $ret;
+	}
+
+	/**
+	 * Write stream
+	 *
+	 * @param   string  $data  The data to write to the stream.
+	 *
+	 * @return  integer
+	 *
+	 * @see     streamWrapper::stream_write
+	 * @since   1.0
+	 */
+	public function stream_write($data)
+	{
+		$left = substr($this->buffers[$this->name], 0, $this->position);
+		$right = substr($this->buffers[$this->name], $this->position + strlen($data));
+		$this->buffers[$this->name] = $left . $data . $right;
+		$this->position += strlen($data);
+
+		return strlen($data);
+	}
+
+	/**
+	 * Function to get the current position of the stream
+	 *
+	 * @return  integer
+	 *
+	 * @see     streamWrapper::stream_tell
+	 * @since   1.0
+	 */
+	public function stream_tell()
+	{
+		return $this->position;
+	}
+
+	/**
+	 * Function to test for end of file pointer
+	 *
+	 * @return  boolean  True if the pointer is at the end of the stream
+	 *
+	 * @see     streamWrapper::stream_eof
+	 * @since   1.0
+	 */
+	public function stream_eof()
+	{
+		return $this->position >= strlen($this->buffers[$this->name]);
+	}
+
+	/**
+	 * The read write position updates in response to $offset and $whence
+	 *
+	 * @param   integer  $offset  The offset in bytes
+	 * @param   integer  $whence  Position the offset is added to
+	 *                            Options are SEEK_SET, SEEK_CUR, and SEEK_END
+	 *
+	 * @return  boolean  True if updated
+	 *
+	 * @see     streamWrapper::stream_seek
+	 * @since   1.0
+	 */
+	public function stream_seek($offset, $whence)
+	{
+		switch ($whence)
+		{
+			case SEEK_SET:
+				if ($offset < strlen($this->buffers[$this->name]) && $offset >= 0)
+				{
+					$this->position = $offset;
+
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+				break;
+
+			case SEEK_CUR:
+				if ($offset >= 0)
+				{
+					$this->position += $offset;
+
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+				break;
+
+			case SEEK_END:
+				if (strlen($this->buffers[$this->name]) + $offset >= 0)
+				{
+					$this->position = strlen($this->buffers[$this->name]) + $offset;
+
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+				break;
+
+			default:
+				return false;
+		}
+	}
+}
+
+// Register the stream
+stream_wrapper_register('buffer', 'Joomla\\Filesystem\\Buffer');
diff --git a/core/libraries/vendor/joomla/filesystem/src/Clients/FtpClient.php b/core/libraries/vendor/joomla/filesystem/src/Clients/FtpClient.php
new file mode 100644
index 00000000..db4dd58f
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Clients/FtpClient.php
@@ -0,0 +1,1796 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem\Clients;
+
+use Joomla\Filesystem\Exception\FilesystemException;
+
+/** Error Codes:
+ * - 30 : Unable to connect to host
+ * - 31 : Not connected
+ * - 32 : Unable to send command to server
+ * - 33 : Bad username
+ * - 34 : Bad password
+ * - 35 : Bad response
+ * - 36 : Passive mode failed
+ * - 37 : Data transfer error
+ * - 38 : Local filesystem error
+ */
+
+if (!defined('CRLF'))
+{
+	define('CRLF', "\r\n");
+}
+
+if (!defined("FTP_AUTOASCII"))
+{
+	define("FTP_AUTOASCII", -1);
+}
+
+if (!defined("FTP_BINARY"))
+{
+	define("FTP_BINARY", 1);
+}
+
+if (!defined("FTP_ASCII"))
+{
+	define("FTP_ASCII", 0);
+}
+
+if (!defined('FTP_NATIVE'))
+{
+	define('FTP_NATIVE', (function_exists('ftp_connect')) ? 1 : 0);
+}
+
+/**
+ * FTP client class
+ *
+ * @since  1.0
+ */
+class FtpClient
+{
+	/**
+	 * @var    resource  Socket resource
+	 * @since  1.0
+	 */
+	private $conn = null;
+
+	/**
+	 * @var    resource  Data port connection resource
+	 * @since  1.0
+	 */
+	private $dataconn = null;
+
+	/**
+	 * @var    array  Passive connection information
+	 * @since  1.0
+	 */
+	private $pasv = null;
+
+	/**
+	 * @var    string  Response Message
+	 * @since  1.0
+	 */
+	private $response = null;
+
+	/**
+	 * @var    integer  Response Code
+	 * @since  1.0
+	 */
+	private $responseCode = null;
+
+	/**
+	 * @var    string  Response Message
+	 * @since  1.0
+	 */
+	private $responseMsg = null;
+
+	/**
+	 * @var    integer  Timeout limit
+	 * @since  1.0
+	 */
+	private $timeout = 15;
+
+	/**
+	 * @var    integer  Transfer Type
+	 * @since  1.0
+	 */
+	private $type = null;
+
+	/**
+	 * @var    array  Array to hold ascii format file extensions
+	 * @since   1.0
+	 */
+	private $autoAscii = array(
+		"asp",
+		"bat",
+		"c",
+		"cpp",
+		"csv",
+		"h",
+		"htm",
+		"html",
+		"shtml",
+		"ini",
+		"inc",
+		"log",
+		"php",
+		"php3",
+		"pl",
+		"perl",
+		"sh",
+		"sql",
+		"txt",
+		"xhtml",
+		"xml");
+
+	/**
+	 * Array to hold native line ending characters
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $lineEndings = array('UNIX' => "\n", 'WIN' => "\r\n");
+
+	/**
+	 * @var    FtpClient[]  FtpClient instances container.
+	 * @since  1.0
+	 */
+	protected static $instances = array();
+
+	/**
+	 * FtpClient object constructor
+	 *
+	 * @param   array  $options  Associative array of options to set
+	 *
+	 * @since   1.0
+	 */
+	public function __construct(array $options = array())
+	{
+		// If default transfer type is not set, set it to autoascii detect
+		if (!isset($options['type']))
+		{
+			$options['type'] = FTP_BINARY;
+		}
+
+		$this->setOptions($options);
+
+		if (FTP_NATIVE)
+		{
+			// Autoloading fails for Buffer as the class is used as a stream handler
+			class_exists('Joomla\\Filesystem\\Buffer');
+		}
+	}
+
+	/**
+	 * FtpClient object destructor
+	 *
+	 * Closes an existing connection, if we have one
+	 *
+	 * @since   1.0
+	 */
+	public function __destruct()
+	{
+		if (is_resource($this->conn))
+		{
+			$this->quit();
+		}
+	}
+
+	/**
+	 * Returns the global FTP connector object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * You may optionally specify a username and password in the parameters. If you do so,
+	 * you may not login() again with different credentials using the same object.
+	 * If you do not use this option, you must quit() the current connection when you
+	 * are done, to free it for use by others.
+	 *
+	 * @param   string  $host     Host to connect to
+	 * @param   string  $port     Port to connect to
+	 * @param   array   $options  Array with any of these options: type=>[FTP_AUTOASCII|FTP_ASCII|FTP_BINARY], timeout=>(int)
+	 * @param   string  $user     Username to use for a connection
+	 * @param   string  $pass     Password to use for a connection
+	 *
+	 * @return  FtpClient  The FTP Client object.
+	 *
+	 * @since   1.0
+	 */
+	public static function getInstance($host = '127.0.0.1', $port = '21', array $options = array(), $user = null, $pass = null)
+	{
+		$signature = $user . ':' . $pass . '@' . $host . ":" . $port;
+
+		// Create a new instance, or set the options of an existing one
+		if (!isset(self::$instances[$signature]) || !is_object(self::$instances[$signature]))
+		{
+			self::$instances[$signature] = new static($options);
+		}
+		else
+		{
+			self::$instances[$signature]->setOptions($options);
+		}
+
+		// Connect to the server, and login, if requested
+		if (!self::$instances[$signature]->isConnected())
+		{
+			$return = self::$instances[$signature]->connect($host, $port);
+
+			if ($return && $user !== null && $pass !== null)
+			{
+				self::$instances[$signature]->login($user, $pass);
+			}
+		}
+
+		return self::$instances[$signature];
+	}
+
+	/**
+	 * Set client options
+	 *
+	 * @param   array  $options  Associative array of options to set
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 */
+	public function setOptions(array $options)
+	{
+		if (isset($options['type']))
+		{
+			$this->type = $options['type'];
+		}
+
+		if (isset($options['timeout']))
+		{
+			$this->timeout = $options['timeout'];
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to connect to a FTP server
+	 *
+	 * @param   string   $host  Host to connect to [Default: 127.0.0.1]
+	 * @param   integer  $port  Port to connect on [Default: port 21]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function connect($host = '127.0.0.1', $port = 21)
+	{
+		$errno = null;
+		$err = null;
+
+		// If already connected, return
+		if (is_resource($this->conn))
+		{
+			return true;
+		}
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			$this->conn = @ftp_connect($host, $port, $this->timeout);
+
+			if ($this->conn === false)
+			{
+				throw new FilesystemException(sprintf('%1$s: Could not connect to host " %2$s " on port " %3$s "', __METHOD__, $host, $port));
+			}
+
+			// Set the timeout for this connection
+			ftp_set_option($this->conn, FTP_TIMEOUT_SEC, $this->timeout);
+
+			return true;
+		}
+
+		// Connect to the FTP server.
+		$this->conn = @ fsockopen($host, $port, $errno, $err, $this->timeout);
+
+		if (!$this->conn)
+		{
+			throw new FilesystemException(
+				sprintf(
+					'%1$s: Could not connect to host " %2$s " on port " %3$s ". Socket error number: %4$s and error message: %5$s',
+					__METHOD__,
+					$host,
+					$port,
+					$errno,
+					$err
+				)
+			);
+		}
+
+		// Set the timeout for this connection
+		socket_set_timeout($this->conn, $this->timeout, 0);
+
+		// Check for welcome response code
+		if (!$this->_verifyResponse(220))
+		{
+			throw new FilesystemException(sprintf('%1$s: Bad response. Server response: %2$s [Expected: 220]', __METHOD__, $this->response));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to determine if the object is connected to an FTP server
+	 *
+	 * @return  boolean  True if connected
+	 *
+	 * @since   1.0
+	 */
+	public function isConnected()
+	{
+		return is_resource($this->conn);
+	}
+
+	/**
+	 * Method to login to a server once connected
+	 *
+	 * @param   string  $user  Username to login to the server
+	 * @param   string  $pass  Password to login to the server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function login($user = 'anonymous', $pass = 'jftp@joomla.org')
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_login($this->conn, $user, $pass) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to login');
+			}
+
+			return true;
+		}
+
+		// Send the username
+		if (!$this->_putCmd('USER ' . $user, array(331, 503)))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Bad Username. Server response: %2$s [Expected: 331]. Username sent: %3$s', __METHOD__, $this->response, $user)
+			);
+		}
+
+		// If we are already logged in, continue :)
+		if ($this->responseCode == 503)
+		{
+			return true;
+		}
+
+		// Send the password
+		if (!$this->_putCmd('PASS ' . $pass, 230))
+		{
+			throw new FilesystemException(sprintf('%1$s: Bad Password. Server response: %2$s [Expected: 230].', __METHOD__, $this->response));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to quit and close the connection
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 */
+	public function quit()
+	{
+		// If native FTP support is enabled lets use it...
+		if (FTP_NATIVE)
+		{
+			@ftp_close($this->conn);
+
+			return true;
+		}
+
+		// Logout and close connection
+		@fwrite($this->conn, "QUIT\r\n");
+		@fclose($this->conn);
+
+		return true;
+	}
+
+	/**
+	 * Method to retrieve the current working directory on the FTP server
+	 *
+	 * @return  string   Current working directory
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function pwd()
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (($ret = @ftp_pwd($this->conn)) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return $ret;
+		}
+
+		$match = array(null);
+
+		// Send print working directory command and verify success
+		if (!$this->_putCmd('PWD', 257))
+		{
+			throw new FilesystemException(sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 257]', __METHOD__, $this->response));
+		}
+
+		// Match just the path
+		preg_match('/"[^"\r\n]*"/', $this->response, $match);
+
+		// Return the cleaned path
+		return preg_replace("/\"/", "", $match[0]);
+	}
+
+	/**
+	 * Method to system string from the FTP server
+	 *
+	 * @return  string   System identifier string
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function syst()
+	{
+		// If native FTP support is enabled lets use it...
+		if (FTP_NATIVE)
+		{
+			if (($ret = @ftp_systype($this->conn)) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+		}
+		else
+		{
+			// Send print working directory command and verify success
+			if (!$this->_putCmd('SYST', 215))
+			{
+				throw new FilesystemException(sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 215]', __METHOD__, $this->response));
+			}
+
+			$ret = $this->response;
+		}
+
+		// Match the system string to an OS
+		if (strpos(strtoupper($ret), 'MAC') !== false)
+		{
+			$ret = 'MAC';
+		}
+		elseif (strpos(strtoupper($ret), 'WIN') !== false)
+		{
+			$ret = 'WIN';
+		}
+		else
+		{
+			$ret = 'UNIX';
+		}
+
+		// Return the os type
+		return $ret;
+	}
+
+	/**
+	 * Method to change the current working directory on the FTP server
+	 *
+	 * @param   string  $path  Path to change into on the server
+	 *
+	 * @return  boolean True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function chdir($path)
+	{
+		// If native FTP support is enabled lets use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_chdir($this->conn, $path) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		// Send change directory command and verify success
+		if (!$this->_putCmd('CWD ' . $path, 250))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 250].  Sent path: %3$s', __METHOD__, $this->response, $path)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to reinitialise the server, ie. need to login again
+	 *
+	 * NOTE: This command not available on all servers
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function reinit()
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_site($this->conn, 'REIN') === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		// Send reinitialise command to the server
+		if (!$this->_putCmd('REIN', 220))
+		{
+			throw new FilesystemException(sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 220]', __METHOD__, $this->response));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to rename a file/folder on the FTP server
+	 *
+	 * @param   string  $from  Path to change file/folder from
+	 * @param   string  $to    Path to change file/folder to
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function rename($from, $to)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_rename($this->conn, $from, $to) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		// Send rename from command to the server
+		if (!$this->_putCmd('RNFR ' . $from, 350))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 350].  From path sent: %3$s', __METHOD__, $this->response, $from)
+			);
+		}
+
+		// Send rename to command to the server
+		if (!$this->_putCmd('RNTO ' . $to, 250))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 250].  To path sent: %3$s', __METHOD__, $this->response, $to)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to change mode for a path on the FTP server
+	 *
+	 * @param   string  $path  Path to change mode on
+	 * @param   mixed   $mode  Octal value to change mode to, e.g. '0777', 0777 or 511 (string or integer)
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function chmod($path, $mode)
+	{
+		// If no filename is given, we assume the current directory is the target
+		if ($path == '')
+		{
+			$path = '.';
+		}
+
+		// Convert the mode to a string
+		if (is_int($mode))
+		{
+			$mode = decoct($mode);
+		}
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_site($this->conn, 'CHMOD ' . $mode . ' ' . $path) === false)
+			{
+				if (!defined('PHP_WINDOWS_VERSION_MAJOR'))
+				{
+					throw new FilesystemException(__METHOD__ . 'Bad response.');
+				}
+
+				return false;
+			}
+
+			return true;
+		}
+
+		// Send change mode command and verify success [must convert mode from octal]
+		if (!$this->_putCmd('SITE CHMOD ' . $mode . ' ' . $path, array(200, 250)))
+		{
+			if (!defined('PHP_WINDOWS_VERSION_MAJOR'))
+			{
+				throw new FilesystemException(
+					sprintf(
+						'%1$s: Bad response.  Server response: %2$s [Expected: 250].  Path sent: %3$s.  Mode sent: %4$s',
+						__METHOD__,
+						$this->response,
+						$path,
+						$mode
+					)
+				);
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to delete a path [file/folder] on the FTP server
+	 *
+	 * @param   string  $path  Path to delete
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function delete($path)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_delete($this->conn, $path) === false)
+			{
+				if (@ftp_rmdir($this->conn, $path) === false)
+				{
+					throw new FilesystemException(__METHOD__ . 'Bad response.');
+				}
+			}
+
+			return true;
+		}
+
+		// Send delete file command and if that doesn't work, try to remove a directory
+		if (!$this->_putCmd('DELE ' . $path, 250))
+		{
+			if (!$this->_putCmd('RMD ' . $path, 250))
+			{
+				throw new FilesystemException(
+					sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 250].  Path sent: %3$s', __METHOD__, $this->response, $path)
+				);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to create a directory on the FTP server
+	 *
+	 * @param   string  $path  Directory to create
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function mkdir($path)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_mkdir($this->conn, $path) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		// Send change directory command and verify success
+		if (!$this->_putCmd('MKD ' . $path, 257))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 257].  Path sent: %3$s', __METHOD__, $this->response, $path)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to restart data transfer at a given byte
+	 *
+	 * @param   integer  $point  Byte to restart transfer at
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function restart($point)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			if (@ftp_site($this->conn, 'REST ' . $point) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		// Send restart command and verify success
+		if (!$this->_putCmd('REST ' . $point, 350))
+		{
+			throw new FilesystemException(
+				sprintf(
+					'%1$s: Bad response.  Server response: %2$s [Expected: 350].  Restart point sent: %3$s', __METHOD__, $this->response, $point
+				)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to create an empty file on the FTP server
+	 *
+	 * @param   string  $path  Path local file to store on the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function create($path)
+	{
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			$buffer = fopen('buffer://tmp', 'r');
+
+			if (@ftp_fput($this->conn, $path, $buffer, FTP_ASCII) === false)
+			{
+				fclose($buffer);
+
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			fclose($buffer);
+
+			return true;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+		}
+
+		if (!$this->_putCmd('STOR ' . $path, array(150, 125)))
+		{
+			@ fclose($this->dataconn);
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s', __METHOD__, $this->response, $path)
+			);
+		}
+
+		// To create a zero byte upload close the data port connection
+		fclose($this->dataconn);
+
+		if (!$this->_verifyResponse(226))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Path sent: %3$s', __METHOD__, $this->response, $path)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to read a file from the FTP server's contents into a buffer
+	 *
+	 * @param   string  $remote   Path to remote file to read on the FTP server
+	 * @param   string  &$buffer  Buffer variable to read file contents into
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function read($remote, &$buffer)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			$tmp = fopen('buffer://tmp', 'br+');
+
+			if (@ftp_fget($this->conn, $tmp, $remote, $mode) === false)
+			{
+				fclose($tmp);
+
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			// Read tmp buffer contents
+			rewind($tmp);
+			$buffer = '';
+
+			while (!feof($tmp))
+			{
+				$buffer .= fread($tmp, 8192);
+			}
+
+			fclose($tmp);
+
+			return true;
+		}
+
+		$this->_mode($mode);
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+		}
+
+		if (!$this->_putCmd('RETR ' . $remote, array(150, 125)))
+		{
+			@ fclose($this->dataconn);
+
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		// Read data from data port connection and add to the buffer
+		$buffer = '';
+
+		while (!feof($this->dataconn))
+		{
+			$buffer .= fread($this->dataconn, 4096);
+		}
+
+		// Close the data port connection
+		fclose($this->dataconn);
+
+		// Let's try to cleanup some line endings if it is ascii
+		if ($mode == FTP_ASCII)
+		{
+			$os = 'UNIX';
+
+			if (defined('PHP_WINDOWS_VERSION_MAJOR'))
+			{
+				$os = 'WIN';
+			}
+
+			$buffer = preg_replace("/" . CRLF . "/", $this->lineEndings[$os], $buffer);
+		}
+
+		if (!$this->_verifyResponse(226))
+		{
+			throw new FilesystemException(
+				sprintf(
+					'%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Restart point sent: %3$s',
+					__METHOD__, $this->response, $remote
+				)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to get a file from the FTP server and save it to a local file
+	 *
+	 * @param   string  $local   Local path to save remote file to
+	 * @param   string  $remote  Path to remote file to get on the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function get($local, $remote)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			if (@ftp_get($this->conn, $local, $remote, $mode) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		$this->_mode($mode);
+
+		// Check to see if the local file can be opened for writing
+		$fp = fopen($local, "wb");
+
+		if (!$fp)
+		{
+			throw new FilesystemException(sprintf('%1$s: Unable to open local file for writing.  Local path: %2$s', __METHOD__, $local));
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+		}
+
+		if (!$this->_putCmd('RETR ' . $remote, array(150, 125)))
+		{
+			@ fclose($this->dataconn);
+
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		// Read data from data port connection and add to the buffer
+		while (!feof($this->dataconn))
+		{
+			$buffer = fread($this->dataconn, 4096);
+			fwrite($fp, $buffer, 4096);
+		}
+
+		// Close the data port connection and file pointer
+		fclose($this->dataconn);
+		fclose($fp);
+
+		if (!$this->_verifyResponse(226))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to store a file to the FTP server
+	 *
+	 * @param   string  $local   Path to local file to store on the FTP server
+	 * @param   string  $remote  FTP path to file to create
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function store($local, $remote = null)
+	{
+		// If remote file is not given, use the filename of the local file in the current
+		// working directory.
+		if ($remote == null)
+		{
+			$remote = basename($local);
+		}
+
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			if (@ftp_put($this->conn, $remote, $local, $mode) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			return true;
+		}
+
+		$this->_mode($mode);
+
+		// Check to see if the local file exists and if so open it for reading
+		if (@ file_exists($local))
+		{
+			$fp = fopen($local, "rb");
+
+			if (!$fp)
+			{
+				throw new FilesystemException(sprintf('%1$s: Unable to open local file for reading. Local path: %2$s', __METHOD__, $local));
+			}
+		}
+		else
+		{
+			throw new FilesystemException(sprintf('%1$s: Unable to find local file. Local path: %2$s', __METHOD__, $local));
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			@ fclose($fp);
+
+			throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+		}
+
+		// Send store command to the FTP server
+		if (!$this->_putCmd('STOR ' . $remote, array(150, 125)))
+		{
+			@ fclose($fp);
+			@ fclose($this->dataconn);
+
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		// Do actual file transfer, read local file and write to data port connection
+		while (!feof($fp))
+		{
+			$line = fread($fp, 4096);
+
+			do
+			{
+				if (($result = @ fwrite($this->dataconn, $line)) === false)
+				{
+					throw new FilesystemException(__METHOD__ . ': Unable to write to data port socket');
+				}
+
+				$line = substr($line, $result);
+			}
+
+			while ($line != "");
+		}
+
+		fclose($fp);
+		fclose($this->dataconn);
+
+		if (!$this->_verifyResponse(226))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to write a string to the FTP server
+	 *
+	 * @param   string  $remote  FTP path to file to write to
+	 * @param   string  $buffer  Contents to write to the FTP server
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function write($remote, $buffer)
+	{
+		// Determine file type
+		$mode = $this->_findMode($remote);
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			$tmp = fopen('buffer://tmp', 'br+');
+			fwrite($tmp, $buffer);
+			rewind($tmp);
+
+			if (@ftp_fput($this->conn, $remote, $tmp, $mode) === false)
+			{
+				fclose($tmp);
+
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			fclose($tmp);
+
+			return true;
+		}
+
+		// First we need to set the transfer mode
+		$this->_mode($mode);
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+		}
+
+		// Send store command to the FTP server
+		if (!$this->_putCmd('STOR ' . $remote, array(150, 125)))
+		{
+			@ fclose($this->dataconn);
+
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		// Write buffer to the data connection port
+		do
+		{
+			if (($result = @ fwrite($this->dataconn, $buffer)) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to write to data port socket.');
+			}
+
+			$buffer = substr($buffer, $result);
+		}
+
+		while ($buffer != "");
+
+		// Close the data connection port [Data transfer complete]
+		fclose($this->dataconn);
+
+		// Verify that the server recieved the transfer
+		if (!$this->_verifyResponse(226))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Path sent: %3$s', __METHOD__, $this->response, $remote)
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to list the filenames of the contents of a directory on the FTP server
+	 *
+	 * Note: Some servers also return folder names. However, to be sure to list folders on all
+	 * servers, you should use listDetails() instead if you also need to deal with folders
+	 *
+	 * @param   string  $path  Path local file to store on the FTP server
+	 *
+	 * @return  string  Directory listing
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function listNames($path = null)
+	{
+		$data = null;
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			if (($list = @ftp_nlist($this->conn, $path)) === false)
+			{
+				// Workaround for empty directories on some servers
+				if ($this->listDetails($path, 'files') === array())
+				{
+					return array();
+				}
+
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+
+			$list = preg_replace('#^' . preg_quote($path, '#') . '[/\\\\]?#', '', $list);
+
+			if ($keys = array_merge(array_keys($list, '.'), array_keys($list, '..')))
+			{
+				foreach ($keys as $key)
+				{
+					unset($list[$key]);
+				}
+			}
+
+			return $list;
+		}
+
+		// If a path exists, prepend a space
+		if ($path != null)
+		{
+			$path = ' ' . $path;
+		}
+
+		// Start passive mode
+		if (!$this->_passive())
+		{
+			throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+		}
+
+		if (!$this->_putCmd('NLST' . $path, array(150, 125)))
+		{
+			@ fclose($this->dataconn);
+
+			// Workaround for empty directories on some servers
+			if ($this->listDetails($path, 'files') === array())
+			{
+				return array();
+			}
+
+			throw new FilesystemException(
+				sprintf('%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s', __METHOD__, $this->response, $path)
+			);
+		}
+
+		// Read in the file listing.
+		while (!feof($this->dataconn))
+		{
+			$data .= fread($this->dataconn, 4096);
+		}
+
+		fclose($this->dataconn);
+
+		// Everything go okay?
+		if (!$this->_verifyResponse(226))
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Path sent: %3$s', __METHOD__, $this->response, $path)
+			);
+		}
+
+		$data = preg_split("/[" . CRLF . "]+/", $data, -1, PREG_SPLIT_NO_EMPTY);
+		$data = preg_replace('#^' . preg_quote(substr($path, 1), '#') . '[/\\\\]?#', '', $data);
+
+		if ($keys = array_merge(array_keys($data, '.'), array_keys($data, '..')))
+		{
+			foreach ($keys as $key)
+			{
+				unset($data[$key]);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Method to list the contents of a directory on the FTP server
+	 *
+	 * @param   string  $path  Path to the local file to be stored on the FTP server
+	 * @param   string  $type  Return type [raw|all|folders|files]
+	 *
+	 * @return  mixed  If $type is raw: string Directory listing, otherwise array of string with file-names
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function listDetails($path = null, $type = 'all')
+	{
+		$dir_list = array();
+		$data = null;
+		$regs = null;
+
+		// TODO: Deal with recurse -- nightmare
+		// For now we will just set it to false
+		$recurse = false;
+
+		// If native FTP support is enabled let's use it...
+		if (FTP_NATIVE)
+		{
+			// Turn passive mode on
+			if (@ftp_pasv($this->conn, true) === false)
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			if (($contents = @ftp_rawlist($this->conn, $path)) === false)
+			{
+				throw new FilesystemException(__METHOD__ . 'Bad response.');
+			}
+		}
+		else
+		{
+			// Non Native mode
+
+			// Start passive mode
+			if (!$this->_passive())
+			{
+				throw new FilesystemException(__METHOD__ . ': Unable to use passive mode.');
+			}
+
+			// If a path exists, prepend a space
+			if ($path != null)
+			{
+				$path = ' ' . $path;
+			}
+
+			// Request the file listing
+			if (!$this->_putCmd(($recurse == true) ? 'LIST -R' : 'LIST' . $path, array(150, 125)))
+			{
+				@ fclose($this->dataconn);
+
+				throw new FilesystemException(
+					sprintf(
+						'%1$s: Bad response.  Server response: %2$s [Expected: 150 or 125].  Path sent: %3$s',
+						__METHOD__, $this->response, $path
+					)
+				);
+			}
+
+			// Read in the file listing.
+			while (!feof($this->dataconn))
+			{
+				$data .= fread($this->dataconn, 4096);
+			}
+
+			fclose($this->dataconn);
+
+			// Everything go okay?
+			if (!$this->_verifyResponse(226))
+			{
+				throw new FilesystemException(
+					sprintf('%1$s: Transfer failed.  Server response: %2$s [Expected: 226].  Path sent: %3$s', __METHOD__, $this->response, $path)
+				);
+			}
+
+			$contents = explode(CRLF, $data);
+		}
+
+		// If only raw output is requested we are done
+		if ($type == 'raw')
+		{
+			return $data;
+		}
+
+		// If we received the listing of an empty directory, we are done as well
+		if (empty($contents[0]))
+		{
+			return $dir_list;
+		}
+
+		// If the server returned the number of results in the first response, let's dump it
+		if (strtolower(substr($contents[0], 0, 6)) == 'total ')
+		{
+			array_shift($contents);
+
+			if (!isset($contents[0]) || empty($contents[0]))
+			{
+				return $dir_list;
+			}
+		}
+
+		// Regular expressions for the directory listing parsing.
+		$regexps = array(
+			'UNIX' => '#([-dl][rwxstST-]+).* ([0-9]*) ([a-zA-Z0-9]+).* ([a-zA-Z0-9]+).* ([0-9]*)'
+				. ' ([a-zA-Z]+[0-9: ]*[0-9])[ ]+(([0-9]{1,2}:[0-9]{2})|[0-9]{4}) (.+)#',
+			'MAC' => '#([-dl][rwxstST-]+).* ?([0-9 ]*)?([a-zA-Z0-9]+).* ([a-zA-Z0-9]+).* ([0-9]*)'
+				. ' ([a-zA-Z]+[0-9: ]*[0-9])[ ]+(([0-9]{2}:[0-9]{2})|[0-9]{4}) (.+)#',
+			'WIN' => '#([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)#'
+		);
+
+		// Find out the format of the directory listing by matching one of the regexps
+		$osType = null;
+
+		foreach ($regexps as $k => $v)
+		{
+			if (@preg_match($v, $contents[0]))
+			{
+				$osType = $k;
+				$regexp = $v;
+				break;
+			}
+		}
+
+		if (!$osType)
+		{
+			throw new FilesystemException(__METHOD__ . ': Unrecognised directory listing format.');
+		}
+
+		/*
+		 * Here is where it is going to get dirty....
+		 */
+		if ($osType == 'UNIX' || $osType == 'MAC')
+		{
+			foreach ($contents as $file)
+			{
+				$tmp_array = null;
+
+				if (@preg_match($regexp, $file, $regs))
+				{
+					$fType = (int) strpos("-dl", $regs[1]{0});
+
+					// $tmp_array['line'] = $regs[0];
+					$tmp_array['type'] = $fType;
+					$tmp_array['rights'] = $regs[1];
+
+					// $tmp_array['number'] = $regs[2];
+					$tmp_array['user'] = $regs[3];
+					$tmp_array['group'] = $regs[4];
+					$tmp_array['size'] = $regs[5];
+					$tmp_array['date'] = @date("m-d", strtotime($regs[6]));
+					$tmp_array['time'] = $regs[7];
+					$tmp_array['name'] = $regs[9];
+				}
+
+				// If we just want files, do not add a folder
+				if ($type == 'files' && $tmp_array['type'] == 1)
+				{
+					continue;
+				}
+
+				// If we just want folders, do not add a file
+				if ($type == 'folders' && $tmp_array['type'] == 0)
+				{
+					continue;
+				}
+
+				if (is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..')
+				{
+					$dir_list[] = $tmp_array;
+				}
+			}
+		}
+		else
+		{
+			foreach ($contents as $file)
+			{
+				$tmp_array = null;
+
+				if (@preg_match($regexp, $file, $regs))
+				{
+					$fType = (int) ($regs[7] == '<DIR>');
+					$timestamp = strtotime("$regs[3]-$regs[1]-$regs[2] $regs[4]:$regs[5]$regs[6]");
+
+					// $tmp_array['line'] = $regs[0];
+					$tmp_array['type'] = $fType;
+					$tmp_array['rights'] = '';
+
+					// $tmp_array['number'] = 0;
+					$tmp_array['user'] = '';
+					$tmp_array['group'] = '';
+					$tmp_array['size'] = (int) $regs[7];
+					$tmp_array['date'] = date('m-d', $timestamp);
+					$tmp_array['time'] = date('H:i', $timestamp);
+					$tmp_array['name'] = $regs[8];
+				}
+
+				// If we just want files, do not add a folder
+				if ($type == 'files' && $tmp_array['type'] == 1)
+				{
+					continue;
+				}
+
+				// If we just want folders, do not add a file
+				if ($type == 'folders' && $tmp_array['type'] == 0)
+				{
+					continue;
+				}
+
+				if (is_array($tmp_array) && $tmp_array['name'] != '.' && $tmp_array['name'] != '..')
+				{
+					$dir_list[] = $tmp_array;
+				}
+			}
+		}
+
+		return $dir_list;
+	}
+
+	/**
+	 * Send command to the FTP server and validate an expected response code
+	 *
+	 * @param   string  $cmd               Command to send to the FTP server
+	 * @param   mixed   $expectedResponse  Integer response code or array of integer response codes
+	 *
+	 * @return  boolean  True if command executed successfully
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	protected function _putCmd($cmd, $expectedResponse)
+	{
+		// Make sure we have a connection to the server
+		if (!is_resource($this->conn))
+		{
+			throw new FilesystemException(__METHOD__ . ': Not connected to the control port.');
+		}
+
+		// Send the command to the server
+		if (!fwrite($this->conn, $cmd . "\r\n"))
+		{
+			throw new FilesystemException(sprintf('%1$s: Unable to send command: %2$s', __METHOD__, $cmd));
+		}
+
+		return $this->_verifyResponse($expectedResponse);
+	}
+
+	/**
+	 * Verify the response code from the server and log response if flag is set
+	 *
+	 * @param   mixed  $expected  Integer response code or array of integer response codes
+	 *
+	 * @return  boolean  True if response code from the server is expected
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	protected function _verifyResponse($expected)
+	{
+		$parts = null;
+
+		// Wait for a response from the server, but timeout after the set time limit
+		$endTime = time() + $this->timeout;
+		$this->response = '';
+
+		do
+		{
+			$this->response .= fgets($this->conn, 4096);
+		}
+
+		while (!preg_match("/^([0-9]{3})(-(.*" . CRLF . ")+\\1)? [^" . CRLF . "]+" . CRLF . "$/", $this->response, $parts) && time() < $endTime);
+
+		// Catch a timeout or bad response
+		if (!isset($parts[1]))
+		{
+			throw new FilesystemException(
+				sprintf(
+					'%1$s: Timeout or unrecognised response while waiting for a response from the server. Server response: %2$s',
+					__METHOD__, $this->response
+				)
+			);
+		}
+
+		// Separate the code from the message
+		$this->responseCode = $parts[1];
+		$this->responseMsg  = $parts[0];
+
+		// Did the server respond with the code we wanted?
+		if (is_array($expected))
+		{
+			if (in_array($this->responseCode, $expected))
+			{
+				$retval = true;
+			}
+			else
+			{
+				$retval = false;
+			}
+		}
+		else
+		{
+			if ($this->responseCode == $expected)
+			{
+				$retval = true;
+			}
+			else
+			{
+				$retval = false;
+			}
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Set server to passive mode and open a data port connection
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	protected function _passive()
+	{
+		$match = array();
+		$parts = array();
+		$errno = null;
+		$err = null;
+
+		// Make sure we have a connection to the server
+		if (!is_resource($this->conn))
+		{
+			throw new FilesystemException(__METHOD__ . ': Not connected to the control port.');
+		}
+
+		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
+		@ fwrite($this->conn, "PASV\r\n");
+
+		// Wait for a response from the server, but timeout after the set time limit
+		$endTime = time() + $this->timeout;
+		$this->response = '';
+
+		do
+		{
+			$this->response .= fgets($this->conn, 4096);
+		}
+
+		while (!preg_match("/^([0-9]{3})(-(.*" . CRLF . ")+\\1)? [^" . CRLF . "]+" . CRLF . "$/", $this->response, $parts) && time() < $endTime);
+
+		// Catch a timeout or bad response
+		if (!isset($parts[1]))
+		{
+			throw new FilesystemException(
+				sprintf(
+					'%1$s: Timeout or unrecognised response while waiting for a response from the server. Server response: %2$s',
+					__METHOD__, $this->response
+				)
+			);
+		}
+
+		// Separate the code from the message
+		$this->responseCode = $parts[1];
+		$this->responseMsg  = $parts[0];
+
+		// If it's not 227, we weren't given an IP and port, which means it failed.
+		if ($this->responseCode != 227)
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: Unable to obtain IP and port for data transfer. Server response: %2$s', __METHOD__, $this->responseMsg)
+			);
+		}
+
+		// Snatch the IP and port information, or die horribly trying...
+		if (preg_match('~\((\d+),\s*(\d+),\s*(\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+))\)~', $this->responseMsg, $match) == 0)
+		{
+			throw new FilesystemException(
+				sprintf('%1$s: IP and port for data transfer not valid. Server response: %2$s', __METHOD__, $this->responseMsg)
+			);
+		}
+
+		// This is pretty simple - store it for later use ;).
+		$this->pasv = array('ip' => $match[1] . '.' . $match[2] . '.' . $match[3] . '.' . $match[4], 'port' => $match[5] * 256 + $match[6]);
+
+		// Connect, assuming we've got a connection.
+		$this->dataconn = @fsockopen($this->pasv['ip'], $this->pasv['port'], $errno, $err, $this->timeout);
+
+		if (!$this->dataconn)
+		{
+			throw new FilesystemException(
+				sprintf(
+					'%1$s: Could not connect to host %2$s on port %3$s. Socket error number: %4$s and error message: %5$s',
+					__METHOD__,
+					$this->pasv['ip'],
+					$this->pasv['port'],
+					$errno,
+					$err
+				)
+			);
+		}
+
+		// Set the timeout for this connection
+		socket_set_timeout($this->conn, $this->timeout, 0);
+
+		return true;
+	}
+
+	/**
+	 * Method to find out the correct transfer mode for a specific file
+	 *
+	 * @param   string  $fileName  Name of the file
+	 *
+	 * @return  integer Transfer-mode for this filetype [FTP_ASCII|FTP_BINARY]
+	 *
+	 * @since   1.0
+	 */
+	protected function _findMode($fileName)
+	{
+		if ($this->type == FTP_AUTOASCII)
+		{
+			$dot = strrpos($fileName, '.') + 1;
+			$ext = substr($fileName, $dot);
+
+			if (in_array($ext, $this->autoAscii))
+			{
+				$mode = FTP_ASCII;
+			}
+			else
+			{
+				$mode = FTP_BINARY;
+			}
+		}
+		elseif ($this->type == FTP_ASCII)
+		{
+			$mode = FTP_ASCII;
+		}
+		else
+		{
+			$mode = FTP_BINARY;
+		}
+
+		return $mode;
+	}
+
+	/**
+	 * Set transfer mode
+	 *
+	 * @param   integer  $mode  Integer representation of data transfer mode [1:Binary|0:Ascii]
+	 *                          Defined constants can also be used [FTP_BINARY|FTP_ASCII]
+	 *
+	 * @return  boolean  True if successful
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	protected function _mode($mode)
+	{
+		if ($mode == FTP_BINARY)
+		{
+			if (!$this->_putCmd("TYPE I", 200))
+			{
+				throw new FilesystemException(
+					sprintf('%1$s: Bad response. Server response: %2$s [Expected: 200]. Mode sent: Binary', __METHOD__, $this->response)
+				);
+			}
+		}
+		else
+		{
+			if (!$this->_putCmd("TYPE A", 200))
+			{
+				throw new FilesystemException(
+					sprintf('%1$s: Bad response. Server response: %2$s [Expected: 200]. Mode sent: ASCII', __METHOD__, $this->response)
+				);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Exception/FilesystemException.php b/core/libraries/vendor/joomla/filesystem/src/Exception/FilesystemException.php
new file mode 100644
index 00000000..575bc2f7
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Exception/FilesystemException.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem\Exception;
+
+/**
+ * Exception class for handling errors in the Filesystem package
+ *
+ * @since  1.2.0
+ */
+class FilesystemException extends \RuntimeException
+{
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/File.php b/core/libraries/vendor/joomla/filesystem/src/File.php
new file mode 100644
index 00000000..0f00dfe1
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/File.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+use Joomla\Filesystem\Exception\FilesystemException;
+
+/**
+ * A File handling class
+ *
+ * @since  1.0
+ */
+class File
+{
+	/**
+	 * Strips the last extension off of a file name
+	 *
+	 * @param   string  $file  The file name
+	 *
+	 * @return  string  The file name without the extension
+	 *
+	 * @since   1.0
+	 */
+	public static function stripExt($file)
+	{
+		return preg_replace('#\.[^.]*$#', '', $file);
+	}
+
+	/**
+	 * Makes the file name safe to use
+	 *
+	 * @param   string  $file        The name of the file [not full path]
+	 * @param   array   $stripChars  Array of regex (by default will remove any leading periods)
+	 *
+	 * @return  string  The sanitised string
+	 *
+	 * @since   1.0
+	 */
+	public static function makeSafe($file, array $stripChars = array('#^\.#'))
+	{
+		$regex = array_merge(array('#(\.){2,}#', '#[^A-Za-z0-9\.\_\- ]#'), $stripChars);
+
+		$file = preg_replace($regex, '', $file);
+
+		// Remove any trailing dots, as those aren't ever valid file names.
+		$file = rtrim($file, '.');
+
+		return $file;
+	}
+
+	/**
+	 * Copies a file
+	 *
+	 * @param   string   $src          The path to the source file
+	 * @param   string   $dest         The path to the destination file
+	 * @param   string   $path         An optional base path to prefix to the file names
+	 * @param   boolean  $use_streams  True to use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 * @throws  \UnexpectedValueException
+	 */
+	public static function copy($src, $dest, $path = null, $use_streams = false)
+	{
+		// Prepend a base path if it exists
+		if ($path)
+		{
+			$src = Path::clean($path . '/' . $src);
+			$dest = Path::clean($path . '/' . $dest);
+		}
+
+		// Check src path
+		if (!is_readable($src))
+		{
+			throw new \UnexpectedValueException(__METHOD__ . ': Cannot find or read file: ' . $src);
+		}
+
+		if ($use_streams)
+		{
+			Stream::getStream()->copy($src, $dest);
+
+			return true;
+		}
+
+		if (!@ copy($src, $dest))
+		{
+			throw new FilesystemException(__METHOD__ . ': Copy failed.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Delete a file or array of files
+	 *
+	 * @param   mixed  $file  The file name or an array of file names
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public static function delete($file)
+	{
+		$files = (array) $file;
+
+		foreach ($files as $file)
+		{
+			$file = Path::clean($file);
+
+			// Try making the file writable first. If it's read-only, it can't be deleted
+			// on Windows, even if the parent folder is writable
+			@chmod($file, 0777);
+
+			// In case of restricted permissions we zap it one way or the other
+			// as long as the owner is either the webserver or the ftp
+			if (!@ unlink($file))
+			{
+				$filename = basename($file);
+
+				throw new FilesystemException(__METHOD__ . ': Failed deleting ' . $filename);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Moves a file
+	 *
+	 * @param   string   $src          The path to the source file
+	 * @param   string   $dest         The path to the destination file
+	 * @param   string   $path         An optional base path to prefix to the file names
+	 * @param   boolean  $use_streams  True to use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public static function move($src, $dest, $path = '', $use_streams = false)
+	{
+		if ($path)
+		{
+			$src = Path::clean($path . '/' . $src);
+			$dest = Path::clean($path . '/' . $dest);
+		}
+
+		// Check src path
+		if (!is_readable($src))
+		{
+			return 'Cannot find source file.';
+		}
+
+		if ($use_streams)
+		{
+			Stream::getStream()->move($src, $dest);
+
+			return true;
+		}
+
+		if (!@ rename($src, $dest))
+		{
+			throw new FilesystemException(__METHOD__ . ': Rename failed.');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Write contents to a file
+	 *
+	 * @param   string   $file         The full file path
+	 * @param   string   &$buffer      The buffer to write
+	 * @param   boolean  $use_streams  Use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 */
+	public static function write($file, &$buffer, $use_streams = false)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		// If the destination directory doesn't exist we need to create it
+		if (!file_exists(dirname($file)))
+		{
+			Folder::create(dirname($file));
+		}
+
+		if ($use_streams)
+		{
+			$stream = Stream::getStream();
+
+			// Beef up the chunk size to a meg
+			$stream->set('chunksize', (1024 * 1024));
+
+			$stream->writeFile($file, $buffer);
+
+			return true;
+		}
+
+		$file = Path::clean($file);
+
+		return is_int(file_put_contents($file, $buffer));
+	}
+
+	/**
+	 * Moves an uploaded file to a destination folder
+	 *
+	 * @param   string   $src          The name of the php (temporary) uploaded file
+	 * @param   string   $dest         The path (including filename) to move the uploaded file to
+	 * @param   boolean  $use_streams  True to use streams
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public static function upload($src, $dest, $use_streams = false)
+	{
+		// Ensure that the path is valid and clean
+		$dest = Path::clean($dest);
+
+		// Create the destination directory if it does not exist
+		$baseDir = dirname($dest);
+
+		if (!file_exists($baseDir))
+		{
+			Folder::create($baseDir);
+		}
+
+		if ($use_streams)
+		{
+			Stream::getStream()->upload($src, $dest);
+
+			return true;
+		}
+
+		if (is_writeable($baseDir) && move_uploaded_file($src, $dest))
+		{
+			// Short circuit to prevent file permission errors
+			if (Path::setPermissions($dest))
+			{
+				return true;
+			}
+
+			throw new FilesystemException(__METHOD__ . ': Failed to change file permissions.');
+		}
+
+		throw new FilesystemException(__METHOD__ . ': Failed to move file.');
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Folder.php b/core/libraries/vendor/joomla/filesystem/src/Folder.php
new file mode 100644
index 00000000..129e085b
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Folder.php
@@ -0,0 +1,563 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+use Joomla\Filesystem\Exception\FilesystemException;
+
+/**
+ * A Folder handling class
+ *
+ * @since  1.0
+ */
+abstract class Folder
+{
+	/**
+	 * Copy a folder.
+	 *
+	 * @param   string   $src          The path to the source folder.
+	 * @param   string   $dest         The path to the destination folder.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $force        Force copy.
+	 * @param   boolean  $use_streams  Optionally force folder/file overwrites.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public static function copy($src, $dest, $path = '', $force = false, $use_streams = false)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		if ($path)
+		{
+			$src = Path::clean($path . '/' . $src);
+			$dest = Path::clean($path . '/' . $dest);
+		}
+
+		// Eliminate trailing directory separators, if any
+		$src = rtrim($src, DIRECTORY_SEPARATOR);
+		$dest = rtrim($dest, DIRECTORY_SEPARATOR);
+
+		if (!is_dir(Path::clean($src)))
+		{
+			throw new FilesystemException('Source folder not found', -1);
+		}
+
+		if (is_dir(Path::clean($dest)) && !$force)
+		{
+			throw new FilesystemException('Destination folder not found', -1);
+		}
+
+		// Make sure the destination exists
+		if (!self::create($dest))
+		{
+			throw new FilesystemException('Cannot create destination folder', -1);
+		}
+
+		if (!($dh = @opendir($src)))
+		{
+			throw new FilesystemException('Cannot open source folder', -1);
+		}
+
+		// Walk through the directory copying files and recursing into folders.
+		while (($file = readdir($dh)) !== false)
+		{
+			$sfid = $src . '/' . $file;
+			$dfid = $dest . '/' . $file;
+
+			switch (filetype($sfid))
+			{
+				case 'dir':
+					if ($file != '.' && $file != '..')
+					{
+						$ret = self::copy($sfid, $dfid, null, $force, $use_streams);
+
+						if ($ret !== true)
+						{
+							return $ret;
+						}
+					}
+					break;
+
+				case 'file':
+					if ($use_streams)
+					{
+						Stream::getStream()->copy($sfid, $dfid);
+					}
+					else
+					{
+						if (!@copy($sfid, $dfid))
+						{
+							throw new FilesystemException('Copy file failed', -1);
+						}
+					}
+					break;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Create a folder -- and all necessary parent folders.
+	 *
+	 * @param   string   $path  A path to create from the base path.
+	 * @param   integer  $mode  Directory permissions to set for folders created. 0755 by default.
+	 *
+	 * @return  boolean  True if successful.
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public static function create($path = '', $mode = 0755)
+	{
+		static $nested = 0;
+
+		// Check to make sure the path valid and clean
+		$path = Path::clean($path);
+
+		// Check if parent dir exists
+		$parent = dirname($path);
+
+		if (!is_dir(Path::clean($parent)))
+		{
+			// Prevent infinite loops!
+			$nested++;
+
+			if (($nested > 20) || ($parent == $path))
+			{
+				throw new FilesystemException(__METHOD__ . ': Infinite loop detected');
+			}
+
+			// Create the parent directory
+			if (self::create($parent, $mode) !== true)
+			{
+				// Folder::create throws an error
+				$nested--;
+
+				return false;
+			}
+
+			// OK, parent directory has been created
+			$nested--;
+		}
+
+		// Check if dir already exists
+		if (is_dir(Path::clean($path)))
+		{
+			return true;
+		}
+
+		// We need to get and explode the open_basedir paths
+		$obd = ini_get('open_basedir');
+
+		// If open_basedir is set we need to get the open_basedir that the path is in
+		if ($obd != null)
+		{
+			if (defined('PHP_WINDOWS_VERSION_MAJOR'))
+			{
+				$obdSeparator = ";";
+			}
+			else
+			{
+				$obdSeparator = ":";
+			}
+
+			// Create the array of open_basedir paths
+			$obdArray = explode($obdSeparator, $obd);
+			$inBaseDir = false;
+
+			// Iterate through open_basedir paths looking for a match
+			foreach ($obdArray as $test)
+			{
+				$test = Path::clean($test);
+
+				if (strpos($path, $test) === 0)
+				{
+					$inBaseDir = true;
+					break;
+				}
+			}
+
+			if ($inBaseDir == false)
+			{
+				// Throw a FilesystemException because the path to be created is not in open_basedir
+				throw new FilesystemException(__METHOD__ . ': Path not in open_basedir paths');
+			}
+		}
+
+		// First set umask
+		$origmask = @umask(0);
+
+		// Create the path
+		if (!$ret = @mkdir($path, $mode))
+		{
+			@umask($origmask);
+
+			throw new FilesystemException(__METHOD__ . ': Could not create directory.  Path: ' . $path);
+		}
+
+		// Reset umask
+		@umask($origmask);
+
+		return $ret;
+	}
+
+	/**
+	 * Delete a folder.
+	 *
+	 * @param   string  $path  The path to the folder to delete.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 * @throws  \UnexpectedValueException
+	 */
+	public static function delete($path)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		// Sanity check
+		if (!$path)
+		{
+			// Bad programmer! Bad Bad programmer!
+			throw new FilesystemException(__METHOD__ . ': You can not delete a base directory.');
+		}
+
+		try
+		{
+			// Check to make sure the path valid and clean
+			$path = Path::clean($path);
+		}
+		catch (\UnexpectedValueException $e)
+		{
+			throw $e;
+		}
+
+		// Is this really a folder?
+		if (!is_dir($path))
+		{
+			throw new \UnexpectedValueException(sprintf('%1$s: Path is not a folder. Path: %2$s', __METHOD__, $path));
+		}
+
+		// Remove all the files in folder if they exist; disable all filtering
+		$files = self::files($path, '.', false, true, array(), array());
+
+		if (!empty($files))
+		{
+			if (File::delete($files) !== true)
+			{
+				// File::delete throws an error
+				return false;
+			}
+		}
+
+		// Remove sub-folders of folder; disable all filtering
+		$folders = self::folders($path, '.', false, true, array(), array());
+
+		foreach ($folders as $folder)
+		{
+			if (is_link($folder))
+			{
+				// Don't descend into linked directories, just delete the link.
+				if (File::delete($folder) !== true)
+				{
+					// File::delete throws an error
+					return false;
+				}
+			}
+			elseif (self::delete($folder) !== true)
+			{
+				// Folder::delete throws an error
+				return false;
+			}
+		}
+
+		// In case of restricted permissions we zap it one way or the other
+		// as long as the owner is either the webserver or the ftp.
+		if (@rmdir($path))
+		{
+			return true;
+		}
+		else
+		{
+			throw new FilesystemException(sprintf('%1$s: Could not delete folder. Path: %2$s', __METHOD__, $path));
+		}
+	}
+
+	/**
+	 * Moves a folder.
+	 *
+	 * @param   string   $src          The path to the source folder.
+	 * @param   string   $dest         The path to the destination folder.
+	 * @param   string   $path         An optional base path to prefix to the file names.
+	 * @param   boolean  $use_streams  Optionally use streams.
+	 *
+	 * @return  mixed  Error message on false or boolean true on success.
+	 *
+	 * @since   1.0
+	 */
+	public static function move($src, $dest, $path = '', $use_streams = false)
+	{
+		if ($path)
+		{
+			$src = Path::clean($path . '/' . $src);
+			$dest = Path::clean($path . '/' . $dest);
+		}
+
+		if (!is_dir(Path::clean($src)))
+		{
+			return 'Cannot find source folder';
+		}
+
+		if (is_dir(Path::clean($dest)))
+		{
+			return 'Folder already exists';
+		}
+
+		if ($use_streams)
+		{
+			Stream::getStream()->move($src, $dest);
+
+			return true;
+		}
+
+		if (!@rename($src, $dest))
+		{
+			return 'Rename failed';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Utility function to read the files in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for file names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the file.
+	 * @param   array    $exclude        Array with names of files which should not be shown in the result.
+	 * @param   array    $excludefilter  Array of filter to exclude
+	 *
+	 * @return  array  Files in the given folder.
+	 *
+	 * @since   1.0
+	 * @throws  \UnexpectedValueException
+	 */
+	public static function files($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*', '.*~'))
+	{
+		// Check to make sure the path valid and clean
+		$path = Path::clean($path);
+
+		// Is the path a folder?
+		if (!is_dir($path))
+		{
+			throw new \UnexpectedValueException(sprintf('%1$s: Path is not a folder. Path: %2$s', __METHOD__, $path));
+		}
+
+		// Compute the excludefilter string
+		if (count($excludefilter))
+		{
+			$excludefilter_string = '/(' . implode('|', $excludefilter) . ')/';
+		}
+		else
+		{
+			$excludefilter_string = '';
+		}
+
+		// Get the files
+		$arr = self::_items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, true);
+
+		// Sort the files
+		asort($arr);
+
+		return array_values($arr);
+	}
+
+	/**
+	 * Utility function to read the folders in a folder.
+	 *
+	 * @param   string   $path           The path of the folder to read.
+	 * @param   string   $filter         A filter for folder names.
+	 * @param   mixed    $recurse        True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full           True to return the full path to the folders.
+	 * @param   array    $exclude        Array with names of folders which should not be shown in the result.
+	 * @param   array    $excludefilter  Array with regular expressions matching folders which should not be shown in the result.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @since   1.0
+	 * @throws  \UnexpectedValueException
+	 */
+	public static function folders($path, $filter = '.', $recurse = false, $full = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'),
+		$excludefilter = array('^\..*'))
+	{
+		// Check to make sure the path valid and clean
+		$path = Path::clean($path);
+
+		// Is the path a folder?
+		if (!is_dir($path))
+		{
+			throw new \UnexpectedValueException(sprintf('%1$s: Path is not a folder. Path: %2$s', __METHOD__, $path));
+		}
+
+		// Compute the excludefilter string
+		if (count($excludefilter))
+		{
+			$excludefilter_string = '/(' . implode('|', $excludefilter) . ')/';
+		}
+		else
+		{
+			$excludefilter_string = '';
+		}
+
+		// Get the folders
+		$arr = self::_items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, false);
+
+		// Sort the folders
+		asort($arr);
+
+		return array_values($arr);
+	}
+
+	/**
+	 * Function to read the files/folders in a folder.
+	 *
+	 * @param   string   $path                  The path of the folder to read.
+	 * @param   string   $filter                A filter for file names.
+	 * @param   mixed    $recurse               True to recursively search into sub-folders, or an integer to specify the maximum depth.
+	 * @param   boolean  $full                  True to return the full path to the file.
+	 * @param   array    $exclude               Array with names of files which should not be shown in the result.
+	 * @param   string   $excludefilter_string  Regexp of files to exclude
+	 * @param   boolean  $findfiles             True to read the files, false to read the folders
+	 *
+	 * @return  array  Files.
+	 *
+	 * @since   1.0
+	 */
+	protected static function _items($path, $filter, $recurse, $full, $exclude, $excludefilter_string, $findfiles)
+	{
+		@set_time_limit(ini_get('max_execution_time'));
+
+		$arr = array();
+
+		// Read the source directory
+		if (!($handle = @opendir($path)))
+		{
+			return $arr;
+		}
+
+		while (($file = readdir($handle)) !== false)
+		{
+			if ($file != '.' && $file != '..' && !in_array($file, $exclude)
+				&& (empty($excludefilter_string) || !preg_match($excludefilter_string, $file)))
+			{
+				// Compute the fullpath
+				$fullpath = $path . '/' . $file;
+
+				// Compute the isDir flag
+				$isDir = is_dir($fullpath);
+
+				if (($isDir xor $findfiles) && preg_match("/$filter/", $file))
+				{
+					// (fullpath is dir and folders are searched or fullpath is not dir and files are searched) and file matches the filter
+					if ($full)
+					{
+						// Full path is requested
+						$arr[] = $fullpath;
+					}
+					else
+					{
+						// Filename is requested
+						$arr[] = $file;
+					}
+				}
+
+				if ($isDir && $recurse)
+				{
+					// Search recursively
+					if (is_int($recurse))
+					{
+						// Until depth 0 is reached
+						$arr = array_merge($arr, self::_items($fullpath, $filter, $recurse - 1, $full, $exclude, $excludefilter_string, $findfiles));
+					}
+					else
+					{
+						$arr = array_merge($arr, self::_items($fullpath, $filter, $recurse, $full, $exclude, $excludefilter_string, $findfiles));
+					}
+				}
+			}
+		}
+
+		closedir($handle);
+
+		return $arr;
+	}
+
+	/**
+	 * Lists folder in format suitable for tree display.
+	 *
+	 * @param   string   $path      The path of the folder to read.
+	 * @param   string   $filter    A filter for folder names.
+	 * @param   integer  $maxLevel  The maximum number of levels to recursively read, defaults to three.
+	 * @param   integer  $level     The current level, optional.
+	 * @param   integer  $parent    Unique identifier of the parent folder, if any.
+	 *
+	 * @return  array  Folders in the given folder.
+	 *
+	 * @since   1.0
+	 */
+	public static function listFolderTree($path, $filter, $maxLevel = 3, $level = 0, $parent = 0)
+	{
+		$dirs = array();
+
+		if ($level == 0)
+		{
+			$GLOBALS['_JFolder_folder_tree_index'] = 0;
+		}
+
+		if ($level < $maxLevel)
+		{
+			$folders = self::folders($path, $filter);
+
+			// First path, index foldernames
+			foreach ($folders as $name)
+			{
+				$id = ++$GLOBALS['_JFolder_folder_tree_index'];
+				$fullName = Path::clean($path . '/' . $name);
+				$dirs[] = array('id' => $id, 'parent' => $parent, 'name' => $name, 'fullname' => $fullName,
+					'relname' => str_replace(JPATH_ROOT, '', $fullName));
+				$dirs2 = self::listFolderTree($fullName, $filter, $maxLevel, $level + 1, $id);
+				$dirs = array_merge($dirs, $dirs2);
+			}
+		}
+
+		return $dirs;
+	}
+
+	/**
+	 * Makes path name safe to use.
+	 *
+	 * @param   string  $path  The full path to sanitise.
+	 *
+	 * @return  string  The sanitised string.
+	 *
+	 * @since   1.0
+	 */
+	public static function makeSafe($path)
+	{
+		$regex = array('#[^A-Za-z0-9_\\\/\(\)\[\]\{\}\#\$\^\+\.\'~`!@&=;,-]#');
+
+		return preg_replace($regex, '', $path);
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Helper.php b/core/libraries/vendor/joomla/filesystem/src/Helper.php
new file mode 100644
index 00000000..dee497e7
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Helper.php
@@ -0,0 +1,299 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+/**
+ * File system helper
+ *
+ * Holds support functions for the filesystem, particularly the stream
+ *
+ * @since  1.0
+ */
+class Helper
+{
+	/**
+	 * Remote file size function for streams that don't support it
+	 *
+	 * @param   string  $url  TODO Add text
+	 *
+	 * @return  mixed
+	 *
+	 * @see     http://www.php.net/manual/en/function.filesize.php#71098
+	 * @since   1.0
+	 */
+	public static function remotefsize($url)
+	{
+		$sch = parse_url($url, PHP_URL_SCHEME);
+
+		if (($sch != 'http') && ($sch != 'https') && ($sch != 'ftp') && ($sch != 'ftps'))
+		{
+			return false;
+		}
+
+		if (($sch == 'http') || ($sch == 'https'))
+		{
+			$headers = get_headers($url, 1);
+
+			if ((!array_key_exists('Content-Length', $headers)))
+			{
+				return false;
+			}
+
+			return $headers['Content-Length'];
+		}
+
+		if (($sch == 'ftp') || ($sch == 'ftps'))
+		{
+			$server = parse_url($url, PHP_URL_HOST);
+			$port = parse_url($url, PHP_URL_PORT);
+			$path = parse_url($url, PHP_URL_PATH);
+			$user = parse_url($url, PHP_URL_USER);
+			$pass = parse_url($url, PHP_URL_PASS);
+
+			if ((!$server) || (!$path))
+			{
+				return false;
+			}
+
+			if (!$port)
+			{
+				$port = 21;
+			}
+
+			if (!$user)
+			{
+				$user = 'anonymous';
+			}
+
+			if (!$pass)
+			{
+				$pass = '';
+			}
+
+			$ftpid = null;
+
+			switch ($sch)
+			{
+				case 'ftp':
+					$ftpid = ftp_connect($server, $port);
+					break;
+
+				case 'ftps':
+					$ftpid = ftp_ssl_connect($server, $port);
+					break;
+			}
+
+			if (!$ftpid)
+			{
+				return false;
+			}
+
+			$login = ftp_login($ftpid, $user, $pass);
+
+			if (!$login)
+			{
+				return false;
+			}
+
+			$ftpsize = ftp_size($ftpid, $path);
+			ftp_close($ftpid);
+
+			if ($ftpsize == -1)
+			{
+				return false;
+			}
+
+			return $ftpsize;
+		}
+	}
+
+	/**
+	 * Quick FTP chmod
+	 *
+	 * @param   string   $url   Link identifier
+	 * @param   integer  $mode  The new permissions, given as an octal value.
+	 *
+	 * @return  mixed
+	 *
+	 * @see     http://www.php.net/manual/en/function.ftp-chmod.php
+	 * @since   1.0
+	 */
+	public static function ftpChmod($url, $mode)
+	{
+		$sch = parse_url($url, PHP_URL_SCHEME);
+
+		if (($sch != 'ftp') && ($sch != 'ftps'))
+		{
+			return false;
+		}
+
+		$server = parse_url($url, PHP_URL_HOST);
+		$port = parse_url($url, PHP_URL_PORT);
+		$path = parse_url($url, PHP_URL_PATH);
+		$user = parse_url($url, PHP_URL_USER);
+		$pass = parse_url($url, PHP_URL_PASS);
+
+		if ((!$server) || (!$path))
+		{
+			return false;
+		}
+
+		if (!$port)
+		{
+			$port = 21;
+		}
+
+		if (!$user)
+		{
+			$user = 'anonymous';
+		}
+
+		if (!$pass)
+		{
+			$pass = '';
+		}
+
+		$ftpid = null;
+
+		switch ($sch)
+		{
+			case 'ftp':
+				$ftpid = ftp_connect($server, $port);
+				break;
+
+			case 'ftps':
+				$ftpid = ftp_ssl_connect($server, $port);
+				break;
+		}
+
+		if (!$ftpid)
+		{
+			return false;
+		}
+
+		$login = ftp_login($ftpid, $user, $pass);
+
+		if (!$login)
+		{
+			return false;
+		}
+
+		$res = ftp_chmod($ftpid, $mode, $path);
+		ftp_close($ftpid);
+
+		return $res;
+	}
+
+	/**
+	 * Modes that require a write operation
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function getWriteModes()
+	{
+		return array('w', 'w+', 'a', 'a+', 'r+', 'x', 'x+');
+	}
+
+	/**
+	 * Stream and Filter Support Operations
+	 *
+	 * Returns the supported streams, in addition to direct file access
+	 * Also includes Joomla! streams as well as PHP streams
+	 *
+	 * @return  array  Streams
+	 *
+	 * @since   1.0
+	 */
+	public static function getSupported()
+	{
+		// Really quite cool what php can do with arrays when you let it...
+		static $streams;
+
+		if (!$streams)
+		{
+			$streams = array_merge(stream_get_wrappers(), self::getJStreams());
+		}
+
+		return $streams;
+	}
+
+	/**
+	 * Returns a list of transports
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function getTransports()
+	{
+		// Is this overkill?
+		return stream_get_transports();
+	}
+
+	/**
+	 * Returns a list of filters
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function getFilters()
+	{
+		// Note: This will look like the getSupported() function with J! filters.
+		// TODO: add user space filter loading like user space stream loading
+		return stream_get_filters();
+	}
+
+	/**
+	 * Returns a list of J! streams
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function getJStreams()
+	{
+		static $streams = array();
+
+		if (!$streams)
+		{
+			$files = new \DirectoryIterator(__DIR__ . '/Stream');
+
+			/* @var  $file  \DirectoryIterator */
+			foreach ($files as $file)
+			{
+				// Only load for php files.
+				if (!$file->isFile() || $file->getExtension() != 'php')
+				{
+					continue;
+				}
+
+				$streams[] = $file->getBasename('.php');
+			}
+		}
+
+		return $streams;
+	}
+
+	/**
+	 * Determine if a stream is a Joomla stream.
+	 *
+	 * @param   string  $streamname  The name of a stream
+	 *
+	 * @return  boolean  True for a Joomla Stream
+	 *
+	 * @since   1.0
+	 */
+	public static function isJoomlaStream($streamname)
+	{
+		return in_array($streamname, self::getJStreams());
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Patcher.php b/core/libraries/vendor/joomla/filesystem/src/Patcher.php
new file mode 100644
index 00000000..ec46f779
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Patcher.php
@@ -0,0 +1,544 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+/**
+ * A Unified Diff Format Patcher class
+ *
+ * @link   http://sourceforge.net/projects/phppatcher/ This has been derived from the PhpPatcher version 0.1.1 written by Giuseppe Mazzotta
+ * @since  1.0
+ */
+class Patcher
+{
+	/**
+	 * Regular expression for searching source files
+	 */
+	const SRC_FILE = '/^---\\s+(\\S+)\s+\\d{1,4}-\\d{1,2}-\\d{1,2}\\s+\\d{1,2}:\\d{1,2}:\\d{1,2}(\\.\\d+)?\\s+(\+|-)\\d{4}/A';
+
+	/**
+	 * Regular expression for searching destination files
+	 */
+	const DST_FILE = '/^\\+\\+\\+\\s+(\\S+)\s+\\d{1,4}-\\d{1,2}-\\d{1,2}\\s+\\d{1,2}:\\d{1,2}:\\d{1,2}(\\.\\d+)?\\s+(\+|-)\\d{4}/A';
+
+	/**
+	 * Regular expression for searching hunks of differences
+	 */
+	const HUNK = '/@@ -(\\d+)(,(\\d+))?\\s+\\+(\\d+)(,(\\d+))?\\s+@@($)/A';
+
+	/**
+	 * Regular expression for splitting lines
+	 */
+	const SPLIT = '/(\r\n)|(\r)|(\n)/';
+
+	/**
+	 * @var    array  sources files
+	 * @since  1.0
+	 */
+	protected $sources = array();
+
+	/**
+	 * @var    array  destination files
+	 * @since  1.0
+	 */
+	protected $destinations = array();
+
+	/**
+	 * @var    array  removal files
+	 * @since  1.0
+	 */
+	protected $removals = array();
+
+	/**
+	 * @var    array  patches
+	 * @since  1.0
+	 */
+	protected $patches = array();
+
+	/**
+	 * @var    array  instance of this class
+	 * @since  1.0
+	 */
+	protected static $instance;
+
+	/**
+	 * Constructor
+	 *
+	 * The constructor is protected to force the use of Patcher::getInstance()
+	 *
+	 * @since   1.0
+	 */
+	protected function __construct()
+	{
+	}
+
+	/**
+	 * Method to get a patcher
+	 *
+	 * @return  Patcher  an instance of the patcher
+	 *
+	 * @since   1.0
+	 */
+	public static function getInstance()
+	{
+		if (!isset(static::$instance))
+		{
+			static::$instance = new static;
+		}
+
+		return static::$instance;
+	}
+
+	/**
+	 * Reset the pacher
+	 *
+	 * @return  Patcher  This object for chaining
+	 *
+	 * @since   1.0
+	 */
+	public function reset()
+	{
+		$this->sources = array();
+		$this->destinations = array();
+		$this->removals = array();
+		$this->patches = array();
+
+		return $this;
+	}
+
+	/**
+	 * Apply the patches
+	 *
+	 * @return  integer  The number of files patched
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function apply()
+	{
+		foreach ($this->patches as $patch)
+		{
+			// Separate the input into lines
+			$lines = self::splitLines($patch['udiff']);
+
+			// Loop for each header
+			while (self::findHeader($lines, $src, $dst))
+			{
+				$done = false;
+
+				if ($patch['strip'] === null)
+				{
+					$src = $patch['root'] . preg_replace('#^([^/]*/)*#', '', $src);
+					$dst = $patch['root'] . preg_replace('#^([^/]*/)*#', '', $dst);
+				}
+				else
+				{
+					$src = $patch['root'] . preg_replace('#^([^/]*/){' . (int) $patch['strip'] . '}#', '', $src);
+					$dst = $patch['root'] . preg_replace('#^([^/]*/){' . (int) $patch['strip'] . '}#', '', $dst);
+				}
+
+				// Loop for each hunk of differences
+				while (self::findHunk($lines, $src_line, $src_size, $dst_line, $dst_size))
+				{
+					$done = true;
+
+					// Apply the hunk of differences
+					$this->applyHunk($lines, $src, $dst, $src_line, $src_size, $dst_line, $dst_size);
+				}
+
+				// If no modifications were found, throw an exception
+				if (!$done)
+				{
+					throw new \RuntimeException('Invalid Diff');
+				}
+			}
+		}
+
+		// Initialize the counter
+		$done = 0;
+
+		// Patch each destination file
+		foreach ($this->destinations as $file => $content)
+		{
+			$content = implode("\n", $content);
+
+			if (File::write($file, $content))
+			{
+				if (isset($this->sources[$file]))
+				{
+					$this->sources[$file] = $content;
+				}
+
+				$done++;
+			}
+		}
+
+		// Remove each removed file
+		foreach ($this->removals as $file)
+		{
+			if (File::delete($file))
+			{
+				if (isset($this->sources[$file]))
+				{
+					unset($this->sources[$file]);
+				}
+
+				$done++;
+			}
+		}
+
+		// Clear the destinations cache
+		$this->destinations = array();
+
+		// Clear the removals
+		$this->removals = array();
+
+		// Clear the patches
+		$this->patches = array();
+
+		return $done;
+	}
+
+	/**
+	 * Add a unified diff file to the patcher
+	 *
+	 * @param   string   $filename  Path to the unified diff file
+	 * @param   string   $root      The files root path
+	 * @param   integer  $strip     The number of '/' to strip
+	 *
+	 * @return	Patcher  $this for chaining
+	 *
+	 * @since   1.0
+	 */
+	public function addFile($filename, $root = JPATH_ROOT, $strip = 0)
+	{
+		return $this->add(file_get_contents($filename), $root, $strip);
+	}
+
+	/**
+	 * Add a unified diff string to the patcher
+	 *
+	 * @param   string   $udiff  Unified diff input string
+	 * @param   string   $root   The files root path
+	 * @param   integer  $strip  The number of '/' to strip
+	 *
+	 * @return	Patcher  $this for chaining
+	 *
+	 * @since   1.0
+	 */
+	public function add($udiff, $root = JPATH_ROOT, $strip = 0)
+	{
+		$this->patches[] = array(
+			'udiff' => $udiff,
+			'root' => isset($root) ? rtrim($root, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : '',
+			'strip' => $strip
+		);
+
+		return $this;
+	}
+
+	/**
+	 * Separate CR or CRLF lines
+	 *
+	 * @param   string  $data  Input string
+	 *
+	 * @return  array  The lines of the input destination file
+	 *
+	 * @since   1.0
+	 */
+	protected static function splitLines($data)
+	{
+		return preg_split(self::SPLIT, $data);
+	}
+
+	/**
+	 * Find the diff header
+	 *
+	 * The internal array pointer of $lines is on the next line after the finding
+	 *
+	 * @param   array   &$lines  The udiff array of lines
+	 * @param   string  &$src    The source file
+	 * @param   string  &$dst    The destination file
+	 *
+	 * @return  boolean  TRUE in case of success, FALSE in case of failure
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected static function findHeader(&$lines, &$src, &$dst)
+	{
+		// Get the current line
+		$line = current($lines);
+
+		// Search for the header
+		while ($line !== false && !preg_match(self::SRC_FILE, $line, $m))
+		{
+			$line = next($lines);
+		}
+
+		if ($line === false)
+		{
+			// No header found, return false
+			return false;
+		}
+		else
+		{
+			// Set the source file
+			$src = $m[1];
+
+			// Advance to the next line
+			$line = next($lines);
+
+			if ($line === false)
+			{
+				throw new \RuntimeException('Unexpected EOF');
+			}
+
+			// Search the destination file
+			if (!preg_match(self::DST_FILE, $line, $m))
+			{
+				throw new \RuntimeException('Invalid Diff file');
+			}
+
+			// Set the destination file
+			$dst = $m[1];
+
+			// Advance to the next line
+			if (next($lines) === false)
+			{
+				throw new \RuntimeException('Unexpected EOF');
+			}
+
+			return true;
+		}
+	}
+
+	/**
+	 * Find the next hunk of difference
+	 *
+	 * The internal array pointer of $lines is on the next line after the finding
+	 *
+	 * @param   array   &$lines     The udiff array of lines
+	 * @param   string  &$src_line  The beginning of the patch for the source file
+	 * @param   string  &$src_size  The size of the patch for the source file
+	 * @param   string  &$dst_line  The beginning of the patch for the destination file
+	 * @param   string  &$dst_size  The size of the patch for the destination file
+	 *
+	 * @return  boolean  TRUE in case of success, false in case of failure
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected static function findHunk(&$lines, &$src_line, &$src_size, &$dst_line, &$dst_size)
+	{
+		$line = current($lines);
+
+		if (preg_match(self::HUNK, $line, $m))
+		{
+			$src_line = (int) $m[1];
+
+			if ($m[3] === '')
+			{
+				$src_size = 1;
+			}
+			else
+			{
+				$src_size = (int) $m[3];
+			}
+
+			$dst_line = (int) $m[4];
+
+			if ($m[6] === '')
+			{
+				$dst_size = 1;
+			}
+			else
+			{
+				$dst_size = (int) $m[6];
+			}
+
+			if (next($lines) === false)
+			{
+				throw new \RuntimeException('Unexpected EOF');
+			}
+
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Apply the patch
+	 *
+	 * @param   array   &$lines    The udiff array of lines
+	 * @param   string  $src       The source file
+	 * @param   string  $dst       The destination file
+	 * @param   string  $src_line  The beginning of the patch for the source file
+	 * @param   string  $src_size  The size of the patch for the source file
+	 * @param   string  $dst_line  The beginning of the patch for the destination file
+	 * @param   string  $dst_size  The size of the patch for the destination file
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function applyHunk(&$lines, $src, $dst, $src_line, $src_size, $dst_line, $dst_size)
+	{
+		$src_line--;
+		$dst_line--;
+		$line = current($lines);
+
+		// Source lines (old file)
+		$source = array();
+
+		// New lines (new file)
+		$destin = array();
+		$src_left = $src_size;
+		$dst_left = $dst_size;
+
+		do
+		{
+			if (!isset($line[0]))
+			{
+				$source[] = '';
+				$destin[] = '';
+				$src_left--;
+				$dst_left--;
+			}
+			elseif ($line[0] == '-')
+			{
+				if ($src_left == 0)
+				{
+					throw new \RuntimeException('Unexpected remove line at line ' . key($lines));
+				}
+
+				$source[] = substr($line, 1);
+				$src_left--;
+			}
+			elseif ($line[0] == '+')
+			{
+				if ($dst_left == 0)
+				{
+					throw new \RuntimeException('Unexpected add line at line ' . key($lines));
+				}
+
+				$destin[] = substr($line, 1);
+				$dst_left--;
+			}
+			elseif ($line != '\\ No newline at end of file')
+			{
+				$line = substr($line, 1);
+				$source[] = $line;
+				$destin[] = $line;
+				$src_left--;
+				$dst_left--;
+			}
+
+			if ($src_left == 0 && $dst_left == 0)
+			{
+				// Now apply the patch, finally!
+				if ($src_size > 0)
+				{
+					$src_lines = & $this->getSource($src);
+
+					if (!isset($src_lines))
+					{
+						throw new \RuntimeException('Unexisting source file: ' . $src);
+					}
+				}
+
+				if ($dst_size > 0)
+				{
+					if ($src_size > 0)
+					{
+						$dst_lines = & $this->getDestination($dst, $src);
+						$src_bottom = $src_line + count($source);
+
+						for ($l = $src_line;$l < $src_bottom;$l++)
+						{
+							if ($src_lines[$l] != $source[$l - $src_line])
+							{
+								throw new \RuntimeException(sprintf('Failed source verification of file %1$s at line %2$s', $src, $l));
+							}
+						}
+
+						array_splice($dst_lines, $dst_line, count($source), $destin);
+					}
+					else
+					{
+						$this->destinations[$dst] = $destin;
+					}
+				}
+				else
+				{
+					$this->removals[] = $src;
+				}
+
+				next($lines);
+
+				return;
+			}
+
+			$line = next($lines);
+		}
+
+		while ($line !== false);
+
+		throw new \RuntimeException('Unexpected EOF');
+	}
+
+	/**
+	 * Get the lines of a source file
+	 *
+	 * @param   string  $src  The path of a file
+	 *
+	 * @return  array  The lines of the source file
+	 *
+	 * @since   1.0
+	 */
+	protected function &getSource($src)
+	{
+		if (!isset($this->sources[$src]))
+		{
+			if (is_readable($src))
+			{
+				$this->sources[$src] = self::splitLines(file_get_contents($src));
+			}
+			else
+			{
+				$this->sources[$src] = null;
+			}
+		}
+
+		return $this->sources[$src];
+	}
+
+	/**
+	 * Get the lines of a destination file
+	 *
+	 * @param   string  $dst  The path of a destination file
+	 * @param   string  $src  The path of a source file
+	 *
+	 * @return  array  The lines of the destination file
+	 *
+	 * @since   1.0
+	 */
+	protected function &getDestination($dst, $src)
+	{
+		if (!isset($this->destinations[$dst]))
+		{
+			$this->destinations[$dst] = $this->getSource($src);
+		}
+
+		return $this->destinations[$dst];
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Path.php b/core/libraries/vendor/joomla/filesystem/src/Path.php
new file mode 100644
index 00000000..1ffb3d07
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Path.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+if (!defined('JPATH_ROOT'))
+{
+	throw new \LogicException('The "JPATH_ROOT" constant must be defined for your application.');
+}
+
+/**
+ * A Path handling class
+ *
+ * @since  1.0
+ */
+class Path
+{
+	/**
+	 * Checks if a path's permissions can be changed.
+	 *
+	 * @param   string  $path  Path to check.
+	 *
+	 * @return  boolean  True if path can have mode changed.
+	 *
+	 * @since   1.0
+	 */
+	public static function canChmod($path)
+	{
+		$perms = fileperms($path);
+
+		if ($perms !== false)
+		{
+			if (@chmod($path, $perms ^ 0001))
+			{
+				@chmod($path, $perms);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Chmods files and directories recursively to given permissions.
+	 *
+	 * @param   string  $path        Root path to begin changing mode [without trailing slash].
+	 * @param   string  $filemode    Octal representation of the value to change file mode to [null = no change].
+	 * @param   string  $foldermode  Octal representation of the value to change folder mode to [null = no change].
+	 *
+	 * @return  boolean  True if successful [one fail means the whole operation failed].
+	 *
+	 * @since   1.0
+	 */
+	public static function setPermissions($path, $filemode = '0644', $foldermode = '0755')
+	{
+		// Initialise return value
+		$ret = true;
+
+		if (is_dir($path))
+		{
+			$dh = opendir($path);
+
+			while ($file = readdir($dh))
+			{
+				if ($file != '.' && $file != '..')
+				{
+					$fullpath = $path . '/' . $file;
+
+					if (is_dir($fullpath))
+					{
+						if (!self::setPermissions($fullpath, $filemode, $foldermode))
+						{
+							$ret = false;
+						}
+					}
+					else
+					{
+						if (isset($filemode))
+						{
+							if (!@ chmod($fullpath, octdec($filemode)))
+							{
+								$ret = false;
+							}
+						}
+					}
+				}
+			}
+
+			closedir($dh);
+
+			if (isset($foldermode))
+			{
+				if (!@ chmod($path, octdec($foldermode)))
+				{
+					$ret = false;
+				}
+			}
+		}
+		else
+		{
+			if (isset($filemode))
+			{
+				$ret = @ chmod($path, octdec($filemode));
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Get the permissions of the file/folder at a give path.
+	 *
+	 * @param   string  $path  The path of a file/folder.
+	 *
+	 * @return  string  Filesystem permissions.
+	 *
+	 * @since   1.0
+	 */
+	public static function getPermissions($path)
+	{
+		$path = self::clean($path);
+		$mode = @ decoct(@ fileperms($path) & 0777);
+
+		if (strlen($mode) < 3)
+		{
+			return '---------';
+		}
+
+		$parsed_mode = '';
+
+		for ($i = 0; $i < 3; $i++)
+		{
+			// Read
+			$parsed_mode .= ($mode{$i} & 04) ? "r" : "-";
+
+			// Write
+			$parsed_mode .= ($mode{$i} & 02) ? "w" : "-";
+
+			// Execute
+			$parsed_mode .= ($mode{$i} & 01) ? "x" : "-";
+		}
+
+		return $parsed_mode;
+	}
+
+	/**
+	 * Checks for snooping outside of the file system root.
+	 *
+	 * @param   string  $path  A file system path to check.
+	 *
+	 * @return  string  A cleaned version of the path or exit on error.
+	 *
+	 * @since   1.0
+	 * @throws  \Exception
+	 */
+	public static function check($path)
+	{
+		if (strpos($path, '..') !== false)
+		{
+			throw new \Exception('JPath::check Use of relative paths not permitted', 20);
+		}
+
+		$path = self::clean($path);
+
+		if ((JPATH_ROOT != '') && strpos($path, self::clean(JPATH_ROOT)) !== 0)
+		{
+			throw new \Exception('JPath::check Snooping out of bounds @ ' . $path, 20);
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Function to strip additional / or \ in a path name.
+	 *
+	 * @param   string  $path  The path to clean.
+	 * @param   string  $ds    Directory separator (optional).
+	 *
+	 * @return  string  The cleaned path.
+	 *
+	 * @since   1.0
+	 * @throws  \UnexpectedValueException If $path is not a string.
+	 */
+	public static function clean($path, $ds = DIRECTORY_SEPARATOR)
+	{
+		if (!is_string($path))
+		{
+			throw new \UnexpectedValueException('JPath::clean $path is not a string.');
+		}
+
+		$path = trim($path);
+
+		if (empty($path))
+		{
+			$path = JPATH_ROOT;
+		}
+		elseif (($ds == '\\') && ($path[0] == '\\' ) && ( $path[1] == '\\' ))
+		// Remove double slashes and backslashes and convert all slashes and backslashes to DIRECTORY_SEPARATOR
+		// If dealing with a UNC path don't forget to prepend the path with a backslash.
+		{
+			$path = "\\" . preg_replace('#[/\\\\]+#', $ds, $path);
+		}
+		else
+		{
+			$path = preg_replace('#[/\\\\]+#', $ds, $path);
+		}
+
+		return $path;
+	}
+
+	/**
+	 * Method to determine if script owns the path.
+	 *
+	 * @param   string  $path  Path to check ownership.
+	 *
+	 * @return  boolean  True if the php script owns the path passed.
+	 *
+	 * @since   1.0
+	 */
+	public static function isOwner($path)
+	{
+		$tmp = md5(random_bytes(16));
+		$ssp = ini_get('session.save_path');
+		$jtp = JPATH_ROOT . '/tmp';
+
+		// Try to find a writable directory
+		$dir = is_writable('/tmp') ? '/tmp' : false;
+		$dir = (!$dir && is_writable($ssp)) ? $ssp : $dir;
+		$dir = (!$dir && is_writable($jtp)) ? $jtp : $dir;
+
+		if ($dir)
+		{
+			$test = $dir . '/' . $tmp;
+
+			// Create the test file
+			$blank = '';
+			File::write($test, $blank, false);
+
+			// Test ownership
+			$return = (fileowner($test) == fileowner($path));
+
+			// Delete the test file
+			File::delete($test);
+
+			return $return;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Searches the directory paths for a given file.
+	 *
+	 * @param   mixed   $paths  An path string or array of path strings to search in
+	 * @param   string  $file   The file name to look for.
+	 *
+	 * @return  mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+	 *
+	 * @since   1.0
+	 */
+	public static function find($paths, $file)
+	{
+		// Force to array
+		if (!is_array($paths) && !($paths instanceof \Iterator))
+		{
+			settype($paths, 'array');
+		}
+
+		// Start looping through the path set
+		foreach ($paths as $path)
+		{
+			// Get the path to the file
+			$fullname = $path . '/' . $file;
+
+			// Is the path based on a stream?
+			if (strpos($path, '://') === false)
+			{
+				// Not a stream, so do a realpath() to avoid directory
+				// traversal attempts on the local file system.
+
+				// Needed for substr() later
+				$path = realpath($path);
+				$fullname = realpath($fullname);
+			}
+
+			/*
+			 * The substr() check added to make sure that the realpath()
+			 * results in a directory registered so that
+			 * non-registered directories are not accessible via directory
+			 * traversal attempts.
+			 */
+			if (file_exists($fullname) && substr($fullname, 0, strlen($path)) == $path)
+			{
+				return $fullname;
+			}
+		}
+
+		// Could not find the file in the set of paths
+		return false;
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Stream.php b/core/libraries/vendor/joomla/filesystem/src/Stream.php
new file mode 100644
index 00000000..4ee8d618
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Stream.php
@@ -0,0 +1,1441 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem;
+
+use Joomla\Filesystem\Exception\FilesystemException;
+
+/**
+ * Joomla! Stream Interface
+ *
+ * The Joomla! stream interface is designed to handle files as streams
+ * where as the legacy JFile static class treated files in a rather
+ * atomic manner.
+ *
+ * This class adheres to the stream wrapper operations:
+ *
+ * @see    http://php.net/manual/en/function.stream-get-wrappers.php
+ * @see    http://php.net/manual/en/intro.stream.php PHP Stream Manual
+ * @see    http://php.net/manual/en/wrappers.php Stream Wrappers
+ * @see    http://php.net/manual/en/filters.php Stream Filters
+ * @see    http://php.net/manual/en/transports.php Socket Transports (used by some options, particularly HTTP proxy)
+ * @since  1.0
+ */
+class Stream
+{
+	/**
+	 * File Mode
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	protected $filemode = 0644;
+
+	/**
+	 * Directory Mode
+	 *
+	 * @var   integer
+	 * @since  1.0
+	 */
+	protected $dirmode = 0755;
+
+	/**
+	 * Default Chunk Size
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	protected $chunksize = 8192;
+
+	/**
+	 * Filename
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected $filename;
+
+	/**
+	 * Prefix of the connection for writing
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected $writeprefix;
+
+	/**
+	 * Prefix of the connection for reading
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected $readprefix;
+
+	/**
+	 * Read Processing method
+	 *
+	 * @var    string  gz, bz, f
+	 * If a scheme is detected, fopen will be defaulted
+	 * To use compression with a network stream use a filter
+	 * @since  1.0
+	 */
+	protected $processingmethod = 'f';
+
+	/**
+	 * Filters applied to the current stream
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $filters = array();
+
+	/**
+	 * File Handle
+	 *
+	 * @var    resource
+	 * @since  1.0
+	 */
+	protected $fh;
+
+	/**
+	 * File size
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	protected $filesize;
+
+	/**
+	 * Context to use when opening the connection
+	 *
+	 * @var
+	 * @since  1.0
+	 */
+	protected $context = null;
+
+	/**
+	 * Context options; used to rebuild the context
+	 *
+	 * @var
+	 * @since  1.0
+	 */
+	protected $contextOptions;
+
+	/**
+	 * The mode under which the file was opened
+	 *
+	 * @var
+	 * @since  1.0
+	 */
+	protected $openmode;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $writeprefix  Prefix of the stream (optional). Unlike the JPATH_*, this has a final path separator!
+	 * @param   string  $readprefix   The read prefix (optional).
+	 * @param   array   $context      The context options (optional).
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($writeprefix = '', $readprefix = '', $context = array())
+	{
+		$this->writeprefix = $writeprefix;
+		$this->readprefix = $readprefix;
+		$this->contextOptions = $context;
+		$this->_buildContext();
+	}
+
+	/**
+	 * Destructor
+	 *
+	 * @since   1.0
+	 */
+	public function __destruct()
+	{
+		// Attempt to close on destruction if there is a file handle
+		if ($this->fh)
+		{
+			@$this->close();
+		}
+	}
+
+	/**
+	 * Creates a new stream object with appropriate prefix
+	 *
+	 * @param   boolean  $use_prefix  Prefix the connections for writing
+	 * @param   string   $ua          UA User agent to use
+	 * @param   boolean  $uamask      User agent masking (prefix Mozilla)
+	 *
+	 * @return  Stream
+	 *
+	 * @see     Stream
+	 * @since   1.0
+	 */
+	public static function getStream($use_prefix = true, $ua = null, $uamask = false)
+	{
+		// Setup the context; Joomla! UA and overwrite
+		$context = array();
+
+		// Set the UA for HTTP
+		$context['http']['user_agent'] = $ua ?: 'Joomla! Framework Stream';
+
+		if ($use_prefix)
+		{
+			return new Stream(JPATH_ROOT . '/', JPATH_ROOT, $context);
+		}
+
+		return new Stream('', '', $context);
+	}
+
+	/**
+	 * Generic File Operations
+	 *
+	 * Open a stream with some lazy loading smarts
+	 *
+	 * @param   string    $filename              Filename
+	 * @param   string    $mode                  Mode string to use
+	 * @param   boolean   $use_include_path      Use the PHP include path
+	 * @param   resource  $context               Context to use when opening
+	 * @param   boolean   $use_prefix            Use a prefix to open the file
+	 * @param   boolean   $relative              Filename is a relative path (if false, strips JPATH_ROOT to make it relative)
+	 * @param   boolean   $detectprocessingmode  Detect the processing method for the file and use the appropriate function
+	 *                                           to handle output automatically
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function open($filename, $mode = 'r', $use_include_path = false, $context = null, $use_prefix = false, $relative = false,
+		$detectprocessingmode = false)
+	{
+		$filename = $this->_getFilename($filename, $mode, $use_prefix, $relative);
+
+		if (!$filename)
+		{
+			throw new FilesystemException('Filename not set');
+		}
+
+		$this->filename = $filename;
+		$this->openmode = $mode;
+
+		$url = parse_url($filename);
+
+		if (isset($url['scheme']))
+		{
+			// If we're dealing with a Joomla! stream, load it
+			if (Helper::isJoomlaStream($url['scheme']))
+			{
+				require_once __DIR__ . '/streams/' . $url['scheme'] . '.php';
+			}
+
+			// We have a scheme! force the method to be f
+			$this->processingmethod = 'f';
+		}
+		elseif ($detectprocessingmode)
+		{
+			$ext = strtolower(pathinfo($this->filename, PATHINFO_EXTENSION));
+
+			switch ($ext)
+			{
+				case 'tgz':
+				case 'gz':
+				case 'gzip':
+					$this->processingmethod = 'gz';
+					break;
+
+				case 'tbz2':
+				case 'bz2':
+				case 'bzip2':
+					$this->processingmethod = 'bz';
+					break;
+
+				default:
+					$this->processingmethod = 'f';
+					break;
+			}
+		}
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown whilst opening a file';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		// Decide which context to use:
+		switch ($this->processingmethod)
+		{
+			// Gzip doesn't support contexts or streams
+			case 'gz':
+				$this->fh = gzopen($filename, $mode, $use_include_path);
+				break;
+
+			// Bzip2 is much like gzip except it doesn't use the include path
+			case 'bz':
+				$this->fh = bzopen($filename, $mode);
+				break;
+
+			// Fopen can handle streams
+			case 'f':
+			default:
+				// One supplied at open; overrides everything
+				if ($context)
+				{
+					$this->fh = fopen($filename, $mode, $use_include_path, $context);
+				}
+				elseif ($this->context)
+				// One provided at initialisation
+				{
+					$this->fh = fopen($filename, $mode, $use_include_path, $this->context);
+				}
+				else
+				// No context; all defaults
+				{
+					$this->fh = fopen($filename, $mode, $use_include_path);
+				}
+				break;
+		}
+
+		if (!$this->fh)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return true;
+	}
+
+	/**
+	 * Attempt to close a file handle
+	 *
+	 * Will return false if it failed and true on success
+	 * If the file is not open the system will return true, this function destroys the file handle as well
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function close()
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gzclose($this->fh);
+				break;
+
+			case 'bz':
+				$res = bzclose($this->fh);
+				break;
+
+			case 'f':
+			default:
+				$res = fclose($this->fh);
+				break;
+		}
+
+		if (!$res)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Reset this
+		$this->fh = null;
+
+		// If we wrote, chmod the file after it's closed
+		if ($this->openmode[0] == 'w')
+		{
+			$this->chmod();
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return true;
+	}
+
+	/**
+	 * Work out if we're at the end of the file for a stream
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function eof()
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gzeof($this->fh);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = feof($this->fh);
+				break;
+		}
+
+		if ($php_errormsg)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $res;
+	}
+
+	/**
+	 * Retrieve the file size of the path
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function filesize()
+	{
+		if (!$this->filename)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$res = @filesize($this->filename);
+
+		if (!$res)
+		{
+			$tmp_error = '';
+
+			if ($php_errormsg)
+			{
+				// Something went wrong.
+				// Store the error in case we need it.
+				$tmp_error = $php_errormsg;
+			}
+
+			$res = Helper::remotefsize($this->filename);
+
+			if (!$res)
+			{
+				if ($tmp_error)
+				{
+					// Use the php_errormsg from before
+					throw new FilesystemException($tmp_error);
+				}
+
+				// Error but nothing from php? How strange! Create our own
+				throw new FilesystemException('Failed to get file size. This may not work for all streams.');
+			}
+			else
+			{
+				$this->filesize = $res;
+				$retval = $res;
+			}
+		}
+		else
+		{
+			$this->filesize = $res;
+			$retval = $res;
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Get a line from the stream source.
+	 *
+	 * @param   integer  $length  The number of bytes (optional) to read.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function gets($length = 0)
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = $length ? gzgets($this->fh, $length) : gzgets($this->fh);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = $length ? fgets($this->fh, $length) : fgets($this->fh);
+				break;
+		}
+
+		if (!$res)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $res;
+	}
+
+	/**
+	 * Read a file
+	 *
+	 * Handles user space streams appropriately otherwise any read will return 8192
+	 *
+	 * @param   integer  $length  Length of data to read
+	 *
+	 * @return  mixed
+	 *
+	 * @see     http://php.net/manual/en/function.fread.php
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function read($length = 0)
+	{
+		if (!$this->filesize && !$length)
+		{
+			// Get the filesize
+			$this->filesize();
+
+			if (!$this->filesize)
+			{
+				// Set it to the biggest and then wait until eof
+				$length = -1;
+			}
+			else
+			{
+				$length = $this->filesize;
+			}
+		}
+
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		$retval = false;
+
+		// Capture PHP errors
+		$php_errormsg = 'Error Unknown';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$remaining = $length;
+
+		do
+		{
+			// Do chunked reads where relevant
+			switch ($this->processingmethod)
+			{
+				case 'bz':
+					$res = ($remaining > 0) ? bzread($this->fh, $remaining) : bzread($this->fh, $this->chunksize);
+					break;
+
+				case 'gz':
+					$res = ($remaining > 0) ? gzread($this->fh, $remaining) : gzread($this->fh, $this->chunksize);
+					break;
+
+				case 'f':
+				default:
+					$res = ($remaining > 0) ? fread($this->fh, $remaining) : fread($this->fh, $this->chunksize);
+					break;
+			}
+
+			if (!$res)
+			{
+				throw new FilesystemException($php_errormsg);
+			}
+
+			if (!$retval)
+			{
+				$retval = '';
+			}
+
+			$retval .= $res;
+
+			if (!$this->eof())
+			{
+				$len = strlen($res);
+				$remaining -= $len;
+			}
+			else
+			{
+				// If it's the end of the file then we've nothing left to read; reset remaining and len
+				$remaining = 0;
+				$length = strlen($retval);
+			}
+		}
+
+		while ($remaining || !$length);
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Seek the file
+	 *
+	 * Note: the return value is different to that of fseek
+	 *
+	 * @param   integer  $offset  Offset to use when seeking.
+	 * @param   integer  $whence  Seek mode to use.
+	 *
+	 * @return  boolean  True on success, false on failure
+	 *
+	 * @see     http://php.net/manual/en/function.fseek.php
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function seek($offset, $whence = SEEK_SET)
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gzseek($this->fh, $offset, $whence);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = fseek($this->fh, $offset, $whence);
+				break;
+		}
+
+		// Seek, interestingly, returns 0 on success or -1 on failure.
+		if ($res == -1)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return true;
+	}
+
+	/**
+	 * Returns the current position of the file read/write pointer.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function tell()
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		switch ($this->processingmethod)
+		{
+			case 'gz':
+				$res = gztell($this->fh);
+				break;
+
+			case 'bz':
+			case 'f':
+			default:
+				$res = ftell($this->fh);
+				break;
+		}
+
+		// May return 0 so check if it's really false
+		if ($res === false)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $res;
+	}
+
+	/**
+	 * File write
+	 *
+	 * Whilst this function accepts a reference, the underlying fwrite
+	 * will do a copy! This will roughly double the memory allocation for
+	 * any write you do. Specifying chunked will get around this by only
+	 * writing in specific chunk sizes. This defaults to 8192 which is a
+	 * sane number to use most of the time (change the default with
+	 * Stream::set('chunksize', newsize);)
+	 * Note: This doesn't support gzip/bzip2 writing like reading does
+	 *
+	 * @param   string   &$string  Reference to the string to write.
+	 * @param   integer  $length   Length of the string to write.
+	 * @param   integer  $chunk    Size of chunks to write in.
+	 *
+	 * @return  boolean
+	 *
+	 * @see     http://php.net/manual/en/function.fwrite.php
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function write(&$string, $length = 0, $chunk = 0)
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		// If the length isn't set, set it to the length of the string.
+		if (!$length)
+		{
+			$length = strlen($string);
+		}
+
+		// If the chunk isn't set, set it to the default.
+		if (!$chunk)
+		{
+			$chunk = $this->chunksize;
+		}
+
+		$retval = true;
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$remaining = $length;
+		$start = 0;
+
+		do
+		{
+			// If the amount remaining is greater than the chunk size, then use the chunk
+			$amount = ($remaining > $chunk) ? $chunk : $remaining;
+			$res = fwrite($this->fh, substr($string, $start), $amount);
+
+			// Returns false on error or the number of bytes written
+			if ($res === false)
+			{
+				// Returned error
+				throw new FilesystemException($php_errormsg);
+			}
+			elseif ($res === 0)
+			{
+				// Wrote nothing?
+				throw new FilesystemException('Warning: No data written');
+			}
+			else
+			{
+				// Wrote something
+				$start += $amount;
+				$remaining -= $res;
+			}
+		}
+
+		while ($remaining);
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return $retval;
+	}
+
+	/**
+	 * Chmod wrapper
+	 *
+	 * @param   string  $filename  File name.
+	 * @param   mixed   $mode      Mode to use.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function chmod($filename = '', $mode = 0)
+	{
+		if (!$filename)
+		{
+			if (!isset($this->filename) || !$this->filename)
+			{
+				throw new FilesystemException('Filename not set');
+			}
+
+			$filename = $this->filename;
+		}
+
+		// If no mode is set use the default
+		if (!$mode)
+		{
+			$mode = $this->filemode;
+		}
+
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+		$sch = parse_url($filename, PHP_URL_SCHEME);
+
+		// Scheme specific options; ftp's chmod support is fun.
+		switch ($sch)
+		{
+			case 'ftp':
+			case 'ftps':
+				$res = Helper::ftpChmod($filename, $mode);
+				break;
+
+			default:
+				$res = chmod($filename, $mode);
+				break;
+		}
+
+		// Seek, interestingly, returns 0 on success or -1 on failure
+		if (!$res)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		// Return the result
+		return true;
+	}
+
+	/**
+	 * Get the stream metadata
+	 *
+	 * @return  array  header/metadata
+	 *
+	 * @see     http://php.net/manual/en/function.stream-get-meta-data.php
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function get_meta_data()
+	{
+		if (!$this->fh)
+		{
+			throw new FilesystemException('File not open');
+		}
+
+		return stream_get_meta_data($this->fh);
+	}
+
+	/**
+	 * Stream contexts
+	 * Builds the context from the array
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 */
+	public function _buildContext()
+	{
+		// According to the manual this always works!
+		if (count($this->contextOptions))
+		{
+			$this->context = @stream_context_create($this->contextOptions);
+		}
+		else
+		{
+			$this->context = null;
+		}
+	}
+
+	/**
+	 * Updates the context to the array
+	 *
+	 * Format is the same as the options for stream_context_create
+	 *
+	 * @param   array  $context  Options to create the context with
+	 *
+	 * @return  void
+	 *
+	 * @see     http://php.net/stream_context_create
+	 * @since   1.0
+	 */
+	public function setContextOptions($context)
+	{
+		$this->contextOptions = $context;
+		$this->_buildContext();
+	}
+
+	/**
+	 * Adds a particular options to the context
+	 *
+	 * @param   string  $wrapper  The wrapper to use
+	 * @param   string  $name     The option to set
+	 * @param   string  $value    The value of the option
+	 *
+	 * @return  void
+	 *
+	 * @see     http://php.net/stream_context_create Stream Context Creation
+	 * @see     http://php.net/manual/en/context.php Context Options for various streams
+	 * @since   1.0
+	 */
+	public function addContextEntry($wrapper, $name, $value)
+	{
+		$this->contextOptions[$wrapper][$name] = $value;
+		$this->_buildContext();
+	}
+
+	/**
+	 * Deletes a particular setting from a context
+	 *
+	 * @param   string  $wrapper  The wrapper to use
+	 * @param   string  $name     The option to unset
+	 *
+	 * @return  void
+	 *
+	 * @see     http://php.net/stream_context_create
+	 * @since   1.0
+	 */
+	public function deleteContextEntry($wrapper, $name)
+	{
+		// Check whether the wrapper is set
+		if (isset($this->contextOptions[$wrapper]))
+		{
+			// Check that entry is set for that wrapper
+			if (isset($this->contextOptions[$wrapper][$name]))
+			{
+				// Unset the item
+				unset($this->contextOptions[$wrapper][$name]);
+
+				// Check that there are still items there
+				if (!count($this->contextOptions[$wrapper]))
+				{
+					// Clean up an empty wrapper context option
+					unset($this->contextOptions[$wrapper]);
+				}
+			}
+		}
+
+		// Rebuild the context and apply it to the stream
+		$this->_buildContext();
+	}
+
+	/**
+	 * Applies the current context to the stream
+	 *
+	 * Use this to change the values of the context after you've opened a stream
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function applyContextToStream()
+	{
+		$retval = false;
+
+		if ($this->fh)
+		{
+			// Capture PHP errors
+			$php_errormsg = 'Unknown error setting context option';
+			$track_errors = ini_get('track_errors');
+			ini_set('track_errors', true);
+			$retval = @stream_context_set_option($this->fh, $this->contextOptions);
+
+			if (!$retval)
+			{
+				throw new FilesystemException($php_errormsg);
+			}
+
+			// Restore error tracking to what it was before
+			ini_set('track_errors', $track_errors);
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Stream filters
+	 * Append a filter to the chain
+	 *
+	 * @param   string   $filtername  The key name of the filter.
+	 * @param   integer  $read_write  Optional. Defaults to STREAM_FILTER_READ.
+	 * @param   array    $params      An array of params for the stream_filter_append call.
+	 *
+	 * @return  mixed
+	 *
+	 * @see     http://php.net/manual/en/function.stream-filter-append.php
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function appendFilter($filtername, $read_write = STREAM_FILTER_READ, $params = array())
+	{
+		$res = false;
+
+		if ($this->fh)
+		{
+			// Capture PHP errors
+			$php_errormsg = '';
+			$track_errors = ini_get('track_errors');
+			ini_set('track_errors', true);
+
+			$res = @stream_filter_append($this->fh, $filtername, $read_write, $params);
+
+			if (!$res && $php_errormsg)
+			{
+				throw new FilesystemException($php_errormsg);
+			}
+
+			$this->filters[] = &$res;
+
+			// Restore error tracking to what it was before.
+			ini_set('track_errors', $track_errors);
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Prepend a filter to the chain
+	 *
+	 * @param   string   $filtername  The key name of the filter.
+	 * @param   integer  $read_write  Optional. Defaults to STREAM_FILTER_READ.
+	 * @param   array    $params      An array of params for the stream_filter_prepend call.
+	 *
+	 * @return  mixed
+	 *
+	 * @see     http://php.net/manual/en/function.stream-filter-prepend.php
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function prependFilter($filtername, $read_write = STREAM_FILTER_READ, $params = array())
+	{
+		$res = false;
+
+		if ($this->fh)
+		{
+			// Capture PHP errors
+			$php_errormsg = '';
+			$track_errors = ini_get('track_errors');
+			ini_set('track_errors', true);
+			$res = @stream_filter_prepend($this->fh, $filtername, $read_write, $params);
+
+			if (!$res && $php_errormsg)
+			{
+				// Set the error msg
+				throw new FilesystemException($php_errormsg);
+			}
+
+			array_unshift($res, '');
+			$res[0] = &$this->filters;
+
+			// Restore error tracking to what it was before.
+			ini_set('track_errors', $track_errors);
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Remove a filter, either by resource (handed out from the append or prepend function)
+	 * or via getting the filter list)
+	 *
+	 * @param   resource  &$resource  The resource.
+	 * @param   boolean   $byindex    The index of the filter.
+	 *
+	 * @return  boolean   Result of operation
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function removeFilter(&$resource, $byindex = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		if ($byindex)
+		{
+			$res = stream_filter_remove($this->filters[$resource]);
+		}
+		else
+		{
+			$res = stream_filter_remove($resource);
+		}
+
+		if ($res && $php_errormsg)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Copy a file from src to dest
+	 *
+	 * @param   string    $src         The file path to copy from.
+	 * @param   string    $dest        The file path to copy to.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function copy($src, $dest, $context = null, $use_prefix = true, $relative = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		$chmodDest = $this->_getFilename($dest, 'w', $use_prefix, $relative);
+
+		// Since we're going to open the file directly we need to get the filename.
+		// We need to use the same prefix so force everything to write.
+		$src = $this->_getFilename($src, 'w', $use_prefix, $relative);
+		$dest = $this->_getFilename($dest, 'w', $use_prefix, $relative);
+
+		if ($context)
+		{
+			// Use the provided context
+			$res = @copy($src, $dest, $context);
+		}
+		elseif ($this->context)
+		{
+			// Use the objects context
+			$res = @copy($src, $dest, $this->context);
+		}
+		else
+		{
+			// Don't use any context
+			$res = @copy($src, $dest);
+		}
+
+		if (!$res && $php_errormsg)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		$this->chmod($chmodDest);
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Moves a file
+	 *
+	 * @param   string    $src         The file path to move from.
+	 * @param   string    $dest        The file path to move to.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function move($src, $dest, $context = null, $use_prefix = true, $relative = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		$src = $this->_getFilename($src, 'w', $use_prefix, $relative);
+		$dest = $this->_getFilename($dest, 'w', $use_prefix, $relative);
+
+		if ($context)
+		{
+			// Use the provided context
+			$res = @rename($src, $dest, $context);
+		}
+		elseif ($this->context)
+		{
+			// Use the object's context
+			$res = @rename($src, $dest, $this->context);
+		}
+		else
+		{
+			// Don't use any context
+			$res = @rename($src, $dest);
+		}
+
+		if (!$res && $php_errormsg)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		$this->chmod($dest);
+
+		// Restore error tracking to what it was before
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Delete a file
+	 *
+	 * @param   string    $filename    The file path to delete.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function delete($filename, $context = null, $use_prefix = true, $relative = false)
+	{
+		// Capture PHP errors
+		$php_errormsg = '';
+		$track_errors = ini_get('track_errors');
+		ini_set('track_errors', true);
+
+		$filename = $this->_getFilename($filename, 'w', $use_prefix, $relative);
+
+		if ($context)
+		{
+			// Use the provided context
+			$res = @unlink($filename, $context);
+		}
+		elseif ($this->context)
+		{
+			// Use the object's context
+			$res = @unlink($filename, $this->context);
+		}
+		else
+		{
+			// Don't use any context
+			$res = @unlink($filename);
+		}
+
+		if (!$res && $php_errormsg)
+		{
+			throw new FilesystemException($php_errormsg);
+		}
+
+		// Restore error tracking to what it was before.
+		ini_set('track_errors', $track_errors);
+
+		return $res;
+	}
+
+	/**
+	 * Upload a file
+	 *
+	 * @param   string    $src         The file path to copy from (usually a temp folder).
+	 * @param   string    $dest        The file path to copy to.
+	 * @param   resource  $context     A valid context resource (optional) created with stream_context_create.
+	 * @param   boolean   $use_prefix  Controls the use of a prefix (optional).
+	 * @param   boolean   $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  FilesystemException
+	 */
+	public function upload($src, $dest, $context = null, $use_prefix = true, $relative = false)
+	{
+		if (is_uploaded_file($src))
+		{
+			// Make sure it's an uploaded file
+			return $this->copy($src, $dest, $context, $use_prefix, $relative);
+		}
+
+		throw new FilesystemException('Not an uploaded file.');
+	}
+
+	/**
+	 * Writes a chunk of data to a file.
+	 *
+	 * @param   string  $filename  The file name.
+	 * @param   string  &$buffer   The data to write to the file.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function writeFile($filename, &$buffer)
+	{
+		if ($this->open($filename, 'w'))
+		{
+			$result = $this->write($buffer);
+			$this->chmod();
+			$this->close();
+
+			return $result;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Determine the appropriate 'filename' of a file
+	 *
+	 * @param   string   $filename    Original filename of the file
+	 * @param   string   $mode        Mode string to retrieve the filename
+	 * @param   boolean  $use_prefix  Controls the use of a prefix
+	 * @param   boolean  $relative    Determines if the filename given is relative. Relative paths do not have JPATH_ROOT stripped.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function _getFilename($filename, $mode, $use_prefix, $relative)
+	{
+		if ($use_prefix)
+		{
+			// Get rid of binary or t, should be at the end of the string
+			$tmode = trim($mode, 'btf123456789');
+
+			// Check if it's a write mode then add the appropriate prefix
+			if (in_array($tmode, Helper::getWriteModes()))
+			{
+				$prefixToUse = $this->writeprefix;
+			}
+			else
+			{
+				$prefixToUse = $this->readprefix;
+			}
+
+			// Get rid of JPATH_ROOT (legacy compat)
+			if (!$relative && $prefixToUse)
+			{
+				$pos = strpos($filename, JPATH_ROOT);
+
+				if ($pos !== false)
+				{
+					$filename = substr_replace($filename, '', $pos, strlen(JPATH_ROOT));
+				}
+			}
+
+			$filename = ($prefixToUse ? $prefixToUse : '') . $filename;
+		}
+
+		return $filename;
+	}
+
+	/**
+	 * Return the internal file handle
+	 *
+	 * @return  File handler
+	 *
+	 * @since   1.0
+	 */
+	public function getFileHandle()
+	{
+		return $this->fh;
+	}
+
+	/**
+	 * Modifies a property of the object, creating it if it does not already exist.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $value     The value of the property to set.
+	 *
+	 * @return  mixed  Previous value of the property.
+	 *
+	 * @since   1.0
+	 */
+	public function set($property, $value = null)
+	{
+		$previous = isset($this->$property) ? $this->$property : null;
+		$this->$property = $value;
+
+		return $previous;
+	}
+
+	/**
+	 * Returns a property of the object or the default value if the property is not set.
+	 *
+	 * @param   string  $property  The name of the property.
+	 * @param   mixed   $default   The default value.
+	 *
+	 * @return  mixed    The value of the property.
+	 *
+	 * @since   1.0
+	 */
+	public function get($property, $default = null)
+	{
+		if (isset($this->$property))
+		{
+			return $this->$property;
+		}
+
+		return $default;
+	}
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Stream/String.php b/core/libraries/vendor/joomla/filesystem/src/Stream/String.php
new file mode 100644
index 00000000..429fcba2
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Stream/String.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem\Stream;
+
+/**
+ * String Stream Wrapper
+ *
+ * This class allows you to use a PHP string in the same way that
+ * you would normally use a regular stream wrapper
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use StringWrapper instead
+ */
+class String extends StringWrapper
+{
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Stream/StringWrapper.php b/core/libraries/vendor/joomla/filesystem/src/Stream/StringWrapper.php
new file mode 100644
index 00000000..d5c79136
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Stream/StringWrapper.php
@@ -0,0 +1,287 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem\Stream;
+
+use Joomla\Filesystem\Support\StringController;
+
+/**
+ * String Stream Wrapper
+ *
+ * This class allows you to use a PHP string in the same way that
+ * you would normally use a regular stream wrapper
+ *
+ * @since  1.3.0
+ */
+class StringWrapper
+{
+	/**
+	 * The current string
+	 *
+	 * @var   string
+	 * @since  1.3.0
+	 */
+	protected $currentString;
+
+	/**
+	 * The path
+	 *
+	 * @var   string
+	 * @since  1.3.0
+	 */
+	protected $path;
+
+	/**
+	 * The mode
+	 *
+	 * @var   string
+	 * @since  1.3.0
+	 */
+	protected $mode;
+
+	/**
+	 * Enter description here ...
+	 *
+	 * @var   string
+	 * @since  1.3.0
+	 */
+	protected $options;
+
+	/**
+	 * Enter description here ...
+	 *
+	 * @var   string
+	 * @since  1.3.0
+	 */
+	protected $openedPath;
+
+	/**
+	 * Current position
+	 *
+	 * @var   integer
+	 * @since  1.3.0
+	 */
+	protected $pos;
+
+	/**
+	 * Length of the string
+	 *
+	 * @var   string
+	 * @since  1.3.0
+	 */
+	protected $len;
+
+	/**
+	 * Statistics for a file
+	 *
+	 * @var    array
+	 * @since  1.3.0
+	 * @see    http://us.php.net/manual/en/function.stat.php
+	 */
+	protected $stat;
+
+	/**
+	 * Method to open a file or URL.
+	 *
+	 * @param   string   $path          The stream path.
+	 * @param   string   $mode          Not used.
+	 * @param   integer  $options       Not used.
+	 * @param   string   &$opened_path  Not used.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.3.0
+	 */
+	public function stream_open($path, $mode, $options, &$opened_path)
+	{
+		$this->currentString = &StringController::getRef(str_replace('string://', '', $path));
+
+		if ($this->currentString)
+		{
+			$this->len = strlen($this->currentString);
+			$this->pos = 0;
+			$this->stat = $this->url_stat($path, 0);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to retrieve information from a file resource
+	 *
+	 * @return  array
+	 *
+	 * @see     http://www.php.net/manual/en/streamwrapper.stream-stat.php
+	 * @since   1.3.0
+	 */
+	public function stream_stat()
+	{
+		return $this->stat;
+	}
+
+	/**
+	 * Method to retrieve information about a file.
+	 *
+	 * @param   string   $path   File path or URL to stat
+	 * @param   integer  $flags  Additional flags set by the streams API
+	 *
+	 * @return  array
+	 *
+	 * @see     http://php.net/manual/en/streamwrapper.url-stat.php
+	 * @since   1.3.0
+	 */
+	public function url_stat($path, $flags = 0)
+	{
+		$now = time();
+		$string = &StringController::getRef(str_replace('string://', '', $path));
+		$stat = array(
+			'dev' => 0,
+			'ino' => 0,
+			'mode' => 0,
+			'nlink' => 1,
+			'uid' => 0,
+			'gid' => 0,
+			'rdev' => 0,
+			'size' => strlen($string),
+			'atime' => $now,
+			'mtime' => $now,
+			'ctime' => $now,
+			'blksize' => '512',
+			'blocks' => ceil(strlen($string) / 512));
+
+		return $stat;
+	}
+
+	/**
+	 * Method to read a given number of bytes starting at the current position
+	 * and moving to the end of the string defined by the current position plus the
+	 * given number.
+	 *
+	 * @param   integer  $count  Bytes of data from the current position should be returned.
+	 *
+	 * @return  string
+	 *
+	 * @see     http://www.php.net/manual/en/streamwrapper.stream-read.php
+	 * @since   1.3.0
+	 */
+	public function stream_read($count)
+	{
+		$result = substr($this->currentString, $this->pos, $count);
+		$this->pos += $count;
+
+		return $result;
+	}
+
+	/**
+	 * Stream write, always returning false.
+	 *
+	 * @param   string  $data  The data to write.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.3.0
+	 * @note    Updating the string is not supported.
+	 */
+	public function stream_write($data)
+	{
+		// We don't support updating the string.
+		return false;
+	}
+
+	/**
+	 * Method to get the current position
+	 *
+	 * @return  integer  The position
+	 *
+	 * @since   1.3.0
+	 */
+	public function stream_tell()
+	{
+		return $this->pos;
+	}
+
+	/**
+	 * End of field check
+	 *
+	 * @return  boolean  True if at end of field.
+	 *
+	 * @since   1.3.0
+	 */
+	public function stream_eof()
+	{
+		if ($this->pos > $this->len)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Stream offset
+	 *
+	 * @param   integer  $offset  The starting offset.
+	 * @param   integer  $whence  SEEK_SET, SEEK_CUR, SEEK_END
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.3.0
+	 */
+	public function stream_seek($offset, $whence)
+	{
+		// $whence: SEEK_SET, SEEK_CUR, SEEK_END
+		if ($offset > $this->len)
+		{
+			// We can't seek beyond our len.
+			return false;
+		}
+
+		switch ($whence)
+		{
+			case SEEK_SET:
+				$this->pos = $offset;
+				break;
+
+			case SEEK_CUR:
+				if (($this->pos + $offset) >= $this->len)
+				{
+					return false;
+				}
+
+				$this->pos += $offset;
+				break;
+
+			case SEEK_END:
+				$this->pos = $this->len - $offset;
+				break;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Stream flush, always returns true.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.3.0
+	 * @note    Data storage is not supported
+	 */
+	public function stream_flush()
+	{
+		// We don't store data.
+		return true;
+	}
+}
+
+if (!stream_wrapper_register('string', '\\Joomla\\Filesystem\\Stream\\StringWrapper'))
+{
+	die('\\Joomla\\Filesystem\\Stream\\StringWrapper Wrapper Registration Failed');
+}
diff --git a/core/libraries/vendor/joomla/filesystem/src/Support/StringController.php b/core/libraries/vendor/joomla/filesystem/src/Support/StringController.php
new file mode 100644
index 00000000..64177f94
--- /dev/null
+++ b/core/libraries/vendor/joomla/filesystem/src/Support/StringController.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Part of the Joomla Framework Filesystem Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filesystem\Support;
+
+/**
+ * String Controller
+ *
+ * @since  1.0
+ */
+class StringController
+{
+	/**
+	 * Defines a variable as an array
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public function _getArray()
+	{
+		static $strings = array();
+
+		return $strings;
+	}
+
+	/**
+	 * Create a reference
+	 *
+	 * @param   string  $reference  The key
+	 * @param   string  &$string    The value
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function createRef($reference, &$string)
+	{
+		$ref = &self::_getArray();
+		$ref[$reference] = & $string;
+	}
+
+	/**
+	 * Get reference
+	 *
+	 * @param   string  $reference  The key for the reference.
+	 *
+	 * @return  mixed  False if not set, reference if it it exists
+	 *
+	 * @since   1.0
+	 */
+	public function getRef($reference)
+	{
+		$ref = &self::_getArray();
+
+		if (isset($ref[$reference]))
+		{
+			return $ref[$reference];
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/vendor/joomla/filter/LICENSE b/core/libraries/vendor/joomla/filter/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/filter/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/filter/src/InputFilter.php b/core/libraries/vendor/joomla/filter/src/InputFilter.php
new file mode 100644
index 00000000..1a17f520
--- /dev/null
+++ b/core/libraries/vendor/joomla/filter/src/InputFilter.php
@@ -0,0 +1,1053 @@
+<?php
+/**
+ * Part of the Joomla Framework Filter Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filter;
+
+use Joomla\String\StringHelper;
+
+/**
+ * InputFilter is a class for filtering input from any data source
+ *
+ * Forked from the php input filter library by: Daniel Morris <dan@rootcube.com>
+ * Original Contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
+ *
+ * @since  1.0
+ */
+class InputFilter
+{
+	/**
+	 * Defines the InputFilter instance should use a whitelist method for sanitising tags.
+	 *
+	 * @var    integer
+	 * @since  1.3.0
+	 */
+	const TAGS_WHITELIST = 0;
+
+	/**
+	 * Defines the InputFilter instance should use a blacklist method for sanitising tags.
+	 *
+	 * @var    integer
+	 * @since  1.3.0
+	 */
+	const TAGS_BLACKLIST = 1;
+
+	/**
+	 * Defines the InputFilter instance should use a whitelist method for sanitising attributes.
+	 *
+	 * @var    integer
+	 * @since  1.3.0
+	 */
+	const ATTR_WHITELIST = 0;
+
+	/**
+	 * Defines the InputFilter instance should use a blacklist method for sanitising attributes.
+	 *
+	 * @var    integer
+	 * @since  1.3.0
+	 */
+	const ATTR_BLACKLIST = 1;
+
+	/**
+	 * A container for InputFilter instances.
+	 *
+	 * @var    InputFilter[]
+	 * @since  1.0
+	 * @deprecated  1.2.0
+	 */
+	protected static $instances = array();
+
+	/**
+	 * The array of permitted tags (whitelist).
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	public $tagsArray;
+
+	/**
+	 * The array of permitted tag attributes (whitelist).
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	public $attrArray;
+
+	/**
+	 * The method for sanitising tags
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	public $tagsMethod;
+
+	/**
+	 * The method for sanitising attributes
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	public $attrMethod;
+
+	/**
+	 * A flag for XSS checks. Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	public $xssAuto;
+
+	/**
+	 * The list of the default blacklisted tags.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	public $tagBlacklist = array(
+		'applet',
+		'body',
+		'bgsound',
+		'base',
+		'basefont',
+		'canvas',
+		'embed',
+		'frame',
+		'frameset',
+		'head',
+		'html',
+		'id',
+		'iframe',
+		'ilayer',
+		'layer',
+		'link',
+		'meta',
+		'name',
+		'object',
+		'script',
+		'style',
+		'title',
+		'xml',
+	);
+
+	/**
+	 * The list of the default blacklisted tag attributes. All event handlers implicit.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	public $attrBlacklist = array(
+		'action',
+		'background',
+		'codebase',
+		'dynsrc',
+		'formaction',
+		'lowsrc',
+	);
+
+	/**
+	 * A special list of blacklisted chars
+	 *
+	 * @var    array
+	 * @since  1.3.3
+	 */
+	private $blacklistedChars = array(
+		'&tab;',
+		'&space;',
+		'&colon;',
+		'&column;',
+	);
+
+	/**
+	 * Constructor for InputFilter class.
+	 *
+	 * @param   array    $tagsArray   List of user-defined tags
+	 * @param   array    $attrArray   List of user-defined attributes
+	 * @param   integer  $tagsMethod  WhiteList method = 0, BlackList method = 1
+	 * @param   integer  $attrMethod  WhiteList method = 0, BlackList method = 1
+	 * @param   integer  $xssAuto     Only auto clean essentials = 0, Allow clean blacklisted tags/attr = 1
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($tagsArray = array(), $attrArray = array(), $tagsMethod = self::TAGS_WHITELIST, $attrMethod = self::ATTR_WHITELIST,
+		$xssAuto = 1
+	)
+	{
+		// Make sure user defined arrays are in lowercase
+		$tagsArray = array_map('strtolower', (array) $tagsArray);
+		$attrArray = array_map('strtolower', (array) $attrArray);
+
+		// Assign member variables
+		$this->tagsArray  = $tagsArray;
+		$this->attrArray  = $attrArray;
+		$this->tagsMethod = $tagsMethod;
+		$this->attrMethod = $attrMethod;
+		$this->xssAuto    = $xssAuto;
+	}
+
+	/**
+	 * Method to be called by another php script. Processes for XSS and
+	 * specified bad code.
+	 *
+	 * @param   mixed   $source  Input string/array-of-string to be 'cleaned'
+	 * @param   string  $type    The return type for the variable:
+	 *                           INT:       An integer, or an array of integers,
+	 *                           UINT:      An unsigned integer, or an array of unsigned integers,
+	 *                           FLOAT:     A floating point number, or an array of floating point numbers,
+	 *                           BOOLEAN:   A boolean value,
+	 *                           WORD:      A string containing A-Z or underscores only (not case sensitive),
+	 *                           ALNUM:     A string containing A-Z or 0-9 only (not case sensitive),
+	 *                           CMD:       A string containing A-Z, 0-9, underscores, periods or hyphens (not case sensitive),
+	 *                           BASE64:    A string containing A-Z, 0-9, forward slashes, plus or equals (not case sensitive),
+	 *                           STRING:    A fully decoded and sanitised string (default),
+	 *                           HTML:      A sanitised string,
+	 *                           ARRAY:     An array,
+	 *                           PATH:      A sanitised file path, or an array of sanitised file paths,
+	 *                           TRIM:      A string trimmed from normal, non-breaking and multibyte spaces
+	 *                           USERNAME:  Do not use (use an application specific filter),
+	 *                           RAW:       The raw string is returned with no filtering,
+	 *                           unknown:   An unknown filter will act like STRING. If the input is an array it will return an
+	 *                                      array of fully decoded and sanitised strings.
+	 *
+	 * @return  mixed  'Cleaned' version of input parameter
+	 *
+	 * @since   1.0
+	 */
+	public function clean($source, $type = 'string')
+	{
+		// Handle the type constraint cases
+		switch (strtoupper($type))
+		{
+			case 'INT':
+			case 'INTEGER':
+				$pattern = '/[-+]?[0-9]+/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? (int) $matches[0] : 0;
+					}
+				}
+				else
+				{
+					preg_match($pattern, (string) $source, $matches);
+					$result = isset($matches[0]) ? (int) $matches[0] : 0;
+				}
+
+				break;
+
+			case 'UINT':
+				$pattern = '/[-+]?[0-9]+/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? abs((int) $matches[0]) : 0;
+					}
+				}
+				else
+				{
+					preg_match($pattern, (string) $source, $matches);
+					$result = isset($matches[0]) ? abs((int) $matches[0]) : 0;
+				}
+
+				break;
+
+			case 'FLOAT':
+			case 'DOUBLE':
+				$pattern = '/[-+]?[0-9]+(\.[0-9]+)?([eE][-+]?[0-9]+)?/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? (float) $matches[0] : 0;
+					}
+				}
+				else
+				{
+					preg_match($pattern, (string) $source, $matches);
+					$result = isset($matches[0]) ? (float) $matches[0] : 0;
+				}
+
+				break;
+
+			case 'BOOL':
+			case 'BOOLEAN':
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (bool) $eachString;
+					}
+				}
+				else
+				{
+					$result = (bool) $source;
+				}
+
+				break;
+
+			case 'WORD':
+				$pattern = '/[^A-Z_]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+
+			case 'ALNUM':
+				$pattern = '/[^A-Z0-9]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+
+			case 'CMD':
+				$pattern = '/[^A-Z0-9_\.-]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$cleaned  = (string) preg_replace($pattern, '', $eachString);
+						$result[] = ltrim($cleaned, '.');
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+					$result = ltrim($result, '.');
+				}
+
+				break;
+
+			case 'BASE64':
+				$pattern = '/[^A-Z0-9\/+=]/i';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+
+			case 'STRING':
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) $this->remove($this->decode((string) $eachString));
+					}
+				}
+				else
+				{
+					$result = (string) $this->remove($this->decode((string) $source));
+				}
+
+				break;
+
+			case 'HTML':
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) $this->remove((string) $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) $this->remove((string) $source);
+				}
+
+				break;
+
+			case 'ARRAY':
+				$result = (array) $source;
+				break;
+
+			case 'PATH':
+				$pattern = '/^[A-Za-z0-9_\/-]+[A-Za-z0-9_\.-]*([\\\\\/][A-Za-z0-9_-]+[A-Za-z0-9_\.-]*)*$/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						preg_match($pattern, (string) $eachString, $matches);
+						$result[] = isset($matches[0]) ? (string) $matches[0] : '';
+					}
+				}
+				else
+				{
+					preg_match($pattern, $source, $matches);
+					$result = isset($matches[0]) ? (string) $matches[0] : '';
+				}
+
+				break;
+
+			case 'TRIM':
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$cleaned  = (string) trim($eachString);
+						$cleaned  = StringHelper::trim($cleaned, chr(0xE3) . chr(0x80) . chr(0x80));
+						$result[] = StringHelper::trim($cleaned, chr(0xC2) . chr(0xA0));
+					}
+				}
+				else
+				{
+					$result = (string) trim($source);
+					$result = StringHelper::trim($result, chr(0xE3) . chr(0x80) . chr(0x80));
+					$result = StringHelper::trim($result, chr(0xC2) . chr(0xA0));
+				}
+
+				break;
+
+			case 'USERNAME':
+				$pattern = '/[\x00-\x1F\x7F<>"\'%&]/';
+
+				if (is_array($source))
+				{
+					$result = array();
+
+					// Iterate through the array
+					foreach ($source as $eachString)
+					{
+						$result[] = (string) preg_replace($pattern, '', $eachString);
+					}
+				}
+				else
+				{
+					$result = (string) preg_replace($pattern, '', $source);
+				}
+
+				break;
+
+			case 'RAW':
+				$result = $source;
+				break;
+
+			default:
+				// Are we dealing with an array?
+				if (is_array($source))
+				{
+					foreach ($source as $key => $value)
+					{
+						// Filter element for XSS and other 'bad' code etc.
+						if (is_string($value))
+						{
+							$source[$key] = $this->remove($this->decode($value));
+						}
+					}
+
+					$result = $source;
+				}
+				else
+				{
+					// Or a string?
+					if (is_string($source) && !empty($source))
+					{
+						// Filter source for XSS and other 'bad' code etc.
+						$result = $this->remove($this->decode($source));
+					}
+					else
+					{
+						// Not an array or string... return the passed parameter
+						$result = $source;
+					}
+				}
+
+				break;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Function to determine if contents of an attribute are safe
+	 *
+	 * @param   array  $attrSubSet  A 2 element array for attribute's name, value
+	 *
+	 * @return  boolean  True if bad code is detected
+	 *
+	 * @since   1.0
+	 */
+	public static function checkAttribute($attrSubSet)
+	{
+		$quoteStyle = version_compare(PHP_VERSION, '5.4', '>=') ? ENT_QUOTES | ENT_HTML401 : ENT_QUOTES;
+
+		$attrSubSet[0] = strtolower($attrSubSet[0]);
+		$attrSubSet[1] = html_entity_decode(strtolower($attrSubSet[1]), $quoteStyle, 'UTF-8');
+
+		return ((strpos($attrSubSet[1], 'expression') !== false && $attrSubSet[0] === 'style')
+			|| preg_match('/(?:(?:java|vb|live)script|behaviour|mocha)(?::|&colon;|&column;)/', $attrSubSet[1]) !== 0);
+	}
+
+	/**
+	 * Internal method to iteratively remove all unwanted tags and attributes
+	 *
+	 * @param   string  $source  Input string to be 'cleaned'
+	 *
+	 * @return  string  'Cleaned' version of input parameter
+	 *
+	 * @since   1.0
+	 */
+	protected function remove($source)
+	{
+		// Iteration provides nested tag protection
+		do
+		{
+			$temp = $source;
+			$source = $this->cleanTags($source);
+		}
+		while ($temp !== $source);
+
+		return $source;
+	}
+
+	/**
+	 * Internal method to strip a string of certain tags
+	 *
+	 * @param   string  $source  Input string to be 'cleaned'
+	 *
+	 * @return  string  'Cleaned' version of input parameter
+	 *
+	 * @since   1.0
+	 */
+	protected function cleanTags($source)
+	{
+		// First, pre-process this for illegal characters inside attribute values
+		$source = $this->escapeAttributeValues($source);
+
+		// In the beginning we don't really have a tag, so everything is postTag
+		$preTag = null;
+		$postTag = $source;
+		$currentSpace = false;
+
+		// Setting to null to deal with undefined variables
+		$attr = '';
+
+		// Is there a tag? If so it will certainly start with a '<'.
+		$tagOpenStart = StringHelper::strpos($source, '<');
+
+		while ($tagOpenStart !== false)
+		{
+			// Get some information about the tag we are processing
+			$preTag .= StringHelper::substr($postTag, 0, $tagOpenStart);
+			$postTag = StringHelper::substr($postTag, $tagOpenStart);
+			$fromTagOpen = StringHelper::substr($postTag, 1);
+			$tagOpenEnd = StringHelper::strpos($fromTagOpen, '>');
+
+			// Check for mal-formed tag where we have a second '<' before the first '>'
+			$nextOpenTag = (StringHelper::strlen($postTag) > $tagOpenStart) ? StringHelper::strpos($postTag, '<', $tagOpenStart + 1) : false;
+
+			if (($nextOpenTag !== false) && ($nextOpenTag < $tagOpenEnd))
+			{
+				// At this point we have a mal-formed tag -- remove the offending open
+				$postTag = StringHelper::substr($postTag, 0, $tagOpenStart) . StringHelper::substr($postTag, $tagOpenStart + 1);
+				$tagOpenStart = StringHelper::strpos($postTag, '<');
+				continue;
+			}
+
+			// Let's catch any non-terminated tags and skip over them
+			if ($tagOpenEnd === false)
+			{
+				$postTag = StringHelper::substr($postTag, $tagOpenStart + 1);
+				$tagOpenStart = StringHelper::strpos($postTag, '<');
+				continue;
+			}
+
+			// Do we have a nested tag?
+			$tagOpenNested = StringHelper::strpos($fromTagOpen, '<');
+
+			if (($tagOpenNested !== false) && ($tagOpenNested < $tagOpenEnd))
+			{
+				$preTag .= StringHelper::substr($postTag, 0, ($tagOpenNested + 1));
+				$postTag = StringHelper::substr($postTag, ($tagOpenNested + 1));
+				$tagOpenStart = StringHelper::strpos($postTag, '<');
+				continue;
+			}
+
+			// Let's get some information about our tag and setup attribute pairs
+			$tagOpenNested = (StringHelper::strpos($fromTagOpen, '<') + $tagOpenStart + 1);
+			$currentTag = StringHelper::substr($fromTagOpen, 0, $tagOpenEnd);
+			$tagLength = StringHelper::strlen($currentTag);
+			$tagLeft = $currentTag;
+			$attrSet = array();
+			$currentSpace = StringHelper::strpos($tagLeft, ' ');
+
+			// Are we an open tag or a close tag?
+			if (StringHelper::substr($currentTag, 0, 1) === '/')
+			{
+				// Close Tag
+				$isCloseTag = true;
+				list ($tagName) = explode(' ', $currentTag);
+				$tagName = StringHelper::substr($tagName, 1);
+			}
+			else
+			{
+				// Open Tag
+				$isCloseTag = false;
+				list ($tagName) = explode(' ', $currentTag);
+			}
+
+			/*
+			 * Exclude all "non-regular" tagnames
+			 * OR no tagname
+			 * OR remove if xssauto is on and tag is blacklisted
+			 */
+			if ((!preg_match("/^[a-z][a-z0-9]*$/i", $tagName))
+				|| (!$tagName)
+				|| ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto)))
+			{
+				$postTag = StringHelper::substr($postTag, ($tagLength + 2));
+				$tagOpenStart = StringHelper::strpos($postTag, '<');
+
+				// Strip tag
+				continue;
+			}
+
+			/*
+			 * Time to grab any attributes from the tag... need this section in
+			 * case attributes have spaces in the values.
+			 */
+			while ($currentSpace !== false)
+			{
+				$attr = '';
+				$fromSpace = StringHelper::substr($tagLeft, ($currentSpace + 1));
+				$nextEqual = StringHelper::strpos($fromSpace, '=');
+				$nextSpace = StringHelper::strpos($fromSpace, ' ');
+				$openQuotes = StringHelper::strpos($fromSpace, '"');
+				$closeQuotes = StringHelper::strpos(StringHelper::substr($fromSpace, ($openQuotes + 1)), '"') + $openQuotes + 1;
+
+				$startAtt = '';
+				$startAttPosition = 0;
+
+				// Find position of equal and open quotes ignoring
+				if (preg_match('#\s*=\s*\"#', $fromSpace, $matches, PREG_OFFSET_CAPTURE))
+				{
+					// We have found an attribute, convert its byte position to a UTF-8 string length, using non-multibyte substr()
+					$stringBeforeAttr = substr($fromSpace, 0, $matches[0][1]);
+					$startAttPosition = StringHelper::strlen($stringBeforeAttr);
+					$startAtt = $matches[0][0];
+					$closeQuotePos = StringHelper::strpos(
+						StringHelper::substr($fromSpace, ($startAttPosition + StringHelper::strlen($startAtt))), '"'
+					);
+					$closeQuotes = $closeQuotePos + $startAttPosition + StringHelper::strlen($startAtt);
+					$nextEqual = $startAttPosition + StringHelper::strpos($startAtt, '=');
+					$openQuotes = $startAttPosition + StringHelper::strpos($startAtt, '"');
+					$nextSpace = StringHelper::strpos(StringHelper::substr($fromSpace, $closeQuotes), ' ') + $closeQuotes;
+				}
+
+				// Do we have an attribute to process? [check for equal sign]
+				if ($fromSpace !== '/' && (($nextEqual && $nextSpace && $nextSpace < $nextEqual) || !$nextEqual))
+				{
+					if (!$nextEqual)
+					{
+						$attribEnd = StringHelper::strpos($fromSpace, '/') - 1;
+					}
+					else
+					{
+						$attribEnd = $nextSpace - 1;
+					}
+
+					// If there is an ending, use this, if not, do not worry.
+					if ($attribEnd > 0)
+					{
+						$fromSpace = StringHelper::substr($fromSpace, $attribEnd + 1);
+					}
+				}
+
+				if (StringHelper::strpos($fromSpace, '=') !== false)
+				{
+					/*
+					 * If the attribute value is wrapped in quotes we need to grab the substring from the closing quote,
+					 * otherwise grab until the next space.
+					 */
+					if (($openQuotes !== false)
+						&& (StringHelper::strpos(StringHelper::substr($fromSpace, ($openQuotes + 1)), '"') !== false))
+					{
+						$attr = StringHelper::substr($fromSpace, 0, ($closeQuotes + 1));
+					}
+					else
+					{
+						$attr = StringHelper::substr($fromSpace, 0, $nextSpace);
+					}
+				}
+				else
+				// No more equal signs so add any extra text in the tag into the attribute array [eg. checked]
+				{
+					if ($fromSpace !== '/')
+					{
+						$attr = StringHelper::substr($fromSpace, 0, $nextSpace);
+					}
+				}
+
+				// Last Attribute Pair
+				if (!$attr && $fromSpace !== '/')
+				{
+					$attr = $fromSpace;
+				}
+
+				// Add attribute pair to the attribute array
+				$attrSet[] = $attr;
+
+				// Move search point and continue iteration
+				$tagLeft = StringHelper::substr($fromSpace, StringHelper::strlen($attr));
+				$currentSpace = StringHelper::strpos($tagLeft, ' ');
+			}
+
+			// Is our tag in the user input array?
+			$tagFound = in_array(strtolower($tagName), $this->tagsArray);
+
+			// If the tag is allowed let's append it to the output string.
+			if ((!$tagFound && $this->tagsMethod) || ($tagFound && !$this->tagsMethod))
+			{
+				// Reconstruct tag with allowed attributes
+				if (!$isCloseTag)
+				{
+					// Open or single tag
+					$attrSet = $this->cleanAttributes($attrSet);
+					$preTag .= '<' . $tagName;
+
+					for ($i = 0, $count = count($attrSet); $i < $count; $i++)
+					{
+						$preTag .= ' ' . $attrSet[$i];
+					}
+
+					// Reformat single tags to XHTML
+					if (StringHelper::strpos($fromTagOpen, '</' . $tagName))
+					{
+						$preTag .= '>';
+					}
+					else
+					{
+						$preTag .= ' />';
+					}
+				}
+				else
+				// Closing tag
+				{
+					$preTag .= '</' . $tagName . '>';
+				}
+			}
+
+			// Find next tag's start and continue iteration
+			$postTag = StringHelper::substr($postTag, ($tagLength + 2));
+			$tagOpenStart = StringHelper::strpos($postTag, '<');
+		}
+
+		// Append any code after the end of tags and return
+		if ($postTag !== '<')
+		{
+			$preTag .= $postTag;
+		}
+
+		return $preTag;
+	}
+
+	/**
+	 * Internal method to strip a tag of certain attributes
+	 *
+	 * @param   array  $attrSet  Array of attribute pairs to filter
+	 *
+	 * @return  array  Filtered array of attribute pairs
+	 *
+	 * @since   1.0
+	 */
+	protected function cleanAttributes($attrSet)
+	{
+		$newSet = array();
+
+		$count = count($attrSet);
+
+		// Iterate through attribute pairs
+		for ($i = 0; $i < $count; $i++)
+		{
+			// Skip blank spaces
+			if (!$attrSet[$i])
+			{
+				continue;
+			}
+
+			// Split into name/value pairs
+			$attrSubSet = explode('=', trim($attrSet[$i]), 2);
+
+			// Take the last attribute in case there is an attribute with no value
+			$attrSubSet0   = explode(' ', trim($attrSubSet[0]));
+			$attrSubSet[0] = array_pop($attrSubSet0);
+
+			$attrSubSet[0] = strtolower($attrSubSet[0]);
+			$quoteStyle = version_compare(PHP_VERSION, '5.4', '>=') ? ENT_QUOTES | ENT_HTML401 : ENT_QUOTES;
+
+			// Remove all spaces as valid attributes does not have spaces.
+			$attrSubSet[0] = html_entity_decode($attrSubSet[0], $quoteStyle, 'UTF-8');
+			$attrSubSet[0] = preg_replace('/^[\pZ\pC]+|[\pZ\pC]+$/u', '', $attrSubSet[0]);
+			$attrSubSet[0] = preg_replace('/\s+/u', '', $attrSubSet[0]);
+
+			// Remove blacklisted chars from the attribute name
+			foreach ($this->blacklistedChars as $blacklistedChar)
+			{
+				$attrSubSet[0] = str_ireplace($blacklistedChar, '', $attrSubSet[0]);
+			}
+
+			// Remove all symbols
+			$attrSubSet[0] = preg_replace('/[^\p{L}\p{N}\-\s]/u', '', $attrSubSet[0]);
+
+			// Remove all "non-regular" attribute names
+			// AND blacklisted attributes
+			if ((!preg_match('/[a-z]*$/i', $attrSubSet[0]))
+				|| (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist))
+				|| (substr($attrSubSet[0], 0, 2) == 'on'))))
+			{
+				continue;
+			}
+
+			// XSS attribute value filtering
+			if (!isset($attrSubSet[1]))
+			{
+				continue;
+			}
+
+			// Remove blacklisted chars from the attribute value
+			foreach ($this->blacklistedChars as $blacklistedChar)
+			{
+				$attrSubSet[1] = str_ireplace($blacklistedChar, '', $attrSubSet[1]);
+			}
+
+			// Trim leading and trailing spaces
+			$attrSubSet[1] = trim($attrSubSet[1]);
+
+			// Strips unicode, hex, etc
+			$attrSubSet[1] = str_replace('&#', '', $attrSubSet[1]);
+
+			// Strip normal newline within attr value
+			$attrSubSet[1] = preg_replace('/[\n\r]/', '', $attrSubSet[1]);
+
+			// Strip double quotes
+			$attrSubSet[1] = str_replace('"', '', $attrSubSet[1]);
+
+			// Convert single quotes from either side to doubles (Single quotes shouldn't be used to pad attr values)
+			if ((substr($attrSubSet[1], 0, 1) == "'") && (substr($attrSubSet[1], (strlen($attrSubSet[1]) - 1), 1) == "'"))
+			{
+				$attrSubSet[1] = substr($attrSubSet[1], 1, (strlen($attrSubSet[1]) - 2));
+			}
+
+			// Strip slashes
+			$attrSubSet[1] = stripslashes($attrSubSet[1]);
+
+			// Autostrip script tags
+			if (static::checkAttribute($attrSubSet))
+			{
+				continue;
+			}
+
+			// Is our attribute in the user input array?
+			$attrFound = in_array(strtolower($attrSubSet[0]), $this->attrArray);
+
+			// If the tag is allowed lets keep it
+			if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod))
+			{
+				// Does the attribute have a value?
+				if (empty($attrSubSet[1]) === false)
+				{
+					$newSet[] = $attrSubSet[0] . '="' . $attrSubSet[1] . '"';
+				}
+				elseif ($attrSubSet[1] === "0")
+				{
+					// Special Case
+					// Is the value 0?
+					$newSet[] = $attrSubSet[0] . '="0"';
+				}
+				else
+				{
+					// Leave empty attributes alone
+					$newSet[] = $attrSubSet[0] . '=""';
+				}
+			}
+		}
+
+		return $newSet;
+	}
+
+	/**
+	 * Try to convert to plaintext
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Plaintext string
+	 *
+	 * @since   1.0
+	 * @deprecated  This method will be removed once support for PHP 5.3 is discontinued.
+	 */
+	protected function decode($source)
+	{
+		return html_entity_decode($source, ENT_QUOTES, 'UTF-8');
+	}
+
+	/**
+	 * Escape < > and " inside attribute values
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Filtered string
+	 *
+	 * @since   1.0
+	 */
+	protected function escapeAttributeValues($source)
+	{
+		$alreadyFiltered = '';
+		$remainder = $source;
+		$badChars = array('<', '"', '>');
+		$escapedChars = array('&lt;', '&quot;', '&gt;');
+
+		// Process each portion based on presence of =" and "<space>, "/>, or ">
+		// See if there are any more attributes to process
+		while (preg_match('#<[^>]*?=\s*?(\"|\')#s', $remainder, $matches, PREG_OFFSET_CAPTURE))
+		{
+			// We have found a tag with an attribute, convert its byte position to a UTF-8 string length, using non-multibyte substr()
+			$stringBeforeTag = substr($remainder, 0, $matches[0][1]);
+			$tagPosition = StringHelper::strlen($stringBeforeTag);
+
+			// Get the character length before the attribute value
+			$nextBefore = $tagPosition + StringHelper::strlen($matches[0][0]);
+
+			// Figure out if we have a single or double quote and look for the matching closing quote
+			// Closing quote should be "/>, ">, "<space>, or " at the end of the string
+			$quote = StringHelper::substr($matches[0][0], -1);
+			$pregMatch = ($quote == '"') ? '#(\"\s*/\s*>|\"\s*>|\"\s+|\"$)#' : "#(\'\s*/\s*>|\'\s*>|\'\s+|\'$)#";
+
+			// Get the portion after attribute value
+			$attributeValueRemainder = StringHelper::substr($remainder, $nextBefore);
+
+			if (preg_match($pregMatch, $attributeValueRemainder, $matches, PREG_OFFSET_CAPTURE))
+			{
+				// We have a closing quote, convert its byte position to a UTF-8 string length, using non-multibyte substr()
+				$stringBeforeQuote = substr($attributeValueRemainder, 0, $matches[0][1]);
+				$closeQuoteChars = StringHelper::strlen($stringBeforeQuote);
+				$nextAfter = $nextBefore + $matches[0][1];
+			}
+			else
+			{
+				// No closing quote
+				$nextAfter = StringHelper::strlen($remainder);
+			}
+
+			// Get the actual attribute value
+			$attributeValue = StringHelper::substr($remainder, $nextBefore, $nextAfter - $nextBefore);
+
+			// Escape bad chars
+			$attributeValue = str_replace($badChars, $escapedChars, $attributeValue);
+			$attributeValue = $this->stripCssExpressions($attributeValue);
+			$alreadyFiltered .= StringHelper::substr($remainder, 0, $nextBefore) . $attributeValue . $quote;
+			$remainder = StringHelper::substr($remainder, $nextAfter + 1);
+		}
+
+		// At this point, we just have to return the $alreadyFiltered and the $remainder
+		return $alreadyFiltered . $remainder;
+	}
+
+	/**
+	 * Remove CSS Expressions in the form of <property>:expression(...)
+	 *
+	 * @param   string  $source  The source string.
+	 *
+	 * @return  string  Filtered string
+	 *
+	 * @since   1.0
+	 */
+	protected function stripCssExpressions($source)
+	{
+		// Strip any comments out (in the form of /*...*/)
+		$test = preg_replace('#\/\*.*\*\/#U', '', $source);
+
+		// Test for :expression
+		if (!stripos($test, ':expression'))
+		{
+			// Not found, so we are done
+			return $source;
+		}
+
+		// At this point, we have stripped out the comments and have found :expression
+		// Test stripped string for :expression followed by a '('
+		if (preg_match_all('#:expression\s*\(#', $test, $matches))
+		{
+			// If found, remove :expression
+			return str_ireplace(':expression', '', $test);
+		}
+
+		return $source;
+	}
+}
diff --git a/core/libraries/vendor/joomla/filter/src/OutputFilter.php b/core/libraries/vendor/joomla/filter/src/OutputFilter.php
new file mode 100644
index 00000000..8ca20e4e
--- /dev/null
+++ b/core/libraries/vendor/joomla/filter/src/OutputFilter.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Part of the Joomla Framework Filter Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Filter;
+
+use Joomla\Language\Language;
+use Joomla\String\StringHelper;
+
+/**
+ * OutputFilter
+ *
+ * @since  1.0
+ */
+class OutputFilter
+{
+	/**
+	 * Makes an object safe to display in forms
+	 *
+	 * Object parameters that are non-string, array, object or start with underscore
+	 * will be converted
+	 *
+	 * @param   object   $mixed        An object to be parsed
+	 * @param   integer  $quoteStyle   The optional quote style for the htmlspecialchars function
+	 * @param   mixed    $excludeKeys  An optional string single field name or array of field names not to be parsed (eg, for a textarea)
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public static function objectHtmlSafe(&$mixed, $quoteStyle = ENT_QUOTES, $excludeKeys = '')
+	{
+		if (is_object($mixed))
+		{
+			foreach (get_object_vars($mixed) as $k => $v)
+			{
+				if (is_array($v) || is_object($v) || $v == null || substr($k, 1, 1) == '_')
+				{
+					continue;
+				}
+
+				if (is_string($excludeKeys) && $k == $excludeKeys)
+				{
+					continue;
+				}
+				elseif (is_array($excludeKeys) && in_array($k, $excludeKeys))
+				{
+					continue;
+				}
+
+				$mixed->$k = htmlspecialchars($v, $quoteStyle, 'UTF-8');
+			}
+		}
+	}
+
+	/**
+	 * This method processes a string and replaces all instances of & with &amp; in links only.
+	 *
+	 * @param   string  $input  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.0
+	 */
+	public static function linkXhtmlSafe($input)
+	{
+		$regex = 'href="([^"]*(&(amp;){0})[^"]*)*?"';
+
+		return preg_replace_callback(
+			"#$regex#i",
+			function ($m)
+			{
+				return preg_replace('#&(?!amp;)#', '&amp;', $m[0]);
+			},
+			$input
+		);
+	}
+
+	/**
+	 * This method processes a string and replaces all accented UTF-8 characters by unaccented
+	 * ASCII-7 "equivalents", whitespaces are replaced by hyphens and the string is lowercase.
+	 *
+	 * @param   string  $string    String to process
+	 * @param   string  $language  Language to transliterate to
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.0
+	 */
+	public static function stringUrlSafe($string, $language = '')
+	{
+		// Remove any '-' from the string since they will be used as concatenaters
+		$str = str_replace('-', ' ', $string);
+
+		// Transliterate on the language requested (fallback to current language if not specified)
+		$lang = empty($language) ? Language::getInstance() : Language::getInstance($language);
+		$str = $lang->transliterate($str);
+
+		// Trim white spaces at beginning and end of alias and make lowercase
+		$str = trim(StringHelper::strtolower($str));
+
+		// Remove any duplicate whitespace, and ensure all characters are alphanumeric
+		$str = preg_replace('/(\s|[^A-Za-z0-9\-])+/', '-', $str);
+
+		// Trim dashes at beginning and end of alias
+		$str = trim($str, '-');
+
+		return $str;
+	}
+
+	/**
+	 * This method implements unicode slugs instead of transliteration.
+	 *
+	 * @param   string  $string  String to process
+	 *
+	 * @return  string  Processed string
+	 *
+	 * @since   1.0
+	 */
+	public static function stringUrlUnicodeSlug($string)
+	{
+		// Replace double byte whitespaces by single byte (East Asian languages)
+		$str = preg_replace('/\xE3\x80\x80/', ' ', $string);
+
+		// Remove any '-' from the string as they will be used as concatenator.
+		// Would be great to let the spaces in but only Firefox is friendly with this
+
+		$str = str_replace('-', ' ', $str);
+
+		// Replace forbidden characters by whitespaces
+		$str = preg_replace('#[:\#\*"@+=;!><&\.%()\]\/\'\\\\|\[]#', "\x20", $str);
+
+		// Delete all '?'
+		$str = str_replace('?', '', $str);
+
+		// Trim white spaces at beginning and end of alias and make lowercase
+		$str = trim(StringHelper::strtolower($str));
+
+		// Remove any duplicate whitespace and replace whitespaces by hyphens
+		$str = preg_replace('#\x20+#', '-', $str);
+
+		return $str;
+	}
+
+	/**
+	 * Replaces &amp; with & for XHTML compliance
+	 *
+	 * @param   string  $text  Text to process
+	 *
+	 * @return  string  Processed string.
+	 *
+	 * @since   1.0
+	 */
+	public static function ampReplace($text)
+	{
+		return preg_replace('/(?<!&)&(?!&|#|[\w]+;)/', '&amp;', $text);
+	}
+
+	/**
+	 * Cleans text of all formatting and scripting code
+	 *
+	 * @param   string  $text  Text to clean
+	 *
+	 * @return  string  Cleaned text.
+	 *
+	 * @since   1.0
+	 */
+	public static function cleanText(&$text)
+	{
+		$text = preg_replace("'<script[^>]*>.*?</script>'si", '', $text);
+		$text = preg_replace('/<a\s+.*?href="([^"]+)"[^>]*>([^<]+)<\/a>/is', '\2 (\1)', $text);
+		$text = preg_replace('/<!--.+?-->/', '', $text);
+		$text = preg_replace('/{.+?}/', '', $text);
+		$text = preg_replace('/&nbsp;/', ' ', $text);
+		$text = preg_replace('/&amp;/', ' ', $text);
+		$text = preg_replace('/&quot;/', ' ', $text);
+		$text = strip_tags($text);
+		$text = htmlspecialchars($text, ENT_COMPAT, 'UTF-8');
+
+		return $text;
+	}
+
+	/**
+	 * Strip img-tags from string
+	 *
+	 * @param   string  $string  Sting to be cleaned.
+	 *
+	 * @return  string  Cleaned string
+	 *
+	 * @since   1.0
+	 */
+	public static function stripImages($string)
+	{
+		return preg_replace('#(<[/]?img.*>)#U', '', $string);
+	}
+
+	/**
+	 * Strip iframe-tags from string
+	 *
+	 * @param   string  $string  Sting to be cleaned.
+	 *
+	 * @return  string  Cleaned string
+	 *
+	 * @since   1.0
+	 */
+	public static function stripIframes($string)
+	{
+		return preg_replace('#(<[/]?iframe.*>)#U', '', $string);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/LICENSE b/core/libraries/vendor/joomla/image/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Backgroundfill.php b/core/libraries/vendor/joomla/image/src/Filter/Backgroundfill.php
new file mode 100644
index 00000000..cc98042c
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Backgroundfill.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+use InvalidArgumentException;
+
+/**
+ * Image Filter class fill background with color;
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Backgroundfill extends ImageFilter
+{
+	/**
+	 * Method to apply a background color to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *                           color  Background matte color
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function execute(array $options = array())
+	{
+		// Validate that the color value exists and is an integer.
+		if (!isset($options['color']))
+		{
+			throw new InvalidArgumentException('No color value was given. Expected string or array.');
+		}
+
+		$colorCode = (!empty($options['color'])) ? $options['color'] : null;
+
+		// Get resource dimensions
+		$width = imagesX($this->handle);
+		$height = imagesY($this->handle);
+
+		// Sanitize color
+		$rgba = $this->sanitizeColor($colorCode);
+
+		// Enforce alpha on source image
+		if (imageIsTrueColor($this->handle))
+		{
+			imageAlphaBlending($this->handle, false);
+			imageSaveAlpha($this->handle, true);
+		}
+
+		// Create background
+		$bg = imageCreateTruecolor($width, $height);
+		imageSaveAlpha($bg, empty($rgba['alpha']));
+
+		// Allocate background color.
+		$color = imageColorAllocateAlpha($bg, $rgba['red'], $rgba['green'], $rgba['blue'], $rgba['alpha']);
+
+		// Fill background
+		imageFill($bg, 0, 0, $color);
+
+		// Apply image over background
+		imageCopy($bg, $this->handle, 0, 0, 0, 0, $width, $height);
+
+		// Move flattened result onto curent handle.
+		// If handle was palette-based, it'll stay like that.
+		imageCopy($this->handle, $bg, 0, 0, 0, 0, $width, $height);
+
+		// Free up memory
+		imageDestroy($bg);
+
+		return;
+	}
+
+	/**
+	 * Method to sanitize color values
+	 * and/or convert to an array
+	 *
+	 * @param   mixed  $input  Associative array of colors and alpha,
+	 *                         or hex RGBA string when alpha FF is opaque.
+	 *                         Defaults to black and opaque alpha
+	 *
+	 * @return  array  Associative array of red, green, blue and alpha
+	 *
+	 * @since   1.0
+	 *
+	 * @note    '#FF0000FF' returns an array with alpha of 0 (opaque)
+	 */
+	protected function sanitizeColor($input)
+	{
+		// Construct default values
+		$colors = array('red' => 0, 'green' => 0, 'blue' => 0, 'alpha' => 0);
+
+		// Make sure all values are in
+		if (is_array($input))
+		{
+			$colors = array_merge($colors, $input);
+		}
+		elseif (is_string($input))
+		// Convert RGBA 6-9 char string
+		{
+			$hex = ltrim($input, '#');
+
+			$hexValues = array(
+				'red' => substr($hex, 0, 2),
+				'green' => substr($hex, 2, 2),
+				'blue' => substr($hex, 4, 2),
+				'alpha' => substr($hex, 6, 2),
+			);
+
+			$colors = array_map('hexdec', $hexValues);
+
+			// Convert Alpha to 0..127 when provided
+			if (strlen($hex) > 6)
+			{
+				$colors['alpha'] = floor((255 - $colors['alpha']) / 2);
+			}
+		}
+		else
+		// Cannot sanitize such type
+		{
+			return $colors;
+		}
+
+		// Make sure each value is within the allowed range
+		foreach ($colors as &$value)
+		{
+			$value = max(0, min(255, (int) $value));
+		}
+
+		$colors['alpha'] = min(127, $colors['alpha']);
+
+		return $colors;
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Brightness.php b/core/libraries/vendor/joomla/image/src/Filter/Brightness.php
new file mode 100644
index 00000000..5b1d6f18
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Brightness.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+use InvalidArgumentException;
+
+/**
+ * Image Filter class adjust the brightness of an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Brightness extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function execute(array $options = array())
+	{
+		// Validate that the brightness value exists and is an integer.
+		if (!isset($options[IMG_FILTER_BRIGHTNESS]) || !is_int($options[IMG_FILTER_BRIGHTNESS]))
+		{
+			throw new InvalidArgumentException('No valid brightness value was given.  Expected integer.');
+		}
+
+		// Perform the brightness filter.
+		imagefilter($this->handle, IMG_FILTER_BRIGHTNESS, $options[IMG_FILTER_BRIGHTNESS]);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Contrast.php b/core/libraries/vendor/joomla/image/src/Filter/Contrast.php
new file mode 100644
index 00000000..ca3ce951
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Contrast.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+use InvalidArgumentException;
+
+/**
+ * Image Filter class adjust the contrast of an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Contrast extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function execute(array $options = array())
+	{
+		// Validate that the contrast value exists and is an integer.
+		if (!isset($options[IMG_FILTER_CONTRAST]) || !is_int($options[IMG_FILTER_CONTRAST]))
+		{
+			throw new InvalidArgumentException('No valid contrast value was given.  Expected integer.');
+		}
+
+		// Perform the contrast filter.
+		imagefilter($this->handle, IMG_FILTER_CONTRAST, $options[IMG_FILTER_CONTRAST]);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Edgedetect.php b/core/libraries/vendor/joomla/image/src/Filter/Edgedetect.php
new file mode 100644
index 00000000..bd4545dc
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Edgedetect.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+
+/**
+ * Image Filter class to add an edge detect effect to an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Edgedetect extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute(array $options = array())
+	{
+		// Perform the edge detection filter.
+		imagefilter($this->handle, IMG_FILTER_EDGEDETECT);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Emboss.php b/core/libraries/vendor/joomla/image/src/Filter/Emboss.php
new file mode 100644
index 00000000..c07dc710
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Emboss.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+
+/**
+ * Image Filter class to emboss an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Emboss extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute(array $options = array())
+	{
+		// Perform the emboss filter.
+		imagefilter($this->handle, IMG_FILTER_EMBOSS);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Grayscale.php b/core/libraries/vendor/joomla/image/src/Filter/Grayscale.php
new file mode 100644
index 00000000..a24eebeb
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Grayscale.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+
+/**
+ * Image Filter class to transform an image to grayscale.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Grayscale extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute(array $options = array())
+	{
+		// Perform the grayscale filter.
+		imagefilter($this->handle, IMG_FILTER_GRAYSCALE);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Negate.php b/core/libraries/vendor/joomla/image/src/Filter/Negate.php
new file mode 100644
index 00000000..1f443101
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Negate.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+
+/**
+ * Image Filter class to negate the colors of an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Negate extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute(array $options = array())
+	{
+		// Perform the negative filter.
+		imagefilter($this->handle, IMG_FILTER_NEGATE);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Sketchy.php b/core/libraries/vendor/joomla/image/src/Filter/Sketchy.php
new file mode 100644
index 00000000..a9c53b75
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Sketchy.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+
+/**
+ * Image Filter class to make an image appear "sketchy".
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Sketchy extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function execute(array $options = array())
+	{
+		// Perform the sketchy filter.
+		imagefilter($this->handle, IMG_FILTER_MEAN_REMOVAL);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Filter/Smooth.php b/core/libraries/vendor/joomla/image/src/Filter/Smooth.php
new file mode 100644
index 00000000..29ed7e14
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Filter/Smooth.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image\Filter;
+
+use Joomla\Image\ImageFilter;
+use InvalidArgumentException;
+
+/**
+ * Image Filter class adjust the smoothness of an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Smooth extends ImageFilter
+{
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  InvalidArgumentException
+	 */
+	public function execute(array $options = array())
+	{
+		// Validate that the smoothing value exists and is an integer.
+		if (!isset($options[IMG_FILTER_SMOOTH]) || !is_int($options[IMG_FILTER_SMOOTH]))
+		{
+			throw new InvalidArgumentException('No valid smoothing value was given.  Expected integer.');
+		}
+
+		// Perform the smoothing filter.
+		imagefilter($this->handle, IMG_FILTER_SMOOTH, $options[IMG_FILTER_SMOOTH]);
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/Image.php b/core/libraries/vendor/joomla/image/src/Image.php
new file mode 100644
index 00000000..e165876d
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/Image.php
@@ -0,0 +1,1243 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image;
+
+use Psr\Log\NullLogger;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerAwareInterface;
+
+/**
+ * Class to manipulate an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+class Image implements LoggerAwareInterface
+{
+	/**
+	 * @const  integer
+	 * @since  1.0
+	 */
+	const SCALE_FILL = 1;
+
+	/**
+	 * @const  integer
+	 * @since  1.0
+	 */
+	const SCALE_INSIDE = 2;
+
+	/**
+	 * @const  integer
+	 * @since  1.0
+	 */
+	const SCALE_OUTSIDE = 3;
+
+	/**
+	 * @const  integer
+	 * @since  1.0
+	 */
+	const CROP = 4;
+
+	/**
+	 * @const  integer
+	 * @since  1.0
+	 */
+	const CROP_RESIZE = 5;
+
+	/**
+	 * @const  integer
+	 * @since  1.0
+	 */
+	const SCALE_FIT = 6;
+
+	/**
+	 * @const  string
+	 * @since  1.2.0
+	 */
+	const ORIENTATION_LANDSCAPE = 'landscape';
+
+	/**
+	 * @const  string
+	 * @since  1.2.0
+	 */
+	const ORIENTATION_PORTRAIT = 'portrait';
+
+	/**
+	 * @const  string
+	 * @since  1.2.0
+	 */
+	const ORIENTATION_SQUARE = 'square';
+
+	/**
+	 * @var    resource  The image resource handle.
+	 * @since  1.0
+	 */
+	protected $handle;
+
+	/**
+	 * @var    string  The source image path.
+	 * @since  1.0
+	 */
+	protected $path = null;
+
+	/**
+	 * @var    array  Whether or not different image formats are supported.
+	 * @since  1.0
+	 */
+	protected static $formats = array();
+
+	/**
+	 * @var    LoggerInterface  Logger object
+	 * @since  1.0
+	 */
+	protected $logger = null;
+
+	/**
+	 * @var    boolean  Flag if an image should use the best quality available.  Disable for improved performance.
+	 * @since  1.4.0
+	 */
+	protected $generateBestQuality = true;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   mixed  $source  Either a file path for a source image or a GD resource handler for an image.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function __construct($source = null)
+	{
+		// Verify that GD support for PHP is available.
+		if (!extension_loaded('gd'))
+		{
+			// @codeCoverageIgnoreStart
+			throw new \RuntimeException('The GD extension for PHP is not available.');
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Determine which image types are supported by GD, but only once.
+		if (!isset(static::$formats[IMAGETYPE_JPEG]))
+		{
+			$info = gd_info();
+			static::$formats[IMAGETYPE_JPEG] = ($info['JPEG Support']) ? true : false;
+			static::$formats[IMAGETYPE_PNG] = ($info['PNG Support']) ? true : false;
+			static::$formats[IMAGETYPE_GIF] = ($info['GIF Read Support']) ? true : false;
+		}
+
+		// If the source input is a resource, set it as the image handle.
+		if (is_resource($source) && (get_resource_type($source) == 'gd'))
+		{
+			$this->handle = &$source;
+		}
+		elseif (!empty($source) && is_string($source))
+		{
+			// If the source input is not empty, assume it is a path and populate the image handle.
+			$this->loadFile($source);
+		}
+	}
+
+	/**
+	 * Get the image resource handle
+	 *
+	 * @return  resource
+	 *
+	 * @since   1.3.0
+	 * @throws  \LogicException if an image has not been loaded into the instance
+	 */
+	public function getHandle()
+	{
+		// Make sure the resource handle is valid.
+		if (!$this->isLoaded())
+		{
+			throw new \LogicException('No valid image was loaded.');
+		}
+
+		return $this->handle;
+	}
+
+	/**
+	 * Get the logger.
+	 *
+	 * @return  LoggerInterface
+	 *
+	 * @since   1.0
+	 */
+	public function getLogger()
+	{
+		// If a logger hasn't been set, use NullLogger
+		if (! ($this->logger instanceof LoggerInterface))
+		{
+			$this->logger = new NullLogger;
+		}
+
+		return $this->logger;
+	}
+
+	/**
+	 * Sets a logger instance on the object
+	 *
+	 * @param   LoggerInterface  $logger  A PSR-3 compliant logger.
+	 *
+	 * @return  Image  This object for message chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setLogger(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+
+		return $this;
+	}
+
+	/**
+	 * Method to return a properties object for an image given a filesystem path.
+	 *
+	 * The result object has values for image width, height, type, attributes, mime type, bits, and channels.
+	 *
+	 * @param   string  $path  The filesystem path to the image for which to get properties.
+	 *
+	 * @return  \stdClass
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 * @throws  \RuntimeException
+	 */
+	public static function getImageFileProperties($path)
+	{
+		// Make sure the file exists.
+		if (!file_exists($path))
+		{
+			throw new \InvalidArgumentException('The image file does not exist.');
+		}
+
+		// Get the image file information.
+		$info = getimagesize($path);
+
+		if (!$info)
+		{
+			// @codeCoverageIgnoreStart
+			throw new \RuntimeException('Unable to get properties for the image.');
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Build the response object.
+		$properties = (object) array(
+			'width'       => $info[0],
+			'height'      => $info[1],
+			'type'        => $info[2],
+			'attributes'  => $info[3],
+			'bits'        => isset($info['bits']) ? $info['bits'] : null,
+			'channels'    => isset($info['channels']) ? $info['channels'] : null,
+			'mime'        => $info['mime'],
+			'filesize'    => filesize($path),
+			'orientation' => self::getOrientationString((int) $info[0], (int) $info[1]),
+		);
+
+		return $properties;
+	}
+
+	/**
+	 * Method to detect whether an image's orientation is landscape, portrait or square.
+	 *
+	 * The orientation will be returned as a string.
+	 *
+	 * @return  mixed   Orientation string or null.
+	 *
+	 * @since   1.2.0
+	 */
+	public function getOrientation()
+	{
+		if ($this->isLoaded())
+		{
+			return self::getOrientationString($this->getWidth(), $this->getHeight());
+		}
+
+		return null;
+	}
+
+	/**
+	 * Compare width and height integers to determine image orientation.
+	 *
+	 * @param   integer  $width   The width value to use for calculation
+	 * @param   integer  $height  The height value to use for calculation
+	 *
+	 * @return  string   Orientation string
+	 *
+	 * @since   1.2.0
+	 */
+	private static function getOrientationString($width, $height)
+	{
+		switch (true)
+		{
+			case ($width > $height) :
+				return self::ORIENTATION_LANDSCAPE;
+
+			case ($width < $height) :
+				return self::ORIENTATION_PORTRAIT;
+
+			default:
+				return self::ORIENTATION_SQUARE;
+		}
+	}
+
+	/**
+	 * Method to generate thumbnails from the current image. It allows
+	 * creation by resizing or cropping the original image.
+	 *
+	 * @param   mixed    $thumbSizes      String or array of strings. Example: $thumbSizes = array('150x75','250x150');
+	 * @param   integer  $creationMethod  1-3 resize $scaleMethod | 4 create cropping | 5 resize then crop
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 * @throws  \InvalidArgumentException
+	 */
+	public function generateThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE)
+	{
+		// Make sure the resource handle is valid.
+		if (!$this->isLoaded())
+		{
+			throw new \LogicException('No valid image was loaded.');
+		}
+
+		// Accept a single thumbsize string as parameter
+		if (!is_array($thumbSizes))
+		{
+			$thumbSizes = array($thumbSizes);
+		}
+
+		// Process thumbs
+		$generated = array();
+
+		if (!empty($thumbSizes))
+		{
+			foreach ($thumbSizes as $thumbSize)
+			{
+				// Desired thumbnail size
+				$size = explode('x', strtolower($thumbSize));
+
+				if (count($size) != 2)
+				{
+					throw new \InvalidArgumentException('Invalid thumb size received: ' . $thumbSize);
+				}
+
+				$thumbWidth  = $size[0];
+				$thumbHeight = $size[1];
+
+				switch ($creationMethod)
+				{
+					// Case for self::CROP
+					case 4:
+						$thumb = $this->crop($thumbWidth, $thumbHeight, null, null, true);
+						break;
+
+					// Case for self::CROP_RESIZE
+					case 5:
+						$thumb = $this->cropResize($thumbWidth, $thumbHeight, true);
+						break;
+
+					default:
+						$thumb = $this->resize($thumbWidth, $thumbHeight, true, $creationMethod);
+						break;
+				}
+
+				// Store the thumb in the results array
+				$generated[] = $thumb;
+			}
+		}
+
+		return $generated;
+	}
+
+	/**
+	 * Method to create thumbnails from the current image and save them to disk. It allows creation by resizing
+	 * or cropping the original image.
+	 *
+	 * @param   mixed    $thumbSizes      string or array of strings. Example: $thumbSizes = array('150x75','250x150');
+	 * @param   integer  $creationMethod  1-3 resize $scaleMethod | 4 create cropping
+	 * @param   string   $thumbsFolder    destination thumbs folder. null generates a thumbs folder in the image folder
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 * @throws  \InvalidArgumentException
+	 */
+	public function createThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE, $thumbsFolder = null)
+	{
+		// Make sure the resource handle is valid.
+		if (!$this->isLoaded())
+		{
+			throw new \LogicException('No valid image was loaded.');
+		}
+
+		// No thumbFolder set -> we will create a thumbs folder in the current image folder
+		if (is_null($thumbsFolder))
+		{
+			$thumbsFolder = dirname($this->getPath()) . '/thumbs';
+		}
+
+		// Check destination
+		if (!is_dir($thumbsFolder) && (!is_dir(dirname($thumbsFolder)) || !@mkdir($thumbsFolder)))
+		{
+			throw new \InvalidArgumentException('Folder does not exist and cannot be created: ' . $thumbsFolder);
+		}
+
+		// Process thumbs
+		$thumbsCreated = array();
+
+		if ($thumbs = $this->generateThumbs($thumbSizes, $creationMethod))
+		{
+			// Parent image properties
+			$imgProperties = static::getImageFileProperties($this->getPath());
+
+			foreach ($thumbs as $thumb)
+			{
+				// Get thumb properties
+				$thumbWidth     = $thumb->getWidth();
+				$thumbHeight    = $thumb->getHeight();
+
+				// Generate thumb name
+				$filename       = pathinfo($this->getPath(), PATHINFO_FILENAME);
+				$fileExtension  = pathinfo($this->getPath(), PATHINFO_EXTENSION);
+				$thumbFileName  = $filename . '_' . $thumbWidth . 'x' . $thumbHeight . '.' . $fileExtension;
+
+				// Save thumb file to disk
+				$thumbFileName = $thumbsFolder . '/' . $thumbFileName;
+
+				if ($thumb->toFile($thumbFileName, $imgProperties->type))
+				{
+					// Return Image object with thumb path to ease further manipulation
+					$thumb->path = $thumbFileName;
+					$thumbsCreated[] = $thumb;
+				}
+			}
+		}
+
+		return $thumbsCreated;
+	}
+
+	/**
+	 * Method to crop the current image.
+	 *
+	 * @param   mixed    $width      The width of the image section to crop in pixels or a percentage.
+	 * @param   mixed    $height     The height of the image section to crop in pixels or a percentage.
+	 * @param   integer  $left       The number of pixels from the left to start cropping.
+	 * @param   integer  $top        The number of pixels from the top to start cropping.
+	 * @param   boolean  $createNew  If true the current image will be cloned, cropped and returned; else
+	 *                               the current image will be cropped and returned.
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function crop($width, $height, $left = null, $top = null, $createNew = true)
+	{
+		// Sanitize width.
+		$width = $this->sanitizeWidth($width, $height);
+
+		// Sanitize height.
+		$height = $this->sanitizeHeight($height, $width);
+
+		// Autocrop offsets
+		if (is_null($left))
+		{
+			$left = round(($this->getWidth() - $width) / 2);
+		}
+
+		if (is_null($top))
+		{
+			$top = round(($this->getHeight() - $height) / 2);
+		}
+
+		// Sanitize left.
+		$left = $this->sanitizeOffset($left);
+
+		// Sanitize top.
+		$top = $this->sanitizeOffset($top);
+
+		// Create the new truecolor image handle.
+		$handle = imagecreatetruecolor($width, $height);
+
+		// Allow transparency for the new image handle.
+		imagealphablending($handle, false);
+		imagesavealpha($handle, true);
+
+		if ($this->isTransparent())
+		{
+			// Get the transparent color values for the current image.
+			$rgba  = imagecolorsforindex($this->getHandle(), imagecolortransparent($this->getHandle()));
+			$color = imagecolorallocatealpha($handle, $rgba['red'], $rgba['green'], $rgba['blue'], $rgba['alpha']);
+
+			// Set the transparent color values for the new image.
+			imagecolortransparent($handle, $color);
+			imagefill($handle, 0, 0, $color);
+		}
+
+		if (!$this->generateBestQuality)
+		{
+			imagecopyresized($handle, $this->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height);
+		}
+		else
+		{
+			imagecopyresampled($handle, $this->getHandle(), 0, 0, $left, $top, $width, $height, $width, $height);
+		}
+
+		// If we are cropping to a new image, create a new Image object.
+		if ($createNew)
+		{
+			// @codeCoverageIgnoreStart
+			return new static($handle);
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Swap out the current handle for the new image handle.
+		$this->destroy();
+
+		$this->handle = $handle;
+
+		return $this;
+	}
+
+	/**
+	 * Method to apply a filter to the image by type.  Two examples are: grayscale and sketchy.
+	 *
+	 * @param   string  $type     The name of the image filter to apply.
+	 * @param   array   $options  An array of options for the filter.
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.0
+	 * @see     Joomla\Image\Filter
+	 * @throws  \LogicException
+	 */
+	public function filter($type, array $options = array())
+	{
+		// Make sure the resource handle is valid.
+		if (!$this->isLoaded())
+		{
+			throw new \LogicException('No valid image was loaded.');
+		}
+
+		// Get the image filter instance.
+		$filter = $this->getFilterInstance($type);
+
+		// Execute the image filter.
+		$filter->execute($options);
+
+		return $this;
+	}
+
+	/**
+	 * Method to get the height of the image in pixels.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function getHeight()
+	{
+		return imagesy($this->getHandle());
+	}
+
+	/**
+	 * Method to get the width of the image in pixels.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function getWidth()
+	{
+		return imagesx($this->getHandle());
+	}
+
+	/**
+	 * Method to return the path
+	 *
+	 * @return	string
+	 *
+	 * @since	1.0
+	 */
+	public function getPath()
+	{
+		return $this->path;
+	}
+
+	/**
+	 * Method to determine whether or not an image has been loaded into the object.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function isLoaded()
+	{
+		// Make sure the resource handle is valid.
+		if (!is_resource($this->handle) || (get_resource_type($this->handle) != 'gd'))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to determine whether or not the image has transparency.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function isTransparent()
+	{
+		return imagecolortransparent($this->getHandle()) >= 0;
+	}
+
+	/**
+	 * Method to load a file into the Image object as the resource.
+	 *
+	 * @param   string  $path  The filesystem path to load as an image.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 * @throws  \RuntimeException
+	 */
+	public function loadFile($path)
+	{
+		// Destroy the current image handle if it exists
+		$this->destroy();
+
+		// Make sure the file exists.
+		if (!file_exists($path))
+		{
+			throw new \InvalidArgumentException('The image file does not exist.');
+		}
+
+		// Get the image properties.
+		$properties = static::getImageFileProperties($path);
+
+		// Attempt to load the image based on the MIME-Type
+		switch ($properties->mime)
+		{
+			case 'image/gif':
+				// Make sure the image type is supported.
+				if (empty(static::$formats[IMAGETYPE_GIF]))
+				{
+					// @codeCoverageIgnoreStart
+					$this->getLogger()->error('Attempting to load an image of unsupported type GIF.');
+
+					throw new \RuntimeException('Attempting to load an image of unsupported type GIF.');
+
+					// @codeCoverageIgnoreEnd
+				}
+
+				// Attempt to create the image handle.
+				$handle = imagecreatefromgif($path);
+
+				if (!is_resource($handle))
+				{
+					// @codeCoverageIgnoreStart
+					throw new \RuntimeException('Unable to process GIF image.');
+
+					// @codeCoverageIgnoreEnd
+				}
+
+				$this->handle = $handle;
+				break;
+
+			case 'image/jpeg':
+				// Make sure the image type is supported.
+				if (empty(static::$formats[IMAGETYPE_JPEG]))
+				{
+					// @codeCoverageIgnoreStart
+					$this->getLogger()->error('Attempting to load an image of unsupported type JPG.');
+
+					throw new \RuntimeException('Attempting to load an image of unsupported type JPG.');
+
+					// @codeCoverageIgnoreEnd
+				}
+
+				// Attempt to create the image handle.
+				$handle = imagecreatefromjpeg($path);
+
+				if (!is_resource($handle))
+				{
+					// @codeCoverageIgnoreStart
+					throw new \RuntimeException('Unable to process JPG image.');
+
+					// @codeCoverageIgnoreEnd
+				}
+
+				$this->handle = $handle;
+				break;
+
+			case 'image/png':
+				// Make sure the image type is supported.
+				if (empty(static::$formats[IMAGETYPE_PNG]))
+				{
+					// @codeCoverageIgnoreStart
+					$this->getLogger()->error('Attempting to load an image of unsupported type PNG.');
+
+					throw new \RuntimeException('Attempting to load an image of unsupported type PNG.');
+
+					// @codeCoverageIgnoreEnd
+				}
+
+				// Attempt to create the image handle.
+				$handle = imagecreatefrompng($path);
+
+				if (!is_resource($handle))
+				{
+					// @codeCoverageIgnoreStart
+					throw new \RuntimeException('Unable to process PNG image.');
+
+					// @codeCoverageIgnoreEnd
+				}
+
+				$this->handle = $handle;
+
+				break;
+
+			default:
+				$this->getLogger()->error('Attempting to load an image of unsupported type ' . $properties->mime);
+
+				throw new \InvalidArgumentException('Attempting to load an image of unsupported type ' . $properties->mime);
+		}
+
+		// Set the filesystem path to the source image.
+		$this->path = $path;
+	}
+
+	/**
+	 * Method to resize the current image.
+	 *
+	 * @param   mixed    $width        The width of the resized image in pixels or a percentage.
+	 * @param   mixed    $height       The height of the resized image in pixels or a percentage.
+	 * @param   boolean  $createNew    If true the current image will be cloned, resized and returned; else
+	 *                                 the current image will be resized and returned.
+	 * @param   integer  $scaleMethod  Which method to use for scaling
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function resize($width, $height, $createNew = true, $scaleMethod = self::SCALE_INSIDE)
+	{
+		// Sanitize width.
+		$width = $this->sanitizeWidth($width, $height);
+
+		// Sanitize height.
+		$height = $this->sanitizeHeight($height, $width);
+
+		// Prepare the dimensions for the resize operation.
+		$dimensions = $this->prepareDimensions($width, $height, $scaleMethod);
+
+		// Instantiate offset.
+		$offset = new \stdClass;
+		$offset->x = $offset->y = 0;
+
+		// Center image if needed and create the new truecolor image handle.
+		if ($scaleMethod == self::SCALE_FIT)
+		{
+			// Get the offsets
+			$offset->x	= round(($width - $dimensions->width) / 2);
+			$offset->y	= round(($height - $dimensions->height) / 2);
+
+			$handle = imagecreatetruecolor($width, $height);
+
+			// Make image transparent, otherwise canvas outside initial image would default to black
+			if (!$this->isTransparent())
+			{
+				$transparency = imagecolorallocatealpha($this->getHandle(), 0, 0, 0, 127);
+				imagecolortransparent($this->getHandle(), $transparency);
+			}
+		}
+		else
+		{
+			$handle = imagecreatetruecolor($dimensions->width, $dimensions->height);
+		}
+
+		// Allow transparency for the new image handle.
+		imagealphablending($handle, false);
+		imagesavealpha($handle, true);
+
+		if ($this->isTransparent())
+		{
+			// Get the transparent color values for the current image.
+			$rgba = imagecolorsforindex($this->getHandle(), imagecolortransparent($this->getHandle()));
+			$color = imagecolorallocatealpha($handle, $rgba['red'], $rgba['green'], $rgba['blue'], $rgba['alpha']);
+
+			// Set the transparent color values for the new image.
+			imagecolortransparent($handle, $color);
+			imagefill($handle, 0, 0, $color);
+		}
+
+		if (!$this->generateBestQuality)
+		{
+			imagecopyresized(
+				$handle,
+				$this->getHandle(),
+				$offset->x,
+				$offset->y,
+				0,
+				0,
+				$dimensions->width,
+				$dimensions->height,
+				$this->getWidth(),
+				$this->getHeight()
+			);
+		}
+		else
+		{
+			// Use resampling for better quality
+			imagecopyresampled(
+				$handle,
+				$this->getHandle(),
+				$offset->x,
+				$offset->y,
+				0,
+				0,
+				$dimensions->width,
+				$dimensions->height,
+				$this->getWidth(),
+				$this->getHeight()
+			);
+		}
+
+		// If we are resizing to a new image, create a new JImage object.
+		if ($createNew)
+		{
+			// @codeCoverageIgnoreStart
+			return new static($handle);
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Swap out the current handle for the new image handle.
+		$this->destroy();
+
+		$this->handle = $handle;
+
+		return $this;
+	}
+
+	/**
+	 * Method to crop an image after resizing it to maintain
+	 * proportions without having to do all the set up work.
+	 *
+	 * @param   integer  $width      The desired width of the image in pixels or a percentage.
+	 * @param   integer  $height     The desired height of the image in pixels or a percentage.
+	 * @param   integer  $createNew  If true the current image will be cloned, resized, cropped and returned.
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.0
+	 */
+	public function cropResize($width, $height, $createNew = true)
+	{
+		$width   = $this->sanitizeWidth($width, $height);
+		$height  = $this->sanitizeHeight($height, $width);
+
+		$resizewidth = $width;
+		$resizeheight = $height;
+
+		if (($this->getWidth() / $width) < ($this->getHeight() / $height))
+		{
+			$resizeheight = 0;
+		}
+		else
+		{
+			$resizewidth = 0;
+		}
+
+		return $this->resize($resizewidth, $resizeheight, $createNew)->crop($width, $height, null, null, false);
+	}
+
+	/**
+	 * Method to rotate the current image.
+	 *
+	 * @param   mixed    $angle       The angle of rotation for the image
+	 * @param   integer  $background  The background color to use when areas are added due to rotation
+	 * @param   boolean  $createNew   If true the current image will be cloned, rotated and returned; else
+	 *                                the current image will be rotated and returned.
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function rotate($angle, $background = -1, $createNew = true)
+	{
+		// Sanitize input
+		$angle = (float) $angle;
+
+		// Create the new truecolor image handle.
+		$handle = imagecreatetruecolor($this->getWidth(), $this->getHeight());
+
+		// Make background transparent if no external background color is provided.
+		if ($background == -1)
+		{
+			// Allow transparency for the new image handle.
+			imagealphablending($handle, false);
+			imagesavealpha($handle, true);
+
+			$background = imagecolorallocatealpha($handle, 0, 0, 0, 127);
+		}
+
+		// Copy the image
+		imagecopy($handle, $this->getHandle(), 0, 0, 0, 0, $this->getWidth(), $this->getHeight());
+
+		// Rotate the image
+		$handle = imagerotate($handle, $angle, $background);
+
+		// If we are resizing to a new image, create a new Image object.
+		if ($createNew)
+		{
+			// @codeCoverageIgnoreStart
+			return new static($handle);
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Swap out the current handle for the new image handle.
+		$this->destroy();
+
+		$this->handle = $handle;
+
+		return $this;
+	}
+
+	/**
+	 * Method to flip the current image.
+	 *
+	 * @param   integer  $mode       The flip mode for flipping the image {@link http://php.net/imageflip#refsect1-function.imageflip-parameters}
+	 * @param   boolean  $createNew  If true the current image will be cloned, flipped and returned; else
+	 *                               the current image will be flipped and returned.
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.2.0
+	 * @throws  \LogicException
+	 */
+	public function flip($mode, $createNew = true)
+	{
+		// Create the new truecolor image handle.
+		$handle = imagecreatetruecolor($this->getWidth(), $this->getHeight());
+
+		// Copy the image
+		imagecopy($handle, $this->getHandle(), 0, 0, 0, 0, $this->getWidth(), $this->getHeight());
+
+		// Flip the image
+		if (!imageflip($handle, $mode))
+		{
+			throw new \LogicException('Unable to flip the image.');
+		}
+
+		// If we are resizing to a new image, create a new Image object.
+		if ($createNew)
+		{
+			// @codeCoverageIgnoreStart
+			return new static($handle);
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Free the memory from the current handle
+		$this->destroy();
+
+		// Swap out the current handle for the new image handle.
+		$this->handle = $handle;
+
+		return $this;
+	}
+
+	/**
+	 * Watermark the image
+	 *
+	 * @param   Image    $watermark     The Image object containing the watermark graphic
+	 * @param   integer  $transparency  The transparency to use for the watermark graphic
+	 * @param   integer  $bottomMargin  The margin from the bottom of this image
+	 * @param   integer  $rightMargin   The margin from the right side of this image
+	 *
+	 * @return  Image
+	 *
+	 * @since   1.3.0
+	 * @link    https://secure.php.net/manual/en/image.examples-watermark.php
+	 */
+	public function watermark(Image $watermark, $transparency = 50, $bottomMargin = 0, $rightMargin = 0)
+	{
+		imagecopymerge(
+			$this->getHandle(),
+			$watermark->getHandle(),
+			$this->getWidth() - $watermark->getWidth() - $rightMargin,
+			$this->getHeight() - $watermark->getHeight() - $bottomMargin,
+			0,
+			0,
+			$watermark->getWidth(),
+			$watermark->getHeight(),
+			$transparency
+		);
+
+		return $this;
+	}
+
+	/**
+	 * Method to write the current image out to a file or output directly.
+	 *
+	 * @param   mixed    $path     The filesystem path to save the image.
+	 *                             When null, the raw image stream will be outputted directly.
+	 * @param   integer  $type     The image type to save the file as.
+	 * @param   array    $options  The image type options to use in saving the file.
+	 *                             For PNG and JPEG formats use `quality` key to set compression level (0..9 and 0..100)
+	 *
+	 * @return  boolean
+	 *
+	 * @link    http://www.php.net/manual/image.constants.php
+	 * @since   1.0
+	 * @throws  \LogicException
+	 */
+	public function toFile($path, $type = IMAGETYPE_JPEG, array $options = array())
+	{
+		switch ($type)
+		{
+			case IMAGETYPE_GIF:
+				return imagegif($this->getHandle(), $path);
+				break;
+
+			case IMAGETYPE_PNG:
+				return imagepng($this->getHandle(), $path, (array_key_exists('quality', $options)) ? $options['quality'] : 0);
+				break;
+		}
+
+		// Case IMAGETYPE_JPEG & default
+		return imagejpeg($this->getHandle(), $path, (array_key_exists('quality', $options)) ? $options['quality'] : 100);
+	}
+
+	/**
+	 * Method to get an image filter instance of a specified type.
+	 *
+	 * @param   string  $type  The image filter type to get.
+	 *
+	 * @return  ImageFilter
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	protected function getFilterInstance($type)
+	{
+		// Sanitize the filter type.
+		$type = strtolower(preg_replace('#[^A-Z0-9_]#i', '', $type));
+
+		// Verify that the filter type exists.
+		$className = 'Joomla\\Image\\Filter\\' . ucfirst($type);
+
+		if (!class_exists($className))
+		{
+			$this->getLogger()->error('The ' . ucfirst($type) . ' image filter is not available.');
+
+			throw new \RuntimeException('The ' . ucfirst($type) . ' image filter is not available.');
+		}
+
+		// Instantiate the filter object.
+		$instance = new $className($this->getHandle());
+
+		// Verify that the filter type is valid.
+		if (!($instance instanceof ImageFilter))
+		{
+			// @codeCoverageIgnoreStart
+			$this->getLogger()->error('The ' . ucfirst($type) . ' image filter is not valid.');
+
+			throw new \RuntimeException('The ' . ucfirst($type) . ' image filter is not valid.');
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		return $instance;
+	}
+
+	/**
+	 * Method to get the new dimensions for a resized image.
+	 *
+	 * @param   integer  $width        The width of the resized image in pixels.
+	 * @param   integer  $height       The height of the resized image in pixels.
+	 * @param   integer  $scaleMethod  The method to use for scaling
+	 *
+	 * @return  \stdClass
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException  If width, height or both given as zero
+	 */
+	protected function prepareDimensions($width, $height, $scaleMethod)
+	{
+		// Instantiate variables.
+		$dimensions = new \stdClass;
+
+		switch ($scaleMethod)
+		{
+			case self::SCALE_FILL:
+				$dimensions->width = (int) round($width);
+				$dimensions->height = (int) round($height);
+				break;
+
+			case self::SCALE_INSIDE:
+			case self::SCALE_OUTSIDE:
+			case self::SCALE_FIT:
+				$rx = ($width > 0) ? ($this->getWidth() / $width) : 0;
+				$ry = ($height > 0) ? ($this->getHeight() / $height) : 0;
+
+				if ($scaleMethod != self::SCALE_OUTSIDE)
+				{
+					$ratio = max($rx, $ry);
+				}
+				else
+				{
+					$ratio = min($rx, $ry);
+				}
+
+				$dimensions->width = (int) round($this->getWidth() / $ratio);
+				$dimensions->height = (int) round($this->getHeight() / $ratio);
+				break;
+
+			default:
+				throw new \InvalidArgumentException('Invalid scale method.');
+				break;
+		}
+
+		return $dimensions;
+	}
+
+	/**
+	 * Method to sanitize a height value.
+	 *
+	 * @param   mixed  $height  The input height value to sanitize.
+	 * @param   mixed  $width   The input width value for reference.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.0
+	 */
+	protected function sanitizeHeight($height, $width)
+	{
+		// If no height was given we will assume it is a square and use the width.
+		$height = ($height === null) ? $width : $height;
+
+		// If we were given a percentage, calculate the integer value.
+		if (preg_match('/^[0-9]+(\.[0-9]+)?\%$/', $height))
+		{
+			$height = (int) round($this->getHeight() * (float) str_replace('%', '', $height) / 100);
+		}
+		else
+		// Else do some rounding so we come out with a sane integer value.
+		{
+			$height = (int) round((float) $height);
+		}
+
+		return $height;
+	}
+
+	/**
+	 * Method to sanitize an offset value like left or top.
+	 *
+	 * @param   mixed  $offset  An offset value.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.0
+	 */
+	protected function sanitizeOffset($offset)
+	{
+		return (int) round((float) $offset);
+	}
+
+	/**
+	 * Method to sanitize a width value.
+	 *
+	 * @param   mixed  $width   The input width value to sanitize.
+	 * @param   mixed  $height  The input height value for reference.
+	 *
+	 * @return  integer
+	 *
+	 * @since   1.0
+	 */
+	protected function sanitizeWidth($width, $height)
+	{
+		// If no width was given we will assume it is a square and use the height.
+		$width = ($width === null) ? $height : $width;
+
+		// If we were given a percentage, calculate the integer value.
+		if (preg_match('/^[0-9]+(\.[0-9]+)?\%$/', $width))
+		{
+			$width = (int) round($this->getWidth() * (float) str_replace('%', '', $width) / 100);
+		}
+		else
+		// Else do some rounding so we come out with a sane integer value.
+		{
+			$width = (int) round((float) $width);
+		}
+
+		return $width;
+	}
+
+	/**
+	 * Method to destroy an image handle and
+	 * free the memory associated with the handle
+	 *
+	 * @return  boolean  True on success, false on failure or if no image is loaded
+	 *
+	 * @since   1.0
+	 */
+	public function destroy()
+	{
+		if ($this->isLoaded())
+		{
+			return imagedestroy($this->getHandle());
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to call the destroy() method one last time
+	 * to free any memory when the object is unset
+	 *
+	 * @see    Image::destroy()
+	 * @since  1.0
+	 */
+	public function __destruct()
+	{
+		$this->destroy();
+	}
+
+	/**
+	 * Method for set option of generate thumbnail method
+	 *
+	 * @param   boolean  $quality  True for best quality. False for best speed.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.4.0
+	 */
+	public function setThumbnailGenerate($quality = true)
+	{
+		$this->generateBestQuality = (boolean) $quality;
+	}
+}
diff --git a/core/libraries/vendor/joomla/image/src/ImageFilter.php b/core/libraries/vendor/joomla/image/src/ImageFilter.php
new file mode 100644
index 00000000..85a9ce7a
--- /dev/null
+++ b/core/libraries/vendor/joomla/image/src/ImageFilter.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Part of the Joomla Framework Image Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Image;
+
+use Psr\Log\NullLogger;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerAwareInterface;
+
+/**
+ * Class to manipulate an image.
+ *
+ * @since       1.0
+ * @deprecated  The joomla/image package is deprecated
+ */
+abstract class ImageFilter implements LoggerAwareInterface
+{
+	/**
+	 * @var    resource  The image resource handle.
+	 * @since  1.0
+	 */
+	protected $handle;
+
+	/**
+	 * @var    LoggerInterface  Logger object
+	 * @since  1.0
+	 */
+	protected $logger = null;
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param   resource  $handle  The image resource on which to apply the filter.
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 * @throws  \RuntimeException
+	 */
+	public function __construct($handle)
+	{
+		// Verify that image filter support for PHP is available.
+		if (!function_exists('imagefilter'))
+		{
+			// @codeCoverageIgnoreStart
+			$this->getLogger()->error('The imagefilter function for PHP is not available.');
+
+			throw new \RuntimeException('The imagefilter function for PHP is not available.');
+
+			// @codeCoverageIgnoreEnd
+		}
+
+		// Make sure the file handle is valid.
+		if (!is_resource($handle) || (get_resource_type($handle) != 'gd'))
+		{
+			$this->getLogger()->error('The image handle is invalid for the image filter.');
+
+			throw new \InvalidArgumentException('The image handle is invalid for the image filter.');
+		}
+
+		$this->handle = $handle;
+	}
+
+	/**
+	 * Get the logger.
+	 *
+	 * @return  LoggerInterface
+	 *
+	 * @since   1.0
+	 */
+	public function getLogger()
+	{
+		// If a logger hasn't been set, use NullLogger
+		if (! ($this->logger instanceof LoggerInterface))
+		{
+			$this->logger = new NullLogger;
+		}
+
+		return $this->logger;
+	}
+
+	/**
+	 * Sets a logger instance on the object
+	 *
+	 * @param   LoggerInterface  $logger  A PSR-3 compliant logger.
+	 *
+	 * @return  Image  This object for message chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function setLogger(LoggerInterface $logger)
+	{
+		$this->logger = $logger;
+
+		return $this;
+	}
+
+	/**
+	 * Method to apply a filter to an image resource.
+	 *
+	 * @param   array  $options  An array of options for the filter.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	abstract public function execute(array $options = array());
+}
diff --git a/core/libraries/vendor/joomla/input/LICENSE b/core/libraries/vendor/joomla/input/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/input/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/input/src/Cli.php b/core/libraries/vendor/joomla/input/src/Cli.php
new file mode 100644
index 00000000..dc489e0d
--- /dev/null
+++ b/core/libraries/vendor/joomla/input/src/Cli.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Part of the Joomla Framework Input Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Input;
+
+use Joomla\Filter;
+
+/**
+ * Joomla! Input CLI Class
+ *
+ * @since  1.0
+ */
+class Cli extends Input
+{
+	/**
+	 * The executable that was called to run the CLI script.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $executable;
+
+	/**
+	 * The additional arguments passed to the script that are not associated
+	 * with a specific argument name.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	public $args = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is $_REQUEST)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+
+		// Get the command line options
+		$this->parseArguments();
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Method to serialize the input.
+	 *
+	 * @return  string  The serialized input.
+	 *
+	 * @since   1.0
+	 */
+	public function serialize()
+	{
+		// Load all of the inputs.
+		$this->loadAllInputs();
+
+		// Remove $_ENV and $_SERVER from the inputs.
+		$inputs = $this->inputs;
+		unset($inputs['env']);
+		unset($inputs['server']);
+
+		// Serialize the executable, args, options, data, and inputs.
+		return serialize(array($this->executable, $this->args, $this->options, $this->data, $inputs));
+	}
+
+	/**
+	 * Gets a value from the input data.
+	 *
+	 * @param   string  $name     Name of the value to get.
+	 * @param   mixed   $default  Default value to return if variable does not exist.
+	 * @param   string  $filter   Filter to apply to the value.
+	 *
+	 * @return  mixed  The filtered input value.
+	 *
+	 * @since   1.0
+	 */
+	public function get($name, $default = null, $filter = 'string')
+	{
+		return parent::get($name, $default, $filter);
+	}
+
+	/**
+	 * Method to unserialize the input.
+	 *
+	 * @param   string  $input  The serialized input.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function unserialize($input)
+	{
+		// Unserialize the executable, args, options, data, and inputs.
+		list($this->executable, $this->args, $this->options, $this->data, $this->inputs) = unserialize($input);
+
+		// Load the filter.
+		if (isset($this->options['filter']))
+		{
+			$this->filter = $this->options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+	}
+
+	/**
+	 * Initialise the options and arguments
+	 *
+	 * Not supported: -abc c-value
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function parseArguments()
+	{
+		$argv = $_SERVER['argv'];
+
+		$this->executable = array_shift($argv);
+
+		$out = array();
+
+		for ($i = 0, $j = count($argv); $i < $j; $i++)
+		{
+			$arg = $argv[$i];
+
+			// --foo --bar=baz
+			if (substr($arg, 0, 2) === '--')
+			{
+				$eqPos = strpos($arg, '=');
+
+				// --foo
+				if ($eqPos === false)
+				{
+					$key = substr($arg, 2);
+
+					// --foo value
+					if ($i + 1 < $j && $argv[$i + 1][0] !== '-')
+					{
+						$value          = $argv[$i + 1];
+						$i++;
+					}
+					else
+					{
+						$value          = isset($out[$key]) ? $out[$key] : true;
+					}
+
+					$out[$key]          = $value;
+				}
+
+				// --bar=baz
+				else
+				{
+					$key                = substr($arg, 2, $eqPos - 2);
+					$value              = substr($arg, $eqPos + 1);
+					$out[$key]          = $value;
+				}
+			}
+			// -k=value -abc
+			elseif (substr($arg, 0, 1) === '-')
+			{
+				// -k=value
+				if (substr($arg, 2, 1) === '=')
+				{
+					$key                = substr($arg, 1, 1);
+					$value              = substr($arg, 3);
+					$out[$key]          = $value;
+				}
+				// -abc
+				else
+				{
+					$chars              = str_split(substr($arg, 1));
+
+					foreach ($chars as $char)
+					{
+						$key            = $char;
+						$value          = isset($out[$key]) ? $out[$key] : true;
+						$out[$key]      = $value;
+					}
+
+					// -a a-value
+					if ((count($chars) === 1) && ($i + 1 < $j) && ($argv[$i + 1][0] !== '-'))
+					{
+						$out[$key]      = $argv[$i + 1];
+						$i++;
+					}
+				}
+			}
+			// Plain-arg
+			else
+			{
+				$this->args[] = $arg;
+			}
+		}
+
+		$this->data = $out;
+	}
+}
diff --git a/core/libraries/vendor/joomla/input/src/Cookie.php b/core/libraries/vendor/joomla/input/src/Cookie.php
new file mode 100644
index 00000000..e36b7ea6
--- /dev/null
+++ b/core/libraries/vendor/joomla/input/src/Cookie.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Part of the Joomla Framework Input Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Input;
+
+use Joomla\Filter;
+
+/**
+ * Joomla! Input Cookie Class
+ *
+ * @since  1.0
+ */
+class Cookie extends Input
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Ignored.
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+
+		// Set the data source.
+		$this->data = & $_COOKIE;
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Sets a value
+	 *
+	 * @param   string   $name      Name of the value to set.
+	 * @param   mixed    $value     Value to assign to the input.
+	 * @param   integer  $expire    The time the cookie expires. This is a Unix timestamp so is in number
+	 *                              of seconds since the epoch. In other words, you'll most likely set this
+	 *                              with the time() function plus the number of seconds before you want it
+	 *                              to expire. Or you might use mktime(). time()+60*60*24*30 will set the
+	 *                              cookie to expire in 30 days. If set to 0, or omitted, the cookie will
+	 *                              expire at the end of the session (when the browser closes).
+	 * @param   string   $path      The path on the server in which the cookie will be available on. If set
+	 *                              to '/', the cookie will be available within the entire domain. If set to
+	 *                              '/foo/', the cookie will only be available within the /foo/ directory and
+	 *                              all sub-directories such as /foo/bar/ of domain. The default value is the
+	 *                              current directory that the cookie is being set in.
+	 * @param   string   $domain    The domain that the cookie is available to. To make the cookie available
+	 *                              on all subdomains of example.com (including example.com itself) then you'd
+	 *                              set it to '.example.com'. Although some browsers will accept cookies without
+	 *                              the initial ., RFC 2109 requires it to be included. Setting the domain to
+	 *                              'www.example.com' or '.www.example.com' will make the cookie only available
+	 *                              in the www subdomain.
+	 * @param   boolean  $secure    Indicates that the cookie should only be transmitted over a secure HTTPS
+	 *                              connection from the client. When set to TRUE, the cookie will only be set
+	 *                              if a secure connection exists. On the server-side, it's on the programmer
+	 *                              to send this kind of cookie only on secure connection (e.g. with respect
+	 *                              to $_SERVER["HTTPS"]).
+	 * @param   boolean  $httpOnly  When TRUE the cookie will be made accessible only through the HTTP protocol.
+	 *                              This means that the cookie won't be accessible by scripting languages, such
+	 *                              as JavaScript. This setting can effectively help to reduce identity theft
+	 *                              through XSS attacks (although it is not supported by all browsers).
+	 *
+	 * @return  void
+	 *
+	 * @link    http://www.ietf.org/rfc/rfc2109.txt
+	 * @see     setcookie()
+	 * @since   1.0
+	 */
+	public function set($name, $value, $expire = 0, $path = '', $domain = '', $secure = false, $httpOnly = false)
+	{
+		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
+
+		$this->data[$name] = $value;
+	}
+}
diff --git a/core/libraries/vendor/joomla/input/src/Files.php b/core/libraries/vendor/joomla/input/src/Files.php
new file mode 100644
index 00000000..49533a5a
--- /dev/null
+++ b/core/libraries/vendor/joomla/input/src/Files.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Part of the Joomla Framework Input Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Input;
+
+use Joomla\Filter;
+
+/**
+ * Joomla! Input Files Class
+ *
+ * @since  1.0
+ */
+class Files extends Input
+{
+	/**
+	 * The pivoted data from a $_FILES or compatible array.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $decodedData = array();
+
+	/**
+	 * The class constructor.
+	 *
+	 * @param   array  $source   The source argument is ignored. $_FILES is always used.
+	 * @param   array  $options  An optional array of configuration options:
+	 *                           filter : a custom JFilterInput object.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+
+		// Set the data source.
+		$this->data = & $_FILES;
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Gets a value from the input data.
+	 *
+	 * @param   string  $name     The name of the input property (usually the name of the files INPUT tag) to get.
+	 * @param   mixed   $default  The default value to return if the named property does not exist.
+	 * @param   string  $filter   The filter to apply to the value.
+	 *
+	 * @return  mixed  The filtered input value.
+	 *
+	 * @see     \Joomla\Filter\InputFilter::clean()
+	 * @since   1.0
+	 */
+	public function get($name, $default = null, $filter = 'cmd')
+	{
+		if (isset($this->data[$name]))
+		{
+			$results = $this->decodeData(
+				array(
+					$this->data[$name]['name'],
+					$this->data[$name]['type'],
+					$this->data[$name]['tmp_name'],
+					$this->data[$name]['error'],
+					$this->data[$name]['size']
+				)
+			);
+
+			return $results;
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Method to decode a data array.
+	 *
+	 * @param   array  $data  The data array to decode.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	protected function decodeData(array $data)
+	{
+		$result = array();
+
+		if (is_array($data[0]))
+		{
+			foreach ($data[0] as $k => $v)
+			{
+				$result[$k] = $this->decodeData(array($data[0][$k], $data[1][$k], $data[2][$k], $data[3][$k], $data[4][$k]));
+			}
+
+			return $result;
+		}
+
+		return array('name' => $data[0], 'type' => $data[1], 'tmp_name' => $data[2], 'error' => $data[3], 'size' => $data[4]);
+	}
+
+	/**
+	 * Sets a value.
+	 *
+	 * @param   string  $name   The name of the input property to set.
+	 * @param   mixed   $value  The value to assign to the input property.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function set($name, $value)
+	{
+		// Restricts the usage of parent's set method.
+	}
+}
diff --git a/core/libraries/vendor/joomla/input/src/Input.php b/core/libraries/vendor/joomla/input/src/Input.php
new file mode 100644
index 00000000..ecb4343e
--- /dev/null
+++ b/core/libraries/vendor/joomla/input/src/Input.php
@@ -0,0 +1,439 @@
+<?php
+/**
+ * Part of the Joomla Framework Input Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Input;
+
+use Joomla\Filter;
+
+/**
+ * Joomla! Input Base Class
+ *
+ * This is an abstracted input class used to manage retrieving data from the application environment.
+ *
+ * @since  1.0
+ *
+ * @property-read    Input   $get
+ * @property-read    Input   $post
+ * @property-read    Input   $request
+ * @property-read    Input   $server
+ * @property-read    Input   $env
+ * @property-read    Files   $files
+ * @property-read    Cookie  $cookie
+ *
+ * @method      integer  getInt($name, $default = null)       Get a signed integer.
+ * @method      integer  getUint($name, $default = null)      Get an unsigned integer.
+ * @method      float    getFloat($name, $default = null)     Get a floating-point number.
+ * @method      boolean  getBool($name, $default = null)      Get a boolean value.
+ * @method      string   getWord($name, $default = null)      Get a word.
+ * @method      string   getAlnum($name, $default = null)     Get an alphanumeric string.
+ * @method      string   getCmd($name, $default = null)       Get a CMD filtered string.
+ * @method      string   getBase64($name, $default = null)    Get a base64 encoded string.
+ * @method      string   getString($name, $default = null)    Get a string.
+ * @method      string   getHtml($name, $default = null)      Get a HTML string.
+ * @method      string   getPath($name, $default = null)      Get a file path.
+ * @method      string   getUsername($name, $default = null)  Get a username.
+ */
+class Input implements \Serializable, \Countable
+{
+	/**
+	 * Container with allowed superglobals
+	 *
+	 * @var    array
+	 * @since  1.3.0
+	 * @note   Once PHP 7.1 is the minimum supported version this should become a private constant
+	 */
+	private static $allowedGlobals = array('REQUEST', 'GET', 'POST', 'FILES', 'SERVER', 'ENV');
+
+	/**
+	 * Options array for the Input instance.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $options = array();
+
+	/**
+	 * Filter object to use.
+	 *
+	 * @var    Filter\InputFilter
+	 * @since  1.0
+	 */
+	protected $filter = null;
+
+	/**
+	 * Input data.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $data = array();
+
+	/**
+	 * Input objects
+	 *
+	 * @var    Input[]
+	 * @since  1.0
+	 */
+	protected $inputs = array();
+
+	/**
+	 * Is all GLOBAL added
+	 *
+	 * @var    boolean
+	 * @since  1.1.4
+	 */
+	protected static $loaded = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Optional source data. If omitted, a copy of the server variable '_REQUEST' is used.
+	 * @param   array  $options  An optional associative array of configuration parameters:
+	 *                           filter: An instance of Filter\Input. If omitted, a default filter is initialised.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+
+		if (is_null($source))
+		{
+			$this->data = &$_REQUEST;
+		}
+		else
+		{
+			$this->data = $source;
+		}
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Magic method to get an input object
+	 *
+	 * @param   mixed  $name  Name of the input object to retrieve.
+	 *
+	 * @return  Input  The request input object
+	 *
+	 * @since   1.0
+	 */
+	public function __get($name)
+	{
+		if (isset($this->inputs[$name]))
+		{
+			return $this->inputs[$name];
+		}
+
+		$className = '\\Joomla\\Input\\' . ucfirst($name);
+
+		if (class_exists($className))
+		{
+			$this->inputs[$name] = new $className(null, $this->options);
+
+			return $this->inputs[$name];
+		}
+
+		$superGlobal = '_' . strtoupper($name);
+
+		if (in_array(strtoupper($name), self::$allowedGlobals, true) && isset($GLOBALS[$superGlobal]))
+		{
+			$this->inputs[$name] = new Input($GLOBALS[$superGlobal], $this->options);
+
+			return $this->inputs[$name];
+		}
+
+		// TODO throw an exception
+	}
+
+	/**
+	 * Get the number of variables.
+	 *
+	 * @return  integer  The number of variables in the input.
+	 *
+	 * @since   1.0
+	 * @see     Countable::count()
+	 */
+	public function count()
+	{
+		return count($this->data);
+	}
+
+	/**
+	 * Gets a value from the input data.
+	 *
+	 * @param   string  $name     Name of the value to get.
+	 * @param   mixed   $default  Default value to return if variable does not exist.
+	 * @param   string  $filter   Filter to apply to the value.
+	 *
+	 * @return  mixed  The filtered input value.
+	 *
+	 * @see     \Joomla\Filter\InputFilter::clean()
+	 * @since   1.0
+	 */
+	public function get($name, $default = null, $filter = 'cmd')
+	{
+		if (isset($this->data[$name]))
+		{
+			return $this->filter->clean($this->data[$name], $filter);
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Gets an array of values from the request.
+	 *
+	 * @param   array  $vars        Associative array of keys and filter types to apply.
+	 *                              If empty and datasource is null, all the input data will be returned
+	 *                              but filtered using the default case in JFilterInput::clean.
+	 * @param   mixed  $datasource  Array to retrieve data from, or null
+	 *
+	 * @return  mixed  The filtered input data.
+	 *
+	 * @since   1.0
+	 */
+	public function getArray(array $vars = array(), $datasource = null)
+	{
+		if (empty($vars) && is_null($datasource))
+		{
+			$vars = $this->data;
+		}
+
+		$results = array();
+
+		foreach ($vars as $k => $v)
+		{
+			if (is_array($v))
+			{
+				if (is_null($datasource))
+				{
+					$results[$k] = $this->getArray($v, $this->get($k, null, 'array'));
+				}
+				else
+				{
+					$results[$k] = $this->getArray($v, $datasource[$k]);
+				}
+			}
+			else
+			{
+				if (is_null($datasource))
+				{
+					$results[$k] = $this->get($k, null, $v);
+				}
+				elseif (isset($datasource[$k]))
+				{
+					$results[$k] = $this->filter->clean($datasource[$k], $v);
+				}
+				else
+				{
+					$results[$k] = $this->filter->clean(null, $v);
+				}
+			}
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Get the Input instance holding the data for the current request method
+	 *
+	 * @return  Input
+	 *
+	 * @since   1.3.0
+	 */
+	public function getInputForRequestMethod()
+	{
+		switch (strtoupper($this->getMethod()))
+		{
+			case 'GET':
+				return $this->get;
+
+			case 'POST':
+				return $this->post;
+
+			default:
+				// PUT, PATCH, etc. don't have superglobals
+				return $this;
+		}
+	}
+
+	/**
+	 * Sets a value
+	 *
+	 * @param   string  $name   Name of the value to set.
+	 * @param   mixed   $value  Value to assign to the input.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function set($name, $value)
+	{
+		$this->data[$name] = $value;
+	}
+
+	/**
+	 * Define a value. The value will only be set if there's no value for the name or if it is null.
+	 *
+	 * @param   string  $name   Name of the value to define.
+	 * @param   mixed   $value  Value to assign to the input.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function def($name, $value)
+	{
+		if (isset($this->data[$name]))
+		{
+			return;
+		}
+
+		$this->data[$name] = $value;
+	}
+
+	/**
+	 * Check if a value name exists.
+	 *
+	 * @param   string  $name  Value name
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.2.0
+	 */
+	public function exists($name)
+	{
+		return isset($this->data[$name]);
+	}
+
+	/**
+	 * Magic method to get filtered input data.
+	 *
+	 * @param   string  $name       Name of the filter type prefixed with 'get'.
+	 * @param   array   $arguments  [0] The name of the variable [1] The default value.
+	 *
+	 * @return  mixed   The filtered input value.
+	 *
+	 * @since   1.0
+	 */
+	public function __call($name, $arguments)
+	{
+		if (substr($name, 0, 3) == 'get')
+		{
+			$filter = substr($name, 3);
+
+			$default = null;
+
+			if (isset($arguments[1]))
+			{
+				$default = $arguments[1];
+			}
+
+			return $this->get($arguments[0], $default, $filter);
+		}
+	}
+
+	/**
+	 * Gets the request method.
+	 *
+	 * @return  string   The request method.
+	 *
+	 * @since   1.0
+	 */
+	public function getMethod()
+	{
+		$method = strtoupper($_SERVER['REQUEST_METHOD']);
+
+		return $method;
+	}
+
+	/**
+	 * Method to serialize the input.
+	 *
+	 * @return  string  The serialized input.
+	 *
+	 * @since   1.0
+	 */
+	public function serialize()
+	{
+		// Load all of the inputs.
+		$this->loadAllInputs();
+
+		// Remove $_ENV and $_SERVER from the inputs.
+		$inputs = $this->inputs;
+		unset($inputs['env']);
+		unset($inputs['server']);
+
+		// Serialize the options, data, and inputs.
+		return serialize(array($this->options, $this->data, $inputs));
+	}
+
+	/**
+	 * Method to unserialize the input.
+	 *
+	 * @param   string  $input  The serialized input.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function unserialize($input)
+	{
+		// Unserialize the options, data, and inputs.
+		list($this->options, $this->data, $this->inputs) = unserialize($input);
+
+		// Load the filter.
+		if (isset($this->options['filter']))
+		{
+			$this->filter = $this->options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+	}
+
+	/**
+	 * Method to load all of the global inputs.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function loadAllInputs()
+	{
+		if (!self::$loaded)
+		{
+			// Load up all the globals.
+			foreach ($GLOBALS as $global => $data)
+			{
+				// Check if the global starts with an underscore and is allowed.
+				if (strpos($global, '_') === 0 && in_array(substr($global, 1), self::$allowedGlobals, true))
+				{
+					// Convert global name to input name.
+					$global = strtolower($global);
+					$global = substr($global, 1);
+
+					// Get the input.
+					$this->$global;
+				}
+			}
+
+			self::$loaded = true;
+		}
+	}
+}
diff --git a/core/libraries/vendor/joomla/input/src/Json.php b/core/libraries/vendor/joomla/input/src/Json.php
new file mode 100644
index 00000000..12a75249
--- /dev/null
+++ b/core/libraries/vendor/joomla/input/src/Json.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Part of the Joomla Framework Input Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Input;
+
+use Joomla\Filter;
+
+/**
+ * Joomla! Input JSON Class
+ *
+ * This class decodes a JSON string from the raw request data and makes it available via
+ * the standard Input interface.
+ *
+ * @since  1.0
+ */
+class Json extends Input
+{
+	/**
+	 * @var    string  The raw JSON string from the request.
+	 * @since  1.0
+	 */
+	private $raw;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $source   Source data (Optional, default is the raw HTTP input decoded from JSON)
+	 * @param   array  $options  Array of configuration parameters (Optional)
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($source = null, array $options = array())
+	{
+		if (isset($options['filter']))
+		{
+			$this->filter = $options['filter'];
+		}
+		else
+		{
+			$this->filter = new Filter\InputFilter;
+		}
+
+		if (is_null($source))
+		{
+			$this->raw = file_get_contents('php://input');
+
+			// This is a workaround for where php://input has already been read.
+			// See note under php://input on http://php.net/manual/en/wrappers.php.php
+			if (empty($this->raw) && isset($GLOBALS['HTTP_RAW_POST_DATA']))
+			{
+				$this->raw = $GLOBALS['HTTP_RAW_POST_DATA'];
+			}
+
+			$this->data = json_decode($this->raw, true);
+
+			if (!is_array($this->data))
+			{
+				$this->data = array();
+			}
+		}
+		else
+		{
+			$this->data = $source;
+		}
+
+		// Set the options for the class.
+		$this->options = $options;
+	}
+
+	/**
+	 * Gets the raw JSON string from the request.
+	 *
+	 * @return  string  The raw JSON string from the request.
+	 *
+	 * @since   1.0
+	 */
+	public function getRaw()
+	{
+		return $this->raw;
+	}
+}
diff --git a/core/libraries/vendor/joomla/ldap/LICENSE b/core/libraries/vendor/joomla/ldap/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/ldap/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/ldap/src/LdapClient.php b/core/libraries/vendor/joomla/ldap/src/LdapClient.php
new file mode 100644
index 00000000..fd245934
--- /dev/null
+++ b/core/libraries/vendor/joomla/ldap/src/LdapClient.php
@@ -0,0 +1,807 @@
+<?php
+/**
+ * Part of the Joomla Framework LDAP Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Ldap;
+
+/**
+ * LDAP client class
+ *
+ * @since       1.0
+ * @deprecated  The joomla/ldap package is deprecated
+ */
+class LdapClient
+{
+	/**
+	 * Hostname of LDAP server
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $host = null;
+
+	/**
+	 * Authorization Method to use
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	public $auth_method = null;
+
+	/**
+	 * Port of LDAP server
+	 *
+	 * @var    integer
+	 * @since  1.0
+	 */
+	public $port = null;
+
+	/**
+	 * Base DN (e.g. o=MyDir)
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $base_dn = null;
+
+	/**
+	 * User DN (e.g. cn=Users,o=MyDir)
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $users_dn = null;
+
+	/**
+	 * Search String
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $search_string = null;
+
+	/**
+	 * Use LDAP Version 3
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	public $use_ldapV3 = null;
+
+	/**
+	 * No referrals (server transfers)
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	public $no_referrals = null;
+
+	/**
+	 * Negotiate TLS (encrypted communications)
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	public $negotiate_tls = null;
+
+	/**
+	 * Username to connect to server
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $username = null;
+
+	/**
+	 * Password to connect to server
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	public $password = null;
+
+	/**
+	 * LDAP Resource Identifier
+	 *
+	 * @var    resource
+	 * @since  1.0
+	 */
+	private $resource = null;
+
+	/**
+	 * Current DN
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	private $dn = null;
+
+	/**
+	 * Flag tracking whether the connection has been bound
+	 *
+	 * @var    boolean
+	 * @since  1.3.0
+	 */
+	private $isBound = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  $configObj  An object of configuration variables
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($configObj = null)
+	{
+		if (is_object($configObj))
+		{
+			$vars = get_class_vars(get_class($this));
+
+			foreach (array_keys($vars) as $var)
+			{
+				if (substr($var, 0, 1) != '_')
+				{
+					$param = $configObj->get($var);
+
+					if ($param)
+					{
+						$this->$var = $param;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Class destructor.
+	 *
+	 * @since   1.3.0
+	 */
+	public function __destruct()
+	{
+		$this->close();
+	}
+
+	/**
+	 * Connect to an LDAP server
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function connect()
+	{
+		if ($this->host == '')
+		{
+			return false;
+		}
+
+		$this->resource = ldap_connect($this->host, $this->port);
+
+		if (!$this->resource)
+		{
+			return false;
+		}
+
+		if ($this->use_ldapV3 && !ldap_set_option($this->resource, LDAP_OPT_PROTOCOL_VERSION, 3))
+		{
+			return false;
+		}
+
+		if (!ldap_set_option($this->resource, LDAP_OPT_REFERRALS, (int) $this->no_referrals))
+		{
+			return false;
+		}
+
+		if ($this->negotiate_tls && !ldap_start_tls($this->resource))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Close the connection
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function close()
+	{
+		if ($this->isConnected())
+		{
+			$this->unbind();
+		}
+
+		$this->resource = null;
+	}
+
+	/**
+	 * Sets the DN with some template replacements
+	 *
+	 * @param   string  $username  The username
+	 * @param   string  $nosub     ...
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setDn($username, $nosub = 0)
+	{
+		if ($this->users_dn == '' || $nosub)
+		{
+			$this->dn = $username;
+		}
+		elseif (strlen($username))
+		{
+			$this->dn = str_replace('[username]', $username, $this->users_dn);
+		}
+		else
+		{
+			$this->dn = '';
+		}
+	}
+
+	/**
+	 * Get the configured DN
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function getDn()
+	{
+		return $this->dn;
+	}
+
+	/**
+	 * Anonymously binds to LDAP directory
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function anonymous_bind()
+	{
+		if (!$this->isConnected())
+		{
+			if (!$this->connect())
+			{
+				return false;
+			}
+		}
+
+		$this->isBound = ldap_bind($this->resource);
+
+		return $this->isBound;
+	}
+
+	/**
+	 * Binds to the LDAP directory
+	 *
+	 * @param   string  $username  The username
+	 * @param   string  $password  The password
+	 * @param   string  $nosub     ...
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function bind($username = null, $password = null, $nosub = 0)
+	{
+		if (!$this->isConnected())
+		{
+			if (!$this->connect())
+			{
+				return false;
+			}
+		}
+
+		if (is_null($username))
+		{
+			$username = $this->username;
+		}
+
+		if (is_null($password))
+		{
+			$password = $this->password;
+		}
+
+		$this->setDn($username, $nosub);
+
+		$this->isBound = ldap_bind($this->resource, $this->getDn(), $password);
+
+		return $this->isBound;
+	}
+
+	/**
+	 * Unbinds from the LDAP directory
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.3.0
+	 */
+	public function unbind()
+	{
+		if ($this->isBound && $this->resource && is_resource($this->resource))
+		{
+			return ldap_unbind($this->resource);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Perform an LDAP search using comma separated search strings
+	 *
+	 * @param   string  $search  search string of search values
+	 *
+	 * @return  array  Search results
+	 *
+	 * @since   1.0
+	 */
+	public function simple_search($search)
+	{
+		$results = explode(';', $search);
+
+		foreach ($results as $key => $result)
+		{
+			$results[$key] = '(' . $result . ')';
+		}
+
+		return $this->search($results);
+	}
+
+	/**
+	 * Performs an LDAP search
+	 *
+	 * @param   array   $filters     Search Filters (array of strings)
+	 * @param   string  $dnoverride  DN Override
+	 * @param   array   $attributes  An array of attributes to return (if empty, all fields are returned).
+	 *
+	 * @return  array  Multidimensional array of results
+	 *
+	 * @since   1.0
+	 */
+	public function search(array $filters, $dnoverride = null, array $attributes = array())
+	{
+		$result = array();
+
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return $result;
+		}
+
+		if ($dnoverride)
+		{
+			$dn = $dnoverride;
+		}
+		else
+		{
+			$dn = $this->base_dn;
+		}
+
+		foreach ($filters as $searchFilter)
+		{
+			$searchResult = ldap_search($this->resource, $dn, $searchFilter, $attributes);
+
+			if ($searchResult && ($count = ldap_count_entries($this->resource, $searchResult)) > 0)
+			{
+				for ($i = 0; $i < $count; $i++)
+				{
+					$result[$i] = array();
+
+					if (!$i)
+					{
+						$firstentry = ldap_first_entry($this->resource, $searchResult);
+					}
+					else
+					{
+						$firstentry = ldap_next_entry($this->resource, $firstentry);
+					}
+
+					// Load user-specified attributes
+					$attributeResult = ldap_get_attributes($this->resource, $firstentry);
+
+					// LDAP returns an array of arrays, fit this into attributes result array
+					foreach ($attributeResult as $ki => $ai)
+					{
+						if (is_array($ai))
+						{
+							$subcount = $ai['count'];
+							$result[$i][$ki] = array();
+
+							for ($k = 0; $k < $subcount; $k++)
+							{
+								$result[$i][$ki][$k] = $ai[$k];
+							}
+						}
+					}
+
+					$result[$i]['dn'] = ldap_get_dn($this->resource, $firstentry);
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Replace attribute values with new ones
+	 *
+	 * @param   string  $dn         The DN which contains the attribute you want to replace
+	 * @param   string  $attribute  The attribute values you want to replace
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function replace($dn, $attribute)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_mod_replace($this->resource, $dn, $attribute);
+	}
+
+	/**
+	 * Modify an LDAP entry
+	 *
+	 * @param   string  $dn         The DN which contains the attribute you want to modify
+	 * @param   string  $attribute  The attribute values you want to modify
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function modify($dn, $attribute)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_modify($this->resource, $dn, $attribute);
+	}
+
+	/**
+	 * Delete attribute values from current attributes
+	 *
+	 * @param   string  $dn         The DN which contains the attribute you want to remove
+	 * @param   string  $attribute  The attribute values you want to remove
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function remove($dn, $attribute)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_mod_del($this->resource, $dn, $attribute);
+	}
+
+	/**
+	 * Compare value of attribute found in entry specified with DN
+	 *
+	 * @param   string  $dn         The DN which contains the attribute you want to compare
+	 * @param   string  $attribute  The attribute whose value you want to compare
+	 * @param   string  $value      The value you want to check against the LDAP attribute
+	 *
+	 * @return  boolean|integer  Boolean result of the comparison or -1 on error
+	 *
+	 * @since   1.0
+	 */
+	public function compare($dn, $attribute, $value)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_compare($this->resource, $dn, $attribute, $value);
+	}
+
+	/**
+	 * Read attributes of a given DN
+	 *
+	 * @param   string  $dn  The DN of the object you want to read
+	 *
+	 * @return  array|boolean  Array of attributes for the given DN or boolean false on failure
+	 *
+	 * @since   1.0
+	 */
+	public function read($dn)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		$base = substr($dn, strpos($dn, ',') + 1);
+		$cn = substr($dn, 0, strpos($dn, ','));
+		$result = ldap_read($this->resource, $base, $cn);
+
+		if ($result === false)
+		{
+			return false;
+		}
+
+		return ldap_get_entries($this->resource, $result);
+	}
+
+	/**
+	 * Delete an entry from a directory
+	 *
+	 * @param   string  $dn  The DN of the object you want to delete
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function delete($dn)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_delete($this->resource, $dn);
+	}
+
+	/**
+	 * Add entries to LDAP directory
+	 *
+	 * @param   string  $dn       The DN where you want to put the object
+	 * @param   array   $entries  An array of arrays describing the object to add
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function create($dn, array $entries)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_add($this->resource, $dn, $entries);
+	}
+
+	/**
+	 * Add attribute values to current attributes
+	 *
+	 * @param   string  $dn     The DN of the entry to add the attribute
+	 * @param   array   $entry  An array of arrays with attributes to add
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function add($dn, array $entry)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_mod_add($this->resource, $dn, $entry);
+	}
+
+	/**
+	 * Modify the name of an entry
+	 *
+	 * @param   string   $dn           The DN of the entry at the moment
+	 * @param   string   $newdn        The DN of the entry should be (only cn=newvalue)
+	 * @param   string   $newparent    The full DN of the parent (null by default)
+	 * @param   boolean  $deleteolddn  Delete the old values (default)
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function rename($dn, $newdn, $newparent, $deleteolddn)
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return false;
+		}
+
+		return ldap_rename($this->resource, $dn, $newdn, $newparent, $deleteolddn);
+	}
+
+	/**
+	 * Escape a string
+	 *
+	 * @param   string   $value   The subject string
+	 * @param   string   $ignore  Characters to ignore when escaping.
+	 * @param   integer  $flags   The context the escaped string will be used in LDAP_ESCAPE_FILTER or LDAP_ESCAPE_DN
+	 *
+	 * @return  string
+	 *
+	 * @since   1.2.0
+	 */
+	public function escape($value, $ignore = '', $flags = 0)
+	{
+		return ldap_escape($value, $ignore, $flags);
+	}
+
+	/**
+	 * Return the LDAP error message of the last LDAP command
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function getErrorMsg()
+	{
+		if (!$this->isBound || !$this->isConnected())
+		{
+			return '';
+		}
+
+		return ldap_error($this->resource);
+	}
+
+	/**
+	 * Check if the connection is established
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.3.0
+	 */
+	public function isConnected()
+	{
+		return $this->resource && is_resource($this->resource);
+	}
+
+	/**
+	 * Converts a dot notation IP address to net address (e.g. for Netware, etc)
+	 *
+	 * @param   string  $ip  IP Address (e.g. xxx.xxx.xxx.xxx)
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public static function ipToNetAddress($ip)
+	{
+		$parts = explode('.', $ip);
+		$address = '1#';
+
+		foreach ($parts as $int)
+		{
+			$tmp = dechex($int);
+
+			if (strlen($tmp) != 2)
+			{
+				$tmp = '0' . $tmp;
+			}
+
+			$address .= '\\' . $tmp;
+		}
+
+		return $address;
+	}
+
+	/**
+	 * Extract readable network address from the LDAP encoded networkAddress attribute.
+	 *
+	 * Please keep this document block and author attribution in place.
+	 *
+	 * Novell Docs, see: http://developer.novell.com/ndk/doc/ndslib/schm_enu/data/sdk5624.html#sdk5624
+	 * for Address types: http://developer.novell.com/ndk/doc/ndslib/index.html?page=/ndk/doc/ndslib/schm_enu/data/sdk4170.html
+	 * LDAP Format, String:
+	 * taggedData = uint32String "#" octetstring
+	 * byte 0 = uint32String = Address Type: 0= IPX Address; 1 = IP Address
+	 * byte 1 = char = "#" - separator
+	 * byte 2+ = octetstring - the ordinal value of the address
+	 * Note: with eDirectory 8.6.2, the IP address (type 1) returns
+	 * correctly, however, an IPX address does not seem to.  eDir 8.7 may correct this.
+	 * Enhancement made by Merijn van de Schoot:
+	 * If addresstype is 8 (UDP) or 9 (TCP) do some additional parsing like still returning the IP address
+	 *
+	 * @param   string  $networkaddress  The network address
+	 *
+	 * @return  array
+	 *
+	 * @author  Jay Burrell, Systems & Networks, Mississippi State University
+	 * @since   1.0
+	 */
+	public static function ldapNetAddr($networkaddress)
+	{
+		$addr = "";
+		$addrtype = (int) substr($networkaddress, 0, 1);
+
+		// Throw away bytes 0 and 1 which should be the addrtype and the "#" separator
+		$networkaddress = substr($networkaddress, 2);
+
+		if (($addrtype == 8) || ($addrtype = 9))
+		{
+			// TODO 1.6: If UDP or TCP, (TODO fill addrport and) strip portnumber information from address
+			$networkaddress = substr($networkaddress, (strlen($networkaddress) - 4));
+		}
+
+		$addrtypes = array(
+			'IPX',
+			'IP',
+			'SDLC',
+			'Token Ring',
+			'OSI',
+			'AppleTalk',
+			'NetBEUI',
+			'Socket',
+			'UDP',
+			'TCP',
+			'UDP6',
+			'TCP6',
+			'Reserved (12)',
+			'URL',
+			'Count'
+		);
+
+		$len = strlen($networkaddress);
+
+		if ($len > 0)
+		{
+			for ($i = 0; $i < $len; $i++)
+			{
+				$byte = substr($networkaddress, $i, 1);
+				$addr .= ord($byte);
+
+				if (($addrtype == 1) || ($addrtype == 8) || ($addrtype = 9))
+				{
+					// Dot separate IP addresses...
+					$addr .= ".";
+				}
+			}
+
+			if (($addrtype == 1) || ($addrtype == 8) || ($addrtype = 9))
+			{
+				// Strip last period from end of $addr
+				$addr = substr($addr, 0, strlen($addr) - 1);
+			}
+		}
+		else
+		{
+			$addr .= 'Address not available.';
+		}
+
+		return array('protocol' => $addrtypes[$addrtype], 'address' => $addr);
+	}
+
+	/**
+	 * Generates a LDAP compatible password
+	 *
+	 * @param   string  $password  Clear text password to encrypt
+	 * @param   string  $type      Type of password hash, either md5 or SHA
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public static function generatePassword($password, $type = 'md5')
+	{
+		switch (strtolower($type))
+		{
+			case 'sha':
+				return '{SHA}' . base64_encode(pack('H*', sha1($password)));
+
+			case 'md5':
+			default:
+				return '{MD5}' . base64_encode(pack('H*', md5($password)));
+		}
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/LICENSE b/core/libraries/vendor/joomla/registry/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/registry/src/AbstractRegistryFormat.php b/core/libraries/vendor/joomla/registry/src/AbstractRegistryFormat.php
new file mode 100644
index 00000000..b08cb051
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/AbstractRegistryFormat.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry;
+
+/**
+ * Abstract Format for Registry
+ *
+ * @since       1.0
+ * @deprecated  2.0  Format objects should directly implement the FormatInterface
+ */
+abstract class AbstractRegistryFormat implements FormatInterface
+{
+	/**
+	 * @var    AbstractRegistryFormat[]  Format instances container.
+	 * @since  1.0
+	 * @deprecated  2.0  Object caching will no longer be supported
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Returns a reference to a Format object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $type     The format to load
+	 * @param   array   $options  Additional options to configure the object
+	 *
+	 * @return  AbstractRegistryFormat  Registry format handler
+	 *
+	 * @deprecated  2.0  Use Factory::getFormat() instead
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public static function getInstance($type, array $options = array())
+	{
+		return Factory::getFormat($type, $options);
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Factory.php b/core/libraries/vendor/joomla/registry/src/Factory.php
new file mode 100644
index 00000000..6de86a50
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Factory.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry;
+
+/**
+ * Factory class to fetch Registry objects
+ *
+ * @since  1.5.0
+ */
+class Factory
+{
+	/**
+	 * Format instances container - for backward compatibility with AbstractRegistryFormat::getInstance().
+	 *
+	 * @var    FormatInterface[]
+	 * @since  1.5.0
+	 * @deprecated  2.0  Object caching will no longer be supported
+	 */
+	protected static $formatInstances = array();
+
+	/**
+	 * Returns an AbstractRegistryFormat object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $type     The format to load
+	 * @param   array   $options  Additional options to configure the object
+	 *
+	 * @return  FormatInterface  Registry format handler
+	 *
+	 * @since   1.5.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public static function getFormat($type, array $options = array())
+	{
+		// Sanitize format type.
+		$type = strtolower(preg_replace('/[^A-Z0-9_]/i', '', $type));
+
+		/*
+		 * Only instantiate the object if it doesn't already exist.
+		 * @deprecated 2.0 Object caching will no longer be supported, a new instance will be returned every time
+		 */
+		if (!isset(self::$formatInstances[$type]))
+		{
+			$localNamespace = __NAMESPACE__ . '\\Format';
+			$namespace      = isset($options['format_namespace']) ? $options['format_namespace'] : $localNamespace;
+			$class          = $namespace . '\\' . ucfirst($type);
+
+			if (!class_exists($class))
+			{
+				// Were we given a custom namespace?  If not, there's nothing else we can do
+				if ($namespace === $localNamespace)
+				{
+					throw new \InvalidArgumentException(sprintf('Unable to load format class for type "%s".', $type), 500);
+				}
+
+				$class = $localNamespace . '\\' . ucfirst($type);
+
+				if (!class_exists($class))
+				{
+					throw new \InvalidArgumentException(sprintf('Unable to load format class for type "%s".', $type), 500);
+				}
+			}
+
+			self::$formatInstances[$type] = new $class;
+		}
+
+		return self::$formatInstances[$type];
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Format/Ini.php b/core/libraries/vendor/joomla/registry/src/Format/Ini.php
new file mode 100644
index 00000000..1d96244f
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Format/Ini.php
@@ -0,0 +1,365 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry\Format;
+
+use Joomla\Registry\AbstractRegistryFormat;
+use Joomla\Utilities\ArrayHelper;
+use stdClass;
+
+/**
+ * INI format handler for Registry.
+ *
+ * @since  1.0
+ */
+class Ini extends AbstractRegistryFormat
+{
+	/**
+	 * Default options array
+	 *
+	 * @var    array
+	 * @since  1.3.0
+	 */
+	protected static $options = array(
+		'supportArrayValues' => false,
+		'parseBooleanWords'  => false,
+		'processSections'    => false,
+	);
+
+	/**
+	 * A cache used by stringToObject.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected static $cache = array();
+
+	/**
+	 * Converts an object into an INI formatted string
+	 * - Unfortunately, there is no way to have ini values nested further than two
+	 * levels deep.  Therefore we will only go through the first two levels of
+	 * the object.
+	 *
+	 * @param   object  $object   Data source object.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  string  INI formatted string.
+	 *
+	 * @since   1.0
+	 */
+	public function objectToString($object, $options = array())
+	{
+		$options            = array_merge(self::$options, $options);
+		$supportArrayValues = $options['supportArrayValues'];
+
+		$local  = array();
+		$global = array();
+
+		$variables = get_object_vars($object);
+
+		$last = count($variables);
+
+		// Assume that the first element is in section
+		$inSection = true;
+
+		// Iterate over the object to set the properties.
+		foreach ($variables as $key => $value)
+		{
+			// If the value is an object then we need to put it in a local section.
+			if (is_object($value))
+			{
+				// Add an empty line if previous string wasn't in a section
+				if (!$inSection)
+				{
+					$local[] = '';
+				}
+
+				// Add the section line.
+				$local[] = '[' . $key . ']';
+
+				// Add the properties for this section.
+				foreach (get_object_vars($value) as $k => $v)
+				{
+					if (is_array($v) && $supportArrayValues)
+					{
+						$assoc = ArrayHelper::isAssociative($v);
+
+						foreach ($v as $arrayKey => $item)
+						{
+							$arrayKey = $assoc ? $arrayKey : '';
+							$local[]  = $k . '[' . $arrayKey . ']=' . $this->getValueAsIni($item);
+						}
+					}
+					else
+					{
+						$local[] = $k . '=' . $this->getValueAsIni($v);
+					}
+				}
+
+				// Add empty line after section if it is not the last one
+				if (0 !== --$last)
+				{
+					$local[] = '';
+				}
+			}
+			elseif (is_array($value) && $supportArrayValues)
+			{
+				$assoc = ArrayHelper::isAssociative($value);
+
+				foreach ($value as $arrayKey => $item)
+				{
+					$arrayKey = $assoc ? $arrayKey : '';
+					$global[] = $key . '[' . $arrayKey . ']=' . $this->getValueAsIni($item);
+				}
+			}
+			else
+			{
+				// Not in a section so add the property to the global array.
+				$global[]  = $key . '=' . $this->getValueAsIni($value);
+				$inSection = false;
+			}
+		}
+
+		return implode("\n", array_merge($global, $local));
+	}
+
+	/**
+	 * Parse an INI formatted string and convert it into an object.
+	 *
+	 * @param   string  $data     INI formatted string to convert.
+	 * @param   array   $options  An array of options used by the formatter, or a boolean setting to process sections.
+	 *
+	 * @return  object   Data object.
+	 *
+	 * @since   1.0
+	 */
+	public function stringToObject($data, array $options = array())
+	{
+		$options = array_merge(self::$options, $options);
+
+		// Check the memory cache for already processed strings.
+		$hash = md5($data . ':' . (int) $options['processSections']);
+
+		if (isset(self::$cache[$hash]))
+		{
+			return self::$cache[$hash];
+		}
+
+		// If no lines present just return the object.
+		if (empty($data))
+		{
+			return new stdClass;
+		}
+
+		$obj     = new stdClass;
+		$section = false;
+		$array   = false;
+		$lines   = explode("\n", $data);
+
+		// Process the lines.
+		foreach ($lines as $line)
+		{
+			// Trim any unnecessary whitespace.
+			$line = trim($line);
+
+			// Ignore empty lines and comments.
+			if (empty($line) || ($line[0] === ';'))
+			{
+				continue;
+			}
+
+			if ($options['processSections'])
+			{
+				$length = strlen($line);
+
+				// If we are processing sections and the line is a section add the object and continue.
+				if ($line[0] === '[' && ($line[$length - 1] === ']'))
+				{
+					$section       = substr($line, 1, $length - 2);
+					$obj->$section = new stdClass;
+					continue;
+				}
+			}
+			elseif ($line[0] === '[')
+			{
+				continue;
+			}
+
+			// Check that an equal sign exists and is not the first character of the line.
+			if (!strpos($line, '='))
+			{
+				// Maybe throw exception?
+				continue;
+			}
+
+			// Get the key and value for the line.
+			list ($key, $value) = explode('=', $line, 2);
+
+			// If we have an array item
+			if (substr($key, -1) === ']' && ($openBrace = strpos($key, '[', 1)) !== false)
+			{
+				if ($options['supportArrayValues'])
+				{
+					$array    = true;
+					$arrayKey = substr($key, $openBrace + 1, -1);
+
+					// If we have a multi-dimensional array or malformed key
+					if (strpos($arrayKey, '[') !== false || strpos($arrayKey, ']') !== false)
+					{
+						// Maybe throw exception?
+						continue;
+					}
+
+					$key = substr($key, 0, $openBrace);
+				}
+				else
+				{
+					continue;
+				}
+			}
+
+			// Validate the key.
+			if (preg_match('/[^A-Z0-9_]/i', $key))
+			{
+				// Maybe throw exception?
+				continue;
+			}
+
+			// If the value is quoted then we assume it is a string.
+			$length = strlen($value);
+
+			if ($length && ($value[0] === '"') && ($value[$length - 1] === '"'))
+			{
+				// Strip the quotes and Convert the new line characters.
+				$value = stripcslashes(substr($value, 1, $length - 2));
+				$value = str_replace('\n', "\n", $value);
+			}
+			else
+			{
+				// If the value is not quoted, we assume it is not a string.
+
+				// If the value is 'false' assume boolean false.
+				if ($value === 'false')
+				{
+					$value = false;
+				}
+				elseif ($value === 'true')
+					// If the value is 'true' assume boolean true.
+				{
+					$value = true;
+				}
+				elseif ($options['parseBooleanWords'] && in_array(strtolower($value), array('yes', 'no'), true))
+					// If the value is 'yes' or 'no' and option is enabled assume appropriate boolean
+				{
+					$value = (strtolower($value) === 'yes');
+				}
+				elseif (is_numeric($value))
+					// If the value is numeric than it is either a float or int.
+				{
+					// If there is a period then we assume a float.
+					if (strpos($value, '.') !== false)
+					{
+						$value = (float) $value;
+					}
+					else
+					{
+						$value = (int) $value;
+					}
+				}
+			}
+
+			// If a section is set add the key/value to the section, otherwise top level.
+			if ($section)
+			{
+				if ($array)
+				{
+					if (!isset($obj->$section->$key))
+					{
+						$obj->$section->$key = array();
+					}
+
+					if (!empty($arrayKey))
+					{
+						$obj->$section->{$key}[$arrayKey] = $value;
+					}
+					else
+					{
+						$obj->$section->{$key}[] = $value;
+					}
+				}
+				else
+				{
+					$obj->$section->$key = $value;
+				}
+			}
+			else
+			{
+				if ($array)
+				{
+					if (!isset($obj->$key))
+					{
+						$obj->$key = array();
+					}
+
+					if (!empty($arrayKey))
+					{
+						$obj->{$key}[$arrayKey] = $value;
+					}
+					else
+					{
+						$obj->{$key}[] = $value;
+					}
+				}
+				else
+				{
+					$obj->$key = $value;
+				}
+			}
+
+			$array = false;
+		}
+
+		// Cache the string to save cpu cycles -- thus the world :)
+		self::$cache[$hash] = clone $obj;
+
+		return $obj;
+	}
+
+	/**
+	 * Method to get a value in an INI format.
+	 *
+	 * @param   mixed  $value  The value to convert to INI format.
+	 *
+	 * @return  string  The value in INI format.
+	 *
+	 * @since   1.0
+	 */
+	protected function getValueAsIni($value)
+	{
+		$string = '';
+
+		switch (gettype($value))
+		{
+			case 'integer':
+			case 'double':
+				$string = $value;
+				break;
+
+			case 'boolean':
+				$string = $value ? 'true' : 'false';
+				break;
+
+			case 'string':
+				// Sanitize any CRLF characters..
+				$string = '"' . str_replace(array("\r\n", "\n"), '\\n', $value) . '"';
+				break;
+		}
+
+		return $string;
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Format/Json.php b/core/libraries/vendor/joomla/registry/src/Format/Json.php
new file mode 100644
index 00000000..fd46d4f5
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Format/Json.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry\Format;
+
+use Joomla\Registry\AbstractRegistryFormat;
+
+/**
+ * JSON format handler for Registry.
+ *
+ * @since  1.0
+ */
+class Json extends AbstractRegistryFormat
+{
+	/**
+	 * Converts an object into a JSON formatted string.
+	 *
+	 * @param   object  $object   Data source object.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  string  JSON formatted string.
+	 *
+	 * @since   1.0
+	 */
+	public function objectToString($object, $options = array())
+	{
+		$bitMask = isset($options['bitmask']) ? $options['bitmask'] : 0;
+
+		// The depth parameter is only present as of PHP 5.5
+		if (version_compare(PHP_VERSION, '5.5', '>='))
+		{
+			$depth = isset($options['depth']) ? $options['depth'] : 512;
+
+			return json_encode($object, $bitMask, $depth);
+		}
+
+		return json_encode($object, $bitMask);
+	}
+
+	/**
+	 * Parse a JSON formatted string and convert it into an object.
+	 *
+	 * If the string is not in JSON format, this method will attempt to parse it as INI format.
+	 *
+	 * @param   string  $data     JSON formatted string to convert.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  object   Data object.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 */
+	public function stringToObject($data, array $options = array('processSections' => false))
+	{
+		$data = trim($data);
+
+		// Because developers are clearly not validating their data before pushing it into a Registry, we'll do it for them
+		if (empty($data))
+		{
+			return new \stdClass;
+		}
+
+		if ($data !== '' && $data[0] !== '{')
+		{
+			return AbstractRegistryFormat::getInstance('Ini')->stringToObject($data, $options);
+		}
+
+		$decoded = json_decode($data);
+
+		// Check for an error decoding the data
+		if ($decoded === null && json_last_error() !== JSON_ERROR_NONE)
+		{
+			throw new \RuntimeException(sprintf('Error decoding JSON data: %s', json_last_error_msg()));
+		}
+
+		return (object) $decoded;
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Format/Php.php b/core/libraries/vendor/joomla/registry/src/Format/Php.php
new file mode 100644
index 00000000..06e2aded
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Format/Php.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry\Format;
+
+use Joomla\Registry\AbstractRegistryFormat;
+
+/**
+ * PHP class format handler for Registry
+ *
+ * @since  1.0
+ */
+class Php extends AbstractRegistryFormat
+{
+	/**
+	 * Converts an object into a php class string.
+	 * - NOTE: Only one depth level is supported.
+	 *
+	 * @param   object  $object  Data Source Object
+	 * @param   array   $params  Parameters used by the formatter
+	 *
+	 * @return  string  Config class formatted string
+	 *
+	 * @since   1.0
+	 */
+	public function objectToString($object, $params = array())
+	{
+		// A class must be provided
+		$class = !empty($params['class']) ? $params['class'] : 'Registry';
+
+		// Build the object variables string
+		$vars = '';
+
+		foreach (get_object_vars($object) as $k => $v)
+		{
+			if (is_scalar($v))
+			{
+				$vars .= "\tpublic $" . $k . " = '" . addcslashes($v, '\\\'') . "';\n";
+			}
+			elseif (is_array($v) || is_object($v))
+			{
+				$vars .= "\tpublic $" . $k . ' = ' . $this->getArrayString((array) $v) . ";\n";
+			}
+		}
+
+		$str = "<?php\n";
+
+		// If supplied, add a namespace to the class object
+		if (isset($params['namespace']) && $params['namespace'] !== '')
+		{
+			$str .= 'namespace ' . $params['namespace'] . ";\n\n";
+		}
+
+		$str .= 'class ' . $class . " {\n";
+		$str .= $vars;
+		$str .= '}';
+
+		// Use the closing tag if it not set to false in parameters.
+		if (!isset($params['closingtag']) || $params['closingtag'] !== false)
+		{
+			$str .= "\n?>";
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Parse a PHP class formatted string and convert it into an object.
+	 *
+	 * @param   string  $data     PHP Class formatted string to convert.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  object   Data object.
+	 *
+	 * @since   1.0
+	 */
+	public function stringToObject($data, array $options = array())
+	{
+		return new \stdClass;
+	}
+
+	/**
+	 * Method to get an array as an exported string.
+	 *
+	 * @param   array  $a  The array to get as a string.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	protected function getArrayString($a)
+	{
+		$s = 'array(';
+		$i = 0;
+
+		foreach ($a as $k => $v)
+		{
+			$s .= $i ? ', ' : '';
+			$s .= '"' . $k . '" => ';
+
+			if (is_array($v) || is_object($v))
+			{
+				$s .= $this->getArrayString((array) $v);
+			}
+			else
+			{
+				$s .= '"' . addslashes($v) . '"';
+			}
+
+			$i++;
+		}
+
+		$s .= ')';
+
+		return $s;
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Format/Xml.php b/core/libraries/vendor/joomla/registry/src/Format/Xml.php
new file mode 100644
index 00000000..c168ff8c
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Format/Xml.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry\Format;
+
+use Joomla\Registry\AbstractRegistryFormat;
+use SimpleXMLElement;
+use stdClass;
+
+/**
+ * XML format handler for Registry.
+ *
+ * @since  1.0
+ */
+class Xml extends AbstractRegistryFormat
+{
+	/**
+	 * Converts an object into an XML formatted string.
+	 * -	If more than two levels of nested groups are necessary, since INI is not
+	 * useful, XML or another format should be used.
+	 *
+	 * @param   object  $object   Data source object.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  string  XML formatted string.
+	 *
+	 * @since   1.0
+	 */
+	public function objectToString($object, $options = array())
+	{
+		$rootName = isset($options['name']) ? $options['name'] : 'registry';
+		$nodeName = isset($options['nodeName']) ? $options['nodeName'] : 'node';
+
+		// Create the root node.
+		$root = simplexml_load_string('<' . $rootName . ' />');
+
+		// Iterate over the object members.
+		$this->getXmlChildren($root, $object, $nodeName);
+
+		return $root->asXML();
+	}
+
+	/**
+	 * Parse a XML formatted string and convert it into an object.
+	 *
+	 * @param   string  $data     XML formatted string to convert.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  object   Data object.
+	 *
+	 * @since   1.0
+	 */
+	public function stringToObject($data, array $options = array())
+	{
+		$obj = new stdClass;
+
+		// Parse the XML string.
+		$xml = simplexml_load_string($data);
+
+		foreach ($xml->children() as $node)
+		{
+			$obj->{$node['name']} = $this->getValueFromNode($node);
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * Method to get a PHP native value for a SimpleXMLElement object. -- called recursively
+	 *
+	 * @param   object  $node  SimpleXMLElement object for which to get the native value.
+	 *
+	 * @return  mixed  Native value of the SimpleXMLElement object.
+	 *
+	 * @since   1.0
+	 */
+	protected function getValueFromNode($node)
+	{
+		switch ($node['type'])
+		{
+			case 'integer':
+				$value = (string) $node;
+
+				return (int) $value;
+				break;
+
+			case 'string':
+				return (string) $node;
+				break;
+
+			case 'boolean':
+				$value = (string) $node;
+
+				return (bool) $value;
+				break;
+
+			case 'double':
+				$value = (string) $node;
+
+				return (float) $value;
+				break;
+
+			case 'array':
+				$value = array();
+
+				foreach ($node->children() as $child)
+				{
+					$value[(string) $child['name']] = $this->getValueFromNode($child);
+				}
+
+				break;
+
+			default:
+				$value = new stdClass;
+
+				foreach ($node->children() as $child)
+				{
+					$value->{$child['name']} = $this->getValueFromNode($child);
+				}
+
+				break;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Method to build a level of the XML string -- called recursively
+	 *
+	 * @param   SimpleXMLElement  $node      SimpleXMLElement object to attach children.
+	 * @param   object            $var       Object that represents a node of the XML document.
+	 * @param   string            $nodeName  The name to use for node elements.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function getXmlChildren(SimpleXMLElement $node, $var, $nodeName)
+	{
+		// Iterate over the object members.
+		foreach ((array) $var as $k => $v)
+		{
+			if (is_scalar($v))
+			{
+				$n = $node->addChild($nodeName, $v);
+				$n->addAttribute('name', $k);
+				$n->addAttribute('type', gettype($v));
+			}
+			else
+			{
+				$n = $node->addChild($nodeName);
+				$n->addAttribute('name', $k);
+				$n->addAttribute('type', gettype($v));
+
+				$this->getXmlChildren($n, $v, $nodeName);
+			}
+		}
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Format/Yaml.php b/core/libraries/vendor/joomla/registry/src/Format/Yaml.php
new file mode 100644
index 00000000..86175f8b
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Format/Yaml.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry\Format;
+
+use Joomla\Registry\AbstractRegistryFormat;
+use Symfony\Component\Yaml\Parser as SymfonyYamlParser;
+use Symfony\Component\Yaml\Dumper as SymfonyYamlDumper;
+
+/**
+ * YAML format handler for Registry.
+ *
+ * @since  1.0
+ */
+class Yaml extends AbstractRegistryFormat
+{
+	/**
+	 * The YAML parser class.
+	 *
+	 * @var    \Symfony\Component\Yaml\Parser
+	 * @since  1.0
+	 */
+	private $parser;
+
+	/**
+	 * The YAML dumper class.
+	 *
+	 * @var    \Symfony\Component\Yaml\Dumper
+	 * @since  1.0
+	 */
+	private $dumper;
+
+	/**
+	 * Construct to set up the parser and dumper
+	 *
+	 * @since   1.0
+	 */
+	public function __construct()
+	{
+		$this->parser = new SymfonyYamlParser;
+		$this->dumper = new SymfonyYamlDumper;
+	}
+
+	/**
+	 * Converts an object into a YAML formatted string.
+	 * We use json_* to convert the passed object to an array.
+	 *
+	 * @param   object  $object   Data source object.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  string  YAML formatted string.
+	 *
+	 * @since   1.0
+	 */
+	public function objectToString($object, $options = array())
+	{
+		$array = json_decode(json_encode($object), true);
+
+		return $this->dumper->dump($array, 2, 0);
+	}
+
+	/**
+	 * Parse a YAML formatted string and convert it into an object.
+	 * We use the json_* methods to convert the parsed YAML array to an object.
+	 *
+	 * @param   string  $data     YAML formatted string to convert.
+	 * @param   array   $options  Options used by the formatter.
+	 *
+	 * @return  object  Data object.
+	 *
+	 * @since   1.0
+	 */
+	public function stringToObject($data, array $options = array())
+	{
+		$array = $this->parser->parse(trim($data));
+
+		return (object) json_decode(json_encode($array));
+	}
+}
diff --git a/core/libraries/vendor/joomla/registry/src/FormatInterface.php b/core/libraries/vendor/joomla/registry/src/FormatInterface.php
new file mode 100644
index 00000000..94a70484
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/FormatInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry;
+
+/**
+ * Interface defining a format object
+ *
+ * @since  1.5.0
+ */
+interface FormatInterface
+{
+	/**
+	 * Converts an object into a formatted string.
+	 *
+	 * @param   object  $object   Data Source Object.
+	 * @param   array   $options  An array of options for the formatter.
+	 *
+	 * @return  string  Formatted string.
+	 *
+	 * @since   1.5.0
+	 */
+	public function objectToString($object, $options = null);
+
+	/**
+	 * Converts a formatted string into an object.
+	 *
+	 * @param   string  $data     Formatted string
+	 * @param   array   $options  An array of options for the formatter.
+	 *
+	 * @return  object  Data Object
+	 *
+	 * @since   1.5.0
+	 */
+	public function stringToObject($data, array $options = array());
+}
diff --git a/core/libraries/vendor/joomla/registry/src/Registry.php b/core/libraries/vendor/joomla/registry/src/Registry.php
new file mode 100644
index 00000000..b0bc7004
--- /dev/null
+++ b/core/libraries/vendor/joomla/registry/src/Registry.php
@@ -0,0 +1,895 @@
+<?php
+/**
+ * Part of the Joomla Framework Registry Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Registry;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Registry class
+ *
+ * @since  1.0
+ */
+class Registry implements \JsonSerializable, \ArrayAccess, \IteratorAggregate, \Countable
+{
+	/**
+	 * Registry Object
+	 *
+	 * @var    \stdClass
+	 * @since  1.0
+	 */
+	protected $data;
+
+	/**
+	 * Flag if the Registry data object has been initialized
+	 *
+	 * @var    boolean
+	 * @since  1.5.2
+	 */
+	protected $initialized = false;
+
+	/**
+	 * Registry instances container.
+	 *
+	 * @var    Registry[]
+	 * @since  1.0
+	 * @deprecated  2.0  Object caching will no longer be supported
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Path separator
+	 *
+	 * @var    string
+	 * @since  1.4.0
+	 */
+	public $separator = '.';
+
+	/**
+	 * Constructor
+	 *
+	 * @param   mixed  $data  The data to bind to the new Registry object.
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($data = null)
+	{
+		// Instantiate the internal data object.
+		$this->data = new \stdClass;
+
+		// Optionally load supplied data.
+		if ($data instanceof Registry)
+		{
+			$this->merge($data);
+		}
+		elseif (is_array($data) || is_object($data))
+		{
+			$this->bindData($this->data, $data);
+		}
+		elseif (!empty($data) && is_string($data))
+		{
+			$this->loadString($data);
+		}
+	}
+
+	/**
+	 * Magic function to clone the registry object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function __clone()
+	{
+		$this->data = unserialize(serialize($this->data));
+	}
+
+	/**
+	 * Magic function to render this object as a string using default args of toString method.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Count elements of the data object
+	 *
+	 * @return  integer  The custom count as an integer.
+	 *
+	 * @link    https://secure.php.net/manual/en/countable.count.php
+	 * @since   1.3.0
+	 */
+	public function count()
+	{
+		return count(get_object_vars($this->data));
+	}
+
+	/**
+	 * Implementation for the JsonSerializable interface.
+	 * Allows us to pass Registry objects to json_encode.
+	 *
+	 * @return  object
+	 *
+	 * @since   1.0
+	 * @note    The interface is only present in PHP 5.4 and up.
+	 */
+	public function jsonSerialize()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Sets a default value if not already assigned.
+	 *
+	 * @param   string  $key      The name of the parameter.
+	 * @param   mixed   $default  An optional value for the parameter.
+	 *
+	 * @return  mixed  The value set, or the default if the value was not previously set (or null).
+	 *
+	 * @since   1.0
+	 */
+	public function def($key, $default = '')
+	{
+		$value = $this->get($key, $default);
+		$this->set($key, $value);
+
+		return $value;
+	}
+
+	/**
+	 * Check if a registry path exists.
+	 *
+	 * @param   string  $path  Registry path (e.g. joomla.content.showauthor)
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function exists($path)
+	{
+		// Return default value if path is empty
+		if (empty($path))
+		{
+			return false;
+		}
+
+		// Explode the registry path into an array
+		$nodes = explode($this->separator, $path);
+
+		// Initialize the current node to be the registry root.
+		$node  = $this->data;
+		$found = false;
+
+		// Traverse the registry to find the correct node for the result.
+		foreach ($nodes as $n)
+		{
+			if (is_array($node) && isset($node[$n]))
+			{
+				$node  = $node[$n];
+				$found = true;
+				continue;
+			}
+
+			if (!isset($node->$n))
+			{
+				return false;
+			}
+
+			$node  = $node->$n;
+			$found = true;
+		}
+
+		return $found;
+	}
+
+	/**
+	 * Get a registry value.
+	 *
+	 * @param   string  $path     Registry path (e.g. joomla.content.showauthor)
+	 * @param   mixed   $default  Optional default value, returned if the internal value is null.
+	 *
+	 * @return  mixed  Value of entry or null
+	 *
+	 * @since   1.0
+	 */
+	public function get($path, $default = null)
+	{
+		// Return default value if path is empty
+		if (empty($path))
+		{
+			return $default;
+		}
+
+		if (!strpos($path, $this->separator))
+		{
+			return (isset($this->data->$path) && $this->data->$path !== null && $this->data->$path !== '') ? $this->data->$path : $default;
+		}
+
+		// Explode the registry path into an array
+		$nodes = explode($this->separator, trim($path));
+
+		// Initialize the current node to be the registry root.
+		$node  = $this->data;
+		$found = false;
+
+		// Traverse the registry to find the correct node for the result.
+		foreach ($nodes as $n)
+		{
+			if (is_array($node) && isset($node[$n]))
+			{
+				$node  = $node[$n];
+				$found = true;
+
+				continue;
+			}
+
+			if (!isset($node->$n))
+			{
+				return $default;
+			}
+
+			$node  = $node->$n;
+			$found = true;
+		}
+
+		if (!$found || $node === null || $node === '')
+		{
+			return $default;
+		}
+
+		return $node;
+	}
+
+	/**
+	 * Returns a reference to a global Registry object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * This method must be invoked as:
+	 * <pre>$registry = Registry::getInstance($id);</pre>
+	 *
+	 * @param   string  $id  An ID for the registry instance
+	 *
+	 * @return  Registry  The Registry object.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  Instantiate a new Registry instance instead
+	 */
+	public static function getInstance($id)
+	{
+		if (empty(self::$instances[$id]))
+		{
+			self::$instances[$id] = new self;
+		}
+
+		return self::$instances[$id];
+	}
+
+	/**
+	 * Gets this object represented as an ArrayIterator.
+	 *
+	 * This allows the data properties to be accessed via a foreach statement.
+	 *
+	 * @return  \ArrayIterator  This object represented as an ArrayIterator.
+	 *
+	 * @see     IteratorAggregate::getIterator()
+	 * @since   1.3.0
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->data);
+	}
+
+	/**
+	 * Load an associative array of values into the default namespace
+	 *
+	 * @param   array    $array      Associative array of value to load
+	 * @param   boolean  $flattened  Load from a one-dimensional array
+	 * @param   string   $separator  The key separator
+	 *
+	 * @return  Registry  Return this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function loadArray($array, $flattened = false, $separator = null)
+	{
+		if (!$flattened)
+		{
+			$this->bindData($this->data, $array);
+
+			return $this;
+		}
+
+		foreach ($array as $k => $v)
+		{
+			$this->set($k, $v, $separator);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Load the public variables of the object into the default namespace.
+	 *
+	 * @param   object  $object  The object holding the publics to load
+	 *
+	 * @return  Registry  Return this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function loadObject($object)
+	{
+		$this->bindData($this->data, $object);
+
+		return $this;
+	}
+
+	/**
+	 * Load the contents of a file into the registry
+	 *
+	 * @param   string  $file     Path to file to load
+	 * @param   string  $format   Format of the file [optional: defaults to JSON]
+	 * @param   array   $options  Options used by the formatter
+	 *
+	 * @return  Registry  Return this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function loadFile($file, $format = 'JSON', $options = array())
+	{
+		$data = file_get_contents($file);
+
+		return $this->loadString($data, $format, $options);
+	}
+
+	/**
+	 * Load a string into the registry
+	 *
+	 * @param   string  $data     String to load into the registry
+	 * @param   string  $format   Format of the string
+	 * @param   array   $options  Options used by the formatter
+	 *
+	 * @return  Registry  Return this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function loadString($data, $format = 'JSON', $options = array())
+	{
+		// Load a string into the given namespace [or default namespace if not given]
+		$handler = AbstractRegistryFormat::getInstance($format, $options);
+
+		$obj = $handler->stringToObject($data, $options);
+
+		// If the data object has not yet been initialized, direct assign the object
+		if (!$this->initialized)
+		{
+			$this->data        = $obj;
+			$this->initialized = true;
+
+			return $this;
+		}
+
+		$this->loadObject($obj);
+
+		return $this;
+	}
+
+	/**
+	 * Merge a Registry object into this one
+	 *
+	 * @param   Registry  $source     Source Registry object to merge.
+	 * @param   boolean   $recursive  True to support recursive merge the children values.
+	 *
+	 * @return  Registry|false  Return this object to support chaining or false if $source is not an instance of Registry.
+	 *
+	 * @since   1.0
+	 */
+	public function merge($source, $recursive = false)
+	{
+		if (!$source instanceof Registry)
+		{
+			return false;
+		}
+
+		$this->bindData($this->data, $source->toArray(), $recursive, false);
+
+		return $this;
+	}
+
+	/**
+	 * Method to extract a sub-registry from path
+	 *
+	 * @param   string  $path  Registry path (e.g. joomla.content.showauthor)
+	 *
+	 * @return  Registry|null  Registry object if data is present
+	 *
+	 * @since   1.2.0
+	 */
+	public function extract($path)
+	{
+		$data = $this->get($path);
+
+		if ($data === null)
+		{
+			return null;
+		}
+
+		return new Registry($data);
+	}
+
+	/**
+	 * Checks whether an offset exists in the iterator.
+	 *
+	 * @param   mixed  $offset  The array offset.
+	 *
+	 * @return  boolean  True if the offset exists, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetExists($offset)
+	{
+		return (boolean) ($this->get($offset) !== null);
+	}
+
+	/**
+	 * Gets an offset in the iterator.
+	 *
+	 * @param   mixed  $offset  The array offset.
+	 *
+	 * @return  mixed  The array value if it exists, null otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->get($offset);
+	}
+
+	/**
+	 * Sets an offset in the iterator.
+	 *
+	 * @param   mixed  $offset  The array offset.
+	 * @param   mixed  $value   The array value.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->set($offset, $value);
+	}
+
+	/**
+	 * Unsets an offset in the iterator.
+	 *
+	 * @param   mixed  $offset  The array offset.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function offsetUnset($offset)
+	{
+		$this->remove($offset);
+	}
+
+	/**
+	 * Set a registry value.
+	 *
+	 * @param   string  $path       Registry Path (e.g. joomla.content.showauthor)
+	 * @param   mixed   $value      Value of entry
+	 * @param   string  $separator  The key separator
+	 *
+	 * @return  mixed  The value of the that has been set.
+	 *
+	 * @since   1.0
+	 */
+	public function set($path, $value, $separator = null)
+	{
+		if (empty($separator))
+		{
+			$separator = $this->separator;
+		}
+
+		/*
+		 * Explode the registry path into an array and remove empty
+		 * nodes that occur as a result of a double separator. ex: joomla..test
+		 * Finally, re-key the array so they are sequential.
+		 */
+		$nodes = array_values(array_filter(explode($separator, $path), 'strlen'));
+
+		if (!$nodes)
+		{
+			return null;
+		}
+
+		// Initialize the current node to be the registry root.
+		$node = $this->data;
+
+		// Traverse the registry to find the correct node for the result.
+		for ($i = 0, $n = count($nodes) - 1; $i < $n; $i++)
+		{
+			if (is_object($node))
+			{
+				if (!isset($node->{$nodes[$i]}) && ($i !== $n))
+				{
+					$node->{$nodes[$i]} = new \stdClass;
+				}
+
+				// Pass the child as pointer in case it is an object
+				$node = &$node->{$nodes[$i]};
+
+				continue;
+			}
+
+			if (is_array($node))
+			{
+				if (($i !== $n) && !isset($node[$nodes[$i]]))
+				{
+					$node[$nodes[$i]] = new \stdClass;
+				}
+
+				// Pass the child as pointer in case it is an array
+				$node = &$node[$nodes[$i]];
+			}
+		}
+
+		// Get the old value if exists so we can return it
+		switch (true)
+		{
+			case (is_object($node)):
+				$result = $node->{$nodes[$i]} = $value;
+				break;
+
+			case (is_array($node)):
+				$result = $node[$nodes[$i]] = $value;
+				break;
+
+			default:
+				$result = null;
+				break;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Append value to a path in registry
+	 *
+	 * @param   string  $path   Parent registry Path (e.g. joomla.content.showauthor)
+	 * @param   mixed   $value  Value of entry
+	 *
+	 * @return  mixed  The value of the that has been set.
+	 *
+	 * @since   1.4.0
+	 */
+	public function append($path, $value)
+	{
+		$result = null;
+
+		/*
+		 * Explode the registry path into an array and remove empty
+		 * nodes that occur as a result of a double dot. ex: joomla..test
+		 * Finally, re-key the array so they are sequential.
+		 */
+		$nodes = array_values(array_filter(explode('.', $path), 'strlen'));
+
+		if ($nodes)
+		{
+			// Initialize the current node to be the registry root.
+			$node = $this->data;
+
+			// Traverse the registry to find the correct node for the result.
+			// TODO Create a new private method from part of code below, as it is almost equal to 'set' method
+			for ($i = 0, $n = count($nodes) - 1; $i <= $n; $i++)
+			{
+				if (is_object($node))
+				{
+					if (!isset($node->{$nodes[$i]}) && ($i !== $n))
+					{
+						$node->{$nodes[$i]} = new \stdClass;
+					}
+
+					// Pass the child as pointer in case it is an array
+					$node = &$node->{$nodes[$i]};
+				}
+				elseif (is_array($node))
+				{
+					if (($i !== $n) && !isset($node[$nodes[$i]]))
+					{
+						$node[$nodes[$i]] = new \stdClass;
+					}
+
+					// Pass the child as pointer in case it is an array
+					$node = &$node[$nodes[$i]];
+				}
+			}
+
+			if (!is_array($node))
+				// Convert the node to array to make append possible
+			{
+				$node = get_object_vars($node);
+			}
+
+			$node[] = $value;
+			$result = $value;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Delete a registry value
+	 *
+	 * @param   string  $path  Registry Path (e.g. joomla.content.showauthor)
+	 *
+	 * @return  mixed  The value of the removed node or null if not set
+	 *
+	 * @since   1.6.0
+	 */
+	public function remove($path)
+	{
+		// Cheap optimisation to direct remove the node if there is no separator
+		if (!strpos($path, $this->separator))
+		{
+			$result = (isset($this->data->$path) && $this->data->$path !== null && $this->data->$path !== '') ? $this->data->$path : null;
+
+			unset($this->data->$path);
+
+			return $result;
+		}
+
+		/*
+		 * Explode the registry path into an array and remove empty
+		 * nodes that occur as a result of a double separator. ex: joomla..test
+		 * Finally, re-key the array so they are sequential.
+		 */
+		$nodes = array_values(array_filter(explode($this->separator, $path), 'strlen'));
+
+		if (!$nodes)
+		{
+			return null;
+		}
+
+		// Initialize the current node to be the registry root.
+		$node   = $this->data;
+		$parent = null;
+
+		// Traverse the registry to find the correct node for the result.
+		for ($i = 0, $n = count($nodes) - 1; $i < $n; $i++)
+		{
+			if (is_object($node))
+			{
+				if (!isset($node->{$nodes[$i]}) && ($i !== $n))
+				{
+					continue;
+				}
+
+				$parent = &$node;
+				$node   = $node->{$nodes[$i]};
+
+				continue;
+			}
+
+			if (is_array($node))
+			{
+				if (($i !== $n) && !isset($node[$nodes[$i]]))
+				{
+					continue;
+				}
+
+				$parent = &$node;
+				$node   = $node[$nodes[$i]];
+
+				continue;
+			}
+		}
+
+		// Get the old value if exists so we can return it
+		switch (true)
+		{
+			case (is_object($node)):
+				$result = isset($node->{$nodes[$i]}) ? $node->{$nodes[$i]} : null;
+				unset($parent->{$nodes[$i]});
+				break;
+
+			case (is_array($node)):
+				$result = isset($node[$nodes[$i]]) ? $node[$nodes[$i]] : null;
+				unset($parent[$nodes[$i]]);
+				break;
+
+			default:
+				$result = null;
+				break;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Transforms a namespace to an array
+	 *
+	 * @return  array  An associative array holding the namespace data
+	 *
+	 * @since   1.0
+	 */
+	public function toArray()
+	{
+		return (array) $this->asArray($this->data);
+	}
+
+	/**
+	 * Transforms a namespace to an object
+	 *
+	 * @return  object   An an object holding the namespace data
+	 *
+	 * @since   1.0
+	 */
+	public function toObject()
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Get a namespace in a given string format
+	 *
+	 * @param   string  $format   Format to return the string in
+	 * @param   mixed   $options  Parameters used by the formatter, see formatters for more info
+	 *
+	 * @return  string   Namespace in string format
+	 *
+	 * @since   1.0
+	 */
+	public function toString($format = 'JSON', $options = array())
+	{
+		// Return a namespace in a given format
+		$handler = AbstractRegistryFormat::getInstance($format, $options);
+
+		return $handler->objectToString($this->data, $options);
+	}
+
+	/**
+	 * Method to recursively bind data to a parent object.
+	 *
+	 * @param   object   $parent     The parent object on which to attach the data values.
+	 * @param   mixed    $data       An array or object of data to bind to the parent object.
+	 * @param   boolean  $recursive  True to support recursive bindData.
+	 * @param   boolean  $allowNull  True to allow null values.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	protected function bindData($parent, $data, $recursive = true, $allowNull = true)
+	{
+		// The data object is now initialized
+		$this->initialized = true;
+
+		// Ensure the input data is an array.
+		$data = is_object($data) ? get_object_vars($data) : (array) $data;
+
+		foreach ($data as $k => $v)
+		{
+			if (!$allowNull && !(($v !== null) && ($v !== '')))
+			{
+				continue;
+			}
+
+			if ($recursive && ((is_array($v) && ArrayHelper::isAssociative($v)) || is_object($v)))
+			{
+				if (!isset($parent->$k))
+				{
+					$parent->$k = new \stdClass;
+				}
+
+				$this->bindData($parent->$k, $v);
+
+				continue;
+			}
+
+			$parent->$k = $v;
+		}
+	}
+
+	/**
+	 * Method to recursively convert an object of data to an array.
+	 *
+	 * @param   object  $data  An object of data to return as an array.
+	 *
+	 * @return  array  Array representation of the input object.
+	 *
+	 * @since   1.0
+	 */
+	protected function asArray($data)
+	{
+		$array = array();
+
+		if (is_object($data))
+		{
+			$data = get_object_vars($data);
+		}
+
+		foreach ($data as $k => $v)
+		{
+			if (is_object($v) || is_array($v))
+			{
+				$array[$k] = $this->asArray($v);
+
+				continue;
+			}
+
+			$array[$k] = $v;
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Dump to one dimension array.
+	 *
+	 * @param   string  $separator  The key separator.
+	 *
+	 * @return  string[]  Dumped array.
+	 *
+	 * @since   1.3.0
+	 */
+	public function flatten($separator = null)
+	{
+		$array = array();
+
+		if (empty($separator))
+		{
+			$separator = $this->separator;
+		}
+
+		$this->toFlatten($separator, $this->data, $array);
+
+		return $array;
+	}
+
+	/**
+	 * Method to recursively convert data to one dimension array.
+	 *
+	 * @param   string        $separator  The key separator.
+	 * @param   array|object  $data       Data source of this scope.
+	 * @param   array         $array      The result array, it is passed by reference.
+	 * @param   string        $prefix     Last level key prefix.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.3.0
+	 */
+	protected function toFlatten($separator = null, $data = null, &$array = array(), $prefix = '')
+	{
+		$data = (array) $data;
+
+		if (empty($separator))
+		{
+			$separator = $this->separator;
+		}
+
+		foreach ($data as $k => $v)
+		{
+			$key = $prefix ? $prefix . $separator . $k : $k;
+
+			if (is_object($v) || is_array($v))
+			{
+				$this->toFlatten($separator, $v, $array, $key);
+
+				continue;
+			}
+
+			$array[$key] = $v;
+		}
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/LICENSE b/core/libraries/vendor/joomla/session/Joomla/Session/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Session.php b/core/libraries/vendor/joomla/session/Joomla/Session/Session.php
new file mode 100644
index 00000000..40d5df92
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Session.php
@@ -0,0 +1,1075 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session;
+
+use Joomla\Event\DispatcherInterface;
+use Joomla\Input\Input;
+
+/**
+ * Class for managing HTTP sessions
+ *
+ * Provides access to session-state values as well as session-level
+ * settings and lifetime management methods.
+ * Based on the standard PHP session handling mechanism it provides
+ * more advanced features such as expire timeouts.
+ *
+ * @since  1.0
+ */
+class Session implements \IteratorAggregate
+{
+	/**
+	 * Internal state.
+	 * One of 'inactive'|'active'|'expired'|'destroyed'|'error'
+	 *
+	 * @var    string
+	 * @see    getState()
+	 * @since  1.0
+	 */
+	protected $state = 'inactive';
+
+	/**
+	 * Maximum age of unused session in minutes
+	 *
+	 * @var    string
+	 * @since  1.0
+	 */
+	protected $expire = 15;
+
+	/**
+	 * The session store object.
+	 *
+	 * @var    Storage
+	 * @since  1.0
+	 */
+	protected $store = null;
+
+	/**
+	 * Security policy.
+	 * List of checks that will be done.
+	 *
+	 * Default values:
+	 * - fix_browser
+	 * - fix_adress
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	protected $security = array('fix_browser');
+
+	/**
+	 * Force cookies to be SSL only
+	 * Default  false
+	 *
+	 * @var    boolean
+	 * @since  1.0
+	 */
+	protected $force_ssl = false;
+
+	/**
+	 * The domain to use when setting cookies.
+	 *
+	 * @var    mixed
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected $cookie_domain;
+
+	/**
+	 * The path to use when setting cookies.
+	 *
+	 * @var    mixed
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected $cookie_path;
+
+	/**
+	 * Session instances container.
+	 *
+	 * @var    Session
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected static $instance;
+
+	/**
+	 * The type of storage for the session.
+	 *
+	 * @var    string
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected $storeName;
+
+	/**
+	 * Holds the Input object
+	 *
+	 * @var    Input
+	 * @since  1.0
+	 */
+	private $input = null;
+
+	/**
+	 * Holds the Dispatcher object
+	 *
+	 * @var    DispatcherInterface
+	 * @since  1.0
+	 */
+	private $dispatcher = null;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   string  $store    The type of storage for the session.
+	 * @param   array   $options  Optional parameters
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($store = 'none', array $options = array())
+	{
+		// Need to destroy any existing sessions started with session.auto_start
+		if (session_id())
+		{
+			session_unset();
+			session_destroy();
+		}
+
+		// Disable transparent sid support
+		ini_set('session.use_trans_sid', '0');
+
+		// Only allow the session ID to come from cookies and nothing else.
+		ini_set('session.use_only_cookies', '1');
+
+		// Create handler
+		$this->store = Storage::getInstance($store, $options);
+
+		$this->storeName = $store;
+
+		// Set options
+		$this->_setOptions($options);
+
+		$this->_setCookieParams();
+
+		$this->setState('inactive');
+	}
+
+	/**
+	 * Magic method to get read-only access to properties.
+	 *
+	 * @param   string  $name  Name of property to retrieve
+	 *
+	 * @return  mixed   The value of the property
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  Use get methods for non-deprecated properties
+	 */
+	public function __get($name)
+	{
+		if ($name === 'storeName' || $name === 'state' || $name === 'expire')
+		{
+			return $this->$name;
+		}
+	}
+
+	/**
+	 * Returns the global Session object, only creating it
+	 * if it doesn't already exist.
+	 *
+	 * @param   string  $handler  The type of session handler.
+	 * @param   array   $options  An array of configuration options (for new sessions only).
+	 *
+	 * @return  Session  The Session object.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  A singleton object store will no longer be supported
+	 */
+	public static function getInstance($handler, array $options = array ())
+	{
+		if (!is_object(self::$instance))
+		{
+			self::$instance = new self($handler, $options);
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Get current state of session
+	 *
+	 * @return  string  The session state
+	 *
+	 * @since   1.0
+	 */
+	public function getState()
+	{
+		return $this->state;
+	}
+
+	/**
+	 * Get expiration time in minutes
+	 *
+	 * @return  integer  The session expiration time in minutes
+	 *
+	 * @since   1.0
+	 */
+	public function getExpire()
+	{
+		return $this->expire;
+	}
+
+	/**
+	 * Get a session token, if a token isn't set yet one will be generated.
+	 *
+	 * Tokens are used to secure forms from spamming attacks. Once a token
+	 * has been generated the system will check the post request to see if
+	 * it is present, if not it will invalidate the session.
+	 *
+	 * @param   boolean  $forceNew  If true, force a new token to be created
+	 *
+	 * @return  string  The session token
+	 *
+	 * @since   1.0
+	 */
+	public function getToken($forceNew = false)
+	{
+		$token = $this->get('session.token');
+
+		// Create a token
+		if ($token === null || $forceNew)
+		{
+			$token = $this->_createToken();
+			$this->set('session.token', $token);
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Method to determine if a token exists in the session. If not the
+	 * session will be set to expired
+	 *
+	 * @param   string   $tCheck       Hashed token to be verified
+	 * @param   boolean  $forceExpire  If true, expires the session
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function hasToken($tCheck, $forceExpire = true)
+	{
+		// Check if a token exists in the session
+		$tStored = $this->get('session.token');
+
+		// Check token
+		if (($tStored !== $tCheck))
+		{
+			if ($forceExpire)
+			{
+				$this->setState('expired');
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Retrieve an external iterator.
+	 *
+	 * @return  \ArrayIterator  Return an ArrayIterator of $_SESSION.
+	 *
+	 * @since   1.0
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($_SESSION);
+	}
+
+	/**
+	 * Get session name
+	 *
+	 * @return  string  The session name
+	 *
+	 * @since   1.0
+	 */
+	public function getName()
+	{
+		if ($this->getState() === 'destroyed')
+		{
+			// @TODO : raise error
+			return null;
+		}
+
+		return session_name();
+	}
+
+	/**
+	 * Get session id
+	 *
+	 * @return  string  The session name
+	 *
+	 * @since   1.0
+	 */
+	public function getId()
+	{
+		if ($this->getState() === 'destroyed')
+		{
+			return null;
+		}
+
+		return session_id();
+	}
+
+	/**
+	 * Get the session handlers
+	 *
+	 * @return  array  An array of available session handlers
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  The Storage class chain will be removed
+	 */
+	public static function getStores()
+	{
+		$connectors = array();
+
+		// Get an iterator and loop trough the driver classes.
+		$iterator = new \DirectoryIterator(__DIR__ . '/Storage');
+
+		foreach ($iterator as $file)
+		{
+			$fileName = $file->getFilename();
+
+			// Only load for php files.
+			if (!$file->isFile() || $file->getExtension() != 'php')
+			{
+				continue;
+			}
+
+			// Derive the class name from the type.
+			$class = str_ireplace('.php', '', '\\Joomla\\Session\\Storage\\' . ucfirst(trim($fileName)));
+
+			// If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+			if (!class_exists($class))
+			{
+				continue;
+			}
+
+			// Sweet!  Our class exists, so now we just need to know if it passes its test method.
+			if ($class::isSupported())
+			{
+				// Connector names should not have file extensions.
+				$connectors[] = str_ireplace('.php', '', $fileName);
+			}
+		}
+
+		return $connectors;
+	}
+
+	/**
+	 * Shorthand to check if the session is active
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public function isActive()
+	{
+		return (bool) ($this->getState() == 'active');
+	}
+
+	/**
+	 * Check whether this session is currently created
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.0
+	 */
+	public function isNew()
+	{
+		$counter = $this->get('session.counter');
+
+		return (bool) ($counter === 1);
+	}
+
+	/**
+	 * Check whether this session is currently created
+	 *
+	 * @param   Input                $input       Input object for the session to use.
+	 * @param   DispatcherInterface  $dispatcher  Dispatcher object for the session to use.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  In 2.0 the DispatcherInterface should be injected via the object constructor
+	 */
+	public function initialise(Input $input, DispatcherInterface $dispatcher = null)
+	{
+		$this->input      = $input;
+		$this->dispatcher = $dispatcher;
+	}
+
+	/**
+	 * Get data from the session store
+	 *
+	 * @param   string  $name       Name of a variable
+	 * @param   mixed   $default    Default value of a variable if not set
+	 * @param   string  $namespace  Namespace to use, default to 'default' {@deprecated 2.0 Namespace support will be removed.}
+	 *
+	 * @return  mixed  Value of a variable
+	 *
+	 * @since   1.0
+	 */
+	public function get($name, $default = null, $namespace = 'default')
+	{
+		// Add prefix to namespace to avoid collisions
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active' && $this->getState() !== 'expired')
+		{
+			// @TODO :: generated error here
+			$error = null;
+
+			return $error;
+		}
+
+		if (isset($_SESSION[$namespace][$name]))
+		{
+			return $_SESSION[$namespace][$name];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Set data into the session store.
+	 *
+	 * @param   string  $name       Name of a variable.
+	 * @param   mixed   $value      Value of a variable.
+	 * @param   string  $namespace  Namespace to use, default to 'default' {@deprecated 2.0 Namespace support will be removed.}
+	 *
+	 * @return  mixed  Old value of a variable.
+	 *
+	 * @since   1.0
+	 */
+	public function set($name, $value = null, $namespace = 'default')
+	{
+		// Add prefix to namespace to avoid collisions
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return null;
+		}
+
+		$old = isset($_SESSION[$namespace][$name]) ? $_SESSION[$namespace][$name] : null;
+
+		if (null === $value)
+		{
+			unset($_SESSION[$namespace][$name]);
+		}
+		else
+		{
+			$_SESSION[$namespace][$name] = $value;
+		}
+
+		return $old;
+	}
+
+	/**
+	 * Check whether data exists in the session store
+	 *
+	 * @param   string  $name       Name of variable
+	 * @param   string  $namespace  Namespace to use, default to 'default' {@deprecated 2.0 Namespace support will be removed.}
+	 *
+	 * @return  boolean  True if the variable exists
+	 *
+	 * @since   1.0
+	 */
+	public function has($name, $namespace = 'default')
+	{
+		// Add prefix to namespace to avoid collisions.
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return null;
+		}
+
+		return isset($_SESSION[$namespace][$name]);
+	}
+
+	/**
+	 * Unset data from the session store
+	 *
+	 * @param   string  $name       Name of variable
+	 * @param   string  $namespace  Namespace to use, default to 'default' {@deprecated 2.0 Namespace support will be removed.}
+	 *
+	 * @return  mixed   The value from session or NULL if not set
+	 *
+	 * @since   1.0
+	 */
+	public function clear($name, $namespace = 'default')
+	{
+		// Add prefix to namespace to avoid collisions
+		$namespace = '__' . $namespace;
+
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return null;
+		}
+
+		$value = null;
+
+		if (isset($_SESSION[$namespace][$name]))
+		{
+			$value = $_SESSION[$namespace][$name];
+			unset($_SESSION[$namespace][$name]);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Start a session.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function start()
+	{
+		if ($this->getState() === 'active')
+		{
+			return;
+		}
+
+		$this->_start();
+
+		$this->setState('active');
+
+		// Initialise the session
+		$this->_setCounter();
+		$this->_setTimers();
+
+		// Perform security checks
+		$this->_validate();
+
+		if ($this->dispatcher instanceof DispatcherInterface)
+		{
+			$this->dispatcher->triggerEvent('onAfterSessionStart');
+		}
+	}
+
+	/**
+	 * Start a session.
+	 *
+	 * Creates a session (or resumes the current one based on the state of the session)
+	 *
+	 * @return  boolean  true on success
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	protected function _start()
+	{
+		// Start session if not started
+		if ($this->getState() === 'restart')
+		{
+			session_regenerate_id(true);
+		}
+		else
+		{
+			$session_name = session_name();
+
+			// Get the Joomla\Input\Cookie object
+			$cookie = $this->input->cookie;
+
+			if (is_null($cookie->get($session_name)))
+			{
+				$session_clean = $this->input->get($session_name, false, 'string');
+
+				if ($session_clean)
+				{
+					session_id($session_clean);
+					$cookie->set($session_name, '', 1);
+				}
+			}
+		}
+
+		/**
+		 * Write and Close handlers are called after destructing objects since PHP 5.0.5.
+		 * Thus destructors can use sessions but session handler can't use objects.
+		 * So we are moving session closure before destructing objects.
+		 *
+		 * Replace with session_register_shutdown() when dropping compatibility with PHP 5.3
+		 */
+		register_shutdown_function('session_write_close');
+
+		session_cache_limiter('none');
+		session_start();
+
+		return true;
+	}
+
+	/**
+	 * Frees all session variables and destroys all data registered to a session
+	 *
+	 * This method resets the $_SESSION variable and destroys all of the data associated
+	 * with the current session in its storage (file or DB). It forces new session to be
+	 * started after this method is called. It does not unset the session cookie.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     session_destroy()
+	 * @see     session_unset()
+	 * @since   1.0
+	 */
+	public function destroy()
+	{
+		// Session was already destroyed
+		if ($this->getState() === 'destroyed')
+		{
+			return true;
+		}
+
+		/*
+		 * In order to kill the session altogether, such as to log the user out, the session id
+		 * must also be unset. If a cookie is used to propagate the session id (default behavior),
+		 * then the session cookie must be deleted.
+		 */
+		if (isset($_COOKIE[session_name()]))
+		{
+			$this->input->cookie->set(session_name(), '', 1);
+		}
+
+		session_unset();
+		session_destroy();
+
+		$this->setState('destroyed');
+
+		return true;
+	}
+
+	/**
+	 * Restart an expired or locked session.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     destroy
+	 * @since   1.0
+	 */
+	public function restart()
+	{
+		$this->destroy();
+
+		if ($this->getState() !== 'destroyed')
+		{
+			// @TODO :: generated error here
+			return false;
+		}
+
+		// Re-register the session handler after a session has been destroyed, to avoid PHP bug
+		$this->store->register();
+
+		$this->setState('restart');
+
+		// Regenerate session id
+		session_regenerate_id(true);
+		$this->_start();
+		$this->setState('active');
+
+		$this->_validate();
+		$this->_setCounter();
+
+		return true;
+	}
+
+	/**
+	 * Create a new session and copy variables from the old one
+	 *
+	 * @return  boolean $result true on success
+	 *
+	 * @since   1.0
+	 */
+	public function fork()
+	{
+		if ($this->getState() !== 'active')
+		{
+			// @TODO :: generated error here
+			return false;
+		}
+
+		// Keep session config
+		$cookie = session_get_cookie_params();
+
+		// Kill session
+		session_destroy();
+
+		// Re-register the session store after a session has been destroyed, to avoid PHP bug
+		$this->store->register();
+
+		// Restore config
+		session_set_cookie_params($cookie['lifetime'], $cookie['path'], $cookie['domain'], $cookie['secure'], true);
+
+		// Restart session with new id
+		session_regenerate_id(true);
+		session_start();
+
+		return true;
+	}
+
+	/**
+	 * Writes session data and ends session
+	 *
+	 * Session data is usually stored after your script terminated without the need
+	 * to call JSession::close(), but as session data is locked to prevent concurrent
+	 * writes only one script may operate on a session at any time. When using
+	 * framesets together with sessions you will experience the frames loading one
+	 * by one due to this locking. You can reduce the time needed to load all the
+	 * frames by ending the session as soon as all changes to session variables are
+	 * done.
+	 *
+	 * @return  void
+	 *
+	 * @see     session_write_close()
+	 * @since   1.0
+	 */
+	public function close()
+	{
+		session_write_close();
+	}
+
+	/**
+	 * Set the session expiration
+	 *
+	 * @param   integer  $expire  Maximum age of unused session in minutes
+	 *
+	 * @return  $this
+	 *
+	 * @since   1.3.0
+	 */
+	protected function setExpire($expire)
+	{
+		$this->expire = $expire;
+
+		return $this;
+	}
+
+	/**
+	 * Set the session state
+	 *
+	 * @param   string  $state  Internal state
+	 *
+	 * @return  $this
+	 *
+	 * @since   1.3.0
+	 */
+	protected function setState($state)
+	{
+		$this->state = $state;
+
+		return $this;
+	}
+
+	/**
+	 * Set session cookie parameters
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	protected function _setCookieParams()
+	{
+		$cookie = session_get_cookie_params();
+
+		if ($this->force_ssl)
+		{
+			$cookie['secure'] = true;
+		}
+
+		if ($this->cookie_domain)
+		{
+			$cookie['domain'] = $this->cookie_domain;
+		}
+
+		if ($this->cookie_path)
+		{
+			$cookie['path'] = $this->cookie_path;
+		}
+
+		session_set_cookie_params($cookie['lifetime'], $cookie['path'], $cookie['domain'], $cookie['secure'], true);
+	}
+
+	/**
+	 * Create a token-string
+	 *
+	 * @param   integer  $length  Length of string
+	 *
+	 * @return  string  Generated token
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  Use createToken instead
+	 */
+	protected function _createToken($length = 32)
+	{
+		return $this->createToken($length);
+	}
+
+	/**
+	 * Create a token-string
+	 *
+	 * @param   integer  $length  Length of string
+	 *
+	 * @return  string  Generated token
+	 *
+	 * @since   1.3.1
+	 */
+	protected function createToken($length = 32)
+	{
+		return bin2hex(random_bytes($length));
+	}
+
+	/**
+	 * Set counter of session usage
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  Use setCounter instead
+	 */
+	protected function _setCounter()
+	{
+		return $this->setCounter();
+	}
+
+	/**
+	 * Set counter of session usage
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.3.0
+	 */
+	protected function setCounter()
+	{
+		$counter = $this->get('session.counter', 0);
+		++$counter;
+
+		$this->set('session.counter', $counter);
+
+		return true;
+	}
+
+	/**
+	 * Set the session timers
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  Use setTimers instead
+	 */
+	protected function _setTimers()
+	{
+		return $this->setTimers();
+	}
+
+	/**
+	 * Set the session timers
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.3.0
+	 */
+	protected function setTimers()
+	{
+		if (!$this->has('session.timer.start'))
+		{
+			$start = time();
+
+			$this->set('session.timer.start', $start);
+			$this->set('session.timer.last', $start);
+			$this->set('session.timer.now', $start);
+		}
+
+		$this->set('session.timer.last', $this->get('session.timer.now'));
+		$this->set('session.timer.now', time());
+
+		return true;
+	}
+
+	/**
+	 * Set additional session options
+	 *
+	 * @param   array  $options  List of parameter
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0  Use setOptions instead
+	 */
+	protected function _setOptions(array $options)
+	{
+		return $this->setOptions($options);
+	}
+
+	/**
+	 * Set additional session options
+	 *
+	 * @param   array  $options  List of parameter
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.3.0
+	 */
+	protected function setOptions(array $options)
+	{
+		// Set name
+		if (isset($options['name']))
+		{
+			session_name(md5($options['name']));
+		}
+
+		// Set id
+		if (isset($options['id']))
+		{
+			session_id($options['id']);
+		}
+
+		// Set expire time
+		if (isset($options['expire']))
+		{
+			$this->setExpire($options['expire']);
+		}
+
+		// Get security options
+		if (isset($options['security']))
+		{
+			$this->security = explode(',', $options['security']);
+		}
+
+		if (isset($options['force_ssl']))
+		{
+			$this->force_ssl = (bool) $options['force_ssl'];
+		}
+
+		if (isset($options['cookie_domain']))
+		{
+			$this->cookie_domain = $options['cookie_domain'];
+		}
+
+		if (isset($options['cookie_path']))
+		{
+			$this->cookie_path = $options['cookie_path'];
+		}
+
+		// Sync the session maxlifetime
+		ini_set('session.gc_maxlifetime', $this->getExpire());
+
+		return true;
+	}
+
+	/**
+	 * Do some checks for security reason
+	 *
+	 * - timeout check (expire)
+	 * - ip-fixiation
+	 * - browser-fixiation
+	 *
+	 * If one check failed, session data has to be cleaned.
+	 *
+	 * @param   boolean  $restart  Reactivate session
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     http://shiflett.org/articles/the-truth-about-sessions
+	 * @since   1.0
+	 * @deprecated  2.0  Use validate instead
+	 */
+	protected function _validate($restart = false)
+	{
+		return $this->validate($restart);
+	}
+
+	/**
+	 * Do some checks for security reason
+	 *
+	 * - timeout check (expire)
+	 * - ip-fixiation
+	 * - browser-fixiation
+	 *
+	 * If one check failed, session data has to be cleaned.
+	 *
+	 * @param   boolean  $restart  Reactivate session
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @see     http://shiflett.org/articles/the-truth-about-sessions
+	 * @since   1.3.0
+	 */
+	protected function validate($restart = false)
+	{
+		// Allow to restart a session
+		if ($restart)
+		{
+			$this->setState('active');
+
+			$this->set('session.client.address', null);
+			$this->set('session.client.forwarded', null);
+			$this->set('session.token', null);
+		}
+
+		// Check if session has expired
+		if ($this->getExpire())
+		{
+			$curTime = $this->get('session.timer.now', 0);
+			$maxTime = $this->get('session.timer.last', 0) + $this->getExpire();
+
+			// Empty session variables
+			if ($maxTime < $curTime)
+			{
+				$this->setState('expired');
+
+				return false;
+			}
+		}
+
+		$remoteAddr = $this->input->server->getString('REMOTE_ADDR', '');
+
+		// Check for client address
+		if (in_array('fix_adress', $this->security) && !empty($remoteAddr) && filter_var($remoteAddr, FILTER_VALIDATE_IP) !== false)
+		{
+			$ip = $this->get('session.client.address');
+
+			if ($ip === null)
+			{
+				$this->set('session.client.address', $remoteAddr);
+			}
+			elseif ($remoteAddr !== $ip)
+			{
+				$this->setState('error');
+
+				return false;
+			}
+		}
+
+		$xForwardedFor = $this->input->server->getString('HTTP_X_FORWARDED_FOR', '');
+
+		// Record proxy forwarded for in the session in case we need it later
+		if (!empty($xForwardedFor) && filter_var($xForwardedFor, FILTER_VALIDATE_IP) !== false)
+		{
+			$this->set('session.client.forwarded', $xForwardedFor);
+		}
+
+		return true;
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage.php
new file mode 100644
index 00000000..42d59532
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session;
+
+use Joomla\Filter\InputFilter;
+
+/**
+ * Custom session storage handler for PHP
+ *
+ * @see         http://www.php.net/manual/en/function.session-set-save-handler.php
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed.
+ */
+abstract class Storage
+{
+	/**
+	 * @var    Storage[]  Storage instances container.
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected static $instances = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		$this->register($options);
+	}
+
+	/**
+	 * Returns a session storage handler object, only creating it if it doesn't already exist.
+	 *
+	 * @param   string  $name     The session store to instantiate
+	 * @param   array   $options  Array of options
+	 *
+	 * @return  Storage
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public static function getInstance($name = 'none', $options = array())
+	{
+		$filter = new InputFilter;
+		$name = strtolower($filter->clean($name, 'word'));
+
+		if (empty(self::$instances[$name]))
+		{
+			$class = '\\Joomla\\Session\\Storage\\' . ucfirst($name);
+
+			if (!class_exists($class))
+			{
+				$path = __DIR__ . '/storage/' . $name . '.php';
+
+				if (file_exists($path))
+				{
+					require_once $path;
+				}
+				else
+				{
+					// No attempt to die gracefully here, as it tries to close the non-existing session
+					exit('Unable to load session storage class: ' . $name);
+				}
+			}
+
+			self::$instances[$name] = new $class($options);
+		}
+
+		return self::$instances[$name];
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function register()
+	{
+		// Use this object as the session handler
+		session_set_save_handler(
+			array($this, 'open'), array($this, 'close'), array($this, 'read'), array($this, 'write'),
+			array($this, 'destroy'), array($this, 'gc')
+		);
+	}
+
+	/**
+	 * Open the SessionHandler backend.
+	 *
+	 * @param   string  $save_path     The path to the session object.
+	 * @param   string  $session_name  The name of the session.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function open($save_path, $session_name)
+	{
+		return true;
+	}
+
+	/**
+	 * Close the SessionHandler backend.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function close()
+	{
+		return true;
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the
+	 * SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function read($id)
+	{
+		return;
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id            The session identifier.
+	 * @param   string  $session_data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function write($id, $session_data)
+	{
+		return true;
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the
+	 * SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function destroy($id)
+	{
+		return true;
+	}
+
+	/**
+	 * Garbage collect stale sessions from the SessionHandler backend.
+	 *
+	 * @param   integer  $maxlifetime  The maximum age of a session.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function gc($maxlifetime = null)
+	{
+		return true;
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public static function isSupported()
+	{
+		return true;
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Apc.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Apc.php
new file mode 100644
index 00000000..ce219e2b
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Apc.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+
+/**
+ * APC session storage handler for PHP
+ *
+ * @see         http://www.php.net/manual/en/function.session-set-save-handler.php
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed.
+ */
+class Apc extends Storage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('APC Extension is not available', 404);
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the
+	 * SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function read($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return (string) apc_fetch($sess_id);
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id            The session identifier.
+	 * @param   string  $session_data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function write($id, $session_data)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return apc_store($sess_id, $session_data, ini_get("session.gc_maxlifetime"));
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function destroy($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return apc_delete($sess_id);
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public static function isSupported()
+	{
+		return extension_loaded('apc');
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Database.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Database.php
new file mode 100644
index 00000000..c855c4ff
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Database.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+use Joomla\Database\DatabaseDriver;
+
+/**
+ * Database session storage handler for PHP
+ *
+ * @see         http://www.php.net/manual/en/function.session-set-save-handler.php
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed
+ */
+class Database extends Storage
+{
+	/**
+	 * The DatabaseDriver to use when querying.
+	 *
+	 * @var    DatabaseDriver
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected $db;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters. A `dbo` options is required.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		if (isset($options['db']) && ($options['db'] instanceof DatabaseDriver))
+		{
+			parent::__construct($options);
+			$this->db = $options['db'];
+		}
+		else
+		{
+			throw new \RuntimeException(
+				sprintf('The %s storage engine requires a `db` option that is an instance of Joomla\\Database\\DatabaseDriver.', __CLASS__)
+			);
+		}
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function read($id)
+	{
+		try
+		{
+			// Get the session data from the database table.
+			$query = $this->db->getQuery(true);
+			$query->select($this->db->quoteName('data'))
+			->from($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = ' . $this->db->quote($id));
+
+			$this->db->setQuery($query);
+
+			return (string) $this->db->loadResult();
+		}
+		catch (\Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id    The session identifier.
+	 * @param   string  $data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function write($id, $data)
+	{
+		try
+		{
+			$query = $this->db->getQuery(true);
+			$query->update($this->db->quoteName('#__session'))
+			->set($this->db->quoteName('data') . ' = ' . $this->db->quote($data))
+			->set($this->db->quoteName('time') . ' = ' . $this->db->quote((int) time()))
+			->where($this->db->quoteName('session_id') . ' = ' . $this->db->quote($id));
+
+			// Try to update the session data in the database table.
+			$this->db->setQuery($query);
+
+			if (!$this->db->execute())
+			{
+				return false;
+			}
+
+			// Since $this->db->execute did not throw an exception the query was successful.
+			// Either the data changed, or the data was identical. In either case we are done.
+
+			return true;
+		}
+		catch (\Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function destroy($id)
+	{
+		try
+		{
+			$query = $this->db->getQuery(true);
+			$query->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('session_id') . ' = ' . $this->db->quote($id));
+
+			// Remove a session from the database.
+			$this->db->setQuery($query);
+
+			return (boolean) $this->db->execute();
+		}
+		catch (\Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Garbage collect stale sessions from the SessionHandler backend.
+	 *
+	 * @param   integer  $lifetime  The maximum age of a session.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function gc($lifetime = 1440)
+	{
+		// Determine the timestamp threshold with which to purge old sessions.
+		$past = time() - $lifetime;
+
+		try
+		{
+			$query = $this->db->getQuery(true);
+			$query->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('time') . ' < ' . $this->db->quote((int) $past));
+
+			// Remove expired sessions from the database.
+			$this->db->setQuery($query);
+
+			return (boolean) $this->db->execute();
+		}
+		catch (\Exception $e)
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcache.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcache.php
new file mode 100644
index 00000000..e03fb921
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcache.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+
+/**
+ * Memcache session storage handler for PHP
+ *
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed
+ */
+class Memcache extends Storage
+{
+	/**
+	 * Container for server data
+	 *
+	 * @var    array
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected $_servers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('Memcache Extension is not available', 404);
+		}
+
+		// This will be an array of loveliness
+		// @todo: multiple servers
+		$this->_servers = array(
+			array(
+				'host' => isset($options['memcache_server_host']) ? $options['memcache_server_host'] : 'localhost',
+				'port' => isset($options['memcache_server_port']) ? $options['memcache_server_port'] : 11211
+			)
+		);
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function register()
+	{
+		ini_set('session.save_path', $this->_servers[0]['host'] . ':' . $this->_servers[0]['port']);
+		ini_set('session.save_handler', 'memcache');
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	static public function isSupported()
+	{
+		return (extension_loaded('memcache') && class_exists('Memcache'));
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcached.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcached.php
new file mode 100644
index 00000000..cfb7a1e3
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Memcached.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+
+/**
+ * Memcached session storage handler for PHP
+ *
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed
+ */
+class Memcached extends Storage
+{
+	/**
+	 * Container for server data
+	 *
+	 * @var    array
+	 * @since  1.0
+	 * @deprecated  2.0
+	 */
+	protected $_servers = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('Memcached Extension is not available', 404);
+		}
+
+		// This will be an array of loveliness
+		// @todo: multiple servers
+		$this->_servers = array(
+			array(
+				'host' => isset($options['memcache_server_host']) ? $options['memcache_server_host'] : 'localhost',
+				'port' => isset($options['memcache_server_port']) ? $options['memcache_server_port'] : 11211
+			)
+		);
+
+		// Only construct parent AFTER host and port are sent, otherwise when register is called this will fail.
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function register()
+	{
+		ini_set('session.save_path', $this->_servers[0]['host'] . ':' . $this->_servers[0]['port']);
+		ini_set('session.save_handler', 'memcached');
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	static public function isSupported()
+	{
+		/*
+		 * GAE and HHVM have both had instances where Memcached the class was defined but no extension was loaded.
+		 * If the class is there, we can assume it works.
+		 */
+		return (class_exists('Memcached'));
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/None.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/None.php
new file mode 100644
index 00000000..f374e7c8
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/None.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+
+/**
+ * Default PHP configured session handler for Joomla!
+ *
+ * @see         http://www.php.net/manual/en/function.session-set-save-handler.php
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed
+ */
+class None extends Storage
+{
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function register()
+	{
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Wincache.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Wincache.php
new file mode 100644
index 00000000..82e206fe
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Wincache.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+
+/**
+ * WINCACHE session storage handler for PHP
+ *
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed
+ */
+class Wincache extends Storage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('Wincache Extension is not available', 404);
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Register the functions of this class with PHP's session handler
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function register()
+	{
+		ini_set('session.save_handler', 'wincache');
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	static public function isSupported()
+	{
+		return (extension_loaded('wincache') && function_exists('wincache_ucache_get') && !strcmp(ini_get('wincache.ucenabled'), "1"));
+	}
+}
diff --git a/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Xcache.php b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Xcache.php
new file mode 100644
index 00000000..c69ca9ea
--- /dev/null
+++ b/core/libraries/vendor/joomla/session/Joomla/Session/Storage/Xcache.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Part of the Joomla Framework Session Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Session\Storage;
+
+use Joomla\Session\Storage;
+
+/**
+ * XCache session storage handler
+ *
+ * @since       1.0
+ * @deprecated  2.0  The Storage class chain will be removed
+ */
+class Xcache extends Storage
+{
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $options  Optional parameters.
+	 *
+	 * @since   1.0
+	 * @throws  \RuntimeException
+	 * @deprecated  2.0
+	 */
+	public function __construct($options = array())
+	{
+		if (!self::isSupported())
+		{
+			throw new \RuntimeException('XCache Extension is not available', 404);
+		}
+
+		parent::__construct($options);
+	}
+
+	/**
+	 * Read the data for a particular session identifier from the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  string  The session data.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function read($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		// Check if id exists
+		if (!xcache_isset($sess_id))
+		{
+			return;
+		}
+
+		return (string) xcache_get($sess_id);
+	}
+
+	/**
+	 * Write session data to the SessionHandler backend.
+	 *
+	 * @param   string  $id            The session identifier.
+	 * @param   string  $session_data  The session data.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function write($id, $session_data)
+	{
+		$sess_id = 'sess_' . $id;
+
+		return xcache_set($sess_id, $session_data, ini_get("session.gc_maxlifetime"));
+	}
+
+	/**
+	 * Destroy the data for a particular session identifier in the SessionHandler backend.
+	 *
+	 * @param   string  $id  The session identifier.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	public function destroy($id)
+	{
+		$sess_id = 'sess_' . $id;
+
+		if (!xcache_isset($sess_id))
+		{
+			return true;
+		}
+
+		return xcache_unset($sess_id);
+	}
+
+	/**
+	 * Test to see if the SessionHandler is available.
+	 *
+	 * @return  boolean  True on success, false otherwise.
+	 *
+	 * @since   1.0
+	 * @deprecated  2.0
+	 */
+	static public function isSupported()
+	{
+		return (extension_loaded('xcache'));
+	}
+}
diff --git a/core/libraries/vendor/joomla/string/LICENSE b/core/libraries/vendor/joomla/string/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/string/src/Inflector.php b/core/libraries/vendor/joomla/string/src/Inflector.php
new file mode 100644
index 00000000..fd9c1897
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/Inflector.php
@@ -0,0 +1,482 @@
+<?php
+/**
+ * Part of the Joomla Framework String Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\String;
+
+use InvalidArgumentException;
+
+/**
+ * Joomla Framework String Inflector Class
+ *
+ * The Inflector transforms words
+ *
+ * @since  1.0
+ */
+class Inflector
+{
+	/**
+	 * The singleton instance.
+	 *
+	 * @var    Inflector
+	 * @since  1.0
+	 */
+	private static $instance;
+
+	/**
+	 * The inflector rules for singularisation, pluralisation and countability.
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $rules = array(
+		'singular' => array(
+			'/(matr)ices$/i' => '\1ix',
+			'/(vert|ind)ices$/i' => '\1ex',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us',
+			'/([ftw]ax)es/i' => '\1',
+			'/(cris|ax|test)es$/i' => '\1is',
+			'/(shoe|slave)s$/i' => '\1',
+			'/(o)es$/i' => '\1',
+			'/([^aeiouy]|qu)ies$/i' => '\1y',
+			'/$1ses$/i' => '\s',
+			'/ses$/i' => '\s',
+			'/eaus$/' => 'eau',
+			'/^(.*us)$/' => '\\1',
+			'/s$/i' => '',
+		),
+		'plural' => array(
+			'/([m|l])ouse$/i' => '\1ice',
+			'/(matr|vert|ind)(ix|ex)$/i'  => '\1ices',
+			'/(x|ch|ss|sh)$/i' => '\1es',
+			'/([^aeiouy]|qu)y$/i' => '\1ies',
+			'/([^aeiouy]|qu)ies$/i' => '\1y',
+			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
+			'/sis$/i' => 'ses',
+			'/([ti])um$/i' => '\1a',
+			'/(buffal|tomat)o$/i' => '\1\2oes',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
+			'/us$/i' => 'uses',
+			'/(ax|cris|test)is$/i' => '\1es',
+			'/s$/i' => 's',
+			'/$/' => 's',
+		),
+		'countable' => array(
+			'id',
+			'hits',
+			'clicks',
+		),
+	);
+
+	/**
+	 * Cached inflections.
+	 *
+	 * The array is in the form [singular => plural]
+	 *
+	 * @var    array
+	 * @since  1.0
+	 */
+	private $cache = array();
+
+	/**
+	 * Protected constructor.
+	 *
+	 * @since  1.0
+	 */
+	protected function __construct()
+	{
+		// Pre=populate the irregual singular/plural.
+		$this
+			->addWord('deer')
+			->addWord('moose')
+			->addWord('sheep')
+			->addWord('bison')
+			->addWord('salmon')
+			->addWord('pike')
+			->addWord('trout')
+			->addWord('fish')
+			->addWord('swine')
+
+			->addWord('alias', 'aliases')
+			->addWord('bus', 'buses')
+			->addWord('foot', 'feet')
+			->addWord('goose', 'geese')
+			->addWord('hive', 'hives')
+			->addWord('louse', 'lice')
+			->addWord('man', 'men')
+			->addWord('mouse', 'mice')
+			->addWord('ox', 'oxen')
+			->addWord('quiz', 'quizes')
+			->addWord('status', 'statuses')
+			->addWord('tooth', 'teeth')
+			->addWord('woman', 'women');
+	}
+
+	/**
+	 * Adds inflection regex rules to the inflector.
+	 *
+	 * @param   mixed   $data      A string or an array of strings or regex rules to add.
+	 * @param   string  $ruleType  The rule type: singular | plural | countable
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 * @throws  InvalidArgumentException
+	 */
+	private function addRule($data, $ruleType)
+	{
+		if (is_string($data))
+		{
+			$data = array($data);
+		}
+		elseif (!is_array($data))
+		{
+			// Do not translate.
+			throw new InvalidArgumentException('Invalid inflector rule data.');
+		}
+
+		foreach ($data as $rule)
+		{
+			// Ensure a string is pushed.
+			array_push($this->rules[$ruleType], (string) $rule);
+		}
+	}
+
+	/**
+	 * Gets an inflected word from the cache where the singular form is supplied.
+	 *
+	 * @param   string  $singular  A singular form of a word.
+	 *
+	 * @return  mixed  The cached inflection or false if none found.
+	 *
+	 * @since   1.0
+	 */
+	private function getCachedPlural($singular)
+	{
+		$singular = StringHelper::strtolower($singular);
+
+		// Check if the word is in cache.
+		if (isset($this->cache[$singular]))
+		{
+			return $this->cache[$singular];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets an inflected word from the cache where the plural form is supplied.
+	 *
+	 * @param   string  $plural  A plural form of a word.
+	 *
+	 * @return  mixed  The cached inflection or false if none found.
+	 *
+	 * @since   1.0
+	 */
+	private function getCachedSingular($plural)
+	{
+		$plural = StringHelper::strtolower($plural);
+
+		return array_search($plural, $this->cache);
+	}
+
+	/**
+	 * Execute a regex from rules.
+	 *
+	 * The 'plural' rule type expects a singular word.
+	 * The 'singular' rule type expects a plural word.
+	 *
+	 * @param   string  $word      The string input.
+	 * @param   string  $ruleType  String (eg, singular|plural)
+	 *
+	 * @return  mixed  An inflected string, or false if no rule could be applied.
+	 *
+	 * @since   1.0
+	 */
+	private function matchRegexRule($word, $ruleType)
+	{
+		// Cycle through the regex rules.
+		foreach ($this->rules[$ruleType] as $regex => $replacement)
+		{
+			$matches = 0;
+			$matchedWord = preg_replace($regex, $replacement, $word, -1, $matches);
+
+			if ($matches > 0)
+			{
+				return $matchedWord;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets an inflected word in the cache.
+	 *
+	 * @param   string  $singular  The singular form of the word.
+	 * @param   string  $plural    The plural form of the word. If omitted, it is assumed the singular and plural are identical.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	private function setCache($singular, $plural = null)
+	{
+		$singular = StringHelper::strtolower($singular);
+
+		if ($plural === null)
+		{
+			$plural = $singular;
+		}
+		else
+		{
+			$plural = StringHelper::strtolower($plural);
+		}
+
+		$this->cache[$singular] = $plural;
+	}
+
+	/**
+	 * Adds a countable word.
+	 *
+	 * @param   mixed  $data  A string or an array of strings to add.
+	 *
+	 * @return  Inflector  Returns this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function addCountableRule($data)
+	{
+		$this->addRule($data, 'countable');
+
+		return $this;
+	}
+
+	/**
+	 * Adds a specific singular-plural pair for a word.
+	 *
+	 * @param   string  $singular  The singular form of the word.
+	 * @param   string  $plural    The plural form of the word. If omitted, it is assumed the singular and plural are identical.
+	 *
+	 * @return  Inflector  Returns this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function addWord($singular, $plural =null)
+	{
+		$this->setCache($singular, $plural);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a pluralisation rule.
+	 *
+	 * @param   mixed  $data  A string or an array of regex rules to add.
+	 *
+	 * @return  Inflector  Returns this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function addPluraliseRule($data)
+	{
+		$this->addRule($data, 'plural');
+
+		return $this;
+	}
+
+	/**
+	 * Adds a singularisation rule.
+	 *
+	 * @param   mixed  $data  A string or an array of regex rules to add.
+	 *
+	 * @return  Inflector  Returns this object to support chaining.
+	 *
+	 * @since   1.0
+	 */
+	public function addSingulariseRule($data)
+	{
+		$this->addRule($data, 'singular');
+
+		return $this;
+	}
+
+	/**
+	 * Gets an instance of the JStringInflector singleton.
+	 *
+	 * @param   boolean  $new  If true (default is false), returns a new instance regardless if one exists.
+	 *                         This argument is mainly used for testing.
+	 *
+	 * @return  Inflector
+	 *
+	 * @since   1.0
+	 */
+	public static function getInstance($new = false)
+	{
+		if ($new)
+		{
+			return new static;
+		}
+		elseif (!is_object(self::$instance))
+		{
+			self::$instance = new static;
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Checks if a word is countable.
+	 *
+	 * @param   string  $word  The string input.
+	 *
+	 * @return  boolean  True if word is countable, false otherwise.
+	 *
+	 * @since   1.0
+	 */
+	public function isCountable($word)
+	{
+		return (boolean) in_array($word, $this->rules['countable']);
+	}
+
+	/**
+	 * Checks if a word is in a plural form.
+	 *
+	 * @param   string  $word  The string input.
+	 *
+	 * @return  boolean  True if word is plural, false if not.
+	 *
+	 * @since   1.0
+	 */
+	public function isPlural($word)
+	{
+		// Try the cache for an known inflection.
+		$inflection = $this->getCachedSingular($word);
+
+		if ($inflection !== false)
+		{
+			return true;
+		}
+
+		$singularWord = $this->toSingular($word);
+
+		if ($singularWord === false)
+		{
+			return false;
+		}
+
+		// Compute the inflection to cache the values, and compare.
+		return $this->toPlural($singularWord) == $word;
+	}
+
+	/**
+	 * Checks if a word is in a singular form.
+	 *
+	 * @param   string  $word  The string input.
+	 *
+	 * @return  boolean  True if word is singular, false if not.
+	 *
+	 * @since   1.0
+	 */
+	public function isSingular($word)
+	{
+		// Try the cache for an known inflection.
+		$inflection = $this->getCachedPlural($word);
+
+		if ($inflection !== false)
+		{
+			return true;
+		}
+
+		$pluralWord = $this->toPlural($word);
+
+		if ($pluralWord === false)
+		{
+			return false;
+		}
+
+		// Compute the inflection to cache the values, and compare.
+		return $this->toSingular($pluralWord) == $word;
+	}
+
+	/**
+	 * Converts a word into its plural form.
+	 *
+	 * @param   string  $word  The singular word to pluralise.
+	 *
+	 * @return  mixed  An inflected string, or false if no rule could be applied.
+	 *
+	 * @since   1.0
+	 */
+	public function toPlural($word)
+	{
+		// Try to get the cached plural form from the singular.
+		$cache = $this->getCachedPlural($word);
+
+		if ($cache !== false)
+		{
+			return $cache;
+		}
+
+		// Check if the word is a known singular.
+		if ($this->getCachedSingular($word))
+		{
+			return false;
+		}
+
+		// Compute the inflection.
+		$inflected = $this->matchRegexRule($word, 'plural');
+
+		if ($inflected !== false)
+		{
+			$this->setCache($word, $inflected);
+
+			return $inflected;
+		}
+
+		// Dead code
+		return false;
+	}
+
+	/**
+	 * Converts a word into its singular form.
+	 *
+	 * @param   string  $word  The plural word to singularise.
+	 *
+	 * @return  mixed  An inflected string, or false if no rule could be applied.
+	 *
+	 * @since   1.0
+	 */
+	public function toSingular($word)
+	{
+		// Try to get the cached singular form from the plural.
+		$cache = $this->getCachedSingular($word);
+
+		if ($cache !== false)
+		{
+			return $cache;
+		}
+
+		// Check if the word is a known plural.
+		if ($this->getCachedPlural($word))
+		{
+			return false;
+		}
+
+		// Compute the inflection.
+		$inflected = $this->matchRegexRule($word, 'singular');
+
+		if ($inflected !== false)
+		{
+			$this->setCache($inflected, $word);
+
+			return $inflected;
+		}
+
+		return false;
+	}
+}
diff --git a/core/libraries/vendor/joomla/string/src/Normalise.php b/core/libraries/vendor/joomla/string/src/Normalise.php
new file mode 100644
index 00000000..10600552
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/Normalise.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Part of the Joomla Framework String Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\String;
+
+/**
+ * Joomla Framework String Normalise Class
+ *
+ * @since  1.0
+ */
+abstract class Normalise
+{
+	/**
+	 * Method to convert a string from camel case.
+	 *
+	 * This method offers two modes. Grouped allows for splitting on groups of uppercase characters as follows:
+	 *
+	 * "FooBarABCDef"            becomes  array("Foo", "Bar", "ABC", "Def")
+	 * "JFooBar"                 becomes  array("J", "Foo", "Bar")
+	 * "J001FooBar002"           becomes  array("J001", "Foo", "Bar002")
+	 * "abcDef"                  becomes  array("abc", "Def")
+	 * "abc_defGhi_Jkl"          becomes  array("abc_def", "Ghi_Jkl")
+	 * "ThisIsA_NASAAstronaut"   becomes  array("This", "Is", "A_NASA", "Astronaut"))
+	 * "JohnFitzgerald_Kennedy"  becomes  array("John", "Fitzgerald_Kennedy"))
+	 *
+	 * Non-grouped will split strings at each uppercase character.
+	 *
+	 * @param   string   $input    The string input (ASCII only).
+	 * @param   boolean  $grouped  Optionally allows splitting on groups of uppercase characters.
+	 *
+	 * @return  string  The space separated string.
+	 *
+	 * @since   1.0
+	 */
+	public static function fromCamelCase($input, $grouped = false)
+	{
+		return $grouped
+			? preg_split('/(?<=[^A-Z_])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][^A-Z_])/x', $input)
+			: trim(preg_replace('#([A-Z])#', ' $1', $input));
+	}
+
+	/**
+	 * Method to convert a string into camel case.
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return  string  The camel case string.
+	 *
+	 * @since   1.0
+	 */
+	public static function toCamelCase($input)
+	{
+		// Convert words to uppercase and then remove spaces.
+		$input = self::toSpaceSeparated($input);
+		$input = ucwords($input);
+		$input = str_ireplace(' ', '', $input);
+
+		return $input;
+	}
+
+	/**
+	 * Method to convert a string into dash separated form.
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return  string  The dash separated string.
+	 *
+	 * @since   1.0
+	 */
+	public static function toDashSeparated($input)
+	{
+		// Convert spaces and underscores to dashes.
+		$input = preg_replace('#[ \-_]+#', '-', $input);
+
+		return $input;
+	}
+
+	/**
+	 * Method to convert a string into space separated form.
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return  string  The space separated string.
+	 *
+	 * @since   1.0
+	 */
+	public static function toSpaceSeparated($input)
+	{
+		// Convert underscores and dashes to spaces.
+		$input = preg_replace('#[ \-_]+#', ' ', $input);
+
+		return $input;
+	}
+
+	/**
+	 * Method to convert a string into underscore separated form.
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return  string  The underscore separated string.
+	 *
+	 * @since   1.0
+	 */
+	public static function toUnderscoreSeparated($input)
+	{
+		// Convert spaces and dashes to underscores.
+		$input = preg_replace('#[ \-_]+#', '_', $input);
+
+		return $input;
+	}
+
+	/**
+	 * Method to convert a string into variable form.
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return  string  The variable string.
+	 *
+	 * @since   1.0
+	 */
+	public static function toVariable($input)
+	{
+		// Remove dashes and underscores, then convert to camel case.
+		$input = self::toSpaceSeparated($input);
+		$input = self::toCamelCase($input);
+
+		// Remove leading digits.
+		$input = preg_replace('#^[0-9]+#', '', $input);
+
+		// Lowercase the first character.
+		$first = substr($input, 0, 1);
+		$first = strtolower($first);
+
+		// Replace the first character with the lowercase character.
+		$input = substr_replace($input, $first, 0, 1);
+
+		return $input;
+	}
+
+	/**
+	 * Method to convert a string into key form.
+	 *
+	 * @param   string  $input  The string input (ASCII only).
+	 *
+	 * @return  string  The key string.
+	 *
+	 * @since   1.0
+	 */
+	public static function toKey($input)
+	{
+		// Remove spaces and dashes, then convert to lower case.
+		$input = self::toUnderscoreSeparated($input);
+		$input = strtolower($input);
+
+		return $input;
+	}
+}
diff --git a/core/libraries/vendor/joomla/string/src/String.php b/core/libraries/vendor/joomla/string/src/String.php
new file mode 100644
index 00000000..f535e087
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/String.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Part of the Joomla Framework String Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\String;
+
+/**
+ * String handling class for utf-8 data
+ * Wraps the phputf8 library
+ * All functions assume the validity of utf-8 strings.
+ *
+ * @since       1.0
+ * @deprecated  2.0  Use StringHelper instead
+ */
+abstract class String extends StringHelper
+{
+}
diff --git a/core/libraries/vendor/joomla/string/src/StringHelper.php b/core/libraries/vendor/joomla/string/src/StringHelper.php
new file mode 100644
index 00000000..ff8172d5
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/StringHelper.php
@@ -0,0 +1,840 @@
+<?php
+/**
+ * Part of the Joomla Framework String Package
+ *
+ * @copyright  Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\String;
+
+// PHP mbstring and iconv local configuration
+if (version_compare(PHP_VERSION, '5.6', '>='))
+{
+	@ini_set('default_charset', 'UTF-8');
+}
+else
+{
+	// Check if mbstring extension is loaded and attempt to load it if not present except for windows
+	if (extension_loaded('mbstring'))
+	{
+		@ini_set('mbstring.internal_encoding', 'UTF-8');
+		@ini_set('mbstring.http_input', 'UTF-8');
+		@ini_set('mbstring.http_output', 'UTF-8');
+	}
+
+	// Same for iconv
+	if (function_exists('iconv'))
+	{
+		iconv_set_encoding('internal_encoding', 'UTF-8');
+		iconv_set_encoding('input_encoding', 'UTF-8');
+		iconv_set_encoding('output_encoding', 'UTF-8');
+	}
+}
+
+/**
+ * String handling class for UTF-8 data wrapping the phputf8 library. All functions assume the validity of UTF-8 strings.
+ *
+ * @since  1.3.0
+ */
+abstract class StringHelper
+{
+	/**
+	 * Increment styles.
+	 *
+	 * @var    array
+	 * @since  1.3.0
+	 */
+	protected static $incrementStyles = array(
+		'dash' => array(
+			'#-(\d+)$#',
+			'-%d'
+		),
+		'default' => array(
+			array('#\((\d+)\)$#', '#\(\d+\)$#'),
+			array(' (%d)', '(%d)'),
+		),
+	);
+
+	/**
+	 * Increments a trailing number in a string.
+	 *
+	 * Used to easily create distinct labels when copying objects. The method has the following styles:
+	 *
+	 * default: "Label" becomes "Label (2)"
+	 * dash:    "Label" becomes "Label-2"
+	 *
+	 * @param   string   $string  The source string.
+	 * @param   string   $style   The the style (default|dash).
+	 * @param   integer  $n       If supplied, this number is used for the copy, otherwise it is the 'next' number.
+	 *
+	 * @return  string  The incremented string.
+	 *
+	 * @since   1.3.0
+	 */
+	public static function increment($string, $style = 'default', $n = 0)
+	{
+		$styleSpec = isset(static::$incrementStyles[$style]) ? static::$incrementStyles[$style] : static::$incrementStyles['default'];
+
+		// Regular expression search and replace patterns.
+		if (is_array($styleSpec[0]))
+		{
+			$rxSearch = $styleSpec[0][0];
+			$rxReplace = $styleSpec[0][1];
+		}
+		else
+		{
+			$rxSearch = $rxReplace = $styleSpec[0];
+		}
+
+		// New and old (existing) sprintf formats.
+		if (is_array($styleSpec[1]))
+		{
+			$newFormat = $styleSpec[1][0];
+			$oldFormat = $styleSpec[1][1];
+		}
+		else
+		{
+			$newFormat = $oldFormat = $styleSpec[1];
+		}
+
+		// Check if we are incrementing an existing pattern, or appending a new one.
+		if (preg_match($rxSearch, $string, $matches))
+		{
+			$n = empty($n) ? ($matches[1] + 1) : $n;
+			$string = preg_replace($rxReplace, sprintf($oldFormat, $n), $string);
+		}
+		else
+		{
+			$n = empty($n) ? 2 : $n;
+			$string .= sprintf($newFormat, $n);
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Tests whether a string contains only 7bit ASCII bytes.
+	 *
+	 * You might use this to conditionally check whether a string needs handling as UTF-8 or not, potentially offering performance
+	 * benefits by using the native PHP equivalent if it's just ASCII e.g.;
+	 *
+	 * <code>
+	 * if (StringHelper::is_ascii($someString))
+	 * {
+	 *     // It's just ASCII - use the native PHP version
+	 *     $someString = strtolower($someString);
+	 * }
+	 * else
+	 * {
+	 *     $someString = StringHelper::strtolower($someString);
+	 * }
+	 * </code>
+	 *
+	 * @param   string  $str  The string to test.
+	 *
+	 * @return  boolean True if the string is all ASCII
+	 *
+	 * @since   1.3.0
+	 */
+	public static function is_ascii($str)
+	{
+		return utf8_is_ascii($str);
+	}
+
+	/**
+	 * UTF-8 aware alternative to ord()
+	 *
+	 * Returns the unicode ordinal for a character.
+	 *
+	 * @param   string  $chr  UTF-8 encoded character
+	 *
+	 * @return  integer Unicode ordinal for the character
+	 *
+	 * @see     http://www.php.net/ord
+	 * @since   1.4.0
+	 */
+	public static function ord($chr)
+	{
+		return utf8_ord($chr);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strpos()
+	 *
+	 * Find position of first occurrence of a string.
+	 *
+	 * @param   string   $str     String being examined
+	 * @param   string   $search  String being searched for
+	 * @param   integer  $offset  Optional, specifies the position from which the search should be performed
+	 *
+	 * @return  mixed  Number of characters before the first match or FALSE on failure
+	 *
+	 * @see     http://www.php.net/strpos
+	 * @since   1.3.0
+	 */
+	public static function strpos($str, $search, $offset = false)
+	{
+		if ($offset === false)
+		{
+			return utf8_strpos($str, $search);
+		}
+
+		return utf8_strpos($str, $search, $offset);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strrpos()
+	 *
+	 * Finds position of last occurrence of a string.
+	 *
+	 * @param   string   $str     String being examined.
+	 * @param   string   $search  String being searched for.
+	 * @param   integer  $offset  Offset from the left of the string.
+	 *
+	 * @return  mixed  Number of characters before the last match or false on failure
+	 *
+	 * @see     http://www.php.net/strrpos
+	 * @since   1.3.0
+	 */
+	public static function strrpos($str, $search, $offset = 0)
+	{
+		return utf8_strrpos($str, $search, $offset);
+	}
+
+	/**
+	 * UTF-8 aware alternative to substr()
+	 *
+	 * Return part of a string given character offset (and optionally length).
+	 *
+	 * @param   string   $str     String being processed
+	 * @param   integer  $offset  Number of UTF-8 characters offset (from left)
+	 * @param   integer  $length  Optional length in UTF-8 characters from offset
+	 *
+	 * @return  mixed string or FALSE if failure
+	 *
+	 * @see     http://www.php.net/substr
+	 * @since   1.3.0
+	 */
+	public static function substr($str, $offset, $length = false)
+	{
+		if ($length === false)
+		{
+			return utf8_substr($str, $offset);
+		}
+
+		return utf8_substr($str, $offset, $length);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strtolower()
+	 *
+	 * Make a string lowercase
+	 *
+	 * Note: The concept of a characters "case" only exists is some alphabets such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does
+	 * not exist in the Chinese alphabet, for example. See Unicode Standard Annex #21: Case Mappings
+	 *
+	 * @param   string  $str  String being processed
+	 *
+	 * @return  mixed  Either string in lowercase or FALSE is UTF-8 invalid
+	 *
+	 * @see http://www.php.net/strtolower
+	 * @since   1.3.0
+	 */
+	public static function strtolower($str)
+	{
+		return utf8_strtolower($str);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strtoupper()
+	 *
+	 * Make a string uppercase
+	 *
+	 * Note: The concept of a characters "case" only exists is some alphabets such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does
+	 * not exist in the Chinese alphabet, for example. See Unicode Standard Annex #21: Case Mappings
+	 *
+	 * @param   string  $str  String being processed
+	 *
+	 * @return  mixed  Either string in uppercase or FALSE is UTF-8 invalid
+	 *
+	 * @see     http://www.php.net/strtoupper
+	 * @since   1.3.0
+	 */
+	public static function strtoupper($str)
+	{
+		return utf8_strtoupper($str);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strlen()
+	 *
+	 * Returns the number of characters in the string (NOT THE NUMBER OF BYTES).
+	 *
+	 * @param   string  $str  UTF-8 string.
+	 *
+	 * @return  integer  Number of UTF-8 characters in string.
+	 *
+	 * @see     http://www.php.net/strlen
+	 * @since   1.3.0
+	 */
+	public static function strlen($str)
+	{
+		return utf8_strlen($str);
+	}
+
+	/**
+	 * UTF-8 aware alternative to str_ireplace()
+	 *
+	 * Case-insensitive version of str_replace()
+	 *
+	 * @param   string   $search   String to search
+	 * @param   string   $replace  Existing string to replace
+	 * @param   string   $str      New string to replace with
+	 * @param   integer  $count    Optional count value to be passed by referene
+	 *
+	 * @return  string  UTF-8 String
+	 *
+	 * @see     http://www.php.net/str_ireplace
+	 * @since   1.3.0
+	 */
+	public static function str_ireplace($search, $replace, $str, $count = null)
+	{
+		if ($count === false)
+		{
+			return utf8_ireplace($search, $replace, $str);
+		}
+
+		return utf8_ireplace($search, $replace, $str, $count);
+	}
+
+	/**
+	 * UTF-8 aware alternative to str_pad()
+	 *
+	 * Pad a string to a certain length with another string.
+	 * $padStr may contain multi-byte characters.
+	 *
+	 * @param   string   $input   The input string.
+	 * @param   integer  $length  If the value is negative, less than, or equal to the length of the input string, no padding takes place.
+	 * @param   string   $padStr  The string may be truncated if the number of padding characters can't be evenly divided by the string's length.
+	 * @param   integer  $type    The type of padding to apply
+	 *
+	 * @return  string
+	 *
+	 * @see     http://www.php.net/str_pad
+	 * @since   1.4.0
+	 */
+	public static function str_pad($input, $length, $padStr = ' ', $type = STR_PAD_RIGHT)
+	{
+		return utf8_str_pad($input, $length, $padStr, $type);
+	}
+
+	/**
+	 * UTF-8 aware alternative to str_split()
+	 *
+	 * Convert a string to an array.
+	 *
+	 * @param   string   $str        UTF-8 encoded string to process
+	 * @param   integer  $split_len  Number to characters to split string by
+	 *
+	 * @return  array
+	 *
+	 * @see     http://www.php.net/str_split
+	 * @since   1.3.0
+	 */
+	public static function str_split($str, $split_len = 1)
+	{
+		return utf8_str_split($str, $split_len);
+	}
+
+	/**
+	 * UTF-8/LOCALE aware alternative to strcasecmp()
+	 *
+	 * A case insensitive string comparison.
+	 *
+	 * @param   string  $str1    string 1 to compare
+	 * @param   string  $str2    string 2 to compare
+	 * @param   mixed   $locale  The locale used by strcoll or false to use classical comparison
+	 *
+	 * @return  integer   < 0 if str1 is less than str2; > 0 if str1 is greater than str2, and 0 if they are equal.
+	 *
+	 * @see     http://www.php.net/strcasecmp
+	 * @see     http://www.php.net/strcoll
+	 * @see     http://www.php.net/setlocale
+	 * @since   1.3.0
+	 */
+	public static function strcasecmp($str1, $str2, $locale = false)
+	{
+		if ($locale)
+		{
+			// Get current locale
+			$locale0 = setlocale(LC_COLLATE, 0);
+
+			if (!$locale = setlocale(LC_COLLATE, $locale))
+			{
+				$locale = $locale0;
+			}
+
+			// See if we have successfully set locale to UTF-8
+			if (!stristr($locale, 'UTF-8') && stristr($locale, '_') && preg_match('~\.(\d+)$~', $locale, $m))
+			{
+				$encoding = 'CP' . $m[1];
+			}
+			elseif (stristr($locale, 'UTF-8') || stristr($locale, 'utf8'))
+			{
+				$encoding = 'UTF-8';
+			}
+			else
+			{
+				$encoding = 'nonrecodable';
+			}
+
+			// If we successfully set encoding it to utf-8 or encoding is sth weird don't recode
+			if ($encoding == 'UTF-8' || $encoding == 'nonrecodable')
+			{
+				return strcoll(utf8_strtolower($str1), utf8_strtolower($str2));
+			}
+
+			return strcoll(
+				static::transcode(utf8_strtolower($str1), 'UTF-8', $encoding),
+				static::transcode(utf8_strtolower($str2), 'UTF-8', $encoding)
+			);
+		}
+
+		return utf8_strcasecmp($str1, $str2);
+	}
+
+	/**
+	 * UTF-8/LOCALE aware alternative to strcmp()
+	 *
+	 * A case sensitive string comparison.
+	 *
+	 * @param   string  $str1    string 1 to compare
+	 * @param   string  $str2    string 2 to compare
+	 * @param   mixed   $locale  The locale used by strcoll or false to use classical comparison
+	 *
+	 * @return  integer  < 0 if str1 is less than str2; > 0 if str1 is greater than str2, and 0 if they are equal.
+	 *
+	 * @see     http://www.php.net/strcmp
+	 * @see     http://www.php.net/strcoll
+	 * @see     http://www.php.net/setlocale
+	 * @since   1.3.0
+	 */
+	public static function strcmp($str1, $str2, $locale = false)
+	{
+		if ($locale)
+		{
+			// Get current locale
+			$locale0 = setlocale(LC_COLLATE, 0);
+
+			if (!$locale = setlocale(LC_COLLATE, $locale))
+			{
+				$locale = $locale0;
+			}
+
+			// See if we have successfully set locale to UTF-8
+			if (!stristr($locale, 'UTF-8') && stristr($locale, '_') && preg_match('~\.(\d+)$~', $locale, $m))
+			{
+				$encoding = 'CP' . $m[1];
+			}
+			elseif (stristr($locale, 'UTF-8') || stristr($locale, 'utf8'))
+			{
+				$encoding = 'UTF-8';
+			}
+			else
+			{
+				$encoding = 'nonrecodable';
+			}
+
+			// If we successfully set encoding it to utf-8 or encoding is sth weird don't recode
+			if ($encoding == 'UTF-8' || $encoding == 'nonrecodable')
+			{
+				return strcoll($str1, $str2);
+			}
+
+			return strcoll(static::transcode($str1, 'UTF-8', $encoding), static::transcode($str2, 'UTF-8', $encoding));
+		}
+
+		return strcmp($str1, $str2);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strcspn()
+	 *
+	 * Find length of initial segment not matching mask.
+	 *
+	 * @param   string   $str     The string to process
+	 * @param   string   $mask    The mask
+	 * @param   integer  $start   Optional starting character position (in characters)
+	 * @param   integer  $length  Optional length
+	 *
+	 * @return  integer  The length of the initial segment of str1 which does not contain any of the characters in str2
+	 *
+	 * @see     http://www.php.net/strcspn
+	 * @since   1.3.0
+	 */
+	public static function strcspn($str, $mask, $start = null, $length = null)
+	{
+		if ($start === false && $length === false)
+		{
+			return utf8_strcspn($str, $mask);
+		}
+
+		if ($length === false)
+		{
+			return utf8_strcspn($str, $mask, $start);
+		}
+
+		return utf8_strcspn($str, $mask, $start, $length);
+	}
+
+	/**
+	 * UTF-8 aware alternative to stristr()
+	 *
+	 * Returns all of haystack from the first occurrence of needle to the end. Needle and haystack are examined in a case-insensitive manner to
+	 * find the first occurrence of a string using case insensitive comparison.
+	 *
+	 * @param   string  $str     The haystack
+	 * @param   string  $search  The needle
+	 *
+	 * @return string the sub string
+	 *
+	 * @see     http://www.php.net/stristr
+	 * @since   1.3.0
+	 */
+	public static function stristr($str, $search)
+	{
+		return utf8_stristr($str, $search);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strrev()
+	 *
+	 * Reverse a string.
+	 *
+	 * @param   string  $str  String to be reversed
+	 *
+	 * @return  string   The string in reverse character order
+	 *
+	 * @see     http://www.php.net/strrev
+	 * @since   1.3.0
+	 */
+	public static function strrev($str)
+	{
+		return utf8_strrev($str);
+	}
+
+	/**
+	 * UTF-8 aware alternative to strspn()
+	 *
+	 * Find length of initial segment matching mask.
+	 *
+	 * @param   string   $str     The haystack
+	 * @param   string   $mask    The mask
+	 * @param   integer  $start   Start optional
+	 * @param   integer  $length  Length optional
+	 *
+	 * @return  integer
+	 *
+	 * @see     http://www.php.net/strspn
+	 * @since   1.3.0
+	 */
+	public static function strspn($str, $mask, $start = null, $length = null)
+	{
+		if ($start === null && $length === null)
+		{
+			return utf8_strspn($str, $mask);
+		}
+
+		if ($length === null)
+		{
+			return utf8_strspn($str, $mask, $start);
+		}
+
+		return utf8_strspn($str, $mask, $start, $length);
+	}
+
+	/**
+	 * UTF-8 aware alternative to substr_replace()
+	 *
+	 * Replace text within a portion of a string.
+	 *
+	 * @param   string   $str     The haystack
+	 * @param   string   $repl    The replacement string
+	 * @param   integer  $start   Start
+	 * @param   integer  $length  Length (optional)
+	 *
+	 * @return  string
+	 *
+	 * @see     http://www.php.net/substr_replace
+	 * @since   1.3.0
+	 */
+	public static function substr_replace($str, $repl, $start, $length = null)
+	{
+		// Loaded by library loader
+		if ($length === false)
+		{
+			return utf8_substr_replace($str, $repl, $start);
+		}
+
+		return utf8_substr_replace($str, $repl, $start, $length);
+	}
+
+	/**
+	 * UTF-8 aware replacement for ltrim()
+	 *
+	 * Strip whitespace (or other characters) from the beginning of a string. You only need to use this if you are supplying the charlist
+	 * optional arg and it contains UTF-8 characters. Otherwise ltrim will work normally on a UTF-8 string.
+	 *
+	 * @param   string  $str       The string to be trimmed
+	 * @param   string  $charlist  The optional charlist of additional characters to trim
+	 *
+	 * @return  string  The trimmed string
+	 *
+	 * @see     http://www.php.net/ltrim
+	 * @since   1.3.0
+	 */
+	public static function ltrim($str, $charlist = false)
+	{
+		if (empty($charlist) && $charlist !== false)
+		{
+			return $str;
+		}
+
+		if ($charlist === false)
+		{
+			return utf8_ltrim($str);
+		}
+
+		return utf8_ltrim($str, $charlist);
+	}
+
+	/**
+	 * UTF-8 aware replacement for rtrim()
+	 *
+	 * Strip whitespace (or other characters) from the end of a string. You only need to use this if you are supplying the charlist
+	 * optional arg and it contains UTF-8 characters. Otherwise rtrim will work normally on a UTF-8 string.
+	 *
+	 * @param   string  $str       The string to be trimmed
+	 * @param   string  $charlist  The optional charlist of additional characters to trim
+	 *
+	 * @return  string  The trimmed string
+	 *
+	 * @see     http://www.php.net/rtrim
+	 * @since   1.3.0
+	 */
+	public static function rtrim($str, $charlist = false)
+	{
+		if (empty($charlist) && $charlist !== false)
+		{
+			return $str;
+		}
+
+		if ($charlist === false)
+		{
+			return utf8_rtrim($str);
+		}
+
+		return utf8_rtrim($str, $charlist);
+	}
+
+	/**
+	 * UTF-8 aware replacement for trim()
+	 *
+	 * Strip whitespace (or other characters) from the beginning and end of a string. You only need to use this if you are supplying the charlist
+	 * optional arg and it contains UTF-8 characters. Otherwise trim will work normally on a UTF-8 string
+	 *
+	 * @param   string  $str       The string to be trimmed
+	 * @param   string  $charlist  The optional charlist of additional characters to trim
+	 *
+	 * @return  string  The trimmed string
+	 *
+	 * @see     http://www.php.net/trim
+	 * @since   1.3.0
+	 */
+	public static function trim($str, $charlist = false)
+	{
+		if (empty($charlist) && $charlist !== false)
+		{
+			return $str;
+		}
+
+		if ($charlist === false)
+		{
+			return utf8_trim($str);
+		}
+
+		return utf8_trim($str, $charlist);
+	}
+
+	/**
+	 * UTF-8 aware alternative to ucfirst()
+	 *
+	 * Make a string's first character uppercase or all words' first character uppercase.
+	 *
+	 * @param   string  $str           String to be processed
+	 * @param   string  $delimiter     The words delimiter (null means do not split the string)
+	 * @param   string  $newDelimiter  The new words delimiter (null means equal to $delimiter)
+	 *
+	 * @return  string  If $delimiter is null, return the string with first character as upper case (if applicable)
+	 *                  else consider the string of words separated by the delimiter, apply the ucfirst to each words
+	 *                  and return the string with the new delimiter
+	 *
+	 * @see     http://www.php.net/ucfirst
+	 * @since   1.3.0
+	 */
+	public static function ucfirst($str, $delimiter = null, $newDelimiter = null)
+	{
+		if ($delimiter === null)
+		{
+			return utf8_ucfirst($str);
+		}
+
+		if ($newDelimiter === null)
+		{
+			$newDelimiter = $delimiter;
+		}
+
+		return implode($newDelimiter, array_map('utf8_ucfirst', explode($delimiter, $str)));
+	}
+
+	/**
+	 * UTF-8 aware alternative to ucwords()
+	 *
+	 * Uppercase the first character of each word in a string.
+	 *
+	 * @param   string  $str  String to be processed
+	 *
+	 * @return  string  String with first char of each word uppercase
+	 *
+	 * @see     http://www.php.net/ucwords
+	 * @since   1.3.0
+	 */
+	public static function ucwords($str)
+	{
+		return utf8_ucwords($str);
+	}
+
+	/**
+	 * Transcode a string.
+	 *
+	 * @param   string  $source         The string to transcode.
+	 * @param   string  $from_encoding  The source encoding.
+	 * @param   string  $to_encoding    The target encoding.
+	 *
+	 * @return  mixed  The transcoded string, or null if the source was not a string.
+	 *
+	 * @link    https://bugs.php.net/bug.php?id=48147
+	 *
+	 * @since   1.3.0
+	 */
+	public static function transcode($source, $from_encoding, $to_encoding)
+	{
+		if (is_string($source))
+		{
+			switch (ICONV_IMPL)
+			{
+				case 'glibc':
+					return @iconv($from_encoding, $to_encoding . '//TRANSLIT,IGNORE', $source);
+
+				case 'libiconv':
+				default:
+					return iconv($from_encoding, $to_encoding . '//IGNORE//TRANSLIT', $source);
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Tests a string as to whether it's valid UTF-8 and supported by the Unicode standard.
+	 *
+	 * Note: this function has been modified to simple return true or false.
+	 *
+	 * @param   string  $str  UTF-8 encoded string.
+	 *
+	 * @return  boolean  true if valid
+	 *
+	 * @author  <hsivonen@iki.fi>
+	 * @see     http://hsivonen.iki.fi/php-utf8/
+	 * @see     compliant
+	 * @since   1.3.0
+	 */
+	public static function valid($str)
+	{
+		return utf8_is_valid($str);
+	}
+
+	/**
+	 * Tests whether a string complies as UTF-8.
+	 *
+	 * This will be much faster than StringHelper::valid() but will pass five and six octet UTF-8 sequences, which are not supported by Unicode and
+	 * so cannot be displayed correctly in a browser. In other words it is not as strict as StringHelper::valid() but it's faster. If you use it to
+	 * validate user input, you place yourself at the risk that attackers will be able to inject 5 and 6 byte sequences (which may or may not be a
+	 * significant risk, depending on what you are are doing).
+	 *
+	 * @param   string  $str  UTF-8 string to check
+	 *
+	 * @return  boolean  TRUE if string is valid UTF-8
+	 *
+	 * @see     StringHelper::valid
+	 * @see     http://www.php.net/manual/en/reference.pcre.pattern.modifiers.php#54805
+	 * @since   1.3.0
+	 */
+	public static function compliant($str)
+	{
+		return utf8_compliant($str);
+	}
+
+	/**
+	 * Converts Unicode sequences to UTF-8 string.
+	 *
+	 * @param   string  $str  Unicode string to convert
+	 *
+	 * @return  string  UTF-8 string
+	 *
+	 * @since   1.3.0
+	 */
+	public static function unicode_to_utf8($str)
+	{
+		if (extension_loaded('mbstring'))
+		{
+			return preg_replace_callback(
+				'/\\\\u([0-9a-fA-F]{4})/',
+				function ($match)
+				{
+					return mb_convert_encoding(pack('H*', $match[1]), 'UTF-8', 'UCS-2BE');
+				},
+				$str
+			);
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Converts Unicode sequences to UTF-16 string.
+	 *
+	 * @param   string  $str  Unicode string to convert
+	 *
+	 * @return  string  UTF-16 string
+	 *
+	 * @since   1.3.0
+	 */
+	public static function unicode_to_utf16($str)
+	{
+		if (extension_loaded('mbstring'))
+		{
+			return preg_replace_callback(
+				'/\\\\u([0-9a-fA-F]{4})/',
+				function ($match)
+				{
+					return mb_convert_encoding(pack('H*', $match[1]), 'UTF-8', 'UTF-16BE');
+				},
+				$str
+			);
+		}
+
+		return $str;
+	}
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/LICENSE b/core/libraries/vendor/joomla/string/src/phputf8/LICENSE
new file mode 100644
index 00000000..28f18896
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/README b/core/libraries/vendor/joomla/string/src/phputf8/README
new file mode 100644
index 00000000..6c309054
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/README
@@ -0,0 +1,82 @@
+++PHP UTF-8++
+
+Version 0.5
+
+++DOCUMENTATION++
+
+Documentation in progress in ./docs dir
+
+http://www.phpwact.org/php/i18n/charsets
+http://www.phpwact.org/php/i18n/utf-8
+
+Important Note: DO NOT use these functions without understanding WHY
+you are using them. In particular, do not blindly replace all use of PHP's
+string functions which functions found here - most of the time you will
+not need to, and you will be introducing a significant performance
+overhead to your application. You can get a good idea of when to use what
+from reading: http://www.phpwact.org/php/i18n/utf-8
+
+Important Note: For sake of performance most of the functions here are
+not "defensive" (e.g. there is not extensive parameter checking, well
+formed UTF-8 is assumed). This is particularily relevant when is comes to
+catching badly formed UTF-8 - you should screen input on the "outer
+perimeter" with help from functions in the utf8_validation.php and
+utf8_bad.php files.
+
+Important Note: this library treats ALL ASCII characters as valid, including ASCII control characters. But if you use some ASCII control characters in XML, it will render the XML ill-formed. Don't be a bozo: http://hsivonen.iki.fi/producing-xml/#controlchar
+
+++BUGS / SUPPORT / FEATURE REQUESTS ++
+
+Please report bugs to:
+http://sourceforge.net/tracker/?group_id=142846&atid=753842
+- if you are able, please submit a failing unit test
+(http://www.lastcraft.com/simple_test.php) with your bug report.
+
+For feature requests / faster implementation of functions found here,
+please drop them in via the RFE tracker: http://sourceforge.net/tracker/?group_id=142846&atid=753845
+Particularily interested in faster implementations!
+
+For general support / help, use:
+http://sourceforge.net/tracker/?group_id=142846&atid=753843
+
+In the VERY WORST case, you can email me: hfuecks gmail com - I tend to be slow to respond though so be warned.
+
+Important Note: when reporting bugs, please provide the following
+information;
+
+PHP version, whether the iconv extension is loaded (in PHP5 it's
+there by default), whether the mbstring extension is loaded. The
+following PHP script can be used to determine this information;
+
+<?php
+print "PHP Version: " .phpversion()."<br>";
+if ( extension_loaded('mbstring') ) {
+    print "mbstring available<br>";
+} else {
+    print "mbstring not available<br>";
+}
+if ( extension_loaded('iconv') ) {
+    print "iconv available<br>";
+} else {
+    print "iconv not available<br>";
+}
+?>
+
+++LICENSING++
+
+Parts of the code in this library come from other places, under different
+licenses.
+The authors involved have been contacted (see below). Attribution for
+which code came from elsewhere can be found in the source code itself.
+
++Andreas Gohr / Chris Smith - Dokuwiki
+There is a fair degree of collaboration / exchange of ideas and code
+beteen Dokuwiki's UTF-8 library;
+http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+and phputf8. Although Dokuwiki is released under GPL, its UTF-8
+library is released under LGPL, hence no conflict with phputf8
+
++Henri Sivonen (http://hsivonen.iki.fi/php-utf8/ /
+http://hsivonen.iki.fi/php-utf8/) has also given permission for his
+code to be released under the terms of the LGPL. He ported a Unicode / UTF-8
+converter from the Mozilla codebase to PHP, which is re-used in phputf8
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/mbstring/core.php b/core/libraries/vendor/joomla/string/src/phputf8/mbstring/core.php
new file mode 100644
index 00000000..6cb5501d
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/mbstring/core.php
@@ -0,0 +1,132 @@
+<?php
+/**
+* @package utf8
+*/
+
+/**
+* Define UTF8_CORE as required
+*/
+if ( !defined('UTF8_CORE') ) {
+    define('UTF8_CORE',TRUE);
+}
+
+//--------------------------------------------------------------------
+/**
+* Wrapper round mb_strlen
+* Assumes you have mb_internal_encoding to UTF-8 already
+* Note: this function does not count bad bytes in the string - these
+* are simply ignored
+* @param string UTF-8 string
+* @return int number of UTF-8 characters in string
+* @package utf8
+*/
+function utf8_strlen($str){
+    return mb_strlen($str);
+}
+
+
+//--------------------------------------------------------------------
+/**
+* Assumes mbstring internal encoding is set to UTF-8
+* Wrapper around mb_strpos
+* Find position of first occurrence of a string
+* @param string haystack
+* @param string needle (you should validate this with utf8_is_valid)
+* @param integer offset in characters (from left)
+* @return mixed integer position or FALSE on failure
+* @package utf8
+*/
+function utf8_strpos($str, $search, $offset = FALSE){
+    if ( $offset === FALSE ) {
+        return mb_strpos($str, $search);
+    } else {
+        return mb_strpos($str, $search, $offset);
+    }
+}
+
+//--------------------------------------------------------------------
+/**
+* Assumes mbstring internal encoding is set to UTF-8
+* Wrapper around mb_strrpos
+* Find position of last occurrence of a char in a string
+* @param string haystack
+* @param string needle (you should validate this with utf8_is_valid)
+* @param integer (optional) offset (from left)
+* @return mixed integer position or FALSE on failure
+* @package utf8
+*/
+function utf8_strrpos($str, $search, $offset = FALSE){
+    if ( $offset === FALSE ) {
+        # Emulate behaviour of strrpos rather than raising warning
+        if ( empty($str) ) {
+            return FALSE;
+        }
+        return mb_strrpos($str, $search);
+    } else {
+        if ( !is_int($offset) ) {
+            trigger_error('utf8_strrpos expects parameter 3 to be long',E_USER_WARNING);
+            return FALSE;
+        }
+
+        $str = mb_substr($str, $offset);
+
+        if ( FALSE !== ( $pos = mb_strrpos($str, $search) ) ) {
+            return $pos + $offset;
+        }
+
+        return FALSE;
+    }
+}
+
+//--------------------------------------------------------------------
+/**
+* Assumes mbstring internal encoding is set to UTF-8
+* Wrapper around mb_substr
+* Return part of a string given character offset (and optionally length)
+* @param string
+* @param integer number of UTF-8 characters offset (from left)
+* @param integer (optional) length in UTF-8 characters from offset
+* @return mixed string or FALSE if failure
+* @package utf8
+*/
+function utf8_substr($str, $offset, $length = FALSE){
+    if ( $length === FALSE ) {
+        return mb_substr($str, $offset);
+    } else {
+        return mb_substr($str, $offset, $length);
+    }
+}
+
+//--------------------------------------------------------------------
+/**
+* Assumes mbstring internal encoding is set to UTF-8
+* Wrapper around mb_strtolower
+* Make a string lowercase
+* Note: The concept of a characters "case" only exists is some alphabets
+* such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does
+* not exist in the Chinese alphabet, for example. See Unicode Standard
+* Annex #21: Case Mappings
+* @param string
+* @return mixed either string in lowercase or FALSE is UTF-8 invalid
+* @package utf8
+*/
+function utf8_strtolower($str){
+    return mb_strtolower($str);
+}
+
+//--------------------------------------------------------------------
+/**
+* Assumes mbstring internal encoding is set to UTF-8
+* Wrapper around mb_strtoupper
+* Make a string uppercase
+* Note: The concept of a characters "case" only exists is some alphabets
+* such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does
+* not exist in the Chinese alphabet, for example. See Unicode Standard
+* Annex #21: Case Mappings
+* @param string
+* @return mixed either string in lowercase or FALSE is UTF-8 invalid
+* @package utf8
+*/
+function utf8_strtoupper($str){
+    return mb_strtoupper($str);
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/native/core.php b/core/libraries/vendor/joomla/string/src/phputf8/native/core.php
new file mode 100644
index 00000000..8aa9b891
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/native/core.php
@@ -0,0 +1,430 @@
+<?php
+/**
+* @package utf8
+*/
+
+/**
+* Define UTF8_CORE as required
+*/
+if ( !defined('UTF8_CORE') ) {
+    define('UTF8_CORE',TRUE);
+}
+
+//--------------------------------------------------------------------
+/**
+* Unicode aware replacement for strlen(). Returns the number
+* of characters in the string (not the number of bytes), replacing
+* multibyte characters with a single byte equivalent
+* utf8_decode() converts characters that are not in ISO-8859-1
+* to '?', which, for the purpose of counting, is alright - It's
+* much faster than iconv_strlen
+* Note: this function does not count bad UTF-8 bytes in the string
+* - these are simply ignored
+* @author <chernyshevsky at hotmail dot com>
+* @link   http://www.php.net/manual/en/function.strlen.php
+* @link   http://www.php.net/manual/en/function.utf8-decode.php
+* @param string UTF-8 string
+* @return int number of UTF-8 characters in string
+* @package utf8
+*/
+function utf8_strlen($str){
+    return strlen(utf8_decode($str));
+}
+
+
+//--------------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strpos
+* Find position of first occurrence of a string
+* Note: This will get alot slower if offset is used
+* Note: requires utf8_strlen amd utf8_substr to be loaded
+* @param string haystack
+* @param string needle (you should validate this with utf8_is_valid)
+* @param integer offset in characters (from left)
+* @return mixed integer position or FALSE on failure
+* @see http://www.php.net/strpos
+* @see utf8_strlen
+* @see utf8_substr
+* @package utf8
+*/
+function utf8_strpos($str, $needle, $offset = NULL) {
+
+    if ( is_null($offset) ) {
+
+        $ar = explode($needle, $str, 2);
+        if ( count($ar) > 1 ) {
+            return utf8_strlen($ar[0]);
+        }
+        return FALSE;
+
+    } else {
+
+        if ( !is_int($offset) ) {
+            trigger_error('utf8_strpos: Offset must be an integer',E_USER_ERROR);
+            return FALSE;
+        }
+
+        $str = utf8_substr($str, $offset);
+
+        if ( FALSE !== ( $pos = utf8_strpos($str, $needle) ) ) {
+            return $pos + $offset;
+        }
+
+        return FALSE;
+    }
+
+}
+
+//--------------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strrpos
+* Find position of last occurrence of a char in a string
+* Note: This will get alot slower if offset is used
+* Note: requires utf8_substr and utf8_strlen to be loaded
+* @param string haystack
+* @param string needle (you should validate this with utf8_is_valid)
+* @param integer (optional) offset (from left)
+* @return mixed integer position or FALSE on failure
+* @see http://www.php.net/strrpos
+* @see utf8_substr
+* @see utf8_strlen
+* @package utf8
+*/
+function utf8_strrpos($str, $needle, $offset = NULL) {
+
+    if ( is_null($offset) ) {
+
+        $ar = explode($needle, $str);
+
+        if ( count($ar) > 1 ) {
+            // Pop off the end of the string where the last match was made
+            array_pop($ar);
+            $str = join($needle,$ar);
+            return utf8_strlen($str);
+        }
+        return FALSE;
+
+    } else {
+
+        if ( !is_int($offset) ) {
+            trigger_error('utf8_strrpos expects parameter 3 to be long',E_USER_WARNING);
+            return FALSE;
+        }
+
+        $str = utf8_substr($str, $offset);
+
+        if ( FALSE !== ( $pos = utf8_strrpos($str, $needle) ) ) {
+            return $pos + $offset;
+        }
+
+        return FALSE;
+    }
+
+}
+
+//--------------------------------------------------------------------
+/**
+* UTF-8 aware alternative to substr
+* Return part of a string given character offset (and optionally length)
+*
+* Note arguments: comparied to substr - if offset or length are
+* not integers, this version will not complain but rather massages them
+* into an integer.
+*
+* Note on returned values: substr documentation states false can be
+* returned in some cases (e.g. offset > string length)
+* mb_substr never returns false, it will return an empty string instead.
+* This adopts the mb_substr approach
+*
+* Note on implementation: PCRE only supports repetitions of less than
+* 65536, in order to accept up to MAXINT values for offset and length,
+* we'll repeat a group of 65535 characters when needed.
+*
+* Note on implementation: calculating the number of characters in the
+* string is a relatively expensive operation, so we only carry it out when
+* necessary. It isn't necessary for +ve offsets and no specified length
+*
+* @author Chris Smith<chris@jalakai.co.uk>
+* @param string
+* @param integer number of UTF-8 characters offset (from left)
+* @param integer (optional) length in UTF-8 characters from offset
+* @return mixed string or FALSE if failure
+* @package utf8
+*/
+function utf8_substr($str, $offset, $length = NULL) {
+
+    // generates E_NOTICE
+    // for PHP4 objects, but not PHP5 objects
+    $str = (string)$str;
+    $offset = (int)$offset;
+    if (!is_null($length)) $length = (int)$length;
+
+    // handle trivial cases
+    if ($length === 0) return '';
+    if ($offset < 0 && $length < 0 && $length < $offset)
+        return '';
+
+    // normalise negative offsets (we could use a tail
+    // anchored pattern, but they are horribly slow!)
+    if ($offset < 0) {
+
+        // see notes
+        $strlen = strlen(utf8_decode($str));
+        $offset = $strlen + $offset;
+        if ($offset < 0) $offset = 0;
+
+    }
+
+    $Op = '';
+    $Lp = '';
+
+    // establish a pattern for offset, a
+    // non-captured group equal in length to offset
+    if ($offset > 0) {
+
+        $Ox = (int)($offset/65535);
+        $Oy = $offset%65535;
+
+        if ($Ox) {
+            $Op = '(?:.{65535}){'.$Ox.'}';
+        }
+
+        $Op = '^(?:'.$Op.'.{'.$Oy.'})';
+
+    } else {
+
+        // offset == 0; just anchor the pattern
+        $Op = '^';
+
+    }
+
+    // establish a pattern for length
+    if (is_null($length)) {
+
+        // the rest of the string
+        $Lp = '(.*)$';
+
+    } else {
+
+        if (!isset($strlen)) {
+            // see notes
+            $strlen = strlen(utf8_decode($str));
+        }
+
+        // another trivial case
+        if ($offset > $strlen) return '';
+
+        if ($length > 0) {
+
+            // reduce any length that would
+            // go passed the end of the string
+            $length = min($strlen-$offset, $length);
+
+            $Lx = (int)( $length / 65535 );
+            $Ly = $length % 65535;
+
+            // negative length requires a captured group
+            // of length characters
+            if ($Lx) $Lp = '(?:.{65535}){'.$Lx.'}';
+            $Lp = '('.$Lp.'.{'.$Ly.'})';
+
+        } else if ($length < 0) {
+
+            if ( $length < ($offset - $strlen) ) {
+                return '';
+            }
+
+            $Lx = (int)((-$length)/65535);
+            $Ly = (-$length)%65535;
+
+            // negative length requires ... capture everything
+            // except a group of  -length characters
+            // anchored at the tail-end of the string
+            if ($Lx) $Lp = '(?:.{65535}){'.$Lx.'}';
+            $Lp = '(.*)(?:'.$Lp.'.{'.$Ly.'})$';
+
+        }
+
+    }
+
+    if (!preg_match( '#'.$Op.$Lp.'#us',$str, $match )) {
+        return '';
+    }
+
+    return $match[1];
+
+}
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strtolower
+* Make a string lowercase
+* Note: The concept of a characters "case" only exists is some alphabets
+* such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does
+* not exist in the Chinese alphabet, for example. See Unicode Standard
+* Annex #21: Case Mappings
+* Note: requires utf8_to_unicode and utf8_from_unicode
+* @author Andreas Gohr <andi@splitbrain.org>
+* @param string
+* @return mixed either string in lowercase or FALSE is UTF-8 invalid
+* @see http://www.php.net/strtolower
+* @see utf8_to_unicode
+* @see utf8_from_unicode
+* @see http://www.unicode.org/reports/tr21/tr21-5.html
+* @see http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+* @package utf8
+*/
+function utf8_strtolower($string){
+
+    static $UTF8_UPPER_TO_LOWER = NULL;
+
+    if ( is_null($UTF8_UPPER_TO_LOWER) ) {
+        $UTF8_UPPER_TO_LOWER = array(
+    0x0041=>0x0061, 0x03A6=>0x03C6, 0x0162=>0x0163, 0x00C5=>0x00E5, 0x0042=>0x0062,
+    0x0139=>0x013A, 0x00C1=>0x00E1, 0x0141=>0x0142, 0x038E=>0x03CD, 0x0100=>0x0101,
+    0x0490=>0x0491, 0x0394=>0x03B4, 0x015A=>0x015B, 0x0044=>0x0064, 0x0393=>0x03B3,
+    0x00D4=>0x00F4, 0x042A=>0x044A, 0x0419=>0x0439, 0x0112=>0x0113, 0x041C=>0x043C,
+    0x015E=>0x015F, 0x0143=>0x0144, 0x00CE=>0x00EE, 0x040E=>0x045E, 0x042F=>0x044F,
+    0x039A=>0x03BA, 0x0154=>0x0155, 0x0049=>0x0069, 0x0053=>0x0073, 0x1E1E=>0x1E1F,
+    0x0134=>0x0135, 0x0427=>0x0447, 0x03A0=>0x03C0, 0x0418=>0x0438, 0x00D3=>0x00F3,
+    0x0420=>0x0440, 0x0404=>0x0454, 0x0415=>0x0435, 0x0429=>0x0449, 0x014A=>0x014B,
+    0x0411=>0x0431, 0x0409=>0x0459, 0x1E02=>0x1E03, 0x00D6=>0x00F6, 0x00D9=>0x00F9,
+    0x004E=>0x006E, 0x0401=>0x0451, 0x03A4=>0x03C4, 0x0423=>0x0443, 0x015C=>0x015D,
+    0x0403=>0x0453, 0x03A8=>0x03C8, 0x0158=>0x0159, 0x0047=>0x0067, 0x00C4=>0x00E4,
+    0x0386=>0x03AC, 0x0389=>0x03AE, 0x0166=>0x0167, 0x039E=>0x03BE, 0x0164=>0x0165,
+    0x0116=>0x0117, 0x0108=>0x0109, 0x0056=>0x0076, 0x00DE=>0x00FE, 0x0156=>0x0157,
+    0x00DA=>0x00FA, 0x1E60=>0x1E61, 0x1E82=>0x1E83, 0x00C2=>0x00E2, 0x0118=>0x0119,
+    0x0145=>0x0146, 0x0050=>0x0070, 0x0150=>0x0151, 0x042E=>0x044E, 0x0128=>0x0129,
+    0x03A7=>0x03C7, 0x013D=>0x013E, 0x0422=>0x0442, 0x005A=>0x007A, 0x0428=>0x0448,
+    0x03A1=>0x03C1, 0x1E80=>0x1E81, 0x016C=>0x016D, 0x00D5=>0x00F5, 0x0055=>0x0075,
+    0x0176=>0x0177, 0x00DC=>0x00FC, 0x1E56=>0x1E57, 0x03A3=>0x03C3, 0x041A=>0x043A,
+    0x004D=>0x006D, 0x016A=>0x016B, 0x0170=>0x0171, 0x0424=>0x0444, 0x00CC=>0x00EC,
+    0x0168=>0x0169, 0x039F=>0x03BF, 0x004B=>0x006B, 0x00D2=>0x00F2, 0x00C0=>0x00E0,
+    0x0414=>0x0434, 0x03A9=>0x03C9, 0x1E6A=>0x1E6B, 0x00C3=>0x00E3, 0x042D=>0x044D,
+    0x0416=>0x0436, 0x01A0=>0x01A1, 0x010C=>0x010D, 0x011C=>0x011D, 0x00D0=>0x00F0,
+    0x013B=>0x013C, 0x040F=>0x045F, 0x040A=>0x045A, 0x00C8=>0x00E8, 0x03A5=>0x03C5,
+    0x0046=>0x0066, 0x00DD=>0x00FD, 0x0043=>0x0063, 0x021A=>0x021B, 0x00CA=>0x00EA,
+    0x0399=>0x03B9, 0x0179=>0x017A, 0x00CF=>0x00EF, 0x01AF=>0x01B0, 0x0045=>0x0065,
+    0x039B=>0x03BB, 0x0398=>0x03B8, 0x039C=>0x03BC, 0x040C=>0x045C, 0x041F=>0x043F,
+    0x042C=>0x044C, 0x00DE=>0x00FE, 0x00D0=>0x00F0, 0x1EF2=>0x1EF3, 0x0048=>0x0068,
+    0x00CB=>0x00EB, 0x0110=>0x0111, 0x0413=>0x0433, 0x012E=>0x012F, 0x00C6=>0x00E6,
+    0x0058=>0x0078, 0x0160=>0x0161, 0x016E=>0x016F, 0x0391=>0x03B1, 0x0407=>0x0457,
+    0x0172=>0x0173, 0x0178=>0x00FF, 0x004F=>0x006F, 0x041B=>0x043B, 0x0395=>0x03B5,
+    0x0425=>0x0445, 0x0120=>0x0121, 0x017D=>0x017E, 0x017B=>0x017C, 0x0396=>0x03B6,
+    0x0392=>0x03B2, 0x0388=>0x03AD, 0x1E84=>0x1E85, 0x0174=>0x0175, 0x0051=>0x0071,
+    0x0417=>0x0437, 0x1E0A=>0x1E0B, 0x0147=>0x0148, 0x0104=>0x0105, 0x0408=>0x0458,
+    0x014C=>0x014D, 0x00CD=>0x00ED, 0x0059=>0x0079, 0x010A=>0x010B, 0x038F=>0x03CE,
+    0x0052=>0x0072, 0x0410=>0x0430, 0x0405=>0x0455, 0x0402=>0x0452, 0x0126=>0x0127,
+    0x0136=>0x0137, 0x012A=>0x012B, 0x038A=>0x03AF, 0x042B=>0x044B, 0x004C=>0x006C,
+    0x0397=>0x03B7, 0x0124=>0x0125, 0x0218=>0x0219, 0x00DB=>0x00FB, 0x011E=>0x011F,
+    0x041E=>0x043E, 0x1E40=>0x1E41, 0x039D=>0x03BD, 0x0106=>0x0107, 0x03AB=>0x03CB,
+    0x0426=>0x0446, 0x00DE=>0x00FE, 0x00C7=>0x00E7, 0x03AA=>0x03CA, 0x0421=>0x0441,
+    0x0412=>0x0432, 0x010E=>0x010F, 0x00D8=>0x00F8, 0x0057=>0x0077, 0x011A=>0x011B,
+    0x0054=>0x0074, 0x004A=>0x006A, 0x040B=>0x045B, 0x0406=>0x0456, 0x0102=>0x0103,
+    0x039B=>0x03BB, 0x00D1=>0x00F1, 0x041D=>0x043D, 0x038C=>0x03CC, 0x00C9=>0x00E9,
+    0x00D0=>0x00F0, 0x0407=>0x0457, 0x0122=>0x0123,
+            );
+    }
+
+    $uni = utf8_to_unicode($string);
+
+    if ( !$uni ) {
+        return FALSE;
+    }
+
+    $cnt = count($uni);
+    for ($i=0; $i < $cnt; $i++){
+        if ( isset($UTF8_UPPER_TO_LOWER[$uni[$i]]) ) {
+            $uni[$i] = $UTF8_UPPER_TO_LOWER[$uni[$i]];
+        }
+    }
+
+    return utf8_from_unicode($uni);
+}
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strtoupper
+* Make a string uppercase
+* Note: The concept of a characters "case" only exists is some alphabets
+* such as Latin, Greek, Cyrillic, Armenian and archaic Georgian - it does
+* not exist in the Chinese alphabet, for example. See Unicode Standard
+* Annex #21: Case Mappings
+* Note: requires utf8_to_unicode and utf8_from_unicode
+* @author Andreas Gohr <andi@splitbrain.org>
+* @param string
+* @return mixed either string in lowercase or FALSE is UTF-8 invalid
+* @see http://www.php.net/strtoupper
+* @see utf8_to_unicode
+* @see utf8_from_unicode
+* @see http://www.unicode.org/reports/tr21/tr21-5.html
+* @see http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+* @package utf8
+*/
+function utf8_strtoupper($string){
+
+    static $UTF8_LOWER_TO_UPPER = NULL;
+
+    if ( is_null($UTF8_LOWER_TO_UPPER) ) {
+        $UTF8_LOWER_TO_UPPER = array(
+    0x0061=>0x0041, 0x03C6=>0x03A6, 0x0163=>0x0162, 0x00E5=>0x00C5, 0x0062=>0x0042,
+    0x013A=>0x0139, 0x00E1=>0x00C1, 0x0142=>0x0141, 0x03CD=>0x038E, 0x0101=>0x0100,
+    0x0491=>0x0490, 0x03B4=>0x0394, 0x015B=>0x015A, 0x0064=>0x0044, 0x03B3=>0x0393,
+    0x00F4=>0x00D4, 0x044A=>0x042A, 0x0439=>0x0419, 0x0113=>0x0112, 0x043C=>0x041C,
+    0x015F=>0x015E, 0x0144=>0x0143, 0x00EE=>0x00CE, 0x045E=>0x040E, 0x044F=>0x042F,
+    0x03BA=>0x039A, 0x0155=>0x0154, 0x0069=>0x0049, 0x0073=>0x0053, 0x1E1F=>0x1E1E,
+    0x0135=>0x0134, 0x0447=>0x0427, 0x03C0=>0x03A0, 0x0438=>0x0418, 0x00F3=>0x00D3,
+    0x0440=>0x0420, 0x0454=>0x0404, 0x0435=>0x0415, 0x0449=>0x0429, 0x014B=>0x014A,
+    0x0431=>0x0411, 0x0459=>0x0409, 0x1E03=>0x1E02, 0x00F6=>0x00D6, 0x00F9=>0x00D9,
+    0x006E=>0x004E, 0x0451=>0x0401, 0x03C4=>0x03A4, 0x0443=>0x0423, 0x015D=>0x015C,
+    0x0453=>0x0403, 0x03C8=>0x03A8, 0x0159=>0x0158, 0x0067=>0x0047, 0x00E4=>0x00C4,
+    0x03AC=>0x0386, 0x03AE=>0x0389, 0x0167=>0x0166, 0x03BE=>0x039E, 0x0165=>0x0164,
+    0x0117=>0x0116, 0x0109=>0x0108, 0x0076=>0x0056, 0x00FE=>0x00DE, 0x0157=>0x0156,
+    0x00FA=>0x00DA, 0x1E61=>0x1E60, 0x1E83=>0x1E82, 0x00E2=>0x00C2, 0x0119=>0x0118,
+    0x0146=>0x0145, 0x0070=>0x0050, 0x0151=>0x0150, 0x044E=>0x042E, 0x0129=>0x0128,
+    0x03C7=>0x03A7, 0x013E=>0x013D, 0x0442=>0x0422, 0x007A=>0x005A, 0x0448=>0x0428,
+    0x03C1=>0x03A1, 0x1E81=>0x1E80, 0x016D=>0x016C, 0x00F5=>0x00D5, 0x0075=>0x0055,
+    0x0177=>0x0176, 0x00FC=>0x00DC, 0x1E57=>0x1E56, 0x03C3=>0x03A3, 0x043A=>0x041A,
+    0x006D=>0x004D, 0x016B=>0x016A, 0x0171=>0x0170, 0x0444=>0x0424, 0x00EC=>0x00CC,
+    0x0169=>0x0168, 0x03BF=>0x039F, 0x006B=>0x004B, 0x00F2=>0x00D2, 0x00E0=>0x00C0,
+    0x0434=>0x0414, 0x03C9=>0x03A9, 0x1E6B=>0x1E6A, 0x00E3=>0x00C3, 0x044D=>0x042D,
+    0x0436=>0x0416, 0x01A1=>0x01A0, 0x010D=>0x010C, 0x011D=>0x011C, 0x00F0=>0x00D0,
+    0x013C=>0x013B, 0x045F=>0x040F, 0x045A=>0x040A, 0x00E8=>0x00C8, 0x03C5=>0x03A5,
+    0x0066=>0x0046, 0x00FD=>0x00DD, 0x0063=>0x0043, 0x021B=>0x021A, 0x00EA=>0x00CA,
+    0x03B9=>0x0399, 0x017A=>0x0179, 0x00EF=>0x00CF, 0x01B0=>0x01AF, 0x0065=>0x0045,
+    0x03BB=>0x039B, 0x03B8=>0x0398, 0x03BC=>0x039C, 0x045C=>0x040C, 0x043F=>0x041F,
+    0x044C=>0x042C, 0x00FE=>0x00DE, 0x00F0=>0x00D0, 0x1EF3=>0x1EF2, 0x0068=>0x0048,
+    0x00EB=>0x00CB, 0x0111=>0x0110, 0x0433=>0x0413, 0x012F=>0x012E, 0x00E6=>0x00C6,
+    0x0078=>0x0058, 0x0161=>0x0160, 0x016F=>0x016E, 0x03B1=>0x0391, 0x0457=>0x0407,
+    0x0173=>0x0172, 0x00FF=>0x0178, 0x006F=>0x004F, 0x043B=>0x041B, 0x03B5=>0x0395,
+    0x0445=>0x0425, 0x0121=>0x0120, 0x017E=>0x017D, 0x017C=>0x017B, 0x03B6=>0x0396,
+    0x03B2=>0x0392, 0x03AD=>0x0388, 0x1E85=>0x1E84, 0x0175=>0x0174, 0x0071=>0x0051,
+    0x0437=>0x0417, 0x1E0B=>0x1E0A, 0x0148=>0x0147, 0x0105=>0x0104, 0x0458=>0x0408,
+    0x014D=>0x014C, 0x00ED=>0x00CD, 0x0079=>0x0059, 0x010B=>0x010A, 0x03CE=>0x038F,
+    0x0072=>0x0052, 0x0430=>0x0410, 0x0455=>0x0405, 0x0452=>0x0402, 0x0127=>0x0126,
+    0x0137=>0x0136, 0x012B=>0x012A, 0x03AF=>0x038A, 0x044B=>0x042B, 0x006C=>0x004C,
+    0x03B7=>0x0397, 0x0125=>0x0124, 0x0219=>0x0218, 0x00FB=>0x00DB, 0x011F=>0x011E,
+    0x043E=>0x041E, 0x1E41=>0x1E40, 0x03BD=>0x039D, 0x0107=>0x0106, 0x03CB=>0x03AB,
+    0x0446=>0x0426, 0x00FE=>0x00DE, 0x00E7=>0x00C7, 0x03CA=>0x03AA, 0x0441=>0x0421,
+    0x0432=>0x0412, 0x010F=>0x010E, 0x00F8=>0x00D8, 0x0077=>0x0057, 0x011B=>0x011A,
+    0x0074=>0x0054, 0x006A=>0x004A, 0x045B=>0x040B, 0x0456=>0x0406, 0x0103=>0x0102,
+    0x03BB=>0x039B, 0x00F1=>0x00D1, 0x043D=>0x041D, 0x03CC=>0x038C, 0x00E9=>0x00C9,
+    0x00F0=>0x00D0, 0x0457=>0x0407, 0x0123=>0x0122,
+            );
+    }
+
+    $uni = utf8_to_unicode($string);
+
+    if ( !$uni ) {
+        return FALSE;
+    }
+
+    $cnt = count($uni);
+    for ($i=0; $i < $cnt; $i++){
+        if( isset($UTF8_LOWER_TO_UPPER[$uni[$i]]) ) {
+            $uni[$i] = $UTF8_LOWER_TO_UPPER[$uni[$i]];
+        }
+    }
+
+    return utf8_from_unicode($uni);
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/ord.php b/core/libraries/vendor/joomla/string/src/phputf8/ord.php
new file mode 100644
index 00000000..449fe313
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/ord.php
@@ -0,0 +1,90 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to ord
+* Returns the unicode ordinal for a character
+* @param string UTF-8 encoded character
+* @return int unicode ordinal for the character
+* @see http://www.php.net/ord
+* @see http://www.php.net/manual/en/function.ord.php#46267
+*/
+function utf8_ord($chr) {
+
+    $ord0 = ord($chr);
+
+    if ( $ord0 >= 0 && $ord0 <= 127 ) {
+        return $ord0;
+    }
+
+    if ( !isset($chr{1}) ) {
+        trigger_error('Short sequence - at least 2 bytes expected, only 1 seen');
+        return FALSE;
+    }
+
+    $ord1 = ord($chr{1});
+    if ( $ord0 >= 192 && $ord0 <= 223 ) {
+        return ( $ord0 - 192 ) * 64
+            + ( $ord1 - 128 );
+    }
+
+    if ( !isset($chr{2}) ) {
+        trigger_error('Short sequence - at least 3 bytes expected, only 2 seen');
+        return FALSE;
+    }
+    $ord2 = ord($chr{2});
+    if ( $ord0 >= 224 && $ord0 <= 239 ) {
+        return ($ord0-224)*4096
+            + ($ord1-128)*64
+                + ($ord2-128);
+    }
+
+    if ( !isset($chr{3}) ) {
+        trigger_error('Short sequence - at least 4 bytes expected, only 3 seen');
+        return FALSE;
+    }
+    $ord3 = ord($chr{3});
+    if ($ord0>=240 && $ord0<=247) {
+        return ($ord0-240)*262144
+            + ($ord1-128)*4096
+                + ($ord2-128)*64
+                    + ($ord3-128);
+
+    }
+
+    if ( !isset($chr{4}) ) {
+        trigger_error('Short sequence - at least 5 bytes expected, only 4 seen');
+        return FALSE;
+    }
+    $ord4 = ord($chr{4});
+    if ($ord0>=248 && $ord0<=251) {
+        return ($ord0-248)*16777216
+            + ($ord1-128)*262144
+                + ($ord2-128)*4096
+                    + ($ord3-128)*64
+                        + ($ord4-128);
+    }
+
+    if ( !isset($chr{5}) ) {
+        trigger_error('Short sequence - at least 6 bytes expected, only 5 seen');
+        return FALSE;
+    }
+    if ($ord0>=252 && $ord0<=253) {
+        return ($ord0-252) * 1073741824
+            + ($ord1-128)*16777216
+                + ($ord2-128)*262144
+                    + ($ord3-128)*4096
+                        + ($ord4-128)*64
+                            + (ord($chr{5})-128);
+    }
+
+    if ( $ord0 >= 254 && $ord0 <= 255 ) {
+        trigger_error('Invalid UTF-8 with surrogate ordinal '.$ord0);
+        return FALSE;
+    }
+
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/str_ireplace.php b/core/libraries/vendor/joomla/string/src/phputf8/str_ireplace.php
new file mode 100644
index 00000000..c4b4df8d
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/str_ireplace.php
@@ -0,0 +1,77 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to str_ireplace
+* Case-insensitive version of str_replace
+* Note: requires utf8_strtolower
+* Note: it's not fast and gets slower if $search / $replace is array
+* Notes: it's based on the assumption that the lower and uppercase
+* versions of a UTF-8 character will have the same length in bytes
+* which is currently true given the hash table to strtolower
+* @param string
+* @return string
+* @see http://www.php.net/str_ireplace
+* @see utf8_strtolower
+* @package utf8
+*/
+function utf8_ireplace($search, $replace, $str, $count = NULL){
+
+    if ( !is_array($search) ) {
+
+        $slen = strlen($search);
+        if ( $slen == 0 ) {
+            return $str;
+        }
+
+        $lendif = strlen($replace) - strlen($search);
+        $search = utf8_strtolower($search);
+
+        $search = preg_quote($search, '/');
+        $lstr = utf8_strtolower($str);
+        $i = 0;
+        $matched = 0;
+        while ( preg_match('/(.*)'.$search.'/Us',$lstr, $matches) ) {
+            if ( $i === $count ) {
+                break;
+            }
+            $mlen = strlen($matches[0]);
+            $lstr = substr($lstr, $mlen);
+            $str = substr_replace($str, $replace, $matched+strlen($matches[1]), $slen);
+            $matched += $mlen + $lendif;
+            $i++;
+        }
+        return $str;
+
+    } else {
+
+        foreach ( array_keys($search) as $k ) {
+
+            if ( is_array($replace) ) {
+
+                if ( array_key_exists($k,$replace) ) {
+
+                    $str = utf8_ireplace($search[$k], $replace[$k], $str, $count);
+
+                } else {
+
+                    $str = utf8_ireplace($search[$k], '', $str, $count);
+
+                }
+
+            } else {
+
+                $str = utf8_ireplace($search[$k], $replace, $str, $count);
+
+            }
+        }
+        return $str;
+
+    }
+
+}
+
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/str_pad.php b/core/libraries/vendor/joomla/string/src/phputf8/str_pad.php
new file mode 100644
index 00000000..32beca46
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/str_pad.php
@@ -0,0 +1,54 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* Replacement for str_pad. $padStr may contain multi-byte characters.
+*
+* @author Oliver Saunders <oliver (a) osinternetservices.com>
+* @param string $input
+* @param int $length
+* @param string $padStr
+* @param int $type ( same constants as str_pad )
+* @return string
+* @see http://www.php.net/str_pad
+* @see utf8_substr
+* @package utf8
+*/
+function utf8_str_pad($input, $length, $padStr = ' ', $type = STR_PAD_RIGHT) {
+
+    $inputLen = utf8_strlen($input);
+    if ($length <= $inputLen) {
+        return $input;
+    }
+
+    $padStrLen = utf8_strlen($padStr);
+    $padLen = $length - $inputLen;
+
+    if ($type == STR_PAD_RIGHT) {
+        $repeatTimes = ceil($padLen / $padStrLen);
+        return utf8_substr($input . str_repeat($padStr, $repeatTimes), 0, $length);
+    }
+
+    if ($type == STR_PAD_LEFT) {
+        $repeatTimes = ceil($padLen / $padStrLen);
+        return utf8_substr(str_repeat($padStr, $repeatTimes), 0, floor($padLen)) . $input;
+    }
+
+    if ($type == STR_PAD_BOTH) {
+
+        $padLen/= 2;
+        $padAmountLeft = floor($padLen);
+        $padAmountRight = ceil($padLen);
+        $repeatTimesLeft = ceil($padAmountLeft / $padStrLen);
+        $repeatTimesRight = ceil($padAmountRight / $padStrLen);
+
+        $paddingLeft = utf8_substr(str_repeat($padStr, $repeatTimesLeft), 0, $padAmountLeft);
+        $paddingRight = utf8_substr(str_repeat($padStr, $repeatTimesRight), 0, $padAmountLeft);
+        return $paddingLeft . $input . $paddingRight;
+    }
+
+    trigger_error('utf8_str_pad: Unknown padding type (' . $type . ')',E_USER_ERROR);
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/str_split.php b/core/libraries/vendor/joomla/string/src/phputf8/str_split.php
new file mode 100644
index 00000000..13b93d51
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/str_split.php
@@ -0,0 +1,32 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to str_split
+* Convert a string to an array
+* Note: requires utf8_strlen to be loaded
+* @param string UTF-8 encoded
+* @param int number to characters to split string by
+* @return string characters in string reverses
+* @see http://www.php.net/str_split
+* @see utf8_strlen
+* @package utf8
+*/
+function utf8_str_split($str, $split_len = 1) {
+
+    if ( !preg_match('/^[0-9]+$/',$split_len) || $split_len < 1 ) {
+        return FALSE;
+    }
+
+    $len = utf8_strlen($str);
+    if ( $len <= $split_len ) {
+        return array($str);
+    }
+
+    preg_match_all('/.{'.$split_len.'}|[^\x00]{1,'.$split_len.'}$/us', $str, $ar);
+    return $ar[0];
+
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/strcasecmp.php b/core/libraries/vendor/joomla/string/src/phputf8/strcasecmp.php
new file mode 100644
index 00000000..ece008c0
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/strcasecmp.php
@@ -0,0 +1,23 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strcasecmp
+* A case insensivite string comparison
+* Note: requires utf8_strtolower
+* @param string
+* @param string
+* @return int
+* @see http://www.php.net/strcasecmp
+* @see utf8_strtolower
+* @package utf8
+*/
+function utf8_strcasecmp($strX, $strY) {
+    $strX = utf8_strtolower($strX);
+    $strY = utf8_strtolower($strY);
+    return strcmp($strX, $strY);
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/strcspn.php b/core/libraries/vendor/joomla/string/src/phputf8/strcspn.php
new file mode 100644
index 00000000..4a081bb2
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/strcspn.php
@@ -0,0 +1,38 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strcspn
+* Find length of initial segment not matching mask
+* Note: requires utf8_strlen and utf8_substr (if start, length are used)
+* @param string
+* @return int
+* @see http://www.php.net/strcspn
+* @see utf8_strlen
+* @package utf8
+*/
+function utf8_strcspn($str, $mask, $start = NULL, $length = NULL) {
+
+    if ( empty($mask) || strlen($mask) == 0 ) {
+        return NULL;
+    }
+
+    $mask = preg_replace('!([\\\\\\-\\]\\[/^])!','\\\${1}',$mask);
+
+    if ( $start !== NULL || $length !== NULL ) {
+        $str = utf8_substr($str, $start, $length);
+    }
+
+    preg_match('/^[^'.$mask.']+/u',$str, $matches);
+
+    if ( isset($matches[0]) ) {
+        return utf8_strlen($matches[0]);
+    }
+
+    return 0;
+
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/stristr.php b/core/libraries/vendor/joomla/string/src/phputf8/stristr.php
new file mode 100644
index 00000000..b286e700
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/stristr.php
@@ -0,0 +1,35 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to stristr
+* Find first occurrence of a string using case insensitive comparison
+* Note: requires utf8_strtolower
+* @param string
+* @param string
+* @return int
+* @see http://www.php.net/strcasecmp
+* @see utf8_strtolower
+* @package utf8
+*/
+function utf8_stristr($str, $search) {
+
+    if ( strlen($search) == 0 ) {
+        return $str;
+    }
+
+    $lstr = utf8_strtolower($str);
+    $lsearch = utf8_strtolower($search);
+    //JOOMLA SPECIFIC FIX - BEGIN
+    preg_match('/^(.*)'.preg_quote($lsearch, '/').'/Us',$lstr, $matches);
+    //JOOMLA SPECIFIC FIX - END
+
+    if ( count($matches) == 2 ) {
+        return substr($str, strlen($matches[1]));
+    }
+
+    return FALSE;
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/strrev.php b/core/libraries/vendor/joomla/string/src/phputf8/strrev.php
new file mode 100644
index 00000000..e137fc4b
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/strrev.php
@@ -0,0 +1,19 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strrev
+* Reverse a string
+* @param string UTF-8 encoded
+* @return string characters in string reverses
+* @see http://www.php.net/strrev
+* @package utf8
+*/
+function utf8_strrev($str){
+    preg_match_all('/./us', $str, $ar);
+    return join('',array_reverse($ar[0]));
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/strspn.php b/core/libraries/vendor/joomla/string/src/phputf8/strspn.php
new file mode 100644
index 00000000..372596d6
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/strspn.php
@@ -0,0 +1,38 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to strspn
+* Find length of initial segment matching mask
+* Note: requires utf8_strlen and utf8_substr (if start, length are used)
+* @param string
+* @return int
+* @see http://www.php.net/strspn
+* @package utf8
+*/
+function utf8_strspn($str, $mask, $start = NULL, $length = NULL) {
+
+    $mask = preg_replace('!([\\\\\\-\\]\\[/^])!','\\\${1}',$mask);
+
+	// Fix for $start but no $length argument.
+    if ($start !== null && $length === null) {
+    	$length = utf8_strlen($str);
+    }
+
+    if ( $start !== NULL || $length !== NULL ) {
+        $str = utf8_substr($str, $start, $length);
+    }
+
+    preg_match('/^['.$mask.']+/u',$str, $matches);
+
+    if ( isset($matches[0]) ) {
+        return utf8_strlen($matches[0]);
+    }
+
+    return 0;
+
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/substr_replace.php b/core/libraries/vendor/joomla/string/src/phputf8/substr_replace.php
new file mode 100644
index 00000000..fd66e1e9
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/substr_replace.php
@@ -0,0 +1,22 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware substr_replace.
+* Note: requires utf8_substr to be loaded
+* @see http://www.php.net/substr_replace
+* @see utf8_strlen
+* @see utf8_substr
+*/
+function utf8_substr_replace($str, $repl, $start , $length = NULL ) {
+    preg_match_all('/./us', $str, $ar);
+    preg_match_all('/./us', $repl, $rar);
+    if( $length === NULL ) {
+        $length = utf8_strlen($str);
+    }
+    array_splice( $ar[0], $start, $length, $rar[0] );
+    return join('',$ar[0]);
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/trim.php b/core/libraries/vendor/joomla/string/src/phputf8/trim.php
new file mode 100644
index 00000000..248acc3a
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/trim.php
@@ -0,0 +1,63 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware replacement for ltrim()
+* Note: you only need to use this if you are supplying the charlist
+* optional arg and it contains UTF-8 characters. Otherwise ltrim will
+* work normally on a UTF-8 string
+* @author Andreas Gohr <andi@splitbrain.org>
+* @see http://www.php.net/ltrim
+* @see http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+* @return string
+* @package utf8
+*/
+function utf8_ltrim( $str, $charlist = FALSE ) {
+    if($charlist === FALSE) return ltrim($str);
+
+    //quote charlist for use in a characterclass
+    $charlist = preg_replace('!([\\\\\\-\\]\\[/^])!','\\\${1}',$charlist);
+
+    return preg_replace('/^['.$charlist.']+/u','',$str);
+}
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware replacement for rtrim()
+* Note: you only need to use this if you are supplying the charlist
+* optional arg and it contains UTF-8 characters. Otherwise rtrim will
+* work normally on a UTF-8 string
+* @author Andreas Gohr <andi@splitbrain.org>
+* @see http://www.php.net/rtrim
+* @see http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+* @return string
+* @package utf8
+*/
+function utf8_rtrim( $str, $charlist = FALSE ) {
+    if($charlist === FALSE) return rtrim($str);
+
+    //quote charlist for use in a characterclass
+    $charlist = preg_replace('!([\\\\\\-\\]\\[/^])!','\\\${1}',$charlist);
+
+    return preg_replace('/['.$charlist.']+$/u','',$str);
+}
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware replacement for trim()
+* Note: you only need to use this if you are supplying the charlist
+* optional arg and it contains UTF-8 characters. Otherwise trim will
+* work normally on a UTF-8 string
+* @author Andreas Gohr <andi@splitbrain.org>
+* @see http://www.php.net/trim
+* @see http://dev.splitbrain.org/view/darcs/dokuwiki/inc/utf8.php
+* @return string
+* @package utf8
+*/
+function utf8_trim( $str, $charlist = FALSE ) {
+    if($charlist === FALSE) return trim($str);
+    return utf8_ltrim(utf8_rtrim($str, $charlist), $charlist);
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/ucfirst.php b/core/libraries/vendor/joomla/string/src/phputf8/ucfirst.php
new file mode 100644
index 00000000..7f7ae9ec
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/ucfirst.php
@@ -0,0 +1,31 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to ucfirst
+* Make a string's first character uppercase
+* Note: requires utf8_strtoupper
+* @param string
+* @return string with first character as upper case (if applicable)
+* @see http://www.php.net/ucfirst
+* @see utf8_strtoupper
+* @package utf8
+*/
+function utf8_ucfirst($str){
+    switch ( utf8_strlen($str) ) {
+        case 0:
+            return '';
+        break;
+        case 1:
+            return utf8_strtoupper($str);
+        break;
+        default:
+            preg_match('/^(.{1})(.*)$/us', $str, $matches);
+            return utf8_strtoupper($matches[1]).$matches[2];
+        break;
+    }
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/ucwords.php b/core/libraries/vendor/joomla/string/src/phputf8/ucwords.php
new file mode 100644
index 00000000..6f300a97
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/ucwords.php
@@ -0,0 +1,40 @@
+<?php
+/**
+* @package utf8
+*/
+
+//---------------------------------------------------------------
+/**
+* UTF-8 aware alternative to ucwords
+* Uppercase the first character of each word in a string
+* Note: requires utf8_substr_replace and utf8_strtoupper
+* @param string
+* @return string with first char of each word uppercase
+* @see http://www.php.net/ucwords
+* @package utf8
+*/
+function utf8_ucwords($str) {
+    // Note: [\x0c\x09\x0b\x0a\x0d\x20] matches;
+    // form feeds, horizontal tabs, vertical tabs, linefeeds and carriage returns
+    // This corresponds to the definition of a "word" defined at http://www.php.net/ucwords
+    $pattern = '/(^|([\x0c\x09\x0b\x0a\x0d\x20]+))([^\x0c\x09\x0b\x0a\x0d\x20]{1})[^\x0c\x09\x0b\x0a\x0d\x20]*/u';
+    return preg_replace_callback($pattern, 'utf8_ucwords_callback',$str);
+}
+
+//---------------------------------------------------------------
+/**
+* Callback function for preg_replace_callback call in utf8_ucwords
+* You don't need to call this yourself
+* @param array of matches corresponding to a single word
+* @return string with first char of the word in uppercase
+* @see utf8_ucwords
+* @see utf8_strtoupper
+* @package utf8
+*/
+function utf8_ucwords_callback($matches) {
+    $leadingws = $matches[2];
+    $ucfirst = utf8_strtoupper($matches[3]);
+    $ucword = utf8_substr_replace(ltrim($matches[0]),$ucfirst,0,1);
+    return $leadingws . $ucword;
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utf8.php b/core/libraries/vendor/joomla/string/src/phputf8/utf8.php
new file mode 100644
index 00000000..4be7ef94
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utf8.php
@@ -0,0 +1,74 @@
+<?php
+/**
+* This is the dynamic loader for the library. It checks whether you have
+* the mbstring extension available and includes relevant files
+* on that basis, falling back to the native (as in written in PHP) version
+* if mbstring is unavailabe.
+*
+* It's probably easiest to use this, if you don't want to understand
+* the dependencies involved, in conjunction with PHP versions etc. At
+* the same time, you might get better performance by managing loading
+* yourself. The smartest way to do this, bearing in mind performance,
+* is probably to "load on demand" - i.e. just before you use these
+* functions in your code, load the version you need.
+*
+* It makes sure the the following functions are available;
+* utf8_strlen, utf8_strpos, utf8_strrpos, utf8_substr,
+* utf8_strtolower, utf8_strtoupper
+* Other functions in the ./native directory depend on these
+* six functions being available
+* @package utf8
+*/
+
+/**
+* Put the current directory in this constant
+*/
+if ( !defined('UTF8') ) {
+    define('UTF8',dirname(__FILE__));
+}
+
+/**
+* If string overloading is active, it will break many of the
+* native implementations. mbstring.func_overload must be set
+* to 0, 1 or 4 in php.ini (string overloading disabled).
+* Also need to check we have the correct internal mbstring
+* encoding
+*/
+if ( extension_loaded('mbstring')) {
+    if ( ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING ) {
+        trigger_error('String functions are overloaded by mbstring',E_USER_ERROR);
+    }
+    mb_internal_encoding('UTF-8');
+}
+
+/**
+* Check whether PCRE has been compiled with UTF-8 support
+*/
+$UTF8_ar = array();
+if ( preg_match('/^.{1}$/u',"ñ",$UTF8_ar) != 1 ) {
+    trigger_error('PCRE is not compiled with UTF-8 support',E_USER_ERROR);
+}
+unset($UTF8_ar);
+
+
+/**
+* Load the smartest implementations of utf8_strpos, utf8_strrpos
+* and utf8_substr
+*/
+if ( !defined('UTF8_CORE') ) {
+    if ( function_exists('mb_substr') ) {
+        require_once UTF8 . '/mbstring/core.php';
+    } else {
+        require_once UTF8 . '/utils/unicode.php';
+        require_once UTF8 . '/native/core.php';
+    }
+}
+
+/**
+* Load the native implementation of utf8_substr_replace
+*/
+require_once UTF8 . '/substr_replace.php';
+
+/**
+* You should now be able to use all the other utf_* string functions
+*/
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/ascii.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/ascii.php
new file mode 100644
index 00000000..0c956605
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/ascii.php
@@ -0,0 +1,214 @@
+<?php
+/**
+* Tools to help with ASCII in UTF-8
+*
+* @package utf8
+*/
+
+//--------------------------------------------------------------------
+/**
+* Tests whether a string contains only 7bit ASCII bytes.
+* You might use this to conditionally check whether a string
+* needs handling as UTF-8 or not, potentially offering performance
+* benefits by using the native PHP equivalent if it's just ASCII e.g.;
+*
+* <code>
+* if ( utf8_is_ascii($someString) ) {
+*     // It's just ASCII - use the native PHP version
+*     $someString = strtolower($someString);
+* } else {
+*     $someString = utf8_strtolower($someString);
+* }
+* </code>
+*
+* @param string
+* @return boolean TRUE if it's all ASCII
+* @package utf8
+* @see utf8_is_ascii_ctrl
+*/
+function utf8_is_ascii($str) {
+    // Search for any bytes which are outside the ASCII range...
+    return (preg_match('/(?:[^\x00-\x7F])/',$str) !== 1);
+}
+
+//--------------------------------------------------------------------
+/**
+* Tests whether a string contains only 7bit ASCII bytes with device
+* control codes omitted. The device control codes can be found on the
+* second table here: http://www.w3schools.com/tags/ref_ascii.asp
+*
+* @param string
+* @return boolean TRUE if it's all ASCII without device control codes
+* @package utf8
+* @see utf8_is_ascii
+*/
+function utf8_is_ascii_ctrl($str) {
+    if ( strlen($str) > 0 ) {
+        // Search for any bytes which are outside the ASCII range,
+        // or are device control codes
+        return (preg_match('/[^\x09\x0A\x0D\x20-\x7E]/',$str) !== 1);
+    }
+    return FALSE;
+}
+
+//--------------------------------------------------------------------
+/**
+* Strip out all non-7bit ASCII bytes
+* If you need to transmit a string to system which you know can only
+* support 7bit ASCII, you could use this function.
+* @param string
+* @return string with non ASCII bytes removed
+* @package utf8
+* @see utf8_strip_non_ascii_ctrl
+*/
+function utf8_strip_non_ascii($str) {
+    ob_start();
+    while ( preg_match(
+        '/^([\x00-\x7F]+)|([^\x00-\x7F]+)/S',
+            $str, $matches) ) {
+        if ( !isset($matches[2]) ) {
+            echo $matches[0];
+        }
+        $str = substr($str, strlen($matches[0]));
+    }
+    $result = ob_get_contents();
+    ob_end_clean();
+    return $result;
+}
+
+//--------------------------------------------------------------------
+/**
+* Strip out device control codes in the ASCII range
+* which are not permitted in XML. Note that this leaves
+* multi-byte characters untouched - it only removes device
+* control codes
+* @see http://hsivonen.iki.fi/producing-xml/#controlchar
+* @param string
+* @return string control codes removed
+*/
+function utf8_strip_ascii_ctrl($str) {
+    ob_start();
+    while ( preg_match(
+        '/^([^\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+)|([\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+)/S',
+            $str, $matches) ) {
+        if ( !isset($matches[2]) ) {
+            echo $matches[0];
+        }
+        $str = substr($str, strlen($matches[0]));
+    }
+    $result = ob_get_contents();
+    ob_end_clean();
+    return $result;
+}
+
+//--------------------------------------------------------------------
+/**
+* Strip out all non 7bit ASCII bytes and ASCII device control codes.
+* For a list of ASCII device control codes see the 2nd table here:
+* http://www.w3schools.com/tags/ref_ascii.asp
+*
+* @param string
+* @return boolean TRUE if it's all ASCII
+* @package utf8
+*/
+function utf8_strip_non_ascii_ctrl($str) {
+    ob_start();
+    while ( preg_match(
+        '/^([\x09\x0A\x0D\x20-\x7E]+)|([^\x09\x0A\x0D\x20-\x7E]+)/S',
+            $str, $matches) ) {
+        if ( !isset($matches[2]) ) {
+            echo $matches[0];
+        }
+        $str = substr($str, strlen($matches[0]));
+    }
+    $result = ob_get_contents();
+    ob_end_clean();
+    return $result;
+}
+
+//---------------------------------------------------------------
+/**
+* Replace accented UTF-8 characters by unaccented ASCII-7 "equivalents".
+* The purpose of this function is to replace characters commonly found in Latin
+* alphabets with something more or less equivalent from the ASCII range. This can
+* be useful for converting a UTF-8 to something ready for a filename, for example.
+* Following the use of this function, you would probably also pass the string
+* through utf8_strip_non_ascii to clean out any other non-ASCII chars
+* Use the optional parameter to just deaccent lower ($case = -1) or upper ($case = 1)
+* letters. Default is to deaccent both cases ($case = 0)
+*
+* For a more complete implementation of transliteration, see the utf8_to_ascii package
+* available from the phputf8 project downloads:
+* http://prdownloads.sourceforge.net/phputf8
+*
+* @param string UTF-8 string
+* @param int (optional) -1 lowercase only, +1 uppercase only, 1 both cases
+* @param string UTF-8 with accented characters replaced by ASCII chars
+* @return string accented chars replaced with ascii equivalents
+* @author Andreas Gohr <andi@splitbrain.org>
+* @package utf8
+*/
+function utf8_accents_to_ascii( $str, $case=0 ){
+
+    static $UTF8_LOWER_ACCENTS = NULL;
+    static $UTF8_UPPER_ACCENTS = NULL;
+
+    if($case <= 0){
+
+        if ( is_null($UTF8_LOWER_ACCENTS) ) {
+            $UTF8_LOWER_ACCENTS = array(
+  'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
+  'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
+  'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
+  'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o',
+  'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c',
+  'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't',
+  'ū' => 'u', 'č' => 'c', 'ö' => 'oe', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l',
+  'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z',
+  'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't',
+  'ŗ' => 'r', 'ä' => 'ae', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'ue', 'ò' => 'o',
+  'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j',
+  'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o',
+  'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
+  'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
+  'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
+            );
+        }
+
+        $str = str_replace(
+                array_keys($UTF8_LOWER_ACCENTS),
+                array_values($UTF8_LOWER_ACCENTS),
+                $str
+            );
+    }
+
+    if($case >= 0){
+        if ( is_null($UTF8_UPPER_ACCENTS) ) {
+            $UTF8_UPPER_ACCENTS = array(
+  'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
+  'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
+  'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
+  'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O',
+  'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C',
+  'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T',
+  'Ū' => 'U', 'Č' => 'C', 'Ö' => 'Oe', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L',
+  'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z',
+  'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T',
+  'Ŗ' => 'R', 'Ä' => 'Ae', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'Ue', 'Ò' => 'O',
+  'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J',
+  'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O',
+  'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
+  'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
+  'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
+            );
+        }
+        $str = str_replace(
+                array_keys($UTF8_UPPER_ACCENTS),
+                array_values($UTF8_UPPER_ACCENTS),
+                $str
+            );
+    }
+
+    return $str;
+
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/bad.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/bad.php
new file mode 100644
index 00000000..e8b8f117
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/bad.php
@@ -0,0 +1,406 @@
+<?php
+/**
+* Tools for locating / replacing bad bytes in UTF-8 strings
+* The Original Code is Mozilla Communicator client code.
+* The Initial Developer of the Original Code is
+* Netscape Communications Corporation.
+* Portions created by the Initial Developer are Copyright (C) 1998
+* the Initial Developer. All Rights Reserved.
+* Ported to PHP by Henri Sivonen (http://hsivonen.iki.fi)
+* Slight modifications to fit with phputf8 library by Harry Fuecks (hfuecks gmail com)
+* @see http://lxr.mozilla.org/seamonkey/source/intl/uconv/src/nsUTF8ToUnicode.cpp
+* @see http://lxr.mozilla.org/seamonkey/source/intl/uconv/src/nsUnicodeToUTF8.cpp
+* @see http://hsivonen.iki.fi/php-utf8/
+* @package utf8
+* @see utf8_is_valid
+*/
+
+//--------------------------------------------------------------------
+/**
+* Locates the first bad byte in a UTF-8 string returning it's
+* byte index in the string
+* PCRE Pattern to locate bad bytes in a UTF-8 string
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @param string
+* @return mixed integer byte index or FALSE if no bad found
+* @package utf8
+*/
+function utf8_bad_find($str) {
+    $UTF8_BAD =
+    '([\x00-\x7F]'.                          # ASCII (including control chars)
+    '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+    '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+    '|(.{1}))';                              # invalid byte
+    $pos = 0;
+    $badList = array();
+    while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches)) {
+        $bytes = strlen($matches[0]);
+        if ( isset($matches[2])) {
+            return $pos;
+        }
+        $pos += $bytes;
+        $str = substr($str,$bytes);
+    }
+    return FALSE;
+}
+
+//--------------------------------------------------------------------
+/**
+* Locates all bad bytes in a UTF-8 string and returns a list of their
+* byte index in the string
+* PCRE Pattern to locate bad bytes in a UTF-8 string
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @param string
+* @return mixed array of integers or FALSE if no bad found
+* @package utf8
+*/
+function utf8_bad_findall($str) {
+    $UTF8_BAD =
+    '([\x00-\x7F]'.                          # ASCII (including control chars)
+    '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+    '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+    '|(.{1}))';                              # invalid byte
+    $pos = 0;
+    $badList = array();
+    while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches)) {
+        $bytes = strlen($matches[0]);
+        if ( isset($matches[2])) {
+            $badList[] = $pos;
+        }
+        $pos += $bytes;
+        $str = substr($str,$bytes);
+    }
+    if ( count($badList) > 0 ) {
+        return $badList;
+    }
+    return FALSE;
+}
+
+//--------------------------------------------------------------------
+/**
+* Strips out any bad bytes from a UTF-8 string and returns the rest
+* PCRE Pattern to locate bad bytes in a UTF-8 string
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @param string
+* @return string
+* @package utf8
+*/
+function utf8_bad_strip($str) {
+    $UTF8_BAD =
+    '([\x00-\x7F]'.                          # ASCII (including control chars)
+    '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+    '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+    '|(.{1}))';                              # invalid byte
+    ob_start();
+    while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches)) {
+        if ( !isset($matches[2])) {
+            echo $matches[0];
+        }
+        $str = substr($str,strlen($matches[0]));
+    }
+    $result = ob_get_contents();
+    ob_end_clean();
+    return $result;
+}
+
+//--------------------------------------------------------------------
+/**
+* Replace bad bytes with an alternative character - ASCII character
+* recommended is replacement char
+* PCRE Pattern to locate bad bytes in a UTF-8 string
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @param string to search
+* @param string to replace bad bytes with (defaults to '?') - use ASCII
+* @return string
+* @package utf8
+*/
+function utf8_bad_replace($str, $replace = '?') {
+    $UTF8_BAD =
+    '([\x00-\x7F]'.                          # ASCII (including control chars)
+    '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+    '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+    '|(.{1}))';                              # invalid byte
+    ob_start();
+    while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches)) {
+        if ( !isset($matches[2])) {
+            echo $matches[0];
+        } else {
+            echo $replace;
+        }
+        $str = substr($str,strlen($matches[0]));
+    }
+    $result = ob_get_contents();
+    ob_end_clean();
+    return $result;
+}
+
+//--------------------------------------------------------------------
+/**
+* Return code from utf8_bad_identify() when a five octet sequence is detected.
+* Note: 5 octets sequences are valid UTF-8 but are not supported by Unicode so
+* do not represent a useful character
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_5OCTET',1);
+
+/**
+* Return code from utf8_bad_identify() when a six octet sequence is detected.
+* Note: 6 octets sequences are valid UTF-8 but are not supported by Unicode so
+* do not represent a useful character
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_6OCTET',2);
+
+/**
+* Return code from utf8_bad_identify().
+* Invalid octet for use as start of multi-byte UTF-8 sequence
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_SEQID',3);
+
+/**
+* Return code from utf8_bad_identify().
+* From Unicode 3.1, non-shortest form is illegal
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_NONSHORT',4);
+
+/**
+* Return code from utf8_bad_identify().
+* From Unicode 3.2, surrogate characters are illegal
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_SURROGATE',5);
+
+/**
+* Return code from utf8_bad_identify().
+* Codepoints outside the Unicode range are illegal
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_UNIOUTRANGE',6);
+
+/**
+* Return code from utf8_bad_identify().
+* Incomplete multi-octet sequence
+* Note: this is kind of a "catch-all"
+* @see utf8_bad_identify
+* @package utf8
+*/
+define('UTF8_BAD_SEQINCOMPLETE',7);
+
+//--------------------------------------------------------------------
+/**
+* Reports on the type of bad byte found in a UTF-8 string. Returns a
+* status code on the first bad byte found
+* @author <hsivonen@iki.fi>
+* @param string UTF-8 encoded string
+* @return mixed integer constant describing problem or FALSE if valid UTF-8
+* @see utf8_bad_explain
+* @see http://hsivonen.iki.fi/php-utf8/
+* @package utf8
+*/
+function utf8_bad_identify($str, &$i) {
+
+    $mState = 0;     // cached expected number of octets after the current octet
+                     // until the beginning of the next UTF8 character sequence
+    $mUcs4  = 0;     // cached Unicode character
+    $mBytes = 1;     // cached expected number of octets in the current sequence
+
+    $len = strlen($str);
+
+    for($i = 0; $i < $len; $i++) {
+
+        $in = ord($str{$i});
+
+        if ( $mState == 0) {
+
+            // When mState is zero we expect either a US-ASCII character or a
+            // multi-octet sequence.
+            if (0 == (0x80 & ($in))) {
+                // US-ASCII, pass straight through.
+                $mBytes = 1;
+
+            } else if (0xC0 == (0xE0 & ($in))) {
+                // First octet of 2 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x1F) << 6;
+                $mState = 1;
+                $mBytes = 2;
+
+            } else if (0xE0 == (0xF0 & ($in))) {
+                // First octet of 3 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x0F) << 12;
+                $mState = 2;
+                $mBytes = 3;
+
+            } else if (0xF0 == (0xF8 & ($in))) {
+                // First octet of 4 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x07) << 18;
+                $mState = 3;
+                $mBytes = 4;
+
+            } else if (0xF8 == (0xFC & ($in))) {
+
+                /* First octet of 5 octet sequence.
+                *
+                * This is illegal because the encoded codepoint must be either
+                * (a) not the shortest form or
+                * (b) outside the Unicode range of 0-0x10FFFF.
+                */
+
+                return UTF8_BAD_5OCTET;
+
+            } else if (0xFC == (0xFE & ($in))) {
+
+                // First octet of 6 octet sequence, see comments for 5 octet sequence.
+                return UTF8_BAD_6OCTET;
+
+            } else {
+                // Current octet is neither in the US-ASCII range nor a legal first
+                // octet of a multi-octet sequence.
+                return UTF8_BAD_SEQID;
+
+            }
+
+        } else {
+
+            // When mState is non-zero, we expect a continuation of the multi-octet
+            // sequence
+            if (0x80 == (0xC0 & ($in))) {
+
+                // Legal continuation.
+                $shift = ($mState - 1) * 6;
+                $tmp = $in;
+                $tmp = ($tmp & 0x0000003F) << $shift;
+                $mUcs4 |= $tmp;
+
+                /**
+                * End of the multi-octet sequence. mUcs4 now contains the final
+                * Unicode codepoint to be output
+                */
+                if (0 == --$mState) {
+
+                    // From Unicode 3.1, non-shortest form is illegal
+                    if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+                        ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+                        ((4 == $mBytes) && ($mUcs4 < 0x10000)) ) {
+                        return UTF8_BAD_NONSHORT;
+
+                    // From Unicode 3.2, surrogate characters are illegal
+                    } else if (($mUcs4 & 0xFFFFF800) == 0xD800) {
+                        return UTF8_BAD_SURROGATE;
+
+                    // Codepoints outside the Unicode range are illegal
+                    } else if ($mUcs4 > 0x10FFFF) {
+                        return UTF8_BAD_UNIOUTRANGE;
+                    }
+
+                    //initialize UTF8 cache
+                    $mState = 0;
+                    $mUcs4  = 0;
+                    $mBytes = 1;
+                }
+
+            } else {
+                // ((0xC0 & (*in) != 0x80) && (mState != 0))
+                // Incomplete multi-octet sequence.
+                $i--;
+                return UTF8_BAD_SEQINCOMPLETE;
+            }
+        }
+    }
+
+    if ( $mState != 0 ) {
+        // Incomplete multi-octet sequence.
+        $i--;
+        return UTF8_BAD_SEQINCOMPLETE;
+    }
+
+    // No bad octets found
+    $i = NULL;
+    return FALSE;
+}
+
+//--------------------------------------------------------------------
+/**
+* Takes a return code from utf8_bad_identify() are returns a message
+* (in English) explaining what the problem is.
+* @param int return code from utf8_bad_identify
+* @return mixed string message or FALSE if return code unknown
+* @see utf8_bad_identify
+* @package utf8
+*/
+function utf8_bad_explain($code) {
+
+    switch ($code) {
+
+        case UTF8_BAD_5OCTET:
+            return 'Five octet sequences are valid UTF-8 but are not supported by Unicode';
+        break;
+
+        case UTF8_BAD_6OCTET:
+            return 'Six octet sequences are valid UTF-8 but are not supported by Unicode';
+        break;
+
+        case UTF8_BAD_SEQID:
+            return 'Invalid octet for use as start of multi-byte UTF-8 sequence';
+        break;
+
+        case UTF8_BAD_NONSHORT:
+            return 'From Unicode 3.1, non-shortest form is illegal';
+        break;
+
+        case UTF8_BAD_SURROGATE:
+            return 'From Unicode 3.2, surrogate characters are illegal';
+        break;
+
+        case UTF8_BAD_UNIOUTRANGE:
+            return 'Codepoints outside the Unicode range are illegal';
+        break;
+
+        case UTF8_BAD_SEQINCOMPLETE:
+            return 'Incomplete multi-octet sequence';
+        break;
+
+    }
+
+    trigger_error('Unknown error code: '.$code,E_USER_WARNING);
+    return FALSE;
+
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/patterns.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/patterns.php
new file mode 100644
index 00000000..0ed83463
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/patterns.php
@@ -0,0 +1,64 @@
+<?php
+/**
+* PCRE Regular expressions for UTF-8. Note this file is not actually used by
+* the rest of the library but these regular expressions can be useful to have
+* available.
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @package utf8
+*/
+
+//--------------------------------------------------------------------
+/**
+* PCRE Pattern to check a UTF-8 string is valid
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @package utf8
+*/
+$UTF8_VALID = '^('.
+    '[\x00-\x7F]'.                          # ASCII (including control chars)
+    '|[\xC2-\xDF][\x80-\xBF]'.              # non-overlong 2-byte
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.          # excluding overlongs
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.   # straight 3-byte
+    '|\xED[\x80-\x9F][\x80-\xBF]'.          # excluding surrogates
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.       # planes 1-3
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.           # planes 4-15
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.       # plane 16
+    ')*$';
+
+//--------------------------------------------------------------------
+/**
+* PCRE Pattern to match single UTF-8 characters
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @package utf8
+*/
+$UTF8_MATCH =
+    '([\x00-\x7F])'.                          # ASCII (including control chars)
+    '|([\xC2-\xDF][\x80-\xBF])'.              # non-overlong 2-byte
+    '|(\xE0[\xA0-\xBF][\x80-\xBF])'.          # excluding overlongs
+    '|([\xE1-\xEC\xEE\xEF][\x80-\xBF]{2})'.   # straight 3-byte
+    '|(\xED[\x80-\x9F][\x80-\xBF])'.          # excluding surrogates
+    '|(\xF0[\x90-\xBF][\x80-\xBF]{2})'.       # planes 1-3
+    '|([\xF1-\xF3][\x80-\xBF]{3})'.           # planes 4-15
+    '|(\xF4[\x80-\x8F][\x80-\xBF]{2})';       # plane 16
+
+//--------------------------------------------------------------------
+/**
+* PCRE Pattern to locate bad bytes in a UTF-8 string
+* Comes from W3 FAQ: Multilingual Forms
+* Note: modified to include full ASCII range including control chars
+* @see http://www.w3.org/International/questions/qa-forms-utf-8
+* @package utf8
+*/
+$UTF8_BAD =
+    '([\x00-\x7F]'.                          # ASCII (including control chars)
+    '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+    '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+    '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+    '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+    '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+    '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+    '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+    '|(.{1}))';                              # invalid byte
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/position.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/position.php
new file mode 100644
index 00000000..a7a684d9
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/position.php
@@ -0,0 +1,168 @@
+<?php
+/**
+* Locate a byte index given a UTF-8 character index
+* @package utf8
+*/
+
+//--------------------------------------------------------------------
+/**
+* Given a string and a character index in the string, in
+* terms of the UTF-8 character position, returns the byte
+* index of that character. Can be useful when you want to
+* PHP's native string functions but we warned, locating
+* the byte can be expensive
+* Takes variable number of parameters - first must be
+* the search string then 1 to n UTF-8 character positions
+* to obtain byte indexes for - it is more efficient to search
+* the string for multiple characters at once, than make
+* repeated calls to this function
+*
+* @author Chris Smith<chris@jalakai.co.uk>
+* @param string string to locate index in
+* @param int (n times)
+* @return mixed - int if only one input int, array if more
+* @return boolean TRUE if it's all ASCII
+* @package utf8
+*/
+function utf8_byte_position() {
+
+    $args = func_get_args();
+    $str =& array_shift($args);
+    if (!is_string($str)) return false;
+
+    $result = array();
+
+    // trivial byte index, character offset pair
+    $prev = array(0,0);
+
+    // use a short piece of str to estimate bytes per character
+    // $i (& $j) -> byte indexes into $str
+    $i = utf8_locate_next_chr($str, 300);
+
+    // $c -> character offset into $str
+    $c = strlen(utf8_decode(substr($str,0,$i)));
+
+    // deal with arguments from lowest to highest
+    sort($args);
+
+    foreach ($args as $offset) {
+        // sanity checks FIXME
+
+        // 0 is an easy check
+        if ($offset == 0) { $result[] = 0; continue; }
+
+        // ensure no endless looping
+        $safety_valve = 50;
+
+        do {
+
+            if ( ($c - $prev[1]) == 0 ) {
+                // Hack: gone past end of string
+                $error = 0;
+                $i = strlen($str);
+                break;
+            }
+
+            $j = $i + (int)(($offset-$c) * ($i - $prev[0]) / ($c - $prev[1]));
+
+            // correct to utf8 character boundary
+            $j = utf8_locate_next_chr($str, $j);
+
+            // save the index, offset for use next iteration
+            $prev = array($i,$c);
+
+            if ($j > $i) {
+                // determine new character offset
+                $c += strlen(utf8_decode(substr($str,$i,$j-$i)));
+            } else {
+                // ditto
+                $c -= strlen(utf8_decode(substr($str,$j,$i-$j)));
+            }
+
+            $error = abs($c-$offset);
+
+            // ready for next time around
+            $i = $j;
+
+        // from 7 it is faster to iterate over the string
+        } while ( ($error > 7) && --$safety_valve) ;
+
+        if ($error && $error <= 7) {
+
+            if ($c < $offset) {
+                // move up
+                while ($error--) { $i = utf8_locate_next_chr($str,++$i); }
+            } else {
+                // move down
+                while ($error--) { $i = utf8_locate_current_chr($str,--$i); }
+            }
+
+            // ready for next arg
+            $c = $offset;
+        }
+        $result[] = $i;
+    }
+
+    if ( count($result) == 1 ) {
+        return $result[0];
+    }
+
+    return $result;
+}
+
+//--------------------------------------------------------------------
+/**
+* Given a string and any byte index, returns the byte index
+* of the start of the current UTF-8 character, relative to supplied
+* position. If the current character begins at the same place as the
+* supplied byte index, that byte index will be returned. Otherwise
+* this function will step backwards, looking for the index where
+* curent UTF-8 character begins
+* @author Chris Smith<chris@jalakai.co.uk>
+* @param string
+* @param int byte index in the string
+* @return int byte index of start of next UTF-8 character
+* @package utf8
+*/
+function utf8_locate_current_chr( &$str, $idx ) {
+
+    if ($idx <= 0) return 0;
+
+    $limit = strlen($str);
+    if ($idx >= $limit) return $limit;
+
+    // Binary value for any byte after the first in a multi-byte UTF-8 character
+    // will be like 10xxxxxx so & 0xC0 can be used to detect this kind
+    // of byte - assuming well formed UTF-8
+    while ($idx && ((ord($str[$idx]) & 0xC0) == 0x80)) $idx--;
+
+    return $idx;
+}
+
+//--------------------------------------------------------------------
+/**
+* Given a string and any byte index, returns the byte index
+* of the start of the next UTF-8 character, relative to supplied
+* position. If the next character begins at the same place as the
+* supplied byte index, that byte index will be returned.
+* @author Chris Smith<chris@jalakai.co.uk>
+* @param string
+* @param int byte index in the string
+* @return int byte index of start of next UTF-8 character
+* @package utf8
+*/
+function utf8_locate_next_chr( &$str, $idx ) {
+
+    if ($idx <= 0) return 0;
+
+    $limit = strlen($str);
+    if ($idx >= $limit) return $limit;
+
+    // Binary value for any byte after the first in a multi-byte UTF-8 character
+    // will be like 10xxxxxx so & 0xC0 can be used to detect this kind
+    // of byte - assuming well formed UTF-8
+    while (($idx < $limit) && ((ord($str[$idx]) & 0xC0) == 0x80)) $idx++;
+
+    return $idx;
+}
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/specials.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/specials.php
new file mode 100644
index 00000000..a53e2745
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/specials.php
@@ -0,0 +1,126 @@
+<?php
+/**
+* Utilities for processing "special" characters in UTF-8. "Special" largely means anything which would
+* be regarded as a non-word character, like ASCII control characters and punctuation. This has a "Roman"
+* bias - it would be unaware of modern Chinese "punctuation" characters for example.
+* Note: requires utils/unicode.php to be loaded
+* @package utf8
+* @see utf8_is_valid
+*/
+
+//--------------------------------------------------------------------
+/**
+* Used internally. Builds a PCRE pattern from the $UTF8_SPECIAL_CHARS
+* array defined in this file
+* The $UTF8_SPECIAL_CHARS should contain all special characters (non-letter/non-digit)
+* defined in the various local charsets - it's not a complete list of
+* non-alphanum characters in UTF-8. It's not perfect but should match most
+* cases of special chars.
+* This function adds the control chars 0x00 to 0x19 to the array of
+* special chars (they are not included in $UTF8_SPECIAL_CHARS)
+* @package utf8
+* @return string
+* @see utf8_from_unicode
+* @see utf8_is_word_chars
+* @see utf8_strip_specials
+*/
+function utf8_specials_pattern() {
+    static $pattern = NULL;
+
+    if ( !$pattern ) {
+        $UTF8_SPECIAL_CHARS = array(
+    0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023,
+    0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c,
+    0x002f,         0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x005b,
+    0x005c, 0x005d, 0x005e,         0x0060, 0x007b, 0x007c, 0x007d, 0x007e,
+    0x007f, 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+    0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092,
+    0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c,
+    0x009d, 0x009e, 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6,
+    0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 0x00b0,
+    0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba,
+    0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00d7, 0x00f7, 0x02c7, 0x02d8, 0x02d9,
+    0x02da, 0x02db, 0x02dc, 0x02dd, 0x0300, 0x0301, 0x0303, 0x0309, 0x0323, 0x0384,
+    0x0385, 0x0387, 0x03b2, 0x03c6, 0x03d1, 0x03d2, 0x03d5, 0x03d6, 0x05b0, 0x05b1,
+    0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05bb, 0x05bc,
+    0x05bd, 0x05be, 0x05bf, 0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f3, 0x05f4, 0x060c,
+    0x061b, 0x061f, 0x0640, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651,
+    0x0652, 0x066a, 0x0e3f, 0x200c, 0x200d, 0x200e, 0x200f, 0x2013, 0x2014, 0x2015,
+    0x2017, 0x2018, 0x2019, 0x201a, 0x201c, 0x201d, 0x201e, 0x2020, 0x2021, 0x2022,
+    0x2026, 0x2030, 0x2032, 0x2033, 0x2039, 0x203a, 0x2044, 0x20a7, 0x20aa, 0x20ab,
+    0x20ac, 0x2116, 0x2118, 0x2122, 0x2126, 0x2135, 0x2190, 0x2191, 0x2192, 0x2193,
+    0x2194, 0x2195, 0x21b5, 0x21d0, 0x21d1, 0x21d2, 0x21d3, 0x21d4, 0x2200, 0x2202,
+    0x2203, 0x2205, 0x2206, 0x2207, 0x2208, 0x2209, 0x220b, 0x220f, 0x2211, 0x2212,
+    0x2215, 0x2217, 0x2219, 0x221a, 0x221d, 0x221e, 0x2220, 0x2227, 0x2228, 0x2229,
+    0x222a, 0x222b, 0x2234, 0x223c, 0x2245, 0x2248, 0x2260, 0x2261, 0x2264, 0x2265,
+    0x2282, 0x2283, 0x2284, 0x2286, 0x2287, 0x2295, 0x2297, 0x22a5, 0x22c5, 0x2310,
+    0x2320, 0x2321, 0x2329, 0x232a, 0x2469, 0x2500, 0x2502, 0x250c, 0x2510, 0x2514,
+    0x2518, 0x251c, 0x2524, 0x252c, 0x2534, 0x253c, 0x2550, 0x2551, 0x2552, 0x2553,
+    0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d,
+    0x255e, 0x255f, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+    0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
+    0x2591, 0x2592, 0x2593, 0x25a0, 0x25b2, 0x25bc, 0x25c6, 0x25ca, 0x25cf, 0x25d7,
+    0x2605, 0x260e, 0x261b, 0x261e, 0x2660, 0x2663, 0x2665, 0x2666, 0x2701, 0x2702,
+    0x2703, 0x2704, 0x2706, 0x2707, 0x2708, 0x2709, 0x270c, 0x270d, 0x270e, 0x270f,
+    0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, 0x2718, 0x2719,
+    0x271a, 0x271b, 0x271c, 0x271d, 0x271e, 0x271f, 0x2720, 0x2721, 0x2722, 0x2723,
+    0x2724, 0x2725, 0x2726, 0x2727, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d, 0x272e,
+    0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738,
+    0x2739, 0x273a, 0x273b, 0x273c, 0x273d, 0x273e, 0x273f, 0x2740, 0x2741, 0x2742,
+    0x2743, 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b, 0x274d,
+    0x274f, 0x2750, 0x2751, 0x2752, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c,
+    0x275d, 0x275e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x277f,
+    0x2789, 0x2793, 0x2794, 0x2798, 0x2799, 0x279a, 0x279b, 0x279c, 0x279d, 0x279e,
+    0x279f, 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8,
+    0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, 0x27b1, 0x27b2, 0x27b3,
+    0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd,
+    0x27be, 0xf6d9, 0xf6da, 0xf6db, 0xf8d7, 0xf8d8, 0xf8d9, 0xf8da, 0xf8db, 0xf8dc,
+    0xf8dd, 0xf8de, 0xf8df, 0xf8e0, 0xf8e1, 0xf8e2, 0xf8e3, 0xf8e4, 0xf8e5, 0xf8e6,
+    0xf8e7, 0xf8e8, 0xf8e9, 0xf8ea, 0xf8eb, 0xf8ec, 0xf8ed, 0xf8ee, 0xf8ef, 0xf8f0,
+    0xf8f1, 0xf8f2, 0xf8f3, 0xf8f4, 0xf8f5, 0xf8f6, 0xf8f7, 0xf8f8, 0xf8f9, 0xf8fa,
+    0xf8fb, 0xf8fc, 0xf8fd, 0xf8fe, 0xfe7c, 0xfe7d,
+            );
+        $pattern = preg_quote(utf8_from_unicode($UTF8_SPECIAL_CHARS), '/');
+        $pattern = '/[\x00-\x19'.$pattern.']/u';
+    }
+
+    return $pattern;
+}
+
+//--------------------------------------------------------------------
+/**
+* Checks a string for whether it contains only word characters. This
+* is logically equivalent to the \w PCRE meta character. Note that
+* this is not a 100% guarantee that the string only contains alpha /
+* numeric characters but just that common non-alphanumeric are not
+* in the string, including ASCII device control characters.
+* @package utf8
+* @param string to check
+* @return boolean TRUE if the string only contains word characters
+* @see utf8_specials_pattern
+*/
+function utf8_is_word_chars($str) {
+    return !(bool)preg_match(utf8_specials_pattern(),$str);
+}
+
+//--------------------------------------------------------------------
+/**
+* Removes special characters (nonalphanumeric) from a UTF-8 string
+*
+* This can be useful as a helper for sanitizing a string for use as
+* something like a file name or a unique identifier. Be warned though
+* it does not handle all possible non-alphanumeric characters and is
+* not intended is some kind of security / injection filter.
+*
+* @package utf8
+* @author Andreas Gohr <andi@splitbrain.org>
+* @param string $string The UTF8 string to strip of special chars
+* @param string (optional) $repl   Replace special with this string
+* @return string with common non-alphanumeric characters removed
+* @see utf8_specials_pattern
+*/
+function utf8_strip_specials($string, $repl=''){
+    return preg_replace(utf8_specials_pattern(), $repl, $string);
+}
+
+
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/unicode.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/unicode.php
new file mode 100644
index 00000000..2d561f3c
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/unicode.php
@@ -0,0 +1,265 @@
+<?php
+/**
+* Tools for conversion between UTF-8 and unicode
+* The Original Code is Mozilla Communicator client code.
+* The Initial Developer of the Original Code is
+* Netscape Communications Corporation.
+* Portions created by the Initial Developer are Copyright (C) 1998
+* the Initial Developer. All Rights Reserved.
+* Ported to PHP by Henri Sivonen (http://hsivonen.iki.fi)
+* Slight modifications to fit with phputf8 library by Harry Fuecks (hfuecks gmail com)
+* @see http://lxr.mozilla.org/seamonkey/source/intl/uconv/src/nsUTF8ToUnicode.cpp
+* @see http://lxr.mozilla.org/seamonkey/source/intl/uconv/src/nsUnicodeToUTF8.cpp
+* @see http://hsivonen.iki.fi/php-utf8/
+* @package utf8
+*/
+
+//--------------------------------------------------------------------
+/**
+* Takes an UTF-8 string and returns an array of ints representing the
+* Unicode characters. Astral planes are supported ie. the ints in the
+* output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
+* are not allowed.
+* Returns false if the input string isn't a valid UTF-8 octet sequence
+* and raises a PHP error at level E_USER_WARNING
+* Note: this function has been modified slightly in this library to
+* trigger errors on encountering bad bytes
+* @author <hsivonen@iki.fi>
+* @param string UTF-8 encoded string
+* @return mixed array of unicode code points or FALSE if UTF-8 invalid
+* @see utf8_from_unicode
+* @see http://hsivonen.iki.fi/php-utf8/
+* @package utf8
+*/
+function utf8_to_unicode($str) {
+    $mState = 0;     // cached expected number of octets after the current octet
+                     // until the beginning of the next UTF8 character sequence
+    $mUcs4  = 0;     // cached Unicode character
+    $mBytes = 1;     // cached expected number of octets in the current sequence
+
+    $out = array();
+
+    $len = strlen($str);
+
+    for($i = 0; $i < $len; $i++) {
+
+        $in = ord($str{$i});
+
+        if ( $mState == 0) {
+
+            // When mState is zero we expect either a US-ASCII character or a
+            // multi-octet sequence.
+            if (0 == (0x80 & ($in))) {
+                // US-ASCII, pass straight through.
+                $out[] = $in;
+                $mBytes = 1;
+
+            } else if (0xC0 == (0xE0 & ($in))) {
+                // First octet of 2 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x1F) << 6;
+                $mState = 1;
+                $mBytes = 2;
+
+            } else if (0xE0 == (0xF0 & ($in))) {
+                // First octet of 3 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x0F) << 12;
+                $mState = 2;
+                $mBytes = 3;
+
+            } else if (0xF0 == (0xF8 & ($in))) {
+                // First octet of 4 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x07) << 18;
+                $mState = 3;
+                $mBytes = 4;
+
+            } else if (0xF8 == (0xFC & ($in))) {
+                /* First octet of 5 octet sequence.
+                *
+                * This is illegal because the encoded codepoint must be either
+                * (a) not the shortest form or
+                * (b) outside the Unicode range of 0-0x10FFFF.
+                * Rather than trying to resynchronize, we will carry on until the end
+                * of the sequence and let the later error handling code catch it.
+                */
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x03) << 24;
+                $mState = 4;
+                $mBytes = 5;
+
+            } else if (0xFC == (0xFE & ($in))) {
+                // First octet of 6 octet sequence, see comments for 5 octet sequence.
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 1) << 30;
+                $mState = 5;
+                $mBytes = 6;
+
+            } else {
+                /* Current octet is neither in the US-ASCII range nor a legal first
+                 * octet of a multi-octet sequence.
+                 */
+                trigger_error(
+                        'utf8_to_unicode: Illegal sequence identifier '.
+                            'in UTF-8 at byte '.$i,
+                        E_USER_WARNING
+                    );
+                return FALSE;
+
+            }
+
+        } else {
+
+            // When mState is non-zero, we expect a continuation of the multi-octet
+            // sequence
+            if (0x80 == (0xC0 & ($in))) {
+
+                // Legal continuation.
+                $shift = ($mState - 1) * 6;
+                $tmp = $in;
+                $tmp = ($tmp & 0x0000003F) << $shift;
+                $mUcs4 |= $tmp;
+
+                /**
+                * End of the multi-octet sequence. mUcs4 now contains the final
+                * Unicode codepoint to be output
+                */
+                if (0 == --$mState) {
+
+                    /*
+                    * Check for illegal sequences and codepoints.
+                    */
+                    // From Unicode 3.1, non-shortest form is illegal
+                    if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+                        ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+                        ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
+                        (4 < $mBytes) ||
+                        // From Unicode 3.2, surrogate characters are illegal
+                        (($mUcs4 & 0xFFFFF800) == 0xD800) ||
+                        // Codepoints outside the Unicode range are illegal
+                        ($mUcs4 > 0x10FFFF)) {
+
+                        trigger_error(
+                                'utf8_to_unicode: Illegal sequence or codepoint '.
+                                    'in UTF-8 at byte '.$i,
+                                E_USER_WARNING
+                            );
+
+                        return FALSE;
+
+                    }
+
+                    if (0xFEFF != $mUcs4) {
+                        // BOM is legal but we don't want to output it
+                        $out[] = $mUcs4;
+                    }
+
+                    //initialize UTF8 cache
+                    $mState = 0;
+                    $mUcs4  = 0;
+                    $mBytes = 1;
+                }
+
+            } else {
+                /**
+                *((0xC0 & (*in) != 0x80) && (mState != 0))
+                * Incomplete multi-octet sequence.
+                */
+                trigger_error(
+                        'utf8_to_unicode: Incomplete multi-octet '.
+                        '   sequence in UTF-8 at byte '.$i,
+                        E_USER_WARNING
+                    );
+
+                return FALSE;
+            }
+        }
+    }
+    return $out;
+}
+
+//--------------------------------------------------------------------
+/**
+* Takes an array of ints representing the Unicode characters and returns
+* a UTF-8 string. Astral planes are supported ie. the ints in the
+* input can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
+* are not allowed.
+* Returns false if the input array contains ints that represent
+* surrogates or are outside the Unicode range
+* and raises a PHP error at level E_USER_WARNING
+* Note: this function has been modified slightly in this library to use
+* output buffering to concatenate the UTF-8 string (faster) as well as
+* reference the array by it's keys
+* @param array of unicode code points representing a string
+* @return mixed UTF-8 string or FALSE if array contains invalid code points
+* @author <hsivonen@iki.fi>
+* @see utf8_to_unicode
+* @see http://hsivonen.iki.fi/php-utf8/
+* @package utf8
+*/
+function utf8_from_unicode($arr) {
+    ob_start();
+
+    foreach (array_keys($arr) as $k) {
+
+        # ASCII range (including control chars)
+        if ( ($arr[$k] >= 0) && ($arr[$k] <= 0x007f) ) {
+
+            echo chr($arr[$k]);
+
+        # 2 byte sequence
+        } else if ($arr[$k] <= 0x07ff) {
+
+            echo chr(0xc0 | ($arr[$k] >> 6));
+            echo chr(0x80 | ($arr[$k] & 0x003f));
+
+        # Byte order mark (skip)
+        } else if($arr[$k] == 0xFEFF) {
+
+            // nop -- zap the BOM
+
+        # Test for illegal surrogates
+        } else if ($arr[$k] >= 0xD800 && $arr[$k] <= 0xDFFF) {
+
+            // found a surrogate
+            trigger_error(
+                'utf8_from_unicode: Illegal surrogate '.
+                    'at index: '.$k.', value: '.$arr[$k],
+                E_USER_WARNING
+                );
+
+            return FALSE;
+
+        # 3 byte sequence
+        } else if ($arr[$k] <= 0xffff) {
+
+            echo chr(0xe0 | ($arr[$k] >> 12));
+            echo chr(0x80 | (($arr[$k] >> 6) & 0x003f));
+            echo chr(0x80 | ($arr[$k] & 0x003f));
+
+        # 4 byte sequence
+        } else if ($arr[$k] <= 0x10ffff) {
+
+            echo chr(0xf0 | ($arr[$k] >> 18));
+            echo chr(0x80 | (($arr[$k] >> 12) & 0x3f));
+            echo chr(0x80 | (($arr[$k] >> 6) & 0x3f));
+            echo chr(0x80 | ($arr[$k] & 0x3f));
+
+        } else {
+
+            trigger_error(
+                'utf8_from_unicode: Codepoint out of Unicode range '.
+                    'at index: '.$k.', value: '.$arr[$k],
+                E_USER_WARNING
+                );
+
+            // out of range
+            return FALSE;
+        }
+    }
+
+    $result = ob_get_contents();
+    ob_end_clean();
+    return $result;
+}
diff --git a/core/libraries/vendor/joomla/string/src/phputf8/utils/validation.php b/core/libraries/vendor/joomla/string/src/phputf8/utils/validation.php
new file mode 100644
index 00000000..13e18061
--- /dev/null
+++ b/core/libraries/vendor/joomla/string/src/phputf8/utils/validation.php
@@ -0,0 +1,181 @@
+<?php
+/**
+* Tools for validing a UTF-8 string is well formed.
+* The Original Code is Mozilla Communicator client code.
+* The Initial Developer of the Original Code is
+* Netscape Communications Corporation.
+* Portions created by the Initial Developer are Copyright (C) 1998
+* the Initial Developer. All Rights Reserved.
+* Ported to PHP by Henri Sivonen (http://hsivonen.iki.fi)
+* Slight modifications to fit with phputf8 library by Harry Fuecks (hfuecks gmail com)
+* @see http://lxr.mozilla.org/seamonkey/source/intl/uconv/src/nsUTF8ToUnicode.cpp
+* @see http://lxr.mozilla.org/seamonkey/source/intl/uconv/src/nsUnicodeToUTF8.cpp
+* @see http://hsivonen.iki.fi/php-utf8/
+* @package utf8
+*/
+
+//--------------------------------------------------------------------
+/**
+* Tests a string as to whether it's valid UTF-8 and supported by the
+* Unicode standard
+* Note: this function has been modified to simple return true or false
+* @author <hsivonen@iki.fi>
+* @param string UTF-8 encoded string
+* @return boolean true if valid
+* @see http://hsivonen.iki.fi/php-utf8/
+* @see utf8_compliant
+* @package utf8
+*/
+function utf8_is_valid($str) {
+
+    $mState = 0;     // cached expected number of octets after the current octet
+                     // until the beginning of the next UTF8 character sequence
+    $mUcs4  = 0;     // cached Unicode character
+    $mBytes = 1;     // cached expected number of octets in the current sequence
+
+    $len = strlen($str);
+
+    for($i = 0; $i < $len; $i++) {
+
+        $in = ord($str{$i});
+
+        if ( $mState == 0) {
+
+            // When mState is zero we expect either a US-ASCII character or a
+            // multi-octet sequence.
+            if (0 == (0x80 & ($in))) {
+                // US-ASCII, pass straight through.
+                $mBytes = 1;
+
+            } else if (0xC0 == (0xE0 & ($in))) {
+                // First octet of 2 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x1F) << 6;
+                $mState = 1;
+                $mBytes = 2;
+
+            } else if (0xE0 == (0xF0 & ($in))) {
+                // First octet of 3 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x0F) << 12;
+                $mState = 2;
+                $mBytes = 3;
+
+            } else if (0xF0 == (0xF8 & ($in))) {
+                // First octet of 4 octet sequence
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x07) << 18;
+                $mState = 3;
+                $mBytes = 4;
+
+            } else if (0xF8 == (0xFC & ($in))) {
+                /* First octet of 5 octet sequence.
+                *
+                * This is illegal because the encoded codepoint must be either
+                * (a) not the shortest form or
+                * (b) outside the Unicode range of 0-0x10FFFF.
+                * Rather than trying to resynchronize, we will carry on until the end
+                * of the sequence and let the later error handling code catch it.
+                */
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 0x03) << 24;
+                $mState = 4;
+                $mBytes = 5;
+
+            } else if (0xFC == (0xFE & ($in))) {
+                // First octet of 6 octet sequence, see comments for 5 octet sequence.
+                $mUcs4 = ($in);
+                $mUcs4 = ($mUcs4 & 1) << 30;
+                $mState = 5;
+                $mBytes = 6;
+
+            } else {
+                /* Current octet is neither in the US-ASCII range nor a legal first
+                 * octet of a multi-octet sequence.
+                 */
+                return FALSE;
+
+            }
+
+        } else {
+
+            // When mState is non-zero, we expect a continuation of the multi-octet
+            // sequence
+            if (0x80 == (0xC0 & ($in))) {
+
+                // Legal continuation.
+                $shift = ($mState - 1) * 6;
+                $tmp = $in;
+                $tmp = ($tmp & 0x0000003F) << $shift;
+                $mUcs4 |= $tmp;
+
+                /**
+                * End of the multi-octet sequence. mUcs4 now contains the final
+                * Unicode codepoint to be output
+                */
+                if (0 == --$mState) {
+
+                    /*
+                    * Check for illegal sequences and codepoints.
+                    */
+                    // From Unicode 3.1, non-shortest form is illegal
+                    if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+                        ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+                        ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
+                        (4 < $mBytes) ||
+                        // From Unicode 3.2, surrogate characters are illegal
+                        (($mUcs4 & 0xFFFFF800) == 0xD800) ||
+                        // Codepoints outside the Unicode range are illegal
+                        ($mUcs4 > 0x10FFFF)) {
+
+                        return FALSE;
+
+                    }
+
+                    //initialize UTF8 cache
+                    $mState = 0;
+                    $mUcs4  = 0;
+                    $mBytes = 1;
+                }
+
+            } else {
+                /**
+                *((0xC0 & (*in) != 0x80) && (mState != 0))
+                * Incomplete multi-octet sequence.
+                */
+
+                return FALSE;
+            }
+        }
+    }
+    return TRUE;
+}
+
+//--------------------------------------------------------------------
+/**
+* Tests whether a string complies as UTF-8. This will be much
+* faster than utf8_is_valid but will pass five and six octet
+* UTF-8 sequences, which are not supported by Unicode and
+* so cannot be displayed correctly in a browser. In other words
+* it is not as strict as utf8_is_valid but it's faster. If you use
+* is to validate user input, you place yourself at the risk that
+* attackers will be able to inject 5 and 6 byte sequences (which
+* may or may not be a significant risk, depending on what you are
+* are doing)
+* @see utf8_is_valid
+* @see http://www.php.net/manual/en/reference.pcre.pattern.modifiers.php#54805
+* @param string UTF-8 string to check
+* @return boolean TRUE if string is valid UTF-8
+* @package utf8
+*/
+function utf8_compliant($str) {
+    if ( strlen($str) == 0 ) {
+        return TRUE;
+    }
+    // If even just the first character can be matched, when the /u
+    // modifier is used, then it's valid UTF-8. If the UTF-8 is somehow
+    // invalid, nothing at all will match, even if the string contains
+    // some valid sequences
+    return (preg_match('/^.{1}/us',$str,$ar) == 1);
+}
+
diff --git a/core/libraries/vendor/joomla/uri/LICENSE b/core/libraries/vendor/joomla/uri/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/uri/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/uri/src/AbstractUri.php b/core/libraries/vendor/joomla/uri/src/AbstractUri.php
new file mode 100644
index 00000000..a81a8a14
--- /dev/null
+++ b/core/libraries/vendor/joomla/uri/src/AbstractUri.php
@@ -0,0 +1,402 @@
+<?php
+/**
+ * Part of the Joomla Framework Uri Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Uri;
+
+/**
+ * Uri Class
+ *
+ * Abstract base for out uri classes.
+ *
+ * This class should be considered an implementation detail. Typehint against UriInterface.
+ *
+ * @since  1.0
+ */
+abstract class AbstractUri implements UriInterface
+{
+	/**
+	 * @var    string  Original URI
+	 * @since  1.0
+	 */
+	protected $uri = null;
+
+	/**
+	 * @var    string  Protocol
+	 * @since  1.0
+	 */
+	protected $scheme = null;
+
+	/**
+	 * @var    string  Host
+	 * @since  1.0
+	 */
+	protected $host = null;
+
+	/**
+	 * @var    integer  Port
+	 * @since  1.0
+	 */
+	protected $port = null;
+
+	/**
+	 * @var    string  Username
+	 * @since  1.0
+	 */
+	protected $user = null;
+
+	/**
+	 * @var    string  Password
+	 * @since  1.0
+	 */
+	protected $pass = null;
+
+	/**
+	 * @var    string  Path
+	 * @since  1.0
+	 */
+	protected $path = null;
+
+	/**
+	 * @var    string  Query
+	 * @since  1.0
+	 */
+	protected $query = null;
+
+	/**
+	 * @var    string  Anchor
+	 * @since  1.0
+	 */
+	protected $fragment = null;
+
+	/**
+	 * @var    array  Query variable hash
+	 * @since  1.0
+	 */
+	protected $vars = array();
+
+	/**
+	 * Constructor.
+	 * You can pass a URI string to the constructor to initialise a specific URI.
+	 *
+	 * @param   string  $uri  The optional URI string
+	 *
+	 * @since   1.0
+	 */
+	public function __construct($uri = null)
+	{
+		if (!is_null($uri))
+		{
+			$this->parse($uri);
+		}
+	}
+
+	/**
+	 * Magic method to get the string representation of the URI object.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Returns full uri string.
+	 *
+	 * @param   array  $parts  An array specifying the parts to render.
+	 *
+	 * @return  string  The rendered URI string.
+	 *
+	 * @since   1.0
+	 */
+	public function toString(array $parts = array('scheme', 'user', 'pass', 'host', 'port', 'path', 'query', 'fragment'))
+	{
+		// Make sure the query is created
+		$query = $this->getQuery();
+
+		$uri = '';
+		$uri .= in_array('scheme', $parts) ? (!empty($this->scheme) ? $this->scheme . '://' : '') : '';
+		$uri .= in_array('user', $parts) ? $this->user : '';
+		$uri .= in_array('pass', $parts) ? (!empty($this->pass) ? ':' : '') . $this->pass . (!empty($this->user) ? '@' : '') : '';
+		$uri .= in_array('host', $parts) ? $this->host : '';
+		$uri .= in_array('port', $parts) ? (!empty($this->port) ? ':' : '') . $this->port : '';
+		$uri .= in_array('path', $parts) ? $this->path : '';
+		$uri .= in_array('query', $parts) ? (!empty($query) ? '?' . $query : '') : '';
+		$uri .= in_array('fragment', $parts) ? (!empty($this->fragment) ? '#' . $this->fragment : '') : '';
+
+		return $uri;
+	}
+
+	/**
+	 * Checks if variable exists.
+	 *
+	 * @param   string  $name  Name of the query variable to check.
+	 *
+	 * @return  boolean  True if the variable exists.
+	 *
+	 * @since   1.0
+	 */
+	public function hasVar($name)
+	{
+		return array_key_exists($name, $this->vars);
+	}
+
+	/**
+	 * Returns a query variable by name.
+	 *
+	 * @param   string  $name     Name of the query variable to get.
+	 * @param   string  $default  Default value to return if the variable is not set.
+	 *
+	 * @return  array   Query variables.
+	 *
+	 * @since   1.0
+	 */
+	public function getVar($name, $default = null)
+	{
+		if (array_key_exists($name, $this->vars))
+		{
+			return $this->vars[$name];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Returns flat query string.
+	 *
+	 * @param   boolean  $toArray  True to return the query as a key => value pair array.
+	 *
+	 * @return  string   Query string.
+	 *
+	 * @since   1.0
+	 */
+	public function getQuery($toArray = false)
+	{
+		if ($toArray)
+		{
+			return $this->vars;
+		}
+
+		// If the query is empty build it first
+		if (is_null($this->query))
+		{
+			$this->query = self::buildQuery($this->vars);
+		}
+
+		return $this->query;
+	}
+
+	/**
+	 * Get URI scheme (protocol)
+	 * ie. http, https, ftp, etc...
+	 *
+	 * @return  string  The URI scheme.
+	 *
+	 * @since   1.0
+	 */
+	public function getScheme()
+	{
+		return $this->scheme;
+	}
+
+	/**
+	 * Get URI username
+	 * Returns the username, or null if no username was specified.
+	 *
+	 * @return  string  The URI username.
+	 *
+	 * @since   1.0
+	 */
+	public function getUser()
+	{
+		return $this->user;
+	}
+
+	/**
+	 * Get URI password
+	 * Returns the password, or null if no password was specified.
+	 *
+	 * @return  string  The URI password.
+	 *
+	 * @since   1.0
+	 */
+	public function getPass()
+	{
+		return $this->pass;
+	}
+
+	/**
+	 * Get URI host
+	 * Returns the hostname/ip or null if no hostname/ip was specified.
+	 *
+	 * @return  string  The URI host.
+	 *
+	 * @since   1.0
+	 */
+	public function getHost()
+	{
+		return $this->host;
+	}
+
+	/**
+	 * Get URI port
+	 * Returns the port number, or null if no port was specified.
+	 *
+	 * @return  integer  The URI port number.
+	 *
+	 * @since   1.0
+	 */
+	public function getPort()
+	{
+		return (isset($this->port)) ? $this->port : null;
+	}
+
+	/**
+	 * Gets the URI path string.
+	 *
+	 * @return  string  The URI path string.
+	 *
+	 * @since   1.0
+	 */
+	public function getPath()
+	{
+		return $this->path;
+	}
+
+	/**
+	 * Get the URI archor string
+	 * Everything after the "#".
+	 *
+	 * @return  string  The URI anchor string.
+	 *
+	 * @since   1.0
+	 */
+	public function getFragment()
+	{
+		return $this->fragment;
+	}
+
+	/**
+	 * Checks whether the current URI is using HTTPS.
+	 *
+	 * @return  boolean  True if using SSL via HTTPS.
+	 *
+	 * @since   1.0
+	 */
+	public function isSSL()
+	{
+		return $this->getScheme() == 'https' ? true : false;
+	}
+
+	/**
+	 * Build a query from an array (reverse of the PHP parse_str()).
+	 *
+	 * @param   array  $params  The array of key => value pairs to return as a query string.
+	 *
+	 * @return  string  The resulting query string.
+	 *
+	 * @see     parse_str()
+	 * @since   1.0
+	 */
+	protected static function buildQuery(array $params)
+	{
+		return urldecode(http_build_query($params, '', '&'));
+	}
+
+	/**
+	 * Parse a given URI and populate the class fields.
+	 *
+	 * @param   string  $uri  The URI string to parse.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.0
+	 */
+	protected function parse($uri)
+	{
+		// Set the original URI to fall back on
+		$this->uri = $uri;
+
+		/*
+		 * Parse the URI and populate the object fields. If URI is parsed properly,
+		 * set method return value to true.
+		 */
+
+		$parts = UriHelper::parse_url($uri);
+
+		$retval = ($parts) ? true : false;
+
+		// We need to replace &amp; with & for parse_str to work right...
+		if (isset($parts['query']) && strpos($parts['query'], '&amp;'))
+		{
+			$parts['query'] = str_replace('&amp;', '&', $parts['query']);
+		}
+
+		$this->scheme   = isset($parts['scheme']) ? $parts['scheme'] : null;
+		$this->user     = isset($parts['user']) ? $parts['user'] : null;
+		$this->pass     = isset($parts['pass']) ? $parts['pass'] : null;
+		$this->host     = isset($parts['host']) ? $parts['host'] : null;
+		$this->port     = isset($parts['port']) ? $parts['port'] : null;
+		$this->path     = isset($parts['path']) ? $parts['path'] : null;
+		$this->query    = isset($parts['query']) ? $parts['query'] : null;
+		$this->fragment = isset($parts['fragment']) ? $parts['fragment'] : null;
+
+		// Parse the query
+		if (isset($parts['query']))
+		{
+			parse_str($parts['query'], $this->vars);
+		}
+
+		return $retval;
+	}
+
+	/**
+	 * Resolves //, ../ and ./ from a path and returns
+	 * the result. Eg:
+	 *
+	 * /foo/bar/../boo.php	=> /foo/boo.php
+	 * /foo/bar/../../boo.php => /boo.php
+	 * /foo/bar/.././/boo.php => /foo/boo.php
+	 *
+	 * @param   string  $path  The URI path to clean.
+	 *
+	 * @return  string  Cleaned and resolved URI path.
+	 *
+	 * @since   1.0
+	 */
+	protected function cleanPath($path)
+	{
+		$path = explode('/', preg_replace('#(/+)#', '/', $path));
+
+		for ($i = 0, $n = count($path); $i < $n; $i++)
+		{
+			if ($path[$i] == '.' || $path[$i] == '..')
+			{
+				if (($path[$i] == '.') || ($path[$i] == '..' && $i == 1 && $path[0] == ''))
+				{
+					unset($path[$i]);
+					$path = array_values($path);
+					$i--;
+					$n--;
+				}
+				elseif ($path[$i] == '..' && ($i > 1 || ($i == 1 && $path[0] != '')))
+				{
+					unset($path[$i]);
+					unset($path[$i - 1]);
+					$path = array_values($path);
+					$i -= 2;
+					$n -= 2;
+				}
+			}
+		}
+
+		return implode('/', $path);
+	}
+}
diff --git a/core/libraries/vendor/joomla/uri/src/Uri.php b/core/libraries/vendor/joomla/uri/src/Uri.php
new file mode 100644
index 00000000..f2d2b83d
--- /dev/null
+++ b/core/libraries/vendor/joomla/uri/src/Uri.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Part of the Joomla Framework Uri Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Uri;
+
+/**
+ * Uri Class
+ *
+ * This class parses a URI and provides a common interface for the Joomla Framework
+ * to access and manipulate a URI.
+ *
+ * @since  1.0
+ */
+class Uri extends AbstractUri
+{
+	/**
+	 * Adds a query variable and value, replacing the value if it
+	 * already exists and returning the old value.
+	 *
+	 * @param   string  $name   Name of the query variable to set.
+	 * @param   string  $value  Value of the query variable.
+	 *
+	 * @return  string  Previous value for the query variable.
+	 *
+	 * @since   1.0
+	 */
+	public function setVar($name, $value)
+	{
+		$tmp = isset($this->vars[$name]) ? $this->vars[$name] : null;
+
+		$this->vars[$name] = $value;
+
+		// Empty the query
+		$this->query = null;
+
+		return $tmp;
+	}
+
+	/**
+	 * Removes an item from the query string variables if it exists.
+	 *
+	 * @param   string  $name  Name of variable to remove.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function delVar($name)
+	{
+		if (array_key_exists($name, $this->vars))
+		{
+			unset($this->vars[$name]);
+
+			// Empty the query
+			$this->query = null;
+		}
+	}
+
+	/**
+	 * Sets the query to a supplied string in format:
+	 * foo=bar&x=y
+	 *
+	 * @param   mixed  $query  The query string or array.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setQuery($query)
+	{
+		if (is_array($query))
+		{
+			$this->vars = $query;
+		}
+		else
+		{
+			if (strpos($query, '&amp;') !== false)
+			{
+				$query = str_replace('&amp;', '&', $query);
+			}
+
+			parse_str($query, $this->vars);
+		}
+
+		// Empty the query
+		$this->query = null;
+	}
+
+	/**
+	 * Set URI scheme (protocol)
+	 * ie. http, https, ftp, etc...
+	 *
+	 * @param   string  $scheme  The URI scheme.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setScheme($scheme)
+	{
+		$this->scheme = $scheme;
+	}
+
+	/**
+	 * Set URI username.
+	 *
+	 * @param   string  $user  The URI username.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setUser($user)
+	{
+		$this->user = $user;
+	}
+
+	/**
+	 * Set URI password.
+	 *
+	 * @param   string  $pass  The URI password.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setPass($pass)
+	{
+		$this->pass = $pass;
+	}
+
+	/**
+	 * Set URI host.
+	 *
+	 * @param   string  $host  The URI host.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setHost($host)
+	{
+		$this->host = $host;
+	}
+
+	/**
+	 * Set URI port.
+	 *
+	 * @param   integer  $port  The URI port number.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setPort($port)
+	{
+		$this->port = $port;
+	}
+
+	/**
+	 * Set the URI path string.
+	 *
+	 * @param   string  $path  The URI path string.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setPath($path)
+	{
+		$this->path = $this->cleanPath($path);
+	}
+
+	/**
+	 * Set the URI anchor string
+	 * everything after the "#".
+	 *
+	 * @param   string  $anchor  The URI anchor string.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.0
+	 */
+	public function setFragment($anchor)
+	{
+		$this->fragment = $anchor;
+	}
+}
diff --git a/core/libraries/vendor/joomla/uri/src/UriHelper.php b/core/libraries/vendor/joomla/uri/src/UriHelper.php
new file mode 100644
index 00000000..3a5c83bc
--- /dev/null
+++ b/core/libraries/vendor/joomla/uri/src/UriHelper.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Part of the Joomla Framework Uri Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Uri;
+
+/**
+ * Uri Helper
+ *
+ * This class provides a UTF-8 safe version of parse_url().
+ *
+ * @since  1.0
+ */
+class UriHelper
+{
+	/**
+	 * Does a UTF-8 safe version of PHP parse_url function
+	 *
+	 * @param   string  $url  URL to parse
+	 *
+	 * @return  mixed  Associative array or false if badly formed URL.
+	 *
+	 * @see     http://us3.php.net/manual/en/function.parse-url.php
+	 * @since   1.0
+	 */
+	public static function parse_url($url)
+	{
+		$result = false;
+
+		// Build arrays of values we need to decode before parsing
+		$entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%24', '%2C', '%2F', '%3F', '%23', '%5B', '%5D');
+		$replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "$", ",", "/", "?", "#", "[", "]");
+
+		// Create encoded URL with special URL characters decoded so it can be parsed
+		// All other characters will be encoded
+		$encodedURL = str_replace($entities, $replacements, urlencode($url));
+
+		// Parse the encoded URL
+		$encodedParts = parse_url($encodedURL);
+
+		// Now, decode each value of the resulting array
+		if ($encodedParts)
+		{
+			foreach ($encodedParts as $key => $value)
+			{
+				$result[$key] = urldecode(str_replace($replacements, $entities, $value));
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/core/libraries/vendor/joomla/uri/src/UriImmutable.php b/core/libraries/vendor/joomla/uri/src/UriImmutable.php
new file mode 100644
index 00000000..1ad5a0c4
--- /dev/null
+++ b/core/libraries/vendor/joomla/uri/src/UriImmutable.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Part of the Joomla Framework Uri Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Uri;
+
+/**
+ * Uri Class
+ *
+ * This is an immutable version of the uri class.
+ *
+ * @since  1.0
+ */
+final class UriImmutable extends AbstractUri
+{
+	/**
+	 * @var    boolean  Has this class been instantiated yet.
+	 * @since  1.0
+	 */
+	private $constructed = false;
+
+	/**
+	 * Prevent setting undeclared properties.
+	 *
+	 * @param   string  $name   This is an immutable object, setting $name is not allowed.
+	 * @param   mixed   $value  This is an immutable object, setting $value is not allowed.
+	 *
+	 * @return  null  This method always throws an exception.
+	 *
+	 * @since   1.0
+	 * @throws  \BadMethodCallException
+	 */
+	public function __set($name, $value)
+	{
+		throw new \BadMethodCallException('This is an immutable object');
+	}
+
+	/**
+	 * This is a special constructor that prevents calling the __construct method again.
+	 *
+	 * @param   string  $uri  The optional URI string
+	 *
+	 * @since   1.0
+	 * @throws  \BadMethodCallException
+	 */
+	public function __construct($uri = null)
+	{
+		if ($this->constructed === true)
+		{
+			throw new \BadMethodCallException('This is an immutable object');
+		}
+
+		$this->constructed = true;
+
+		parent::__construct($uri);
+	}
+}
diff --git a/core/libraries/vendor/joomla/uri/src/UriInterface.php b/core/libraries/vendor/joomla/uri/src/UriInterface.php
new file mode 100644
index 00000000..f6125e1f
--- /dev/null
+++ b/core/libraries/vendor/joomla/uri/src/UriInterface.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Part of the Joomla Framework Uri Package
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Uri;
+
+/**
+ * Uri Interface
+ *
+ * Interface for read-only access to Uris.
+ *
+ * @since  1.0
+ */
+interface UriInterface
+{
+	/**
+	 * Magic method to get the string representation of the URI object.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public function __toString();
+
+	/**
+	 * Returns full uri string.
+	 *
+	 * @param   array  $parts  An array specifying the parts to render.
+	 *
+	 * @return  string  The rendered URI string.
+	 *
+	 * @since   1.0
+	 */
+	public function toString(array $parts = array('scheme', 'user', 'pass', 'host', 'port', 'path', 'query', 'fragment'));
+
+	/**
+	 * Checks if variable exists.
+	 *
+	 * @param   string  $name  Name of the query variable to check.
+	 *
+	 * @return  boolean  True if the variable exists.
+	 *
+	 * @since   1.0
+	 */
+	public function hasVar($name);
+
+	/**
+	 * Returns a query variable by name.
+	 *
+	 * @param   string  $name     Name of the query variable to get.
+	 * @param   string  $default  Default value to return if the variable is not set.
+	 *
+	 * @return  array   Query variables.
+	 *
+	 * @since   1.0
+	 */
+	public function getVar($name, $default = null);
+
+	/**
+	 * Returns flat query string.
+	 *
+	 * @param   boolean  $toArray  True to return the query as a key => value pair array.
+	 *
+	 * @return  string   Query string.
+	 *
+	 * @since   1.0
+	 */
+	public function getQuery($toArray = false);
+
+	/**
+	 * Get URI scheme (protocol)
+	 * ie. http, https, ftp, etc...
+	 *
+	 * @return  string  The URI scheme.
+	 *
+	 * @since   1.0
+	 */
+	public function getScheme();
+
+	/**
+	 * Get URI username
+	 * Returns the username, or null if no username was specified.
+	 *
+	 * @return  string  The URI username.
+	 *
+	 * @since   1.0
+	 */
+	public function getUser();
+
+	/**
+	 * Get URI password
+	 * Returns the password, or null if no password was specified.
+	 *
+	 * @return  string  The URI password.
+	 *
+	 * @since   1.0
+	 */
+	public function getPass();
+
+	/**
+	 * Get URI host
+	 * Returns the hostname/ip or null if no hostname/ip was specified.
+	 *
+	 * @return  string  The URI host.
+	 *
+	 * @since   1.0
+	 */
+	public function getHost();
+
+	/**
+	 * Get URI port
+	 * Returns the port number, or null if no port was specified.
+	 *
+	 * @return  integer  The URI port number.
+	 *
+	 * @since   1.0
+	 */
+	public function getPort();
+
+	/**
+	 * Gets the URI path string.
+	 *
+	 * @return  string  The URI path string.
+	 *
+	 * @since   1.0
+	 */
+	public function getPath();
+
+	/**
+	 * Get the URI archor string
+	 * Everything after the "#".
+	 *
+	 * @return  string  The URI anchor string.
+	 *
+	 * @since   1.0
+	 */
+	public function getFragment();
+
+	/**
+	 * Checks whether the current URI is using HTTPS.
+	 *
+	 * @return  boolean  True if using SSL via HTTPS.
+	 *
+	 * @since   1.0
+	 */
+	public function isSSL();
+}
diff --git a/core/libraries/vendor/joomla/utilities/LICENSE b/core/libraries/vendor/joomla/utilities/LICENSE
new file mode 100644
index 00000000..df50810b
--- /dev/null
+++ b/core/libraries/vendor/joomla/utilities/LICENSE
@@ -0,0 +1,340 @@
+GNU GENERAL PUBLIC LICENSE
+				Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+				Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+			GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+	a) You must cause the modified files to carry prominent notices
+	stating that you changed the files and the date of any change.
+
+	b) You must cause any work that you distribute or publish, that in
+	whole or in part contains or is derived from the Program or any
+	part thereof, to be licensed as a whole at no charge to all third
+	parties under the terms of this License.
+
+	c) If the modified program normally reads commands interactively
+	when run, you must cause it, when started running for such
+	interactive use in the most ordinary way, to print or display an
+	announcement including an appropriate copyright notice and a
+	notice that there is no warranty (or else, saying that you provide
+	a warranty) and that users may redistribute the program under
+	these conditions, and telling the user how to view a copy of this
+	License.  (Exception: if the Program itself is interactive but
+	does not normally print such an announcement, your work based on
+	the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+	a) Accompany it with the complete corresponding machine-readable
+	source code, which must be distributed under the terms of Sections
+	1 and 2 above on a medium customarily used for software interchange; or,
+
+	b) Accompany it with a written offer, valid for at least three
+	years, to give any third party, for a charge no more than your
+	cost of physically performing source distribution, a complete
+	machine-readable copy of the corresponding source code, to be
+	distributed under the terms of Sections 1 and 2 above on a medium
+	customarily used for software interchange; or,
+
+	c) Accompany it with the information you received as to the offer
+	to distribute corresponding source code.  (This alternative is
+	allowed only for noncommercial distribution and only if you
+	received the program in object code or executable form with such
+	an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+				NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			 END OF TERMS AND CONDITIONS
+
+		How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+	Gnomovision version 69, Copyright (C) year name of author
+	Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/core/libraries/vendor/joomla/utilities/src/ArrayHelper.php b/core/libraries/vendor/joomla/utilities/src/ArrayHelper.php
new file mode 100644
index 00000000..bd8a86d4
--- /dev/null
+++ b/core/libraries/vendor/joomla/utilities/src/ArrayHelper.php
@@ -0,0 +1,747 @@
+<?php
+/**
+ * Part of the Joomla Framework Utilities Package
+ *
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\Utilities;
+
+use Joomla\String\StringHelper;
+
+/**
+ * ArrayHelper is an array utility class for doing all sorts of odds and ends with arrays.
+ *
+ * @since  1.0
+ */
+final class ArrayHelper
+{
+	/**
+	 * Private constructor to prevent instantiation of this class
+	 *
+	 * @since   1.0
+	 */
+	private function __construct()
+	{
+	}
+
+	/**
+	 * Function to convert array to integer values
+	 *
+	 * @param   array      $array    The source array to convert
+	 * @param   int|array  $default  A default value to assign if $array is not an array
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function toInteger($array, $default = null)
+	{
+		if (is_array($array))
+		{
+			return array_map('intval', $array);
+		}
+
+		if ($default === null)
+		{
+			return array();
+		}
+
+		if (is_array($default))
+		{
+			return static::toInteger($default, null);
+		}
+
+		return array((int) $default);
+	}
+
+	/**
+	 * Utility function to map an array to a stdClass object.
+	 *
+	 * @param   array    $array      The array to map.
+	 * @param   string   $class      Name of the class to create
+	 * @param   boolean  $recursive  Convert also any array inside the main array
+	 *
+	 * @return  object
+	 *
+	 * @since   1.0
+	 */
+	public static function toObject(array $array, $class = 'stdClass', $recursive = true)
+	{
+		$obj = new $class;
+
+		foreach ($array as $k => $v)
+		{
+			if ($recursive && is_array($v))
+			{
+				$obj->$k = static::toObject($v, $class);
+			}
+			else
+			{
+				$obj->$k = $v;
+			}
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * Utility function to map an array to a string.
+	 *
+	 * @param   array    $array         The array to map.
+	 * @param   string   $innerGlue     The glue (optional, defaults to '=') between the key and the value.
+	 * @param   string   $outerGlue     The glue (optional, defaults to ' ') between array elements.
+	 * @param   boolean  $keepOuterKey  True if final key should be kept.
+	 *
+	 * @return  string
+	 *
+	 * @since   1.0
+	 */
+	public static function toString(array $array, $innerGlue = '=', $outerGlue = ' ', $keepOuterKey = false)
+	{
+		$output = array();
+
+		foreach ($array as $key => $item)
+		{
+			if (is_array($item))
+			{
+				if ($keepOuterKey)
+				{
+					$output[] = $key;
+				}
+
+				// This is value is an array, go and do it again!
+				$output[] = static::toString($item, $innerGlue, $outerGlue, $keepOuterKey);
+			}
+			else
+			{
+				$output[] = $key . $innerGlue . '"' . $item . '"';
+			}
+		}
+
+		return implode($outerGlue, $output);
+	}
+
+	/**
+	 * Utility function to map an object to an array
+	 *
+	 * @param   object   $source   The source object
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function fromObject($source, $recurse = true, $regex = null)
+	{
+		if (is_object($source) || is_array($source))
+		{
+			return self::arrayFromObject($source, $recurse, $regex);
+		}
+
+		return array();
+	}
+
+	/**
+	 * Utility function to map an object or array to an array
+	 *
+	 * @param   mixed    $item     The source object or array
+	 * @param   boolean  $recurse  True to recurse through multi-level objects
+	 * @param   string   $regex    An optional regular expression to match on field names
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	private static function arrayFromObject($item, $recurse, $regex)
+	{
+		if (is_object($item))
+		{
+			$result = array();
+
+			foreach (get_object_vars($item) as $k => $v)
+			{
+				if (!$regex || preg_match($regex, $k))
+				{
+					if ($recurse)
+					{
+						$result[$k] = self::arrayFromObject($v, $recurse, $regex);
+					}
+					else
+					{
+						$result[$k] = $v;
+					}
+				}
+			}
+
+			return $result;
+		}
+
+		if (is_array($item))
+		{
+			$result = array();
+
+			foreach ($item as $k => $v)
+			{
+				$result[$k] = self::arrayFromObject($v, $recurse, $regex);
+			}
+
+			return $result;
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Adds a column to an array of arrays or objects
+	 *
+	 * @param   array   $array    The source array
+	 * @param   array   $column   The array to be used as new column
+	 * @param   string  $colName  The index of the new column or name of the new object property
+	 * @param   string  $keyCol   The index of the column or name of object property to be used for mapping with the new column
+	 *
+	 * @return  array  An array with the new column added to the source array
+	 *
+	 * @since   1.5.0
+	 * @see     https://secure.php.net/manual/en/language.types.array.php
+	 */
+	public static function addColumn(array $array, array $column, $colName, $keyCol = null)
+	{
+		$result = array();
+
+		foreach ($array as $i => $item)
+		{
+			$value = null;
+
+			if (!isset($keyCol))
+			{
+				$value = static::getValue($column, $i);
+			}
+			else
+			{
+				// Convert object to array
+				$subject = is_object($item) ? static::fromObject($item) : $item;
+
+				if (isset($subject[$keyCol]) && is_scalar($subject[$keyCol]))
+				{
+					$value = static::getValue($column, $subject[$keyCol]);
+				}
+			}
+
+			// Add the column
+			if (is_object($item))
+			{
+				if (isset($colName))
+				{
+					$item->$colName = $value;
+				}
+			}
+			else
+			{
+				if (isset($colName))
+				{
+					$item[$colName] = $value;
+				}
+				else
+				{
+					$item[] = $value;
+				}
+			}
+
+			$result[$i] = $item;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Remove a column from an array of arrays or objects
+	 *
+	 * @param   array   $array    The source array
+	 * @param   string  $colName  The index of the column or name of object property to be removed
+	 *
+	 * @return  array  Column of values from the source array
+	 *
+	 * @since   1.5.0
+	 * @see     https://secure.php.net/manual/en/language.types.array.php
+	 */
+	public static function dropColumn(array $array, $colName)
+	{
+		$result = array();
+
+		foreach ($array as $i => $item)
+		{
+			if (is_object($item) && isset($item->$colName))
+			{
+				unset($item->$colName);
+			}
+			elseif (is_array($item) && isset($item[$colName]))
+			{
+				unset($item[$colName]);
+			}
+
+			$result[$i] = $item;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Extracts a column from an array of arrays or objects
+	 *
+	 * @param   array   $array     The source array
+	 * @param   string  $valueCol  The index of the column or name of object property to be used as value
+	 *                             It may also be NULL to return complete arrays or objects (this is
+	 *                             useful together with <var>$keyCol</var> to reindex the array).
+	 * @param   string  $keyCol    The index of the column or name of object property to be used as key
+	 *
+	 * @return  array  Column of values from the source array
+	 *
+	 * @since   1.0
+	 * @see     https://secure.php.net/manual/en/language.types.array.php
+	 * @see     https://secure.php.net/manual/en/function.array-column.php
+	 */
+	public static function getColumn(array $array, $valueCol, $keyCol = null)
+	{
+		// As of PHP 7, array_column() supports an array of objects so we'll use that
+		if (PHP_VERSION_ID >= 70000)
+		{
+			return array_column($array, $valueCol, $keyCol);
+		}
+
+		$result = array();
+
+		foreach ($array as $item)
+		{
+			// Convert object to array
+			$subject = is_object($item) ? static::fromObject($item) : $item;
+
+			/*
+			 * We process arrays (and objects already converted to array)
+			 * Only if the value column (if required) exists in this item
+			 */
+			if (is_array($subject) && (!isset($valueCol) || isset($subject[$valueCol])))
+			{
+				// Use whole $item if valueCol is null, else use the value column.
+				$value = isset($valueCol) ? $subject[$valueCol] : $item;
+
+				// Array keys can only be integer or string. Casting will occur as per the PHP Manual.
+				if (isset($keyCol) && isset($subject[$keyCol]) && is_scalar($subject[$keyCol]))
+				{
+					$key          = $subject[$keyCol];
+					$result[$key] = $value;
+				}
+				else
+				{
+					$result[] = $value;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Utility function to return a value from a named array or a specified default
+	 *
+	 * @param   array|\ArrayAccess  $array    A named array or object that implements ArrayAccess
+	 * @param   string              $name     The key to search for (this can be an array index or a dot separated key sequence as in Registry)
+	 * @param   mixed               $default  The default value to give if no key found
+	 * @param   string              $type     Return type for the variable (INT, FLOAT, STRING, WORD, BOOLEAN, ARRAY)
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.0
+	 * @throws  \InvalidArgumentException
+	 */
+	public static function getValue($array, $name, $default = null, $type = '')
+	{
+		if (!is_array($array) && !($array instanceof \ArrayAccess))
+		{
+			throw new \InvalidArgumentException('The object must be an array or an object that implements ArrayAccess');
+		}
+
+		$result = null;
+
+		if (isset($array[$name]))
+		{
+			$result = $array[$name];
+		}
+		elseif (strpos($name, '.'))
+		{
+			list($name, $subset) = explode('.', $name, 2);
+
+			if (isset($array[$name]) && is_array($array[$name]))
+			{
+				return static::getValue($array[$name], $subset, $default, $type);
+			}
+		}
+
+		// Handle the default case
+		if (is_null($result))
+		{
+			$result = $default;
+		}
+
+		// Handle the type constraint
+		switch (strtoupper($type))
+		{
+			case 'INT':
+			case 'INTEGER':
+				// Only use the first integer value
+				@preg_match('/-?[0-9]+/', $result, $matches);
+				$result = @(int) $matches[0];
+				break;
+
+			case 'FLOAT':
+			case 'DOUBLE':
+				// Only use the first floating point value
+				@preg_match('/-?[0-9]+(\.[0-9]+)?/', $result, $matches);
+				$result = @(float) $matches[0];
+				break;
+
+			case 'BOOL':
+			case 'BOOLEAN':
+				$result = (bool) $result;
+				break;
+
+			case 'ARRAY':
+				if (!is_array($result))
+				{
+					$result = array($result);
+				}
+				break;
+
+			case 'STRING':
+				$result = (string) $result;
+				break;
+
+			case 'WORD':
+				$result = (string) preg_replace('#\W#', '', $result);
+				break;
+
+			case 'NONE':
+			default:
+				// No casting necessary
+				break;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Takes an associative array of arrays and inverts the array keys to values using the array values as keys.
+	 *
+	 * Example:
+	 * $input = array(
+	 *     'New' => array('1000', '1500', '1750'),
+	 *     'Used' => array('3000', '4000', '5000', '6000')
+	 * );
+	 * $output = ArrayHelper::invert($input);
+	 *
+	 * Output would be equal to:
+	 * $output = array(
+	 *     '1000' => 'New',
+	 *     '1500' => 'New',
+	 *     '1750' => 'New',
+	 *     '3000' => 'Used',
+	 *     '4000' => 'Used',
+	 *     '5000' => 'Used',
+	 *     '6000' => 'Used'
+	 * );
+	 *
+	 * @param   array  $array  The source array.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function invert(array $array)
+	{
+		$return = array();
+
+		foreach ($array as $base => $values)
+		{
+			if (!is_array($values))
+			{
+				continue;
+			}
+
+			foreach ($values as $key)
+			{
+				// If the key isn't scalar then ignore it.
+				if (is_scalar($key))
+				{
+					$return[$key] = $base;
+				}
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Method to determine if an array is an associative array.
+	 *
+	 * @param   array  $array  An array to test.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.0
+	 */
+	public static function isAssociative($array)
+	{
+		if (is_array($array))
+		{
+			foreach (array_keys($array) as $k => $v)
+			{
+				if ($k !== $v)
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Pivots an array to create a reverse lookup of an array of scalars, arrays or objects.
+	 *
+	 * @param   array   $source  The source array.
+	 * @param   string  $key     Where the elements of the source array are objects or arrays, the key to pivot on.
+	 *
+	 * @return  array  An array of arrays pivoted either on the value of the keys, or an individual key of an object or array.
+	 *
+	 * @since   1.0
+	 */
+	public static function pivot(array $source, $key = null)
+	{
+		$result  = array();
+		$counter = array();
+
+		foreach ($source as $index => $value)
+		{
+			// Determine the name of the pivot key, and its value.
+			if (is_array($value))
+			{
+				// If the key does not exist, ignore it.
+				if (!isset($value[$key]))
+				{
+					continue;
+				}
+
+				$resultKey   = $value[$key];
+				$resultValue = $source[$index];
+			}
+			elseif (is_object($value))
+			{
+				// If the key does not exist, ignore it.
+				if (!isset($value->$key))
+				{
+					continue;
+				}
+
+				$resultKey   = $value->$key;
+				$resultValue = $source[$index];
+			}
+			else
+			{
+				// Just a scalar value.
+				$resultKey   = $value;
+				$resultValue = $index;
+			}
+
+			// The counter tracks how many times a key has been used.
+			if (empty($counter[$resultKey]))
+			{
+				// The first time around we just assign the value to the key.
+				$result[$resultKey] = $resultValue;
+				$counter[$resultKey] = 1;
+			}
+			elseif ($counter[$resultKey] == 1)
+			{
+				// If there is a second time, we convert the value into an array.
+				$result[$resultKey] = array(
+					$result[$resultKey],
+					$resultValue,
+				);
+				$counter[$resultKey]++;
+			}
+			else
+			{
+				// After the second time, no need to track any more. Just append to the existing array.
+				$result[$resultKey][] = $resultValue;
+			}
+		}
+
+		unset($counter);
+
+		return $result;
+	}
+
+	/**
+	 * Utility function to sort an array of objects on a given field
+	 *
+	 * @param   array  $a              An array of objects
+	 * @param   mixed  $k              The key (string) or an array of keys to sort on
+	 * @param   mixed  $direction      Direction (integer) or an array of direction to sort in [1 = Ascending] [-1 = Descending]
+	 * @param   mixed  $caseSensitive  Boolean or array of booleans to let sort occur case sensitive or insensitive
+	 * @param   mixed  $locale         Boolean or array of booleans to let sort occur using the locale language or not
+	 *
+	 * @return  array
+	 *
+	 * @since   1.0
+	 */
+	public static function sortObjects(array $a, $k, $direction = 1, $caseSensitive = true, $locale = false)
+	{
+		if (!is_array($locale) || !is_array($locale[0]))
+		{
+			$locale = array($locale);
+		}
+
+		$sortCase      = (array) $caseSensitive;
+		$sortDirection = (array) $direction;
+		$key           = (array) $k;
+		$sortLocale    = $locale;
+
+		usort(
+			$a, function ($a, $b) use ($sortCase, $sortDirection, $key, $sortLocale)
+			{
+				for ($i = 0, $count = count($key); $i < $count; $i++)
+				{
+					if (isset($sortDirection[$i]))
+					{
+						$direction = $sortDirection[$i];
+					}
+
+					if (isset($sortCase[$i]))
+					{
+						$caseSensitive = $sortCase[$i];
+					}
+
+					if (isset($sortLocale[$i]))
+					{
+						$locale = $sortLocale[$i];
+					}
+
+					$va = $a->{$key[$i]};
+					$vb = $b->{$key[$i]};
+
+					if ((is_bool($va) || is_numeric($va)) && (is_bool($vb) || is_numeric($vb)))
+					{
+						$cmp = $va - $vb;
+					}
+					elseif ($caseSensitive)
+					{
+						$cmp = StringHelper::strcmp($va, $vb, $locale);
+					}
+					else
+					{
+						$cmp = StringHelper::strcasecmp($va, $vb, $locale);
+					}
+
+					if ($cmp > 0)
+					{
+						return $direction;
+					}
+
+					if ($cmp < 0)
+					{
+						return -$direction;
+					}
+				}
+
+				return 0;
+			}
+		);
+
+		return $a;
+	}
+
+	/**
+	 * Multidimensional array safe unique test
+	 *
+	 * @param   array  $array  The array to make unique.
+	 *
+	 * @return  array
+	 *
+	 * @see     https://secure.php.net/manual/en/function.array-unique.php
+	 * @since   1.0
+	 */
+	public static function arrayUnique(array $array)
+	{
+		$array = array_map('serialize', $array);
+		$array = array_unique($array);
+		$array = array_map('unserialize', $array);
+
+		return $array;
+	}
+
+	/**
+	 * An improved array_search that allows for partial matching of strings values in associative arrays.
+	 *
+	 * @param   string   $needle         The text to search for within the array.
+	 * @param   array    $haystack       Associative array to search in to find $needle.
+	 * @param   boolean  $caseSensitive  True to search case sensitive, false otherwise.
+	 *
+	 * @return  mixed    Returns the matching array $key if found, otherwise false.
+	 *
+	 * @since   1.0
+	 */
+	public static function arraySearch($needle, array $haystack, $caseSensitive = true)
+	{
+		foreach ($haystack as $key => $value)
+		{
+			$searchFunc = ($caseSensitive) ? 'strpos' : 'stripos';
+
+			if ($searchFunc($value, $needle) === 0)
+			{
+				return $key;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to recursively convert data to a one dimension array.
+	 *
+	 * @param   array|object  $array      The array or object to convert.
+	 * @param   string        $separator  The key separator.
+	 * @param   string        $prefix     Last level key prefix.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.3.0
+	 */
+	public static function flatten($array, $separator = '.', $prefix = '')
+	{
+		if ($array instanceof \Traversable)
+		{
+			$array = iterator_to_array($array);
+		}
+		elseif (is_object($array))
+		{
+			$array = get_object_vars($array);
+		}
+
+		foreach ($array as $k => $v)
+		{
+			$key = $prefix ? $prefix . $separator . $k : $k;
+
+			if (is_object($v) || is_array($v))
+			{
+				$array = array_merge($array, static::flatten($v, $separator, $key));
+			}
+			else
+			{
+				$array[$key] = $v;
+			}
+		}
+
+		return $array;
+	}
+}
diff --git a/core/libraries/vendor/leafo/lessphp/LICENSE b/core/libraries/vendor/leafo/lessphp/LICENSE
new file mode 100644
index 00000000..49c9ea41
--- /dev/null
+++ b/core/libraries/vendor/leafo/lessphp/LICENSE
@@ -0,0 +1,660 @@
+For ease of distribution, lessphp 0.4.0 is under a dual license.
+You are free to pick which one suits your needs.
+
+
+
+
+MIT LICENSE
+
+
+
+
+Copyright (c) 2013 Leaf Corcoran, http://leafo.net/lessphp
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+
+GPL VERSION 3
+
+
+
+
+					GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
diff --git a/core/libraries/vendor/leafo/lessphp/lessc.inc.php b/core/libraries/vendor/leafo/lessphp/lessc.inc.php
new file mode 100644
index 00000000..2292f219
--- /dev/null
+++ b/core/libraries/vendor/leafo/lessphp/lessc.inc.php
@@ -0,0 +1,3768 @@
+<?php
+
+/**
+ * lessphp v0.5.0
+ * http://leafo.net/lessphp
+ *
+ * LESS CSS compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2013, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ */
+
+
+/**
+ * The LESS compiler and parser.
+ *
+ * Converting LESS to CSS is a three stage process. The incoming file is parsed
+ * by `lessc_parser` into a syntax tree, then it is compiled into another tree
+ * representing the CSS structure by `lessc`. The CSS tree is fed into a
+ * formatter, like `lessc_formatter` which then outputs CSS as a string.
+ *
+ * During the first compile, all values are *reduced*, which means that their
+ * types are brought to the lowest form before being dump as strings. This
+ * handles math equations, variable dereferences, and the like.
+ *
+ * The `parse` function of `lessc` is the entry point.
+ *
+ * In summary:
+ *
+ * The `lessc` class creates an instance of the parser, feeds it LESS code,
+ * then transforms the resulting tree to a CSS tree. This class also holds the
+ * evaluation context, such as all available mixins and variables at any given
+ * time.
+ *
+ * The `lessc_parser` class is only concerned with parsing its input.
+ *
+ * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string,
+ * handling things like indentation.
+ */
+class lessc {
+	static public $VERSION = "v0.5.0";
+
+	static public $TRUE = array("keyword", "true");
+	static public $FALSE = array("keyword", "false");
+
+	protected $libFunctions = array();
+	protected $registeredVars = array();
+	protected $preserveComments = false;
+
+	public $vPrefix = '@'; // prefix of abstract properties
+	public $mPrefix = '$'; // prefix of abstract blocks
+	public $parentSelector = '&';
+
+	public $importDisabled = false;
+	public $importDir = '';
+
+	protected $numberPrecision = null;
+
+	protected $allParsedFiles = array();
+
+	// set to the parser that generated the current line when compiling
+	// so we know how to create error messages
+	protected $sourceParser = null;
+	protected $sourceLoc = null;
+
+	static protected $nextImportId = 0; // uniquely identify imports
+
+	// attempts to find the path of an import url, returns null for css files
+	protected function findImport($url) {
+		foreach ((array)$this->importDir as $dir) {
+			$full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
+			if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
+				return $file;
+			}
+		}
+
+		return null;
+	}
+
+	protected function fileExists($name) {
+		return is_file($name);
+	}
+
+	static public function compressList($items, $delim) {
+		if (!isset($items[1]) && isset($items[0])) return $items[0];
+		else return array('list', $delim, $items);
+	}
+
+	static public function preg_quote($what) {
+		return preg_quote($what, '/');
+	}
+
+	protected function tryImport($importPath, $parentBlock, $out) {
+		if ($importPath[0] == "function" && $importPath[1] == "url") {
+			$importPath = $this->flattenList($importPath[2]);
+		}
+
+		$str = $this->coerceString($importPath);
+		if ($str === null) return false;
+
+		$url = $this->compileValue($this->lib_e($str));
+
+		// don't import if it ends in css
+		if (substr_compare($url, '.css', -4, 4) === 0) return false;
+
+		$realPath = $this->findImport($url);
+
+		if ($realPath === null) return false;
+
+		if ($this->importDisabled) {
+			return array(false, "/* import disabled */");
+		}
+
+		if (isset($this->allParsedFiles[realpath($realPath)])) {
+			return array(false, null);
+		}
+
+		$this->addParsedFile($realPath);
+		$parser = $this->makeParser($realPath);
+		$root = $parser->parse(file_get_contents($realPath));
+
+		// set the parents of all the block props
+		foreach ($root->props as $prop) {
+			if ($prop[0] == "block") {
+				$prop[1]->parent = $parentBlock;
+			}
+		}
+
+		// copy mixins into scope, set their parents
+		// bring blocks from import into current block
+		// TODO: need to mark the source parser	these came from this file
+		foreach ($root->children as $childName => $child) {
+			if (isset($parentBlock->children[$childName])) {
+				$parentBlock->children[$childName] = array_merge(
+					$parentBlock->children[$childName],
+					$child);
+			} else {
+				$parentBlock->children[$childName] = $child;
+			}
+		}
+
+		$pi = pathinfo($realPath);
+		$dir = $pi["dirname"];
+
+		list($top, $bottom) = $this->sortProps($root->props, true);
+		$this->compileImportedProps($top, $parentBlock, $out, $parser, $dir);
+
+		return array(true, $bottom, $parser, $dir);
+	}
+
+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {
+		$oldSourceParser = $this->sourceParser;
+
+		$oldImport = $this->importDir;
+
+		// TODO: this is because the importDir api is stupid
+		$this->importDir = (array)$this->importDir;
+		array_unshift($this->importDir, $importDir);
+
+		foreach ($props as $prop) {
+			$this->compileProp($prop, $block, $out);
+		}
+
+		$this->importDir = $oldImport;
+		$this->sourceParser = $oldSourceParser;
+	}
+
+	/**
+	 * Recursively compiles a block.
+	 *
+	 * A block is analogous to a CSS block in most cases. A single LESS document
+	 * is encapsulated in a block when parsed, but it does not have parent tags
+	 * so all of it's children appear on the root level when compiled.
+	 *
+	 * Blocks are made up of props and children.
+	 *
+	 * Props are property instructions, array tuples which describe an action
+	 * to be taken, eg. write a property, set a variable, mixin a block.
+	 *
+	 * The children of a block are just all the blocks that are defined within.
+	 * This is used to look up mixins when performing a mixin.
+	 *
+	 * Compiling the block involves pushing a fresh environment on the stack,
+	 * and iterating through the props, compiling each one.
+	 *
+	 * See lessc::compileProp()
+	 *
+	 */
+	protected function compileBlock($block) {
+		switch ($block->type) {
+		case "root":
+			$this->compileRoot($block);
+			break;
+		case null:
+			$this->compileCSSBlock($block);
+			break;
+		case "media":
+			$this->compileMedia($block);
+			break;
+		case "directive":
+			$name = "@" . $block->name;
+			if (!empty($block->value)) {
+				$name .= " " . $this->compileValue($this->reduce($block->value));
+			}
+
+			$this->compileNestedBlock($block, array($name));
+			break;
+		default:
+			$this->throwError("unknown block type: $block->type\n");
+		}
+	}
+
+	protected function compileCSSBlock($block) {
+		$env = $this->pushEnv();
+
+		$selectors = $this->compileSelectors($block->tags);
+		$env->selectors = $this->multiplySelectors($selectors);
+		$out = $this->makeOutputBlock(null, $env->selectors);
+
+		$this->scope->children[] = $out;
+		$this->compileProps($block, $out);
+
+		$block->scope = $env; // mixins carry scope with them!
+		$this->popEnv();
+	}
+
+	protected function compileMedia($media) {
+		$env = $this->pushEnv($media);
+		$parentScope = $this->mediaParent($this->scope);
+
+		$query = $this->compileMediaQuery($this->multiplyMedia($env));
+
+		$this->scope = $this->makeOutputBlock($media->type, array($query));
+		$parentScope->children[] = $this->scope;
+
+		$this->compileProps($media, $this->scope);
+
+		if (count($this->scope->lines) > 0) {
+			$orphanSelelectors = $this->findClosestSelectors();
+			if (!is_null($orphanSelelectors)) {
+				$orphan = $this->makeOutputBlock(null, $orphanSelelectors);
+				$orphan->lines = $this->scope->lines;
+				array_unshift($this->scope->children, $orphan);
+				$this->scope->lines = array();
+			}
+		}
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	protected function mediaParent($scope) {
+		while (!empty($scope->parent)) {
+			if (!empty($scope->type) && $scope->type != "media") {
+				break;
+			}
+			$scope = $scope->parent;
+		}
+
+		return $scope;
+	}
+
+	protected function compileNestedBlock($block, $selectors) {
+		$this->pushEnv($block);
+		$this->scope = $this->makeOutputBlock($block->type, $selectors);
+		$this->scope->parent->children[] = $this->scope;
+
+		$this->compileProps($block, $this->scope);
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	protected function compileRoot($root) {
+		$this->pushEnv();
+		$this->scope = $this->makeOutputBlock($root->type);
+		$this->compileProps($root, $this->scope);
+		$this->popEnv();
+	}
+
+	protected function compileProps($block, $out) {
+		foreach ($this->sortProps($block->props) as $prop) {
+			$this->compileProp($prop, $block, $out);
+		}
+		$out->lines = $this->deduplicate($out->lines);
+	}
+
+	/**
+	 * Deduplicate lines in a block. Comments are not deduplicated. If a
+	 * duplicate rule is detected, the comments immediately preceding each
+	 * occurence are consolidated.
+	 */
+	protected function deduplicate($lines) {
+		$unique = array();
+		$comments = array();
+
+		foreach($lines as $line) {
+			if (strpos($line, '/*') === 0) {
+				$comments[] = $line;
+				continue;
+			}
+			if (!in_array($line, $unique)) {
+				$unique[] = $line;
+			}
+			array_splice($unique, array_search($line, $unique), 0, $comments);
+			$comments = array();
+		}
+		return array_merge($unique, $comments);
+	}
+
+	protected function sortProps($props, $split = false) {
+		$vars = array();
+		$imports = array();
+		$other = array();
+		$stack = array();
+
+		foreach ($props as $prop) {
+			switch ($prop[0]) {
+			case "comment":
+				$stack[] = $prop;
+				break;
+			case "assign":
+				$stack[] = $prop;
+				if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) {
+					$vars = array_merge($vars, $stack);
+				} else {
+					$other = array_merge($other, $stack);
+				}
+				$stack = array();
+				break;
+			case "import":
+				$id = self::$nextImportId++;
+				$prop[] = $id;
+				$stack[] = $prop;
+				$imports = array_merge($imports, $stack);
+				$other[] = array("import_mixin", $id);
+				$stack = array();
+				break;
+			default:
+				$stack[] = $prop;
+				$other = array_merge($other, $stack);
+				$stack = array();
+				break;
+			}
+		}
+		$other = array_merge($other, $stack);
+
+		if ($split) {
+			return array(array_merge($imports, $vars), $other);
+		} else {
+			return array_merge($imports, $vars, $other);
+		}
+	}
+
+	protected function compileMediaQuery($queries) {
+		$compiledQueries = array();
+		foreach ($queries as $query) {
+			$parts = array();
+			foreach ($query as $q) {
+				switch ($q[0]) {
+				case "mediaType":
+					$parts[] = implode(" ", array_slice($q, 1));
+					break;
+				case "mediaExp":
+					if (isset($q[2])) {
+						$parts[] = "($q[1]: " .
+							$this->compileValue($this->reduce($q[2])) . ")";
+					} else {
+						$parts[] = "($q[1])";
+					}
+					break;
+				case "variable":
+					$parts[] = $this->compileValue($this->reduce($q));
+				break;
+				}
+			}
+
+			if (count($parts) > 0) {
+				$compiledQueries[] =  implode(" and ", $parts);
+			}
+		}
+
+		$out = "@media";
+		if (!empty($parts)) {
+			$out .= " " .
+				implode($this->formatter->selectorSeparator, $compiledQueries);
+		}
+		return $out;
+	}
+
+	protected function multiplyMedia($env, $childQueries = null) {
+		if (is_null($env) ||
+			!empty($env->block->type) && $env->block->type != "media")
+		{
+			return $childQueries;
+		}
+
+		// plain old block, skip
+		if (empty($env->block->type)) {
+			return $this->multiplyMedia($env->parent, $childQueries);
+		}
+
+		$out = array();
+		$queries = $env->block->queries;
+		if (is_null($childQueries)) {
+			$out = $queries;
+		} else {
+			foreach ($queries as $parent) {
+				foreach ($childQueries as $child) {
+					$out[] = array_merge($parent, $child);
+				}
+			}
+		}
+
+		return $this->multiplyMedia($env->parent, $out);
+	}
+
+	protected function expandParentSelectors(&$tag, $replace) {
+		$parts = explode("$&$", $tag);
+		$count = 0;
+		foreach ($parts as &$part) {
+			$part = str_replace($this->parentSelector, $replace, $part, $c);
+			$count += $c;
+		}
+		$tag = implode($this->parentSelector, $parts);
+		return $count;
+	}
+
+	protected function findClosestSelectors() {
+		$env = $this->env;
+		$selectors = null;
+		while ($env !== null) {
+			if (isset($env->selectors)) {
+				$selectors = $env->selectors;
+				break;
+			}
+			$env = $env->parent;
+		}
+
+		return $selectors;
+	}
+
+
+	// multiply $selectors against the nearest selectors in env
+	protected function multiplySelectors($selectors) {
+		// find parent selectors
+
+		$parentSelectors = $this->findClosestSelectors();
+		if (is_null($parentSelectors)) {
+			// kill parent reference in top level selector
+			foreach ($selectors as &$s) {
+				$this->expandParentSelectors($s, "");
+			}
+
+			return $selectors;
+		}
+
+		$out = array();
+		foreach ($parentSelectors as $parent) {
+			foreach ($selectors as $child) {
+				$count = $this->expandParentSelectors($child, $parent);
+
+				// don't prepend the parent tag if & was used
+				if ($count > 0) {
+					$out[] = trim($child);
+				} else {
+					$out[] = trim($parent . ' ' . $child);
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	// reduces selector expressions
+	protected function compileSelectors($selectors) {
+		$out = array();
+
+		foreach ($selectors as $s) {
+			if (is_array($s)) {
+				list(, $value) = $s;
+				$out[] = trim($this->compileValue($this->reduce($value)));
+			} else {
+				$out[] = $s;
+			}
+		}
+
+		return $out;
+	}
+
+	protected function eq($left, $right) {
+		return $left == $right;
+	}
+
+	protected function patternMatch($block, $orderedArgs, $keywordArgs) {
+		// match the guards if it has them
+		// any one of the groups must have all its guards pass for a match
+		if (!empty($block->guards)) {
+			$groupPassed = false;
+			foreach ($block->guards as $guardGroup) {
+				foreach ($guardGroup as $guard) {
+					$this->pushEnv();
+					$this->zipSetArgs($block->args, $orderedArgs, $keywordArgs);
+
+					$negate = false;
+					if ($guard[0] == "negate") {
+						$guard = $guard[1];
+						$negate = true;
+					}
+
+					$passed = $this->reduce($guard) == self::$TRUE;
+					if ($negate) $passed = !$passed;
+
+					$this->popEnv();
+
+					if ($passed) {
+						$groupPassed = true;
+					} else {
+						$groupPassed = false;
+						break;
+					}
+				}
+
+				if ($groupPassed) break;
+			}
+
+			if (!$groupPassed) {
+				return false;
+			}
+		}
+
+		if (empty($block->args)) {
+			return $block->isVararg || empty($orderedArgs) && empty($keywordArgs);
+		}
+
+		$remainingArgs = $block->args;
+		if ($keywordArgs) {
+			$remainingArgs = array();
+			foreach ($block->args as $arg) {
+				if ($arg[0] == "arg" && isset($keywordArgs[$arg[1]])) {
+					continue;
+				}
+
+				$remainingArgs[] = $arg;
+			}
+		}
+
+		$i = -1; // no args
+		// try to match by arity or by argument literal
+		foreach ($remainingArgs as $i => $arg) {
+			switch ($arg[0]) {
+			case "lit":
+				if (empty($orderedArgs[$i]) || !$this->eq($arg[1], $orderedArgs[$i])) {
+					return false;
+				}
+				break;
+			case "arg":
+				// no arg and no default value
+				if (!isset($orderedArgs[$i]) && !isset($arg[2])) {
+					return false;
+				}
+				break;
+			case "rest":
+				$i--; // rest can be empty
+				break 2;
+			}
+		}
+
+		if ($block->isVararg) {
+			return true; // not having enough is handled above
+		} else {
+			$numMatched = $i + 1;
+			// greater than becuase default values always match
+			return $numMatched >= count($orderedArgs);
+		}
+	}
+
+	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip=array()) {
+		$matches = null;
+		foreach ($blocks as $block) {
+			// skip seen blocks that don't have arguments
+			if (isset($skip[$block->id]) && !isset($block->args)) {
+				continue;
+			}
+
+			if ($this->patternMatch($block, $orderedArgs, $keywordArgs)) {
+				$matches[] = $block;
+			}
+		}
+
+		return $matches;
+	}
+
+	// attempt to find blocks matched by path and args
+	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen=array()) {
+		if ($searchIn == null) return null;
+		if (isset($seen[$searchIn->id])) return null;
+		$seen[$searchIn->id] = true;
+
+		$name = $path[0];
+
+		if (isset($searchIn->children[$name])) {
+			$blocks = $searchIn->children[$name];
+			if (count($path) == 1) {
+				$matches = $this->patternMatchAll($blocks, $orderedArgs, $keywordArgs, $seen);
+				if (!empty($matches)) {
+					// This will return all blocks that match in the closest
+					// scope that has any matching block, like lessjs
+					return $matches;
+				}
+			} else {
+				$matches = array();
+				foreach ($blocks as $subBlock) {
+					$subMatches = $this->findBlocks($subBlock,
+						array_slice($path, 1), $orderedArgs, $keywordArgs, $seen);
+
+					if (!is_null($subMatches)) {
+						foreach ($subMatches as $sm) {
+							$matches[] = $sm;
+						}
+					}
+				}
+
+				return count($matches) > 0 ? $matches : null;
+			}
+		}
+		if ($searchIn->parent === $searchIn) return null;
+		return $this->findBlocks($searchIn->parent, $path, $orderedArgs, $keywordArgs, $seen);
+	}
+
+	// sets all argument names in $args to either the default value
+	// or the one passed in through $values
+	protected function zipSetArgs($args, $orderedValues, $keywordValues) {
+		$assignedValues = array();
+
+		$i = 0;
+		foreach ($args as  $a) {
+			if ($a[0] == "arg") {
+				if (isset($keywordValues[$a[1]])) {
+					// has keyword arg
+					$value = $keywordValues[$a[1]];
+				} elseif (isset($orderedValues[$i])) {
+					// has ordered arg
+					$value = $orderedValues[$i];
+					$i++;
+				} elseif (isset($a[2])) {
+					// has default value
+					$value = $a[2];
+				} else {
+					$this->throwError("Failed to assign arg " . $a[1]);
+					$value = null; // :(
+				}
+
+				$value = $this->reduce($value);
+				$this->set($a[1], $value);
+				$assignedValues[] = $value;
+			} else {
+				// a lit
+				$i++;
+			}
+		}
+
+		// check for a rest
+		$last = end($args);
+		if ($last[0] == "rest") {
+			$rest = array_slice($orderedValues, count($args) - 1);
+			$this->set($last[1], $this->reduce(array("list", " ", $rest)));
+		}
+
+		// wow is this the only true use of PHP's + operator for arrays?
+		$this->env->arguments = $assignedValues + $orderedValues;
+	}
+
+	// compile a prop and update $lines or $blocks appropriately
+	protected function compileProp($prop, $block, $out) {
+		// set error position context
+		$this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
+
+		switch ($prop[0]) {
+		case 'assign':
+			list(, $name, $value) = $prop;
+			if ($name[0] == $this->vPrefix) {
+				$this->set($name, $value);
+			} else {
+				$out->lines[] = $this->formatter->property($name,
+						$this->compileValue($this->reduce($value)));
+			}
+			break;
+		case 'block':
+			list(, $child) = $prop;
+			$this->compileBlock($child);
+			break;
+		case 'mixin':
+			list(, $path, $args, $suffix) = $prop;
+
+			$orderedArgs = array();
+			$keywordArgs = array();
+			foreach ((array)$args as $arg) {
+				$argval = null;
+				switch ($arg[0]) {
+				case "arg":
+					if (!isset($arg[2])) {
+						$orderedArgs[] = $this->reduce(array("variable", $arg[1]));
+					} else {
+						$keywordArgs[$arg[1]] = $this->reduce($arg[2]);
+					}
+					break;
+
+				case "lit":
+					$orderedArgs[] = $this->reduce($arg[1]);
+					break;
+				default:
+					$this->throwError("Unknown arg type: " . $arg[0]);
+				}
+			}
+
+			$mixins = $this->findBlocks($block, $path, $orderedArgs, $keywordArgs);
+
+			if ($mixins === null) {
+				$this->throwError("{$prop[1][0]} is undefined");
+			}
+
+			foreach ($mixins as $mixin) {
+				if ($mixin === $block && !$orderedArgs) {
+					continue;
+				}
+
+				$haveScope = false;
+				if (isset($mixin->parent->scope)) {
+					$haveScope = true;
+					$mixinParentEnv = $this->pushEnv();
+					$mixinParentEnv->storeParent = $mixin->parent->scope;
+				}
+
+				$haveArgs = false;
+				if (isset($mixin->args)) {
+					$haveArgs = true;
+					$this->pushEnv();
+					$this->zipSetArgs($mixin->args, $orderedArgs, $keywordArgs);
+				}
+
+				$oldParent = $mixin->parent;
+				if ($mixin != $block) $mixin->parent = $block;
+
+				foreach ($this->sortProps($mixin->props) as $subProp) {
+					if ($suffix !== null &&
+						$subProp[0] == "assign" &&
+						is_string($subProp[1]) &&
+						$subProp[1]{0} != $this->vPrefix)
+					{
+						$subProp[2] = array(
+							'list', ' ',
+							array($subProp[2], array('keyword', $suffix))
+						);
+					}
+
+					$this->compileProp($subProp, $mixin, $out);
+				}
+
+				$mixin->parent = $oldParent;
+
+				if ($haveArgs) $this->popEnv();
+				if ($haveScope) $this->popEnv();
+			}
+
+			break;
+		case 'raw':
+			$out->lines[] = $prop[1];
+			break;
+		case "directive":
+			list(, $name, $value) = $prop;
+			$out->lines[] = "@$name " . $this->compileValue($this->reduce($value)).';';
+			break;
+		case "comment":
+			$out->lines[] = $prop[1];
+			break;
+		case "import";
+			list(, $importPath, $importId) = $prop;
+			$importPath = $this->reduce($importPath);
+
+			if (!isset($this->env->imports)) {
+				$this->env->imports = array();
+			}
+
+			$result = $this->tryImport($importPath, $block, $out);
+
+			$this->env->imports[$importId] = $result === false ?
+				array(false, "@import " . $this->compileValue($importPath).";") :
+				$result;
+
+			break;
+		case "import_mixin":
+			list(,$importId) = $prop;
+			$import = $this->env->imports[$importId];
+			if ($import[0] === false) {
+				if (isset($import[1])) {
+					$out->lines[] = $import[1];
+				}
+			} else {
+				list(, $bottom, $parser, $importDir) = $import;
+				$this->compileImportedProps($bottom, $block, $out, $parser, $importDir);
+			}
+
+			break;
+		default:
+			$this->throwError("unknown op: {$prop[0]}\n");
+		}
+	}
+
+
+	/**
+	 * Compiles a primitive value into a CSS property value.
+	 *
+	 * Values in lessphp are typed by being wrapped in arrays, their format is
+	 * typically:
+	 *
+	 *     array(type, contents [, additional_contents]*)
+	 *
+	 * The input is expected to be reduced. This function will not work on
+	 * things like expressions and variables.
+	 */
+	public function compileValue($value) {
+		switch ($value[0]) {
+		case 'list':
+			// [1] - delimiter
+			// [2] - array of values
+			return implode($value[1], array_map(array($this, 'compileValue'), $value[2]));
+		case 'raw_color':
+			if (!empty($this->formatter->compressColors)) {
+				return $this->compileValue($this->coerceColor($value));
+			}
+			return $value[1];
+		case 'keyword':
+			// [1] - the keyword
+			return $value[1];
+		case 'number':
+			list(, $num, $unit) = $value;
+			// [1] - the number
+			// [2] - the unit
+			if ($this->numberPrecision !== null) {
+				$num = round($num, $this->numberPrecision);
+			}
+			return $num . $unit;
+		case 'string':
+			// [1] - contents of string (includes quotes)
+			list(, $delim, $content) = $value;
+			foreach ($content as &$part) {
+				if (is_array($part)) {
+					$part = $this->compileValue($part);
+				}
+			}
+			return $delim . implode($content) . $delim;
+		case 'color':
+			// [1] - red component (either number or a %)
+			// [2] - green component
+			// [3] - blue component
+			// [4] - optional alpha component
+			list(, $r, $g, $b) = $value;
+			$r = round($r);
+			$g = round($g);
+			$b = round($b);
+
+			if (count($value) == 5 && $value[4] != 1) { // rgba
+				return 'rgba('.$r.','.$g.','.$b.','.$value[4].')';
+			}
+
+			$h = sprintf("#%02x%02x%02x", $r, $g, $b);
+
+			if (!empty($this->formatter->compressColors)) {
+				// Converting hex color to short notation (e.g. #003399 to #039)
+				if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
+					$h = '#' . $h[1] . $h[3] . $h[5];
+				}
+			}
+
+			return $h;
+
+		case 'function':
+			list(, $name, $args) = $value;
+			return $name.'('.$this->compileValue($args).')';
+		default: // assumed to be unit
+			$this->throwError("unknown value type: $value[0]");
+		}
+	}
+
+	protected function lib_pow($args) {
+		list($base, $exp) = $this->assertArgs($args, 2, "pow");
+		return pow($this->assertNumber($base), $this->assertNumber($exp));
+	}
+
+	protected function lib_pi() {
+		return pi();
+	}
+
+	protected function lib_mod($args) {
+		list($a, $b) = $this->assertArgs($args, 2, "mod");
+		return $this->assertNumber($a) % $this->assertNumber($b);
+	}
+
+	protected function lib_tan($num) {
+		return tan($this->assertNumber($num));
+	}
+
+	protected function lib_sin($num) {
+		return sin($this->assertNumber($num));
+	}
+
+	protected function lib_cos($num) {
+		return cos($this->assertNumber($num));
+	}
+
+	protected function lib_atan($num) {
+		$num = atan($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_asin($num) {
+		$num = asin($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_acos($num) {
+		$num = acos($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_sqrt($num) {
+		return sqrt($this->assertNumber($num));
+	}
+
+	protected function lib_extract($value) {
+		list($list, $idx) = $this->assertArgs($value, 2, "extract");
+		$idx = $this->assertNumber($idx);
+		// 1 indexed
+		if ($list[0] == "list" && isset($list[2][$idx - 1])) {
+			return $list[2][$idx - 1];
+		}
+	}
+
+	protected function lib_isnumber($value) {
+		return $this->toBool($value[0] == "number");
+	}
+
+	protected function lib_isstring($value) {
+		return $this->toBool($value[0] == "string");
+	}
+
+	protected function lib_iscolor($value) {
+		return $this->toBool($this->coerceColor($value));
+	}
+
+	protected function lib_iskeyword($value) {
+		return $this->toBool($value[0] == "keyword");
+	}
+
+	protected function lib_ispixel($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "px");
+	}
+
+	protected function lib_ispercentage($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "%");
+	}
+
+	protected function lib_isem($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "em");
+	}
+
+	protected function lib_isrem($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "rem");
+	}
+
+	protected function lib_rgbahex($color) {
+		$color = $this->coerceColor($color);
+		if (is_null($color))
+			$this->throwError("color expected for rgbahex");
+
+		return sprintf("#%02x%02x%02x%02x",
+			isset($color[4]) ? $color[4]*255 : 255,
+			$color[1],$color[2], $color[3]);
+	}
+
+	protected function lib_argb($color){
+		return $this->lib_rgbahex($color);
+	}
+
+	/**
+	 * Given an url, decide whether to output a regular link or the base64-encoded contents of the file
+	 *
+	 * @param  array  $value either an argument list (two strings) or a single string
+	 * @return string        formatted url(), either as a link or base64-encoded
+	 */
+	protected function lib_data_uri($value) {
+		$mime = ($value[0] === 'list') ? $value[2][0][2] : null;
+		$url = ($value[0] === 'list') ? $value[2][1][2][0] : $value[2][0];
+
+		$fullpath = $this->findImport($url);
+
+		if($fullpath && ($fsize = filesize($fullpath)) !== false) {
+			// IE8 can't handle data uris larger than 32KB
+			if($fsize/1024 < 32) {
+				if(is_null($mime)) {
+					if(class_exists('finfo')) { // php 5.3+
+						$finfo = new finfo(FILEINFO_MIME);
+						$mime = explode('; ', $finfo->file($fullpath));
+						$mime = $mime[0];
+					} elseif(function_exists('mime_content_type')) { // PHP 5.2
+						$mime = mime_content_type($fullpath);
+					}
+				}
+
+				if(!is_null($mime)) // fallback if the mime type is still unknown
+					$url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath)));
+			}
+		}
+
+		return 'url("'.$url.'")';
+	}
+
+	// utility func to unquote a string
+	protected function lib_e($arg) {
+		switch ($arg[0]) {
+			case "list":
+				$items = $arg[2];
+				if (isset($items[0])) {
+					return $this->lib_e($items[0]);
+				}
+				$this->throwError("unrecognised input");
+			case "string":
+				$arg[1] = "";
+				return $arg;
+			case "keyword":
+				return $arg;
+			default:
+				return array("keyword", $this->compileValue($arg));
+		}
+	}
+
+	protected function lib__sprintf($args) {
+		if ($args[0] != "list") return $args;
+		$values = $args[2];
+		$string = array_shift($values);
+		$template = $this->compileValue($this->lib_e($string));
+
+		$i = 0;
+		if (preg_match_all('/%[dsa]/', $template, $m)) {
+			foreach ($m[0] as $match) {
+				$val = isset($values[$i]) ?
+					$this->reduce($values[$i]) : array('keyword', '');
+
+				// lessjs compat, renders fully expanded color, not raw color
+				if ($color = $this->coerceColor($val)) {
+					$val = $color;
+				}
+
+				$i++;
+				$rep = $this->compileValue($this->lib_e($val));
+				$template = preg_replace('/'.self::preg_quote($match).'/',
+					$rep, $template, 1);
+			}
+		}
+
+		$d = $string[0] == "string" ? $string[1] : '"';
+		return array("string", $d, array($template));
+	}
+
+	protected function lib_floor($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", floor($value), $arg[2]);
+	}
+
+	protected function lib_ceil($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", ceil($value), $arg[2]);
+	}
+
+	protected function lib_round($arg) {
+		if($arg[0] != "list") {
+			$value = $this->assertNumber($arg);
+			return array("number", round($value), $arg[2]);
+		} else {
+			$value = $this->assertNumber($arg[2][0]);
+			$precision = $this->assertNumber($arg[2][1]);
+			return array("number", round($value, $precision), $arg[2][0][2]);
+		}
+	}
+
+	protected function lib_unit($arg) {
+		if ($arg[0] == "list") {
+			list($number, $newUnit) = $arg[2];
+			return array("number", $this->assertNumber($number),
+				$this->compileValue($this->lib_e($newUnit)));
+		} else {
+			return array("number", $this->assertNumber($arg), "");
+		}
+	}
+
+	/**
+	 * Helper function to get arguments for color manipulation functions.
+	 * takes a list that contains a color like thing and a percentage
+	 */
+	public function colorArgs($args) {
+		if ($args[0] != 'list' || count($args[2]) < 2) {
+			return array(array('color', 0, 0, 0), 0);
+		}
+		list($color, $delta) = $args[2];
+		$color = $this->assertColor($color);
+		$delta = floatval($delta[1]);
+
+		return array($color, $delta);
+	}
+
+	protected function lib_darken($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] - $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_lighten($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] + $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_saturate($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] + $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_desaturate($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] - $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_spin($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+
+		$hsl[1] = $hsl[1] + $delta % 360;
+		if ($hsl[1] < 0) $hsl[1] += 360;
+
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_fadeout($args) {
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta/100);
+		return $color;
+	}
+
+	protected function lib_fadein($args) {
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta/100);
+		return $color;
+	}
+
+	protected function lib_hue($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[1]);
+	}
+
+	protected function lib_saturation($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[2]);
+	}
+
+	protected function lib_lightness($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[3]);
+	}
+
+	// get the alpha of a color
+	// defaults to 1 for non-colors or colors without an alpha
+	protected function lib_alpha($value) {
+		if (!is_null($color = $this->coerceColor($value))) {
+			return isset($color[4]) ? $color[4] : 1;
+		}
+	}
+
+	// set the alpha of the color
+	protected function lib_fade($args) {
+		list($color, $alpha) = $this->colorArgs($args);
+		$color[4] = $this->clamp($alpha / 100.0);
+		return $color;
+	}
+
+	protected function lib_percentage($arg) {
+		$num = $this->assertNumber($arg);
+		return array("number", $num*100, "%");
+	}
+
+	// mixes two colors by weight
+	// mix(@color1, @color2, [@weight: 50%]);
+	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+	protected function lib_mix($args) {
+		if ($args[0] != "list" || count($args[2]) < 2)
+			$this->throwError("mix expects (color1, color2, weight)");
+
+		list($first, $second) = $args[2];
+		$first = $this->assertColor($first);
+		$second = $this->assertColor($second);
+
+		$first_a = $this->lib_alpha($first);
+		$second_a = $this->lib_alpha($second);
+
+		if (isset($args[2][2])) {
+			$weight = $args[2][2][1] / 100.0;
+		} else {
+			$weight = 0.5;
+		}
+
+		$w = $weight * 2 - 1;
+		$a = $first_a - $second_a;
+
+		$w1 = (($w * $a == -1 ? $w : ($w + $a)/(1 + $w * $a)) + 1) / 2.0;
+		$w2 = 1.0 - $w1;
+
+		$new = array('color',
+			$w1 * $first[1] + $w2 * $second[1],
+			$w1 * $first[2] + $w2 * $second[2],
+			$w1 * $first[3] + $w2 * $second[3],
+		);
+
+		if ($first_a != 1.0 || $second_a != 1.0) {
+			$new[] = $first_a * $weight + $second_a * ($weight - 1);
+		}
+
+		return $this->fixColor($new);
+	}
+
+	protected function lib_contrast($args) {
+	    $darkColor  = array('color', 0, 0, 0);
+	    $lightColor = array('color', 255, 255, 255);
+	    $threshold  = 0.43;
+
+	    if ( $args[0] == 'list' ) {
+	        $inputColor = ( isset($args[2][0]) ) ? $this->assertColor($args[2][0])  : $lightColor;
+	        $darkColor  = ( isset($args[2][1]) ) ? $this->assertColor($args[2][1])  : $darkColor;
+	        $lightColor = ( isset($args[2][2]) ) ? $this->assertColor($args[2][2])  : $lightColor;
+	        $threshold  = ( isset($args[2][3]) ) ? $this->assertNumber($args[2][3]) : $threshold;
+	    }
+	    else {
+	        $inputColor  = $this->assertColor($args);
+	    }
+
+	    $inputColor = $this->coerceColor($inputColor);
+	    $darkColor  = $this->coerceColor($darkColor);
+	    $lightColor = $this->coerceColor($lightColor);
+
+	    //Figure out which is actually light and dark!
+	    if ( $this->lib_luma($darkColor) > $this->lib_luma($lightColor) ) {
+	        $t  = $lightColor;
+	        $lightColor = $darkColor;
+	        $darkColor  = $t;
+	    }
+
+	    $inputColor_alpha = $this->lib_alpha($inputColor);
+	    if ( ( $this->lib_luma($inputColor) * $inputColor_alpha) < $threshold) {
+	        return $lightColor;
+	    }
+	    return $darkColor;
+	}
+
+	protected function lib_luma($color) {
+	    $color = $this->coerceColor($color);
+	    return (0.2126 * $color[0] / 255) + (0.7152 * $color[1] / 255) + (0.0722 * $color[2] / 255);
+	}
+
+
+	public function assertColor($value, $error = "expected color value") {
+		$color = $this->coerceColor($value);
+		if (is_null($color)) $this->throwError($error);
+		return $color;
+	}
+
+	public function assertNumber($value, $error = "expecting number") {
+		if ($value[0] == "number") return $value[1];
+		$this->throwError($error);
+	}
+
+	public function assertArgs($value, $expectedArgs, $name="") {
+		if ($expectedArgs == 1) {
+			return $value;
+		} else {
+			if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list");
+			$values = $value[2];
+			$numValues = count($values);
+			if ($expectedArgs != $numValues) {
+				if ($name) {
+					$name = $name . ": ";
+				}
+
+				$this->throwError("${name}expecting $expectedArgs arguments, got $numValues");
+			}
+
+			return $values;
+		}
+	}
+
+	protected function toHSL($color) {
+		if ($color[0] == 'hsl') return $color;
+
+		$r = $color[1] / 255;
+		$g = $color[2] / 255;
+		$b = $color[3] / 255;
+
+		$min = min($r, $g, $b);
+		$max = max($r, $g, $b);
+
+		$L = ($min + $max) / 2;
+		if ($min == $max) {
+			$S = $H = 0;
+		} else {
+			if ($L < 0.5)
+				$S = ($max - $min)/($max + $min);
+			else
+				$S = ($max - $min)/(2.0 - $max - $min);
+
+			if ($r == $max) $H = ($g - $b)/($max - $min);
+			elseif ($g == $max) $H = 2.0 + ($b - $r)/($max - $min);
+			elseif ($b == $max) $H = 4.0 + ($r - $g)/($max - $min);
+
+		}
+
+		$out = array('hsl',
+			($H < 0 ? $H + 6 : $H)*60,
+			$S*100,
+			$L*100,
+		);
+
+		if (count($color) > 4) $out[] = $color[4]; // copy alpha
+		return $out;
+	}
+
+	protected function toRGB_helper($comp, $temp1, $temp2) {
+		if ($comp < 0) $comp += 1.0;
+		elseif ($comp > 1) $comp -= 1.0;
+
+		if (6 * $comp < 1) return $temp1 + ($temp2 - $temp1) * 6 * $comp;
+		if (2 * $comp < 1) return $temp2;
+		if (3 * $comp < 2) return $temp1 + ($temp2 - $temp1)*((2/3) - $comp) * 6;
+
+		return $temp1;
+	}
+
+	/**
+	 * Converts a hsl array into a color value in rgb.
+	 * Expects H to be in range of 0 to 360, S and L in 0 to 100
+	 */
+	protected function toRGB($color) {
+		if ($color[0] == 'color') return $color;
+
+		$H = $color[1] / 360;
+		$S = $color[2] / 100;
+		$L = $color[3] / 100;
+
+		if ($S == 0) {
+			$r = $g = $b = $L;
+		} else {
+			$temp2 = $L < 0.5 ?
+				$L*(1.0 + $S) :
+				$L + $S - $L * $S;
+
+			$temp1 = 2.0 * $L - $temp2;
+
+			$r = $this->toRGB_helper($H + 1/3, $temp1, $temp2);
+			$g = $this->toRGB_helper($H, $temp1, $temp2);
+			$b = $this->toRGB_helper($H - 1/3, $temp1, $temp2);
+		}
+
+		// $out = array('color', round($r*255), round($g*255), round($b*255));
+		$out = array('color', $r*255, $g*255, $b*255);
+		if (count($color) > 4) $out[] = $color[4]; // copy alpha
+		return $out;
+	}
+
+	protected function clamp($v, $max = 1, $min = 0) {
+		return min($max, max($min, $v));
+	}
+
+	/**
+	 * Convert the rgb, rgba, hsl color literals of function type
+	 * as returned by the parser into values of color type.
+	 */
+	protected function funcToColor($func) {
+		$fname = $func[1];
+		if ($func[2][0] != 'list') return false; // need a list of arguments
+		$rawComponents = $func[2][2];
+
+		if ($fname == 'hsl' || $fname == 'hsla') {
+			$hsl = array('hsl');
+			$i = 0;
+			foreach ($rawComponents as $c) {
+				$val = $this->reduce($c);
+				$val = isset($val[1]) ? floatval($val[1]) : 0;
+
+				if ($i == 0) $clamp = 360;
+				elseif ($i < 3) $clamp = 100;
+				else $clamp = 1;
+
+				$hsl[] = $this->clamp($val, $clamp);
+				$i++;
+			}
+
+			while (count($hsl) < 4) $hsl[] = 0;
+			return $this->toRGB($hsl);
+
+		} elseif ($fname == 'rgb' || $fname == 'rgba') {
+			$components = array();
+			$i = 1;
+			foreach	($rawComponents as $c) {
+				$c = $this->reduce($c);
+				if ($i < 4) {
+					if ($c[0] == "number" && $c[2] == "%") {
+						$components[] = 255 * ($c[1] / 100);
+					} else {
+						$components[] = floatval($c[1]);
+					}
+				} elseif ($i == 4) {
+					if ($c[0] == "number" && $c[2] == "%") {
+						$components[] = 1.0 * ($c[1] / 100);
+					} else {
+						$components[] = floatval($c[1]);
+					}
+				} else break;
+
+				$i++;
+			}
+			while (count($components) < 3) $components[] = 0;
+			array_unshift($components, 'color');
+			return $this->fixColor($components);
+		}
+
+		return false;
+	}
+
+	protected function reduce($value, $forExpression = false) {
+		switch ($value[0]) {
+		case "interpolate":
+			$reduced = $this->reduce($value[1]);
+			$var = $this->compileValue($reduced);
+			$res = $this->reduce(array("variable", $this->vPrefix . $var));
+
+			if ($res[0] == "raw_color") {
+				$res = $this->coerceColor($res);
+			}
+
+			if (empty($value[2])) $res = $this->lib_e($res);
+
+			return $res;
+		case "variable":
+			$key = $value[1];
+			if (is_array($key)) {
+				$key = $this->reduce($key);
+				$key = $this->vPrefix . $this->compileValue($this->lib_e($key));
+			}
+
+			$seen =& $this->env->seenNames;
+
+			if (!empty($seen[$key])) {
+				$this->throwError("infinite loop detected: $key");
+			}
+
+			$seen[$key] = true;
+			$out = $this->reduce($this->get($key));
+			$seen[$key] = false;
+			return $out;
+		case "list":
+			foreach ($value[2] as &$item) {
+				$item = $this->reduce($item, $forExpression);
+			}
+			return $value;
+		case "expression":
+			return $this->evaluate($value);
+		case "string":
+			foreach ($value[2] as &$part) {
+				if (is_array($part)) {
+					$strip = $part[0] == "variable";
+					$part = $this->reduce($part);
+					if ($strip) $part = $this->lib_e($part);
+				}
+			}
+			return $value;
+		case "escape":
+			list(,$inner) = $value;
+			return $this->lib_e($this->reduce($inner));
+		case "function":
+			$color = $this->funcToColor($value);
+			if ($color) return $color;
+
+			list(, $name, $args) = $value;
+			if ($name == "%") $name = "_sprintf";
+
+			$f = isset($this->libFunctions[$name]) ?
+				$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));
+
+			if (is_callable($f)) {
+				if ($args[0] == 'list')
+					$args = self::compressList($args[2], $args[1]);
+
+				$ret = call_user_func($f, $this->reduce($args, true), $this);
+
+				if (is_null($ret)) {
+					return array("string", "", array(
+						$name, "(", $args, ")"
+					));
+				}
+
+				// convert to a typed value if the result is a php primitive
+				if (is_numeric($ret)) $ret = array('number', $ret, "");
+				elseif (!is_array($ret)) $ret = array('keyword', $ret);
+
+				return $ret;
+			}
+
+			// plain function, reduce args
+			$value[2] = $this->reduce($value[2]);
+			return $value;
+		case "unary":
+			list(, $op, $exp) = $value;
+			$exp = $this->reduce($exp);
+
+			if ($exp[0] == "number") {
+				switch ($op) {
+				case "+":
+					return $exp;
+				case "-":
+					$exp[1] *= -1;
+					return $exp;
+				}
+			}
+			return array("string", "", array($op, $exp));
+		}
+
+		if ($forExpression) {
+			switch ($value[0]) {
+			case "keyword":
+				if ($color = $this->coerceColor($value)) {
+					return $color;
+				}
+				break;
+			case "raw_color":
+				return $this->coerceColor($value);
+			}
+		}
+
+		return $value;
+	}
+
+
+	// coerce a value for use in color operation
+	protected function coerceColor($value) {
+		switch($value[0]) {
+			case 'color': return $value;
+			case 'raw_color':
+				$c = array("color", 0, 0, 0);
+				$colorStr = substr($value[1], 1);
+				$num = hexdec($colorStr);
+				$width = strlen($colorStr) == 3 ? 16 : 256;
+
+				for ($i = 3; $i > 0; $i--) { // 3 2 1
+					$t = $num % $width;
+					$num /= $width;
+
+					$c[$i] = $t * (256/$width) + $t * floor(16/$width);
+				}
+
+				return $c;
+			case 'keyword':
+				$name = $value[1];
+				if (isset(self::$cssColors[$name])) {
+					$rgba = explode(',', self::$cssColors[$name]);
+
+					if(isset($rgba[3]))
+						return array('color', $rgba[0], $rgba[1], $rgba[2], $rgba[3]);
+
+					return array('color', $rgba[0], $rgba[1], $rgba[2]);
+				}
+				return null;
+		}
+	}
+
+	// make something string like into a string
+	protected function coerceString($value) {
+		switch ($value[0]) {
+		case "string":
+			return $value;
+		case "keyword":
+			return array("string", "", array($value[1]));
+		}
+		return null;
+	}
+
+	// turn list of length 1 into value type
+	protected function flattenList($value) {
+		if ($value[0] == "list" && count($value[2]) == 1) {
+			return $this->flattenList($value[2][0]);
+		}
+		return $value;
+	}
+
+	public function toBool($a) {
+		if ($a) return self::$TRUE;
+		else return self::$FALSE;
+	}
+
+	// evaluate an expression
+	protected function evaluate($exp) {
+		list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp;
+
+		$left = $this->reduce($left, true);
+		$right = $this->reduce($right, true);
+
+		if ($leftColor = $this->coerceColor($left)) {
+			$left = $leftColor;
+		}
+
+		if ($rightColor = $this->coerceColor($right)) {
+			$right = $rightColor;
+		}
+
+		$ltype = $left[0];
+		$rtype = $right[0];
+
+		// operators that work on all types
+		if ($op == "and") {
+			return $this->toBool($left == self::$TRUE && $right == self::$TRUE);
+		}
+
+		if ($op == "=") {
+			return $this->toBool($this->eq($left, $right) );
+		}
+
+		if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right))) {
+			return $str;
+		}
+
+		// type based operators
+		$fname = "op_${ltype}_${rtype}";
+		if (is_callable(array($this, $fname))) {
+			$out = $this->$fname($op, $left, $right);
+			if (!is_null($out)) return $out;
+		}
+
+		// make the expression look it did before being parsed
+		$paddedOp = $op;
+		if ($whiteBefore) $paddedOp = " " . $paddedOp;
+		if ($whiteAfter) $paddedOp .= " ";
+
+		return array("string", "", array($left, $paddedOp, $right));
+	}
+
+	protected function stringConcatenate($left, $right) {
+		if ($strLeft = $this->coerceString($left)) {
+			if ($right[0] == "string") {
+				$right[1] = "";
+			}
+			$strLeft[2][] = $right;
+			return $strLeft;
+		}
+
+		if ($strRight = $this->coerceString($right)) {
+			array_unshift($strRight[2], $left);
+			return $strRight;
+		}
+	}
+
+
+	// make sure a color's components don't go out of bounds
+	protected function fixColor($c) {
+		foreach (range(1, 3) as $i) {
+			if ($c[$i] < 0) $c[$i] = 0;
+			if ($c[$i] > 255) $c[$i] = 255;
+		}
+
+		return $c;
+	}
+
+	protected function op_number_color($op, $lft, $rgt) {
+		if ($op == '+' || $op == '*') {
+			return $this->op_color_number($op, $rgt, $lft);
+		}
+	}
+
+	protected function op_color_number($op, $lft, $rgt) {
+		if ($rgt[0] == '%') $rgt[1] /= 100;
+
+		return $this->op_color_color($op, $lft,
+			array_fill(1, count($lft) - 1, $rgt[1]));
+	}
+
+	protected function op_color_color($op, $left, $right) {
+		$out = array('color');
+		$max = count($left) > count($right) ? count($left) : count($right);
+		foreach (range(1, $max - 1) as $i) {
+			$lval = isset($left[$i]) ? $left[$i] : 0;
+			$rval = isset($right[$i]) ? $right[$i] : 0;
+			switch ($op) {
+			case '+':
+				$out[] = $lval + $rval;
+				break;
+			case '-':
+				$out[] = $lval - $rval;
+				break;
+			case '*':
+				$out[] = $lval * $rval;
+				break;
+			case '%':
+				$out[] = $lval % $rval;
+				break;
+			case '/':
+				if ($rval == 0) $this->throwError("evaluate error: can't divide by zero");
+				$out[] = $lval / $rval;
+				break;
+			default:
+				$this->throwError('evaluate error: color op number failed on op '.$op);
+			}
+		}
+		return $this->fixColor($out);
+	}
+
+	function lib_red($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for red()');
+		}
+
+		return $color[1];
+	}
+
+	function lib_green($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for green()');
+		}
+
+		return $color[2];
+	}
+
+	function lib_blue($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for blue()');
+		}
+
+		return $color[3];
+	}
+
+
+	// operator on two numbers
+	protected function op_number_number($op, $left, $right) {
+		$unit = empty($left[2]) ? $right[2] : $left[2];
+
+		$value = 0;
+		switch ($op) {
+		case '+':
+			$value = $left[1] + $right[1];
+			break;
+		case '*':
+			$value = $left[1] * $right[1];
+			break;
+		case '-':
+			$value = $left[1] - $right[1];
+			break;
+		case '%':
+			$value = $left[1] % $right[1];
+			break;
+		case '/':
+			if ($right[1] == 0) $this->throwError('parse error: divide by zero');
+			$value = $left[1] / $right[1];
+			break;
+		case '<':
+			return $this->toBool($left[1] < $right[1]);
+		case '>':
+			return $this->toBool($left[1] > $right[1]);
+		case '>=':
+			return $this->toBool($left[1] >= $right[1]);
+		case '=<':
+			return $this->toBool($left[1] <= $right[1]);
+		default:
+			$this->throwError('parse error: unknown number operator: '.$op);
+		}
+
+		return array("number", $value, $unit);
+	}
+
+
+	/* environment functions */
+
+	protected function makeOutputBlock($type, $selectors = null) {
+		$b = new stdclass;
+		$b->lines = array();
+		$b->children = array();
+		$b->selectors = $selectors;
+		$b->type = $type;
+		$b->parent = $this->scope;
+		return $b;
+	}
+
+	// the state of execution
+	protected function pushEnv($block = null) {
+		$e = new stdclass;
+		$e->parent = $this->env;
+		$e->store = array();
+		$e->block = $block;
+
+		$this->env = $e;
+		return $e;
+	}
+
+	// pop something off the stack
+	protected function popEnv() {
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
+
+	// set something in the current env
+	protected function set($name, $value) {
+		$this->env->store[$name] = $value;
+	}
+
+
+	// get the highest occurrence entry for a name
+	protected function get($name) {
+		$current = $this->env;
+
+		$isArguments = $name == $this->vPrefix . 'arguments';
+		while ($current) {
+			if ($isArguments && isset($current->arguments)) {
+				return array('list', ' ', $current->arguments);
+			}
+
+			if (isset($current->store[$name]))
+				return $current->store[$name];
+			else {
+				$current = isset($current->storeParent) ?
+					$current->storeParent : $current->parent;
+			}
+		}
+
+		$this->throwError("variable $name is undefined");
+	}
+
+	// inject array of unparsed strings into environment as variables
+	protected function injectVariables($args) {
+		$this->pushEnv();
+		$parser = new lessc_parser($this, __METHOD__);
+		foreach ($args as $name => $strValue) {
+			if ($name{0} != '@') $name = '@'.$name;
+			$parser->count = 0;
+			$parser->buffer = (string)$strValue;
+			if (!$parser->propertyValue($value)) {
+				throw new Exception("failed to parse passed in variable $name: $strValue");
+			}
+
+			$this->set($name, $value);
+		}
+	}
+
+	/**
+	 * Initialize any static state, can initialize parser for a file
+	 * $opts isn't used yet
+	 */
+	public function __construct($fname = null) {
+		if ($fname !== null) {
+			// used for deprecated parse method
+			$this->_parseFile = $fname;
+		}
+	}
+
+	public function compile($string, $name = null) {
+		$locale = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, "C");
+
+		$this->parser = $this->makeParser($name);
+		$root = $this->parser->parse($string);
+
+		$this->env = null;
+		$this->scope = null;
+
+		$this->formatter = $this->newFormatter();
+
+		if (!empty($this->registeredVars)) {
+			$this->injectVariables($this->registeredVars);
+		}
+
+		$this->sourceParser = $this->parser; // used for error messages
+		$this->compileBlock($root);
+
+		ob_start();
+		$this->formatter->block($this->scope);
+		$out = ob_get_clean();
+		setlocale(LC_NUMERIC, $locale);
+		return $out;
+	}
+
+	public function compileFile($fname, $outFname = null) {
+		if (!is_readable($fname)) {
+			throw new Exception('load error: failed to find '.$fname);
+		}
+
+		$pi = pathinfo($fname);
+
+		$oldImport = $this->importDir;
+
+		$this->importDir = (array)$this->importDir;
+		$this->importDir[] = $pi['dirname'].'/';
+
+		$this->addParsedFile($fname);
+
+		$out = $this->compile(file_get_contents($fname), $fname);
+
+		$this->importDir = $oldImport;
+
+		if ($outFname !== null) {
+			return file_put_contents($outFname, $out);
+		}
+
+		return $out;
+	}
+
+	// compile only if changed input has changed or output doesn't exist
+	public function checkedCompile($in, $out) {
+		if (!is_file($out) || filemtime($in) > filemtime($out)) {
+			$this->compileFile($in, $out);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Execute lessphp on a .less file or a lessphp cache structure
+	 *
+	 * The lessphp cache structure contains information about a specific
+	 * less file having been parsed. It can be used as a hint for future
+	 * calls to determine whether or not a rebuild is required.
+	 *
+	 * The cache structure contains two important keys that may be used
+	 * externally:
+	 *
+	 * compiled: The final compiled CSS
+	 * updated: The time (in seconds) the CSS was last compiled
+	 *
+	 * The cache structure is a plain-ol' PHP associative array and can
+	 * be serialized and unserialized without a hitch.
+	 *
+	 * @param mixed $in Input
+	 * @param bool $force Force rebuild?
+	 * @return array lessphp cache structure
+	 */
+	public function cachedCompile($in, $force = false) {
+		// assume no root
+		$root = null;
+
+		if (is_string($in)) {
+			$root = $in;
+		} elseif (is_array($in) and isset($in['root'])) {
+			if ($force or ! isset($in['files'])) {
+				// If we are forcing a recompile or if for some reason the
+				// structure does not contain any file information we should
+				// specify the root to trigger a rebuild.
+				$root = $in['root'];
+			} elseif (isset($in['files']) and is_array($in['files'])) {
+				foreach ($in['files'] as $fname => $ftime ) {
+					if (!file_exists($fname) or filemtime($fname) > $ftime) {
+						// One of the files we knew about previously has changed
+						// so we should look at our incoming root again.
+						$root = $in['root'];
+						break;
+					}
+				}
+			}
+		} else {
+			// TODO: Throw an exception? We got neither a string nor something
+			// that looks like a compatible lessphp cache structure.
+			return null;
+		}
+
+		if ($root !== null) {
+			// If we have a root value which means we should rebuild.
+			$out = array();
+			$out['root'] = $root;
+			$out['compiled'] = $this->compileFile($root);
+			$out['files'] = $this->allParsedFiles();
+			$out['updated'] = time();
+			return $out;
+		} else {
+			// No changes, pass back the structure
+			// we were given initially.
+			return $in;
+		}
+
+	}
+
+	// parse and compile buffer
+	// This is deprecated
+	public function parse($str = null, $initialVariables = null) {
+		if (is_array($str)) {
+			$initialVariables = $str;
+			$str = null;
+		}
+
+		$oldVars = $this->registeredVars;
+		if ($initialVariables !== null) {
+			$this->setVariables($initialVariables);
+		}
+
+		if ($str == null) {
+			if (empty($this->_parseFile)) {
+				throw new exception("nothing to parse");
+			}
+
+			$out = $this->compileFile($this->_parseFile);
+		} else {
+			$out = $this->compile($str);
+		}
+
+		$this->registeredVars = $oldVars;
+		return $out;
+	}
+
+	protected function makeParser($name) {
+		$parser = new lessc_parser($this, $name);
+		$parser->writeComments = $this->preserveComments;
+
+		return $parser;
+	}
+
+	public function setFormatter($name) {
+		$this->formatterName = $name;
+	}
+
+	protected function newFormatter() {
+		$className = "lessc_formatter_lessjs";
+		if (!empty($this->formatterName)) {
+			if (!is_string($this->formatterName))
+				return $this->formatterName;
+			$className = "lessc_formatter_$this->formatterName";
+		}
+
+		return new $className;
+	}
+
+	public function setPreserveComments($preserve) {
+		$this->preserveComments = $preserve;
+	}
+
+	public function registerFunction($name, $func) {
+		$this->libFunctions[$name] = $func;
+	}
+
+	public function unregisterFunction($name) {
+		unset($this->libFunctions[$name]);
+	}
+
+	public function setVariables($variables) {
+		$this->registeredVars = array_merge($this->registeredVars, $variables);
+	}
+
+	public function unsetVariable($name) {
+		unset($this->registeredVars[$name]);
+	}
+
+	public function setImportDir($dirs) {
+		$this->importDir = (array)$dirs;
+	}
+
+	public function addImportDir($dir) {
+		$this->importDir = (array)$this->importDir;
+		$this->importDir[] = $dir;
+	}
+
+	public function allParsedFiles() {
+		return $this->allParsedFiles;
+	}
+
+	public function addParsedFile($file) {
+		$this->allParsedFiles[realpath($file)] = filemtime($file);
+	}
+
+	/**
+	 * Uses the current value of $this->count to show line and line number
+	 */
+	public function throwError($msg = null) {
+		if ($this->sourceLoc >= 0) {
+			$this->sourceParser->throwError($msg, $this->sourceLoc);
+		}
+		throw new exception($msg);
+	}
+
+	// compile file $in to file $out if $in is newer than $out
+	// returns true when it compiles, false otherwise
+	public static function ccompile($in, $out, $less = null) {
+		if ($less === null) {
+			$less = new self;
+		}
+		return $less->checkedCompile($in, $out);
+	}
+
+	public static function cexecute($in, $force = false, $less = null) {
+		if ($less === null) {
+			$less = new self;
+		}
+		return $less->cachedCompile($in, $force);
+	}
+
+	static protected $cssColors = array(
+		'aliceblue' => '240,248,255',
+		'antiquewhite' => '250,235,215',
+		'aqua' => '0,255,255',
+		'aquamarine' => '127,255,212',
+		'azure' => '240,255,255',
+		'beige' => '245,245,220',
+		'bisque' => '255,228,196',
+		'black' => '0,0,0',
+		'blanchedalmond' => '255,235,205',
+		'blue' => '0,0,255',
+		'blueviolet' => '138,43,226',
+		'brown' => '165,42,42',
+		'burlywood' => '222,184,135',
+		'cadetblue' => '95,158,160',
+		'chartreuse' => '127,255,0',
+		'chocolate' => '210,105,30',
+		'coral' => '255,127,80',
+		'cornflowerblue' => '100,149,237',
+		'cornsilk' => '255,248,220',
+		'crimson' => '220,20,60',
+		'cyan' => '0,255,255',
+		'darkblue' => '0,0,139',
+		'darkcyan' => '0,139,139',
+		'darkgoldenrod' => '184,134,11',
+		'darkgray' => '169,169,169',
+		'darkgreen' => '0,100,0',
+		'darkgrey' => '169,169,169',
+		'darkkhaki' => '189,183,107',
+		'darkmagenta' => '139,0,139',
+		'darkolivegreen' => '85,107,47',
+		'darkorange' => '255,140,0',
+		'darkorchid' => '153,50,204',
+		'darkred' => '139,0,0',
+		'darksalmon' => '233,150,122',
+		'darkseagreen' => '143,188,143',
+		'darkslateblue' => '72,61,139',
+		'darkslategray' => '47,79,79',
+		'darkslategrey' => '47,79,79',
+		'darkturquoise' => '0,206,209',
+		'darkviolet' => '148,0,211',
+		'deeppink' => '255,20,147',
+		'deepskyblue' => '0,191,255',
+		'dimgray' => '105,105,105',
+		'dimgrey' => '105,105,105',
+		'dodgerblue' => '30,144,255',
+		'firebrick' => '178,34,34',
+		'floralwhite' => '255,250,240',
+		'forestgreen' => '34,139,34',
+		'fuchsia' => '255,0,255',
+		'gainsboro' => '220,220,220',
+		'ghostwhite' => '248,248,255',
+		'gold' => '255,215,0',
+		'goldenrod' => '218,165,32',
+		'gray' => '128,128,128',
+		'green' => '0,128,0',
+		'greenyellow' => '173,255,47',
+		'grey' => '128,128,128',
+		'honeydew' => '240,255,240',
+		'hotpink' => '255,105,180',
+		'indianred' => '205,92,92',
+		'indigo' => '75,0,130',
+		'ivory' => '255,255,240',
+		'khaki' => '240,230,140',
+		'lavender' => '230,230,250',
+		'lavenderblush' => '255,240,245',
+		'lawngreen' => '124,252,0',
+		'lemonchiffon' => '255,250,205',
+		'lightblue' => '173,216,230',
+		'lightcoral' => '240,128,128',
+		'lightcyan' => '224,255,255',
+		'lightgoldenrodyellow' => '250,250,210',
+		'lightgray' => '211,211,211',
+		'lightgreen' => '144,238,144',
+		'lightgrey' => '211,211,211',
+		'lightpink' => '255,182,193',
+		'lightsalmon' => '255,160,122',
+		'lightseagreen' => '32,178,170',
+		'lightskyblue' => '135,206,250',
+		'lightslategray' => '119,136,153',
+		'lightslategrey' => '119,136,153',
+		'lightsteelblue' => '176,196,222',
+		'lightyellow' => '255,255,224',
+		'lime' => '0,255,0',
+		'limegreen' => '50,205,50',
+		'linen' => '250,240,230',
+		'magenta' => '255,0,255',
+		'maroon' => '128,0,0',
+		'mediumaquamarine' => '102,205,170',
+		'mediumblue' => '0,0,205',
+		'mediumorchid' => '186,85,211',
+		'mediumpurple' => '147,112,219',
+		'mediumseagreen' => '60,179,113',
+		'mediumslateblue' => '123,104,238',
+		'mediumspringgreen' => '0,250,154',
+		'mediumturquoise' => '72,209,204',
+		'mediumvioletred' => '199,21,133',
+		'midnightblue' => '25,25,112',
+		'mintcream' => '245,255,250',
+		'mistyrose' => '255,228,225',
+		'moccasin' => '255,228,181',
+		'navajowhite' => '255,222,173',
+		'navy' => '0,0,128',
+		'oldlace' => '253,245,230',
+		'olive' => '128,128,0',
+		'olivedrab' => '107,142,35',
+		'orange' => '255,165,0',
+		'orangered' => '255,69,0',
+		'orchid' => '218,112,214',
+		'palegoldenrod' => '238,232,170',
+		'palegreen' => '152,251,152',
+		'paleturquoise' => '175,238,238',
+		'palevioletred' => '219,112,147',
+		'papayawhip' => '255,239,213',
+		'peachpuff' => '255,218,185',
+		'peru' => '205,133,63',
+		'pink' => '255,192,203',
+		'plum' => '221,160,221',
+		'powderblue' => '176,224,230',
+		'purple' => '128,0,128',
+		'red' => '255,0,0',
+		'rosybrown' => '188,143,143',
+		'royalblue' => '65,105,225',
+		'saddlebrown' => '139,69,19',
+		'salmon' => '250,128,114',
+		'sandybrown' => '244,164,96',
+		'seagreen' => '46,139,87',
+		'seashell' => '255,245,238',
+		'sienna' => '160,82,45',
+		'silver' => '192,192,192',
+		'skyblue' => '135,206,235',
+		'slateblue' => '106,90,205',
+		'slategray' => '112,128,144',
+		'slategrey' => '112,128,144',
+		'snow' => '255,250,250',
+		'springgreen' => '0,255,127',
+		'steelblue' => '70,130,180',
+		'tan' => '210,180,140',
+		'teal' => '0,128,128',
+		'thistle' => '216,191,216',
+		'tomato' => '255,99,71',
+		'transparent' => '0,0,0,0',
+		'turquoise' => '64,224,208',
+		'violet' => '238,130,238',
+		'wheat' => '245,222,179',
+		'white' => '255,255,255',
+		'whitesmoke' => '245,245,245',
+		'yellow' => '255,255,0',
+		'yellowgreen' => '154,205,50'
+	);
+}
+
+// responsible for taking a string of LESS code and converting it into a
+// syntax tree
+class lessc_parser {
+	static protected $nextBlockId = 0; // used to uniquely identify blocks
+
+	static protected $precedence = array(
+		'=<' => 0,
+		'>=' => 0,
+		'=' => 0,
+		'<' => 0,
+		'>' => 0,
+
+		'+' => 1,
+		'-' => 1,
+		'*' => 2,
+		'/' => 2,
+		'%' => 2,
+	);
+
+	static protected $whitePattern;
+	static protected $commentMulti;
+
+	static protected $commentSingle = "//";
+	static protected $commentMultiLeft = "/*";
+	static protected $commentMultiRight = "*/";
+
+	// regex string to match any of the operators
+	static protected $operatorString;
+
+	// these properties will supress division unless it's inside parenthases
+	static protected $supressDivisionProps =
+		array('/border-radius$/i', '/^font$/i');
+
+	protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport");
+	protected $lineDirectives = array("charset");
+
+	/**
+	 * if we are in parens we can be more liberal with whitespace around
+	 * operators because it must evaluate to a single value and thus is less
+	 * ambiguous.
+	 *
+	 * Consider:
+	 *     property1: 10 -5; // is two numbers, 10 and -5
+	 *     property2: (10 -5); // should evaluate to 5
+	 */
+	protected $inParens = false;
+
+	// caches preg escaped literals
+	static protected $literalCache = array();
+
+	public function __construct($lessc, $sourceName = null) {
+		$this->eatWhiteDefault = true;
+		// reference to less needed for vPrefix, mPrefix, and parentSelector
+		$this->lessc = $lessc;
+
+		$this->sourceName = $sourceName; // name used for error messages
+
+		$this->writeComments = false;
+
+		if (!self::$operatorString) {
+			self::$operatorString =
+				'('.implode('|', array_map(array('lessc', 'preg_quote'),
+					array_keys(self::$precedence))).')';
+
+			$commentSingle = lessc::preg_quote(self::$commentSingle);
+			$commentMultiLeft = lessc::preg_quote(self::$commentMultiLeft);
+			$commentMultiRight = lessc::preg_quote(self::$commentMultiRight);
+
+			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
+			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+		}
+	}
+
+	public function parse($buffer) {
+		$this->count = 0;
+		$this->line = 1;
+
+		$this->env = null; // block stack
+		$this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
+		$this->pushSpecialBlock("root");
+		$this->eatWhiteDefault = true;
+		$this->seenComments = array();
+
+		// trim whitespace on head
+		// if (preg_match('/^\s+/', $this->buffer, $m)) {
+		// 	$this->line += substr_count($m[0], "\n");
+		// 	$this->buffer = ltrim($this->buffer);
+		// }
+		$this->whitespace();
+
+		// parse the entire file
+		while (false !== $this->parseChunk());
+
+		if ($this->count != strlen($this->buffer))
+			$this->throwError();
+
+		// TODO report where the block was opened
+		if ( !property_exists($this->env, 'parent') || !is_null($this->env->parent) )
+			throw new exception('parse error: unclosed block');
+
+		return $this->env;
+	}
+
+	/**
+	 * Parse a single chunk off the head of the buffer and append it to the
+	 * current parse environment.
+	 * Returns false when the buffer is empty, or when there is an error.
+	 *
+	 * This function is called repeatedly until the entire document is
+	 * parsed.
+	 *
+	 * This parser is most similar to a recursive descent parser. Single
+	 * functions represent discrete grammatical rules for the language, and
+	 * they are able to capture the text that represents those rules.
+	 *
+	 * Consider the function lessc::keyword(). (all parse functions are
+	 * structured the same)
+	 *
+	 * The function takes a single reference argument. When calling the
+	 * function it will attempt to match a keyword on the head of the buffer.
+	 * If it is successful, it will place the keyword in the referenced
+	 * argument, advance the position in the buffer, and return true. If it
+	 * fails then it won't advance the buffer and it will return false.
+	 *
+	 * All of these parse functions are powered by lessc::match(), which behaves
+	 * the same way, but takes a literal regular expression. Sometimes it is
+	 * more convenient to use match instead of creating a new function.
+	 *
+	 * Because of the format of the functions, to parse an entire string of
+	 * grammatical rules, you can chain them together using &&.
+	 *
+	 * But, if some of the rules in the chain succeed before one fails, then
+	 * the buffer position will be left at an invalid state. In order to
+	 * avoid this, lessc::seek() is used to remember and set buffer positions.
+	 *
+	 * Before parsing a chain, use $s = $this->seek() to remember the current
+	 * position into $s. Then if a chain fails, use $this->seek($s) to
+	 * go back where we started.
+	 */
+	protected function parseChunk() {
+		if (empty($this->buffer)) return false;
+		$s = $this->seek();
+
+		if ($this->whitespace()) {
+			return true;
+		}
+
+		// setting a property
+		if ($this->keyword($key) && $this->assign() &&
+			$this->propertyValue($value, $key) && $this->end())
+		{
+			$this->append(array('assign', $key, $value), $s);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+
+		// look for special css blocks
+		if ($this->literal('@', false)) {
+			$this->count--;
+
+			// media
+			if ($this->literal('@media')) {
+				if (($this->mediaQueryList($mediaQueries) || true)
+					&& $this->literal('{'))
+				{
+					$media = $this->pushSpecialBlock("media");
+					$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+					return true;
+				} else {
+					$this->seek($s);
+					return false;
+				}
+			}
+
+			if ($this->literal("@", false) && $this->keyword($dirName)) {
+				if ($this->isDirective($dirName, $this->blockDirectives)) {
+					if (($this->openString("{", $dirValue, null, array(";")) || true) &&
+						$this->literal("{"))
+					{
+						$dir = $this->pushSpecialBlock("directive");
+						$dir->name = $dirName;
+						if (isset($dirValue)) $dir->value = $dirValue;
+						return true;
+					}
+				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
+					if ($this->propertyValue($dirValue) && $this->end()) {
+						$this->append(array("directive", $dirName, $dirValue));
+						return true;
+					}
+				}
+			}
+
+			$this->seek($s);
+		}
+
+		// setting a variable
+		if ($this->variable($var) && $this->assign() &&
+			$this->propertyValue($value) && $this->end())
+		{
+			$this->append(array('assign', $var, $value), $s);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		if ($this->import($importValue)) {
+			$this->append($importValue, $s);
+			return true;
+		}
+
+		// opening parametric mixin
+		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
+			($this->guards($guards) || true) &&
+			$this->literal('{'))
+		{
+			$block = $this->pushBlock($this->fixTags(array($tag)));
+			$block->args = $args;
+			$block->isVararg = $isVararg;
+			if (!empty($guards)) $block->guards = $guards;
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// opening a simple block
+		if ($this->tags($tags) && $this->literal('{', false)) {
+			$tags = $this->fixTags($tags);
+			$this->pushBlock($tags);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// closing a block
+		if ($this->literal('}', false)) {
+			try {
+				$block = $this->pop();
+			} catch (exception $e) {
+				$this->seek($s);
+				$this->throwError($e->getMessage());
+			}
+
+			$hidden = false;
+			if (is_null($block->type)) {
+				$hidden = true;
+				if (!isset($block->args)) {
+					foreach ($block->tags as $tag) {
+						if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+							$hidden = false;
+							break;
+						}
+					}
+				}
+
+				foreach ($block->tags as $tag) {
+					if (is_string($tag)) {
+						$this->env->children[$tag][] = $block;
+					}
+				}
+			}
+
+			if (!$hidden) {
+				$this->append(array('block', $block), $s);
+			}
+
+			// this is done here so comments aren't bundled into he block that
+			// was just closed
+			$this->whitespace();
+			return true;
+		}
+
+		// mixin
+		if ($this->mixinTags($tags) &&
+			($this->argumentDef($argv, $isVararg) || true) &&
+			($this->keyword($suffix) || true) && $this->end())
+		{
+			$tags = $this->fixTags($tags);
+			$this->append(array('mixin', $tags, $argv, $suffix), $s);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// spare ;
+		if ($this->literal(';')) return true;
+
+		return false; // got nothing, throw error
+	}
+
+	protected function isDirective($dirname, $directives) {
+		// TODO: cache pattern in parser
+		$pattern = implode("|",
+			array_map(array("lessc", "preg_quote"), $directives));
+		$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
+
+		return preg_match($pattern, $dirname);
+	}
+
+	protected function fixTags($tags) {
+		// move @ tags out of variable namespace
+		foreach ($tags as &$tag) {
+			if ($tag{0} == $this->lessc->vPrefix)
+				$tag[0] = $this->lessc->mPrefix;
+		}
+		return $tags;
+	}
+
+	// a list of expressions
+	protected function expressionList(&$exps) {
+		$values = array();
+
+		while ($this->expression($exp)) {
+			$values[] = $exp;
+		}
+
+		if (count($values) == 0) return false;
+
+		$exps = lessc::compressList($values, ' ');
+		return true;
+	}
+
+	/**
+	 * Attempt to consume an expression.
+	 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+	 */
+	protected function expression(&$out) {
+		if ($this->value($lhs)) {
+			$out = $this->expHelper($lhs, 0);
+
+			// look for / shorthand
+			if (!empty($this->env->supressedDivision)) {
+				unset($this->env->supressedDivision);
+				$s = $this->seek();
+				if ($this->literal("/") && $this->value($rhs)) {
+					$out = array("list", "",
+						array($out, array("keyword", "/"), $rhs));
+				} else {
+					$this->seek($s);
+				}
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * recursively parse infix equation with $lhs at precedence $minP
+	 */
+	protected function expHelper($lhs, $minP) {
+		$this->inExp = true;
+		$ss = $this->seek();
+
+		while (true) {
+			$whiteBefore = isset($this->buffer[$this->count - 1]) &&
+				ctype_space($this->buffer[$this->count - 1]);
+
+			// If there is whitespace before the operator, then we require
+			// whitespace after the operator for it to be an expression
+			$needWhite = $whiteBefore && !$this->inParens;
+
+			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+					foreach (self::$supressDivisionProps as $pattern) {
+						if (preg_match($pattern, $this->env->currentProperty)) {
+							$this->env->supressedDivision = true;
+							break 2;
+						}
+					}
+				}
+
+
+				$whiteAfter = isset($this->buffer[$this->count - 1]) &&
+					ctype_space($this->buffer[$this->count - 1]);
+
+				if (!$this->value($rhs)) break;
+
+				// peek for next operator to see what to do with rhs
+				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
+					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+				}
+
+				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+				$ss = $this->seek();
+
+				continue;
+			}
+
+			break;
+		}
+
+		$this->seek($ss);
+
+		return $lhs;
+	}
+
+	// consume a list of values for a property
+	public function propertyValue(&$value, $keyName = null) {
+		$values = array();
+
+		if ($keyName !== null) $this->env->currentProperty = $keyName;
+
+		$s = null;
+		while ($this->expressionList($v)) {
+			$values[] = $v;
+			$s = $this->seek();
+			if (!$this->literal(',')) break;
+		}
+
+		if ($s) $this->seek($s);
+
+		if ($keyName !== null) unset($this->env->currentProperty);
+
+		if (count($values) == 0) return false;
+
+		$value = lessc::compressList($values, ', ');
+		return true;
+	}
+
+	protected function parenValue(&$out) {
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+			return false;
+		}
+
+		$inParens = $this->inParens;
+		if ($this->literal("(") &&
+			($this->inParens = true) && $this->expression($exp) &&
+			$this->literal(")"))
+		{
+			$out = $exp;
+			$this->inParens = $inParens;
+			return true;
+		} else {
+			$this->inParens = $inParens;
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+	// a single value
+	protected function value(&$value) {
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+			// negation
+			if ($this->literal("-", false) &&
+				(($this->variable($inner) && $inner = array("variable", $inner)) ||
+				$this->unit($inner) ||
+				$this->parenValue($inner)))
+			{
+				$value = array("unary", "-", $inner);
+				return true;
+			} else {
+				$this->seek($s);
+			}
+		}
+
+		if ($this->parenValue($value)) return true;
+		if ($this->unit($value)) return true;
+		if ($this->color($value)) return true;
+		if ($this->func($value)) return true;
+		if ($this->string($value)) return true;
+
+		if ($this->keyword($word)) {
+			$value = array('keyword', $word);
+			return true;
+		}
+
+		// try a variable
+		if ($this->variable($var)) {
+			$value = array('variable', $var);
+			return true;
+		}
+
+		// unquote string (should this work on any type?
+		if ($this->literal("~") && $this->string($str)) {
+			$value = array("escape", $str);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// css hack: \0
+		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
+			$value = array('keyword', '\\'.$m[1]);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+	// an import statement
+	protected function import(&$out) {
+		if (!$this->literal('@import')) return false;
+
+		// @import "something.css" media;
+		// @import url("something.css") media;
+		// @import url(something.css) media;
+
+		if ($this->propertyValue($value)) {
+			$out = array("import", $value);
+			return true;
+		}
+	}
+
+	protected function mediaQueryList(&$out) {
+		if ($this->genericList($list, "mediaQuery", ",", false)) {
+			$out = $list[2];
+			return true;
+		}
+		return false;
+	}
+
+	protected function mediaQuery(&$out) {
+		$s = $this->seek();
+
+		$expressions = null;
+		$parts = array();
+
+		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
+			$prop = array("mediaType");
+			if (isset($only)) $prop[] = "only";
+			if (isset($not)) $prop[] = "not";
+			$prop[] = $mediaType;
+			$parts[] = $prop;
+		} else {
+			$this->seek($s);
+		}
+
+
+		if (!empty($mediaType) && !$this->literal("and")) {
+			// ~
+		} else {
+			$this->genericList($expressions, "mediaExpression", "and", false);
+			if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
+		}
+
+		if (count($parts) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		$out = $parts;
+		return true;
+	}
+
+	protected function mediaExpression(&$out) {
+		$s = $this->seek();
+		$value = null;
+		if ($this->literal("(") &&
+			$this->keyword($feature) &&
+			($this->literal(":") && $this->expression($value) || true) &&
+			$this->literal(")"))
+		{
+			$out = array("mediaExp", $feature);
+			if ($value) $out[] = $value;
+			return true;
+		} elseif ($this->variable($variable)) {
+			$out = array('variable', $variable);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	// an unbounded string stopped by $end
+	protected function openString($end, &$out, $nestingOpen=null, $rejectStrs = null) {
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		$stop = array("'", '"', "@{", $end);
+		$stop = array_map(array("lessc", "preg_quote"), $stop);
+		// $stop[] = self::$commentMulti;
+
+		if (!is_null($rejectStrs)) {
+			$stop = array_merge($stop, $rejectStrs);
+		}
+
+		$patt = '(.*?)('.implode("|", $stop).')';
+
+		$nestingLevel = 0;
+
+		$content = array();
+		while ($this->match($patt, $m, false)) {
+			if (!empty($m[1])) {
+				$content[] = $m[1];
+				if ($nestingOpen) {
+					$nestingLevel += substr_count($m[1], $nestingOpen);
+				}
+			}
+
+			$tok = $m[2];
+
+			$this->count-= strlen($tok);
+			if ($tok == $end) {
+				if ($nestingLevel == 0) {
+					break;
+				} else {
+					$nestingLevel--;
+				}
+			}
+
+			if (($tok == "'" || $tok == '"') && $this->string($str)) {
+				$content[] = $str;
+				continue;
+			}
+
+			if ($tok == "@{" && $this->interpolation($inter)) {
+				$content[] = $inter;
+				continue;
+			}
+
+			if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
+				break;
+			}
+
+			$content[] = $tok;
+			$this->count+= strlen($tok);
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if (count($content) == 0) return false;
+
+		// trim the end
+		if (is_string(end($content))) {
+			$content[count($content) - 1] = rtrim(end($content));
+		}
+
+		$out = array("string", "", $content);
+		return true;
+	}
+
+	protected function string(&$out) {
+		$s = $this->seek();
+		if ($this->literal('"', false)) {
+			$delim = '"';
+		} elseif ($this->literal("'", false)) {
+			$delim = "'";
+		} else {
+			return false;
+		}
+
+		$content = array();
+
+		// look for either ending delim , escape, or string interpolation
+		$patt = '([^\n]*?)(@\{|\\\\|' .
+			lessc::preg_quote($delim).')';
+
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		while ($this->match($patt, $m, false)) {
+			$content[] = $m[1];
+			if ($m[2] == "@{") {
+				$this->count -= strlen($m[2]);
+				if ($this->interpolation($inter, false)) {
+					$content[] = $inter;
+				} else {
+					$this->count += strlen($m[2]);
+					$content[] = "@{"; // ignore it
+				}
+			} elseif ($m[2] == '\\') {
+				$content[] = $m[2];
+				if ($this->literal($delim, false)) {
+					$content[] = $delim;
+				}
+			} else {
+				$this->count -= strlen($delim);
+				break; // delim
+			}
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if ($this->literal($delim)) {
+			$out = array("string", $delim, $content);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	protected function interpolation(&$out) {
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = true;
+
+		$s = $this->seek();
+		if ($this->literal("@{") &&
+			$this->openString("}", $interp, null, array("'", '"', ";")) &&
+			$this->literal("}", false))
+		{
+			$out = array("interpolate", $interp);
+			$this->eatWhiteDefault = $oldWhite;
+			if ($this->eatWhiteDefault) $this->whitespace();
+			return true;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		$this->seek($s);
+		return false;
+	}
+
+	protected function unit(&$unit) {
+		// speed shortcut
+		if (isset($this->buffer[$this->count])) {
+			$char = $this->buffer[$this->count];
+			if (!ctype_digit($char) && $char != ".") return false;
+		}
+
+		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
+			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+			return true;
+		}
+		return false;
+	}
+
+	// a # color
+	protected function color(&$out) {
+		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
+			if (strlen($m[1]) > 7) {
+				$out = array("string", "", array($m[1]));
+			} else {
+				$out = array("raw_color", $m[1]);
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	// consume an argument definition list surrounded by ()
+	// each argument is a variable name with optional value
+	// or at the end a ... or a variable named followed by ...
+	// arguments are separated by , unless a ; is in the list, then ; is the
+	// delimiter.
+	protected function argumentDef(&$args, &$isVararg) {
+		$s = $this->seek();
+		if (!$this->literal('(')) return false;
+
+		$values = array();
+		$delim = ",";
+		$method = "expressionList";
+
+		$isVararg = false;
+		while (true) {
+			if ($this->literal("...")) {
+				$isVararg = true;
+				break;
+			}
+
+			if ($this->$method($value)) {
+				if ($value[0] == "variable") {
+					$arg = array("arg", $value[1]);
+					$ss = $this->seek();
+
+					if ($this->assign() && $this->$method($rhs)) {
+						$arg[] = $rhs;
+					} else {
+						$this->seek($ss);
+						if ($this->literal("...")) {
+							$arg[0] = "rest";
+							$isVararg = true;
+						}
+					}
+
+					$values[] = $arg;
+					if ($isVararg) break;
+					continue;
+				} else {
+					$values[] = array("lit", $value);
+				}
+			}
+
+
+			if (!$this->literal($delim)) {
+				if ($delim == "," && $this->literal(";")) {
+					// found new delim, convert existing args
+					$delim = ";";
+					$method = "propertyValue";
+
+					// transform arg list
+					if (isset($values[1])) { // 2 items
+						$newList = array();
+						foreach ($values as $i => $arg) {
+							switch($arg[0]) {
+							case "arg":
+								if ($i) {
+									$this->throwError("Cannot mix ; and , as delimiter types");
+								}
+								$newList[] = $arg[2];
+								break;
+							case "lit":
+								$newList[] = $arg[1];
+								break;
+							case "rest":
+								$this->throwError("Unexpected rest before semicolon");
+							}
+						}
+
+						$newList = array("list", ", ", $newList);
+
+						switch ($values[0][0]) {
+						case "arg":
+							$newArg = array("arg", $values[0][1], $newList);
+							break;
+						case "lit":
+							$newArg = array("lit", $newList);
+							break;
+						}
+
+					} elseif ($values) { // 1 item
+						$newArg = $values[0];
+					}
+
+					if ($newArg) {
+						$values = array($newArg);
+					}
+				} else {
+					break;
+				}
+			}
+		}
+
+		if (!$this->literal(')')) {
+			$this->seek($s);
+			return false;
+		}
+
+		$args = $values;
+
+		return true;
+	}
+
+	// consume a list of tags
+	// this accepts a hanging delimiter
+	protected function tags(&$tags, $simple = false, $delim = ',') {
+		$tags = array();
+		while ($this->tag($tt, $simple)) {
+			$tags[] = $tt;
+			if (!$this->literal($delim)) break;
+		}
+		if (count($tags) == 0) return false;
+
+		return true;
+	}
+
+	// list of tags of specifying mixin path
+	// optionally separated by > (lazy, accepts extra >)
+	protected function mixinTags(&$tags) {
+		$tags = array();
+		while ($this->tag($tt, true)) {
+			$tags[] = $tt;
+			$this->literal(">");
+		}
+
+		if (count($tags) == 0) return false;
+
+		return true;
+	}
+
+	// a bracketed value (contained within in a tag definition)
+	protected function tagBracket(&$parts, &$hasExpression) {
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+			return false;
+		}
+
+		$s = $this->seek();
+
+		$hasInterpolation = false;
+
+		if ($this->literal("[", false)) {
+			$attrParts = array("[");
+			// keyword, string, operator
+			while (true) {
+				if ($this->literal("]", false)) {
+					$this->count--;
+					break; // get out early
+				}
+
+				if ($this->match('\s+', $m)) {
+					$attrParts[] = " ";
+					continue;
+				}
+				if ($this->string($str)) {
+					// escape parent selector, (yuck)
+					foreach ($str[2] as &$chunk) {
+						$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+					}
+
+					$attrParts[] = $str;
+					$hasInterpolation = true;
+					continue;
+				}
+
+				if ($this->keyword($word)) {
+					$attrParts[] = $word;
+					continue;
+				}
+
+				if ($this->interpolation($inter, false)) {
+					$attrParts[] = $inter;
+					$hasInterpolation = true;
+					continue;
+				}
+
+				// operator, handles attr namespace too
+				if ($this->match('[|-~\$\*\^=]+', $m)) {
+					$attrParts[] = $m[0];
+					continue;
+				}
+
+				break;
+			}
+
+			if ($this->literal("]", false)) {
+				$attrParts[] = "]";
+				foreach ($attrParts as $part) {
+					$parts[] = $part;
+				}
+				$hasExpression = $hasExpression || $hasInterpolation;
+				return true;
+			}
+			$this->seek($s);
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	// a space separated list of selectors
+	protected function tag(&$tag, $simple = false) {
+		if ($simple)
+			$chars = '^@,:;{}\][>\(\) "\'';
+		else
+			$chars = '^@,;{}["\'';
+
+		$s = $this->seek();
+
+		$hasExpression = false;
+		$parts = array();
+		while ($this->tagBracket($parts, $hasExpression));
+
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		while (true) {
+			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+				$parts[] = $m[1];
+				if ($simple) break;
+
+				while ($this->tagBracket($parts, $hasExpression));
+				continue;
+			}
+
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+				if ($this->interpolation($interp)) {
+					$hasExpression = true;
+					$interp[2] = true; // don't unescape
+					$parts[] = $interp;
+					continue;
+				}
+
+				if ($this->literal("@")) {
+					$parts[] = "@";
+					continue;
+				}
+			}
+
+			if ($this->unit($unit)) { // for keyframes
+				$parts[] = $unit[1];
+				$parts[] = $unit[2];
+				continue;
+			}
+
+			break;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		if (!$parts) {
+			$this->seek($s);
+			return false;
+		}
+
+		if ($hasExpression) {
+			$tag = array("exp", array("string", "", $parts));
+		} else {
+			$tag = trim(implode($parts));
+		}
+
+		$this->whitespace();
+		return true;
+	}
+
+	// a css function
+	protected function func(&$func) {
+		$s = $this->seek();
+
+		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
+			$fname = $m[1];
+
+			$sPreArgs = $this->seek();
+
+			$args = array();
+			while (true) {
+				$ss = $this->seek();
+				// this ugly nonsense is for ie filter properties
+				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
+					$args[] = array("string", "", array($name, "=", $value));
+				} else {
+					$this->seek($ss);
+					if ($this->expressionList($value)) {
+						$args[] = $value;
+					}
+				}
+
+				if (!$this->literal(',')) break;
+			}
+			$args = array('list', ',', $args);
+
+			if ($this->literal(')')) {
+				$func = array('function', $fname, $args);
+				return true;
+			} elseif ($fname == 'url') {
+				// couldn't parse and in url? treat as string
+				$this->seek($sPreArgs);
+				if ($this->openString(")", $string) && $this->literal(")")) {
+					$func = array('function', $fname, $string);
+					return true;
+				}
+			}
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	// consume a less variable
+	protected function variable(&$name) {
+		$s = $this->seek();
+		if ($this->literal($this->lessc->vPrefix, false) &&
+			($this->variable($sub) || $this->keyword($name)))
+		{
+			if (!empty($sub)) {
+				$name = array('variable', $sub);
+			} else {
+				$name = $this->lessc->vPrefix.$name;
+			}
+			return true;
+		}
+
+		$name = null;
+		$this->seek($s);
+		return false;
+	}
+
+	/**
+	 * Consume an assignment operator
+	 * Can optionally take a name that will be set to the current property name
+	 */
+	protected function assign($name = null) {
+		if ($name) $this->currentProperty = $name;
+		return $this->literal(':') || $this->literal('=');
+	}
+
+	// consume a keyword
+	protected function keyword(&$word) {
+		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
+			$word = $m[1];
+			return true;
+		}
+		return false;
+	}
+
+	// consume an end of statement delimiter
+	protected function end() {
+		if ($this->literal(';', false)) {
+			return true;
+		} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
+			// if there is end of file or a closing block next then we don't need a ;
+			return true;
+		}
+		return false;
+	}
+
+	protected function guards(&$guards) {
+		$s = $this->seek();
+
+		if (!$this->literal("when")) {
+			$this->seek($s);
+			return false;
+		}
+
+		$guards = array();
+
+		while ($this->guardGroup($g)) {
+			$guards[] = $g;
+			if (!$this->literal(",")) break;
+		}
+
+		if (count($guards) == 0) {
+			$guards = null;
+			$this->seek($s);
+			return false;
+		}
+
+		return true;
+	}
+
+	// a bunch of guards that are and'd together
+	// TODO rename to guardGroup
+	protected function guardGroup(&$guardGroup) {
+		$s = $this->seek();
+		$guardGroup = array();
+		while ($this->guard($guard)) {
+			$guardGroup[] = $guard;
+			if (!$this->literal("and")) break;
+		}
+
+		if (count($guardGroup) == 0) {
+			$guardGroup = null;
+			$this->seek($s);
+			return false;
+		}
+
+		return true;
+	}
+
+	protected function guard(&$guard) {
+		$s = $this->seek();
+		$negate = $this->literal("not");
+
+		if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+			$guard = $exp;
+			if ($negate) $guard = array("negate", $guard);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	/* raw parsing functions */
+
+	protected function literal($what, $eatWhitespace = null) {
+		if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+		// shortcut on single letter
+		if (!isset($what[1]) && isset($this->buffer[$this->count])) {
+			if ($this->buffer[$this->count] == $what) {
+				if (!$eatWhitespace) {
+					$this->count++;
+					return true;
+				}
+				// goes below...
+			} else {
+				return false;
+			}
+		}
+
+		if (!isset(self::$literalCache[$what])) {
+			self::$literalCache[$what] = lessc::preg_quote($what);
+		}
+
+		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+	}
+
+	protected function genericList(&$out, $parseItem, $delim="", $flatten=true) {
+		$s = $this->seek();
+		$items = array();
+		while ($this->$parseItem($value)) {
+			$items[] = $value;
+			if ($delim) {
+				if (!$this->literal($delim)) break;
+			}
+		}
+
+		if (count($items) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		if ($flatten && count($items) == 1) {
+			$out = $items[0];
+		} else {
+			$out = array("list", $delim, $items);
+		}
+
+		return true;
+	}
+
+
+	// advance counter to next occurrence of $what
+	// $until - don't include $what in advance
+	// $allowNewline, if string, will be used as valid char set
+	protected function to($what, &$out, $until = false, $allowNewline = false) {
+		if (is_string($allowNewline)) {
+			$validChars = $allowNewline;
+		} else {
+			$validChars = $allowNewline ? "." : "[^\n]";
+		}
+		if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
+		if ($until) $this->count -= strlen($what); // give back $what
+		$out = $m[1];
+		return true;
+	}
+
+	// try to match something on head of buffer
+	protected function match($regex, &$out, $eatWhitespace = null) {
+		if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+			$this->count += strlen($out[0]);
+			if ($eatWhitespace && $this->writeComments) $this->whitespace();
+			return true;
+		}
+		return false;
+	}
+
+	// match some whitespace
+	protected function whitespace() {
+		if ($this->writeComments) {
+			$gotWhite = false;
+			while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
+				if (isset($m[1]) && empty($this->seenComments[$this->count])) {
+					$this->append(array("comment", $m[1]));
+					$this->seenComments[$this->count] = true;
+				}
+				$this->count += strlen($m[0]);
+				$gotWhite = true;
+			}
+			return $gotWhite;
+		} else {
+			$this->match("", $m);
+			return strlen($m[0]) > 0;
+		}
+	}
+
+	// match something without consuming it
+	protected function peek($regex, &$out = null, $from=null) {
+		if (is_null($from)) $from = $this->count;
+		$r = '/'.$regex.'/Ais';
+		$result = preg_match($r, $this->buffer, $out, null, $from);
+
+		return $result;
+	}
+
+	// seek to a spot in the buffer or return where we are on no argument
+	protected function seek($where = null) {
+		if ($where === null) return $this->count;
+		else $this->count = $where;
+		return true;
+	}
+
+	/* misc functions */
+
+	public function throwError($msg = "parse error", $count = null) {
+		$count = is_null($count) ? $this->count : $count;
+
+		$line = $this->line +
+			substr_count(substr($this->buffer, 0, $count), "\n");
+
+		if (!empty($this->sourceName)) {
+			$loc = "$this->sourceName on line $line";
+		} else {
+			$loc = "line: $line";
+		}
+
+		// TODO this depends on $this->count
+		if ($this->peek("(.*?)(\n|$)", $m, $count)) {
+			throw new exception("$msg: failed at `$m[1]` $loc");
+		} else {
+			throw new exception("$msg: $loc");
+		}
+	}
+
+	protected function pushBlock($selectors=null, $type=null) {
+		$b = new stdclass;
+		$b->parent = $this->env;
+
+		$b->type = $type;
+		$b->id = self::$nextBlockId++;
+
+		$b->isVararg = false; // TODO: kill me from here
+		$b->tags = $selectors;
+
+		$b->props = array();
+		$b->children = array();
+
+		$this->env = $b;
+		return $b;
+	}
+
+	// push a block that doesn't multiply tags
+	protected function pushSpecialBlock($type) {
+		return $this->pushBlock(null, $type);
+	}
+
+	// append a property to the current block
+	protected function append($prop, $pos = null) {
+		if ($pos !== null) $prop[-1] = $pos;
+		$this->env->props[] = $prop;
+	}
+
+	// pop something off the stack
+	protected function pop() {
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
+
+	// remove comments from $text
+	// todo: make it work for all functions, not just url
+	protected function removeComments($text) {
+		$look = array(
+			'url(', '//', '/*', '"', "'"
+		);
+
+		$out = '';
+		$min = null;
+		while (true) {
+			// find the next item
+			foreach ($look as $token) {
+				$pos = strpos($text, $token);
+				if ($pos !== false) {
+					if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
+				}
+			}
+
+			if (is_null($min)) break;
+
+			$count = $min[1];
+			$skip = 0;
+			$newlines = 0;
+			switch ($min[0]) {
+			case 'url(':
+				if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
+					$count += strlen($m[0]) - strlen($min[0]);
+				break;
+			case '"':
+			case "'":
+				if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))
+					$count += strlen($m[0]) - 1;
+				break;
+			case '//':
+				$skip = strpos($text, "\n", $count);
+				if ($skip === false) $skip = strlen($text) - $count;
+				else $skip -= $count;
+				break;
+			case '/*':
+				if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
+					$skip = strlen($m[0]);
+					$newlines = substr_count($m[0], "\n");
+				}
+				break;
+			}
+
+			if ($skip == 0) $count += strlen($min[0]);
+
+			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+			$text = substr($text, $count + $skip);
+
+			$min = null;
+		}
+
+		return $out.$text;
+	}
+
+}
+
+class lessc_formatter_classic {
+	public $indentChar = "  ";
+
+	public $break = "\n";
+	public $open = " {";
+	public $close = "}";
+	public $selectorSeparator = ", ";
+	public $assignSeparator = ":";
+
+	public $openSingle = " { ";
+	public $closeSingle = " }";
+
+	public $disableSingle = false;
+	public $breakSelectors = false;
+
+	public $compressColors = false;
+
+	public function __construct() {
+		$this->indentLevel = 0;
+	}
+
+	public function indentStr($n = 0) {
+		return str_repeat($this->indentChar, max($this->indentLevel + $n, 0));
+	}
+
+	public function property($name, $value) {
+		return $name . $this->assignSeparator . $value . ";";
+	}
+
+	protected function isEmpty($block) {
+		if (empty($block->lines)) {
+			foreach ($block->children as $child) {
+				if (!$this->isEmpty($child)) return false;
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	public function block($block) {
+		if ($this->isEmpty($block)) return;
+
+		$inner = $pre = $this->indentStr();
+
+		$isSingle = !$this->disableSingle &&
+			is_null($block->type) && count($block->lines) == 1;
+
+		if (!empty($block->selectors)) {
+			$this->indentLevel++;
+
+			if ($this->breakSelectors) {
+				$selectorSeparator = $this->selectorSeparator . $this->break . $pre;
+			} else {
+				$selectorSeparator = $this->selectorSeparator;
+			}
+
+			echo $pre .
+				implode($selectorSeparator, $block->selectors);
+			if ($isSingle) {
+				echo $this->openSingle;
+				$inner = "";
+			} else {
+				echo $this->open . $this->break;
+				$inner = $this->indentStr();
+			}
+
+		}
+
+		if (!empty($block->lines)) {
+			$glue = $this->break.$inner;
+			echo $inner . implode($glue, $block->lines);
+			if (!$isSingle && !empty($block->children)) {
+				echo $this->break;
+			}
+		}
+
+		foreach ($block->children as $child) {
+			$this->block($child);
+		}
+
+		if (!empty($block->selectors)) {
+			if (!$isSingle && empty($block->children)) echo $this->break;
+
+			if ($isSingle) {
+				echo $this->closeSingle . $this->break;
+			} else {
+				echo $pre . $this->close . $this->break;
+			}
+
+			$this->indentLevel--;
+		}
+	}
+}
+
+class lessc_formatter_compressed extends lessc_formatter_classic {
+	public $disableSingle = true;
+	public $open = "{";
+	public $selectorSeparator = ",";
+	public $assignSeparator = ":";
+	public $break = "";
+	public $compressColors = true;
+
+	public function indentStr($n = 0) {
+		return "";
+	}
+}
+
+class lessc_formatter_lessjs extends lessc_formatter_classic {
+	public $disableSingle = true;
+	public $breakSelectors = true;
+	public $assignSeparator = ": ";
+	public $selectorSeparator = ",";
+}
+
+
diff --git a/core/libraries/vendor/leafo/lessphp/lessify b/core/libraries/vendor/leafo/lessphp/lessify
new file mode 100644
index 00000000..becc5388
--- /dev/null
+++ b/core/libraries/vendor/leafo/lessphp/lessify
@@ -0,0 +1,23 @@
+#!/usr/bin/php
+<?php
+
+if (php_sapi_name() != "cli") {
+	err($fa.$argv[0]." must be run in the command line.");
+	exit(1);
+}
+$exe = array_shift($argv); // remove filename
+
+if (!$fname = array_shift($argv)) {
+	exit("Usage: ".$exe." input-file\n");
+}
+
+require "lessify.inc.php";
+
+try  {
+	$parser = new lessify($fname);
+	echo $parser->parse();
+} catch (exception $e) {
+	exit("Fatal error: ".$e->getMessage()."\n");
+}
+
+
diff --git a/core/libraries/vendor/leafo/lessphp/lessify.inc.php b/core/libraries/vendor/leafo/lessphp/lessify.inc.php
new file mode 100644
index 00000000..91c14423
--- /dev/null
+++ b/core/libraries/vendor/leafo/lessphp/lessify.inc.php
@@ -0,0 +1,447 @@
+<?php
+/**
+ * lessify
+ * Convert a css file into a less file
+ * http://leafo.net/lessphp
+ * Copyright 2010, leaf corcoran <leafot@gmail.com>
+ *
+ * WARNING: THIS DOES NOT WORK ANYMORE. NEEDS TO BE UPDATED FOR
+ * LATEST VERSION OF LESSPHP.
+ *
+ */
+
+require "lessc.inc.php";
+
+//
+// check if the merge during mixin is overwriting values. should or should it not?
+//
+
+//
+// 1. split apart class tags
+//
+
+class easyparse {
+	var $buffer;
+	var $count;
+
+	function __construct($str) {
+		$this->count = 0;
+		$this->buffer = trim($str);
+	}
+
+	function seek($where = null) {
+		if ($where === null) return $this->count;
+		else $this->count = $where;
+		return true;
+	}
+
+	function preg_quote($what) {
+		return preg_quote($what, '/');
+	}
+
+	function match($regex, &$out, $eatWhitespace = true) {
+		$r = '/'.$regex.($eatWhitespace ? '\s*' : '').'/Ais';
+		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+			$this->count += strlen($out[0]);
+			return true;
+		}
+		return false;
+	}
+
+	function literal($what, $eatWhitespace = true) {
+		// this is here mainly prevent notice from { } string accessor
+		if ($this->count >= strlen($this->buffer)) return false;
+
+		// shortcut on single letter
+		if (!$eatWhitespace and strlen($what) == 1) {
+			if ($this->buffer{$this->count} == $what) {
+				$this->count++;
+				return true;
+			}
+			else return false;
+		}
+
+		return $this->match($this->preg_quote($what), $m, $eatWhitespace);
+	}
+
+}
+
+class tagparse extends easyparse {
+	static private $combinators = null;
+	static private $match_opts = null;
+
+	function parse() {
+		if (empty(self::$combinators)) {
+			self::$combinators = '('.implode('|', array_map(array($this, 'preg_quote'),
+				array('+', '>', '~'))).')';
+			self::$match_opts = '('.implode('|', array_map(array($this, 'preg_quote'),
+				array('=', '~=', '|=', '$=', '*='))).')';
+		}
+
+		// crush whitespace
+		$this->buffer = preg_replace('/\s+/', ' ', $this->buffer).' ';
+
+		$tags = array();
+		while ($this->tag($t)) $tags[] = $t;
+
+		return $tags;
+	}
+
+	static function compileString($string) {
+		list(, $delim, $str) = $string;
+		$str = str_replace($delim, "\\".$delim, $str);
+		$str = str_replace("\n", "\\\n", $str);
+		return $delim.$str.$delim;
+	}
+
+	static function compilePaths($paths) {
+		return implode(', ', array_map(array('self', 'compilePath'), $paths));
+	}
+
+	// array of tags
+	static function compilePath($path) {
+		return implode(' ', array_map(array('self', 'compileTag'), $path));
+	}
+
+
+	static function compileTag($tag) {
+		ob_start();
+		if (isset($tag['comb'])) echo $tag['comb']." ";
+		if (isset($tag['front'])) echo $tag['front'];
+		if (isset($tag['attr'])) {
+			echo '['.$tag['attr'];
+			if (isset($tag['op'])) {
+				echo $tag['op'].$tag['op_value'];
+			}
+			echo ']';
+		}
+		return ob_get_clean();
+	}
+
+	function string(&$out) {
+		$s = $this->seek();
+
+		if ($this->literal('"')) {
+			$delim = '"';
+		} elseif ($this->literal("'")) {
+			$delim = "'";
+		} else {
+			return false;
+		}
+
+		while (true) {
+			// step through letters looking for either end or escape
+			$buff = "";
+			$escapeNext = false;
+			$finished = false;
+			for ($i = $this->count; $i < strlen($this->buffer); $i++) {
+				$char = $this->buffer[$i];
+				switch ($char) {
+				case $delim:
+					if ($escapeNext) {
+						$buff .= $char;
+						$escapeNext = false;
+						break;
+					}
+					$finished = true;
+					break 2;
+				case "\\":
+					if ($escapeNext) {
+						$buff .= $char;
+						$escapeNext = false;
+					} else {
+						$escapeNext = true;
+					}
+					break;
+				case "\n":
+					if (!$escapeNext) {
+						break 3;
+					}
+
+					$buff .= $char;
+					$escapeNext = false;
+					break;
+				default:
+					if ($escapeNext) {
+						$buff .= "\\";
+						$escapeNext = false;
+					}
+					$buff .= $char;
+				}
+			}
+			if (!$finished) break;
+			$out = array('string', $delim, $buff);
+			$this->seek($i+1);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	function tag(&$out) {
+		$s = $this->seek();
+		$tag = array();
+		if ($this->combinator($op)) $tag['comb'] = $op;
+
+		if (!$this->match('(.*?)( |$|\[|'.self::$combinators.')', $match)) {
+			$this->seek($s);
+			return false;
+		}
+
+		if (!empty($match[3])) {
+			// give back combinator
+			$this->count-=strlen($match[3]);
+		}
+
+		if (!empty($match[1])) $tag['front'] = $match[1];
+
+		if ($match[2] == '[') {
+			if ($this->ident($i)) {
+				$tag['attr'] = $i;
+
+				if ($this->match(self::$match_opts, $m) && $this->value($v)) {
+					$tag['op'] = $m[1];
+					$tag['op_value'] = $v;
+				}
+
+				if ($this->literal(']')) {
+					$out = $tag;
+					return true;
+				}
+			}
+		} elseif (isset($tag['front'])) {
+			$out = $tag;
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	function ident(&$out) {
+		// [-]?{nmstart}{nmchar}*
+		// nmstart: [_a-z]|{nonascii}|{escape}
+		// nmchar: [_a-z0-9-]|{nonascii}|{escape}
+		if ($this->match('(-?[_a-z][_\w]*)', $m)) {
+			$out = $m[1];
+			return true;
+		}
+		return false;
+	}
+
+	function value(&$out) {
+		if ($this->string($str)) {
+			$out = $this->compileString($str);
+			return true;
+		} elseif ($this->ident($id)) {
+			$out = $id;
+			return true;
+		}
+		return false;
+	}
+
+
+	function combinator(&$op) {
+		if ($this->match(self::$combinators, $m)) {
+			$op = $m[1];
+			return true;
+		}
+		return false;
+	}
+}
+
+class nodecounter {
+	var $count = 0;
+	var $children = array();
+
+	var $name;
+	var $child_blocks;
+	var $the_block;
+
+	function __construct($name) {
+		$this->name = $name;
+	}
+
+	function dump($stack = null) {
+		if (is_null($stack)) $stack = array();
+		$stack[] = $this->getName();
+		echo implode(' -> ', $stack)." ($this->count)\n";
+		foreach ($this->children as $child) {
+			$child->dump($stack);
+		}
+	}
+
+	static function compileProperties($c, $block) {
+		foreach($block as $name => $value) {
+			if ($c->isProperty($name, $value)) {
+				echo $c->compileProperty($name, $value)."\n";
+			}
+		}
+	}
+
+	function compile($c, $path = null) {
+		if (is_null($path)) $path = array();
+		$path[] = $this->name;
+
+		$isVisible = !is_null($this->the_block) || !is_null($this->child_blocks);
+
+		if ($isVisible) {
+			echo $c->indent(implode(' ', $path).' {');
+			$c->indentLevel++;
+			$path = array();
+
+			if ($this->the_block) {
+				$this->compileProperties($c, $this->the_block);
+			}
+
+			if ($this->child_blocks) {
+				foreach ($this->child_blocks as $block) {
+					echo $c->indent(tagparse::compilePaths($block['__tags']).' {');
+					$c->indentLevel++;
+					$this->compileProperties($c, $block);
+					$c->indentLevel--;
+					echo $c->indent('}');
+				}
+			}
+		}
+
+		// compile child nodes
+		foreach($this->children as $node) {
+			$node->compile($c, $path);
+		}
+
+		if ($isVisible) {
+			$c->indentLevel--;
+			echo $c->indent('}');
+		}
+
+	}
+
+	function getName() {
+		if (is_null($this->name)) return "[root]";
+		else return $this->name;
+	}
+
+	function getNode($name) {
+		if (!isset($this->children[$name])) {
+			$this->children[$name] = new nodecounter($name);
+		}
+
+		return $this->children[$name];
+	}
+
+	function findNode($path) {
+		$current = $this;
+		for ($i = 0; $i < count($path); $i++) {
+			$t = tagparse::compileTag($path[$i]);
+			$current = $current->getNode($t);
+		}
+
+		return $current;
+	}
+
+	function addBlock($path, $block) {
+		$node = $this->findNode($path);
+		if (!is_null($node->the_block)) throw new exception("can this happen?");
+
+		unset($block['__tags']);
+		$node->the_block = $block;
+	}
+
+	function addToNode($path, $block) {
+		$node = $this->findNode($path);
+		$node->child_blocks[] = $block;
+	}
+}
+
+/**
+ * create a less file from a css file by combining blocks where appropriate
+ */
+class lessify extends lessc {
+	public function dump() {
+		print_r($this->env);
+	}
+
+	public function parse($str = null) {
+		$this->prepareParser($str ? $str : $this->buffer);
+		while (false !== $this->parseChunk());
+
+		$root = new nodecounter(null);
+
+		// attempt to preserve some of the block order
+		$order = array();
+
+		$visitedTags = array();
+		foreach (end($this->env) as $name => $block) {
+			if (!$this->isBlock($name, $block)) continue;
+			if (isset($visitedTags[$name])) continue;
+
+			foreach ($block['__tags'] as $t) {
+				$visitedTags[$t] = true;
+			}
+
+			// skip those with more than 1
+			if (count($block['__tags']) == 1) {
+				$p = new tagparse(end($block['__tags']));
+				$path = $p->parse();
+				$root->addBlock($path, $block);
+				$order[] = array('compressed', $path, $block);
+				continue;
+			} else {
+				$common = null;
+				$paths = array();
+				foreach ($block['__tags'] as $rawtag) {
+					$p = new tagparse($rawtag);
+					$paths[] = $path = $p->parse();
+					if (is_null($common)) $common = $path;
+					else {
+						$new_common = array();
+						foreach ($path as $tag) {
+							$head = array_shift($common);
+							if ($tag == $head) {
+								$new_common[] = $head;
+							} else break;
+						}
+						$common = $new_common;
+						if (empty($common)) {
+							// nothing in common
+							break;
+						}
+					}
+				}
+
+				if (!empty($common)) {
+					$new_paths = array();
+					foreach ($paths as $p) $new_paths[] = array_slice($p, count($common));
+					$block['__tags'] = $new_paths;
+					$root->addToNode($common, $block);
+					$order[] = array('compressed', $common, $block);
+					continue;
+				}
+
+			}
+
+			$order[] = array('none', $block['__tags'], $block);
+		}
+
+
+		$compressed = $root->children;
+		foreach ($order as $item) {
+			list($type, $tags, $block) = $item;
+			if ($type == 'compressed') {
+				$top = tagparse::compileTag(reset($tags));
+				if (isset($compressed[$top])) {
+					$compressed[$top]->compile($this);
+					unset($compressed[$top]);
+				}
+			} else {
+				echo $this->indent(implode(', ', $tags).' {');
+				$this->indentLevel++;
+				nodecounter::compileProperties($this, $block);
+				$this->indentLevel--;
+				echo $this->indent('}');
+			}
+		}
+	}
+}
diff --git a/core/libraries/vendor/leafo/lessphp/plessc b/core/libraries/vendor/leafo/lessphp/plessc
new file mode 100644
index 00000000..1871dc77
--- /dev/null
+++ b/core/libraries/vendor/leafo/lessphp/plessc
@@ -0,0 +1,250 @@
+#!/usr/bin/env php
+<?php
+// Command line utility to compile LESS to STDOUT
+// Leaf Corcoran <leafot@gmail.com>, 2013
+
+$exe = array_shift($argv); // remove filename
+
+$HELP = <<<EOT
+Usage: $exe [options] input-file [output-file]
+
+Options include:
+
+    -h, --help  Show this message
+    -v          Print the version
+    -f=format   Set the output format, includes "default", "compressed"
+    -c          Keep /* */ comments in output
+    -r          Read from STDIN instead of input-file
+    -w          Watch input-file, and compile to output-file if it is changed
+    -T          Dump formatted parse tree
+    -X          Dump raw parse tree
+
+
+EOT;
+
+$opts = getopt('hvrwncXTf:', array('help'));
+while (count($argv) > 0 && preg_match('/^-([-hvrwncXT]$|[f]=)/', $argv[0])) {
+	array_shift($argv);
+}
+
+function has() {
+	global $opts;
+	foreach (func_get_args() as $arg) {
+		if (isset($opts[$arg])) return true;
+	}
+	return false;
+}
+
+if (has("h", "help")) {
+	exit($HELP);
+}
+
+error_reporting(E_ALL);
+$path  = realpath(dirname(__FILE__)).'/';
+
+require $path."lessc.inc.php";
+
+$VERSION = lessc::$VERSION;
+
+$fa = "Fatal Error: ";
+function err($msg) {
+	fwrite(STDERR, $msg."\n");
+}
+
+if (php_sapi_name() != "cli") {
+	err($fa.$argv[0]." must be run in the command line.");
+	exit(1);
+}
+
+function make_less($fname = null) {
+	global $opts;
+	$l = new lessc($fname);
+
+	if (has("f")) {
+		$format = $opts["f"];
+		if ($format != "default") $l->setFormatter($format);
+	}
+
+	if (has("c")) {
+		$l->setPreserveComments(true);
+	}
+
+	return $l;
+}
+
+function process($data, $import = null) {
+	global $fa;
+
+	$l = make_less();
+	if ($import) $l->importDir = $import;
+
+	try {
+		echo $l->parse($data);
+		exit(0);
+	} catch (exception $ex) {
+		err($fa."\n".str_repeat('=', 20)."\n".
+			$ex->getMessage());
+		exit(1);
+	}
+}
+
+if (has("v")) {
+	exit($VERSION."\n");
+}
+
+if (has("r")) {
+	if (!empty($argv)) {
+		$data = $argv[0];
+	} else {
+		$data = "";
+		while (!feof(STDIN)) {
+			$data .= fread(STDIN, 8192);
+		}
+	}
+	exit(process($data));
+}
+
+if (has("w")) {
+	// need two files
+	if (!is_file($in = array_shift($argv)) ||
+		null == $out = array_shift($argv))
+	{
+		err($fa.$exe." -w infile outfile");
+		exit(1);
+	}
+
+	echo "Watching ".$in.
+		(has("n") ? ' with notifications' : '').
+		", press Ctrl + c to exit.\n";
+
+	$cache = $in;
+	$last_action = 0;
+	while (true) {
+		clearstatcache();
+
+		// check if anything has changed since last fail
+		$updated = false;
+		if (is_array($cache)) {
+			foreach ($cache['files'] as $fname=>$_) {
+				if (filemtime($fname) > $last_action) {
+					$updated = true;
+					break;
+				}
+			}
+		} else $updated = true;
+
+		// try to compile it
+		if ($updated) {
+			$last_action = time();
+
+			try {
+				$cache = lessc::cexecute($cache);
+				echo "Writing updated file: ".$out."\n";
+				if (!file_put_contents($out, $cache['compiled'])) {
+					err($fa."Could not write to file ".$out);
+					exit(1);
+				}
+			} catch (exception $ex) {
+				echo "\nFatal Error:\n".str_repeat('=', 20)."\n".
+					$ex->getMessage()."\n\n";
+
+				if (has("n")) {
+					`notify-send -u critical "compile failed" "{$ex->getMessage()}"`;
+				}
+			}
+		}
+
+		sleep(1);
+	}
+	exit(0);
+}
+
+if (!$fname = array_shift($argv)) {
+	echo $HELP;
+	exit(1);
+}
+
+function dumpValue($node, $depth = 0) {
+	if (is_object($node)) {
+		$indent = str_repeat("  ", $depth);
+		$out = array();
+		foreach ($node->props as $prop) {
+			$out[] = $indent . dumpValue($prop, $depth + 1);
+		}
+		$out = implode("\n", $out);
+		if (!empty($node->tags)) {
+			$out = "+ ".implode(", ", $node->tags)."\n".$out;
+		}
+		return $out;
+	} elseif (is_array($node)) {
+		if (empty($node)) return "[]";
+		$type = $node[0];
+		if ($type == "block")
+			return dumpValue($node[1], $depth);
+
+		$out = array();
+		foreach ($node as $value) {
+			$out[] = dumpValue($value, $depth);
+		}
+		return "{ ".implode(", ", $out)." }";
+	} else {
+		if (is_string($node) && preg_match("/[\s,]/", $node)) {
+			return '"'.$node.'"';
+		}
+		return $node; // normal value
+	}
+}
+
+
+function stripValue($o, $toStrip) {
+	if (is_array($o) || is_object($o)) {
+		$isObject = is_object($o);
+		$o = (array)$o;
+		foreach ($toStrip as $removeKey) {
+			if (!empty($o[$removeKey])) {
+				$o[$removeKey] = "*stripped*";
+			}
+		}
+
+		foreach ($o as $k => $v) {
+			$o[$k] = stripValue($v, $toStrip);
+		}
+
+		if ($isObject) {
+			$o = (object)$o;
+		}
+	}
+
+	return $o;
+}
+
+function dumpWithoutParent($o, $alsoStrip=array()) {
+	$toStrip = array_merge(array("parent"), $alsoStrip);
+	print_r(stripValue($o, $toStrip));
+}
+
+try {
+	$less = make_less($fname);
+	if (has("T", "X")) {
+		$parser = new lessc_parser($less, $fname);
+		$tree = $parser->parse(file_get_contents($fname));
+		if (has("X"))
+			$out = print_r($tree, 1);
+		else
+			$out = dumpValue($tree)."\n";
+	} else {
+		$out = $less->parse();
+	}
+
+	if (!$fout = array_shift($argv)) {
+		echo $out;
+	} else {
+		file_put_contents($fout, $out);
+	}
+
+} catch (exception $ex) {
+	err($fa.$ex->getMessage());
+	exit(1);
+}
+
+?>
diff --git a/core/libraries/vendor/paragonie/random_compat/LICENSE b/core/libraries/vendor/paragonie/random_compat/LICENSE
new file mode 100644
index 00000000..45c7017d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Paragon Initiative Enterprises
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/byte_safe_strings.php b/core/libraries/vendor/paragonie/random_compat/lib/byte_safe_strings.php
new file mode 100644
index 00000000..6de294f8
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/byte_safe_strings.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2016 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('RandomCompat_strlen')) {
+    if (
+        defined('MB_OVERLOAD_STRING') &&
+        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+    ) {
+        /**
+         * strlen() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
+         * binary rather than UTF-8, ISO-8859-1, etc
+         *
+         * @param string $binary_string
+         *
+         * @throws TypeError
+         *
+         * @return int
+         */
+        function RandomCompat_strlen($binary_string)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_strlen() expects a string'
+                );
+            }
+
+            return (int) mb_strlen($binary_string, '8bit');
+        }
+
+    } else {
+        /**
+         * strlen() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version just used the default strlen()
+         *
+         * @param string $binary_string
+         *
+         * @throws TypeError
+         *
+         * @return int
+         */
+        function RandomCompat_strlen($binary_string)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_strlen() expects a string'
+                );
+            }
+            return (int) strlen($binary_string);
+        }
+    }
+}
+
+if (!is_callable('RandomCompat_substr')) {
+
+    if (
+        defined('MB_OVERLOAD_STRING')
+        &&
+        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+    ) {
+        /**
+         * substr() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version uses mb_substr() in '8bit' mode to treat strings as raw
+         * binary rather than UTF-8, ISO-8859-1, etc
+         *
+         * @param string $binary_string
+         * @param int $start
+         * @param int $length (optional)
+         *
+         * @throws TypeError
+         *
+         * @return string
+         */
+        function RandomCompat_substr($binary_string, $start, $length = null)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): First argument should be a string'
+                );
+            }
+
+            if (!is_int($start)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): Second argument should be an integer'
+                );
+            }
+
+            if ($length === null) {
+                /**
+                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
+                 * PHP 5.3, so we have to find the length ourselves.
+                 */
+                $length = RandomCompat_strlen($binary_string) - $start;
+            } elseif (!is_int($length)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
+                );
+            }
+
+            // Consistency with PHP's behavior
+            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+                return '';
+            }
+            if ($start > RandomCompat_strlen($binary_string)) {
+                return '';
+            }
+
+            return (string) mb_substr($binary_string, $start, $length, '8bit');
+        }
+
+    } else {
+
+        /**
+         * substr() implementation that isn't brittle to mbstring.func_overload
+         *
+         * This version just uses the default substr()
+         *
+         * @param string $binary_string
+         * @param int $start
+         * @param int $length (optional)
+         *
+         * @throws TypeError
+         *
+         * @return string
+         */
+        function RandomCompat_substr($binary_string, $start, $length = null)
+        {
+            if (!is_string($binary_string)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): First argument should be a string'
+                );
+            }
+
+            if (!is_int($start)) {
+                throw new TypeError(
+                    'RandomCompat_substr(): Second argument should be an integer'
+                );
+            }
+
+            if ($length !== null) {
+                if (!is_int($length)) {
+                    throw new TypeError(
+                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
+                    );
+                }
+
+                return (string) substr($binary_string, $start, $length);
+            }
+
+            return (string) substr($binary_string, $start);
+        }
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/cast_to_int.php b/core/libraries/vendor/paragonie/random_compat/lib/cast_to_int.php
new file mode 100644
index 00000000..dc4048c9
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/cast_to_int.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2016 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('RandomCompat_intval')) {
+
+    /**
+     * Cast to an integer if we can, safely.
+     *
+     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+     * lose precision, so the <= and => operators might accidentally let a float
+     * through.
+     *
+     * @param int|float $number    The number we want to convert to an int
+     * @param boolean   $fail_open Set to true to not throw an exception
+     *
+     * @return float|int
+     *
+     * @throws TypeError
+     */
+    function RandomCompat_intval($number, $fail_open = false)
+    {
+        if (is_int($number) || is_float($number)) {
+            $number += 0;
+        } elseif (is_numeric($number)) {
+            $number += 0;
+        }
+
+        if (
+            is_float($number)
+            &&
+            $number > ~PHP_INT_MAX
+            &&
+            $number < PHP_INT_MAX
+        ) {
+            $number = (int) $number;
+        }
+
+        if (is_int($number)) {
+            return (int) $number;
+        } elseif (!$fail_open) {
+            throw new TypeError(
+                'Expected an integer.'
+            );
+        }
+        return $number;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/error_polyfill.php b/core/libraries/vendor/paragonie/random_compat/lib/error_polyfill.php
new file mode 100644
index 00000000..17ece7b2
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/error_polyfill.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2016 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!class_exists('Error', false)) {
+    // We can't really avoid making this extend Exception in PHP 5.
+    class Error extends Exception
+    {
+
+    }
+}
+
+if (!class_exists('TypeError', false)) {
+    if (is_subclass_of('Error', 'Exception')) {
+        class TypeError extends Error
+        {
+
+        }
+    } else {
+        class TypeError extends Exception
+        {
+
+        }
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random.php b/core/libraries/vendor/paragonie/random_compat/lib/random.php
new file mode 100644
index 00000000..8a29adc9
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * @version 1.4.3
+ * @released 2018-04-04
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2016 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!defined('PHP_VERSION_ID')) {
+    // This constant was introduced in PHP 5.2.7
+    $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
+    define(
+        'PHP_VERSION_ID',
+        $RandomCompatversion[0] * 10000
+        + $RandomCompatversion[1] * 100
+        + $RandomCompatversion[2]
+    );
+    $RandomCompatversion = null;
+}
+
+/**
+ * PHP 7.0.0 and newer have these functions natively.
+ */
+if (PHP_VERSION_ID >= 70000) {
+    return;
+}
+
+if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+    define('RANDOM_COMPAT_READ_BUFFER', 8);
+}
+
+$RandomCompatDIR = dirname(__FILE__);
+
+require_once $RandomCompatDIR . '/byte_safe_strings.php';
+require_once $RandomCompatDIR . '/cast_to_int.php';
+require_once $RandomCompatDIR . '/error_polyfill.php';
+
+if (!is_callable('random_bytes')) {
+    /**
+     * PHP 5.2.0 - 5.6.x way to implement random_bytes()
+     *
+     * We use conditional statements here to define the function in accordance
+     * to the operating environment. It's a micro-optimization.
+     *
+     * In order of preference:
+     *   1. Use libsodium if available.
+     *   2. fread() /dev/urandom if available (never on Windows)
+     *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
+     *   4. COM('CAPICOM.Utilities.1')->GetRandom()
+     *
+     * See RATIONALE.md for our reasoning behind this particular order
+     */
+    if (extension_loaded('libsodium')) {
+        // See random_bytes_libsodium.php
+        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
+            require_once $RandomCompatDIR . '/random_bytes_libsodium.php';
+        } elseif (method_exists('Sodium', 'randombytes_buf')) {
+            require_once $RandomCompatDIR . '/random_bytes_libsodium_legacy.php';
+        }
+    }
+
+    /**
+     * Reading directly from /dev/urandom:
+     */
+    if (DIRECTORY_SEPARATOR === '/') {
+        // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
+        // way to exclude Windows.
+        $RandomCompatUrandom = true;
+        $RandomCompat_basedir = ini_get('open_basedir');
+
+        if (!empty($RandomCompat_basedir)) {
+            $RandomCompat_open_basedir = explode(
+                PATH_SEPARATOR,
+                strtolower($RandomCompat_basedir)
+            );
+            $RandomCompatUrandom = (array() !== array_intersect(
+                    array('/dev', '/dev/', '/dev/urandom'),
+                    $RandomCompat_open_basedir
+                ));
+            $RandomCompat_open_basedir = null;
+        }
+
+        if (
+            !is_callable('random_bytes')
+            &&
+            $RandomCompatUrandom
+            &&
+            @is_readable('/dev/urandom')
+        ) {
+            // Error suppression on is_readable() in case of an open_basedir
+            // or safe_mode failure. All we care about is whether or not we
+            // can read it at this point. If the PHP environment is going to
+            // panic over trying to see if the file can be read in the first
+            // place, that is not helpful to us here.
+
+            // See random_bytes_dev_urandom.php
+            require_once $RandomCompatDIR . '/random_bytes_dev_urandom.php';
+        }
+        // Unset variables after use
+        $RandomCompat_basedir = null;
+    } else {
+        $RandomCompatUrandom = false;
+    }
+
+    /**
+     * mcrypt_create_iv()
+     *
+     * We only want to use mcypt_create_iv() if:
+     *
+     * - random_bytes() hasn't already been defined
+     * - the mcrypt extensions is loaded
+     * - One of these two conditions is true:
+     *   - We're on Windows (DIRECTORY_SEPARATOR !== '/')
+     *   - We're not on Windows and /dev/urandom is readabale
+     *     (i.e. we're not in a chroot jail)
+     * - Special case:
+     *   - If we're not on Windows, but the PHP version is between
+     *     5.6.10 and 5.6.12, we don't want to use mcrypt. It will
+     *     hang indefinitely. This is bad.
+     *   - If we're on Windows, we want to use PHP >= 5.3.7 or else
+     *     we get insufficient entropy errors.
+     */
+    if (
+        !is_callable('random_bytes')
+        &&
+        // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
+        (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
+        &&
+        // Prevent this code from hanging indefinitely on non-Windows;
+        // see https://bugs.php.net/bug.php?id=69833
+        (
+            DIRECTORY_SEPARATOR !== '/' ||
+            (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
+        )
+        &&
+        extension_loaded('mcrypt')
+    ) {
+        // See random_bytes_mcrypt.php
+        require_once $RandomCompatDIR . '/random_bytes_mcrypt.php';
+    }
+    $RandomCompatUrandom = null;
+
+    /**
+     * This is a Windows-specific fallback, for when the mcrypt extension
+     * isn't loaded.
+     */
+    if (
+        !is_callable('random_bytes')
+        &&
+        extension_loaded('com_dotnet')
+        &&
+        class_exists('COM')
+    ) {
+        $RandomCompat_disabled_classes = preg_split(
+            '#\s*,\s*#',
+            strtolower(ini_get('disable_classes'))
+        );
+
+        if (!in_array('com', $RandomCompat_disabled_classes)) {
+            try {
+                $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
+                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+                    // See random_bytes_com_dotnet.php
+                    require_once $RandomCompatDIR . '/random_bytes_com_dotnet.php';
+                }
+            } catch (com_exception $e) {
+                // Don't try to use it.
+            }
+        }
+        $RandomCompat_disabled_classes = null;
+        $RandomCompatCOMtest = null;
+    }
+
+    /**
+     * openssl_random_pseudo_bytes()
+     */
+    if (
+        (
+            // Unix-like with PHP >= 5.3.0 or
+            (
+                DIRECTORY_SEPARATOR === '/'
+                &&
+                PHP_VERSION_ID >= 50300
+            )
+            ||
+            // Windows with PHP >= 5.4.1
+            PHP_VERSION_ID >= 50401
+        )
+        &&
+        !function_exists('random_bytes')
+        &&
+        extension_loaded('openssl')
+    ) {
+        // See random_bytes_openssl.php
+        require_once $RandomCompatDIR . '/random_bytes_openssl.php';
+    }
+
+    /**
+     * throw new Exception
+     */
+    if (!is_callable('random_bytes')) {
+        /**
+         * We don't have any more options, so let's throw an exception right now
+         * and hope the developer won't let it fail silently.
+         *
+         * @param mixed $length
+         * @return void
+         * @throws Exception
+         */
+        function random_bytes($length)
+        {
+            unset($length); // Suppress "variable not used" warnings.
+            throw new Exception(
+                'There is no suitable CSPRNG installed on your system'
+            );
+        }
+    }
+}
+
+if (!is_callable('random_int')) {
+    require_once $RandomCompatDIR . '/random_int.php';
+}
+
+$RandomCompatDIR = null;
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
new file mode 100644
index 00000000..28cc56ac
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+    /**
+     * Windows with PHP < 5.3.0 will not have the function
+     * openssl_random_pseudo_bytes() available, so let's use
+     * CAPICOM to work around this deficiency.
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        $buf = '';
+        if (!class_exists('COM')) {
+            throw new Error(
+                'COM does not exist'
+            );
+        }
+        $util = new COM('CAPICOM.Utilities.1');
+        $execCount = 0;
+
+        /**
+         * Let's not let it loop forever. If we run N times and fail to
+         * get N bytes of random data, then CAPICOM has failed us.
+         */
+        do {
+            $buf .= base64_decode($util->GetRandom($bytes, 0));
+            if (RandomCompat_strlen($buf) >= $bytes) {
+                /**
+                 * Return our random entropy buffer here:
+                 */
+                return RandomCompat_substr($buf, 0, $bytes);
+            }
+            ++$execCount;
+        } while ($execCount < $bytes);
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
new file mode 100644
index 00000000..8bf70341
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+    define('RANDOM_COMPAT_READ_BUFFER', 8);
+}
+
+if (!is_callable('random_bytes')) {
+    /**
+     * Unless open_basedir is enabled, use /dev/urandom for
+     * random numbers in accordance with best practices
+     *
+     * Why we use /dev/urandom and not /dev/random
+     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        static $fp = null;
+        /**
+         * This block should only be run once
+         */
+        if (empty($fp)) {
+            /**
+             * We use /dev/urandom if it is a char device.
+             * We never fall back to /dev/random
+             */
+            $fp = fopen('/dev/urandom', 'rb');
+            if (!empty($fp)) {
+                $st = fstat($fp);
+                if (($st['mode'] & 0170000) !== 020000) {
+                    fclose($fp);
+                    $fp = false;
+                }
+            }
+
+            if (!empty($fp)) {
+                /**
+                 * stream_set_read_buffer() does not exist in HHVM
+                 * 
+                 * If we don't set the stream's read buffer to 0, PHP will
+                 * internally buffer 8192 bytes, which can waste entropy
+                 * 
+                 * stream_set_read_buffer returns 0 on success
+                 */
+                if (function_exists('stream_set_read_buffer')) {
+                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+                }
+                if (function_exists('stream_set_chunk_size')) {
+                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+                }
+            }
+        }
+
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        /**
+         * This if() block only runs if we managed to open a file handle
+         *
+         * It does not belong in an else {} block, because the above
+         * if (empty($fp)) line is logic that should only be run once per
+         * page load.
+         */
+        if (!empty($fp)) {
+            $remaining = $bytes;
+            $buf = '';
+
+            /**
+             * We use fread() in a loop to protect against partial reads
+             */
+            do {
+                $read = fread($fp, $remaining);
+                if ($read === false) {
+                    /**
+                     * We cannot safely read from the file. Exit the
+                     * do-while loop and trigger the exception condition
+                     */
+                    $buf = false;
+                    break;
+                }
+                /**
+                 * Decrease the number of bytes returned from remaining
+                 */
+                $remaining -= RandomCompat_strlen($read);
+                $buf .= $read;
+            } while ($remaining > 0);
+
+            /**
+             * Is our result valid?
+             */
+            if ($buf !== false) {
+                if (RandomCompat_strlen($buf) === $bytes) {
+                    /**
+                     * Return our random entropy buffer here:
+                     */
+                    return $buf;
+                }
+            }
+        }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Error reading from source device'
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
new file mode 100644
index 00000000..7d32b21f
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+    /**
+     * If the libsodium PHP extension is loaded, we'll use it above any other
+     * solution.
+     *
+     * libsodium-php project:
+     * @ref https://github.com/jedisct1/libsodium-php
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        /**
+         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+         * generated in one invocation.
+         */
+        if ($bytes > 2147483647) {
+            $buf = '';
+            for ($i = 0; $i < $bytes; $i += 1073741824) {
+                $n = ($bytes - $i) > 1073741824
+                    ? 1073741824
+                    : $bytes - $i;
+                $buf .= \Sodium\randombytes_buf($n);
+            }
+        } else {
+            $buf = \Sodium\randombytes_buf($bytes);
+        }
+
+        if ($buf !== false) {
+            if (RandomCompat_strlen($buf) === $bytes) {
+                return $buf;
+            }
+        }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
new file mode 100644
index 00000000..ba93c403
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+    /**
+     * If the libsodium PHP extension is loaded, we'll use it above any other
+     * solution.
+     *
+     * libsodium-php project:
+     * @ref https://github.com/jedisct1/libsodium-php
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        /**
+         * @var string
+         */
+        $buf = '';
+
+        /**
+         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+         * generated in one invocation.
+         */
+        if ($bytes > 2147483647) {
+            for ($i = 0; $i < $bytes; $i += 1073741824) {
+                $n = ($bytes - $i) > 1073741824
+                    ? 1073741824
+                    : $bytes - $i;
+                $buf .= Sodium::randombytes_buf($n);
+            }
+        } else {
+            $buf .= Sodium::randombytes_buf($bytes);
+        }
+
+        if (is_string($buf)) {
+            if (RandomCompat_strlen($buf) === $bytes) {
+                return $buf;
+            }
+        }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
new file mode 100644
index 00000000..3bce91a5
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Random_* Compatibility Library
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+if (!is_callable('random_bytes')) {
+    /**
+     * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
+     *
+     * @ref https://bugs.php.net/bug.php?id=55169
+     * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
+     *
+     * @param int $bytes
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    function random_bytes($bytes)
+    {
+        try {
+            $bytes = RandomCompat_intval($bytes);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_bytes(): $bytes must be an integer'
+            );
+        }
+
+        if ($bytes < 1) {
+            throw new Error(
+                'Length must be greater than 0'
+            );
+        }
+
+        $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+        if (
+            $buf !== false
+            &&
+            RandomCompat_strlen($buf) === $bytes
+        ) {
+            /**
+             * Return our random entropy buffer here:
+             */
+            return $buf;
+        }
+
+        /**
+         * If we reach here, PHP has failed us.
+         */
+        throw new Exception(
+            'Could not gather sufficient random data'
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_openssl.php b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_openssl.php
new file mode 100644
index 00000000..2a7ecc53
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_bytes_openssl.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Random_* Compatibility Library 
+ * for using the new PHP 7 random_* API in PHP 5 projects
+ * 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Paragon Initiative Enterprises
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * Since openssl_random_pseudo_bytes() uses openssl's 
+ * RAND_pseudo_bytes() API, which has been marked as deprecated by the
+ * OpenSSL team, this is our last resort before failure.
+ * 
+ * @ref https://www.openssl.org/docs/crypto/RAND_bytes.html
+ * 
+ * @param int $bytes
+ * 
+ * @throws Exception
+ * 
+ * @return string
+ */
+function random_bytes($bytes)
+{
+    try {
+        $bytes = RandomCompat_intval($bytes);
+    } catch (TypeError $ex) {
+        throw new TypeError(
+            'random_bytes(): $bytes must be an integer'
+        );
+    }
+
+    if ($bytes < 1) {
+        throw new Error(
+            'Length must be greater than 0'
+        );
+    }
+
+    /**
+     * $secure is passed by reference. If it's set to false, fail. Note
+     * that this will only return false if this function fails to return
+     * any data.
+     * 
+     * @ref https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973
+     */
+    $secure = true;
+    /**
+     * @var string
+     */
+    $buf = openssl_random_pseudo_bytes($bytes, $secure);
+    if (
+        is_string($buf)
+        &&
+        $secure
+        &&
+        RandomCompat_strlen($buf) === $bytes
+    ) {
+        return $buf;
+    }
+
+    /**
+     * If we reach here, PHP has failed us.
+     */
+    throw new Exception(
+        'Could not gather sufficient random data'
+    );
+}
diff --git a/core/libraries/vendor/paragonie/random_compat/lib/random_int.php b/core/libraries/vendor/paragonie/random_compat/lib/random_int.php
new file mode 100644
index 00000000..b2ea02d1
--- /dev/null
+++ b/core/libraries/vendor/paragonie/random_compat/lib/random_int.php
@@ -0,0 +1,190 @@
+<?php
+
+if (!is_callable('random_int')) {
+    /**
+     * Random_* Compatibility Library
+     * for using the new PHP 7 random_* API in PHP 5 projects
+     *
+     * The MIT License (MIT)
+     *
+     * Copyright (c) 2015 - 2017 Paragon Initiative Enterprises
+     *
+     * Permission is hereby granted, free of charge, to any person obtaining a copy
+     * of this software and associated documentation files (the "Software"), to deal
+     * in the Software without restriction, including without limitation the rights
+     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     * copies of the Software, and to permit persons to whom the Software is
+     * furnished to do so, subject to the following conditions:
+     *
+     * The above copyright notice and this permission notice shall be included in
+     * all copies or substantial portions of the Software.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+     * SOFTWARE.
+     */
+
+    /**
+     * Fetch a random integer between $min and $max inclusive
+     *
+     * @param int $min
+     * @param int $max
+     *
+     * @throws Exception
+     *
+     * @return int
+     */
+    function random_int($min, $max)
+    {
+        /**
+         * Type and input logic checks
+         *
+         * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+         * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+         * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
+         * lose precision, so the <= and => operators might accidentally let a float
+         * through.
+         */
+
+        try {
+            $min = RandomCompat_intval($min);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_int(): $min must be an integer'
+            );
+        }
+
+        try {
+            $max = RandomCompat_intval($max);
+        } catch (TypeError $ex) {
+            throw new TypeError(
+                'random_int(): $max must be an integer'
+            );
+        }
+
+        /**
+         * Now that we've verified our weak typing system has given us an integer,
+         * let's validate the logic then we can move forward with generating random
+         * integers along a given range.
+         */
+        if ($min > $max) {
+            throw new Error(
+                'Minimum value must be less than or equal to the maximum value'
+            );
+        }
+
+        if ($max === $min) {
+            return $min;
+        }
+
+        /**
+         * Initialize variables to 0
+         *
+         * We want to store:
+         * $bytes => the number of random bytes we need
+         * $mask => an integer bitmask (for use with the &) operator
+         *          so we can minimize the number of discards
+         */
+        $attempts = $bits = $bytes = $mask = $valueShift = 0;
+
+        /**
+         * At this point, $range is a positive number greater than 0. It might
+         * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+         * a float and we will lose some precision.
+         */
+        $range = $max - $min;
+
+        /**
+         * Test for integer overflow:
+         */
+        if (!is_int($range)) {
+
+            /**
+             * Still safely calculate wider ranges.
+             * Provided by @CodesInChaos, @oittaa
+             *
+             * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+             *
+             * We use ~0 as a mask in this case because it generates all 1s
+             *
+             * @ref https://eval.in/400356 (32-bit)
+             * @ref http://3v4l.org/XX9r5  (64-bit)
+             */
+            $bytes = PHP_INT_SIZE;
+            $mask = ~0;
+
+        } else {
+
+            /**
+             * $bits is effectively ceil(log($range, 2)) without dealing with
+             * type juggling
+             */
+            while ($range > 0) {
+                if ($bits % 8 === 0) {
+                    ++$bytes;
+                }
+                ++$bits;
+                $range >>= 1;
+                $mask = $mask << 1 | 1;
+            }
+            $valueShift = $min;
+        }
+
+        $val = 0;
+        /**
+         * Now that we have our parameters set up, let's begin generating
+         * random integers until one falls between $min and $max
+         */
+        do {
+            /**
+             * The rejection probability is at most 0.5, so this corresponds
+             * to a failure probability of 2^-128 for a working RNG
+             */
+            if ($attempts > 128) {
+                throw new Exception(
+                    'random_int: RNG is broken - too many rejections'
+                );
+            }
+
+            /**
+             * Let's grab the necessary number of random bytes
+             */
+            $randomByteString = random_bytes($bytes);
+
+            /**
+             * Let's turn $randomByteString into an integer
+             *
+             * This uses bitwise operators (<< and |) to build an integer
+             * out of the values extracted from ord()
+             *
+             * Example: [9F] | [6D] | [32] | [0C] =>
+             *   159 + 27904 + 3276800 + 201326592 =>
+             *   204631455
+             */
+            $val &= 0;
+            for ($i = 0; $i < $bytes; ++$i) {
+                $val |= ord($randomByteString[$i]) << ($i * 8);
+            }
+
+            /**
+             * Apply mask
+             */
+            $val &= $mask;
+            $val += $valueShift;
+
+            ++$attempts;
+            /**
+             * If $val overflows to a floating point number,
+             * ... or is larger than $max,
+             * ... or smaller than $min,
+             * then try again.
+             */
+        } while (!is_int($val) || $val > $max || $val < $min);
+
+        return (int)$val;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/LICENSE b/core/libraries/vendor/paragonie/sodium_compat/LICENSE
new file mode 100644
index 00000000..532a3cf5
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/LICENSE
@@ -0,0 +1,21 @@
+/*
+ * ISC License
+ *
+ * Copyright (c) 2016-2018
+ * Paragon Initiative Enterprises <security at paragonie dot com>
+ *
+ * Copyright (c) 2013-2018
+ * Frank Denis <j at pureftpd dot org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
\ No newline at end of file
diff --git a/core/libraries/vendor/paragonie/sodium_compat/autoload-fast.php b/core/libraries/vendor/paragonie/sodium_compat/autoload-fast.php
new file mode 100644
index 00000000..08724d1e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/autoload-fast.php
@@ -0,0 +1,4 @@
+<?php
+
+require_once 'autoload.php';
+ParagonIE_Sodium_Compat::$fastMult = true;
diff --git a/core/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php b/core/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php
new file mode 100644
index 00000000..e4646ca8
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/autoload-pedantic.php
@@ -0,0 +1,6 @@
+<?php
+
+require_once 'autoload.php';
+define('DO_PEDANTIC_TEST', true);
+
+ParagonIE_Sodium_Compat::$fastMult = true;
diff --git a/core/libraries/vendor/paragonie/sodium_compat/autoload.php b/core/libraries/vendor/paragonie/sodium_compat/autoload.php
new file mode 100644
index 00000000..de2683da
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/autoload.php
@@ -0,0 +1,49 @@
+<?php
+
+if (!is_callable('sodiumCompatAutoloader')) {
+    /**
+     * Sodium_Compat autoloader.
+     *
+     * @param string $class Class name to be autoloaded.
+     *
+     * @return bool         Stop autoloading?
+     */
+    function sodiumCompatAutoloader($class)
+    {
+        $namespace = 'ParagonIE_Sodium_';
+        // Does the class use the namespace prefix?
+        $len = strlen($namespace);
+        if (strncmp($namespace, $class, $len) !== 0) {
+            // no, move to the next registered autoloader
+            return false;
+        }
+
+        // Get the relative class name
+        $relative_class = substr($class, $len);
+
+        // Replace the namespace prefix with the base directory, replace namespace
+        // separators with directory separators in the relative class name, append
+        // with .php
+        $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+        // if the file exists, require it
+        if (file_exists($file)) {
+            require_once $file;
+            return true;
+        }
+        return false;
+    }
+
+    // Now that we have an autoloader, let's register it!
+    spl_autoload_register('sodiumCompatAutoloader');
+}
+
+require_once dirname(__FILE__) . '/src/SodiumException.php';
+if (PHP_VERSION_ID >= 50300) {
+    // Namespaces didn't exist before 5.3.0, so don't even try to use this
+    // unless PHP >= 5.3.0
+    require_once dirname(__FILE__) . '/lib/namespaced.php';
+    require_once dirname(__FILE__) . '/lib/sodium_compat.php';
+}
+if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
+    require_once dirname(__FILE__) . '/lib/php72compat.php';
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/lib/constants.php b/core/libraries/vendor/paragonie/sodium_compat/lib/constants.php
new file mode 100644
index 00000000..8ddb6a48
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/lib/constants.php
@@ -0,0 +1,50 @@
+<?php
+namespace Sodium;
+
+use ParagonIE_Sodium_Compat;
+
+const CRYPTO_AEAD_AES256GCM_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_KEYBYTES;
+const CRYPTO_AEAD_AES256GCM_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_NSECBYTES;
+const CRYPTO_AEAD_AES256GCM_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_NPUBBYTES;
+const CRYPTO_AEAD_AES256GCM_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_ABYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES;
+const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES;
+const CRYPTO_AUTH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_BYTES;
+const CRYPTO_AUTH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_KEYBYTES;
+const CRYPTO_BOX_SEALBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEALBYTES;
+const CRYPTO_BOX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES;
+const CRYPTO_BOX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES;
+const CRYPTO_BOX_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES;
+const CRYPTO_BOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_MACBYTES;
+const CRYPTO_BOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES;
+const CRYPTO_BOX_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEEDBYTES;
+const CRYPTO_KX_BYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_BYTES;
+const CRYPTO_KX_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_SEEDBYTES;
+const CRYPTO_KX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_PUBLICKEYBYTES;
+const CRYPTO_KX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_SECRETKEYBYTES;
+const CRYPTO_GENERICHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES;
+const CRYPTO_GENERICHASH_BYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN;
+const CRYPTO_GENERICHASH_BYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX;
+const CRYPTO_GENERICHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES;
+const CRYPTO_GENERICHASH_KEYBYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN;
+const CRYPTO_GENERICHASH_KEYBYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX;
+const CRYPTO_SCALARMULT_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_BYTES;
+const CRYPTO_SCALARMULT_SCALARBYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_SCALARBYTES;
+const CRYPTO_SHORTHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_BYTES;
+const CRYPTO_SHORTHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_KEYBYTES;
+const CRYPTO_SECRETBOX_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES;
+const CRYPTO_SECRETBOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES;
+const CRYPTO_SECRETBOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES;
+const CRYPTO_SIGN_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES;
+const CRYPTO_SIGN_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SEEDBYTES;
+const CRYPTO_SIGN_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES;
+const CRYPTO_SIGN_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES;
+const CRYPTO_SIGN_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_KEYPAIRBYTES;
+const CRYPTO_STREAM_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_KEYBYTES;
+const CRYPTO_STREAM_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_NONCEBYTES;
diff --git a/core/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php b/core/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php
new file mode 100644
index 00000000..58f20418
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/lib/namespaced.php
@@ -0,0 +1,46 @@
+<?php
+
+if (PHP_VERSION_ID < 50300) {
+    return;
+}
+
+/*
+ * This file is just for convenience, to allow developers to reduce verbosity when
+ * they add this project to their libraries.
+ *
+ * Replace this:
+ *
+ * $x = ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
+ *
+ * with this:
+ *
+ * use ParagonIE\Sodium\Compat;
+ *
+ * $x = Compat::crypto_aead_xchacha20poly1305_encrypt(...$args);
+ */
+spl_autoload_register(function ($class) {
+    if ($class[0] === '\\') {
+        $class = substr($class, 1);
+    }
+    $namespace = 'ParagonIE\\Sodium';
+    // Does the class use the namespace prefix?
+    $len = strlen($namespace);
+    if (strncmp($namespace, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return false;
+    }
+
+    // Get the relative class name
+    $relative_class = substr($class, $len);
+
+    // Replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = dirname(__DIR__) . '/namespaced/' . str_replace('\\', '/', $relative_class) . '.php';
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require_once $file;
+        return true;
+    }
+    return false;
+});
diff --git a/core/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php b/core/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php
new file mode 100644
index 00000000..6f22f342
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/lib/php72compat.php
@@ -0,0 +1,1052 @@
+<?php
+
+/**
+ * This file will monkey patch the pure-PHP implementation in place of the
+ * PECL functions and constants, but only if they do not already exist.
+ *
+ * Thus, the functions or constants just proxy to the appropriate
+ * ParagonIE_Sodium_Compat method or class constant, respectively.
+ */
+foreach (array(
+    'CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_ABYTES',
+    'CRYPTO_AEAD_AES256GCM_KEYBYTES',
+    'CRYPTO_AEAD_AES256GCM_NSECBYTES',
+    'CRYPTO_AEAD_AES256GCM_NPUBBYTES',
+    'CRYPTO_AEAD_AES256GCM_ABYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES',
+    'CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES',
+    'CRYPTO_AUTH_BYTES',
+    'CRYPTO_AUTH_KEYBYTES',
+    'CRYPTO_BOX_SEALBYTES',
+    'CRYPTO_BOX_SECRETKEYBYTES',
+    'CRYPTO_BOX_PUBLICKEYBYTES',
+    'CRYPTO_BOX_KEYPAIRBYTES',
+    'CRYPTO_BOX_MACBYTES',
+    'CRYPTO_BOX_NONCEBYTES',
+    'CRYPTO_BOX_SEEDBYTES',
+    'CRYPTO_KX_BYTES',
+    'CRYPTO_KX_SEEDBYTES',
+    'CRYPTO_KX_PUBLICKEYBYTES',
+    'CRYPTO_KX_SECRETKEYBYTES',
+    'CRYPTO_GENERICHASH_BYTES',
+    'CRYPTO_GENERICHASH_BYTES_MIN',
+    'CRYPTO_GENERICHASH_BYTES_MAX',
+    'CRYPTO_GENERICHASH_KEYBYTES',
+    'CRYPTO_GENERICHASH_KEYBYTES_MIN',
+    'CRYPTO_GENERICHASH_KEYBYTES_MAX',
+    'CRYPTO_PWHASH_SALTBYTES',
+    'CRYPTO_PWHASH_STRPREFIX',
+    'CRYPTO_PWHASH_ALG_ARGON2I13',
+    'CRYPTO_PWHASH_ALG_ARGON2ID13',
+    'CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE',
+    'CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE',
+    'CRYPTO_PWHASH_MEMLIMIT_MODERATE',
+    'CRYPTO_PWHASH_OPSLIMIT_MODERATE',
+    'CRYPTO_PWHASH_MEMLIMIT_SENSITIVE',
+    'CRYPTO_PWHASH_OPSLIMIT_SENSITIVE',
+    'CRYPTO_SCALARMULT_BYTES',
+    'CRYPTO_SCALARMULT_SCALARBYTES',
+    'CRYPTO_SHORTHASH_BYTES',
+    'CRYPTO_SHORTHASH_KEYBYTES',
+    'CRYPTO_SECRETBOX_KEYBYTES',
+    'CRYPTO_SECRETBOX_MACBYTES',
+    'CRYPTO_SECRETBOX_NONCEBYTES',
+    'CRYPTO_SIGN_BYTES',
+    'CRYPTO_SIGN_SEEDBYTES',
+    'CRYPTO_SIGN_PUBLICKEYBYTES',
+    'CRYPTO_SIGN_SECRETKEYBYTES',
+    'CRYPTO_SIGN_KEYPAIRBYTES',
+    'CRYPTO_STREAM_KEYBYTES',
+    'CRYPTO_STREAM_NONCEBYTES',
+    ) as $constant
+) {
+    if (!defined("SODIUM_$constant")) {
+        define("SODIUM_$constant", constant("ParagonIE_Sodium_Compat::$constant"));
+    }
+}
+
+if (!is_callable('sodium_bin2hex')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::hex2bin()
+     * @param string $string
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_bin2hex($string)
+    {
+        return ParagonIE_Sodium_Compat::bin2hex($string);
+    }
+}
+if (!is_callable('sodium_compare')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::compare()
+     * @param string $a
+     * @param string $b
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_compare($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::compare($a, $b);
+    }
+}
+if (!is_callable('sodium_crypto_aead_aes256gcm_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_aead_aes256gcm_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_aes256gcm_is_available')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available()
+     * @return bool
+     */
+    function sodium_crypto_aead_aes256gcm_is_available()
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available();
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_keygen()
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_keygen()
+     * @return string
+     */
+    function sodium_crypto_aead_chacha20poly1305_ietf_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     */
+    function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_keygen()
+     * @return string
+     */
+    function sodium_crypto_aead_xchacha20poly1305_ietf_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_auth')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_auth()
+     * @param string $message
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_auth($message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+    }
+}
+if (!is_callable('sodium_crypto_auth_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_auth_keygen()
+     * @return string
+     */
+    function sodium_crypto_auth_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_auth_verify')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_auth_verify()
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+    }
+}
+if (!is_callable('sodium_crypto_box')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box()
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box($message, $nonce, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+    }
+}
+if (!is_callable('sodium_crypto_box_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_keypair()
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair();
+    }
+}
+if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey()
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+    }
+}
+if (!is_callable('sodium_crypto_box_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_open()
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string|bool
+     */
+    function sodium_crypto_box_open($message, $nonce, $kp)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_box_publickey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_publickey()
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey()
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('sodium_crypto_box_seal')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_seal()
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_seal($message, $publicKey)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+    }
+}
+if (!is_callable('sodium_crypto_box_seal_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_seal_open()
+     * @param string $message
+     * @param string $kp
+     * @return string|bool
+     */
+    function sodium_crypto_box_seal_open($message, $kp)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_box_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_secretkey()
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_box_seed_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_seed_keypair()
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_box_seed_keypair($seed)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
+    }
+}
+if (!is_callable('sodium_crypto_generichash')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash()
+     * @param string $message
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_generichash($message, $key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+    }
+}
+if (!is_callable('sodium_crypto_generichash_final')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_final()
+     * @param string|null $ctx
+     * @param int $outputLength
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_generichash_final(&$ctx, $outputLength = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+    }
+}
+if (!is_callable('sodium_crypto_generichash_init')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_init()
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_generichash_init($key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+    }
+}
+if (!is_callable('sodium_crypto_generichash_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_keygen()
+     * @return string
+     */
+    function sodium_crypto_generichash_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_generichash_update')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_update()
+     * @param string|null $ctx
+     * @param string $message
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_generichash_update(&$ctx, $message = '')
+    {
+        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+    }
+}
+if (!is_callable('sodium_crypto_kx')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_kx()
+     * @param string $my_secret
+     * @param string $their_public
+     * @param string $client_public
+     * @param string $server_public
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    {
+        return ParagonIE_Sodium_Compat::crypto_kx(
+            $my_secret,
+            $their_public,
+            $client_public,
+            $server_public
+        );
+    }
+}
+if (!is_callable('sodium_crypto_pwhash')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash()
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @param int|null $algo
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $algo = null)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $algo);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_str')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_str()
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_str_verify')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_str_verify()
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_pwhash_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256()
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str()
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify()
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+    }
+}
+if (!is_callable('sodium_crypto_scalarmult')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_scalarmult()
+     * @param string $n
+     * @param string $p
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_scalarmult($n, $p)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+    }
+}
+if (!is_callable('sodium_crypto_scalarmult_base')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_scalarmult_base()
+     * @param string $n
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_scalarmult_base($n)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+    }
+}
+if (!is_callable('sodium_crypto_secretbox')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_secretbox()
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_secretbox($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_secretbox_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_secretbox_keygen()
+     * @return string
+     */
+    function sodium_crypto_secretbox_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_secretbox_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_secretbox_open()
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string|bool
+     */
+    function sodium_crypto_secretbox_open($message, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_shorthash')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_shorthash()
+     * @param string $message
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_shorthash($message, $key = '')
+    {
+        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+    }
+}
+if (!is_callable('sodium_crypto_shorthash_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_shorthash_keygen()
+     * @return string
+     */
+    function sodium_crypto_shorthash_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_shorthash_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_sign')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign()
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_detached')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_detached()
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_keypair()
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+    }
+}
+if (!is_callable('sodium_crypto_sign_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_open()
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string|bool
+     */
+    function sodium_crypto_sign_open($signedMessage, $pk)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('sodium_crypto_sign_publickey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_publickey()
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey()
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_secretkey()
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+    }
+}
+if (!is_callable('sodium_crypto_sign_seed_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_seed_keypair()
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_seed_keypair($seed)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+    }
+}
+if (!is_callable('sodium_crypto_sign_verify_detached')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_verify_detached()
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_ed25519_pk_to_curve25519')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519()
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_ed25519_pk_to_curve25519($pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519($pk);
+    }
+}
+if (!is_callable('sodium_crypto_sign_ed25519_sk_to_curve25519')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519()
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_sign_ed25519_sk_to_curve25519($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
+    }
+}
+if (!is_callable('sodium_crypto_stream')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_stream()
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_stream($len, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_crypto_stream_keygen')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_stream_keygen()
+     * @return string
+     */
+    function sodium_crypto_stream_keygen()
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream_keygen();
+    }
+}
+if (!is_callable('sodium_crypto_stream_xor')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_stream_xor()
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_crypto_stream_xor($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+    }
+}
+if (!is_callable('sodium_hex2bin')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::hex2bin()
+     * @param string $string
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_hex2bin($string)
+    {
+        return ParagonIE_Sodium_Compat::hex2bin($string);
+    }
+}
+if (!is_callable('sodium_increment')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::increment()
+     * @param &string $string
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_increment(&$string)
+    {
+        ParagonIE_Sodium_Compat::increment($string);
+    }
+}
+if (!is_callable('sodium_library_version_major')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::library_version_major()
+     * @return int
+     */
+    function sodium_library_version_major()
+    {
+        return ParagonIE_Sodium_Compat::library_version_major();
+    }
+}
+if (!is_callable('sodium_library_version_minor')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::library_version_minor()
+     * @return int
+     */
+    function sodium_library_version_minor()
+    {
+        return ParagonIE_Sodium_Compat::library_version_minor();
+    }
+}
+if (!is_callable('sodium_version_string')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::version_string()
+     * @return string
+     */
+    function sodium_version_string()
+    {
+        return ParagonIE_Sodium_Compat::version_string();
+    }
+}
+if (!is_callable('sodium_memcmp')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::memcmp()
+     * @param string $a
+     * @param string $b
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_memcmp($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+    }
+}
+if (!is_callable('sodium_memzero')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::memzero()
+     * @param string &$str
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    function sodium_memzero(&$str)
+    {
+        ParagonIE_Sodium_Compat::memzero($str);
+    }
+}
+if (!is_callable('sodium_randombytes_buf')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::randombytes_buf()
+     * @param int $amount
+     * @return string
+     * @throws Exception
+     */
+    function sodium_randombytes_buf($amount)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+    }
+}
+
+if (!is_callable('sodium_randombytes_uniform')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::randombytes_uniform()
+     * @param int $upperLimit
+     * @return int
+     * @throws Exception
+     */
+    function sodium_randombytes_uniform($upperLimit)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+    }
+}
+
+if (!is_callable('sodium_randombytes_random16')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::randombytes_random16()
+     * @return int
+     */
+    function sodium_randombytes_random16()
+    {
+        return ParagonIE_Sodium_Compat::randombytes_random16();
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php b/core/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php
new file mode 100644
index 00000000..1799bb57
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/lib/sodium_compat.php
@@ -0,0 +1,835 @@
+<?php
+namespace Sodium;
+
+use ParagonIE_Sodium_Compat;
+
+/**
+ * This file will monkey patch the pure-PHP implementation in place of the
+ * PECL functions, but only if they do not already exist.
+ *
+ * Thus, the functions just proxy to the appropriate ParagonIE_Sodium_Compat
+ * method.
+ */
+if (!is_callable('\\Sodium\\bin2hex')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::bin2hex()
+     * @param string $string
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function bin2hex($string)
+    {
+        return ParagonIE_Sodium_Compat::bin2hex($string);
+    }
+}
+if (!is_callable('\\Sodium\\compare')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::compare()
+     * @param string $a
+     * @param string $b
+     * @return int
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function compare($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::compare($a, $b);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_aes256gcm_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string|bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_aes256gcm_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_aes256gcm_is_available')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available()
+     * @return bool
+     */
+    function crypto_aead_aes256gcm_is_available()
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available();
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string|bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string|bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt()
+     * @param string $message
+     * @param string $assocData
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_auth')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_auth()
+     * @param string $message
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_auth($message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_auth_verify')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_auth_verify()
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box()
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box($message, $nonce, $kp)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_keypair()
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair();
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey()
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_keypair_from_secretkey_and_publickey($sk, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_open()
+     * @param string $message
+     * @param string $nonce
+     * @param string $kp
+     * @return string|bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_open($message, $nonce, $kp)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_publickey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_publickey()
+     * @param string $keypair
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_publickey_from_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey()
+     * @param string $sk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_seal')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_seal_open()
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_seal($message, $publicKey)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_seal_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_seal_open()
+     * @param string $message
+     * @param string $kp
+     * @return string|bool
+     * @throws \TypeError
+     */
+    function crypto_box_seal_open($message, $kp)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
+        } catch (\Error $ex) {
+            return false;
+        } catch (\Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_box_secretkey()
+     * @param string $keypair
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_box_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash()
+     * @param string $message
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_generichash($message, $key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash_final')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_final()
+     * @param string|null $ctx
+     * @param int $outputLength
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_generichash_final(&$ctx, $outputLength = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash_init')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_init()
+     * @param string|null $key
+     * @param int $outLen
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_generichash_init($key = null, $outLen = 32)
+    {
+        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_generichash_update')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_generichash_update()
+     * @param string|null $ctx
+     * @param string $message
+     * @return void
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_generichash_update(&$ctx, $message = '')
+    {
+        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_kx')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_kx()
+     * @param string $my_secret
+     * @param string $their_public
+     * @param string $client_public
+     * @param string $server_public
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    {
+        return ParagonIE_Sodium_Compat::crypto_kx(
+            $my_secret,
+            $their_public,
+            $client_public,
+            $server_public
+        );
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash()
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_str()
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_str_verify')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_str_verify()
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_pwhash_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256()
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str()
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify()
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    {
+        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_scalarmult')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_scalarmult()
+     * @param string $n
+     * @param string $p
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_scalarmult($n, $p)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_scalarmult_base')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_scalarmult_base()
+     * @param string $n
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_scalarmult_base($n)
+    {
+        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_secretbox')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_secretbox()
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_secretbox($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_secretbox_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_secretbox_open()
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string|bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_secretbox_open($message, $nonce, $key)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
+        } catch (Error $ex) {
+            return false;
+        } catch (Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_shorthash')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_shorthash()
+     * @param string $message
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_shorthash($message, $key = '')
+    {
+        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign()
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_detached')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_detached()
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_keypair()
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_keypair()
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_open')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_open()
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string|bool
+     */
+    function crypto_sign_open($signedMessage, $pk)
+    {
+        try {
+            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
+        } catch (\Error $ex) {
+            return false;
+        } catch (\Exception $ex) {
+            return false;
+        }
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_publickey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_publickey()
+     * @param string $keypair
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_publickey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_publickey_from_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey()
+     * @param string $sk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_publickey_from_secretkey($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_secretkey')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_secretkey()
+     * @param string $keypair
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_secretkey($keypair)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_seed_keypair')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_seed_keypair()
+     * @param string $seed
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_seed_keypair($seed)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_verify_detached')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_verify_detached()
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_ed25519_pk_to_curve25519')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519()
+     * @param string $pk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_ed25519_pk_to_curve25519($pk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519($pk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519()
+     * @param string $sk
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_sign_ed25519_sk_to_curve25519($sk)
+    {
+        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_stream')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_stream()
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_stream($len, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\crypto_stream_xor')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::crypto_stream_xor()
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function crypto_stream_xor($message, $nonce, $key)
+    {
+        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
+    }
+}
+if (!is_callable('\\Sodium\\hex2bin')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::hex2bin()
+     * @param string $string
+     * @return string
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function hex2bin($string)
+    {
+        return ParagonIE_Sodium_Compat::hex2bin($string);
+    }
+}
+if (!is_callable('\\Sodium\\memcmp')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::memcmp()
+     * @param string $a
+     * @param string $b
+     * @return int
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function memcmp($a, $b)
+    {
+        return ParagonIE_Sodium_Compat::memcmp($a, $b);
+    }
+}
+if (!is_callable('\\Sodium\\memzero')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::memzero()
+     * @param string $str
+     * @return void
+     * @throws \SodiumException
+     * @throws \TypeError
+     */
+    function memzero(&$str)
+    {
+        ParagonIE_Sodium_Compat::memzero($str);
+    }
+}
+if (!is_callable('\\Sodium\\randombytes_buf')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::randombytes_buf()
+     * @param int $amount
+     * @return string
+     * @throws \TypeError
+     */
+    function randombytes_buf($amount)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
+    }
+}
+
+if (!is_callable('\\Sodium\\randombytes_uniform')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::randombytes_uniform()
+     * @param int $upperLimit
+     * @return int
+     * @throws \Exception
+     * @throws \Error
+     */
+    function randombytes_uniform($upperLimit)
+    {
+        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
+    }
+}
+
+if (!is_callable('\\Sodium\\randombytes_random16')) {
+    /**
+     * @see ParagonIE_Sodium_Compat::randombytes_random16()
+     * @return int
+     */
+    function randombytes_random16()
+    {
+        return ParagonIE_Sodium_Compat::randombytes_random16();
+    }
+}
+
+if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
+    require_once dirname(__FILE__) . '/constants.php';
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php
new file mode 100644
index 00000000..c40f7fb4
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Compat.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium;
+
+class Compat extends \ParagonIE_Sodium_Compat
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php
new file mode 100644
index 00000000..f152c5ad
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/BLAKE2b.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class BLAKE2b extends \ParagonIE_Sodium_Core_BLAKE2b
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php
new file mode 100644
index 00000000..08936b5f
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class ChaCha20 extends \ParagonIE_Sodium_Core_ChaCha20
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php
new file mode 100644
index 00000000..ea07a26a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/Ctx.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\ChaCha20;
+
+class Ctx extends \ParagonIE_Sodium_Core_ChaCha20_Ctx
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php
new file mode 100644
index 00000000..c0b2de8d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/ChaCha20/IetfCtx.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\ChaCha20;
+
+class IetfCtx extends \ParagonIE_Sodium_Core_ChaCha20_IetfCtx
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php
new file mode 100644
index 00000000..d4a7ce1e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Curve25519 extends \ParagonIE_Sodium_Core_Curve25519
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php
new file mode 100644
index 00000000..7129065a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Fe.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519;
+
+class Fe extends \ParagonIE_Sodium_Core_Curve25519_Fe
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php
new file mode 100644
index 00000000..269d6a77
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Cached.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class Cached extends \ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php
new file mode 100644
index 00000000..0b700461
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P1p1.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class P1p1 extends \ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php
new file mode 100644
index 00000000..e0c76c6d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P2.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class P2 extends \ParagonIE_Sodium_Core_Curve25519_Ge_P2
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php
new file mode 100644
index 00000000..1a9cad7f
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/P3.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class P3 extends \ParagonIE_Sodium_Core_Curve25519_Ge_P3
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php
new file mode 100644
index 00000000..07e509a8
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/Ge/Precomp.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519\Ge;
+
+class Precomp extends \ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php
new file mode 100644
index 00000000..5ba7fd84
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Curve25519/H.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Curve25519;
+
+class H extends \ParagonIE_Sodium_Core_Curve25519_H
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php
new file mode 100644
index 00000000..13939883
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Ed25519.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Ed25519 extends \ParagonIE_Sodium_Core_Ed25519
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php
new file mode 100644
index 00000000..d96dc14e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HChaCha20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class HChaCha20 extends \ParagonIE_Sodium_Core_HChaCha20
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php
new file mode 100644
index 00000000..e526b99f
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/HSalsa20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class HSalsa20 extends \ParagonIE_Sodium_Core_HSalsa20
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php
new file mode 100644
index 00000000..acfc6d09
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Poly1305 extends \ParagonIE_Sodium_Core_Poly1305
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php
new file mode 100644
index 00000000..a0648e76
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Poly1305/State.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core\Poly1305;
+
+class State extends \ParagonIE_Sodium_Core_Poly1305_State
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php
new file mode 100644
index 00000000..ac83f739
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Salsa20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class SipHash extends \ParagonIE_Sodium_Core_Salsa20
+{
+
+}
\ No newline at end of file
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php
new file mode 100644
index 00000000..4570904a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/SipHash.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class SipHash extends \ParagonIE_Sodium_Core_SipHash
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php
new file mode 100644
index 00000000..6086a361
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Util.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Util extends \ParagonIE_Sodium_Core_Util
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php
new file mode 100644
index 00000000..f17a2cf0
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/X25519.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class X25519 extends \ParagonIE_Sodium_Core_X25519
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php
new file mode 100644
index 00000000..51b5535a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/XChaCha20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class XChaCha20 extends \ParagonIE_Sodium_Core_XChaCha20
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php
new file mode 100644
index 00000000..5338d52c
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Core/Xsalsa20.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium\Core;
+
+class Xsalsa20 extends \ParagonIE_Sodium_Core_Xsalsa20
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php
new file mode 100644
index 00000000..78f092d9
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/Crypto.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium;
+
+class Crypto extends \ParagonIE_Sodium_Crypto
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/namespaced/File.php b/core/libraries/vendor/paragonie/sodium_compat/namespaced/File.php
new file mode 100644
index 00000000..6b40459d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/namespaced/File.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Sodium;
+
+class File extends \ParagonIE_Sodium_File
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Compat.php b/core/libraries/vendor/paragonie/sodium_compat/src/Compat.php
new file mode 100644
index 00000000..0082d339
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Compat.php
@@ -0,0 +1,2706 @@
+<?php
+
+/**
+ * Libsodium compatibility layer
+ *
+ * This is the only class you should be interfacing with, as a user of
+ * sodium_compat.
+ *
+ * If the PHP extension for libsodium is installed, it will always use that
+ * instead of our implementations. You get better performance and stronger
+ * guarantees against side-channels that way.
+ *
+ * However, if your users don't have the PHP extension installed, we offer a
+ * compatible interface here. It will give you the correct results as if the
+ * PHP extension was installed. It won't be as fast, of course.
+ *
+ * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION *
+ *                                                                               *
+ *     Until audited, this is probably not safe to use! DANGER WILL ROBINSON     *
+ *                                                                               *
+ * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION * CAUTION *
+ */
+
+if (class_exists('ParagonIE_Sodium_Compat', false)) {
+    return;
+}
+
+class ParagonIE_Sodium_Compat
+{
+    /**
+     * This parameter prevents the use of the PECL extension.
+     * It should only be used for unit testing.
+     *
+     * @var bool
+     */
+    public static $disableFallbackForUnitTests = false;
+
+    /**
+     * Use fast multiplication rather than our constant-time multiplication
+     * implementation. Can be enabled at runtime. Only enable this if you
+     * are absolutely certain that there is no timing leak on your platform.
+     *
+     * @var bool
+     */
+    public static $fastMult = false;
+
+    const LIBRARY_VERSION_MAJOR = 9;
+    const LIBRARY_VERSION_MINOR = 1;
+    const VERSION_STRING = 'polyfill-1.0.8';
+
+    // From libsodium
+    const CRYPTO_AEAD_AES256GCM_KEYBYTES = 32;
+    const CRYPTO_AEAD_AES256GCM_NSECBYTES = 0;
+    const CRYPTO_AEAD_AES256GCM_NPUBBYTES = 12;
+    const CRYPTO_AEAD_AES256GCM_ABYTES = 16;
+    const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = 32;
+    const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = 0;
+    const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = 8;
+    const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = 16;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = 32;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = 0;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = 12;
+    const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = 16;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES = 32;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES = 0;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES = 24;
+    const CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES = 16;
+    const CRYPTO_AUTH_BYTES = 32;
+    const CRYPTO_AUTH_KEYBYTES = 32;
+    const CRYPTO_BOX_SEALBYTES = 16;
+    const CRYPTO_BOX_SECRETKEYBYTES = 32;
+    const CRYPTO_BOX_PUBLICKEYBYTES = 32;
+    const CRYPTO_BOX_KEYPAIRBYTES = 64;
+    const CRYPTO_BOX_MACBYTES = 16;
+    const CRYPTO_BOX_NONCEBYTES = 24;
+    const CRYPTO_BOX_SEEDBYTES = 32;
+    const CRYPTO_KX_BYTES = 32;
+    const CRYPTO_KX_SEEDBYTES = 32;
+    const CRYPTO_KX_PUBLICKEYBYTES = 32;
+    const CRYPTO_KX_SECRETKEYBYTES = 32;
+    const CRYPTO_GENERICHASH_BYTES = 32;
+    const CRYPTO_GENERICHASH_BYTES_MIN = 16;
+    const CRYPTO_GENERICHASH_BYTES_MAX = 64;
+    const CRYPTO_GENERICHASH_KEYBYTES = 32;
+    const CRYPTO_GENERICHASH_KEYBYTES_MIN = 16;
+    const CRYPTO_GENERICHASH_KEYBYTES_MAX = 64;
+    const CRYPTO_PWHASH_SALTBYTES = 16;
+    const CRYPTO_PWHASH_STRPREFIX = '$argon2i$';
+    const CRYPTO_PWHASH_ALG_ARGON2I13 = 1;
+    const CRYPTO_PWHASH_ALG_ARGON2ID13 = 2;
+    const CRYPTO_PWHASH_MEMLIMIT_INTERACTIVE = 33554432;
+    const CRYPTO_PWHASH_OPSLIMIT_INTERACTIVE = 4;
+    const CRYPTO_PWHASH_MEMLIMIT_MODERATE = 134217728;
+    const CRYPTO_PWHASH_OPSLIMIT_MODERATE = 6;
+    const CRYPTO_PWHASH_MEMLIMIT_SENSITIVE = 536870912;
+    const CRYPTO_PWHASH_OPSLIMIT_SENSITIVE = 8;
+    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES = 32;
+    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX = '$7$';
+    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE = 534288;
+    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE = 16777216;
+    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE = 33554432;
+    const CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE = 1073741824;
+    const CRYPTO_SCALARMULT_BYTES = 32;
+    const CRYPTO_SCALARMULT_SCALARBYTES = 32;
+    const CRYPTO_SHORTHASH_BYTES = 8;
+    const CRYPTO_SHORTHASH_KEYBYTES = 16;
+    const CRYPTO_SECRETBOX_KEYBYTES = 32;
+    const CRYPTO_SECRETBOX_MACBYTES = 16;
+    const CRYPTO_SECRETBOX_NONCEBYTES = 24;
+    const CRYPTO_SIGN_BYTES = 64;
+    const CRYPTO_SIGN_SEEDBYTES = 32;
+    const CRYPTO_SIGN_PUBLICKEYBYTES = 32;
+    const CRYPTO_SIGN_SECRETKEYBYTES = 64;
+    const CRYPTO_SIGN_KEYPAIRBYTES = 96;
+    const CRYPTO_STREAM_KEYBYTES = 32;
+    const CRYPTO_STREAM_NONCEBYTES = 24;
+
+    /**
+     * Cache-timing-safe implementation of bin2hex().
+     *
+     * @param string $string A string (probably raw binary)
+     * @return string        A hexadecimal-encoded string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function bin2hex($string)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_bin2hex($string);
+        }
+        if (self::use_fallback('bin2hex')) {
+            return (string) call_user_func('\\Sodium\\bin2hex', $string);
+        }
+        return ParagonIE_Sodium_Core_Util::bin2hex($string);
+    }
+
+    /**
+     * Compare two strings, in constant-time.
+     * Compared to memcmp(), compare() is more useful for sorting.
+     *
+     * @param string $left The left operand; must be a string
+     * @param string $right The right operand; must be a string
+     * @return int          < 0 if the left operand is less than the right
+     *                      = 0 if both strings are equal
+     *                      > 0 if the right operand is less than the left
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function compare($left, $right)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
+
+        if (self::useNewSodiumAPI()) {
+            return (int) sodium_compare($left, $right);
+        }
+        if (self::use_fallback('compare')) {
+            return (int) call_user_func('\\Sodium\\compare', $left, $right);
+        }
+        return ParagonIE_Sodium_Core_Util::compare($left, $right);
+    }
+
+    /**
+     * Is AES-256-GCM even available to use?
+     *
+     * @return bool
+     * @psalm-suppress UndefinedFunction
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_aead_aes256gcm_is_available()
+    {
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_aead_aes256gcm_is_available();
+        }
+        if (self::use_fallback('crypto_aead_aes256gcm_is_available')) {
+            return call_user_func('\\Sodium\\crypto_aead_aes256gcm_is_available');
+        }
+        if (PHP_VERSION_ID < 70100) {
+            // OpenSSL doesn't support AEAD before 7.1.0
+            return false;
+        }
+        if (!is_callable('openssl_encrypt') || !is_callable('openssl_decrypt')) {
+            // OpenSSL isn't installed
+            return false;
+        }
+        return (bool) in_array('aes-256-gcm', openssl_get_cipher_methods());
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     AES-256-GCM
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData  Authenticated Associated Data (unencrypted)
+     * @param string $nonce      Number to be used only Once; must be 8 bytes
+     * @param string $key        Encryption key
+     *
+     * @return string|bool       The original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_aead_aes256gcm_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        if (!self::crypto_aead_aes256gcm_is_available()) {
+            throw new SodiumException('AES-256-GCM is not available');
+        }
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AES256GCM_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_AES256GCM_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_AES256GCM_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_AES256GCM_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_AES256GCM_ABYTES) {
+            throw new SodiumException('Message must be at least CRYPTO_AEAD_AES256GCM_ABYTES long');
+        }
+
+        if (!self::crypto_aead_aes256gcm_is_available()) {
+            throw new SodiumException('AES-256-GCM is not available');
+        }
+        $ctext = ParagonIE_Sodium_Core_Util::substr($ciphertext, 0, -self::CRYPTO_AEAD_AES256GCM_ABYTES);
+        $authTag = ParagonIE_Sodium_Core_Util::substr($ciphertext, -self::CRYPTO_AEAD_AES256GCM_ABYTES, 16);
+        return openssl_decrypt(
+            $ctext,
+            'aes-256-gcm',
+            $key,
+            OPENSSL_RAW_DATA,
+            $nonce,
+            $authTag,
+            $assocData
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Encryption
+     *
+     * Algorithm:
+     *     AES-256-GCM
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce     Number to be used only Once; must be 8 bytes
+     * @param string $key       Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte GCM message
+     *                          authentication code appended
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_aead_aes256gcm_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        if (!self::crypto_aead_aes256gcm_is_available()) {
+            throw new SodiumException('AES-256-GCM is not available');
+        }
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AES256GCM_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_AES256GCM_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_AES256GCM_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_AES256GCM_KEYBYTES long');
+        }
+        $authTag = '';
+        $ciphertext = openssl_encrypt(
+            $plaintext,
+            'aes-256-gcm',
+            $key,
+            OPENSSL_RAW_DATA,
+            $nonce,
+            $authTag,
+            $assocData
+        );
+        return $ciphertext . $authTag;
+    }
+
+    /**
+     * Return a secure random key for use with the AES-256-GCM
+     * symmetric AEAD interface.
+     *
+     * @return string
+     */
+    public static function crypto_aead_aes256gcm_keygen()
+    {
+        return random_bytes(self::CRYPTO_AEAD_AES256GCM_KEYBYTES);
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string            The original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_aead_chacha20poly1305_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
+            throw new SodiumException('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            /**
+             * @psalm-suppress InvalidReturnStatement
+             * @psalm-suppress FalsableReturnStatement
+             */
+            return sodium_crypto_aead_chacha20poly1305_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_decrypt')) {
+            return call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_decrypt',
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_decrypt(
+            $ciphertext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte Poly1305 message
+     *                          authentication code appended
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_aead_chacha20poly1305_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_aead_chacha20poly1305_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_encrypt')) {
+            return (string) call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_encrypt',
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_encrypt(
+            $plaintext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     * Regular mode uses a 64-bit random nonce with a 64-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 12 bytes
+     * @param string $key Encryption key
+     *
+     * @return string            The original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_aead_chacha20poly1305_ietf_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES) {
+            throw new SodiumException('Message must be at least CRYPTO_AEAD_CHACHA20POLY1305_ABYTES long');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            /**
+             * @psalm-suppress InvalidReturnStatement
+             * @psalm-suppress FalsableReturnStatement
+             */
+            return sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_decrypt')) {
+            return call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt',
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_decrypt(
+            $ciphertext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Return a secure random key for use with the ChaCha20-Poly1305
+     * symmetric AEAD interface.
+     *
+     * @return string
+     */
+    public static function crypto_aead_chacha20poly1305_keygen()
+    {
+        return random_bytes(self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES);
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data
+     *
+     * Algorithm:
+     *     ChaCha20-Poly1305
+     *
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     * Regular mode uses a 64-bit random nonce with a 64-bit counter.
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte Poly1305 message
+     *                          authentication code appended
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_aead_chacha20poly1305_ietf_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES long');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (self::use_fallback('crypto_aead_chacha20poly1305_ietf_encrypt')) {
+            return (string) call_user_func(
+                '\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt',
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_encrypt(
+            $plaintext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Return a secure random key for use with the ChaCha20-Poly1305
+     * symmetric AEAD interface. (IETF version)
+     *
+     * @return string
+     */
+    public static function crypto_aead_chacha20poly1305_ietf_keygen()
+    {
+        return random_bytes(self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES);
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data: Decryption
+     *
+     * Algorithm:
+     *     XChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $ciphertext Encrypted message (with Poly1305 MAC appended)
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string            The original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_aead_xchacha20poly1305_ietf_decrypt(
+        $ciphertext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES) {
+            throw new SodiumException('Message must be at least CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES long');
+        }
+
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_decrypt(
+                $ciphertext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_decrypt(
+            $ciphertext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Authenticated Encryption with Associated Data
+     *
+     * Algorithm:
+     *     XChaCha20-Poly1305
+     *
+     * This mode uses a 64-bit random nonce with a 64-bit counter.
+     * IETF mode uses a 96-bit random nonce with a 32-bit counter.
+     *
+     * @param string $plaintext Message to be encrypted
+     * @param string $assocData Authenticated Associated Data (unencrypted)
+     * @param string $nonce Number to be used only Once; must be 8 bytes
+     * @param string $key Encryption key
+     *
+     * @return string           Ciphertext with a 16-byte Poly1305 message
+     *                          authentication code appended
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_aead_xchacha20poly1305_ietf_encrypt(
+        $plaintext = '',
+        $assocData = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
+            throw new SodiumException('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES) {
+            throw new SodiumException('Key must be CRYPTO_AEAD_XCHACHA20POLY1305_KEYBYTES long');
+        }
+
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_encrypt(
+                $plaintext,
+                $assocData,
+                $nonce,
+                $key
+            );
+        }
+        return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_encrypt(
+            $plaintext,
+            $assocData,
+            $nonce,
+            $key
+        );
+    }
+
+    /**
+     * Return a secure random key for use with the XChaCha20-Poly1305
+     * symmetric AEAD interface.
+     *
+     * @return string
+     */
+    public static function crypto_aead_xchacha20poly1305_ietf_keygen()
+    {
+        return random_bytes(self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES);
+    }
+
+    /**
+     * Authenticate a message. Uses symmetric-key cryptography.
+     *
+     * Algorithm:
+     *     HMAC-SHA512-256. Which is HMAC-SHA-512 truncated to 256 bits.
+     *     Not to be confused with HMAC-SHA-512/256 which would use the
+     *     SHA-512/256 hash function (uses different initial parameters
+     *     but still truncates to 256 bits to sidestep length-extension
+     *     attacks).
+     *
+     * @param string $message Message to be authenticated
+     * @param string $key Symmetric authentication key
+     * @return string         Message authentication code
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_auth($message, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_AUTH_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_auth($message, $key);
+        }
+        if (self::use_fallback('crypto_auth')) {
+            return (string) call_user_func('\\Sodium\\crypto_auth', $message, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::auth($message, $key);
+        }
+        return ParagonIE_Sodium_Crypto::auth($message, $key);
+    }
+
+    /**
+     * @return string
+     */
+    public static function crypto_auth_keygen()
+    {
+        return random_bytes(self::CRYPTO_AUTH_KEYBYTES);
+    }
+
+    /**
+     * Verify the MAC of a message previously authenticated with crypto_auth.
+     *
+     * @param string $mac Message authentication code
+     * @param string $message Message whose authenticity you are attempting to
+     *                        verify (with a given MAC and key)
+     * @param string $key Symmetric authentication key
+     * @return bool           TRUE if authenticated, FALSE otherwise
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_auth_verify($mac, $message, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($mac) !== self::CRYPTO_AUTH_BYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_AUTH_BYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_AUTH_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (bool) sodium_crypto_auth_verify($mac, $message, $key);
+        }
+        if (self::use_fallback('crypto_auth_verify')) {
+            return (bool) call_user_func('\\Sodium\\crypto_auth_verify', $mac, $message, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::auth_verify($mac, $message, $key);
+        }
+        return ParagonIE_Sodium_Crypto::auth_verify($mac, $message, $key);
+    }
+
+    /**
+     * Authenticated asymmetric-key encryption. Both the sender and recipient
+     * may decrypt messages.
+     *
+     * Algorithm: X25519-XSalsa20-Poly1305.
+     *     X25519: Elliptic-Curve Diffie Hellman over Curve25519.
+     *     XSalsa20: Extended-nonce variant of salsa20.
+     *     Poyl1305: Polynomial MAC for one-time message authentication.
+     *
+     * @param string $plaintext The message to be encrypted
+     * @param string $nonce A Number to only be used Once; must be 24 bytes
+     * @param string $keypair Your secret key and your recipient's public key
+     * @return string           Ciphertext with 16-byte Poly1305 MAC
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box($plaintext, $nonce, $keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box($plaintext, $nonce, $keypair);
+        }
+        if (self::use_fallback('crypto_box')) {
+            return (string) call_user_func('\\Sodium\\crypto_box', $plaintext, $nonce, $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box($plaintext, $nonce, $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box($plaintext, $nonce, $keypair);
+    }
+
+    /**
+     * Anonymous public-key encryption. Only the recipient may decrypt messages.
+     *
+     * Algorithm: X25519-XSalsa20-Poly1305, as with crypto_box.
+     *     The sender's X25519 keypair is ephemeral.
+     *     Nonce is generated from the BLAKE2b hash of both public keys.
+     *
+     * This provides ciphertext integrity.
+     *
+     * @param string $plaintext Message to be sealed
+     * @param string $publicKey Your recipient's public key
+     * @return string           Sealed message that only your recipient can
+     *                          decrypt
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box_seal($plaintext, $publicKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_seal($plaintext, $publicKey);
+        }
+        if (self::use_fallback('crypto_box_seal')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_seal', $plaintext, $publicKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_seal($plaintext, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::box_seal($plaintext, $publicKey);
+    }
+
+    /**
+     * Opens a message encrypted with crypto_box_seal(). Requires
+     * the recipient's keypair (sk || pk) to decrypt successfully.
+     *
+     * This validates ciphertext integrity.
+     *
+     * @param string $ciphertext Sealed message to be opened
+     * @param string $keypair    Your crypto_box keypair
+     * @return string            The original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_box_seal_open($ciphertext, $keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            /**
+             * @psalm-suppress InvalidReturnStatement
+             * @psalm-suppress FalsableReturnStatement
+             */
+            return sodium_crypto_box_seal_open($ciphertext, $keypair);
+        }
+        if (self::use_fallback('crypto_box_seal_open')) {
+            return call_user_func('\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_seal_open($ciphertext, $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_seal_open($ciphertext, $keypair);
+    }
+
+    /**
+     * Generate a new random X25519 keypair.
+     *
+     * @return string A 64-byte string; the first 32 are your secret key, while
+     *                the last 32 are your public key. crypto_box_secretkey()
+     *                and crypto_box_publickey() exist to separate them so you
+     *                don't accidentally get them mixed up!
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box_keypair()
+    {
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_keypair();
+        }
+        if (self::use_fallback('crypto_box_keypair')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_keypair');
+        }
+        return ParagonIE_Sodium_Crypto::box_keypair();
+    }
+
+    /**
+     * Combine two keys into a keypair for use in library methods that expect
+     * a keypair. This doesn't necessarily have to be the same person's keys.
+     *
+     * @param string $secretKey Secret key
+     * @param string $publicKey Public key
+     * @return string    Keypair
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+        }
+        if (self::use_fallback('crypto_box_keypair_from_secretkey_and_publickey')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+    }
+
+    /**
+     * Decrypt a message previously encrypted with crypto_box().
+     *
+     * @param string $ciphertext Encrypted message
+     * @param string $nonce      Number to only be used Once; must be 24 bytes
+     * @param string $keypair    Your secret key and the sender's public key
+     * @return string            The original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_box_open($ciphertext, $nonce, $keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_BOX_MACBYTES) {
+            throw new SodiumException('Argument 1 must be at least CRYPTO_BOX_MACBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            /**
+             * @psalm-suppress InvalidReturnStatement
+             * @psalm-suppress FalsableReturnStatement
+             */
+            return sodium_crypto_box_open($ciphertext, $nonce, $keypair);
+        }
+        if (self::use_fallback('crypto_box_open')) {
+            return call_user_func('\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_open($ciphertext, $nonce, $keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_open($ciphertext, $nonce, $keypair);
+    }
+
+    /**
+     * Extract the public key from a crypto_box keypair.
+     *
+     * @param string $keypair
+     * @return string         Your crypto_box public key
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box_publickey($keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_publickey($keypair);
+        }
+        if (self::use_fallback('crypto_box_publickey')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_publickey', $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_publickey($keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_publickey($keypair);
+    }
+
+    /**
+     * Calculate the X25519 public key from a given X25519 secret key.
+     *
+     * @param string $secretKey Any X25519 secret key
+     * @return string      The corresponding X25519 public key
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box_publickey_from_secretkey($secretKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_publickey_from_secretkey($secretKey);
+        }
+        if (self::use_fallback('crypto_box_publickey_from_secretkey')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_publickey_from_secretkey($secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey($secretKey);
+    }
+
+    /**
+     * Extract the secret key from a crypto_box keypair.
+     *
+     * @param string $keypair
+     * @return string         Your crypto_box secret key
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_box_secretkey($keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_secretkey($keypair);
+        }
+        if (self::use_fallback('crypto_box_secretkey')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_secretkey', $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_secretkey($keypair);
+        }
+        return ParagonIE_Sodium_Crypto::box_secretkey($keypair);
+    }
+
+    /**
+     * Generate an X25519 keypair from a seed.
+     *
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress UndefinedFunction
+     */
+    public static function crypto_box_seed_keypair($seed)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_box_seed_keypair($seed);
+        }
+        if (self::use_fallback('crypto_box_seed_keypair')) {
+            return (string) call_user_func('\\Sodium\\crypto_box_seed_keypair', $seed);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::box_seed_keypair($seed);
+        }
+        return ParagonIE_Sodium_Crypto::box_seed_keypair($seed);
+    }
+
+    /**
+     * Calculates a BLAKE2b hash, with an optional key.
+     *
+     * @param string      $message The message to be hashed
+     * @param string|null $key     If specified, must be a string between 16
+     *                             and 64 bytes long
+     * @param int         $length  Output length in bytes; must be between 16
+     *                             and 64 (default = 32)
+     * @return string              Raw binary
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_generichash($message, $key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        if (is_null($key)) {
+            $key = '';
+        }
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 3);
+
+        /* Input validation: */
+        if (!empty($key)) {
+            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+                throw new SodiumException('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+            }
+            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+                throw new SodiumException('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+            }
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_generichash($message, $key, $length);
+        }
+        if (self::use_fallback('crypto_generichash')) {
+            return (string) call_user_func('\\Sodium\\crypto_generichash', $message, $key, $length);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::generichash($message, $key, $length);
+        }
+        return ParagonIE_Sodium_Crypto::generichash($message, $key, $length);
+    }
+
+    /**
+     * Get the final BLAKE2b hash output for a given context.
+     *
+     * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
+     * @param int $length Hash output size.
+     * @return string      Final BLAKE2b hash.
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_generichash_final(&$ctx, $length = self::CRYPTO_GENERICHASH_BYTES)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_generichash_final($ctx, $length);
+        }
+        if (self::use_fallback('crypto_generichash_final')) {
+            $func = '\\Sodium\\crypto_generichash_final';
+            return (string) $func($ctx, $length);
+        }
+        if (PHP_INT_SIZE === 4) {
+            $result = ParagonIE_Sodium_Crypto32::generichash_final($ctx, $length);
+        } else {
+            $result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
+        }
+        try {
+            self::memzero($ctx);
+        } catch (SodiumException $ex) {
+            unset($ctx);
+        }
+        return $result;
+    }
+
+    /**
+     * Initialize a BLAKE2b hashing context, for use in a streaming interface.
+     *
+     * @param string|null $key If specified must be a string between 16 and 64 bytes
+     * @param int $length      The size of the desired hash output
+     * @return string          A BLAKE2 hashing context, encoded as a string
+     *                         (To be 100% compatible with ext/libsodium)
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_generichash_init($key = '', $length = self::CRYPTO_GENERICHASH_BYTES)
+    {
+        /* Type checks: */
+        if (is_null($key)) {
+            $key = '';
+        }
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
+
+        /* Input validation: */
+        if (!empty($key)) {
+            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+                throw new SodiumException('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
+            }
+            if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+                throw new SodiumException('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
+            }
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_generichash_init($key, $length);
+        }
+        if (self::use_fallback('crypto_generichash_init')) {
+            return (string) call_user_func('\\Sodium\\crypto_generichash_init', $key, $length);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::generichash_init($key, $length);
+        }
+        return ParagonIE_Sodium_Crypto::generichash_init($key, $length);
+    }
+
+    /**
+     * Update a BLAKE2b hashing context with additional data.
+     *
+     * @param string &$ctx BLAKE2 hashing context. Generated by crypto_generichash_init().
+     *                        $ctx is passed by reference and gets updated in-place.
+     * @param string $message The message to append to the existing hash state.
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_generichash_update(&$ctx, $message)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+
+        if (self::useNewSodiumAPI()) {
+            sodium_crypto_generichash_update($ctx, $message);
+            return;
+        }
+        if (self::use_fallback('crypto_generichash_update')) {
+            $func = '\\Sodium\\crypto_generichash_update';
+            $func($ctx, $message);
+            return;
+        }
+        if (PHP_INT_SIZE === 4) {
+            $ctx = ParagonIE_Sodium_Crypto32::generichash_update($ctx, $message);
+        } else {
+            $ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public static function crypto_generichash_keygen()
+    {
+        return random_bytes(self::CRYPTO_GENERICHASH_KEYBYTES);
+    }
+
+    /**
+     * Perform a key exchange, between a designated client and a server.
+     *
+     * Typically, you would designate one machine to be the client and the
+     * other to be the server. The first two keys are what you'd expect for
+     * scalarmult() below, but the latter two public keys don't swap places.
+     *
+     * | ALICE                          | BOB                                 |
+     * | Client                         | Server                              |
+     * |--------------------------------|-------------------------------------|
+     * | shared = crypto_kx(            | shared = crypto_kx(                 |
+     * |     alice_sk,                  |     bob_sk,                         | <- contextual
+     * |     bob_pk,                    |     alice_pk,                       | <- contextual
+     * |     alice_pk,                  |     alice_pk,                       | <----- static
+     * |     bob_pk                     |     bob_pk                          | <----- static
+     * | )                              | )                                   |
+     *
+     * They are used along with the scalarmult product to generate a 256-bit
+     * BLAKE2b hash unique to the client and server keys.
+     *
+     * @param string $my_secret
+     * @param string $their_public
+     * @param string $client_public
+     * @param string $server_public
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_kx($my_secret, $their_public, $client_public, $server_public)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($client_public, 'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($server_public, 'string', 4);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($my_secret) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($their_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($client_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($server_public) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 4 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            if (is_callable('sodium_crypto_kx')) {
+                return (string) sodium_crypto_kx(
+                    $my_secret,
+                    $their_public,
+                    $client_public,
+                    $server_public
+                );
+            }
+        }
+        if (self::use_fallback('crypto_kx')) {
+            return (string) call_user_func(
+                '\\Sodium\\crypto_kx',
+                $my_secret,
+                $their_public,
+                $client_public,
+                $server_public
+            );
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::keyExchange(
+                $my_secret,
+                $their_public,
+                $client_public,
+                $server_public
+            );
+        }
+        return ParagonIE_Sodium_Crypto::keyExchange(
+            $my_secret,
+            $their_public,
+            $client_public,
+            $server_public
+        );
+    }
+
+    /**
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @param int|null $alg
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $alg = null)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
+
+        if (self::useNewSodiumAPI()) {
+            if (!is_null($alg)) {
+                ParagonIE_Sodium_Core_Util::declareScalarType($alg, 'int', 6);
+                return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $alg);
+            }
+            return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
+        }
+        if (self::use_fallback('crypto_pwhash')) {
+            return (string) call_user_func('\\Sodium\\crypto_pwhash', $outlen, $passwd, $salt, $opslimit, $memlimit);
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
+        );
+    }
+
+    /**
+     * !Exclusive to sodium_compat!
+     *
+     * This returns TRUE if the native crypto_pwhash API is available by libsodium.
+     * This returns FALSE if only sodium_compat is available.
+     *
+     * @return bool
+     */
+    public static function crypto_pwhash_is_available()
+    {
+        if (self::useNewSodiumAPI()) {
+            return true;
+        }
+        if (self::use_fallback('crypto_pwhash')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_pwhash_str($passwd, $opslimit, $memlimit)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit);
+        }
+        if (self::use_fallback('crypto_pwhash_str')) {
+            return (string) call_user_func('\\Sodium\\crypto_pwhash_str', $passwd, $opslimit, $memlimit);
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
+        );
+    }
+
+    /**
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_pwhash_str_verify($passwd, $hash)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
+
+        if (self::useNewSodiumAPI()) {
+            return (bool) sodium_crypto_pwhash_str_verify($passwd, $hash);
+        }
+        if (self::use_fallback('crypto_pwhash_str_verify')) {
+            return (bool) call_user_func('\\Sodium\\crypto_pwhash_str_verify', $passwd, $hash);
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented, as it is not possible to implement Argon2i with acceptable performance in pure-PHP'
+        );
+    }
+
+    /**
+     * @param int $outlen
+     * @param string $passwd
+     * @param string $salt
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
+        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
+        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
+        }
+        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256')) {
+            return (string) call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256', $outlen, $passwd, $salt, $opslimit, $memlimit);
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
+        );
+    }
+
+    /**
+     * !Exclusive to sodium_compat!
+     *
+     * This returns TRUE if the native crypto_pwhash API is available by libsodium.
+     * This returns FALSE if only sodium_compat is available.
+     *
+     * @return bool
+     */
+    public static function crypto_pwhash_scryptsalsa208sha256_is_available()
+    {
+        if (self::useNewSodiumAPI()) {
+            return true;
+        }
+        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param string $passwd
+     * @param int $opslimit
+     * @param int $memlimit
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
+
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
+        }
+        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str')) {
+            return (string) call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str', $passwd, $opslimit, $memlimit);
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
+        );
+    }
+
+    /**
+     * @param string $passwd
+     * @param string $hash
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
+
+        if (self::useNewSodiumAPI()) {
+            return (bool) sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
+        }
+        if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str_verify')) {
+            return (bool) call_user_func('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify', $passwd, $hash);
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented, as it is not possible to implement Scrypt with acceptable performance in pure-PHP'
+        );
+    }
+
+    /**
+     * Calculate the shared secret between your secret key and your
+     * recipient's public key.
+     *
+     * Algorithm: X25519 (ECDH over Curve25519)
+     *
+     * @param string $secretKey
+     * @param string $publicKey
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_scalarmult($secretKey, $publicKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_scalarmult($secretKey, $publicKey);
+        }
+        if (self::use_fallback('crypto_scalarmult')) {
+            return (string) call_user_func('\\Sodium\\crypto_scalarmult', $secretKey, $publicKey);
+        }
+
+        /* Output validation: Forbid all-zero keys */
+        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
+            throw new SodiumException('Zero secret key is not allowed');
+        }
+        if (ParagonIE_Sodium_Core_Util::hashEquals($publicKey, str_repeat("\0", self::CRYPTO_BOX_PUBLICKEYBYTES))) {
+            throw new SodiumException('Zero public key is not allowed');
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::scalarmult($secretKey, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::scalarmult($secretKey, $publicKey);
+    }
+
+    /**
+     * Calculate an X25519 public key from an X25519 secret key.
+     *
+     * @param string $secretKey
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress TooFewArguments
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_scalarmult_base($secretKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_scalarmult_base($secretKey);
+        }
+        if (self::use_fallback('crypto_scalarmult_base')) {
+            return (string) call_user_func('\\Sodium\\crypto_scalarmult_base', $secretKey);
+        }
+        if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
+            throw new SodiumException('Zero secret key is not allowed');
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::scalarmult_base($secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::scalarmult_base($secretKey);
+    }
+
+    /**
+     * Authenticated symmetric-key encryption.
+     *
+     * Algorithm: XSalsa20-Poly1305
+     *
+     * @param string $plaintext The message you're encrypting
+     * @param string $nonce A Number to be used Once; must be 24 bytes
+     * @param string $key Symmetric encryption key
+     * @return string           Ciphertext with Poly1305 MAC
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_secretbox($plaintext, $nonce, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_secretbox($plaintext, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_secretbox')) {
+            return (string) call_user_func('\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::secretbox($plaintext, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Crypto::secretbox($plaintext, $nonce, $key);
+    }
+
+    /**
+     * Decrypts a message previously encrypted with crypto_secretbox().
+     *
+     * @param string $ciphertext Ciphertext with Poly1305 MAC
+     * @param string $nonce      A Number to be used Once; must be 24 bytes
+     * @param string $key        Symmetric encryption key
+     * @return string            Original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_secretbox_open($ciphertext, $nonce, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            /**
+             * @psalm-suppress InvalidReturnStatement
+             * @psalm-suppress FalsableReturnStatement
+             */
+            return sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_secretbox_open')) {
+            return call_user_func('\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::secretbox_open($ciphertext, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Crypto::secretbox_open($ciphertext, $nonce, $key);
+    }
+
+    /**
+     * Return a secure random key for use with crypto_secretbox
+     *
+     * @return string
+     */
+    public static function crypto_secretbox_keygen()
+    {
+        return random_bytes(self::CRYPTO_SECRETBOX_KEYBYTES);
+    }
+
+    /**
+     * Authenticated symmetric-key encryption.
+     *
+     * Algorithm: XChaCha20-Poly1305
+     *
+     * @param string $plaintext The message you're encrypting
+     * @param string $nonce     A Number to be used Once; must be 24 bytes
+     * @param string $key       Symmetric encryption key
+     * @return string           Ciphertext with Poly1305 MAC
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
+    }
+    /**
+     * Decrypts a message previously encrypted with crypto_secretbox_xchacha20poly1305().
+     *
+     * @param string $ciphertext Ciphertext with Poly1305 MAC
+     * @param string $nonce      A Number to be used Once; must be 24 bytes
+     * @param string $key        Symmetric encryption key
+     * @return string            Original plaintext message
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
+    }
+
+    /**
+     * Calculates a SipHash-2-4 hash of a message for a given key.
+     *
+     * @param string $message Input message
+     * @param string $key SipHash-2-4 key
+     * @return string         Hash
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_shorthash($message, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SHORTHASH_KEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_shorthash($message, $key);
+        }
+        if (self::use_fallback('crypto_shorthash')) {
+            return (string) call_user_func('\\Sodium\\crypto_shorthash', $message, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_SipHash::sipHash24($message, $key);
+        }
+        return ParagonIE_Sodium_Core_SipHash::sipHash24($message, $key);
+    }
+
+    /**
+     * Return a secure random key for use with crypto_shorthash
+     *
+     * @return string
+     */
+    public static function crypto_shorthash_keygen()
+    {
+        return random_bytes(self::CRYPTO_SHORTHASH_KEYBYTES);
+    }
+
+    /**
+     * Returns a signed message. You probably want crypto_sign_detached()
+     * instead, which only returns the signature.
+     *
+     * Algorithm: Ed25519 (EdDSA over Curve25519)
+     *
+     * @param string $message Message to be signed.
+     * @param string $secretKey Secret signing key.
+     * @return string           Signed message (signature is prefixed).
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_sign($message, $secretKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign($message, $secretKey);
+        }
+        if (self::use_fallback('crypto_sign')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign', $message, $secretKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::sign($message, $secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign($message, $secretKey);
+    }
+
+    /**
+     * Validates a signed message then returns the message.
+     *
+     * @param string $signedMessage A signed message
+     * @param string $publicKey A public key
+     * @return string               The original message (if the signature is
+     *                              valid for this public key)
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function crypto_sign_open($signedMessage, $publicKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($signedMessage) < self::CRYPTO_SIGN_BYTES) {
+            throw new SodiumException('Argument 1 must be at least CRYPTO_SIGN_BYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            /**
+             * @psalm-suppress InvalidReturnStatement
+             * @psalm-suppress FalsableReturnStatement
+             */
+            return sodium_crypto_sign_open($signedMessage, $publicKey);
+        }
+        if (self::use_fallback('crypto_sign_open')) {
+            return call_user_func('\\Sodium\\crypto_sign_open', $signedMessage, $publicKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::sign_open($signedMessage, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign_open($signedMessage, $publicKey);
+    }
+
+    /**
+     * Generate a new random Ed25519 keypair.
+     *
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_sign_keypair()
+    {
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_keypair();
+        }
+        if (self::use_fallback('crypto_sign_keypair')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_keypair');
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_Ed25519::keypair();
+        }
+        return ParagonIE_Sodium_Core_Ed25519::keypair();
+    }
+
+    /**
+     * Generate an Ed25519 keypair from a seed.
+     *
+     * @param string $seed Input seed
+     * @return string      Keypair
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_seed_keypair($seed)
+    {
+        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_seed_keypair($seed);
+        }
+        if (self::use_fallback('crypto_sign_keypair')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_seed_keypair', $seed);
+        }
+        $publicKey = '';
+        $secretKey = '';
+        if (PHP_INT_SIZE === 4) {
+            ParagonIE_Sodium_Core32_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+        } else {
+            ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
+        }
+        return $secretKey . $publicKey;
+    }
+
+    /**
+     * Extract an Ed25519 public key from an Ed25519 keypair.
+     *
+     * @param string $keypair Keypair
+     * @return string         Public key
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_publickey($keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_publickey($keypair);
+        }
+        if (self::use_fallback('crypto_sign_publickey')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_publickey', $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_Ed25519::publickey($keypair);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::publickey($keypair);
+    }
+
+    /**
+     * Calculate an Ed25519 public key from an Ed25519 secret key.
+     *
+     * @param string $secretKey Your Ed25519 secret key
+     * @return string           The corresponding Ed25519 public key
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_publickey_from_secretkey($secretKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_publickey_from_secretkey($secretKey);
+        }
+        if (self::use_fallback('crypto_sign_publickey_from_secretkey')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_publickey_from_secretkey', $secretKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_Ed25519::publickey_from_secretkey($secretKey);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey($secretKey);
+    }
+
+    /**
+     * Extract an Ed25519 secret key from an Ed25519 keypair.
+     *
+     * @param string $keypair Keypair
+     * @return string         Secret key
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_secretkey($keypair)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_secretkey($keypair);
+        }
+        if (self::use_fallback('crypto_sign_secretkey')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_secretkey', $keypair);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_Ed25519::secretkey($keypair);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::secretkey($keypair);
+    }
+
+    /**
+     * Calculate the Ed25519 signature of a message and return ONLY the signature.
+     *
+     * Algorithm: Ed25519 (EdDSA over Curve25519)
+     *
+     * @param string $message Message to be signed
+     * @param string $secretKey Secret signing key
+     * @return string           Digital signature
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_detached($message, $secretKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_detached($message, $secretKey);
+        }
+        if (self::use_fallback('crypto_sign_detached')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_detached', $message, $secretKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::sign_detached($message, $secretKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign_detached($message, $secretKey);
+    }
+
+    /**
+     * Verify the Ed25519 signature of a message.
+     *
+     * @param string $signature Digital sginature
+     * @param string $message Message to be verified
+     * @param string $publicKey Public key
+     * @return bool             TRUE if this signature is good for this public key;
+     *                          FALSE otherwise
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($signature) !== self::CRYPTO_SIGN_BYTES) {
+            throw new SodiumException('Argument 1 must be CRYPTO_SIGN_BYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_sign_verify_detached($signature, $message, $publicKey);
+        }
+        if (self::use_fallback('crypto_sign_verify_detached')) {
+            return (bool) call_user_func('\\Sodium\\crypto_sign_verify_detached', $signature, $message, $publicKey);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Crypto32::sign_verify_detached($signature, $message, $publicKey);
+        }
+        return ParagonIE_Sodium_Crypto::sign_verify_detached($signature, $message, $publicKey);
+    }
+
+    /**
+     * Convert an Ed25519 public key to a Curve25519 public key
+     *
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_ed25519_pk_to_curve25519($pk)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($pk, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($pk) < self::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new SodiumException('Argument 1 must be at least CRYPTO_SIGN_PUBLICKEYBYTES long.');
+        }
+        if (self::useNewSodiumAPI()) {
+            if (is_callable('crypto_sign_ed25519_pk_to_curve25519')) {
+                return (string) sodium_crypto_sign_ed25519_pk_to_curve25519($pk);
+            }
+        }
+        if (self::use_fallback('crypto_sign_ed25519_pk_to_curve25519')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_ed25519_pk_to_curve25519', $pk);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_Ed25519::pk_to_curve25519($pk);
+        }
+        return ParagonIE_Sodium_Core_Ed25519::pk_to_curve25519($pk);
+    }
+
+    /**
+     * Convert an Ed25519 secret key to a Curve25519 secret key
+     *
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_sign_ed25519_sk_to_curve25519($sk)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($sk) < self::CRYPTO_SIGN_SEEDBYTES) {
+            throw new SodiumException('Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.');
+        }
+        if (self::useNewSodiumAPI()) {
+            if (is_callable('crypto_sign_ed25519_sk_to_curve25519')) {
+                return sodium_crypto_sign_ed25519_sk_to_curve25519($sk);
+            }
+        }
+        if (self::use_fallback('crypto_sign_ed25519_sk_to_curve25519')) {
+            return (string) call_user_func('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519', $sk);
+        }
+
+        $h = hash('sha512', ParagonIE_Sodium_Core_Util::substr($sk, 0, 32), true);
+        $h[0] = ParagonIE_Sodium_Core_Util::intToChr(
+            ParagonIE_Sodium_Core_Util::chrToInt($h[0]) & 248
+        );
+        $h[31] = ParagonIE_Sodium_Core_Util::intToChr(
+            (ParagonIE_Sodium_Core_Util::chrToInt($h[31]) & 127) | 64
+        );
+        return ParagonIE_Sodium_Core_Util::substr($h, 0, 32);
+    }
+
+    /**
+     * Expand a key and nonce into a keystream of pseudorandom bytes.
+     *
+     * @param int $len Number of bytes desired
+     * @param string $nonce Number to be used Once; must be 24 bytes
+     * @param string $key XSalsa20 key
+     * @return string       Pseudorandom stream that can be XORed with messages
+     *                      to provide encryption (but not authentication; see
+     *                      Poly1305 or crypto_auth() for that, which is not
+     *                      optional for security)
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_stream($len, $nonce, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_STREAM_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_stream($len, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_stream')) {
+            return (string) call_user_func('\\Sodium\\crypto_stream', $len, $nonce, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20($len, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20($len, $nonce, $key);
+    }
+
+    /**
+     * DANGER! UNAUTHENTICATED ENCRYPTION!
+     *
+     * Unless you are following expert advice, do not used this feature.
+     *
+     * Algorithm: XSalsa20
+     *
+     * This DOES NOT provide ciphertext integrity.
+     *
+     * @param string $message Plaintext message
+     * @param string $nonce Number to be used Once; must be 24 bytes
+     * @param string $key Encryption key
+     * @return string         Encrypted text which is vulnerable to chosen-
+     *                        ciphertext attacks unless you implement some
+     *                        other mitigation to the ciphertext (i.e.
+     *                        Encrypt then MAC)
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function crypto_stream_xor($message, $nonce, $key)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+
+        /* Input validation: */
+        if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
+            throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
+        }
+        if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_KEYBYTES) {
+            throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
+        }
+
+        if (self::useNewSodiumAPI()) {
+            return sodium_crypto_stream_xor($message, $nonce, $key);
+        }
+        if (self::use_fallback('crypto_stream_xor')) {
+            return (string) call_user_func('\\Sodium\\crypto_stream_xor', $message, $nonce, $key);
+        }
+        if (PHP_INT_SIZE === 4) {
+            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20_xor($message, $nonce, $key);
+        }
+        return ParagonIE_Sodium_Core_XSalsa20::xsalsa20_xor($message, $nonce, $key);
+    }
+
+    /**
+     * Return a secure random key for use with crypto_stream
+     *
+     * @return string
+     */
+    public static function crypto_stream_keygen()
+    {
+        return random_bytes(self::CRYPTO_STREAM_KEYBYTES);
+    }
+
+    /**
+     * Cache-timing-safe implementation of hex2bin().
+     *
+     * @param string $string Hexadecimal string
+     * @return string        Raw binary string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress TooFewArguments
+     * @psalm-suppress MixedArgument
+     */
+    public static function hex2bin($string)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
+
+        if (self::useNewSodiumAPI()) {
+            if (is_callable('sodium_hex2bin')) {
+                return (string) sodium_hex2bin($string);
+            }
+        }
+        if (self::use_fallback('hex2bin')) {
+            return (string) call_user_func('\\Sodium\\hex2bin', $string);
+        }
+        return ParagonIE_Sodium_Core_Util::hex2bin($string);
+    }
+
+    /**
+     * Increase a string (little endian)
+     *
+     * @param string $var
+     *
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function increment(&$var)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
+
+        if (self::useNewSodiumAPI()) {
+            sodium_increment($var);
+            return;
+        }
+        if (self::use_fallback('increment')) {
+            @call_user_func('\\Sodium\\increment', $var);
+            return;
+        }
+
+        $len = ParagonIE_Sodium_Core_Util::strlen($var);
+        $c = 1;
+        $copy = '';
+        for ($i = 0; $i < $len; ++$i) {
+            $c += ParagonIE_Sodium_Core_Util::chrToInt(
+                ParagonIE_Sodium_Core_Util::substr($var, $i, 1)
+            );
+            $copy .= ParagonIE_Sodium_Core_Util::intToChr($c);
+            $c >>= 8;
+        }
+        $var = $copy;
+    }
+
+    /**
+     * The equivalent to the libsodium minor version we aim to be compatible
+     * with (sans pwhash and memzero).
+     *
+     * @return int
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress UndefinedFunction
+     */
+    public static function library_version_major()
+    {
+        if (self::useNewSodiumAPI()) {
+            return sodium_library_version_major();
+        }
+        if (self::use_fallback('library_version_major')) {
+            return (int) call_user_func('\\Sodium\\library_version_major');
+        }
+        return self::LIBRARY_VERSION_MAJOR;
+    }
+
+    /**
+     * The equivalent to the libsodium minor version we aim to be compatible
+     * with (sans pwhash and memzero).
+     *
+     * @return int
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress UndefinedFunction
+     */
+    public static function library_version_minor()
+    {
+        if (self::useNewSodiumAPI()) {
+            return sodium_library_version_minor();
+        }
+        if (self::use_fallback('library_version_minor')) {
+            return (int) call_user_func('\\Sodium\\library_version_minor');
+        }
+        return self::LIBRARY_VERSION_MINOR;
+    }
+
+    /**
+     * Compare two strings.
+     *
+     * @param string $left
+     * @param string $right
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     */
+    public static function memcmp($left, $right)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
+        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
+
+        if (self::use_fallback('memcmp')) {
+            return (int) call_user_func('\\Sodium\\memcmp', $left, $right);
+        }
+        /** @var string $left */
+        /** @var string $right */
+        return ParagonIE_Sodium_Core_Util::memcmp($left, $right);
+    }
+
+    /**
+     * It's actually not possible to zero memory buffers in PHP. You need the
+     * native library for that.
+     *
+     * @param string|null $var
+     *
+     * @return void
+     * @throws SodiumException (Unless libsodium is installed)
+     * @throws TypeError
+     * @psalm-suppress TooFewArguments
+     */
+    public static function memzero(&$var)
+    {
+        /* Type checks: */
+        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
+
+        if (self::useNewSodiumAPI()) {
+            sodium_memzero($var);
+            return;
+        }
+        if (self::use_fallback('memzero')) {
+            @call_user_func('\\Sodium\\memzero', $var);
+            return;
+        }
+        // This is the best we can do.
+        throw new SodiumException(
+            'This is not implemented in sodium_compat, as it is not possible to securely wipe memory from PHP. ' .
+            'To fix this error, make sure libsodium is installed and the PHP extension is enabled.'
+        );
+    }
+
+    /**
+     * Generate a string of bytes from the kernel's CSPRNG.
+     * Proudly uses /dev/urandom (if getrandom(2) is not available).
+     *
+     * @param int $numBytes
+     * @return string
+     * @throws TypeError
+     */
+    public static function randombytes_buf($numBytes)
+    {
+        /* Type checks: */
+        if (!is_int($numBytes)) {
+            if (is_numeric($numBytes)) {
+                $numBytes = (int) $numBytes;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($numBytes) . ' given.');
+            }
+        }
+        if (self::use_fallback('randombytes_buf')) {
+            return (string) call_user_func('\\Sodium\\randombytes_buf', $numBytes);
+        }
+        return random_bytes($numBytes);
+    }
+
+    /**
+     * Generate an integer between 0 and $range (non-inclusive).
+     *
+     * @param int $range
+     * @return int
+     * @throws TypeError
+     */
+    public static function randombytes_uniform($range)
+    {
+        /* Type checks: */
+        if (!is_int($range)) {
+            if (is_numeric($range)) {
+                $range = (int)$range;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($range) . ' given.');
+            }
+        }
+        if (self::use_fallback('randombytes_uniform')) {
+            return (int) call_user_func('\\Sodium\\randombytes_uniform', $range);
+        }
+        return random_int(0, $range - 1);
+    }
+
+    /**
+     * Generate a random 16-bit integer.
+     *
+     * @return int
+     */
+    public static function randombytes_random16()
+    {
+        if (self::use_fallback('randombytes_random16')) {
+            return (int) call_user_func('\\Sodium\\randombytes_random16');
+        }
+        return random_int(0, 65535);
+    }
+
+    /**
+     * This emulates libsodium's version_string() function, except ours is
+     * prefixed with 'polyfill-'.
+     *
+     * @return string
+     * @psalm-suppress MixedInferredReturnType
+     * @psalm-suppress UndefinedFunction
+     */
+    public static function version_string()
+    {
+        if (self::useNewSodiumAPI()) {
+            return (string) sodium_version_string();
+        }
+        if (self::use_fallback('version_string')) {
+            return (string) call_user_func('\\Sodium\\version_string');
+        }
+        return (string) self::VERSION_STRING;
+    }
+
+    /**
+     * Should we use the libsodium core function instead?
+     * This is always a good idea, if it's available. (Unless we're in the
+     * middle of running our unit test suite.)
+     *
+     * If ext/libsodium is available, use it. Return TRUE.
+     * Otherwise, we have to use the code provided herein. Return FALSE.
+     *
+     * @param string $sodium_func_name
+     *
+     * @return bool
+     */
+    protected static function use_fallback($sodium_func_name = '')
+    {
+        static $res = null;
+        if ($res === null) {
+            $res = extension_loaded('libsodium') && PHP_VERSION_ID >= 50300;
+        }
+        if ($res === false) {
+            // No libsodium installed
+            return false;
+        }
+        if (self::$disableFallbackForUnitTests) {
+            // Don't fallback. Use the PHP implementation.
+            return false;
+        }
+        if (!empty($sodium_func_name)) {
+            return is_callable('\\Sodium\\' . $sodium_func_name);
+        }
+        return true;
+    }
+
+    /**
+     * Libsodium as implemented in PHP 7.2
+     * and/or ext/sodium (via PECL)
+     *
+     * @ref https://wiki.php.net/rfc/libsodium
+     * @return bool
+     */
+    protected static function useNewSodiumAPI()
+    {
+        static $res = null;
+        if ($res === null) {
+            $res = PHP_VERSION_ID >= 70000 && extension_loaded('sodium');
+        }
+        if (self::$disableFallbackForUnitTests) {
+            // Don't fallback. Use the PHP implementation.
+            return false;
+        }
+        return (bool) $res;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
new file mode 100644
index 00000000..c1a232b3
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/BLAKE2b.php
@@ -0,0 +1,746 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_BLAKE2b
+ *
+ * Based on the work of Devi Mandiri in devi/salt.
+ */
+abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @var SplFixedArray
+     */
+    protected static $iv;
+
+    /**
+     * @var array<int, array<int, int>>
+     */
+    protected static $sigma = array(
+        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
+        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
+        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
+        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
+        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
+        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
+        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
+        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
+        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
+        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
+    );
+
+    const BLOCKBYTES = 128;
+    const OUTBYTES   = 64;
+    const KEYBYTES   = 64;
+
+    /**
+     * Turn two 32-bit integers into a fixed array representing a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $high
+     * @param int $low
+     * @return SplFixedArray
+     * @psalm-suppress MixedAssignment
+     */
+    public static function new64($high, $low)
+    {
+        $i64 = new SplFixedArray(2);
+        $i64[0] = $high & 0xffffffff;
+        $i64[1] = $low & 0xffffffff;
+        return $i64;
+    }
+
+    /**
+     * Convert an arbitrary number into an SplFixedArray of two 32-bit integers
+     * that represents a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $num
+     * @return SplFixedArray
+     */
+    protected static function to64($num)
+    {
+        list($hi, $lo) = self::numericTo64BitInteger($num);
+        return self::new64($hi, $lo);
+    }
+
+    /**
+     * Adds two 64-bit integers together, returning their sum as a SplFixedArray
+     * containing two 32-bit integers (representing a 64-bit integer).
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param SplFixedArray $y
+     * @return SplFixedArray
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedOperand
+     */
+    protected static function add64($x, $y)
+    {
+        $l = ($x[1] + $y[1]) & 0xffffffff;
+        return self::new64(
+            $x[0] + $y[0] + (
+                ($l < $x[1]) ? 1 : 0
+            ),
+            $l
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param SplFixedArray $y
+     * @param SplFixedArray $z
+     * @return SplFixedArray
+     */
+    protected static function add364($x, $y, $z)
+    {
+        return self::add64($x, self::add64($y, $z));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param SplFixedArray $y
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
+    {
+        if (!is_numeric($x[0])) {
+            throw new SodiumException('x[0] is not an integer');
+        }
+        if (!is_numeric($x[1])) {
+            throw new SodiumException('x[1] is not an integer');
+        }
+        if (!is_numeric($y[0])) {
+            throw new SodiumException('y[0] is not an integer');
+        }
+        if (!is_numeric($y[1])) {
+            throw new SodiumException('y[1] is not an integer');
+        }
+        return self::new64($x[0] ^ $y[0], $x[1] ^ $y[1]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $c
+     * @return SplFixedArray
+     * @psalm-suppress MixedAssignment
+     */
+    public static function rotr64($x, $c)
+    {
+        if ($c >= 64) {
+            $c %= 64;
+        }
+        if ($c >= 32) {
+            /** @var int $tmp */
+            $tmp = $x[0];
+            $x[0] = $x[1];
+            $x[1] = $tmp;
+            $c -= 32;
+        }
+        if ($c === 0) {
+            return $x;
+        }
+
+        $l0 = 0;
+        $c = 64 - $c;
+
+        if ($c < 32) {
+            /** @var int $h0 */
+            $h0 = ($x[0] << $c) | (
+                (
+                    $x[1] & ((1 << $c) - 1)
+                        <<
+                    (32 - $c)
+                ) >> (32 - $c)
+            );
+            /** @var int $l0 */
+            $l0 = $x[1] << $c;
+        } else {
+            /** @var int $h0 */
+            $h0 = $x[1] << ($c - 32);
+        }
+
+        $h1 = 0;
+        $c1 = 64 - $c;
+
+        if ($c1 < 32) {
+            /** @var int $h1 */
+            $h1 = $x[0] >> $c1;
+            /** @var int $l1 */
+            $l1 = ($x[1] >> $c1) | ($x[0] & ((1 << $c1) - 1)) << (32 - $c1);
+        } else {
+            /** @var int $l1 */
+            $l1 = $x[0] >> ($c1 - 32);
+        }
+
+        return self::new64($h0 | $h1, $l0 | $l1);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @return int
+     * @psalm-suppress MixedOperand
+     */
+    protected static function flatten64($x)
+    {
+        return (int) ($x[0] * 4294967296 + $x[1]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $i
+     * @return SplFixedArray
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayOffset
+     */
+    protected static function load64(SplFixedArray $x, $i)
+    {
+        /** @var int $l */
+        $l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
+        /** @var int $h */
+        $h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
+        return self::new64($h, $l);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $i
+     * @param SplFixedArray $u
+     * @return void
+     * @psalm-suppress MixedAssignment
+     */
+    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
+    {
+        $maxLength = $x->getSize() - 1;
+        for ($j = 0; $j < 8; ++$j) {
+            /*
+               [0, 1, 2, 3, 4, 5, 6, 7]
+                    ... becomes ...
+               [0, 0, 0, 0, 1, 1, 1, 1]
+            */
+            /** @var int $uIdx */
+            $uIdx = ((7 - $j) & 4) >> 2;
+            $x[$i]   = ($u[$uIdx] & 0xff);
+            if (++$i > $maxLength) {
+                return;
+            }
+            $u[$uIdx] >>= 8;
+        }
+    }
+
+    /**
+     * This just sets the $iv static variable.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return void
+     */
+    public static function pseudoConstructor()
+    {
+        static $called = false;
+        if ($called) {
+            return;
+        }
+        self::$iv = new SplFixedArray(8);
+        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
+        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
+        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
+        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
+        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
+        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
+        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
+        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
+
+        $called = true;
+    }
+
+    /**
+     * Returns a fresh BLAKE2 context.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return SplFixedArray
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     */
+    protected static function context()
+    {
+        $ctx    = new SplFixedArray(5);
+        $ctx[0] = new SplFixedArray(8);   // h
+        $ctx[1] = new SplFixedArray(2);   // t
+        $ctx[2] = new SplFixedArray(2);   // f
+        $ctx[3] = new SplFixedArray(256); // buf
+        $ctx[4] = 0;                      // buflen
+
+        for ($i = 8; $i--;) {
+            $ctx[0][$i] = self::$iv[$i];
+        }
+        for ($i = 256; $i--;) {
+            $ctx[3][$i] = 0;
+        }
+
+        $zero = self::new64(0, 0);
+        $ctx[1][0] = $zero;
+        $ctx[1][1] = $zero;
+        $ctx[2][0] = $zero;
+        $ctx[2][1] = $zero;
+
+        return $ctx;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $buf
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     */
+    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+    {
+        $m = new SplFixedArray(16);
+        $v = new SplFixedArray(16);
+
+        for ($i = 16; $i--;) {
+            $m[$i] = self::load64($buf, $i << 3);
+        }
+
+        for ($i = 8; $i--;) {
+            $v[$i] = $ctx[0][$i];
+        }
+
+        $v[ 8] = self::$iv[0];
+        $v[ 9] = self::$iv[1];
+        $v[10] = self::$iv[2];
+        $v[11] = self::$iv[3];
+
+        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
+        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
+        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
+        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
+
+        for ($r = 0; $r < 12; ++$r) {
+            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
+            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
+            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
+            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
+            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
+            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
+            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
+            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
+        }
+
+        for ($i = 8; $i--;) {
+            $ctx[0][$i] = self::xor64(
+                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
+            );
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $r
+     * @param int $i
+     * @param int $a
+     * @param int $b
+     * @param int $c
+     * @param int $d
+     * @param SplFixedArray $v
+     * @param SplFixedArray $m
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayOffset
+     */
+    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
+    {
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
+        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
+        $v[$c] = self::add64($v[$c], $v[$d]);
+        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
+        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
+        $v[$c] = self::add64($v[$c], $v[$d]);
+        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
+        return $v;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param int $inc
+     * @return void
+     * @throws SodiumException
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     */
+    public static function increment_counter($ctx, $inc)
+    {
+        if ($inc < 0) {
+            throw new SodiumException('Increasing by a negative number makes no sense.');
+        }
+        $t = self::to64($inc);
+        # S->t is $ctx[1] in our implementation
+
+        # S->t[0] = ( uint64_t )( t >> 0 );
+        $ctx[1][0] = self::add64($ctx[1][0], $t);
+
+        # S->t[1] += ( S->t[0] < inc );
+        if (self::flatten64($ctx[1][0]) < $inc) {
+            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $p
+     * @param int $plen
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress MixedOperand
+     */
+    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+    {
+        self::pseudoConstructor();
+
+        $offset = 0;
+        while ($plen > 0) {
+            $left = $ctx[4];
+            $fill = 256 - $left;
+
+            if ($plen > $fill) {
+                # memcpy( S->buf + left, in, fill ); /* Fill buffer */
+                for ($i = $fill; $i--;) {
+                    $ctx[3][$i + $left] = $p[$i + $offset];
+                }
+
+                # S->buflen += fill;
+                $ctx[4] += $fill;
+
+                # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+                self::increment_counter($ctx, 128);
+
+                # blake2b_compress( S, S->buf ); /* Compress */
+                self::compress($ctx, $ctx[3]);
+
+                # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
+                for ($i = 128; $i--;) {
+                    $ctx[3][$i] = $ctx[3][$i + 128];
+                }
+
+                # S->buflen -= BLAKE2B_BLOCKBYTES;
+                $ctx[4] -= 128;
+
+                # in += fill;
+                $offset += $fill;
+
+                # inlen -= fill;
+                $plen -= $fill;
+            } else {
+                for ($i = $plen; $i--;) {
+                    $ctx[3][$i + $left] = $p[$i + $offset];
+                }
+                $ctx[4] += $plen;
+                $offset += $plen;
+                $plen -= $plen;
+            }
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $out
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress MixedOperand
+     */
+    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+    {
+        self::pseudoConstructor();
+        if ($ctx[4] > 128) {
+            self::increment_counter($ctx, 128);
+            self::compress($ctx, $ctx[3]);
+            $ctx[4] -= 128;
+            if ($ctx[4] > 128) {
+                throw new SodiumException('Failed to assert that buflen <= 128 bytes');
+            }
+            for ($i = $ctx[4]; $i--;) {
+                $ctx[3][$i] = $ctx[3][$i + 128];
+            }
+        }
+
+        self::increment_counter($ctx, $ctx[4]);
+        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
+
+        for ($i = 256 - $ctx[4]; $i--;) {
+            $ctx[3][$i+$ctx[4]] = 0;
+        }
+
+        self::compress($ctx, $ctx[3]);
+
+        $i = (int) (($out->getSize() - 1) / 8);
+        for (; $i >= 0; --$i) {
+            self::store64($out, $i << 3, $ctx[0][$i]);
+        }
+        return $out;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray|null $key
+     * @param int $outlen
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     */
+    public static function init($key = null, $outlen = 64)
+    {
+        self::pseudoConstructor();
+        $klen = 0;
+
+        if ($key !== null) {
+            if (count($key) > 64) {
+                throw new SodiumException('Invalid key size');
+            }
+            $klen = count($key);
+        }
+
+        if ($outlen > 64) {
+            throw new SodiumException('Invalid output size');
+        }
+
+        $ctx = self::context();
+
+        $p = new SplFixedArray(64);
+        for ($i = 64; --$i;) {
+            $p[$i] = 0;
+        }
+
+        $p[0] = $outlen; // digest_length
+        $p[1] = $klen;   // key_length
+        $p[2] = 1;       // fanout
+        $p[3] = 1;       // depth
+
+        $ctx[0][0] = self::xor64(
+            $ctx[0][0],
+            self::load64($p, 0)
+        );
+
+        if ($klen > 0 && $key instanceof SplFixedArray) {
+            $block = new SplFixedArray(128);
+            for ($i = 128; $i--;) {
+                $block[$i] = 0;
+            }
+            for ($i = $klen; $i--;) {
+                $block[$i] = $key[$i];
+            }
+            self::update($ctx, $block, 128);
+        }
+
+        return $ctx;
+    }
+
+    /**
+     * Convert a string into an SplFixedArray of integers
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $str
+     * @return SplFixedArray
+     */
+    public static function stringToSplFixedArray($str = '')
+    {
+        $values = unpack('C*', $str);
+        return SplFixedArray::fromArray(array_values($values));
+    }
+
+    /**
+     * Convert an SplFixedArray of integers into a string
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $a
+     * @return string
+     * @throws TypeError
+     */
+    public static function SplFixedArrayToString(SplFixedArray $a)
+    {
+        /**
+         * @var array<mixed, int>
+         */
+        $arr = $a->toArray();
+        $c = $a->count();
+        array_unshift($arr, str_repeat('C', $c));
+        return (string) (call_user_func_array('pack', $arr));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray[SplFixedArray] $ctx
+     * @return string
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function contextToString(SplFixedArray $ctx)
+    {
+        $str = '';
+        /** @var array<int, array<int, int>> $ctxA */
+        $ctxA = $ctx[0]->toArray();
+
+        # uint64_t h[8];
+        for ($i = 0; $i < 8; ++$i) {
+            $str .= self::store32_le($ctxA[$i][1]);
+            $str .= self::store32_le($ctxA[$i][0]);
+        }
+
+        # uint64_t t[2];
+        # uint64_t f[2];
+        for ($i = 1; $i < 3; ++$i) {
+            $ctxA = $ctx[$i]->toArray();
+            $str .= self::store32_le($ctxA[0][1]);
+            $str .= self::store32_le($ctxA[0][0]);
+            $str .= self::store32_le($ctxA[1][1]);
+            $str .= self::store32_le($ctxA[1][0]);
+        }
+
+        # uint8_t buf[2 * 128];
+        $str .= self::SplFixedArrayToString($ctx[3]);
+
+        # size_t buflen;
+        $str .= implode('', array(
+            self::intToChr($ctx[4] & 0xff),
+            self::intToChr(($ctx[4] >> 8) & 0xff),
+            self::intToChr(($ctx[4] >> 16) & 0xff),
+            self::intToChr(($ctx[4] >> 24) & 0xff),
+            self::intToChr(($ctx[4] >> 32) & 0xff),
+            self::intToChr(($ctx[4] >> 40) & 0xff),
+            self::intToChr(($ctx[4] >> 48) & 0xff),
+            self::intToChr(($ctx[4] >> 56) & 0xff)
+        ));
+        # uint8_t last_node;
+        return $str . "\x00";
+    }
+
+    /**
+     * Creates an SplFixedArray containing other SplFixedArray elements, from
+     * a string (compatible with \Sodium\crypto_generichash_{init, update, final})
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAssignment
+     */
+    public static function stringToContext($string)
+    {
+        $ctx = self::context();
+
+        # uint64_t h[8];
+        for ($i = 0; $i < 8; ++$i) {
+            $ctx[0][$i] = SplFixedArray::fromArray(
+                array(
+                    self::load_4(
+                        self::substr($string, (($i << 3) + 4), 4)
+                    ),
+                    self::load_4(
+                        self::substr($string, (($i << 3) + 0), 4)
+                    )
+                )
+            );
+        }
+
+        # uint64_t t[2];
+        # uint64_t f[2];
+        for ($i = 1; $i < 3; ++$i) {
+            $ctx[$i][1] = SplFixedArray::fromArray(
+                array(
+                    self::load_4(self::substr($string, 76 + (($i - 1) << 4), 4)),
+                    self::load_4(self::substr($string, 72 + (($i - 1) << 4), 4))
+                )
+            );
+            $ctx[$i][0] = SplFixedArray::fromArray(
+                array(
+                    self::load_4(self::substr($string, 68 + (($i - 1) << 4), 4)),
+                    self::load_4(self::substr($string, 64 + (($i - 1) << 4), 4))
+                )
+            );
+        }
+
+        # uint8_t buf[2 * 128];
+        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
+
+
+        # uint8_t buf[2 * 128];
+        $int = 0;
+        for ($i = 0; $i < 8; ++$i) {
+            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
+        }
+        $ctx[4] = $int;
+
+        return $ctx;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php
new file mode 100644
index 00000000..806010c7
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20.php
@@ -0,0 +1,395 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_ChaCha20
+ */
+class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * Bitwise left rotation
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $v
+     * @param int $n
+     * @return int
+     */
+    public static function rotate($v, $n)
+    {
+        $v &= 0xffffffff;
+        $n &= 31;
+        return (int) (
+            0xffffffff & (
+                ($v << $n)
+                    |
+                ($v >> (32 - $n))
+            )
+        );
+    }
+
+    /**
+     * The ChaCha20 quarter round function. Works on four 32-bit integers.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $a
+     * @param int $b
+     * @param int $c
+     * @param int $d
+     * @return array<int, int>
+     */
+    protected static function quarterRound($a, $b, $c, $d)
+    {
+        # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
+        /** @var int $a */
+        $a = ($a + $b) & 0xffffffff;
+        $d = self::rotate($d ^ $a, 16);
+
+        # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
+        /** @var int $c */
+        $c = ($c + $d) & 0xffffffff;
+        $b = self::rotate($b ^ $c, 12);
+
+        # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
+        /** @var int $a */
+        $a = ($a + $b) & 0xffffffff;
+        $d = self::rotate($d ^ $a, 8);
+
+        # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+        /** @var int $c */
+        $c = ($c + $d) & 0xffffffff;
+        $b = self::rotate($b ^ $c, 7);
+        return array((int) $a, (int) $b, (int) $c, (int) $d);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx
+     * @param string $message
+     *
+     * @return string
+     * @throws TypeError
+     * @throws SodiumException
+     */
+    public static function encryptBytes(
+        ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
+        $message = ''
+    ) {
+        $bytes = self::strlen($message);
+
+        /*
+        j0 = ctx->input[0];
+        j1 = ctx->input[1];
+        j2 = ctx->input[2];
+        j3 = ctx->input[3];
+        j4 = ctx->input[4];
+        j5 = ctx->input[5];
+        j6 = ctx->input[6];
+        j7 = ctx->input[7];
+        j8 = ctx->input[8];
+        j9 = ctx->input[9];
+        j10 = ctx->input[10];
+        j11 = ctx->input[11];
+        j12 = ctx->input[12];
+        j13 = ctx->input[13];
+        j14 = ctx->input[14];
+        j15 = ctx->input[15];
+        */
+        $j0  = (int) $ctx[0];
+        $j1  = (int) $ctx[1];
+        $j2  = (int) $ctx[2];
+        $j3  = (int) $ctx[3];
+        $j4  = (int) $ctx[4];
+        $j5  = (int) $ctx[5];
+        $j6  = (int) $ctx[6];
+        $j7  = (int) $ctx[7];
+        $j8  = (int) $ctx[8];
+        $j9  = (int) $ctx[9];
+        $j10 = (int) $ctx[10];
+        $j11 = (int) $ctx[11];
+        $j12 = (int) $ctx[12];
+        $j13 = (int) $ctx[13];
+        $j14 = (int) $ctx[14];
+        $j15 = (int) $ctx[15];
+
+        $c = '';
+        for (;;) {
+            if ($bytes < 64) {
+                $message .= str_repeat("\x00", 64 - $bytes);
+            }
+
+            $x0 =  (int) $j0;
+            $x1 =  (int) $j1;
+            $x2 =  (int) $j2;
+            $x3 =  (int) $j3;
+            $x4 =  (int) $j4;
+            $x5 =  (int) $j5;
+            $x6 =  (int) $j6;
+            $x7 =  (int) $j7;
+            $x8 =  (int) $j8;
+            $x9 =  (int) $j9;
+            $x10 = (int) $j10;
+            $x11 = (int) $j11;
+            $x12 = (int) $j12;
+            $x13 = (int) $j13;
+            $x14 = (int) $j14;
+            $x15 = (int) $j15;
+
+            # for (i = 20; i > 0; i -= 2) {
+            for ($i = 20; $i > 0; $i -= 2) {
+                # QUARTERROUND( x0,  x4,  x8,  x12)
+                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+
+                # QUARTERROUND( x1,  x5,  x9,  x13)
+                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+
+                # QUARTERROUND( x2,  x6,  x10,  x14)
+                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+
+                # QUARTERROUND( x3,  x7,  x11,  x15)
+                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+
+                # QUARTERROUND( x0,  x5,  x10,  x15)
+                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+
+                # QUARTERROUND( x1,  x6,  x11,  x12)
+                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+
+                # QUARTERROUND( x2,  x7,  x8,  x13)
+                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+
+                # QUARTERROUND( x3,  x4,  x9,  x14)
+                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            }
+            /*
+            x0 = PLUS(x0, j0);
+            x1 = PLUS(x1, j1);
+            x2 = PLUS(x2, j2);
+            x3 = PLUS(x3, j3);
+            x4 = PLUS(x4, j4);
+            x5 = PLUS(x5, j5);
+            x6 = PLUS(x6, j6);
+            x7 = PLUS(x7, j7);
+            x8 = PLUS(x8, j8);
+            x9 = PLUS(x9, j9);
+            x10 = PLUS(x10, j10);
+            x11 = PLUS(x11, j11);
+            x12 = PLUS(x12, j12);
+            x13 = PLUS(x13, j13);
+            x14 = PLUS(x14, j14);
+            x15 = PLUS(x15, j15);
+            */
+            /** @var int $x0 */
+            $x0  = ($x0 & 0xffffffff) + $j0;
+            /** @var int $x1 */
+            $x1  = ($x1 & 0xffffffff) + $j1;
+            /** @var int $x2 */
+            $x2  = ($x2 & 0xffffffff) + $j2;
+            /** @var int $x3 */
+            $x3  = ($x3 & 0xffffffff) + $j3;
+            /** @var int $x4 */
+            $x4  = ($x4 & 0xffffffff) + $j4;
+            /** @var int $x5 */
+            $x5  = ($x5 & 0xffffffff) + $j5;
+            /** @var int $x6 */
+            $x6  = ($x6 & 0xffffffff) + $j6;
+            /** @var int $x7 */
+            $x7  = ($x7 & 0xffffffff) + $j7;
+            /** @var int $x8 */
+            $x8  = ($x8 & 0xffffffff) + $j8;
+            /** @var int $x9 */
+            $x9  = ($x9 & 0xffffffff) + $j9;
+            /** @var int $x10 */
+            $x10 = ($x10 & 0xffffffff) + $j10;
+            /** @var int $x11 */
+            $x11 = ($x11 & 0xffffffff) + $j11;
+            /** @var int $x12 */
+            $x12 = ($x12 & 0xffffffff) + $j12;
+            /** @var int $x13 */
+            $x13 = ($x13 & 0xffffffff) + $j13;
+            /** @var int $x14 */
+            $x14 = ($x14 & 0xffffffff) + $j14;
+            /** @var int $x15 */
+            $x15 = ($x15 & 0xffffffff) + $j15;
+
+            /*
+            x0 = XOR(x0, LOAD32_LE(m + 0));
+            x1 = XOR(x1, LOAD32_LE(m + 4));
+            x2 = XOR(x2, LOAD32_LE(m + 8));
+            x3 = XOR(x3, LOAD32_LE(m + 12));
+            x4 = XOR(x4, LOAD32_LE(m + 16));
+            x5 = XOR(x5, LOAD32_LE(m + 20));
+            x6 = XOR(x6, LOAD32_LE(m + 24));
+            x7 = XOR(x7, LOAD32_LE(m + 28));
+            x8 = XOR(x8, LOAD32_LE(m + 32));
+            x9 = XOR(x9, LOAD32_LE(m + 36));
+            x10 = XOR(x10, LOAD32_LE(m + 40));
+            x11 = XOR(x11, LOAD32_LE(m + 44));
+            x12 = XOR(x12, LOAD32_LE(m + 48));
+            x13 = XOR(x13, LOAD32_LE(m + 52));
+            x14 = XOR(x14, LOAD32_LE(m + 56));
+            x15 = XOR(x15, LOAD32_LE(m + 60));
+            */
+            $x0  ^= self::load_4(self::substr($message, 0, 4));
+            $x1  ^= self::load_4(self::substr($message, 4, 4));
+            $x2  ^= self::load_4(self::substr($message, 8, 4));
+            $x3  ^= self::load_4(self::substr($message, 12, 4));
+            $x4  ^= self::load_4(self::substr($message, 16, 4));
+            $x5  ^= self::load_4(self::substr($message, 20, 4));
+            $x6  ^= self::load_4(self::substr($message, 24, 4));
+            $x7  ^= self::load_4(self::substr($message, 28, 4));
+            $x8  ^= self::load_4(self::substr($message, 32, 4));
+            $x9  ^= self::load_4(self::substr($message, 36, 4));
+            $x10 ^= self::load_4(self::substr($message, 40, 4));
+            $x11 ^= self::load_4(self::substr($message, 44, 4));
+            $x12 ^= self::load_4(self::substr($message, 48, 4));
+            $x13 ^= self::load_4(self::substr($message, 52, 4));
+            $x14 ^= self::load_4(self::substr($message, 56, 4));
+            $x15 ^= self::load_4(self::substr($message, 60, 4));
+
+            /*
+                j12 = PLUSONE(j12);
+                if (!j12) {
+                    j13 = PLUSONE(j13);
+                }
+             */
+            ++$j12;
+            if ($j12 & 0xf0000000) {
+                throw new SodiumException('Overflow');
+            }
+
+            /*
+            STORE32_LE(c + 0, x0);
+            STORE32_LE(c + 4, x1);
+            STORE32_LE(c + 8, x2);
+            STORE32_LE(c + 12, x3);
+            STORE32_LE(c + 16, x4);
+            STORE32_LE(c + 20, x5);
+            STORE32_LE(c + 24, x6);
+            STORE32_LE(c + 28, x7);
+            STORE32_LE(c + 32, x8);
+            STORE32_LE(c + 36, x9);
+            STORE32_LE(c + 40, x10);
+            STORE32_LE(c + 44, x11);
+            STORE32_LE(c + 48, x12);
+            STORE32_LE(c + 52, x13);
+            STORE32_LE(c + 56, x14);
+            STORE32_LE(c + 60, x15);
+            */
+            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
+                 self::store32_le((int) ($x1  & 0xffffffff)) .
+                 self::store32_le((int) ($x2  & 0xffffffff)) .
+                 self::store32_le((int) ($x3  & 0xffffffff)) .
+                 self::store32_le((int) ($x4  & 0xffffffff)) .
+                 self::store32_le((int) ($x5  & 0xffffffff)) .
+                 self::store32_le((int) ($x6  & 0xffffffff)) .
+                 self::store32_le((int) ($x7  & 0xffffffff)) .
+                 self::store32_le((int) ($x8  & 0xffffffff)) .
+                 self::store32_le((int) ($x9  & 0xffffffff)) .
+                 self::store32_le((int) ($x10 & 0xffffffff)) .
+                 self::store32_le((int) ($x11 & 0xffffffff)) .
+                 self::store32_le((int) ($x12 & 0xffffffff)) .
+                 self::store32_le((int) ($x13 & 0xffffffff)) .
+                 self::store32_le((int) ($x14 & 0xffffffff)) .
+                 self::store32_le((int) ($x15 & 0xffffffff));
+
+            /* Partial block */
+            if ($bytes < 64) {
+                $c .= self::substr($block, 0, $bytes);
+                break;
+            }
+
+            /* Full block */
+            $c .= $block;
+            $bytes -= 64;
+            if ($bytes <= 0) {
+                break;
+            }
+            $message = self::substr($message, 64);
+        }
+        /* end for(;;) loop */
+
+        $ctx[12] = $j12;
+        $ctx[13] = $j13;
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function stream($len = 64, $nonce = '', $key = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ietfStream($len, $nonce = '', $key = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
+            $message
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce, $ic),
+            $message
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
new file mode 100644
index 00000000..b29ab900
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
@@ -0,0 +1,120 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_ChaCha20_Ctx
+ */
+class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util implements ArrayAccess
+{
+    /**
+     * @var SplFixedArray internally, <int, int>
+     */
+    protected $container;
+
+    /**
+     * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key     ChaCha20 key.
+     * @param string $iv      Initialization Vector (a.k.a. nonce).
+     * @param string $counter The initial counter value.
+     *                        Defaults to 8 0x00 bytes.
+     * @throws InvalidArgumentException
+     * @throws TypeError
+     */
+    public function __construct($key = '', $iv = '', $counter = '')
+    {
+        if (self::strlen($key) !== 32) {
+            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+        }
+        if (self::strlen($iv) !== 8) {
+            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+        }
+        $this->container = new SplFixedArray(16);
+
+        /* "expand 32-byte k" as per ChaCha20 spec */
+        $this->container[0]  = 0x61707865;
+        $this->container[1]  = 0x3320646e;
+        $this->container[2]  = 0x79622d32;
+        $this->container[3]  = 0x6b206574;
+        $this->container[4]  = self::load_4(self::substr($key, 0, 4));
+        $this->container[5]  = self::load_4(self::substr($key, 4, 4));
+        $this->container[6]  = self::load_4(self::substr($key, 8, 4));
+        $this->container[7]  = self::load_4(self::substr($key, 12, 4));
+        $this->container[8]  = self::load_4(self::substr($key, 16, 4));
+        $this->container[9]  = self::load_4(self::substr($key, 20, 4));
+        $this->container[10] = self::load_4(self::substr($key, 24, 4));
+        $this->container[11] = self::load_4(self::substr($key, 28, 4));
+
+        if (empty($counter)) {
+            $this->container[12] = 0;
+            $this->container[13] = 0;
+        } else {
+            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
+            $this->container[13] = self::load_4(self::substr($counter, 4, 4));
+        }
+        $this->container[14] = self::load_4(self::substr($iv, 0, 4));
+        $this->container[15] = self::load_4(self::substr($iv, 4, 4));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $offset
+     * @param int $value
+     * @return void
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!is_int($offset)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        if (!is_int($value)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        $this->container[$offset] = $value;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return bool
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return void
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return mixed|null
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset])
+            ? $this->container[$offset]
+            : null;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
new file mode 100644
index 00000000..4d63b900
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
@@ -0,0 +1,38 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_ChaCha20_IetfCtx
+ */
+class ParagonIE_Sodium_Core_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core_ChaCha20_Ctx
+{
+    /**
+     * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key     ChaCha20 key.
+     * @param string $iv      Initialization Vector (a.k.a. nonce).
+     * @param string $counter The initial counter value.
+     *                        Defaults to 4 0x00 bytes.
+     * @throws InvalidArgumentException
+     * @throws TypeError
+     */
+    public function __construct($key = '', $iv = '', $counter = '')
+    {
+        if (self::strlen($iv) !== 12) {
+            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
+        }
+        parent::__construct($key, self::substr($iv, 0, 8), $counter);
+
+        if (!empty($counter)) {
+            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
+        }
+        $this->container[13] = self::load_4(self::substr($iv, 0, 4));
+        $this->container[14] = self::load_4(self::substr($iv, 4, 4));
+        $this->container[15] = self::load_4(self::substr($iv, 8, 4));
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
new file mode 100644
index 00000000..dedf7a4d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519.php
@@ -0,0 +1,2978 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519
+ *
+ * Implements Curve25519 core functions
+ *
+ * Based on the ref10 curve25519 code provided by libsodium
+ *
+ * @ref https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
+ */
+abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Curve25519_H
+{
+    /**
+     * Get a field element of size 10 with a value of 0
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_0()
+    {
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        );
+    }
+
+    /**
+     * Get a field element of size 10 with a value of 1
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_1()
+    {
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        );
+    }
+
+    /**
+     * Add two field elements.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedOperand
+     */
+    public static function fe_add(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g
+    ) {
+        /** @var array<int, int> $arr */
+        $arr = array();
+        for ($i = 0; $i < 10; ++$i) {
+            $arr[$i] = (int) ($f[$i] + $g[$i]);
+        }
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
+    }
+
+    /**
+     * Constant-time conditional move.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @param int $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     * @psalm-suppress MixedAssignment
+     */
+    public static function fe_cmov(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g,
+        $b = 0
+    ) {
+        /** @var array<int, int> $h */
+        $h = array();
+        $b *= -1;
+        for ($i = 0; $i < 10; ++$i) {
+            /** @var int $x */
+            $x = (($f[$i] ^ $g[$i]) & $b);
+            $h[$i] = (int) ($f[$i] ^ $x);
+        }
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+    }
+
+    /**
+     * Create a copy of a field element.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $h = clone $f;
+        return $h;
+    }
+
+    /**
+     * Give: 32-byte string.
+     * Receive: A field element object to use for internal calculations.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function fe_frombytes($s)
+    {
+        if (self::strlen($s) !== 32) {
+            throw new RangeException('Expected a 32-byte string.');
+        }
+        /** @var int $h0 */
+        $h0 = self::load_4($s);
+        /** @var int $h1 */
+        $h1 = self::load_3(self::substr($s, 4, 3)) << 6;
+        /** @var int $h2 */
+        $h2 = self::load_3(self::substr($s, 7, 3)) << 5;
+        /** @var int $h3 */
+        $h3 = self::load_3(self::substr($s, 10, 3)) << 3;
+        /** @var int $h4 */
+        $h4 = self::load_3(self::substr($s, 13, 3)) << 2;
+        /** @var int $h5 */
+        $h5 = self::load_4(self::substr($s, 16, 4));
+        /** @var int $h6 */
+        $h6 = self::load_3(self::substr($s, 20, 3)) << 7;
+        /** @var int $h7 */
+        $h7 = self::load_3(self::substr($s, 23, 3)) << 5;
+        /** @var int $h8 */
+        $h8 = self::load_3(self::substr($s, 26, 3)) << 4;
+        /** @var int $h9 */
+        $h9 = (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2;
+
+        /** @var int $carry9 */
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19, 5);
+        $h9 -= $carry9 << 25;
+        /** @var int $carry1 */
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        /** @var int $carry3 */
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        /** @var int $carry5 */
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+        /** @var int $carry7 */
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        /** @var int $carry2 */
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        /** @var int $carry6 */
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+        /** @var int $carry8 */
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+    /**
+     * Convert a field element to a byte string.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
+     * @return string
+     */
+    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
+    {
+        /** @var int $h0 */
+        $h0 = (int) $h[0];
+        /** @var int $h1 */
+        $h1 = (int) $h[1];
+        /** @var int $h2 */
+        $h2 = (int) $h[2];
+        /** @var int $h3 */
+        $h3 = (int) $h[3];
+        /** @var int $h4 */
+        $h4 = (int) $h[4];
+        /** @var int $h5 */
+        $h5 = (int) $h[5];
+        /** @var int $h6 */
+        $h6 = (int) $h[6];
+        /** @var int $h7 */
+        $h7 = (int) $h[7];
+        /** @var int $h8 */
+        $h8 = (int) $h[8];
+        /** @var int $h9 */
+        $h9 = (int) $h[9];
+
+        /** @var int $q */
+        $q = (self::mul($h9, 19, 5) + (1 << 24)) >> 25;
+        /** @var int $q */
+        $q = ($h0 + $q) >> 26;
+        /** @var int $q */
+        $q = ($h1 + $q) >> 25;
+        /** @var int $q */
+        $q = ($h2 + $q) >> 26;
+        /** @var int $q */
+        $q = ($h3 + $q) >> 25;
+        /** @var int $q */
+        $q = ($h4 + $q) >> 26;
+        /** @var int $q */
+        $q = ($h5 + $q) >> 25;
+        /** @var int $q */
+        $q = ($h6 + $q) >> 26;
+        /** @var int $q */
+        $q = ($h7 + $q) >> 25;
+        /** @var int $q */
+        $q = ($h8 + $q) >> 26;
+        /** @var int $q */
+        $q = ($h9 + $q) >> 25;
+
+        $h0 += self::mul($q, 19, 5);
+
+        /** @var int $carry0 */
+        $carry0 = $h0 >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        /** @var int $carry1 */
+        $carry1 = $h1 >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        /** @var int $carry2 */
+        $carry2 = $h2 >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        /** @var int $carry3 */
+        $carry3 = $h3 >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        /** @var int $carry4 */
+        $carry4 = $h4 >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        /** @var int $carry5 */
+        $carry5 = $h5 >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+        /** @var int $carry6 */
+        $carry6 = $h6 >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+        /** @var int $carry7 */
+        $carry7 = $h7 >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+        /** @var int $carry8 */
+        $carry8 = $h8 >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+        /** @var int $carry9 */
+        $carry9 = $h9 >> 25;
+        $h9 -= $carry9 << 25;
+
+        /**
+         * @var array<int, int>
+         */
+        $s = array(
+            (int) (($h0 >> 0) & 0xff),
+            (int) (($h0 >> 8) & 0xff),
+            (int) (($h0 >> 16) & 0xff),
+            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
+            (int) (($h1 >> 6) & 0xff),
+            (int) (($h1 >> 14) & 0xff),
+            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
+            (int) (($h2 >> 5) & 0xff),
+            (int) (($h2 >> 13) & 0xff),
+            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
+            (int) (($h3 >> 3) & 0xff),
+            (int) (($h3 >> 11) & 0xff),
+            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
+            (int) (($h4 >> 2) & 0xff),
+            (int) (($h4 >> 10) & 0xff),
+            (int) (($h4 >> 18) & 0xff),
+            (int) (($h5 >> 0) & 0xff),
+            (int) (($h5 >> 8) & 0xff),
+            (int) (($h5 >> 16) & 0xff),
+            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
+            (int) (($h6 >> 7) & 0xff),
+            (int) (($h6 >> 15) & 0xff),
+            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
+            (int) (($h7 >> 5) & 0xff),
+            (int) (($h7 >> 13) & 0xff),
+            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
+            (int) (($h8 >> 4) & 0xff),
+            (int) (($h8 >> 12) & 0xff),
+            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
+            (int) (($h9 >> 2) & 0xff),
+            (int) (($h9 >> 10) & 0xff),
+            (int) (($h9 >> 18) & 0xff)
+        );
+        return self::intArrayToString($s);
+    }
+
+    /**
+     * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $str = self::fe_tobytes($f);
+        return (int) (self::chrToInt($str[0]) & 1);
+    }
+
+    /**
+     * Returns 0 if this field element results in all NUL bytes.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        static $zero;
+        if ($zero === null) {
+            $zero = str_repeat("\x00", 32);
+        }
+        /** @var string $zero */
+        /** @var string $str */
+        $str = self::fe_tobytes($f);
+        return !self::verify_32($str, (string) $zero);
+    }
+
+    /**
+     * Multiply two field elements
+     *
+     * h = f * g
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @security Is multiplication a source of timing leaks? If so, can we do
+     *           anything to prevent that from happening?
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_mul(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g
+    ) {
+        /** @var int $f0 */
+        $f0 = $f[0];
+        /** @var int $f1 */
+        $f1 = $f[1];
+        /** @var int $f2 */
+        $f2 = $f[2];
+        /** @var int $f3 */
+        $f3 = $f[3];
+        /** @var int $f4 */
+        $f4 = $f[4];
+        /** @var int $f5 */
+        $f5 = $f[5];
+        /** @var int $f6 */
+        $f6 = $f[6];
+        /** @var int $f7 */
+        $f7 = $f[7];
+        /** @var int $f8 */
+        $f8 = $f[8];
+        /** @var int $f9 */
+        $f9 = $f[9];
+        /** @var int $g0 */
+        $g0 = $g[0];
+        /** @var int $g1 */
+        $g1 = $g[1];
+        /** @var int $g2 */
+        $g2 = $g[2];
+        /** @var int $g3 */
+        $g3 = $g[3];
+        /** @var int $g4 */
+        $g4 = $g[4];
+        /** @var int $g5 */
+        $g5 = $g[5];
+        /** @var int $g6 */
+        $g6 = $g[6];
+        /** @var int $g7 */
+        $g7 = $g[7];
+        /** @var int $g8 */
+        $g8 = $g[8];
+        /** @var int $g9 */
+        $g9 = $g[9];
+        $g1_19 = self::mul($g1, 19, 5);
+        $g2_19 = self::mul($g2, 19, 5);
+        $g3_19 = self::mul($g3, 19, 5);
+        $g4_19 = self::mul($g4, 19, 5);
+        $g5_19 = self::mul($g5, 19, 5);
+        $g6_19 = self::mul($g6, 19, 5);
+        $g7_19 = self::mul($g7, 19, 5);
+        $g8_19 = self::mul($g8, 19, 5);
+        $g9_19 = self::mul($g9, 19, 5);
+        /** @var int $f1_2 */
+        $f1_2 = $f1 << 1;
+        /** @var int $f3_2 */
+        $f3_2 = $f3 << 1;
+        /** @var int $f5_2 */
+        $f5_2 = $f5 << 1;
+        /** @var int $f7_2 */
+        $f7_2 = $f7 << 1;
+        /** @var int $f9_2 */
+        $f9_2 = $f9 << 1;
+        $f0g0    = self::mul($f0,    $g0, 27);
+        $f0g1    = self::mul($f0,    $g1, 26);
+        $f0g2    = self::mul($f0,    $g2, 27);
+        $f0g3    = self::mul($f0,    $g3, 26);
+        $f0g4    = self::mul($f0,    $g4, 27);
+        $f0g5    = self::mul($f0,    $g5, 26);
+        $f0g6    = self::mul($f0,    $g6, 27);
+        $f0g7    = self::mul($f0,    $g7, 26);
+        $f0g8    = self::mul($f0,    $g8, 27);
+        $f0g9    = self::mul($f0,    $g9, 27);
+        $f1g0    = self::mul($f1,    $g0, 27);
+        $f1g1_2  = self::mul($f1_2,  $g1, 26);
+        $f1g2    = self::mul($f1,    $g2, 27);
+        $f1g3_2  = self::mul($f1_2,  $g3, 26);
+        $f1g4    = self::mul($f1,    $g4, 27);
+        $f1g5_2  = self::mul($f1_2,  $g5, 26);
+        $f1g6    = self::mul($f1,    $g6, 27);
+        $f1g7_2  = self::mul($f1_2,  $g7, 26);
+        $f1g8    = self::mul($f1,    $g8, 27);
+        $f1g9_38 = self::mul($g9_19, $f1_2, 27);
+        $f2g0    = self::mul($f2,    $g0, 27);
+        $f2g1    = self::mul($f2,    $g1, 26);
+        $f2g2    = self::mul($f2,    $g2, 27);
+        $f2g3    = self::mul($f2,    $g3, 26);
+        $f2g4    = self::mul($f2,    $g4, 27);
+        $f2g5    = self::mul($f2,    $g5, 26);
+        $f2g6    = self::mul($f2,    $g6, 27);
+        $f2g7    = self::mul($f2,    $g7, 26);
+        $f2g8_19 = self::mul($g8_19, $f2, 27);
+        $f2g9_19 = self::mul($g9_19, $f2, 27);
+        $f3g0    = self::mul($f3,    $g0, 27);
+        $f3g1_2  = self::mul($f3_2,  $g1, 26);
+        $f3g2    = self::mul($f3,    $g2, 27);
+        $f3g3_2  = self::mul($f3_2,  $g3, 26);
+        $f3g4    = self::mul($f3,    $g4, 27);
+        $f3g5_2  = self::mul($f3_2,  $g5, 26);
+        $f3g6    = self::mul($f3,    $g6, 27);
+        $f3g7_38 = self::mul($g7_19, $f3_2, 27);
+        $f3g8_19 = self::mul($g8_19, $f3, 27);
+        $f3g9_38 = self::mul($g9_19, $f3_2, 27);
+        $f4g0    = self::mul($f4,    $g0, 27);
+        $f4g1    = self::mul($f4,    $g1, 26);
+        $f4g2    = self::mul($f4,    $g2, 27);
+        $f4g3    = self::mul($f4,    $g3, 26);
+        $f4g4    = self::mul($f4,    $g4, 27);
+        $f4g5    = self::mul($f4,    $g5, 26);
+        $f4g6_19 = self::mul($g6_19, $f4, 27);
+        $f4g7_19 = self::mul($g7_19, $f4, 27);
+        $f4g8_19 = self::mul($g8_19, $f4, 27);
+        $f4g9_19 = self::mul($g9_19, $f4, 27);
+        $f5g0    = self::mul($f5,    $g0, 27);
+        $f5g1_2  = self::mul($f5_2,  $g1, 26);
+        $f5g2    = self::mul($f5,    $g2, 27);
+        $f5g3_2  = self::mul($f5_2,  $g3, 26);
+        $f5g4    = self::mul($f5,    $g4, 27);
+        $f5g5_38 = self::mul($g5_19, $f5_2, 27);
+        $f5g6_19 = self::mul($g6_19, $f5, 26);
+        $f5g7_38 = self::mul($g7_19, $f5_2, 27);
+        $f5g8_19 = self::mul($g8_19, $f5, 26);
+        $f5g9_38 = self::mul($g9_19, $f5_2, 27);
+        $f6g0    = self::mul($f6,    $g0, 27);
+        $f6g1    = self::mul($f6,    $g1, 26);
+        $f6g2    = self::mul($f6,    $g2, 27);
+        $f6g3    = self::mul($f6,    $g3, 26);
+        $f6g4_19 = self::mul($g4_19, $f6, 27);
+        $f6g5_19 = self::mul($g5_19, $f6, 27);
+        $f6g6_19 = self::mul($g6_19, $f6, 27);
+        $f6g7_19 = self::mul($g7_19, $f6, 27);
+        $f6g8_19 = self::mul($g8_19, $f6, 27);
+        $f6g9_19 = self::mul($g9_19, $f6, 27);
+        $f7g0    = self::mul($f7,    $g0, 27);
+        $f7g1_2  = self::mul($f7_2,  $g1, 26);
+        $f7g2    = self::mul($f7,    $g2, 27);
+        $f7g3_38 = self::mul($g3_19, $f7_2, 27);
+        $f7g4_19 = self::mul($g4_19, $f7, 27);
+        $f7g5_38 = self::mul($g5_19, $f7_2, 27);
+        $f7g6_19 = self::mul($g6_19, $f7, 27);
+        $f7g7_38 = self::mul($g7_19, $f7_2, 27);
+        $f7g8_19 = self::mul($g8_19, $f7, 27);
+        $f7g9_38 = self::mul($g9_19,$f7_2, 27);
+        $f8g0    = self::mul($f8,    $g0, 27);
+        $f8g1    = self::mul($f8,    $g1, 26);
+        $f8g2_19 = self::mul($g2_19, $f8, 27);
+        $f8g3_19 = self::mul($g3_19, $f8, 27);
+        $f8g4_19 = self::mul($g4_19, $f8, 27);
+        $f8g5_19 = self::mul($g5_19, $f8, 27);
+        $f8g6_19 = self::mul($g6_19, $f8, 27);
+        $f8g7_19 = self::mul($g7_19, $f8, 27);
+        $f8g8_19 = self::mul($g8_19, $f8, 27);
+        $f8g9_19 = self::mul($g9_19, $f8, 27);
+        $f9g0    = self::mul($f9,    $g0, 27);
+        $f9g1_38 = self::mul($g1_19, $f9_2, 27);
+        $f9g2_19 = self::mul($g2_19, $f9, 27);
+        $f9g3_38 = self::mul($g3_19, $f9_2, 27);
+        $f9g4_19 = self::mul($g4_19, $f9, 27);
+        $f9g5_38 = self::mul($g5_19, $f9_2, 27);
+        $f9g6_19 = self::mul($g6_19, $f9, 27);
+        $f9g7_38 = self::mul($g7_19, $f9_2, 27);
+        $f9g8_19 = self::mul($g8_19, $f9, 27);
+        $f9g9_38 = self::mul($g9_19, $f9_2, 27);
+        $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
+        $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+        $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+        $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+        $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+        $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+        $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
+        $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
+        $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
+        $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+
+        /** @var int $carry1 */
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        /** @var int $carry5 */
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+
+        /** @var int $carry2 */
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        /** @var int $carry6 */
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+
+        /** @var int $carry3 */
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        /** @var int $carry7 */
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        /** @var int $carry8 */
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        /** @var int $carry9 */
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19, 5);
+        $h9 -= $carry9 << 25;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+    /**
+     * Get the negative values for each piece of the field element.
+     *
+     * h = -f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     * @psalm-suppress MixedAssignment
+     */
+    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        for ($i = 0; $i < 10; ++$i) {
+            $h[$i] = -$f[$i];
+        }
+        return $h;
+    }
+
+    /**
+     * Square a field element
+     *
+     * h = f * f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $f0 = (int) $f[0];
+        $f1 = (int) $f[1];
+        $f2 = (int) $f[2];
+        $f3 = (int) $f[3];
+        $f4 = (int) $f[4];
+        $f5 = (int) $f[5];
+        $f6 = (int) $f[6];
+        $f7 = (int) $f[7];
+        $f8 = (int) $f[8];
+        $f9 = (int) $f[9];
+
+        /** @var int $f0_2 */
+        $f0_2 = $f0 << 1;
+        /** @var int $f1_2 */
+        $f1_2 = $f1 << 1;
+        /** @var int $f2_2 */
+        $f2_2 = $f2 << 1;
+        /** @var int $f3_2 */
+        $f3_2 = $f3 << 1;
+        /** @var int $f4_2 */
+        $f4_2 = $f4 << 1;
+        /** @var int $f5_2 */
+        $f5_2 = $f5 << 1;
+        /** @var int $f6_2 */
+        $f6_2 = $f6 << 1;
+        /** @var int $f7_2 */
+        $f7_2 = $f7 << 1;
+        $f5_38 = self::mul($f5, 38, 6);
+        $f6_19 = self::mul($f6, 19, 5);
+        $f7_38 = self::mul($f7, 38, 6);
+        $f8_19 = self::mul($f8, 19, 5);
+        $f9_38 = self::mul($f9, 38, 6);
+        $f0f0    = self::mul($f0,    $f0,    26);
+        $f0f1_2  = self::mul($f0_2,  $f1,    26);
+        $f0f2_2  = self::mul($f0_2,  $f2,    26);
+        $f0f3_2  = self::mul($f0_2,  $f3,    26);
+        $f0f4_2  = self::mul($f0_2,  $f4,    26);
+        $f0f5_2  = self::mul($f0_2,  $f5,    26);
+        $f0f6_2  = self::mul($f0_2,  $f6,    26);
+        $f0f7_2  = self::mul($f0_2,  $f7,    26);
+        $f0f8_2  = self::mul($f0_2,  $f8,    26);
+        $f0f9_2  = self::mul($f0_2,  $f9,    26);
+        $f1f1_2  = self::mul($f1_2,  $f1,    26);
+        $f1f2_2  = self::mul($f1_2,  $f2,    26);
+        $f1f3_4  = self::mul($f1_2,  $f3_2,  26);
+        $f1f4_2  = self::mul($f1_2,  $f4,    26);
+        $f1f5_4  = self::mul($f1_2,  $f5_2,  27);
+        $f1f6_2  = self::mul($f1_2,  $f6,    26);
+        $f1f7_4  = self::mul($f1_2,  $f7_2,  26);
+        $f1f8_2  = self::mul($f1_2,  $f8,    26);
+        $f1f9_76 = self::mul($f9_38, $f1_2,  26);
+        $f2f2    = self::mul($f2,    $f2,    26);
+        $f2f3_2  = self::mul($f2_2,  $f3,    26);
+        $f2f4_2  = self::mul($f2_2,  $f4,    26);
+        $f2f5_2  = self::mul($f2_2,  $f5,    26);
+        $f2f6_2  = self::mul($f2_2,  $f6,    26);
+        $f2f7_2  = self::mul($f2_2,  $f7,    26);
+        $f2f8_38 = self::mul($f8_19, $f2_2,  27);
+        $f2f9_38 = self::mul($f9_38, $f2,    26);
+        $f3f3_2  = self::mul($f3_2,  $f3,    26);
+        $f3f4_2  = self::mul($f3_2,  $f4,    26);
+        $f3f5_4  = self::mul($f3_2,  $f5_2,  27);
+        $f3f6_2  = self::mul($f3_2,  $f6,    26);
+        $f3f7_76 = self::mul($f7_38, $f3_2,  26);
+        $f3f8_38 = self::mul($f8_19, $f3_2,  26);
+        $f3f9_76 = self::mul($f9_38, $f3_2,  26);
+        $f4f4    = self::mul($f4,    $f4,    26);
+        $f4f5_2  = self::mul($f4_2,  $f5,    26);
+        $f4f6_38 = self::mul($f6_19, $f4_2,  27);
+        $f4f7_38 = self::mul($f7_38, $f4,    26);
+        $f4f8_38 = self::mul($f8_19, $f4_2,  27);
+        $f4f9_38 = self::mul($f9_38, $f4,    26);
+        $f5f5_38 = self::mul($f5_38, $f5,    26);
+        $f5f6_38 = self::mul($f6_19, $f5_2,  27);
+        $f5f7_76 = self::mul($f7_38, $f5_2,  27);
+        $f5f8_38 = self::mul($f8_19, $f5_2,  27);
+        $f5f9_76 = self::mul($f9_38, $f5_2,  27);
+        $f6f6_19 = self::mul($f6_19, $f6,    26);
+        $f6f7_38 = self::mul($f7_38, $f6,    26);
+        $f6f8_38 = self::mul($f8_19, $f6_2,  27);
+        $f6f9_38 = self::mul($f9_38, $f6,    26);
+        $f7f7_38 = self::mul($f7_38, $f7,    26);
+        $f7f8_38 = self::mul($f8_19, $f7_2,  27);
+        $f7f9_76 = self::mul($f9_38, $f7_2,  27);
+        $f8f8_19 = self::mul($f8_19, $f8,    26);
+        $f8f9_38 = self::mul($f9_38, $f8,    26);
+        $f9f9_38 = self::mul($f9_38, $f9,    27);
+        $h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
+        $h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
+        $h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
+        $h3 = $f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38;
+        $h4 = $f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38;
+        $h5 = $f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38;
+        $h6 = $f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19;
+        $h7 = $f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38;
+        $h8 = $f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38;
+        $h9 = $f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+
+        /** @var int $carry1 */
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        /** @var int $carry5 */
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+
+        /** @var int $carry2 */
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        /** @var int $carry6 */
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+
+        /** @var int $carry3 */
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        /** @var int $carry7 */
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        /** @var int $carry8 */
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        /** @var int $carry9 */
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19, 5);
+        $h9 -= $carry9 << 25;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+
+    /**
+     * Square and double a field element
+     *
+     * h = 2 * f * f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $f0 = (int) $f[0];
+        $f1 = (int) $f[1];
+        $f2 = (int) $f[2];
+        $f3 = (int) $f[3];
+        $f4 = (int) $f[4];
+        $f5 = (int) $f[5];
+        $f6 = (int) $f[6];
+        $f7 = (int) $f[7];
+        $f8 = (int) $f[8];
+        $f9 = (int) $f[9];
+
+        /** @var int $f0_2 */
+        $f0_2 = $f0 << 1;
+        /** @var int $f1_2 */
+        $f1_2 = $f1 << 1;
+        /** @var int $f2_2 */
+        $f2_2 = $f2 << 1;
+        /** @var int $f3_2 */
+        $f3_2 = $f3 << 1;
+        /** @var int $f4_2 */
+        $f4_2 = $f4 << 1;
+        /** @var int $f5_2 */
+        $f5_2 = $f5 << 1;
+        /** @var int $f6_2 */
+        $f6_2 = $f6 << 1;
+        /** @var int $f7_2 */
+        $f7_2 = $f7 << 1;
+        $f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */
+        $f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */
+        $f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */
+        $f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */
+        $f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */
+        $f0f0 = self::mul($f0, $f0, 26);
+        $f0f1_2 = self::mul($f0_2, $f1, 26);
+        $f0f2_2 = self::mul($f0_2, $f2, 26);
+        $f0f3_2 = self::mul($f0_2, $f3, 26);
+        $f0f4_2 = self::mul($f0_2, $f4, 26);
+        $f0f5_2 = self::mul($f0_2, $f5, 26);
+        $f0f6_2 = self::mul($f0_2, $f6, 26);
+        $f0f7_2 = self::mul($f0_2, $f7, 26);
+        $f0f8_2 = self::mul($f0_2, $f8, 26);
+        $f0f9_2 = self::mul($f0_2, $f9, 26);
+        $f1f1_2 = self::mul($f1_2,  $f1, 26);
+        $f1f2_2 = self::mul($f1_2,  $f2, 26);
+        $f1f3_4 = self::mul($f1_2,  $f3_2, 27);
+        $f1f4_2 = self::mul($f1_2,  $f4, 26);
+        $f1f5_4 = self::mul($f1_2,  $f5_2, 27);
+        $f1f6_2 = self::mul($f1_2,  $f6, 26);
+        $f1f7_4 = self::mul($f1_2,  $f7_2, 27);
+        $f1f8_2 = self::mul($f1_2,  $f8, 26);
+        $f1f9_76 = self::mul($f9_38, $f1_2, 27);
+        $f2f2 = self::mul($f2,  $f2, 26);
+        $f2f3_2 = self::mul($f2_2,  $f3, 26);
+        $f2f4_2 = self::mul($f2_2,  $f4, 26);
+        $f2f5_2 = self::mul($f2_2,  $f5, 26);
+        $f2f6_2 = self::mul($f2_2,  $f6, 26);
+        $f2f7_2 = self::mul($f2_2,  $f7, 26);
+        $f2f8_38 = self::mul($f8_19, $f2_2, 27);
+        $f2f9_38 = self::mul($f9_38, $f2, 26);
+        $f3f3_2 = self::mul($f3_2,  $f3, 26);
+        $f3f4_2 = self::mul($f3_2,  $f4, 26);
+        $f3f5_4 = self::mul($f3_2,  $f5_2, 27);
+        $f3f6_2 = self::mul($f3_2,  $f6, 27);
+        $f3f7_76 = self::mul($f7_38, $f3_2, 27);
+        $f3f8_38 = self::mul($f8_19, $f3_2, 27);
+        $f3f9_76 = self::mul($f9_38, $f3_2, 27);
+        $f4f4 = self::mul($f4,  $f4, 26);
+        $f4f5_2 = self::mul($f4_2,  $f5, 26);
+        $f4f6_38 = self::mul($f6_19, $f4_2, 27);
+        $f4f7_38 = self::mul($f7_38, $f4, 27);
+        $f4f8_38 = self::mul($f8_19, $f4_2, 27);
+        $f4f9_38 = self::mul($f9_38, $f4, 27);
+        $f5f5_38 = self::mul($f5_38, $f5, 26);
+        $f5f6_38 = self::mul($f6_19, $f5_2, 27);
+        $f5f7_76 = self::mul($f7_38, $f5_2, 27);
+        $f5f8_38 = self::mul($f8_19, $f5_2, 27);
+        $f5f9_76 = self::mul($f9_38, $f5_2, 27);
+        $f6f6_19 = self::mul($f6_19, $f6, 26);
+        $f6f7_38 = self::mul($f7_38, $f6, 26);
+        $f6f8_38 = self::mul($f8_19, $f6_2, 27);
+        $f6f9_38 = self::mul($f9_38, $f6, 26);
+        $f7f7_38 = self::mul($f7_38, $f7, 26);
+        $f7f8_38 = self::mul($f8_19, $f7_2, 27);
+        $f7f9_76 = self::mul($f9_38, $f7_2, 27);
+        $f8f8_19 = self::mul($f8_19, $f8, 26);
+        $f8f9_38 = self::mul($f9_38, $f8, 26);
+        $f9f9_38 = self::mul($f9_38, $f9, 27);
+
+        /** @var int $h0 */
+        $h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38) << 1;
+        /** @var int $h1 */
+        $h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38) << 1;
+        /** @var int $h2 */
+        $h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19) << 1;
+        /** @var int $h3 */
+        $h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38) << 1;
+        /** @var int $h4 */
+        $h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38) << 1;
+        /** @var int $h5 */
+        $h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38) << 1;
+        /** @var int $h6 */
+        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19) << 1;
+        /** @var int $h7 */
+        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38) << 1;
+        /** @var int $h8 */
+        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38) << 1;
+        /** @var int $h9 */
+        $h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2) << 1;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+
+        /** @var int $carry1 */
+        $carry1 = ($h1 + (1 << 24)) >> 25;
+        $h2 += $carry1;
+        $h1 -= $carry1 << 25;
+        /** @var int $carry5 */
+        $carry5 = ($h5 + (1 << 24)) >> 25;
+        $h6 += $carry5;
+        $h5 -= $carry5 << 25;
+
+        /** @var int $carry2 */
+        $carry2 = ($h2 + (1 << 25)) >> 26;
+        $h3 += $carry2;
+        $h2 -= $carry2 << 26;
+        /** @var int $carry6 */
+        $carry6 = ($h6 + (1 << 25)) >> 26;
+        $h7 += $carry6;
+        $h6 -= $carry6 << 26;
+
+        /** @var int $carry3 */
+        $carry3 = ($h3 + (1 << 24)) >> 25;
+        $h4 += $carry3;
+        $h3 -= $carry3 << 25;
+        /** @var int $carry7 */
+        $carry7 = ($h7 + (1 << 24)) >> 25;
+        $h8 += $carry7;
+        $h7 -= $carry7 << 25;
+
+        /** @var int $carry4 */
+        $carry4 = ($h4 + (1 << 25)) >> 26;
+        $h5 += $carry4;
+        $h4 -= $carry4 << 26;
+        /** @var int $carry8 */
+        $carry8 = ($h8 + (1 << 25)) >> 26;
+        $h9 += $carry8;
+        $h8 -= $carry8 << 26;
+
+        /** @var int $carry9 */
+        $carry9 = ($h9 + (1 << 24)) >> 25;
+        $h0 += self::mul($carry9, 19, 5);
+        $h9 -= $carry9 << 25;
+
+        /** @var int $carry0 */
+        $carry0 = ($h0 + (1 << 25)) >> 26;
+        $h1 += $carry0;
+        $h0 -= $carry0 << 26;
+
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) $h0,
+                (int) $h1,
+                (int) $h2,
+                (int) $h3,
+                (int) $h4,
+                (int) $h5,
+                (int) $h6,
+                (int) $h7,
+                (int) $h8,
+                (int) $h9
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
+    {
+        $z = clone $Z;
+        $t0 = self::fe_sq($z);
+        $t1 = self::fe_sq($t0);
+        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul($z, $t1);
+        $t0 = self::fe_mul($t0, $t1);
+        $t2 = self::fe_sq($t0);
+        $t1 = self::fe_mul($t1, $t2);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 5; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 10; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t2 = self::fe_mul($t2, $t1);
+        $t3 = self::fe_sq($t2);
+        for ($i = 1; $i < 20; ++$i) {
+            $t3 = self::fe_sq($t3);
+        }
+        $t2 = self::fe_mul($t3, $t2);
+        $t2 = self::fe_sq($t2);
+        for ($i = 1; $i < 10; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 50; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t2 = self::fe_mul($t2, $t1);
+        $t3 = self::fe_sq($t2);
+        for ($i = 1; $i < 100; ++$i) {
+            $t3 = self::fe_sq($t3);
+        }
+        $t2 = self::fe_mul($t3, $t2);
+        $t2 = self::fe_sq($t2);
+        for ($i = 1; $i < 50; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+        for ($i = 1; $i < 5; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+        return self::fe_mul($t1, $t0);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
+    {
+        # fe_sq(t0, z);
+        # fe_sq(t1, t0);
+        # fe_sq(t1, t1);
+        # fe_mul(t1, z, t1);
+        # fe_mul(t0, t0, t1);
+        # fe_sq(t0, t0);
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_sq($z);
+        $t1 = self::fe_sq($t0);
+        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul($z, $t1);
+        $t0 = self::fe_mul($t0, $t1);
+        $t0 = self::fe_sq($t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 5; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 5; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 10; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 10; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t1, t1, t0);
+        # fe_sq(t2, t1);
+        $t1 = self::fe_mul($t1, $t0);
+        $t2 = self::fe_sq($t1);
+
+        # for (i = 1; i < 20; ++i) {
+        #     fe_sq(t2, t2);
+        # }
+        for ($i = 1; $i < 20; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+
+        # fe_mul(t1, t2, t1);
+        # fe_sq(t1, t1);
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+
+        # for (i = 1; i < 10; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 10; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 50; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 50; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t1, t1, t0);
+        # fe_sq(t2, t1);
+        $t1 = self::fe_mul($t1, $t0);
+        $t2 = self::fe_sq($t1);
+
+        # for (i = 1; i < 100; ++i) {
+        #     fe_sq(t2, t2);
+        # }
+        for ($i = 1; $i < 100; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+
+        # fe_mul(t1, t2, t1);
+        # fe_sq(t1, t1);
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+
+        # for (i = 1; i < 50; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 50; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t0, t0);
+        # fe_sq(t0, t0);
+        # fe_mul(out, t0, z);
+        $t0 = self::fe_mul($t1, $t0);
+        $t0 = self::fe_sq($t0);
+        $t0 = self::fe_sq($t0);
+        return self::fe_mul($t0, $z);
+    }
+
+    /**
+     * Subtract two field elements.
+     *
+     * h = f - g
+     *
+     * Preconditions:
+     * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+     * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+     *
+     * Postconditions:
+     * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     * @psalm-suppress MixedOperand
+     */
+    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
+    {
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
+            array(
+                (int) ($f[0] - $g[0]),
+                (int) ($f[1] - $g[1]),
+                (int) ($f[2] - $g[2]),
+                (int) ($f[3] - $g[3]),
+                (int) ($f[4] - $g[4]),
+                (int) ($f[5] - $g[5]),
+                (int) ($f[6] - $g[6]),
+                (int) ($f[7] - $g[7]),
+                (int) ($f[8] - $g[8]),
+                (int) ($f[9] - $g[9])
+            )
+        );
+    }
+
+    /**
+     * Add two group elements.
+     *
+     * r = p + q
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_add(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+    ) {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->YplusX);
+        $r->Y = self::fe_mul($r->Y, $q->YminusX);
+        $r->T = self::fe_mul($q->T2d, $p->T);
+        $r->X = self::fe_mul($p->Z, $q->Z);
+        $t0   = self::fe_add($r->X, $r->X);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_add($t0, $r->T);
+        $r->T = self::fe_sub($t0, $r->T);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
+     * @param string $a
+     * @return array<int, mixed>
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function slide($a)
+    {
+        if (self::strlen($a) < 256) {
+            if (self::strlen($a) < 16) {
+                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+            }
+        }
+        /** @var array<int, int> $r */
+        $r = array();
+
+        /** @var int $i */
+        for ($i = 0; $i < 256; ++$i) {
+            $r[$i] = (int) (
+                1 & (
+                    self::chrToInt($a[(int) ($i >> 3)])
+                        >>
+                    ($i & 7)
+                )
+            );
+        }
+
+        for ($i = 0;$i < 256;++$i) {
+            if ($r[$i]) {
+                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
+                    if ($r[$i + $b]) {
+                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+                            $r[$i] += $r[$i + $b] << $b;
+                            $r[$i + $b] = 0;
+                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+                            $r[$i] -= $r[$i + $b] << $b;
+                            for ($k = $i + $b; $k < 256; ++$k) {
+                                if (!$r[$k]) {
+                                    $r[$k] = 1;
+                                    break;
+                                }
+                                $r[$k] = 0;
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_frombytes_negate_vartime($s)
+    {
+        static $d = null;
+        if (!$d) {
+            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
+        }
+
+        # fe_frombytes(h->Y,s);
+        # fe_1(h->Z);
+        $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
+            self::fe_0(),
+            self::fe_frombytes($s),
+            self::fe_1()
+        );
+
+        # fe_sq(u,h->Y);
+        # fe_mul(v,u,d);
+        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
+        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
+        $u = self::fe_sq($h->Y);
+        /** @var ParagonIE_Sodium_Core_Curve25519_Fe $d */
+        $v = self::fe_mul($u, $d);
+        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
+        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+
+        # fe_sq(v3,v);
+        # fe_mul(v3,v3,v);        /* v3 = v^3 */
+        # fe_sq(h->X,v3);
+        # fe_mul(h->X,h->X,v);
+        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
+        $v3 = self::fe_sq($v);
+        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
+        $h->X = self::fe_sq($v3);
+        $h->X = self::fe_mul($h->X, $v);
+        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+
+        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
+        # fe_mul(h->X,h->X,v3);
+        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
+        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
+        $h->X = self::fe_mul($h->X, $v3);
+        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+
+        # fe_sq(vxx,h->X);
+        # fe_mul(vxx,vxx,v);
+        # fe_sub(check,vxx,u);    /* vx^2-u */
+        $vxx = self::fe_sq($h->X);
+        $vxx = self::fe_mul($vxx, $v);
+        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
+
+        # if (fe_isnonzero(check)) {
+        #     fe_add(check,vxx,u);  /* vx^2+u */
+        #     if (fe_isnonzero(check)) {
+        #         return -1;
+        #     }
+        #     fe_mul(h->X,h->X,sqrtm1);
+        # }
+        if (self::fe_isnonzero($check)) {
+            $check = self::fe_add($vxx, $u); /* vx^2 + u */
+            if (self::fe_isnonzero($check)) {
+                throw new RangeException('Internal check failed.');
+            }
+            $h->X = self::fe_mul(
+                $h->X,
+                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
+            );
+        }
+
+        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
+        #     fe_neg(h->X,h->X);
+        # }
+        $i = self::chrToInt($s[31]);
+        if (self::fe_isnegative($h->X) === ($i >> 7)) {
+            $h->X = self::fe_neg($h->X);
+        }
+
+        # fe_mul(h->T,h->X,h->Y);
+        $h->T = self::fe_mul($h->X, $h->Y);
+        return $h;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_madd(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+    ) {
+        $r = clone $R;
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->yplusx);
+        $r->Y = self::fe_mul($r->Y, $q->yminusx);
+        $r->T = self::fe_mul($q->xy2d, $p->T);
+        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_add($t0, $r->T);
+        $r->T = self::fe_sub($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_msub(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
+    ) {
+        $r = clone $R;
+
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->yminusx);
+        $r->Y = self::fe_mul($r->Y, $q->yplusx);
+        $r->T = self::fe_mul($q->xy2d, $p->T);
+        $t0 = self::fe_add($p->Z, $p->Z);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_sub($t0, $r->T);
+        $r->T = self::fe_add($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
+        $r->X = self::fe_mul($p->X, $p->T);
+        $r->Y = self::fe_mul($p->Y, $p->Z);
+        $r->Z = self::fe_mul($p->Z, $p->T);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
+    {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
+        $r->X = self::fe_mul($p->X, $p->T);
+        $r->Y = self::fe_mul($p->Y, $p->Z);
+        $r->Z = self::fe_mul($p->Z, $p->T);
+        $r->T = self::fe_mul($p->X, $p->Y);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_p2_0()
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
+            self::fe_0(),
+            self::fe_1(),
+            self::fe_1()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
+    {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+        $r->X = self::fe_sq($p->X);
+        $r->Z = self::fe_sq($p->Y);
+        $r->T = self::fe_sq2($p->Z);
+        $r->Y = self::fe_add($p->X, $p->Y);
+        $t0   = self::fe_sq($r->Y);
+        $r->Y = self::fe_add($r->Z, $r->X);
+        $r->Z = self::fe_sub($r->Z, $r->X);
+        $r->X = self::fe_sub($t0, $r->Y);
+        $r->T = self::fe_sub($r->T, $r->Z);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_p3_0()
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
+            self::fe_0(),
+            self::fe_1(),
+            self::fe_1(),
+            self::fe_0()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+     */
+    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    {
+        static $d2 = null;
+        if ($d2 === null) {
+            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
+        }
+        /** @var ParagonIE_Sodium_Core_Curve25519_Fe $d2 */
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
+        $r->YplusX = self::fe_add($p->Y, $p->X);
+        $r->YminusX = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_copy($p->Z);
+        $r->T2d = self::fe_mul($p->T, $d2);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     */
+    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
+            $p->X,
+            $p->Y,
+            $p->Z
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
+    {
+        $recip = self::fe_invert($h->Z);
+        $x = self::fe_mul($h->X, $recip);
+        $y = self::fe_mul($h->Y, $recip);
+        $s = self::fe_tobytes($y);
+        $s[31] = self::intToChr(
+            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        );
+        return $s;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
+    {
+        $q = self::ge_p3_to_p2($p);
+        return self::ge_p2_dbl($q);
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+     */
+    public static function ge_precomp_0()
+    {
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+            self::fe_1(),
+            self::fe_1(),
+            self::fe_0()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $b
+     * @param int $c
+     * @return int
+     */
+    public static function equal($b, $c)
+    {
+        return (int) ((($b ^ $c) - 1 & 0xffffffff) >> 31);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int|string $char
+     * @return int (1 = yes, 0 = no)
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function negative($char)
+    {
+        if (is_int($char)) {
+            return $char < 0 ? 1 : 0;
+        }
+        $x = self::chrToInt(self::substr($char, 0, 1));
+        return (int) ($x >> 63);
+    }
+
+    /**
+     * Conditional move
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u
+     * @param int $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+     */
+    public static function cmov(
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
+        $b
+    ) {
+        if (!is_int($b)) {
+            throw new InvalidArgumentException('Expected an integer.');
+        }
+        return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+            self::fe_cmov($t->yplusx, $u->yplusx, $b),
+            self::fe_cmov($t->yminusx, $u->yminusx, $b),
+            self::fe_cmov($t->xy2d, $u->xy2d, $b)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $pos
+     * @param int $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayOffset
+     */
+    public static function ge_select($pos = 0, $b = 0)
+    {
+        static $base = null;
+        if ($base === null) {
+            $base = array();
+            /** @var int $i */
+            foreach (self::$base as $i => $bas) {
+                for ($j = 0; $j < 8; ++$j) {
+                    $base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][1]),
+                        ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][2])
+                    );
+                }
+            }
+        }
+        /** @var array<int, array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Precomp>> $base */
+        if (!is_int($pos)) {
+            throw new InvalidArgumentException('Position must be an integer');
+        }
+        if ($pos < 0 || $pos > 31) {
+            throw new RangeException('Position is out of range [0, 31]');
+        }
+
+        /** @var int $bnegative */
+        $bnegative = self::negative($b);
+        /** @var int $babs */
+        $babs = $b - (((-$bnegative) & $b) << 1);
+
+        $t = self::ge_precomp_0();
+        for ($i = 0; $i < 8; ++$i) {
+            $t = self::cmov(
+                $t,
+                $base[$pos][$i],
+                self::equal($babs, $i + 1)
+            );
+        }
+        $minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+            self::fe_copy($t->yminusx),
+            self::fe_copy($t->yplusx),
+            self::fe_neg($t->xy2d)
+        );
+        return self::cmov($t, $minusT, $bnegative);
+    }
+
+    /**
+     * Subtract two group elements.
+     *
+     * r = p - q
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+     */
+    public static function ge_sub(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
+    ) {
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->YminusX);
+        $r->Y = self::fe_mul($r->Y, $q->YplusX);
+        $r->T = self::fe_mul($q->T2d, $p->T);
+        $r->X = self::fe_mul($p->Z, $q->Z);
+        $t0 = self::fe_add($r->X, $r->X);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_sub($t0, $r->T);
+        $r->T = self::fe_add($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * Convert a group element to a byte string.
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
+    {
+        $recip = self::fe_invert($h->Z);
+        $x = self::fe_mul($h->X, $recip);
+        $y = self::fe_mul($h->Y, $recip);
+        $s = self::fe_tobytes($y);
+        $s[31] = self::intToChr(
+            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        );
+        return $s;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
+     * @param string $b
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayAccess
+     */
+    public static function ge_double_scalarmult_vartime(
+        $a,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A,
+        $b
+    ) {
+        /** @var array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Cached> $Ai */
+        $Ai = array();
+
+        /** @var array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Precomp> $Bi */
+        static $Bi = array();
+        if (!$Bi) {
+            for ($i = 0; $i < 8; ++$i) {
+                $Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
+                );
+            }
+        }
+        for ($i = 0; $i < 8; ++$i) {
+            $Ai[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
+                self::fe_0(),
+                self::fe_0(),
+                self::fe_0(),
+                self::fe_0()
+            );
+        }
+
+        # slide(aslide,a);
+        # slide(bslide,b);
+        $aslide = self::slide($a);
+        $bslide = self::slide($b);
+
+        # ge_p3_to_cached(&Ai[0],A);
+        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
+        $Ai[0] = self::ge_p3_to_cached($A);
+        $t = self::ge_p3_dbl($A);
+        $A2 = self::ge_p1p1_to_p3($t);
+
+        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
+        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
+        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
+        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
+        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
+        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
+        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
+        for ($i = 0; $i < 7; ++$i) {
+            $t = self::ge_add($A2, $Ai[$i]);
+            $u = self::ge_p1p1_to_p3($t);
+            $Ai[$i + 1] = self::ge_p3_to_cached($u);
+        }
+
+        # ge_p2_0(r);
+        $r = self::ge_p2_0();
+
+        # for (i = 255;i >= 0;--i) {
+        #     if (aslide[i] || bslide[i]) break;
+        # }
+        $i = 255;
+        for (; $i >= 0; --$i) {
+            if ($aslide[$i] || $bslide[$i]) {
+                break;
+            }
+        }
+
+        # for (;i >= 0;--i) {
+        for (; $i >= 0; --$i) {
+            # ge_p2_dbl(&t,r);
+            $t = self::ge_p2_dbl($r);
+
+            # if (aslide[i] > 0) {
+            if ($aslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_add(&t,&u,&Ai[aslide[i]/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_add(
+                    $u,
+                    $Ai[(int) floor($aslide[$i] / 2)]
+                );
+            # } else if (aslide[i] < 0) {
+            } elseif ($aslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_sub(
+                    $u,
+                    $Ai[(int) floor(-$aslide[$i] / 2)]
+                );
+            }
+
+            # if (bslide[i] > 0) {
+            if ($bslide[$i] > 0) {
+                /** @var int $index */
+                $index = (int) floor($bslide[$i] / 2);
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_madd($t, $u, $Bi[$index]);
+            # } else if (bslide[i] < 0) {
+            } elseif ($bslide[$i] < 0) {
+                /** @var int $index */
+                $index = (int) floor(-$bslide[$i] / 2);
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_msub($t, $u, $Bi[$index]);
+            }
+            # ge_p1p1_to_p2(r,&t);
+            $r = self::ge_p1p1_to_p2($t);
+        }
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedOperand
+     */
+    public static function ge_scalarmult_base($a)
+    {
+        /** @var array<int, int> $e */
+        $e = array();
+        $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
+
+        for ($i = 0; $i < 32; ++$i) {
+            /** @var int $dbl */
+            $dbl = (int) $i << 1;
+            $e[$dbl] = (int) self::chrToInt($a[$i]) & 15;
+            $e[$dbl + 1] = (int) (self::chrToInt($a[$i]) >> 4) & 15;
+        }
+
+        /** @var int $carry */
+        $carry = 0;
+        for ($i = 0; $i < 63; ++$i) {
+            $e[$i] += $carry;
+            /** @var int $carry */
+            $carry = $e[$i] + 8;
+            /** @var int $carry */
+            $carry >>= 4;
+            $e[$i] -= $carry << 4;
+        }
+        /** @var array<int, int> $e */
+        $e[63] += (int) $carry;
+
+        $h = self::ge_p3_0();
+
+        for ($i = 1; $i < 64; $i += 2) {
+            $t = self::ge_select((int) floor($i / 2), (int) $e[$i]);
+            $r = self::ge_madd($r, $h, $t);
+            $h = self::ge_p1p1_to_p3($r);
+        }
+
+        $r = self::ge_p3_dbl($h);
+
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+
+        $h = self::ge_p1p1_to_p3($r);
+
+        for ($i = 0; $i < 64; $i += 2) {
+            $t = self::ge_select($i >> 1, (int) $e[$i]);
+            $r = self::ge_madd($r, $h, $t);
+            $h = self::ge_p1p1_to_p3($r);
+        }
+        return $h;
+    }
+
+    /**
+     * Calculates (ab + c) mod l
+     * where l = 2^252 + 27742317777372353535851937790883648493
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @param string $c
+     * @return string
+     * @throws TypeError
+     */
+    public static function sc_muladd($a, $b, $c)
+    {
+        /** @var int $a0 */
+        $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
+        /** @var int $a1 */
+        $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
+        /** @var int $a2 */
+        $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
+        /** @var int $a3 */
+        $a3 = 2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7);
+        /** @var int $a4 */
+        $a4 = 2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4);
+        /** @var int $a5 */
+        $a5 = 2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1);
+        /** @var int $a6 */
+        $a6 = 2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6);
+        /** @var int $a7 */
+        $a7 = 2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3);
+        /** @var int $a8 */
+        $a8 = 2097151 & self::load_3(self::substr($a, 21, 3));
+        /** @var int $a9 */
+        $a9 = 2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5);
+        /** @var int $a10 */
+        $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
+        /** @var int $a11 */
+        $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
+
+        /** @var int $b0 */
+        $b0 = 2097151 & self::load_3(self::substr($b, 0, 3));
+        /** @var int $b1 */
+        $b1 = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
+        /** @var int $b2 */
+        $b2 = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
+        /** @var int $b3 */
+        $b3 = 2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7);
+        /** @var int $b4 */
+        $b4 = 2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4);
+        /** @var int $b5 */
+        $b5 = 2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1);
+        /** @var int $b6 */
+        $b6 = 2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6);
+        /** @var int $b7 */
+        $b7 = 2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3);
+        /** @var int $b8 */
+        $b8 = 2097151 & self::load_3(self::substr($b, 21, 3));
+        /** @var int $b9 */
+        $b9 = 2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5);
+        /** @var int $b10 */
+        $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
+        /** @var int $b11 */
+        $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
+
+        /** @var int $c0 */
+        $c0 = 2097151 & self::load_3(self::substr($c, 0, 3));
+        /** @var int $c1 */
+        $c1 = 2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5);
+        /** @var int $c2 */
+        $c2 = 2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2);
+        /** @var int $c3 */
+        $c3 = 2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7);
+        /** @var int $c4 */
+        $c4 = 2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4);
+        /** @var int $c5 */
+        $c5 = 2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1);
+        /** @var int $c6 */
+        $c6 = 2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6);
+        /** @var int $c7 */
+        $c7 = 2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3);
+        /** @var int $c8 */
+        $c8 = 2097151 & self::load_3(self::substr($c, 21, 3));
+        /** @var int $c9 */
+        $c9 = 2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5);
+        /** @var int $c10 */
+        $c10 = 2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2);
+        /** @var int $c11 */
+        $c11 = (self::load_4(self::substr($c, 28, 4)) >> 7);
+
+        /* Can't really avoid the pyramid here: */
+        $s0 = $c0 + self::mul($a0, $b0, 24);
+        $s1 = $c1 + self::mul($a0, $b1, 24) + self::mul($a1, $b0, 24);
+        $s2 = $c2 + self::mul($a0, $b2, 24) + self::mul($a1, $b1, 24) + self::mul($a2, $b0, 24);
+        $s3 = $c3 + self::mul($a0, $b3, 24) + self::mul($a1, $b2, 24) + self::mul($a2, $b1, 24) + self::mul($a3, $b0, 24);
+        $s4 = $c4 + self::mul($a0, $b4, 24) + self::mul($a1, $b3, 24) + self::mul($a2, $b2, 24) + self::mul($a3, $b1, 24) + self::mul($a4, $b0, 24);
+        $s5 = $c5 + self::mul($a0, $b5, 24) + self::mul($a1, $b4, 24) + self::mul($a2, $b3, 24) + self::mul($a3, $b2, 24) + self::mul($a4, $b1, 24) + self::mul($a5, $b0, 24);
+        $s6 = $c6 + self::mul($a0, $b6, 24) + self::mul($a1, $b5, 24) + self::mul($a2, $b4, 24) + self::mul($a3, $b3, 24) + self::mul($a4, $b2, 24) + self::mul($a5, $b1, 24) + self::mul($a6, $b0, 24);
+        $s7 = $c7 + self::mul($a0, $b7, 24) + self::mul($a1, $b6, 24) + self::mul($a2, $b5, 24) + self::mul($a3, $b4, 24) + self::mul($a4, $b3, 24) + self::mul($a5, $b2, 24) + self::mul($a6, $b1, 24) + self::mul($a7, $b0, 24);
+        $s8 = $c8 + self::mul($a0, $b8, 24) + self::mul($a1, $b7, 24) + self::mul($a2, $b6, 24) + self::mul($a3, $b5, 24) + self::mul($a4, $b4, 24) + self::mul($a5, $b3, 24) + self::mul($a6, $b2, 24) + self::mul($a7, $b1, 24) + self::mul($a8, $b0, 24);
+        $s9 = $c9 + self::mul($a0, $b9, 24) + self::mul($a1, $b8, 24) + self::mul($a2, $b7, 24) + self::mul($a3, $b6, 24) + self::mul($a4, $b5, 24) + self::mul($a5, $b4, 24) + self::mul($a6, $b3, 24) + self::mul($a7, $b2, 24) + self::mul($a8, $b1, 24) + self::mul($a9, $b0, 24);
+        $s10 = $c10 + self::mul($a0, $b10, 24) + self::mul($a1, $b9, 24) + self::mul($a2, $b8, 24) + self::mul($a3, $b7, 24) + self::mul($a4, $b6, 24) + self::mul($a5, $b5, 24) + self::mul($a6, $b4, 24) + self::mul($a7, $b3, 24) + self::mul($a8, $b2, 24) + self::mul($a9, $b1, 24) + self::mul($a10, $b0, 24);
+        $s11 = $c11 + self::mul($a0, $b11, 24) + self::mul($a1, $b10, 24) + self::mul($a2, $b9, 24) + self::mul($a3, $b8, 24) + self::mul($a4, $b7, 24) + self::mul($a5, $b6, 24) + self::mul($a6, $b5, 24) + self::mul($a7, $b4, 24) + self::mul($a8, $b3, 24) + self::mul($a9, $b2, 24) + self::mul($a10, $b1, 24) + self::mul($a11, $b0, 24);
+        $s12 = self::mul($a1, $b11, 24) + self::mul($a2, $b10, 24) + self::mul($a3, $b9, 24) + self::mul($a4, $b8, 24) + self::mul($a5, $b7, 24) + self::mul($a6, $b6, 24) + self::mul($a7, $b5, 24) + self::mul($a8, $b4, 24) + self::mul($a9, $b3, 24) + self::mul($a10, $b2, 24) + self::mul($a11, $b1, 24);
+        $s13 = self::mul($a2, $b11, 24) + self::mul($a3, $b10, 24) + self::mul($a4, $b9, 24) + self::mul($a5, $b8, 24) + self::mul($a6, $b7, 24) + self::mul($a7, $b6, 24) + self::mul($a8, $b5, 24) + self::mul($a9, $b4, 24) + self::mul($a10, $b3, 24) + self::mul($a11, $b2, 24);
+        $s14 = self::mul($a3, $b11, 24) + self::mul($a4, $b10, 24) + self::mul($a5, $b9, 24) + self::mul($a6, $b8, 24) + self::mul($a7, $b7, 24) + self::mul($a8, $b6, 24) + self::mul($a9, $b5, 24) + self::mul($a10, $b4, 24) + self::mul($a11, $b3, 24);
+        $s15 = self::mul($a4, $b11, 24) + self::mul($a5, $b10, 24) + self::mul($a6, $b9, 24) + self::mul($a7, $b8, 24) + self::mul($a8, $b7, 24) + self::mul($a9, $b6, 24) + self::mul($a10, $b5, 24) + self::mul($a11, $b4, 24);
+        $s16 = self::mul($a5, $b11, 24) + self::mul($a6, $b10, 24) + self::mul($a7, $b9, 24) + self::mul($a8, $b8, 24) + self::mul($a9, $b7, 24) + self::mul($a10, $b6, 24) + self::mul($a11, $b5, 24);
+        $s17 = self::mul($a6, $b11, 24) + self::mul($a7, $b10, 24) + self::mul($a8, $b9, 24) + self::mul($a9, $b8, 24) + self::mul($a10, $b7, 24) + self::mul($a11, $b6, 24);
+        $s18 = self::mul($a7, $b11, 24) + self::mul($a8, $b10, 24) + self::mul($a9, $b9, 24) + self::mul($a10, $b8, 24) + self::mul($a11, $b7, 24);
+        $s19 = self::mul($a8, $b11, 24) + self::mul($a9, $b10, 24) + self::mul($a10, $b9, 24) + self::mul($a11, $b8, 24);
+        $s20 = self::mul($a9, $b11, 24) + self::mul($a10, $b10, 24) + self::mul($a11, $b9, 24);
+        $s21 = self::mul($a10, $b11, 24) + self::mul($a11, $b10, 24);
+        $s22 = self::mul($a11, $b11, 24);
+        $s23 = 0;
+
+        /** @var int $carry0 */
+        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry2 */
+        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry4 */
+        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry6 */
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry8 */
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry10 */
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+        /** @var int $carry12 */
+        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $s13 += $carry12;
+        $s12 -= $carry12 << 21;
+        /** @var int $carry14 */
+        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $s15 += $carry14;
+        $s14 -= $carry14 << 21;
+        /** @var int $carry16 */
+        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $s17 += $carry16;
+        $s16 -= $carry16 << 21;
+        /** @var int $carry18 */
+        $carry18 = ($s18 + (1 << 20)) >> 21;
+        $s19 += $carry18;
+        $s18 -= $carry18 << 21;
+        /** @var int $carry20 */
+        $carry20 = ($s20 + (1 << 20)) >> 21;
+        $s21 += $carry20;
+        $s20 -= $carry20 << 21;
+        /** @var int $carry22 */
+        $carry22 = ($s22 + (1 << 20)) >> 21;
+        $s23 += $carry22;
+        $s22 -= $carry22 << 21;
+
+        /** @var int $carry1 */
+        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry3 */
+        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry5 */
+        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry7 */
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry9 */
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry11 */
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+        /** @var int $carry13 */
+        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $s14 += $carry13;
+        $s13 -= $carry13 << 21;
+        /** @var int $carry15 */
+        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $s16 += $carry15;
+        $s15 -= $carry15 << 21;
+        /** @var int $carry17 */
+        $carry17 = ($s17 + (1 << 20)) >> 21;
+        $s18 += $carry17;
+        $s17 -= $carry17 << 21;
+        /** @var int $carry19 */
+        $carry19 = ($s19 + (1 << 20)) >> 21;
+        $s20 += $carry19;
+        $s19 -= $carry19 << 21;
+        /** @var int $carry21 */
+        $carry21 = ($s21 + (1 << 20)) >> 21;
+        $s22 += $carry21;
+        $s21 -= $carry21 << 21;
+
+        $s11 += self::mul($s23, 666643, 20);
+        $s12 += self::mul($s23, 470296, 19);
+        $s13 += self::mul($s23, 654183, 20);
+        $s14 -= self::mul($s23, 997805, 20);
+        $s15 += self::mul($s23, 136657, 18);
+        $s16 -= self::mul($s23, 683901, 20);
+
+        $s10 += self::mul($s22, 666643, 20);
+        $s11 += self::mul($s22, 470296, 19);
+        $s12 += self::mul($s22, 654183, 20);
+        $s13 -= self::mul($s22, 997805, 20);
+        $s14 += self::mul($s22, 136657, 18);
+        $s15 -= self::mul($s22, 683901, 20);
+
+        $s9  += self::mul($s21,  666643, 20);
+        $s10 += self::mul($s21,  470296, 19);
+        $s11 += self::mul($s21,  654183, 20);
+        $s12 -= self::mul($s21,  997805, 20);
+        $s13 += self::mul($s21,  136657, 18);
+        $s14 -= self::mul($s21,  683901, 20);
+
+        $s8  += self::mul($s20,  666643, 20);
+        $s9  += self::mul($s20,  470296, 19);
+        $s10 += self::mul($s20,  654183, 20);
+        $s11 -= self::mul($s20,  997805, 20);
+        $s12 += self::mul($s20,  136657, 18);
+        $s13 -= self::mul($s20,  683901, 20);
+
+        $s7  += self::mul($s19,  666643, 20);
+        $s8  += self::mul($s19,  470296, 19);
+        $s9  += self::mul($s19,  654183, 20);
+        $s10 -= self::mul($s19,  997805, 20);
+        $s11 += self::mul($s19,  136657, 18);
+        $s12 -= self::mul($s19,  683901, 20);
+
+        $s6  += self::mul($s18,  666643, 20);
+        $s7  += self::mul($s18,  470296, 19);
+        $s8  += self::mul($s18,  654183, 20);
+        $s9  -= self::mul($s18,  997805, 20);
+        $s10 += self::mul($s18,  136657, 18);
+        $s11 -= self::mul($s18,  683901, 20);
+
+        /** @var int $carry6 */
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry8 */
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry10 */
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+        /** @var int $carry12 */
+        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $s13 += $carry12;
+        $s12 -= $carry12 << 21;
+        /** @var int $carry14 */
+        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $s15 += $carry14;
+        $s14 -= $carry14 << 21;
+        /** @var int $carry16 */
+        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $s17 += $carry16;
+        $s16 -= $carry16 << 21;
+
+        /** @var int $carry7 */
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry9 */
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry11 */
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+        /** @var int $carry13 */
+        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $s14 += $carry13;
+        $s13 -= $carry13 << 21;
+        /** @var int $carry15 */
+        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $s16 += $carry15;
+        $s15 -= $carry15 << 21;
+
+        $s5  += self::mul($s17,  666643, 20);
+        $s6  += self::mul($s17,  470296, 19);
+        $s7  += self::mul($s17,  654183, 20);
+        $s8  -= self::mul($s17,  997805, 20);
+        $s9  += self::mul($s17,  136657, 18);
+        $s10 -= self::mul($s17,  683901, 20);
+
+        $s4 += self::mul($s16,  666643, 20);
+        $s5 += self::mul($s16,  470296, 19);
+        $s6 += self::mul($s16,  654183, 20);
+        $s7 -= self::mul($s16,  997805, 20);
+        $s8 += self::mul($s16,  136657, 18);
+        $s9 -= self::mul($s16,  683901, 20);
+
+        $s3 += self::mul($s15,  666643, 20);
+        $s4 += self::mul($s15,  470296, 19);
+        $s5 += self::mul($s15,  654183, 20);
+        $s6 -= self::mul($s15,  997805, 20);
+        $s7 += self::mul($s15,  136657, 18);
+        $s8 -= self::mul($s15,  683901, 20);
+
+        $s2 += self::mul($s14,  666643, 20);
+        $s3 += self::mul($s14,  470296, 19);
+        $s4 += self::mul($s14,  654183, 20);
+        $s5 -= self::mul($s14,  997805, 20);
+        $s6 += self::mul($s14,  136657, 18);
+        $s7 -= self::mul($s14,  683901, 20);
+
+        $s1 += self::mul($s13,  666643, 20);
+        $s2 += self::mul($s13,  470296, 19);
+        $s3 += self::mul($s13,  654183, 20);
+        $s4 -= self::mul($s13,  997805, 20);
+        $s5 += self::mul($s13,  136657, 18);
+        $s6 -= self::mul($s13,  683901, 20);
+
+        $s0 += self::mul($s12,  666643, 20);
+        $s1 += self::mul($s12,  470296, 19);
+        $s2 += self::mul($s12,  654183, 20);
+        $s3 -= self::mul($s12,  997805, 20);
+        $s4 += self::mul($s12,  136657, 18);
+        $s5 -= self::mul($s12,  683901, 20);
+        $s12 = 0;
+
+        /** @var int $carry0 */
+        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry2 */
+        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry4 */
+        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry6 */
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry8 */
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry10 */
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+
+        /** @var int $carry1 */
+        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry3 */
+        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry5 */
+        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry7 */
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry9 */
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry11 */
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+
+        $s0 += self::mul($s12,  666643, 20);
+        $s1 += self::mul($s12,  470296, 19);
+        $s2 += self::mul($s12,  654183, 20);
+        $s3 -= self::mul($s12,  997805, 20);
+        $s4 += self::mul($s12,  136657, 18);
+        $s5 -= self::mul($s12,  683901, 20);
+        $s12 = 0;
+
+        /** @var int $carry0 */
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry1 */
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry2 */
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry3 */
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry4 */
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry5 */
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry6 */
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry7 */
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry8 */
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry9 */
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry10 */
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+        /** @var int $carry11 */
+        $carry11 = $s11 >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+
+        $s0 += self::mul($s12,  666643, 20);
+        $s1 += self::mul($s12,  470296, 19);
+        $s2 += self::mul($s12,  654183, 20);
+        $s3 -= self::mul($s12,  997805, 20);
+        $s4 += self::mul($s12,  136657, 18);
+        $s5 -= self::mul($s12,  683901, 20);
+
+        /** @var int $carry0 */
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry1 */
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry2 */
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry3 */
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry4 */
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry5 */
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry6 */
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry7 */
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry8 */
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry9 */
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry10 */
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) (0xff & ($s0 >> 0)),
+            (int) (0xff & ($s0 >> 8)),
+            (int) (0xff & (($s0 >> 16) | $s1 << 5)),
+            (int) (0xff & ($s1 >> 3)),
+            (int) (0xff & ($s1 >> 11)),
+            (int) (0xff & (($s1 >> 19) | $s2 << 2)),
+            (int) (0xff & ($s2 >> 6)),
+            (int) (0xff & (($s2 >> 14) | $s3 << 7)),
+            (int) (0xff & ($s3 >> 1)),
+            (int) (0xff & ($s3 >> 9)),
+            (int) (0xff & (($s3 >> 17) | $s4 << 4)),
+            (int) (0xff & ($s4 >> 4)),
+            (int) (0xff & ($s4 >> 12)),
+            (int) (0xff & (($s4 >> 20) | $s5 << 1)),
+            (int) (0xff & ($s5 >> 7)),
+            (int) (0xff & (($s5 >> 15) | $s6 << 6)),
+            (int) (0xff & ($s6 >> 2)),
+            (int) (0xff & ($s6 >> 10)),
+            (int) (0xff & (($s6 >> 18) | $s7 << 3)),
+            (int) (0xff & ($s7 >> 5)),
+            (int) (0xff & ($s7 >> 13)),
+            (int) (0xff & ($s8 >> 0)),
+            (int) (0xff & ($s8 >> 8)),
+            (int) (0xff & (($s8 >> 16) | $s9 << 5)),
+            (int) (0xff & ($s9 >> 3)),
+            (int) (0xff & ($s9 >> 11)),
+            (int) (0xff & (($s9 >> 19) | $s10 << 2)),
+            (int) (0xff & ($s10 >> 6)),
+            (int) (0xff & (($s10 >> 14) | $s11 << 7)),
+            (int) (0xff & ($s11 >> 1)),
+            (int) (0xff & ($s11 >> 9)),
+            0xff & ($s11 >> 17)
+        );
+        return self::intArrayToString($arr);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return string
+     * @throws TypeError
+     */
+    public static function sc_reduce($s)
+    {
+        /** @var int $s0 */
+        $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
+        /** @var int $s1 */
+        $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
+        /** @var int $s2 */
+        $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
+        /** @var int $s3 */
+        $s3 = 2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7);
+        /** @var int $s4 */
+        $s4 = 2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4);
+        /** @var int $s5 */
+        $s5 = 2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1);
+        /** @var int $s6 */
+        $s6 = 2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6);
+        /** @var int $s7 */
+        $s7 = 2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3);
+        /** @var int $s8 */
+        $s8 = 2097151 & self::load_3(self::substr($s, 21, 3));
+        /** @var int $s9 */
+        $s9 = 2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5);
+        /** @var int $s10 */
+        $s10 = 2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2);
+        /** @var int $s11 */
+        $s11 = 2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7);
+        /** @var int $s12 */
+        $s12 = 2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4);
+        /** @var int $s13 */
+        $s13 = 2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1);
+        /** @var int $s14 */
+        $s14 = 2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6);
+        /** @var int $s15 */
+        $s15 = 2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3);
+        /** @var int $s16 */
+        $s16 = 2097151 & self::load_3(self::substr($s, 42, 3));
+        /** @var int $s17 */
+        $s17 = 2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5);
+        /** @var int $s18 */
+        $s18 = 2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2);
+        /** @var int $s19 */
+        $s19 = 2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7);
+        /** @var int $s20 */
+        $s20 = 2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4);
+        /** @var int $s21 */
+        $s21 = 2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1);
+        /** @var int $s22 */
+        $s22 = 2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6);
+        /** @var int $s23 */
+        $s23 = (self::load_4(self::substr($s, 60, 4)) >> 3);
+
+        $s11 += self::mul($s23,  666643, 20);
+        $s12 += self::mul($s23,  470296, 19);
+        $s13 += self::mul($s23,  654183, 20);
+        $s14 -= self::mul($s23,  997805, 20);
+        $s15 += self::mul($s23,  136657, 18);
+        $s16 -= self::mul($s23,  683901, 20);
+
+        $s10 += self::mul($s22,  666643, 20);
+        $s11 += self::mul($s22,  470296, 19);
+        $s12 += self::mul($s22,  654183, 20);
+        $s13 -= self::mul($s22,  997805, 20);
+        $s14 += self::mul($s22,  136657, 18);
+        $s15 -= self::mul($s22,  683901, 20);
+
+        $s9  += self::mul($s21,  666643, 20);
+        $s10 += self::mul($s21,  470296, 19);
+        $s11 += self::mul($s21,  654183, 20);
+        $s12 -= self::mul($s21,  997805, 20);
+        $s13 += self::mul($s21,  136657, 18);
+        $s14 -= self::mul($s21,  683901, 20);
+
+        $s8  += self::mul($s20,  666643, 20);
+        $s9  += self::mul($s20,  470296, 19);
+        $s10 += self::mul($s20,  654183, 20);
+        $s11 -= self::mul($s20,  997805, 20);
+        $s12 += self::mul($s20,  136657, 18);
+        $s13 -= self::mul($s20,  683901, 20);
+
+        $s7  += self::mul($s19,  666643, 20);
+        $s8  += self::mul($s19,  470296, 19);
+        $s9  += self::mul($s19,  654183, 20);
+        $s10 -= self::mul($s19,  997805, 20);
+        $s11 += self::mul($s19,  136657, 18);
+        $s12 -= self::mul($s19,  683901, 20);
+
+        $s6  += self::mul($s18,  666643, 20);
+        $s7  += self::mul($s18,  470296, 19);
+        $s8  += self::mul($s18,  654183, 20);
+        $s9  -= self::mul($s18,  997805, 20);
+        $s10 += self::mul($s18,  136657, 18);
+        $s11 -= self::mul($s18,  683901, 20);
+
+        /** @var int $carry6 */
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry8 */
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry10 */
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+        /** @var int $carry12 */
+        $carry12 = ($s12 + (1 << 20)) >> 21;
+        $s13 += $carry12;
+        $s12 -= $carry12 << 21;
+        /** @var int $carry14 */
+        $carry14 = ($s14 + (1 << 20)) >> 21;
+        $s15 += $carry14;
+        $s14 -= $carry14 << 21;
+        /** @var int $carry16 */
+        $carry16 = ($s16 + (1 << 20)) >> 21;
+        $s17 += $carry16;
+        $s16 -= $carry16 << 21;
+
+        /** @var int $carry7 */
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry9 */
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry11 */
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+        /** @var int $carry13 */
+        $carry13 = ($s13 + (1 << 20)) >> 21;
+        $s14 += $carry13;
+        $s13 -= $carry13 << 21;
+        /** @var int $carry15 */
+        $carry15 = ($s15 + (1 << 20)) >> 21;
+        $s16 += $carry15;
+        $s15 -= $carry15 << 21;
+
+        $s5  += self::mul($s17,  666643, 20);
+        $s6  += self::mul($s17,  470296, 19);
+        $s7  += self::mul($s17,  654183, 20);
+        $s8  -= self::mul($s17,  997805, 20);
+        $s9  += self::mul($s17,  136657, 18);
+        $s10 -= self::mul($s17,  683901, 20);
+
+        $s4 += self::mul($s16,  666643, 20);
+        $s5 += self::mul($s16,  470296, 19);
+        $s6 += self::mul($s16,  654183, 20);
+        $s7 -= self::mul($s16,  997805, 20);
+        $s8 += self::mul($s16,  136657, 18);
+        $s9 -= self::mul($s16,  683901, 20);
+
+        $s3 += self::mul($s15,  666643, 20);
+        $s4 += self::mul($s15,  470296, 19);
+        $s5 += self::mul($s15,  654183, 20);
+        $s6 -= self::mul($s15,  997805, 20);
+        $s7 += self::mul($s15,  136657, 18);
+        $s8 -= self::mul($s15,  683901, 20);
+
+        $s2 += self::mul($s14,  666643, 20);
+        $s3 += self::mul($s14,  470296, 19);
+        $s4 += self::mul($s14,  654183, 20);
+        $s5 -= self::mul($s14,  997805, 20);
+        $s6 += self::mul($s14,  136657, 18);
+        $s7 -= self::mul($s14,  683901, 20);
+
+        $s1 += self::mul($s13,  666643, 20);
+        $s2 += self::mul($s13,  470296, 19);
+        $s3 += self::mul($s13,  654183, 20);
+        $s4 -= self::mul($s13,  997805, 20);
+        $s5 += self::mul($s13,  136657, 18);
+        $s6 -= self::mul($s13,  683901, 20);
+
+        $s0 += self::mul($s12,  666643, 20);
+        $s1 += self::mul($s12,  470296, 19);
+        $s2 += self::mul($s12,  654183, 20);
+        $s3 -= self::mul($s12,  997805, 20);
+        $s4 += self::mul($s12,  136657, 18);
+        $s5 -= self::mul($s12,  683901, 20);
+        $s12 = 0;
+
+        /** @var int $carry0 */
+        $carry0 = ($s0 + (1 << 20)) >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry2 */
+        $carry2 = ($s2 + (1 << 20)) >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry4 */
+        $carry4 = ($s4 + (1 << 20)) >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry6 */
+        $carry6 = ($s6 + (1 << 20)) >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry8 */
+        $carry8 = ($s8 + (1 << 20)) >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry10 */
+        $carry10 = ($s10 + (1 << 20)) >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+
+        /** @var int $carry1 */
+        $carry1 = ($s1 + (1 << 20)) >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry3 */
+        $carry3 = ($s3 + (1 << 20)) >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry5 */
+        $carry5 = ($s5 + (1 << 20)) >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry7 */
+        $carry7 = ($s7 + (1 << 20)) >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry9 */
+        $carry9 = ($s9 + (1 << 20)) >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry11 */
+        $carry11 = ($s11 + (1 << 20)) >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+
+        $s0 += self::mul($s12,  666643, 20);
+        $s1 += self::mul($s12,  470296, 19);
+        $s2 += self::mul($s12,  654183, 20);
+        $s3 -= self::mul($s12,  997805, 20);
+        $s4 += self::mul($s12,  136657, 18);
+        $s5 -= self::mul($s12,  683901, 20);
+        $s12 = 0;
+
+        /** @var int $carry0 */
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry1 */
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry2 */
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry3 */
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry4 */
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry5 */
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry6 */
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry7 */
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry8 */
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry9 */
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry10 */
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+        /** @var int $carry11 */
+        $carry11 = $s11 >> 21;
+        $s12 += $carry11;
+        $s11 -= $carry11 << 21;
+
+        $s0 += self::mul($s12,  666643, 20);
+        $s1 += self::mul($s12,  470296, 19);
+        $s2 += self::mul($s12,  654183, 20);
+        $s3 -= self::mul($s12,  997805, 20);
+        $s4 += self::mul($s12,  136657, 18);
+        $s5 -= self::mul($s12,  683901, 20);
+
+        /** @var int $carry0 */
+        $carry0 = $s0 >> 21;
+        $s1 += $carry0;
+        $s0 -= $carry0 << 21;
+        /** @var int $carry1 */
+        $carry1 = $s1 >> 21;
+        $s2 += $carry1;
+        $s1 -= $carry1 << 21;
+        /** @var int $carry2 */
+        $carry2 = $s2 >> 21;
+        $s3 += $carry2;
+        $s2 -= $carry2 << 21;
+        /** @var int $carry3 */
+        $carry3 = $s3 >> 21;
+        $s4 += $carry3;
+        $s3 -= $carry3 << 21;
+        /** @var int $carry4 */
+        $carry4 = $s4 >> 21;
+        $s5 += $carry4;
+        $s4 -= $carry4 << 21;
+        /** @var int $carry5 */
+        $carry5 = $s5 >> 21;
+        $s6 += $carry5;
+        $s5 -= $carry5 << 21;
+        /** @var int $carry6 */
+        $carry6 = $s6 >> 21;
+        $s7 += $carry6;
+        $s6 -= $carry6 << 21;
+        /** @var int $carry7 */
+        $carry7 = $s7 >> 21;
+        $s8 += $carry7;
+        $s7 -= $carry7 << 21;
+        /** @var int $carry8 */
+        $carry8 = $s8 >> 21;
+        $s9 += $carry8;
+        $s8 -= $carry8 << 21;
+        /** @var int $carry9 */
+        $carry9 = $s9 >> 21;
+        $s10 += $carry9;
+        $s9 -= $carry9 << 21;
+        /** @var int $carry10 */
+        $carry10 = $s10 >> 21;
+        $s11 += $carry10;
+        $s10 -= $carry10 << 21;
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) ($s0 >> 0),
+            (int) ($s0 >> 8),
+            (int) (($s0 >> 16) | $s1 << 5),
+            (int) ($s1 >> 3),
+            (int) ($s1 >> 11),
+            (int) (($s1 >> 19) | $s2 << 2),
+            (int) ($s2 >> 6),
+            (int) (($s2 >> 14) | $s3 << 7),
+            (int) ($s3 >> 1),
+            (int) ($s3 >> 9),
+            (int) (($s3 >> 17) | $s4 << 4),
+            (int) ($s4 >> 4),
+            (int) ($s4 >> 12),
+            (int) (($s4 >> 20) | $s5 << 1),
+            (int) ($s5 >> 7),
+            (int) (($s5 >> 15) | $s6 << 6),
+            (int) ($s6 >> 2),
+            (int) ($s6 >> 10),
+            (int) (($s6 >> 18) | $s7 << 3),
+            (int) ($s7 >> 5),
+            (int) ($s7 >> 13),
+            (int) ($s8 >> 0),
+            (int) ($s8 >> 8),
+            (int) (($s8 >> 16) | $s9 << 5),
+            (int) ($s9 >> 3),
+            (int) ($s9 >> 11),
+            (int) (($s9 >> 19) | $s10 << 2),
+            (int) ($s10 >> 6),
+            (int) (($s10 >> 14) | $s11 << 7),
+            (int) ($s11 >> 1),
+            (int) ($s11 >> 9),
+            (int) $s11 >> 17
+        );
+        return self::intArrayToString($arr);
+    }
+
+    /**
+     * multiply by the order of the main subgroup l = 2^252+27742317777372353535851937790883648493
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
+     * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
+     */
+    public static function ge_mul_l(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A)
+    {
+        /** @var array<int, int> $aslide */
+        $aslide = array(
+            13, 0, 0, 0, 0, -1, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0,
+            0, 0, 0, -3, 0, 0, 0, 0, -13, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 3, 0,
+            0, 0, 0, -13, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0,
+            0, 0, 11, 0, 0, 0, 0, -13, 0, 0, 0, 0, 0, 0, -3, 0, 0, 0, 0, 0, -1,
+            0, 0, 0, 0, 3, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
+            0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 5, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
+        );
+
+        /** @var array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Cached> $Ai size 8 */
+        $Ai = array();
+
+        # ge_p3_to_cached(&Ai[0], A);
+        $Ai[0] = self::ge_p3_to_cached($A);
+        # ge_p3_dbl(&t, A);
+        $t = self::ge_p3_dbl($A);
+        # ge_p1p1_to_p3(&A2, &t);
+        $A2 = self::ge_p1p1_to_p3($t);
+
+        for ($i = 1; $i < 8; ++$i) {
+            # ge_add(&t, &A2, &Ai[0]);
+            $t = self::ge_add($A2, $Ai[$i - 1]);
+            # ge_p1p1_to_p3(&u, &t);
+            $u = self::ge_p1p1_to_p3($t);
+            # ge_p3_to_cached(&Ai[i], &u);
+            $Ai[$i] = self::ge_p3_to_cached($u);
+        }
+
+        $r = self::ge_p3_0();
+        for ($i = 252; $i >= 0; --$i) {
+            $t = self::ge_p3_dbl($r);
+            if ($aslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u, &t);
+                $u = self::ge_p1p1_to_p3($t);
+                # ge_add(&t, &u, &Ai[aslide[i] / 2]);
+                $t = self::ge_add($u, $Ai[(int)($aslide[$i] / 2)]);
+            } elseif ($aslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u, &t);
+                $u = self::ge_p1p1_to_p3($t);
+                # ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]);
+                $t = self::ge_sub($u, $Ai[(int)(-$aslide[$i] / 2)]);
+            }
+        }
+
+        # ge_p1p1_to_p3(r, &t);
+        return self::ge_p1p1_to_p3($t);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
new file mode 100644
index 00000000..5cb71184
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
@@ -0,0 +1,130 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Fe
+ *
+ * This represents a Field Element
+ */
+class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
+{
+    /**
+     * @var array
+     */
+    protected $container = array();
+
+    /**
+     * @var int
+     */
+    protected $size = 10;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Fe constructor.
+     * @param int $size
+     */
+    public function __construct($size = 10)
+    {
+        $this->size = 10;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param array $array
+     * @param bool $save_indexes
+     * @return self
+     */
+    public static function fromArray($array, $save_indexes = null)
+    {
+        $count = count($array);
+        if ($save_indexes) {
+            $keys = array_keys($array);
+        } else {
+            $keys = range(0, $count - 1);
+        }
+        $array = array_values($array);
+
+        $obj = new ParagonIE_Sodium_Core_Curve25519_Fe($count);
+        if ($save_indexes) {
+            for ($i = 0; $i < $count; ++$i) {
+                $obj->offsetSet($keys[$i], $array[$i]);
+            }
+        } else {
+            for ($i = 0; $i < $count; ++$i) {
+                $obj->offsetSet($i, $array[$i]);
+            }
+        }
+        return $obj;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @param mixed $value
+     * @return void
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!is_int($value)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return bool
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return void
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return mixed|null
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset])
+            ? $this->container[$offset]
+            : null;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return array
+     */
+    public function __debugInfo()
+    {
+        return array(implode(', ', $this->container));
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
new file mode 100644
index 00000000..39bf8977
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
@@ -0,0 +1,65 @@
+<?php
+
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Cached', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $YplusX;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $YminusX;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $T2d;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_Cached constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $YplusX
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $YminusX
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $Z
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $T2d
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $YplusX = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $YminusX = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $Z = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $T2d = null
+    ) {
+        if ($YplusX === null) {
+            $YplusX = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->YplusX = $YplusX;
+        if ($YminusX === null) {
+            $YminusX = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->YminusX = $YminusX;
+        if ($Z === null) {
+            $Z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $Z;
+        if ($T2d === null) {
+            $T2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->T2d = $T2d;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
new file mode 100644
index 00000000..a63d6ab2
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
@@ -0,0 +1,64 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P1p1', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $T;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $t
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $z = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $t = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $z;
+        if ($t === null) {
+            $t = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->T = $t;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
new file mode 100644
index 00000000..aee4000d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
@@ -0,0 +1,54 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P2', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_P2
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_P2
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_P2 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $z = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $z;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
new file mode 100644
index 00000000..00f5b27a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
@@ -0,0 +1,65 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P3', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_P3
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_P3
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $T;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_P3 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $t
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $z = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $t = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->Z = $z;
+        if ($t === null) {
+            $t = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->T = $t;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
new file mode 100644
index 00000000..59611c10
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
@@ -0,0 +1,54 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+ */
+class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
+{
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $yplusx;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $yminusx;
+
+    /**
+     * @var ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public $xy2d;
+
+    /**
+     * ParagonIE_Sodium_Core_Curve25519_Ge_Precomp constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $yplusx
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $yminusx
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $xy2d
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core_Curve25519_Fe $yplusx = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $yminusx = null,
+        ParagonIE_Sodium_Core_Curve25519_Fe $xy2d = null
+    ) {
+        if ($yplusx === null) {
+            $yplusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->yplusx = $yplusx;
+        if ($yminusx === null) {
+            $yminusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->yminusx = $yminusx;
+        if ($xy2d === null) {
+            $xy2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
+        }
+        $this->xy2d = $xy2d;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php
new file mode 100644
index 00000000..37ad497d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/H.php
@@ -0,0 +1,1467 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Curve25519_H', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Curve25519_H
+ *
+ * This just contains the constants in the ref10/base.h file
+ */
+class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * See: libsodium's crypto_core/curve25519/ref10/base.h
+     *
+     * @var array<int, array<int, array<int, array<int, int>>>> Basically, int[32][8][3][10]
+     */
+    protected static $base = array(
+        array(
+            array(
+                array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
+                array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
+                array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
+            ),
+            array(
+                array(-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303),
+                array(-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081),
+                array(26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697),
+            ),
+            array(
+                array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
+                array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
+                array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
+            ),
+            array(
+                array(-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540),
+                array(23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397),
+                array(7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325),
+            ),
+            array(
+                array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
+                array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
+                array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
+            ),
+            array(
+                array(-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777),
+                array(-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737),
+                array(-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652),
+            ),
+            array(
+                array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
+                array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
+                array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
+            ),
+            array(
+                array(14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726),
+                array(-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955),
+                array(27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425),
+            ),
+        ),
+        array(
+            array(
+                array(-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171),
+                array(27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510),
+                array(17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660),
+            ),
+            array(
+                array(-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639),
+                array(29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963),
+                array(5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950),
+            ),
+            array(
+                array(-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568),
+                array(12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335),
+                array(25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628),
+            ),
+            array(
+                array(-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007),
+                array(-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772),
+                array(-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653),
+            ),
+            array(
+                array(2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567),
+                array(13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686),
+                array(21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372),
+            ),
+            array(
+                array(-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887),
+                array(-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954),
+                array(-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953),
+            ),
+            array(
+                array(24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833),
+                array(-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532),
+                array(-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876),
+            ),
+            array(
+                array(2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268),
+                array(33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214),
+                array(1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038),
+            ),
+        ),
+        array(
+            array(
+                array(6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800),
+                array(4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645),
+                array(-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664),
+            ),
+            array(
+                array(1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933),
+                array(-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182),
+                array(-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222),
+            ),
+            array(
+                array(-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991),
+                array(20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880),
+                array(9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092),
+            ),
+            array(
+                array(-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295),
+                array(19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788),
+                array(8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553),
+            ),
+            array(
+                array(-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026),
+                array(11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347),
+                array(-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033),
+            ),
+            array(
+                array(-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395),
+                array(-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278),
+                array(1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890),
+            ),
+            array(
+                array(32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995),
+                array(-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596),
+                array(-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891),
+            ),
+            array(
+                array(31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060),
+                array(11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608),
+                array(-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606),
+            ),
+        ),
+        array(
+            array(
+                array(7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389),
+                array(-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016),
+                array(-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341),
+            ),
+            array(
+                array(-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505),
+                array(14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553),
+                array(-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655),
+            ),
+            array(
+                array(15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220),
+                array(12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631),
+                array(-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099),
+            ),
+            array(
+                array(26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556),
+                array(14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749),
+                array(236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930),
+            ),
+            array(
+                array(1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391),
+                array(5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253),
+                array(20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066),
+            ),
+            array(
+                array(24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958),
+                array(-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082),
+                array(-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383),
+            ),
+            array(
+                array(-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521),
+                array(-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807),
+                array(23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948),
+            ),
+            array(
+                array(9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134),
+                array(-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455),
+                array(27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629),
+            ),
+        ),
+        array(
+            array(
+                array(-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069),
+                array(-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746),
+                array(24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919),
+            ),
+            array(
+                array(11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837),
+                array(8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906),
+                array(-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771),
+            ),
+            array(
+                array(-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817),
+                array(10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098),
+                array(10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409),
+            ),
+            array(
+                array(-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504),
+                array(-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727),
+                array(28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420),
+            ),
+            array(
+                array(-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003),
+                array(-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605),
+                array(-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384),
+            ),
+            array(
+                array(-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701),
+                array(-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683),
+                array(29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708),
+            ),
+            array(
+                array(-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563),
+                array(-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260),
+                array(-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387),
+            ),
+            array(
+                array(-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672),
+                array(23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686),
+                array(-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665),
+            ),
+        ),
+        array(
+            array(
+                array(11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182),
+                array(-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277),
+                array(14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628),
+            ),
+            array(
+                array(-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474),
+                array(-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539),
+                array(-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822),
+            ),
+            array(
+                array(-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970),
+                array(19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756),
+                array(-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508),
+            ),
+            array(
+                array(-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683),
+                array(-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655),
+                array(-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158),
+            ),
+            array(
+                array(-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125),
+                array(-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839),
+                array(-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664),
+            ),
+            array(
+                array(27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294),
+                array(-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899),
+                array(-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070),
+            ),
+            array(
+                array(3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294),
+                array(-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949),
+                array(-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083),
+            ),
+            array(
+                array(31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420),
+                array(-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940),
+                array(29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396),
+            ),
+        ),
+        array(
+            array(
+                array(-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567),
+                array(20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127),
+                array(-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294),
+            ),
+            array(
+                array(-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887),
+                array(22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964),
+                array(16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195),
+            ),
+            array(
+                array(9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244),
+                array(24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999),
+                array(-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762),
+            ),
+            array(
+                array(-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274),
+                array(-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236),
+                array(-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605),
+            ),
+            array(
+                array(-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761),
+                array(-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884),
+                array(-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482),
+            ),
+            array(
+                array(-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638),
+                array(-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490),
+                array(-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170),
+            ),
+            array(
+                array(5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736),
+                array(10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124),
+                array(-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392),
+            ),
+            array(
+                array(8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029),
+                array(6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048),
+                array(28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958),
+            ),
+        ),
+        array(
+            array(
+                array(24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593),
+                array(26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071),
+                array(-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692),
+            ),
+            array(
+                array(11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687),
+                array(-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441),
+                array(-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001),
+            ),
+            array(
+                array(-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460),
+                array(-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007),
+                array(-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762),
+            ),
+            array(
+                array(15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005),
+                array(-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674),
+                array(4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035),
+            ),
+            array(
+                array(7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590),
+                array(-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957),
+                array(-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812),
+            ),
+            array(
+                array(33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740),
+                array(-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122),
+                array(-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158),
+            ),
+            array(
+                array(8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885),
+                array(26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140),
+                array(19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857),
+            ),
+            array(
+                array(801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155),
+                array(19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260),
+                array(19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483),
+            ),
+        ),
+        array(
+            array(
+                array(-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677),
+                array(32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815),
+                array(22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751),
+            ),
+            array(
+                array(-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203),
+                array(-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208),
+                array(1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230),
+            ),
+            array(
+                array(16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850),
+                array(-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389),
+                array(-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968),
+            ),
+            array(
+                array(-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689),
+                array(14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880),
+                array(5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304),
+            ),
+            array(
+                array(30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632),
+                array(-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412),
+                array(20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566),
+            ),
+            array(
+                array(-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038),
+                array(-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232),
+                array(-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943),
+            ),
+            array(
+                array(17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856),
+                array(23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738),
+                array(15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971),
+            ),
+            array(
+                array(-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718),
+                array(-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697),
+                array(-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883),
+            ),
+        ),
+        array(
+            array(
+                array(5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912),
+                array(-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358),
+                array(3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849),
+            ),
+            array(
+                array(29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307),
+                array(-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977),
+                array(-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335),
+            ),
+            array(
+                array(-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644),
+                array(-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616),
+                array(-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735),
+            ),
+            array(
+                array(-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099),
+                array(29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341),
+                array(-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336),
+            ),
+            array(
+                array(-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646),
+                array(31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425),
+                array(-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388),
+            ),
+            array(
+                array(-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743),
+                array(-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822),
+                array(-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462),
+            ),
+            array(
+                array(18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985),
+                array(9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702),
+                array(-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797),
+            ),
+            array(
+                array(21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293),
+                array(27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100),
+                array(19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688),
+            ),
+        ),
+        array(
+            array(
+                array(12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186),
+                array(2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610),
+                array(-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707),
+            ),
+            array(
+                array(7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220),
+                array(915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025),
+                array(32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044),
+            ),
+            array(
+                array(32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992),
+                array(-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027),
+                array(21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197),
+            ),
+            array(
+                array(8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901),
+                array(31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952),
+                array(19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878),
+            ),
+            array(
+                array(-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390),
+                array(32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730),
+                array(2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730),
+            ),
+            array(
+                array(-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180),
+                array(-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272),
+                array(-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715),
+            ),
+            array(
+                array(-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970),
+                array(-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772),
+                array(-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865),
+            ),
+            array(
+                array(15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750),
+                array(20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373),
+                array(32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348),
+            ),
+        ),
+        array(
+            array(
+                array(9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144),
+                array(-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195),
+                array(5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086),
+            ),
+            array(
+                array(-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684),
+                array(-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518),
+                array(-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233),
+            ),
+            array(
+                array(-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793),
+                array(-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794),
+                array(580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435),
+            ),
+            array(
+                array(23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921),
+                array(13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518),
+                array(2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563),
+            ),
+            array(
+                array(14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278),
+                array(-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024),
+                array(4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030),
+            ),
+            array(
+                array(10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783),
+                array(27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717),
+                array(6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844),
+            ),
+            array(
+                array(14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333),
+                array(16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048),
+                array(22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760),
+            ),
+            array(
+                array(-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760),
+                array(-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757),
+                array(-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112),
+            ),
+        ),
+        array(
+            array(
+                array(-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468),
+                array(3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184),
+                array(10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289),
+            ),
+            array(
+                array(15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066),
+                array(24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882),
+                array(13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226),
+            ),
+            array(
+                array(16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101),
+                array(29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279),
+                array(-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811),
+            ),
+            array(
+                array(27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709),
+                array(20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714),
+                array(-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121),
+            ),
+            array(
+                array(9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464),
+                array(12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847),
+                array(13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400),
+            ),
+            array(
+                array(4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414),
+                array(-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158),
+                array(17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045),
+            ),
+            array(
+                array(-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415),
+                array(-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459),
+                array(-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079),
+            ),
+            array(
+                array(21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412),
+                array(-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743),
+                array(-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836),
+            ),
+        ),
+        array(
+            array(
+                array(12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022),
+                array(18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429),
+                array(-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065),
+            ),
+            array(
+                array(30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861),
+                array(10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000),
+                array(-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101),
+            ),
+            array(
+                array(32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815),
+                array(29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642),
+                array(10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966),
+            ),
+            array(
+                array(25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574),
+                array(-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742),
+                array(-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689),
+            ),
+            array(
+                array(12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020),
+                array(-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772),
+                array(3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982),
+            ),
+            array(
+                array(-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953),
+                array(-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218),
+                array(-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265),
+            ),
+            array(
+                array(29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073),
+                array(-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325),
+                array(-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798),
+            ),
+            array(
+                array(-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870),
+                array(-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863),
+                array(-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927),
+            ),
+        ),
+        array(
+            array(
+                array(-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267),
+                array(-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663),
+                array(22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862),
+            ),
+            array(
+                array(-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673),
+                array(15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943),
+                array(15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020),
+            ),
+            array(
+                array(-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238),
+                array(11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064),
+                array(14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795),
+            ),
+            array(
+                array(15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052),
+                array(-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904),
+                array(29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531),
+            ),
+            array(
+                array(-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979),
+                array(-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841),
+                array(10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431),
+            ),
+            array(
+                array(10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324),
+                array(-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940),
+                array(10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320),
+            ),
+            array(
+                array(-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184),
+                array(14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114),
+                array(30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878),
+            ),
+            array(
+                array(12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784),
+                array(-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091),
+                array(-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585),
+            ),
+        ),
+        array(
+            array(
+                array(-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208),
+                array(10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864),
+                array(17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661),
+            ),
+            array(
+                array(7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233),
+                array(26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212),
+                array(-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525),
+            ),
+            array(
+                array(-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068),
+                array(9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397),
+                array(-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988),
+            ),
+            array(
+                array(5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889),
+                array(32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038),
+                array(14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697),
+            ),
+            array(
+                array(20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875),
+                array(-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905),
+                array(-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656),
+            ),
+            array(
+                array(11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818),
+                array(27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714),
+                array(10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203),
+            ),
+            array(
+                array(20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931),
+                array(-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024),
+                array(-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084),
+            ),
+            array(
+                array(-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204),
+                array(20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817),
+                array(27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667),
+            ),
+        ),
+        array(
+            array(
+                array(11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504),
+                array(-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768),
+                array(-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255),
+            ),
+            array(
+                array(6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790),
+                array(1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438),
+                array(-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333),
+            ),
+            array(
+                array(17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971),
+                array(31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905),
+                array(29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409),
+            ),
+            array(
+                array(12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409),
+                array(6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499),
+                array(-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363),
+            ),
+            array(
+                array(28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664),
+                array(-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324),
+                array(-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940),
+            ),
+            array(
+                array(13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990),
+                array(-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914),
+                array(-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290),
+            ),
+            array(
+                array(24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257),
+                array(-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433),
+                array(-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236),
+            ),
+            array(
+                array(-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045),
+                array(11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093),
+                array(-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347),
+            ),
+        ),
+        array(
+            array(
+                array(-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191),
+                array(-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507),
+                array(-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906),
+            ),
+            array(
+                array(3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018),
+                array(-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109),
+                array(-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926),
+            ),
+            array(
+                array(-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528),
+                array(8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625),
+                array(-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286),
+            ),
+            array(
+                array(2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033),
+                array(27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866),
+                array(21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896),
+            ),
+            array(
+                array(30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075),
+                array(26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347),
+                array(-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437),
+            ),
+            array(
+                array(-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165),
+                array(-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588),
+                array(-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193),
+            ),
+            array(
+                array(-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017),
+                array(-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883),
+                array(21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961),
+            ),
+            array(
+                array(8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043),
+                array(29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663),
+                array(-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362),
+            ),
+        ),
+        array(
+            array(
+                array(-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860),
+                array(2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466),
+                array(-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063),
+            ),
+            array(
+                array(-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997),
+                array(-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295),
+                array(-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369),
+            ),
+            array(
+                array(9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385),
+                array(18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109),
+                array(2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906),
+            ),
+            array(
+                array(4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424),
+                array(-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185),
+                array(7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962),
+            ),
+            array(
+                array(-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325),
+                array(10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593),
+                array(696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404),
+            ),
+            array(
+                array(-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644),
+                array(17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801),
+                array(26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804),
+            ),
+            array(
+                array(-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884),
+                array(-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577),
+                array(-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849),
+            ),
+            array(
+                array(32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473),
+                array(-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644),
+                array(-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319),
+            ),
+        ),
+        array(
+            array(
+                array(-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599),
+                array(-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768),
+                array(-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084),
+            ),
+            array(
+                array(-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328),
+                array(-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369),
+                array(20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920),
+            ),
+            array(
+                array(12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815),
+                array(-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025),
+                array(-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397),
+            ),
+            array(
+                array(-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448),
+                array(6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981),
+                array(30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165),
+            ),
+            array(
+                array(32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501),
+                array(17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073),
+                array(-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861),
+            ),
+            array(
+                array(14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845),
+                array(-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211),
+                array(18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870),
+            ),
+            array(
+                array(10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096),
+                array(33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803),
+                array(-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168),
+            ),
+            array(
+                array(30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965),
+                array(-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505),
+                array(18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598),
+            ),
+        ),
+        array(
+            array(
+                array(5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782),
+                array(5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900),
+                array(-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479),
+            ),
+            array(
+                array(-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208),
+                array(8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232),
+                array(17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719),
+            ),
+            array(
+                array(16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271),
+                array(-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326),
+                array(-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132),
+            ),
+            array(
+                array(14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300),
+                array(8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570),
+                array(15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670),
+            ),
+            array(
+                array(-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994),
+                array(-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913),
+                array(31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317),
+            ),
+            array(
+                array(-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730),
+                array(842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096),
+                array(-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078),
+            ),
+            array(
+                array(-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411),
+                array(-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905),
+                array(-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654),
+            ),
+            array(
+                array(-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870),
+                array(-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498),
+                array(12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579),
+            ),
+        ),
+        array(
+            array(
+                array(14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677),
+                array(10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647),
+                array(-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743),
+            ),
+            array(
+                array(-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468),
+                array(21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375),
+                array(-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155),
+            ),
+            array(
+                array(6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725),
+                array(-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612),
+                array(-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943),
+            ),
+            array(
+                array(-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944),
+                array(30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928),
+                array(9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406),
+            ),
+            array(
+                array(22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139),
+                array(-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963),
+                array(-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693),
+            ),
+            array(
+                array(1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734),
+                array(-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680),
+                array(-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410),
+            ),
+            array(
+                array(-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931),
+                array(-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654),
+                array(22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710),
+            ),
+            array(
+                array(29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180),
+                array(-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684),
+                array(-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895),
+            ),
+        ),
+        array(
+            array(
+                array(22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501),
+                array(-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413),
+                array(6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880),
+            ),
+            array(
+                array(-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874),
+                array(22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962),
+                array(-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899),
+            ),
+            array(
+                array(21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152),
+                array(9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063),
+                array(7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080),
+            ),
+            array(
+                array(-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146),
+                array(-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183),
+                array(-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133),
+            ),
+            array(
+                array(-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421),
+                array(-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622),
+                array(-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197),
+            ),
+            array(
+                array(2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663),
+                array(31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753),
+                array(4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755),
+            ),
+            array(
+                array(-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862),
+                array(-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118),
+                array(26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171),
+            ),
+            array(
+                array(15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380),
+                array(16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824),
+                array(28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270),
+            ),
+        ),
+        array(
+            array(
+                array(-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438),
+                array(-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584),
+                array(-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562),
+            ),
+            array(
+                array(30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471),
+                array(18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610),
+                array(19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269),
+            ),
+            array(
+                array(-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650),
+                array(14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369),
+                array(19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461),
+            ),
+            array(
+                array(30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462),
+                array(-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793),
+                array(-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218),
+            ),
+            array(
+                array(-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226),
+                array(18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019),
+                array(-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037),
+            ),
+            array(
+                array(31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171),
+                array(-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132),
+                array(-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841),
+            ),
+            array(
+                array(21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181),
+                array(-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210),
+                array(-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040),
+            ),
+            array(
+                array(3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935),
+                array(24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105),
+                array(-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814),
+            ),
+        ),
+        array(
+            array(
+                array(793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852),
+                array(5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581),
+                array(-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646),
+            ),
+            array(
+                array(10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844),
+                array(10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025),
+                array(27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453),
+            ),
+            array(
+                array(-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068),
+                array(4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192),
+                array(-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921),
+            ),
+            array(
+                array(-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259),
+                array(-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426),
+                array(-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072),
+            ),
+            array(
+                array(-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305),
+                array(13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832),
+                array(28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943),
+            ),
+            array(
+                array(-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011),
+                array(24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447),
+                array(17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494),
+            ),
+            array(
+                array(-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245),
+                array(-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859),
+                array(28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915),
+            ),
+            array(
+                array(16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707),
+                array(10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848),
+                array(-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224),
+            ),
+        ),
+        array(
+            array(
+                array(-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391),
+                array(15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215),
+                array(-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101),
+            ),
+            array(
+                array(23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713),
+                array(21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849),
+                array(-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930),
+            ),
+            array(
+                array(-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940),
+                array(-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031),
+                array(-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404),
+            ),
+            array(
+                array(-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243),
+                array(-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116),
+                array(-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525),
+            ),
+            array(
+                array(-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509),
+                array(-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883),
+                array(15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865),
+            ),
+            array(
+                array(-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660),
+                array(4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273),
+                array(-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138),
+            ),
+            array(
+                array(-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560),
+                array(-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135),
+                array(2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941),
+            ),
+            array(
+                array(-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739),
+                array(18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756),
+                array(-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819),
+            ),
+        ),
+        array(
+            array(
+                array(-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347),
+                array(-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028),
+                array(21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075),
+            ),
+            array(
+                array(16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799),
+                array(-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609),
+                array(-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817),
+            ),
+            array(
+                array(-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989),
+                array(-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523),
+                array(4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278),
+            ),
+            array(
+                array(31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045),
+                array(19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377),
+                array(24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480),
+            ),
+            array(
+                array(17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016),
+                array(510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426),
+                array(18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525),
+            ),
+            array(
+                array(13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396),
+                array(9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080),
+                array(12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892),
+            ),
+            array(
+                array(15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275),
+                array(11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074),
+                array(20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140),
+            ),
+            array(
+                array(-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717),
+                array(-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101),
+                array(24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127),
+            ),
+        ),
+        array(
+            array(
+                array(-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632),
+                array(-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415),
+                array(-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160),
+            ),
+            array(
+                array(31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876),
+                array(22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625),
+                array(-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478),
+            ),
+            array(
+                array(27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164),
+                array(26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595),
+                array(-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248),
+            ),
+            array(
+                array(-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858),
+                array(15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193),
+                array(8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184),
+            ),
+            array(
+                array(-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942),
+                array(-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635),
+                array(21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948),
+            ),
+            array(
+                array(11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935),
+                array(-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415),
+                array(-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416),
+            ),
+            array(
+                array(-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018),
+                array(4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778),
+                array(366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659),
+            ),
+            array(
+                array(-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385),
+                array(18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503),
+                array(476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329),
+            ),
+        ),
+        array(
+            array(
+                array(20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056),
+                array(-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838),
+                array(24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948),
+            ),
+            array(
+                array(-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691),
+                array(-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118),
+                array(-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517),
+            ),
+            array(
+                array(-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269),
+                array(-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904),
+                array(-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589),
+            ),
+            array(
+                array(-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193),
+                array(-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910),
+                array(-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930),
+            ),
+            array(
+                array(-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667),
+                array(25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481),
+                array(-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876),
+            ),
+            array(
+                array(22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640),
+                array(-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278),
+                array(-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112),
+            ),
+            array(
+                array(26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272),
+                array(17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012),
+                array(-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221),
+            ),
+            array(
+                array(30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046),
+                array(13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345),
+                array(-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310),
+            ),
+        ),
+        array(
+            array(
+                array(19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937),
+                array(31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636),
+                array(-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008),
+            ),
+            array(
+                array(-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429),
+                array(-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576),
+                array(31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066),
+            ),
+            array(
+                array(-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490),
+                array(-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104),
+                array(33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053),
+            ),
+            array(
+                array(31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275),
+                array(-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511),
+                array(22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095),
+            ),
+            array(
+                array(-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439),
+                array(23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939),
+                array(-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424),
+            ),
+            array(
+                array(2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310),
+                array(3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608),
+                array(-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079),
+            ),
+            array(
+                array(-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101),
+                array(21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418),
+                array(18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576),
+            ),
+            array(
+                array(30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356),
+                array(9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996),
+                array(-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099),
+            ),
+        ),
+        array(
+            array(
+                array(-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728),
+                array(-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658),
+                array(-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242),
+            ),
+            array(
+                array(-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001),
+                array(-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766),
+                array(18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373),
+            ),
+            array(
+                array(26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458),
+                array(-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628),
+                array(-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657),
+            ),
+            array(
+                array(-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062),
+                array(25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616),
+                array(31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014),
+            ),
+            array(
+                array(24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383),
+                array(-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814),
+                array(-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718),
+            ),
+            array(
+                array(30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417),
+                array(2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222),
+                array(33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444),
+            ),
+            array(
+                array(-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597),
+                array(23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970),
+                array(1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799),
+            ),
+            array(
+                array(-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647),
+                array(13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511),
+                array(-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032),
+            ),
+        ),
+        array(
+            array(
+                array(9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834),
+                array(-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461),
+                array(29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062),
+            ),
+            array(
+                array(-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516),
+                array(-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547),
+                array(-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240),
+            ),
+            array(
+                array(-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038),
+                array(-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741),
+                array(16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103),
+            ),
+            array(
+                array(-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747),
+                array(-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323),
+                array(31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016),
+            ),
+            array(
+                array(-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373),
+                array(15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228),
+                array(-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141),
+            ),
+            array(
+                array(16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399),
+                array(11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831),
+                array(-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376),
+            ),
+            array(
+                array(-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313),
+                array(-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958),
+                array(-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577),
+            ),
+            array(
+                array(-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743),
+                array(29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684),
+                array(-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476),
+            ),
+        )
+    );
+
+    /**
+     * See: libsodium's crypto_core/curve25519/ref10/base2.h
+     *
+     * @var array basically int[8][3]
+     */
+    protected static $base2 = array(
+        array(
+            array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
+            array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
+            array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
+        ),
+        array(
+            array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
+            array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
+            array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
+        ),
+        array(
+            array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
+            array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
+            array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
+        ),
+        array(
+            array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
+            array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
+            array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
+        ),
+        array(
+            array(-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877),
+            array(-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951),
+            array(4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784),
+        ),
+        array(
+            array(-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436),
+            array(25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918),
+            array(23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877),
+        ),
+        array(
+            array(-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800),
+            array(-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305),
+            array(-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300),
+        ),
+        array(
+            array(-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876),
+            array(-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619),
+            array(-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683),
+        )
+    );
+
+    /**
+     * 37095705934669439343138083508754565189542113879843219016388785533085940283555
+     *
+     * @var array<int, int>
+     */
+    protected static $d = array(
+        -10913610,
+        13857413,
+        -15372611,
+        6949391,
+        114729,
+        -8787816,
+        -6275908,
+        -3247719,
+        -18696448,
+        -12055116
+    );
+
+    /**
+     * 2 * d = 16295367250680780974490674513165176452449235426866156013048779062215315747161
+     *
+     * @var array<int, int>
+     */
+    protected static $d2 = array(
+        -21827239,
+        -5839606,
+        -30745221,
+        13898782,
+        229458,
+        15978800,
+        -12551817,
+        -6495438,
+        29715968,
+        9444199
+    );
+
+    /**
+     * sqrt(-1)
+     *
+     * @var array<int, int>
+     */
+    protected static $sqrtm1 = array(
+        -32595792,
+        -7943725,
+        9377950,
+        3500415,
+        12389472,
+        -272473,
+        -25146209,
+        -2005654,
+        326686,
+        11406482
+    );
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php
new file mode 100644
index 00000000..4514dc8a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Ed25519.php
@@ -0,0 +1,479 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Ed25519
+ */
+abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve25519
+{
+    const KEYPAIR_BYTES = 96;
+    const SEED_BYTES = 32;
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return string (96 bytes)
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function keypair()
+    {
+        $seed = random_bytes(self::SEED_BYTES);
+        $pk = '';
+        $sk = '';
+        self::seed_keypair($pk, $sk, $seed);
+        return $sk . $pk;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $pk
+     * @param string $sk
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function seed_keypair(&$pk, &$sk, $seed)
+    {
+        if (self::strlen($seed) !== self::SEED_BYTES) {
+            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+        }
+
+        /** @var string $pk */
+        $pk = self::publickey_from_secretkey($seed);
+        $sk = $seed . $pk;
+        return $sk;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $keypair
+     * @return string
+     * @throws TypeError
+     */
+    public static function secretkey($keypair)
+    {
+        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+            throw new RangeException('crypto_sign keypair must be 96 bytes long');
+        }
+        return self::substr($keypair, 0, 64);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $keypair
+     * @return string
+     * @throws TypeError
+     */
+    public static function publickey($keypair)
+    {
+        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+            throw new RangeException('crypto_sign keypair must be 96 bytes long');
+        }
+        return self::substr($keypair, 64, 32);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function publickey_from_secretkey($sk)
+    {
+        /** @var string $sk */
+        $sk = hash('sha512', self::substr($sk, 0, 32), true);
+        $sk[0] = self::intToChr(
+            self::chrToInt($sk[0]) & 248
+        );
+        $sk[31] = self::intToChr(
+            (self::chrToInt($sk[31]) & 63) | 64
+        );
+        return self::sk_to_pk($sk);
+    }
+
+    /**
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function pk_to_curve25519($pk)
+    {
+        if (self::small_order($pk)) {
+            throw new SodiumException('Public key is on a small order');
+        }
+        $A = self::ge_frombytes_negate_vartime(self::substr($pk, 0, 32));
+        $p1 = self::ge_mul_l($A);
+        if (!self::fe_isnonzero($p1->X)) {
+            throw new SodiumException('Unexpected zero result');
+        }
+
+        # fe_1(one_minus_y);
+        # fe_sub(one_minus_y, one_minus_y, A.Y);
+        # fe_invert(one_minus_y, one_minus_y);
+        $one_minux_y = self::fe_invert(
+            self::fe_sub(
+                self::fe_1(),
+                $A->Y
+            )
+        );
+
+        # fe_1(x);
+        # fe_add(x, x, A.Y);
+        # fe_mul(x, x, one_minus_y);
+        $x = self::fe_mul(
+            self::fe_add(self::fe_1(), $A->Y),
+            $one_minux_y
+        );
+
+        # fe_tobytes(curve25519_pk, x);
+        return self::fe_tobytes($x);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sk_to_pk($sk)
+    {
+        return self::ge_p3_tobytes(
+            self::ge_scalarmult_base(
+                self::substr($sk, 0, 32)
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign($message, $sk)
+    {
+        /** @var string $signature */
+        $signature = self::sign_detached($message, $sk);
+        return $signature . $message;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message A signed message
+     * @param string $pk      Public key
+     * @return string         Message (without signature)
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_open($message, $pk)
+    {
+        /** @var string $signature */
+        $signature = self::substr($message, 0, 64);
+
+        /** @var string $message */
+        $message = self::substr($message, 64);
+
+        if (self::verify_detached($signature, $message, $pk)) {
+            return $message;
+        }
+        throw new SodiumException('Invalid signature');
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_detached($message, $sk)
+    {
+        # crypto_hash_sha512(az, sk, 32);
+        $az =  hash('sha512', self::substr($sk, 0, 32), true);
+
+        # az[0] &= 248;
+        # az[31] &= 63;
+        # az[31] |= 64;
+        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+        # crypto_hash_sha512_init(&hs);
+        # crypto_hash_sha512_update(&hs, az + 32, 32);
+        # crypto_hash_sha512_update(&hs, m, mlen);
+        # crypto_hash_sha512_final(&hs, nonce);
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($az, 32, 32));
+        hash_update($hs, $message);
+        $nonceHash = hash_final($hs, true);
+
+        # memmove(sig + 32, sk + 32, 32);
+        $pk = self::substr($sk, 32, 32);
+
+        # sc_reduce(nonce);
+        # ge_scalarmult_base(&R, nonce);
+        # ge_p3_tobytes(sig, &R);
+        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $sig = self::ge_p3_tobytes(
+            self::ge_scalarmult_base($nonce)
+        );
+
+        # crypto_hash_sha512_init(&hs);
+        # crypto_hash_sha512_update(&hs, sig, 64);
+        # crypto_hash_sha512_update(&hs, m, mlen);
+        # crypto_hash_sha512_final(&hs, hram);
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
+        hash_update($hs, $message);
+        $hramHash = hash_final($hs, true);
+
+        # sc_reduce(hram);
+        # sc_muladd(sig + 32, hram, az, nonce);
+        $hram = self::sc_reduce($hramHash);
+        $sigAfter = self::sc_muladd($hram, $az, $nonce);
+        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+        try {
+            ParagonIE_Sodium_Compat::memzero($az);
+        } catch (SodiumException $ex) {
+            $az = null;
+        }
+        return $sig;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sig
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function verify_detached($sig, $message, $pk)
+    {
+        if (self::strlen($sig) < 64) {
+            throw new SodiumException('Signature is too short');
+        }
+        if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
+            throw new SodiumException('S < L - Invalid signature');
+        }
+        if (self::small_order($sig)) {
+            throw new SodiumException('Signature is on too small of an order');
+        }
+        if ((self::chrToInt($sig[63]) & 224) !== 0) {
+            throw new SodiumException('Invalid signature');
+        }
+        $d = 0;
+        for ($i = 0; $i < 32; ++$i) {
+            $d |= self::chrToInt($pk[$i]);
+        }
+        if ($d === 0) {
+            throw new SodiumException('All zero public key');
+        }
+
+        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        $orig = ParagonIE_Sodium_Compat::$fastMult;
+
+        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+        ParagonIE_Sodium_Compat::$fastMult = true;
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
+        $A = self::ge_frombytes_negate_vartime($pk);
+
+        /** @var string $hDigest */
+        $hDigest = hash(
+            'sha512',
+            self::substr($sig, 0, 32) .
+                self::substr($pk, 0, 32) .
+                $message,
+            true
+        );
+
+        /** @var string $h */
+        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
+        $R = self::ge_double_scalarmult_vartime(
+            $h,
+            $A,
+            self::substr($sig, 32)
+        );
+
+        /** @var string $rcheck */
+        $rcheck = self::ge_tobytes($R);
+
+        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+        ParagonIE_Sodium_Compat::$fastMult = $orig;
+
+        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $S
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function check_S_lt_L($S)
+    {
+        if (self::strlen($S) < 32) {
+            throw new SodiumException('Signature must be 32 bytes');
+        }
+        $L = array(
+            0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
+            0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
+        );
+        $c = 0;
+        $n = 1;
+        $i = 32;
+
+        /** @var array<int, int> $L */
+        do {
+            --$i;
+            $x = self::chrToInt($S[$i]);
+            $c |= (
+                (($x - $L[$i]) >> 8) & $n
+            );
+            $n &= (
+                (($x ^ $L[$i]) - 1) >> 8
+            );
+        } while ($i !== 0);
+
+        return $c === 0;
+    }
+
+    /**
+     * @param string $R
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function small_order($R)
+    {
+        /** @var array<int, array<int, int>> $blacklist */
+        $blacklist = array(
+            /* 0 (order 4) */
+            array(
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            ),
+            /* 1 (order 1) */
+            array(
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            ),
+            /* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+            array(
+                0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
+            ),
+            /* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+            array(
+                0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
+            ),
+            /* p-1 (order 2) */
+            array(
+                0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
+            ),
+            /* p (order 4) */
+            array(
+                0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
+            ),
+            /* p+1 (order 1) */
+            array(
+                0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+            array(
+                0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+            array(
+                0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* 2p-1 (order 2) */
+            array(
+                0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ),
+            /* 2p (order 4) */
+            array(
+                0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ),
+            /* 2p+1 (order 1) */
+            array(
+                0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            )
+        );
+        /** @var int $countBlacklist */
+        $countBlacklist = count($blacklist);
+
+        for ($i = 0; $i < $countBlacklist; ++$i) {
+            $c = 0;
+            for ($j = 0; $j < 32; ++$j) {
+                $c |= self::chrToInt($R[$j]) ^ (int) $blacklist[$i][$j];
+            }
+            if ($c === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php
new file mode 100644
index 00000000..947df10f
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/HChaCha20.php
@@ -0,0 +1,108 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_HChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_HChaCha20
+ */
+class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20
+{
+    /**
+     * @param string $in
+     * @param string $key
+     * @param string|null $c
+     * @return string
+     * @throws TypeError
+     */
+    public static function hChaCha20($in = '', $key = '', $c = null)
+    {
+        $ctx = array();
+
+        if ($c === null) {
+            $ctx[0] = 0x61707865;
+            $ctx[1] = 0x3320646e;
+            $ctx[2] = 0x79622d32;
+            $ctx[3] = 0x6b206574;
+        } else {
+            $ctx[0] = self::load_4(self::substr($c,  0, 4));
+            $ctx[1] = self::load_4(self::substr($c,  4, 4));
+            $ctx[2] = self::load_4(self::substr($c,  8, 4));
+            $ctx[3] = self::load_4(self::substr($c, 12, 4));
+        }
+        $ctx[4]  = self::load_4(self::substr($key,  0, 4));
+        $ctx[5]  = self::load_4(self::substr($key,  4, 4));
+        $ctx[6]  = self::load_4(self::substr($key,  8, 4));
+        $ctx[7]  = self::load_4(self::substr($key, 12, 4));
+        $ctx[8]  = self::load_4(self::substr($key, 16, 4));
+        $ctx[9]  = self::load_4(self::substr($key, 20, 4));
+        $ctx[10] = self::load_4(self::substr($key, 24, 4));
+        $ctx[11] = self::load_4(self::substr($key, 28, 4));
+        $ctx[12] = self::load_4(self::substr($in,   0, 4));
+        $ctx[13] = self::load_4(self::substr($in,   4, 4));
+        $ctx[14] = self::load_4(self::substr($in,   8, 4));
+        $ctx[15] = self::load_4(self::substr($in,  12, 4));
+        return self::hChaCha20Bytes($ctx);
+    }
+
+    /**
+     * @param array $ctx
+     * @return string
+     * @throws TypeError
+     */
+    protected static function hChaCha20Bytes(array $ctx)
+    {
+        $x0  = (int) $ctx[0];
+        $x1  = (int) $ctx[1];
+        $x2  = (int) $ctx[2];
+        $x3  = (int) $ctx[3];
+        $x4  = (int) $ctx[4];
+        $x5  = (int) $ctx[5];
+        $x6  = (int) $ctx[6];
+        $x7  = (int) $ctx[7];
+        $x8  = (int) $ctx[8];
+        $x9  = (int) $ctx[9];
+        $x10 = (int) $ctx[10];
+        $x11 = (int) $ctx[11];
+        $x12 = (int) $ctx[12];
+        $x13 = (int) $ctx[13];
+        $x14 = (int) $ctx[14];
+        $x15 = (int) $ctx[15];
+
+        for ($i = 0; $i < 10; ++$i) {
+            # QUARTERROUND( x0,  x4,  x8,  x12)
+            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+
+            # QUARTERROUND( x1,  x5,  x9,  x13)
+            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+
+            # QUARTERROUND( x2,  x6,  x10,  x14)
+            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+
+            # QUARTERROUND( x3,  x7,  x11,  x15)
+            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+
+            # QUARTERROUND( x0,  x5,  x10,  x15)
+            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+
+            # QUARTERROUND( x1,  x6,  x11,  x12)
+            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+
+            # QUARTERROUND( x2,  x7,  x8,  x13)
+            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+
+            # QUARTERROUND( x3,  x4,  x9,  x14)
+            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+        }
+
+        return self::store32_le((int) ($x0  & 0xffffffff)) .
+            self::store32_le((int) ($x1  & 0xffffffff)) .
+            self::store32_le((int) ($x2  & 0xffffffff)) .
+            self::store32_le((int) ($x3  & 0xffffffff)) .
+            self::store32_le((int) ($x12 & 0xffffffff)) .
+            self::store32_le((int) ($x13 & 0xffffffff)) .
+            self::store32_le((int) ($x14 & 0xffffffff)) .
+            self::store32_le((int) ($x15 & 0xffffffff));
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php
new file mode 100644
index 00000000..35ee79ed
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/HSalsa20.php
@@ -0,0 +1,96 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_HSalsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_HSalsa20
+ */
+abstract class ParagonIE_Sodium_Core_HSalsa20 extends ParagonIE_Sodium_Core_Salsa20
+{
+    /**
+     * Calculate an hsalsa20 hash of a single block
+     *
+     * HSalsa20 doesn't have a counter and will never be used for more than
+     * one block (used to derive a subkey for xsalsa20).
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $k
+     * @param string|null $c
+     * @return string
+     * @throws TypeError
+     */
+    public static function hsalsa20($in, $k, $c = null)
+    {
+        if ($c === null) {
+            $x0  = 0x61707865;
+            $x5  = 0x3320646e;
+            $x10 = 0x79622d32;
+            $x15 = 0x6b206574;
+        } else {
+            $x0  = self::load_4(self::substr($c, 0, 4));
+            $x5  = self::load_4(self::substr($c, 4, 4));
+            $x10 = self::load_4(self::substr($c, 8, 4));
+            $x15 = self::load_4(self::substr($c, 12, 4));
+        }
+        $x1  = self::load_4(self::substr($k, 0, 4));
+        $x2  = self::load_4(self::substr($k, 4, 4));
+        $x3  = self::load_4(self::substr($k, 8, 4));
+        $x4  = self::load_4(self::substr($k, 12, 4));
+        $x11 = self::load_4(self::substr($k, 16, 4));
+        $x12 = self::load_4(self::substr($k, 20, 4));
+        $x13 = self::load_4(self::substr($k, 24, 4));
+        $x14 = self::load_4(self::substr($k, 28, 4));
+        $x6  = self::load_4(self::substr($in, 0, 4));
+        $x7  = self::load_4(self::substr($in, 4, 4));
+        $x8  = self::load_4(self::substr($in, 8, 4));
+        $x9  = self::load_4(self::substr($in, 12, 4));
+
+        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+            $x4 ^= self::rotate($x0 + $x12, 7);
+            $x8 ^= self::rotate($x4 + $x0, 9);
+            $x12 ^= self::rotate($x8 + $x4, 13);
+            $x0 ^= self::rotate($x12 + $x8, 18);
+            $x9 ^= self::rotate($x5 + $x1, 7);
+            $x13 ^= self::rotate($x9 + $x5, 9);
+            $x1 ^= self::rotate($x13 + $x9, 13);
+            $x5 ^= self::rotate($x1 + $x13, 18);
+            $x14 ^= self::rotate($x10 + $x6, 7);
+            $x2 ^= self::rotate($x14 + $x10, 9);
+            $x6 ^= self::rotate($x2 + $x14, 13);
+            $x10 ^= self::rotate($x6 + $x2, 18);
+            $x3 ^= self::rotate($x15 + $x11, 7);
+            $x7 ^= self::rotate($x3 + $x15, 9);
+            $x11 ^= self::rotate($x7 + $x3, 13);
+            $x15 ^= self::rotate($x11 + $x7, 18);
+            $x1 ^= self::rotate($x0 + $x3, 7);
+            $x2 ^= self::rotate($x1 + $x0, 9);
+            $x3 ^= self::rotate($x2 + $x1, 13);
+            $x0 ^= self::rotate($x3 + $x2, 18);
+            $x6 ^= self::rotate($x5 + $x4, 7);
+            $x7 ^= self::rotate($x6 + $x5, 9);
+            $x4 ^= self::rotate($x7 + $x6, 13);
+            $x5 ^= self::rotate($x4 + $x7, 18);
+            $x11 ^= self::rotate($x10 + $x9, 7);
+            $x8 ^= self::rotate($x11 + $x10, 9);
+            $x9 ^= self::rotate($x8 + $x11, 13);
+            $x10 ^= self::rotate($x9 + $x8, 18);
+            $x12 ^= self::rotate($x15 + $x14, 7);
+            $x13 ^= self::rotate($x12 + $x15, 9);
+            $x14 ^= self::rotate($x13 + $x12, 13);
+            $x15 ^= self::rotate($x14 + $x13, 18);
+        }
+
+        return self::store32_le($x0) .
+            self::store32_le($x5) .
+            self::store32_le($x10) .
+            self::store32_le($x15) .
+            self::store32_le($x6) .
+            self::store32_le($x7) .
+            self::store32_le($x8) .
+            self::store32_le($x9);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php
new file mode 100644
index 00000000..33018217
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305.php
@@ -0,0 +1,63 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Poly1305', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Poly1305
+ */
+abstract class ParagonIE_Sodium_Core_Poly1305 extends ParagonIE_Sodium_Core_Util
+{
+    const BLOCK_SIZE = 16;
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $m
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function onetimeauth($m, $key)
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Key must be 32 bytes long.'
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            self::substr($key, 0, 32)
+        );
+        return $state
+            ->update($m)
+            ->finish();
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $mac
+     * @param string $m
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function onetimeauth_verify($mac, $m, $key)
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Key must be 32 bytes long.'
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            self::substr($key, 0, 32)
+        );
+        $calc = $state
+            ->update($m)
+            ->finish();
+        return self::verify_16($calc, $mac);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php
new file mode 100644
index 00000000..1fa93101
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Poly1305/State.php
@@ -0,0 +1,419 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Poly1305_State
+ */
+class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @var array<int, int>
+     */
+    protected $buffer = array();
+
+    /**
+     * @var bool
+     */
+    protected $final = false;
+
+    /**
+     * @var array<int, int>
+     */
+    public $h;
+
+    /**
+     * @var int
+     */
+    protected $leftover = 0;
+
+    /**
+     * @var int[]
+     */
+    public $r;
+
+    /**
+     * @var int[]
+     */
+    public $pad;
+
+    /**
+     * ParagonIE_Sodium_Core_Poly1305_State constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key
+     * @throws InvalidArgumentException
+     * @throws TypeError
+     */
+    public function __construct($key = '')
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Poly1305 requires a 32-byte key'
+            );
+        }
+        /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
+        $this->r = array(
+            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
+            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
+            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
+            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
+            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+        );
+
+        /* h = 0 */
+        $this->h = array(0, 0, 0, 0, 0);
+
+        /* save pad for later */
+        $this->pad = array(
+            self::load_4(self::substr($key, 16, 4)),
+            self::load_4(self::substr($key, 20, 4)),
+            self::load_4(self::substr($key, 24, 4)),
+            self::load_4(self::substr($key, 28, 4)),
+        );
+
+        $this->leftover = 0;
+        $this->final = false;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function update($message = '')
+    {
+        $bytes = self::strlen($message);
+
+        /* handle leftover */
+        if ($this->leftover) {
+            $want = ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - $this->leftover;
+            if ($want > $bytes) {
+                $want = $bytes;
+            }
+            for ($i = 0; $i < $want; ++$i) {
+                $mi = self::chrToInt($message[$i]);
+                $this->buffer[$this->leftover + $i] = $mi;
+            }
+            // We snip off the leftmost bytes.
+            $message = self::substr($message, $want);
+            $bytes = self::strlen($message);
+            $this->leftover += $want;
+            if ($this->leftover < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+                // We still don't have enough to run $this->blocks()
+                return $this;
+            }
+
+            $this->blocks(
+                static::intArrayToString($this->buffer),
+                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+            );
+            $this->leftover = 0;
+        }
+
+        /* process full blocks */
+        if ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            /** @var int $want */
+            $want = $bytes & ~(ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE - 1);
+            if ($want >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+                $block = self::substr($message, 0, $want);
+                if (self::strlen($block) >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+                    $this->blocks($block, $want);
+                    $message = self::substr($message, $want);
+                    $bytes = self::strlen($message);
+                }
+            }
+        }
+
+        /* store leftover */
+        if ($bytes) {
+            for ($i = 0; $i < $bytes; ++$i) {
+                $mi = self::chrToInt($message[$i]);
+                $this->buffer[$this->leftover + $i] = $mi;
+            }
+            $this->leftover = (int) $this->leftover + $bytes;
+        }
+        return $this;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param int $bytes
+     * @return self
+     * @throws TypeError
+     */
+    public function blocks($message, $bytes)
+    {
+        if (self::strlen($message) < 16) {
+            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+        }
+        /** @var int $hibit */
+        $hibit = $this->final ? 0 : 1 << 24; /* 1 << 128 */
+        $r0 = (int) $this->r[0];
+        $r1 = (int) $this->r[1];
+        $r2 = (int) $this->r[2];
+        $r3 = (int) $this->r[3];
+        $r4 = (int) $this->r[4];
+
+        $s1 = self::mul($r1, 5, 3);
+        $s2 = self::mul($r2, 5, 3);
+        $s3 = self::mul($r3, 5, 3);
+        $s4 = self::mul($r4, 5, 3);
+
+        $h0 = $this->h[0];
+        $h1 = $this->h[1];
+        $h2 = $this->h[2];
+        $h3 = $this->h[3];
+        $h4 = $this->h[4];
+
+        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            /* h += m[i] */
+            $h0 +=  self::load_4(self::substr($message, 0, 4))       & 0x3ffffff;
+            $h1 += (self::load_4(self::substr($message, 3, 4)) >> 2) & 0x3ffffff;
+            $h2 += (self::load_4(self::substr($message, 6, 4)) >> 4) & 0x3ffffff;
+            $h3 += (self::load_4(self::substr($message, 9, 4)) >> 6) & 0x3ffffff;
+            $h4 += (self::load_4(self::substr($message, 12, 4)) >> 8) | $hibit;
+
+            /* h *= r */
+            $d0 = (
+                self::mul($h0, $r0, 31) +
+                self::mul($h1, $s4, 31) +
+                self::mul($h2, $s3, 31) +
+                self::mul($h3, $s2, 31) +
+                self::mul($h4, $s1, 31)
+            );
+
+            $d1 = (
+                self::mul($h0, $r1, 31) +
+                self::mul($h1, $r0, 31) +
+                self::mul($h2, $s4, 31) +
+                self::mul($h3, $s3, 31) +
+                self::mul($h4, $s2, 31)
+            );
+
+            $d2 = (
+                self::mul($h0, $r2, 31) +
+                self::mul($h1, $r1, 31) +
+                self::mul($h2, $r0, 31) +
+                self::mul($h3, $s4, 31) +
+                self::mul($h4, $s3, 31)
+            );
+
+            $d3 = (
+                self::mul($h0, $r3, 31) +
+                self::mul($h1, $r2, 31) +
+                self::mul($h2, $r1, 31) +
+                self::mul($h3, $r0, 31) +
+                self::mul($h4, $s4, 31)
+            );
+
+            $d4 = (
+                self::mul($h0, $r4, 31) +
+                self::mul($h1, $r3, 31) +
+                self::mul($h2, $r2, 31) +
+                self::mul($h3, $r1, 31) +
+                self::mul($h4, $r0, 31)
+            );
+
+            /* (partial) h %= p */
+            /** @var int $c */
+            $c = $d0 >> 26;
+            /** @var int $h0 */
+            $h0 = $d0 & 0x3ffffff;
+            $d1 += $c;
+
+            /** @var int $c */
+            $c = $d1 >> 26;
+            /** @var int $h1 */
+            $h1 = $d1 & 0x3ffffff;
+            $d2 += $c;
+
+            /** @var int $c */
+            $c = $d2 >> 26;
+            /** @var int $h2  */
+            $h2 = $d2 & 0x3ffffff;
+            $d3 += $c;
+
+            /** @var int $c */
+            $c = $d3 >> 26;
+            /** @var int $h3 */
+            $h3 = $d3 & 0x3ffffff;
+            $d4 += $c;
+
+            /** @var int $c */
+            $c = $d4 >> 26;
+            /** @var int $h4 */
+            $h4 = $d4 & 0x3ffffff;
+            $h0 += (int) self::mul($c, 5, 3);
+
+            /** @var int $c */
+            $c = $h0 >> 26;
+            /** @var int $h0 */
+            $h0 &= 0x3ffffff;
+            $h1 += $c;
+
+            // Chop off the left 32 bytes.
+            $message = self::substr(
+                $message,
+                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+            );
+            $bytes -= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE;
+        }
+
+        $this->h = array(
+            (int) ($h0 & 0xffffffff),
+            (int) ($h1 & 0xffffffff),
+            (int) ($h2 & 0xffffffff),
+            (int) ($h3 & 0xffffffff),
+            (int) ($h4 & 0xffffffff)
+        );
+        return $this;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return string
+     * @throws TypeError
+     */
+    public function finish()
+    {
+        /* process the remaining block */
+        if ($this->leftover) {
+            $i = $this->leftover;
+            $this->buffer[$i++] = 1;
+            for (; $i < ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE; ++$i) {
+                $this->buffer[$i] = 0;
+            }
+            $this->final = true;
+            $this->blocks(
+                self::substr(
+                    static::intArrayToString($this->buffer),
+                    0,
+                    ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+                ),
+                ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
+            );
+        }
+
+        $h0 = (int) $this->h[0];
+        $h1 = (int) $this->h[1];
+        $h2 = (int) $this->h[2];
+        $h3 = (int) $this->h[3];
+        $h4 = (int) $this->h[4];
+
+        /** @var int $c */
+        $c = $h1 >> 26;
+        /** @var int $h1 */
+        $h1 &= 0x3ffffff;
+        /** @var int $h2 */
+        $h2 += $c;
+        /** @var int $c */
+        $c = $h2 >> 26;
+        /** @var int $h2 */
+        $h2 &= 0x3ffffff;
+        $h3 += $c;
+        /** @var int $c */
+        $c = $h3 >> 26;
+        $h3 &= 0x3ffffff;
+        $h4 += $c;
+        /** @var int $c */
+        $c = $h4 >> 26;
+        $h4 &= 0x3ffffff;
+        /** @var int $h0 */
+        $h0 += self::mul($c, 5, 3);
+        /** @var int $c */
+        $c = $h0 >> 26;
+        /** @var int $h0 */
+        $h0 &= 0x3ffffff;
+        /** @var int $h1 */
+        $h1 += $c;
+
+        /* compute h + -p */
+        /** @var int $g0 */
+        $g0 = $h0 + 5;
+        /** @var int $c */
+        $c = $g0 >> 26;
+        /** @var int $g0 */
+        $g0 &= 0x3ffffff;
+
+        /** @var int $g1 */
+        $g1 = $h1 + $c;
+        /** @var int $c */
+        $c = $g1 >> 26;
+        $g1 &= 0x3ffffff;
+
+        /** @var int $g2 */
+        $g2 = $h2 + $c;
+        /** @var int $c */
+        $c = $g2 >> 26;
+        /** @var int $g2 */
+        $g2 &= 0x3ffffff;
+
+        /** @var int $g3 */
+        $g3 = $h3 + $c;
+        /** @var int $c */
+        $c = $g3 >> 26;
+        /** @var int $g3 */
+        $g3 &= 0x3ffffff;
+
+        /** @var int $g4 */
+        $g4 = ($h4 + $c - (1 << 26)) & 0xffffffff;
+
+        /* select h if h < p, or h + -p if h >= p */
+        /** @var int $mask */
+        $mask = ($g4 >> 31) - 1;
+
+        $g0 &= $mask;
+        $g1 &= $mask;
+        $g2 &= $mask;
+        $g3 &= $mask;
+        $g4 &= $mask;
+
+        /** @var int $mask */
+        $mask = ~$mask & 0xffffffff;
+        /** @var int $h0 */
+        $h0 = ($h0 & $mask) | $g0;
+        /** @var int $h1 */
+        $h1 = ($h1 & $mask) | $g1;
+        /** @var int $h2 */
+        $h2 = ($h2 & $mask) | $g2;
+        /** @var int $h3 */
+        $h3 = ($h3 & $mask) | $g3;
+        /** @var int $h4 */
+        $h4 = ($h4 & $mask) | $g4;
+
+        /* h = h % (2^128) */
+        /** @var int $h0 */
+        $h0 = (($h0) | ($h1 << 26)) & 0xffffffff;
+        /** @var int $h1 */
+        $h1 = (($h1 >>  6) | ($h2 << 20)) & 0xffffffff;
+        /** @var int $h2 */
+        $h2 = (($h2 >> 12) | ($h3 << 14)) & 0xffffffff;
+        /** @var int $h3 */
+        $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
+
+        /* mac = (h + pad) % (2^128) */
+        $f = (int) ($h0 + $this->pad[0]);
+        $h0 = (int) $f;
+        $f = (int) ($h1 + $this->pad[1] + ($f >> 32));
+        $h1 = (int) $f;
+        $f = (int) ($h2 + $this->pad[2] + ($f >> 32));
+        $h2 = (int) $f;
+        $f = (int) ($h3 + $this->pad[3] + ($f >> 32));
+        $h3 = (int) $f;
+
+        return self::store32_le($h0 & 0xffffffff) .
+            self::store32_le($h1 & 0xffffffff) .
+            self::store32_le($h2 & 0xffffffff) .
+            self::store32_le($h3 & 0xffffffff);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php
new file mode 100644
index 00000000..515ccad6
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Salsa20.php
@@ -0,0 +1,273 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Salsa20
+ */
+abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
+{
+    const ROUNDS = 20;
+
+    /**
+     * Calculate an salsa20 hash of a single block
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $k
+     * @param string|null $c
+     * @return string
+     * @throws TypeError
+     */
+    public static function core_salsa20($in, $k, $c = null)
+    {
+        if (self::strlen($k) < 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        if ($c === null) {
+            $j0  = $x0  = 0x61707865;
+            $j5  = $x5  = 0x3320646e;
+            $j10 = $x10 = 0x79622d32;
+            $j15 = $x15 = 0x6b206574;
+        } else {
+            $j0  = $x0  = self::load_4(self::substr($c, 0, 4));
+            $j5  = $x5  = self::load_4(self::substr($c, 4, 4));
+            $j10 = $x10 = self::load_4(self::substr($c, 8, 4));
+            $j15 = $x15 = self::load_4(self::substr($c, 12, 4));
+        }
+        $j1  = $x1  = self::load_4(self::substr($k, 0, 4));
+        $j2  = $x2  = self::load_4(self::substr($k, 4, 4));
+        $j3  = $x3  = self::load_4(self::substr($k, 8, 4));
+        $j4  = $x4  = self::load_4(self::substr($k, 12, 4));
+        $j6  = $x6  = self::load_4(self::substr($in, 0, 4));
+        $j7  = $x7  = self::load_4(self::substr($in, 4, 4));
+        $j8  = $x8  = self::load_4(self::substr($in, 8, 4));
+        $j9  = $x9  = self::load_4(self::substr($in, 12, 4));
+        $j11 = $x11 = self::load_4(self::substr($k, 16, 4));
+        $j12 = $x12 = self::load_4(self::substr($k, 20, 4));
+        $j13 = $x13 = self::load_4(self::substr($k, 24, 4));
+        $j14 = $x14 = self::load_4(self::substr($k, 28, 4));
+
+        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+            $x4 ^= self::rotate($x0 + $x12, 7);
+            $x8 ^= self::rotate($x4 + $x0, 9);
+            $x12 ^= self::rotate($x8 + $x4, 13);
+            $x0 ^= self::rotate($x12 + $x8, 18);
+
+            $x9 ^= self::rotate($x5 + $x1, 7);
+            $x13 ^= self::rotate($x9 + $x5, 9);
+            $x1 ^= self::rotate($x13 + $x9, 13);
+            $x5 ^= self::rotate($x1 + $x13, 18);
+
+            $x14 ^= self::rotate($x10 + $x6, 7);
+            $x2 ^= self::rotate($x14 + $x10, 9);
+            $x6 ^= self::rotate($x2 + $x14, 13);
+            $x10 ^= self::rotate($x6 + $x2, 18);
+
+            $x3 ^= self::rotate($x15 + $x11, 7);
+            $x7 ^= self::rotate($x3 + $x15, 9);
+            $x11 ^= self::rotate($x7 + $x3, 13);
+            $x15 ^= self::rotate($x11 + $x7, 18);
+
+            $x1 ^= self::rotate($x0 + $x3, 7);
+            $x2 ^= self::rotate($x1 + $x0, 9);
+            $x3 ^= self::rotate($x2 + $x1, 13);
+            $x0 ^= self::rotate($x3 + $x2, 18);
+
+            $x6 ^= self::rotate($x5 + $x4, 7);
+            $x7 ^= self::rotate($x6 + $x5, 9);
+            $x4 ^= self::rotate($x7 + $x6, 13);
+            $x5 ^= self::rotate($x4 + $x7, 18);
+
+            $x11 ^= self::rotate($x10 + $x9, 7);
+            $x8 ^= self::rotate($x11 + $x10, 9);
+            $x9 ^= self::rotate($x8 + $x11, 13);
+            $x10 ^= self::rotate($x9 + $x8, 18);
+
+            $x12 ^= self::rotate($x15 + $x14, 7);
+            $x13 ^= self::rotate($x12 + $x15, 9);
+            $x14 ^= self::rotate($x13 + $x12, 13);
+            $x15 ^= self::rotate($x14 + $x13, 18);
+        }
+
+        $x0  += $j0;
+        $x1  += $j1;
+        $x2  += $j2;
+        $x3  += $j3;
+        $x4  += $j4;
+        $x5  += $j5;
+        $x6  += $j6;
+        $x7  += $j7;
+        $x8  += $j8;
+        $x9  += $j9;
+        $x10 += $j10;
+        $x11 += $j11;
+        $x12 += $j12;
+        $x13 += $j13;
+        $x14 += $j14;
+        $x15 += $j15;
+
+        return self::store32_le($x0) .
+            self::store32_le($x1) .
+            self::store32_le($x2) .
+            self::store32_le($x3) .
+            self::store32_le($x4) .
+            self::store32_le($x5) .
+            self::store32_le($x6) .
+            self::store32_le($x7) .
+            self::store32_le($x8) .
+            self::store32_le($x9) .
+            self::store32_le($x10) .
+            self::store32_le($x11) .
+            self::store32_le($x12) .
+            self::store32_le($x13) .
+            self::store32_le($x14) .
+            self::store32_le($x15);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function salsa20($len, $nonce, $key)
+    {
+        if (self::strlen($key) !== 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        $kcopy = '' . $key;
+        $in = self::substr($nonce, 0, 8) . str_repeat("\0", 8);
+        $c = '';
+        while ($len >= 64) {
+            $c .= self::core_salsa20($in, $kcopy, null);
+            $u = 1;
+            // Internal counter.
+            for ($i = 8; $i < 16; ++$i) {
+                $u += self::chrToInt($in[$i]);
+                $in[$i] = self::intToChr($u & 0xff);
+                $u >>= 8;
+            }
+            $len -= 64;
+        }
+        if ($len > 0) {
+            $c .= self::substr(
+                self::core_salsa20($in, $kcopy, null),
+                0,
+                $len
+            );
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($kcopy);
+        } catch (SodiumException $ex) {
+            $kcopy = null;
+        }
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $m
+     * @param string $n
+     * @param int $ic
+     * @param string $k
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function salsa20_xor_ic($m, $n, $ic, $k)
+    {
+        $mlen = self::strlen($m);
+        if ($mlen < 1) {
+            return '';
+        }
+        $kcopy = self::substr($k, 0, 32);
+        $in = self::substr($n, 0, 8);
+        // Initialize the counter
+        $in .= ParagonIE_Sodium_Core_Util::store64_le($ic);
+
+        $c = '';
+        while ($mlen >= 64) {
+            $block = self::core_salsa20($in, $kcopy, null);
+            $c .= self::xorStrings(
+                self::substr($m, 0, 64),
+                self::substr($block, 0, 64)
+            );
+            $u = 1;
+            for ($i = 8; $i < 16; ++$i) {
+                $u += self::chrToInt($in[$i]);
+                $in[$i] = self::intToChr($u & 0xff);
+                $u >>= 8;
+            }
+
+            $mlen -= 64;
+            $m = self::substr($m, 64);
+        }
+
+        if ($mlen) {
+            $block = self::core_salsa20($in, $kcopy, null);
+            $c .= self::xorStrings(
+                self::substr($m, 0, $mlen),
+                self::substr($block, 0, $mlen)
+            );
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($block);
+            ParagonIE_Sodium_Compat::memzero($kcopy);
+        } catch (SodiumException $ex) {
+            $block = null;
+            $kcopy = null;
+        }
+
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function salsa20_xor($message, $nonce, $key)
+    {
+        return self::xorStrings(
+            $message,
+            self::salsa20(
+                self::strlen($message),
+                $nonce,
+                $key
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $u
+     * @param int $c
+     * @return int
+     */
+    public static function rotate($u, $c)
+    {
+        $u &= 0xffffffff;
+        $c %= 32;
+        return (int) (0xffffffff & (
+                ($u << $c)
+                    |
+                ($u >> (32 - $c))
+            )
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php
new file mode 100644
index 00000000..7d398162
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/SipHash.php
@@ -0,0 +1,305 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_SodiumCompat_Core_SipHash
+ *
+ * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
+ */
+class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int[] $v
+     * @return int[]
+     */
+    public static function sipRound(array $v)
+    {
+        # v0 += v1;
+        list($v[0], $v[1]) = self::add(
+            array($v[0], $v[1]),
+            array($v[2], $v[3])
+        );
+
+        #  v1=ROTL(v1,13);
+        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
+
+        #  v1 ^= v0;
+        $v[2] ^= $v[0];
+        $v[3] ^= $v[1];
+
+        #  v0=ROTL(v0,32);
+        list($v[0], $v[1]) = self::rotl_64((int) $v[0], (int) $v[1], 32);
+
+        # v2 += v3;
+        list($v[4], $v[5]) = self::add(
+            array($v[4], $v[5]),
+            array($v[6], $v[7])
+        );
+
+        # v3=ROTL(v3,16);
+        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
+
+        #  v3 ^= v2;
+        $v[6] ^= $v[4];
+        $v[7] ^= $v[5];
+
+        # v0 += v3;
+        list($v[0], $v[1]) = self::add(
+            array((int) $v[0], (int) $v[1]),
+            array((int) $v[6], (int) $v[7])
+        );
+
+        # v3=ROTL(v3,21);
+        list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 21);
+
+        # v3 ^= v0;
+        $v[6] ^= $v[0];
+        $v[7] ^= $v[1];
+
+        # v2 += v1;
+        list($v[4], $v[5]) = self::add(
+            array((int) $v[4], (int) $v[5]),
+            array((int) $v[2], (int) $v[3])
+        );
+
+        # v1=ROTL(v1,17);
+        list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 17);
+
+        #  v1 ^= v2;;
+        $v[2] ^= $v[4];
+        $v[3] ^= $v[5];
+
+        # v2=ROTL(v2,32)
+        list($v[4], $v[5]) = self::rotl_64((int) $v[4], (int) $v[5], 32);
+
+        return $v;
+    }
+
+    /**
+     * Add two 32 bit integers representing a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int[] $a
+     * @param int[] $b
+     * @return array<int, mixed>
+     */
+    public static function add(array $a, array $b)
+    {
+        /** @var int $x1 */
+        $x1 = $a[1] + $b[1];
+        /** @var int $c */
+        $c = $x1 >> 32; // Carry if ($a + $b) > 0xffffffff
+        /** @var int $x0 */
+        $x0 = $a[0] + $b[0] + $c;
+        return array(
+            $x0 & 0xffffffff,
+            $x1 & 0xffffffff
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int0
+     * @param int $int1
+     * @param int $c
+     * @return array<int, mixed>
+     */
+    public static function rotl_64($int0, $int1, $c)
+    {
+        $int0 &= 0xffffffff;
+        $int1 &= 0xffffffff;
+        $c &= 63;
+        if ($c === 32) {
+            return array($int1, $int0);
+        }
+        if ($c > 31) {
+            $tmp = $int1;
+            $int1 = $int0;
+            $int0 = $tmp;
+            $c &= 31;
+        }
+        if ($c === 0) {
+            return array($int0, $int1);
+        }
+        return array(
+            0xffffffff & (
+                ($int0 << $c)
+                    |
+                ($int1 >> (32 - $c))
+            ),
+            0xffffffff & (
+                ($int1 << $c)
+                    |
+                ($int0 >> (32 - $c))
+            ),
+        );
+    }
+
+    /**
+     * Implements Siphash-2-4 using only 32-bit numbers.
+     *
+     * When we split an int into two, the higher bits go to the lower index.
+     * e.g. 0xDEADBEEFAB10C92D becomes [
+     *     0 => 0xDEADBEEF,
+     *     1 => 0xAB10C92D
+     * ].
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sipHash24($in, $key)
+    {
+        $inlen = self::strlen($in);
+
+        # /* "somepseudorandomlygeneratedbytes" */
+        # u64 v0 = 0x736f6d6570736575ULL;
+        # u64 v1 = 0x646f72616e646f6dULL;
+        # u64 v2 = 0x6c7967656e657261ULL;
+        # u64 v3 = 0x7465646279746573ULL;
+        $v = array(
+            0x736f6d65, // 0
+            0x70736575, // 1
+            0x646f7261, // 2
+            0x6e646f6d, // 3
+            0x6c796765, // 4
+            0x6e657261, // 5
+            0x74656462, // 6
+            0x79746573  // 7
+        );
+        // v0 => $v[0], $v[1]
+        // v1 => $v[2], $v[3]
+        // v2 => $v[4], $v[5]
+        // v3 => $v[6], $v[7]
+
+        # u64 k0 = LOAD64_LE( k );
+        # u64 k1 = LOAD64_LE( k + 8 );
+        $k = array(
+            self::load_4(self::substr($key, 4, 4)),
+            self::load_4(self::substr($key, 0, 4)),
+            self::load_4(self::substr($key, 12, 4)),
+            self::load_4(self::substr($key, 8, 4))
+        );
+        // k0 => $k[0], $k[1]
+        // k1 => $k[2], $k[3]
+
+        # b = ( ( u64 )inlen ) << 56;
+        $b = array(
+            $inlen << 24,
+            0
+        );
+        // See docblock for why the 0th index gets the higher bits.
+
+        # v3 ^= k1;
+        $v[6] ^= $k[2];
+        $v[7] ^= $k[3];
+        # v2 ^= k0;
+        $v[4] ^= $k[0];
+        $v[5] ^= $k[1];
+        # v1 ^= k1;
+        $v[2] ^= $k[2];
+        $v[3] ^= $k[3];
+        # v0 ^= k0;
+        $v[0] ^= $k[0];
+        $v[1] ^= $k[1];
+
+        $left = $inlen;
+        # for ( ; in != end; in += 8 )
+        while ($left >= 8) {
+            # m = LOAD64_LE( in );
+            $m = array(
+                self::load_4(self::substr($in, 4, 4)),
+                self::load_4(self::substr($in, 0, 4))
+            );
+
+            # v3 ^= m;
+            $v[6] ^= $m[0];
+            $v[7] ^= $m[1];
+
+            # SIPROUND;
+            # SIPROUND;
+            $v = self::sipRound($v);
+            $v = self::sipRound($v);
+
+            # v0 ^= m;
+            $v[0] ^= $m[0];
+            $v[1] ^= $m[1];
+
+            $in = self::substr($in, 8);
+            $left -= 8;
+        }
+
+        # switch( left )
+        #  {
+        #     case 7: b |= ( ( u64 )in[ 6] )  << 48;
+        #     case 6: b |= ( ( u64 )in[ 5] )  << 40;
+        #     case 5: b |= ( ( u64 )in[ 4] )  << 32;
+        #     case 4: b |= ( ( u64 )in[ 3] )  << 24;
+        #     case 3: b |= ( ( u64 )in[ 2] )  << 16;
+        #     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
+        #     case 1: b |= ( ( u64 )in[ 0] ); break;
+        #     case 0: break;
+        # }
+        switch ($left) {
+            case 7:
+                $b[0] |= self::chrToInt($in[6]) << 16;
+            case 6:
+                $b[0] |= self::chrToInt($in[5]) << 8;
+            case 5:
+                $b[0] |= self::chrToInt($in[4]);
+            case 4:
+                $b[1] |= self::chrToInt($in[3]) << 24;
+            case 3:
+                $b[1] |= self::chrToInt($in[2]) << 16;
+            case 2:
+                $b[1] |= self::chrToInt($in[1]) << 8;
+            case 1:
+                $b[1] |= self::chrToInt($in[0]);
+            case 0:
+                break;
+        }
+        // See docblock for why the 0th index gets the higher bits.
+
+        # v3 ^= b;
+        $v[6] ^= $b[0];
+        $v[7] ^= $b[1];
+
+        # SIPROUND;
+        # SIPROUND;
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+
+        # v0 ^= b;
+        $v[0] ^= $b[0];
+        $v[1] ^= $b[1];
+
+        // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
+        # v2 ^= 0xff;
+        $v[5] ^= 0xff;
+
+        # SIPROUND;
+        # SIPROUND;
+        # SIPROUND;
+        # SIPROUND;
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+
+        # b = v0 ^ v1 ^ v2 ^ v3;
+        # STORE64_LE( out, b );
+        return  self::store32_le($v[1] ^ $v[3] ^ $v[5] ^ $v[7]) .
+            self::store32_le($v[0] ^ $v[2] ^ $v[4] ^ $v[6]);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php
new file mode 100644
index 00000000..9c8e41e2
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Util.php
@@ -0,0 +1,921 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Util
+ */
+abstract class ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @param int $integer
+     * @param int $size (16, 32, 64)
+     * @return int
+     */
+    public static function abs($integer, $size = 0)
+    {
+        /** @var int $realSize */
+        $realSize = (PHP_INT_SIZE << 3) - 1;
+        if ($size) {
+            --$size;
+        } else {
+            /** @var int $size */
+            $size = $realSize;
+        }
+
+        $negative = -(($integer >> $size) & 1);
+        return (int) (
+            ($integer ^ $negative)
+                +
+            (($negative >> $realSize) & 1)
+        );
+    }
+
+    /**
+     * Convert a binary string into a hexadecimal string without cache-timing
+     * leaks
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $binaryString (raw binary)
+     * @return string
+     * @throws TypeError
+     */
+    public static function bin2hex($binaryString)
+    {
+        /* Type checks: */
+        if (!is_string($binaryString)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
+        }
+
+        $hex = '';
+        $len = self::strlen($binaryString);
+        for ($i = 0; $i < $len; ++$i) {
+            /** @var array<int, int> $chunk */
+            $chunk = unpack('C', $binaryString[$i]);
+            /** @var int $c */
+            $c = $chunk[1] & 0xf;
+            /** @var int $b */
+            $b = $chunk[1] >> 4;
+            $hex .= pack(
+                'CC',
+                (87 + $b + ((($b - 10) >> 8) & ~38)),
+                (87 + $c + ((($c - 10) >> 8) & ~38))
+            );
+        }
+        return $hex;
+    }
+
+    /**
+     * Convert a binary string into a hexadecimal string without cache-timing
+     * leaks, returning uppercase letters (as per RFC 4648)
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $bin_string (raw binary)
+     * @return string
+     * @throws TypeError
+     */
+    public static function bin2hexUpper($bin_string)
+    {
+        $hex = '';
+        $len = self::strlen($bin_string);
+        for ($i = 0; $i < $len; ++$i) {
+            /** @var array<int, int> $chunk */
+            $chunk = unpack('C', $bin_string[$i]);
+            /**
+             * Lower 16 bits
+             *
+             * @var int $c
+             */
+            $c = $chunk[1] & 0xf;
+
+            /**
+             * Upper 16 bits
+             * @var int $b
+             */
+            $b = $chunk[1] >> 4;
+
+            /**
+             * Use pack() and binary operators to turn the two integers
+             * into hexadecimal characters. We don't use chr() here, because
+             * it uses a lookup table internally and we want to avoid
+             * cache-timing side-channels.
+             */
+            $hex .= pack(
+                'CC',
+                (55 + $b + ((($b - 10) >> 8) & ~6)),
+                (55 + $c + ((($c - 10) >> 8) & ~6))
+            );
+        }
+        return $hex;
+    }
+
+    /**
+     * Cache-timing-safe variant of ord()
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $chr
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function chrToInt($chr)
+    {
+        /* Type checks: */
+        if (!is_string($chr)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
+        }
+        if (self::strlen($chr) !== 1) {
+            throw new SodiumException('chrToInt() expects a string that is exactly 1 character long');
+        }
+        /** @var array<int, int> $chunk */
+        $chunk = unpack('C', $chr);
+        return (int) ($chunk[1]);
+    }
+
+    /**
+     * Compares two strings.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $left
+     * @param string $right
+     * @param int $len
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function compare($left, $right, $len = null)
+    {
+        $leftLen = self::strlen($left);
+        $rightLen = self::strlen($right);
+        if ($len === null) {
+            $len = max($leftLen, $rightLen);
+            $left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
+            $right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
+        }
+
+        $gt = 0;
+        $eq = 1;
+        $i = $len;
+        while ($i !== 0) {
+            --$i;
+            $gt |= ((self::chrToInt($right[$i]) - self::chrToInt($left[$i])) >> 8) & $eq;
+            $eq &= ((self::chrToInt($right[$i]) ^ self::chrToInt($left[$i])) - 1) >> 8;
+        }
+        return ($gt + $gt + $eq) - 1;
+    }
+
+    /**
+     * If a variable does not match a given type, throw a TypeError.
+     *
+     * @param mixed $mixedVar
+     * @param string $type
+     * @param int $argumentIndex
+     * @throws TypeError
+     * @throws SodiumException
+     * @return void
+     */
+    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
+    {
+        if (func_num_args() === 0) {
+            /* Tautology, by default */
+            return;
+        }
+        if (func_num_args() === 1) {
+            throw new TypeError('Declared void, but passed a variable');
+        }
+        $realType = strtolower(gettype($mixedVar));
+        $type = strtolower($type);
+        switch ($type) {
+            case 'null':
+                if ($mixedVar !== null) {
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be null, ' . $realType . ' given.');
+                }
+                break;
+            case 'integer':
+            case 'int':
+                $allow = array('int', 'integer');
+                if (!in_array($type, $allow)) {
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be an integer, ' . $realType . ' given.');
+                }
+                $mixedVar = (int) $mixedVar;
+                break;
+            case 'boolean':
+            case 'bool':
+                $allow = array('bool', 'boolean');
+                if (!in_array($type, $allow)) {
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be a boolean, ' . $realType . ' given.');
+                }
+                $mixedVar = (bool) $mixedVar;
+                break;
+            case 'string':
+                if (!is_string($mixedVar)) {
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be a string, ' . $realType . ' given.');
+                }
+                $mixedVar = (string) $mixedVar;
+                break;
+            case 'decimal':
+            case 'double':
+            case 'float':
+                $allow = array('decimal', 'double', 'float');
+                if (!in_array($type, $allow)) {
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be a float, ' . $realType . ' given.');
+                }
+                $mixedVar = (float) $mixedVar;
+                break;
+            case 'object':
+                if (!is_object($mixedVar)) {
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be an object, ' . $realType . ' given.');
+                }
+                break;
+            case 'array':
+                if (!is_array($mixedVar)) {
+                    if (is_object($mixedVar)) {
+                        if ($mixedVar instanceof ArrayAccess) {
+                            return;
+                        }
+                    }
+                    throw new TypeError('Argument ' . $argumentIndex . ' must be an array, ' . $realType . ' given.');
+                }
+                break;
+            default:
+                throw new SodiumException('Unknown type (' . $realType .') does not match expect type (' . $type . ')');
+        }
+    }
+
+    /**
+     * Evaluate whether or not two strings are equal (in constant-time)
+     *
+     * @param string $left
+     * @param string $right
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function hashEquals($left, $right)
+    {
+        /* Type checks: */
+        if (!is_string($left)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
+        }
+        if (!is_string($right)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
+        }
+
+        if (is_callable('hash_equals')) {
+            return hash_equals($left, $right);
+        }
+        $d = 0;
+        /** @var int $len */
+        $len = self::strlen($left);
+        if ($len !== self::strlen($right)) {
+            return false;
+        }
+        for ($i = 0; $i < $len; ++$i) {
+            $d |= self::chrToInt($left[$i]) ^ self::chrToInt($right[$i]);
+        }
+
+        if ($d !== 0) {
+            return false;
+        }
+        return $left === $right;
+    }
+
+    /**
+     * Convert a hexadecimal string into a binary string without cache-timing
+     * leaks
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $hexString
+     * @param bool $strictPadding
+     * @return string (raw binary)
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function hex2bin($hexString, $strictPadding = false)
+    {
+        /* Type checks: */
+        if (!is_string($hexString)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
+        }
+
+        /** @var int $hex_pos */
+        $hex_pos = 0;
+        /** @var string $bin */
+        $bin = '';
+        /** @var int $c_acc */
+        $c_acc = 0;
+        /** @var int $hex_len */
+        $hex_len = self::strlen($hexString);
+        /** @var int $state */
+        $state = 0;
+        if (($hex_len & 1) !== 0) {
+            if ($strictPadding) {
+                throw new RangeException(
+                    'Expected an even number of hexadecimal characters'
+                );
+            } else {
+                $hexString = '0' . $hexString;
+                ++$hex_len;
+            }
+        }
+
+        $chunk = unpack('C*', $hexString);
+        while ($hex_pos < $hex_len) {
+            ++$hex_pos;
+            /** @var int $c */
+            $c = $chunk[$hex_pos];
+            /** @var int $c_num */
+            $c_num = $c ^ 48;
+            /** @var int $c_num0 */
+            $c_num0 = ($c_num - 10) >> 8;
+            /** @var int $c_alpha */
+            $c_alpha = ($c & ~32) - 55;
+            /** @var int $c_alpha0 */
+            $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
+            if (($c_num0 | $c_alpha0) === 0) {
+                throw new RangeException(
+                    'hex2bin() only expects hexadecimal characters'
+                );
+            }
+            /** @var int $c_val */
+            $c_val = ($c_num0 & $c_num) | ($c_alpha & $c_alpha0);
+            if ($state === 0) {
+                $c_acc = $c_val * 16;
+            } else {
+                $bin .= pack('C', $c_acc | $c_val);
+            }
+            $state ^= 1;
+        }
+        return $bin;
+    }
+
+    /**
+     * Turn an array of integers into a string
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param array<int, int> $ints
+     * @return string
+     */
+    public static function intArrayToString(array $ints)
+    {
+        /** @var array<int, int> $args */
+        $args = $ints;
+        foreach ($args as $i => $v) {
+            $args[$i] = (int) ($v & 0xff);
+        }
+        array_unshift($args, str_repeat('C', count($ints)));
+        return (string) (call_user_func_array('pack', $args));
+    }
+
+    /**
+     * Cache-timing-safe variant of ord()
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function intToChr($int)
+    {
+        return pack('C', $int);
+    }
+
+    /**
+     * Load a 3 character substring into an integer
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return int
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function load_3($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($string) < 3) {
+            throw new RangeException(
+                'String must be 3 bytes or more; ' . self::strlen($string) . ' given.'
+            );
+        }
+        /** @var array<int, int> $unpacked */
+        $unpacked = unpack('V', $string . "\0");
+        return (int) ($unpacked[1] & 0xffffff);
+    }
+
+    /**
+     * Load a 4 character substring into an integer
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return int
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function load_4($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($string) < 4) {
+            throw new RangeException(
+                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+            );
+        }
+        /** @var array<int, int> $unpacked */
+        $unpacked = unpack('V', $string);
+        return (int) ($unpacked[1] & 0xffffffff);
+    }
+
+    /**
+     * Load a 8 character substring into an integer
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return int
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function load64_le($string)
+    {
+        /* Type checks: */
+        if (!is_string($string)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($string) < 4) {
+            throw new RangeException(
+                'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
+            );
+        }
+        if (PHP_VERSION_ID >= 50603 && PHP_INT_SIZE === 8) {
+            /** @var array<int, int> $unpacked */
+            $unpacked = unpack('P', $string);
+            return (int) $unpacked[1];
+        }
+
+        /** @var int $result */
+        $result  = (self::chrToInt($string[0]) & 0xff);
+        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
+        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
+        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
+        $result |= (self::chrToInt($string[4]) & 0xff) << 32;
+        $result |= (self::chrToInt($string[5]) & 0xff) << 40;
+        $result |= (self::chrToInt($string[6]) & 0xff) << 48;
+        $result |= (self::chrToInt($string[7]) & 0xff) << 56;
+        return (int) $result;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $left
+     * @param string $right
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function memcmp($left, $right)
+    {
+        if (self::hashEquals($left, $right)) {
+            return 0;
+        }
+        return -1;
+    }
+
+    /**
+     * Multiply two integers in constant-time
+     *
+     * Micro-architecture timing side-channels caused by how your CPU
+     * implements multiplication are best prevented by never using the
+     * multiplication operators and ensuring that our code always takes
+     * the same number of operations to complete, regardless of the values
+     * of $a and $b.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $a
+     * @param int $b
+     * @param int $size Limits the number of operations (useful for small,
+     *                  constant operands)
+     * @return int
+     */
+    public static function mul($a, $b, $size = 0)
+    {
+        if (ParagonIE_Sodium_Compat::$fastMult) {
+            return (int) ($a * $b);
+        }
+
+        static $defaultSize = null;
+        /** @var int $defaultSize */
+        if (!$defaultSize) {
+            /** @var int $defaultSize */
+            $defaultSize = (PHP_INT_SIZE << 3) - 1;
+        }
+        if ($size < 1) {
+            /** @var int $size */
+            $size = $defaultSize;
+        }
+        /** @var int $size */
+
+        $c = 0;
+
+        /**
+         * Mask is either -1 or 0.
+         *
+         * -1 in binary looks like 0x1111 ... 1111
+         *  0 in binary looks like 0x0000 ... 0000
+         *
+         * @var int
+         */
+        $mask = -(($b >> $defaultSize) & 1);
+
+        /**
+         * Ensure $b is a positive integer, without creating
+         * a branching side-channel
+         *
+         * @var int $b
+         */
+        $b = ($b & ~$mask) | ($mask & -$b);
+
+        /**
+         * Unless $size is provided:
+         *
+         * This loop always runs 32 times when PHP_INT_SIZE is 4.
+         * This loop always runs 64 times when PHP_INT_SIZE is 8.
+         */
+        for ($i = $size; $i >= 0; --$i) {
+            $c += (int) ($a & -($b & 1));
+            $a <<= 1;
+            $b >>= 1;
+        }
+
+        /**
+         * If $b was negative, we then apply the same value to $c here.
+         * It doesn't matter much if $a was negative; the $c += above would
+         * have produced a negative integer to begin with. But a negative $b
+         * makes $b >>= 1 never return 0, so we would end up with incorrect
+         * results.
+         *
+         * The end result is what we'd expect from integer multiplication.
+         */
+        return (int) (($c & ~$mask) | ($mask & -$c));
+    }
+
+    /**
+     * Convert any arbitrary numbers into two 32-bit integers that represent
+     * a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int|float $num
+     * @return array<int, int>
+     */
+    public static function numericTo64BitInteger($num)
+    {
+        $high = 0;
+        /** @var int $low */
+        $low = $num & 0xffffffff;
+
+        if ((+(abs($num))) >= 1) {
+            if ($num > 0) {
+                /** @var int $high */
+                $high = min((+(floor($num/4294967296))), 4294967295);
+            } else {
+                /** @var int $high */
+                $high = ~~((+(ceil(($num - (+((~~($num)))))/4294967296))));
+            }
+        }
+        return array((int) $high, (int) $low);
+    }
+
+    /**
+     * Store a 24-bit integer into a string, treating it as big-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store_3($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+        /** @var string $packed */
+        $packed = pack('N', $int);
+        return self::substr($packed, 1, 3);
+    }
+
+    /**
+     * Store a 32-bit integer into a string, treating it as little-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store32_le($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        /** @var string $packed */
+        $packed = pack('V', $int);
+        return $packed;
+    }
+
+    /**
+     * Store a 32-bit integer into a string, treating it as big-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store_4($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        /** @var string $packed */
+        $packed = pack('N', $int);
+        return $packed;
+    }
+
+    /**
+     * Stores a 64-bit integer as an string, treating it as little-endian.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $int
+     * @return string
+     * @throws TypeError
+     */
+    public static function store64_le($int)
+    {
+        /* Type checks: */
+        if (!is_int($int)) {
+            if (is_numeric($int)) {
+                $int = (int) $int;
+            } else {
+                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
+            }
+        }
+
+        if (PHP_INT_SIZE === 8) {
+            if (PHP_VERSION_ID >= 50603) {
+                /** @var string $packed */
+                $packed = pack('P', $int);
+                return $packed;
+            }
+            return self::intToChr($int & 0xff) .
+                self::intToChr(($int >>  8) & 0xff) .
+                self::intToChr(($int >> 16) & 0xff) .
+                self::intToChr(($int >> 24) & 0xff) .
+                self::intToChr(($int >> 32) & 0xff) .
+                self::intToChr(($int >> 40) & 0xff) .
+                self::intToChr(($int >> 48) & 0xff) .
+                self::intToChr(($int >> 56) & 0xff);
+        }
+        if ($int > PHP_INT_MAX) {
+            list($hiB, $int) = self::numericTo64BitInteger($int);
+        } else {
+            $hiB = 0;
+        }
+        return
+            self::intToChr(($int      ) & 0xff) .
+            self::intToChr(($int >>  8) & 0xff) .
+            self::intToChr(($int >> 16) & 0xff) .
+            self::intToChr(($int >> 24) & 0xff) .
+            self::intToChr($hiB & 0xff) .
+            self::intToChr(($hiB >>  8) & 0xff) .
+            self::intToChr(($hiB >> 16) & 0xff) .
+            self::intToChr(($hiB >> 24) & 0xff);
+    }
+
+    /**
+     * Safe string length
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @ref mbstring.func_overload
+     *
+     * @param string $str
+     * @return int
+     * @throws TypeError
+     */
+    public static function strlen($str)
+    {
+        /* Type checks: */
+        if (!is_string($str)) {
+            throw new TypeError('String expected');
+        }
+
+        return (int) (
+        self::isMbStringOverride()
+            ? mb_strlen($str, '8bit')
+            : strlen($str)
+        );
+    }
+
+    /**
+     * Turn a string into an array of integers
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return array<int, int>
+     * @throws TypeError
+     */
+    public static function stringToIntArray($string)
+    {
+        if (!is_string($string)) {
+            throw new TypeError('String expected');
+        }
+        /**
+         * @var array<int, int>
+         */
+        $values = array_values(
+            unpack('C*', $string)
+        );
+        return $values;
+    }
+
+    /**
+     * Safe substring
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @ref mbstring.func_overload
+     *
+     * @param string $str
+     * @param int $start
+     * @param int $length
+     * @return string
+     * @throws TypeError
+     */
+    public static function substr($str, $start = 0, $length = null)
+    {
+        /* Type checks: */
+        if (!is_string($str)) {
+            throw new TypeError('String expected');
+        }
+
+        if ($length === 0) {
+            return '';
+        }
+
+        if (self::isMbStringOverride()) {
+            if (PHP_VERSION_ID < 50400 && $length === null) {
+                $length = self::strlen($str);
+            }
+            $sub = (string) mb_substr($str, $start, $length, '8bit');
+        } elseif ($length === null) {
+            $sub = (string) substr($str, $start);
+        } else {
+            $sub = (string) substr($str, $start, $length);
+        }
+        if (isset($sub)) {
+            return $sub;
+        }
+        return '';
+    }
+
+    /**
+     * Compare a 16-character byte string in constant time.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function verify_16($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('String expected');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('String expected');
+        }
+        return self::hashEquals(
+            self::substr($a, 0, 16),
+            self::substr($b, 0, 16)
+        );
+    }
+
+    /**
+     * Compare a 32-character byte string in constant time.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function verify_32($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('String expected');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('String expected');
+        }
+        return self::hashEquals(
+            self::substr($a, 0, 32),
+            self::substr($b, 0, 32)
+        );
+    }
+
+    /**
+     * Calculate $a ^ $b for two strings.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @return string
+     * @throws TypeError
+     */
+    public static function xorStrings($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('Argument 1 must be a string');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('Argument 2 must be a string');
+        }
+
+        return (string) ($a ^ $b);
+    }
+
+    /**
+     * Returns whether or not mbstring.func_overload is in effect.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return bool
+     */
+    protected static function isMbStringOverride()
+    {
+        static $mbstring = null;
+
+        if ($mbstring === null) {
+            $mbstring = extension_loaded('mbstring')
+                &&
+            (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING);
+        }
+        /** @var bool $mbstring */
+
+        return $mbstring;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php
new file mode 100644
index 00000000..732bb65e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/X25519.php
@@ -0,0 +1,327 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_X25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_X25519
+ */
+abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve25519
+{
+    /**
+     * Alters the objects passed to this method in place.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
+     * @param int $b
+     * @return void
+     * @psalm-suppress MixedAssignment
+     */
+    public static function fe_cswap(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g,
+        $b = 0
+    ) {
+        $f0 = (int) $f[0];
+        $f1 = (int) $f[1];
+        $f2 = (int) $f[2];
+        $f3 = (int) $f[3];
+        $f4 = (int) $f[4];
+        $f5 = (int) $f[5];
+        $f6 = (int) $f[6];
+        $f7 = (int) $f[7];
+        $f8 = (int) $f[8];
+        $f9 = (int) $f[9];
+        $g0 = (int) $g[0];
+        $g1 = (int) $g[1];
+        $g2 = (int) $g[2];
+        $g3 = (int) $g[3];
+        $g4 = (int) $g[4];
+        $g5 = (int) $g[5];
+        $g6 = (int) $g[6];
+        $g7 = (int) $g[7];
+        $g8 = (int) $g[8];
+        $g9 = (int) $g[9];
+        $b = -$b;
+        $x0 = ($f0 ^ $g0) & $b;
+        $x1 = ($f1 ^ $g1) & $b;
+        $x2 = ($f2 ^ $g2) & $b;
+        $x3 = ($f3 ^ $g3) & $b;
+        $x4 = ($f4 ^ $g4) & $b;
+        $x5 = ($f5 ^ $g5) & $b;
+        $x6 = ($f6 ^ $g6) & $b;
+        $x7 = ($f7 ^ $g7) & $b;
+        $x8 = ($f8 ^ $g8) & $b;
+        $x9 = ($f9 ^ $g9) & $b;
+        $f[0] = $f0 ^ $x0;
+        $f[1] = $f1 ^ $x1;
+        $f[2] = $f2 ^ $x2;
+        $f[3] = $f3 ^ $x3;
+        $f[4] = $f4 ^ $x4;
+        $f[5] = $f5 ^ $x5;
+        $f[6] = $f6 ^ $x6;
+        $f[7] = $f7 ^ $x7;
+        $f[8] = $f8 ^ $x8;
+        $f[9] = $f9 ^ $x9;
+        $g[0] = $g0 ^ $x0;
+        $g[1] = $g1 ^ $x1;
+        $g[2] = $g2 ^ $x2;
+        $g[3] = $g3 ^ $x3;
+        $g[4] = $g4 ^ $x4;
+        $g[5] = $g5 ^ $x5;
+        $g[6] = $g6 ^ $x6;
+        $g[7] = $g7 ^ $x7;
+        $g[8] = $g8 ^ $x8;
+        $g[9] = $g9 ^ $x9;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    {
+        $h = array(
+            self::mul((int) $f[0], 121666, 17),
+            self::mul((int) $f[1], 121666, 17),
+            self::mul((int) $f[2], 121666, 17),
+            self::mul((int) $f[3], 121666, 17),
+            self::mul((int) $f[4], 121666, 17),
+            self::mul((int) $f[5], 121666, 17),
+            self::mul((int) $f[6], 121666, 17),
+            self::mul((int) $f[7], 121666, 17),
+            self::mul((int) $f[8], 121666, 17),
+            self::mul((int) $f[9], 121666, 17)
+        );
+
+        /** @var int $carry9 */
+        $carry9 = ($h[9] + (1 << 24)) >> 25;
+        $h[0] += self::mul($carry9, 19, 5);
+        $h[9] -= $carry9 << 25;
+        /** @var int $carry1 */
+        $carry1 = ($h[1] + (1 << 24)) >> 25;
+        $h[2] += $carry1;
+        $h[1] -= $carry1 << 25;
+        /** @var int $carry3 */
+        $carry3 = ($h[3] + (1 << 24)) >> 25;
+        $h[4] += $carry3;
+        $h[3] -= $carry3 << 25;
+        /** @var int $carry5 */
+        $carry5 = ($h[5] + (1 << 24)) >> 25;
+        $h[6] += $carry5;
+        $h[5] -= $carry5 << 25;
+        /** @var int $carry7 */
+        $carry7 = ($h[7] + (1 << 24)) >> 25;
+        $h[8] += $carry7;
+        $h[7] -= $carry7 << 25;
+
+        /** @var int $carry0 */
+        $carry0 = ($h[0] + (1 << 25)) >> 26;
+        $h[1] += $carry0;
+        $h[0] -= $carry0 << 26;
+        /** @var int $carry2 */
+        $carry2 = ($h[2] + (1 << 25)) >> 26;
+        $h[3] += $carry2;
+        $h[2] -= $carry2 << 26;
+        /** @var int $carry4 */
+        $carry4 = ($h[4] + (1 << 25)) >> 26;
+        $h[5] += $carry4;
+        $h[4] -= $carry4 << 26;
+        /** @var int $carry6 */
+        $carry6 = ($h[6] + (1 << 25)) >> 26;
+        $h[7] += $carry6;
+        $h[6] -= $carry6 << 26;
+        /** @var int $carry8 */
+        $carry8 = ($h[8] + (1 << 25)) >> 26;
+        $h[9] += $carry8;
+        $h[8] -= $carry8 << 26;
+
+        foreach ($h as $i => $value) {
+            $h[$i] = (int) $value;
+        }
+        return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * Inline comments preceded by # are from libsodium's ref10 code.
+     *
+     * @param string $n
+     * @param string $p
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult_curve25519_ref10($n, $p)
+    {
+        # for (i = 0;i < 32;++i) e[i] = n[i];
+        $e = '' . $n;
+        # e[0] &= 248;
+        $e[0] = self::intToChr(
+            self::chrToInt($e[0]) & 248
+        );
+        # e[31] &= 127;
+        # e[31] |= 64;
+        $e[31] = self::intToChr(
+            (self::chrToInt($e[31]) & 127) | 64
+        );
+        # fe_frombytes(x1,p);
+        $x1 = self::fe_frombytes($p);
+        # fe_1(x2);
+        $x2 = self::fe_1();
+        # fe_0(z2);
+        $z2 = self::fe_0();
+        # fe_copy(x3,x1);
+        $x3 = self::fe_copy($x1);
+        # fe_1(z3);
+        $z3 = self::fe_1();
+
+        # swap = 0;
+        /** @var int $swap */
+        $swap = 0;
+
+        # for (pos = 254;pos >= 0;--pos) {
+        for ($pos = 254; $pos >= 0; --$pos) {
+            # b = e[pos / 8] >> (pos & 7);
+            /** @var int $b */
+            $b = self::chrToInt(
+                    $e[(int) floor($pos / 8)]
+                ) >> ($pos & 7);
+            # b &= 1;
+            $b &= 1;
+            # swap ^= b;
+            $swap ^= $b;
+            # fe_cswap(x2,x3,swap);
+            self::fe_cswap($x2, $x3, $swap);
+            # fe_cswap(z2,z3,swap);
+            self::fe_cswap($z2, $z3, $swap);
+            # swap = b;
+            $swap = $b;
+            # fe_sub(tmp0,x3,z3);
+            $tmp0 = self::fe_sub($x3, $z3);
+            # fe_sub(tmp1,x2,z2);
+            $tmp1 = self::fe_sub($x2, $z2);
+
+            # fe_add(x2,x2,z2);
+            $x2 = self::fe_add($x2, $z2);
+
+            # fe_add(z2,x3,z3);
+            $z2 = self::fe_add($x3, $z3);
+
+            # fe_mul(z3,tmp0,x2);
+            $z3 = self::fe_mul($tmp0, $x2);
+
+            # fe_mul(z2,z2,tmp1);
+            $z2 = self::fe_mul($z2, $tmp1);
+
+            # fe_sq(tmp0,tmp1);
+            $tmp0 = self::fe_sq($tmp1);
+
+            # fe_sq(tmp1,x2);
+            $tmp1 = self::fe_sq($x2);
+
+            # fe_add(x3,z3,z2);
+            $x3 = self::fe_add($z3, $z2);
+
+            # fe_sub(z2,z3,z2);
+            $z2 = self::fe_sub($z3, $z2);
+
+            # fe_mul(x2,tmp1,tmp0);
+            $x2 = self::fe_mul($tmp1, $tmp0);
+
+            # fe_sub(tmp1,tmp1,tmp0);
+            $tmp1 = self::fe_sub($tmp1, $tmp0);
+
+            # fe_sq(z2,z2);
+            $z2 = self::fe_sq($z2);
+
+            # fe_mul121666(z3,tmp1);
+            $z3 = self::fe_mul121666($tmp1);
+
+            # fe_sq(x3,x3);
+            $x3 = self::fe_sq($x3);
+
+            # fe_add(tmp0,tmp0,z3);
+            $tmp0 = self::fe_add($tmp0, $z3);
+
+            # fe_mul(z3,x1,z2);
+            $z3 = self::fe_mul($x1, $z2);
+
+            # fe_mul(z2,tmp1,tmp0);
+            $z2 = self::fe_mul($tmp1, $tmp0);
+        }
+
+        # fe_cswap(x2,x3,swap);
+        self::fe_cswap($x2, $x3, $swap);
+
+        # fe_cswap(z2,z3,swap);
+        self::fe_cswap($z2, $z3, $swap);
+
+        # fe_invert(z2,z2);
+        $z2 = self::fe_invert($z2);
+
+        # fe_mul(x2,x2,z2);
+        $x2 = self::fe_mul($x2, $z2);
+        # fe_tobytes(q,x2);
+        return self::fe_tobytes($x2);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY
+     * @param ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
+     * @return ParagonIE_Sodium_Core_Curve25519_Fe
+     */
+    public static function edwards_to_montgomery(
+        ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY,
+        ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
+    ) {
+        $tempX = self::fe_add($edwardsZ, $edwardsY);
+        $tempZ = self::fe_sub($edwardsZ, $edwardsY);
+        $tempZ = self::fe_invert($tempZ);
+        return self::fe_mul($tempX, $tempZ);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $n
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult_curve25519_ref10_base($n)
+    {
+        # for (i = 0;i < 32;++i) e[i] = n[i];
+        $e = '' . $n;
+
+        # e[0] &= 248;
+        $e[0] = self::intToChr(
+            self::chrToInt($e[0]) & 248
+        );
+
+        # e[31] &= 127;
+        # e[31] |= 64;
+        $e[31] = self::intToChr(
+            (self::chrToInt($e[31]) & 127) | 64
+        );
+
+        $A = self::ge_scalarmult_base($e);
+        if (
+            !($A->Y instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
+                ||
+            !($A->Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
+        ) {
+            throw new TypeError('Null points encountered');
+        }
+        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
+        return self::fe_tobytes($pk);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php
new file mode 100644
index 00000000..a9b203ce
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/XChaCha20.php
@@ -0,0 +1,64 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_XChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_XChaCha20
+ */
+class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
+{
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function stream($len = 64, $nonce = '', $key = '')
+    {
+        if (self::strlen($nonce) !== 24) {
+            throw new SodiumException('Nonce must be 24 bytes long');
+        }
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx(
+                self::hChaCha20(
+                    self::substr($nonce, 0, 16),
+                    $key
+                ),
+                self::substr($nonce, 16, 8)
+            ),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        if (self::strlen($nonce) !== 24) {
+            throw new SodiumException('Nonce must be 24 bytes long');
+        }
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core_ChaCha20_Ctx(
+                self::hChaCha20(self::substr($nonce, 0, 16), $key),
+                self::substr($nonce, 16, 8),
+                $ic
+            ),
+            $message
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php
new file mode 100644
index 00000000..9ef989ee
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core/Xsalsa20.php
@@ -0,0 +1,57 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_XSalsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_XSalsa20
+ */
+abstract class ParagonIE_Sodium_Core_XSalsa20 extends ParagonIE_Sodium_Core_HSalsa20
+{
+    /**
+     * Expand a key and nonce into an xsalsa20 keystream.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function xsalsa20($len, $nonce, $key)
+    {
+        $ret = self::salsa20(
+            $len,
+            self::substr($nonce, 16, 8),
+            self::hsalsa20($nonce, $key)
+        );
+        return $ret;
+    }
+
+    /**
+     * Encrypt a string with XSalsa20. Doesn't provide integrity.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function xsalsa20_xor($message, $nonce, $key)
+    {
+        return self::xorStrings(
+            $message,
+            self::xsalsa20(
+                self::strlen($message),
+                $nonce,
+                $key
+            )
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/BLAKE2b.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/BLAKE2b.php
new file mode 100644
index 00000000..88bc98d6
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/BLAKE2b.php
@@ -0,0 +1,675 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_BLAKE2b
+ *
+ * Based on the work of Devi Mandiri in devi/salt.
+ */
+abstract class ParagonIE_Sodium_Core32_BLAKE2b extends ParagonIE_Sodium_Core_Util
+{
+    /**
+     * @var SplFixedArray
+     */
+    public static $iv;
+
+    /**
+     * @var array<int, array<int, int>>
+     */
+    public static $sigma = array(
+        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
+        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
+        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
+        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
+        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
+        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
+        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
+        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
+        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
+        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
+        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
+    );
+
+    const BLOCKBYTES = 128;
+    const OUTBYTES   = 64;
+    const KEYBYTES   = 64;
+
+    /**
+     * Turn two 32-bit integers into a fixed array representing a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $high
+     * @param int $low
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function new64($high, $low)
+    {
+        return ParagonIE_Sodium_Core32_Int64::fromInts($low, $high);
+    }
+
+    /**
+     * Convert an arbitrary number into an SplFixedArray of two 32-bit integers
+     * that represents a 64-bit integer.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $num
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function to64($num)
+    {
+        list($hi, $lo) = self::numericTo64BitInteger($num);
+        return self::new64($hi, $lo);
+    }
+
+    /**
+     * Adds two 64-bit integers together, returning their sum as a SplFixedArray
+     * containing two 32-bit integers (representing a 64-bit integer).
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $x
+     * @param ParagonIE_Sodium_Core32_Int64 $y
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    protected static function add64($x, $y)
+    {
+        return $x->addInt64($y);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $x
+     * @param ParagonIE_Sodium_Core32_Int64 $y
+     * @param ParagonIE_Sodium_Core32_Int64 $z
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public static function add364($x, $y, $z)
+    {
+        return $x->addInt64($y)->addInt64($z);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $x
+     * @param ParagonIE_Sodium_Core32_Int64 $y
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws TypeError
+     */
+    public static function xor64(ParagonIE_Sodium_Core32_Int64 $x, ParagonIE_Sodium_Core32_Int64 $y)
+    {
+        return $x->xorInt64($y);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $x
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function rotr64(ParagonIE_Sodium_Core32_Int64 $x, $c)
+    {
+        return $x->rotateRight($c);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $i
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function load64($x, $i)
+    {
+        /** @var int $l */
+        $l = $x[$i]   | ($x[$i+1]<<8) | ($x[$i+2]<<16) | ($x[$i+3]<<24);
+        /** @var int $h */
+        $h = $x[$i+4] | ($x[$i+5]<<8) | ($x[$i+6]<<16) | ($x[$i+7]<<24);
+        return self::new64($h, $l);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $x
+     * @param int $i
+     * @param ParagonIE_Sodium_Core32_Int64 $u
+     * @return void
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     */
+    public static function store64(SplFixedArray $x, $i, ParagonIE_Sodium_Core32_Int64 $u)
+    {
+        $v = clone $u;
+        $maxLength = $x->getSize() - 1;
+        for ($j = 0; $j < 8; ++$j) {
+            $k = 3 - ($j >> 1);
+            $x[$i] = $v->limbs[$k] & 0xff;
+            if (++$i > $maxLength) {
+                return;
+            }
+            $v->limbs[$k] >>= 8;
+        }
+    }
+
+    /**
+     * This just sets the $iv static variable.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function pseudoConstructor()
+    {
+        static $called = false;
+        if ($called) {
+            return;
+        }
+        self::$iv = new SplFixedArray(8);
+        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
+        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
+        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
+        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
+        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
+        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
+        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
+        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
+
+        $called = true;
+    }
+
+    /**
+     * Returns a fresh BLAKE2 context.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return SplFixedArray
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function context()
+    {
+        $ctx    = new SplFixedArray(5);
+        $ctx[0] = new SplFixedArray(8);   // h
+        $ctx[1] = new SplFixedArray(2);   // t
+        $ctx[2] = new SplFixedArray(2);   // f
+        $ctx[3] = new SplFixedArray(256); // buf
+        $ctx[4] = 0;                      // buflen
+
+        for ($i = 8; $i--;) {
+            $ctx[0][$i] = self::$iv[$i];
+        }
+        for ($i = 256; $i--;) {
+            $ctx[3][$i] = 0;
+        }
+
+        $zero = self::new64(0, 0);
+        $ctx[1][0] = $zero;
+        $ctx[1][1] = $zero;
+        $ctx[2][0] = $zero;
+        $ctx[2][1] = $zero;
+
+        return $ctx;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $buf
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedAssignment
+     */
+    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+    {
+        $m = new SplFixedArray(16);
+        $v = new SplFixedArray(16);
+
+        for ($i = 16; $i--;) {
+            $m[$i] = self::load64($buf, $i << 3);
+        }
+
+        for ($i = 8; $i--;) {
+            $v[$i] = $ctx[0][$i];
+        }
+
+        $v[ 8] = self::$iv[0];
+        $v[ 9] = self::$iv[1];
+        $v[10] = self::$iv[2];
+        $v[11] = self::$iv[3];
+
+        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
+        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
+        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
+        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
+
+        for ($r = 0; $r < 12; ++$r) {
+            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
+            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
+            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
+            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
+            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
+            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
+            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
+            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
+        }
+
+        for ($i = 8; $i--;) {
+            $ctx[0][$i] = self::xor64(
+                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
+            );
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $r
+     * @param int $i
+     * @param int $a
+     * @param int $b
+     * @param int $c
+     * @param int $d
+     * @param SplFixedArray $v
+     * @param SplFixedArray $m
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayOffset
+     */
+    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
+    {
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
+        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
+        $v[$c] = self::add64($v[$c], $v[$d]);
+        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
+        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
+        $v[$c] = self::add64($v[$c], $v[$d]);
+        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
+        return $v;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param int $inc
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     */
+    public static function increment_counter($ctx, $inc)
+    {
+        if ($inc < 0) {
+            throw new SodiumException('Increasing by a negative number makes no sense.');
+        }
+        $t = self::to64($inc);
+        # S->t is $ctx[1] in our implementation
+
+        # S->t[0] = ( uint64_t )( t >> 0 );
+        $ctx[1][0] = self::add64($ctx[1][0], $t);
+
+        # S->t[1] += ( S->t[0] < inc );
+        if (!($ctx[1][0] instanceof ParagonIE_Sodium_Core32_Int64)) {
+            throw new TypeError('Not an int64');
+        }
+        /** @var ParagonIE_Sodium_Core32_Int64 $c*/
+        $c = $ctx[1][0];
+        if ($c->isLessThanInt($inc)) {
+            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $p
+     * @param int $plen
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress MixedMethodCall
+     * @psalm-suppress MixedOperand
+     */
+    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+    {
+        self::pseudoConstructor();
+
+        $offset = 0;
+        while ($plen > 0) {
+            $left = $ctx[4];
+            $fill = 256 - $left;
+
+            if ($plen > $fill) {
+                # memcpy( S->buf + left, in, fill ); /* Fill buffer */
+                for ($i = $fill; $i--;) {
+                    $ctx[3][$i + $left] = $p[$i + $offset];
+                }
+
+                # S->buflen += fill;
+                $ctx[4] += $fill;
+
+                # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+                self::increment_counter($ctx, 128);
+
+                # blake2b_compress( S, S->buf ); /* Compress */
+                self::compress($ctx, $ctx[3]);
+
+                # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
+                for ($i = 128; $i--;) {
+                    $ctx[3][$i] = $ctx[3][$i + 128];
+                }
+
+                # S->buflen -= BLAKE2B_BLOCKBYTES;
+                $ctx[4] -= 128;
+
+                # in += fill;
+                $offset += $fill;
+
+                # inlen -= fill;
+                $plen -= $fill;
+            } else {
+                for ($i = $plen; $i--;) {
+                    $ctx[3][$i + $left] = $p[$i + $offset];
+                }
+                $ctx[4] += $plen;
+                $offset += $plen;
+                $plen -= $plen;
+            }
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $ctx
+     * @param SplFixedArray $out
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress MixedMethodCall
+     * @psalm-suppress MixedOperand
+     */
+    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+    {
+        self::pseudoConstructor();
+        if ($ctx[4] > 128) {
+            self::increment_counter($ctx, 128);
+            self::compress($ctx, $ctx[3]);
+            $ctx[4] -= 128;
+            if ($ctx[4] > 128) {
+                throw new SodiumException('Failed to assert that buflen <= 128 bytes');
+            }
+            for ($i = $ctx[4]; $i--;) {
+                $ctx[3][$i] = $ctx[3][$i + 128];
+            }
+        }
+
+        self::increment_counter($ctx, $ctx[4]);
+        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
+
+        for ($i = 256 - $ctx[4]; $i--;) {
+            /** @var int $i */
+            $ctx[3][$i + $ctx[4]] = 0;
+        }
+
+        self::compress($ctx, $ctx[3]);
+
+        $i = (int) (($out->getSize() - 1) / 8);
+        for (; $i >= 0; --$i) {
+            self::store64($out, $i << 3, $ctx[0][$i]);
+        }
+        return $out;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray|null $key
+     * @param int $outlen
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function init($key = null, $outlen = 64)
+    {
+        self::pseudoConstructor();
+        $klen = 0;
+
+        if ($key !== null) {
+            if (count($key) > 64) {
+                throw new SodiumException('Invalid key size');
+            }
+            $klen = count($key);
+        }
+
+        if ($outlen > 64) {
+            throw new SodiumException('Invalid output size');
+        }
+
+        $ctx = self::context();
+
+        $p = new SplFixedArray(64);
+        for ($i = 64; --$i;) {
+            $p[$i] = 0;
+        }
+
+        $p[0] = $outlen; // digest_length
+        $p[1] = $klen;   // key_length
+        $p[2] = 1;       // fanout
+        $p[3] = 1;       // depth
+
+        $ctx[0][0] = self::xor64(
+            $ctx[0][0],
+            self::load64($p, 0)
+        );
+
+        if ($klen > 0 && $key instanceof SplFixedArray) {
+            $block = new SplFixedArray(128);
+            for ($i = 128; $i--;) {
+                $block[$i] = 0;
+            }
+            for ($i = $klen; $i--;) {
+                $block[$i] = $key[$i];
+            }
+            self::update($ctx, $block, 128);
+        }
+
+        return $ctx;
+    }
+
+    /**
+     * Convert a string into an SplFixedArray of integers
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $str
+     * @return SplFixedArray
+     */
+    public static function stringToSplFixedArray($str = '')
+    {
+        $values = unpack('C*', $str);
+        return SplFixedArray::fromArray(array_values($values));
+    }
+
+    /**
+     * Convert an SplFixedArray of integers into a string
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray $a
+     * @return string
+     */
+    public static function SplFixedArrayToString(SplFixedArray $a)
+    {
+        /**
+         * @var array<mixed, int>
+         */
+        $arr = $a->toArray();
+        $c = $a->count();
+        array_unshift($arr, str_repeat('C', $c));
+        return (string) (call_user_func_array('pack', $arr));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param SplFixedArray[SplFixedArray] $ctx
+     * @return string
+     * @throws TypeError
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function contextToString(SplFixedArray $ctx)
+    {
+        $str = '';
+        /** @var array<int, ParagonIE_Sodium_Core32_Int64> $ctxA */
+        $ctxA = $ctx[0]->toArray();
+
+        # uint64_t h[8];
+        for ($i = 0; $i < 8; ++$i) {
+            if (!($ctxA[$i] instanceof ParagonIE_Sodium_Core32_Int64)) {
+                throw new TypeError('Not an instance of Int64');
+            }
+            /** @var ParagonIE_Sodium_Core32_Int64 $ctxAi */
+            $ctxAi = $ctxA[$i];
+            $str .= $ctxAi->toString();
+        }
+
+        # uint64_t t[2];
+        # uint64_t f[2];
+        for ($i = 1; $i < 3; ++$i) {
+            /** @var array<int, ParagonIE_Sodium_Core32_Int64> $ctxA */
+            $ctxA = $ctx[$i]->toArray();
+            /** @var ParagonIE_Sodium_Core32_Int64 $ctxA1 */
+            $ctxA1 = $ctxA[0];
+            /** @var ParagonIE_Sodium_Core32_Int64 $ctxA2 */
+            $ctxA2 = $ctxA[1];
+
+            $str .= $ctxA1->toString();
+            $str .= $ctxA2->toString();
+        }
+
+        # uint8_t buf[2 * 128];
+        $str .= self::SplFixedArrayToString($ctx[3]);
+
+        # size_t buflen;
+        $str .= implode('', array(
+            self::intToChr($ctx[4] & 0xff),
+            self::intToChr(($ctx[4] >> 8) & 0xff),
+            self::intToChr(($ctx[4] >> 16) & 0xff),
+            self::intToChr(($ctx[4] >> 24) & 0xff),
+            self::intToChr(($ctx[4] >> 32) & 0xff),
+            self::intToChr(($ctx[4] >> 40) & 0xff),
+            self::intToChr(($ctx[4] >> 48) & 0xff),
+            self::intToChr(($ctx[4] >> 56) & 0xff)
+        ));
+        # uint8_t last_node;
+        return $str . "\x00";
+    }
+
+    /**
+     * Creates an SplFixedArray containing other SplFixedArray elements, from
+     * a string (compatible with \Sodium\crypto_generichash_{init, update, final})
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $string
+     * @return SplFixedArray
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayAssignment
+     */
+    public static function stringToContext($string)
+    {
+        $ctx = self::context();
+
+        # uint64_t h[8];
+        for ($i = 0; $i < 8; ++$i) {
+            $ctx[0][$i] = ParagonIE_Sodium_Core32_Int64::fromString(
+                self::substr($string, (($i << 3) + 0), 8)
+            );
+        }
+
+        # uint64_t t[2];
+        # uint64_t f[2];
+        for ($i = 1; $i < 3; ++$i) {
+            $ctx[$i][1] = ParagonIE_Sodium_Core32_Int64::fromString(
+                self::substr($string, 72 + (($i - 1) << 4), 8)
+            );
+            $ctx[$i][0] = ParagonIE_Sodium_Core32_Int64::fromString(
+                self::substr($string, 64 + (($i - 1) << 4), 8)
+            );
+        }
+
+        # uint8_t buf[2 * 128];
+        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
+
+
+        # uint8_t buf[2 * 128];
+        $int = 0;
+        for ($i = 0; $i < 8; ++$i) {
+            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
+        }
+        $ctx[4] = $int;
+
+        return $ctx;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20.php
new file mode 100644
index 00000000..6f8c0bff
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20.php
@@ -0,0 +1,400 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_ChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_ChaCha20
+ */
+class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util
+{
+    /**
+     * The ChaCha20 quarter round function. Works on four 32-bit integers.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Int32 $a
+     * @param ParagonIE_Sodium_Core32_Int32 $b
+     * @param ParagonIE_Sodium_Core32_Int32 $c
+     * @param ParagonIE_Sodium_Core32_Int32 $d
+     * @return array<int, ParagonIE_Sodium_Core32_Int32>
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function quarterRound(
+        ParagonIE_Sodium_Core32_Int32 $a,
+        ParagonIE_Sodium_Core32_Int32 $b,
+        ParagonIE_Sodium_Core32_Int32 $c,
+        ParagonIE_Sodium_Core32_Int32 $d
+    ) {
+        /** @var ParagonIE_Sodium_Core32_Int32 $a */
+        /** @var ParagonIE_Sodium_Core32_Int32 $b */
+        /** @var ParagonIE_Sodium_Core32_Int32 $c */
+        /** @var ParagonIE_Sodium_Core32_Int32 $d */
+
+        # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
+        $a = $a->addInt32($b);
+        $d = $d->xorInt32($a)->rotateLeft(16);
+
+        # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
+        $c = $c->addInt32($d);
+        $b = $b->xorInt32($c)->rotateLeft(12);
+
+        # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
+        $a = $a->addInt32($b);
+        $d = $d->xorInt32($a)->rotateLeft(8);
+
+        # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+        $c = $c->addInt32($d);
+        $b = $b->xorInt32($c)->rotateLeft(7);
+
+        return array($a, $b, $c, $d);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx
+     * @param string $message
+     *
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function encryptBytes(
+        ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx,
+        $message = ''
+    ) {
+        $bytes = self::strlen($message);
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x2 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x3 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x4 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x5 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x6 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x7 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x8 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x9 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x10 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x11 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x12 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x13 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x14 */
+        /** @var ParagonIE_Sodium_Core32_Int32 $x15 */
+
+        /*
+        j0 = ctx->input[0];
+        j1 = ctx->input[1];
+        j2 = ctx->input[2];
+        j3 = ctx->input[3];
+        j4 = ctx->input[4];
+        j5 = ctx->input[5];
+        j6 = ctx->input[6];
+        j7 = ctx->input[7];
+        j8 = ctx->input[8];
+        j9 = ctx->input[9];
+        j10 = ctx->input[10];
+        j11 = ctx->input[11];
+        j12 = ctx->input[12];
+        j13 = ctx->input[13];
+        j14 = ctx->input[14];
+        j15 = ctx->input[15];
+        */
+        /** @var ParagonIE_Sodium_Core32_Int32 $j0 */
+        $j0  = $ctx[0];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j1 */
+        $j1  = $ctx[1];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j2 */
+        $j2  = $ctx[2];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j3 */
+        $j3  = $ctx[3];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j4 */
+        $j4  = $ctx[4];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j5 */
+        $j5  = $ctx[5];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j6 */
+        $j6  = $ctx[6];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j7 */
+        $j7  = $ctx[7];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j8 */
+        $j8  = $ctx[8];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j9 */
+        $j9  = $ctx[9];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j10 */
+        $j10 = $ctx[10];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j11 */
+        $j11 = $ctx[11];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
+        $j12 = $ctx[12];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j13 */
+        $j13 = $ctx[13];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j14 */
+        $j14 = $ctx[14];
+        /** @var ParagonIE_Sodium_Core32_Int32 $j15 */
+        $j15 = $ctx[15];
+
+        $c = '';
+        for (;;) {
+            if ($bytes < 64) {
+                $message .= str_repeat("\x00", 64 - $bytes);
+            }
+
+            $x0 =  clone $j0;
+            $x1 =  clone $j1;
+            $x2 =  clone $j2;
+            $x3 =  clone $j3;
+            $x4 =  clone $j4;
+            $x5 =  clone $j5;
+            $x6 =  clone $j6;
+            $x7 =  clone $j7;
+            $x8 =  clone $j8;
+            $x9 =  clone $j9;
+            $x10 = clone $j10;
+            $x11 = clone $j11;
+            $x12 = clone $j12;
+            $x13 = clone $j13;
+            $x14 = clone $j14;
+            $x15 = clone $j15;
+
+            # for (i = 20; i > 0; i -= 2) {
+            for ($i = 20; $i > 0; $i -= 2) {
+                # QUARTERROUND( x0,  x4,  x8,  x12)
+                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+
+                # QUARTERROUND( x1,  x5,  x9,  x13)
+                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+
+                # QUARTERROUND( x2,  x6,  x10,  x14)
+                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+
+                # QUARTERROUND( x3,  x7,  x11,  x15)
+                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+
+                # QUARTERROUND( x0,  x5,  x10,  x15)
+                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+
+                # QUARTERROUND( x1,  x6,  x11,  x12)
+                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+
+                # QUARTERROUND( x2,  x7,  x8,  x13)
+                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+
+                # QUARTERROUND( x3,  x4,  x9,  x14)
+                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            }
+            /*
+            x0 = PLUS(x0, j0);
+            x1 = PLUS(x1, j1);
+            x2 = PLUS(x2, j2);
+            x3 = PLUS(x3, j3);
+            x4 = PLUS(x4, j4);
+            x5 = PLUS(x5, j5);
+            x6 = PLUS(x6, j6);
+            x7 = PLUS(x7, j7);
+            x8 = PLUS(x8, j8);
+            x9 = PLUS(x9, j9);
+            x10 = PLUS(x10, j10);
+            x11 = PLUS(x11, j11);
+            x12 = PLUS(x12, j12);
+            x13 = PLUS(x13, j13);
+            x14 = PLUS(x14, j14);
+            x15 = PLUS(x15, j15);
+            */
+            $x0 = $x0->addInt32($j0);
+            $x1 = $x1->addInt32($j1);
+            $x2 = $x2->addInt32($j2);
+            $x3 = $x3->addInt32($j3);
+            $x4 = $x4->addInt32($j4);
+            $x5 = $x5->addInt32($j5);
+            $x6 = $x6->addInt32($j6);
+            $x7 = $x7->addInt32($j7);
+            $x8 = $x8->addInt32($j8);
+            $x9 = $x9->addInt32($j9);
+            $x10 = $x10->addInt32($j10);
+            $x11 = $x11->addInt32($j11);
+            $x12 = $x12->addInt32($j12);
+            $x13 = $x13->addInt32($j13);
+            $x14 = $x14->addInt32($j14);
+            $x15 = $x15->addInt32($j15);
+
+            /*
+            x0 = XOR(x0, LOAD32_LE(m + 0));
+            x1 = XOR(x1, LOAD32_LE(m + 4));
+            x2 = XOR(x2, LOAD32_LE(m + 8));
+            x3 = XOR(x3, LOAD32_LE(m + 12));
+            x4 = XOR(x4, LOAD32_LE(m + 16));
+            x5 = XOR(x5, LOAD32_LE(m + 20));
+            x6 = XOR(x6, LOAD32_LE(m + 24));
+            x7 = XOR(x7, LOAD32_LE(m + 28));
+            x8 = XOR(x8, LOAD32_LE(m + 32));
+            x9 = XOR(x9, LOAD32_LE(m + 36));
+            x10 = XOR(x10, LOAD32_LE(m + 40));
+            x11 = XOR(x11, LOAD32_LE(m + 44));
+            x12 = XOR(x12, LOAD32_LE(m + 48));
+            x13 = XOR(x13, LOAD32_LE(m + 52));
+            x14 = XOR(x14, LOAD32_LE(m + 56));
+            x15 = XOR(x15, LOAD32_LE(m + 60));
+            */
+            $x0  =  $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  0, 4)));
+            $x1  =  $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  4, 4)));
+            $x2  =  $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  8, 4)));
+            $x3  =  $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)));
+            $x4  =  $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4)));
+            $x5  =  $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4)));
+            $x6  =  $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4)));
+            $x7  =  $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4)));
+            $x8  =  $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4)));
+            $x9  =  $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4)));
+            $x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4)));
+            $x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4)));
+            $x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4)));
+            $x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4)));
+            $x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4)));
+            $x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4)));
+
+            /*
+                j12 = PLUSONE(j12);
+                if (!j12) {
+                    j13 = PLUSONE(j13);
+                }
+             */
+            /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
+            $j12 = $j12->addInt(1);
+            if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) {
+                $j13 = $j13->addInt(1);
+            }
+
+            /*
+            STORE32_LE(c + 0, x0);
+            STORE32_LE(c + 4, x1);
+            STORE32_LE(c + 8, x2);
+            STORE32_LE(c + 12, x3);
+            STORE32_LE(c + 16, x4);
+            STORE32_LE(c + 20, x5);
+            STORE32_LE(c + 24, x6);
+            STORE32_LE(c + 28, x7);
+            STORE32_LE(c + 32, x8);
+            STORE32_LE(c + 36, x9);
+            STORE32_LE(c + 40, x10);
+            STORE32_LE(c + 44, x11);
+            STORE32_LE(c + 48, x12);
+            STORE32_LE(c + 52, x13);
+            STORE32_LE(c + 56, x14);
+            STORE32_LE(c + 60, x15);
+            */
+
+            $block = $x0->toReverseString() .
+                $x1->toReverseString() .
+                $x2->toReverseString() .
+                $x3->toReverseString() .
+                $x4->toReverseString() .
+                $x5->toReverseString() .
+                $x6->toReverseString() .
+                $x7->toReverseString() .
+                $x8->toReverseString() .
+                $x9->toReverseString() .
+                $x10->toReverseString() .
+                $x11->toReverseString() .
+                $x12->toReverseString() .
+                $x13->toReverseString() .
+                $x14->toReverseString() .
+                $x15->toReverseString();
+
+            /* Partial block */
+            if ($bytes < 64) {
+                $c .= self::substr($block, 0, $bytes);
+                break;
+            }
+
+            /* Full block */
+            $c .= $block;
+            $bytes -= 64;
+            if ($bytes <= 0) {
+                break;
+            }
+            $message = self::substr($message, 64);
+        }
+        /* end for(;;) loop */
+
+        $ctx[12] = $j12;
+        $ctx[13] = $j13;
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function stream($len = 64, $nonce = '', $key = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ietfStream($len, $nonce = '', $key = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
+            $message
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
+            $message
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php
new file mode 100644
index 00000000..996acf23
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php
@@ -0,0 +1,126 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_ChaCha20_Ctx
+ */
+class ParagonIE_Sodium_Core32_ChaCha20_Ctx extends ParagonIE_Sodium_Core32_Util implements ArrayAccess
+{
+    /**
+     * @var SplFixedArray internally, <int, ParagonIE_Sodium_Core32_Int32>
+     */
+    protected $container;
+
+    /**
+     * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key     ChaCha20 key.
+     * @param string $iv      Initialization Vector (a.k.a. nonce).
+     * @param string $counter The initial counter value.
+     *                        Defaults to 8 0x00 bytes.
+     * @throws InvalidArgumentException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function __construct($key = '', $iv = '', $counter = '')
+    {
+        if (self::strlen($key) !== 32) {
+            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
+        }
+        if (self::strlen($iv) !== 8) {
+            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
+        }
+        $this->container = new SplFixedArray(16);
+
+        /* "expand 32-byte k" as per ChaCha20 spec */
+        $this->container[0]  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+        $this->container[1]  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+        $this->container[2]  = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+        $this->container[3]  = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+
+        $this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
+        $this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
+        $this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
+        $this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
+        $this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
+        $this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
+        $this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
+        $this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
+
+        if (empty($counter)) {
+            $this->container[12] = new ParagonIE_Sodium_Core32_Int32();
+            $this->container[13] = new ParagonIE_Sodium_Core32_Int32();
+        } else {
+            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
+            $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 4, 4));
+        }
+        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
+        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $offset
+     * @param int|ParagonIE_Sodium_Core32_Int32 $value
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!is_int($offset)) {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        if ($value instanceof ParagonIE_Sodium_Core32_Int32) {
+            /*
+        } elseif (is_int($value)) {
+            $value = ParagonIE_Sodium_Core32_Int32::fromInt($value);
+            */
+        } else {
+            throw new InvalidArgumentException('Expected an integer');
+        }
+        $this->container[$offset] = $value;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return bool
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return void
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return mixed|null
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetGet($offset)
+    {
+        return isset($this->container[$offset])
+            ? $this->container[$offset]
+            : null;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php
new file mode 100644
index 00000000..eea08de8
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php
@@ -0,0 +1,39 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx
+ */
+class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core32_ChaCha20_Ctx
+{
+    /**
+     * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key     ChaCha20 key.
+     * @param string $iv      Initialization Vector (a.k.a. nonce).
+     * @param string $counter The initial counter value.
+     *                        Defaults to 4 0x00 bytes.
+     * @throws InvalidArgumentException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function __construct($key = '', $iv = '', $counter = '')
+    {
+        if (self::strlen($iv) !== 12) {
+            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
+        }
+        parent::__construct($key, self::substr($iv, 0, 8), $counter);
+
+        if (!empty($counter)) {
+            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
+        }
+        $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
+        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
+        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 8, 4));
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php
new file mode 100644
index 00000000..351a2f29
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519.php
@@ -0,0 +1,3543 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519
+ *
+ * Implements Curve25519 core functions
+ *
+ * Based on the ref10 curve25519 code provided by libsodium
+ *
+ * @ref https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
+ */
+abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core32_Curve25519_H
+{
+    /**
+     * Get a field element of size 10 with a value of 0
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_0()
+    {
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array(
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32()
+            )
+        );
+    }
+
+    /**
+     * Get a field element of size 10 with a value of 1
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_1()
+    {
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array(
+                ParagonIE_Sodium_Core32_Int32::fromInt(1),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32(),
+                new ParagonIE_Sodium_Core32_Int32()
+            )
+        );
+    }
+
+    /**
+     * Add two field elements.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_add(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $g
+    ) {
+        $arr = array();
+        for ($i = 0; $i < 10; ++$i) {
+            $arr[$i] = $f[$i]->addInt32($g[$i]);
+        }
+        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $arr */
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($arr);
+    }
+
+    /**
+     * Constant-time conditional move.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+     * @param int $b
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_cmov(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $g,
+        $b = 0
+    ) {
+        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
+        $h = array();
+        for ($i = 0; $i < 10; ++$i) {
+            if (!($f[$i] instanceof ParagonIE_Sodium_Core32_Int32)) {
+                throw new TypeError('Expected Int32');
+            }
+            if (!($g[$i] instanceof ParagonIE_Sodium_Core32_Int32)) {
+                throw new TypeError('Expected Int32');
+            }
+            $h[$i] = $f[$i]->xorInt32(
+                $f[$i]->xorInt32($g[$i])->mask($b)
+            );
+        }
+        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
+    }
+
+    /**
+     * Create a copy of a field element.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        $h = clone $f;
+        return $h;
+    }
+
+    /**
+     * Give: 32-byte string.
+     * Receive: A field element object to use for internal calculations.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_frombytes($s)
+    {
+        if (self::strlen($s) !== 32) {
+            throw new RangeException('Expected a 32-byte string.');
+        }
+        /** @var ParagonIE_Sodium_Core32_Int32 $h0 */
+        $h0 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_4($s)
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h1 */
+        $h1 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 4, 3)) << 6
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h2 */
+        $h2 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 7, 3)) << 5
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h3 */
+        $h3 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 10, 3)) << 3
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h4 */
+        $h4 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 13, 3)) << 2
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h5 */
+        $h5 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_4(self::substr($s, 16, 4))
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h6 */
+        $h6 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 20, 3)) << 7
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h7 */
+        $h7 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 23, 3)) << 5
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h8 */
+        $h8 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            self::load_3(self::substr($s, 26, 3)) << 4
+        );
+        /** @var ParagonIE_Sodium_Core32_Int32 $h9 */
+        $h9 = ParagonIE_Sodium_Core32_Int32::fromInt(
+            (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2
+        );
+
+        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+        $h0 = $h0->addInt32($carry9->mulInt(19, 5));
+        $h9 = $h9->subInt32($carry9->shiftLeft(25));
+
+        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+        $h2 = $h2->addInt32($carry1);
+        $h1 = $h1->subInt32($carry1->shiftLeft(25));
+
+        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+        $h4 = $h4->addInt32($carry3);
+        $h3 = $h3->subInt32($carry3->shiftLeft(25));
+
+        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+        $h6 = $h6->addInt32($carry5);
+        $h5 = $h5->subInt32($carry5->shiftLeft(25));
+
+        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+        $h8 = $h8->addInt32($carry7);
+        $h7 = $h7->subInt32($carry7->shiftLeft(25));
+
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt32($carry0);
+        $h0 = $h0->subInt32($carry0->shiftLeft(26));
+
+        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+        $h3 = $h3->addInt32($carry2);
+        $h2 = $h2->subInt32($carry2->shiftLeft(26));
+
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt32($carry4);
+        $h4 = $h4->subInt32($carry4->shiftLeft(26));
+
+        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+        $h7 = $h7->addInt32($carry6);
+        $h6 = $h6->subInt32($carry6->shiftLeft(26));
+
+        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+        $h9 = $h9->addInt32($carry8);
+        $h8 = $h8->subInt32($carry8->shiftLeft(26));
+
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array($h0, $h1, $h2,$h3, $h4, $h5, $h6, $h7, $h8, $h9)
+        );
+    }
+
+    /**
+     * Convert a field element to a byte string.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $h
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h)
+    {
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64[] $f
+         * @var ParagonIE_Sodium_Core32_Int64 $q
+         */
+        $f = array();
+
+        for ($i = 0; $i < 10; ++$i) {
+            $f[$i] = $h[$i]->toInt64();
+        }
+
+        $q = $f[9]->mulInt(19, 5)->addInt(1 << 14)->shiftRight(25)
+            ->addInt64($f[0])->shiftRight(26)
+            ->addInt64($f[1])->shiftRight(25)
+            ->addInt64($f[2])->shiftRight(26)
+            ->addInt64($f[3])->shiftRight(25)
+            ->addInt64($f[4])->shiftRight(26)
+            ->addInt64($f[5])->shiftRight(25)
+            ->addInt64($f[6])->shiftRight(26)
+            ->addInt64($f[7])->shiftRight(25)
+            ->addInt64($f[8])->shiftRight(26)
+            ->addInt64($f[9])->shiftRight(25);
+
+        $f[0] = $f[0]->addInt64($q->mulInt(19, 5));
+
+        $carry0 = $f[0]->shiftRight(26);
+        $f[1] = $f[1]->addInt64($carry0);
+        $f[0] = $f[0]->subInt64($carry0->shiftLeft(26));
+
+        $carry1 = $f[1]->shiftRight(25);
+        $f[2] = $f[2]->addInt64($carry1);
+        $f[1] = $f[1]->subInt64($carry1->shiftLeft(25));
+
+        $carry2 = $f[2]->shiftRight(26);
+        $f[3] = $f[3]->addInt64($carry2);
+        $f[2] = $f[2]->subInt64($carry2->shiftLeft(26));
+
+        $carry3 = $f[3]->shiftRight(25);
+        $f[4] = $f[4]->addInt64($carry3);
+        $f[3] = $f[3]->subInt64($carry3->shiftLeft(25));
+
+        $carry4 = $f[4]->shiftRight(26);
+        $f[5] = $f[5]->addInt64($carry4);
+        $f[4] = $f[4]->subInt64($carry4->shiftLeft(26));
+
+        $carry5 = $f[5]->shiftRight(25);
+        $f[6] = $f[6]->addInt64($carry5);
+        $f[5] = $f[5]->subInt64($carry5->shiftLeft(25));
+
+        $carry6 = $f[6]->shiftRight(26);
+        $f[7] = $f[7]->addInt64($carry6);
+        $f[6] = $f[6]->subInt64($carry6->shiftLeft(26));
+
+        $carry7 = $f[7]->shiftRight(25);
+        $f[8] = $f[8]->addInt64($carry7);
+        $f[7] = $f[7]->subInt64($carry7->shiftLeft(25));
+
+        $carry8 = $f[8]->shiftRight(26);
+        $f[9] = $f[9]->addInt64($carry8);
+        $f[8] = $f[8]->subInt64($carry8->shiftLeft(26));
+
+        $carry9 = $f[9]->shiftRight(25);
+        $f[9] = $f[9]->subInt64($carry9->shiftLeft(25));
+
+        /** @var int $h0 */
+        $h0 = $f[0]->toInt32()->toInt();
+        /** @var int $h1 */
+        $h1 = $f[1]->toInt32()->toInt();
+        /** @var int $h2 */
+        $h2 = $f[2]->toInt32()->toInt();
+        /** @var int $h3 */
+        $h3 = $f[3]->toInt32()->toInt();
+        /** @var int $h4 */
+        $h4 = $f[4]->toInt32()->toInt();
+        /** @var int $h5 */
+        $h5 = $f[5]->toInt32()->toInt();
+        /** @var int $h6 */
+        $h6 = $f[6]->toInt32()->toInt();
+        /** @var int $h7 */
+        $h7 = $f[7]->toInt32()->toInt();
+        /** @var int $h8 */
+        $h8 = $f[8]->toInt32()->toInt();
+        /** @var int $h9 */
+        $h9 = $f[9]->toInt32()->toInt();
+
+        /**
+         * @var array<int, int>
+         */
+        $s = array(
+            (int) (($h0 >> 0) & 0xff),
+            (int) (($h0 >> 8) & 0xff),
+            (int) (($h0 >> 16) & 0xff),
+            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
+            (int) (($h1 >> 6) & 0xff),
+            (int) (($h1 >> 14) & 0xff),
+            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
+            (int) (($h2 >> 5) & 0xff),
+            (int) (($h2 >> 13) & 0xff),
+            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
+            (int) (($h3 >> 3) & 0xff),
+            (int) (($h3 >> 11) & 0xff),
+            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
+            (int) (($h4 >> 2) & 0xff),
+            (int) (($h4 >> 10) & 0xff),
+            (int) (($h4 >> 18) & 0xff),
+            (int) (($h5 >> 0) & 0xff),
+            (int) (($h5 >> 8) & 0xff),
+            (int) (($h5 >> 16) & 0xff),
+            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
+            (int) (($h6 >> 7) & 0xff),
+            (int) (($h6 >> 15) & 0xff),
+            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
+            (int) (($h7 >> 5) & 0xff),
+            (int) (($h7 >> 13) & 0xff),
+            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
+            (int) (($h8 >> 4) & 0xff),
+            (int) (($h8 >> 12) & 0xff),
+            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
+            (int) (($h9 >> 2) & 0xff),
+            (int) (($h9 >> 10) & 0xff),
+            (int) (($h9 >> 18) & 0xff)
+        );
+        return self::intArrayToString($s);
+    }
+
+    /**
+     * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return int
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        $str = self::fe_tobytes($f);
+        return (int) (self::chrToInt($str[0]) & 1);
+    }
+
+    /**
+     * Returns 0 if this field element results in all NUL bytes.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        static $zero;
+        if ($zero === null) {
+            $zero = str_repeat("\x00", 32);
+        }
+        /** @var string $str */
+        $str = self::fe_tobytes($f);
+        /** @var string $zero */
+        return !self::verify_32($str, $zero);
+    }
+
+    /**
+     * Multiply two field elements
+     *
+     * h = f * g
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @security Is multiplication a source of timing leaks? If so, can we do
+     *           anything to prevent that from happening?
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_mul(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $g
+    ) {
+        /**
+         * @var ParagonIE_Sodium_Core32_Int32[] $f
+         * @var ParagonIE_Sodium_Core32_Int32[] $g
+         * @var ParagonIE_Sodium_Core32_Int64 $f0
+         * @var ParagonIE_Sodium_Core32_Int64 $f1
+         * @var ParagonIE_Sodium_Core32_Int64 $f2
+         * @var ParagonIE_Sodium_Core32_Int64 $f3
+         * @var ParagonIE_Sodium_Core32_Int64 $f4
+         * @var ParagonIE_Sodium_Core32_Int64 $f5
+         * @var ParagonIE_Sodium_Core32_Int64 $f6
+         * @var ParagonIE_Sodium_Core32_Int64 $f7
+         * @var ParagonIE_Sodium_Core32_Int64 $f8
+         * @var ParagonIE_Sodium_Core32_Int64 $f9
+         * @var ParagonIE_Sodium_Core32_Int64 $g0
+         * @var ParagonIE_Sodium_Core32_Int64 $g1
+         * @var ParagonIE_Sodium_Core32_Int64 $g2
+         * @var ParagonIE_Sodium_Core32_Int64 $g3
+         * @var ParagonIE_Sodium_Core32_Int64 $g4
+         * @var ParagonIE_Sodium_Core32_Int64 $g5
+         * @var ParagonIE_Sodium_Core32_Int64 $g6
+         * @var ParagonIE_Sodium_Core32_Int64 $g7
+         * @var ParagonIE_Sodium_Core32_Int64 $g8
+         * @var ParagonIE_Sodium_Core32_Int64 $g9
+         */
+        $f0 = $f[0]->toInt64();
+        $f1 = $f[1]->toInt64();
+        $f2 = $f[2]->toInt64();
+        $f3 = $f[3]->toInt64();
+        $f4 = $f[4]->toInt64();
+        $f5 = $f[5]->toInt64();
+        $f6 = $f[6]->toInt64();
+        $f7 = $f[7]->toInt64();
+        $f8 = $f[8]->toInt64();
+        $f9 = $f[9]->toInt64();
+        $g0 = $g[0]->toInt64();
+        $g1 = $g[1]->toInt64();
+        $g2 = $g[2]->toInt64();
+        $g3 = $g[3]->toInt64();
+        $g4 = $g[4]->toInt64();
+        $g5 = $g[5]->toInt64();
+        $g6 = $g[6]->toInt64();
+        $g7 = $g[7]->toInt64();
+        $g8 = $g[8]->toInt64();
+        $g9 = $g[9]->toInt64();
+        $g1_19 = $g1->mulInt(19, 5); /* 2^4 <= 19 <= 2^5, but we only want 5 bits */
+        $g2_19 = $g2->mulInt(19, 5);
+        $g3_19 = $g3->mulInt(19, 5);
+        $g4_19 = $g4->mulInt(19, 5);
+        $g5_19 = $g5->mulInt(19, 5);
+        $g6_19 = $g6->mulInt(19, 5);
+        $g7_19 = $g7->mulInt(19, 5);
+        $g8_19 = $g8->mulInt(19, 5);
+        $g9_19 = $g9->mulInt(19, 5);
+        /** @var ParagonIE_Sodium_Core32_Int64 $f1_2 */
+        $f1_2 = $f1->shiftLeft(1);
+        /** @var ParagonIE_Sodium_Core32_Int64 $f3_2 */
+        $f3_2 = $f3->shiftLeft(1);
+        /** @var ParagonIE_Sodium_Core32_Int64 $f5_2 */
+        $f5_2 = $f5->shiftLeft(1);
+        /** @var ParagonIE_Sodium_Core32_Int64 $f7_2 */
+        $f7_2 = $f7->shiftLeft(1);
+        /** @var ParagonIE_Sodium_Core32_Int64 $f9_2 */
+        $f9_2 = $f9->shiftLeft(1);
+        $f0g0    = $f0->mulInt64($g0, 31);
+        $f0g1    = $f0->mulInt64($g1, 31);
+        $f0g2    = $f0->mulInt64($g2, 31);
+        $f0g3    = $f0->mulInt64($g3, 31);
+        $f0g4    = $f0->mulInt64($g4, 31);
+        $f0g5    = $f0->mulInt64($g5, 31);
+        $f0g6    = $f0->mulInt64($g6, 31);
+        $f0g7    = $f0->mulInt64($g7, 31);
+        $f0g8    = $f0->mulInt64($g8, 31);
+        $f0g9    = $f0->mulInt64($g9, 31);
+        $f1g0    = $f1->mulInt64($g0, 31);
+        $f1g1_2  = $f1_2->mulInt64($g1, 31);
+        $f1g2    = $f1->mulInt64($g2, 31);
+        $f1g3_2  = $f1_2->mulInt64($g3, 31);
+        $f1g4    = $f1->mulInt64($g4, 31);
+        $f1g5_2  = $f1_2->mulInt64($g5, 31);
+        $f1g6    = $f1->mulInt64($g6, 31);
+        $f1g7_2  = $f1_2->mulInt64($g7, 31);
+        $f1g8    = $f1->mulInt64($g8, 31);
+        $f1g9_38 = $g9_19->mulInt64($f1_2, 31);
+        $f2g0    = $f2->mulInt64($g0, 31);
+        $f2g1    = $f2->mulInt64($g1, 31);
+        $f2g2    = $f2->mulInt64($g2, 31);
+        $f2g3    = $f2->mulInt64($g3, 31);
+        $f2g4    = $f2->mulInt64($g4, 31);
+        $f2g5    = $f2->mulInt64($g5, 31);
+        $f2g6    = $f2->mulInt64($g6, 31);
+        $f2g7    = $f2->mulInt64($g7, 31);
+        $f2g8_19 = $g8_19->mulInt64($f2, 31);
+        $f2g9_19 = $g9_19->mulInt64($f2, 31);
+        $f3g0    = $f3->mulInt64($g0, 31);
+        $f3g1_2  = $f3_2->mulInt64($g1, 31);
+        $f3g2    = $f3->mulInt64($g2, 31);
+        $f3g3_2  = $f3_2->mulInt64($g3, 31);
+        $f3g4    = $f3->mulInt64($g4, 31);
+        $f3g5_2  = $f3_2->mulInt64($g5, 31);
+        $f3g6    = $f3->mulInt64($g6, 31);
+        $f3g7_38 = $g7_19->mulInt64($f3_2, 31);
+        $f3g8_19 = $g8_19->mulInt64($f3, 31);
+        $f3g9_38 = $g9_19->mulInt64($f3_2, 31);
+        $f4g0    = $f4->mulInt64($g0, 31);
+        $f4g1    = $f4->mulInt64($g1, 31);
+        $f4g2    = $f4->mulInt64($g2, 31);
+        $f4g3    = $f4->mulInt64($g3, 31);
+        $f4g4    = $f4->mulInt64($g4, 31);
+        $f4g5    = $f4->mulInt64($g5, 31);
+        $f4g6_19 = $g6_19->mulInt64($f4, 31);
+        $f4g7_19 = $g7_19->mulInt64($f4, 31);
+        $f4g8_19 = $g8_19->mulInt64($f4, 31);
+        $f4g9_19 = $g9_19->mulInt64($f4, 31);
+        $f5g0    = $f5->mulInt64($g0, 31);
+        $f5g1_2  = $f5_2->mulInt64($g1, 31);
+        $f5g2    = $f5->mulInt64($g2, 31);
+        $f5g3_2  = $f5_2->mulInt64($g3, 31);
+        $f5g4    = $f5->mulInt64($g4, 31);
+        $f5g5_38 = $g5_19->mulInt64($f5_2, 31);
+        $f5g6_19 = $g6_19->mulInt64($f5, 31);
+        $f5g7_38 = $g7_19->mulInt64($f5_2, 31);
+        $f5g8_19 = $g8_19->mulInt64($f5, 31);
+        $f5g9_38 = $g9_19->mulInt64($f5_2, 31);
+        $f6g0    = $f6->mulInt64($g0, 31);
+        $f6g1    = $f6->mulInt64($g1, 31);
+        $f6g2    = $f6->mulInt64($g2, 31);
+        $f6g3    = $f6->mulInt64($g3, 31);
+        $f6g4_19 = $g4_19->mulInt64($f6, 31);
+        $f6g5_19 = $g5_19->mulInt64($f6, 31);
+        $f6g6_19 = $g6_19->mulInt64($f6, 31);
+        $f6g7_19 = $g7_19->mulInt64($f6, 31);
+        $f6g8_19 = $g8_19->mulInt64($f6, 31);
+        $f6g9_19 = $g9_19->mulInt64($f6, 31);
+        $f7g0    = $f7->mulInt64($g0, 31);
+        $f7g1_2  = $g1->mulInt64($f7_2, 31);
+        $f7g2    = $f7->mulInt64($g2, 31);
+        $f7g3_38 = $g3_19->mulInt64($f7_2, 31);
+        $f7g4_19 = $g4_19->mulInt64($f7, 31);
+        $f7g5_38 = $g5_19->mulInt64($f7_2, 31);
+        $f7g6_19 = $g6_19->mulInt64($f7, 31);
+        $f7g7_38 = $g7_19->mulInt64($f7_2, 31);
+        $f7g8_19 = $g8_19->mulInt64($f7, 31);
+        $f7g9_38 = $g9_19->mulInt64($f7_2, 31);
+        $f8g0    = $f8->mulInt64($g0, 31);
+        $f8g1    = $f8->mulInt64($g1, 31);
+        $f8g2_19 = $f8->mulInt64($g2_19, 31);
+        $f8g3_19 = $f8->mulInt64($g3_19, 31);
+        $f8g4_19 = $f8->mulInt64($g4_19, 31);
+        $f8g5_19 = $f8->mulInt64($g5_19, 31);
+        $f8g6_19 = $f8->mulInt64($g6_19, 31);
+        $f8g7_19 = $f8->mulInt64($g7_19, 31);
+        $f8g8_19 = $f8->mulInt64($g8_19, 31);
+        $f8g9_19 = $f8->mulInt64($g9_19, 31);
+        $f9g0    = $f9->mulInt64($g0, 31);
+        $f9g1_38 = $f9_2->mulInt64($g1_19, 31);
+        $f9g2_19 = $f9->mulInt64($g2_19, 31);
+        $f9g3_38 = $f9_2->mulInt64($g3_19, 31);
+        $f9g4_19 = $f9->mulInt64($g4_19, 31);
+        $f9g5_38 = $f9_2->mulInt64($g5_19, 31);
+        $f9g6_19 = $f9->mulInt64($g6_19, 31);
+        $f9g7_38 = $f9_2->mulInt64($g7_19, 31);
+        $f9g8_19 = $f9->mulInt64($g8_19, 31);
+        $f9g9_38 = $f9_2->mulInt64($g9_19, 31);
+
+        // $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
+        $h0 = $f0g0->addInt64($f1g9_38)->addInt64($f2g8_19)->addInt64($f3g7_38)
+            ->addInt64($f4g6_19)->addInt64($f5g5_38)->addInt64($f6g4_19)
+            ->addInt64($f7g3_38)->addInt64($f8g2_19)->addInt64($f9g1_38);
+
+        // $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
+        $h1 = $f0g1->addInt64($f1g0)->addInt64($f2g9_19)->addInt64($f3g8_19)
+            ->addInt64($f4g7_19)->addInt64($f5g6_19)->addInt64($f6g5_19)
+            ->addInt64($f7g4_19)->addInt64($f8g3_19)->addInt64($f9g2_19);
+
+        // $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
+        $h2 = $f0g2->addInt64($f1g1_2)->addInt64($f2g0)->addInt64($f3g9_38)
+            ->addInt64($f4g8_19)->addInt64($f5g7_38)->addInt64($f6g6_19)
+            ->addInt64($f7g5_38)->addInt64($f8g4_19)->addInt64($f9g3_38);
+
+        // $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
+        $h3 = $f0g3->addInt64($f1g2)->addInt64($f2g1)->addInt64($f3g0)
+            ->addInt64($f4g9_19)->addInt64($f5g8_19)->addInt64($f6g7_19)
+            ->addInt64($f7g6_19)->addInt64($f8g5_19)->addInt64($f9g4_19);
+
+        // $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
+        $h4 = $f0g4->addInt64($f1g3_2)->addInt64($f2g2)->addInt64($f3g1_2)
+            ->addInt64($f4g0)->addInt64($f5g9_38)->addInt64($f6g8_19)
+            ->addInt64($f7g7_38)->addInt64($f8g6_19)->addInt64($f9g5_38);
+
+        // $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
+        $h5 = $f0g5->addInt64($f1g4)->addInt64($f2g3)->addInt64($f3g2)
+            ->addInt64($f4g1)->addInt64($f5g0)->addInt64($f6g9_19)
+            ->addInt64($f7g8_19)->addInt64($f8g7_19)->addInt64($f9g6_19);
+
+        // $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
+        $h6 = $f0g6->addInt64($f1g5_2)->addInt64($f2g4)->addInt64($f3g3_2)
+            ->addInt64($f4g2)->addInt64($f5g1_2)->addInt64($f6g0)
+            ->addInt64($f7g9_38)->addInt64($f8g8_19)->addInt64($f9g7_38);
+
+        // $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
+        $h7 = $f0g7->addInt64($f1g6)->addInt64($f2g5)->addInt64($f3g4)
+            ->addInt64($f4g3)->addInt64($f5g2)->addInt64($f6g1)
+            ->addInt64($f7g0)->addInt64($f8g9_19)->addInt64($f9g8_19);
+
+        // $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
+        $h8 = $f0g8->addInt64($f1g7_2)->addInt64($f2g6)->addInt64($f3g5_2)
+            ->addInt64($f4g4)->addInt64($f5g3_2)->addInt64($f6g2)
+            ->addInt64($f7g1_2)->addInt64($f8g0)->addInt64($f9g9_38);
+
+        // $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
+        $h9 = $f0g9->addInt64($f1g8)->addInt64($f2g7)->addInt64($f3g6)
+            ->addInt64($f4g5)->addInt64($f5g4)->addInt64($f6g3)
+            ->addInt64($f7g2)->addInt64($f8g1)->addInt64($f9g0);
+
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64 $h0
+         * @var ParagonIE_Sodium_Core32_Int64 $h1
+         * @var ParagonIE_Sodium_Core32_Int64 $h2
+         * @var ParagonIE_Sodium_Core32_Int64 $h3
+         * @var ParagonIE_Sodium_Core32_Int64 $h4
+         * @var ParagonIE_Sodium_Core32_Int64 $h5
+         * @var ParagonIE_Sodium_Core32_Int64 $h6
+         * @var ParagonIE_Sodium_Core32_Int64 $h7
+         * @var ParagonIE_Sodium_Core32_Int64 $h8
+         * @var ParagonIE_Sodium_Core32_Int64 $h9
+         * @var ParagonIE_Sodium_Core32_Int64 $carry0
+         * @var ParagonIE_Sodium_Core32_Int64 $carry1
+         * @var ParagonIE_Sodium_Core32_Int64 $carry2
+         * @var ParagonIE_Sodium_Core32_Int64 $carry3
+         * @var ParagonIE_Sodium_Core32_Int64 $carry4
+         * @var ParagonIE_Sodium_Core32_Int64 $carry5
+         * @var ParagonIE_Sodium_Core32_Int64 $carry6
+         * @var ParagonIE_Sodium_Core32_Int64 $carry7
+         * @var ParagonIE_Sodium_Core32_Int64 $carry8
+         * @var ParagonIE_Sodium_Core32_Int64 $carry9
+         */
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt64($carry0);
+        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt64($carry4);
+        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+        $h2 = $h2->addInt64($carry1);
+        $h1 = $h1->subInt64($carry1->shiftLeft(25));
+        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+        $h6 = $h6->addInt64($carry5);
+        $h5 = $h5->subInt64($carry5->shiftLeft(25));
+
+        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+        $h3 = $h3->addInt64($carry2);
+        $h2 = $h2->subInt64($carry2->shiftLeft(26));
+        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+        $h7 = $h7->addInt64($carry6);
+        $h6 = $h6->subInt64($carry6->shiftLeft(26));
+
+        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+        $h4 = $h4->addInt64($carry3);
+        $h3 = $h3->subInt64($carry3->shiftLeft(25));
+        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+        $h8 = $h8->addInt64($carry7);
+        $h7 = $h7->subInt64($carry7->shiftLeft(25));
+
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt64($carry4);
+        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+        $h9 = $h9->addInt64($carry8);
+        $h8 = $h8->subInt64($carry8->shiftLeft(26));
+
+        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+        $h0 = $h0->addInt64($carry9->mulInt(19));
+        $h9 = $h9->subInt64($carry9->shiftLeft(25));
+
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt64($carry0);
+        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array(
+                $h0->toInt32(),
+                $h1->toInt32(),
+                $h2->toInt32(),
+                $h3->toInt32(),
+                $h4->toInt32(),
+                $h5->toInt32(),
+                $h6->toInt32(),
+                $h7->toInt32(),
+                $h8->toInt32(),
+                $h9->toInt32()
+            )
+        );
+    }
+
+    /**
+     * Get the negative values for each piece of the field element.
+     *
+     * h = -f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        $h = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        for ($i = 0; $i < 10; ++$i) {
+            $h[$i] = $h[$i]->subInt32($f[$i]);
+        }
+        return $h;
+    }
+
+    /**
+     * Square a field element
+     *
+     * h = f * f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        /** @var ParagonIE_Sodium_Core32_Int64 $f0 */
+        $f0 = $f[0]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f1 */
+        $f1 = $f[1]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f2 */
+        $f2 = $f[2]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f3 */
+        $f3 = $f[3]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f4 */
+        $f4 = $f[4]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f5 */
+        $f5 = $f[5]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f6 */
+        $f6 = $f[6]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f7 */
+        $f7 = $f[7]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f8 */
+        $f8 = $f[8]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f9 */
+        $f9 = $f[9]->toInt64();
+
+        /** @var ParagonIE_Sodium_Core32_Int64 $f0_2 */
+        $f0_2 = $f0->shiftLeft(1);
+        $f1_2 = $f1->shiftLeft(1);
+        $f2_2 = $f2->shiftLeft(1);
+        $f3_2 = $f3->shiftLeft(1);
+        $f4_2 = $f4->shiftLeft(1);
+        $f5_2 = $f5->shiftLeft(1);
+        $f6_2 = $f6->shiftLeft(1);
+        $f7_2 = $f7->shiftLeft(1);
+        $f5_38 = $f5->mulInt(38, 6);
+        $f6_19 = $f6->mulInt(19, 5);
+        $f7_38 = $f7->mulInt(38, 6);
+        $f8_19 = $f8->mulInt(19, 5);
+        $f9_38 = $f9->mulInt(38, 6);
+        /** @var ParagonIE_Sodium_Core32_Int64 $f0f0*/
+        $f0f0    = $f0->mulInt64($f0, 31);
+        $f0f1_2  = $f0_2->mulInt64($f1, 31);
+        $f0f2_2 =  $f0_2->mulInt64($f2, 31);
+        $f0f3_2 =  $f0_2->mulInt64($f3, 31);
+        $f0f4_2 =  $f0_2->mulInt64($f4, 31);
+        $f0f5_2 =  $f0_2->mulInt64($f5, 31);
+        $f0f6_2 =  $f0_2->mulInt64($f6, 31);
+        $f0f7_2 =  $f0_2->mulInt64($f7, 31);
+        $f0f8_2 =  $f0_2->mulInt64($f8, 31);
+        $f0f9_2 =  $f0_2->mulInt64($f9, 31);
+
+        $f1f1_2 = $f1_2->mulInt64($f1, 31);
+        $f1f2_2 = $f1_2->mulInt64($f2, 31);
+        $f1f3_4 = $f1_2->mulInt64($f3_2, 31);
+        $f1f4_2 = $f1_2->mulInt64($f4, 31);
+        $f1f5_4 = $f1_2->mulInt64($f5_2, 31);
+        $f1f6_2 = $f1_2->mulInt64($f6, 31);
+        $f1f7_4 = $f1_2->mulInt64($f7_2, 31);
+        $f1f8_2 = $f1_2->mulInt64($f8, 31);
+        $f1f9_76 = $f1_2->mulInt64($f9_38, 31);
+
+        $f2f2 = $f2->mulInt64($f2, 31);
+        $f2f3_2 = $f2_2->mulInt64($f3, 31);
+        $f2f4_2 = $f2_2->mulInt64($f4, 31);
+        $f2f5_2 = $f2_2->mulInt64($f5, 31);
+        $f2f6_2 = $f2_2->mulInt64($f6, 31);
+        $f2f7_2 = $f2_2->mulInt64($f7, 31);
+        $f2f8_38 = $f8_19->mulInt64($f2_2, 31);
+        $f2f9_38 = $f9_38->mulInt64($f2, 31);
+
+        $f3f3_2 = $f3_2->mulInt64($f3, 31);
+        $f3f4_2 = $f3_2->mulInt64($f4, 31);
+        $f3f5_4 = $f3_2->mulInt64($f5_2, 31);
+        $f3f6_2 = $f3_2->mulInt64($f6, 31);
+        $f3f7_76 = $f7_38->mulInt64($f3_2, 31);
+        $f3f8_38 = $f8_19->mulInt64($f3_2, 31);
+        $f3f9_76 = $f9_38->mulInt64($f3_2, 31);
+
+        $f4f4 = $f4->mulInt64($f4, 31);
+        $f4f5_2 = $f4_2->mulInt64($f5, 31);
+        $f4f6_38 = $f4_2->mulInt64($f6_19, 31);
+        $f4f7_38 = $f7_38->mulInt64($f4, 31);
+        $f4f8_38 = $f8_19->mulInt64($f4_2, 31);
+        $f4f9_38 = $f9_38->mulInt64($f4, 31);
+
+        $f5f5_38 = $f5_38->mulInt64($f5, 31);
+        $f5f6_38 = $f6_19->mulInt64($f5_2, 31);
+        $f5f7_76 = $f7_38->mulInt64($f5_2, 31);
+        $f5f8_38 = $f8_19->mulInt64($f5_2, 31);
+        $f5f9_76 = $f9_38->mulInt64($f5_2, 31);
+
+        $f6f6_19 = $f6_19->mulInt64($f6, 31);
+        $f6f7_38 = $f7_38->mulInt64($f6, 31);
+        $f6f8_38 = $f8_19->mulInt64($f6_2, 31);
+        $f6f9_38 = $f6->mulInt64($f9_38, 31);
+
+        $f7f7_38 = $f7->mulInt64($f7_38, 31);
+        $f7f8_38 = $f7_2->mulInt64($f8_19, 31);
+        $f7f9_76 = $f7_2->mulInt64($f9_38, 31);
+
+        $f8f8_19 = $f8->mulInt64($f8_19, 31);
+        $f8f9_38 = $f8->mulInt64($f9_38, 31);
+
+        $f9f9_38 = $f9->mulInt64($f9_38, 31);
+
+        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
+        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
+        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
+        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
+        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
+        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
+        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
+        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
+        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
+        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
+
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64 $h0
+         * @var ParagonIE_Sodium_Core32_Int64 $h1
+         * @var ParagonIE_Sodium_Core32_Int64 $h2
+         * @var ParagonIE_Sodium_Core32_Int64 $h3
+         * @var ParagonIE_Sodium_Core32_Int64 $h4
+         * @var ParagonIE_Sodium_Core32_Int64 $h5
+         * @var ParagonIE_Sodium_Core32_Int64 $h6
+         * @var ParagonIE_Sodium_Core32_Int64 $h7
+         * @var ParagonIE_Sodium_Core32_Int64 $h8
+         * @var ParagonIE_Sodium_Core32_Int64 $h9
+         */
+
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt64($carry0);
+        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt64($carry4);
+        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+        $h2 = $h2->addInt64($carry1);
+        $h1 = $h1->subInt64($carry1->shiftLeft(25));
+
+        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+        $h6 = $h6->addInt64($carry5);
+        $h5 = $h5->subInt64($carry5->shiftLeft(25));
+
+        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+        $h3 = $h3->addInt64($carry2);
+        $h2 = $h2->subInt64($carry2->shiftLeft(26));
+
+        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+        $h7 = $h7->addInt64($carry6);
+        $h6 = $h6->subInt64($carry6->shiftLeft(26));
+
+        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+        $h4 = $h4->addInt64($carry3);
+        $h3 = $h3->subInt64($carry3->shiftLeft(25));
+
+        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+        $h8 = $h8->addInt64($carry7);
+        $h7 = $h7->subInt64($carry7->shiftLeft(25));
+
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt64($carry4);
+        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+        $h9 = $h9->addInt64($carry8);
+        $h8 = $h8->subInt64($carry8->shiftLeft(26));
+
+        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+        $h0 = $h0->addInt64($carry9->mulInt(19));
+        $h9 = $h9->subInt64($carry9->shiftLeft(25));
+
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt64($carry0);
+        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array(
+                $h0->toInt32(),
+                $h1->toInt32(),
+                $h2->toInt32(),
+                $h3->toInt32(),
+                $h4->toInt32(),
+                $h5->toInt32(),
+                $h6->toInt32(),
+                $h7->toInt32(),
+                $h8->toInt32(),
+                $h9->toInt32()
+            )
+        );
+    }
+
+    /**
+     * Square and double a field element
+     *
+     * h = 2 * f * f
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        /** @var ParagonIE_Sodium_Core32_Int64 $f0 */
+        $f0 = $f[0]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f1 */
+        $f1 = $f[1]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f2 */
+        $f2 = $f[2]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f3 */
+        $f3 = $f[3]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f4 */
+        $f4 = $f[4]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f5 */
+        $f5 = $f[5]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f6 */
+        $f6 = $f[6]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f7 */
+        $f7 = $f[7]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f8 */
+        $f8 = $f[8]->toInt64();
+        /** @var ParagonIE_Sodium_Core32_Int64 $f9 */
+        $f9 = $f[9]->toInt64();
+
+        $f0_2 = $f0->shiftLeft(1);
+        $f1_2 = $f1->shiftLeft(1);
+        $f2_2 = $f2->shiftLeft(1);
+        $f3_2 = $f3->shiftLeft(1);
+        $f4_2 = $f4->shiftLeft(1);
+        $f5_2 = $f5->shiftLeft(1);
+        $f6_2 = $f6->shiftLeft(1);
+        $f7_2 = $f7->shiftLeft(1);
+        $f5_38 = $f5->mulInt(38, 6); /* 1.959375*2^30 */
+        $f6_19 = $f6->mulInt(19, 5); /* 1.959375*2^30 */
+        $f7_38 = $f7->mulInt(38, 6); /* 1.959375*2^30 */
+        $f8_19 = $f8->mulInt(19, 5); /* 1.959375*2^30 */
+        $f9_38 = $f9->mulInt(38, 6); /* 1.959375*2^30 */
+        $f0f0 = $f0->mulInt64($f0, 31);
+        $f0f1_2 = $f0_2->mulInt64($f1, 31);
+        $f0f2_2 = $f0_2->mulInt64($f2, 31);
+        $f0f3_2 = $f0_2->mulInt64($f3, 31);
+        $f0f4_2 = $f0_2->mulInt64($f4, 31);
+        $f0f5_2 = $f0_2->mulInt64($f5, 31);
+        $f0f6_2 = $f0_2->mulInt64($f6, 31);
+        $f0f7_2 = $f0_2->mulInt64($f7, 31);
+        $f0f8_2 = $f0_2->mulInt64($f8, 31);
+        $f0f9_2 = $f0_2->mulInt64($f9, 31);
+        $f1f1_2 = $f1_2->mulInt64($f1, 31);
+        $f1f2_2 = $f1_2->mulInt64($f2, 31);
+        $f1f3_4 = $f1_2->mulInt64($f3_2, 31);
+        $f1f4_2 = $f1_2->mulInt64($f4, 31);
+        $f1f5_4 = $f1_2->mulInt64($f5_2, 31);
+        $f1f6_2 = $f1_2->mulInt64($f6, 31);
+        $f1f7_4 = $f1_2->mulInt64($f7_2, 31);
+        $f1f8_2 = $f1_2->mulInt64($f8, 31);
+        $f1f9_76 = $f1_2->mulInt64($f9_38, 31);
+        $f2f2 = $f2->mulInt64($f2, 31);
+        $f2f3_2 = $f2_2->mulInt64($f3, 31);
+        $f2f4_2 = $f2_2->mulInt64($f4, 31);
+        $f2f5_2 = $f2_2->mulInt64($f5, 31);
+        $f2f6_2 = $f2_2->mulInt64($f6, 31);
+        $f2f7_2 = $f2_2->mulInt64($f7, 31);
+        $f2f8_38 = $f2_2->mulInt64($f8_19, 31);
+        $f2f9_38 = $f2->mulInt64($f9_38, 31);
+        $f3f3_2 = $f3_2->mulInt64($f3, 31);
+        $f3f4_2 = $f3_2->mulInt64($f4, 31);
+        $f3f5_4 = $f3_2->mulInt64($f5_2, 31);
+        $f3f6_2 = $f3_2->mulInt64($f6, 31);
+        $f3f7_76 = $f3_2->mulInt64($f7_38, 31);
+        $f3f8_38 = $f3_2->mulInt64($f8_19, 31);
+        $f3f9_76 = $f3_2->mulInt64($f9_38, 31);
+        $f4f4 = $f4->mulInt64($f4, 31);
+        $f4f5_2 = $f4_2->mulInt64($f5, 31);
+        $f4f6_38 = $f4_2->mulInt64($f6_19, 31);
+        $f4f7_38 = $f4->mulInt64($f7_38, 31);
+        $f4f8_38 = $f4_2->mulInt64($f8_19, 31);
+        $f4f9_38 = $f4->mulInt64($f9_38, 31);
+        $f5f5_38 = $f5->mulInt64($f5_38, 31);
+        $f5f6_38 = $f5_2->mulInt64($f6_19, 31);
+        $f5f7_76 = $f5_2->mulInt64($f7_38, 31);
+        $f5f8_38 = $f5_2->mulInt64($f8_19, 31);
+        $f5f9_76 = $f5_2->mulInt64($f9_38, 31);
+        $f6f6_19 = $f6->mulInt64($f6_19, 31);
+        $f6f7_38 = $f6->mulInt64($f7_38, 31);
+        $f6f8_38 = $f6_2->mulInt64($f8_19, 31);
+        $f6f9_38 = $f6->mulInt64($f9_38, 31);
+        $f7f7_38 = $f7->mulInt64($f7_38, 31);
+        $f7f8_38 = $f7_2->mulInt64($f8_19, 31);
+        $f7f9_76 = $f7_2->mulInt64($f9_38, 31);
+        $f8f8_19 = $f8->mulInt64($f8_19, 31);
+        $f8f9_38 = $f8->mulInt64($f9_38, 31);
+        $f9f9_38 = $f9->mulInt64($f9_38, 31);
+
+        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
+        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
+        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
+        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
+        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
+        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
+        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
+        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
+        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
+        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
+
+        /*
+        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19);
+        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38);
+        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38);
+         */
+
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64 $h0
+         * @var ParagonIE_Sodium_Core32_Int64 $h1
+         * @var ParagonIE_Sodium_Core32_Int64 $h2
+         * @var ParagonIE_Sodium_Core32_Int64 $h3
+         * @var ParagonIE_Sodium_Core32_Int64 $h4
+         * @var ParagonIE_Sodium_Core32_Int64 $h5
+         * @var ParagonIE_Sodium_Core32_Int64 $h6
+         * @var ParagonIE_Sodium_Core32_Int64 $h7
+         * @var ParagonIE_Sodium_Core32_Int64 $h8
+         * @var ParagonIE_Sodium_Core32_Int64 $h9
+         */
+        $h0 = $h0->shiftLeft(1);
+        $h1 = $h1->shiftLeft(1);
+        $h2 = $h2->shiftLeft(1);
+        $h3 = $h3->shiftLeft(1);
+        $h4 = $h4->shiftLeft(1);
+        $h5 = $h5->shiftLeft(1);
+        $h6 = $h6->shiftLeft(1);
+        $h7 = $h7->shiftLeft(1);
+        $h8 = $h8->shiftLeft(1);
+        $h9 = $h9->shiftLeft(1);
+
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt64($carry0);
+        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt64($carry4);
+        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+
+        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
+        $h2 = $h2->addInt64($carry1);
+        $h1 = $h1->subInt64($carry1->shiftLeft(25));
+        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
+        $h6 = $h6->addInt64($carry5);
+        $h5 = $h5->subInt64($carry5->shiftLeft(25));
+
+        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
+        $h3 = $h3->addInt64($carry2);
+        $h2 = $h2->subInt64($carry2->shiftLeft(26));
+        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
+        $h7 = $h7->addInt64($carry6);
+        $h6 = $h6->subInt64($carry6->shiftLeft(26));
+
+        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
+        $h4 = $h4->addInt64($carry3);
+        $h3 = $h3->subInt64($carry3->shiftLeft(25));
+        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
+        $h8 = $h8->addInt64($carry7);
+        $h7 = $h7->subInt64($carry7->shiftLeft(25));
+
+        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
+        $h5 = $h5->addInt64($carry4);
+        $h4 = $h4->subInt64($carry4->shiftLeft(26));
+        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
+        $h9 = $h9->addInt64($carry8);
+        $h8 = $h8->subInt64($carry8->shiftLeft(26));
+
+        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
+        $h0 = $h0->addInt64($carry9->mulInt(19));
+        $h9 = $h9->subInt64($carry9->shiftLeft(25));
+
+        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
+        $h1 = $h1->addInt64($carry0);
+        $h0 = $h0->subInt64($carry0->shiftLeft(26));
+
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array(
+                $h0->toInt32(),
+                $h1->toInt32(),
+                $h2->toInt32(),
+                $h3->toInt32(),
+                $h4->toInt32(),
+                $h5->toInt32(),
+                $h6->toInt32(),
+                $h7->toInt32(),
+                $h8->toInt32(),
+                $h9->toInt32()
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $Z
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z)
+    {
+        $z = clone $Z;
+        $t0 = self::fe_sq($z);
+        $t1 = self::fe_sq($t0);
+        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul($z, $t1);
+        $t0 = self::fe_mul($t0, $t1);
+        $t2 = self::fe_sq($t0);
+        $t1 = self::fe_mul($t1, $t2);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 5; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 10; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t2 = self::fe_mul($t2, $t1);
+        $t3 = self::fe_sq($t2);
+        for ($i = 1; $i < 20; ++$i) {
+            $t3 = self::fe_sq($t3);
+        }
+        $t2 = self::fe_mul($t3, $t2);
+        $t2 = self::fe_sq($t2);
+        for ($i = 1; $i < 10; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t2 = self::fe_sq($t1);
+        for ($i = 1; $i < 50; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t2 = self::fe_mul($t2, $t1);
+        $t3 = self::fe_sq($t2);
+        for ($i = 1; $i < 100; ++$i) {
+            $t3 = self::fe_sq($t3);
+        }
+        $t2 = self::fe_mul($t3, $t2);
+        $t2 = self::fe_sq($t2);
+        for ($i = 1; $i < 50; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+        for ($i = 1; $i < 5; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+        return self::fe_mul($t1, $t0);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $z
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z)
+    {
+        # fe_sq(t0, z);
+        # fe_sq(t1, t0);
+        # fe_sq(t1, t1);
+        # fe_mul(t1, z, t1);
+        # fe_mul(t0, t0, t1);
+        # fe_sq(t0, t0);
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_sq($z);
+        $t1 = self::fe_sq($t0);
+        $t1 = self::fe_sq($t1);
+        $t1 = self::fe_mul($z, $t1);
+        $t0 = self::fe_mul($t0, $t1);
+        $t0 = self::fe_sq($t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 5; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 5; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 10; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 10; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t1, t1, t0);
+        # fe_sq(t2, t1);
+        $t1 = self::fe_mul($t1, $t0);
+        $t2 = self::fe_sq($t1);
+
+        # for (i = 1; i < 20; ++i) {
+        #     fe_sq(t2, t2);
+        # }
+        for ($i = 1; $i < 20; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+
+        # fe_mul(t1, t2, t1);
+        # fe_sq(t1, t1);
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+
+        # for (i = 1; i < 10; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 10; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t1, t0);
+        $t0 = self::fe_mul($t1, $t0);
+        $t1 = self::fe_sq($t0);
+
+        # for (i = 1; i < 50; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 50; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t1, t1, t0);
+        # fe_sq(t2, t1);
+        $t1 = self::fe_mul($t1, $t0);
+        $t2 = self::fe_sq($t1);
+
+        # for (i = 1; i < 100; ++i) {
+        #     fe_sq(t2, t2);
+        # }
+        for ($i = 1; $i < 100; ++$i) {
+            $t2 = self::fe_sq($t2);
+        }
+
+        # fe_mul(t1, t2, t1);
+        # fe_sq(t1, t1);
+        $t1 = self::fe_mul($t2, $t1);
+        $t1 = self::fe_sq($t1);
+
+        # for (i = 1; i < 50; ++i) {
+        #     fe_sq(t1, t1);
+        # }
+        for ($i = 1; $i < 50; ++$i) {
+            $t1 = self::fe_sq($t1);
+        }
+
+        # fe_mul(t0, t1, t0);
+        # fe_sq(t0, t0);
+        # fe_sq(t0, t0);
+        # fe_mul(out, t0, z);
+        $t0 = self::fe_mul($t1, $t0);
+        $t0 = self::fe_sq($t0);
+        $t0 = self::fe_sq($t0);
+        return self::fe_mul($t0, $z);
+    }
+
+    /**
+     * Subtract two field elements.
+     *
+     * h = f - g
+     *
+     * Preconditions:
+     * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+     * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+     *
+     * Postconditions:
+     * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedMethodCall
+     * @psalm-suppress MixedTypeCoercion
+     */
+    public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g)
+    {
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+            array(
+                $f[0]->subInt32($g[0]),
+                $f[1]->subInt32($g[1]),
+                $f[2]->subInt32($g[2]),
+                $f[3]->subInt32($g[3]),
+                $f[4]->subInt32($g[4]),
+                $f[5]->subInt32($g[5]),
+                $f[6]->subInt32($g[6]),
+                $f[7]->subInt32($g[7]),
+                $f[8]->subInt32($g[8]),
+                $f[9]->subInt32($g[9])
+            )
+        );
+    }
+
+    /**
+     * Add two group elements.
+     *
+     * r = p + q
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_add(
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+    ) {
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->YplusX);
+        $r->Y = self::fe_mul($r->Y, $q->YminusX);
+        $r->T = self::fe_mul($q->T2d, $p->T);
+        $r->X = self::fe_mul($p->Z, $q->Z);
+        $t0   = self::fe_add($r->X, $r->X);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_add($t0, $r->T);
+        $r->T = self::fe_sub($t0, $r->T);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
+     * @param string $a
+     * @return array<int, mixed>
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayOffset
+     */
+    public static function slide($a)
+    {
+        if (self::strlen($a) < 256) {
+            if (self::strlen($a) < 16) {
+                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+            }
+        }
+        /** @var array<int, int> $r */
+        $r = array();
+        for ($i = 0; $i < 256; ++$i) {
+            $r[$i] = (int) (1 &
+                (
+                    self::chrToInt($a[$i >> 3])
+                        >>
+                    ($i & 7)
+                )
+            );
+        }
+
+        for ($i = 0;$i < 256;++$i) {
+            if ($r[$i]) {
+                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
+                    if ($r[$i + $b]) {
+                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
+                            $r[$i] += $r[$i + $b] << $b;
+                            $r[$i + $b] = 0;
+                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
+                            $r[$i] -= $r[$i + $b] << $b;
+                            for ($k = $i + $b; $k < 256; ++$k) {
+                                if (!$r[$k]) {
+                                    $r[$k] = 1;
+                                    break;
+                                }
+                                $r[$k] = 0;
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_frombytes_negate_vartime($s)
+    {
+        static $d = null;
+        if (!$d) {
+            /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d */
+            $d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                array(
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[0]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[1]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[2]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[3]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[4]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[5]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[6]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[7]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[8]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[9])
+                )
+            );
+        }
+
+        # fe_frombytes(h->Y,s);
+        # fe_1(h->Z);
+        $h = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
+            self::fe_0(),
+            self::fe_frombytes($s),
+            self::fe_1()
+        );
+
+        # fe_sq(u,h->Y);
+        # fe_mul(v,u,d);
+        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
+        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
+        $u = self::fe_sq($h->Y);
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d */
+        $v = self::fe_mul($u, $d);
+        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
+        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
+
+        # fe_sq(v3,v);
+        # fe_mul(v3,v3,v);        /* v3 = v^3 */
+        # fe_sq(h->X,v3);
+        # fe_mul(h->X,h->X,v);
+        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
+        $v3 = self::fe_sq($v);
+        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
+        $h->X = self::fe_sq($v3);
+        $h->X = self::fe_mul($h->X, $v);
+        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
+
+        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
+        # fe_mul(h->X,h->X,v3);
+        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
+        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
+        $h->X = self::fe_mul($h->X, $v3);
+        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
+
+        # fe_sq(vxx,h->X);
+        # fe_mul(vxx,vxx,v);
+        # fe_sub(check,vxx,u);    /* vx^2-u */
+        $vxx = self::fe_sq($h->X);
+        $vxx = self::fe_mul($vxx, $v);
+        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
+
+        # if (fe_isnonzero(check)) {
+        #     fe_add(check,vxx,u);  /* vx^2+u */
+        #     if (fe_isnonzero(check)) {
+        #         return -1;
+        #     }
+        #     fe_mul(h->X,h->X,sqrtm1);
+        # }
+        if (self::fe_isnonzero($check)) {
+            $check = self::fe_add($vxx, $u); /* vx^2 + u */
+            if (self::fe_isnonzero($check)) {
+                throw new RangeException('Internal check failed.');
+            }
+            $h->X = self::fe_mul(
+                $h->X,
+                ParagonIE_Sodium_Core32_Curve25519_Fe::fromIntArray(self::$sqrtm1)
+            );
+        }
+
+        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
+        #     fe_neg(h->X,h->X);
+        # }
+        $i = self::chrToInt($s[31]);
+        if (self::fe_isnegative($h->X) === ($i >> 7)) {
+            $h->X = self::fe_neg($h->X);
+        }
+
+        # fe_mul(h->T,h->X,h->Y);
+        $h->T = self::fe_mul($h->X, $h->Y);
+        return $h;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_madd(
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+    ) {
+        $r = clone $R;
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->yplusx);
+        $r->Y = self::fe_mul($r->Y, $q->yminusx);
+        $r->T = self::fe_mul($q->xy2d, $p->T);
+        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_add($t0, $r->T);
+        $r->T = self::fe_sub($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_msub(
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
+    ) {
+        $r = clone $R;
+
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->yminusx);
+        $r->Y = self::fe_mul($r->Y, $q->yplusx);
+        $r->T = self::fe_mul($q->xy2d, $p->T);
+        $t0 = self::fe_add($p->Z, $p->Z);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_sub($t0, $r->T);
+        $r->T = self::fe_add($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
+    {
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P2();
+        $r->X = self::fe_mul($p->X, $p->T);
+        $r->Y = self::fe_mul($p->Y, $p->Z);
+        $r->Z = self::fe_mul($p->Z, $p->T);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
+    {
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3();
+        $r->X = self::fe_mul($p->X, $p->T);
+        $r->Y = self::fe_mul($p->Y, $p->Z);
+        $r->Z = self::fe_mul($p->Z, $p->T);
+        $r->T = self::fe_mul($p->X, $p->Y);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p2_0()
+    {
+        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
+            self::fe_0(),
+            self::fe_1(),
+            self::fe_1()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p)
+    {
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+
+        $r->X = self::fe_sq($p->X);
+        $r->Z = self::fe_sq($p->Y);
+        $r->T = self::fe_sq2($p->Z);
+        $r->Y = self::fe_add($p->X, $p->Y);
+        $t0   = self::fe_sq($r->Y);
+        $r->Y = self::fe_add($r->Z, $r->X);
+        $r->Z = self::fe_sub($r->Z, $r->X);
+        $r->X = self::fe_sub($t0, $r->Y);
+        $r->T = self::fe_sub($r->T, $r->Z);
+
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p3_0()
+    {
+        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
+            self::fe_0(),
+            self::fe_1(),
+            self::fe_1(),
+            self::fe_0()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+    {
+        static $d2 = null;
+        if ($d2 === null) {
+            $d2 = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                array(
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[0]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[1]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[2]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[3]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[4]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[5]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[6]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[7]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[8]),
+                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[9])
+                )
+            );
+        }
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d2 */
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached();
+        $r->YplusX = self::fe_add($p->Y, $p->X);
+        $r->YminusX = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_copy($p->Z);
+        $r->T2d = self::fe_mul($p->T, $d2);
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+     */
+    public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+    {
+        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
+            $p->X,
+            $p->Y,
+            $p->Z
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h)
+    {
+        $recip = self::fe_invert($h->Z);
+        $x = self::fe_mul($h->X, $recip);
+        $y = self::fe_mul($h->Y, $recip);
+        $s = self::fe_tobytes($y);
+        $s[31] = self::intToChr(
+            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        );
+        return $s;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
+    {
+        $q = self::ge_p3_to_p2($p);
+        return self::ge_p2_dbl($q);
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_precomp_0()
+    {
+        return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+            self::fe_1(),
+            self::fe_1(),
+            self::fe_0()
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $b
+     * @param int $c
+     * @return int
+     * @psalm-suppress MixedReturnStatement
+     */
+    public static function equal($b, $c)
+    {
+        return (int) ((($b ^ $c) - 1 & 0xffffffff) >> 31);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string|int $char
+     * @return int (1 = yes, 0 = no)
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function negative($char)
+    {
+        if (is_int($char)) {
+            return $char < 0 ? 1 : 0;
+        }
+        /** @var string $char */
+        /** @var int $x */
+        $x = self::chrToInt(self::substr($char, 0, 1));
+        return (int) ($x >> 31);
+    }
+
+    /**
+     * Conditional move
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u
+     * @param int $b
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function cmov(
+        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u,
+        $b
+    ) {
+        if (!is_int($b)) {
+            throw new InvalidArgumentException('Expected an integer.');
+        }
+        return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+            self::fe_cmov($t->yplusx, $u->yplusx, $b),
+            self::fe_cmov($t->yminusx, $u->yminusx, $b),
+            self::fe_cmov($t->xy2d, $u->xy2d, $b)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $pos
+     * @param int $b
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress MixedArgument
+     */
+    public static function ge_select($pos = 0, $b = 0)
+    {
+        static $base = null;
+        if ($base === null) {
+            $base = array();
+            foreach (self::$base as $i => $bas) {
+                for ($j = 0; $j < 8; ++$j) {
+                    $base[$i][$j] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                            array(
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][0]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][1]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][2]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][3]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][4]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][5]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][6]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][7]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][8]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][9])
+                            )
+                        ),
+                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                            array(
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][0]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][1]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][2]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][3]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][4]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][5]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][6]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][7]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][8]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][9])
+                            )
+                        ),
+                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                            array(
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][0]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][1]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][2]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][3]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][4]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][5]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][6]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][7]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][8]),
+                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][9])
+                            )
+                        )
+                    );
+                }
+            }
+        }
+        if (!is_int($pos)) {
+            throw new InvalidArgumentException('Position must be an integer');
+        }
+        if ($pos < 0 || $pos > 31) {
+            throw new RangeException('Position is out of range [0, 31]');
+        }
+
+        $bnegative = self::negative($b);
+        /** @var int $babs */
+        $babs = $b - (((-$bnegative) & $b) << 1);
+
+        $t = self::ge_precomp_0();
+        for ($i = 0; $i < 8; ++$i) {
+            $t = self::cmov(
+                $t,
+                $base[$pos][$i],
+                self::equal($babs, $i + 1)
+            );
+        }
+        $minusT = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+            self::fe_copy($t->yminusx),
+            self::fe_copy($t->yplusx),
+            self::fe_neg($t->xy2d)
+        );
+        return self::cmov($t, $minusT, -$bnegative);
+    }
+
+    /**
+     * Subtract two group elements.
+     *
+     * r = p - q
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_sub(
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
+    ) {
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+
+        $r->X = self::fe_add($p->Y, $p->X);
+        $r->Y = self::fe_sub($p->Y, $p->X);
+        $r->Z = self::fe_mul($r->X, $q->YminusX);
+        $r->Y = self::fe_mul($r->Y, $q->YplusX);
+        $r->T = self::fe_mul($q->T2d, $p->T);
+        $r->X = self::fe_mul($p->Z, $q->Z);
+        $t0 = self::fe_add($r->X, $r->X);
+        $r->X = self::fe_sub($r->Z, $r->Y);
+        $r->Y = self::fe_add($r->Z, $r->Y);
+        $r->Z = self::fe_sub($t0, $r->T);
+        $r->T = self::fe_add($t0, $r->T);
+
+        return $r;
+    }
+
+    /**
+     * Convert a group element to a byte string.
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h)
+    {
+        $recip = self::fe_invert($h->Z);
+        $x = self::fe_mul($h->X, $recip);
+        $y = self::fe_mul($h->Y, $recip);
+        $s = self::fe_tobytes($y);
+        $s[31] = self::intToChr(
+            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
+        );
+        return $s;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
+     * @param string $b
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     */
+    public static function ge_double_scalarmult_vartime(
+        $a,
+        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A,
+        $b
+    ) {
+        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Cached> $Ai */
+        $Ai = array();
+
+        static $Bi = array();
+        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp> $Bi */
+        if (!$Bi) {
+            for ($i = 0; $i < 8; ++$i) {
+                $Bi[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
+                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                        array(
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][0]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][1]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][2]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][3]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][4]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][5]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][6]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][7]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][8]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][9])
+                        )
+                    ),
+                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                        array(
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][0]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][1]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][2]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][3]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][4]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][5]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][6]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][7]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][8]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][9])
+                        )
+                    ),
+                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
+                        array(
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][0]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][1]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][2]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][3]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][4]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][5]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][6]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][7]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][8]),
+                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][9])
+                        )
+                    )
+                );
+            }
+        }
+
+        for ($i = 0; $i < 8; ++$i) {
+            $Ai[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached(
+                self::fe_0(),
+                self::fe_0(),
+                self::fe_0(),
+                self::fe_0()
+            );
+        }
+        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Cached> $Ai */
+
+        # slide(aslide,a);
+        # slide(bslide,b);
+        $aslide = self::slide($a);
+        $bslide = self::slide($b);
+
+        # ge_p3_to_cached(&Ai[0],A);
+        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
+        $Ai[0] = self::ge_p3_to_cached($A);
+        $t = self::ge_p3_dbl($A);
+        $A2 = self::ge_p1p1_to_p3($t);
+
+        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
+        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
+        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
+        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
+        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
+        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
+        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
+        for ($i = 0; $i < 7; ++$i) {
+            $t = self::ge_add($A2, $Ai[$i]);
+            $u = self::ge_p1p1_to_p3($t);
+            $Ai[$i + 1] = self::ge_p3_to_cached($u);
+        }
+
+        # ge_p2_0(r);
+        $r = self::ge_p2_0();
+
+        # for (i = 255;i >= 0;--i) {
+        #     if (aslide[i] || bslide[i]) break;
+        # }
+        $i = 255;
+        for (; $i >= 0; --$i) {
+            if ($aslide[$i] || $bslide[$i]) {
+                break;
+            }
+        }
+
+        # for (;i >= 0;--i) {
+        for (; $i >= 0; --$i) {
+            # ge_p2_dbl(&t,r);
+            $t = self::ge_p2_dbl($r);
+
+            # if (aslide[i] > 0) {
+            if ($aslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_add(&t,&u,&Ai[aslide[i]/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_add(
+                    $u,
+                    $Ai[(int) floor($aslide[$i] / 2)]
+                );
+                # } else if (aslide[i] < 0) {
+            } elseif ($aslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                $t = self::ge_sub(
+                    $u,
+                    $Ai[(int) floor(-$aslide[$i] / 2)]
+                );
+            }
+            /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp> $Bi */
+
+            # if (bslide[i] > 0) {
+            if ($bslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
+                $u = self::ge_p1p1_to_p3($t);
+                /** @var int $index */
+                $index = (int) floor($bslide[$i] / 2);
+                /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $thisB */
+                $thisB = $Bi[$index];
+                $t = self::ge_madd($t, $u, $thisB);
+                # } else if (bslide[i] < 0) {
+            } elseif ($bslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u,&t);
+                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
+                $u = self::ge_p1p1_to_p3($t);
+
+                /** @var int $index */
+                $index = (int) floor(-$bslide[$i] / 2);
+
+                /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $thisB */
+                $thisB = $Bi[$index];
+                $t = self::ge_msub($t, $u, $thisB);
+            }
+            # ge_p1p1_to_p2(r,&t);
+            $r = self::ge_p1p1_to_p2($t);
+        }
+        return $r;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedOperand
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_scalarmult_base($a)
+    {
+        /** @var array<int, int> $e */
+        $e = array();
+        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
+
+        for ($i = 0; $i < 32; ++$i) {
+            /** @var int $dbl */
+            $dbl = (int) $i << 1;
+            $e[$dbl] = (int) self::chrToInt($a[$i]) & 15;
+            $e[$dbl + 1] = (int) (self::chrToInt($a[$i]) >> 4) & 15;
+        }
+
+        /** @var int $carry */
+        $carry = 0;
+        for ($i = 0; $i < 63; ++$i) {
+            $e[$i] += $carry;
+            /** @var int $carry */
+            $carry = $e[$i] + 8;
+            /** @var int $carry */
+            $carry >>= 4;
+            $e[$i] -= $carry << 4;
+        }
+
+        /** @var array<int, int> $e */
+        $e[63] += (int) $carry;
+
+        $h = self::ge_p3_0();
+
+        for ($i = 1; $i < 64; $i += 2) {
+            $t = self::ge_select((int) floor($i / 2), (int) $e[$i]);
+            $r = self::ge_madd($r, $h, $t);
+            $h = self::ge_p1p1_to_p3($r);
+        }
+
+        $r = self::ge_p3_dbl($h);
+
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+        $s = self::ge_p1p1_to_p2($r);
+        $r = self::ge_p2_dbl($s);
+
+        $h = self::ge_p1p1_to_p3($r);
+
+        for ($i = 0; $i < 64; $i += 2) {
+            $t = self::ge_select($i >> 1, (int) $e[$i]);
+            $r = self::ge_madd($r, $h, $t);
+            $h = self::ge_p1p1_to_p3($r);
+        }
+        return $h;
+    }
+
+    /**
+     * Calculates (ab + c) mod l
+     * where l = 2^252 + 27742317777372353535851937790883648493
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $a
+     * @param string $b
+     * @param string $c
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sc_muladd($a, $b, $c)
+    {
+        $a0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 0, 3)))->toInt64();
+        $a1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5))->toInt64();
+        $a2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2))->toInt64();
+        $a3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7))->toInt64();
+        $a4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4))->toInt64();
+        $a5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1))->toInt64();
+        $a6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6))->toInt64();
+        $a7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3))->toInt64();
+        $a8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($a, 21, 3)))->toInt64();
+        $a9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5))->toInt64();
+        $a10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2))->toInt64();
+        $a11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($a, 28, 4)) >> 7))->toInt64();
+        $b0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 0, 3)))->toInt64();
+        $b1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5))->toInt64();
+        $b2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2))->toInt64();
+        $b3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7))->toInt64();
+        $b4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4))->toInt64();
+        $b5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1))->toInt64();
+        $b6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6))->toInt64();
+        $b7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3))->toInt64();
+        $b8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($b, 21, 3)))->toInt64();
+        $b9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5))->toInt64();
+        $b10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2))->toInt64();
+        $b11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($b, 28, 4)) >> 7))->toInt64();
+        $c0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 0, 3)))->toInt64();
+        $c1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5))->toInt64();
+        $c2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2))->toInt64();
+        $c3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7))->toInt64();
+        $c4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4))->toInt64();
+        $c5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1))->toInt64();
+        $c6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6))->toInt64();
+        $c7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3))->toInt64();
+        $c8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($c, 21, 3)))->toInt64();
+        $c9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5))->toInt64();
+        $c10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2))->toInt64();
+        $c11 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($c, 28, 4)) >> 7))->toInt64();
+
+        /* Can't really avoid the pyramid here: */
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64 $s0
+         * @var ParagonIE_Sodium_Core32_Int64 $s1
+         * @var ParagonIE_Sodium_Core32_Int64 $s2
+         * @var ParagonIE_Sodium_Core32_Int64 $s3
+         * @var ParagonIE_Sodium_Core32_Int64 $s4
+         * @var ParagonIE_Sodium_Core32_Int64 $s5
+         * @var ParagonIE_Sodium_Core32_Int64 $s6
+         * @var ParagonIE_Sodium_Core32_Int64 $s7
+         * @var ParagonIE_Sodium_Core32_Int64 $s8
+         * @var ParagonIE_Sodium_Core32_Int64 $s9
+         * @var ParagonIE_Sodium_Core32_Int64 $s10
+         * @var ParagonIE_Sodium_Core32_Int64 $s11
+         * @var ParagonIE_Sodium_Core32_Int64 $s12
+         * @var ParagonIE_Sodium_Core32_Int64 $s13
+         * @var ParagonIE_Sodium_Core32_Int64 $s14
+         * @var ParagonIE_Sodium_Core32_Int64 $s15
+         * @var ParagonIE_Sodium_Core32_Int64 $s16
+         * @var ParagonIE_Sodium_Core32_Int64 $s17
+         * @var ParagonIE_Sodium_Core32_Int64 $s18
+         * @var ParagonIE_Sodium_Core32_Int64 $s19
+         * @var ParagonIE_Sodium_Core32_Int64 $s20
+         * @var ParagonIE_Sodium_Core32_Int64 $s21
+         * @var ParagonIE_Sodium_Core32_Int64 $s22
+         * @var ParagonIE_Sodium_Core32_Int64 $s23
+         */
+
+        $s0 = $c0->addInt64($a0->mulInt64($b0, 24));
+        $s1 = $c1->addInt64($a0->mulInt64($b1, 24))->addInt64($a1->mulInt64($b0, 24));
+        $s2 = $c2->addInt64($a0->mulInt64($b2, 24))->addInt64($a1->mulInt64($b1, 24))->addInt64($a2->mulInt64($b0, 24));
+        $s3 = $c3->addInt64($a0->mulInt64($b3, 24))->addInt64($a1->mulInt64($b2, 24))->addInt64($a2->mulInt64($b1, 24))->addInt64($a3->mulInt64($b0, 24));
+        $s4 = $c4->addInt64($a0->mulInt64($b4, 24))->addInt64($a1->mulInt64($b3, 24))->addInt64($a2->mulInt64($b2, 24))->addInt64($a3->mulInt64($b1, 24))->addInt64($a4->mulInt64($b0, 24));
+        $s5 = $c5->addInt64($a0->mulInt64($b5, 24))->addInt64($a1->mulInt64($b4, 24))->addInt64($a2->mulInt64($b3, 24))->addInt64($a3->mulInt64($b2, 24))->addInt64($a4->mulInt64($b1, 24))->addInt64($a5->mulInt64($b0, 24));
+        $s6 = $c6->addInt64($a0->mulInt64($b6, 24))->addInt64($a1->mulInt64($b5, 24))->addInt64($a2->mulInt64($b4, 24))->addInt64($a3->mulInt64($b3, 24))->addInt64($a4->mulInt64($b2, 24))->addInt64($a5->mulInt64($b1, 24))
+                 ->addInt64($a6->mulInt64($b0, 24));
+        $s7 = $c7->addInt64($a0->mulInt64($b7, 24))->addInt64($a1->mulInt64($b6, 24))->addInt64($a2->mulInt64($b5, 24))->addInt64($a3->mulInt64($b4, 24))->addInt64($a4->mulInt64($b3, 24))->addInt64($a5->mulInt64($b2, 24))
+                 ->addInt64($a6->mulInt64($b1, 24))->addInt64($a7->mulInt64($b0, 24));
+        $s8 = $c8->addInt64($a0->mulInt64($b8, 24))->addInt64($a1->mulInt64($b7, 24))->addInt64($a2->mulInt64($b6, 24))->addInt64($a3->mulInt64($b5, 24))->addInt64($a4->mulInt64($b4, 24))->addInt64($a5->mulInt64($b3, 24))
+                 ->addInt64($a6->mulInt64($b2, 24))->addInt64($a7->mulInt64($b1, 24))->addInt64($a8->mulInt64($b0, 24));
+        $s9 = $c9->addInt64($a0->mulInt64($b9, 24))->addInt64($a1->mulInt64($b8, 24))->addInt64($a2->mulInt64($b7, 24))->addInt64($a3->mulInt64($b6, 24))->addInt64($a4->mulInt64($b5, 24))->addInt64($a5->mulInt64($b4, 24))
+                 ->addInt64($a6->mulInt64($b3, 24))->addInt64($a7->mulInt64($b2, 24))->addInt64($a8->mulInt64($b1, 24))->addInt64($a9->mulInt64($b0, 24));
+        $s10 = $c10->addInt64($a0->mulInt64($b10, 24))->addInt64($a1->mulInt64($b9, 24))->addInt64($a2->mulInt64($b8, 24))->addInt64($a3->mulInt64($b7, 24))->addInt64($a4->mulInt64($b6, 24))->addInt64($a5->mulInt64($b5, 24))
+                   ->addInt64($a6->mulInt64($b4, 24))->addInt64($a7->mulInt64($b3, 24))->addInt64($a8->mulInt64($b2, 24))->addInt64($a9->mulInt64($b1, 24))->addInt64($a10->mulInt64($b0, 24));
+        $s11 = $c11->addInt64($a0->mulInt64($b11, 24))->addInt64($a1->mulInt64($b10, 24))->addInt64($a2->mulInt64($b9, 24))->addInt64($a3->mulInt64($b8, 24))->addInt64($a4->mulInt64($b7, 24))->addInt64($a5->mulInt64($b6, 24))
+                   ->addInt64($a6->mulInt64($b5, 24))->addInt64($a7->mulInt64($b4, 24))->addInt64($a8->mulInt64($b3, 24))->addInt64($a9->mulInt64($b2, 24))->addInt64($a10->mulInt64($b1, 24))->addInt64($a11->mulInt64($b0, 24));
+        $s12 = $a1->mulInt64($b11, 24)->addInt64($a2->mulInt64($b10, 24))->addInt64($a3->mulInt64($b9, 24))->addInt64($a4->mulInt64($b8, 24))->addInt64($a5->mulInt64($b7, 24))->addInt64($a6->mulInt64($b6, 24))
+                  ->addInt64($a7->mulInt64($b5, 24))->addInt64($a8->mulInt64($b4, 24))->addInt64($a9->mulInt64($b3, 24))->addInt64($a10->mulInt64($b2, 24))->addInt64($a11->mulInt64($b1, 24));
+        $s13 = $a2->mulInt64($b11, 24)->addInt64($a3->mulInt64($b10, 24))->addInt64($a4->mulInt64($b9, 24))->addInt64($a5->mulInt64($b8, 24))->addInt64($a6->mulInt64($b7, 24))->addInt64($a7->mulInt64($b6, 24))
+                  ->addInt64($a8->mulInt64($b5, 24))->addInt64($a9->mulInt64($b4, 24))->addInt64($a10->mulInt64($b3, 24))->addInt64($a11->mulInt64($b2, 24));
+        $s14 = $a3->mulInt64($b11, 24)->addInt64($a4->mulInt64($b10, 24))->addInt64($a5->mulInt64($b9, 24))->addInt64($a6->mulInt64($b8, 24))->addInt64($a7->mulInt64($b7, 24))->addInt64($a8->mulInt64($b6, 24))
+                  ->addInt64($a9->mulInt64($b5, 24))->addInt64($a10->mulInt64($b4, 24))->addInt64($a11->mulInt64($b3, 24));
+        $s15 = $a4->mulInt64($b11, 24)->addInt64($a5->mulInt64($b10, 24))->addInt64($a6->mulInt64($b9, 24))->addInt64($a7->mulInt64($b8, 24))->addInt64($a8->mulInt64($b7, 24))->addInt64($a9->mulInt64($b6, 24))
+                  ->addInt64($a10->mulInt64($b5, 24))->addInt64($a11->mulInt64($b4, 24));
+        $s16 = $a5->mulInt64($b11, 24)->addInt64($a6->mulInt64($b10, 24))->addInt64($a7->mulInt64($b9, 24))->addInt64($a8->mulInt64($b8, 24))->addInt64($a9->mulInt64($b7, 24))->addInt64($a10->mulInt64($b6, 24))
+                   ->addInt64($a11->mulInt64($b5, 24));
+        $s17 = $a6->mulInt64($b11, 24)->addInt64($a7->mulInt64($b10, 24))->addInt64($a8->mulInt64($b9, 24))->addInt64($a9->mulInt64($b8, 24))->addInt64($a10->mulInt64($b7, 24))->addInt64($a11->mulInt64($b6, 24));
+        $s18 = $a7->mulInt64($b11, 24)->addInt64($a8->mulInt64($b10, 24))->addInt64($a9->mulInt64($b9, 24))->addInt64($a10->mulInt64($b8, 24))->addInt64($a11->mulInt64($b7, 24));
+        $s19 = $a8->mulInt64($b11, 24)->addInt64($a9->mulInt64($b10, 24))->addInt64($a10->mulInt64($b9, 24))->addInt64($a11->mulInt64($b8, 24));
+        $s20 = $a9->mulInt64($b11, 24)->addInt64($a10->mulInt64($b10, 24))->addInt64($a11->mulInt64($b9, 24));
+        $s21 = $a10->mulInt64($b11, 24)->addInt64($a11->mulInt64($b10, 24));
+        $s22 = $a11->mulInt64($b11, 24);
+        $s23 = new ParagonIE_Sodium_Core32_Int64();
+
+        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+        $s13 = $s13->addInt64($carry12);
+        $s12 = $s12->subInt64($carry12->shiftLeft(21));
+        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+        $s15 = $s15->addInt64($carry14);
+        $s14 = $s14->subInt64($carry14->shiftLeft(21));
+        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+        $s17 = $s17->addInt64($carry16);
+        $s16 = $s16->subInt64($carry16->shiftLeft(21));
+        $carry18 = $s18->addInt(1 << 20)->shiftRight(21);
+        $s19 = $s19->addInt64($carry18);
+        $s18 = $s18->subInt64($carry18->shiftLeft(21));
+        $carry20 = $s20->addInt(1 << 20)->shiftRight(21);
+        $s21 = $s21->addInt64($carry20);
+        $s20 = $s20->subInt64($carry20->shiftLeft(21));
+        $carry22 = $s22->addInt(1 << 20)->shiftRight(21);
+        $s23 = $s23->addInt64($carry22);
+        $s22 = $s22->subInt64($carry22->shiftLeft(21));
+
+        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+        $s14 = $s14->addInt64($carry13);
+        $s13 = $s13->subInt64($carry13->shiftLeft(21));
+        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+        $s16 = $s16->addInt64($carry15);
+        $s15 = $s15->subInt64($carry15->shiftLeft(21));
+        $carry17 = $s17->addInt(1 << 20)->shiftRight(21);
+        $s18 = $s18->addInt64($carry17);
+        $s17 = $s17->subInt64($carry17->shiftLeft(21));
+        $carry19 = $s19->addInt(1 << 20)->shiftRight(21);
+        $s20 = $s20->addInt64($carry19);
+        $s19 = $s19->subInt64($carry19->shiftLeft(21));
+        $carry21 = $s21->addInt(1 << 20)->shiftRight(21);
+        $s22 = $s22->addInt64($carry21);
+        $s21 = $s21->subInt64($carry21->shiftLeft(21));
+
+        $s11 = $s11->addInt64($s23->mulInt(666643, 20));
+        $s12 = $s12->addInt64($s23->mulInt(470296, 19));
+        $s13 = $s13->addInt64($s23->mulInt(654183, 20));
+        $s14 = $s14->subInt64($s23->mulInt(997805, 20));
+        $s15 = $s15->addInt64($s23->mulInt(136657, 18));
+        $s16 = $s16->subInt64($s23->mulInt(683901, 20));
+
+        $s10 = $s10->addInt64($s22->mulInt(666643, 20));
+        $s11 = $s11->addInt64($s22->mulInt(470296, 19));
+        $s12 = $s12->addInt64($s22->mulInt(654183, 20));
+        $s13 = $s13->subInt64($s22->mulInt(997805, 20));
+        $s14 = $s14->addInt64($s22->mulInt(136657, 18));
+        $s15 = $s15->subInt64($s22->mulInt(683901, 20));
+
+        $s9  =  $s9->addInt64($s21->mulInt(666643, 20));
+        $s10 = $s10->addInt64($s21->mulInt(470296, 19));
+        $s11 = $s11->addInt64($s21->mulInt(654183, 20));
+        $s12 = $s12->subInt64($s21->mulInt(997805, 20));
+        $s13 = $s13->addInt64($s21->mulInt(136657, 18));
+        $s14 = $s14->subInt64($s21->mulInt(683901, 20));
+
+        $s8  =  $s8->addInt64($s20->mulInt(666643, 20));
+        $s9  =  $s9->addInt64($s20->mulInt(470296, 19));
+        $s10 = $s10->addInt64($s20->mulInt(654183, 20));
+        $s11 = $s11->subInt64($s20->mulInt(997805, 20));
+        $s12 = $s12->addInt64($s20->mulInt(136657, 18));
+        $s13 = $s13->subInt64($s20->mulInt(683901, 20));
+
+        $s7  =  $s7->addInt64($s19->mulInt(666643, 20));
+        $s8  =  $s8->addInt64($s19->mulInt(470296, 19));
+        $s9  =  $s9->addInt64($s19->mulInt(654183, 20));
+        $s10 = $s10->subInt64($s19->mulInt(997805, 20));
+        $s11 = $s11->addInt64($s19->mulInt(136657, 18));
+        $s12 = $s12->subInt64($s19->mulInt(683901, 20));
+
+        $s6  =  $s6->addInt64($s18->mulInt(666643, 20));
+        $s7  =  $s7->addInt64($s18->mulInt(470296, 19));
+        $s8  =  $s8->addInt64($s18->mulInt(654183, 20));
+        $s9  =  $s9->subInt64($s18->mulInt(997805, 20));
+        $s10 = $s10->addInt64($s18->mulInt(136657, 18));
+        $s11 = $s11->subInt64($s18->mulInt(683901, 20));
+
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+        $s13 = $s13->addInt64($carry12);
+        $s12 = $s12->subInt64($carry12->shiftLeft(21));
+        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+        $s15 = $s15->addInt64($carry14);
+        $s14 = $s14->subInt64($carry14->shiftLeft(21));
+        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+        $s17 = $s17->addInt64($carry16);
+        $s16 = $s16->subInt64($carry16->shiftLeft(21));
+
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+        $s14 = $s14->addInt64($carry13);
+        $s13 = $s13->subInt64($carry13->shiftLeft(21));
+        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+        $s16 = $s16->addInt64($carry15);
+        $s15 = $s15->subInt64($carry15->shiftLeft(21));
+
+        $s5  =  $s5->addInt64($s17->mulInt(666643, 20));
+        $s6  =  $s6->addInt64($s17->mulInt(470296, 19));
+        $s7  =  $s7->addInt64($s17->mulInt(654183, 20));
+        $s8  =  $s8->subInt64($s17->mulInt(997805, 20));
+        $s9  =  $s9->addInt64($s17->mulInt(136657, 18));
+        $s10 = $s10->subInt64($s17->mulInt(683901, 20));
+
+        $s4  =  $s4->addInt64($s16->mulInt(666643, 20));
+        $s5  =  $s5->addInt64($s16->mulInt(470296, 19));
+        $s6  =  $s6->addInt64($s16->mulInt(654183, 20));
+        $s7  =  $s7->subInt64($s16->mulInt(997805, 20));
+        $s8  =  $s8->addInt64($s16->mulInt(136657, 18));
+        $s9  =  $s9->subInt64($s16->mulInt(683901, 20));
+
+        $s3  =  $s3->addInt64($s15->mulInt(666643, 20));
+        $s4  =  $s4->addInt64($s15->mulInt(470296, 19));
+        $s5  =  $s5->addInt64($s15->mulInt(654183, 20));
+        $s6  =  $s6->subInt64($s15->mulInt(997805, 20));
+        $s7  =  $s7->addInt64($s15->mulInt(136657, 18));
+        $s8  =  $s8->subInt64($s15->mulInt(683901, 20));
+
+        $s2  =  $s2->addInt64($s14->mulInt(666643, 20));
+        $s3  =  $s3->addInt64($s14->mulInt(470296, 19));
+        $s4  =  $s4->addInt64($s14->mulInt(654183, 20));
+        $s5  =  $s5->subInt64($s14->mulInt(997805, 20));
+        $s6  =  $s6->addInt64($s14->mulInt(136657, 18));
+        $s7  =  $s7->subInt64($s14->mulInt(683901, 20));
+
+        $s1  =  $s1->addInt64($s13->mulInt(666643, 20));
+        $s2  =  $s2->addInt64($s13->mulInt(470296, 19));
+        $s3  =  $s3->addInt64($s13->mulInt(654183, 20));
+        $s4  =  $s4->subInt64($s13->mulInt(997805, 20));
+        $s5  =  $s5->addInt64($s13->mulInt(136657, 18));
+        $s6  =  $s6->subInt64($s13->mulInt(683901, 20));
+
+        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
+        $s12 = new ParagonIE_Sodium_Core32_Int64();
+
+        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+
+        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
+        $s12 = new ParagonIE_Sodium_Core32_Int64();
+
+        $carry0 = $s0->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry1 = $s1->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry2 = $s2->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry3 = $s3->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry4 = $s4->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry5 = $s5->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry6 = $s6->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry7 = $s7->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry8 = $s8->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry9 = $s9->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry10 = $s10->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry11 = $s11->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
+
+        $carry0 = $s0->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry1 = $s1->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry2 = $s2->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry3 = $s3->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry4 = $s4->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry5 = $s5->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry6 = $s6->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry7 = $s7->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry8 = $s10->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry9 = $s9->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry10 = $s10->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+
+        $S0  =  $s0->toInt32()->toInt();
+        $S1  =  $s1->toInt32()->toInt();
+        $S2  =  $s2->toInt32()->toInt();
+        $S3  =  $s3->toInt32()->toInt();
+        $S4  =  $s4->toInt32()->toInt();
+        $S5  =  $s5->toInt32()->toInt();
+        $S6  =  $s6->toInt32()->toInt();
+        $S7  =  $s7->toInt32()->toInt();
+        $S8  =  $s8->toInt32()->toInt();
+        $S9  =  $s9->toInt32()->toInt();
+        $S10 = $s10->toInt32()->toInt();
+        $S11 = $s11->toInt32()->toInt();
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) (0xff & ($S0 >> 0)),
+            (int) (0xff & ($S0 >> 8)),
+            (int) (0xff & (($S0 >> 16) | ($S1 << 5))),
+            (int) (0xff & ($S1 >> 3)),
+            (int) (0xff & ($S1 >> 11)),
+            (int) (0xff & (($S1 >> 19) | ($S2 << 2))),
+            (int) (0xff & ($S2 >> 6)),
+            (int) (0xff & (($S2 >> 14) | ($S3 << 7))),
+            (int) (0xff & ($S3 >> 1)),
+            (int) (0xff & ($S3 >> 9)),
+            (int) (0xff & (($S3 >> 17) | ($S4 << 4))),
+            (int) (0xff & ($S4 >> 4)),
+            (int) (0xff & ($S4 >> 12)),
+            (int) (0xff & (($S4 >> 20) | ($S5 << 1))),
+            (int) (0xff & ($S5 >> 7)),
+            (int) (0xff & (($S5 >> 15) | ($S6 << 6))),
+            (int) (0xff & ($S6 >> 2)),
+            (int) (0xff & ($S6 >> 10)),
+            (int) (0xff & (($S6 >> 18) | ($S7 << 3))),
+            (int) (0xff & ($S7 >> 5)),
+            (int) (0xff & ($S7 >> 13)),
+            (int) (0xff & ($S8 >> 0)),
+            (int) (0xff & ($S8 >> 8)),
+            (int) (0xff & (($S8 >> 16) | ($S9 << 5))),
+            (int) (0xff & ($S9 >> 3)),
+            (int) (0xff & ($S9 >> 11)),
+            (int) (0xff & (($S9 >> 19) | ($S10 << 2))),
+            (int) (0xff & ($S10 >> 6)),
+            (int) (0xff & (($S10 >> 14) | ($S11 << 7))),
+            (int) (0xff & ($S11 >> 1)),
+            (int) (0xff & ($S11 >> 9)),
+            (int) (0xff & ($S11 >> 17))
+        );
+        return self::intArrayToString($arr);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sc_reduce($s)
+    {
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64 $s0
+         * @var ParagonIE_Sodium_Core32_Int64 $s1
+         * @var ParagonIE_Sodium_Core32_Int64 $s2
+         * @var ParagonIE_Sodium_Core32_Int64 $s3
+         * @var ParagonIE_Sodium_Core32_Int64 $s4
+         * @var ParagonIE_Sodium_Core32_Int64 $s5
+         * @var ParagonIE_Sodium_Core32_Int64 $s6
+         * @var ParagonIE_Sodium_Core32_Int64 $s7
+         * @var ParagonIE_Sodium_Core32_Int64 $s8
+         * @var ParagonIE_Sodium_Core32_Int64 $s9
+         * @var ParagonIE_Sodium_Core32_Int64 $s10
+         * @var ParagonIE_Sodium_Core32_Int64 $s11
+         * @var ParagonIE_Sodium_Core32_Int64 $s12
+         * @var ParagonIE_Sodium_Core32_Int64 $s13
+         * @var ParagonIE_Sodium_Core32_Int64 $s14
+         * @var ParagonIE_Sodium_Core32_Int64 $s15
+         * @var ParagonIE_Sodium_Core32_Int64 $s16
+         * @var ParagonIE_Sodium_Core32_Int64 $s17
+         * @var ParagonIE_Sodium_Core32_Int64 $s18
+         * @var ParagonIE_Sodium_Core32_Int64 $s19
+         * @var ParagonIE_Sodium_Core32_Int64 $s20
+         * @var ParagonIE_Sodium_Core32_Int64 $s21
+         * @var ParagonIE_Sodium_Core32_Int64 $s22
+         * @var ParagonIE_Sodium_Core32_Int64 $s23
+         */
+        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)))->toInt64();
+        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5))->toInt64();
+        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2))->toInt64();
+        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7))->toInt64();
+        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4))->toInt64();
+        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1))->toInt64();
+        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6))->toInt64();
+        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3))->toInt64();
+        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)))->toInt64();
+        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5))->toInt64();
+        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2))->toInt64();
+        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7))->toInt64();
+        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4))->toInt64();
+        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1))->toInt64();
+        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6))->toInt64();
+        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3))->toInt64();
+        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)))->toInt64();
+        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5))->toInt64();
+        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2))->toInt64();
+        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7))->toInt64();
+        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4))->toInt64();
+        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1))->toInt64();
+        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6))->toInt64();
+        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt(0x1fffffff & (self::load_4(self::substr($s, 60, 4)) >> 3))->toInt64();
+
+        $s11 = $s11->addInt64($s23->mulInt(666643, 20));
+        $s12 = $s12->addInt64($s23->mulInt(470296, 19));
+        $s13 = $s13->addInt64($s23->mulInt(654183, 20));
+        $s14 = $s14->subInt64($s23->mulInt(997805, 20));
+        $s15 = $s15->addInt64($s23->mulInt(136657, 18));
+        $s16 = $s16->subInt64($s23->mulInt(683901, 20));
+
+        $s10 = $s10->addInt64($s22->mulInt(666643, 20));
+        $s11 = $s11->addInt64($s22->mulInt(470296, 19));
+        $s12 = $s12->addInt64($s22->mulInt(654183, 20));
+        $s13 = $s13->subInt64($s22->mulInt(997805, 20));
+        $s14 = $s14->addInt64($s22->mulInt(136657, 18));
+        $s15 = $s15->subInt64($s22->mulInt(683901, 20));
+
+        $s9  =  $s9->addInt64($s21->mulInt(666643, 20));
+        $s10 = $s10->addInt64($s21->mulInt(470296, 19));
+        $s11 = $s11->addInt64($s21->mulInt(654183, 20));
+        $s12 = $s12->subInt64($s21->mulInt(997805, 20));
+        $s13 = $s13->addInt64($s21->mulInt(136657, 18));
+        $s14 = $s14->subInt64($s21->mulInt(683901, 20));
+
+        $s8  =  $s8->addInt64($s20->mulInt(666643, 20));
+        $s9  =  $s9->addInt64($s20->mulInt(470296, 19));
+        $s10 = $s10->addInt64($s20->mulInt(654183, 20));
+        $s11 = $s11->subInt64($s20->mulInt(997805, 20));
+        $s12 = $s12->addInt64($s20->mulInt(136657, 18));
+        $s13 = $s13->subInt64($s20->mulInt(683901, 20));
+
+        $s7  =  $s7->addInt64($s19->mulInt(666643, 20));
+        $s8  =  $s8->addInt64($s19->mulInt(470296, 19));
+        $s9  =  $s9->addInt64($s19->mulInt(654183, 20));
+        $s10 = $s10->subInt64($s19->mulInt(997805, 20));
+        $s11 = $s11->addInt64($s19->mulInt(136657, 18));
+        $s12 = $s12->subInt64($s19->mulInt(683901, 20));
+
+        $s6  =  $s6->addInt64($s18->mulInt(666643, 20));
+        $s7  =  $s7->addInt64($s18->mulInt(470296, 19));
+        $s8  =  $s8->addInt64($s18->mulInt(654183, 20));
+        $s9  =  $s9->subInt64($s18->mulInt(997805, 20));
+        $s10 = $s10->addInt64($s18->mulInt(136657, 18));
+        $s11 = $s11->subInt64($s18->mulInt(683901, 20));
+
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+        $s13 = $s13->addInt64($carry12);
+        $s12 = $s12->subInt64($carry12->shiftLeft(21));
+        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+        $s15 = $s15->addInt64($carry14);
+        $s14 = $s14->subInt64($carry14->shiftLeft(21));
+        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+        $s17 = $s17->addInt64($carry16);
+        $s16 = $s16->subInt64($carry16->shiftLeft(21));
+
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+        $s14 = $s14->addInt64($carry13);
+        $s13 = $s13->subInt64($carry13->shiftLeft(21));
+        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+        $s16 = $s16->addInt64($carry15);
+        $s15 = $s15->subInt64($carry15->shiftLeft(21));
+
+        $s5  =  $s5->addInt64($s17->mulInt(666643, 20));
+        $s6  =  $s6->addInt64($s17->mulInt(470296, 19));
+        $s7  =  $s7->addInt64($s17->mulInt(654183, 20));
+        $s8  =  $s8->subInt64($s17->mulInt(997805, 20));
+        $s9  =  $s9->addInt64($s17->mulInt(136657, 18));
+        $s10 = $s10->subInt64($s17->mulInt(683901, 20));
+
+        $s4  =  $s4->addInt64($s16->mulInt(666643, 20));
+        $s5  =  $s5->addInt64($s16->mulInt(470296, 19));
+        $s6  =  $s6->addInt64($s16->mulInt(654183, 20));
+        $s7  =  $s7->subInt64($s16->mulInt(997805, 20));
+        $s8  =  $s8->addInt64($s16->mulInt(136657, 18));
+        $s9  =  $s9->subInt64($s16->mulInt(683901, 20));
+
+        $s3  =  $s3->addInt64($s15->mulInt(666643, 20));
+        $s4  =  $s4->addInt64($s15->mulInt(470296, 19));
+        $s5  =  $s5->addInt64($s15->mulInt(654183, 20));
+        $s6  =  $s6->subInt64($s15->mulInt(997805, 20));
+        $s7  =  $s7->addInt64($s15->mulInt(136657, 18));
+        $s8  =  $s8->subInt64($s15->mulInt(683901, 20));
+
+        $s2  =  $s2->addInt64($s14->mulInt(666643, 20));
+        $s3  =  $s3->addInt64($s14->mulInt(470296, 19));
+        $s4  =  $s4->addInt64($s14->mulInt(654183, 20));
+        $s5  =  $s5->subInt64($s14->mulInt(997805, 20));
+        $s6  =  $s6->addInt64($s14->mulInt(136657, 18));
+        $s7  =  $s7->subInt64($s14->mulInt(683901, 20));
+
+        $s1  =  $s1->addInt64($s13->mulInt(666643, 20));
+        $s2  =  $s2->addInt64($s13->mulInt(470296, 19));
+        $s3  =  $s3->addInt64($s13->mulInt(654183, 20));
+        $s4  =  $s4->subInt64($s13->mulInt(997805, 20));
+        $s5  =  $s5->addInt64($s13->mulInt(136657, 18));
+        $s6  =  $s6->subInt64($s13->mulInt(683901, 20));
+
+        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
+        $s12 = new ParagonIE_Sodium_Core32_Int64();
+
+        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
+        $s12 = new ParagonIE_Sodium_Core32_Int64();
+
+        $carry0 = $s0->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry1 = $s1->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry2 = $s2->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry3 = $s3->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry4 = $s4->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry5 = $s5->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry6 = $s6->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry7 = $s7->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry8 = $s8->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry9 = $s9->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry10 = $s10->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+        $carry11 = $s11->shiftRight(21);
+        $s12 = $s12->addInt64($carry11);
+        $s11 = $s11->subInt64($carry11->shiftLeft(21));
+
+        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
+
+        $carry0 = $s0->shiftRight(21);
+        $s1 = $s1->addInt64($carry0);
+        $s0 = $s0->subInt64($carry0->shiftLeft(21));
+        $carry1 = $s1->shiftRight(21);
+        $s2 = $s2->addInt64($carry1);
+        $s1 = $s1->subInt64($carry1->shiftLeft(21));
+        $carry2 = $s2->shiftRight(21);
+        $s3 = $s3->addInt64($carry2);
+        $s2 = $s2->subInt64($carry2->shiftLeft(21));
+        $carry3 = $s3->shiftRight(21);
+        $s4 = $s4->addInt64($carry3);
+        $s3 = $s3->subInt64($carry3->shiftLeft(21));
+        $carry4 = $s4->shiftRight(21);
+        $s5 = $s5->addInt64($carry4);
+        $s4 = $s4->subInt64($carry4->shiftLeft(21));
+        $carry5 = $s5->shiftRight(21);
+        $s6 = $s6->addInt64($carry5);
+        $s5 = $s5->subInt64($carry5->shiftLeft(21));
+        $carry6 = $s6->shiftRight(21);
+        $s7 = $s7->addInt64($carry6);
+        $s6 = $s6->subInt64($carry6->shiftLeft(21));
+        $carry7 = $s7->shiftRight(21);
+        $s8 = $s8->addInt64($carry7);
+        $s7 = $s7->subInt64($carry7->shiftLeft(21));
+        $carry8 = $s8->shiftRight(21);
+        $s9 = $s9->addInt64($carry8);
+        $s8 = $s8->subInt64($carry8->shiftLeft(21));
+        $carry9 = $s9->shiftRight(21);
+        $s10 = $s10->addInt64($carry9);
+        $s9 = $s9->subInt64($carry9->shiftLeft(21));
+        $carry10 = $s10->shiftRight(21);
+        $s11 = $s11->addInt64($carry10);
+        $s10 = $s10->subInt64($carry10->shiftLeft(21));
+
+        $S0 = $s0->toInt32()->toInt();
+        $S1 = $s1->toInt32()->toInt();
+        $S2 = $s2->toInt32()->toInt();
+        $S3 = $s3->toInt32()->toInt();
+        $S4 = $s4->toInt32()->toInt();
+        $S5 = $s5->toInt32()->toInt();
+        $S6 = $s6->toInt32()->toInt();
+        $S7 = $s7->toInt32()->toInt();
+        $S8 = $s8->toInt32()->toInt();
+        $S9 = $s9->toInt32()->toInt();
+        $S10 = $s10->toInt32()->toInt();
+        $S11 = $s11->toInt32()->toInt();
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) ($S0 >> 0),
+            (int) ($S0 >> 8),
+            (int) (($S0 >> 16) | ($S1 << 5)),
+            (int) ($S1 >> 3),
+            (int) ($S1 >> 11),
+            (int) (($S1 >> 19) | ($S2 << 2)),
+            (int) ($S2 >> 6),
+            (int) (($S2 >> 14) | ($S3 << 7)),
+            (int) ($S3 >> 1),
+            (int) ($S3 >> 9),
+            (int) (($S3 >> 17) | ($S4 << 4)),
+            (int) ($S4 >> 4),
+            (int) ($S4 >> 12),
+            (int) (($S4 >> 20) | ($S5 << 1)),
+            (int) ($S5 >> 7),
+            (int) (($S5 >> 15) | ($S6 << 6)),
+            (int) ($S6 >> 2),
+            (int) ($S6 >> 10),
+            (int) (($S6 >> 18) | ($S7 << 3)),
+            (int) ($S7 >> 5),
+            (int) ($S7 >> 13),
+            (int) ($S8 >> 0),
+            (int) ($S8 >> 8),
+            (int) (($S8 >> 16) | ($S9 << 5)),
+            (int) ($S9 >> 3),
+            (int) ($S9 >> 11),
+            (int) (($S9 >> 19) | ($S10 << 2)),
+            (int) ($S10 >> 6),
+            (int) (($S10 >> 14) | ($S11 << 7)),
+            (int) ($S11 >> 1),
+            (int) ($S11 >> 9),
+            (int) $S11 >> 17
+        );
+        return self::intArrayToString($arr);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $s
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sc_reduce_old($s)
+    {
+        /**
+         * @var ParagonIE_Sodium_Core32_Int32 $s0
+         * @var ParagonIE_Sodium_Core32_Int32 $s1
+         * @var ParagonIE_Sodium_Core32_Int32 $s2
+         * @var ParagonIE_Sodium_Core32_Int32 $s3
+         * @var ParagonIE_Sodium_Core32_Int32 $s4
+         * @var ParagonIE_Sodium_Core32_Int32 $s5
+         * @var ParagonIE_Sodium_Core32_Int32 $s6
+         * @var ParagonIE_Sodium_Core32_Int32 $s7
+         * @var ParagonIE_Sodium_Core32_Int32 $s8
+         * @var ParagonIE_Sodium_Core32_Int32 $s9
+         * @var ParagonIE_Sodium_Core32_Int32 $s10
+         * @var ParagonIE_Sodium_Core32_Int32 $s11
+         * @var ParagonIE_Sodium_Core32_Int32 $s12
+         * @var ParagonIE_Sodium_Core32_Int32 $s13
+         * @var ParagonIE_Sodium_Core32_Int32 $s14
+         * @var ParagonIE_Sodium_Core32_Int32 $s15
+         * @var ParagonIE_Sodium_Core32_Int32 $s16
+         * @var ParagonIE_Sodium_Core32_Int32 $s17
+         * @var ParagonIE_Sodium_Core32_Int32 $s18
+         * @var ParagonIE_Sodium_Core32_Int32 $s19
+         * @var ParagonIE_Sodium_Core32_Int32 $s20
+         * @var ParagonIE_Sodium_Core32_Int32 $s21
+         * @var ParagonIE_Sodium_Core32_Int32 $s22
+         * @var ParagonIE_Sodium_Core32_Int32 $s23
+         */
+        $s0 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)));
+        $s1 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5));
+        $s2 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2));
+        $s3 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7));
+        $s4 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4));
+        $s5 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1));
+        $s6 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6));
+        $s7 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3));
+        $s8 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)));
+        $s9 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5));
+        $s10 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2));
+        $s11 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7));
+        $s12 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4));
+        $s13 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1));
+        $s14 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6));
+        $s15 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3));
+        $s16 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)));
+        $s17 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5));
+        $s18 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2));
+        $s19 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7));
+        $s20 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4));
+        $s21 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1));
+        $s22 = ParagonIE_Sodium_Core32_Int32::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6));
+        $s23 = ParagonIE_Sodium_Core32_Int32::fromInt(self::load_4(self::substr($s, 60, 4)) >> 3);
+
+        $s11 = $s11->addInt32($s23->mulInt(666643, 20));
+        $s12 = $s12->addInt32($s23->mulInt(470296, 19));
+        $s13 = $s13->addInt32($s23->mulInt(654183, 20));
+        $s14 = $s14->subInt32($s23->mulInt(997805, 20));
+        $s15 = $s15->addInt32($s23->mulInt(136657, 18));
+        $s16 = $s16->subInt32($s23->mulInt(683901, 20));
+
+        $s10 = $s10->addInt32($s22->mulInt(666643, 20));
+        $s11 = $s11->addInt32($s22->mulInt(470296, 19));
+        $s12 = $s12->addInt32($s22->mulInt(654183, 20));
+        $s13 = $s13->subInt32($s22->mulInt(997805, 20));
+        $s14 = $s14->addInt32($s22->mulInt(136657, 18));
+        $s15 = $s15->subInt32($s22->mulInt(683901, 20));
+
+        $s9  =  $s9->addInt32($s21->mulInt(666643, 20));
+        $s10 = $s10->addInt32($s21->mulInt(470296, 19));
+        $s11 = $s11->addInt32($s21->mulInt(654183, 20));
+        $s12 = $s12->subInt32($s21->mulInt(997805, 20));
+        $s13 = $s13->addInt32($s21->mulInt(136657, 18));
+        $s14 = $s14->subInt32($s21->mulInt(683901, 20));
+
+        $s8  =  $s8->addInt32($s20->mulInt(666643, 20));
+        $s9  =  $s9->addInt32($s20->mulInt(470296, 19));
+        $s10 = $s10->addInt32($s20->mulInt(654183, 20));
+        $s11 = $s11->subInt32($s20->mulInt(997805, 20));
+        $s12 = $s12->addInt32($s20->mulInt(136657, 18));
+        $s13 = $s13->subInt32($s20->mulInt(683901, 20));
+
+        $s7  =  $s7->addInt32($s19->mulInt(666643, 20));
+        $s8  =  $s8->addInt32($s19->mulInt(470296, 19));
+        $s9  =  $s9->addInt32($s19->mulInt(654183, 20));
+        $s10 = $s10->subInt32($s19->mulInt(997805, 20));
+        $s11 = $s11->addInt32($s19->mulInt(136657, 18));
+        $s12 = $s12->subInt32($s19->mulInt(683901, 20));
+
+        $s6  =  $s6->addInt32($s18->mulInt(666643, 20));
+        $s7  =  $s7->addInt32($s18->mulInt(470296, 19));
+        $s8  =  $s8->addInt32($s18->mulInt(654183, 20));
+        $s9  =  $s9->subInt32($s18->mulInt(997805, 20));
+        $s10 = $s10->addInt32($s18->mulInt(136657, 18));
+        $s11 = $s11->subInt32($s18->mulInt(683901, 20));
+
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt32($carry6);
+        $s6 = $s6->subInt32($carry6->shiftLeft(21));
+
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt32($carry8);
+        $s8 = $s8->subInt32($carry8->shiftLeft(21));
+
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt32($carry10);
+        $s10 = $s10->subInt32($carry10->shiftLeft(21));
+
+        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
+        $s13 = $s13->addInt32($carry12);
+        $s12 = $s12->subInt32($carry12->shiftLeft(21));
+
+        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
+        $s15 = $s15->addInt32($carry14);
+        $s14 = $s14->subInt32($carry14->shiftLeft(21));
+
+        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
+        $s17 = $s17->addInt32($carry16);
+        $s16 = $s16->subInt32($carry16->shiftLeft(21));
+
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt32($carry7);
+        $s7 = $s7->subInt32($carry7->shiftLeft(21));
+
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt32($carry9);
+        $s9 = $s9->subInt32($carry9->shiftLeft(21));
+
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt32($carry11);
+        $s11 = $s11->subInt32($carry11->shiftLeft(21));
+
+        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
+        $s14 = $s14->addInt32($carry13);
+        $s13 = $s13->subInt32($carry13->shiftLeft(21));
+
+        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
+        $s16 = $s16->addInt32($carry15);
+        $s15 = $s15->subInt32($carry15->shiftLeft(21));
+
+        $s5  =  $s5->addInt32($s17->mulInt(666643, 20));
+        $s6  =  $s6->addInt32($s17->mulInt(470296, 19));
+        $s7  =  $s7->addInt32($s17->mulInt(654183, 20));
+        $s8  =  $s8->subInt32($s17->mulInt(997805, 20));
+        $s9  =  $s9->addInt32($s17->mulInt(136657, 18));
+        $s10 = $s10->subInt32($s17->mulInt(683901, 20));
+
+        $s4  =  $s4->addInt32($s16->mulInt(666643, 20));
+        $s5  =  $s5->addInt32($s16->mulInt(470296, 19));
+        $s6  =  $s6->addInt32($s16->mulInt(654183, 20));
+        $s7  =  $s7->subInt32($s16->mulInt(997805, 20));
+        $s8  =  $s8->addInt32($s16->mulInt(136657, 18));
+        $s9  =  $s9->subInt32($s16->mulInt(683901, 20));
+
+        $s3  =  $s3->addInt32($s15->mulInt(666643, 20));
+        $s4  =  $s4->addInt32($s15->mulInt(470296, 19));
+        $s5  =  $s5->addInt32($s15->mulInt(654183, 20));
+        $s6  =  $s6->subInt32($s15->mulInt(997805, 20));
+        $s7  =  $s7->addInt32($s15->mulInt(136657, 18));
+        $s8  =  $s8->subInt32($s15->mulInt(683901, 20));
+
+        $s2  =  $s2->addInt32($s14->mulInt(666643, 20));
+        $s3  =  $s3->addInt32($s14->mulInt(470296, 19));
+        $s4  =  $s4->addInt32($s14->mulInt(654183, 20));
+        $s5  =  $s5->subInt32($s14->mulInt(997805, 20));
+        $s6  =  $s6->addInt32($s14->mulInt(136657, 18));
+        $s7  =  $s7->subInt32($s14->mulInt(683901, 20));
+
+        $s1  =  $s1->addInt32($s13->mulInt(666643, 20));
+        $s2  =  $s2->addInt32($s13->mulInt(470296, 19));
+        $s3  =  $s3->addInt32($s13->mulInt(654183, 20));
+        $s4  =  $s4->subInt32($s13->mulInt(997805, 20));
+        $s5  =  $s5->addInt32($s13->mulInt(136657, 18));
+        $s6  =  $s6->subInt32($s13->mulInt(683901, 20));
+
+        $s0  =  $s0->addInt32($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt32($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt32($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt32($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt32($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt32($s12->mulInt(683901, 20));
+        $s12 = new ParagonIE_Sodium_Core32_Int32();
+
+        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
+        $s1 = $s1->addInt32($carry0);
+        $s0 = $s0->subInt32($carry0->shiftLeft(21));
+        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
+        $s3 = $s3->addInt32($carry2);
+        $s2 = $s2->subInt32($carry2->shiftLeft(21));
+        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
+        $s5 = $s5->addInt32($carry4);
+        $s4 = $s4->subInt32($carry4->shiftLeft(21));
+        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
+        $s7 = $s7->addInt32($carry6);
+        $s6 = $s6->subInt32($carry6->shiftLeft(21));
+        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
+        $s9 = $s9->addInt32($carry8);
+        $s8 = $s8->subInt32($carry8->shiftLeft(21));
+        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
+        $s11 = $s11->addInt32($carry10);
+        $s10 = $s10->subInt32($carry10->shiftLeft(21));
+        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
+        $s2 = $s2->addInt32($carry1);
+        $s1 = $s1->subInt32($carry1->shiftLeft(21));
+        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
+        $s4 = $s4->addInt32($carry3);
+        $s3 = $s3->subInt32($carry3->shiftLeft(21));
+        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
+        $s6 = $s6->addInt32($carry5);
+        $s5 = $s5->subInt32($carry5->shiftLeft(21));
+        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
+        $s8 = $s8->addInt32($carry7);
+        $s7 = $s7->subInt32($carry7->shiftLeft(21));
+        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
+        $s10 = $s10->addInt32($carry9);
+        $s9 = $s9->subInt32($carry9->shiftLeft(21));
+        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
+        $s12 = $s12->addInt32($carry11);
+        $s11 = $s11->subInt32($carry11->shiftLeft(21));
+
+        $s0  =  $s0->addInt32($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt32($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt32($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt32($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt32($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt32($s12->mulInt(683901, 20));
+        $s12 = new ParagonIE_Sodium_Core32_Int32();
+
+        $carry0 = $s0->shiftRight(21);
+        $s1 = $s1->addInt32($carry0);
+        $s0 = $s0->subInt32($carry0->shiftLeft(21));
+        $carry1 = $s1->shiftRight(21);
+        $s2 = $s2->addInt32($carry1);
+        $s1 = $s1->subInt32($carry1->shiftLeft(21));
+        $carry2 = $s2->shiftRight(21);
+        $s3 = $s3->addInt32($carry2);
+        $s2 = $s2->subInt32($carry2->shiftLeft(21));
+        $carry3 = $s3->shiftRight(21);
+        $s4 = $s4->addInt32($carry3);
+        $s3 = $s3->subInt32($carry3->shiftLeft(21));
+        $carry4 = $s4->shiftRight(21);
+        $s5 = $s5->addInt32($carry4);
+        $s4 = $s4->subInt32($carry4->shiftLeft(21));
+        $carry5 = $s5->shiftRight(21);
+        $s6 = $s6->addInt32($carry5);
+        $s5 = $s5->subInt32($carry5->shiftLeft(21));
+        $carry6 = $s6->shiftRight(21);
+        $s7 = $s7->addInt32($carry6);
+        $s6 = $s6->subInt32($carry6->shiftLeft(21));
+        $carry7 = $s7->shiftRight(21);
+        $s8 = $s8->addInt32($carry7);
+        $s7 = $s7->subInt32($carry7->shiftLeft(21));
+        $carry8 = $s8->shiftRight(21);
+        $s9 = $s9->addInt32($carry8);
+        $s8 = $s8->subInt32($carry8->shiftLeft(21));
+        $carry9 = $s9->shiftRight(21);
+        $s10 = $s10->addInt32($carry9);
+        $s9 = $s9->subInt32($carry9->shiftLeft(21));
+        $carry10 = $s10->shiftRight(21);
+        $s11 = $s11->addInt32($carry10);
+        $s10 = $s10->subInt32($carry10->shiftLeft(21));
+        $carry11 = $s11->shiftRight(21);
+        $s12 = $s12->addInt32($carry11);
+        $s11 = $s11->subInt32($carry11->shiftLeft(21));
+
+        $s0  =  $s0->addInt32($s12->mulInt(666643, 20));
+        $s1  =  $s1->addInt32($s12->mulInt(470296, 19));
+        $s2  =  $s2->addInt32($s12->mulInt(654183, 20));
+        $s3  =  $s3->subInt32($s12->mulInt(997805, 20));
+        $s4  =  $s4->addInt32($s12->mulInt(136657, 18));
+        $s5  =  $s5->subInt32($s12->mulInt(683901, 20));
+
+        $carry0 = $s0->shiftRight(21);
+        $s1 = $s1->addInt32($carry0);
+        $s0 = $s0->subInt32($carry0->shiftLeft(21));
+        $carry1 = $s1->shiftRight(21);
+        $s2 = $s2->addInt32($carry1);
+        $s1 = $s1->subInt32($carry1->shiftLeft(21));
+        $carry2 = $s2->shiftRight(21);
+        $s3 = $s3->addInt32($carry2);
+        $s2 = $s2->subInt32($carry2->shiftLeft(21));
+        $carry3 = $s3->shiftRight(21);
+        $s4 = $s4->addInt32($carry3);
+        $s3 = $s3->subInt32($carry3->shiftLeft(21));
+        $carry4 = $s4->shiftRight(21);
+        $s5 = $s5->addInt32($carry4);
+        $s4 = $s4->subInt32($carry4->shiftLeft(21));
+        $carry5 = $s5->shiftRight(21);
+        $s6 = $s6->addInt32($carry5);
+        $s5 = $s5->subInt32($carry5->shiftLeft(21));
+        $carry6 = $s6->shiftRight(21);
+        $s7 = $s7->addInt32($carry6);
+        $s6 = $s6->subInt32($carry6->shiftLeft(21));
+        $carry7 = $s7->shiftRight(21);
+        $s8 = $s8->addInt32($carry7);
+        $s7 = $s7->subInt32($carry7->shiftLeft(21));
+        $carry8 = $s8->shiftRight(21);
+        $s9 = $s9->addInt32($carry8);
+        $s8 = $s8->subInt32($carry8->shiftLeft(21));
+        $carry9 = $s9->shiftRight(21);
+        $s10 = $s10->addInt32($carry9);
+        $s9 = $s9->subInt32($carry9->shiftLeft(21));
+        $carry10 = $s10->shiftRight(21);
+        $s11 = $s11->addInt32($carry10);
+        $s10 = $s10->subInt32($carry10->shiftLeft(21));
+
+        $S0 = $s0->toInt();
+        $S1 = $s1->toInt();
+        $S2 = $s2->toInt();
+        $S3 = $s3->toInt();
+        $S4 = $s4->toInt();
+        $S5 = $s5->toInt();
+        $S6 = $s6->toInt();
+        $S7 = $s7->toInt();
+        $S8 = $s8->toInt();
+        $S9 = $s9->toInt();
+        $S10 = $s10->toInt();
+        $S11 = $s11->toInt();
+
+        /**
+         * @var array<int, int>
+         */
+        $arr = array(
+            (int) ($S0 >> 0),
+            (int) ($S0 >> 8),
+            (int) (($S0 >> 16) | ($S1 << 5)),
+            (int) ($S1 >> 3),
+            (int) ($S1 >> 11),
+            (int) (($S1 >> 19) | ($S2 << 2)),
+            (int) ($S2 >> 6),
+            (int) (($S2 >> 14) | ($S3 << 7)),
+            (int) ($S3 >> 1),
+            (int) ($S3 >> 9),
+            (int) (($S3 >> 17) | ($S4 << 4)),
+            (int) ($S4 >> 4),
+            (int) ($S4 >> 12),
+            (int) (($S4 >> 20) | ($S5 << 1)),
+            (int) ($S5 >> 7),
+            (int) (($S5 >> 15) | ($S6 << 6)),
+            (int) ($S6 >> 2),
+            (int) ($S6 >> 10),
+            (int) (($S6 >> 18) | ($S7 << 3)),
+            (int) ($S7 >> 5),
+            (int) ($S7 >> 13),
+            (int) ($S8 >> 0),
+            (int) ($S8 >> 8),
+            (int) (($S8 >> 16) | ($S9 << 5)),
+            (int) ($S9 >> 3),
+            (int) ($S9 >> 11),
+            (int) (($S9 >> 19) | ($S10 << 2)),
+            (int) ($S10 >> 6),
+            (int) (($S10 >> 14) | ($S11 << 7)),
+            (int) ($S11 >> 1),
+            (int) ($S11 >> 9),
+            (int) $S11 >> 17
+        );
+        return self::intArrayToString($arr);
+    }
+
+    /**
+     * multiply by the order of the main subgroup l = 2^252+27742317777372353535851937790883648493
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
+     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function ge_mul_l(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A)
+    {
+        /** @var array<int, int> $aslide */
+        $aslide = array(
+            13, 0, 0, 0, 0, -1, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0,
+            0, 0, 0, -3, 0, 0, 0, 0, -13, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 3, 0,
+            0, 0, 0, -13, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0,
+            0, 0, 11, 0, 0, 0, 0, -13, 0, 0, 0, 0, 0, 0, -3, 0, 0, 0, 0, 0, -1,
+            0, 0, 0, 0, 3, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
+            0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 5, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
+        );
+
+        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Cached> $Ai size 8 */
+        $Ai = array();
+
+        # ge_p3_to_cached(&Ai[0], A);
+        $Ai[0] = self::ge_p3_to_cached($A);
+        # ge_p3_dbl(&t, A);
+        $t = self::ge_p3_dbl($A);
+        # ge_p1p1_to_p3(&A2, &t);
+        $A2 = self::ge_p1p1_to_p3($t);
+
+        for ($i = 1; $i < 8; ++$i) {
+            # ge_add(&t, &A2, &Ai[0]);
+            $t = self::ge_add($A2, $Ai[$i - 1]);
+            # ge_p1p1_to_p3(&u, &t);
+            $u = self::ge_p1p1_to_p3($t);
+            # ge_p3_to_cached(&Ai[i], &u);
+            $Ai[$i] = self::ge_p3_to_cached($u);
+        }
+
+        $r = self::ge_p3_0();
+        for ($i = 252; $i >= 0; --$i) {
+            $t = self::ge_p3_dbl($r);
+            if ($aslide[$i] > 0) {
+                # ge_p1p1_to_p3(&u, &t);
+                $u = self::ge_p1p1_to_p3($t);
+                # ge_add(&t, &u, &Ai[aslide[i] / 2]);
+                $t = self::ge_add($u, $Ai[(int)($aslide[$i] / 2)]);
+            } elseif ($aslide[$i] < 0) {
+                # ge_p1p1_to_p3(&u, &t);
+                $u = self::ge_p1p1_to_p3($t);
+                # ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]);
+                $t = self::ge_sub($u, $Ai[(int)(-$aslide[$i] / 2)]);
+            }
+        }
+        # ge_p1p1_to_p3(r, &t);
+        return self::ge_p1p1_to_p3($t);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
new file mode 100644
index 00000000..45f0807a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
@@ -0,0 +1,221 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Fe', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_Fe
+ *
+ * This represents a Field Element
+ */
+class ParagonIE_Sodium_Core32_Curve25519_Fe implements ArrayAccess
+{
+    /**
+     * @var array<int, ParagonIE_Sodium_Core32_Int32>
+     */
+    protected $container = array();
+
+    /**
+     * @var int
+     */
+    protected $size = 10;
+
+    /**
+     * ParagonIE_Sodium_Core32_Curve25519_Fe constructor.
+     * @param int $size
+     */
+    public function __construct($size = 10)
+    {
+        $this->size = 10;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param array<int, ParagonIE_Sodium_Core32_Int32> $array
+     * @param bool $save_indexes
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fromArray($array, $save_indexes = null)
+    {
+        $count = count($array);
+        if ($save_indexes) {
+            $keys = array_keys($array);
+        } else {
+            $keys = range(0, $count - 1);
+        }
+        $array = array_values($array);
+
+        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
+        if ($save_indexes) {
+            for ($i = 0; $i < $count; ++$i) {
+                $array[$i]->overflow = 0;
+                $obj->offsetSet($keys[$i], $array[$i]);
+            }
+        } else {
+            for ($i = 0; $i < $count; ++$i) {
+                $array[$i]->overflow = 0;
+                $obj->offsetSet($i, $array[$i]);
+            }
+        }
+        return $obj;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param array<int, int> $array
+     * @param bool $save_indexes
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fromIntArray($array, $save_indexes = null)
+    {
+        $count = count($array);
+        if ($save_indexes) {
+            $keys = array_keys($array);
+        } else {
+            $keys = range(0, $count - 1);
+        }
+        $array = array_values($array);
+        $set = array();
+        /** @var int $i */
+        /** @var int $v */
+        foreach ($array as $i => $v) {
+            $set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt($v);
+        }
+
+        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe($count);
+        if ($save_indexes) {
+            for ($i = 0; $i < $count; ++$i) {
+                $set[$i]->overflow = 0;
+                $obj->offsetSet($keys[$i], $set[$i]);
+            }
+        } else {
+            for ($i = 0; $i < $count; ++$i) {
+                $set[$i]->overflow = 0;
+                $obj->offsetSet($i, $set[$i]);
+            }
+        }
+        return $obj;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @param mixed $value
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
+            throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
+        }
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            ParagonIE_Sodium_Core32_Util::declareScalarType($offset, 'int', 1);
+            $this->container[(int) $offset] = $value;
+        }
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return bool
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return void
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param mixed $offset
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @psalm-suppress MixedArrayOffset
+     */
+    public function offsetGet($offset)
+    {
+        if (!isset($this->container[$offset])) {
+            $this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
+        }
+        /** @var ParagonIE_Sodium_Core32_Int32 $get */
+        $get = $this->container[$offset];
+        return $get;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return array
+     */
+    public function __debugInfo()
+    {
+        if (empty($this->container)) {
+            return array();
+        }
+        $c = array(
+            (int) ($this->container[0]->toInt()),
+            (int) ($this->container[1]->toInt()),
+            (int) ($this->container[2]->toInt()),
+            (int) ($this->container[3]->toInt()),
+            (int) ($this->container[4]->toInt()),
+            (int) ($this->container[5]->toInt()),
+            (int) ($this->container[6]->toInt()),
+            (int) ($this->container[7]->toInt()),
+            (int) ($this->container[8]->toInt()),
+            (int) ($this->container[9]->toInt())
+        );
+        
+        /* 
+        $c = array(
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[0]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[1]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[2]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[3]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[4]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[5]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[6]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[7]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[8]->toReverseString()),
+            ParagonIE_Sodium_Core_Util::bin2hex($this->container[9]->toReverseString())
+        );
+        $c = array(
+            json_encode($this->container[0]->limbs),
+            json_encode($this->container[1]->limbs),
+            json_encode($this->container[2]->limbs),
+            json_encode($this->container[3]->limbs),
+            json_encode($this->container[4]->limbs),
+            json_encode($this->container[5]->limbs),
+            json_encode($this->container[6]->limbs),
+            json_encode($this->container[7]->limbs),
+            json_encode($this->container[8]->limbs),
+            json_encode($this->container[9]->limbs)
+        );
+        */
+        return array(implode(', ', $c));
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php
new file mode 100644
index 00000000..970481fd
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php
@@ -0,0 +1,65 @@
+<?php
+
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
+ */
+class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
+{
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $YplusX;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $YminusX;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $T2d;
+
+    /**
+     * ParagonIE_Sodium_Core32_Curve25519_Ge_Cached constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YplusX
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YminusX
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $Z
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $T2d
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $YplusX = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $YminusX = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $Z = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $T2d = null
+    ) {
+        if ($YplusX === null) {
+            $YplusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->YplusX = $YplusX;
+        if ($YminusX === null) {
+            $YminusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->YminusX = $YminusX;
+        if ($Z === null) {
+            $Z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->Z = $Z;
+        if ($T2d === null) {
+            $T2d = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->T2d = $T2d;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php
new file mode 100644
index 00000000..ff10b1d7
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php
@@ -0,0 +1,67 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+ */
+class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
+{
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $T;
+
+    /**
+     * ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
+     *
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
+    ) {
+        if ($x === null) {
+            $x = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->Z = $z;
+        if ($t === null) {
+            $t = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->T = $t;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php
new file mode 100644
index 00000000..8a45a913
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php
@@ -0,0 +1,54 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P2', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+ */
+class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
+{
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * ParagonIE_Sodium_Core32_Curve25519_Ge_P2 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->Z = $z;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php
new file mode 100644
index 00000000..c9e4b16d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php
@@ -0,0 +1,65 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+ */
+class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
+{
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $X;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Y;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $Z;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $T;
+
+    /**
+     * ParagonIE_Sodium_Core32_Curve25519_Ge_P3 constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
+    ) {
+        if ($x === null) {
+            $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->X = $x;
+        if ($y === null) {
+            $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->Y = $y;
+        if ($z === null) {
+            $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->Z = $z;
+        if ($t === null) {
+            $t = new ParagonIE_Sodium_Core32_Curve25519_Fe();
+        }
+        $this->T = $t;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php
new file mode 100644
index 00000000..b590b75d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php
@@ -0,0 +1,56 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+ */
+class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
+{
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $yplusx;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $yminusx;
+
+    /**
+     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
+     */
+    public $xy2d;
+
+    /**
+     * ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function __construct(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx = null,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d = null
+    ) {
+        if ($yplusx === null) {
+            $yplusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->yplusx = $yplusx;
+        if ($yminusx === null) {
+            $yminusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->yminusx = $yminusx;
+        if ($xy2d === null) {
+            $xy2d = ParagonIE_Sodium_Core32_Curve25519::fe_0();
+        }
+        $this->xy2d = $xy2d;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/H.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/H.php
new file mode 100644
index 00000000..48c999a9
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/H.php
@@ -0,0 +1,1467 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Curve25519_H', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Curve25519_H
+ *
+ * This just contains the constants in the ref10/base.h file
+ */
+class ParagonIE_Sodium_Core32_Curve25519_H extends ParagonIE_Sodium_Core32_Util
+{
+    /**
+     * See: libsodium's crypto_core/curve25519/ref10/base.h
+     *
+     * @var array<int, array<int, array<int, array<int, int>>>> Basically, int[32][8][3][10]
+     */
+    protected static $base = array(
+        array(
+            array(
+                array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
+                array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
+                array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
+            ),
+            array(
+                array(-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303),
+                array(-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081),
+                array(26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697),
+            ),
+            array(
+                array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
+                array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
+                array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
+            ),
+            array(
+                array(-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540),
+                array(23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397),
+                array(7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325),
+            ),
+            array(
+                array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
+                array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
+                array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
+            ),
+            array(
+                array(-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777),
+                array(-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737),
+                array(-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652),
+            ),
+            array(
+                array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
+                array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
+                array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
+            ),
+            array(
+                array(14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726),
+                array(-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955),
+                array(27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425),
+            ),
+        ),
+        array(
+            array(
+                array(-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171),
+                array(27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510),
+                array(17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660),
+            ),
+            array(
+                array(-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639),
+                array(29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963),
+                array(5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950),
+            ),
+            array(
+                array(-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568),
+                array(12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335),
+                array(25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628),
+            ),
+            array(
+                array(-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007),
+                array(-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772),
+                array(-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653),
+            ),
+            array(
+                array(2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567),
+                array(13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686),
+                array(21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372),
+            ),
+            array(
+                array(-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887),
+                array(-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954),
+                array(-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953),
+            ),
+            array(
+                array(24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833),
+                array(-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532),
+                array(-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876),
+            ),
+            array(
+                array(2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268),
+                array(33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214),
+                array(1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038),
+            ),
+        ),
+        array(
+            array(
+                array(6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800),
+                array(4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645),
+                array(-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664),
+            ),
+            array(
+                array(1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933),
+                array(-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182),
+                array(-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222),
+            ),
+            array(
+                array(-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991),
+                array(20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880),
+                array(9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092),
+            ),
+            array(
+                array(-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295),
+                array(19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788),
+                array(8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553),
+            ),
+            array(
+                array(-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026),
+                array(11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347),
+                array(-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033),
+            ),
+            array(
+                array(-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395),
+                array(-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278),
+                array(1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890),
+            ),
+            array(
+                array(32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995),
+                array(-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596),
+                array(-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891),
+            ),
+            array(
+                array(31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060),
+                array(11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608),
+                array(-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606),
+            ),
+        ),
+        array(
+            array(
+                array(7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389),
+                array(-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016),
+                array(-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341),
+            ),
+            array(
+                array(-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505),
+                array(14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553),
+                array(-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655),
+            ),
+            array(
+                array(15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220),
+                array(12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631),
+                array(-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099),
+            ),
+            array(
+                array(26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556),
+                array(14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749),
+                array(236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930),
+            ),
+            array(
+                array(1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391),
+                array(5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253),
+                array(20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066),
+            ),
+            array(
+                array(24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958),
+                array(-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082),
+                array(-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383),
+            ),
+            array(
+                array(-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521),
+                array(-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807),
+                array(23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948),
+            ),
+            array(
+                array(9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134),
+                array(-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455),
+                array(27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629),
+            ),
+        ),
+        array(
+            array(
+                array(-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069),
+                array(-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746),
+                array(24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919),
+            ),
+            array(
+                array(11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837),
+                array(8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906),
+                array(-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771),
+            ),
+            array(
+                array(-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817),
+                array(10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098),
+                array(10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409),
+            ),
+            array(
+                array(-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504),
+                array(-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727),
+                array(28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420),
+            ),
+            array(
+                array(-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003),
+                array(-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605),
+                array(-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384),
+            ),
+            array(
+                array(-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701),
+                array(-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683),
+                array(29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708),
+            ),
+            array(
+                array(-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563),
+                array(-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260),
+                array(-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387),
+            ),
+            array(
+                array(-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672),
+                array(23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686),
+                array(-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665),
+            ),
+        ),
+        array(
+            array(
+                array(11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182),
+                array(-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277),
+                array(14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628),
+            ),
+            array(
+                array(-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474),
+                array(-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539),
+                array(-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822),
+            ),
+            array(
+                array(-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970),
+                array(19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756),
+                array(-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508),
+            ),
+            array(
+                array(-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683),
+                array(-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655),
+                array(-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158),
+            ),
+            array(
+                array(-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125),
+                array(-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839),
+                array(-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664),
+            ),
+            array(
+                array(27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294),
+                array(-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899),
+                array(-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070),
+            ),
+            array(
+                array(3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294),
+                array(-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949),
+                array(-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083),
+            ),
+            array(
+                array(31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420),
+                array(-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940),
+                array(29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396),
+            ),
+        ),
+        array(
+            array(
+                array(-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567),
+                array(20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127),
+                array(-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294),
+            ),
+            array(
+                array(-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887),
+                array(22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964),
+                array(16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195),
+            ),
+            array(
+                array(9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244),
+                array(24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999),
+                array(-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762),
+            ),
+            array(
+                array(-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274),
+                array(-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236),
+                array(-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605),
+            ),
+            array(
+                array(-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761),
+                array(-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884),
+                array(-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482),
+            ),
+            array(
+                array(-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638),
+                array(-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490),
+                array(-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170),
+            ),
+            array(
+                array(5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736),
+                array(10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124),
+                array(-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392),
+            ),
+            array(
+                array(8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029),
+                array(6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048),
+                array(28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958),
+            ),
+        ),
+        array(
+            array(
+                array(24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593),
+                array(26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071),
+                array(-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692),
+            ),
+            array(
+                array(11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687),
+                array(-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441),
+                array(-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001),
+            ),
+            array(
+                array(-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460),
+                array(-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007),
+                array(-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762),
+            ),
+            array(
+                array(15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005),
+                array(-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674),
+                array(4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035),
+            ),
+            array(
+                array(7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590),
+                array(-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957),
+                array(-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812),
+            ),
+            array(
+                array(33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740),
+                array(-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122),
+                array(-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158),
+            ),
+            array(
+                array(8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885),
+                array(26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140),
+                array(19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857),
+            ),
+            array(
+                array(801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155),
+                array(19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260),
+                array(19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483),
+            ),
+        ),
+        array(
+            array(
+                array(-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677),
+                array(32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815),
+                array(22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751),
+            ),
+            array(
+                array(-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203),
+                array(-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208),
+                array(1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230),
+            ),
+            array(
+                array(16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850),
+                array(-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389),
+                array(-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968),
+            ),
+            array(
+                array(-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689),
+                array(14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880),
+                array(5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304),
+            ),
+            array(
+                array(30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632),
+                array(-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412),
+                array(20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566),
+            ),
+            array(
+                array(-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038),
+                array(-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232),
+                array(-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943),
+            ),
+            array(
+                array(17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856),
+                array(23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738),
+                array(15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971),
+            ),
+            array(
+                array(-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718),
+                array(-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697),
+                array(-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883),
+            ),
+        ),
+        array(
+            array(
+                array(5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912),
+                array(-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358),
+                array(3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849),
+            ),
+            array(
+                array(29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307),
+                array(-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977),
+                array(-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335),
+            ),
+            array(
+                array(-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644),
+                array(-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616),
+                array(-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735),
+            ),
+            array(
+                array(-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099),
+                array(29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341),
+                array(-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336),
+            ),
+            array(
+                array(-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646),
+                array(31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425),
+                array(-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388),
+            ),
+            array(
+                array(-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743),
+                array(-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822),
+                array(-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462),
+            ),
+            array(
+                array(18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985),
+                array(9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702),
+                array(-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797),
+            ),
+            array(
+                array(21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293),
+                array(27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100),
+                array(19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688),
+            ),
+        ),
+        array(
+            array(
+                array(12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186),
+                array(2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610),
+                array(-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707),
+            ),
+            array(
+                array(7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220),
+                array(915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025),
+                array(32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044),
+            ),
+            array(
+                array(32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992),
+                array(-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027),
+                array(21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197),
+            ),
+            array(
+                array(8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901),
+                array(31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952),
+                array(19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878),
+            ),
+            array(
+                array(-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390),
+                array(32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730),
+                array(2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730),
+            ),
+            array(
+                array(-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180),
+                array(-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272),
+                array(-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715),
+            ),
+            array(
+                array(-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970),
+                array(-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772),
+                array(-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865),
+            ),
+            array(
+                array(15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750),
+                array(20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373),
+                array(32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348),
+            ),
+        ),
+        array(
+            array(
+                array(9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144),
+                array(-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195),
+                array(5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086),
+            ),
+            array(
+                array(-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684),
+                array(-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518),
+                array(-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233),
+            ),
+            array(
+                array(-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793),
+                array(-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794),
+                array(580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435),
+            ),
+            array(
+                array(23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921),
+                array(13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518),
+                array(2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563),
+            ),
+            array(
+                array(14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278),
+                array(-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024),
+                array(4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030),
+            ),
+            array(
+                array(10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783),
+                array(27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717),
+                array(6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844),
+            ),
+            array(
+                array(14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333),
+                array(16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048),
+                array(22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760),
+            ),
+            array(
+                array(-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760),
+                array(-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757),
+                array(-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112),
+            ),
+        ),
+        array(
+            array(
+                array(-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468),
+                array(3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184),
+                array(10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289),
+            ),
+            array(
+                array(15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066),
+                array(24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882),
+                array(13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226),
+            ),
+            array(
+                array(16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101),
+                array(29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279),
+                array(-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811),
+            ),
+            array(
+                array(27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709),
+                array(20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714),
+                array(-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121),
+            ),
+            array(
+                array(9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464),
+                array(12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847),
+                array(13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400),
+            ),
+            array(
+                array(4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414),
+                array(-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158),
+                array(17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045),
+            ),
+            array(
+                array(-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415),
+                array(-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459),
+                array(-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079),
+            ),
+            array(
+                array(21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412),
+                array(-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743),
+                array(-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836),
+            ),
+        ),
+        array(
+            array(
+                array(12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022),
+                array(18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429),
+                array(-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065),
+            ),
+            array(
+                array(30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861),
+                array(10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000),
+                array(-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101),
+            ),
+            array(
+                array(32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815),
+                array(29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642),
+                array(10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966),
+            ),
+            array(
+                array(25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574),
+                array(-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742),
+                array(-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689),
+            ),
+            array(
+                array(12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020),
+                array(-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772),
+                array(3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982),
+            ),
+            array(
+                array(-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953),
+                array(-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218),
+                array(-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265),
+            ),
+            array(
+                array(29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073),
+                array(-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325),
+                array(-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798),
+            ),
+            array(
+                array(-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870),
+                array(-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863),
+                array(-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927),
+            ),
+        ),
+        array(
+            array(
+                array(-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267),
+                array(-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663),
+                array(22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862),
+            ),
+            array(
+                array(-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673),
+                array(15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943),
+                array(15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020),
+            ),
+            array(
+                array(-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238),
+                array(11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064),
+                array(14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795),
+            ),
+            array(
+                array(15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052),
+                array(-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904),
+                array(29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531),
+            ),
+            array(
+                array(-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979),
+                array(-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841),
+                array(10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431),
+            ),
+            array(
+                array(10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324),
+                array(-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940),
+                array(10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320),
+            ),
+            array(
+                array(-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184),
+                array(14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114),
+                array(30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878),
+            ),
+            array(
+                array(12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784),
+                array(-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091),
+                array(-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585),
+            ),
+        ),
+        array(
+            array(
+                array(-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208),
+                array(10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864),
+                array(17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661),
+            ),
+            array(
+                array(7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233),
+                array(26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212),
+                array(-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525),
+            ),
+            array(
+                array(-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068),
+                array(9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397),
+                array(-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988),
+            ),
+            array(
+                array(5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889),
+                array(32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038),
+                array(14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697),
+            ),
+            array(
+                array(20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875),
+                array(-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905),
+                array(-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656),
+            ),
+            array(
+                array(11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818),
+                array(27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714),
+                array(10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203),
+            ),
+            array(
+                array(20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931),
+                array(-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024),
+                array(-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084),
+            ),
+            array(
+                array(-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204),
+                array(20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817),
+                array(27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667),
+            ),
+        ),
+        array(
+            array(
+                array(11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504),
+                array(-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768),
+                array(-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255),
+            ),
+            array(
+                array(6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790),
+                array(1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438),
+                array(-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333),
+            ),
+            array(
+                array(17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971),
+                array(31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905),
+                array(29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409),
+            ),
+            array(
+                array(12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409),
+                array(6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499),
+                array(-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363),
+            ),
+            array(
+                array(28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664),
+                array(-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324),
+                array(-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940),
+            ),
+            array(
+                array(13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990),
+                array(-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914),
+                array(-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290),
+            ),
+            array(
+                array(24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257),
+                array(-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433),
+                array(-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236),
+            ),
+            array(
+                array(-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045),
+                array(11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093),
+                array(-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347),
+            ),
+        ),
+        array(
+            array(
+                array(-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191),
+                array(-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507),
+                array(-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906),
+            ),
+            array(
+                array(3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018),
+                array(-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109),
+                array(-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926),
+            ),
+            array(
+                array(-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528),
+                array(8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625),
+                array(-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286),
+            ),
+            array(
+                array(2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033),
+                array(27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866),
+                array(21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896),
+            ),
+            array(
+                array(30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075),
+                array(26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347),
+                array(-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437),
+            ),
+            array(
+                array(-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165),
+                array(-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588),
+                array(-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193),
+            ),
+            array(
+                array(-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017),
+                array(-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883),
+                array(21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961),
+            ),
+            array(
+                array(8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043),
+                array(29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663),
+                array(-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362),
+            ),
+        ),
+        array(
+            array(
+                array(-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860),
+                array(2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466),
+                array(-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063),
+            ),
+            array(
+                array(-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997),
+                array(-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295),
+                array(-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369),
+            ),
+            array(
+                array(9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385),
+                array(18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109),
+                array(2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906),
+            ),
+            array(
+                array(4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424),
+                array(-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185),
+                array(7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962),
+            ),
+            array(
+                array(-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325),
+                array(10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593),
+                array(696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404),
+            ),
+            array(
+                array(-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644),
+                array(17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801),
+                array(26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804),
+            ),
+            array(
+                array(-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884),
+                array(-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577),
+                array(-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849),
+            ),
+            array(
+                array(32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473),
+                array(-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644),
+                array(-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319),
+            ),
+        ),
+        array(
+            array(
+                array(-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599),
+                array(-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768),
+                array(-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084),
+            ),
+            array(
+                array(-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328),
+                array(-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369),
+                array(20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920),
+            ),
+            array(
+                array(12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815),
+                array(-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025),
+                array(-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397),
+            ),
+            array(
+                array(-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448),
+                array(6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981),
+                array(30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165),
+            ),
+            array(
+                array(32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501),
+                array(17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073),
+                array(-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861),
+            ),
+            array(
+                array(14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845),
+                array(-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211),
+                array(18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870),
+            ),
+            array(
+                array(10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096),
+                array(33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803),
+                array(-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168),
+            ),
+            array(
+                array(30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965),
+                array(-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505),
+                array(18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598),
+            ),
+        ),
+        array(
+            array(
+                array(5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782),
+                array(5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900),
+                array(-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479),
+            ),
+            array(
+                array(-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208),
+                array(8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232),
+                array(17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719),
+            ),
+            array(
+                array(16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271),
+                array(-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326),
+                array(-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132),
+            ),
+            array(
+                array(14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300),
+                array(8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570),
+                array(15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670),
+            ),
+            array(
+                array(-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994),
+                array(-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913),
+                array(31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317),
+            ),
+            array(
+                array(-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730),
+                array(842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096),
+                array(-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078),
+            ),
+            array(
+                array(-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411),
+                array(-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905),
+                array(-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654),
+            ),
+            array(
+                array(-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870),
+                array(-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498),
+                array(12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579),
+            ),
+        ),
+        array(
+            array(
+                array(14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677),
+                array(10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647),
+                array(-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743),
+            ),
+            array(
+                array(-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468),
+                array(21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375),
+                array(-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155),
+            ),
+            array(
+                array(6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725),
+                array(-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612),
+                array(-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943),
+            ),
+            array(
+                array(-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944),
+                array(30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928),
+                array(9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406),
+            ),
+            array(
+                array(22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139),
+                array(-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963),
+                array(-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693),
+            ),
+            array(
+                array(1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734),
+                array(-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680),
+                array(-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410),
+            ),
+            array(
+                array(-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931),
+                array(-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654),
+                array(22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710),
+            ),
+            array(
+                array(29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180),
+                array(-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684),
+                array(-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895),
+            ),
+        ),
+        array(
+            array(
+                array(22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501),
+                array(-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413),
+                array(6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880),
+            ),
+            array(
+                array(-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874),
+                array(22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962),
+                array(-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899),
+            ),
+            array(
+                array(21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152),
+                array(9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063),
+                array(7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080),
+            ),
+            array(
+                array(-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146),
+                array(-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183),
+                array(-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133),
+            ),
+            array(
+                array(-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421),
+                array(-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622),
+                array(-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197),
+            ),
+            array(
+                array(2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663),
+                array(31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753),
+                array(4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755),
+            ),
+            array(
+                array(-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862),
+                array(-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118),
+                array(26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171),
+            ),
+            array(
+                array(15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380),
+                array(16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824),
+                array(28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270),
+            ),
+        ),
+        array(
+            array(
+                array(-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438),
+                array(-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584),
+                array(-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562),
+            ),
+            array(
+                array(30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471),
+                array(18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610),
+                array(19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269),
+            ),
+            array(
+                array(-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650),
+                array(14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369),
+                array(19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461),
+            ),
+            array(
+                array(30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462),
+                array(-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793),
+                array(-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218),
+            ),
+            array(
+                array(-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226),
+                array(18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019),
+                array(-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037),
+            ),
+            array(
+                array(31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171),
+                array(-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132),
+                array(-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841),
+            ),
+            array(
+                array(21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181),
+                array(-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210),
+                array(-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040),
+            ),
+            array(
+                array(3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935),
+                array(24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105),
+                array(-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814),
+            ),
+        ),
+        array(
+            array(
+                array(793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852),
+                array(5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581),
+                array(-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646),
+            ),
+            array(
+                array(10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844),
+                array(10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025),
+                array(27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453),
+            ),
+            array(
+                array(-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068),
+                array(4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192),
+                array(-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921),
+            ),
+            array(
+                array(-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259),
+                array(-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426),
+                array(-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072),
+            ),
+            array(
+                array(-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305),
+                array(13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832),
+                array(28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943),
+            ),
+            array(
+                array(-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011),
+                array(24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447),
+                array(17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494),
+            ),
+            array(
+                array(-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245),
+                array(-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859),
+                array(28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915),
+            ),
+            array(
+                array(16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707),
+                array(10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848),
+                array(-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224),
+            ),
+        ),
+        array(
+            array(
+                array(-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391),
+                array(15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215),
+                array(-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101),
+            ),
+            array(
+                array(23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713),
+                array(21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849),
+                array(-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930),
+            ),
+            array(
+                array(-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940),
+                array(-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031),
+                array(-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404),
+            ),
+            array(
+                array(-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243),
+                array(-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116),
+                array(-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525),
+            ),
+            array(
+                array(-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509),
+                array(-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883),
+                array(15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865),
+            ),
+            array(
+                array(-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660),
+                array(4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273),
+                array(-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138),
+            ),
+            array(
+                array(-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560),
+                array(-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135),
+                array(2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941),
+            ),
+            array(
+                array(-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739),
+                array(18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756),
+                array(-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819),
+            ),
+        ),
+        array(
+            array(
+                array(-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347),
+                array(-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028),
+                array(21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075),
+            ),
+            array(
+                array(16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799),
+                array(-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609),
+                array(-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817),
+            ),
+            array(
+                array(-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989),
+                array(-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523),
+                array(4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278),
+            ),
+            array(
+                array(31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045),
+                array(19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377),
+                array(24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480),
+            ),
+            array(
+                array(17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016),
+                array(510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426),
+                array(18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525),
+            ),
+            array(
+                array(13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396),
+                array(9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080),
+                array(12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892),
+            ),
+            array(
+                array(15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275),
+                array(11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074),
+                array(20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140),
+            ),
+            array(
+                array(-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717),
+                array(-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101),
+                array(24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127),
+            ),
+        ),
+        array(
+            array(
+                array(-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632),
+                array(-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415),
+                array(-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160),
+            ),
+            array(
+                array(31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876),
+                array(22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625),
+                array(-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478),
+            ),
+            array(
+                array(27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164),
+                array(26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595),
+                array(-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248),
+            ),
+            array(
+                array(-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858),
+                array(15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193),
+                array(8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184),
+            ),
+            array(
+                array(-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942),
+                array(-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635),
+                array(21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948),
+            ),
+            array(
+                array(11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935),
+                array(-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415),
+                array(-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416),
+            ),
+            array(
+                array(-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018),
+                array(4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778),
+                array(366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659),
+            ),
+            array(
+                array(-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385),
+                array(18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503),
+                array(476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329),
+            ),
+        ),
+        array(
+            array(
+                array(20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056),
+                array(-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838),
+                array(24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948),
+            ),
+            array(
+                array(-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691),
+                array(-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118),
+                array(-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517),
+            ),
+            array(
+                array(-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269),
+                array(-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904),
+                array(-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589),
+            ),
+            array(
+                array(-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193),
+                array(-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910),
+                array(-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930),
+            ),
+            array(
+                array(-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667),
+                array(25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481),
+                array(-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876),
+            ),
+            array(
+                array(22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640),
+                array(-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278),
+                array(-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112),
+            ),
+            array(
+                array(26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272),
+                array(17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012),
+                array(-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221),
+            ),
+            array(
+                array(30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046),
+                array(13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345),
+                array(-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310),
+            ),
+        ),
+        array(
+            array(
+                array(19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937),
+                array(31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636),
+                array(-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008),
+            ),
+            array(
+                array(-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429),
+                array(-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576),
+                array(31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066),
+            ),
+            array(
+                array(-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490),
+                array(-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104),
+                array(33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053),
+            ),
+            array(
+                array(31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275),
+                array(-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511),
+                array(22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095),
+            ),
+            array(
+                array(-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439),
+                array(23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939),
+                array(-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424),
+            ),
+            array(
+                array(2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310),
+                array(3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608),
+                array(-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079),
+            ),
+            array(
+                array(-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101),
+                array(21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418),
+                array(18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576),
+            ),
+            array(
+                array(30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356),
+                array(9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996),
+                array(-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099),
+            ),
+        ),
+        array(
+            array(
+                array(-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728),
+                array(-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658),
+                array(-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242),
+            ),
+            array(
+                array(-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001),
+                array(-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766),
+                array(18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373),
+            ),
+            array(
+                array(26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458),
+                array(-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628),
+                array(-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657),
+            ),
+            array(
+                array(-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062),
+                array(25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616),
+                array(31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014),
+            ),
+            array(
+                array(24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383),
+                array(-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814),
+                array(-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718),
+            ),
+            array(
+                array(30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417),
+                array(2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222),
+                array(33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444),
+            ),
+            array(
+                array(-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597),
+                array(23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970),
+                array(1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799),
+            ),
+            array(
+                array(-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647),
+                array(13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511),
+                array(-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032),
+            ),
+        ),
+        array(
+            array(
+                array(9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834),
+                array(-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461),
+                array(29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062),
+            ),
+            array(
+                array(-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516),
+                array(-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547),
+                array(-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240),
+            ),
+            array(
+                array(-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038),
+                array(-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741),
+                array(16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103),
+            ),
+            array(
+                array(-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747),
+                array(-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323),
+                array(31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016),
+            ),
+            array(
+                array(-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373),
+                array(15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228),
+                array(-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141),
+            ),
+            array(
+                array(16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399),
+                array(11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831),
+                array(-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376),
+            ),
+            array(
+                array(-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313),
+                array(-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958),
+                array(-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577),
+            ),
+            array(
+                array(-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743),
+                array(29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684),
+                array(-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476),
+            ),
+        )
+    );
+
+    /**
+     * See: libsodium's crypto_core/curve25519/ref10/base2.h
+     *
+     * @var array<int, array<int, array<int, int>>> basically int[8][3]
+     */
+    protected static $base2 = array(
+        array(
+            array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
+            array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
+            array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
+        ),
+        array(
+            array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
+            array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
+            array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
+        ),
+        array(
+            array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
+            array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
+            array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
+        ),
+        array(
+            array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
+            array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
+            array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
+        ),
+        array(
+            array(-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877),
+            array(-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951),
+            array(4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784),
+        ),
+        array(
+            array(-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436),
+            array(25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918),
+            array(23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877),
+        ),
+        array(
+            array(-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800),
+            array(-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305),
+            array(-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300),
+        ),
+        array(
+            array(-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876),
+            array(-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619),
+            array(-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683),
+        )
+    );
+
+    /**
+     * 37095705934669439343138083508754565189542113879843219016388785533085940283555
+     *
+     * @var array<int, int>
+     */
+    protected static $d = array(
+        -10913610,
+        13857413,
+        -15372611,
+        6949391,
+        114729,
+        -8787816,
+        -6275908,
+        -3247719,
+        -18696448,
+        -12055116
+    );
+
+    /**
+     * 2 * d = 16295367250680780974490674513165176452449235426866156013048779062215315747161
+     *
+     * @var array<int, int>
+     */
+    protected static $d2 = array(
+        -21827239,
+        -5839606,
+        -30745221,
+        13898782,
+        229458,
+        15978800,
+        -12551817,
+        -6495438,
+        29715968,
+        9444199
+    );
+
+    /**
+     * sqrt(-1)
+     *
+     * @var array<int, int>
+     */
+    protected static $sqrtm1 = array(
+        -32595792,
+        -7943725,
+        9377950,
+        3500415,
+        12389472,
+        -272473,
+        -25146209,
+        -2005654,
+        326686,
+        11406482
+    );
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/README.md b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/README.md
new file mode 100644
index 00000000..e8097fa3
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Curve25519/README.md
@@ -0,0 +1,3 @@
+# Curve25519 Data Structures
+
+These are PHP implementation of the [structs used in the ref10 curve25519 code](https://github.com/jedisct1/libsodium/blob/master/src/libsodium/include/sodium/private/curve25519_ref10.h).
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php
new file mode 100644
index 00000000..0128d8e0
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Ed25519.php
@@ -0,0 +1,480 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Ed25519
+ */
+abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_Curve25519
+{
+    const KEYPAIR_BYTES = 96;
+    const SEED_BYTES = 32;
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return string (96 bytes)
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function keypair()
+    {
+        $seed = random_bytes(self::SEED_BYTES);
+        $pk = '';
+        $sk = '';
+        self::seed_keypair($pk, $sk, $seed);
+        return $sk . $pk;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $pk
+     * @param string $sk
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function seed_keypair(&$pk, &$sk, $seed)
+    {
+        if (self::strlen($seed) !== self::SEED_BYTES) {
+            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
+        }
+
+        /** @var string $pk */
+        $pk = self::publickey_from_secretkey($seed);
+        $sk = $seed . $pk;
+        return $sk;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $keypair
+     * @return string
+     * @throws TypeError
+     */
+    public static function secretkey($keypair)
+    {
+        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+            throw new RangeException('crypto_sign keypair must be 96 bytes long');
+        }
+        return self::substr($keypair, 0, 64);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function publickey($keypair)
+    {
+        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
+            throw new RangeException('crypto_sign keypair must be 96 bytes long');
+        }
+        return self::substr($keypair, 64, 32);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function publickey_from_secretkey($sk)
+    {
+        /** @var string $sk */
+        $sk = hash('sha512', self::substr($sk, 0, 32), true);
+        $sk[0] = self::intToChr(
+            self::chrToInt($sk[0]) & 248
+        );
+        $sk[31] = self::intToChr(
+            (self::chrToInt($sk[31]) & 63) | 64
+        );
+        return self::sk_to_pk($sk);
+    }
+
+    /**
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function pk_to_curve25519($pk)
+    {
+        if (self::small_order($pk)) {
+            throw new SodiumException('Public key is on a small order');
+        }
+        $A = self::ge_frombytes_negate_vartime($pk);
+        $p1 = self::ge_mul_l($A);
+        if (!self::fe_isnonzero($p1->X)) {
+            throw new SodiumException('Unexpected zero result');
+        }
+
+        # fe_1(one_minus_y);
+        # fe_sub(one_minus_y, one_minus_y, A.Y);
+        # fe_invert(one_minus_y, one_minus_y);
+        $one_minux_y = self::fe_invert(
+            self::fe_sub(
+                self::fe_1(),
+                $A->Y
+            )
+        );
+
+
+        # fe_1(x);
+        # fe_add(x, x, A.Y);
+        # fe_mul(x, x, one_minus_y);
+        $x = self::fe_mul(
+            self::fe_add(self::fe_1(), $A->Y),
+            $one_minux_y
+        );
+
+        # fe_tobytes(curve25519_pk, x);
+        return self::fe_tobytes($x);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sk_to_pk($sk)
+    {
+        return self::ge_p3_tobytes(
+            self::ge_scalarmult_base(
+                self::substr($sk, 0, 32)
+            )
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign($message, $sk)
+    {
+        /** @var string $signature */
+        $signature = self::sign_detached($message, $sk);
+        return $signature . $message;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message A signed message
+     * @param string $pk      Public key
+     * @return string         Message (without signature)
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_open($message, $pk)
+    {
+        /** @var string $signature */
+        $signature = self::substr($message, 0, 64);
+
+        /** @var string $message */
+        $message = self::substr($message, 64);
+
+        if (self::verify_detached($signature, $message, $pk)) {
+            return $message;
+        }
+        throw new SodiumException('Invalid signature');
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_detached($message, $sk)
+    {
+        # crypto_hash_sha512(az, sk, 32);
+        $az =  hash('sha512', self::substr($sk, 0, 32), true);
+
+        # az[0] &= 248;
+        # az[31] &= 63;
+        # az[31] |= 64;
+        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+        # crypto_hash_sha512_init(&hs);
+        # crypto_hash_sha512_update(&hs, az + 32, 32);
+        # crypto_hash_sha512_update(&hs, m, mlen);
+        # crypto_hash_sha512_final(&hs, nonce);
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($az, 32, 32));
+        hash_update($hs, $message);
+        $nonceHash = hash_final($hs, true);
+
+        # memmove(sig + 32, sk + 32, 32);
+        $pk = self::substr($sk, 32, 32);
+
+        # sc_reduce(nonce);
+        # ge_scalarmult_base(&R, nonce);
+        # ge_p3_tobytes(sig, &R);
+        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+        $sig = self::ge_p3_tobytes(
+            self::ge_scalarmult_base($nonce)
+        );
+
+        # crypto_hash_sha512_init(&hs);
+        # crypto_hash_sha512_update(&hs, sig, 64);
+        # crypto_hash_sha512_update(&hs, m, mlen);
+        # crypto_hash_sha512_final(&hs, hram);
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
+        hash_update($hs, $message);
+        $hramHash = hash_final($hs, true);
+
+        # sc_reduce(hram);
+        # sc_muladd(sig + 32, hram, az, nonce);
+        $hram = self::sc_reduce($hramHash);
+        $sigAfter = self::sc_muladd($hram, $az, $nonce);
+        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+        try {
+            ParagonIE_Sodium_Compat::memzero($az);
+        } catch (SodiumException $ex) {
+            $az = null;
+        }
+        return $sig;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $sig
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function verify_detached($sig, $message, $pk)
+    {
+        if (self::strlen($sig) < 64) {
+            throw new SodiumException('Signature is too short');
+        }
+        if (self::check_S_lt_L(self::substr($sig, 32, 32))) {
+            throw new SodiumException('S < L - Invalid signature');
+        }
+        if (self::small_order($sig)) {
+            throw new SodiumException('Signature is on too small of an order');
+        }
+        if ((self::chrToInt($sig[63]) & 224) !== 0) {
+            throw new SodiumException('Invalid signature');
+        }
+        $d = 0;
+        for ($i = 0; $i < 32; ++$i) {
+            $d |= self::chrToInt($pk[$i]);
+        }
+        if ($d === 0) {
+            throw new SodiumException('All zero public key');
+        }
+
+        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        $orig = ParagonIE_Sodium_Compat::$fastMult;
+
+        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+        ParagonIE_Sodium_Compat::$fastMult = true;
+
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
+        $A = self::ge_frombytes_negate_vartime($pk);
+
+        /** @var string $hDigest */
+        $hDigest = hash(
+            'sha512',
+            self::substr($sig, 0, 32) .
+            self::substr($pk, 0, 32) .
+            $message,
+            true
+        );
+
+        /** @var string $h */
+        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
+        $R = self::ge_double_scalarmult_vartime(
+            $h,
+            $A,
+            self::substr($sig, 32)
+        );
+
+        /** @var string $rcheck */
+        $rcheck = self::ge_tobytes($R);
+
+        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+        ParagonIE_Sodium_Compat::$fastMult = $orig;
+
+        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $S
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function check_S_lt_L($S)
+    {
+        if (self::strlen($S) < 32) {
+            throw new SodiumException('Signature must be 32 bytes');
+        }
+        static $L = array(
+            0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
+            0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
+        );
+        /** @var array<int, int> $L */
+        $c = 0;
+        $n = 1;
+        $i = 32;
+
+        do {
+            --$i;
+            $x = self::chrToInt($S[$i]);
+            $c |= (
+                (($x - $L[$i]) >> 8) & $n
+            );
+            $n &= (
+                (($x ^ $L[$i]) - 1) >> 8
+            );
+        } while ($i !== 0);
+
+        return $c === 0;
+    }
+
+    /**
+     * @param string $R
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function small_order($R)
+    {
+        static $blacklist = array(
+            /* 0 (order 4) */
+            array(
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            ),
+            /* 1 (order 1) */
+            array(
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            ),
+            /* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+            array(
+                0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
+            ),
+            /* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+            array(
+                0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
+            ),
+            /* p-1 (order 2) */
+            array(
+                0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
+                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
+                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
+                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
+            ),
+            /* p (order 4) */
+            array(
+                0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
+                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
+                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
+                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
+            ),
+            /* p+1 (order 1) */
+            array(
+                0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
+            array(
+                0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
+            array(
+                0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
+            ),
+            /* 2p-1 (order 2) */
+            array(
+                0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ),
+            /* 2p (order 4) */
+            array(
+                0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            ),
+            /* 2p+1 (order 1) */
+            array(
+                0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+            )
+        );
+        /** @var array<int, array<int, int>> $blacklist */
+        $countBlacklist = count($blacklist);
+
+        for ($i = 0; $i < $countBlacklist; ++$i) {
+            $c = 0;
+            for ($j = 0; $j < 32; ++$j) {
+                $c |= self::chrToInt($R[$j]) ^ $blacklist[$i][$j];
+            }
+            if ($c === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/HChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/HChaCha20.php
new file mode 100644
index 00000000..551d995e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/HChaCha20.php
@@ -0,0 +1,127 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_HChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_HChaCha20
+ */
+class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20
+{
+    /**
+     * @param string $in
+     * @param string $key
+     * @param string|null $c
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function hChaCha20($in = '', $key = '', $c = null)
+    {
+        $ctx = array();
+
+        if ($c === null) {
+            $ctx[0] = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+            $ctx[1] = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+            $ctx[2] = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+            $ctx[3] = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        } else {
+            $ctx[0] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
+            $ctx[1] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
+            $ctx[2] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
+            $ctx[3] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+        }
+        $ctx[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
+        $ctx[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
+        $ctx[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
+        $ctx[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
+        $ctx[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
+        $ctx[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
+        $ctx[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
+        $ctx[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
+        $ctx[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
+        $ctx[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
+        $ctx[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
+        $ctx[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+
+        return self::hChaCha20Bytes($ctx);
+    }
+
+    /**
+     * @param array $ctx
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function hChaCha20Bytes(array $ctx)
+    {
+        /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
+        $x0  = $ctx[0];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
+        $x1  = $ctx[1];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x2 */
+        $x2  = $ctx[2];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x3 */
+        $x3  = $ctx[3];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x4 */
+        $x4  = $ctx[4];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x5 */
+        $x5  = $ctx[5];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x6 */
+        $x6  = $ctx[6];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x7 */
+        $x7  = $ctx[7];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x8 */
+        $x8  = $ctx[8];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x9 */
+        $x9  = $ctx[9];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x10 */
+        $x10 = $ctx[10];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x11 */
+        $x11 = $ctx[11];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x12 */
+        $x12 = $ctx[12];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x13 */
+        $x13 = $ctx[13];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x14 */
+        $x14 = $ctx[14];
+        /** @var ParagonIE_Sodium_Core32_Int32 $x15 */
+        $x15 = $ctx[15];
+
+        for ($i = 0; $i < 10; ++$i) {
+            # QUARTERROUND( x0,  x4,  x8,  x12)
+            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+
+            # QUARTERROUND( x1,  x5,  x9,  x13)
+            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
+
+            # QUARTERROUND( x2,  x6,  x10,  x14)
+            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
+
+            # QUARTERROUND( x3,  x7,  x11,  x15)
+            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
+
+            # QUARTERROUND( x0,  x5,  x10,  x15)
+            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
+
+            # QUARTERROUND( x1,  x6,  x11,  x12)
+            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
+
+            # QUARTERROUND( x2,  x7,  x8,  x13)
+            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+
+            # QUARTERROUND( x3,  x4,  x9,  x14)
+            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+        }
+
+        return $x0->toReverseString() .
+            $x1->toReverseString() .
+            $x2->toReverseString() .
+            $x3->toReverseString() .
+            $x12->toReverseString() .
+            $x13->toReverseString() .
+            $x14->toReverseString() .
+            $x15->toReverseString();
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/HSalsa20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/HSalsa20.php
new file mode 100644
index 00000000..39287f2d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/HSalsa20.php
@@ -0,0 +1,141 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_HSalsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_HSalsa20
+ */
+abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20
+{
+    /**
+     * Calculate an hsalsa20 hash of a single block
+     *
+     * HSalsa20 doesn't have a counter and will never be used for more than
+     * one block (used to derive a subkey for xsalsa20).
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $k
+     * @param string|null $c
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function hsalsa20($in, $k, $c = null)
+    {
+        /**
+         * @var ParagonIE_Sodium_Core32_Int32 $x0
+         * @var ParagonIE_Sodium_Core32_Int32 $x1
+         * @var ParagonIE_Sodium_Core32_Int32 $x2
+         * @var ParagonIE_Sodium_Core32_Int32 $x3
+         * @var ParagonIE_Sodium_Core32_Int32 $x4
+         * @var ParagonIE_Sodium_Core32_Int32 $x5
+         * @var ParagonIE_Sodium_Core32_Int32 $x6
+         * @var ParagonIE_Sodium_Core32_Int32 $x7
+         * @var ParagonIE_Sodium_Core32_Int32 $x8
+         * @var ParagonIE_Sodium_Core32_Int32 $x9
+         * @var ParagonIE_Sodium_Core32_Int32 $x10
+         * @var ParagonIE_Sodium_Core32_Int32 $x11
+         * @var ParagonIE_Sodium_Core32_Int32 $x12
+         * @var ParagonIE_Sodium_Core32_Int32 $x13
+         * @var ParagonIE_Sodium_Core32_Int32 $x14
+         * @var ParagonIE_Sodium_Core32_Int32 $x15
+         * @var ParagonIE_Sodium_Core32_Int32 $j0
+         * @var ParagonIE_Sodium_Core32_Int32 $j1
+         * @var ParagonIE_Sodium_Core32_Int32 $j2
+         * @var ParagonIE_Sodium_Core32_Int32 $j3
+         * @var ParagonIE_Sodium_Core32_Int32 $j4
+         * @var ParagonIE_Sodium_Core32_Int32 $j5
+         * @var ParagonIE_Sodium_Core32_Int32 $j6
+         * @var ParagonIE_Sodium_Core32_Int32 $j7
+         * @var ParagonIE_Sodium_Core32_Int32 $j8
+         * @var ParagonIE_Sodium_Core32_Int32 $j9
+         * @var ParagonIE_Sodium_Core32_Int32 $j10
+         * @var ParagonIE_Sodium_Core32_Int32 $j11
+         * @var ParagonIE_Sodium_Core32_Int32 $j12
+         * @var ParagonIE_Sodium_Core32_Int32 $j13
+         * @var ParagonIE_Sodium_Core32_Int32 $j14
+         * @var ParagonIE_Sodium_Core32_Int32 $j15
+         */
+        if (self::strlen($k) < 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        if ($c === null) {
+            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        } else {
+            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
+            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
+            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
+            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+        }
+        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
+        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
+        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
+        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
+        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
+        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
+        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
+        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
+        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
+        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
+        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
+
+        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
+            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
+            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
+            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
+
+            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
+            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
+            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
+            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
+
+            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
+            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
+            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
+            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
+
+            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
+            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
+            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
+            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
+
+            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
+            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
+            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
+            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
+
+            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
+            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
+            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
+            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
+
+            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
+            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
+            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
+            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
+
+            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
+            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
+            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
+            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
+        }
+
+        return $x0->toReverseString() .
+            $x5->toReverseString() .
+            $x10->toReverseString() .
+            $x15->toReverseString() .
+            $x6->toReverseString() .
+            $x7->toReverseString() .
+            $x8->toReverseString() .
+            $x9->toReverseString();
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php
new file mode 100644
index 00000000..c5c8058c
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int32.php
@@ -0,0 +1,650 @@
+<?php
+
+/**
+ * Class ParagonIE_Sodium_Core32_Int32
+ *
+ * Encapsulates a 32-bit integer.
+ *
+ * These are immutable. It always returns a new instance.
+ */
+class ParagonIE_Sodium_Core32_Int32
+{
+    /**
+     * @var array<int, int> - two 16-bit integers
+     *
+     * 0 is the higher 16 bits
+     * 1 is the lower 16 bits
+     */
+    public $limbs;
+
+    /**
+     * @var int
+     */
+    public $overflow = 0;
+
+    /**
+     * @var bool
+     */
+    public $unsignedInt = false;
+
+    /**
+     * ParagonIE_Sodium_Core32_Int32 constructor.
+     * @param array $array
+     * @param bool $unsignedInt
+     */
+    public function __construct($array = array(0, 0), $unsignedInt = false)
+    {
+        $this->limbs = array(
+            (int) $array[0],
+            (int) $array[1]
+        );
+        $this->overflow = 0;
+        $this->unsignedInt = $unsignedInt;
+    }
+
+    /**
+     * Adds two int32 objects
+     *
+     * @param ParagonIE_Sodium_Core32_Int32 $addend
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[1] + $addend->limbs[1];
+        /** @var int $carry */
+        $carry = $tmp >> 16;
+        $return->limbs[1] = (int) ($tmp & 0xffff);
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[0] + $addend->limbs[0] + $carry;
+        $return->limbs[0] = (int) ($tmp & 0xffff);
+        /** @var int overflow */
+        $return->overflow = $this->overflow + $addend->overflow + ($tmp >> 16);
+
+        return $return;
+    }
+
+    /**
+     * Adds a normal integer to an int32 object
+     *
+     * @param int $int
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function addInt($int)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $tmp */
+        $tmp = ($this->limbs[1] & 0xffff) + ($int & 0xffff);
+        /** @var int $carry */
+        $carry = $tmp >> 16;
+        $return->limbs[1] = (int) ($tmp & 0xffff);
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[0] + (($int >> 16) & 0xffff) + $carry;
+        $return->limbs[0] = (int) ($tmp & 0xffff);
+        /** @var int overflow */
+        $return->overflow = $this->overflow + ($tmp >> 16);
+        return $return;
+    }
+
+    /**
+     * @param int $b
+     * @return int
+     */
+    public function compareInt($b = 0)
+    {
+        $gt = 0;
+        $eq = 1;
+
+        $i = 2;
+        $j = 0;
+        while ($i > 0) {
+            --$i;
+            /** @var int $x1 */
+            $x1 = $this->limbs[$i];
+            /** @var int $x2 */
+            $x2 = ($b >> ($j << 4)) & 0xffff;
+            /** @var int $gt */
+            $gt |= (($x2 - $x1) >> 8) & $eq;
+            /** @var int $eq */
+            $eq &= (($x2 ^ $x1) - 1) >> 8;
+        }
+        return ($gt + $gt - $eq) + 1;
+    }
+
+    /**
+     * @param int $m
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function mask($m = 0)
+    {
+        /** @var int $hi */
+        $hi = ($m >> 16) & 0xffff;
+        /** @var int $lo */
+        $lo = ($m & 0xffff);
+        return new ParagonIE_Sodium_Core32_Int32(
+            array(
+                (int) ($this->limbs[0] & $hi),
+                (int) ($this->limbs[1] & $lo)
+            ),
+            $this->unsignedInt
+        );
+    }
+
+    /**
+     * @param int $int
+     * @param int $size
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function mulInt($int = 0, $size = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+        if (!$size) {
+            $size = 31;
+        }
+        /** @var int $size */
+
+        $a = clone $this;
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+
+        for ($i = $size; $i >= 0; --$i) {
+            $m = (int) (-($int & 1));
+            $return = $return->addInt32($a->mask($m));
+            $a = $a->shiftLeft(1);
+            $int >>= 1;
+        }
+        return $return;
+    }
+
+    /**
+     * @param ParagonIE_Sodium_Core32_Int32 $int
+     * @param int $size
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+        if (!$size) {
+            $size = 31;
+        }
+        /** @var int $size */
+
+        $a = clone $this;
+        $b = clone $int;
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $i */
+        for ($i = $size; $i >= 0; --$i) {
+            $m = (int) (-($b->limbs[1] & 1));
+            $return = $return->addInt32($a->mask($m));
+            $a = $a->shiftLeft(1);
+            $b = $b->shiftRight(1);
+        }
+        return $return;
+    }
+
+    /**
+     * OR this 32-bit integer with another.
+     *
+     * @param ParagonIE_Sodium_Core32_Int32 $b
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function orInt32(ParagonIE_Sodium_Core32_Int32 $b)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+        $return->limbs = array(
+            (int) ($this->limbs[0] | $b->limbs[0]),
+            (int) ($this->limbs[1] | $b->limbs[1])
+        );
+        /** @var int overflow */
+        $return->overflow = $this->overflow | $b->overflow;
+        return $return;
+    }
+
+    /**
+     * @param int $b
+     * @return bool
+     */
+    public function isGreaterThan($b = 0)
+    {
+        return $this->compareInt($b) > 0;
+    }
+
+    /**
+     * @param int $b
+     * @return bool
+     */
+    public function isLessThanInt($b = 0)
+    {
+        return $this->compareInt($b) < 0;
+    }
+
+    /**
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     */
+    public function rotateLeft($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 31;
+        if ($c === 0) {
+            // NOP, but we want a copy.
+            $return->limbs = $this->limbs;
+        } else {
+            /** @var int $c */
+
+            /** @var int $idx_shift */
+            $idx_shift = ($c >> 4) & 1;
+
+            /** @var int $sub_shift */
+            $sub_shift = $c & 15;
+
+            /** @var array<int, int> $limbs */
+            $limbs =& $return->limbs;
+
+            /** @var array<int, int> $myLimbs */
+            $myLimbs =& $this->limbs;
+
+            for ($i = 1; $i >= 0; --$i) {
+                /** @var int $j */
+                $j = ($i + $idx_shift) & 1;
+                /** @var int $k */
+                $k = ($i + $idx_shift + 1) & 1;
+                $limbs[$i] = (int) (
+                    (
+                        ($myLimbs[$j] << $sub_shift)
+                            |
+                        ($myLimbs[$k] >> (16 - $sub_shift))
+                    ) & 0xffff
+                );
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * Rotate to the right
+     *
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     */
+    public function rotateRight($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 31;
+        /** @var int $c */
+        if ($c === 0) {
+            // NOP, but we want a copy.
+            $return->limbs = $this->limbs;
+        } else {
+            /** @var int $c */
+
+            /** @var int $idx_shift */
+            $idx_shift = ($c >> 4) & 1;
+
+            /** @var int $sub_shift */
+            $sub_shift = $c & 15;
+
+            /** @var array<int, int> $limbs */
+            $limbs =& $return->limbs;
+
+            /** @var array<int, int> $myLimbs */
+            $myLimbs =& $this->limbs;
+
+            for ($i = 1; $i >= 0; --$i) {
+                /** @var int $j */
+                $j = ($i - $idx_shift) & 1;
+                /** @var int $k */
+                $k = ($i - $idx_shift - 1) & 1;
+                $limbs[$i] = (int) (
+                    (
+                        ($myLimbs[$j] >> (int) ($sub_shift))
+                            |
+                        ($myLimbs[$k] << (16 - (int) ($sub_shift)))
+                    ) & 0xffff
+                );
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * @param bool $bool
+     * @return self
+     */
+    public function setUnsignedInt($bool = false)
+    {
+        $this->unsignedInt = !empty($bool);
+        return $this;
+    }
+
+    /**
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function shiftLeft($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 63;
+        /** @var int $c */
+        if ($c === 0) {
+            $return->limbs = $this->limbs;
+        } elseif ($c < 0) {
+            /** @var int $c */
+            return $this->shiftRight(-$c);
+        } else {
+            /** @var int $c */
+            /** @var int $tmp */
+            $tmp = $this->limbs[1] << $c;
+            $return->limbs[1] = (int)($tmp & 0xffff);
+            /** @var int $carry */
+            $carry = $tmp >> 16;
+
+            /** @var int $tmp */
+            $tmp = ($this->limbs[0] << $c) | ($carry & 0xffff);
+            $return->limbs[0] = (int) ($tmp & 0xffff);
+        }
+        return $return;
+    }
+
+    /**
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedOperand
+     */
+    public function shiftRight($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 63;
+        /** @var int $c */
+        if ($c >= 16) {
+            $return->limbs = array(
+                (int) ($this->overflow & 0xffff),
+                (int) ($this->limbs[0])
+            );
+            $return->overflow = $this->overflow >> 16;
+            return $return->shiftRight($c & 15);
+        }
+        if ($c === 0) {
+            $return->limbs = $this->limbs;
+        } elseif ($c < 0) {
+            /** @var int $c */
+            return $this->shiftLeft(-$c);
+        } else {
+            if (is_null($c)) {
+                throw new TypeError();
+            }
+            /** @var int $c */
+            // $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff);
+            $carryLeft = (int) ($this->overflow & ((1 << ($c + 1)) - 1));
+            $return->limbs[0] = (int) ((($this->limbs[0] >> $c) | ($carryLeft << (16 - $c))) & 0xffff);
+            $carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1));
+            $return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff);
+            $return->overflow >>= $c;
+        }
+        return $return;
+    }
+
+    /**
+     * Subtract a normal integer from an int32 object.
+     *
+     * @param int $int
+     * @return ParagonIE_Sodium_Core32_Int32
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function subInt($int)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[1] - ($int & 0xffff);
+        /** @var int $carry */
+        $carry = $tmp >> 16;
+        $return->limbs[1] = (int) ($tmp & 0xffff);
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[0] - (($int >> 16) & 0xffff) + $carry;
+        $return->limbs[0] = (int) ($tmp & 0xffff);
+        return $return;
+    }
+
+    /**
+     * Subtract two int32 objects from each other
+     *
+     * @param ParagonIE_Sodium_Core32_Int32 $b
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function subInt32(ParagonIE_Sodium_Core32_Int32 $b)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[1] - ($b->limbs[1] & 0xffff);
+        /** @var int $carry */
+        $carry = $tmp >> 16;
+        $return->limbs[1] = (int) ($tmp & 0xffff);
+
+        /** @var int $tmp */
+        $tmp = $this->limbs[0] - ($b->limbs[0] & 0xffff) + $carry;
+        $return->limbs[0] = (int) ($tmp & 0xffff);
+        return $return;
+    }
+
+    /**
+     * XOR this 32-bit integer with another.
+     *
+     * @param ParagonIE_Sodium_Core32_Int32 $b
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->unsignedInt = $this->unsignedInt;
+        $return->limbs = array(
+            (int) ($this->limbs[0] ^ $b->limbs[0]),
+            (int) ($this->limbs[1] ^ $b->limbs[1])
+        );
+        return $return;
+    }
+
+    /**
+     * @param int $signed
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fromInt($signed)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);;
+
+        return new ParagonIE_Sodium_Core32_Int32(
+            array(
+                (int) (($signed >> 16) & 0xffff),
+                (int) ($signed & 0xffff)
+            )
+        );
+    }
+
+    /**
+     * @param string $string
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fromString($string)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+        $string = (string) $string;
+        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
+            throw new RangeException(
+                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+            );
+        }
+        $return = new ParagonIE_Sodium_Core32_Int32();
+
+        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
+        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
+        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
+        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
+        return $return;
+    }
+
+    /**
+     * @param string $string
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function fromReverseString($string)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+        $string = (string) $string;
+        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
+            throw new RangeException(
+                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+            );
+        }
+        $return = new ParagonIE_Sodium_Core32_Int32();
+
+        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
+        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
+        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
+        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
+        return $return;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    public function toArray()
+    {
+        return array((int) ($this->limbs[0] << 16 | $this->limbs[1]));
+    }
+
+    /**
+     * @return string
+     * @throws TypeError
+     */
+    public function toString()
+    {
+        return
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff);
+    }
+
+    /**
+     * @return int
+     */
+    public function toInt()
+    {
+        return (int) (
+            (($this->limbs[0] & 0xffff) << 16)
+                |
+            ($this->limbs[1] & 0xffff)
+        );
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function toInt32()
+    {
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->limbs[0] = (int) ($this->limbs[0] & 0xffff);
+        $return->limbs[1] = (int) ($this->limbs[1] & 0xffff);
+        $return->unsignedInt = $this->unsignedInt;
+        $return->overflow = (int) ($this->overflow & 0x7fffffff);
+        return $return;
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function toInt64()
+    {
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        if ($this->unsignedInt) {
+            $return->limbs[0] += (($this->overflow >> 16) & 0xffff);
+            $return->limbs[1] += (($this->overflow) & 0xffff);
+        } else {
+            $neg = -(($this->limbs[0] >> 15) & 1);
+            $return->limbs[0] = (int)($neg & 0xffff);
+            $return->limbs[1] = (int)($neg & 0xffff);
+        }
+        $return->limbs[2] = (int) ($this->limbs[0] & 0xffff);
+        $return->limbs[3] = (int) ($this->limbs[1] & 0xffff);
+        return $return;
+    }
+
+    /**
+     * @return string
+     * @throws TypeError
+     */
+    public function toReverseString()
+    {
+        return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        try {
+            return $this->toString();
+        } catch (TypeError $ex) {
+            // PHP engine can't handle exceptions from __toString()
+            return '';
+        }
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php
new file mode 100644
index 00000000..f7a99753
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Int64.php
@@ -0,0 +1,743 @@
+<?php
+
+/**
+ * Class ParagonIE_Sodium_Core32_Int64
+ *
+ * Encapsulates a 64-bit integer.
+ *
+ * These are immutable. It always returns a new instance.
+ */
+class ParagonIE_Sodium_Core32_Int64
+{
+    /**
+     * @var array<int, int> - four 16-bit integers
+     */
+    public $limbs;
+
+    /**
+     * @var int
+     */
+    public $overflow = 0;
+
+    /**
+     * @var bool
+     */
+    public $unsignedInt = false;
+
+    /**
+     * ParagonIE_Sodium_Core32_Int64 constructor.
+     * @param array $array
+     * @param bool $unsignedInt
+     */
+    public function __construct($array = array(0, 0, 0, 0), $unsignedInt = false)
+    {
+        $this->limbs = array(
+            (int) $array[0],
+            (int) $array[1],
+            (int) $array[2],
+            (int) $array[3]
+        );
+        $this->overflow = 0;
+        $this->unsignedInt = $unsignedInt;
+    }
+
+    /**
+     * Adds two int64 objects
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $addend
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        /** @var int $carry */
+        $carry = 0;
+        for ($i = 3; $i >= 0; --$i) {
+            /** @var int $tmp */
+            $tmp = $this->limbs[$i] + $addend->limbs[$i] + $carry;
+            /** @var int $carry */
+            $carry = $tmp >> 16;
+            $return->limbs[$i] = (int) ($tmp & 0xffff);
+        }
+        $return->overflow = $carry;
+        return $return;
+    }
+
+    /**
+     * Adds a normal integer to an int64 object
+     *
+     * @param int $int
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws TypeError
+     */
+    public function addInt($int)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        /** @var int $carry */
+        $carry = 0;
+        for ($i = 3; $i >= 0; --$i) {
+            /** @var int $step */
+            $step = (3 - $i) << 4; // 0, 16, 32, 48
+            if ($i < 2) {
+                /** @var int $toAdd */
+                $toAdd = 0;
+            } else {
+                /** @var int $toAdd */
+                $toAdd = (($int >> $step) & 0xffff);
+            }
+            /** @var int $tmp */
+            $tmp = $this->limbs[$i] + $toAdd + $carry;
+
+            /** @var int $carry */
+            $carry = $tmp >> 16;
+            $return->limbs[$i] = (int) ($tmp & 0xffff);
+        }
+        /** @var int overflow */
+        $return->overflow = $carry;
+        return $return;
+    }
+
+    /**
+     * @param int $b
+     * @return int
+     */
+    public function compareInt($b = 0)
+    {
+        $gt = 0;
+        $eq = 1;
+
+        $i = 4;
+        $j = 0;
+        while ($i > 0) {
+            --$i;
+            /** @var int $x1 */
+            $x1 = $this->limbs[$i];
+            /** @var int $x2 */
+            $x2 = ($b >> ($j << 4)) & 0xffff;
+            /** int */
+            $gt |= (($x2 - $x1) >> 8) & $eq;
+            /** int */
+            $eq &= (($x2 ^ $x1) - 1) >> 8;
+        }
+        return ($gt + $gt - $eq) + 1;
+    }
+
+    /**
+     * @param int $b
+     * @return bool
+     */
+    public function isGreaterThan($b = 0)
+    {
+        return $this->compareInt($b) > 0;
+    }
+
+    /**
+     * @param int $b
+     * @return bool
+     */
+    public function isLessThanInt($b = 0)
+    {
+        return $this->compareInt($b) < 0;
+    }
+
+    /**
+     * @param int $hi
+     * @param int $lo
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function mask64($hi = 0, $lo = 0)
+    {
+        /** @var int $a */
+        $a = ($hi >> 16) & 0xffff;
+        /** @var int $b */
+        $b = ($hi) & 0xffff;
+        /** @var int $c */
+        $c = ($lo >> 16) & 0xffff;
+        /** @var int $d */
+        $d = ($lo & 0xffff);
+        return new ParagonIE_Sodium_Core32_Int64(
+            array(
+                $this->limbs[0] & $a,
+                $this->limbs[1] & $b,
+                $this->limbs[2] & $c,
+                $this->limbs[3] & $d
+            ),
+            $this->unsignedInt
+        );
+    }
+
+    /**
+     * @param int $int
+     * @param int $size
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     */
+    public function mulInt($int = 0, $size = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+        if (!$size) {
+            $size = 63;
+        }
+
+        $a = clone $this;
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+
+        for ($i = $size; $i >= 0; --$i) {
+            $return = $return->addInt64(
+                $a->mask64(
+                    (int) (-($int & 1)),
+                    (int) (-($int & 1))
+                )
+            );
+            $a = $a->shiftLeft(1);
+            $int >>= 1;
+        }
+        return $return;
+    }
+
+    /**
+     * @param ParagonIE_Sodium_Core32_Int64 $A
+     * @param ParagonIE_Sodium_Core32_Int64 $B
+     * @return array<int, ParagonIE_Sodium_Core32_Int64>
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedInferredReturnType
+     */
+    public static function ctSelect(
+        ParagonIE_Sodium_Core32_Int64 $A,
+        ParagonIE_Sodium_Core32_Int64 $B
+    ) {
+        $a = clone $A;
+        $b = clone $B;
+        /** @var int $aNeg */
+        $aNeg = ($a->limbs[0] >> 15) & 1;
+        /** @var int $bNeg */
+        $bNeg = ($b->limbs[0] >> 15) & 1;
+        /** @var int $m */
+        $m = (-($aNeg & $bNeg)) | 1;
+        /** @var int $swap */
+        $swap = $bNeg & ~$aNeg;
+        /** @var int $d */
+        $d = -$swap;
+
+        /*
+        if ($bNeg && !$aNeg) {
+            $a = clone $int;
+            $b = clone $this;
+        } elseif($bNeg && $aNeg) {
+            $a = $this->mulInt(-1);
+            $b = $int->mulInt(-1);
+        }
+         */
+        $x = $a->xorInt64($b)->mask64($d, $d);
+        return array(
+            $a->xorInt64($x)->mulInt($m),
+            $b->xorInt64($x)->mulInt($m)
+        );
+    }
+
+    /**
+     * @param ParagonIE_Sodium_Core32_Int64 $int
+     * @param int $size
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     */
+    public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
+        if (!$size) {
+            $size = 63;
+        }
+        list($a, $b) = self::ctSelect($this, $int);
+
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $size $i */
+        /** @var int $i */
+        for ($i = $size; $i >= 0; --$i) {
+            $return = $return->addInt64(
+                $a->mask64(
+                    (int) (-($b->limbs[3] & 1)),
+                    (int) (-($b->limbs[3] & 1))
+                )
+            );
+            $a = $a->shiftLeft(1);
+            $b = $b->shiftRight(1);
+        }
+        return $return;
+    }
+
+    /**
+     * OR this 64-bit integer with another.
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $b
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function orInt64(ParagonIE_Sodium_Core32_Int64 $b)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        $return->limbs = array(
+            (int) ($this->limbs[0] | $b->limbs[0]),
+            (int) ($this->limbs[1] | $b->limbs[1]),
+            (int) ($this->limbs[2] | $b->limbs[2]),
+            (int) ($this->limbs[3] | $b->limbs[3])
+        );
+        return $return;
+    }
+
+    /**
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     */
+    public function rotateLeft($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 63;
+        if ($c === 0) {
+            // NOP, but we want a copy.
+            $return->limbs = $this->limbs;
+        } else {
+            /** @var array<int, int> $limbs */
+            $limbs =& $return->limbs;
+
+            /** @var array<int, int> $myLimbs */
+            $myLimbs =& $this->limbs;
+
+            /** @var int $idx_shift */
+            $idx_shift = ($c >> 4) & 3;
+            /** @var int $sub_shift */
+            $sub_shift = $c & 15;
+
+            for ($i = 3; $i >= 0; --$i) {
+                /** @var int $j */
+                $j = ($i + $idx_shift) & 3;
+                /** @var int $k */
+                $k = ($i + $idx_shift + 1) & 3;
+                $limbs[$i] = (int) (
+                    (
+                        ($myLimbs[$j] << $sub_shift)
+                            |
+                        ($myLimbs[$k] >> (16 - $sub_shift))
+                    ) & 0xffff
+                );
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * Rotate to the right
+     *
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws TypeError
+     * @psalm-suppress MixedArrayAccess
+     */
+    public function rotateRight($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+
+        /** @var ParagonIE_Sodium_Core32_Int64 $return */
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 63;
+        /** @var int $c */
+        if ($c === 0) {
+            // NOP, but we want a copy.
+            $return->limbs = $this->limbs;
+        } else {
+            /** @var array<int, int> $limbs */
+            $limbs =& $return->limbs;
+
+            /** @var array<int, int> $myLimbs */
+            $myLimbs =& $this->limbs;
+
+            /** @var int $idx_shift */
+            $idx_shift = ($c >> 4) & 3;
+            /** @var int $sub_shift */
+            $sub_shift = $c & 15;
+
+            for ($i = 3; $i >= 0; --$i) {
+                /** @var int $j */
+                $j = ($i - $idx_shift) & 3;
+                /** @var int $k */
+                $k = ($i - $idx_shift - 1) & 3;
+                $limbs[$i] = (int) (
+                    (
+                        ($myLimbs[$j] >> (int) ($sub_shift))
+                            |
+                        ($myLimbs[$k] << (16 - (int) ($sub_shift)))
+                    ) & 0xffff
+                );
+            }
+        }
+        return $return;
+    }
+    /**
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function shiftLeft($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 63;
+        /** @var int $c */
+
+        if ($c >= 16) {
+            if ($c >= 48) {
+                $return->limbs = array(
+                    $this->limbs[3], 0, 0, 0
+                );
+            } elseif ($c >= 32) {
+                $return->limbs = array(
+                    $this->limbs[2], $this->limbs[3], 0, 0
+                );
+            } else {
+                $return->limbs = array(
+                    $this->limbs[1], $this->limbs[2], $this->limbs[3], 0
+                );
+            }
+            return $return->shiftLeft($c & 15);
+        }
+        if ($c === 0) {
+            $return->limbs = $this->limbs;
+        } elseif ($c < 0) {
+            /** @var int $c */
+            return $this->shiftRight(-$c);
+        } else {
+            if (is_null($c)) {
+                throw new TypeError();
+            }
+            /** @var int $carry */
+            $carry = 0;
+            for ($i = 3; $i >= 0; --$i) {
+                /** @var int $tmp */
+                $tmp = ($this->limbs[$i] << $c) | ($carry & 0xffff);
+                $return->limbs[$i] = (int) ($tmp & 0xffff);
+                /** @var int $carry */
+                $carry = $tmp >> 16;
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * @param int $c
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function shiftRight($c = 0)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        $c &= 63;
+        /** @var int $c */
+
+        $negative = -(($this->limbs[0] >> 15) & 1);
+        if ($c >= 16) {
+            if ($c >= 48) {
+                $return->limbs = array(
+                    (int) ($negative & 0xffff),
+                    (int) ($negative & 0xffff),
+                    (int) ($negative & 0xffff),
+                    (int) $this->limbs[0]
+                );
+            } elseif ($c >= 32) {
+                $return->limbs = array(
+                    (int) ($negative & 0xffff),
+                    (int) ($negative & 0xffff),
+                    (int) $this->limbs[0],
+                    (int) $this->limbs[1]
+                );
+            } else {
+                $return->limbs = array(
+                    (int) ($negative & 0xffff),
+                    (int) $this->limbs[0],
+                    (int) $this->limbs[1],
+                    (int) $this->limbs[2]
+                );
+            }
+            return $return->shiftRight($c & 15);
+        }
+
+        if ($c === 0) {
+            $return->limbs = $this->limbs;
+        } elseif ($c < 0) {
+            return $this->shiftLeft(-$c);
+        } else {
+            if (!is_int($c)) {
+                throw new TypeError();
+            }
+            /** @var int $carryRight */
+            $carryRight = ($negative & 0xffff);
+            $mask = (int) (((1 << ($c + 1)) - 1) & 0xffff);
+            for ($i = 0; $i < 4; ++$i) {
+                $return->limbs[$i] = (int) (
+                    (($this->limbs[$i] >> $c) | ($carryRight << (16 - $c))) & 0xffff
+                );
+                $carryRight = (int) ($this->limbs[$i] & $mask);
+            }
+        }
+        return $return;
+    }
+
+
+    /**
+     * Subtract a normal integer from an int64 object.
+     *
+     * @param int $int
+     * @return ParagonIE_Sodium_Core32_Int64
+     * @throws TypeError
+     */
+    public function subInt($int)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
+
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+
+        /** @var int $carry */
+        $carry = 0;
+        for ($i = 3; $i >= 0; --$i) {
+            /** @var int $tmp */
+            $tmp = $this->limbs[$i] - (($int >> 16) & 0xffff) + $carry;
+            /** @var int $carry */
+            $carry = $tmp >> 16;
+            $return->limbs[$i] = (int) ($tmp & 0xffff);
+        }
+        return $return;
+    }
+
+    /**
+     * The difference between two Int64 objects.
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $b
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function subInt64(ParagonIE_Sodium_Core32_Int64 $b)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        /** @var int $carry */
+        $carry = 0;
+        for ($i = 3; $i >= 0; --$i) {
+            /** @var int $tmp */
+            $tmp = $this->limbs[$i] - $b->limbs[$i] + $carry;
+            /** @var int $carry */
+            $carry = ($tmp >> 16);
+            $return->limbs[$i] = (int) ($tmp & 0xffff);
+        }
+        return $return;
+    }
+
+    /**
+     * XOR this 64-bit integer with another.
+     *
+     * @param ParagonIE_Sodium_Core32_Int64 $b
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b)
+    {
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->unsignedInt = $this->unsignedInt;
+        $return->limbs = array(
+            (int) ($this->limbs[0] ^ $b->limbs[0]),
+            (int) ($this->limbs[1] ^ $b->limbs[1]),
+            (int) ($this->limbs[2] ^ $b->limbs[2]),
+            (int) ($this->limbs[3] ^ $b->limbs[3])
+        );
+        return $return;
+    }
+
+    /**
+     * @param int $low
+     * @param int $high
+     * @return self
+     * @throws TypeError
+     */
+    public static function fromInts($low, $high)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
+        ParagonIE_Sodium_Core32_Util::declareScalarType($high, 'int', 2);
+
+        return new ParagonIE_Sodium_Core32_Int64(
+            array(
+                (int) (($high >> 16) & 0xffff),
+                (int) ($high & 0xffff),
+                (int) (($low >> 16) & 0xffff),
+                (int) ($low & 0xffff)
+            )
+        );
+    }
+
+    /**
+     * @param string $string
+     * @return self
+     * @throws TypeError
+     */
+    public static function fromString($string)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+        $string = (string) $string;
+        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
+            throw new RangeException(
+                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+            );
+        }
+        $return = new ParagonIE_Sodium_Core32_Int64();
+
+        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
+        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
+        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
+        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
+        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff) << 8);
+        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff);
+        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff) << 8);
+        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff);
+        return $return;
+    }
+
+    /**
+     * @param string $string
+     * @return self
+     * @throws TypeError
+     */
+    public static function fromReverseString($string)
+    {
+        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
+        $string = (string) $string;
+        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
+            throw new RangeException(
+                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
+            );
+        }
+        $return = new ParagonIE_Sodium_Core32_Int64();
+
+        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff) << 8);
+        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff);
+        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff) << 8);
+        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff);
+        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
+        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
+        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
+        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
+        return $return;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    public function toArray()
+    {
+        return array(
+            (int) ((($this->limbs[0] & 0xffff) << 16) | ($this->limbs[1] & 0xffff)),
+            (int) ((($this->limbs[2] & 0xffff) << 16) | ($this->limbs[3] & 0xffff))
+        );
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core32_Int32
+     */
+    public function toInt32()
+    {
+        $return = new ParagonIE_Sodium_Core32_Int32();
+        $return->limbs[0] = (int) ($this->limbs[2]);
+        $return->limbs[1] = (int) ($this->limbs[3]);
+        $return->unsignedInt = $this->unsignedInt;
+        $return->overflow = (int) (ParagonIE_Sodium_Core32_Util::abs($this->limbs[1], 16) & 0xffff);
+        return $return;
+    }
+
+    /**
+     * @return ParagonIE_Sodium_Core32_Int64
+     */
+    public function toInt64()
+    {
+        $return = new ParagonIE_Sodium_Core32_Int64();
+        $return->limbs[0] = (int) ($this->limbs[0]);
+        $return->limbs[1] = (int) ($this->limbs[1]);
+        $return->limbs[2] = (int) ($this->limbs[2]);
+        $return->limbs[3] = (int) ($this->limbs[3]);
+        $return->unsignedInt = $this->unsignedInt;
+        $return->overflow = ParagonIE_Sodium_Core32_Util::abs($this->overflow);
+        return $return;
+    }
+
+    /**
+     * @param bool $bool
+     * @return self
+     */
+    public function setUnsignedInt($bool = false)
+    {
+        $this->unsignedInt = !empty($bool);
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @throws TypeError
+     */
+    public function toString()
+    {
+        return ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff);
+    }
+
+    /**
+     * @return string
+     * @throws TypeError
+     */
+    public function toReverseString()
+    {
+        return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
+            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        try {
+            return $this->toString();
+        } catch (TypeError $ex) {
+            // PHP engine can't handle exceptions from __toString()
+            return '';
+        }
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305.php
new file mode 100644
index 00000000..b9dfaf3c
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305.php
@@ -0,0 +1,63 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Poly1305', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Poly1305
+ */
+abstract class ParagonIE_Sodium_Core32_Poly1305 extends ParagonIE_Sodium_Core32_Util
+{
+    const BLOCK_SIZE = 16;
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $m
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function onetimeauth($m, $key)
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Key must be 32 bytes long.'
+            );
+        }
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
+            self::substr($key, 0, 32)
+        );
+        return $state
+            ->update($m)
+            ->finish();
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $mac
+     * @param string $m
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function onetimeauth_verify($mac, $m, $key)
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Key must be 32 bytes long.'
+            );
+        }
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
+            self::substr($key, 0, 32)
+        );
+        $calc = $state
+            ->update($m)
+            ->finish();
+        return self::verify_16($calc, $mac);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php
new file mode 100644
index 00000000..08a5399e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Poly1305/State.php
@@ -0,0 +1,451 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Poly1305_State', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Poly1305_State
+ */
+class ParagonIE_Sodium_Core32_Poly1305_State extends ParagonIE_Sodium_Core32_Util
+{
+    /**
+     * @var array<int, int>
+     */
+    protected $buffer = array();
+
+    /**
+     * @var bool
+     */
+    protected $final = false;
+
+    /**
+     * @var array<int, ParagonIE_Sodium_Core32_Int32>
+     */
+    public $h;
+
+    /**
+     * @var int
+     */
+    protected $leftover = 0;
+
+    /**
+     * @var array<int, ParagonIE_Sodium_Core32_Int32>
+     */
+    public $r;
+
+    /**
+     * @var array<int, ParagonIE_Sodium_Core32_Int64>
+     */
+    public $pad;
+
+    /**
+     * ParagonIE_Sodium_Core32_Poly1305_State constructor.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $key
+     * @throws InvalidArgumentException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function __construct($key = '')
+    {
+        if (self::strlen($key) < 32) {
+            throw new InvalidArgumentException(
+                'Poly1305 requires a 32-byte key'
+            );
+        }
+        /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
+        $this->r = array(
+            // st->r[0] = ...
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4))
+                ->setUnsignedInt(true)
+                ->mask(0x3ffffff),
+            // st->r[1] = ...
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4))
+                ->setUnsignedInt(true)
+                ->shiftRight(2)
+                ->mask(0x3ffff03),
+            // st->r[2] = ...
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4))
+                ->setUnsignedInt(true)
+                ->shiftRight(4)
+                ->mask(0x3ffc0ff),
+            // st->r[3] = ...
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4))
+                ->setUnsignedInt(true)
+                ->shiftRight(6)
+                ->mask(0x3f03fff),
+            // st->r[4] = ...
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4))
+                ->setUnsignedInt(true)
+                ->shiftRight(8)
+                ->mask(0x00fffff)
+        );
+
+        /* h = 0 */
+        $this->h = array(
+            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
+            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
+            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
+            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
+            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true)
+        );
+
+        /* save pad for later */
+        $this->pad = array(
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4))
+                ->setUnsignedInt(true)->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4))
+                ->setUnsignedInt(true)->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4))
+                ->setUnsignedInt(true)->toInt64(),
+            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4))
+                ->setUnsignedInt(true)->toInt64(),
+        );
+
+        $this->leftover = 0;
+        $this->final = false;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function update($message = '')
+    {
+        $bytes = self::strlen($message);
+
+        /* handle leftover */
+        if ($this->leftover) {
+            /** @var int $want */
+            $want = ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - $this->leftover;
+            if ($want > $bytes) {
+                $want = $bytes;
+            }
+            for ($i = 0; $i < $want; ++$i) {
+                $mi = self::chrToInt($message[$i]);
+                $this->buffer[$this->leftover + $i] = $mi;
+            }
+            // We snip off the leftmost bytes.
+            $message = self::substr($message, $want);
+            $bytes = self::strlen($message);
+            $this->leftover += $want;
+            if ($this->leftover < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+                // We still don't have enough to run $this->blocks()
+                return $this;
+            }
+
+            $this->blocks(
+                static::intArrayToString($this->buffer),
+                ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
+            );
+            $this->leftover = 0;
+        }
+
+        /* process full blocks */
+        if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+            /** @var int $want */
+            $want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1);
+            if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+                /** @var string $block */
+                $block = self::substr($message, 0, $want);
+                if (self::strlen($block) >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
+                    $this->blocks($block, $want);
+                    $message = self::substr($message, $want);
+                    $bytes = self::strlen($message);
+                }
+            }
+        }
+
+        /* store leftover */
+        if ($bytes) {
+            for ($i = 0; $i < $bytes; ++$i) {
+                $mi = self::chrToInt($message[$i]);
+                $this->buffer[$this->leftover + $i] = $mi;
+            }
+            $this->leftover = (int) $this->leftover + $bytes;
+        }
+        return $this;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param int $bytes
+     * @return self
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function blocks($message, $bytes)
+    {
+        if (self::strlen($message) < 16) {
+            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+        }
+        $hibit = ParagonIE_Sodium_Core32_Int32::fromInt((int) ($this->final ? 0 : 1 << 24)); /* 1 << 128 */
+        $hibit->setUnsignedInt(true);
+        $zero = new ParagonIE_Sodium_Core32_Int64(array(0, 0, 0, 0), true);
+        /**
+         * @var ParagonIE_Sodium_Core32_Int64 $d0
+         * @var ParagonIE_Sodium_Core32_Int64 $d1
+         * @var ParagonIE_Sodium_Core32_Int64 $d2
+         * @var ParagonIE_Sodium_Core32_Int64 $d3
+         * @var ParagonIE_Sodium_Core32_Int64 $d4
+         * @var ParagonIE_Sodium_Core32_Int64 $r0
+         * @var ParagonIE_Sodium_Core32_Int64 $r1
+         * @var ParagonIE_Sodium_Core32_Int64 $r2
+         * @var ParagonIE_Sodium_Core32_Int64 $r3
+         * @var ParagonIE_Sodium_Core32_Int64 $r4
+         *
+         * @var ParagonIE_Sodium_Core32_Int32 $h0
+         * @var ParagonIE_Sodium_Core32_Int32 $h1
+         * @var ParagonIE_Sodium_Core32_Int32 $h2
+         * @var ParagonIE_Sodium_Core32_Int32 $h3
+         * @var ParagonIE_Sodium_Core32_Int32 $h4
+         */
+        $r0 = $this->r[0]->toInt64();
+        $r1 = $this->r[1]->toInt64();
+        $r2 = $this->r[2]->toInt64();
+        $r3 = $this->r[3]->toInt64();
+        $r4 = $this->r[4]->toInt64();
+
+        $s1 = $r1->toInt64()->mulInt(5);
+        $s2 = $r2->toInt64()->mulInt(5);
+        $s3 = $r3->toInt64()->mulInt(5);
+        $s4 = $r4->toInt64()->mulInt(5);
+
+        $h0 = $this->h[0];
+        $h1 = $this->h[1];
+        $h2 = $this->h[2];
+        $h3 = $this->h[3];
+        $h4 = $this->h[4];
+
+        while ($bytes >= ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE) {
+            /* h += m[i] */
+            $h0 = $h0->addInt32(
+                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4))
+                    ->mask(0x3ffffff)
+            );
+            $h1 = $h1->addInt32(
+                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 3, 4))
+                    ->shiftRight(2)
+                    ->mask(0x3ffffff)
+            );
+            $h2 = $h2->addInt32(
+                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 6, 4))
+                    ->shiftRight(4)
+                    ->mask(0x3ffffff)
+            );
+            $h3 = $h3->addInt32(
+                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 9, 4))
+                    ->shiftRight(6)
+                    ->mask(0x3ffffff)
+            );
+            $h4 = $h4->addInt32(
+                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4))
+                    ->shiftRight(8)
+                    ->orInt32($hibit)
+            );
+
+            /* h *= r */
+            $d0 = $zero
+                ->addInt64($h0->toInt64()->mulInt64($r0))
+                ->addInt64($h1->toInt64()->mulInt64($s4))
+                ->addInt64($h2->toInt64()->mulInt64($s3))
+                ->addInt64($h3->toInt64()->mulInt64($s2))
+                ->addInt64($h4->toInt64()->mulInt64($s1));
+
+            $d1 = $zero
+                ->addInt64($h0->toInt64()->mulInt64($r1))
+                ->addInt64($h1->toInt64()->mulInt64($r0))
+                ->addInt64($h2->toInt64()->mulInt64($s4))
+                ->addInt64($h3->toInt64()->mulInt64($s3))
+                ->addInt64($h4->toInt64()->mulInt64($s2));
+
+            $d2 = $zero
+                ->addInt64($h0->toInt64()->mulInt64($r2))
+                ->addInt64($h1->toInt64()->mulInt64($r1))
+                ->addInt64($h2->toInt64()->mulInt64($r0))
+                ->addInt64($h3->toInt64()->mulInt64($s4))
+                ->addInt64($h4->toInt64()->mulInt64($s3));
+
+            $d3 = $zero
+                ->addInt64($h0->toInt64()->mulInt64($r3))
+                ->addInt64($h1->toInt64()->mulInt64($r2))
+                ->addInt64($h2->toInt64()->mulInt64($r1))
+                ->addInt64($h3->toInt64()->mulInt64($r0))
+                ->addInt64($h4->toInt64()->mulInt64($s4));
+
+            $d4 = $zero
+                ->addInt64($h0->toInt64()->mulInt64($r4))
+                ->addInt64($h1->toInt64()->mulInt64($r3))
+                ->addInt64($h2->toInt64()->mulInt64($r2))
+                ->addInt64($h3->toInt64()->mulInt64($r1))
+                ->addInt64($h4->toInt64()->mulInt64($r0));
+
+            /* (partial) h %= p */
+            $c = $d0->shiftRight(26);
+            $h0 = $d0->toInt32()->mask(0x3ffffff);
+            $d1 = $d1->addInt64($c);
+
+            $c = $d1->shiftRight(26);
+            $h1 = $d1->toInt32()->mask(0x3ffffff);
+            $d2 = $d2->addInt64($c);
+
+            $c = $d2->shiftRight(26);
+            $h2 = $d2->toInt32()->mask(0x3ffffff);
+            $d3 = $d3->addInt64($c);
+
+            $c = $d3->shiftRight(26);
+            $h3 = $d3->toInt32()->mask(0x3ffffff);
+            $d4 = $d4->addInt64($c);
+
+            $c = $d4->shiftRight(26);
+            $h4 = $d4->toInt32()->mask(0x3ffffff);
+            $h0 = $h0->addInt32($c->toInt32()->mulInt(5, 3));
+
+            $c = $h0->shiftRight(26);
+            $h0 = $h0->mask(0x3ffffff);
+            $h1 = $h1->addInt32($c);
+
+            // Chop off the left 32 bytes.
+            $message = self::substr(
+                $message,
+                ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
+            );
+            $bytes -= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE;
+        }
+
+        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
+        $this->h = array($h0, $h1, $h2, $h3, $h4);
+        return $this;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public function finish()
+    {
+        /* process the remaining block */
+        if ($this->leftover) {
+            $i = $this->leftover;
+            $this->buffer[$i++] = 1;
+            for (; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i) {
+                $this->buffer[$i] = 0;
+            }
+            $this->final = true;
+            $this->blocks(
+                self::substr(
+                    static::intArrayToString($this->buffer),
+                    0,
+                    ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
+                ),
+                $b = ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
+            );
+        }
+
+        /**
+         * @var ParagonIE_Sodium_Core32_Int32 $f
+         * @var ParagonIE_Sodium_Core32_Int32 $g0
+         * @var ParagonIE_Sodium_Core32_Int32 $g1
+         * @var ParagonIE_Sodium_Core32_Int32 $g2
+         * @var ParagonIE_Sodium_Core32_Int32 $g3
+         * @var ParagonIE_Sodium_Core32_Int32 $g4
+         * @var ParagonIE_Sodium_Core32_Int32 $h0
+         * @var ParagonIE_Sodium_Core32_Int32 $h1
+         * @var ParagonIE_Sodium_Core32_Int32 $h2
+         * @var ParagonIE_Sodium_Core32_Int32 $h3
+         * @var ParagonIE_Sodium_Core32_Int32 $h4
+         */
+        $h0 = $this->h[0];
+        $h1 = $this->h[1];
+        $h2 = $this->h[2];
+        $h3 = $this->h[3];
+        $h4 = $this->h[4];
+
+        $c = $h1->shiftRight(26);           # $c = $h1 >> 26;
+        $h1 = $h1->mask(0x3ffffff);         # $h1 &= 0x3ffffff;
+
+        $h2 = $h2->addInt32($c);            # $h2 += $c;
+        $c = $h2->shiftRight(26);           # $c = $h2 >> 26;
+        $h2 = $h2->mask(0x3ffffff);         # $h2 &= 0x3ffffff;
+
+        $h3 = $h3->addInt32($c);            # $h3 += $c;
+        $c = $h3->shiftRight(26);           # $c = $h3 >> 26;
+        $h3 = $h3->mask(0x3ffffff);         # $h3 &= 0x3ffffff;
+
+        $h4 = $h4->addInt32($c);            # $h4 += $c;
+        $c = $h4->shiftRight(26);           # $c = $h4 >> 26;
+        $h4 = $h4->mask(0x3ffffff);         # $h4 &= 0x3ffffff;
+
+        $h0 = $h0->addInt32($c->mulInt(5)); # $h0 += self::mul($c, 5);
+        $c = $h0->shiftRight(26);           # $c = $h0 >> 26;
+        $h0 = $h0->mask(0x3ffffff);         # $h0 &= 0x3ffffff;
+        $h1 = $h1->addInt32($c);            # $h1 += $c;
+
+        /* compute h + -p */
+        $g0 = $h0->addInt(5);
+        $c  = $g0->shiftRight(26);
+        $g0 = $g0->mask(0x3ffffff);
+        $g1 = $h1->addInt32($c);
+        $c  = $g1->shiftRight(26);
+        $g1 = $g1->mask(0x3ffffff);
+        $g2 = $h2->addInt32($c);
+        $c  = $g2->shiftRight(26);
+        $g2 = $g2->mask(0x3ffffff);
+        $g3 = $h3->addInt32($c);
+        $c  = $g3->shiftRight(26);
+        $g3 = $g3->mask(0x3ffffff);
+        $g4 = $h4->addInt32($c)->subInt(1 << 26);
+
+        # $mask = ($g4 >> 31) - 1;
+        /* select h if h < p, or h + -p if h >= p */
+        $mask = (int) (($g4->toInt() >> 31) + 1);
+
+        $g0 = $g0->mask($mask);
+        $g1 = $g1->mask($mask);
+        $g2 = $g2->mask($mask);
+        $g3 = $g3->mask($mask);
+        $g4 = $g4->mask($mask);
+
+        /** @var int $mask */
+        $mask = (~$mask) & 0xffffffff;
+
+        $h0 = $h0->mask($mask)->orInt32($g0);
+        $h1 = $h1->mask($mask)->orInt32($g1);
+        $h2 = $h2->mask($mask)->orInt32($g2);
+        $h3 = $h3->mask($mask)->orInt32($g3);
+        $h4 = $h4->mask($mask)->orInt32($g4);
+
+        /* h = h % (2^128) */
+        $h0 = $h0->orInt32($h1->shiftLeft(26));
+        $h1 = $h1->shiftRight(6)->orInt32($h2->shiftLeft(20));
+        $h2 = $h2->shiftRight(12)->orInt32($h3->shiftLeft(14));
+        $h3 = $h3->shiftRight(18)->orInt32($h4->shiftLeft(8));
+
+        /* mac = (h + pad) % (2^128) */
+        $f = $h0->toInt64()->addInt64($this->pad[0]);
+        $h0 = $f->toInt32();
+        $f = $h1->toInt64()->addInt64($this->pad[1])->addInt($h0->overflow);
+        $h1 = $f->toInt32();
+        $f = $h2->toInt64()->addInt64($this->pad[2])->addInt($h1->overflow);
+        $h2 = $f->toInt32();
+        $f = $h3->toInt64()->addInt64($this->pad[3])->addInt($h2->overflow);
+        $h3 = $f->toInt32();
+
+        return $h0->toReverseString() .
+            $h1->toReverseString() .
+            $h2->toReverseString() .
+            $h3->toReverseString();
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Salsa20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Salsa20.php
new file mode 100644
index 00000000..d8c8073c
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Salsa20.php
@@ -0,0 +1,306 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Salsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_Salsa20
+ */
+abstract class ParagonIE_Sodium_Core32_Salsa20 extends ParagonIE_Sodium_Core32_Util
+{
+    const ROUNDS = 20;
+
+    /**
+     * Calculate an salsa20 hash of a single block
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $k
+     * @param string|null $c
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function core_salsa20($in, $k, $c = null)
+    {
+        /**
+         * @var ParagonIE_Sodium_Core32_Int32 $x0
+         * @var ParagonIE_Sodium_Core32_Int32 $x1
+         * @var ParagonIE_Sodium_Core32_Int32 $x2
+         * @var ParagonIE_Sodium_Core32_Int32 $x3
+         * @var ParagonIE_Sodium_Core32_Int32 $x4
+         * @var ParagonIE_Sodium_Core32_Int32 $x5
+         * @var ParagonIE_Sodium_Core32_Int32 $x6
+         * @var ParagonIE_Sodium_Core32_Int32 $x7
+         * @var ParagonIE_Sodium_Core32_Int32 $x8
+         * @var ParagonIE_Sodium_Core32_Int32 $x9
+         * @var ParagonIE_Sodium_Core32_Int32 $x10
+         * @var ParagonIE_Sodium_Core32_Int32 $x11
+         * @var ParagonIE_Sodium_Core32_Int32 $x12
+         * @var ParagonIE_Sodium_Core32_Int32 $x13
+         * @var ParagonIE_Sodium_Core32_Int32 $x14
+         * @var ParagonIE_Sodium_Core32_Int32 $x15
+         * @var ParagonIE_Sodium_Core32_Int32 $j0
+         * @var ParagonIE_Sodium_Core32_Int32 $j1
+         * @var ParagonIE_Sodium_Core32_Int32 $j2
+         * @var ParagonIE_Sodium_Core32_Int32 $j3
+         * @var ParagonIE_Sodium_Core32_Int32 $j4
+         * @var ParagonIE_Sodium_Core32_Int32 $j5
+         * @var ParagonIE_Sodium_Core32_Int32 $j6
+         * @var ParagonIE_Sodium_Core32_Int32 $j7
+         * @var ParagonIE_Sodium_Core32_Int32 $j8
+         * @var ParagonIE_Sodium_Core32_Int32 $j9
+         * @var ParagonIE_Sodium_Core32_Int32 $j10
+         * @var ParagonIE_Sodium_Core32_Int32 $j11
+         * @var ParagonIE_Sodium_Core32_Int32 $j12
+         * @var ParagonIE_Sodium_Core32_Int32 $j13
+         * @var ParagonIE_Sodium_Core32_Int32 $j14
+         * @var ParagonIE_Sodium_Core32_Int32 $j15
+         */
+        if (self::strlen($k) < 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        if ($c === null) {
+            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
+            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
+            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
+            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
+        } else {
+            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
+            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
+            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
+            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
+        }
+        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
+        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
+        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
+        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
+        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
+        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
+        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
+        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
+        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
+        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
+        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
+        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
+
+        $j0  = clone $x0;
+        $j1  = clone $x1;
+        $j2  = clone $x2;
+        $j3  = clone $x3;
+        $j4  = clone $x4;
+        $j5  = clone $x5;
+        $j6  = clone $x6;
+        $j7  = clone $x7;
+        $j8  = clone $x8;
+        $j9  = clone $x9;
+        $j10  = clone $x10;
+        $j11  = clone $x11;
+        $j12  = clone $x12;
+        $j13  = clone $x13;
+        $j14  = clone $x14;
+        $j15  = clone $x15;
+
+        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
+            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
+            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
+            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
+            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
+
+            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
+            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
+            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
+            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
+
+            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
+            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
+            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
+            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
+
+            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
+            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
+            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
+            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
+
+            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
+            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
+            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
+            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
+
+            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
+            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
+            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
+            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
+
+            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
+            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
+            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
+            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
+
+            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
+            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
+            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
+            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
+        }
+
+        $x0  = $x0->addInt32($j0);
+        $x1  = $x1->addInt32($j1);
+        $x2  = $x2->addInt32($j2);
+        $x3  = $x3->addInt32($j3);
+        $x4  = $x4->addInt32($j4);
+        $x5  = $x5->addInt32($j5);
+        $x6  = $x6->addInt32($j6);
+        $x7  = $x7->addInt32($j7);
+        $x8  = $x8->addInt32($j8);
+        $x9  = $x9->addInt32($j9);
+        $x10 = $x10->addInt32($j10);
+        $x11 = $x11->addInt32($j11);
+        $x12 = $x12->addInt32($j12);
+        $x13 = $x13->addInt32($j13);
+        $x14 = $x14->addInt32($j14);
+        $x15 = $x15->addInt32($j15);
+
+        return $x0->toReverseString() .
+            $x1->toReverseString() .
+            $x2->toReverseString() .
+            $x3->toReverseString() .
+            $x4->toReverseString() .
+            $x5->toReverseString() .
+            $x6->toReverseString() .
+            $x7->toReverseString() .
+            $x8->toReverseString() .
+            $x9->toReverseString() .
+            $x10->toReverseString() .
+            $x11->toReverseString() .
+            $x12->toReverseString() .
+            $x13->toReverseString() .
+            $x14->toReverseString() .
+            $x15->toReverseString();
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function salsa20($len, $nonce, $key)
+    {
+        if (self::strlen($key) !== 32) {
+            throw new RangeException('Key must be 32 bytes long');
+        }
+        $kcopy = '' . $key;
+        $in = self::substr($nonce, 0, 8) . str_repeat("\0", 8);
+        $c = '';
+        while ($len >= 64) {
+            $c .= self::core_salsa20($in, $kcopy, null);
+            $u = 1;
+            // Internal counter.
+            for ($i = 8; $i < 16; ++$i) {
+                $u += self::chrToInt($in[$i]);
+                $in[$i] = self::intToChr($u & 0xff);
+                $u >>= 8;
+            }
+            $len -= 64;
+        }
+        if ($len > 0) {
+            $c .= self::substr(
+                self::core_salsa20($in, $kcopy, null),
+                0,
+                $len
+            );
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($kcopy);
+        } catch (SodiumException $ex) {
+            $kcopy = null;
+        }
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $m
+     * @param string $n
+     * @param int $ic
+     * @param string $k
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function salsa20_xor_ic($m, $n, $ic, $k)
+    {
+        $mlen = self::strlen($m);
+        if ($mlen < 1) {
+            return '';
+        }
+        $kcopy = self::substr($k, 0, 32);
+        $in = self::substr($n, 0, 8);
+        // Initialize the counter
+        $in .= ParagonIE_Sodium_Core32_Util::store64_le($ic);
+
+        $c = '';
+        while ($mlen >= 64) {
+            $block = self::core_salsa20($in, $kcopy, null);
+            $c .= self::xorStrings(
+                self::substr($m, 0, 64),
+                self::substr($block, 0, 64)
+            );
+            $u = 1;
+            for ($i = 8; $i < 16; ++$i) {
+                $u += self::chrToInt($in[$i]);
+                $in[$i] = self::intToChr($u & 0xff);
+                $u >>= 8;
+            }
+
+            $mlen -= 64;
+            $m = self::substr($m, 64);
+        }
+
+        if ($mlen) {
+            $block = self::core_salsa20($in, $kcopy, null);
+            $c .= self::xorStrings(
+                self::substr($m, 0, $mlen),
+                self::substr($block, 0, $mlen)
+            );
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($block);
+            ParagonIE_Sodium_Compat::memzero($kcopy);
+        } catch (SodiumException $ex) {
+            $block = null;
+            $kcopy = null;
+        }
+
+        return $c;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function salsa20_xor($message, $nonce, $key)
+    {
+        return self::xorStrings(
+            $message,
+            self::salsa20(
+                self::strlen($message),
+                $nonce,
+                $key
+            )
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/SipHash.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/SipHash.php
new file mode 100644
index 00000000..6d43602a
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/SipHash.php
@@ -0,0 +1,239 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_SipHash', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_SodiumCompat_Core32_SipHash
+ *
+ * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
+ */
+class ParagonIE_Sodium_Core32_SipHash extends ParagonIE_Sodium_Core32_Util
+{
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param array<int, ParagonIE_Sodium_Core32_Int64> $v
+     * @return array<int, ParagonIE_Sodium_Core32_Int64>
+     */
+    public static function sipRound(array $v)
+    {
+        # v0 += v1;
+        $v[0] = $v[0]->addInt64($v[1]);
+
+        # v1 = ROTL(v1, 13);
+        $v[1] = $v[1]->rotateLeft(13);
+
+        #  v1 ^= v0;
+        $v[1] = $v[1]->xorInt64($v[0]);
+
+        #  v0=ROTL(v0,32);
+        $v[0] = $v[0]->rotateLeft(32);
+
+        # v2 += v3;
+        $v[2] = $v[2]->addInt64($v[3]);
+
+        # v3=ROTL(v3,16);
+        $v[3] = $v[3]->rotateLeft(16);
+
+        #  v3 ^= v2;
+        $v[3] = $v[3]->xorInt64($v[2]);
+
+        # v0 += v3;
+        $v[0] = $v[0]->addInt64($v[3]);
+
+        # v3=ROTL(v3,21);
+        $v[3] = $v[3]->rotateLeft(21);
+
+        # v3 ^= v0;
+        $v[3] = $v[3]->xorInt64($v[0]);
+
+        # v2 += v1;
+        $v[2] = $v[2]->addInt64($v[1]);
+
+        # v1=ROTL(v1,17);
+        $v[1] = $v[1]->rotateLeft(17);
+
+        #  v1 ^= v2;
+        $v[1] = $v[1]->xorInt64($v[2]);
+
+        # v2=ROTL(v2,32)
+        $v[2] = $v[2]->rotateLeft(32);
+
+        return $v;
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $in
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sipHash24($in, $key)
+    {
+        $inlen = self::strlen($in);
+
+        # /* "somepseudorandomlygeneratedbytes" */
+        # u64 v0 = 0x736f6d6570736575ULL;
+        # u64 v1 = 0x646f72616e646f6dULL;
+        # u64 v2 = 0x6c7967656e657261ULL;
+        # u64 v3 = 0x7465646279746573ULL;
+        $v = array(
+            new ParagonIE_Sodium_Core32_Int64(
+                array(0x736f, 0x6d65, 0x7073, 0x6575)
+            ),
+            new ParagonIE_Sodium_Core32_Int64(
+                array(0x646f, 0x7261, 0x6e64, 0x6f6d)
+            ),
+            new ParagonIE_Sodium_Core32_Int64(
+                array(0x6c79, 0x6765, 0x6e65, 0x7261)
+            ),
+            new ParagonIE_Sodium_Core32_Int64(
+                array(0x7465, 0x6462, 0x7974, 0x6573)
+            )
+        );
+
+        # u64 k0 = LOAD64_LE( k );
+        # u64 k1 = LOAD64_LE( k + 8 );
+        $k = array(
+            ParagonIE_Sodium_Core32_Int64::fromReverseString(
+                self::substr($key, 0, 8)
+            ),
+            ParagonIE_Sodium_Core32_Int64::fromReverseString(
+                self::substr($key, 8, 8)
+            )
+        );
+
+        # b = ( ( u64 )inlen ) << 56;
+        $b = new ParagonIE_Sodium_Core32_Int64(
+            array(($inlen << 8) & 0xffff, 0, 0, 0)
+        );
+
+        # v3 ^= k1;
+        $v[3] = $v[3]->xorInt64($k[1]);
+        # v2 ^= k0;
+        $v[2] = $v[2]->xorInt64($k[0]);
+        # v1 ^= k1;
+        $v[1] = $v[1]->xorInt64($k[1]);
+        # v0 ^= k0;
+        $v[0] = $v[0]->xorInt64($k[0]);
+
+        $left = $inlen;
+        # for ( ; in != end; in += 8 )
+        while ($left >= 8) {
+            # m = LOAD64_LE( in );
+            $m = ParagonIE_Sodium_Core32_Int64::fromReverseString(
+                self::substr($in, 0, 8)
+            );
+
+            # v3 ^= m;
+            $v[3] = $v[3]->xorInt64($m);
+
+            # SIPROUND;
+            # SIPROUND;
+            $v = self::sipRound($v);
+            $v = self::sipRound($v);
+
+            # v0 ^= m;
+            $v[0] = $v[0]->xorInt64($m);
+
+            $in = self::substr($in, 8);
+            $left -= 8;
+        }
+
+        # switch( left )
+        #  {
+        #     case 7: b |= ( ( u64 )in[ 6] )  << 48;
+        #     case 6: b |= ( ( u64 )in[ 5] )  << 40;
+        #     case 5: b |= ( ( u64 )in[ 4] )  << 32;
+        #     case 4: b |= ( ( u64 )in[ 3] )  << 24;
+        #     case 3: b |= ( ( u64 )in[ 2] )  << 16;
+        #     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
+        #     case 1: b |= ( ( u64 )in[ 0] ); break;
+        #     case 0: break;
+        # }
+        switch ($left) {
+            case 7:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        0, self::chrToInt($in[6]) << 16
+                    )
+                );
+            case 6:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        0, self::chrToInt($in[5]) << 8
+                    )
+                );
+            case 5:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        0, self::chrToInt($in[4])
+                    )
+                );
+            case 4:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        self::chrToInt($in[3]) << 24, 0
+                    )
+                );
+            case 3:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        self::chrToInt($in[2]) << 16, 0
+                    )
+                );
+            case 2:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        self::chrToInt($in[1]) << 8, 0
+                    )
+                );
+            case 1:
+                $b = $b->orInt64(
+                    ParagonIE_Sodium_Core32_Int64::fromInts(
+                        self::chrToInt($in[0]), 0
+                    )
+                );
+            case 0:
+                break;
+        }
+        // See docblock for why the 0th index gets the higher bits.
+
+        # v3 ^= b;
+        $v[3] = $v[3]->xorInt64($b);
+
+        # SIPROUND;
+        # SIPROUND;
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+
+        # v0 ^= b;
+        $v[0] = $v[0]->xorInt64($b);
+
+        // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
+        # v2 ^= 0xff;
+        $v[2]->limbs[3] ^= 0xff;
+
+        # SIPROUND;
+        # SIPROUND;
+        # SIPROUND;
+        # SIPROUND;
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+        $v = self::sipRound($v);
+
+        # b = v0 ^ v1 ^ v2 ^ v3;
+        # STORE64_LE( out, b );
+        return $v[0]
+            ->xorInt64($v[1])
+            ->xorInt64($v[2])
+            ->xorInt64($v[3])
+            ->toReverseString();
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Util.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Util.php
new file mode 100644
index 00000000..f32e5adc
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/Util.php
@@ -0,0 +1,13 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_Util', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core_Util
+ */
+abstract class ParagonIE_Sodium_Core32_Util extends ParagonIE_Sodium_Core_Util
+{
+
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/X25519.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/X25519.php
new file mode 100644
index 00000000..4e594b1e
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/X25519.php
@@ -0,0 +1,348 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_X25519', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_X25519
+ */
+abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519
+{
+    /**
+     * Alters the objects passed to this method in place.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
+     * @param int $b
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_cswap(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $g,
+        $b = 0
+    ) {
+        $f0 = (int) $f[0]->toInt();
+        $f1 = (int) $f[1]->toInt();
+        $f2 = (int) $f[2]->toInt();
+        $f3 = (int) $f[3]->toInt();
+        $f4 = (int) $f[4]->toInt();
+        $f5 = (int) $f[5]->toInt();
+        $f6 = (int) $f[6]->toInt();
+        $f7 = (int) $f[7]->toInt();
+        $f8 = (int) $f[8]->toInt();
+        $f9 = (int) $f[9]->toInt();
+        $g0 = (int) $g[0]->toInt();
+        $g1 = (int) $g[1]->toInt();
+        $g2 = (int) $g[2]->toInt();
+        $g3 = (int) $g[3]->toInt();
+        $g4 = (int) $g[4]->toInt();
+        $g5 = (int) $g[5]->toInt();
+        $g6 = (int) $g[6]->toInt();
+        $g7 = (int) $g[7]->toInt();
+        $g8 = (int) $g[8]->toInt();
+        $g9 = (int) $g[9]->toInt();
+        $b = -$b;
+        /** @var int $x0 */
+        $x0 = ($f0 ^ $g0) & $b;
+        /** @var int $x1 */
+        $x1 = ($f1 ^ $g1) & $b;
+        /** @var int $x2 */
+        $x2 = ($f2 ^ $g2) & $b;
+        /** @var int $x3 */
+        $x3 = ($f3 ^ $g3) & $b;
+        /** @var int $x4 */
+        $x4 = ($f4 ^ $g4) & $b;
+        /** @var int $x5 */
+        $x5 = ($f5 ^ $g5) & $b;
+        /** @var int $x6 */
+        $x6 = ($f6 ^ $g6) & $b;
+        /** @var int $x7 */
+        $x7 = ($f7 ^ $g7) & $b;
+        /** @var int $x8 */
+        $x8 = ($f8 ^ $g8) & $b;
+        /** @var int $x9 */
+        $x9 = ($f9 ^ $g9) & $b;
+        $f[0] = ParagonIE_Sodium_Core32_Int32::fromInt($f0 ^ $x0);
+        $f[1] = ParagonIE_Sodium_Core32_Int32::fromInt($f1 ^ $x1);
+        $f[2] = ParagonIE_Sodium_Core32_Int32::fromInt($f2 ^ $x2);
+        $f[3] = ParagonIE_Sodium_Core32_Int32::fromInt($f3 ^ $x3);
+        $f[4] = ParagonIE_Sodium_Core32_Int32::fromInt($f4 ^ $x4);
+        $f[5] = ParagonIE_Sodium_Core32_Int32::fromInt($f5 ^ $x5);
+        $f[6] = ParagonIE_Sodium_Core32_Int32::fromInt($f6 ^ $x6);
+        $f[7] = ParagonIE_Sodium_Core32_Int32::fromInt($f7 ^ $x7);
+        $f[8] = ParagonIE_Sodium_Core32_Int32::fromInt($f8 ^ $x8);
+        $f[9] = ParagonIE_Sodium_Core32_Int32::fromInt($f9 ^ $x9);
+        $g[0] = ParagonIE_Sodium_Core32_Int32::fromInt($g0 ^ $x0);
+        $g[1] = ParagonIE_Sodium_Core32_Int32::fromInt($g1 ^ $x1);
+        $g[2] = ParagonIE_Sodium_Core32_Int32::fromInt($g2 ^ $x2);
+        $g[3] = ParagonIE_Sodium_Core32_Int32::fromInt($g3 ^ $x3);
+        $g[4] = ParagonIE_Sodium_Core32_Int32::fromInt($g4 ^ $x4);
+        $g[5] = ParagonIE_Sodium_Core32_Int32::fromInt($g5 ^ $x5);
+        $g[6] = ParagonIE_Sodium_Core32_Int32::fromInt($g6 ^ $x6);
+        $g[7] = ParagonIE_Sodium_Core32_Int32::fromInt($g7 ^ $x7);
+        $g[8] = ParagonIE_Sodium_Core32_Int32::fromInt($g8 ^ $x8);
+        $g[9] = ParagonIE_Sodium_Core32_Int32::fromInt($g9 ^ $x9);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress MixedAssignment
+     * @psalm-suppress MixedMethodCall
+     */
+    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
+    {
+        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
+        $h = array();
+        for ($i = 0; $i < 10; ++$i) {
+            $h[$i] = $f[$i]->toInt64()->mulInt(121666, 17);
+        }
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry9 */
+        $carry9 = $h[9]->addInt(1 << 24)->shiftRight(25);
+        $h[0] = $h[0]->addInt64($carry9->mulInt(19, 5));
+        $h[9] = $h[9]->subInt64($carry9->shiftLeft(25));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry1 */
+        $carry1 = $h[1]->addInt(1 << 24)->shiftRight(25);
+        $h[2] = $h[2]->addInt64($carry1);
+        $h[1] = $h[1]->subInt64($carry1->shiftLeft(25));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry3 */
+        $carry3 = $h[3]->addInt(1 << 24)->shiftRight(25);
+        $h[4] = $h[4]->addInt64($carry3);
+        $h[3] = $h[3]->subInt64($carry3->shiftLeft(25));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry5 */
+        $carry5 = $h[5]->addInt(1 << 24)->shiftRight(25);
+        $h[6] = $h[6]->addInt64($carry5);
+        $h[5] = $h[5]->subInt64($carry5->shiftLeft(25));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry7 */
+        $carry7 = $h[7]->addInt(1 << 24)->shiftRight(25);
+        $h[8] = $h[8]->addInt64($carry7);
+        $h[7] = $h[7]->subInt64($carry7->shiftLeft(25));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry0 */
+        $carry0 = $h[0]->addInt(1 << 25)->shiftRight(26);
+        $h[1] = $h[1]->addInt64($carry0);
+        $h[0] = $h[0]->subInt64($carry0->shiftLeft(26));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry2 */
+        $carry2 = $h[2]->addInt(1 << 25)->shiftRight(26);
+        $h[3] = $h[3]->addInt64($carry2);
+        $h[2] = $h[2]->subInt64($carry2->shiftLeft(26));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry4 */
+        $carry4 = $h[4]->addInt(1 << 25)->shiftRight(26);
+        $h[5] = $h[5]->addInt64($carry4);
+        $h[4] = $h[4]->subInt64($carry4->shiftLeft(26));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry6 */
+        $carry6 = $h[6]->addInt(1 << 25)->shiftRight(26);
+        $h[7] = $h[7]->addInt64($carry6);
+        $h[6] = $h[6]->subInt64($carry6->shiftLeft(26));
+
+        /** @var ParagonIE_Sodium_Core32_Int32 $carry8 */
+        $carry8 = $h[8]->addInt(1 << 25)->shiftRight(26);
+        $h[9] = $h[9]->addInt64($carry8);
+        $h[8] = $h[8]->subInt64($carry8->shiftLeft(26));
+
+        for ($i = 0; $i < 10; ++$i) {
+            $h[$i] = $h[$i]->toInt32();
+        }
+        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
+        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * Inline comments preceded by # are from libsodium's ref10 code.
+     *
+     * @param string $n
+     * @param string $p
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult_curve25519_ref10($n, $p)
+    {
+        # for (i = 0;i < 32;++i) e[i] = n[i];
+        $e = '' . $n;
+        # e[0] &= 248;
+        $e[0] = self::intToChr(
+            self::chrToInt($e[0]) & 248
+        );
+        # e[31] &= 127;
+        # e[31] |= 64;
+        $e[31] = self::intToChr(
+            (self::chrToInt($e[31]) & 127) | 64
+        );
+        # fe_frombytes(x1,p);
+        $x1 = self::fe_frombytes($p);
+        # fe_1(x2);
+        $x2 = self::fe_1();
+        # fe_0(z2);
+        $z2 = self::fe_0();
+        # fe_copy(x3,x1);
+        $x3 = self::fe_copy($x1);
+        # fe_1(z3);
+        $z3 = self::fe_1();
+
+        # swap = 0;
+        /** @var int $swap */
+        $swap = 0;
+
+        # for (pos = 254;pos >= 0;--pos) {
+        for ($pos = 254; $pos >= 0; --$pos) {
+            # b = e[pos / 8] >> (pos & 7);
+            /** @var int $b */
+            $b = self::chrToInt(
+                    $e[(int) floor($pos / 8)]
+                ) >> ($pos & 7);
+            # b &= 1;
+            $b &= 1;
+            # swap ^= b;
+            $swap ^= $b;
+            # fe_cswap(x2,x3,swap);
+            self::fe_cswap($x2, $x3, $swap);
+            # fe_cswap(z2,z3,swap);
+            self::fe_cswap($z2, $z3, $swap);
+            # swap = b;
+            /** @var int $swap */
+            $swap = $b;
+            # fe_sub(tmp0,x3,z3);
+            $tmp0 = self::fe_sub($x3, $z3);
+            # fe_sub(tmp1,x2,z2);
+            $tmp1 = self::fe_sub($x2, $z2);
+
+            # fe_add(x2,x2,z2);
+            $x2 = self::fe_add($x2, $z2);
+
+            # fe_add(z2,x3,z3);
+            $z2 = self::fe_add($x3, $z3);
+
+            # fe_mul(z3,tmp0,x2);
+            $z3 = self::fe_mul($tmp0, $x2);
+
+            # fe_mul(z2,z2,tmp1);
+            $z2 = self::fe_mul($z2, $tmp1);
+
+            # fe_sq(tmp0,tmp1);
+            $tmp0 = self::fe_sq($tmp1);
+
+            # fe_sq(tmp1,x2);
+            $tmp1 = self::fe_sq($x2);
+
+            # fe_add(x3,z3,z2);
+            $x3 = self::fe_add($z3, $z2);
+
+            # fe_sub(z2,z3,z2);
+            $z2 = self::fe_sub($z3, $z2);
+
+            # fe_mul(x2,tmp1,tmp0);
+            $x2 = self::fe_mul($tmp1, $tmp0);
+
+            # fe_sub(tmp1,tmp1,tmp0);
+            $tmp1 = self::fe_sub($tmp1, $tmp0);
+
+            # fe_sq(z2,z2);
+            $z2 = self::fe_sq($z2);
+
+            # fe_mul121666(z3,tmp1);
+            $z3 = self::fe_mul121666($tmp1);
+
+            # fe_sq(x3,x3);
+            $x3 = self::fe_sq($x3);
+
+            # fe_add(tmp0,tmp0,z3);
+            $tmp0 = self::fe_add($tmp0, $z3);
+
+            # fe_mul(z3,x1,z2);
+            $z3 = self::fe_mul($x1, $z2);
+
+            # fe_mul(z2,tmp1,tmp0);
+            $z2 = self::fe_mul($tmp1, $tmp0);
+        }
+
+        # fe_cswap(x2,x3,swap);
+        self::fe_cswap($x2, $x3, $swap);
+
+        # fe_cswap(z2,z3,swap);
+        self::fe_cswap($z2, $z3, $swap);
+
+        # fe_invert(z2,z2);
+        $z2 = self::fe_invert($z2);
+
+        # fe_mul(x2,x2,z2);
+        $x2 = self::fe_mul($x2, $z2);
+        # fe_tobytes(q,x2);
+        return (string) self::fe_tobytes($x2);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY
+     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
+     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function edwards_to_montgomery(
+        ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY,
+        ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
+    ) {
+        $tempX = self::fe_add($edwardsZ, $edwardsY);
+        $tempZ = self::fe_sub($edwardsZ, $edwardsY);
+        $tempZ = self::fe_invert($tempZ);
+        return self::fe_mul($tempX, $tempZ);
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $n
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function crypto_scalarmult_curve25519_ref10_base($n)
+    {
+        # for (i = 0;i < 32;++i) e[i] = n[i];
+        $e = '' . $n;
+
+        # e[0] &= 248;
+        $e[0] = self::intToChr(
+            self::chrToInt($e[0]) & 248
+        );
+
+        # e[31] &= 127;
+        # e[31] |= 64;
+        $e[31] = self::intToChr(
+            (self::chrToInt($e[31]) & 127) | 64
+        );
+
+        $A = self::ge_scalarmult_base($e);
+        if (
+            !($A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
+            ||
+            !($A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
+        ) {
+            throw new TypeError('Null points encountered');
+        }
+        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
+        return self::fe_tobytes($pk);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php
new file mode 100644
index 00000000..1dfc8591
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/XChaCha20.php
@@ -0,0 +1,64 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_XChaCha20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_XChaCha20
+ */
+class ParagonIE_Sodium_Core32_XChaCha20 extends ParagonIE_Sodium_Core32_HChaCha20
+{
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function stream($len = 64, $nonce = '', $key = '')
+    {
+        if (self::strlen($nonce) !== 24) {
+            throw new SodiumException('Nonce must be 24 bytes long');
+        }
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
+                self::hChaCha20(
+                    self::substr($nonce, 0, 16),
+                    $key
+                ),
+                self::substr($nonce, 16, 8)
+            ),
+            str_repeat("\x00", $len)
+        );
+    }
+
+    /**
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @param string $ic
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
+    {
+        if (self::strlen($nonce) !== 24) {
+            throw new SodiumException('Nonce must be 24 bytes long');
+        }
+        return self::encryptBytes(
+            new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
+                self::hChaCha20(self::substr($nonce, 0, 16), $key),
+                self::substr($nonce, 16, 8),
+                $ic
+            ),
+            $message
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Core32/XSalsa20.php b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/XSalsa20.php
new file mode 100644
index 00000000..a16b93bc
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Core32/XSalsa20.php
@@ -0,0 +1,57 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Core32_XSalsa20', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Core32_XSalsa20
+ */
+abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20
+{
+    /**
+     * Expand a key and nonce into an xsalsa20 keystream.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param int $len
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function xsalsa20($len, $nonce, $key)
+    {
+        $ret = self::salsa20(
+            $len,
+            self::substr($nonce, 16, 8),
+            self::hsalsa20($nonce, $key)
+        );
+        return $ret;
+    }
+
+    /**
+     * Encrypt a string with XSalsa20. Doesn't provide integrity.
+     *
+     * @internal You should not use this directly from another application
+     *
+     * @param string $message
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function xsalsa20_xor($message, $nonce, $key)
+    {
+        return self::xorStrings(
+            $message,
+            self::xsalsa20(
+                self::strlen($message),
+                $nonce,
+                $key
+            )
+        );
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Crypto.php b/core/libraries/vendor/paragonie/sodium_compat/src/Crypto.php
new file mode 100644
index 00000000..15b24c68
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Crypto.php
@@ -0,0 +1,1245 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Crypto', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Crypto
+ *
+ * ATTENTION!
+ *
+ * If you are using this library, you should be using
+ * ParagonIE_Sodium_Compat in your code, not this class.
+ */
+abstract class ParagonIE_Sodium_Crypto
+{
+    const aead_chacha20poly1305_KEYBYTES = 32;
+    const aead_chacha20poly1305_NSECBYTES = 0;
+    const aead_chacha20poly1305_NPUBBYTES = 8;
+    const aead_chacha20poly1305_ABYTES = 16;
+
+    const aead_chacha20poly1305_IETF_KEYBYTES = 32;
+    const aead_chacha20poly1305_IETF_NSECBYTES = 0;
+    const aead_chacha20poly1305_IETF_NPUBBYTES = 12;
+    const aead_chacha20poly1305_IETF_ABYTES = 16;
+
+    const aead_xchacha20poly1305_IETF_KEYBYTES = 32;
+    const aead_xchacha20poly1305_IETF_NSECBYTES = 0;
+    const aead_xchacha20poly1305_IETF_NPUBBYTES = 24;
+    const aead_xchacha20poly1305_IETF_ABYTES = 16;
+
+    const box_curve25519xsalsa20poly1305_SEEDBYTES = 32;
+    const box_curve25519xsalsa20poly1305_PUBLICKEYBYTES = 32;
+    const box_curve25519xsalsa20poly1305_SECRETKEYBYTES = 32;
+    const box_curve25519xsalsa20poly1305_BEFORENMBYTES = 32;
+    const box_curve25519xsalsa20poly1305_NONCEBYTES = 24;
+    const box_curve25519xsalsa20poly1305_MACBYTES = 16;
+    const box_curve25519xsalsa20poly1305_BOXZEROBYTES = 16;
+    const box_curve25519xsalsa20poly1305_ZEROBYTES = 32;
+
+    const onetimeauth_poly1305_BYTES = 16;
+    const onetimeauth_poly1305_KEYBYTES = 32;
+
+    const secretbox_xsalsa20poly1305_KEYBYTES = 32;
+    const secretbox_xsalsa20poly1305_NONCEBYTES = 24;
+    const secretbox_xsalsa20poly1305_MACBYTES = 16;
+    const secretbox_xsalsa20poly1305_BOXZEROBYTES = 16;
+    const secretbox_xsalsa20poly1305_ZEROBYTES = 32;
+
+    const secretbox_xchacha20poly1305_KEYBYTES = 32;
+    const secretbox_xchacha20poly1305_NONCEBYTES = 24;
+    const secretbox_xchacha20poly1305_MACBYTES = 16;
+    const secretbox_xchacha20poly1305_BOXZEROBYTES = 16;
+    const secretbox_xchacha20poly1305_ZEROBYTES = 32;
+
+    const stream_salsa20_KEYBYTES = 32;
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of message (ciphertext + MAC) */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int  $clen - Length of ciphertext */
+        $clen = $len - self::aead_chacha20poly1305_ABYTES;
+
+        /** @var int $adlen - Length of associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var string $mac - Message authentication code */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $message,
+            $clen,
+            self::aead_chacha20poly1305_ABYTES
+        );
+
+        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+            32,
+            $nonce,
+            $key
+        );
+
+        /* Recalculate the Poly1305 authentication tag (MAC): */
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+        $state->update($ad);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update($ciphertext);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $computed_mac = $state->finish();
+
+        /* Compare the given MAC with the recalculated MAC: */
+        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
+            throw new SodiumException('Invalid MAC');
+        }
+
+        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
+        return ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+            $ciphertext,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of the plaintext message */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int $adlen - Length of the associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+            32,
+            $nonce,
+            $key
+        );
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+
+        /** @var string $ciphertext - Raw encrypted data */
+        $ciphertext = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+            $message,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+
+        $state->update($ad);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update($ciphertext);
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        return $ciphertext . $state->finish();
+    }
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_ietf_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $adlen - Length of associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var int $len - Length of message (ciphertext + MAC) */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int  $clen - Length of ciphertext */
+        $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
+            32,
+            $nonce,
+            $key
+        );
+
+        /** @var string $mac - Message authentication code */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $message,
+            $len - self::aead_chacha20poly1305_IETF_ABYTES,
+            self::aead_chacha20poly1305_IETF_ABYTES
+        );
+
+        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr(
+            $message,
+            0,
+            $len - self::aead_chacha20poly1305_IETF_ABYTES
+        );
+
+        /* Recalculate the Poly1305 authentication tag (MAC): */
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+        $state->update($ad);
+        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+        $state->update($ciphertext);
+        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($clen));
+        $computed_mac = $state->finish();
+
+        /* Compare the given MAC with the recalculated MAC: */
+        if (!ParagonIE_Sodium_Core_Util::verify_16($computed_mac, $mac)) {
+            throw new SodiumException('Invalid MAC');
+        }
+
+        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
+        return ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
+            $ciphertext,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_ietf_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of the plaintext message */
+        $len = ParagonIE_Sodium_Core_Util::strlen($message);
+
+        /** @var int $adlen - Length of the associated data */
+        $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
+            32,
+            $nonce,
+            $key
+        );
+        $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+
+        /** @var string $ciphertext - Raw encrypted data */
+        $ciphertext = ParagonIE_Sodium_Core_ChaCha20::ietfStreamXorIc(
+            $message,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core_Util::store64_le(1)
+        );
+
+        $state->update($ad);
+        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+        $state->update($ciphertext);
+        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($adlen));
+        $state->update(ParagonIE_Sodium_Core_Util::store64_le($len));
+        return $ciphertext . $state->finish();
+    }
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_xchacha20poly1305_ietf_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = "\x00\x00\x00\x00" .
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_xchacha20poly1305_ietf_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = "\x00\x00\x00\x00" .
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+    }
+
+    /**
+     * HMAC-SHA-512-256 (a.k.a. the leftmost 256 bits of HMAC-SHA-512)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $key
+     * @return string
+     * @throws TypeError
+     */
+    public static function auth($message, $key)
+    {
+        return ParagonIE_Sodium_Core_Util::substr(
+            hash_hmac('sha512', $message, $key, true),
+            0,
+            32
+        );
+    }
+
+    /**
+     * HMAC-SHA-512-256 validation. Constant-time via hash_equals().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Core_Util::hashEquals(
+            $mac,
+            self::auth($message, $key)
+        );
+    }
+
+    /**
+     * X25519 key exchange followed by XSalsa20Poly1305 symmetric encryption
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box($plaintext, $nonce, $keypair)
+    {
+        $c = self::secretbox(
+            $plaintext,
+            $nonce,
+            self::box_beforenm(
+                self::box_secretkey($keypair),
+                self::box_publickey($keypair)
+            )
+        );
+        return $c;
+    }
+
+    /**
+     * X25519-XSalsa20-Poly1305 with one ephemeral X25519 keypair.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seal($message, $publicKey)
+    {
+        /** @var string $ephemeralKeypair */
+        $ephemeralKeypair = self::box_keypair();
+
+        /** @var string $ephemeralSK */
+        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
+
+        /** @var string $ephemeralPK */
+        $ephemeralPK = self::box_publickey($ephemeralKeypair);
+
+        /** @var string $nonce */
+        $nonce = self::generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var string $keypair - The combined keypair used in crypto_box() */
+        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+
+        /** @var string $ciphertext Ciphertext + MAC from crypto_box */
+        $ciphertext = self::box($message, $nonce, $keypair);
+        try {
+            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
+            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
+            ParagonIE_Sodium_Compat::memzero($nonce);
+        } catch (SodiumException $ex) {
+            $ephemeralKeypair = null;
+            $ephemeralSK = null;
+            $nonce = null;
+        }
+        return $ephemeralPK . $ciphertext;
+    }
+
+    /**
+     * Opens a message encrypted via box_seal().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seal_open($message, $keypair)
+    {
+        /** @var string $ephemeralPK */
+        $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32);
+
+        /** @var string $ciphertext (ciphertext + MAC) */
+        $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 32);
+
+        /** @var string $secretKey */
+        $secretKey = self::box_secretkey($keypair);
+
+        /** @var string $publicKey */
+        $publicKey = self::box_publickey($keypair);
+
+        /** @var string $nonce */
+        $nonce = self::generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var string $keypair */
+        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+
+        /** @var string $m */
+        $m = self::box_open($ciphertext, $nonce, $keypair);
+        try {
+            ParagonIE_Sodium_Compat::memzero($secretKey);
+            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
+            ParagonIE_Sodium_Compat::memzero($nonce);
+        } catch (SodiumException $ex) {
+            $secretKey = null;
+            $ephemeralPK = null;
+            $nonce = null;
+        }
+        return $m;
+    }
+
+    /**
+     * Used by crypto_box() to get the crypto_secretbox() key.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_beforenm($sk, $pk)
+    {
+        return ParagonIE_Sodium_Core_HSalsa20::hsalsa20(
+            str_repeat("\x00", 16),
+            self::scalarmult($sk, $pk)
+        );
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_keypair()
+    {
+        $sKey = random_bytes(32);
+        $pKey = self::scalarmult_base($sKey);
+        return $sKey . $pKey;
+    }
+
+    /**
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seed_keypair($seed)
+    {
+        $sKey = ParagonIE_Sodium_Core_Util::substr(
+            hash('sha512', $seed, true),
+            0,
+            32
+        );
+        $pKey = self::scalarmult_base($sKey);
+        return $sKey . $pKey;
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @param string $pKey
+     * @return string
+     * @throws TypeError
+     */
+    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+    {
+        return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
+            ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function box_secretkey($keypair)
+    {
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        }
+        return ParagonIE_Sodium_Core_Util::substr($keypair, 0, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function box_publickey($keypair)
+    {
+        if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        }
+        return ParagonIE_Sodium_Core_Util::substr($keypair, 32, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @return string
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_publickey_from_secretkey($sKey)
+    {
+        if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.');
+        }
+        return self::scalarmult_base($sKey);
+    }
+
+    /**
+     * Decrypt a message encrypted with box().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_open($ciphertext, $nonce, $keypair)
+    {
+        return self::secretbox_open(
+            $ciphertext,
+            $nonce,
+            self::box_beforenm(
+                self::box_secretkey($keypair),
+                self::box_publickey($keypair)
+            )
+        );
+    }
+
+    /**
+     * Calculate a BLAKE2b hash.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string|null $key
+     * @param int $outlen
+     * @return string
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash($message, $key = '', $outlen = 32)
+    {
+        // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+        $k = null;
+        if (!empty($key)) {
+            /** @var SplFixedArray $k */
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
+            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
+                throw new RangeException('Invalid key size');
+            }
+        }
+
+        /** @var SplFixedArray $in */
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+
+        /** @var SplFixedArray $ctx */
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outlen);
+        ParagonIE_Sodium_Core_BLAKE2b::update($ctx, $in, $in->count());
+
+        /** @var SplFixedArray $out */
+        $out = new SplFixedArray($outlen);
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($ctx, $out);
+
+        /** @var array<int, int> */
+        $outArray = $out->toArray();
+        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+    }
+
+    /**
+     * Finalize a BLAKE2b hashing context, returning the hash.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ctx
+     * @param int $outlen
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash_final($ctx, $outlen = 32)
+    {
+        if (!is_string($ctx)) {
+            throw new TypeError('Context must be a string');
+        }
+        $out = new SplFixedArray($outlen);
+
+        /** @var SplFixedArray $context */
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+
+        /** @var SplFixedArray $out */
+        $out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
+
+        /** @var array<int, int> */
+        $outArray = $out->toArray();
+        return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
+    }
+
+    /**
+     * Initialize a hashing context for BLAKE2b.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $key
+     * @param int $outputLength
+     * @return string
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash_init($key = '', $outputLength = 32)
+    {
+        // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+        $k = null;
+        if (!empty($key)) {
+            $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
+            if ($k->count() > ParagonIE_Sodium_Core_BLAKE2b::KEYBYTES) {
+                throw new RangeException('Invalid key size');
+            }
+        }
+
+        /** @var SplFixedArray $ctx */
+        $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength);
+
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($ctx);
+    }
+
+    /**
+     * Update a hashing context for BLAKE2b with $message
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ctx
+     * @param string $message
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash_update($ctx, $message)
+    {
+        // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
+
+        /** @var SplFixedArray $context */
+        $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
+
+        /** @var SplFixedArray $in */
+        $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
+
+        ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
+
+        return ParagonIE_Sodium_Core_BLAKE2b::contextToString($context);
+    }
+
+    /**
+     * Libsodium's crypto_kx().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $my_sk
+     * @param string $their_pk
+     * @param string $client_pk
+     * @param string $server_pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
+    {
+        return self::generichash(
+            self::scalarmult($my_sk, $their_pk) .
+            $client_pk .
+            $server_pk
+        );
+    }
+
+    /**
+     * ECDH over Curve25519
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @param string $pKey
+     * @return string
+     *
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function scalarmult($sKey, $pKey)
+    {
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
+        self::scalarmult_throw_if_zero($q);
+        return $q;
+    }
+
+    /**
+     * ECDH over Curve25519, using the basepoint.
+     * Used to get a secret key from a public key.
+     *
+     * @param string $secret
+     * @return string
+     *
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function scalarmult_base($secret)
+    {
+        $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
+        self::scalarmult_throw_if_zero($q);
+        return $q;
+    }
+
+    /**
+     * This throws an Error if a zero public key was passed to the function.
+     *
+     * @param string $q
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function scalarmult_throw_if_zero($q)
+    {
+        $d = 0;
+        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
+            $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]);
+        }
+
+        /* branch-free variant of === 0 */
+        if (-(1 & (($d - 1) >> 8))) {
+            throw new SodiumException('Zero public key is not allowed');
+        }
+    }
+
+    /**
+     * XSalsa20-Poly1305 authenticated symmetric-key encryption.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox($plaintext, $nonce, $key)
+    {
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
+            $block0,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $block0,
+            self::secretbox_xsalsa20poly1305_ZEROBYTES
+        );
+        if ($mlen > $mlen0) {
+            $c .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $plaintext,
+                    self::secretbox_xsalsa20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                1,
+                $subkey
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            ParagonIE_Sodium_Core_Util::substr(
+                $block0,
+                0,
+                self::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+
+        $state->update($c);
+
+        /** @var string $c - MAC || ciphertext */
+        $c = $state->finish() . $c;
+        unset($state);
+
+        return $c;
+    }
+
+    /**
+     * Decrypt a ciphertext generated via secretbox().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_open($ciphertext, $nonce, $key)
+    {
+        /** @var string $mac */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            0,
+            self::secretbox_xsalsa20poly1305_MACBYTES
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            self::secretbox_xsalsa20poly1305_MACBYTES
+        );
+
+        /** @var int $clen */
+        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
+            64,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+        $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
+            $mac,
+            $c,
+            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+        );
+        if (!$verified) {
+            try {
+                ParagonIE_Sodium_Compat::memzero($subkey);
+            } catch (SodiumException $ex) {
+                $subkey = null;
+            }
+            throw new SodiumException('Invalid MAC');
+        }
+
+        /** @var string $m - Decrypted message */
+        $m = ParagonIE_Sodium_Core_Util::xorStrings(
+            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
+            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+        );
+        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            // We had more than 1 block, so let's continue to decrypt the rest.
+            $m .= ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $c,
+                    self::secretbox_xsalsa20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                1,
+                (string) $subkey
+            );
+        }
+        return $m;
+    }
+
+    /**
+     * XChaCha20-Poly1305 authenticated symmetric-key encryption.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    {
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+            $block0,
+            $nonceLast,
+            $subkey
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $block0,
+            self::secretbox_xchacha20poly1305_ZEROBYTES
+        );
+        if ($mlen > $mlen0) {
+            $c .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $plaintext,
+                    self::secretbox_xchacha20poly1305_ZEROBYTES
+                ),
+                $nonceLast,
+                $subkey,
+                ParagonIE_Sodium_Core_Util::store64_le(1)
+            );
+        }
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            ParagonIE_Sodium_Core_Util::substr(
+                $block0,
+                0,
+                self::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+
+        $state->update($c);
+
+        /** @var string $c - MAC || ciphertext */
+        $c = $state->finish() . $c;
+        unset($state);
+
+        return $c;
+    }
+
+    /**
+     * Decrypt a ciphertext generated via secretbox_xchacha20poly1305().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    {
+        /** @var string $mac */
+        $mac = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            0,
+            self::secretbox_xchacha20poly1305_MACBYTES
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core_Util::substr(
+            $ciphertext,
+            self::secretbox_xchacha20poly1305_MACBYTES
+        );
+
+        /** @var int $clen */
+        $clen = ParagonIE_Sodium_Core_Util::strlen($c);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HChaCha20::hchacha20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
+            64,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+        $verified = ParagonIE_Sodium_Core_Poly1305::onetimeauth_verify(
+            $mac,
+            $c,
+            ParagonIE_Sodium_Core_Util::substr($block0, 0, 32)
+        );
+
+        if (!$verified) {
+            try {
+                ParagonIE_Sodium_Compat::memzero($subkey);
+            } catch (SodiumException $ex) {
+                $subkey = null;
+            }
+            throw new SodiumException('Invalid MAC');
+        }
+
+        /** @var string $m - Decrypted message */
+        $m = ParagonIE_Sodium_Core_Util::xorStrings(
+            ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
+            ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+        );
+
+        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
+            // We had more than 1 block, so let's continue to decrypt the rest.
+            $m .= ParagonIE_Sodium_Core_ChaCha20::streamXorIc(
+                ParagonIE_Sodium_Core_Util::substr(
+                    $c,
+                    self::secretbox_xchacha20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+                (string) $subkey,
+                ParagonIE_Sodium_Core_Util::store64_le(1)
+            );
+        }
+        return $m;
+    }
+
+    /**
+     * Detached Ed25519 signature.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk);
+    }
+
+    /**
+     * Attached Ed25519 signature. (Returns a signed message.)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk);
+    }
+
+    /**
+     * Opens a signed message. If valid, returns the message.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_open($signedMessage, $pk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk);
+    }
+
+    /**
+     * Verify a detached signature of a given message and public key.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/Crypto32.php b/core/libraries/vendor/paragonie/sodium_compat/src/Crypto32.php
new file mode 100644
index 00000000..cd4e2661
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/Crypto32.php
@@ -0,0 +1,1244 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_Crypto32', false)) {
+    return;
+}
+
+/**
+ * Class ParagonIE_Sodium_Crypto
+ *
+ * ATTENTION!
+ *
+ * If you are using this library, you should be using
+ * ParagonIE_Sodium_Compat in your code, not this class.
+ */
+abstract class ParagonIE_Sodium_Crypto32
+{
+    const aead_chacha20poly1305_KEYBYTES = 32;
+    const aead_chacha20poly1305_NSECBYTES = 0;
+    const aead_chacha20poly1305_NPUBBYTES = 8;
+    const aead_chacha20poly1305_ABYTES = 16;
+
+    const aead_chacha20poly1305_IETF_KEYBYTES = 32;
+    const aead_chacha20poly1305_IETF_NSECBYTES = 0;
+    const aead_chacha20poly1305_IETF_NPUBBYTES = 12;
+    const aead_chacha20poly1305_IETF_ABYTES = 16;
+
+    const aead_xchacha20poly1305_IETF_KEYBYTES = 32;
+    const aead_xchacha20poly1305_IETF_NSECBYTES = 0;
+    const aead_xchacha20poly1305_IETF_NPUBBYTES = 24;
+    const aead_xchacha20poly1305_IETF_ABYTES = 16;
+
+    const box_curve25519xsalsa20poly1305_SEEDBYTES = 32;
+    const box_curve25519xsalsa20poly1305_PUBLICKEYBYTES = 32;
+    const box_curve25519xsalsa20poly1305_SECRETKEYBYTES = 32;
+    const box_curve25519xsalsa20poly1305_BEFORENMBYTES = 32;
+    const box_curve25519xsalsa20poly1305_NONCEBYTES = 24;
+    const box_curve25519xsalsa20poly1305_MACBYTES = 16;
+    const box_curve25519xsalsa20poly1305_BOXZEROBYTES = 16;
+    const box_curve25519xsalsa20poly1305_ZEROBYTES = 32;
+
+    const onetimeauth_poly1305_BYTES = 16;
+    const onetimeauth_poly1305_KEYBYTES = 32;
+
+    const secretbox_xsalsa20poly1305_KEYBYTES = 32;
+    const secretbox_xsalsa20poly1305_NONCEBYTES = 24;
+    const secretbox_xsalsa20poly1305_MACBYTES = 16;
+    const secretbox_xsalsa20poly1305_BOXZEROBYTES = 16;
+    const secretbox_xsalsa20poly1305_ZEROBYTES = 32;
+
+    const secretbox_xchacha20poly1305_KEYBYTES = 32;
+    const secretbox_xchacha20poly1305_NONCEBYTES = 24;
+    const secretbox_xchacha20poly1305_MACBYTES = 16;
+    const secretbox_xchacha20poly1305_BOXZEROBYTES = 16;
+    const secretbox_xchacha20poly1305_ZEROBYTES = 32;
+
+    const stream_salsa20_KEYBYTES = 32;
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of message (ciphertext + MAC) */
+        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+        /** @var int  $clen - Length of ciphertext */
+        $clen = $len - self::aead_chacha20poly1305_ABYTES;
+
+        /** @var int $adlen - Length of associated data */
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+        /** @var string $mac - Message authentication code */
+        $mac = ParagonIE_Sodium_Core32_Util::substr(
+            $message,
+            $clen,
+            self::aead_chacha20poly1305_ABYTES
+        );
+
+        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 0, $clen);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
+            32,
+            $nonce,
+            $key
+        );
+
+        /* Recalculate the Poly1305 authentication tag (MAC): */
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+        $state->update($ad);
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+        $state->update($ciphertext);
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
+        $computed_mac = $state->finish();
+
+        /* Compare the given MAC with the recalculated MAC: */
+        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
+            throw new SodiumException('Invalid MAC');
+        }
+
+        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
+        return ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+            $ciphertext,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core32_Util::store64_le(1)
+        );
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of the plaintext message */
+        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+        /** @var int $adlen - Length of the associated data */
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
+            32,
+            $nonce,
+            $key
+        );
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+
+        /** @var string $ciphertext - Raw encrypted data */
+        $ciphertext = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+            $message,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core32_Util::store64_le(1)
+        );
+
+        $state->update($ad);
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+        $state->update($ciphertext);
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
+        return $ciphertext . $state->finish();
+    }
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_ietf_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $adlen - Length of associated data */
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+        /** @var int $len - Length of message (ciphertext + MAC) */
+        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+        /** @var int  $clen - Length of ciphertext */
+        $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
+            32,
+            $nonce,
+            $key
+        );
+
+        /** @var string $mac - Message authentication code */
+        $mac = ParagonIE_Sodium_Core32_Util::substr(
+            $message,
+            $len - self::aead_chacha20poly1305_IETF_ABYTES,
+            self::aead_chacha20poly1305_IETF_ABYTES
+        );
+
+        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        $ciphertext = ParagonIE_Sodium_Core32_Util::substr(
+            $message,
+            0,
+            $len - self::aead_chacha20poly1305_IETF_ABYTES
+        );
+
+        /* Recalculate the Poly1305 authentication tag (MAC): */
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+        $state->update($ad);
+        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+        $state->update($ciphertext);
+        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
+        $computed_mac = $state->finish();
+
+        /* Compare the given MAC with the recalculated MAC: */
+        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
+            throw new SodiumException('Invalid MAC');
+        }
+
+        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
+        return ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+            $ciphertext,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core32_Util::store64_le(1)
+        );
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_chacha20poly1305_ietf_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        /** @var int $len - Length of the plaintext message */
+        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
+
+        /** @var int $adlen - Length of the associated data */
+        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
+
+        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
+            32,
+            $nonce,
+            $key
+        );
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+        }
+
+        /** @var string $ciphertext - Raw encrypted data */
+        $ciphertext = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
+            $message,
+            $nonce,
+            $key,
+            ParagonIE_Sodium_Core32_Util::store64_le(1)
+        );
+
+        $state->update($ad);
+        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
+        $state->update($ciphertext);
+        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
+        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
+        return $ciphertext . $state->finish();
+    }
+
+    /**
+     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_xchacha20poly1305_ietf_decrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = "\x00\x00\x00\x00" .
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
+    }
+
+    /**
+     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $ad
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function aead_xchacha20poly1305_ietf_encrypt(
+        $message = '',
+        $ad = '',
+        $nonce = '',
+        $key = ''
+    ) {
+        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = "\x00\x00\x00\x00" .
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
+    }
+
+    /**
+     * HMAC-SHA-512-256 (a.k.a. the leftmost 256 bits of HMAC-SHA-512)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $key
+     * @return string
+     * @throws TypeError
+     */
+    public static function auth($message, $key)
+    {
+        return ParagonIE_Sodium_Core32_Util::substr(
+            hash_hmac('sha512', $message, $key, true),
+            0,
+            32
+        );
+    }
+
+    /**
+     * HMAC-SHA-512-256 validation. Constant-time via hash_equals().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $mac
+     * @param string $message
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function auth_verify($mac, $message, $key)
+    {
+        return ParagonIE_Sodium_Core32_Util::hashEquals(
+            $mac,
+            self::auth($message, $key)
+        );
+    }
+
+    /**
+     * X25519 key exchange followed by XSalsa20Poly1305 symmetric encryption
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box($plaintext, $nonce, $keypair)
+    {
+        return self::secretbox(
+            $plaintext,
+            $nonce,
+            self::box_beforenm(
+                self::box_secretkey($keypair),
+                self::box_publickey($keypair)
+            )
+        );
+    }
+
+    /**
+     * X25519-XSalsa20-Poly1305 with one ephemeral X25519 keypair.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $publicKey
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seal($message, $publicKey)
+    {
+        /** @var string $ephemeralKeypair */
+        $ephemeralKeypair = self::box_keypair();
+
+        /** @var string $ephemeralSK */
+        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
+
+        /** @var string $ephemeralPK */
+        $ephemeralPK = self::box_publickey($ephemeralKeypair);
+
+        /** @var string $nonce */
+        $nonce = self::generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var string $keypair - The combined keypair used in crypto_box() */
+        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
+
+        /** @var string $ciphertext Ciphertext + MAC from crypto_box */
+        $ciphertext = self::box($message, $nonce, $keypair);
+        try {
+            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
+            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
+            ParagonIE_Sodium_Compat::memzero($nonce);
+        } catch (SodiumException $ex) {
+            $ephemeralKeypair = null;
+            $ephemeralSK = null;
+            $nonce = null;
+        }
+        return $ephemeralPK . $ciphertext;
+    }
+
+    /**
+     * Opens a message encrypted via box_seal().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seal_open($message, $keypair)
+    {
+        /** @var string $ephemeralPK */
+        $ephemeralPK = ParagonIE_Sodium_Core32_Util::substr($message, 0, 32);
+
+        /** @var string $ciphertext (ciphertext + MAC) */
+        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 32);
+
+        /** @var string $secretKey */
+        $secretKey = self::box_secretkey($keypair);
+
+        /** @var string $publicKey */
+        $publicKey = self::box_publickey($keypair);
+
+        /** @var string $nonce */
+        $nonce = self::generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var string $keypair */
+        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
+
+        /** @var string $m */
+        $m = self::box_open($ciphertext, $nonce, $keypair);
+        try {
+            ParagonIE_Sodium_Compat::memzero($secretKey);
+            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
+            ParagonIE_Sodium_Compat::memzero($nonce);
+        } catch (SodiumException $ex) {
+            $secretKey = null;
+            $ephemeralPK = null;
+            $nonce = null;
+        }
+        return $m;
+    }
+
+    /**
+     * Used by crypto_box() to get the crypto_secretbox() key.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sk
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_beforenm($sk, $pk)
+    {
+        return ParagonIE_Sodium_Core32_HSalsa20::hsalsa20(
+            str_repeat("\x00", 16),
+            self::scalarmult($sk, $pk)
+        );
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_keypair()
+    {
+        $sKey = random_bytes(32);
+        $pKey = self::scalarmult_base($sKey);
+        return $sKey . $pKey;
+    }
+
+    /**
+     * @param string $seed
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seed_keypair($seed)
+    {
+        $sKey = ParagonIE_Sodium_Core32_Util::substr(
+            hash('sha512', $seed, true),
+            0,
+            32
+        );
+        $pKey = self::scalarmult_base($sKey);
+        return $sKey . $pKey;
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @param string $pKey
+     * @return string
+     * @throws TypeError
+     */
+    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
+    {
+        return ParagonIE_Sodium_Core32_Util::substr($sKey, 0, 32) .
+            ParagonIE_Sodium_Core32_Util::substr($pKey, 0, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function box_secretkey($keypair)
+    {
+        if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== 64) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        }
+        return ParagonIE_Sodium_Core32_Util::substr($keypair, 0, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $keypair
+     * @return string
+     * @throws RangeException
+     * @throws TypeError
+     */
+    public static function box_publickey($keypair)
+    {
+        if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.');
+        }
+        return ParagonIE_Sodium_Core32_Util::substr($keypair, 32, 32);
+    }
+
+    /**
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @return string
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_publickey_from_secretkey($sKey)
+    {
+        if (ParagonIE_Sodium_Core32_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new RangeException('Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.');
+        }
+        return self::scalarmult_base($sKey);
+    }
+
+    /**
+     * Decrypt a message encrypted with box().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $keypair
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_open($ciphertext, $nonce, $keypair)
+    {
+        return self::secretbox_open(
+            $ciphertext,
+            $nonce,
+            self::box_beforenm(
+                self::box_secretkey($keypair),
+                self::box_publickey($keypair)
+            )
+        );
+    }
+
+    /**
+     * Calculate a BLAKE2b hash.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string|null $key
+     * @param int $outlen
+     * @return string
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash($message, $key = '', $outlen = 32)
+    {
+        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+        $k = null;
+        if (!empty($key)) {
+            /** @var SplFixedArray $k */
+            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
+            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
+                throw new RangeException('Invalid key size');
+            }
+        }
+
+        /** @var SplFixedArray $in */
+        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
+
+        /** @var SplFixedArray $ctx */
+        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outlen);
+        ParagonIE_Sodium_Core32_BLAKE2b::update($ctx, $in, $in->count());
+
+        /** @var SplFixedArray $out */
+        $out = new SplFixedArray($outlen);
+        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($ctx, $out);
+
+        /** @var array<int, int> */
+        $outArray = $out->toArray();
+        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
+    }
+
+    /**
+     * Finalize a BLAKE2b hashing context, returning the hash.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ctx
+     * @param int $outlen
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash_final($ctx, $outlen = 32)
+    {
+        if (!is_string($ctx)) {
+            throw new TypeError('Context must be a string');
+        }
+        $out = new SplFixedArray($outlen);
+
+        /** @var SplFixedArray $context */
+        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
+
+        /** @var SplFixedArray $out */
+        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($context, $out);
+
+        /** @var array<int, int> */
+        $outArray = $out->toArray();
+        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
+    }
+
+    /**
+     * Initialize a hashing context for BLAKE2b.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $key
+     * @param int $outputLength
+     * @return string
+     * @throws RangeException
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash_init($key = '', $outputLength = 32)
+    {
+        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+        $k = null;
+        if (!empty($key)) {
+            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
+            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
+                throw new RangeException('Invalid key size');
+            }
+        }
+
+        /** @var SplFixedArray $ctx */
+        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength);
+
+        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
+    }
+
+    /**
+     * Update a hashing context for BLAKE2b with $message
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ctx
+     * @param string $message
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function generichash_update($ctx, $message)
+    {
+        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
+        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
+
+        /** @var SplFixedArray $context */
+        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
+
+        /** @var SplFixedArray $in */
+        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
+
+        ParagonIE_Sodium_Core32_BLAKE2b::update($context, $in, $in->count());
+
+        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($context);
+    }
+
+    /**
+     * Libsodium's crypto_kx().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $my_sk
+     * @param string $their_pk
+     * @param string $client_pk
+     * @param string $server_pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
+    {
+        return self::generichash(
+            self::scalarmult($my_sk, $their_pk) .
+            $client_pk .
+            $server_pk
+        );
+    }
+
+    /**
+     * ECDH over Curve25519
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $sKey
+     * @param string $pKey
+     * @return string
+     *
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function scalarmult($sKey, $pKey)
+    {
+        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
+        self::scalarmult_throw_if_zero($q);
+        return $q;
+    }
+
+    /**
+     * ECDH over Curve25519, using the basepoint.
+     * Used to get a secret key from a public key.
+     *
+     * @param string $secret
+     * @return string
+     *
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function scalarmult_base($secret)
+    {
+        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
+        self::scalarmult_throw_if_zero($q);
+        return $q;
+    }
+
+    /**
+     * This throws an Error if a zero public key was passed to the function.
+     *
+     * @param string $q
+     * @return void
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function scalarmult_throw_if_zero($q)
+    {
+        $d = 0;
+        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
+            $d |= ParagonIE_Sodium_Core32_Util::chrToInt($q[$i]);
+        }
+
+        /* branch-free variant of === 0 */
+        if (-(1 & (($d - 1) >> 8))) {
+            throw new SodiumException('Zero public key is not allowed');
+        }
+    }
+
+    /**
+     * XSalsa20-Poly1305 authenticated symmetric-key encryption.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox($plaintext, $nonce, $key)
+    {
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
+            $block0,
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core32_Util::substr(
+            $block0,
+            self::secretbox_xsalsa20poly1305_ZEROBYTES
+        );
+        if ($mlen > $mlen0) {
+            $c .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
+                ParagonIE_Sodium_Core32_Util::substr(
+                    $plaintext,
+                    self::secretbox_xsalsa20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+                1,
+                $subkey
+            );
+        }
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
+            ParagonIE_Sodium_Core32_Util::substr(
+                $block0,
+                0,
+                self::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+
+        $state->update($c);
+
+        /** @var string $c - MAC || ciphertext */
+        $c = $state->finish() . $c;
+        unset($state);
+
+        return $c;
+    }
+
+    /**
+     * Decrypt a ciphertext generated via secretbox().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_open($ciphertext, $nonce, $key)
+    {
+        /** @var string $mac */
+        $mac = ParagonIE_Sodium_Core32_Util::substr(
+            $ciphertext,
+            0,
+            self::secretbox_xsalsa20poly1305_MACBYTES
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core32_Util::substr(
+            $ciphertext,
+            self::secretbox_xsalsa20poly1305_MACBYTES
+        );
+
+        /** @var int $clen */
+        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
+            64,
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+        $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
+            $mac,
+            $c,
+            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
+        );
+        if (!$verified) {
+            try {
+                ParagonIE_Sodium_Compat::memzero($subkey);
+            } catch (SodiumException $ex) {
+                $subkey = null;
+            }
+            throw new SodiumException('Invalid MAC');
+        }
+
+        /** @var string $m - Decrypted message */
+        $m = ParagonIE_Sodium_Core32_Util::xorStrings(
+            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
+            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
+        );
+        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            // We had more than 1 block, so let's continue to decrypt the rest.
+            $m .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
+                ParagonIE_Sodium_Core32_Util::substr(
+                    $c,
+                    self::secretbox_xsalsa20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+                1,
+                (string) $subkey
+            );
+        }
+        return $m;
+    }
+
+    /**
+     * XChaCha20-Poly1305 authenticated symmetric-key encryption.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $plaintext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
+    {
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
+            $key
+        );
+        $nonceLast = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+            $block0,
+            $nonceLast,
+            $subkey
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core32_Util::substr(
+            $block0,
+            self::secretbox_xchacha20poly1305_ZEROBYTES
+        );
+        if ($mlen > $mlen0) {
+            $c .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+                ParagonIE_Sodium_Core32_Util::substr(
+                    $plaintext,
+                    self::secretbox_xchacha20poly1305_ZEROBYTES
+                ),
+                $nonceLast,
+                $subkey,
+                ParagonIE_Sodium_Core32_Util::store64_le(1)
+            );
+        }
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
+            ParagonIE_Sodium_Core32_Util::substr(
+                $block0,
+                0,
+                self::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+
+        $state->update($c);
+
+        /** @var string $c - MAC || ciphertext */
+        $c = $state->finish() . $c;
+        unset($state);
+
+        return $c;
+    }
+
+    /**
+     * Decrypt a ciphertext generated via secretbox_xchacha20poly1305().
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $ciphertext
+     * @param string $nonce
+     * @param string $key
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
+    {
+        /** @var string $mac */
+        $mac = ParagonIE_Sodium_Core32_Util::substr(
+            $ciphertext,
+            0,
+            self::secretbox_xchacha20poly1305_MACBYTES
+        );
+
+        /** @var string $c */
+        $c = ParagonIE_Sodium_Core32_Util::substr(
+            $ciphertext,
+            self::secretbox_xchacha20poly1305_MACBYTES
+        );
+
+        /** @var int $clen */
+        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hchacha20($nonce, $key);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
+            64,
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+        $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
+            $mac,
+            $c,
+            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
+        );
+
+        if (!$verified) {
+            try {
+                ParagonIE_Sodium_Compat::memzero($subkey);
+            } catch (SodiumException $ex) {
+                $subkey = null;
+            }
+            throw new SodiumException('Invalid MAC');
+        }
+
+        /** @var string $m - Decrypted message */
+        $m = ParagonIE_Sodium_Core32_Util::xorStrings(
+            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
+            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
+        );
+
+        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
+            // We had more than 1 block, so let's continue to decrypt the rest.
+            $m .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
+                ParagonIE_Sodium_Core32_Util::substr(
+                    $c,
+                    self::secretbox_xchacha20poly1305_ZEROBYTES
+                ),
+                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+                (string) $subkey,
+                ParagonIE_Sodium_Core32_Util::store64_le(1)
+            );
+        }
+        return $m;
+    }
+
+    /**
+     * Detached Ed25519 signature.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_detached($message, $sk)
+    {
+        return ParagonIE_Sodium_Core32_Ed25519::sign_detached($message, $sk);
+    }
+
+    /**
+     * Attached Ed25519 signature. (Returns a signed message.)
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $message
+     * @param string $sk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign($message, $sk)
+    {
+        return ParagonIE_Sodium_Core32_Ed25519::sign($message, $sk);
+    }
+
+    /**
+     * Opens a signed message. If valid, returns the message.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $signedMessage
+     * @param string $pk
+     * @return string
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_open($signedMessage, $pk)
+    {
+        return ParagonIE_Sodium_Core32_Ed25519::sign_open($signedMessage, $pk);
+    }
+
+    /**
+     * Verify a detached signature of a given message and public key.
+     *
+     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
+     *
+     * @param string $signature
+     * @param string $message
+     * @param string $pk
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign_verify_detached($signature, $message, $pk)
+    {
+        return ParagonIE_Sodium_Core32_Ed25519::verify_detached($signature, $message, $pk);
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/File.php b/core/libraries/vendor/paragonie/sodium_compat/src/File.php
new file mode 100644
index 00000000..0f066533
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/File.php
@@ -0,0 +1,1515 @@
+<?php
+
+if (class_exists('ParagonIE_Sodium_File', false)) {
+    return;
+}
+/**
+ * Class ParagonIE_Sodium_File
+ */
+class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
+{
+    /* PHP's default buffer size is 8192 for fread()/fwrite(). */
+    const BUFFER_SIZE = 8192;
+
+    /**
+     * Box a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box(), but produces
+     * the same result.
+     *
+     * @param string $inputFile  Absolute path to a file on the filesystem
+     * @param string $outputFile Absolute path to a file on the filesystem
+     * @param string $nonce      Number to be used only once
+     * @param string $keyPair    ECDH secret key and ECDH public key concatenated
+     *
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box($inputFile, $outputFile, $nonce, $keyPair)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+
+        /* Input validation: */
+        if (!is_string($keyPair)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
+        }
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
+        }
+        if (self::strlen($keyPair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new SodiumException('Could not open output file for writing');
+        }
+
+        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $keyPair);
+        fclose($ifp);
+        fclose($ofp);
+        return $res;
+    }
+
+    /**
+     * Open a boxed file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box_open(), but produces
+     * the same result.
+     *
+     * Warning: Does not protect against TOCTOU attacks. You should
+     * just load the file into memory and use crypto_box_open() if
+     * you are worried about those.
+     *
+     * @param string $inputFile
+     * @param string $outputFile
+     * @param string $nonce
+     * @param string $keypair
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_open($inputFile, $outputFile, $nonce, $keypair)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($keypair)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
+        }
+        if (self::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new SodiumException('Could not open output file for writing');
+        }
+
+        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $keypair);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($nonce);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+        } catch (SodiumException $ex) {
+            unset($ephKeypair);
+        }
+        return $res;
+    }
+
+    /**
+     * Seal a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box_seal(), but produces
+     * the same result.
+     *
+     * @param string $inputFile  Absolute path to a file on the filesystem
+     * @param string $outputFile Absolute path to a file on the filesystem
+     * @param string $publicKey  ECDH public key
+     *
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seal($inputFile, $outputFile, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new SodiumException('Could not open output file for writing');
+        }
+
+        /** @var string $ephKeypair */
+        $ephKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair();
+
+        /** @var string $msgKeypair */
+        $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
+            ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
+            $publicKey
+        );
+
+        /** @var string $ephemeralPK */
+        $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
+
+        /** @var string $nonce */
+        $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+
+        /** @var int $firstWrite */
+        $firstWrite = fwrite(
+            $ofp,
+            $ephemeralPK,
+            ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES
+        );
+        if (!is_int($firstWrite)) {
+            fclose($ifp);
+            fclose($ofp);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+            throw new SodiumException('Could not write to output file');
+        }
+        if ($firstWrite !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+            fclose($ifp);
+            fclose($ofp);
+            throw new SodiumException('Error writing public key to output file');
+        }
+
+        $res = self::box_encrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($nonce);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+        } catch (SodiumException $ex) {
+            unset($ephKeypair);
+        }
+        return $res;
+    }
+
+    /**
+     * Open a sealed file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_box_seal_open(), but produces
+     * the same result.
+     *
+     * Warning: Does not protect against TOCTOU attacks. You should
+     * just load the file into memory and use crypto_box_seal_open() if
+     * you are worried about those.
+     *
+     * @param string $inputFile
+     * @param string $outputFile
+     * @param string $ecdhKeypair
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function box_seal_open($inputFile, $outputFile, $ecdhKeypair)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($ecdhKeypair)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
+        }
+
+        $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new SodiumException('Could not open output file for writing');
+        }
+
+        $ephemeralPK = fread($ifp, ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES);
+        if (!is_string($ephemeralPK)) {
+            throw new SodiumException('Could not read input file');
+        }
+        if (self::strlen($ephemeralPK) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
+            fclose($ifp);
+            fclose($ofp);
+            throw new SodiumException('Could not read public key from sealed file');
+        }
+
+        $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
+            $ephemeralPK . $publicKey,
+            '',
+            24
+        );
+        $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
+            ParagonIE_Sodium_Compat::crypto_box_secretkey($ecdhKeypair),
+            $ephemeralPK
+        );
+
+        $res = self::box_decrypt($ifp, $ofp, $size, $nonce, $msgKeypair);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($nonce);
+            ParagonIE_Sodium_Compat::memzero($ephKeypair);
+        } catch (SodiumException $ex) {
+            unset($ephKeypair);
+        }
+        return $res;
+    }
+
+    /**
+     * Calculate the BLAKE2b hash of a file.
+     *
+     * @param string      $filePath     Absolute path to a file on the filesystem
+     * @param string|null $key          BLAKE2b key
+     * @param int         $outputLength Length of hash output
+     *
+     * @return string                   BLAKE2b hash
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress FailedTypeResolution
+     */
+    public static function generichash($filePath, $key = '', $outputLength = 32)
+    {
+        /* Type checks: */
+        if (!is_string($filePath)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        }
+        if (!is_string($key)) {
+            if (is_null($key)) {
+                $key = '';
+            } else {
+                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
+            }
+        }
+        if (!is_int($outputLength)) {
+            if (!is_numeric($outputLength)) {
+                throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
+            }
+            $outputLength = (int) $outputLength;
+        }
+
+        /* Input validation: */
+        if (!empty($key)) {
+            if (self::strlen($key) < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
+                throw new TypeError('Argument 2 must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes');
+            }
+            if (self::strlen($key) > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
+                throw new TypeError('Argument 2 must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes');
+            }
+        }
+        if ($outputLength < ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN) {
+            throw new SodiumException('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MIN');
+        }
+        if ($outputLength > ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX) {
+            throw new SodiumException('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
+        }
+
+        /** @var int $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+        $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
+        while ($size > 0) {
+            $blockSize = $size > 64
+                ? 64
+                : $size;
+            $read = fread($fp, $blockSize);
+            if (!is_string($read)) {
+                throw new SodiumException('Could not read input file');
+            }
+            ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $read);
+            $size -= $blockSize;
+        }
+
+        fclose($fp);
+        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
+    }
+
+    /**
+     * Encrypt a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_secretbox(), but produces
+     * the same result.
+     *
+     * @param string $inputFile  Absolute path to a file on the filesystem
+     * @param string $outputFile Absolute path to a file on the filesystem
+     * @param string $nonce      Number to be used only once
+     * @param string $key        Encryption key
+     *
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox($inputFile, $outputFile, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new SodiumException('Could not open output file for writing');
+        }
+
+        $res = self::secretbox_encrypt($ifp, $ofp, $size, $nonce, $key);
+        fclose($ifp);
+        fclose($ofp);
+        return $res;
+    }
+    /**
+     * Seal a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_secretbox_open(), but produces
+     * the same result.
+     *
+     * Warning: Does not protect against TOCTOU attacks. You should
+     * just load the file into memory and use crypto_secretbox_open() if
+     * you are worried about those.
+     *
+     * @param string $inputFile
+     * @param string $outputFile
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function secretbox_open($inputFile, $outputFile, $nonce, $key)
+    {
+        /* Type checks: */
+        if (!is_string($inputFile)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
+        }
+        if (!is_string($outputFile)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
+        }
+        if (!is_string($nonce)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
+        }
+        if (!is_string($key)) {
+            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
+        }
+        if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
+            throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
+        }
+
+        /** @var int $size */
+        $size = filesize($inputFile);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $ifp */
+        $ifp = fopen($inputFile, 'rb');
+        if (!is_resource($ifp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var resource $ofp */
+        $ofp = fopen($outputFile, 'wb');
+        if (!is_resource($ofp)) {
+            fclose($ifp);
+            throw new SodiumException('Could not open output file for writing');
+        }
+
+        $res = self::secretbox_decrypt($ifp, $ofp, $size, $nonce, $key);
+        fclose($ifp);
+        fclose($ofp);
+        try {
+            ParagonIE_Sodium_Compat::memzero($key);
+        } catch (SodiumException $ex) {
+            unset($key);
+        }
+        return $res;
+    }
+
+    /**
+     * Sign a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_sign_detached(), but produces
+     * the same result.
+     *
+     * @param string $filePath  Absolute path to a file on the filesystem
+     * @param string $secretKey Secret signing key
+     *
+     * @return string           Ed25519 signature
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    public static function sign($filePath, $secretKey)
+    {
+        /* Type checks: */
+        if (!is_string($filePath)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
+        }
+        if (!is_string($secretKey)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
+        }
+        if (PHP_INT_SIZE === 4) {
+            return self::sign_core32($filePath, $secretKey);
+        }
+
+        /** @var int $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var string $az */
+        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
+
+        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($az, 32, 32));
+        /** @var resource $hs */
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+
+        /** @var string $nonceHash */
+        $nonceHash = hash_final($hs, true);
+
+        /** @var string $pk */
+        $pk = self::substr($secretKey, 32, 32);
+
+        /** @var string $nonce */
+        $nonce = ParagonIE_Sodium_Core_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+
+        /** @var string $sig */
+        $sig = ParagonIE_Sodium_Core_Ed25519::ge_p3_tobytes(
+            ParagonIE_Sodium_Core_Ed25519::ge_scalarmult_base($nonce)
+        );
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
+        /** @var resource $hs */
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+
+        /** @var string $hramHash */
+        $hramHash = hash_final($hs, true);
+
+        /** @var string $hram */
+        $hram = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hramHash);
+
+        /** @var string $sigAfter */
+        $sigAfter = ParagonIE_Sodium_Core_Ed25519::sc_muladd($hram, $az, $nonce);
+
+        /** @var string $sig */
+        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+        try {
+            ParagonIE_Sodium_Compat::memzero($az);
+        } catch (SodiumException $ex) {
+            $az = null;
+        }
+        fclose($fp);
+        return $sig;
+    }
+
+    /**
+     * Verify a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_sign_verify_detached(), but
+     * produces the same result.
+     *
+     * @param string $sig       Ed25519 signature
+     * @param string $filePath  Absolute path to a file on the filesystem
+     * @param string $publicKey Signing public key
+     *
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     * @throws Exception
+     */
+    public static function verify($sig, $filePath, $publicKey)
+    {
+        /* Type checks: */
+        if (!is_string($sig)) {
+            throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
+        }
+        if (!is_string($filePath)) {
+            throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
+        }
+        if (!is_string($publicKey)) {
+            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
+        }
+
+        /* Input validation: */
+        if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
+            throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
+        }
+        if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new TypeError('Argument 3 must be CRYPTO_SIGN_PUBLICKEYBYTES bytes');
+        }
+        if (self::strlen($sig) < 64) {
+            throw new SodiumException('Signature is too short');
+        }
+
+        if (PHP_INT_SIZE === 4) {
+            return self::verify_core32($sig, $filePath, $publicKey);
+        }
+
+        /* Security checks */
+        if (ParagonIE_Sodium_Core_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
+            throw new SodiumException('S < L - Invalid signature');
+        }
+        if (ParagonIE_Sodium_Core_Ed25519::small_order($sig)) {
+            throw new SodiumException('Signature is on too small of an order');
+        }
+        if ((self::chrToInt($sig[63]) & 224) !== 0) {
+            throw new SodiumException('Invalid signature');
+        }
+        $d = 0;
+        for ($i = 0; $i < 32; ++$i) {
+            $d |= self::chrToInt($publicKey[$i]);
+        }
+        if ($d === 0) {
+            throw new SodiumException('All zero public key');
+        }
+
+        /** @var int $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+
+        /** @var resource $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+
+        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        $orig = ParagonIE_Sodium_Compat::$fastMult;
+
+        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+        ParagonIE_Sodium_Compat::$fastMult = true;
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
+        $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($publicKey, 0, 32));
+        /** @var resource $hs */
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+        /** @var string $hDigest */
+        $hDigest = hash_final($hs, true);
+
+        /** @var string $h */
+        $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
+        $R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
+            $h,
+            $A,
+            self::substr($sig, 32)
+        );
+
+        /** @var string $rcheck */
+        $rcheck = ParagonIE_Sodium_Core_Ed25519::ge_tobytes($R);
+
+        // Close the file handle
+        fclose($fp);
+
+        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+        ParagonIE_Sodium_Compat::$fastMult = $orig;
+        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+    }
+
+    /**
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int      $mlen
+     * @param string   $nonce
+     * @param string   $boxKeypair
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    {
+        return self::secretbox_encrypt(
+            $ifp,
+            $ofp,
+            $mlen,
+            $nonce,
+            ParagonIE_Sodium_Crypto::box_beforenm(
+                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
+                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+            )
+        );
+    }
+
+
+    /**
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int      $mlen
+     * @param string   $nonce
+     * @param string   $boxKeypair
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
+    {
+        return self::secretbox_decrypt(
+            $ifp,
+            $ofp,
+            $mlen,
+            $nonce,
+            ParagonIE_Sodium_Crypto::box_beforenm(
+                ParagonIE_Sodium_Crypto::box_secretkey($boxKeypair),
+                ParagonIE_Sodium_Crypto::box_publickey($boxKeypair)
+            )
+        );
+    }
+
+    /**
+     * Encrypt a file
+     *
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int $mlen
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
+    {
+        if (PHP_INT_SIZE === 4) {
+            return self::secretbox_encrypt_core32($ifp, $ofp, $mlen, $nonce, $key);
+        }
+
+        $plaintext = fread($ifp, 32);
+        if (!is_string($plaintext)) {
+            throw new SodiumException('Could not read input file');
+        }
+        $first32 = ftell($ifp);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $realNonce */
+        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20_xor(
+            $block0,
+            $realNonce,
+            $subkey
+        );
+
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(
+            ParagonIE_Sodium_Core_Util::substr(
+                $block0,
+                0,
+                ParagonIE_Sodium_Crypto::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+
+        // Pre-write 16 blank bytes for the Poly1305 tag
+        $start = ftell($ofp);
+        fwrite($ofp, str_repeat("\x00", 16));
+
+        /** @var string $c */
+        $cBlock = ParagonIE_Sodium_Core_Util::substr(
+            $block0,
+            ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
+        );
+        $state->update($cBlock);
+        fwrite($ofp, $cBlock);
+        $mlen -= 32;
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        /*
+         * Set the cursor to the end of the first half-block. All future bytes will
+         * generated from salsa20_xor_ic, starting from 1 (second block).
+         */
+        fseek($ifp, $first32, SEEK_SET);
+
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $plaintext = fread($ifp, $blockSize);
+            if (!is_string($plaintext)) {
+                throw new SodiumException('Could not read input file');
+            }
+            $cBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                $plaintext,
+                $realNonce,
+                $iter,
+                $subkey
+            );
+            fwrite($ofp, $cBlock, $blockSize);
+            $state->update($cBlock);
+
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+        $end = ftell($ofp);
+
+        /*
+         * Write the Poly1305 authentication tag that provides integrity
+         * over the ciphertext (encrypt-then-MAC)
+         */
+        fseek($ofp, $start, SEEK_SET);
+        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
+        fseek($ofp, $end, SEEK_SET);
+        unset($state);
+
+        return true;
+    }
+
+    /**
+     * Decrypt a file
+     *
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int $mlen
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
+    {
+        if (PHP_INT_SIZE === 4) {
+            return self::secretbox_decrypt_core32($ifp, $ofp, $mlen, $nonce, $key);
+        }
+        $tag = fread($ifp, 16);
+        if (!is_string($tag)) {
+            throw new SodiumException('Could not read input file');
+        }
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $realNonce */
+        $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
+            64,
+            ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+
+        /* Verify the Poly1305 MAC -before- attempting to decrypt! */
+        $state = new ParagonIE_Sodium_Core_Poly1305_State(self::substr($block0, 0, 32));
+        if (!self::onetimeauth_verify($state, $ifp, $tag, $mlen)) {
+            throw new SodiumException('Invalid MAC');
+        }
+
+        /*
+         * Set the cursor to the end of the first half-block. All future bytes will
+         * generated from salsa20_xor_ic, starting from 1 (second block).
+         */
+        $first32 = fread($ifp, 32);
+        if (!is_string($first32)) {
+            throw new SodiumException('Could not read input file');
+        }
+        $first32len = self::strlen($first32);
+        fwrite(
+            $ofp,
+            self::xorStrings(
+                self::substr($block0, 32, $first32len),
+                self::substr($first32, 0, $first32len)
+            )
+        );
+        $mlen -= 32;
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        /* Decrypts ciphertext, writes to output file. */
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $ciphertext = fread($ifp, $blockSize);
+            if (!is_string($ciphertext)) {
+                throw new SodiumException('Could not read input file');
+            }
+            $pBlock = ParagonIE_Sodium_Core_Salsa20::salsa20_xor_ic(
+                $ciphertext,
+                $realNonce,
+                $iter,
+                $subkey
+            );
+            fwrite($ofp, $pBlock, $blockSize);
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        return true;
+    }
+
+    /**
+     * @param ParagonIE_Sodium_Core_Poly1305_State $state
+     * @param resource $ifp
+     * @param string $tag
+     * @param int $mlen
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function onetimeauth_verify(ParagonIE_Sodium_Core_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
+    {
+        /** @var int $pos */
+        $pos = ftell($ifp);
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $ciphertext = fread($ifp, $blockSize);
+            if (!is_string($ciphertext)) {
+                throw new SodiumException('Could not read input file');
+            }
+            $state->update($ciphertext);
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        $res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
+
+        fseek($ifp, $pos, SEEK_SET);
+        return $res;
+    }
+
+    /**
+     * Update a hash context with the contents of a file, without
+     * loading the entire file into memory.
+     *
+     * @param resource|object $hash
+     * @param resource $fp
+     * @param int $size
+     * @return mixed (resource on PHP < 7.2, object on PHP >= 7.2)
+     * @throws SodiumException
+     * @throws TypeError
+     * @psalm-suppress PossiblyInvalidArgument
+     *                 PHP 7.2 changes from a resource to an object,
+     *                 which causes Psalm to complain about an error.
+     */
+    public static function updateHashWithFile($hash, $fp, $size = 0)
+    {
+        /* Type checks: */
+        if (PHP_VERSION_ID < 70200) {
+            if (!is_resource($hash)) {
+                throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
+            }
+
+        } else {
+            if (!is_object($hash)) {
+                throw new TypeError('Argument 1 must be an object (PHP 7.2+), ' . gettype($hash) . ' given.');
+            }
+        }
+        if (!is_resource($fp)) {
+            throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
+        }
+        if (!is_int($size)) {
+            throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
+        }
+
+        /** @var int $originalPosition */
+        $originalPosition = ftell($fp);
+
+        // Move file pointer to beginning of file
+        fseek($fp, 0, SEEK_SET);
+        for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
+            /** @var string|bool $message */
+            $message = fread(
+                $fp,
+                ($size - $i) > self::BUFFER_SIZE
+                    ? $size - $i
+                    : self::BUFFER_SIZE
+            );
+            if (!is_string($message)) {
+                throw new SodiumException('Unexpected error reading from file.');
+            }
+            /** @var string $message */
+            /** @psalm-suppress InvalidArgument */
+            hash_update($hash, $message);
+        }
+        // Reset file pointer's position
+        fseek($fp, $originalPosition, SEEK_SET);
+        return $hash;
+    }
+
+    /**
+     * Sign a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_sign_detached(), but produces
+     * the same result. (32-bit)
+     *
+     * @param string $filePath  Absolute path to a file on the filesystem
+     * @param string $secretKey Secret signing key
+     *
+     * @return string           Ed25519 signature
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    private static function sign_core32($filePath, $secretKey)
+    {
+        /** @var int|bool $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+        /** @var int $size */
+
+        /** @var resource|bool $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+        /** @var resource $fp */
+
+        /** @var string $az */
+        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
+
+        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
+        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($az, 32, 32));
+        /** @var resource $hs */
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+
+        /** @var string $nonceHash */
+        $nonceHash = hash_final($hs, true);
+
+        /** @var string $pk */
+        $pk = self::substr($secretKey, 32, 32);
+
+        /** @var string $nonce */
+        $nonce = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
+
+        /** @var string $sig */
+        $sig = ParagonIE_Sodium_Core32_Ed25519::ge_p3_tobytes(
+            ParagonIE_Sodium_Core32_Ed25519::ge_scalarmult_base($nonce)
+        );
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
+        /** @var resource $hs */
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+
+        /** @var string $hramHash */
+        $hramHash = hash_final($hs, true);
+
+        /** @var string $hram */
+        $hram = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hramHash);
+
+        /** @var string $sigAfter */
+        $sigAfter = ParagonIE_Sodium_Core32_Ed25519::sc_muladd($hram, $az, $nonce);
+
+        /** @var string $sig */
+        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
+
+        try {
+            ParagonIE_Sodium_Compat::memzero($az);
+        } catch (SodiumException $ex) {
+            $az = null;
+        }
+        fclose($fp);
+        return $sig;
+    }
+
+    /**
+     *
+     * Verify a file (rather than a string). Uses less memory than
+     * ParagonIE_Sodium_Compat::crypto_sign_verify_detached(), but
+     * produces the same result. (32-bit)
+     *
+     * @param string $sig       Ed25519 signature
+     * @param string $filePath  Absolute path to a file on the filesystem
+     * @param string $publicKey Signing public key
+     *
+     * @return bool
+     * @throws SodiumException
+     * @throws Exception
+     */
+    public static function verify_core32($sig, $filePath, $publicKey)
+    {
+        /* Security checks */
+        if (ParagonIE_Sodium_Core32_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
+            throw new SodiumException('S < L - Invalid signature');
+        }
+        if (ParagonIE_Sodium_Core32_Ed25519::small_order($sig)) {
+            throw new SodiumException('Signature is on too small of an order');
+        }
+        if ((self::chrToInt($sig[63]) & 224) !== 0) {
+            throw new SodiumException('Invalid signature');
+        }
+        $d = 0;
+        for ($i = 0; $i < 32; ++$i) {
+            $d |= self::chrToInt($publicKey[$i]);
+        }
+        if ($d === 0) {
+            throw new SodiumException('All zero public key');
+        }
+
+        /** @var int|bool $size */
+        $size = filesize($filePath);
+        if (!is_int($size)) {
+            throw new SodiumException('Could not obtain the file size');
+        }
+        /** @var int $size */
+
+        /** @var resource|bool $fp */
+        $fp = fopen($filePath, 'rb');
+        if (!is_resource($fp)) {
+            throw new SodiumException('Could not open input file for reading');
+        }
+        /** @var resource $fp */
+
+        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        $orig = ParagonIE_Sodium_Compat::$fastMult;
+
+        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
+        ParagonIE_Sodium_Compat::$fastMult = true;
+
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
+        $A = ParagonIE_Sodium_Core32_Ed25519::ge_frombytes_negate_vartime($publicKey);
+
+        /** @var resource $hs */
+        $hs = hash_init('sha512');
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($publicKey, 0, 32));
+        /** @var resource $hs */
+        $hs = self::updateHashWithFile($hs, $fp, $size);
+        /** @var string $hDigest */
+        $hDigest = hash_final($hs, true);
+
+        /** @var string $h */
+        $h = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
+
+        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
+        $R = ParagonIE_Sodium_Core32_Ed25519::ge_double_scalarmult_vartime(
+            $h,
+            $A,
+            self::substr($sig, 32)
+        );
+
+        /** @var string $rcheck */
+        $rcheck = ParagonIE_Sodium_Core32_Ed25519::ge_tobytes($R);
+
+        // Close the file handle
+        fclose($fp);
+
+        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
+        ParagonIE_Sodium_Compat::$fastMult = $orig;
+        return self::verify_32($rcheck, self::substr($sig, 0, 32));
+    }
+
+    /**
+     * Encrypt a file (32-bit)
+     *
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int $mlen
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function secretbox_encrypt_core32($ifp, $ofp, $mlen, $nonce, $key)
+    {
+        $plaintext = fread($ifp, 32);
+        if (!is_string($plaintext)) {
+            throw new SodiumException('Could not read input file');
+        }
+        $first32 = ftell($ifp);
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $realNonce */
+        $realNonce = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = str_repeat("\x00", 32);
+
+        /** @var int $mlen - Length of the plaintext message */
+        $mlen0 = $mlen;
+        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
+            $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
+        }
+        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
+            $block0,
+            $realNonce,
+            $subkey
+        );
+
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
+            ParagonIE_Sodium_Core32_Util::substr(
+                $block0,
+                0,
+                ParagonIE_Sodium_Crypto::onetimeauth_poly1305_KEYBYTES
+            )
+        );
+
+        // Pre-write 16 blank bytes for the Poly1305 tag
+        $start = ftell($ofp);
+        fwrite($ofp, str_repeat("\x00", 16));
+
+        /** @var string $c */
+        $cBlock = ParagonIE_Sodium_Core32_Util::substr(
+            $block0,
+            ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
+        );
+        $state->update($cBlock);
+        fwrite($ofp, $cBlock);
+        $mlen -= 32;
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        /*
+         * Set the cursor to the end of the first half-block. All future bytes will
+         * generated from salsa20_xor_ic, starting from 1 (second block).
+         */
+        fseek($ifp, $first32, SEEK_SET);
+
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $plaintext = fread($ifp, $blockSize);
+            if (!is_string($plaintext)) {
+                throw new SodiumException('Could not read input file');
+            }
+            $cBlock = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
+                $plaintext,
+                $realNonce,
+                $iter,
+                $subkey
+            );
+            fwrite($ofp, $cBlock, $blockSize);
+            $state->update($cBlock);
+
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        try {
+            ParagonIE_Sodium_Compat::memzero($block0);
+            ParagonIE_Sodium_Compat::memzero($subkey);
+        } catch (SodiumException $ex) {
+            $block0 = null;
+            $subkey = null;
+        }
+        $end = ftell($ofp);
+
+        /*
+         * Write the Poly1305 authentication tag that provides integrity
+         * over the ciphertext (encrypt-then-MAC)
+         */
+        fseek($ofp, $start, SEEK_SET);
+        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
+        fseek($ofp, $end, SEEK_SET);
+        unset($state);
+
+        return true;
+    }
+
+    /**
+     * Decrypt a file (32-bit)
+     *
+     * @param resource $ifp
+     * @param resource $ofp
+     * @param int $mlen
+     * @param string $nonce
+     * @param string $key
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function secretbox_decrypt_core32($ifp, $ofp, $mlen, $nonce, $key)
+    {
+        $tag = fread($ifp, 16);
+        if (!is_string($tag)) {
+            throw new SodiumException('Could not read input file');
+        }
+
+        /** @var string $subkey */
+        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
+
+        /** @var string $realNonce */
+        $realNonce = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
+
+        /** @var string $block0 */
+        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
+            64,
+            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
+            $subkey
+        );
+
+        /* Verify the Poly1305 MAC -before- attempting to decrypt! */
+        $state = new ParagonIE_Sodium_Core32_Poly1305_State(self::substr($block0, 0, 32));
+        if (!self::onetimeauth_verify_core32($state, $ifp, $tag, $mlen)) {
+            throw new SodiumException('Invalid MAC');
+        }
+
+        /*
+         * Set the cursor to the end of the first half-block. All future bytes will
+         * generated from salsa20_xor_ic, starting from 1 (second block).
+         */
+        $first32 = fread($ifp, 32);
+        if (!is_string($first32)) {
+            throw new SodiumException('Could not read input file');
+        }
+        $first32len = self::strlen($first32);
+        fwrite(
+            $ofp,
+            self::xorStrings(
+                self::substr($block0, 32, $first32len),
+                self::substr($first32, 0, $first32len)
+            )
+        );
+        $mlen -= 32;
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        /* Decrypts ciphertext, writes to output file. */
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $ciphertext = fread($ifp, $blockSize);
+            if (!is_string($ciphertext)) {
+                throw new SodiumException('Could not read input file');
+            }
+            $pBlock = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
+                $ciphertext,
+                $realNonce,
+                $iter,
+                $subkey
+            );
+            fwrite($ofp, $pBlock, $blockSize);
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        return true;
+    }
+
+    /**
+     * One-time message authentication for 32-bit systems
+     *
+     * @param ParagonIE_Sodium_Core32_Poly1305_State $state
+     * @param resource $ifp
+     * @param string $tag
+     * @param int $mlen
+     * @return bool
+     * @throws SodiumException
+     * @throws TypeError
+     */
+    protected static function onetimeauth_verify_core32(ParagonIE_Sodium_Core32_Poly1305_State $state, $ifp, $tag = '', $mlen = 0)
+    {
+        /** @var int $pos */
+        $pos = ftell($ifp);
+
+        /** @var int $iter */
+        $iter = 1;
+
+        /** @var int $incr */
+        $incr = self::BUFFER_SIZE >> 6;
+
+        while ($mlen > 0) {
+            $blockSize = $mlen > self::BUFFER_SIZE
+                ? self::BUFFER_SIZE
+                : $mlen;
+            $ciphertext = fread($ifp, $blockSize);
+            if (!is_string($ciphertext)) {
+                throw new SodiumException('Could not read input file');
+            }
+            $state->update($ciphertext);
+            $mlen -= $blockSize;
+            $iter += $incr;
+        }
+        $res = ParagonIE_Sodium_Core32_Util::verify_16($tag, $state->finish());
+
+        fseek($ifp, $pos, SEEK_SET);
+        return $res;
+    }
+}
diff --git a/core/libraries/vendor/paragonie/sodium_compat/src/SodiumException.php b/core/libraries/vendor/paragonie/sodium_compat/src/SodiumException.php
new file mode 100644
index 00000000..a3176d7d
--- /dev/null
+++ b/core/libraries/vendor/paragonie/sodium_compat/src/SodiumException.php
@@ -0,0 +1,11 @@
+<?php
+
+if (!class_exists('SodiumException', false)) {
+    /**
+     * Class SodiumException
+     */
+    class SodiumException extends Exception
+    {
+
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/LICENSE b/core/libraries/vendor/phpmailer/phpmailer/LICENSE
new file mode 100644
index 00000000..8e0763d1
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/core/libraries/vendor/phpmailer/phpmailer/PHPMailerAutoload.php b/core/libraries/vendor/phpmailer/phpmailer/PHPMailerAutoload.php
new file mode 100644
index 00000000..eaa2e303
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/PHPMailerAutoload.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * PHPMailer SPL autoloader.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer SPL autoloader.
+ * @param string $classname The name of the class to load
+ */
+function PHPMailerAutoload($classname)
+{
+    //Can't use __DIR__ as it's only in PHP 5.3+
+    $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
+    if (is_readable($filename)) {
+        require $filename;
+    }
+}
+
+if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
+    //SPL autoloading was introduced in PHP 5.1.2
+    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+        spl_autoload_register('PHPMailerAutoload', true, true);
+    } else {
+        spl_autoload_register('PHPMailerAutoload');
+    }
+} else {
+    /**
+     * Fall back to traditional autoload for old PHP versions
+     * @param string $classname The name of the class to load
+     */
+    function __autoload($classname)
+    {
+        PHPMailerAutoload($classname);
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/VERSION b/core/libraries/vendor/phpmailer/phpmailer/VERSION
new file mode 100644
index 00000000..f0fb1a22
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/VERSION
@@ -0,0 +1 @@
+5.2.26
diff --git a/core/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php b/core/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php
new file mode 100644
index 00000000..99f9092c
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/class.phpmailer.php
@@ -0,0 +1,4044 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * @package PHPMailer
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ */
+class PHPMailer
+{
+    /**
+     * The PHPMailer Version number.
+     * @var string
+     */
+    public $Version = '5.2.26';
+
+    /**
+     * Email priority.
+     * Options: null (default), 1 = High, 3 = Normal, 5 = low.
+     * When null, the header is not set at all.
+     * @var integer
+     */
+    public $Priority = null;
+
+    /**
+     * The character set of the message.
+     * @var string
+     */
+    public $CharSet = 'iso-8859-1';
+
+    /**
+     * The MIME Content-type of the message.
+     * @var string
+     */
+    public $ContentType = 'text/plain';
+
+    /**
+     * The message encoding.
+     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     * @var string
+     */
+    public $Encoding = '8bit';
+
+    /**
+     * Holds the most recent mailer error message.
+     * @var string
+     */
+    public $ErrorInfo = '';
+
+    /**
+     * The From email address for the message.
+     * @var string
+     */
+    public $From = 'root@localhost';
+
+    /**
+     * The From name of the message.
+     * @var string
+     */
+    public $FromName = 'Root User';
+
+    /**
+     * The Sender email (Return-Path) of the message.
+     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+     * @var string
+     */
+    public $Sender = '';
+
+    /**
+     * The Return-Path of the message.
+     * If empty, it will be set to either From or Sender.
+     * @var string
+     * @deprecated Email senders should never set a return-path header;
+     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
+     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
+     */
+    public $ReturnPath = '';
+
+    /**
+     * The Subject of the message.
+     * @var string
+     */
+    public $Subject = '';
+
+    /**
+     * An HTML or plain text message body.
+     * If HTML then call isHTML(true).
+     * @var string
+     */
+    public $Body = '';
+
+    /**
+     * The plain-text message body.
+     * This body can be read by mail clients that do not have HTML email
+     * capability such as mutt & Eudora.
+     * Clients that can read HTML will view the normal Body.
+     * @var string
+     */
+    public $AltBody = '';
+
+    /**
+     * An iCal message part body.
+     * Only supported in simple alt or alt_inline message types
+     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
+     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+     * @link http://kigkonsult.se/iCalcreator/
+     * @var string
+     */
+    public $Ical = '';
+
+    /**
+     * The complete compiled MIME message body.
+     * @access protected
+     * @var string
+     */
+    protected $MIMEBody = '';
+
+    /**
+     * The complete compiled MIME message headers.
+     * @var string
+     * @access protected
+     */
+    protected $MIMEHeader = '';
+
+    /**
+     * Extra headers that createHeader() doesn't fold in.
+     * @var string
+     * @access protected
+     */
+    protected $mailHeader = '';
+
+    /**
+     * Word-wrap the message body to this number of chars.
+     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+     * @var integer
+     */
+    public $WordWrap = 0;
+
+    /**
+     * Which method to use to send mail.
+     * Options: "mail", "sendmail", or "smtp".
+     * @var string
+     */
+    public $Mailer = 'mail';
+
+    /**
+     * The path to the sendmail program.
+     * @var string
+     */
+    public $Sendmail = '/usr/sbin/sendmail';
+
+    /**
+     * Whether mail() uses a fully sendmail-compatible MTA.
+     * One which supports sendmail's "-oi -f" options.
+     * @var boolean
+     */
+    public $UseSendmailOptions = true;
+
+    /**
+     * Path to PHPMailer plugins.
+     * Useful if the SMTP class is not in the PHP include path.
+     * @var string
+     * @deprecated Should not be needed now there is an autoloader.
+     */
+    public $PluginDir = '';
+
+    /**
+     * The email address that a reading confirmation should be sent to, also known as read receipt.
+     * @var string
+     */
+    public $ConfirmReadingTo = '';
+
+    /**
+     * The hostname to use in the Message-ID header and as default HELO string.
+     * If empty, PHPMailer attempts to find one with, in order,
+     * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
+     * 'localhost.localdomain'.
+     * @var string
+     */
+    public $Hostname = '';
+
+    /**
+     * An ID to be used in the Message-ID header.
+     * If empty, a unique id will be generated.
+     * You can set your own, but it must be in the format "<id@domain>",
+     * as defined in RFC5322 section 3.6.4 or it will be ignored.
+     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     * @var string
+     */
+    public $MessageID = '';
+
+    /**
+     * The message Date to be used in the Date header.
+     * If empty, the current date will be added.
+     * @var string
+     */
+    public $MessageDate = '';
+
+    /**
+     * SMTP hosts.
+     * Either a single hostname or multiple semicolon-delimited hostnames.
+     * You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * You can also specify encryption type, for example:
+     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+     * Hosts will be tried in order.
+     * @var string
+     */
+    public $Host = 'localhost';
+
+    /**
+     * The default SMTP server port.
+     * @var integer
+     * @TODO Why is this needed when the SMTP class takes care of it?
+     */
+    public $Port = 25;
+
+    /**
+     * The SMTP HELO of the message.
+     * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
+     * one with the same method described above for $Hostname.
+     * @var string
+     * @see PHPMailer::$Hostname
+     */
+    public $Helo = '';
+
+    /**
+     * What kind of encryption to use on the SMTP connection.
+     * Options: '', 'ssl' or 'tls'
+     * @var string
+     */
+    public $SMTPSecure = '';
+
+    /**
+     * Whether to enable TLS encryption automatically if a server supports it,
+     * even if `SMTPSecure` is not set to 'tls'.
+     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+     * @var boolean
+     */
+    public $SMTPAutoTLS = true;
+
+    /**
+     * Whether to use SMTP authentication.
+     * Uses the Username and Password properties.
+     * @var boolean
+     * @see PHPMailer::$Username
+     * @see PHPMailer::$Password
+     */
+    public $SMTPAuth = false;
+
+    /**
+     * Options array passed to stream_context_create when connecting via SMTP.
+     * @var array
+     */
+    public $SMTPOptions = array();
+
+    /**
+     * SMTP username.
+     * @var string
+     */
+    public $Username = '';
+
+    /**
+     * SMTP password.
+     * @var string
+     */
+    public $Password = '';
+
+    /**
+     * SMTP auth type.
+     * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that order if not specified
+     * @var string
+     */
+    public $AuthType = '';
+
+    /**
+     * SMTP realm.
+     * Used for NTLM auth
+     * @var string
+     */
+    public $Realm = '';
+
+    /**
+     * SMTP workstation.
+     * Used for NTLM auth
+     * @var string
+     */
+    public $Workstation = '';
+
+    /**
+     * The SMTP server timeout in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @var integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * SMTP class debug output mode.
+     * Debug output level.
+     * Options:
+     * * `0` No output
+     * * `1` Commands
+     * * `2` Data and commands
+     * * `3` As 2 plus connection status
+     * * `4` Low-level data output
+     * @var integer
+     * @see SMTP::$do_debug
+     */
+    public $SMTPDebug = 0;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @var string|callable
+     * @see SMTP::$Debugoutput
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to keep SMTP connection open after each message.
+     * If this is set to true then to close the connection
+     * requires an explicit call to smtpClose().
+     * @var boolean
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Whether to split multiple to addresses into multiple messages
+     * or send them all in one message.
+     * Only supported in `mail` and `sendmail` transports, not in SMTP.
+     * @var boolean
+     */
+    public $SingleTo = false;
+
+    /**
+     * Storage for addresses when SingleTo is enabled.
+     * @var array
+     * @TODO This should really not be public
+     */
+    public $SingleToArray = array();
+
+    /**
+     * Whether to generate VERP addresses on send.
+     * Only applicable when sending via SMTP.
+     * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
+     * @var boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * Whether to allow sending messages with an empty body.
+     * @var boolean
+     */
+    public $AllowEmpty = false;
+
+    /**
+     * The default line ending.
+     * @note The default remains "\n". We force CRLF where we know
+     *        it must be used via self::CRLF.
+     * @var string
+     */
+    public $LE = "\n";
+
+    /**
+     * DKIM selector.
+     * @var string
+     */
+    public $DKIM_selector = '';
+
+    /**
+     * DKIM Identity.
+     * Usually the email address used as the source of the email.
+     * @var string
+     */
+    public $DKIM_identity = '';
+
+    /**
+     * DKIM passphrase.
+     * Used if your key is encrypted.
+     * @var string
+     */
+    public $DKIM_passphrase = '';
+
+    /**
+     * DKIM signing domain name.
+     * @example 'example.com'
+     * @var string
+     */
+    public $DKIM_domain = '';
+
+    /**
+     * DKIM private key file path.
+     * @var string
+     */
+    public $DKIM_private = '';
+
+    /**
+     * DKIM private key string.
+     * If set, takes precedence over `$DKIM_private`.
+     * @var string
+     */
+    public $DKIM_private_string = '';
+
+    /**
+     * Callback Action function name.
+     *
+     * The function that handles the result of the send email action.
+     * It is called out by send() for each email sent.
+     *
+     * Value can be any php callable: http://www.php.net/is_callable
+     *
+     * Parameters:
+     *   boolean $result        result of the send action
+     *   array   $to            email addresses of the recipients
+     *   array   $cc            cc email addresses
+     *   array   $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     *   string  $from          email address of sender
+     * @var string
+     */
+    public $action_function = '';
+
+    /**
+     * What to put in the X-Mailer header.
+     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
+     * @var string
+     */
+    public $XMailer = '';
+
+    /**
+     * Which validator to use by default when validating email addresses.
+     * May be a callable to inject your own validator, but there are several built-in validators.
+     * @see PHPMailer::validateAddress()
+     * @var string|callable
+     * @static
+     */
+    public static $validator = 'auto';
+
+    /**
+     * An instance of the SMTP sender class.
+     * @var SMTP
+     * @access protected
+     */
+    protected $smtp = null;
+
+    /**
+     * The array of 'to' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $to = array();
+
+    /**
+     * The array of 'cc' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $cc = array();
+
+    /**
+     * The array of 'bcc' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $bcc = array();
+
+    /**
+     * The array of reply-to names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $ReplyTo = array();
+
+    /**
+     * An array of all kinds of addresses.
+     * Includes all of $to, $cc, $bcc
+     * @var array
+     * @access protected
+     * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+     */
+    protected $all_recipients = array();
+
+    /**
+     * An array of names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $all_recipients
+     * and one of $to, $cc, or $bcc.
+     * This array is used only for addresses with IDN.
+     * @var array
+     * @access protected
+     * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+     * @see PHPMailer::$all_recipients
+     */
+    protected $RecipientsQueue = array();
+
+    /**
+     * An array of reply-to names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $ReplyTo.
+     * This array is used only for addresses with IDN.
+     * @var array
+     * @access protected
+     * @see PHPMailer::$ReplyTo
+     */
+    protected $ReplyToQueue = array();
+
+    /**
+     * The array of attachments.
+     * @var array
+     * @access protected
+     */
+    protected $attachment = array();
+
+    /**
+     * The array of custom headers.
+     * @var array
+     * @access protected
+     */
+    protected $CustomHeader = array();
+
+    /**
+     * The most recent Message-ID (including angular brackets).
+     * @var string
+     * @access protected
+     */
+    protected $lastMessageID = '';
+
+    /**
+     * The message's MIME type.
+     * @var string
+     * @access protected
+     */
+    protected $message_type = '';
+
+    /**
+     * The array of MIME boundary strings.
+     * @var array
+     * @access protected
+     */
+    protected $boundary = array();
+
+    /**
+     * The array of available languages.
+     * @var array
+     * @access protected
+     */
+    protected $language = array();
+
+    /**
+     * The number of errors encountered.
+     * @var integer
+     * @access protected
+     */
+    protected $error_count = 0;
+
+    /**
+     * The S/MIME certificate file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_cert_file = '';
+
+    /**
+     * The S/MIME key file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_key_file = '';
+
+    /**
+     * The optional S/MIME extra certificates ("CA Chain") file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_extracerts_file = '';
+
+    /**
+     * The S/MIME password for the key.
+     * Used only if the key is encrypted.
+     * @var string
+     * @access protected
+     */
+    protected $sign_key_pass = '';
+
+    /**
+     * Whether to throw exceptions for errors.
+     * @var boolean
+     * @access protected
+     */
+    protected $exceptions = false;
+
+    /**
+     * Unique ID used for message ID and boundaries.
+     * @var string
+     * @access protected
+     */
+    protected $uniqueid = '';
+
+    /**
+     * Error severity: message only, continue processing.
+     */
+    const STOP_MESSAGE = 0;
+
+    /**
+     * Error severity: message, likely ok to continue processing.
+     */
+    const STOP_CONTINUE = 1;
+
+    /**
+     * Error severity: message, plus full stop, critical error reached.
+     */
+    const STOP_CRITICAL = 2;
+
+    /**
+     * SMTP RFC standard line ending.
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @var integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Constructor.
+     * @param boolean $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = null)
+    {
+        if ($exceptions !== null) {
+            $this->exceptions = (boolean)$exceptions;
+        }
+        //Pick an appropriate debug output format automatically
+        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        //Close any open SMTP connection nicely
+        $this->smtpClose();
+    }
+
+    /**
+     * Call mail() in a safe_mode-aware fashion.
+     * Also, unless sendmail_path points to sendmail (or something that
+     * claims to be sendmail), don't pass params (not a perfect fix,
+     * but it will do)
+     * @param string $to To
+     * @param string $subject Subject
+     * @param string $body Message Body
+     * @param string $header Additional Header(s)
+     * @param string $params Params
+     * @access private
+     * @return boolean
+     */
+    private function mailPassthru($to, $subject, $body, $header, $params)
+    {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
+        } else {
+            $subject = $this->encodeHeader($this->secureHeader($subject));
+        }
+
+        //Can't use additional_parameters in safe_mode, calling mail() with null params breaks
+        //@link http://php.net/manual/en/function.mail.php
+        if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
+            $result = @mail($to, $subject, $body, $header);
+        } else {
+            $result = @mail($to, $subject, $body, $header, $params);
+        }
+        return $result;
+    }
+    /**
+     * Output debugging info via user-defined method.
+     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     * @see PHPMailer::$Debugoutput
+     * @see PHPMailer::$SMTPDebug
+     * @param string $str
+     */
+    protected function edebug($str)
+    {
+        if ($this->SMTPDebug <= 0) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                )
+                . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/\r\n?/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
+        }
+    }
+
+    /**
+     * Sets message type to HTML or plain.
+     * @param boolean $isHtml True for HTML mode.
+     * @return void
+     */
+    public function isHTML($isHtml = true)
+    {
+        if ($isHtml) {
+            $this->ContentType = 'text/html';
+        } else {
+            $this->ContentType = 'text/plain';
+        }
+    }
+
+    /**
+     * Send messages using SMTP.
+     * @return void
+     */
+    public function isSMTP()
+    {
+        $this->Mailer = 'smtp';
+    }
+
+    /**
+     * Send messages using PHP's mail() function.
+     * @return void
+     */
+    public function isMail()
+    {
+        $this->Mailer = 'mail';
+    }
+
+    /**
+     * Send messages using $Sendmail.
+     * @return void
+     */
+    public function isSendmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'sendmail')) {
+            $this->Sendmail = '/usr/sbin/sendmail';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'sendmail';
+    }
+
+    /**
+     * Send messages using qmail.
+     * @return void
+     */
+    public function isQmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'qmail')) {
+            $this->Sendmail = '/var/qmail/bin/qmail-inject';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'qmail';
+    }
+
+    /**
+     * Add a "To" address.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addAddress($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('to', $address, $name);
+    }
+
+    /**
+     * Add a "CC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('cc', $address, $name);
+    }
+
+    /**
+     * Add a "BCC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addBCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('bcc', $address, $name);
+    }
+
+    /**
+     * Add a "Reply-To" address.
+     * @param string $address The email address to reply to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addReplyTo($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer
+     * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still
+     * be modified after calling this function), addition of such addresses is delayed until send().
+     * Addresses that have been added already return false, but do not throw exceptions.
+     * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     * @throws phpmailerException
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addOrEnqueueAnAddress($kind, $address, $name)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        if (($pos = strrpos($address, '@')) === false) {
+            // At-sign is misssing.
+            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        $params = array($kind, $address, $name);
+        // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) {
+            if ($kind != 'Reply-To') {
+                if (!array_key_exists($address, $this->RecipientsQueue)) {
+                    $this->RecipientsQueue[$address] = $params;
+                    return true;
+                }
+            } else {
+                if (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
+                    return true;
+                }
+            }
+            return false;
+        }
+        // Immediately add standard addresses without IDN.
+        return call_user_func_array(array($this, 'addAnAddress'), $params);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array.
+     * Addresses that have been added already return false, but do not throw exceptions.
+     * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     * @throws phpmailerException
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addAnAddress($kind, $address, $name = '')
+    {
+        if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) {
+            $error_message = $this->lang('Invalid recipient kind: ') . $kind;
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        if (!$this->validateAddress($address)) {
+            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        if ($kind != 'Reply-To') {
+            if (!array_key_exists(strtolower($address), $this->all_recipients)) {
+                array_push($this->$kind, array($address, $name));
+                $this->all_recipients[strtolower($address)] = true;
+                return true;
+            }
+        } else {
+            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+                $this->ReplyTo[strtolower($address)] = array($address, $name);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
+     * of the form "display name <address>" into an array of name/address pairs.
+     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
+     * Note that quotes in the name part are removed.
+     * @param string $addrstr The address list string
+     * @param bool $useimap Whether to use the IMAP extension to parse the list
+     * @return array
+     * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     */
+    public function parseAddresses($addrstr, $useimap = true)
+    {
+        $addresses = array();
+        if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
+            //Use this built-in parser if it's available
+            $list = imap_rfc822_parse_adrlist($addrstr, '');
+            foreach ($list as $address) {
+                if ($address->host != '.SYNTAX-ERROR.') {
+                    if ($this->validateAddress($address->mailbox . '@' . $address->host)) {
+                        $addresses[] = array(
+                            'name' => (property_exists($address, 'personal') ? $address->personal : ''),
+                            'address' => $address->mailbox . '@' . $address->host
+                        );
+                    }
+                }
+            }
+        } else {
+            //Use this simpler parser
+            $list = explode(',', $addrstr);
+            foreach ($list as $address) {
+                $address = trim($address);
+                //Is there a separate name part?
+                if (strpos($address, '<') === false) {
+                    //No separate name, just use the whole thing
+                    if ($this->validateAddress($address)) {
+                        $addresses[] = array(
+                            'name' => '',
+                            'address' => $address
+                        );
+                    }
+                } else {
+                    list($name, $email) = explode('<', $address);
+                    $email = trim(str_replace('>', '', $email));
+                    if ($this->validateAddress($email)) {
+                        $addresses[] = array(
+                            'name' => trim(str_replace(array('"', "'"), '', $name)),
+                            'address' => $email
+                        );
+                    }
+                }
+            }
+        }
+        return $addresses;
+    }
+
+    /**
+     * Set the From and FromName properties.
+     * @param string $address
+     * @param string $name
+     * @param boolean $auto Whether to also set the Sender address, defaults to true
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function setFrom($address, $name = '', $auto = true)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        // Don't validate now addresses with IDN. Will be done in send().
+        if (($pos = strrpos($address, '@')) === false or
+            (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and
+            !$this->validateAddress($address)) {
+            $error_message = $this->lang('invalid_address') . " (setFrom) $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        $this->From = $address;
+        $this->FromName = $name;
+        if ($auto) {
+            if (empty($this->Sender)) {
+                $this->Sender = $address;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Return the Message-ID header of the last email.
+     * Technically this is the value from the last time the headers were created,
+     * but it's also the message ID of the last sent message except in
+     * pathological cases.
+     * @return string
+     */
+    public function getLastMessageID()
+    {
+        return $this->lastMessageID;
+    }
+
+    /**
+     * Check that a string looks like an email address.
+     * @param string $address The email address to check
+     * @param string|callable $patternselect A selector for the validation pattern to use :
+     * * `auto` Pick best pattern automatically;
+     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
+     * * `pcre` Use old PCRE implementation;
+     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
+     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `noregex` Don't use a regex: super fast, really dumb.
+     * Alternatively you may pass in a callable to inject your own validator, for example:
+     * PHPMailer::validateAddress('user@example.com', function($address) {
+     *     return (strpos($address, '@') !== false);
+     * });
+     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
+     * @return boolean
+     * @static
+     * @access public
+     */
+    public static function validateAddress($address, $patternselect = null)
+    {
+        if (is_null($patternselect)) {
+            $patternselect = self::$validator;
+        }
+        if (is_callable($patternselect)) {
+            return call_user_func($patternselect, $address);
+        }
+        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
+        if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
+            return false;
+        }
+        if (!$patternselect or $patternselect == 'auto') {
+            //Check this constant first so it works when extension_loaded() is disabled by safe mode
+            //Constant was added in PHP 5.2.4
+            if (defined('PCRE_VERSION')) {
+                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
+                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
+                    $patternselect = 'pcre8';
+                } else {
+                    $patternselect = 'pcre';
+                }
+            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
+                //Fall back to older PCRE
+                $patternselect = 'pcre';
+            } else {
+                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
+                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+                    $patternselect = 'php';
+                } else {
+                    $patternselect = 'noregex';
+                }
+            }
+        }
+        switch ($patternselect) {
+            case 'pcre8':
+                /**
+                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
+                 * @link http://squiloople.com/2009/12/20/email-address-validation/
+                 * @copyright 2009-2010 Michael Rushton
+                 * Feel free to use and redistribute this code. But please keep this copyright notice.
+                 */
+                return (boolean)preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+                    $address
+                );
+            case 'pcre':
+                //An older regex that doesn't need a recent PCRE
+                return (boolean)preg_match(
+                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
+                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
+                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
+                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
+                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
+                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
+                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
+                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
+                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
+                    $address
+                );
+            case 'html5':
+                /**
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 */
+                return (boolean)preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
+                    $address
+                );
+            case 'noregex':
+                //No PCRE! Do something _very_ approximate!
+                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
+                return (strlen($address) >= 3
+                    and strpos($address, '@') >= 1
+                    and strpos($address, '@') != strlen($address) - 1);
+            case 'php':
+            default:
+                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+        }
+    }
+
+    /**
+     * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the
+     * "intl" and "mbstring" PHP extensions.
+     * @return bool "true" if required functions for IDN support are present
+     */
+    public function idnSupported()
+    {
+        // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2.
+        return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
+    }
+
+    /**
+     * Converts IDN in given email address to its ASCII form, also known as punycode, if possible.
+     * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet.
+     * This function silently returns unmodified address if:
+     * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form)
+     * - Conversion to punycode is impossible (e.g. required PHP functions are not available)
+     *   or fails for any reason (e.g. domain has characters not allowed in an IDN)
+     * @see PHPMailer::$CharSet
+     * @param string $address The email address to convert
+     * @return string The encoded address in ASCII form
+     */
+    public function punyencodeAddress($address)
+    {
+        // Verify we have required functions, CharSet, and at-sign.
+        if ($this->idnSupported() and
+            !empty($this->CharSet) and
+            ($pos = strrpos($address, '@')) !== false) {
+            $domain = substr($address, ++$pos);
+            // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
+            if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
+                $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
+                if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ?
+                    idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) :
+                    idn_to_ascii($domain)) !== false) {
+                    return substr($address, 0, $pos) . $punycode;
+                }
+            }
+        }
+        return $address;
+    }
+
+    /**
+     * Create a message and send it.
+     * Uses the sending method specified by $Mailer.
+     * @throws phpmailerException
+     * @return boolean false on error - See the ErrorInfo property for details of the error.
+     */
+    public function send()
+    {
+        try {
+            if (!$this->preSend()) {
+                return false;
+            }
+            return $this->postSend();
+        } catch (phpmailerException $exc) {
+            $this->mailHeader = '';
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Prepare a message for sending.
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function preSend()
+    {
+        try {
+            $this->error_count = 0; // Reset errors
+            $this->mailHeader = '';
+
+            // Dequeue recipient and Reply-To addresses with IDN
+            foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
+                $params[1] = $this->punyencodeAddress($params[1]);
+                call_user_func_array(array($this, 'addAnAddress'), $params);
+            }
+            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
+            }
+
+            // Validate From, Sender, and ConfirmReadingTo addresses
+            foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) {
+                $this->$address_kind = trim($this->$address_kind);
+                if (empty($this->$address_kind)) {
+                    continue;
+                }
+                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
+                if (!$this->validateAddress($this->$address_kind)) {
+                    $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind;
+                    $this->setError($error_message);
+                    $this->edebug($error_message);
+                    if ($this->exceptions) {
+                        throw new phpmailerException($error_message);
+                    }
+                    return false;
+                }
+            }
+
+            // Set whether the message is multipart/alternative
+            if ($this->alternativeExists()) {
+                $this->ContentType = 'multipart/alternative';
+            }
+
+            $this->setMessageType();
+            // Refuse to send an empty message unless we are specifically allowing it
+            if (!$this->AllowEmpty and empty($this->Body)) {
+                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+
+            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+            $this->MIMEHeader = '';
+            $this->MIMEBody = $this->createBody();
+            // createBody may have added some headers, so retain them
+            $tempheaders = $this->MIMEHeader;
+            $this->MIMEHeader = $this->createHeader();
+            $this->MIMEHeader .= $tempheaders;
+
+            // To capture the complete message when using mail(), create
+            // an extra header list which createHeader() doesn't fold in
+            if ($this->Mailer == 'mail') {
+                if (count($this->to) > 0) {
+                    $this->mailHeader .= $this->addrAppend('To', $this->to);
+                } else {
+                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+                }
+                $this->mailHeader .= $this->headerLine(
+                    'Subject',
+                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
+                );
+            }
+
+            // Sign with DKIM if enabled
+            if (!empty($this->DKIM_domain)
+                && !empty($this->DKIM_selector)
+                && (!empty($this->DKIM_private_string)
+                   || (!empty($this->DKIM_private) && file_exists($this->DKIM_private))
+                )
+            ) {
+                $header_dkim = $this->DKIM_Add(
+                    $this->MIMEHeader . $this->mailHeader,
+                    $this->encodeHeader($this->secureHeader($this->Subject)),
+                    $this->MIMEBody
+                );
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
+                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+            }
+            return true;
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Actually send a message.
+     * Send the email via the selected mechanism
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function postSend()
+    {
+        try {
+            // Choose the mailer and send through it
+            switch ($this->Mailer) {
+                case 'sendmail':
+                case 'qmail':
+                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+                case 'smtp':
+                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+                case 'mail':
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+                default:
+                    $sendMethod = $this->Mailer.'Send';
+                    if (method_exists($this, $sendMethod)) {
+                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                    }
+
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+            }
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Send mail using the $Sendmail program.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @see PHPMailer::$Sendmail
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function sendmailSend($header, $body)
+    {
+        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
+            if ($this->Mailer == 'qmail') {
+                $sendmailFmt = '%s -f%s';
+            } else {
+                $sendmailFmt = '%s -oi -f%s -t';
+            }
+        } else {
+            if ($this->Mailer == 'qmail') {
+                $sendmailFmt = '%s';
+            } else {
+                $sendmailFmt = '%s -oi -t';
+            }
+        }
+
+        // TODO: If possible, this should be changed to escapeshellarg.  Needs thorough testing.
+        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+
+        if ($this->SingleTo) {
+            foreach ($this->SingleToArray as $toAddr) {
+                if (!@$mail = popen($sendmail, 'w')) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+                fputs($mail, 'To: ' . $toAddr . "\n");
+                fputs($mail, $header);
+                fputs($mail, $body);
+                $result = pclose($mail);
+                $this->doCallback(
+                    ($result == 0),
+                    array($toAddr),
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From
+                );
+                if ($result != 0) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+            }
+        } else {
+            if (!@$mail = popen($sendmail, 'w')) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+            fputs($mail, $header);
+            fputs($mail, $body);
+            $result = pclose($mail);
+            $this->doCallback(
+                ($result == 0),
+                $this->to,
+                $this->cc,
+                $this->bcc,
+                $this->Subject,
+                $body,
+                $this->From
+            );
+            if ($result != 0) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
+     *
+     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+     * @param string $string The string to be validated
+     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
+     * @access protected
+     * @return boolean
+     */
+    protected static function isShellSafe($string)
+    {
+        // Future-proof
+        if (escapeshellcmd($string) !== $string
+            or !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))
+        ) {
+            return false;
+        }
+
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; $i++) {
+            $c = $string[$i];
+
+            // All other characters have a special meaning in at least one common shell, including = and +.
+            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Send mail using the PHP mail() function.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @link http://www.php.net/manual/en/book.mail.php
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function mailSend($header, $body)
+    {
+        $toArr = array();
+        foreach ($this->to as $toaddr) {
+            $toArr[] = $this->addrFormat($toaddr);
+        }
+        $to = implode(', ', $toArr);
+
+        $params = null;
+        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
+        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
+        }
+        if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
+            $old_from = ini_get('sendmail_from');
+            ini_set('sendmail_from', $this->Sender);
+        }
+        $result = false;
+        if ($this->SingleTo and count($toArr) > 1) {
+            foreach ($toArr as $toAddr) {
+                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+            }
+        } else {
+            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+        }
+        if (isset($old_from)) {
+            ini_set('sendmail_from', $old_from);
+        }
+        if (!$result) {
+            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
+        }
+        return true;
+    }
+
+    /**
+     * Get an instance to use for SMTP operations.
+     * Override this function to load your own SMTP implementation
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTP;
+        }
+        return $this->smtp;
+    }
+
+    /**
+     * Send mail via SMTP.
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     * Uses the PHPMailerSMTP class by default.
+     * @see PHPMailer::getSMTPInstance() to use a different class.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @throws phpmailerException
+     * @uses SMTP
+     * @access protected
+     * @return boolean
+     */
+    protected function smtpSend($header, $body)
+    {
+        $bad_rcpt = array();
+        if (!$this->smtpConnect($this->SMTPOptions)) {
+            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        }
+        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+            $smtp_from = $this->Sender;
+        } else {
+            $smtp_from = $this->From;
+        }
+        if (!$this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
+        }
+
+        // Attempt to send to all recipients
+        foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
+            foreach ($togroup as $to) {
+                if (!$this->smtp->recipient($to[0])) {
+                    $error = $this->smtp->getError();
+                    $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
+                    $isSent = false;
+                } else {
+                    $isSent = true;
+                }
+                $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
+            }
+        }
+
+        // Only send the DATA command if we have viable recipients
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
+        if ($this->SMTPKeepAlive) {
+            $this->smtp->reset();
+        } else {
+            $this->smtp->quit();
+            $this->smtp->close();
+        }
+        //Create error message for any bad addresses
+        if (count($bad_rcpt) > 0) {
+            $errstr = '';
+            foreach ($bad_rcpt as $bad) {
+                $errstr .= $bad['to'] . ': ' . $bad['error'];
+            }
+            throw new phpmailerException(
+                $this->lang('recipients_failed') . $errstr,
+                self::STOP_CONTINUE
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Returns false if the operation failed.
+     * @param array $options An array of options compatible with stream_context_create()
+     * @uses SMTP
+     * @access public
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function smtpConnect($options = null)
+    {
+        if (is_null($this->smtp)) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        //If no options are provided, use whatever is set in the instance
+        if (is_null($options)) {
+            $options = $this->SMTPOptions;
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = array();
+            if (!preg_match(
+                '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/',
+                trim($hostentry),
+                $hostinfo
+            )) {
+                // Not a valid host entry
+                $this->edebug('Ignoring invalid host: ' . $hostentry);
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ($this->SMTPSecure == 'tls');
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ($hostinfo[2] == 'tls') {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA1');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (integer)$hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new phpmailerException($this->lang('connect_host'));
+                        }
+                        // We must resend EHLO after TLS negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->Realm,
+                            $this->Workstation
+                        )
+                        ) {
+                            throw new phpmailerException($this->lang('authenticate'));
+                        }
+                    }
+                    return true;
+                } catch (phpmailerException $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and !is_null($lastexception)) {
+            throw $lastexception;
+        }
+        return false;
+    }
+
+    /**
+     * Close the active SMTP session if one exists.
+     * @return void
+     */
+    public function smtpClose()
+    {
+        if (is_a($this->smtp, 'SMTP')) {
+            if ($this->smtp->connected()) {
+                $this->smtp->quit();
+                $this->smtp->close();
+            }
+        }
+    }
+
+    /**
+     * Set the language for error messages.
+     * Returns false if it cannot load the language file.
+     * The default language is English.
+     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     * @return boolean
+     * @access public
+     */
+    public function setLanguage($langcode = 'en', $lang_path = '')
+    {
+        // Backwards compatibility for renamed language codes
+        $renamed_langcodes = array(
+            'br' => 'pt_br',
+            'cz' => 'cs',
+            'dk' => 'da',
+            'no' => 'nb',
+            'se' => 'sv',
+            'sr' => 'rs'
+        );
+
+        if (isset($renamed_langcodes[$langcode])) {
+            $langcode = $renamed_langcodes[$langcode];
+        }
+
+        // Define full set of translatable strings in English
+        $PHPMAILER_LANG = array(
+            'authenticate' => 'SMTP Error: Could not authenticate.',
+            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+            'data_not_accepted' => 'SMTP Error: data not accepted.',
+            'empty_message' => 'Message body empty',
+            'encoding' => 'Unknown encoding: ',
+            'execute' => 'Could not execute: ',
+            'file_access' => 'Could not access file: ',
+            'file_open' => 'File Error: Could not open file: ',
+            'from_failed' => 'The following From address failed: ',
+            'instantiate' => 'Could not instantiate mail function.',
+            'invalid_address' => 'Invalid address: ',
+            'mailer_not_supported' => ' mailer is not supported.',
+            'provide_address' => 'You must provide at least one recipient email address.',
+            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+            'signing' => 'Signing Error: ',
+            'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_error' => 'SMTP server error: ',
+            'variable_set' => 'Cannot set or reset variable: ',
+            'extension_missing' => 'Extension missing: '
+        );
+        if (empty($lang_path)) {
+            // Calculate an absolute path so it can work if CWD is not here
+            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+        }
+        //Validate $langcode
+        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+            $langcode = 'en';
+        }
+        $foundlang = true;
+        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        // There is no English translation file
+        if ($langcode != 'en') {
+            // Make sure language file path is readable
+            if (!is_readable($lang_file)) {
+                $foundlang = false;
+            } else {
+                // Overwrite language-specific strings.
+                // This way we'll never have missing translation keys.
+                $foundlang = include $lang_file;
+            }
+        }
+        $this->language = $PHPMAILER_LANG;
+        return (boolean)$foundlang; // Returns false if language not found
+    }
+
+    /**
+     * Get the array of strings for the current language.
+     * @return array
+     */
+    public function getTranslations()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Create recipient headers.
+     * @access public
+     * @param string $type
+     * @param array $addr An array of recipient,
+     * where each recipient is a 2-element indexed array with element 0 containing an address
+     * and element 1 containing a name, like:
+     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
+     * @return string
+     */
+    public function addrAppend($type, $addr)
+    {
+        $addresses = array();
+        foreach ($addr as $address) {
+            $addresses[] = $this->addrFormat($address);
+        }
+        return $type . ': ' . implode(', ', $addresses) . $this->LE;
+    }
+
+    /**
+     * Format an address for use in a message header.
+     * @access public
+     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
+     *      like array('joe@example.com', 'Joe User')
+     * @return string
+     */
+    public function addrFormat($addr)
+    {
+        if (empty($addr[1])) { // No name provided
+            return $this->secureHeader($addr[0]);
+        } else {
+            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+                $addr[0]
+            ) . '>';
+        }
+    }
+
+    /**
+     * Word-wrap message.
+     * For use with mailers that do not automatically perform wrapping
+     * and for quoted-printable encoded messages.
+     * Original written by philippe.
+     * @param string $message The message to wrap
+     * @param integer $length The line length to wrap to
+     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+     * @access public
+     * @return string
+     */
+    public function wrapText($message, $length, $qp_mode = false)
+    {
+        if ($qp_mode) {
+            $soft_break = sprintf(' =%s', $this->LE);
+        } else {
+            $soft_break = $this->LE;
+        }
+        // If utf-8 encoding is used, we will need to make sure we don't
+        // split multibyte characters when we wrap
+        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
+        $lelen = strlen($this->LE);
+        $crlflen = strlen(self::CRLF);
+
+        $message = $this->fixEOL($message);
+        //Remove a trailing line break
+        if (substr($message, -$lelen) == $this->LE) {
+            $message = substr($message, 0, -$lelen);
+        }
+
+        //Split message into lines
+        $lines = explode($this->LE, $message);
+        //Message will be rebuilt in here
+        $message = '';
+        foreach ($lines as $line) {
+            $words = explode(' ', $line);
+            $buf = '';
+            $firstword = true;
+            foreach ($words as $word) {
+                if ($qp_mode and (strlen($word) > $length)) {
+                    $space_left = $length - strlen($buf) - $crlflen;
+                    if (!$firstword) {
+                        if ($space_left > 20) {
+                            $len = $space_left;
+                            if ($is_utf8) {
+                                $len = $this->utf8CharBoundary($word, $len);
+                            } elseif (substr($word, $len - 1, 1) == '=') {
+                                $len--;
+                            } elseif (substr($word, $len - 2, 1) == '=') {
+                                $len -= 2;
+                            }
+                            $part = substr($word, 0, $len);
+                            $word = substr($word, $len);
+                            $buf .= ' ' . $part;
+                            $message .= $buf . sprintf('=%s', self::CRLF);
+                        } else {
+                            $message .= $buf . $soft_break;
+                        }
+                        $buf = '';
+                    }
+                    while (strlen($word) > 0) {
+                        if ($length <= 0) {
+                            break;
+                        }
+                        $len = $length;
+                        if ($is_utf8) {
+                            $len = $this->utf8CharBoundary($word, $len);
+                        } elseif (substr($word, $len - 1, 1) == '=') {
+                            $len--;
+                        } elseif (substr($word, $len - 2, 1) == '=') {
+                            $len -= 2;
+                        }
+                        $part = substr($word, 0, $len);
+                        $word = substr($word, $len);
+
+                        if (strlen($word) > 0) {
+                            $message .= $part . sprintf('=%s', self::CRLF);
+                        } else {
+                            $buf = $part;
+                        }
+                    }
+                } else {
+                    $buf_o = $buf;
+                    if (!$firstword) {
+                        $buf .= ' ';
+                    }
+                    $buf .= $word;
+
+                    if (strlen($buf) > $length and $buf_o != '') {
+                        $message .= $buf_o . $soft_break;
+                        $buf = $word;
+                    }
+                }
+                $firstword = false;
+            }
+            $message .= $buf . self::CRLF;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Find the last character boundary prior to $maxLength in a utf-8
+     * quoted-printable encoded string.
+     * Original written by Colin Brown.
+     * @access public
+     * @param string $encodedText utf-8 QP text
+     * @param integer $maxLength Find the last character boundary prior to this length
+     * @return integer
+     */
+    public function utf8CharBoundary($encodedText, $maxLength)
+    {
+        $foundSplitPos = false;
+        $lookBack = 3;
+        while (!$foundSplitPos) {
+            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+            $encodedCharPos = strpos($lastChunk, '=');
+            if (false !== $encodedCharPos) {
+                // Found start of encoded character byte within $lookBack block.
+                // Check the encoded byte value (the 2 chars after the '=')
+                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+                $dec = hexdec($hex);
+                if ($dec < 128) {
+                    // Single byte character.
+                    // If the encoded char was found at pos 0, it will fit
+                    // otherwise reduce maxLength to start of the encoded char
+                    if ($encodedCharPos > 0) {
+                        $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    }
+                    $foundSplitPos = true;
+                } elseif ($dec >= 192) {
+                    // First byte of a multi byte character
+                    // Reduce maxLength to split at start of character
+                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    $foundSplitPos = true;
+                } elseif ($dec < 192) {
+                    // Middle byte of a multi byte character, look further back
+                    $lookBack += 3;
+                }
+            } else {
+                // No encoded character found
+                $foundSplitPos = true;
+            }
+        }
+        return $maxLength;
+    }
+
+    /**
+     * Apply word wrapping to the message body.
+     * Wraps the message body to the number of chars set in the WordWrap property.
+     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
+     * This is called automatically by createBody(), so you don't need to call it yourself.
+     * @access public
+     * @return void
+     */
+    public function setWordWrap()
+    {
+        if ($this->WordWrap < 1) {
+            return;
+        }
+
+        switch ($this->message_type) {
+            case 'alt':
+            case 'alt_inline':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+                break;
+            default:
+                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
+                break;
+        }
+    }
+
+    /**
+     * Assemble message headers.
+     * @access public
+     * @return string The assembled headers
+     */
+    public function createHeader()
+    {
+        $result = '';
+
+        $result .= $this->headerLine('Date', $this->MessageDate == '' ? self::rfcDate() : $this->MessageDate);
+
+        // To be created automatically by mail()
+        if ($this->SingleTo) {
+            if ($this->Mailer != 'mail') {
+                foreach ($this->to as $toaddr) {
+                    $this->SingleToArray[] = $this->addrFormat($toaddr);
+                }
+            }
+        } else {
+            if (count($this->to) > 0) {
+                if ($this->Mailer != 'mail') {
+                    $result .= $this->addrAppend('To', $this->to);
+                }
+            } elseif (count($this->cc) == 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
+            }
+        }
+
+        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
+
+        // sendmail and mail() extract Cc from the header before sending
+        if (count($this->cc) > 0) {
+            $result .= $this->addrAppend('Cc', $this->cc);
+        }
+
+        // sendmail and mail() extract Bcc from the header before sending
+        if ((
+                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
+            )
+            and count($this->bcc) > 0
+        ) {
+            $result .= $this->addrAppend('Bcc', $this->bcc);
+        }
+
+        if (count($this->ReplyTo) > 0) {
+            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
+        }
+
+        // mail() sets the subject itself
+        if ($this->Mailer != 'mail') {
+            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
+        }
+
+        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
+        // https://tools.ietf.org/html/rfc5322#section-3.6.4
+        if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
+            $this->lastMessageID = $this->MessageID;
+        } else {
+            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
+        }
+        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
+        if (!is_null($this->Priority)) {
+            $result .= $this->headerLine('X-Priority', $this->Priority);
+        }
+        if ($this->XMailer == '') {
+            $result .= $this->headerLine(
+                'X-Mailer',
+                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)'
+            );
+        } else {
+            $myXmailer = trim($this->XMailer);
+            if ($myXmailer) {
+                $result .= $this->headerLine('X-Mailer', $myXmailer);
+            }
+        }
+
+        if ($this->ConfirmReadingTo != '') {
+            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+        }
+
+        // Add custom headers
+        foreach ($this->CustomHeader as $header) {
+            $result .= $this->headerLine(
+                trim($header[0]),
+                $this->encodeHeader(trim($header[1]))
+            );
+        }
+        if (!$this->sign_key_file) {
+            $result .= $this->headerLine('MIME-Version', '1.0');
+            $result .= $this->getMailMIME();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the message MIME type headers.
+     * @access public
+     * @return string
+     */
+    public function getMailMIME()
+    {
+        $result = '';
+        $ismultipart = true;
+        switch ($this->message_type) {
+            case 'inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/related;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'attach':
+            case 'inline_attach':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'alt':
+            case 'alt_inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            default:
+                // Catches case 'plain': and case '':
+                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $ismultipart = false;
+                break;
+        }
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($this->Encoding != '7bit') {
+            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            if ($ismultipart) {
+                if ($this->Encoding == '8bit') {
+                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
+                }
+                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+            } else {
+                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+            }
+        }
+
+        if ($this->Mailer != 'mail') {
+            $result .= $this->LE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the whole MIME message.
+     * Includes complete headers and body.
+     * Only valid post preSend().
+     * @see PHPMailer::preSend()
+     * @access public
+     * @return string
+     */
+    public function getSentMIMEMessage()
+    {
+        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
+    }
+
+    /**
+     * Create unique ID
+     * @return string
+     */
+    protected function generateId() {
+        return md5(uniqid(time()));
+    }
+
+    /**
+     * Assemble the message body.
+     * Returns an empty string on failure.
+     * @access public
+     * @throws phpmailerException
+     * @return string The assembled message body
+     */
+    public function createBody()
+    {
+        $body = '';
+        //Create unique IDs and preset boundaries
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1_' . $this->uniqueid;
+        $this->boundary[2] = 'b2_' . $this->uniqueid;
+        $this->boundary[3] = 'b3_' . $this->uniqueid;
+
+        if ($this->sign_key_file) {
+            $body .= $this->getMailMIME() . $this->LE;
+        }
+
+        $this->setWordWrap();
+
+        $bodyEncoding = $this->Encoding;
+        $bodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
+            $bodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $bodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the body part only
+        if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) {
+            $bodyEncoding = 'quoted-printable';
+        }
+
+        $altBodyEncoding = $this->Encoding;
+        $altBodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
+            $altBodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $altBodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the alt body part only
+        if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) {
+            $altBodyEncoding = 'quoted-printable';
+        }
+        //Use this as a preamble in all multipart message types
+        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
+        switch ($this->message_type) {
+            case 'inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[1]);
+                break;
+            case 'attach':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                    $body .= $this->LE . $this->LE;
+                }
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt_inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[3]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            default:
+                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
+                //Reset the `Encoding` property in case we changed it for line length reasons
+                $this->Encoding = $bodyEncoding;
+                $body .= $this->encodeString($this->Body, $this->Encoding);
+                break;
+        }
+
+        if ($this->isError()) {
+            $body = '';
+        } elseif ($this->sign_key_file) {
+            try {
+                if (!defined('PKCS7_TEXT')) {
+                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                }
+                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
+                $file = tempnam(sys_get_temp_dir(), 'mail');
+                if (false === file_put_contents($file, $body)) {
+                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+                }
+                $signed = tempnam(sys_get_temp_dir(), 'signed');
+                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
+                if (empty($this->sign_extracerts_file)) {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        null
+                    );
+                } else {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        null,
+                        PKCS7_DETACHED,
+                        $this->sign_extracerts_file
+                    );
+                }
+                if ($sign) {
+                    @unlink($file);
+                    $body = file_get_contents($signed);
+                    @unlink($signed);
+                    //The message returned by openssl contains both headers and body, so need to split them up
+                    $parts = explode("\n\n", $body, 2);
+                    $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
+                    $body = $parts[1];
+                } else {
+                    @unlink($file);
+                    @unlink($signed);
+                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
+                }
+            } catch (phpmailerException $exc) {
+                $body = '';
+                if ($this->exceptions) {
+                    throw $exc;
+                }
+            }
+        }
+        return $body;
+    }
+
+    /**
+     * Return the start of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @param string $charSet
+     * @param string $contentType
+     * @param string $encoding
+     * @return string
+     */
+    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
+    {
+        $result = '';
+        if ($charSet == '') {
+            $charSet = $this->CharSet;
+        }
+        if ($contentType == '') {
+            $contentType = $this->ContentType;
+        }
+        if ($encoding == '') {
+            $encoding = $this->Encoding;
+        }
+        $result .= $this->textLine('--' . $boundary);
+        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
+        $result .= $this->LE;
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($encoding != '7bit') {
+            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+        }
+        $result .= $this->LE;
+
+        return $result;
+    }
+
+    /**
+     * Return the end of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @return string
+     */
+    protected function endBoundary($boundary)
+    {
+        return $this->LE . '--' . $boundary . '--' . $this->LE;
+    }
+
+    /**
+     * Set the message type.
+     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
+     * @access protected
+     * @return void
+     */
+    protected function setMessageType()
+    {
+        $type = array();
+        if ($this->alternativeExists()) {
+            $type[] = 'alt';
+        }
+        if ($this->inlineImageExists()) {
+            $type[] = 'inline';
+        }
+        if ($this->attachmentExists()) {
+            $type[] = 'attach';
+        }
+        $this->message_type = implode('_', $type);
+        if ($this->message_type == '') {
+            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
+            $this->message_type = 'plain';
+        }
+    }
+
+    /**
+     * Format a header line.
+     * @access public
+     * @param string $name
+     * @param string $value
+     * @return string
+     */
+    public function headerLine($name, $value)
+    {
+        return $name . ': ' . $value . $this->LE;
+    }
+
+    /**
+     * Return a formatted mail line.
+     * @access public
+     * @param string $value
+     * @return string
+     */
+    public function textLine($value)
+    {
+        return $value . $this->LE;
+    }
+
+    /**
+     * Add an attachment from a path on the filesystem.
+     * Never use a user-supplied path to a file!
+     * Returns false if the file could not be found or read.
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
+    {
+        try {
+            if (!@is_file($path)) {
+                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            }
+
+            // If a MIME type is not specified, try to work it out from the file name
+            if ($type == '') {
+                $type = self::filenameToType($path);
+            }
+
+            $filename = basename($path);
+            if ($name == '') {
+                $name = $filename;
+            }
+
+            $this->attachment[] = array(
+                0 => $path,
+                1 => $filename,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => false, // isStringAttachment
+                6 => $disposition,
+                7 => 0
+            );
+
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Return the array of attachments.
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Attach all file, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     * @access protected
+     * @param string $disposition_type
+     * @param string $boundary
+     * @return string
+     */
+    protected function attachAll($disposition_type, $boundary)
+    {
+        // Return text of body
+        $mime = array();
+        $cidUniq = array();
+        $incl = array();
+
+        // Add all attachments
+        foreach ($this->attachment as $attachment) {
+            // Check if it is a valid disposition_filter
+            if ($attachment[6] == $disposition_type) {
+                // Check for string attachment
+                $string = '';
+                $path = '';
+                $bString = $attachment[5];
+                if ($bString) {
+                    $string = $attachment[0];
+                } else {
+                    $path = $attachment[0];
+                }
+
+                $inclhash = md5(serialize($attachment));
+                if (in_array($inclhash, $incl)) {
+                    continue;
+                }
+                $incl[] = $inclhash;
+                $name = $attachment[2];
+                $encoding = $attachment[3];
+                $type = $attachment[4];
+                $disposition = $attachment[6];
+                $cid = $attachment[7];
+                if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) {
+                    continue;
+                }
+                $cidUniq[$cid] = true;
+
+                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
+                //Only include a filename property if we have one
+                if (!empty($name)) {
+                    $mime[] = sprintf(
+                        'Content-Type: %s; name="%s"%s',
+                        $type,
+                        $this->encodeHeader($this->secureHeader($name)),
+                        $this->LE
+                    );
+                } else {
+                    $mime[] = sprintf(
+                        'Content-Type: %s%s',
+                        $type,
+                        $this->LE
+                    );
+                }
+                // RFC1341 part 5 says 7bit is assumed if not specified
+                if ($encoding != '7bit') {
+                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
+                }
+
+                if ($disposition == 'inline') {
+                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
+                }
+
+                // If a filename contains any of these chars, it should be quoted,
+                // but not otherwise: RFC2183 & RFC2045 5.1
+                // Fixes a warning in IETF's msglint MIME checker
+                // Allow for bypassing the Content-Disposition header totally
+                if (!(empty($disposition))) {
+                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
+                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename="%s"%s',
+                            $disposition,
+                            $encoded_name,
+                            $this->LE . $this->LE
+                        );
+                    } else {
+                        if (!empty($encoded_name)) {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s; filename=%s%s',
+                                $disposition,
+                                $encoded_name,
+                                $this->LE . $this->LE
+                            );
+                        } else {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s%s',
+                                $disposition,
+                                $this->LE . $this->LE
+                            );
+                        }
+                    }
+                } else {
+                    $mime[] = $this->LE;
+                }
+
+                // Encode as string attachment
+                if ($bString) {
+                    $mime[] = $this->encodeString($string, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                } else {
+                    $mime[] = $this->encodeFile($path, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                }
+            }
+        }
+
+        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
+
+        return implode('', $mime);
+    }
+
+    /**
+     * Encode a file attachment in requested format.
+     * Returns an empty string on failure.
+     * @param string $path The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @throws phpmailerException
+     * @access protected
+     * @return string
+     */
+    protected function encodeFile($path, $encoding = 'base64')
+    {
+        try {
+            if (!is_readable($path)) {
+                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $magic_quotes = get_magic_quotes_runtime();
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime(false);
+                } else {
+                    //Doesn't exist in PHP 5.4, but we don't need to check because
+                    //get_magic_quotes_runtime always returns false in 5.4+
+                    //so it will never get here
+                    ini_set('magic_quotes_runtime', false);
+                }
+            }
+            $file_buffer = file_get_contents($path);
+            $file_buffer = $this->encodeString($file_buffer, $encoding);
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime($magic_quotes);
+                } else {
+                    ini_set('magic_quotes_runtime', $magic_quotes);
+                }
+            }
+            return $file_buffer;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            return '';
+        }
+    }
+
+    /**
+     * Encode a string in requested format.
+     * Returns an empty string on failure.
+     * @param string $str The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @access public
+     * @return string
+     */
+    public function encodeString($str, $encoding = 'base64')
+    {
+        $encoded = '';
+        switch (strtolower($encoding)) {
+            case 'base64':
+                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
+                break;
+            case '7bit':
+            case '8bit':
+                $encoded = $this->fixEOL($str);
+                // Make sure it ends with a line break
+                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                    $encoded .= $this->LE;
+                }
+                break;
+            case 'binary':
+                $encoded = $str;
+                break;
+            case 'quoted-printable':
+                $encoded = $this->encodeQP($str);
+                break;
+            default:
+                $this->setError($this->lang('encoding') . $encoding);
+                break;
+        }
+        return $encoded;
+    }
+
+    /**
+     * Encode a header string optimally.
+     * Picks shortest of Q, B, quoted-printable or none.
+     * @access public
+     * @param string $str
+     * @param string $position
+     * @return string
+     */
+    public function encodeHeader($str, $position = 'text')
+    {
+        $matchcount = 0;
+        switch (strtolower($position)) {
+            case 'phrase':
+                if (!preg_match('/[\200-\377]/', $str)) {
+                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    $encoded = addcslashes($str, "\0..\37\177\\\"");
+                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                        return ($encoded);
+                    } else {
+                        return ("\"$encoded\"");
+                    }
+                }
+                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $matchcount = preg_match_all('/[()"]/', $str, $matches);
+                // Intentional fall-through
+            case 'text':
+            default:
+                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+                break;
+        }
+
+        //There are no chars that need encoding
+        if ($matchcount == 0) {
+            return ($str);
+        }
+
+        $maxlen = 75 - 7 - strlen($this->CharSet);
+        // Try to select the encoding which should produce the shortest output
+        if ($matchcount > strlen($str) / 3) {
+            // More than a third of the content will need encoding, so B encoding will be most efficient
+            $encoding = 'B';
+            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
+                // Use a custom function which correctly encodes and wraps long
+                // multibyte strings without breaking lines within a character
+                $encoded = $this->base64EncodeWrapMB($str, "\n");
+            } else {
+                $encoded = base64_encode($str);
+                $maxlen -= $maxlen % 4;
+                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+            }
+        } else {
+            $encoding = 'Q';
+            $encoded = $this->encodeQ($str, $position);
+            $encoded = $this->wrapText($encoded, $maxlen, true);
+            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
+        }
+
+        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+        return $encoded;
+    }
+
+    /**
+     * Check if a string contains multi-byte characters.
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return boolean
+     */
+    public function hasMultiBytes($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return (strlen($str) > mb_strlen($str, $this->CharSet));
+        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+            return false;
+        }
+    }
+
+    /**
+     * Does a string contain any 8-bit chars (in any charset)?
+     * @param string $text
+     * @return boolean
+     */
+    public function has8bitChars($text)
+    {
+        return (boolean)preg_match('/[\x80-\xFF]/', $text);
+    }
+
+    /**
+     * Encode and wrap long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid
+     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @param string $linebreak string to use as linefeed/end-of-line
+     * @return string
+     */
+    public function base64EncodeWrapMB($str, $linebreak = null)
+    {
+        $start = '=?' . $this->CharSet . '?B?';
+        $end = '?=';
+        $encoded = '';
+        if ($linebreak === null) {
+            $linebreak = $this->LE;
+        }
+
+        $mb_length = mb_strlen($str, $this->CharSet);
+        // Each line must have length <= 75, including $start and $end
+        $length = 75 - strlen($start) - strlen($end);
+        // Average multi-byte ratio
+        $ratio = $mb_length / strlen($str);
+        // Base64 has a 4:3 ratio
+        $avgLength = floor($length * $ratio * .75);
+
+        for ($i = 0; $i < $mb_length; $i += $offset) {
+            $lookBack = 0;
+            do {
+                $offset = $avgLength - $lookBack;
+                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+                $chunk = base64_encode($chunk);
+                $lookBack++;
+            } while (strlen($chunk) > $length);
+            $encoded .= $chunk . $linebreak;
+        }
+
+        // Chomp the last linefeed
+        $encoded = substr($encoded, 0, -strlen($linebreak));
+        return $encoded;
+    }
+
+    /**
+     * Encode a string in quoted-printable format.
+     * According to RFC2045 section 6.7.
+     * @access public
+     * @param string $string The text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @return string
+     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
+     */
+    public function encodeQP($string, $line_max = 76)
+    {
+        // Use native function if it's available (>= PHP5.3)
+        if (function_exists('quoted_printable_encode')) {
+            return quoted_printable_encode($string);
+        }
+        // Fall back to a pure PHP implementation
+        $string = str_replace(
+            array('%20', '%0D%0A.', '%0D%0A', '%'),
+            array(' ', "\r\n=2E", "\r\n", '='),
+            rawurlencode($string)
+        );
+        return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+    }
+
+    /**
+     * Backward compatibility wrapper for an old QP encoding function that was removed.
+     * @see PHPMailer::encodeQP()
+     * @access public
+     * @param string $string
+     * @param integer $line_max
+     * @param boolean $space_conv
+     * @return string
+     * @deprecated Use encodeQP instead.
+     */
+    public function encodeQPphp(
+        $string,
+        $line_max = 76,
+        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
+    ) {
+        return $this->encodeQP($string, $line_max);
+    }
+
+    /**
+     * Encode a string using Q encoding.
+     * @link http://tools.ietf.org/html/rfc2047
+     * @param string $str the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     * @access public
+     * @return string
+     */
+    public function encodeQ($str, $position = 'text')
+    {
+        // There should not be any EOL in the string
+        $pattern = '';
+        $encoded = str_replace(array("\r", "\n"), '', $str);
+        switch (strtolower($position)) {
+            case 'phrase':
+                // RFC 2047 section 5.3
+                $pattern = '^A-Za-z0-9!*+\/ -';
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                // RFC 2047 section 5.2
+                $pattern = '\(\)"';
+                // intentional fall-through
+                // for this reason we build the $pattern without including delimiters and []
+            case 'text':
+            default:
+                // RFC 2047 section 5.1
+                // Replace every high ascii, control, =, ? and _ characters
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                break;
+        }
+        $matches = array();
+        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+            // If the string contains an '=', make sure it's the first thing we replace
+            // so as to avoid double-encoding
+            $eqkey = array_search('=', $matches[0]);
+            if (false !== $eqkey) {
+                unset($matches[0][$eqkey]);
+                array_unshift($matches[0], '=');
+            }
+            foreach (array_unique($matches[0]) as $char) {
+                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+            }
+        }
+        // Replace every spaces to _ (more readable than =20)
+        return str_replace(' ', '_', $encoded);
+    }
+
+    /**
+     * Add a string or binary attachment (non-filesystem).
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @return void
+     */
+    public function addStringAttachment(
+        $string,
+        $filename,
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'attachment'
+    ) {
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($filename);
+        }
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $filename,
+            2 => basename($filename),
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => 0
+        );
+    }
+
+    /**
+     * Add an embedded (inline) attachment from a file.
+     * This can include images, sounds, and just about any other document type.
+     * These differ from 'regular' attachments in that they are intended to be
+     * displayed inline with the message, not just attached for download.
+     * This is used in HTML messages that embed the images
+     * the HTML refers to using the $cid value.
+     * Never use a user-supplied path to a file!
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
+    {
+        if (!@is_file($path)) {
+            $this->setError($this->lang('file_access') . $path);
+            return false;
+        }
+
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($path);
+        }
+
+        $filename = basename($path);
+        if ($name == '') {
+            $name = $filename;
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $path,
+            1 => $filename,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => false, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
+    }
+
+    /**
+     * Add an embedded stringified attachment.
+     * This can include images, sounds, and just about any other document type.
+     * Be sure to set the $type to an image type for images:
+     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
+     * @param string $string The attachment binary data.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ) {
+        // If a MIME type is not specified, try to work it out from the name
+        if ($type == '' and !empty($name)) {
+            $type = self::filenameToType($name);
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
+    }
+
+    /**
+     * Check if an inline attachment is present.
+     * @access public
+     * @return boolean
+     */
+    public function inlineImageExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'inline') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if an attachment (non-inline) is present.
+     * @return boolean
+     */
+    public function attachmentExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'attachment') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if this message has an alternative body set.
+     * @return boolean
+     */
+    public function alternativeExists()
+    {
+        return !empty($this->AltBody);
+    }
+
+    /**
+     * Clear queued addresses of given kind.
+     * @access protected
+     * @param string $kind 'to', 'cc', or 'bcc'
+     * @return void
+     */
+    public function clearQueuedAddresses($kind)
+    {
+        $RecipientsQueue = $this->RecipientsQueue;
+        foreach ($RecipientsQueue as $address => $params) {
+            if ($params[0] == $kind) {
+                unset($this->RecipientsQueue[$address]);
+            }
+        }
+    }
+
+    /**
+     * Clear all To recipients.
+     * @return void
+     */
+    public function clearAddresses()
+    {
+        foreach ($this->to as $to) {
+            unset($this->all_recipients[strtolower($to[0])]);
+        }
+        $this->to = array();
+        $this->clearQueuedAddresses('to');
+    }
+
+    /**
+     * Clear all CC recipients.
+     * @return void
+     */
+    public function clearCCs()
+    {
+        foreach ($this->cc as $cc) {
+            unset($this->all_recipients[strtolower($cc[0])]);
+        }
+        $this->cc = array();
+        $this->clearQueuedAddresses('cc');
+    }
+
+    /**
+     * Clear all BCC recipients.
+     * @return void
+     */
+    public function clearBCCs()
+    {
+        foreach ($this->bcc as $bcc) {
+            unset($this->all_recipients[strtolower($bcc[0])]);
+        }
+        $this->bcc = array();
+        $this->clearQueuedAddresses('bcc');
+    }
+
+    /**
+     * Clear all ReplyTo recipients.
+     * @return void
+     */
+    public function clearReplyTos()
+    {
+        $this->ReplyTo = array();
+        $this->ReplyToQueue = array();
+    }
+
+    /**
+     * Clear all recipient types.
+     * @return void
+     */
+    public function clearAllRecipients()
+    {
+        $this->to = array();
+        $this->cc = array();
+        $this->bcc = array();
+        $this->all_recipients = array();
+        $this->RecipientsQueue = array();
+    }
+
+    /**
+     * Clear all filesystem, string, and binary attachments.
+     * @return void
+     */
+    public function clearAttachments()
+    {
+        $this->attachment = array();
+    }
+
+    /**
+     * Clear all custom headers.
+     * @return void
+     */
+    public function clearCustomHeaders()
+    {
+        $this->CustomHeader = array();
+    }
+
+    /**
+     * Add an error message to the error container.
+     * @access protected
+     * @param string $msg
+     * @return void
+     */
+    protected function setError($msg)
+    {
+        $this->error_count++;
+        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+            $lasterror = $this->smtp->getError();
+            if (!empty($lasterror['error'])) {
+                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                if (!empty($lasterror['detail'])) {
+                    $msg .= ' Detail: '. $lasterror['detail'];
+                }
+                if (!empty($lasterror['smtp_code'])) {
+                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                }
+                if (!empty($lasterror['smtp_code_ex'])) {
+                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                }
+            }
+        }
+        $this->ErrorInfo = $msg;
+    }
+
+    /**
+     * Return an RFC 822 formatted date.
+     * @access public
+     * @return string
+     * @static
+     */
+    public static function rfcDate()
+    {
+        // Set the time zone to whatever the default is to avoid 500 errors
+        // Will default to UTC if it's not set properly in php.ini
+        date_default_timezone_set(@date_default_timezone_get());
+        return date('D, j M Y H:i:s O');
+    }
+
+    /**
+     * Get the server hostname.
+     * Returns 'localhost.localdomain' if unknown.
+     * @access protected
+     * @return string
+     */
+    protected function serverHostname()
+    {
+        $result = 'localhost.localdomain';
+        if (!empty($this->Hostname)) {
+            $result = $this->Hostname;
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+            $result = $_SERVER['SERVER_NAME'];
+        } elseif (function_exists('gethostname') && gethostname() !== false) {
+            $result = gethostname();
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
+        }
+        return $result;
+    }
+
+    /**
+     * Get an error message in the current language.
+     * @access protected
+     * @param string $key
+     * @return string
+     */
+    protected function lang($key)
+    {
+        if (count($this->language) < 1) {
+            $this->setLanguage('en'); // set the default language
+        }
+
+        if (array_key_exists($key, $this->language)) {
+            if ($key == 'smtp_connect_failed') {
+                //Include a link to troubleshooting docs on SMTP connection failure
+                //this is by far the biggest cause of support questions
+                //but it's usually not PHPMailer's fault.
+                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+            }
+            return $this->language[$key];
+        } else {
+            //Return the key as a fallback
+            return $key;
+        }
+    }
+
+    /**
+     * Check if an error occurred.
+     * @access public
+     * @return boolean True if an error did occur.
+     */
+    public function isError()
+    {
+        return ($this->error_count > 0);
+    }
+
+    /**
+     * Ensure consistent line endings in a string.
+     * Changes every end of line from CRLF, CR or LF to $this->LE.
+     * @access public
+     * @param string $str String to fixEOL
+     * @return string
+     */
+    public function fixEOL($str)
+    {
+        // Normalise to \n
+        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
+        // Now convert LE as needed
+        if ($this->LE !== "\n") {
+            $nstr = str_replace("\n", $this->LE, $nstr);
+        }
+        return $nstr;
+    }
+
+    /**
+     * Add a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value)
+     * @access public
+     * @param string $name Custom header name
+     * @param string $value Header value
+     * @return void
+     */
+    public function addCustomHeader($name, $value = null)
+    {
+        if ($value === null) {
+            // Value passed in as name:value
+            $this->CustomHeader[] = explode(':', $name, 2);
+        } else {
+            $this->CustomHeader[] = array($name, $value);
+        }
+    }
+
+    /**
+     * Returns all custom headers.
+     * @return array
+     */
+    public function getCustomHeaders()
+    {
+        return $this->CustomHeader;
+    }
+
+    /**
+     * Create a message body from an HTML string.
+     * Automatically inlines images and creates a plain-text version by converting the HTML,
+     * overwriting any existing values in Body and AltBody.
+     * Do not source $message content from user input!
+     * $basedir is prepended when handling relative URLs, e.g. <img src="/images/a.png"> and must not be empty
+     * will look for an image file in $basedir/images/a.png and convert it to inline.
+     * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
+     * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
+     * @access public
+     * @param string $message HTML message string
+     * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
+     * @param boolean|callable $advanced Whether to use the internal HTML to text converter
+     *    or your own custom converter @see PHPMailer::html2text()
+     * @return string $message The transformed message Body
+     */
+    public function msgHTML($message, $basedir = '', $advanced = false)
+    {
+        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+        if (array_key_exists(2, $images)) {
+            if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
+                // Ensure $basedir has a trailing /
+                $basedir .= '/';
+            }
+            foreach ($images[2] as $imgindex => $url) {
+                // Convert data URIs into embedded images
+                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
+                    $data = substr($url, strpos($url, ','));
+                    if ($match[2]) {
+                        $data = base64_decode($data);
+                    } else {
+                        $data = rawurldecode($data);
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) {
+                        $message = str_replace(
+                            $images[0][$imgindex],
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                    continue;
+                }
+                if (
+                    // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+                    !empty($basedir)
+                    // Ignore URLs containing parent dir traversal (..)
+                    && (strpos($url, '..') === false)
+                    // Do not change urls that are already inline images
+                    && substr($url, 0, 4) !== 'cid:'
+                    // Do not change absolute URLs, including anonymous protocol
+                    && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
+                ) {
+                    $filename = basename($url);
+                    $directory = dirname($url);
+                    if ($directory == '.') {
+                        $directory = '';
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
+                        $directory .= '/';
+                    }
+                    if ($this->addEmbeddedImage(
+                        $basedir . $directory . $filename,
+                        $cid,
+                        $filename,
+                        'base64',
+                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                    )
+                    ) {
+                        $message = preg_replace(
+                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                }
+            }
+        }
+        $this->isHTML(true);
+        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
+        $this->Body = $this->normalizeBreaks($message);
+        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
+        if (!$this->alternativeExists()) {
+            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
+                self::CRLF . self::CRLF;
+        }
+        return $this->Body;
+    }
+
+    /**
+     * Convert an HTML string into plain text.
+     * This is used by msgHTML().
+     * Note - older versions of this function used a bundled advanced converter
+     * which was been removed for license reasons in #232.
+     * Example usage:
+     * <code>
+     * // Use default conversion
+     * $plain = $mail->html2text($html);
+     * // Use your own custom converter
+     * $plain = $mail->html2text($html, function($html) {
+     *     $converter = new MyHtml2text($html);
+     *     return $converter->get_text();
+     * });
+     * </code>
+     * @param string $html The HTML text to convert
+     * @param boolean|callable $advanced Any boolean value to use the internal converter,
+     *   or provide your own callable for custom conversion.
+     * @return string
+     */
+    public function html2text($html, $advanced = false)
+    {
+        if (is_callable($advanced)) {
+            return call_user_func($advanced, $html);
+        }
+        return html_entity_decode(
+            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+            ENT_QUOTES,
+            $this->CharSet
+        );
+    }
+
+    /**
+     * Get the MIME type for a file extension.
+     * @param string $ext File extension
+     * @access public
+     * @return string MIME type of file.
+     * @static
+     */
+    public static function _mime_types($ext = '')
+    {
+        $mimes = array(
+            'xl'    => 'application/excel',
+            'js'    => 'application/javascript',
+            'hqx'   => 'application/mac-binhex40',
+            'cpt'   => 'application/mac-compactpro',
+            'bin'   => 'application/macbinary',
+            'doc'   => 'application/msword',
+            'word'  => 'application/msword',
+            'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'xltx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+            'potx'  => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+            'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+            'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'sldx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+            'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'dotx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+            'xlam'  => 'application/vnd.ms-excel.addin.macroEnabled.12',
+            'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+            'class' => 'application/octet-stream',
+            'dll'   => 'application/octet-stream',
+            'dms'   => 'application/octet-stream',
+            'exe'   => 'application/octet-stream',
+            'lha'   => 'application/octet-stream',
+            'lzh'   => 'application/octet-stream',
+            'psd'   => 'application/octet-stream',
+            'sea'   => 'application/octet-stream',
+            'so'    => 'application/octet-stream',
+            'oda'   => 'application/oda',
+            'pdf'   => 'application/pdf',
+            'ai'    => 'application/postscript',
+            'eps'   => 'application/postscript',
+            'ps'    => 'application/postscript',
+            'smi'   => 'application/smil',
+            'smil'  => 'application/smil',
+            'mif'   => 'application/vnd.mif',
+            'xls'   => 'application/vnd.ms-excel',
+            'ppt'   => 'application/vnd.ms-powerpoint',
+            'wbxml' => 'application/vnd.wap.wbxml',
+            'wmlc'  => 'application/vnd.wap.wmlc',
+            'dcr'   => 'application/x-director',
+            'dir'   => 'application/x-director',
+            'dxr'   => 'application/x-director',
+            'dvi'   => 'application/x-dvi',
+            'gtar'  => 'application/x-gtar',
+            'php3'  => 'application/x-httpd-php',
+            'php4'  => 'application/x-httpd-php',
+            'php'   => 'application/x-httpd-php',
+            'phtml' => 'application/x-httpd-php',
+            'phps'  => 'application/x-httpd-php-source',
+            'swf'   => 'application/x-shockwave-flash',
+            'sit'   => 'application/x-stuffit',
+            'tar'   => 'application/x-tar',
+            'tgz'   => 'application/x-tar',
+            'xht'   => 'application/xhtml+xml',
+            'xhtml' => 'application/xhtml+xml',
+            'zip'   => 'application/zip',
+            'mid'   => 'audio/midi',
+            'midi'  => 'audio/midi',
+            'mp2'   => 'audio/mpeg',
+            'mp3'   => 'audio/mpeg',
+            'mpga'  => 'audio/mpeg',
+            'aif'   => 'audio/x-aiff',
+            'aifc'  => 'audio/x-aiff',
+            'aiff'  => 'audio/x-aiff',
+            'ram'   => 'audio/x-pn-realaudio',
+            'rm'    => 'audio/x-pn-realaudio',
+            'rpm'   => 'audio/x-pn-realaudio-plugin',
+            'ra'    => 'audio/x-realaudio',
+            'wav'   => 'audio/x-wav',
+            'bmp'   => 'image/bmp',
+            'gif'   => 'image/gif',
+            'jpeg'  => 'image/jpeg',
+            'jpe'   => 'image/jpeg',
+            'jpg'   => 'image/jpeg',
+            'png'   => 'image/png',
+            'tiff'  => 'image/tiff',
+            'tif'   => 'image/tiff',
+            'eml'   => 'message/rfc822',
+            'css'   => 'text/css',
+            'html'  => 'text/html',
+            'htm'   => 'text/html',
+            'shtml' => 'text/html',
+            'log'   => 'text/plain',
+            'text'  => 'text/plain',
+            'txt'   => 'text/plain',
+            'rtx'   => 'text/richtext',
+            'rtf'   => 'text/rtf',
+            'vcf'   => 'text/vcard',
+            'vcard' => 'text/vcard',
+            'xml'   => 'text/xml',
+            'xsl'   => 'text/xml',
+            'mpeg'  => 'video/mpeg',
+            'mpe'   => 'video/mpeg',
+            'mpg'   => 'video/mpeg',
+            'mov'   => 'video/quicktime',
+            'qt'    => 'video/quicktime',
+            'rv'    => 'video/vnd.rn-realvideo',
+            'avi'   => 'video/x-msvideo',
+            'movie' => 'video/x-sgi-movie'
+        );
+        if (array_key_exists(strtolower($ext), $mimes)) {
+            return $mimes[strtolower($ext)];
+        }
+        return 'application/octet-stream';
+    }
+
+    /**
+     * Map a file name to a MIME type.
+     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+     * @param string $filename A file name or full path, does not need to exist as a file
+     * @return string
+     * @static
+     */
+    public static function filenameToType($filename)
+    {
+        // In case the path is a URL, strip any query string before getting extension
+        $qpos = strpos($filename, '?');
+        if (false !== $qpos) {
+            $filename = substr($filename, 0, $qpos);
+        }
+        $pathinfo = self::mb_pathinfo($filename);
+        return self::_mime_types($pathinfo['extension']);
+    }
+
+    /**
+     * Multi-byte-safe pathinfo replacement.
+     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
+     * Works similarly to the one in PHP >= 5.2.0
+     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
+     * @param string $path A filename or path, does not need to exist as a file
+     * @param integer|string $options Either a PATHINFO_* constant,
+     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
+     * @return string|array
+     * @static
+     */
+    public static function mb_pathinfo($path, $options = null)
+    {
+        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
+        $pathinfo = array();
+        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
+            if (array_key_exists(1, $pathinfo)) {
+                $ret['dirname'] = $pathinfo[1];
+            }
+            if (array_key_exists(2, $pathinfo)) {
+                $ret['basename'] = $pathinfo[2];
+            }
+            if (array_key_exists(5, $pathinfo)) {
+                $ret['extension'] = $pathinfo[5];
+            }
+            if (array_key_exists(3, $pathinfo)) {
+                $ret['filename'] = $pathinfo[3];
+            }
+        }
+        switch ($options) {
+            case PATHINFO_DIRNAME:
+            case 'dirname':
+                return $ret['dirname'];
+            case PATHINFO_BASENAME:
+            case 'basename':
+                return $ret['basename'];
+            case PATHINFO_EXTENSION:
+            case 'extension':
+                return $ret['extension'];
+            case PATHINFO_FILENAME:
+            case 'filename':
+                return $ret['filename'];
+            default:
+                return $ret;
+        }
+    }
+
+    /**
+     * Set or reset instance properties.
+     * You should avoid this function - it's more verbose, less efficient, more error-prone and
+     * harder to debug than setting properties directly.
+     * Usage Example:
+     * `$mail->set('SMTPSecure', 'tls');`
+     *   is the same as:
+     * `$mail->SMTPSecure = 'tls';`
+     * @access public
+     * @param string $name The property name to set
+     * @param mixed $value The value to set the property to
+     * @return boolean
+     * @TODO Should this not be using the __set() magic function?
+     */
+    public function set($name, $value = '')
+    {
+        if (property_exists($this, $name)) {
+            $this->$name = $value;
+            return true;
+        } else {
+            $this->setError($this->lang('variable_set') . $name);
+            return false;
+        }
+    }
+
+    /**
+     * Strip newlines to prevent header injection.
+     * @access public
+     * @param string $str
+     * @return string
+     */
+    public function secureHeader($str)
+    {
+        return trim(str_replace(array("\r", "\n"), '', $str));
+    }
+
+    /**
+     * Normalize line breaks in a string.
+     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+     * @param string $text
+     * @param string $breaktype What kind of line break to use, defaults to CRLF
+     * @return string
+     * @access public
+     * @static
+     */
+    public static function normalizeBreaks($text, $breaktype = "\r\n")
+    {
+        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
+    }
+
+    /**
+     * Set the public and private key files and password for S/MIME signing.
+     * @access public
+     * @param string $cert_filename
+     * @param string $key_filename
+     * @param string $key_pass Password for private key
+     * @param string $extracerts_filename Optional path to chain certificate
+     */
+    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
+    {
+        $this->sign_cert_file = $cert_filename;
+        $this->sign_key_file = $key_filename;
+        $this->sign_key_pass = $key_pass;
+        $this->sign_extracerts_file = $extracerts_filename;
+    }
+
+    /**
+     * Quoted-Printable-encode a DKIM header.
+     * @access public
+     * @param string $txt
+     * @return string
+     */
+    public function DKIM_QP($txt)
+    {
+        $line = '';
+        for ($i = 0; $i < strlen($txt); $i++) {
+            $ord = ord($txt[$i]);
+            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+                $line .= $txt[$i];
+            } else {
+                $line .= '=' . sprintf('%02X', $ord);
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * Generate a DKIM signature.
+     * @access public
+     * @param string $signHeader
+     * @throws phpmailerException
+     * @return string The DKIM signature value
+     */
+    public function DKIM_Sign($signHeader)
+    {
+        if (!defined('PKCS7_TEXT')) {
+            if ($this->exceptions) {
+                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+            }
+            return '';
+        }
+        $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
+        if ('' != $this->DKIM_passphrase) {
+            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+        } else {
+            $privKey = openssl_pkey_get_private($privKeyStr);
+        }
+        //Workaround for missing digest algorithms in old PHP & OpenSSL versions
+        //@link http://stackoverflow.com/a/11117338/333340
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
+            in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
+            if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
+                openssl_pkey_free($privKey);
+                return base64_encode($signature);
+            }
+        } else {
+            $pinfo = openssl_pkey_get_details($privKey);
+            $hash = hash('sha256', $signHeader);
+            //'Magic' constant for SHA256 from RFC3447
+            //@link https://tools.ietf.org/html/rfc3447#page-43
+            $t = '3031300d060960864801650304020105000420' . $hash;
+            $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
+            $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
+
+            if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
+                openssl_pkey_free($privKey);
+                return base64_encode($signature);
+            }
+        }
+        openssl_pkey_free($privKey);
+        return '';
+    }
+
+    /**
+     * Generate a DKIM canonicalization header.
+     * @access public
+     * @param string $signHeader Header
+     * @return string
+     */
+    public function DKIM_HeaderC($signHeader)
+    {
+        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
+        $lines = explode("\r\n", $signHeader);
+        foreach ($lines as $key => $line) {
+            list($heading, $value) = explode(':', $line, 2);
+            $heading = strtolower($heading);
+            $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
+            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
+        }
+        $signHeader = implode("\r\n", $lines);
+        return $signHeader;
+    }
+
+    /**
+     * Generate a DKIM canonicalization body.
+     * @access public
+     * @param string $body Message Body
+     * @return string
+     */
+    public function DKIM_BodyC($body)
+    {
+        if ($body == '') {
+            return "\r\n";
+        }
+        // stabilize line endings
+        $body = str_replace("\r\n", "\n", $body);
+        $body = str_replace("\n", "\r\n", $body);
+        // END stabilize line endings
+        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+            $body = substr($body, 0, strlen($body) - 2);
+        }
+        return $body;
+    }
+
+    /**
+     * Create the DKIM header and body in a new message header.
+     * @access public
+     * @param string $headers_line Header lines
+     * @param string $subject Subject
+     * @param string $body Body
+     * @return string
+     */
+    public function DKIM_Add($headers_line, $subject, $body)
+    {
+        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+        $subject_header = "Subject: $subject";
+        $headers = explode($this->LE, $headers_line);
+        $from_header = '';
+        $to_header = '';
+        $date_header = '';
+        $current = '';
+        foreach ($headers as $header) {
+            if (strpos($header, 'From:') === 0) {
+                $from_header = $header;
+                $current = 'from_header';
+            } elseif (strpos($header, 'To:') === 0) {
+                $to_header = $header;
+                $current = 'to_header';
+            } elseif (strpos($header, 'Date:') === 0) {
+                $date_header = $header;
+                $current = 'date_header';
+            } else {
+                if (!empty($$current) && strpos($header, ' =?') === 0) {
+                    $$current .= $header;
+                } else {
+                    $current = '';
+                }
+            }
+        }
+        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+        $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
+        $subject = str_replace(
+            '|',
+            '=7C',
+            $this->DKIM_QP($subject_header)
+        ); // Copied header fields (dkim-quoted-printable)
+        $body = $this->DKIM_BodyC($body);
+        $DKIMlen = strlen($body); // Length of body
+        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
+        if ('' == $this->DKIM_identity) {
+            $ident = '';
+        } else {
+            $ident = ' i=' . $this->DKIM_identity . ';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
+            $DKIMsignatureType . '; q=' .
+            $DKIMquery . '; l=' .
+            $DKIMlen . '; s=' .
+            $this->DKIM_selector .
+            ";\r\n" .
+            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
+            "\th=From:To:Date:Subject;\r\n" .
+            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
+            "\tz=$from\r\n" .
+            "\t|$to\r\n" .
+            "\t|$date\r\n" .
+            "\t|$subject;\r\n" .
+            "\tbh=" . $DKIMb64 . ";\r\n" .
+            "\tb=";
+        $toSign = $this->DKIM_HeaderC(
+            $from_header . "\r\n" .
+            $to_header . "\r\n" .
+            $date_header . "\r\n" .
+            $subject_header . "\r\n" .
+            $dkimhdrs
+        );
+        $signed = $this->DKIM_Sign($toSign);
+        return $dkimhdrs . $signed . "\r\n";
+    }
+
+    /**
+     * Detect if a string contains a line longer than the maximum line length allowed.
+     * @param string $str
+     * @return boolean
+     * @static
+     */
+    public static function hasLineLongerThanMax($str)
+    {
+        //+2 to include CRLF line break for a 1000 total
+        return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+    }
+
+    /**
+     * Allows for public read access to 'to' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getToAddresses()
+    {
+        return $this->to;
+    }
+
+    /**
+     * Allows for public read access to 'cc' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getCcAddresses()
+    {
+        return $this->cc;
+    }
+
+    /**
+     * Allows for public read access to 'bcc' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getBccAddresses()
+    {
+        return $this->bcc;
+    }
+
+    /**
+     * Allows for public read access to 'ReplyTo' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getReplyToAddresses()
+    {
+        return $this->ReplyTo;
+    }
+
+    /**
+     * Allows for public read access to 'all_recipients' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getAllRecipientAddresses()
+    {
+        return $this->all_recipients;
+    }
+
+    /**
+     * Perform a callback.
+     * @param boolean $isSent
+     * @param array $to
+     * @param array $cc
+     * @param array $bcc
+     * @param string $subject
+     * @param string $body
+     * @param string $from
+     */
+    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
+    {
+        if (!empty($this->action_function) && is_callable($this->action_function)) {
+            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
+            call_user_func_array($this->action_function, $params);
+        }
+    }
+}
+
+/**
+ * PHPMailer exception handler
+ * @package PHPMailer
+ */
+class phpmailerException extends Exception
+{
+    /**
+     * Prettify error message output
+     * @return string
+     */
+    public function errorMessage()
+    {
+        $errorMsg = '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return $errorMsg;
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauth.php b/core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauth.php
new file mode 100644
index 00000000..b1bb09f0
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauth.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.4
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailerOAuth - PHPMailer subclass adding OAuth support.
+ * @package PHPMailer
+ * @author @sherryl4george
+ * @author Marcus Bointon (@Synchro) <phpmailer@synchromedia.co.uk>
+ */
+class PHPMailerOAuth extends PHPMailer
+{
+    /**
+     * The OAuth user's email address
+     * @var string
+     */
+    public $oauthUserEmail = '';
+
+    /**
+     * The OAuth refresh token
+     * @var string
+     */
+    public $oauthRefreshToken = '';
+
+    /**
+     * The OAuth client ID
+     * @var string
+     */
+    public $oauthClientId = '';
+
+    /**
+     * The OAuth client secret
+     * @var string
+     */
+    public $oauthClientSecret = '';
+
+    /**
+     * An instance of the PHPMailerOAuthGoogle class.
+     * @var PHPMailerOAuthGoogle
+     * @access protected
+     */
+    protected $oauth = null;
+
+    /**
+     * Get a PHPMailerOAuthGoogle instance to use.
+     * @return PHPMailerOAuthGoogle
+     */
+    public function getOAUTHInstance()
+    {
+        if (!is_object($this->oauth)) {
+            $this->oauth = new PHPMailerOAuthGoogle(
+                $this->oauthUserEmail,
+                $this->oauthClientSecret,
+                $this->oauthClientId,
+                $this->oauthRefreshToken
+            );
+        }
+        return $this->oauth;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Overrides the original smtpConnect method to add support for OAuth.
+     * @param array $options An array of options compatible with stream_context_create()
+     * @uses SMTP
+     * @access public
+     * @return bool
+     * @throws phpmailerException
+     */
+    public function smtpConnect($options = array())
+    {
+        if (is_null($this->smtp)) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        if (is_null($this->oauth)) {
+            $this->oauth = $this->getOAUTHInstance();
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = array();
+            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
+                // Not a valid host entry
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ($this->SMTPSecure == 'tls');
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ($hostinfo[2] == 'tls') {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA1');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (integer)$hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new phpmailerException($this->lang('connect_host'));
+                        }
+                        // We must resend HELO after tls negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->Realm,
+                            $this->Workstation,
+                            $this->oauth
+                        )
+                        ) {
+                            throw new phpmailerException($this->lang('authenticate'));
+                        }
+                    }
+                    return true;
+                } catch (phpmailerException $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and !is_null($lastexception)) {
+            throw $lastexception;
+        }
+        return false;
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php b/core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
new file mode 100644
index 00000000..71c9bd32
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/class.phpmaileroauthgoogle.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.4
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailerOAuthGoogle - Wrapper for League OAuth2 Google provider.
+ * @package PHPMailer
+ * @author @sherryl4george
+ * @author Marcus Bointon (@Synchro) <phpmailer@synchromedia.co.uk>
+ * @link https://github.com/thephpleague/oauth2-client
+ */
+class PHPMailerOAuthGoogle
+{
+    private $oauthUserEmail = '';
+    private $oauthRefreshToken = '';
+    private $oauthClientId = '';
+    private $oauthClientSecret = '';
+
+    /**
+     * @param string $UserEmail
+     * @param string $ClientSecret
+     * @param string $ClientId
+     * @param string $RefreshToken
+     */
+    public function __construct(
+        $UserEmail,
+        $ClientSecret,
+        $ClientId,
+        $RefreshToken
+    ) {
+        $this->oauthClientId = $ClientId;
+        $this->oauthClientSecret = $ClientSecret;
+        $this->oauthRefreshToken = $RefreshToken;
+        $this->oauthUserEmail = $UserEmail;
+    }
+
+    private function getProvider()
+    {
+        return new League\OAuth2\Client\Provider\Google([
+            'clientId' => $this->oauthClientId,
+            'clientSecret' => $this->oauthClientSecret
+        ]);
+    }
+
+    private function getGrant()
+    {
+        return new \League\OAuth2\Client\Grant\RefreshToken();
+    }
+
+    private function getToken()
+    {
+        $provider = $this->getProvider();
+        $grant = $this->getGrant();
+        return $provider->getAccessToken($grant, ['refresh_token' => $this->oauthRefreshToken]);
+    }
+
+    public function getOauth64()
+    {
+        $token = $this->getToken();
+        return base64_encode("user=" . $this->oauthUserEmail . "\001auth=Bearer " . $token . "\001\001");
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/class.pop3.php b/core/libraries/vendor/phpmailer/phpmailer/class.pop3.php
new file mode 100644
index 00000000..f833ac61
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/class.pop3.php
@@ -0,0 +1,407 @@
+<?php
+/**
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
+ * Does not support APOP.
+ * @package PHPMailer
+ * @author Richard Davey (original author) <rich@corephp.co.uk>
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ */
+class POP3
+{
+    /**
+     * The POP3 PHPMailer Version number.
+     * @var string
+     * @access public
+     */
+    public $Version = '5.2.26';
+
+    /**
+     * Default POP3 port number.
+     * @var integer
+     * @access public
+     */
+    public $POP3_PORT = 110;
+
+    /**
+     * Default timeout in seconds.
+     * @var integer
+     * @access public
+     */
+    public $POP3_TIMEOUT = 30;
+
+    /**
+     * POP3 Carriage Return + Line Feed.
+     * @var string
+     * @access public
+     * @deprecated Use the constant instead
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug display level.
+     * Options: 0 = no, 1+ = yes
+     * @var integer
+     * @access public
+     */
+    public $do_debug = 0;
+
+    /**
+     * POP3 mail server hostname.
+     * @var string
+     * @access public
+     */
+    public $host;
+
+    /**
+     * POP3 port number.
+     * @var integer
+     * @access public
+     */
+    public $port;
+
+    /**
+     * POP3 Timeout Value in seconds.
+     * @var integer
+     * @access public
+     */
+    public $tval;
+
+    /**
+     * POP3 username
+     * @var string
+     * @access public
+     */
+    public $username;
+
+    /**
+     * POP3 password.
+     * @var string
+     * @access public
+     */
+    public $password;
+
+    /**
+     * Resource handle for the POP3 connection socket.
+     * @var resource
+     * @access protected
+     */
+    protected $pop_conn;
+
+    /**
+     * Are we connected?
+     * @var boolean
+     * @access protected
+     */
+    protected $connected = false;
+
+    /**
+     * Error container.
+     * @var array
+     * @access protected
+     */
+    protected $errors = array();
+
+    /**
+     * Line break constant
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * Simple static wrapper for all-in-one POP before SMTP
+     * @param $host
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public static function popBeforeSmtp(
+        $host,
+        $port = false,
+        $timeout = false,
+        $username = '',
+        $password = '',
+        $debug_level = 0
+    ) {
+        $pop = new POP3;
+        return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
+    }
+
+    /**
+     * Authenticate with a POP3 server.
+     * A connect, login, disconnect sequence
+     * appropriate for POP-before SMTP authorisation.
+     * @access public
+     * @param string $host The hostname to connect to
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
+    {
+        $this->host = $host;
+        // If no port value provided, use default
+        if (false === $port) {
+            $this->port = $this->POP3_PORT;
+        } else {
+            $this->port = (integer)$port;
+        }
+        // If no timeout value provided, use default
+        if (false === $timeout) {
+            $this->tval = $this->POP3_TIMEOUT;
+        } else {
+            $this->tval = (integer)$timeout;
+        }
+        $this->do_debug = $debug_level;
+        $this->username = $username;
+        $this->password = $password;
+        //  Reset the error log
+        $this->errors = array();
+        //  connect
+        $result = $this->connect($this->host, $this->port, $this->tval);
+        if ($result) {
+            $login_result = $this->login($this->username, $this->password);
+            if ($login_result) {
+                $this->disconnect();
+                return true;
+            }
+        }
+        // We need to disconnect regardless of whether the login succeeded
+        $this->disconnect();
+        return false;
+    }
+
+    /**
+     * Connect to a POP3 server.
+     * @access public
+     * @param string $host
+     * @param integer|boolean $port
+     * @param integer $tval
+     * @return boolean
+     */
+    public function connect($host, $port = false, $tval = 30)
+    {
+        //  Are we already connected?
+        if ($this->connected) {
+            return true;
+        }
+
+        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
+        //Rather than suppress it with @fsockopen, capture it cleanly instead
+        set_error_handler(array($this, 'catchWarning'));
+
+        if (false === $port) {
+            $port = $this->POP3_PORT;
+        }
+
+        //  connect to the POP3 server
+        $this->pop_conn = fsockopen(
+            $host, //  POP3 Host
+            $port, //  Port #
+            $errno, //  Error Number
+            $errstr, //  Error Message
+            $tval
+        ); //  Timeout (seconds)
+        //  Restore the error handler
+        restore_error_handler();
+
+        //  Did we connect?
+        if (false === $this->pop_conn) {
+            //  It would appear not...
+            $this->setError(array(
+                'error' => "Failed to connect to server $host on port $port",
+                'errno' => $errno,
+                'errstr' => $errstr
+            ));
+            return false;
+        }
+
+        //  Increase the stream time-out
+        stream_set_timeout($this->pop_conn, $tval, 0);
+
+        //  Get the POP3 server response
+        $pop3_response = $this->getResponse();
+        //  Check for the +OK
+        if ($this->checkResponse($pop3_response)) {
+            //  The connection is established and the POP3 server is talking
+            $this->connected = true;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Log in to the POP3 server.
+     * Does not support APOP (RFC 2828, 4949).
+     * @access public
+     * @param string $username
+     * @param string $password
+     * @return boolean
+     */
+    public function login($username = '', $password = '')
+    {
+        if (!$this->connected) {
+            $this->setError('Not connected to POP3 server');
+        }
+        if (empty($username)) {
+            $username = $this->username;
+        }
+        if (empty($password)) {
+            $password = $this->password;
+        }
+
+        // Send the Username
+        $this->sendString("USER $username" . self::CRLF);
+        $pop3_response = $this->getResponse();
+        if ($this->checkResponse($pop3_response)) {
+            // Send the Password
+            $this->sendString("PASS $password" . self::CRLF);
+            $pop3_response = $this->getResponse();
+            if ($this->checkResponse($pop3_response)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Disconnect from the POP3 server.
+     * @access public
+     */
+    public function disconnect()
+    {
+        $this->sendString('QUIT');
+        //The QUIT command may cause the daemon to exit, which will kill our connection
+        //So ignore errors here
+        try {
+            @fclose($this->pop_conn);
+        } catch (Exception $e) {
+            //Do nothing
+        };
+    }
+
+    /**
+     * Get a response from the POP3 server.
+     * $size is the maximum number of bytes to retrieve
+     * @param integer $size
+     * @return string
+     * @access protected
+     */
+    protected function getResponse($size = 128)
+    {
+        $response = fgets($this->pop_conn, $size);
+        if ($this->do_debug >= 1) {
+            echo "Server -> Client: $response";
+        }
+        return $response;
+    }
+
+    /**
+     * Send raw data to the POP3 server.
+     * @param string $string
+     * @return integer
+     * @access protected
+     */
+    protected function sendString($string)
+    {
+        if ($this->pop_conn) {
+            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+                echo "Client -> Server: $string";
+            }
+            return fwrite($this->pop_conn, $string, strlen($string));
+        }
+        return 0;
+    }
+
+    /**
+     * Checks the POP3 server response.
+     * Looks for for +OK or -ERR.
+     * @param string $string
+     * @return boolean
+     * @access protected
+     */
+    protected function checkResponse($string)
+    {
+        if (substr($string, 0, 3) !== '+OK') {
+            $this->setError(array(
+                'error' => "Server reported an error: $string",
+                'errno' => 0,
+                'errstr' => ''
+            ));
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Add an error to the internal error store.
+     * Also display debug output if it's enabled.
+     * @param $error
+     * @access protected
+     */
+    protected function setError($error)
+    {
+        $this->errors[] = $error;
+        if ($this->do_debug >= 1) {
+            echo '<pre>';
+            foreach ($this->errors as $error) {
+                print_r($error);
+            }
+            echo '</pre>';
+        }
+    }
+
+    /**
+     * Get an array of error messages, if any.
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * POP3 connection error handler.
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     * @access protected
+     */
+    protected function catchWarning($errno, $errstr, $errfile, $errline)
+    {
+        $this->setError(array(
+            'error' => "Connecting to the POP3 server raised a PHP warning: ",
+            'errno' => $errno,
+            'errstr' => $errstr,
+            'errfile' => $errfile,
+            'errline' => $errline
+        ));
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/class.smtp.php b/core/libraries/vendor/phpmailer/phpmailer/class.smtp.php
new file mode 100644
index 00000000..be6ddce4
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/class.smtp.php
@@ -0,0 +1,1276 @@
+<?php
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
+ * @package PHPMailer
+ * @author Chris Ryan
+ * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ */
+class SMTP
+{
+    /**
+     * The PHPMailer SMTP version number.
+     * @var string
+     */
+    const VERSION = '5.2.26';
+
+    /**
+     * SMTP line break constant.
+     * @var string
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * The SMTP port to use if one is not specified.
+     * @var integer
+     */
+    const DEFAULT_SMTP_PORT = 25;
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @var integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Debug level for no output
+     */
+    const DEBUG_OFF = 0;
+
+    /**
+     * Debug level to show client -> server messages
+     */
+    const DEBUG_CLIENT = 1;
+
+    /**
+     * Debug level to show client -> server and server -> client messages
+     */
+    const DEBUG_SERVER = 2;
+
+    /**
+     * Debug level to show connection status, client -> server and server -> client messages
+     */
+    const DEBUG_CONNECTION = 3;
+
+    /**
+     * Debug level to show all messages
+     */
+    const DEBUG_LOWLEVEL = 4;
+
+    /**
+     * The PHPMailer SMTP Version number.
+     * @var string
+     * @deprecated Use the `VERSION` constant instead
+     * @see SMTP::VERSION
+     */
+    public $Version = '5.2.26';
+
+    /**
+     * SMTP server port number.
+     * @var integer
+     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+     * @see SMTP::DEFAULT_SMTP_PORT
+     */
+    public $SMTP_PORT = 25;
+
+    /**
+     * SMTP reply line ending.
+     * @var string
+     * @deprecated Use the `CRLF` constant instead
+     * @see SMTP::CRLF
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug output level.
+     * Options:
+     * * self::DEBUG_OFF (`0`) No debug output, default
+     * * self::DEBUG_CLIENT (`1`) Client commands
+     * * self::DEBUG_SERVER (`2`) Client commands and server responses
+     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+     * @var integer
+     */
+    public $do_debug = self::DEBUG_OFF;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @var string|callable
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to use VERP.
+     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Info on VERP
+     * @var boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * The timeout value for connection, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     * @var integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * How long to wait for commands to complete, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @var integer
+     */
+    public $Timelimit = 300;
+
+    /**
+     * @var array Patterns to extract an SMTP transaction id from reply to a DATA command.
+     * The first capture group in each regex will be used as the ID.
+     */
+    protected $smtp_transaction_id_patterns = array(
+        'exim' => '/[0-9]{3} OK id=(.*)/',
+        'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
+        'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
+    );
+
+    /**
+     * @var string The last transaction ID issued in response to a DATA command,
+     * if one was detected
+     */
+    protected $last_smtp_transaction_id;
+
+    /**
+     * The socket for the server connection.
+     * @var resource
+     */
+    protected $smtp_conn;
+
+    /**
+     * Error information, if any, for the last SMTP command.
+     * @var array
+     */
+    protected $error = array(
+        'error' => '',
+        'detail' => '',
+        'smtp_code' => '',
+        'smtp_code_ex' => ''
+    );
+
+    /**
+     * The reply the server sent to us for HELO.
+     * If null, no HELO string has yet been received.
+     * @var string|null
+     */
+    protected $helo_rply = null;
+
+    /**
+     * The set of SMTP extensions sent in reply to EHLO command.
+     * Indexes of the array are extension names.
+     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+     * represents the server name. In case of HELO it is the only element of the array.
+     * Other values can be boolean TRUE or an array containing extension options.
+     * If null, no HELO/EHLO string has yet been received.
+     * @var array|null
+     */
+    protected $server_caps = null;
+
+    /**
+     * The most recent reply received from the server.
+     * @var string
+     */
+    protected $last_reply = '';
+
+    /**
+     * Output debugging info via a user-selected method.
+     * @see SMTP::$Debugoutput
+     * @see SMTP::$do_debug
+     * @param string $str Debug string to output
+     * @param integer $level The debug level of this message; see DEBUG_* constants
+     * @return void
+     */
+    protected function edebug($str, $level = 0)
+    {
+        if ($level > $this->do_debug) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $level);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                ) . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
+        }
+    }
+
+    /**
+     * Connect to an SMTP server.
+     * @param string $host SMTP server IP or host name
+     * @param integer $port The port number to connect to
+     * @param integer $timeout How long to wait for the connection to open
+     * @param array $options An array of options for stream_context_create()
+     * @access public
+     * @return boolean
+     */
+    public function connect($host, $port = null, $timeout = 30, $options = array())
+    {
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (is_null($streamok)) {
+            $streamok = function_exists('stream_socket_client');
+        }
+        // Clear errors to avoid confusion
+        $this->setError('');
+        // Make sure we are __not__ connected
+        if ($this->connected()) {
+            // Already connected, generate error
+            $this->setError('Already connected to a server');
+            return false;
+        }
+        if (empty($port)) {
+            $port = self::DEFAULT_SMTP_PORT;
+        }
+        // Connect to the SMTP server
+        $this->edebug(
+            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            var_export($options, true),
+            self::DEBUG_CONNECTION
+        );
+        $errno = 0;
+        $errstr = '';
+        if ($streamok) {
+            $socket_context = stream_context_create($options);
+            set_error_handler(array($this, 'errorHandler'));
+            $this->smtp_conn = stream_socket_client(
+                $host . ":" . $port,
+                $errno,
+                $errstr,
+                $timeout,
+                STREAM_CLIENT_CONNECT,
+                $socket_context
+            );
+            restore_error_handler();
+        } else {
+            //Fall back to fsockopen which should work in more places, but is missing some features
+            $this->edebug(
+                "Connection: stream_socket_client not available, falling back to fsockopen",
+                self::DEBUG_CONNECTION
+            );
+            set_error_handler(array($this, 'errorHandler'));
+            $this->smtp_conn = fsockopen(
+                $host,
+                $port,
+                $errno,
+                $errstr,
+                $timeout
+            );
+            restore_error_handler();
+        }
+        // Verify we connected properly
+        if (!is_resource($this->smtp_conn)) {
+            $this->setError(
+                'Failed to connect to server',
+                $errno,
+                $errstr
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error']
+                . ": $errstr ($errno)",
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        // SMTP server can take longer to respond, give longer timeout for first read
+        // Windows does not have support for this timeout function
+        if (substr(PHP_OS, 0, 3) != 'WIN') {
+            $max = ini_get('max_execution_time');
+            // Don't bother if unlimited
+            if ($max != 0 && $timeout > $max) {
+                @set_time_limit($timeout);
+            }
+            stream_set_timeout($this->smtp_conn, $timeout, 0);
+        }
+        // Get any announcement
+        $announce = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        return true;
+    }
+
+    /**
+     * Initiate a TLS (encrypted) session.
+     * @access public
+     * @return boolean
+     */
+    public function startTLS()
+    {
+        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+            return false;
+        }
+
+        //Allow the best TLS version(s) we can
+        $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+        //PHP 5.6.7 dropped inclusion of TLS 1.1 and 1.2 in STREAM_CRYPTO_METHOD_TLS_CLIENT
+        //so add them back in manually if we can
+        if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+        }
+
+        // Begin encrypted connection
+        set_error_handler(array($this, 'errorHandler'));
+        $crypto_ok = stream_socket_enable_crypto(
+            $this->smtp_conn,
+            true,
+            $crypto_method
+        );
+        restore_error_handler();
+        return $crypto_ok;
+    }
+
+    /**
+     * Perform SMTP authentication.
+     * Must be run after hello().
+     * @see hello()
+     * @param string $username The user name
+     * @param string $password The password
+     * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
+     * @param string $realm The auth realm for NTLM
+     * @param string $workstation The auth workstation for NTLM
+     * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth)
+     * @return bool True if successfully authenticated.* @access public
+     */
+    public function authenticate(
+        $username,
+        $password,
+        $authtype = null,
+        $realm = '',
+        $workstation = '',
+        $OAuth = null
+    ) {
+        if (!$this->server_caps) {
+            $this->setError('Authentication is not allowed before HELO/EHLO');
+            return false;
+        }
+
+        if (array_key_exists('EHLO', $this->server_caps)) {
+            // SMTP extensions are available; try to find a proper authentication method
+            if (!array_key_exists('AUTH', $this->server_caps)) {
+                $this->setError('Authentication is not allowed at this stage');
+                // 'at this stage' means that auth may be allowed after the stage changes
+                // e.g. after STARTTLS
+                return false;
+            }
+
+            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug(
+                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                self::DEBUG_LOWLEVEL
+            );
+
+            if (empty($authtype)) {
+                foreach (array('CRAM-MD5', 'LOGIN', 'PLAIN', 'NTLM', 'XOAUTH2') as $method) {
+                    if (in_array($method, $this->server_caps['AUTH'])) {
+                        $authtype = $method;
+                        break;
+                    }
+                }
+                if (empty($authtype)) {
+                    $this->setError('No supported authentication methods found');
+                    return false;
+                }
+                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+            }
+
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
+                return false;
+            }
+        } elseif (empty($authtype)) {
+            $authtype = 'LOGIN';
+        }
+        switch ($authtype) {
+            case 'PLAIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                    return false;
+                }
+                // Send encoded username and password
+                if (!$this->sendCommand(
+                    'User & Password',
+                    base64_encode("\0" . $username . "\0" . $password),
+                    235
+                )
+                ) {
+                    return false;
+                }
+                break;
+            case 'LOGIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+                    return false;
+                }
+                break;
+            case 'XOAUTH2':
+                //If the OAuth Instance is not set. Can be a case when PHPMailer is used
+                //instead of PHPMailerOAuth
+                if (is_null($OAuth)) {
+                    return false;
+                }
+                $oauth = $OAuth->getOauth64();
+
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                    return false;
+                }
+                break;
+            case 'NTLM':
+                /*
+                 * ntlm_sasl_client.php
+                 * Bundled with Permission
+                 *
+                 * How to telnet in windows:
+                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
+                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
+                 */
+                require_once 'extras/ntlm_sasl_client.php';
+                $temp = new stdClass;
+                $ntlm_client = new ntlm_sasl_client_class;
+                //Check that functions are available
+                if (!$ntlm_client->initialize($temp)) {
+                    $this->setError($temp->error);
+                    $this->edebug(
+                        'You need to enable some modules in your php.ini file: '
+                        . $this->error['error'],
+                        self::DEBUG_CLIENT
+                    );
+                    return false;
+                }
+                //msg1
+                $msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
+
+                if (!$this->sendCommand(
+                    'AUTH NTLM',
+                    'AUTH NTLM ' . base64_encode($msg1),
+                    334
+                )
+                ) {
+                    return false;
+                }
+                //Though 0 based, there is a white space after the 3 digit number
+                //msg2
+                $challenge = substr($this->last_reply, 3);
+                $challenge = base64_decode($challenge);
+                $ntlm_res = $ntlm_client->NTLMResponse(
+                    substr($challenge, 24, 8),
+                    $password
+                );
+                //msg3
+                $msg3 = $ntlm_client->typeMsg3(
+                    $ntlm_res,
+                    $username,
+                    $realm,
+                    $workstation
+                );
+                // send encoded username
+                return $this->sendCommand('Username', base64_encode($msg3), 235);
+            case 'CRAM-MD5':
+                // Start authentication
+                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                    return false;
+                }
+                // Get the challenge
+                $challenge = base64_decode(substr($this->last_reply, 4));
+
+                // Build the response
+                $response = $username . ' ' . $this->hmac($challenge, $password);
+
+                // send encoded credentials
+                return $this->sendCommand('Username', base64_encode($response), 235);
+            default:
+                $this->setError("Authentication method \"$authtype\" is not supported");
+                return false;
+        }
+        return true;
+    }
+
+    /**
+     * Calculate an MD5 HMAC hash.
+     * Works like hash_hmac('md5', $data, $key)
+     * in case that function is not available
+     * @param string $data The data to hash
+     * @param string $key The key to hash with
+     * @access protected
+     * @return string
+     */
+    protected function hmac($data, $key)
+    {
+        if (function_exists('hash_hmac')) {
+            return hash_hmac('md5', $data, $key);
+        }
+
+        // The following borrowed from
+        // http://php.net/manual/en/function.mhash.php#27225
+
+        // RFC 2104 HMAC implementation for php.
+        // Creates an md5 HMAC.
+        // Eliminates the need to install mhash to compute a HMAC
+        // by Lance Rushing
+
+        $bytelen = 64; // byte length for md5
+        if (strlen($key) > $bytelen) {
+            $key = pack('H*', md5($key));
+        }
+        $key = str_pad($key, $bytelen, chr(0x00));
+        $ipad = str_pad('', $bytelen, chr(0x36));
+        $opad = str_pad('', $bytelen, chr(0x5c));
+        $k_ipad = $key ^ $ipad;
+        $k_opad = $key ^ $opad;
+
+        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+    }
+
+    /**
+     * Check connection state.
+     * @access public
+     * @return boolean True if connected.
+     */
+    public function connected()
+    {
+        if (is_resource($this->smtp_conn)) {
+            $sock_status = stream_get_meta_data($this->smtp_conn);
+            if ($sock_status['eof']) {
+                // The socket is valid but we are not connected
+                $this->edebug(
+                    'SMTP NOTICE: EOF caught while checking if connected',
+                    self::DEBUG_CLIENT
+                );
+                $this->close();
+                return false;
+            }
+            return true; // everything looks good
+        }
+        return false;
+    }
+
+    /**
+     * Close the socket and clean up the state of the class.
+     * Don't use this function without first trying to use QUIT.
+     * @see quit()
+     * @access public
+     * @return void
+     */
+    public function close()
+    {
+        $this->setError('');
+        $this->server_caps = null;
+        $this->helo_rply = null;
+        if (is_resource($this->smtp_conn)) {
+            // close the connection and cleanup
+            fclose($this->smtp_conn);
+            $this->smtp_conn = null; //Makes for cleaner serialization
+            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+        }
+    }
+
+    /**
+     * Send an SMTP DATA command.
+     * Issues a data command and sends the msg_data to the server,
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being separated by and additional <CRLF>.
+     * Implements rfc 821: DATA <CRLF>
+     * @param string $msg_data Message data to send
+     * @access public
+     * @return boolean
+     */
+    public function data($msg_data)
+    {
+        //This will use the standard timelimit
+        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+            return false;
+        }
+
+        /* The server is ready to accept data!
+         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
+         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
+         * smaller lines to fit within the limit.
+         * We will also look for lines that start with a '.' and prepend an additional '.'.
+         * NOTE: this does not count towards line-length limit.
+         */
+
+        // Normalize line breaks before exploding
+        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
+
+        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * process all lines before a blank line as headers.
+         */
+
+        $field = substr($lines[0], 0, strpos($lines[0], ':'));
+        $in_headers = false;
+        if (!empty($field) && strpos($field, ' ') === false) {
+            $in_headers = true;
+        }
+
+        foreach ($lines as $line) {
+            $lines_out = array();
+            if ($in_headers and $line == '') {
+                $in_headers = false;
+            }
+            //Break this line up into several smaller lines if it's too long
+            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
+            while (isset($line[self::MAX_LINE_LENGTH])) {
+                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+                //so as to avoid breaking in the middle of a word
+                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+                //Deliberately matches both false and 0
+                if (!$pos) {
+                    //No nice break found, add a hard break
+                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $lines_out[] = substr($line, 0, $pos);
+                    $line = substr($line, $pos);
+                } else {
+                    //Break at the found point
+                    $lines_out[] = substr($line, 0, $pos);
+                    //Move along by the amount we dealt with
+                    $line = substr($line, $pos + 1);
+                }
+                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                if ($in_headers) {
+                    $line = "\t" . $line;
+                }
+            }
+            $lines_out[] = $line;
+
+            //Send the lines to the server
+            foreach ($lines_out as $line_out) {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.' . $line_out;
+                }
+                $this->client_send($line_out . self::CRLF);
+            }
+        }
+
+        //Message data has been sent, complete the command
+        //Increase timelimit for end of DATA command
+        $savetimelimit = $this->Timelimit;
+        $this->Timelimit = $this->Timelimit * 2;
+        $result = $this->sendCommand('DATA END', '.', 250);
+        $this->recordLastTransactionID();
+        //Restore timelimit
+        $this->Timelimit = $savetimelimit;
+        return $result;
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Used to identify the sending server to the receiving server.
+     * This makes sure that client and server are in a known state.
+     * Implements RFC 821: HELO <SP> <domain> <CRLF>
+     * and RFC 2821 EHLO.
+     * @param string $host The host name or IP to connect to
+     * @access public
+     * @return boolean
+     */
+    public function hello($host = '')
+    {
+        //Try extended hello first (RFC 2821)
+        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Low-level implementation used by hello()
+     * @see hello()
+     * @param string $hello The HELO string
+     * @param string $host The hostname to say we are
+     * @access protected
+     * @return boolean
+     */
+    protected function sendHello($hello, $host)
+    {
+        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $this->helo_rply = $this->last_reply;
+        if ($noerror) {
+            $this->parseHelloFields($hello);
+        } else {
+            $this->server_caps = null;
+        }
+        return $noerror;
+    }
+
+    /**
+     * Parse a reply to HELO/EHLO command to discover server extensions.
+     * In case of HELO, the only parameter that can be discovered is a server name.
+     * @access protected
+     * @param string $type - 'HELO' or 'EHLO'
+     */
+    protected function parseHelloFields($type)
+    {
+        $this->server_caps = array();
+        $lines = explode("\n", $this->helo_rply);
+
+        foreach ($lines as $n => $s) {
+            //First 4 chars contain response code followed by - or space
+            $s = trim(substr($s, 4));
+            if (empty($s)) {
+                continue;
+            }
+            $fields = explode(' ', $s);
+            if (!empty($fields)) {
+                if (!$n) {
+                    $name = $type;
+                    $fields = $fields[0];
+                } else {
+                    $name = array_shift($fields);
+                    switch ($name) {
+                        case 'SIZE':
+                            $fields = ($fields ? $fields[0] : 0);
+                            break;
+                        case 'AUTH':
+                            if (!is_array($fields)) {
+                                $fields = array();
+                            }
+                            break;
+                        default:
+                            $fields = true;
+                    }
+                }
+                $this->server_caps[$name] = $fields;
+            }
+        }
+    }
+
+    /**
+     * Send an SMTP MAIL command.
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command.
+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from Source address of this message
+     * @access public
+     * @return boolean
+     */
+    public function mail($from)
+    {
+        $useVerp = ($this->do_verp ? ' XVERP' : '');
+        return $this->sendCommand(
+            'MAIL FROM',
+            'MAIL FROM:<' . $from . '>' . $useVerp,
+            250
+        );
+    }
+
+    /**
+     * Send an SMTP QUIT command.
+     * Closes the socket if there is no error or the $close_on_error argument is true.
+     * Implements from rfc 821: QUIT <CRLF>
+     * @param boolean $close_on_error Should the connection close if an error occurs?
+     * @access public
+     * @return boolean
+     */
+    public function quit($close_on_error = true)
+    {
+        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+        $err = $this->error; //Save any error
+        if ($noerror or $close_on_error) {
+            $this->close();
+            $this->error = $err; //Restore any error from the quit command
+        }
+        return $noerror;
+    }
+
+    /**
+     * Send an SMTP RCPT command.
+     * Sets the TO argument to $toaddr.
+     * Returns true if the recipient was accepted false if it was rejected.
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     * @param string $address The address the message is being sent to
+     * @access public
+     * @return boolean
+     */
+    public function recipient($address)
+    {
+        return $this->sendCommand(
+            'RCPT TO',
+            'RCPT TO:<' . $address . '>',
+            array(250, 251)
+        );
+    }
+
+    /**
+     * Send an SMTP RSET command.
+     * Abort any transaction that is currently in progress.
+     * Implements rfc 821: RSET <CRLF>
+     * @access public
+     * @return boolean True on success.
+     */
+    public function reset()
+    {
+        return $this->sendCommand('RSET', 'RSET', 250);
+    }
+
+    /**
+     * Send a command to an SMTP server and check its return code.
+     * @param string $command The command name - not sent to the server
+     * @param string $commandstring The actual command to send
+     * @param integer|array $expect One or more expected integer success codes
+     * @access protected
+     * @return boolean True on success.
+     */
+    protected function sendCommand($command, $commandstring, $expect)
+    {
+        if (!$this->connected()) {
+            $this->setError("Called $command without being connected");
+            return false;
+        }
+        //Reject line breaks in all commands
+        if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
+            $this->setError("Command '$command' contained line breaks");
+            return false;
+        }
+        $this->client_send($commandstring . self::CRLF);
+
+        $this->last_reply = $this->get_lines();
+        // Fetch SMTP code and possible error code explanation
+        $matches = array();
+        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
+            $code = $matches[1];
+            $code_ex = (count($matches) > 2 ? $matches[2] : null);
+            // Cut off error code from each response line
+            $detail = preg_replace(
+                "/{$code}[ -]" .
+                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . "/m",
+                '',
+                $this->last_reply
+            );
+        } else {
+            // Fall back to simple parsing if regex fails
+            $code = substr($this->last_reply, 0, 3);
+            $code_ex = null;
+            $detail = substr($this->last_reply, 4);
+        }
+
+        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+        if (!in_array($code, (array)$expect)) {
+            $this->setError(
+                "$command command failed",
+                $detail,
+                $code,
+                $code_ex
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+
+        $this->setError('');
+        return true;
+    }
+
+    /**
+     * Send an SMTP SAML command.
+     * Starts a mail transaction from the email address specified in $from.
+     * Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from The address the message is from
+     * @access public
+     * @return boolean
+     */
+    public function sendAndMail($from)
+    {
+        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+    }
+
+    /**
+     * Send an SMTP VRFY command.
+     * @param string $name The name to verify
+     * @access public
+     * @return boolean
+     */
+    public function verify($name)
+    {
+        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
+    }
+
+    /**
+     * Send an SMTP NOOP command.
+     * Used to keep keep-alives alive, doesn't actually do anything
+     * @access public
+     * @return boolean
+     */
+    public function noop()
+    {
+        return $this->sendCommand('NOOP', 'NOOP', 250);
+    }
+
+    /**
+     * Send an SMTP TURN command.
+     * This is an optional command for SMTP that this class does not support.
+     * This method is here to make the RFC821 Definition complete for this class
+     * and _may_ be implemented in future
+     * Implements from rfc 821: TURN <CRLF>
+     * @access public
+     * @return boolean
+     */
+    public function turn()
+    {
+        $this->setError('The SMTP TURN command is not implemented');
+        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        return false;
+    }
+
+    /**
+     * Send raw data to the server.
+     * @param string $data The data to send
+     * @access public
+     * @return integer|boolean The number of bytes sent to the server or false on error
+     */
+    public function client_send($data)
+    {
+        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+        set_error_handler(array($this, 'errorHandler'));
+        $result = fwrite($this->smtp_conn, $data);
+        restore_error_handler();
+        return $result;
+    }
+
+    /**
+     * Get the latest error.
+     * @access public
+     * @return array
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Get SMTP extensions available on the server
+     * @access public
+     * @return array|null
+     */
+    public function getServerExtList()
+    {
+        return $this->server_caps;
+    }
+
+    /**
+     * A multipurpose method
+     * The method works in three ways, dependent on argument value and current state
+     *   1. HELO/EHLO was not sent - returns null and set up $this->error
+     *   2. HELO was sent
+     *     $name = 'HELO': returns server name
+     *     $name = 'EHLO': returns boolean false
+     *     $name = any string: returns null and set up $this->error
+     *   3. EHLO was sent
+     *     $name = 'HELO'|'EHLO': returns server name
+     *     $name = any string: if extension $name exists, returns boolean True
+     *       or its options. Otherwise returns boolean False
+     * In other words, one can use this method to detect 3 conditions:
+     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
+     *  - false returned: the requested feature exactly not exists
+     *  - positive value returned: the requested feature exists
+     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+     * @return mixed
+     */
+    public function getServerExt($name)
+    {
+        if (!$this->server_caps) {
+            $this->setError('No HELO/EHLO was sent');
+            return null;
+        }
+
+        // the tight logic knot ;)
+        if (!array_key_exists($name, $this->server_caps)) {
+            if ($name == 'HELO') {
+                return $this->server_caps['EHLO'];
+            }
+            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+                return false;
+            }
+            $this->setError('HELO handshake was used. Client knows nothing about server extensions');
+            return null;
+        }
+
+        return $this->server_caps[$name];
+    }
+
+    /**
+     * Get the last reply from the server.
+     * @access public
+     * @return string
+     */
+    public function getLastReply()
+    {
+        return $this->last_reply;
+    }
+
+    /**
+     * Read the SMTP server's response.
+     * Either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     * @access protected
+     * @return string
+     */
+    protected function get_lines()
+    {
+        // If the connection is bad, give up straight away
+        if (!is_resource($this->smtp_conn)) {
+            return '';
+        }
+        $data = '';
+        $endtime = 0;
+        stream_set_timeout($this->smtp_conn, $this->Timeout);
+        if ($this->Timelimit > 0) {
+            $endtime = time() + $this->Timelimit;
+        }
+        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+            $str = @fgets($this->smtp_conn, 515);
+            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+            $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
+            $data .= $str;
+            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            // or 4th character is a space, we are done reading, break the loop,
+            // string array access is a micro-optimisation over strlen
+            if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) {
+                break;
+            }
+            // Timed-out? Log and break
+            $info = stream_get_meta_data($this->smtp_conn);
+            if ($info['timed_out']) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+            // Now check if reads took too long
+            if ($endtime and time() > $endtime) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timelimit reached (' .
+                    $this->Timelimit . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Enable or disable VERP address generation.
+     * @param boolean $enabled
+     */
+    public function setVerp($enabled = false)
+    {
+        $this->do_verp = $enabled;
+    }
+
+    /**
+     * Get VERP address generation mode.
+     * @return boolean
+     */
+    public function getVerp()
+    {
+        return $this->do_verp;
+    }
+
+    /**
+     * Set error messages and codes.
+     * @param string $message The error message
+     * @param string $detail Further detail on the error
+     * @param string $smtp_code An associated SMTP error code
+     * @param string $smtp_code_ex Extended SMTP code
+     */
+    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
+    {
+        $this->error = array(
+            'error' => $message,
+            'detail' => $detail,
+            'smtp_code' => $smtp_code,
+            'smtp_code_ex' => $smtp_code_ex
+        );
+    }
+
+    /**
+     * Set debug output method.
+     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+     */
+    public function setDebugOutput($method = 'echo')
+    {
+        $this->Debugoutput = $method;
+    }
+
+    /**
+     * Get debug output method.
+     * @return string
+     */
+    public function getDebugOutput()
+    {
+        return $this->Debugoutput;
+    }
+
+    /**
+     * Set debug output level.
+     * @param integer $level
+     */
+    public function setDebugLevel($level = 0)
+    {
+        $this->do_debug = $level;
+    }
+
+    /**
+     * Get debug output level.
+     * @return integer
+     */
+    public function getDebugLevel()
+    {
+        return $this->do_debug;
+    }
+
+    /**
+     * Set SMTP timeout.
+     * @param integer $timeout
+     */
+    public function setTimeout($timeout = 0)
+    {
+        $this->Timeout = $timeout;
+    }
+
+    /**
+     * Get SMTP timeout.
+     * @return integer
+     */
+    public function getTimeout()
+    {
+        return $this->Timeout;
+    }
+
+    /**
+     * Reports an error number and string.
+     * @param integer $errno The error number returned by PHP.
+     * @param string $errmsg The error message returned by PHP.
+     * @param string $errfile The file the error occurred in
+     * @param integer $errline The line number the error occurred on
+     */
+    protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0)
+    {
+        $notice = 'Connection failed.';
+        $this->setError(
+            $notice,
+            $errno,
+            $errmsg
+        );
+        $this->edebug(
+            $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]",
+            self::DEBUG_CONNECTION
+        );
+    }
+
+    /**
+     * Extract and return the ID of the last SMTP transaction based on
+     * a list of patterns provided in SMTP::$smtp_transaction_id_patterns.
+     * Relies on the host providing the ID in response to a DATA command.
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     */
+    protected function recordLastTransactionID()
+    {
+        $reply = $this->getLastReply();
+
+        if (empty($reply)) {
+            $this->last_smtp_transaction_id = null;
+        } else {
+            $this->last_smtp_transaction_id = false;
+            foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
+                if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
+                    $this->last_smtp_transaction_id = $matches[1];
+                }
+            }
+        }
+
+        return $this->last_smtp_transaction_id;
+    }
+
+    /**
+     * Get the queue/transaction ID of the last SMTP transaction
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     * @see recordLastTransactionID()
+     */
+    public function getLastTransactionID()
+    {
+        return $this->last_smtp_transaction_id;
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/composer.lock b/core/libraries/vendor/phpmailer/phpmailer/composer.lock
new file mode 100644
index 00000000..9808f283
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/composer.lock
@@ -0,0 +1,3593 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "7e4b1bef833056eed0df39fad5399d7a",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "cilex/cilex",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Cilex/Cilex.git",
+                "reference": "7acd965a609a56d0345e8b6071c261fbdb926cb5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Cilex/Cilex/zipball/7acd965a609a56d0345e8b6071c261fbdb926cb5",
+                "reference": "7acd965a609a56d0345e8b6071c261fbdb926cb5",
+                "shasum": ""
+            },
+            "require": {
+                "cilex/console-service-provider": "1.*",
+                "php": ">=5.3.3",
+                "pimple/pimple": "~1.0",
+                "symfony/finder": "~2.1",
+                "symfony/process": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "symfony/validator": "~2.1"
+            },
+            "suggest": {
+                "monolog/monolog": ">=1.0.0",
+                "symfony/validator": ">=1.0.0",
+                "symfony/yaml": ">=1.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Cilex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "description": "The PHP micro-framework for Command line tools based on the Symfony2 Components",
+            "homepage": "http://cilex.github.com",
+            "keywords": [
+                "cli",
+                "microframework"
+            ],
+            "time": "2014-03-29T14:03:13+00:00"
+        },
+        {
+            "name": "cilex/console-service-provider",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Cilex/console-service-provider.git",
+                "reference": "25ee3d1875243d38e1a3448ff94bdf944f70d24e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Cilex/console-service-provider/zipball/25ee3d1875243d38e1a3448ff94bdf944f70d24e",
+                "reference": "25ee3d1875243d38e1a3448ff94bdf944f70d24e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "pimple/pimple": "1.*@dev",
+                "symfony/console": "~2.1"
+            },
+            "require-dev": {
+                "cilex/cilex": "1.*@dev",
+                "silex/silex": "1.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Cilex\\Provider\\Console": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "description": "Console Service Provider",
+            "keywords": [
+                "cilex",
+                "console",
+                "pimple",
+                "service-provider",
+                "silex"
+            ],
+            "time": "2012-12-19T10:50:58+00:00"
+        },
+        {
+            "name": "doctrine/annotations",
+            "version": "v1.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Annotations\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2015-08-31T12:32:49+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2014-09-09T13:34:57+00:00"
+        },
+        {
+            "name": "erusev/parsedown",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Parsedown": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Emanuil Rusev",
+                    "email": "hello@erusev.com",
+                    "homepage": "http://erusev.com"
+                }
+            ],
+            "description": "Parser for Markdown.",
+            "homepage": "http://parsedown.org",
+            "keywords": [
+                "markdown",
+                "parser"
+            ],
+            "time": "2016-11-02T15:56:58+00:00"
+        },
+        {
+            "name": "herrera-io/json",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kherge-php/json.git",
+                "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kherge-php/json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1",
+                "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "justinrainbow/json-schema": ">=1.0,<2.0-dev",
+                "php": ">=5.3.3",
+                "seld/jsonlint": ">=1.0,<2.0-dev"
+            },
+            "require-dev": {
+                "herrera-io/phpunit-test-case": "1.*",
+                "mikey179/vfsstream": "1.1.0",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/lib/json_version.php"
+                ],
+                "psr-0": {
+                    "Herrera\\Json": "src/lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Herrera",
+                    "email": "kevin@herrera.io",
+                    "homepage": "http://kevin.herrera.io/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A library for simplifying JSON linting and validation.",
+            "homepage": "http://herrera-io.github.com/php-json",
+            "keywords": [
+                "json",
+                "lint",
+                "schema",
+                "validate"
+            ],
+            "abandoned": "kherge/json",
+            "time": "2013-10-30T16:51:34+00:00"
+        },
+        {
+            "name": "herrera-io/phar-update",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kherge-abandoned/php-phar-update.git",
+                "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kherge-abandoned/php-phar-update/zipball/00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b",
+                "reference": "00a79e1d5b8cf3c080a2e3becf1ddf7a7fea025b",
+                "shasum": ""
+            },
+            "require": {
+                "herrera-io/json": "1.*",
+                "kherge/version": "1.*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "herrera-io/phpunit-test-case": "1.*",
+                "mikey179/vfsstream": "1.1.0",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/lib/constants.php"
+                ],
+                "psr-0": {
+                    "Herrera\\Phar\\Update": "src/lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Herrera",
+                    "email": "kevin@herrera.io",
+                    "homepage": "http://kevin.herrera.io/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A library for self-updating Phars.",
+            "homepage": "http://herrera-io.github.com/php-phar-update",
+            "keywords": [
+                "phar",
+                "update"
+            ],
+            "abandoned": true,
+            "time": "2013-10-30T17:23:01+00:00"
+        },
+        {
+            "name": "jms/metadata",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/metadata.git",
+                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab",
+                "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.0",
+                "symfony/cache": "~3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Metadata\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Class/method/property metadata management in PHP",
+            "keywords": [
+                "annotations",
+                "metadata",
+                "xml",
+                "yaml"
+            ],
+            "time": "2016-12-05T10:18:33+00:00"
+        },
+        {
+            "name": "jms/parser-lib",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/parser-lib.git",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": ">=0.9,<2.0-dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "description": "A library for easily creating recursive-descent parsers.",
+            "time": "2012-11-18T18:08:43+00:00"
+        },
+        {
+            "name": "jms/serializer",
+            "version": "0.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/serializer.git",
+                "reference": "c8a171357ca92b6706e395c757f334902d430ea9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9",
+                "reference": "c8a171357ca92b6706e395c757f334902d430ea9",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "1.*",
+                "jms/metadata": "~1.1",
+                "jms/parser-lib": "1.*",
+                "php": ">=5.3.2",
+                "phpcollection/phpcollection": "~0.1"
+            },
+            "require-dev": {
+                "doctrine/orm": "~2.1",
+                "doctrine/phpcr-odm": "~1.0.1",
+                "jackalope/jackalope-doctrine-dbal": "1.0.*",
+                "propel/propel1": "~1.7",
+                "symfony/filesystem": "2.*",
+                "symfony/form": "~2.1",
+                "symfony/translation": "~2.0",
+                "symfony/validator": "~2.0",
+                "symfony/yaml": "2.*",
+                "twig/twig": ">=1.8,<2.0-dev"
+            },
+            "suggest": {
+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.15-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\Serializer": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com",
+                    "homepage": "https://github.com/schmittjoh",
+                    "role": "Developer of wrapped JMSSerializerBundle"
+                }
+            ],
+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
+            "homepage": "http://jmsyst.com/libs/serializer",
+            "keywords": [
+                "deserialization",
+                "jaxb",
+                "json",
+                "serialization",
+                "xml"
+            ],
+            "time": "2014-03-18T08:39:00+00:00"
+        },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/cc84765fb7317f6b07bd8ac78364747f95b86341",
+                "reference": "cc84765fb7317f6b07bd8ac78364747f95b86341",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.29"
+            },
+            "require-dev": {
+                "json-schema/json-schema-test-suite": "1.1.0",
+                "phpdocumentor/phpdocumentor": "~2",
+                "phpunit/phpunit": "~3.7"
+            },
+            "bin": [
+                "bin/validate-json"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JsonSchema\\": "src/JsonSchema/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "seroscho@googlemail.com"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "time": "2016-01-25T15:43:01+00:00"
+        },
+        {
+            "name": "kherge/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kherge-abandoned/Version.git",
+                "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kherge-abandoned/Version/zipball/f07cf83f8ce533be8f93d2893d96d674bbeb7e30",
+                "reference": "f07cf83f8ce533be8f93d2893d96d674bbeb7e30",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "KevinGH\\Version": "src/lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kevin Herrera",
+                    "email": "me@kevingh.com",
+                    "homepage": "http://www.kevingh.com/"
+                }
+            ],
+            "description": "A parsing and comparison library for semantic versioning.",
+            "homepage": "http://github.com/kherge/Version",
+            "abandoned": true,
+            "time": "2012-08-16T17:13:03+00:00"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "1.22.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
+                "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/log": "~1.0"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+                "doctrine/couchdb": "~1.0@dev",
+                "graylog2/gelf-php": "~1.0",
+                "jakub-onderka/php-parallel-lint": "0.9",
+                "php-amqplib/php-amqplib": "~2.4",
+                "php-console/php-console": "^3.1.3",
+                "phpunit/phpunit": "~4.5",
+                "phpunit/phpunit-mock-objects": "2.3.0",
+                "ruflin/elastica": ">=0.90 <3.0",
+                "sentry/sentry": "^0.13",
+                "swiftmailer/swiftmailer": "~5.3"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-mongo": "Allow sending log messages to a MongoDB server",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "php-console/php-console": "Allow sending log messages to Google Chrome",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+                "sentry/sentry": "Allow sending log messages to a Sentry server"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "http://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3"
+            ],
+            "time": "2017-03-13T07:08:03+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
+                "reference": "f78af2c9c86107aa1a34cd1dbb5bbe9eeb0d9f51",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "lib/bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2015-09-19T14:15:08+00:00"
+        },
+        {
+            "name": "phpcollection/phpcollection",
+            "version": "0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-collection.git",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": "1.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpCollection": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "General-Purpose Collection Library for PHP",
+            "keywords": [
+                "collection",
+                "list",
+                "map",
+                "sequence",
+                "set"
+            ],
+            "time": "2015-05-17T12:39:23+00:00"
+        },
+        {
+            "name": "phpdocumentor/fileset",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/Fileset.git",
+                "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/Fileset/zipball/bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
+                "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/finder": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Fileset component for collecting a set of files given directories and file paths",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "files",
+                "fileset",
+                "phpdoc"
+            ],
+            "time": "2013-08-06T21:07:42+00:00"
+        },
+        {
+            "name": "phpdocumentor/graphviz",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/GraphViz.git",
+                "reference": "a906a90a9f230535f25ea31caf81b2323956283f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/GraphViz/zipball/a906a90a9f230535f25ea31caf81b2323956283f",
+                "reference": "a906a90a9f230535f25ea31caf81b2323956283f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2016-02-02T13:00:08+00:00"
+        },
+        {
+            "name": "phpdocumentor/phpdocumentor",
+            "version": "v2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/phpDocumentor2.git",
+                "reference": "be607da0eef9b9249c43c5b4820d25d631c73667"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor2/zipball/be607da0eef9b9249c43c5b4820d25d631c73667",
+                "reference": "be607da0eef9b9249c43c5b4820d25d631c73667",
+                "shasum": ""
+            },
+            "require": {
+                "cilex/cilex": "~1.0",
+                "erusev/parsedown": "~1.0",
+                "herrera-io/phar-update": "1.0.3",
+                "jms/serializer": ">=0.12",
+                "monolog/monolog": "~1.6",
+                "php": ">=5.3.3",
+                "phpdocumentor/fileset": "~1.0",
+                "phpdocumentor/graphviz": "~1.0",
+                "phpdocumentor/reflection": "^3.0",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "symfony/config": "~2.3",
+                "symfony/console": "~2.3",
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/process": "~2.0",
+                "symfony/stopwatch": "~2.3",
+                "symfony/validator": "~2.2",
+                "twig/twig": "~1.3",
+                "zendframework/zend-cache": "~2.1",
+                "zendframework/zend-config": "~2.1",
+                "zendframework/zend-filter": "~2.1",
+                "zendframework/zend-i18n": "~2.1",
+                "zendframework/zend-serializer": "~2.1",
+                "zendframework/zend-servicemanager": "~2.1",
+                "zendframework/zend-stdlib": "~2.1",
+                "zetacomponents/document": ">=1.3.1"
+            },
+            "require-dev": {
+                "behat/behat": "~3.0",
+                "mikey179/vfsstream": "~1.2",
+                "mockery/mockery": "~0.9@dev",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.4",
+                "symfony/expression-language": "~2.4"
+            },
+            "suggest": {
+                "ext-twig": "Enabling the twig extension improves the generation of twig based templates.",
+                "ext-xslcache": "Enabling the XSLCache extension improves the generation of xml based templates."
+            },
+            "bin": [
+                "bin/phpdoc.php",
+                "bin/phpdoc"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "2.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit/"
+                    ],
+                    "Cilex\\Provider": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Documentation Generator for PHP",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "api",
+                "application",
+                "dga",
+                "documentation",
+                "phpdoc"
+            ],
+            "time": "2016-05-22T09:50:56+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/Reflection.git",
+                "reference": "793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d",
+                "reference": "793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^1.0",
+                "php": ">=5.3.3",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "psr/log": "~1.0"
+            },
+            "require-dev": {
+                "behat/behat": "~2.4",
+                "mockery/mockery": "~0.8",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/",
+                        "tests/unit/",
+                        "tests/mocks/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Reflection library to do Static Analysis for PHP Projects",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2016-05-21T08:42:32+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03T12:10:50+00:00"
+        },
+        {
+            "name": "phpoption/phpoption",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-option.git",
+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpOption\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Option Type for PHP",
+            "keywords": [
+                "language",
+                "option",
+                "php",
+                "type"
+            ],
+            "time": "2015-07-25T16:39:46+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-02T20:05:34+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06T15:47:00+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03T07:40:28+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-02-27T10:12:30+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.35",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/791b1a67c25af50e230f841ee7a9c6eba507dc87",
+                "reference": "791b1a67c25af50e230f841ee7a9c6eba507dc87",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.2.2",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-02-06T05:18:07+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02T06:51:40+00:00"
+        },
+        {
+            "name": "pimple/pimple",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silexphp/Pimple.git",
+                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
+            "homepage": "http://pimple.sensiolabs.org",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "time": "2013-11-22T08:30:29+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2016-10-10T12:19:37+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08T07:14:41+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-08-18T05:49:44+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17T09:04:28+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-10-03T07:41:43+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21T13:59:46+00:00"
+        },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/791f8c594f300d246cdf01c6b3e1e19611e301d8",
+                "reference": "791f8c594f300d246cdf01c6b3e1e19611e301d8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "time": "2017-03-06T16:42:24+00:00"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "06ce6bb46c24963ec09323da45d0f4f85d3cecd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/06ce6bb46c24963ec09323da45d0f4f85d3cecd2",
+                "reference": "06ce6bb46c24963ec09323da45d0f4f85d3cecd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/filesystem": "~2.3|~3.0.0"
+            },
+            "require-dev": {
+                "symfony/yaml": "~2.7|~3.0.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-01T18:13:50+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "81508e6fac4476771275a3f4f53c3fee9b956bfa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/81508e6fac4476771275a3f4f53c3fee9b956bfa",
+                "reference": "81508e6fac4476771275a3f4f53c3fee9b956bfa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/debug": "^2.7.2|~3.0.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/process": "~2.1|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-04T11:00:12+00:00"
+        },
+        {
+            "name": "symfony/debug",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/e90099a2958d4833a02d05b504cc06e1c234abcc",
+                "reference": "e90099a2958d4833a02d05b504cc06e1c234abcc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/class-loader": "~2.2|~3.0.0",
+                "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18T19:13:35+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "bb4ec47e8e109c1c1172145732d0aa468d967cd0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bb4ec47e8e109c1c1172145732d0aa468d967cd0",
+                "reference": "bb4ec47e8e109c1c1172145732d0aa468d967cd0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "^2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.6|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-21T08:33:48+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "e542d4765092d22552b1bf01ddccfb01d98ee325"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e542d4765092d22552b1bf01ddccfb01d98ee325",
+                "reference": "e542d4765092d22552b1bf01ddccfb01d98ee325",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18T17:06:33+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "5fc4b5cab38b9d28be318fcffd8066988e7d9451"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5fc4b5cab38b9d28be318fcffd8066988e7d9451",
+                "reference": "5fc4b5cab38b9d28be318fcffd8066988e7d9451",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-21T08:33:48+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14T01:06:16+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "41336b20b52f5fd5b42a227e394e673c8071118f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/41336b20b52f5fd5b42a227e394e673c8071118f",
+                "reference": "41336b20b52f5fd5b42a227e394e673c8071118f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-04T12:20:59+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9e4369666d02ee9b8830da878b7f6a769eb96f4b",
+                "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Stopwatch Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18T17:06:33+00:00"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation.git",
+                "reference": "b538355bc99db2ec7cc35284ec76d92ae7d1d256"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b538355bc99db2ec7cc35284ec76d92ae7d1d256",
+                "reference": "b538355bc99db2ec7cc35284ec76d92ae7d1d256",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/config": "<2.7"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.8",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+                "symfony/yaml": "~2.2|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Translation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Translation Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-04T12:20:59+00:00"
+        },
+        {
+            "name": "symfony/validator",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/validator.git",
+                "reference": "8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63",
+                "reference": "8d4bfa7ec24e70ebc28d0cea5f2702d3f1257a63",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/translation": "~2.4|~3.0.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "doctrine/cache": "~1.0",
+                "egulias/email-validator": "^1.2.1",
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/http-foundation": "~2.3|~3.0.0",
+                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
+                "symfony/property-access": "~2.3|~3.0.0",
+                "symfony/yaml": "^2.0.5|~3.0.0"
+            },
+            "suggest": {
+                "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+                "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+                "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "symfony/config": "",
+                "symfony/expression-language": "For using the 2.4 Expression validator",
+                "symfony/http-foundation": "",
+                "symfony/intl": "",
+                "symfony/property-access": "For using the 2.4 Validator API",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Validator\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Validator Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-28T02:24:56+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.8.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d",
+                "reference": "2a7bab3c16f6f452c47818fdd08f3b1e49ffcf7d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-01T18:13:50+00:00"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "9935b662e24d6e634da88901ab534cc12e8c728f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9935b662e24d6e634da88901ab534cc12e8c728f",
+                "reference": "9935b662e24d6e634da88901ab534cc12e8c728f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.7"
+            },
+            "require-dev": {
+                "psr/container": "^1.0",
+                "symfony/debug": "~2.7",
+                "symfony/phpunit-bridge": "~3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.32-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2017-02-27T00:07:03+00:00"
+        },
+        {
+            "name": "zendframework/zend-cache",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-cache.git",
+                "reference": "5999e5a03f7dcf82abbbe67eea74da641f959684"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-cache/zipball/5999e5a03f7dcf82abbbe67eea74da641f959684",
+                "reference": "5999e5a03f7dcf82abbbe67eea74da641f959684",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-serializer": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-session": "~2.5"
+            },
+            "suggest": {
+                "ext-apc": "APC >= 3.1.6 to use the APC storage adapter",
+                "ext-dba": "DBA, to use the DBA storage adapter",
+                "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",
+                "ext-mongo": "Mongo, to use MongoDb storage adapter",
+                "ext-wincache": "WinCache, to use the WinCache storage adapter",
+                "mongofill/mongofill": "Alternative to ext-mongo - a pure PHP implementation designed as a drop in replacement",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-session": "Zend\\Session component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a generic way to cache any data",
+            "homepage": "https://github.com/zendframework/zend-cache",
+            "keywords": [
+                "cache",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:31:59+00:00"
+        },
+        {
+            "name": "zendframework/zend-config",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-config.git",
+                "reference": "ec49b1df1bdd9772df09dc2f612fbfc279bf4c27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-config/zipball/ec49b1df1bdd9772df09dc2f612fbfc279bf4c27",
+                "reference": "ec49b1df1bdd9772df09dc2f612fbfc279bf4c27",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-i18n": "~2.5",
+                "zendframework/zend-json": "~2.5",
+                "zendframework/zend-mvc": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Config\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+            "homepage": "https://github.com/zendframework/zend-config",
+            "keywords": [
+                "config",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:00+00:00"
+        },
+        {
+            "name": "zendframework/zend-eventmanager",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-eventmanager.git",
+                "reference": "d94a16039144936f107f906896349900fd634443"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d94a16039144936f107f906896349900fd634443",
+                "reference": "d94a16039144936f107f906896349900fd634443",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\EventManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-eventmanager",
+            "keywords": [
+                "eventmanager",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:01+00:00"
+        },
+        {
+            "name": "zendframework/zend-filter",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-filter.git",
+                "reference": "93e6990a198e6cdd811064083acac4693f4b29ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/93e6990a198e6cdd811064083acac4693f4b29ae",
+                "reference": "93e6990a198e6cdd811064083acac4693f4b29ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-crypt": "~2.5",
+                "zendframework/zend-i18n": "~2.5",
+                "zendframework/zend-loader": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5",
+                "zendframework/zend-uri": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-crypt": "Zend\\Crypt component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Filter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a set of commonly needed data filters",
+            "homepage": "https://github.com/zendframework/zend-filter",
+            "keywords": [
+                "filter",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:01+00:00"
+        },
+        {
+            "name": "zendframework/zend-i18n",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-i18n.git",
+                "reference": "509271eb7947e4aabebfc376104179cffea42696"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/509271eb7947e4aabebfc376104179cffea42696",
+                "reference": "509271eb7947e4aabebfc376104179cffea42696",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-cache": "~2.5",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5",
+                "zendframework/zend-validator": "~2.5",
+                "zendframework/zend-view": "~2.5"
+            },
+            "suggest": {
+                "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
+                "zendframework/zend-cache": "Zend\\Cache component",
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
+                "zendframework/zend-filter": "You should install this package to use the provided filters",
+                "zendframework/zend-resources": "Translation resources",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-validator": "You should install this package to use the provided validators",
+                "zendframework/zend-view": "You should install this package to use the provided view helpers"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\I18n\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-i18n",
+            "keywords": [
+                "i18n",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:01+00:00"
+        },
+        {
+            "name": "zendframework/zend-json",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-json.git",
+                "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-json/zipball/c74eaf17d2dd37dc1e964be8dfde05706a821ebc",
+                "reference": "c74eaf17d2dd37dc1e964be8dfde05706a821ebc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-http": "~2.5",
+                "zendframework/zend-server": "~2.5",
+                "zendframework/zendxml": "~1.0"
+            },
+            "suggest": {
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-server": "Zend\\Server component",
+                "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Json\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "homepage": "https://github.com/zendframework/zend-json",
+            "keywords": [
+                "json",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:01+00:00"
+        },
+        {
+            "name": "zendframework/zend-math",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-math.git",
+                "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-math/zipball/9f02a1ac4d3374d3332c80f9215deec9c71558fc",
+                "reference": "9f02a1ac4d3374d3332c80f9215deec9c71558fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "ircmaxell/random-lib": "~1.1",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "ext-bcmath": "If using the bcmath functionality",
+                "ext-gmp": "If using the gmp functionality",
+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Math\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-math",
+            "keywords": [
+                "math",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:02+00:00"
+        },
+        {
+            "name": "zendframework/zend-serializer",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-serializer.git",
+                "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/b7208eb17dc4a4fb3a660b85e6c4af035eeed40c",
+                "reference": "b7208eb17dc4a4fb3a660b85e6c4af035eeed40c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-json": "~2.5",
+                "zendframework/zend-math": "~2.5",
+                "zendframework/zend-stdlib": "~2.5"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Serializer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "homepage": "https://github.com/zendframework/zend-serializer",
+            "keywords": [
+                "serializer",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:02+00:00"
+        },
+        {
+            "name": "zendframework/zend-servicemanager",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-servicemanager.git",
+                "reference": "3b22c403e351d92526c642cba0bd810bc22e1c56"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/3b22c403e351d92526c642cba0bd810bc22e1c56",
+                "reference": "3b22c403e351d92526c642cba0bd810bc22e1c56",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-di": "~2.5",
+                "zendframework/zend-mvc": "~2.5"
+            },
+            "suggest": {
+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
+                "zendframework/zend-di": "Zend\\Di component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\ServiceManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-servicemanager",
+            "keywords": [
+                "servicemanager",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:02+00:00"
+        },
+        {
+            "name": "zendframework/zend-stdlib",
+            "version": "2.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-stdlib.git",
+                "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cc8e90a60dd5d44b9730b77d07b97550091da1ae",
+                "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0",
+                "zendframework/zend-config": "~2.5",
+                "zendframework/zend-eventmanager": "~2.5",
+                "zendframework/zend-filter": "~2.5",
+                "zendframework/zend-inputfilter": "~2.5",
+                "zendframework/zend-serializer": "~2.5",
+                "zendframework/zend-servicemanager": "~2.5"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+                "zendframework/zend-filter": "To support naming strategy hydrator usage",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev",
+                    "dev-develop": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Stdlib\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://github.com/zendframework/zend-stdlib",
+            "keywords": [
+                "stdlib",
+                "zf2"
+            ],
+            "time": "2015-06-03T15:32:03+00:00"
+        },
+        {
+            "name": "zetacomponents/base",
+            "version": "1.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zetacomponents/Base.git",
+                "reference": "f20df24e8de3e48b6b69b2503f917e457281e687"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zetacomponents/Base/zipball/f20df24e8de3e48b6b69b2503f917e457281e687",
+                "reference": "f20df24e8de3e48b6b69b2503f917e457281e687",
+                "shasum": ""
+            },
+            "require-dev": {
+                "zetacomponents/unit-test": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sergey Alexeev"
+                },
+                {
+                    "name": "Sebastian Bergmann"
+                },
+                {
+                    "name": "Jan Borsodi"
+                },
+                {
+                    "name": "Raymond Bosman"
+                },
+                {
+                    "name": "Frederik Holljen"
+                },
+                {
+                    "name": "Kore Nordmann"
+                },
+                {
+                    "name": "Derick Rethans"
+                },
+                {
+                    "name": "Vadym Savchuk"
+                },
+                {
+                    "name": "Tobias Schlitt"
+                },
+                {
+                    "name": "Alexandru Stanoi"
+                }
+            ],
+            "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
+            "homepage": "https://github.com/zetacomponents",
+            "time": "2014-09-19T03:28:34+00:00"
+        },
+        {
+            "name": "zetacomponents/document",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zetacomponents/Document.git",
+                "reference": "688abfde573cf3fe0730f82538fbd7aa9fc95bc8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zetacomponents/Document/zipball/688abfde573cf3fe0730f82538fbd7aa9fc95bc8",
+                "reference": "688abfde573cf3fe0730f82538fbd7aa9fc95bc8",
+                "shasum": ""
+            },
+            "require": {
+                "zetacomponents/base": "*"
+            },
+            "require-dev": {
+                "zetacomponents/unit-test": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann"
+                },
+                {
+                    "name": "Kore Nordmann"
+                },
+                {
+                    "name": "Derick Rethans"
+                },
+                {
+                    "name": "Tobias Schlitt"
+                },
+                {
+                    "name": "Alexandru Stanoi"
+                }
+            ],
+            "description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
+            "homepage": "https://github.com/zetacomponents",
+            "time": "2013-12-19T11:40:00+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.0.0"
+    },
+    "platform-dev": []
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/extras/EasyPeasyICS.php b/core/libraries/vendor/phpmailer/phpmailer/extras/EasyPeasyICS.php
new file mode 100644
index 00000000..d8bfcfae
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/extras/EasyPeasyICS.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * EasyPeasyICS Simple ICS/vCal data generator.
+ * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ * @author Manuel Reinhard <manu@sprain.ch>
+ *
+ * Built with inspiration from
+ * http://stackoverflow.com/questions/1463480/how-can-i-use-php-to-dynamically-publish-an-ical-file-to-be-read-by-google-calend/1464355#1464355
+ * History:
+ * 2010/12/17 - Manuel Reinhard - when it all started
+ * 2014 PHPMailer project becomes maintainer
+ */
+
+/**
+ * Class EasyPeasyICS.
+ * Simple ICS data generator
+ * @package phpmailer
+ * @subpackage easypeasyics
+ */
+class EasyPeasyICS
+{
+    /**
+     * The name of the calendar
+     * @var string
+     */
+    protected $calendarName;
+    /**
+     * The array of events to add to this calendar
+     * @var array
+     */
+    protected $events = array();
+
+    /**
+     * Constructor
+     * @param string $calendarName
+     */
+    public function __construct($calendarName = "")
+    {
+        $this->calendarName = $calendarName;
+    }
+
+    /**
+     * Add an event to this calendar.
+     * @param string $start The start date and time as a unix timestamp
+     * @param string $end The end date and time as a unix timestamp
+     * @param string $summary A summary or title for the event
+     * @param string $description A description of the event
+     * @param string $url A URL for the event
+     * @param string $uid A unique identifier for the event - generated automatically if not provided
+     * @return array An array of event details, including any generated UID
+     */
+    public function addEvent($start, $end, $summary = '', $description = '', $url = '', $uid = '')
+    {
+        if (empty($uid)) {
+            $uid = md5(uniqid(mt_rand(), true)) . '@EasyPeasyICS';
+        }
+        $event = array(
+            'start' => gmdate('Ymd', $start) . 'T' . gmdate('His', $start) . 'Z',
+            'end' => gmdate('Ymd', $end) . 'T' . gmdate('His', $end) . 'Z',
+            'summary' => $summary,
+            'description' => $description,
+            'url' => $url,
+            'uid' => $uid
+        );
+        $this->events[] = $event;
+        return $event;
+    }
+
+    /**
+     * @return array Get the array of events.
+     */
+    public function getEvents()
+    {
+        return $this->events;
+    }
+
+    /**
+     * Clear all events.
+     */
+    public function clearEvents()
+    {
+        $this->events = array();
+    }
+
+    /**
+     * Get the name of the calendar.
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->calendarName;
+    }
+
+    /**
+     * Set the name of the calendar.
+     * @param $name
+     */
+    public function setName($name)
+    {
+        $this->calendarName = $name;
+    }
+
+    /**
+     * Render and optionally output a vcal string.
+     * @param bool $output Whether to output the calendar data directly (the default).
+     * @return string The complete rendered vlal
+     */
+    public function render($output = true)
+    {
+        //Add header
+        $ics = 'BEGIN:VCALENDAR
+METHOD:PUBLISH
+VERSION:2.0
+X-WR-CALNAME:' . $this->calendarName . '
+PRODID:-//hacksw/handcal//NONSGML v1.0//EN';
+
+        //Add events
+        foreach ($this->events as $event) {
+            $ics .= '
+BEGIN:VEVENT
+UID:' . $event['uid'] . '
+DTSTAMP:' . gmdate('Ymd') . 'T' . gmdate('His') . 'Z
+DTSTART:' . $event['start'] . '
+DTEND:' . $event['end'] . '
+SUMMARY:' . str_replace("\n", "\\n", $event['summary']) . '
+DESCRIPTION:' . str_replace("\n", "\\n", $event['description']) . '
+URL;VALUE=URI:' . $event['url'] . '
+END:VEVENT';
+        }
+
+        //Add footer
+        $ics .= '
+END:VCALENDAR';
+
+        if ($output) {
+            //Output
+            $filename = $this->calendarName;
+            //Filename needs quoting if it contains spaces
+            if (strpos($filename, ' ') !== false) {
+                $filename = '"'.$filename.'"';
+            }
+            header('Content-type: text/calendar; charset=utf-8');
+            header('Content-Disposition: inline; filename=' . $filename . '.ics');
+            echo $ics;
+        }
+        return $ics;
+    }
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/extras/htmlfilter.php b/core/libraries/vendor/phpmailer/phpmailer/extras/htmlfilter.php
new file mode 100644
index 00000000..0c55ddb7
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/extras/htmlfilter.php
@@ -0,0 +1,1159 @@
+<?php
+/**
+ * htmlfilter.inc
+ * ---------------
+ * This set of functions allows you to filter html in order to remove
+ * any malicious tags from it. Useful in cases when you need to filter
+ * user input for any cross-site-scripting attempts.
+ *
+ * Copyright (C) 2002-2004 by Duke University
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301  USA
+ *
+ * @Author	Konstantin Riabitsev <icon@linux.duke.edu>
+ * @Author  Jim Jagielski <jim@jaguNET.com / jimjag@gmail.com>
+ * @Version 1.1 ($Date$)
+ */
+
+/**
+ * This function returns the final tag out of the tag name, an array
+ * of attributes, and the type of the tag. This function is called by
+ * tln_sanitize internally.
+ *
+ * @param string $tagname the name of the tag.
+ * @param array $attary the array of attributes and their values
+ * @param integer $tagtype The type of the tag (see in comments).
+ * @return string A string with the final tag representation.
+ */
+function tln_tagprint($tagname, $attary, $tagtype)
+{
+    if ($tagtype == 2) {
+        $fulltag = '</' . $tagname . '>';
+    } else {
+        $fulltag = '<' . $tagname;
+        if (is_array($attary) && sizeof($attary)) {
+            $atts = array();
+            foreach($attary as $attname => $attvalue) {
+                array_push($atts, "$attname=$attvalue");
+            }
+            $fulltag .= ' ' . join(' ', $atts);
+        }
+        if ($tagtype == 3) {
+            $fulltag .= ' /';
+        }
+        $fulltag .= '>';
+    }
+    return $fulltag;
+}
+
+/**
+ * A small helper function to use with array_walk. Modifies a by-ref
+ * value and makes it lowercase.
+ *
+ * @param string $val a value passed by-ref.
+ * @return		void since it modifies a by-ref value.
+ */
+function tln_casenormalize(&$val)
+{
+    $val = strtolower($val);
+}
+
+/**
+ * This function skips any whitespace from the current position within
+ * a string and to the next non-whitespace value.
+ *
+ * @param string $body the string
+ * @param integer $offset the offset within the string where we should start
+ *				   looking for the next non-whitespace character.
+ * @return integer          the location within the $body where the next
+ *				   non-whitespace char is located.
+ */
+function tln_skipspace($body, $offset)
+{
+    preg_match('/^(\s*)/s', substr($body, $offset), $matches);
+    if (sizeof($matches[1])) {
+        $count = strlen($matches[1]);
+        $offset += $count;
+    }
+    return $offset;
+}
+
+/**
+ * This function looks for the next character within a string.	It's
+ * really just a glorified "strpos", except it catches the failures
+ * nicely.
+ *
+ * @param string $body   The string to look for needle in.
+ * @param integer $offset Start looking from this position.
+ * @param string $needle The character/string to look for.
+ * @return integer           location of the next occurrence of the needle, or
+ *				   strlen($body) if needle wasn't found.
+ */
+function tln_findnxstr($body, $offset, $needle)
+{
+    $pos = strpos($body, $needle, $offset);
+    if ($pos === false) {
+        $pos = strlen($body);
+    }
+    return $pos;
+}
+
+/**
+ * This function takes a PCRE-style regexp and tries to match it
+ * within the string.
+ *
+ * @param string $body   The string to look for needle in.
+ * @param integer $offset Start looking from here.
+ * @param string $reg       A PCRE-style regex to match.
+ * @return array|boolean  Returns a false if no matches found, or an array
+ *				   with the following members:
+ *				   - integer with the location of the match within $body
+ *				   - string with whatever content between offset and the match
+ *				   - string with whatever it is we matched
+ */
+function tln_findnxreg($body, $offset, $reg)
+{
+    $matches = array();
+    $retarr = array();
+    $preg_rule = '%^(.*?)(' . $reg . ')%s';
+    preg_match($preg_rule, substr($body, $offset), $matches);
+    if (!isset($matches[0]) || !$matches[0]) {
+        $retarr = false;
+    } else {
+        $retarr[0] = $offset + strlen($matches[1]);
+        $retarr[1] = $matches[1];
+        $retarr[2] = $matches[2];
+    }
+    return $retarr;
+}
+
+/**
+ * This function looks for the next tag.
+ *
+ * @param string $body   String where to look for the next tag.
+ * @param integer $offset Start looking from here.
+ * @return array|boolean false if no more tags exist in the body, or
+ *				   an array with the following members:
+ *				   - string with the name of the tag
+ *				   - array with attributes and their values
+ *				   - integer with tag type (1, 2, or 3)
+ *				   - integer where the tag starts (starting "<")
+ *				   - integer where the tag ends (ending ">")
+ *				   first three members will be false, if the tag is invalid.
+ */
+function tln_getnxtag($body, $offset)
+{
+    if ($offset > strlen($body)) {
+        return false;
+    }
+    $lt = tln_findnxstr($body, $offset, '<');
+    if ($lt == strlen($body)) {
+        return false;
+    }
+    /**
+     * We are here:
+     * blah blah <tag attribute="value">
+     * \---------^
+     */
+    $pos = tln_skipspace($body, $lt + 1);
+    if ($pos >= strlen($body)) {
+        return array(false, false, false, $lt, strlen($body));
+    }
+    /**
+     * There are 3 kinds of tags:
+     * 1. Opening tag, e.g.:
+     *	  <a href="blah">
+     * 2. Closing tag, e.g.:
+     *	  </a>
+     * 3. XHTML-style content-less tag, e.g.:
+     *	  <img src="blah"/>
+     */
+    switch (substr($body, $pos, 1)) {
+    case '/':
+        $tagtype = 2;
+        $pos++;
+        break;
+    case '!':
+        /**
+         * A comment or an SGML declaration.
+         */
+            if (substr($body, $pos + 1, 2) == '--') {
+            $gt = strpos($body, '-->', $pos);
+            if ($gt === false) {
+                $gt = strlen($body);
+            } else {
+                $gt += 2;
+            }
+            return array(false, false, false, $lt, $gt);
+        } else {
+            $gt = tln_findnxstr($body, $pos, '>');
+            return array(false, false, false, $lt, $gt);
+        }
+        break;
+    default:
+        /**
+         * Assume tagtype 1 for now. If it's type 3, we'll switch values
+         * later.
+         */
+        $tagtype = 1;
+        break;
+    }
+
+    /**
+     * Look for next [\W-_], which will indicate the end of the tag name.
+     */
+    $regary = tln_findnxreg($body, $pos, '[^\w\-_]');
+    if ($regary == false) {
+        return array(false, false, false, $lt, strlen($body));
+    }
+    list($pos, $tagname, $match) = $regary;
+    $tagname = strtolower($tagname);
+
+    /**
+     * $match can be either of these:
+     * '>'	indicating the end of the tag entirely.
+     * '\s' indicating the end of the tag name.
+     * '/'	indicating that this is type-3 xhtml tag.
+     *
+     * Whatever else we find there indicates an invalid tag.
+     */
+    switch ($match) {
+    case '/':
+        /**
+         * This is an xhtml-style tag with a closing / at the
+         * end, like so: <img src="blah"/>. Check if it's followed
+         * by the closing bracket. If not, then this tag is invalid
+         */
+        if (substr($body, $pos, 2) == '/>') {
+            $pos++;
+            $tagtype = 3;
+        } else {
+            $gt = tln_findnxstr($body, $pos, '>');
+            $retary = array(false, false, false, $lt, $gt);
+            return $retary;
+        }
+            //intentional fall-through
+    case '>':
+        return array($tagname, false, $tagtype, $lt, $pos);
+        break;
+    default:
+        /**
+         * Check if it's whitespace
+         */
+        if (!preg_match('/\s/', $match)) {
+            /**
+             * This is an invalid tag! Look for the next closing ">".
+             */
+            $gt = tln_findnxstr($body, $lt, '>');
+            return array(false, false, false, $lt, $gt);
+        }
+        break;
+    }
+
+    /**
+     * At this point we're here:
+     * <tagname	 attribute='blah'>
+     * \-------^
+     *
+     * At this point we loop in order to find all attributes.
+     */
+    $attary = array();
+
+    while ($pos <= strlen($body)) {
+        $pos = tln_skipspace($body, $pos);
+        if ($pos == strlen($body)) {
+            /**
+             * Non-closed tag.
+             */
+            return array(false, false, false, $lt, $pos);
+        }
+        /**
+         * See if we arrived at a ">" or "/>", which means that we reached
+         * the end of the tag.
+         */
+        $matches = array();
+        if (preg_match('%^(\s*)(>|/>)%s', substr($body, $pos), $matches)) {
+            /**
+             * Yep. So we did.
+             */
+            $pos += strlen($matches[1]);
+            if ($matches[2] == '/>') {
+                $tagtype = 3;
+                $pos++;
+            }
+            return array($tagname, $attary, $tagtype, $lt, $pos);
+        }
+
+        /**
+         * There are several types of attributes, with optional
+         * [:space:] between members.
+         * Type 1:
+         *	 attrname[:space:]=[:space:]'CDATA'
+         * Type 2:
+         *	 attrname[:space:]=[:space:]"CDATA"
+         * Type 3:
+         *	 attr[:space:]=[:space:]CDATA
+         * Type 4:
+         *	 attrname
+         *
+         * We leave types 1 and 2 the same, type 3 we check for
+         * '"' and convert to "&quot" if needed, then wrap in
+         * double quotes. Type 4 we convert into:
+         * attrname="yes".
+         */
+        $regary = tln_findnxreg($body, $pos, '[^\w\-_]');
+        if ($regary == false) {
+            /**
+             * Looks like body ended before the end of tag.
+             */
+            return array(false, false, false, $lt, strlen($body));
+        }
+        list($pos, $attname, $match) = $regary;
+        $attname = strtolower($attname);
+        /**
+         * We arrived at the end of attribute name. Several things possible
+         * here:
+         * '>'	means the end of the tag and this is attribute type 4
+         * '/'	if followed by '>' means the same thing as above
+         * '\s' means a lot of things -- look what it's followed by.
+         *		anything else means the attribute is invalid.
+         */
+        switch ($match) {
+        case '/':
+            /**
+             * This is an xhtml-style tag with a closing / at the
+             * end, like so: <img src="blah"/>. Check if it's followed
+             * by the closing bracket. If not, then this tag is invalid
+             */
+            if (substr($body, $pos, 2) == '/>') {
+                $pos++;
+                $tagtype = 3;
+            } else {
+                $gt = tln_findnxstr($body, $pos, '>');
+                $retary = array(false, false, false, $lt, $gt);
+                return $retary;
+            }
+                //intentional fall-through
+        case '>':
+            $attary{$attname} = '"yes"';
+            return array($tagname, $attary, $tagtype, $lt, $pos);
+            break;
+        default:
+            /**
+             * Skip whitespace and see what we arrive at.
+             */
+            $pos = tln_skipspace($body, $pos);
+            $char = substr($body, $pos, 1);
+            /**
+             * Two things are valid here:
+             * '=' means this is attribute type 1 2 or 3.
+             * \w means this was attribute type 4.
+             * anything else we ignore and re-loop. End of tag and
+             * invalid stuff will be caught by our checks at the beginning
+             * of the loop.
+             */
+            if ($char == '=') {
+                $pos++;
+                $pos = tln_skipspace($body, $pos);
+                /**
+                 * Here are 3 possibilities:
+                 * "'"	attribute type 1
+                 * '"'	attribute type 2
+                 * everything else is the content of tag type 3
+                 */
+                $quot = substr($body, $pos, 1);
+                if ($quot == '\'') {
+                        $regary = tln_findnxreg($body, $pos + 1, '\'');
+                    if ($regary == false) {
+                        return array(false, false, false, $lt, strlen($body));
+                    }
+                    list($pos, $attval, $match) = $regary;
+                    $pos++;
+                    $attary{$attname} = '\'' . $attval . '\'';
+                } elseif ($quot == '"') {
+                    $regary = tln_findnxreg($body, $pos + 1, '\"');
+                    if ($regary == false) {
+                        return array(false, false, false, $lt, strlen($body));
+                    }
+                    list($pos, $attval, $match) = $regary;
+                    $pos++;
+                            $attary{$attname} = '"' . $attval . '"';
+                } else {
+                    /**
+                     * These are hateful. Look for \s, or >.
+                     */
+                    $regary = tln_findnxreg($body, $pos, '[\s>]');
+                    if ($regary == false) {
+                        return array(false, false, false, $lt, strlen($body));
+                    }
+                    list($pos, $attval, $match) = $regary;
+                    /**
+                     * If it's ">" it will be caught at the top.
+                     */
+                    $attval = preg_replace('/\"/s', '&quot;', $attval);
+                    $attary{$attname} = '"' . $attval . '"';
+                }
+            } elseif (preg_match('|[\w/>]|', $char)) {
+                /**
+                 * That was attribute type 4.
+                 */
+                $attary{$attname} = '"yes"';
+            } else {
+                /**
+                 * An illegal character. Find next '>' and return.
+                 */
+                $gt = tln_findnxstr($body, $pos, '>');
+                return array(false, false, false, $lt, $gt);
+            }
+            break;
+        }
+    }
+    /**
+     * The fact that we got here indicates that the tag end was never
+     * found. Return invalid tag indication so it gets stripped.
+     */
+    return array(false, false, false, $lt, strlen($body));
+}
+
+/**
+ * Translates entities into literal values so they can be checked.
+ *
+ * @param string $attvalue the by-ref value to check.
+ * @param string $regex    the regular expression to check against.
+ * @param boolean $hex        whether the entities are hexadecimal.
+ * @return boolean            True or False depending on whether there were matches.
+ */
+function tln_deent(&$attvalue, $regex, $hex = false)
+{
+    preg_match_all($regex, $attvalue, $matches);
+    if (is_array($matches) && sizeof($matches[0]) > 0) {
+        $repl = array();
+        for ($i = 0; $i < sizeof($matches[0]); $i++) {
+            $numval = $matches[1][$i];
+            if ($hex) {
+                $numval = hexdec($numval);
+            }
+            $repl{$matches[0][$i]} = chr($numval);
+        }
+        $attvalue = strtr($attvalue, $repl);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/**
+ * This function checks attribute values for entity-encoded values
+ * and returns them translated into 8-bit strings so we can run
+ * checks on them.
+ *
+ * @param string $attvalue A string to run entity check against.
+ */
+function tln_defang(&$attvalue)
+{
+    /**
+     * Skip this if there aren't ampersands or backslashes.
+     */
+    if (strpos($attvalue, '&') === false
+        && strpos($attvalue, '\\') === false
+    ) {
+        return;
+    }
+    do {
+        $m = false;
+        $m = $m || tln_deent($attvalue, '/\&#0*(\d+);*/s');
+        $m = $m || tln_deent($attvalue, '/\&#x0*((\d|[a-f])+);*/si', true);
+        $m = $m || tln_deent($attvalue, '/\\\\(\d+)/s', true);
+    } while ($m == true);
+    $attvalue = stripslashes($attvalue);
+}
+
+/**
+ * Kill any tabs, newlines, or carriage returns. Our friends the
+ * makers of the browser with 95% market value decided that it'd
+ * be funny to make "java[tab]script" be just as good as "javascript".
+ *
+ * @param string $attvalue     The attribute value before extraneous spaces removed.
+ */
+function tln_unspace(&$attvalue)
+{
+    if (strcspn($attvalue, "\t\r\n\0 ") != strlen($attvalue)) {
+        $attvalue = str_replace(
+            array("\t", "\r", "\n", "\0", " "),
+            array('', '', '', '', ''),
+            $attvalue
+        );
+    }
+}
+
+/**
+ * This function runs various checks against the attributes.
+ *
+ * @param string $tagname            String with the name of the tag.
+ * @param array $attary            Array with all tag attributes.
+ * @param array $rm_attnames        See description for tln_sanitize
+ * @param array $bad_attvals        See description for tln_sanitize
+ * @param array $add_attr_to_tag See description for tln_sanitize
+ * @param string $trans_image_path
+ * @param boolean $block_external_images
+ * @return array with modified attributes.
+ */
+function tln_fixatts(
+    $tagname,
+    $attary,
+    $rm_attnames,
+    $bad_attvals,
+    $add_attr_to_tag,
+    $trans_image_path,
+    $block_external_images
+) {
+    foreach($attary as $attname => $attvalue) {
+        /**
+         * See if this attribute should be removed.
+         */
+        foreach ($rm_attnames as $matchtag => $matchattrs) {
+            if (preg_match($matchtag, $tagname)) {
+                foreach ($matchattrs as $matchattr) {
+                    if (preg_match($matchattr, $attname)) {
+                        unset($attary{$attname});
+                        continue;
+                    }
+                }
+            }
+        }
+        /**
+         * Remove any backslashes, entities, or extraneous whitespace.
+         */
+        $oldattvalue = $attvalue;
+        tln_defang($attvalue);
+        if ($attname == 'style' && $attvalue !== $oldattvalue) {
+            $attvalue = "idiocy";
+            $attary{$attname} = $attvalue;
+        }
+        tln_unspace($attvalue);
+
+        /**
+         * Now let's run checks on the attvalues.
+         * I don't expect anyone to comprehend this. If you do,
+         * get in touch with me so I can drive to where you live and
+         * shake your hand personally. :)
+         */
+        foreach ($bad_attvals as $matchtag => $matchattrs) {
+            if (preg_match($matchtag, $tagname)) {
+                foreach ($matchattrs as $matchattr => $valary) {
+                    if (preg_match($matchattr, $attname)) {
+                        /**
+                         * There are two arrays in valary.
+                         * First is matches.
+                         * Second one is replacements
+                         */
+                        list($valmatch, $valrepl) = $valary;
+                        $newvalue = preg_replace($valmatch, $valrepl, $attvalue);
+                        if ($newvalue != $attvalue) {
+                            $attary{$attname} = $newvalue;
+                            $attvalue = $newvalue;
+                        }
+                    }
+                }
+            }
+        }
+        if ($attname == 'style') {
+            if (preg_match('/[\0-\37\200-\377]+/', $attvalue)) {
+                $attary{$attname} = '"disallowed character"';
+            }
+            preg_match_all("/url\s*\((.+)\)/si", $attvalue, $aMatch);
+            if (count($aMatch)) {
+                foreach($aMatch[1] as $sMatch) {
+                    $urlvalue = $sMatch;
+                    tln_fixurl($attname, $urlvalue, $trans_image_path, $block_external_images);
+                    $attary{$attname} = str_replace($sMatch, $urlvalue, $attvalue);
+                }
+            }
+        }
+     }
+    /**
+     * See if we need to append any attributes to this tag.
+     */
+    foreach ($add_attr_to_tag as $matchtag => $addattary) {
+        if (preg_match($matchtag, $tagname)) {
+            $attary = array_merge($attary, $addattary);
+        }
+    }
+    return $attary;
+}
+
+function tln_fixurl($attname, &$attvalue, $trans_image_path, $block_external_images)
+{
+    $sQuote = '"';
+    $attvalue = trim($attvalue);
+    if ($attvalue && ($attvalue[0] =='"'|| $attvalue[0] == "'")) {
+        // remove the double quotes
+        $sQuote = $attvalue[0];
+        $attvalue = trim(substr($attvalue,1,-1));
+    }
+
+    /**
+     * Replace empty src tags with the blank image.  src is only used
+     * for frames, images, and image inputs.  Doing a replace should
+     * not affect them working as should be, however it will stop
+     * IE from being kicked off when src for img tags are not set
+     */
+    if ($attvalue == '') {
+        $attvalue = $sQuote . $trans_image_path . $sQuote;
+    } else {
+        // first, disallow 8 bit characters and control characters
+        if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) {
+            switch ($attname) {
+                case 'href':
+                    $attvalue = $sQuote . 'http://invalid-stuff-detected.example.com' . $sQuote;
+                    break;
+                default:
+                    $attvalue = $sQuote . $trans_image_path . $sQuote;
+                    break;
+            }
+        } else {
+            $aUrl = parse_url($attvalue);
+            if (isset($aUrl['scheme'])) {
+                switch(strtolower($aUrl['scheme'])) {
+                    case 'mailto':
+                    case 'http':
+                    case 'https':
+                    case 'ftp':
+                        if ($attname != 'href') {
+                            if ($block_external_images == true) {
+                                $attvalue = $sQuote . $trans_image_path . $sQuote;
+                            } else {
+                                if (!isset($aUrl['path'])) {
+                                    $attvalue = $sQuote . $trans_image_path . $sQuote;
+                                }
+                            }
+                        } else {
+                            $attvalue = $sQuote . $attvalue . $sQuote;
+                        }
+                        break;
+                    case 'outbind':
+                        $attvalue = $sQuote . $attvalue . $sQuote;
+                        break;
+                    case 'cid':
+                        $attvalue = $sQuote . $attvalue . $sQuote;
+                        break;
+                    default:
+                        $attvalue = $sQuote . $trans_image_path . $sQuote;
+                        break;
+                }
+            } else {
+                if (!isset($aUrl['path']) || $aUrl['path'] != $trans_image_path) {
+                    $$attvalue = $sQuote . $trans_image_path . $sQuote;
+                }
+            }
+        }
+    }
+}
+
+function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images)
+{
+    // workaround for </style> in between comments
+    $content = '';
+    $sToken = '';
+    $bSucces = false;
+    $bEndTag = false;
+    for ($i=$pos,$iCount=strlen($body);$i<$iCount;++$i) {
+        $char = $body{$i};
+        switch ($char) {
+            case '<':
+                $sToken = $char;
+                break;
+            case '/':
+                 if ($sToken == '<') {
+                    $sToken .= $char;
+                    $bEndTag = true;
+                 } else {
+                    $content .= $char;
+                 }
+                 break;
+            case '>':
+                 if ($bEndTag) {
+                    $sToken .= $char;
+                    if (preg_match('/\<\/\s*style\s*\>/i',$sToken,$aMatch)) {
+                        $newpos = $i + 1;
+                        $bSucces = true;
+                        break 2;
+                    } else {
+                        $content .= $sToken;
+                    }
+                    $bEndTag = false;
+                 } else {
+                    $content .= $char;
+                 }
+                 break;
+            case '!':
+                if ($sToken == '<') {
+                    // possible comment
+                    if (isset($body{$i+2}) && substr($body,$i,3) == '!--') {
+                        $i = strpos($body,'-->',$i+3);
+                        if ($i === false) { // no end comment
+                            $i = strlen($body);
+                        }
+                        $sToken = '';
+                    }
+                } else {
+                    $content .= $char;
+                }
+                break;
+            default:
+                if ($bEndTag) {
+                    $sToken .= $char;
+                } else {
+                    $content .= $char;
+                }
+                break;
+        }
+    }
+    if ($bSucces == FALSE){
+        return array(FALSE, strlen($body));
+    }
+
+
+
+    /**
+     * First look for general BODY style declaration, which would be
+     * like so:
+     * body {background: blah-blah}
+     * and change it to .bodyclass so we can just assign it to a <div>
+     */
+    $content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content);
+
+    /**
+    * Fix url('blah') declarations.
+    */
+    //   $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si",
+    //                           "url(\\1$trans_image_path\\2)", $content);
+
+    // first check for 8bit sequences and disallowed control characters
+    if (preg_match('/[\16-\37\200-\377]+/',$content)) {
+        $content = '<!-- style block removed by html filter due to presence of 8bit characters -->';
+        return array($content, $newpos);
+    }
+
+    // remove @import line
+    $content = preg_replace("/^\s*(@import.*)$/mi","\n<!-- @import rules forbidden -->\n",$content);
+
+    $content = preg_replace("/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/i", 'url', $content);
+    preg_match_all("/url\s*\((.+)\)/si",$content,$aMatch);
+    if (count($aMatch)) {
+        $aValue = $aReplace = array();
+        foreach($aMatch[1] as $sMatch) {
+            // url value
+            $urlvalue = $sMatch;
+            tln_fixurl('style',$urlvalue, $trans_image_path, $block_external_images);
+            $aValue[] = $sMatch;
+            $aReplace[] = $urlvalue;
+        }
+        $content = str_replace($aValue,$aReplace,$content);
+    }
+
+    /**
+     * Remove any backslashes, entities, and extraneous whitespace.
+     */
+    $contentTemp = $content;
+    tln_defang($contentTemp);
+    tln_unspace($contentTemp);
+
+    $match   = array('/\/\*.*\*\//',
+                    '/expression/i',
+                    '/behaviou*r/i',
+                    '/binding/i',
+                    '/include-source/i',
+                    '/javascript/i',
+                    '/script/i',
+                    '/position/i');
+    $replace = array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy', '');
+    $contentNew = preg_replace($match, $replace, $contentTemp);
+    if ($contentNew !== $contentTemp) {
+        $content = $contentNew;
+    }
+    return array($content, $newpos);
+}
+
+function tln_body2div($attary, $trans_image_path)
+{
+    $divattary = array('class' => "'bodyclass'");
+    $text = '#000000';
+    $has_bgc_stl = $has_txt_stl = false;
+    $styledef = '';
+    if (is_array($attary) && sizeof($attary) > 0){
+        foreach ($attary as $attname=>$attvalue){
+            $quotchar = substr($attvalue, 0, 1);
+            $attvalue = str_replace($quotchar, "", $attvalue);
+            switch ($attname){
+                case 'background':
+                    $styledef .= "background-image: url('$trans_image_path'); ";
+                    break;
+                case 'bgcolor':
+                    $has_bgc_stl = true;
+                    $styledef .= "background-color: $attvalue; ";
+                    break;
+                case 'text':
+                    $has_txt_stl = true;
+                    $styledef .= "color: $attvalue; ";
+                    break;
+            }
+        }
+        // Outlook defines a white bgcolor and no text color. This can lead to
+        // white text on a white bg with certain themes.
+        if ($has_bgc_stl && !$has_txt_stl) {
+            $styledef .= "color: $text; ";
+        }
+        if (strlen($styledef) > 0){
+            $divattary{"style"} = "\"$styledef\"";
+        }
+    }
+    return $divattary;
+}
+
+/**
+ *
+ * @param string $body                    The HTML you wish to filter
+ * @param array $tag_list                see description above
+ * @param array $rm_tags_with_content see description above
+ * @param array $self_closing_tags    see description above
+ * @param boolean $force_tag_closing    see description above
+ * @param array $rm_attnames            see description above
+ * @param array $bad_attvals            see description above
+ * @param array $add_attr_to_tag        see description above
+ * @param string $trans_image_path
+ * @param boolean $block_external_images
+
+ * @return string                       Sanitized html safe to show on your pages.
+ */
+function tln_sanitize(
+    $body,
+    $tag_list,
+    $rm_tags_with_content,
+    $self_closing_tags,
+    $force_tag_closing,
+    $rm_attnames,
+    $bad_attvals,
+    $add_attr_to_tag,
+    $trans_image_path,
+    $block_external_images
+) {
+    /**
+     * Normalize rm_tags and rm_tags_with_content.
+     */
+    $rm_tags = array_shift($tag_list);
+    @array_walk($tag_list, 'tln_casenormalize');
+    @array_walk($rm_tags_with_content, 'tln_casenormalize');
+    @array_walk($self_closing_tags, 'tln_casenormalize');
+    /**
+     * See if tag_list is of tags to remove or tags to allow.
+     * false  means remove these tags
+     * true	  means allow these tags
+     */
+    $curpos = 0;
+    $open_tags = array();
+    $trusted = "<!-- begin tln_sanitized html -->\n";
+    $skip_content = false;
+    /**
+     * Take care of netscape's stupid javascript entities like
+     * &{alert('boo')};
+     */
+    $body = preg_replace('/&(\{.*?\};)/si', '&amp;\\1', $body);
+    while (($curtag = tln_getnxtag($body, $curpos)) != false) {
+        list($tagname, $attary, $tagtype, $lt, $gt) = $curtag;
+        $free_content = substr($body, $curpos, $lt-$curpos);
+        /**
+         * Take care of <style>
+         */
+        if ($tagname == "style" && $tagtype == 1){
+            list($free_content, $curpos) =
+                tln_fixstyle($body, $gt+1, $trans_image_path, $block_external_images);
+            if ($free_content != FALSE){
+                if ( !empty($attary) ) {
+                    $attary = tln_fixatts($tagname,
+                                         $attary,
+                                         $rm_attnames,
+                                         $bad_attvals,
+                                         $add_attr_to_tag,
+                                         $trans_image_path,
+                                         $block_external_images
+                                         );
+                }
+                $trusted .= tln_tagprint($tagname, $attary, $tagtype);
+                $trusted .= $free_content;
+                $trusted .= tln_tagprint($tagname, null, 2);
+            }
+            continue;
+        }
+        if ($skip_content == false){
+            $trusted .= $free_content;
+        }
+        if ($tagname != false) {
+            if ($tagtype == 2) {
+                if ($skip_content == $tagname) {
+                    /**
+                     * Got to the end of tag we needed to remove.
+                     */
+                    $tagname = false;
+                    $skip_content = false;
+                } else {
+                    if ($skip_content == false) {
+                        if ($tagname == "body") {
+                            $tagname = "div";
+                        }
+                        if (isset($open_tags{$tagname}) &&
+                            $open_tags{$tagname} > 0
+                        ) {
+                            $open_tags{$tagname}--;
+                        } else {
+                            $tagname = false;
+                        }
+                    }
+                }
+            } else {
+                /**
+                 * $rm_tags_with_content
+                 */
+                if ($skip_content == false) {
+                    /**
+                     * See if this is a self-closing type and change
+                     * tagtype appropriately.
+                     */
+                    if ($tagtype == 1
+                        && in_array($tagname, $self_closing_tags)
+                    ) {
+                        $tagtype = 3;
+                    }
+                    /**
+                     * See if we should skip this tag and any content
+                     * inside it.
+                     */
+                    if ($tagtype == 1
+                        && in_array($tagname, $rm_tags_with_content)
+                    ) {
+                        $skip_content = $tagname;
+                    } else {
+                        if (($rm_tags == false
+                             && in_array($tagname, $tag_list)) ||
+                            ($rm_tags == true
+                                && !in_array($tagname, $tag_list))
+                        ) {
+                            $tagname = false;
+                        } else {
+                            /**
+                             * Convert body into div.
+                             */
+                            if ($tagname == "body"){
+                                $tagname = "div";
+                                $attary = tln_body2div($attary, $trans_image_path);
+                            }
+                            if ($tagtype == 1) {
+                                if (isset($open_tags{$tagname})) {
+                                    $open_tags{$tagname}++;
+                                } else {
+                                    $open_tags{$tagname} = 1;
+                                }
+                            }
+                            /**
+                             * This is where we run other checks.
+                             */
+                            if (is_array($attary) && sizeof($attary) > 0) {
+                                $attary = tln_fixatts(
+                                    $tagname,
+                                    $attary,
+                                    $rm_attnames,
+                                    $bad_attvals,
+                                    $add_attr_to_tag,
+                                    $trans_image_path,
+                                    $block_external_images
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+            if ($tagname != false && $skip_content == false) {
+                $trusted .= tln_tagprint($tagname, $attary, $tagtype);
+            }
+        }
+        $curpos = $gt + 1;
+    }
+    $trusted .= substr($body, $curpos, strlen($body) - $curpos);
+    if ($force_tag_closing == true) {
+        foreach ($open_tags as $tagname => $opentimes) {
+            while ($opentimes > 0) {
+                $trusted .= '</' . $tagname . '>';
+                $opentimes--;
+            }
+        }
+        $trusted .= "\n";
+    }
+    $trusted .= "<!-- end tln_sanitized html -->\n";
+    return $trusted;
+}
+
+//
+// Use the nifty htmlfilter library
+//
+
+
+function HTMLFilter($body, $trans_image_path, $block_external_images = false)
+{
+
+    $tag_list = array(
+        false,
+        "object",
+        "meta",
+        "html",
+        "head",
+        "base",
+        "link",
+        "frame",
+        "iframe",
+        "plaintext",
+        "marquee"
+    );
+
+    $rm_tags_with_content = array(
+        "script",
+        "applet",
+        "embed",
+        "title",
+        "frameset",
+        "xmp",
+        "xml"
+    );
+
+    $self_closing_tags =  array(
+        "img",
+        "br",
+        "hr",
+        "input",
+        "outbind"
+    );
+
+    $force_tag_closing = true;
+
+    $rm_attnames = array(
+        "/.*/" =>
+            array(
+                // "/target/i",
+                "/^on.*/i",
+                "/^dynsrc/i",
+                "/^data.*/i",
+                "/^lowsrc.*/i"
+            )
+    );
+
+    $bad_attvals = array(
+        "/.*/" =>
+        array(
+            "/^src|background/i" =>
+            array(
+                array(
+                    '/^([\'"])\s*\S+script\s*:.*([\'"])/si',
+                    '/^([\'"])\s*mocha\s*:*.*([\'"])/si',
+                    '/^([\'"])\s*about\s*:.*([\'"])/si'
+                ),
+                array(
+                    "\\1$trans_image_path\\2",
+                    "\\1$trans_image_path\\2",
+                    "\\1$trans_image_path\\2"
+                )
+            ),
+            "/^href|action/i" =>
+            array(
+                array(
+                    '/^([\'"])\s*\S+script\s*:.*([\'"])/si',
+                    '/^([\'"])\s*mocha\s*:*.*([\'"])/si',
+                    '/^([\'"])\s*about\s*:.*([\'"])/si'
+                ),
+                array(
+                    "\\1#\\1",
+                    "\\1#\\1",
+                    "\\1#\\1"
+                )
+            ),
+            "/^style/i" =>
+            array(
+                array(
+                    "/\/\*.*\*\//",
+                    "/expression/i",
+                    "/binding/i",
+                    "/behaviou*r/i",
+                    "/include-source/i",
+                    '/position\s*:/i',
+                    '/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/i',
+                    '/url\s*\(\s*([\'"])\s*\S+script\s*:.*([\'"])\s*\)/si',
+                    '/url\s*\(\s*([\'"])\s*mocha\s*:.*([\'"])\s*\)/si',
+                    '/url\s*\(\s*([\'"])\s*about\s*:.*([\'"])\s*\)/si',
+                    '/(.*)\s*:\s*url\s*\(\s*([\'"]*)\s*\S+script\s*:.*([\'"]*)\s*\)/si'
+                ),
+                array(
+                    "",
+                    "idiocy",
+                    "idiocy",
+                    "idiocy",
+                    "idiocy",
+                    "idiocy",
+                    "url",
+                    "url(\\1#\\1)",
+                    "url(\\1#\\1)",
+                    "url(\\1#\\1)",
+                    "\\1:url(\\2#\\3)"
+                )
+            )
+        )
+    );
+
+    if ($block_external_images) {
+        array_push(
+            $bad_attvals{'/.*/'}{'/^src|background/i'}[0],
+            '/^([\'\"])\s*https*:.*([\'\"])/si'
+        );
+        array_push(
+            $bad_attvals{'/.*/'}{'/^src|background/i'}[1],
+            "\\1$trans_image_path\\1"
+        );
+        array_push(
+            $bad_attvals{'/.*/'}{'/^style/i'}[0],
+            '/url\(([\'\"])\s*https*:.*([\'\"])\)/si'
+        );
+        array_push(
+            $bad_attvals{'/.*/'}{'/^style/i'}[1],
+            "url(\\1$trans_image_path\\1)"
+        );
+    }
+
+    $add_attr_to_tag = array(
+        "/^a$/i" =>
+            array('target' => '"_blank"')
+    );
+
+    $trusted = tln_sanitize(
+        $body,
+        $tag_list,
+        $rm_tags_with_content,
+        $self_closing_tags,
+        $force_tag_closing,
+        $rm_attnames,
+        $bad_attvals,
+        $add_attr_to_tag,
+        $trans_image_path,
+        $block_external_images
+    );
+    return $trusted;
+}
diff --git a/core/libraries/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php b/core/libraries/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php
new file mode 100644
index 00000000..3fd53924
--- /dev/null
+++ b/core/libraries/vendor/phpmailer/phpmailer/extras/ntlm_sasl_client.php
@@ -0,0 +1,185 @@
+<?php
+/*
+ * ntlm_sasl_client.php
+ *
+ * @(#) $Id: ntlm_sasl_client.php,v 1.3 2004/11/17 08:00:37 mlemos Exp $
+ *
+ */
+
+define("SASL_NTLM_STATE_START", 0);
+define("SASL_NTLM_STATE_IDENTIFY_DOMAIN", 1);
+define("SASL_NTLM_STATE_RESPOND_CHALLENGE", 2);
+define("SASL_NTLM_STATE_DONE", 3);
+define("SASL_FAIL", -1);
+define("SASL_CONTINUE", 1);
+
+class ntlm_sasl_client_class
+{
+    public $credentials = array();
+    public $state = SASL_NTLM_STATE_START;
+
+    public function initialize(&$client)
+    {
+        if (!function_exists($function = "mcrypt_encrypt")
+            || !function_exists($function = "mhash")
+        ) {
+            $extensions = array(
+                "mcrypt_encrypt" => "mcrypt",
+                "mhash" => "mhash"
+            );
+            $client->error = "the extension " . $extensions[$function] .
+                " required by the NTLM SASL client class is not available in this PHP configuration";
+            return (0);
+        }
+        return (1);
+    }
+
+    public function ASCIIToUnicode($ascii)
+    {
+        for ($unicode = "", $a = 0; $a < strlen($ascii); $a++) {
+            $unicode .= substr($ascii, $a, 1) . chr(0);
+        }
+        return ($unicode);
+    }
+
+    public function typeMsg1($domain, $workstation)
+    {
+        $domain_length = strlen($domain);
+        $workstation_length = strlen($workstation);
+        $workstation_offset = 32;
+        $domain_offset = $workstation_offset + $workstation_length;
+        return (
+            "NTLMSSP\0" .
+            "\x01\x00\x00\x00" .
+            "\x07\x32\x00\x00" .
+            pack("v", $domain_length) .
+            pack("v", $domain_length) .
+            pack("V", $domain_offset) .
+            pack("v", $workstation_length) .
+            pack("v", $workstation_length) .
+            pack("V", $workstation_offset) .
+            $workstation .
+            $domain
+        );
+    }
+
+    public function NTLMResponse($challenge, $password)
+    {
+        $unicode = $this->ASCIIToUnicode($password);
+        $md4 = mhash(MHASH_MD4, $unicode);
+        $padded = $md4 . str_repeat(chr(0), 21 - strlen($md4));
+        $iv_size = mcrypt_get_iv_size(MCRYPT_DES, MCRYPT_MODE_ECB);
+        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+        for ($response = "", $third = 0; $third < 21; $third += 7) {
+            for ($packed = "", $p = $third; $p < $third + 7; $p++) {
+                $packed .= str_pad(decbin(ord(substr($padded, $p, 1))), 8, "0", STR_PAD_LEFT);
+            }
+            for ($key = "", $p = 0; $p < strlen($packed); $p += 7) {
+                $s = substr($packed, $p, 7);
+                $b = $s . ((substr_count($s, "1") % 2) ? "0" : "1");
+                $key .= chr(bindec($b));
+            }
+            $ciphertext = mcrypt_encrypt(MCRYPT_DES, $key, $challenge, MCRYPT_MODE_ECB, $iv);
+            $response .= $ciphertext;
+        }
+        return $response;
+    }
+
+    public function typeMsg3($ntlm_response, $user, $domain, $workstation)
+    {
+        $domain_unicode = $this->ASCIIToUnicode($domain);
+        $domain_length = strlen($domain_unicode);
+        $domain_offset = 64;
+        $user_unicode = $this->ASCIIToUnicode($user);
+        $user_length = strlen($user_unicode);
+        $user_offset = $domain_offset + $domain_length;
+        $workstation_unicode = $this->ASCIIToUnicode($workstation);
+        $workstation_length = strlen($workstation_unicode);
+        $workstation_offset = $user_offset + $user_length;
+        $lm = "";
+        $lm_length = strlen($lm);
+        $lm_offset = $workstation_offset + $workstation_length;
+        $ntlm = $ntlm_response;
+        $ntlm_length = strlen($ntlm);
+        $ntlm_offset = $lm_offset + $lm_length;
+        $session = "";
+        $session_length = strlen($session);
+        $session_offset = $ntlm_offset + $ntlm_length;
+        return (
+            "NTLMSSP\0" .
+            "\x03\x00\x00\x00" .
+            pack("v", $lm_length) .
+            pack("v", $lm_length) .
+            pack("V", $lm_offset) .
+            pack("v", $ntlm_length) .
+            pack("v", $ntlm_length) .
+            pack("V", $ntlm_offset) .
+            pack("v", $domain_length) .
+            pack("v", $domain_length) .
+            pack("V", $domain_offset) .
+            pack("v", $user_length) .
+            pack("v", $user_length) .
+            pack("V", $user_offset) .
+            pack("v", $workstation_length) .
+            pack("v", $workstation_length) .
+            pack("V", $workstation_offset) .
+            pack("v", $session_length) .
+            pack("v", $session_length) .
+            pack("V", $session_offset) .
+            "\x01\x02\x00\x00" .
+            $domain_unicode .
+            $user_unicode .
+            $workstation_unicode .
+            $lm .
+            $ntlm
+        );
+    }
+
+    public function start(&$client, &$message, &$interactions)
+    {
+        if ($this->state != SASL_NTLM_STATE_START) {
+            $client->error = "NTLM authentication state is not at the start";
+            return (SASL_FAIL);
+        }
+        $this->credentials = array(
+            "user" => "",
+            "password" => "",
+            "realm" => "",
+            "workstation" => ""
+        );
+        $defaults = array();
+        $status = $client->GetCredentials($this->credentials, $defaults, $interactions);
+        if ($status == SASL_CONTINUE) {
+            $this->state = SASL_NTLM_STATE_IDENTIFY_DOMAIN;
+        }
+        unset($message);
+        return ($status);
+    }
+
+    public function step(&$client, $response, &$message, &$interactions)
+    {
+        switch ($this->state) {
+            case SASL_NTLM_STATE_IDENTIFY_DOMAIN:
+                $message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
+                $this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE;
+                break;
+            case SASL_NTLM_STATE_RESPOND_CHALLENGE:
+                $ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]);
+                $message = $this->typeMsg3(
+                    $ntlm_response,
+                    $this->credentials["user"],
+                    $this->credentials["realm"],
+                    $this->credentials["workstation"]
+                );
+                $this->state = SASL_NTLM_STATE_DONE;
+                break;
+            case SASL_NTLM_STATE_DONE:
+                $client->error = "NTLM authentication was finished without success";
+                return (SASL_FAIL);
+            default:
+                $client->error = "invalid NTLM authentication step state";
+                return (SASL_FAIL);
+        }
+        return (SASL_CONTINUE);
+    }
+}
diff --git a/core/libraries/vendor/psr/container/LICENSE b/core/libraries/vendor/psr/container/LICENSE
new file mode 100644
index 00000000..2877a489
--- /dev/null
+++ b/core/libraries/vendor/psr/container/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2016 container-interop
+Copyright (c) 2016 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/libraries/vendor/psr/container/src/ContainerExceptionInterface.php b/core/libraries/vendor/psr/container/src/ContainerExceptionInterface.php
new file mode 100644
index 00000000..d35c6b4d
--- /dev/null
+++ b/core/libraries/vendor/psr/container/src/ContainerExceptionInterface.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace Psr\Container;
+
+/**
+ * Base interface representing a generic exception in a container.
+ */
+interface ContainerExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/psr/container/src/ContainerInterface.php b/core/libraries/vendor/psr/container/src/ContainerInterface.php
new file mode 100644
index 00000000..c3a7206f
--- /dev/null
+++ b/core/libraries/vendor/psr/container/src/ContainerInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace Psr\Container;
+
+/**
+ * Describes the interface of a container that exposes methods to read its entries.
+ */
+interface ContainerInterface
+{
+    /**
+     * Finds an entry of the container by its identifier and returns it.
+     *
+     * @param string $id Identifier of the entry to look for.
+     *
+     * @throws NotFoundExceptionInterface  No entry was found for **this** identifier.
+     * @throws ContainerExceptionInterface Error while retrieving the entry.
+     *
+     * @return mixed Entry.
+     */
+    public function get($id);
+
+    /**
+     * Returns true if the container can return an entry for the given identifier.
+     * Returns false otherwise.
+     *
+     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+     * It does however mean that `get($id)` will not throw a `NotFoundExceptionInterface`.
+     *
+     * @param string $id Identifier of the entry to look for.
+     *
+     * @return bool
+     */
+    public function has($id);
+}
diff --git a/core/libraries/vendor/psr/container/src/NotFoundExceptionInterface.php b/core/libraries/vendor/psr/container/src/NotFoundExceptionInterface.php
new file mode 100644
index 00000000..6566704e
--- /dev/null
+++ b/core/libraries/vendor/psr/container/src/NotFoundExceptionInterface.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace Psr\Container;
+
+/**
+ * No entry was found in the container.
+ */
+interface NotFoundExceptionInterface extends ContainerExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/psr/log/LICENSE b/core/libraries/vendor/psr/log/LICENSE
new file mode 100644
index 00000000..474c952b
--- /dev/null
+++ b/core/libraries/vendor/psr/log/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2012 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/psr/log/Psr/Log/AbstractLogger.php b/core/libraries/vendor/psr/log/Psr/Log/AbstractLogger.php
new file mode 100644
index 00000000..90e721af
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/InvalidArgumentException.php b/core/libraries/vendor/psr/log/Psr/Log/InvalidArgumentException.php
new file mode 100644
index 00000000..67f852d1
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psr\Log;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/LogLevel.php b/core/libraries/vendor/psr/log/Psr/Log/LogLevel.php
new file mode 100644
index 00000000..9cebcace
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/LogLevel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes log levels.
+ */
+class LogLevel
+{
+    const EMERGENCY = 'emergency';
+    const ALERT     = 'alert';
+    const CRITICAL  = 'critical';
+    const ERROR     = 'error';
+    const WARNING   = 'warning';
+    const NOTICE    = 'notice';
+    const INFO      = 'info';
+    const DEBUG     = 'debug';
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/LoggerAwareInterface.php b/core/libraries/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
new file mode 100644
index 00000000..4d64f478
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger-aware instance.
+ */
+interface LoggerAwareInterface
+{
+    /**
+     * Sets a logger instance on the object.
+     *
+     * @param LoggerInterface $logger
+     *
+     * @return void
+     */
+    public function setLogger(LoggerInterface $logger);
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/core/libraries/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
new file mode 100644
index 00000000..639f79bd
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Basic Implementation of LoggerAwareInterface.
+ */
+trait LoggerAwareTrait
+{
+    /**
+     * The logger instance.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Sets a logger.
+     *
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php b/core/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php
new file mode 100644
index 00000000..5ea72438
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger instance.
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data. The only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ */
+interface LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = array());
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = array());
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = array());
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = array());
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = array());
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = array());
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = array());
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = array());
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function log($level, $message, array $context = array());
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php b/core/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php
new file mode 100644
index 00000000..867225df
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger trait that classes unable to extend AbstractLogger
+ * (because they extend another class, etc) can include.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+trait LoggerTrait
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    abstract public function log($level, $message, array $context = array());
+}
diff --git a/core/libraries/vendor/psr/log/Psr/Log/NullLogger.php b/core/libraries/vendor/psr/log/Psr/Log/NullLogger.php
new file mode 100644
index 00000000..d8cd682c
--- /dev/null
+++ b/core/libraries/vendor/psr/log/Psr/Log/NullLogger.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This Logger can be used to avoid conditional log calls.
+ *
+ * Logging should always be optional, and if no logger is provided to your
+ * library creating a NullLogger instance to have something to throw logs at
+ * is a good way to avoid littering your code with `if ($this->logger) { }`
+ * blocks.
+ */
+class NullLogger extends AbstractLogger
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function log($level, $message, array $context = array())
+    {
+        // noop
+    }
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/LICENSE.txt b/core/libraries/vendor/simplepie/simplepie/LICENSE.txt
new file mode 100644
index 00000000..a822a4bd
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright (c) 2004-2007, Ryan Parman and Geoffrey Sneddon.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are 
+permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of 
+	  conditions and the following disclaimer.
+
+	* Redistributions in binary form must reproduce the above copyright notice, this list 
+	  of conditions and the following disclaimer in the documentation and/or other materials 
+	  provided with the distribution.
+
+	* Neither the name of the SimplePie Team nor the names of its contributors may be used 
+	  to endorse or promote products derived from this software without specific prior 
+	  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS 
+AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/autoloader.php b/core/libraries/vendor/simplepie/simplepie/autoloader.php
new file mode 100644
index 00000000..c16a8f8b
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/autoloader.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2009, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+// autoloader
+spl_autoload_register(array(new SimplePie_Autoloader(), 'autoload'));
+
+if (!class_exists('SimplePie'))
+{
+	trigger_error('Autoloader not registered properly', E_USER_ERROR);
+}
+
+/**
+ * Autoloader class
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Autoloader
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->path = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'library';
+	}
+
+	/**
+	 * Autoloader
+	 *
+	 * @param string $class The name of the class to attempt to load.
+	 */
+	public function autoload($class)
+	{
+		// Only load the class if it starts with "SimplePie"
+		if (strpos($class, 'SimplePie') !== 0)
+		{
+			return;
+		}
+
+		$filename = $this->path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+		include $filename;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/db.sql b/core/libraries/vendor/simplepie/simplepie/db.sql
new file mode 100644
index 00000000..13f504c2
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/db.sql
@@ -0,0 +1,38 @@
+/* SQLite */
+CREATE TABLE cache_data (
+	id TEXT NOT NULL,
+	items SMALLINT NOT NULL DEFAULT 0,
+	data BLOB NOT NULL,
+	mtime INTEGER UNSIGNED NOT NULL
+);
+CREATE UNIQUE INDEX id ON cache_data(id);
+
+CREATE TABLE items (
+	feed_id TEXT NOT NULL,
+	id TEXT NOT NULL,
+	data TEXT NOT NULL,
+	posted INTEGER UNSIGNED NOT NULL
+);
+CREATE INDEX feed_id ON items(feed_id);
+
+
+/* MySQL */
+CREATE TABLE `cache_data` (
+	`id` TEXT CHARACTER SET utf8 NOT NULL,
+	`items` SMALLINT NOT NULL DEFAULT 0,
+	`data` BLOB NOT NULL,
+	`mtime` INT UNSIGNED NOT NULL,
+	UNIQUE (
+		`id`(125)
+	)
+);
+
+CREATE TABLE `items` (
+	`feed_id` TEXT CHARACTER SET utf8 NOT NULL,
+	`id` TEXT CHARACTER SET utf8 NOT NULL,
+	`data` TEXT CHARACTER SET utf8 NOT NULL,
+	`posted` INT UNSIGNED NOT NULL,
+	INDEX `feed_id` (
+		`feed_id`(125)
+	)
+);
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/idn/LICENCE b/core/libraries/vendor/simplepie/simplepie/idn/LICENCE
new file mode 100644
index 00000000..25a1d22d
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/idn/LICENCE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/core/libraries/vendor/simplepie/simplepie/idn/idna_convert.class.php b/core/libraries/vendor/simplepie/simplepie/idn/idna_convert.class.php
new file mode 100644
index 00000000..ed2bae26
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/idn/idna_convert.class.php
@@ -0,0 +1,969 @@
+<?php
+// {{{ license
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
+//
+// +----------------------------------------------------------------------+
+// | This library is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU Lesser General Public License as       |
+// | published by the Free Software Foundation; either version 2.1 of the |
+// | License, or (at your option) any later version.                      |
+// |                                                                      |
+// | This library is distributed in the hope that it will be useful, but  |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of           |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    |
+// | Lesser General Public License for more details.                      |
+// |                                                                      |
+// | You should have received a copy of the GNU Lesser General Public     |
+// | License along with this library; if not, write to the Free Software  |
+// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 |
+// | USA.                                                                 |
+// +----------------------------------------------------------------------+
+//
+
+// }}}
+
+/**
+ * Encode/decode Internationalized Domain Names.
+ *
+ * The class allows to convert internationalized domain names
+ * (see RFC 3490 for details) as they can be used with various registries worldwide
+ * to be translated between their original (localized) form and their encoded form
+ * as it will be used in the DNS (Domain Name System).
+ *
+ * The class provides two public methods, encode() and decode(), which do exactly
+ * what you would expect them to do. You are allowed to use complete domain names,
+ * simple strings and complete email addresses as well. That means, that you might
+ * use any of the following notations:
+ *
+ * - www.nörgler.com
+ * - xn--nrgler-wxa
+ * - xn--brse-5qa.xn--knrz-1ra.info
+ *
+ * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4
+ * array. Unicode output is available in the same formats.
+ * You can select your preferred format via {@link set_paramter()}.
+ *
+ * ACE input and output is always expected to be ASCII.
+ *
+ * @author  Matthias Sommerfeld <mso@phlylabs.de>
+ * @copyright 2004-2007 phlyLabs Berlin, http://phlylabs.de
+ * @version 0.5.1
+ *
+ */
+class idna_convert
+{
+    /**
+     * Holds all relevant mapping tables, loaded from a seperate file on construct
+     * See RFC3454 for details
+     *
+     * @var array
+     * @access private
+     */
+    var $NP = array();
+
+    // Internal settings, do not mess with them
+    var $_punycode_prefix = 'xn--';
+    var $_invalid_ucs =     0x80000000;
+    var $_max_ucs =         0x10FFFF;
+    var $_base =            36;
+    var $_tmin =            1;
+    var $_tmax =            26;
+    var $_skew =            38;
+    var $_damp =            700;
+    var $_initial_bias =    72;
+    var $_initial_n =       0x80;
+    var $_sbase =           0xAC00;
+    var $_lbase =           0x1100;
+    var $_vbase =           0x1161;
+    var $_tbase =           0x11A7;
+    var $_lcount =          19;
+    var $_vcount =          21;
+    var $_tcount =          28;
+    var $_ncount =          588;   // _vcount * _tcount
+    var $_scount =          11172; // _lcount * _tcount * _vcount
+    var $_error =           false;
+
+    // See {@link set_paramter()} for details of how to change the following
+    // settings from within your script / application
+    var $_api_encoding   =  'utf8'; // Default input charset is UTF-8
+    var $_allow_overlong =  false;  // Overlong UTF-8 encodings are forbidden
+    var $_strict_mode    =  false;  // Behave strict or not
+
+    // The constructor
+    function idna_convert($options = false)
+    {
+        $this->slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
+        if (function_exists('file_get_contents')) {
+            $this->NP = unserialize(file_get_contents(dirname(__FILE__).'/npdata.ser'));
+        } else {
+            $this->NP = unserialize(join('', file(dirname(__FILE__).'/npdata.ser')));
+        }
+        // If parameters are given, pass these to the respective method
+        if (is_array($options)) {
+            return $this->set_parameter($options);
+        }
+        return true;
+    }
+
+    /**
+     * Sets a new option value. Available options and values:
+     * [encoding - Use either UTF-8, UCS4 as array or UCS4 as string as input ('utf8' for UTF-8,
+     *         'ucs4_string' and 'ucs4_array' respectively for UCS4); The output is always UTF-8]
+     * [overlong - Unicode does not allow unnecessarily long encodings of chars,
+     *             to allow this, set this parameter to true, else to false;
+     *             default is false.]
+     * [strict - true: strict mode, good for registration purposes - Causes errors
+     *           on failures; false: loose mode, ideal for "wildlife" applications
+     *           by silently ignoring errors and returning the original input instead
+     *
+     * @param    mixed     Parameter to set (string: single parameter; array of Parameter => Value pairs)
+     * @param    string    Value to use (if parameter 1 is a string)
+     * @return   boolean   true on success, false otherwise
+     * @access   public
+     */
+    function set_parameter($option, $value = false)
+    {
+        if (!is_array($option)) {
+            $option = array($option => $value);
+        }
+        foreach ($option as $k => $v) {
+            switch ($k) {
+            case 'encoding':
+                switch ($v) {
+                case 'utf8':
+                case 'ucs4_string':
+                case 'ucs4_array':
+                    $this->_api_encoding = $v;
+                    break;
+                default:
+                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                    return false;
+                }
+                break;
+            case 'overlong':
+                $this->_allow_overlong = ($v) ? true : false;
+                break;
+            case 'strict':
+                $this->_strict_mode = ($v) ? true : false;
+                break;
+            default:
+                $this->_error('Set Parameter: Unknown option '.$k);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Decode a given ACE domain name
+     * @param    string   Domain name (ACE string)
+     * [@param    string   Desired output encoding, see {@link set_parameter}]
+     * @return   string   Decoded Domain name (UTF-8 or UCS-4)
+     * @access   public
+     */
+    function decode($input, $one_time_encoding = false)
+    {
+        // Optionally set
+        if ($one_time_encoding) {
+            switch ($one_time_encoding) {
+            case 'utf8':
+            case 'ucs4_string':
+            case 'ucs4_array':
+                break;
+            default:
+                $this->_error('Unknown encoding '.$one_time_encoding);
+                return false;
+            }
+        }
+        // Make sure to drop any newline characters around
+        $input = trim($input);
+
+        // Negotiate input and try to determine, whether it is a plain string,
+        // an email address or something like a complete URL
+        if (strpos($input, '@')) { // Maybe it is an email address
+            // No no in strict mode
+            if ($this->_strict_mode) {
+                $this->_error('Only simple domain name parts can be handled in strict mode');
+                return false;
+            }
+            list ($email_pref, $input) = explode('@', $input, 2);
+            $arr = explode('.', $input);
+            foreach ($arr as $k => $v) {
+                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+            }
+            $input = join('.', $arr);
+            $arr = explode('.', $email_pref);
+            foreach ($arr as $k => $v) {
+                if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+            }
+            $email_pref = join('.', $arr);
+            $return = $email_pref . '@' . $input;
+        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
+            // No no in strict mode
+            if ($this->_strict_mode) {
+                $this->_error('Only simple domain name parts can be handled in strict mode');
+                return false;
+            }
+            $parsed = parse_url($input);
+            if (isset($parsed['host'])) {
+                $arr = explode('.', $parsed['host']);
+                foreach ($arr as $k => $v) {
+                    $conv = $this->_decode($v);
+                    if ($conv) $arr[$k] = $conv;
+                }
+                $parsed['host'] = join('.', $arr);
+                $return =
+                        (empty($parsed['scheme']) ? '' : $parsed['scheme'].(strtolower($parsed['scheme']) == 'mailto' ? ':' : '://'))
+                        .(empty($parsed['user']) ? '' : $parsed['user'].(empty($parsed['pass']) ? '' : ':'.$parsed['pass']).'@')
+                        .$parsed['host']
+                        .(empty($parsed['port']) ? '' : ':'.$parsed['port'])
+                        .(empty($parsed['path']) ? '' : $parsed['path'])
+                        .(empty($parsed['query']) ? '' : '?'.$parsed['query'])
+                        .(empty($parsed['fragment']) ? '' : '#'.$parsed['fragment']);
+            } else { // parse_url seems to have failed, try without it
+                $arr = explode('.', $input);
+                foreach ($arr as $k => $v) {
+                    $conv = $this->_decode($v);
+                    $arr[$k] = ($conv) ? $conv : $v;
+                }
+                $return = join('.', $arr);
+            }
+        } else { // Otherwise we consider it being a pure domain name string
+            $return = $this->_decode($input);
+            if (!$return) $return = $input;
+        }
+        // The output is UTF-8 by default, other output formats need conversion here
+        // If one time encoding is given, use this, else the objects property
+        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
+        case 'utf8':
+            return $return;
+            break;
+        case 'ucs4_string':
+           return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
+           break;
+        case 'ucs4_array':
+            return $this->_utf8_to_ucs4($return);
+            break;
+        default:
+            $this->_error('Unsupported output format');
+            return false;
+        }
+    }
+
+    /**
+     * Encode a given UTF-8 domain name
+     * @param    string   Domain name (UTF-8 or UCS-4)
+     * [@param    string   Desired input encoding, see {@link set_parameter}]
+     * @return   string   Encoded Domain name (ACE string)
+     * @access   public
+     */
+    function encode($decoded, $one_time_encoding = false)
+    {
+        // Forcing conversion of input to UCS4 array
+        // If one time encoding is given, use this, else the objects property
+        switch ($one_time_encoding ? $one_time_encoding : $this->_api_encoding) {
+        case 'utf8':
+            $decoded = $this->_utf8_to_ucs4($decoded);
+            break;
+        case 'ucs4_string':
+           $decoded = $this->_ucs4_string_to_ucs4($decoded);
+        case 'ucs4_array':
+           break;
+        default:
+            $this->_error('Unsupported input format: '.($one_time_encoding ? $one_time_encoding : $this->_api_encoding));
+            return false;
+        }
+
+        // No input, no output, what else did you expect?
+        if (empty($decoded)) return '';
+
+        // Anchors for iteration
+        $last_begin = 0;
+        // Output string
+        $output = '';
+        foreach ($decoded as $k => $v) {
+            // Make sure to use just the plain dot
+            switch($v) {
+            case 0x3002:
+            case 0xFF0E:
+            case 0xFF61:
+                $decoded[$k] = 0x2E;
+                // Right, no break here, the above are converted to dots anyway
+            // Stumbling across an anchoring character
+            case 0x2E:
+            case 0x2F:
+            case 0x3A:
+            case 0x3F:
+            case 0x40:
+                // Neither email addresses nor URLs allowed in strict mode
+                if ($this->_strict_mode) {
+                   $this->_error('Neither email addresses nor URLs are allowed in strict mode.');
+                   return false;
+                } else {
+                    // Skip first char
+                    if ($k) {
+                        $encoded = '';
+                        $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        if ($encoded) {
+                            $output .= $encoded;
+                        } else {
+                            $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
+                        }
+                        $output .= chr($decoded[$k]);
+                    }
+                    $last_begin = $k + 1;
+                }
+            }
+        }
+        // Catch the rest of the string
+        if ($last_begin) {
+            $inp_len = sizeof($decoded);
+            $encoded = '';
+            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            if ($encoded) {
+                $output .= $encoded;
+            } else {
+                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
+            }
+            return $output;
+        } else {
+            if ($output = $this->_encode($decoded)) {
+                return $output;
+            } else {
+                return $this->_ucs4_to_utf8($decoded);
+            }
+        }
+    }
+
+    /**
+     * Use this method to get the last error ocurred
+     * @param    void
+     * @return   string   The last error, that occured
+     * @access   public
+     */
+    function get_last_error()
+    {
+        return $this->_error;
+    }
+
+    /**
+     * The actual decoding algorithm
+     * @access   private
+     */
+    function _decode($encoded)
+    {
+        // We do need to find the Punycode prefix
+        if (!preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $encoded)) {
+            $this->_error('This is not a punycode string');
+            return false;
+        }
+        $encode_test = preg_replace('!^'.preg_quote($this->_punycode_prefix, '!').'!', '', $encoded);
+        // If nothing left after removing the prefix, it is hopeless
+        if (!$encode_test) {
+            $this->_error('The given encoded string was empty');
+            return false;
+        }
+        // Find last occurence of the delimiter
+        $delim_pos = strrpos($encoded, '-');
+        if ($delim_pos > strlen($this->_punycode_prefix)) {
+            for ($k = strlen($this->_punycode_prefix); $k < $delim_pos; ++$k) {
+                $decoded[] = ord($encoded{$k});
+            }
+        } else {
+            $decoded = array();
+        }
+        $deco_len = count($decoded);
+        $enco_len = strlen($encoded);
+
+        // Wandering through the strings; init
+        $is_first = true;
+        $bias     = $this->_initial_bias;
+        $idx      = 0;
+        $char     = $this->_initial_n;
+
+        for ($enco_idx = ($delim_pos) ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
+            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
+                $digit = $this->_decode_digit($encoded{$enco_idx++});
+                $idx += $digit * $w;
+                $t = ($k <= $bias) ? $this->_tmin :
+                        (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias));
+                if ($digit < $t) break;
+                $w = (int) ($w * ($this->_base - $t));
+            }
+            $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
+            $is_first = false;
+            $char += (int) ($idx / ($deco_len + 1));
+            $idx %= ($deco_len + 1);
+            if ($deco_len > 0) {
+                // Make room for the decoded char
+                for ($i = $deco_len; $i > $idx; $i--) {
+                    $decoded[$i] = $decoded[($i - 1)];
+                }
+            }
+            $decoded[$idx++] = $char;
+        }
+        return $this->_ucs4_to_utf8($decoded);
+    }
+
+    /**
+     * The actual encoding algorithm
+     * @access   private
+     */
+    function _encode($decoded)
+    {
+        // We cannot encode a domain name containing the Punycode prefix
+        $extract = strlen($this->_punycode_prefix);
+        $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
+        $check_deco = array_slice($decoded, 0, $extract);
+
+        if ($check_pref == $check_deco) {
+            $this->_error('This is already a punycode string');
+            return false;
+        }
+        // We will not try to encode strings consisting of basic code points only
+        $encodable = false;
+        foreach ($decoded as $k => $v) {
+            if ($v > 0x7a) {
+                $encodable = true;
+                break;
+            }
+        }
+        if (!$encodable) {
+            $this->_error('The given string does not contain encodable chars');
+            return false;
+        }
+
+        // Do NAMEPREP
+        $decoded = $this->_nameprep($decoded);
+        if (!$decoded || !is_array($decoded)) return false; // NAMEPREP failed
+
+        $deco_len  = count($decoded);
+        if (!$deco_len) return false; // Empty array
+
+        $codecount = 0; // How many chars have been consumed
+
+        $encoded = '';
+        // Copy all basic code points to output
+        for ($i = 0; $i < $deco_len; ++$i) {
+            $test = $decoded[$i];
+            // Will match [-0-9a-zA-Z]
+            if ((0x2F < $test && $test < 0x40) || (0x40 < $test && $test < 0x5B)
+                    || (0x60 < $test && $test <= 0x7B) || (0x2D == $test)) {
+                $encoded .= chr($decoded[$i]);
+                $codecount++;
+            }
+        }
+        if ($codecount == $deco_len) return $encoded; // All codepoints were basic ones
+
+        // Start with the prefix; copy it to output
+        $encoded = $this->_punycode_prefix.$encoded;
+
+        // If we have basic code points in output, add an hyphen to the end
+        if ($codecount) $encoded .= '-';
+
+        // Now find and encode all non-basic code points
+        $is_first  = true;
+        $cur_code  = $this->_initial_n;
+        $bias      = $this->_initial_bias;
+        $delta     = 0;
+        while ($codecount < $deco_len) {
+            // Find the smallest code point >= the current code point and
+            // remember the last ouccrence of it in the input
+            for ($i = 0, $next_code = $this->_max_ucs; $i < $deco_len; $i++) {
+                if ($decoded[$i] >= $cur_code && $decoded[$i] <= $next_code) {
+                    $next_code = $decoded[$i];
+                }
+            }
+
+            $delta += ($next_code - $cur_code) * ($codecount + 1);
+            $cur_code = $next_code;
+
+            // Scan input again and encode all characters whose code point is $cur_code
+            for ($i = 0; $i < $deco_len; $i++) {
+                if ($decoded[$i] < $cur_code) {
+                    $delta++;
+                } elseif ($decoded[$i] == $cur_code) {
+                    for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
+                        $t = ($k <= $bias) ? $this->_tmin :
+                                (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias);
+                        if ($q < $t) break;
+                        $encoded .= $this->_encode_digit(intval($t + (($q - $t) % ($this->_base - $t)))); //v0.4.5 Changed from ceil() to intval()
+                        $q = (int) (($q - $t) / ($this->_base - $t));
+                    }
+                    $encoded .= $this->_encode_digit($q);
+                    $bias = $this->_adapt($delta, $codecount+1, $is_first);
+                    $codecount++;
+                    $delta = 0;
+                    $is_first = false;
+                }
+            }
+            $delta++;
+            $cur_code++;
+        }
+        return $encoded;
+    }
+
+    /**
+     * Adapt the bias according to the current code point and position
+     * @access   private
+     */
+    function _adapt($delta, $npoints, $is_first)
+    {
+        $delta = intval($is_first ? ($delta / $this->_damp) : ($delta / 2));
+        $delta += intval($delta / $npoints);
+        for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
+            $delta = intval($delta / ($this->_base - $this->_tmin));
+        }
+        return intval($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
+    }
+
+    /**
+     * Encoding a certain digit
+     * @access   private
+     */
+    function _encode_digit($d)
+    {
+        return chr($d + 22 + 75 * ($d < 26));
+    }
+
+    /**
+     * Decode a certain digit
+     * @access   private
+     */
+    function _decode_digit($cp)
+    {
+        $cp = ord($cp);
+        return ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $this->_base));
+    }
+
+    /**
+     * Internal error handling method
+     * @access   private
+     */
+    function _error($error = '')
+    {
+        $this->_error = $error;
+    }
+
+    /**
+     * Do Nameprep according to RFC3491 and RFC3454
+     * @param    array    Unicode Characters
+     * @return   string   Unicode Characters, Nameprep'd
+     * @access   private
+     */
+    function _nameprep($input)
+    {
+        $output = array();
+        $error = false;
+        //
+        // Mapping
+        // Walking through the input array, performing the required steps on each of
+        // the input chars and putting the result into the output array
+        // While mapping required chars we apply the cannonical ordering
+        foreach ($input as $v) {
+            // Map to nothing == skip that code point
+            if (in_array($v, $this->NP['map_nothing'])) continue;
+
+            // Try to find prohibited input
+            if (in_array($v, $this->NP['prohibit']) || in_array($v, $this->NP['general_prohibited'])) {
+                $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
+                return false;
+            }
+            foreach ($this->NP['prohibit_ranges'] as $range) {
+                if ($range[0] <= $v && $v <= $range[1]) {
+                    $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
+                    return false;
+                }
+            }
+            //
+            // Hangul syllable decomposition
+            if (0xAC00 <= $v && $v <= 0xD7AF) {
+                foreach ($this->_hangul_decompose($v) as $out) {
+                    $output[] = (int) $out;
+                }
+            // There's a decomposition mapping for that code point
+            } elseif (isset($this->NP['replacemaps'][$v])) {
+                foreach ($this->_apply_cannonical_ordering($this->NP['replacemaps'][$v]) as $out) {
+                    $output[] = (int) $out;
+                }
+            } else {
+                $output[] = (int) $v;
+            }
+        }
+        // Before applying any Combining, try to rearrange any Hangul syllables
+        $output = $this->_hangul_compose($output);
+        //
+        // Combine code points
+        //
+        $last_class   = 0;
+        $last_starter = 0;
+        $out_len      = count($output);
+        for ($i = 0; $i < $out_len; ++$i) {
+            $class = $this->_get_combining_class($output[$i]);
+            if ((!$last_class || $last_class > $class) && $class) {
+                // Try to match
+                $seq_len = $i - $last_starter;
+                $out = $this->_combine(array_slice($output, $last_starter, $seq_len));
+                // On match: Replace the last starter with the composed character and remove
+                // the now redundant non-starter(s)
+                if ($out) {
+                    $output[$last_starter] = $out;
+                    if (count($out) != $seq_len) {
+                        for ($j = $i+1; $j < $out_len; ++$j) {
+                            $output[$j-1] = $output[$j];
+                        }
+                        unset($output[$out_len]);
+                    }
+                    // Rewind the for loop by one, since there can be more possible compositions
+                    $i--;
+                    $out_len--;
+                    $last_class = ($i == $last_starter) ? 0 : $this->_get_combining_class($output[$i-1]);
+                    continue;
+                }
+            }
+            // The current class is 0
+            if (!$class) $last_starter = $i;
+            $last_class = $class;
+        }
+        return $output;
+    }
+
+    /**
+     * Decomposes a Hangul syllable
+     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul
+     * @param    integer  32bit UCS4 code point
+     * @return   array    Either Hangul Syllable decomposed or original 32bit value as one value array
+     * @access   private
+     */
+    function _hangul_decompose($char)
+    {
+        $sindex = (int) $char - $this->_sbase;
+        if ($sindex < 0 || $sindex >= $this->_scount) {
+            return array($char);
+        }
+        $result = array();
+        $result[] = (int) $this->_lbase + $sindex / $this->_ncount;
+        $result[] = (int) $this->_vbase + ($sindex % $this->_ncount) / $this->_tcount;
+        $T = intval($this->_tbase + $sindex % $this->_tcount);
+        if ($T != $this->_tbase) $result[] = $T;
+        return $result;
+    }
+    /**
+     * Ccomposes a Hangul syllable
+     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul
+     * @param    array    Decomposed UCS4 sequence
+     * @return   array    UCS4 sequence with syllables composed
+     * @access   private
+     */
+    function _hangul_compose($input)
+    {
+        $inp_len = count($input);
+        if (!$inp_len) return array();
+        $result = array();
+        $last = (int) $input[0];
+        $result[] = $last; // copy first char from input to output
+
+        for ($i = 1; $i < $inp_len; ++$i) {
+            $char = (int) $input[$i];
+            $sindex = $last - $this->_sbase;
+            $lindex = $last - $this->_lbase;
+            $vindex = $char - $this->_vbase;
+            $tindex = $char - $this->_tbase;
+            // Find out, whether two current characters are LV and T
+            if (0 <= $sindex && $sindex < $this->_scount && ($sindex % $this->_tcount == 0)
+                    && 0 <= $tindex && $tindex <= $this->_tcount) {
+                // create syllable of form LVT
+                $last += $tindex;
+                $result[(count($result) - 1)] = $last; // reset last
+                continue; // discard char
+            }
+            // Find out, whether two current characters form L and V
+            if (0 <= $lindex && $lindex < $this->_lcount && 0 <= $vindex && $vindex < $this->_vcount) {
+                // create syllable of form LV
+                $last = (int) $this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount;
+                $result[(count($result) - 1)] = $last; // reset last
+                continue; // discard char
+            }
+            // if neither case was true, just add the character
+            $last = $char;
+            $result[] = $char;
+        }
+        return $result;
+    }
+
+    /**
+     * Returns the combining class of a certain wide char
+     * @param    integer    Wide char to check (32bit integer)
+     * @return   integer    Combining class if found, else 0
+     * @access   private
+     */
+    function _get_combining_class($char)
+    {
+        return isset($this->NP['norm_combcls'][$char]) ? $this->NP['norm_combcls'][$char] : 0;
+    }
+
+    /**
+     * Apllies the cannonical ordering of a decomposed UCS4 sequence
+     * @param    array      Decomposed UCS4 sequence
+     * @return   array      Ordered USC4 sequence
+     * @access   private
+     */
+    function _apply_cannonical_ordering($input)
+    {
+        $swap = true;
+        $size = count($input);
+        while ($swap) {
+            $swap = false;
+            $last = $this->_get_combining_class(intval($input[0]));
+            for ($i = 0; $i < $size-1; ++$i) {
+                $next = $this->_get_combining_class(intval($input[$i+1]));
+                if ($next != 0 && $last > $next) {
+                    // Move item leftward until it fits
+                    for ($j = $i + 1; $j > 0; --$j) {
+                        if ($this->_get_combining_class(intval($input[$j-1])) <= $next) break;
+                        $t = intval($input[$j]);
+                        $input[$j] = intval($input[$j-1]);
+                        $input[$j-1] = $t;
+                        $swap = true;
+                    }
+                    // Reentering the loop looking at the old character again
+                    $next = $last;
+                }
+                $last = $next;
+            }
+        }
+        return $input;
+    }
+
+    /**
+     * Do composition of a sequence of starter and non-starter
+     * @param    array      UCS4 Decomposed sequence
+     * @return   array      Ordered USC4 sequence
+     * @access   private
+     */
+    function _combine($input)
+    {
+        $inp_len = count($input);
+        foreach ($this->NP['replacemaps'] as $np_src => $np_target) {
+            if ($np_target[0] != $input[0]) continue;
+            if (count($np_target) != $inp_len) continue;
+            $hit = false;
+            foreach ($input as $k2 => $v2) {
+                if ($v2 == $np_target[$k2]) {
+                    $hit = true;
+                } else {
+                    $hit = false;
+                    break;
+                }
+            }
+            if ($hit) return $np_src;
+        }
+        return false;
+    }
+
+    /**
+     * This converts an UTF-8 encoded string to its UCS-4 representation
+     * By talking about UCS-4 "strings" we mean arrays of 32bit integers representing
+     * each of the "chars". This is due to PHP not being able to handle strings with
+     * bit depth different from 8. This apllies to the reverse method _ucs4_to_utf8(), too.
+     * The following UTF-8 encodings are supported:
+     * bytes bits  representation
+     * 1        7  0xxxxxxx
+     * 2       11  110xxxxx 10xxxxxx
+     * 3       16  1110xxxx 10xxxxxx 10xxxxxx
+     * 4       21  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * 5       26  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * 6       31  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+     * Each x represents a bit that can be used to store character data.
+     * The five and six byte sequences are part of Annex D of ISO/IEC 10646-1:2000
+     * @access   private
+     */
+    function _utf8_to_ucs4($input)
+    {
+        $output = array();
+        $out_len = 0;
+        $inp_len = strlen($input);
+        $mode = 'next';
+        $test = 'none';
+        for ($k = 0; $k < $inp_len; ++$k) {
+            $v = ord($input{$k}); // Extract byte from input string
+
+            if ($v < 128) { // We found an ASCII char - put into stirng as is
+                $output[$out_len] = $v;
+                ++$out_len;
+                if ('add' == $mode) {
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    return false;
+                }
+                continue;
+            }
+            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
+                $start_byte = $v;
+                $mode = 'add';
+                $test = 'range';
+                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
+                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
+                    $v = ($v - 192) << 6;
+                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 1;
+                    $v = ($v - 224) << 12;
+                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 2;
+                    $v = ($v - 240) << 18;
+                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 3;
+                    $v = ($v - 248) << 24;
+                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
+                    $next_byte = 4;
+                    $v = ($v - 252) << 30;
+                } else {
+                    $this->_error('This might be UTF-8, but I don\'t understand it at byte '.$k);
+                    return false;
+                }
+                if ('add' == $mode) {
+                    $output[$out_len] = (int) $v;
+                    ++$out_len;
+                    continue;
+                }
+            }
+            if ('add' == $mode) {
+                if (!$this->_allow_overlong && $test == 'range') {
+                    $test = 'none';
+                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
+                        $this->_error('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
+                        return false;
+                    }
+                }
+                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
+                    $v = ($v - 128) << ($next_byte * 6);
+                    $output[($out_len - 1)] += $v;
+                    --$next_byte;
+                } else {
+                    $this->_error('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
+                    return false;
+                }
+                if ($next_byte < 0) {
+                    $mode = 'next';
+                }
+            }
+        } // for
+        return $output;
+    }
+
+    /**
+     * Convert UCS-4 string into UTF-8 string
+     * See _utf8_to_ucs4() for details
+     * @access   private
+     */
+    function _ucs4_to_utf8($input)
+    {
+        $output = '';
+        $k = 0;
+        foreach ($input as $v) {
+            ++$k;
+            // $v = ord($v);
+            if ($v < 128) { // 7bit are transferred literally
+                $output .= chr($v);
+            } elseif ($v < (1 << 11)) { // 2 bytes
+                $output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
+            } elseif ($v < (1 << 16)) { // 3 bytes
+                $output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
+            } elseif ($v < (1 << 21)) { // 4 bytes
+                $output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63))
+                         . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
+            } elseif ($v < (1 << 26)) { // 5 bytes
+                $output .= chr(248 + ($v >> 24)) . chr(128 + (($v >> 18) & 63))
+                         . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63))
+                         . chr(128 + ($v & 63));
+            } elseif ($v < (1 << 31)) { // 6 bytes
+                $output .= chr(252 + ($v >> 30)) . chr(128 + (($v >> 24) & 63))
+                         . chr(128 + (($v >> 18) & 63)) . chr(128 + (($v >> 12) & 63))
+                         . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
+            } else {
+                $this->_error('Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k);
+                return false;
+            }
+        }
+        return $output;
+    }
+
+    /**
+      * Convert UCS-4 array into UCS-4 string
+      *
+      * @access   private
+      */
+    function _ucs4_to_ucs4_string($input)
+    {
+        $output = '';
+        // Take array values and split output to 4 bytes per value
+        // The bit mask is 255, which reads &11111111
+        foreach ($input as $v) {
+            $output .= chr(($v >> 24) & 255).chr(($v >> 16) & 255).chr(($v >> 8) & 255).chr($v & 255);
+        }
+        return $output;
+    }
+
+    /**
+      * Convert UCS-4 strin into UCS-4 garray
+      *
+      * @access   private
+      */
+    function _ucs4_string_to_ucs4($input)
+    {
+        $output = array();
+        $inp_len = strlen($input);
+        // Input length must be dividable by 4
+        if ($inp_len % 4) {
+            $this->_error('Input UCS4 string is broken');
+            return false;
+        }
+        // Empty input - return empty output
+        if (!$inp_len) return $output;
+        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
+            // Increment output position every 4 input bytes
+            if (!($i % 4)) {
+                $out_len++;
+                $output[$out_len] = 0;
+            }
+            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
+        }
+        return $output;
+    }
+}
+
+/**
+* Adapter class for aligning the API of idna_convert with that of Net_IDNA
+* @author  Matthias Sommerfeld <mso@phlylabs.de>
+*/
+class Net_IDNA_php4 extends idna_convert
+{
+    /**
+     * Sets a new option value. Available options and values:
+     * [encoding - Use either UTF-8, UCS4 as array or UCS4 as string as input ('utf8' for UTF-8,
+     *         'ucs4_string' and 'ucs4_array' respectively for UCS4); The output is always UTF-8]
+     * [overlong - Unicode does not allow unnecessarily long encodings of chars,
+     *             to allow this, set this parameter to true, else to false;
+     *             default is false.]
+     * [strict - true: strict mode, good for registration purposes - Causes errors
+     *           on failures; false: loose mode, ideal for "wildlife" applications
+     *           by silently ignoring errors and returning the original input instead
+     *
+     * @param    mixed     Parameter to set (string: single parameter; array of Parameter => Value pairs)
+     * @param    string    Value to use (if parameter 1 is a string)
+     * @return   boolean   true on success, false otherwise
+     * @access   public
+     */
+    function setParams($option, $param = false)
+    {
+        return $this->IC->set_parameters($option, $param);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/idn/npdata.ser b/core/libraries/vendor/simplepie/simplepie/idn/npdata.ser
new file mode 100644
index 00000000..d7ce6d03
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/idn/npdata.ser
@@ -0,0 +1 @@
+a:6:{s:11:"map_nothing";a:27:{i:0;i:173;i:1;i:847;i:2;i:6150;i:3;i:6155;i:4;i:6156;i:5;i:6157;i:6;i:8203;i:7;i:8204;i:8;i:8205;i:9;i:8288;i:10;i:65024;i:11;i:65025;i:12;i:65026;i:13;i:65027;i:14;i:65028;i:15;i:65029;i:16;i:65030;i:17;i:65031;i:18;i:65032;i:19;i:65033;i:20;i:65034;i:21;i:65035;i:22;i:65036;i:23;i:65037;i:24;i:65038;i:25;i:65039;i:26;i:65279;}s:18:"general_prohibited";a:64:{i:0;i:0;i:1;i:1;i:2;i:2;i:3;i:3;i:4;i:4;i:5;i:5;i:6;i:6;i:7;i:7;i:8;i:8;i:9;i:9;i:10;i:10;i:11;i:11;i:12;i:12;i:13;i:13;i:14;i:14;i:15;i:15;i:16;i:16;i:17;i:17;i:18;i:18;i:19;i:19;i:20;i:20;i:21;i:21;i:22;i:22;i:23;i:23;i:24;i:24;i:25;i:25;i:26;i:26;i:27;i:27;i:28;i:28;i:29;i:29;i:30;i:30;i:31;i:31;i:32;i:32;i:33;i:33;i:34;i:34;i:35;i:35;i:36;i:36;i:37;i:37;i:38;i:38;i:39;i:39;i:40;i:40;i:41;i:41;i:42;i:42;i:43;i:43;i:44;i:44;i:45;i:47;i:46;i:59;i:47;i:60;i:48;i:61;i:49;i:62;i:50;i:63;i:51;i:64;i:52;i:91;i:53;i:92;i:54;i:93;i:55;i:94;i:56;i:95;i:57;i:96;i:58;i:123;i:59;i:124;i:60;i:125;i:61;i:126;i:62;i:127;i:63;i:12290;}s:8:"prohibit";a:84:{i:0;i:160;i:1;i:5760;i:2;i:8192;i:3;i:8193;i:4;i:8194;i:5;i:8195;i:6;i:8196;i:7;i:8197;i:8;i:8198;i:9;i:8199;i:10;i:8200;i:11;i:8201;i:12;i:8202;i:13;i:8203;i:14;i:8239;i:15;i:8287;i:16;i:12288;i:17;i:1757;i:18;i:1807;i:19;i:6158;i:20;i:8204;i:21;i:8205;i:22;i:8232;i:23;i:8233;i:24;i:65279;i:25;i:65529;i:26;i:65530;i:27;i:65531;i:28;i:65532;i:29;i:65534;i:30;i:65535;i:31;i:131070;i:32;i:131071;i:33;i:196606;i:34;i:196607;i:35;i:262142;i:36;i:262143;i:37;i:327678;i:38;i:327679;i:39;i:393214;i:40;i:393215;i:41;i:458750;i:42;i:458751;i:43;i:524286;i:44;i:524287;i:45;i:589822;i:46;i:589823;i:47;i:655358;i:48;i:655359;i:49;i:720894;i:50;i:720895;i:51;i:786430;i:52;i:786431;i:53;i:851966;i:54;i:851967;i:55;i:917502;i:56;i:917503;i:57;i:983038;i:58;i:983039;i:59;i:1048574;i:60;i:1048575;i:61;i:1114110;i:62;i:1114111;i:63;i:65529;i:64;i:65530;i:65;i:65531;i:66;i:65532;i:67;i:65533;i:68;i:832;i:69;i:833;i:70;i:8206;i:71;i:8207;i:72;i:8234;i:73;i:8235;i:74;i:8236;i:75;i:8237;i:76;i:8238;i:77;i:8298;i:78;i:8299;i:79;i:8300;i:80;i:8301;i:81;i:8302;i:82;i:8303;i:83;i:917505;}s:15:"prohibit_ranges";a:10:{i:0;a:2:{i:0;i:128;i:1;i:159;}i:1;a:2:{i:0;i:8288;i:1;i:8303;}i:2;a:2:{i:0;i:119155;i:1;i:119162;}i:3;a:2:{i:0;i:57344;i:1;i:63743;}i:4;a:2:{i:0;i:983040;i:1;i:1048573;}i:5;a:2:{i:0;i:1048576;i:1;i:1114109;}i:6;a:2:{i:0;i:64976;i:1;i:65007;}i:7;a:2:{i:0;i:55296;i:1;i:57343;}i:8;a:2:{i:0;i:12272;i:1;i:12283;}i:9;a:2:{i:0;i:917536;i:1;i:917631;}}s:11:"replacemaps";a:1401:{i:65;a:1:{i:0;i:97;}i:66;a:1:{i:0;i:98;}i:67;a:1:{i:0;i:99;}i:68;a:1:{i:0;i:100;}i:69;a:1:{i:0;i:101;}i:70;a:1:{i:0;i:102;}i:71;a:1:{i:0;i:103;}i:72;a:1:{i:0;i:104;}i:73;a:1:{i:0;i:105;}i:74;a:1:{i:0;i:106;}i:75;a:1:{i:0;i:107;}i:76;a:1:{i:0;i:108;}i:77;a:1:{i:0;i:109;}i:78;a:1:{i:0;i:110;}i:79;a:1:{i:0;i:111;}i:80;a:1:{i:0;i:112;}i:81;a:1:{i:0;i:113;}i:82;a:1:{i:0;i:114;}i:83;a:1:{i:0;i:115;}i:84;a:1:{i:0;i:116;}i:85;a:1:{i:0;i:117;}i:86;a:1:{i:0;i:118;}i:87;a:1:{i:0;i:119;}i:88;a:1:{i:0;i:120;}i:89;a:1:{i:0;i:121;}i:90;a:1:{i:0;i:122;}i:181;a:1:{i:0;i:956;}i:192;a:1:{i:0;i:224;}i:193;a:1:{i:0;i:225;}i:194;a:1:{i:0;i:226;}i:195;a:1:{i:0;i:227;}i:196;a:1:{i:0;i:228;}i:197;a:1:{i:0;i:229;}i:198;a:1:{i:0;i:230;}i:199;a:1:{i:0;i:231;}i:200;a:1:{i:0;i:232;}i:201;a:1:{i:0;i:233;}i:202;a:1:{i:0;i:234;}i:203;a:1:{i:0;i:235;}i:204;a:1:{i:0;i:236;}i:205;a:1:{i:0;i:237;}i:206;a:1:{i:0;i:238;}i:207;a:1:{i:0;i:239;}i:208;a:1:{i:0;i:240;}i:209;a:1:{i:0;i:241;}i:210;a:1:{i:0;i:242;}i:211;a:1:{i:0;i:243;}i:212;a:1:{i:0;i:244;}i:213;a:1:{i:0;i:245;}i:214;a:1:{i:0;i:246;}i:216;a:1:{i:0;i:248;}i:217;a:1:{i:0;i:249;}i:218;a:1:{i:0;i:250;}i:219;a:1:{i:0;i:251;}i:220;a:1:{i:0;i:252;}i:221;a:1:{i:0;i:253;}i:222;a:1:{i:0;i:254;}i:223;a:2:{i:0;i:115;i:1;i:115;}i:256;a:1:{i:0;i:257;}i:258;a:1:{i:0;i:259;}i:260;a:1:{i:0;i:261;}i:262;a:1:{i:0;i:263;}i:264;a:1:{i:0;i:265;}i:266;a:1:{i:0;i:267;}i:268;a:1:{i:0;i:269;}i:270;a:1:{i:0;i:271;}i:272;a:1:{i:0;i:273;}i:274;a:1:{i:0;i:275;}i:276;a:1:{i:0;i:277;}i:278;a:1:{i:0;i:279;}i:280;a:1:{i:0;i:281;}i:282;a:1:{i:0;i:283;}i:284;a:1:{i:0;i:285;}i:286;a:1:{i:0;i:287;}i:288;a:1:{i:0;i:289;}i:290;a:1:{i:0;i:291;}i:292;a:1:{i:0;i:293;}i:294;a:1:{i:0;i:295;}i:296;a:1:{i:0;i:297;}i:298;a:1:{i:0;i:299;}i:300;a:1:{i:0;i:301;}i:302;a:1:{i:0;i:303;}i:304;a:2:{i:0;i:105;i:1;i:775;}i:306;a:1:{i:0;i:307;}i:308;a:1:{i:0;i:309;}i:310;a:1:{i:0;i:311;}i:313;a:1:{i:0;i:314;}i:315;a:1:{i:0;i:316;}i:317;a:1:{i:0;i:318;}i:319;a:1:{i:0;i:320;}i:321;a:1:{i:0;i:322;}i:323;a:1:{i:0;i:324;}i:325;a:1:{i:0;i:326;}i:327;a:1:{i:0;i:328;}i:329;a:2:{i:0;i:700;i:1;i:110;}i:330;a:1:{i:0;i:331;}i:332;a:1:{i:0;i:333;}i:334;a:1:{i:0;i:335;}i:336;a:1:{i:0;i:337;}i:338;a:1:{i:0;i:339;}i:340;a:1:{i:0;i:341;}i:342;a:1:{i:0;i:343;}i:344;a:1:{i:0;i:345;}i:346;a:1:{i:0;i:347;}i:348;a:1:{i:0;i:349;}i:350;a:1:{i:0;i:351;}i:352;a:1:{i:0;i:353;}i:354;a:1:{i:0;i:355;}i:356;a:1:{i:0;i:357;}i:358;a:1:{i:0;i:359;}i:360;a:1:{i:0;i:361;}i:362;a:1:{i:0;i:363;}i:364;a:1:{i:0;i:365;}i:366;a:1:{i:0;i:367;}i:368;a:1:{i:0;i:369;}i:370;a:1:{i:0;i:371;}i:372;a:1:{i:0;i:373;}i:374;a:1:{i:0;i:375;}i:376;a:1:{i:0;i:255;}i:377;a:1:{i:0;i:378;}i:379;a:1:{i:0;i:380;}i:381;a:1:{i:0;i:382;}i:383;a:1:{i:0;i:115;}i:385;a:1:{i:0;i:595;}i:386;a:1:{i:0;i:387;}i:388;a:1:{i:0;i:389;}i:390;a:1:{i:0;i:596;}i:391;a:1:{i:0;i:392;}i:393;a:1:{i:0;i:598;}i:394;a:1:{i:0;i:599;}i:395;a:1:{i:0;i:396;}i:398;a:1:{i:0;i:477;}i:399;a:1:{i:0;i:601;}i:400;a:1:{i:0;i:603;}i:401;a:1:{i:0;i:402;}i:403;a:1:{i:0;i:608;}i:404;a:1:{i:0;i:611;}i:406;a:1:{i:0;i:617;}i:407;a:1:{i:0;i:616;}i:408;a:1:{i:0;i:409;}i:412;a:1:{i:0;i:623;}i:413;a:1:{i:0;i:626;}i:415;a:1:{i:0;i:629;}i:416;a:1:{i:0;i:417;}i:418;a:1:{i:0;i:419;}i:420;a:1:{i:0;i:421;}i:422;a:1:{i:0;i:640;}i:423;a:1:{i:0;i:424;}i:425;a:1:{i:0;i:643;}i:428;a:1:{i:0;i:429;}i:430;a:1:{i:0;i:648;}i:431;a:1:{i:0;i:432;}i:433;a:1:{i:0;i:650;}i:434;a:1:{i:0;i:651;}i:435;a:1:{i:0;i:436;}i:437;a:1:{i:0;i:438;}i:439;a:1:{i:0;i:658;}i:440;a:1:{i:0;i:441;}i:444;a:1:{i:0;i:445;}i:452;a:1:{i:0;i:454;}i:453;a:1:{i:0;i:454;}i:455;a:1:{i:0;i:457;}i:456;a:1:{i:0;i:457;}i:458;a:1:{i:0;i:460;}i:459;a:1:{i:0;i:460;}i:461;a:1:{i:0;i:462;}i:463;a:1:{i:0;i:464;}i:465;a:1:{i:0;i:466;}i:467;a:1:{i:0;i:468;}i:469;a:1:{i:0;i:470;}i:471;a:1:{i:0;i:472;}i:473;a:1:{i:0;i:474;}i:475;a:1:{i:0;i:476;}i:478;a:1:{i:0;i:479;}i:480;a:1:{i:0;i:481;}i:482;a:1:{i:0;i:483;}i:484;a:1:{i:0;i:485;}i:486;a:1:{i:0;i:487;}i:488;a:1:{i:0;i:489;}i:490;a:1:{i:0;i:491;}i:492;a:1:{i:0;i:493;}i:494;a:1:{i:0;i:495;}i:496;a:2:{i:0;i:106;i:1;i:780;}i:497;a:1:{i:0;i:499;}i:498;a:1:{i:0;i:499;}i:500;a:1:{i:0;i:501;}i:502;a:1:{i:0;i:405;}i:503;a:1:{i:0;i:447;}i:504;a:1:{i:0;i:505;}i:506;a:1:{i:0;i:507;}i:508;a:1:{i:0;i:509;}i:510;a:1:{i:0;i:511;}i:512;a:1:{i:0;i:513;}i:514;a:1:{i:0;i:515;}i:516;a:1:{i:0;i:517;}i:518;a:1:{i:0;i:519;}i:520;a:1:{i:0;i:521;}i:522;a:1:{i:0;i:523;}i:524;a:1:{i:0;i:525;}i:526;a:1:{i:0;i:527;}i:528;a:1:{i:0;i:529;}i:530;a:1:{i:0;i:531;}i:532;a:1:{i:0;i:533;}i:534;a:1:{i:0;i:535;}i:536;a:1:{i:0;i:537;}i:538;a:1:{i:0;i:539;}i:540;a:1:{i:0;i:541;}i:542;a:1:{i:0;i:543;}i:544;a:1:{i:0;i:414;}i:546;a:1:{i:0;i:547;}i:548;a:1:{i:0;i:549;}i:550;a:1:{i:0;i:551;}i:552;a:1:{i:0;i:553;}i:554;a:1:{i:0;i:555;}i:556;a:1:{i:0;i:557;}i:558;a:1:{i:0;i:559;}i:560;a:1:{i:0;i:561;}i:562;a:1:{i:0;i:563;}i:837;a:1:{i:0;i:953;}i:890;a:2:{i:0;i:32;i:1;i:953;}i:902;a:1:{i:0;i:940;}i:904;a:1:{i:0;i:941;}i:905;a:1:{i:0;i:942;}i:906;a:1:{i:0;i:943;}i:908;a:1:{i:0;i:972;}i:910;a:1:{i:0;i:973;}i:911;a:1:{i:0;i:974;}i:912;a:3:{i:0;i:953;i:1;i:776;i:2;i:769;}i:913;a:1:{i:0;i:945;}i:914;a:1:{i:0;i:946;}i:915;a:1:{i:0;i:947;}i:916;a:1:{i:0;i:948;}i:917;a:1:{i:0;i:949;}i:918;a:1:{i:0;i:950;}i:919;a:1:{i:0;i:951;}i:920;a:1:{i:0;i:952;}i:921;a:1:{i:0;i:953;}i:922;a:1:{i:0;i:954;}i:923;a:1:{i:0;i:955;}i:924;a:1:{i:0;i:956;}i:925;a:1:{i:0;i:957;}i:926;a:1:{i:0;i:958;}i:927;a:1:{i:0;i:959;}i:928;a:1:{i:0;i:960;}i:929;a:1:{i:0;i:961;}i:931;a:1:{i:0;i:963;}i:932;a:1:{i:0;i:964;}i:933;a:1:{i:0;i:965;}i:934;a:1:{i:0;i:966;}i:935;a:1:{i:0;i:967;}i:936;a:1:{i:0;i:968;}i:937;a:1:{i:0;i:969;}i:938;a:1:{i:0;i:970;}i:939;a:1:{i:0;i:971;}i:944;a:3:{i:0;i:965;i:1;i:776;i:2;i:769;}i:962;a:1:{i:0;i:963;}i:976;a:1:{i:0;i:946;}i:977;a:1:{i:0;i:952;}i:978;a:1:{i:0;i:965;}i:979;a:1:{i:0;i:973;}i:980;a:1:{i:0;i:971;}i:981;a:1:{i:0;i:966;}i:982;a:1:{i:0;i:960;}i:984;a:1:{i:0;i:985;}i:986;a:1:{i:0;i:987;}i:988;a:1:{i:0;i:989;}i:990;a:1:{i:0;i:991;}i:992;a:1:{i:0;i:993;}i:994;a:1:{i:0;i:995;}i:996;a:1:{i:0;i:997;}i:998;a:1:{i:0;i:999;}i:1000;a:1:{i:0;i:1001;}i:1002;a:1:{i:0;i:1003;}i:1004;a:1:{i:0;i:1005;}i:1006;a:1:{i:0;i:1007;}i:1008;a:1:{i:0;i:954;}i:1009;a:1:{i:0;i:961;}i:1010;a:1:{i:0;i:963;}i:1012;a:1:{i:0;i:952;}i:1013;a:1:{i:0;i:949;}i:1024;a:1:{i:0;i:1104;}i:1025;a:1:{i:0;i:1105;}i:1026;a:1:{i:0;i:1106;}i:1027;a:1:{i:0;i:1107;}i:1028;a:1:{i:0;i:1108;}i:1029;a:1:{i:0;i:1109;}i:1030;a:1:{i:0;i:1110;}i:1031;a:1:{i:0;i:1111;}i:1032;a:1:{i:0;i:1112;}i:1033;a:1:{i:0;i:1113;}i:1034;a:1:{i:0;i:1114;}i:1035;a:1:{i:0;i:1115;}i:1036;a:1:{i:0;i:1116;}i:1037;a:1:{i:0;i:1117;}i:1038;a:1:{i:0;i:1118;}i:1039;a:1:{i:0;i:1119;}i:1040;a:1:{i:0;i:1072;}i:1041;a:1:{i:0;i:1073;}i:1042;a:1:{i:0;i:1074;}i:1043;a:1:{i:0;i:1075;}i:1044;a:1:{i:0;i:1076;}i:1045;a:1:{i:0;i:1077;}i:1046;a:1:{i:0;i:1078;}i:1047;a:1:{i:0;i:1079;}i:1048;a:1:{i:0;i:1080;}i:1049;a:1:{i:0;i:1081;}i:1050;a:1:{i:0;i:1082;}i:1051;a:1:{i:0;i:1083;}i:1052;a:1:{i:0;i:1084;}i:1053;a:1:{i:0;i:1085;}i:1054;a:1:{i:0;i:1086;}i:1055;a:1:{i:0;i:1087;}i:1056;a:1:{i:0;i:1088;}i:1057;a:1:{i:0;i:1089;}i:1058;a:1:{i:0;i:1090;}i:1059;a:1:{i:0;i:1091;}i:1060;a:1:{i:0;i:1092;}i:1061;a:1:{i:0;i:1093;}i:1062;a:1:{i:0;i:1094;}i:1063;a:1:{i:0;i:1095;}i:1064;a:1:{i:0;i:1096;}i:1065;a:1:{i:0;i:1097;}i:1066;a:1:{i:0;i:1098;}i:1067;a:1:{i:0;i:1099;}i:1068;a:1:{i:0;i:1100;}i:1069;a:1:{i:0;i:1101;}i:1070;a:1:{i:0;i:1102;}i:1071;a:1:{i:0;i:1103;}i:1120;a:1:{i:0;i:1121;}i:1122;a:1:{i:0;i:1123;}i:1124;a:1:{i:0;i:1125;}i:1126;a:1:{i:0;i:1127;}i:1128;a:1:{i:0;i:1129;}i:1130;a:1:{i:0;i:1131;}i:1132;a:1:{i:0;i:1133;}i:1134;a:1:{i:0;i:1135;}i:1136;a:1:{i:0;i:1137;}i:1138;a:1:{i:0;i:1139;}i:1140;a:1:{i:0;i:1141;}i:1142;a:1:{i:0;i:1143;}i:1144;a:1:{i:0;i:1145;}i:1146;a:1:{i:0;i:1147;}i:1148;a:1:{i:0;i:1149;}i:1150;a:1:{i:0;i:1151;}i:1152;a:1:{i:0;i:1153;}i:1162;a:1:{i:0;i:1163;}i:1164;a:1:{i:0;i:1165;}i:1166;a:1:{i:0;i:1167;}i:1168;a:1:{i:0;i:1169;}i:1170;a:1:{i:0;i:1171;}i:1172;a:1:{i:0;i:1173;}i:1174;a:1:{i:0;i:1175;}i:1176;a:1:{i:0;i:1177;}i:1178;a:1:{i:0;i:1179;}i:1180;a:1:{i:0;i:1181;}i:1182;a:1:{i:0;i:1183;}i:1184;a:1:{i:0;i:1185;}i:1186;a:1:{i:0;i:1187;}i:1188;a:1:{i:0;i:1189;}i:1190;a:1:{i:0;i:1191;}i:1192;a:1:{i:0;i:1193;}i:1194;a:1:{i:0;i:1195;}i:1196;a:1:{i:0;i:1197;}i:1198;a:1:{i:0;i:1199;}i:1200;a:1:{i:0;i:1201;}i:1202;a:1:{i:0;i:1203;}i:1204;a:1:{i:0;i:1205;}i:1206;a:1:{i:0;i:1207;}i:1208;a:1:{i:0;i:1209;}i:1210;a:1:{i:0;i:1211;}i:1212;a:1:{i:0;i:1213;}i:1214;a:1:{i:0;i:1215;}i:1217;a:1:{i:0;i:1218;}i:1219;a:1:{i:0;i:1220;}i:1221;a:1:{i:0;i:1222;}i:1223;a:1:{i:0;i:1224;}i:1225;a:1:{i:0;i:1226;}i:1227;a:1:{i:0;i:1228;}i:1229;a:1:{i:0;i:1230;}i:1232;a:1:{i:0;i:1233;}i:1234;a:1:{i:0;i:1235;}i:1236;a:1:{i:0;i:1237;}i:1238;a:1:{i:0;i:1239;}i:1240;a:1:{i:0;i:1241;}i:1242;a:1:{i:0;i:1243;}i:1244;a:1:{i:0;i:1245;}i:1246;a:1:{i:0;i:1247;}i:1248;a:1:{i:0;i:1249;}i:1250;a:1:{i:0;i:1251;}i:1252;a:1:{i:0;i:1253;}i:1254;a:1:{i:0;i:1255;}i:1256;a:1:{i:0;i:1257;}i:1258;a:1:{i:0;i:1259;}i:1260;a:1:{i:0;i:1261;}i:1262;a:1:{i:0;i:1263;}i:1264;a:1:{i:0;i:1265;}i:1266;a:1:{i:0;i:1267;}i:1268;a:1:{i:0;i:1269;}i:1272;a:1:{i:0;i:1273;}i:1280;a:1:{i:0;i:1281;}i:1282;a:1:{i:0;i:1283;}i:1284;a:1:{i:0;i:1285;}i:1286;a:1:{i:0;i:1287;}i:1288;a:1:{i:0;i:1289;}i:1290;a:1:{i:0;i:1291;}i:1292;a:1:{i:0;i:1293;}i:1294;a:1:{i:0;i:1295;}i:1329;a:1:{i:0;i:1377;}i:1330;a:1:{i:0;i:1378;}i:1331;a:1:{i:0;i:1379;}i:1332;a:1:{i:0;i:1380;}i:1333;a:1:{i:0;i:1381;}i:1334;a:1:{i:0;i:1382;}i:1335;a:1:{i:0;i:1383;}i:1336;a:1:{i:0;i:1384;}i:1337;a:1:{i:0;i:1385;}i:1338;a:1:{i:0;i:1386;}i:1339;a:1:{i:0;i:1387;}i:1340;a:1:{i:0;i:1388;}i:1341;a:1:{i:0;i:1389;}i:1342;a:1:{i:0;i:1390;}i:1343;a:1:{i:0;i:1391;}i:1344;a:1:{i:0;i:1392;}i:1345;a:1:{i:0;i:1393;}i:1346;a:1:{i:0;i:1394;}i:1347;a:1:{i:0;i:1395;}i:1348;a:1:{i:0;i:1396;}i:1349;a:1:{i:0;i:1397;}i:1350;a:1:{i:0;i:1398;}i:1351;a:1:{i:0;i:1399;}i:1352;a:1:{i:0;i:1400;}i:1353;a:1:{i:0;i:1401;}i:1354;a:1:{i:0;i:1402;}i:1355;a:1:{i:0;i:1403;}i:1356;a:1:{i:0;i:1404;}i:1357;a:1:{i:0;i:1405;}i:1358;a:1:{i:0;i:1406;}i:1359;a:1:{i:0;i:1407;}i:1360;a:1:{i:0;i:1408;}i:1361;a:1:{i:0;i:1409;}i:1362;a:1:{i:0;i:1410;}i:1363;a:1:{i:0;i:1411;}i:1364;a:1:{i:0;i:1412;}i:1365;a:1:{i:0;i:1413;}i:1366;a:1:{i:0;i:1414;}i:1415;a:2:{i:0;i:1381;i:1;i:1410;}i:7680;a:1:{i:0;i:7681;}i:7682;a:1:{i:0;i:7683;}i:7684;a:1:{i:0;i:7685;}i:7686;a:1:{i:0;i:7687;}i:7688;a:1:{i:0;i:7689;}i:7690;a:1:{i:0;i:7691;}i:7692;a:1:{i:0;i:7693;}i:7694;a:1:{i:0;i:7695;}i:7696;a:1:{i:0;i:7697;}i:7698;a:1:{i:0;i:7699;}i:7700;a:1:{i:0;i:7701;}i:7702;a:1:{i:0;i:7703;}i:7704;a:1:{i:0;i:7705;}i:7706;a:1:{i:0;i:7707;}i:7708;a:1:{i:0;i:7709;}i:7710;a:1:{i:0;i:7711;}i:7712;a:1:{i:0;i:7713;}i:7714;a:1:{i:0;i:7715;}i:7716;a:1:{i:0;i:7717;}i:7718;a:1:{i:0;i:7719;}i:7720;a:1:{i:0;i:7721;}i:7722;a:1:{i:0;i:7723;}i:7724;a:1:{i:0;i:7725;}i:7726;a:1:{i:0;i:7727;}i:7728;a:1:{i:0;i:7729;}i:7730;a:1:{i:0;i:7731;}i:7732;a:1:{i:0;i:7733;}i:7734;a:1:{i:0;i:7735;}i:7736;a:1:{i:0;i:7737;}i:7738;a:1:{i:0;i:7739;}i:7740;a:1:{i:0;i:7741;}i:7742;a:1:{i:0;i:7743;}i:7744;a:1:{i:0;i:7745;}i:7746;a:1:{i:0;i:7747;}i:7748;a:1:{i:0;i:7749;}i:7750;a:1:{i:0;i:7751;}i:7752;a:1:{i:0;i:7753;}i:7754;a:1:{i:0;i:7755;}i:7756;a:1:{i:0;i:7757;}i:7758;a:1:{i:0;i:7759;}i:7760;a:1:{i:0;i:7761;}i:7762;a:1:{i:0;i:7763;}i:7764;a:1:{i:0;i:7765;}i:7766;a:1:{i:0;i:7767;}i:7768;a:1:{i:0;i:7769;}i:7770;a:1:{i:0;i:7771;}i:7772;a:1:{i:0;i:7773;}i:7774;a:1:{i:0;i:7775;}i:7776;a:1:{i:0;i:7777;}i:7778;a:1:{i:0;i:7779;}i:7780;a:1:{i:0;i:7781;}i:7782;a:1:{i:0;i:7783;}i:7784;a:1:{i:0;i:7785;}i:7786;a:1:{i:0;i:7787;}i:7788;a:1:{i:0;i:7789;}i:7790;a:1:{i:0;i:7791;}i:7792;a:1:{i:0;i:7793;}i:7794;a:1:{i:0;i:7795;}i:7796;a:1:{i:0;i:7797;}i:7798;a:1:{i:0;i:7799;}i:7800;a:1:{i:0;i:7801;}i:7802;a:1:{i:0;i:7803;}i:7804;a:1:{i:0;i:7805;}i:7806;a:1:{i:0;i:7807;}i:7808;a:1:{i:0;i:7809;}i:7810;a:1:{i:0;i:7811;}i:7812;a:1:{i:0;i:7813;}i:7814;a:1:{i:0;i:7815;}i:7816;a:1:{i:0;i:7817;}i:7818;a:1:{i:0;i:7819;}i:7820;a:1:{i:0;i:7821;}i:7822;a:1:{i:0;i:7823;}i:7824;a:1:{i:0;i:7825;}i:7826;a:1:{i:0;i:7827;}i:7828;a:1:{i:0;i:7829;}i:7830;a:2:{i:0;i:104;i:1;i:817;}i:7831;a:2:{i:0;i:116;i:1;i:776;}i:7832;a:2:{i:0;i:119;i:1;i:778;}i:7833;a:2:{i:0;i:121;i:1;i:778;}i:7834;a:2:{i:0;i:97;i:1;i:702;}i:7835;a:1:{i:0;i:7777;}i:7840;a:1:{i:0;i:7841;}i:7842;a:1:{i:0;i:7843;}i:7844;a:1:{i:0;i:7845;}i:7846;a:1:{i:0;i:7847;}i:7848;a:1:{i:0;i:7849;}i:7850;a:1:{i:0;i:7851;}i:7852;a:1:{i:0;i:7853;}i:7854;a:1:{i:0;i:7855;}i:7856;a:1:{i:0;i:7857;}i:7858;a:1:{i:0;i:7859;}i:7860;a:1:{i:0;i:7861;}i:7862;a:1:{i:0;i:7863;}i:7864;a:1:{i:0;i:7865;}i:7866;a:1:{i:0;i:7867;}i:7868;a:1:{i:0;i:7869;}i:7870;a:1:{i:0;i:7871;}i:7872;a:1:{i:0;i:7873;}i:7874;a:1:{i:0;i:7875;}i:7876;a:1:{i:0;i:7877;}i:7878;a:1:{i:0;i:7879;}i:7880;a:1:{i:0;i:7881;}i:7882;a:1:{i:0;i:7883;}i:7884;a:1:{i:0;i:7885;}i:7886;a:1:{i:0;i:7887;}i:7888;a:1:{i:0;i:7889;}i:7890;a:1:{i:0;i:7891;}i:7892;a:1:{i:0;i:7893;}i:7894;a:1:{i:0;i:7895;}i:7896;a:1:{i:0;i:7897;}i:7898;a:1:{i:0;i:7899;}i:7900;a:1:{i:0;i:7901;}i:7902;a:1:{i:0;i:7903;}i:7904;a:1:{i:0;i:7905;}i:7906;a:1:{i:0;i:7907;}i:7908;a:1:{i:0;i:7909;}i:7910;a:1:{i:0;i:7911;}i:7912;a:1:{i:0;i:7913;}i:7914;a:1:{i:0;i:7915;}i:7916;a:1:{i:0;i:7917;}i:7918;a:1:{i:0;i:7919;}i:7920;a:1:{i:0;i:7921;}i:7922;a:1:{i:0;i:7923;}i:7924;a:1:{i:0;i:7925;}i:7926;a:1:{i:0;i:7927;}i:7928;a:1:{i:0;i:7929;}i:7944;a:1:{i:0;i:7936;}i:7945;a:1:{i:0;i:7937;}i:7946;a:1:{i:0;i:7938;}i:7947;a:1:{i:0;i:7939;}i:7948;a:1:{i:0;i:7940;}i:7949;a:1:{i:0;i:7941;}i:7950;a:1:{i:0;i:7942;}i:7951;a:1:{i:0;i:7943;}i:7960;a:1:{i:0;i:7952;}i:7961;a:1:{i:0;i:7953;}i:7962;a:1:{i:0;i:7954;}i:7963;a:1:{i:0;i:7955;}i:7964;a:1:{i:0;i:7956;}i:7965;a:1:{i:0;i:7957;}i:7976;a:1:{i:0;i:7968;}i:7977;a:1:{i:0;i:7969;}i:7978;a:1:{i:0;i:7970;}i:7979;a:1:{i:0;i:7971;}i:7980;a:1:{i:0;i:7972;}i:7981;a:1:{i:0;i:7973;}i:7982;a:1:{i:0;i:7974;}i:7983;a:1:{i:0;i:7975;}i:7992;a:1:{i:0;i:7984;}i:7993;a:1:{i:0;i:7985;}i:7994;a:1:{i:0;i:7986;}i:7995;a:1:{i:0;i:7987;}i:7996;a:1:{i:0;i:7988;}i:7997;a:1:{i:0;i:7989;}i:7998;a:1:{i:0;i:7990;}i:7999;a:1:{i:0;i:7991;}i:8008;a:1:{i:0;i:8000;}i:8009;a:1:{i:0;i:8001;}i:8010;a:1:{i:0;i:8002;}i:8011;a:1:{i:0;i:8003;}i:8012;a:1:{i:0;i:8004;}i:8013;a:1:{i:0;i:8005;}i:8016;a:2:{i:0;i:965;i:1;i:787;}i:8018;a:3:{i:0;i:965;i:1;i:787;i:2;i:768;}i:8020;a:3:{i:0;i:965;i:1;i:787;i:2;i:769;}i:8022;a:3:{i:0;i:965;i:1;i:787;i:2;i:834;}i:8025;a:1:{i:0;i:8017;}i:8027;a:1:{i:0;i:8019;}i:8029;a:1:{i:0;i:8021;}i:8031;a:1:{i:0;i:8023;}i:8040;a:1:{i:0;i:8032;}i:8041;a:1:{i:0;i:8033;}i:8042;a:1:{i:0;i:8034;}i:8043;a:1:{i:0;i:8035;}i:8044;a:1:{i:0;i:8036;}i:8045;a:1:{i:0;i:8037;}i:8046;a:1:{i:0;i:8038;}i:8047;a:1:{i:0;i:8039;}i:8064;a:2:{i:0;i:7936;i:1;i:953;}i:8065;a:2:{i:0;i:7937;i:1;i:953;}i:8066;a:2:{i:0;i:7938;i:1;i:953;}i:8067;a:2:{i:0;i:7939;i:1;i:953;}i:8068;a:2:{i:0;i:7940;i:1;i:953;}i:8069;a:2:{i:0;i:7941;i:1;i:953;}i:8070;a:2:{i:0;i:7942;i:1;i:953;}i:8071;a:2:{i:0;i:7943;i:1;i:953;}i:8072;a:2:{i:0;i:7936;i:1;i:953;}i:8073;a:2:{i:0;i:7937;i:1;i:953;}i:8074;a:2:{i:0;i:7938;i:1;i:953;}i:8075;a:2:{i:0;i:7939;i:1;i:953;}i:8076;a:2:{i:0;i:7940;i:1;i:953;}i:8077;a:2:{i:0;i:7941;i:1;i:953;}i:8078;a:2:{i:0;i:7942;i:1;i:953;}i:8079;a:2:{i:0;i:7943;i:1;i:953;}i:8080;a:2:{i:0;i:7968;i:1;i:953;}i:8081;a:2:{i:0;i:7969;i:1;i:953;}i:8082;a:2:{i:0;i:7970;i:1;i:953;}i:8083;a:2:{i:0;i:7971;i:1;i:953;}i:8084;a:2:{i:0;i:7972;i:1;i:953;}i:8085;a:2:{i:0;i:7973;i:1;i:953;}i:8086;a:2:{i:0;i:7974;i:1;i:953;}i:8087;a:2:{i:0;i:7975;i:1;i:953;}i:8088;a:2:{i:0;i:7968;i:1;i:953;}i:8089;a:2:{i:0;i:7969;i:1;i:953;}i:8090;a:2:{i:0;i:7970;i:1;i:953;}i:8091;a:2:{i:0;i:7971;i:1;i:953;}i:8092;a:2:{i:0;i:7972;i:1;i:953;}i:8093;a:2:{i:0;i:7973;i:1;i:953;}i:8094;a:2:{i:0;i:7974;i:1;i:953;}i:8095;a:2:{i:0;i:7975;i:1;i:953;}i:8096;a:2:{i:0;i:8032;i:1;i:953;}i:8097;a:2:{i:0;i:8033;i:1;i:953;}i:8098;a:2:{i:0;i:8034;i:1;i:953;}i:8099;a:2:{i:0;i:8035;i:1;i:953;}i:8100;a:2:{i:0;i:8036;i:1;i:953;}i:8101;a:2:{i:0;i:8037;i:1;i:953;}i:8102;a:2:{i:0;i:8038;i:1;i:953;}i:8103;a:2:{i:0;i:8039;i:1;i:953;}i:8104;a:2:{i:0;i:8032;i:1;i:953;}i:8105;a:2:{i:0;i:8033;i:1;i:953;}i:8106;a:2:{i:0;i:8034;i:1;i:953;}i:8107;a:2:{i:0;i:8035;i:1;i:953;}i:8108;a:2:{i:0;i:8036;i:1;i:953;}i:8109;a:2:{i:0;i:8037;i:1;i:953;}i:8110;a:2:{i:0;i:8038;i:1;i:953;}i:8111;a:2:{i:0;i:8039;i:1;i:953;}i:8114;a:2:{i:0;i:8048;i:1;i:953;}i:8115;a:2:{i:0;i:945;i:1;i:953;}i:8116;a:2:{i:0;i:940;i:1;i:953;}i:8118;a:2:{i:0;i:945;i:1;i:834;}i:8119;a:3:{i:0;i:945;i:1;i:834;i:2;i:953;}i:8120;a:1:{i:0;i:8112;}i:8121;a:1:{i:0;i:8113;}i:8122;a:1:{i:0;i:8048;}i:8123;a:1:{i:0;i:8049;}i:8124;a:2:{i:0;i:945;i:1;i:953;}i:8126;a:1:{i:0;i:953;}i:8130;a:2:{i:0;i:8052;i:1;i:953;}i:8131;a:2:{i:0;i:951;i:1;i:953;}i:8132;a:2:{i:0;i:942;i:1;i:953;}i:8134;a:2:{i:0;i:951;i:1;i:834;}i:8135;a:3:{i:0;i:951;i:1;i:834;i:2;i:953;}i:8136;a:1:{i:0;i:8050;}i:8137;a:1:{i:0;i:8051;}i:8138;a:1:{i:0;i:8052;}i:8139;a:1:{i:0;i:8053;}i:8140;a:2:{i:0;i:951;i:1;i:953;}i:8146;a:3:{i:0;i:953;i:1;i:776;i:2;i:768;}i:8147;a:3:{i:0;i:953;i:1;i:776;i:2;i:769;}i:8150;a:2:{i:0;i:953;i:1;i:834;}i:8151;a:3:{i:0;i:953;i:1;i:776;i:2;i:834;}i:8152;a:1:{i:0;i:8144;}i:8153;a:1:{i:0;i:8145;}i:8154;a:1:{i:0;i:8054;}i:8155;a:1:{i:0;i:8055;}i:8162;a:3:{i:0;i:965;i:1;i:776;i:2;i:768;}i:8163;a:3:{i:0;i:965;i:1;i:776;i:2;i:769;}i:8164;a:2:{i:0;i:961;i:1;i:787;}i:8166;a:2:{i:0;i:965;i:1;i:834;}i:8167;a:3:{i:0;i:965;i:1;i:776;i:2;i:834;}i:8168;a:1:{i:0;i:8160;}i:8169;a:1:{i:0;i:8161;}i:8170;a:1:{i:0;i:8058;}i:8171;a:1:{i:0;i:8059;}i:8172;a:1:{i:0;i:8165;}i:8178;a:2:{i:0;i:8060;i:1;i:953;}i:8179;a:2:{i:0;i:969;i:1;i:953;}i:8180;a:2:{i:0;i:974;i:1;i:953;}i:8182;a:2:{i:0;i:969;i:1;i:834;}i:8183;a:3:{i:0;i:969;i:1;i:834;i:2;i:953;}i:8184;a:1:{i:0;i:8056;}i:8185;a:1:{i:0;i:8057;}i:8186;a:1:{i:0;i:8060;}i:8187;a:1:{i:0;i:8061;}i:8188;a:2:{i:0;i:969;i:1;i:953;}i:8360;a:2:{i:0;i:114;i:1;i:115;}i:8450;a:1:{i:0;i:99;}i:8451;a:2:{i:0;i:176;i:1;i:99;}i:8455;a:1:{i:0;i:603;}i:8457;a:2:{i:0;i:176;i:1;i:102;}i:8459;a:1:{i:0;i:104;}i:8460;a:1:{i:0;i:104;}i:8461;a:1:{i:0;i:104;}i:8464;a:1:{i:0;i:105;}i:8465;a:1:{i:0;i:105;}i:8466;a:1:{i:0;i:108;}i:8469;a:1:{i:0;i:110;}i:8470;a:2:{i:0;i:110;i:1;i:111;}i:8473;a:1:{i:0;i:112;}i:8474;a:1:{i:0;i:113;}i:8475;a:1:{i:0;i:114;}i:8476;a:1:{i:0;i:114;}i:8477;a:1:{i:0;i:114;}i:8480;a:2:{i:0;i:115;i:1;i:109;}i:8481;a:3:{i:0;i:116;i:1;i:101;i:2;i:108;}i:8482;a:2:{i:0;i:116;i:1;i:109;}i:8484;a:1:{i:0;i:122;}i:8486;a:1:{i:0;i:969;}i:8488;a:1:{i:0;i:122;}i:8490;a:1:{i:0;i:107;}i:8491;a:1:{i:0;i:229;}i:8492;a:1:{i:0;i:98;}i:8493;a:1:{i:0;i:99;}i:8496;a:1:{i:0;i:101;}i:8497;a:1:{i:0;i:102;}i:8499;a:1:{i:0;i:109;}i:8510;a:1:{i:0;i:947;}i:8511;a:1:{i:0;i:960;}i:8517;a:1:{i:0;i:100;}i:8544;a:1:{i:0;i:8560;}i:8545;a:1:{i:0;i:8561;}i:8546;a:1:{i:0;i:8562;}i:8547;a:1:{i:0;i:8563;}i:8548;a:1:{i:0;i:8564;}i:8549;a:1:{i:0;i:8565;}i:8550;a:1:{i:0;i:8566;}i:8551;a:1:{i:0;i:8567;}i:8552;a:1:{i:0;i:8568;}i:8553;a:1:{i:0;i:8569;}i:8554;a:1:{i:0;i:8570;}i:8555;a:1:{i:0;i:8571;}i:8556;a:1:{i:0;i:8572;}i:8557;a:1:{i:0;i:8573;}i:8558;a:1:{i:0;i:8574;}i:8559;a:1:{i:0;i:8575;}i:9398;a:1:{i:0;i:9424;}i:9399;a:1:{i:0;i:9425;}i:9400;a:1:{i:0;i:9426;}i:9401;a:1:{i:0;i:9427;}i:9402;a:1:{i:0;i:9428;}i:9403;a:1:{i:0;i:9429;}i:9404;a:1:{i:0;i:9430;}i:9405;a:1:{i:0;i:9431;}i:9406;a:1:{i:0;i:9432;}i:9407;a:1:{i:0;i:9433;}i:9408;a:1:{i:0;i:9434;}i:9409;a:1:{i:0;i:9435;}i:9410;a:1:{i:0;i:9436;}i:9411;a:1:{i:0;i:9437;}i:9412;a:1:{i:0;i:9438;}i:9413;a:1:{i:0;i:9439;}i:9414;a:1:{i:0;i:9440;}i:9415;a:1:{i:0;i:9441;}i:9416;a:1:{i:0;i:9442;}i:9417;a:1:{i:0;i:9443;}i:9418;a:1:{i:0;i:9444;}i:9419;a:1:{i:0;i:9445;}i:9420;a:1:{i:0;i:9446;}i:9421;a:1:{i:0;i:9447;}i:9422;a:1:{i:0;i:9448;}i:9423;a:1:{i:0;i:9449;}i:13169;a:3:{i:0;i:104;i:1;i:112;i:2;i:97;}i:13171;a:2:{i:0;i:97;i:1;i:117;}i:13173;a:2:{i:0;i:111;i:1;i:118;}i:13184;a:2:{i:0;i:112;i:1;i:97;}i:13185;a:2:{i:0;i:110;i:1;i:97;}i:13186;a:2:{i:0;i:956;i:1;i:97;}i:13187;a:2:{i:0;i:109;i:1;i:97;}i:13188;a:2:{i:0;i:107;i:1;i:97;}i:13189;a:2:{i:0;i:107;i:1;i:98;}i:13190;a:2:{i:0;i:109;i:1;i:98;}i:13191;a:2:{i:0;i:103;i:1;i:98;}i:13194;a:2:{i:0;i:112;i:1;i:102;}i:13195;a:2:{i:0;i:110;i:1;i:102;}i:13196;a:2:{i:0;i:956;i:1;i:102;}i:13200;a:2:{i:0;i:104;i:1;i:122;}i:13201;a:3:{i:0;i:107;i:1;i:104;i:2;i:122;}i:13202;a:3:{i:0;i:109;i:1;i:104;i:2;i:122;}i:13203;a:3:{i:0;i:103;i:1;i:104;i:2;i:122;}i:13204;a:3:{i:0;i:116;i:1;i:104;i:2;i:122;}i:13225;a:2:{i:0;i:112;i:1;i:97;}i:13226;a:3:{i:0;i:107;i:1;i:112;i:2;i:97;}i:13227;a:3:{i:0;i:109;i:1;i:112;i:2;i:97;}i:13228;a:3:{i:0;i:103;i:1;i:112;i:2;i:97;}i:13236;a:2:{i:0;i:112;i:1;i:118;}i:13237;a:2:{i:0;i:110;i:1;i:118;}i:13238;a:2:{i:0;i:956;i:1;i:118;}i:13239;a:2:{i:0;i:109;i:1;i:118;}i:13240;a:2:{i:0;i:107;i:1;i:118;}i:13241;a:2:{i:0;i:109;i:1;i:118;}i:13242;a:2:{i:0;i:112;i:1;i:119;}i:13243;a:2:{i:0;i:110;i:1;i:119;}i:13244;a:2:{i:0;i:956;i:1;i:119;}i:13245;a:2:{i:0;i:109;i:1;i:119;}i:13246;a:2:{i:0;i:107;i:1;i:119;}i:13247;a:2:{i:0;i:109;i:1;i:119;}i:13248;a:2:{i:0;i:107;i:1;i:969;}i:13249;a:2:{i:0;i:109;i:1;i:969;}i:13251;a:2:{i:0;i:98;i:1;i:113;}i:13254;a:4:{i:0;i:99;i:1;i:8725;i:2;i:107;i:3;i:103;}i:13255;a:3:{i:0;i:99;i:1;i:111;i:2;i:46;}i:13256;a:2:{i:0;i:100;i:1;i:98;}i:13257;a:2:{i:0;i:103;i:1;i:121;}i:13259;a:2:{i:0;i:104;i:1;i:112;}i:13261;a:2:{i:0;i:107;i:1;i:107;}i:13262;a:2:{i:0;i:107;i:1;i:109;}i:13271;a:2:{i:0;i:112;i:1;i:104;}i:13273;a:3:{i:0;i:112;i:1;i:112;i:2;i:109;}i:13274;a:2:{i:0;i:112;i:1;i:114;}i:13276;a:2:{i:0;i:115;i:1;i:118;}i:13277;a:2:{i:0;i:119;i:1;i:98;}i:64256;a:2:{i:0;i:102;i:1;i:102;}i:64257;a:2:{i:0;i:102;i:1;i:105;}i:64258;a:2:{i:0;i:102;i:1;i:108;}i:64259;a:3:{i:0;i:102;i:1;i:102;i:2;i:105;}i:64260;a:3:{i:0;i:102;i:1;i:102;i:2;i:108;}i:64261;a:2:{i:0;i:115;i:1;i:116;}i:64262;a:2:{i:0;i:115;i:1;i:116;}i:64275;a:2:{i:0;i:1396;i:1;i:1398;}i:64276;a:2:{i:0;i:1396;i:1;i:1381;}i:64277;a:2:{i:0;i:1396;i:1;i:1387;}i:64278;a:2:{i:0;i:1406;i:1;i:1398;}i:64279;a:2:{i:0;i:1396;i:1;i:1389;}i:65313;a:1:{i:0;i:65345;}i:65314;a:1:{i:0;i:65346;}i:65315;a:1:{i:0;i:65347;}i:65316;a:1:{i:0;i:65348;}i:65317;a:1:{i:0;i:65349;}i:65318;a:1:{i:0;i:65350;}i:65319;a:1:{i:0;i:65351;}i:65320;a:1:{i:0;i:65352;}i:65321;a:1:{i:0;i:65353;}i:65322;a:1:{i:0;i:65354;}i:65323;a:1:{i:0;i:65355;}i:65324;a:1:{i:0;i:65356;}i:65325;a:1:{i:0;i:65357;}i:65326;a:1:{i:0;i:65358;}i:65327;a:1:{i:0;i:65359;}i:65328;a:1:{i:0;i:65360;}i:65329;a:1:{i:0;i:65361;}i:65330;a:1:{i:0;i:65362;}i:65331;a:1:{i:0;i:65363;}i:65332;a:1:{i:0;i:65364;}i:65333;a:1:{i:0;i:65365;}i:65334;a:1:{i:0;i:65366;}i:65335;a:1:{i:0;i:65367;}i:65336;a:1:{i:0;i:65368;}i:65337;a:1:{i:0;i:65369;}i:65338;a:1:{i:0;i:65370;}i:66560;a:1:{i:0;i:66600;}i:66561;a:1:{i:0;i:66601;}i:66562;a:1:{i:0;i:66602;}i:66563;a:1:{i:0;i:66603;}i:66564;a:1:{i:0;i:66604;}i:66565;a:1:{i:0;i:66605;}i:66566;a:1:{i:0;i:66606;}i:66567;a:1:{i:0;i:66607;}i:66568;a:1:{i:0;i:66608;}i:66569;a:1:{i:0;i:66609;}i:66570;a:1:{i:0;i:66610;}i:66571;a:1:{i:0;i:66611;}i:66572;a:1:{i:0;i:66612;}i:66573;a:1:{i:0;i:66613;}i:66574;a:1:{i:0;i:66614;}i:66575;a:1:{i:0;i:66615;}i:66576;a:1:{i:0;i:66616;}i:66577;a:1:{i:0;i:66617;}i:66578;a:1:{i:0;i:66618;}i:66579;a:1:{i:0;i:66619;}i:66580;a:1:{i:0;i:66620;}i:66581;a:1:{i:0;i:66621;}i:66582;a:1:{i:0;i:66622;}i:66583;a:1:{i:0;i:66623;}i:66584;a:1:{i:0;i:66624;}i:66585;a:1:{i:0;i:66625;}i:66586;a:1:{i:0;i:66626;}i:66587;a:1:{i:0;i:66627;}i:66588;a:1:{i:0;i:66628;}i:66589;a:1:{i:0;i:66629;}i:66590;a:1:{i:0;i:66630;}i:66591;a:1:{i:0;i:66631;}i:66592;a:1:{i:0;i:66632;}i:66593;a:1:{i:0;i:66633;}i:66594;a:1:{i:0;i:66634;}i:66595;a:1:{i:0;i:66635;}i:66596;a:1:{i:0;i:66636;}i:66597;a:1:{i:0;i:66637;}i:119808;a:1:{i:0;i:97;}i:119809;a:1:{i:0;i:98;}i:119810;a:1:{i:0;i:99;}i:119811;a:1:{i:0;i:100;}i:119812;a:1:{i:0;i:101;}i:119813;a:1:{i:0;i:102;}i:119814;a:1:{i:0;i:103;}i:119815;a:1:{i:0;i:104;}i:119816;a:1:{i:0;i:105;}i:119817;a:1:{i:0;i:106;}i:119818;a:1:{i:0;i:107;}i:119819;a:1:{i:0;i:108;}i:119820;a:1:{i:0;i:109;}i:119821;a:1:{i:0;i:110;}i:119822;a:1:{i:0;i:111;}i:119823;a:1:{i:0;i:112;}i:119824;a:1:{i:0;i:113;}i:119825;a:1:{i:0;i:114;}i:119826;a:1:{i:0;i:115;}i:119827;a:1:{i:0;i:116;}i:119828;a:1:{i:0;i:117;}i:119829;a:1:{i:0;i:118;}i:119830;a:1:{i:0;i:119;}i:119831;a:1:{i:0;i:120;}i:119832;a:1:{i:0;i:121;}i:119833;a:1:{i:0;i:122;}i:119860;a:1:{i:0;i:97;}i:119861;a:1:{i:0;i:98;}i:119862;a:1:{i:0;i:99;}i:119863;a:1:{i:0;i:100;}i:119864;a:1:{i:0;i:101;}i:119865;a:1:{i:0;i:102;}i:119866;a:1:{i:0;i:103;}i:119867;a:1:{i:0;i:104;}i:119868;a:1:{i:0;i:105;}i:119869;a:1:{i:0;i:106;}i:119870;a:1:{i:0;i:107;}i:119871;a:1:{i:0;i:108;}i:119872;a:1:{i:0;i:109;}i:119873;a:1:{i:0;i:110;}i:119874;a:1:{i:0;i:111;}i:119875;a:1:{i:0;i:112;}i:119876;a:1:{i:0;i:113;}i:119877;a:1:{i:0;i:114;}i:119878;a:1:{i:0;i:115;}i:119879;a:1:{i:0;i:116;}i:119880;a:1:{i:0;i:117;}i:119881;a:1:{i:0;i:118;}i:119882;a:1:{i:0;i:119;}i:119883;a:1:{i:0;i:120;}i:119884;a:1:{i:0;i:121;}i:119885;a:1:{i:0;i:122;}i:119912;a:1:{i:0;i:97;}i:119913;a:1:{i:0;i:98;}i:119914;a:1:{i:0;i:99;}i:119915;a:1:{i:0;i:100;}i:119916;a:1:{i:0;i:101;}i:119917;a:1:{i:0;i:102;}i:119918;a:1:{i:0;i:103;}i:119919;a:1:{i:0;i:104;}i:119920;a:1:{i:0;i:105;}i:119921;a:1:{i:0;i:106;}i:119922;a:1:{i:0;i:107;}i:119923;a:1:{i:0;i:108;}i:119924;a:1:{i:0;i:109;}i:119925;a:1:{i:0;i:110;}i:119926;a:1:{i:0;i:111;}i:119927;a:1:{i:0;i:112;}i:119928;a:1:{i:0;i:113;}i:119929;a:1:{i:0;i:114;}i:119930;a:1:{i:0;i:115;}i:119931;a:1:{i:0;i:116;}i:119932;a:1:{i:0;i:117;}i:119933;a:1:{i:0;i:118;}i:119934;a:1:{i:0;i:119;}i:119935;a:1:{i:0;i:120;}i:119936;a:1:{i:0;i:121;}i:119937;a:1:{i:0;i:122;}i:119964;a:1:{i:0;i:97;}i:119966;a:1:{i:0;i:99;}i:119967;a:1:{i:0;i:100;}i:119970;a:1:{i:0;i:103;}i:119973;a:1:{i:0;i:106;}i:119974;a:1:{i:0;i:107;}i:119977;a:1:{i:0;i:110;}i:119978;a:1:{i:0;i:111;}i:119979;a:1:{i:0;i:112;}i:119980;a:1:{i:0;i:113;}i:119982;a:1:{i:0;i:115;}i:119983;a:1:{i:0;i:116;}i:119984;a:1:{i:0;i:117;}i:119985;a:1:{i:0;i:118;}i:119986;a:1:{i:0;i:119;}i:119987;a:1:{i:0;i:120;}i:119988;a:1:{i:0;i:121;}i:119989;a:1:{i:0;i:122;}i:120016;a:1:{i:0;i:97;}i:120017;a:1:{i:0;i:98;}i:120018;a:1:{i:0;i:99;}i:120019;a:1:{i:0;i:100;}i:120020;a:1:{i:0;i:101;}i:120021;a:1:{i:0;i:102;}i:120022;a:1:{i:0;i:103;}i:120023;a:1:{i:0;i:104;}i:120024;a:1:{i:0;i:105;}i:120025;a:1:{i:0;i:106;}i:120026;a:1:{i:0;i:107;}i:120027;a:1:{i:0;i:108;}i:120028;a:1:{i:0;i:109;}i:120029;a:1:{i:0;i:110;}i:120030;a:1:{i:0;i:111;}i:120031;a:1:{i:0;i:112;}i:120032;a:1:{i:0;i:113;}i:120033;a:1:{i:0;i:114;}i:120034;a:1:{i:0;i:115;}i:120035;a:1:{i:0;i:116;}i:120036;a:1:{i:0;i:117;}i:120037;a:1:{i:0;i:118;}i:120038;a:1:{i:0;i:119;}i:120039;a:1:{i:0;i:120;}i:120040;a:1:{i:0;i:121;}i:120041;a:1:{i:0;i:122;}i:120068;a:1:{i:0;i:97;}i:120069;a:1:{i:0;i:98;}i:120071;a:1:{i:0;i:100;}i:120072;a:1:{i:0;i:101;}i:120073;a:1:{i:0;i:102;}i:120074;a:1:{i:0;i:103;}i:120077;a:1:{i:0;i:106;}i:120078;a:1:{i:0;i:107;}i:120079;a:1:{i:0;i:108;}i:120080;a:1:{i:0;i:109;}i:120081;a:1:{i:0;i:110;}i:120082;a:1:{i:0;i:111;}i:120083;a:1:{i:0;i:112;}i:120084;a:1:{i:0;i:113;}i:120086;a:1:{i:0;i:115;}i:120087;a:1:{i:0;i:116;}i:120088;a:1:{i:0;i:117;}i:120089;a:1:{i:0;i:118;}i:120090;a:1:{i:0;i:119;}i:120091;a:1:{i:0;i:120;}i:120092;a:1:{i:0;i:121;}i:120120;a:1:{i:0;i:97;}i:120121;a:1:{i:0;i:98;}i:120123;a:1:{i:0;i:100;}i:120124;a:1:{i:0;i:101;}i:120125;a:1:{i:0;i:102;}i:120126;a:1:{i:0;i:103;}i:120128;a:1:{i:0;i:105;}i:120129;a:1:{i:0;i:106;}i:120130;a:1:{i:0;i:107;}i:120131;a:1:{i:0;i:108;}i:120132;a:1:{i:0;i:109;}i:120134;a:1:{i:0;i:111;}i:120138;a:1:{i:0;i:115;}i:120139;a:1:{i:0;i:116;}i:120140;a:1:{i:0;i:117;}i:120141;a:1:{i:0;i:118;}i:120142;a:1:{i:0;i:119;}i:120143;a:1:{i:0;i:120;}i:120144;a:1:{i:0;i:121;}i:120172;a:1:{i:0;i:97;}i:120173;a:1:{i:0;i:98;}i:120174;a:1:{i:0;i:99;}i:120175;a:1:{i:0;i:100;}i:120176;a:1:{i:0;i:101;}i:120177;a:1:{i:0;i:102;}i:120178;a:1:{i:0;i:103;}i:120179;a:1:{i:0;i:104;}i:120180;a:1:{i:0;i:105;}i:120181;a:1:{i:0;i:106;}i:120182;a:1:{i:0;i:107;}i:120183;a:1:{i:0;i:108;}i:120184;a:1:{i:0;i:109;}i:120185;a:1:{i:0;i:110;}i:120186;a:1:{i:0;i:111;}i:120187;a:1:{i:0;i:112;}i:120188;a:1:{i:0;i:113;}i:120189;a:1:{i:0;i:114;}i:120190;a:1:{i:0;i:115;}i:120191;a:1:{i:0;i:116;}i:120192;a:1:{i:0;i:117;}i:120193;a:1:{i:0;i:118;}i:120194;a:1:{i:0;i:119;}i:120195;a:1:{i:0;i:120;}i:120196;a:1:{i:0;i:121;}i:120197;a:1:{i:0;i:122;}i:120224;a:1:{i:0;i:97;}i:120225;a:1:{i:0;i:98;}i:120226;a:1:{i:0;i:99;}i:120227;a:1:{i:0;i:100;}i:120228;a:1:{i:0;i:101;}i:120229;a:1:{i:0;i:102;}i:120230;a:1:{i:0;i:103;}i:120231;a:1:{i:0;i:104;}i:120232;a:1:{i:0;i:105;}i:120233;a:1:{i:0;i:106;}i:120234;a:1:{i:0;i:107;}i:120235;a:1:{i:0;i:108;}i:120236;a:1:{i:0;i:109;}i:120237;a:1:{i:0;i:110;}i:120238;a:1:{i:0;i:111;}i:120239;a:1:{i:0;i:112;}i:120240;a:1:{i:0;i:113;}i:120241;a:1:{i:0;i:114;}i:120242;a:1:{i:0;i:115;}i:120243;a:1:{i:0;i:116;}i:120244;a:1:{i:0;i:117;}i:120245;a:1:{i:0;i:118;}i:120246;a:1:{i:0;i:119;}i:120247;a:1:{i:0;i:120;}i:120248;a:1:{i:0;i:121;}i:120249;a:1:{i:0;i:122;}i:120276;a:1:{i:0;i:97;}i:120277;a:1:{i:0;i:98;}i:120278;a:1:{i:0;i:99;}i:120279;a:1:{i:0;i:100;}i:120280;a:1:{i:0;i:101;}i:120281;a:1:{i:0;i:102;}i:120282;a:1:{i:0;i:103;}i:120283;a:1:{i:0;i:104;}i:120284;a:1:{i:0;i:105;}i:120285;a:1:{i:0;i:106;}i:120286;a:1:{i:0;i:107;}i:120287;a:1:{i:0;i:108;}i:120288;a:1:{i:0;i:109;}i:120289;a:1:{i:0;i:110;}i:120290;a:1:{i:0;i:111;}i:120291;a:1:{i:0;i:112;}i:120292;a:1:{i:0;i:113;}i:120293;a:1:{i:0;i:114;}i:120294;a:1:{i:0;i:115;}i:120295;a:1:{i:0;i:116;}i:120296;a:1:{i:0;i:117;}i:120297;a:1:{i:0;i:118;}i:120298;a:1:{i:0;i:119;}i:120299;a:1:{i:0;i:120;}i:120300;a:1:{i:0;i:121;}i:120301;a:1:{i:0;i:122;}i:120328;a:1:{i:0;i:97;}i:120329;a:1:{i:0;i:98;}i:120330;a:1:{i:0;i:99;}i:120331;a:1:{i:0;i:100;}i:120332;a:1:{i:0;i:101;}i:120333;a:1:{i:0;i:102;}i:120334;a:1:{i:0;i:103;}i:120335;a:1:{i:0;i:104;}i:120336;a:1:{i:0;i:105;}i:120337;a:1:{i:0;i:106;}i:120338;a:1:{i:0;i:107;}i:120339;a:1:{i:0;i:108;}i:120340;a:1:{i:0;i:109;}i:120341;a:1:{i:0;i:110;}i:120342;a:1:{i:0;i:111;}i:120343;a:1:{i:0;i:112;}i:120344;a:1:{i:0;i:113;}i:120345;a:1:{i:0;i:114;}i:120346;a:1:{i:0;i:115;}i:120347;a:1:{i:0;i:116;}i:120348;a:1:{i:0;i:117;}i:120349;a:1:{i:0;i:118;}i:120350;a:1:{i:0;i:119;}i:120351;a:1:{i:0;i:120;}i:120352;a:1:{i:0;i:121;}i:120353;a:1:{i:0;i:122;}i:120380;a:1:{i:0;i:97;}i:120381;a:1:{i:0;i:98;}i:120382;a:1:{i:0;i:99;}i:120383;a:1:{i:0;i:100;}i:120384;a:1:{i:0;i:101;}i:120385;a:1:{i:0;i:102;}i:120386;a:1:{i:0;i:103;}i:120387;a:1:{i:0;i:104;}i:120388;a:1:{i:0;i:105;}i:120389;a:1:{i:0;i:106;}i:120390;a:1:{i:0;i:107;}i:120391;a:1:{i:0;i:108;}i:120392;a:1:{i:0;i:109;}i:120393;a:1:{i:0;i:110;}i:120394;a:1:{i:0;i:111;}i:120395;a:1:{i:0;i:112;}i:120396;a:1:{i:0;i:113;}i:120397;a:1:{i:0;i:114;}i:120398;a:1:{i:0;i:115;}i:120399;a:1:{i:0;i:116;}i:120400;a:1:{i:0;i:117;}i:120401;a:1:{i:0;i:118;}i:120402;a:1:{i:0;i:119;}i:120403;a:1:{i:0;i:120;}i:120404;a:1:{i:0;i:121;}i:120405;a:1:{i:0;i:122;}i:120432;a:1:{i:0;i:97;}i:120433;a:1:{i:0;i:98;}i:120434;a:1:{i:0;i:99;}i:120435;a:1:{i:0;i:100;}i:120436;a:1:{i:0;i:101;}i:120437;a:1:{i:0;i:102;}i:120438;a:1:{i:0;i:103;}i:120439;a:1:{i:0;i:104;}i:120440;a:1:{i:0;i:105;}i:120441;a:1:{i:0;i:106;}i:120442;a:1:{i:0;i:107;}i:120443;a:1:{i:0;i:108;}i:120444;a:1:{i:0;i:109;}i:120445;a:1:{i:0;i:110;}i:120446;a:1:{i:0;i:111;}i:120447;a:1:{i:0;i:112;}i:120448;a:1:{i:0;i:113;}i:120449;a:1:{i:0;i:114;}i:120450;a:1:{i:0;i:115;}i:120451;a:1:{i:0;i:116;}i:120452;a:1:{i:0;i:117;}i:120453;a:1:{i:0;i:118;}i:120454;a:1:{i:0;i:119;}i:120455;a:1:{i:0;i:120;}i:120456;a:1:{i:0;i:121;}i:120457;a:1:{i:0;i:122;}i:120488;a:1:{i:0;i:945;}i:120489;a:1:{i:0;i:946;}i:120490;a:1:{i:0;i:947;}i:120491;a:1:{i:0;i:948;}i:120492;a:1:{i:0;i:949;}i:120493;a:1:{i:0;i:950;}i:120494;a:1:{i:0;i:951;}i:120495;a:1:{i:0;i:952;}i:120496;a:1:{i:0;i:953;}i:120497;a:1:{i:0;i:954;}i:120498;a:1:{i:0;i:955;}i:120499;a:1:{i:0;i:956;}i:120500;a:1:{i:0;i:957;}i:120501;a:1:{i:0;i:958;}i:120502;a:1:{i:0;i:959;}i:120503;a:1:{i:0;i:960;}i:120504;a:1:{i:0;i:961;}i:120505;a:1:{i:0;i:952;}i:120506;a:1:{i:0;i:963;}i:120507;a:1:{i:0;i:964;}i:120508;a:1:{i:0;i:965;}i:120509;a:1:{i:0;i:966;}i:120510;a:1:{i:0;i:967;}i:120511;a:1:{i:0;i:968;}i:120512;a:1:{i:0;i:969;}i:120531;a:1:{i:0;i:963;}i:120546;a:1:{i:0;i:945;}i:120547;a:1:{i:0;i:946;}i:120548;a:1:{i:0;i:947;}i:120549;a:1:{i:0;i:948;}i:120550;a:1:{i:0;i:949;}i:120551;a:1:{i:0;i:950;}i:120552;a:1:{i:0;i:951;}i:120553;a:1:{i:0;i:952;}i:120554;a:1:{i:0;i:953;}i:120555;a:1:{i:0;i:954;}i:120556;a:1:{i:0;i:955;}i:120557;a:1:{i:0;i:956;}i:120558;a:1:{i:0;i:957;}i:120559;a:1:{i:0;i:958;}i:120560;a:1:{i:0;i:959;}i:120561;a:1:{i:0;i:960;}i:120562;a:1:{i:0;i:961;}i:120563;a:1:{i:0;i:952;}i:120564;a:1:{i:0;i:963;}i:120565;a:1:{i:0;i:964;}i:120566;a:1:{i:0;i:965;}i:120567;a:1:{i:0;i:966;}i:120568;a:1:{i:0;i:967;}i:120569;a:1:{i:0;i:968;}i:120570;a:1:{i:0;i:969;}i:120589;a:1:{i:0;i:963;}i:120604;a:1:{i:0;i:945;}i:120605;a:1:{i:0;i:946;}i:120606;a:1:{i:0;i:947;}i:120607;a:1:{i:0;i:948;}i:120608;a:1:{i:0;i:949;}i:120609;a:1:{i:0;i:950;}i:120610;a:1:{i:0;i:951;}i:120611;a:1:{i:0;i:952;}i:120612;a:1:{i:0;i:953;}i:120613;a:1:{i:0;i:954;}i:120614;a:1:{i:0;i:955;}i:120615;a:1:{i:0;i:956;}i:120616;a:1:{i:0;i:957;}i:120617;a:1:{i:0;i:958;}i:120618;a:1:{i:0;i:959;}i:120619;a:1:{i:0;i:960;}i:120620;a:1:{i:0;i:961;}i:120621;a:1:{i:0;i:952;}i:120622;a:1:{i:0;i:963;}i:120623;a:1:{i:0;i:964;}i:120624;a:1:{i:0;i:965;}i:120625;a:1:{i:0;i:966;}i:120626;a:1:{i:0;i:967;}i:120627;a:1:{i:0;i:968;}i:120628;a:1:{i:0;i:969;}i:120647;a:1:{i:0;i:963;}i:120662;a:1:{i:0;i:945;}i:120663;a:1:{i:0;i:946;}i:120664;a:1:{i:0;i:947;}i:120665;a:1:{i:0;i:948;}i:120666;a:1:{i:0;i:949;}i:120667;a:1:{i:0;i:950;}i:120668;a:1:{i:0;i:951;}i:120669;a:1:{i:0;i:952;}i:120670;a:1:{i:0;i:953;}i:120671;a:1:{i:0;i:954;}i:120672;a:1:{i:0;i:955;}i:120673;a:1:{i:0;i:956;}i:120674;a:1:{i:0;i:957;}i:120675;a:1:{i:0;i:958;}i:120676;a:1:{i:0;i:959;}i:120677;a:1:{i:0;i:960;}i:120678;a:1:{i:0;i:961;}i:120679;a:1:{i:0;i:952;}i:120680;a:1:{i:0;i:963;}i:120681;a:1:{i:0;i:964;}i:120682;a:1:{i:0;i:965;}i:120683;a:1:{i:0;i:966;}i:120684;a:1:{i:0;i:967;}i:120685;a:1:{i:0;i:968;}i:120686;a:1:{i:0;i:969;}i:120705;a:1:{i:0;i:963;}i:120720;a:1:{i:0;i:945;}i:120721;a:1:{i:0;i:946;}i:120722;a:1:{i:0;i:947;}i:120723;a:1:{i:0;i:948;}i:120724;a:1:{i:0;i:949;}i:120725;a:1:{i:0;i:950;}i:120726;a:1:{i:0;i:951;}i:120727;a:1:{i:0;i:952;}i:120728;a:1:{i:0;i:953;}i:120729;a:1:{i:0;i:954;}i:120730;a:1:{i:0;i:955;}i:120731;a:1:{i:0;i:956;}i:120732;a:1:{i:0;i:957;}i:120733;a:1:{i:0;i:958;}i:120734;a:1:{i:0;i:959;}i:120735;a:1:{i:0;i:960;}i:120736;a:1:{i:0;i:961;}i:120737;a:1:{i:0;i:952;}i:120738;a:1:{i:0;i:963;}i:120739;a:1:{i:0;i:964;}i:120740;a:1:{i:0;i:965;}i:120741;a:1:{i:0;i:966;}i:120742;a:1:{i:0;i:967;}i:120743;a:1:{i:0;i:968;}i:120744;a:1:{i:0;i:969;}i:120763;a:1:{i:0;i:963;}i:1017;a:1:{i:0;i:963;}i:7468;a:1:{i:0;i:97;}i:7469;a:1:{i:0;i:230;}i:7470;a:1:{i:0;i:98;}i:7472;a:1:{i:0;i:100;}i:7473;a:1:{i:0;i:101;}i:7474;a:1:{i:0;i:477;}i:7475;a:1:{i:0;i:103;}i:7476;a:1:{i:0;i:104;}i:7477;a:1:{i:0;i:105;}i:7478;a:1:{i:0;i:106;}i:7479;a:1:{i:0;i:107;}i:7480;a:1:{i:0;i:108;}i:7481;a:1:{i:0;i:109;}i:7482;a:1:{i:0;i:110;}i:7484;a:1:{i:0;i:111;}i:7485;a:1:{i:0;i:547;}i:7486;a:1:{i:0;i:112;}i:7487;a:1:{i:0;i:114;}i:7488;a:1:{i:0;i:116;}i:7489;a:1:{i:0;i:117;}i:7490;a:1:{i:0;i:119;}i:8507;a:3:{i:0;i:102;i:1;i:97;i:2;i:120;}i:12880;a:3:{i:0;i:112;i:1;i:116;i:2;i:101;}i:13004;a:2:{i:0;i:104;i:1;i:103;}i:13006;a:2:{i:0;i:101;i:1;i:118;}i:13007;a:3:{i:0;i:108;i:1;i:116;i:2;i:100;}i:13178;a:2:{i:0;i:105;i:1;i:117;}i:13278;a:3:{i:0;i:118;i:1;i:8725;i:2;i:109;}i:13279;a:3:{i:0;i:97;i:1;i:8725;i:2;i:109;}}s:12:"norm_combcls";a:341:{i:820;i:1;i:821;i:1;i:822;i:1;i:823;i:1;i:824;i:1;i:2364;i:7;i:2492;i:7;i:2620;i:7;i:2748;i:7;i:2876;i:7;i:3260;i:7;i:4151;i:7;i:12441;i:8;i:12442;i:8;i:2381;i:9;i:2509;i:9;i:2637;i:9;i:2765;i:9;i:2893;i:9;i:3021;i:9;i:3149;i:9;i:3277;i:9;i:3405;i:9;i:3530;i:9;i:3642;i:9;i:3972;i:9;i:4153;i:9;i:5908;i:9;i:5940;i:9;i:6098;i:9;i:1456;i:10;i:1457;i:11;i:1458;i:12;i:1459;i:13;i:1460;i:14;i:1461;i:15;i:1462;i:16;i:1463;i:17;i:1464;i:18;i:1465;i:19;i:1467;i:20;i:1468;i:21;i:1469;i:22;i:1471;i:23;i:1473;i:24;i:1474;i:25;i:64286;i:26;i:1611;i:27;i:1612;i:28;i:1613;i:29;i:1614;i:30;i:1615;i:31;i:1616;i:32;i:1617;i:33;i:1618;i:34;i:1648;i:35;i:1809;i:36;i:3157;i:84;i:3158;i:91;i:3640;i:103;i:3641;i:103;i:3656;i:107;i:3657;i:107;i:3658;i:107;i:3659;i:107;i:3768;i:118;i:3769;i:118;i:3784;i:122;i:3785;i:122;i:3786;i:122;i:3787;i:122;i:3953;i:129;i:3954;i:130;i:3962;i:130;i:3963;i:130;i:3964;i:130;i:3965;i:130;i:3968;i:130;i:3956;i:132;i:801;i:202;i:802;i:202;i:807;i:202;i:808;i:202;i:795;i:216;i:3897;i:216;i:119141;i:216;i:119142;i:216;i:119150;i:216;i:119151;i:216;i:119152;i:216;i:119153;i:216;i:119154;i:216;i:12330;i:218;i:790;i:220;i:791;i:220;i:792;i:220;i:793;i:220;i:796;i:220;i:797;i:220;i:798;i:220;i:799;i:220;i:800;i:220;i:803;i:220;i:804;i:220;i:805;i:220;i:806;i:220;i:809;i:220;i:810;i:220;i:811;i:220;i:812;i:220;i:813;i:220;i:814;i:220;i:815;i:220;i:816;i:220;i:817;i:220;i:818;i:220;i:819;i:220;i:825;i:220;i:826;i:220;i:827;i:220;i:828;i:220;i:839;i:220;i:840;i:220;i:841;i:220;i:845;i:220;i:846;i:220;i:851;i:220;i:852;i:220;i:853;i:220;i:854;i:220;i:1425;i:220;i:1430;i:220;i:1435;i:220;i:1443;i:220;i:1444;i:220;i:1445;i:220;i:1446;i:220;i:1447;i:220;i:1450;i:220;i:1621;i:220;i:1622;i:220;i:1763;i:220;i:1770;i:220;i:1773;i:220;i:1841;i:220;i:1844;i:220;i:1847;i:220;i:1848;i:220;i:1849;i:220;i:1851;i:220;i:1852;i:220;i:1854;i:220;i:1858;i:220;i:1860;i:220;i:1862;i:220;i:1864;i:220;i:2386;i:220;i:3864;i:220;i:3865;i:220;i:3893;i:220;i:3895;i:220;i:4038;i:220;i:6459;i:220;i:8424;i:220;i:119163;i:220;i:119164;i:220;i:119165;i:220;i:119166;i:220;i:119167;i:220;i:119168;i:220;i:119169;i:220;i:119170;i:220;i:119178;i:220;i:119179;i:220;i:1434;i:222;i:1453;i:222;i:6441;i:222;i:12333;i:222;i:12334;i:224;i:12335;i:224;i:119149;i:226;i:1454;i:228;i:6313;i:228;i:12331;i:228;i:768;i:230;i:769;i:230;i:770;i:230;i:771;i:230;i:772;i:230;i:773;i:230;i:774;i:230;i:775;i:230;i:776;i:230;i:777;i:230;i:778;i:230;i:779;i:230;i:780;i:230;i:781;i:230;i:782;i:230;i:783;i:230;i:784;i:230;i:785;i:230;i:786;i:230;i:787;i:230;i:788;i:230;i:829;i:230;i:830;i:230;i:831;i:230;i:832;i:230;i:833;i:230;i:834;i:230;i:835;i:230;i:836;i:230;i:838;i:230;i:842;i:230;i:843;i:230;i:844;i:230;i:848;i:230;i:849;i:230;i:850;i:230;i:855;i:230;i:867;i:230;i:868;i:230;i:869;i:230;i:870;i:230;i:871;i:230;i:872;i:230;i:873;i:230;i:874;i:230;i:875;i:230;i:876;i:230;i:877;i:230;i:878;i:230;i:879;i:230;i:1155;i:230;i:1156;i:230;i:1157;i:230;i:1158;i:230;i:1426;i:230;i:1427;i:230;i:1428;i:230;i:1429;i:230;i:1431;i:230;i:1432;i:230;i:1433;i:230;i:1436;i:230;i:1437;i:230;i:1438;i:230;i:1439;i:230;i:1440;i:230;i:1441;i:230;i:1448;i:230;i:1449;i:230;i:1451;i:230;i:1452;i:230;i:1455;i:230;i:1476;i:230;i:1552;i:230;i:1553;i:230;i:1554;i:230;i:1555;i:230;i:1556;i:230;i:1557;i:230;i:1619;i:230;i:1620;i:230;i:1623;i:230;i:1624;i:230;i:1750;i:230;i:1751;i:230;i:1752;i:230;i:1753;i:230;i:1754;i:230;i:1755;i:230;i:1756;i:230;i:1759;i:230;i:1760;i:230;i:1761;i:230;i:1762;i:230;i:1764;i:230;i:1767;i:230;i:1768;i:230;i:1771;i:230;i:1772;i:230;i:1840;i:230;i:1842;i:230;i:1843;i:230;i:1845;i:230;i:1846;i:230;i:1850;i:230;i:1853;i:230;i:1855;i:230;i:1856;i:230;i:1857;i:230;i:1859;i:230;i:1861;i:230;i:1863;i:230;i:1865;i:230;i:1866;i:230;i:2385;i:230;i:2387;i:230;i:2388;i:230;i:3970;i:230;i:3971;i:230;i:3974;i:230;i:3975;i:230;i:5901;i:230;i:6458;i:230;i:8400;i:230;i:8401;i:230;i:8404;i:230;i:8405;i:230;i:8406;i:230;i:8407;i:230;i:8411;i:230;i:8412;i:230;i:8417;i:230;i:8423;i:230;i:8425;i:230;i:65056;i:230;i:65057;i:230;i:65058;i:230;i:65059;i:230;i:119173;i:230;i:119174;i:230;i:119175;i:230;i:119177;i:230;i:119176;i:230;i:119210;i:230;i:119211;i:230;i:119212;i:230;i:119213;i:230;i:789;i:232;i:794;i:232;i:12332;i:232;i:863;i:233;i:866;i:233;i:861;i:234;i:862;i:234;i:864;i:234;i:865;i:234;i:837;i:240;}}
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie.php
new file mode 100644
index 00000000..b33c635f
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie.php
@@ -0,0 +1,3058 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * SimplePie Name
+ */
+define('SIMPLEPIE_NAME', 'SimplePie');
+
+/**
+ * SimplePie Version
+ */
+define('SIMPLEPIE_VERSION', '1.3.1');
+
+/**
+ * SimplePie Build
+ * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::get_build() only every load of simplepie.inc)
+ */
+define('SIMPLEPIE_BUILD', gmdate('YmdHis', SimplePie_Misc::get_build()));
+
+/**
+ * SimplePie Website URL
+ */
+define('SIMPLEPIE_URL', 'http://simplepie.org');
+
+/**
+ * SimplePie Useragent
+ * @see SimplePie::set_useragent()
+ */
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+
+/**
+ * SimplePie Linkback
+ */
+define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+
+/**
+ * No Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_NONE', 0);
+
+/**
+ * Feed Link Element Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
+
+/**
+ * Local Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
+
+/**
+ * Local Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_BODY', 4);
+
+/**
+ * Remote Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', 8);
+
+/**
+ * Remote Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_BODY', 16);
+
+/**
+ * All Feed Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_ALL', 31);
+
+/**
+ * No known feed type
+ */
+define('SIMPLEPIE_TYPE_NONE', 0);
+
+/**
+ * RSS 0.90
+ */
+define('SIMPLEPIE_TYPE_RSS_090', 1);
+
+/**
+ * RSS 0.91 (Netscape)
+ */
+define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', 2);
+
+/**
+ * RSS 0.91 (Userland)
+ */
+define('SIMPLEPIE_TYPE_RSS_091_USERLAND', 4);
+
+/**
+ * RSS 0.91 (both Netscape and Userland)
+ */
+define('SIMPLEPIE_TYPE_RSS_091', 6);
+
+/**
+ * RSS 0.92
+ */
+define('SIMPLEPIE_TYPE_RSS_092', 8);
+
+/**
+ * RSS 0.93
+ */
+define('SIMPLEPIE_TYPE_RSS_093', 16);
+
+/**
+ * RSS 0.94
+ */
+define('SIMPLEPIE_TYPE_RSS_094', 32);
+
+/**
+ * RSS 1.0
+ */
+define('SIMPLEPIE_TYPE_RSS_10', 64);
+
+/**
+ * RSS 2.0
+ */
+define('SIMPLEPIE_TYPE_RSS_20', 128);
+
+/**
+ * RDF-based RSS
+ */
+define('SIMPLEPIE_TYPE_RSS_RDF', 65);
+
+/**
+ * Non-RDF-based RSS (truly intended as syndication format)
+ */
+define('SIMPLEPIE_TYPE_RSS_SYNDICATION', 190);
+
+/**
+ * All RSS
+ */
+define('SIMPLEPIE_TYPE_RSS_ALL', 255);
+
+/**
+ * Atom 0.3
+ */
+define('SIMPLEPIE_TYPE_ATOM_03', 256);
+
+/**
+ * Atom 1.0
+ */
+define('SIMPLEPIE_TYPE_ATOM_10', 512);
+
+/**
+ * All Atom
+ */
+define('SIMPLEPIE_TYPE_ATOM_ALL', 768);
+
+/**
+ * All feed types
+ */
+define('SIMPLEPIE_TYPE_ALL', 1023);
+
+/**
+ * No construct
+ */
+define('SIMPLEPIE_CONSTRUCT_NONE', 0);
+
+/**
+ * Text construct
+ */
+define('SIMPLEPIE_CONSTRUCT_TEXT', 1);
+
+/**
+ * HTML construct
+ */
+define('SIMPLEPIE_CONSTRUCT_HTML', 2);
+
+/**
+ * XHTML construct
+ */
+define('SIMPLEPIE_CONSTRUCT_XHTML', 4);
+
+/**
+ * base64-encoded construct
+ */
+define('SIMPLEPIE_CONSTRUCT_BASE64', 8);
+
+/**
+ * IRI construct
+ */
+define('SIMPLEPIE_CONSTRUCT_IRI', 16);
+
+/**
+ * A construct that might be HTML
+ */
+define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', 32);
+
+/**
+ * All constructs
+ */
+define('SIMPLEPIE_CONSTRUCT_ALL', 63);
+
+/**
+ * Don't change case
+ */
+define('SIMPLEPIE_SAME_CASE', 1);
+
+/**
+ * Change to lowercase
+ */
+define('SIMPLEPIE_LOWERCASE', 2);
+
+/**
+ * Change to uppercase
+ */
+define('SIMPLEPIE_UPPERCASE', 4);
+
+/**
+ * PCRE for HTML attributes
+ */
+define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:[\x09\x0A\x0B\x0C\x0D\x20]+[^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?)*)[\x09\x0A\x0B\x0C\x0D\x20]*');
+
+/**
+ * PCRE for XML attributes
+ */
+define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*');
+
+/**
+ * XML Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_XML', 'http://www.w3.org/XML/1998/namespace');
+
+/**
+ * Atom 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_10', 'http://www.w3.org/2005/Atom');
+
+/**
+ * Atom 0.3 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_03', 'http://purl.org/atom/ns#');
+
+/**
+ * RDF Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RDF', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+
+/**
+ * RSS 0.90 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_090', 'http://my.netscape.com/rdf/simple/0.9/');
+
+/**
+ * RSS 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10', 'http://purl.org/rss/1.0/');
+
+/**
+ * RSS 1.0 Content Module Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', 'http://purl.org/rss/1.0/modules/content/');
+
+/**
+ * RSS 2.0 Namespace
+ * (Stupid, I know, but I'm certain it will confuse people less with support.)
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_20', '');
+
+/**
+ * DC 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_DC_10', 'http://purl.org/dc/elements/1.0/');
+
+/**
+ * DC 1.1 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_DC_11', 'http://purl.org/dc/elements/1.1/');
+
+/**
+ * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', 'http://www.w3.org/2003/01/geo/wgs84_pos#');
+
+/**
+ * GeoRSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_GEORSS', 'http://www.georss.org/georss');
+
+/**
+ * Media RSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS', 'http://search.yahoo.com/mrss/');
+
+/**
+ * Wrong Media RSS Namespace. Caused by a long-standing typo in the spec.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG', 'http://search.yahoo.com/mrss');
+
+/**
+ * Wrong Media RSS Namespace #2. New namespace introduced in Media RSS 1.5.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2', 'http://video.search.yahoo.com/mrss');
+
+/**
+ * Wrong Media RSS Namespace #3. A possible typo of the Media RSS 1.5 namespace.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3', 'http://video.search.yahoo.com/mrss/');
+
+/**
+ * Wrong Media RSS Namespace #4. New spec location after the RSS Advisory Board takes it over, but not a valid namespace.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4', 'http://www.rssboard.org/media-rss');
+
+/**
+ * Wrong Media RSS Namespace #5. A possible typo of the RSS Advisory Board URL.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5', 'http://www.rssboard.org/media-rss/');
+
+/**
+ * iTunes RSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ITUNES', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
+
+/**
+ * XHTML Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_XHTML', 'http://www.w3.org/1999/xhtml');
+
+/**
+ * IANA Link Relations Registry
+ */
+define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', 'http://www.iana.org/assignments/relation/');
+
+/**
+ * No file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_NONE', 0);
+
+/**
+ * Remote file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_REMOTE', 1);
+
+/**
+ * Local file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_LOCAL', 2);
+
+/**
+ * fsockopen() file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_FSOCKOPEN', 4);
+
+/**
+ * cURL file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_CURL', 8);
+
+/**
+ * file_get_contents() file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS', 16);
+
+
+
+/**
+ * SimplePie
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie
+{
+	/**
+	 * @var array Raw data
+	 * @access private
+	 */
+	public $data = array();
+
+	/**
+	 * @var mixed Error string
+	 * @access private
+	 */
+	public $error;
+
+	/**
+	 * @var object Instance of SimplePie_Sanitize (or other class)
+	 * @see SimplePie::set_sanitize_class()
+	 * @access private
+	 */
+	public $sanitize;
+
+	/**
+	 * @var string SimplePie Useragent
+	 * @see SimplePie::set_useragent()
+	 * @access private
+	 */
+	public $useragent = SIMPLEPIE_USERAGENT;
+
+	/**
+	 * @var string Feed URL
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	public $feed_url;
+
+	/**
+	 * @var object Instance of SimplePie_File to use as a feed
+	 * @see SimplePie::set_file()
+	 * @access private
+	 */
+	public $file;
+
+	/**
+	 * @var string Raw feed data
+	 * @see SimplePie::set_raw_data()
+	 * @access private
+	 */
+	public $raw_data;
+
+	/**
+	 * @var int Timeout for fetching remote files
+	 * @see SimplePie::set_timeout()
+	 * @access private
+	 */
+	public $timeout = 10;
+
+	/**
+	 * @var bool Forces fsockopen() to be used for remote files instead
+	 * of cURL, even if a new enough version is installed
+	 * @see SimplePie::force_fsockopen()
+	 * @access private
+	 */
+	public $force_fsockopen = false;
+
+	/**
+	 * @var bool Force the given data/URL to be treated as a feed no matter what
+	 * it appears like
+	 * @see SimplePie::force_feed()
+	 * @access private
+	 */
+	public $force_feed = false;
+
+	/**
+	 * @var bool Enable/Disable Caching
+	 * @see SimplePie::enable_cache()
+	 * @access private
+	 */
+	public $cache = true;
+
+	/**
+	 * @var int Cache duration (in seconds)
+	 * @see SimplePie::set_cache_duration()
+	 * @access private
+	 */
+	public $cache_duration = 3600;
+
+	/**
+	 * @var int Auto-discovery cache duration (in seconds)
+	 * @see SimplePie::set_autodiscovery_cache_duration()
+	 * @access private
+	 */
+	public $autodiscovery_cache_duration = 604800; // 7 Days.
+
+	/**
+	 * @var string Cache location (relative to executing script)
+	 * @see SimplePie::set_cache_location()
+	 * @access private
+	 */
+	public $cache_location = './cache';
+
+	/**
+	 * @var string Function that creates the cache filename
+	 * @see SimplePie::set_cache_name_function()
+	 * @access private
+	 */
+	public $cache_name_function = 'md5';
+
+	/**
+	 * @var bool Reorder feed by date descending
+	 * @see SimplePie::enable_order_by_date()
+	 * @access private
+	 */
+	public $order_by_date = true;
+
+	/**
+	 * @var mixed Force input encoding to be set to the follow value
+	 * (false, or anything type-cast to false, disables this feature)
+	 * @see SimplePie::set_input_encoding()
+	 * @access private
+	 */
+	public $input_encoding = false;
+
+	/**
+	 * @var int Feed Autodiscovery Level
+	 * @see SimplePie::set_autodiscovery_level()
+	 * @access private
+	 */
+	public $autodiscovery = SIMPLEPIE_LOCATOR_ALL;
+
+	/**
+	 * Class registry object
+	 *
+	 * @var SimplePie_Registry
+	 */
+	public $registry;
+
+	/**
+	 * @var int Maximum number of feeds to check with autodiscovery
+	 * @see SimplePie::set_max_checked_feeds()
+	 * @access private
+	 */
+	public $max_checked_feeds = 10;
+
+	/**
+	 * @var array All the feeds found during the autodiscovery process
+	 * @see SimplePie::get_all_discovered_feeds()
+	 * @access private
+	 */
+	public $all_discovered_feeds = array();
+
+	/**
+	 * @var string Web-accessible path to the handler_image.php file.
+	 * @see SimplePie::set_image_handler()
+	 * @access private
+	 */
+	public $image_handler = '';
+
+	/**
+	 * @var array Stores the URLs when multiple feeds are being initialized.
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	public $multifeed_url = array();
+
+	/**
+	 * @var array Stores SimplePie objects when multiple feeds initialized.
+	 * @access private
+	 */
+	public $multifeed_objects = array();
+
+	/**
+	 * @var array Stores the get_object_vars() array for use with multifeeds.
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	public $config_settings = null;
+
+	/**
+	 * @var integer Stores the number of items to return per-feed with multifeeds.
+	 * @see SimplePie::set_item_limit()
+	 * @access private
+	 */
+	public $item_limit = 0;
+
+	/**
+	 * @var array Stores the default attributes to be stripped by strip_attributes().
+	 * @see SimplePie::strip_attributes()
+	 * @access private
+	 */
+	public $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+
+	/**
+	 * @var array Stores the default tags to be stripped by strip_htmltags().
+	 * @see SimplePie::strip_htmltags()
+	 * @access private
+	 */
+	public $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+
+	/**
+	 * The SimplePie class contains feed level data and options
+	 *
+	 * To use SimplePie, create the SimplePie object with no parameters. You can
+	 * then set configuration options using the provided methods. After setting
+	 * them, you must initialise the feed using $feed->init(). At that point the
+	 * object's methods and properties will be available to you.
+	 *
+	 * Previously, it was possible to pass in the feed URL along with cache
+	 * options directly into the constructor. This has been removed as of 1.3 as
+	 * it caused a lot of confusion.
+	 *
+	 * @since 1.0 Preview Release
+	 */
+	public function __construct()
+	{
+		if (version_compare(PHP_VERSION, '5.2', '<'))
+		{
+			trigger_error('PHP 4.x, 5.0 and 5.1 are no longer supported. Please upgrade to PHP 5.2 or newer.');
+			die();
+		}
+
+		// Other objects, instances created here so we can set options on them
+		$this->sanitize = new SimplePie_Sanitize();
+		$this->registry = new SimplePie_Registry();
+
+		if (func_num_args() > 0)
+		{
+			$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+			trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_location() directly.', $level);
+
+			$args = func_get_args();
+			switch (count($args)) {
+				case 3:
+					$this->set_cache_duration($args[2]);
+				case 2:
+					$this->set_cache_location($args[1]);
+				case 1:
+					$this->set_feed_url($args[0]);
+					$this->init();
+			}
+		}
+	}
+
+	/**
+	 * Used for converting object to a string
+	 */
+	public function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	/**
+	 * Remove items that link back to this before destroying this object
+	 */
+	public function __destruct()
+	{
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		{
+			if (!empty($this->data['items']))
+			{
+				foreach ($this->data['items'] as $item)
+				{
+					$item->__destruct();
+				}
+				unset($item, $this->data['items']);
+			}
+			if (!empty($this->data['ordered_items']))
+			{
+				foreach ($this->data['ordered_items'] as $item)
+				{
+					$item->__destruct();
+				}
+				unset($item, $this->data['ordered_items']);
+			}
+		}
+	}
+
+	/**
+	 * Force the given data/URL to be treated as a feed
+	 *
+	 * This tells SimplePie to ignore the content-type provided by the server.
+	 * Be careful when using this option, as it will also disable autodiscovery.
+	 *
+	 * @since 1.1
+	 * @param bool $enable Force the given data/URL to be treated as a feed
+	 */
+	public function force_feed($enable = false)
+	{
+		$this->force_feed = (bool) $enable;
+	}
+
+	/**
+	 * Set the URL of the feed you want to parse
+	 *
+	 * This allows you to enter the URL of the feed you want to parse, or the
+	 * website you want to try to use auto-discovery on. This takes priority
+	 * over any set raw data.
+	 *
+	 * You can set multiple feeds to mash together by passing an array instead
+	 * of a string for the $url. Remember that with each additional feed comes
+	 * additional processing and resources.
+	 *
+	 * @since 1.0 Preview Release
+	 * @see set_raw_data()
+	 * @param string|array $url This is the URL (or array of URLs) that you want to parse.
+	 */
+	public function set_feed_url($url)
+	{
+		$this->multifeed_url = array();
+		if (is_array($url))
+		{
+			foreach ($url as $value)
+			{
+				$this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
+			}
+		}
+		else
+		{
+			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
+		}
+	}
+
+	/**
+	 * Set an instance of {@see SimplePie_File} to use as a feed
+	 *
+	 * @param SimplePie_File &$file
+	 * @return bool True on success, false on failure
+	 */
+	public function set_file(&$file)
+	{
+		if ($file instanceof SimplePie_File)
+		{
+			$this->feed_url = $file->url;
+			$this->file =& $file;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Set the raw XML data to parse
+	 *
+	 * Allows you to use a string of RSS/Atom data instead of a remote feed.
+	 *
+	 * If you have a feed available as a string in PHP, you can tell SimplePie
+	 * to parse that data string instead of a remote feed. Any set feed URL
+	 * takes precedence.
+	 *
+	 * @since 1.0 Beta 3
+	 * @param string $data RSS or Atom data as a string.
+	 * @see set_feed_url()
+	 */
+	public function set_raw_data($data)
+	{
+		$this->raw_data = $data;
+	}
+
+	/**
+	 * Set the the default timeout for fetching remote feeds
+	 *
+	 * This allows you to change the maximum time the feed's server to respond
+	 * and send the feed back.
+	 *
+	 * @since 1.0 Beta 3
+	 * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed.
+	 */
+	public function set_timeout($timeout = 10)
+	{
+		$this->timeout = (int) $timeout;
+	}
+
+	/**
+	 * Force SimplePie to use fsockopen() instead of cURL
+	 *
+	 * @since 1.0 Beta 3
+	 * @param bool $enable Force fsockopen() to be used
+	 */
+	public function force_fsockopen($enable = false)
+	{
+		$this->force_fsockopen = (bool) $enable;
+	}
+
+	/**
+	 * Enable/disable caching in SimplePie.
+	 *
+	 * This option allows you to disable caching all-together in SimplePie.
+	 * However, disabling the cache can lead to longer load times.
+	 *
+	 * @since 1.0 Preview Release
+	 * @param bool $enable Enable caching
+	 */
+	public function enable_cache($enable = true)
+	{
+		$this->cache = (bool) $enable;
+	}
+
+	/**
+	 * Set the length of time (in seconds) that the contents of a feed will be
+	 * cached
+	 *
+	 * @param int $seconds The feed content cache duration
+	 */
+	public function set_cache_duration($seconds = 3600)
+	{
+		$this->cache_duration = (int) $seconds;
+	}
+
+	/**
+	 * Set the length of time (in seconds) that the autodiscovered feed URL will
+	 * be cached
+	 *
+	 * @param int $seconds The autodiscovered feed URL cache duration.
+	 */
+	public function set_autodiscovery_cache_duration($seconds = 604800)
+	{
+		$this->autodiscovery_cache_duration = (int) $seconds;
+	}
+
+	/**
+	 * Set the file system location where the cached files should be stored
+	 *
+	 * @param string $location The file system location.
+	 */
+	public function set_cache_location($location = './cache')
+	{
+		$this->cache_location = (string) $location;
+	}
+
+	/**
+	 * Set whether feed items should be sorted into reverse chronological order
+	 *
+	 * @param bool $enable Sort as reverse chronological order.
+	 */
+	public function enable_order_by_date($enable = true)
+	{
+		$this->order_by_date = (bool) $enable;
+	}
+
+	/**
+	 * Set the character encoding used to parse the feed
+	 *
+	 * This overrides the encoding reported by the feed, however it will fall
+	 * back to the normal encoding detection if the override fails
+	 *
+	 * @param string $encoding Character encoding
+	 */
+	public function set_input_encoding($encoding = false)
+	{
+		if ($encoding)
+		{
+			$this->input_encoding = (string) $encoding;
+		}
+		else
+		{
+			$this->input_encoding = false;
+		}
+	}
+
+	/**
+	 * Set how much feed autodiscovery to do
+	 *
+	 * @see SIMPLEPIE_LOCATOR_NONE
+	 * @see SIMPLEPIE_LOCATOR_AUTODISCOVERY
+	 * @see SIMPLEPIE_LOCATOR_LOCAL_EXTENSION
+	 * @see SIMPLEPIE_LOCATOR_LOCAL_BODY
+	 * @see SIMPLEPIE_LOCATOR_REMOTE_EXTENSION
+	 * @see SIMPLEPIE_LOCATOR_REMOTE_BODY
+	 * @see SIMPLEPIE_LOCATOR_ALL
+	 * @param int $level Feed Autodiscovery Level (level can be a combination of the above constants, see bitwise OR operator)
+	 */
+	public function set_autodiscovery_level($level = SIMPLEPIE_LOCATOR_ALL)
+	{
+		$this->autodiscovery = (int) $level;
+	}
+
+	/**
+	 * Get the class registry
+	 *
+	 * Use this to override SimplePie's default classes
+	 * @see SimplePie_Registry
+	 * @return SimplePie_Registry
+	 */
+	public function &get_registry()
+	{
+		return $this->registry;
+	}
+
+	/**#@+
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @deprecated Use {@see get_registry()} instead
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 * @param string $class Name of custom class
+	 * @return boolean True on success, false otherwise
+	 */
+	/**
+	 * Set which class SimplePie uses for caching
+	 */
+	public function set_cache_class($class = 'SimplePie_Cache')
+	{
+		return $this->registry->register('Cache', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for auto-discovery
+	 */
+	public function set_locator_class($class = 'SimplePie_Locator')
+	{
+		return $this->registry->register('Locator', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for XML parsing
+	 */
+	public function set_parser_class($class = 'SimplePie_Parser')
+	{
+		return $this->registry->register('Parser', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for remote file fetching
+	 */
+	public function set_file_class($class = 'SimplePie_File')
+	{
+		return $this->registry->register('File', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for data sanitization
+	 */
+	public function set_sanitize_class($class = 'SimplePie_Sanitize')
+	{
+		return $this->registry->register('Sanitize', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for handling feed items
+	 */
+	public function set_item_class($class = 'SimplePie_Item')
+	{
+		return $this->registry->register('Item', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for handling author data
+	 */
+	public function set_author_class($class = 'SimplePie_Author')
+	{
+		return $this->registry->register('Author', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for handling category data
+	 */
+	public function set_category_class($class = 'SimplePie_Category')
+	{
+		return $this->registry->register('Category', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for feed enclosures
+	 */
+	public function set_enclosure_class($class = 'SimplePie_Enclosure')
+	{
+		return $this->registry->register('Enclosure', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:text>` captions
+	 */
+	public function set_caption_class($class = 'SimplePie_Caption')
+	{
+		return $this->registry->register('Caption', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:copyright>`
+	 */
+	public function set_copyright_class($class = 'SimplePie_Copyright')
+	{
+		return $this->registry->register('Copyright', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:credit>`
+	 */
+	public function set_credit_class($class = 'SimplePie_Credit')
+	{
+		return $this->registry->register('Credit', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:rating>`
+	 */
+	public function set_rating_class($class = 'SimplePie_Rating')
+	{
+		return $this->registry->register('Rating', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:restriction>`
+	 */
+	public function set_restriction_class($class = 'SimplePie_Restriction')
+	{
+		return $this->registry->register('Restriction', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for content-type sniffing
+	 */
+	public function set_content_type_sniffer_class($class = 'SimplePie_Content_Type_Sniffer')
+	{
+		return $this->registry->register('Content_Type_Sniffer', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses item sources
+	 */
+	public function set_source_class($class = 'SimplePie_Source')
+	{
+		return $this->registry->register('Source', $class, true);
+	}
+	/**#@-*/
+
+	/**
+	 * Set the user agent string
+	 *
+	 * @param string $ua New user agent string.
+	 */
+	public function set_useragent($ua = SIMPLEPIE_USERAGENT)
+	{
+		$this->useragent = (string) $ua;
+	}
+
+	/**
+	 * Set callback function to create cache filename with
+	 *
+	 * @param mixed $function Callback function
+	 */
+	public function set_cache_name_function($function = 'md5')
+	{
+		if (is_callable($function))
+		{
+			$this->cache_name_function = $function;
+		}
+	}
+
+	/**
+	 * Set options to make SP as fast as possible
+	 *
+	 * Forgoes a substantial amount of data sanitization in favor of speed. This
+	 * turns SimplePie into a dumb parser of feeds.
+	 *
+	 * @param bool $set Whether to set them or not
+	 */
+	public function set_stupidly_fast($set = false)
+	{
+		if ($set)
+		{
+			$this->enable_order_by_date(false);
+			$this->remove_div(false);
+			$this->strip_comments(false);
+			$this->strip_htmltags(false);
+			$this->strip_attributes(false);
+			$this->set_image_handler(false);
+		}
+	}
+
+	/**
+	 * Set maximum number of feeds to check with autodiscovery
+	 *
+	 * @param int $max Maximum number of feeds to check
+	 */
+	public function set_max_checked_feeds($max = 10)
+	{
+		$this->max_checked_feeds = (int) $max;
+	}
+
+	public function remove_div($enable = true)
+	{
+		$this->sanitize->remove_div($enable);
+	}
+
+	public function strip_htmltags($tags = '', $encode = null)
+	{
+		if ($tags === '')
+		{
+			$tags = $this->strip_htmltags;
+		}
+		$this->sanitize->strip_htmltags($tags);
+		if ($encode !== null)
+		{
+			$this->sanitize->encode_instead_of_strip($tags);
+		}
+	}
+
+	public function encode_instead_of_strip($enable = true)
+	{
+		$this->sanitize->encode_instead_of_strip($enable);
+	}
+
+	public function strip_attributes($attribs = '')
+	{
+		if ($attribs === '')
+		{
+			$attribs = $this->strip_attributes;
+		}
+		$this->sanitize->strip_attributes($attribs);
+	}
+
+	/**
+	 * Set the output encoding
+	 *
+	 * Allows you to override SimplePie's output to match that of your webpage.
+	 * This is useful for times when your webpages are not being served as
+	 * UTF-8.  This setting will be obeyed by {@see handle_content_type()}, and
+	 * is similar to {@see set_input_encoding()}.
+	 *
+	 * It should be noted, however, that not all character encodings can support
+	 * all characters.  If your page is being served as ISO-8859-1 and you try
+	 * to display a Japanese feed, you'll likely see garbled characters.
+	 * Because of this, it is highly recommended to ensure that your webpages
+	 * are served as UTF-8.
+	 *
+	 * The number of supported character encodings depends on whether your web
+	 * host supports {@link http://php.net/mbstring mbstring},
+	 * {@link http://php.net/iconv iconv}, or both. See
+	 * {@link http://simplepie.org/wiki/faq/Supported_Character_Encodings} for
+	 * more information.
+	 *
+	 * @param string $encoding
+	 */
+	public function set_output_encoding($encoding = 'UTF-8')
+	{
+		$this->sanitize->set_output_encoding($encoding);
+	}
+
+	public function strip_comments($strip = false)
+	{
+		$this->sanitize->strip_comments($strip);
+	}
+
+	/**
+	 * Set element/attribute key/value pairs of HTML attributes
+	 * containing URLs that need to be resolved relative to the feed
+	 *
+	 * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
+	 * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
+	 * |q|@cite
+	 *
+	 * @since 1.0
+	 * @param array|null $element_attribute Element/attribute key/value pairs, null for default
+	 */
+	public function set_url_replacements($element_attribute = null)
+	{
+		$this->sanitize->set_url_replacements($element_attribute);
+	}
+
+	/**
+	 * Set the handler to enable the display of cached images.
+	 *
+	 * @param str $page Web-accessible path to the handler_image.php file.
+	 * @param str $qs The query string that the value should be passed to.
+	 */
+	public function set_image_handler($page = false, $qs = 'i')
+	{
+		if ($page !== false)
+		{
+			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+		}
+		else
+		{
+			$this->image_handler = '';
+		}
+	}
+
+	/**
+	 * Set the limit for items returned per-feed with multifeeds
+	 *
+	 * @param integer $limit The maximum number of items to return.
+	 */
+	public function set_item_limit($limit = 0)
+	{
+		$this->item_limit = (int) $limit;
+	}
+
+	/**
+	 * Initialize the feed object
+	 *
+	 * This is what makes everything happen.  Period.  This is where all of the
+	 * configuration options get processed, feeds are fetched, cached, and
+	 * parsed, and all of that other good stuff.
+	 *
+	 * @return boolean True if successful, false otherwise
+	 */
+	public function init()
+	{
+		// Check absolute bare minimum requirements.
+		if (!extension_loaded('xml') || !extension_loaded('pcre'))
+		{
+			return false;
+		}
+		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
+		elseif (!extension_loaded('xmlreader'))
+		{
+			static $xml_is_sane = null;
+			if ($xml_is_sane === null)
+			{
+				$parser_check = xml_parser_create();
+				xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+				xml_parser_free($parser_check);
+				$xml_is_sane = isset($values[0]['value']);
+			}
+			if (!$xml_is_sane)
+			{
+				return false;
+			}
+		}
+
+		if (method_exists($this->sanitize, 'set_registry'))
+		{
+			$this->sanitize->set_registry($this->registry);
+		}
+
+		// Pass whatever was set with config options over to the sanitizer.
+		// Pass the classes in for legacy support; new classes should use the registry instead
+		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
+		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen);
+
+		if (!empty($this->multifeed_url))
+		{
+			$i = 0;
+			$success = 0;
+			$this->multifeed_objects = array();
+			$this->error = array();
+			foreach ($this->multifeed_url as $url)
+			{
+				$this->multifeed_objects[$i] = clone $this;
+				$this->multifeed_objects[$i]->set_feed_url($url);
+				$single_success = $this->multifeed_objects[$i]->init();
+				$success |= $single_success;
+				if (!$single_success)
+				{
+					$this->error[$i] = $this->multifeed_objects[$i]->error();
+				}
+				$i++;
+			}
+			return (bool) $success;
+		}
+		elseif ($this->feed_url === null && $this->raw_data === null)
+		{
+			return false;
+		}
+
+		$this->error = null;
+		$this->data = array();
+		$this->multifeed_objects = array();
+		$cache = false;
+
+		if ($this->feed_url !== null)
+		{
+			$parsed_feed_url = $this->registry->call('Misc', 'parse_url', array($this->feed_url));
+
+			// Decide whether to enable caching
+			if ($this->cache && $parsed_feed_url['scheme'] !== '')
+			{
+				$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc'));
+			}
+
+			// Fetch the data via SimplePie_File into $this->raw_data
+			if (($fetched = $this->fetch_data($cache)) === true)
+			{
+				return true;
+			}
+			elseif ($fetched === false) {
+				return false;
+			}
+
+			list($headers, $sniffed) = $fetched;
+		}
+
+		// Set up array of possible encodings
+		$encodings = array();
+
+		// First check to see if input has been overridden.
+		if ($this->input_encoding !== false)
+		{
+			$encodings[] = $this->input_encoding;
+		}
+
+		$application_types = array('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity');
+		$text_types = array('text/xml', 'text/xml-external-parsed-entity');
+
+		// RFC 3023 (only applies to sniffed content)
+		if (isset($sniffed))
+		{
+			if (in_array($sniffed, $application_types) || substr($sniffed, 0, 12) === 'application/' && substr($sniffed, -4) === '+xml')
+			{
+				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
+				{
+					$encodings[] = strtoupper($charset[1]);
+				}
+				$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
+				$encodings[] = 'UTF-8';
+			}
+			elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
+			{
+				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
+				{
+					$encodings[] = $charset[1];
+				}
+				$encodings[] = 'US-ASCII';
+			}
+			// Text MIME-type default
+			elseif (substr($sniffed, 0, 5) === 'text/')
+			{
+				$encodings[] = 'US-ASCII';
+			}
+		}
+
+		// Fallback to XML 1.0 Appendix F.1/UTF-8/ISO-8859-1
+		$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
+		$encodings[] = 'UTF-8';
+		$encodings[] = 'ISO-8859-1';
+
+		// There's no point in trying an encoding twice
+		$encodings = array_unique($encodings);
+
+		// Loop through each possible encoding, till we return something, or run out of possibilities
+		foreach ($encodings as $encoding)
+		{
+			// Change the encoding to UTF-8 (as we always use UTF-8 internally)
+			if ($utf8_data = $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8')))
+			{
+				// Create new parser
+				$parser = $this->registry->create('Parser');
+
+				// If it's parsed fine
+				if ($parser->parse($utf8_data, 'UTF-8'))
+				{
+					$this->data = $parser->get_data();
+					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					{
+						$this->error = "A feed could not be found at $this->feed_url. This does not appear to be a valid RSS or Atom feed.";
+						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+						return false;
+					}
+
+					if (isset($headers))
+					{
+						$this->data['headers'] = $headers;
+					}
+					$this->data['build'] = SIMPLEPIE_BUILD;
+
+					// Cache the file if caching is enabled
+					if ($cache && !$cache->save($this))
+					{
+						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+					}
+					return true;
+				}
+			}
+		}
+
+		if (isset($parser))
+		{
+			// We have an error, just set SimplePie_Misc::error to it and quit
+			$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+		}
+		else
+		{
+			$this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.';
+		}
+
+		$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+
+		return false;
+	}
+
+	/**
+	 * Fetch the data via SimplePie_File
+	 *
+	 * If the data is already cached, attempt to fetch it from there instead
+	 * @param SimplePie_Cache|false $cache Cache handler, or false to not load from the cache
+	 * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type
+	 */
+	protected function fetch_data(&$cache)
+	{
+		// If it's enabled, use the cache
+		if ($cache)
+		{
+			// Load the Cache
+			$this->data = $cache->load();
+			if (!empty($this->data))
+			{
+				// If the cache is for an outdated build of SimplePie
+				if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
+				{
+					$cache->unlink();
+					$this->data = array();
+				}
+				// If we've hit a collision just rerun it with caching disabled
+				elseif (isset($this->data['url']) && $this->data['url'] !== $this->feed_url)
+				{
+					$cache = false;
+					$this->data = array();
+				}
+				// If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL.
+				elseif (isset($this->data['feed_url']))
+				{
+					// If the autodiscovery cache is still valid use it.
+					if ($cache->mtime() + $this->autodiscovery_cache_duration > time())
+					{
+						// Do not need to do feed autodiscovery yet.
+						if ($this->data['feed_url'] !== $this->data['url'])
+						{
+							$this->set_feed_url($this->data['feed_url']);
+							return $this->init();
+						}
+
+						$cache->unlink();
+						$this->data = array();
+					}
+				}
+				// Check if the cache has been updated
+				elseif ($cache->mtime() + $this->cache_duration < time())
+				{
+					// If we have last-modified and/or etag set
+					if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))
+					{
+						$headers = array(
+							'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+						);
+						if (isset($this->data['headers']['last-modified']))
+						{
+							$headers['if-modified-since'] = $this->data['headers']['last-modified'];
+						}
+						if (isset($this->data['headers']['etag']))
+						{
+							$headers['if-none-match'] = $this->data['headers']['etag'];
+						}
+
+						$file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen));
+
+						if ($file->success)
+						{
+							if ($file->status_code === 304)
+							{
+								$cache->touch();
+								return true;
+							}
+						}
+						else
+						{
+							unset($file);
+						}
+					}
+				}
+				// If the cache is still valid, just return true
+				else
+				{
+					$this->raw_data = false;
+					return true;
+				}
+			}
+			// If the cache is empty, delete it
+			else
+			{
+				$cache->unlink();
+				$this->data = array();
+			}
+		}
+		// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
+		if (!isset($file))
+		{
+			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
+			{
+				$file =& $this->file;
+			}
+			else
+			{
+				$headers = array(
+					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+				);
+				$file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen));
+			}
+		}
+		// If the file connection has an error, set SimplePie::error to that and quit
+		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+		{
+			$this->error = $file->error;
+			return !empty($this->data);
+		}
+
+		if (!$this->force_feed)
+		{
+			// Check if the supplied URL is a feed, if it isn't, look for it.
+			$locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds));
+
+			if (!$locate->is_feed($file))
+			{
+				// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
+				unset($file);
+				try
+				{
+					if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
+					{
+						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+						return false;
+					}
+				}
+				catch (SimplePie_Exception $e)
+				{
+					// This is usually because DOMDocument doesn't exist
+					$this->error = $e->getMessage();
+					$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, $e->getFile(), $e->getLine()));
+					return false;
+				}
+				if ($cache)
+				{
+					$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
+					if (!$cache->save($this))
+					{
+						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+					}
+					$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
+				}
+				$this->feed_url = $file->url;
+			}
+			$locate = null;
+		}
+
+		$this->raw_data = $file->body;
+
+		$headers = $file->headers;
+		$sniffer = $this->registry->create('Content_Type_Sniffer', array(&$file));
+		$sniffed = $sniffer->get_type();
+
+		return array($headers, $sniffed);
+	}
+
+	/**
+	 * Get the error message for the occured error
+	 *
+	 * @return string|array Error message, or array of messages for multifeeds
+	 */
+	public function error()
+	{
+		return $this->error;
+	}
+
+	/**
+	 * Get the raw XML
+	 *
+	 * This is the same as the old `$feed->enable_xml_dump(true)`, but returns
+	 * the data instead of printing it.
+	 *
+	 * @return string|boolean Raw XML data, false if the cache is used
+	 */
+	public function get_raw_data()
+	{
+		return $this->raw_data;
+	}
+
+	/**
+	 * Get the character encoding used for output
+	 *
+	 * @since Preview Release
+	 * @return string
+	 */
+	public function get_encoding()
+	{
+		return $this->sanitize->output_encoding;
+	}
+
+	/**
+	 * Send the content-type header with correct encoding
+	 *
+	 * This method ensures that the SimplePie-enabled page is being served with
+	 * the correct {@link http://www.iana.org/assignments/media-types/ mime-type}
+	 * and character encoding HTTP headers (character encoding determined by the
+	 * {@see set_output_encoding} config option).
+	 *
+	 * This won't work properly if any content or whitespace has already been
+	 * sent to the browser, because it relies on PHP's
+	 * {@link http://php.net/header header()} function, and these are the
+	 * circumstances under which the function works.
+	 *
+	 * Because it's setting these settings for the entire page (as is the nature
+	 * of HTTP headers), this should only be used once per page (again, at the
+	 * top).
+	 *
+	 * @param string $mime MIME type to serve the page as
+	 */
+	public function handle_content_type($mime = 'text/html')
+	{
+		if (!headers_sent())
+		{
+			$header = "Content-type: $mime;";
+			if ($this->get_encoding())
+			{
+				$header .= ' charset=' . $this->get_encoding();
+			}
+			else
+			{
+				$header .= ' charset=UTF-8';
+			}
+			header($header);
+		}
+	}
+
+	/**
+	 * Get the type of the feed
+	 *
+	 * This returns a SIMPLEPIE_TYPE_* constant, which can be tested against
+	 * using {@link http://php.net/language.operators.bitwise bitwise operators}
+	 *
+	 * @since 0.8 (usage changed to using constants in 1.0)
+	 * @see SIMPLEPIE_TYPE_NONE Unknown.
+	 * @see SIMPLEPIE_TYPE_RSS_090 RSS 0.90.
+	 * @see SIMPLEPIE_TYPE_RSS_091_NETSCAPE RSS 0.91 (Netscape).
+	 * @see SIMPLEPIE_TYPE_RSS_091_USERLAND RSS 0.91 (Userland).
+	 * @see SIMPLEPIE_TYPE_RSS_091 RSS 0.91.
+	 * @see SIMPLEPIE_TYPE_RSS_092 RSS 0.92.
+	 * @see SIMPLEPIE_TYPE_RSS_093 RSS 0.93.
+	 * @see SIMPLEPIE_TYPE_RSS_094 RSS 0.94.
+	 * @see SIMPLEPIE_TYPE_RSS_10 RSS 1.0.
+	 * @see SIMPLEPIE_TYPE_RSS_20 RSS 2.0.x.
+	 * @see SIMPLEPIE_TYPE_RSS_RDF RDF-based RSS.
+	 * @see SIMPLEPIE_TYPE_RSS_SYNDICATION Non-RDF-based RSS (truly intended as syndication format).
+	 * @see SIMPLEPIE_TYPE_RSS_ALL Any version of RSS.
+	 * @see SIMPLEPIE_TYPE_ATOM_03 Atom 0.3.
+	 * @see SIMPLEPIE_TYPE_ATOM_10 Atom 1.0.
+	 * @see SIMPLEPIE_TYPE_ATOM_ALL Any version of Atom.
+	 * @see SIMPLEPIE_TYPE_ALL Any known/supported feed type.
+	 * @return int SIMPLEPIE_TYPE_* constant
+	 */
+	public function get_type()
+	{
+		if (!isset($this->data['type']))
+		{
+			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+			{
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['textinput']))
+				{
+					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_10;
+				}
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['channel'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['image'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['textinput']))
+				{
+					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
+				}
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
+				{
+					switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
+					{
+						case '0.91':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091;
+							if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
+							{
+								switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
+								{
+									case '0':
+										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE;
+										break;
+
+									case '24':
+										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_USERLAND;
+										break;
+								}
+							}
+							break;
+
+						case '0.92':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_092;
+							break;
+
+						case '0.93':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_093;
+							break;
+
+						case '0.94':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_094;
+							break;
+
+						case '2.0':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_20;
+							break;
+					}
+				}
+			}
+			else
+			{
+				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
+			}
+		}
+		return $this->data['type'];
+	}
+
+	/**
+	 * Get the URL for the feed
+	 *
+	 * May or may not be different from the URL passed to {@see set_feed_url()},
+	 * depending on whether auto-discovery was used.
+	 *
+	 * @since Preview Release (previously called `get_feed_url()` since SimplePie 0.8.)
+	 * @todo If we have a perm redirect we should return the new URL
+	 * @todo When we make the above change, let's support <itunes:new-feed-url> as well
+	 * @todo Also, |atom:link|@rel=self
+	 * @return string|null
+	 */
+	public function subscribe_url()
+	{
+		if ($this->feed_url !== null)
+		{
+			return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get data for an feed-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute that is a
+	 * sub-element of the opening feed tag.
+	 *
+	 * The return value is an indexed array of elements matching the given
+	 * namespace and tag name. Each element has `attribs`, `data` and `child`
+	 * subkeys. For `attribs` and `child`, these contain namespace subkeys.
+	 * `attribs` then has one level of associative name => value data (where
+	 * `value` is a string) after the namespace. `child` has tag-indexed keys
+	 * after the namespace, each member of which is an indexed array matching
+	 * this same format.
+	 *
+	 * For example:
+	 * <pre>
+	 * // This is probably a bad example because we already support
+	 * // <media:content> natively, but it shows you how to parse through
+	 * // the nodes.
+	 * $group = $item->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group');
+	 * $content = $group[0]['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'];
+	 * $file = $content[0]['attribs']['']['url'];
+	 * echo $file;
+	 * </pre>
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_feed_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_ATOM_10)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_ATOM_03)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get data for an channel-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute in the
+	 * channel/header section of the feed.
+	 *
+	 * See {@see SimplePie::get_feed_tags()} for a description of the return value
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_channel_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
+		{
+			if ($return = $this->get_feed_tags($namespace, $tag))
+			{
+				return $return;
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get data for an channel-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute in the
+	 * image/logo section of the feed.
+	 *
+	 * See {@see SimplePie::get_feed_tags()} for a description of the return value
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_image_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		{
+			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		{
+			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the base URL value from the feed
+	 *
+	 * Uses `<xml:base>` if available, otherwise uses the first link in the
+	 * feed, or failing that, the URL of the feed itself.
+	 *
+	 * @see get_link
+	 * @see subscribe_url
+	 *
+	 * @param array $element
+	 * @return string
+	 */
+	public function get_base($element = array())
+	{
+		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		{
+			return $element['xml_base'];
+		}
+		elseif ($this->get_link() !== null)
+		{
+			return $this->get_link();
+		}
+		else
+		{
+			return $this->subscribe_url();
+		}
+	}
+
+	/**
+	 * Sanitize feed data
+	 *
+	 * @access private
+	 * @see SimplePie_Sanitize::sanitize()
+	 * @param string $data Data to sanitize
+	 * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants
+	 * @param string $base Base URL to resolve URLs against
+	 * @return string Sanitized data
+	 */
+	public function sanitize($data, $type, $base = '')
+	{
+		return $this->sanitize->sanitize($data, $type, $base);
+	}
+
+	/**
+	 * Get the title of the feed
+	 *
+	 * Uses `<atom:title>`, `<title>` or `<dc:title>`
+	 *
+	 * @since 1.0 (previously called `get_feed_title` since 0.8)
+	 * @return string|null
+	 */
+	public function get_title()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a category for the feed
+	 *
+	 * @since Unknown
+	 * @param int $key The category that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Category|null
+	 */
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all categories for the feed
+	 *
+	 * Uses `<atom:category>`, `<category>` or `<dc:subject>`
+	 *
+	 * @since Unknown
+	 * @return array|null List of {@see SimplePie_Category} objects
+	 */
+	public function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+		{
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($categories))
+		{
+			return array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get an author for the feed
+	 *
+	 * @since 1.1
+	 * @param int $key The author that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all authors for the feed
+	 *
+	 * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
+	 *
+	 * @since 1.1
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		if ($author = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($authors))
+		{
+			return array_unique($authors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a contributor for the feed
+	 *
+	 * @since 1.1
+	 * @param int $key The contrbutor that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_contributor($key = 0)
+	{
+		$contributors = $this->get_contributors();
+		if (isset($contributors[$key]))
+		{
+			return $contributors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all contributors for the feed
+	 *
+	 * Uses `<atom:contributor>`
+	 *
+	 * @since 1.1
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_contributors()
+	{
+		$contributors = array();
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+
+		if (!empty($contributors))
+		{
+			return array_unique($contributors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single link for the feed
+	 *
+	 * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
+	 * @param int $key The link that you want to return.  Remember that arrays begin with 0, not 1
+	 * @param string $rel The relationship of the link to return
+	 * @return string|null Link URL
+	 */
+	public function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if (isset($links[$key]))
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the permalink for the item
+	 *
+	 * Returns the first link available with a relationship of "alternate".
+	 * Identical to {@see get_link()} with key 0
+	 *
+	 * @see get_link
+	 * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
+	 * @internal Added for parity between the parent-level and the item/entry-level.
+	 * @return string|null Link URL
+	 */
+	public function get_permalink()
+	{
+		return $this->get_link(0);
+	}
+
+	/**
+	 * Get all links for the feed
+	 *
+	 * Uses `<atom:link>` or `<link>`
+	 *
+	 * @since Beta 2
+	 * @param string $rel The relationship of links to return
+	 * @return array|null Links found for the feed (strings)
+	 */
+	public function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					}
+				}
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+					}
+				}
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_all_discovered_feeds()
+	{
+		return $this->all_discovered_feeds;
+	}
+
+	/**
+	 * Get the content for the item
+	 *
+	 * Uses `<atom:subtitle>`, `<atom:tagline>`, `<description>`,
+	 * `<dc:description>`, `<itunes:summary>` or `<itunes:subtitle>`
+	 *
+	 * @since 1.0 (previously called `get_feed_description()` since 0.8)
+	 * @return string|null
+	 */
+	public function get_description()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the copyright info for the feed
+	 *
+	 * Uses `<atom:rights>`, `<atom:copyright>` or `<dc:rights>`
+	 *
+	 * @since 1.0 (previously called `get_feed_copyright()` since 0.8)
+	 * @return string|null
+	 */
+	public function get_copyright()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the language for the feed
+	 *
+	 * Uses `<language>`, `<dc:language>`, or @xml_lang
+	 *
+	 * @since 1.0 (previously called `get_feed_language()` since 0.8)
+	 * @return string|null
+	 */
+	public function get_language()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['headers']['content-language']))
+		{
+			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the latitude coordinates for the item
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:lat>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_latitude()
+	{
+
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the longitude coordinates for the feed
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_longitude()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's title
+	 *
+	 * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" title.
+	 *
+	 * Uses `<image><title>` or `<image><dc:title>`
+	 *
+	 * @return string|null
+	 */
+	public function get_image_title()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's URL
+	 *
+	 * RSS 0.9.0, 2.0, Atom 1.0, and feeds with iTunes RSS tags are allowed to
+	 * have a "feed logo" URL. This points directly to the image itself.
+	 *
+	 * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
+	 * `<image><title>` or `<image><dc:title>`
+	 *
+	 * @return string|null
+	 */
+	public function get_image_url()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
+		{
+			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+
+	/**
+	 * Get the feed logo's link
+	 *
+	 * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" link. This
+	 * points to a human-readable page that the image should link to.
+	 *
+	 * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
+	 * `<image><title>` or `<image><dc:title>`
+	 *
+	 * @return string|null
+	 */
+	public function get_image_link()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's link
+	 *
+	 * RSS 2.0 feeds are allowed to have a "feed logo" width.
+	 *
+	 * Uses `<image><width>` or defaults to 88.0 if no width is specified and
+	 * the feed is an RSS 2.0 feed.
+	 *
+	 * @return int|float|null
+	 */
+	public function get_image_width()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
+		{
+			return round($return[0]['data']);
+		}
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		{
+			return 88.0;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's height
+	 *
+	 * RSS 2.0 feeds are allowed to have a "feed logo" height.
+	 *
+	 * Uses `<image><height>` or defaults to 31.0 if no height is specified and
+	 * the feed is an RSS 2.0 feed.
+	 *
+	 * @return int|float|null
+	 */
+	public function get_image_height()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
+		{
+			return round($return[0]['data']);
+		}
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		{
+			return 31.0;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the number of items in the feed
+	 *
+	 * This is well-suited for {@link http://php.net/for for()} loops with
+	 * {@see get_item()}
+	 *
+	 * @param int $max Maximum value to return. 0 for no limit
+	 * @return int Number of items in the feed
+	 */
+	public function get_item_quantity($max = 0)
+	{
+		$max = (int) $max;
+		$qty = count($this->get_items());
+		if ($max === 0)
+		{
+			return $qty;
+		}
+		else
+		{
+			return ($qty > $max) ? $max : $qty;
+		}
+	}
+
+	/**
+	 * Get a single item from the feed
+	 *
+	 * This is better suited for {@link http://php.net/for for()} loops, whereas
+	 * {@see get_items()} is better suited for
+	 * {@link http://php.net/foreach foreach()} loops.
+	 *
+	 * @see get_item_quantity()
+	 * @since Beta 2
+	 * @param int $key The item that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Item|null
+	 */
+	public function get_item($key = 0)
+	{
+		$items = $this->get_items();
+		if (isset($items[$key]))
+		{
+			return $items[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all items from the feed
+	 *
+	 * This is better suited for {@link http://php.net/for for()} loops, whereas
+	 * {@see get_items()} is better suited for
+	 * {@link http://php.net/foreach foreach()} loops.
+	 *
+	 * @see get_item_quantity
+	 * @since Beta 2
+	 * @param int $start Index to start at
+	 * @param int $end Number of items to return. 0 for all items after `$start`
+	 * @return array|null List of {@see SimplePie_Item} objects
+	 */
+	public function get_items($start = 0, $end = 0)
+	{
+		if (!isset($this->data['items']))
+		{
+			if (!empty($this->multifeed_objects))
+			{
+				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
+			}
+			else
+			{
+				$this->data['items'] = array();
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
+				{
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+					}
+				}
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
+				{
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+					}
+				}
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
+				{
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+					}
+				}
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
+				{
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+					}
+				}
+				if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item'))
+				{
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+					}
+				}
+			}
+		}
+
+		if (!empty($this->data['items']))
+		{
+			// If we want to order it by date, check if all items have a date, and then sort it
+			if ($this->order_by_date && empty($this->multifeed_objects))
+			{
+				if (!isset($this->data['ordered_items']))
+				{
+					$do_sort = true;
+					foreach ($this->data['items'] as $item)
+					{
+						if (!$item->get_date('U'))
+						{
+							$do_sort = false;
+							break;
+						}
+					}
+					$item = null;
+					$this->data['ordered_items'] = $this->data['items'];
+					if ($do_sort)
+					{
+						usort($this->data['ordered_items'], array(get_class($this), 'sort_items'));
+					}
+				}
+				$items = $this->data['ordered_items'];
+			}
+			else
+			{
+				$items = $this->data['items'];
+			}
+
+			// Slice the data as desired
+			if ($end === 0)
+			{
+				return array_slice($items, $start);
+			}
+			else
+			{
+				return array_slice($items, $start, $end);
+			}
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	/**
+	 * Set the favicon handler
+	 *
+	 * @deprecated Use your own favicon handling instead
+	 */
+	public function set_favicon_handler($page = false, $qs = 'i')
+	{
+		$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+		trigger_error('Favicon handling has been removed, please use your own handling', $level);
+		return false;
+	}
+
+	/**
+	 * Get the favicon for the current feed
+	 *
+	 * @deprecated Use your own favicon handling instead
+	 */
+	public function get_favicon()
+	{
+		$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+		trigger_error('Favicon handling has been removed, please use your own handling', $level);
+
+		if (($url = $this->get_link()) !== null)
+		{
+			return 'http://g.etfv.co/' . urlencode($url);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Magic method handler
+	 *
+	 * @param string $method Method name
+	 * @param array $args Arguments to the method
+	 * @return mixed
+	 */
+	public function __call($method, $args)
+	{
+		if (strpos($method, 'subscribe_') === 0)
+		{
+			$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+			trigger_error('subscribe_*() has been deprecated, implement the callback yourself', $level);
+			return '';
+		}
+		if ($method === 'enable_xml_dump')
+		{
+			$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+			trigger_error('enable_xml_dump() has been deprecated, use get_raw_data() instead', $level);
+			return false;
+		}
+
+		$class = get_class($this);
+		$trace = debug_backtrace();
+		$file = $trace[0]['file'];
+		$line = $trace[0]['line'];
+		trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR);
+	}
+
+	/**
+	 * Sorting callback for items
+	 *
+	 * @access private
+	 * @param SimplePie $a
+	 * @param SimplePie $b
+	 * @return boolean
+	 */
+	public static function sort_items($a, $b)
+	{
+		return $a->get_date('U') <= $b->get_date('U');
+	}
+
+	/**
+	 * Merge items from several feeds into one
+	 *
+	 * If you're merging multiple feeds together, they need to all have dates
+	 * for the items or else SimplePie will refuse to sort them.
+	 *
+	 * @link http://simplepie.org/wiki/tutorial/sort_multiple_feeds_by_time_and_date#if_feeds_require_separate_per-feed_settings
+	 * @param array $urls List of SimplePie feed objects to merge
+	 * @param int $start Starting item
+	 * @param int $end Number of items to return
+	 * @param int $limit Maximum number of items per feed
+	 * @return array
+	 */
+	public static function merge_items($urls, $start = 0, $end = 0, $limit = 0)
+	{
+		if (is_array($urls) && sizeof($urls) > 0)
+		{
+			$items = array();
+			foreach ($urls as $arg)
+			{
+				if ($arg instanceof SimplePie)
+				{
+					$items = array_merge($items, $arg->get_items(0, $limit));
+				}
+				else
+				{
+					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
+				}
+			}
+
+			$do_sort = true;
+			foreach ($items as $item)
+			{
+				if (!$item->get_date('U'))
+				{
+					$do_sort = false;
+					break;
+				}
+			}
+			$item = null;
+			if ($do_sort)
+			{
+				usort($items, array(get_class($urls[0]), 'sort_items'));
+			}
+
+			if ($end === 0)
+			{
+				return array_slice($items, $start);
+			}
+			else
+			{
+				return array_slice($items, $start, $end);
+			}
+		}
+		else
+		{
+			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
+			return array();
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Author.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Author.php
new file mode 100644
index 00000000..bbf3812f
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Author.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Manages all author-related data
+ *
+ * Used by {@see SimplePie_Item::get_author()} and {@see SimplePie::get_authors()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_author_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Author
+{
+	/**
+	 * Author's name
+	 *
+	 * @var string
+	 * @see get_name()
+	 */
+	var $name;
+
+	/**
+	 * Author's link
+	 *
+	 * @var string
+	 * @see get_link()
+	 */
+	var $link;
+
+	/**
+	 * Author's email address
+	 *
+	 * @var string
+	 * @see get_email()
+	 */
+	var $email;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * @param string $name
+	 * @param string $link
+	 * @param string $email
+	 */
+	public function __construct($name = null, $link = null, $email = null)
+	{
+		$this->name = $name;
+		$this->link = $link;
+		$this->email = $email;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Author's name
+	 *
+	 * @return string|null
+	 */
+	public function get_name()
+	{
+		if ($this->name !== null)
+		{
+			return $this->name;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Author's link
+	 *
+	 * @return string|null
+	 */
+	public function get_link()
+	{
+		if ($this->link !== null)
+		{
+			return $this->link;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Author's email address
+	 *
+	 * @return string|null
+	 */
+	public function get_email()
+	{
+		if ($this->email !== null)
+		{
+			return $this->email;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache.php
new file mode 100644
index 00000000..75586d74
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used to create cache objects
+ *
+ * This class can be overloaded with {@see SimplePie::set_cache_class()},
+ * although the preferred way is to create your own handler
+ * via {@see register()}
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+class SimplePie_Cache
+{
+	/**
+	 * Cache handler classes
+	 *
+	 * These receive 3 parameters to their constructor, as documented in
+	 * {@see register()}
+	 * @var array
+	 */
+	protected static $handlers = array(
+		'mysql' => 'SimplePie_Cache_MySQL',
+		'memcache' => 'SimplePie_Cache_Memcache',
+	);
+
+	/**
+	 * Don't call the constructor. Please.
+	 */
+	private function __construct() { }
+
+	/**
+	 * Create a new SimplePie_Cache object
+	 *
+	 * @param string $location URL location (scheme is used to determine handler)
+	 * @param string $filename Unique identifier for cache object
+	 * @param string $extension 'spi' or 'spc'
+	 * @return SimplePie_Cache_Base Type of object depends on scheme of `$location`
+	 */
+	public static function get_handler($location, $filename, $extension)
+	{
+		$type = explode(':', $location, 2);
+		$type = $type[0];
+		if (!empty(self::$handlers[$type]))
+		{
+			$class = self::$handlers[$type];
+			return new $class($location, $filename, $extension);
+		}
+
+		return new SimplePie_Cache_File($location, $filename, $extension);
+	}
+
+	/**
+	 * Create a new SimplePie_Cache object
+	 *
+	 * @deprecated Use {@see get_handler} instead
+	 */
+	public function create($location, $filename, $extension)
+	{
+		trigger_error('Cache::create() has been replaced with Cache::get_handler(). Switch to the registry system to use this.', E_USER_DEPRECATED);
+		return self::get_handler($location, $filename, $extension);
+	}
+
+	/**
+	 * Register a handler
+	 *
+	 * @param string $type DSN type to register for
+	 * @param string $class Name of handler class. Must implement SimplePie_Cache_Base
+	 */
+	public static function register($type, $class)
+	{
+		self::$handlers[$type] = $class;
+	}
+
+	/**
+	 * Parse a URL into an array
+	 *
+	 * @param string $url
+	 * @return array
+	 */
+	public static function parse_URL($url)
+	{
+		$params = parse_url($url);
+		$params['extras'] = array();
+		if (isset($params['query']))
+		{
+			parse_str($params['query'], $params['extras']);
+		}
+		return $params;
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php
new file mode 100644
index 00000000..937e3463
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Base for cache objects
+ *
+ * Classes to be used with {@see SimplePie_Cache::register()} are expected
+ * to implement this interface.
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+interface SimplePie_Cache_Base
+{
+	/**
+	 * Feed cache type
+	 *
+	 * @var string
+	 */
+	const TYPE_FEED = 'spc';
+
+	/**
+	 * Image cache type
+	 *
+	 * @var string
+	 */
+	const TYPE_IMAGE = 'spi';
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type);
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data);
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load();
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime();
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch();
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink();
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php
new file mode 100644
index 00000000..ac509ae0
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Base class for database-based caches
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base
+{
+	/**
+	 * Helper for database conversion
+	 *
+	 * Converts a given {@see SimplePie} object into data to be stored
+	 *
+	 * @param SimplePie $data
+	 * @return array First item is the serialized data for storage, second item is the unique ID for this item
+	 */
+	protected static function prepare_simplepie_object_for_cache($data)
+	{
+		$items = $data->get_items();
+		$items_by_id = array();
+
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				$items_by_id[$item->get_id()] = $item;
+			}
+
+			if (count($items_by_id) !== count($items))
+			{
+				$items_by_id = array();
+				foreach ($items as $item)
+				{
+					$items_by_id[$item->get_id(true)] = $item;
+				}
+			}
+
+			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
+			}
+			else
+			{
+				$channel = null;
+			}
+
+			if ($channel !== null)
+			{
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']);
+				}
+			}
+			if (isset($data->data['items']))
+			{
+				unset($data->data['items']);
+			}
+			if (isset($data->data['ordered_items']))
+			{
+				unset($data->data['ordered_items']);
+			}
+		}
+		return array(serialize($data->data), $items_by_id);
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php
new file mode 100644
index 00000000..5797b3ae
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to the filesystem
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+class SimplePie_Cache_File implements SimplePie_Cache_Base
+{
+	/**
+	 * Location string
+	 *
+	 * @see SimplePie::$cache_location
+	 * @var string
+	 */
+	protected $location;
+
+	/**
+	 * Filename
+	 *
+	 * @var string
+	 */
+	protected $filename;
+
+	/**
+	 * File extension
+	 *
+	 * @var string
+	 */
+	protected $extension;
+
+	/**
+	 * File path
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type)
+	{
+		$this->location = $location;
+		$this->filename = $name;
+		$this->extension = $type;
+		$this->name = "$this->location/$this->filename.$this->extension";
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data)
+	{
+		if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location))
+		{
+			if ($data instanceof SimplePie)
+			{
+				$data = $data->data;
+			}
+
+			$data = serialize($data);
+			return (bool) file_put_contents($this->name, $data);
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load()
+	{
+		if (file_exists($this->name) && is_readable($this->name))
+		{
+			return unserialize(file_get_contents($this->name));
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime()
+	{
+		if (file_exists($this->name))
+		{
+			return filemtime($this->name);
+		}
+		return false;
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch()
+	{
+		if (file_exists($this->name))
+		{
+			return touch($this->name);
+		}
+		return false;
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink()
+	{
+		if (file_exists($this->name))
+		{
+			return unlink($this->name);
+		}
+		return false;
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php
new file mode 100644
index 00000000..fd447806
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to memcache
+ *
+ * Registered for URLs with the "memcache" protocol
+ *
+ * For example, `memcache://localhost:11211/?timeout=3600&prefix=sp_` will
+ * connect to memcache on `localhost` on port 11211. All tables will be
+ * prefixed with `sp_` and data will expire after 3600 seconds
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @uses Memcache
+ */
+class SimplePie_Cache_Memcache implements SimplePie_Cache_Base
+{
+	/**
+	 * Memcache instance
+	 *
+	 * @var Memcache
+	 */
+	protected $cache;
+
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Cache name
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type)
+	{
+		$this->options = array(
+			'host' => '127.0.0.1',
+			'port' => 11211,
+			'extras' => array(
+				'timeout' => 3600, // one hour
+				'prefix' => 'simplepie_',
+			),
+		);
+		$parsed = SimplePie_Cache::parse_URL($location);
+		$this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host'];
+		$this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port'];
+		$this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']);
+		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+
+		$this->cache = new Memcache();
+		$this->cache->addServer($this->options['host'], (int) $this->options['port']);
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data)
+	{
+		if ($data instanceof SimplePie)
+		{
+			$data = $data->data;
+		}
+		return $this->cache->set($this->name, serialize($data), MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load()
+	{
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false)
+		{
+			return unserialize($data);
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime()
+	{
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false)
+		{
+			// essentially ignore the mtime because Memcache expires on it's own
+			return time();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch()
+	{
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false)
+		{
+			return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->duration);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink()
+	{
+		return $this->cache->delete($this->name, 0);
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php
new file mode 100644
index 00000000..d53ebc11
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php
@@ -0,0 +1,438 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to a MySQL database
+ *
+ * Registered for URLs with the "mysql" protocol
+ *
+ * For example, `mysql://root:password@localhost:3306/mydb?prefix=sp_` will
+ * connect to the `mydb` database on `localhost` on port 3306, with the user
+ * `root` and the password `password`. All tables will be prefixed with `sp_`
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
+{
+	/**
+	 * PDO instance
+	 *
+	 * @var PDO
+	 */
+	protected $mysql;
+
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Cache ID
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type)
+	{
+		$this->options = array(
+			'user' => null,
+			'pass' => null,
+			'host' => '127.0.0.1',
+			'port' => '3306',
+			'path' => '',
+			'extras' => array(
+				'prefix' => '',
+			),
+		);
+		$this->options = array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
+
+		// Path is prefixed with a "/"
+		$this->options['dbname'] = substr($this->options['path'], 1);
+
+		try
+		{
+			$this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+		}
+		catch (PDOException $e)
+		{
+			$this->mysql = null;
+			return;
+		}
+
+		$this->id = $name . $type;
+
+		if (!$query = $this->mysql->query('SHOW TABLES'))
+		{
+			$this->mysql = null;
+			return;
+		}
+
+		$db = array();
+		while ($row = $query->fetchColumn())
+		{
+			$db[] = $row;
+		}
+
+		if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+		{
+			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+			if ($query === false)
+			{
+				$this->mysql = null;
+			}
+		}
+
+		if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+		{
+			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+			if ($query === false)
+			{
+				$this->mysql = null;
+			}
+		}
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data)
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		if ($data instanceof SimplePie)
+		{
+			$data = clone $data;
+
+			$prepared = self::prepare_simplepie_object_for_cache($data);
+
+			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query->bindValue(':feed', $this->id);
+			if ($query->execute())
+			{
+				if ($query->fetchColumn() > 0)
+				{
+					$items = count($prepared[1]);
+					if ($items)
+					{
+						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$query = $this->mysql->prepare($sql);
+						$query->bindValue(':items', $items);
+					}
+					else
+					{
+						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$query = $this->mysql->prepare($sql);
+					}
+
+					$query->bindValue(':data', $prepared[0]);
+					$query->bindValue(':time', time());
+					$query->bindValue(':feed', $this->id);
+					if (!$query->execute())
+					{
+						return false;
+					}
+				}
+				else
+				{
+					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+					$query->bindValue(':feed', $this->id);
+					$query->bindValue(':count', count($prepared[1]));
+					$query->bindValue(':data', $prepared[0]);
+					$query->bindValue(':time', time());
+					if (!$query->execute())
+					{
+						return false;
+					}
+				}
+
+				$ids = array_keys($prepared[1]);
+				if (!empty($ids))
+				{
+					foreach ($ids as $id)
+					{
+						$database_ids[] = $this->mysql->quote($id);
+					}
+
+					$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+					$query->bindValue(':feed', $this->id);
+
+					if ($query->execute())
+					{
+						$existing_ids = array();
+						while ($row = $query->fetchColumn())
+						{
+							$existing_ids[] = $row;
+						}
+
+						$new_ids = array_diff($ids, $existing_ids);
+
+						foreach ($new_ids as $new_id)
+						{
+							if (!($date = $prepared[1][$new_id]->get_date('U')))
+							{
+								$date = time();
+							}
+
+							$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+							$query->bindValue(':feed', $this->id);
+							$query->bindValue(':id', $new_id);
+							$query->bindValue(':data', serialize($prepared[1][$new_id]->data));
+							$query->bindValue(':date', $date);
+							if (!$query->execute())
+							{
+								return false;
+							}
+						}
+						return true;
+					}
+				}
+				else
+				{
+					return true;
+				}
+			}
+		}
+		else
+		{
+			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query->bindValue(':feed', $this->id);
+			if ($query->execute())
+			{
+				if ($query->rowCount() > 0)
+				{
+					$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+					$query->bindValue(':data', serialize($data));
+					$query->bindValue(':time', time());
+					$query->bindValue(':feed', $this->id);
+					if ($this->execute())
+					{
+						return true;
+					}
+				}
+				else
+				{
+					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+					$query->bindValue(':id', $this->id);
+					$query->bindValue(':data', serialize($data));
+					$query->bindValue(':time', time());
+					if ($query->execute())
+					{
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query->bindValue(':id', $this->id);
+		if ($query->execute() && ($row = $query->fetch()))
+		{
+			$data = unserialize($row[1]);
+
+			if (isset($this->options['items'][0]))
+			{
+				$items = (int) $this->options['items'][0];
+			}
+			else
+			{
+				$items = (int) $row[0];
+			}
+
+			if ($items !== 0)
+			{
+				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+				}
+				else
+				{
+					$feed = null;
+				}
+
+				if ($feed !== null)
+				{
+					$sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+					if ($items > 0)
+					{
+						$sql .= ' LIMIT ' . $items;
+					}
+
+					$query = $this->mysql->prepare($sql);
+					$query->bindValue(':feed', $this->id);
+					if ($query->execute())
+					{
+						while ($row = $query->fetchColumn())
+						{
+							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
+						}
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query->bindValue(':id', $this->id);
+		if ($query->execute() && ($time = $query->fetchColumn()))
+		{
+			return $time;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+		$query->bindValue(':time', time());
+		$query->bindValue(':id', $this->id);
+		if ($query->execute() && $query->rowCount() > 0)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query->bindValue(':id', $this->id);
+		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+		$query2->bindValue(':id', $this->id);
+		if ($query->execute() && $query2->execute())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Caption.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Caption.php
new file mode 100644
index 00000000..52922c5d
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Caption.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Handles `<media:text>` captions as defined in Media RSS.
+ *
+ * Used by {@see SimplePie_Enclosure::get_caption()} and {@see SimplePie_Enclosure::get_captions()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_caption_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Caption
+{
+	/**
+	 * Content type
+	 *
+	 * @var string
+	 * @see get_type()
+	 */
+	var $type;
+
+	/**
+	 * Language
+	 *
+	 * @var string
+	 * @see get_language()
+	 */
+	var $lang;
+
+	/**
+	 * Start time
+	 *
+	 * @var string
+	 * @see get_starttime()
+	 */
+	var $startTime;
+
+	/**
+	 * End time
+	 *
+	 * @var string
+	 * @see get_endtime()
+	 */
+	var $endTime;
+
+	/**
+	 * Caption text
+	 *
+	 * @var string
+	 * @see get_text()
+	 */
+	var $text;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
+	{
+		$this->type = $type;
+		$this->lang = $lang;
+		$this->startTime = $startTime;
+		$this->endTime = $endTime;
+		$this->text = $text;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the end time
+	 *
+	 * @return string|null Time in the format 'hh:mm:ss.SSS'
+	 */
+	public function get_endtime()
+	{
+		if ($this->endTime !== null)
+		{
+			return $this->endTime;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the language
+	 *
+	 * @link http://tools.ietf.org/html/rfc3066
+	 * @return string|null Language code as per RFC 3066
+	 */
+	public function get_language()
+	{
+		if ($this->lang !== null)
+		{
+			return $this->lang;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the start time
+	 *
+	 * @return string|null Time in the format 'hh:mm:ss.SSS'
+	 */
+	public function get_starttime()
+	{
+		if ($this->startTime !== null)
+		{
+			return $this->startTime;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the text of the caption
+	 *
+	 * @return string|null
+	 */
+	public function get_text()
+	{
+		if ($this->text !== null)
+		{
+			return $this->text;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the content type (not MIME type)
+	 *
+	 * @return string|null Either 'text' or 'html'
+	 */
+	public function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Category.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Category.php
new file mode 100644
index 00000000..ad0407b4
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Category.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Manages all category-related data
+ *
+ * Used by {@see SimplePie_Item::get_category()} and {@see SimplePie_Item::get_categories()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_category_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Category
+{
+	/**
+	 * Category identifier
+	 *
+	 * @var string
+	 * @see get_term
+	 */
+	var $term;
+
+	/**
+	 * Categorization scheme identifier
+	 *
+	 * @var string
+	 * @see get_scheme()
+	 */
+	var $scheme;
+
+	/**
+	 * Human readable label
+	 *
+	 * @var string
+	 * @see get_label()
+	 */
+	var $label;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * @param string $term
+	 * @param string $scheme
+	 * @param string $label
+	 */
+	public function __construct($term = null, $scheme = null, $label = null)
+	{
+		$this->term = $term;
+		$this->scheme = $scheme;
+		$this->label = $label;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the category identifier
+	 *
+	 * @return string|null
+	 */
+	public function get_term()
+	{
+		if ($this->term !== null)
+		{
+			return $this->term;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the categorization scheme identifier
+	 *
+	 * @return string|null
+	 */
+	public function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the human readable label
+	 *
+	 * @return string|null
+	 */
+	public function get_label()
+	{
+		if ($this->label !== null)
+		{
+			return $this->label;
+		}
+		else
+		{
+			return $this->get_term();
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
new file mode 100644
index 00000000..20d053dc
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Content-type sniffing
+ *
+ * Based on the rules in http://tools.ietf.org/html/draft-abarth-mime-sniff-06
+ *
+ * This is used since we can't always trust Content-Type headers, and is based
+ * upon the HTML5 parsing rules.
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_content_type_sniffer_class()}
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ */
+class SimplePie_Content_Type_Sniffer
+{
+	/**
+	 * File object
+	 *
+	 * @var SimplePie_File
+	 */
+	var $file;
+
+	/**
+	 * Create an instance of the class with the input file
+	 *
+	 * @param SimplePie_Content_Type_Sniffer $file Input file
+	 */
+	public function __construct($file)
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * Get the Content-Type of the specified file
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function get_type()
+	{
+		if (isset($this->file->headers['content-type']))
+		{
+			if (!isset($this->file->headers['content-encoding'])
+				&& ($this->file->headers['content-type'] === 'text/plain'
+					|| $this->file->headers['content-type'] === 'text/plain; charset=ISO-8859-1'
+					|| $this->file->headers['content-type'] === 'text/plain; charset=iso-8859-1'
+					|| $this->file->headers['content-type'] === 'text/plain; charset=UTF-8'))
+			{
+				return $this->text_or_binary();
+			}
+
+			if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
+			{
+				$official = substr($this->file->headers['content-type'], 0, $pos);
+			}
+			else
+			{
+				$official = $this->file->headers['content-type'];
+			}
+			$official = trim(strtolower($official));
+
+			if ($official === 'unknown/unknown'
+				|| $official === 'application/unknown')
+			{
+				return $this->unknown();
+			}
+			elseif (substr($official, -4) === '+xml'
+				|| $official === 'text/xml'
+				|| $official === 'application/xml')
+			{
+				return $official;
+			}
+			elseif (substr($official, 0, 6) === 'image/')
+			{
+				if ($return = $this->image())
+				{
+					return $return;
+				}
+				else
+				{
+					return $official;
+				}
+			}
+			elseif ($official === 'text/html')
+			{
+				return $this->feed_or_html();
+			}
+			else
+			{
+				return $official;
+			}
+		}
+		else
+		{
+			return $this->unknown();
+		}
+	}
+
+	/**
+	 * Sniff text or binary
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function text_or_binary()
+	{
+		if (substr($this->file->body, 0, 2) === "\xFE\xFF"
+			|| substr($this->file->body, 0, 2) === "\xFF\xFE"
+			|| substr($this->file->body, 0, 4) === "\x00\x00\xFE\xFF"
+			|| substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
+		{
+			return 'text/plain';
+		}
+		elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
+		{
+			return 'application/octect-stream';
+		}
+		else
+		{
+			return 'text/plain';
+		}
+	}
+
+	/**
+	 * Sniff unknown
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function unknown()
+	{
+		$ws = strspn($this->file->body, "\x09\x0A\x0B\x0C\x0D\x20");
+		if (strtolower(substr($this->file->body, $ws, 14)) === '<!doctype html'
+			|| strtolower(substr($this->file->body, $ws, 5)) === '<html'
+			|| strtolower(substr($this->file->body, $ws, 7)) === '<script')
+		{
+			return 'text/html';
+		}
+		elseif (substr($this->file->body, 0, 5) === '%PDF-')
+		{
+			return 'application/pdf';
+		}
+		elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
+		{
+			return 'application/postscript';
+		}
+		elseif (substr($this->file->body, 0, 6) === 'GIF87a'
+			|| substr($this->file->body, 0, 6) === 'GIF89a')
+		{
+			return 'image/gif';
+		}
+		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		{
+			return 'image/png';
+		}
+		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		{
+			return 'image/jpeg';
+		}
+		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		{
+			return 'image/bmp';
+		}
+		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		{
+			return 'image/vnd.microsoft.icon';
+		}
+		else
+		{
+			return $this->text_or_binary();
+		}
+	}
+
+	/**
+	 * Sniff images
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function image()
+	{
+		if (substr($this->file->body, 0, 6) === 'GIF87a'
+			|| substr($this->file->body, 0, 6) === 'GIF89a')
+		{
+			return 'image/gif';
+		}
+		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		{
+			return 'image/png';
+		}
+		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		{
+			return 'image/jpeg';
+		}
+		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		{
+			return 'image/bmp';
+		}
+		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		{
+			return 'image/vnd.microsoft.icon';
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Sniff HTML
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function feed_or_html()
+	{
+		$len = strlen($this->file->body);
+		$pos = strspn($this->file->body, "\x09\x0A\x0D\x20");
+
+		while ($pos < $len)
+		{
+			switch ($this->file->body[$pos])
+			{
+				case "\x09":
+				case "\x0A":
+				case "\x0D":
+				case "\x20":
+					$pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos);
+					continue 2;
+
+				case '<':
+					$pos++;
+					break;
+
+				default:
+					return 'text/html';
+			}
+
+			if (substr($this->file->body, $pos, 3) === '!--')
+			{
+				$pos += 3;
+				if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
+				{
+					$pos += 3;
+				}
+				else
+				{
+					return 'text/html';
+				}
+			}
+			elseif (substr($this->file->body, $pos, 1) === '!')
+			{
+				if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
+				{
+					$pos++;
+				}
+				else
+				{
+					return 'text/html';
+				}
+			}
+			elseif (substr($this->file->body, $pos, 1) === '?')
+			{
+				if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
+				{
+					$pos += 2;
+				}
+				else
+				{
+					return 'text/html';
+				}
+			}
+			elseif (substr($this->file->body, $pos, 3) === 'rss'
+				|| substr($this->file->body, $pos, 7) === 'rdf:RDF')
+			{
+				return 'application/rss+xml';
+			}
+			elseif (substr($this->file->body, $pos, 4) === 'feed')
+			{
+				return 'application/atom+xml';
+			}
+			else
+			{
+				return 'text/html';
+			}
+		}
+
+		return 'text/html';
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Copyright.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Copyright.php
new file mode 100644
index 00000000..57c535a6
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Copyright.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Manages `<media:copyright>` copyright tags as defined in Media RSS
+ *
+ * Used by {@see SimplePie_Enclosure::get_copyright()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_copyright_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Copyright
+{
+	/**
+	 * Copyright URL
+	 *
+	 * @var string
+	 * @see get_url()
+	 */
+	var $url;
+
+	/**
+	 * Attribution
+	 *
+	 * @var string
+	 * @see get_attribution()
+	 */
+	var $label;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($url = null, $label = null)
+	{
+		$this->url = $url;
+		$this->label = $label;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the copyright URL
+	 *
+	 * @return string|null URL to copyright information
+	 */
+	public function get_url()
+	{
+		if ($this->url !== null)
+		{
+			return $this->url;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the attribution text
+	 *
+	 * @return string|null
+	 */
+	public function get_attribution()
+	{
+		if ($this->label !== null)
+		{
+			return $this->label;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Core.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Core.php
new file mode 100644
index 00000000..46d99662
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Core.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2009, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * SimplePie class.
+ *
+ * Class for backward compatibility.
+ *
+ * @deprecated Use {@see SimplePie} directly
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Core extends SimplePie
+{
+
+}
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Credit.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Credit.php
new file mode 100644
index 00000000..d3a3442a
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Credit.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<media:credit>` as defined in Media RSS
+ *
+ * Used by {@see SimplePie_Enclosure::get_credit()} and {@see SimplePie_Enclosure::get_credits()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_credit_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Credit
+{
+	/**
+	 * Credited role
+	 *
+	 * @var string
+	 * @see get_role()
+	 */
+	var $role;
+
+	/**
+	 * Organizational scheme
+	 *
+	 * @var string
+	 * @see get_scheme()
+	 */
+	var $scheme;
+
+	/**
+	 * Credited name
+	 *
+	 * @var string
+	 * @see get_name()
+	 */
+	var $name;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($role = null, $scheme = null, $name = null)
+	{
+		$this->role = $role;
+		$this->scheme = $scheme;
+		$this->name = $name;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the role of the person receiving credit
+	 *
+	 * @return string|null
+	 */
+	public function get_role()
+	{
+		if ($this->role !== null)
+		{
+			return $this->role;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the organizational scheme
+	 *
+	 * @return string|null
+	 */
+	public function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the credited person/entity's name
+	 *
+	 * @return string|null
+	 */
+	public function get_name()
+	{
+		if ($this->name !== null)
+		{
+			return $this->name;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php
new file mode 100644
index 00000000..069e8d8e
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Decode/HTML/Entities.php
@@ -0,0 +1,617 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Decode HTML Entities
+ *
+ * This implements HTML5 as of revision 967 (2007-06-28)
+ *
+ * @deprecated Use DOMDocument instead!
+ * @package SimplePie
+ */
+class SimplePie_Decode_HTML_Entities
+{
+	/**
+	 * Data to be parsed
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $data = '';
+
+	/**
+	 * Currently consumed bytes
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $consumed = '';
+
+	/**
+	 * Position of the current byte being parsed
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $position = 0;
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @access public
+	 * @param string $data Input data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @access public
+	 * @return string Output data
+	 */
+	public function parse()
+	{
+		while (($this->position = strpos($this->data, '&', $this->position)) !== false)
+		{
+			$this->consume();
+			$this->entity();
+			$this->consumed = '';
+		}
+		return $this->data;
+	}
+
+	/**
+	 * Consume the next byte
+	 *
+	 * @access private
+	 * @return mixed The next byte, or false, if there is no more data
+	 */
+	public function consume()
+	{
+		if (isset($this->data[$this->position]))
+		{
+			$this->consumed .= $this->data[$this->position];
+			return $this->data[$this->position++];
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Consume a range of characters
+	 *
+	 * @access private
+	 * @param string $chars Characters to consume
+	 * @return mixed A series of characters that match the range, or false
+	 */
+	public function consume_range($chars)
+	{
+		if ($len = strspn($this->data, $chars, $this->position))
+		{
+			$data = substr($this->data, $this->position, $len);
+			$this->consumed .= $data;
+			$this->position += $len;
+			return $data;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Unconsume one byte
+	 *
+	 * @access private
+	 */
+	public function unconsume()
+	{
+		$this->consumed = substr($this->consumed, 0, -1);
+		$this->position--;
+	}
+
+	/**
+	 * Decode an entity
+	 *
+	 * @access private
+	 */
+	public function entity()
+	{
+		switch ($this->consume())
+		{
+			case "\x09":
+			case "\x0A":
+			case "\x0B":
+			case "\x0B":
+			case "\x0C":
+			case "\x20":
+			case "\x3C":
+			case "\x26":
+			case false:
+				break;
+
+			case "\x23":
+				switch ($this->consume())
+				{
+					case "\x78":
+					case "\x58":
+						$range = '0123456789ABCDEFabcdef';
+						$hex = true;
+						break;
+
+					default:
+						$range = '0123456789';
+						$hex = false;
+						$this->unconsume();
+						break;
+				}
+
+				if ($codepoint = $this->consume_range($range))
+				{
+					static $windows_1252_specials = array(0x0D => "\x0A", 0x80 => "\xE2\x82\xAC", 0x81 => "\xEF\xBF\xBD", 0x82 => "\xE2\x80\x9A", 0x83 => "\xC6\x92", 0x84 => "\xE2\x80\x9E", 0x85 => "\xE2\x80\xA6", 0x86 => "\xE2\x80\xA0", 0x87 => "\xE2\x80\xA1", 0x88 => "\xCB\x86", 0x89 => "\xE2\x80\xB0", 0x8A => "\xC5\xA0", 0x8B => "\xE2\x80\xB9", 0x8C => "\xC5\x92", 0x8D => "\xEF\xBF\xBD", 0x8E => "\xC5\xBD", 0x8F => "\xEF\xBF\xBD", 0x90 => "\xEF\xBF\xBD", 0x91 => "\xE2\x80\x98", 0x92 => "\xE2\x80\x99", 0x93 => "\xE2\x80\x9C", 0x94 => "\xE2\x80\x9D", 0x95 => "\xE2\x80\xA2", 0x96 => "\xE2\x80\x93", 0x97 => "\xE2\x80\x94", 0x98 => "\xCB\x9C", 0x99 => "\xE2\x84\xA2", 0x9A => "\xC5\xA1", 0x9B => "\xE2\x80\xBA", 0x9C => "\xC5\x93", 0x9D => "\xEF\xBF\xBD", 0x9E => "\xC5\xBE", 0x9F => "\xC5\xB8");
+
+					if ($hex)
+					{
+						$codepoint = hexdec($codepoint);
+					}
+					else
+					{
+						$codepoint = intval($codepoint);
+					}
+
+					if (isset($windows_1252_specials[$codepoint]))
+					{
+						$replacement = $windows_1252_specials[$codepoint];
+					}
+					else
+					{
+						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
+					}
+
+					if (!in_array($this->consume(), array(';', false), true))
+					{
+						$this->unconsume();
+					}
+
+					$consumed_length = strlen($this->consumed);
+					$this->data = substr_replace($this->data, $replacement, $this->position - $consumed_length, $consumed_length);
+					$this->position += strlen($replacement) - $consumed_length;
+				}
+				break;
+
+			default:
+				static $entities = array(
+					'Aacute' => "\xC3\x81",
+					'aacute' => "\xC3\xA1",
+					'Aacute;' => "\xC3\x81",
+					'aacute;' => "\xC3\xA1",
+					'Acirc' => "\xC3\x82",
+					'acirc' => "\xC3\xA2",
+					'Acirc;' => "\xC3\x82",
+					'acirc;' => "\xC3\xA2",
+					'acute' => "\xC2\xB4",
+					'acute;' => "\xC2\xB4",
+					'AElig' => "\xC3\x86",
+					'aelig' => "\xC3\xA6",
+					'AElig;' => "\xC3\x86",
+					'aelig;' => "\xC3\xA6",
+					'Agrave' => "\xC3\x80",
+					'agrave' => "\xC3\xA0",
+					'Agrave;' => "\xC3\x80",
+					'agrave;' => "\xC3\xA0",
+					'alefsym;' => "\xE2\x84\xB5",
+					'Alpha;' => "\xCE\x91",
+					'alpha;' => "\xCE\xB1",
+					'AMP' => "\x26",
+					'amp' => "\x26",
+					'AMP;' => "\x26",
+					'amp;' => "\x26",
+					'and;' => "\xE2\x88\xA7",
+					'ang;' => "\xE2\x88\xA0",
+					'apos;' => "\x27",
+					'Aring' => "\xC3\x85",
+					'aring' => "\xC3\xA5",
+					'Aring;' => "\xC3\x85",
+					'aring;' => "\xC3\xA5",
+					'asymp;' => "\xE2\x89\x88",
+					'Atilde' => "\xC3\x83",
+					'atilde' => "\xC3\xA3",
+					'Atilde;' => "\xC3\x83",
+					'atilde;' => "\xC3\xA3",
+					'Auml' => "\xC3\x84",
+					'auml' => "\xC3\xA4",
+					'Auml;' => "\xC3\x84",
+					'auml;' => "\xC3\xA4",
+					'bdquo;' => "\xE2\x80\x9E",
+					'Beta;' => "\xCE\x92",
+					'beta;' => "\xCE\xB2",
+					'brvbar' => "\xC2\xA6",
+					'brvbar;' => "\xC2\xA6",
+					'bull;' => "\xE2\x80\xA2",
+					'cap;' => "\xE2\x88\xA9",
+					'Ccedil' => "\xC3\x87",
+					'ccedil' => "\xC3\xA7",
+					'Ccedil;' => "\xC3\x87",
+					'ccedil;' => "\xC3\xA7",
+					'cedil' => "\xC2\xB8",
+					'cedil;' => "\xC2\xB8",
+					'cent' => "\xC2\xA2",
+					'cent;' => "\xC2\xA2",
+					'Chi;' => "\xCE\xA7",
+					'chi;' => "\xCF\x87",
+					'circ;' => "\xCB\x86",
+					'clubs;' => "\xE2\x99\xA3",
+					'cong;' => "\xE2\x89\x85",
+					'COPY' => "\xC2\xA9",
+					'copy' => "\xC2\xA9",
+					'COPY;' => "\xC2\xA9",
+					'copy;' => "\xC2\xA9",
+					'crarr;' => "\xE2\x86\xB5",
+					'cup;' => "\xE2\x88\xAA",
+					'curren' => "\xC2\xA4",
+					'curren;' => "\xC2\xA4",
+					'Dagger;' => "\xE2\x80\xA1",
+					'dagger;' => "\xE2\x80\xA0",
+					'dArr;' => "\xE2\x87\x93",
+					'darr;' => "\xE2\x86\x93",
+					'deg' => "\xC2\xB0",
+					'deg;' => "\xC2\xB0",
+					'Delta;' => "\xCE\x94",
+					'delta;' => "\xCE\xB4",
+					'diams;' => "\xE2\x99\xA6",
+					'divide' => "\xC3\xB7",
+					'divide;' => "\xC3\xB7",
+					'Eacute' => "\xC3\x89",
+					'eacute' => "\xC3\xA9",
+					'Eacute;' => "\xC3\x89",
+					'eacute;' => "\xC3\xA9",
+					'Ecirc' => "\xC3\x8A",
+					'ecirc' => "\xC3\xAA",
+					'Ecirc;' => "\xC3\x8A",
+					'ecirc;' => "\xC3\xAA",
+					'Egrave' => "\xC3\x88",
+					'egrave' => "\xC3\xA8",
+					'Egrave;' => "\xC3\x88",
+					'egrave;' => "\xC3\xA8",
+					'empty;' => "\xE2\x88\x85",
+					'emsp;' => "\xE2\x80\x83",
+					'ensp;' => "\xE2\x80\x82",
+					'Epsilon;' => "\xCE\x95",
+					'epsilon;' => "\xCE\xB5",
+					'equiv;' => "\xE2\x89\xA1",
+					'Eta;' => "\xCE\x97",
+					'eta;' => "\xCE\xB7",
+					'ETH' => "\xC3\x90",
+					'eth' => "\xC3\xB0",
+					'ETH;' => "\xC3\x90",
+					'eth;' => "\xC3\xB0",
+					'Euml' => "\xC3\x8B",
+					'euml' => "\xC3\xAB",
+					'Euml;' => "\xC3\x8B",
+					'euml;' => "\xC3\xAB",
+					'euro;' => "\xE2\x82\xAC",
+					'exist;' => "\xE2\x88\x83",
+					'fnof;' => "\xC6\x92",
+					'forall;' => "\xE2\x88\x80",
+					'frac12' => "\xC2\xBD",
+					'frac12;' => "\xC2\xBD",
+					'frac14' => "\xC2\xBC",
+					'frac14;' => "\xC2\xBC",
+					'frac34' => "\xC2\xBE",
+					'frac34;' => "\xC2\xBE",
+					'frasl;' => "\xE2\x81\x84",
+					'Gamma;' => "\xCE\x93",
+					'gamma;' => "\xCE\xB3",
+					'ge;' => "\xE2\x89\xA5",
+					'GT' => "\x3E",
+					'gt' => "\x3E",
+					'GT;' => "\x3E",
+					'gt;' => "\x3E",
+					'hArr;' => "\xE2\x87\x94",
+					'harr;' => "\xE2\x86\x94",
+					'hearts;' => "\xE2\x99\xA5",
+					'hellip;' => "\xE2\x80\xA6",
+					'Iacute' => "\xC3\x8D",
+					'iacute' => "\xC3\xAD",
+					'Iacute;' => "\xC3\x8D",
+					'iacute;' => "\xC3\xAD",
+					'Icirc' => "\xC3\x8E",
+					'icirc' => "\xC3\xAE",
+					'Icirc;' => "\xC3\x8E",
+					'icirc;' => "\xC3\xAE",
+					'iexcl' => "\xC2\xA1",
+					'iexcl;' => "\xC2\xA1",
+					'Igrave' => "\xC3\x8C",
+					'igrave' => "\xC3\xAC",
+					'Igrave;' => "\xC3\x8C",
+					'igrave;' => "\xC3\xAC",
+					'image;' => "\xE2\x84\x91",
+					'infin;' => "\xE2\x88\x9E",
+					'int;' => "\xE2\x88\xAB",
+					'Iota;' => "\xCE\x99",
+					'iota;' => "\xCE\xB9",
+					'iquest' => "\xC2\xBF",
+					'iquest;' => "\xC2\xBF",
+					'isin;' => "\xE2\x88\x88",
+					'Iuml' => "\xC3\x8F",
+					'iuml' => "\xC3\xAF",
+					'Iuml;' => "\xC3\x8F",
+					'iuml;' => "\xC3\xAF",
+					'Kappa;' => "\xCE\x9A",
+					'kappa;' => "\xCE\xBA",
+					'Lambda;' => "\xCE\x9B",
+					'lambda;' => "\xCE\xBB",
+					'lang;' => "\xE3\x80\x88",
+					'laquo' => "\xC2\xAB",
+					'laquo;' => "\xC2\xAB",
+					'lArr;' => "\xE2\x87\x90",
+					'larr;' => "\xE2\x86\x90",
+					'lceil;' => "\xE2\x8C\x88",
+					'ldquo;' => "\xE2\x80\x9C",
+					'le;' => "\xE2\x89\xA4",
+					'lfloor;' => "\xE2\x8C\x8A",
+					'lowast;' => "\xE2\x88\x97",
+					'loz;' => "\xE2\x97\x8A",
+					'lrm;' => "\xE2\x80\x8E",
+					'lsaquo;' => "\xE2\x80\xB9",
+					'lsquo;' => "\xE2\x80\x98",
+					'LT' => "\x3C",
+					'lt' => "\x3C",
+					'LT;' => "\x3C",
+					'lt;' => "\x3C",
+					'macr' => "\xC2\xAF",
+					'macr;' => "\xC2\xAF",
+					'mdash;' => "\xE2\x80\x94",
+					'micro' => "\xC2\xB5",
+					'micro;' => "\xC2\xB5",
+					'middot' => "\xC2\xB7",
+					'middot;' => "\xC2\xB7",
+					'minus;' => "\xE2\x88\x92",
+					'Mu;' => "\xCE\x9C",
+					'mu;' => "\xCE\xBC",
+					'nabla;' => "\xE2\x88\x87",
+					'nbsp' => "\xC2\xA0",
+					'nbsp;' => "\xC2\xA0",
+					'ndash;' => "\xE2\x80\x93",
+					'ne;' => "\xE2\x89\xA0",
+					'ni;' => "\xE2\x88\x8B",
+					'not' => "\xC2\xAC",
+					'not;' => "\xC2\xAC",
+					'notin;' => "\xE2\x88\x89",
+					'nsub;' => "\xE2\x8A\x84",
+					'Ntilde' => "\xC3\x91",
+					'ntilde' => "\xC3\xB1",
+					'Ntilde;' => "\xC3\x91",
+					'ntilde;' => "\xC3\xB1",
+					'Nu;' => "\xCE\x9D",
+					'nu;' => "\xCE\xBD",
+					'Oacute' => "\xC3\x93",
+					'oacute' => "\xC3\xB3",
+					'Oacute;' => "\xC3\x93",
+					'oacute;' => "\xC3\xB3",
+					'Ocirc' => "\xC3\x94",
+					'ocirc' => "\xC3\xB4",
+					'Ocirc;' => "\xC3\x94",
+					'ocirc;' => "\xC3\xB4",
+					'OElig;' => "\xC5\x92",
+					'oelig;' => "\xC5\x93",
+					'Ograve' => "\xC3\x92",
+					'ograve' => "\xC3\xB2",
+					'Ograve;' => "\xC3\x92",
+					'ograve;' => "\xC3\xB2",
+					'oline;' => "\xE2\x80\xBE",
+					'Omega;' => "\xCE\xA9",
+					'omega;' => "\xCF\x89",
+					'Omicron;' => "\xCE\x9F",
+					'omicron;' => "\xCE\xBF",
+					'oplus;' => "\xE2\x8A\x95",
+					'or;' => "\xE2\x88\xA8",
+					'ordf' => "\xC2\xAA",
+					'ordf;' => "\xC2\xAA",
+					'ordm' => "\xC2\xBA",
+					'ordm;' => "\xC2\xBA",
+					'Oslash' => "\xC3\x98",
+					'oslash' => "\xC3\xB8",
+					'Oslash;' => "\xC3\x98",
+					'oslash;' => "\xC3\xB8",
+					'Otilde' => "\xC3\x95",
+					'otilde' => "\xC3\xB5",
+					'Otilde;' => "\xC3\x95",
+					'otilde;' => "\xC3\xB5",
+					'otimes;' => "\xE2\x8A\x97",
+					'Ouml' => "\xC3\x96",
+					'ouml' => "\xC3\xB6",
+					'Ouml;' => "\xC3\x96",
+					'ouml;' => "\xC3\xB6",
+					'para' => "\xC2\xB6",
+					'para;' => "\xC2\xB6",
+					'part;' => "\xE2\x88\x82",
+					'permil;' => "\xE2\x80\xB0",
+					'perp;' => "\xE2\x8A\xA5",
+					'Phi;' => "\xCE\xA6",
+					'phi;' => "\xCF\x86",
+					'Pi;' => "\xCE\xA0",
+					'pi;' => "\xCF\x80",
+					'piv;' => "\xCF\x96",
+					'plusmn' => "\xC2\xB1",
+					'plusmn;' => "\xC2\xB1",
+					'pound' => "\xC2\xA3",
+					'pound;' => "\xC2\xA3",
+					'Prime;' => "\xE2\x80\xB3",
+					'prime;' => "\xE2\x80\xB2",
+					'prod;' => "\xE2\x88\x8F",
+					'prop;' => "\xE2\x88\x9D",
+					'Psi;' => "\xCE\xA8",
+					'psi;' => "\xCF\x88",
+					'QUOT' => "\x22",
+					'quot' => "\x22",
+					'QUOT;' => "\x22",
+					'quot;' => "\x22",
+					'radic;' => "\xE2\x88\x9A",
+					'rang;' => "\xE3\x80\x89",
+					'raquo' => "\xC2\xBB",
+					'raquo;' => "\xC2\xBB",
+					'rArr;' => "\xE2\x87\x92",
+					'rarr;' => "\xE2\x86\x92",
+					'rceil;' => "\xE2\x8C\x89",
+					'rdquo;' => "\xE2\x80\x9D",
+					'real;' => "\xE2\x84\x9C",
+					'REG' => "\xC2\xAE",
+					'reg' => "\xC2\xAE",
+					'REG;' => "\xC2\xAE",
+					'reg;' => "\xC2\xAE",
+					'rfloor;' => "\xE2\x8C\x8B",
+					'Rho;' => "\xCE\xA1",
+					'rho;' => "\xCF\x81",
+					'rlm;' => "\xE2\x80\x8F",
+					'rsaquo;' => "\xE2\x80\xBA",
+					'rsquo;' => "\xE2\x80\x99",
+					'sbquo;' => "\xE2\x80\x9A",
+					'Scaron;' => "\xC5\xA0",
+					'scaron;' => "\xC5\xA1",
+					'sdot;' => "\xE2\x8B\x85",
+					'sect' => "\xC2\xA7",
+					'sect;' => "\xC2\xA7",
+					'shy' => "\xC2\xAD",
+					'shy;' => "\xC2\xAD",
+					'Sigma;' => "\xCE\xA3",
+					'sigma;' => "\xCF\x83",
+					'sigmaf;' => "\xCF\x82",
+					'sim;' => "\xE2\x88\xBC",
+					'spades;' => "\xE2\x99\xA0",
+					'sub;' => "\xE2\x8A\x82",
+					'sube;' => "\xE2\x8A\x86",
+					'sum;' => "\xE2\x88\x91",
+					'sup;' => "\xE2\x8A\x83",
+					'sup1' => "\xC2\xB9",
+					'sup1;' => "\xC2\xB9",
+					'sup2' => "\xC2\xB2",
+					'sup2;' => "\xC2\xB2",
+					'sup3' => "\xC2\xB3",
+					'sup3;' => "\xC2\xB3",
+					'supe;' => "\xE2\x8A\x87",
+					'szlig' => "\xC3\x9F",
+					'szlig;' => "\xC3\x9F",
+					'Tau;' => "\xCE\xA4",
+					'tau;' => "\xCF\x84",
+					'there4;' => "\xE2\x88\xB4",
+					'Theta;' => "\xCE\x98",
+					'theta;' => "\xCE\xB8",
+					'thetasym;' => "\xCF\x91",
+					'thinsp;' => "\xE2\x80\x89",
+					'THORN' => "\xC3\x9E",
+					'thorn' => "\xC3\xBE",
+					'THORN;' => "\xC3\x9E",
+					'thorn;' => "\xC3\xBE",
+					'tilde;' => "\xCB\x9C",
+					'times' => "\xC3\x97",
+					'times;' => "\xC3\x97",
+					'TRADE;' => "\xE2\x84\xA2",
+					'trade;' => "\xE2\x84\xA2",
+					'Uacute' => "\xC3\x9A",
+					'uacute' => "\xC3\xBA",
+					'Uacute;' => "\xC3\x9A",
+					'uacute;' => "\xC3\xBA",
+					'uArr;' => "\xE2\x87\x91",
+					'uarr;' => "\xE2\x86\x91",
+					'Ucirc' => "\xC3\x9B",
+					'ucirc' => "\xC3\xBB",
+					'Ucirc;' => "\xC3\x9B",
+					'ucirc;' => "\xC3\xBB",
+					'Ugrave' => "\xC3\x99",
+					'ugrave' => "\xC3\xB9",
+					'Ugrave;' => "\xC3\x99",
+					'ugrave;' => "\xC3\xB9",
+					'uml' => "\xC2\xA8",
+					'uml;' => "\xC2\xA8",
+					'upsih;' => "\xCF\x92",
+					'Upsilon;' => "\xCE\xA5",
+					'upsilon;' => "\xCF\x85",
+					'Uuml' => "\xC3\x9C",
+					'uuml' => "\xC3\xBC",
+					'Uuml;' => "\xC3\x9C",
+					'uuml;' => "\xC3\xBC",
+					'weierp;' => "\xE2\x84\x98",
+					'Xi;' => "\xCE\x9E",
+					'xi;' => "\xCE\xBE",
+					'Yacute' => "\xC3\x9D",
+					'yacute' => "\xC3\xBD",
+					'Yacute;' => "\xC3\x9D",
+					'yacute;' => "\xC3\xBD",
+					'yen' => "\xC2\xA5",
+					'yen;' => "\xC2\xA5",
+					'yuml' => "\xC3\xBF",
+					'Yuml;' => "\xC5\xB8",
+					'yuml;' => "\xC3\xBF",
+					'Zeta;' => "\xCE\x96",
+					'zeta;' => "\xCE\xB6",
+					'zwj;' => "\xE2\x80\x8D",
+					'zwnj;' => "\xE2\x80\x8C"
+				);
+
+				for ($i = 0, $match = null; $i < 9 && $this->consume() !== false; $i++)
+				{
+					$consumed = substr($this->consumed, 1);
+					if (isset($entities[$consumed]))
+					{
+						$match = $consumed;
+					}
+				}
+
+				if ($match !== null)
+				{
+ 					$this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
+					$this->position += strlen($entities[$match]) - strlen($consumed) - 1;
+				}
+				break;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php
new file mode 100644
index 00000000..55674379
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php
@@ -0,0 +1,1380 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles everything related to enclosures (including Media RSS and iTunes RSS)
+ *
+ * Used by {@see SimplePie_Item::get_enclosure()} and {@see SimplePie_Item::get_enclosures()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_enclosure_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Enclosure
+{
+	/**
+	 * @var string
+	 * @see get_bitrate()
+	 */
+	var $bitrate;
+
+	/**
+	 * @var array
+	 * @see get_captions()
+	 */
+	var $captions;
+
+	/**
+	 * @var array
+	 * @see get_categories()
+	 */
+	var $categories;
+
+	/**
+	 * @var int
+	 * @see get_channels()
+	 */
+	var $channels;
+
+	/**
+	 * @var SimplePie_Copyright
+	 * @see get_copyright()
+	 */
+	var $copyright;
+
+	/**
+	 * @var array
+	 * @see get_credits()
+	 */
+	var $credits;
+
+	/**
+	 * @var string
+	 * @see get_description()
+	 */
+	var $description;
+
+	/**
+	 * @var int
+	 * @see get_duration()
+	 */
+	var $duration;
+
+	/**
+	 * @var string
+	 * @see get_expression()
+	 */
+	var $expression;
+
+	/**
+	 * @var string
+	 * @see get_framerate()
+	 */
+	var $framerate;
+
+	/**
+	 * @var string
+	 * @see get_handler()
+	 */
+	var $handler;
+
+	/**
+	 * @var array
+	 * @see get_hashes()
+	 */
+	var $hashes;
+
+	/**
+	 * @var string
+	 * @see get_height()
+	 */
+	var $height;
+
+	/**
+	 * @deprecated
+	 * @var null
+	 */
+	var $javascript;
+
+	/**
+	 * @var array
+	 * @see get_keywords()
+	 */
+	var $keywords;
+
+	/**
+	 * @var string
+	 * @see get_language()
+	 */
+	var $lang;
+
+	/**
+	 * @var string
+	 * @see get_length()
+	 */
+	var $length;
+
+	/**
+	 * @var string
+	 * @see get_link()
+	 */
+	var $link;
+
+	/**
+	 * @var string
+	 * @see get_medium()
+	 */
+	var $medium;
+
+	/**
+	 * @var string
+	 * @see get_player()
+	 */
+	var $player;
+
+	/**
+	 * @var array
+	 * @see get_ratings()
+	 */
+	var $ratings;
+
+	/**
+	 * @var array
+	 * @see get_restrictions()
+	 */
+	var $restrictions;
+
+	/**
+	 * @var string
+	 * @see get_sampling_rate()
+	 */
+	var $samplingrate;
+
+	/**
+	 * @var array
+	 * @see get_thumbnails()
+	 */
+	var $thumbnails;
+
+	/**
+	 * @var string
+	 * @see get_title()
+	 */
+	var $title;
+
+	/**
+	 * @var string
+	 * @see get_type()
+	 */
+	var $type;
+
+	/**
+	 * @var string
+	 * @see get_width()
+	 */
+	var $width;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 *
+	 * @uses idna_convert If available, this will convert an IDN
+	 */
+	public function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
+	{
+		$this->bitrate = $bitrate;
+		$this->captions = $captions;
+		$this->categories = $categories;
+		$this->channels = $channels;
+		$this->copyright = $copyright;
+		$this->credits = $credits;
+		$this->description = $description;
+		$this->duration = $duration;
+		$this->expression = $expression;
+		$this->framerate = $framerate;
+		$this->hashes = $hashes;
+		$this->height = $height;
+		$this->keywords = $keywords;
+		$this->lang = $lang;
+		$this->length = $length;
+		$this->link = $link;
+		$this->medium = $medium;
+		$this->player = $player;
+		$this->ratings = $ratings;
+		$this->restrictions = $restrictions;
+		$this->samplingrate = $samplingrate;
+		$this->thumbnails = $thumbnails;
+		$this->title = $title;
+		$this->type = $type;
+		$this->width = $width;
+
+		if (class_exists('idna_convert'))
+		{
+			$idn = new idna_convert();
+			$parsed = SimplePie_Misc::parse_url($link);
+			$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+		}
+		$this->handler = $this->get_handler(); // Needs to load last
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the bitrate
+	 *
+	 * @return string|null
+	 */
+	public function get_bitrate()
+	{
+		if ($this->bitrate !== null)
+		{
+			return $this->bitrate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single caption
+	 *
+	 * @param int $key
+	 * @return SimplePie_Caption|null
+	 */
+	public function get_caption($key = 0)
+	{
+		$captions = $this->get_captions();
+		if (isset($captions[$key]))
+		{
+			return $captions[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all captions
+	 *
+	 * @return array|null Array of {@see SimplePie_Caption} objects
+	 */
+	public function get_captions()
+	{
+		if ($this->captions !== null)
+		{
+			return $this->captions;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single category
+	 *
+	 * @param int $key
+	 * @return SimplePie_Category|null
+	 */
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all categories
+	 *
+	 * @return array|null Array of {@see SimplePie_Category} objects
+	 */
+	public function get_categories()
+	{
+		if ($this->categories !== null)
+		{
+			return $this->categories;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the number of audio channels
+	 *
+	 * @return int|null
+	 */
+	public function get_channels()
+	{
+		if ($this->channels !== null)
+		{
+			return $this->channels;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the copyright information
+	 *
+	 * @return SimplePie_Copyright|null
+	 */
+	public function get_copyright()
+	{
+		if ($this->copyright !== null)
+		{
+			return $this->copyright;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single credit
+	 *
+	 * @param int $key
+	 * @return SimplePie_Credit|null
+	 */
+	public function get_credit($key = 0)
+	{
+		$credits = $this->get_credits();
+		if (isset($credits[$key]))
+		{
+			return $credits[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all credits
+	 *
+	 * @return array|null Array of {@see SimplePie_Credit} objects
+	 */
+	public function get_credits()
+	{
+		if ($this->credits !== null)
+		{
+			return $this->credits;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the description of the enclosure
+	 *
+	 * @return string|null
+	 */
+	public function get_description()
+	{
+		if ($this->description !== null)
+		{
+			return $this->description;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the duration of the enclosure
+	 *
+	 * @param string $convert Convert seconds into hh:mm:ss
+	 * @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found)
+	 */
+	public function get_duration($convert = false)
+	{
+		if ($this->duration !== null)
+		{
+			if ($convert)
+			{
+				$time = SimplePie_Misc::time_hms($this->duration);
+				return $time;
+			}
+			else
+			{
+				return $this->duration;
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the expression
+	 *
+	 * @return string Probably one of 'sample', 'full', 'nonstop', 'clip'. Defaults to 'full'
+	 */
+	public function get_expression()
+	{
+		if ($this->expression !== null)
+		{
+			return $this->expression;
+		}
+		else
+		{
+			return 'full';
+		}
+	}
+
+	/**
+	 * Get the file extension
+	 *
+	 * @return string|null
+	 */
+	public function get_extension()
+	{
+		if ($this->link !== null)
+		{
+			$url = SimplePie_Misc::parse_url($this->link);
+			if ($url['path'] !== '')
+			{
+				return pathinfo($url['path'], PATHINFO_EXTENSION);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the framerate (in frames-per-second)
+	 *
+	 * @return string|null
+	 */
+	public function get_framerate()
+	{
+		if ($this->framerate !== null)
+		{
+			return $this->framerate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the preferred handler
+	 *
+	 * @return string|null One of 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3'
+	 */
+	public function get_handler()
+	{
+		return $this->get_real_type(true);
+	}
+
+	/**
+	 * Get a single hash
+	 *
+	 * @link http://www.rssboard.org/media-rss#media-hash
+	 * @param int $key
+	 * @return string|null Hash as per `media:hash`, prefixed with "$algo:"
+	 */
+	public function get_hash($key = 0)
+	{
+		$hashes = $this->get_hashes();
+		if (isset($hashes[$key]))
+		{
+			return $hashes[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all credits
+	 *
+	 * @return array|null Array of strings, see {@see get_hash()}
+	 */
+	public function get_hashes()
+	{
+		if ($this->hashes !== null)
+		{
+			return $this->hashes;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the height
+	 *
+	 * @return string|null
+	 */
+	public function get_height()
+	{
+		if ($this->height !== null)
+		{
+			return $this->height;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the language
+	 *
+	 * @link http://tools.ietf.org/html/rfc3066
+	 * @return string|null Language code as per RFC 3066
+	 */
+	public function get_language()
+	{
+		if ($this->lang !== null)
+		{
+			return $this->lang;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single keyword
+	 *
+	 * @param int $key
+	 * @return string|null
+	 */
+	public function get_keyword($key = 0)
+	{
+		$keywords = $this->get_keywords();
+		if (isset($keywords[$key]))
+		{
+			return $keywords[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all keywords
+	 *
+	 * @return array|null Array of strings
+	 */
+	public function get_keywords()
+	{
+		if ($this->keywords !== null)
+		{
+			return $this->keywords;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get length
+	 *
+	 * @return float Length in bytes
+	 */
+	public function get_length()
+	{
+		if ($this->length !== null)
+		{
+			return $this->length;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the URL
+	 *
+	 * @return string|null
+	 */
+	public function get_link()
+	{
+		if ($this->link !== null)
+		{
+			return urldecode($this->link);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the medium
+	 *
+	 * @link http://www.rssboard.org/media-rss#media-content
+	 * @return string|null Should be one of 'image', 'audio', 'video', 'document', 'executable'
+	 */
+	public function get_medium()
+	{
+		if ($this->medium !== null)
+		{
+			return $this->medium;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the player URL
+	 *
+	 * Typically the same as {@see get_permalink()}
+	 * @return string|null Player URL
+	 */
+	public function get_player()
+	{
+		if ($this->player !== null)
+		{
+			return $this->player;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single rating
+	 *
+	 * @param int $key
+	 * @return SimplePie_Rating|null
+	 */
+	public function get_rating($key = 0)
+	{
+		$ratings = $this->get_ratings();
+		if (isset($ratings[$key]))
+		{
+			return $ratings[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all ratings
+	 *
+	 * @return array|null Array of {@see SimplePie_Rating} objects
+	 */
+	public function get_ratings()
+	{
+		if ($this->ratings !== null)
+		{
+			return $this->ratings;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single restriction
+	 *
+	 * @param int $key
+	 * @return SimplePie_Restriction|null
+	 */
+	public function get_restriction($key = 0)
+	{
+		$restrictions = $this->get_restrictions();
+		if (isset($restrictions[$key]))
+		{
+			return $restrictions[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all restrictions
+	 *
+	 * @return array|null Array of {@see SimplePie_Restriction} objects
+	 */
+	public function get_restrictions()
+	{
+		if ($this->restrictions !== null)
+		{
+			return $this->restrictions;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the sampling rate (in kHz)
+	 *
+	 * @return string|null
+	 */
+	public function get_sampling_rate()
+	{
+		if ($this->samplingrate !== null)
+		{
+			return $this->samplingrate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the file size (in MiB)
+	 *
+	 * @return float|null File size in mebibytes (1048 bytes)
+	 */
+	public function get_size()
+	{
+		$length = $this->get_length();
+		if ($length !== null)
+		{
+			return round($length/1048576, 2);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single thumbnail
+	 *
+	 * @param int $key
+	 * @return string|null Thumbnail URL
+	 */
+	public function get_thumbnail($key = 0)
+	{
+		$thumbnails = $this->get_thumbnails();
+		if (isset($thumbnails[$key]))
+		{
+			return $thumbnails[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all thumbnails
+	 *
+	 * @return array|null Array of thumbnail URLs
+	 */
+	public function get_thumbnails()
+	{
+		if ($this->thumbnails !== null)
+		{
+			return $this->thumbnails;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the title
+	 *
+	 * @return string|null
+	 */
+	public function get_title()
+	{
+		if ($this->title !== null)
+		{
+			return $this->title;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get mimetype of the enclosure
+	 *
+	 * @see get_real_type()
+	 * @return string|null MIME type
+	 */
+	public function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the width
+	 *
+	 * @return string|null
+	 */
+	public function get_width()
+	{
+		if ($this->width !== null)
+		{
+			return $this->width;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Embed the enclosure using `<embed>`
+	 *
+	 * @deprecated Use the second parameter to {@see embed} instead
+	 *
+	 * @param array|string $options See first paramter to {@see embed}
+	 * @return string HTML string to output
+	 */
+	public function native_embed($options='')
+	{
+		return $this->embed($options, true);
+	}
+
+	/**
+	 * Embed the enclosure using Javascript
+	 *
+	 * `$options` is an array or comma-separated key:value string, with the
+	 * following properties:
+	 *
+	 * - `alt` (string): Alternate content for when an end-user does not have
+	 *    the appropriate handler installed or when a file type is
+	 *    unsupported. Can be any text or HTML. Defaults to blank.
+	 * - `altclass` (string): If a file type is unsupported, the end-user will
+	 *    see the alt text (above) linked directly to the content. That link
+	 *    will have this value as its class name. Defaults to blank.
+	 * - `audio` (string): This is an image that should be used as a
+	 *    placeholder for audio files before they're loaded (QuickTime-only).
+	 *    Can be any relative or absolute URL. Defaults to blank.
+	 * - `bgcolor` (string): The background color for the media, if not
+	 *    already transparent. Defaults to `#ffffff`.
+	 * - `height` (integer): The height of the embedded media. Accepts any
+	 *    numeric pixel value (such as `360`) or `auto`. Defaults to `auto`,
+	 *    and it is recommended that you use this default.
+	 * - `loop` (boolean): Do you want the media to loop when its done?
+	 *    Defaults to `false`.
+	 * - `mediaplayer` (string): The location of the included
+	 *    `mediaplayer.swf` file. This allows for the playback of Flash Video
+	 *    (`.flv`) files, and is the default handler for non-Odeo MP3's.
+	 *    Defaults to blank.
+	 * - `video` (string): This is an image that should be used as a
+	 *    placeholder for video files before they're loaded (QuickTime-only).
+	 *    Can be any relative or absolute URL. Defaults to blank.
+	 * - `width` (integer): The width of the embedded media. Accepts any
+	 *    numeric pixel value (such as `480`) or `auto`. Defaults to `auto`,
+	 *    and it is recommended that you use this default.
+	 * - `widescreen` (boolean): Is the enclosure widescreen or standard?
+	 *    This applies only to video enclosures, and will automatically resize
+	 *    the content appropriately.  Defaults to `false`, implying 4:3 mode.
+	 *
+	 * Note: Non-widescreen (4:3) mode with `width` and `height` set to `auto`
+	 * will default to 480x360 video resolution.  Widescreen (16:9) mode with
+	 * `width` and `height` set to `auto` will default to 480x270 video resolution.
+	 *
+	 * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'.
+	 * @param array|string $options Comma-separated key:value list, or array
+	 * @param bool $native Use `<embed>`
+	 * @return string HTML string to output
+	 */
+	public function embed($options = '', $native = false)
+	{
+		// Set up defaults
+		$audio = '';
+		$video = '';
+		$alt = '';
+		$altclass = '';
+		$loop = 'false';
+		$width = 'auto';
+		$height = 'auto';
+		$bgcolor = '#ffffff';
+		$mediaplayer = '';
+		$widescreen = false;
+		$handler = $this->get_handler();
+		$type = $this->get_real_type();
+
+		// Process options and reassign values as necessary
+		if (is_array($options))
+		{
+			extract($options);
+		}
+		else
+		{
+			$options = explode(',', $options);
+			foreach($options as $option)
+			{
+				$opt = explode(':', $option, 2);
+				if (isset($opt[0], $opt[1]))
+				{
+					$opt[0] = trim($opt[0]);
+					$opt[1] = trim($opt[1]);
+					switch ($opt[0])
+					{
+						case 'audio':
+							$audio = $opt[1];
+							break;
+
+						case 'video':
+							$video = $opt[1];
+							break;
+
+						case 'alt':
+							$alt = $opt[1];
+							break;
+
+						case 'altclass':
+							$altclass = $opt[1];
+							break;
+
+						case 'loop':
+							$loop = $opt[1];
+							break;
+
+						case 'width':
+							$width = $opt[1];
+							break;
+
+						case 'height':
+							$height = $opt[1];
+							break;
+
+						case 'bgcolor':
+							$bgcolor = $opt[1];
+							break;
+
+						case 'mediaplayer':
+							$mediaplayer = $opt[1];
+							break;
+
+						case 'widescreen':
+							$widescreen = $opt[1];
+							break;
+					}
+				}
+			}
+		}
+
+		$mime = explode('/', $type, 2);
+		$mime = $mime[0];
+
+		// Process values for 'auto'
+		if ($width === 'auto')
+		{
+			if ($mime === 'video')
+			{
+				if ($height === 'auto')
+				{
+					$width = 480;
+				}
+				elseif ($widescreen)
+				{
+					$width = round((intval($height)/9)*16);
+				}
+				else
+				{
+					$width = round((intval($height)/3)*4);
+				}
+			}
+			else
+			{
+				$width = '100%';
+			}
+		}
+
+		if ($height === 'auto')
+		{
+			if ($mime === 'audio')
+			{
+				$height = 0;
+			}
+			elseif ($mime === 'video')
+			{
+				if ($width === 'auto')
+				{
+					if ($widescreen)
+					{
+						$height = 270;
+					}
+					else
+					{
+						$height = 360;
+					}
+				}
+				elseif ($widescreen)
+				{
+					$height = round((intval($width)/16)*9);
+				}
+				else
+				{
+					$height = round((intval($width)/4)*3);
+				}
+			}
+			else
+			{
+				$height = 376;
+			}
+		}
+		elseif ($mime === 'audio')
+		{
+			$height = 0;
+		}
+
+		// Set proper placeholder value
+		if ($mime === 'audio')
+		{
+			$placeholder = $audio;
+		}
+		elseif ($mime === 'video')
+		{
+			$placeholder = $video;
+		}
+
+		$embed = '';
+
+		// Flash
+		if ($handler === 'flash')
+		{
+			if ($native)
+			{
+				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+			}
+		}
+
+		// Flash Media Player file types.
+		// Preferred handler for MP3 file types.
+		elseif ($handler === 'fmedia' || ($handler === 'mp3' && $mediaplayer !== ''))
+		{
+			$height += 20;
+			if ($native)
+			{
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+			}
+		}
+
+		// QuickTime 7 file types.  Need to test with QuickTime 6.
+		// Only handle MP3's if the Flash Media Player is not present.
+		elseif ($handler === 'quicktime' || ($handler === 'mp3' && $mediaplayer === ''))
+		{
+			$height += 16;
+			if ($native)
+			{
+				if ($placeholder !== '')
+				{
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+				}
+				else
+				{
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+				}
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+			}
+		}
+
+		// Windows Media
+		elseif ($handler === 'wmedia')
+		{
+			$height += 45;
+			if ($native)
+			{
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+			}
+		}
+
+		// Everything else
+		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+
+		return $embed;
+	}
+
+	/**
+	 * Get the real media type
+	 *
+	 * Often, feeds lie to us, necessitating a bit of deeper inspection. This
+	 * converts types to their canonical representations based on the file
+	 * extension
+	 *
+	 * @see get_type()
+	 * @param bool $find_handler Internal use only, use {@see get_handler()} instead
+	 * @return string MIME type
+	 */
+	public function get_real_type($find_handler = false)
+	{
+		// Mime-types by handler.
+		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
+		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
+		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
+		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
+
+		if ($this->get_type() !== null)
+		{
+			$type = strtolower($this->type);
+		}
+		else
+		{
+			$type = null;
+		}
+
+		// If we encounter an unsupported mime-type, check the file extension and guess intelligently.
+		if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
+		{
+			switch (strtolower($this->get_extension()))
+			{
+				// Audio mime-types
+				case 'aac':
+				case 'adts':
+					$type = 'audio/acc';
+					break;
+
+				case 'aif':
+				case 'aifc':
+				case 'aiff':
+				case 'cdda':
+					$type = 'audio/aiff';
+					break;
+
+				case 'bwf':
+					$type = 'audio/wav';
+					break;
+
+				case 'kar':
+				case 'mid':
+				case 'midi':
+				case 'smf':
+					$type = 'audio/midi';
+					break;
+
+				case 'm4a':
+					$type = 'audio/x-m4a';
+					break;
+
+				case 'mp3':
+				case 'swa':
+					$type = 'audio/mp3';
+					break;
+
+				case 'wav':
+					$type = 'audio/wav';
+					break;
+
+				case 'wax':
+					$type = 'audio/x-ms-wax';
+					break;
+
+				case 'wma':
+					$type = 'audio/x-ms-wma';
+					break;
+
+				// Video mime-types
+				case '3gp':
+				case '3gpp':
+					$type = 'video/3gpp';
+					break;
+
+				case '3g2':
+				case '3gp2':
+					$type = 'video/3gpp2';
+					break;
+
+				case 'asf':
+					$type = 'video/x-ms-asf';
+					break;
+
+				case 'flv':
+					$type = 'video/x-flv';
+					break;
+
+				case 'm1a':
+				case 'm1s':
+				case 'm1v':
+				case 'm15':
+				case 'm75':
+				case 'mp2':
+				case 'mpa':
+				case 'mpeg':
+				case 'mpg':
+				case 'mpm':
+				case 'mpv':
+					$type = 'video/mpeg';
+					break;
+
+				case 'm4v':
+					$type = 'video/x-m4v';
+					break;
+
+				case 'mov':
+				case 'qt':
+					$type = 'video/quicktime';
+					break;
+
+				case 'mp4':
+				case 'mpg4':
+					$type = 'video/mp4';
+					break;
+
+				case 'sdv':
+					$type = 'video/sd-video';
+					break;
+
+				case 'wm':
+					$type = 'video/x-ms-wm';
+					break;
+
+				case 'wmv':
+					$type = 'video/x-ms-wmv';
+					break;
+
+				case 'wvx':
+					$type = 'video/x-ms-wvx';
+					break;
+
+				// Flash mime-types
+				case 'spl':
+					$type = 'application/futuresplash';
+					break;
+
+				case 'swf':
+					$type = 'application/x-shockwave-flash';
+					break;
+			}
+		}
+
+		if ($find_handler)
+		{
+			if (in_array($type, $types_flash))
+			{
+				return 'flash';
+			}
+			elseif (in_array($type, $types_fmedia))
+			{
+				return 'fmedia';
+			}
+			elseif (in_array($type, $types_quicktime))
+			{
+				return 'quicktime';
+			}
+			elseif (in_array($type, $types_wmedia))
+			{
+				return 'wmedia';
+			}
+			elseif (in_array($type, $types_mp3))
+			{
+				return 'mp3';
+			}
+			else
+			{
+				return null;
+			}
+		}
+		else
+		{
+			return $type;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Exception.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Exception.php
new file mode 100644
index 00000000..73e104d6
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Exception.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.4-dev
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * General SimplePie exception class
+ *
+ * @package SimplePie
+ */
+class SimplePie_Exception extends Exception
+{
+}
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/File.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/File.php
new file mode 100644
index 00000000..b7d1a2ac
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/File.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used for fetching remote files and reading local files
+ *
+ * Supports HTTP 1.0 via cURL or fsockopen, with spotty HTTP 1.1 support
+ *
+ * This class can be overloaded with {@see SimplePie::set_file_class()}
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @todo Move to properly supporting RFC2616 (HTTP/1.1)
+ */
+class SimplePie_File
+{
+	var $url;
+	var $useragent;
+	var $success = true;
+	var $headers = array();
+	var $body;
+	var $status_code;
+	var $redirects = 0;
+	var $error;
+	var $method = SIMPLEPIE_FILE_SOURCE_NONE;
+
+	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false)
+	{
+		if (class_exists('idna_convert'))
+		{
+			$idn = new idna_convert();
+			$parsed = SimplePie_Misc::parse_url($url);
+			$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+		}
+		$this->url = $url;
+		$this->useragent = $useragent;
+		if (preg_match('/^http(s)?:\/\//i', $url))
+		{
+			if ($useragent === null)
+			{
+				$useragent = ini_get('user_agent');
+				$this->useragent = $useragent;
+			}
+			if (!is_array($headers))
+			{
+				$headers = array();
+			}
+			if (!$force_fsockopen && function_exists('curl_exec'))
+			{
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
+				$fp = curl_init();
+				$headers2 = array();
+				foreach ($headers as $key => $value)
+				{
+					$headers2[] = "$key: $value";
+				}
+				if (version_compare(SimplePie_Misc::get_curl_version(), '7.10.5', '>='))
+				{
+					curl_setopt($fp, CURLOPT_ENCODING, '');
+				}
+				curl_setopt($fp, CURLOPT_URL, $url);
+				curl_setopt($fp, CURLOPT_HEADER, 1);
+				curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
+				curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
+				curl_setopt($fp, CURLOPT_REFERER, $url);
+				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
+				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
+				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
+				{
+					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
+					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
+				}
+
+				$this->headers = curl_exec($fp);
+				if (curl_errno($fp) === 23 || curl_errno($fp) === 61)
+				{
+					curl_setopt($fp, CURLOPT_ENCODING, 'none');
+					$this->headers = curl_exec($fp);
+				}
+				if (curl_errno($fp))
+				{
+					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+					$this->success = false;
+				}
+				else
+				{
+					$info = curl_getinfo($fp);
+					curl_close($fp);
+					$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
+					$this->headers = array_pop($this->headers);
+					$parser = new SimplePie_HTTP_Parser($this->headers);
+					if ($parser->parse())
+					{
+						$this->headers = $parser->headers;
+						$this->body = $parser->body;
+						$this->status_code = $parser->status_code;
+						if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+						{
+							$this->redirects++;
+							$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
+							return $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+						}
+					}
+				}
+			}
+			else
+			{
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
+				$url_parts = parse_url($url);
+				$socket_host = $url_parts['host'];
+				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
+				{
+					$socket_host = "ssl://$url_parts[host]";
+					$url_parts['port'] = 443;
+				}
+				if (!isset($url_parts['port']))
+				{
+					$url_parts['port'] = 80;
+				}
+				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
+				if (!$fp)
+				{
+					$this->error = 'fsockopen error: ' . $errstr;
+					$this->success = false;
+				}
+				else
+				{
+					stream_set_timeout($fp, $timeout);
+					if (isset($url_parts['path']))
+					{
+						if (isset($url_parts['query']))
+						{
+							$get = "$url_parts[path]?$url_parts[query]";
+						}
+						else
+						{
+							$get = $url_parts['path'];
+						}
+					}
+					else
+					{
+						$get = '/';
+					}
+					$out = "GET $get HTTP/1.1\r\n";
+					$out .= "Host: $url_parts[host]\r\n";
+					$out .= "User-Agent: $useragent\r\n";
+					if (extension_loaded('zlib'))
+					{
+						$out .= "Accept-Encoding: x-gzip,gzip,deflate\r\n";
+					}
+
+					if (isset($url_parts['user']) && isset($url_parts['pass']))
+					{
+						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+					}
+					foreach ($headers as $key => $value)
+					{
+						$out .= "$key: $value\r\n";
+					}
+					$out .= "Connection: Close\r\n\r\n";
+					fwrite($fp, $out);
+
+					$info = stream_get_meta_data($fp);
+
+					$this->headers = '';
+					while (!$info['eof'] && !$info['timed_out'])
+					{
+						$this->headers .= fread($fp, 1160);
+						$info = stream_get_meta_data($fp);
+					}
+					if (!$info['timed_out'])
+					{
+						$parser = new SimplePie_HTTP_Parser($this->headers);
+						if ($parser->parse())
+						{
+							$this->headers = $parser->headers;
+							$this->body = $parser->body;
+							$this->status_code = $parser->status_code;
+							if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+							{
+								$this->redirects++;
+								$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
+								return $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+							}
+							if (isset($this->headers['content-encoding']))
+							{
+								// Hey, we act dumb elsewhere, so let's do that here too
+								switch (strtolower(trim($this->headers['content-encoding'], "\x09\x0A\x0D\x20")))
+								{
+									case 'gzip':
+									case 'x-gzip':
+										$decoder = new SimplePie_gzdecode($this->body);
+										if (!$decoder->parse())
+										{
+											$this->error = 'Unable to decode HTTP "gzip" stream';
+											$this->success = false;
+										}
+										else
+										{
+											$this->body = $decoder->data;
+										}
+										break;
+
+									case 'deflate':
+										if (($decompressed = gzinflate($this->body)) !== false)
+										{
+											$this->body = $decompressed;
+										}
+										else if (($decompressed = gzuncompress($this->body)) !== false)
+										{
+											$this->body = $decompressed;
+										}
+										else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
+										{
+											$this->body = $decompressed;
+										}
+										else
+										{
+											$this->error = 'Unable to decode HTTP "deflate" stream';
+											$this->success = false;
+										}
+										break;
+
+									default:
+										$this->error = 'Unknown content coding';
+										$this->success = false;
+								}
+							}
+						}
+					}
+					else
+					{
+						$this->error = 'fsocket timed out';
+						$this->success = false;
+					}
+					fclose($fp);
+				}
+			}
+		}
+		else
+		{
+			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
+			if (!$this->body = file_get_contents($url))
+			{
+				$this->error = 'file_get_contents could not read the file';
+				$this->success = false;
+			}
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php
new file mode 100644
index 00000000..bff2222b
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php
@@ -0,0 +1,500 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * HTTP Response Parser
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ */
+class SimplePie_HTTP_Parser
+{
+	/**
+	 * HTTP Version
+	 *
+	 * @var float
+	 */
+	public $http_version = 0.0;
+
+	/**
+	 * Status code
+	 *
+	 * @var int
+	 */
+	public $status_code = 0;
+
+	/**
+	 * Reason phrase
+	 *
+	 * @var string
+	 */
+	public $reason = '';
+
+	/**
+	 * Key/value pairs of the headers
+	 *
+	 * @var array
+	 */
+	public $headers = array();
+
+	/**
+	 * Body of the response
+	 *
+	 * @var string
+	 */
+	public $body = '';
+
+	/**
+	 * Current state of the state machine
+	 *
+	 * @var string
+	 */
+	protected $state = 'http_version';
+
+	/**
+	 * Input data
+	 *
+	 * @var string
+	 */
+	protected $data = '';
+
+	/**
+	 * Input data length (to avoid calling strlen() everytime this is needed)
+	 *
+	 * @var int
+	 */
+	protected $data_length = 0;
+
+	/**
+	 * Current position of the pointer
+	 *
+	 * @var int
+	 */
+	protected $position = 0;
+
+	/**
+	 * Name of the hedaer currently being parsed
+	 *
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * Value of the hedaer currently being parsed
+	 *
+	 * @var string
+	 */
+	protected $value = '';
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @param string $data Input data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+		$this->data_length = strlen($this->data);
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @return bool true on success, false on failure
+	 */
+	public function parse()
+	{
+		while ($this->state && $this->state !== 'emit' && $this->has_data())
+		{
+			$state = $this->state;
+			$this->$state();
+		}
+		$this->data = '';
+		if ($this->state === 'emit' || $this->state === 'body')
+		{
+			return true;
+		}
+		else
+		{
+			$this->http_version = '';
+			$this->status_code = '';
+			$this->reason = '';
+			$this->headers = array();
+			$this->body = '';
+			return false;
+		}
+	}
+
+	/**
+	 * Check whether there is data beyond the pointer
+	 *
+	 * @return bool true if there is further data, false if not
+	 */
+	protected function has_data()
+	{
+		return (bool) ($this->position < $this->data_length);
+	}
+
+	/**
+	 * See if the next character is LWS
+	 *
+	 * @return bool true if the next character is LWS, false if not
+	 */
+	protected function is_linear_whitespace()
+	{
+		return (bool) ($this->data[$this->position] === "\x09"
+			|| $this->data[$this->position] === "\x20"
+			|| ($this->data[$this->position] === "\x0A"
+				&& isset($this->data[$this->position + 1])
+				&& ($this->data[$this->position + 1] === "\x09" || $this->data[$this->position + 1] === "\x20")));
+	}
+
+	/**
+	 * Parse the HTTP version
+	 */
+	protected function http_version()
+	{
+		if (strpos($this->data, "\x0A") !== false && strtoupper(substr($this->data, 0, 5)) === 'HTTP/')
+		{
+			$len = strspn($this->data, '0123456789.', 5);
+			$this->http_version = substr($this->data, 5, $len);
+			$this->position += 5 + $len;
+			if (substr_count($this->http_version, '.') <= 1)
+			{
+				$this->http_version = (float) $this->http_version;
+				$this->position += strspn($this->data, "\x09\x20", $this->position);
+				$this->state = 'status';
+			}
+			else
+			{
+				$this->state = false;
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse the status code
+	 */
+	protected function status()
+	{
+		if ($len = strspn($this->data, '0123456789', $this->position))
+		{
+			$this->status_code = (int) substr($this->data, $this->position, $len);
+			$this->position += $len;
+			$this->state = 'reason';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse the reason phrase
+	 */
+	protected function reason()
+	{
+		$len = strcspn($this->data, "\x0A", $this->position);
+		$this->reason = trim(substr($this->data, $this->position, $len), "\x09\x0D\x20");
+		$this->position += $len + 1;
+		$this->state = 'new_line';
+	}
+
+	/**
+	 * Deal with a new line, shifting data around as needed
+	 */
+	protected function new_line()
+	{
+		$this->value = trim($this->value, "\x0D\x20");
+		if ($this->name !== '' && $this->value !== '')
+		{
+			$this->name = strtolower($this->name);
+			// We should only use the last Content-Type header. c.f. issue #1
+			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
+			{
+				$this->headers[$this->name] .= ', ' . $this->value;
+			}
+			else
+			{
+				$this->headers[$this->name] = $this->value;
+			}
+		}
+		$this->name = '';
+		$this->value = '';
+		if (substr($this->data[$this->position], 0, 2) === "\x0D\x0A")
+		{
+			$this->position += 2;
+			$this->state = 'body';
+		}
+		elseif ($this->data[$this->position] === "\x0A")
+		{
+			$this->position++;
+			$this->state = 'body';
+		}
+		else
+		{
+			$this->state = 'name';
+		}
+	}
+
+	/**
+	 * Parse a header name
+	 */
+	protected function name()
+	{
+		$len = strcspn($this->data, "\x0A:", $this->position);
+		if (isset($this->data[$this->position + $len]))
+		{
+			if ($this->data[$this->position + $len] === "\x0A")
+			{
+				$this->position += $len;
+				$this->state = 'new_line';
+			}
+			else
+			{
+				$this->name = substr($this->data, $this->position, $len);
+				$this->position += $len + 1;
+				$this->state = 'value';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse LWS, replacing consecutive LWS characters with a single space
+	 */
+	protected function linear_whitespace()
+	{
+		do
+		{
+			if (substr($this->data, $this->position, 2) === "\x0D\x0A")
+			{
+				$this->position += 2;
+			}
+			elseif ($this->data[$this->position] === "\x0A")
+			{
+				$this->position++;
+			}
+			$this->position += strspn($this->data, "\x09\x20", $this->position);
+		} while ($this->has_data() && $this->is_linear_whitespace());
+		$this->value .= "\x20";
+	}
+
+	/**
+	 * See what state to move to while within non-quoted header values
+	 */
+	protected function value()
+	{
+		if ($this->is_linear_whitespace())
+		{
+			$this->linear_whitespace();
+		}
+		else
+		{
+			switch ($this->data[$this->position])
+			{
+				case '"':
+					// Workaround for ETags: we have to include the quotes as
+					// part of the tag.
+					if (strtolower($this->name) === 'etag')
+					{
+						$this->value .= '"';
+						$this->position++;
+						$this->state = 'value_char';
+						break;
+					}
+					$this->position++;
+					$this->state = 'quote';
+					break;
+
+				case "\x0A":
+					$this->position++;
+					$this->state = 'new_line';
+					break;
+
+				default:
+					$this->state = 'value_char';
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a header value while outside quotes
+	 */
+	protected function value_char()
+	{
+		$len = strcspn($this->data, "\x09\x20\x0A\"", $this->position);
+		$this->value .= substr($this->data, $this->position, $len);
+		$this->position += $len;
+		$this->state = 'value';
+	}
+
+	/**
+	 * See what state to move to while within quoted header values
+	 */
+	protected function quote()
+	{
+		if ($this->is_linear_whitespace())
+		{
+			$this->linear_whitespace();
+		}
+		else
+		{
+			switch ($this->data[$this->position])
+			{
+				case '"':
+					$this->position++;
+					$this->state = 'value';
+					break;
+
+				case "\x0A":
+					$this->position++;
+					$this->state = 'new_line';
+					break;
+
+				case '\\':
+					$this->position++;
+					$this->state = 'quote_escaped';
+					break;
+
+				default:
+					$this->state = 'quote_char';
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a header value while within quotes
+	 */
+	protected function quote_char()
+	{
+		$len = strcspn($this->data, "\x09\x20\x0A\"\\", $this->position);
+		$this->value .= substr($this->data, $this->position, $len);
+		$this->position += $len;
+		$this->state = 'value';
+	}
+
+	/**
+	 * Parse an escaped character within quotes
+	 */
+	protected function quote_escaped()
+	{
+		$this->value .= $this->data[$this->position];
+		$this->position++;
+		$this->state = 'quote';
+	}
+
+	/**
+	 * Parse the body
+	 */
+	protected function body()
+	{
+		$this->body = substr($this->data, $this->position);
+		if (!empty($this->headers['transfer-encoding']))
+		{
+			unset($this->headers['transfer-encoding']);
+			$this->state = 'chunked';
+		}
+		else
+		{
+			$this->state = 'emit';
+		}
+	}
+
+	/**
+	 * Parsed a "Transfer-Encoding: chunked" body
+	 */
+	protected function chunked()
+	{
+		if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body)))
+		{
+			$this->state = 'emit';
+			return;
+		}
+
+		$decoded = '';
+		$encoded = $this->body;
+
+		while (true)
+		{
+			$is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
+			if (!$is_chunked)
+			{
+				// Looks like it's not chunked after all
+				$this->state = 'emit';
+				return;
+			}
+
+			$length = hexdec(trim($matches[1]));
+			if ($length === 0)
+			{
+				// Ignore trailer headers
+				$this->state = 'emit';
+				$this->body = $decoded;
+				return;
+			}
+
+			$chunk_length = strlen($matches[0]);
+			$decoded .= $part = substr($encoded, $chunk_length, $length);
+			$encoded = substr($encoded, $chunk_length + $length + 2);
+
+			if (trim($encoded) === '0' || empty($encoded))
+			{
+				$this->state = 'emit';
+				$this->body = $decoded;
+				return;
+			}
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/IRI.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/IRI.php
new file mode 100644
index 00000000..d3198c04
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/IRI.php
@@ -0,0 +1,1238 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * IRI parser/serialiser/normaliser
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @author Geoffrey Sneddon
+ * @author Steve Minutillo
+ * @author Ryan McCue
+ * @copyright 2007-2012 Geoffrey Sneddon, Steve Minutillo, Ryan McCue
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ */
+class SimplePie_IRI
+{
+	/**
+	 * Scheme
+	 *
+	 * @var string
+	 */
+	protected $scheme = null;
+
+	/**
+	 * User Information
+	 *
+	 * @var string
+	 */
+	protected $iuserinfo = null;
+
+	/**
+	 * ihost
+	 *
+	 * @var string
+	 */
+	protected $ihost = null;
+
+	/**
+	 * Port
+	 *
+	 * @var string
+	 */
+	protected $port = null;
+
+	/**
+	 * ipath
+	 *
+	 * @var string
+	 */
+	protected $ipath = '';
+
+	/**
+	 * iquery
+	 *
+	 * @var string
+	 */
+	protected $iquery = null;
+
+	/**
+	 * ifragment
+	 *
+	 * @var string
+	 */
+	protected $ifragment = null;
+
+	/**
+	 * Normalization database
+	 *
+	 * Each key is the scheme, each value is an array with each key as the IRI
+	 * part and value as the default value for that part.
+	 */
+	protected $normalization = array(
+		'acap' => array(
+			'port' => 674
+		),
+		'dict' => array(
+			'port' => 2628
+		),
+		'file' => array(
+			'ihost' => 'localhost'
+		),
+		'http' => array(
+			'port' => 80,
+			'ipath' => '/'
+		),
+		'https' => array(
+			'port' => 443,
+			'ipath' => '/'
+		),
+	);
+
+	/**
+	 * Return the entire IRI when you try and read the object as a string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get_iri();
+	}
+
+	/**
+	 * Overload __set() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 * @param mixed $value Property value
+	 */
+	public function __set($name, $value)
+	{
+		if (method_exists($this, 'set_' . $name))
+		{
+			call_user_func(array($this, 'set_' . $name), $value);
+		}
+		elseif (
+			   $name === 'iauthority'
+			|| $name === 'iuserinfo'
+			|| $name === 'ihost'
+			|| $name === 'ipath'
+			|| $name === 'iquery'
+			|| $name === 'ifragment'
+		)
+		{
+			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+		}
+	}
+
+	/**
+	 * Overload __get() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		// isset() returns false for null, we don't want to do that
+		// Also why we use array_key_exists below instead of isset()
+		$props = get_object_vars($this);
+
+		if (
+			$name === 'iri' ||
+			$name === 'uri' ||
+			$name === 'iauthority' ||
+			$name === 'authority'
+		)
+		{
+			$return = $this->{"get_$name"}();
+		}
+		elseif (array_key_exists($name, $props))
+		{
+			$return = $this->$name;
+		}
+		// host -> ihost
+		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		{
+			$name = $prop;
+			$return = $this->$prop;
+		}
+		// ischeme -> scheme
+		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props))
+		{
+			$name = $prop;
+			$return = $this->$prop;
+		}
+		else
+		{
+			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			$return = null;
+		}
+
+		if ($return === null && isset($this->normalization[$this->scheme][$name]))
+		{
+			return $this->normalization[$this->scheme][$name];
+		}
+		else
+		{
+			return $return;
+		}
+	}
+
+	/**
+	 * Overload __isset() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Overload __unset() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 */
+	public function __unset($name)
+	{
+		if (method_exists($this, 'set_' . $name))
+		{
+			call_user_func(array($this, 'set_' . $name), '');
+		}
+	}
+
+	/**
+	 * Create a new IRI object, from a specified string
+	 *
+	 * @param string $iri
+	 */
+	public function __construct($iri = null)
+	{
+		$this->set_iri($iri);
+	}
+
+	/**
+	 * Create a new IRI object by resolving a relative IRI
+	 *
+	 * Returns false if $base is not absolute, otherwise an IRI.
+	 *
+	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param IRI|string $relative Relative IRI
+	 * @return IRI|false
+	 */
+	public static function absolutize($base, $relative)
+	{
+		if (!($relative instanceof SimplePie_IRI))
+		{
+			$relative = new SimplePie_IRI($relative);
+		}
+		if (!$relative->is_valid())
+		{
+			return false;
+		}
+		elseif ($relative->scheme !== null)
+		{
+			return clone $relative;
+		}
+		else
+		{
+			if (!($base instanceof SimplePie_IRI))
+			{
+				$base = new SimplePie_IRI($base);
+			}
+			if ($base->scheme !== null && $base->is_valid())
+			{
+				if ($relative->get_iri() !== '')
+				{
+					if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null)
+					{
+						$target = clone $relative;
+						$target->scheme = $base->scheme;
+					}
+					else
+					{
+						$target = new SimplePie_IRI;
+						$target->scheme = $base->scheme;
+						$target->iuserinfo = $base->iuserinfo;
+						$target->ihost = $base->ihost;
+						$target->port = $base->port;
+						if ($relative->ipath !== '')
+						{
+							if ($relative->ipath[0] === '/')
+							{
+								$target->ipath = $relative->ipath;
+							}
+							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+							{
+								$target->ipath = '/' . $relative->ipath;
+							}
+							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+							{
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+							}
+							else
+							{
+								$target->ipath = $relative->ipath;
+							}
+							$target->ipath = $target->remove_dot_segments($target->ipath);
+							$target->iquery = $relative->iquery;
+						}
+						else
+						{
+							$target->ipath = $base->ipath;
+							if ($relative->iquery !== null)
+							{
+								$target->iquery = $relative->iquery;
+							}
+							elseif ($base->iquery !== null)
+							{
+								$target->iquery = $base->iquery;
+							}
+						}
+						$target->ifragment = $relative->ifragment;
+					}
+				}
+				else
+				{
+					$target = clone $base;
+					$target->ifragment = null;
+				}
+				$target->scheme_normalization();
+				return $target;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Parse an IRI into scheme/authority/path/query/fragment segments
+	 *
+	 * @param string $iri
+	 * @return array
+	 */
+	protected function parse_iri($iri)
+	{
+		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
+		if (preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match))
+		{
+			if ($match[1] === '')
+			{
+				$match['scheme'] = null;
+			}
+			if (!isset($match[3]) || $match[3] === '')
+			{
+				$match['authority'] = null;
+			}
+			if (!isset($match[5]))
+			{
+				$match['path'] = '';
+			}
+			if (!isset($match[6]) || $match[6] === '')
+			{
+				$match['query'] = null;
+			}
+			if (!isset($match[8]) || $match[8] === '')
+			{
+				$match['fragment'] = null;
+			}
+			return $match;
+		}
+		else
+		{
+			// This can occur when a paragraph is accidentally parsed as a URI
+			return false;
+		}
+	}
+
+	/**
+	 * Remove dot segments from a path
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	protected function remove_dot_segments($input)
+	{
+		$output = '';
+		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..')
+		{
+			// A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
+			if (strpos($input, '../') === 0)
+			{
+				$input = substr($input, 3);
+			}
+			elseif (strpos($input, './') === 0)
+			{
+				$input = substr($input, 2);
+			}
+			// B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
+			elseif (strpos($input, '/./') === 0)
+			{
+				$input = substr($input, 2);
+			}
+			elseif ($input === '/.')
+			{
+				$input = '/';
+			}
+			// C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
+			elseif (strpos($input, '/../') === 0)
+			{
+				$input = substr($input, 3);
+				$output = substr_replace($output, '', strrpos($output, '/'));
+			}
+			elseif ($input === '/..')
+			{
+				$input = '/';
+				$output = substr_replace($output, '', strrpos($output, '/'));
+			}
+			// D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
+			elseif ($input === '.' || $input === '..')
+			{
+				$input = '';
+			}
+			// E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
+			elseif (($pos = strpos($input, '/', 1)) !== false)
+			{
+				$output .= substr($input, 0, $pos);
+				$input = substr_replace($input, '', 0, $pos);
+			}
+			else
+			{
+				$output .= $input;
+				$input = '';
+			}
+		}
+		return $output . $input;
+	}
+
+	/**
+	 * Replace invalid character with percent encoding
+	 *
+	 * @param string $string Input string
+	 * @param string $extra_chars Valid characters not in iunreserved or
+	 *                            iprivate (this is ASCII-only)
+	 * @param bool $iprivate Allow iprivate
+	 * @return string
+	 */
+	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
+	{
+		// Normalize as many pct-encoded sections as possible
+		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string);
+
+		// Replace invalid percent characters
+		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+
+		// Add unreserved and % to $extra_chars (the latter is safe because all
+		// pct-encoded sections are now valid).
+		$extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
+
+		// Now replace any bytes that aren't allowed with their pct-encoded versions
+		$position = 0;
+		$strlen = strlen($string);
+		while (($position += strspn($string, $extra_chars, $position)) < $strlen)
+		{
+			$value = ord($string[$position]);
+
+			// Start position
+			$start = $position;
+
+			// By default we are valid
+			$valid = true;
+
+			// No one byte sequences are valid due to the while.
+			// Two byte sequence:
+			if (($value & 0xE0) === 0xC0)
+			{
+				$character = ($value & 0x1F) << 6;
+				$length = 2;
+				$remaining = 1;
+			}
+			// Three byte sequence:
+			elseif (($value & 0xF0) === 0xE0)
+			{
+				$character = ($value & 0x0F) << 12;
+				$length = 3;
+				$remaining = 2;
+			}
+			// Four byte sequence:
+			elseif (($value & 0xF8) === 0xF0)
+			{
+				$character = ($value & 0x07) << 18;
+				$length = 4;
+				$remaining = 3;
+			}
+			// Invalid byte:
+			else
+			{
+				$valid = false;
+				$length = 1;
+				$remaining = 0;
+			}
+
+			if ($remaining)
+			{
+				if ($position + $length <= $strlen)
+				{
+					for ($position++; $remaining; $position++)
+					{
+						$value = ord($string[$position]);
+
+						// Check that the byte is valid, then add it to the character:
+						if (($value & 0xC0) === 0x80)
+						{
+							$character |= ($value & 0x3F) << (--$remaining * 6);
+						}
+						// If it is invalid, count the sequence as invalid and reprocess the current byte:
+						else
+						{
+							$valid = false;
+							$position--;
+							break;
+						}
+					}
+				}
+				else
+				{
+					$position = $strlen - 1;
+					$valid = false;
+				}
+			}
+
+			// Percent encode anything invalid or not in ucschar
+			if (
+				// Invalid sequences
+				!$valid
+				// Non-shortest form sequences are invalid
+				|| $length > 1 && $character <= 0x7F
+				|| $length > 2 && $character <= 0x7FF
+				|| $length > 3 && $character <= 0xFFFF
+				// Outside of range of ucschar codepoints
+				// Noncharacters
+				|| ($character & 0xFFFE) === 0xFFFE
+				|| $character >= 0xFDD0 && $character <= 0xFDEF
+				|| (
+					// Everything else not in ucschar
+					   $character > 0xD7FF && $character < 0xF900
+					|| $character < 0xA0
+					|| $character > 0xEFFFD
+				)
+				&& (
+					// Everything not in iprivate, if it applies
+					   !$iprivate
+					|| $character < 0xE000
+					|| $character > 0x10FFFD
+				)
+			)
+			{
+				// If we were a character, pretend we weren't, but rather an error.
+				if ($valid)
+					$position--;
+
+				for ($j = $start; $j <= $position; $j++)
+				{
+					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+					$j += 2;
+					$position += 2;
+					$strlen += 2;
+				}
+			}
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Callback function for preg_replace_callback.
+	 *
+	 * Removes sequences of percent encoded bytes that represent UTF-8
+	 * encoded characters in iunreserved
+	 *
+	 * @param array $match PCRE match
+	 * @return string Replacement
+	 */
+	protected function remove_iunreserved_percent_encoded($match)
+	{
+		// As we just have valid percent encoded sequences we can just explode
+		// and ignore the first member of the returned array (an empty string).
+		$bytes = explode('%', $match[0]);
+
+		// Initialize the new string (this is what will be returned) and that
+		// there are no bytes remaining in the current sequence (unsurprising
+		// at the first byte!).
+		$string = '';
+		$remaining = 0;
+
+		// Loop over each and every byte, and set $value to its value
+		for ($i = 1, $len = count($bytes); $i < $len; $i++)
+		{
+			$value = hexdec($bytes[$i]);
+
+			// If we're the first byte of sequence:
+			if (!$remaining)
+			{
+				// Start position
+				$start = $i;
+
+				// By default we are valid
+				$valid = true;
+
+				// One byte sequence:
+				if ($value <= 0x7F)
+				{
+					$character = $value;
+					$length = 1;
+				}
+				// Two byte sequence:
+				elseif (($value & 0xE0) === 0xC0)
+				{
+					$character = ($value & 0x1F) << 6;
+					$length = 2;
+					$remaining = 1;
+				}
+				// Three byte sequence:
+				elseif (($value & 0xF0) === 0xE0)
+				{
+					$character = ($value & 0x0F) << 12;
+					$length = 3;
+					$remaining = 2;
+				}
+				// Four byte sequence:
+				elseif (($value & 0xF8) === 0xF0)
+				{
+					$character = ($value & 0x07) << 18;
+					$length = 4;
+					$remaining = 3;
+				}
+				// Invalid byte:
+				else
+				{
+					$valid = false;
+					$remaining = 0;
+				}
+			}
+			// Continuation byte:
+			else
+			{
+				// Check that the byte is valid, then add it to the character:
+				if (($value & 0xC0) === 0x80)
+				{
+					$remaining--;
+					$character |= ($value & 0x3F) << ($remaining * 6);
+				}
+				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
+				else
+				{
+					$valid = false;
+					$remaining = 0;
+					$i--;
+				}
+			}
+
+			// If we've reached the end of the current byte sequence, append it to Unicode::$data
+			if (!$remaining)
+			{
+				// Percent encode anything invalid or not in iunreserved
+				if (
+					// Invalid sequences
+					!$valid
+					// Non-shortest form sequences are invalid
+					|| $length > 1 && $character <= 0x7F
+					|| $length > 2 && $character <= 0x7FF
+					|| $length > 3 && $character <= 0xFFFF
+					// Outside of range of iunreserved codepoints
+					|| $character < 0x2D
+					|| $character > 0xEFFFD
+					// Noncharacters
+					|| ($character & 0xFFFE) === 0xFFFE
+					|| $character >= 0xFDD0 && $character <= 0xFDEF
+					// Everything else not in iunreserved (this is all BMP)
+					|| $character === 0x2F
+					|| $character > 0x39 && $character < 0x41
+					|| $character > 0x5A && $character < 0x61
+					|| $character > 0x7A && $character < 0x7E
+					|| $character > 0x7E && $character < 0xA0
+					|| $character > 0xD7FF && $character < 0xF900
+				)
+				{
+					for ($j = $start; $j <= $i; $j++)
+					{
+						$string .= '%' . strtoupper($bytes[$j]);
+					}
+				}
+				else
+				{
+					for ($j = $start; $j <= $i; $j++)
+					{
+						$string .= chr(hexdec($bytes[$j]));
+					}
+				}
+			}
+		}
+
+		// If we have any bytes left over they are invalid (i.e., we are
+		// mid-way through a multi-byte sequence)
+		if ($remaining)
+		{
+			for ($j = $start; $j < $len; $j++)
+			{
+				$string .= '%' . strtoupper($bytes[$j]);
+			}
+		}
+
+		return $string;
+	}
+
+	protected function scheme_normalization()
+	{
+		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo'])
+		{
+			$this->iuserinfo = null;
+		}
+		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost'])
+		{
+			$this->ihost = null;
+		}
+		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port'])
+		{
+			$this->port = null;
+		}
+		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath'])
+		{
+			$this->ipath = '';
+		}
+		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery'])
+		{
+			$this->iquery = null;
+		}
+		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment'])
+		{
+			$this->ifragment = null;
+		}
+	}
+
+	/**
+	 * Check if the object represents a valid IRI. This needs to be done on each
+	 * call as some things change depending on another part of the IRI.
+	 *
+	 * @return bool
+	 */
+	public function is_valid()
+	{
+		$isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
+		if ($this->ipath !== '' &&
+			(
+				$isauthority && (
+					$this->ipath[0] !== '/' ||
+					substr($this->ipath, 0, 2) === '//'
+				) ||
+				(
+					$this->scheme === null &&
+					!$isauthority &&
+					strpos($this->ipath, ':') !== false &&
+					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
+				)
+			)
+		)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the entire IRI. Returns true on success, false on failure (if there
+	 * are any invalid characters).
+	 *
+	 * @param string $iri
+	 * @return bool
+	 */
+	public function set_iri($iri)
+	{
+		static $cache;
+		if (!$cache)
+		{
+			$cache = array();
+		}
+
+		if ($iri === null)
+		{
+			return true;
+		}
+		elseif (isset($cache[$iri]))
+		{
+			list($this->scheme,
+				 $this->iuserinfo,
+				 $this->ihost,
+				 $this->port,
+				 $this->ipath,
+				 $this->iquery,
+				 $this->ifragment,
+				 $return) = $cache[$iri];
+			return $return;
+		}
+		else
+		{
+			$parsed = $this->parse_iri((string) $iri);
+			if (!$parsed)
+			{
+				return false;
+			}
+
+			$return = $this->set_scheme($parsed['scheme'])
+				&& $this->set_authority($parsed['authority'])
+				&& $this->set_path($parsed['path'])
+				&& $this->set_query($parsed['query'])
+				&& $this->set_fragment($parsed['fragment']);
+
+			$cache[$iri] = array($this->scheme,
+								 $this->iuserinfo,
+								 $this->ihost,
+								 $this->port,
+								 $this->ipath,
+								 $this->iquery,
+								 $this->ifragment,
+								 $return);
+			return $return;
+		}
+	}
+
+	/**
+	 * Set the scheme. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $scheme
+	 * @return bool
+	 */
+	public function set_scheme($scheme)
+	{
+		if ($scheme === null)
+		{
+			$this->scheme = null;
+		}
+		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		{
+			$this->scheme = null;
+			return false;
+		}
+		else
+		{
+			$this->scheme = strtolower($scheme);
+		}
+		return true;
+	}
+
+	/**
+	 * Set the authority. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $authority
+	 * @return bool
+	 */
+	public function set_authority($authority)
+	{
+		static $cache;
+		if (!$cache)
+			$cache = array();
+
+		if ($authority === null)
+		{
+			$this->iuserinfo = null;
+			$this->ihost = null;
+			$this->port = null;
+			return true;
+		}
+		elseif (isset($cache[$authority]))
+		{
+			list($this->iuserinfo,
+				 $this->ihost,
+				 $this->port,
+				 $return) = $cache[$authority];
+
+			return $return;
+		}
+		else
+		{
+			$remaining = $authority;
+			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
+			{
+				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
+				$remaining = substr($remaining, $iuserinfo_end + 1);
+			}
+			else
+			{
+				$iuserinfo = null;
+			}
+			if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)
+			{
+				if (($port = substr($remaining, $port_start + 1)) === false)
+				{
+					$port = null;
+				}
+				$remaining = substr($remaining, 0, $port_start);
+			}
+			else
+			{
+				$port = null;
+			}
+
+			$return = $this->set_userinfo($iuserinfo) &&
+					  $this->set_host($remaining) &&
+					  $this->set_port($port);
+
+			$cache[$authority] = array($this->iuserinfo,
+									   $this->ihost,
+									   $this->port,
+									   $return);
+
+			return $return;
+		}
+	}
+
+	/**
+	 * Set the iuserinfo.
+	 *
+	 * @param string $iuserinfo
+	 * @return bool
+	 */
+	public function set_userinfo($iuserinfo)
+	{
+		if ($iuserinfo === null)
+		{
+			$this->iuserinfo = null;
+		}
+		else
+		{
+			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
+			$this->scheme_normalization();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the ihost. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $ihost
+	 * @return bool
+	 */
+	public function set_host($ihost)
+	{
+		if ($ihost === null)
+		{
+			$this->ihost = null;
+			return true;
+		}
+		elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+		{
+			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
+			{
+				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+			}
+			else
+			{
+				$this->ihost = null;
+				return false;
+			}
+		}
+		else
+		{
+			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
+
+			// Lowercase, but ignore pct-encoded sections (as they should
+			// remain uppercase). This must be done after the previous step
+			// as that can add unescaped characters.
+			$position = 0;
+			$strlen = strlen($ihost);
+			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen)
+			{
+				if ($ihost[$position] === '%')
+				{
+					$position += 3;
+				}
+				else
+				{
+					$ihost[$position] = strtolower($ihost[$position]);
+					$position++;
+				}
+			}
+
+			$this->ihost = $ihost;
+		}
+
+		$this->scheme_normalization();
+
+		return true;
+	}
+
+	/**
+	 * Set the port. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $port
+	 * @return bool
+	 */
+	public function set_port($port)
+	{
+		if ($port === null)
+		{
+			$this->port = null;
+			return true;
+		}
+		elseif (strspn($port, '0123456789') === strlen($port))
+		{
+			$this->port = (int) $port;
+			$this->scheme_normalization();
+			return true;
+		}
+		else
+		{
+			$this->port = null;
+			return false;
+		}
+	}
+
+	/**
+	 * Set the ipath.
+	 *
+	 * @param string $ipath
+	 * @return bool
+	 */
+	public function set_path($ipath)
+	{
+		static $cache;
+		if (!$cache)
+		{
+			$cache = array();
+		}
+
+		$ipath = (string) $ipath;
+
+		if (isset($cache[$ipath]))
+		{
+			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
+		}
+		else
+		{
+			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
+			$removed = $this->remove_dot_segments($valid);
+
+			$cache[$ipath] = array($valid, $removed);
+			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+		}
+
+		$this->scheme_normalization();
+		return true;
+	}
+
+	/**
+	 * Set the iquery.
+	 *
+	 * @param string $iquery
+	 * @return bool
+	 */
+	public function set_query($iquery)
+	{
+		if ($iquery === null)
+		{
+			$this->iquery = null;
+		}
+		else
+		{
+			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
+			$this->scheme_normalization();
+		}
+		return true;
+	}
+
+	/**
+	 * Set the ifragment.
+	 *
+	 * @param string $ifragment
+	 * @return bool
+	 */
+	public function set_fragment($ifragment)
+	{
+		if ($ifragment === null)
+		{
+			$this->ifragment = null;
+		}
+		else
+		{
+			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
+			$this->scheme_normalization();
+		}
+		return true;
+	}
+
+	/**
+	 * Convert an IRI to a URI (or parts thereof)
+	 *
+	 * @return string
+	 */
+	public function to_uri($string)
+	{
+		static $non_ascii;
+		if (!$non_ascii)
+		{
+			$non_ascii = implode('', range("\x80", "\xFF"));
+		}
+
+		$position = 0;
+		$strlen = strlen($string);
+		while (($position += strcspn($string, $non_ascii, $position)) < $strlen)
+		{
+			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
+			$position += 3;
+			$strlen += 2;
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Get the complete IRI
+	 *
+	 * @return string
+	 */
+	public function get_iri()
+	{
+		if (!$this->is_valid())
+		{
+			return false;
+		}
+
+		$iri = '';
+		if ($this->scheme !== null)
+		{
+			$iri .= $this->scheme . ':';
+		}
+		if (($iauthority = $this->get_iauthority()) !== null)
+		{
+			$iri .= '//' . $iauthority;
+		}
+		if ($this->ipath !== '')
+		{
+			$iri .= $this->ipath;
+		}
+		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		{
+			$iri .= $this->normalization[$this->scheme]['ipath'];
+		}
+		if ($this->iquery !== null)
+		{
+			$iri .= '?' . $this->iquery;
+		}
+		if ($this->ifragment !== null)
+		{
+			$iri .= '#' . $this->ifragment;
+		}
+
+		return $iri;
+	}
+
+	/**
+	 * Get the complete URI
+	 *
+	 * @return string
+	 */
+	public function get_uri()
+	{
+		return $this->to_uri($this->get_iri());
+	}
+
+	/**
+	 * Get the complete iauthority
+	 *
+	 * @return string
+	 */
+	protected function get_iauthority()
+	{
+		if ($this->iuserinfo !== null || $this->ihost !== null || $this->port !== null)
+		{
+			$iauthority = '';
+			if ($this->iuserinfo !== null)
+			{
+				$iauthority .= $this->iuserinfo . '@';
+			}
+			if ($this->ihost !== null)
+			{
+				$iauthority .= $this->ihost;
+			}
+			if ($this->port !== null)
+			{
+				$iauthority .= ':' . $this->port;
+			}
+			return $iauthority;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the complete authority
+	 *
+	 * @return string
+	 */
+	protected function get_authority()
+	{
+		$iauthority = $this->get_iauthority();
+		if (is_string($iauthority))
+			return $this->to_uri($iauthority);
+		else
+			return $iauthority;
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Item.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Item.php
new file mode 100644
index 00000000..a77574b3
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Item.php
@@ -0,0 +1,2964 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Manages all item-related data
+ *
+ * Used by {@see SimplePie::get_item()} and {@see SimplePie::get_items()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_item_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Item
+{
+	/**
+	 * Parent feed
+	 *
+	 * @access private
+	 * @var SimplePie
+	 */
+	var $feed;
+
+	/**
+	 * Raw data
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $data = array();
+
+	/**
+	 * Registry object
+	 *
+	 * @see set_registry
+	 * @var SimplePie_Registry
+	 */
+	protected $registry;
+
+	/**
+	 * Create a new item object
+	 *
+	 * This is usually used by {@see SimplePie::get_items} and
+	 * {@see SimplePie::get_item}. Avoid creating this manually.
+	 *
+	 * @param SimplePie $feed Parent feed
+	 * @param array $data Raw data
+	 */
+	public function __construct($feed, $data)
+	{
+		$this->feed = $feed;
+		$this->data = $data;
+	}
+
+	/**
+	 * Set the registry handler
+	 *
+	 * This is usually used by {@see SimplePie_Registry::create}
+	 *
+	 * @since 1.3
+	 * @param SimplePie_Registry $registry
+	 */
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	/**
+	 * Get a string representation of the item
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	/**
+	 * Remove items that link back to this before destroying this object
+	 */
+	public function __destruct()
+	{
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		{
+			unset($this->feed);
+		}
+	}
+
+	/**
+	 * Get data for an item-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute that is a
+	 * sub-element of the item/entry tag.
+	 *
+	 * See {@see SimplePie::get_feed_tags()} for a description of the return value
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_item_tags($namespace, $tag)
+	{
+		if (isset($this->data['child'][$namespace][$tag]))
+		{
+			return $this->data['child'][$namespace][$tag];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the base URL value from the parent feed
+	 *
+	 * Uses `<xml:base>`
+	 *
+	 * @param array $element
+	 * @return string
+	 */
+	public function get_base($element = array())
+	{
+		return $this->feed->get_base($element);
+	}
+
+	/**
+	 * Sanitize feed data
+	 *
+	 * @access private
+	 * @see SimplePie::sanitize()
+	 * @param string $data Data to sanitize
+	 * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants
+	 * @param string $base Base URL to resolve URLs against
+	 * @return string Sanitized data
+	 */
+	public function sanitize($data, $type, $base = '')
+	{
+		return $this->feed->sanitize($data, $type, $base);
+	}
+
+	/**
+	 * Get the parent feed
+	 *
+	 * Note: this may not work as you think for multifeeds!
+	 *
+	 * @link http://simplepie.org/faq/typical_multifeed_gotchas#missing_data_from_feed
+	 * @since 1.0
+	 * @return SimplePie
+	 */
+	public function get_feed()
+	{
+		return $this->feed;
+	}
+
+	/**
+	 * Get the unique identifier for the item
+	 *
+	 * This is usually used when writing code to check for new items in a feed.
+	 *
+	 * Uses `<atom:id>`, `<guid>`, `<dc:identifier>` or the `about` attribute
+	 * for RDF. If none of these are supplied (or `$hash` is true), creates an
+	 * MD5 hash based on the permalink and title. If either of those are not
+	 * supplied, creates a hash based on the full feed data.
+	 *
+	 * @since Beta 2
+	 * @param boolean $hash Should we force using a hash instead of the supplied ID?
+	 * @return string
+	 */
+	public function get_id($hash = false)
+	{
+		if (!$hash)
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
+			{
+				return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif (($return = $this->get_permalink()) !== null)
+			{
+				return $return;
+			}
+			elseif (($return = $this->get_title()) !== null)
+			{
+				return $return;
+			}
+		}
+		if ($this->get_permalink() !== null || $this->get_title() !== null)
+		{
+			return md5($this->get_permalink() . $this->get_title());
+		}
+		else
+		{
+			return md5(serialize($this->data));
+		}
+	}
+
+	/**
+	 * Get the title of the item
+	 *
+	 * Uses `<atom:title>`, `<title>` or `<dc:title>`
+	 *
+	 * @since Beta 2 (previously called `get_item_title` since 0.8)
+	 * @return string|null
+	 */
+	public function get_title()
+	{
+		if (!isset($this->data['title']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$this->data['title'] = null;
+			}
+		}
+		return $this->data['title'];
+	}
+
+	/**
+	 * Get the content for the item
+	 *
+	 * Prefers summaries over full content , but will return full content if a
+	 * summary does not exist.
+	 *
+	 * To prefer full content instead, use {@see get_content}
+	 *
+	 * Uses `<atom:summary>`, `<description>`, `<dc:description>` or
+	 * `<itunes:subtitle>`
+	 *
+	 * @since 0.8
+	 * @param boolean $description_only Should we avoid falling back to the content?
+	 * @return string|null
+	 */
+	public function get_description($description_only = false)
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
+		}
+
+		elseif (!$description_only)
+		{
+			return $this->get_content(true);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the content for the item
+	 *
+	 * Prefers full content over summaries, but will return a summary if full
+	 * content does not exist.
+	 *
+	 * To prefer summaries instead, use {@see get_description}
+	 *
+	 * Uses `<atom:content>` or `<content:encoded>` (RSS 1.0 Content Module)
+	 *
+	 * @since 1.0
+	 * @param boolean $content_only Should we avoid falling back to the description?
+	 * @return string|null
+	 */
+	public function get_content($content_only = false)
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif (!$content_only)
+		{
+			return $this->get_description(true);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a category for the item
+	 *
+	 * @since Beta 3 (previously called `get_categories()` since Beta 2)
+	 * @param int $key The category that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Category|null
+	 */
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all categories for the item
+	 *
+	 * Uses `<atom:category>`, `<category>` or `<dc:subject>`
+	 *
+	 * @since Beta 3
+	 * @return array|null List of {@see SimplePie_Category} objects
+	 */
+	public function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+		{
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($categories))
+		{
+			return array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get an author for the item
+	 *
+	 * @since Beta 2
+	 * @param int $key The author that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a contributor for the item
+	 *
+	 * @since 1.1
+	 * @param int $key The contrbutor that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_contributor($key = 0)
+	{
+		$contributors = $this->get_contributors();
+		if (isset($contributors[$key]))
+		{
+			return $contributors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all contributors for the item
+	 *
+	 * Uses `<atom:contributor>`
+	 *
+	 * @since 1.1
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_contributors()
+	{
+		$contributors = array();
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+
+		if (!empty($contributors))
+		{
+			return array_unique($contributors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all authors for the item
+	 *
+	 * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
+	 *
+	 * @since Beta 2
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author'))
+		{
+			$authors[] = $this->registry->create('Author', array(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($authors))
+		{
+			return array_unique($authors);
+		}
+		elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
+		{
+			return $authors;
+		}
+		elseif ($authors = $this->feed->get_authors())
+		{
+			return $authors;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the copyright info for the item
+	 *
+	 * Uses `<atom:rights>` or `<dc:rights>`
+	 *
+	 * @since 1.1
+	 * @return string
+	 */
+	public function get_copyright()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the posting date/time for the item
+	 *
+	 * Uses `<atom:published>`, `<atom:updated>`, `<atom:issued>`,
+	 * `<atom:modified>`, `<pubDate>` or `<dc:date>`
+	 *
+	 * Note: obeys PHP's timezone setting. To get a UTC date/time, use
+	 * {@see get_gmdate}
+	 *
+	 * @since Beta 2 (previously called `get_item_date` since 0.8)
+	 *
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
+	 * @return int|string|null
+	 */
+	public function get_date($date_format = 'j F Y, g:i a')
+	{
+		if (!isset($this->data['date']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+
+			if (!empty($this->data['date']['raw']))
+			{
+				$parser = $this->registry->call('Parse_Date', 'get');
+				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
+			}
+			else
+			{
+				$this->data['date'] = null;
+			}
+		}
+		if ($this->data['date'])
+		{
+			$date_format = (string) $date_format;
+			switch ($date_format)
+			{
+				case '':
+					return $this->sanitize($this->data['date']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
+
+				case 'U':
+					return $this->data['date']['parsed'];
+
+				default:
+					return date($date_format, $this->data['date']['parsed']);
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the update date/time for the item
+	 *
+	 * Uses `<atom:updated>`
+	 *
+	 * Note: obeys PHP's timezone setting. To get a UTC date/time, use
+	 * {@see get_gmdate}
+	 *
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
+	 * @return int|string|null
+	 */
+	public function get_updated_date($date_format = 'j F Y, g:i a')
+	{
+		if (!isset($this->data['updated']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			{
+				$this->data['updated']['raw'] = $return[0]['data'];
+			}
+
+			if (!empty($this->data['updated']['raw']))
+			{
+				$parser = $this->registry->call('Parse_Date', 'get');
+				$this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']);
+			}
+			else
+			{
+				$this->data['updated'] = null;
+			}
+		}
+		if ($this->data['updated'])
+		{
+			$date_format = (string) $date_format;
+			switch ($date_format)
+			{
+				case '':
+					return $this->sanitize($this->data['updated']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
+
+				case 'U':
+					return $this->data['updated']['parsed'];
+
+				default:
+					return date($date_format, $this->data['updated']['parsed']);
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the localized posting date/time for the item
+	 *
+	 * Returns the date formatted in the localized language. To display in
+	 * languages other than the server's default, you need to change the locale
+	 * with {@link http://php.net/setlocale setlocale()}. The available
+	 * localizations depend on which ones are installed on your web server.
+	 *
+	 * @since 1.0
+	 *
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
+	 * @return int|string|null
+	 */
+	public function get_local_date($date_format = '%c')
+	{
+		if (!$date_format)
+		{
+			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (($date = $this->get_date('U')) !== null && $date !== false)
+		{
+			return strftime($date_format, $date);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the posting date/time for the item (UTC time)
+	 *
+	 * @see get_date
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
+	 * @return int|string|null
+	 */
+	public function get_gmdate($date_format = 'j F Y, g:i a')
+	{
+		$date = $this->get_date('U');
+		if ($date === null)
+		{
+			return null;
+		}
+
+		return gmdate($date_format, $date);
+	}
+
+	/**
+	 * Get the update date/time for the item (UTC time)
+	 *
+	 * @see get_updated_date
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
+	 * @return int|string|null
+	 */
+	public function get_updated_gmdate($date_format = 'j F Y, g:i a')
+	{
+		$date = $this->get_updated_date('U');
+		if ($date === null)
+		{
+			return null;
+		}
+
+		return gmdate($date_format, $date);
+	}
+
+	/**
+	 * Get the permalink for the item
+	 *
+	 * Returns the first link available with a relationship of "alternate".
+	 * Identical to {@see get_link()} with key 0
+	 *
+	 * @see get_link
+	 * @since 0.8
+	 * @return string|null Permalink URL
+	 */
+	public function get_permalink()
+	{
+		$link = $this->get_link();
+		$enclosure = $this->get_enclosure(0);
+		if ($link !== null)
+		{
+			return $link;
+		}
+		elseif ($enclosure !== null)
+		{
+			return $enclosure->get_link();
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single link for the item
+	 *
+	 * @since Beta 3
+	 * @param int $key The link that you want to return.  Remember that arrays begin with 0, not 1
+	 * @param string $rel The relationship of the link to return
+	 * @return string|null Link URL
+	 */
+	public function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if ($links[$key] !== null)
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all links for the item
+	 *
+	 * Uses `<atom:link>`, `<link>` or `<guid>`
+	 *
+	 * @since Beta 2
+	 * @param string $rel The relationship of links to return
+	 * @return array|null Links found for the item (strings)
+	 */
+	public function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']))
+				{
+					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+				}
+			}
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']))
+				{
+					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+				}
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			{
+				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
+				{
+					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+				}
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get an enclosure from the item
+	 *
+	 * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+	 *
+	 * @since Beta 2
+	 * @todo Add ability to prefer one type of content over another (in a media group).
+	 * @param int $key The enclosure that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Enclosure|null
+	 */
+	public function get_enclosure($key = 0, $prefer = null)
+	{
+		$enclosures = $this->get_enclosures();
+		if (isset($enclosures[$key]))
+		{
+			return $enclosures[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all available enclosures (podcasts, etc.)
+	 *
+	 * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+	 *
+	 * At this point, we're pretty much assuming that all enclosures for an item
+	 * are the same content.  Anything else is too complicated to
+	 * properly support.
+	 *
+	 * @since Beta 2
+	 * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4).
+	 * @todo If an element exists at a level, but it's value is empty, we should fall back to the value from the parent (if it exists).
+	 * @return array|null List of SimplePie_Enclosure items
+	 */
+	public function get_enclosures()
+	{
+		if (!isset($this->data['enclosures']))
+		{
+			$this->data['enclosures'] = array();
+
+			// Elements
+			$captions_parent = null;
+			$categories_parent = null;
+			$copyrights_parent = null;
+			$credits_parent = null;
+			$description_parent = null;
+			$duration_parent = null;
+			$hashes_parent = null;
+			$keywords_parent = null;
+			$player_parent = null;
+			$ratings_parent = null;
+			$restrictions_parent = null;
+			$thumbnails_parent = null;
+			$title_parent = null;
+
+			// Let's do the channel and item-level ones first, and just re-use them if we need to.
+			$parent = $this->get_feed();
+
+			// CAPTIONS
+			if ($captions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			{
+				foreach ($captions as $caption)
+				{
+					$caption_type = null;
+					$caption_lang = null;
+					$caption_startTime = null;
+					$caption_endTime = null;
+					$caption_text = null;
+					if (isset($caption['attribs']['']['type']))
+					{
+						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['lang']))
+					{
+						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['start']))
+					{
+						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['end']))
+					{
+						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['data']))
+					{
+						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+				}
+			}
+			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			{
+				foreach ($captions as $caption)
+				{
+					$caption_type = null;
+					$caption_lang = null;
+					$caption_startTime = null;
+					$caption_endTime = null;
+					$caption_text = null;
+					if (isset($caption['attribs']['']['type']))
+					{
+						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['lang']))
+					{
+						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['start']))
+					{
+						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['end']))
+					{
+						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['data']))
+					{
+						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+				}
+			}
+			if (is_array($captions_parent))
+			{
+				$captions_parent = array_values(array_unique($captions_parent));
+			}
+
+			// CATEGORIES
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
+			{
+				$term = null;
+				$scheme = null;
+				$label = null;
+				if (isset($category['data']))
+				{
+					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($category['attribs']['']['scheme']))
+				{
+					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				else
+				{
+					$scheme = 'http://search.yahoo.com/mrss/category_schema';
+				}
+				if (isset($category['attribs']['']['label']))
+				{
+					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+			}
+			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
+			{
+				$term = null;
+				$scheme = null;
+				$label = null;
+				if (isset($category['data']))
+				{
+					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($category['attribs']['']['scheme']))
+				{
+					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				else
+				{
+					$scheme = 'http://search.yahoo.com/mrss/category_schema';
+				}
+				if (isset($category['attribs']['']['label']))
+				{
+					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+			}
+			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
+			{
+				$term = null;
+				$scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
+				$label = null;
+				if (isset($category['attribs']['']['text']))
+				{
+					$label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+
+				if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
+				{
+					foreach ((array) $category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'] as $subcategory)
+					{
+						if (isset($subcategory['attribs']['']['text']))
+						{
+							$label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+					}
+				}
+			}
+			if (is_array($categories_parent))
+			{
+				$categories_parent = array_values(array_unique($categories_parent));
+			}
+
+			// COPYRIGHT
+			if ($copyright = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			{
+				$copyright_url = null;
+				$copyright_label = null;
+				if (isset($copyright[0]['attribs']['']['url']))
+				{
+					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($copyright[0]['data']))
+				{
+					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+			}
+			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			{
+				$copyright_url = null;
+				$copyright_label = null;
+				if (isset($copyright[0]['attribs']['']['url']))
+				{
+					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($copyright[0]['data']))
+				{
+					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+			}
+
+			// CREDITS
+			if ($credits = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			{
+				foreach ($credits as $credit)
+				{
+					$credit_role = null;
+					$credit_scheme = null;
+					$credit_name = null;
+					if (isset($credit['attribs']['']['role']))
+					{
+						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($credit['attribs']['']['scheme']))
+					{
+						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$credit_scheme = 'urn:ebu';
+					}
+					if (isset($credit['data']))
+					{
+						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+				}
+			}
+			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			{
+				foreach ($credits as $credit)
+				{
+					$credit_role = null;
+					$credit_scheme = null;
+					$credit_name = null;
+					if (isset($credit['attribs']['']['role']))
+					{
+						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($credit['attribs']['']['scheme']))
+					{
+						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$credit_scheme = 'urn:ebu';
+					}
+					if (isset($credit['data']))
+					{
+						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+				}
+			}
+			if (is_array($credits_parent))
+			{
+				$credits_parent = array_values(array_unique($credits_parent));
+			}
+
+			// DESCRIPTION
+			if ($description_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			{
+				if (isset($description_parent[0]['data']))
+				{
+					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			{
+				if (isset($description_parent[0]['data']))
+				{
+					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+
+			// DURATION
+			if ($duration_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'duration'))
+			{
+				$seconds = null;
+				$minutes = null;
+				$hours = null;
+				if (isset($duration_parent[0]['data']))
+				{
+					$temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					if (sizeof($temp) > 0)
+					{
+						$seconds = (int) array_pop($temp);
+					}
+					if (sizeof($temp) > 0)
+					{
+						$minutes = (int) array_pop($temp);
+						$seconds += $minutes * 60;
+					}
+					if (sizeof($temp) > 0)
+					{
+						$hours = (int) array_pop($temp);
+						$seconds += $hours * 3600;
+					}
+					unset($temp);
+					$duration_parent = $seconds;
+				}
+			}
+
+			// HASHES
+			if ($hashes_iterator = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			{
+				foreach ($hashes_iterator as $hash)
+				{
+					$value = null;
+					$algo = null;
+					if (isset($hash['data']))
+					{
+						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($hash['attribs']['']['algo']))
+					{
+						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$algo = 'md5';
+					}
+					$hashes_parent[] = $algo.':'.$value;
+				}
+			}
+			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			{
+				foreach ($hashes_iterator as $hash)
+				{
+					$value = null;
+					$algo = null;
+					if (isset($hash['data']))
+					{
+						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($hash['attribs']['']['algo']))
+					{
+						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$algo = 'md5';
+					}
+					$hashes_parent[] = $algo.':'.$value;
+				}
+			}
+			if (is_array($hashes_parent))
+			{
+				$hashes_parent = array_values(array_unique($hashes_parent));
+			}
+
+			// KEYWORDS
+			if ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			if (is_array($keywords_parent))
+			{
+				$keywords_parent = array_values(array_unique($keywords_parent));
+			}
+
+			// PLAYER
+			if ($player_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			{
+				if (isset($player_parent[0]['attribs']['']['url']))
+				{
+					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+				}
+			}
+			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			{
+				if (isset($player_parent[0]['attribs']['']['url']))
+				{
+					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+				}
+			}
+
+			// RATINGS
+			if ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = null;
+					$rating_value = null;
+					if (isset($rating['attribs']['']['scheme']))
+					{
+						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$rating_scheme = 'urn:simple';
+					}
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = 'urn:itunes';
+					$rating_value = null;
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = null;
+					$rating_value = null;
+					if (isset($rating['attribs']['']['scheme']))
+					{
+						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$rating_scheme = 'urn:simple';
+					}
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = 'urn:itunes';
+					$rating_value = null;
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			if (is_array($ratings_parent))
+			{
+				$ratings_parent = array_values(array_unique($ratings_parent));
+			}
+
+			// RESTRICTIONS
+			if ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = null;
+					$restriction_type = null;
+					$restriction_value = null;
+					if (isset($restriction['attribs']['']['relationship']))
+					{
+						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['attribs']['']['type']))
+					{
+						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['data']))
+					{
+						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = 'allow';
+					$restriction_type = null;
+					$restriction_value = 'itunes';
+					if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
+					{
+						$restriction_relationship = 'deny';
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = null;
+					$restriction_type = null;
+					$restriction_value = null;
+					if (isset($restriction['attribs']['']['relationship']))
+					{
+						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['attribs']['']['type']))
+					{
+						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['data']))
+					{
+						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = 'allow';
+					$restriction_type = null;
+					$restriction_value = 'itunes';
+					if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
+					{
+						$restriction_relationship = 'deny';
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			if (is_array($restrictions_parent))
+			{
+				$restrictions_parent = array_values(array_unique($restrictions_parent));
+			}
+			else
+			{
+				$restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
+			}
+
+			// THUMBNAILS
+			if ($thumbnails = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				foreach ($thumbnails as $thumbnail)
+				{
+					if (isset($thumbnail['attribs']['']['url']))
+					{
+						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+					}
+				}
+			}
+			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				foreach ($thumbnails as $thumbnail)
+				{
+					if (isset($thumbnail['attribs']['']['url']))
+					{
+						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+					}
+				}
+			}
+
+			// TITLES
+			if ($title_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			{
+				if (isset($title_parent[0]['data']))
+				{
+					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			{
+				if (isset($title_parent[0]['data']))
+				{
+					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+
+			// Clear the memory
+			unset($parent);
+
+			// Attributes
+			$bitrate = null;
+			$channels = null;
+			$duration = null;
+			$expression = null;
+			$framerate = null;
+			$height = null;
+			$javascript = null;
+			$lang = null;
+			$length = null;
+			$medium = null;
+			$samplingrate = null;
+			$type = null;
+			$url = null;
+			$width = null;
+
+			// Elements
+			$captions = null;
+			$categories = null;
+			$copyrights = null;
+			$credits = null;
+			$description = null;
+			$hashes = null;
+			$keywords = null;
+			$player = null;
+			$ratings = null;
+			$restrictions = null;
+			$thumbnails = null;
+			$title = null;
+
+			// If we have media:group tags, loop through them.
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
+			{
+				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+				{
+					// If we have media:content tags, loop through them.
+					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
+					{
+						if (isset($content['attribs']['']['url']))
+						{
+							// Attributes
+							$bitrate = null;
+							$channels = null;
+							$duration = null;
+							$expression = null;
+							$framerate = null;
+							$height = null;
+							$javascript = null;
+							$lang = null;
+							$length = null;
+							$medium = null;
+							$samplingrate = null;
+							$type = null;
+							$url = null;
+							$width = null;
+
+							// Elements
+							$captions = null;
+							$categories = null;
+							$copyrights = null;
+							$credits = null;
+							$description = null;
+							$hashes = null;
+							$keywords = null;
+							$player = null;
+							$ratings = null;
+							$restrictions = null;
+							$thumbnails = null;
+							$title = null;
+
+							// Start checking the attributes of media:content
+							if (isset($content['attribs']['']['bitrate']))
+							{
+								$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['channels']))
+							{
+								$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['duration']))
+							{
+								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							else
+							{
+								$duration = $duration_parent;
+							}
+							if (isset($content['attribs']['']['expression']))
+							{
+								$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['framerate']))
+							{
+								$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['height']))
+							{
+								$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['lang']))
+							{
+								$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['fileSize']))
+							{
+								$length = ceil($content['attribs']['']['fileSize']);
+							}
+							if (isset($content['attribs']['']['medium']))
+							{
+								$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['samplingrate']))
+							{
+								$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['type']))
+							{
+								$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['width']))
+							{
+								$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+
+							// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+							// CAPTIONS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+								{
+									$caption_type = null;
+									$caption_lang = null;
+									$caption_startTime = null;
+									$caption_endTime = null;
+									$caption_text = null;
+									if (isset($caption['attribs']['']['type']))
+									{
+										$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['lang']))
+									{
+										$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['start']))
+									{
+										$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['end']))
+									{
+										$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['data']))
+									{
+										$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+								}
+								if (is_array($captions))
+								{
+									$captions = array_values(array_unique($captions));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+								{
+									$caption_type = null;
+									$caption_lang = null;
+									$caption_startTime = null;
+									$caption_endTime = null;
+									$caption_text = null;
+									if (isset($caption['attribs']['']['type']))
+									{
+										$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['lang']))
+									{
+										$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['start']))
+									{
+										$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['end']))
+									{
+										$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['data']))
+									{
+										$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+								}
+								if (is_array($captions))
+								{
+									$captions = array_values(array_unique($captions));
+								}
+							}
+							else
+							{
+								$captions = $captions_parent;
+							}
+
+							// CATEGORIES
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+							{
+								foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+								{
+									$term = null;
+									$scheme = null;
+									$label = null;
+									if (isset($category['data']))
+									{
+										$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($category['attribs']['']['scheme']))
+									{
+										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$scheme = 'http://search.yahoo.com/mrss/category_schema';
+									}
+									if (isset($category['attribs']['']['label']))
+									{
+										$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+								}
+							}
+							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+							{
+								foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+								{
+									$term = null;
+									$scheme = null;
+									$label = null;
+									if (isset($category['data']))
+									{
+										$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($category['attribs']['']['scheme']))
+									{
+										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$scheme = 'http://search.yahoo.com/mrss/category_schema';
+									}
+									if (isset($category['attribs']['']['label']))
+									{
+										$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+								}
+							}
+							if (is_array($categories) && is_array($categories_parent))
+							{
+								$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
+							}
+							elseif (is_array($categories))
+							{
+								$categories = array_values(array_unique($categories));
+							}
+							elseif (is_array($categories_parent))
+							{
+								$categories = array_values(array_unique($categories_parent));
+							}
+
+							// COPYRIGHTS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							{
+								$copyright_url = null;
+								$copyright_label = null;
+								if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+								{
+									$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+								{
+									$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							{
+								$copyright_url = null;
+								$copyright_label = null;
+								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+								{
+									$copyright_url = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+								{
+									$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+							}
+							else
+							{
+								$copyrights = $copyrights_parent;
+							}
+
+							// CREDITS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+								{
+									$credit_role = null;
+									$credit_scheme = null;
+									$credit_name = null;
+									if (isset($credit['attribs']['']['role']))
+									{
+										$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($credit['attribs']['']['scheme']))
+									{
+										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$credit_scheme = 'urn:ebu';
+									}
+									if (isset($credit['data']))
+									{
+										$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+								}
+								if (is_array($credits))
+								{
+									$credits = array_values(array_unique($credits));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+								{
+									$credit_role = null;
+									$credit_scheme = null;
+									$credit_name = null;
+									if (isset($credit['attribs']['']['role']))
+									{
+										$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($credit['attribs']['']['scheme']))
+									{
+										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$credit_scheme = 'urn:ebu';
+									}
+									if (isset($credit['data']))
+									{
+										$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+								}
+								if (is_array($credits))
+								{
+									$credits = array_values(array_unique($credits));
+								}
+							}
+							else
+							{
+								$credits = $credits_parent;
+							}
+
+							// DESCRIPTION
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							{
+								$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							{
+								$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							else
+							{
+								$description = $description_parent;
+							}
+
+							// HASHES
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+								{
+									$value = null;
+									$algo = null;
+									if (isset($hash['data']))
+									{
+										$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($hash['attribs']['']['algo']))
+									{
+										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$algo = 'md5';
+									}
+									$hashes[] = $algo.':'.$value;
+								}
+								if (is_array($hashes))
+								{
+									$hashes = array_values(array_unique($hashes));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+								{
+									$value = null;
+									$algo = null;
+									if (isset($hash['data']))
+									{
+										$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($hash['attribs']['']['algo']))
+									{
+										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$algo = 'md5';
+									}
+									$hashes[] = $algo.':'.$value;
+								}
+								if (is_array($hashes))
+								{
+									$hashes = array_values(array_unique($hashes));
+								}
+							}
+							else
+							{
+								$hashes = $hashes_parent;
+							}
+
+							// KEYWORDS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							{
+								if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+								{
+									$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+									foreach ($temp as $word)
+									{
+										$keywords[] = trim($word);
+									}
+									unset($temp);
+								}
+								if (is_array($keywords))
+								{
+									$keywords = array_values(array_unique($keywords));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							{
+								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+								{
+									$temp = explode(',', $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+									foreach ($temp as $word)
+									{
+										$keywords[] = trim($word);
+									}
+									unset($temp);
+								}
+								if (is_array($keywords))
+								{
+									$keywords = array_values(array_unique($keywords));
+								}
+							}
+							else
+							{
+								$keywords = $keywords_parent;
+							}
+
+							// PLAYER
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							{
+								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							{
+								$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							else
+							{
+								$player = $player_parent;
+							}
+
+							// RATINGS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+								{
+									$rating_scheme = null;
+									$rating_value = null;
+									if (isset($rating['attribs']['']['scheme']))
+									{
+										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$rating_scheme = 'urn:simple';
+									}
+									if (isset($rating['data']))
+									{
+										$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+								}
+								if (is_array($ratings))
+								{
+									$ratings = array_values(array_unique($ratings));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+								{
+									$rating_scheme = null;
+									$rating_value = null;
+									if (isset($rating['attribs']['']['scheme']))
+									{
+										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$rating_scheme = 'urn:simple';
+									}
+									if (isset($rating['data']))
+									{
+										$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+								}
+								if (is_array($ratings))
+								{
+									$ratings = array_values(array_unique($ratings));
+								}
+							}
+							else
+							{
+								$ratings = $ratings_parent;
+							}
+
+							// RESTRICTIONS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+								{
+									$restriction_relationship = null;
+									$restriction_type = null;
+									$restriction_value = null;
+									if (isset($restriction['attribs']['']['relationship']))
+									{
+										$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['attribs']['']['type']))
+									{
+										$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['data']))
+									{
+										$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+								}
+								if (is_array($restrictions))
+								{
+									$restrictions = array_values(array_unique($restrictions));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+								{
+									$restriction_relationship = null;
+									$restriction_type = null;
+									$restriction_value = null;
+									if (isset($restriction['attribs']['']['relationship']))
+									{
+										$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['attribs']['']['type']))
+									{
+										$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['data']))
+									{
+										$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+								}
+								if (is_array($restrictions))
+								{
+									$restrictions = array_values(array_unique($restrictions));
+								}
+							}
+							else
+							{
+								$restrictions = $restrictions_parent;
+							}
+
+							// THUMBNAILS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+								{
+									$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								}
+								if (is_array($thumbnails))
+								{
+									$thumbnails = array_values(array_unique($thumbnails));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+								{
+									$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								}
+								if (is_array($thumbnails))
+								{
+									$thumbnails = array_values(array_unique($thumbnails));
+								}
+							}
+							else
+							{
+								$thumbnails = $thumbnails_parent;
+							}
+
+							// TITLES
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							{
+								$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							{
+								$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							else
+							{
+								$title = $title_parent;
+							}
+
+							$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width));
+						}
+					}
+				}
+			}
+
+			// If we have standalone media:content tags, loop through them.
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+			{
+				foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
+				{
+					if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+					{
+						// Attributes
+						$bitrate = null;
+						$channels = null;
+						$duration = null;
+						$expression = null;
+						$framerate = null;
+						$height = null;
+						$javascript = null;
+						$lang = null;
+						$length = null;
+						$medium = null;
+						$samplingrate = null;
+						$type = null;
+						$url = null;
+						$width = null;
+
+						// Elements
+						$captions = null;
+						$categories = null;
+						$copyrights = null;
+						$credits = null;
+						$description = null;
+						$hashes = null;
+						$keywords = null;
+						$player = null;
+						$ratings = null;
+						$restrictions = null;
+						$thumbnails = null;
+						$title = null;
+
+						// Start checking the attributes of media:content
+						if (isset($content['attribs']['']['bitrate']))
+						{
+							$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['channels']))
+						{
+							$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['duration']))
+						{
+							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$duration = $duration_parent;
+						}
+						if (isset($content['attribs']['']['expression']))
+						{
+							$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['framerate']))
+						{
+							$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['height']))
+						{
+							$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['lang']))
+						{
+							$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['fileSize']))
+						{
+							$length = ceil($content['attribs']['']['fileSize']);
+						}
+						if (isset($content['attribs']['']['medium']))
+						{
+							$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['samplingrate']))
+						{
+							$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['type']))
+						{
+							$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['width']))
+						{
+							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['url']))
+						{
+							$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+						// CAPTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+							{
+								$caption_type = null;
+								$caption_lang = null;
+								$caption_startTime = null;
+								$caption_endTime = null;
+								$caption_text = null;
+								if (isset($caption['attribs']['']['type']))
+								{
+									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['lang']))
+								{
+									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['start']))
+								{
+									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['end']))
+								{
+									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['data']))
+								{
+									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+							}
+							if (is_array($captions))
+							{
+								$captions = array_values(array_unique($captions));
+							}
+						}
+						else
+						{
+							$captions = $captions_parent;
+						}
+
+						// CATEGORIES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+						{
+							foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+							{
+								$term = null;
+								$scheme = null;
+								$label = null;
+								if (isset($category['data']))
+								{
+									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($category['attribs']['']['scheme']))
+								{
+									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$scheme = 'http://search.yahoo.com/mrss/category_schema';
+								}
+								if (isset($category['attribs']['']['label']))
+								{
+									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+							}
+						}
+						if (is_array($categories) && is_array($categories_parent))
+						{
+							$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
+						}
+						elseif (is_array($categories))
+						{
+							$categories = array_values(array_unique($categories));
+						}
+						elseif (is_array($categories_parent))
+						{
+							$categories = array_values(array_unique($categories_parent));
+						}
+						else
+						{
+							$categories = null;
+						}
+
+						// COPYRIGHTS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+						{
+							$copyright_url = null;
+							$copyright_label = null;
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+							{
+								$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+							{
+								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+						}
+						else
+						{
+							$copyrights = $copyrights_parent;
+						}
+
+						// CREDITS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+							{
+								$credit_role = null;
+								$credit_scheme = null;
+								$credit_name = null;
+								if (isset($credit['attribs']['']['role']))
+								{
+									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($credit['attribs']['']['scheme']))
+								{
+									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$credit_scheme = 'urn:ebu';
+								}
+								if (isset($credit['data']))
+								{
+									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+							}
+							if (is_array($credits))
+							{
+								$credits = array_values(array_unique($credits));
+							}
+						}
+						else
+						{
+							$credits = $credits_parent;
+						}
+
+						// DESCRIPTION
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+						{
+							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$description = $description_parent;
+						}
+
+						// HASHES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+							{
+								$value = null;
+								$algo = null;
+								if (isset($hash['data']))
+								{
+									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($hash['attribs']['']['algo']))
+								{
+									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$algo = 'md5';
+								}
+								$hashes[] = $algo.':'.$value;
+							}
+							if (is_array($hashes))
+							{
+								$hashes = array_values(array_unique($hashes));
+							}
+						}
+						else
+						{
+							$hashes = $hashes_parent;
+						}
+
+						// KEYWORDS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+						{
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+							{
+								$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+								foreach ($temp as $word)
+								{
+									$keywords[] = trim($word);
+								}
+								unset($temp);
+							}
+							if (is_array($keywords))
+							{
+								$keywords = array_values(array_unique($keywords));
+							}
+						}
+						else
+						{
+							$keywords = $keywords_parent;
+						}
+
+						// PLAYER
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+						{
+							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						else
+						{
+							$player = $player_parent;
+						}
+
+						// RATINGS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+							{
+								$rating_scheme = null;
+								$rating_value = null;
+								if (isset($rating['attribs']['']['scheme']))
+								{
+									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$rating_scheme = 'urn:simple';
+								}
+								if (isset($rating['data']))
+								{
+									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+							}
+							if (is_array($ratings))
+							{
+								$ratings = array_values(array_unique($ratings));
+							}
+						}
+						else
+						{
+							$ratings = $ratings_parent;
+						}
+
+						// RESTRICTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+							{
+								$restriction_relationship = null;
+								$restriction_type = null;
+								$restriction_value = null;
+								if (isset($restriction['attribs']['']['relationship']))
+								{
+									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['attribs']['']['type']))
+								{
+									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['data']))
+								{
+									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+							}
+							if (is_array($restrictions))
+							{
+								$restrictions = array_values(array_unique($restrictions));
+							}
+						}
+						else
+						{
+							$restrictions = $restrictions_parent;
+						}
+
+						// THUMBNAILS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+							{
+								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							if (is_array($thumbnails))
+							{
+								$thumbnails = array_values(array_unique($thumbnails));
+							}
+						}
+						else
+						{
+							$thumbnails = $thumbnails_parent;
+						}
+
+						// TITLES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+						{
+							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$title = $title_parent;
+						}
+
+						$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width));
+					}
+				}
+			}
+
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					if (isset($link['attribs']['']['type']))
+					{
+						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($link['attribs']['']['length']))
+					{
+						$length = ceil($link['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+				}
+			}
+
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					if (isset($link['attribs']['']['type']))
+					{
+						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($link['attribs']['']['length']))
+					{
+						$length = ceil($link['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+				}
+			}
+
+			if ($enclosure = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'enclosure'))
+			{
+				if (isset($enclosure[0]['attribs']['']['url']))
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0]));
+					if (isset($enclosure[0]['attribs']['']['type']))
+					{
+						$type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($enclosure[0]['attribs']['']['length']))
+					{
+						$length = ceil($enclosure[0]['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+				}
+			}
+
+			if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width))
+			{
+				// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+				$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+			}
+
+			$this->data['enclosures'] = array_values(array_unique($this->data['enclosures']));
+		}
+		if (!empty($this->data['enclosures']))
+		{
+			return $this->data['enclosures'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the latitude coordinates for the item
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:lat>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_latitude()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the longitude coordinates for the item
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_longitude()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the `<atom:source>` for the item
+	 *
+	 * @since 1.1
+	 * @return SimplePie_Source|null
+	 */
+	public function get_source()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
+		{
+			return $this->registry->create('Source', array($this, $return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Locator.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Locator.php
new file mode 100644
index 00000000..57e910c2
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Locator.php
@@ -0,0 +1,372 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used for feed auto-discovery
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_locator_class()}
+ *
+ * @package SimplePie
+ */
+class SimplePie_Locator
+{
+	var $useragent;
+	var $timeout;
+	var $file;
+	var $local = array();
+	var $elsewhere = array();
+	var $cached_entities = array();
+	var $http_base;
+	var $base;
+	var $base_location = 0;
+	var $checked_feeds = 0;
+	var $max_checked_feeds = 10;
+	protected $registry;
+
+	public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10)
+	{
+		$this->file = $file;
+		$this->useragent = $useragent;
+		$this->timeout = $timeout;
+		$this->max_checked_feeds = $max_checked_feeds;
+
+		if (class_exists('DOMDocument'))
+		{
+			$this->dom = new DOMDocument();
+
+			set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+			$this->dom->loadHTML($this->file->body);
+			restore_error_handler();
+		}
+		else
+		{
+			$this->dom = null;
+		}
+	}
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working)
+	{
+		if ($this->is_feed($this->file))
+		{
+			return $this->file;
+		}
+
+		if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
+		{
+			$sniffer = $this->registry->create('Content_Type_Sniffer', array($this->file));
+			if ($sniffer->get_type() !== 'text/html')
+			{
+				return null;
+			}
+		}
+
+		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
+		{
+			$this->get_base();
+		}
+
+		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
+		{
+			return $working[0];
+		}
+
+		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
+		{
+			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
+			{
+				return $working;
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
+			{
+				return $working;
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
+			{
+				return $working;
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
+			{
+				return $working;
+			}
+		}
+		return null;
+	}
+
+	public function is_feed($file)
+	{
+		if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
+		{
+			$sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
+			$sniffed = $sniffer->get_type();
+			if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public function get_base()
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+		$this->http_base = $this->file->url;
+		$this->base = $this->http_base;
+		$elements = $this->dom->getElementsByTagName('base');
+		foreach ($elements as $element)
+		{
+			if ($element->hasAttribute('href'))
+			{
+				$base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+				if ($base === false)
+				{
+					continue;
+				}
+				$this->base = $base;
+				$this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
+				break;
+			}
+		}
+	}
+
+	public function autodiscovery()
+	{
+		$done = array();
+		$feeds = array();
+		$feeds = array_merge($feeds, $this->search_elements_by_tag('link', $done, $feeds));
+		$feeds = array_merge($feeds, $this->search_elements_by_tag('a', $done, $feeds));
+		$feeds = array_merge($feeds, $this->search_elements_by_tag('area', $done, $feeds));
+
+		if (!empty($feeds))
+		{
+			return array_values($feeds);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	protected function search_elements_by_tag($name, &$done, $feeds)
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+
+		$links = $this->dom->getElementsByTagName($name);
+		foreach ($links as $link)
+		{
+			if ($this->checked_feeds === $this->max_checked_feeds)
+			{
+				break;
+			}
+			if ($link->hasAttribute('href') && $link->hasAttribute('rel'))
+			{
+				$rel = array_unique($this->registry->call('Misc', 'space_seperated_tokens', array(strtolower($link->getAttribute('rel')))));
+				$line = method_exists($link, 'getLineNo') ? $link->getLineNo() : 1;
+
+				if ($this->base_location < $line)
+				{
+					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
+				}
+				else
+				{
+					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
+				}
+				if ($href === false)
+				{
+					continue;
+				}
+
+				if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href]))
+				{
+					$this->checked_feeds++;
+					$headers = array(
+						'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+					);
+					$feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent));
+					if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
+					{
+						$feeds[$href] = $feed;
+					}
+				}
+				$done[] = $href;
+			}
+		}
+
+		return $feeds;
+	}
+
+	public function get_links()
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+
+		$links = $this->dom->getElementsByTagName('a');
+		foreach ($links as $link)
+		{
+			if ($link->hasAttribute('href'))
+			{
+				$href = trim($link->getAttribute('href'));
+				$parsed = $this->registry->call('Misc', 'parse_url', array($href));
+				if ($parsed['scheme'] === '' || preg_match('/^(http(s)|feed)?$/i', $parsed['scheme']))
+				{
+					if ($this->base_location < $link->getLineNo())
+					{
+						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
+					}
+					else
+					{
+						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
+					}
+					if ($href === false)
+					{
+						continue;
+					}
+
+					$current = $this->registry->call('Misc', 'parse_url', array($this->file->url));
+
+					if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
+					{
+						$this->local[] = $href;
+					}
+					else
+					{
+						$this->elsewhere[] = $href;
+					}
+				}
+			}
+		}
+		$this->local = array_unique($this->local);
+		$this->elsewhere = array_unique($this->elsewhere);
+		if (!empty($this->local) || !empty($this->elsewhere))
+		{
+			return true;
+		}
+		return null;
+	}
+
+	public function extension(&$array)
+	{
+		foreach ($array as $key => $value)
+		{
+			if ($this->checked_feeds === $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
+			{
+				$this->checked_feeds++;
+
+				$headers = array(
+					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+				);
+				$feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent));
+				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
+				{
+					return $feed;
+				}
+				else
+				{
+					unset($array[$key]);
+				}
+			}
+		}
+		return null;
+	}
+
+	public function body(&$array)
+	{
+		foreach ($array as $key => $value)
+		{
+			if ($this->checked_feeds === $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (preg_match('/(rss|rdf|atom|xml)/i', $value))
+			{
+				$this->checked_feeds++;
+				$headers = array(
+					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+				);
+				$feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent));
+				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
+				{
+					return $feed;
+				}
+				else
+				{
+					unset($array[$key]);
+				}
+			}
+		}
+		return null;
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Misc.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Misc.php
new file mode 100644
index 00000000..5d7367f6
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Misc.php
@@ -0,0 +1,2247 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Miscellanous utilities
+ *
+ * @package SimplePie
+ */
+class SimplePie_Misc
+{
+	public static function time_hms($seconds)
+	{
+		$time = '';
+
+		$hours = floor($seconds / 3600);
+		$remainder = $seconds % 3600;
+		if ($hours > 0)
+		{
+			$time .= $hours.':';
+		}
+
+		$minutes = floor($remainder / 60);
+		$seconds = $remainder % 60;
+		if ($minutes < 10 && $hours > 0)
+		{
+			$minutes = '0' . $minutes;
+		}
+		if ($seconds < 10)
+		{
+			$seconds = '0' . $seconds;
+		}
+
+		$time .= $minutes.':';
+		$time .= $seconds;
+
+		return $time;
+	}
+
+	public static function absolutize_url($relative, $base)
+	{
+		$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
+		if ($iri === false)
+		{
+			return false;
+		}
+		return $iri->get_uri();
+	}
+
+	/**
+	 * Get a HTML/XML element from a HTML string
+	 *
+	 * @deprecated Use DOMDocument instead (parsing HTML with regex is bad!)
+	 * @param string $realname Element name (including namespace prefix if applicable)
+	 * @param string $string HTML document
+	 * @return array
+	 */
+	public static function get_element($realname, $string)
+	{
+		$return = array();
+		$name = preg_quote($realname, '/');
+		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		{
+			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
+			{
+				$return[$i]['tag'] = $realname;
+				$return[$i]['full'] = $matches[$i][0][0];
+				$return[$i]['offset'] = $matches[$i][0][1];
+				if (strlen($matches[$i][3][0]) <= 2)
+				{
+					$return[$i]['self_closing'] = true;
+				}
+				else
+				{
+					$return[$i]['self_closing'] = false;
+					$return[$i]['content'] = $matches[$i][4][0];
+				}
+				$return[$i]['attribs'] = array();
+				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+				{
+					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
+					{
+						if (count($attribs[$j]) === 2)
+						{
+							$attribs[$j][2] = $attribs[$j][1];
+						}
+						$return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]), 'UTF-8');
+					}
+				}
+			}
+		}
+		return $return;
+	}
+
+	public static function element_implode($element)
+	{
+		$full = "<$element[tag]";
+		foreach ($element['attribs'] as $key => $value)
+		{
+			$key = strtolower($key);
+			$full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
+		}
+		if ($element['self_closing'])
+		{
+			$full .= ' />';
+		}
+		else
+		{
+			$full .= ">$element[content]</$element[tag]>";
+		}
+		return $full;
+	}
+
+	public static function error($message, $level, $file, $line)
+	{
+		if ((ini_get('error_reporting') & $level) > 0)
+		{
+			switch ($level)
+			{
+				case E_USER_ERROR:
+					$note = 'PHP Error';
+					break;
+				case E_USER_WARNING:
+					$note = 'PHP Warning';
+					break;
+				case E_USER_NOTICE:
+					$note = 'PHP Notice';
+					break;
+				default:
+					$note = 'Unknown Error';
+					break;
+			}
+
+			$log_error = true;
+			if (!function_exists('error_log'))
+			{
+				$log_error = false;
+			}
+
+			$log_file = @ini_get('error_log');
+			if (!empty($log_file) && ('syslog' !== $log_file) && !@is_writable($log_file))
+			{
+				$log_error = false;
+			}
+
+			if ($log_error)
+			{
+				@error_log("$note: $message in $file on line $line", 0);
+			}
+		}
+
+		return $message;
+	}
+
+	public static function fix_protocol($url, $http = 1)
+	{
+		$url = SimplePie_Misc::normalize_url($url);
+		$parsed = SimplePie_Misc::parse_url($url);
+		if ($parsed['scheme'] !== '' && $parsed['scheme'] !== 'http' && $parsed['scheme'] !== 'https')
+		{
+			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http);
+		}
+
+		if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url))
+		{
+			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http);
+		}
+
+		if ($http === 2 && $parsed['scheme'] !== '')
+		{
+			return "feed:$url";
+		}
+		elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
+		{
+			return substr_replace($url, 'podcast', 0, 4);
+		}
+		elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
+		{
+			return substr_replace($url, 'itpc', 0, 4);
+		}
+		else
+		{
+			return $url;
+		}
+	}
+
+	public static function parse_url($url)
+	{
+		$iri = new SimplePie_IRI($url);
+		return array(
+			'scheme' => (string) $iri->scheme,
+			'authority' => (string) $iri->authority,
+			'path' => (string) $iri->path,
+			'query' => (string) $iri->query,
+			'fragment' => (string) $iri->fragment
+		);
+	}
+
+	public static function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
+	{
+		$iri = new SimplePie_IRI('');
+		$iri->scheme = $scheme;
+		$iri->authority = $authority;
+		$iri->path = $path;
+		$iri->query = $query;
+		$iri->fragment = $fragment;
+		return $iri->get_uri();
+	}
+
+	public static function normalize_url($url)
+	{
+		$iri = new SimplePie_IRI($url);
+		return $iri->get_uri();
+	}
+
+	public static function percent_encoding_normalization($match)
+	{
+		$integer = hexdec($match[1]);
+		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
+		{
+			return chr($integer);
+		}
+		else
+		{
+			return strtoupper($match[0]);
+		}
+	}
+
+	/**
+	 * Converts a Windows-1252 encoded string to a UTF-8 encoded string
+	 *
+	 * @static
+	 * @param string $string Windows-1252 encoded string
+	 * @return string UTF-8 encoded string
+	 */
+	public static function windows_1252_to_utf8($string)
+	{
+		static $convert_table = array("\x80" => "\xE2\x82\xAC", "\x81" => "\xEF\xBF\xBD", "\x82" => "\xE2\x80\x9A", "\x83" => "\xC6\x92", "\x84" => "\xE2\x80\x9E", "\x85" => "\xE2\x80\xA6", "\x86" => "\xE2\x80\xA0", "\x87" => "\xE2\x80\xA1", "\x88" => "\xCB\x86", "\x89" => "\xE2\x80\xB0", "\x8A" => "\xC5\xA0", "\x8B" => "\xE2\x80\xB9", "\x8C" => "\xC5\x92", "\x8D" => "\xEF\xBF\xBD", "\x8E" => "\xC5\xBD", "\x8F" => "\xEF\xBF\xBD", "\x90" => "\xEF\xBF\xBD", "\x91" => "\xE2\x80\x98", "\x92" => "\xE2\x80\x99", "\x93" => "\xE2\x80\x9C", "\x94" => "\xE2\x80\x9D", "\x95" => "\xE2\x80\xA2", "\x96" => "\xE2\x80\x93", "\x97" => "\xE2\x80\x94", "\x98" => "\xCB\x9C", "\x99" => "\xE2\x84\xA2", "\x9A" => "\xC5\xA1", "\x9B" => "\xE2\x80\xBA", "\x9C" => "\xC5\x93", "\x9D" => "\xEF\xBF\xBD", "\x9E" => "\xC5\xBE", "\x9F" => "\xC5\xB8", "\xA0" => "\xC2\xA0", "\xA1" => "\xC2\xA1", "\xA2" => "\xC2\xA2", "\xA3" => "\xC2\xA3", "\xA4" => "\xC2\xA4", "\xA5" => "\xC2\xA5", "\xA6" => "\xC2\xA6", "\xA7" => "\xC2\xA7", "\xA8" => "\xC2\xA8", "\xA9" => "\xC2\xA9", "\xAA" => "\xC2\xAA", "\xAB" => "\xC2\xAB", "\xAC" => "\xC2\xAC", "\xAD" => "\xC2\xAD", "\xAE" => "\xC2\xAE", "\xAF" => "\xC2\xAF", "\xB0" => "\xC2\xB0", "\xB1" => "\xC2\xB1", "\xB2" => "\xC2\xB2", "\xB3" => "\xC2\xB3", "\xB4" => "\xC2\xB4", "\xB5" => "\xC2\xB5", "\xB6" => "\xC2\xB6", "\xB7" => "\xC2\xB7", "\xB8" => "\xC2\xB8", "\xB9" => "\xC2\xB9", "\xBA" => "\xC2\xBA", "\xBB" => "\xC2\xBB", "\xBC" => "\xC2\xBC", "\xBD" => "\xC2\xBD", "\xBE" => "\xC2\xBE", "\xBF" => "\xC2\xBF", "\xC0" => "\xC3\x80", "\xC1" => "\xC3\x81", "\xC2" => "\xC3\x82", "\xC3" => "\xC3\x83", "\xC4" => "\xC3\x84", "\xC5" => "\xC3\x85", "\xC6" => "\xC3\x86", "\xC7" => "\xC3\x87", "\xC8" => "\xC3\x88", "\xC9" => "\xC3\x89", "\xCA" => "\xC3\x8A", "\xCB" => "\xC3\x8B", "\xCC" => "\xC3\x8C", "\xCD" => "\xC3\x8D", "\xCE" => "\xC3\x8E", "\xCF" => "\xC3\x8F", "\xD0" => "\xC3\x90", "\xD1" => "\xC3\x91", "\xD2" => "\xC3\x92", "\xD3" => "\xC3\x93", "\xD4" => "\xC3\x94", "\xD5" => "\xC3\x95", "\xD6" => "\xC3\x96", "\xD7" => "\xC3\x97", "\xD8" => "\xC3\x98", "\xD9" => "\xC3\x99", "\xDA" => "\xC3\x9A", "\xDB" => "\xC3\x9B", "\xDC" => "\xC3\x9C", "\xDD" => "\xC3\x9D", "\xDE" => "\xC3\x9E", "\xDF" => "\xC3\x9F", "\xE0" => "\xC3\xA0", "\xE1" => "\xC3\xA1", "\xE2" => "\xC3\xA2", "\xE3" => "\xC3\xA3", "\xE4" => "\xC3\xA4", "\xE5" => "\xC3\xA5", "\xE6" => "\xC3\xA6", "\xE7" => "\xC3\xA7", "\xE8" => "\xC3\xA8", "\xE9" => "\xC3\xA9", "\xEA" => "\xC3\xAA", "\xEB" => "\xC3\xAB", "\xEC" => "\xC3\xAC", "\xED" => "\xC3\xAD", "\xEE" => "\xC3\xAE", "\xEF" => "\xC3\xAF", "\xF0" => "\xC3\xB0", "\xF1" => "\xC3\xB1", "\xF2" => "\xC3\xB2", "\xF3" => "\xC3\xB3", "\xF4" => "\xC3\xB4", "\xF5" => "\xC3\xB5", "\xF6" => "\xC3\xB6", "\xF7" => "\xC3\xB7", "\xF8" => "\xC3\xB8", "\xF9" => "\xC3\xB9", "\xFA" => "\xC3\xBA", "\xFB" => "\xC3\xBB", "\xFC" => "\xC3\xBC", "\xFD" => "\xC3\xBD", "\xFE" => "\xC3\xBE", "\xFF" => "\xC3\xBF");
+
+		return strtr($string, $convert_table);
+	}
+
+	/**
+	 * Change a string from one encoding to another
+	 *
+	 * @param string $data Raw data in $input encoding
+	 * @param string $input Encoding of $data
+	 * @param string $output Encoding you want
+	 * @return string|boolean False if we can't convert it
+	 */
+	public static function change_encoding($data, $input, $output)
+	{
+		$input = SimplePie_Misc::encoding($input);
+		$output = SimplePie_Misc::encoding($output);
+
+		// We fail to fail on non US-ASCII bytes
+		if ($input === 'US-ASCII')
+		{
+			static $non_ascii_octects = '';
+			if (!$non_ascii_octects)
+			{
+				for ($i = 0x80; $i <= 0xFF; $i++)
+				{
+					$non_ascii_octects .= chr($i);
+				}
+			}
+			$data = substr($data, 0, strcspn($data, $non_ascii_octects));
+		}
+
+		// This is first, as behaviour of this is completely predictable
+		if ($input === 'windows-1252' && $output === 'UTF-8')
+		{
+			return SimplePie_Misc::windows_1252_to_utf8($data);
+		}
+		// This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported).
+		elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output)))
+		{
+			return $return;
+ 		}
+		// This is last, as behaviour of this varies with OS userland and PHP version
+		elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
+		{
+			return $return;
+		}
+		// If we can't do anything, just fail
+		else
+		{
+			return false;
+		}
+	}
+
+	protected static function change_encoding_mbstring($data, $input, $output)
+	{
+		if ($input === 'windows-949')
+		{
+			$input = 'EUC-KR';
+		}
+		if ($output === 'windows-949')
+		{
+			$output = 'EUC-KR';
+		}
+		if ($input === 'Windows-31J')
+		{
+			$input = 'SJIS';
+		}
+		if ($output === 'Windows-31J')
+		{
+			$output = 'SJIS';
+		}
+
+		// Check that the encoding is supported
+		if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80")
+		{
+			return false;
+		}
+		if (!in_array($input, mb_list_encodings()))
+		{
+			return false;
+		}
+
+		// Let's do some conversion
+		if ($return = @mb_convert_encoding($data, $output, $input))
+		{
+			return $return;
+		}
+
+		return false;
+	}
+
+	protected static function change_encoding_iconv($data, $input, $output)
+	{
+		return @iconv($input, $output, $data);
+	}
+
+	/**
+	 * Normalize an encoding name
+	 *
+	 * This is automatically generated by create.php
+	 *
+	 * To generate it, run `php create.php` on the command line, and copy the
+	 * output to replace this function.
+	 *
+	 * @param string $charset Character set to standardise
+	 * @return string Standardised name
+	 */
+	public static function encoding($charset)
+	{
+		// Normalization from UTS #22
+		switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset)))
+		{
+			case 'adobestandardencoding':
+			case 'csadobestandardencoding':
+				return 'Adobe-Standard-Encoding';
+
+			case 'adobesymbolencoding':
+			case 'cshppsmath':
+				return 'Adobe-Symbol-Encoding';
+
+			case 'ami1251':
+			case 'amiga1251':
+				return 'Amiga-1251';
+
+			case 'ansix31101983':
+			case 'csat5001983':
+			case 'csiso99naplps':
+			case 'isoir99':
+			case 'naplps':
+				return 'ANSI_X3.110-1983';
+
+			case 'arabic7':
+			case 'asmo449':
+			case 'csiso89asmo449':
+			case 'iso9036':
+			case 'isoir89':
+				return 'ASMO_449';
+
+			case 'big5':
+			case 'csbig5':
+				return 'Big5';
+
+			case 'big5hkscs':
+				return 'Big5-HKSCS';
+
+			case 'bocu1':
+			case 'csbocu1':
+				return 'BOCU-1';
+
+			case 'brf':
+			case 'csbrf':
+				return 'BRF';
+
+			case 'bs4730':
+			case 'csiso4unitedkingdom':
+			case 'gb':
+			case 'iso646gb':
+			case 'isoir4':
+			case 'uk':
+				return 'BS_4730';
+
+			case 'bsviewdata':
+			case 'csiso47bsviewdata':
+			case 'isoir47':
+				return 'BS_viewdata';
+
+			case 'cesu8':
+			case 'cscesu8':
+				return 'CESU-8';
+
+			case 'ca':
+			case 'csa71':
+			case 'csaz243419851':
+			case 'csiso121canadian1':
+			case 'iso646ca':
+			case 'isoir121':
+				return 'CSA_Z243.4-1985-1';
+
+			case 'csa72':
+			case 'csaz243419852':
+			case 'csiso122canadian2':
+			case 'iso646ca2':
+			case 'isoir122':
+				return 'CSA_Z243.4-1985-2';
+
+			case 'csaz24341985gr':
+			case 'csiso123csaz24341985gr':
+			case 'isoir123':
+				return 'CSA_Z243.4-1985-gr';
+
+			case 'csiso139csn369103':
+			case 'csn369103':
+			case 'isoir139':
+				return 'CSN_369103';
+
+			case 'csdecmcs':
+			case 'dec':
+			case 'decmcs':
+				return 'DEC-MCS';
+
+			case 'csiso21german':
+			case 'de':
+			case 'din66003':
+			case 'iso646de':
+			case 'isoir21':
+				return 'DIN_66003';
+
+			case 'csdkus':
+			case 'dkus':
+				return 'dk-us';
+
+			case 'csiso646danish':
+			case 'dk':
+			case 'ds2089':
+			case 'iso646dk':
+				return 'DS_2089';
+
+			case 'csibmebcdicatde':
+			case 'ebcdicatde':
+				return 'EBCDIC-AT-DE';
+
+			case 'csebcdicatdea':
+			case 'ebcdicatdea':
+				return 'EBCDIC-AT-DE-A';
+
+			case 'csebcdiccafr':
+			case 'ebcdiccafr':
+				return 'EBCDIC-CA-FR';
+
+			case 'csebcdicdkno':
+			case 'ebcdicdkno':
+				return 'EBCDIC-DK-NO';
+
+			case 'csebcdicdknoa':
+			case 'ebcdicdknoa':
+				return 'EBCDIC-DK-NO-A';
+
+			case 'csebcdices':
+			case 'ebcdices':
+				return 'EBCDIC-ES';
+
+			case 'csebcdicesa':
+			case 'ebcdicesa':
+				return 'EBCDIC-ES-A';
+
+			case 'csebcdicess':
+			case 'ebcdicess':
+				return 'EBCDIC-ES-S';
+
+			case 'csebcdicfise':
+			case 'ebcdicfise':
+				return 'EBCDIC-FI-SE';
+
+			case 'csebcdicfisea':
+			case 'ebcdicfisea':
+				return 'EBCDIC-FI-SE-A';
+
+			case 'csebcdicfr':
+			case 'ebcdicfr':
+				return 'EBCDIC-FR';
+
+			case 'csebcdicit':
+			case 'ebcdicit':
+				return 'EBCDIC-IT';
+
+			case 'csebcdicpt':
+			case 'ebcdicpt':
+				return 'EBCDIC-PT';
+
+			case 'csebcdicuk':
+			case 'ebcdicuk':
+				return 'EBCDIC-UK';
+
+			case 'csebcdicus':
+			case 'ebcdicus':
+				return 'EBCDIC-US';
+
+			case 'csiso111ecmacyrillic':
+			case 'ecmacyrillic':
+			case 'isoir111':
+			case 'koi8e':
+				return 'ECMA-cyrillic';
+
+			case 'csiso17spanish':
+			case 'es':
+			case 'iso646es':
+			case 'isoir17':
+				return 'ES';
+
+			case 'csiso85spanish2':
+			case 'es2':
+			case 'iso646es2':
+			case 'isoir85':
+				return 'ES2';
+
+			case 'cseucpkdfmtjapanese':
+			case 'eucjp':
+			case 'extendedunixcodepackedformatforjapanese':
+				return 'EUC-JP';
+
+			case 'cseucfixwidjapanese':
+			case 'extendedunixcodefixedwidthforjapanese':
+				return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
+
+			case 'gb18030':
+				return 'GB18030';
+
+			case 'chinese':
+			case 'cp936':
+			case 'csgb2312':
+			case 'csiso58gb231280':
+			case 'gb2312':
+			case 'gb231280':
+			case 'gbk':
+			case 'isoir58':
+			case 'ms936':
+			case 'windows936':
+				return 'GBK';
+
+			case 'cn':
+			case 'csiso57gb1988':
+			case 'gb198880':
+			case 'iso646cn':
+			case 'isoir57':
+				return 'GB_1988-80';
+
+			case 'csiso153gost1976874':
+			case 'gost1976874':
+			case 'isoir153':
+			case 'stsev35888':
+				return 'GOST_19768-74';
+
+			case 'csiso150':
+			case 'csiso150greekccitt':
+			case 'greekccitt':
+			case 'isoir150':
+				return 'greek-ccitt';
+
+			case 'csiso88greek7':
+			case 'greek7':
+			case 'isoir88':
+				return 'greek7';
+
+			case 'csiso18greek7old':
+			case 'greek7old':
+			case 'isoir18':
+				return 'greek7-old';
+
+			case 'cshpdesktop':
+			case 'hpdesktop':
+				return 'HP-DeskTop';
+
+			case 'cshplegal':
+			case 'hplegal':
+				return 'HP-Legal';
+
+			case 'cshpmath8':
+			case 'hpmath8':
+				return 'HP-Math8';
+
+			case 'cshppifont':
+			case 'hppifont':
+				return 'HP-Pi-font';
+
+			case 'cshproman8':
+			case 'hproman8':
+			case 'r8':
+			case 'roman8':
+				return 'hp-roman8';
+
+			case 'hzgb2312':
+				return 'HZ-GB-2312';
+
+			case 'csibmsymbols':
+			case 'ibmsymbols':
+				return 'IBM-Symbols';
+
+			case 'csibmthai':
+			case 'ibmthai':
+				return 'IBM-Thai';
+
+			case 'cp37':
+			case 'csibm37':
+			case 'ebcdiccpca':
+			case 'ebcdiccpnl':
+			case 'ebcdiccpus':
+			case 'ebcdiccpwt':
+			case 'ibm37':
+				return 'IBM037';
+
+			case 'cp38':
+			case 'csibm38':
+			case 'ebcdicint':
+			case 'ibm38':
+				return 'IBM038';
+
+			case 'cp273':
+			case 'csibm273':
+			case 'ibm273':
+				return 'IBM273';
+
+			case 'cp274':
+			case 'csibm274':
+			case 'ebcdicbe':
+			case 'ibm274':
+				return 'IBM274';
+
+			case 'cp275':
+			case 'csibm275':
+			case 'ebcdicbr':
+			case 'ibm275':
+				return 'IBM275';
+
+			case 'csibm277':
+			case 'ebcdiccpdk':
+			case 'ebcdiccpno':
+			case 'ibm277':
+				return 'IBM277';
+
+			case 'cp278':
+			case 'csibm278':
+			case 'ebcdiccpfi':
+			case 'ebcdiccpse':
+			case 'ibm278':
+				return 'IBM278';
+
+			case 'cp280':
+			case 'csibm280':
+			case 'ebcdiccpit':
+			case 'ibm280':
+				return 'IBM280';
+
+			case 'cp281':
+			case 'csibm281':
+			case 'ebcdicjpe':
+			case 'ibm281':
+				return 'IBM281';
+
+			case 'cp284':
+			case 'csibm284':
+			case 'ebcdiccpes':
+			case 'ibm284':
+				return 'IBM284';
+
+			case 'cp285':
+			case 'csibm285':
+			case 'ebcdiccpgb':
+			case 'ibm285':
+				return 'IBM285';
+
+			case 'cp290':
+			case 'csibm290':
+			case 'ebcdicjpkana':
+			case 'ibm290':
+				return 'IBM290';
+
+			case 'cp297':
+			case 'csibm297':
+			case 'ebcdiccpfr':
+			case 'ibm297':
+				return 'IBM297';
+
+			case 'cp420':
+			case 'csibm420':
+			case 'ebcdiccpar1':
+			case 'ibm420':
+				return 'IBM420';
+
+			case 'cp423':
+			case 'csibm423':
+			case 'ebcdiccpgr':
+			case 'ibm423':
+				return 'IBM423';
+
+			case 'cp424':
+			case 'csibm424':
+			case 'ebcdiccphe':
+			case 'ibm424':
+				return 'IBM424';
+
+			case '437':
+			case 'cp437':
+			case 'cspc8codepage437':
+			case 'ibm437':
+				return 'IBM437';
+
+			case 'cp500':
+			case 'csibm500':
+			case 'ebcdiccpbe':
+			case 'ebcdiccpch':
+			case 'ibm500':
+				return 'IBM500';
+
+			case 'cp775':
+			case 'cspc775baltic':
+			case 'ibm775':
+				return 'IBM775';
+
+			case '850':
+			case 'cp850':
+			case 'cspc850multilingual':
+			case 'ibm850':
+				return 'IBM850';
+
+			case '851':
+			case 'cp851':
+			case 'csibm851':
+			case 'ibm851':
+				return 'IBM851';
+
+			case '852':
+			case 'cp852':
+			case 'cspcp852':
+			case 'ibm852':
+				return 'IBM852';
+
+			case '855':
+			case 'cp855':
+			case 'csibm855':
+			case 'ibm855':
+				return 'IBM855';
+
+			case '857':
+			case 'cp857':
+			case 'csibm857':
+			case 'ibm857':
+				return 'IBM857';
+
+			case 'ccsid858':
+			case 'cp858':
+			case 'ibm858':
+			case 'pcmultilingual850euro':
+				return 'IBM00858';
+
+			case '860':
+			case 'cp860':
+			case 'csibm860':
+			case 'ibm860':
+				return 'IBM860';
+
+			case '861':
+			case 'cp861':
+			case 'cpis':
+			case 'csibm861':
+			case 'ibm861':
+				return 'IBM861';
+
+			case '862':
+			case 'cp862':
+			case 'cspc862latinhebrew':
+			case 'ibm862':
+				return 'IBM862';
+
+			case '863':
+			case 'cp863':
+			case 'csibm863':
+			case 'ibm863':
+				return 'IBM863';
+
+			case 'cp864':
+			case 'csibm864':
+			case 'ibm864':
+				return 'IBM864';
+
+			case '865':
+			case 'cp865':
+			case 'csibm865':
+			case 'ibm865':
+				return 'IBM865';
+
+			case '866':
+			case 'cp866':
+			case 'csibm866':
+			case 'ibm866':
+				return 'IBM866';
+
+			case 'cp868':
+			case 'cpar':
+			case 'csibm868':
+			case 'ibm868':
+				return 'IBM868';
+
+			case '869':
+			case 'cp869':
+			case 'cpgr':
+			case 'csibm869':
+			case 'ibm869':
+				return 'IBM869';
+
+			case 'cp870':
+			case 'csibm870':
+			case 'ebcdiccproece':
+			case 'ebcdiccpyu':
+			case 'ibm870':
+				return 'IBM870';
+
+			case 'cp871':
+			case 'csibm871':
+			case 'ebcdiccpis':
+			case 'ibm871':
+				return 'IBM871';
+
+			case 'cp880':
+			case 'csibm880':
+			case 'ebcdiccyrillic':
+			case 'ibm880':
+				return 'IBM880';
+
+			case 'cp891':
+			case 'csibm891':
+			case 'ibm891':
+				return 'IBM891';
+
+			case 'cp903':
+			case 'csibm903':
+			case 'ibm903':
+				return 'IBM903';
+
+			case '904':
+			case 'cp904':
+			case 'csibbm904':
+			case 'ibm904':
+				return 'IBM904';
+
+			case 'cp905':
+			case 'csibm905':
+			case 'ebcdiccptr':
+			case 'ibm905':
+				return 'IBM905';
+
+			case 'cp918':
+			case 'csibm918':
+			case 'ebcdiccpar2':
+			case 'ibm918':
+				return 'IBM918';
+
+			case 'ccsid924':
+			case 'cp924':
+			case 'ebcdiclatin9euro':
+			case 'ibm924':
+				return 'IBM00924';
+
+			case 'cp1026':
+			case 'csibm1026':
+			case 'ibm1026':
+				return 'IBM1026';
+
+			case 'ibm1047':
+				return 'IBM1047';
+
+			case 'ccsid1140':
+			case 'cp1140':
+			case 'ebcdicus37euro':
+			case 'ibm1140':
+				return 'IBM01140';
+
+			case 'ccsid1141':
+			case 'cp1141':
+			case 'ebcdicde273euro':
+			case 'ibm1141':
+				return 'IBM01141';
+
+			case 'ccsid1142':
+			case 'cp1142':
+			case 'ebcdicdk277euro':
+			case 'ebcdicno277euro':
+			case 'ibm1142':
+				return 'IBM01142';
+
+			case 'ccsid1143':
+			case 'cp1143':
+			case 'ebcdicfi278euro':
+			case 'ebcdicse278euro':
+			case 'ibm1143':
+				return 'IBM01143';
+
+			case 'ccsid1144':
+			case 'cp1144':
+			case 'ebcdicit280euro':
+			case 'ibm1144':
+				return 'IBM01144';
+
+			case 'ccsid1145':
+			case 'cp1145':
+			case 'ebcdices284euro':
+			case 'ibm1145':
+				return 'IBM01145';
+
+			case 'ccsid1146':
+			case 'cp1146':
+			case 'ebcdicgb285euro':
+			case 'ibm1146':
+				return 'IBM01146';
+
+			case 'ccsid1147':
+			case 'cp1147':
+			case 'ebcdicfr297euro':
+			case 'ibm1147':
+				return 'IBM01147';
+
+			case 'ccsid1148':
+			case 'cp1148':
+			case 'ebcdicinternational500euro':
+			case 'ibm1148':
+				return 'IBM01148';
+
+			case 'ccsid1149':
+			case 'cp1149':
+			case 'ebcdicis871euro':
+			case 'ibm1149':
+				return 'IBM01149';
+
+			case 'csiso143iecp271':
+			case 'iecp271':
+			case 'isoir143':
+				return 'IEC_P27-1';
+
+			case 'csiso49inis':
+			case 'inis':
+			case 'isoir49':
+				return 'INIS';
+
+			case 'csiso50inis8':
+			case 'inis8':
+			case 'isoir50':
+				return 'INIS-8';
+
+			case 'csiso51iniscyrillic':
+			case 'iniscyrillic':
+			case 'isoir51':
+				return 'INIS-cyrillic';
+
+			case 'csinvariant':
+			case 'invariant':
+				return 'INVARIANT';
+
+			case 'iso2022cn':
+				return 'ISO-2022-CN';
+
+			case 'iso2022cnext':
+				return 'ISO-2022-CN-EXT';
+
+			case 'csiso2022jp':
+			case 'iso2022jp':
+				return 'ISO-2022-JP';
+
+			case 'csiso2022jp2':
+			case 'iso2022jp2':
+				return 'ISO-2022-JP-2';
+
+			case 'csiso2022kr':
+			case 'iso2022kr':
+				return 'ISO-2022-KR';
+
+			case 'cswindows30latin1':
+			case 'iso88591windows30latin1':
+				return 'ISO-8859-1-Windows-3.0-Latin-1';
+
+			case 'cswindows31latin1':
+			case 'iso88591windows31latin1':
+				return 'ISO-8859-1-Windows-3.1-Latin-1';
+
+			case 'csisolatin2':
+			case 'iso88592':
+			case 'iso885921987':
+			case 'isoir101':
+			case 'l2':
+			case 'latin2':
+				return 'ISO-8859-2';
+
+			case 'cswindows31latin2':
+			case 'iso88592windowslatin2':
+				return 'ISO-8859-2-Windows-Latin-2';
+
+			case 'csisolatin3':
+			case 'iso88593':
+			case 'iso885931988':
+			case 'isoir109':
+			case 'l3':
+			case 'latin3':
+				return 'ISO-8859-3';
+
+			case 'csisolatin4':
+			case 'iso88594':
+			case 'iso885941988':
+			case 'isoir110':
+			case 'l4':
+			case 'latin4':
+				return 'ISO-8859-4';
+
+			case 'csisolatincyrillic':
+			case 'cyrillic':
+			case 'iso88595':
+			case 'iso885951988':
+			case 'isoir144':
+				return 'ISO-8859-5';
+
+			case 'arabic':
+			case 'asmo708':
+			case 'csisolatinarabic':
+			case 'ecma114':
+			case 'iso88596':
+			case 'iso885961987':
+			case 'isoir127':
+				return 'ISO-8859-6';
+
+			case 'csiso88596e':
+			case 'iso88596e':
+				return 'ISO-8859-6-E';
+
+			case 'csiso88596i':
+			case 'iso88596i':
+				return 'ISO-8859-6-I';
+
+			case 'csisolatingreek':
+			case 'ecma118':
+			case 'elot928':
+			case 'greek':
+			case 'greek8':
+			case 'iso88597':
+			case 'iso885971987':
+			case 'isoir126':
+				return 'ISO-8859-7';
+
+			case 'csisolatinhebrew':
+			case 'hebrew':
+			case 'iso88598':
+			case 'iso885981988':
+			case 'isoir138':
+				return 'ISO-8859-8';
+
+			case 'csiso88598e':
+			case 'iso88598e':
+				return 'ISO-8859-8-E';
+
+			case 'csiso88598i':
+			case 'iso88598i':
+				return 'ISO-8859-8-I';
+
+			case 'cswindows31latin5':
+			case 'iso88599windowslatin5':
+				return 'ISO-8859-9-Windows-Latin-5';
+
+			case 'csisolatin6':
+			case 'iso885910':
+			case 'iso8859101992':
+			case 'isoir157':
+			case 'l6':
+			case 'latin6':
+				return 'ISO-8859-10';
+
+			case 'iso885913':
+				return 'ISO-8859-13';
+
+			case 'iso885914':
+			case 'iso8859141998':
+			case 'isoceltic':
+			case 'isoir199':
+			case 'l8':
+			case 'latin8':
+				return 'ISO-8859-14';
+
+			case 'iso885915':
+			case 'latin9':
+				return 'ISO-8859-15';
+
+			case 'iso885916':
+			case 'iso8859162001':
+			case 'isoir226':
+			case 'l10':
+			case 'latin10':
+				return 'ISO-8859-16';
+
+			case 'iso10646j1':
+				return 'ISO-10646-J-1';
+
+			case 'csunicode':
+			case 'iso10646ucs2':
+				return 'ISO-10646-UCS-2';
+
+			case 'csucs4':
+			case 'iso10646ucs4':
+				return 'ISO-10646-UCS-4';
+
+			case 'csunicodeascii':
+			case 'iso10646ucsbasic':
+				return 'ISO-10646-UCS-Basic';
+
+			case 'csunicodelatin1':
+			case 'iso10646':
+			case 'iso10646unicodelatin1':
+				return 'ISO-10646-Unicode-Latin1';
+
+			case 'csiso10646utf1':
+			case 'iso10646utf1':
+				return 'ISO-10646-UTF-1';
+
+			case 'csiso115481':
+			case 'iso115481':
+			case 'isotr115481':
+				return 'ISO-11548-1';
+
+			case 'csiso90':
+			case 'isoir90':
+				return 'iso-ir-90';
+
+			case 'csunicodeibm1261':
+			case 'isounicodeibm1261':
+				return 'ISO-Unicode-IBM-1261';
+
+			case 'csunicodeibm1264':
+			case 'isounicodeibm1264':
+				return 'ISO-Unicode-IBM-1264';
+
+			case 'csunicodeibm1265':
+			case 'isounicodeibm1265':
+				return 'ISO-Unicode-IBM-1265';
+
+			case 'csunicodeibm1268':
+			case 'isounicodeibm1268':
+				return 'ISO-Unicode-IBM-1268';
+
+			case 'csunicodeibm1276':
+			case 'isounicodeibm1276':
+				return 'ISO-Unicode-IBM-1276';
+
+			case 'csiso646basic1983':
+			case 'iso646basic1983':
+			case 'ref':
+				return 'ISO_646.basic:1983';
+
+			case 'csiso2intlrefversion':
+			case 'irv':
+			case 'iso646irv1983':
+			case 'isoir2':
+				return 'ISO_646.irv:1983';
+
+			case 'csiso2033':
+			case 'e13b':
+			case 'iso20331983':
+			case 'isoir98':
+				return 'ISO_2033-1983';
+
+			case 'csiso5427cyrillic':
+			case 'iso5427':
+			case 'isoir37':
+				return 'ISO_5427';
+
+			case 'iso5427cyrillic1981':
+			case 'iso54271981':
+			case 'isoir54':
+				return 'ISO_5427:1981';
+
+			case 'csiso5428greek':
+			case 'iso54281980':
+			case 'isoir55':
+				return 'ISO_5428:1980';
+
+			case 'csiso6937add':
+			case 'iso6937225':
+			case 'isoir152':
+				return 'ISO_6937-2-25';
+
+			case 'csisotextcomm':
+			case 'iso69372add':
+			case 'isoir142':
+				return 'ISO_6937-2-add';
+
+			case 'csiso8859supp':
+			case 'iso8859supp':
+			case 'isoir154':
+			case 'latin125':
+				return 'ISO_8859-supp';
+
+			case 'csiso10367box':
+			case 'iso10367box':
+			case 'isoir155':
+				return 'ISO_10367-box';
+
+			case 'csiso15italian':
+			case 'iso646it':
+			case 'isoir15':
+			case 'it':
+				return 'IT';
+
+			case 'csiso13jisc6220jp':
+			case 'isoir13':
+			case 'jisc62201969':
+			case 'jisc62201969jp':
+			case 'katakana':
+			case 'x2017':
+				return 'JIS_C6220-1969-jp';
+
+			case 'csiso14jisc6220ro':
+			case 'iso646jp':
+			case 'isoir14':
+			case 'jisc62201969ro':
+			case 'jp':
+				return 'JIS_C6220-1969-ro';
+
+			case 'csiso42jisc62261978':
+			case 'isoir42':
+			case 'jisc62261978':
+				return 'JIS_C6226-1978';
+
+			case 'csiso87jisx208':
+			case 'isoir87':
+			case 'jisc62261983':
+			case 'jisx2081983':
+			case 'x208':
+				return 'JIS_C6226-1983';
+
+			case 'csiso91jisc62291984a':
+			case 'isoir91':
+			case 'jisc62291984a':
+			case 'jpocra':
+				return 'JIS_C6229-1984-a';
+
+			case 'csiso92jisc62991984b':
+			case 'iso646jpocrb':
+			case 'isoir92':
+			case 'jisc62291984b':
+			case 'jpocrb':
+				return 'JIS_C6229-1984-b';
+
+			case 'csiso93jis62291984badd':
+			case 'isoir93':
+			case 'jisc62291984badd':
+			case 'jpocrbadd':
+				return 'JIS_C6229-1984-b-add';
+
+			case 'csiso94jis62291984hand':
+			case 'isoir94':
+			case 'jisc62291984hand':
+			case 'jpocrhand':
+				return 'JIS_C6229-1984-hand';
+
+			case 'csiso95jis62291984handadd':
+			case 'isoir95':
+			case 'jisc62291984handadd':
+			case 'jpocrhandadd':
+				return 'JIS_C6229-1984-hand-add';
+
+			case 'csiso96jisc62291984kana':
+			case 'isoir96':
+			case 'jisc62291984kana':
+				return 'JIS_C6229-1984-kana';
+
+			case 'csjisencoding':
+			case 'jisencoding':
+				return 'JIS_Encoding';
+
+			case 'cshalfwidthkatakana':
+			case 'jisx201':
+			case 'x201':
+				return 'JIS_X0201';
+
+			case 'csiso159jisx2121990':
+			case 'isoir159':
+			case 'jisx2121990':
+			case 'x212':
+				return 'JIS_X0212-1990';
+
+			case 'csiso141jusib1002':
+			case 'iso646yu':
+			case 'isoir141':
+			case 'js':
+			case 'jusib1002':
+			case 'yu':
+				return 'JUS_I.B1.002';
+
+			case 'csiso147macedonian':
+			case 'isoir147':
+			case 'jusib1003mac':
+			case 'macedonian':
+				return 'JUS_I.B1.003-mac';
+
+			case 'csiso146serbian':
+			case 'isoir146':
+			case 'jusib1003serb':
+			case 'serbian':
+				return 'JUS_I.B1.003-serb';
+
+			case 'koi7switched':
+				return 'KOI7-switched';
+
+			case 'cskoi8r':
+			case 'koi8r':
+				return 'KOI8-R';
+
+			case 'koi8u':
+				return 'KOI8-U';
+
+			case 'csksc5636':
+			case 'iso646kr':
+			case 'ksc5636':
+				return 'KSC5636';
+
+			case 'cskz1048':
+			case 'kz1048':
+			case 'rk1048':
+			case 'strk10482002':
+				return 'KZ-1048';
+
+			case 'csiso19latingreek':
+			case 'isoir19':
+			case 'latingreek':
+				return 'latin-greek';
+
+			case 'csiso27latingreek1':
+			case 'isoir27':
+			case 'latingreek1':
+				return 'Latin-greek-1';
+
+			case 'csiso158lap':
+			case 'isoir158':
+			case 'lap':
+			case 'latinlap':
+				return 'latin-lap';
+
+			case 'csmacintosh':
+			case 'mac':
+			case 'macintosh':
+				return 'macintosh';
+
+			case 'csmicrosoftpublishing':
+			case 'microsoftpublishing':
+				return 'Microsoft-Publishing';
+
+			case 'csmnem':
+			case 'mnem':
+				return 'MNEM';
+
+			case 'csmnemonic':
+			case 'mnemonic':
+				return 'MNEMONIC';
+
+			case 'csiso86hungarian':
+			case 'hu':
+			case 'iso646hu':
+			case 'isoir86':
+			case 'msz77953':
+				return 'MSZ_7795.3';
+
+			case 'csnatsdano':
+			case 'isoir91':
+			case 'natsdano':
+				return 'NATS-DANO';
+
+			case 'csnatsdanoadd':
+			case 'isoir92':
+			case 'natsdanoadd':
+				return 'NATS-DANO-ADD';
+
+			case 'csnatssefi':
+			case 'isoir81':
+			case 'natssefi':
+				return 'NATS-SEFI';
+
+			case 'csnatssefiadd':
+			case 'isoir82':
+			case 'natssefiadd':
+				return 'NATS-SEFI-ADD';
+
+			case 'csiso151cuba':
+			case 'cuba':
+			case 'iso646cu':
+			case 'isoir151':
+			case 'ncnc1081':
+				return 'NC_NC00-10:81';
+
+			case 'csiso69french':
+			case 'fr':
+			case 'iso646fr':
+			case 'isoir69':
+			case 'nfz62010':
+				return 'NF_Z_62-010';
+
+			case 'csiso25french':
+			case 'iso646fr1':
+			case 'isoir25':
+			case 'nfz620101973':
+				return 'NF_Z_62-010_(1973)';
+
+			case 'csiso60danishnorwegian':
+			case 'csiso60norwegian1':
+			case 'iso646no':
+			case 'isoir60':
+			case 'no':
+			case 'ns45511':
+				return 'NS_4551-1';
+
+			case 'csiso61norwegian2':
+			case 'iso646no2':
+			case 'isoir61':
+			case 'no2':
+			case 'ns45512':
+				return 'NS_4551-2';
+
+			case 'osdebcdicdf3irv':
+				return 'OSD_EBCDIC_DF03_IRV';
+
+			case 'osdebcdicdf41':
+				return 'OSD_EBCDIC_DF04_1';
+
+			case 'osdebcdicdf415':
+				return 'OSD_EBCDIC_DF04_15';
+
+			case 'cspc8danishnorwegian':
+			case 'pc8danishnorwegian':
+				return 'PC8-Danish-Norwegian';
+
+			case 'cspc8turkish':
+			case 'pc8turkish':
+				return 'PC8-Turkish';
+
+			case 'csiso16portuguese':
+			case 'iso646pt':
+			case 'isoir16':
+			case 'pt':
+				return 'PT';
+
+			case 'csiso84portuguese2':
+			case 'iso646pt2':
+			case 'isoir84':
+			case 'pt2':
+				return 'PT2';
+
+			case 'cp154':
+			case 'csptcp154':
+			case 'cyrillicasian':
+			case 'pt154':
+			case 'ptcp154':
+				return 'PTCP154';
+
+			case 'scsu':
+				return 'SCSU';
+
+			case 'csiso10swedish':
+			case 'fi':
+			case 'iso646fi':
+			case 'iso646se':
+			case 'isoir10':
+			case 'se':
+			case 'sen850200b':
+				return 'SEN_850200_B';
+
+			case 'csiso11swedishfornames':
+			case 'iso646se2':
+			case 'isoir11':
+			case 'se2':
+			case 'sen850200c':
+				return 'SEN_850200_C';
+
+			case 'csiso102t617bit':
+			case 'isoir102':
+			case 't617bit':
+				return 'T.61-7bit';
+
+			case 'csiso103t618bit':
+			case 'isoir103':
+			case 't61':
+			case 't618bit':
+				return 'T.61-8bit';
+
+			case 'csiso128t101g2':
+			case 'isoir128':
+			case 't101g2':
+				return 'T.101-G2';
+
+			case 'cstscii':
+			case 'tscii':
+				return 'TSCII';
+
+			case 'csunicode11':
+			case 'unicode11':
+				return 'UNICODE-1-1';
+
+			case 'csunicode11utf7':
+			case 'unicode11utf7':
+				return 'UNICODE-1-1-UTF-7';
+
+			case 'csunknown8bit':
+			case 'unknown8bit':
+				return 'UNKNOWN-8BIT';
+
+			case 'ansix341968':
+			case 'ansix341986':
+			case 'ascii':
+			case 'cp367':
+			case 'csascii':
+			case 'ibm367':
+			case 'iso646irv1991':
+			case 'iso646us':
+			case 'isoir6':
+			case 'us':
+			case 'usascii':
+				return 'US-ASCII';
+
+			case 'csusdk':
+			case 'usdk':
+				return 'us-dk';
+
+			case 'utf7':
+				return 'UTF-7';
+
+			case 'utf8':
+				return 'UTF-8';
+
+			case 'utf16':
+				return 'UTF-16';
+
+			case 'utf16be':
+				return 'UTF-16BE';
+
+			case 'utf16le':
+				return 'UTF-16LE';
+
+			case 'utf32':
+				return 'UTF-32';
+
+			case 'utf32be':
+				return 'UTF-32BE';
+
+			case 'utf32le':
+				return 'UTF-32LE';
+
+			case 'csventurainternational':
+			case 'venturainternational':
+				return 'Ventura-International';
+
+			case 'csventuramath':
+			case 'venturamath':
+				return 'Ventura-Math';
+
+			case 'csventuraus':
+			case 'venturaus':
+				return 'Ventura-US';
+
+			case 'csiso70videotexsupp1':
+			case 'isoir70':
+			case 'videotexsuppl':
+				return 'videotex-suppl';
+
+			case 'csviqr':
+			case 'viqr':
+				return 'VIQR';
+
+			case 'csviscii':
+			case 'viscii':
+				return 'VISCII';
+
+			case 'csshiftjis':
+			case 'cswindows31j':
+			case 'mskanji':
+			case 'shiftjis':
+			case 'windows31j':
+				return 'Windows-31J';
+
+			case 'iso885911':
+			case 'tis620':
+				return 'windows-874';
+
+			case 'cseuckr':
+			case 'csksc56011987':
+			case 'euckr':
+			case 'isoir149':
+			case 'korean':
+			case 'ksc5601':
+			case 'ksc56011987':
+			case 'ksc56011989':
+			case 'windows949':
+				return 'windows-949';
+
+			case 'windows1250':
+				return 'windows-1250';
+
+			case 'windows1251':
+				return 'windows-1251';
+
+			case 'cp819':
+			case 'csisolatin1':
+			case 'ibm819':
+			case 'iso88591':
+			case 'iso885911987':
+			case 'isoir100':
+			case 'l1':
+			case 'latin1':
+			case 'windows1252':
+				return 'windows-1252';
+
+			case 'windows1253':
+				return 'windows-1253';
+
+			case 'csisolatin5':
+			case 'iso88599':
+			case 'iso885991989':
+			case 'isoir148':
+			case 'l5':
+			case 'latin5':
+			case 'windows1254':
+				return 'windows-1254';
+
+			case 'windows1255':
+				return 'windows-1255';
+
+			case 'windows1256':
+				return 'windows-1256';
+
+			case 'windows1257':
+				return 'windows-1257';
+
+			case 'windows1258':
+				return 'windows-1258';
+
+			default:
+				return $charset;
+		}
+	}
+
+	public static function get_curl_version()
+	{
+		if (is_array($curl = curl_version()))
+		{
+			$curl = $curl['version'];
+		}
+		elseif (substr($curl, 0, 5) === 'curl/')
+		{
+			$curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
+		}
+		elseif (substr($curl, 0, 8) === 'libcurl/')
+		{
+			$curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
+		}
+		else
+		{
+			$curl = 0;
+		}
+		return $curl;
+	}
+
+	/**
+	 * Strip HTML comments
+	 *
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	public static function strip_comments($data)
+	{
+		$output = '';
+		while (($start = strpos($data, '<!--')) !== false)
+		{
+			$output .= substr($data, 0, $start);
+			if (($end = strpos($data, '-->', $start)) !== false)
+			{
+				$data = substr_replace($data, '', 0, $end + 3);
+			}
+			else
+			{
+				$data = '';
+			}
+		}
+		return $output . $data;
+	}
+
+	public static function parse_date($dt)
+	{
+		$parser = SimplePie_Parse_Date::get();
+		return $parser->parse($dt);
+	}
+
+	/**
+	 * Decode HTML entities
+	 *
+	 * @deprecated Use DOMDocument instead
+	 * @param string $data Input data
+	 * @return string Output data
+	 */
+	public static function entities_decode($data)
+	{
+		$decoder = new SimplePie_Decode_HTML_Entities($data);
+		return $decoder->parse();
+	}
+
+	/**
+	 * Remove RFC822 comments
+	 *
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	public static function uncomment_rfc822($string)
+	{
+		$string = (string) $string;
+		$position = 0;
+		$length = strlen($string);
+		$depth = 0;
+
+		$output = '';
+
+		while ($position < $length && ($pos = strpos($string, '(', $position)) !== false)
+		{
+			$output .= substr($string, $position, $pos - $position);
+			$position = $pos + 1;
+			if ($string[$pos - 1] !== '\\')
+			{
+				$depth++;
+				while ($depth && $position < $length)
+				{
+					$position += strcspn($string, '()', $position);
+					if ($string[$position - 1] === '\\')
+					{
+						$position++;
+						continue;
+					}
+					elseif (isset($string[$position]))
+					{
+						switch ($string[$position])
+						{
+							case '(':
+								$depth++;
+								break;
+
+							case ')':
+								$depth--;
+								break;
+						}
+						$position++;
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+			else
+			{
+				$output .= '(';
+			}
+		}
+		$output .= substr($string, $position);
+
+		return $output;
+	}
+
+	public static function parse_mime($mime)
+	{
+		if (($pos = strpos($mime, ';')) === false)
+		{
+			return trim($mime);
+		}
+		else
+		{
+			return trim(substr($mime, 0, $pos));
+		}
+	}
+
+	public static function atom_03_construct_type($attribs)
+	{
+		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
+		{
+			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
+		}
+		else
+		{
+			$mode = SIMPLEPIE_CONSTRUCT_NONE;
+		}
+		if (isset($attribs['']['type']))
+		{
+			switch (strtolower(trim($attribs['']['type'])))
+			{
+				case 'text':
+				case 'text/plain':
+					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+
+				case 'html':
+				case 'text/html':
+					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
+
+				case 'xhtml':
+				case 'application/xhtml+xml':
+					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
+
+				default:
+					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
+			}
+		}
+		else
+		{
+			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+		}
+	}
+
+	public static function atom_10_construct_type($attribs)
+	{
+		if (isset($attribs['']['type']))
+		{
+			switch (strtolower(trim($attribs['']['type'])))
+			{
+				case 'text':
+					return SIMPLEPIE_CONSTRUCT_TEXT;
+
+				case 'html':
+					return SIMPLEPIE_CONSTRUCT_HTML;
+
+				case 'xhtml':
+					return SIMPLEPIE_CONSTRUCT_XHTML;
+
+				default:
+					return SIMPLEPIE_CONSTRUCT_NONE;
+			}
+		}
+		return SIMPLEPIE_CONSTRUCT_TEXT;
+	}
+
+	public static function atom_10_content_construct_type($attribs)
+	{
+		if (isset($attribs['']['type']))
+		{
+			$type = strtolower(trim($attribs['']['type']));
+			switch ($type)
+			{
+				case 'text':
+					return SIMPLEPIE_CONSTRUCT_TEXT;
+
+				case 'html':
+					return SIMPLEPIE_CONSTRUCT_HTML;
+
+				case 'xhtml':
+					return SIMPLEPIE_CONSTRUCT_XHTML;
+			}
+			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
+			{
+				return SIMPLEPIE_CONSTRUCT_NONE;
+			}
+			else
+			{
+				return SIMPLEPIE_CONSTRUCT_BASE64;
+			}
+		}
+		else
+		{
+			return SIMPLEPIE_CONSTRUCT_TEXT;
+		}
+	}
+
+	public static function is_isegment_nz_nc($string)
+	{
+		return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
+	}
+
+	public static function space_seperated_tokens($string)
+	{
+		$space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
+		$string_length = strlen($string);
+
+		$position = strspn($string, $space_characters);
+		$tokens = array();
+
+		while ($position < $string_length)
+		{
+			$len = strcspn($string, $space_characters, $position);
+			$tokens[] = substr($string, $position, $len);
+			$position += $len;
+			$position += strspn($string, $space_characters, $position);
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Converts a unicode codepoint to a UTF-8 character
+	 *
+	 * @static
+	 * @param int $codepoint Unicode codepoint
+	 * @return string UTF-8 character
+	 */
+	public static function codepoint_to_utf8($codepoint)
+	{
+		$codepoint = (int) $codepoint;
+		if ($codepoint < 0)
+		{
+			return false;
+		}
+		else if ($codepoint <= 0x7f)
+		{
+			return chr($codepoint);
+		}
+		else if ($codepoint <= 0x7ff)
+		{
+			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else if ($codepoint <= 0xffff)
+		{
+			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else if ($codepoint <= 0x10ffff)
+		{
+			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else
+		{
+			// U+FFFD REPLACEMENT CHARACTER
+			return "\xEF\xBF\xBD";
+		}
+	}
+
+	/**
+	 * Similar to parse_str()
+	 *
+	 * Returns an associative array of name/value pairs, where the value is an
+	 * array of values that have used the same name
+	 *
+	 * @static
+	 * @param string $str The input string.
+	 * @return array
+	 */
+	public static function parse_str($str)
+	{
+		$return = array();
+		$str = explode('&', $str);
+
+		foreach ($str as $section)
+		{
+			if (strpos($section, '=') !== false)
+			{
+				list($name, $value) = explode('=', $section, 2);
+				$return[urldecode($name)][] = urldecode($value);
+			}
+			else
+			{
+				$return[urldecode($section)][] = null;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Detect XML encoding, as per XML 1.0 Appendix F.1
+	 *
+	 * @todo Add support for EBCDIC
+	 * @param string $data XML data
+	 * @param SimplePie_Registry $registry Class registry
+	 * @return array Possible encodings
+	 */
+	public static function xml_encoding($data, $registry)
+	{
+		// UTF-32 Big Endian BOM
+		if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
+		{
+			$encoding[] = 'UTF-32BE';
+		}
+		// UTF-32 Little Endian BOM
+		elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
+		{
+			$encoding[] = 'UTF-32LE';
+		}
+		// UTF-16 Big Endian BOM
+		elseif (substr($data, 0, 2) === "\xFE\xFF")
+		{
+			$encoding[] = 'UTF-16BE';
+		}
+		// UTF-16 Little Endian BOM
+		elseif (substr($data, 0, 2) === "\xFF\xFE")
+		{
+			$encoding[] = 'UTF-16LE';
+		}
+		// UTF-8 BOM
+		elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
+		{
+			$encoding[] = 'UTF-8';
+		}
+		// UTF-32 Big Endian Without BOM
+		elseif (substr($data, 0, 20) === "\x00\x00\x00\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C")
+		{
+			if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-32BE';
+		}
+		// UTF-32 Little Endian Without BOM
+		elseif (substr($data, 0, 20) === "\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C\x00\x00\x00")
+		{
+			if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-32LE';
+		}
+		// UTF-16 Big Endian Without BOM
+		elseif (substr($data, 0, 10) === "\x00\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C")
+		{
+			if ($pos = strpos($data, "\x00\x3F\x00\x3E"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-16BE';
+		}
+		// UTF-16 Little Endian Without BOM
+		elseif (substr($data, 0, 10) === "\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C\x00")
+		{
+			if ($pos = strpos($data, "\x3F\x00\x3E\x00"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-16LE';
+		}
+		// US-ASCII (or superset)
+		elseif (substr($data, 0, 5) === "\x3C\x3F\x78\x6D\x6C")
+		{
+			if ($pos = strpos($data, "\x3F\x3E"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5)));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-8';
+		}
+		// Fallback to UTF-8
+		else
+		{
+			$encoding[] = 'UTF-8';
+		}
+		return $encoding;
+	}
+
+	public static function output_javascript()
+	{
+		if (function_exists('ob_gzhandler'))
+		{
+			ob_start('ob_gzhandler');
+		}
+		header('Content-type: text/javascript; charset: UTF-8');
+		header('Cache-Control: must-revalidate');
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+		?>
+function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
+	if (placeholder != '') {
+		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+	}
+	else {
+		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+	}
+}
+
+function embed_flash(bgcolor, width, height, link, loop, type) {
+	document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
+}
+
+function embed_flv(width, height, link, placeholder, loop, player) {
+	document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
+}
+
+function embed_wmedia(width, height, link) {
+	document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
+}
+		<?php
+	}
+
+	/**
+	 * Get the SimplePie build timestamp
+	 *
+	 * Uses the git index if it exists, otherwise uses the modification time
+	 * of the newest file.
+	 */
+	public static function get_build()
+	{
+		$root = dirname(dirname(__FILE__));
+		if (file_exists($root . '/.git/index'))
+		{
+			return filemtime($root . '/.git/index');
+		}
+		elseif (file_exists($root . '/SimplePie'))
+		{
+			$time = 0;
+			foreach (glob($root . '/SimplePie/*.php') as $file)
+			{
+				if (($mtime = filemtime($file)) > $time)
+				{
+					$time = $mtime;
+				}
+			}
+			return $time;
+		}
+		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+		{
+			return filemtime(dirname(__FILE__) . '/Core.php');
+		}
+		else
+		{
+			return filemtime(__FILE__);
+		}
+	}
+
+	/**
+	 * Format debugging information
+	 */
+	public static function debug(&$sp)
+	{
+		$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
+		$info .= 'PHP ' . PHP_VERSION . "\n";
+		if ($sp->error() !== null)
+		{
+			$info .= 'Error occurred: ' . $sp->error() . "\n";
+		}
+		else
+		{
+			$info .= "No error found.\n";
+		}
+		$info .= "Extensions:\n";
+		$extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml');
+		foreach ($extensions as $ext)
+		{
+			if (extension_loaded($ext))
+			{
+				$info .= "    $ext loaded\n";
+				switch ($ext)
+				{
+					case 'pcre':
+						$info .= '      Version ' . PCRE_VERSION . "\n";
+						break;
+					case 'curl':
+						$version = curl_version();
+						$info .= '      Version ' . $version['version'] . "\n";
+						break;
+					case 'mbstring':
+						$info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+						break;
+					case 'iconv':
+						$info .= '      Version ' . ICONV_VERSION . "\n";
+						break;
+					case 'xml':
+						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+						break;
+				}
+			}
+			else
+			{
+				$info .= "    $ext not loaded\n";
+			}
+		}
+		return $info;
+	}
+
+	public static function silence_errors($num, $str)
+	{
+		// No-op
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php
new file mode 100644
index 00000000..da80d8ac
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php
@@ -0,0 +1,276 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Class to validate and to work with IPv6 addresses.
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @copyright 2003-2005 The PHP Group
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ * @link http://pear.php.net/package/Net_IPv6
+ * @author Alexander Merz <alexander.merz@web.de>
+ * @author elfrink at introweb dot nl
+ * @author Josh Peck <jmp at joshpeck dot org>
+ * @author Geoffrey Sneddon <geoffers@gmail.com>
+ */
+class SimplePie_Net_IPv6
+{
+	/**
+	 * Uncompresses an IPv6 address
+	 *
+	 * RFC 4291 allows you to compress concecutive zero pieces in an address to
+	 * '::'. This method expects a valid IPv6 address and expands the '::' to
+	 * the required number of zero pieces.
+	 *
+	 * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
+	 *           ::1         ->  0:0:0:0:0:0:0:1
+	 *
+	 * @author Alexander Merz <alexander.merz@web.de>
+	 * @author elfrink at introweb dot nl
+	 * @author Josh Peck <jmp at joshpeck dot org>
+	 * @copyright 2003-2005 The PHP Group
+	 * @license http://www.opensource.org/licenses/bsd-license.php
+	 * @param string $ip An IPv6 address
+	 * @return string The uncompressed IPv6 address
+	 */
+	public static function uncompress($ip)
+	{
+		$c1 = -1;
+		$c2 = -1;
+		if (substr_count($ip, '::') === 1)
+		{
+			list($ip1, $ip2) = explode('::', $ip);
+			if ($ip1 === '')
+			{
+				$c1 = -1;
+			}
+			else
+			{
+				$c1 = substr_count($ip1, ':');
+			}
+			if ($ip2 === '')
+			{
+				$c2 = -1;
+			}
+			else
+			{
+				$c2 = substr_count($ip2, ':');
+			}
+			if (strpos($ip2, '.') !== false)
+			{
+				$c2++;
+			}
+			// ::
+			if ($c1 === -1 && $c2 === -1)
+			{
+				$ip = '0:0:0:0:0:0:0:0';
+			}
+			// ::xxx
+			else if ($c1 === -1)
+			{
+				$fill = str_repeat('0:', 7 - $c2);
+				$ip = str_replace('::', $fill, $ip);
+			}
+			// xxx::
+			else if ($c2 === -1)
+			{
+				$fill = str_repeat(':0', 7 - $c1);
+				$ip = str_replace('::', $fill, $ip);
+			}
+			// xxx::xxx
+			else
+			{
+				$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+				$ip = str_replace('::', $fill, $ip);
+			}
+		}
+		return $ip;
+	}
+
+	/**
+	 * Compresses an IPv6 address
+	 *
+	 * RFC 4291 allows you to compress concecutive zero pieces in an address to
+	 * '::'. This method expects a valid IPv6 address and compresses consecutive
+	 * zero pieces to '::'.
+	 *
+	 * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
+	 *           0:0:0:0:0:0:0:1        ->  ::1
+	 *
+	 * @see uncompress()
+	 * @param string $ip An IPv6 address
+	 * @return string The compressed IPv6 address
+	 */
+	public static function compress($ip)
+	{
+		// Prepare the IP to be compressed
+		$ip = self::uncompress($ip);
+		$ip_parts = self::split_v6_v4($ip);
+
+		// Replace all leading zeros
+		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
+
+		// Find bunches of zeros
+		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE))
+		{
+			$max = 0;
+			$pos = null;
+			foreach ($matches[0] as $match)
+			{
+				if (strlen($match[0]) > $max)
+				{
+					$max = strlen($match[0]);
+					$pos = $match[1];
+				}
+			}
+
+			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
+		}
+
+		if ($ip_parts[1] !== '')
+		{
+			return implode(':', $ip_parts);
+		}
+		else
+		{
+			return $ip_parts[0];
+		}
+	}
+
+	/**
+	 * Splits an IPv6 address into the IPv6 and IPv4 representation parts
+	 *
+	 * RFC 4291 allows you to represent the last two parts of an IPv6 address
+	 * using the standard IPv4 representation
+	 *
+	 * Example:  0:0:0:0:0:0:13.1.68.3
+	 *           0:0:0:0:0:FFFF:129.144.52.38
+	 *
+	 * @param string $ip An IPv6 address
+	 * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+	 */
+	private static function split_v6_v4($ip)
+	{
+		if (strpos($ip, '.') !== false)
+		{
+			$pos = strrpos($ip, ':');
+			$ipv6_part = substr($ip, 0, $pos);
+			$ipv4_part = substr($ip, $pos + 1);
+			return array($ipv6_part, $ipv4_part);
+		}
+		else
+		{
+			return array($ip, '');
+		}
+	}
+
+	/**
+	 * Checks an IPv6 address
+	 *
+	 * Checks if the given IP is a valid IPv6 address
+	 *
+	 * @param string $ip An IPv6 address
+	 * @return bool true if $ip is a valid IPv6 address
+	 */
+	public static function check_ipv6($ip)
+	{
+		$ip = self::uncompress($ip);
+		list($ipv6, $ipv4) = self::split_v6_v4($ip);
+		$ipv6 = explode(':', $ipv6);
+		$ipv4 = explode('.', $ipv4);
+		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4)
+		{
+			foreach ($ipv6 as $ipv6_part)
+			{
+				// The section can't be empty
+				if ($ipv6_part === '')
+					return false;
+
+				// Nor can it be over four characters
+				if (strlen($ipv6_part) > 4)
+					return false;
+
+				// Remove leading zeros (this is safe because of the above)
+				$ipv6_part = ltrim($ipv6_part, '0');
+				if ($ipv6_part === '')
+					$ipv6_part = '0';
+
+				// Check the value is valid
+				$value = hexdec($ipv6_part);
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
+					return false;
+			}
+			if (count($ipv4) === 4)
+			{
+				foreach ($ipv4 as $ipv4_part)
+				{
+					$value = (int) $ipv4_part;
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
+						return false;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Checks if the given IP is a valid IPv6 address
+	 *
+	 * @codeCoverageIgnore
+	 * @deprecated Use {@see SimplePie_Net_IPv6::check_ipv6()} instead
+	 * @see check_ipv6
+	 * @param string $ip An IPv6 address
+	 * @return bool true if $ip is a valid IPv6 address
+	 */
+	public static function checkIPv6($ip)
+	{
+		return self::check_ipv6($ip);
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php
new file mode 100644
index 00000000..d51f500d
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php
@@ -0,0 +1,983 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Date Parser
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class SimplePie_Parse_Date
+{
+	/**
+	 * Input data
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $date;
+
+	/**
+	 * List of days, calendar day name => ordinal day number in the week
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $day = array(
+		// English
+		'mon' => 1,
+		'monday' => 1,
+		'tue' => 2,
+		'tuesday' => 2,
+		'wed' => 3,
+		'wednesday' => 3,
+		'thu' => 4,
+		'thursday' => 4,
+		'fri' => 5,
+		'friday' => 5,
+		'sat' => 6,
+		'saturday' => 6,
+		'sun' => 7,
+		'sunday' => 7,
+		// Dutch
+		'maandag' => 1,
+		'dinsdag' => 2,
+		'woensdag' => 3,
+		'donderdag' => 4,
+		'vrijdag' => 5,
+		'zaterdag' => 6,
+		'zondag' => 7,
+		// French
+		'lundi' => 1,
+		'mardi' => 2,
+		'mercredi' => 3,
+		'jeudi' => 4,
+		'vendredi' => 5,
+		'samedi' => 6,
+		'dimanche' => 7,
+		// German
+		'montag' => 1,
+		'dienstag' => 2,
+		'mittwoch' => 3,
+		'donnerstag' => 4,
+		'freitag' => 5,
+		'samstag' => 6,
+		'sonnabend' => 6,
+		'sonntag' => 7,
+		// Italian
+		'lunedì' => 1,
+		'martedì' => 2,
+		'mercoledì' => 3,
+		'giovedì' => 4,
+		'venerdì' => 5,
+		'sabato' => 6,
+		'domenica' => 7,
+		// Spanish
+		'lunes' => 1,
+		'martes' => 2,
+		'miércoles' => 3,
+		'jueves' => 4,
+		'viernes' => 5,
+		'sábado' => 6,
+		'domingo' => 7,
+		// Finnish
+		'maanantai' => 1,
+		'tiistai' => 2,
+		'keskiviikko' => 3,
+		'torstai' => 4,
+		'perjantai' => 5,
+		'lauantai' => 6,
+		'sunnuntai' => 7,
+		// Hungarian
+		'hétfő' => 1,
+		'kedd' => 2,
+		'szerda' => 3,
+		'csütörtok' => 4,
+		'péntek' => 5,
+		'szombat' => 6,
+		'vasárnap' => 7,
+		// Greek
+		'Δευ' => 1,
+		'Τρι' => 2,
+		'Τετ' => 3,
+		'Πεμ' => 4,
+		'Παρ' => 5,
+		'Σαβ' => 6,
+		'Κυρ' => 7,
+	);
+
+	/**
+	 * List of months, calendar month name => calendar month number
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $month = array(
+		// English
+		'jan' => 1,
+		'january' => 1,
+		'feb' => 2,
+		'february' => 2,
+		'mar' => 3,
+		'march' => 3,
+		'apr' => 4,
+		'april' => 4,
+		'may' => 5,
+		// No long form of May
+		'jun' => 6,
+		'june' => 6,
+		'jul' => 7,
+		'july' => 7,
+		'aug' => 8,
+		'august' => 8,
+		'sep' => 9,
+		'september' => 8,
+		'oct' => 10,
+		'october' => 10,
+		'nov' => 11,
+		'november' => 11,
+		'dec' => 12,
+		'december' => 12,
+		// Dutch
+		'januari' => 1,
+		'februari' => 2,
+		'maart' => 3,
+		'april' => 4,
+		'mei' => 5,
+		'juni' => 6,
+		'juli' => 7,
+		'augustus' => 8,
+		'september' => 9,
+		'oktober' => 10,
+		'november' => 11,
+		'december' => 12,
+		// French
+		'janvier' => 1,
+		'février' => 2,
+		'mars' => 3,
+		'avril' => 4,
+		'mai' => 5,
+		'juin' => 6,
+		'juillet' => 7,
+		'août' => 8,
+		'septembre' => 9,
+		'octobre' => 10,
+		'novembre' => 11,
+		'décembre' => 12,
+		// German
+		'januar' => 1,
+		'februar' => 2,
+		'märz' => 3,
+		'april' => 4,
+		'mai' => 5,
+		'juni' => 6,
+		'juli' => 7,
+		'august' => 8,
+		'september' => 9,
+		'oktober' => 10,
+		'november' => 11,
+		'dezember' => 12,
+		// Italian
+		'gennaio' => 1,
+		'febbraio' => 2,
+		'marzo' => 3,
+		'aprile' => 4,
+		'maggio' => 5,
+		'giugno' => 6,
+		'luglio' => 7,
+		'agosto' => 8,
+		'settembre' => 9,
+		'ottobre' => 10,
+		'novembre' => 11,
+		'dicembre' => 12,
+		// Spanish
+		'enero' => 1,
+		'febrero' => 2,
+		'marzo' => 3,
+		'abril' => 4,
+		'mayo' => 5,
+		'junio' => 6,
+		'julio' => 7,
+		'agosto' => 8,
+		'septiembre' => 9,
+		'setiembre' => 9,
+		'octubre' => 10,
+		'noviembre' => 11,
+		'diciembre' => 12,
+		// Finnish
+		'tammikuu' => 1,
+		'helmikuu' => 2,
+		'maaliskuu' => 3,
+		'huhtikuu' => 4,
+		'toukokuu' => 5,
+		'kesäkuu' => 6,
+		'heinäkuu' => 7,
+		'elokuu' => 8,
+		'suuskuu' => 9,
+		'lokakuu' => 10,
+		'marras' => 11,
+		'joulukuu' => 12,
+		// Hungarian
+		'január' => 1,
+		'február' => 2,
+		'március' => 3,
+		'április' => 4,
+		'május' => 5,
+		'június' => 6,
+		'július' => 7,
+		'augusztus' => 8,
+		'szeptember' => 9,
+		'október' => 10,
+		'november' => 11,
+		'december' => 12,
+		// Greek
+		'Ιαν' => 1,
+		'Φεβ' => 2,
+		'Μάώ' => 3,
+		'Μαώ' => 3,
+		'Απρ' => 4,
+		'Μάι' => 5,
+		'Μαϊ' => 5,
+		'Μαι' => 5,
+		'Ιούν' => 6,
+		'Ιον' => 6,
+		'Ιούλ' => 7,
+		'Ιολ' => 7,
+		'Αύγ' => 8,
+		'Αυγ' => 8,
+		'Σεπ' => 9,
+		'Οκτ' => 10,
+		'Νοέ' => 11,
+		'Δεκ' => 12,
+	);
+
+	/**
+	 * List of timezones, abbreviation => offset from UTC
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $timezone = array(
+		'ACDT' => 37800,
+		'ACIT' => 28800,
+		'ACST' => 34200,
+		'ACT' => -18000,
+		'ACWDT' => 35100,
+		'ACWST' => 31500,
+		'AEDT' => 39600,
+		'AEST' => 36000,
+		'AFT' => 16200,
+		'AKDT' => -28800,
+		'AKST' => -32400,
+		'AMDT' => 18000,
+		'AMT' => -14400,
+		'ANAST' => 46800,
+		'ANAT' => 43200,
+		'ART' => -10800,
+		'AZOST' => -3600,
+		'AZST' => 18000,
+		'AZT' => 14400,
+		'BIOT' => 21600,
+		'BIT' => -43200,
+		'BOT' => -14400,
+		'BRST' => -7200,
+		'BRT' => -10800,
+		'BST' => 3600,
+		'BTT' => 21600,
+		'CAST' => 18000,
+		'CAT' => 7200,
+		'CCT' => 23400,
+		'CDT' => -18000,
+		'CEDT' => 7200,
+		'CET' => 3600,
+		'CGST' => -7200,
+		'CGT' => -10800,
+		'CHADT' => 49500,
+		'CHAST' => 45900,
+		'CIST' => -28800,
+		'CKT' => -36000,
+		'CLDT' => -10800,
+		'CLST' => -14400,
+		'COT' => -18000,
+		'CST' => -21600,
+		'CVT' => -3600,
+		'CXT' => 25200,
+		'DAVT' => 25200,
+		'DTAT' => 36000,
+		'EADT' => -18000,
+		'EAST' => -21600,
+		'EAT' => 10800,
+		'ECT' => -18000,
+		'EDT' => -14400,
+		'EEST' => 10800,
+		'EET' => 7200,
+		'EGT' => -3600,
+		'EKST' => 21600,
+		'EST' => -18000,
+		'FJT' => 43200,
+		'FKDT' => -10800,
+		'FKST' => -14400,
+		'FNT' => -7200,
+		'GALT' => -21600,
+		'GEDT' => 14400,
+		'GEST' => 10800,
+		'GFT' => -10800,
+		'GILT' => 43200,
+		'GIT' => -32400,
+		'GST' => 14400,
+		'GST' => -7200,
+		'GYT' => -14400,
+		'HAA' => -10800,
+		'HAC' => -18000,
+		'HADT' => -32400,
+		'HAE' => -14400,
+		'HAP' => -25200,
+		'HAR' => -21600,
+		'HAST' => -36000,
+		'HAT' => -9000,
+		'HAY' => -28800,
+		'HKST' => 28800,
+		'HMT' => 18000,
+		'HNA' => -14400,
+		'HNC' => -21600,
+		'HNE' => -18000,
+		'HNP' => -28800,
+		'HNR' => -25200,
+		'HNT' => -12600,
+		'HNY' => -32400,
+		'IRDT' => 16200,
+		'IRKST' => 32400,
+		'IRKT' => 28800,
+		'IRST' => 12600,
+		'JFDT' => -10800,
+		'JFST' => -14400,
+		'JST' => 32400,
+		'KGST' => 21600,
+		'KGT' => 18000,
+		'KOST' => 39600,
+		'KOVST' => 28800,
+		'KOVT' => 25200,
+		'KRAST' => 28800,
+		'KRAT' => 25200,
+		'KST' => 32400,
+		'LHDT' => 39600,
+		'LHST' => 37800,
+		'LINT' => 50400,
+		'LKT' => 21600,
+		'MAGST' => 43200,
+		'MAGT' => 39600,
+		'MAWT' => 21600,
+		'MDT' => -21600,
+		'MESZ' => 7200,
+		'MEZ' => 3600,
+		'MHT' => 43200,
+		'MIT' => -34200,
+		'MNST' => 32400,
+		'MSDT' => 14400,
+		'MSST' => 10800,
+		'MST' => -25200,
+		'MUT' => 14400,
+		'MVT' => 18000,
+		'MYT' => 28800,
+		'NCT' => 39600,
+		'NDT' => -9000,
+		'NFT' => 41400,
+		'NMIT' => 36000,
+		'NOVST' => 25200,
+		'NOVT' => 21600,
+		'NPT' => 20700,
+		'NRT' => 43200,
+		'NST' => -12600,
+		'NUT' => -39600,
+		'NZDT' => 46800,
+		'NZST' => 43200,
+		'OMSST' => 25200,
+		'OMST' => 21600,
+		'PDT' => -25200,
+		'PET' => -18000,
+		'PETST' => 46800,
+		'PETT' => 43200,
+		'PGT' => 36000,
+		'PHOT' => 46800,
+		'PHT' => 28800,
+		'PKT' => 18000,
+		'PMDT' => -7200,
+		'PMST' => -10800,
+		'PONT' => 39600,
+		'PST' => -28800,
+		'PWT' => 32400,
+		'PYST' => -10800,
+		'PYT' => -14400,
+		'RET' => 14400,
+		'ROTT' => -10800,
+		'SAMST' => 18000,
+		'SAMT' => 14400,
+		'SAST' => 7200,
+		'SBT' => 39600,
+		'SCDT' => 46800,
+		'SCST' => 43200,
+		'SCT' => 14400,
+		'SEST' => 3600,
+		'SGT' => 28800,
+		'SIT' => 28800,
+		'SRT' => -10800,
+		'SST' => -39600,
+		'SYST' => 10800,
+		'SYT' => 7200,
+		'TFT' => 18000,
+		'THAT' => -36000,
+		'TJT' => 18000,
+		'TKT' => -36000,
+		'TMT' => 18000,
+		'TOT' => 46800,
+		'TPT' => 32400,
+		'TRUT' => 36000,
+		'TVT' => 43200,
+		'TWT' => 28800,
+		'UYST' => -7200,
+		'UYT' => -10800,
+		'UZT' => 18000,
+		'VET' => -14400,
+		'VLAST' => 39600,
+		'VLAT' => 36000,
+		'VOST' => 21600,
+		'VUT' => 39600,
+		'WAST' => 7200,
+		'WAT' => 3600,
+		'WDT' => 32400,
+		'WEST' => 3600,
+		'WFT' => 43200,
+		'WIB' => 25200,
+		'WIT' => 32400,
+		'WITA' => 28800,
+		'WKST' => 18000,
+		'WST' => 28800,
+		'YAKST' => 36000,
+		'YAKT' => 32400,
+		'YAPT' => 36000,
+		'YEKST' => 21600,
+		'YEKT' => 18000,
+	);
+
+	/**
+	 * Cached PCRE for SimplePie_Parse_Date::$day
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $day_pcre;
+
+	/**
+	 * Cached PCRE for SimplePie_Parse_Date::$month
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $month_pcre;
+
+	/**
+	 * Array of user-added callback methods
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $built_in = array();
+
+	/**
+	 * Array of user-added callback methods
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $user = array();
+
+	/**
+	 * Create new SimplePie_Parse_Date object, and set self::day_pcre,
+	 * self::month_pcre, and self::built_in
+	 *
+	 * @access private
+	 */
+	public function __construct()
+	{
+		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
+		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+
+		static $cache;
+		if (!isset($cache[get_class($this)]))
+		{
+			$all_methods = get_class_methods($this);
+
+			foreach ($all_methods as $method)
+			{
+				if (strtolower(substr($method, 0, 5)) === 'date_')
+				{
+					$cache[get_class($this)][] = $method;
+				}
+			}
+		}
+
+		foreach ($cache[get_class($this)] as $method)
+		{
+			$this->built_in[] = $method;
+		}
+	}
+
+	/**
+	 * Get the object
+	 *
+	 * @access public
+	 */
+	public static function get()
+	{
+		static $object;
+		if (!$object)
+		{
+			$object = new SimplePie_Parse_Date;
+		}
+		return $object;
+	}
+
+	/**
+	 * Parse a date
+	 *
+	 * @final
+	 * @access public
+	 * @param string $date Date to parse
+	 * @return int Timestamp corresponding to date string, or false on failure
+	 */
+	public function parse($date)
+	{
+		foreach ($this->user as $method)
+		{
+			if (($returned = call_user_func($method, $date)) !== false)
+			{
+				return $returned;
+			}
+		}
+
+		foreach ($this->built_in as $method)
+		{
+			if (($returned = call_user_func(array($this, $method), $date)) !== false)
+			{
+				return $returned;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add a callback method to parse a date
+	 *
+	 * @final
+	 * @access public
+	 * @param callback $callback
+	 */
+	public function add_callback($callback)
+	{
+		if (is_callable($callback))
+		{
+			$this->user[] = $callback;
+		}
+		else
+		{
+			trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
+		}
+	}
+
+	/**
+	 * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as
+	 * well as allowing any of upper or lower case "T", horizontal tabs, or
+	 * spaces to be used as the time seperator (including more than one))
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_w3cdtf($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$year = '([0-9]{4})';
+			$month = $day = $hour = $minute = $second = '([0-9]{2})';
+			$decimal = '([0-9]*)';
+			$zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
+			$pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+		}
+		if (preg_match($pcre, $date, $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Year
+			2: Month
+			3: Day
+			4: Hour
+			5: Minute
+			6: Second
+			7: Decimal fraction of a second
+			8: Zulu
+			9: Timezone ±
+			10: Timezone hours
+			11: Timezone minutes
+			*/
+
+			// Fill in empty matches
+			for ($i = count($match); $i <= 3; $i++)
+			{
+				$match[$i] = '1';
+			}
+
+			for ($i = count($match); $i <= 7; $i++)
+			{
+				$match[$i] = '0';
+			}
+
+			// Numeric timezone
+			if (isset($match[9]) && $match[9] !== '')
+			{
+				$timezone = $match[10] * 3600;
+				$timezone += $match[11] * 60;
+				if ($match[9] === '-')
+				{
+					$timezone = 0 - $timezone;
+				}
+			}
+			else
+			{
+				$timezone = 0;
+			}
+
+			// Convert the number of seconds to an integer, taking decimals into account
+			$second = round($match[6] + $match[7] / pow(10, strlen($match[7])));
+
+			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Remove RFC822 comments
+	 *
+	 * @access protected
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	public function remove_rfc2822_comments($string)
+	{
+		$string = (string) $string;
+		$position = 0;
+		$length = strlen($string);
+		$depth = 0;
+
+		$output = '';
+
+		while ($position < $length && ($pos = strpos($string, '(', $position)) !== false)
+		{
+			$output .= substr($string, $position, $pos - $position);
+			$position = $pos + 1;
+			if ($string[$pos - 1] !== '\\')
+			{
+				$depth++;
+				while ($depth && $position < $length)
+				{
+					$position += strcspn($string, '()', $position);
+					if ($string[$position - 1] === '\\')
+					{
+						$position++;
+						continue;
+					}
+					elseif (isset($string[$position]))
+					{
+						switch ($string[$position])
+						{
+							case '(':
+								$depth++;
+								break;
+
+							case ')':
+								$depth--;
+								break;
+						}
+						$position++;
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+			else
+			{
+				$output .= '(';
+			}
+		}
+		$output .= substr($string, $position);
+
+		return $output;
+	}
+
+	/**
+	 * Parse RFC2822's date format
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_rfc2822($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$wsp = '[\x09\x20]';
+			$fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
+			$optional_fws = $fws . '?';
+			$day_name = $this->day_pcre;
+			$month = $this->month_pcre;
+			$day = '([0-9]{1,2})';
+			$hour = $minute = $second = '([0-9]{2})';
+			$year = '([0-9]{2,4})';
+			$num_zone = '([+\-])([0-9]{2})([0-9]{2})';
+			$character_zone = '([A-Z]{1,5})';
+			$zone = '(?:' . $num_zone . '|' . $character_zone . ')';
+			$pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+		}
+		if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Day name
+			2: Day
+			3: Month
+			4: Year
+			5: Hour
+			6: Minute
+			7: Second
+			8: Timezone ±
+			9: Timezone hours
+			10: Timezone minutes
+			11: Alphabetic timezone
+			*/
+
+			// Find the month number
+			$month = $this->month[strtolower($match[3])];
+
+			// Numeric timezone
+			if ($match[8] !== '')
+			{
+				$timezone = $match[9] * 3600;
+				$timezone += $match[10] * 60;
+				if ($match[8] === '-')
+				{
+					$timezone = 0 - $timezone;
+				}
+			}
+			// Character timezone
+			elseif (isset($this->timezone[strtoupper($match[11])]))
+			{
+				$timezone = $this->timezone[strtoupper($match[11])];
+			}
+			// Assume everything else to be -0000
+			else
+			{
+				$timezone = 0;
+			}
+
+			// Deal with 2/3 digit years
+			if ($match[4] < 50)
+			{
+				$match[4] += 2000;
+			}
+			elseif ($match[4] < 1000)
+			{
+				$match[4] += 1900;
+			}
+
+			// Second is optional, if it is empty set it to zero
+			if ($match[7] !== '')
+			{
+				$second = $match[7];
+			}
+			else
+			{
+				$second = 0;
+			}
+
+			return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse RFC850's date format
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_rfc850($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$space = '[\x09\x20]+';
+			$day_name = $this->day_pcre;
+			$month = $this->month_pcre;
+			$day = '([0-9]{1,2})';
+			$year = $hour = $minute = $second = '([0-9]{2})';
+			$zone = '([A-Z]{1,5})';
+			$pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+		}
+		if (preg_match($pcre, $date, $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Day name
+			2: Day
+			3: Month
+			4: Year
+			5: Hour
+			6: Minute
+			7: Second
+			8: Timezone
+			*/
+
+			// Month
+			$month = $this->month[strtolower($match[3])];
+
+			// Character timezone
+			if (isset($this->timezone[strtoupper($match[8])]))
+			{
+				$timezone = $this->timezone[strtoupper($match[8])];
+			}
+			// Assume everything else to be -0000
+			else
+			{
+				$timezone = 0;
+			}
+
+			// Deal with 2 digit year
+			if ($match[4] < 50)
+			{
+				$match[4] += 2000;
+			}
+			else
+			{
+				$match[4] += 1900;
+			}
+
+			return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse C99's asctime()'s date format
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_asctime($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$space = '[\x09\x20]+';
+			$wday_name = $this->day_pcre;
+			$mon_name = $this->month_pcre;
+			$day = '([0-9]{1,2})';
+			$hour = $sec = $min = '([0-9]{2})';
+			$year = '([0-9]{4})';
+			$terminator = '\x0A?\x00?';
+			$pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+		}
+		if (preg_match($pcre, $date, $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Day name
+			2: Month
+			3: Day
+			4: Hour
+			5: Minute
+			6: Second
+			7: Year
+			*/
+
+			$month = $this->month[strtolower($match[2])];
+			return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse dates using strtotime()
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_strtotime($date)
+	{
+		$strtotime = strtotime($date);
+		if ($strtotime === -1 || $strtotime === false)
+		{
+			return false;
+		}
+		else
+		{
+			return $strtotime;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parser.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parser.php
new file mode 100644
index 00000000..d698552c
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Parser.php
@@ -0,0 +1,407 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Parses XML into something sane
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_parser_class()}
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class SimplePie_Parser
+{
+	var $error_code;
+	var $error_string;
+	var $current_line;
+	var $current_column;
+	var $current_byte;
+	var $separator = ' ';
+	var $namespace = array('');
+	var $element = array('');
+	var $xml_base = array('');
+	var $xml_base_explicit = array(false);
+	var $xml_lang = array('');
+	var $data = array();
+	var $datas = array(array());
+	var $current_xhtml_construct = -1;
+	var $encoding;
+	protected $registry;
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function parse(&$data, $encoding)
+	{
+		// Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
+		if (strtoupper($encoding) === 'US-ASCII')
+		{
+			$this->encoding = 'UTF-8';
+		}
+		else
+		{
+			$this->encoding = $encoding;
+		}
+
+		// Strip BOM:
+		// UTF-32 Big Endian BOM
+		if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
+		{
+			$data = substr($data, 4);
+		}
+		// UTF-32 Little Endian BOM
+		elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
+		{
+			$data = substr($data, 4);
+		}
+		// UTF-16 Big Endian BOM
+		elseif (substr($data, 0, 2) === "\xFE\xFF")
+		{
+			$data = substr($data, 2);
+		}
+		// UTF-16 Little Endian BOM
+		elseif (substr($data, 0, 2) === "\xFF\xFE")
+		{
+			$data = substr($data, 2);
+		}
+		// UTF-8 BOM
+		elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
+		{
+			$data = substr($data, 3);
+		}
+
+		if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
+		{
+			$declaration = $this->registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5)));
+			if ($declaration->parse())
+			{
+				$data = substr($data, $pos + 2);
+				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
+			}
+			else
+			{
+				$this->error_string = 'SimplePie bug! Please report this!';
+				return false;
+			}
+		}
+
+		$return = true;
+
+		static $xml_is_sane = null;
+		if ($xml_is_sane === null)
+		{
+			$parser_check = xml_parser_create();
+			xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+			xml_parser_free($parser_check);
+			$xml_is_sane = isset($values[0]['value']);
+		}
+
+		// Create the parser
+		if ($xml_is_sane)
+		{
+			$xml = xml_parser_create_ns($this->encoding, $this->separator);
+			xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
+			xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
+			xml_set_object($xml, $this);
+			xml_set_character_data_handler($xml, 'cdata');
+			xml_set_element_handler($xml, 'tag_open', 'tag_close');
+
+			// Parse!
+			if (!xml_parse($xml, $data, true))
+			{
+				$this->error_code = xml_get_error_code($xml);
+				$this->error_string = xml_error_string($this->error_code);
+				$return = false;
+			}
+			$this->current_line = xml_get_current_line_number($xml);
+			$this->current_column = xml_get_current_column_number($xml);
+			$this->current_byte = xml_get_current_byte_index($xml);
+			xml_parser_free($xml);
+			return $return;
+		}
+		else
+		{
+			libxml_clear_errors();
+			$xml = new XMLReader();
+			$xml->xml($data);
+			while (@$xml->read())
+			{
+				switch ($xml->nodeType)
+				{
+
+					case constant('XMLReader::END_ELEMENT'):
+						if ($xml->namespaceURI !== '')
+						{
+							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+						}
+						else
+						{
+							$tagName = $xml->localName;
+						}
+						$this->tag_close(null, $tagName);
+						break;
+					case constant('XMLReader::ELEMENT'):
+						$empty = $xml->isEmptyElement;
+						if ($xml->namespaceURI !== '')
+						{
+							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+						}
+						else
+						{
+							$tagName = $xml->localName;
+						}
+						$attributes = array();
+						while ($xml->moveToNextAttribute())
+						{
+							if ($xml->namespaceURI !== '')
+							{
+								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+							}
+							else
+							{
+								$attrName = $xml->localName;
+							}
+							$attributes[$attrName] = $xml->value;
+						}
+						$this->tag_open(null, $tagName, $attributes);
+						if ($empty)
+						{
+							$this->tag_close(null, $tagName);
+						}
+						break;
+					case constant('XMLReader::TEXT'):
+
+					case constant('XMLReader::CDATA'):
+						$this->cdata(null, $xml->value);
+						break;
+				}
+			}
+			if ($error = libxml_get_last_error())
+			{
+				$this->error_code = $error->code;
+				$this->error_string = $error->message;
+				$this->current_line = $error->line;
+				$this->current_column = $error->column;
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	public function get_error_code()
+	{
+		return $this->error_code;
+	}
+
+	public function get_error_string()
+	{
+		return $this->error_string;
+	}
+
+	public function get_current_line()
+	{
+		return $this->current_line;
+	}
+
+	public function get_current_column()
+	{
+		return $this->current_column;
+	}
+
+	public function get_current_byte()
+	{
+		return $this->current_byte;
+	}
+
+	public function get_data()
+	{
+		return $this->data;
+	}
+
+	public function tag_open($parser, $tag, $attributes)
+	{
+		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
+
+		$attribs = array();
+		foreach ($attributes as $name => $value)
+		{
+			list($attrib_namespace, $attribute) = $this->split_ns($name);
+			$attribs[$attrib_namespace][$attribute] = $value;
+		}
+
+		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
+		{
+			$base = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base)));
+			if ($base !== false)
+			{
+				$this->xml_base[] = $base;
+				$this->xml_base_explicit[] = true;
+			}
+		}
+		else
+		{
+			$this->xml_base[] = end($this->xml_base);
+			$this->xml_base_explicit[] = end($this->xml_base_explicit);
+		}
+
+		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
+		{
+			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
+		}
+		else
+		{
+			$this->xml_lang[] = end($this->xml_lang);
+		}
+
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->current_xhtml_construct++;
+			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
+			{
+				$this->data['data'] .= '<' . end($this->element);
+				if (isset($attribs['']))
+				{
+					foreach ($attribs[''] as $name => $value)
+					{
+						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+					}
+				}
+				$this->data['data'] .= '>';
+			}
+		}
+		else
+		{
+			$this->datas[] =& $this->data;
+			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
+			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_20 && in_array(end($this->element), array('title')))
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_090 && in_array(end($this->element), array('title')))
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_10 && in_array(end($this->element), array('title'))))
+			{
+				$this->current_xhtml_construct = 0;
+			}
+		}
+	}
+
+	public function cdata($parser, $cdata)
+	{
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
+		}
+		else
+		{
+			$this->data['data'] .= $cdata;
+		}
+	}
+
+	public function tag_close($parser, $tag)
+	{
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->current_xhtml_construct--;
+			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
+			{
+				$this->data['data'] .= '</' . end($this->element) . '>';
+			}
+		}
+		if ($this->current_xhtml_construct === -1)
+		{
+			$this->data =& $this->datas[count($this->datas) - 1];
+			array_pop($this->datas);
+		}
+
+		array_pop($this->element);
+		array_pop($this->namespace);
+		array_pop($this->xml_base);
+		array_pop($this->xml_base_explicit);
+		array_pop($this->xml_lang);
+	}
+
+	public function split_ns($string)
+	{
+		static $cache = array();
+		if (!isset($cache[$string]))
+		{
+			if ($pos = strpos($string, $this->separator))
+			{
+				static $separator_length;
+				if (!$separator_length)
+				{
+					$separator_length = strlen($this->separator);
+				}
+				$namespace = substr($string, 0, $pos);
+				$local_name = substr($string, $pos + $separator_length);
+				if (strtolower($namespace) === SIMPLEPIE_NAMESPACE_ITUNES)
+				{
+					$namespace = SIMPLEPIE_NAMESPACE_ITUNES;
+				}
+
+				// Normalize the Media RSS namespaces
+				if ($namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+				{
+					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
+				}
+				$cache[$string] = array($namespace, $local_name);
+			}
+			else
+			{
+				$cache[$string] = array('', $string);
+			}
+		}
+		return $cache[$string];
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Rating.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Rating.php
new file mode 100644
index 00000000..8689e5df
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Rating.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<media:rating>` or `<itunes:explicit>` tags as defined in Media RSS and iTunes RSS respectively
+ *
+ * Used by {@see SimplePie_Enclosure::get_rating()} and {@see SimplePie_Enclosure::get_ratings()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_rating_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Rating
+{
+	/**
+	 * Rating scheme
+	 *
+	 * @var string
+	 * @see get_scheme()
+	 */
+	var $scheme;
+
+	/**
+	 * Rating value
+	 *
+	 * @var string
+	 * @see get_value()
+	 */
+	var $value;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($scheme = null, $value = null)
+	{
+		$this->scheme = $scheme;
+		$this->value = $value;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the organizational scheme for the rating
+	 *
+	 * @return string|null
+	 */
+	public function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the value of the rating
+	 *
+	 * @return string|null
+	 */
+	public function get_value()
+	{
+		if ($this->value !== null)
+		{
+			return $this->value;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Registry.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Registry.php
new file mode 100644
index 00000000..1072cdeb
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Registry.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles creating objects and calling methods
+ *
+ * Access this via {@see SimplePie::get_registry()}
+ *
+ * @package SimplePie
+ */
+class SimplePie_Registry
+{
+	/**
+	 * Default class mapping
+	 *
+	 * Overriding classes *must* subclass these.
+	 *
+	 * @var array
+	 */
+	protected $default = array(
+		'Cache' => 'SimplePie_Cache',
+		'Locator' => 'SimplePie_Locator',
+		'Parser' => 'SimplePie_Parser',
+		'File' => 'SimplePie_File',
+		'Sanitize' => 'SimplePie_Sanitize',
+		'Item' => 'SimplePie_Item',
+		'Author' => 'SimplePie_Author',
+		'Category' => 'SimplePie_Category',
+		'Enclosure' => 'SimplePie_Enclosure',
+		'Caption' => 'SimplePie_Caption',
+		'Copyright' => 'SimplePie_Copyright',
+		'Credit' => 'SimplePie_Credit',
+		'Rating' => 'SimplePie_Rating',
+		'Restriction' => 'SimplePie_Restriction',
+		'Content_Type_Sniffer' => 'SimplePie_Content_Type_Sniffer',
+		'Source' => 'SimplePie_Source',
+		'Misc' => 'SimplePie_Misc',
+		'XML_Declaration_Parser' => 'SimplePie_XML_Declaration_Parser',
+		'Parse_Date' => 'SimplePie_Parse_Date',
+	);
+
+	/**
+	 * Class mapping
+	 *
+	 * @see register()
+	 * @var array
+	 */
+	protected $classes = array();
+
+	/**
+	 * Legacy classes
+	 *
+	 * @see register()
+	 * @var array
+	 */
+	protected $legacy = array();
+
+	/**
+	 * Constructor
+	 *
+	 * No-op
+	 */
+	public function __construct() { }
+
+	/**
+	 * Register a class
+	 *
+	 * @param string $type See {@see $default} for names
+	 * @param string $class Class name, must subclass the corresponding default
+	 * @param bool $legacy Whether to enable legacy support for this class
+	 * @return bool Successfulness
+	 */
+	public function register($type, $class, $legacy = false)
+	{
+		if (!is_subclass_of($class, $this->default[$type]))
+		{
+			return false;
+		}
+
+		$this->classes[$type] = $class;
+
+		if ($legacy)
+		{
+			$this->legacy[] = $class;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the class registered for a type
+	 *
+	 * Where possible, use {@see create()} or {@see call()} instead
+	 *
+	 * @param string $type
+	 * @return string|null
+	 */
+	public function get_class($type)
+	{
+		if (!empty($this->classes[$type]))
+		{
+			return $this->classes[$type];
+		}
+		if (!empty($this->default[$type]))
+		{
+			return $this->default[$type];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Create a new instance of a given type
+	 *
+	 * @param string $type
+	 * @param array $parameters Parameters to pass to the constructor
+	 * @return object Instance of class
+	 */
+	public function &create($type, $parameters = array())
+	{
+		$class = $this->get_class($type);
+
+		if (in_array($class, $this->legacy))
+		{
+			switch ($type)
+			{
+				case 'locator':
+					// Legacy: file, timeout, useragent, file_class, max_checked_feeds, content_type_sniffer_class
+					// Specified: file, timeout, useragent, max_checked_feeds
+					$replacement = array($this->get_class('file'), $parameters[3], $this->get_class('content_type_sniffer'));
+					array_splice($parameters, 3, 1, $replacement);
+					break;
+			}
+		}
+
+		if (!method_exists($class, '__construct'))
+		{
+			$instance = new $class;
+		}
+		else
+		{
+			$reflector = new ReflectionClass($class);
+			$instance = $reflector->newInstanceArgs($parameters);
+		}
+
+		if (method_exists($instance, 'set_registry'))
+		{
+			$instance->set_registry($this);
+		}
+		return $instance;
+	}
+
+	/**
+	 * Call a static method for a type
+	 *
+	 * @param string $type
+	 * @param string $method
+	 * @param array $parameters
+	 * @return mixed
+	 */
+	public function &call($type, $method, $parameters = array())
+	{
+		$class = $this->get_class($type);
+
+		if (in_array($class, $this->legacy))
+		{
+			switch ($type)
+			{
+				case 'Cache':
+					// For backwards compatibility with old non-static
+					// Cache::create() methods
+					if ($method === 'get_handler')
+					{
+						$result = @call_user_func_array(array($class, 'create'), $parameters);
+						return $result;
+					}
+					break;
+			}
+		}
+
+		$result = call_user_func_array(array($class, $method), $parameters);
+		return $result;
+	}
+}
\ No newline at end of file
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Restriction.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Restriction.php
new file mode 100644
index 00000000..4ba371bf
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Restriction.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<media:restriction>` as defined in Media RSS
+ *
+ * Used by {@see SimplePie_Enclosure::get_restriction()} and {@see SimplePie_Enclosure::get_restrictions()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_restriction_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Restriction
+{
+	/**
+	 * Relationship ('allow'/'deny')
+	 *
+	 * @var string
+	 * @see get_relationship()
+	 */
+	var $relationship;
+
+	/**
+	 * Type of restriction
+	 *
+	 * @var string
+	 * @see get_type()
+	 */
+	var $type;
+
+	/**
+	 * Restricted values
+	 *
+	 * @var string
+	 * @see get_value()
+	 */
+	var $value;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($relationship = null, $type = null, $value = null)
+	{
+		$this->relationship = $relationship;
+		$this->type = $type;
+		$this->value = $value;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the relationship
+	 *
+	 * @return string|null Either 'allow' or 'deny'
+	 */
+	public function get_relationship()
+	{
+		if ($this->relationship !== null)
+		{
+			return $this->relationship;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the type
+	 *
+	 * @return string|null
+	 */
+	public function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the list of restricted things
+	 *
+	 * @return string|null
+	 */
+	public function get_value()
+	{
+		if ($this->value !== null)
+		{
+			return $this->value;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php
new file mode 100644
index 00000000..6810cc49
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php
@@ -0,0 +1,549 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used for data cleanup and post-processing
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_sanitize_class()}
+ *
+ * @package SimplePie
+ * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shorten a string while preserving HTML tags
+ */
+class SimplePie_Sanitize
+{
+	// Private vars
+	var $base;
+
+	// Options
+	var $remove_div = true;
+	var $image_handler = '';
+	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+	var $encode_instead_of_strip = false;
+	var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+	var $strip_comments = false;
+	var $output_encoding = 'UTF-8';
+	var $enable_cache = true;
+	var $cache_location = './cache';
+	var $cache_name_function = 'md5';
+	var $timeout = 10;
+	var $useragent = '';
+	var $force_fsockopen = false;
+	var $replace_url_attributes = null;
+
+	public function __construct()
+	{
+		// Set defaults
+		$this->set_url_replacements(null);
+	}
+
+	public function remove_div($enable = true)
+	{
+		$this->remove_div = (bool) $enable;
+	}
+
+	public function set_image_handler($page = false)
+	{
+		if ($page)
+		{
+			$this->image_handler = (string) $page;
+		}
+		else
+		{
+			$this->image_handler = false;
+		}
+	}
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie_Cache')
+	{
+		if (isset($enable_cache))
+		{
+			$this->enable_cache = (bool) $enable_cache;
+		}
+
+		if ($cache_location)
+		{
+			$this->cache_location = (string) $cache_location;
+		}
+
+		if ($cache_name_function)
+		{
+			$this->cache_name_function = (string) $cache_name_function;
+		}
+	}
+
+	public function pass_file_data($file_class = 'SimplePie_File', $timeout = 10, $useragent = '', $force_fsockopen = false)
+	{
+		if ($timeout)
+		{
+			$this->timeout = (string) $timeout;
+		}
+
+		if ($useragent)
+		{
+			$this->useragent = (string) $useragent;
+		}
+
+		if ($force_fsockopen)
+		{
+			$this->force_fsockopen = (string) $force_fsockopen;
+		}
+	}
+
+	public function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
+	{
+		if ($tags)
+		{
+			if (is_array($tags))
+			{
+				$this->strip_htmltags = $tags;
+			}
+			else
+			{
+				$this->strip_htmltags = explode(',', $tags);
+			}
+		}
+		else
+		{
+			$this->strip_htmltags = false;
+		}
+	}
+
+	public function encode_instead_of_strip($encode = false)
+	{
+		$this->encode_instead_of_strip = (bool) $encode;
+	}
+
+	public function strip_attributes($attribs = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'))
+	{
+		if ($attribs)
+		{
+			if (is_array($attribs))
+			{
+				$this->strip_attributes = $attribs;
+			}
+			else
+			{
+				$this->strip_attributes = explode(',', $attribs);
+			}
+		}
+		else
+		{
+			$this->strip_attributes = false;
+		}
+	}
+
+	public function strip_comments($strip = false)
+	{
+		$this->strip_comments = (bool) $strip;
+	}
+
+	public function set_output_encoding($encoding = 'UTF-8')
+	{
+		$this->output_encoding = (string) $encoding;
+	}
+
+	/**
+	 * Set element/attribute key/value pairs of HTML attributes
+	 * containing URLs that need to be resolved relative to the feed
+	 *
+	 * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
+	 * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
+	 * |q|@cite
+	 *
+	 * @since 1.0
+	 * @param array|null $element_attribute Element/attribute key/value pairs, null for default
+	 */
+	public function set_url_replacements($element_attribute = null)
+	{
+		if ($element_attribute === null)
+		{
+			$element_attribute = array(
+				'a' => 'href',
+				'area' => 'href',
+				'blockquote' => 'cite',
+				'del' => 'cite',
+				'form' => 'action',
+				'img' => array(
+					'longdesc',
+					'src'
+				),
+				'input' => 'src',
+				'ins' => 'cite',
+				'q' => 'cite'
+			);
+		}
+		$this->replace_url_attributes = (array) $element_attribute;
+	}
+
+	public function sanitize($data, $type, $base = '')
+	{
+		$data = trim($data);
+		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
+		{
+			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
+			{
+				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+				{
+					$type |= SIMPLEPIE_CONSTRUCT_HTML;
+				}
+				else
+				{
+					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
+				}
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
+			{
+				$data = base64_decode($data);
+			}
+
+			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
+			{
+
+				$document = new DOMDocument();
+				$document->encoding = 'UTF-8';
+				$data = $this->preprocess($data, $type);
+
+				set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+				$document->loadHTML($data);
+				restore_error_handler();
+
+				// Strip comments
+				if ($this->strip_comments)
+				{
+					$xpath = new DOMXPath($document);
+					$comments = $xpath->query('//comment()');
+
+					foreach ($comments as $comment)
+					{
+						$comment->parentNode->removeChild($comment);
+					}
+				}
+
+				// Strip out HTML tags and attributes that might cause various security problems.
+				// Based on recommendations by Mark Pilgrim at:
+				// http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
+				if ($this->strip_htmltags)
+				{
+					foreach ($this->strip_htmltags as $tag)
+					{
+						$this->strip_tag($tag, $document, $type);
+					}
+				}
+
+				if ($this->strip_attributes)
+				{
+					foreach ($this->strip_attributes as $attrib)
+					{
+						$this->strip_attr($attrib, $document);
+					}
+				}
+
+				// Replace relative URLs
+				$this->base = $base;
+				foreach ($this->replace_url_attributes as $element => $attributes)
+				{
+					$this->replace_urls($document, $element, $attributes);
+				}
+
+				// If image handling (caching, etc.) is enabled, cache and rewrite all the image tags.
+				if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache)
+				{
+					$images = $document->getElementsByTagName('img');
+					foreach ($images as $img)
+					{
+						if ($img->hasAttribute('src'))
+						{
+							$image_url = call_user_func($this->cache_name_function, $img->getAttribute('src'));
+							$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
+
+							if ($cache->load())
+							{
+								$img->setAttribute('src', $this->image_handler . $image_url);
+							}
+							else
+							{
+								$file = $this->registry->create('File', array($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
+								$headers = $file->headers;
+
+								if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+								{
+									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
+									{
+										$img->setAttribute('src', $this->image_handler . $image_url);
+									}
+									else
+									{
+										trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+									}
+								}
+							}
+						}
+					}
+				}
+
+				// Remove the DOCTYPE
+				// Seems to cause segfaulting if we don't do this
+				if ($document->firstChild instanceof DOMDocumentType)
+				{
+					$document->removeChild($document->firstChild);
+				}
+
+				// Move everything from the body to the root
+				$real_body = $document->getElementsByTagName('body')->item(0)->childNodes->item(0);
+				$document->replaceChild($real_body, $document->firstChild);
+
+				// Finally, convert to a HTML string
+				$data = trim($document->saveHTML());
+
+				if ($this->remove_div)
+				{
+					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+					$data = preg_replace('/<\/div>$/', '', $data);
+				}
+				else
+				{
+					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+				}
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
+			{
+				$absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
+				if ($absolute !== false)
+				{
+					$data = $absolute;
+				}
+			}
+
+			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
+			{
+				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
+			}
+
+			if ($this->output_encoding !== 'UTF-8')
+			{
+				$data = $this->registry->call('Misc', 'change_encoding', array($data, 'UTF-8', $this->output_encoding));
+			}
+		}
+		return $data;
+	}
+
+	protected function preprocess($html, $type)
+	{
+		$ret = '';
+		if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML)
+		{
+			// Atom XHTML constructs are wrapped with a div by default
+			// Note: No protection if $html contains a stray </div>!
+			$html = '<div>' . $html . '</div>';
+			$ret .= '<!DOCTYPE html>';
+			$content_type = 'text/html';
+		}
+		else
+		{
+			$ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+			$content_type = 'application/xhtml+xml';
+		}
+
+		$ret .= '<html><head>';
+		$ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
+		$ret .= '</head><body>' . $html . '</body></html>';
+		return $ret;
+	}
+
+	public function replace_urls($document, $tag, $attributes)
+	{
+		if (!is_array($attributes))
+		{
+			$attributes = array($attributes);
+		}
+
+		if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags))
+		{
+			$elements = $document->getElementsByTagName($tag);
+			foreach ($elements as $element)
+			{
+				foreach ($attributes as $attribute)
+				{
+					if ($element->hasAttribute($attribute))
+					{
+						$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
+						if ($value !== false)
+						{
+							$element->setAttribute($attribute, $value);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public function do_strip_htmltags($match)
+	{
+		if ($this->encode_instead_of_strip)
+		{
+			if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+			{
+				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
+				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
+				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
+			}
+			else
+			{
+				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
+			}
+		}
+		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+		{
+			return $match[4];
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	protected function strip_tag($tag, $document, $type)
+	{
+		$xpath = new DOMXPath($document);
+		$elements = $xpath->query('body//' . $tag);
+		if ($this->encode_instead_of_strip)
+		{
+			foreach ($elements as $element)
+			{
+				$fragment = $document->createDocumentFragment();
+
+				// For elements which aren't script or style, include the tag itself
+				if (!in_array($tag, array('script', 'style')))
+				{
+					$text = '<' . $tag;
+					if ($element->hasAttributes())
+					{
+						$attrs = array();
+						foreach ($element->attributes as $name => $attr)
+						{
+							$value = $attr->value;
+
+							// In XHTML, empty values should never exist, so we repeat the value
+							if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML))
+							{
+								$value = $name;
+							}
+							// For HTML, empty is fine
+							elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML))
+							{
+								$attrs[] = $name;
+								continue;
+							}
+
+							// Standard attribute text
+							$attrs[] = $name . '="' . $attr->value . '"';
+						}
+						$text .= ' ' . implode(' ', $attrs);
+					}
+					$text .= '>';
+					$fragment->appendChild(new DOMText($text));
+				}
+
+				$number = $element->childNodes->length;
+				for ($i = $number; $i > 0; $i--)
+				{
+					$child = $element->childNodes->item(0);
+					$fragment->appendChild($child);
+				}
+
+				if (!in_array($tag, array('script', 'style')))
+				{
+					$fragment->appendChild(new DOMText('</' . $tag . '>'));
+				}
+
+				$element->parentNode->replaceChild($fragment, $element);
+			}
+
+			return;
+		}
+		elseif (in_array($tag, array('script', 'style')))
+		{
+			foreach ($elements as $element)
+			{
+				$element->parentNode->removeChild($element);
+			}
+
+			return;
+		}
+		else
+		{
+			foreach ($elements as $element)
+			{
+				$fragment = $document->createDocumentFragment();
+				$number = $element->childNodes->length;
+				for ($i = $number; $i > 0; $i--)
+				{
+					$child = $element->childNodes->item(0);
+					$fragment->appendChild($child);
+				}
+
+				$element->parentNode->replaceChild($fragment, $element);
+			}
+		}
+	}
+
+	protected function strip_attr($attrib, $document)
+	{
+		$xpath = new DOMXPath($document);
+		$elements = $xpath->query('//*[@' . $attrib . ']');
+
+		foreach ($elements as $element)
+		{
+			$element->removeAttribute($attrib);
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Source.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Source.php
new file mode 100644
index 00000000..51d8e6c2
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/Source.php
@@ -0,0 +1,611 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<atom:source>`
+ *
+ * Used by {@see SimplePie_Item::get_source()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_source_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Source
+{
+	var $item;
+	var $data = array();
+	protected $registry;
+
+	public function __construct($item, $data)
+	{
+		$this->item = $item;
+		$this->data = $data;
+	}
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	public function get_source_tags($namespace, $tag)
+	{
+		if (isset($this->data['child'][$namespace][$tag]))
+		{
+			return $this->data['child'][$namespace][$tag];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_base($element = array())
+	{
+		return $this->item->get_base($element);
+	}
+
+	public function sanitize($data, $type, $base = '')
+	{
+		return $this->item->sanitize($data, $type, $base);
+	}
+
+	public function get_item()
+	{
+		return $this->item;
+	}
+
+	public function get_title()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+		{
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($categories))
+		{
+			return array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		if ($author = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($authors))
+		{
+			return array_unique($authors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_contributor($key = 0)
+	{
+		$contributors = $this->get_contributors();
+		if (isset($contributors[$key]))
+		{
+			return $contributors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_contributors()
+	{
+		$contributors = array();
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+
+		if (!empty($contributors))
+		{
+			return array_unique($contributors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if (isset($links[$key]))
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Added for parity between the parent-level and the item/entry-level.
+	 */
+	public function get_permalink()
+	{
+		return $this->get_link(0);
+	}
+
+	public function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					}
+				}
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+					}
+				}
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_description()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_copyright()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_language()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['xml_lang']))
+		{
+			return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_latitude()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_longitude()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_image_url()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
+		{
+			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
new file mode 100644
index 00000000..aec19f10
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Parses the XML Declaration
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class SimplePie_XML_Declaration_Parser
+{
+	/**
+	 * XML Version
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $version = '1.0';
+
+	/**
+	 * Encoding
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $encoding = 'UTF-8';
+
+	/**
+	 * Standalone
+	 *
+	 * @access public
+	 * @var bool
+	 */
+	var $standalone = false;
+
+	/**
+	 * Current state of the state machine
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $state = 'before_version_name';
+
+	/**
+	 * Input data
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $data = '';
+
+	/**
+	 * Input data length (to avoid calling strlen() everytime this is needed)
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $data_length = 0;
+
+	/**
+	 * Current position of the pointer
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $position = 0;
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @access public
+	 * @param string $data Input data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+		$this->data_length = strlen($this->data);
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @access public
+	 * @return bool true on success, false on failure
+	 */
+	public function parse()
+	{
+		while ($this->state && $this->state !== 'emit' && $this->has_data())
+		{
+			$state = $this->state;
+			$this->$state();
+		}
+		$this->data = '';
+		if ($this->state === 'emit')
+		{
+			return true;
+		}
+		else
+		{
+			$this->version = '';
+			$this->encoding = '';
+			$this->standalone = '';
+			return false;
+		}
+	}
+
+	/**
+	 * Check whether there is data beyond the pointer
+	 *
+	 * @access private
+	 * @return bool true if there is further data, false if not
+	 */
+	public function has_data()
+	{
+		return (bool) ($this->position < $this->data_length);
+	}
+
+	/**
+	 * Advance past any whitespace
+	 *
+	 * @return int Number of whitespace characters passed
+	 */
+	public function skip_whitespace()
+	{
+		$whitespace = strspn($this->data, "\x09\x0A\x0D\x20", $this->position);
+		$this->position += $whitespace;
+		return $whitespace;
+	}
+
+	/**
+	 * Read value
+	 */
+	public function get_value()
+	{
+		$quote = substr($this->data, $this->position, 1);
+		if ($quote === '"' || $quote === "'")
+		{
+			$this->position++;
+			$len = strcspn($this->data, $quote, $this->position);
+			if ($this->has_data())
+			{
+				$value = substr($this->data, $this->position, $len);
+				$this->position += $len + 1;
+				return $value;
+			}
+		}
+		return false;
+	}
+
+	public function before_version_name()
+	{
+		if ($this->skip_whitespace())
+		{
+			$this->state = 'version_name';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function version_name()
+	{
+		if (substr($this->data, $this->position, 7) === 'version')
+		{
+			$this->position += 7;
+			$this->skip_whitespace();
+			$this->state = 'version_equals';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function version_equals()
+	{
+		if (substr($this->data, $this->position, 1) === '=')
+		{
+			$this->position++;
+			$this->skip_whitespace();
+			$this->state = 'version_value';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function version_value()
+	{
+		if ($this->version = $this->get_value())
+		{
+			$this->skip_whitespace();
+			if ($this->has_data())
+			{
+				$this->state = 'encoding_name';
+			}
+			else
+			{
+				$this->state = 'emit';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function encoding_name()
+	{
+		if (substr($this->data, $this->position, 8) === 'encoding')
+		{
+			$this->position += 8;
+			$this->skip_whitespace();
+			$this->state = 'encoding_equals';
+		}
+		else
+		{
+			$this->state = 'standalone_name';
+		}
+	}
+
+	public function encoding_equals()
+	{
+		if (substr($this->data, $this->position, 1) === '=')
+		{
+			$this->position++;
+			$this->skip_whitespace();
+			$this->state = 'encoding_value';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function encoding_value()
+	{
+		if ($this->encoding = $this->get_value())
+		{
+			$this->skip_whitespace();
+			if ($this->has_data())
+			{
+				$this->state = 'standalone_name';
+			}
+			else
+			{
+				$this->state = 'emit';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function standalone_name()
+	{
+		if (substr($this->data, $this->position, 10) === 'standalone')
+		{
+			$this->position += 10;
+			$this->skip_whitespace();
+			$this->state = 'standalone_equals';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function standalone_equals()
+	{
+		if (substr($this->data, $this->position, 1) === '=')
+		{
+			$this->position++;
+			$this->skip_whitespace();
+			$this->state = 'standalone_value';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function standalone_value()
+	{
+		if ($standalone = $this->get_value())
+		{
+			switch ($standalone)
+			{
+				case 'yes':
+					$this->standalone = true;
+					break;
+
+				case 'no':
+					$this->standalone = false;
+					break;
+
+				default:
+					$this->state = false;
+					return;
+			}
+
+			$this->skip_whitespace();
+			if ($this->has_data())
+			{
+				$this->state = false;
+			}
+			else
+			{
+				$this->state = 'emit';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+}
diff --git a/core/libraries/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
new file mode 100644
index 00000000..52e024ea
--- /dev/null
+++ b/core/libraries/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.3.1
+ * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Decode 'gzip' encoded HTTP data
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @link http://www.gzip.org/format.txt
+ */
+class SimplePie_gzdecode
+{
+	/**
+	 * Compressed data
+	 *
+	 * @access private
+	 * @var string
+	 * @see gzdecode::$data
+	 */
+	var $compressed_data;
+
+	/**
+	 * Size of compressed data
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $compressed_size;
+
+	/**
+	 * Minimum size of a valid gzip string
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $min_compressed_size = 18;
+
+	/**
+	 * Current position of pointer
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $position = 0;
+
+	/**
+	 * Flags (FLG)
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $flags;
+
+	/**
+	 * Uncompressed data
+	 *
+	 * @access public
+	 * @see gzdecode::$compressed_data
+	 * @var string
+	 */
+	var $data;
+
+	/**
+	 * Modified time
+	 *
+	 * @access public
+	 * @var int
+	 */
+	var $MTIME;
+
+	/**
+	 * Extra Flags
+	 *
+	 * @access public
+	 * @var int
+	 */
+	var $XFL;
+
+	/**
+	 * Operating System
+	 *
+	 * @access public
+	 * @var int
+	 */
+	var $OS;
+
+	/**
+	 * Subfield ID 1
+	 *
+	 * @access public
+	 * @see gzdecode::$extra_field
+	 * @see gzdecode::$SI2
+	 * @var string
+	 */
+	var $SI1;
+
+	/**
+	 * Subfield ID 2
+	 *
+	 * @access public
+	 * @see gzdecode::$extra_field
+	 * @see gzdecode::$SI1
+	 * @var string
+	 */
+	var $SI2;
+
+	/**
+	 * Extra field content
+	 *
+	 * @access public
+	 * @see gzdecode::$SI1
+	 * @see gzdecode::$SI2
+	 * @var string
+	 */
+	var $extra_field;
+
+	/**
+	 * Original filename
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $filename;
+
+	/**
+	 * Human readable comment
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $comment;
+
+	/**
+	 * Don't allow anything to be set
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 */
+	public function __set($name, $value)
+	{
+		trigger_error("Cannot write property $name", E_USER_ERROR);
+	}
+
+	/**
+	 * Set the compressed string and related properties
+	 *
+	 * @param string $data
+	 */
+	public function __construct($data)
+	{
+		$this->compressed_data = $data;
+		$this->compressed_size = strlen($data);
+	}
+
+	/**
+	 * Decode the GZIP stream
+	 *
+	 * @return bool Successfulness
+	 */
+	public function parse()
+	{
+		if ($this->compressed_size >= $this->min_compressed_size)
+		{
+			// Check ID1, ID2, and CM
+			if (substr($this->compressed_data, 0, 3) !== "\x1F\x8B\x08")
+			{
+				return false;
+			}
+
+			// Get the FLG (FLaGs)
+			$this->flags = ord($this->compressed_data[3]);
+
+			// FLG bits above (1 << 4) are reserved
+			if ($this->flags > 0x1F)
+			{
+				return false;
+			}
+
+			// Advance the pointer after the above
+			$this->position += 4;
+
+			// MTIME
+			$mtime = substr($this->compressed_data, $this->position, 4);
+			// Reverse the string if we're on a big-endian arch because l is the only signed long and is machine endianness
+			if (current(unpack('S', "\x00\x01")) === 1)
+			{
+				$mtime = strrev($mtime);
+			}
+			$this->MTIME = current(unpack('l', $mtime));
+			$this->position += 4;
+
+			// Get the XFL (eXtra FLags)
+			$this->XFL = ord($this->compressed_data[$this->position++]);
+
+			// Get the OS (Operating System)
+			$this->OS = ord($this->compressed_data[$this->position++]);
+
+			// Parse the FEXTRA
+			if ($this->flags & 4)
+			{
+				// Read subfield IDs
+				$this->SI1 = $this->compressed_data[$this->position++];
+				$this->SI2 = $this->compressed_data[$this->position++];
+
+				// SI2 set to zero is reserved for future use
+				if ($this->SI2 === "\x00")
+				{
+					return false;
+				}
+
+				// Get the length of the extra field
+				$len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+				$this->position += 2;
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 4;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the extra field to the given data
+					$this->extra_field = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FNAME
+			if ($this->flags & 8)
+			{
+				// Get the length of the filename
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 1;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the original filename to the given string
+					$this->filename = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len + 1;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FCOMMENT
+			if ($this->flags & 16)
+			{
+				// Get the length of the comment
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 1;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the original comment to the given string
+					$this->comment = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len + 1;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FHCRC
+			if ($this->flags & 2)
+			{
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 2;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Read the CRC
+					$crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+
+					// Check the CRC matches
+					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
+					{
+						$this->position += 2;
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Decompress the actual data
+			if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
+			{
+				return false;
+			}
+			else
+			{
+				$this->position = $this->compressed_size - 8;
+			}
+
+			// Check CRC of data
+			$crc = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+			$this->position += 4;
+			/*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc))
+			{
+				return false;
+			}*/
+
+			// Check ISIZE of data
+			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+			$this->position += 4;
+			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
+			{
+				return false;
+			}
+
+			// Wow, against all odds, we've actually got a valid gzip string
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/core/libraries/vendor/symfony/polyfill-ctype/Ctype.php b/core/libraries/vendor/symfony/polyfill-ctype/Ctype.php
new file mode 100644
index 00000000..58414dc7
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-ctype/Ctype.php
@@ -0,0 +1,227 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Ctype;
+
+/**
+ * Ctype implementation through regex.
+ *
+ * @internal
+ *
+ * @author Gert de Pagter <BackEndTea@gmail.com>
+ */
+final class Ctype
+{
+    /**
+     * Returns TRUE if every character in text is either a letter or a digit, FALSE otherwise.
+     *
+     * @see https://php.net/ctype-alnum
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_alnum($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z0-9]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is a letter, FALSE otherwise.
+     *
+     * @see https://php.net/ctype-alpha
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_alpha($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is a control character from the current locale, FALSE otherwise.
+     *
+     * @see https://php.net/ctype-cntrl
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_cntrl($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^\x00-\x1f\x7f]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in the string text is a decimal digit, FALSE otherwise.
+     *
+     * @see https://php.net/ctype-digit
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_digit($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^0-9]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is printable and actually creates visible output (no white space), FALSE otherwise.
+     *
+     * @see https://php.net/ctype-graph
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_graph($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^!-~]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is a lowercase letter.
+     *
+     * @see https://php.net/ctype-lower
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_lower($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^a-z]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text will actually create output (including blanks). Returns FALSE if text contains control characters or characters that do not have any output or control function at all.
+     *
+     * @see https://php.net/ctype-print
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_print($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^ -~]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is printable, but neither letter, digit or blank, FALSE otherwise.
+     *
+     * @see https://php.net/ctype-punct
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_punct($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^!-\/\:-@\[-`\{-~]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text creates some sort of white space, FALSE otherwise. Besides the blank character this also includes tab, vertical tab, line feed, carriage return and form feed characters.
+     *
+     * @see https://php.net/ctype-space
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_space($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^\s]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is an uppercase letter.
+     *
+     * @see https://php.net/ctype-upper
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_upper($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^A-Z]/', $text);
+    }
+
+    /**
+     * Returns TRUE if every character in text is a hexadecimal 'digit', that is a decimal digit or a character from [A-Fa-f] , FALSE otherwise.
+     *
+     * @see https://php.net/ctype-xdigit
+     *
+     * @param string|int $text
+     *
+     * @return bool
+     */
+    public static function ctype_xdigit($text)
+    {
+        $text = self::convert_int_to_char_for_ctype($text);
+
+        return \is_string($text) && '' !== $text && !preg_match('/[^A-Fa-f0-9]/', $text);
+    }
+
+    /**
+     * Converts integers to their char versions according to normal ctype behaviour, if needed.
+     *
+     * If an integer between -128 and 255 inclusive is provided,
+     * it is interpreted as the ASCII value of a single character
+     * (negative values have 256 added in order to allow characters in the Extended ASCII range).
+     * Any other integer is interpreted as a string containing the decimal digits of the integer.
+     *
+     * @param string|int $int
+     *
+     * @return mixed
+     */
+    private static function convert_int_to_char_for_ctype($int)
+    {
+        if (!\is_int($int)) {
+            return $int;
+        }
+
+        if ($int < -128 || $int > 255) {
+            return (string) $int;
+        }
+
+        if ($int < 0) {
+            $int += 256;
+        }
+
+        return \chr($int);
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-ctype/LICENSE b/core/libraries/vendor/symfony/polyfill-ctype/LICENSE
new file mode 100644
index 00000000..ad399a79
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-ctype/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/symfony/polyfill-ctype/bootstrap.php b/core/libraries/vendor/symfony/polyfill-ctype/bootstrap.php
new file mode 100644
index 00000000..14d1d0fa
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-ctype/bootstrap.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Ctype as p;
+
+if (!function_exists('ctype_alnum')) {
+    function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
+    function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); }
+    function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); }
+    function ctype_digit($text) { return p\Ctype::ctype_digit($text); }
+    function ctype_graph($text) { return p\Ctype::ctype_graph($text); }
+    function ctype_lower($text) { return p\Ctype::ctype_lower($text); }
+    function ctype_print($text) { return p\Ctype::ctype_print($text); }
+    function ctype_punct($text) { return p\Ctype::ctype_punct($text); }
+    function ctype_space($text) { return p\Ctype::ctype_space($text); }
+    function ctype_upper($text) { return p\Ctype::ctype_upper($text); }
+    function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-php55/LICENSE b/core/libraries/vendor/symfony/polyfill-php55/LICENSE
new file mode 100644
index 00000000..24fa32c2
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php55/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2018 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/symfony/polyfill-php55/Php55.php b/core/libraries/vendor/symfony/polyfill-php55/Php55.php
new file mode 100644
index 00000000..bae55e9f
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php55/Php55.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php55;
+
+/**
+ * @internal
+ */
+final class Php55
+{
+    public static function boolval($val)
+    {
+        return (bool) $val;
+    }
+
+    public static function json_last_error_msg()
+    {
+        switch (json_last_error()) {
+            case JSON_ERROR_NONE: return 'No error';
+            case JSON_ERROR_DEPTH: return 'Maximum stack depth exceeded';
+            case JSON_ERROR_STATE_MISMATCH: return 'State mismatch (invalid or malformed JSON)';
+            case JSON_ERROR_CTRL_CHAR: return 'Control character error, possibly incorrectly encoded';
+            case JSON_ERROR_SYNTAX: return 'Syntax error';
+            case JSON_ERROR_UTF8: return 'Malformed UTF-8 characters, possibly incorrectly encoded';
+            default: return 'Unknown error';
+        }
+    }
+
+    /**
+     * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+     */
+    public static function hash_pbkdf2($algorithm, $password, $salt, $iterations, $length = 0, $rawOutput = false)
+    {
+        // Number of blocks needed to create the derived key
+        $blocks = ceil($length / \strlen(hash($algorithm, null, true)));
+        $digest = '';
+
+        for ($i = 1; $i <= $blocks; ++$i) {
+            $ib = $block = hash_hmac($algorithm, $salt.pack('N', $i), $password, true);
+
+            // Iterations
+            for ($j = 1; $j < $iterations; ++$j) {
+                $ib ^= ($block = hash_hmac($algorithm, $block, $password, true));
+            }
+
+            $digest .= $ib;
+        }
+
+        if (!$rawOutput) {
+            $digest = bin2hex($digest);
+        }
+
+        return substr($digest, 0, $length);
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-php55/Php55ArrayColumn.php b/core/libraries/vendor/symfony/polyfill-php55/Php55ArrayColumn.php
new file mode 100644
index 00000000..9bdea01b
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php55/Php55ArrayColumn.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ *   Copyright (c) 2013 Ben Ramsey <http://benramsey.com>
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a
+ *   copy of this software and associated documentation files (the "Software"),
+ *   to deal in the Software without restriction, including without limitation
+ *   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *   and/or sell copies of the Software, and to permit persons to whom the
+ *   Software is furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *   DEALINGS IN THE SOFTWARE.
+ */
+
+namespace Symfony\Polyfill\Php55;
+
+/**
+ * @internal
+ */
+final class Php55ArrayColumn
+{
+    public static function array_column(array $input, $columnKey, $indexKey = null)
+    {
+        $output = array();
+
+        foreach ($input as $row) {
+            $key = $value = null;
+            $keySet = $valueSet = false;
+
+            if ($indexKey !== null && array_key_exists($indexKey, $row)) {
+                $keySet = true;
+                $key = (string) $row[$indexKey];
+            }
+
+            if ($columnKey === null) {
+                $valueSet = true;
+                $value = $row;
+            } elseif (\is_array($row) && \array_key_exists($columnKey, $row)) {
+                $valueSet = true;
+                $value = $row[$columnKey];
+            }
+
+            if ($valueSet) {
+                if ($keySet) {
+                    $output[$key] = $value;
+                } else {
+                    $output[] = $value;
+                }
+            }
+        }
+
+        return $output;
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-php55/bootstrap.php b/core/libraries/vendor/symfony/polyfill-php55/bootstrap.php
new file mode 100644
index 00000000..5e634feb
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php55/bootstrap.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php55 as p;
+
+if (PHP_VERSION_ID < 50500) {
+    if (!function_exists('boolval')) {
+        function boolval($val) { return p\Php55::boolval($val); }
+    }
+    if (!function_exists('json_last_error_msg')) {
+        function json_last_error_msg() { return p\Php55::json_last_error_msg(); }
+    }
+    if (!function_exists('array_column')) {
+        function array_column($array, $columnKey, $indexKey = null) { return p\Php55ArrayColumn::array_column($array, $columnKey, $indexKey); }
+    }
+    if (!function_exists('hash_pbkdf2')) {
+        function hash_pbkdf2($algorithm, $password, $salt, $iterations, $length = 0, $rawOutput = false) { return p\Php55::hash_pbkdf2($algorithm, $password, $salt, $iterations, $length, $rawOutput); }
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-php56/LICENSE b/core/libraries/vendor/symfony/polyfill-php56/LICENSE
new file mode 100644
index 00000000..24fa32c2
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php56/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2018 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/symfony/polyfill-php56/Php56.php b/core/libraries/vendor/symfony/polyfill-php56/Php56.php
new file mode 100644
index 00000000..6ec354eb
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php56/Php56.php
@@ -0,0 +1,138 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php56;
+
+use Symfony\Polyfill\Util\Binary;
+
+/**
+ * @internal
+ */
+final class Php56
+{
+    const LDAP_ESCAPE_FILTER = 1;
+    const LDAP_ESCAPE_DN = 2;
+
+    public static function hash_equals($knownString, $userInput)
+    {
+        if (!\is_string($knownString)) {
+            trigger_error('Expected known_string to be a string, '.gettype($knownString).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        if (!\is_string($userInput)) {
+            trigger_error('Expected user_input to be a string, '.gettype($userInput).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        $knownLen = Binary::strlen($knownString);
+        $userLen = Binary::strlen($userInput);
+
+        if ($knownLen !== $userLen) {
+            return false;
+        }
+
+        $result = 0;
+
+        for ($i = 0; $i < $knownLen; ++$i) {
+            $result |= \ord($knownString[$i]) ^ \ord($userInput[$i]);
+        }
+
+        return 0 === $result;
+    }
+
+    /**
+     * Stub implementation of the {@link ldap_escape()} function of the ldap
+     * extension.
+     *
+     * Escape strings for safe use in LDAP filters and DNs.
+     *
+     * @author Chris Wright <ldapi@daverandom.com>
+     *
+     * @param string $subject
+     * @param string $ignore
+     * @param int    $flags
+     *
+     * @return string
+     *
+     * @see http://stackoverflow.com/a/8561604
+     */
+    public static function ldap_escape($subject, $ignore = '', $flags = 0)
+    {
+        static $charMaps = null;
+
+        if (null === $charMaps) {
+            $charMaps = array(
+                self::LDAP_ESCAPE_FILTER => array('\\', '*', '(', ')', "\x00"),
+                self::LDAP_ESCAPE_DN => array('\\', ',', '=', '+', '<', '>', ';', '"', '#', "\r"),
+            );
+
+            $charMaps[0] = array();
+
+            for ($i = 0; $i < 256; ++$i) {
+                $charMaps[0][\chr($i)] = sprintf('\\%02x', $i);
+            }
+
+            for ($i = 0, $l = \count($charMaps[self::LDAP_ESCAPE_FILTER]); $i < $l; ++$i) {
+                $chr = $charMaps[self::LDAP_ESCAPE_FILTER][$i];
+                unset($charMaps[self::LDAP_ESCAPE_FILTER][$i]);
+                $charMaps[self::LDAP_ESCAPE_FILTER][$chr] = $charMaps[0][$chr];
+            }
+
+            for ($i = 0, $l = \count($charMaps[self::LDAP_ESCAPE_DN]); $i < $l; ++$i) {
+                $chr = $charMaps[self::LDAP_ESCAPE_DN][$i];
+                unset($charMaps[self::LDAP_ESCAPE_DN][$i]);
+                $charMaps[self::LDAP_ESCAPE_DN][$chr] = $charMaps[0][$chr];
+            }
+        }
+
+        // Create the base char map to escape
+        $flags = (int) $flags;
+        $charMap = array();
+
+        if ($flags & self::LDAP_ESCAPE_FILTER) {
+            $charMap += $charMaps[self::LDAP_ESCAPE_FILTER];
+        }
+
+        if ($flags & self::LDAP_ESCAPE_DN) {
+            $charMap += $charMaps[self::LDAP_ESCAPE_DN];
+        }
+
+        if (!$charMap) {
+            $charMap = $charMaps[0];
+        }
+
+        // Remove any chars to ignore from the list
+        $ignore = (string) $ignore;
+
+        for ($i = 0, $l = \strlen($ignore); $i < $l; ++$i) {
+            unset($charMap[$ignore[$i]]);
+        }
+
+        // Do the main replacement
+        $result = strtr($subject, $charMap);
+
+        // Encode leading/trailing spaces if self::LDAP_ESCAPE_DN is passed
+        if ($flags & self::LDAP_ESCAPE_DN) {
+            if ($result[0] === ' ') {
+                $result = '\\20'.substr($result, 1);
+            }
+
+            if ($result[\strlen($result) - 1] === ' ') {
+                $result = substr($result, 0, -1).'\\20';
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-php56/bootstrap.php b/core/libraries/vendor/symfony/polyfill-php56/bootstrap.php
new file mode 100644
index 00000000..587c2a81
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php56/bootstrap.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php56 as p;
+
+if (PHP_VERSION_ID < 50600) {
+    if (!function_exists('hash_equals')) {
+        function hash_equals($knownString, $userInput) { return p\Php56::hash_equals($knownString, $userInput); }
+    }
+    if (extension_loaded('ldap') && !function_exists('ldap_escape')) {
+        define('LDAP_ESCAPE_FILTER', 1);
+        define('LDAP_ESCAPE_DN', 2);
+
+        function ldap_escape($subject, $ignore = '', $flags = 0) { return p\Php56::ldap_escape($subject, $ignore, $flags); }
+    }
+
+    if (50509 === PHP_VERSION_ID && 4 === PHP_INT_SIZE) {
+        // Missing functions in PHP 5.5.9 - affects 32 bit builds of Ubuntu 14.04LTS
+        // See https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1315888
+        if (!function_exists('gzopen') && function_exists('gzopen64')) {
+            function gzopen($filename, $mode, $use_include_path = 0) { return gzopen64($filename, $mode, $use_include_path); }
+        }
+        if (!function_exists('gzseek') && function_exists('gzseek64')) {
+            function gzseek($zp, $offset, $whence = SEEK_SET) { return gzseek64($zp, $offset, $whence); }
+        }
+        if (!function_exists('gztell') && function_exists('gztell64')) {
+            function gztell($zp) { return gztell64($zp); }
+        }
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-php73/LICENSE b/core/libraries/vendor/symfony/polyfill-php73/LICENSE
new file mode 100644
index 00000000..ad399a79
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php73/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/symfony/polyfill-php73/bootstrap.php b/core/libraries/vendor/symfony/polyfill-php73/bootstrap.php
new file mode 100644
index 00000000..304b2dee
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-php73/bootstrap.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (PHP_VERSION_ID < 70300) {
+    if (!function_exists('is_countable')) {
+        function is_countable($var) { return is_array($var) || $var instanceof Countable || $var instanceof ResourceBundle || $var instanceof SimpleXmlElement; }
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-util/Binary.php b/core/libraries/vendor/symfony/polyfill-util/Binary.php
new file mode 100644
index 00000000..815bc750
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-util/Binary.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Util;
+
+if (extension_loaded('mbstring')) {
+    class Binary extends BinaryOnFuncOverload {}
+} else {
+    class Binary extends BinaryNoFuncOverload {}
+}
diff --git a/core/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php b/core/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
new file mode 100644
index 00000000..800ad75d
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Util;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class BinaryNoFuncOverload
+{
+    public static function strlen($s)
+    {
+        return \strlen($s);
+    }
+
+    public static function strpos($haystack, $needle, $offset = 0)
+    {
+        return strpos($haystack, $needle, $offset);
+    }
+
+    public static function strrpos($haystack, $needle, $offset = 0)
+    {
+        return strrpos($haystack, $needle, $offset);
+    }
+
+    public static function substr($string, $start, $length = PHP_INT_MAX)
+    {
+        return substr($string, $start, $length);
+    }
+
+    public static function stripos($s, $needle, $offset = 0)
+    {
+        return stripos($s, $needle, $offset);
+    }
+
+    public static function stristr($s, $needle, $part = false)
+    {
+        return stristr($s, $needle, $part);
+    }
+
+    public static function strrchr($s, $needle, $part = false)
+    {
+        return strrchr($s, $needle, $part);
+    }
+
+    public static function strripos($s, $needle, $offset = 0)
+    {
+        return strripos($s, $needle, $offset);
+    }
+
+    public static function strstr($s, $needle, $part = false)
+    {
+        return strstr($s, $needle, $part);
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php b/core/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
new file mode 100644
index 00000000..e1b886ea
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Util;
+
+/**
+ * Binary safe version of string functions overloaded when MB_OVERLOAD_STRING is enabled.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class BinaryOnFuncOverload
+{
+    public static function strlen($s)
+    {
+        return mb_strlen($s, '8bit');
+    }
+
+    public static function strpos($haystack, $needle, $offset = 0)
+    {
+        return mb_strpos($haystack, $needle, $offset, '8bit');
+    }
+
+    public static function strrpos($haystack, $needle, $offset = 0)
+    {
+        return mb_strrpos($haystack, $needle, $offset, '8bit');
+    }
+
+    public static function substr($string, $start, $length = 2147483647)
+    {
+        return mb_substr($string, $start, $length, '8bit');
+    }
+
+    public static function stripos($s, $needle, $offset = 0)
+    {
+        return mb_stripos($s, $needle, $offset, '8bit');
+    }
+
+    public static function stristr($s, $needle, $part = false)
+    {
+        return mb_stristr($s, $needle, $part, '8bit');
+    }
+
+    public static function strrchr($s, $needle, $part = false)
+    {
+        return mb_strrchr($s, $needle, $part, '8bit');
+    }
+
+    public static function strripos($s, $needle, $offset = 0)
+    {
+        return mb_strripos($s, $needle, $offset, '8bit');
+    }
+
+    public static function strstr($s, $needle, $part = false)
+    {
+        return mb_strstr($s, $needle, $part, '8bit');
+    }
+}
diff --git a/core/libraries/vendor/symfony/polyfill-util/LICENSE b/core/libraries/vendor/symfony/polyfill-util/LICENSE
new file mode 100644
index 00000000..24fa32c2
--- /dev/null
+++ b/core/libraries/vendor/symfony/polyfill-util/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2018 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/symfony/yaml/Dumper.php b/core/libraries/vendor/symfony/yaml/Dumper.php
new file mode 100644
index 00000000..96da91e5
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Dumper.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Dumper dumps PHP variables to YAML strings.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Dumper
+{
+    /**
+     * The amount of spaces to use for indentation of nested nodes.
+     *
+     * @var int
+     */
+    protected $indentation = 4;
+
+    /**
+     * Sets the indentation.
+     *
+     * @param int $num The amount of spaces to use for indentation of nested nodes
+     */
+    public function setIndentation($num)
+    {
+        if ($num < 1) {
+            throw new \InvalidArgumentException('The indentation must be greater than zero.');
+        }
+
+        $this->indentation = (int) $num;
+    }
+
+    /**
+     * Dumps a PHP value to YAML.
+     *
+     * @param mixed $input                  The PHP value
+     * @param int   $inline                 The level where you switch to inline YAML
+     * @param int   $indent                 The level of indentation (used internally)
+     * @param bool  $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          True if object support is enabled, false otherwise
+     *
+     * @return string The YAML representation of the PHP value
+     */
+    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        $output = '';
+        $prefix = $indent ? str_repeat(' ', $indent) : '';
+
+        if ($inline <= 0 || !is_array($input) || empty($input)) {
+            $output .= $prefix.Inline::dump($input, $exceptionOnInvalidType, $objectSupport);
+        } else {
+            $isAHash = Inline::isHash($input);
+
+            foreach ($input as $key => $value) {
+                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+
+                $output .= sprintf('%s%s%s%s',
+                    $prefix,
+                    $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
+                    $willBeInlined ? ' ' : "\n",
+                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
+                ).($willBeInlined ? "\n" : '');
+            }
+        }
+
+        return $output;
+    }
+}
diff --git a/core/libraries/vendor/symfony/yaml/Escaper.php b/core/libraries/vendor/symfony/yaml/Escaper.php
new file mode 100644
index 00000000..94bb3924
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Escaper.php
@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Escaper encapsulates escaping rules for single and double-quoted
+ * YAML strings.
+ *
+ * @author Matthew Lewinski <matthew@lewinski.org>
+ *
+ * @internal
+ */
+class Escaper
+{
+    // Characters that would cause a dumped string to require double quoting.
+    const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
+
+    // Mapping arrays for escaping a double quoted string. The backslash is
+    // first to ensure proper escaping because str_replace operates iteratively
+    // on the input arrays. This ordering of the characters avoids the use of strtr,
+    // which performs more slowly.
+    private static $escapees = array('\\', '\\\\', '\\"', '"',
+                                     "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
+                                     "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
+                                     "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
+                                     "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
+                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",
+                               );
+    private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
+                                     '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
+                                     '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
+                                     '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
+                                     '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
+                                     '\\N', '\\_', '\\L', '\\P',
+                              );
+
+    /**
+     * Determines if a PHP value would require double quoting in YAML.
+     *
+     * @param string $value A PHP value
+     *
+     * @return bool True if the value would require double quotes
+     */
+    public static function requiresDoubleQuoting($value)
+    {
+        return 0 < preg_match('/'.self::REGEX_CHARACTER_TO_ESCAPE.'/u', $value);
+    }
+
+    /**
+     * Escapes and surrounds a PHP value with double quotes.
+     *
+     * @param string $value A PHP value
+     *
+     * @return string The quoted, escaped string
+     */
+    public static function escapeWithDoubleQuotes($value)
+    {
+        return sprintf('"%s"', str_replace(self::$escapees, self::$escaped, $value));
+    }
+
+    /**
+     * Determines if a PHP value would require single quoting in YAML.
+     *
+     * @param string $value A PHP value
+     *
+     * @return bool True if the value would require single quotes
+     */
+    public static function requiresSingleQuoting($value)
+    {
+        // Determines if a PHP value is entirely composed of a value that would
+        // require single quoting in YAML.
+        if (in_array(strtolower($value), array('null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'))) {
+            return true;
+        }
+
+        // Determines if the PHP value contains any single characters that would
+        // cause it to require single quoting in YAML.
+        return 0 < preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
+    }
+
+    /**
+     * Escapes and surrounds a PHP value with single quotes.
+     *
+     * @param string $value A PHP value
+     *
+     * @return string The quoted, escaped string
+     */
+    public static function escapeWithSingleQuotes($value)
+    {
+        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
+    }
+}
diff --git a/core/libraries/vendor/symfony/yaml/Exception/DumpException.php b/core/libraries/vendor/symfony/yaml/Exception/DumpException.php
new file mode 100644
index 00000000..cce972f2
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Exception/DumpException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception class thrown when an error occurs during dumping.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class DumpException extends RuntimeException
+{
+}
diff --git a/core/libraries/vendor/symfony/yaml/Exception/ExceptionInterface.php b/core/libraries/vendor/symfony/yaml/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..ad850eea
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Exception/ExceptionInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception interface for all exceptions thrown by the component.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface ExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/symfony/yaml/Exception/ParseException.php b/core/libraries/vendor/symfony/yaml/Exception/ParseException.php
new file mode 100644
index 00000000..60802b6d
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Exception/ParseException.php
@@ -0,0 +1,144 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception class thrown when an error occurs during parsing.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class ParseException extends RuntimeException
+{
+    private $parsedFile;
+    private $parsedLine;
+    private $snippet;
+    private $rawMessage;
+
+    /**
+     * @param string          $message    The error message
+     * @param int             $parsedLine The line where the error occurred
+     * @param string|null     $snippet    The snippet of code near the problem
+     * @param string|null     $parsedFile The file name where the error occurred
+     * @param \Exception|null $previous   The previous exception
+     */
+    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
+    {
+        $this->parsedFile = $parsedFile;
+        $this->parsedLine = $parsedLine;
+        $this->snippet = $snippet;
+        $this->rawMessage = $message;
+
+        $this->updateRepr();
+
+        parent::__construct($this->message, 0, $previous);
+    }
+
+    /**
+     * Gets the snippet of code near the error.
+     *
+     * @return string The snippet of code
+     */
+    public function getSnippet()
+    {
+        return $this->snippet;
+    }
+
+    /**
+     * Sets the snippet of code near the error.
+     *
+     * @param string $snippet The code snippet
+     */
+    public function setSnippet($snippet)
+    {
+        $this->snippet = $snippet;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the filename where the error occurred.
+     *
+     * This method returns null if a string is parsed.
+     *
+     * @return string The filename
+     */
+    public function getParsedFile()
+    {
+        return $this->parsedFile;
+    }
+
+    /**
+     * Sets the filename where the error occurred.
+     *
+     * @param string $parsedFile The filename
+     */
+    public function setParsedFile($parsedFile)
+    {
+        $this->parsedFile = $parsedFile;
+
+        $this->updateRepr();
+    }
+
+    /**
+     * Gets the line where the error occurred.
+     *
+     * @return int The file line
+     */
+    public function getParsedLine()
+    {
+        return $this->parsedLine;
+    }
+
+    /**
+     * Sets the line where the error occurred.
+     *
+     * @param int $parsedLine The file line
+     */
+    public function setParsedLine($parsedLine)
+    {
+        $this->parsedLine = $parsedLine;
+
+        $this->updateRepr();
+    }
+
+    private function updateRepr()
+    {
+        $this->message = $this->rawMessage;
+
+        $dot = false;
+        if ('.' === substr($this->message, -1)) {
+            $this->message = substr($this->message, 0, -1);
+            $dot = true;
+        }
+
+        if (null !== $this->parsedFile) {
+            if (\PHP_VERSION_ID >= 50400) {
+                $jsonOptions = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+            } else {
+                $jsonOptions = 0;
+            }
+            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, $jsonOptions));
+        }
+
+        if ($this->parsedLine >= 0) {
+            $this->message .= sprintf(' at line %d', $this->parsedLine);
+        }
+
+        if ($this->snippet) {
+            $this->message .= sprintf(' (near "%s")', $this->snippet);
+        }
+
+        if ($dot) {
+            $this->message .= '.';
+        }
+    }
+}
diff --git a/core/libraries/vendor/symfony/yaml/Exception/RuntimeException.php b/core/libraries/vendor/symfony/yaml/Exception/RuntimeException.php
new file mode 100644
index 00000000..3f36b73b
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Exception/RuntimeException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml\Exception;
+
+/**
+ * Exception class thrown when an error occurs during parsing.
+ *
+ * @author Romain Neutron <imprec@gmail.com>
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/core/libraries/vendor/symfony/yaml/Inline.php b/core/libraries/vendor/symfony/yaml/Inline.php
new file mode 100644
index 00000000..743be249
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Inline.php
@@ -0,0 +1,609 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Exception\DumpException;
+
+/**
+ * Inline implements a YAML parser/dumper for the YAML inline syntax.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Inline
+{
+    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
+
+    private static $exceptionOnInvalidType = false;
+    private static $objectSupport = false;
+    private static $objectForMap = false;
+
+    /**
+     * Converts a YAML string to a PHP value.
+     *
+     * @param string $value                  A YAML string
+     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
+     * @param array  $references             Mapping of variable names to values
+     *
+     * @return mixed A PHP value
+     *
+     * @throws ParseException
+     */
+    public static function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false, $references = array())
+    {
+        self::$exceptionOnInvalidType = $exceptionOnInvalidType;
+        self::$objectSupport = $objectSupport;
+        self::$objectForMap = $objectForMap;
+
+        $value = trim($value);
+
+        if ('' === $value) {
+            return '';
+        }
+
+        if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('ASCII');
+        }
+
+        $i = 0;
+        switch ($value[0]) {
+            case '[':
+                $result = self::parseSequence($value, $i, $references);
+                ++$i;
+                break;
+            case '{':
+                $result = self::parseMapping($value, $i, $references);
+                ++$i;
+                break;
+            default:
+                $result = self::parseScalar($value, null, array('"', "'"), $i, true, $references);
+        }
+
+        // some comments are allowed at the end
+        if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
+            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)));
+        }
+
+        if (isset($mbEncoding)) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Dumps a given PHP variable to a YAML string.
+     *
+     * @param mixed $value                  The PHP variable to convert
+     * @param bool  $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          True if object support is enabled, false otherwise
+     *
+     * @return string The YAML string representing the PHP value
+     *
+     * @throws DumpException When trying to dump PHP resource
+     */
+    public static function dump($value, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        switch (true) {
+            case is_resource($value):
+                if ($exceptionOnInvalidType) {
+                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
+                }
+
+                return 'null';
+            case is_object($value):
+                if ($objectSupport) {
+                    return '!php/object:'.serialize($value);
+                }
+
+                if ($exceptionOnInvalidType) {
+                    throw new DumpException('Object support when dumping a YAML file has been disabled.');
+                }
+
+                return 'null';
+            case is_array($value):
+                return self::dumpArray($value, $exceptionOnInvalidType, $objectSupport);
+            case null === $value:
+                return 'null';
+            case true === $value:
+                return 'true';
+            case false === $value:
+                return 'false';
+            case ctype_digit($value):
+                return is_string($value) ? "'$value'" : (int) $value;
+            case is_numeric($value):
+                $locale = setlocale(LC_NUMERIC, 0);
+                if (false !== $locale) {
+                    setlocale(LC_NUMERIC, 'C');
+                }
+                if (is_float($value)) {
+                    $repr = (string) $value;
+                    if (is_infinite($value)) {
+                        $repr = str_ireplace('INF', '.Inf', $repr);
+                    } elseif (floor($value) == $value && $repr == $value) {
+                        // Preserve float data type since storing a whole number will result in integer value.
+                        $repr = '!!float '.$repr;
+                    }
+                } else {
+                    $repr = is_string($value) ? "'$value'" : (string) $value;
+                }
+                if (false !== $locale) {
+                    setlocale(LC_NUMERIC, $locale);
+                }
+
+                return $repr;
+            case '' == $value:
+                return "''";
+            case Escaper::requiresDoubleQuoting($value):
+                return Escaper::escapeWithDoubleQuotes($value);
+            case Escaper::requiresSingleQuoting($value):
+            case Parser::preg_match(self::getHexRegex(), $value):
+            case Parser::preg_match(self::getTimestampRegex(), $value):
+                return Escaper::escapeWithSingleQuotes($value);
+            default:
+                return $value;
+        }
+    }
+
+    /**
+     * Check if given array is hash or just normal indexed array.
+     *
+     * @internal
+     *
+     * @param array $value The PHP array to check
+     *
+     * @return bool true if value is hash array, false otherwise
+     */
+    public static function isHash(array $value)
+    {
+        $expectedKey = 0;
+
+        foreach ($value as $key => $val) {
+            if ($key !== $expectedKey++) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Dumps a PHP array to a YAML string.
+     *
+     * @param array $value                  The PHP array to dump
+     * @param bool  $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          True if object support is enabled, false otherwise
+     *
+     * @return string The YAML string representing the PHP array
+     */
+    private static function dumpArray($value, $exceptionOnInvalidType, $objectSupport)
+    {
+        // array
+        if ($value && !self::isHash($value)) {
+            $output = array();
+            foreach ($value as $val) {
+                $output[] = self::dump($val, $exceptionOnInvalidType, $objectSupport);
+            }
+
+            return sprintf('[%s]', implode(', ', $output));
+        }
+
+        // hash
+        $output = array();
+        foreach ($value as $key => $val) {
+            $output[] = sprintf('%s: %s', self::dump($key, $exceptionOnInvalidType, $objectSupport), self::dump($val, $exceptionOnInvalidType, $objectSupport));
+        }
+
+        return sprintf('{ %s }', implode(', ', $output));
+    }
+
+    /**
+     * Parses a YAML scalar.
+     *
+     * @param string   $scalar
+     * @param string[] $delimiters
+     * @param string[] $stringDelimiters
+     * @param int      &$i
+     * @param bool     $evaluate
+     * @param array    $references
+     *
+     * @return string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     *
+     * @internal
+     */
+    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
+    {
+        if (in_array($scalar[$i], $stringDelimiters)) {
+            // quoted scalar
+            $output = self::parseQuotedScalar($scalar, $i);
+
+            if (null !== $delimiters) {
+                $tmp = ltrim(substr($scalar, $i), ' ');
+                if ('' === $tmp) {
+                    throw new ParseException(sprintf('Unexpected end of line, expected one of "%s".', implode($delimiters)));
+                }
+                if (!in_array($tmp[0], $delimiters)) {
+                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));
+                }
+            }
+        } else {
+            // "normal" string
+            if (!$delimiters) {
+                $output = substr($scalar, $i);
+                $i += strlen($output);
+
+                // remove comments
+                if (Parser::preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
+                    $output = substr($output, 0, $match[0][1]);
+                }
+            } elseif (Parser::preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
+                $output = $match[1];
+                $i += strlen($output);
+            } else {
+                throw new ParseException(sprintf('Malformed inline YAML string: %s.', $scalar));
+            }
+
+            // a non-quoted string cannot start with @ or ` (reserved) nor with a scalar indicator (| or >)
+            if ($output && ('@' === $output[0] || '`' === $output[0] || '|' === $output[0] || '>' === $output[0])) {
+                @trigger_error(sprintf('Not quoting the scalar "%s" starting with "%s" is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $output, $output[0]), E_USER_DEPRECATED);
+
+                // to be thrown in 3.0
+                // throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]));
+            }
+
+            if ($evaluate) {
+                $output = self::evaluateScalar($output, $references);
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Parses a YAML quoted scalar.
+     *
+     * @param string $scalar
+     * @param int    &$i
+     *
+     * @return string
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    private static function parseQuotedScalar($scalar, &$i)
+    {
+        if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
+            throw new ParseException(sprintf('Malformed inline YAML string: %s.', substr($scalar, $i)));
+        }
+
+        $output = substr($match[0], 1, strlen($match[0]) - 2);
+
+        $unescaper = new Unescaper();
+        if ('"' == $scalar[$i]) {
+            $output = $unescaper->unescapeDoubleQuotedString($output);
+        } else {
+            $output = $unescaper->unescapeSingleQuotedString($output);
+        }
+
+        $i += strlen($match[0]);
+
+        return $output;
+    }
+
+    /**
+     * Parses a YAML sequence.
+     *
+     * @param string $sequence
+     * @param int    &$i
+     * @param array  $references
+     *
+     * @return array
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    private static function parseSequence($sequence, &$i = 0, $references = array())
+    {
+        $output = array();
+        $len = strlen($sequence);
+        ++$i;
+
+        // [foo, bar, ...]
+        while ($i < $len) {
+            switch ($sequence[$i]) {
+                case '[':
+                    // nested sequence
+                    $output[] = self::parseSequence($sequence, $i, $references);
+                    break;
+                case '{':
+                    // nested mapping
+                    $output[] = self::parseMapping($sequence, $i, $references);
+                    break;
+                case ']':
+                    return $output;
+                case ',':
+                case ' ':
+                    break;
+                default:
+                    $isQuoted = in_array($sequence[$i], array('"', "'"));
+                    $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i, true, $references);
+
+                    // the value can be an array if a reference has been resolved to an array var
+                    if (!is_array($value) && !$isQuoted && false !== strpos($value, ': ')) {
+                        // embedded mapping?
+                        try {
+                            $pos = 0;
+                            $value = self::parseMapping('{'.$value.'}', $pos, $references);
+                        } catch (\InvalidArgumentException $e) {
+                            // no, it's not
+                        }
+                    }
+
+                    $output[] = $value;
+
+                    --$i;
+            }
+
+            ++$i;
+        }
+
+        throw new ParseException(sprintf('Malformed inline YAML string: %s.', $sequence));
+    }
+
+    /**
+     * Parses a YAML mapping.
+     *
+     * @param string $mapping
+     * @param int    &$i
+     * @param array  $references
+     *
+     * @return array|\stdClass
+     *
+     * @throws ParseException When malformed inline YAML string is parsed
+     */
+    private static function parseMapping($mapping, &$i = 0, $references = array())
+    {
+        $output = array();
+        $len = strlen($mapping);
+        ++$i;
+        $allowOverwrite = false;
+
+        // {foo: bar, bar:foo, ...}
+        while ($i < $len) {
+            switch ($mapping[$i]) {
+                case ' ':
+                case ',':
+                    ++$i;
+                    continue 2;
+                case '}':
+                    if (self::$objectForMap) {
+                        return (object) $output;
+                    }
+
+                    return $output;
+            }
+
+            // key
+            $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
+
+            if ('<<' === $key) {
+                $allowOverwrite = true;
+            }
+
+            // value
+            $done = false;
+
+            while ($i < $len) {
+                switch ($mapping[$i]) {
+                    case '[':
+                        // nested sequence
+                        $value = self::parseSequence($mapping, $i, $references);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // Parser cannot abort this mapping earlier, since lines
+                        // are processed sequentially.
+                        // But overwriting is allowed when a merge node is used in current block.
+                        if ('<<' === $key) {
+                            foreach ($value as $parsedValue) {
+                                $output += $parsedValue;
+                            }
+                        } elseif ($allowOverwrite || !isset($output[$key])) {
+                            $output[$key] = $value;
+                        }
+                        $done = true;
+                        break;
+                    case '{':
+                        // nested mapping
+                        $value = self::parseMapping($mapping, $i, $references);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // Parser cannot abort this mapping earlier, since lines
+                        // are processed sequentially.
+                        // But overwriting is allowed when a merge node is used in current block.
+                        if ('<<' === $key) {
+                            $output += $value;
+                        } elseif ($allowOverwrite || !isset($output[$key])) {
+                            $output[$key] = $value;
+                        }
+                        $done = true;
+                        break;
+                    case ':':
+                    case ' ':
+                        break;
+                    default:
+                        $value = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i, true, $references);
+                        // Spec: Keys MUST be unique; first one wins.
+                        // Parser cannot abort this mapping earlier, since lines
+                        // are processed sequentially.
+                        // But overwriting is allowed when a merge node is used in current block.
+                        if ('<<' === $key) {
+                            $output += $value;
+                        } elseif ($allowOverwrite || !isset($output[$key])) {
+                            $output[$key] = $value;
+                        }
+                        $done = true;
+                        --$i;
+                }
+
+                ++$i;
+
+                if ($done) {
+                    continue 2;
+                }
+            }
+        }
+
+        throw new ParseException(sprintf('Malformed inline YAML string: %s.', $mapping));
+    }
+
+    /**
+     * Evaluates scalars and replaces magic values.
+     *
+     * @param string $scalar
+     * @param array  $references
+     *
+     * @return mixed The evaluated YAML string
+     *
+     * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
+     */
+    private static function evaluateScalar($scalar, $references = array())
+    {
+        $scalar = trim($scalar);
+        $scalarLower = strtolower($scalar);
+
+        if (0 === strpos($scalar, '*')) {
+            if (false !== $pos = strpos($scalar, '#')) {
+                $value = substr($scalar, 1, $pos - 2);
+            } else {
+                $value = substr($scalar, 1);
+            }
+
+            // an unquoted *
+            if (false === $value || '' === $value) {
+                throw new ParseException('A reference must contain at least one character.');
+            }
+
+            if (!array_key_exists($value, $references)) {
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value));
+            }
+
+            return $references[$value];
+        }
+
+        switch (true) {
+            case 'null' === $scalarLower:
+            case '' === $scalar:
+            case '~' === $scalar:
+                return;
+            case 'true' === $scalarLower:
+                return true;
+            case 'false' === $scalarLower:
+                return false;
+            // Optimise for returning strings.
+            case '+' === $scalar[0] || '-' === $scalar[0] || '.' === $scalar[0] || '!' === $scalar[0] || is_numeric($scalar[0]):
+                switch (true) {
+                    case 0 === strpos($scalar, '!str'):
+                        return (string) substr($scalar, 5);
+                    case 0 === strpos($scalar, '! '):
+                        return (int) self::parseScalar(substr($scalar, 2));
+                    case 0 === strpos($scalar, '!php/object:'):
+                        if (self::$objectSupport) {
+                            return unserialize(substr($scalar, 12));
+                        }
+
+                        if (self::$exceptionOnInvalidType) {
+                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                        }
+
+                        return;
+                    case 0 === strpos($scalar, '!!php/object:'):
+                        if (self::$objectSupport) {
+                            return unserialize(substr($scalar, 13));
+                        }
+
+                        if (self::$exceptionOnInvalidType) {
+                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                        }
+
+                        return;
+                    case 0 === strpos($scalar, '!!float '):
+                        return (float) substr($scalar, 8);
+                    case ctype_digit($scalar):
+                        $raw = $scalar;
+                        $cast = (int) $scalar;
+
+                        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
+                    case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
+                        $raw = $scalar;
+                        $cast = (int) $scalar;
+
+                        return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw);
+                    case is_numeric($scalar):
+                    case Parser::preg_match(self::getHexRegex(), $scalar):
+                        return '0x' === $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar;
+                    case '.inf' === $scalarLower:
+                    case '.nan' === $scalarLower:
+                        return -log(0);
+                    case '-.inf' === $scalarLower:
+                        return log(0);
+                    case Parser::preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
+                        return (float) str_replace(',', '', $scalar);
+                    case Parser::preg_match(self::getTimestampRegex(), $scalar):
+                        $timeZone = date_default_timezone_get();
+                        date_default_timezone_set('UTC');
+                        $time = strtotime($scalar);
+                        date_default_timezone_set($timeZone);
+
+                        return $time;
+                }
+                // no break
+            default:
+                return (string) $scalar;
+        }
+    }
+
+    /**
+     * Gets a regex that matches a YAML date.
+     *
+     * @return string The regular expression
+     *
+     * @see http://www.yaml.org/spec/1.2/spec.html#id2761573
+     */
+    private static function getTimestampRegex()
+    {
+        return <<<EOF
+        ~^
+        (?P<year>[0-9][0-9][0-9][0-9])
+        -(?P<month>[0-9][0-9]?)
+        -(?P<day>[0-9][0-9]?)
+        (?:(?:[Tt]|[ \t]+)
+        (?P<hour>[0-9][0-9]?)
+        :(?P<minute>[0-9][0-9])
+        :(?P<second>[0-9][0-9])
+        (?:\.(?P<fraction>[0-9]*))?
+        (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+        (?::(?P<tz_minute>[0-9][0-9]))?))?)?
+        $~x
+EOF;
+    }
+
+    /**
+     * Gets a regex that matches a YAML number in hexadecimal notation.
+     *
+     * @return string
+     */
+    private static function getHexRegex()
+    {
+        return '~^0x[0-9a-f]++$~i';
+    }
+}
diff --git a/core/libraries/vendor/symfony/yaml/LICENSE b/core/libraries/vendor/symfony/yaml/LICENSE
new file mode 100644
index 00000000..21d7fb9e
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-2018 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/libraries/vendor/symfony/yaml/Parser.php b/core/libraries/vendor/symfony/yaml/Parser.php
new file mode 100644
index 00000000..d043dd7d
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Parser.php
@@ -0,0 +1,852 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+
+/**
+ * Parser parses YAML strings to convert them to PHP arrays.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Parser
+{
+    const BLOCK_SCALAR_HEADER_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
+    // BC - wrongly named
+    const FOLDED_SCALAR_PATTERN = self::BLOCK_SCALAR_HEADER_PATTERN;
+
+    private $offset = 0;
+    private $totalNumberOfLines;
+    private $lines = array();
+    private $currentLineNb = -1;
+    private $currentLine = '';
+    private $refs = array();
+    private $skippedLineNumbers = array();
+    private $locallySkippedLineNumbers = array();
+
+    /**
+     * @param int      $offset             The offset of YAML document (used for line numbers in error messages)
+     * @param int|null $totalNumberOfLines The overall number of lines being parsed
+     * @param int[]    $skippedLineNumbers Number of comment lines that have been skipped by the parser
+     */
+    public function __construct($offset = 0, $totalNumberOfLines = null, array $skippedLineNumbers = array())
+    {
+        $this->offset = $offset;
+        $this->totalNumberOfLines = $totalNumberOfLines;
+        $this->skippedLineNumbers = $skippedLineNumbers;
+    }
+
+    /**
+     * Parses a YAML string to a PHP value.
+     *
+     * @param string $value                  A YAML string
+     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
+     *
+     * @return mixed A PHP value
+     *
+     * @throws ParseException If the YAML is not valid
+     */
+    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
+    {
+        if (false === preg_match('//u', $value)) {
+            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
+        }
+
+        $this->refs = array();
+
+        $mbEncoding = null;
+        $e = null;
+        $data = null;
+
+        if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) {
+            $mbEncoding = mb_internal_encoding();
+            mb_internal_encoding('UTF-8');
+        }
+
+        try {
+            $data = $this->doParse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+        }
+
+        if (null !== $mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        $this->lines = array();
+        $this->currentLine = '';
+        $this->refs = array();
+        $this->skippedLineNumbers = array();
+        $this->locallySkippedLineNumbers = array();
+
+        if (null !== $e) {
+            throw $e;
+        }
+
+        return $data;
+    }
+
+    private function doParse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
+    {
+        $this->currentLineNb = -1;
+        $this->currentLine = '';
+        $value = $this->cleanup($value);
+        $this->lines = explode("\n", $value);
+        $this->locallySkippedLineNumbers = array();
+
+        if (null === $this->totalNumberOfLines) {
+            $this->totalNumberOfLines = count($this->lines);
+        }
+
+        $data = array();
+        $context = null;
+        $allowOverwrite = false;
+
+        while ($this->moveToNextLine()) {
+            if ($this->isCurrentLineEmpty()) {
+                continue;
+            }
+
+            // tab?
+            if ("\t" === $this->currentLine[0]) {
+                throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+
+            $isRef = $mergeNode = false;
+            if (self::preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+))?$#u', rtrim($this->currentLine), $values)) {
+                if ($context && 'mapping' == $context) {
+                    throw new ParseException('You cannot define a sequence item when in a mapping', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                }
+                $context = 'sequence';
+
+                if (isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                    $isRef = $matches['ref'];
+                    $values['value'] = $matches['value'];
+                }
+
+                // array
+                if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
+                    $data[] = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                } else {
+                    if (isset($values['leadspaces'])
+                        && self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+))?$#u', rtrim($values['value']), $matches)
+                    ) {
+                        // this is a compact notation element, add to next block and parse
+                        $block = $values['value'];
+                        if ($this->isNextLineIndented()) {
+                            $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + strlen($values['leadspaces']) + 1);
+                        }
+
+                        $data[] = $this->parseBlock($this->getRealCurrentLineNb(), $block, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+                    } else {
+                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap, $context);
+                    }
+                }
+                if ($isRef) {
+                    $this->refs[$isRef] = end($data);
+                }
+            } elseif (
+                self::preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+))?$#u', rtrim($this->currentLine), $values)
+                && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))
+            ) {
+                if ($context && 'sequence' == $context) {
+                    throw new ParseException('You cannot define a mapping item when in a sequence', $this->currentLineNb + 1, $this->currentLine);
+                }
+                $context = 'mapping';
+
+                // force correct settings
+                Inline::parse(null, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+                try {
+                    $key = Inline::parseScalar($values['key']);
+                } catch (ParseException $e) {
+                    $e->setParsedLine($this->getRealCurrentLineNb() + 1);
+                    $e->setSnippet($this->currentLine);
+
+                    throw $e;
+                }
+
+                // Convert float keys to strings, to avoid being converted to integers by PHP
+                if (is_float($key)) {
+                    $key = (string) $key;
+                }
+
+                if ('<<' === $key && (!isset($values['value']) || !self::preg_match('#^&(?P<ref>[^ ]+)#u', $values['value'], $refMatches))) {
+                    $mergeNode = true;
+                    $allowOverwrite = true;
+                    if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
+                        $refName = substr($values['value'], 1);
+                        if (!array_key_exists($refName, $this->refs)) {
+                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        }
+
+                        $refValue = $this->refs[$refName];
+
+                        if (!is_array($refValue)) {
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        }
+
+                        $data += $refValue; // array union
+                    } else {
+                        if (isset($values['value']) && '' !== $values['value']) {
+                            $value = $values['value'];
+                        } else {
+                            $value = $this->getNextEmbedBlock();
+                        }
+                        $parsed = $this->parseBlock($this->getRealCurrentLineNb() + 1, $value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+
+                        if (!is_array($parsed)) {
+                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+                        }
+
+                        if (isset($parsed[0])) {
+                            // If the value associated with the merge key is a sequence, then this sequence is expected to contain mapping nodes
+                            // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
+                            // in the sequence override keys specified in later mapping nodes.
+                            foreach ($parsed as $parsedItem) {
+                                if (!is_array($parsedItem)) {
+                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
+                                }
+
+                                $data += $parsedItem; // array union
+                            }
+                        } else {
+                            // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
+                            // current mapping, unless the key already exists in it.
+                            $data += $parsed; // array union
+                        }
+                    }
+                } elseif ('<<' !== $key && isset($values['value']) && self::preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
+                    $isRef = $matches['ref'];
+                    $values['value'] = $matches['value'];
+                }
+
+                if ($mergeNode) {
+                    // Merge keys
+                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#') || '<<' === $key) {
+                    // hash
+                    // if next line is less indented or equal, then it means that the current value is null
+                    if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
+                        // Spec: Keys MUST be unique; first one wins.
+                        // But overwriting is allowed when a merge node is used in current block.
+                        if ($allowOverwrite || !isset($data[$key])) {
+                            $data[$key] = null;
+                        }
+                    } else {
+                        $value = $this->parseBlock($this->getRealCurrentLineNb() + 1, $this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
+
+                        if ('<<' === $key) {
+                            $this->refs[$refMatches['ref']] = $value;
+                            $data += $value;
+                        } elseif ($allowOverwrite || !isset($data[$key])) {
+                            // Spec: Keys MUST be unique; first one wins.
+                            // But overwriting is allowed when a merge node is used in current block.
+                            $data[$key] = $value;
+                        }
+                    }
+                } else {
+                    $value = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap, $context);
+                    // Spec: Keys MUST be unique; first one wins.
+                    // But overwriting is allowed when a merge node is used in current block.
+                    if ($allowOverwrite || !isset($data[$key])) {
+                        $data[$key] = $value;
+                    }
+                }
+                if ($isRef) {
+                    $this->refs[$isRef] = $data[$key];
+                }
+            } else {
+                // multiple documents are not supported
+                if ('---' === $this->currentLine) {
+                    throw new ParseException('Multiple documents are not supported.', $this->currentLineNb + 1, $this->currentLine);
+                }
+
+                // 1-liner optionally followed by newline(s)
+                if (is_string($value) && $this->lines[0] === trim($value)) {
+                    try {
+                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+                    } catch (ParseException $e) {
+                        $e->setParsedLine($this->getRealCurrentLineNb() + 1);
+                        $e->setSnippet($this->currentLine);
+
+                        throw $e;
+                    }
+
+                    return $value;
+                }
+
+                throw new ParseException('Unable to parse.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+        }
+
+        if ($objectForMap && !is_object($data) && 'mapping' === $context) {
+            $object = new \stdClass();
+
+            foreach ($data as $key => $value) {
+                $object->$key = $value;
+            }
+
+            $data = $object;
+        }
+
+        return empty($data) ? null : $data;
+    }
+
+    private function parseBlock($offset, $yaml, $exceptionOnInvalidType, $objectSupport, $objectForMap)
+    {
+        $skippedLineNumbers = $this->skippedLineNumbers;
+
+        foreach ($this->locallySkippedLineNumbers as $lineNumber) {
+            if ($lineNumber < $offset) {
+                continue;
+            }
+
+            $skippedLineNumbers[] = $lineNumber;
+        }
+
+        $parser = new self($offset, $this->totalNumberOfLines, $skippedLineNumbers);
+        $parser->refs = &$this->refs;
+
+        return $parser->doParse($yaml, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+    }
+
+    /**
+     * Returns the current line number (takes the offset into account).
+     *
+     * @return int The current line number
+     */
+    private function getRealCurrentLineNb()
+    {
+        $realCurrentLineNumber = $this->currentLineNb + $this->offset;
+
+        foreach ($this->skippedLineNumbers as $skippedLineNumber) {
+            if ($skippedLineNumber > $realCurrentLineNumber) {
+                break;
+            }
+
+            ++$realCurrentLineNumber;
+        }
+
+        return $realCurrentLineNumber;
+    }
+
+    /**
+     * Returns the current line indentation.
+     *
+     * @return int The current line indentation
+     */
+    private function getCurrentLineIndentation()
+    {
+        return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
+    }
+
+    /**
+     * Returns the next embed block of YAML.
+     *
+     * @param int  $indentation The indent level at which the block is to be read, or null for default
+     * @param bool $inSequence  True if the enclosing data structure is a sequence
+     *
+     * @return string A YAML string
+     *
+     * @throws ParseException When indentation problem are detected
+     */
+    private function getNextEmbedBlock($indentation = null, $inSequence = false)
+    {
+        $oldLineIndentation = $this->getCurrentLineIndentation();
+        $blockScalarIndentations = array();
+
+        if ($this->isBlockScalarHeader()) {
+            $blockScalarIndentations[] = $this->getCurrentLineIndentation();
+        }
+
+        if (!$this->moveToNextLine()) {
+            return;
+        }
+
+        if (null === $indentation) {
+            $newIndent = $this->getCurrentLineIndentation();
+
+            $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem();
+
+            if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
+                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+        } else {
+            $newIndent = $indentation;
+        }
+
+        $data = array();
+        if ($this->getCurrentLineIndentation() >= $newIndent) {
+            $data[] = substr($this->currentLine, $newIndent);
+        } else {
+            $this->moveToPreviousLine();
+
+            return;
+        }
+
+        if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {
+            // the previous line contained a dash but no item content, this line is a sequence item with the same indentation
+            // and therefore no nested list or mapping
+            $this->moveToPreviousLine();
+
+            return;
+        }
+
+        $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem();
+
+        if (empty($blockScalarIndentations) && $this->isBlockScalarHeader()) {
+            $blockScalarIndentations[] = $this->getCurrentLineIndentation();
+        }
+
+        $previousLineIndentation = $this->getCurrentLineIndentation();
+
+        while ($this->moveToNextLine()) {
+            $indent = $this->getCurrentLineIndentation();
+
+            // terminate all block scalars that are more indented than the current line
+            if (!empty($blockScalarIndentations) && $indent < $previousLineIndentation && '' !== trim($this->currentLine)) {
+                foreach ($blockScalarIndentations as $key => $blockScalarIndentation) {
+                    if ($blockScalarIndentation >= $this->getCurrentLineIndentation()) {
+                        unset($blockScalarIndentations[$key]);
+                    }
+                }
+            }
+
+            if (empty($blockScalarIndentations) && !$this->isCurrentLineComment() && $this->isBlockScalarHeader()) {
+                $blockScalarIndentations[] = $this->getCurrentLineIndentation();
+            }
+
+            $previousLineIndentation = $indent;
+
+            if ($isItUnindentedCollection && !$this->isCurrentLineEmpty() && !$this->isStringUnIndentedCollectionItem() && $newIndent === $indent) {
+                $this->moveToPreviousLine();
+                break;
+            }
+
+            if ($this->isCurrentLineBlank()) {
+                $data[] = substr($this->currentLine, $newIndent);
+                continue;
+            }
+
+            // we ignore "comment" lines only when we are not inside a scalar block
+            if (empty($blockScalarIndentations) && $this->isCurrentLineComment()) {
+                // remember ignored comment lines (they are used later in nested
+                // parser calls to determine real line numbers)
+                //
+                // CAUTION: beware to not populate the global property here as it
+                // will otherwise influence the getRealCurrentLineNb() call here
+                // for consecutive comment lines and subsequent embedded blocks
+                $this->locallySkippedLineNumbers[] = $this->getRealCurrentLineNb();
+
+                continue;
+            }
+
+            if ($indent >= $newIndent) {
+                $data[] = substr($this->currentLine, $newIndent);
+            } elseif (0 == $indent) {
+                $this->moveToPreviousLine();
+
+                break;
+            } else {
+                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
+            }
+        }
+
+        return implode("\n", $data);
+    }
+
+    /**
+     * Moves the parser to the next line.
+     *
+     * @return bool
+     */
+    private function moveToNextLine()
+    {
+        if ($this->currentLineNb >= count($this->lines) - 1) {
+            return false;
+        }
+
+        $this->currentLine = $this->lines[++$this->currentLineNb];
+
+        return true;
+    }
+
+    /**
+     * Moves the parser to the previous line.
+     *
+     * @return bool
+     */
+    private function moveToPreviousLine()
+    {
+        if ($this->currentLineNb < 1) {
+            return false;
+        }
+
+        $this->currentLine = $this->lines[--$this->currentLineNb];
+
+        return true;
+    }
+
+    /**
+     * Parses a YAML value.
+     *
+     * @param string $value                  A YAML value
+     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+     * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
+     * @param string $context                The parser context (either sequence or mapping)
+     *
+     * @return mixed A PHP value
+     *
+     * @throws ParseException When reference does not exist
+     */
+    private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $context)
+    {
+        if (0 === strpos($value, '*')) {
+            if (false !== $pos = strpos($value, '#')) {
+                $value = substr($value, 1, $pos - 2);
+            } else {
+                $value = substr($value, 1);
+            }
+
+            if (!array_key_exists($value, $this->refs)) {
+                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLineNb + 1, $this->currentLine);
+            }
+
+            return $this->refs[$value];
+        }
+
+        if (self::preg_match('/^'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
+            $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
+
+            return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
+        }
+
+        try {
+            $parsedValue = Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
+
+            if ('mapping' === $context && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
+                @trigger_error(sprintf('Using a colon in the unquoted mapping value "%s" in line %d is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $value, $this->getRealCurrentLineNb() + 1), E_USER_DEPRECATED);
+
+                // to be thrown in 3.0
+                // throw new ParseException('A colon cannot be used in an unquoted mapping value.');
+            }
+
+            return $parsedValue;
+        } catch (ParseException $e) {
+            $e->setParsedLine($this->getRealCurrentLineNb() + 1);
+            $e->setSnippet($this->currentLine);
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Parses a block scalar.
+     *
+     * @param string $style       The style indicator that was used to begin this block scalar (| or >)
+     * @param string $chomping    The chomping indicator that was used to begin this block scalar (+ or -)
+     * @param int    $indentation The indentation indicator that was used to begin this block scalar
+     *
+     * @return string The text value
+     */
+    private function parseBlockScalar($style, $chomping = '', $indentation = 0)
+    {
+        $notEOF = $this->moveToNextLine();
+        if (!$notEOF) {
+            return '';
+        }
+
+        $isCurrentLineBlank = $this->isCurrentLineBlank();
+        $blockLines = array();
+
+        // leading blank lines are consumed before determining indentation
+        while ($notEOF && $isCurrentLineBlank) {
+            // newline only if not EOF
+            if ($notEOF = $this->moveToNextLine()) {
+                $blockLines[] = '';
+                $isCurrentLineBlank = $this->isCurrentLineBlank();
+            }
+        }
+
+        // determine indentation if not specified
+        if (0 === $indentation) {
+            if (self::preg_match('/^ +/', $this->currentLine, $matches)) {
+                $indentation = strlen($matches[0]);
+            }
+        }
+
+        if ($indentation > 0) {
+            $pattern = sprintf('/^ {%d}(.*)$/', $indentation);
+
+            while (
+                $notEOF && (
+                    $isCurrentLineBlank ||
+                    self::preg_match($pattern, $this->currentLine, $matches)
+                )
+            ) {
+                if ($isCurrentLineBlank && strlen($this->currentLine) > $indentation) {
+                    $blockLines[] = substr($this->currentLine, $indentation);
+                } elseif ($isCurrentLineBlank) {
+                    $blockLines[] = '';
+                } else {
+                    $blockLines[] = $matches[1];
+                }
+
+                // newline only if not EOF
+                if ($notEOF = $this->moveToNextLine()) {
+                    $isCurrentLineBlank = $this->isCurrentLineBlank();
+                }
+            }
+        } elseif ($notEOF) {
+            $blockLines[] = '';
+        }
+
+        if ($notEOF) {
+            $blockLines[] = '';
+            $this->moveToPreviousLine();
+        } elseif (!$notEOF && !$this->isCurrentLineLastLineInDocument()) {
+            $blockLines[] = '';
+        }
+
+        // folded style
+        if ('>' === $style) {
+            $text = '';
+            $previousLineIndented = false;
+            $previousLineBlank = false;
+
+            for ($i = 0, $blockLinesCount = count($blockLines); $i < $blockLinesCount; ++$i) {
+                if ('' === $blockLines[$i]) {
+                    $text .= "\n";
+                    $previousLineIndented = false;
+                    $previousLineBlank = true;
+                } elseif (' ' === $blockLines[$i][0]) {
+                    $text .= "\n".$blockLines[$i];
+                    $previousLineIndented = true;
+                    $previousLineBlank = false;
+                } elseif ($previousLineIndented) {
+                    $text .= "\n".$blockLines[$i];
+                    $previousLineIndented = false;
+                    $previousLineBlank = false;
+                } elseif ($previousLineBlank || 0 === $i) {
+                    $text .= $blockLines[$i];
+                    $previousLineIndented = false;
+                    $previousLineBlank = false;
+                } else {
+                    $text .= ' '.$blockLines[$i];
+                    $previousLineIndented = false;
+                    $previousLineBlank = false;
+                }
+            }
+        } else {
+            $text = implode("\n", $blockLines);
+        }
+
+        // deal with trailing newlines
+        if ('' === $chomping) {
+            $text = preg_replace('/\n+$/', "\n", $text);
+        } elseif ('-' === $chomping) {
+            $text = preg_replace('/\n+$/', '', $text);
+        }
+
+        return $text;
+    }
+
+    /**
+     * Returns true if the next line is indented.
+     *
+     * @return bool Returns true if the next line is indented, false otherwise
+     */
+    private function isNextLineIndented()
+    {
+        $currentIndentation = $this->getCurrentLineIndentation();
+        $EOF = !$this->moveToNextLine();
+
+        while (!$EOF && $this->isCurrentLineEmpty()) {
+            $EOF = !$this->moveToNextLine();
+        }
+
+        if ($EOF) {
+            return false;
+        }
+
+        $ret = $this->getCurrentLineIndentation() > $currentIndentation;
+
+        $this->moveToPreviousLine();
+
+        return $ret;
+    }
+
+    /**
+     * Returns true if the current line is blank or if it is a comment line.
+     *
+     * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
+     */
+    private function isCurrentLineEmpty()
+    {
+        return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
+    }
+
+    /**
+     * Returns true if the current line is blank.
+     *
+     * @return bool Returns true if the current line is blank, false otherwise
+     */
+    private function isCurrentLineBlank()
+    {
+        return '' == trim($this->currentLine, ' ');
+    }
+
+    /**
+     * Returns true if the current line is a comment line.
+     *
+     * @return bool Returns true if the current line is a comment line, false otherwise
+     */
+    private function isCurrentLineComment()
+    {
+        //checking explicitly the first char of the trim is faster than loops or strpos
+        $ltrimmedLine = ltrim($this->currentLine, ' ');
+
+        return '' !== $ltrimmedLine && '#' === $ltrimmedLine[0];
+    }
+
+    private function isCurrentLineLastLineInDocument()
+    {
+        return ($this->offset + $this->currentLineNb) >= ($this->totalNumberOfLines - 1);
+    }
+
+    /**
+     * Cleanups a YAML string to be parsed.
+     *
+     * @param string $value The input YAML string
+     *
+     * @return string A cleaned up YAML string
+     */
+    private function cleanup($value)
+    {
+        $value = str_replace(array("\r\n", "\r"), "\n", $value);
+
+        // strip YAML header
+        $count = 0;
+        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#u', '', $value, -1, $count);
+        $this->offset += $count;
+
+        // remove leading comments
+        $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
+        if (1 == $count) {
+            // items have been removed, update the offset
+            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+            $value = $trimmedValue;
+        }
+
+        // remove start of the document marker (---)
+        $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
+        if (1 == $count) {
+            // items have been removed, update the offset
+            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+            $value = $trimmedValue;
+
+            // remove end of the document marker (...)
+            $value = preg_replace('#\.\.\.\s*$#', '', $value);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Returns true if the next line starts unindented collection.
+     *
+     * @return bool Returns true if the next line starts unindented collection, false otherwise
+     */
+    private function isNextLineUnIndentedCollection()
+    {
+        $currentIndentation = $this->getCurrentLineIndentation();
+        $notEOF = $this->moveToNextLine();
+
+        while ($notEOF && $this->isCurrentLineEmpty()) {
+            $notEOF = $this->moveToNextLine();
+        }
+
+        if (false === $notEOF) {
+            return false;
+        }
+
+        $ret = $this->getCurrentLineIndentation() === $currentIndentation && $this->isStringUnIndentedCollectionItem();
+
+        $this->moveToPreviousLine();
+
+        return $ret;
+    }
+
+    /**
+     * Returns true if the string is un-indented collection item.
+     *
+     * @return bool Returns true if the string is un-indented collection item, false otherwise
+     */
+    private function isStringUnIndentedCollectionItem()
+    {
+        return '-' === rtrim($this->currentLine) || 0 === strpos($this->currentLine, '- ');
+    }
+
+    /**
+     * Tests whether or not the current line is the header of a block scalar.
+     *
+     * @return bool
+     */
+    private function isBlockScalarHeader()
+    {
+        return (bool) self::preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine);
+    }
+
+    /**
+     * A local wrapper for `preg_match` which will throw a ParseException if there
+     * is an internal error in the PCRE engine.
+     *
+     * This avoids us needing to check for "false" every time PCRE is used
+     * in the YAML engine
+     *
+     * @throws ParseException on a PCRE internal error
+     *
+     * @see preg_last_error()
+     *
+     * @internal
+     */
+    public static function preg_match($pattern, $subject, &$matches = null, $flags = 0, $offset = 0)
+    {
+        if (false === $ret = preg_match($pattern, $subject, $matches, $flags, $offset)) {
+            switch (preg_last_error()) {
+                case PREG_INTERNAL_ERROR:
+                    $error = 'Internal PCRE error.';
+                    break;
+                case PREG_BACKTRACK_LIMIT_ERROR:
+                    $error = 'pcre.backtrack_limit reached.';
+                    break;
+                case PREG_RECURSION_LIMIT_ERROR:
+                    $error = 'pcre.recursion_limit reached.';
+                    break;
+                case PREG_BAD_UTF8_ERROR:
+                    $error = 'Malformed UTF-8 data.';
+                    break;
+                case PREG_BAD_UTF8_OFFSET_ERROR:
+                    $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
+                    break;
+                default:
+                    $error = 'Error.';
+            }
+
+            throw new ParseException($error);
+        }
+
+        return $ret;
+    }
+}
diff --git a/core/libraries/vendor/symfony/yaml/Unescaper.php b/core/libraries/vendor/symfony/yaml/Unescaper.php
new file mode 100644
index 00000000..1e02cc9f
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Unescaper.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+/**
+ * Unescaper encapsulates unescaping rules for single and double-quoted
+ * YAML strings.
+ *
+ * @author Matthew Lewinski <matthew@lewinski.org>
+ *
+ * @internal
+ */
+class Unescaper
+{
+    /**
+     * Parser and Inline assume UTF-8 encoding, so escaped Unicode characters
+     * must be converted to that encoding.
+     *
+     * @deprecated since version 2.5, to be removed in 3.0
+     *
+     * @internal
+     */
+    const ENCODING = 'UTF-8';
+
+    /**
+     * Regex fragment that matches an escaped character in a double quoted string.
+     */
+    const REGEX_ESCAPED_CHARACTER = '\\\\(x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8}|.)';
+
+    /**
+     * Unescapes a single quoted string.
+     *
+     * @param string $value A single quoted string
+     *
+     * @return string The unescaped string
+     */
+    public function unescapeSingleQuotedString($value)
+    {
+        return str_replace('\'\'', '\'', $value);
+    }
+
+    /**
+     * Unescapes a double quoted string.
+     *
+     * @param string $value A double quoted string
+     *
+     * @return string The unescaped string
+     */
+    public function unescapeDoubleQuotedString($value)
+    {
+        $self = $this;
+        $callback = function ($match) use ($self) {
+            return $self->unescapeCharacter($match[0]);
+        };
+
+        // evaluate the string
+        return preg_replace_callback('/'.self::REGEX_ESCAPED_CHARACTER.'/u', $callback, $value);
+    }
+
+    /**
+     * Unescapes a character that was found in a double-quoted string.
+     *
+     * @param string $value An escaped character
+     *
+     * @return string The unescaped character
+     *
+     * @internal This method is public to be usable as callback. It should not
+     *           be used in user code. Should be changed in 3.0.
+     */
+    public function unescapeCharacter($value)
+    {
+        switch ($value[1]) {
+            case '0':
+                return "\x0";
+            case 'a':
+                return "\x7";
+            case 'b':
+                return "\x8";
+            case 't':
+                return "\t";
+            case "\t":
+                return "\t";
+            case 'n':
+                return "\n";
+            case 'v':
+                return "\xB";
+            case 'f':
+                return "\xC";
+            case 'r':
+                return "\r";
+            case 'e':
+                return "\x1B";
+            case ' ':
+                return ' ';
+            case '"':
+                return '"';
+            case '/':
+                return '/';
+            case '\\':
+                return '\\';
+            case 'N':
+                // U+0085 NEXT LINE
+                return "\xC2\x85";
+            case '_':
+                // U+00A0 NO-BREAK SPACE
+                return "\xC2\xA0";
+            case 'L':
+                // U+2028 LINE SEPARATOR
+                return "\xE2\x80\xA8";
+            case 'P':
+                // U+2029 PARAGRAPH SEPARATOR
+                return "\xE2\x80\xA9";
+            case 'x':
+                return self::utf8chr(hexdec(substr($value, 2, 2)));
+            case 'u':
+                return self::utf8chr(hexdec(substr($value, 2, 4)));
+            case 'U':
+                return self::utf8chr(hexdec(substr($value, 2, 8)));
+            default:
+                @trigger_error('Not escaping a backslash in a double-quoted string is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', E_USER_DEPRECATED);
+
+                return $value;
+        }
+    }
+
+    /**
+     * Get the UTF-8 character for the given code point.
+     *
+     * @param int $c The unicode code point
+     *
+     * @return string The corresponding UTF-8 character
+     */
+    private static function utf8chr($c)
+    {
+        if (0x80 > $c %= 0x200000) {
+            return chr($c);
+        }
+        if (0x800 > $c) {
+            return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
+        }
+        if (0x10000 > $c) {
+            return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
+        }
+
+        return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
+    }
+}
diff --git a/core/libraries/vendor/symfony/yaml/Yaml.php b/core/libraries/vendor/symfony/yaml/Yaml.php
new file mode 100644
index 00000000..595fbef0
--- /dev/null
+++ b/core/libraries/vendor/symfony/yaml/Yaml.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Yaml;
+
+use Symfony\Component\Yaml\Exception\ParseException;
+
+/**
+ * Yaml offers convenience methods to load and dump YAML.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class Yaml
+{
+    /**
+     * Parses YAML into a PHP value.
+     *
+     *  Usage:
+     *  <code>
+     *   $array = Yaml::parse(file_get_contents('config.yml'));
+     *   print_r($array);
+     *  </code>
+     *
+     * As this method accepts both plain strings and file names as an input,
+     * you must validate the input before calling this method. Passing a file
+     * as an input is a deprecated feature and will be removed in 3.0.
+     *
+     * Note: the ability to pass file names to the Yaml::parse method is deprecated since Symfony 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
+     *
+     * @param string $input                  Path to a YAML file or a string containing YAML
+     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
+     * @param bool   $objectSupport          True if object support is enabled, false otherwise
+     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
+     *
+     * @return mixed The YAML converted to a PHP value
+     *
+     * @throws ParseException If the YAML is not valid
+     */
+    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
+    {
+        // if input is a file, process it
+        $file = '';
+        if (false === strpos($input, "\n") && is_file($input)) {
+            @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since Symfony 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
+
+            if (false === is_readable($input)) {
+                throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
+            }
+
+            $file = $input;
+            $input = file_get_contents($file);
+        }
+
+        $yaml = new Parser();
+
+        try {
+            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport, $objectForMap);
+        } catch (ParseException $e) {
+            if ($file) {
+                $e->setParsedFile($file);
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Dumps a PHP value to a YAML string.
+     *
+     * The dump method, when supplied with an array, will do its best
+     * to convert the array into friendly YAML.
+     *
+     * @param mixed $input                  The PHP value
+     * @param int   $inline                 The level where you switch to inline YAML
+     * @param int   $indent                 The amount of spaces to use for indentation of nested nodes
+     * @param bool  $exceptionOnInvalidType True if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param bool  $objectSupport          True if object support is enabled, false otherwise
+     *
+     * @return string A YAML string representing the original PHP value
+     */
+    public static function dump($input, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
+    {
+        if ($indent < 1) {
+            throw new \InvalidArgumentException('The indentation must be greater than zero.');
+        }
+
+        $yaml = new Dumper();
+        $yaml->setIndentation($indent);
+
+        return $yaml->dump($input, $inline, 0, $exceptionOnInvalidType, $objectSupport);
+    }
+}
diff --git a/core/libraries/vendor/web.config b/core/libraries/vendor/web.config
new file mode 100644
index 00000000..f7a77db2
--- /dev/null
+++ b/core/libraries/vendor/web.config
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<configuration>
+    <system.web>
+        <authorization>
+            <deny users="*" />              
+        </authorization>
+    </system.web>
+</configuration>
\ No newline at end of file
diff --git a/core/media/cms/css/debug.css b/core/media/cms/css/debug.css
new file mode 100644
index 00000000..af7799db
--- /dev/null
+++ b/core/media/cms/css/debug.css
@@ -0,0 +1,208 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Common CSS for system debug */
+div#system-debug {
+	clear: both;
+}
+
+#system-debug {
+	background-color: #fff;
+	color: #000;
+	border: 1px dashed silver;
+	padding: 10px;
+}
+
+#system-debug div.dbg-header {
+	background-color: #ddd;
+	border: 1px solid #eee;
+	font-size: 16px;
+}
+
+#system-debug h3 {
+	margin: 0;
+}
+
+#system-debug a h3 {
+	background-color: #ddd;
+	color: #000;
+	font-size: 14px;
+	padding: 5px;
+	text-decoration: none;
+	margin: 0px;
+}
+
+#system-debug .dbg-error a h3 {
+	background-color: red;
+}
+
+#system-debug a:hover h3,
+#system-debug a:focus h3 {
+	background-color: #4d4d4d;
+	color: #ddd;
+	font-size: 14px;
+	cursor: pointer;
+	text-decoration: none;
+}
+
+#system-debug div.dbg-container {
+	padding: 10px;
+}
+
+#system-debug span.dbg-command {
+	color: blue;
+	font-weight: bold;
+}
+
+#system-debug span.dbg-table {
+	color: green;
+	font-weight: bold;
+}
+
+#system-debug b.dbg-operator {
+	color: red;
+	font-weight: bold;
+}
+
+#system-debug h1 {
+	background-color: #2c2c2c;
+	color: #fff;
+	padding: 10px;
+	margin: 0;
+	font-size: 16px;
+	line-height: 1em;
+}
+
+#system-debug h4 {
+	font-size: 14px;
+	font-weight: bold;
+	margin: 5px 0 0 0;
+}
+
+#system-debug h5 {
+	font-size: 13px;
+	font-weight: bold;
+	margin: 5px 0 0 0;
+}
+
+div#system-debug {
+	margin: 5px;
+}
+
+#system-debug ol {
+	margin-left: 25px;
+	margin-right: 25px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug ul {
+	list-style: none;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug li {
+	font-size: 13px;
+	margin-bottom: 10px;
+}
+
+#system-debug code {
+	font-size: 13px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug p {
+	font-size: 13px;
+}
+
+#system-debug div.dbg-header.dbg-error {
+	background-color: red;
+}
+#system-debug .dbg-warning {
+	color: red;
+	font-weight: bold;
+	background-color: #ffffcc !important;
+}
+
+#system-debug .accordion {
+	margin-bottom: 0;
+}
+#system-debug .dbg-noprofile {
+	text-decoration: line-through;
+}
+
+/* dbg-bars */
+#system-debug .alert,
+#system-debug .dbg-bars {
+	margin-bottom: 10px;
+}
+#system-debug .dbg-bar-spacer {
+	float: left;
+	height: 100%;
+}
+/* dbg-bars-query */
+#system-debug .dbg-bars-query .dbg-bar {
+	opacity: 0.3;
+	height: 12px;
+	margin-top: 3px;
+}
+#system-debug .dbg-bars-query:hover .dbg-bar {
+	opacity: 0.6;
+	height: 18px;
+	margin-top: 0;
+}
+#system-debug .dbg-bars-query .dbg-bar:hover,
+#system-debug .dbg-bars-query .dbg-bar-active,
+#system-debug .dbg-bars-query:hover .dbg-bar-active {
+	opacity: 1;
+	height: 18px;
+	margin-top: 0;
+}
+
+/* dbg-query-table */
+#system-debug table.dbg-query-table {
+	margin: 0px 0px 6px;
+}
+#system-debug table.dbg-query-table th,
+#system-debug table.dbg-query-table td {
+	padding: 3px 8px;
+}
+
+#system-debug .dbg-profile-list .label {
+	display: inline-block;
+	min-width: 60px;
+	text-align: right;
+}
+
+#system-debug .dbg-query-memory,
+#system-debug .dbg-query-rowsnumber
+{
+	margin-left: 50px;
+}
+#dbg_container_session pre
+{
+	background: white;
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+#dbg_container_session pre .blue
+{
+	color:blue;
+}
+#dbg_container_session pre .green
+{
+	color:green;
+}
+#dbg_container_session pre .black
+{
+	color:black;
+}
+#dbg_container_session pre .grey
+{
+	color:grey;
+}
\ No newline at end of file
diff --git a/core/media/com_associations/css/sidebyside.css b/core/media/com_associations/css/sidebyside.css
new file mode 100644
index 00000000..e9ca7632
--- /dev/null
+++ b/core/media/com_associations/css/sidebyside.css
@@ -0,0 +1,75 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.sidebyside .outer-panel {
+	float: left;
+	width: 50%;
+}
+
+.sidebyside #left-panel .inner-panel {
+	padding: 0 10px 0 0;
+}
+
+.sidebyside #right-panel .inner-panel {
+	padding: 0 0 0 10px;
+}
+
+.sidebyside .full-width {
+	float: none !important;
+	width: 100% !important;
+}
+
+.sidebyside .full-width .inner-panel {
+	padding: 0 !important;
+}
+
+#reference-association, #target-association {
+	width: 100%;
+	height: 1500px;
+	overflow-y: auto;
+	border: 0 !important;
+}
+
+.target-text {
+	float: left;
+	width: 30%;
+}
+
+/* RTL overrides */
+html[dir=rtl] .sidebyside .outer-panel {
+	float: right;
+}
+
+html[dir=rtl] .sidebyside #left-panel .inner-panel {
+	padding: 0 0 0 10px;
+}
+
+html[dir=rtl] .sidebyside #right-panel .inner-panel {
+	padding: 0 10px 0 0;
+}
+
+html[dir=rtl] .sidebyside .full-width .inner-panel {
+	padding: 0 !important;
+}
+
+html[dir=rtl] .target-text {
+	float: right;
+}
+
+/* Responsive layout */
+@media (max-width: 767px) {
+	.sidebyside .outer-panel {
+		float: none;
+		width: 100%;
+	}
+
+	.sidebyside #left-panel .inner-panel {
+		padding: 0;
+	}
+
+	.sidebyside #right-panel .inner-panel {
+		padding: 0;
+	}
+}
diff --git a/core/media/com_associations/js/sidebyside-uncompressed.js b/core/media/com_associations/js/sidebyside-uncompressed.js
new file mode 100644
index 00000000..0fbccca8
--- /dev/null
+++ b/core/media/com_associations/js/sidebyside-uncompressed.js
@@ -0,0 +1,319 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+jQuery(document).ready(function($) {
+	$('#toolbar-target').hide();
+	$('#toolbar-copy').hide();
+
+	// Save button actions, replacing the default Joomla.submitbutton() with custom function.
+	Joomla.submitbutton = function(task)
+	{
+		// Using close button, normal joomla submit.
+		if (task === 'association.cancel')
+		{
+			Joomla.submitform(task);
+		}
+		else if(task === 'copy')
+		{
+			Joomla.loadingLayer('show');
+
+			var targetLang     = document.getElementById('target-association').getAttribute('data-language'),
+				referlangInput = window.frames['reference-association'].document.getElementById('jform_language');
+
+			// Set target language, to get correct content language in the copy
+			referlangInput.removeAttribute('disabled');
+			referlangInput.value = targetLang;
+
+			window.frames['reference-association'].Joomla.submitbutton(document.getElementById('adminForm').getAttribute('data-associatedview') + '.save2copy');
+		}
+		// Undo association
+		else if (task === 'undo-association')
+		{
+			var reference     = document.getElementById('reference-association');
+			var target        = document.getElementById('target-association');
+			var referenceId   = reference.getAttribute('data-id');
+			var referenceLang = reference.getAttribute('data-language').replace(/-/,'_');
+			var targetId      = target.getAttribute('data-id');
+			var targetLang    = target.getAttribute('data-language').replace(/-/,'_');
+			reference         = $(reference).contents();
+			target            = $(target).contents();
+
+			// Remove it on the reference
+			// - For modal association selectors.
+			reference.find('#jform_associations_' + targetLang + '_id').val('');
+			reference.find('#jform_associations_' + targetLang + '_name').val('');
+
+			// - For chosen association selectors (menus).
+			reference.find('#jform_associations_' + targetLang + '_chzn').remove();
+			reference.find('#jform_associations_' + targetLang).val('').change().chosen();
+
+			var lang = '';
+
+			// Remove it on the target
+			$('#jform_itemlanguage option').each(function()
+			{
+				lang = $(this).val().split('|')[0];
+				if (typeof lang !== 'undefined')
+				{
+					lang = lang.replace(/-/,'_');
+					// - For modal association selectors.
+					target.find('#jform_associations_' + lang + '_id').val('');
+					// - For chosen association selectors (menus).
+					target.find('#jform_associations_' + lang + '_chzn').remove();
+					target.find('#jform_associations_' + lang).val('').change().chosen();
+				}
+			});
+
+			// Same as above but reference language is not in the selector
+			// - For modal association selectors.
+			target.find('#jform_associations_' + referenceLang + '_id').val('');
+			target.find('#jform_associations_' + referenceLang + '_name').val('');
+
+			// - For chosen association selectors (menus).
+			target.find('#jform_associations_' + referenceLang + '_chzn').remove();
+			target.find('#jform_associations_' + referenceLang).val('').change().chosen();
+
+			// Reset switcher after removing association
+			var currentSwitcher = $('#jform_itemlanguage').val();
+			var currentLang = targetLang.replace(/_/,'-');
+			$('#jform_itemlanguage option[value=\"' + currentSwitcher + '\"]').val(currentLang + ':0:add');
+			$('#jform_itemlanguage').val('').change();
+			$('#jform_itemlanguage').trigger('liszt:updated');
+
+			// Save one of the items to confirm action
+			Joomla.submitbutton('reference');
+		}
+		// Saving target or reference, send the save action to the target/reference iframe.
+		else
+		{
+			// We need to re-enable the language field to save.
+
+			$('#' + task + '-association').contents().find('#jform_language').attr('disabled', false);
+			window.frames[task + '-association'].Joomla.submitbutton(document.getElementById('adminForm').getAttribute('data-associatedview') + '.apply');
+		}
+
+		return false;
+	};
+
+	// Preload Joomla loading layer.
+	Joomla.loadingLayer('load');
+
+	// Attach behaviour to toggle button.
+	$(document).on('click', '#toogle-left-panel', function()
+	{
+		var referenceHide = this.getAttribute('data-hide-reference');
+		var referenceShow = this.getAttribute('data-show-reference');
+
+		if ($(this).text() === referenceHide)
+		{
+			$(this).text(referenceShow);
+		}
+		else
+		{
+			$(this).text(referenceHide);
+		}
+
+		$('#left-panel').toggle();
+		$('#right-panel').toggleClass('full-width');
+	});
+
+	// Attach behaviour to language selector change event.
+	$(document).on('change', '#jform_itemlanguage', function() {
+		var target   = document.getElementById('target-association');
+		var selected = $(this).val();
+
+		// Populate the data attributes and load the the edit page in target frame.
+		if (selected !== '' && typeof selected !== 'undefined')
+		{
+			target.setAttribute('data-action', selected.split(':')[2]);
+			target.setAttribute('data-id', selected.split(':')[1]);
+			target.setAttribute('data-language', selected.split(':')[0]);
+
+			// Iframe load start, show Joomla loading layer.
+			Joomla.loadingLayer('show');
+
+			// Load the target frame.
+			target.src = target.getAttribute('data-editurl') + '&task=' + target.getAttribute('data-item') + '.' + target.getAttribute('data-action') + '&id=' + target.getAttribute('data-id');
+		}
+		// Reset the data attributes and no item to load.
+		else
+		{
+			$('#toolbar-target').hide();
+			$('#toolbar-copy').hide();
+			$('#select-change').addClass("hidden");
+			$('#remove-assoc').addClass("hidden");
+
+			target.setAttribute('data-action', '');
+			target.setAttribute('data-id', '0');
+			target.setAttribute('data-language', '');
+			target.src = '';
+		}
+	});
+
+	// Attach behaviour to reference frame load event.
+	$('#reference-association').on('load', function() {
+
+		// Load Target Pane AFTER reference pane has loaded to prevent session conflict with checkout
+		document.getElementById('target-association').setAttribute('src', document.getElementById('target-association').getAttribute('src'));
+
+		// If copy button used
+		if ($(this).contents().find('#jform_id').val() !== this.getAttribute('data-id'))
+		{
+			var target = document.getElementById('target-association');
+			target.src = target.getAttribute('data-editurl') + '&task=' + target.getAttribute('data-item') + '.edit' + '&id=' + $(this).contents().find('#jform_id').val();
+			this.src   = this.getAttribute('data-editurl') + '&task=' + this.getAttribute('data-item') + '.edit' + '&id=' + this.getAttribute('data-id');
+		}
+
+		var reference = $(this).contents();
+
+		// Disable language field.
+		reference.find('#jform_language_chzn').remove();
+		reference.find('#jform_language').attr('disabled', true).chosen();
+
+		// Remove modal buttons on the reference
+		reference.find('#associations').find('.btn').remove();
+
+		var parse = '';
+
+		$('#jform_itemlanguage option').each(function()
+		{
+			parse = $(this).val().split(':');
+
+			if (typeof parse[0] !== 'undefined')
+			{
+				// - For modal association selectors.
+				langAssociation = parse[0].replace(/-/,'_');
+				if (reference.find('#jform_associations_' + langAssociation + '_id').val() == '')
+				{
+					reference.find('#jform_associations_' + langAssociation + '_name')
+						.val(document.getElementById('reference-association').getAttribute('data-no-assoc'));
+				}
+			}
+		});
+
+		// Iframe load finished, hide Joomla loading layer.
+		Joomla.loadingLayer('hide');
+	});
+
+	// Attach behaviour to target frame load event.
+	$('#target-association').on('load', function() {
+		// We need to check if we are not loading a blank iframe.
+		if (this.getAttribute('src') != '')
+		{
+			$('#toolbar-target').show();
+			$('#toolbar-copy').show();
+			$('#select-change').removeClass("hidden");
+
+			var targetLanguage       = this.getAttribute('data-language');
+			var targetId             = this.getAttribute('data-id');
+			var targetLoadedId       = $(this).contents().find('#jform_id').val() || '0';
+
+			// Remove modal buttons on the target
+			$(this).contents().find('a[href=\"#associations\"]').parent().find('.btn').remove();
+			$(this).contents().find('#associations').find('.btn').remove();
+
+			// Always show General tab first if associations tab is selected on the reference
+			if ($(this).contents().find('#associations').hasClass('active'))
+			{
+				$(this).contents().find('a[href=\"#associations\"]').parent().removeClass('active');
+				$(this).contents().find('#associations').removeClass('active');
+
+				$(this).contents().find('.nav-tabs').find('li').first().addClass('active');
+				$(this).contents().find('.tab-content').find('.tab-pane').first().addClass('active');
+			}
+
+			// Update language field with the selected language and them disable it.
+			$(this).contents().find('#jform_language_chzn').remove();
+			$(this).contents().find('#jform_language').val(targetLanguage).change().attr('disabled', true).chosen();
+
+			// If we are creating a new association (before save) we need to add the new association.
+			if (targetLoadedId == '0')
+			{
+				document.getElementById('select-change-text').innerHTML =  document.getElementById('select-change').getAttribute('data-select');
+			}
+			// If we are editing a association.
+			else
+			{
+				// Show change language button
+				document.getElementById('select-change-text').innerHTML =  document.getElementById('select-change').getAttribute('data-change');
+				$('#remove-assoc').removeClass("hidden");
+				$('#toolbar-copy').hide();
+
+				// Add the id to list of items to check in on close.
+				var currentIdList = document.getElementById('target-id').value;
+				var updatedList   = currentIdList == '' ? targetLoadedId : currentIdList + ',' + targetLoadedId;
+				document.getElementById('target-id').value = updatedList;
+
+				// If we created a new association (after save).
+				if (targetLoadedId != targetId)
+				{
+					// Refresh the language selector with the new id (used after save).
+					$('#jform_itemlanguage option[value^=\"' + targetLanguage + ':' + targetId + ':add\"]').val(targetLanguage + ':' + targetLoadedId + ':edit');
+
+					// Update main frame data-id attribute (used after save).
+					this.setAttribute('data-id', targetLoadedId);
+					this.setAttribute('data-action', 'edit');
+				}
+
+				// Update the reference item associations tab.
+				var reference      = document.getElementById('reference-association');
+				var languageCode   = targetLanguage.replace(/-/, '_');
+				var referenceTitle = reference.getAttribute('data-title');
+				var title          = $(this).contents().find('#jform_' + referenceTitle).val();
+
+				// - For modal association selectors.
+				$(reference).contents().find('#jform_associations_' + languageCode + '_id').val(targetLoadedId);
+				$(reference).contents().find('#jform_associations_' + languageCode + '_name').val(title);
+
+				// - For chosen association selectors (menus).
+				$(reference).contents().find('#jform_associations_' + languageCode + '_chzn').remove();
+				$(reference).contents().find('#jform_associations_' + languageCode).append('<option value=\"'+ targetLoadedId + '\">' + title + '</option>');
+				$(reference).contents().find('#jform_associations_' + languageCode).val(targetLoadedId).change().chosen();
+			}
+
+			// Update the target item associations tab.
+			var reference    = document.getElementById('reference-association');
+			var referenceId  = reference.getAttribute('data-id');
+			var languageCode = reference.getAttribute('data-language').replace(/-/, '_');
+			var target       = document.getElementById('target-association');
+			var targetTitle  = target.getAttribute('data-title');
+			var title        = $(this).contents().find('#jform_' + targetTitle).val();
+			var target       = $(this).contents();
+
+			// - For modal association selectors.
+			target.find('#jform_associations_' + languageCode + '_id').val(referenceId);
+			target.find('#jform_associations_' + languageCode + '_name').val(title);
+
+			// - For chosen association selectors (menus).
+			target.find('#jform_associations_' + languageCode + '_chzn').remove();
+			var chznField = target.find('#jform_associations_' + languageCode);
+			chznField.append('<option value=\"'+ referenceId + '\">' + title + '</option>');
+			chznField.val(referenceId).change().chosen();
+
+			var parse, langAssociation;
+
+			$('#jform_itemlanguage option').each(function()
+			{
+				parse = $(this).val().split(':');
+
+				if (typeof parse[1] !== 'undefined' && parse[1] !== '0')
+				{
+					// - For modal association selectors.
+					langAssociation = parse[0].replace(/-/,'_');
+					target.find('#jform_associations_' + langAssociation + '_id').val(parse[1]);
+
+					// - For chosen association selectors (menus).
+					target.find('#jform_associations_' + langAssociation + '_chzn').remove();
+					chznField = target.find('#jform_associations_' + langAssociation);
+					chznField.append('<option value=\"'+ parse[1] + '\"></option>');
+					chznField.val(parse[1]).change().chosen();
+				}
+			});
+
+			// Iframe load finished, hide Joomla loading layer.
+			Joomla.loadingLayer('hide');
+		}
+	});
+});
diff --git a/core/media/com_associations/js/sidebyside.js b/core/media/com_associations/js/sidebyside.js
new file mode 100644
index 00000000..362e9316
--- /dev/null
+++ b/core/media/com_associations/js/sidebyside.js
@@ -0,0 +1 @@
+jQuery(document).ready(function(t){t("#toolbar-target").hide(),t("#toolbar-copy").hide(),Joomla.submitbutton=function(e){if("association.cancel"===e)Joomla.submitform(e);else if("copy"===e){Joomla.loadingLayer("show");var a=document.getElementById("target-association").getAttribute("data-language"),i=window.frames["reference-association"].document.getElementById("jform_language");i.removeAttribute("disabled"),i.value=a,window.frames["reference-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".save2copy")}else if("undo-association"===e){var n=document.getElementById("reference-association"),o=document.getElementById("target-association"),s=(n.getAttribute("data-id"),n.getAttribute("data-language").replace(/-/,"_"));o.getAttribute("data-id"),a=o.getAttribute("data-language").replace(/-/,"_");n=t(n).contents(),o=t(o).contents(),n.find("#jform_associations_"+a+"_id").val(""),n.find("#jform_associations_"+a+"_name").val(""),n.find("#jform_associations_"+a+"_chzn").remove(),n.find("#jform_associations_"+a).val("").change().chosen();var d="";t("#jform_itemlanguage option").each(function(){void 0!==(d=t(this).val().split("|")[0])&&(d=d.replace(/-/,"_"),o.find("#jform_associations_"+d+"_id").val(""),o.find("#jform_associations_"+d+"_chzn").remove(),o.find("#jform_associations_"+d).val("").change().chosen())}),o.find("#jform_associations_"+s+"_id").val(""),o.find("#jform_associations_"+s+"_name").val(""),o.find("#jform_associations_"+s+"_chzn").remove(),o.find("#jform_associations_"+s).val("").change().chosen();var r=t("#jform_itemlanguage").val(),c=a.replace(/_/,"-");t('#jform_itemlanguage option[value="'+r+'"]').val(c+":0:add"),t("#jform_itemlanguage").val("").change(),t("#jform_itemlanguage").trigger("liszt:updated"),Joomla.submitbutton("reference")}else t("#"+e+"-association").contents().find("#jform_language").attr("disabled",!1),window.frames[e+"-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".apply");return!1},Joomla.loadingLayer("load"),t(document).on("click","#toogle-left-panel",function(){var e=this.getAttribute("data-hide-reference"),a=this.getAttribute("data-show-reference");t(this).text()===e?t(this).text(a):t(this).text(e),t("#left-panel").toggle(),t("#right-panel").toggleClass("full-width")}),t(document).on("change","#jform_itemlanguage",function(){var e=document.getElementById("target-association"),a=t(this).val();""!==a&&void 0!==a?(e.setAttribute("data-action",a.split(":")[2]),e.setAttribute("data-id",a.split(":")[1]),e.setAttribute("data-language",a.split(":")[0]),Joomla.loadingLayer("show"),e.src=e.getAttribute("data-editurl")+"&task="+e.getAttribute("data-item")+"."+e.getAttribute("data-action")+"&id="+e.getAttribute("data-id")):(t("#toolbar-target").hide(),t("#toolbar-copy").hide(),t("#select-change").addClass("hidden"),t("#remove-assoc").addClass("hidden"),e.setAttribute("data-action",""),e.setAttribute("data-id","0"),e.setAttribute("data-language",""),e.src="")}),t("#reference-association").on("load",function(){if(document.getElementById("target-association").setAttribute("src",document.getElementById("target-association").getAttribute("src")),t(this).contents().find("#jform_id").val()!==this.getAttribute("data-id")){var e=document.getElementById("target-association");e.src=e.getAttribute("data-editurl")+"&task="+e.getAttribute("data-item")+".edit&id="+t(this).contents().find("#jform_id").val(),this.src=this.getAttribute("data-editurl")+"&task="+this.getAttribute("data-item")+".edit&id="+this.getAttribute("data-id")}var a=t(this).contents();a.find("#jform_language_chzn").remove(),a.find("#jform_language").attr("disabled",!0).chosen(),a.find("#associations").find(".btn").remove();var i="";t("#jform_itemlanguage option").each(function(){void 0!==(i=t(this).val().split(":"))[0]&&(langAssociation=i[0].replace(/-/,"_"),""==a.find("#jform_associations_"+langAssociation+"_id").val()&&a.find("#jform_associations_"+langAssociation+"_name").val(document.getElementById("reference-association").getAttribute("data-no-assoc")))}),Joomla.loadingLayer("hide")}),t("#target-association").on("load",function(){if(""!=this.getAttribute("src")){t("#toolbar-target").show(),t("#toolbar-copy").show(),t("#select-change").removeClass("hidden");var e=this.getAttribute("data-language"),a=this.getAttribute("data-id"),i=t(this).contents().find("#jform_id").val()||"0";if(t(this).contents().find('a[href="#associations"]').parent().find(".btn").remove(),t(this).contents().find("#associations").find(".btn").remove(),t(this).contents().find("#associations").hasClass("active")&&(t(this).contents().find('a[href="#associations"]').parent().removeClass("active"),t(this).contents().find("#associations").removeClass("active"),t(this).contents().find(".nav-tabs").find("li").first().addClass("active"),t(this).contents().find(".tab-content").find(".tab-pane").first().addClass("active")),t(this).contents().find("#jform_language_chzn").remove(),t(this).contents().find("#jform_language").val(e).change().attr("disabled",!0).chosen(),"0"==i)document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-select");else{document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-change"),t("#remove-assoc").removeClass("hidden"),t("#toolbar-copy").hide();var n=document.getElementById("target-id").value,o=""==n?i:n+","+i;document.getElementById("target-id").value=o,i!=a&&(t('#jform_itemlanguage option[value^="'+e+":"+a+':add"]').val(e+":"+i+":edit"),this.setAttribute("data-id",i),this.setAttribute("data-action","edit"));var s=document.getElementById("reference-association"),d=e.replace(/-/,"_"),r=s.getAttribute("data-title"),c=t(this).contents().find("#jform_"+r).val();t(s).contents().find("#jform_associations_"+d+"_id").val(i),t(s).contents().find("#jform_associations_"+d+"_name").val(c),t(s).contents().find("#jform_associations_"+d+"_chzn").remove(),t(s).contents().find("#jform_associations_"+d).append('<option value="'+i+'">'+c+"</option>"),t(s).contents().find("#jform_associations_"+d).val(i).change().chosen()}var l,m=(s=document.getElementById("reference-association")).getAttribute("data-id"),g=(d=s.getAttribute("data-language").replace(/-/,"_"),(l=document.getElementById("target-association")).getAttribute("data-title"));c=t(this).contents().find("#jform_"+g).val();(l=t(this).contents()).find("#jform_associations_"+d+"_id").val(m),l.find("#jform_associations_"+d+"_name").val(c),l.find("#jform_associations_"+d+"_chzn").remove();var f,u,_=l.find("#jform_associations_"+d);_.append('<option value="'+m+'">'+c+"</option>"),_.val(m).change().chosen(),t("#jform_itemlanguage option").each(function(){void 0!==(f=t(this).val().split(":"))[1]&&"0"!==f[1]&&(u=f[0].replace(/-/,"_"),l.find("#jform_associations_"+u+"_id").val(f[1]),l.find("#jform_associations_"+u+"_chzn").remove(),(_=l.find("#jform_associations_"+u)).append('<option value="'+f[1]+'"></option>'),_.val(f[1]).change().chosen())}),Joomla.loadingLayer("hide")}})});
\ No newline at end of file
diff --git a/core/media/com_contact/js/admin-contacts-modal.js b/core/media/com_contact/js/admin-contacts-modal.js
new file mode 100644
index 00000000..f8b4fc0b
--- /dev/null
+++ b/core/media/com_contact/js/admin-contacts-modal.js
@@ -0,0 +1,62 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(function() {
+	"use strict";
+	/**
+	 * Javascript to insert the link
+	 * View element calls jSelectContact when a contact is clicked
+	 * jSelectContact creates the link tag, sends it to the editor,
+	 * and closes the select frame.
+	 */
+
+	window.jSelectContact = function(id, title, catid, object, link, lang)
+	{
+		var hreflang = '', tag, editor;
+
+		if (!Joomla.getOptions('xtd-contacts')) {
+			// Something went wrong!
+			window.parent.jModalClose();
+			return false;
+		}
+
+		editor = Joomla.getOptions('xtd-contacts').editor;
+
+		if (lang !== '') {
+			hreflang = ' hreflang = "' + lang + '"';
+		}
+
+		tag = '<a' + hreflang + ' href="' + link + '">' + title + '</a>';
+
+		/** Use the API, if editor supports it **/
+		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.parent.Joomla.editors.instances[editor].replaceSelection(tag)
+		} else {
+			window.parent.jInsertEditorText(tag, editor);
+		}
+
+		window.parent.jModalClose();
+	};
+
+	document.addEventListener('DOMContentLoaded', function(){
+		// Get the elements
+		var elements = document.querySelectorAll('.select-link');
+
+		for(var i = 0, l = elements.length; l>i; i++) {
+			// Listen for click event
+			elements[i].addEventListener('click', function (event) {
+				event.preventDefault();
+				var functionName = event.target.getAttribute('data-function');
+
+				if (functionName === 'jSelectContact') {
+					// Used in xtd_contacts
+					window[functionName](event.target.getAttribute('data-id'), event.target.getAttribute('data-title'), null, null, event.target.getAttribute('data-uri'), event.target.getAttribute('data-language'), null);
+				} else {
+					// Used in com_menus
+					window.parent[functionName](event.target.getAttribute('data-id'), event.target.getAttribute('data-title'), null, null, event.target.getAttribute('data-uri'), event.target.getAttribute('data-language'), null);
+				}
+			})
+		}
+	});
+})();
diff --git a/core/media/com_contact/js/admin-contacts-modal.min.js b/core/media/com_contact/js/admin-contacts-modal.min.js
new file mode 100644
index 00000000..5c861c51
--- /dev/null
+++ b/core/media/com_contact/js/admin-contacts-modal.min.js
@@ -0,0 +1 @@
+!function(){"use strict";window.jSelectContact=function(a,b,c,d,e,f){var h,i,g="";return Joomla.getOptions("xtd-contacts")?(i=Joomla.getOptions("xtd-contacts").editor,""!==f&&(g=' hreflang = "'+f+'"'),h="<a"+g+' href="'+e+'">'+b+"</a>",window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(i)?window.parent.Joomla.editors.instances[i].replaceSelection(h):window.parent.jInsertEditorText(h,i),void window.parent.jModalClose()):(window.parent.jModalClose(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectContact"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
diff --git a/core/media/com_content/js/admin-article-pagebreak.js b/core/media/com_content/js/admin-article-pagebreak.js
new file mode 100644
index 00000000..f0ef05ae
--- /dev/null
+++ b/core/media/com_content/js/admin-article-pagebreak.js
@@ -0,0 +1,37 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(function() {
+	"use strict";
+
+	window.insertPagebreak = function(editor) {
+		/** Get the pagebreak title **/
+		var alt, tag, title = document.getElementById('title').value;
+
+		if (!window.parent.Joomla.getOptions('xtd-pagebreak')) {
+			// Something went wrong!
+			window.parent.jModalClose();
+			return false;
+		}
+
+		/** Get the pagebreak toc alias -- not inserting for now **/
+		/** don't know which attribute to use... **/
+		alt = document.getElementById('alt').value;
+
+		title  = (title != '') ? 'title="' + title + '"' : '';
+		alt    = (alt != '') ? 'alt="' + alt + '"' : '';
+
+		tag = '<hr class="system-pagebreak" ' + title + ' ' + alt + '/>';
+
+		/** Use the API, if editor supports it **/
+		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.parent.Joomla.editors.instances[editor].replaceSelection(tag)
+		} else {
+			window.parent.jInsertEditorText(tag, editor);
+		}
+
+		window.parent.jModalClose();
+		return false;
+	};
+})();
diff --git a/core/media/com_content/js/admin-article-pagebreak.min.js b/core/media/com_content/js/admin-article-pagebreak.min.js
new file mode 100644
index 00000000..d2b57a51
--- /dev/null
+++ b/core/media/com_content/js/admin-article-pagebreak.min.js
@@ -0,0 +1 @@
+!function(){"use strict";window.insertPagebreak=function(a){var b,c,d=document.getElementById("title").value;return window.parent.Joomla.getOptions("xtd-pagebreak")?(b=document.getElementById("alt").value,d=""!=d?'title="'+d+'"':"",b=""!=b?'alt="'+b+'"':"",c='<hr class="system-pagebreak" '+d+" "+b+"/>",window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(a)?window.parent.Joomla.editors.instances[a].replaceSelection(c):window.parent.jInsertEditorText(c,a),window.parent.jModalClose(),!1):(window.parent.jModalClose(),!1)}}();
\ No newline at end of file
diff --git a/core/media/com_content/js/admin-article-readmore.js b/core/media/com_content/js/admin-article-readmore.js
new file mode 100644
index 00000000..e7bf7a9f
--- /dev/null
+++ b/core/media/com_content/js/admin-article-readmore.js
@@ -0,0 +1,32 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+window.insertReadmore = function(editor) {
+	"use strict";
+	if (!Joomla.getOptions('xtd-readmore')) {
+		// Something went wrong!
+		return false;
+	}
+
+	var content, options = window.Joomla.getOptions('xtd-readmore');
+
+	if (window.Joomla && window.Joomla.editors && window.Joomla.editors.instances && window.Joomla.editors.instances.hasOwnProperty(editor)) {
+		content = window.Joomla.editors.instances[editor].getValue();
+	} else {
+		content = (new Function('return ' + options.editor))();
+	}
+
+	if (content.match(/<hr\s+id=("|')system-readmore("|')\s*\/*>/i)) {
+		alert(options.exists);
+		return false;
+	} else {
+		/** Use the API, if editor supports it **/
+		if (window.Joomla && window.Joomla.editors && window.Joomla.editors.instances && window.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.Joomla.editors.instances[editor].replaceSelection('<hr id="system-readmore" />');
+		} else {
+			window.jInsertEditorText('<hr id="system-readmore" />', editor);
+		}
+	}
+};
diff --git a/core/media/com_content/js/admin-article-readmore.min.js b/core/media/com_content/js/admin-article-readmore.min.js
new file mode 100644
index 00000000..63d3a40c
--- /dev/null
+++ b/core/media/com_content/js/admin-article-readmore.min.js
@@ -0,0 +1 @@
+window.insertReadmore=function(a){"use strict";if(!Joomla.getOptions("xtd-readmore"))return!1;var b,c=window.Joomla.getOptions("xtd-readmore");if(b=window.Joomla&&window.Joomla.editors&&window.Joomla.editors.instances&&window.Joomla.editors.instances.hasOwnProperty(a)?window.Joomla.editors.instances[a].getValue():new Function("return "+c.editor)(),b.match(/<hr\s+id=("|')system-readmore("|')\s*\/*>/i))return alert(c.exists),!1;window.Joomla&&window.Joomla.editors&&window.Joomla.editors.instances&&window.Joomla.editors.instances.hasOwnProperty(a)?window.Joomla.editors.instances[a].replaceSelection('<hr id="system-readmore" />'):window.jInsertEditorText('<hr id="system-readmore" />',a)};
\ No newline at end of file
diff --git a/core/media/com_content/js/admin-articles-modal.js b/core/media/com_content/js/admin-articles-modal.js
new file mode 100644
index 00000000..ee0d495a
--- /dev/null
+++ b/core/media/com_content/js/admin-articles-modal.js
@@ -0,0 +1,61 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(function() {
+	"use strict";
+	/**
+	 * Javascript to insert the link
+	 * View element calls jSelectArticle when an article is clicked
+	 * jSelectArticle creates the link tag, sends it to the editor,
+	 * and closes the select frame.
+	 **/
+	window.jSelectArticle = function (id, title, catid, object, link, lang) {
+		var hreflang = '', editor, tag;
+
+		if (!Joomla.getOptions('xtd-articles')) {
+			// Something went wrong!
+			window.parent.jModalClose();
+			return false;
+		}
+
+		editor = Joomla.getOptions('xtd-articles').editor;
+
+		if (lang !== '')
+		{
+			hreflang = ' hreflang="' + lang + '"';
+		}
+
+		tag = '<a' + hreflang + ' href="' + link + '">' + title + '</a>';
+
+		/** Use the API, if editor supports it **/
+		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.parent.Joomla.editors.instances[editor].replaceSelection(tag)
+		} else {
+			window.parent.jInsertEditorText(tag, editor);
+		}
+
+		window.parent.jModalClose();
+	};
+
+	document.addEventListener('DOMContentLoaded', function(){
+		// Get the elements
+		var elements = document.querySelectorAll('.select-link');
+
+		for(var i = 0, l = elements.length; l>i; i++) {
+			// Listen for click event
+			elements[i].addEventListener('click', function (event) {
+				event.preventDefault();
+				var functionName = event.target.getAttribute('data-function');
+
+				if (functionName === 'jSelectArticle') {
+					// Used in xtd_contacts
+					window[functionName](event.target.getAttribute('data-id'), event.target.getAttribute('data-title'), event.target.getAttribute('data-cat-id'), null, event.target.getAttribute('data-uri'), event.target.getAttribute('data-language'));
+				} else {
+					// Used in com_menus
+					window.parent[functionName](event.target.getAttribute('data-id'), event.target.getAttribute('data-title'), event.target.getAttribute('data-cat-id'), null, event.target.getAttribute('data-uri'), event.target.getAttribute('data-language'));
+				}
+			})
+		}
+	});
+})();
diff --git a/core/media/com_content/js/admin-articles-modal.min.js b/core/media/com_content/js/admin-articles-modal.min.js
new file mode 100644
index 00000000..bf211685
--- /dev/null
+++ b/core/media/com_content/js/admin-articles-modal.min.js
@@ -0,0 +1 @@
+!function(){"use strict";window.jSelectArticle=function(a,b,c,d,e,f){var h,i,g="";return Joomla.getOptions("xtd-articles")?(h=Joomla.getOptions("xtd-articles").editor,""!==f&&(g=' hreflang="'+f+'"'),i="<a"+g+' href="'+e+'">'+b+"</a>",window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(h)?window.parent.Joomla.editors.instances[h].replaceSelection(i):window.parent.jInsertEditorText(i,h),void window.parent.jModalClose()):(window.parent.jModalClose(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectArticle"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-cat-id"),null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-cat-id"),null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"))})})}();
\ No newline at end of file
diff --git a/core/media/com_contenthistory/css/jquery.pretty-text-diff.css b/core/media/com_contenthistory/css/jquery.pretty-text-diff.css
new file mode 100644
index 00000000..9714725e
--- /dev/null
+++ b/core/media/com_contenthistory/css/jquery.pretty-text-diff.css
@@ -0,0 +1,10 @@
+/* colors for pretty-text-diff*/
+ins {
+    background-color: #c6ffc6;
+    text-decoration: none;
+}
+
+del {
+    background-color: #ffc6c6;
+}
+
diff --git a/core/media/com_contenthistory/js/diff_match_patch.js b/core/media/com_contenthistory/js/diff_match_patch.js
new file mode 100644
index 00000000..c41b5132
--- /dev/null
+++ b/core/media/com_contenthistory/js/diff_match_patch.js
@@ -0,0 +1,49 @@
+(function(){function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=0.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=0.5;this.Patch_Margin=4;this.Match_MaxBits=32}
+diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[0,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);var f=this.diff_commonSuffix(a,b),g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a,
+b,e,d);c&&a.unshift([0,c]);g&&a.push([0,g]);this.diff_cleanupMerge(a);return a};
+diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[1,b]];if(!b)return[[-1,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[1,e.substring(0,g)],[0,f],[1,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=-1),c):1==f.length?[[-1,a],[1,b]]:(e=this.diff_halfMatch_(a,b))?(f=e[0],a=e[1],g=e[2],b=e[3],e=e[4],f=this.diff_main(f,g,c,d),c=this.diff_main(a,b,c,d),f.concat([[0,e]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,
+d):this.diff_bisect_(a,b,d)};
+diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([0,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case 1:e++;g+=a[b][1];break;case -1:d++;f+=a[b][1];break;case 0:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+=d.length}d=e=0;g=f=""}b++}a.pop();return a};
+diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=f,h=2*f,j=Array(h),i=Array(h),k=0;k<h;k++)j[k]=-1,i[k]=-1;j[g+1]=0;i[g+1]=0;for(var k=d-e,q=0!=k%2,r=0,t=0,p=0,w=0,v=0;v<f&&!((new Date).getTime()>c);v++){for(var n=-v+r;n<=v-t;n+=2){var l=g+n,m;m=n==-v||n!=v&&j[l-1]<j[l+1]?j[l+1]:j[l-1]+1;for(var s=m-n;m<d&&s<e&&a.charAt(m)==b.charAt(s);)m++,s++;j[l]=m;if(m>d)t+=2;else if(s>e)r+=2;else if(q&&(l=g+k-n,0<=l&&l<h&&-1!=i[l])){var u=d-i[l];if(m>=
+u)return this.diff_bisectSplit_(a,b,m,s,c)}}for(n=-v+p;n<=v-w;n+=2){l=g+n;u=n==-v||n!=v&&i[l-1]<i[l+1]?i[l+1]:i[l-1]+1;for(m=u-n;u<d&&m<e&&a.charAt(d-u-1)==b.charAt(e-m-1);)u++,m++;i[l]=u;if(u>d)w+=2;else if(m>e)p+=2;else if(!q&&(l=g+k-n,0<=l&&(l<h&&-1!=j[l])&&(m=j[l],s=g+m-l,u=d-u,m>=u)))return this.diff_bisectSplit_(a,b,m,s,c)}}return[[-1,a],[1,b]]};
+diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)};
+diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var r=a.substring(c,f+1),c=f+1;(e.hasOwnProperty?e.hasOwnProperty(r):void 0!==e[r])?b+=String.fromCharCode(e[r]):(b+=String.fromCharCode(g),e[r]=g,d[g++]=r)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}};
+diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
+diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
+diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;for(var d=0,e=1;;){var f=a.substring(c-e),f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}};
+diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,j,n,l;-1!=(e=b.indexOf(d,e+1));){var m=f.diff_commonPrefix(a.substring(c),b.substring(e)),s=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<s+m&&(g=b.substring(e-s,e)+b.substring(e,e+m),h=a.substring(0,c-s),j=a.substring(c+m),n=b.substring(0,e-s),l=b.substring(e+m))}return 2*g.length>=a.length?[h,j,n,l,g]:null}if(0>=this.Diff_Timeout)return null;
+var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4)),d=c(d,e,Math.ceil(d.length/2)),h;if(!g&&!d)return null;h=d?g?g[4].length>d[4].length?g:d:d:g;var j;a.length>b.length?(g=h[0],d=h[1],e=h[2],j=h[3]):(e=h[0],j=h[1],g=h[2],d=h[3]);h=h[4];return[g,d,e,j,h]};
+diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,j=0,i=0;f<a.length;)0==a[f][0]?(c[d++]=f,g=j,h=i,i=j=0,e=a[f][1]):(1==a[f][0]?j+=a[f][1].length:i+=a[f][1].length,e&&(e.length<=Math.max(g,h)&&e.length<=Math.max(j,i))&&(a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,d--,f=0<d?c[d-1]:-1,i=j=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(-1==a[f-1][0]&&1==a[f][0]){b=a[f-1][1];c=a[f][1];
+d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[0,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[0,b.substring(0,e)]),a[f-1][0]=1,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=-1,a[f+1][1]=b.substring(e),f++;f++}f++}};
+diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_),c=g&&c.match(diff_match_patch.linebreakRegex_),d=h&&d.match(diff_match_patch.linebreakRegex_),i=c&&a.match(diff_match_patch.blanklineEndRegex_),j=d&&b.match(diff_match_patch.blanklineStartRegex_);
+return i||j?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(0==a[c-1][0]&&0==a[c+1][0]){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g)var h=e.substring(e.length-g),d=d.substring(0,d.length-g),e=h+e.substring(0,e.length-g),f=h+f;for(var g=d,h=e,j=f,i=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){var d=d+e.charAt(0),e=e.substring(1)+f.charAt(0),f=f.substring(1),k=b(d,e)+b(e,f);k>=i&&(i=k,g=d,h=e,j=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c-1,1),c--),a[c][1]=
+h,j?a[c+1][1]=j:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/;
+diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,j=!1,i=!1;f<a.length;){if(0==a[f][0])a[f][1].length<this.Diff_EditCost&&(j||i)?(c[d++]=f,g=j,h=i,e=a[f][1]):(d=0,e=null),j=i=!1;else if(-1==a[f][0]?i=!0:j=!0,e&&(g&&h&&j&&i||e.length<this.Diff_EditCost/2&&3==g+h+j+i))a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,e=null,g&&h?(j=i=!0,d=0):(d--,f=0<d?c[d-1]:-1,j=i=!1),b=!0;f++}b&&this.diff_cleanupMerge(a)};
+diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([0,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case 1:d++;f+=a[b][1];b++;break;case -1:c++;e+=a[b][1];b++;break;case 0:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&0==a[b-c-d-1][0]?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[0,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length-g)+a[b][1],f=f.substring(0,f.length-
+g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[1,f]):0===d?a.splice(b-c,c+d,[-1,e]):a.splice(b-c-d,c+d,[-1,e],[1,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&0==a[b-1][0]?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)0==a[b-1][0]&&0==a[b+1][0]&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0,a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,
+a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)};diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){1!==a[g][0]&&(c+=a[g][1].length);-1!==a[g][0]&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&-1===a[g][0]?f:f+(b-e)};
+diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],j=a[g][1],j=j.replace(c,"&amp;").replace(d,"&lt;").replace(e,"&gt;").replace(f,"&para;<br>");switch(h){case 1:b[g]='<ins style="background:#e6ffe6;">'+j+"</ins>";break;case -1:b[g]='<del style="background:#ffe6e6;">'+j+"</del>";break;case 0:b[g]="<span>"+j+"</span>"}}return b.join("")};
+diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)-1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][0],g=a[e][1];switch(f){case 1:c+=g.length;break;case -1:d+=g.length;break;case 0:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)};
+diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case 1:b[c]="+"+encodeURI(a[c][1]);break;case -1:b[c]="-"+a[c][1].length;break;case 0:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")};
+diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[1,decodeURI(h)]}catch(j){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var i=parseInt(h,10);if(isNaN(i)||0>i)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=i);"="==f[g].charAt(0)?c[d++]=[0,h]:c[d++]=[-1,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+
+f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1};
+diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return!f.Match_Distance?g?1:e:e+g/f.Match_Distance}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));for(var j=1<<b.length-1,h=-1,i,k,q=b.length+a.length,r,t=0;t<b.length;t++){i=0;for(k=q;i<k;)d(t,c+
+k)<=g?i=k:q=k,k=Math.floor((q-i)/2+i);q=k;i=Math.max(1,c-k+1);var p=Math.min(c+k,a.length)+b.length;k=Array(p+2);for(k[p+1]=(1<<t)-1;p>=i;p--){var w=e[a.charAt(p-1)];k[p]=0===t?(k[p+1]<<1|1)&w:(k[p+1]<<1|1)&w|((r[p+1]|r[p])<<1|1)|r[p+1];if(k[p]&j&&(w=d(t,p-1),w<=g))if(g=w,h=p-1,h>c)i=Math.max(1,2*c-h);else break}if(d(t+1,c)>g)break;r=k}return h};
+diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b};
+diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([0,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([0,d]);a.start1-=c.length;a.start2-=c.length;a.length1+=
+c.length+d.length;a.length2+=c.length+d.length}};
+diff_match_patch.prototype.patch_make=function(a,b,c){var d;if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c)d=a,b=this.diff_main(d,b,!0),2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b));else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make.");
+if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,j=0;j<b.length;j++){var i=b[j][0],k=b[j][1];!e&&0!==i&&(a.start1=f,a.start2=g);switch(i){case 1:a.diffs[e++]=b[j];a.length2+=k.length;d=d.substring(0,g)+k+d.substring(g);break;case -1:a.length1+=k.length;a.diffs[e++]=b[j];d=d.substring(0,g)+d.substring(g+k.length);break;case 0:k.length<=2*this.Patch_Margin&&e&&b.length!=j+1?(a.diffs[e++]=b[j],a.length1+=k.length,a.length2+=k.length):k.length>=2*this.Patch_Margin&&
+e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}1!==i&&(f+=k.length);-1!==i&&(g+=k.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c};diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b};
+diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),j,i=-1;if(h.length>this.Match_MaxBits){if(j=this.match_main(b,h.substring(0,this.Match_MaxBits),g),-1!=j&&(i=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==i||j>=i))j=-1}else j=this.match_main(b,h,g);
+if(-1==j)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=j-g,g=-1==i?b.substring(j,j+h.length):b.substring(j,i+this.Match_MaxBits),h==g)b=b.substring(0,j)+this.diff_text2(a[f].diffs)+b.substring(j+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);for(var h=0,k,i=0;i<a[f].diffs.length;i++){var q=a[f].diffs[i];0!==q[0]&&(k=this.diff_xIndex(g,h));1===q[0]?b=b.substring(0,
+j+k)+q[1]+b.substring(j+k):-1===q[0]&&(b=b.substring(0,j+k)+b.substring(j+this.diff_xIndex(g,h+q[1].length)));-1!==q[0]&&(h+=q[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]};
+diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;var d=a[0],e=d.diffs;if(0==e.length||0!=e[0][0])e.unshift([0,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||0!=e[e.length-1][0]?(e.push([0,
+c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c};
+diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,j=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([0,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){var g=d.diffs[0][0],i=d.diffs[0][1];1===g?(h.length2+=i.length,f+=i.length,h.diffs.push(d.diffs.shift()),
+j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.length,e+=i.length,j=!1,h.diffs.push([g,i]),d.diffs.shift()):(i=i.substring(0,b-h.length1-this.Patch_Margin),h.length1+=i.length,e+=i.length,0===g?(h.length2+=i.length,f+=i.length):j=!1,h.diffs.push([g,i]),i==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(i.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);i=this.diff_text1(d.diffs).substring(0,this.Patch_Margin);""!==i&&
+(h.length1+=i.length,h.length2+=i.length,0!==h.diffs.length&&0===h.diffs[h.diffs.length-1][0]?h.diffs[h.diffs.length-1][1]+=i:h.diffs.push([0,i]));j||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")};
+diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
+parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
+diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
+this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})()
diff --git a/core/media/com_contenthistory/js/jquery.pretty-text-diff.js b/core/media/com_contenthistory/js/jquery.pretty-text-diff.js
new file mode 100644
index 00000000..74f402ee
--- /dev/null
+++ b/core/media/com_contenthistory/js/jquery.pretty-text-diff.js
@@ -0,0 +1,87 @@
+// Generated by CoffeeScript 1.4.0
+
+/*
+@preserve jQuery.PrettyTextDiff 1.0.2
+See https://github.com/arnab/jQuery.PrettyTextDiff/
+
+Modified to show with and without HTML: Mark Dexter, Joomla Project.
+*/
+
+
+(function() {
+  var $;
+
+  $ = jQuery;
+
+  $.fn.extend({
+    prettyTextDiff: function(options) {
+      var dmp, settings;
+      settings = {
+        originalContainer: ".original",
+        changedContainer: ".changed",
+        diffContainer: ".diff",
+        originalHtmlContainer: ".originalhtml",
+        changedHtmlContainer: ".changedhtml",
+        diffHtmlContainer: ".diffhtml",
+        cleanup: true,
+        debug: false
+      };
+      settings = $.extend(settings, options);
+      $.fn.prettyTextDiff.debug("Options: ", settings, settings);
+      dmp = new diff_match_patch();
+      return this.each(function() {
+        var changed, diff_as_html, diffs, original, changedhtml, originalhtml, diffshtml;
+        original = $(settings.originalContainer, this).text();
+        $.fn.prettyTextDiff.debug("Original text found: ", original, settings);
+        changed = $(settings.changedContainer, this).text();
+        $.fn.prettyTextDiff.debug("Changed  text found: ", changed, settings);
+        originalhtml = $(settings.originalHtmlContainer, this).text();
+        $.fn.prettyTextDiff.debug("Original text found: ", original, settings);
+        changedhtml = $(settings.changedHtmlContainer, this).text();
+        $.fn.prettyTextDiff.debug("Changed  text found: ", changed, settings);
+        diffs = dmp.diff_main(original, changed);
+        diffshtml = dmp.diff_main(originalhtml, changedhtml);
+        if (settings.cleanup) {
+          dmp.diff_cleanupSemantic(diffs);
+          dmp.diff_cleanupSemantic(diffshtml);
+        }
+        $.fn.prettyTextDiff.debug("Diffs: ", diffs, settings);
+        diff_as_html = diffs.map(function(diff) {
+          return $.fn.prettyTextDiff.createHTML(diff);
+        });
+        diffhtml_as_html = diffshtml.map(function(diff) {
+            return $.fn.prettyTextDiff.createHTML(diff);
+        });
+        $(settings.diffContainer, this).html(diff_as_html.join(''));
+        $(settings.diffHtmlContainer, this).html(diffhtml_as_html.join(''));
+        return this;
+      });
+    }
+  });
+
+  $.fn.prettyTextDiff.debug = function(message, object, settings) {
+    if (settings.debug) {
+      return console.log(message, object);
+    }
+  };
+
+  $.fn.prettyTextDiff.createHTML = function(diff) {
+    var data, html, operation, pattern_amp, pattern_gt, pattern_lt, pattern_para, text;
+    html = [];
+    pattern_amp = /&/g;
+    pattern_lt = /</g;
+    pattern_gt = />/g;
+    pattern_para = /\n/g;
+    operation = diff[0], data = diff[1];
+    text = data.replace(pattern_amp, '&amp;').replace(pattern_lt, '&lt;').replace(pattern_gt, '&gt;').replace(pattern_para, '<br>');
+    switch (operation) {
+      case DIFF_INSERT:
+        return '<ins>' + text + '</ins>';
+      case DIFF_DELETE:
+        return '<del>' + text + '</del>';
+      case DIFF_EQUAL:
+        return '<span>' + text + '</span>';
+    }
+  };
+
+}).call(this);
diff --git a/core/media/com_contenthistory/js/jquery.pretty-text-diff.min.js b/core/media/com_contenthistory/js/jquery.pretty-text-diff.min.js
new file mode 100644
index 00000000..4bf5ef49
--- /dev/null
+++ b/core/media/com_contenthistory/js/jquery.pretty-text-diff.min.js
@@ -0,0 +1,5 @@
+(function(){var $;$=jQuery;$.fn.extend({prettyTextDiff:function(options){var dmp,settings;settings={originalContainer:".original",changedContainer:".changed",diffContainer:".diff",originalHtmlContainer:".originalhtml",changedHtmlContainer:".changedhtml",diffHtmlContainer:".diffhtml",cleanup:true,debug:false};settings=$.extend(settings,options);$.fn.prettyTextDiff.debug("Options: ",settings,settings);dmp=new diff_match_patch;return this.each(function(){var changed,diff_as_html,diffs,original,changedhtml,
+originalhtml,diffshtml;original=$(settings.originalContainer,this).text();$.fn.prettyTextDiff.debug("Original text found: ",original,settings);changed=$(settings.changedContainer,this).text();$.fn.prettyTextDiff.debug("Changed  text found: ",changed,settings);originalhtml=$(settings.originalHtmlContainer,this).text();$.fn.prettyTextDiff.debug("Original text found: ",original,settings);changedhtml=$(settings.changedHtmlContainer,this).text();$.fn.prettyTextDiff.debug("Changed  text found: ",changed,
+settings);diffs=dmp.diff_main(original,changed);diffshtml=dmp.diff_main(originalhtml,changedhtml);if(settings.cleanup){dmp.diff_cleanupSemantic(diffs);dmp.diff_cleanupSemantic(diffshtml)}$.fn.prettyTextDiff.debug("Diffs: ",diffs,settings);diff_as_html=diffs.map(function(diff){return $.fn.prettyTextDiff.createHTML(diff)});diffhtml_as_html=diffshtml.map(function(diff){return $.fn.prettyTextDiff.createHTML(diff)});$(settings.diffContainer,this).html(diff_as_html.join(""));$(settings.diffHtmlContainer,
+this).html(diffhtml_as_html.join(""));return this})}});$.fn.prettyTextDiff.debug=function(message,object,settings){if(settings.debug)return console.log(message,object)};$.fn.prettyTextDiff.createHTML=function(diff){var data,html,operation,pattern_amp,pattern_gt,pattern_lt,pattern_para,text;html=[];pattern_amp=/&/g;pattern_lt=/</g;pattern_gt=/>/g;pattern_para=/\n/g;operation=diff[0],data=diff[1];text=data.replace(pattern_amp,"&amp;").replace(pattern_lt,"&lt;").replace(pattern_gt,"&gt;").replace(pattern_para,
+"<br>");switch(operation){case DIFF_INSERT:return"<ins>"+text+"</ins>";case DIFF_DELETE:return"<del>"+text+"</del>";case DIFF_EQUAL:return"<span>"+text+"</span>"}}}).call(this);
\ No newline at end of file
diff --git a/core/media/com_fields/js/admin-fields-modal.js b/core/media/com_fields/js/admin-fields-modal.js
new file mode 100644
index 00000000..c8d7a6ed
--- /dev/null
+++ b/core/media/com_fields/js/admin-fields-modal.js
@@ -0,0 +1,30 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Joomla = window.Joomla || {};
+
+(function(Joomla) {
+	Joomla.fieldIns = function(id, editor) {
+		/** Use the API, if editor supports it **/
+		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.parent.Joomla.editors.instances[editor].replaceSelection("{field " + id + "}")
+		} else {
+			window.parent.jInsertEditorText("{field " + id + "}", editor);
+		}
+
+		window.parent.jModalClose();
+	};
+
+	Joomla.fieldgroupIns = function(id, editor) {
+		/** Use the API, if editor supports it **/
+		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.parent.Joomla.editors.instances[editor].replaceSelection("{fieldgroup " + id + "}")
+		} else {
+			window.parent.jInsertEditorText("{fieldgroup " + id + "}", editor);
+		}
+
+		window.parent.jModalClose();
+	};
+})(Joomla);
diff --git a/core/media/com_fields/js/admin-fields-modal.min.js b/core/media/com_fields/js/admin-fields-modal.min.js
new file mode 100644
index 00000000..55a20951
--- /dev/null
+++ b/core/media/com_fields/js/admin-fields-modal.min.js
@@ -0,0 +1 @@
+Joomla=window.Joomla||{},function(a){a.fieldIns=function(a,b){window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(b)?window.parent.Joomla.editors.instances[b].replaceSelection("{field "+a+"}"):window.parent.jInsertEditorText("{field "+a+"}",b),window.parent.jModalClose()},a.fieldgroupIns=function(a,b){window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(b)?window.parent.Joomla.editors.instances[b].replaceSelection("{fieldgroup "+a+"}"):window.parent.jInsertEditorText("{fieldgroup "+a+"}",b),window.parent.jModalClose()}}(Joomla);
\ No newline at end of file
diff --git a/core/media/com_finder/css/dates.css b/core/media/com_finder/css/dates.css
new file mode 100644
index 00000000..82efa20a
--- /dev/null
+++ b/core/media/com_finder/css/dates.css
@@ -0,0 +1,26 @@
+#finder-filter-window {
+	margin: 10px 0 10px;
+	overflow: auto;
+	padding: 0;
+	width: 100%;
+}
+
+ul#finder-filter-select-dates {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+ul#finder-filter-select-dates li.filter-date {
+	background: none;
+	float: left;
+	list-style: none;
+	margin: 0;
+	padding: 5px 0;
+	text-align: left;
+	width: 49%;
+}
+
+ul#finder-filter-select-dates li.filter-date select.filter-date-operator {
+	margin-right: 10px;
+}
diff --git a/core/media/com_finder/css/finder.css b/core/media/com_finder/css/finder.css
new file mode 100644
index 00000000..d92f2055
--- /dev/null
+++ b/core/media/com_finder/css/finder.css
@@ -0,0 +1,137 @@
+#advanced-search {
+	text-align:left;
+	width:100%;
+	padding:5px 0 15px;
+}
+
+#advanced-search-toggle {
+	cursor:pointer;
+}
+
+#search-query-explained {
+	padding:10px 0;
+}
+
+#search-query-explained span.term,
+#search-query-explained span.date,
+#search-query-explained span.when,
+#search-query-explained span.branch,
+#search-query-explained span.node,
+#search-query-explained span.op {
+	font-weight:bold;
+}
+
+#search-query-explained span.op {
+	text-transform:uppercase;
+}
+
+#search-results li.search-result .mime-pdf {
+	padding-left:20px;
+	background:url(../../system/images/pdf_button.png) no-repeat;
+}
+
+#search-results .search-pagination,
+#search-results .pagination,
+#search-results .search-pages-counter {
+	clear:both;
+	margin:0 auto;
+}
+
+#highlighter-start, #highlighter-end {
+	display:none;
+	height:0;
+	opacity:0;
+}
+
+span.highlight {
+	background-color:#FFFFCC;
+	font-weight:bold;
+	padding:1px 0;
+}
+
+ul.autocompleter-choices {
+	position:absolute;
+	margin:0;
+	padding:0;
+	list-style:none;
+	border:1px solid #EEEEEE;
+	background-color:white;
+	border-right-color:#DDDDDD;
+	border-bottom-color:#DDDDDD;
+	text-align:left;
+	font-family:Verdana, Geneva, Arial, Helvetica, sans-serif;
+	z-index:50;
+}
+
+ul.autocompleter-choices li {
+	background:none;
+	position:relative;
+	padding:0.1em 1.5em 0.1em 1em;
+	cursor:pointer;
+	font-weight:normal;
+	font-size:1em;
+}
+
+ul.autocompleter-choices li.autocompleter-selected {
+	background-color:#444;
+	color:#fff;
+}
+
+ul.autocompleter-choices span.autocompleter-queried {
+	font-weight:bold;
+}
+
+ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried {
+	color:#9FCFFF;
+}
+
+.autocomplete-suggestions {
+	border: 1px solid #999;
+	background: #FFF; cursor: default;
+	overflow: auto;
+	-webkit-box-shadow: 1px 4px 3px rgba(50, 50, 50, 0.64);
+	-moz-box-shadow: 1px 4px 3px rgba(50, 50, 50, 0.64);
+	box-shadow: 1px 4px 3px rgba(50, 50, 50, 0.64);
+}
+
+.autocomplete-suggestion {
+	padding: 2px 5px;
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.autocomplete-no-suggestion {
+	padding: 2px 5px;
+}
+
+.autocomplete-selected {
+	background: #F0F0F0;
+}
+
+.autocomplete-suggestions strong {
+	font-weight: bold; color: #000;
+}
+
+.autocomplete-group {
+	padding: 2px 5px;
+}
+
+.autocomplete-group strong {
+	font-weight: bold;
+	font-size: 16px;
+	color: #000;
+	display: block;
+	border-bottom: 1px solid #000;
+}
+
+ul#finder-filter-select-list {
+	top: 4em !important;
+}
+
+.finder-selects .inputbox {
+	width: 180px;
+}
+
+div#finder-filter-window .filter-branch .finder-selects {
+	float: left;
+}
diff --git a/core/media/com_finder/css/indexer.css b/core/media/com_finder/css/indexer.css
new file mode 100644
index 00000000..75eee685
--- /dev/null
+++ b/core/media/com_finder/css/indexer.css
@@ -0,0 +1,17 @@
+#finder-indexer-container {
+	text-align: center;
+}
+
+#finder-progress-container {
+	width: 350px;
+	margin: 0 auto;
+}
+
+h1.finder-error {
+	color: #FF0000;
+}
+
+p.finder-error {
+	color: #FF0000;
+	font-weight:bold;
+}
diff --git a/core/media/com_finder/js/autocompleter.js b/core/media/com_finder/js/autocompleter.js
new file mode 100644
index 00000000..ff40fe20
--- /dev/null
+++ b/core/media/com_finder/js/autocompleter.js
@@ -0,0 +1,506 @@
+//@deprecated  3.4
+var Observer = new Class({
+	Implements: [Options, Events],
+	options: {
+		periodical: false,
+		delay: 1000
+	},
+	initialize: function (el, onFired, options) {
+		this.element = document.id(el) || $document.id(el);
+		this.addEvent('onFired', onFired);
+		this.setOptions(options);
+		this.bound = this.changed.bind(this);
+		this.resume();
+	},
+	changed: function () {
+		var value = this.element.get('value');
+		if ($equals(this.value, value)) return;
+		this.clear();
+		this.value = value;
+		this.timeout = this.onFired.delay(this.options.delay, this);
+	},
+	setValue: function (value) {
+		this.value = value;
+		this.element.set('value', value);
+		return this.clear();
+	},
+	onFired: function () {
+		this.fireEvent('onFired', [this.value, this.element]);
+	},
+	clear: function () {
+		clearTimeout(this.timeout || null);
+		return this;
+	},
+	pause: function () {
+		if (this.timer) clearTimeout(this.timer);
+		else this.element.removeEvent('keyup', this.bound);
+		return this.clear();
+	},
+	resume: function () {
+		this.value = this.element.get('value');
+		if (this.options.periodical) this.timer = this.changed.periodical(this.options.periodical, this);
+		else this.element.addEvent('keyup', this.bound);
+		return this;
+	}
+});
+var $equals = function (obj1, obj2) {
+		return (obj1 == obj2 || JSON.encode(obj1) == JSON.encode(obj2));
+	};
+var Autocompleter = new Class({
+	Implements: [Options, Events],
+	options: {
+		minLength: 1,
+		markQuery: true,
+		width: 'inherit',
+		maxChoices: 10,
+		injectChoice: null,
+		customChoices: null,
+		emptyChoices: null,
+		visibleChoices: true,
+		className: 'autocompleter-choices',
+		zIndex: 1000,
+		delay: 400,
+		observerOptions: {},
+		fxOptions: {},
+		autoSubmit: false,
+		overflow: false,
+		overflowMargin: 25,
+		selectFirst: false,
+		filter: null,
+		filterCase: false,
+		filterSubset: false,
+		forceSelect: false,
+		selectMode: true,
+		choicesMatch: null,
+		multiple: false,
+		separator: ', ',
+		separatorSplit: /\s*[,;]\s*/,
+		autoTrim: false,
+		allowDupes: false,
+		cache: true,
+		relative: false
+	},
+	initialize: function (element, options) {
+		this.element = document.id(element);
+		this.setOptions(options);
+		this.build();
+		this.observer = new Observer(this.element, this.prefetch.bind(this), Object.merge({}, {
+			'delay': this.options.delay
+		}, this.options.observerOptions));
+		this.queryValue = null;
+		if (this.options.filter) this.filter = this.options.filter.bind(this);
+		var mode = this.options.selectMode;
+		this.typeAhead = (mode == 'type-ahead');
+		this.selectMode = (mode === true) ? 'selection' : mode;
+		this.cached = [];
+	},
+	build: function () {
+		if (document.id(this.options.customChoices)) {
+			this.choices = this.options.customChoices;
+		} else {
+			this.choices = new Element('ul', {
+				'class': this.options.className,
+				'styles': {
+					'zIndex': this.options.zIndex
+				}
+			}).inject(document.body);
+			this.relative = false;
+			if (this.options.relative) {
+				this.choices.inject(this.element, 'after');
+				this.relative = this.element.getOffsetParent();
+			}
+			this.fix = new OverlayFix(this.choices);
+		}
+		if (!this.options.separator.test(this.options.separatorSplit)) {
+			this.options.separatorSplit = this.options.separator;
+		}
+		this.fx = (!this.options.fxOptions) ? null : new Fx.Tween(this.choices, Object.merge({}, {
+			'property': 'opacity',
+			'link': 'cancel',
+			'duration': 200
+		}, this.options.fxOptions)).addEvent('onStart', Chain.prototype.clearChain).set(0);
+		this.element.setProperty('autocomplete', 'off').addEvent((Browser.ie || Browser.safari || Browser.chrome) ? 'keydown' : 'keypress', this.onCommand.bind(this)).addEvent('click', this.onCommand.bind(this, [false])).addEvent('focus', this.toggleFocus.pass({
+			bind: this,
+			arguments: true,
+			delay: 100
+		})).addEvent('blur', this.toggleFocus.pass({
+			bind: this,
+			arguments: false,
+			delay: 100
+		}));
+	},
+	destroy: function () {
+		if (this.fix) this.fix.destroy();
+		this.choices = this.selected = this.choices.destroy();
+	},
+	toggleFocus: function (state) {
+		this.focussed = state;
+		if (!state) this.hideChoices(true);
+		this.fireEvent((state) ? 'onFocus' : 'onBlur', [this.element]);
+	},
+	onCommand: function (e) {
+		if (!e && this.focussed) return this.prefetch();
+		if (e && e.key && !e.shift) {
+			switch (e.key) {
+			case 'enter':
+				if (this.element.value != this.opted) return true;
+				if (this.selected && this.visible) {
+					this.choiceSelect(this.selected);
+					return !!(this.options.autoSubmit);
+				}
+				break;
+			case 'up':
+			case 'down':
+				if (!this.prefetch() && this.queryValue !== null) {
+					var up = (e.key == 'up');
+					this.choiceOver((this.selected || this.choices)[(this.selected) ? ((up) ? 'getPrevious' : 'getNext') : ((up) ? 'getLast' : 'getFirst')](this.options.choicesMatch), true);
+				}
+				return false;
+			case 'esc':
+			case 'tab':
+				this.hideChoices(true);
+				break;
+			}
+		}
+		return true;
+	},
+	setSelection: function (finish) {
+		var input = this.selected.inputValue,
+			value = input;
+		var start = this.queryValue.length,
+			end = input.length;
+		if (input.substr(0, start).toLowerCase() != this.queryValue.toLowerCase()) start = 0;
+		if (this.options.multiple) {
+			var split = this.options.separatorSplit;
+			value = this.element.value;
+			start += this.queryIndex;
+			end += this.queryIndex;
+			var old = value.substr(this.queryIndex).split(split, 1)[0];
+			value = value.substr(0, this.queryIndex) + input + value.substr(this.queryIndex + old.length);
+			if (finish) {
+				var tokens = value.split(this.options.separatorSplit).filter(function (entry) {
+					return this.test(entry);
+				}, /[^\s,]+/);
+				if (!this.options.allowDupes) tokens = [].combine(tokens);
+				var sep = this.options.separator;
+				value = tokens.join(sep) + sep;
+				end = value.length;
+			}
+		}
+		this.observer.setValue(value);
+		this.opted = value;
+		if (finish || this.selectMode == 'pick') start = end;
+		this.element.selectRange(start, end);
+		this.fireEvent('onSelection', [this.element, this.selected, value, input]);
+	},
+	showChoices: function () {
+		var match = this.options.choicesMatch,
+			first = this.choices.getFirst(match);
+		this.selected = this.selectedValue = null;
+		if (this.fix) {
+			var pos = this.element.getCoordinates(this.relative),
+				width = this.options.width || 'auto';
+			this.choices.setStyles({
+				'left': pos.left,
+				'top': pos.bottom,
+				'width': (width === true || width == 'inherit') ? pos.width : width
+			});
+		}
+		if (!first) return;
+		if (!this.visible) {
+			this.visible = true;
+			this.choices.setStyle('display', '');
+			if (this.fx) this.fx.start(1);
+			this.fireEvent('onShow', [this.element, this.choices]);
+		}
+		if (this.options.selectFirst || this.typeAhead || first.inputValue == this.queryValue) this.choiceOver(first, this.typeAhead);
+		var items = this.choices.getChildren(match),
+			max = this.options.maxChoices;
+		var styles = {
+			'overflowY': 'hidden',
+			'height': ''
+		};
+		this.overflown = false;
+		if (items.length > max) {
+			var item = items[max - 1];
+			styles.overflowY = 'scroll';
+			styles.height = item.getCoordinates(this.choices).bottom;
+			this.overflown = true;
+		};
+		this.choices.setStyles(styles);
+		this.fix.show();
+		if (this.options.visibleChoices) {
+			var scroll = document.getScroll(),
+				size = document.getSize(),
+				coords = this.choices.getCoordinates();
+			if (coords.right > scroll.x + size.x) scroll.x = coords.right - size.x;
+			if (coords.bottom > scroll.y + size.y) scroll.y = coords.bottom - size.y;
+			window.scrollTo(Math.min(scroll.x, coords.left), Math.min(scroll.y, coords.top));
+		}
+	},
+	// TODO: No $arguments in MT 1.3
+	hideChoices: function (clear) {
+		if (clear) {
+			var value = this.element.value;
+			if (this.options.forceSelect) value = this.opted;
+			if (this.options.autoTrim) {
+				value = value.split(this.options.separatorSplit).filter($arguments(0)).join(this.options.separator);
+			}
+			this.observer.setValue(value);
+		}
+		if (!this.visible) return;
+		this.visible = false;
+		if (this.selected) this.selected.removeClass('autocompleter-selected');
+		this.observer.clear();
+		var hide = function () {
+				this.choices.setStyle('display', 'none');
+				this.fix.hide();
+			}.bind(this);
+		if (this.fx) this.fx.start(0).chain(hide);
+		else hide();
+		this.fireEvent('onHide', [this.element, this.choices]);
+	},
+	prefetch: function () {
+		var value = this.element.value,
+			query = value;
+		if (this.options.multiple) {
+			var split = this.options.separatorSplit;
+			var values = value.split(split);
+			var index = this.element.getSelectedRange().start;
+			var toIndex = value.substr(0, index).split(split);
+			var last = toIndex.length - 1;
+			index -= toIndex[last].length;
+			query = values[last];
+		}
+		if (query.length < this.options.minLength) {
+			this.hideChoices();
+		} else {
+			if (query === this.queryValue || (this.visible && query == this.selectedValue)) {
+				if (this.visible) return false;
+				this.showChoices();
+			} else {
+				this.queryValue = query;
+				this.queryIndex = index;
+				if (!this.fetchCached()) this.query();
+			}
+		}
+		return true;
+	},
+	fetchCached: function () {
+		return false;
+		if (!this.options.cache || !this.cached || !this.cached.length || this.cached.length >= this.options.maxChoices || this.queryValue) return false;
+		this.update(this.filter(this.cached));
+		return true;
+	},
+	update: function (tokens) {
+		this.choices.empty();
+		this.cached = tokens;
+		var type = tokens && typeOf(tokens);
+		if (!type || (type == 'array' && !tokens.length) || (type == 'hash' && !tokens.getLength())) {
+			(this.options.emptyChoices || this.hideChoices).call(this);
+		} else {
+			if (this.options.maxChoices < tokens.length && !this.options.overflow) tokens.length = this.options.maxChoices;
+			tokens.each(this.options.injectChoice ||
+			function (token) {
+				var choice = new Element('li', {
+					'html': this.markQueryValue(token)
+				});
+				choice.inputValue = token;
+				this.addChoiceEvents(choice).inject(this.choices);
+			}, this);
+			this.showChoices();
+		}
+	},
+	choiceOver: function (choice, selection) {
+		if (!choice || choice == this.selected) return;
+		if (this.selected) this.selected.removeClass('autocompleter-selected');
+		this.selected = choice.addClass('autocompleter-selected');
+		this.fireEvent('onSelect', [this.element, this.selected, selection]);
+		if (!this.selectMode) this.opted = this.element.value;
+		if (!selection) return;
+		this.selectedValue = this.selected.inputValue;
+		if (this.overflown) {
+			var coords = this.selected.getCoordinates(this.choices),
+				margin = this.options.overflowMargin,
+				top = this.choices.scrollTop,
+				height = this.choices.offsetHeight,
+				bottom = top + height;
+			if (coords.top - margin < top && top) this.choices.scrollTop = Math.max(coords.top - margin, 0);
+			else if (coords.bottom + margin > bottom) this.choices.scrollTop = Math.min(coords.bottom - height + margin, bottom);
+		}
+		if (this.selectMode) this.setSelection();
+	},
+	choiceSelect: function (choice) {
+		if (choice) this.choiceOver(choice);
+		this.setSelection(true);
+		this.queryValue = false;
+		this.hideChoices();
+	},
+	filter: function (tokens) {
+		return (tokens || this.tokens).filter(function (token) {
+			return this.test(token);
+		}, new RegExp(((this.options.filterSubset) ? '' : '^') + this.queryValue.escapeRegExp(), (this.options.filterCase) ? '' : 'i'));
+	},
+	markQueryValue: function (str) {
+		return (!this.options.markQuery || !this.queryValue) ? str : str.replace(new RegExp('(' + ((this.options.filterSubset) ? '' : '^') + this.queryValue.escapeRegExp() + ')', (this.options.filterCase) ? '' : 'i'), '<span class="autocompleter-queried">$1</span>');
+	},
+	addChoiceEvents: function (el) {
+		return el.addEvents({
+			'mouseover': this.choiceOver.bind(this, el),
+			'click': this.choiceSelect.bind(this, el)
+		});
+	}
+});
+var OverlayFix = new Class({
+	initialize: function (el) {
+		if (Browser.ie) {
+			this.element = document.id(el);
+			this.relative = this.element.getOffsetParent();
+			this.fix = new Element('iframe', {
+				'frameborder': '0',
+				'scrolling': 'no',
+				'src': 'javascript:false;',
+				'styles': {
+					'position': 'absolute',
+					'border': 'none',
+					'display': 'none',
+					'filter': 'progid:DXImageTransform.Microsoft.Alpha(opacity=0)'
+				}
+			}).inject(this.element, 'after');
+		}
+	},
+	show: function () {
+		if (this.fix) {
+			var coords = this.element.getCoordinates(this.relative);
+			delete coords.right;
+			delete coords.bottom;
+			this.fix.setStyles(Object.append(coords, {
+				'display': '',
+				'zIndex': (this.element.getStyle('zIndex') || 1) - 1
+			}));
+		}
+		return this;
+	},
+	hide: function () {
+		if (this.fix) this.fix.setStyle('display', 'none');
+		return this;
+	},
+	destroy: function () {
+		if (this.fix) this.fix = this.fix.destroy();
+	}
+});
+Element.implement({
+	getSelectedRange: function () {
+		if (!Browser.ie) return {
+			start: this.selectionStart,
+			end: this.selectionEnd
+		};
+		var pos = {
+			start: 0,
+			end: 0
+		};
+		var range = this.getDocument().selection.createRange();
+		if (!range || range.parentElement() != this) return pos;
+		var dup = range.duplicate();
+		if (this.type == 'text') {
+			pos.start = 0 - dup.moveStart('character', -100000);
+			pos.end = pos.start + range.text.length;
+		} else {
+			var value = this.value;
+			var offset = value.length - value.match(/[\n\r]*$/)[0].length;
+			dup.moveToElementText(this);
+			dup.setEndPoint('StartToEnd', range);
+			pos.end = offset - dup.text.length;
+			dup.setEndPoint('StartToStart', range);
+			pos.start = offset - dup.text.length;
+		}
+		return pos;
+	},
+	selectRange: function (start, end) {
+		if (Browser.ie) {
+			var diff = this.value.substr(start, end - start).replace(/\r/g, '').length;
+			start = this.value.substr(0, start).replace(/\r/g, '').length;
+			var range = this.createTextRange();
+			range.collapse(true);
+			range.moveEnd('character', start + diff);
+			range.moveStart('character', start);
+			range.select();
+		} else {
+			this.focus();
+			this.setSelectionRange(start, end);
+		}
+		return this;
+	}
+});
+Autocompleter.Base = Autocompleter;
+Autocompleter.Request = new Class({
+	Extends: Autocompleter,
+	options: {
+		postData: {},
+		ajaxOptions: {},
+		postVar: 'value'
+	},
+	query: function () {
+		var data = this.options.postData.unlink || {};
+		data[this.options.postVar] = this.queryValue;
+		var indicator = document.id(this.options.indicator);
+		if (indicator) indicator.setStyle('display', '');
+		var cls = this.options.indicatorClass;
+		if (cls) this.element.addClass(cls);
+		this.fireEvent('onRequest', [this.element, this.request, data, this.queryValue]);
+		this.request.send({
+			'data': data
+		});
+	},
+	queryResponse: function () {
+		var indicator = document.id(this.options.indicator);
+		if (indicator) indicator.setStyle('display', 'none');
+		var cls = this.options.indicatorClass;
+		if (cls) this.element.removeClass(cls);
+		return this.fireEvent('onComplete', [this.element, this.request]);
+	}
+});
+Autocompleter.Request.JSON = new Class({
+	Extends: Autocompleter.Request,
+	initialize: function (el, url, options) {
+		this.parent(el, options);
+		this.request = new Request.JSON(Object.merge({}, {
+			'url': url,
+			'link': 'cancel'
+		}, this.options.ajaxOptions)).addEvent('onComplete', this.queryResponse.bind(this));
+	},
+	queryResponse: function (response) {
+		this.parent();
+		this.update(response);
+	}
+});
+Autocompleter.Request.HTML = new Class({
+	Extends: Autocompleter.Request,
+	initialize: function (el, url, options) {
+		this.parent(el, options);
+		this.request = new Request.HTML(Object.merge({}, {
+			'url': url,
+			'link': 'cancel',
+			'update': this.choices
+		}, this.options.ajaxOptions)).addEvent('onComplete', this.queryResponse.bind(this));
+	},
+	queryResponse: function (tree, elements) {
+		this.parent();
+		if (!elements || !elements.length) {
+			this.hideChoices();
+		} else {
+			this.choices.getChildren(this.options.choicesMatch).each(this.options.injectChoice ||
+			function (choice) {
+				var value = choice.innerHTML;
+				choice.inputValue = value;
+				this.addChoiceEvents(choice.set('html', this.markQueryValue(value)));
+			}, this);
+			this.showChoices();
+		}
+	}
+});
+Autocompleter.Ajax = {
+	Base: Autocompleter.Request,
+	Json: Autocompleter.Request.JSON,
+	Xhtml: Autocompleter.Request.HTML
+};
diff --git a/core/media/com_finder/js/indexer.js b/core/media/com_finder/js/indexer.js
new file mode 100644
index 00000000..ecceb077
--- /dev/null
+++ b/core/media/com_finder/js/indexer.js
@@ -0,0 +1,104 @@
+var FinderIndexer = function(){
+	var totalItems= null;
+	var batchSize= null;
+	var offset= null;
+	var progress= null;
+	var optimized= false;
+	var path = 'index.php?option=com_finder&tmpl=component&format=json';
+
+	var initialize = function () {
+		offset = 0;
+		progress = 0;
+		path = path + '&' + jQuery('#finder-indexer-token').attr('name') + '=1';
+		getRequest('indexer.start');
+	};
+
+	var getRequest= function (task) {
+		jQuery.ajax({
+			type : "GET",
+			url : path,
+			data :  'task=' + task,
+			dataType : 'json',
+			success : handleResponse,
+			error : handleFailure
+		});
+	};
+
+	var handleResponse = function (json, resp) {
+		try {
+			if (json === null) {
+				throw resp;
+			}
+			if (json.error) {
+				throw json;
+			}
+			if (json.start) {
+				totalItems = json.totalItems;
+			}
+			offset += json.batchOffset;
+			updateProgress(json.header, json.message);
+			if (offset < totalItems) {
+				getRequest('indexer.batch');
+			} else if (!optimized) {
+				optimized = true;
+				getRequest('indexer.optimize');
+			}
+		} catch (error) {
+			jQuery('#progress').remove();
+			try {
+				if (json.error) {
+					jQuery('#finder-progress-header').text(json.header).addClass('finder-error');
+					jQuery('#finder-progress-message').html(json.message).addClass('finder-error');
+				}
+			} catch (ignore) {
+				if (error === '') {
+					error = Joomla.JText._('COM_FINDER_NO_ERROR_RETURNED');
+				}
+				jQuery('#finder-progress-header').text(Joomla.JText._('COM_FINDER_AN_ERROR_HAS_OCCURRED')).addClass('finder-error');
+				jQuery('#finder-progress-message').html(error).addClass('finder-error');
+			}
+		}
+		return true;
+	};
+
+	var handleFailure= function (xhr) {
+		json = (typeof xhr == 'object' && xhr.responseText) ? xhr.responseText : null;
+		json = json ? jQuery.parseJSON(json) : null;
+		jQuery('#progress').remove();
+		if (json) {
+			json = json.responseText != null ? Json.evaluate(json.responseText, true) : json;
+		}
+		var header = json ? json.header : Joomla.JText._('COM_FINDER_AN_ERROR_HAS_OCCURRED');
+		var message = json ? json.message : Joomla.JText._('COM_FINDER_MESSAGE_RETURNED') + ' <br />' + json;
+		jQuery('#finder-progress-header').text(header).addClass('finder-error');
+		jQuery('#finder-progress-message').html(message).addClass('finder-error');
+	};
+
+	var updateProgress = function (header, message) {
+		progress = (offset / totalItems) * 100;
+		jQuery('#finder-progress-header').text(header);
+		jQuery('#finder-progress-message').html(message);
+		if (progress < 100) {
+			jQuery('#progress-bar').css('width', progress + '%').attr('aria-valuenow', progress);
+		}
+		else {
+			jQuery('#progress-bar').removeClass('bar-success').addClass('bar-warning').attr('aria-valuemin', 100).attr('aria-valuemax', 200);
+			jQuery('#progress-bar').css('width', progress + '%').attr('aria-valuenow', progress);
+		}
+		if (message == msg) {
+			jQuery('#progress').remove();
+			window.parent.jQuery('#modal-archive', parent.document).modal('hide');
+		}
+	};
+
+	initialize();
+};
+
+jQuery(function () {
+	Indexer = new FinderIndexer();
+	if (typeof window.parent.SqueezeBox == 'object') {
+		jQuery(window.parent.SqueezeBox).on('close', function () {
+			window.parent.location.reload(true);
+		});
+	}
+});
diff --git a/core/media/com_joomlaupdate/js/default.js b/core/media/com_joomlaupdate/js/default.js
new file mode 100644
index 00000000..86cc3c5c
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/default.js
@@ -0,0 +1,13 @@
+function extractionMethodHandler(target, prefix)
+{
+	jQuery(function ($) {
+		$em = $(target);
+		displayStyle = ($em.val() === 'direct') ? 'none' : 'table-row';
+
+		document.getElementById(prefix + '_hostname').style.display = displayStyle;
+		document.getElementById(prefix + '_port').style.display = displayStyle;
+		document.getElementById(prefix + '_username').style.display = displayStyle;
+		document.getElementById(prefix + '_password').style.display = displayStyle;
+		document.getElementById(prefix + '_directory').style.display = displayStyle;
+	});
+}
diff --git a/core/media/com_joomlaupdate/js/default.min.js b/core/media/com_joomlaupdate/js/default.min.js
new file mode 100644
index 00000000..40a79b22
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/default.min.js
@@ -0,0 +1 @@
+function extractionMethodHandler(e,t){jQuery(function(l){$em=l(e),displayStyle="direct"===$em.val()?"none":"table-row",document.getElementById(t+"_hostname").style.display=displayStyle,document.getElementById(t+"_port").style.display=displayStyle,document.getElementById(t+"_username").style.display=displayStyle,document.getElementById(t+"_password").style.display=displayStyle,document.getElementById(t+"_directory").style.display=displayStyle})}
diff --git a/core/media/com_joomlaupdate/js/encryption.js b/core/media/com_joomlaupdate/js/encryption.js
new file mode 100644
index 00000000..ca598ff6
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/encryption.js
@@ -0,0 +1,457 @@
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+/*  AES implementation in JavaScript (c) Chris Veness 2005-2010                                   */
+/*   - see http://csrc.nist.gov/publications/PubsFIPS.html#197                                    */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+
+var Aes = {};  // Aes namespace
+
+/**
+ * AES Cipher function: encrypt 'input' state with Rijndael algorithm
+ *   applies Nr rounds (10/12/14) using key schedule w for 'add round key' stage
+ *
+ * @param {Number[]} input 16-byte (128-bit) input state array
+ * @param {Number[][]} w   Key schedule as 2D byte-array (Nr+1 x Nb bytes)
+ * @returns {Number[]}     Encrypted output state array
+ */
+Aes.Cipher = function(input, w) {    // main Cipher function [§5.1]
+  var Nb = 4;               // block size (in words): no of columns in state (fixed at 4 for AES)
+  var Nr = w.length/Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+
+  var state = [[],[],[],[]];  // initialise 4xNb byte-array 'state' with input [§3.4]
+  for (var i=0; i<4*Nb; i++) state[i%4][Math.floor(i/4)] = input[i];
+
+  state = Aes.AddRoundKey(state, w, 0, Nb);
+
+  for (var round=1; round<Nr; round++) {
+    state = Aes.SubBytes(state, Nb);
+    state = Aes.ShiftRows(state, Nb);
+    state = Aes.MixColumns(state, Nb);
+    state = Aes.AddRoundKey(state, w, round, Nb);
+  }
+
+  state = Aes.SubBytes(state, Nb);
+  state = Aes.ShiftRows(state, Nb);
+  state = Aes.AddRoundKey(state, w, Nr, Nb);
+
+  var output = new Array(4*Nb);  // convert state to 1-d array before returning [§3.4]
+  for (var i=0; i<4*Nb; i++) output[i] = state[i%4][Math.floor(i/4)];
+  return output;
+}
+
+/**
+ * Perform Key Expansion to generate a Key Schedule
+ *
+ * @param {Number[]} key Key as 16/24/32-byte array
+ * @returns {Number[][]} Expanded key schedule as 2D byte-array (Nr+1 x Nb bytes)
+ */
+Aes.KeyExpansion = function(key) {  // generate Key Schedule (byte-array Nr+1 x Nb) from Key [§5.2]
+  var Nb = 4;            // block size (in words): no of columns in state (fixed at 4 for AES)
+  var Nk = key.length/4  // key length (in words): 4/6/8 for 128/192/256-bit keys
+  var Nr = Nk + 6;       // no of rounds: 10/12/14 for 128/192/256-bit keys
+
+  var w = new Array(Nb*(Nr+1));
+  var temp = new Array(4);
+
+  for (var i=0; i<Nk; i++) {
+    var r = [key[4*i], key[4*i+1], key[4*i+2], key[4*i+3]];
+    w[i] = r;
+  }
+
+  for (var i=Nk; i<(Nb*(Nr+1)); i++) {
+    w[i] = new Array(4);
+    for (var t=0; t<4; t++) temp[t] = w[i-1][t];
+    if (i % Nk == 0) {
+      temp = Aes.SubWord(Aes.RotWord(temp));
+      for (var t=0; t<4; t++) temp[t] ^= Aes.Rcon[i/Nk][t];
+    } else if (Nk > 6 && i%Nk == 4) {
+      temp = Aes.SubWord(temp);
+    }
+    for (var t=0; t<4; t++) w[i][t] = w[i-Nk][t] ^ temp[t];
+  }
+
+  return w;
+}
+
+/*
+ * ---- remaining routines are private, not called externally ----
+ */
+ 
+Aes.SubBytes = function(s, Nb) {    // apply SBox to state S [§5.1.1]
+  for (var r=0; r<4; r++) {
+    for (var c=0; c<Nb; c++) s[r][c] = Aes.Sbox[s[r][c]];
+  }
+  return s;
+}
+
+Aes.ShiftRows = function(s, Nb) {    // shift row r of state S left by r bytes [§5.1.2]
+  var t = new Array(4);
+  for (var r=1; r<4; r++) {
+    for (var c=0; c<4; c++) t[c] = s[r][(c+r)%Nb];  // shift into temp copy
+    for (var c=0; c<4; c++) s[r][c] = t[c];         // and copy back
+  }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
+  return s;  // see asmaes.sourceforge.net/rijndael/rijndaelImplementation.pdf
+}
+
+Aes.MixColumns = function(s, Nb) {   // combine bytes of each col of state S [§5.1.3]
+  for (var c=0; c<4; c++) {
+    var a = new Array(4);  // 'a' is a copy of the current column from 's'
+    var b = new Array(4);  // 'b' is a•{02} in GF(2^8)
+    for (var i=0; i<4; i++) {
+      a[i] = s[i][c];
+      b[i] = s[i][c]&0x80 ? s[i][c]<<1 ^ 0x011b : s[i][c]<<1;
+    }
+    // a[n] ^ b[n] is a•{03} in GF(2^8)
+    s[0][c] = b[0] ^ a[1] ^ b[1] ^ a[2] ^ a[3]; // 2*a0 + 3*a1 + a2 + a3
+    s[1][c] = a[0] ^ b[1] ^ a[2] ^ b[2] ^ a[3]; // a0 * 2*a1 + 3*a2 + a3
+    s[2][c] = a[0] ^ a[1] ^ b[2] ^ a[3] ^ b[3]; // a0 + a1 + 2*a2 + 3*a3
+    s[3][c] = a[0] ^ b[0] ^ a[1] ^ a[2] ^ b[3]; // 3*a0 + a1 + a2 + 2*a3
+  }
+  return s;
+}
+
+Aes.AddRoundKey = function(state, w, rnd, Nb) {  // xor Round Key into state S [§5.1.4]
+  for (var r=0; r<4; r++) {
+    for (var c=0; c<Nb; c++) state[r][c] ^= w[rnd*4+c][r];
+  }
+  return state;
+}
+
+Aes.SubWord = function(w) {    // apply SBox to 4-byte word w
+  for (var i=0; i<4; i++) w[i] = Aes.Sbox[w[i]];
+  return w;
+}
+
+Aes.RotWord = function(w) {    // rotate 4-byte word w left by one byte
+  var tmp = w[0];
+  for (var i=0; i<3; i++) w[i] = w[i+1];
+  w[3] = tmp;
+  return w;
+}
+
+// Sbox is pre-computed multiplicative inverse in GF(2^8) used in SubBytes and KeyExpansion [§5.1.1]
+Aes.Sbox =  [0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
+             0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
+             0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
+             0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
+             0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
+             0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
+             0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
+             0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
+             0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
+             0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
+             0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
+             0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
+             0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
+             0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
+             0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
+             0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16];
+
+// Rcon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [§5.2]
+Aes.Rcon = [ [0x00, 0x00, 0x00, 0x00],
+             [0x01, 0x00, 0x00, 0x00],
+             [0x02, 0x00, 0x00, 0x00],
+             [0x04, 0x00, 0x00, 0x00],
+             [0x08, 0x00, 0x00, 0x00],
+             [0x10, 0x00, 0x00, 0x00],
+             [0x20, 0x00, 0x00, 0x00],
+             [0x40, 0x00, 0x00, 0x00],
+             [0x80, 0x00, 0x00, 0x00],
+             [0x1b, 0x00, 0x00, 0x00],
+             [0x36, 0x00, 0x00, 0x00] ]; 
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+/*  AES Counter-mode implementation in JavaScript (c) Chris Veness 2005-2010                      */
+/*   - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf                       */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+
+var AesCtr = {};  // AesCtr namespace
+
+/** 
+ * Encrypt a text using AES encryption in Counter mode of operation
+ *
+ * Unicode multi-byte character safe
+ *
+ * @param {String} plaintext Source text to be encrypted
+ * @param {String} password  The password to use to generate a key
+ * @param {Number} nBits     Number of bits to be used in the key (128, 192, or 256)
+ * @returns {string}         Encrypted text
+ */
+AesCtr.encrypt = function(plaintext, password, nBits) {
+  var blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+  if (!(nBits==128 || nBits==192 || nBits==256)) return '';  // standard allows 128/192/256 bit keys
+  plaintext = Utf8.encode(plaintext);
+  password = Utf8.encode(password);
+  //var t = new Date();  // timer
+        
+  // use AES itself to encrypt password to get cipher key (using plain password as source for key 
+  // expansion) - gives us well encrypted key
+  var nBytes = nBits/8;  // no bytes in key
+  var pwBytes = new Array(nBytes);
+  for (var i=0; i<nBytes; i++) {
+    pwBytes[i] = isNaN(password.charCodeAt(i)) ? 0 : password.charCodeAt(i);
+  }
+  var key = Aes.Cipher(pwBytes, Aes.KeyExpansion(pwBytes));  // gives us 16-byte key
+  key = key.concat(key.slice(0, nBytes-16));  // expand key to 16/24/32 bytes long
+
+  // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in 1st 8 bytes,
+  // block counter in 2nd 8 bytes
+  var counterBlock = new Array(blockSize);
+  var nonce = (new Date()).getTime();  // timestamp: milliseconds since 1-Jan-1970
+  var nonceSec = Math.floor(nonce/1000);
+  var nonceMs = nonce%1000;
+  // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
+  for (var i=0; i<4; i++) counterBlock[i] = (nonceSec >>> i*8) & 0xff;
+  for (var i=0; i<4; i++) counterBlock[i+4] = nonceMs & 0xff; 
+  // and convert it to a string to go on the front of the ciphertext
+  var ctrTxt = '';
+  for (var i=0; i<8; i++) ctrTxt += String.fromCharCode(counterBlock[i]);
+
+  // generate key schedule - an expansion of the key into distinct Key Rounds for each round
+  var keySchedule = Aes.KeyExpansion(key);
+  
+  var blockCount = Math.ceil(plaintext.length/blockSize);
+  var ciphertxt = new Array(blockCount);  // ciphertext as array of strings
+  
+  for (var b=0; b<blockCount; b++) {
+    // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+    // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
+    for (var c=0; c<4; c++) counterBlock[15-c] = (b >>> c*8) & 0xff;
+    for (var c=0; c<4; c++) counterBlock[15-c-4] = (b/0x100000000 >>> c*8)
+
+    var cipherCntr = Aes.Cipher(counterBlock, keySchedule);  // -- encrypt counter block --
+    
+    // block size is reduced on final block
+    var blockLength = b<blockCount-1 ? blockSize : (plaintext.length-1)%blockSize+1;
+    var cipherChar = new Array(blockLength);
+    
+    for (var i=0; i<blockLength; i++) {  // -- xor plaintext with ciphered counter char-by-char --
+      cipherChar[i] = cipherCntr[i] ^ plaintext.charCodeAt(b*blockSize+i);
+      cipherChar[i] = String.fromCharCode(cipherChar[i]);
+    }
+    ciphertxt[b] = cipherChar.join(''); 
+  }
+
+  // Array.join is more efficient than repeated string concatenation in IE
+  var ciphertext = ctrTxt + ciphertxt.join('');
+  ciphertext = Base64.encode(ciphertext);  // encode in base64
+  
+  //alert((new Date()) - t);
+  return ciphertext;
+}
+
+/** 
+ * Decrypt a text encrypted by AES in counter mode of operation
+ *
+ * @param {String} ciphertext Source text to be encrypted
+ * @param {String} password   The password to use to generate a key
+ * @param {Number} nBits      Number of bits to be used in the key (128, 192, or 256)
+ * @returns {String}          Decrypted text
+ */
+AesCtr.decrypt = function(ciphertext, password, nBits) {
+  var blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+  if (!(nBits==128 || nBits==192 || nBits==256)) return '';  // standard allows 128/192/256 bit keys
+  ciphertext = Base64.decode(ciphertext);
+  password = Utf8.encode(password);
+  //var t = new Date();  // timer
+  
+  // use AES to encrypt password (mirroring encrypt routine)
+  var nBytes = nBits/8;  // no bytes in key
+  var pwBytes = new Array(nBytes);
+  for (var i=0; i<nBytes; i++) {
+    pwBytes[i] = isNaN(password.charCodeAt(i)) ? 0 : password.charCodeAt(i);
+  }
+  var key = Aes.Cipher(pwBytes, Aes.KeyExpansion(pwBytes));
+  key = key.concat(key.slice(0, nBytes-16));  // expand key to 16/24/32 bytes long
+
+  // recover nonce from 1st 8 bytes of ciphertext
+  var counterBlock = new Array(8);
+  ctrTxt = ciphertext.slice(0, 8);
+  for (var i=0; i<8; i++) counterBlock[i] = ctrTxt.charCodeAt(i);
+  
+  // generate key schedule
+  var keySchedule = Aes.KeyExpansion(key);
+
+  // separate ciphertext into blocks (skipping past initial 8 bytes)
+  var nBlocks = Math.ceil((ciphertext.length-8) / blockSize);
+  var ct = new Array(nBlocks);
+  for (var b=0; b<nBlocks; b++) ct[b] = ciphertext.slice(8+b*blockSize, 8+b*blockSize+blockSize);
+  ciphertext = ct;  // ciphertext is now array of block-length strings
+
+  // plaintext will get generated block-by-block into array of block-length strings
+  var plaintxt = new Array(ciphertext.length);
+
+  for (var b=0; b<nBlocks; b++) {
+    // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+    for (var c=0; c<4; c++) counterBlock[15-c] = ((b) >>> c*8) & 0xff;
+    for (var c=0; c<4; c++) counterBlock[15-c-4] = (((b+1)/0x100000000-1) >>> c*8) & 0xff;
+
+    var cipherCntr = Aes.Cipher(counterBlock, keySchedule);  // encrypt counter block
+
+    var plaintxtByte = new Array(ciphertext[b].length);
+    for (var i=0; i<ciphertext[b].length; i++) {
+      // -- xor plaintxt with ciphered counter byte-by-byte --
+      plaintxtByte[i] = cipherCntr[i] ^ ciphertext[b].charCodeAt(i);
+      plaintxtByte[i] = String.fromCharCode(plaintxtByte[i]);
+    }
+    plaintxt[b] = plaintxtByte.join('');
+  }
+
+  // join array of blocks into single plaintext string
+  var plaintext = plaintxt.join('');
+  plaintext = Utf8.decode(plaintext);  // decode from UTF8 back to Unicode multi-byte chars
+  
+  //alert((new Date()) - t);
+  return plaintext;
+}
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+/*  Base64 class: Base 64 encoding / decoding (c) Chris Veness 2002-2010                          */
+/*    note: depends on Utf8 class                                                                 */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+
+var Base64 = {};  // Base64 namespace
+
+Base64.code = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+/**
+ * Encode string into Base64, as defined by RFC 4648 [http://tools.ietf.org/html/rfc4648]
+ * (instance method extending String object). As per RFC 4648, no newlines are added.
+ *
+ * @param {String} str The string to be encoded as base-64
+ * @param {Boolean} [utf8encode=false] Flag to indicate whether str is Unicode string to be encoded 
+ *   to UTF8 before conversion to base64; otherwise string is assumed to be 8-bit characters
+ * @returns {String} Base64-encoded string
+ */ 
+Base64.encode = function(str, utf8encode) {  // http://tools.ietf.org/html/rfc4648
+  utf8encode =  (typeof utf8encode == 'undefined') ? false : utf8encode;
+  var o1, o2, o3, bits, h1, h2, h3, h4, e=[], pad = '', c, plain, coded;
+  var b64 = Base64.code;
+   
+  plain = utf8encode ? str.encodeUTF8() : str;
+  
+  c = plain.length % 3;  // pad string to length of multiple of 3
+  if (c > 0) { while (c++ < 3) { pad += '='; plain += '\0'; } }
+  // note: doing padding here saves us doing special-case packing for trailing 1 or 2 chars
+   
+  for (c=0; c<plain.length; c+=3) {  // pack three octets into four hexets
+    o1 = plain.charCodeAt(c);
+    o2 = plain.charCodeAt(c+1);
+    o3 = plain.charCodeAt(c+2);
+      
+    bits = o1<<16 | o2<<8 | o3;
+      
+    h1 = bits>>18 & 0x3f;
+    h2 = bits>>12 & 0x3f;
+    h3 = bits>>6 & 0x3f;
+    h4 = bits & 0x3f;
+
+    // use hextets to index into code string
+    e[c/3] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
+  }
+  coded = e.join('');  // join() is far faster than repeated string concatenation in IE
+  
+  // replace 'A's from padded nulls with '='s
+  coded = coded.slice(0, coded.length-pad.length) + pad;
+   
+  return coded;
+}
+
+/**
+ * Decode string from Base64, as defined by RFC 4648 [http://tools.ietf.org/html/rfc4648]
+ * (instance method extending String object). As per RFC 4648, newlines are not catered for.
+ *
+ * @param {String} str The string to be decoded from base-64
+ * @param {Boolean} [utf8decode=false] Flag to indicate whether str is Unicode string to be decoded 
+ *   from UTF8 after conversion from base64
+ * @returns {String} decoded string
+ */ 
+Base64.decode = function(str, utf8decode) {
+  utf8decode =  (typeof utf8decode == 'undefined') ? false : utf8decode;
+  var o1, o2, o3, h1, h2, h3, h4, bits, d=[], plain, coded;
+  var b64 = Base64.code;
+
+  coded = utf8decode ? str.decodeUTF8() : str;
+  
+  
+  for (var c=0; c<coded.length; c+=4) {  // unpack four hexets into three octets
+    h1 = b64.indexOf(coded.charAt(c));
+    h2 = b64.indexOf(coded.charAt(c+1));
+    h3 = b64.indexOf(coded.charAt(c+2));
+    h4 = b64.indexOf(coded.charAt(c+3));
+      
+    bits = h1<<18 | h2<<12 | h3<<6 | h4;
+      
+    o1 = bits>>>16 & 0xff;
+    o2 = bits>>>8 & 0xff;
+    o3 = bits & 0xff;
+    
+    d[c/4] = String.fromCharCode(o1, o2, o3);
+    // check for padding
+    if (h4 == 0x40) d[c/4] = String.fromCharCode(o1, o2);
+    if (h3 == 0x40) d[c/4] = String.fromCharCode(o1);
+  }
+  plain = d.join('');  // join() is far faster than repeated string concatenation in IE
+   
+  return utf8decode ? plain.decodeUTF8() : plain; 
+}
+
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+/*  Utf8 class: encode / decode between multi-byte Unicode characters and UTF-8 multiple          */
+/*              single-byte character encoding (c) Chris Veness 2002-2010                         */
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
+
+var Utf8 = {};  // Utf8 namespace
+
+/**
+ * Encode multi-byte Unicode string into utf-8 multiple single-byte characters 
+ * (BMP / basic multilingual plane only)
+ *
+ * Chars in range U+0080 - U+07FF are encoded in 2 chars, U+0800 - U+FFFF in 3 chars
+ *
+ * @param {String} strUni Unicode string to be encoded as UTF-8
+ * @returns {String} encoded string
+ */
+Utf8.encode = function(strUni) {
+  // use regular expressions & String.replace callback function for better efficiency 
+  // than procedural approaches
+  var strUtf = strUni.replace(
+      /[\u0080-\u07ff]/g,  // U+0080 - U+07FF => 2 bytes 110yyyyy, 10zzzzzz
+      function(c) { 
+        var cc = c.charCodeAt(0);
+        return String.fromCharCode(0xc0 | cc>>6, 0x80 | cc&0x3f); }
+    );
+  strUtf = strUtf.replace(
+      /[\u0800-\uffff]/g,  // U+0800 - U+FFFF => 3 bytes 1110xxxx, 10yyyyyy, 10zzzzzz
+      function(c) { 
+        var cc = c.charCodeAt(0); 
+        return String.fromCharCode(0xe0 | cc>>12, 0x80 | cc>>6&0x3F, 0x80 | cc&0x3f); }
+    );
+  return strUtf;
+}
+
+/**
+ * Decode utf-8 encoded string back into multi-byte Unicode characters
+ *
+ * @param {String} strUtf UTF-8 string to be decoded back to Unicode
+ * @returns {String} decoded string
+ */
+Utf8.decode = function(strUtf) {
+  var strUni = strUtf.replace(
+      /[\u00c0-\u00df][\u0080-\u00bf]/g,                 // 2-byte chars
+      function(c) {  // (note parentheses for precence)
+        var cc = (c.charCodeAt(0)&0x1f)<<6 | c.charCodeAt(1)&0x3f;
+        return String.fromCharCode(cc); }
+    );
+  strUni = strUni.replace(
+      /[\u00e0-\u00ef][\u0080-\u00bf][\u0080-\u00bf]/g,  // 3-byte chars
+      function(c) {  // (note parentheses for precence)
+        var cc = ((c.charCodeAt(0)&0x0f)<<12) | ((c.charCodeAt(1)&0x3f)<<6) | ( c.charCodeAt(2)&0x3f); 
+        return String.fromCharCode(cc); }
+    );
+  return strUni;
+}
+
+/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */
\ No newline at end of file
diff --git a/core/media/com_joomlaupdate/js/encryption.min.js b/core/media/com_joomlaupdate/js/encryption.min.js
new file mode 100644
index 00000000..3389ec95
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/encryption.min.js
@@ -0,0 +1 @@
+var Aes={};Aes.Cipher=function(r,e){for(var o=4,n=e.length/o-1,a=[[],[],[],[]],t=0;4*o>t;t++)a[t%4][Math.floor(t/4)]=r[t];a=Aes.AddRoundKey(a,e,0,o);for(var f=1;n>f;f++)a=Aes.SubBytes(a,o),a=Aes.ShiftRows(a,o),a=Aes.MixColumns(a,o),a=Aes.AddRoundKey(a,e,f,o);a=Aes.SubBytes(a,o),a=Aes.ShiftRows(a,o),a=Aes.AddRoundKey(a,e,n,o);for(var c=new Array(4*o),t=0;4*o>t;t++)c[t]=a[t%4][Math.floor(t/4)];return c},Aes.KeyExpansion=function(r){for(var e=4,o=r.length/4,n=o+6,a=new Array(e*(n+1)),t=new Array(4),f=0;o>f;f++){var c=[r[4*f],r[4*f+1],r[4*f+2],r[4*f+3]];a[f]=c}for(var f=o;e*(n+1)>f;f++){a[f]=new Array(4);for(var A=0;4>A;A++)t[A]=a[f-1][A];if(f%o==0){t=Aes.SubWord(Aes.RotWord(t));for(var A=0;4>A;A++)t[A]^=Aes.Rcon[f/o][A]}else o>6&&f%o==4&&(t=Aes.SubWord(t));for(var A=0;4>A;A++)a[f][A]=a[f-o][A]^t[A]}return a},Aes.SubBytes=function(r,e){for(var o=0;4>o;o++)for(var n=0;e>n;n++)r[o][n]=Aes.Sbox[r[o][n]];return r},Aes.ShiftRows=function(r,e){for(var o=new Array(4),n=1;4>n;n++){for(var a=0;4>a;a++)o[a]=r[n][(a+n)%e];for(var a=0;4>a;a++)r[n][a]=o[a]}return r},Aes.MixColumns=function(r,e){for(var o=0;4>o;o++){for(var n=new Array(4),a=new Array(4),t=0;4>t;t++)n[t]=r[t][o],a[t]=128&r[t][o]?r[t][o]<<1^283:r[t][o]<<1;r[0][o]=a[0]^n[1]^a[1]^n[2]^n[3],r[1][o]=n[0]^a[1]^n[2]^a[2]^n[3],r[2][o]=n[0]^n[1]^a[2]^n[3]^a[3],r[3][o]=n[0]^a[0]^n[1]^n[2]^a[3]}return r},Aes.AddRoundKey=function(r,e,o,n){for(var a=0;4>a;a++)for(var t=0;n>t;t++)r[a][t]^=e[4*o+t][a];return r},Aes.SubWord=function(r){for(var e=0;4>e;e++)r[e]=Aes.Sbox[r[e]];return r},Aes.RotWord=function(r){for(var e=r[0],o=0;3>o;o++)r[o]=r[o+1];return r[3]=e,r},Aes.Sbox=[99,124,119,123,242,107,111,197,48,1,103,43,254,215,171,118,202,130,201,125,250,89,71,240,173,212,162,175,156,164,114,192,183,253,147,38,54,63,247,204,52,165,229,241,113,216,49,21,4,199,35,195,24,150,5,154,7,18,128,226,235,39,178,117,9,131,44,26,27,110,90,160,82,59,214,179,41,227,47,132,83,209,0,237,32,252,177,91,106,203,190,57,74,76,88,207,208,239,170,251,67,77,51,133,69,249,2,127,80,60,159,168,81,163,64,143,146,157,56,245,188,182,218,33,16,255,243,210,205,12,19,236,95,151,68,23,196,167,126,61,100,93,25,115,96,129,79,220,34,42,144,136,70,238,184,20,222,94,11,219,224,50,58,10,73,6,36,92,194,211,172,98,145,149,228,121,231,200,55,109,141,213,78,169,108,86,244,234,101,122,174,8,186,120,37,46,28,166,180,198,232,221,116,31,75,189,139,138,112,62,181,102,72,3,246,14,97,53,87,185,134,193,29,158,225,248,152,17,105,217,142,148,155,30,135,233,206,85,40,223,140,161,137,13,191,230,66,104,65,153,45,15,176,84,187,22],Aes.Rcon=[[0,0,0,0],[1,0,0,0],[2,0,0,0],[4,0,0,0],[8,0,0,0],[16,0,0,0],[32,0,0,0],[64,0,0,0],[128,0,0,0],[27,0,0,0],[54,0,0,0]];var AesCtr={};AesCtr.encrypt=function(r,e,o){var n=16;if(128!=o&&192!=o&&256!=o)return"";r=Utf8.encode(r),e=Utf8.encode(e);for(var a=o/8,t=new Array(a),f=0;a>f;f++)t[f]=isNaN(e.charCodeAt(f))?0:e.charCodeAt(f);var c=Aes.Cipher(t,Aes.KeyExpansion(t));c=c.concat(c.slice(0,a-16));for(var A=new Array(n),d=(new Date).getTime(),i=Math.floor(d/1e3),u=d%1e3,f=0;4>f;f++)A[f]=i>>>8*f&255;for(var f=0;4>f;f++)A[f+4]=255&u;for(var s="",f=0;8>f;f++)s+=String.fromCharCode(A[f]);for(var h=Aes.KeyExpansion(c),v=Math.ceil(r.length/n),C=new Array(v),y=0;v>y;y++){for(var l=0;4>l;l++)A[15-l]=y>>>8*l&255;for(var l=0;4>l;l++)A[15-l-4]=y/4294967296>>>8*l;for(var g=Aes.Cipher(A,h),S=v-1>y?n:(r.length-1)%n+1,w=new Array(S),f=0;S>f;f++)w[f]=g[f]^r.charCodeAt(y*n+f),w[f]=String.fromCharCode(w[f]);C[y]=w.join("")}var p=s+C.join("");return p=Base64.encode(p)},AesCtr.decrypt=function(r,e,o){var n=16;if(128!=o&&192!=o&&256!=o)return"";r=Base64.decode(r),e=Utf8.encode(e);for(var a=o/8,t=new Array(a),f=0;a>f;f++)t[f]=isNaN(e.charCodeAt(f))?0:e.charCodeAt(f);var c=Aes.Cipher(t,Aes.KeyExpansion(t));c=c.concat(c.slice(0,a-16));var A=new Array(8);ctrTxt=r.slice(0,8);for(var f=0;8>f;f++)A[f]=ctrTxt.charCodeAt(f);for(var d=Aes.KeyExpansion(c),i=Math.ceil((r.length-8)/n),u=new Array(i),s=0;i>s;s++)u[s]=r.slice(8+s*n,8+s*n+n);r=u;for(var h=new Array(r.length),s=0;i>s;s++){for(var v=0;4>v;v++)A[15-v]=s>>>8*v&255;for(var v=0;4>v;v++)A[15-v-4]=(s+1)/4294967296-1>>>8*v&255;for(var C=Aes.Cipher(A,d),y=new Array(r[s].length),f=0;f<r[s].length;f++)y[f]=C[f]^r[s].charCodeAt(f),y[f]=String.fromCharCode(y[f]);h[s]=y.join("")}var l=h.join("");return l=Utf8.decode(l)};var Base64={};Base64.code="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",Base64.encode=function(r,e){e="undefined"==typeof e?!1:e;var o,n,a,t,f,c,A,d,i,u,s,h=[],v="",C=Base64.code;if(u=e?r.encodeUTF8():r,i=u.length%3,i>0)for(;i++<3;)v+="=",u+="\x00";for(i=0;i<u.length;i+=3)o=u.charCodeAt(i),n=u.charCodeAt(i+1),a=u.charCodeAt(i+2),t=o<<16|n<<8|a,f=t>>18&63,c=t>>12&63,A=t>>6&63,d=63&t,h[i/3]=C.charAt(f)+C.charAt(c)+C.charAt(A)+C.charAt(d);return s=h.join(""),s=s.slice(0,s.length-v.length)+v},Base64.decode=function(r,e){e="undefined"==typeof e?!1:e;var o,n,a,t,f,c,A,d,i,u,s=[],h=Base64.code;u=e?r.decodeUTF8():r;for(var v=0;v<u.length;v+=4)t=h.indexOf(u.charAt(v)),f=h.indexOf(u.charAt(v+1)),c=h.indexOf(u.charAt(v+2)),A=h.indexOf(u.charAt(v+3)),d=t<<18|f<<12|c<<6|A,o=d>>>16&255,n=d>>>8&255,a=255&d,s[v/4]=String.fromCharCode(o,n,a),64==A&&(s[v/4]=String.fromCharCode(o,n)),64==c&&(s[v/4]=String.fromCharCode(o));return i=s.join(""),e?i.decodeUTF8():i};var Utf8={};Utf8.encode=function(r){var e=r.replace(/[\u0080-\u07ff]/g,function(r){var e=r.charCodeAt(0);return String.fromCharCode(192|e>>6,128|63&e)});return e=e.replace(/[\u0800-\uffff]/g,function(r){var e=r.charCodeAt(0);return String.fromCharCode(224|e>>12,128|e>>6&63,128|63&e)})},Utf8.decode=function(r){var e=r.replace(/[\u00c0-\u00df][\u0080-\u00bf]/g,function(r){var e=(31&r.charCodeAt(0))<<6|63&r.charCodeAt(1);return String.fromCharCode(e)});return e=e.replace(/[\u00e0-\u00ef][\u0080-\u00bf][\u0080-\u00bf]/g,function(r){var e=(15&r.charCodeAt(0))<<12|(63&r.charCodeAt(1))<<6|63&r.charCodeAt(2);return String.fromCharCode(e)})};
diff --git a/core/media/com_joomlaupdate/js/json2.js b/core/media/com_joomlaupdate/js/json2.js
new file mode 100644
index 00000000..dcc673e3
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/json2.js
@@ -0,0 +1,8 @@
+/*
+ *  json2.js
+ *  2014-02-04
+ *  Public Domain.
+ *  NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+ *  See http://www.JSON.org/js.html
+ */
+if(typeof JSON!=='object'){JSON={}}(function(){'use strict';function f(n){return n<10?'0'+n:n}if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+'-'+f(this.getUTCMonth()+1)+'-'+f(this.getUTCDate())+'T'+f(this.getUTCHours())+':'+f(this.getUTCMinutes())+':'+f(this.getUTCSeconds())+'Z':null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()}}var e,escapable,gap,indent,meta,rep;function quote(b){escapable.lastIndex=0;return escapable.test(b)?'"'+b.replace(escapable,function(a){var c=meta[a];return typeof c==='string'?c:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+b+'"'}function str(a,b){var i,k,v,length,mind=gap,partial,value=b[a];if(value&&typeof value==='object'&&typeof value.toJSON==='function'){value=value.toJSON(a)}if(typeof rep==='function'){value=rep.call(b,a,value)}switch(typeof value){case'string':return quote(value);case'number':return isFinite(value)?String(value):'null';case'boolean':case'null':return String(value);case'object':if(!value){return'null'}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==='[object Array]'){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||'null'}v=partial.length===0?'[]':gap?'[\n'+gap+partial.join(',\n'+gap)+'\n'+mind+']':'['+partial.join(',')+']';gap=mind;return v}if(rep&&typeof rep==='object'){length=rep.length;for(i=0;i<length;i+=1){if(typeof rep[i]==='string'){k=rep[i];v=str(k,value);if(v){partial.push(quote(k)+(gap?': ':':')+v)}}}}else{for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?': ':':')+v)}}}}v=partial.length===0?'{}':gap?'{\n'+gap+partial.join(',\n'+gap)+'\n'+mind+'}':'{'+partial.join(',')+'}';gap=mind;return v}}if(typeof JSON.stringify!=='function'){escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};JSON.stringify=function(a,b,c){var i;gap='';indent='';if(typeof c==='number'){for(i=0;i<c;i+=1){indent+=' '}}else if(typeof c==='string'){indent=c}rep=b;if(b&&typeof b!=='function'&&(typeof b!=='object'||typeof b.length!=='number')){throw new Error('JSON.stringify');}return str('',{'':a})}}if(typeof JSON.parse!=='function'){e=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;JSON.parse=function(c,d){var j;function walk(a,b){var k,v,value=a[b];if(value&&typeof value==='object'){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return d.call(a,b,value)}c=String(c);e.lastIndex=0;if(e.test(c)){c=c.replace(e,function(a){return'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(c.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){j=eval('('+c+')');return typeof d==='function'?walk({'':j},''):j}throw new SyntaxError('JSON.parse');}}}());
diff --git a/core/media/com_joomlaupdate/js/json2.min.js b/core/media/com_joomlaupdate/js/json2.min.js
new file mode 100644
index 00000000..09d59754
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/json2.min.js
@@ -0,0 +1 @@
+"object"!=typeof JSON&&(JSON={}),function(){"use strict";function f(t){return 10>t?"0"+t:t}function quote(t){return escapable.lastIndex=0,escapable.test(t)?'"'+t.replace(escapable,function(t){var e=meta[t];return"string"==typeof e?e:"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+t+'"'}function str(t,e){var n,r,o,f,u,p=gap,a=e[t];switch(a&&"object"==typeof a&&"function"==typeof a.toJSON&&(a=a.toJSON(t)),"function"==typeof rep&&(a=rep.call(e,t,a)),typeof a){case"string":return quote(a);case"number":return isFinite(a)?String(a):"null";case"boolean":case"null":return String(a);case"object":if(!a)return"null";if(gap+=indent,u=[],"[object Array]"===Object.prototype.toString.apply(a)){for(f=a.length,n=0;f>n;n+=1)u[n]=str(n,a)||"null";return o=0===u.length?"[]":gap?"[\n"+gap+u.join(",\n"+gap)+"\n"+p+"]":"["+u.join(",")+"]",gap=p,o}if(rep&&"object"==typeof rep)for(f=rep.length,n=0;f>n;n+=1)"string"==typeof rep[n]&&(r=rep[n],o=str(r,a),o&&u.push(quote(r)+(gap?": ":":")+o));else for(r in a)Object.prototype.hasOwnProperty.call(a,r)&&(o=str(r,a),o&&u.push(quote(r)+(gap?": ":":")+o));return o=0===u.length?"{}":gap?"{\n"+gap+u.join(",\n"+gap)+"\n"+p+"}":"{"+u.join(",")+"}",gap=p,o}}"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()});var e,escapable,gap,indent,meta,rep;"function"!=typeof JSON.stringify&&(escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,meta={"\b":"\\b","	":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(t,e,n){var r;if(gap="",indent="","number"==typeof n)for(r=0;n>r;r+=1)indent+=" ";else"string"==typeof n&&(indent=n);if(rep=e,e&&"function"!=typeof e&&("object"!=typeof e||"number"!=typeof e.length))throw new Error("JSON.stringify");return str("",{"":t})}),"function"!=typeof JSON.parse&&(e=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,JSON.parse=function(c,d){function walk(t,e){var n,r,o=t[e];if(o&&"object"==typeof o)for(n in o)Object.prototype.hasOwnProperty.call(o,n)&&(r=walk(o,n),void 0!==r?o[n]=r:delete o[n]);return d.call(t,e,o)}var j;if(c=String(c),e.lastIndex=0,e.test(c)&&(c=c.replace(e,function(t){return"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})),/^[\],:{}\s]*$/.test(c.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return j=eval("("+c+")"),"function"==typeof d?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}();
diff --git a/core/media/com_joomlaupdate/js/update.js b/core/media/com_joomlaupdate/js/update.js
new file mode 100644
index 00000000..29900a34
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/update.js
@@ -0,0 +1,393 @@
+/**
+ *  @package    AkeebaCMSUpdate
+ *  @copyright  Copyright (c)2010-2014 Nicholas K. Dionysopoulos
+ *  @license    GNU General Public License version 3, or later
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+var stat_total = 0;
+var stat_files = 0;
+var stat_inbytes = 0;
+var stat_outbytes = 0;
+
+/**
+ * An extremely simple error handler, dumping error messages to screen
+ *
+ * @param error The error message string
+ */
+function error_callback(error)
+{
+	alert("ERROR:\n"+error);
+}
+
+/**
+ * Performs an encrypted AJAX request and returns the parsed JSON output.
+ * The window.ajax_url is used as the AJAX proxy URL.
+ * If there is no errorCallback, the window.error_callback is used.
+ *
+ * @param   object    data             An object with the query data, e.g. a serialized form
+ * @param   function  successCallback  A function accepting a single object parameter, called on success
+ * @param   function  errorCallback    A function accepting a single string parameter, called on failure
+ */
+doEncryptedAjax = function(data, successCallback, errorCallback)
+{
+	var json = JSON.stringify(data);
+	if( joomlaupdate_password.length > 0 )
+	{
+		json = AesCtr.encrypt( json, joomlaupdate_password, 128 );
+	}
+	var post_data = {
+		'json':     json
+	};
+
+	var structure =
+	{
+		type: "POST",
+		url: joomlaupdate_ajax_url,
+		cache: false,
+		data: post_data,
+		timeout: 600000,
+
+		success: function(msg, responseXML)
+		{
+			// Initialize
+			var junk = null;
+			var message = "";
+
+			// Get rid of junk before the data
+			var valid_pos = msg.indexOf('###');
+
+			if( valid_pos == -1 )
+			{
+				// Valid data not found in the response
+				msg = 'Invalid AJAX data:\n' + msg;
+
+				if (errorCallback == null)
+				{
+					if(error_callback != null)
+					{
+						error_callback(msg);
+					}
+				}
+				else
+				{
+					errorCallback(msg);
+				}
+
+				return;
+			}
+			else if( valid_pos != 0 )
+			{
+				// Data is prefixed with junk
+				junk = msg.substr(0, valid_pos);
+				message = msg.substr(valid_pos);
+			}
+			else
+			{
+				message = msg;
+			}
+
+			message = message.substr(3); // Remove triple hash in the beginning
+
+			// Get of rid of junk after the data
+			var valid_pos = message.lastIndexOf('###');
+
+			message = message.substr(0, valid_pos); // Remove triple hash in the end
+
+			// Decrypt if required
+			var data = null;
+			if( joomlaupdate_password.length > 0 )
+			{
+				try
+				{
+					var data = JSON.parse(message);
+				}
+				catch(err)
+				{
+					message = AesCtr.decrypt(message, joomlaupdate_password, 128);
+				}
+			}
+
+			try
+			{
+				if (empty(data))
+				{
+					data = JSON.parse(message);
+				}
+			}
+			catch(err)
+			{
+				var msg = err.message + "\n<br/>\n<pre>\n" + message + "\n</pre>";
+
+				if (errorCallback == null)
+				{
+					if (error_callback != null)
+					{
+						error_callback(msg);
+					}
+				}
+				else
+				{
+					errorCallback(msg);
+				}
+
+				return;
+			}
+
+			// Call the callback function
+			successCallback(data);
+		},
+
+		error: function(req)
+		{
+			var message = 'AJAX Loading Error: ' + req.statusText;
+
+			if(errorCallback == null)
+			{
+				if (error_callback != null)
+				{
+					error_callback(message);
+				}
+			}
+			else
+			{
+				errorCallback(message);
+			}
+		}
+	};
+
+	jQuery.ajax( structure );
+};
+
+/**
+ * Pings the update script (making sure its executable)
+ */
+pingExtract = function()
+{
+	// Reset variables
+	this.stat_files = 0;
+	this.stat_inbytes = 0;
+	this.stat_outbytes = 0;
+
+	// Do AJAX post
+	var post = {task : 'ping'};
+
+	this.doEncryptedAjax(post,
+		function(data) {
+			startExtract(data);
+		});
+};
+
+startExtract = function()
+{
+	console.log("started");
+	// Reset variables
+	this.stat_files = 0;
+	this.stat_inbytes = 0;
+	this.stat_outbytes = 0;
+
+	var post = { task : 'startRestore' };
+
+	this.doEncryptedAjax(post, function(data){
+		stepExtract(data);
+	});
+};
+
+stepExtract = function(data)
+{
+	if(data.status == false)
+	{
+		// handle failure
+		error_callback(data.message);
+
+		return;
+	}
+
+	if( !empty(data.Warnings) )
+	{
+		// @todo Handle warnings
+		/**
+		 $.each(data.Warnings, function(i, item){
+            $('#warnings').append(
+                $(document.createElement('div'))
+                    .html(item)
+            );
+            $('#warningsBox').show('fast');
+        });
+		 /**/
+	}
+
+	if (!empty(data.factory))
+	{
+		extract_factory = data.factory;
+	}
+
+	if(data.done)
+	{
+		finalizeUpdate();
+	}
+	else
+	{
+		// Add data to variables
+		stat_inbytes += data.bytesIn;
+		stat_percent = (stat_inbytes * 100) / joomlaupdate_totalsize;
+
+		// Update GUI
+		stat_inbytes += data.bytesIn;
+		stat_outbytes += data.bytesOut;
+		stat_files += data.files;
+
+		if (stat_percent < 100)
+		{
+			jQuery('#progress-bar').css('width', stat_percent + '%').attr('aria-valuenow', stat_percent);
+		}
+		else if (stat_percent > 100)
+		{
+			stat_percent = 100;
+			jQuery('#progress-bar').css('width', stat_percent + '%').attr('aria-valuenow', stat_percent);
+		}
+		else
+		{
+			jQuery('#progress-bar').removeClass('bar-success');
+		}
+
+		jQuery('#extpercent').text(stat_percent.toFixed(1) + '%');
+		jQuery('#extbytesin').text(stat_inbytes);
+		jQuery('#extbytesout').text(stat_outbytes);
+		jQuery('#extfiles').text(data.files);
+
+		// Do AJAX post
+		post = {
+			task: 'stepRestore',
+			factory: data.factory
+		};
+		doEncryptedAjax(post, function(data){
+			stepExtract(data);
+		});
+	}
+};
+
+finalizeUpdate = function ()
+{
+	// Do AJAX post
+	var post = { task : 'finalizeRestore', factory: window.factory };
+	doEncryptedAjax(post, function(data){
+		window.location = joomlaupdate_return_url;
+	});
+};
+
+
+/**
+ * Is a variable empty?
+ *
+ * Part of php.js
+ *
+ * @see  http://phpjs.org/
+ *
+ * @param   mixed  mixed_var  The variable
+ *
+ * @returns  boolean  True if empty
+ */
+function empty (mixed_var)
+{
+	var key;
+
+	if (mixed_var === "" ||
+		mixed_var === 0 ||
+		mixed_var === "0" ||
+		mixed_var === null ||
+		mixed_var === false ||
+		typeof mixed_var === 'undefined'
+	){
+		return true;
+	}
+
+	if (typeof mixed_var == 'object')
+	{
+		for (key in mixed_var)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Is the variable an array?
+ *
+ * Part of php.js
+ *
+ * @see  http://phpjs.org/
+ *
+ * @param   mixed  mixed_var  The variable
+ *
+ * @returns  boolean  True if it is an array or an object
+ */
+function is_array (mixed_var)
+{
+	var key = '';
+	var getFuncName = function (fn) {
+		var name = (/\W*function\s+([\w\$]+)\s*\(/).exec(fn);
+
+		if (!name) {
+			return '(Anonymous)';
+		}
+
+		return name[1];
+	};
+
+	if (!mixed_var)
+	{
+		return false;
+	}
+
+	// BEGIN REDUNDANT
+	this.php_js = this.php_js || {};
+	this.php_js.ini = this.php_js.ini || {};
+	// END REDUNDANT
+
+	if (typeof mixed_var === 'object')
+	{
+		if (this.php_js.ini['phpjs.objectsAsArrays'] &&  // Strict checking for being a JavaScript array (only check this way if call ini_set('phpjs.objectsAsArrays', 0) to disallow objects as arrays)
+			(
+			(this.php_js.ini['phpjs.objectsAsArrays'].local_value.toLowerCase &&
+			this.php_js.ini['phpjs.objectsAsArrays'].local_value.toLowerCase() === 'off') ||
+			parseInt(this.php_js.ini['phpjs.objectsAsArrays'].local_value, 10) === 0)
+		) {
+			return mixed_var.hasOwnProperty('length') && // Not non-enumerable because of being on parent class
+			!mixed_var.propertyIsEnumerable('length') && // Since is own property, if not enumerable, it must be a built-in function
+			getFuncName(mixed_var.constructor) !== 'String'; // exclude String()
+		}
+
+		if (mixed_var.hasOwnProperty)
+		{
+			for (key in mixed_var) {
+				// Checks whether the object has the specified property
+				// if not, we figure it's not an object in the sense of a php-associative-array.
+				if (false === mixed_var.hasOwnProperty(key)) {
+					return false;
+				}
+			}
+		}
+
+		// Read discussion at: http://kevin.vanzonneveld.net/techblog/article/javascript_equivalent_for_phps_is_array/
+		return true;
+	}
+
+	return false;
+}
diff --git a/core/media/com_joomlaupdate/js/update.min.js b/core/media/com_joomlaupdate/js/update.min.js
new file mode 100644
index 00000000..c5dd74c6
--- /dev/null
+++ b/core/media/com_joomlaupdate/js/update.min.js
@@ -0,0 +1 @@
+var stat_total=0,stat_files=0,stat_inbytes=0,stat_outbytes=0;function error_callback(t){alert("ERROR:\n"+t)}function empty(t){var e;if(""===t||0===t||"0"===t||null===t||!1===t||void 0===t)return!0;if("object"==typeof t){for(e in t)return!1;return!0}return!1}function is_array(t){var e,r,s="";if(!t)return!1;if(this.php_js=this.php_js||{},this.php_js.ini=this.php_js.ini||{},"object"==typeof t){if(this.php_js.ini["phpjs.objectsAsArrays"]&&(this.php_js.ini["phpjs.objectsAsArrays"].local_value.toLowerCase&&"off"===this.php_js.ini["phpjs.objectsAsArrays"].local_value.toLowerCase()||0===parseInt(this.php_js.ini["phpjs.objectsAsArrays"].local_value,10)))return t.hasOwnProperty("length")&&!t.propertyIsEnumerable("length")&&"String"!==(e=t.constructor,(r=/\W*function\s+([\w\$]+)\s*\(/.exec(e))?r[1]:"(Anonymous)");if(t.hasOwnProperty)for(s in t)if(!1===t.hasOwnProperty(s))return!1;return!0}return!1}doEncryptedAjax=function(t,e,r){var s=JSON.stringify(t);joomlaupdate_password.length>0&&(s=AesCtr.encrypt(s,joomlaupdate_password,128));var a={type:"POST",url:joomlaupdate_ajax_url,cache:!1,data:{json:s},timeout:6e5,success:function(t,s){var a="";if(-1==(n=t.indexOf("###")))return t="Invalid AJAX data:\n"+t,void(null==r?null!=error_callback&&error_callback(t):r(t));0!=n?(t.substr(0,n),a=t.substr(n)):a=t;var n=(a=a.substr(3)).lastIndexOf("###");a=a.substr(0,n);var o=null;if(joomlaupdate_password.length>0)try{o=JSON.parse(a)}catch(t){a=AesCtr.decrypt(a,joomlaupdate_password,128)}try{empty(o)&&(o=JSON.parse(a))}catch(e){t=e.message+"\n<br/>\n<pre>\n"+a+"\n</pre>";return void(null==r?null!=error_callback&&error_callback(t):r(t))}e(o)},error:function(t){var e="AJAX Loading Error: "+t.statusText;null==r?null!=error_callback&&error_callback(e):r(e)}};jQuery.ajax(a)},pingExtract=function(){this.stat_files=0,this.stat_inbytes=0,this.stat_outbytes=0;this.doEncryptedAjax({task:"ping"},function(t){startExtract(t)})},startExtract=function(){console.log("started"),this.stat_files=0,this.stat_inbytes=0,this.stat_outbytes=0;this.doEncryptedAjax({task:"startRestore"},function(t){stepExtract(t)})},stepExtract=function(t){0!=t.status?(empty(t.Warnings),empty(t.factory)||(extract_factory=t.factory),t.done?finalizeUpdate():(stat_inbytes+=t.bytesIn,stat_percent=100*stat_inbytes/joomlaupdate_totalsize,stat_inbytes+=t.bytesIn,stat_outbytes+=t.bytesOut,stat_files+=t.files,stat_percent<100?jQuery("#progress-bar").css("width",stat_percent+"%").attr("aria-valuenow",stat_percent):stat_percent>100?(stat_percent=100,jQuery("#progress-bar").css("width",stat_percent+"%").attr("aria-valuenow",stat_percent)):jQuery("#progress-bar").removeClass("bar-success"),jQuery("#extpercent").text(stat_percent.toFixed(1)+"%"),jQuery("#extbytesin").text(stat_inbytes),jQuery("#extbytesout").text(stat_outbytes),jQuery("#extfiles").text(t.files),post={task:"stepRestore",factory:t.factory},doEncryptedAjax(post,function(t){stepExtract(t)}))):error_callback(t.message)},finalizeUpdate=function(){var t={task:"finalizeRestore",factory:window.factory};doEncryptedAjax(t,function(t){window.location=joomlaupdate_return_url})};
\ No newline at end of file
diff --git a/core/media/com_menus/js/admin-items-modal.js b/core/media/com_menus/js/admin-items-modal.js
new file mode 100644
index 00000000..65d77700
--- /dev/null
+++ b/core/media/com_menus/js/admin-items-modal.js
@@ -0,0 +1,63 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(function() {
+	"use strict";
+	/**
+	 * Javascript to insert the link
+	 * View element calls jSelectContact when a contact is clicked
+	 * jSelectContact creates the link tag, sends it to the editor,
+	 * and closes the select frame.
+	 */
+
+	window.jSelectMenuItem = function(id, title, uri, object, link, lang)
+	{
+		var thislang = '', tag, editor;
+
+		if (!Joomla.getOptions('xtd-menus')) {
+			// Something went wrong!
+			window.parent.jModalClose();
+			return false;
+		}
+
+		editor = Joomla.getOptions('xtd-menus').editor;
+
+		if (lang !== '')
+		{
+			thislang = '&lang=';
+		}
+
+		tag = '<a href=\"' + uri + thislang + lang + '">' + title + '</a>';
+
+		/** Use the API, if editor supports it **/
+		if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+			window.parent.Joomla.editors.instances[editor].replaceSelection(tag)
+		} else {
+			window.parent.jInsertEditorText(tag, editor);
+		}
+
+		window.parent.jModalClose();
+	};
+
+	document.addEventListener('DOMContentLoaded', function(){
+		// Get the elements
+		var elements = document.querySelectorAll('.select-link');
+
+		for(var i = 0, l = elements.length; l>i; i++) {
+			// Listen for click event
+			elements[i].addEventListener('click', function (event) {
+				event.preventDefault();
+				var functionName = event.target.getAttribute('data-function');
+
+				if (functionName === 'jSelectMenuItem') {
+					// Used in xtd_contacts
+					window[functionName](event.target.getAttribute('data-id'), event.target.getAttribute('data-title'), event.target.getAttribute('data-uri'), null, null, event.target.getAttribute('data-language'));
+				} else {
+					// Used in com_menus
+					window.parent[functionName](event.target.getAttribute('data-id'), event.target.getAttribute('data-title'), null, null, event.target.getAttribute('data-uri'), event.target.getAttribute('data-language'), null);
+				}
+			})
+		}
+	});
+})();
diff --git a/core/media/com_menus/js/admin-items-modal.min.js b/core/media/com_menus/js/admin-items-modal.min.js
new file mode 100644
index 00000000..6a88337f
--- /dev/null
+++ b/core/media/com_menus/js/admin-items-modal.min.js
@@ -0,0 +1 @@
+!function(){"use strict";window.jSelectMenuItem=function(a,b,c,d,e,f){var h,i,g="";return Joomla.getOptions("xtd-menus")?(i=Joomla.getOptions("xtd-menus").editor,""!==f&&(g="&lang="),h='<a href="'+c+g+f+'">'+b+"</a>",window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(i)?window.parent.Joomla.editors.instances[i].replaceSelection(h):window.parent.jInsertEditorText(h,i),void window.parent.jModalClose()):(window.parent.jModalClose(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectMenuItem"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-uri"),null,null,a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
diff --git a/core/media/com_modules/js/admin-modules-modal.js b/core/media/com_modules/js/admin-modules-modal.js
new file mode 100644
index 00000000..c6c10d6e
--- /dev/null
+++ b/core/media/com_modules/js/admin-modules-modal.js
@@ -0,0 +1,49 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+document.addEventListener('DOMContentLoaded', function() {
+	"use strict";
+
+	/** Get the elements **/
+	var modulesLinks = document.querySelectorAll('.js-module-insert'), i,
+		positionsLinks = document.querySelectorAll('.js-position-insert');
+
+	/** Assign listener for click event (for single module insertion) **/
+	for (i= 0; modulesLinks.length > i; i++) {
+		modulesLinks[i].addEventListener('click', function(event) {
+			event.preventDefault();
+			var type = event.target.getAttribute('data-module'),
+				name = event.target.getAttribute('data-title'),
+				editor = event.target.getAttribute('data-editor');
+
+			/** Use the API, if editor supports it **/
+			if (window.parent.Joomla && window.parent.Joomla.editors && window.parent.Joomla.editors.instances && window.parent.Joomla.editors.instances.hasOwnProperty(editor)) {
+				window.parent.Joomla.editors.instances[editor].replaceSelection("{loadmodule " + type + "," + name + "}")
+			} else {
+				window.parent.jInsertEditorText("{loadmodule " + type + "," + name + "}", editor);
+			}
+
+			window.parent.jModalClose();
+		});
+	}
+
+	/** Assign listener for click event (for position insertion) **/
+	for (i= 0; positionsLinks.length > i; i++) {
+		positionsLinks[i].addEventListener('click', function(event) {
+			event.preventDefault();
+			var position = event.target.getAttribute('data-position'),
+				editor = event.target.getAttribute('data-editor');
+
+			/** Use the API, if editor supports it **/
+			if (window.Joomla && window.Joomla.editors && Joomla.editors.instances && Joomla.editors.instances.hasOwnProperty(editor)) {
+				Joomla.editors.instances[editor].replaceSelection("{loadposition " + position + "}")
+			} else {
+				window.parent.jInsertEditorText("{loadposition " + position + "}", editor);
+			}
+
+			window.parent.jModalClose();
+		});
+	}
+});
diff --git a/core/media/com_modules/js/admin-modules-modal.min.js b/core/media/com_modules/js/admin-modules-modal.min.js
new file mode 100644
index 00000000..965dadb9
--- /dev/null
+++ b/core/media/com_modules/js/admin-modules-modal.min.js
@@ -0,0 +1 @@
+document.addEventListener("DOMContentLoaded",function(){"use strict";var b,a=document.querySelectorAll(".js-module-insert"),c=document.querySelectorAll(".js-position-insert");for(b=0;a.length>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-module"),c=a.target.getAttribute("data-title"),d=a.target.getAttribute("data-editor");window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(d)?window.parent.Joomla.editors.instances[d].replaceSelection("{loadmodule "+b+","+c+"}"):window.parent.jInsertEditorText("{loadmodule "+b+","+c+"}",d),window.parent.jModalClose()});for(b=0;c.length>b;b++)c[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-position"),c=a.target.getAttribute("data-editor");window.Joomla&&window.Joomla.editors&&Joomla.editors.instances&&Joomla.editors.instances.hasOwnProperty(c)?Joomla.editors.instances[c].replaceSelection("{loadposition "+b+"}"):window.parent.jInsertEditorText("{loadposition "+b+"}",c),window.parent.jModalClose()})});
\ No newline at end of file
diff --git a/core/media/com_wrapper/js/iframe-height.js b/core/media/com_wrapper/js/iframe-height.js
new file mode 100644
index 00000000..aebbeca1
--- /dev/null
+++ b/core/media/com_wrapper/js/iframe-height.js
@@ -0,0 +1,14 @@
+function iFrameHeight(iframe)
+{
+    var doc    = 'contentDocument' in iframe ? iframe.contentDocument : iframe.contentWindow.document;
+    var height = parseInt(doc.body.scrollHeight);
+
+    if (!document.all)
+    {
+        iframe.style.height = parseInt(height) + 60 + 'px';
+    }
+    else if (document.all && iframe.id)
+    {
+        document.all[iframe.id].style.height = parseInt(height) + 20 + 'px';
+    }
+}
diff --git a/core/media/com_wrapper/js/iframe-height.min.js b/core/media/com_wrapper/js/iframe-height.min.js
new file mode 100644
index 00000000..0a662a68
--- /dev/null
+++ b/core/media/com_wrapper/js/iframe-height.min.js
@@ -0,0 +1 @@
+function iFrameHeight(iframe){var doc="contentDocument"in iframe?iframe.contentDocument:iframe.contentWindow.document;var height=parseInt(doc.body.scrollHeight);if(!document.all){iframe.style.height=parseInt(height)+60+"px"}else if(document.all&&iframe.id){document.all[iframe.id].style.height=parseInt(height)+20+"px"}}
diff --git a/core/media/contacts/images/con_address.png b/core/media/contacts/images/con_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e92694b4e0d9746b8b400ed530b62cdf630c037
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0d+}4K~#7Fb&)9;tsoSHjYguCXf#rdMxxb7G*XE~B9%xqQi(*P^~M`-
zoOjOKc<X$!&p#{<K-Up&<zCv~hi@@A{7W4$>5=9W8Y&QOD0>@U{tMXrOy(mEY=eIg
z9(ZP+&0M9nKLMBT#eRgwbYQ>0U-{md&-c9Ll<RMR@^5*70I_5CSOWNq{HX{@St|Qb
zIv~&Yw6lBE7>Tr)93~GLux6;t9kE_9T|WTBz(iI<!1s^(v*(XU5h$zr5c>}Dz)X%4
z;sgWKcTjvh?g)o*BOrBvtP45l<5Z}CEz*!qU&LCM_&Y#P!PbB^u}>%H%%6~981yKk
ziV(j8uazRd`7ZwU!rwT>Vc18RC`jnmfipH~9&#TANBv%#3Odg)*iq&s@+*a(0LjH7
zO(Uy&U~m51O~-f!aSc<RS8tuCf8GI7%w;}`tw=Ba0s(8A7k65+{`RN4(p487_W05M
qwQT;YwV<m5T@<EGGN=39+Vus&f)R|Vh3c^Y0000<MNUMnLSTZc(a4qn

literal 0
HcmV?d00001

diff --git a/core/media/contacts/images/con_fax.png b/core/media/contacts/images/con_fax.png
new file mode 100644
index 0000000000000000000000000000000000000000..61e841b942352fc5fb22de37ba0df0849e5b5d4c
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004BNkl<Zcmaiz
zDU-w?6om7CM@EiCB9T}m5{X43k=V${$X>om<=WYUs;@Y^-{YDjec(gXvMk!RP3yXz
zP`vk4)4`7h);h%cse}+jfFBKVDGD*kIY-0?hhZ6O-o}Wv!oUy5FdUr^vX02>Sd>o?
zK!sYAQc})Y#+cop)+!2h>rJJt@~IEn0~edZsAEZT)u{|K0#3CxkseV<)#pWX=oh{T
zUIR1wu_n!B7Qx7Z3=m>)JGgDMVb!`U>b(OZwRZ7-4+DfuvM)pjm>%NRDqB42gJJO2
zgb+9Co0xY1%soUvP?!$`22)B1FY%T3E~@1aKMjs+p+?xfS9eaiB!v>l;6sQRnt7fz
z@v;yz$l{*!U|$4?fi_}<V6ELV;ME}n9!46Ia0rg<AjT*HzFsdGW0gzQ6vu>hUd|8p
z`gmm@2TGf4ctC%CCQQB+%mAbR4Ol=HpIGY0Z~Ovhw?t`l-_~>h0000<MNUMnLSTXl
C60dat

literal 0
HcmV?d00001

diff --git a/core/media/contacts/images/con_info.png b/core/media/contacts/images/con_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..133e888a8e17377c3d9fb18d0a2e7571a949fd9a
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004(Nkl<ZcmaKq
zE6l7g5QQs|l~`mYvKF~=C3YneSzC!jVv&`|+Dha~?8=qM@6zUG^1mnflIgVPOkWE4
zgj*8b5UFngecRAoK-&d-UvX39>v~B-+_9HX_mO@+Sa%2qh3yHC`H8kGrkh!}Bt{}`
z`VHd_;sM7S-X}oL&kG9s3+#~4jTe(*kUN|4AUr7snG+-)K1w}fACab=ia|NE?h`)2
zvJ0i#@p>~YF>n9V+?1edW=0oK`NCTNVvKylh07qmKh=hddw{y%F|9}C+qQEl3SmF_
z811FHtx!*(+<(Rsr3O@fs%D0E`ONx6qPhhU3gboPC<fY-$sHv32?^D$pM;VZ1G`G`
zBV$BD+4;M8$VYgfY#&hlktaX#*}zL(=n}>_RQ{fo4OEU#ObH2nn?B7I1ML~d6$L2M
zE$Dlq_7sK<V%#s1pzlHEwcV&|2lAD-gf<iPWnyOjB#WzRU=2wO3i)q0?Tj`v&11*T
zC*49J=S`oew9lPIECwGLeZbfWRgF~Ip)%@GE-at<>-v8y#lf*r(XrbA0000<MNUMn
GLSTZ9{nHNs

literal 0
HcmV?d00001

diff --git a/core/media/contacts/images/con_mobile.png b/core/media/contacts/images/con_mobile.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f60ccb54ca406268b1618bb30995a33fd5254bf
GIT binary patch
literal 544
zcmV+*0^j|KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005!Nkl<Zcma)&
z1FRft0EN$B(YycNu4>!Xt8IogVl_r>+i`6MZC`EMw%3>)?dWgg>pNd`q9YbXxb#LH
z*n0G-E1pIhzH?O;$DFm7fA=(9d*smha32(bKHW$d6rsh)qsx81z^r^P1BRmr1qj}~
zO~C224&T^2Vq75uO1(UaP_0(&%!O^80RV~^M+M>oz@u58O%{s77Bi63l)n6$!`nAe
zRIgPH2E(9N3xILDDN3N2fsl>!aBv8J5)iz41Hb?KhRdO8u&4vJ3{v5@q-BlaXgR$F
z60a!Q)ozNUw;BN5o&h0*%PJ;JDGXoJM&LLe#K?iMV9y|#fV5`EJyg!8sMDB7PRio_
zhu=sg6`K>1F?ILRuSiETs8;hUB7X#U0|a7DLrJhGf+-0OkKYf6i${;az2NW=s0xcb
zm&;xQur6mZEWl!%xOn;@bVY?_@h}z1UIUg*Qzaw77Ycx5G}NwN6`(+#uOeg1plZ{0
zP*fR0JPs{qKoVrAiiB3}I+?Z%y7g$oFcy!zd>?cQ$bt%sGVu9n!qx}6oQY}QUgD>m
z0Z06xh6z)a@#6W9G>YRY)?m`8`cG?hYI~n%|2($j-#1)t<x%}Mb?(lbJ>(vxl&2@g
i@bun1=RZvVr2Yc=%+b0hU)yc~0000<MNUMnLSTaZXZWrF

literal 0
HcmV?d00001

diff --git a/core/media/contacts/images/con_tel.png b/core/media/contacts/images/con_tel.png
new file mode 100644
index 0000000000000000000000000000000000000000..0efabb06fd431868a5b813634be00b40a349a429
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0kcU&K~#7Fb&?wZ^&l9Ahr{9YU>K&uaF~W+n1*4PhG94z9z2*1!|?mx
z?Z4l4U%k(FpNOa)XBDC|_SxjAbaAfaLjO5#Aa9c9nHZyeC+8@{4#t=i<3E7t!>yhs
zTG!5bmy)cdl&BO6A#0sW`3)$HL5-^~i`#^^)+wFT-mM|;DaMadF@&E$j1dYir4yoY
z7PZD|3gP1HEjTGf#xyB&sXue5^~lCn=MYTu{)!RLVeQ+PZtd7Mk`i`*0`ZYj&ZE|G
zUH!Snd13|0G$97(-k4titx=x=+n>(`b?>-aYaO8@9>&HrHNk`T-vLzS^=i-m=V9<X
z&hx~I5a+s<c}6|7)}<adkc2>$E^E)$YOPS?iS>r!E=!%~7!!Ep?R|Iv&H;>le?NwC
zym7R4IfwOQo?sZV<9s{szXEqFU<}O~M0XNn+(`@Z0CP+UPGH_T_tV4OZ&VQFgA^e-
zhhJC$pp5~Oa<0dZ9F}>!*0G79Bw0;P5513#(`&8kf{=b2zJQtI?B3otGCO$y3gkUn
zuQjb}J$?srF3wt~wNvWbwePs_fklLlbbkO}0JkUcd+g>)ng9R*07*qoM6N<$f+7;_
AKmY&$

literal 0
HcmV?d00001

diff --git a/core/media/contacts/images/emailButton.png b/core/media/contacts/images/emailButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..79add119b799f627977ff6621dd0df8e0170b725
GIT binary patch
literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0JTX(K~#7FWB5-ZppS;d!~s7)KZFJ}WB&a8_x0!Bw_pA|dH3titDhGh
zfA8J<0jGw4|Nj5{{qMuKKQBK1zW?Uer$qk`F8WwBq%3^ewD}c~grL`-|2%yA>)Nv)
zK-KTe70@+cb<C}oAjcfN^L6j_FZgVLFz&wkdGYc0llQ*uyYXe)<<ICE;7<Sa{qM_9
zK&OKobL#%LL$|)}y!v_Lg-_@jfPDN2U4tKSfaI7SoEiY~sgzX9rnAcc0000<MNUMn
GLSTZ~jDU>*

literal 0
HcmV?d00001

diff --git a/core/media/editors/codemirror/LICENSE b/core/media/editors/codemirror/LICENSE
new file mode 100644
index 00000000..ff7db4b9
--- /dev/null
+++ b/core/media/editors/codemirror/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (C) 2017 by Marijn Haverbeke <marijnh@gmail.com> and others
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/media/editors/codemirror/addon/comment/comment.js b/core/media/editors/codemirror/addon/comment/comment.js
new file mode 100644
index 00000000..84c67edf
--- /dev/null
+++ b/core/media/editors/codemirror/addon/comment/comment.js
@@ -0,0 +1,209 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var noOptions = {};
+  var nonWS = /[^\s\u00a0]/;
+  var Pos = CodeMirror.Pos;
+
+  function firstNonWS(str) {
+    var found = str.search(nonWS);
+    return found == -1 ? 0 : found;
+  }
+
+  CodeMirror.commands.toggleComment = function(cm) {
+    cm.toggleComment();
+  };
+
+  CodeMirror.defineExtension("toggleComment", function(options) {
+    if (!options) options = noOptions;
+    var cm = this;
+    var minLine = Infinity, ranges = this.listSelections(), mode = null;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      if (from.line >= minLine) continue;
+      if (to.line >= minLine) to = Pos(minLine, 0);
+      minLine = from.line;
+      if (mode == null) {
+        if (cm.uncomment(from, to, options)) mode = "un";
+        else { cm.lineComment(from, to, options); mode = "line"; }
+      } else if (mode == "un") {
+        cm.uncomment(from, to, options);
+      } else {
+        cm.lineComment(from, to, options);
+      }
+    }
+  });
+
+  // Rough heuristic to try and detect lines that are part of multi-line string
+  function probablyInsideString(cm, pos, line) {
+    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
+  }
+
+  function getMode(cm, pos) {
+    var mode = cm.getMode()
+    return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos)
+  }
+
+  CodeMirror.defineExtension("lineComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = getMode(self, from);
+    var firstLine = self.getLine(from.line);
+    if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
+
+    var commentString = options.lineComment || mode.lineComment;
+    if (!commentString) {
+      if (options.blockCommentStart || mode.blockCommentStart) {
+        options.fullLines = true;
+        self.blockComment(from, to, options);
+      }
+      return;
+    }
+
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
+    var pad = options.padding == null ? " " : options.padding;
+    var blankLines = options.commentBlankLines || from.line == to.line;
+
+    self.operation(function() {
+      if (options.indent) {
+        var baseString = null;
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i);
+          var whitespace = line.slice(0, firstNonWS(line));
+          if (baseString == null || baseString.length > whitespace.length) {
+            baseString = whitespace;
+          }
+        }
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i), cut = baseString.length;
+          if (!blankLines && !nonWS.test(line)) continue;
+          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
+          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
+        }
+      } else {
+        for (var i = from.line; i < end; ++i) {
+          if (blankLines || nonWS.test(self.getLine(i)))
+            self.replaceRange(commentString + pad, Pos(i, 0));
+        }
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("blockComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = getMode(self, from);
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) {
+      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
+        self.lineComment(from, to, options);
+      return;
+    }
+    if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return
+
+    var end = Math.min(to.line, self.lastLine());
+    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
+
+    var pad = options.padding == null ? " " : options.padding;
+    if (from.line > end) return;
+
+    self.operation(function() {
+      if (options.fullLines != false) {
+        var lastLineHasText = nonWS.test(self.getLine(end));
+        self.replaceRange(pad + endString, Pos(end));
+        self.replaceRange(startString + pad, Pos(from.line, 0));
+        var lead = options.blockCommentLead || mode.blockCommentLead;
+        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
+          if (i != end || lastLineHasText)
+            self.replaceRange(lead + pad, Pos(i, 0));
+      } else {
+        self.replaceRange(endString, to);
+        self.replaceRange(startString, from);
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("uncomment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = getMode(self, from);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
+
+    // Try finding line comments
+    var lineString = options.lineComment || mode.lineComment, lines = [];
+    var pad = options.padding == null ? " " : options.padding, didSomething;
+    lineComment: {
+      if (!lineString) break lineComment;
+      for (var i = start; i <= end; ++i) {
+        var line = self.getLine(i);
+        var found = line.indexOf(lineString);
+        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
+        if (found == -1 && nonWS.test(line)) break lineComment;
+        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+        lines.push(line);
+      }
+      self.operation(function() {
+        for (var i = start; i <= end; ++i) {
+          var line = lines[i - start];
+          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
+          if (pos < 0) continue;
+          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+          didSomething = true;
+          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
+        }
+      });
+      if (didSomething) return true;
+    }
+
+    // Try block comments
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) return false;
+    var lead = options.blockCommentLead || mode.blockCommentLead;
+    var startLine = self.getLine(start), open = startLine.indexOf(startString)
+    if (open == -1) return false
+    var endLine = end == start ? startLine : self.getLine(end)
+    var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
+    var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
+    if (close == -1 ||
+        !/comment/.test(self.getTokenTypeAt(insideStart)) ||
+        !/comment/.test(self.getTokenTypeAt(insideEnd)) ||
+        self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
+      return false;
+
+    // Avoid killing block comments completely outside the selection.
+    // Positions of the last startString before the start of the selection, and the first endString after it.
+    var lastStart = startLine.lastIndexOf(startString, from.ch);
+    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
+    // Positions of the first endString after the end of the selection, and the last startString before it.
+    firstEnd = endLine.indexOf(endString, to.ch);
+    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
+
+    self.operation(function() {
+      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
+                        Pos(end, close + endString.length));
+      var openEnd = open + startString.length;
+      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
+      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
+      if (lead) for (var i = start + 1; i <= end; ++i) {
+        var line = self.getLine(i), found = line.indexOf(lead);
+        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
+        var foundEnd = found + lead.length;
+        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
+        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
+      }
+    });
+    return true;
+  });
+});
diff --git a/core/media/editors/codemirror/addon/comment/comment.min.js b/core/media/editors/codemirror/addon/comment/comment.min.js
new file mode 100644
index 00000000..8117213a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/comment/comment.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.search(f);return b==-1?0:b}function c(a,b,c){return/\bstring\b/.test(a.getTokenTypeAt(g(b.line,0)))&&!/^[\'\"\`]/.test(c)}function d(a,b){var c=a.getMode();return c.useInnerComments!==!1&&c.innerMode?a.getModeAt(b):c}var e={},f=/[^\s\u00a0]/,g=a.Pos;a.commands.toggleComment=function(a){a.toggleComment()},a.defineExtension("toggleComment",(function(a){a||(a=e);for(var b=this,c=1/0,d=this.listSelections(),f=null,h=d.length-1;h>=0;h--){var i=d[h].from(),j=d[h].to();i.line>=c||(j.line>=c&&(j=g(c,0)),c=i.line,null==f?b.uncomment(i,j,a)?f="un":(b.lineComment(i,j,a),f="line"):"un"==f?b.uncomment(i,j,a):b.lineComment(i,j,a))}})),a.defineExtension("lineComment",(function(a,h,i){i||(i=e);var j=this,k=d(j,a),l=j.getLine(a.line);if(null!=l&&!c(j,a,l)){var m=i.lineComment||k.lineComment;if(!m)return void((i.blockCommentStart||k.blockCommentStart)&&(i.fullLines=!0,j.blockComment(a,h,i)));var n=Math.min(0!=h.ch||h.line==a.line?h.line+1:h.line,j.lastLine()+1),o=null==i.padding?" ":i.padding,p=i.commentBlankLines||a.line==h.line;j.operation((function(){if(i.indent){for(var c=null,d=a.line;d<n;++d){var e=j.getLine(d),h=e.slice(0,b(e));(null==c||c.length>h.length)&&(c=h)}for(var d=a.line;d<n;++d){var e=j.getLine(d),k=c.length;(p||f.test(e))&&(e.slice(0,k)!=c&&(k=b(e)),j.replaceRange(c+m+o,g(d,0),g(d,k)))}}else for(var d=a.line;d<n;++d)(p||f.test(j.getLine(d)))&&j.replaceRange(m+o,g(d,0))}))}})),a.defineExtension("blockComment",(function(a,b,c){c||(c=e);var h=this,i=d(h,a),j=c.blockCommentStart||i.blockCommentStart,k=c.blockCommentEnd||i.blockCommentEnd;if(!j||!k)return void((c.lineComment||i.lineComment)&&0!=c.fullLines&&h.lineComment(a,b,c));if(!/\bcomment\b/.test(h.getTokenTypeAt(g(a.line,0)))){var l=Math.min(b.line,h.lastLine());l!=a.line&&0==b.ch&&f.test(h.getLine(l))&&--l;var m=null==c.padding?" ":c.padding;a.line>l||h.operation((function(){if(0!=c.fullLines){var d=f.test(h.getLine(l));h.replaceRange(m+k,g(l)),h.replaceRange(j+m,g(a.line,0));var e=c.blockCommentLead||i.blockCommentLead;if(null!=e)for(var n=a.line+1;n<=l;++n)(n!=l||d)&&h.replaceRange(e+m,g(n,0))}else h.replaceRange(k,b),h.replaceRange(j,a)}))}})),a.defineExtension("uncomment",(function(a,b,c){c||(c=e);var h,i=this,j=d(i,a),k=Math.min(0!=b.ch||b.line==a.line?b.line:b.line-1,i.lastLine()),l=Math.min(a.line,k),m=c.lineComment||j.lineComment,n=[],o=null==c.padding?" ":c.padding;a:if(m){for(var p=l;p<=k;++p){var q=i.getLine(p),r=q.indexOf(m);if(r>-1&&!/comment/.test(i.getTokenTypeAt(g(p,r+1)))&&(r=-1),r==-1&&f.test(q))break a;if(r>-1&&f.test(q.slice(0,r)))break a;n.push(q)}if(i.operation((function(){for(var a=l;a<=k;++a){var b=n[a-l],c=b.indexOf(m),d=c+m.length;c<0||(b.slice(d,d+o.length)==o&&(d+=o.length),h=!0,i.replaceRange("",g(a,c),g(a,d)))}})),h)return!0}var s=c.blockCommentStart||j.blockCommentStart,t=c.blockCommentEnd||j.blockCommentEnd;if(!s||!t)return!1;var u=c.blockCommentLead||j.blockCommentLead,v=i.getLine(l),w=v.indexOf(s);if(w==-1)return!1;var x=k==l?v:i.getLine(k),y=x.indexOf(t,k==l?w+s.length:0),z=g(l,w+1),A=g(k,y+1);if(y==-1||!/comment/.test(i.getTokenTypeAt(z))||!/comment/.test(i.getTokenTypeAt(A))||i.getRange(z,A,"\n").indexOf(t)>-1)return!1;var B=v.lastIndexOf(s,a.ch),C=B==-1?-1:v.slice(0,a.ch).indexOf(t,B+s.length);if(B!=-1&&C!=-1&&C+t.length!=a.ch)return!1;C=x.indexOf(t,b.ch);var D=x.slice(b.ch).lastIndexOf(s,C-b.ch);return B=C==-1||D==-1?-1:b.ch+D,(C==-1||B==-1||B==b.ch)&&(i.operation((function(){i.replaceRange("",g(k,y-(o&&x.slice(y-o.length,y)==o?o.length:0)),g(k,y+t.length));var a=w+s.length;if(o&&v.slice(a,a+o.length)==o&&(a+=o.length),i.replaceRange("",g(l,w),g(l,a)),u)for(var b=l+1;b<=k;++b){var c=i.getLine(b),d=c.indexOf(u);if(d!=-1&&!f.test(c.slice(0,d))){var e=d+u.length;o&&c.slice(e,e+o.length)==o&&(e+=o.length),i.replaceRange("",g(b,d),g(b,e))}}})),!0)}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/comment/continuecomment.js b/core/media/editors/codemirror/addon/comment/continuecomment.js
new file mode 100644
index 00000000..d92318b3
--- /dev/null
+++ b/core/media/editors/codemirror/addon/comment/continuecomment.js
@@ -0,0 +1,78 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  function continueComment(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), mode, inserts = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head
+      if (!/\bcomment\b/.test(cm.getTokenTypeAt(pos))) return CodeMirror.Pass;
+      var modeHere = cm.getModeAt(pos)
+      if (!mode) mode = modeHere;
+      else if (mode != modeHere) return CodeMirror.Pass;
+
+      var insert = null;
+      if (mode.blockCommentStart && mode.blockCommentContinue) {
+        var line = cm.getLine(pos.line).slice(0, pos.ch)
+        var end = line.lastIndexOf(mode.blockCommentEnd), found
+        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length) {
+          // Comment ended, don't continue it
+        } else if ((found = line.lastIndexOf(mode.blockCommentStart)) > -1 && found > end) {
+          insert = line.slice(0, found)
+          if (/\S/.test(insert)) {
+            insert = ""
+            for (var j = 0; j < found; ++j) insert += " "
+          }
+        } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 && !/\S/.test(line.slice(0, found))) {
+          insert = line.slice(0, found)
+        }
+        if (insert != null) insert += mode.blockCommentContinue
+      }
+      if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
+        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
+        if (found > -1) {
+          insert = line.slice(0, found);
+          if (/\S/.test(insert)) insert = null;
+          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+        }
+      }
+      if (insert == null) return CodeMirror.Pass;
+      inserts[i] = "\n" + insert;
+    }
+
+    cm.operation(function() {
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
+    });
+  }
+
+  function continueLineCommentEnabled(cm) {
+    var opt = cm.getOption("continueComments");
+    if (opt && typeof opt == "object")
+      return opt.continueLineComment !== false;
+    return true;
+  }
+
+  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
+    if (prev && prev != CodeMirror.Init)
+      cm.removeKeyMap("continueComment");
+    if (val) {
+      var key = "Enter";
+      if (typeof val == "string")
+        key = val;
+      else if (typeof val == "object" && val.key)
+        key = val.key;
+      var map = {name: "continueComment"};
+      map[key] = continueComment;
+      cm.addKeyMap(map);
+    }
+  });
+});
diff --git a/core/media/editors/codemirror/addon/comment/continuecomment.min.js b/core/media/editors/codemirror/addon/comment/continuecomment.min.js
new file mode 100644
index 00000000..8fc64cd9
--- /dev/null
+++ b/core/media/editors/codemirror/addon/comment/continuecomment.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var d,e=b.listSelections(),f=[],g=0;g<e.length;g++){var h=e[g].head;if(!/\bcomment\b/.test(b.getTokenTypeAt(h)))return a.Pass;var i=b.getModeAt(h);if(d){if(d!=i)return a.Pass}else d=i;var j=null;if(d.blockCommentStart&&d.blockCommentContinue){var k,l=b.getLine(h.line).slice(0,h.ch),m=l.lastIndexOf(d.blockCommentEnd);if(m!=-1&&m==h.ch-d.blockCommentEnd.length);else if((k=l.lastIndexOf(d.blockCommentStart))>-1&&k>m){if(j=l.slice(0,k),/\S/.test(j)){j="";for(var n=0;n<k;++n)j+=" "}}else(k=l.indexOf(d.blockCommentContinue))>-1&&!/\S/.test(l.slice(0,k))&&(j=l.slice(0,k));null!=j&&(j+=d.blockCommentContinue)}if(null==j&&d.lineComment&&c(b)){var l=b.getLine(h.line),k=l.indexOf(d.lineComment);k>-1&&(j=l.slice(0,k),/\S/.test(j)?j=null:j+=d.lineComment+l.slice(k+d.lineComment.length).match(/^\s*/)[0])}if(null==j)return a.Pass;f[g]="\n"+j}b.operation((function(){for(var a=e.length-1;a>=0;a--)b.replaceRange(f[a],e[a].from(),e[a].to(),"+insert")}))}function c(a){var b=a.getOption("continueComments");return!b||"object"!=typeof b||b.continueLineComment!==!1}a.defineOption("continueComments",null,(function(c,d,e){if(e&&e!=a.Init&&c.removeKeyMap("continueComment"),d){var f="Enter";"string"==typeof d?f=d:"object"==typeof d&&d.key&&(f=d.key);var g={name:"continueComment"};g[f]=b,c.addKeyMap(g)}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/dialog/dialog.css b/core/media/editors/codemirror/addon/dialog/dialog.css
new file mode 100644
index 00000000..677c0783
--- /dev/null
+++ b/core/media/editors/codemirror/addon/dialog/dialog.css
@@ -0,0 +1,32 @@
+.CodeMirror-dialog {
+  position: absolute;
+  left: 0; right: 0;
+  background: inherit;
+  z-index: 15;
+  padding: .1em .8em;
+  overflow: hidden;
+  color: inherit;
+}
+
+.CodeMirror-dialog-top {
+  border-bottom: 1px solid #eee;
+  top: 0;
+}
+
+.CodeMirror-dialog-bottom {
+  border-top: 1px solid #eee;
+  bottom: 0;
+}
+
+.CodeMirror-dialog input {
+  border: none;
+  outline: none;
+  background: transparent;
+  width: 20em;
+  color: inherit;
+  font-family: monospace;
+}
+
+.CodeMirror-dialog button {
+  font-size: 70%;
+}
diff --git a/core/media/editors/codemirror/addon/dialog/dialog.js b/core/media/editors/codemirror/addon/dialog/dialog.js
new file mode 100644
index 00000000..f61e4476
--- /dev/null
+++ b/core/media/editors/codemirror/addon/dialog/dialog.js
@@ -0,0 +1,161 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Open simple dialogs on top of an editor. Relies on dialog.css.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  function dialogDiv(cm, template, bottom) {
+    var wrap = cm.getWrapperElement();
+    var dialog;
+    dialog = wrap.appendChild(document.createElement("div"));
+    if (bottom)
+      dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
+    else
+      dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
+
+    if (typeof template == "string") {
+      dialog.innerHTML = template;
+    } else { // Assuming it's a detached DOM element.
+      dialog.appendChild(template);
+    }
+    CodeMirror.addClass(wrap, 'dialog-opened');
+    return dialog;
+  }
+
+  function closeNotification(cm, newVal) {
+    if (cm.state.currentNotificationClose)
+      cm.state.currentNotificationClose();
+    cm.state.currentNotificationClose = newVal;
+  }
+
+  CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    if (!options) options = {};
+
+    closeNotification(this, null);
+
+    var dialog = dialogDiv(this, template, options.bottom);
+    var closed = false, me = this;
+    function close(newVal) {
+      if (typeof newVal == 'string') {
+        inp.value = newVal;
+      } else {
+        if (closed) return;
+        closed = true;
+        CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
+        dialog.parentNode.removeChild(dialog);
+        me.focus();
+
+        if (options.onClose) options.onClose(dialog);
+      }
+    }
+
+    var inp = dialog.getElementsByTagName("input")[0], button;
+    if (inp) {
+      inp.focus();
+
+      if (options.value) {
+        inp.value = options.value;
+        if (options.selectValueOnOpen !== false) {
+          inp.select();
+        }
+      }
+
+      if (options.onInput)
+        CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
+      if (options.onKeyUp)
+        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
+
+      CodeMirror.on(inp, "keydown", function(e) {
+        if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
+        if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
+          inp.blur();
+          CodeMirror.e_stop(e);
+          close();
+        }
+        if (e.keyCode == 13) callback(inp.value, e);
+      });
+
+      if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
+    } else if (button = dialog.getElementsByTagName("button")[0]) {
+      CodeMirror.on(button, "click", function() {
+        close();
+        me.focus();
+      });
+
+      if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
+
+      button.focus();
+    }
+    return close;
+  });
+
+  CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
+    closeNotification(this, null);
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var buttons = dialog.getElementsByTagName("button");
+    var closed = false, me = this, blurring = 1;
+    function close() {
+      if (closed) return;
+      closed = true;
+      CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
+      dialog.parentNode.removeChild(dialog);
+      me.focus();
+    }
+    buttons[0].focus();
+    for (var i = 0; i < buttons.length; ++i) {
+      var b = buttons[i];
+      (function(callback) {
+        CodeMirror.on(b, "click", function(e) {
+          CodeMirror.e_preventDefault(e);
+          close();
+          if (callback) callback(me);
+        });
+      })(callbacks[i]);
+      CodeMirror.on(b, "blur", function() {
+        --blurring;
+        setTimeout(function() { if (blurring <= 0) close(); }, 200);
+      });
+      CodeMirror.on(b, "focus", function() { ++blurring; });
+    }
+  });
+
+  /*
+   * openNotification
+   * Opens a notification, that can be closed with an optional timer
+   * (default 5000ms timer) and always closes on click.
+   *
+   * If a notification is opened while another is opened, it will close the
+   * currently opened one and open the new one immediately.
+   */
+  CodeMirror.defineExtension("openNotification", function(template, options) {
+    closeNotification(this, close);
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
+
+    function close() {
+      if (closed) return;
+      closed = true;
+      clearTimeout(doneTimer);
+      CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
+      dialog.parentNode.removeChild(dialog);
+    }
+
+    CodeMirror.on(dialog, 'click', function(e) {
+      CodeMirror.e_preventDefault(e);
+      close();
+    });
+
+    if (duration)
+      doneTimer = setTimeout(close, duration);
+
+    return close;
+  });
+});
diff --git a/core/media/editors/codemirror/addon/dialog/dialog.min.css b/core/media/editors/codemirror/addon/dialog/dialog.min.css
new file mode 100644
index 00000000..9f33bead
--- /dev/null
+++ b/core/media/editors/codemirror/addon/dialog/dialog.min.css
@@ -0,0 +1 @@
+.CodeMirror-dialog{position:absolute;left:0;right:0;background:inherit;z-index:15;padding:.1em .8em;overflow:hidden;color:inherit}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{border:none;outline:0;background:0 0;width:20em;color:inherit;font-family:monospace}.CodeMirror-dialog button{font-size:70%}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/dialog/dialog.min.js b/core/media/editors/codemirror/addon/dialog/dialog.min.js
new file mode 100644
index 00000000..da45989c
--- /dev/null
+++ b/core/media/editors/codemirror/addon/dialog/dialog.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(b,c,d){var e,f=b.getWrapperElement();return e=f.appendChild(document.createElement("div")),d?e.className="CodeMirror-dialog CodeMirror-dialog-bottom":e.className="CodeMirror-dialog CodeMirror-dialog-top","string"==typeof c?e.innerHTML=c:e.appendChild(c),a.addClass(f,"dialog-opened"),e}function c(a,b){a.state.currentNotificationClose&&a.state.currentNotificationClose(),a.state.currentNotificationClose=b}a.defineExtension("openDialog",(function(d,e,f){function g(b){if("string"==typeof b)l.value=b;else{if(j)return;j=!0,a.rmClass(i.parentNode,"dialog-opened"),i.parentNode.removeChild(i),k.focus(),f.onClose&&f.onClose(i)}}f||(f={}),c(this,null);var h,i=b(this,d,f.bottom),j=!1,k=this,l=i.getElementsByTagName("input")[0];return l?(l.focus(),f.value&&(l.value=f.value,f.selectValueOnOpen!==!1&&l.select()),f.onInput&&a.on(l,"input",(function(a){f.onInput(a,l.value,g)})),f.onKeyUp&&a.on(l,"keyup",(function(a){f.onKeyUp(a,l.value,g)})),a.on(l,"keydown",(function(b){f&&f.onKeyDown&&f.onKeyDown(b,l.value,g)||((27==b.keyCode||f.closeOnEnter!==!1&&13==b.keyCode)&&(l.blur(),a.e_stop(b),g()),13==b.keyCode&&e(l.value,b))})),f.closeOnBlur!==!1&&a.on(l,"blur",g)):(h=i.getElementsByTagName("button")[0])&&(a.on(h,"click",(function(){g(),k.focus()})),f.closeOnBlur!==!1&&a.on(h,"blur",g),h.focus()),g})),a.defineExtension("openConfirm",(function(d,e,f){function g(){j||(j=!0,a.rmClass(h.parentNode,"dialog-opened"),h.parentNode.removeChild(h),k.focus())}c(this,null);var h=b(this,d,f&&f.bottom),i=h.getElementsByTagName("button"),j=!1,k=this,l=1;i[0].focus();for(var m=0;m<i.length;++m){var n=i[m];!(function(b){a.on(n,"click",(function(c){a.e_preventDefault(c),g(),b&&b(k)}))})(e[m]),a.on(n,"blur",(function(){--l,setTimeout((function(){l<=0&&g()}),200)})),a.on(n,"focus",(function(){++l}))}})),a.defineExtension("openNotification",(function(d,e){function f(){i||(i=!0,clearTimeout(g),a.rmClass(h.parentNode,"dialog-opened"),h.parentNode.removeChild(h))}c(this,f);var g,h=b(this,d,e&&e.bottom),i=!1,j=e&&"undefined"!=typeof e.duration?e.duration:5e3;return a.on(h,"click",(function(b){a.e_preventDefault(b),f()})),j&&(g=setTimeout(f,j)),f}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/display/autorefresh.js b/core/media/editors/codemirror/addon/display/autorefresh.js
new file mode 100644
index 00000000..1e0e8504
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/autorefresh.js
@@ -0,0 +1,47 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  CodeMirror.defineOption("autoRefresh", false, function(cm, val) {
+    if (cm.state.autoRefresh) {
+      stopListening(cm, cm.state.autoRefresh)
+      cm.state.autoRefresh = null
+    }
+    if (val && cm.display.wrapper.offsetHeight == 0)
+      startListening(cm, cm.state.autoRefresh = {delay: val.delay || 250})
+  })
+
+  function startListening(cm, state) {
+    function check() {
+      if (cm.display.wrapper.offsetHeight) {
+        stopListening(cm, state)
+        if (cm.display.lastWrapHeight != cm.display.wrapper.clientHeight)
+          cm.refresh()
+      } else {
+        state.timeout = setTimeout(check, state.delay)
+      }
+    }
+    state.timeout = setTimeout(check, state.delay)
+    state.hurry = function() {
+      clearTimeout(state.timeout)
+      state.timeout = setTimeout(check, 50)
+    }
+    CodeMirror.on(window, "mouseup", state.hurry)
+    CodeMirror.on(window, "keyup", state.hurry)
+  }
+
+  function stopListening(_cm, state) {
+    clearTimeout(state.timeout)
+    CodeMirror.off(window, "mouseup", state.hurry)
+    CodeMirror.off(window, "keyup", state.hurry)
+  }
+});
diff --git a/core/media/editors/codemirror/addon/display/autorefresh.min.js b/core/media/editors/codemirror/addon/display/autorefresh.min.js
new file mode 100644
index 00000000..43418415
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/autorefresh.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,d){function e(){b.display.wrapper.offsetHeight?(c(b,d),b.display.lastWrapHeight!=b.display.wrapper.clientHeight&&b.refresh()):d.timeout=setTimeout(e,d.delay)}d.timeout=setTimeout(e,d.delay),d.hurry=function(){clearTimeout(d.timeout),d.timeout=setTimeout(e,50)},a.on(window,"mouseup",d.hurry),a.on(window,"keyup",d.hurry)}function c(b,c){clearTimeout(c.timeout),a.off(window,"mouseup",c.hurry),a.off(window,"keyup",c.hurry)}a.defineOption("autoRefresh",!1,(function(a,d){a.state.autoRefresh&&(c(a,a.state.autoRefresh),a.state.autoRefresh=null),d&&0==a.display.wrapper.offsetHeight&&b(a,a.state.autoRefresh={delay:d.delay||250})}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/display/fullscreen.css b/core/media/editors/codemirror/addon/display/fullscreen.css
new file mode 100644
index 00000000..437acd89
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/fullscreen.css
@@ -0,0 +1,6 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9;
+}
diff --git a/core/media/editors/codemirror/addon/display/fullscreen.js b/core/media/editors/codemirror/addon/display/fullscreen.js
new file mode 100644
index 00000000..cd3673b9
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/fullscreen.js
@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
+    if (old == CodeMirror.Init) old = false;
+    if (!old == !val) return;
+    if (val) setFullscreen(cm);
+    else setNormal(cm);
+  });
+
+  function setFullscreen(cm) {
+    var wrap = cm.getWrapperElement();
+    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
+                                  width: wrap.style.width, height: wrap.style.height};
+    wrap.style.width = "";
+    wrap.style.height = "auto";
+    wrap.className += " CodeMirror-fullscreen";
+    document.documentElement.style.overflow = "hidden";
+    cm.refresh();
+  }
+
+  function setNormal(cm) {
+    var wrap = cm.getWrapperElement();
+    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
+    document.documentElement.style.overflow = "";
+    var info = cm.state.fullScreenRestore;
+    wrap.style.width = info.width; wrap.style.height = info.height;
+    window.scrollTo(info.scrollLeft, info.scrollTop);
+    cm.refresh();
+  }
+});
diff --git a/core/media/editors/codemirror/addon/display/fullscreen.min.css b/core/media/editors/codemirror/addon/display/fullscreen.min.css
new file mode 100644
index 00000000..a414b022
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/fullscreen.min.css
@@ -0,0 +1 @@
+.CodeMirror-fullscreen{position:fixed;top:0;left:0;right:0;bottom:0;height:auto;z-index:9}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/display/fullscreen.min.js b/core/media/editors/codemirror/addon/display/fullscreen.min.js
new file mode 100644
index 00000000..d5ed1380
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/fullscreen.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.getWrapperElement();a.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:b.style.width,height:b.style.height},b.style.width="",b.style.height="auto",b.className+=" CodeMirror-fullscreen",document.documentElement.style.overflow="hidden",a.refresh()}function c(a){var b=a.getWrapperElement();b.className=b.className.replace(/\s*CodeMirror-fullscreen\b/,""),document.documentElement.style.overflow="";var c=a.state.fullScreenRestore;b.style.width=c.width,b.style.height=c.height,window.scrollTo(c.scrollLeft,c.scrollTop),a.refresh()}a.defineOption("fullScreen",!1,(function(d,e,f){f==a.Init&&(f=!1),!f!=!e&&(e?b(d):c(d))}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/display/panel.js b/core/media/editors/codemirror/addon/display/panel.js
new file mode 100644
index 00000000..f88d152b
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/panel.js
@@ -0,0 +1,123 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineExtension("addPanel", function(node, options) {
+    options = options || {};
+
+    if (!this.state.panels) initPanels(this);
+
+    var info = this.state.panels;
+    var wrapper = info.wrapper;
+    var cmWrapper = this.getWrapperElement();
+
+    if (options.after instanceof Panel && !options.after.cleared) {
+      wrapper.insertBefore(node, options.before.node.nextSibling);
+    } else if (options.before instanceof Panel && !options.before.cleared) {
+      wrapper.insertBefore(node, options.before.node);
+    } else if (options.replace instanceof Panel && !options.replace.cleared) {
+      wrapper.insertBefore(node, options.replace.node);
+      options.replace.clear();
+    } else if (options.position == "bottom") {
+      wrapper.appendChild(node);
+    } else if (options.position == "before-bottom") {
+      wrapper.insertBefore(node, cmWrapper.nextSibling);
+    } else if (options.position == "after-top") {
+      wrapper.insertBefore(node, cmWrapper);
+    } else {
+      wrapper.insertBefore(node, wrapper.firstChild);
+    }
+
+    var height = (options && options.height) || node.offsetHeight;
+    this._setSize(null, info.heightLeft -= height);
+    info.panels++;
+    if (options.stable && isAtTop(this, node))
+      this.scrollTo(null, this.getScrollInfo().top + height)
+
+    return new Panel(this, node, options, height);
+  });
+
+  function Panel(cm, node, options, height) {
+    this.cm = cm;
+    this.node = node;
+    this.options = options;
+    this.height = height;
+    this.cleared = false;
+  }
+
+  Panel.prototype.clear = function() {
+    if (this.cleared) return;
+    this.cleared = true;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.heightLeft += this.height);
+    if (this.options.stable && isAtTop(this.cm, this.node))
+      this.cm.scrollTo(null, this.cm.getScrollInfo().top - this.height)
+    info.wrapper.removeChild(this.node);
+    if (--info.panels == 0) removePanels(this.cm);
+  };
+
+  Panel.prototype.changed = function(height) {
+    var newHeight = height == null ? this.node.offsetHeight : height;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.heightLeft -= (newHeight - this.height));
+    this.height = newHeight;
+  };
+
+  function initPanels(cm) {
+    var wrap = cm.getWrapperElement();
+    var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
+    var height = parseInt(style.height);
+    var info = cm.state.panels = {
+      setHeight: wrap.style.height,
+      heightLeft: height,
+      panels: 0,
+      wrapper: document.createElement("div")
+    };
+    wrap.parentNode.insertBefore(info.wrapper, wrap);
+    var hasFocus = cm.hasFocus();
+    info.wrapper.appendChild(wrap);
+    if (hasFocus) cm.focus();
+
+    cm._setSize = cm.setSize;
+    if (height != null) cm.setSize = function(width, newHeight) {
+      if (newHeight == null) return this._setSize(width, newHeight);
+      info.setHeight = newHeight;
+      if (typeof newHeight != "number") {
+        var px = /^(\d+\.?\d*)px$/.exec(newHeight);
+        if (px) {
+          newHeight = Number(px[1]);
+        } else {
+          info.wrapper.style.height = newHeight;
+          newHeight = info.wrapper.offsetHeight;
+          info.wrapper.style.height = "";
+        }
+      }
+      cm._setSize(width, info.heightLeft += (newHeight - height));
+      height = newHeight;
+    };
+  }
+
+  function removePanels(cm) {
+    var info = cm.state.panels;
+    cm.state.panels = null;
+
+    var wrap = cm.getWrapperElement();
+    info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
+    wrap.style.height = info.setHeight;
+    cm.setSize = cm._setSize;
+    cm.setSize();
+  }
+
+  function isAtTop(cm, dom) {
+    for (var sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
+      if (sibling == cm.getWrapperElement()) return true
+    return false
+  }
+});
diff --git a/core/media/editors/codemirror/addon/display/panel.min.js b/core/media/editors/codemirror/addon/display/panel.min.js
new file mode 100644
index 00000000..e0940c8c
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/panel.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,c,d){this.cm=a,this.node=b,this.options=c,this.height=d,this.cleared=!1}function c(a){var b=a.getWrapperElement(),c=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,d=parseInt(c.height),e=a.state.panels={setHeight:b.style.height,heightLeft:d,panels:0,wrapper:document.createElement("div")};b.parentNode.insertBefore(e.wrapper,b);var f=a.hasFocus();e.wrapper.appendChild(b),f&&a.focus(),a._setSize=a.setSize,null!=d&&(a.setSize=function(b,c){if(null==c)return this._setSize(b,c);if(e.setHeight=c,"number"!=typeof c){var f=/^(\d+\.?\d*)px$/.exec(c);f?c=Number(f[1]):(e.wrapper.style.height=c,c=e.wrapper.offsetHeight,e.wrapper.style.height="")}a._setSize(b,e.heightLeft+=c-d),d=c})}function d(a){var b=a.state.panels;a.state.panels=null;var c=a.getWrapperElement();b.wrapper.parentNode.replaceChild(c,b.wrapper),c.style.height=b.setHeight,a.setSize=a._setSize,a.setSize()}function e(a,b){for(var c=b.nextSibling;c;c=c.nextSibling)if(c==a.getWrapperElement())return!0;return!1}a.defineExtension("addPanel",(function(a,d){d=d||{},this.state.panels||c(this);var f=this.state.panels,g=f.wrapper,h=this.getWrapperElement();d.after instanceof b&&!d.after.cleared?g.insertBefore(a,d.before.node.nextSibling):d.before instanceof b&&!d.before.cleared?g.insertBefore(a,d.before.node):d.replace instanceof b&&!d.replace.cleared?(g.insertBefore(a,d.replace.node),d.replace.clear()):"bottom"==d.position?g.appendChild(a):"before-bottom"==d.position?g.insertBefore(a,h.nextSibling):"after-top"==d.position?g.insertBefore(a,h):g.insertBefore(a,g.firstChild);var i=d&&d.height||a.offsetHeight;return this._setSize(null,f.heightLeft-=i),f.panels++,d.stable&&e(this,a)&&this.scrollTo(null,this.getScrollInfo().top+i),new b(this,a,d,i)})),b.prototype.clear=function(){if(!this.cleared){this.cleared=!0;var a=this.cm.state.panels;this.cm._setSize(null,a.heightLeft+=this.height),this.options.stable&&e(this.cm,this.node)&&this.cm.scrollTo(null,this.cm.getScrollInfo().top-this.height),a.wrapper.removeChild(this.node),0==--a.panels&&d(this.cm)}},b.prototype.changed=function(a){var b=null==a?this.node.offsetHeight:a,c=this.cm.state.panels;this.cm._setSize(null,c.heightLeft-=b-this.height),this.height=b}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/display/placeholder.js b/core/media/editors/codemirror/addon/display/placeholder.js
new file mode 100644
index 00000000..65753ebf
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/placeholder.js
@@ -0,0 +1,63 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
+    var prev = old && old != CodeMirror.Init;
+    if (val && !prev) {
+      cm.on("blur", onBlur);
+      cm.on("change", onChange);
+      cm.on("swapDoc", onChange);
+      onChange(cm);
+    } else if (!val && prev) {
+      cm.off("blur", onBlur);
+      cm.off("change", onChange);
+      cm.off("swapDoc", onChange);
+      clearPlaceholder(cm);
+      var wrapper = cm.getWrapperElement();
+      wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
+    }
+
+    if (val && !cm.hasFocus()) onBlur(cm);
+  });
+
+  function clearPlaceholder(cm) {
+    if (cm.state.placeholder) {
+      cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
+      cm.state.placeholder = null;
+    }
+  }
+  function setPlaceholder(cm) {
+    clearPlaceholder(cm);
+    var elt = cm.state.placeholder = document.createElement("pre");
+    elt.style.cssText = "height: 0; overflow: visible";
+    elt.style.direction = cm.getOption("direction");
+    elt.className = "CodeMirror-placeholder";
+    var placeHolder = cm.getOption("placeholder")
+    if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
+    elt.appendChild(placeHolder)
+    cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
+  }
+
+  function onBlur(cm) {
+    if (isEmpty(cm)) setPlaceholder(cm);
+  }
+  function onChange(cm) {
+    var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
+    wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + (empty ? " CodeMirror-empty" : "");
+
+    if (empty) setPlaceholder(cm);
+    else clearPlaceholder(cm);
+  }
+
+  function isEmpty(cm) {
+    return (cm.lineCount() === 1) && (cm.getLine(0) === "");
+  }
+});
diff --git a/core/media/editors/codemirror/addon/display/placeholder.min.js b/core/media/editors/codemirror/addon/display/placeholder.min.js
new file mode 100644
index 00000000..976c9faa
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/placeholder.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a){a.state.placeholder&&(a.state.placeholder.parentNode.removeChild(a.state.placeholder),a.state.placeholder=null)}function c(a){b(a);var c=a.state.placeholder=document.createElement("pre");c.style.cssText="height: 0; overflow: visible",c.style.direction=a.getOption("direction"),c.className="CodeMirror-placeholder";var d=a.getOption("placeholder");"string"==typeof d&&(d=document.createTextNode(d)),c.appendChild(d),a.display.lineSpace.insertBefore(c,a.display.lineSpace.firstChild)}function d(a){f(a)&&c(a)}function e(a){var d=a.getWrapperElement(),e=f(a);d.className=d.className.replace(" CodeMirror-empty","")+(e?" CodeMirror-empty":""),e?c(a):b(a)}function f(a){return 1===a.lineCount()&&""===a.getLine(0)}a.defineOption("placeholder","",(function(c,f,g){var h=g&&g!=a.Init;if(f&&!h)c.on("blur",d),c.on("change",e),c.on("swapDoc",e),e(c);else if(!f&&h){c.off("blur",d),c.off("change",e),c.off("swapDoc",e),b(c);var i=c.getWrapperElement();i.className=i.className.replace(" CodeMirror-empty","")}f&&!c.hasFocus()&&d(c)}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/display/rulers.js b/core/media/editors/codemirror/addon/display/rulers.js
new file mode 100644
index 00000000..151cc820
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/rulers.js
@@ -0,0 +1,51 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("rulers", false, function(cm, val) {
+    if (cm.state.rulerDiv) {
+      cm.state.rulerDiv.parentElement.removeChild(cm.state.rulerDiv)
+      cm.state.rulerDiv = null
+      cm.off("refresh", drawRulers)
+    }
+    if (val && val.length) {
+      cm.state.rulerDiv = cm.display.lineSpace.parentElement.insertBefore(document.createElement("div"), cm.display.lineSpace)
+      cm.state.rulerDiv.className = "CodeMirror-rulers"
+      drawRulers(cm)
+      cm.on("refresh", drawRulers)
+    }
+  });
+
+  function drawRulers(cm) {
+    cm.state.rulerDiv.textContent = ""
+    var val = cm.getOption("rulers");
+    var cw = cm.defaultCharWidth();
+    var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
+    cm.state.rulerDiv.style.minHeight = (cm.display.scroller.offsetHeight + 30) + "px";
+    for (var i = 0; i < val.length; i++) {
+      var elt = document.createElement("div");
+      elt.className = "CodeMirror-ruler";
+      var col, conf = val[i];
+      if (typeof conf == "number") {
+        col = conf;
+      } else {
+        col = conf.column;
+        if (conf.className) elt.className += " " + conf.className;
+        if (conf.color) elt.style.borderColor = conf.color;
+        if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
+        if (conf.width) elt.style.borderLeftWidth = conf.width;
+      }
+      elt.style.left = (left + col * cw) + "px";
+      cm.state.rulerDiv.appendChild(elt)
+    }
+  }
+});
diff --git a/core/media/editors/codemirror/addon/display/rulers.min.js b/core/media/editors/codemirror/addon/display/rulers.min.js
new file mode 100644
index 00000000..e7187000
--- /dev/null
+++ b/core/media/editors/codemirror/addon/display/rulers.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b){b.state.rulerDiv.textContent="";var c=b.getOption("rulers"),d=b.defaultCharWidth(),e=b.charCoords(a.Pos(b.firstLine(),0),"div").left;b.state.rulerDiv.style.minHeight=b.display.scroller.offsetHeight+30+"px";for(var f=0;f<c.length;f++){var g=document.createElement("div");g.className="CodeMirror-ruler";var h,i=c[f];"number"==typeof i?h=i:(h=i.column,i.className&&(g.className+=" "+i.className),i.color&&(g.style.borderColor=i.color),i.lineStyle&&(g.style.borderLeftStyle=i.lineStyle),i.width&&(g.style.borderLeftWidth=i.width)),g.style.left=e+h*d+"px",b.state.rulerDiv.appendChild(g)}}a.defineOption("rulers",!1,(function(a,c){a.state.rulerDiv&&(a.state.rulerDiv.parentElement.removeChild(a.state.rulerDiv),a.state.rulerDiv=null,a.off("refresh",b)),c&&c.length&&(a.state.rulerDiv=a.display.lineSpace.parentElement.insertBefore(document.createElement("div"),a.display.lineSpace),a.state.rulerDiv.className="CodeMirror-rulers",b(a),a.on("refresh",b))}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/edit/closebrackets.js b/core/media/editors/codemirror/addon/edit/closebrackets.js
new file mode 100644
index 00000000..86b2fe1c
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/closebrackets.js
@@ -0,0 +1,194 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var defaults = {
+    pairs: "()[]{}''\"\"",
+    triples: "",
+    explode: "[]{}"
+  };
+
+  var Pos = CodeMirror.Pos;
+
+  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.removeKeyMap(keyMap);
+      cm.state.closeBrackets = null;
+    }
+    if (val) {
+      ensureBound(getOption(val, "pairs"))
+      cm.state.closeBrackets = val;
+      cm.addKeyMap(keyMap);
+    }
+  });
+
+  function getOption(conf, name) {
+    if (name == "pairs" && typeof conf == "string") return conf;
+    if (typeof conf == "object" && conf[name] != null) return conf[name];
+    return defaults[name];
+  }
+
+  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+  function ensureBound(chars) {
+    for (var i = 0; i < chars.length; i++) {
+      var ch = chars.charAt(i), key = "'" + ch + "'"
+      if (!keyMap[key]) keyMap[key] = handler(ch)
+    }
+  }
+  ensureBound(defaults.pairs + "`")
+
+  function handler(ch) {
+    return function(cm) { return handleChar(cm, ch); };
+  }
+
+  function getConfig(cm) {
+    var deflt = cm.state.closeBrackets;
+    if (!deflt || deflt.override) return deflt;
+    var mode = cm.getModeAt(cm.getCursor());
+    return mode.closeBrackets || deflt;
+  }
+
+  function handleBackspace(cm) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var cur = ranges[i].head;
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
+    }
+  }
+
+  function handleEnter(cm) {
+    var conf = getConfig(cm);
+    var explode = conf && getOption(conf, "explode");
+    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    cm.operation(function() {
+      var linesep = cm.lineSeparator() || "\n";
+      cm.replaceSelection(linesep + linesep, null);
+      cm.execCommand("goCharLeft");
+      ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var line = ranges[i].head.line;
+        cm.indentLine(line, null, true);
+        cm.indentLine(line + 1, null, true);
+      }
+    });
+  }
+
+  function contractSelection(sel) {
+    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
+    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
+            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
+  }
+
+  function handleChar(cm, ch) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var pos = pairs.indexOf(ch);
+    if (pos == -1) return CodeMirror.Pass;
+    var triples = getOption(conf, "triples");
+
+    var identical = pairs.charAt(pos + 1) == ch;
+    var ranges = cm.listSelections();
+    var opening = pos % 2 == 0;
+
+    var type;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], cur = range.head, curType;
+      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+      if (opening && !range.empty()) {
+        curType = "surround";
+      } else if ((identical || !opening) && next == ch) {
+        if (identical && stringStartsAfter(cm, cur))
+          curType = "both";
+        else if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+          curType = "skipThree";
+        else
+          curType = "skip";
+      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) {
+        if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass;
+        curType = "addFour";
+      } else if (identical) {
+        var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
+        if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
+        else return CodeMirror.Pass;
+      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
+                             isClosingBracket(next, pairs) ||
+                             /\s/.test(next))) {
+        curType = "both";
+      } else {
+        return CodeMirror.Pass;
+      }
+      if (!type) type = curType;
+      else if (type != curType) return CodeMirror.Pass;
+    }
+
+    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
+    cm.operation(function() {
+      if (type == "skip") {
+        cm.execCommand("goCharRight");
+      } else if (type == "skipThree") {
+        for (var i = 0; i < 3; i++)
+          cm.execCommand("goCharRight");
+      } else if (type == "surround") {
+        var sels = cm.getSelections();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = left + sels[i] + right;
+        cm.replaceSelections(sels, "around");
+        sels = cm.listSelections().slice();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = contractSelection(sels[i]);
+        cm.setSelections(sels);
+      } else if (type == "both") {
+        cm.replaceSelection(left + right, null);
+        cm.triggerElectric(left + right);
+        cm.execCommand("goCharLeft");
+      } else if (type == "addFour") {
+        cm.replaceSelection(left + left + left + left, "before");
+        cm.execCommand("goCharRight");
+      }
+    });
+  }
+
+  function isClosingBracket(ch, pairs) {
+    var pos = pairs.lastIndexOf(ch);
+    return pos > -1 && pos % 2 == 1;
+  }
+
+  function charsAround(cm, pos) {
+    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+                          Pos(pos.line, pos.ch + 1));
+    return str.length == 2 ? str : null;
+  }
+
+  function stringStartsAfter(cm, pos) {
+    var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
+    return /\bstring/.test(token.type) && token.start == pos.ch &&
+      (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos)))
+  }
+});
diff --git a/core/media/editors/codemirror/addon/edit/closebrackets.min.js b/core/media/editors/codemirror/addon/edit/closebrackets.min.js
new file mode 100644
index 00000000..85380fe7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/closebrackets.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b){return"pairs"==b&&"string"==typeof a?a:"object"==typeof a&&null!=a[b]?a[b]:m[b]}function c(a){for(var b=0;b<a.length;b++){var c=a.charAt(b),e="'"+c+"'";o[e]||(o[e]=d(c))}}function d(a){return function(b){return i(b,a)}}function e(a){var b=a.state.closeBrackets;if(!b||b.override)return b;var c=a.getModeAt(a.getCursor());return c.closeBrackets||b}function f(c){var d=e(c);if(!d||c.getOption("disableInput"))return a.Pass;for(var f=b(d,"pairs"),g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=k(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}for(var h=g.length-1;h>=0;h--){var j=g[h].head;c.replaceRange("",n(j.line,j.ch-1),n(j.line,j.ch+1),"+delete")}}function g(c){var d=e(c),f=d&&b(d,"explode");if(!f||c.getOption("disableInput"))return a.Pass;for(var g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=k(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}c.operation((function(){var a=c.lineSeparator()||"\n";c.replaceSelection(a+a,null),c.execCommand("goCharLeft"),g=c.listSelections();for(var b=0;b<g.length;b++){var d=g[b].head.line;c.indentLine(d,null,!0),c.indentLine(d+1,null,!0)}}))}function h(b){var c=a.cmpPos(b.anchor,b.head)>0;return{anchor:new n(b.anchor.line,b.anchor.ch+(c?-1:1)),head:new n(b.head.line,b.head.ch+(c?1:-1))}}function i(c,d){var f=e(c);if(!f||c.getOption("disableInput"))return a.Pass;var g=b(f,"pairs"),i=g.indexOf(d);if(i==-1)return a.Pass;for(var k,m=b(f,"triples"),o=g.charAt(i+1)==d,p=c.listSelections(),q=i%2==0,r=0;r<p.length;r++){var s,t=p[r],u=t.head,v=c.getRange(u,n(u.line,u.ch+1));if(q&&!t.empty())s="surround";else if(!o&&q||v!=d)if(o&&u.ch>1&&m.indexOf(d)>=0&&c.getRange(n(u.line,u.ch-2),u)==d+d){if(u.ch>2&&/\bstring/.test(c.getTokenTypeAt(n(u.line,u.ch-2))))return a.Pass;s="addFour"}else if(o){var w=0==u.ch?" ":c.getRange(n(u.line,u.ch-1),u);if(a.isWordChar(v)||w==d||a.isWordChar(w))return a.Pass;s="both"}else{if(!q||c.getLine(u.line).length!=u.ch&&!j(v,g)&&!/\s/.test(v))return a.Pass;s="both"}else s=o&&l(c,u)?"both":m.indexOf(d)>=0&&c.getRange(u,n(u.line,u.ch+3))==d+d+d?"skipThree":"skip";if(k){if(k!=s)return a.Pass}else k=s}var x=i%2?g.charAt(i-1):d,y=i%2?d:g.charAt(i+1);c.operation((function(){if("skip"==k)c.execCommand("goCharRight");else if("skipThree"==k)for(var a=0;a<3;a++)c.execCommand("goCharRight");else if("surround"==k){for(var b=c.getSelections(),a=0;a<b.length;a++)b[a]=x+b[a]+y;c.replaceSelections(b,"around"),b=c.listSelections().slice();for(var a=0;a<b.length;a++)b[a]=h(b[a]);c.setSelections(b)}else"both"==k?(c.replaceSelection(x+y,null),c.triggerElectric(x+y),c.execCommand("goCharLeft")):"addFour"==k&&(c.replaceSelection(x+x+x+x,"before"),c.execCommand("goCharRight"))}))}function j(a,b){var c=b.lastIndexOf(a);return c>-1&&c%2==1}function k(a,b){var c=a.getRange(n(b.line,b.ch-1),n(b.line,b.ch+1));return 2==c.length?c:null}function l(a,b){var c=a.getTokenAt(n(b.line,b.ch+1));return/\bstring/.test(c.type)&&c.start==b.ch&&(0==b.ch||!/\bstring/.test(a.getTokenTypeAt(b)))}var m={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},n=a.Pos;a.defineOption("autoCloseBrackets",!1,(function(d,e,f){f&&f!=a.Init&&(d.removeKeyMap(o),d.state.closeBrackets=null),e&&(c(b(e,"pairs")),d.state.closeBrackets=e,d.addKeyMap(o))}));var o={Backspace:f,Enter:g};c(m.pairs+"`")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/edit/closetag.js b/core/media/editors/codemirror/addon/edit/closetag.js
new file mode 100644
index 00000000..83f133a5
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/closetag.js
@@ -0,0 +1,175 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Tag-closer extension for CodeMirror.
+ *
+ * This extension adds an "autoCloseTags" option that can be set to
+ * either true to get the default behavior, or an object to further
+ * configure its behavior.
+ *
+ * These are supported options:
+ *
+ * `whenClosing` (default true)
+ *   Whether to autoclose when the '/' of a closing tag is typed.
+ * `whenOpening` (default true)
+ *   Whether to autoclose the tag when the final '>' of an opening
+ *   tag is typed.
+ * `dontCloseTags` (default is empty tags for HTML, none for XML)
+ *   An array of tag names that should not be autoclosed.
+ * `indentTags` (default is block tags for HTML, none for XML)
+ *   An array of tag names that should, when opened, cause a
+ *   blank line to be added inside the tag, and the blank line and
+ *   closing line to be indented.
+ *
+ * See demos/closetag.html for a usage example.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
+    if (old != CodeMirror.Init && old)
+      cm.removeKeyMap("autoCloseTags");
+    if (!val) return;
+    var map = {name: "autoCloseTags"};
+    if (typeof val != "object" || val.whenClosing)
+      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
+    if (typeof val != "object" || val.whenOpening)
+      map["'>'"] = function(cm) { return autoCloseGT(cm); };
+    cm.addKeyMap(map);
+  });
+
+  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
+                       "source", "track", "wbr"];
+  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
+                    "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
+
+  function autoCloseGT(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    var opt = cm.getOption("autoCloseTags");
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+
+      var html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+
+      var tagName = state.tagName;
+      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+      var lowerTagName = tagName.toLowerCase();
+      // Don't process the '>' at the end of an end-tag or self-closing tag
+      if (!tagName ||
+          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+          tok.type == "tag" && state.type == "closeTag" ||
+          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+          closingTagExists(cm, tagName, pos, state, true))
+        return CodeMirror.Pass;
+
+      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+      replacements[i] = {indent: indent,
+                         text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",
+                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
+    }
+
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnAutoClose);
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var info = replacements[i];
+      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
+      var sel = cm.listSelections().slice(0);
+      sel[i] = {head: info.newPos, anchor: info.newPos};
+      cm.setSelections(sel);
+      if (!dontIndentOnAutoClose && info.indent) {
+        cm.indentLine(info.newPos.line, null, true);
+        cm.indentLine(info.newPos.line + 1, null, true);
+      }
+    }
+  }
+
+  function autoCloseCurrent(cm, typingSlash) {
+    var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
+    var opt = cm.getOption("autoCloseTags");
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnSlash);
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
+        return CodeMirror.Pass;
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      var replacement;
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacement = head + "script";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacement = head + "style";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacement = head + state.context.tagName;
+      }
+      if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
+      replacements[i] = replacement;
+    }
+    cm.replaceSelections(replacements);
+    ranges = cm.listSelections();
+    if (!dontIndentOnAutoClose) {
+        for (var i = 0; i < ranges.length; i++)
+            if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+                cm.indentLine(ranges[i].head.line);
+    }
+  }
+
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    return autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
+  function indexOf(collection, elt) {
+    if (collection.indexOf) return collection.indexOf(elt);
+    for (var i = 0, e = collection.length; i < e; ++i)
+      if (collection[i] == elt) return i;
+    return -1;
+  }
+
+  // If xml-fold is loaded, we use its functionality to try and verify
+  // whether a given tag is actually unclosed.
+  function closingTagExists(cm, tagName, pos, state, newTag) {
+    if (!CodeMirror.scanForClosingTag) return false;
+    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
+    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
+    if (!nextClose || nextClose.tag != tagName) return false;
+    var cx = state.context;
+    // If the immediate wrapping context contains onCx instances of
+    // the same tag, a closing tag only exists if there are at least
+    // that many closing tags of that type following.
+    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
+    pos = nextClose.to;
+    for (var i = 1; i < onCx; i++) {
+      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
+      if (!next || next.tag != tagName) return false;
+      pos = next.to;
+    }
+    return true;
+  }
+});
diff --git a/core/media/editors/codemirror/addon/edit/closetag.min.js b/core/media/editors/codemirror/addon/edit/closetag.min.js
new file mode 100644
index 00000000..0f31f1b8
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/closetag.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var c=b.listSelections(),d=[],i=b.getOption("autoCloseTags"),j=0;j<c.length;j++){if(!c[j].empty())return a.Pass;var k=c[j].head,l=b.getTokenAt(k),m=a.innerMode(b.getMode(),l.state),n=m.state;if("xml"!=m.mode.name||!n.tagName)return a.Pass;var o="html"==m.mode.configuration,p="object"==typeof i&&i.dontCloseTags||o&&g,q="object"==typeof i&&i.indentTags||o&&h,r=n.tagName;l.end>k.ch&&(r=r.slice(0,r.length-l.end+k.ch));var s=r.toLowerCase();if(!r||"string"==l.type&&(l.end!=k.ch||!/[\"\']/.test(l.string.charAt(l.string.length-1))||1==l.string.length)||"tag"==l.type&&"closeTag"==n.type||l.string.indexOf("/")==l.string.length-1||p&&e(p,s)>-1||f(b,r,k,n,!0))return a.Pass;var t=q&&e(q,s)>-1;d[j]={indent:t,text:">"+(t?"\n\n":"")+"</"+r+">",newPos:t?a.Pos(k.line+1,0):a.Pos(k.line,k.ch+1)}}for(var u="object"==typeof i&&i.dontIndentOnAutoClose,j=c.length-1;j>=0;j--){var v=d[j];b.replaceRange(v.text,c[j].head,c[j].anchor,"+insert");var w=b.listSelections().slice(0);w[j]={head:v.newPos,anchor:v.newPos},b.setSelections(w),!u&&v.indent&&(b.indentLine(v.newPos.line,null,!0),b.indentLine(v.newPos.line+1,null,!0))}}function c(b,c){for(var d=b.listSelections(),e=[],g=c?"/":"</",h=b.getOption("autoCloseTags"),i="object"==typeof h&&h.dontIndentOnSlash,j=0;j<d.length;j++){if(!d[j].empty())return a.Pass;var k=d[j].head,l=b.getTokenAt(k),m=a.innerMode(b.getMode(),l.state),n=m.state;if(c&&("string"==l.type||"<"!=l.string.charAt(0)||l.start!=k.ch-1))return a.Pass;var o;if("xml"!=m.mode.name)if("htmlmixed"==b.getMode().name&&"javascript"==m.mode.name)o=g+"script";else{if("htmlmixed"!=b.getMode().name||"css"!=m.mode.name)return a.Pass;o=g+"style"}else{if(!n.context||!n.context.tagName||f(b,n.context.tagName,k,n))return a.Pass;o=g+n.context.tagName}">"!=b.getLine(k.line).charAt(l.end)&&(o+=">"),e[j]=o}if(b.replaceSelections(e),d=b.listSelections(),!i)for(var j=0;j<d.length;j++)(j==d.length-1||d[j].head.line<d[j+1].head.line)&&b.indentLine(d[j].head.line)}function d(b){return b.getOption("disableInput")?a.Pass:c(b,!0)}function e(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;++c)if(a[c]==b)return c;return-1}function f(b,c,d,e,f){if(!a.scanForClosingTag)return!1;var g=Math.min(b.lastLine()+1,d.line+500),h=a.scanForClosingTag(b,d,null,g);if(!h||h.tag!=c)return!1;for(var i=e.context,j=f?1:0;i&&i.tagName==c;i=i.prev)++j;d=h.to;for(var k=1;k<j;k++){var l=a.scanForClosingTag(b,d,null,g);if(!l||l.tag!=c)return!1;d=l.to}return!0}a.defineOption("autoCloseTags",!1,(function(c,e,f){if(f!=a.Init&&f&&c.removeKeyMap("autoCloseTags"),e){var g={name:"autoCloseTags"};("object"!=typeof e||e.whenClosing)&&(g["'/'"]=function(a){return d(a)}),("object"!=typeof e||e.whenOpening)&&(g["'>'"]=function(a){return b(a)}),c.addKeyMap(g)}}));var g=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],h=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];a.commands.closeTag=function(a){return c(a)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/edit/continuelist.js b/core/media/editors/codemirror/addon/edit/continuelist.js
new file mode 100644
index 00000000..4e7d3928
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/continuelist.js
@@ -0,0 +1,89 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var listRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
+      unorderedListRE = /[*+-]\s/;
+
+  CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head;
+      var eolState = cm.getStateAfter(pos.line);
+      var inList = eolState.list !== false;
+      var inQuote = eolState.quote !== 0;
+
+      var line = cm.getLine(pos.line), match = listRE.exec(line);
+      var cursorBeforeBullet = /^\s*$/.test(line.slice(0, pos.ch));
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match || cursorBeforeBullet) {
+        cm.execCommand("newlineAndIndent");
+        return;
+      }
+      if (emptyListRE.test(line)) {
+        if (!/>\s*$/.test(line)) cm.replaceRange("", {
+          line: pos.line, ch: 0
+        }, {
+          line: pos.line, ch: pos.ch + 1
+        });
+        replacements[i] = "\n";
+      } else {
+        var indent = match[1], after = match[5];
+        var numbered = !(unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0);
+        var bullet = numbered ? (parseInt(match[3], 10) + 1) + match[4] : match[2].replace("x", " ");
+        replacements[i] = "\n" + indent + bullet + after;
+
+        if (numbered) incrementRemainingMarkdownListNumbers(cm, pos);
+      }
+    }
+
+    cm.replaceSelections(replacements);
+  };
+
+  // Auto-updating Markdown list numbers when a new item is added to the
+  // middle of a list
+  function incrementRemainingMarkdownListNumbers(cm, pos) {
+    var startLine = pos.line, lookAhead = 0, skipCount = 0;
+    var startItem = listRE.exec(cm.getLine(startLine)), startIndent = startItem[1];
+
+    do {
+      lookAhead += 1;
+      var nextLineNumber = startLine + lookAhead;
+      var nextLine = cm.getLine(nextLineNumber), nextItem = listRE.exec(nextLine);
+
+      if (nextItem) {
+        var nextIndent = nextItem[1];
+        var newNumber = (parseInt(startItem[3], 10) + lookAhead - skipCount);
+        var nextNumber = (parseInt(nextItem[3], 10)), itemNumber = nextNumber;
+
+        if (startIndent === nextIndent && !isNaN(nextNumber)) {
+          if (newNumber === nextNumber) itemNumber = nextNumber + 1;
+          if (newNumber > nextNumber) itemNumber = newNumber + 1;
+          cm.replaceRange(
+            nextLine.replace(listRE, nextIndent + itemNumber + nextItem[4] + nextItem[5]),
+          {
+            line: nextLineNumber, ch: 0
+          }, {
+            line: nextLineNumber, ch: nextLine.length
+          });
+        } else {
+          if (startIndent.length > nextIndent.length) return;
+          // This doesn't run if the next line immediatley indents, as it is
+          // not clear of the users intention (new indented item or same level)
+          if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return;
+          skipCount += 1;
+        }
+      }
+    } while (nextItem);
+  }
+});
diff --git a/core/media/editors/codemirror/addon/edit/continuelist.min.js b/core/media/editors/codemirror/addon/edit/continuelist.min.js
new file mode 100644
index 00000000..e7e653a7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/continuelist.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){var d=b.line,e=0,f=0,g=c.exec(a.getLine(d)),h=g[1];do{e+=1;var i=d+e,j=a.getLine(i),k=c.exec(j);if(k){var l=k[1],m=parseInt(g[3],10)+e-f,n=parseInt(k[3],10),o=n;if(h!==l||isNaN(n)){if(h.length>l.length)return;if(h.length<l.length&&1===e)return;f+=1}else m===n&&(o=n+1),m>n&&(o=m+1),a.replaceRange(j.replace(c,l+o+k[4]+k[5]),{line:i,ch:0},{line:i,ch:j.length})}}while(k)}var c=/^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,d=/^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,e=/[*+-]\s/;a.commands.newlineAndIndentContinueMarkdownList=function(f){if(f.getOption("disableInput"))return a.Pass;for(var g=f.listSelections(),h=[],i=0;i<g.length;i++){var j=g[i].head,k=f.getStateAfter(j.line),l=k.list!==!1,m=0!==k.quote,n=f.getLine(j.line),o=c.exec(n),p=/^\s*$/.test(n.slice(0,j.ch));if(!g[i].empty()||!l&&!m||!o||p)return void f.execCommand("newlineAndIndent");if(d.test(n))/>\s*$/.test(n)||f.replaceRange("",{line:j.line,ch:0},{line:j.line,ch:j.ch+1}),h[i]="\n";else{var q=o[1],r=o[5],s=!(e.test(o[2])||o[2].indexOf(">")>=0),t=s?parseInt(o[3],10)+1+o[4]:o[2].replace("x"," ");h[i]="\n"+q+t+r,s&&b(f,j)}}f.replaceSelections(h)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/edit/matchbrackets.js b/core/media/editors/codemirror/addon/edit/matchbrackets.js
new file mode 100644
index 00000000..c9851bda
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/matchbrackets.js
@@ -0,0 +1,145 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
+    (document.documentMode == null || document.documentMode < 8);
+
+  var Pos = CodeMirror.Pos;
+
+  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
+
+  function findMatchingBracket(cm, where, config) {
+    var line = cm.getLineHandle(where.line), pos = where.ch - 1;
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+        matching[line.text.charAt(++pos)];
+    if (!match) return null;
+    var dir = match.charAt(1) == ">" ? 1 : -1;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
+    var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
+
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    if (found == null) return null;
+    return {from: Pos(where.line, pos), to: found && found.pos,
+            match: found && found.ch == match.charAt(0), forward: dir > 0};
+  }
+
+  // bracketRegex is used to specify which type of bracket to scan
+  // should be a regexp, e.g. /[[\]]/
+  //
+  // Note: If "where" is on an open bracket, then this bracket is ignored.
+  //
+  // Returns false when no bracket was found, null when it reached
+  // maxScanLines and gave up
+  function scanForBracket(cm, where, dir, style, config) {
+    var maxScanLen = (config && config.maxScanLineLength) || 10000;
+    var maxScanLines = (config && config.maxScanLines) || 1000;
+
+    var stack = [];
+    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
+    var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
+                          : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
+    for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
+      var line = cm.getLine(lineNo);
+      if (!line) continue;
+      var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1;
+      if (line.length > maxScanLen) continue;
+      if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
+      for (; pos != end; pos += dir) {
+        var ch = line.charAt(pos);
+        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
+          var match = matching[ch];
+          if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
+          else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
+          else stack.pop();
+        }
+      }
+    }
+    return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
+  }
+
+  function matchBrackets(cm, autoclear, config) {
+    // Disable brace matching in long lines, since it'll cause hugely slow updates
+    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
+    var marks = [], ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
+        var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
+        marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
+        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
+          marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
+      }
+    }
+
+    if (marks.length) {
+      // Kludge to work around the IE bug from issue #1193, where text
+      // input stops going to the textare whever this fires.
+      if (ie_lt8 && cm.state.focused) cm.focus();
+
+      var clear = function() {
+        cm.operation(function() {
+          for (var i = 0; i < marks.length; i++) marks[i].clear();
+        });
+      };
+      if (autoclear) setTimeout(clear, 800);
+      else return clear;
+    }
+  }
+
+  function doMatchBrackets(cm) {
+    cm.operation(function() {
+      if (cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+      cm.state.matchBrackets.currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
+    });
+  }
+
+  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchBrackets);
+      if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+    }
+    if (val) {
+      cm.state.matchBrackets = typeof val == "object" ? val : {};
+      cm.on("cursorActivity", doMatchBrackets);
+    }
+  });
+
+  CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
+  });
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
+    return scanForBracket(this, pos, dir, style, config);
+  });
+});
diff --git a/core/media/editors/codemirror/addon/edit/matchbrackets.min.js b/core/media/editors/codemirror/addon/edit/matchbrackets.min.js
new file mode 100644
index 00000000..9d336866
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/matchbrackets.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d){var e=a.getLineHandle(b.line),f=b.ch-1,i=d&&d.afterCursor;null==i&&(i=/(^| )cm-fat-cursor($| )/.test(a.getWrapperElement().className));var j=!i&&f>=0&&h[e.text.charAt(f)]||h[e.text.charAt(++f)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&d.strict&&k>0!=(f==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,f+1)),m=c(a,g(b.line,f+(k>0?1:0)),k,l||null,d);return null==m?null:{from:g(b.line,f),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j<i.length;j++){var k=i[j].empty()&&b(a,i[j].head,d);if(k&&a.getLine(k.from.line).length<=e){var l=k.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";h.push(a.markText(k.from,g(k.from.line,k.from.ch+1),{className:l})),k.to&&a.getLine(k.to.line).length<=e&&h.push(a.markText(k.to,g(k.to.line,k.to.ch+1),{className:l}))}}if(h.length){f&&a.state.focused&&a.focus();var m=function(){a.operation((function(){for(var a=0;a<h.length;a++)h[a].clear()}))};if(!c)return m;setTimeout(m,800)}}function e(a){a.operation((function(){a.state.matchBrackets.currentlyHighlighted&&(a.state.matchBrackets.currentlyHighlighted(),a.state.matchBrackets.currentlyHighlighted=null),a.state.matchBrackets.currentlyHighlighted=d(a,!1,a.state.matchBrackets)}))}var f=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),g=a.Pos,h={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"};a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),b.state.matchBrackets&&b.state.matchBrackets.currentlyHighlighted&&(b.state.matchBrackets.currentlyHighlighted(),b.state.matchBrackets.currentlyHighlighted=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return(d||"boolean"==typeof c)&&(d?(d.strict=c,c=d):c=c?{strict:!0}:null),b(this,a,c)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/edit/matchtags.js b/core/media/editors/codemirror/addon/edit/matchtags.js
new file mode 100644
index 00000000..fb1911a8
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/matchtags.js
@@ -0,0 +1,66 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchTags);
+      cm.off("viewportChange", maybeUpdateMatch);
+      clear(cm);
+    }
+    if (val) {
+      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
+      cm.on("cursorActivity", doMatchTags);
+      cm.on("viewportChange", maybeUpdateMatch);
+      doMatchTags(cm);
+    }
+  });
+
+  function clear(cm) {
+    if (cm.state.tagHit) cm.state.tagHit.clear();
+    if (cm.state.tagOther) cm.state.tagOther.clear();
+    cm.state.tagHit = cm.state.tagOther = null;
+  }
+
+  function doMatchTags(cm) {
+    cm.state.failedTagMatch = false;
+    cm.operation(function() {
+      clear(cm);
+      if (cm.somethingSelected()) return;
+      var cur = cm.getCursor(), range = cm.getViewport();
+      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
+      var match = CodeMirror.findMatchingTag(cm, cur, range);
+      if (!match) return;
+      if (cm.state.matchBothTags) {
+        var hit = match.at == "open" ? match.open : match.close;
+        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
+      }
+      var other = match.at == "close" ? match.open : match.close;
+      if (other)
+        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+      else
+        cm.state.failedTagMatch = true;
+    });
+  }
+
+  function maybeUpdateMatch(cm) {
+    if (cm.state.failedTagMatch) doMatchTags(cm);
+  }
+
+  CodeMirror.commands.toMatchingTag = function(cm) {
+    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
+    if (found) {
+      var other = found.at == "close" ? found.open : found.close;
+      if (other) cm.extendSelection(other.to, other.from);
+    }
+  };
+});
diff --git a/core/media/editors/codemirror/addon/edit/matchtags.min.js b/core/media/editors/codemirror/addon/edit/matchtags.min.js
new file mode 100644
index 00000000..1013d9ff
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/matchtags.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){"use strict";function b(a){a.state.tagHit&&a.state.tagHit.clear(),a.state.tagOther&&a.state.tagOther.clear(),a.state.tagHit=a.state.tagOther=null}function c(c){c.state.failedTagMatch=!1,c.operation((function(){if(b(c),!c.somethingSelected()){var d=c.getCursor(),e=c.getViewport();e.from=Math.min(e.from,d.line),e.to=Math.max(d.line+1,e.to);var f=a.findMatchingTag(c,d,e);if(f){if(c.state.matchBothTags){var g="open"==f.at?f.open:f.close;g&&(c.state.tagHit=c.markText(g.from,g.to,{className:"CodeMirror-matchingtag"}))}var h="close"==f.at?f.open:f.close;h?c.state.tagOther=c.markText(h.from,h.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}}}))}function d(a){a.state.failedTagMatch&&c(a)}a.defineOption("matchTags",!1,(function(e,f,g){g&&g!=a.Init&&(e.off("cursorActivity",c),e.off("viewportChange",d),b(e)),f&&(e.state.matchBothTags="object"==typeof f&&f.bothTags,e.on("cursorActivity",c),e.on("viewportChange",d),c(e))})),a.commands.toMatchingTag=function(b){var c=a.findMatchingTag(b,b.getCursor());if(c){var d="close"==c.at?c.open:c.close;d&&b.extendSelection(d.to,d.from)}}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/edit/trailingspace.js b/core/media/editors/codemirror/addon/edit/trailingspace.js
new file mode 100644
index 00000000..fa7b56be
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/trailingspace.js
@@ -0,0 +1,27 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
+    if (prev == CodeMirror.Init) prev = false;
+    if (prev && !val)
+      cm.removeOverlay("trailingspace");
+    else if (!prev && val)
+      cm.addOverlay({
+        token: function(stream) {
+          for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
+          if (i > stream.pos) { stream.pos = i; return null; }
+          stream.pos = l;
+          return "trailingspace";
+        },
+        name: "trailingspace"
+      });
+  });
+});
diff --git a/core/media/editors/codemirror/addon/edit/trailingspace.min.js b/core/media/editors/codemirror/addon/edit/trailingspace.min.js
new file mode 100644
index 00000000..994db403
--- /dev/null
+++ b/core/media/editors/codemirror/addon/edit/trailingspace.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){a.defineOption("showTrailingSpace",!1,(function(b,c,d){d==a.Init&&(d=!1),d&&!c?b.removeOverlay("trailingspace"):!d&&c&&b.addOverlay({token:function(a){for(var b=a.string.length,c=b;c&&/\s/.test(a.string.charAt(c-1));--c);return c>a.pos?(a.pos=c,null):(a.pos=b,"trailingspace")},name:"trailingspace"})}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/brace-fold.js b/core/media/editors/codemirror/addon/fold/brace-fold.js
new file mode 100644
index 00000000..13c0f0cd
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/brace-fold.js
@@ -0,0 +1,105 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("fold", "brace", function(cm, start) {
+  var line = start.line, lineText = cm.getLine(line);
+  var tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+      if (!/^(comment|string)/.test(tokenType)) return found + 1;
+      at = found - 1;
+    }
+  }
+
+  var startToken = "{", endToken = "}", startCh = findOpening("{");
+  if (startCh == null) {
+    startToken = "[", endToken = "]";
+    startCh = findOpening("[");
+  }
+
+  if (startCh == null) return;
+  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
+        if (pos == nextOpen) ++count;
+        else if (!--count) { end = i; endCh = pos; break outer; }
+      }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
+
+CodeMirror.registerHelper("fold", "import", function(cm, start) {
+  function hasImport(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type != "keyword" || start.string != "import") return null;
+    // Now find closing semicolon, return its position
+    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
+      var text = cm.getLine(i), semi = text.indexOf(";");
+      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
+    }
+  }
+
+  var startLine = start.line, has = hasImport(startLine), prev;
+  if (!has || hasImport(startLine - 1) || ((prev = hasImport(startLine - 2)) && prev.end.line == startLine - 1))
+    return null;
+  for (var end = has.end;;) {
+    var next = hasImport(end.line + 1);
+    if (next == null) break;
+    end = next.end;
+  }
+  return {from: cm.clipPos(CodeMirror.Pos(startLine, has.startCh + 1)), to: end};
+});
+
+CodeMirror.registerHelper("fold", "include", function(cm, start) {
+  function hasInclude(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
+  }
+
+  var startLine = start.line, has = hasInclude(startLine);
+  if (has == null || hasInclude(startLine - 1) != null) return null;
+  for (var end = startLine;;) {
+    var next = hasInclude(end + 1);
+    if (next == null) break;
+    ++end;
+  }
+  return {from: CodeMirror.Pos(startLine, has + 1),
+          to: cm.clipPos(CodeMirror.Pos(end))};
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/fold/brace-fold.min.js b/core/media/editors/codemirror/addon/fold/brace-fold.min.js
new file mode 100644
index 00000000..49d8c2cc
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/brace-fold.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","brace",(function(b,c){function d(d){for(var h=c.ch,i=0;;){var j=h<=0?-1:g.lastIndexOf(d,h-1);if(j!=-1){if(1==i&&j<c.ch)break;if(e=b.getTokenTypeAt(a.Pos(f,j+1)),!/^(comment|string)/.test(e))return j+1;h=j-1}else{if(1==i)break;i=1,h=g.length}}}var e,f=c.line,g=b.getLine(f),h="{",i="}",j=d("{");if(null==j&&(h="[",i="]",j=d("[")),null!=j){var k,l,m=1,n=b.lastLine();a:for(var o=f;o<=n;++o)for(var p=b.getLine(o),q=o==f?j:0;;){var r=p.indexOf(h,q),s=p.indexOf(i,q);if(r<0&&(r=p.length),s<0&&(s=p.length),q=Math.min(r,s),q==p.length)break;if(b.getTokenTypeAt(a.Pos(o,q+1))==e)if(q==r)++m;else if(!--m){k=o,l=q;break a}++q}if(null!=k&&(f!=k||l!=j))return{from:a.Pos(f,j),to:a.Pos(k,l)}}})),a.registerHelper("fold","import",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));if(/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"keyword"!=d.type||"import"!=d.string)return null;for(var e=c,f=Math.min(b.lastLine(),c+10);e<=f;++e){var g=b.getLine(e),h=g.indexOf(";");if(h!=-1)return{startCh:d.end,end:a.Pos(e,h)}}}var e,f=c.line,g=d(f);if(!g||d(f-1)||(e=d(f-2))&&e.end.line==f-1)return null;for(var h=g.end;;){var i=d(h.line+1);if(null==i)break;h=i.end}return{from:b.clipPos(a.Pos(f,g.startCh+1)),to:h}})),a.registerHelper("fold","include",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));return/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"meta"==d.type&&"#include"==d.string.slice(0,8)?d.start+8:void 0}var e=c.line,f=d(e);if(null==f||null!=d(e-1))return null;for(var g=e;;){var h=d(g+1);if(null==h)break;++g}return{from:a.Pos(e,f+1),to:b.clipPos(a.Pos(g))}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/comment-fold.js b/core/media/editors/codemirror/addon/fold/comment-fold.js
new file mode 100644
index 00000000..e8d800eb
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/comment-fold.js
@@ -0,0 +1,59 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
+  return mode.blockCommentStart && mode.blockCommentEnd;
+}, function(cm, start) {
+  var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
+  if (!startToken || !endToken) return;
+  var line = start.line, lineText = cm.getLine(line);
+
+  var startCh;
+  for (var at = start.ch, pass = 0;;) {
+    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
+    if (found == -1) {
+      if (pass == 1) return;
+      pass = 1;
+      at = lineText.length;
+      continue;
+    }
+    if (pass == 1 && found < start.ch) return;
+    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) &&
+        (found == 0 || lineText.slice(found - endToken.length, found) == endToken ||
+         !/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {
+      startCh = found + startToken.length;
+      break;
+    }
+    at = found - 1;
+  }
+
+  var depth = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (pos == nextOpen) ++depth;
+      else if (!--depth) { end = i; endCh = pos; break outer; }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/fold/comment-fold.min.js b/core/media/editors/codemirror/addon/fold/comment-fold.min.js
new file mode 100644
index 00000000..92076a37
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/comment-fold.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerGlobalHelper("fold","comment",(function(a){return a.blockCommentStart&&a.blockCommentEnd}),(function(b,c){var d=b.getModeAt(c),e=d.blockCommentStart,f=d.blockCommentEnd;if(e&&f){for(var g,h=c.line,i=b.getLine(h),j=c.ch,k=0;;){var l=j<=0?-1:i.lastIndexOf(e,j-1);if(l!=-1){if(1==k&&l<c.ch)return;if(/comment/.test(b.getTokenTypeAt(a.Pos(h,l+1)))&&(0==l||i.slice(l-f.length,l)==f||!/comment/.test(b.getTokenTypeAt(a.Pos(h,l))))){g=l+e.length;break}j=l-1}else{if(1==k)return;k=1,j=i.length}}var m,n,o=1,p=b.lastLine();a:for(var q=h;q<=p;++q)for(var r=b.getLine(q),s=q==h?g:0;;){var t=r.indexOf(e,s),u=r.indexOf(f,s);if(t<0&&(t=r.length),u<0&&(u=r.length),s=Math.min(t,u),s==r.length)break;if(s==t)++o;else if(!--o){m=q,n=s;break a}++s}if(null!=m&&(h!=m||n!=g))return{from:a.Pos(h,g),to:a.Pos(m,n)}}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/foldcode.js b/core/media/editors/codemirror/addon/fold/foldcode.js
new file mode 100644
index 00000000..826766b6
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/foldcode.js
@@ -0,0 +1,152 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function doFold(cm, pos, options, force) {
+    if (options && options.call) {
+      var finder = options;
+      options = null;
+    } else {
+      var finder = getOption(cm, options, "rangeFinder");
+    }
+    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
+    var minSize = getOption(cm, options, "minFoldSize");
+
+    function getRange(allowFolded) {
+      var range = finder(cm, pos);
+      if (!range || range.to.line - range.from.line < minSize) return null;
+      var marks = cm.findMarksAt(range.from);
+      for (var i = 0; i < marks.length; ++i) {
+        if (marks[i].__isFold && force !== "fold") {
+          if (!allowFolded) return null;
+          range.cleared = true;
+          marks[i].clear();
+        }
+      }
+      return range;
+    }
+
+    var range = getRange(true);
+    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
+      pos = CodeMirror.Pos(pos.line - 1, 0);
+      range = getRange(false);
+    }
+    if (!range || range.cleared || force === "unfold") return;
+
+    var myWidget = makeWidget(cm, options);
+    CodeMirror.on(myWidget, "mousedown", function(e) {
+      myRange.clear();
+      CodeMirror.e_preventDefault(e);
+    });
+    var myRange = cm.markText(range.from, range.to, {
+      replacedWith: myWidget,
+      clearOnEnter: getOption(cm, options, "clearOnEnter"),
+      __isFold: true
+    });
+    myRange.on("clear", function(from, to) {
+      CodeMirror.signal(cm, "unfold", cm, from, to);
+    });
+    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
+  }
+
+  function makeWidget(cm, options) {
+    var widget = getOption(cm, options, "widget");
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    } else if (widget) {
+      widget = widget.cloneNode(true)
+    }
+    return widget;
+  }
+
+  // Clumsy backwards-compatible interface
+  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
+  };
+
+  // New-style interface
+  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
+    doFold(this, pos, options, force);
+  });
+
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
+  CodeMirror.commands.toggleFold = function(cm) {
+    cm.foldCode(cm.getCursor());
+  };
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "fold");
+  };
+  CodeMirror.commands.unfold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "unfold");
+  };
+  CodeMirror.commands.foldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+    });
+  };
+  CodeMirror.commands.unfoldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+    });
+  };
+
+  CodeMirror.registerHelper("fold", "combine", function() {
+    var funcs = Array.prototype.slice.call(arguments, 0);
+    return function(cm, start) {
+      for (var i = 0; i < funcs.length; ++i) {
+        var found = funcs[i](cm, start);
+        if (found) return found;
+      }
+    };
+  });
+
+  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
+    var helpers = cm.getHelpers(start, "fold");
+    for (var i = 0; i < helpers.length; i++) {
+      var cur = helpers[i](cm, start);
+      if (cur) return cur;
+    }
+  });
+
+  var defaultOptions = {
+    rangeFinder: CodeMirror.fold.auto,
+    widget: "\u2194",
+    minFoldSize: 0,
+    scanUp: false,
+    clearOnEnter: true
+  };
+
+  CodeMirror.defineOption("foldOptions", null);
+
+  function getOption(cm, options, name) {
+    if (options && options[name] !== undefined)
+      return options[name];
+    var editorOptions = cm.options.foldOptions;
+    if (editorOptions && editorOptions[name] !== undefined)
+      return editorOptions[name];
+    return defaultOptions[name];
+  }
+
+  CodeMirror.defineExtension("foldOption", function(options, name) {
+    return getOption(this, options, name);
+  });
+});
diff --git a/core/media/editors/codemirror/addon/fold/foldcode.min.js b/core/media/editors/codemirror/addon/fold/foldcode.min.js
new file mode 100644
index 00000000..3b22c7eb
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/foldcode.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,e,f,g){function h(a){var c=i(b,e);if(!c||c.to.line-c.from.line<j)return null;for(var d=b.findMarksAt(c.from),f=0;f<d.length;++f)if(d[f].__isFold&&"fold"!==g){if(!a)return null;c.cleared=!0,d[f].clear()}return c}if(f&&f.call){var i=f;f=null}else var i=d(b,f,"rangeFinder");"number"==typeof e&&(e=a.Pos(e,0));var j=d(b,f,"minFoldSize"),k=h(!0);if(d(b,f,"scanUp"))for(;!k&&e.line>b.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}else c&&(c=c.cloneNode(!0));return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c<b.length;++c)if(b[c].__isFold)return!0})),a.commands.toggleFold=function(a){a.foldCode(a.getCursor())},a.commands.fold=function(a){a.foldCode(a.getCursor(),null,"fold")},a.commands.unfold=function(a){a.foldCode(a.getCursor(),null,"unfold")},a.commands.foldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"fold")}))},a.commands.unfoldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"unfold")}))},a.registerHelper("fold","combine",(function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;d<a.length;++d){var e=a[d](b,c);if(e)return e}}})),a.registerHelper("fold","auto",(function(a,b){for(var c=a.getHelpers(b,"fold"),d=0;d<c.length;d++){var e=c[d](a,b);if(e)return e}}));var e={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null),a.defineExtension("foldOption",(function(a,b){return d(this,a,b)}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/foldgutter.css b/core/media/editors/codemirror/addon/fold/foldgutter.css
new file mode 100644
index 00000000..ad19ae2d
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/foldgutter.css
@@ -0,0 +1,20 @@
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}
diff --git a/core/media/editors/codemirror/addon/fold/foldgutter.js b/core/media/editors/codemirror/addon/fold/foldgutter.js
new file mode 100644
index 00000000..9d323265
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/foldgutter.js
@@ -0,0 +1,146 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.clearGutter(cm.state.foldGutter.options.gutter);
+      cm.state.foldGutter = null;
+      cm.off("gutterClick", onGutterClick);
+      cm.off("change", onChange);
+      cm.off("viewportChange", onViewportChange);
+      cm.off("fold", onFold);
+      cm.off("unfold", onFold);
+      cm.off("swapDoc", onChange);
+    }
+    if (val) {
+      cm.state.foldGutter = new State(parseOptions(val));
+      updateInViewport(cm);
+      cm.on("gutterClick", onGutterClick);
+      cm.on("change", onChange);
+      cm.on("viewportChange", onViewportChange);
+      cm.on("fold", onFold);
+      cm.on("unfold", onFold);
+      cm.on("swapDoc", onChange);
+    }
+  });
+
+  var Pos = CodeMirror.Pos;
+
+  function State(options) {
+    this.options = options;
+    this.from = this.to = 0;
+  }
+
+  function parseOptions(opts) {
+    if (opts === true) opts = {};
+    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
+    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
+    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
+    return opts;
+  }
+
+  function isFolded(cm, line) {
+    var marks = cm.findMarks(Pos(line, 0), Pos(line + 1, 0));
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
+  }
+
+  function marker(spec) {
+    if (typeof spec == "string") {
+      var elt = document.createElement("div");
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
+      return elt;
+    } else {
+      return spec.cloneNode(true);
+    }
+  }
+
+  function updateFoldInfo(cm, from, to) {
+    var opts = cm.state.foldGutter.options, cur = from;
+    var minSize = cm.foldOption(opts, "minFoldSize");
+    var func = cm.foldOption(opts, "rangeFinder");
+    cm.eachLine(from, to, function(line) {
+      var mark = null;
+      if (isFolded(cm, cur)) {
+        mark = marker(opts.indicatorFolded);
+      } else {
+        var pos = Pos(cur, 0);
+        var range = func && func(cm, pos);
+        if (range && range.to.line - range.from.line >= minSize)
+          mark = marker(opts.indicatorOpen);
+      }
+      cm.setGutterMarker(line, opts.gutter, mark);
+      ++cur;
+    });
+  }
+
+  function updateInViewport(cm) {
+    var vp = cm.getViewport(), state = cm.state.foldGutter;
+    if (!state) return;
+    cm.operation(function() {
+      updateFoldInfo(cm, vp.from, vp.to);
+    });
+    state.from = vp.from; state.to = vp.to;
+  }
+
+  function onGutterClick(cm, line, gutter) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    if (gutter != opts.gutter) return;
+    var folded = isFolded(cm, line);
+    if (folded) folded.clear();
+    else cm.foldCode(Pos(line, 0), opts.rangeFinder);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    state.from = state.to = 0;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
+  }
+
+  function onViewportChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() {
+      var vp = cm.getViewport();
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        updateInViewport(cm);
+      } else {
+        cm.operation(function() {
+          if (vp.from < state.from) {
+            updateFoldInfo(cm, vp.from, state.from);
+            state.from = vp.from;
+          }
+          if (vp.to > state.to) {
+            updateFoldInfo(cm, state.to, vp.to);
+            state.to = vp.to;
+          }
+        });
+      }
+    }, opts.updateViewportTimeSpan || 400);
+  }
+
+  function onFold(cm, from) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
+    if (line >= state.from && line < state.to)
+      updateFoldInfo(cm, line, line + 1);
+  }
+});
diff --git a/core/media/editors/codemirror/addon/fold/foldgutter.min.css b/core/media/editors/codemirror/addon/fold/foldgutter.min.css
new file mode 100644
index 00000000..7ee0f2a4
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/foldgutter.min.css
@@ -0,0 +1 @@
+.CodeMirror-foldmarker{color:#00f;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-folded,.CodeMirror-foldgutter-open{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/foldgutter.min.js b/core/media/editors/codemirror/addon/fold/foldgutter.min.js
new file mode 100644
index 00000000..dbc0bb22
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/foldgutter.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options=a,this.from=this.to=0}function c(a){return a===!0&&(a={}),null==a.gutter&&(a.gutter="CodeMirror-foldgutter"),null==a.indicatorOpen&&(a.indicatorOpen="CodeMirror-foldgutter-open"),null==a.indicatorFolded&&(a.indicatorFolded="CodeMirror-foldgutter-folded"),a}function d(a,b){for(var c=a.findMarks(l(b,0),l(b+1,0)),d=0;d<c.length;++d)if(c[d].__isFold&&c[d].find().from.line==b)return c[d]}function e(a){if("string"==typeof a){var b=document.createElement("div");return b.className=a+" CodeMirror-guttermarker-subtle",b}return a.cloneNode(!0)}function f(a,b,c){var f=a.state.foldGutter.options,g=b,h=a.foldOption(f,"minFoldSize"),i=a.foldOption(f,"rangeFinder");a.eachLine(b,c,(function(b){var c=null;if(d(a,g))c=e(f.indicatorFolded);else{var j=l(g,0),k=i&&i(a,j);k&&k.to.line-k.from.line>=h&&(c=e(f.indicatorOpen))}a.setGutterMarker(b,f.gutter,c),++g}))}function g(a){var b=a.getViewport(),c=a.state.foldGutter;c&&(a.operation((function(){f(a,b.from,b.to)})),c.from=b.from,c.to=b.to)}function h(a,b,c){var e=a.state.foldGutter;if(e){var f=e.options;if(c==f.gutter){var g=d(a,b);g?g.clear():a.foldCode(l(b,0),f.rangeFinder)}}}function i(a){var b=a.state.foldGutter;if(b){var c=b.options;b.from=b.to=0,clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){g(a)}),c.foldOnChangeTimeSpan||600)}}function j(a){var b=a.state.foldGutter;if(b){var c=b.options;clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){var c=a.getViewport();b.from==b.to||c.from-b.to>20||b.from-c.to>20?g(a):a.operation((function(){c.from<b.from&&(f(a,c.from,b.from),b.from=c.from),c.to>b.to&&(f(a,b.to,c.to),b.to=c.to)}))}),c.updateViewportTimeSpan||400)}}function k(a,b){var c=a.state.foldGutter;if(c){var d=b.line;d>=c.from&&d<c.to&&f(a,d,d+1)}}a.defineOption("foldGutter",!1,(function(d,e,f){f&&f!=a.Init&&(d.clearGutter(d.state.foldGutter.options.gutter),d.state.foldGutter=null,d.off("gutterClick",h),d.off("change",i),d.off("viewportChange",j),d.off("fold",k),d.off("unfold",k),d.off("swapDoc",i)),e&&(d.state.foldGutter=new b(c(e)),g(d),d.on("gutterClick",h),d.on("change",i),d.on("viewportChange",j),d.on("fold",k),d.on("unfold",k),d.on("swapDoc",i))}));var l=a.Pos}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/indent-fold.js b/core/media/editors/codemirror/addon/fold/indent-fold.js
new file mode 100644
index 00000000..f93edec2
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/indent-fold.js
@@ -0,0 +1,48 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function lineIndent(cm, lineNo) {
+  var text = cm.getLine(lineNo)
+  var spaceTo = text.search(/\S/)
+  if (spaceTo == -1 || /\bcomment\b/.test(cm.getTokenTypeAt(CodeMirror.Pos(lineNo, spaceTo + 1))))
+    return -1
+  return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
+}
+
+CodeMirror.registerHelper("fold", "indent", function(cm, start) {
+  var myIndent = lineIndent(cm, start.line)
+  if (myIndent < 0) return
+  var lastLineInFold = null
+
+  // Go through lines until we find a line that definitely doesn't belong in
+  // the block we're folding, or to the end.
+  for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
+    var indent = lineIndent(cm, i)
+    if (indent == -1) {
+    } else if (indent > myIndent) {
+      // Lines with a greater indent are considered part of the block.
+      lastLineInFold = i;
+    } else {
+      // If this line has non-space, non-comment content, and is
+      // indented less or equal to the start line, it is the start of
+      // another block.
+      break;
+    }
+  }
+  if (lastLineInFold) return {
+    from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
+    to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
+  };
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/fold/indent-fold.min.js b/core/media/editors/codemirror/addon/fold/indent-fold.min.js
new file mode 100644
index 00000000..f5d8bca0
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/indent-fold.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c){var d=b.getLine(c),e=d.search(/\S/);return e==-1||/\bcomment\b/.test(b.getTokenTypeAt(a.Pos(c,e+1)))?-1:a.countColumn(d,null,b.getOption("tabSize"))}a.registerHelper("fold","indent",(function(c,d){var e=b(c,d.line);if(!(e<0)){for(var f=null,g=d.line+1,h=c.lastLine();g<=h;++g){var i=b(c,g);if(i==-1);else{if(!(i>e))break;f=g}}return f?{from:a.Pos(d.line,c.getLine(d.line).length),to:a.Pos(f,c.getLine(f).length)}:void 0}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/markdown-fold.js b/core/media/editors/codemirror/addon/fold/markdown-fold.js
new file mode 100644
index 00000000..ce84c946
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/markdown-fold.js
@@ -0,0 +1,49 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("fold", "markdown", function(cm, start) {
+  var maxDepth = 100;
+
+  function isHeader(lineNo) {
+    var tokentype = cm.getTokenTypeAt(CodeMirror.Pos(lineNo, 0));
+    return tokentype && /\bheader\b/.test(tokentype);
+  }
+
+  function headerLevel(lineNo, line, nextLine) {
+    var match = line && line.match(/^#+/);
+    if (match && isHeader(lineNo)) return match[0].length;
+    match = nextLine && nextLine.match(/^[=\-]+\s*$/);
+    if (match && isHeader(lineNo + 1)) return nextLine[0] == "=" ? 1 : 2;
+    return maxDepth;
+  }
+
+  var firstLine = cm.getLine(start.line), nextLine = cm.getLine(start.line + 1);
+  var level = headerLevel(start.line, firstLine, nextLine);
+  if (level === maxDepth) return undefined;
+
+  var lastLineNo = cm.lastLine();
+  var end = start.line, nextNextLine = cm.getLine(end + 2);
+  while (end < lastLineNo) {
+    if (headerLevel(end + 1, nextLine, nextNextLine) <= level) break;
+    ++end;
+    nextLine = nextNextLine;
+    nextNextLine = cm.getLine(end + 2);
+  }
+
+  return {
+    from: CodeMirror.Pos(start.line, firstLine.length),
+    to: CodeMirror.Pos(end, cm.getLine(end).length)
+  };
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/fold/markdown-fold.min.js b/core/media/editors/codemirror/addon/fold/markdown-fold.min.js
new file mode 100644
index 00000000..2bc2d494
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/markdown-fold.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","markdown",(function(b,c){function d(c){var d=b.getTokenTypeAt(a.Pos(c,0));return d&&/\bheader\b/.test(d)}function e(a,b,c){var e=b&&b.match(/^#+/);return e&&d(a)?e[0].length:(e=c&&c.match(/^[=\-]+\s*$/),e&&d(a+1)?"="==c[0]?1:2:f)}var f=100,g=b.getLine(c.line),h=b.getLine(c.line+1),i=e(c.line,g,h);if(i!==f){for(var j=b.lastLine(),k=c.line,l=b.getLine(k+2);k<j&&!(e(k+1,h,l)<=i);)++k,h=l,l=b.getLine(k+2);return{from:a.Pos(c.line,g.length),to:a.Pos(k,b.getLine(k).length)}}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/fold/xml-fold.js b/core/media/editors/codemirror/addon/fold/xml-fold.js
new file mode 100644
index 00000000..867ecb5c
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/xml-fold.js
@@ -0,0 +1,184 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
+
+  var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
+  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
+  var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
+
+  function Iter(cm, line, ch, range) {
+    this.line = line; this.ch = ch;
+    this.cm = cm; this.text = cm.getLine(line);
+    this.min = range ? Math.max(range.from, cm.firstLine()) : cm.firstLine();
+    this.max = range ? Math.min(range.to - 1, cm.lastLine()) : cm.lastLine();
+  }
+
+  function tagAt(iter, ch) {
+    var type = iter.cm.getTokenTypeAt(Pos(iter.line, ch));
+    return type && /\btag\b/.test(type);
+  }
+
+  function nextLine(iter) {
+    if (iter.line >= iter.max) return;
+    iter.ch = 0;
+    iter.text = iter.cm.getLine(++iter.line);
+    return true;
+  }
+  function prevLine(iter) {
+    if (iter.line <= iter.min) return;
+    iter.text = iter.cm.getLine(--iter.line);
+    iter.ch = iter.text.length;
+    return true;
+  }
+
+  function toTagEnd(iter) {
+    for (;;) {
+      var gt = iter.text.indexOf(">", iter.ch);
+      if (gt == -1) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt + 1; continue; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
+  function toTagStart(iter) {
+    for (;;) {
+      var lt = iter.ch ? iter.text.lastIndexOf("<", iter.ch - 1) : -1;
+      if (lt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
+      xmlTagStart.lastIndex = lt;
+      iter.ch = lt;
+      var match = xmlTagStart.exec(iter.text);
+      if (match && match.index == lt) return match;
+    }
+  }
+
+  function toNextTag(iter) {
+    for (;;) {
+      xmlTagStart.lastIndex = iter.ch;
+      var found = xmlTagStart.exec(iter.text);
+      if (!found) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, found.index + 1)) { iter.ch = found.index + 1; continue; }
+      iter.ch = found.index + found[0].length;
+      return found;
+    }
+  }
+  function toPrevTag(iter) {
+    for (;;) {
+      var gt = iter.ch ? iter.text.lastIndexOf(">", iter.ch - 1) : -1;
+      if (gt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
+
+  function findMatchingClose(iter, tag) {
+    var stack = [];
+    for (;;) {
+      var next = toNextTag(iter), end, startLine = iter.line, startCh = iter.ch - (next ? next[0].length : 0);
+      if (!next || !(end = toTagEnd(iter))) return;
+      if (end == "selfClose") continue;
+      if (next[1]) { // closing tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == next[2]) {
+          stack.length = i;
+          break;
+        }
+        if (i < 0 && (!tag || tag == next[2])) return {
+          tag: next[2],
+          from: Pos(startLine, startCh),
+          to: Pos(iter.line, iter.ch)
+        };
+      } else { // opening tag
+        stack.push(next[2]);
+      }
+    }
+  }
+  function findMatchingOpen(iter, tag) {
+    var stack = [];
+    for (;;) {
+      var prev = toPrevTag(iter);
+      if (!prev) return;
+      if (prev == "selfClose") { toTagStart(iter); continue; }
+      var endLine = iter.line, endCh = iter.ch;
+      var start = toTagStart(iter);
+      if (!start) return;
+      if (start[1]) { // closing tag
+        stack.push(start[2]);
+      } else { // opening tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == start[2]) {
+          stack.length = i;
+          break;
+        }
+        if (i < 0 && (!tag || tag == start[2])) return {
+          tag: start[2],
+          from: Pos(iter.line, iter.ch),
+          to: Pos(endLine, endCh)
+        };
+      }
+    }
+  }
+
+  CodeMirror.registerHelper("fold", "xml", function(cm, start) {
+    var iter = new Iter(cm, start.line, 0);
+    for (;;) {
+      var openTag = toNextTag(iter)
+      if (!openTag || iter.line != start.line) return
+      var end = toTagEnd(iter)
+      if (!end) return
+      if (!openTag[1] && end != "selfClose") {
+        var startPos = Pos(iter.line, iter.ch);
+        var endPos = findMatchingClose(iter, openTag[2]);
+        return endPos && cmp(endPos.from, startPos) > 0 ? {from: startPos, to: endPos.from} : null
+      }
+    }
+  });
+  CodeMirror.findMatchingTag = function(cm, pos, range) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
+    if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
+    var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
+    var start = end && toTagStart(iter);
+    if (!end || !start || cmp(iter, pos) > 0) return;
+    var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
+    if (end == "selfClose") return {open: here, close: null, at: "open"};
+
+    if (start[1]) { // closing tag
+      return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
+    } else { // opening tag
+      iter = new Iter(cm, to.line, to.ch, range);
+      return {open: here, close: findMatchingClose(iter, start[2]), at: "open"};
+    }
+  };
+
+  CodeMirror.findEnclosingTag = function(cm, pos, range, tag) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
+    for (;;) {
+      var open = findMatchingOpen(iter, tag);
+      if (!open) break;
+      var forward = new Iter(cm, pos.line, pos.ch, range);
+      var close = findMatchingClose(forward, open.tag);
+      if (close) return {open: open, close: close};
+    }
+  };
+
+  // Used by addon/edit/closetag.js
+  CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
+    var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
+    return findMatchingClose(iter, name);
+  };
+});
diff --git a/core/media/editors/codemirror/addon/fold/xml-fold.min.js b/core/media/editors/codemirror/addon/fold/xml-fold.min.js
new file mode 100644
index 00000000..c74f1659
--- /dev/null
+++ b/core/media/editors/codemirror/addon/fold/xml-fold.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line-b.line||a.ch-b.ch}function c(a,b,c,d){this.line=b,this.ch=c,this.cm=a,this.text=a.getLine(b),this.min=d?Math.max(d.from,a.firstLine()):a.firstLine(),this.max=d?Math.min(d.to-1,a.lastLine()):a.lastLine()}function d(a,b){var c=a.cm.getTokenTypeAt(m(a.line,b));return c&&/\btag\b/.test(c)}function e(a){if(!(a.line>=a.max))return a.ch=0,a.text=a.cm.getLine(++a.line),!0}function f(a){if(!(a.line<=a.min))return a.text=a.cm.getLine(--a.line),a.ch=a.text.length,!0}function g(a){for(;;){var b=a.text.indexOf(">",a.ch);if(b==-1){if(e(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),f=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,f?"selfClose":"regular"}a.ch=b+1}}}function h(a){for(;;){var b=a.ch?a.text.lastIndexOf("<",a.ch-1):-1;if(b==-1){if(f(a))continue;return}if(d(a,b+1)){p.lastIndex=b,a.ch=b;var c=p.exec(a.text);if(c&&c.index==b)return c}else a.ch=b}}function i(a){for(;;){p.lastIndex=a.ch;var b=p.exec(a.text);if(!b){if(e(a))continue;return}{if(d(a,b.index+1))return a.ch=b.index+b[0].length,b;a.ch=b.index+1}}}function j(a){for(;;){var b=a.ch?a.text.lastIndexOf(">",a.ch-1):-1;if(b==-1){if(f(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),e=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,e?"selfClose":"regular"}a.ch=b}}}function k(a,b){for(var c=[];;){var d,e=i(a),f=a.line,h=a.ch-(e?e[0].length:0);if(!e||!(d=g(a)))return;if("selfClose"!=d)if(e[1]){for(var j=c.length-1;j>=0;--j)if(c[j]==e[2]){c.length=j;break}if(j<0&&(!b||b==e[2]))return{tag:e[2],from:m(f,h),to:m(a.line,a.ch)}}else c.push(e[2])}}function l(a,b){for(var c=[];;){var d=j(a);if(!d)return;if("selfClose"!=d){var e=a.line,f=a.ch,g=h(a);if(!g)return;if(g[1])c.push(g[2]);else{for(var i=c.length-1;i>=0;--i)if(c[i]==g[2]){c.length=i;break}if(i<0&&(!b||b==g[2]))return{tag:g[2],from:m(a.line,a.ch),to:m(e,f)}}}else h(a)}}var m=a.Pos,n="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",o=n+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",p=new RegExp("<(/?)(["+n+"]["+o+"]*)","g");a.registerHelper("fold","xml",(function(a,d){for(var e=new c(a,d.line,0);;){var f=i(e);if(!f||e.line!=d.line)return;var h=g(e);if(!h)return;if(!f[1]&&"selfClose"!=h){var j=m(e.line,e.ch),l=k(e,f[2]);return l&&b(l.from,j)>0?{from:j,to:l.from}:null}}})),a.findMatchingTag=function(a,d,e){var f=new c(a,d.line,d.ch,e);if(f.text.indexOf(">")!=-1||f.text.indexOf("<")!=-1){var i=g(f),j=i&&m(f.line,f.ch),n=i&&h(f);if(i&&n&&!(b(f,d)>0)){var o={from:m(f.line,f.ch),to:j,tag:n[2]};return"selfClose"==i?{open:o,close:null,at:"open"}:n[1]?{open:l(f,n[2]),close:o,at:"close"}:(f=new c(a,j.line,j.ch,e),{open:o,close:k(f,n[2]),at:"open"})}}},a.findEnclosingTag=function(a,b,d,e){for(var f=new c(a,b.line,b.ch,d);;){var g=l(f,e);if(!g)break;var h=new c(a,b.line,b.ch,d),i=k(h,g.tag);if(i)return{open:g,close:i}}},a.scanForClosingTag=function(a,b,d,e){var f=new c(a,b.line,b.ch,e?{from:0,to:e}:null);return k(f,d)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/anyword-hint.js b/core/media/editors/codemirror/addon/hint/anyword-hint.js
new file mode 100644
index 00000000..dae78e2e
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/anyword-hint.js
@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var WORD = /[\w$]+/, RANGE = 500;
+
+  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
+    var word = options && options.word || WORD;
+    var range = options && options.range || RANGE;
+    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
+    var end = cur.ch, start = end;
+    while (start && word.test(curLine.charAt(start - 1))) --start;
+    var curWord = start != end && curLine.slice(start, end);
+
+    var list = options && options.list || [], seen = {};
+    var re = new RegExp(word.source, "g");
+    for (var dir = -1; dir <= 1; dir += 2) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
+        var text = editor.getLine(line), m;
+        while (m = re.exec(text)) {
+          if (line == cur.line && m[0] === curWord) continue;
+          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
+            seen[m[0]] = true;
+            list.push(m[0]);
+          }
+        }
+      }
+    }
+    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
+  });
+});
diff --git a/core/media/editors/codemirror/addon/hint/anyword-hint.min.js b/core/media/editors/codemirror/addon/hint/anyword-hint.min.js
new file mode 100644
index 00000000..575fe4d9
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/anyword-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";var b=/[\w$]+/,c=500;a.registerHelper("hint","anyword",(function(d,e){for(var f=e&&e.word||b,g=e&&e.range||c,h=d.getCursor(),i=d.getLine(h.line),j=h.ch,k=j;k&&f.test(i.charAt(k-1));)--k;for(var l=k!=j&&i.slice(k,j),m=e&&e.list||[],n={},o=new RegExp(f.source,"g"),p=-1;p<=1;p+=2)for(var q=h.line,r=Math.min(Math.max(q+p*g,d.firstLine()),d.lastLine())+p;q!=r;q+=p)for(var s,t=d.getLine(q);s=o.exec(t);)q==h.line&&s[0]===l||l&&0!=s[0].lastIndexOf(l,0)||Object.prototype.hasOwnProperty.call(n,s[0])||(n[s[0]]=!0,m.push(s[0]));return{list:m,from:a.Pos(h.line,k),to:a.Pos(h.line,j)}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/css-hint.js b/core/media/editors/codemirror/addon/hint/css-hint.js
new file mode 100644
index 00000000..22642727
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/css-hint.js
@@ -0,0 +1,60 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
+                       "first-letter": 1, "first-line": 1, "first-child": 1,
+                       before: 1, after: 1, lang: 1};
+
+  CodeMirror.registerHelper("hint", "css", function(cm) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (inner.mode.name != "css") return;
+
+    if (token.type == "keyword" && "!important".indexOf(token.string) == 0)
+      return {list: ["!important"], from: CodeMirror.Pos(cur.line, token.start),
+              to: CodeMirror.Pos(cur.line, token.end)};
+
+    var start = token.start, end = cur.ch, word = token.string.slice(0, end - start);
+    if (/[^\w$_-]/.test(word)) {
+      word = ""; start = end = cur.ch;
+    }
+
+    var spec = CodeMirror.resolveMode("text/css");
+
+    var result = [];
+    function add(keywords) {
+      for (var name in keywords)
+        if (!word || name.lastIndexOf(word, 0) == 0)
+          result.push(name);
+    }
+
+    var st = inner.state.state;
+    if (st == "pseudo" || token.type == "variable-3") {
+      add(pseudoClasses);
+    } else if (st == "block" || st == "maybeprop") {
+      add(spec.propertyKeywords);
+    } else if (st == "prop" || st == "parens" || st == "at" || st == "params") {
+      add(spec.valueKeywords);
+      add(spec.colorKeywords);
+    } else if (st == "media" || st == "media_parens") {
+      add(spec.mediaTypes);
+      add(spec.mediaFeatures);
+    }
+
+    if (result.length) return {
+      list: result,
+      from: CodeMirror.Pos(cur.line, start),
+      to: CodeMirror.Pos(cur.line, end)
+    };
+  });
+});
diff --git a/core/media/editors/codemirror/addon/hint/css-hint.min.js b/core/media/editors/codemirror/addon/hint/css-hint.min.js
new file mode 100644
index 00000000..02bac741
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/css-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/css/css"],a):a(CodeMirror)})((function(a){"use strict";var b={link:1,visited:1,active:1,hover:1,focus:1,"first-letter":1,"first-line":1,"first-child":1,before:1,after:1,lang:1};a.registerHelper("hint","css",(function(c){function d(a){for(var b in a)j&&0!=b.lastIndexOf(j,0)||l.push(b)}var e=c.getCursor(),f=c.getTokenAt(e),g=a.innerMode(c.getMode(),f.state);if("css"==g.mode.name){if("keyword"==f.type&&0=="!important".indexOf(f.string))return{list:["!important"],from:a.Pos(e.line,f.start),to:a.Pos(e.line,f.end)};var h=f.start,i=e.ch,j=f.string.slice(0,i-h);/[^\w$_-]/.test(j)&&(j="",h=i=e.ch);var k=a.resolveMode("text/css"),l=[],m=g.state.state;return"pseudo"==m||"variable-3"==f.type?d(b):"block"==m||"maybeprop"==m?d(k.propertyKeywords):"prop"==m||"parens"==m||"at"==m||"params"==m?(d(k.valueKeywords),d(k.colorKeywords)):"media"!=m&&"media_parens"!=m||(d(k.mediaTypes),d(k.mediaFeatures)),l.length?{list:l,from:a.Pos(e.line,h),to:a.Pos(e.line,i)}:void 0}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/html-hint.js b/core/media/editors/codemirror/addon/hint/html-hint.js
new file mode 100644
index 00000000..c6769bca
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/html-hint.js
@@ -0,0 +1,348 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./xml-hint"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./xml-hint"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
+  var targets = ["_blank", "_self", "_top", "_parent"];
+  var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
+  var methods = ["get", "post", "put", "delete"];
+  var encs = ["application/x-www-form-urlencoded", "multipart/form-data", "text/plain"];
+  var media = ["all", "screen", "print", "embossed", "braille", "handheld", "print", "projection", "screen", "tty", "tv", "speech",
+               "3d-glasses", "resolution [>][<][=] [X]", "device-aspect-ratio: X/Y", "orientation:portrait",
+               "orientation:landscape", "device-height: [X]", "device-width: [X]"];
+  var s = { attrs: {} }; // Simple tag, reused for a whole lot of tags
+
+  var data = {
+    a: {
+      attrs: {
+        href: null, ping: null, type: null,
+        media: media,
+        target: targets,
+        hreflang: langs
+      }
+    },
+    abbr: s,
+    acronym: s,
+    address: s,
+    applet: s,
+    area: {
+      attrs: {
+        alt: null, coords: null, href: null, target: null, ping: null,
+        media: media, hreflang: langs, type: null,
+        shape: ["default", "rect", "circle", "poly"]
+      }
+    },
+    article: s,
+    aside: s,
+    audio: {
+      attrs: {
+        src: null, mediagroup: null,
+        crossorigin: ["anonymous", "use-credentials"],
+        preload: ["none", "metadata", "auto"],
+        autoplay: ["", "autoplay"],
+        loop: ["", "loop"],
+        controls: ["", "controls"]
+      }
+    },
+    b: s,
+    base: { attrs: { href: null, target: targets } },
+    basefont: s,
+    bdi: s,
+    bdo: s,
+    big: s,
+    blockquote: { attrs: { cite: null } },
+    body: s,
+    br: s,
+    button: {
+      attrs: {
+        form: null, formaction: null, name: null, value: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "autofocus"],
+        formenctype: encs,
+        formmethod: methods,
+        formnovalidate: ["", "novalidate"],
+        formtarget: targets,
+        type: ["submit", "reset", "button"]
+      }
+    },
+    canvas: { attrs: { width: null, height: null } },
+    caption: s,
+    center: s,
+    cite: s,
+    code: s,
+    col: { attrs: { span: null } },
+    colgroup: { attrs: { span: null } },
+    command: {
+      attrs: {
+        type: ["command", "checkbox", "radio"],
+        label: null, icon: null, radiogroup: null, command: null, title: null,
+        disabled: ["", "disabled"],
+        checked: ["", "checked"]
+      }
+    },
+    data: { attrs: { value: null } },
+    datagrid: { attrs: { disabled: ["", "disabled"], multiple: ["", "multiple"] } },
+    datalist: { attrs: { data: null } },
+    dd: s,
+    del: { attrs: { cite: null, datetime: null } },
+    details: { attrs: { open: ["", "open"] } },
+    dfn: s,
+    dir: s,
+    div: s,
+    dl: s,
+    dt: s,
+    em: s,
+    embed: { attrs: { src: null, type: null, width: null, height: null } },
+    eventsource: { attrs: { src: null } },
+    fieldset: { attrs: { disabled: ["", "disabled"], form: null, name: null } },
+    figcaption: s,
+    figure: s,
+    font: s,
+    footer: s,
+    form: {
+      attrs: {
+        action: null, name: null,
+        "accept-charset": charsets,
+        autocomplete: ["on", "off"],
+        enctype: encs,
+        method: methods,
+        novalidate: ["", "novalidate"],
+        target: targets
+      }
+    },
+    frame: s,
+    frameset: s,
+    h1: s, h2: s, h3: s, h4: s, h5: s, h6: s,
+    head: {
+      attrs: {},
+      children: ["title", "base", "link", "style", "meta", "script", "noscript", "command"]
+    },
+    header: s,
+    hgroup: s,
+    hr: s,
+    html: {
+      attrs: { manifest: null },
+      children: ["head", "body"]
+    },
+    i: s,
+    iframe: {
+      attrs: {
+        src: null, srcdoc: null, name: null, width: null, height: null,
+        sandbox: ["allow-top-navigation", "allow-same-origin", "allow-forms", "allow-scripts"],
+        seamless: ["", "seamless"]
+      }
+    },
+    img: {
+      attrs: {
+        alt: null, src: null, ismap: null, usemap: null, width: null, height: null,
+        crossorigin: ["anonymous", "use-credentials"]
+      }
+    },
+    input: {
+      attrs: {
+        alt: null, dirname: null, form: null, formaction: null,
+        height: null, list: null, max: null, maxlength: null, min: null,
+        name: null, pattern: null, placeholder: null, size: null, src: null,
+        step: null, value: null, width: null,
+        accept: ["audio/*", "video/*", "image/*"],
+        autocomplete: ["on", "off"],
+        autofocus: ["", "autofocus"],
+        checked: ["", "checked"],
+        disabled: ["", "disabled"],
+        formenctype: encs,
+        formmethod: methods,
+        formnovalidate: ["", "novalidate"],
+        formtarget: targets,
+        multiple: ["", "multiple"],
+        readonly: ["", "readonly"],
+        required: ["", "required"],
+        type: ["hidden", "text", "search", "tel", "url", "email", "password", "datetime", "date", "month",
+               "week", "time", "datetime-local", "number", "range", "color", "checkbox", "radio",
+               "file", "submit", "image", "reset", "button"]
+      }
+    },
+    ins: { attrs: { cite: null, datetime: null } },
+    kbd: s,
+    keygen: {
+      attrs: {
+        challenge: null, form: null, name: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        keytype: ["RSA"]
+      }
+    },
+    label: { attrs: { "for": null, form: null } },
+    legend: s,
+    li: { attrs: { value: null } },
+    link: {
+      attrs: {
+        href: null, type: null,
+        hreflang: langs,
+        media: media,
+        sizes: ["all", "16x16", "16x16 32x32", "16x16 32x32 64x64"]
+      }
+    },
+    map: { attrs: { name: null } },
+    mark: s,
+    menu: { attrs: { label: null, type: ["list", "context", "toolbar"] } },
+    meta: {
+      attrs: {
+        content: null,
+        charset: charsets,
+        name: ["viewport", "application-name", "author", "description", "generator", "keywords"],
+        "http-equiv": ["content-language", "content-type", "default-style", "refresh"]
+      }
+    },
+    meter: { attrs: { value: null, min: null, low: null, high: null, max: null, optimum: null } },
+    nav: s,
+    noframes: s,
+    noscript: s,
+    object: {
+      attrs: {
+        data: null, type: null, name: null, usemap: null, form: null, width: null, height: null,
+        typemustmatch: ["", "typemustmatch"]
+      }
+    },
+    ol: { attrs: { reversed: ["", "reversed"], start: null, type: ["1", "a", "A", "i", "I"] } },
+    optgroup: { attrs: { disabled: ["", "disabled"], label: null } },
+    option: { attrs: { disabled: ["", "disabled"], label: null, selected: ["", "selected"], value: null } },
+    output: { attrs: { "for": null, form: null, name: null } },
+    p: s,
+    param: { attrs: { name: null, value: null } },
+    pre: s,
+    progress: { attrs: { value: null, max: null } },
+    q: { attrs: { cite: null } },
+    rp: s,
+    rt: s,
+    ruby: s,
+    s: s,
+    samp: s,
+    script: {
+      attrs: {
+        type: ["text/javascript"],
+        src: null,
+        async: ["", "async"],
+        defer: ["", "defer"],
+        charset: charsets
+      }
+    },
+    section: s,
+    select: {
+      attrs: {
+        form: null, name: null, size: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        multiple: ["", "multiple"]
+      }
+    },
+    small: s,
+    source: { attrs: { src: null, type: null, media: null } },
+    span: s,
+    strike: s,
+    strong: s,
+    style: {
+      attrs: {
+        type: ["text/css"],
+        media: media,
+        scoped: null
+      }
+    },
+    sub: s,
+    summary: s,
+    sup: s,
+    table: s,
+    tbody: s,
+    td: { attrs: { colspan: null, rowspan: null, headers: null } },
+    textarea: {
+      attrs: {
+        dirname: null, form: null, maxlength: null, name: null, placeholder: null,
+        rows: null, cols: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        readonly: ["", "readonly"],
+        required: ["", "required"],
+        wrap: ["soft", "hard"]
+      }
+    },
+    tfoot: s,
+    th: { attrs: { colspan: null, rowspan: null, headers: null, scope: ["row", "col", "rowgroup", "colgroup"] } },
+    thead: s,
+    time: { attrs: { datetime: null } },
+    title: s,
+    tr: s,
+    track: {
+      attrs: {
+        src: null, label: null, "default": null,
+        kind: ["subtitles", "captions", "descriptions", "chapters", "metadata"],
+        srclang: langs
+      }
+    },
+    tt: s,
+    u: s,
+    ul: s,
+    "var": s,
+    video: {
+      attrs: {
+        src: null, poster: null, width: null, height: null,
+        crossorigin: ["anonymous", "use-credentials"],
+        preload: ["auto", "metadata", "none"],
+        autoplay: ["", "autoplay"],
+        mediagroup: ["movie"],
+        muted: ["", "muted"],
+        controls: ["", "controls"]
+      }
+    },
+    wbr: s
+  };
+
+  var globalAttrs = {
+    accesskey: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    "class": null,
+    contenteditable: ["true", "false"],
+    contextmenu: null,
+    dir: ["ltr", "rtl", "auto"],
+    draggable: ["true", "false", "auto"],
+    dropzone: ["copy", "move", "link", "string:", "file:"],
+    hidden: ["hidden"],
+    id: null,
+    inert: ["inert"],
+    itemid: null,
+    itemprop: null,
+    itemref: null,
+    itemscope: ["itemscope"],
+    itemtype: null,
+    lang: ["en", "es"],
+    spellcheck: ["true", "false"],
+    style: null,
+    tabindex: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    title: null,
+    translate: ["yes", "no"],
+    onclick: null,
+    rel: ["stylesheet", "alternate", "author", "bookmark", "help", "license", "next", "nofollow", "noreferrer", "prefetch", "prev", "search", "tag"]
+  };
+  function populate(obj) {
+    for (var attr in globalAttrs) if (globalAttrs.hasOwnProperty(attr))
+      obj.attrs[attr] = globalAttrs[attr];
+  }
+
+  populate(s);
+  for (var tag in data) if (data.hasOwnProperty(tag) && data[tag] != s)
+    populate(data[tag]);
+
+  CodeMirror.htmlSchema = data;
+  function htmlHint(cm, options) {
+    var local = {schemaInfo: data};
+    if (options) for (var opt in options) local[opt] = options[opt];
+    return CodeMirror.hint.xml(cm, local);
+  }
+  CodeMirror.registerHelper("hint", "html", htmlHint);
+});
diff --git a/core/media/editors/codemirror/addon/hint/html-hint.min.js b/core/media/editors/codemirror/addon/hint/html-hint.min.js
new file mode 100644
index 00000000..cd649c18
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/html-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./xml-hint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./xml-hint"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b in l)l.hasOwnProperty(b)&&(a.attrs[b]=l[b])}function c(b,c){var d={schemaInfo:k};if(c)for(var e in c)d[e]=c[e];return a.hint.xml(b,d)}var d="ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" "),e=["_blank","_self","_top","_parent"],f=["ascii","utf-8","utf-16","latin1","latin1"],g=["get","post","put","delete"],h=["application/x-www-form-urlencoded","multipart/form-data","text/plain"],i=["all","screen","print","embossed","braille","handheld","print","projection","screen","tty","tv","speech","3d-glasses","resolution [>][<][=] [X]","device-aspect-ratio: X/Y","orientation:portrait","orientation:landscape","device-height: [X]","device-width: [X]"],j={attrs:{}},k={a:{attrs:{href:null,ping:null,type:null,media:i,target:e,hreflang:d}},abbr:j,acronym:j,address:j,applet:j,area:{attrs:{alt:null,coords:null,href:null,target:null,ping:null,media:i,hreflang:d,type:null,shape:["default","rect","circle","poly"]}},article:j,aside:j,audio:{attrs:{src:null,mediagroup:null,crossorigin:["anonymous","use-credentials"],preload:["none","metadata","auto"],autoplay:["","autoplay"],loop:["","loop"],controls:["","controls"]}},b:j,base:{attrs:{href:null,target:e}},basefont:j,bdi:j,bdo:j,big:j,blockquote:{attrs:{cite:null}},body:j,br:j,button:{attrs:{form:null,formaction:null,name:null,value:null,autofocus:["","autofocus"],disabled:["","autofocus"],formenctype:h,formmethod:g,formnovalidate:["","novalidate"],formtarget:e,type:["submit","reset","button"]}},canvas:{attrs:{width:null,height:null}},caption:j,center:j,cite:j,code:j,col:{attrs:{span:null}},colgroup:{attrs:{span:null}},command:{attrs:{type:["command","checkbox","radio"],label:null,icon:null,radiogroup:null,command:null,title:null,disabled:["","disabled"],checked:["","checked"]}},data:{attrs:{value:null}},datagrid:{attrs:{disabled:["","disabled"],multiple:["","multiple"]}},datalist:{attrs:{data:null}},dd:j,del:{attrs:{cite:null,datetime:null}},details:{attrs:{open:["","open"]}},dfn:j,dir:j,div:j,dl:j,dt:j,em:j,embed:{attrs:{src:null,type:null,width:null,height:null}},eventsource:{attrs:{src:null}},fieldset:{attrs:{disabled:["","disabled"],form:null,name:null}},figcaption:j,figure:j,font:j,footer:j,form:{attrs:{action:null,name:null,"accept-charset":f,autocomplete:["on","off"],enctype:h,method:g,novalidate:["","novalidate"],target:e}},frame:j,frameset:j,h1:j,h2:j,h3:j,h4:j,h5:j,h6:j,head:{attrs:{},children:["title","base","link","style","meta","script","noscript","command"]},header:j,hgroup:j,hr:j,html:{attrs:{manifest:null},children:["head","body"]},i:j,iframe:{attrs:{src:null,srcdoc:null,name:null,width:null,height:null,sandbox:["allow-top-navigation","allow-same-origin","allow-forms","allow-scripts"],seamless:["","seamless"]}},img:{attrs:{alt:null,src:null,ismap:null,usemap:null,width:null,height:null,crossorigin:["anonymous","use-credentials"]}},input:{attrs:{alt:null,dirname:null,form:null,formaction:null,height:null,list:null,max:null,maxlength:null,min:null,name:null,pattern:null,placeholder:null,size:null,src:null,step:null,value:null,width:null,accept:["audio/*","video/*","image/*"],autocomplete:["on","off"],autofocus:["","autofocus"],checked:["","checked"],disabled:["","disabled"],formenctype:h,formmethod:g,formnovalidate:["","novalidate"],formtarget:e,multiple:["","multiple"],readonly:["","readonly"],required:["","required"],type:["hidden","text","search","tel","url","email","password","datetime","date","month","week","time","datetime-local","number","range","color","checkbox","radio","file","submit","image","reset","button"]}},ins:{attrs:{cite:null,datetime:null}},kbd:j,keygen:{attrs:{challenge:null,form:null,name:null,autofocus:["","autofocus"],disabled:["","disabled"],keytype:["RSA"]}},label:{attrs:{for:null,form:null}},legend:j,li:{attrs:{value:null}},link:{attrs:{href:null,type:null,hreflang:d,media:i,sizes:["all","16x16","16x16 32x32","16x16 32x32 64x64"]}},map:{attrs:{name:null}},mark:j,menu:{attrs:{label:null,type:["list","context","toolbar"]}},meta:{attrs:{content:null,charset:f,name:["viewport","application-name","author","description","generator","keywords"],"http-equiv":["content-language","content-type","default-style","refresh"]}},meter:{attrs:{value:null,min:null,low:null,high:null,max:null,optimum:null}},nav:j,noframes:j,noscript:j,object:{attrs:{data:null,type:null,name:null,usemap:null,form:null,width:null,height:null,typemustmatch:["","typemustmatch"]}},ol:{attrs:{reversed:["","reversed"],start:null,type:["1","a","A","i","I"]}},optgroup:{attrs:{disabled:["","disabled"],label:null}},option:{attrs:{disabled:["","disabled"],label:null,selected:["","selected"],value:null}},output:{attrs:{for:null,form:null,name:null}},p:j,param:{attrs:{name:null,value:null}},pre:j,progress:{attrs:{value:null,max:null}},q:{attrs:{cite:null}},rp:j,rt:j,ruby:j,s:j,samp:j,script:{attrs:{type:["text/javascript"],src:null,async:["","async"],defer:["","defer"],charset:f}},section:j,select:{attrs:{form:null,name:null,size:null,autofocus:["","autofocus"],disabled:["","disabled"],multiple:["","multiple"]}},small:j,source:{attrs:{src:null,type:null,media:null}},span:j,strike:j,strong:j,style:{attrs:{type:["text/css"],media:i,scoped:null}},sub:j,summary:j,sup:j,table:j,tbody:j,td:{attrs:{colspan:null,rowspan:null,headers:null}},textarea:{attrs:{dirname:null,form:null,maxlength:null,name:null,placeholder:null,rows:null,cols:null,autofocus:["","autofocus"],disabled:["","disabled"],readonly:["","readonly"],required:["","required"],wrap:["soft","hard"]}},tfoot:j,th:{attrs:{colspan:null,rowspan:null,headers:null,scope:["row","col","rowgroup","colgroup"]}},thead:j,time:{attrs:{datetime:null}},title:j,tr:j,track:{attrs:{src:null,label:null,default:null,kind:["subtitles","captions","descriptions","chapters","metadata"],srclang:d}},tt:j,u:j,ul:j,var:j,video:{attrs:{src:null,poster:null,width:null,height:null,crossorigin:["anonymous","use-credentials"],preload:["auto","metadata","none"],autoplay:["","autoplay"],mediagroup:["movie"],muted:["","muted"],controls:["","controls"]}},wbr:j},l={accesskey:["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"],class:null,contenteditable:["true","false"],contextmenu:null,dir:["ltr","rtl","auto"],draggable:["true","false","auto"],dropzone:["copy","move","link","string:","file:"],hidden:["hidden"],id:null,inert:["inert"],itemid:null,itemprop:null,itemref:null,itemscope:["itemscope"],itemtype:null,lang:["en","es"],spellcheck:["true","false"],style:null,tabindex:["1","2","3","4","5","6","7","8","9"],title:null,translate:["yes","no"],onclick:null,rel:["stylesheet","alternate","author","bookmark","help","license","next","nofollow","noreferrer","prefetch","prev","search","tag"]};b(j);for(var m in k)k.hasOwnProperty(m)&&k[m]!=j&&b(k[m]);a.htmlSchema=k,a.registerHelper("hint","html",c)}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/javascript-hint.js b/core/media/editors/codemirror/addon/hint/javascript-hint.js
new file mode 100644
index 00000000..f6ab2a2e
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/javascript-hint.js
@@ -0,0 +1,157 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var Pos = CodeMirror.Pos;
+
+  function forEach(arr, f) {
+    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
+  }
+
+  function arrayContains(arr, item) {
+    if (!Array.prototype.indexOf) {
+      var i = arr.length;
+      while (i--) {
+        if (arr[i] === item) {
+          return true;
+        }
+      }
+      return false;
+    }
+    return arr.indexOf(item) != -1;
+  }
+
+  function scriptHint(editor, keywords, getToken, options) {
+    // Find the token at the cursor
+    var cur = editor.getCursor(), token = getToken(editor, cur);
+    if (/\b(?:string|comment)\b/.test(token.type)) return;
+    var innerMode = CodeMirror.innerMode(editor.getMode(), token.state);
+    if (innerMode.mode.helperType === "json") return;
+    token.state = innerMode.state;
+
+    // If it's not a 'word-style' token, ignore the token.
+    if (!/^[\w$_]*$/.test(token.string)) {
+      token = {start: cur.ch, end: cur.ch, string: "", state: token.state,
+               type: token.string == "." ? "property" : null};
+    } else if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+
+    var tprop = token;
+    // If it is a property, find out what it is a property of.
+    while (tprop.type == "property") {
+      tprop = getToken(editor, Pos(cur.line, tprop.start));
+      if (tprop.string != ".") return;
+      tprop = getToken(editor, Pos(cur.line, tprop.start));
+      if (!context) var context = [];
+      context.push(tprop);
+    }
+    return {list: getCompletions(token, context, keywords, options),
+            from: Pos(cur.line, token.start),
+            to: Pos(cur.line, token.end)};
+  }
+
+  function javascriptHint(editor, options) {
+    return scriptHint(editor, javascriptKeywords,
+                      function (e, cur) {return e.getTokenAt(cur);},
+                      options);
+  };
+  CodeMirror.registerHelper("hint", "javascript", javascriptHint);
+
+  function getCoffeeScriptToken(editor, cur) {
+  // This getToken, it is for coffeescript, imitates the behavior of
+  // getTokenAt method in javascript.js, that is, returning "property"
+  // type and treat "." as indepenent token.
+    var token = editor.getTokenAt(cur);
+    if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
+      token.end = token.start;
+      token.string = '.';
+      token.type = "property";
+    }
+    else if (/^\.[\w$_]*$/.test(token.string)) {
+      token.type = "property";
+      token.start++;
+      token.string = token.string.replace(/\./, '');
+    }
+    return token;
+  }
+
+  function coffeescriptHint(editor, options) {
+    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
+  }
+  CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
+
+  var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
+                     "toUpperCase toLowerCase split concat match replace search").split(" ");
+  var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
+                    "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
+  var funcProps = "prototype apply call bind".split(" ");
+  var javascriptKeywords = ("break case catch class const continue debugger default delete do else export extends false finally for function " +
+                  "if in import instanceof new null return super switch this throw true try typeof var void while with yield").split(" ");
+  var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
+                  "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
+
+  function forAllProps(obj, callback) {
+    if (!Object.getOwnPropertyNames || !Object.getPrototypeOf) {
+      for (var name in obj) callback(name)
+    } else {
+      for (var o = obj; o; o = Object.getPrototypeOf(o))
+        Object.getOwnPropertyNames(o).forEach(callback)
+    }
+  }
+
+  function getCompletions(token, context, keywords, options) {
+    var found = [], start = token.string, global = options && options.globalScope || window;
+    function maybeAdd(str) {
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
+    }
+    function gatherCompletions(obj) {
+      if (typeof obj == "string") forEach(stringProps, maybeAdd);
+      else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
+      else if (obj instanceof Function) forEach(funcProps, maybeAdd);
+      forAllProps(obj, maybeAdd)
+    }
+
+    if (context && context.length) {
+      // If this is a property, see if it belongs to some object we can
+      // find in the current environment.
+      var obj = context.pop(), base;
+      if (obj.type && obj.type.indexOf("variable") === 0) {
+        if (options && options.additionalContext)
+          base = options.additionalContext[obj.string];
+        if (!options || options.useGlobalScope !== false)
+          base = base || global[obj.string];
+      } else if (obj.type == "string") {
+        base = "";
+      } else if (obj.type == "atom") {
+        base = 1;
+      } else if (obj.type == "function") {
+        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
+            (typeof global.jQuery == 'function'))
+          base = global.jQuery();
+        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
+          base = global._();
+      }
+      while (base != null && context.length)
+        base = base[context.pop().string];
+      if (base != null) gatherCompletions(base);
+    } else {
+      // If not, just look in the global object and any local scope
+      // (reading into JS mode internals to get at the local and global variables)
+      for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
+      for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
+      if (!options || options.useGlobalScope !== false)
+        gatherCompletions(global);
+      forEach(keywords, maybeAdd);
+    }
+    return found;
+  }
+});
diff --git a/core/media/editors/codemirror/addon/hint/javascript-hint.min.js b/core/media/editors/codemirror/addon/hint/javascript-hint.min.js
new file mode 100644
index 00000000..fa853411
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/javascript-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b){for(var c=0,d=a.length;c<d;++c)b(a[c])}function c(a,b){if(!Array.prototype.indexOf){for(var c=a.length;c--;)if(a[c]===b)return!0;return!1}return a.indexOf(b)!=-1}function d(b,c,d,e){var f=b.getCursor(),g=d(b,f);if(!/\b(?:string|comment)\b/.test(g.type)){var h=a.innerMode(b.getMode(),g.state);if("json"!==h.mode.helperType){g.state=h.state,/^[\w$_]*$/.test(g.string)?g.end>f.ch&&(g.end=f.ch,g.string=g.string.slice(0,f.ch-g.start)):g={start:f.ch,end:f.ch,string:"",state:g.state,type:"."==g.string?"property":null};for(var k=g;"property"==k.type;){if(k=d(b,j(f.line,k.start)),"."!=k.string)return;if(k=d(b,j(f.line,k.start)),!l)var l=[];l.push(k)}return{list:i(g,l,c,e),from:j(f.line,g.start),to:j(f.line,g.end)}}}}function e(a,b){return d(a,n,(function(a,b){return a.getTokenAt(b)}),b)}function f(a,b){var c=a.getTokenAt(b);return b.ch==c.start+1&&"."==c.string.charAt(0)?(c.end=c.start,c.string=".",c.type="property"):/^\.[\w$_]*$/.test(c.string)&&(c.type="property",c.start++,c.string=c.string.replace(/\./,"")),c}function g(a,b){return d(a,o,f,b)}function h(a,b){if(Object.getOwnPropertyNames&&Object.getPrototypeOf)for(var c=a;c;c=Object.getPrototypeOf(c))Object.getOwnPropertyNames(c).forEach(b);else for(var d in a)b(d)}function i(a,d,e,f){function g(a){0!=a.lastIndexOf(n,0)||c(j,a)||j.push(a)}function i(a){"string"==typeof a?b(k,g):a instanceof Array?b(l,g):a instanceof Function&&b(m,g),h(a,g)}var j=[],n=a.string,o=f&&f.globalScope||window;if(d&&d.length){var p,q=d.pop();for(q.type&&0===q.type.indexOf("variable")?(f&&f.additionalContext&&(p=f.additionalContext[q.string]),f&&f.useGlobalScope===!1||(p=p||o[q.string])):"string"==q.type?p="":"atom"==q.type?p=1:"function"==q.type&&(null==o.jQuery||"$"!=q.string&&"jQuery"!=q.string||"function"!=typeof o.jQuery?null!=o._&&"_"==q.string&&"function"==typeof o._&&(p=o._()):p=o.jQuery());null!=p&&d.length;)p=p[d.pop().string];null!=p&&i(p)}else{for(var r=a.state.localVars;r;r=r.next)g(r.name);for(var r=a.state.globalVars;r;r=r.next)g(r.name);f&&f.useGlobalScope===!1||i(o),b(e,g)}return j}var j=a.Pos;a.registerHelper("hint","javascript",e),a.registerHelper("hint","coffeescript",g);var k="charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight toUpperCase toLowerCase split concat match replace search".split(" "),l="length concat join splice push pop shift unshift slice reverse sort indexOf lastIndexOf every some filter forEach map reduce reduceRight ".split(" "),m="prototype apply call bind".split(" "),n="break case catch class const continue debugger default delete do else export extends false finally for function if in import instanceof new null return super switch this throw true try typeof var void while with yield".split(" "),o="and break catch class continue delete do else extends false finally for if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes".split(" ")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/show-hint.css b/core/media/editors/codemirror/addon/hint/show-hint.css
new file mode 100644
index 00000000..5617ccca
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/show-hint.css
@@ -0,0 +1,36 @@
+.CodeMirror-hints {
+  position: absolute;
+  z-index: 10;
+  overflow: hidden;
+  list-style: none;
+
+  margin: 0;
+  padding: 2px;
+
+  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  border-radius: 3px;
+  border: 1px solid silver;
+
+  background: white;
+  font-size: 90%;
+  font-family: monospace;
+
+  max-height: 20em;
+  overflow-y: auto;
+}
+
+.CodeMirror-hint {
+  margin: 0;
+  padding: 0 4px;
+  border-radius: 2px;
+  white-space: pre;
+  color: black;
+  cursor: pointer;
+}
+
+li.CodeMirror-hint-active {
+  background: #08f;
+  color: white;
+}
diff --git a/core/media/editors/codemirror/addon/hint/show-hint.js b/core/media/editors/codemirror/addon/hint/show-hint.js
new file mode 100644
index 00000000..dae450db
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/show-hint.js
@@ -0,0 +1,433 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
+  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
+
+  // This is the old interface, kept around for now to stay
+  // backwards-compatible.
+  CodeMirror.showHint = function(cm, getHints, options) {
+    if (!getHints) return cm.showHint(options);
+    if (options && options.async) getHints.async = true;
+    var newOpts = {hint: getHints};
+    if (options) for (var prop in options) newOpts[prop] = options[prop];
+    return cm.showHint(newOpts);
+  };
+
+  CodeMirror.defineExtension("showHint", function(options) {
+    options = parseOptions(this, this.getCursor("start"), options);
+    var selections = this.listSelections()
+    if (selections.length > 1) return;
+    // By default, don't allow completion when something is selected.
+    // A hint function can have a `supportsSelection` property to
+    // indicate that it can handle selections.
+    if (this.somethingSelected()) {
+      if (!options.hint.supportsSelection) return;
+      // Don't try with cross-line selections
+      for (var i = 0; i < selections.length; i++)
+        if (selections[i].head.line != selections[i].anchor.line) return;
+    }
+
+    if (this.state.completionActive) this.state.completionActive.close();
+    var completion = this.state.completionActive = new Completion(this, options);
+    if (!completion.options.hint) return;
+
+    CodeMirror.signal(this, "startCompletion", this);
+    completion.update(true);
+  });
+
+  function Completion(cm, options) {
+    this.cm = cm;
+    this.options = options;
+    this.widget = null;
+    this.debounce = 0;
+    this.tick = 0;
+    this.startPos = this.cm.getCursor("start");
+    this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
+
+    var self = this;
+    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
+  }
+
+  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
+    return setTimeout(fn, 1000/60);
+  };
+  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
+
+  Completion.prototype = {
+    close: function() {
+      if (!this.active()) return;
+      this.cm.state.completionActive = null;
+      this.tick = null;
+      this.cm.off("cursorActivity", this.activityFunc);
+
+      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
+      if (this.widget) this.widget.close();
+      CodeMirror.signal(this.cm, "endCompletion", this.cm);
+    },
+
+    active: function() {
+      return this.cm.state.completionActive == this;
+    },
+
+    pick: function(data, i) {
+      var completion = data.list[i];
+      if (completion.hint) completion.hint(this.cm, data, completion);
+      else this.cm.replaceRange(getText(completion), completion.from || data.from,
+                                completion.to || data.to, "complete");
+      CodeMirror.signal(data, "pick", completion);
+      this.close();
+    },
+
+    cursorActivity: function() {
+      if (this.debounce) {
+        cancelAnimationFrame(this.debounce);
+        this.debounce = 0;
+      }
+
+      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
+      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
+          pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
+          (pos.ch && this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
+        this.close();
+      } else {
+        var self = this;
+        this.debounce = requestAnimationFrame(function() {self.update();});
+        if (this.widget) this.widget.disable();
+      }
+    },
+
+    update: function(first) {
+      if (this.tick == null) return
+      var self = this, myTick = ++this.tick
+      fetchHints(this.options.hint, this.cm, this.options, function(data) {
+        if (self.tick == myTick) self.finishUpdate(data, first)
+      })
+    },
+
+    finishUpdate: function(data, first) {
+      if (this.data) CodeMirror.signal(this.data, "update");
+
+      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
+      if (this.widget) this.widget.close();
+
+      this.data = data;
+
+      if (data && data.list.length) {
+        if (picked && data.list.length == 1) {
+          this.pick(data, 0);
+        } else {
+          this.widget = new Widget(this, data);
+          CodeMirror.signal(data, "shown");
+        }
+      }
+    }
+  };
+
+  function parseOptions(cm, pos, options) {
+    var editor = cm.options.hintOptions;
+    var out = {};
+    for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+    if (editor) for (var prop in editor)
+      if (editor[prop] !== undefined) out[prop] = editor[prop];
+    if (options) for (var prop in options)
+      if (options[prop] !== undefined) out[prop] = options[prop];
+    if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos)
+    return out;
+  }
+
+  function getText(completion) {
+    if (typeof completion == "string") return completion;
+    else return completion.text;
+  }
+
+  function buildKeyMap(completion, handle) {
+    var baseMap = {
+      Up: function() {handle.moveFocus(-1);},
+      Down: function() {handle.moveFocus(1);},
+      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
+      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
+      Home: function() {handle.setFocus(0);},
+      End: function() {handle.setFocus(handle.length - 1);},
+      Enter: handle.pick,
+      Tab: handle.pick,
+      Esc: handle.close
+    };
+    var custom = completion.options.customKeys;
+    var ourMap = custom ? {} : baseMap;
+    function addBinding(key, val) {
+      var bound;
+      if (typeof val != "string")
+        bound = function(cm) { return val(cm, handle); };
+      // This mechanism is deprecated
+      else if (baseMap.hasOwnProperty(val))
+        bound = baseMap[val];
+      else
+        bound = val;
+      ourMap[key] = bound;
+    }
+    if (custom)
+      for (var key in custom) if (custom.hasOwnProperty(key))
+        addBinding(key, custom[key]);
+    var extra = completion.options.extraKeys;
+    if (extra)
+      for (var key in extra) if (extra.hasOwnProperty(key))
+        addBinding(key, extra[key]);
+    return ourMap;
+  }
+
+  function getHintElement(hintsElement, el) {
+    while (el && el != hintsElement) {
+      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
+      el = el.parentNode;
+    }
+  }
+
+  function Widget(completion, data) {
+    this.completion = completion;
+    this.data = data;
+    this.picked = false;
+    var widget = this, cm = completion.cm;
+
+    var hints = this.hints = document.createElement("ul");
+    hints.className = "CodeMirror-hints";
+    this.selectedHint = data.selectedHint || 0;
+
+    var completions = data.list;
+    for (var i = 0; i < completions.length; ++i) {
+      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
+      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
+      if (cur.className != null) className = cur.className + " " + className;
+      elt.className = className;
+      if (cur.render) cur.render(elt, data, cur);
+      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
+      elt.hintId = i;
+    }
+
+    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
+    var left = pos.left, top = pos.bottom, below = true;
+    hints.style.left = left + "px";
+    hints.style.top = top + "px";
+    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
+    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
+    var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
+    (completion.options.container || document.body).appendChild(hints);
+    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    var scrolls = hints.scrollHeight > hints.clientHeight + 1
+    var startScroll = cm.getScrollInfo();
+
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
+      if (curTop - height > 0) { // Fits above cursor
+        hints.style.top = (top = pos.top - height) + "px";
+        below = false;
+      } else if (height > winH) {
+        hints.style.height = (winH - 5) + "px";
+        hints.style.top = (top = pos.bottom - box.top) + "px";
+        var cursor = cm.getCursor();
+        if (data.from.ch != cursor.ch) {
+          pos = cm.cursorCoords(cursor);
+          hints.style.left = (left = pos.left) + "px";
+          box = hints.getBoundingClientRect();
+        }
+      }
+    }
+    var overlapX = box.right - winW;
+    if (overlapX > 0) {
+      if (box.right - box.left > winW) {
+        hints.style.width = (winW - 5) + "px";
+        overlapX -= (box.right - box.left) - winW;
+      }
+      hints.style.left = (left = pos.left - overlapX) + "px";
+    }
+    if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
+      node.style.paddingRight = cm.display.nativeBarWidth + "px"
+
+    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
+      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
+      setFocus: function(n) { widget.changeActive(n); },
+      menuSize: function() { return widget.screenAmount(); },
+      length: completions.length,
+      close: function() { completion.close(); },
+      pick: function() { widget.pick(); },
+      data: data
+    }));
+
+    if (completion.options.closeOnUnfocus) {
+      var closingOnBlur;
+      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
+      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
+    }
+
+    cm.on("scroll", this.onScroll = function() {
+      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
+      var newTop = top + startScroll.top - curScroll.top;
+      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
+      if (!below) point += hints.offsetHeight;
+      if (point <= editor.top || point >= editor.bottom) return completion.close();
+      hints.style.top = newTop + "px";
+      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
+    });
+
+    CodeMirror.on(hints, "dblclick", function(e) {
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
+    });
+
+    CodeMirror.on(hints, "click", function(e) {
+      var t = getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {
+        widget.changeActive(t.hintId);
+        if (completion.options.completeOnSingleClick) widget.pick();
+      }
+    });
+
+    CodeMirror.on(hints, "mousedown", function() {
+      setTimeout(function(){cm.focus();}, 20);
+    });
+
+    CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
+    return true;
+  }
+
+  Widget.prototype = {
+    close: function() {
+      if (this.completion.widget != this) return;
+      this.completion.widget = null;
+      this.hints.parentNode.removeChild(this.hints);
+      this.completion.cm.removeKeyMap(this.keyMap);
+
+      var cm = this.completion.cm;
+      if (this.completion.options.closeOnUnfocus) {
+        cm.off("blur", this.onBlur);
+        cm.off("focus", this.onFocus);
+      }
+      cm.off("scroll", this.onScroll);
+    },
+
+    disable: function() {
+      this.completion.cm.removeKeyMap(this.keyMap);
+      var widget = this;
+      this.keyMap = {Enter: function() { widget.picked = true; }};
+      this.completion.cm.addKeyMap(this.keyMap);
+    },
+
+    pick: function() {
+      this.completion.pick(this.data, this.selectedHint);
+    },
+
+    changeActive: function(i, avoidWrap) {
+      if (i >= this.data.list.length)
+        i = avoidWrap ? this.data.list.length - 1 : 0;
+      else if (i < 0)
+        i = avoidWrap ? 0  : this.data.list.length - 1;
+      if (this.selectedHint == i) return;
+      var node = this.hints.childNodes[this.selectedHint];
+      if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+      node = this.hints.childNodes[this.selectedHint = i];
+      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
+      if (node.offsetTop < this.hints.scrollTop)
+        this.hints.scrollTop = node.offsetTop - 3;
+      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
+        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
+      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
+    },
+
+    screenAmount: function() {
+      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
+    }
+  };
+
+  function applicableHelpers(cm, helpers) {
+    if (!cm.somethingSelected()) return helpers
+    var result = []
+    for (var i = 0; i < helpers.length; i++)
+      if (helpers[i].supportsSelection) result.push(helpers[i])
+    return result
+  }
+
+  function fetchHints(hint, cm, options, callback) {
+    if (hint.async) {
+      hint(cm, callback, options)
+    } else {
+      var result = hint(cm, options)
+      if (result && result.then) result.then(callback)
+      else callback(result)
+    }
+  }
+
+  function resolveAutoHints(cm, pos) {
+    var helpers = cm.getHelpers(pos, "hint"), words
+    if (helpers.length) {
+      var resolved = function(cm, callback, options) {
+        var app = applicableHelpers(cm, helpers);
+        function run(i) {
+          if (i == app.length) return callback(null)
+          fetchHints(app[i], cm, options, function(result) {
+            if (result && result.list.length > 0) callback(result)
+            else run(i + 1)
+          })
+        }
+        run(0)
+      }
+      resolved.async = true
+      resolved.supportsSelection = true
+      return resolved
+    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
+      return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
+    } else if (CodeMirror.hint.anyword) {
+      return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
+    } else {
+      return function() {}
+    }
+  }
+
+  CodeMirror.registerHelper("hint", "auto", {
+    resolve: resolveAutoHints
+  });
+
+  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur)
+    var term, from = CodeMirror.Pos(cur.line, token.start), to = cur
+    if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) {
+      term = token.string.substr(0, cur.ch - token.start)
+    } else {
+      term = ""
+      from = cur
+    }
+    var found = [];
+    for (var i = 0; i < options.words.length; i++) {
+      var word = options.words[i];
+      if (word.slice(0, term.length) == term)
+        found.push(word);
+    }
+
+    if (found.length) return {list: found, from: from, to: to};
+  });
+
+  CodeMirror.commands.autocomplete = CodeMirror.showHint;
+
+  var defaultOptions = {
+    hint: CodeMirror.hint.auto,
+    completeSingle: true,
+    alignWithWord: true,
+    closeCharacters: /[\s()\[\]{};:>,]/,
+    closeOnUnfocus: true,
+    completeOnSingleClick: true,
+    container: null,
+    customKeys: null,
+    extraKeys: null
+  };
+
+  CodeMirror.defineOption("hintOptions", null);
+});
diff --git a/core/media/editors/codemirror/addon/hint/show-hint.min.css b/core/media/editors/codemirror/addon/hint/show-hint.min.css
new file mode 100644
index 00000000..311e1c39
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/show-hint.min.css
@@ -0,0 +1 @@
+.CodeMirror-hints{position:absolute;z-index:10;overflow:hidden;list-style:none;margin:0;padding:2px;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);border-radius:3px;border:1px solid silver;background:#fff;font-size:90%;font-family:monospace;max-height:20em;overflow-y:auto}.CodeMirror-hint{margin:0;padding:0 4px;border-radius:2px;white-space:pre;color:#000;cursor:pointer}li.CodeMirror-hint-active{background:#08f;color:#fff}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/show-hint.min.js b/core/media/editors/codemirror/addon/hint/show-hint.min.js
new file mode 100644
index 00000000..1c43206f
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/show-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){this.cm=a,this.options=b,this.widget=null,this.debounce=0,this.tick=0,this.startPos=this.cm.getCursor("start"),this.startLen=this.cm.getLine(this.startPos.line).length-this.cm.getSelection().length;var c=this;a.on("cursorActivity",this.activityFunc=function(){c.cursorActivity()})}function c(a,b,c){var d=a.options.hintOptions,e={};for(var f in o)e[f]=o[f];if(d)for(var f in d)void 0!==d[f]&&(e[f]=d[f]);if(c)for(var f in c)void 0!==c[f]&&(e[f]=c[f]);return e.hint.resolve&&(e.hint=e.hint.resolve(a,b)),e}function d(a){return"string"==typeof a?a:a.text}function e(a,b){function c(a,c){var e;e="string"!=typeof c?function(a){return c(a,b)}:d.hasOwnProperty(c)?d[c]:c,f[a]=e}var d={Up:function(){b.moveFocus(-1)},Down:function(){b.moveFocus(1)},PageUp:function(){b.moveFocus(-b.menuSize()+1,!0)},PageDown:function(){b.moveFocus(b.menuSize()-1,!0)},Home:function(){b.setFocus(0)},End:function(){b.setFocus(b.length-1)},Enter:b.pick,Tab:b.pick,Esc:b.close},e=a.options.customKeys,f=e?{}:d;if(e)for(var g in e)e.hasOwnProperty(g)&&c(g,e[g]);var h=a.options.extraKeys;if(h)for(var g in h)h.hasOwnProperty(g)&&c(g,h[g]);return f}function f(a,b){for(;b&&b!=a;){if("LI"===b.nodeName.toUpperCase()&&b.parentNode==a)return b;b=b.parentNode}}function g(b,c){this.completion=b,this.data=c,this.picked=!1;var g=this,h=b.cm,i=this.hints=document.createElement("ul");i.className="CodeMirror-hints",this.selectedHint=c.selectedHint||0;for(var j=c.list,m=0;m<j.length;++m){var n=i.appendChild(document.createElement("li")),o=j[m],p=k+(m!=this.selectedHint?"":" "+l);null!=o.className&&(p=o.className+" "+p),n.className=p,o.render?o.render(n,c,o):n.appendChild(document.createTextNode(o.displayText||d(o))),n.hintId=m}var q=h.cursorCoords(b.options.alignWithWord?c.from:null),r=q.left,s=q.bottom,t=!0;i.style.left=r+"px",i.style.top=s+"px";var u=window.innerWidth||Math.max(document.body.offsetWidth,document.documentElement.offsetWidth),v=window.innerHeight||Math.max(document.body.offsetHeight,document.documentElement.offsetHeight);(b.options.container||document.body).appendChild(i);var w=i.getBoundingClientRect(),x=w.bottom-v,y=i.scrollHeight>i.clientHeight+1,z=h.getScrollInfo();if(x>0){var A=w.bottom-w.top,B=q.top-(q.bottom-w.top);if(B-A>0)i.style.top=(s=q.top-A)+"px",t=!1;else if(A>v){i.style.height=v-5+"px",i.style.top=(s=q.bottom-w.top)+"px";var C=h.getCursor();c.from.ch!=C.ch&&(q=h.cursorCoords(C),i.style.left=(r=q.left)+"px",w=i.getBoundingClientRect())}}var D=w.right-u;if(D>0&&(w.right-w.left>u&&(i.style.width=u-5+"px",D-=w.right-w.left-u),i.style.left=(r=q.left-D)+"px"),y)for(var E=i.firstChild;E;E=E.nextSibling)E.style.paddingRight=h.display.nativeBarWidth+"px";if(h.addKeyMap(this.keyMap=e(b,{moveFocus:function(a,b){g.changeActive(g.selectedHint+a,b)},setFocus:function(a){g.changeActive(a)},menuSize:function(){return g.screenAmount()},length:j.length,close:function(){b.close()},pick:function(){g.pick()},data:c})),b.options.closeOnUnfocus){var F;h.on("blur",this.onBlur=function(){F=setTimeout((function(){b.close()}),100)}),h.on("focus",this.onFocus=function(){clearTimeout(F)})}return h.on("scroll",this.onScroll=function(){var a=h.getScrollInfo(),c=h.getWrapperElement().getBoundingClientRect(),d=s+z.top-a.top,e=d-(window.pageYOffset||(document.documentElement||document.body).scrollTop);return t||(e+=i.offsetHeight),e<=c.top||e>=c.bottom?b.close():(i.style.top=d+"px",void(i.style.left=r+z.left-a.left+"px"))}),a.on(i,"dblclick",(function(a){var b=f(i,a.target||a.srcElement);b&&null!=b.hintId&&(g.changeActive(b.hintId),g.pick())})),a.on(i,"click",(function(a){var c=f(i,a.target||a.srcElement);c&&null!=c.hintId&&(g.changeActive(c.hintId),b.options.completeOnSingleClick&&g.pick())})),a.on(i,"mousedown",(function(){setTimeout((function(){h.focus()}),20)})),a.signal(c,"select",j[this.selectedHint],i.childNodes[this.selectedHint]),!0}function h(a,b){if(!a.somethingSelected())return b;for(var c=[],d=0;d<b.length;d++)b[d].supportsSelection&&c.push(b[d]);return c}function i(a,b,c,d){if(a.async)a(b,d,c);else{var e=a(b,c);e&&e.then?e.then(d):d(e)}}function j(b,c){var d,e=b.getHelpers(c,"hint");if(e.length){var f=function(a,b,c){function d(e){return e==f.length?b(null):void i(f[e],a,c,(function(a){a&&a.list.length>0?b(a):d(e+1)}))}var f=h(a,e);d(0)};return f.async=!0,f.supportsSelection=!0,f}return(d=b.getHelper(b.getCursor(),"hintWords"))?function(b){return a.hint.fromList(b,{words:d})}:a.hint.anyword?function(b,c){return a.hint.anyword(b,c)}:function(){}}var k="CodeMirror-hint",l="CodeMirror-hint-active";a.showHint=function(a,b,c){if(!b)return a.showHint(c);c&&c.async&&(b.async=!0);var d={hint:b};if(c)for(var e in c)d[e]=c[e];return a.showHint(d)},a.defineExtension("showHint",(function(d){d=c(this,this.getCursor("start"),d);var e=this.listSelections();if(!(e.length>1)){if(this.somethingSelected()){if(!d.hint.supportsSelection)return;for(var f=0;f<e.length;f++)if(e[f].head.line!=e[f].anchor.line)return}this.state.completionActive&&this.state.completionActive.close();var g=this.state.completionActive=new b(this,d);g.options.hint&&(a.signal(this,"startCompletion",this),g.update(!0))}}));var m=window.requestAnimationFrame||function(a){return setTimeout(a,1e3/60)},n=window.cancelAnimationFrame||clearTimeout;b.prototype={close:function(){this.active()&&(this.cm.state.completionActive=null,this.tick=null,this.cm.off("cursorActivity",this.activityFunc),this.widget&&this.data&&a.signal(this.data,"close"),this.widget&&this.widget.close(),a.signal(this.cm,"endCompletion",this.cm))},active:function(){return this.cm.state.completionActive==this},pick:function(b,c){var e=b.list[c];e.hint?e.hint(this.cm,b,e):this.cm.replaceRange(d(e),e.from||b.from,e.to||b.to,"complete"),a.signal(b,"pick",e),this.close()},cursorActivity:function(){this.debounce&&(n(this.debounce),this.debounce=0);var a=this.cm.getCursor(),b=this.cm.getLine(a.line);if(a.line!=this.startPos.line||b.length-a.ch!=this.startLen-this.startPos.ch||a.ch<this.startPos.ch||this.cm.somethingSelected()||a.ch&&this.options.closeCharacters.test(b.charAt(a.ch-1)))this.close();else{var c=this;this.debounce=m((function(){c.update()})),this.widget&&this.widget.disable()}},update:function(a){if(null!=this.tick){var b=this,c=++this.tick;i(this.options.hint,this.cm,this.options,(function(d){b.tick==c&&b.finishUpdate(d,a)}))}},finishUpdate:function(b,c){this.data&&a.signal(this.data,"update");var d=this.widget&&this.widget.picked||c&&this.options.completeSingle;this.widget&&this.widget.close(),this.data=b,b&&b.list.length&&(d&&1==b.list.length?this.pick(b,0):(this.widget=new g(this,b),a.signal(b,"shown")))}},g.prototype={close:function(){if(this.completion.widget==this){this.completion.widget=null,this.hints.parentNode.removeChild(this.hints),this.completion.cm.removeKeyMap(this.keyMap);var a=this.completion.cm;this.completion.options.closeOnUnfocus&&(a.off("blur",this.onBlur),a.off("focus",this.onFocus)),a.off("scroll",this.onScroll)}},disable:function(){this.completion.cm.removeKeyMap(this.keyMap);var a=this;this.keyMap={Enter:function(){a.picked=!0}},this.completion.cm.addKeyMap(this.keyMap)},pick:function(){this.completion.pick(this.data,this.selectedHint)},changeActive:function(b,c){if(b>=this.data.list.length?b=c?this.data.list.length-1:0:b<0&&(b=c?0:this.data.list.length-1),this.selectedHint!=b){var d=this.hints.childNodes[this.selectedHint];d&&(d.className=d.className.replace(" "+l,"")),d=this.hints.childNodes[this.selectedHint=b],d.className+=" "+l,d.offsetTop<this.hints.scrollTop?this.hints.scrollTop=d.offsetTop-3:d.offsetTop+d.offsetHeight>this.hints.scrollTop+this.hints.clientHeight&&(this.hints.scrollTop=d.offsetTop+d.offsetHeight-this.hints.clientHeight+3),a.signal(this.data,"select",this.data.list[this.selectedHint],d)}},screenAmount:function(){return Math.floor(this.hints.clientHeight/this.hints.firstChild.offsetHeight)||1}},a.registerHelper("hint","auto",{resolve:j}),a.registerHelper("hint","fromList",(function(b,c){var d,e=b.getCursor(),f=b.getTokenAt(e),g=a.Pos(e.line,f.start),h=e;f.start<e.ch&&/\w/.test(f.string.charAt(e.ch-f.start-1))?d=f.string.substr(0,e.ch-f.start):(d="",g=e);for(var i=[],j=0;j<c.words.length;j++){var k=c.words[j];k.slice(0,d.length)==d&&i.push(k)}if(i.length)return{list:i,from:g,to:h}})),a.commands.autocomplete=a.showHint;var o={hint:a.hint.auto,completeSingle:!0,alignWithWord:!0,closeCharacters:/[\s()\[\]{};:>,]/,closeOnUnfocus:!0,completeOnSingleClick:!0,container:null,customKeys:null,extraKeys:null};a.defineOption("hintOptions",null)}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/sql-hint.js b/core/media/editors/codemirror/addon/hint/sql-hint.js
new file mode 100644
index 00000000..62b69c94
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/sql-hint.js
@@ -0,0 +1,299 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/sql/sql"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var tables;
+  var defaultTable;
+  var keywords;
+  var identifierQuote;
+  var CONS = {
+    QUERY_DIV: ";",
+    ALIAS_KEYWORD: "AS"
+  };
+  var Pos = CodeMirror.Pos, cmpPos = CodeMirror.cmpPos;
+
+  function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
+
+  function getKeywords(editor) {
+    var mode = editor.doc.modeOption;
+    if (mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).keywords;
+  }
+
+  function getIdentifierQuote(editor) {
+    var mode = editor.doc.modeOption;
+    if (mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).identifierQuote || "`";
+  }
+
+  function getText(item) {
+    return typeof item == "string" ? item : item.text;
+  }
+
+  function wrapTable(name, value) {
+    if (isArray(value)) value = {columns: value}
+    if (!value.text) value.text = name
+    return value
+  }
+
+  function parseTables(input) {
+    var result = {}
+    if (isArray(input)) {
+      for (var i = input.length - 1; i >= 0; i--) {
+        var item = input[i]
+        result[getText(item).toUpperCase()] = wrapTable(getText(item), item)
+      }
+    } else if (input) {
+      for (var name in input)
+        result[name.toUpperCase()] = wrapTable(name, input[name])
+    }
+    return result
+  }
+
+  function getTable(name) {
+    return tables[name.toUpperCase()]
+  }
+
+  function shallowClone(object) {
+    var result = {};
+    for (var key in object) if (object.hasOwnProperty(key))
+      result[key] = object[key];
+    return result;
+  }
+
+  function match(string, word) {
+    var len = string.length;
+    var sub = getText(word).substr(0, len);
+    return string.toUpperCase() === sub.toUpperCase();
+  }
+
+  function addMatches(result, search, wordlist, formatter) {
+    if (isArray(wordlist)) {
+      for (var i = 0; i < wordlist.length; i++)
+        if (match(search, wordlist[i])) result.push(formatter(wordlist[i]))
+    } else {
+      for (var word in wordlist) if (wordlist.hasOwnProperty(word)) {
+        var val = wordlist[word]
+        if (!val || val === true)
+          val = word
+        else
+          val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text
+        if (match(search, val)) result.push(formatter(val))
+      }
+    }
+  }
+
+  function cleanName(name) {
+    // Get rid name from identifierQuote and preceding dot(.)
+    if (name.charAt(0) == ".") {
+      name = name.substr(1);
+    }
+    // replace doublicated identifierQuotes with single identifierQuotes
+    // and remove single identifierQuotes
+    var nameParts = name.split(identifierQuote+identifierQuote);
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = nameParts[i].replace(new RegExp(identifierQuote,"g"), "");
+    return nameParts.join(identifierQuote);
+  }
+
+  function insertIdentifierQuotes(name) {
+    var nameParts = getText(name).split(".");
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = identifierQuote +
+        // doublicate identifierQuotes
+        nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
+        identifierQuote;
+    var escaped = nameParts.join(".");
+    if (typeof name == "string") return escaped;
+    name = shallowClone(name);
+    name.text = escaped;
+    return name;
+  }
+
+  function nameCompletion(cur, token, result, editor) {
+    // Try to complete table, column names and return start position of completion
+    var useIdentifierQuotes = false;
+    var nameParts = [];
+    var start = token.start;
+    var cont = true;
+    while (cont) {
+      cont = (token.string.charAt(0) == ".");
+      useIdentifierQuotes = useIdentifierQuotes || (token.string.charAt(0) == identifierQuote);
+
+      start = token.start;
+      nameParts.unshift(cleanName(token.string));
+
+      token = editor.getTokenAt(Pos(cur.line, token.start));
+      if (token.string == ".") {
+        cont = true;
+        token = editor.getTokenAt(Pos(cur.line, token.start));
+      }
+    }
+
+    // Try to complete table names
+    var string = nameParts.join(".");
+    addMatches(result, string, tables, function(w) {
+      return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
+    });
+
+    // Try to complete columns from defaultTable
+    addMatches(result, string, defaultTable, function(w) {
+      return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
+    });
+
+    // Try to complete columns
+    string = nameParts.pop();
+    var table = nameParts.join(".");
+
+    var alias = false;
+    var aliasTable = table;
+    // Check if table is available. If not, find table by Alias
+    if (!getTable(table)) {
+      var oldTable = table;
+      table = findTableByAlias(table, editor);
+      if (table !== oldTable) alias = true;
+    }
+
+    var columns = getTable(table);
+    if (columns && columns.columns)
+      columns = columns.columns;
+
+    if (columns) {
+      addMatches(result, string, columns, function(w) {
+        var tableInsert = table;
+        if (alias == true) tableInsert = aliasTable;
+        if (typeof w == "string") {
+          w = tableInsert + "." + w;
+        } else {
+          w = shallowClone(w);
+          w.text = tableInsert + "." + w.text;
+        }
+        return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
+      });
+    }
+
+    return start;
+  }
+
+  function eachWord(lineText, f) {
+    var words = lineText.split(/\s+/)
+    for (var i = 0; i < words.length; i++)
+      if (words[i]) f(words[i].replace(/[,;]/g, ''))
+  }
+
+  function findTableByAlias(alias, editor) {
+    var doc = editor.doc;
+    var fullQuery = doc.getValue();
+    var aliasUpperCase = alias.toUpperCase();
+    var previousWord = "";
+    var table = "";
+    var separator = [];
+    var validRange = {
+      start: Pos(0, 0),
+      end: Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).length)
+    };
+
+    //add separator
+    var indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV);
+    while(indexOfSeparator != -1) {
+      separator.push(doc.posFromIndex(indexOfSeparator));
+      indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV, indexOfSeparator+1);
+    }
+    separator.unshift(Pos(0, 0));
+    separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
+
+    //find valid range
+    var prevItem = null;
+    var current = editor.getCursor()
+    for (var i = 0; i < separator.length; i++) {
+      if ((prevItem == null || cmpPos(current, prevItem) > 0) && cmpPos(current, separator[i]) <= 0) {
+        validRange = {start: prevItem, end: separator[i]};
+        break;
+      }
+      prevItem = separator[i];
+    }
+
+    if (validRange.start) {
+      var query = doc.getRange(validRange.start, validRange.end, false);
+
+      for (var i = 0; i < query.length; i++) {
+        var lineText = query[i];
+        eachWord(lineText, function(word) {
+          var wordUpperCase = word.toUpperCase();
+          if (wordUpperCase === aliasUpperCase && getTable(previousWord))
+            table = previousWord;
+          if (wordUpperCase !== CONS.ALIAS_KEYWORD)
+            previousWord = word;
+        });
+        if (table) break;
+      }
+    }
+    return table;
+  }
+
+  CodeMirror.registerHelper("hint", "sql", function(editor, options) {
+    tables = parseTables(options && options.tables)
+    var defaultTableName = options && options.defaultTable;
+    var disableKeywords = options && options.disableKeywords;
+    defaultTable = defaultTableName && getTable(defaultTableName);
+    keywords = getKeywords(editor);
+    identifierQuote = getIdentifierQuote(editor);
+
+    if (defaultTableName && !defaultTable)
+      defaultTable = findTableByAlias(defaultTableName, editor);
+
+    defaultTable = defaultTable || [];
+
+    if (defaultTable.columns)
+      defaultTable = defaultTable.columns;
+
+    var cur = editor.getCursor();
+    var result = [];
+    var token = editor.getTokenAt(cur), start, end, search;
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+
+    if (token.string.match(/^[.`"\w@]\w*$/)) {
+      search = token.string;
+      start = token.start;
+      end = token.end;
+    } else {
+      start = end = cur.ch;
+      search = "";
+    }
+    if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
+      start = nameCompletion(cur, token, result, editor);
+    } else {
+      addMatches(result, search, defaultTable, function(w) {return {text:w, className: "CodeMirror-hint-table CodeMirror-hint-default-table"};});
+      addMatches(
+          result,
+          search,
+          tables,
+          function(w) {
+              if (typeof w === 'object') {
+                  w.className =  "CodeMirror-hint-table";
+              } else {
+                  w = {text: w, className: "CodeMirror-hint-table"};
+              }
+
+              return w;
+          }
+      );
+      if (!disableKeywords)
+        addMatches(result, search, keywords, function(w) {return {text: w.toUpperCase(), className: "CodeMirror-hint-keyword"};});
+    }
+
+    return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
+  });
+});
diff --git a/core/media/editors/codemirror/addon/hint/sql-hint.min.js b/core/media/editors/codemirror/addon/hint/sql-hint.min.js
new file mode 100644
index 00000000..44033194
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/sql-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../mode/sql/sql")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../mode/sql/sql"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return"[object Array]"==Object.prototype.toString.call(a)}function c(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).keywords}function d(b){var c=b.doc.modeOption;return"sql"===c&&(c="text/x-sql"),a.resolveMode(c).identifierQuote||"`"}function e(a){return"string"==typeof a?a:a.text}function f(a,c){return b(c)&&(c={columns:c}),c.text||(c.text=a),c}function g(a){var c={};if(b(a))for(var d=a.length-1;d>=0;d--){var g=a[d];c[e(g).toUpperCase()]=f(e(g),g)}else if(a)for(var h in a)c[h.toUpperCase()]=f(h,a[h]);return c}function h(a){return q[a.toUpperCase()]}function i(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function j(a,b){var c=a.length,d=e(b).substr(0,c);return a.toUpperCase()===d.toUpperCase()}function k(a,c,d,e){if(b(d))for(var f=0;f<d.length;f++)j(c,d[f])&&a.push(e(d[f]));else for(var g in d)if(d.hasOwnProperty(g)){var h=d[g];h=h&&h!==!0?h.displayText?{text:h.text,displayText:h.displayText}:h.text:g,j(c,h)&&a.push(e(h))}}function l(a){"."==a.charAt(0)&&(a=a.substr(1));for(var b=a.split(t+t),c=0;c<b.length;c++)b[c]=b[c].replace(new RegExp(t,"g"),"");return b.join(t)}function m(a){for(var b=e(a).split("."),c=0;c<b.length;c++)b[c]=t+b[c].replace(new RegExp(t,"g"),t+t)+t;var d=b.join(".");return"string"==typeof a?d:(a=i(a),a.text=d,a)}function n(a,b,c,d){for(var e=!1,f=[],g=b.start,j=!0;j;)j="."==b.string.charAt(0),e=e||b.string.charAt(0)==t,g=b.start,f.unshift(l(b.string)),b=d.getTokenAt(v(a.line,b.start)),"."==b.string&&(j=!0,b=d.getTokenAt(v(a.line,b.start)));var n=f.join(".");k(c,n,q,(function(a){return e?m(a):a})),k(c,n,r,(function(a){return e?m(a):a})),n=f.pop();var o=f.join("."),s=!1,u=o;if(!h(o)){var w=o;o=p(o,d),o!==w&&(s=!0)}var x=h(o);return x&&x.columns&&(x=x.columns),x&&k(c,n,x,(function(a){var b=o;return 1==s&&(b=u),"string"==typeof a?a=b+"."+a:(a=i(a),a.text=b+"."+a.text),e?m(a):a})),g}function o(a,b){for(var c=a.split(/\s+/),d=0;d<c.length;d++)c[d]&&b(c[d].replace(/[,;]/g,""))}function p(a,b){for(var c=b.doc,d=c.getValue(),e=a.toUpperCase(),f="",g="",i=[],j={start:v(0,0),end:v(b.lastLine(),b.getLineHandle(b.lastLine()).length)},k=d.indexOf(u.QUERY_DIV);k!=-1;)i.push(c.posFromIndex(k)),k=d.indexOf(u.QUERY_DIV,k+1);i.unshift(v(0,0)),i.push(v(b.lastLine(),b.getLineHandle(b.lastLine()).text.length));for(var l=null,m=b.getCursor(),n=0;n<i.length;n++){if((null==l||w(m,l)>0)&&w(m,i[n])<=0){j={start:l,end:i[n]};break}l=i[n]}if(j.start)for(var p=c.getRange(j.start,j.end,!1),n=0;n<p.length;n++){var q=p[n];if(o(q,(function(a){var b=a.toUpperCase();b===e&&h(f)&&(g=f),b!==u.ALIAS_KEYWORD&&(f=a)})),g)break}return g}var q,r,s,t,u={QUERY_DIV:";",ALIAS_KEYWORD:"AS"},v=a.Pos,w=a.cmpPos;a.registerHelper("hint","sql",(function(a,b){q=g(b&&b.tables);var e=b&&b.defaultTable,f=b&&b.disableKeywords;r=e&&h(e),s=c(a),t=d(a),e&&!r&&(r=p(e,a)),r=r||[],r.columns&&(r=r.columns);var i,j,l,m=a.getCursor(),o=[],u=a.getTokenAt(m);return u.end>m.ch&&(u.end=m.ch,u.string=u.string.slice(0,m.ch-u.start)),u.string.match(/^[.`"\w@]\w*$/)?(l=u.string,i=u.start,j=u.end):(i=j=m.ch,l=""),"."==l.charAt(0)||l.charAt(0)==t?i=n(m,u,o,a):(k(o,l,r,(function(a){return{text:a,className:"CodeMirror-hint-table CodeMirror-hint-default-table"}})),k(o,l,q,(function(a){return"object"==typeof a?a.className="CodeMirror-hint-table":a={text:a,className:"CodeMirror-hint-table"},a})),f||k(o,l,s,(function(a){return{text:a.toUpperCase(),className:"CodeMirror-hint-keyword"}}))),{list:o,from:v(m.line,i),to:v(m.line,j)}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/hint/xml-hint.js b/core/media/editors/codemirror/addon/hint/xml-hint.js
new file mode 100644
index 00000000..9b9baa0c
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/xml-hint.js
@@ -0,0 +1,110 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  function getHints(cm, options) {
+    var tags = options && options.schemaInfo;
+    var quote = (options && options.quoteChar) || '"';
+    if (!tags) return;
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (inner.mode.name != "xml") return;
+    var result = [], replaceToken = false, prefix;
+    var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
+    var tagName = tag && /^\w/.test(token.string), tagStart;
+
+    if (tagName) {
+      var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
+      var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
+      if (tagType) tagStart = token.start - (tagType == "close" ? 2 : 1);
+    } else if (tag && token.string == "<") {
+      tagType = "open";
+    } else if (tag && token.string == "</") {
+      tagType = "close";
+    }
+
+    if (!tag && !inner.state.tagName || tagType) {
+      if (tagName)
+        prefix = token.string;
+      replaceToken = tagType;
+      var cx = inner.state.context, curTag = cx && tags[cx.tagName];
+      var childList = cx ? curTag && curTag.children : tags["!top"];
+      if (childList && tagType != "close") {
+        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].lastIndexOf(prefix, 0) == 0)
+          result.push("<" + childList[i]);
+      } else if (tagType != "close") {
+        for (var name in tags)
+          if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
+            result.push("<" + name);
+      }
+      if (cx && (!prefix || tagType == "close" && cx.tagName.lastIndexOf(prefix, 0) == 0))
+        result.push("</" + cx.tagName + ">");
+    } else {
+      // Attribute completion
+      var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
+      var globalAttrs = tags["!attrs"];
+      if (!attrs && !globalAttrs) return;
+      if (!attrs) {
+        attrs = globalAttrs;
+      } else if (globalAttrs) { // Combine tag-local and global attributes
+        var set = {};
+        for (var nm in globalAttrs) if (globalAttrs.hasOwnProperty(nm)) set[nm] = globalAttrs[nm];
+        for (var nm in attrs) if (attrs.hasOwnProperty(nm)) set[nm] = attrs[nm];
+        attrs = set;
+      }
+      if (token.type == "string" || token.string == "=") { // A value
+        var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
+                                 Pos(cur.line, token.type == "string" ? token.start : token.end));
+        var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
+        if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
+        if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
+        if (token.type == "string") {
+          prefix = token.string;
+          var n = 0;
+          if (/['"]/.test(token.string.charAt(0))) {
+            quote = token.string.charAt(0);
+            prefix = token.string.slice(1);
+            n++;
+          }
+          var len = token.string.length;
+          if (/['"]/.test(token.string.charAt(len - 1))) {
+            quote = token.string.charAt(len - 1);
+            prefix = token.string.substr(n, len - 2);
+          }
+          replaceToken = true;
+        }
+        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].lastIndexOf(prefix, 0) == 0)
+          result.push(quote + atValues[i] + quote);
+      } else { // An attribute name
+        if (token.type == "attribute") {
+          prefix = token.string;
+          replaceToken = true;
+        }
+        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.lastIndexOf(prefix, 0) == 0))
+          result.push(attr);
+      }
+    }
+    return {
+      list: result,
+      from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
+      to: replaceToken ? Pos(cur.line, token.end) : cur
+    };
+  }
+
+  CodeMirror.registerHelper("hint", "xml", getHints);
+});
diff --git a/core/media/editors/codemirror/addon/hint/xml-hint.min.js b/core/media/editors/codemirror/addon/hint/xml-hint.min.js
new file mode 100644
index 00000000..ab6e4d1d
--- /dev/null
+++ b/core/media/editors/codemirror/addon/hint/xml-hint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,d){var e=d&&d.schemaInfo,f=d&&d.quoteChar||'"';if(e){var g=b.getCursor(),h=b.getTokenAt(g);h.end>g.ch&&(h.end=g.ch,h.string=h.string.slice(0,g.ch-h.start));var i=a.innerMode(b.getMode(),h.state);if("xml"==i.mode.name){var j,k,l=[],m=!1,n=/\btag\b/.test(h.type)&&!/>$/.test(h.string),o=n&&/^\w/.test(h.string);if(o){var p=b.getLine(g.line).slice(Math.max(0,h.start-2),h.start),q=/<\/$/.test(p)?"close":/<$/.test(p)?"open":null;q&&(k=h.start-("close"==q?2:1))}else n&&"<"==h.string?q="open":n&&"</"==h.string&&(q="close");if(!n&&!i.state.tagName||q){o&&(j=h.string),m=q;var r=i.state.context,s=r&&e[r.tagName],t=r?s&&s.children:e["!top"];if(t&&"close"!=q)for(var u=0;u<t.length;++u)j&&0!=t[u].lastIndexOf(j,0)||l.push("<"+t[u]);else if("close"!=q)for(var v in e)!e.hasOwnProperty(v)||"!top"==v||"!attrs"==v||j&&0!=v.lastIndexOf(j,0)||l.push("<"+v);r&&(!j||"close"==q&&0==r.tagName.lastIndexOf(j,0))&&l.push("</"+r.tagName+">")}else{var s=e[i.state.tagName],w=s&&s.attrs,x=e["!attrs"];if(!w&&!x)return;if(w){if(x){var y={};for(var z in x)x.hasOwnProperty(z)&&(y[z]=x[z]);for(var z in w)w.hasOwnProperty(z)&&(y[z]=w[z]);w=y}}else w=x;if("string"==h.type||"="==h.string){var A,p=b.getRange(c(g.line,Math.max(0,g.ch-60)),c(g.line,"string"==h.type?h.start:h.end)),B=p.match(/([^\s\u00a0=<>\"\']+)=$/);if(!B||!w.hasOwnProperty(B[1])||!(A=w[B[1]]))return;if("function"==typeof A&&(A=A.call(this,b)),"string"==h.type){j=h.string;var C=0;/['"]/.test(h.string.charAt(0))&&(f=h.string.charAt(0),j=h.string.slice(1),C++);var D=h.string.length;/['"]/.test(h.string.charAt(D-1))&&(f=h.string.charAt(D-1),j=h.string.substr(C,D-2)),m=!0}for(var u=0;u<A.length;++u)j&&0!=A[u].lastIndexOf(j,0)||l.push(f+A[u]+f)}else{"attribute"==h.type&&(j=h.string,m=!0);for(var E in w)!w.hasOwnProperty(E)||j&&0!=E.lastIndexOf(j,0)||l.push(E)}}return{list:l,from:m?c(g.line,null==k?h.start:k):g,to:m?c(g.line,h.end):g}}}}var c=a.Pos;a.registerHelper("hint","xml",b)}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/coffeescript-lint.js b/core/media/editors/codemirror/addon/lint/coffeescript-lint.js
new file mode 100644
index 00000000..70621a1b
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/coffeescript-lint.js
@@ -0,0 +1,47 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
+
+// declare global: coffeelint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "coffeescript", function(text) {
+  var found = [];
+  if (!window.coffeelint) {
+    if (window.console) {
+      window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run.");
+    }
+    return found;
+  }
+  var parseError = function(err) {
+    var loc = err.lineNumber;
+    found.push({from: CodeMirror.Pos(loc-1, 0),
+                to: CodeMirror.Pos(loc, 0),
+                severity: err.level,
+                message: err.message});
+  };
+  try {
+    var res = coffeelint.lint(text);
+    for(var i = 0; i < res.length; i++) {
+      parseError(res[i]);
+    }
+  } catch(e) {
+    found.push({from: CodeMirror.Pos(e.location.first_line, 0),
+                to: CodeMirror.Pos(e.location.last_line, e.location.last_column),
+                severity: 'error',
+                message: e.message});
+  }
+  return found;
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/lint/coffeescript-lint.min.js b/core/media/editors/codemirror/addon/lint/coffeescript-lint.min.js
new file mode 100644
index 00000000..82601c69
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/coffeescript-lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","coffeescript",(function(b){var c=[];if(!window.coffeelint)return window.console&&window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run."),c;var d=function(b){var d=b.lineNumber;c.push({from:a.Pos(d-1,0),to:a.Pos(d,0),severity:b.level,message:b.message})};try{for(var e=coffeelint.lint(b),f=0;f<e.length;f++)d(e[f])}catch(b){c.push({from:a.Pos(b.location.first_line,0),to:a.Pos(b.location.last_line,b.location.last_column),severity:"error",message:b.message})}return c}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/css-lint.js b/core/media/editors/codemirror/addon/lint/css-lint.js
new file mode 100644
index 00000000..135d031a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/css-lint.js
@@ -0,0 +1,40 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Depends on csslint.js from https://github.com/stubbornella/csslint
+
+// declare global: CSSLint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "css", function(text, options) {
+  var found = [];
+  if (!window.CSSLint) {
+    if (window.console) {
+        window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run.");
+    }
+    return found;
+  }
+  var results = CSSLint.verify(text, options), messages = results.messages, message = null;
+  for ( var i = 0; i < messages.length; i++) {
+    message = messages[i];
+    var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
+    found.push({
+      from: CodeMirror.Pos(startLine, startCol),
+      to: CodeMirror.Pos(endLine, endCol),
+      message: message.message,
+      severity : message.type
+    });
+  }
+  return found;
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/lint/css-lint.min.js b/core/media/editors/codemirror/addon/lint/css-lint.min.js
new file mode 100644
index 00000000..c44fc135
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/css-lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","css",(function(b,c){var d=[];if(!window.CSSLint)return window.console&&window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run."),d;for(var e=CSSLint.verify(b,c),f=e.messages,g=null,h=0;h<f.length;h++){g=f[h];var i=g.line-1,j=g.line-1,k=g.col-1,l=g.col;d.push({from:a.Pos(i,k),to:a.Pos(j,l),message:g.message,severity:g.type})}return d}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/html-lint.js b/core/media/editors/codemirror/addon/lint/html-lint.js
new file mode 100644
index 00000000..23de9bb2
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/html-lint.js
@@ -0,0 +1,53 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Depends on htmlhint.js from http://htmlhint.com/js/htmlhint.js
+
+// declare global: HTMLHint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("htmlhint"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "htmlhint"], mod);
+  else // Plain browser env
+    mod(CodeMirror, window.HTMLHint);
+})(function(CodeMirror, HTMLHint) {
+  "use strict";
+
+  var defaultRules = {
+    "tagname-lowercase": true,
+    "attr-lowercase": true,
+    "attr-value-double-quotes": true,
+    "doctype-first": false,
+    "tag-pair": true,
+    "spec-char-escape": true,
+    "id-unique": true,
+    "src-not-empty": true,
+    "attr-no-duplication": true
+  };
+
+  CodeMirror.registerHelper("lint", "html", function(text, options) {
+    var found = [];
+    if (HTMLHint && !HTMLHint.verify) HTMLHint = HTMLHint.HTMLHint;
+    if (!HTMLHint) HTMLHint = window.HTMLHint;
+    if (!HTMLHint) {
+      if (window.console) {
+          window.console.error("Error: HTMLHint not found, not defined on window, or not available through define/require, CodeMirror HTML linting cannot run.");
+      }
+      return found;
+    }
+    var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
+    for (var i = 0; i < messages.length; i++) {
+      var message = messages[i];
+      var startLine = message.line - 1, endLine = message.line - 1, startCol = message.col - 1, endCol = message.col;
+      found.push({
+        from: CodeMirror.Pos(startLine, startCol),
+        to: CodeMirror.Pos(endLine, endCol),
+        message: message.message,
+        severity : message.type
+      });
+    }
+    return found;
+  });
+});
diff --git a/core/media/editors/codemirror/addon/lint/html-lint.min.js b/core/media/editors/codemirror/addon/lint/html-lint.min.js
new file mode 100644
index 00000000..7fca754a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/html-lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("htmlhint")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","htmlhint"],a):a(CodeMirror,window.HTMLHint)})((function(a,b){"use strict";var c={"tagname-lowercase":!0,"attr-lowercase":!0,"attr-value-double-quotes":!0,"doctype-first":!1,"tag-pair":!0,"spec-char-escape":!0,"id-unique":!0,"src-not-empty":!0,"attr-no-duplication":!0};a.registerHelper("lint","html",(function(d,e){var f=[];if(b&&!b.verify&&(b=b.HTMLHint),b||(b=window.HTMLHint),!b)return window.console&&window.console.error("Error: HTMLHint not found, not defined on window, or not available through define/require, CodeMirror HTML linting cannot run."),f;for(var g=b.verify(d,e&&e.rules||c),h=0;h<g.length;h++){var i=g[h],j=i.line-1,k=i.line-1,l=i.col-1,m=i.col;f.push({from:a.Pos(j,l),to:a.Pos(k,m),message:i.message,severity:i.type})}return f}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/javascript-lint.js b/core/media/editors/codemirror/addon/lint/javascript-lint.js
new file mode 100644
index 00000000..8266b7e7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/javascript-lint.js
@@ -0,0 +1,63 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  // declare global: JSHINT
+
+  function validator(text, options) {
+    if (!window.JSHINT) {
+      if (window.console) {
+        window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run.");
+      }
+      return [];
+    }
+    if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
+      options.indent = 1; // JSHint default value is 4
+    JSHINT(text, options, options.globals);
+    var errors = JSHINT.data().errors, result = [];
+    if (errors) parseErrors(errors, result);
+    return result;
+  }
+
+  CodeMirror.registerHelper("lint", "javascript", validator);
+
+  function parseErrors(errors, output) {
+    for ( var i = 0; i < errors.length; i++) {
+      var error = errors[i];
+      if (error) {
+        if (error.line <= 0) {
+          if (window.console) {
+            window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error);
+          }
+          continue;
+        }
+
+        var start = error.character - 1, end = start + 1;
+        if (error.evidence) {
+          var index = error.evidence.substring(start).search(/.\b/);
+          if (index > -1) {
+            end += index;
+          }
+        }
+
+        // Convert to format expected by validation service
+        var hint = {
+          message: error.reason,
+          severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error",
+          from: CodeMirror.Pos(error.line - 1, start),
+          to: CodeMirror.Pos(error.line - 1, end)
+        };
+
+        output.push(hint);
+      }
+    }
+  }
+});
diff --git a/core/media/editors/codemirror/addon/lint/javascript-lint.min.js b/core/media/editors/codemirror/addon/lint/javascript-lint.min.js
new file mode 100644
index 00000000..640c8ff2
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/javascript-lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!window.JSHINT)return window.console&&window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run."),[];b.indent||(b.indent=1),JSHINT(a,b,b.globals);var d=JSHINT.data().errors,e=[];return d&&c(d,e),e}function c(b,c){for(var d=0;d<b.length;d++){var e=b[d];if(e){if(e.line<=0){window.console&&window.console.warn("Cannot display JSHint error (invalid line "+e.line+")",e);continue}var f=e.character-1,g=f+1;if(e.evidence){var h=e.evidence.substring(f).search(/.\b/);h>-1&&(g+=h)}var i={message:e.reason,severity:e.code&&e.code.startsWith("W")?"warning":"error",from:a.Pos(e.line-1,f),to:a.Pos(e.line-1,g)};c.push(i)}}}a.registerHelper("lint","javascript",b)}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/json-lint.js b/core/media/editors/codemirror/addon/lint/json-lint.js
new file mode 100644
index 00000000..63e70c45
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/json-lint.js
@@ -0,0 +1,40 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Depends on jsonlint.js from https://github.com/zaach/jsonlint
+
+// declare global: jsonlint
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("lint", "json", function(text) {
+  var found = [];
+  if (!window.jsonlint) {
+    if (window.console) {
+      window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run.");
+    }
+    return found;
+  }
+  // for jsonlint's web dist jsonlint is exported as an object with a single property parser, of which parseError
+  // is a subproperty
+  var jsonlint = window.jsonlint.parser || window.jsonlint
+  jsonlint.parseError = function(str, hash) {
+    var loc = hash.loc;
+    found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
+                to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
+                message: str});
+  };
+  try { jsonlint.parse(text); }
+  catch(e) {}
+  return found;
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/lint/json-lint.min.js b/core/media/editors/codemirror/addon/lint/json-lint.min.js
new file mode 100644
index 00000000..c5c71e59
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/json-lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","json",(function(b){var c=[];if(!window.jsonlint)return window.console&&window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run."),c;var d=window.jsonlint.parser||window.jsonlint;d.parseError=function(b,d){var e=d.loc;c.push({from:a.Pos(e.first_line-1,e.first_column),to:a.Pos(e.last_line-1,e.last_column),message:b})};try{d.parse(b)}catch(a){}return c}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/lint.css b/core/media/editors/codemirror/addon/lint/lint.css
new file mode 100644
index 00000000..f097cfe3
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/lint.css
@@ -0,0 +1,73 @@
+/* The lint marker gutter */
+.CodeMirror-lint-markers {
+  width: 16px;
+}
+
+.CodeMirror-lint-tooltip {
+  background-color: #ffd;
+  border: 1px solid black;
+  border-radius: 4px 4px 4px 4px;
+  color: black;
+  font-family: monospace;
+  font-size: 10pt;
+  overflow: hidden;
+  padding: 2px 5px;
+  position: fixed;
+  white-space: pre;
+  white-space: pre-wrap;
+  z-index: 100;
+  max-width: 600px;
+  opacity: 0;
+  transition: opacity .4s;
+  -moz-transition: opacity .4s;
+  -webkit-transition: opacity .4s;
+  -o-transition: opacity .4s;
+  -ms-transition: opacity .4s;
+}
+
+.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
+  background-position: left bottom;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-lint-mark-error {
+  background-image:
+  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
+  ;
+}
+
+.CodeMirror-lint-mark-warning {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
+  background-position: center center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  display: inline-block;
+  height: 16px;
+  width: 16px;
+  vertical-align: middle;
+  position: relative;
+}
+
+.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
+  padding-left: 18px;
+  background-position: top left;
+  background-repeat: no-repeat;
+}
+
+.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
+}
+
+.CodeMirror-lint-marker-multiple {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
+  background-repeat: no-repeat;
+  background-position: right bottom;
+  width: 100%; height: 100%;
+}
diff --git a/core/media/editors/codemirror/addon/lint/lint.js b/core/media/editors/codemirror/addon/lint/lint.js
new file mode 100644
index 00000000..e00e77a2
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/lint.js
@@ -0,0 +1,252 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var GUTTER_ID = "CodeMirror-lint-markers";
+
+  function showTooltip(e, content) {
+    var tt = document.createElement("div");
+    tt.className = "CodeMirror-lint-tooltip";
+    tt.appendChild(content.cloneNode(true));
+    document.body.appendChild(tt);
+
+    function position(e) {
+      if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
+      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
+      tt.style.left = (e.clientX + 5) + "px";
+    }
+    CodeMirror.on(document, "mousemove", position);
+    position(e);
+    if (tt.style.opacity != null) tt.style.opacity = 1;
+    return tt;
+  }
+  function rm(elt) {
+    if (elt.parentNode) elt.parentNode.removeChild(elt);
+  }
+  function hideTooltip(tt) {
+    if (!tt.parentNode) return;
+    if (tt.style.opacity == null) rm(tt);
+    tt.style.opacity = 0;
+    setTimeout(function() { rm(tt); }, 600);
+  }
+
+  function showTooltipFor(e, content, node) {
+    var tooltip = showTooltip(e, content);
+    function hide() {
+      CodeMirror.off(node, "mouseout", hide);
+      if (tooltip) { hideTooltip(tooltip); tooltip = null; }
+    }
+    var poll = setInterval(function() {
+      if (tooltip) for (var n = node;; n = n.parentNode) {
+        if (n && n.nodeType == 11) n = n.host;
+        if (n == document.body) return;
+        if (!n) { hide(); break; }
+      }
+      if (!tooltip) return clearInterval(poll);
+    }, 400);
+    CodeMirror.on(node, "mouseout", hide);
+  }
+
+  function LintState(cm, options, hasGutter) {
+    this.marked = [];
+    this.options = options;
+    this.timeout = null;
+    this.hasGutter = hasGutter;
+    this.onMouseOver = function(e) { onMouseOver(cm, e); };
+    this.waitingFor = 0
+  }
+
+  function parseOptions(_cm, options) {
+    if (options instanceof Function) return {getAnnotations: options};
+    if (!options || options === true) options = {};
+    return options;
+  }
+
+  function clearMarks(cm) {
+    var state = cm.state.lint;
+    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
+    for (var i = 0; i < state.marked.length; ++i)
+      state.marked[i].clear();
+    state.marked.length = 0;
+  }
+
+  function makeMarker(labels, severity, multiple, tooltips) {
+    var marker = document.createElement("div"), inner = marker;
+    marker.className = "CodeMirror-lint-marker-" + severity;
+    if (multiple) {
+      inner = marker.appendChild(document.createElement("div"));
+      inner.className = "CodeMirror-lint-marker-multiple";
+    }
+
+    if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
+      showTooltipFor(e, labels, inner);
+    });
+
+    return marker;
+  }
+
+  function getMaxSeverity(a, b) {
+    if (a == "error") return a;
+    else return b;
+  }
+
+  function groupByLine(annotations) {
+    var lines = [];
+    for (var i = 0; i < annotations.length; ++i) {
+      var ann = annotations[i], line = ann.from.line;
+      (lines[line] || (lines[line] = [])).push(ann);
+    }
+    return lines;
+  }
+
+  function annotationTooltip(ann) {
+    var severity = ann.severity;
+    if (!severity) severity = "error";
+    var tip = document.createElement("div");
+    tip.className = "CodeMirror-lint-message-" + severity;
+    if (typeof ann.messageHTML != 'undefined') {
+        tip.innerHTML = ann.messageHTML;
+    } else {
+        tip.appendChild(document.createTextNode(ann.message));
+    }
+    return tip;
+  }
+
+  function lintAsync(cm, getAnnotations, passOptions) {
+    var state = cm.state.lint
+    var id = ++state.waitingFor
+    function abort() {
+      id = -1
+      cm.off("change", abort)
+    }
+    cm.on("change", abort)
+    getAnnotations(cm.getValue(), function(annotations, arg2) {
+      cm.off("change", abort)
+      if (state.waitingFor != id) return
+      if (arg2 && annotations instanceof CodeMirror) annotations = arg2
+      cm.operation(function() {updateLinting(cm, annotations)})
+    }, passOptions, cm);
+  }
+
+  function startLinting(cm) {
+    var state = cm.state.lint, options = state.options;
+    /*
+     * Passing rules in `options` property prevents JSHint (and other linters) from complaining
+     * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
+     */
+    var passOptions = options.options || options;
+    var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
+    if (!getAnnotations) return;
+    if (options.async || getAnnotations.async) {
+      lintAsync(cm, getAnnotations, passOptions)
+    } else {
+      var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      if (!annotations) return;
+      if (annotations.then) annotations.then(function(issues) {
+        cm.operation(function() {updateLinting(cm, issues)})
+      });
+      else cm.operation(function() {updateLinting(cm, annotations)})
+    }
+  }
+
+  function updateLinting(cm, annotationsNotSorted) {
+    clearMarks(cm);
+    var state = cm.state.lint, options = state.options;
+
+    var annotations = groupByLine(annotationsNotSorted);
+
+    for (var line = 0; line < annotations.length; ++line) {
+      var anns = annotations[line];
+      if (!anns) continue;
+
+      var maxSeverity = null;
+      var tipLabel = state.hasGutter && document.createDocumentFragment();
+
+      for (var i = 0; i < anns.length; ++i) {
+        var ann = anns[i];
+        var severity = ann.severity;
+        if (!severity) severity = "error";
+        maxSeverity = getMaxSeverity(maxSeverity, severity);
+
+        if (options.formatAnnotation) ann = options.formatAnnotation(ann);
+        if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
+
+        if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
+          className: "CodeMirror-lint-mark-" + severity,
+          __annotation: ann
+        }));
+      }
+
+      if (state.hasGutter)
+        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
+                                                       state.options.tooltips));
+    }
+    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.lint;
+    if (!state) return;
+    clearTimeout(state.timeout);
+    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
+  }
+
+  function popupTooltips(annotations, e) {
+    var target = e.target || e.srcElement;
+    var tooltip = document.createDocumentFragment();
+    for (var i = 0; i < annotations.length; i++) {
+      var ann = annotations[i];
+      tooltip.appendChild(annotationTooltip(ann));
+    }
+    showTooltipFor(e, tooltip, target);
+  }
+
+  function onMouseOver(cm, e) {
+    var target = e.target || e.srcElement;
+    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
+    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
+    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
+
+    var annotations = [];
+    for (var i = 0; i < spans.length; ++i) {
+      var ann = spans[i].__annotation;
+      if (ann) annotations.push(ann);
+    }
+    if (annotations.length) popupTooltips(annotations, e);
+  }
+
+  CodeMirror.defineOption("lint", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      clearMarks(cm);
+      if (cm.state.lint.options.lintOnChange !== false)
+        cm.off("change", onChange);
+      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
+      clearTimeout(cm.state.lint.timeout);
+      delete cm.state.lint;
+    }
+
+    if (val) {
+      var gutters = cm.getOption("gutters"), hasLintGutter = false;
+      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
+      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
+      if (state.options.lintOnChange !== false)
+        cm.on("change", onChange);
+      if (state.options.tooltips != false && state.options.tooltips != "gutter")
+        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
+
+      startLinting(cm);
+    }
+  });
+
+  CodeMirror.defineExtension("performLint", function() {
+    if (this.state.lint) startLinting(this);
+  });
+});
diff --git a/core/media/editors/codemirror/addon/lint/lint.min.css b/core/media/editors/codemirror/addon/lint/lint.min.css
new file mode 100644
index 00000000..fde86f6a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/lint.min.css
@@ -0,0 +1 @@
+.CodeMirror-lint-markers{width:16px}.CodeMirror-lint-tooltip{background-color:#ffd;border:1px solid #000;border-radius:4px;color:#000;font-family:monospace;font-size:10pt;overflow:hidden;padding:2px 5px;position:fixed;white-space:pre;white-space:pre-wrap;z-index:100;max-width:600px;opacity:0;transition:opacity .4s;-moz-transition:opacity .4s;-webkit-transition:opacity .4s;-o-transition:opacity .4s;-ms-transition:opacity .4s}.CodeMirror-lint-mark-error,.CodeMirror-lint-mark-warning{background-position:left bottom;background-repeat:repeat-x}.CodeMirror-lint-mark-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==)}.CodeMirror-lint-mark-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=)}.CodeMirror-lint-marker-error,.CodeMirror-lint-marker-warning{background-position:center center;background-repeat:no-repeat;cursor:pointer;display:inline-block;height:16px;width:16px;vertical-align:middle;position:relative}.CodeMirror-lint-message-error,.CodeMirror-lint-message-warning{padding-left:18px;background-position:top left;background-repeat:no-repeat}.CodeMirror-lint-marker-error,.CodeMirror-lint-message-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=)}.CodeMirror-lint-marker-warning,.CodeMirror-lint-message-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=)}.CodeMirror-lint-marker-multiple{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-position:right bottom;width:100%;height:100%}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/lint.min.js b/core/media/editors/codemirror/addon/lint/lint.min.js
new file mode 100644
index 00000000..ec8b5660
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c){function d(b){return e.parentNode?(e.style.top=Math.max(0,b.clientY-e.offsetHeight-5)+"px",void(e.style.left=b.clientX+5+"px")):a.off(document,"mousemove",d)}var e=document.createElement("div");return e.className="CodeMirror-lint-tooltip",e.appendChild(c.cloneNode(!0)),document.body.appendChild(e),a.on(document,"mousemove",d),d(b),null!=e.style.opacity&&(e.style.opacity=1),e}function c(a){a.parentNode&&a.parentNode.removeChild(a)}function d(a){a.parentNode&&(null==a.style.opacity&&c(a),a.style.opacity=0,setTimeout((function(){c(a)}),600))}function e(c,e,f){function g(){a.off(f,"mouseout",g),h&&(d(h),h=null)}var h=b(c,e),i=setInterval((function(){if(h)for(var a=f;;a=a.parentNode){if(a&&11==a.nodeType&&(a=a.host),a==document.body)return;if(!a){g();break}}if(!h)return clearInterval(i)}),400);a.on(f,"mouseout",g)}function f(a,b,c){this.marked=[],this.options=b,this.timeout=null,this.hasGutter=c,this.onMouseOver=function(b){r(a,b)},this.waitingFor=0}function g(a,b){return b instanceof Function?{getAnnotations:b}:(b&&b!==!0||(b={}),b)}function h(a){var b=a.state.lint;b.hasGutter&&a.clearGutter(s);for(var c=0;c<b.marked.length;++c)b.marked[c].clear();b.marked.length=0}function i(b,c,d,f){var g=document.createElement("div"),h=g;return g.className="CodeMirror-lint-marker-"+c,d&&(h=g.appendChild(document.createElement("div")),h.className="CodeMirror-lint-marker-multiple"),0!=f&&a.on(h,"mouseover",(function(a){e(a,b,h)})),g}function j(a,b){return"error"==a?a:b}function k(a){for(var b=[],c=0;c<a.length;++c){var d=a[c],e=d.from.line;(b[e]||(b[e]=[])).push(d)}return b}function l(a){var b=a.severity;b||(b="error");var c=document.createElement("div");return c.className="CodeMirror-lint-message-"+b,"undefined"!=typeof a.messageHTML?c.innerHTML=a.messageHTML:c.appendChild(document.createTextNode(a.message)),c}function m(b,c,d){function e(){g=-1,b.off("change",e)}var f=b.state.lint,g=++f.waitingFor;b.on("change",e),c(b.getValue(),(function(c,d){b.off("change",e),f.waitingFor==g&&(d&&c instanceof a&&(c=d),b.operation((function(){o(b,c)})))}),d,b)}function n(b){var c=b.state.lint,d=c.options,e=d.options||d,f=d.getAnnotations||b.getHelper(a.Pos(0,0),"lint");if(f)if(d.async||f.async)m(b,f,e);else{var g=f(b.getValue(),e,b);if(!g)return;g.then?g.then((function(a){b.operation((function(){o(b,a)}))})):b.operation((function(){o(b,g)}))}}function o(a,b){h(a);for(var c=a.state.lint,d=c.options,e=k(b),f=0;f<e.length;++f){var g=e[f];if(g){for(var m=null,n=c.hasGutter&&document.createDocumentFragment(),o=0;o<g.length;++o){var p=g[o],q=p.severity;q||(q="error"),m=j(m,q),d.formatAnnotation&&(p=d.formatAnnotation(p)),c.hasGutter&&n.appendChild(l(p)),p.to&&c.marked.push(a.markText(p.from,p.to,{className:"CodeMirror-lint-mark-"+q,__annotation:p}))}c.hasGutter&&a.setGutterMarker(f,s,i(n,m,g.length>1,c.options.tooltips))}}d.onUpdateLinting&&d.onUpdateLinting(b,e,a)}function p(a){var b=a.state.lint;b&&(clearTimeout(b.timeout),b.timeout=setTimeout((function(){n(a)}),b.options.delay||500))}function q(a,b){for(var c=b.target||b.srcElement,d=document.createDocumentFragment(),f=0;f<a.length;f++){var g=a[f];d.appendChild(l(g))}e(b,d,c)}function r(a,b){var c=b.target||b.srcElement;if(/\bCodeMirror-lint-mark-/.test(c.className)){for(var d=c.getBoundingClientRect(),e=(d.left+d.right)/2,f=(d.top+d.bottom)/2,g=a.findMarksAt(a.coordsChar({left:e,top:f},"client")),h=[],i=0;i<g.length;++i){var j=g[i].__annotation;j&&h.push(j)}h.length&&q(h,b)}}var s="CodeMirror-lint-markers";a.defineOption("lint",!1,(function(b,c,d){if(d&&d!=a.Init&&(h(b),b.state.lint.options.lintOnChange!==!1&&b.off("change",p),a.off(b.getWrapperElement(),"mouseover",b.state.lint.onMouseOver),clearTimeout(b.state.lint.timeout),delete b.state.lint),c){for(var e=b.getOption("gutters"),i=!1,j=0;j<e.length;++j)e[j]==s&&(i=!0);var k=b.state.lint=new f(b,g(b,c),i);k.options.lintOnChange!==!1&&b.on("change",p),0!=k.options.tooltips&&"gutter"!=k.options.tooltips&&a.on(b.getWrapperElement(),"mouseover",k.onMouseOver),n(b)}})),a.defineExtension("performLint",(function(){this.state.lint&&n(this)}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/lint/yaml-lint.js b/core/media/editors/codemirror/addon/lint/yaml-lint.js
new file mode 100644
index 00000000..3954ed38
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/yaml-lint.js
@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+// Depends on js-yaml.js from https://github.com/nodeca/js-yaml
+
+// declare global: jsyaml
+
+CodeMirror.registerHelper("lint", "yaml", function(text) {
+  var found = [];
+  if (!window.jsyaml) {
+    if (window.console) {
+      window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run.");
+    }
+    return found;
+  }
+  try { jsyaml.load(text); }
+  catch(e) {
+      var loc = e.mark,
+          // js-yaml YAMLException doesn't always provide an accurate lineno
+          // e.g., when there are multiple yaml docs
+          // ---
+          // ---
+          // foo:bar
+          from = loc ? CodeMirror.Pos(loc.line, loc.column) : CodeMirror.Pos(0, 0),
+          to = from;
+      found.push({ from: from, to: to, message: e.message });
+  }
+  return found;
+});
+
+});
diff --git a/core/media/editors/codemirror/addon/lint/yaml-lint.min.js b/core/media/editors/codemirror/addon/lint/yaml-lint.min.js
new file mode 100644
index 00000000..3e5bd54e
--- /dev/null
+++ b/core/media/editors/codemirror/addon/lint/yaml-lint.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("lint","yaml",(function(b){var c=[];if(!window.jsyaml)return window.console&&window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run."),c;try{jsyaml.load(b)}catch(b){var d=b.mark,e=d?a.Pos(d.line,d.column):a.Pos(0,0),f=e;c.push({from:e,to:f,message:b.message})}return c}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/merge/merge.css b/core/media/editors/codemirror/addon/merge/merge.css
new file mode 100644
index 00000000..dadd7f59
--- /dev/null
+++ b/core/media/editors/codemirror/addon/merge/merge.css
@@ -0,0 +1,119 @@
+.CodeMirror-merge {
+  position: relative;
+  border: 1px solid #ddd;
+  white-space: pre;
+}
+
+.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
+  height: 350px;
+}
+
+.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
+.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
+.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
+.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
+
+.CodeMirror-merge-pane {
+  display: inline-block;
+  white-space: normal;
+  vertical-align: top;
+}
+.CodeMirror-merge-pane-rightmost {
+  position: absolute;
+  right: 0px;
+  z-index: 1;
+}
+
+.CodeMirror-merge-gap {
+  z-index: 2;
+  display: inline-block;
+  height: 100%;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: hidden;
+  border-left: 1px solid #ddd;
+  border-right: 1px solid #ddd;
+  position: relative;
+  background: #f8f8f8;
+}
+
+.CodeMirror-merge-scrolllock-wrap {
+  position: absolute;
+  bottom: 0; left: 50%;
+}
+.CodeMirror-merge-scrolllock {
+  position: relative;
+  left: -50%;
+  cursor: pointer;
+  color: #555;
+  line-height: 1;
+}
+.CodeMirror-merge-scrolllock:after {
+  content: "\21db\00a0\00a0\21da";
+}
+.CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
+  content: "\21db\21da";
+}
+
+.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
+  position: absolute;
+  left: 0; top: 0;
+  right: 0; bottom: 0;
+  line-height: 1;
+}
+
+.CodeMirror-merge-copy {
+  position: absolute;
+  cursor: pointer;
+  color: #44c;
+  z-index: 3;
+}
+
+.CodeMirror-merge-copy-reverse {
+  position: absolute;
+  cursor: pointer;
+  color: #44c;
+}
+
+.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
+.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
+
+.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
+  background-position: bottom left;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
+  background-position: bottom left;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-merge-r-chunk { background: #ffffe0; }
+.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
+.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
+.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
+
+.CodeMirror-merge-l-chunk { background: #eef; }
+.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
+.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
+.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
+
+.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
+.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
+.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
+
+.CodeMirror-merge-collapsed-widget:before {
+  content: "(...)";
+}
+.CodeMirror-merge-collapsed-widget {
+  cursor: pointer;
+  color: #88b;
+  background: #eef;
+  border: 1px solid #ddf;
+  font-size: 90%;
+  padding: 0 3px;
+  border-radius: 4px;
+}
+.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
diff --git a/core/media/editors/codemirror/addon/merge/merge.js b/core/media/editors/codemirror/addon/merge/merge.js
new file mode 100644
index 00000000..5b87b5e6
--- /dev/null
+++ b/core/media/editors/codemirror/addon/merge/merge.js
@@ -0,0 +1,1002 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror")); // Note non-packaged dependency diff_match_patch
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "diff_match_patch"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var Pos = CodeMirror.Pos;
+  var svgNS = "http://www.w3.org/2000/svg";
+
+  function DiffView(mv, type) {
+    this.mv = mv;
+    this.type = type;
+    this.classes = type == "left"
+      ? {chunk: "CodeMirror-merge-l-chunk",
+         start: "CodeMirror-merge-l-chunk-start",
+         end: "CodeMirror-merge-l-chunk-end",
+         insert: "CodeMirror-merge-l-inserted",
+         del: "CodeMirror-merge-l-deleted",
+         connect: "CodeMirror-merge-l-connect"}
+      : {chunk: "CodeMirror-merge-r-chunk",
+         start: "CodeMirror-merge-r-chunk-start",
+         end: "CodeMirror-merge-r-chunk-end",
+         insert: "CodeMirror-merge-r-inserted",
+         del: "CodeMirror-merge-r-deleted",
+         connect: "CodeMirror-merge-r-connect"};
+  }
+
+  DiffView.prototype = {
+    constructor: DiffView,
+    init: function(pane, orig, options) {
+      this.edit = this.mv.edit;
+      ;(this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
+      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
+      if (this.mv.options.connect == "align") {
+        if (!this.edit.state.trackAlignable) this.edit.state.trackAlignable = new TrackAlignable(this.edit)
+        this.orig.state.trackAlignable = new TrackAlignable(this.orig)
+      }
+
+      this.orig.state.diffViews = [this];
+      var classLocation = options.chunkClassLocation || "background";
+      if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
+      this.classes.classLocation = classLocation
+
+      this.diff = getDiff(asString(orig), asString(options.value), this.mv.options.ignoreWhitespace);
+      this.chunks = getChunks(this.diff);
+      this.diffOutOfDate = this.dealigned = false;
+      this.needsScrollSync = null
+
+      this.showDifferences = options.showDifferences !== false;
+    },
+    registerEvents: function(otherDv) {
+      this.forceUpdate = registerUpdate(this);
+      setScrollLock(this, true, false);
+      registerScroll(this, otherDv);
+    },
+    setShowDifferences: function(val) {
+      val = val !== false;
+      if (val != this.showDifferences) {
+        this.showDifferences = val;
+        this.forceUpdate("full");
+      }
+    }
+  };
+
+  function ensureDiff(dv) {
+    if (dv.diffOutOfDate) {
+      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue(), dv.mv.options.ignoreWhitespace);
+      dv.chunks = getChunks(dv.diff);
+      dv.diffOutOfDate = false;
+      CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
+    }
+  }
+
+  var updating = false;
+  function registerUpdate(dv) {
+    var edit = {from: 0, to: 0, marked: []};
+    var orig = {from: 0, to: 0, marked: []};
+    var debounceChange, updatingFast = false;
+    function update(mode) {
+      updating = true;
+      updatingFast = false;
+      if (mode == "full") {
+        if (dv.svg) clear(dv.svg);
+        if (dv.copyButtons) clear(dv.copyButtons);
+        clearMarks(dv.edit, edit.marked, dv.classes);
+        clearMarks(dv.orig, orig.marked, dv.classes);
+        edit.from = edit.to = orig.from = orig.to = 0;
+      }
+      ensureDiff(dv);
+      if (dv.showDifferences) {
+        updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
+        updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
+      }
+
+      if (dv.mv.options.connect == "align")
+        alignChunks(dv);
+      makeConnections(dv);
+      if (dv.needsScrollSync != null) syncScroll(dv, dv.needsScrollSync)
+
+      updating = false;
+    }
+    function setDealign(fast) {
+      if (updating) return;
+      dv.dealigned = true;
+      set(fast);
+    }
+    function set(fast) {
+      if (updating || updatingFast) return;
+      clearTimeout(debounceChange);
+      if (fast === true) updatingFast = true;
+      debounceChange = setTimeout(update, fast === true ? 20 : 250);
+    }
+    function change(_cm, change) {
+      if (!dv.diffOutOfDate) {
+        dv.diffOutOfDate = true;
+        edit.from = edit.to = orig.from = orig.to = 0;
+      }
+      // Update faster when a line was added/removed
+      setDealign(change.text.length - 1 != change.to.line - change.from.line);
+    }
+    function swapDoc() {
+      dv.diffOutOfDate = true;
+      dv.dealigned = true;
+      update("full");
+    }
+    dv.edit.on("change", change);
+    dv.orig.on("change", change);
+    dv.edit.on("swapDoc", swapDoc);
+    dv.orig.on("swapDoc", swapDoc);
+    if (dv.mv.options.connect == "align") {
+      CodeMirror.on(dv.edit.state.trackAlignable, "realign", setDealign)
+      CodeMirror.on(dv.orig.state.trackAlignable, "realign", setDealign)
+    }
+    dv.edit.on("viewportChange", function() { set(false); });
+    dv.orig.on("viewportChange", function() { set(false); });
+    update();
+    return update;
+  }
+
+  function registerScroll(dv, otherDv) {
+    dv.edit.on("scroll", function() {
+      syncScroll(dv, true) && makeConnections(dv);
+    });
+    dv.orig.on("scroll", function() {
+      syncScroll(dv, false) && makeConnections(dv);
+      if (otherDv) syncScroll(otherDv, true) && makeConnections(otherDv);
+    });
+  }
+
+  function syncScroll(dv, toOrig) {
+    // Change handler will do a refresh after a timeout when diff is out of date
+    if (dv.diffOutOfDate) {
+      if (dv.lockScroll && dv.needsScrollSync == null) dv.needsScrollSync = toOrig
+      return false
+    }
+    dv.needsScrollSync = null
+    if (!dv.lockScroll) return true;
+    var editor, other, now = +new Date;
+    if (toOrig) { editor = dv.edit; other = dv.orig; }
+    else { editor = dv.orig; other = dv.edit; }
+    // Don't take action if the position of this editor was recently set
+    // (to prevent feedback loops)
+    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 250 > now) return false;
+
+    var sInfo = editor.getScrollInfo();
+    if (dv.mv.options.connect == "align") {
+      targetPos = sInfo.top;
+    } else {
+      var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
+      var mid = editor.lineAtHeight(midY, "local");
+      var around = chunkBoundariesAround(dv.chunks, mid, toOrig);
+      var off = getOffsets(editor, toOrig ? around.edit : around.orig);
+      var offOther = getOffsets(other, toOrig ? around.orig : around.edit);
+      var ratio = (midY - off.top) / (off.bot - off.top);
+      var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
+
+      var botDist, mix;
+      // Some careful tweaking to make sure no space is left out of view
+      // when scrolling to top or bottom.
+      if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
+        targetPos = targetPos * mix + sInfo.top * (1 - mix);
+      } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
+        var otherInfo = other.getScrollInfo();
+        var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
+        if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
+          targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
+      }
+    }
+
+    other.scrollTo(sInfo.left, targetPos);
+    other.state.scrollSetAt = now;
+    other.state.scrollSetBy = dv;
+    return true;
+  }
+
+  function getOffsets(editor, around) {
+    var bot = around.after;
+    if (bot == null) bot = editor.lastLine() + 1;
+    return {top: editor.heightAtLine(around.before || 0, "local"),
+            bot: editor.heightAtLine(bot, "local")};
+  }
+
+  function setScrollLock(dv, val, action) {
+    dv.lockScroll = val;
+    if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
+    (val ? CodeMirror.addClass : CodeMirror.rmClass)(dv.lockButton, "CodeMirror-merge-scrolllock-enabled");
+  }
+
+  // Updating the marks for editor content
+
+  function removeClass(editor, line, classes) {
+    var locs = classes.classLocation
+    for (var i = 0; i < locs.length; i++) {
+      editor.removeLineClass(line, locs[i], classes.chunk);
+      editor.removeLineClass(line, locs[i], classes.start);
+      editor.removeLineClass(line, locs[i], classes.end);
+    }
+  }
+
+  function clearMarks(editor, arr, classes) {
+    for (var i = 0; i < arr.length; ++i) {
+      var mark = arr[i];
+      if (mark instanceof CodeMirror.TextMarker)
+        mark.clear();
+      else if (mark.parent)
+        removeClass(editor, mark, classes);
+    }
+    arr.length = 0;
+  }
+
+  // FIXME maybe add a margin around viewport to prevent too many updates
+  function updateMarks(editor, diff, state, type, classes) {
+    var vp = editor.getViewport();
+    editor.operation(function() {
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        clearMarks(editor, state.marked, classes);
+        markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
+        state.from = vp.from; state.to = vp.to;
+      } else {
+        if (vp.from < state.from) {
+          markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
+          state.from = vp.from;
+        }
+        if (vp.to > state.to) {
+          markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
+          state.to = vp.to;
+        }
+      }
+    });
+  }
+
+  function addClass(editor, lineNr, classes, main, start, end) {
+    var locs = classes.classLocation, line = editor.getLineHandle(lineNr);
+    for (var i = 0; i < locs.length; i++) {
+      if (main) editor.addLineClass(line, locs[i], classes.chunk);
+      if (start) editor.addLineClass(line, locs[i], classes.start);
+      if (end) editor.addLineClass(line, locs[i], classes.end);
+    }
+    return line;
+  }
+
+  function markChanges(editor, diff, type, marks, from, to, classes) {
+    var pos = Pos(0, 0);
+    var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
+    var cls = type == DIFF_DELETE ? classes.del : classes.insert;
+    function markChunk(start, end) {
+      var bfrom = Math.max(from, start), bto = Math.min(to, end);
+      for (var i = bfrom; i < bto; ++i)
+        marks.push(addClass(editor, i, classes, true, i == start, i == end - 1));
+      // When the chunk is empty, make sure a horizontal line shows up
+      if (start == end && bfrom == end && bto == end) {
+        if (bfrom)
+          marks.push(addClass(editor, bfrom - 1, classes, false, false, true));
+        else
+          marks.push(addClass(editor, bfrom, classes, false, true, false));
+      }
+    }
+
+    var chunkStart = 0, pending = false;
+    for (var i = 0; i < diff.length; ++i) {
+      var part = diff[i], tp = part[0], str = part[1];
+      if (tp == DIFF_EQUAL) {
+        var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
+        moveOver(pos, str);
+        var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
+        if (cleanTo > cleanFrom) {
+          if (pending) { markChunk(chunkStart, cleanFrom); pending = false }
+          chunkStart = cleanTo;
+        }
+      } else {
+        pending = true
+        if (tp == type) {
+          var end = moveOver(pos, str, true);
+          var a = posMax(top, pos), b = posMin(bot, end);
+          if (!posEq(a, b))
+            marks.push(editor.markText(a, b, {className: cls}));
+          pos = end;
+        }
+      }
+    }
+    if (pending) markChunk(chunkStart, pos.line + 1);
+  }
+
+  // Updating the gap between editor and original
+
+  function makeConnections(dv) {
+    if (!dv.showDifferences) return;
+
+    if (dv.svg) {
+      clear(dv.svg);
+      var w = dv.gap.offsetWidth;
+      attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
+    }
+    if (dv.copyButtons) clear(dv.copyButtons);
+
+    var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
+    var outerTop = dv.mv.wrap.getBoundingClientRect().top
+    var sTopEdit = outerTop - dv.edit.getScrollerElement().getBoundingClientRect().top + dv.edit.getScrollInfo().top
+    var sTopOrig = outerTop - dv.orig.getScrollerElement().getBoundingClientRect().top + dv.orig.getScrollInfo().top;
+    for (var i = 0; i < dv.chunks.length; i++) {
+      var ch = dv.chunks[i];
+      if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&
+          ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from)
+        drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w);
+    }
+  }
+
+  function getMatchingOrigLine(editLine, chunks) {
+    var editStart = 0, origStart = 0;
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null;
+      if (chunk.editFrom > editLine) break;
+      editStart = chunk.editTo;
+      origStart = chunk.origTo;
+    }
+    return origStart + (editLine - editStart);
+  }
+
+  // Combines information about chunks and widgets/markers to return
+  // an array of lines, in a single editor, that probably need to be
+  // aligned with their counterparts in the editor next to it.
+  function alignableFor(cm, chunks, isOrig) {
+    var tracker = cm.state.trackAlignable
+    var start = cm.firstLine(), trackI = 0
+    var result = []
+    for (var i = 0;; i++) {
+      var chunk = chunks[i]
+      var chunkStart = !chunk ? 1e9 : isOrig ? chunk.origFrom : chunk.editFrom
+      for (; trackI < tracker.alignable.length; trackI += 2) {
+        var n = tracker.alignable[trackI] + 1
+        if (n <= start) continue
+        if (n <= chunkStart) result.push(n)
+        else break
+      }
+      if (!chunk) break
+      result.push(start = isOrig ? chunk.origTo : chunk.editTo)
+    }
+    return result
+  }
+
+  // Given information about alignable lines in two editors, fill in
+  // the result (an array of three-element arrays) to reflect the
+  // lines that need to be aligned with each other.
+  function mergeAlignable(result, origAlignable, chunks, setIndex) {
+    var rI = 0, origI = 0, chunkI = 0, diff = 0
+    outer: for (;; rI++) {
+      var nextR = result[rI], nextO = origAlignable[origI]
+      if (!nextR && nextO == null) break
+
+      var rLine = nextR ? nextR[0] : 1e9, oLine = nextO == null ? 1e9 : nextO
+      while (chunkI < chunks.length) {
+        var chunk = chunks[chunkI]
+        if (chunk.origFrom <= oLine && chunk.origTo > oLine) {
+          origI++
+          rI--
+          continue outer;
+        }
+        if (chunk.editTo > rLine) {
+          if (chunk.editFrom <= rLine) continue outer;
+          break
+        }
+        diff += (chunk.origTo - chunk.origFrom) - (chunk.editTo - chunk.editFrom)
+        chunkI++
+      }
+      if (rLine == oLine - diff) {
+        nextR[setIndex] = oLine
+        origI++
+      } else if (rLine < oLine - diff) {
+        nextR[setIndex] = rLine + diff
+      } else {
+        var record = [oLine - diff, null, null]
+        record[setIndex] = oLine
+        result.splice(rI, 0, record)
+        origI++
+      }
+    }
+  }
+
+  function findAlignedLines(dv, other) {
+    var alignable = alignableFor(dv.edit, dv.chunks, false), result = []
+    if (other) for (var i = 0, j = 0; i < other.chunks.length; i++) {
+      var n = other.chunks[i].editTo
+      while (j < alignable.length && alignable[j] < n) j++
+      if (j == alignable.length || alignable[j] != n) alignable.splice(j++, 0, n)
+    }
+    for (var i = 0; i < alignable.length; i++)
+      result.push([alignable[i], null, null])
+
+    mergeAlignable(result, alignableFor(dv.orig, dv.chunks, true), dv.chunks, 1)
+    if (other)
+      mergeAlignable(result, alignableFor(other.orig, other.chunks, true), other.chunks, 2)
+
+    return result
+  }
+
+  function alignChunks(dv, force) {
+    if (!dv.dealigned && !force) return;
+    if (!dv.orig.curOp) return dv.orig.operation(function() {
+      alignChunks(dv, force);
+    });
+
+    dv.dealigned = false;
+    var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left;
+    if (other) {
+      ensureDiff(other);
+      other.dealigned = false;
+    }
+    var linesToAlign = findAlignedLines(dv, other);
+
+    // Clear old aligners
+    var aligners = dv.mv.aligners;
+    for (var i = 0; i < aligners.length; i++)
+      aligners[i].clear();
+    aligners.length = 0;
+
+    var cm = [dv.edit, dv.orig], scroll = [];
+    if (other) cm.push(other.orig);
+    for (var i = 0; i < cm.length; i++)
+      scroll.push(cm[i].getScrollInfo().top);
+
+    for (var ln = 0; ln < linesToAlign.length; ln++)
+      alignLines(cm, linesToAlign[ln], aligners);
+
+    for (var i = 0; i < cm.length; i++)
+      cm[i].scrollTo(null, scroll[i]);
+  }
+
+  function alignLines(cm, lines, aligners) {
+    var maxOffset = 0, offset = [];
+    for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
+      var off = cm[i].heightAtLine(lines[i], "local");
+      offset[i] = off;
+      maxOffset = Math.max(maxOffset, off);
+    }
+    for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
+      var diff = maxOffset - offset[i];
+      if (diff > 1)
+        aligners.push(padAbove(cm[i], lines[i], diff));
+    }
+  }
+
+  function padAbove(cm, line, size) {
+    var above = true;
+    if (line > cm.lastLine()) {
+      line--;
+      above = false;
+    }
+    var elt = document.createElement("div");
+    elt.className = "CodeMirror-merge-spacer";
+    elt.style.height = size + "px"; elt.style.minWidth = "1px";
+    return cm.addLineWidget(line, elt, {height: size, above: above, mergeSpacer: true, handleMouseEvents: true});
+  }
+
+  function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
+    var flip = dv.type == "left";
+    var top = dv.orig.heightAtLine(chunk.origFrom, "local", true) - sTopOrig;
+    if (dv.svg) {
+      var topLpx = top;
+      var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local", true) - sTopEdit;
+      if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
+      var botLpx = dv.orig.heightAtLine(chunk.origTo, "local", true) - sTopOrig;
+      var botRpx = dv.edit.heightAtLine(chunk.editTo, "local", true) - sTopEdit;
+      if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
+      var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
+      var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
+      attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
+            "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
+            "class", dv.classes.connect);
+    }
+    if (dv.copyButtons) {
+      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
+                                                "CodeMirror-merge-copy"));
+      var editOriginals = dv.mv.options.allowEditingOriginals;
+      copy.title = editOriginals ? "Push to left" : "Revert chunk";
+      copy.chunk = chunk;
+      copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
+
+      if (editOriginals) {
+        var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
+        var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
+                                                         "CodeMirror-merge-copy-reverse"));
+        copyReverse.title = "Push to right";
+        copyReverse.chunk = {editFrom: chunk.origFrom, editTo: chunk.origTo,
+                             origFrom: chunk.editFrom, origTo: chunk.editTo};
+        copyReverse.style.top = topReverse + "px";
+        dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
+      }
+    }
+  }
+
+  function copyChunk(dv, to, from, chunk) {
+    if (dv.diffOutOfDate) return;
+    var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0)
+    var origEnd = Pos(chunk.origTo, 0)
+    var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
+    var editEnd = Pos(chunk.editTo, 0)
+    var handler = dv.mv.options.revertChunk
+    if (handler)
+      handler(dv.mv, from, origStart, origEnd, to, editStart, editEnd)
+    else
+      to.replaceRange(from.getRange(origStart, origEnd), editStart, editEnd)
+  }
+
+  // Merge view, containing 0, 1, or 2 diff views.
+
+  var MergeView = CodeMirror.MergeView = function(node, options) {
+    if (!(this instanceof MergeView)) return new MergeView(node, options);
+
+    this.options = options;
+    var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
+
+    var hasLeft = origLeft != null, hasRight = origRight != null;
+    var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
+    var wrap = [], left = this.left = null, right = this.right = null;
+    var self = this;
+
+    if (hasLeft) {
+      left = this.left = new DiffView(this, "left");
+      var leftPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-left");
+      wrap.push(leftPane);
+      wrap.push(buildGap(left));
+    }
+
+    var editPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-editor");
+    wrap.push(editPane);
+
+    if (hasRight) {
+      right = this.right = new DiffView(this, "right");
+      wrap.push(buildGap(right));
+      var rightPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-right");
+      wrap.push(rightPane);
+    }
+
+    (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
+
+    wrap.push(elt("div", null, null, "height: 0; clear: both;"));
+
+    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
+    this.edit = CodeMirror(editPane, copyObj(options));
+
+    if (left) left.init(leftPane, origLeft, options);
+    if (right) right.init(rightPane, origRight, options);
+    if (options.collapseIdentical)
+      this.editor().operation(function() {
+        collapseIdenticalStretches(self, options.collapseIdentical);
+      });
+    if (options.connect == "align") {
+      this.aligners = [];
+      alignChunks(this.left || this.right, true);
+    }
+    if (left) left.registerEvents(right)
+    if (right) right.registerEvents(left)
+
+
+    var onResize = function() {
+      if (left) makeConnections(left);
+      if (right) makeConnections(right);
+    };
+    CodeMirror.on(window, "resize", onResize);
+    var resizeInterval = setInterval(function() {
+      for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
+      if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
+    }, 5000);
+  };
+
+  function buildGap(dv) {
+    var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
+    lock.title = "Toggle locked scrolling";
+    var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
+    CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
+    var gapElts = [lockWrap];
+    if (dv.mv.options.revertButtons !== false) {
+      dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
+      CodeMirror.on(dv.copyButtons, "click", function(e) {
+        var node = e.target || e.srcElement;
+        if (!node.chunk) return;
+        if (node.className == "CodeMirror-merge-copy-reverse") {
+          copyChunk(dv, dv.orig, dv.edit, node.chunk);
+          return;
+        }
+        copyChunk(dv, dv.edit, dv.orig, node.chunk);
+      });
+      gapElts.unshift(dv.copyButtons);
+    }
+    if (dv.mv.options.connect != "align") {
+      var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
+      if (svg && !svg.createSVGRect) svg = null;
+      dv.svg = svg;
+      if (svg) gapElts.push(svg);
+    }
+
+    return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
+  }
+
+  MergeView.prototype = {
+    constructor: MergeView,
+    editor: function() { return this.edit; },
+    rightOriginal: function() { return this.right && this.right.orig; },
+    leftOriginal: function() { return this.left && this.left.orig; },
+    setShowDifferences: function(val) {
+      if (this.right) this.right.setShowDifferences(val);
+      if (this.left) this.left.setShowDifferences(val);
+    },
+    rightChunks: function() {
+      if (this.right) { ensureDiff(this.right); return this.right.chunks; }
+    },
+    leftChunks: function() {
+      if (this.left) { ensureDiff(this.left); return this.left.chunks; }
+    }
+  };
+
+  function asString(obj) {
+    if (typeof obj == "string") return obj;
+    else return obj.getValue();
+  }
+
+  // Operations on diffs
+  var dmp;
+  function getDiff(a, b, ignoreWhitespace) {
+    if (!dmp) dmp = new diff_match_patch();
+
+    var diff = dmp.diff_main(a, b);
+    // The library sometimes leaves in empty parts, which confuse the algorithm
+    for (var i = 0; i < diff.length; ++i) {
+      var part = diff[i];
+      if (ignoreWhitespace ? !/[^ \t]/.test(part[1]) : !part[1]) {
+        diff.splice(i--, 1);
+      } else if (i && diff[i - 1][0] == part[0]) {
+        diff.splice(i--, 1);
+        diff[i][1] += part[1];
+      }
+    }
+    return diff;
+  }
+
+  function getChunks(diff) {
+    var chunks = [];
+    if (!diff.length) return chunks;
+    var startEdit = 0, startOrig = 0;
+    var edit = Pos(0, 0), orig = Pos(0, 0);
+    for (var i = 0; i < diff.length; ++i) {
+      var part = diff[i], tp = part[0];
+      if (tp == DIFF_EQUAL) {
+        var startOff = !startOfLineClean(diff, i) || edit.line < startEdit || orig.line < startOrig ? 1 : 0;
+        var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
+        moveOver(edit, part[1], null, orig);
+        var endOff = endOfLineClean(diff, i) ? 1 : 0;
+        var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
+        if (cleanToEdit > cleanFromEdit) {
+          if (i) chunks.push({origFrom: startOrig, origTo: cleanFromOrig,
+                              editFrom: startEdit, editTo: cleanFromEdit});
+          startEdit = cleanToEdit; startOrig = cleanToOrig;
+        }
+      } else {
+        moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
+      }
+    }
+    if (startEdit <= edit.line || startOrig <= orig.line)
+      chunks.push({origFrom: startOrig, origTo: orig.line + 1,
+                   editFrom: startEdit, editTo: edit.line + 1});
+    return chunks;
+  }
+
+  function endOfLineClean(diff, i) {
+    if (i == diff.length - 1) return true;
+    var next = diff[i + 1][1];
+    if ((next.length == 1 && i < diff.length - 2) || next.charCodeAt(0) != 10) return false;
+    if (i == diff.length - 2) return true;
+    next = diff[i + 2][1];
+    return (next.length > 1 || i == diff.length - 3) && next.charCodeAt(0) == 10;
+  }
+
+  function startOfLineClean(diff, i) {
+    if (i == 0) return true;
+    var last = diff[i - 1][1];
+    if (last.charCodeAt(last.length - 1) != 10) return false;
+    if (i == 1) return true;
+    last = diff[i - 2][1];
+    return last.charCodeAt(last.length - 1) == 10;
+  }
+
+  function chunkBoundariesAround(chunks, n, nInEdit) {
+    var beforeE, afterE, beforeO, afterO;
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      var fromLocal = nInEdit ? chunk.editFrom : chunk.origFrom;
+      var toLocal = nInEdit ? chunk.editTo : chunk.origTo;
+      if (afterE == null) {
+        if (fromLocal > n) { afterE = chunk.editFrom; afterO = chunk.origFrom; }
+        else if (toLocal > n) { afterE = chunk.editTo; afterO = chunk.origTo; }
+      }
+      if (toLocal <= n) { beforeE = chunk.editTo; beforeO = chunk.origTo; }
+      else if (fromLocal <= n) { beforeE = chunk.editFrom; beforeO = chunk.origFrom; }
+    }
+    return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
+  }
+
+  function collapseSingle(cm, from, to) {
+    cm.addLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
+    var widget = document.createElement("span");
+    widget.className = "CodeMirror-merge-collapsed-widget";
+    widget.title = "Identical text collapsed. Click to expand.";
+    var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
+      inclusiveLeft: true,
+      inclusiveRight: true,
+      replacedWith: widget,
+      clearOnEnter: true
+    });
+    function clear() {
+      mark.clear();
+      cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
+    }
+    if (mark.explicitlyCleared) clear();
+    CodeMirror.on(widget, "click", clear);
+    mark.on("clear", clear);
+    CodeMirror.on(widget, "click", clear);
+    return {mark: mark, clear: clear};
+  }
+
+  function collapseStretch(size, editors) {
+    var marks = [];
+    function clear() {
+      for (var i = 0; i < marks.length; i++) marks[i].clear();
+    }
+    for (var i = 0; i < editors.length; i++) {
+      var editor = editors[i];
+      var mark = collapseSingle(editor.cm, editor.line, editor.line + size);
+      marks.push(mark);
+      mark.mark.on("clear", clear);
+    }
+    return marks[0].mark;
+  }
+
+  function unclearNearChunks(dv, margin, off, clear) {
+    for (var i = 0; i < dv.chunks.length; i++) {
+      var chunk = dv.chunks[i];
+      for (var l = chunk.editFrom - margin; l < chunk.editTo + margin; l++) {
+        var pos = l + off;
+        if (pos >= 0 && pos < clear.length) clear[pos] = false;
+      }
+    }
+  }
+
+  function collapseIdenticalStretches(mv, margin) {
+    if (typeof margin != "number") margin = 2;
+    var clear = [], edit = mv.editor(), off = edit.firstLine();
+    for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true);
+    if (mv.left) unclearNearChunks(mv.left, margin, off, clear);
+    if (mv.right) unclearNearChunks(mv.right, margin, off, clear);
+
+    for (var i = 0; i < clear.length; i++) {
+      if (clear[i]) {
+        var line = i + off;
+        for (var size = 1; i < clear.length - 1 && clear[i + 1]; i++, size++) {}
+        if (size > margin) {
+          var editors = [{line: line, cm: edit}];
+          if (mv.left) editors.push({line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig});
+          if (mv.right) editors.push({line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig});
+          var mark = collapseStretch(size, editors);
+          if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark);
+        }
+      }
+    }
+  }
+
+  // General utilities
+
+  function elt(tag, content, className, style) {
+    var e = document.createElement(tag);
+    if (className) e.className = className;
+    if (style) e.style.cssText = style;
+    if (typeof content == "string") e.appendChild(document.createTextNode(content));
+    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
+    return e;
+  }
+
+  function clear(node) {
+    for (var count = node.childNodes.length; count > 0; --count)
+      node.removeChild(node.firstChild);
+  }
+
+  function attrs(elt) {
+    for (var i = 1; i < arguments.length; i += 2)
+      elt.setAttribute(arguments[i], arguments[i+1]);
+  }
+
+  function copyObj(obj, target) {
+    if (!target) target = {};
+    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
+    return target;
+  }
+
+  function moveOver(pos, str, copy, other) {
+    var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
+    for (;;) {
+      var nl = str.indexOf("\n", at);
+      if (nl == -1) break;
+      ++out.line;
+      if (other) ++other.line;
+      at = nl + 1;
+    }
+    out.ch = (at ? 0 : out.ch) + (str.length - at);
+    if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
+    return out;
+  }
+
+  // Tracks collapsed markers and line widgets, in order to be able to
+  // accurately align the content of two editors.
+
+  var F_WIDGET = 1, F_WIDGET_BELOW = 2, F_MARKER = 4
+
+  function TrackAlignable(cm) {
+    this.cm = cm
+    this.alignable = []
+    this.height = cm.doc.height
+    var self = this
+    cm.on("markerAdded", function(_, marker) {
+      if (!marker.collapsed) return
+      var found = marker.find(1)
+      if (found != null) self.set(found.line, F_MARKER)
+    })
+    cm.on("markerCleared", function(_, marker, _min, max) {
+      if (max != null && marker.collapsed)
+        self.check(max, F_MARKER, self.hasMarker)
+    })
+    cm.on("markerChanged", this.signal.bind(this))
+    cm.on("lineWidgetAdded", function(_, widget, lineNo) {
+      if (widget.mergeSpacer) return
+      if (widget.above) self.set(lineNo - 1, F_WIDGET_BELOW)
+      else self.set(lineNo, F_WIDGET)
+    })
+    cm.on("lineWidgetCleared", function(_, widget, lineNo) {
+      if (widget.mergeSpacer) return
+      if (widget.above) self.check(lineNo - 1, F_WIDGET_BELOW, self.hasWidgetBelow)
+      else self.check(lineNo, F_WIDGET, self.hasWidget)
+    })
+    cm.on("lineWidgetChanged", this.signal.bind(this))
+    cm.on("change", function(_, change) {
+      var start = change.from.line, nBefore = change.to.line - change.from.line
+      var nAfter = change.text.length - 1, end = start + nAfter
+      if (nBefore || nAfter) self.map(start, nBefore, nAfter)
+      self.check(end, F_MARKER, self.hasMarker)
+      if (nBefore || nAfter) self.check(change.from.line, F_MARKER, self.hasMarker)
+    })
+    cm.on("viewportChange", function() {
+      if (self.cm.doc.height != self.height) self.signal()
+    })
+  }
+
+  TrackAlignable.prototype = {
+    signal: function() {
+      CodeMirror.signal(this, "realign")
+      this.height = this.cm.doc.height
+    },
+
+    set: function(n, flags) {
+      var pos = -1
+      for (; pos < this.alignable.length; pos += 2) {
+        var diff = this.alignable[pos] - n
+        if (diff == 0) {
+          if ((this.alignable[pos + 1] & flags) == flags) return
+          this.alignable[pos + 1] |= flags
+          this.signal()
+          return
+        }
+        if (diff > 0) break
+      }
+      this.signal()
+      this.alignable.splice(pos, 0, n, flags)
+    },
+
+    find: function(n) {
+      for (var i = 0; i < this.alignable.length; i += 2)
+        if (this.alignable[i] == n) return i
+      return -1
+    },
+
+    check: function(n, flag, pred) {
+      var found = this.find(n)
+      if (found == -1 || !(this.alignable[found + 1] & flag)) return
+      if (!pred.call(this, n)) {
+        this.signal()
+        var flags = this.alignable[found + 1] & ~flag
+        if (flags) this.alignable[found + 1] = flags
+        else this.alignable.splice(found, 2)
+      }
+    },
+
+    hasMarker: function(n) {
+      var handle = this.cm.getLineHandle(n)
+      if (handle.markedSpans) for (var i = 0; i < handle.markedSpans.length; i++)
+        if (handle.markedSpans[i].mark.collapsed && handle.markedSpans[i].to != null)
+          return true
+      return false
+    },
+
+    hasWidget: function(n) {
+      var handle = this.cm.getLineHandle(n)
+      if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++)
+        if (!handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
+      return false
+    },
+
+    hasWidgetBelow: function(n) {
+      if (n == this.cm.lastLine()) return false
+      var handle = this.cm.getLineHandle(n + 1)
+      if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++)
+        if (handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
+      return false
+    },
+
+    map: function(from, nBefore, nAfter) {
+      var diff = nAfter - nBefore, to = from + nBefore, widgetFrom = -1, widgetTo = -1
+      for (var i = 0; i < this.alignable.length; i += 2) {
+        var n = this.alignable[i]
+        if (n == from && (this.alignable[i + 1] & F_WIDGET_BELOW)) widgetFrom = i
+        if (n == to && (this.alignable[i + 1] & F_WIDGET_BELOW)) widgetTo = i
+        if (n <= from) continue
+        else if (n < to) this.alignable.splice(i--, 2)
+        else this.alignable[i] += diff
+      }
+      if (widgetFrom > -1) {
+        var flags = this.alignable[widgetFrom + 1]
+        if (flags == F_WIDGET_BELOW) this.alignable.splice(widgetFrom, 2)
+        else this.alignable[widgetFrom + 1] = flags & ~F_WIDGET_BELOW
+      }
+      if (widgetTo > -1 && nAfter)
+        this.set(from + nAfter, F_WIDGET_BELOW)
+    }
+  }
+
+  function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
+  function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
+  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
+
+  function findPrevDiff(chunks, start, isOrig) {
+    for (var i = chunks.length - 1; i >= 0; i--) {
+      var chunk = chunks[i];
+      var to = (isOrig ? chunk.origTo : chunk.editTo) - 1;
+      if (to < start) return to;
+    }
+  }
+
+  function findNextDiff(chunks, start, isOrig) {
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      var from = (isOrig ? chunk.origFrom : chunk.editFrom);
+      if (from > start) return from;
+    }
+  }
+
+  function goNearbyDiff(cm, dir) {
+    var found = null, views = cm.state.diffViews, line = cm.getCursor().line;
+    if (views) for (var i = 0; i < views.length; i++) {
+      var dv = views[i], isOrig = cm == dv.orig;
+      ensureDiff(dv);
+      var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
+      if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
+        found = pos;
+    }
+    if (found != null)
+      cm.setCursor(found, 0);
+    else
+      return CodeMirror.Pass;
+  }
+
+  CodeMirror.commands.goNextDiff = function(cm) {
+    return goNearbyDiff(cm, 1);
+  };
+  CodeMirror.commands.goPrevDiff = function(cm) {
+    return goNearbyDiff(cm, -1);
+  };
+});
diff --git a/core/media/editors/codemirror/addon/merge/merge.min.css b/core/media/editors/codemirror/addon/merge/merge.min.css
new file mode 100644
index 00000000..24a20a1d
--- /dev/null
+++ b/core/media/editors/codemirror/addon/merge/merge.min.css
@@ -0,0 +1 @@
+.CodeMirror-merge{position:relative;border:1px solid #ddd;white-space:pre}.CodeMirror-merge,.CodeMirror-merge .CodeMirror{height:350px}.CodeMirror-merge-2pane .CodeMirror-merge-pane{width:47%}.CodeMirror-merge-2pane .CodeMirror-merge-gap{width:6%}.CodeMirror-merge-3pane .CodeMirror-merge-pane{width:31%}.CodeMirror-merge-3pane .CodeMirror-merge-gap{width:3.5%}.CodeMirror-merge-pane{display:inline-block;white-space:normal;vertical-align:top}.CodeMirror-merge-pane-rightmost{position:absolute;right:0;z-index:1}.CodeMirror-merge-gap{z-index:2;display:inline-block;height:100%;-moz-box-sizing:border-box;box-sizing:border-box;overflow:hidden;border-left:1px solid #ddd;border-right:1px solid #ddd;position:relative;background:#f8f8f8}.CodeMirror-merge-scrolllock-wrap{position:absolute;bottom:0;left:50%}.CodeMirror-merge-scrolllock{position:relative;left:-50%;cursor:pointer;color:#555;line-height:1}.CodeMirror-merge-copy,.CodeMirror-merge-copy-reverse{position:absolute;color:#44c;cursor:pointer}.CodeMirror-merge-scrolllock:after{content:"\21db\00a0\00a0\21da"}.CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after{content:"\21db\21da"}.CodeMirror-merge-copybuttons-left,.CodeMirror-merge-copybuttons-right{position:absolute;left:0;top:0;right:0;bottom:0;line-height:1}.CodeMirror-merge-copy{z-index:3}.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy{left:2px}.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy{right:2px}.CodeMirror-merge-l-inserted,.CodeMirror-merge-r-inserted{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-merge-l-deleted,.CodeMirror-merge-r-deleted{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);background-position:bottom left;background-repeat:repeat-x}.CodeMirror-merge-r-chunk{background:#ffffe0}.CodeMirror-merge-r-chunk-start{border-top:1px solid #ee8}.CodeMirror-merge-r-chunk-end{border-bottom:1px solid #ee8}.CodeMirror-merge-r-connect{fill:#ffffe0;stroke:#ee8;stroke-width:1px}.CodeMirror-merge-l-chunk{background:#eef}.CodeMirror-merge-l-chunk-start{border-top:1px solid #88e}.CodeMirror-merge-l-chunk-end{border-bottom:1px solid #88e}.CodeMirror-merge-l-connect{fill:#eef;stroke:#88e;stroke-width:1px}.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk{background:#dfd}.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start{border-top:1px solid #4e4}.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end{border-bottom:1px solid #4e4}.CodeMirror-merge-collapsed-widget:before{content:"(...)"}.CodeMirror-merge-collapsed-widget{cursor:pointer;color:#88b;background:#eef;border:1px solid #ddf;font-size:90%;padding:0 3px;border-radius:4px}.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt{display:none}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/merge/merge.min.js b/core/media/editors/codemirror/addon/merge/merge.min.js
new file mode 100644
index 00000000..471606b0
--- /dev/null
+++ b/core/media/editors/codemirror/addon/merge/merge.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","diff_match_patch"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){this.mv=a,this.type=b,this.classes="left"==b?{chunk:"CodeMirror-merge-l-chunk",start:"CodeMirror-merge-l-chunk-start",end:"CodeMirror-merge-l-chunk-end",insert:"CodeMirror-merge-l-inserted",del:"CodeMirror-merge-l-deleted",connect:"CodeMirror-merge-l-connect"}:{chunk:"CodeMirror-merge-r-chunk",start:"CodeMirror-merge-r-chunk-start",end:"CodeMirror-merge-r-chunk-end",insert:"CodeMirror-merge-r-inserted",del:"CodeMirror-merge-r-deleted",connect:"CodeMirror-merge-r-connect"}}function c(b){b.diffOutOfDate&&(b.diff=z(b.orig.getValue(),b.edit.getValue(),b.mv.options.ignoreWhitespace),b.chunks=A(b.diff),b.diffOutOfDate=!1,a.signal(b.edit,"updateDiff",b.diff))}function d(b){function d(a){W=!0,p=!1,"full"==a&&(b.svg&&J(b.svg),b.copyButtons&&J(b.copyButtons),j(b.edit,m.marked,b.classes),j(b.orig,o.marked,b.classes),m.from=m.to=o.from=o.to=0),c(b),b.showDifferences&&(k(b.edit,b.diff,m,DIFF_INSERT,b.classes),k(b.orig,b.diff,o,DIFF_DELETE,b.classes)),"align"==b.mv.options.connect&&s(b),n(b),null!=b.needsScrollSync&&f(b,b.needsScrollSync),W=!1}function e(a){W||(b.dealigned=!0,g(a))}function g(a){W||p||(clearTimeout(l),a===!0&&(p=!0),l=setTimeout(d,a===!0?20:250))}function h(a,c){b.diffOutOfDate||(b.diffOutOfDate=!0,m.from=m.to=o.from=o.to=0),e(c.text.length-1!=c.to.line-c.from.line)}function i(){b.diffOutOfDate=!0,b.dealigned=!0,d("full")}var l,m={from:0,to:0,marked:[]},o={from:0,to:0,marked:[]},p=!1;return b.edit.on("change",h),b.orig.on("change",h),b.edit.on("swapDoc",i),b.orig.on("swapDoc",i),"align"==b.mv.options.connect&&(a.on(b.edit.state.trackAlignable,"realign",e),a.on(b.orig.state.trackAlignable,"realign",e)),b.edit.on("viewportChange",(function(){g(!1)})),b.orig.on("viewportChange",(function(){g(!1)})),d(),d}function e(a,b){a.edit.on("scroll",(function(){f(a,!0)&&n(a)})),a.orig.on("scroll",(function(){f(a,!1)&&n(a),b&&f(b,!0)&&n(b)}))}function f(a,b){if(a.diffOutOfDate)return a.lockScroll&&null==a.needsScrollSync&&(a.needsScrollSync=b),!1;if(a.needsScrollSync=null,!a.lockScroll)return!0;var c,d,e=+new Date;if(b?(c=a.edit,d=a.orig):(c=a.orig,d=a.edit),c.state.scrollSetBy==a&&(c.state.scrollSetAt||0)+250>e)return!1;var f=c.getScrollInfo();if("align"==a.mv.options.connect)q=f.top;else{var h,i,j=.5*f.clientHeight,k=f.top+j,l=c.lineAtHeight(k,"local"),m=D(a.chunks,l,b),n=g(c,b?m.edit:m.orig),o=g(d,b?m.orig:m.edit),p=(k-n.top)/(n.bot-n.top),q=o.top-j+p*(o.bot-o.top);if(q>f.top&&(i=f.top/j)<1)q=q*i+f.top*(1-i);else if((h=f.height-f.clientHeight-f.top)<j){var r=d.getScrollInfo(),s=r.height-r.clientHeight-q;s>h&&(i=h/j)<1&&(q=q*i+(r.height-r.clientHeight-h)*(1-i))}}return d.scrollTo(f.left,q),d.state.scrollSetAt=e,d.state.scrollSetBy=a,!0}function g(a,b){var c=b.after;return null==c&&(c=a.lastLine()+1),{top:a.heightAtLine(b.before||0,"local"),bot:a.heightAtLine(c,"local")}}function h(b,c,d){b.lockScroll=c,c&&0!=d&&f(b,DIFF_INSERT)&&n(b),(c?a.addClass:a.rmClass)(b.lockButton,"CodeMirror-merge-scrolllock-enabled")}function i(a,b,c){for(var d=c.classLocation,e=0;e<d.length;e++)a.removeLineClass(b,d[e],c.chunk),a.removeLineClass(b,d[e],c.start),a.removeLineClass(b,d[e],c.end)}function j(b,c,d){for(var e=0;e<c.length;++e){var f=c[e];f instanceof a.TextMarker?f.clear():f.parent&&i(b,f,d)}c.length=0}function k(a,b,c,d,e){var f=a.getViewport();a.operation((function(){c.from==c.to||f.from-c.to>20||c.from-f.to>20?(j(a,c.marked,e),m(a,b,d,c.marked,f.from,f.to,e),c.from=f.from,c.to=f.to):(f.from<c.from&&(m(a,b,d,c.marked,f.from,c.from,e),c.from=f.from),f.to>c.to&&(m(a,b,d,c.marked,c.to,f.to,e),c.to=f.to))}))}function l(a,b,c,d,e,f){for(var g=c.classLocation,h=a.getLineHandle(b),i=0;i<g.length;i++)d&&a.addLineClass(h,g[i],c.chunk),e&&a.addLineClass(h,g[i],c.start),f&&a.addLineClass(h,g[i],c.end);return h}function m(a,b,c,d,e,f,g){function h(b,c){for(var h=Math.max(e,b),i=Math.min(f,c),j=h;j<i;++j)d.push(l(a,j,g,!0,j==b,j==c-1));b==c&&h==c&&i==c&&(h?d.push(l(a,h-1,g,!1,!1,!0)):d.push(l(a,h,g,!1,!0,!1)))}for(var i=U(0,0),j=U(e,0),k=a.clipPos(U(f-1)),m=c==DIFF_DELETE?g.del:g.insert,n=0,o=!1,p=0;p<b.length;++p){var q=b[p],r=q[0],s=q[1];if(r==DIFF_EQUAL){var t=i.line+(C(b,p)?0:1);M(i,s);var u=i.line+(B(b,p)?1:0);u>t&&(o&&(h(n,t),o=!1),n=u)}else if(o=!0,r==c){var v=M(i,s,!0),w=P(j,i),x=O(k,v);Q(w,x)||d.push(a.markText(w,x,{className:m})),i=v}}o&&h(n,i.line+1)}function n(a){if(a.showDifferences){if(a.svg){J(a.svg);var b=a.gap.offsetWidth;K(a.svg,"width",b,"height",a.gap.offsetHeight)}a.copyButtons&&J(a.copyButtons);for(var c=a.edit.getViewport(),d=a.orig.getViewport(),e=a.mv.wrap.getBoundingClientRect().top,f=e-a.edit.getScrollerElement().getBoundingClientRect().top+a.edit.getScrollInfo().top,g=e-a.orig.getScrollerElement().getBoundingClientRect().top+a.orig.getScrollInfo().top,h=0;h<a.chunks.length;h++){var i=a.chunks[h];i.editFrom<=c.to&&i.editTo>=c.from&&i.origFrom<=d.to&&i.origTo>=d.from&&v(a,i,g,f,b)}}}function o(a,b){for(var c=0,d=0,e=0;e<b.length;e++){var f=b[e];if(f.editTo>a&&f.editFrom<=a)return null;if(f.editFrom>a)break;c=f.editTo,d=f.origTo}return d+(a-c)}function p(a,b,c){for(var d=a.state.trackAlignable,e=a.firstLine(),f=0,g=[],h=0;;h++){for(var i=b[h],j=i?c?i.origFrom:i.editFrom:1e9;f<d.alignable.length;f+=2){var k=d.alignable[f]+1;if(!(k<=e)){if(!(k<=j))break;g.push(k)}}if(!i)break;g.push(e=c?i.origTo:i.editTo)}return g}function q(a,b,c,d){var e=0,f=0,g=0,h=0;a:for(;;e++){var i=a[e],j=b[f];if(!i&&null==j)break;for(var k=i?i[0]:1e9,l=null==j?1e9:j;g<c.length;){var m=c[g];if(m.origFrom<=l&&m.origTo>l){f++,e--;continue a}if(m.editTo>k){if(m.editFrom<=k)continue a;break}h+=m.origTo-m.origFrom-(m.editTo-m.editFrom),g++}if(k==l-h)i[d]=l,f++;else if(k<l-h)i[d]=k+h;else{var n=[l-h,null,null];n[d]=l,a.splice(e,0,n),f++}}}function r(a,b){var c=p(a.edit,a.chunks,!1),d=[];if(b)for(var e=0,f=0;e<b.chunks.length;e++){for(var g=b.chunks[e].editTo;f<c.length&&c[f]<g;)f++;f!=c.length&&c[f]==g||c.splice(f++,0,g)}for(var e=0;e<c.length;e++)d.push([c[e],null,null]);return q(d,p(a.orig,a.chunks,!0),a.chunks,1),b&&q(d,p(b.orig,b.chunks,!0),b.chunks,2),d}function s(a,b){if(a.dealigned||b){if(!a.orig.curOp)return a.orig.operation((function(){s(a,b)}));a.dealigned=!1;var d=a.mv.left==a?a.mv.right:a.mv.left;d&&(c(d),d.dealigned=!1);for(var e=r(a,d),f=a.mv.aligners,g=0;g<f.length;g++)f[g].clear();f.length=0;var h=[a.edit,a.orig],i=[];d&&h.push(d.orig);for(var g=0;g<h.length;g++)i.push(h[g].getScrollInfo().top);for(var j=0;j<e.length;j++)t(h,e[j],f);for(var g=0;g<h.length;g++)h[g].scrollTo(null,i[g])}}function t(a,b,c){for(var d=0,e=[],f=0;f<a.length;f++)if(null!=b[f]){var g=a[f].heightAtLine(b[f],"local");e[f]=g,d=Math.max(d,g)}for(var f=0;f<a.length;f++)if(null!=b[f]){var h=d-e[f];h>1&&c.push(u(a[f],b[f],h))}}function u(a,b,c){var d=!0;b>a.lastLine()&&(b--,d=!1);var e=document.createElement("div");return e.className="CodeMirror-merge-spacer",e.style.height=c+"px",e.style.minWidth="1px",a.addLineWidget(b,e,{height:c,above:d,mergeSpacer:!0,handleMouseEvents:!0})}function v(a,b,c,d,e){var f="left"==a.type,g=a.orig.heightAtLine(b.origFrom,"local",!0)-c;if(a.svg){var h=g,i=a.edit.heightAtLine(b.editFrom,"local",!0)-d;if(f){var j=h;h=i,i=j}var k=a.orig.heightAtLine(b.origTo,"local",!0)-c,l=a.edit.heightAtLine(b.editTo,"local",!0)-d;if(f){var j=k;k=l,l=j}var m=" C "+e/2+" "+i+" "+e/2+" "+h+" "+(e+2)+" "+h,n=" C "+e/2+" "+k+" "+e/2+" "+l+" -1 "+l;K(a.svg.appendChild(document.createElementNS(V,"path")),"d","M -1 "+i+m+" L "+(e+2)+" "+k+n+" z","class",a.classes.connect)}if(a.copyButtons){var o=a.copyButtons.appendChild(I("div","left"==a.type?"⇝":"⇜","CodeMirror-merge-copy")),p=a.mv.options.allowEditingOriginals;if(o.title=p?"Push to left":"Revert chunk",o.chunk=b,o.style.top=(b.origTo>b.origFrom?g:a.edit.heightAtLine(b.editFrom,"local")-d)+"px",p){var q=a.edit.heightAtLine(b.editFrom,"local")-d,r=a.copyButtons.appendChild(I("div","right"==a.type?"⇝":"⇜","CodeMirror-merge-copy-reverse"));r.title="Push to right",r.chunk={editFrom:b.origFrom,editTo:b.origTo,origFrom:b.editFrom,origTo:b.editTo},r.style.top=q+"px","right"==a.type?r.style.left="2px":r.style.right="2px"}}}function w(a,b,c,d){if(!a.diffOutOfDate){var e=d.origTo>c.lastLine()?U(d.origFrom-1):U(d.origFrom,0),f=U(d.origTo,0),g=d.editTo>b.lastLine()?U(d.editFrom-1):U(d.editFrom,0),h=U(d.editTo,0),i=a.mv.options.revertChunk;i?i(a.mv,c,e,f,b,g,h):b.replaceRange(c.getRange(e,f),g,h)}}function x(b){var c=b.lockButton=I("div",null,"CodeMirror-merge-scrolllock");c.title="Toggle locked scrolling";var d=I("div",[c],"CodeMirror-merge-scrolllock-wrap");a.on(c,"click",(function(){h(b,!b.lockScroll)}));var e=[d];if(b.mv.options.revertButtons!==!1&&(b.copyButtons=I("div",null,"CodeMirror-merge-copybuttons-"+b.type),a.on(b.copyButtons,"click",(function(a){var c=a.target||a.srcElement;if(c.chunk)return"CodeMirror-merge-copy-reverse"==c.className?void w(b,b.orig,b.edit,c.chunk):void w(b,b.edit,b.orig,c.chunk)})),e.unshift(b.copyButtons)),"align"!=b.mv.options.connect){var f=document.createElementNS&&document.createElementNS(V,"svg");f&&!f.createSVGRect&&(f=null),b.svg=f,f&&e.push(f)}return b.gap=I("div",e,"CodeMirror-merge-gap")}function y(a){return"string"==typeof a?a:a.getValue()}function z(a,b,c){Y||(Y=new diff_match_patch);for(var d=Y.diff_main(a,b),e=0;e<d.length;++e){var f=d[e];(c?/[^ \t]/.test(f[1]):f[1])?e&&d[e-1][0]==f[0]&&(d.splice(e--,1),d[e][1]+=f[1]):d.splice(e--,1)}return d}function A(a){var b=[];if(!a.length)return b;for(var c=0,d=0,e=U(0,0),f=U(0,0),g=0;g<a.length;++g){var h=a[g],i=h[0];if(i==DIFF_EQUAL){var j=!C(a,g)||e.line<c||f.line<d?1:0,k=e.line+j,l=f.line+j;M(e,h[1],null,f);var m=B(a,g)?1:0,n=e.line+m,o=f.line+m;n>k&&(g&&b.push({origFrom:d,origTo:l,editFrom:c,editTo:k}),c=n,d=o)}else M(i==DIFF_INSERT?e:f,h[1])}return(c<=e.line||d<=f.line)&&b.push({origFrom:d,origTo:f.line+1,editFrom:c,editTo:e.line+1}),b}function B(a,b){if(b==a.length-1)return!0;var c=a[b+1][1];return!(1==c.length&&b<a.length-2||10!=c.charCodeAt(0))&&(b==a.length-2||(c=a[b+2][1],(c.length>1||b==a.length-3)&&10==c.charCodeAt(0)))}function C(a,b){if(0==b)return!0;var c=a[b-1][1];return 10==c.charCodeAt(c.length-1)&&(1==b||(c=a[b-2][1],10==c.charCodeAt(c.length-1)))}function D(a,b,c){for(var d,e,f,g,h=0;h<a.length;h++){var i=a[h],j=c?i.editFrom:i.origFrom,k=c?i.editTo:i.origTo;null==e&&(j>b?(e=i.editFrom,g=i.origFrom):k>b&&(e=i.editTo,g=i.origTo)),k<=b?(d=i.editTo,f=i.origTo):j<=b&&(d=i.editFrom,f=i.origFrom)}return{edit:{before:d,after:e},orig:{before:f,after:g}}}function E(b,c,d){function e(){g.clear(),b.removeLineClass(c,"wrap","CodeMirror-merge-collapsed-line")}b.addLineClass(c,"wrap","CodeMirror-merge-collapsed-line");var f=document.createElement("span");f.className="CodeMirror-merge-collapsed-widget",f.title="Identical text collapsed. Click to expand.";var g=b.markText(U(c,0),U(d-1),{inclusiveLeft:!0,inclusiveRight:!0,replacedWith:f,clearOnEnter:!0});return g.explicitlyCleared&&e(),a.on(f,"click",e),g.on("clear",e),a.on(f,"click",e),{mark:g,clear:e}}function F(a,b){function c(){for(var a=0;a<d.length;a++)d[a].clear()}for(var d=[],e=0;e<b.length;e++){var f=b[e],g=E(f.cm,f.line,f.line+a);d.push(g),g.mark.on("clear",c)}return d[0].mark}function G(a,b,c,d){for(var e=0;e<a.chunks.length;e++)for(var f=a.chunks[e],g=f.editFrom-b;g<f.editTo+b;g++){var h=g+c;h>=0&&h<d.length&&(d[h]=!1)}}function H(a,b){"number"!=typeof b&&(b=2);for(var c=[],d=a.editor(),e=d.firstLine(),f=e,g=d.lastLine();f<=g;f++)c.push(!0);a.left&&G(a.left,b,e,c),a.right&&G(a.right,b,e,c);for(var h=0;h<c.length;h++)if(c[h]){for(var i=h+e,j=1;h<c.length-1&&c[h+1];h++,j++);if(j>b){var k=[{line:i,cm:d}];a.left&&k.push({line:o(i,a.left.chunks),cm:a.left.orig}),a.right&&k.push({line:o(i,a.right.chunks),cm:a.right.orig});var l=F(j,k);a.options.onCollapse&&a.options.onCollapse(a,i,j,l)}}}function I(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)e.appendChild(document.createTextNode(b));else if(b)for(var f=0;f<b.length;++f)e.appendChild(b[f]);return e}function J(a){for(var b=a.childNodes.length;b>0;--b)a.removeChild(a.firstChild)}function K(a){for(var b=1;b<arguments.length;b+=2)a.setAttribute(arguments[b],arguments[b+1])}function L(a,b){b||(b={});for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function M(a,b,c,d){for(var e=c?U(a.line,a.ch):a,f=0;;){var g=b.indexOf("\n",f);if(g==-1)break;++e.line,d&&++d.line,f=g+1}return e.ch=(f?0:e.ch)+(b.length-f),d&&(d.ch=(f?0:d.ch)+(b.length-f)),e}function N(a){this.cm=a,this.alignable=[],this.height=a.doc.height;var b=this;a.on("markerAdded",(function(a,c){if(c.collapsed){var d=c.find(1);null!=d&&b.set(d.line,_)}})),a.on("markerCleared",(function(a,c,d,e){null!=e&&c.collapsed&&b.check(e,_,b.hasMarker)})),a.on("markerChanged",this.signal.bind(this)),a.on("lineWidgetAdded",(function(a,c,d){c.mergeSpacer||(c.above?b.set(d-1,$):b.set(d,Z))})),a.on("lineWidgetCleared",(function(a,c,d){c.mergeSpacer||(c.above?b.check(d-1,$,b.hasWidgetBelow):b.check(d,Z,b.hasWidget))})),a.on("lineWidgetChanged",this.signal.bind(this)),a.on("change",(function(a,c){var d=c.from.line,e=c.to.line-c.from.line,f=c.text.length-1,g=d+f;(e||f)&&b.map(d,e,f),b.check(g,_,b.hasMarker),(e||f)&&b.check(c.from.line,_,b.hasMarker)})),a.on("viewportChange",(function(){b.cm.doc.height!=b.height&&b.signal()}))}function O(a,b){return(a.line-b.line||a.ch-b.ch)<0?a:b}function P(a,b){return(a.line-b.line||a.ch-b.ch)>0?a:b}function Q(a,b){return a.line==b.line&&a.ch==b.ch}function R(a,b,c){for(var d=a.length-1;d>=0;d--){var e=a[d],f=(c?e.origTo:e.editTo)-1;if(f<b)return f}}function S(a,b,c){for(var d=0;d<a.length;d++){var e=a[d],f=c?e.origFrom:e.editFrom;if(f>b)return f}}function T(b,d){var e=null,f=b.state.diffViews,g=b.getCursor().line;if(f)for(var h=0;h<f.length;h++){var i=f[h],j=b==i.orig;c(i);var k=d<0?R(i.chunks,g,j):S(i.chunks,g,j);null==k||null!=e&&!(d<0?k>e:k<e)||(e=k)}return null==e?a.Pass:void b.setCursor(e,0)}var U=a.Pos,V="http://www.w3.org/2000/svg";b.prototype={constructor:b,init:function(b,c,d){this.edit=this.mv.edit,(this.edit.state.diffViews||(this.edit.state.diffViews=[])).push(this),this.orig=a(b,L({value:c,readOnly:!this.mv.options.allowEditingOriginals},L(d))),"align"==this.mv.options.connect&&(this.edit.state.trackAlignable||(this.edit.state.trackAlignable=new N(this.edit)),this.orig.state.trackAlignable=new N(this.orig)),this.orig.state.diffViews=[this];var e=d.chunkClassLocation||"background";"[object Array]"!=Object.prototype.toString.call(e)&&(e=[e]),this.classes.classLocation=e,this.diff=z(y(c),y(d.value),this.mv.options.ignoreWhitespace),this.chunks=A(this.diff),this.diffOutOfDate=this.dealigned=!1,this.needsScrollSync=null,this.showDifferences=d.showDifferences!==!1},registerEvents:function(a){this.forceUpdate=d(this),h(this,!0,!1),e(this,a)},setShowDifferences:function(a){a=a!==!1,a!=this.showDifferences&&(this.showDifferences=a,this.forceUpdate("full"))}};var W=!1,X=a.MergeView=function(c,d){if(!(this instanceof X))return new X(c,d);this.options=d;var e=d.origLeft,f=null==d.origRight?d.orig:d.origRight,g=null!=e,h=null!=f,i=1+(g?1:0)+(h?1:0),j=[],k=this.left=null,l=this.right=null,m=this;if(g){k=this.left=new b(this,"left");var o=I("div",null,"CodeMirror-merge-pane CodeMirror-merge-left");j.push(o),j.push(x(k))}var p=I("div",null,"CodeMirror-merge-pane CodeMirror-merge-editor");if(j.push(p),h){l=this.right=new b(this,"right"),j.push(x(l));var q=I("div",null,"CodeMirror-merge-pane CodeMirror-merge-right");j.push(q)}(h?q:p).className+=" CodeMirror-merge-pane-rightmost",j.push(I("div",null,null,"height: 0; clear: both;"));var r=this.wrap=c.appendChild(I("div",j,"CodeMirror-merge CodeMirror-merge-"+i+"pane"));this.edit=a(p,L(d)),k&&k.init(o,e,d),l&&l.init(q,f,d),d.collapseIdentical&&this.editor().operation((function(){H(m,d.collapseIdentical)})),"align"==d.connect&&(this.aligners=[],s(this.left||this.right,!0)),k&&k.registerEvents(l),l&&l.registerEvents(k);var t=function(){k&&n(k),l&&n(l)};a.on(window,"resize",t);var u=setInterval((function(){for(var b=r.parentNode;b&&b!=document.body;b=b.parentNode);b||(clearInterval(u),a.off(window,"resize",t))}),5e3)};X.prototype={constructor:X,editor:function(){return this.edit},rightOriginal:function(){return this.right&&this.right.orig},leftOriginal:function(){return this.left&&this.left.orig},setShowDifferences:function(a){this.right&&this.right.setShowDifferences(a),this.left&&this.left.setShowDifferences(a)},rightChunks:function(){if(this.right)return c(this.right),this.right.chunks},leftChunks:function(){if(this.left)return c(this.left),this.left.chunks}};var Y,Z=1,$=2,_=4;N.prototype={signal:function(){a.signal(this,"realign"),this.height=this.cm.doc.height},set:function(a,b){for(var c=-1;c<this.alignable.length;c+=2){var d=this.alignable[c]-a;if(0==d){if((this.alignable[c+1]&b)==b)return;return this.alignable[c+1]|=b,void this.signal()}if(d>0)break}this.signal(),this.alignable.splice(c,0,a,b)},find:function(a){for(var b=0;b<this.alignable.length;b+=2)if(this.alignable[b]==a)return b;return-1},check:function(a,b,c){var d=this.find(a);if(d!=-1&&this.alignable[d+1]&b&&!c.call(this,a)){this.signal();var e=this.alignable[d+1]&~b;e?this.alignable[d+1]=e:this.alignable.splice(d,2)}},hasMarker:function(a){var b=this.cm.getLineHandle(a);if(b.markedSpans)for(var c=0;c<b.markedSpans.length;c++)if(b.markedSpans[c].mark.collapsed&&null!=b.markedSpans[c].to)return!0;return!1},hasWidget:function(a){var b=this.cm.getLineHandle(a);if(b.widgets)for(var c=0;c<b.widgets.length;c++)if(!b.widgets[c].above&&!b.widgets[c].mergeSpacer)return!0;return!1},hasWidgetBelow:function(a){if(a==this.cm.lastLine())return!1;var b=this.cm.getLineHandle(a+1);if(b.widgets)for(var c=0;c<b.widgets.length;c++)if(b.widgets[c].above&&!b.widgets[c].mergeSpacer)return!0;return!1},map:function(a,b,c){for(var d=c-b,e=a+b,f=-1,g=-1,h=0;h<this.alignable.length;h+=2){var i=this.alignable[h];i==a&&this.alignable[h+1]&$&&(f=h),i==e&&this.alignable[h+1]&$&&(g=h),i<=a||(i<e?this.alignable.splice(h--,2):this.alignable[h]+=d)}if(f>-1){var j=this.alignable[f+1];j==$?this.alignable.splice(f,2):this.alignable[f+1]=j&~$}g>-1&&c&&this.set(a+c,$)}},a.commands.goNextDiff=function(a){return T(a,1)},a.commands.goPrevDiff=function(a){return T(a,-1)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/mode/loadmode.js b/core/media/editors/codemirror/addon/mode/loadmode.js
new file mode 100644
index 00000000..10117ec2
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/loadmode.js
@@ -0,0 +1,64 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), "cjs");
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
+  else // Plain browser env
+    mod(CodeMirror, "plain");
+})(function(CodeMirror, env) {
+  if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
+
+  var loading = {};
+  function splitCallback(cont, n) {
+    var countDown = n;
+    return function() { if (--countDown == 0) cont(); };
+  }
+  function ensureDeps(mode, cont) {
+    var deps = CodeMirror.modes[mode].dependencies;
+    if (!deps) return cont();
+    var missing = [];
+    for (var i = 0; i < deps.length; ++i) {
+      if (!CodeMirror.modes.hasOwnProperty(deps[i]))
+        missing.push(deps[i]);
+    }
+    if (!missing.length) return cont();
+    var split = splitCallback(cont, missing.length);
+    for (var i = 0; i < missing.length; ++i)
+      CodeMirror.requireMode(missing[i], split);
+  }
+
+  CodeMirror.requireMode = function(mode, cont) {
+    if (typeof mode != "string") mode = mode.name;
+    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
+    if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
+
+    var file = CodeMirror.modeURL.replace(/%N/g, mode);
+    if (env == "plain") {
+      var script = document.createElement("script");
+      script.src = file;
+      var others = document.getElementsByTagName("script")[0];
+      var list = loading[mode] = [cont];
+      CodeMirror.on(script, "load", function() {
+        ensureDeps(mode, function() {
+          for (var i = 0; i < list.length; ++i) list[i]();
+        });
+      });
+      others.parentNode.insertBefore(script, others);
+    } else if (env == "cjs") {
+      require(file);
+      cont();
+    } else if (env == "amd") {
+      requirejs([file], cont);
+    }
+  };
+
+  CodeMirror.autoLoadMode = function(instance, mode) {
+    if (!CodeMirror.modes.hasOwnProperty(mode))
+      CodeMirror.requireMode(mode, function() {
+        instance.setOption("mode", instance.getOption("mode"));
+      });
+  };
+});
diff --git a/core/media/editors/codemirror/addon/mode/loadmode.min.js b/core/media/editors/codemirror/addon/mode/loadmode.min.js
new file mode 100644
index 00000000..d30a1f94
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/loadmode.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),"cjs"):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],(function(b){a(b,"amd")})):a(CodeMirror,"plain")})((function(a,b){function c(a,b){var c=b;return function(){0==--c&&a()}}function d(b,d){var e=a.modes[b].dependencies;if(!e)return d();for(var f=[],g=0;g<e.length;++g)a.modes.hasOwnProperty(e[g])||f.push(e[g]);if(!f.length)return d();for(var h=c(d,f.length),g=0;g<f.length;++g)a.requireMode(f[g],h)}a.modeURL||(a.modeURL="../mode/%N/%N.js");var e={};a.requireMode=function(c,f){if("string"!=typeof c&&(c=c.name),a.modes.hasOwnProperty(c))return d(c,f);if(e.hasOwnProperty(c))return e[c].push(f);var g=a.modeURL.replace(/%N/g,c);if("plain"==b){var h=document.createElement("script");h.src=g;var i=document.getElementsByTagName("script")[0],j=e[c]=[f];a.on(h,"load",(function(){d(c,(function(){for(var a=0;a<j.length;++a)j[a]()}))})),i.parentNode.insertBefore(h,i)}else"cjs"==b?(require(g),f()):"amd"==b&&requirejs([g],f)},a.autoLoadMode=function(b,c){a.modes.hasOwnProperty(c)||a.requireMode(c,(function(){b.setOption("mode",b.getOption("mode"))}))}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/mode/multiplex.js b/core/media/editors/codemirror/addon/mode/multiplex.js
new file mode 100644
index 00000000..a084f702
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/multiplex.js
@@ -0,0 +1,131 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.multiplexingMode = function(outer /*, others */) {
+  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
+  var others = Array.prototype.slice.call(arguments, 1);
+
+  function indexOf(string, pattern, from, returnEnd) {
+    if (typeof pattern == "string") {
+      var found = string.indexOf(pattern, from);
+      return returnEnd && found > -1 ? found + pattern.length : found;
+    }
+    var m = pattern.exec(from ? string.slice(from) : string);
+    return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1;
+  }
+
+  return {
+    startState: function() {
+      return {
+        outer: CodeMirror.startState(outer),
+        innerActive: null,
+        inner: null
+      };
+    },
+
+    copyState: function(state) {
+      return {
+        outer: CodeMirror.copyState(outer, state.outer),
+        innerActive: state.innerActive,
+        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner)
+      };
+    },
+
+    token: function(stream, state) {
+      if (!state.innerActive) {
+        var cutOff = Infinity, oldContent = stream.string;
+        for (var i = 0; i < others.length; ++i) {
+          var other = others[i];
+          var found = indexOf(oldContent, other.open, stream.pos);
+          if (found == stream.pos) {
+            if (!other.parseDelimiters) stream.match(other.open);
+            state.innerActive = other;
+
+            // Get the outer indent, making sure to handle CodeMirror.Pass
+            var outerIndent = 0;
+            if (outer.indent) {
+              var possibleOuterIndent = outer.indent(state.outer, "");
+              if (possibleOuterIndent !== CodeMirror.Pass) outerIndent = possibleOuterIndent;
+            }
+
+            state.inner = CodeMirror.startState(other.mode, outerIndent);
+            return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
+          } else if (found != -1 && found < cutOff) {
+            cutOff = found;
+          }
+        }
+        if (cutOff != Infinity) stream.string = oldContent.slice(0, cutOff);
+        var outerToken = outer.token(stream, state.outer);
+        if (cutOff != Infinity) stream.string = oldContent;
+        return outerToken;
+      } else {
+        var curInner = state.innerActive, oldContent = stream.string;
+        if (!curInner.close && stream.sol()) {
+          state.innerActive = state.inner = null;
+          return this.token(stream, state);
+        }
+        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
+        if (found == stream.pos && !curInner.parseDelimiters) {
+          stream.match(curInner.close);
+          state.innerActive = state.inner = null;
+          return curInner.delimStyle && (curInner.delimStyle + " " + curInner.delimStyle + "-close");
+        }
+        if (found > -1) stream.string = oldContent.slice(0, found);
+        var innerToken = curInner.mode.token(stream, state.inner);
+        if (found > -1) stream.string = oldContent;
+
+        if (found == stream.pos && curInner.parseDelimiters)
+          state.innerActive = state.inner = null;
+
+        if (curInner.innerStyle) {
+          if (innerToken) innerToken = innerToken + " " + curInner.innerStyle;
+          else innerToken = curInner.innerStyle;
+        }
+
+        return innerToken;
+      }
+    },
+
+    indent: function(state, textAfter) {
+      var mode = state.innerActive ? state.innerActive.mode : outer;
+      if (!mode.indent) return CodeMirror.Pass;
+      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
+    },
+
+    blankLine: function(state) {
+      var mode = state.innerActive ? state.innerActive.mode : outer;
+      if (mode.blankLine) {
+        mode.blankLine(state.innerActive ? state.inner : state.outer);
+      }
+      if (!state.innerActive) {
+        for (var i = 0; i < others.length; ++i) {
+          var other = others[i];
+          if (other.open === "\n") {
+            state.innerActive = other;
+            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0);
+          }
+        }
+      } else if (state.innerActive.close === "\n") {
+        state.innerActive = state.inner = null;
+      }
+    },
+
+    electricChars: outer.electricChars,
+
+    innerMode: function(state) {
+      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
+    }
+  };
+};
+
+});
diff --git a/core/media/editors/codemirror/addon/mode/multiplex.min.js b/core/media/editors/codemirror/addon/mode/multiplex.min.js
new file mode 100644
index 00000000..8dd1c9a8
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/multiplex.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.multiplexingMode=function(b){function c(a,b,c,d){if("string"==typeof b){var e=a.indexOf(b,c);return d&&e>-1?e+b.length:e}var f=b.exec(c?a.slice(c):a);return f?f.index+c+(d?f[0].length:0):-1}var d=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(b),innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(b,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(e,f){if(f.innerActive){var g=f.innerActive,h=e.string;if(!g.close&&e.sol())return f.innerActive=f.inner=null,this.token(e,f);var i=g.close?c(h,g.close,e.pos,g.parseDelimiters):-1;if(i==e.pos&&!g.parseDelimiters)return e.match(g.close),f.innerActive=f.inner=null,g.delimStyle&&g.delimStyle+" "+g.delimStyle+"-close";i>-1&&(e.string=h.slice(0,i));var j=g.mode.token(e,f.inner);return i>-1&&(e.string=h),i==e.pos&&g.parseDelimiters&&(f.innerActive=f.inner=null),g.innerStyle&&(j=j?j+" "+g.innerStyle:g.innerStyle),j}for(var k=1/0,h=e.string,l=0;l<d.length;++l){var m=d[l],i=c(h,m.open,e.pos);if(i==e.pos){m.parseDelimiters||e.match(m.open),f.innerActive=m;var n=0;if(b.indent){var o=b.indent(f.outer,"");o!==a.Pass&&(n=o)}return f.inner=a.startState(m.mode,n),m.delimStyle&&m.delimStyle+" "+m.delimStyle+"-open"}i!=-1&&i<k&&(k=i)}k!=1/0&&(e.string=h.slice(0,k));var p=b.token(e,f.outer);return k!=1/0&&(e.string=h),p},indent:function(c,d){var e=c.innerActive?c.innerActive.mode:b;return e.indent?e.indent(c.innerActive?c.inner:c.outer,d):a.Pass},blankLine:function(c){var e=c.innerActive?c.innerActive.mode:b;if(e.blankLine&&e.blankLine(c.innerActive?c.inner:c.outer),c.innerActive)"\n"===c.innerActive.close&&(c.innerActive=c.inner=null);else for(var f=0;f<d.length;++f){var g=d[f];"\n"===g.open&&(c.innerActive=g,c.inner=a.startState(g.mode,e.indent?e.indent(c.outer,""):0))}},electricChars:b.electricChars,innerMode:function(a){return a.inner?{state:a.inner,mode:a.innerActive.mode}:{state:a.outer,mode:b}}}}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/mode/multiplex_test.js b/core/media/editors/codemirror/addon/mode/multiplex_test.js
new file mode 100644
index 00000000..24e5e670
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/multiplex_test.js
@@ -0,0 +1,33 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  CodeMirror.defineMode("markdown_with_stex", function(){
+    var inner = CodeMirror.getMode({}, "stex");
+    var outer = CodeMirror.getMode({}, "markdown");
+
+    var innerOptions = {
+      open: '$',
+      close: '$',
+      mode: inner,
+      delimStyle: 'delim',
+      innerStyle: 'inner'
+    };
+
+    return CodeMirror.multiplexingMode(outer, innerOptions);
+  });
+
+  var mode = CodeMirror.getMode({}, "markdown_with_stex");
+
+  function MT(name) {
+    test.mode(
+      name,
+      mode,
+      Array.prototype.slice.call(arguments, 1),
+      'multiplexing');
+  }
+
+  MT(
+    "stexInsideMarkdown",
+    "[strong **Equation:**] [delim&delim-open $][inner&tag \\pi][delim&delim-close $]");
+})();
diff --git a/core/media/editors/codemirror/addon/mode/multiplex_test.min.js b/core/media/editors/codemirror/addon/mode/multiplex_test.min.js
new file mode 100644
index 00000000..e6d139aa
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/multiplex_test.min.js
@@ -0,0 +1 @@
+!(function(){function a(a){test.mode(a,b,Array.prototype.slice.call(arguments,1),"multiplexing")}CodeMirror.defineMode("markdown_with_stex",(function(){var a=CodeMirror.getMode({},"stex"),b=CodeMirror.getMode({},"markdown"),c={open:"$",close:"$",mode:a,delimStyle:"delim",innerStyle:"inner"};return CodeMirror.multiplexingMode(b,c)}));var b=CodeMirror.getMode({},"markdown_with_stex");a("stexInsideMarkdown","[strong **Equation:**] [delim&delim-open $][inner&tag \\pi][delim&delim-close $]")})();
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/mode/overlay.js b/core/media/editors/codemirror/addon/mode/overlay.js
new file mode 100644
index 00000000..4a9f99a0
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/overlay.js
@@ -0,0 +1,90 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Utility function that allows modes to be combined. The mode given
+// as the base argument takes care of most of the normal mode
+// functionality, but a second (typically simple) mode is used, which
+// can override the style of text. Both modes get to parse all of the
+// text, but when both assign a non-null style to a piece of code, the
+// overlay wins, unless the combine argument was true and not overridden,
+// or state.overlay.combineTokens was true, in which case the styles are
+// combined.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.overlayMode = function(base, overlay, combine) {
+  return {
+    startState: function() {
+      return {
+        base: CodeMirror.startState(base),
+        overlay: CodeMirror.startState(overlay),
+        basePos: 0, baseCur: null,
+        overlayPos: 0, overlayCur: null,
+        streamSeen: null
+      };
+    },
+    copyState: function(state) {
+      return {
+        base: CodeMirror.copyState(base, state.base),
+        overlay: CodeMirror.copyState(overlay, state.overlay),
+        basePos: state.basePos, baseCur: null,
+        overlayPos: state.overlayPos, overlayCur: null
+      };
+    },
+
+    token: function(stream, state) {
+      if (stream != state.streamSeen ||
+          Math.min(state.basePos, state.overlayPos) < stream.start) {
+        state.streamSeen = stream;
+        state.basePos = state.overlayPos = stream.start;
+      }
+
+      if (stream.start == state.basePos) {
+        state.baseCur = base.token(stream, state.base);
+        state.basePos = stream.pos;
+      }
+      if (stream.start == state.overlayPos) {
+        stream.pos = stream.start;
+        state.overlayCur = overlay.token(stream, state.overlay);
+        state.overlayPos = stream.pos;
+      }
+      stream.pos = Math.min(state.basePos, state.overlayPos);
+
+      // state.overlay.combineTokens always takes precedence over combine,
+      // unless set to null
+      if (state.overlayCur == null) return state.baseCur;
+      else if (state.baseCur != null &&
+               state.overlay.combineTokens ||
+               combine && state.overlay.combineTokens == null)
+        return state.baseCur + " " + state.overlayCur;
+      else return state.overlayCur;
+    },
+
+    indent: base.indent && function(state, textAfter) {
+      return base.indent(state.base, textAfter);
+    },
+    electricChars: base.electricChars,
+
+    innerMode: function(state) { return {state: state.base, mode: base}; },
+
+    blankLine: function(state) {
+      var baseToken, overlayToken;
+      if (base.blankLine) baseToken = base.blankLine(state.base);
+      if (overlay.blankLine) overlayToken = overlay.blankLine(state.overlay);
+
+      return overlayToken == null ?
+        baseToken :
+        (combine && baseToken != null ? baseToken + " " + overlayToken : overlayToken);
+    }
+  };
+};
+
+});
diff --git a/core/media/editors/codemirror/addon/mode/overlay.min.js b/core/media/editors/codemirror/addon/mode/overlay.min.js
new file mode 100644
index 00000000..7f387e14
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/overlay.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.overlayMode=function(b,c,d){return{startState:function(){return{base:a.startState(b),overlay:a.startState(c),basePos:0,baseCur:null,overlayPos:0,overlayCur:null,streamSeen:null}},copyState:function(d){return{base:a.copyState(b,d.base),overlay:a.copyState(c,d.overlay),basePos:d.basePos,baseCur:null,overlayPos:d.overlayPos,overlayCur:null}},token:function(a,e){return(a!=e.streamSeen||Math.min(e.basePos,e.overlayPos)<a.start)&&(e.streamSeen=a,e.basePos=e.overlayPos=a.start),a.start==e.basePos&&(e.baseCur=b.token(a,e.base),e.basePos=a.pos),a.start==e.overlayPos&&(a.pos=a.start,e.overlayCur=c.token(a,e.overlay),e.overlayPos=a.pos),a.pos=Math.min(e.basePos,e.overlayPos),null==e.overlayCur?e.baseCur:null!=e.baseCur&&e.overlay.combineTokens||d&&null==e.overlay.combineTokens?e.baseCur+" "+e.overlayCur:e.overlayCur},indent:b.indent&&function(a,c){return b.indent(a.base,c)},electricChars:b.electricChars,innerMode:function(a){return{state:a.base,mode:b}},blankLine:function(a){var e,f;return b.blankLine&&(e=b.blankLine(a.base)),c.blankLine&&(f=c.blankLine(a.overlay)),null==f?e:d&&null!=e?e+" "+f:f}}}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/mode/simple.js b/core/media/editors/codemirror/addon/mode/simple.js
new file mode 100644
index 00000000..c0f80108
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/simple.js
@@ -0,0 +1,216 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode = function(name, states) {
+    CodeMirror.defineMode(name, function(config) {
+      return CodeMirror.simpleMode(config, states);
+    });
+  };
+
+  CodeMirror.simpleMode = function(config, states) {
+    ensureState(states, "start");
+    var states_ = {}, meta = states.meta || {}, hasIndentation = false;
+    for (var state in states) if (state != meta && states.hasOwnProperty(state)) {
+      var list = states_[state] = [], orig = states[state];
+      for (var i = 0; i < orig.length; i++) {
+        var data = orig[i];
+        list.push(new Rule(data, states));
+        if (data.indent || data.dedent) hasIndentation = true;
+      }
+    }
+    var mode = {
+      startState: function() {
+        return {state: "start", pending: null,
+                local: null, localState: null,
+                indent: hasIndentation ? [] : null};
+      },
+      copyState: function(state) {
+        var s = {state: state.state, pending: state.pending,
+                 local: state.local, localState: null,
+                 indent: state.indent && state.indent.slice(0)};
+        if (state.localState)
+          s.localState = CodeMirror.copyState(state.local.mode, state.localState);
+        if (state.stack)
+          s.stack = state.stack.slice(0);
+        for (var pers = state.persistentStates; pers; pers = pers.next)
+          s.persistentStates = {mode: pers.mode,
+                                spec: pers.spec,
+                                state: pers.state == state.localState ? s.localState : CodeMirror.copyState(pers.mode, pers.state),
+                                next: s.persistentStates};
+        return s;
+      },
+      token: tokenFunction(states_, config),
+      innerMode: function(state) { return state.local && {mode: state.local.mode, state: state.localState}; },
+      indent: indentFunction(states_, meta)
+    };
+    if (meta) for (var prop in meta) if (meta.hasOwnProperty(prop))
+      mode[prop] = meta[prop];
+    return mode;
+  };
+
+  function ensureState(states, name) {
+    if (!states.hasOwnProperty(name))
+      throw new Error("Undefined state " + name + " in simple mode");
+  }
+
+  function toRegex(val, caret) {
+    if (!val) return /(?:)/;
+    var flags = "";
+    if (val instanceof RegExp) {
+      if (val.ignoreCase) flags = "i";
+      val = val.source;
+    } else {
+      val = String(val);
+    }
+    return new RegExp((caret === false ? "" : "^") + "(?:" + val + ")", flags);
+  }
+
+  function asToken(val) {
+    if (!val) return null;
+    if (val.apply) return val
+    if (typeof val == "string") return val.replace(/\./g, " ");
+    var result = [];
+    for (var i = 0; i < val.length; i++)
+      result.push(val[i] && val[i].replace(/\./g, " "));
+    return result;
+  }
+
+  function Rule(data, states) {
+    if (data.next || data.push) ensureState(states, data.next || data.push);
+    this.regex = toRegex(data.regex);
+    this.token = asToken(data.token);
+    this.data = data;
+  }
+
+  function tokenFunction(states, config) {
+    return function(stream, state) {
+      if (state.pending) {
+        var pend = state.pending.shift();
+        if (state.pending.length == 0) state.pending = null;
+        stream.pos += pend.text.length;
+        return pend.token;
+      }
+
+      if (state.local) {
+        if (state.local.end && stream.match(state.local.end)) {
+          var tok = state.local.endToken || null;
+          state.local = state.localState = null;
+          return tok;
+        } else {
+          var tok = state.local.mode.token(stream, state.localState), m;
+          if (state.local.endScan && (m = state.local.endScan.exec(stream.current())))
+            stream.pos = stream.start + m.index;
+          return tok;
+        }
+      }
+
+      var curState = states[state.state];
+      for (var i = 0; i < curState.length; i++) {
+        var rule = curState[i];
+        var matches = (!rule.data.sol || stream.sol()) && stream.match(rule.regex);
+        if (matches) {
+          if (rule.data.next) {
+            state.state = rule.data.next;
+          } else if (rule.data.push) {
+            (state.stack || (state.stack = [])).push(state.state);
+            state.state = rule.data.push;
+          } else if (rule.data.pop && state.stack && state.stack.length) {
+            state.state = state.stack.pop();
+          }
+
+          if (rule.data.mode)
+            enterLocalMode(config, state, rule.data.mode, rule.token);
+          if (rule.data.indent)
+            state.indent.push(stream.indentation() + config.indentUnit);
+          if (rule.data.dedent)
+            state.indent.pop();
+          var token = rule.token
+          if (token && token.apply) token = token(matches)
+          if (matches.length > 2 && rule.token && typeof rule.token != "string") {
+            state.pending = [];
+            for (var j = 2; j < matches.length; j++)
+              if (matches[j])
+                state.pending.push({text: matches[j], token: rule.token[j - 1]});
+            stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
+            return token[0];
+          } else if (token && token.join) {
+            return token[0];
+          } else {
+            return token;
+          }
+        }
+      }
+      stream.next();
+      return null;
+    };
+  }
+
+  function cmp(a, b) {
+    if (a === b) return true;
+    if (!a || typeof a != "object" || !b || typeof b != "object") return false;
+    var props = 0;
+    for (var prop in a) if (a.hasOwnProperty(prop)) {
+      if (!b.hasOwnProperty(prop) || !cmp(a[prop], b[prop])) return false;
+      props++;
+    }
+    for (var prop in b) if (b.hasOwnProperty(prop)) props--;
+    return props == 0;
+  }
+
+  function enterLocalMode(config, state, spec, token) {
+    var pers;
+    if (spec.persistent) for (var p = state.persistentStates; p && !pers; p = p.next)
+      if (spec.spec ? cmp(spec.spec, p.spec) : spec.mode == p.mode) pers = p;
+    var mode = pers ? pers.mode : spec.mode || CodeMirror.getMode(config, spec.spec);
+    var lState = pers ? pers.state : CodeMirror.startState(mode);
+    if (spec.persistent && !pers)
+      state.persistentStates = {mode: mode, spec: spec.spec, state: lState, next: state.persistentStates};
+
+    state.localState = lState;
+    state.local = {mode: mode,
+                   end: spec.end && toRegex(spec.end),
+                   endScan: spec.end && spec.forceEnd !== false && toRegex(spec.end, false),
+                   endToken: token && token.join ? token[token.length - 1] : token};
+  }
+
+  function indexOf(val, arr) {
+    for (var i = 0; i < arr.length; i++) if (arr[i] === val) return true;
+  }
+
+  function indentFunction(states, meta) {
+    return function(state, textAfter, line) {
+      if (state.local && state.local.mode.indent)
+        return state.local.mode.indent(state.localState, textAfter, line);
+      if (state.indent == null || state.local || meta.dontIndentStates && indexOf(state.state, meta.dontIndentStates) > -1)
+        return CodeMirror.Pass;
+
+      var pos = state.indent.length - 1, rules = states[state.state];
+      scan: for (;;) {
+        for (var i = 0; i < rules.length; i++) {
+          var rule = rules[i];
+          if (rule.data.dedent && rule.data.dedentIfLineStart !== false) {
+            var m = rule.regex.exec(textAfter);
+            if (m && m[0]) {
+              pos--;
+              if (rule.next || rule.push) rules = states[rule.next || rule.push];
+              textAfter = textAfter.slice(m[0].length);
+              continue scan;
+            }
+          }
+        }
+        break;
+      }
+      return pos < 0 ? 0 : state.indent[pos];
+    };
+  }
+});
diff --git a/core/media/editors/codemirror/addon/mode/simple.min.js b/core/media/editors/codemirror/addon/mode/simple.min.js
new file mode 100644
index 00000000..2bdc1b8e
--- /dev/null
+++ b/core/media/editors/codemirror/addon/mode/simple.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){if(!a.hasOwnProperty(b))throw new Error("Undefined state "+b+" in simple mode")}function c(a,b){if(!a)return/(?:)/;var c="";return a instanceof RegExp?(a.ignoreCase&&(c="i"),a=a.source):a=String(a),new RegExp((b===!1?"":"^")+"(?:"+a+")",c)}function d(a){if(!a)return null;if(a.apply)return a;if("string"==typeof a)return a.replace(/\./g," ");for(var b=[],c=0;c<a.length;c++)b.push(a[c]&&a[c].replace(/\./g," "));return b}function e(a,e){(a.next||a.push)&&b(e,a.next||a.push),this.regex=c(a.regex),this.token=d(a.token),this.data=a}function f(a,b){return function(c,d){if(d.pending){var e=d.pending.shift();return 0==d.pending.length&&(d.pending=null),c.pos+=e.text.length,e.token}if(d.local){if(d.local.end&&c.match(d.local.end)){var f=d.local.endToken||null;return d.local=d.localState=null,f}var g,f=d.local.mode.token(c,d.localState);return d.local.endScan&&(g=d.local.endScan.exec(c.current()))&&(c.pos=c.start+g.index),f}for(var i=a[d.state],j=0;j<i.length;j++){var k=i[j],l=(!k.data.sol||c.sol())&&c.match(k.regex);if(l){k.data.next?d.state=k.data.next:k.data.push?((d.stack||(d.stack=[])).push(d.state),d.state=k.data.push):k.data.pop&&d.stack&&d.stack.length&&(d.state=d.stack.pop()),k.data.mode&&h(b,d,k.data.mode,k.token),k.data.indent&&d.indent.push(c.indentation()+b.indentUnit),k.data.dedent&&d.indent.pop();var m=k.token;if(m&&m.apply&&(m=m(l)),l.length>2&&k.token&&"string"!=typeof k.token){d.pending=[];for(var n=2;n<l.length;n++)l[n]&&d.pending.push({text:l[n],token:k.token[n-1]});return c.backUp(l[0].length-(l[1]?l[1].length:0)),m[0]}return m&&m.join?m[0]:m}}return c.next(),null}}function g(a,b){if(a===b)return!0;if(!a||"object"!=typeof a||!b||"object"!=typeof b)return!1;var c=0;for(var d in a)if(a.hasOwnProperty(d)){if(!b.hasOwnProperty(d)||!g(a[d],b[d]))return!1;c++}for(var d in b)b.hasOwnProperty(d)&&c--;return 0==c}function h(b,d,e,f){var h;if(e.persistent)for(var i=d.persistentStates;i&&!h;i=i.next)(e.spec?g(e.spec,i.spec):e.mode==i.mode)&&(h=i);var j=h?h.mode:e.mode||a.getMode(b,e.spec),k=h?h.state:a.startState(j);e.persistent&&!h&&(d.persistentStates={mode:j,spec:e.spec,state:k,next:d.persistentStates}),d.localState=k,d.local={mode:j,end:e.end&&c(e.end),endScan:e.end&&e.forceEnd!==!1&&c(e.end,!1),endToken:f&&f.join?f[f.length-1]:f}}function i(a,b){for(var c=0;c<b.length;c++)if(b[c]===a)return!0}function j(b,c){return function(d,e,f){if(d.local&&d.local.mode.indent)return d.local.mode.indent(d.localState,e,f);if(null==d.indent||d.local||c.dontIndentStates&&i(d.state,c.dontIndentStates)>-1)return a.Pass;var g=d.indent.length-1,h=b[d.state];a:for(;;){for(var j=0;j<h.length;j++){var k=h[j];if(k.data.dedent&&k.data.dedentIfLineStart!==!1){var l=k.regex.exec(e);if(l&&l[0]){g--,(k.next||k.push)&&(h=b[k.next||k.push]),e=e.slice(l[0].length);continue a}}}break}return g<0?0:d.indent[g]}}a.defineSimpleMode=function(b,c){a.defineMode(b,(function(b){return a.simpleMode(b,c)}))},a.simpleMode=function(c,d){b(d,"start");var g={},h=d.meta||{},i=!1;for(var k in d)if(k!=h&&d.hasOwnProperty(k))for(var l=g[k]=[],m=d[k],n=0;n<m.length;n++){var o=m[n];l.push(new e(o,d)),(o.indent||o.dedent)&&(i=!0)}var p={startState:function(){return{state:"start",pending:null,local:null,localState:null,indent:i?[]:null}},copyState:function(b){var c={state:b.state,pending:b.pending,local:b.local,localState:null,indent:b.indent&&b.indent.slice(0)};b.localState&&(c.localState=a.copyState(b.local.mode,b.localState)),b.stack&&(c.stack=b.stack.slice(0));for(var d=b.persistentStates;d;d=d.next)c.persistentStates={mode:d.mode,spec:d.spec,state:d.state==b.localState?c.localState:a.copyState(d.mode,d.state),next:c.persistentStates};return c},token:f(g,c),innerMode:function(a){return a.local&&{mode:a.local.mode,state:a.localState}},indent:j(g,h)};if(h)for(var q in h)h.hasOwnProperty(q)&&(p[q]=h[q]);return p}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/runmode/colorize.js b/core/media/editors/codemirror/addon/runmode/colorize.js
new file mode 100644
index 00000000..eb7060d0
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/colorize.js
@@ -0,0 +1,40 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./runmode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./runmode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var isBlock = /^(p|li|div|h\\d|pre|blockquote|td)$/;
+
+  function textContent(node, out) {
+    if (node.nodeType == 3) return out.push(node.nodeValue);
+    for (var ch = node.firstChild; ch; ch = ch.nextSibling) {
+      textContent(ch, out);
+      if (isBlock.test(node.nodeType)) out.push("\n");
+    }
+  }
+
+  CodeMirror.colorize = function(collection, defaultMode) {
+    if (!collection) collection = document.body.getElementsByTagName("pre");
+
+    for (var i = 0; i < collection.length; ++i) {
+      var node = collection[i];
+      var mode = node.getAttribute("data-lang") || defaultMode;
+      if (!mode) continue;
+
+      var text = [];
+      textContent(node, text);
+      node.innerHTML = "";
+      CodeMirror.runMode(text.join(""), mode, node);
+
+      node.className += " cm-s-default";
+    }
+  };
+});
diff --git a/core/media/editors/codemirror/addon/runmode/colorize.min.js b/core/media/editors/codemirror/addon/runmode/colorize.min.js
new file mode 100644
index 00000000..0a6197b9
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/colorize.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./runmode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./runmode"],a):a(CodeMirror)})((function(a){"use strict";function b(a,d){if(3==a.nodeType)return d.push(a.nodeValue);for(var e=a.firstChild;e;e=e.nextSibling)b(e,d),c.test(a.nodeType)&&d.push("\n")}var c=/^(p|li|div|h\\d|pre|blockquote|td)$/;a.colorize=function(c,d){c||(c=document.body.getElementsByTagName("pre"));for(var e=0;e<c.length;++e){var f=c[e],g=f.getAttribute("data-lang")||d;if(g){var h=[];b(f,h),f.innerHTML="",a.runMode(h.join(""),g,f),f.className+=" cm-s-default"}}}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/runmode/runmode-standalone.js b/core/media/editors/codemirror/addon/runmode/runmode-standalone.js
new file mode 100644
index 00000000..1bd808c7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/runmode-standalone.js
@@ -0,0 +1,158 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+window.CodeMirror = {};
+
+(function() {
+"use strict";
+
+function splitLines(string){ return string.split(/\r?\n|\r/); };
+
+function StringStream(string) {
+  this.pos = this.start = 0;
+  this.string = string;
+  this.lineStart = 0;
+}
+StringStream.prototype = {
+  eol: function() {return this.pos >= this.string.length;},
+  sol: function() {return this.pos == 0;},
+  peek: function() {return this.string.charAt(this.pos) || null;},
+  next: function() {
+    if (this.pos < this.string.length)
+      return this.string.charAt(this.pos++);
+  },
+  eat: function(match) {
+    var ch = this.string.charAt(this.pos);
+    if (typeof match == "string") var ok = ch == match;
+    else var ok = ch && (match.test ? match.test(ch) : match(ch));
+    if (ok) {++this.pos; return ch;}
+  },
+  eatWhile: function(match) {
+    var start = this.pos;
+    while (this.eat(match)){}
+    return this.pos > start;
+  },
+  eatSpace: function() {
+    var start = this.pos;
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
+    return this.pos > start;
+  },
+  skipToEnd: function() {this.pos = this.string.length;},
+  skipTo: function(ch) {
+    var found = this.string.indexOf(ch, this.pos);
+    if (found > -1) {this.pos = found; return true;}
+  },
+  backUp: function(n) {this.pos -= n;},
+  column: function() {return this.start - this.lineStart;},
+  indentation: function() {return 0;},
+  match: function(pattern, consume, caseInsensitive) {
+    if (typeof pattern == "string") {
+      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
+        if (consume !== false) this.pos += pattern.length;
+        return true;
+      }
+    } else {
+      var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) return null;
+      if (match && consume !== false) this.pos += match[0].length;
+      return match;
+    }
+  },
+  current: function(){return this.string.slice(this.start, this.pos);},
+  hideFirstChars: function(n, inner) {
+    this.lineStart += n;
+    try { return inner(); }
+    finally { this.lineStart -= n; }
+  },
+  lookAhead: function() { return null }
+};
+CodeMirror.StringStream = StringStream;
+
+CodeMirror.startState = function (mode, a1, a2) {
+  return mode.startState ? mode.startState(a1, a2) : true;
+};
+
+var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
+CodeMirror.defineMode = function (name, mode) {
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
+  modes[name] = mode;
+};
+CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
+CodeMirror.resolveMode = function(spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
+    spec = mimeModes[spec];
+  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    spec = mimeModes[spec.name];
+  }
+  if (typeof spec == "string") return {name: spec};
+  else return spec || {name: "null"};
+};
+CodeMirror.getMode = function (options, spec) {
+  spec = CodeMirror.resolveMode(spec);
+  var mfactory = modes[spec.name];
+  if (!mfactory) throw new Error("Unknown mode: " + spec);
+  return mfactory(options, spec);
+};
+CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
+CodeMirror.defineMode("null", function() {
+  return {token: function(stream) {stream.skipToEnd();}};
+});
+CodeMirror.defineMIME("text/plain", "null");
+
+CodeMirror.runMode = function (string, modespec, callback, options) {
+  var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
+
+  if (callback.nodeType == 1) {
+    var tabSize = (options && options.tabSize) || 4;
+    var node = callback, col = 0;
+    node.innerHTML = "";
+    callback = function (text, style) {
+      if (text == "\n") {
+        node.appendChild(document.createElement("br"));
+        col = 0;
+        return;
+      }
+      var content = "";
+      // replace tabs
+      for (var pos = 0; ;) {
+        var idx = text.indexOf("\t", pos);
+        if (idx == -1) {
+          content += text.slice(pos);
+          col += text.length - pos;
+          break;
+        } else {
+          col += idx - pos;
+          content += text.slice(pos, idx);
+          var size = tabSize - col % tabSize;
+          col += size;
+          for (var i = 0; i < size; ++i) content += " ";
+          pos = idx + 1;
+        }
+      }
+
+      if (style) {
+        var sp = node.appendChild(document.createElement("span"));
+        sp.className = "cm-" + style.replace(/ +/g, " cm-");
+        sp.appendChild(document.createTextNode(content));
+      } else {
+        node.appendChild(document.createTextNode(content));
+      }
+    };
+  }
+
+  var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
+  for (var i = 0, e = lines.length; i < e; ++i) {
+    if (i) callback("\n");
+    var stream = new CodeMirror.StringStream(lines[i]);
+    if (!stream.string && mode.blankLine) mode.blankLine(state);
+    while (!stream.eol()) {
+      var style = mode.token(stream, state);
+      callback(stream.current(), style, i, stream.start, state);
+      stream.start = stream.pos;
+    }
+  }
+};
+})();
diff --git a/core/media/editors/codemirror/addon/runmode/runmode-standalone.min.js b/core/media/editors/codemirror/addon/runmode/runmode-standalone.min.js
new file mode 100644
index 00000000..d84e40d3
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/runmode-standalone.min.js
@@ -0,0 +1 @@
+window.CodeMirror={},(function(){"use strict";function a(a){return a.split(/\r?\n|\r/)}function b(a){this.pos=this.start=0,this.string=a,this.lineStart=0}b.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return 0==this.pos},peek:function(){return this.string.charAt(this.pos)||null},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));if(c)return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.start-this.lineStart},indentation:function(){return 0},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}},lookAhead:function(){return null}},CodeMirror.StringStream=b,CodeMirror.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var c=CodeMirror.modes={},d=CodeMirror.mimeModes={};CodeMirror.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),c[a]=b},CodeMirror.defineMIME=function(a,b){d[a]=b},CodeMirror.resolveMode=function(a){return"string"==typeof a&&d.hasOwnProperty(a)?a=d[a]:a&&"string"==typeof a.name&&d.hasOwnProperty(a.name)&&(a=d[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}},CodeMirror.getMode=function(a,b){b=CodeMirror.resolveMode(b);var d=c[b.name];if(!d)throw new Error("Unknown mode: "+b);return d(a,b)},CodeMirror.registerHelper=CodeMirror.registerGlobalHelper=Math.min,CodeMirror.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),CodeMirror.defineMIME("text/plain","null"),CodeMirror.runMode=function(b,c,d,e){var f=CodeMirror.getMode({indentUnit:2},c);if(1==d.nodeType){var g=e&&e.tabSize||4,h=d,i=0;h.innerHTML="",d=function(a,b){if("\n"==a)return h.appendChild(document.createElement("br")),void(i=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),i+=a.length-d;break}i+=e-d,c+=a.slice(d,e);var f=g-i%g;i+=f;for(var j=0;j<f;++j)c+=" ";d=e+1}if(b){var k=h.appendChild(document.createElement("span"));k.className="cm-"+b.replace(/ +/g," cm-"),k.appendChild(document.createTextNode(c))}else h.appendChild(document.createTextNode(c))}}for(var j=a(b),k=e&&e.state||CodeMirror.startState(f),l=0,m=j.length;l<m;++l){l&&d("\n");var n=new CodeMirror.StringStream(j[l]);for(!n.string&&f.blankLine&&f.blankLine(k);!n.eol();){var o=f.token(n,k);d(n.current(),o,l,n.start,k),n.start=n.pos}}}})();
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/runmode/runmode.js b/core/media/editors/codemirror/addon/runmode/runmode.js
new file mode 100644
index 00000000..a51c6d0d
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/runmode.js
@@ -0,0 +1,72 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.runMode = function(string, modespec, callback, options) {
+  var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
+  var ie = /MSIE \d/.test(navigator.userAgent);
+  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
+
+  if (callback.appendChild) {
+    var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
+    var node = callback, col = 0;
+    node.innerHTML = "";
+    callback = function(text, style) {
+      if (text == "\n") {
+        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
+        // Emitting a carriage return makes everything ok.
+        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
+        col = 0;
+        return;
+      }
+      var content = "";
+      // replace tabs
+      for (var pos = 0;;) {
+        var idx = text.indexOf("\t", pos);
+        if (idx == -1) {
+          content += text.slice(pos);
+          col += text.length - pos;
+          break;
+        } else {
+          col += idx - pos;
+          content += text.slice(pos, idx);
+          var size = tabSize - col % tabSize;
+          col += size;
+          for (var i = 0; i < size; ++i) content += " ";
+          pos = idx + 1;
+        }
+      }
+
+      if (style) {
+        var sp = node.appendChild(document.createElement("span"));
+        sp.className = "cm-" + style.replace(/ +/g, " cm-");
+        sp.appendChild(document.createTextNode(content));
+      } else {
+        node.appendChild(document.createTextNode(content));
+      }
+    };
+  }
+
+  var lines = CodeMirror.splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
+  for (var i = 0, e = lines.length; i < e; ++i) {
+    if (i) callback("\n");
+    var stream = new CodeMirror.StringStream(lines[i]);
+    if (!stream.string && mode.blankLine) mode.blankLine(state);
+    while (!stream.eol()) {
+      var style = mode.token(stream, state);
+      callback(stream.current(), style, i, stream.start, state);
+      stream.start = stream.pos;
+    }
+  }
+};
+
+});
diff --git a/core/media/editors/codemirror/addon/runmode/runmode.min.js b/core/media/editors/codemirror/addon/runmode/runmode.min.js
new file mode 100644
index 00000000..48c906d6
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/runmode.min.js
@@ -0,0 +1 @@
+function splitLines(a){return a.split(/\r\n?|\n/)}function StringStream(a,b,c){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.context=c}function copyObj(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.runMode=function(b,c,d,e){var f=a.getMode(a.defaults,c),g=/MSIE \d/.test(navigator.userAgent),h=g&&(null==document.documentMode||document.documentMode<9);if(d.appendChild){var i=e&&e.tabSize||a.defaults.tabSize,j=d,k=0;j.innerHTML="",d=function(a,b){if("\n"==a)return j.appendChild(document.createTextNode(h?"\r":a)),void(k=0);for(var c="",d=0;;){var e=a.indexOf("\t",d);if(e==-1){c+=a.slice(d),k+=a.length-d;break}k+=e-d,c+=a.slice(d,e);var f=i-k%i;k+=f;for(var g=0;g<f;++g)c+=" ";d=e+1}if(b){var l=j.appendChild(document.createElement("span"));l.className="cm-"+b.replace(/ +/g," cm-"),l.appendChild(document.createTextNode(c))}else j.appendChild(document.createTextNode(c))}}for(var l=a.splitLines(b),m=e&&e.state||a.startState(f),n=0,o=l.length;n<o;++n){n&&d("\n");var p=new a.StringStream(l[n]);for(!p.string&&f.blankLine&&f.blankLine(m);!p.eol();){var q=f.token(p,m);d(p.current(),q,n,p.start,m),p.start=p.pos}}}}));var countColumn=exports.countColumn=function(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),b==-1&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf("\t",f);if(h<0||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}};StringStream.prototype={eol:function(){return this.pos>=this.string.length},sol:function(){return this.pos==this.lineStart},peek:function(){return this.string.charAt(this.pos)||void 0},next:function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},eat:function(a){var b=this.string.charAt(this.pos);if("string"==typeof a)var c=b==a;else var c=b&&(a.test?a.test(b):a(b));if(c)return++this.pos,b},eatWhile:function(a){for(var b=this.pos;this.eat(a););return this.pos>b},eatSpace:function(){for(var a=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++this.pos;return this.pos>a},skipToEnd:function(){this.pos=this.string.length},skipTo:function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},backUp:function(a){this.pos-=a},column:function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=countColumn(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?countColumn(this.string,this.lineStart,this.tabSize):0)},indentation:function(){return countColumn(this.string,null,this.tabSize)-(this.lineStart?countColumn(this.string,this.lineStart,this.tabSize):0)},match:function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},current:function(){return this.string.slice(this.start,this.pos)},hideFirstChars:function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}},lookAhead:function(a){var b=this.context.line+a;return b>=this.context.lines.length?null:this.context.lines[b]}},exports.StringStream=StringStream,exports.startState=function(a,b,c){return!a.startState||a.startState(b,c)};var modes=exports.modes={},mimeModes=exports.mimeModes={};exports.defineMode=function(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),modes[a]=b},exports.defineMIME=function(a,b){mimeModes[a]=b},exports.defineMode("null",(function(){return{token:function(a){a.skipToEnd()}}})),exports.defineMIME("text/plain","null"),exports.resolveMode=function(a){return"string"==typeof a&&mimeModes.hasOwnProperty(a)?a=mimeModes[a]:a&&"string"==typeof a.name&&mimeModes.hasOwnProperty(a.name)&&(a=mimeModes[a.name]),"string"==typeof a?{name:a}:a||{name:"null"}};var modeExtensions=exports.modeExtensions={};exports.extendMode=function(a,b){var c=modeExtensions.hasOwnProperty(a)?modeExtensions[a]:modeExtensions[a]={};copyObj(b,c)},exports.getMode=function(a,b){var b=exports.resolveMode(b),c=modes[b.name];if(!c)return exports.getMode(a,"text/plain");var d=c(a,b);if(modeExtensions.hasOwnProperty(b.name)){var e=modeExtensions[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var f in b.modeProps)d[f]=b.modeProps[f];return d},exports.innerMode=function(a,b){for(var c;a.innerMode&&(c=a.innerMode(b),c&&c.mode!=a);)b=c.state,a=c.mode;return c||{mode:a,state:b}},exports.registerHelper=exports.registerGlobalHelper=Math.min,exports.runMode=function(a,b,c,d){for(var e=exports.getMode({indentUnit:2},b),f=splitLines(a),g=d&&d.state||exports.startState(e),h={lines:f,line:0},i=0,j=f.length;i<j;++i,++h.line){i&&c("\n");var k=new exports.StringStream(f[i],4,h);for(!k.string&&e.blankLine&&e.blankLine(g);!k.eol();){var l=e.token(k,g);c(k.current(),l,i,k.start,g),k.start=k.pos}}},require.cache[require.resolve("../../lib/codemirror")]=require.cache[require.resolve("./runmode.node")],require.cache[require.resolve("../../addon/runmode/runmode")]=require.cache[require.resolve("./runmode.node")];
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/runmode/runmode.node.js b/core/media/editors/codemirror/addon/runmode/runmode.node.js
new file mode 100644
index 00000000..21c72696
--- /dev/null
+++ b/core/media/editors/codemirror/addon/runmode/runmode.node.js
@@ -0,0 +1,197 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/* Just enough of CodeMirror to run runMode under node.js */
+
+function splitLines(string){return string.split(/\r\n?|\n/);};
+
+// Counts the column offset in a string, taking tabs into account.
+// Used mostly to find indentation.
+var countColumn = exports.countColumn = function(string, end, tabSize, startIndex, startValue) {
+  if (end == null) {
+    end = string.search(/[^\s\u00a0]/);
+    if (end == -1) end = string.length;
+  }
+  for (var i = startIndex || 0, n = startValue || 0;;) {
+    var nextTab = string.indexOf("\t", i);
+    if (nextTab < 0 || nextTab >= end)
+      return n + (end - i);
+    n += nextTab - i;
+    n += tabSize - (n % tabSize);
+    i = nextTab + 1;
+  }
+};
+
+function StringStream(string, tabSize, context) {
+  this.pos = this.start = 0;
+  this.string = string;
+  this.tabSize = tabSize || 8;
+  this.lastColumnPos = this.lastColumnValue = 0;
+  this.lineStart = 0;
+  this.context = context
+};
+
+StringStream.prototype = {
+  eol: function() {return this.pos >= this.string.length;},
+  sol: function() {return this.pos == this.lineStart;},
+  peek: function() {return this.string.charAt(this.pos) || undefined;},
+  next: function() {
+    if (this.pos < this.string.length)
+      return this.string.charAt(this.pos++);
+  },
+  eat: function(match) {
+    var ch = this.string.charAt(this.pos);
+    if (typeof match == "string") var ok = ch == match;
+    else var ok = ch && (match.test ? match.test(ch) : match(ch));
+    if (ok) {++this.pos; return ch;}
+  },
+  eatWhile: function(match) {
+    var start = this.pos;
+    while (this.eat(match)){}
+    return this.pos > start;
+  },
+  eatSpace: function() {
+    var start = this.pos;
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
+    return this.pos > start;
+  },
+  skipToEnd: function() {this.pos = this.string.length;},
+  skipTo: function(ch) {
+    var found = this.string.indexOf(ch, this.pos);
+    if (found > -1) {this.pos = found; return true;}
+  },
+  backUp: function(n) {this.pos -= n;},
+  column: function() {
+    if (this.lastColumnPos < this.start) {
+      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
+      this.lastColumnPos = this.start;
+    }
+    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+  },
+  indentation: function() {
+    return countColumn(this.string, null, this.tabSize) -
+      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+  },
+  match: function(pattern, consume, caseInsensitive) {
+    if (typeof pattern == "string") {
+      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
+        if (consume !== false) this.pos += pattern.length;
+        return true;
+      }
+    } else {
+      var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) return null;
+      if (match && consume !== false) this.pos += match[0].length;
+      return match;
+    }
+  },
+  current: function(){return this.string.slice(this.start, this.pos);},
+  hideFirstChars: function(n, inner) {
+    this.lineStart += n;
+    try { return inner(); }
+    finally { this.lineStart -= n; }
+  },
+  lookAhead: function(n) {
+    var line = this.context.line + n
+    return line >= this.context.lines.length ? null : this.context.lines[line]
+  }
+};
+exports.StringStream = StringStream;
+
+exports.startState = function(mode, a1, a2) {
+  return mode.startState ? mode.startState(a1, a2) : true;
+};
+
+var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
+exports.defineMode = function(name, mode) {
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
+  modes[name] = mode;
+};
+exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
+
+exports.defineMode("null", function() {
+  return {token: function(stream) {stream.skipToEnd();}};
+});
+exports.defineMIME("text/plain", "null");
+
+exports.resolveMode = function(spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
+    spec = mimeModes[spec];
+  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    spec = mimeModes[spec.name];
+  }
+  if (typeof spec == "string") return {name: spec};
+  else return spec || {name: "null"};
+};
+
+function copyObj(obj, target, overwrite) {
+  if (!target) target = {};
+  for (var prop in obj)
+    if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+      target[prop] = obj[prop];
+  return target;
+}
+
+// This can be used to attach properties to mode objects from
+// outside the actual mode definition.
+var modeExtensions = exports.modeExtensions = {};
+exports.extendMode = function(mode, properties) {
+  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+  copyObj(properties, exts);
+};
+
+exports.getMode = function(options, spec) {
+  var spec = exports.resolveMode(spec);
+  var mfactory = modes[spec.name];
+  if (!mfactory) return exports.getMode(options, "text/plain");
+  var modeObj = mfactory(options, spec);
+  if (modeExtensions.hasOwnProperty(spec.name)) {
+    var exts = modeExtensions[spec.name];
+    for (var prop in exts) {
+      if (!exts.hasOwnProperty(prop)) continue;
+      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
+      modeObj[prop] = exts[prop];
+    }
+  }
+  modeObj.name = spec.name;
+  if (spec.helperType) modeObj.helperType = spec.helperType;
+  if (spec.modeProps) for (var prop in spec.modeProps)
+    modeObj[prop] = spec.modeProps[prop];
+
+  return modeObj;
+};
+
+exports.innerMode = function(mode, state) {
+  var info;
+  while (mode.innerMode) {
+    info = mode.innerMode(state);
+    if (!info || info.mode == mode) break;
+    state = info.state;
+    mode = info.mode;
+  }
+  return info || {mode: mode, state: state};
+}
+
+exports.registerHelper = exports.registerGlobalHelper = Math.min;
+
+exports.runMode = function(string, modespec, callback, options) {
+  var mode = exports.getMode({indentUnit: 2}, modespec);
+  var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
+  var context = {lines: lines, line: 0}
+  for (var i = 0, e = lines.length; i < e; ++i, ++context.line) {
+    if (i) callback("\n");
+    var stream = new exports.StringStream(lines[i], 4, context);
+    if (!stream.string && mode.blankLine) mode.blankLine(state);
+    while (!stream.eol()) {
+      var style = mode.token(stream, state);
+      callback(stream.current(), style, i, stream.start, state);
+      stream.start = stream.pos;
+    }
+  }
+};
+
+require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")];
+require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")];
diff --git a/core/media/editors/codemirror/addon/scroll/annotatescrollbar.js b/core/media/editors/codemirror/addon/scroll/annotatescrollbar.js
new file mode 100644
index 00000000..f2276fc7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/annotatescrollbar.js
@@ -0,0 +1,122 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("annotateScrollbar", function(options) {
+    if (typeof options == "string") options = {className: options};
+    return new Annotation(this, options);
+  });
+
+  CodeMirror.defineOption("scrollButtonHeight", 0);
+
+  function Annotation(cm, options) {
+    this.cm = cm;
+    this.options = options;
+    this.buttonHeight = options.scrollButtonHeight || cm.getOption("scrollButtonHeight");
+    this.annotations = [];
+    this.doRedraw = this.doUpdate = null;
+    this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
+    this.div.style.cssText = "position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";
+    this.computeScale();
+
+    function scheduleRedraw(delay) {
+      clearTimeout(self.doRedraw);
+      self.doRedraw = setTimeout(function() { self.redraw(); }, delay);
+    }
+
+    var self = this;
+    cm.on("refresh", this.resizeHandler = function() {
+      clearTimeout(self.doUpdate);
+      self.doUpdate = setTimeout(function() {
+        if (self.computeScale()) scheduleRedraw(20);
+      }, 100);
+    });
+    cm.on("markerAdded", this.resizeHandler);
+    cm.on("markerCleared", this.resizeHandler);
+    if (options.listenForChanges !== false)
+      cm.on("change", this.changeHandler = function() {
+        scheduleRedraw(250);
+      });
+  }
+
+  Annotation.prototype.computeScale = function() {
+    var cm = this.cm;
+    var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight - this.buttonHeight * 2) /
+      cm.getScrollerElement().scrollHeight
+    if (hScale != this.hScale) {
+      this.hScale = hScale;
+      return true;
+    }
+  };
+
+  Annotation.prototype.update = function(annotations) {
+    this.annotations = annotations;
+    this.redraw();
+  };
+
+  Annotation.prototype.redraw = function(compute) {
+    if (compute !== false) this.computeScale();
+    var cm = this.cm, hScale = this.hScale;
+
+    var frag = document.createDocumentFragment(), anns = this.annotations;
+
+    var wrapping = cm.getOption("lineWrapping");
+    var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
+    var curLine = null, curLineObj = null;
+    function getY(pos, top) {
+      if (curLine != pos.line) {
+        curLine = pos.line;
+        curLineObj = cm.getLineHandle(curLine);
+      }
+      if ((curLineObj.widgets && curLineObj.widgets.length) ||
+          (wrapping && curLineObj.height > singleLineH))
+        return cm.charCoords(pos, "local")[top ? "top" : "bottom"];
+      var topY = cm.heightAtLine(curLineObj, "local");
+      return topY + (top ? 0 : curLineObj.height);
+    }
+
+    var lastLine = cm.lastLine()
+    if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
+      var ann = anns[i];
+      if (ann.to.line > lastLine) continue;
+      var top = nextTop || getY(ann.from, true) * hScale;
+      var bottom = getY(ann.to, false) * hScale;
+      while (i < anns.length - 1) {
+        if (anns[i + 1].to.line > lastLine) break;
+        nextTop = getY(anns[i + 1].from, true) * hScale;
+        if (nextTop > bottom + .9) break;
+        ann = anns[++i];
+        bottom = getY(ann.to, false) * hScale;
+      }
+      if (bottom == top) continue;
+      var height = Math.max(bottom - top, 3);
+
+      var elt = frag.appendChild(document.createElement("div"));
+      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: "
+        + (top + this.buttonHeight) + "px; height: " + height + "px";
+      elt.className = this.options.className;
+      if (ann.id) {
+        elt.setAttribute("annotation-id", ann.id);
+      }
+    }
+    this.div.textContent = "";
+    this.div.appendChild(frag);
+  };
+
+  Annotation.prototype.clear = function() {
+    this.cm.off("refresh", this.resizeHandler);
+    this.cm.off("markerAdded", this.resizeHandler);
+    this.cm.off("markerCleared", this.resizeHandler);
+    if (this.changeHandler) this.cm.off("change", this.changeHandler);
+    this.div.parentNode.removeChild(this.div);
+  };
+});
diff --git a/core/media/editors/codemirror/addon/scroll/annotatescrollbar.min.js b/core/media/editors/codemirror/addon/scroll/annotatescrollbar.min.js
new file mode 100644
index 00000000..f4829e2f
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/annotatescrollbar.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){function c(a){clearTimeout(d.doRedraw),d.doRedraw=setTimeout((function(){d.redraw()}),a)}this.cm=a,this.options=b,this.buttonHeight=b.scrollButtonHeight||a.getOption("scrollButtonHeight"),this.annotations=[],this.doRedraw=this.doUpdate=null,this.div=a.getWrapperElement().appendChild(document.createElement("div")),this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none",this.computeScale();var d=this;a.on("refresh",this.resizeHandler=function(){clearTimeout(d.doUpdate),d.doUpdate=setTimeout((function(){d.computeScale()&&c(20)}),100)}),a.on("markerAdded",this.resizeHandler),a.on("markerCleared",this.resizeHandler),b.listenForChanges!==!1&&a.on("change",this.changeHandler=function(){c(250)})}a.defineExtension("annotateScrollbar",(function(a){return"string"==typeof a&&(a={className:a}),new b(this,a)})),a.defineOption("scrollButtonHeight",0),b.prototype.computeScale=function(){var a=this.cm,b=(a.getWrapperElement().clientHeight-a.display.barHeight-2*this.buttonHeight)/a.getScrollerElement().scrollHeight;if(b!=this.hScale)return this.hScale=b,!0},b.prototype.update=function(a){this.annotations=a,this.redraw()},b.prototype.redraw=function(a){function b(a,b){if(i!=a.line&&(i=a.line,j=c.getLineHandle(i)),j.widgets&&j.widgets.length||g&&j.height>h)return c.charCoords(a,"local")[b?"top":"bottom"];var d=c.heightAtLine(j,"local");return d+(b?0:j.height)}a!==!1&&this.computeScale();var c=this.cm,d=this.hScale,e=document.createDocumentFragment(),f=this.annotations,g=c.getOption("lineWrapping"),h=g&&1.5*c.defaultTextHeight(),i=null,j=null,k=c.lastLine();if(c.display.barWidth)for(var l,m=0;m<f.length;m++){var n=f[m];if(!(n.to.line>k)){for(var o=l||b(n.from,!0)*d,p=b(n.to,!1)*d;m<f.length-1&&!(f[m+1].to.line>k)&&(l=b(f[m+1].from,!0)*d,!(l>p+.9));)n=f[++m],p=b(n.to,!1)*d;if(p!=o){var q=Math.max(p-o,3),r=e.appendChild(document.createElement("div"));r.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(o+this.buttonHeight)+"px; height: "+q+"px",r.className=this.options.className,n.id&&r.setAttribute("annotation-id",n.id)}}}this.div.textContent="",this.div.appendChild(e)},b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("change",this.changeHandler),this.div.parentNode.removeChild(this.div)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/scroll/scrollpastend.js b/core/media/editors/codemirror/addon/scroll/scrollpastend.js
new file mode 100644
index 00000000..a2ed089b
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/scrollpastend.js
@@ -0,0 +1,48 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("change", onChange);
+      cm.off("refresh", updateBottomMargin);
+      cm.display.lineSpace.parentNode.style.paddingBottom = "";
+      cm.state.scrollPastEndPadding = null;
+    }
+    if (val) {
+      cm.on("change", onChange);
+      cm.on("refresh", updateBottomMargin);
+      updateBottomMargin(cm);
+    }
+  });
+
+  function onChange(cm, change) {
+    if (CodeMirror.changeEnd(change).line == cm.lastLine())
+      updateBottomMargin(cm);
+  }
+
+  function updateBottomMargin(cm) {
+    var padding = "";
+    if (cm.lineCount() > 1) {
+      var totalH = cm.display.scroller.clientHeight - 30,
+          lastLineH = cm.getLineHandle(cm.lastLine()).height;
+      padding = (totalH - lastLineH) + "px";
+    }
+    if (cm.state.scrollPastEndPadding != padding) {
+      cm.state.scrollPastEndPadding = padding;
+      cm.display.lineSpace.parentNode.style.paddingBottom = padding;
+      cm.off("refresh", updateBottomMargin);
+      cm.setSize();
+      cm.on("refresh", updateBottomMargin);
+    }
+  }
+});
diff --git a/core/media/editors/codemirror/addon/scroll/scrollpastend.min.js b/core/media/editors/codemirror/addon/scroll/scrollpastend.min.js
new file mode 100644
index 00000000..09c4380f
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/scrollpastend.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,d){a.changeEnd(d).line==b.lastLine()&&c(b)}function c(a){var b="";if(a.lineCount()>1){var d=a.display.scroller.clientHeight-30,e=a.getLineHandle(a.lastLine()).height;b=d-e+"px"}a.state.scrollPastEndPadding!=b&&(a.state.scrollPastEndPadding=b,a.display.lineSpace.parentNode.style.paddingBottom=b,a.off("refresh",c),a.setSize(),a.on("refresh",c))}a.defineOption("scrollPastEnd",!1,(function(d,e,f){f&&f!=a.Init&&(d.off("change",b),d.off("refresh",c),d.display.lineSpace.parentNode.style.paddingBottom="",d.state.scrollPastEndPadding=null),e&&(d.on("change",b),d.on("refresh",c),c(d))}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/scroll/simplescrollbars.css b/core/media/editors/codemirror/addon/scroll/simplescrollbars.css
new file mode 100644
index 00000000..5eea7aa1
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/simplescrollbars.css
@@ -0,0 +1,66 @@
+.CodeMirror-simplescroll-horizontal div, .CodeMirror-simplescroll-vertical div {
+  position: absolute;
+  background: #ccc;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px solid #bbb;
+  border-radius: 2px;
+}
+
+.CodeMirror-simplescroll-horizontal, .CodeMirror-simplescroll-vertical {
+  position: absolute;
+  z-index: 6;
+  background: #eee;
+}
+
+.CodeMirror-simplescroll-horizontal {
+  bottom: 0; left: 0;
+  height: 8px;
+}
+.CodeMirror-simplescroll-horizontal div {
+  bottom: 0;
+  height: 100%;
+}
+
+.CodeMirror-simplescroll-vertical {
+  right: 0; top: 0;
+  width: 8px;
+}
+.CodeMirror-simplescroll-vertical div {
+  right: 0;
+  width: 100%;
+}
+
+
+.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler, .CodeMirror-overlayscroll .CodeMirror-gutter-filler {
+  display: none;
+}
+
+.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
+  position: absolute;
+  background: #bcd;
+  border-radius: 3px;
+}
+
+.CodeMirror-overlayscroll-horizontal, .CodeMirror-overlayscroll-vertical {
+  position: absolute;
+  z-index: 6;
+}
+
+.CodeMirror-overlayscroll-horizontal {
+  bottom: 0; left: 0;
+  height: 6px;
+}
+.CodeMirror-overlayscroll-horizontal div {
+  bottom: 0;
+  height: 100%;
+}
+
+.CodeMirror-overlayscroll-vertical {
+  right: 0; top: 0;
+  width: 6px;
+}
+.CodeMirror-overlayscroll-vertical div {
+  right: 0;
+  width: 100%;
+}
diff --git a/core/media/editors/codemirror/addon/scroll/simplescrollbars.js b/core/media/editors/codemirror/addon/scroll/simplescrollbars.js
new file mode 100644
index 00000000..23f3e03f
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/simplescrollbars.js
@@ -0,0 +1,152 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function Bar(cls, orientation, scroll) {
+    this.orientation = orientation;
+    this.scroll = scroll;
+    this.screen = this.total = this.size = 1;
+    this.pos = 0;
+
+    this.node = document.createElement("div");
+    this.node.className = cls + "-" + orientation;
+    this.inner = this.node.appendChild(document.createElement("div"));
+
+    var self = this;
+    CodeMirror.on(this.inner, "mousedown", function(e) {
+      if (e.which != 1) return;
+      CodeMirror.e_preventDefault(e);
+      var axis = self.orientation == "horizontal" ? "pageX" : "pageY";
+      var start = e[axis], startpos = self.pos;
+      function done() {
+        CodeMirror.off(document, "mousemove", move);
+        CodeMirror.off(document, "mouseup", done);
+      }
+      function move(e) {
+        if (e.which != 1) return done();
+        self.moveTo(startpos + (e[axis] - start) * (self.total / self.size));
+      }
+      CodeMirror.on(document, "mousemove", move);
+      CodeMirror.on(document, "mouseup", done);
+    });
+
+    CodeMirror.on(this.node, "click", function(e) {
+      CodeMirror.e_preventDefault(e);
+      var innerBox = self.inner.getBoundingClientRect(), where;
+      if (self.orientation == "horizontal")
+        where = e.clientX < innerBox.left ? -1 : e.clientX > innerBox.right ? 1 : 0;
+      else
+        where = e.clientY < innerBox.top ? -1 : e.clientY > innerBox.bottom ? 1 : 0;
+      self.moveTo(self.pos + where * self.screen);
+    });
+
+    function onWheel(e) {
+      var moved = CodeMirror.wheelEventPixels(e)[self.orientation == "horizontal" ? "x" : "y"];
+      var oldPos = self.pos;
+      self.moveTo(self.pos + moved);
+      if (self.pos != oldPos) CodeMirror.e_preventDefault(e);
+    }
+    CodeMirror.on(this.node, "mousewheel", onWheel);
+    CodeMirror.on(this.node, "DOMMouseScroll", onWheel);
+  }
+
+  Bar.prototype.setPos = function(pos, force) {
+    if (pos < 0) pos = 0;
+    if (pos > this.total - this.screen) pos = this.total - this.screen;
+    if (!force && pos == this.pos) return false;
+    this.pos = pos;
+    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
+      (pos * (this.size / this.total)) + "px";
+    return true
+  };
+
+  Bar.prototype.moveTo = function(pos) {
+    if (this.setPos(pos)) this.scroll(pos, this.orientation);
+  }
+
+  var minButtonSize = 10;
+
+  Bar.prototype.update = function(scrollSize, clientSize, barSize) {
+    var sizeChanged = this.screen != clientSize || this.total != scrollSize || this.size != barSize
+    if (sizeChanged) {
+      this.screen = clientSize;
+      this.total = scrollSize;
+      this.size = barSize;
+    }
+
+    var buttonSize = this.screen * (this.size / this.total);
+    if (buttonSize < minButtonSize) {
+      this.size -= minButtonSize - buttonSize;
+      buttonSize = minButtonSize;
+    }
+    this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
+      buttonSize + "px";
+    this.setPos(this.pos, sizeChanged);
+  };
+
+  function SimpleScrollbars(cls, place, scroll) {
+    this.addClass = cls;
+    this.horiz = new Bar(cls, "horizontal", scroll);
+    place(this.horiz.node);
+    this.vert = new Bar(cls, "vertical", scroll);
+    place(this.vert.node);
+    this.width = null;
+  }
+
+  SimpleScrollbars.prototype.update = function(measure) {
+    if (this.width == null) {
+      var style = window.getComputedStyle ? window.getComputedStyle(this.horiz.node) : this.horiz.node.currentStyle;
+      if (style) this.width = parseInt(style.height);
+    }
+    var width = this.width || 0;
+
+    var needsH = measure.scrollWidth > measure.clientWidth + 1;
+    var needsV = measure.scrollHeight > measure.clientHeight + 1;
+    this.vert.node.style.display = needsV ? "block" : "none";
+    this.horiz.node.style.display = needsH ? "block" : "none";
+
+    if (needsV) {
+      this.vert.update(measure.scrollHeight, measure.clientHeight,
+                       measure.viewHeight - (needsH ? width : 0));
+      this.vert.node.style.bottom = needsH ? width + "px" : "0";
+    }
+    if (needsH) {
+      this.horiz.update(measure.scrollWidth, measure.clientWidth,
+                        measure.viewWidth - (needsV ? width : 0) - measure.barLeft);
+      this.horiz.node.style.right = needsV ? width + "px" : "0";
+      this.horiz.node.style.left = measure.barLeft + "px";
+    }
+
+    return {right: needsV ? width : 0, bottom: needsH ? width : 0};
+  };
+
+  SimpleScrollbars.prototype.setScrollTop = function(pos) {
+    this.vert.setPos(pos);
+  };
+
+  SimpleScrollbars.prototype.setScrollLeft = function(pos) {
+    this.horiz.setPos(pos);
+  };
+
+  SimpleScrollbars.prototype.clear = function() {
+    var parent = this.horiz.node.parentNode;
+    parent.removeChild(this.horiz.node);
+    parent.removeChild(this.vert.node);
+  };
+
+  CodeMirror.scrollbarModel.simple = function(place, scroll) {
+    return new SimpleScrollbars("CodeMirror-simplescroll", place, scroll);
+  };
+  CodeMirror.scrollbarModel.overlay = function(place, scroll) {
+    return new SimpleScrollbars("CodeMirror-overlayscroll", place, scroll);
+  };
+});
diff --git a/core/media/editors/codemirror/addon/scroll/simplescrollbars.min.css b/core/media/editors/codemirror/addon/scroll/simplescrollbars.min.css
new file mode 100644
index 00000000..618a2f73
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/simplescrollbars.min.css
@@ -0,0 +1 @@
+.CodeMirror-simplescroll-horizontal div,.CodeMirror-simplescroll-vertical div{position:absolute;background:#ccc;-moz-box-sizing:border-box;box-sizing:border-box;border:1px solid #bbb;border-radius:2px}.CodeMirror-simplescroll-horizontal,.CodeMirror-simplescroll-vertical{position:absolute;z-index:6;background:#eee}.CodeMirror-simplescroll-horizontal{bottom:0;left:0;height:8px}.CodeMirror-simplescroll-horizontal div{bottom:0;height:100%}.CodeMirror-simplescroll-vertical{right:0;top:0;width:8px}.CodeMirror-simplescroll-vertical div{right:0;width:100%}.CodeMirror-overlayscroll .CodeMirror-gutter-filler,.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler{display:none}.CodeMirror-overlayscroll-horizontal div,.CodeMirror-overlayscroll-vertical div{position:absolute;background:#bcd;border-radius:3px}.CodeMirror-overlayscroll-horizontal,.CodeMirror-overlayscroll-vertical{position:absolute;z-index:6}.CodeMirror-overlayscroll-horizontal{bottom:0;left:0;height:6px}.CodeMirror-overlayscroll-horizontal div{bottom:0;height:100%}.CodeMirror-overlayscroll-vertical{right:0;top:0;width:6px}.CodeMirror-overlayscroll-vertical div{right:0;width:100%}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/scroll/simplescrollbars.min.js b/core/media/editors/codemirror/addon/scroll/simplescrollbars.min.js
new file mode 100644
index 00000000..08f5955a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/scroll/simplescrollbars.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){function e(b){var c=a.wheelEventPixels(b)["horizontal"==f.orientation?"x":"y"],d=f.pos;f.moveTo(f.pos+c),f.pos!=d&&a.e_preventDefault(b)}this.orientation=c,this.scroll=d,this.screen=this.total=this.size=1,this.pos=0,this.node=document.createElement("div"),this.node.className=b+"-"+c,this.inner=this.node.appendChild(document.createElement("div"));var f=this;a.on(this.inner,"mousedown",(function(b){function c(){a.off(document,"mousemove",d),a.off(document,"mouseup",c)}function d(a){return 1!=a.which?c():void f.moveTo(h+(a[e]-g)*(f.total/f.size))}if(1==b.which){a.e_preventDefault(b);var e="horizontal"==f.orientation?"pageX":"pageY",g=b[e],h=f.pos;a.on(document,"mousemove",d),a.on(document,"mouseup",c)}})),a.on(this.node,"click",(function(b){a.e_preventDefault(b);var c,d=f.inner.getBoundingClientRect();c="horizontal"==f.orientation?b.clientX<d.left?-1:b.clientX>d.right?1:0:b.clientY<d.top?-1:b.clientY>d.bottom?1:0,f.moveTo(f.pos+c*f.screen)})),a.on(this.node,"mousewheel",e),a.on(this.node,"DOMMouseScroll",e)}function c(a,c,d){this.addClass=a,this.horiz=new b(a,"horizontal",d),c(this.horiz.node),this.vert=new b(a,"vertical",d),c(this.vert.node),this.width=null}b.prototype.setPos=function(a,b){return a<0&&(a=0),a>this.total-this.screen&&(a=this.total-this.screen),!(!b&&a==this.pos)&&(this.pos=a,this.inner.style["horizontal"==this.orientation?"left":"top"]=a*(this.size/this.total)+"px",!0)},b.prototype.moveTo=function(a){this.setPos(a)&&this.scroll(a,this.orientation)};var d=10;b.prototype.update=function(a,b,c){var e=this.screen!=b||this.total!=a||this.size!=c;e&&(this.screen=b,this.total=a,this.size=c);var f=this.screen*(this.size/this.total);f<d&&(this.size-=d-f,f=d),this.inner.style["horizontal"==this.orientation?"width":"height"]=f+"px",this.setPos(this.pos,e)},c.prototype.update=function(a){if(null==this.width){var b=window.getComputedStyle?window.getComputedStyle(this.horiz.node):this.horiz.node.currentStyle;b&&(this.width=parseInt(b.height))}var c=this.width||0,d=a.scrollWidth>a.clientWidth+1,e=a.scrollHeight>a.clientHeight+1;return this.vert.node.style.display=e?"block":"none",this.horiz.node.style.display=d?"block":"none",e&&(this.vert.update(a.scrollHeight,a.clientHeight,a.viewHeight-(d?c:0)),this.vert.node.style.bottom=d?c+"px":"0"),d&&(this.horiz.update(a.scrollWidth,a.clientWidth,a.viewWidth-(e?c:0)-a.barLeft),this.horiz.node.style.right=e?c+"px":"0",this.horiz.node.style.left=a.barLeft+"px"),{right:e?c:0,bottom:d?c:0}},c.prototype.setScrollTop=function(a){this.vert.setPos(a)},c.prototype.setScrollLeft=function(a){this.horiz.setPos(a)},c.prototype.clear=function(){var a=this.horiz.node.parentNode;a.removeChild(this.horiz.node),a.removeChild(this.vert.node)},a.scrollbarModel.simple=function(a,b){return new c("CodeMirror-simplescroll",a,b)},a.scrollbarModel.overlay=function(a,b){return new c("CodeMirror-overlayscroll",a,b)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/search/jump-to-line.js b/core/media/editors/codemirror/addon/search/jump-to-line.js
new file mode 100644
index 00000000..8b599cbc
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/jump-to-line.js
@@ -0,0 +1,49 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Defines jumpToLine command. Uses dialog.js if present.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function dialog(cm, text, shortText, deflt, f) {
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+    else f(prompt(shortText, deflt));
+  }
+
+  var jumpDialog =
+      'Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';
+
+  function interpretLine(cm, string) {
+    var num = Number(string)
+    if (/^[-+]/.test(string)) return cm.getCursor().line + num
+    else return num - 1
+  }
+
+  CodeMirror.commands.jumpToLine = function(cm) {
+    var cur = cm.getCursor();
+    dialog(cm, jumpDialog, "Jump to line:", (cur.line + 1) + ":" + cur.ch, function(posStr) {
+      if (!posStr) return;
+
+      var match;
+      if (match = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr)) {
+        cm.setCursor(interpretLine(cm, match[1]), Number(match[2]))
+      } else if (match = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr)) {
+        var line = Math.round(cm.lineCount() * Number(match[1]) / 100);
+        if (/^[-+]/.test(match[1])) line = cur.line + line + 1;
+        cm.setCursor(line - 1, cur.ch);
+      } else if (match = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr)) {
+        cm.setCursor(interpretLine(cm, match[1]), cur.ch);
+      }
+    });
+  };
+
+  CodeMirror.keyMap["default"]["Alt-G"] = "jumpToLine";
+});
diff --git a/core/media/editors/codemirror/addon/search/jump-to-line.min.js b/core/media/editors/codemirror/addon/search/jump-to-line.min.js
new file mode 100644
index 00000000..985b4b4e
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/jump-to-line.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../dialog/dialog"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function c(a,b){var c=Number(b);return/^[-+]/.test(b)?a.getCursor().line+c:c-1}var d='Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';a.commands.jumpToLine=function(a){var e=a.getCursor();b(a,d,"Jump to line:",e.line+1+":"+e.ch,(function(b){if(b){var d;if(d=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(b))a.setCursor(c(a,d[1]),Number(d[2]));else if(d=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(b)){var f=Math.round(a.lineCount()*Number(d[1])/100);/^[-+]/.test(d[1])&&(f=e.line+f+1),a.setCursor(f-1,e.ch)}else(d=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(b))&&a.setCursor(c(a,d[1]),e.ch)}}))},a.keyMap.default["Alt-G"]="jumpToLine"}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/search/match-highlighter.js b/core/media/editors/codemirror/addon/search/match-highlighter.js
new file mode 100644
index 00000000..260cdeb2
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/match-highlighter.js
@@ -0,0 +1,165 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Highlighting text that matches the selection
+//
+// Defines an option highlightSelectionMatches, which, when enabled,
+// will style strings that match the selection throughout the
+// document.
+//
+// The option can be set to true to simply enable it, or to a
+// {minChars, style, wordsOnly, showToken, delay} object to explicitly
+// configure it. minChars is the minimum amount of characters that should be
+// selected for the behavior to occur, and style is the token style to
+// apply to the matches. This will be prefixed by "cm-" to create an
+// actual CSS class name. If wordsOnly is enabled, the matches will be
+// highlighted only if the selected text is a word. showToken, when enabled,
+// will cause the current token to be highlighted when nothing is selected.
+// delay is used to specify how much time to wait, in milliseconds, before
+// highlighting the matches. If annotateScrollbar is enabled, the occurences
+// will be highlighted on the scrollbar via the matchesonscrollbar addon.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./matchesonscrollbar"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./matchesonscrollbar"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var defaults = {
+    style: "matchhighlight",
+    minChars: 2,
+    delay: 100,
+    wordsOnly: false,
+    annotateScrollbar: false,
+    showToken: false,
+    trim: true
+  }
+
+  function State(options) {
+    this.options = {}
+    for (var name in defaults)
+      this.options[name] = (options && options.hasOwnProperty(name) ? options : defaults)[name]
+    this.overlay = this.timeout = null;
+    this.matchesonscroll = null;
+    this.active = false;
+  }
+
+  CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      removeOverlay(cm);
+      clearTimeout(cm.state.matchHighlighter.timeout);
+      cm.state.matchHighlighter = null;
+      cm.off("cursorActivity", cursorActivity);
+      cm.off("focus", onFocus)
+    }
+    if (val) {
+      var state = cm.state.matchHighlighter = new State(val);
+      if (cm.hasFocus()) {
+        state.active = true
+        highlightMatches(cm)
+      } else {
+        cm.on("focus", onFocus)
+      }
+      cm.on("cursorActivity", cursorActivity);
+    }
+  });
+
+  function cursorActivity(cm) {
+    var state = cm.state.matchHighlighter;
+    if (state.active || cm.hasFocus()) scheduleHighlight(cm, state)
+  }
+
+  function onFocus(cm) {
+    var state = cm.state.matchHighlighter
+    if (!state.active) {
+      state.active = true
+      scheduleHighlight(cm, state)
+    }
+  }
+
+  function scheduleHighlight(cm, state) {
+    clearTimeout(state.timeout);
+    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.options.delay);
+  }
+
+  function addOverlay(cm, query, hasBoundary, style) {
+    var state = cm.state.matchHighlighter;
+    cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
+    if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
+      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") + "\\b") : query;
+      state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
+        {className: "CodeMirror-selection-highlight-scrollbar"});
+    }
+  }
+
+  function removeOverlay(cm) {
+    var state = cm.state.matchHighlighter;
+    if (state.overlay) {
+      cm.removeOverlay(state.overlay);
+      state.overlay = null;
+      if (state.matchesonscroll) {
+        state.matchesonscroll.clear();
+        state.matchesonscroll = null;
+      }
+    }
+  }
+
+  function highlightMatches(cm) {
+    cm.operation(function() {
+      var state = cm.state.matchHighlighter;
+      removeOverlay(cm);
+      if (!cm.somethingSelected() && state.options.showToken) {
+        var re = state.options.showToken === true ? /[\w$]/ : state.options.showToken;
+        var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
+        while (start && re.test(line.charAt(start - 1))) --start;
+        while (end < line.length && re.test(line.charAt(end))) ++end;
+        if (start < end)
+          addOverlay(cm, line.slice(start, end), re, state.options.style);
+        return;
+      }
+      var from = cm.getCursor("from"), to = cm.getCursor("to");
+      if (from.line != to.line) return;
+      if (state.options.wordsOnly && !isWord(cm, from, to)) return;
+      var selection = cm.getRange(from, to)
+      if (state.options.trim) selection = selection.replace(/^\s+|\s+$/g, "")
+      if (selection.length >= state.options.minChars)
+        addOverlay(cm, selection, false, state.options.style);
+    });
+  }
+
+  function isWord(cm, from, to) {
+    var str = cm.getRange(from, to);
+    if (str.match(/^\w+$/) !== null) {
+        if (from.ch > 0) {
+            var pos = {line: from.line, ch: from.ch - 1};
+            var chr = cm.getRange(pos, from);
+            if (chr.match(/\W/) === null) return false;
+        }
+        if (to.ch < cm.getLine(from.line).length) {
+            var pos = {line: to.line, ch: to.ch + 1};
+            var chr = cm.getRange(to, pos);
+            if (chr.match(/\W/) === null) return false;
+        }
+        return true;
+    } else return false;
+  }
+
+  function boundariesAround(stream, re) {
+    return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
+      (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
+  }
+
+  function makeOverlay(query, hasBoundary, style) {
+    return {token: function(stream) {
+      if (stream.match(query) &&
+          (!hasBoundary || boundariesAround(stream, hasBoundary)))
+        return style;
+      stream.next();
+      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
+    }};
+  }
+});
diff --git a/core/media/editors/codemirror/addon/search/match-highlighter.min.js b/core/media/editors/codemirror/addon/search/match-highlighter.min.js
new file mode 100644
index 00000000..9bbf9814
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/match-highlighter.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./matchesonscrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./matchesonscrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options={};for(var b in l)this.options[b]=(a&&a.hasOwnProperty(b)?a:l)[b];this.overlay=this.timeout=null,this.matchesonscroll=null,this.active=!1}function c(a){var b=a.state.matchHighlighter;(b.active||a.hasFocus())&&e(a,b)}function d(a){var b=a.state.matchHighlighter;b.active||(b.active=!0,e(a,b))}function e(a,b){clearTimeout(b.timeout),b.timeout=setTimeout((function(){h(a)}),b.options.delay)}function f(a,b,c,d){var e=a.state.matchHighlighter;if(a.addOverlay(e.overlay=k(b,c,d)),e.options.annotateScrollbar&&a.showMatchesOnScrollbar){var f=c?new RegExp("\\b"+b.replace(/[\\\[.+*?(){|^$]/g,"\\$&")+"\\b"):b;e.matchesonscroll=a.showMatchesOnScrollbar(f,!1,{className:"CodeMirror-selection-highlight-scrollbar"})}}function g(a){var b=a.state.matchHighlighter;b.overlay&&(a.removeOverlay(b.overlay),b.overlay=null,b.matchesonscroll&&(b.matchesonscroll.clear(),b.matchesonscroll=null))}function h(a){a.operation((function(){var b=a.state.matchHighlighter;if(g(a),!a.somethingSelected()&&b.options.showToken){for(var c=b.options.showToken===!0?/[\w$]/:b.options.showToken,d=a.getCursor(),e=a.getLine(d.line),h=d.ch,j=h;h&&c.test(e.charAt(h-1));)--h;for(;j<e.length&&c.test(e.charAt(j));)++j;return void(h<j&&f(a,e.slice(h,j),c,b.options.style))}var k=a.getCursor("from"),l=a.getCursor("to");if(k.line==l.line&&(!b.options.wordsOnly||i(a,k,l))){var m=a.getRange(k,l);b.options.trim&&(m=m.replace(/^\s+|\s+$/g,"")),m.length>=b.options.minChars&&f(a,m,!1,b.options.style)}}))}function i(a,b,c){var d=a.getRange(b,c);if(null!==d.match(/^\w+$/)){if(b.ch>0){var e={line:b.line,ch:b.ch-1},f=a.getRange(e,b);if(null===f.match(/\W/))return!1}if(c.ch<a.getLine(b.line).length){var e={line:c.line,ch:c.ch+1},f=a.getRange(c,e);if(null===f.match(/\W/))return!1}return!0}return!1}function j(a,b){return!(a.start&&b.test(a.string.charAt(a.start-1))||a.pos!=a.string.length&&b.test(a.string.charAt(a.pos)))}function k(a,b,c){return{token:function(d){return!d.match(a)||b&&!j(d,b)?(d.next(),void(d.skipTo(a.charAt(0))||d.skipToEnd())):c}}}var l={style:"matchhighlight",minChars:2,delay:100,wordsOnly:!1,annotateScrollbar:!1,showToken:!1,trim:!0};a.defineOption("highlightSelectionMatches",!1,(function(e,f,i){if(i&&i!=a.Init&&(g(e),clearTimeout(e.state.matchHighlighter.timeout),e.state.matchHighlighter=null,e.off("cursorActivity",c),e.off("focus",d)),f){var j=e.state.matchHighlighter=new b(f);e.hasFocus()?(j.active=!0,h(e)):e.on("focus",d),e.on("cursorActivity",c)}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/search/matchesonscrollbar.css b/core/media/editors/codemirror/addon/search/matchesonscrollbar.css
new file mode 100644
index 00000000..77932cc9
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/matchesonscrollbar.css
@@ -0,0 +1,8 @@
+.CodeMirror-search-match {
+  background: gold;
+  border-top: 1px solid orange;
+  border-bottom: 1px solid orange;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  opacity: .5;
+}
diff --git a/core/media/editors/codemirror/addon/search/matchesonscrollbar.js b/core/media/editors/codemirror/addon/search/matchesonscrollbar.js
new file mode 100644
index 00000000..8d192289
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/matchesonscrollbar.js
@@ -0,0 +1,97 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../scroll/annotatescrollbar"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../scroll/annotatescrollbar"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, options) {
+    if (typeof options == "string") options = {className: options};
+    if (!options) options = {};
+    return new SearchAnnotation(this, query, caseFold, options);
+  });
+
+  function SearchAnnotation(cm, query, caseFold, options) {
+    this.cm = cm;
+    this.options = options;
+    var annotateOptions = {listenForChanges: false};
+    for (var prop in options) annotateOptions[prop] = options[prop];
+    if (!annotateOptions.className) annotateOptions.className = "CodeMirror-search-match";
+    this.annotation = cm.annotateScrollbar(annotateOptions);
+    this.query = query;
+    this.caseFold = caseFold;
+    this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};
+    this.matches = [];
+    this.update = null;
+
+    this.findMatches();
+    this.annotation.update(this.matches);
+
+    var self = this;
+    cm.on("change", this.changeHandler = function(_cm, change) { self.onChange(change); });
+  }
+
+  var MAX_MATCHES = 1000;
+
+  SearchAnnotation.prototype.findMatches = function() {
+    if (!this.gap) return;
+    for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      if (match.from.line >= this.gap.to) break;
+      if (match.to.line >= this.gap.from) this.matches.splice(i--, 1);
+    }
+    var cursor = this.cm.getSearchCursor(this.query, CodeMirror.Pos(this.gap.from, 0), this.caseFold);
+    var maxMatches = this.options && this.options.maxMatches || MAX_MATCHES;
+    while (cursor.findNext()) {
+      var match = {from: cursor.from(), to: cursor.to()};
+      if (match.from.line >= this.gap.to) break;
+      this.matches.splice(i++, 0, match);
+      if (this.matches.length > maxMatches) break;
+    }
+    this.gap = null;
+  };
+
+  function offsetLine(line, changeStart, sizeChange) {
+    if (line <= changeStart) return line;
+    return Math.max(changeStart, line + sizeChange);
+  }
+
+  SearchAnnotation.prototype.onChange = function(change) {
+    var startLine = change.from.line;
+    var endLine = CodeMirror.changeEnd(change).line;
+    var sizeChange = endLine - change.to.line;
+    if (this.gap) {
+      this.gap.from = Math.min(offsetLine(this.gap.from, startLine, sizeChange), change.from.line);
+      this.gap.to = Math.max(offsetLine(this.gap.to, startLine, sizeChange), change.from.line);
+    } else {
+      this.gap = {from: change.from.line, to: endLine + 1};
+    }
+
+    if (sizeChange) for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      var newFrom = offsetLine(match.from.line, startLine, sizeChange);
+      if (newFrom != match.from.line) match.from = CodeMirror.Pos(newFrom, match.from.ch);
+      var newTo = offsetLine(match.to.line, startLine, sizeChange);
+      if (newTo != match.to.line) match.to = CodeMirror.Pos(newTo, match.to.ch);
+    }
+    clearTimeout(this.update);
+    var self = this;
+    this.update = setTimeout(function() { self.updateAfterChange(); }, 250);
+  };
+
+  SearchAnnotation.prototype.updateAfterChange = function() {
+    this.findMatches();
+    this.annotation.update(this.matches);
+  };
+
+  SearchAnnotation.prototype.clear = function() {
+    this.cm.off("change", this.changeHandler);
+    this.annotation.clear();
+  };
+});
diff --git a/core/media/editors/codemirror/addon/search/matchesonscrollbar.min.css b/core/media/editors/codemirror/addon/search/matchesonscrollbar.min.css
new file mode 100644
index 00000000..16ee9050
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/matchesonscrollbar.min.css
@@ -0,0 +1 @@
+.CodeMirror-search-match{background:gold;border-top:1px solid orange;border-bottom:1px solid orange;-moz-box-sizing:border-box;box-sizing:border-box;opacity:.5}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/search/matchesonscrollbar.min.js b/core/media/editors/codemirror/addon/search/matchesonscrollbar.min.js
new file mode 100644
index 00000000..314a41be
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/matchesonscrollbar.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d){this.cm=a,this.options=d;var e={listenForChanges:!1};for(var f in d)e[f]=d[f];e.className||(e.className="CodeMirror-search-match"),this.annotation=a.annotateScrollbar(e),this.query=b,this.caseFold=c,this.gap={from:a.firstLine(),to:a.lastLine()+1},this.matches=[],this.update=null,this.findMatches(),this.annotation.update(this.matches);var g=this;a.on("change",this.changeHandler=function(a,b){g.onChange(b)})}function c(a,b,c){return a<=b?a:Math.max(b,a+c)}a.defineExtension("showMatchesOnScrollbar",(function(a,c,d){return"string"==typeof d&&(d={className:d}),d||(d={}),new b(this,a,c,d)}));var d=1e3;b.prototype.findMatches=function(){if(this.gap){for(var b=0;b<this.matches.length;b++){var c=this.matches[b];if(c.from.line>=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(b--,1)}for(var e=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),f=this.options&&this.options.maxMatches||d;e.findNext();){var c={from:e.from(),to:e.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(b++,0,c),this.matches.length>f)break}this.gap=null}},b.prototype.onChange=function(b){var d=b.from.line,e=a.changeEnd(b).line,f=e-b.to.line;if(this.gap?(this.gap.from=Math.min(c(this.gap.from,d,f),b.from.line),this.gap.to=Math.max(c(this.gap.to,d,f),b.from.line)):this.gap={from:b.from.line,to:e+1},f)for(var g=0;g<this.matches.length;g++){var h=this.matches[g],i=c(h.from.line,d,f);i!=h.from.line&&(h.from=a.Pos(i,h.from.ch));var j=c(h.to.line,d,f);j!=h.to.line&&(h.to=a.Pos(j,h.to.ch))}clearTimeout(this.update);var k=this;this.update=setTimeout((function(){k.updateAfterChange()}),250)},b.prototype.updateAfterChange=function(){this.findMatches(),this.annotation.update(this.matches)},b.prototype.clear=function(){this.cm.off("change",this.changeHandler),this.annotation.clear()}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/search/search.js b/core/media/editors/codemirror/addon/search/search.js
new file mode 100644
index 00000000..4059ccdd
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/search.js
@@ -0,0 +1,252 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Define search commands. Depends on dialog.js or another
+// implementation of the openDialog method.
+
+// Replace works a little oddly -- it will do the replace on the next
+// Ctrl-G (or whatever is bound to findNext) press. You prevent a
+// replace by making sure the match is no longer selected when hitting
+// Ctrl-G.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function searchOverlay(query, caseInsensitive) {
+    if (typeof query == "string")
+      query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
+    else if (!query.global)
+      query = new RegExp(query.source, query.ignoreCase ? "gi" : "g");
+
+    return {token: function(stream) {
+      query.lastIndex = stream.pos;
+      var match = query.exec(stream.string);
+      if (match && match.index == stream.pos) {
+        stream.pos += match[0].length || 1;
+        return "searching";
+      } else if (match) {
+        stream.pos = match.index;
+      } else {
+        stream.skipToEnd();
+      }
+    }};
+  }
+
+  function SearchState() {
+    this.posFrom = this.posTo = this.lastQuery = this.query = null;
+    this.overlay = null;
+  }
+
+  function getSearchState(cm) {
+    return cm.state.search || (cm.state.search = new SearchState());
+  }
+
+  function queryCaseInsensitive(query) {
+    return typeof query == "string" && query == query.toLowerCase();
+  }
+
+  function getSearchCursor(cm, query, pos) {
+    // Heuristic: if the query string is all lowercase, do a case insensitive search.
+    return cm.getSearchCursor(query, pos, {caseFold: queryCaseInsensitive(query), multiline: true});
+  }
+
+  function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
+    cm.openDialog(text, onEnter, {
+      value: deflt,
+      selectValueOnOpen: true,
+      closeOnEnter: false,
+      onClose: function() { clearSearch(cm); },
+      onKeyDown: onKeyDown
+    });
+  }
+
+  function dialog(cm, text, shortText, deflt, f) {
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+    else f(prompt(shortText, deflt));
+  }
+
+  function confirmDialog(cm, text, shortText, fs) {
+    if (cm.openConfirm) cm.openConfirm(text, fs);
+    else if (confirm(shortText)) fs[0]();
+  }
+
+  function parseString(string) {
+    return string.replace(/\\(.)/g, function(_, ch) {
+      if (ch == "n") return "\n"
+      if (ch == "r") return "\r"
+      return ch
+    })
+  }
+
+  function parseQuery(query) {
+    var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
+    if (isRE) {
+      try { query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); }
+      catch(e) {} // Not a regular expression after all, do a string search
+    } else {
+      query = parseString(query)
+    }
+    if (typeof query == "string" ? query == "" : query.test(""))
+      query = /x^/;
+    return query;
+  }
+
+  var queryDialog =
+    '<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+
+  function startSearch(cm, state, query) {
+    state.queryText = query;
+    state.query = parseQuery(query);
+    cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
+    state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
+    cm.addOverlay(state.overlay);
+    if (cm.showMatchesOnScrollbar) {
+      if (state.annotate) { state.annotate.clear(); state.annotate = null; }
+      state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query));
+    }
+  }
+
+  function doSearch(cm, rev, persistent, immediate) {
+    var state = getSearchState(cm);
+    if (state.query) return findNext(cm, rev);
+    var q = cm.getSelection() || state.lastQuery;
+    if (q instanceof RegExp && q.source == "x^") q = null
+    if (persistent && cm.openDialog) {
+      var hiding = null
+      var searchNext = function(query, event) {
+        CodeMirror.e_stop(event);
+        if (!query) return;
+        if (query != state.queryText) {
+          startSearch(cm, state, query);
+          state.posFrom = state.posTo = cm.getCursor();
+        }
+        if (hiding) hiding.style.opacity = 1
+        findNext(cm, event.shiftKey, function(_, to) {
+          var dialog
+          if (to.line < 3 && document.querySelector &&
+              (dialog = cm.display.wrapper.querySelector(".CodeMirror-dialog")) &&
+              dialog.getBoundingClientRect().bottom - 4 > cm.cursorCoords(to, "window").top)
+            (hiding = dialog).style.opacity = .4
+        })
+      };
+      persistentDialog(cm, queryDialog, q, searchNext, function(event, query) {
+        var keyName = CodeMirror.keyName(event)
+        var extra = cm.getOption('extraKeys'), cmd = (extra && extra[keyName]) || CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
+        if (cmd == "findNext" || cmd == "findPrev" ||
+          cmd == "findPersistentNext" || cmd == "findPersistentPrev") {
+          CodeMirror.e_stop(event);
+          startSearch(cm, getSearchState(cm), query);
+          cm.execCommand(cmd);
+        } else if (cmd == "find" || cmd == "findPersistent") {
+          CodeMirror.e_stop(event);
+          searchNext(query, event);
+        }
+      });
+      if (immediate && q) {
+        startSearch(cm, state, q);
+        findNext(cm, rev);
+      }
+    } else {
+      dialog(cm, queryDialog, "Search for:", q, function(query) {
+        if (query && !state.query) cm.operation(function() {
+          startSearch(cm, state, query);
+          state.posFrom = state.posTo = cm.getCursor();
+          findNext(cm, rev);
+        });
+      });
+    }
+  }
+
+  function findNext(cm, rev, callback) {cm.operation(function() {
+    var state = getSearchState(cm);
+    var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo);
+    if (!cursor.find(rev)) {
+      cursor = getSearchCursor(cm, state.query, rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0));
+      if (!cursor.find(rev)) return;
+    }
+    cm.setSelection(cursor.from(), cursor.to());
+    cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 20);
+    state.posFrom = cursor.from(); state.posTo = cursor.to();
+    if (callback) callback(cursor.from(), cursor.to())
+  });}
+
+  function clearSearch(cm) {cm.operation(function() {
+    var state = getSearchState(cm);
+    state.lastQuery = state.query;
+    if (!state.query) return;
+    state.query = state.queryText = null;
+    cm.removeOverlay(state.overlay);
+    if (state.annotate) { state.annotate.clear(); state.annotate = null; }
+  });}
+
+  var replaceQueryDialog =
+    ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+  var replacementQueryDialog = '<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+  var doReplaceConfirm = '<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';
+
+  function replaceAll(cm, query, text) {
+    cm.operation(function() {
+      for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
+        if (typeof query != "string") {
+          var match = cm.getRange(cursor.from(), cursor.to()).match(query);
+          cursor.replace(text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
+        } else cursor.replace(text);
+      }
+    });
+  }
+
+  function replace(cm, all) {
+    if (cm.getOption("readOnly")) return;
+    var query = cm.getSelection() || getSearchState(cm).lastQuery;
+    var dialogText = '<span class="CodeMirror-search-label">' + (all ? 'Replace all:' : 'Replace:') + '</span>';
+    dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
+      if (!query) return;
+      query = parseQuery(query);
+      dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
+        text = parseString(text)
+        if (all) {
+          replaceAll(cm, query, text)
+        } else {
+          clearSearch(cm);
+          var cursor = getSearchCursor(cm, query, cm.getCursor("from"));
+          var advance = function() {
+            var start = cursor.from(), match;
+            if (!(match = cursor.findNext())) {
+              cursor = getSearchCursor(cm, query);
+              if (!(match = cursor.findNext()) ||
+                  (start && cursor.from().line == start.line && cursor.from().ch == start.ch)) return;
+            }
+            cm.setSelection(cursor.from(), cursor.to());
+            cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
+            confirmDialog(cm, doReplaceConfirm, "Replace?",
+                          [function() {doReplace(match);}, advance,
+                           function() {replaceAll(cm, query, text)}]);
+          };
+          var doReplace = function(match) {
+            cursor.replace(typeof query == "string" ? text :
+                           text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
+            advance();
+          };
+          advance();
+        }
+      });
+    });
+  }
+
+  CodeMirror.commands.find = function(cm) {clearSearch(cm); doSearch(cm);};
+  CodeMirror.commands.findPersistent = function(cm) {clearSearch(cm); doSearch(cm, false, true);};
+  CodeMirror.commands.findPersistentNext = function(cm) {doSearch(cm, false, true, true);};
+  CodeMirror.commands.findPersistentPrev = function(cm) {doSearch(cm, true, true, true);};
+  CodeMirror.commands.findNext = doSearch;
+  CodeMirror.commands.findPrev = function(cm) {doSearch(cm, true);};
+  CodeMirror.commands.clearSearch = clearSearch;
+  CodeMirror.commands.replace = replace;
+  CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
+});
diff --git a/core/media/editors/codemirror/addon/search/search.min.js b/core/media/editors/codemirror/addon/search/search.min.js
new file mode 100644
index 00000000..d71797ef
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/search.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../dialog/dialog"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return"string"==typeof a?a=new RegExp(a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),b?"gi":"g"):a.global||(a=new RegExp(a.source,a.ignoreCase?"gi":"g")),{token:function(b){a.lastIndex=b.pos;var c=a.exec(b.string);return c&&c.index==b.pos?(b.pos+=c[0].length||1,"searching"):void(c?b.pos=c.index:b.skipToEnd())}}}function c(){this.posFrom=this.posTo=this.lastQuery=this.query=null,this.overlay=null}function d(a){return a.state.search||(a.state.search=new c)}function e(a){return"string"==typeof a&&a==a.toLowerCase()}function f(a,b,c){return a.getSearchCursor(b,c,{caseFold:e(b),multiline:!0})}function g(a,b,c,d,e){a.openDialog(b,d,{value:c,selectValueOnOpen:!0,closeOnEnter:!1,onClose:function(){o(a)},onKeyDown:e})}function h(a,b,c,d,e){a.openDialog?a.openDialog(b,e,{value:d,selectValueOnOpen:!0}):e(prompt(c,d))}function i(a,b,c,d){a.openConfirm?a.openConfirm(b,d):confirm(c)&&d[0]()}function j(a){return a.replace(/\\(.)/g,(function(a,b){return"n"==b?"\n":"r"==b?"\r":b}))}function k(a){var b=a.match(/^\/(.*)\/([a-z]*)$/);if(b)try{a=new RegExp(b[1],b[2].indexOf("i")==-1?"":"i")}catch(a){}else a=j(a);return("string"==typeof a?""==a:a.test(""))&&(a=/x^/),a}function l(a,c,d){c.queryText=d,c.query=k(d),a.removeOverlay(c.overlay,e(c.query)),c.overlay=b(c.query,e(c.query)),a.addOverlay(c.overlay),a.showMatchesOnScrollbar&&(c.annotate&&(c.annotate.clear(),c.annotate=null),c.annotate=a.showMatchesOnScrollbar(c.query,e(c.query)))}function m(b,c,e,f){var i=d(b);if(i.query)return n(b,c);var j=b.getSelection()||i.lastQuery;if(j instanceof RegExp&&"x^"==j.source&&(j=null),e&&b.openDialog){var k=null,m=function(c,d){a.e_stop(d),c&&(c!=i.queryText&&(l(b,i,c),i.posFrom=i.posTo=b.getCursor()),k&&(k.style.opacity=1),n(b,d.shiftKey,(function(a,c){var d;c.line<3&&document.querySelector&&(d=b.display.wrapper.querySelector(".CodeMirror-dialog"))&&d.getBoundingClientRect().bottom-4>b.cursorCoords(c,"window").top&&((k=d).style.opacity=.4)})))};g(b,r,j,m,(function(c,e){var f=a.keyName(c),g=b.getOption("extraKeys"),h=g&&g[f]||a.keyMap[b.getOption("keyMap")][f];"findNext"==h||"findPrev"==h||"findPersistentNext"==h||"findPersistentPrev"==h?(a.e_stop(c),l(b,d(b),e),b.execCommand(h)):"find"!=h&&"findPersistent"!=h||(a.e_stop(c),m(e,c))})),f&&j&&(l(b,i,j),n(b,c))}else h(b,r,"Search for:",j,(function(a){a&&!i.query&&b.operation((function(){l(b,i,a),i.posFrom=i.posTo=b.getCursor(),n(b,c)}))}))}function n(b,c,e){b.operation((function(){var g=d(b),h=f(b,g.query,c?g.posFrom:g.posTo);(h.find(c)||(h=f(b,g.query,c?a.Pos(b.lastLine()):a.Pos(b.firstLine(),0)),h.find(c)))&&(b.setSelection(h.from(),h.to()),b.scrollIntoView({from:h.from(),to:h.to()},20),g.posFrom=h.from(),g.posTo=h.to(),e&&e(h.from(),h.to()))}))}function o(a){a.operation((function(){var b=d(a);b.lastQuery=b.query,b.query&&(b.query=b.queryText=null,a.removeOverlay(b.overlay),b.annotate&&(b.annotate.clear(),b.annotate=null))}))}function p(a,b,c){a.operation((function(){for(var d=f(a,b);d.findNext();)if("string"!=typeof b){var e=a.getRange(d.from(),d.to()).match(b);d.replace(c.replace(/\$(\d)/g,(function(a,b){return e[b]})))}else d.replace(c)}))}function q(a,b){if(!a.getOption("readOnly")){var c=a.getSelection()||d(a).lastQuery,e='<span class="CodeMirror-search-label">'+(b?"Replace all:":"Replace:")+"</span>";h(a,e+s,e,c,(function(c){c&&(c=k(c),h(a,t,"Replace with:","",(function(d){if(d=j(d),b)p(a,c,d);else{o(a);var e=f(a,c,a.getCursor("from")),g=function(){var b,j=e.from();!(b=e.findNext())&&(e=f(a,c),!(b=e.findNext())||j&&e.from().line==j.line&&e.from().ch==j.ch)||(a.setSelection(e.from(),e.to()),a.scrollIntoView({from:e.from(),to:e.to()}),i(a,u,"Replace?",[function(){h(b)},g,function(){p(a,c,d)}]))},h=function(a){e.replace("string"==typeof c?d:d.replace(/\$(\d)/g,(function(b,c){return a[c]}))),g()};g()}})))}))}}var r='<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',s=' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>',t='<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>',u='<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';a.commands.find=function(a){o(a),m(a)},a.commands.findPersistent=function(a){o(a),m(a,!1,!0)},a.commands.findPersistentNext=function(a){m(a,!1,!0,!0)},a.commands.findPersistentPrev=function(a){m(a,!0,!0,!0)},a.commands.findNext=m,a.commands.findPrev=function(a){m(a,!0)},a.commands.clearSearch=o,a.commands.replace=q,a.commands.replaceAll=function(a){q(a,!0)}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/search/searchcursor.js b/core/media/editors/codemirror/addon/search/searchcursor.js
new file mode 100644
index 00000000..e606c5e7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/searchcursor.js
@@ -0,0 +1,293 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+  var Pos = CodeMirror.Pos
+
+  function regexpFlags(regexp) {
+    var flags = regexp.flags
+    return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+      + (regexp.global ? "g" : "")
+      + (regexp.multiline ? "m" : "")
+  }
+
+  function ensureFlags(regexp, flags) {
+    var current = regexpFlags(regexp), target = current
+    for (var i = 0; i < flags.length; i++) if (target.indexOf(flags.charAt(i)) == -1)
+      target += flags.charAt(i)
+    return current == target ? regexp : new RegExp(regexp.source, target)
+  }
+
+  function maybeMultiline(regexp) {
+    return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
+  }
+
+  function searchRegexpForward(doc, regexp, start) {
+    regexp = ensureFlags(regexp, "g")
+    for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+      regexp.lastIndex = ch
+      var string = doc.getLine(line), match = regexp.exec(string)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpForwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+    regexp = ensureFlags(regexp, "gm")
+    var string, chunk = 1
+    for (var line = start.line, last = doc.lastLine(); line <= last;) {
+      // This grows the search buffer in exponentially-sized chunks
+      // between matches, so that nearby matches are fast and don't
+      // require concatenating the whole document (in case we're
+      // searching for something that has tons of matches), but at the
+      // same time, the amount of retries is limited.
+      for (var i = 0; i < chunk; i++) {
+        if (line > last) break
+        var curLine = doc.getLine(line++)
+        string = string == null ? curLine : string + "\n" + curLine
+      }
+      chunk = chunk * 2
+      regexp.lastIndex = start.ch
+      var match = regexp.exec(string)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  function lastMatchIn(string, regexp) {
+    var cutOff = 0, match
+    for (;;) {
+      regexp.lastIndex = cutOff
+      var newMatch = regexp.exec(string)
+      if (!newMatch) return match
+      match = newMatch
+      cutOff = match.index + (match[0].length || 1)
+      if (cutOff == string.length) return match
+    }
+  }
+
+  function searchRegexpBackward(doc, regexp, start) {
+    regexp = ensureFlags(regexp, "g")
+    for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+      var string = doc.getLine(line)
+      if (ch > -1) string = string.slice(0, ch)
+      var match = lastMatchIn(string, regexp)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpBackwardMultiline(doc, regexp, start) {
+    regexp = ensureFlags(regexp, "gm")
+    var string, chunk = 1
+    for (var line = start.line, first = doc.firstLine(); line >= first;) {
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line--)
+        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+      }
+      chunk *= 2
+
+      var match = lastMatchIn(string, regexp)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = line + before.length, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  var doFold, noFold
+  if (String.prototype.normalize) {
+    doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+    noFold = function(str) { return str.normalize("NFD") }
+  } else {
+    doFold = function(str) { return str.toLowerCase() }
+    noFold = function(str) { return str }
+  }
+
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos, foldFunc) {
+    if (orig.length == folded.length) return pos
+    for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
+      if (min == max) return min
+      var mid = (min + max) >> 1
+      var len = foldFunc(orig.slice(0, mid)).length
+      if (len == pos) return mid
+      else if (len > pos) max = mid
+      else min = mid + 1
+    }
+  }
+
+  function searchStringForward(doc, query, start, caseFold) {
+    // Empty string would match anything and never progress, so we
+    // define it to match nothing instead.
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+      var orig = doc.getLine(line).slice(ch), string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.indexOf(lines[0])
+        if (found == -1) continue search
+        var start = adjustPos(orig, string, found, fold) + ch
+        return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
+      } else {
+        var cutFrom = string.length - lines[0].length
+        if (string.slice(cutFrom) != lines[0]) continue search
+        for (var i = 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(line + i)) != lines[i]) continue search
+        var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+        if (endString.slice(0, lastLine.length) != lastLine) continue search
+        return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function searchStringBackward(doc, query, start, caseFold) {
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+      var orig = doc.getLine(line)
+      if (ch > -1) orig = orig.slice(0, ch)
+      var string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.lastIndexOf(lines[0])
+        if (found == -1) continue search
+        return {from: Pos(line, adjustPos(orig, string, found, fold)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
+      } else {
+        var lastLine = lines[lines.length - 1]
+        if (string.slice(0, lastLine.length) != lastLine) continue search
+        for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(start + i)) != lines[i]) continue search
+        var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+        if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function SearchCursor(doc, query, pos, options) {
+    this.atOccurrence = false
+    this.doc = doc
+    pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+    this.pos = {from: pos, to: pos}
+
+    var caseFold
+    if (typeof options == "object") {
+      caseFold = options.caseFold
+    } else { // Backwards compat for when caseFold was the 4th argument
+      caseFold = options
+      options = null
+    }
+
+    if (typeof query == "string") {
+      if (caseFold == null) caseFold = false
+      this.matches = function(reverse, pos) {
+        return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+      }
+    } else {
+      query = ensureFlags(query, "gm")
+      if (!options || options.multiline !== false)
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
+        }
+      else
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+        }
+    }
+  }
+
+  SearchCursor.prototype = {
+    findNext: function() {return this.find(false)},
+    findPrevious: function() {return this.find(true)},
+
+    find: function(reverse) {
+      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
+
+      // Implements weird auto-growing behavior on null-matches for
+      // backwards-compatiblity with the vim code (unfortunately)
+      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+        if (reverse) {
+          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+          else if (result.from.line == this.doc.firstLine()) result = null
+          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+        } else {
+          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+          else if (result.to.line == this.doc.lastLine()) result = null
+          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
+        }
+      }
+
+      if (result) {
+        this.pos = result
+        this.atOccurrence = true
+        return this.pos.match || true
+      } else {
+        var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+        this.pos = {from: end, to: end}
+        return this.atOccurrence = false
+      }
+    },
+
+    from: function() {if (this.atOccurrence) return this.pos.from},
+    to: function() {if (this.atOccurrence) return this.pos.to},
+
+    replace: function(newText, origin) {
+      if (!this.atOccurrence) return
+      var lines = CodeMirror.splitLines(newText)
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin)
+      this.pos.to = Pos(this.pos.from.line + lines.length - 1,
+                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
+    }
+  }
+
+  CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
+    return new SearchCursor(this.doc, query, pos, caseFold)
+  })
+  CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
+    return new SearchCursor(this, query, pos, caseFold)
+  })
+
+  CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
+    var ranges = []
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
+    while (cur.findNext()) {
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+      ranges.push({anchor: cur.from(), head: cur.to()})
+    }
+    if (ranges.length)
+      this.setSelections(ranges, 0)
+  })
+});
diff --git a/core/media/editors/codemirror/addon/search/searchcursor.min.js b/core/media/editors/codemirror/addon/search/searchcursor.min.js
new file mode 100644
index 00000000..7849ffab
--- /dev/null
+++ b/core/media/editors/codemirror/addon/search/searchcursor.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.flags;return null!=b?b:(a.ignoreCase?"i":"")+(a.global?"g":"")+(a.multiline?"m":"")}function c(a,c){for(var d=b(a),e=d,f=0;f<c.length;f++)e.indexOf(c.charAt(f))==-1&&(e+=c.charAt(f));return d==e?a:new RegExp(a.source,e)}function d(a){return/\\s|\\n|\n|\\W|\\D|\[\^/.test(a.source)}function e(a,b,d){b=c(b,"g");for(var e=d.line,f=d.ch,g=a.lastLine();e<=g;e++,f=0){b.lastIndex=f;var h=a.getLine(e),i=b.exec(h);if(i)return{from:p(e,i.index),to:p(e,i.index+i[0].length),match:i}}}function f(a,b,f){if(!d(b))return e(a,b,f);b=c(b,"gm");for(var g,h=1,i=f.line,j=a.lastLine();i<=j;){for(var k=0;k<h&&!(i>j);k++){var l=a.getLine(i++);g=null==g?l:g+"\n"+l}h=2*h,b.lastIndex=f.ch;var m=b.exec(g);if(m){var n=g.slice(0,m.index).split("\n"),o=m[0].split("\n"),q=f.line+n.length-1,r=n[n.length-1].length;return{from:p(q,r),to:p(q+o.length-1,1==o.length?r+o[0].length:o[o.length-1].length),match:m}}}}function g(a,b){for(var c,d=0;;){b.lastIndex=d;var e=b.exec(a);if(!e)return c;if(c=e,d=c.index+(c[0].length||1),d==a.length)return c}}function h(a,b,d){b=c(b,"g");for(var e=d.line,f=d.ch,h=a.firstLine();e>=h;e--,f=-1){var i=a.getLine(e);f>-1&&(i=i.slice(0,f));var j=g(i,b);if(j)return{from:p(e,j.index),to:p(e,j.index+j[0].length),match:j}}}function i(a,b,d){b=c(b,"gm");for(var e,f=1,h=d.line,i=a.firstLine();h>=i;){for(var j=0;j<f;j++){var k=a.getLine(h--);e=null==e?k.slice(0,d.ch):k+"\n"+e}f*=2;var l=g(e,b);if(l){var m=e.slice(0,l.index).split("\n"),n=l[0].split("\n"),o=h+m.length,q=m[m.length-1].length;return{from:p(o,q),to:p(o+n.length-1,1==n.length?q+n[0].length:n[n.length-1].length),match:l}}}}function j(a,b,c,d){if(a.length==b.length)return c;for(var e=0,f=c+Math.max(0,a.length-b.length);;){if(e==f)return e;var g=e+f>>1,h=d(a.slice(0,g)).length;if(h==c)return g;h>c?f=g:e=g+1}}function k(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.lastLine()+1-f.length;g<=i;g++,h=0){var k=a.getLine(g).slice(h),l=e(k);if(1==f.length){var m=l.indexOf(f[0]);if(m==-1)continue a;var c=j(k,l,m,e)+h;return{from:p(g,j(k,l,m,e)+h),to:p(g,j(k,l,m+f[0].length,e)+h)}}var q=l.length-f[0].length;if(l.slice(q)==f[0]){for(var r=1;r<f.length-1;r++)if(e(a.getLine(g+r))!=f[r])continue a;var s=a.getLine(g+f.length-1),t=e(s),u=f[f.length-1];if(t.slice(0,u.length)==u)return{from:p(g,j(k,l,q,e)+h),to:p(g+f.length-1,j(s,t,u.length,e))}}}}function l(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.firstLine()-1+f.length;g>=i;g--,h=-1){var k=a.getLine(g);h>-1&&(k=k.slice(0,h));var l=e(k);if(1==f.length){var m=l.lastIndexOf(f[0]);if(m==-1)continue a;return{from:p(g,j(k,l,m,e)),to:p(g,j(k,l,m+f[0].length,e))}}var q=f[f.length-1];if(l.slice(0,q.length)==q){for(var r=1,c=g-f.length+1;r<f.length-1;r++)if(e(a.getLine(c+r))!=f[r])continue a;var s=a.getLine(g+1-f.length),t=e(s);if(t.slice(t.length-f[0].length)==f[0])return{from:p(g+1-f.length,j(s,t,s.length-f[0].length,e)),to:p(g,j(k,l,q.length,e))}}}}function m(a,b,d,g){this.atOccurrence=!1,this.doc=a,d=d?a.clipPos(d):p(0,0),this.pos={from:d,to:d};var j;"object"==typeof g?j=g.caseFold:(j=g,g=null),"string"==typeof b?(null==j&&(j=!1),this.matches=function(c,d){return(c?l:k)(a,b,d,j)}):(b=c(b,"gm"),g&&g.multiline===!1?this.matches=function(c,d){return(c?h:e)(a,b,d)}:this.matches=function(c,d){return(c?i:f)(a,b,d)})}var n,o,p=a.Pos;String.prototype.normalize?(n=function(a){return a.normalize("NFD").toLowerCase()},o=function(a){return a.normalize("NFD")}):(n=function(a){return a.toLowerCase()},o=function(a){return a}),m.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(b){for(var c=this.matches(b,this.doc.clipPos(b?this.pos.from:this.pos.to));c&&0==a.cmpPos(c.from,c.to);)b?c.from.ch?c.from=p(c.from.line,c.from.ch-1):c=c.from.line==this.doc.firstLine()?null:this.matches(b,this.doc.clipPos(p(c.from.line-1))):c.to.ch<this.doc.getLine(c.to.line).length?c.to=p(c.to.line,c.to.ch+1):c=c.to.line==this.doc.lastLine()?null:this.matches(b,p(c.to.line+1,0));if(c)return this.pos=c,this.atOccurrence=!0,this.pos.match||!0;var d=p(b?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:d,to:d},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var d=a.splitLines(b);this.doc.replaceRange(d,this.pos.from,this.pos.to,c),this.pos.to=p(this.pos.from.line+d.length-1,d[d.length-1].length+(1==d.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,b,c){return new m(this.doc,a,b,c)})),a.defineDocExtension("getSearchCursor",(function(a,b,c){return new m(this,a,b,c)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/selection/active-line.js b/core/media/editors/codemirror/addon/selection/active-line.js
new file mode 100644
index 00000000..aa295d0d
--- /dev/null
+++ b/core/media/editors/codemirror/addon/selection/active-line.js
@@ -0,0 +1,72 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var WRAP_CLASS = "CodeMirror-activeline";
+  var BACK_CLASS = "CodeMirror-activeline-background";
+  var GUTT_CLASS = "CodeMirror-activeline-gutter";
+
+  CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
+    var prev = old == CodeMirror.Init ? false : old;
+    if (val == prev) return
+    if (prev) {
+      cm.off("beforeSelectionChange", selectionChange);
+      clearActiveLines(cm);
+      delete cm.state.activeLines;
+    }
+    if (val) {
+      cm.state.activeLines = [];
+      updateActiveLines(cm, cm.listSelections());
+      cm.on("beforeSelectionChange", selectionChange);
+    }
+  });
+
+  function clearActiveLines(cm) {
+    for (var i = 0; i < cm.state.activeLines.length; i++) {
+      cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "gutter", GUTT_CLASS);
+    }
+  }
+
+  function sameArray(a, b) {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; i++)
+      if (a[i] != b[i]) return false;
+    return true;
+  }
+
+  function updateActiveLines(cm, ranges) {
+    var active = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      var option = cm.getOption("styleActiveLine");
+      if (typeof option == "object" && option.nonEmpty ? range.anchor.line != range.head.line : !range.empty())
+        continue
+      var line = cm.getLineHandleVisualStart(range.head.line);
+      if (active[active.length - 1] != line) active.push(line);
+    }
+    if (sameArray(cm.state.activeLines, active)) return;
+    cm.operation(function() {
+      clearActiveLines(cm);
+      for (var i = 0; i < active.length; i++) {
+        cm.addLineClass(active[i], "wrap", WRAP_CLASS);
+        cm.addLineClass(active[i], "background", BACK_CLASS);
+        cm.addLineClass(active[i], "gutter", GUTT_CLASS);
+      }
+      cm.state.activeLines = active;
+    });
+  }
+
+  function selectionChange(cm, sel) {
+    updateActiveLines(cm, sel.ranges);
+  }
+});
diff --git a/core/media/editors/codemirror/addon/selection/active-line.min.js b/core/media/editors/codemirror/addon/selection/active-line.min.js
new file mode 100644
index 00000000..d320ae53
--- /dev/null
+++ b/core/media/editors/codemirror/addon/selection/active-line.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b=0;b<a.state.activeLines.length;b++)a.removeLineClass(a.state.activeLines[b],"wrap",f),a.removeLineClass(a.state.activeLines[b],"background",g),a.removeLineClass(a.state.activeLines[b],"gutter",h)}function c(a,b){if(a.length!=b.length)return!1;for(var c=0;c<a.length;c++)if(a[c]!=b[c])return!1;return!0}function d(a,d){for(var e=[],i=0;i<d.length;i++){var j=d[i],k=a.getOption("styleActiveLine");if("object"==typeof k&&k.nonEmpty?j.anchor.line==j.head.line:j.empty()){var l=a.getLineHandleVisualStart(j.head.line);e[e.length-1]!=l&&e.push(l)}}c(a.state.activeLines,e)||a.operation((function(){b(a);for(var c=0;c<e.length;c++)a.addLineClass(e[c],"wrap",f),a.addLineClass(e[c],"background",g),a.addLineClass(e[c],"gutter",h);a.state.activeLines=e}))}function e(a,b){d(a,b.ranges)}var f="CodeMirror-activeline",g="CodeMirror-activeline-background",h="CodeMirror-activeline-gutter";a.defineOption("styleActiveLine",!1,(function(c,f,g){var h=g!=a.Init&&g;f!=h&&(h&&(c.off("beforeSelectionChange",e),b(c),delete c.state.activeLines),f&&(c.state.activeLines=[],d(c,c.listSelections()),c.on("beforeSelectionChange",e)))}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/selection/mark-selection.js b/core/media/editors/codemirror/addon/selection/mark-selection.js
new file mode 100644
index 00000000..1602acc3
--- /dev/null
+++ b/core/media/editors/codemirror/addon/selection/mark-selection.js
@@ -0,0 +1,119 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Because sometimes you need to mark the selected *text*.
+//
+// Adds an option 'styleSelectedText' which, when enabled, gives
+// selected text the CSS class given as option value, or
+// "CodeMirror-selectedtext" when the value is not a string.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
+    var prev = old && old != CodeMirror.Init;
+    if (val && !prev) {
+      cm.state.markedSelection = [];
+      cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext";
+      reset(cm);
+      cm.on("cursorActivity", onCursorActivity);
+      cm.on("change", onChange);
+    } else if (!val && prev) {
+      cm.off("cursorActivity", onCursorActivity);
+      cm.off("change", onChange);
+      clear(cm);
+      cm.state.markedSelection = cm.state.markedSelectionStyle = null;
+    }
+  });
+
+  function onCursorActivity(cm) {
+    if (cm.state.markedSelection)
+      cm.operation(function() { update(cm); });
+  }
+
+  function onChange(cm) {
+    if (cm.state.markedSelection && cm.state.markedSelection.length)
+      cm.operation(function() { clear(cm); });
+  }
+
+  var CHUNK_SIZE = 8;
+  var Pos = CodeMirror.Pos;
+  var cmp = CodeMirror.cmpPos;
+
+  function coverRange(cm, from, to, addAt) {
+    if (cmp(from, to) == 0) return;
+    var array = cm.state.markedSelection;
+    var cls = cm.state.markedSelectionStyle;
+    for (var line = from.line;;) {
+      var start = line == from.line ? from : Pos(line, 0);
+      var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line;
+      var end = atEnd ? to : Pos(endLine, 0);
+      var mark = cm.markText(start, end, {className: cls});
+      if (addAt == null) array.push(mark);
+      else array.splice(addAt++, 0, mark);
+      if (atEnd) break;
+      line = endLine;
+    }
+  }
+
+  function clear(cm) {
+    var array = cm.state.markedSelection;
+    for (var i = 0; i < array.length; ++i) array[i].clear();
+    array.length = 0;
+  }
+
+  function reset(cm) {
+    clear(cm);
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++)
+      coverRange(cm, ranges[i].from(), ranges[i].to());
+  }
+
+  function update(cm) {
+    if (!cm.somethingSelected()) return clear(cm);
+    if (cm.listSelections().length > 1) return reset(cm);
+
+    var from = cm.getCursor("start"), to = cm.getCursor("end");
+
+    var array = cm.state.markedSelection;
+    if (!array.length) return coverRange(cm, from, to);
+
+    var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
+    if (!coverStart || !coverEnd || to.line - from.line <= CHUNK_SIZE ||
+        cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
+      return reset(cm);
+
+    while (cmp(from, coverStart.from) > 0) {
+      array.shift().clear();
+      coverStart = array[0].find();
+    }
+    if (cmp(from, coverStart.from) < 0) {
+      if (coverStart.to.line - from.line < CHUNK_SIZE) {
+        array.shift().clear();
+        coverRange(cm, from, coverStart.to, 0);
+      } else {
+        coverRange(cm, from, coverStart.from, 0);
+      }
+    }
+
+    while (cmp(to, coverEnd.to) < 0) {
+      array.pop().clear();
+      coverEnd = array[array.length - 1].find();
+    }
+    if (cmp(to, coverEnd.to) > 0) {
+      if (to.line - coverEnd.from.line < CHUNK_SIZE) {
+        array.pop().clear();
+        coverRange(cm, coverEnd.from, to);
+      } else {
+        coverRange(cm, coverEnd.to, to);
+      }
+    }
+  }
+});
diff --git a/core/media/editors/codemirror/addon/selection/mark-selection.min.js b/core/media/editors/codemirror/addon/selection/mark-selection.min.js
new file mode 100644
index 00000000..62fdbe6a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/selection/mark-selection.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){a.state.markedSelection&&a.operation((function(){g(a)}))}function c(a){a.state.markedSelection&&a.state.markedSelection.length&&a.operation((function(){e(a)}))}function d(a,b,c,d){if(0!=j(b,c))for(var e=a.state.markedSelection,f=a.state.markedSelectionStyle,g=b.line;;){var k=g==b.line?b:i(g,0),l=g+h,m=l>=c.line,n=m?c:i(l,0),o=a.markText(k,n,{className:f});if(null==d?e.push(o):e.splice(d++,0,o),m)break;g=l}}function e(a){for(var b=a.state.markedSelection,c=0;c<b.length;++c)b[c].clear();b.length=0}function f(a){e(a);for(var b=a.listSelections(),c=0;c<b.length;c++)d(a,b[c].from(),b[c].to())}function g(a){if(!a.somethingSelected())return e(a);if(a.listSelections().length>1)return f(a);var b=a.getCursor("start"),c=a.getCursor("end"),g=a.state.markedSelection;if(!g.length)return d(a,b,c);var i=g[0].find(),k=g[g.length-1].find();if(!i||!k||c.line-b.line<=h||j(b,k.to)>=0||j(c,i.from)<=0)return f(a);for(;j(b,i.from)>0;)g.shift().clear(),i=g[0].find();for(j(b,i.from)<0&&(i.to.line-b.line<h?(g.shift().clear(),d(a,b,i.to,0)):d(a,b,i.from,0));j(c,k.to)<0;)g.pop().clear(),k=g[g.length-1].find();j(c,k.to)>0&&(c.line-k.from.line<h?(g.pop().clear(),d(a,k.from,c)):d(a,k.to,c))}a.defineOption("styleSelectedText",!1,(function(d,g,h){var i=h&&h!=a.Init;g&&!i?(d.state.markedSelection=[],d.state.markedSelectionStyle="string"==typeof g?g:"CodeMirror-selectedtext",f(d),d.on("cursorActivity",b),d.on("change",c)):!g&&i&&(d.off("cursorActivity",b),d.off("change",c),e(d),d.state.markedSelection=d.state.markedSelectionStyle=null)}));var h=8,i=a.Pos,j=a.cmpPos}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/selection/selection-pointer.js b/core/media/editors/codemirror/addon/selection/selection-pointer.js
new file mode 100644
index 00000000..ef5e404a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/selection/selection-pointer.js
@@ -0,0 +1,98 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("selectionPointer", false, function(cm, val) {
+    var data = cm.state.selectionPointer;
+    if (data) {
+      CodeMirror.off(cm.getWrapperElement(), "mousemove", data.mousemove);
+      CodeMirror.off(cm.getWrapperElement(), "mouseout", data.mouseout);
+      CodeMirror.off(window, "scroll", data.windowScroll);
+      cm.off("cursorActivity", reset);
+      cm.off("scroll", reset);
+      cm.state.selectionPointer = null;
+      cm.display.lineDiv.style.cursor = "";
+    }
+    if (val) {
+      data = cm.state.selectionPointer = {
+        value: typeof val == "string" ? val : "default",
+        mousemove: function(event) { mousemove(cm, event); },
+        mouseout: function(event) { mouseout(cm, event); },
+        windowScroll: function() { reset(cm); },
+        rects: null,
+        mouseX: null, mouseY: null,
+        willUpdate: false
+      };
+      CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
+      CodeMirror.on(cm.getWrapperElement(), "mouseout", data.mouseout);
+      CodeMirror.on(window, "scroll", data.windowScroll);
+      cm.on("cursorActivity", reset);
+      cm.on("scroll", reset);
+    }
+  });
+
+  function mousemove(cm, event) {
+    var data = cm.state.selectionPointer;
+    if (event.buttons == null ? event.which : event.buttons) {
+      data.mouseX = data.mouseY = null;
+    } else {
+      data.mouseX = event.clientX;
+      data.mouseY = event.clientY;
+    }
+    scheduleUpdate(cm);
+  }
+
+  function mouseout(cm, event) {
+    if (!cm.getWrapperElement().contains(event.relatedTarget)) {
+      var data = cm.state.selectionPointer;
+      data.mouseX = data.mouseY = null;
+      scheduleUpdate(cm);
+    }
+  }
+
+  function reset(cm) {
+    cm.state.selectionPointer.rects = null;
+    scheduleUpdate(cm);
+  }
+
+  function scheduleUpdate(cm) {
+    if (!cm.state.selectionPointer.willUpdate) {
+      cm.state.selectionPointer.willUpdate = true;
+      setTimeout(function() {
+        update(cm);
+        cm.state.selectionPointer.willUpdate = false;
+      }, 50);
+    }
+  }
+
+  function update(cm) {
+    var data = cm.state.selectionPointer;
+    if (!data) return;
+    if (data.rects == null && data.mouseX != null) {
+      data.rects = [];
+      if (cm.somethingSelected()) {
+        for (var sel = cm.display.selectionDiv.firstChild; sel; sel = sel.nextSibling)
+          data.rects.push(sel.getBoundingClientRect());
+      }
+    }
+    var inside = false;
+    if (data.mouseX != null) for (var i = 0; i < data.rects.length; i++) {
+      var rect = data.rects[i];
+      if (rect.left <= data.mouseX && rect.right >= data.mouseX &&
+          rect.top <= data.mouseY && rect.bottom >= data.mouseY)
+        inside = true;
+    }
+    var cursor = inside ? data.value : "";
+    if (cm.display.lineDiv.style.cursor != cursor)
+      cm.display.lineDiv.style.cursor = cursor;
+  }
+});
diff --git a/core/media/editors/codemirror/addon/selection/selection-pointer.min.js b/core/media/editors/codemirror/addon/selection/selection-pointer.min.js
new file mode 100644
index 00000000..c88b7e02
--- /dev/null
+++ b/core/media/editors/codemirror/addon/selection/selection-pointer.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){var c=a.state.selectionPointer;(null==b.buttons?b.which:b.buttons)?c.mouseX=c.mouseY=null:(c.mouseX=b.clientX,c.mouseY=b.clientY),e(a)}function c(a,b){if(!a.getWrapperElement().contains(b.relatedTarget)){var c=a.state.selectionPointer;c.mouseX=c.mouseY=null,e(a)}}function d(a){a.state.selectionPointer.rects=null,e(a)}function e(a){a.state.selectionPointer.willUpdate||(a.state.selectionPointer.willUpdate=!0,setTimeout((function(){f(a),a.state.selectionPointer.willUpdate=!1}),50))}function f(a){var b=a.state.selectionPointer;if(b){if(null==b.rects&&null!=b.mouseX&&(b.rects=[],a.somethingSelected()))for(var c=a.display.selectionDiv.firstChild;c;c=c.nextSibling)b.rects.push(c.getBoundingClientRect());var d=!1;if(null!=b.mouseX)for(var e=0;e<b.rects.length;e++){var f=b.rects[e];f.left<=b.mouseX&&f.right>=b.mouseX&&f.top<=b.mouseY&&f.bottom>=b.mouseY&&(d=!0)}var g=d?b.value:"";a.display.lineDiv.style.cursor!=g&&(a.display.lineDiv.style.cursor=g)}}a.defineOption("selectionPointer",!1,(function(e,f){var g=e.state.selectionPointer;g&&(a.off(e.getWrapperElement(),"mousemove",g.mousemove),a.off(e.getWrapperElement(),"mouseout",g.mouseout),a.off(window,"scroll",g.windowScroll),e.off("cursorActivity",d),e.off("scroll",d),e.state.selectionPointer=null,e.display.lineDiv.style.cursor=""),f&&(g=e.state.selectionPointer={value:"string"==typeof f?f:"default",mousemove:function(a){b(e,a)},mouseout:function(a){c(e,a)},windowScroll:function(){d(e)},rects:null,mouseX:null,mouseY:null,willUpdate:!1},a.on(e.getWrapperElement(),"mousemove",g.mousemove),a.on(e.getWrapperElement(),"mouseout",g.mouseout),a.on(window,"scroll",g.windowScroll),e.on("cursorActivity",d),e.on("scroll",d))}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/tern/tern.css b/core/media/editors/codemirror/addon/tern/tern.css
new file mode 100644
index 00000000..c4b8a2f7
--- /dev/null
+++ b/core/media/editors/codemirror/addon/tern/tern.css
@@ -0,0 +1,87 @@
+.CodeMirror-Tern-completion {
+  padding-left: 22px;
+  position: relative;
+  line-height: 1.5;
+}
+.CodeMirror-Tern-completion:before {
+  position: absolute;
+  left: 2px;
+  bottom: 2px;
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: bold;
+  height: 15px;
+  width: 15px;
+  line-height: 16px;
+  text-align: center;
+  color: white;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.CodeMirror-Tern-completion-unknown:before {
+  content: "?";
+  background: #4bb;
+}
+.CodeMirror-Tern-completion-object:before {
+  content: "O";
+  background: #77c;
+}
+.CodeMirror-Tern-completion-fn:before {
+  content: "F";
+  background: #7c7;
+}
+.CodeMirror-Tern-completion-array:before {
+  content: "A";
+  background: #c66;
+}
+.CodeMirror-Tern-completion-number:before {
+  content: "1";
+  background: #999;
+}
+.CodeMirror-Tern-completion-string:before {
+  content: "S";
+  background: #999;
+}
+.CodeMirror-Tern-completion-bool:before {
+  content: "B";
+  background: #999;
+}
+
+.CodeMirror-Tern-completion-guess {
+  color: #999;
+}
+
+.CodeMirror-Tern-tooltip {
+  border: 1px solid silver;
+  border-radius: 3px;
+  color: #444;
+  padding: 2px 5px;
+  font-size: 90%;
+  font-family: monospace;
+  background-color: white;
+  white-space: pre-wrap;
+
+  max-width: 40em;
+  position: absolute;
+  z-index: 10;
+  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+
+  transition: opacity 1s;
+  -moz-transition: opacity 1s;
+  -webkit-transition: opacity 1s;
+  -o-transition: opacity 1s;
+  -ms-transition: opacity 1s;
+}
+
+.CodeMirror-Tern-hint-doc {
+  max-width: 25em;
+  margin-top: -3px;
+}
+
+.CodeMirror-Tern-fname { color: black; }
+.CodeMirror-Tern-farg { color: #70a; }
+.CodeMirror-Tern-farg-current { text-decoration: underline; }
+.CodeMirror-Tern-type { color: #07c; }
+.CodeMirror-Tern-fhint-guess { opacity: .7; }
diff --git a/core/media/editors/codemirror/addon/tern/tern.js b/core/media/editors/codemirror/addon/tern/tern.js
new file mode 100644
index 00000000..6276b538
--- /dev/null
+++ b/core/media/editors/codemirror/addon/tern/tern.js
@@ -0,0 +1,718 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Glue code between CodeMirror and Tern.
+//
+// Create a CodeMirror.TernServer to wrap an actual Tern server,
+// register open documents (CodeMirror.Doc instances) with it, and
+// call its methods to activate the assisting functions that Tern
+// provides.
+//
+// Options supported (all optional):
+// * defs: An array of JSON definition data structures.
+// * plugins: An object mapping plugin names to configuration
+//   options.
+// * getFile: A function(name, c) that can be used to access files in
+//   the project that haven't been loaded yet. Simply do c(null) to
+//   indicate that a file is not available.
+// * fileFilter: A function(value, docName, doc) that will be applied
+//   to documents before passing them on to Tern.
+// * switchToDoc: A function(name, doc) that should, when providing a
+//   multi-file view, switch the view or focus to the named file.
+// * showError: A function(editor, message) that can be used to
+//   override the way errors are displayed.
+// * completionTip: Customize the content in tooltips for completions.
+//   Is passed a single argument—the completion's data as returned by
+//   Tern—and may return a string, DOM node, or null to indicate that
+//   no tip should be shown. By default the docstring is shown.
+// * typeTip: Like completionTip, but for the tooltips shown for type
+//   queries.
+// * responseFilter: A function(doc, query, request, error, data) that
+//   will be applied to the Tern responses before treating them
+//
+//
+// It is possible to run the Tern server in a web worker by specifying
+// these additional options:
+// * useWorker: Set to true to enable web worker mode. You'll probably
+//   want to feature detect the actual value you use here, for example
+//   !!window.Worker.
+// * workerScript: The main script of the worker. Point this to
+//   wherever you are hosting worker.js from this directory.
+// * workerDeps: An array of paths pointing (relative to workerScript)
+//   to the Acorn and Tern libraries and any Tern plugins you want to
+//   load. Or, if you minified those into a single script and included
+//   them in the workerScript, simply leave this undefined.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  // declare global: tern
+
+  CodeMirror.TernServer = function(options) {
+    var self = this;
+    this.options = options || {};
+    var plugins = this.options.plugins || (this.options.plugins = {});
+    if (!plugins.doc_comment) plugins.doc_comment = true;
+    this.docs = Object.create(null);
+    if (this.options.useWorker) {
+      this.server = new WorkerServer(this);
+    } else {
+      this.server = new tern.Server({
+        getFile: function(name, c) { return getFile(self, name, c); },
+        async: true,
+        defs: this.options.defs || [],
+        plugins: plugins
+      });
+    }
+    this.trackChange = function(doc, change) { trackChange(self, doc, change); };
+
+    this.cachedArgHints = null;
+    this.activeArgHints = null;
+    this.jumpStack = [];
+
+    this.getHint = function(cm, c) { return hint(self, cm, c); };
+    this.getHint.async = true;
+  };
+
+  CodeMirror.TernServer.prototype = {
+    addDoc: function(name, doc) {
+      var data = {doc: doc, name: name, changed: null};
+      this.server.addFile(name, docValue(this, data));
+      CodeMirror.on(doc, "change", this.trackChange);
+      return this.docs[name] = data;
+    },
+
+    delDoc: function(id) {
+      var found = resolveDoc(this, id);
+      if (!found) return;
+      CodeMirror.off(found.doc, "change", this.trackChange);
+      delete this.docs[found.name];
+      this.server.delFile(found.name);
+    },
+
+    hideDoc: function(id) {
+      closeArgHints(this);
+      var found = resolveDoc(this, id);
+      if (found && found.changed) sendDoc(this, found);
+    },
+
+    complete: function(cm) {
+      cm.showHint({hint: this.getHint});
+    },
+
+    showType: function(cm, pos, c) { showContextInfo(this, cm, pos, "type", c); },
+
+    showDocs: function(cm, pos, c) { showContextInfo(this, cm, pos, "documentation", c); },
+
+    updateArgHints: function(cm) { updateArgHints(this, cm); },
+
+    jumpToDef: function(cm) { jumpToDef(this, cm); },
+
+    jumpBack: function(cm) { jumpBack(this, cm); },
+
+    rename: function(cm) { rename(this, cm); },
+
+    selectName: function(cm) { selectName(this, cm); },
+
+    request: function (cm, query, c, pos) {
+      var self = this;
+      var doc = findDoc(this, cm.getDoc());
+      var request = buildRequest(this, doc, query, pos);
+      var extraOptions = request.query && this.options.queryOptions && this.options.queryOptions[request.query.type]
+      if (extraOptions) for (var prop in extraOptions) request.query[prop] = extraOptions[prop];
+
+      this.server.request(request, function (error, data) {
+        if (!error && self.options.responseFilter)
+          data = self.options.responseFilter(doc, query, request, error, data);
+        c(error, data);
+      });
+    },
+
+    destroy: function () {
+      closeArgHints(this)
+      if (this.worker) {
+        this.worker.terminate();
+        this.worker = null;
+      }
+    }
+  };
+
+  var Pos = CodeMirror.Pos;
+  var cls = "CodeMirror-Tern-";
+  var bigDoc = 250;
+
+  function getFile(ts, name, c) {
+    var buf = ts.docs[name];
+    if (buf)
+      c(docValue(ts, buf));
+    else if (ts.options.getFile)
+      ts.options.getFile(name, c);
+    else
+      c(null);
+  }
+
+  function findDoc(ts, doc, name) {
+    for (var n in ts.docs) {
+      var cur = ts.docs[n];
+      if (cur.doc == doc) return cur;
+    }
+    if (!name) for (var i = 0;; ++i) {
+      n = "[doc" + (i || "") + "]";
+      if (!ts.docs[n]) { name = n; break; }
+    }
+    return ts.addDoc(name, doc);
+  }
+
+  function resolveDoc(ts, id) {
+    if (typeof id == "string") return ts.docs[id];
+    if (id instanceof CodeMirror) id = id.getDoc();
+    if (id instanceof CodeMirror.Doc) return findDoc(ts, id);
+  }
+
+  function trackChange(ts, doc, change) {
+    var data = findDoc(ts, doc);
+
+    var argHints = ts.cachedArgHints;
+    if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) >= 0)
+      ts.cachedArgHints = null;
+
+    var changed = data.changed;
+    if (changed == null)
+      data.changed = changed = {from: change.from.line, to: change.from.line};
+    var end = change.from.line + (change.text.length - 1);
+    if (change.from.line < changed.to) changed.to = changed.to - (change.to.line - end);
+    if (end >= changed.to) changed.to = end + 1;
+    if (changed.from > change.from.line) changed.from = change.from.line;
+
+    if (doc.lineCount() > bigDoc && change.to - changed.from > 100) setTimeout(function() {
+      if (data.changed && data.changed.to - data.changed.from > 100) sendDoc(ts, data);
+    }, 200);
+  }
+
+  function sendDoc(ts, doc) {
+    ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc)}]}, function(error) {
+      if (error) window.console.error(error);
+      else doc.changed = null;
+    });
+  }
+
+  // Completion
+
+  function hint(ts, cm, c) {
+    ts.request(cm, {type: "completions", types: true, docs: true, urls: true}, function(error, data) {
+      if (error) return showError(ts, cm, error);
+      var completions = [], after = "";
+      var from = data.start, to = data.end;
+      if (cm.getRange(Pos(from.line, from.ch - 2), from) == "[\"" &&
+          cm.getRange(to, Pos(to.line, to.ch + 2)) != "\"]")
+        after = "\"]";
+
+      for (var i = 0; i < data.completions.length; ++i) {
+        var completion = data.completions[i], className = typeToIcon(completion.type);
+        if (data.guess) className += " " + cls + "guess";
+        completions.push({text: completion.name + after,
+                          displayText: completion.displayName || completion.name,
+                          className: className,
+                          data: completion});
+      }
+
+      var obj = {from: from, to: to, list: completions};
+      var tooltip = null;
+      CodeMirror.on(obj, "close", function() { remove(tooltip); });
+      CodeMirror.on(obj, "update", function() { remove(tooltip); });
+      CodeMirror.on(obj, "select", function(cur, node) {
+        remove(tooltip);
+        var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
+        if (content) {
+          tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
+                                node.getBoundingClientRect().top + window.pageYOffset, content);
+          tooltip.className += " " + cls + "hint-doc";
+        }
+      });
+      c(obj);
+    });
+  }
+
+  function typeToIcon(type) {
+    var suffix;
+    if (type == "?") suffix = "unknown";
+    else if (type == "number" || type == "string" || type == "bool") suffix = type;
+    else if (/^fn\(/.test(type)) suffix = "fn";
+    else if (/^\[/.test(type)) suffix = "array";
+    else suffix = "object";
+    return cls + "completion " + cls + "completion-" + suffix;
+  }
+
+  // Type queries
+
+  function showContextInfo(ts, cm, pos, queryName, c) {
+    ts.request(cm, queryName, function(error, data) {
+      if (error) return showError(ts, cm, error);
+      if (ts.options.typeTip) {
+        var tip = ts.options.typeTip(data);
+      } else {
+        var tip = elt("span", null, elt("strong", null, data.type || "not found"));
+        if (data.doc)
+          tip.appendChild(document.createTextNode(" — " + data.doc));
+        if (data.url) {
+          tip.appendChild(document.createTextNode(" "));
+          var child = tip.appendChild(elt("a", null, "[docs]"));
+          child.href = data.url;
+          child.target = "_blank";
+        }
+      }
+      tempTooltip(cm, tip, ts);
+      if (c) c();
+    }, pos);
+  }
+
+  // Maintaining argument hints
+
+  function updateArgHints(ts, cm) {
+    closeArgHints(ts);
+
+    if (cm.somethingSelected()) return;
+    var state = cm.getTokenAt(cm.getCursor()).state;
+    var inner = CodeMirror.innerMode(cm.getMode(), state);
+    if (inner.mode.name != "javascript") return;
+    var lex = inner.state.lexical;
+    if (lex.info != "call") return;
+
+    var ch, argPos = lex.pos || 0, tabSize = cm.getOption("tabSize");
+    for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line) {
+      var str = cm.getLine(line), extra = 0;
+      for (var pos = 0;;) {
+        var tab = str.indexOf("\t", pos);
+        if (tab == -1) break;
+        extra += tabSize - (tab + extra) % tabSize - 1;
+        pos = tab + 1;
+      }
+      ch = lex.column - extra;
+      if (str.charAt(ch) == "(") {found = true; break;}
+    }
+    if (!found) return;
+
+    var start = Pos(line, ch);
+    var cache = ts.cachedArgHints;
+    if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
+      return showArgHints(ts, cm, argPos);
+
+    ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
+      if (error || !data.type || !(/^fn\(/).test(data.type)) return;
+      ts.cachedArgHints = {
+        start: start,
+        type: parseFnType(data.type),
+        name: data.exprName || data.name || "fn",
+        guess: data.guess,
+        doc: cm.getDoc()
+      };
+      showArgHints(ts, cm, argPos);
+    });
+  }
+
+  function showArgHints(ts, cm, pos) {
+    closeArgHints(ts);
+
+    var cache = ts.cachedArgHints, tp = cache.type;
+    var tip = elt("span", cache.guess ? cls + "fhint-guess" : null,
+                  elt("span", cls + "fname", cache.name), "(");
+    for (var i = 0; i < tp.args.length; ++i) {
+      if (i) tip.appendChild(document.createTextNode(", "));
+      var arg = tp.args[i];
+      tip.appendChild(elt("span", cls + "farg" + (i == pos ? " " + cls + "farg-current" : ""), arg.name || "?"));
+      if (arg.type != "?") {
+        tip.appendChild(document.createTextNode(":\u00a0"));
+        tip.appendChild(elt("span", cls + "type", arg.type));
+      }
+    }
+    tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
+    if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
+    var place = cm.cursorCoords(null, "page");
+    var tooltip = ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip)
+    setTimeout(function() {
+      tooltip.clear = onEditorActivity(cm, function() {
+        if (ts.activeArgHints == tooltip) closeArgHints(ts) })
+    }, 20)
+  }
+
+  function parseFnType(text) {
+    var args = [], pos = 3;
+
+    function skipMatching(upto) {
+      var depth = 0, start = pos;
+      for (;;) {
+        var next = text.charAt(pos);
+        if (upto.test(next) && !depth) return text.slice(start, pos);
+        if (/[{\[\(]/.test(next)) ++depth;
+        else if (/[}\]\)]/.test(next)) --depth;
+        ++pos;
+      }
+    }
+
+    // Parse arguments
+    if (text.charAt(pos) != ")") for (;;) {
+      var name = text.slice(pos).match(/^([^, \(\[\{]+): /);
+      if (name) {
+        pos += name[0].length;
+        name = name[1];
+      }
+      args.push({name: name, type: skipMatching(/[\),]/)});
+      if (text.charAt(pos) == ")") break;
+      pos += 2;
+    }
+
+    var rettype = text.slice(pos).match(/^\) -> (.*)$/);
+
+    return {args: args, rettype: rettype && rettype[1]};
+  }
+
+  // Moving to the definition of something
+
+  function jumpToDef(ts, cm) {
+    function inner(varName) {
+      var req = {type: "definition", variable: varName || null};
+      var doc = findDoc(ts, cm.getDoc());
+      ts.server.request(buildRequest(ts, doc, req), function(error, data) {
+        if (error) return showError(ts, cm, error);
+        if (!data.file && data.url) { window.open(data.url); return; }
+
+        if (data.file) {
+          var localDoc = ts.docs[data.file], found;
+          if (localDoc && (found = findContext(localDoc.doc, data))) {
+            ts.jumpStack.push({file: doc.name,
+                               start: cm.getCursor("from"),
+                               end: cm.getCursor("to")});
+            moveTo(ts, doc, localDoc, found.start, found.end);
+            return;
+          }
+        }
+        showError(ts, cm, "Could not find a definition.");
+      });
+    }
+
+    if (!atInterestingExpression(cm))
+      dialog(cm, "Jump to variable", function(name) { if (name) inner(name); });
+    else
+      inner();
+  }
+
+  function jumpBack(ts, cm) {
+    var pos = ts.jumpStack.pop(), doc = pos && ts.docs[pos.file];
+    if (!doc) return;
+    moveTo(ts, findDoc(ts, cm.getDoc()), doc, pos.start, pos.end);
+  }
+
+  function moveTo(ts, curDoc, doc, start, end) {
+    doc.doc.setSelection(start, end);
+    if (curDoc != doc && ts.options.switchToDoc) {
+      closeArgHints(ts);
+      ts.options.switchToDoc(doc.name, doc.doc);
+    }
+  }
+
+  // The {line,ch} representation of positions makes this rather awkward.
+  function findContext(doc, data) {
+    var before = data.context.slice(0, data.contextOffset).split("\n");
+    var startLine = data.start.line - (before.length - 1);
+    var start = Pos(startLine, (before.length == 1 ? data.start.ch : doc.getLine(startLine).length) - before[0].length);
+
+    var text = doc.getLine(startLine).slice(start.ch);
+    for (var cur = startLine + 1; cur < doc.lineCount() && text.length < data.context.length; ++cur)
+      text += "\n" + doc.getLine(cur);
+    if (text.slice(0, data.context.length) == data.context) return data;
+
+    var cursor = doc.getSearchCursor(data.context, 0, false);
+    var nearest, nearestDist = Infinity;
+    while (cursor.findNext()) {
+      var from = cursor.from(), dist = Math.abs(from.line - start.line) * 10000;
+      if (!dist) dist = Math.abs(from.ch - start.ch);
+      if (dist < nearestDist) { nearest = from; nearestDist = dist; }
+    }
+    if (!nearest) return null;
+
+    if (before.length == 1)
+      nearest.ch += before[0].length;
+    else
+      nearest = Pos(nearest.line + (before.length - 1), before[before.length - 1].length);
+    if (data.start.line == data.end.line)
+      var end = Pos(nearest.line, nearest.ch + (data.end.ch - data.start.ch));
+    else
+      var end = Pos(nearest.line + (data.end.line - data.start.line), data.end.ch);
+    return {start: nearest, end: end};
+  }
+
+  function atInterestingExpression(cm) {
+    var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
+    if (tok.start < pos.ch && tok.type == "comment") return false;
+    return /[\w)\]]/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
+  }
+
+  // Variable renaming
+
+  function rename(ts, cm) {
+    var token = cm.getTokenAt(cm.getCursor());
+    if (!/\w/.test(token.string)) return showError(ts, cm, "Not at a variable");
+    dialog(cm, "New name for " + token.string, function(newName) {
+      ts.request(cm, {type: "rename", newName: newName, fullDocs: true}, function(error, data) {
+        if (error) return showError(ts, cm, error);
+        applyChanges(ts, data.changes);
+      });
+    });
+  }
+
+  function selectName(ts, cm) {
+    var name = findDoc(ts, cm.doc).name;
+    ts.request(cm, {type: "refs"}, function(error, data) {
+      if (error) return showError(ts, cm, error);
+      var ranges = [], cur = 0;
+      var curPos = cm.getCursor();
+      for (var i = 0; i < data.refs.length; i++) {
+        var ref = data.refs[i];
+        if (ref.file == name) {
+          ranges.push({anchor: ref.start, head: ref.end});
+          if (cmpPos(curPos, ref.start) >= 0 && cmpPos(curPos, ref.end) <= 0)
+            cur = ranges.length - 1;
+        }
+      }
+      cm.setSelections(ranges, cur);
+    });
+  }
+
+  var nextChangeOrig = 0;
+  function applyChanges(ts, changes) {
+    var perFile = Object.create(null);
+    for (var i = 0; i < changes.length; ++i) {
+      var ch = changes[i];
+      (perFile[ch.file] || (perFile[ch.file] = [])).push(ch);
+    }
+    for (var file in perFile) {
+      var known = ts.docs[file], chs = perFile[file];;
+      if (!known) continue;
+      chs.sort(function(a, b) { return cmpPos(b.start, a.start); });
+      var origin = "*rename" + (++nextChangeOrig);
+      for (var i = 0; i < chs.length; ++i) {
+        var ch = chs[i];
+        known.doc.replaceRange(ch.text, ch.start, ch.end, origin);
+      }
+    }
+  }
+
+  // Generic request-building helper
+
+  function buildRequest(ts, doc, query, pos) {
+    var files = [], offsetLines = 0, allowFragments = !query.fullDocs;
+    if (!allowFragments) delete query.fullDocs;
+    if (typeof query == "string") query = {type: query};
+    query.lineCharPositions = true;
+    if (query.end == null) {
+      query.end = pos || doc.doc.getCursor("end");
+      if (doc.doc.somethingSelected())
+        query.start = doc.doc.getCursor("start");
+    }
+    var startPos = query.start || query.end;
+
+    if (doc.changed) {
+      if (doc.doc.lineCount() > bigDoc && allowFragments !== false &&
+          doc.changed.to - doc.changed.from < 100 &&
+          doc.changed.from <= startPos.line && doc.changed.to > query.end.line) {
+        files.push(getFragmentAround(doc, startPos, query.end));
+        query.file = "#0";
+        var offsetLines = files[0].offsetLines;
+        if (query.start != null) query.start = Pos(query.start.line - -offsetLines, query.start.ch);
+        query.end = Pos(query.end.line - offsetLines, query.end.ch);
+      } else {
+        files.push({type: "full",
+                    name: doc.name,
+                    text: docValue(ts, doc)});
+        query.file = doc.name;
+        doc.changed = null;
+      }
+    } else {
+      query.file = doc.name;
+    }
+    for (var name in ts.docs) {
+      var cur = ts.docs[name];
+      if (cur.changed && cur != doc) {
+        files.push({type: "full", name: cur.name, text: docValue(ts, cur)});
+        cur.changed = null;
+      }
+    }
+
+    return {query: query, files: files};
+  }
+
+  function getFragmentAround(data, start, end) {
+    var doc = data.doc;
+    var minIndent = null, minLine = null, endLine, tabSize = 4;
+    for (var p = start.line - 1, min = Math.max(0, p - 50); p >= min; --p) {
+      var line = doc.getLine(p), fn = line.search(/\bfunction\b/);
+      if (fn < 0) continue;
+      var indent = CodeMirror.countColumn(line, null, tabSize);
+      if (minIndent != null && minIndent <= indent) continue;
+      minIndent = indent;
+      minLine = p;
+    }
+    if (minLine == null) minLine = min;
+    var max = Math.min(doc.lastLine(), end.line + 20);
+    if (minIndent == null || minIndent == CodeMirror.countColumn(doc.getLine(start.line), null, tabSize))
+      endLine = max;
+    else for (endLine = end.line + 1; endLine < max; ++endLine) {
+      var indent = CodeMirror.countColumn(doc.getLine(endLine), null, tabSize);
+      if (indent <= minIndent) break;
+    }
+    var from = Pos(minLine, 0);
+
+    return {type: "part",
+            name: data.name,
+            offsetLines: from.line,
+            text: doc.getRange(from, Pos(endLine, end.line == endLine ? null : 0))};
+  }
+
+  // Generic utilities
+
+  var cmpPos = CodeMirror.cmpPos;
+
+  function elt(tagname, cls /*, ... elts*/) {
+    var e = document.createElement(tagname);
+    if (cls) e.className = cls;
+    for (var i = 2; i < arguments.length; ++i) {
+      var elt = arguments[i];
+      if (typeof elt == "string") elt = document.createTextNode(elt);
+      e.appendChild(elt);
+    }
+    return e;
+  }
+
+  function dialog(cm, text, f) {
+    if (cm.openDialog)
+      cm.openDialog(text + ": <input type=text>", f);
+    else
+      f(prompt(text, ""));
+  }
+
+  // Tooltips
+
+  function tempTooltip(cm, content, ts) {
+    if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
+    var where = cm.cursorCoords();
+    var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
+    function maybeClear() {
+      old = true;
+      if (!mouseOnTip) clear();
+    }
+    function clear() {
+      cm.state.ternTooltip = null;
+      if (tip.parentNode) fadeOut(tip)
+      clearActivity()
+    }
+    var mouseOnTip = false, old = false;
+    CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
+    CodeMirror.on(tip, "mouseout", function(e) {
+      var related = e.relatedTarget || e.toElement
+      if (!related || !CodeMirror.contains(tip, related)) {
+        if (old) clear();
+        else mouseOnTip = false;
+      }
+    });
+    setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
+    var clearActivity = onEditorActivity(cm, clear)
+  }
+
+  function onEditorActivity(cm, f) {
+    cm.on("cursorActivity", f)
+    cm.on("blur", f)
+    cm.on("scroll", f)
+    cm.on("setDoc", f)
+    return function() {
+      cm.off("cursorActivity", f)
+      cm.off("blur", f)
+      cm.off("scroll", f)
+      cm.off("setDoc", f)
+    }
+  }
+
+  function makeTooltip(x, y, content) {
+    var node = elt("div", cls + "tooltip", content);
+    node.style.left = x + "px";
+    node.style.top = y + "px";
+    document.body.appendChild(node);
+    return node;
+  }
+
+  function remove(node) {
+    var p = node && node.parentNode;
+    if (p) p.removeChild(node);
+  }
+
+  function fadeOut(tooltip) {
+    tooltip.style.opacity = "0";
+    setTimeout(function() { remove(tooltip); }, 1100);
+  }
+
+  function showError(ts, cm, msg) {
+    if (ts.options.showError)
+      ts.options.showError(cm, msg);
+    else
+      tempTooltip(cm, String(msg), ts);
+  }
+
+  function closeArgHints(ts) {
+    if (ts.activeArgHints) {
+      if (ts.activeArgHints.clear) ts.activeArgHints.clear()
+      remove(ts.activeArgHints)
+      ts.activeArgHints = null
+    }
+  }
+
+  function docValue(ts, doc) {
+    var val = doc.doc.getValue();
+    if (ts.options.fileFilter) val = ts.options.fileFilter(val, doc.name, doc.doc);
+    return val;
+  }
+
+  // Worker wrapper
+
+  function WorkerServer(ts) {
+    var worker = ts.worker = new Worker(ts.options.workerScript);
+    worker.postMessage({type: "init",
+                        defs: ts.options.defs,
+                        plugins: ts.options.plugins,
+                        scripts: ts.options.workerDeps});
+    var msgId = 0, pending = {};
+
+    function send(data, c) {
+      if (c) {
+        data.id = ++msgId;
+        pending[msgId] = c;
+      }
+      worker.postMessage(data);
+    }
+    worker.onmessage = function(e) {
+      var data = e.data;
+      if (data.type == "getFile") {
+        getFile(ts, data.name, function(err, text) {
+          send({type: "getFile", err: String(err), text: text, id: data.id});
+        });
+      } else if (data.type == "debug") {
+        window.console.log(data.message);
+      } else if (data.id && pending[data.id]) {
+        pending[data.id](data.err, data.body);
+        delete pending[data.id];
+      }
+    };
+    worker.onerror = function(e) {
+      for (var id in pending) pending[id](e);
+      pending = {};
+    };
+
+    this.addFile = function(name, text) { send({type: "add", name: name, text: text}); };
+    this.delFile = function(name) { send({type: "del", name: name}); };
+    this.request = function(body, c) { send({type: "req", body: body}, c); };
+  }
+});
diff --git a/core/media/editors/codemirror/addon/tern/tern.min.css b/core/media/editors/codemirror/addon/tern/tern.min.css
new file mode 100644
index 00000000..c377ab17
--- /dev/null
+++ b/core/media/editors/codemirror/addon/tern/tern.min.css
@@ -0,0 +1 @@
+.CodeMirror-Tern-completion{padding-left:22px;position:relative;line-height:1.5}.CodeMirror-Tern-completion:before{position:absolute;left:2px;bottom:2px;border-radius:50%;font-size:12px;font-weight:700;height:15px;width:15px;line-height:16px;text-align:center;color:#fff;-moz-box-sizing:border-box;box-sizing:border-box}.CodeMirror-Tern-completion-unknown:before{content:"?";background:#4bb}.CodeMirror-Tern-completion-object:before{content:"O";background:#77c}.CodeMirror-Tern-completion-fn:before{content:"F";background:#7c7}.CodeMirror-Tern-completion-array:before{content:"A";background:#c66}.CodeMirror-Tern-completion-number:before{content:"1";background:#999}.CodeMirror-Tern-completion-string:before{content:"S";background:#999}.CodeMirror-Tern-completion-bool:before{content:"B";background:#999}.CodeMirror-Tern-completion-guess{color:#999}.CodeMirror-Tern-tooltip{border:1px solid silver;border-radius:3px;color:#444;padding:2px 5px;font-size:90%;font-family:monospace;background-color:#fff;white-space:pre-wrap;max-width:40em;position:absolute;z-index:10;-webkit-box-shadow:2px 3px 5px rgba(0,0,0,.2);-moz-box-shadow:2px 3px 5px rgba(0,0,0,.2);box-shadow:2px 3px 5px rgba(0,0,0,.2);transition:opacity 1s;-moz-transition:opacity 1s;-webkit-transition:opacity 1s;-o-transition:opacity 1s;-ms-transition:opacity 1s}.CodeMirror-Tern-hint-doc{max-width:25em;margin-top:-3px}.CodeMirror-Tern-fname{color:#000}.CodeMirror-Tern-farg{color:#70a}.CodeMirror-Tern-farg-current{text-decoration:underline}.CodeMirror-Tern-type{color:#07c}.CodeMirror-Tern-fhint-guess{opacity:.7}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/tern/tern.min.js b/core/media/editors/codemirror/addon/tern/tern.min.js
new file mode 100644
index 00000000..3825adab
--- /dev/null
+++ b/core/media/editors/codemirror/addon/tern/tern.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.docs[b];d?c(F(a,d)):a.options.getFile?a.options.getFile(b,c):c(null)}function c(a,b,c){for(var d in a.docs){var e=a.docs[d];if(e.doc==b)return e}if(!c)for(var f=0;;++f)if(d="[doc"+(f||"")+"]",!a.docs[d]){c=d;break}return a.addDoc(c,b)}function d(b,d){return"string"==typeof d?b.docs[d]:(d instanceof a&&(d=d.getDoc()),d instanceof a.Doc?c(b,d):void 0)}function e(a,b,d){var e=c(a,b),g=a.cachedArgHints;g&&g.doc==b&&L(g.start,d.to)>=0&&(a.cachedArgHints=null);var h=e.changed;null==h&&(e.changed=h={from:d.from.line,to:d.from.line});var i=d.from.line+(d.text.length-1);d.from.line<h.to&&(h.to=h.to-(d.to.line-i)),i>=h.to&&(h.to=i+1),h.from>d.from.line&&(h.from=d.from.line),b.lineCount()>J&&d.to-h.from>100&&setTimeout((function(){e.changed&&e.changed.to-e.changed.from>100&&f(a,e)}),200)}function f(a,b){a.server.request({files:[{type:"full",name:b.name,text:F(a,b)}]},(function(a){a?window.console.error(a):b.changed=null}))}function g(b,c,d){b.request(c,{type:"completions",types:!0,docs:!0,urls:!0},(function(e,f){if(e)return D(b,c,e);var g=[],i="",j=f.start,k=f.end;'["'==c.getRange(H(j.line,j.ch-2),j)&&'"]'!=c.getRange(k,H(k.line,k.ch+2))&&(i='"]');for(var l=0;l<f.completions.length;++l){var m=f.completions[l],n=h(m.type);f.guess&&(n+=" "+I+"guess"),g.push({text:m.name+i,displayText:m.displayName||m.name,className:n,data:m})}var o={from:j,to:k,list:g},p=null;a.on(o,"close",(function(){B(p)})),a.on(o,"update",(function(){B(p)})),a.on(o,"select",(function(a,c){B(p);var d=b.options.completionTip?b.options.completionTip(a.data):a.data.doc;d&&(p=A(c.parentNode.getBoundingClientRect().right+window.pageXOffset,c.getBoundingClientRect().top+window.pageYOffset,d),p.className+=" "+I+"hint-doc")})),d(o)}))}function h(a){var b;return b="?"==a?"unknown":"number"==a||"string"==a||"bool"==a?a:/^fn\(/.test(a)?"fn":/^\[/.test(a)?"array":"object",I+"completion "+I+"completion-"+b}function i(a,b,c,d,e){a.request(b,d,(function(c,d){if(c)return D(a,b,c);if(a.options.typeTip)var f=a.options.typeTip(d);else{var f=w("span",null,w("strong",null,d.type||"not found"));if(d.doc&&f.appendChild(document.createTextNode(" — "+d.doc)),d.url){f.appendChild(document.createTextNode(" "));var g=f.appendChild(w("a",null,"[docs]"));g.href=d.url,g.target="_blank"}}y(b,f,a),e&&e()}),c)}function j(b,c){if(E(b),!c.somethingSelected()){var d=c.getTokenAt(c.getCursor()).state,e=a.innerMode(c.getMode(),d);if("javascript"==e.mode.name){var f=e.state.lexical;if("call"==f.info){for(var g,h=f.pos||0,i=c.getOption("tabSize"),j=c.getCursor().line,m=Math.max(0,j-9),n=!1;j>=m;--j){for(var o=c.getLine(j),p=0,q=0;;){var r=o.indexOf("\t",q);if(r==-1)break;p+=i-(r+p)%i-1,q=r+1}if(g=f.column-p,"("==o.charAt(g)){n=!0;break}}if(n){var s=H(j,g),t=b.cachedArgHints;return t&&t.doc==c.getDoc()&&0==L(s,t.start)?k(b,c,h):void b.request(c,{type:"type",preferFunction:!0,end:s},(function(a,d){!a&&d.type&&/^fn\(/.test(d.type)&&(b.cachedArgHints={start:s,type:l(d.type),name:d.exprName||d.name||"fn",guess:d.guess,doc:c.getDoc()},k(b,c,h))}))}}}}}function k(a,b,c){E(a);for(var d=a.cachedArgHints,e=d.type,f=w("span",d.guess?I+"fhint-guess":null,w("span",I+"fname",d.name),"("),g=0;g<e.args.length;++g){g&&f.appendChild(document.createTextNode(", "));var h=e.args[g];f.appendChild(w("span",I+"farg"+(g==c?" "+I+"farg-current":""),h.name||"?")),"?"!=h.type&&(f.appendChild(document.createTextNode(": ")),f.appendChild(w("span",I+"type",h.type)))}f.appendChild(document.createTextNode(e.rettype?") -> ":")")),e.rettype&&f.appendChild(w("span",I+"type",e.rettype));var i=b.cursorCoords(null,"page"),j=a.activeArgHints=A(i.right+1,i.bottom,f);setTimeout((function(){j.clear=z(b,(function(){a.activeArgHints==j&&E(a)}))}),20)}function l(a){function b(b){for(var c=0,e=d;;){var f=a.charAt(d);if(b.test(f)&&!c)return a.slice(e,d);/[{\[\(]/.test(f)?++c:/[}\]\)]/.test(f)&&--c,++d}}var c=[],d=3;if(")"!=a.charAt(d))for(;;){var e=a.slice(d).match(/^([^, \(\[\{]+): /);if(e&&(d+=e[0].length,e=e[1]),c.push({name:e,type:b(/[\),]/)}),")"==a.charAt(d))break;d+=2}var f=a.slice(d).match(/^\) -> (.*)$/);return{args:c,rettype:f&&f[1]}}function m(a,b){function d(d){var e={type:"definition",variable:d||null},f=c(a,b.getDoc());a.server.request(u(a,f,e),(function(c,d){if(c)return D(a,b,c);if(!d.file&&d.url)return void window.open(d.url);if(d.file){var e,g=a.docs[d.file];if(g&&(e=p(g.doc,d)))return a.jumpStack.push({file:f.name,start:b.getCursor("from"),end:b.getCursor("to")}),void o(a,f,g,e.start,e.end)}D(a,b,"Could not find a definition.")}))}q(b)?d():x(b,"Jump to variable",(function(a){a&&d(a)}))}function n(a,b){var d=a.jumpStack.pop(),e=d&&a.docs[d.file];e&&o(a,c(a,b.getDoc()),e,d.start,d.end)}function o(a,b,c,d,e){c.doc.setSelection(d,e),b!=c&&a.options.switchToDoc&&(E(a),a.options.switchToDoc(c.name,c.doc))}function p(a,b){for(var c=b.context.slice(0,b.contextOffset).split("\n"),d=b.start.line-(c.length-1),e=H(d,(1==c.length?b.start.ch:a.getLine(d).length)-c[0].length),f=a.getLine(d).slice(e.ch),g=d+1;g<a.lineCount()&&f.length<b.context.length;++g)f+="\n"+a.getLine(g);if(f.slice(0,b.context.length)==b.context)return b;for(var h,i=a.getSearchCursor(b.context,0,!1),j=1/0;i.findNext();){var k=i.from(),l=1e4*Math.abs(k.line-e.line);l||(l=Math.abs(k.ch-e.ch)),l<j&&(h=k,j=l)}if(!h)return null;if(1==c.length?h.ch+=c[0].length:h=H(h.line+(c.length-1),c[c.length-1].length),b.start.line==b.end.line)var m=H(h.line,h.ch+(b.end.ch-b.start.ch));else var m=H(h.line+(b.end.line-b.start.line),b.end.ch);return{start:h,end:m}}function q(a){var b=a.getCursor("end"),c=a.getTokenAt(b);return!(c.start<b.ch&&"comment"==c.type)&&/[\w)\]]/.test(a.getLine(b.line).slice(Math.max(b.ch-1,0),b.ch+1))}function r(a,b){var c=b.getTokenAt(b.getCursor());return/\w/.test(c.string)?void x(b,"New name for "+c.string,(function(c){a.request(b,{type:"rename",newName:c,fullDocs:!0},(function(c,d){return c?D(a,b,c):void t(a,d.changes)}))})):D(a,b,"Not at a variable")}function s(a,b){var d=c(a,b.doc).name;a.request(b,{type:"refs"},(function(c,e){if(c)return D(a,b,c);for(var f=[],g=0,h=b.getCursor(),i=0;i<e.refs.length;i++){var j=e.refs[i];j.file==d&&(f.push({anchor:j.start,head:j.end}),L(h,j.start)>=0&&L(h,j.end)<=0&&(g=f.length-1))}b.setSelections(f,g)}))}function t(a,b){for(var c=Object.create(null),d=0;d<b.length;++d){var e=b[d];(c[e.file]||(c[e.file]=[])).push(e)}for(var f in c){var g=a.docs[f],h=c[f];if(g){h.sort((function(a,b){return L(b.start,a.start)}));for(var i="*rename"+ ++K,d=0;d<h.length;++d){var e=h[d];g.doc.replaceRange(e.text,e.start,e.end,i)}}}}function u(a,b,c,d){var e=[],f=0,g=!c.fullDocs;g||delete c.fullDocs,"string"==typeof c&&(c={type:c}),c.lineCharPositions=!0,null==c.end&&(c.end=d||b.doc.getCursor("end"),b.doc.somethingSelected()&&(c.start=b.doc.getCursor("start")));var h=c.start||c.end;if(b.changed)if(b.doc.lineCount()>J&&g!==!1&&b.changed.to-b.changed.from<100&&b.changed.from<=h.line&&b.changed.to>c.end.line){e.push(v(b,h,c.end)),c.file="#0";var f=e[0].offsetLines;null!=c.start&&(c.start=H(c.start.line- -f,c.start.ch)),c.end=H(c.end.line-f,c.end.ch)}else e.push({type:"full",name:b.name,text:F(a,b)}),c.file=b.name,b.changed=null;else c.file=b.name;for(var i in a.docs){var j=a.docs[i];j.changed&&j!=b&&(e.push({type:"full",name:j.name,text:F(a,j)}),j.changed=null)}return{query:c,files:e}}function v(b,c,d){for(var e,f=b.doc,g=null,h=null,i=4,j=c.line-1,k=Math.max(0,j-50);j>=k;--j){var l=f.getLine(j),m=l.search(/\bfunction\b/);if(!(m<0)){var n=a.countColumn(l,null,i);null!=g&&g<=n||(g=n,h=j)}}null==h&&(h=k);var o=Math.min(f.lastLine(),d.line+20);if(null==g||g==a.countColumn(f.getLine(c.line),null,i))e=o;else for(e=d.line+1;e<o;++e){var n=a.countColumn(f.getLine(e),null,i);if(n<=g)break}var p=H(h,0);return{type:"part",name:b.name,offsetLines:p.line,text:f.getRange(p,H(e,d.line==e?null:0))}}function w(a,b){var c=document.createElement(a);b&&(c.className=b);for(var d=2;d<arguments.length;++d){var e=arguments[d];"string"==typeof e&&(e=document.createTextNode(e)),c.appendChild(e)}return c}function x(a,b,c){a.openDialog?a.openDialog(b+": <input type=text>",c):c(prompt(b,""))}function y(b,c,d){function e(){j=!0,i||f()}function f(){b.state.ternTooltip=null,h.parentNode&&C(h),k()}b.state.ternTooltip&&B(b.state.ternTooltip);var g=b.cursorCoords(),h=b.state.ternTooltip=A(g.right+1,g.bottom,c),i=!1,j=!1;a.on(h,"mousemove",(function(){i=!0})),a.on(h,"mouseout",(function(b){var c=b.relatedTarget||b.toElement;c&&a.contains(h,c)||(j?f():i=!1)})),setTimeout(e,d.options.hintDelay?d.options.hintDelay:1700);var k=z(b,f)}function z(a,b){return a.on("cursorActivity",b),a.on("blur",b),a.on("scroll",b),a.on("setDoc",b),function(){a.off("cursorActivity",b),a.off("blur",b),a.off("scroll",b),a.off("setDoc",b)}}function A(a,b,c){var d=w("div",I+"tooltip",c);return d.style.left=a+"px",d.style.top=b+"px",document.body.appendChild(d),d}function B(a){var b=a&&a.parentNode;b&&b.removeChild(a)}function C(a){a.style.opacity="0",setTimeout((function(){B(a)}),1100)}function D(a,b,c){a.options.showError?a.options.showError(b,c):y(b,String(c),a)}function E(a){a.activeArgHints&&(a.activeArgHints.clear&&a.activeArgHints.clear(),B(a.activeArgHints),a.activeArgHints=null)}function F(a,b){var c=b.doc.getValue();return a.options.fileFilter&&(c=a.options.fileFilter(c,b.name,b.doc)),c}function G(a){function c(a,b){b&&(a.id=++e,f[e]=b),d.postMessage(a)}var d=a.worker=new Worker(a.options.workerScript);d.postMessage({type:"init",defs:a.options.defs,plugins:a.options.plugins,scripts:a.options.workerDeps});var e=0,f={};d.onmessage=function(d){var e=d.data;"getFile"==e.type?b(a,e.name,(function(a,b){c({type:"getFile",err:String(a),text:b,id:e.id})})):"debug"==e.type?window.console.log(e.message):e.id&&f[e.id]&&(f[e.id](e.err,e.body),delete f[e.id])},d.onerror=function(a){for(var b in f)f[b](a);f={}},this.addFile=function(a,b){c({type:"add",name:a,text:b})},this.delFile=function(a){c({type:"del",name:a})},this.request=function(a,b){c({type:"req",body:a},b)}}a.TernServer=function(a){var c=this;this.options=a||{};var d=this.options.plugins||(this.options.plugins={});d.doc_comment||(d.doc_comment=!0),this.docs=Object.create(null),this.options.useWorker?this.server=new G(this):this.server=new tern.Server({getFile:function(a,d){return b(c,a,d)},async:!0,defs:this.options.defs||[],plugins:d}),this.trackChange=function(a,b){e(c,a,b)},this.cachedArgHints=null,this.activeArgHints=null,this.jumpStack=[],this.getHint=function(a,b){return g(c,a,b)},this.getHint.async=!0},a.TernServer.prototype={addDoc:function(b,c){var d={doc:c,name:b,changed:null};return this.server.addFile(b,F(this,d)),a.on(c,"change",this.trackChange),this.docs[b]=d},delDoc:function(b){var c=d(this,b);c&&(a.off(c.doc,"change",this.trackChange),delete this.docs[c.name],this.server.delFile(c.name))},hideDoc:function(a){E(this);var b=d(this,a);b&&b.changed&&f(this,b)},complete:function(a){a.showHint({hint:this.getHint})},showType:function(a,b,c){i(this,a,b,"type",c)},showDocs:function(a,b,c){i(this,a,b,"documentation",c)},updateArgHints:function(a){j(this,a)},jumpToDef:function(a){m(this,a)},jumpBack:function(a){n(this,a)},rename:function(a){r(this,a)},selectName:function(a){s(this,a)},request:function(a,b,d,e){var f=this,g=c(this,a.getDoc()),h=u(this,g,b,e),i=h.query&&this.options.queryOptions&&this.options.queryOptions[h.query.type];if(i)for(var j in i)h.query[j]=i[j];this.server.request(h,(function(a,c){!a&&f.options.responseFilter&&(c=f.options.responseFilter(g,b,h,a,c)),d(a,c)}))},destroy:function(){E(this),this.worker&&(this.worker.terminate(),this.worker=null)}};var H=a.Pos,I="CodeMirror-Tern-",J=250,K=0,L=a.cmpPos}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/tern/worker.js b/core/media/editors/codemirror/addon/tern/worker.js
new file mode 100644
index 00000000..887f906a
--- /dev/null
+++ b/core/media/editors/codemirror/addon/tern/worker.js
@@ -0,0 +1,44 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// declare global: tern, server
+
+var server;
+
+this.onmessage = function(e) {
+  var data = e.data;
+  switch (data.type) {
+  case "init": return startServer(data.defs, data.plugins, data.scripts);
+  case "add": return server.addFile(data.name, data.text);
+  case "del": return server.delFile(data.name);
+  case "req": return server.request(data.body, function(err, reqData) {
+    postMessage({id: data.id, body: reqData, err: err && String(err)});
+  });
+  case "getFile":
+    var c = pending[data.id];
+    delete pending[data.id];
+    return c(data.err, data.text);
+  default: throw new Error("Unknown message type: " + data.type);
+  }
+};
+
+var nextId = 0, pending = {};
+function getFile(file, c) {
+  postMessage({type: "getFile", name: file, id: ++nextId});
+  pending[nextId] = c;
+}
+
+function startServer(defs, plugins, scripts) {
+  if (scripts) importScripts.apply(null, scripts);
+
+  server = new tern.Server({
+    getFile: getFile,
+    async: true,
+    defs: defs,
+    plugins: plugins
+  });
+}
+
+this.console = {
+  log: function(v) { postMessage({type: "debug", message: v}); }
+};
diff --git a/core/media/editors/codemirror/addon/tern/worker.min.js b/core/media/editors/codemirror/addon/tern/worker.min.js
new file mode 100644
index 00000000..24509795
--- /dev/null
+++ b/core/media/editors/codemirror/addon/tern/worker.min.js
@@ -0,0 +1 @@
+function getFile(a,b){postMessage({type:"getFile",name:a,id:++nextId}),pending[nextId]=b}function startServer(a,b,c){c&&importScripts.apply(null,c),server=new tern.Server({getFile:getFile,async:!0,defs:a,plugins:b})}var server;this.onmessage=function(a){var b=a.data;switch(b.type){case"init":return startServer(b.defs,b.plugins,b.scripts);case"add":return server.addFile(b.name,b.text);case"del":return server.delFile(b.name);case"req":return server.request(b.body,(function(a,c){postMessage({id:b.id,body:c,err:a&&String(a)})}));case"getFile":var c=pending[b.id];return delete pending[b.id],c(b.err,b.text);default:throw new Error("Unknown message type: "+b.type)}};var nextId=0,pending={};this.console={log:function(a){postMessage({type:"debug",message:a})}};
\ No newline at end of file
diff --git a/core/media/editors/codemirror/addon/wrap/hardwrap.js b/core/media/editors/codemirror/addon/wrap/hardwrap.js
new file mode 100644
index 00000000..04851f99
--- /dev/null
+++ b/core/media/editors/codemirror/addon/wrap/hardwrap.js
@@ -0,0 +1,144 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  function findParagraph(cm, pos, options) {
+    var startRE = options.paragraphStart || cm.getHelper(pos, "paragraphStart");
+    for (var start = pos.line, first = cm.firstLine(); start > first; --start) {
+      var line = cm.getLine(start);
+      if (startRE && startRE.test(line)) break;
+      if (!/\S/.test(line)) { ++start; break; }
+    }
+    var endRE = options.paragraphEnd || cm.getHelper(pos, "paragraphEnd");
+    for (var end = pos.line + 1, last = cm.lastLine(); end <= last; ++end) {
+      var line = cm.getLine(end);
+      if (endRE && endRE.test(line)) { ++end; break; }
+      if (!/\S/.test(line)) break;
+    }
+    return {from: start, to: end};
+  }
+
+  function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
+    var at = column
+    while (at < text.length && text.charAt(at) == " ") at++
+    for (; at > 0; --at)
+      if (wrapOn.test(text.slice(at - 1, at + 1))) break;
+    for (var first = true;; first = false) {
+      var endOfText = at;
+      if (killTrailingSpace)
+        while (text.charAt(endOfText - 1) == " ") --endOfText;
+      if (endOfText == 0 && first) at = column;
+      else return {from: endOfText, to: at};
+    }
+  }
+
+  function wrapRange(cm, from, to, options) {
+    from = cm.clipPos(from); to = cm.clipPos(to);
+    var column = options.column || 80;
+    var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
+    var killTrailing = options.killTrailingSpace !== false;
+    var changes = [], curLine = "", curNo = from.line;
+    var lines = cm.getRange(from, to, false);
+    if (!lines.length) return null;
+    var leadingSpace = lines[0].match(/^[ \t]*/)[0];
+
+    for (var i = 0; i < lines.length; ++i) {
+      var text = lines[i], oldLen = curLine.length, spaceInserted = 0;
+      if (curLine && text && !wrapOn.test(curLine.charAt(curLine.length - 1) + text.charAt(0))) {
+        curLine += " ";
+        spaceInserted = 1;
+      }
+      var spaceTrimmed = "";
+      if (i) {
+        spaceTrimmed = text.match(/^\s*/)[0];
+        text = text.slice(spaceTrimmed.length);
+      }
+      curLine += text;
+      if (i) {
+        var firstBreak = curLine.length > column && leadingSpace == spaceTrimmed &&
+          findBreakPoint(curLine, column, wrapOn, killTrailing);
+        // If this isn't broken, or is broken at a different point, remove old break
+        if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
+          changes.push({text: [spaceInserted ? " " : ""],
+                        from: Pos(curNo, oldLen),
+                        to: Pos(curNo + 1, spaceTrimmed.length)});
+        } else {
+          curLine = leadingSpace + text;
+          ++curNo;
+        }
+      }
+      while (curLine.length > column) {
+        var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
+        changes.push({text: ["", leadingSpace],
+                      from: Pos(curNo, bp.from),
+                      to: Pos(curNo, bp.to)});
+        curLine = leadingSpace + curLine.slice(bp.to);
+        ++curNo;
+      }
+    }
+    if (changes.length) cm.operation(function() {
+      for (var i = 0; i < changes.length; ++i) {
+        var change = changes[i];
+        if (change.text || CodeMirror.cmpPos(change.from, change.to))
+          cm.replaceRange(change.text, change.from, change.to);
+      }
+    });
+    return changes.length ? {from: changes[0].from, to: CodeMirror.changeEnd(changes[changes.length - 1])} : null;
+  }
+
+  CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
+    options = options || {};
+    if (!pos) pos = this.getCursor();
+    var para = findParagraph(this, pos, options);
+    return wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
+  });
+
+  CodeMirror.commands.wrapLines = function(cm) {
+    cm.operation(function() {
+      var ranges = cm.listSelections(), at = cm.lastLine() + 1;
+      for (var i = ranges.length - 1; i >= 0; i--) {
+        var range = ranges[i], span;
+        if (range.empty()) {
+          var para = findParagraph(cm, range.head, {});
+          span = {from: Pos(para.from, 0), to: Pos(para.to - 1)};
+        } else {
+          span = {from: range.from(), to: range.to()};
+        }
+        if (span.to.line >= at) continue;
+        at = span.from.line;
+        wrapRange(cm, span.from, span.to, {});
+      }
+    });
+  };
+
+  CodeMirror.defineExtension("wrapRange", function(from, to, options) {
+    return wrapRange(this, from, to, options || {});
+  });
+
+  CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
+    options = options || {};
+    var cm = this, paras = [];
+    for (var line = from.line; line <= to.line;) {
+      var para = findParagraph(cm, Pos(line, 0), options);
+      paras.push(para);
+      line = para.to;
+    }
+    var madeChange = false;
+    if (paras.length) cm.operation(function() {
+      for (var i = paras.length - 1; i >= 0; --i)
+        madeChange = madeChange || wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
+    });
+    return madeChange;
+  });
+});
diff --git a/core/media/editors/codemirror/addon/wrap/hardwrap.min.js b/core/media/editors/codemirror/addon/wrap/hardwrap.min.js
new file mode 100644
index 00000000..aeb1100e
--- /dev/null
+++ b/core/media/editors/codemirror/addon/wrap/hardwrap.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){for(var d=c.paragraphStart||a.getHelper(b,"paragraphStart"),e=b.line,f=a.firstLine();e>f;--e){var g=a.getLine(e);if(d&&d.test(g))break;if(!/\S/.test(g)){++e;break}}for(var h=c.paragraphEnd||a.getHelper(b,"paragraphEnd"),i=b.line+1,j=a.lastLine();i<=j;++i){var g=a.getLine(i);if(h&&h.test(g)){++i;break}if(!/\S/.test(g))break}return{from:e,to:i}}function c(a,b,c,d){for(var e=b;e<a.length&&" "==a.charAt(e);)e++;for(;e>0&&!c.test(a.slice(e-1,e+1));--e);for(var f=!0;;f=!1){var g=e;if(d)for(;" "==a.charAt(g-1);)--g;if(0!=g||!f)return{from:g,to:e};e=b}}function d(b,d,f,g){d=b.clipPos(d),f=b.clipPos(f);var h=g.column||80,i=g.wrapOn||/\s\S|-[^\.\d]/,j=g.killTrailingSpace!==!1,k=[],l="",m=d.line,n=b.getRange(d,f,!1);if(!n.length)return null;for(var o=n[0].match(/^[ \t]*/)[0],p=0;p<n.length;++p){var q=n[p],r=l.length,s=0;l&&q&&!i.test(l.charAt(l.length-1)+q.charAt(0))&&(l+=" ",s=1);var t="";if(p&&(t=q.match(/^\s*/)[0],q=q.slice(t.length)),l+=q,p){var u=l.length>h&&o==t&&c(l,h,i,j);u&&u.from==r&&u.to==r+s?(l=o+q,++m):k.push({text:[s?" ":""],from:e(m,r),to:e(m+1,t.length)})}for(;l.length>h;){var v=c(l,h,i,j);k.push({text:["",o],from:e(m,v.from),to:e(m,v.to)}),l=o+l.slice(v.to),++m}}return k.length&&b.operation((function(){for(var c=0;c<k.length;++c){var d=k[c];(d.text||a.cmpPos(d.from,d.to))&&b.replaceRange(d.text,d.from,d.to)}})),k.length?{from:k[0].from,to:a.changeEnd(k[k.length-1])}:null}var e=a.Pos;a.defineExtension("wrapParagraph",(function(a,c){c=c||{},a||(a=this.getCursor());var f=b(this,a,c);return d(this,e(f.from,0),e(f.to-1),c)})),a.commands.wrapLines=function(a){a.operation((function(){for(var c=a.listSelections(),f=a.lastLine()+1,g=c.length-1;g>=0;g--){var h,i=c[g];if(i.empty()){var j=b(a,i.head,{});h={from:e(j.from,0),to:e(j.to-1)}}else h={from:i.from(),to:i.to()};h.to.line>=f||(f=h.from.line,d(a,h.from,h.to,{}))}}))},a.defineExtension("wrapRange",(function(a,b,c){return d(this,a,b,c||{})})),a.defineExtension("wrapParagraphsInRange",(function(a,c,f){f=f||{};for(var g=this,h=[],i=a.line;i<=c.line;){var j=b(g,e(i,0),f);h.push(j),i=j.to}var k=!1;return h.length&&g.operation((function(){for(var a=h.length-1;a>=0;--a)k=k||d(g,e(h[a].from,0),e(h[a].to-1),f)})),k}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/keymap/emacs.js b/core/media/editors/codemirror/keymap/emacs.js
new file mode 100644
index 00000000..f7c51b81
--- /dev/null
+++ b/core/media/editors/codemirror/keymap/emacs.js
@@ -0,0 +1,417 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
+
+  // Kill 'ring'
+
+  var killRing = [];
+  function addToRing(str) {
+    killRing.push(str);
+    if (killRing.length > 50) killRing.shift();
+  }
+  function growRingTop(str) {
+    if (!killRing.length) return addToRing(str);
+    killRing[killRing.length - 1] += str;
+  }
+  function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; }
+  function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
+
+  var lastKill = null;
+
+  function kill(cm, from, to, ring, text) {
+    if (text == null) text = cm.getRange(from, to);
+
+    if (ring == "grow" && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
+      growRingTop(text);
+    else if (ring !== false)
+      addToRing(text);
+    cm.replaceRange("", from, to, "+delete");
+
+    if (ring == "grow") lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
+    else lastKill = null;
+  }
+
+  // Boundaries of various units
+
+  function byChar(cm, pos, dir) {
+    return cm.findPosH(pos, dir, "char", true);
+  }
+
+  function byWord(cm, pos, dir) {
+    return cm.findPosH(pos, dir, "word", true);
+  }
+
+  function byLine(cm, pos, dir) {
+    return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn);
+  }
+
+  function byPage(cm, pos, dir) {
+    return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn);
+  }
+
+  function byParagraph(cm, pos, dir) {
+    var no = pos.line, line = cm.getLine(no);
+    var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
+    var fst = cm.firstLine(), lst = cm.lastLine();
+    for (;;) {
+      no += dir;
+      if (no < fst || no > lst)
+        return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null));
+      line = cm.getLine(no);
+      var hasText = /\S/.test(line);
+      if (hasText) sawText = true;
+      else if (sawText) return Pos(no, 0);
+    }
+  }
+
+  function bySentence(cm, pos, dir) {
+    var line = pos.line, ch = pos.ch;
+    var text = cm.getLine(pos.line), sawWord = false;
+    for (;;) {
+      var next = text.charAt(ch + (dir < 0 ? -1 : 0));
+      if (!next) { // End/beginning of line reached
+        if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch);
+        text = cm.getLine(line + dir);
+        if (!/\S/.test(text)) return Pos(line, ch);
+        line += dir;
+        ch = dir < 0 ? text.length : 0;
+        continue;
+      }
+      if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0));
+      if (!sawWord) sawWord = /\w/.test(next);
+      ch += dir;
+    }
+  }
+
+  function byExpr(cm, pos, dir) {
+    var wrap;
+    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, {strict: true}))
+        && wrap.match && (wrap.forward ? 1 : -1) == dir)
+      return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
+
+    for (var first = true;; first = false) {
+      var token = cm.getTokenAt(pos);
+      var after = Pos(pos.line, dir < 0 ? token.start : token.end);
+      if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) {
+        var newPos = cm.findPosH(after, dir, "char");
+        if (posEq(after, newPos)) return pos;
+        else pos = newPos;
+      } else {
+        return after;
+      }
+    }
+  }
+
+  // Prefixes (only crudely supported)
+
+  function getPrefix(cm, precise) {
+    var digits = cm.state.emacsPrefix;
+    if (!digits) return precise ? null : 1;
+    clearPrefix(cm);
+    return digits == "-" ? -1 : Number(digits);
+  }
+
+  function repeated(cmd) {
+    var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd;
+    return function(cm) {
+      var prefix = getPrefix(cm);
+      f(cm);
+      for (var i = 1; i < prefix; ++i) f(cm);
+    };
+  }
+
+  function findEnd(cm, pos, by, dir) {
+    var prefix = getPrefix(cm);
+    if (prefix < 0) { dir = -dir; prefix = -prefix; }
+    for (var i = 0; i < prefix; ++i) {
+      var newPos = by(cm, pos, dir);
+      if (posEq(newPos, pos)) break;
+      pos = newPos;
+    }
+    return pos;
+  }
+
+  function move(by, dir) {
+    var f = function(cm) {
+      cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir));
+    };
+    f.motion = true;
+    return f;
+  }
+
+  function killTo(cm, by, dir, ring) {
+    var selections = cm.listSelections(), cursor;
+    var i = selections.length;
+    while (i--) {
+      cursor = selections[i].head;
+      kill(cm, cursor, findEnd(cm, cursor, by, dir), ring);
+    }
+  }
+
+  function killRegion(cm, ring) {
+    if (cm.somethingSelected()) {
+      var selections = cm.listSelections(), selection;
+      var i = selections.length;
+      while (i--) {
+        selection = selections[i];
+        kill(cm, selection.anchor, selection.head, ring);
+      }
+      return true;
+    }
+  }
+
+  function addPrefix(cm, digit) {
+    if (cm.state.emacsPrefix) {
+      if (digit != "-") cm.state.emacsPrefix += digit;
+      return;
+    }
+    // Not active yet
+    cm.state.emacsPrefix = digit;
+    cm.on("keyHandled", maybeClearPrefix);
+    cm.on("inputRead", maybeDuplicateInput);
+  }
+
+  var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true};
+
+  function maybeClearPrefix(cm, arg) {
+    if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg))
+      clearPrefix(cm);
+  }
+
+  function clearPrefix(cm) {
+    cm.state.emacsPrefix = null;
+    cm.off("keyHandled", maybeClearPrefix);
+    cm.off("inputRead", maybeDuplicateInput);
+  }
+
+  function maybeDuplicateInput(cm, event) {
+    var dup = getPrefix(cm);
+    if (dup > 1 && event.origin == "+input") {
+      var one = event.text.join("\n"), txt = "";
+      for (var i = 1; i < dup; ++i) txt += one;
+      cm.replaceSelection(txt);
+    }
+  }
+
+  function addPrefixMap(cm) {
+    cm.state.emacsPrefixMap = true;
+    cm.addKeyMap(prefixMap);
+    cm.on("keyHandled", maybeRemovePrefixMap);
+    cm.on("inputRead", maybeRemovePrefixMap);
+  }
+
+  function maybeRemovePrefixMap(cm, arg) {
+    if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
+    cm.removeKeyMap(prefixMap);
+    cm.state.emacsPrefixMap = false;
+    cm.off("keyHandled", maybeRemovePrefixMap);
+    cm.off("inputRead", maybeRemovePrefixMap);
+  }
+
+  // Utilities
+
+  function setMark(cm) {
+    cm.setCursor(cm.getCursor());
+    cm.setExtending(!cm.getExtending());
+    cm.on("change", function() { cm.setExtending(false); });
+  }
+
+  function clearMark(cm) {
+    cm.setExtending(false);
+    cm.setCursor(cm.getCursor());
+  }
+
+  function getInput(cm, msg, f) {
+    if (cm.openDialog)
+      cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true});
+    else
+      f(prompt(msg, ""));
+  }
+
+  function operateOnWord(cm, op) {
+    var start = cm.getCursor(), end = cm.findPosH(start, 1, "word");
+    cm.replaceRange(op(cm.getRange(start, end)), start, end);
+    cm.setCursor(end);
+  }
+
+  function toEnclosingExpr(cm) {
+    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
+    var stack = [];
+    while (line >= cm.firstLine()) {
+      var text = cm.getLine(line);
+      for (var i = ch == null ? text.length : ch; i > 0;) {
+        var ch = text.charAt(--i);
+        if (ch == ")")
+          stack.push("(");
+        else if (ch == "]")
+          stack.push("[");
+        else if (ch == "}")
+          stack.push("{");
+        else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch))
+          return cm.extendSelection(Pos(line, i));
+      }
+      --line; ch = null;
+    }
+  }
+
+  function quit(cm) {
+    cm.execCommand("clearSearch");
+    clearMark(cm);
+  }
+
+  CodeMirror.emacs = {kill: kill, killRegion: killRegion, repeated: repeated};
+
+  // Actual keymap
+
+  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
+    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"), true);},
+    "Ctrl-K": repeated(function(cm) {
+      var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
+      var text = cm.getRange(start, end);
+      if (!/\S/.test(text)) {
+        text += "\n";
+        end = Pos(start.line + 1, 0);
+      }
+      kill(cm, start, end, "grow", text);
+    }),
+    "Alt-W": function(cm) {
+      addToRing(cm.getSelection());
+      clearMark(cm);
+    },
+    "Ctrl-Y": function(cm) {
+      var start = cm.getCursor();
+      cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
+      cm.setSelection(start, cm.getCursor());
+    },
+    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
+
+    "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
+
+    "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
+    "Right": move(byChar, 1), "Left": move(byChar, -1),
+    "Ctrl-D": function(cm) { killTo(cm, byChar, 1, false); },
+    "Delete": function(cm) { killRegion(cm, false) || killTo(cm, byChar, 1, false); },
+    "Ctrl-H": function(cm) { killTo(cm, byChar, -1, false); },
+    "Backspace": function(cm) { killRegion(cm, false) || killTo(cm, byChar, -1, false); },
+
+    "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
+    "Alt-Right": move(byWord, 1), "Alt-Left": move(byWord, -1),
+    "Alt-D": function(cm) { killTo(cm, byWord, 1, "grow"); },
+    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1, "grow"); },
+
+    "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
+    "Down": move(byLine, 1), "Up": move(byLine, -1),
+    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+    "End": "goLineEnd", "Home": "goLineStart",
+
+    "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
+    "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
+
+    "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
+
+    "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
+    "Alt-K": function(cm) { killTo(cm, bySentence, 1, "grow"); },
+
+    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1, "grow"); },
+    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1, "grow"); },
+    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1, "grow"),
+
+    "Shift-Ctrl-Alt-2": function(cm) {
+      var cursor = cm.getCursor();
+      cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
+    },
+    "Ctrl-Alt-T": function(cm) {
+      var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
+      var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
+      cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
+                      cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
+    },
+    "Ctrl-Alt-U": repeated(toEnclosingExpr),
+
+    "Alt-Space": function(cm) {
+      var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
+      while (from && /\s/.test(text.charAt(from - 1))) --from;
+      while (to < text.length && /\s/.test(text.charAt(to))) ++to;
+      cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
+    },
+    "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
+    "Ctrl-T": repeated(function(cm) {
+      cm.execCommand("transposeChars");
+    }),
+
+    "Alt-C": repeated(function(cm) {
+      operateOnWord(cm, function(w) {
+        var letter = w.search(/\w/);
+        if (letter == -1) return w;
+        return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
+      });
+    }),
+    "Alt-U": repeated(function(cm) {
+      operateOnWord(cm, function(w) { return w.toUpperCase(); });
+    }),
+    "Alt-L": repeated(function(cm) {
+      operateOnWord(cm, function(w) { return w.toLowerCase(); });
+    }),
+
+    "Alt-;": "toggleComment",
+
+    "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
+    "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
+    "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
+    "Ctrl-S": "findPersistentNext", "Ctrl-R": "findPersistentPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
+    "Alt-/": "autocomplete",
+    "Enter": "newlineAndIndent",
+    "Ctrl-J": repeated(function(cm) { cm.replaceSelection("\n", "end"); }),
+    "Tab": "indentAuto",
+
+    "Alt-G G": function(cm) {
+      var prefix = getPrefix(cm, true);
+      if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
+
+      getInput(cm, "Goto line", function(str) {
+        var num;
+        if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
+          cm.setCursor(num - 1);
+      });
+    },
+
+    "Ctrl-X Tab": function(cm) {
+      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+    },
+    "Ctrl-X Ctrl-X": function(cm) {
+      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+    },
+    "Ctrl-X Ctrl-S": "save",
+    "Ctrl-X Ctrl-W": "save",
+    "Ctrl-X S": "saveAll",
+    "Ctrl-X F": "open",
+    "Ctrl-X U": repeated("undo"),
+    "Ctrl-X K": "close",
+    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), "grow"); },
+    "Ctrl-X H": "selectAll",
+
+    "Ctrl-Q Tab": repeated("insertTab"),
+    "Ctrl-U": addPrefixMap
+  });
+
+  var prefixMap = {"Ctrl-G": clearPrefix};
+  function regPrefix(d) {
+    prefixMap[d] = function(cm) { addPrefix(cm, d); };
+    keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); };
+    prefixPreservingKeys["Ctrl-" + d] = true;
+  }
+  for (var i = 0; i < 10; ++i) regPrefix(String(i));
+  regPrefix("-");
+});
diff --git a/core/media/editors/codemirror/keymap/emacs.min.js b/core/media/editors/codemirror/keymap/emacs.min.js
new file mode 100644
index 00000000..9fb411f3
--- /dev/null
+++ b/core/media/editors/codemirror/keymap/emacs.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line==b.line&&a.ch==b.ch}function c(a){I.push(a),I.length>50&&I.shift()}function d(a){return I.length?void(I[I.length-1]+=a):c(a)}function e(a){return I[I.length-(a?Math.min(a,1):1)]||""}function f(){return I.length>1&&I.pop(),e()}function g(a,e,f,g,h){null==h&&(h=a.getRange(e,f)),"grow"==g&&J&&J.cm==a&&b(e,J.pos)&&a.isClean(J.gen)?d(h):g!==!1&&c(h),a.replaceRange("",e,f,"+delete"),J="grow"==g?{cm:a,pos:e,gen:a.changeGeneration()}:null}function h(a,b,c){return a.findPosH(b,c,"char",!0)}function i(a,b,c){return a.findPosH(b,c,"word",!0)}function j(a,b,c){return a.findPosV(b,c,"line",a.doc.sel.goalColumn)}function k(a,b,c){return a.findPosV(b,c,"page",a.doc.sel.goalColumn)}function l(a,b,c){for(var d=b.line,e=a.getLine(d),f=/\S/.test(c<0?e.slice(0,b.ch):e.slice(b.ch)),g=a.firstLine(),h=a.lastLine();;){if(d+=c,d<g||d>h)return a.clipPos(H(d-c,c<0?0:null));e=a.getLine(d);var i=/\S/.test(e);if(i)f=!0;else if(f)return H(d,0)}}function m(a,b,c){for(var d=b.line,e=b.ch,f=a.getLine(b.line),g=!1;;){var h=f.charAt(e+(c<0?-1:0));if(h){if(g&&/[!?.]/.test(h))return H(d,e+(c>0?1:0));g||(g=/\w/.test(h)),e+=c}else{if(d==(c<0?a.firstLine():a.lastLine()))return H(d,e);if(f=a.getLine(d+c),!/\S/.test(f))return H(d,e);d+=c,e=c<0?f.length:0}}}function n(a,c,d){var e;if(a.findMatchingBracket&&(e=a.findMatchingBracket(c,{strict:!0}))&&e.match&&(e.forward?1:-1)==d)return d>0?H(e.to.line,e.to.ch+1):e.to;for(var f=!0;;f=!1){var g=a.getTokenAt(c),h=H(c.line,d<0?g.start:g.end);if(!(f&&d>0&&g.end==c.ch)&&/\w/.test(g.string))return h;var i=a.findPosH(h,d,"char");if(b(h,i))return c;c=i}}function o(a,b){var c=a.state.emacsPrefix;return c?(w(a),"-"==c?-1:Number(c)):b?null:1}function p(a){var b="string"==typeof a?function(b){b.execCommand(a)}:a;return function(a){var c=o(a);b(a);for(var d=1;d<c;++d)b(a)}}function q(a,c,d,e){var f=o(a);f<0&&(e=-e,f=-f);for(var g=0;g<f;++g){var h=d(a,c,e);if(b(h,c))break;c=h}return c}function r(a,b){var c=function(c){c.extendSelection(q(c,c.getCursor(),a,b))};return c.motion=!0,c}function s(a,b,c,d){for(var e,f=a.listSelections(),h=f.length;h--;)e=f[h].head,g(a,e,q(a,e,b,c),d)}function t(a,b){if(a.somethingSelected()){for(var c,d=a.listSelections(),e=d.length;e--;)c=d[e],g(a,c.anchor,c.head,b);return!0}}function u(a,b){return a.state.emacsPrefix?void("-"!=b&&(a.state.emacsPrefix+=b)):(a.state.emacsPrefix=b,a.on("keyHandled",v),void a.on("inputRead",x))}function v(a,b){a.state.emacsPrefixMap||K.hasOwnProperty(b)||w(a)}function w(a){a.state.emacsPrefix=null,a.off("keyHandled",v),a.off("inputRead",x)}function x(a,b){var c=o(a);if(c>1&&"+input"==b.origin){for(var d=b.text.join("\n"),e="",f=1;f<c;++f)e+=d;a.replaceSelection(e)}}function y(a){a.state.emacsPrefixMap=!0,a.addKeyMap(M),a.on("keyHandled",z),a.on("inputRead",z)}function z(a,b){("string"!=typeof b||!/^\d$/.test(b)&&"Ctrl-U"!=b)&&(a.removeKeyMap(M),a.state.emacsPrefixMap=!1,a.off("keyHandled",z),a.off("inputRead",z))}function A(a){a.setCursor(a.getCursor()),a.setExtending(!a.getExtending()),a.on("change",(function(){a.setExtending(!1)}))}function B(a){a.setExtending(!1),a.setCursor(a.getCursor())}function C(a,b,c){a.openDialog?a.openDialog(b+': <input type="text" style="width: 10em"/>',c,{bottom:!0}):c(prompt(b,""))}function D(a,b){var c=a.getCursor(),d=a.findPosH(c,1,"word");a.replaceRange(b(a.getRange(c,d)),c,d),a.setCursor(d)}function E(a){for(var b=a.getCursor(),c=b.line,d=b.ch,e=[];c>=a.firstLine();){for(var f=a.getLine(c),g=null==d?f.length:d;g>0;){var d=f.charAt(--g);if(")"==d)e.push("(");else if("]"==d)e.push("[");else if("}"==d)e.push("{");else if(/[\(\{\[]/.test(d)&&(!e.length||e.pop()!=d))return a.extendSelection(H(c,g))}--c,d=null}}function F(a){a.execCommand("clearSearch"),B(a)}function G(a){M[a]=function(b){u(b,a)},L["Ctrl-"+a]=function(b){u(b,a)},K["Ctrl-"+a]=!0}var H=a.Pos,I=[],J=null,K={"Alt-G":!0,"Ctrl-X":!0,"Ctrl-Q":!0,"Ctrl-U":!0};a.emacs={kill:g,killRegion:t,repeated:p};for(var L=a.keyMap.emacs=a.normalizeKeyMap({"Ctrl-W":function(a){g(a,a.getCursor("start"),a.getCursor("end"),!0)},"Ctrl-K":p((function(a){var b=a.getCursor(),c=a.clipPos(H(b.line)),d=a.getRange(b,c);/\S/.test(d)||(d+="\n",c=H(b.line+1,0)),g(a,b,c,"grow",d)})),"Alt-W":function(a){c(a.getSelection()),B(a)},"Ctrl-Y":function(a){var b=a.getCursor();a.replaceRange(e(o(a)),b,b,"paste"),a.setSelection(b,a.getCursor())},"Alt-Y":function(a){a.replaceSelection(f(),"around","paste")},"Ctrl-Space":A,"Ctrl-Shift-2":A,"Ctrl-F":r(h,1),"Ctrl-B":r(h,-1),Right:r(h,1),Left:r(h,-1),"Ctrl-D":function(a){s(a,h,1,!1)},Delete:function(a){t(a,!1)||s(a,h,1,!1)},"Ctrl-H":function(a){s(a,h,-1,!1)},Backspace:function(a){t(a,!1)||s(a,h,-1,!1)},"Alt-F":r(i,1),"Alt-B":r(i,-1),"Alt-Right":r(i,1),"Alt-Left":r(i,-1),"Alt-D":function(a){s(a,i,1,"grow")},"Alt-Backspace":function(a){s(a,i,-1,"grow")},"Ctrl-N":r(j,1),"Ctrl-P":r(j,-1),Down:r(j,1),Up:r(j,-1),"Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd",End:"goLineEnd",Home:"goLineStart","Alt-V":r(k,-1),"Ctrl-V":r(k,1),PageUp:r(k,-1),PageDown:r(k,1),"Ctrl-Up":r(l,-1),"Ctrl-Down":r(l,1),"Alt-A":r(m,-1),"Alt-E":r(m,1),"Alt-K":function(a){s(a,m,1,"grow")},"Ctrl-Alt-K":function(a){s(a,n,1,"grow")},"Ctrl-Alt-Backspace":function(a){s(a,n,-1,"grow")},"Ctrl-Alt-F":r(n,1),"Ctrl-Alt-B":r(n,-1,"grow"),"Shift-Ctrl-Alt-2":function(a){var b=a.getCursor();a.setSelection(q(a,b,n,1),b)},"Ctrl-Alt-T":function(a){var b=n(a,a.getCursor(),-1),c=n(a,b,1),d=n(a,c,1),e=n(a,d,-1);a.replaceRange(a.getRange(e,d)+a.getRange(c,e)+a.getRange(b,c),b,d)},"Ctrl-Alt-U":p(E),"Alt-Space":function(a){for(var b=a.getCursor(),c=b.ch,d=b.ch,e=a.getLine(b.line);c&&/\s/.test(e.charAt(c-1));)--c;for(;d<e.length&&/\s/.test(e.charAt(d));)++d;a.replaceRange(" ",H(b.line,c),H(b.line,d))},"Ctrl-O":p((function(a){a.replaceSelection("\n","start")})),"Ctrl-T":p((function(a){a.execCommand("transposeChars")})),"Alt-C":p((function(a){D(a,(function(a){var b=a.search(/\w/);return b==-1?a:a.slice(0,b)+a.charAt(b).toUpperCase()+a.slice(b+1).toLowerCase()}))})),"Alt-U":p((function(a){D(a,(function(a){return a.toUpperCase()}))})),"Alt-L":p((function(a){D(a,(function(a){return a.toLowerCase()}))})),"Alt-;":"toggleComment","Ctrl-/":p("undo"),"Shift-Ctrl--":p("undo"),"Ctrl-Z":p("undo"),"Cmd-Z":p("undo"),"Shift-Alt-,":"goDocStart","Shift-Alt-.":"goDocEnd","Ctrl-S":"findPersistentNext","Ctrl-R":"findPersistentPrev","Ctrl-G":F,"Shift-Alt-5":"replace","Alt-/":"autocomplete",Enter:"newlineAndIndent","Ctrl-J":p((function(a){a.replaceSelection("\n","end")})),Tab:"indentAuto","Alt-G G":function(a){var b=o(a,!0);return null!=b&&b>0?a.setCursor(b-1):void C(a,"Goto line",(function(b){var c;b&&!isNaN(c=Number(b))&&c==(0|c)&&c>0&&a.setCursor(c-1)}))},"Ctrl-X Tab":function(a){a.indentSelection(o(a,!0)||a.getOption("indentUnit"))},"Ctrl-X Ctrl-X":function(a){a.setSelection(a.getCursor("head"),a.getCursor("anchor"))},"Ctrl-X Ctrl-S":"save","Ctrl-X Ctrl-W":"save","Ctrl-X S":"saveAll","Ctrl-X F":"open","Ctrl-X U":p("undo"),"Ctrl-X K":"close","Ctrl-X Delete":function(a){g(a,a.getCursor(),m(a,a.getCursor(),1),"grow")},"Ctrl-X H":"selectAll","Ctrl-Q Tab":p("insertTab"),"Ctrl-U":y}),M={"Ctrl-G":w},N=0;N<10;++N)G(String(N));G("-")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/keymap/sublime.js b/core/media/editors/codemirror/keymap/sublime.js
new file mode 100644
index 00000000..aa9b65e3
--- /dev/null
+++ b/core/media/editors/codemirror/keymap/sublime.js
@@ -0,0 +1,691 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// A rough approximation of Sublime Text's keybindings
+// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var cmds = CodeMirror.commands;
+  var Pos = CodeMirror.Pos;
+
+  // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
+  function findPosSubword(doc, start, dir) {
+    if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
+    var line = doc.getLine(start.line);
+    if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
+    var state = "start", type;
+    for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
+      var next = line.charAt(dir < 0 ? pos - 1 : pos);
+      var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
+      if (cat == "w" && next.toUpperCase() == next) cat = "W";
+      if (state == "start") {
+        if (cat != "o") { state = "in"; type = cat; }
+      } else if (state == "in") {
+        if (type != cat) {
+          if (type == "w" && cat == "W" && dir < 0) pos--;
+          if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
+          break;
+        }
+      }
+    }
+    return Pos(start.line, pos);
+  }
+
+  function moveSubword(cm, dir) {
+    cm.extendSelectionsBy(function(range) {
+      if (cm.display.shift || cm.doc.extend || range.empty())
+        return findPosSubword(cm.doc, range.head, dir);
+      else
+        return dir < 0 ? range.from() : range.to();
+    });
+  }
+
+  cmds.goSubwordLeft = function(cm) { moveSubword(cm, -1); };
+  cmds.goSubwordRight = function(cm) { moveSubword(cm, 1); };
+
+  cmds.scrollLineUp = function(cm) {
+    var info = cm.getScrollInfo();
+    if (!cm.somethingSelected()) {
+      var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
+      if (cm.getCursor().line >= visibleBottomLine)
+        cm.execCommand("goLineUp");
+    }
+    cm.scrollTo(null, info.top - cm.defaultTextHeight());
+  };
+  cmds.scrollLineDown = function(cm) {
+    var info = cm.getScrollInfo();
+    if (!cm.somethingSelected()) {
+      var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
+      if (cm.getCursor().line <= visibleTopLine)
+        cm.execCommand("goLineDown");
+    }
+    cm.scrollTo(null, info.top + cm.defaultTextHeight());
+  };
+
+  cmds.splitSelectionByLine = function(cm) {
+    var ranges = cm.listSelections(), lineRanges = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      for (var line = from.line; line <= to.line; ++line)
+        if (!(to.line > from.line && line == to.line && to.ch == 0))
+          lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
+                           head: line == to.line ? to : Pos(line)});
+    }
+    cm.setSelections(lineRanges, 0);
+  };
+
+  cmds.singleSelectionTop = function(cm) {
+    var range = cm.listSelections()[0];
+    cm.setSelection(range.anchor, range.head, {scroll: false});
+  };
+
+  cmds.selectLine = function(cm) {
+    var ranges = cm.listSelections(), extended = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      extended.push({anchor: Pos(range.from().line, 0),
+                     head: Pos(range.to().line + 1, 0)});
+    }
+    cm.setSelections(extended);
+  };
+
+  function insertLine(cm, above) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    cm.operation(function() {
+      var len = cm.listSelections().length, newSelection = [], last = -1;
+      for (var i = 0; i < len; i++) {
+        var head = cm.listSelections()[i].head;
+        if (head.line <= last) continue;
+        var at = Pos(head.line + (above ? 0 : 1), 0);
+        cm.replaceRange("\n", at, null, "+insertLine");
+        cm.indentLine(at.line, null, true);
+        newSelection.push({head: at, anchor: at});
+        last = head.line + 1;
+      }
+      cm.setSelections(newSelection);
+    });
+    cm.execCommand("indentAuto");
+  }
+
+  cmds.insertLineAfter = function(cm) { return insertLine(cm, false); };
+
+  cmds.insertLineBefore = function(cm) { return insertLine(cm, true); };
+
+  function wordAt(cm, pos) {
+    var start = pos.ch, end = start, line = cm.getLine(pos.line);
+    while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
+    while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
+    return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)};
+  }
+
+  cmds.selectNextOccurrence = function(cm) {
+    var from = cm.getCursor("from"), to = cm.getCursor("to");
+    var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel;
+    if (CodeMirror.cmpPos(from, to) == 0) {
+      var word = wordAt(cm, from);
+      if (!word.word) return;
+      cm.setSelection(word.from, word.to);
+      fullWord = true;
+    } else {
+      var text = cm.getRange(from, to);
+      var query = fullWord ? new RegExp("\\b" + text + "\\b") : text;
+      var cur = cm.getSearchCursor(query, to);
+      var found = cur.findNext();
+      if (!found) {
+        cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
+        found = cur.findNext();
+      }
+      if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to()))
+        return CodeMirror.Pass
+      cm.addSelection(cur.from(), cur.to());
+    }
+    if (fullWord)
+      cm.state.sublimeFindFullWord = cm.doc.sel;
+  };
+
+  function addCursorToSelection(cm, dir) {
+    var ranges = cm.listSelections(), newRanges = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      var newAnchor = cm.findPosV(
+          range.anchor, dir, "line", range.anchor.goalColumn);
+      var newHead = cm.findPosV(
+          range.head, dir, "line", range.head.goalColumn);
+      newAnchor.goalColumn = range.anchor.goalColumn != null ?
+          range.anchor.goalColumn : cm.cursorCoords(range.anchor, "div").left;
+      newHead.goalColumn = range.head.goalColumn != null ?
+          range.head.goalColumn : cm.cursorCoords(range.head, "div").left;
+      var newRange = {anchor: newAnchor, head: newHead};
+      newRanges.push(range);
+      newRanges.push(newRange);
+    }
+    cm.setSelections(newRanges);
+  }
+  cmds.addCursorToPrevLine = function(cm) { addCursorToSelection(cm, -1); };
+  cmds.addCursorToNextLine = function(cm) { addCursorToSelection(cm, 1); };
+
+  function isSelectedRange(ranges, from, to) {
+    for (var i = 0; i < ranges.length; i++)
+      if (ranges[i].from() == from && ranges[i].to() == to) return true
+    return false
+  }
+
+  var mirror = "(){}[]";
+  function selectBetweenBrackets(cm) {
+    var ranges = cm.listSelections(), newRanges = []
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], pos = range.head, opening = cm.scanForBracket(pos, -1);
+      if (!opening) return false;
+      for (;;) {
+        var closing = cm.scanForBracket(pos, 1);
+        if (!closing) return false;
+        if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
+          var startPos = Pos(opening.pos.line, opening.pos.ch + 1);
+          if (CodeMirror.cmpPos(startPos, range.from()) == 0 &&
+              CodeMirror.cmpPos(closing.pos, range.to()) == 0) {
+            opening = cm.scanForBracket(opening.pos, -1);
+            if (!opening) return false;
+          } else {
+            newRanges.push({anchor: startPos, head: closing.pos});
+            break;
+          }
+        }
+        pos = Pos(closing.pos.line, closing.pos.ch + 1);
+      }
+    }
+    cm.setSelections(newRanges);
+    return true;
+  }
+
+  cmds.selectScope = function(cm) {
+    selectBetweenBrackets(cm) || cm.execCommand("selectAll");
+  };
+  cmds.selectBetweenBrackets = function(cm) {
+    if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
+  };
+
+  cmds.goToBracket = function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      var next = cm.scanForBracket(range.head, 1);
+      if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
+      var prev = cm.scanForBracket(range.head, -1);
+      return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
+    });
+  };
+
+  cmds.swapLineUp = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], from = range.from().line - 1, to = range.to().line;
+      newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch),
+                    head: Pos(range.head.line - 1, range.head.ch)});
+      if (range.to().ch == 0 && !range.empty()) --to;
+      if (from > at) linesToMove.push(from, to);
+      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
+      at = to;
+    }
+    cm.operation(function() {
+      for (var i = 0; i < linesToMove.length; i += 2) {
+        var from = linesToMove[i], to = linesToMove[i + 1];
+        var line = cm.getLine(from);
+        cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
+        if (to > cm.lastLine())
+          cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
+        else
+          cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
+      }
+      cm.setSelections(newSels);
+      cm.scrollIntoView();
+    });
+  };
+
+  cmds.swapLineDown = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var range = ranges[i], from = range.to().line + 1, to = range.from().line;
+      if (range.to().ch == 0 && !range.empty()) from--;
+      if (from < at) linesToMove.push(from, to);
+      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
+      at = to;
+    }
+    cm.operation(function() {
+      for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
+        var from = linesToMove[i], to = linesToMove[i + 1];
+        var line = cm.getLine(from);
+        if (from == cm.lastLine())
+          cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine");
+        else
+          cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
+        cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
+      }
+      cm.scrollIntoView();
+    });
+  };
+
+  cmds.toggleCommentIndented = function(cm) {
+    cm.toggleComment({ indent: true });
+  }
+
+  cmds.joinLines = function(cm) {
+    var ranges = cm.listSelections(), joined = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], from = range.from();
+      var start = from.line, end = range.to().line;
+      while (i < ranges.length - 1 && ranges[i + 1].from().line == end)
+        end = ranges[++i].to().line;
+      joined.push({start: start, end: end, anchor: !range.empty() && from});
+    }
+    cm.operation(function() {
+      var offset = 0, ranges = [];
+      for (var i = 0; i < joined.length; i++) {
+        var obj = joined[i];
+        var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), head;
+        for (var line = obj.start; line <= obj.end; line++) {
+          var actual = line - offset;
+          if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1);
+          if (actual < cm.lastLine()) {
+            cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length));
+            ++offset;
+          }
+        }
+        ranges.push({anchor: anchor || head, head: head});
+      }
+      cm.setSelections(ranges, 0);
+    });
+  };
+
+  cmds.duplicateLine = function(cm) {
+    cm.operation(function() {
+      var rangeCount = cm.listSelections().length;
+      for (var i = 0; i < rangeCount; i++) {
+        var range = cm.listSelections()[i];
+        if (range.empty())
+          cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));
+        else
+          cm.replaceRange(cm.getRange(range.from(), range.to()), range.from());
+      }
+      cm.scrollIntoView();
+    });
+  };
+
+
+  function sortLines(cm, caseSensitive) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), toSort = [], selected;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      if (range.empty()) continue;
+      var from = range.from().line, to = range.to().line;
+      while (i < ranges.length - 1 && ranges[i + 1].from().line == to)
+        to = ranges[++i].to().line;
+      if (!ranges[i].to().ch) to--;
+      toSort.push(from, to);
+    }
+    if (toSort.length) selected = true;
+    else toSort.push(cm.firstLine(), cm.lastLine());
+
+    cm.operation(function() {
+      var ranges = [];
+      for (var i = 0; i < toSort.length; i += 2) {
+        var from = toSort[i], to = toSort[i + 1];
+        var start = Pos(from, 0), end = Pos(to);
+        var lines = cm.getRange(start, end, false);
+        if (caseSensitive)
+          lines.sort();
+        else
+          lines.sort(function(a, b) {
+            var au = a.toUpperCase(), bu = b.toUpperCase();
+            if (au != bu) { a = au; b = bu; }
+            return a < b ? -1 : a == b ? 0 : 1;
+          });
+        cm.replaceRange(lines, start, end);
+        if (selected) ranges.push({anchor: start, head: Pos(to + 1, 0)});
+      }
+      if (selected) cm.setSelections(ranges, 0);
+    });
+  }
+
+  cmds.sortLines = function(cm) { sortLines(cm, true); };
+  cmds.sortLinesInsensitive = function(cm) { sortLines(cm, false); };
+
+  cmds.nextBookmark = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) while (marks.length) {
+      var current = marks.shift();
+      var found = current.find();
+      if (found) {
+        marks.push(current);
+        return cm.setSelection(found.from, found.to);
+      }
+    }
+  };
+
+  cmds.prevBookmark = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) while (marks.length) {
+      marks.unshift(marks.pop());
+      var found = marks[marks.length - 1].find();
+      if (!found)
+        marks.pop();
+      else
+        return cm.setSelection(found.from, found.to);
+    }
+  };
+
+  cmds.toggleBookmark = function(cm) {
+    var ranges = cm.listSelections();
+    var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
+    for (var i = 0; i < ranges.length; i++) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      var found = ranges[i].empty() ? cm.findMarksAt(from) : cm.findMarks(from, to);
+      for (var j = 0; j < found.length; j++) {
+        if (found[j].sublimeBookmark) {
+          found[j].clear();
+          for (var k = 0; k < marks.length; k++)
+            if (marks[k] == found[j])
+              marks.splice(k--, 1);
+          break;
+        }
+      }
+      if (j == found.length)
+        marks.push(cm.markText(from, to, {sublimeBookmark: true, clearWhenEmpty: false}));
+    }
+  };
+
+  cmds.clearBookmarks = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
+    marks.length = 0;
+  };
+
+  cmds.selectBookmarks = function(cm) {
+    var marks = cm.state.sublimeBookmarks, ranges = [];
+    if (marks) for (var i = 0; i < marks.length; i++) {
+      var found = marks[i].find();
+      if (!found)
+        marks.splice(i--, 0);
+      else
+        ranges.push({anchor: found.from, head: found.to});
+    }
+    if (ranges.length)
+      cm.setSelections(ranges, 0);
+  };
+
+  function modifyWordOrSelection(cm, mod) {
+    cm.operation(function() {
+      var ranges = cm.listSelections(), indices = [], replacements = [];
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.empty()) { indices.push(i); replacements.push(""); }
+        else replacements.push(mod(cm.getRange(range.from(), range.to())));
+      }
+      cm.replaceSelections(replacements, "around", "case");
+      for (var i = indices.length - 1, at; i >= 0; i--) {
+        var range = ranges[indices[i]];
+        if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
+        var word = wordAt(cm, range.head);
+        at = word.from;
+        cm.replaceRange(mod(word.word), word.from, word.to);
+      }
+    });
+  }
+
+  cmds.smartBackspace = function(cm) {
+    if (cm.somethingSelected()) return CodeMirror.Pass;
+
+    cm.operation(function() {
+      var cursors = cm.listSelections();
+      var indentUnit = cm.getOption("indentUnit");
+
+      for (var i = cursors.length - 1; i >= 0; i--) {
+        var cursor = cursors[i].head;
+        var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
+        var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
+
+        // Delete by one character by default
+        var deletePos = cm.findPosH(cursor, -1, "char", false);
+
+        if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
+          var prevIndent = new Pos(cursor.line,
+            CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
+
+          // Smart delete only if we found a valid prevIndent location
+          if (prevIndent.ch != cursor.ch) deletePos = prevIndent;
+        }
+
+        cm.replaceRange("", deletePos, cursor, "+delete");
+      }
+    });
+  };
+
+  cmds.delLineRight = function(cm) {
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete");
+      cm.scrollIntoView();
+    });
+  };
+
+  cmds.upcaseAtCursor = function(cm) {
+    modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
+  };
+  cmds.downcaseAtCursor = function(cm) {
+    modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
+  };
+
+  cmds.setSublimeMark = function(cm) {
+    if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
+    cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
+  };
+  cmds.selectToSublimeMark = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) cm.setSelection(cm.getCursor(), found);
+  };
+  cmds.deleteToSublimeMark = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) {
+      var from = cm.getCursor(), to = found;
+      if (CodeMirror.cmpPos(from, to) > 0) { var tmp = to; to = from; from = tmp; }
+      cm.state.sublimeKilled = cm.getRange(from, to);
+      cm.replaceRange("", from, to);
+    }
+  };
+  cmds.swapWithSublimeMark = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) {
+      cm.state.sublimeMark.clear();
+      cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
+      cm.setCursor(found);
+    }
+  };
+  cmds.sublimeYank = function(cm) {
+    if (cm.state.sublimeKilled != null)
+      cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
+  };
+
+  cmds.showInCenter = function(cm) {
+    var pos = cm.cursorCoords(null, "local");
+    cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
+  };
+
+  function getTarget(cm) {
+    var from = cm.getCursor("from"), to = cm.getCursor("to");
+    if (CodeMirror.cmpPos(from, to) == 0) {
+      var word = wordAt(cm, from);
+      if (!word.word) return;
+      from = word.from;
+      to = word.to;
+    }
+    return {from: from, to: to, query: cm.getRange(from, to), word: word};
+  }
+
+  function findAndGoTo(cm, forward) {
+    var target = getTarget(cm);
+    if (!target) return;
+    var query = target.query;
+    var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
+
+    if (forward ? cur.findNext() : cur.findPrevious()) {
+      cm.setSelection(cur.from(), cur.to());
+    } else {
+      cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0)
+                                              : cm.clipPos(Pos(cm.lastLine())));
+      if (forward ? cur.findNext() : cur.findPrevious())
+        cm.setSelection(cur.from(), cur.to());
+      else if (target.word)
+        cm.setSelection(target.from, target.to);
+    }
+  };
+  cmds.findUnder = function(cm) { findAndGoTo(cm, true); };
+  cmds.findUnderPrevious = function(cm) { findAndGoTo(cm,false); };
+  cmds.findAllUnder = function(cm) {
+    var target = getTarget(cm);
+    if (!target) return;
+    var cur = cm.getSearchCursor(target.query);
+    var matches = [];
+    var primaryIndex = -1;
+    while (cur.findNext()) {
+      matches.push({anchor: cur.from(), head: cur.to()});
+      if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch)
+        primaryIndex++;
+    }
+    cm.setSelections(matches, primaryIndex);
+  };
+
+
+  var keyMap = CodeMirror.keyMap;
+  keyMap.macSublime = {
+    "Cmd-Left": "goLineStartSmart",
+    "Shift-Tab": "indentLess",
+    "Shift-Ctrl-K": "deleteLine",
+    "Alt-Q": "wrapLines",
+    "Ctrl-Left": "goSubwordLeft",
+    "Ctrl-Right": "goSubwordRight",
+    "Ctrl-Alt-Up": "scrollLineUp",
+    "Ctrl-Alt-Down": "scrollLineDown",
+    "Cmd-L": "selectLine",
+    "Shift-Cmd-L": "splitSelectionByLine",
+    "Esc": "singleSelectionTop",
+    "Cmd-Enter": "insertLineAfter",
+    "Shift-Cmd-Enter": "insertLineBefore",
+    "Cmd-D": "selectNextOccurrence",
+    "Shift-Cmd-Space": "selectScope",
+    "Shift-Cmd-M": "selectBetweenBrackets",
+    "Cmd-M": "goToBracket",
+    "Cmd-Ctrl-Up": "swapLineUp",
+    "Cmd-Ctrl-Down": "swapLineDown",
+    "Cmd-/": "toggleCommentIndented",
+    "Cmd-J": "joinLines",
+    "Shift-Cmd-D": "duplicateLine",
+    "F9": "sortLines",
+    "Cmd-F9": "sortLinesInsensitive",
+    "F2": "nextBookmark",
+    "Shift-F2": "prevBookmark",
+    "Cmd-F2": "toggleBookmark",
+    "Shift-Cmd-F2": "clearBookmarks",
+    "Alt-F2": "selectBookmarks",
+    "Backspace": "smartBackspace",
+    "Cmd-K Cmd-K": "delLineRight",
+    "Cmd-K Cmd-U": "upcaseAtCursor",
+    "Cmd-K Cmd-L": "downcaseAtCursor",
+    "Cmd-K Cmd-Space": "setSublimeMark",
+    "Cmd-K Cmd-A": "selectToSublimeMark",
+    "Cmd-K Cmd-W": "deleteToSublimeMark",
+    "Cmd-K Cmd-X": "swapWithSublimeMark",
+    "Cmd-K Cmd-Y": "sublimeYank",
+    "Cmd-K Cmd-C": "showInCenter",
+    "Cmd-K Cmd-G": "clearBookmarks",
+    "Cmd-K Cmd-Backspace": "delLineLeft",
+    "Cmd-K Cmd-0": "unfoldAll",
+    "Cmd-K Cmd-J": "unfoldAll",
+    "Ctrl-Shift-Up": "addCursorToPrevLine",
+    "Ctrl-Shift-Down": "addCursorToNextLine",
+    "Cmd-F3": "findUnder",
+    "Shift-Cmd-F3": "findUnderPrevious",
+    "Alt-F3": "findAllUnder",
+    "Shift-Cmd-[": "fold",
+    "Shift-Cmd-]": "unfold",
+    "Cmd-I": "findIncremental",
+    "Shift-Cmd-I": "findIncrementalReverse",
+    "Cmd-H": "replace",
+    "F3": "findNext",
+    "Shift-F3": "findPrev",
+    "fallthrough": "macDefault"
+  };
+  CodeMirror.normalizeKeyMap(keyMap.macSublime);
+
+  keyMap.pcSublime = {
+    "Shift-Tab": "indentLess",
+    "Shift-Ctrl-K": "deleteLine",
+    "Alt-Q": "wrapLines",
+    "Ctrl-T": "transposeChars",
+    "Alt-Left": "goSubwordLeft",
+    "Alt-Right": "goSubwordRight",
+    "Ctrl-Up": "scrollLineUp",
+    "Ctrl-Down": "scrollLineDown",
+    "Ctrl-L": "selectLine",
+    "Shift-Ctrl-L": "splitSelectionByLine",
+    "Esc": "singleSelectionTop",
+    "Ctrl-Enter": "insertLineAfter",
+    "Shift-Ctrl-Enter": "insertLineBefore",
+    "Ctrl-D": "selectNextOccurrence",
+    "Shift-Ctrl-Space": "selectScope",
+    "Shift-Ctrl-M": "selectBetweenBrackets",
+    "Ctrl-M": "goToBracket",
+    "Shift-Ctrl-Up": "swapLineUp",
+    "Shift-Ctrl-Down": "swapLineDown",
+    "Ctrl-/": "toggleCommentIndented",
+    "Ctrl-J": "joinLines",
+    "Shift-Ctrl-D": "duplicateLine",
+    "F9": "sortLines",
+    "Ctrl-F9": "sortLinesInsensitive",
+    "F2": "nextBookmark",
+    "Shift-F2": "prevBookmark",
+    "Ctrl-F2": "toggleBookmark",
+    "Shift-Ctrl-F2": "clearBookmarks",
+    "Alt-F2": "selectBookmarks",
+    "Backspace": "smartBackspace",
+    "Ctrl-K Ctrl-K": "delLineRight",
+    "Ctrl-K Ctrl-U": "upcaseAtCursor",
+    "Ctrl-K Ctrl-L": "downcaseAtCursor",
+    "Ctrl-K Ctrl-Space": "setSublimeMark",
+    "Ctrl-K Ctrl-A": "selectToSublimeMark",
+    "Ctrl-K Ctrl-W": "deleteToSublimeMark",
+    "Ctrl-K Ctrl-X": "swapWithSublimeMark",
+    "Ctrl-K Ctrl-Y": "sublimeYank",
+    "Ctrl-K Ctrl-C": "showInCenter",
+    "Ctrl-K Ctrl-G": "clearBookmarks",
+    "Ctrl-K Ctrl-Backspace": "delLineLeft",
+    "Ctrl-K Ctrl-0": "unfoldAll",
+    "Ctrl-K Ctrl-J": "unfoldAll",
+    "Ctrl-Alt-Up": "addCursorToPrevLine",
+    "Ctrl-Alt-Down": "addCursorToNextLine",
+    "Ctrl-F3": "findUnder",
+    "Shift-Ctrl-F3": "findUnderPrevious",
+    "Alt-F3": "findAllUnder",
+    "Shift-Ctrl-[": "fold",
+    "Shift-Ctrl-]": "unfold",
+    "Ctrl-I": "findIncremental",
+    "Shift-Ctrl-I": "findIncrementalReverse",
+    "Ctrl-H": "replace",
+    "F3": "findNext",
+    "Shift-F3": "findPrev",
+    "fallthrough": "pcDefault"
+  };
+  CodeMirror.normalizeKeyMap(keyMap.pcSublime);
+
+  var mac = keyMap.default == keyMap.macDefault;
+  keyMap.sublime = mac ? keyMap.macSublime : keyMap.pcSublime;
+});
diff --git a/core/media/editors/codemirror/keymap/sublime.min.js b/core/media/editors/codemirror/keymap/sublime.min.js
new file mode 100644
index 00000000..1a1936c9
--- /dev/null
+++ b/core/media/editors/codemirror/keymap/sublime.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/edit/matchbrackets")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){if(d<0&&0==c.ch)return b.clipPos(n(c.line-1));var e=b.getLine(c.line);if(d>0&&c.ch>=e.length)return b.clipPos(n(c.line+1,0));for(var f,g="start",h=c.ch,i=d<0?0:e.length,j=0;h!=i;h+=d,j++){var k=e.charAt(d<0?h-1:h),l="_"!=k&&a.isWordChar(k)?"w":"o";if("w"==l&&k.toUpperCase()==k&&(l="W"),"start"==g)"o"!=l&&(g="in",f=l);else if("in"==g&&f!=l){if("w"==f&&"W"==l&&d<0&&h--,"W"==f&&"w"==l&&d>0){f="w";continue}break}}return n(c.line,h)}function c(a,c){a.extendSelectionsBy((function(d){return a.display.shift||a.doc.extend||d.empty()?b(a.doc,d.head,c):c<0?d.from():d.to()}))}function d(b,c){return b.isReadOnly()?a.Pass:(b.operation((function(){for(var a=b.listSelections().length,d=[],e=-1,f=0;f<a;f++){var g=b.listSelections()[f].head;if(!(g.line<=e)){var h=n(g.line+(c?0:1),0);b.replaceRange("\n",h,null,"+insertLine"),b.indentLine(h.line,null,!0),d.push({head:h,anchor:h}),e=g.line+1}}b.setSelections(d)})),void b.execCommand("indentAuto"))}function e(b,c){for(var d=c.ch,e=d,f=b.getLine(c.line);d&&a.isWordChar(f.charAt(d-1));)--d;for(;e<f.length&&a.isWordChar(f.charAt(e));)++e;return{from:n(c.line,d),to:n(c.line,e),word:f.slice(d,e)}}function f(a,b){for(var c=a.listSelections(),d=[],e=0;e<c.length;e++){var f=c[e],g=a.findPosV(f.anchor,b,"line",f.anchor.goalColumn),h=a.findPosV(f.head,b,"line",f.head.goalColumn);g.goalColumn=null!=f.anchor.goalColumn?f.anchor.goalColumn:a.cursorCoords(f.anchor,"div").left,h.goalColumn=null!=f.head.goalColumn?f.head.goalColumn:a.cursorCoords(f.head,"div").left;var i={anchor:g,head:h};d.push(f),d.push(i)}a.setSelections(d)}function g(a,b,c){for(var d=0;d<a.length;d++)if(a[d].from()==b&&a[d].to()==c)return!0;return!1}function h(b){for(var c=b.listSelections(),d=[],e=0;e<c.length;e++){var f=c[e],g=f.head,h=b.scanForBracket(g,-1);if(!h)return!1;for(;;){var i=b.scanForBracket(g,1);if(!i)return!1;if(i.ch==o.charAt(o.indexOf(h.ch)+1)){var j=n(h.pos.line,h.pos.ch+1);if(0!=a.cmpPos(j,f.from())||0!=a.cmpPos(i.pos,f.to())){d.push({anchor:j,head:i.pos});break}if(h=b.scanForBracket(h.pos,-1),!h)return!1}g=n(i.pos.line,i.pos.ch+1)}}return b.setSelections(d),!0}function i(b,c){if(b.isReadOnly())return a.Pass;for(var d,e=b.listSelections(),f=[],g=0;g<e.length;g++){var h=e[g];if(!h.empty()){for(var i=h.from().line,j=h.to().line;g<e.length-1&&e[g+1].from().line==j;)j=e[++g].to().line;e[g].to().ch||j--,f.push(i,j)}}f.length?d=!0:f.push(b.firstLine(),b.lastLine()),b.operation((function(){for(var a=[],e=0;e<f.length;e+=2){var g=f[e],h=f[e+1],i=n(g,0),j=n(h),k=b.getRange(i,j,!1);c?k.sort():k.sort((function(a,b){var c=a.toUpperCase(),d=b.toUpperCase();return c!=d&&(a=c,b=d),a<b?-1:a==b?0:1})),b.replaceRange(k,i,j),d&&a.push({anchor:i,head:n(h+1,0)})}d&&b.setSelections(a,0)}))}function j(b,c){b.operation((function(){for(var d=b.listSelections(),f=[],g=[],h=0;h<d.length;h++){var i=d[h];i.empty()?(f.push(h),g.push("")):g.push(c(b.getRange(i.from(),i.to())))}b.replaceSelections(g,"around","case");for(var j,h=f.length-1;h>=0;h--){var i=d[f[h]];if(!(j&&a.cmpPos(i.head,j)>0)){var k=e(b,i.head);j=k.from,b.replaceRange(c(k.word),k.from,k.to)}}}))}function k(b){var c=b.getCursor("from"),d=b.getCursor("to");if(0==a.cmpPos(c,d)){var f=e(b,c);if(!f.word)return;c=f.from,d=f.to}return{from:c,to:d,query:b.getRange(c,d),word:f}}function l(a,b){var c=k(a);if(c){var d=c.query,e=a.getSearchCursor(d,b?c.to:c.from);(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):(e=a.getSearchCursor(d,b?n(a.firstLine(),0):a.clipPos(n(a.lastLine()))),(b?e.findNext():e.findPrevious())?a.setSelection(e.from(),e.to()):c.word&&a.setSelection(c.from,c.to))}}var m=a.commands,n=a.Pos;m.goSubwordLeft=function(a){c(a,-1)},m.goSubwordRight=function(a){c(a,1)},m.scrollLineUp=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top+b.clientHeight,"local");a.getCursor().line>=c&&a.execCommand("goLineUp")}a.scrollTo(null,b.top-a.defaultTextHeight())},m.scrollLineDown=function(a){var b=a.getScrollInfo();if(!a.somethingSelected()){var c=a.lineAtHeight(b.top,"local")+1;a.getCursor().line<=c&&a.execCommand("goLineDown")}a.scrollTo(null,b.top+a.defaultTextHeight())},m.splitSelectionByLine=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)for(var e=b[d].from(),f=b[d].to(),g=e.line;g<=f.line;++g)f.line>e.line&&g==f.line&&0==f.ch||c.push({anchor:g==e.line?e:n(g,0),head:g==f.line?f:n(g)});a.setSelections(c,0)},m.singleSelectionTop=function(a){var b=a.listSelections()[0];a.setSelection(b.anchor,b.head,{scroll:!1})},m.selectLine=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){var e=b[d];c.push({anchor:n(e.from().line,0),head:n(e.to().line+1,0)})}a.setSelections(c)},m.insertLineAfter=function(a){return d(a,!1)},m.insertLineBefore=function(a){return d(a,!0)},m.selectNextOccurrence=function(b){var c=b.getCursor("from"),d=b.getCursor("to"),f=b.state.sublimeFindFullWord==b.doc.sel;if(0==a.cmpPos(c,d)){var h=e(b,c);if(!h.word)return;b.setSelection(h.from,h.to),f=!0}else{var i=b.getRange(c,d),j=f?new RegExp("\\b"+i+"\\b"):i,k=b.getSearchCursor(j,d),l=k.findNext();if(l||(k=b.getSearchCursor(j,n(b.firstLine(),0)),l=k.findNext()),!l||g(b.listSelections(),k.from(),k.to()))return a.Pass;b.addSelection(k.from(),k.to())}f&&(b.state.sublimeFindFullWord=b.doc.sel)},m.addCursorToPrevLine=function(a){f(a,-1)},m.addCursorToNextLine=function(a){f(a,1)};var o="(){}[]";m.selectScope=function(a){h(a)||a.execCommand("selectAll")},m.selectBetweenBrackets=function(b){if(!h(b))return a.Pass},m.goToBracket=function(b){b.extendSelectionsBy((function(c){var d=b.scanForBracket(c.head,1);if(d&&0!=a.cmpPos(d.pos,c.head))return d.pos;var e=b.scanForBracket(c.head,-1);return e&&n(e.pos.line,e.pos.ch+1)||c.head}))},m.swapLineUp=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.firstLine()-1,f=[],g=0;g<c.length;g++){var h=c[g],i=h.from().line-1,j=h.to().line;f.push({anchor:n(h.anchor.line-1,h.anchor.ch),head:n(h.head.line-1,h.head.ch)}),0!=h.to().ch||h.empty()||--j,i>e?d.push(i,j):d.length&&(d[d.length-1]=j),e=j}b.operation((function(){for(var a=0;a<d.length;a+=2){var c=d[a],e=d[a+1],g=b.getLine(c);b.replaceRange("",n(c,0),n(c+1,0),"+swapLine"),e>b.lastLine()?b.replaceRange("\n"+g,n(b.lastLine()),null,"+swapLine"):b.replaceRange(g+"\n",n(e,0),null,"+swapLine")}b.setSelections(f),b.scrollIntoView()}))},m.swapLineDown=function(b){if(b.isReadOnly())return a.Pass;for(var c=b.listSelections(),d=[],e=b.lastLine()+1,f=c.length-1;f>=0;f--){var g=c[f],h=g.to().line+1,i=g.from().line;0!=g.to().ch||g.empty()||h--,h<e?d.push(h,i):d.length&&(d[d.length-1]=i),e=i}b.operation((function(){for(var a=d.length-2;a>=0;a-=2){var c=d[a],e=d[a+1],f=b.getLine(c);c==b.lastLine()?b.replaceRange("",n(c-1),n(c),"+swapLine"):b.replaceRange("",n(c,0),n(c+1,0),"+swapLine"),b.replaceRange(f+"\n",n(e,0),null,"+swapLine")}b.scrollIntoView()}))},m.toggleCommentIndented=function(a){a.toggleComment({indent:!0})},m.joinLines=function(a){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++){for(var e=b[d],f=e.from(),g=f.line,h=e.to().line;d<b.length-1&&b[d+1].from().line==h;)h=b[++d].to().line;c.push({start:g,end:h,anchor:!e.empty()&&f})}a.operation((function(){for(var b=0,d=[],e=0;e<c.length;e++){for(var f,g=c[e],h=g.anchor&&n(g.anchor.line-b,g.anchor.ch),i=g.start;i<=g.end;i++){var j=i-b;i==g.end&&(f=n(j,a.getLine(j).length+1)),j<a.lastLine()&&(a.replaceRange(" ",n(j),n(j+1,/^\s*/.exec(a.getLine(j+1))[0].length)),++b)}d.push({anchor:h||f,head:f})}a.setSelections(d,0)}))},m.duplicateLine=function(a){a.operation((function(){for(var b=a.listSelections().length,c=0;c<b;c++){var d=a.listSelections()[c];d.empty()?a.replaceRange(a.getLine(d.head.line)+"\n",n(d.head.line,0)):a.replaceRange(a.getRange(d.from(),d.to()),d.from())}a.scrollIntoView()}))},m.sortLines=function(a){i(a,!0)},m.sortLinesInsensitive=function(a){i(a,!1)},m.nextBookmark=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){var c=b.shift(),d=c.find();if(d)return b.push(c),a.setSelection(d.from,d.to)}},m.prevBookmark=function(a){var b=a.state.sublimeBookmarks;if(b)for(;b.length;){b.unshift(b.pop());var c=b[b.length-1].find();if(c)return a.setSelection(c.from,c.to);b.pop()}},m.toggleBookmark=function(a){for(var b=a.listSelections(),c=a.state.sublimeBookmarks||(a.state.sublimeBookmarks=[]),d=0;d<b.length;d++){for(var e=b[d].from(),f=b[d].to(),g=b[d].empty()?a.findMarksAt(e):a.findMarks(e,f),h=0;h<g.length;h++)if(g[h].sublimeBookmark){g[h].clear();for(var i=0;i<c.length;i++)c[i]==g[h]&&c.splice(i--,1);break}h==g.length&&c.push(a.markText(e,f,{sublimeBookmark:!0,clearWhenEmpty:!1}))}},m.clearBookmarks=function(a){var b=a.state.sublimeBookmarks;if(b)for(var c=0;c<b.length;c++)b[c].clear();b.length=0},m.selectBookmarks=function(a){var b=a.state.sublimeBookmarks,c=[];if(b)for(var d=0;d<b.length;d++){var e=b[d].find();e?c.push({anchor:e.from,head:e.to}):b.splice(d--,0)}c.length&&a.setSelections(c,0)},m.smartBackspace=function(b){return b.somethingSelected()?a.Pass:void b.operation((function(){for(var c=b.listSelections(),d=b.getOption("indentUnit"),e=c.length-1;e>=0;e--){var f=c[e].head,g=b.getRange({line:f.line,ch:0},f),h=a.countColumn(g,null,b.getOption("tabSize")),i=b.findPosH(f,-1,"char",!1);if(g&&!/\S/.test(g)&&h%d==0){var j=new n(f.line,a.findColumn(g,h-d,d));j.ch!=f.ch&&(i=j)}b.replaceRange("",i,f,"+delete")}}))},m.delLineRight=function(a){a.operation((function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange("",b[c].anchor,n(b[c].to().line),"+delete");a.scrollIntoView()}))},m.upcaseAtCursor=function(a){j(a,(function(a){return a.toUpperCase()}))},m.downcaseAtCursor=function(a){j(a,(function(a){return a.toLowerCase()}))},m.setSublimeMark=function(a){a.state.sublimeMark&&a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor())},m.selectToSublimeMark=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&a.setSelection(a.getCursor(),b)},m.deleteToSublimeMark=function(b){var c=b.state.sublimeMark&&b.state.sublimeMark.find();if(c){var d=b.getCursor(),e=c;if(a.cmpPos(d,e)>0){var f=e;e=d,d=f}b.state.sublimeKilled=b.getRange(d,e),b.replaceRange("",d,e)}},m.swapWithSublimeMark=function(a){var b=a.state.sublimeMark&&a.state.sublimeMark.find();b&&(a.state.sublimeMark.clear(),a.state.sublimeMark=a.setBookmark(a.getCursor()),a.setCursor(b))},m.sublimeYank=function(a){null!=a.state.sublimeKilled&&a.replaceSelection(a.state.sublimeKilled,null,"paste")},m.showInCenter=function(a){var b=a.cursorCoords(null,"local");a.scrollTo(null,(b.top+b.bottom)/2-a.getScrollInfo().clientHeight/2)},m.findUnder=function(a){l(a,!0)},m.findUnderPrevious=function(a){l(a,!1)},m.findAllUnder=function(a){var b=k(a);if(b){for(var c=a.getSearchCursor(b.query),d=[],e=-1;c.findNext();)d.push({anchor:c.from(),head:c.to()}),c.from().line<=b.from.line&&c.from().ch<=b.from.ch&&e++;a.setSelections(d,e)}};var p=a.keyMap;p.macSublime={"Cmd-Left":"goLineStartSmart","Shift-Tab":"indentLess","Shift-Ctrl-K":"deleteLine","Alt-Q":"wrapLines","Ctrl-Left":"goSubwordLeft","Ctrl-Right":"goSubwordRight","Ctrl-Alt-Up":"scrollLineUp","Ctrl-Alt-Down":"scrollLineDown","Cmd-L":"selectLine","Shift-Cmd-L":"splitSelectionByLine",Esc:"singleSelectionTop","Cmd-Enter":"insertLineAfter","Shift-Cmd-Enter":"insertLineBefore","Cmd-D":"selectNextOccurrence","Shift-Cmd-Space":"selectScope","Shift-Cmd-M":"selectBetweenBrackets","Cmd-M":"goToBracket","Cmd-Ctrl-Up":"swapLineUp","Cmd-Ctrl-Down":"swapLineDown","Cmd-/":"toggleCommentIndented","Cmd-J":"joinLines","Shift-Cmd-D":"duplicateLine",F9:"sortLines","Cmd-F9":"sortLinesInsensitive",F2:"nextBookmark","Shift-F2":"prevBookmark","Cmd-F2":"toggleBookmark","Shift-Cmd-F2":"clearBookmarks","Alt-F2":"selectBookmarks",Backspace:"smartBackspace","Cmd-K Cmd-K":"delLineRight","Cmd-K Cmd-U":"upcaseAtCursor","Cmd-K Cmd-L":"downcaseAtCursor","Cmd-K Cmd-Space":"setSublimeMark","Cmd-K Cmd-A":"selectToSublimeMark","Cmd-K Cmd-W":"deleteToSublimeMark","Cmd-K Cmd-X":"swapWithSublimeMark","Cmd-K Cmd-Y":"sublimeYank","Cmd-K Cmd-C":"showInCenter","Cmd-K Cmd-G":"clearBookmarks","Cmd-K Cmd-Backspace":"delLineLeft","Cmd-K Cmd-0":"unfoldAll","Cmd-K Cmd-J":"unfoldAll","Ctrl-Shift-Up":"addCursorToPrevLine","Ctrl-Shift-Down":"addCursorToNextLine","Cmd-F3":"findUnder","Shift-Cmd-F3":"findUnderPrevious","Alt-F3":"findAllUnder","Shift-Cmd-[":"fold","Shift-Cmd-]":"unfold","Cmd-I":"findIncremental","Shift-Cmd-I":"findIncrementalReverse","Cmd-H":"replace",F3:"findNext","Shift-F3":"findPrev",fallthrough:"macDefault"},a.normalizeKeyMap(p.macSublime),p.pcSublime={"Shift-Tab":"indentLess","Shift-Ctrl-K":"deleteLine","Alt-Q":"wrapLines","Ctrl-T":"transposeChars","Alt-Left":"goSubwordLeft","Alt-Right":"goSubwordRight","Ctrl-Up":"scrollLineUp","Ctrl-Down":"scrollLineDown","Ctrl-L":"selectLine","Shift-Ctrl-L":"splitSelectionByLine",Esc:"singleSelectionTop","Ctrl-Enter":"insertLineAfter","Shift-Ctrl-Enter":"insertLineBefore","Ctrl-D":"selectNextOccurrence","Shift-Ctrl-Space":"selectScope","Shift-Ctrl-M":"selectBetweenBrackets","Ctrl-M":"goToBracket","Shift-Ctrl-Up":"swapLineUp","Shift-Ctrl-Down":"swapLineDown","Ctrl-/":"toggleCommentIndented","Ctrl-J":"joinLines","Shift-Ctrl-D":"duplicateLine",F9:"sortLines","Ctrl-F9":"sortLinesInsensitive",F2:"nextBookmark","Shift-F2":"prevBookmark","Ctrl-F2":"toggleBookmark","Shift-Ctrl-F2":"clearBookmarks","Alt-F2":"selectBookmarks",Backspace:"smartBackspace","Ctrl-K Ctrl-K":"delLineRight","Ctrl-K Ctrl-U":"upcaseAtCursor","Ctrl-K Ctrl-L":"downcaseAtCursor","Ctrl-K Ctrl-Space":"setSublimeMark","Ctrl-K Ctrl-A":"selectToSublimeMark","Ctrl-K Ctrl-W":"deleteToSublimeMark","Ctrl-K Ctrl-X":"swapWithSublimeMark","Ctrl-K Ctrl-Y":"sublimeYank","Ctrl-K Ctrl-C":"showInCenter","Ctrl-K Ctrl-G":"clearBookmarks","Ctrl-K Ctrl-Backspace":"delLineLeft","Ctrl-K Ctrl-0":"unfoldAll","Ctrl-K Ctrl-J":"unfoldAll","Ctrl-Alt-Up":"addCursorToPrevLine","Ctrl-Alt-Down":"addCursorToNextLine","Ctrl-F3":"findUnder","Shift-Ctrl-F3":"findUnderPrevious","Alt-F3":"findAllUnder","Shift-Ctrl-[":"fold","Shift-Ctrl-]":"unfold","Ctrl-I":"findIncremental","Shift-Ctrl-I":"findIncrementalReverse","Ctrl-H":"replace",F3:"findNext","Shift-F3":"findPrev",fallthrough:"pcDefault"},a.normalizeKeyMap(p.pcSublime);var q=p.default==p.macDefault;p.sublime=q?p.macSublime:p.pcSublime}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/keymap/vim.js b/core/media/editors/codemirror/keymap/vim.js
new file mode 100644
index 00000000..ef79585f
--- /dev/null
+++ b/core/media/editors/codemirror/keymap/vim.js
@@ -0,0 +1,5412 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Supported keybindings:
+ *   Too many to list. Refer to defaultKeyMap below.
+ *
+ * Supported Ex commands:
+ *   Refer to defaultExCommandMap below.
+ *
+ * Registers: unnamed, -, a-z, A-Z, 0-9
+ *   (Does not respect the special case for number registers when delete
+ *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
+ *   TODO: Implement the remaining registers.
+ *
+ * Marks: a-z, A-Z, and 0-9
+ *   TODO: Implement the remaining special marks. They have more complex
+ *       behavior.
+ *
+ * Events:
+ *  'vim-mode-change' - raised on the editor anytime the current mode changes,
+ *                      Event object: {mode: "visual", subMode: "linewise"}
+ *
+ * Code structure:
+ *  1. Default keymap
+ *  2. Variable declarations and short basic helpers
+ *  3. Instance (External API) implementation
+ *  4. Internal state tracking objects (input state, counter) implementation
+ *     and instantiation
+ *  5. Key handler (the main command dispatcher) implementation
+ *  6. Motion, operator, and action implementations
+ *  7. Helper functions for the key handler, motions, operators, and actions
+ *  8. Set up Vim to work as a keymap for CodeMirror.
+ *  9. Ex command implementations.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  'use strict';
+
+  var defaultKeymap = [
+    // Key to key mapping. This goes first to make it possible to override
+    // existing mappings.
+    { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
+    { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
+    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
+    { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
+    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b', context: 'normal' },
+    { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
+    { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'},
+    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
+    { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' },
+    { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
+    { keys: '<End>', type: 'keyToKey', toKeys: '$' },
+    { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
+    { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
+    { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
+    { keys: '<Ins>', type: 'action', action: 'toggleOverwrite', context: 'insert' },
+    // Motions
+    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
+    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
+    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
+    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
+    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
+    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
+    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
+    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
+    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
+    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
+    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
+    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
+    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+    { keys: '(', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: false }},
+    { keys: ')', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: true }},
+    { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
+    { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
+    { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
+    { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
+    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
+    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
+    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
+    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
+    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
+    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
+    { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
+    { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
+    { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
+    { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
+    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
+    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
+    { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
+    { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
+    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
+    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
+    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
+    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
+    // the next two aren't motions but must come before more general motion declarations
+    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
+    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
+    { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
+    { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
+    { keys: '|', type: 'motion', motion: 'moveToColumn'},
+    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
+    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
+    // Operators
+    { keys: 'd', type: 'operator', operator: 'delete' },
+    { keys: 'y', type: 'operator', operator: 'yank' },
+    { keys: 'c', type: 'operator', operator: 'change' },
+    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
+    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
+    { keys: 'g~', type: 'operator', operator: 'changeCase' },
+    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
+    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
+    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
+    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
+    // Operator-Motion dual commands
+    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
+    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'expandToLine', motionArgs: { linewise: true }, context: 'normal'},
+    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
+    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
+    { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
+    // Actions
+    { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
+    { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
+    { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
+    { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
+    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
+    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
+    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: '<C-q>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
+    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
+    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
+    { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
+    { keys: '@<character>', type: 'action', action: 'replayMacro' },
+    { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
+    // Handle Replace-mode as a special case of insert mode.
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
+    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: '<C-r>', type: 'action', action: 'redo' },
+    { keys: 'm<character>', type: 'action', action: 'setMark' },
+    { keys: '"<character>', type: 'action', action: 'setRegister' },
+    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
+    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
+    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
+    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '.', type: 'action', action: 'repeatLastEdit' },
+    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
+    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
+    { keys: '<C-t>', type: 'action', action: 'indent', actionArgs: { indentRight: true }, context: 'insert' },
+    { keys: '<C-d>', type: 'action', action: 'indent', actionArgs: { indentRight: false }, context: 'insert' },
+    // Text object motions
+    { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
+    { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
+    // Search
+    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
+    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
+    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
+    // Ex command
+    { keys: ':', type: 'ex' }
+  ];
+
+  /**
+   * Ex commands
+   * Care must be taken when adding to the default Ex command map. For any
+   * pair of commands that have a shared prefix, at least one of their
+   * shortNames must not match the prefix of the other command.
+   */
+  var defaultExCommandMap = [
+    { name: 'colorscheme', shortName: 'colo' },
+    { name: 'map' },
+    { name: 'imap', shortName: 'im' },
+    { name: 'nmap', shortName: 'nm' },
+    { name: 'vmap', shortName: 'vm' },
+    { name: 'unmap' },
+    { name: 'write', shortName: 'w' },
+    { name: 'undo', shortName: 'u' },
+    { name: 'redo', shortName: 'red' },
+    { name: 'set', shortName: 'se' },
+    { name: 'set', shortName: 'se' },
+    { name: 'setlocal', shortName: 'setl' },
+    { name: 'setglobal', shortName: 'setg' },
+    { name: 'sort', shortName: 'sor' },
+    { name: 'substitute', shortName: 's', possiblyAsync: true },
+    { name: 'nohlsearch', shortName: 'noh' },
+    { name: 'yank', shortName: 'y' },
+    { name: 'delmarks', shortName: 'delm' },
+    { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+    { name: 'global', shortName: 'g' }
+  ];
+
+  var Pos = CodeMirror.Pos;
+
+  var Vim = function() {
+    function enterVimMode(cm) {
+      cm.setOption('disableInput', true);
+      cm.setOption('showCursorWhenSelecting', false);
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      cm.on('cursorActivity', onCursorActivity);
+      maybeInitVimState(cm);
+      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
+    }
+
+    function leaveVimMode(cm) {
+      cm.setOption('disableInput', false);
+      cm.off('cursorActivity', onCursorActivity);
+      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.state.vim = null;
+    }
+
+    function detachVimMap(cm, next) {
+      if (this == CodeMirror.keyMap.vim) {
+        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+        if (cm.getOption("inputStyle") == "contenteditable" && document.body.style.caretColor != null) {
+          disableFatCursorMark(cm);
+          cm.getInputField().style.caretColor = "";
+        }
+      }
+
+      if (!next || next.attach != attachVimMap)
+        leaveVimMode(cm);
+    }
+    function attachVimMap(cm, prev) {
+      if (this == CodeMirror.keyMap.vim) {
+        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+        if (cm.getOption("inputStyle") == "contenteditable" && document.body.style.caretColor != null) {
+          enableFatCursorMark(cm);
+          cm.getInputField().style.caretColor = "transparent";
+        }
+      }
+
+      if (!prev || prev.attach != attachVimMap)
+        enterVimMode(cm);
+    }
+
+    function fatCursorMarks(cm) {
+      var ranges = cm.listSelections(), result = []
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i]
+        if (range.empty()) {
+          if (range.anchor.ch < cm.getLine(range.anchor.line).length) {
+            result.push(cm.markText(range.anchor, Pos(range.anchor.line, range.anchor.ch + 1),
+                                    {className: "cm-fat-cursor-mark"}))
+          } else {
+            var widget = document.createElement("span")
+            widget.textContent = "\u00a0"
+            widget.className = "cm-fat-cursor-mark"
+            result.push(cm.setBookmark(range.anchor, {widget: widget}))
+          }
+        }
+      }
+      return result
+    }
+
+    function updateFatCursorMark(cm) {
+      var marks = cm.state.fatCursorMarks
+      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
+      cm.state.fatCursorMarks = fatCursorMarks(cm)
+    }
+
+    function enableFatCursorMark(cm) {
+      cm.state.fatCursorMarks = fatCursorMarks(cm)
+      cm.on("cursorActivity", updateFatCursorMark)
+    }
+
+    function disableFatCursorMark(cm) {
+      var marks = cm.state.fatCursorMarks
+      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
+      cm.state.fatCursorMarks = null
+      cm.off("cursorActivity", updateFatCursorMark)
+    }
+
+    // Deprecated, simply setting the keymap works again.
+    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
+      if (val && cm.getOption("keyMap") != "vim")
+        cm.setOption("keyMap", "vim");
+      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
+        cm.setOption("keyMap", "default");
+    });
+
+    function cmKey(key, cm) {
+      if (!cm) { return undefined; }
+      if (this[key]) { return this[key]; }
+      var vimKey = cmKeyToVimKey(key);
+      if (!vimKey) {
+        return false;
+      }
+      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
+      if (typeof cmd == 'function') {
+        CodeMirror.signal(cm, 'vim-keypress', vimKey);
+      }
+      return cmd;
+    }
+
+    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
+    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
+    function cmKeyToVimKey(key) {
+      if (key.charAt(0) == '\'') {
+        // Keypress character binding of format "'a'"
+        return key.charAt(1);
+      }
+      var pieces = key.split(/-(?!$)/);
+      var lastPiece = pieces[pieces.length - 1];
+      if (pieces.length == 1 && pieces[0].length == 1) {
+        // No-modifier bindings use literal character bindings above. Skip.
+        return false;
+      } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
+        // Ignore Shift+char bindings as they should be handled by literal character.
+        return false;
+      }
+      var hasCharacter = false;
+      for (var i = 0; i < pieces.length; i++) {
+        var piece = pieces[i];
+        if (piece in modifiers) { pieces[i] = modifiers[piece]; }
+        else { hasCharacter = true; }
+        if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
+      }
+      if (!hasCharacter) {
+        // Vim does not support modifier only keys.
+        return false;
+      }
+      // TODO: Current bindings expect the character to be lower case, but
+      // it looks like vim key notation uses upper case.
+      if (isUpperCase(lastPiece)) {
+        pieces[pieces.length - 1] = lastPiece.toLowerCase();
+      }
+      return '<' + pieces.join('-') + '>';
+    }
+
+    function getOnPasteFn(cm) {
+      var vim = cm.state.vim;
+      if (!vim.onPasteFn) {
+        vim.onPasteFn = function() {
+          if (!vim.insertMode) {
+            cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+            actions.enterInsertMode(cm, {}, vim);
+          }
+        };
+      }
+      return vim.onPasteFn;
+    }
+
+    var numberRegex = /[\d]/;
+    var wordCharTest = [CodeMirror.isWordChar, function(ch) {
+      return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
+    }], bigWordCharTest = [function(ch) {
+      return /\S/.test(ch);
+    }];
+    function makeKeyRange(start, size) {
+      var keys = [];
+      for (var i = start; i < start + size; i++) {
+        keys.push(String.fromCharCode(i));
+      }
+      return keys;
+    }
+    var upperCaseAlphabet = makeKeyRange(65, 26);
+    var lowerCaseAlphabet = makeKeyRange(97, 26);
+    var numbers = makeKeyRange(48, 10);
+    var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
+
+    function isLine(cm, line) {
+      return line >= cm.firstLine() && line <= cm.lastLine();
+    }
+    function isLowerCase(k) {
+      return (/^[a-z]$/).test(k);
+    }
+    function isMatchableSymbol(k) {
+      return '()[]{}'.indexOf(k) != -1;
+    }
+    function isNumber(k) {
+      return numberRegex.test(k);
+    }
+    function isUpperCase(k) {
+      return (/^[A-Z]$/).test(k);
+    }
+    function isWhiteSpaceString(k) {
+      return (/^\s*$/).test(k);
+    }
+    function isEndOfSentenceSymbol(k) {
+      return '.?!'.indexOf(k) != -1;
+    }
+    function inArray(val, arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] == val) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    var options = {};
+    function defineOption(name, defaultValue, type, aliases, callback) {
+      if (defaultValue === undefined && !callback) {
+        throw Error('defaultValue is required unless callback is provided');
+      }
+      if (!type) { type = 'string'; }
+      options[name] = {
+        type: type,
+        defaultValue: defaultValue,
+        callback: callback
+      };
+      if (aliases) {
+        for (var i = 0; i < aliases.length; i++) {
+          options[aliases[i]] = options[name];
+        }
+      }
+      if (defaultValue) {
+        setOption(name, defaultValue);
+      }
+    }
+
+    function setOption(name, value, cm, cfg) {
+      var option = options[name];
+      cfg = cfg || {};
+      var scope = cfg.scope;
+      if (!option) {
+        return new Error('Unknown option: ' + name);
+      }
+      if (option.type == 'boolean') {
+        if (value && value !== true) {
+          return new Error('Invalid argument: ' + name + '=' + value);
+        } else if (value !== false) {
+          // Boolean options are set to true if value is not defined.
+          value = true;
+        }
+      }
+      if (option.callback) {
+        if (scope !== 'local') {
+          option.callback(value, undefined);
+        }
+        if (scope !== 'global' && cm) {
+          option.callback(value, cm);
+        }
+      } else {
+        if (scope !== 'local') {
+          option.value = option.type == 'boolean' ? !!value : value;
+        }
+        if (scope !== 'global' && cm) {
+          cm.state.vim.options[name] = {value: value};
+        }
+      }
+    }
+
+    function getOption(name, cm, cfg) {
+      var option = options[name];
+      cfg = cfg || {};
+      var scope = cfg.scope;
+      if (!option) {
+        return new Error('Unknown option: ' + name);
+      }
+      if (option.callback) {
+        var local = cm && option.callback(undefined, cm);
+        if (scope !== 'global' && local !== undefined) {
+          return local;
+        }
+        if (scope !== 'local') {
+          return option.callback();
+        }
+        return;
+      } else {
+        var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
+        return (local || (scope !== 'local') && option || {}).value;
+      }
+    }
+
+    defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) {
+      // Option is local. Do nothing for global.
+      if (cm === undefined) {
+        return;
+      }
+      // The 'filetype' option proxies to the CodeMirror 'mode' option.
+      if (name === undefined) {
+        var mode = cm.getOption('mode');
+        return mode == 'null' ? '' : mode;
+      } else {
+        var mode = name == '' ? 'null' : name;
+        cm.setOption('mode', mode);
+      }
+    });
+
+    var createCircularJumpList = function() {
+      var size = 100;
+      var pointer = -1;
+      var head = 0;
+      var tail = 0;
+      var buffer = new Array(size);
+      function add(cm, oldCur, newCur) {
+        var current = pointer % size;
+        var curMark = buffer[current];
+        function useNextSlot(cursor) {
+          var next = ++pointer % size;
+          var trashMark = buffer[next];
+          if (trashMark) {
+            trashMark.clear();
+          }
+          buffer[next] = cm.setBookmark(cursor);
+        }
+        if (curMark) {
+          var markPos = curMark.find();
+          // avoid recording redundant cursor position
+          if (markPos && !cursorEqual(markPos, oldCur)) {
+            useNextSlot(oldCur);
+          }
+        } else {
+          useNextSlot(oldCur);
+        }
+        useNextSlot(newCur);
+        head = pointer;
+        tail = pointer - size + 1;
+        if (tail < 0) {
+          tail = 0;
+        }
+      }
+      function move(cm, offset) {
+        pointer += offset;
+        if (pointer > head) {
+          pointer = head;
+        } else if (pointer < tail) {
+          pointer = tail;
+        }
+        var mark = buffer[(size + pointer) % size];
+        // skip marks that are temporarily removed from text buffer
+        if (mark && !mark.find()) {
+          var inc = offset > 0 ? 1 : -1;
+          var newCur;
+          var oldCur = cm.getCursor();
+          do {
+            pointer += inc;
+            mark = buffer[(size + pointer) % size];
+            // skip marks that are the same as current position
+            if (mark &&
+                (newCur = mark.find()) &&
+                !cursorEqual(oldCur, newCur)) {
+              break;
+            }
+          } while (pointer < head && pointer > tail);
+        }
+        return mark;
+      }
+      return {
+        cachedCursor: undefined, //used for # and * jumps
+        add: add,
+        move: move
+      };
+    };
+
+    // Returns an object to track the changes associated insert mode.  It
+    // clones the object that is passed in, or creates an empty object one if
+    // none is provided.
+    var createInsertModeChanges = function(c) {
+      if (c) {
+        // Copy construction
+        return {
+          changes: c.changes,
+          expectCursorActivityForChange: c.expectCursorActivityForChange
+        };
+      }
+      return {
+        // Change list
+        changes: [],
+        // Set to true on change, false on cursorActivity.
+        expectCursorActivityForChange: false
+      };
+    };
+
+    function MacroModeState() {
+      this.latestRegister = undefined;
+      this.isPlaying = false;
+      this.isRecording = false;
+      this.replaySearchQueries = [];
+      this.onRecordingDone = undefined;
+      this.lastInsertModeChanges = createInsertModeChanges();
+    }
+    MacroModeState.prototype = {
+      exitMacroRecordMode: function() {
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.onRecordingDone) {
+          macroModeState.onRecordingDone(); // close dialog
+        }
+        macroModeState.onRecordingDone = undefined;
+        macroModeState.isRecording = false;
+      },
+      enterMacroRecordMode: function(cm, registerName) {
+        var register =
+            vimGlobalState.registerController.getRegister(registerName);
+        if (register) {
+          register.clear();
+          this.latestRegister = registerName;
+          if (cm.openDialog) {
+            this.onRecordingDone = cm.openDialog(
+                '(recording)['+registerName+']', null, {bottom:true});
+          }
+          this.isRecording = true;
+        }
+      }
+    };
+
+    function maybeInitVimState(cm) {
+      if (!cm.state.vim) {
+        // Store instance state in the CodeMirror object.
+        cm.state.vim = {
+          inputState: new InputState(),
+          // Vim's input state that triggered the last edit, used to repeat
+          // motions and operators with '.'.
+          lastEditInputState: undefined,
+          // Vim's action command before the last edit, used to repeat actions
+          // with '.' and insert mode repeat.
+          lastEditActionCommand: undefined,
+          // When using jk for navigation, if you move from a longer line to a
+          // shorter line, the cursor may clip to the end of the shorter line.
+          // If j is pressed again and cursor goes to the next line, the
+          // cursor should go back to its horizontal position on the longer
+          // line if it can. This is to keep track of the horizontal position.
+          lastHPos: -1,
+          // Doing the same with screen-position for gj/gk
+          lastHSPos: -1,
+          // The last motion command run. Cleared if a non-motion command gets
+          // executed in between.
+          lastMotion: null,
+          marks: {},
+          // Mark for rendering fake cursor for visual mode.
+          fakeCursor: null,
+          insertMode: false,
+          // Repeat count for changes made in insert mode, triggered by key
+          // sequences like 3,i. Only exists when insertMode is true.
+          insertModeRepeat: undefined,
+          visualMode: false,
+          // If we are in visual line mode. No effect if visualMode is false.
+          visualLine: false,
+          visualBlock: false,
+          lastSelection: null,
+          lastPastedText: null,
+          sel: {},
+          // Buffer-local/window-local values of vim options.
+          options: {}
+        };
+      }
+      return cm.state.vim;
+    }
+    var vimGlobalState;
+    function resetVimGlobalState() {
+      vimGlobalState = {
+        // The current search query.
+        searchQuery: null,
+        // Whether we are searching backwards.
+        searchIsReversed: false,
+        // Replace part of the last substituted pattern
+        lastSubstituteReplacePart: undefined,
+        jumpList: createCircularJumpList(),
+        macroModeState: new MacroModeState,
+        // Recording latest f, t, F or T motion command.
+        lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
+        registerController: new RegisterController({}),
+        // search history buffer
+        searchHistoryController: new HistoryController(),
+        // ex Command history buffer
+        exCommandHistoryController : new HistoryController()
+      };
+      for (var optionName in options) {
+        var option = options[optionName];
+        option.value = option.defaultValue;
+      }
+    }
+
+    var lastInsertModeKeyTimer;
+    var vimApi= {
+      buildKeyMap: function() {
+        // TODO: Convert keymap into dictionary format for fast lookup.
+      },
+      // Testing hook, though it might be useful to expose the register
+      // controller anyways.
+      getRegisterController: function() {
+        return vimGlobalState.registerController;
+      },
+      // Testing hook.
+      resetVimGlobalState_: resetVimGlobalState,
+
+      // Testing hook.
+      getVimGlobalState_: function() {
+        return vimGlobalState;
+      },
+
+      // Testing hook.
+      maybeInitVimState_: maybeInitVimState,
+
+      suppressErrorLogging: false,
+
+      InsertModeKey: InsertModeKey,
+      map: function(lhs, rhs, ctx) {
+        // Add user defined key bindings.
+        exCommandDispatcher.map(lhs, rhs, ctx);
+      },
+      unmap: function(lhs, ctx) {
+        exCommandDispatcher.unmap(lhs, ctx);
+      },
+      // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace
+      // them, or somehow make them work with the existing CodeMirror setOption/getOption API.
+      setOption: setOption,
+      getOption: getOption,
+      defineOption: defineOption,
+      defineEx: function(name, prefix, func){
+        if (!prefix) {
+          prefix = name;
+        } else if (name.indexOf(prefix) !== 0) {
+          throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
+        }
+        exCommands[name]=func;
+        exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
+      },
+      handleKey: function (cm, key, origin) {
+        var command = this.findKey(cm, key, origin);
+        if (typeof command === 'function') {
+          return command();
+        }
+      },
+      /**
+       * This is the outermost function called by CodeMirror, after keys have
+       * been mapped to their Vim equivalents.
+       *
+       * Finds a command based on the key (and cached keys if there is a
+       * multi-key sequence). Returns `undefined` if no key is matched, a noop
+       * function if a partial match is found (multi-key), and a function to
+       * execute the bound command if a a key is matched. The function always
+       * returns true.
+       */
+      findKey: function(cm, key, origin) {
+        var vim = maybeInitVimState(cm);
+        function handleMacroRecording() {
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            if (key == 'q') {
+              macroModeState.exitMacroRecordMode();
+              clearInputState(cm);
+              return true;
+            }
+            if (origin != 'mapping') {
+              logKey(macroModeState, key);
+            }
+          }
+        }
+        function handleEsc() {
+          if (key == '<Esc>') {
+            // Clear input state and get back to normal mode.
+            clearInputState(cm);
+            if (vim.visualMode) {
+              exitVisualMode(cm);
+            } else if (vim.insertMode) {
+              exitInsertMode(cm);
+            }
+            return true;
+          }
+        }
+        function doKeyToKey(keys) {
+          // TODO: prevent infinite recursion.
+          var match;
+          while (keys) {
+            // Pull off one command key, which is either a single character
+            // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
+            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
+            key = match[0];
+            keys = keys.substring(match.index + key.length);
+            CodeMirror.Vim.handleKey(cm, key, 'mapping');
+          }
+        }
+
+        function handleKeyInsertMode() {
+          if (handleEsc()) { return true; }
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          var keysAreChars = key.length == 1;
+          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+          // Need to check all key substrings in insert mode.
+          while (keys.length > 1 && match.type != 'full') {
+            var keys = vim.inputState.keyBuffer = keys.slice(1);
+            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+            if (thisMatch.type != 'none') { match = thisMatch; }
+          }
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') {
+            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+            lastInsertModeKeyTimer = window.setTimeout(
+              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
+              getOption('insertModeEscKeysTimeout'));
+            return !keysAreChars;
+          }
+
+          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+          if (keysAreChars) {
+            var selections = cm.listSelections();
+            for (var i = 0; i < selections.length; i++) {
+              var here = selections[i].head;
+              cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+            }
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes.pop();
+          }
+          clearInputState(cm);
+          return match.command;
+        }
+
+        function handleKeyNonInsertMode() {
+          if (handleMacroRecording() || handleEsc()) { return true; }
+
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          if (/^[1-9]\d*$/.test(keys)) { return true; }
+
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (!keysMatcher) { clearInputState(cm); return false; }
+          var context = vim.visualMode ? 'visual' :
+                                         'normal';
+          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') { return true; }
+
+          vim.inputState.keyBuffer = '';
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (keysMatcher[1] && keysMatcher[1] != '0') {
+            vim.inputState.pushRepeatDigit(keysMatcher[1]);
+          }
+          return match.command;
+        }
+
+        var command;
+        if (vim.insertMode) { command = handleKeyInsertMode(); }
+        else { command = handleKeyNonInsertMode(); }
+        if (command === false) {
+          return !vim.insertMode && key.length === 1 ? function() { return true; } : undefined;
+        } else if (command === true) {
+          // TODO: Look into using CodeMirror's multi-key handling.
+          // Return no-op since we are caching the key. Counts as handled, but
+          // don't want act on it just yet.
+          return function() { return true; };
+        } else {
+          return function() {
+            return cm.operation(function() {
+              cm.curOp.isVimOp = true;
+              try {
+                if (command.type == 'keyToKey') {
+                  doKeyToKey(command.toKeys);
+                } else {
+                  commandDispatcher.processCommand(cm, vim, command);
+                }
+              } catch (e) {
+                // clear VIM state in case it's in a bad state.
+                cm.state.vim = undefined;
+                maybeInitVimState(cm);
+                if (!CodeMirror.Vim.suppressErrorLogging) {
+                  console['log'](e);
+                }
+                throw e;
+              }
+              return true;
+            });
+          };
+        }
+      },
+      handleEx: function(cm, input) {
+        exCommandDispatcher.processCommand(cm, input);
+      },
+
+      defineMotion: defineMotion,
+      defineAction: defineAction,
+      defineOperator: defineOperator,
+      mapCommand: mapCommand,
+      _mapCommand: _mapCommand,
+
+      defineRegister: defineRegister,
+
+      exitVisualMode: exitVisualMode,
+      exitInsertMode: exitInsertMode
+    };
+
+    // Represents the current input state.
+    function InputState() {
+      this.prefixRepeat = [];
+      this.motionRepeat = [];
+
+      this.operator = null;
+      this.operatorArgs = null;
+      this.motion = null;
+      this.motionArgs = null;
+      this.keyBuffer = []; // For matching multi-key commands.
+      this.registerName = null; // Defaults to the unnamed register.
+    }
+    InputState.prototype.pushRepeatDigit = function(n) {
+      if (!this.operator) {
+        this.prefixRepeat = this.prefixRepeat.concat(n);
+      } else {
+        this.motionRepeat = this.motionRepeat.concat(n);
+      }
+    };
+    InputState.prototype.getRepeat = function() {
+      var repeat = 0;
+      if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
+        repeat = 1;
+        if (this.prefixRepeat.length > 0) {
+          repeat *= parseInt(this.prefixRepeat.join(''), 10);
+        }
+        if (this.motionRepeat.length > 0) {
+          repeat *= parseInt(this.motionRepeat.join(''), 10);
+        }
+      }
+      return repeat;
+    };
+
+    function clearInputState(cm, reason) {
+      cm.state.vim.inputState = new InputState();
+      CodeMirror.signal(cm, 'vim-command-done', reason);
+    }
+
+    /*
+     * Register stores information about copy and paste registers.  Besides
+     * text, a register must store whether it is linewise (i.e., when it is
+     * pasted, should it insert itself into a new line, or should the text be
+     * inserted at the cursor position.)
+     */
+    function Register(text, linewise, blockwise) {
+      this.clear();
+      this.keyBuffer = [text || ''];
+      this.insertModeChanges = [];
+      this.searchQueries = [];
+      this.linewise = !!linewise;
+      this.blockwise = !!blockwise;
+    }
+    Register.prototype = {
+      setText: function(text, linewise, blockwise) {
+        this.keyBuffer = [text || ''];
+        this.linewise = !!linewise;
+        this.blockwise = !!blockwise;
+      },
+      pushText: function(text, linewise) {
+        // if this register has ever been set to linewise, use linewise.
+        if (linewise) {
+          if (!this.linewise) {
+            this.keyBuffer.push('\n');
+          }
+          this.linewise = true;
+        }
+        this.keyBuffer.push(text);
+      },
+      pushInsertModeChanges: function(changes) {
+        this.insertModeChanges.push(createInsertModeChanges(changes));
+      },
+      pushSearchQuery: function(query) {
+        this.searchQueries.push(query);
+      },
+      clear: function() {
+        this.keyBuffer = [];
+        this.insertModeChanges = [];
+        this.searchQueries = [];
+        this.linewise = false;
+      },
+      toString: function() {
+        return this.keyBuffer.join('');
+      }
+    };
+
+    /**
+     * Defines an external register.
+     *
+     * The name should be a single character that will be used to reference the register.
+     * The register should support setText, pushText, clear, and toString(). See Register
+     * for a reference implementation.
+     */
+    function defineRegister(name, register) {
+      var registers = vimGlobalState.registerController.registers;
+      if (!name || name.length != 1) {
+        throw Error('Register name must be 1 character');
+      }
+      if (registers[name]) {
+        throw Error('Register already defined ' + name);
+      }
+      registers[name] = register;
+      validRegisters.push(name);
+    }
+
+    /*
+     * vim registers allow you to keep many independent copy and paste buffers.
+     * See http://usevim.com/2012/04/13/registers/ for an introduction.
+     *
+     * RegisterController keeps the state of all the registers.  An initial
+     * state may be passed in.  The unnamed register '"' will always be
+     * overridden.
+     */
+    function RegisterController(registers) {
+      this.registers = registers;
+      this.unnamedRegister = registers['"'] = new Register();
+      registers['.'] = new Register();
+      registers[':'] = new Register();
+      registers['/'] = new Register();
+    }
+    RegisterController.prototype = {
+      pushText: function(registerName, operator, text, linewise, blockwise) {
+        if (linewise && text.charAt(text.length - 1) !== '\n'){
+          text += '\n';
+        }
+        // Lowercase and uppercase registers refer to the same register.
+        // Uppercase just means append.
+        var register = this.isValidRegister(registerName) ?
+            this.getRegister(registerName) : null;
+        // if no register/an invalid register was specified, things go to the
+        // default registers
+        if (!register) {
+          switch (operator) {
+            case 'yank':
+              // The 0 register contains the text from the most recent yank.
+              this.registers['0'] = new Register(text, linewise, blockwise);
+              break;
+            case 'delete':
+            case 'change':
+              if (text.indexOf('\n') == -1) {
+                // Delete less than 1 line. Update the small delete register.
+                this.registers['-'] = new Register(text, linewise);
+              } else {
+                // Shift down the contents of the numbered registers and put the
+                // deleted text into register 1.
+                this.shiftNumericRegisters_();
+                this.registers['1'] = new Register(text, linewise);
+              }
+              break;
+          }
+          // Make sure the unnamed register is set to what just happened
+          this.unnamedRegister.setText(text, linewise, blockwise);
+          return;
+        }
+
+        // If we've gotten to this point, we've actually specified a register
+        var append = isUpperCase(registerName);
+        if (append) {
+          register.pushText(text, linewise);
+        } else {
+          register.setText(text, linewise, blockwise);
+        }
+        // The unnamed register always has the same value as the last used
+        // register.
+        this.unnamedRegister.setText(register.toString(), linewise);
+      },
+      // Gets the register named @name.  If one of @name doesn't already exist,
+      // create it.  If @name is invalid, return the unnamedRegister.
+      getRegister: function(name) {
+        if (!this.isValidRegister(name)) {
+          return this.unnamedRegister;
+        }
+        name = name.toLowerCase();
+        if (!this.registers[name]) {
+          this.registers[name] = new Register();
+        }
+        return this.registers[name];
+      },
+      isValidRegister: function(name) {
+        return name && inArray(name, validRegisters);
+      },
+      shiftNumericRegisters_: function() {
+        for (var i = 9; i >= 2; i--) {
+          this.registers[i] = this.getRegister('' + (i - 1));
+        }
+      }
+    };
+    function HistoryController() {
+        this.historyBuffer = [];
+        this.iterator = 0;
+        this.initialPrefix = null;
+    }
+    HistoryController.prototype = {
+      // the input argument here acts a user entered prefix for a small time
+      // until we start autocompletion in which case it is the autocompleted.
+      nextMatch: function (input, up) {
+        var historyBuffer = this.historyBuffer;
+        var dir = up ? -1 : 1;
+        if (this.initialPrefix === null) this.initialPrefix = input;
+        for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
+          var element = historyBuffer[i];
+          for (var j = 0; j <= element.length; j++) {
+            if (this.initialPrefix == element.substring(0, j)) {
+              this.iterator = i;
+              return element;
+            }
+          }
+        }
+        // should return the user input in case we reach the end of buffer.
+        if (i >= historyBuffer.length) {
+          this.iterator = historyBuffer.length;
+          return this.initialPrefix;
+        }
+        // return the last autocompleted query or exCommand as it is.
+        if (i < 0 ) return input;
+      },
+      pushInput: function(input) {
+        var index = this.historyBuffer.indexOf(input);
+        if (index > -1) this.historyBuffer.splice(index, 1);
+        if (input.length) this.historyBuffer.push(input);
+      },
+      reset: function() {
+        this.initialPrefix = null;
+        this.iterator = this.historyBuffer.length;
+      }
+    };
+    var commandDispatcher = {
+      matchCommand: function(keys, keyMap, inputState, context) {
+        var matches = commandMatches(keys, keyMap, context, inputState);
+        if (!matches.full && !matches.partial) {
+          return {type: 'none'};
+        } else if (!matches.full && matches.partial) {
+          return {type: 'partial'};
+        }
+
+        var bestMatch;
+        for (var i = 0; i < matches.full.length; i++) {
+          var match = matches.full[i];
+          if (!bestMatch) {
+            bestMatch = match;
+          }
+        }
+        if (bestMatch.keys.slice(-11) == '<character>') {
+          var character = lastChar(keys);
+          if (!character) return {type: 'none'};
+          inputState.selectedCharacter = character;
+        }
+        return {type: 'full', command: bestMatch};
+      },
+      processCommand: function(cm, vim, command) {
+        vim.inputState.repeatOverride = command.repeatOverride;
+        switch (command.type) {
+          case 'motion':
+            this.processMotion(cm, vim, command);
+            break;
+          case 'operator':
+            this.processOperator(cm, vim, command);
+            break;
+          case 'operatorMotion':
+            this.processOperatorMotion(cm, vim, command);
+            break;
+          case 'action':
+            this.processAction(cm, vim, command);
+            break;
+          case 'search':
+            this.processSearch(cm, vim, command);
+            break;
+          case 'ex':
+          case 'keyToEx':
+            this.processEx(cm, vim, command);
+            break;
+          default:
+            break;
+        }
+      },
+      processMotion: function(cm, vim, command) {
+        vim.inputState.motion = command.motion;
+        vim.inputState.motionArgs = copyArgs(command.motionArgs);
+        this.evalInput(cm, vim);
+      },
+      processOperator: function(cm, vim, command) {
+        var inputState = vim.inputState;
+        if (inputState.operator) {
+          if (inputState.operator == command.operator) {
+            // Typing an operator twice like 'dd' makes the operator operate
+            // linewise
+            inputState.motion = 'expandToLine';
+            inputState.motionArgs = { linewise: true };
+            this.evalInput(cm, vim);
+            return;
+          } else {
+            // 2 different operators in a row doesn't make sense.
+            clearInputState(cm);
+          }
+        }
+        inputState.operator = command.operator;
+        inputState.operatorArgs = copyArgs(command.operatorArgs);
+        if (vim.visualMode) {
+          // Operating on a selection in visual mode. We don't need a motion.
+          this.evalInput(cm, vim);
+        }
+      },
+      processOperatorMotion: function(cm, vim, command) {
+        var visualMode = vim.visualMode;
+        var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
+        if (operatorMotionArgs) {
+          // Operator motions may have special behavior in visual mode.
+          if (visualMode && operatorMotionArgs.visualLine) {
+            vim.visualLine = true;
+          }
+        }
+        this.processOperator(cm, vim, command);
+        if (!visualMode) {
+          this.processMotion(cm, vim, command);
+        }
+      },
+      processAction: function(cm, vim, command) {
+        var inputState = vim.inputState;
+        var repeat = inputState.getRepeat();
+        var repeatIsExplicit = !!repeat;
+        var actionArgs = copyArgs(command.actionArgs) || {};
+        if (inputState.selectedCharacter) {
+          actionArgs.selectedCharacter = inputState.selectedCharacter;
+        }
+        // Actions may or may not have motions and operators. Do these first.
+        if (command.operator) {
+          this.processOperator(cm, vim, command);
+        }
+        if (command.motion) {
+          this.processMotion(cm, vim, command);
+        }
+        if (command.motion || command.operator) {
+          this.evalInput(cm, vim);
+        }
+        actionArgs.repeat = repeat || 1;
+        actionArgs.repeatIsExplicit = repeatIsExplicit;
+        actionArgs.registerName = inputState.registerName;
+        clearInputState(cm);
+        vim.lastMotion = null;
+        if (command.isEdit) {
+          this.recordLastEdit(vim, inputState, command);
+        }
+        actions[command.action](cm, actionArgs, vim);
+      },
+      processSearch: function(cm, vim, command) {
+        if (!cm.getSearchCursor) {
+          // Search depends on SearchCursor.
+          return;
+        }
+        var forward = command.searchArgs.forward;
+        var wholeWordOnly = command.searchArgs.wholeWordOnly;
+        getSearchState(cm).setReversed(!forward);
+        var promptPrefix = (forward) ? '/' : '?';
+        var originalQuery = getSearchState(cm).getQuery();
+        var originalScrollPos = cm.getScrollInfo();
+        function handleQuery(query, ignoreCase, smartCase) {
+          vimGlobalState.searchHistoryController.pushInput(query);
+          vimGlobalState.searchHistoryController.reset();
+          try {
+            updateSearchQuery(cm, query, ignoreCase, smartCase);
+          } catch (e) {
+            showConfirm(cm, 'Invalid regex: ' + query);
+            clearInputState(cm);
+            return;
+          }
+          commandDispatcher.processMotion(cm, vim, {
+            type: 'motion',
+            motion: 'findNext',
+            motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
+          });
+        }
+        function onPromptClose(query) {
+          cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
+          handleQuery(query, true /** ignoreCase */, true /** smartCase */);
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            logSearchQuery(macroModeState, query);
+          }
+        }
+        function onPromptKeyUp(e, query, close) {
+          var keyName = CodeMirror.keyName(e), up, offset;
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            offset = e.target ? e.target.selectionEnd : 0;
+            query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
+            close(query);
+            if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.searchHistoryController.reset();
+          }
+          var parsedQuery;
+          try {
+            parsedQuery = updateSearchQuery(cm, query,
+                true /** ignoreCase */, true /** smartCase */);
+          } catch (e) {
+            // Swallow bad regexes for incremental search.
+          }
+          if (parsedQuery) {
+            cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
+          } else {
+            clearSearchHighlight(cm);
+            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
+          }
+        }
+        function onPromptKeyDown(e, query, close) {
+          var keyName = CodeMirror.keyName(e);
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && query == '')) {
+            vimGlobalState.searchHistoryController.pushInput(query);
+            vimGlobalState.searchHistoryController.reset();
+            updateSearchQuery(cm, originalQuery);
+            clearSearchHighlight(cm);
+            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
+            CodeMirror.e_stop(e);
+            clearInputState(cm);
+            close();
+            cm.focus();
+          } else if (keyName == 'Up' || keyName == 'Down') {
+            CodeMirror.e_stop(e);
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
+          }
+        }
+        switch (command.searchArgs.querySrc) {
+          case 'prompt':
+            var macroModeState = vimGlobalState.macroModeState;
+            if (macroModeState.isPlaying) {
+              var query = macroModeState.replaySearchQueries.shift();
+              handleQuery(query, true /** ignoreCase */, false /** smartCase */);
+            } else {
+              showPrompt(cm, {
+                  onClose: onPromptClose,
+                  prefix: promptPrefix,
+                  desc: searchPromptDesc,
+                  onKeyUp: onPromptKeyUp,
+                  onKeyDown: onPromptKeyDown
+              });
+            }
+            break;
+          case 'wordUnderCursor':
+            var word = expandWordUnderCursor(cm, false /** inclusive */,
+                true /** forward */, false /** bigWord */,
+                true /** noSymbol */);
+            var isKeyword = true;
+            if (!word) {
+              word = expandWordUnderCursor(cm, false /** inclusive */,
+                  true /** forward */, false /** bigWord */,
+                  false /** noSymbol */);
+              isKeyword = false;
+            }
+            if (!word) {
+              return;
+            }
+            var query = cm.getLine(word.start.line).substring(word.start.ch,
+                word.end.ch);
+            if (isKeyword && wholeWordOnly) {
+                query = '\\b' + query + '\\b';
+            } else {
+              query = escapeRegex(query);
+            }
+
+            // cachedCursor is used to save the old position of the cursor
+            // when * or # causes vim to seek for the nearest word and shift
+            // the cursor before entering the motion.
+            vimGlobalState.jumpList.cachedCursor = cm.getCursor();
+            cm.setCursor(word.start);
+
+            handleQuery(query, true /** ignoreCase */, false /** smartCase */);
+            break;
+        }
+      },
+      processEx: function(cm, vim, command) {
+        function onPromptClose(input) {
+          // Give the prompt some time to close so that if processCommand shows
+          // an error, the elements don't overlap.
+          vimGlobalState.exCommandHistoryController.pushInput(input);
+          vimGlobalState.exCommandHistoryController.reset();
+          exCommandDispatcher.processCommand(cm, input);
+        }
+        function onPromptKeyDown(e, input, close) {
+          var keyName = CodeMirror.keyName(e), up, offset;
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && input == '')) {
+            vimGlobalState.exCommandHistoryController.pushInput(input);
+            vimGlobalState.exCommandHistoryController.reset();
+            CodeMirror.e_stop(e);
+            clearInputState(cm);
+            close();
+            cm.focus();
+          }
+          if (keyName == 'Up' || keyName == 'Down') {
+            CodeMirror.e_stop(e);
+            up = keyName == 'Up' ? true : false;
+            offset = e.target ? e.target.selectionEnd : 0;
+            input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
+            close(input);
+            if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.exCommandHistoryController.reset();
+          }
+        }
+        if (command.type == 'keyToEx') {
+          // Handle user defined Ex to Ex mappings
+          exCommandDispatcher.processCommand(cm, command.exArgs.input);
+        } else {
+          if (vim.visualMode) {
+            showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
+                onKeyDown: onPromptKeyDown, selectValueOnOpen: false});
+          } else {
+            showPrompt(cm, { onClose: onPromptClose, prefix: ':',
+                onKeyDown: onPromptKeyDown});
+          }
+        }
+      },
+      evalInput: function(cm, vim) {
+        // If the motion command is set, execute both the operator and motion.
+        // Otherwise return.
+        var inputState = vim.inputState;
+        var motion = inputState.motion;
+        var motionArgs = inputState.motionArgs || {};
+        var operator = inputState.operator;
+        var operatorArgs = inputState.operatorArgs || {};
+        var registerName = inputState.registerName;
+        var sel = vim.sel;
+        // TODO: Make sure cm and vim selections are identical outside visual mode.
+        var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head'));
+        var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor'));
+        var oldHead = copyCursor(origHead);
+        var oldAnchor = copyCursor(origAnchor);
+        var newHead, newAnchor;
+        var repeat;
+        if (operator) {
+          this.recordLastEdit(vim, inputState);
+        }
+        if (inputState.repeatOverride !== undefined) {
+          // If repeatOverride is specified, that takes precedence over the
+          // input state's repeat. Used by Ex mode and can be user defined.
+          repeat = inputState.repeatOverride;
+        } else {
+          repeat = inputState.getRepeat();
+        }
+        if (repeat > 0 && motionArgs.explicitRepeat) {
+          motionArgs.repeatIsExplicit = true;
+        } else if (motionArgs.noRepeat ||
+            (!motionArgs.explicitRepeat && repeat === 0)) {
+          repeat = 1;
+          motionArgs.repeatIsExplicit = false;
+        }
+        if (inputState.selectedCharacter) {
+          // If there is a character input, stick it in all of the arg arrays.
+          motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
+              inputState.selectedCharacter;
+        }
+        motionArgs.repeat = repeat;
+        clearInputState(cm);
+        if (motion) {
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
+          vim.lastMotion = motions[motion];
+          if (!motionResult) {
+            return;
+          }
+          if (motionArgs.toJumplist) {
+            var jumpList = vimGlobalState.jumpList;
+            // if the current motion is # or *, use cachedCursor
+            var cachedCursor = jumpList.cachedCursor;
+            if (cachedCursor) {
+              recordJumpPosition(cm, cachedCursor, motionResult);
+              delete jumpList.cachedCursor;
+            } else {
+              recordJumpPosition(cm, origHead, motionResult);
+            }
+          }
+          if (motionResult instanceof Array) {
+            newAnchor = motionResult[0];
+            newHead = motionResult[1];
+          } else {
+            newHead = motionResult;
+          }
+          // TODO: Handle null returns from motion commands better.
+          if (!newHead) {
+            newHead = copyCursor(origHead);
+          }
+          if (vim.visualMode) {
+            if (!(vim.visualBlock && newHead.ch === Infinity)) {
+              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+            }
+            if (newAnchor) {
+              newAnchor = clipCursorToContent(cm, newAnchor, true);
+            }
+            newAnchor = newAnchor || oldAnchor;
+            sel.anchor = newAnchor;
+            sel.head = newHead;
+            updateCmSelection(cm);
+            updateMark(cm, vim, '<',
+                cursorIsBefore(newAnchor, newHead) ? newAnchor
+                    : newHead);
+            updateMark(cm, vim, '>',
+                cursorIsBefore(newAnchor, newHead) ? newHead
+                    : newAnchor);
+          } else if (!operator) {
+            newHead = clipCursorToContent(cm, newHead);
+            cm.setCursor(newHead.line, newHead.ch);
+          }
+        }
+        if (operator) {
+          if (operatorArgs.lastSel) {
+            // Replaying a visual mode operation
+            newAnchor = oldAnchor;
+            var lastSel = operatorArgs.lastSel;
+            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
+            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
+            if (lastSel.visualLine) {
+              // Linewise Visual mode: The same number of lines.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            } else if (lastSel.visualBlock) {
+              // Blockwise Visual mode: The same number of lines and columns.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+            } else if (lastSel.head.line == lastSel.anchor.line) {
+              // Normal Visual mode within one line: The same number of characters.
+              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+            } else {
+              // Normal Visual mode with several lines: The same number of lines, in the
+              // last line the same number of characters as in the last line the last time.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            }
+            vim.visualMode = true;
+            vim.visualLine = lastSel.visualLine;
+            vim.visualBlock = lastSel.visualBlock;
+            sel = vim.sel = {
+              anchor: newAnchor,
+              head: newHead
+            };
+            updateCmSelection(cm);
+          } else if (vim.visualMode) {
+            operatorArgs.lastSel = {
+              anchor: copyCursor(sel.anchor),
+              head: copyCursor(sel.head),
+              visualBlock: vim.visualBlock,
+              visualLine: vim.visualLine
+            };
+          }
+          var curStart, curEnd, linewise, mode;
+          var cmSel;
+          if (vim.visualMode) {
+            // Init visual op
+            curStart = cursorMin(sel.head, sel.anchor);
+            curEnd = cursorMax(sel.head, sel.anchor);
+            linewise = vim.visualLine || operatorArgs.linewise;
+            mode = vim.visualBlock ? 'block' :
+                   linewise ? 'line' :
+                   'char';
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode);
+            if (linewise) {
+              var ranges = cmSel.ranges;
+              if (mode == 'block') {
+                // Linewise operators in visual block mode extend to end of line
+                for (var i = 0; i < ranges.length; i++) {
+                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
+                }
+              } else if (mode == 'line') {
+                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+              }
+            }
+          } else {
+            // Init motion op
+            curStart = copyCursor(newAnchor || oldAnchor);
+            curEnd = copyCursor(newHead || oldHead);
+            if (cursorIsBefore(curEnd, curStart)) {
+              var tmp = curStart;
+              curStart = curEnd;
+              curEnd = tmp;
+            }
+            linewise = motionArgs.linewise || operatorArgs.linewise;
+            if (linewise) {
+              // Expand selection to entire line.
+              expandSelectionToLine(cm, curStart, curEnd);
+            } else if (motionArgs.forward) {
+              // Clip to trailing newlines only if the motion goes forward.
+              clipToLine(cm, curStart, curEnd);
+            }
+            mode = 'char';
+            var exclusive = !motionArgs.inclusive || linewise;
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode, exclusive);
+          }
+          cm.setSelections(cmSel.ranges, cmSel.primary);
+          vim.lastMotion = null;
+          operatorArgs.repeat = repeat; // For indent in visual mode.
+          operatorArgs.registerName = registerName;
+          // Keep track of linewise as it affects how paste and change behave.
+          operatorArgs.linewise = linewise;
+          var operatorMoveTo = operators[operator](
+            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
+          if (vim.visualMode) {
+            exitVisualMode(cm, operatorMoveTo != null);
+          }
+          if (operatorMoveTo) {
+            cm.setCursor(operatorMoveTo);
+          }
+        }
+      },
+      recordLastEdit: function(vim, inputState, actionCommand) {
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.isPlaying) { return; }
+        vim.lastEditInputState = inputState;
+        vim.lastEditActionCommand = actionCommand;
+        macroModeState.lastInsertModeChanges.changes = [];
+        macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
+      }
+    };
+
+    /**
+     * typedef {Object{line:number,ch:number}} Cursor An object containing the
+     *     position of the cursor.
+     */
+    // All of the functions below return Cursor objects.
+    var motions = {
+      moveToTopLine: function(cm, _head, motionArgs) {
+        var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+      },
+      moveToMiddleLine: function(cm) {
+        var range = getUserVisibleLines(cm);
+        var line = Math.floor((range.top + range.bottom) * 0.5);
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+      },
+      moveToBottomLine: function(cm, _head, motionArgs) {
+        var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+      },
+      expandToLine: function(_cm, head, motionArgs) {
+        // Expands forward to end of line, and then to next line if repeat is
+        // >1. Does not handle backward motion!
+        var cur = head;
+        return Pos(cur.line + motionArgs.repeat - 1, Infinity);
+      },
+      findNext: function(cm, _head, motionArgs) {
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+        if (!query) {
+          return;
+        }
+        var prev = !motionArgs.forward;
+        // If search is initiated with ? instead of /, negate direction.
+        prev = (state.isReversed()) ? !prev : prev;
+        highlightSearchMatches(cm, query);
+        return findNext(cm, prev/** prev */, query, motionArgs.repeat);
+      },
+      goToMark: function(cm, _head, motionArgs, vim) {
+        var pos = getMarkPos(cm, vim, motionArgs.selectedCharacter);
+        if (pos) {
+          return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
+        }
+        return null;
+      },
+      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
+        if (vim.visualBlock && motionArgs.sameLine) {
+          var sel = vim.sel;
+          return [
+            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+          ];
+        } else {
+          return ([vim.sel.head, vim.sel.anchor]);
+        }
+      },
+      jumpToMark: function(cm, head, motionArgs, vim) {
+        var best = head;
+        for (var i = 0; i < motionArgs.repeat; i++) {
+          var cursor = best;
+          for (var key in vim.marks) {
+            if (!isLowerCase(key)) {
+              continue;
+            }
+            var mark = vim.marks[key].find();
+            var isWrongDirection = (motionArgs.forward) ?
+              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
+
+            if (isWrongDirection) {
+              continue;
+            }
+            if (motionArgs.linewise && (mark.line == cursor.line)) {
+              continue;
+            }
+
+            var equal = cursorEqual(cursor, best);
+            var between = (motionArgs.forward) ?
+              cursorIsBetween(cursor, mark, best) :
+              cursorIsBetween(best, mark, cursor);
+
+            if (equal || between) {
+              best = mark;
+            }
+          }
+        }
+
+        if (motionArgs.linewise) {
+          // Vim places the cursor on the first non-whitespace character of
+          // the line if there is one, else it places the cursor at the end
+          // of the line, regardless of whether a mark was found.
+          best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
+        }
+        return best;
+      },
+      moveByCharacters: function(_cm, head, motionArgs) {
+        var cur = head;
+        var repeat = motionArgs.repeat;
+        var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
+        return Pos(cur.line, ch);
+      },
+      moveByLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
+        var endCh = cur.ch;
+        // Depending what our last motion was, we may want to do different
+        // things. If our last motion was moving vertically, we want to
+        // preserve the HPos from our last horizontal move.  If our last motion
+        // was going to the end of a line, moving vertically we should go to
+        // the end of the line, etc.
+        switch (vim.lastMotion) {
+          case this.moveByLines:
+          case this.moveByDisplayLines:
+          case this.moveByScroll:
+          case this.moveToColumn:
+          case this.moveToEol:
+            endCh = vim.lastHPos;
+            break;
+          default:
+            vim.lastHPos = endCh;
+        }
+        var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
+        var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
+        var first = cm.firstLine();
+        var last = cm.lastLine();
+        // Vim go to line begin or line end when cursor at first/last line and
+        // move to previous/next line is triggered.
+        if (line < first && cur.line == first){
+          return this.moveToStartOfLine(cm, head, motionArgs, vim);
+        }else if (line > last && cur.line == last){
+            return this.moveToEol(cm, head, motionArgs, vim);
+        }
+        if (motionArgs.toFirstChar){
+          endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
+          vim.lastHPos = endCh;
+        }
+        vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
+        return Pos(line, endCh);
+      },
+      moveByDisplayLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
+        switch (vim.lastMotion) {
+          case this.moveByDisplayLines:
+          case this.moveByScroll:
+          case this.moveByLines:
+          case this.moveToColumn:
+          case this.moveToEol:
+            break;
+          default:
+            vim.lastHSPos = cm.charCoords(cur,'div').left;
+        }
+        var repeat = motionArgs.repeat;
+        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
+        if (res.hitSide) {
+          if (motionArgs.forward) {
+            var lastCharCoords = cm.charCoords(res, 'div');
+            var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
+            var res = cm.coordsChar(goalCoords, 'div');
+          } else {
+            var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
+            resCoords.left = vim.lastHSPos;
+            res = cm.coordsChar(resCoords, 'div');
+          }
+        }
+        vim.lastHPos = res.ch;
+        return res;
+      },
+      moveByPage: function(cm, head, motionArgs) {
+        // CodeMirror only exposes functions that move the cursor page down, so
+        // doing this bad hack to move the cursor and move it back. evalInput
+        // will move the cursor to where it should be in the end.
+        var curStart = head;
+        var repeat = motionArgs.repeat;
+        return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
+      },
+      moveByParagraph: function(cm, head, motionArgs) {
+        var dir = motionArgs.forward ? 1 : -1;
+        return findParagraph(cm, head, motionArgs.repeat, dir);
+      },
+      moveBySentence: function(cm, head, motionArgs) {
+        var dir = motionArgs.forward ? 1 : -1;
+        return findSentence(cm, head, motionArgs.repeat, dir);
+      },
+      moveByScroll: function(cm, head, motionArgs, vim) {
+        var scrollbox = cm.getScrollInfo();
+        var curEnd = null;
+        var repeat = motionArgs.repeat;
+        if (!repeat) {
+          repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
+        }
+        var orig = cm.charCoords(head, 'local');
+        motionArgs.repeat = repeat;
+        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
+        if (!curEnd) {
+          return null;
+        }
+        var dest = cm.charCoords(curEnd, 'local');
+        cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
+        return curEnd;
+      },
+      moveByWords: function(cm, head, motionArgs) {
+        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
+            !!motionArgs.wordEnd, !!motionArgs.bigWord);
+      },
+      moveTillCharacter: function(cm, _head, motionArgs) {
+        var repeat = motionArgs.repeat;
+        var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
+            motionArgs.selectedCharacter);
+        var increment = motionArgs.forward ? -1 : 1;
+        recordLastCharacterSearch(increment, motionArgs);
+        if (!curEnd) return null;
+        curEnd.ch += increment;
+        return curEnd;
+      },
+      moveToCharacter: function(cm, head, motionArgs) {
+        var repeat = motionArgs.repeat;
+        recordLastCharacterSearch(0, motionArgs);
+        return moveToCharacter(cm, repeat, motionArgs.forward,
+            motionArgs.selectedCharacter) || head;
+      },
+      moveToSymbol: function(cm, head, motionArgs) {
+        var repeat = motionArgs.repeat;
+        return findSymbol(cm, repeat, motionArgs.forward,
+            motionArgs.selectedCharacter) || head;
+      },
+      moveToColumn: function(cm, head, motionArgs, vim) {
+        var repeat = motionArgs.repeat;
+        // repeat is equivalent to which column we want to move to!
+        vim.lastHPos = repeat - 1;
+        vim.lastHSPos = cm.charCoords(head,'div').left;
+        return moveToColumn(cm, repeat);
+      },
+      moveToEol: function(cm, head, motionArgs, vim) {
+        var cur = head;
+        vim.lastHPos = Infinity;
+        var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
+        var end=cm.clipPos(retval);
+        end.ch--;
+        vim.lastHSPos = cm.charCoords(end,'div').left;
+        return retval;
+      },
+      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
+        // Go to the start of the line where the text begins, or the end for
+        // whitespace-only lines
+        var cursor = head;
+        return Pos(cursor.line,
+                   findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
+      },
+      moveToMatchedSymbol: function(cm, head) {
+        var cursor = head;
+        var line = cursor.line;
+        var ch = cursor.ch;
+        var lineText = cm.getLine(line);
+        var symbol;
+        for (; ch < lineText.length; ch++) {
+          symbol = lineText.charAt(ch);
+          if (symbol && isMatchableSymbol(symbol)) {
+            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
+            if (style !== "string" && style !== "comment") {
+              break;
+            }
+          }
+        }
+        if (ch < lineText.length) {
+          var matched = cm.findMatchingBracket(Pos(line, ch));
+          return matched.to;
+        } else {
+          return cursor;
+        }
+      },
+      moveToStartOfLine: function(_cm, head) {
+        return Pos(head.line, 0);
+      },
+      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
+        var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
+        if (motionArgs.repeatIsExplicit) {
+          lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
+        }
+        return Pos(lineNum,
+                   findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
+      },
+      textObjectManipulation: function(cm, head, motionArgs, vim) {
+        // TODO: lots of possible exceptions that can be thrown here. Try da(
+        //     outside of a () block.
+
+        // TODO: adding <> >< to this map doesn't work, presumably because
+        // they're operators
+        var mirroredPairs = {'(': ')', ')': '(',
+                             '{': '}', '}': '{',
+                             '[': ']', ']': '['};
+        var selfPaired = {'\'': true, '"': true};
+
+        var character = motionArgs.selectedCharacter;
+        // 'b' refers to  '()' block.
+        // 'B' refers to  '{}' block.
+        if (character == 'b') {
+          character = '(';
+        } else if (character == 'B') {
+          character = '{';
+        }
+
+        // Inclusive is the difference between a and i
+        // TODO: Instead of using the additional text object map to perform text
+        //     object operations, merge the map into the defaultKeyMap and use
+        //     motionArgs to define behavior. Define separate entries for 'aw',
+        //     'iw', 'a[', 'i[', etc.
+        var inclusive = !motionArgs.textObjectInner;
+
+        var tmp;
+        if (mirroredPairs[character]) {
+          tmp = selectCompanionObject(cm, head, character, inclusive);
+        } else if (selfPaired[character]) {
+          tmp = findBeginningAndEnd(cm, head, character, inclusive);
+        } else if (character === 'W') {
+          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
+                                                     true /** bigWord */);
+        } else if (character === 'w') {
+          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
+                                                     false /** bigWord */);
+        } else if (character === 'p') {
+          tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
+          motionArgs.linewise = true;
+          if (vim.visualMode) {
+            if (!vim.visualLine) { vim.visualLine = true; }
+          } else {
+            var operatorArgs = vim.inputState.operatorArgs;
+            if (operatorArgs) { operatorArgs.linewise = true; }
+            tmp.end.line--;
+          }
+        } else {
+          // No text object defined for this, don't move.
+          return null;
+        }
+
+        if (!cm.state.vim.visualMode) {
+          return [tmp.start, tmp.end];
+        } else {
+          return expandSelection(cm, tmp.start, tmp.end);
+        }
+      },
+
+      repeatLastCharacterSearch: function(cm, head, motionArgs) {
+        var lastSearch = vimGlobalState.lastCharacterSearch;
+        var repeat = motionArgs.repeat;
+        var forward = motionArgs.forward === lastSearch.forward;
+        var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
+        cm.moveH(-increment, 'char');
+        motionArgs.inclusive = forward ? true : false;
+        var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
+        if (!curEnd) {
+          cm.moveH(increment, 'char');
+          return head;
+        }
+        curEnd.ch += increment;
+        return curEnd;
+      }
+    };
+
+    function defineMotion(name, fn) {
+      motions[name] = fn;
+    }
+
+    function fillArray(val, times) {
+      var arr = [];
+      for (var i = 0; i < times; i++) {
+        arr.push(val);
+      }
+      return arr;
+    }
+    /**
+     * An operator acts on a text selection. It receives the list of selections
+     * as input. The corresponding CodeMirror selection is guaranteed to
+    * match the input selection.
+     */
+    var operators = {
+      change: function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+        if (!vim.visualMode) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          text = cm.getRange(anchor, head);
+          var lastState = vim.lastEditInputState || {};
+          if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
+            // Exclude trailing whitespace if the range is not all whitespace.
+            var match = (/\s+$/).exec(text);
+            if (match && lastState.motionArgs && lastState.motionArgs.forward) {
+              head = offsetCursor(head, 0, - match[0].length);
+              text = text.slice(0, - match[0].length);
+            }
+          }
+          var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
+          var wasLastLine = cm.firstLine() == cm.lastLine();
+          if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
+            cm.replaceRange('', prevLineEnd, head);
+          } else {
+            cm.replaceRange('', anchor, head);
+          }
+          if (args.linewise) {
+            // Push the next line back down, if there is a next line.
+            if (!wasLastLine) {
+              cm.setCursor(prevLineEnd);
+              CodeMirror.commands.newlineAndIndent(cm);
+            }
+            // make sure cursor ends up at the end of the line.
+            anchor.ch = Number.MAX_VALUE;
+          }
+          finalHead = anchor;
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
+        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'change', text,
+            args.linewise, ranges.length > 1);
+        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
+      },
+      // delete is a javascript keyword.
+      'delete': function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        if (!vim.visualBlock) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          if (args.linewise &&
+              head.line != cm.firstLine() &&
+              anchor.line == cm.lastLine() &&
+              anchor.line == head.line - 1) {
+            // Special case for dd on last line (and first line).
+            if (anchor.line == cm.firstLine()) {
+              anchor.ch = 0;
+            } else {
+              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+            }
+          }
+          text = cm.getRange(anchor, head);
+          cm.replaceRange('', anchor, head);
+          finalHead = anchor;
+          if (args.linewise) {
+            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
+          }
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = ranges[0].anchor;
+        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'delete', text,
+            args.linewise, vim.visualBlock);
+        var includeLineBreak = vim.insertMode
+        return clipCursorToContent(cm, finalHead, includeLineBreak);
+      },
+      indent: function(cm, args, ranges) {
+        var vim = cm.state.vim;
+        var startLine = ranges[0].anchor.line;
+        var endLine = vim.visualBlock ?
+          ranges[ranges.length - 1].anchor.line :
+          ranges[0].head.line;
+        // In visual mode, n> shifts the selection right n times, instead of
+        // shifting n lines right once.
+        var repeat = (vim.visualMode) ? args.repeat : 1;
+        if (args.linewise) {
+          // The only way to delete a newline is to delete until the start of
+          // the next line, so in linewise mode evalInput will include the next
+          // line. We don't want this in indent, so we go back a line.
+          endLine--;
+        }
+        for (var i = startLine; i <= endLine; i++) {
+          for (var j = 0; j < repeat; j++) {
+            cm.indentLine(i, args.indentRight);
+          }
+        }
+        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
+      },
+      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
+        var selections = cm.getSelections();
+        var swapped = [];
+        var toLower = args.toLower;
+        for (var j = 0; j < selections.length; j++) {
+          var toSwap = selections[j];
+          var text = '';
+          if (toLower === true) {
+            text = toSwap.toLowerCase();
+          } else if (toLower === false) {
+            text = toSwap.toUpperCase();
+          } else {
+            for (var i = 0; i < toSwap.length; i++) {
+              var character = toSwap.charAt(i);
+              text += isUpperCase(character) ? character.toLowerCase() :
+                  character.toUpperCase();
+            }
+          }
+          swapped.push(text);
+        }
+        cm.replaceSelections(swapped);
+        if (args.shouldMoveCursor){
+          return newHead;
+        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
+          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
+        } else if (args.linewise){
+          return oldAnchor;
+        } else {
+          return cursorMin(ranges[0].anchor, ranges[0].head);
+        }
+      },
+      yank: function(cm, args, ranges, oldAnchor) {
+        var vim = cm.state.vim;
+        var text = cm.getSelection();
+        var endPos = vim.visualMode
+          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
+          : oldAnchor;
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'yank',
+            text, args.linewise, vim.visualBlock);
+        return endPos;
+      }
+    };
+
+    function defineOperator(name, fn) {
+      operators[name] = fn;
+    }
+
+    var actions = {
+      jumpListWalk: function(cm, actionArgs, vim) {
+        if (vim.visualMode) {
+          return;
+        }
+        var repeat = actionArgs.repeat;
+        var forward = actionArgs.forward;
+        var jumpList = vimGlobalState.jumpList;
+
+        var mark = jumpList.move(cm, forward ? repeat : -repeat);
+        var markPos = mark ? mark.find() : undefined;
+        markPos = markPos ? markPos : cm.getCursor();
+        cm.setCursor(markPos);
+      },
+      scroll: function(cm, actionArgs, vim) {
+        if (vim.visualMode) {
+          return;
+        }
+        var repeat = actionArgs.repeat || 1;
+        var lineHeight = cm.defaultTextHeight();
+        var top = cm.getScrollInfo().top;
+        var delta = lineHeight * repeat;
+        var newPos = actionArgs.forward ? top + delta : top - delta;
+        var cursor = copyCursor(cm.getCursor());
+        var cursorCoords = cm.charCoords(cursor, 'local');
+        if (actionArgs.forward) {
+          if (newPos > cursorCoords.top) {
+             cursor.line += (newPos - cursorCoords.top) / lineHeight;
+             cursor.line = Math.ceil(cursor.line);
+             cm.setCursor(cursor);
+             cursorCoords = cm.charCoords(cursor, 'local');
+             cm.scrollTo(null, cursorCoords.top);
+          } else {
+             // Cursor stays within bounds.  Just reposition the scroll window.
+             cm.scrollTo(null, newPos);
+          }
+        } else {
+          var newBottom = newPos + cm.getScrollInfo().clientHeight;
+          if (newBottom < cursorCoords.bottom) {
+             cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
+             cursor.line = Math.floor(cursor.line);
+             cm.setCursor(cursor);
+             cursorCoords = cm.charCoords(cursor, 'local');
+             cm.scrollTo(
+                 null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
+          } else {
+             // Cursor stays within bounds.  Just reposition the scroll window.
+             cm.scrollTo(null, newPos);
+          }
+        }
+      },
+      scrollToCursor: function(cm, actionArgs) {
+        var lineNum = cm.getCursor().line;
+        var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
+        var height = cm.getScrollInfo().clientHeight;
+        var y = charCoords.top;
+        var lineHeight = charCoords.bottom - y;
+        switch (actionArgs.position) {
+          case 'center': y = y - (height / 2) + lineHeight;
+            break;
+          case 'bottom': y = y - height + lineHeight;
+            break;
+        }
+        cm.scrollTo(null, y);
+      },
+      replayMacro: function(cm, actionArgs, vim) {
+        var registerName = actionArgs.selectedCharacter;
+        var repeat = actionArgs.repeat;
+        var macroModeState = vimGlobalState.macroModeState;
+        if (registerName == '@') {
+          registerName = macroModeState.latestRegister;
+        }
+        while(repeat--){
+          executeMacroRegister(cm, vim, macroModeState, registerName);
+        }
+      },
+      enterMacroRecordMode: function(cm, actionArgs) {
+        var macroModeState = vimGlobalState.macroModeState;
+        var registerName = actionArgs.selectedCharacter;
+        if (vimGlobalState.registerController.isValidRegister(registerName)) {
+          macroModeState.enterMacroRecordMode(cm, registerName);
+        }
+      },
+      toggleOverwrite: function(cm) {
+        if (!cm.state.overwrite) {
+          cm.toggleOverwrite(true);
+          cm.setOption('keyMap', 'vim-replace');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
+        } else {
+          cm.toggleOverwrite(false);
+          cm.setOption('keyMap', 'vim-insert');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
+        }
+      },
+      enterInsertMode: function(cm, actionArgs, vim) {
+        if (cm.getOption('readOnly')) { return; }
+        vim.insertMode = true;
+        vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
+        var insertAt = (actionArgs) ? actionArgs.insertAt : null;
+        var sel = vim.sel;
+        var head = actionArgs.head || cm.getCursor('head');
+        var height = cm.listSelections().length;
+        if (insertAt == 'eol') {
+          head = Pos(head.line, lineLength(cm, head.line));
+        } else if (insertAt == 'charAfter') {
+          head = offsetCursor(head, 0, 1);
+        } else if (insertAt == 'firstNonBlank') {
+          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
+        } else if (insertAt == 'startOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line < sel.anchor.line) {
+              head = sel.head;
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.min(sel.head.ch, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
+          }
+        } else if (insertAt == 'endOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line >= sel.anchor.line) {
+              head = offsetCursor(sel.head, 0, 1);
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.max(sel.head.ch + 1, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
+          }
+        } else if (insertAt == 'inplace') {
+          if (vim.visualMode){
+            return;
+          }
+        }
+        cm.setOption('disableInput', false);
+        if (actionArgs && actionArgs.replace) {
+          // Handle Replace-mode as a special case of insert mode.
+          cm.toggleOverwrite(true);
+          cm.setOption('keyMap', 'vim-replace');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
+        } else {
+          cm.toggleOverwrite(false);
+          cm.setOption('keyMap', 'vim-insert');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
+        }
+        if (!vimGlobalState.macroModeState.isPlaying) {
+          // Only record if not replaying.
+          cm.on('change', onChange);
+          CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
+        }
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
+        selectForInsert(cm, head, height);
+      },
+      toggleVisualMode: function(cm, actionArgs, vim) {
+        var repeat = actionArgs.repeat;
+        var anchor = cm.getCursor();
+        var head;
+        // TODO: The repeat should actually select number of characters/lines
+        //     equal to the repeat times the size of the previous visual
+        //     operation.
+        if (!vim.visualMode) {
+          // Entering visual mode
+          vim.visualMode = true;
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          head = clipCursorToContent(
+              cm, Pos(anchor.line, anchor.ch + repeat - 1),
+              true /** includeLineBreak */);
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+        } else if (vim.visualLine ^ actionArgs.linewise ||
+            vim.visualBlock ^ actionArgs.blockwise) {
+          // Toggling between modes
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+        } else {
+          exitVisualMode(cm);
+        }
+      },
+      reselectLastSelection: function(cm, _actionArgs, vim) {
+        var lastSelection = vim.lastSelection;
+        if (vim.visualMode) {
+          updateLastSelection(cm, vim);
+        }
+        if (lastSelection) {
+          var anchor = lastSelection.anchorMark.find();
+          var head = lastSelection.headMark.find();
+          if (!anchor || !head) {
+            // If the marks have been destroyed due to edits, do nothing.
+            return;
+          }
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          vim.visualMode = true;
+          vim.visualLine = lastSelection.visualLine;
+          vim.visualBlock = lastSelection.visualBlock;
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+          CodeMirror.signal(cm, 'vim-mode-change', {
+            mode: 'visual',
+            subMode: vim.visualLine ? 'linewise' :
+                     vim.visualBlock ? 'blockwise' : ''});
+        }
+      },
+      joinLines: function(cm, actionArgs, vim) {
+        var curStart, curEnd;
+        if (vim.visualMode) {
+          curStart = cm.getCursor('anchor');
+          curEnd = cm.getCursor('head');
+          if (cursorIsBefore(curEnd, curStart)) {
+            var tmp = curEnd;
+            curEnd = curStart;
+            curStart = tmp;
+          }
+          curEnd.ch = lineLength(cm, curEnd.line) - 1;
+        } else {
+          // Repeat is the number of lines to join. Minimum 2 lines.
+          var repeat = Math.max(actionArgs.repeat, 2);
+          curStart = cm.getCursor();
+          curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
+                                               Infinity));
+        }
+        var finalCh = 0;
+        for (var i = curStart.line; i < curEnd.line; i++) {
+          finalCh = lineLength(cm, curStart.line);
+          var tmp = Pos(curStart.line + 1,
+                        lineLength(cm, curStart.line + 1));
+          var text = cm.getRange(curStart, tmp);
+          text = text.replace(/\n\s*/g, ' ');
+          cm.replaceRange(text, curStart, tmp);
+        }
+        var curFinalPos = Pos(curStart.line, finalCh);
+        if (vim.visualMode) {
+          exitVisualMode(cm, false);
+        }
+        cm.setCursor(curFinalPos);
+      },
+      newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
+        vim.insertMode = true;
+        var insertAt = copyCursor(cm.getCursor());
+        if (insertAt.line === cm.firstLine() && !actionArgs.after) {
+          // Special case for inserting newline before start of document.
+          cm.replaceRange('\n', Pos(cm.firstLine(), 0));
+          cm.setCursor(cm.firstLine(), 0);
+        } else {
+          insertAt.line = (actionArgs.after) ? insertAt.line :
+              insertAt.line - 1;
+          insertAt.ch = lineLength(cm, insertAt.line);
+          cm.setCursor(insertAt);
+          var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
+              CodeMirror.commands.newlineAndIndent;
+          newlineFn(cm);
+        }
+        this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
+      },
+      paste: function(cm, actionArgs, vim) {
+        var cur = copyCursor(cm.getCursor());
+        var register = vimGlobalState.registerController.getRegister(
+            actionArgs.registerName);
+        var text = register.toString();
+        if (!text) {
+          return;
+        }
+        if (actionArgs.matchIndent) {
+          var tabSize = cm.getOption("tabSize");
+          // length that considers tabs and tabSize
+          var whitespaceLength = function(str) {
+            var tabs = (str.split("\t").length - 1);
+            var spaces = (str.split(" ").length - 1);
+            return tabs * tabSize + spaces * 1;
+          };
+          var currentLine = cm.getLine(cm.getCursor().line);
+          var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
+          // chomp last newline b/c don't want it to match /^\s*/gm
+          var chompedText = text.replace(/\n$/, '');
+          var wasChomped = text !== chompedText;
+          var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
+          var text = chompedText.replace(/^\s*/gm, function(wspace) {
+            var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
+            if (newIndent < 0) {
+              return "";
+            }
+            else if (cm.getOption("indentWithTabs")) {
+              var quotient = Math.floor(newIndent / tabSize);
+              return Array(quotient + 1).join('\t');
+            }
+            else {
+              return Array(newIndent + 1).join(' ');
+            }
+          });
+          text += wasChomped ? "\n" : "";
+        }
+        if (actionArgs.repeat > 1) {
+          var text = Array(actionArgs.repeat + 1).join(text);
+        }
+        var linewise = register.linewise;
+        var blockwise = register.blockwise;
+        if (linewise) {
+          if(vim.visualMode) {
+            text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
+          } else if (actionArgs.after) {
+            // Move the newline at the end to the start instead, and paste just
+            // before the newline character of the line we are on right now.
+            text = '\n' + text.slice(0, text.length - 1);
+            cur.ch = lineLength(cm, cur.line);
+          } else {
+            cur.ch = 0;
+          }
+        } else {
+          if (blockwise) {
+            text = text.split('\n');
+            for (var i = 0; i < text.length; i++) {
+              text[i] = (text[i] == '') ? ' ' : text[i];
+            }
+          }
+          cur.ch += actionArgs.after ? 1 : 0;
+        }
+        var curPosFinal;
+        var idx;
+        if (vim.visualMode) {
+          //  save the pasted text for reselection if the need arises
+          vim.lastPastedText = text;
+          var lastSelectionCurEnd;
+          var selectedArea = getSelectedAreaRange(cm, vim);
+          var selectionStart = selectedArea[0];
+          var selectionEnd = selectedArea[1];
+          var selectedText = cm.getSelection();
+          var selections = cm.listSelections();
+          var emptyStrings = new Array(selections.length).join('1').split('1');
+          // save the curEnd marker before it get cleared due to cm.replaceRange.
+          if (vim.lastSelection) {
+            lastSelectionCurEnd = vim.lastSelection.headMark.find();
+          }
+          // push the previously selected text to unnamed register
+          vimGlobalState.registerController.unnamedRegister.setText(selectedText);
+          if (blockwise) {
+            // first delete the selected text
+            cm.replaceSelections(emptyStrings);
+            // Set new selections as per the block length of the yanked text
+            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
+            cm.setCursor(selectionStart);
+            selectBlock(cm, selectionEnd);
+            cm.replaceSelections(text);
+            curPosFinal = selectionStart;
+          } else if (vim.visualBlock) {
+            cm.replaceSelections(emptyStrings);
+            cm.setCursor(selectionStart);
+            cm.replaceRange(text, selectionStart, selectionStart);
+            curPosFinal = selectionStart;
+          } else {
+            cm.replaceRange(text, selectionStart, selectionEnd);
+            curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
+          }
+          // restore the the curEnd marker
+          if(lastSelectionCurEnd) {
+            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
+          }
+          if (linewise) {
+            curPosFinal.ch=0;
+          }
+        } else {
+          if (blockwise) {
+            cm.setCursor(cur);
+            for (var i = 0; i < text.length; i++) {
+              var line = cur.line+i;
+              if (line > cm.lastLine()) {
+                cm.replaceRange('\n',  Pos(line, 0));
+              }
+              var lastCh = lineLength(cm, line);
+              if (lastCh < cur.ch) {
+                extendLineToColumn(cm, line, cur.ch);
+              }
+            }
+            cm.setCursor(cur);
+            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
+            cm.replaceSelections(text);
+            curPosFinal = cur;
+          } else {
+            cm.replaceRange(text, cur);
+            // Now fine tune the cursor to where we want it.
+            if (linewise && actionArgs.after) {
+              curPosFinal = Pos(
+              cur.line + 1,
+              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
+            } else if (linewise && !actionArgs.after) {
+              curPosFinal = Pos(
+                cur.line,
+                findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
+            } else if (!linewise && actionArgs.after) {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length - 1);
+            } else {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length);
+            }
+          }
+        }
+        if (vim.visualMode) {
+          exitVisualMode(cm, false);
+        }
+        cm.setCursor(curPosFinal);
+      },
+      undo: function(cm, actionArgs) {
+        cm.operation(function() {
+          repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
+          cm.setCursor(cm.getCursor('anchor'));
+        });
+      },
+      redo: function(cm, actionArgs) {
+        repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
+      },
+      setRegister: function(_cm, actionArgs, vim) {
+        vim.inputState.registerName = actionArgs.selectedCharacter;
+      },
+      setMark: function(cm, actionArgs, vim) {
+        var markName = actionArgs.selectedCharacter;
+        updateMark(cm, vim, markName, cm.getCursor());
+      },
+      replace: function(cm, actionArgs, vim) {
+        var replaceWith = actionArgs.selectedCharacter;
+        var curStart = cm.getCursor();
+        var replaceTo;
+        var curEnd;
+        var selections = cm.listSelections();
+        if (vim.visualMode) {
+          curStart = cm.getCursor('start');
+          curEnd = cm.getCursor('end');
+        } else {
+          var line = cm.getLine(curStart.line);
+          replaceTo = curStart.ch + actionArgs.repeat;
+          if (replaceTo > line.length) {
+            replaceTo=line.length;
+          }
+          curEnd = Pos(curStart.line, replaceTo);
+        }
+        if (replaceWith=='\n') {
+          if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
+          // special case, where vim help says to replace by just one line-break
+          (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
+        } else {
+          var replaceWithStr = cm.getRange(curStart, curEnd);
+          //replace all characters in range by selected, but keep linebreaks
+          replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
+          if (vim.visualBlock) {
+            // Tabs are split in visua block before replacing
+            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
+            replaceWithStr = cm.getSelection();
+            replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
+            cm.replaceSelections(replaceWithStr);
+          } else {
+            cm.replaceRange(replaceWithStr, curStart, curEnd);
+          }
+          if (vim.visualMode) {
+            curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
+                         selections[0].anchor : selections[0].head;
+            cm.setCursor(curStart);
+            exitVisualMode(cm, false);
+          } else {
+            cm.setCursor(offsetCursor(curEnd, 0, -1));
+          }
+        }
+      },
+      incrementNumberToken: function(cm, actionArgs) {
+        var cur = cm.getCursor();
+        var lineStr = cm.getLine(cur.line);
+        var re = /(-?)(?:(0x)([\da-f]+)|(0b|0|)(\d+))/gi;
+        var match;
+        var start;
+        var end;
+        var numberStr;
+        while ((match = re.exec(lineStr)) !== null) {
+          start = match.index;
+          end = start + match[0].length;
+          if (cur.ch < end)break;
+        }
+        if (!actionArgs.backtrack && (end <= cur.ch))return;
+        if (match) {
+          var baseStr = match[2] || match[4]
+          var digits = match[3] || match[5]
+          var increment = actionArgs.increase ? 1 : -1;
+          var base = {'0b': 2, '0': 8, '': 10, '0x': 16}[baseStr.toLowerCase()];
+          var number = parseInt(match[1] + digits, base) + (increment * actionArgs.repeat);
+          numberStr = number.toString(base);
+          var zeroPadding = baseStr ? new Array(digits.length - numberStr.length + 1 + match[1].length).join('0') : ''
+          if (numberStr.charAt(0) === '-') {
+            numberStr = '-' + baseStr + zeroPadding + numberStr.substr(1);
+          } else {
+            numberStr = baseStr + zeroPadding + numberStr;
+          }
+          var from = Pos(cur.line, start);
+          var to = Pos(cur.line, end);
+          cm.replaceRange(numberStr, from, to);
+        } else {
+          return;
+        }
+        cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
+      },
+      repeatLastEdit: function(cm, actionArgs, vim) {
+        var lastEditInputState = vim.lastEditInputState;
+        if (!lastEditInputState) { return; }
+        var repeat = actionArgs.repeat;
+        if (repeat && actionArgs.repeatIsExplicit) {
+          vim.lastEditInputState.repeatOverride = repeat;
+        } else {
+          repeat = vim.lastEditInputState.repeatOverride || repeat;
+        }
+        repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
+      },
+      indent: function(cm, actionArgs) {
+        cm.indentLine(cm.getCursor().line, actionArgs.indentRight);
+      },
+      exitInsertMode: exitInsertMode
+    };
+
+    function defineAction(name, fn) {
+      actions[name] = fn;
+    }
+
+    /*
+     * Below are miscellaneous utility functions used by vim.js
+     */
+
+    /**
+     * Clips cursor to ensure that line is within the buffer's range
+     * If includeLineBreak is true, then allow cur.ch == lineLength.
+     */
+    function clipCursorToContent(cm, cur, includeLineBreak) {
+      var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
+      var maxCh = lineLength(cm, line) - 1;
+      maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
+      var ch = Math.min(Math.max(0, cur.ch), maxCh);
+      return Pos(line, ch);
+    }
+    function copyArgs(args) {
+      var ret = {};
+      for (var prop in args) {
+        if (args.hasOwnProperty(prop)) {
+          ret[prop] = args[prop];
+        }
+      }
+      return ret;
+    }
+    function offsetCursor(cur, offsetLine, offsetCh) {
+      if (typeof offsetLine === 'object') {
+        offsetCh = offsetLine.ch;
+        offsetLine = offsetLine.line;
+      }
+      return Pos(cur.line + offsetLine, cur.ch + offsetCh);
+    }
+    function getOffset(anchor, head) {
+      return {
+        line: head.line - anchor.line,
+        ch: head.line - anchor.line
+      };
+    }
+    function commandMatches(keys, keyMap, context, inputState) {
+      // Partial matches are not applied. They inform the key handler
+      // that the current key sequence is a subsequence of a valid key
+      // sequence, so that the key buffer is not cleared.
+      var match, partial = [], full = [];
+      for (var i = 0; i < keyMap.length; i++) {
+        var command = keyMap[i];
+        if (context == 'insert' && command.context != 'insert' ||
+            command.context && command.context != context ||
+            inputState.operator && command.type == 'action' ||
+            !(match = commandMatch(keys, command.keys))) { continue; }
+        if (match == 'partial') { partial.push(command); }
+        if (match == 'full') { full.push(command); }
+      }
+      return {
+        partial: partial.length && partial,
+        full: full.length && full
+      };
+    }
+    function commandMatch(pressed, mapped) {
+      if (mapped.slice(-11) == '<character>') {
+        // Last character matches anything.
+        var prefixLen = mapped.length - 11;
+        var pressedPrefix = pressed.slice(0, prefixLen);
+        var mappedPrefix = mapped.slice(0, prefixLen);
+        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
+               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
+      } else {
+        return pressed == mapped ? 'full' :
+               mapped.indexOf(pressed) == 0 ? 'partial' : false;
+      }
+    }
+    function lastChar(keys) {
+      var match = /^.*(<[^>]+>)$/.exec(keys);
+      var selectedCharacter = match ? match[1] : keys.slice(-1);
+      if (selectedCharacter.length > 1){
+        switch(selectedCharacter){
+          case '<CR>':
+            selectedCharacter='\n';
+            break;
+          case '<Space>':
+            selectedCharacter=' ';
+            break;
+          default:
+            selectedCharacter='';
+            break;
+        }
+      }
+      return selectedCharacter;
+    }
+    function repeatFn(cm, fn, repeat) {
+      return function() {
+        for (var i = 0; i < repeat; i++) {
+          fn(cm);
+        }
+      };
+    }
+    function copyCursor(cur) {
+      return Pos(cur.line, cur.ch);
+    }
+    function cursorEqual(cur1, cur2) {
+      return cur1.ch == cur2.ch && cur1.line == cur2.line;
+    }
+    function cursorIsBefore(cur1, cur2) {
+      if (cur1.line < cur2.line) {
+        return true;
+      }
+      if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
+        return true;
+      }
+      return false;
+    }
+    function cursorMin(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
+      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
+    }
+    function cursorMax(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
+      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
+    }
+    function cursorIsBetween(cur1, cur2, cur3) {
+      // returns true if cur2 is between cur1 and cur3.
+      var cur1before2 = cursorIsBefore(cur1, cur2);
+      var cur2before3 = cursorIsBefore(cur2, cur3);
+      return cur1before2 && cur2before3;
+    }
+    function lineLength(cm, lineNum) {
+      return cm.getLine(lineNum).length;
+    }
+    function trim(s) {
+      if (s.trim) {
+        return s.trim();
+      }
+      return s.replace(/^\s+|\s+$/g, '');
+    }
+    function escapeRegex(s) {
+      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
+    }
+    function extendLineToColumn(cm, lineNum, column) {
+      var endCh = lineLength(cm, lineNum);
+      var spaces = new Array(column-endCh+1).join(' ');
+      cm.setCursor(Pos(lineNum, endCh));
+      cm.replaceRange(spaces, cm.getCursor());
+    }
+    // This functions selects a rectangular block
+    // of text with selectionEnd as any of its corner
+    // Height of block:
+    // Difference in selectionEnd.line and first/last selection.line
+    // Width of the block:
+    // Distance between selectionEnd.ch and any(first considered here) selection.ch
+    function selectBlock(cm, selectionEnd) {
+      var selections = [], ranges = cm.listSelections();
+      var head = copyCursor(cm.clipPos(selectionEnd));
+      var isClipped = !cursorEqual(selectionEnd, head);
+      var curHead = cm.getCursor('head');
+      var primIndex = getIndex(ranges, curHead);
+      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
+      var max = ranges.length - 1;
+      var index = max - primIndex > primIndex ? max : 0;
+      var base = ranges[index].anchor;
+
+      var firstLine = Math.min(base.line, head.line);
+      var lastLine = Math.max(base.line, head.line);
+      var baseCh = base.ch, headCh = head.ch;
+
+      var dir = ranges[index].head.ch - baseCh;
+      var newDir = headCh - baseCh;
+      if (dir > 0 && newDir <= 0) {
+        baseCh++;
+        if (!isClipped) { headCh--; }
+      } else if (dir < 0 && newDir >= 0) {
+        baseCh--;
+        if (!wasClipped) { headCh++; }
+      } else if (dir < 0 && newDir == -1) {
+        baseCh--;
+        headCh++;
+      }
+      for (var line = firstLine; line <= lastLine; line++) {
+        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
+        selections.push(range);
+      }
+      cm.setSelections(selections);
+      selectionEnd.ch = headCh;
+      base.ch = baseCh;
+      return base;
+    }
+    function selectForInsert(cm, head, height) {
+      var sel = [];
+      for (var i = 0; i < height; i++) {
+        var lineHead = offsetCursor(head, i, 0);
+        sel.push({anchor: lineHead, head: lineHead});
+      }
+      cm.setSelections(sel, 0);
+    }
+    // getIndex returns the index of the cursor in the selections.
+    function getIndex(ranges, cursor, end) {
+      for (var i = 0; i < ranges.length; i++) {
+        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
+        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
+        if (atAnchor || atHead) {
+          return i;
+        }
+      }
+      return -1;
+    }
+    function getSelectedAreaRange(cm, vim) {
+      var lastSelection = vim.lastSelection;
+      var getCurrentSelectedAreaRange = function() {
+        var selections = cm.listSelections();
+        var start =  selections[0];
+        var end = selections[selections.length-1];
+        var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
+        var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
+        return [selectionStart, selectionEnd];
+      };
+      var getLastSelectedAreaRange = function() {
+        var selectionStart = cm.getCursor();
+        var selectionEnd = cm.getCursor();
+        var block = lastSelection.visualBlock;
+        if (block) {
+          var width = block.width;
+          var height = block.height;
+          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
+          var selections = [];
+          // selectBlock creates a 'proper' rectangular block.
+          // We do not want that in all cases, so we manually set selections.
+          for (var i = selectionStart.line; i < selectionEnd.line; i++) {
+            var anchor = Pos(i, selectionStart.ch);
+            var head = Pos(i, selectionEnd.ch);
+            var range = {anchor: anchor, head: head};
+            selections.push(range);
+          }
+          cm.setSelections(selections);
+        } else {
+          var start = lastSelection.anchorMark.find();
+          var end = lastSelection.headMark.find();
+          var line = end.line - start.line;
+          var ch = end.ch - start.ch;
+          selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
+          if (lastSelection.visualLine) {
+            selectionStart = Pos(selectionStart.line, 0);
+            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
+          }
+          cm.setSelection(selectionStart, selectionEnd);
+        }
+        return [selectionStart, selectionEnd];
+      };
+      if (!vim.visualMode) {
+      // In case of replaying the action.
+        return getLastSelectedAreaRange();
+      } else {
+        return getCurrentSelectedAreaRange();
+      }
+    }
+    // Updates the previous selection with the current selection's values. This
+    // should only be called in visual mode.
+    function updateLastSelection(cm, vim) {
+      var anchor = vim.sel.anchor;
+      var head = vim.sel.head;
+      // To accommodate the effect of lastPastedText in the last selection
+      if (vim.lastPastedText) {
+        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
+        vim.lastPastedText = null;
+      }
+      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
+                           'headMark': cm.setBookmark(head),
+                           'anchor': copyCursor(anchor),
+                           'head': copyCursor(head),
+                           'visualMode': vim.visualMode,
+                           'visualLine': vim.visualLine,
+                           'visualBlock': vim.visualBlock};
+    }
+    function expandSelection(cm, start, end) {
+      var sel = cm.state.vim.sel;
+      var head = sel.head;
+      var anchor = sel.anchor;
+      var tmp;
+      if (cursorIsBefore(end, start)) {
+        tmp = end;
+        end = start;
+        start = tmp;
+      }
+      if (cursorIsBefore(head, anchor)) {
+        head = cursorMin(start, head);
+        anchor = cursorMax(anchor, end);
+      } else {
+        anchor = cursorMin(start, anchor);
+        head = cursorMax(head, end);
+        head = offsetCursor(head, 0, -1);
+        if (head.ch == -1 && head.line != cm.firstLine()) {
+          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+        }
+      }
+      return [anchor, head];
+    }
+    /**
+     * Updates the CodeMirror selection to match the provided vim selection.
+     * If no arguments are given, it uses the current vim selection state.
+     */
+    function updateCmSelection(cm, sel, mode) {
+      var vim = cm.state.vim;
+      sel = sel || vim.sel;
+      var mode = mode ||
+        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
+      var cmSel = makeCmSelection(cm, sel, mode);
+      cm.setSelections(cmSel.ranges, cmSel.primary);
+      updateFakeCursor(cm);
+    }
+    function makeCmSelection(cm, sel, mode, exclusive) {
+      var head = copyCursor(sel.head);
+      var anchor = copyCursor(sel.anchor);
+      if (mode == 'char') {
+        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        head = offsetCursor(sel.head, 0, headOffset);
+        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'line') {
+        if (!cursorIsBefore(sel.head, sel.anchor)) {
+          anchor.ch = 0;
+
+          var lastLine = cm.lastLine();
+          if (head.line > lastLine) {
+            head.line = lastLine;
+          }
+          head.ch = lineLength(cm, head.line);
+        } else {
+          head.ch = 0;
+          anchor.ch = lineLength(cm, anchor.line);
+        }
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'block') {
+        var top = Math.min(anchor.line, head.line),
+            left = Math.min(anchor.ch, head.ch),
+            bottom = Math.max(anchor.line, head.line),
+            right = Math.max(anchor.ch, head.ch) + 1;
+        var height = bottom - top + 1;
+        var primary = head.line == top ? 0 : height - 1;
+        var ranges = [];
+        for (var i = 0; i < height; i++) {
+          ranges.push({
+            anchor: Pos(top + i, left),
+            head: Pos(top + i, right)
+          });
+        }
+        return {
+          ranges: ranges,
+          primary: primary
+        };
+      }
+    }
+    function getHead(cm) {
+      var cur = cm.getCursor('head');
+      if (cm.getSelection().length == 1) {
+        // Small corner case when only 1 character is selected. The "real"
+        // head is the left of head and anchor.
+        cur = cursorMin(cur, cm.getCursor('anchor'));
+      }
+      return cur;
+    }
+
+    /**
+     * If moveHead is set to false, the CodeMirror selection will not be
+     * touched. The caller assumes the responsibility of putting the cursor
+    * in the right place.
+     */
+    function exitVisualMode(cm, moveHead) {
+      var vim = cm.state.vim;
+      if (moveHead !== false) {
+        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
+      }
+      updateLastSelection(cm, vim);
+      vim.visualMode = false;
+      vim.visualLine = false;
+      vim.visualBlock = false;
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+    }
+
+    // Remove any trailing newlines from the selection. For
+    // example, with the caret at the start of the last word on the line,
+    // 'dw' should word, but not the newline, while 'w' should advance the
+    // caret to the first character of the next line.
+    function clipToLine(cm, curStart, curEnd) {
+      var selection = cm.getRange(curStart, curEnd);
+      // Only clip if the selection ends with trailing newline + whitespace
+      if (/\n\s*$/.test(selection)) {
+        var lines = selection.split('\n');
+        // We know this is all whitespace.
+        lines.pop();
+
+        // Cases:
+        // 1. Last word is an empty line - do not clip the trailing '\n'
+        // 2. Last word is not an empty line - clip the trailing '\n'
+        var line;
+        // Find the line containing the last word, and clip all whitespace up
+        // to it.
+        for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
+          curEnd.line--;
+          curEnd.ch = 0;
+        }
+        // If the last word is not an empty line, clip an additional newline
+        if (line) {
+          curEnd.line--;
+          curEnd.ch = lineLength(cm, curEnd.line);
+        } else {
+          curEnd.ch = 0;
+        }
+      }
+    }
+
+    // Expand the selection to line ends.
+    function expandSelectionToLine(_cm, curStart, curEnd) {
+      curStart.ch = 0;
+      curEnd.ch = 0;
+      curEnd.line++;
+    }
+
+    function findFirstNonWhiteSpaceCharacter(text) {
+      if (!text) {
+        return 0;
+      }
+      var firstNonWS = text.search(/\S/);
+      return firstNonWS == -1 ? text.length : firstNonWS;
+    }
+
+    function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
+      var cur = getHead(cm);
+      var line = cm.getLine(cur.line);
+      var idx = cur.ch;
+
+      // Seek to first word or non-whitespace character, depending on if
+      // noSymbol is true.
+      var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
+      while (!test(line.charAt(idx))) {
+        idx++;
+        if (idx >= line.length) { return null; }
+      }
+
+      if (bigWord) {
+        test = bigWordCharTest[0];
+      } else {
+        test = wordCharTest[0];
+        if (!test(line.charAt(idx))) {
+          test = wordCharTest[1];
+        }
+      }
+
+      var end = idx, start = idx;
+      while (test(line.charAt(end)) && end < line.length) { end++; }
+      while (test(line.charAt(start)) && start >= 0) { start--; }
+      start++;
+
+      if (inclusive) {
+        // If present, include all whitespace after word.
+        // Otherwise, include all whitespace before word, except indentation.
+        var wordEnd = end;
+        while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
+        if (wordEnd == end) {
+          var wordStart = start;
+          while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
+          if (!start) { start = wordStart; }
+        }
+      }
+      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
+    }
+
+    function recordJumpPosition(cm, oldCur, newCur) {
+      if (!cursorEqual(oldCur, newCur)) {
+        vimGlobalState.jumpList.add(cm, oldCur, newCur);
+      }
+    }
+
+    function recordLastCharacterSearch(increment, args) {
+        vimGlobalState.lastCharacterSearch.increment = increment;
+        vimGlobalState.lastCharacterSearch.forward = args.forward;
+        vimGlobalState.lastCharacterSearch.selectedCharacter = args.selectedCharacter;
+    }
+
+    var symbolToMode = {
+        '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
+        '[': 'section', ']': 'section',
+        '*': 'comment', '/': 'comment',
+        'm': 'method', 'M': 'method',
+        '#': 'preprocess'
+    };
+    var findSymbolModes = {
+      bracket: {
+        isComplete: function(state) {
+          if (state.nextCh === state.symb) {
+            state.depth++;
+            if (state.depth >= 1)return true;
+          } else if (state.nextCh === state.reverseSymb) {
+            state.depth--;
+          }
+          return false;
+        }
+      },
+      section: {
+        init: function(state) {
+          state.curMoveThrough = true;
+          state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
+        },
+        isComplete: function(state) {
+          return state.index === 0 && state.nextCh === state.symb;
+        }
+      },
+      comment: {
+        isComplete: function(state) {
+          var found = state.lastCh === '*' && state.nextCh === '/';
+          state.lastCh = state.nextCh;
+          return found;
+        }
+      },
+      // TODO: The original Vim implementation only operates on level 1 and 2.
+      // The current implementation doesn't check for code block level and
+      // therefore it operates on any levels.
+      method: {
+        init: function(state) {
+          state.symb = (state.symb === 'm' ? '{' : '}');
+          state.reverseSymb = state.symb === '{' ? '}' : '{';
+        },
+        isComplete: function(state) {
+          if (state.nextCh === state.symb)return true;
+          return false;
+        }
+      },
+      preprocess: {
+        init: function(state) {
+          state.index = 0;
+        },
+        isComplete: function(state) {
+          if (state.nextCh === '#') {
+            var token = state.lineText.match(/#(\w+)/)[1];
+            if (token === 'endif') {
+              if (state.forward && state.depth === 0) {
+                return true;
+              }
+              state.depth++;
+            } else if (token === 'if') {
+              if (!state.forward && state.depth === 0) {
+                return true;
+              }
+              state.depth--;
+            }
+            if (token === 'else' && state.depth === 0)return true;
+          }
+          return false;
+        }
+      }
+    };
+    function findSymbol(cm, repeat, forward, symb) {
+      var cur = copyCursor(cm.getCursor());
+      var increment = forward ? 1 : -1;
+      var endLine = forward ? cm.lineCount() : -1;
+      var curCh = cur.ch;
+      var line = cur.line;
+      var lineText = cm.getLine(line);
+      var state = {
+        lineText: lineText,
+        nextCh: lineText.charAt(curCh),
+        lastCh: null,
+        index: curCh,
+        symb: symb,
+        reverseSymb: (forward ?  { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
+        forward: forward,
+        depth: 0,
+        curMoveThrough: false
+      };
+      var mode = symbolToMode[symb];
+      if (!mode)return cur;
+      var init = findSymbolModes[mode].init;
+      var isComplete = findSymbolModes[mode].isComplete;
+      if (init) { init(state); }
+      while (line !== endLine && repeat) {
+        state.index += increment;
+        state.nextCh = state.lineText.charAt(state.index);
+        if (!state.nextCh) {
+          line += increment;
+          state.lineText = cm.getLine(line) || '';
+          if (increment > 0) {
+            state.index = 0;
+          } else {
+            var lineLen = state.lineText.length;
+            state.index = (lineLen > 0) ? (lineLen-1) : 0;
+          }
+          state.nextCh = state.lineText.charAt(state.index);
+        }
+        if (isComplete(state)) {
+          cur.line = line;
+          cur.ch = state.index;
+          repeat--;
+        }
+      }
+      if (state.nextCh || state.curMoveThrough) {
+        return Pos(line, state.index);
+      }
+      return cur;
+    }
+
+    /*
+     * Returns the boundaries of the next word. If the cursor in the middle of
+     * the word, then returns the boundaries of the current word, starting at
+     * the cursor. If the cursor is at the start/end of a word, and we are going
+     * forward/backward, respectively, find the boundaries of the next word.
+     *
+     * @param {CodeMirror} cm CodeMirror object.
+     * @param {Cursor} cur The cursor position.
+     * @param {boolean} forward True to search forward. False to search
+     *     backward.
+     * @param {boolean} bigWord True if punctuation count as part of the word.
+     *     False if only [a-zA-Z0-9] characters count as part of the word.
+     * @param {boolean} emptyLineIsWord True if empty lines should be treated
+     *     as words.
+     * @return {Object{from:number, to:number, line: number}} The boundaries of
+     *     the word, or null if there are no more words.
+     */
+    function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
+      var lineNum = cur.line;
+      var pos = cur.ch;
+      var line = cm.getLine(lineNum);
+      var dir = forward ? 1 : -1;
+      var charTests = bigWord ? bigWordCharTest: wordCharTest;
+
+      if (emptyLineIsWord && line == '') {
+        lineNum += dir;
+        line = cm.getLine(lineNum);
+        if (!isLine(cm, lineNum)) {
+          return null;
+        }
+        pos = (forward) ? 0 : line.length;
+      }
+
+      while (true) {
+        if (emptyLineIsWord && line == '') {
+          return { from: 0, to: 0, line: lineNum };
+        }
+        var stop = (dir > 0) ? line.length : -1;
+        var wordStart = stop, wordEnd = stop;
+        // Find bounds of next word.
+        while (pos != stop) {
+          var foundWord = false;
+          for (var i = 0; i < charTests.length && !foundWord; ++i) {
+            if (charTests[i](line.charAt(pos))) {
+              wordStart = pos;
+              // Advance to end of word.
+              while (pos != stop && charTests[i](line.charAt(pos))) {
+                pos += dir;
+              }
+              wordEnd = pos;
+              foundWord = wordStart != wordEnd;
+              if (wordStart == cur.ch && lineNum == cur.line &&
+                  wordEnd == wordStart + dir) {
+                // We started at the end of a word. Find the next one.
+                continue;
+              } else {
+                return {
+                  from: Math.min(wordStart, wordEnd + 1),
+                  to: Math.max(wordStart, wordEnd),
+                  line: lineNum };
+              }
+            }
+          }
+          if (!foundWord) {
+            pos += dir;
+          }
+        }
+        // Advance to next/prev line.
+        lineNum += dir;
+        if (!isLine(cm, lineNum)) {
+          return null;
+        }
+        line = cm.getLine(lineNum);
+        pos = (dir > 0) ? 0 : line.length;
+      }
+    }
+
+    /**
+     * @param {CodeMirror} cm CodeMirror object.
+     * @param {Pos} cur The position to start from.
+     * @param {int} repeat Number of words to move past.
+     * @param {boolean} forward True to search forward. False to search
+     *     backward.
+     * @param {boolean} wordEnd True to move to end of word. False to move to
+     *     beginning of word.
+     * @param {boolean} bigWord True if punctuation count as part of the word.
+     *     False if only alphabet characters count as part of the word.
+     * @return {Cursor} The position the cursor should move to.
+     */
+    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
+      var curStart = copyCursor(cur);
+      var words = [];
+      if (forward && !wordEnd || !forward && wordEnd) {
+        repeat++;
+      }
+      // For 'e', empty lines are not considered words, go figure.
+      var emptyLineIsWord = !(forward && wordEnd);
+      for (var i = 0; i < repeat; i++) {
+        var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
+        if (!word) {
+          var eodCh = lineLength(cm, cm.lastLine());
+          words.push(forward
+              ? {line: cm.lastLine(), from: eodCh, to: eodCh}
+              : {line: 0, from: 0, to: 0});
+          break;
+        }
+        words.push(word);
+        cur = Pos(word.line, forward ? (word.to - 1) : word.from);
+      }
+      var shortCircuit = words.length != repeat;
+      var firstWord = words[0];
+      var lastWord = words.pop();
+      if (forward && !wordEnd) {
+        // w
+        if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
+          // We did not start in the middle of a word. Discard the extra word at the end.
+          lastWord = words.pop();
+        }
+        return Pos(lastWord.line, lastWord.from);
+      } else if (forward && wordEnd) {
+        return Pos(lastWord.line, lastWord.to - 1);
+      } else if (!forward && wordEnd) {
+        // ge
+        if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
+          // We did not start in the middle of a word. Discard the extra word at the end.
+          lastWord = words.pop();
+        }
+        return Pos(lastWord.line, lastWord.to);
+      } else {
+        // b
+        return Pos(lastWord.line, lastWord.from);
+      }
+    }
+
+    function moveToCharacter(cm, repeat, forward, character) {
+      var cur = cm.getCursor();
+      var start = cur.ch;
+      var idx;
+      for (var i = 0; i < repeat; i ++) {
+        var line = cm.getLine(cur.line);
+        idx = charIdxInLine(start, line, character, forward, true);
+        if (idx == -1) {
+          return null;
+        }
+        start = idx;
+      }
+      return Pos(cm.getCursor().line, idx);
+    }
+
+    function moveToColumn(cm, repeat) {
+      // repeat is always >= 1, so repeat - 1 always corresponds
+      // to the column we want to go to.
+      var line = cm.getCursor().line;
+      return clipCursorToContent(cm, Pos(line, repeat - 1));
+    }
+
+    function updateMark(cm, vim, markName, pos) {
+      if (!inArray(markName, validMarks)) {
+        return;
+      }
+      if (vim.marks[markName]) {
+        vim.marks[markName].clear();
+      }
+      vim.marks[markName] = cm.setBookmark(pos);
+    }
+
+    function charIdxInLine(start, line, character, forward, includeChar) {
+      // Search for char in line.
+      // motion_options: {forward, includeChar}
+      // If includeChar = true, include it too.
+      // If forward = true, search forward, else search backwards.
+      // If char is not found on this line, do nothing
+      var idx;
+      if (forward) {
+        idx = line.indexOf(character, start + 1);
+        if (idx != -1 && !includeChar) {
+          idx -= 1;
+        }
+      } else {
+        idx = line.lastIndexOf(character, start - 1);
+        if (idx != -1 && !includeChar) {
+          idx += 1;
+        }
+      }
+      return idx;
+    }
+
+    function findParagraph(cm, head, repeat, dir, inclusive) {
+      var line = head.line;
+      var min = cm.firstLine();
+      var max = cm.lastLine();
+      var start, end, i = line;
+      function isEmpty(i) { return !cm.getLine(i); }
+      function isBoundary(i, dir, any) {
+        if (any) { return isEmpty(i) != isEmpty(i + dir); }
+        return !isEmpty(i) && isEmpty(i + dir);
+      }
+      if (dir) {
+        while (min <= i && i <= max && repeat > 0) {
+          if (isBoundary(i, dir)) { repeat--; }
+          i += dir;
+        }
+        return new Pos(i, 0);
+      }
+
+      var vim = cm.state.vim;
+      if (vim.visualLine && isBoundary(line, 1, true)) {
+        var anchor = vim.sel.anchor;
+        if (isBoundary(anchor.line, -1, true)) {
+          if (!inclusive || anchor.line != line) {
+            line += 1;
+          }
+        }
+      }
+      var startState = isEmpty(line);
+      for (i = line; i <= max && repeat; i++) {
+        if (isBoundary(i, 1, true)) {
+          if (!inclusive || isEmpty(i) != startState) {
+            repeat--;
+          }
+        }
+      }
+      end = new Pos(i, 0);
+      // select boundary before paragraph for the last one
+      if (i > max && !startState) { startState = true; }
+      else { inclusive = false; }
+      for (i = line; i > min; i--) {
+        if (!inclusive || isEmpty(i) == startState || i == line) {
+          if (isBoundary(i, -1, true)) { break; }
+        }
+      }
+      start = new Pos(i, 0);
+      return { start: start, end: end };
+    }
+
+    function findSentence(cm, cur, repeat, dir) {
+
+      /*
+        Takes an index object
+        {
+          line: the line string,
+          ln: line number,
+          pos: index in line,
+          dir: direction of traversal (-1 or 1)
+        }
+        and modifies the line, ln, and pos members to represent the
+        next valid position or sets them to null if there are
+        no more valid positions.
+       */
+      function nextChar(cm, idx) {
+        if (idx.pos + idx.dir < 0 || idx.pos + idx.dir >= idx.line.length) {
+          idx.ln += idx.dir;
+          if (!isLine(cm, idx.ln)) {
+            idx.line = null;
+            idx.ln = null;
+            idx.pos = null;
+            return;
+          }
+          idx.line = cm.getLine(idx.ln);
+          idx.pos = (idx.dir > 0) ? 0 : idx.line.length - 1;
+        }
+        else {
+          idx.pos += idx.dir;
+        }
+      }
+
+      /*
+        Performs one iteration of traversal in forward direction
+        Returns an index object of the new location
+       */
+      function forward(cm, ln, pos, dir) {
+        var line = cm.getLine(ln);
+        var stop = (line === "");
+
+        var curr = {
+          line: line,
+          ln: ln,
+          pos: pos,
+          dir: dir,
+        }
+
+        var last_valid = {
+          ln: curr.ln,
+          pos: curr.pos,
+        }
+
+        var skip_empty_lines = (curr.line === "");
+
+        // Move one step to skip character we start on
+        nextChar(cm, curr);
+
+        while (curr.line !== null) {
+          last_valid.ln = curr.ln;
+          last_valid.pos = curr.pos;
+
+          if (curr.line === "" && !skip_empty_lines) {
+            return { ln: curr.ln, pos: curr.pos, };
+          }
+          else if (stop && curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
+            return { ln: curr.ln, pos: curr.pos, };
+          }
+          else if (isEndOfSentenceSymbol(curr.line[curr.pos])
+            && !stop
+            && (curr.pos === curr.line.length - 1
+              || isWhiteSpaceString(curr.line[curr.pos + 1]))) {
+            stop = true;
+          }
+
+          nextChar(cm, curr);
+        }
+
+        /*
+          Set the position to the last non whitespace character on the last
+          valid line in the case that we reach the end of the document.
+        */
+        var line = cm.getLine(last_valid.ln);
+        last_valid.pos = 0;
+        for(var i = line.length - 1; i >= 0; --i) {
+          if (!isWhiteSpaceString(line[i])) {
+            last_valid.pos = i;
+            break;
+          }
+        }
+
+        return last_valid;
+
+      }
+
+      /*
+        Performs one iteration of traversal in reverse direction
+        Returns an index object of the new location
+       */
+      function reverse(cm, ln, pos, dir) {
+        var line = cm.getLine(ln);
+
+        var curr = {
+          line: line,
+          ln: ln,
+          pos: pos,
+          dir: dir,
+        }
+
+        var last_valid = {
+          ln: curr.ln,
+          pos: null,
+        };
+
+        var skip_empty_lines = (curr.line === "");
+
+        // Move one step to skip character we start on
+        nextChar(cm, curr);
+
+        while (curr.line !== null) {
+
+          if (curr.line === "" && !skip_empty_lines) {
+            if (last_valid.pos !== null) {
+              return last_valid;
+            }
+            else {
+              return { ln: curr.ln, pos: curr.pos };
+            }
+          }
+          else if (isEndOfSentenceSymbol(curr.line[curr.pos])
+              && last_valid.pos !== null
+              && !(curr.ln === last_valid.ln && curr.pos + 1 === last_valid.pos)) {
+            return last_valid;
+          }
+          else if (curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
+            skip_empty_lines = false;
+            last_valid = { ln: curr.ln, pos: curr.pos }
+          }
+
+          nextChar(cm, curr);
+        }
+
+        /*
+          Set the position to the first non whitespace character on the last
+          valid line in the case that we reach the beginning of the document.
+        */
+        var line = cm.getLine(last_valid.ln);
+        last_valid.pos = 0;
+        for(var i = 0; i < line.length; ++i) {
+          if (!isWhiteSpaceString(line[i])) {
+            last_valid.pos = i;
+            break;
+          }
+        }
+        return last_valid;
+      }
+
+      var curr_index = {
+        ln: cur.line,
+        pos: cur.ch,
+      };
+
+      while (repeat > 0) {
+        if (dir < 0) {
+          curr_index = reverse(cm, curr_index.ln, curr_index.pos, dir);
+        }
+        else {
+          curr_index = forward(cm, curr_index.ln, curr_index.pos, dir);
+        }
+        repeat--;
+      }
+
+      return Pos(curr_index.ln, curr_index.pos);
+    }
+
+    // TODO: perhaps this finagling of start and end positions belonds
+    // in codemirror/replaceRange?
+    function selectCompanionObject(cm, head, symb, inclusive) {
+      var cur = head, start, end;
+
+      var bracketRegexp = ({
+        '(': /[()]/, ')': /[()]/,
+        '[': /[[\]]/, ']': /[[\]]/,
+        '{': /[{}]/, '}': /[{}]/})[symb];
+      var openSym = ({
+        '(': '(', ')': '(',
+        '[': '[', ']': '[',
+        '{': '{', '}': '{'})[symb];
+      var curChar = cm.getLine(cur.line).charAt(cur.ch);
+      // Due to the behavior of scanForBracket, we need to add an offset if the
+      // cursor is on a matching open bracket.
+      var offset = curChar === openSym ? 1 : 0;
+
+      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
+      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
+
+      if (!start || !end) {
+        return { start: cur, end: cur };
+      }
+
+      start = start.pos;
+      end = end.pos;
+
+      if ((start.line == end.line && start.ch > end.ch)
+          || (start.line > end.line)) {
+        var tmp = start;
+        start = end;
+        end = tmp;
+      }
+
+      if (inclusive) {
+        end.ch += 1;
+      } else {
+        start.ch += 1;
+      }
+
+      return { start: start, end: end };
+    }
+
+    // Takes in a symbol and a cursor and tries to simulate text objects that
+    // have identical opening and closing symbols
+    // TODO support across multiple lines
+    function findBeginningAndEnd(cm, head, symb, inclusive) {
+      var cur = copyCursor(head);
+      var line = cm.getLine(cur.line);
+      var chars = line.split('');
+      var start, end, i, len;
+      var firstIndex = chars.indexOf(symb);
+
+      // the decision tree is to always look backwards for the beginning first,
+      // but if the cursor is in front of the first instance of the symb,
+      // then move the cursor forward
+      if (cur.ch < firstIndex) {
+        cur.ch = firstIndex;
+        // Why is this line even here???
+        // cm.setCursor(cur.line, firstIndex+1);
+      }
+      // otherwise if the cursor is currently on the closing symbol
+      else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
+        end = cur.ch; // assign end to the current cursor
+        --cur.ch; // make sure to look backwards
+      }
+
+      // if we're currently on the symbol, we've got a start
+      if (chars[cur.ch] == symb && !end) {
+        start = cur.ch + 1; // assign start to ahead of the cursor
+      } else {
+        // go backwards to find the start
+        for (i = cur.ch; i > -1 && !start; i--) {
+          if (chars[i] == symb) {
+            start = i + 1;
+          }
+        }
+      }
+
+      // look forwards for the end symbol
+      if (start && !end) {
+        for (i = start, len = chars.length; i < len && !end; i++) {
+          if (chars[i] == symb) {
+            end = i;
+          }
+        }
+      }
+
+      // nothing found
+      if (!start || !end) {
+        return { start: cur, end: cur };
+      }
+
+      // include the symbols
+      if (inclusive) {
+        --start; ++end;
+      }
+
+      return {
+        start: Pos(cur.line, start),
+        end: Pos(cur.line, end)
+      };
+    }
+
+    // Search functions
+    defineOption('pcre', true, 'boolean');
+    function SearchState() {}
+    SearchState.prototype = {
+      getQuery: function() {
+        return vimGlobalState.query;
+      },
+      setQuery: function(query) {
+        vimGlobalState.query = query;
+      },
+      getOverlay: function() {
+        return this.searchOverlay;
+      },
+      setOverlay: function(overlay) {
+        this.searchOverlay = overlay;
+      },
+      isReversed: function() {
+        return vimGlobalState.isReversed;
+      },
+      setReversed: function(reversed) {
+        vimGlobalState.isReversed = reversed;
+      },
+      getScrollbarAnnotate: function() {
+        return this.annotate;
+      },
+      setScrollbarAnnotate: function(annotate) {
+        this.annotate = annotate;
+      }
+    };
+    function getSearchState(cm) {
+      var vim = cm.state.vim;
+      return vim.searchState_ || (vim.searchState_ = new SearchState());
+    }
+    function dialog(cm, template, shortText, onClose, options) {
+      if (cm.openDialog) {
+        cm.openDialog(template, onClose, { bottom: true, value: options.value,
+            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
+            selectValueOnOpen: false});
+      }
+      else {
+        onClose(prompt(shortText, ''));
+      }
+    }
+    function splitBySlash(argString) {
+      return splitBySeparator(argString, '/');
+    }
+
+    function findUnescapedSlashes(argString) {
+      return findUnescapedSeparators(argString, '/');
+    }
+
+    function splitBySeparator(argString, separator) {
+      var slashes = findUnescapedSeparators(argString, separator) || [];
+      if (!slashes.length) return [];
+      var tokens = [];
+      // in case of strings like foo/bar
+      if (slashes[0] !== 0) return;
+      for (var i = 0; i < slashes.length; i++) {
+        if (typeof slashes[i] == 'number')
+          tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
+      }
+      return tokens;
+    }
+
+    function findUnescapedSeparators(str, separator) {
+      if (!separator)
+        separator = '/';
+
+      var escapeNextChar = false;
+      var slashes = [];
+      for (var i = 0; i < str.length; i++) {
+        var c = str.charAt(i);
+        if (!escapeNextChar && c == separator) {
+          slashes.push(i);
+        }
+        escapeNextChar = !escapeNextChar && (c == '\\');
+      }
+      return slashes;
+    }
+
+    // Translates a search string from ex (vim) syntax into javascript form.
+    function translateRegex(str) {
+      // When these match, add a '\' if unescaped or remove one if escaped.
+      var specials = '|(){';
+      // Remove, but never add, a '\' for these.
+      var unescape = '}';
+      var escapeNextChar = false;
+      var out = [];
+      for (var i = -1; i < str.length; i++) {
+        var c = str.charAt(i) || '';
+        var n = str.charAt(i+1) || '';
+        var specialComesNext = (n && specials.indexOf(n) != -1);
+        if (escapeNextChar) {
+          if (c !== '\\' || !specialComesNext) {
+            out.push(c);
+          }
+          escapeNextChar = false;
+        } else {
+          if (c === '\\') {
+            escapeNextChar = true;
+            // Treat the unescape list as special for removing, but not adding '\'.
+            if (n && unescape.indexOf(n) != -1) {
+              specialComesNext = true;
+            }
+            // Not passing this test means removing a '\'.
+            if (!specialComesNext || n === '\\') {
+              out.push(c);
+            }
+          } else {
+            out.push(c);
+            if (specialComesNext && n !== '\\') {
+              out.push('\\');
+            }
+          }
+        }
+      }
+      return out.join('');
+    }
+
+    // Translates the replace part of a search and replace from ex (vim) syntax into
+    // javascript form.  Similar to translateRegex, but additionally fixes back references
+    // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
+    var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
+    function translateRegexReplace(str) {
+      var escapeNextChar = false;
+      var out = [];
+      for (var i = -1; i < str.length; i++) {
+        var c = str.charAt(i) || '';
+        var n = str.charAt(i+1) || '';
+        if (charUnescapes[c + n]) {
+          out.push(charUnescapes[c+n]);
+          i++;
+        } else if (escapeNextChar) {
+          // At any point in the loop, escapeNextChar is true if the previous
+          // character was a '\' and was not escaped.
+          out.push(c);
+          escapeNextChar = false;
+        } else {
+          if (c === '\\') {
+            escapeNextChar = true;
+            if ((isNumber(n) || n === '$')) {
+              out.push('$');
+            } else if (n !== '/' && n !== '\\') {
+              out.push('\\');
+            }
+          } else {
+            if (c === '$') {
+              out.push('$');
+            }
+            out.push(c);
+            if (n === '/') {
+              out.push('\\');
+            }
+          }
+        }
+      }
+      return out.join('');
+    }
+
+    // Unescape \ and / in the replace part, for PCRE mode.
+    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
+    function unescapeRegexReplace(str) {
+      var stream = new CodeMirror.StringStream(str);
+      var output = [];
+      while (!stream.eol()) {
+        // Search for \.
+        while (stream.peek() && stream.peek() != '\\') {
+          output.push(stream.next());
+        }
+        var matched = false;
+        for (var matcher in unescapes) {
+          if (stream.match(matcher, true)) {
+            matched = true;
+            output.push(unescapes[matcher]);
+            break;
+          }
+        }
+        if (!matched) {
+          // Don't change anything
+          output.push(stream.next());
+        }
+      }
+      return output.join('');
+    }
+
+    /**
+     * Extract the regular expression from the query and return a Regexp object.
+     * Returns null if the query is blank.
+     * If ignoreCase is passed in, the Regexp object will have the 'i' flag set.
+     * If smartCase is passed in, and the query contains upper case letters,
+     *   then ignoreCase is overridden, and the 'i' flag will not be set.
+     * If the query contains the /i in the flag part of the regular expression,
+     *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
+     *   through to the Regex object.
+     */
+    function parseQuery(query, ignoreCase, smartCase) {
+      // First update the last search register
+      var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
+      lastSearchRegister.setText(query);
+      // Check if the query is already a regex.
+      if (query instanceof RegExp) { return query; }
+      // First try to extract regex + flags from the input. If no flags found,
+      // extract just the regex. IE does not accept flags directly defined in
+      // the regex string in the form /regex/flags
+      var slashes = findUnescapedSlashes(query);
+      var regexPart;
+      var forceIgnoreCase;
+      if (!slashes.length) {
+        // Query looks like 'regexp'
+        regexPart = query;
+      } else {
+        // Query looks like 'regexp/...'
+        regexPart = query.substring(0, slashes[0]);
+        var flagsPart = query.substring(slashes[0]);
+        forceIgnoreCase = (flagsPart.indexOf('i') != -1);
+      }
+      if (!regexPart) {
+        return null;
+      }
+      if (!getOption('pcre')) {
+        regexPart = translateRegex(regexPart);
+      }
+      if (smartCase) {
+        ignoreCase = (/^[^A-Z]*$/).test(regexPart);
+      }
+      var regexp = new RegExp(regexPart,
+          (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
+      return regexp;
+    }
+    function showConfirm(cm, text) {
+      if (cm.openNotification) {
+        cm.openNotification('<span style="color: red">' + text + '</span>',
+                            {bottom: true, duration: 5000});
+      } else {
+        alert(text);
+      }
+    }
+    function makePrompt(prefix, desc) {
+      var raw = '<span style="font-family: monospace; white-space: pre">' +
+          (prefix || "") + '<input type="text"></span>';
+      if (desc)
+        raw += ' <span style="color: #888">' + desc + '</span>';
+      return raw;
+    }
+    var searchPromptDesc = '(Javascript regexp)';
+    function showPrompt(cm, options) {
+      var shortText = (options.prefix || '') + ' ' + (options.desc || '');
+      var prompt = makePrompt(options.prefix, options.desc);
+      dialog(cm, prompt, shortText, options.onClose, options);
+    }
+    function regexEqual(r1, r2) {
+      if (r1 instanceof RegExp && r2 instanceof RegExp) {
+          var props = ['global', 'multiline', 'ignoreCase', 'source'];
+          for (var i = 0; i < props.length; i++) {
+              var prop = props[i];
+              if (r1[prop] !== r2[prop]) {
+                  return false;
+              }
+          }
+          return true;
+      }
+      return false;
+    }
+    // Returns true if the query is valid.
+    function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
+      if (!rawQuery) {
+        return;
+      }
+      var state = getSearchState(cm);
+      var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
+      if (!query) {
+        return;
+      }
+      highlightSearchMatches(cm, query);
+      if (regexEqual(query, state.getQuery())) {
+        return query;
+      }
+      state.setQuery(query);
+      return query;
+    }
+    function searchOverlay(query) {
+      if (query.source.charAt(0) == '^') {
+        var matchSol = true;
+      }
+      return {
+        token: function(stream) {
+          if (matchSol && !stream.sol()) {
+            stream.skipToEnd();
+            return;
+          }
+          var match = stream.match(query, false);
+          if (match) {
+            if (match[0].length == 0) {
+              // Matched empty string, skip to next.
+              stream.next();
+              return 'searching';
+            }
+            if (!stream.sol()) {
+              // Backtrack 1 to match \b
+              stream.backUp(1);
+              if (!query.exec(stream.next() + match[0])) {
+                stream.next();
+                return null;
+              }
+            }
+            stream.match(query);
+            return 'searching';
+          }
+          while (!stream.eol()) {
+            stream.next();
+            if (stream.match(query, false)) break;
+          }
+        },
+        query: query
+      };
+    }
+    function highlightSearchMatches(cm, query) {
+      var searchState = getSearchState(cm);
+      var overlay = searchState.getOverlay();
+      if (!overlay || query != overlay.query) {
+        if (overlay) {
+          cm.removeOverlay(overlay);
+        }
+        overlay = searchOverlay(query);
+        cm.addOverlay(overlay);
+        if (cm.showMatchesOnScrollbar) {
+          if (searchState.getScrollbarAnnotate()) {
+            searchState.getScrollbarAnnotate().clear();
+          }
+          searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+        }
+        searchState.setOverlay(overlay);
+      }
+    }
+    function findNext(cm, prev, query, repeat) {
+      if (repeat === undefined) { repeat = 1; }
+      return cm.operation(function() {
+        var pos = cm.getCursor();
+        var cursor = cm.getSearchCursor(query, pos);
+        for (var i = 0; i < repeat; i++) {
+          var found = cursor.find(prev);
+          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
+          if (!found) {
+            // SearchCursor may have returned null because it hit EOF, wrap
+            // around and try again.
+            cursor = cm.getSearchCursor(query,
+                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
+            if (!cursor.find(prev)) {
+              return;
+            }
+          }
+        }
+        return cursor.from();
+      });
+    }
+    function clearSearchHighlight(cm) {
+      var state = getSearchState(cm);
+      cm.removeOverlay(getSearchState(cm).getOverlay());
+      state.setOverlay(null);
+      if (state.getScrollbarAnnotate()) {
+        state.getScrollbarAnnotate().clear();
+        state.setScrollbarAnnotate(null);
+      }
+    }
+    /**
+     * Check if pos is in the specified range, INCLUSIVE.
+     * Range can be specified with 1 or 2 arguments.
+     * If the first range argument is an array, treat it as an array of line
+     * numbers. Match pos against any of the lines.
+     * If the first range argument is a number,
+     *   if there is only 1 range argument, check if pos has the same line
+     *       number
+     *   if there are 2 range arguments, then check if pos is in between the two
+     *       range arguments.
+     */
+    function isInRange(pos, start, end) {
+      if (typeof pos != 'number') {
+        // Assume it is a cursor position. Get the line number.
+        pos = pos.line;
+      }
+      if (start instanceof Array) {
+        return inArray(pos, start);
+      } else {
+        if (end) {
+          return (pos >= start && pos <= end);
+        } else {
+          return pos == start;
+        }
+      }
+    }
+    function getUserVisibleLines(cm) {
+      var scrollInfo = cm.getScrollInfo();
+      var occludeToleranceTop = 6;
+      var occludeToleranceBottom = 10;
+      var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
+      var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
+      var to = cm.coordsChar({left:0, top: bottomY}, 'local');
+      return {top: from.line, bottom: to.line};
+    }
+
+    function getMarkPos(cm, vim, markName) {
+      if (markName == '\'') {
+        var history = cm.doc.history.done;
+        var event = history[history.length - 2];
+        return event && event.ranges && event.ranges[0].head;
+      } else if (markName == '.') {
+        if (cm.doc.history.lastModTime == 0) {
+          return  // If no changes, bail out; don't bother to copy or reverse history array.
+        } else {
+          var changeHistory = cm.doc.history.done.filter(function(el){ if (el.changes !== undefined) { return el } });
+          changeHistory.reverse();
+          var lastEditPos = changeHistory[0].changes[0].to;
+        }
+        return lastEditPos;
+      }
+
+      var mark = vim.marks[markName];
+      return mark && mark.find();
+    }
+
+    var ExCommandDispatcher = function() {
+      this.buildCommandMap_();
+    };
+    ExCommandDispatcher.prototype = {
+      processCommand: function(cm, input, opt_params) {
+        var that = this;
+        cm.operation(function () {
+          cm.curOp.isVimOp = true;
+          that._processCommand(cm, input, opt_params);
+        });
+      },
+      _processCommand: function(cm, input, opt_params) {
+        var vim = cm.state.vim;
+        var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
+        var previousCommand = commandHistoryRegister.toString();
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
+        var inputStream = new CodeMirror.StringStream(input);
+        // update ": with the latest command whether valid or invalid
+        commandHistoryRegister.setText(input);
+        var params = opt_params || {};
+        params.input = input;
+        try {
+          this.parseInput_(cm, inputStream, params);
+        } catch(e) {
+          showConfirm(cm, e);
+          throw e;
+        }
+        var command;
+        var commandName;
+        if (!params.commandName) {
+          // If only a line range is defined, move to the line.
+          if (params.line !== undefined) {
+            commandName = 'move';
+          }
+        } else {
+          command = this.matchCommand_(params.commandName);
+          if (command) {
+            commandName = command.name;
+            if (command.excludeFromCommandHistory) {
+              commandHistoryRegister.setText(previousCommand);
+            }
+            this.parseCommandArgs_(inputStream, params, command);
+            if (command.type == 'exToKey') {
+              // Handle Ex to Key mapping.
+              for (var i = 0; i < command.toKeys.length; i++) {
+                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
+              }
+              return;
+            } else if (command.type == 'exToEx') {
+              // Handle Ex to Ex mapping.
+              this.processCommand(cm, command.toInput);
+              return;
+            }
+          }
+        }
+        if (!commandName) {
+          showConfirm(cm, 'Not an editor command ":' + input + '"');
+          return;
+        }
+        try {
+          exCommands[commandName](cm, params);
+          // Possibly asynchronous commands (e.g. substitute, which might have a
+          // user confirmation), are responsible for calling the callback when
+          // done. All others have it taken care of for them here.
+          if ((!command || !command.possiblyAsync) && params.callback) {
+            params.callback();
+          }
+        } catch(e) {
+          showConfirm(cm, e);
+          throw e;
+        }
+      },
+      parseInput_: function(cm, inputStream, result) {
+        inputStream.eatWhile(':');
+        // Parse range.
+        if (inputStream.eat('%')) {
+          result.line = cm.firstLine();
+          result.lineEnd = cm.lastLine();
+        } else {
+          result.line = this.parseLineSpec_(cm, inputStream);
+          if (result.line !== undefined && inputStream.eat(',')) {
+            result.lineEnd = this.parseLineSpec_(cm, inputStream);
+          }
+        }
+
+        // Parse command name.
+        var commandMatch = inputStream.match(/^(\w+)/);
+        if (commandMatch) {
+          result.commandName = commandMatch[1];
+        } else {
+          result.commandName = inputStream.match(/.*/)[0];
+        }
+
+        return result;
+      },
+      parseLineSpec_: function(cm, inputStream) {
+        var numberMatch = inputStream.match(/^(\d+)/);
+        if (numberMatch) {
+          // Absolute line number plus offset (N+M or N-M) is probably a typo,
+          // not something the user actually wanted. (NB: vim does allow this.)
+          return parseInt(numberMatch[1], 10) - 1;
+        }
+        switch (inputStream.next()) {
+          case '.':
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
+          case '$':
+            return this.parseLineSpecOffset_(inputStream, cm.lastLine());
+          case '\'':
+            var markName = inputStream.next();
+            var markPos = getMarkPos(cm, cm.state.vim, markName);
+            if (!markPos) throw new Error('Mark not set');
+            return this.parseLineSpecOffset_(inputStream, markPos.line);
+          case '-':
+          case '+':
+            inputStream.backUp(1);
+            // Offset is relative to current line if not otherwise specified.
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
+          default:
+            inputStream.backUp(1);
+            return undefined;
+        }
+      },
+      parseLineSpecOffset_: function(inputStream, line) {
+        var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
+        if (offsetMatch) {
+          var offset = parseInt(offsetMatch[2], 10);
+          if (offsetMatch[1] == "-") {
+            line -= offset;
+          } else {
+            line += offset;
+          }
+        }
+        return line;
+      },
+      parseCommandArgs_: function(inputStream, params, command) {
+        if (inputStream.eol()) {
+          return;
+        }
+        params.argString = inputStream.match(/.*/)[0];
+        // Parse command-line arguments
+        var delim = command.argDelimiter || /\s+/;
+        var args = trim(params.argString).split(delim);
+        if (args.length && args[0]) {
+          params.args = args;
+        }
+      },
+      matchCommand_: function(commandName) {
+        // Return the command in the command map that matches the shortest
+        // prefix of the passed in command name. The match is guaranteed to be
+        // unambiguous if the defaultExCommandMap's shortNames are set up
+        // correctly. (see @code{defaultExCommandMap}).
+        for (var i = commandName.length; i > 0; i--) {
+          var prefix = commandName.substring(0, i);
+          if (this.commandMap_[prefix]) {
+            var command = this.commandMap_[prefix];
+            if (command.name.indexOf(commandName) === 0) {
+              return command;
+            }
+          }
+        }
+        return null;
+      },
+      buildCommandMap_: function() {
+        this.commandMap_ = {};
+        for (var i = 0; i < defaultExCommandMap.length; i++) {
+          var command = defaultExCommandMap[i];
+          var key = command.shortName || command.name;
+          this.commandMap_[key] = command;
+        }
+      },
+      map: function(lhs, rhs, ctx) {
+        if (lhs != ':' && lhs.charAt(0) == ':') {
+          if (ctx) { throw Error('Mode not supported for ex mappings'); }
+          var commandName = lhs.substring(1);
+          if (rhs != ':' && rhs.charAt(0) == ':') {
+            // Ex to Ex mapping
+            this.commandMap_[commandName] = {
+              name: commandName,
+              type: 'exToEx',
+              toInput: rhs.substring(1),
+              user: true
+            };
+          } else {
+            // Ex to key mapping
+            this.commandMap_[commandName] = {
+              name: commandName,
+              type: 'exToKey',
+              toKeys: rhs,
+              user: true
+            };
+          }
+        } else {
+          if (rhs != ':' && rhs.charAt(0) == ':') {
+            // Key to Ex mapping.
+            var mapping = {
+              keys: lhs,
+              type: 'keyToEx',
+              exArgs: { input: rhs.substring(1) }
+            };
+            if (ctx) { mapping.context = ctx; }
+            defaultKeymap.unshift(mapping);
+          } else {
+            // Key to key mapping
+            var mapping = {
+              keys: lhs,
+              type: 'keyToKey',
+              toKeys: rhs
+            };
+            if (ctx) { mapping.context = ctx; }
+            defaultKeymap.unshift(mapping);
+          }
+        }
+      },
+      unmap: function(lhs, ctx) {
+        if (lhs != ':' && lhs.charAt(0) == ':') {
+          // Ex to Ex or Ex to key mapping
+          if (ctx) { throw Error('Mode not supported for ex mappings'); }
+          var commandName = lhs.substring(1);
+          if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
+            delete this.commandMap_[commandName];
+            return;
+          }
+        } else {
+          // Key to Ex or key to key mapping
+          var keys = lhs;
+          for (var i = 0; i < defaultKeymap.length; i++) {
+            if (keys == defaultKeymap[i].keys
+                && defaultKeymap[i].context === ctx) {
+              defaultKeymap.splice(i, 1);
+              return;
+            }
+          }
+        }
+        throw Error('No such mapping.');
+      }
+    };
+
+    var exCommands = {
+      colorscheme: function(cm, params) {
+        if (!params.args || params.args.length < 1) {
+          showConfirm(cm, cm.getOption('theme'));
+          return;
+        }
+        cm.setOption('theme', params.args[0]);
+      },
+      map: function(cm, params, ctx) {
+        var mapArgs = params.args;
+        if (!mapArgs || mapArgs.length < 2) {
+          if (cm) {
+            showConfirm(cm, 'Invalid mapping: ' + params.input);
+          }
+          return;
+        }
+        exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
+      },
+      imap: function(cm, params) { this.map(cm, params, 'insert'); },
+      nmap: function(cm, params) { this.map(cm, params, 'normal'); },
+      vmap: function(cm, params) { this.map(cm, params, 'visual'); },
+      unmap: function(cm, params, ctx) {
+        var mapArgs = params.args;
+        if (!mapArgs || mapArgs.length < 1) {
+          if (cm) {
+            showConfirm(cm, 'No such mapping: ' + params.input);
+          }
+          return;
+        }
+        exCommandDispatcher.unmap(mapArgs[0], ctx);
+      },
+      move: function(cm, params) {
+        commandDispatcher.processCommand(cm, cm.state.vim, {
+            type: 'motion',
+            motion: 'moveToLineOrEdgeOfDocument',
+            motionArgs: { forward: false, explicitRepeat: true,
+              linewise: true },
+            repeatOverride: params.line+1});
+      },
+      set: function(cm, params) {
+        var setArgs = params.args;
+        // Options passed through to the setOption/getOption calls. May be passed in by the
+        // local/global versions of the set command
+        var setCfg = params.setCfg || {};
+        if (!setArgs || setArgs.length < 1) {
+          if (cm) {
+            showConfirm(cm, 'Invalid mapping: ' + params.input);
+          }
+          return;
+        }
+        var expr = setArgs[0].split('=');
+        var optionName = expr[0];
+        var value = expr[1];
+        var forceGet = false;
+
+        if (optionName.charAt(optionName.length - 1) == '?') {
+          // If post-fixed with ?, then the set is actually a get.
+          if (value) { throw Error('Trailing characters: ' + params.argString); }
+          optionName = optionName.substring(0, optionName.length - 1);
+          forceGet = true;
+        }
+        if (value === undefined && optionName.substring(0, 2) == 'no') {
+          // To set boolean options to false, the option name is prefixed with
+          // 'no'.
+          optionName = optionName.substring(2);
+          value = false;
+        }
+
+        var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
+        if (optionIsBoolean && value == undefined) {
+          // Calling set with a boolean option sets it to true.
+          value = true;
+        }
+        // If no value is provided, then we assume this is a get.
+        if (!optionIsBoolean && value === undefined || forceGet) {
+          var oldValue = getOption(optionName, cm, setCfg);
+          if (oldValue instanceof Error) {
+            showConfirm(cm, oldValue.message);
+          } else if (oldValue === true || oldValue === false) {
+            showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
+          } else {
+            showConfirm(cm, '  ' + optionName + '=' + oldValue);
+          }
+        } else {
+          var setOptionReturn = setOption(optionName, value, cm, setCfg);
+          if (setOptionReturn instanceof Error) {
+            showConfirm(cm, setOptionReturn.message);
+          }
+        }
+      },
+      setlocal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'local'};
+        this.set(cm, params);
+      },
+      setglobal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'global'};
+        this.set(cm, params);
+      },
+      registers: function(cm, params) {
+        var regArgs = params.args;
+        var registers = vimGlobalState.registerController.registers;
+        var regInfo = '----------Registers----------<br><br>';
+        if (!regArgs) {
+          for (var registerName in registers) {
+            var text = registers[registerName].toString();
+            if (text.length) {
+              regInfo += '"' + registerName + '    ' + text + '<br>';
+            }
+          }
+        } else {
+          var registerName;
+          regArgs = regArgs.join('');
+          for (var i = 0; i < regArgs.length; i++) {
+            registerName = regArgs.charAt(i);
+            if (!vimGlobalState.registerController.isValidRegister(registerName)) {
+              continue;
+            }
+            var register = registers[registerName] || new Register();
+            regInfo += '"' + registerName + '    ' + register.toString() + '<br>';
+          }
+        }
+        showConfirm(cm, regInfo);
+      },
+      sort: function(cm, params) {
+        var reverse, ignoreCase, unique, number, pattern;
+        function parseArgs() {
+          if (params.argString) {
+            var args = new CodeMirror.StringStream(params.argString);
+            if (args.eat('!')) { reverse = true; }
+            if (args.eol()) { return; }
+            if (!args.eatSpace()) { return 'Invalid arguments'; }
+            var opts = args.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);
+            if (!opts && !args.eol()) { return 'Invalid arguments'; }
+            if (opts[1]) {
+              ignoreCase = opts[1].indexOf('i') != -1;
+              unique = opts[1].indexOf('u') != -1;
+              var decimal = opts[1].indexOf('d') != -1 || opts[1].indexOf('n') != -1 && 1;
+              var hex = opts[1].indexOf('x') != -1 && 1;
+              var octal = opts[1].indexOf('o') != -1 && 1;
+              if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
+              number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
+            }
+            if (opts[2]) {
+              pattern = new RegExp(opts[2].substr(1, opts[2].length - 2), ignoreCase ? 'i' : '');
+            }
+          }
+        }
+        var err = parseArgs();
+        if (err) {
+          showConfirm(cm, err + ': ' + params.argString);
+          return;
+        }
+        var lineStart = params.line || cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        if (lineStart == lineEnd) { return; }
+        var curStart = Pos(lineStart, 0);
+        var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
+        var text = cm.getRange(curStart, curEnd).split('\n');
+        var numberRegex = pattern ? pattern :
+           (number == 'decimal') ? /(-?)([\d]+)/ :
+           (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
+           (number == 'octal') ? /([0-7]+)/ : null;
+        var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
+        var numPart = [], textPart = [];
+        if (number || pattern) {
+          for (var i = 0; i < text.length; i++) {
+            var matchPart = pattern ? text[i].match(pattern) : null;
+            if (matchPart && matchPart[0] != '') {
+              numPart.push(matchPart);
+            } else if (!pattern && numberRegex.exec(text[i])) {
+              numPart.push(text[i]);
+            } else {
+              textPart.push(text[i]);
+            }
+          }
+        } else {
+          textPart = text;
+        }
+        function compareFn(a, b) {
+          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
+          if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
+          var anum = number && numberRegex.exec(a);
+          var bnum = number && numberRegex.exec(b);
+          if (!anum) { return a < b ? -1 : 1; }
+          anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
+          bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
+          return anum - bnum;
+        }
+        function comparePatternFn(a, b) {
+          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
+          if (ignoreCase) { a[0] = a[0].toLowerCase(); b[0] = b[0].toLowerCase(); }
+          return (a[0] < b[0]) ? -1 : 1;
+        }
+        numPart.sort(pattern ? comparePatternFn : compareFn);
+        if (pattern) {
+          for (var i = 0; i < numPart.length; i++) {
+            numPart[i] = numPart[i].input;
+          }
+        } else if (!number) { textPart.sort(compareFn); }
+        text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
+        if (unique) { // Remove duplicate lines
+          var textOld = text;
+          var lastLine;
+          text = [];
+          for (var i = 0; i < textOld.length; i++) {
+            if (textOld[i] != lastLine) {
+              text.push(textOld[i]);
+            }
+            lastLine = textOld[i];
+          }
+        }
+        cm.replaceRange(text.join('\n'), curStart, curEnd);
+      },
+      global: function(cm, params) {
+        // a global command is of the form
+        // :[range]g/pattern/[cmd]
+        // argString holds the string /pattern/[cmd]
+        var argString = params.argString;
+        if (!argString) {
+          showConfirm(cm, 'Regular Expression missing from global');
+          return;
+        }
+        // range is specified here
+        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        // get the tokens from argString
+        var tokens = splitBySlash(argString);
+        var regexPart = argString, cmd;
+        if (tokens.length) {
+          regexPart = tokens[0];
+          cmd = tokens.slice(1, tokens.length).join('/');
+        }
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise
+          // use the regex part as the new query.
+          try {
+           updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+             true /** smartCase */);
+          } catch (e) {
+           showConfirm(cm, 'Invalid regex: ' + regexPart);
+           return;
+          }
+        }
+        // now that we have the regexPart, search for regex matches in the
+        // specified range of lines
+        var query = getSearchState(cm).getQuery();
+        var matchedLines = [], content = '';
+        for (var i = lineStart; i <= lineEnd; i++) {
+          var matched = query.test(cm.getLine(i));
+          if (matched) {
+            matchedLines.push(i+1);
+            content+= cm.getLine(i) + '<br>';
+          }
+        }
+        // if there is no [cmd], just display the list of matched lines
+        if (!cmd) {
+          showConfirm(cm, content);
+          return;
+        }
+        var index = 0;
+        var nextCommand = function() {
+          if (index < matchedLines.length) {
+            var command = matchedLines[index] + cmd;
+            exCommandDispatcher.processCommand(cm, command, {
+              callback: nextCommand
+            });
+          }
+          index++;
+        };
+        nextCommand();
+      },
+      substitute: function(cm, params) {
+        if (!cm.getSearchCursor) {
+          throw new Error('Search feature not available. Requires searchcursor.js or ' +
+              'any other getSearchCursor implementation.');
+        }
+        var argString = params.argString;
+        var tokens = argString ? splitBySeparator(argString, argString[0]) : [];
+        var regexPart, replacePart = '', trailing, flagsPart, count;
+        var confirm = false; // Whether to confirm each replace.
+        var global = false; // True to replace all instances on a line, false to replace only 1.
+        if (tokens.length) {
+          regexPart = tokens[0];
+          replacePart = tokens[1];
+          if (regexPart && regexPart[regexPart.length - 1] === '$') {
+            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
+            replacePart = replacePart ? replacePart + '\n' : '\n';
+          }
+          if (replacePart !== undefined) {
+            if (getOption('pcre')) {
+              replacePart = unescapeRegexReplace(replacePart);
+            } else {
+              replacePart = translateRegexReplace(replacePart);
+            }
+            vimGlobalState.lastSubstituteReplacePart = replacePart;
+          }
+          trailing = tokens[2] ? tokens[2].split(' ') : [];
+        } else {
+          // either the argString is empty or its of the form ' hello/world'
+          // actually splitBySlash returns a list of tokens
+          // only if the string starts with a '/'
+          if (argString && argString.length) {
+            showConfirm(cm, 'Substitutions should be of the form ' +
+                ':s/pattern/replace/');
+            return;
+          }
+        }
+        // After the 3rd slash, we can have flags followed by a space followed
+        // by count.
+        if (trailing) {
+          flagsPart = trailing[0];
+          count = parseInt(trailing[1]);
+          if (flagsPart) {
+            if (flagsPart.indexOf('c') != -1) {
+              confirm = true;
+              flagsPart.replace('c', '');
+            }
+            if (flagsPart.indexOf('g') != -1) {
+              global = true;
+              flagsPart.replace('g', '');
+            }
+            regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
+          }
+        }
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise use
+          // the regex part as the new query.
+          try {
+            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+              true /** smartCase */);
+          } catch (e) {
+            showConfirm(cm, 'Invalid regex: ' + regexPart);
+            return;
+          }
+        }
+        replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart;
+        if (replacePart === undefined) {
+          showConfirm(cm, 'No previous substitute regular expression');
+          return;
+        }
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
+        var lineEnd = params.lineEnd || lineStart;
+        if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) {
+          lineEnd = Infinity;
+        }
+        if (count) {
+          lineStart = lineEnd;
+          lineEnd = lineStart + count - 1;
+        }
+        var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
+        var cursor = cm.getSearchCursor(query, startPos);
+        doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
+      },
+      redo: CodeMirror.commands.redo,
+      undo: CodeMirror.commands.undo,
+      write: function(cm) {
+        if (CodeMirror.commands.save) {
+          // If a save command is defined, call it.
+          CodeMirror.commands.save(cm);
+        } else if (cm.save) {
+          // Saves to text area if no save command is defined and cm.save() is available.
+          cm.save();
+        }
+      },
+      nohlsearch: function(cm) {
+        clearSearchHighlight(cm);
+      },
+      yank: function (cm) {
+        var cur = copyCursor(cm.getCursor());
+        var line = cur.line;
+        var lineText = cm.getLine(line);
+        vimGlobalState.registerController.pushText(
+          '0', 'yank', lineText, true, true);
+      },
+      delmarks: function(cm, params) {
+        if (!params.argString || !trim(params.argString)) {
+          showConfirm(cm, 'Argument required');
+          return;
+        }
+
+        var state = cm.state.vim;
+        var stream = new CodeMirror.StringStream(trim(params.argString));
+        while (!stream.eol()) {
+          stream.eatSpace();
+
+          // Record the streams position at the beginning of the loop for use
+          // in error messages.
+          var count = stream.pos;
+
+          if (!stream.match(/[a-zA-Z]/, false)) {
+            showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
+            return;
+          }
+
+          var sym = stream.next();
+          // Check if this symbol is part of a range
+          if (stream.match('-', true)) {
+            // This symbol is part of a range.
+
+            // The range must terminate at an alphabetic character.
+            if (!stream.match(/[a-zA-Z]/, false)) {
+              showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
+              return;
+            }
+
+            var startMark = sym;
+            var finishMark = stream.next();
+            // The range must terminate at an alphabetic character which
+            // shares the same case as the start of the range.
+            if (isLowerCase(startMark) && isLowerCase(finishMark) ||
+                isUpperCase(startMark) && isUpperCase(finishMark)) {
+              var start = startMark.charCodeAt(0);
+              var finish = finishMark.charCodeAt(0);
+              if (start >= finish) {
+                showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
+                return;
+              }
+
+              // Because marks are always ASCII values, and we have
+              // determined that they are the same case, we can use
+              // their char codes to iterate through the defined range.
+              for (var j = 0; j <= finish - start; j++) {
+                var mark = String.fromCharCode(start + j);
+                delete state.marks[mark];
+              }
+            } else {
+              showConfirm(cm, 'Invalid argument: ' + startMark + '-');
+              return;
+            }
+          } else {
+            // This symbol is a valid mark, and is not part of a range.
+            delete state.marks[sym];
+          }
+        }
+      }
+    };
+
+    var exCommandDispatcher = new ExCommandDispatcher();
+
+    /**
+    * @param {CodeMirror} cm CodeMirror instance we are in.
+    * @param {boolean} confirm Whether to confirm each replace.
+    * @param {Cursor} lineStart Line to start replacing from.
+    * @param {Cursor} lineEnd Line to stop replacing at.
+    * @param {RegExp} query Query for performing matches with.
+    * @param {string} replaceWith Text to replace matches with. May contain $1,
+    *     $2, etc for replacing captured groups using Javascript replace.
+    * @param {function()} callback A callback for when the replace is done.
+    */
+    function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
+        replaceWith, callback) {
+      // Set up all the functions.
+      cm.state.vim.exMode = true;
+      var done = false;
+      var lastPos = searchCursor.from();
+      function replaceAll() {
+        cm.operation(function() {
+          while (!done) {
+            replace();
+            next();
+          }
+          stop();
+        });
+      }
+      function replace() {
+        var text = cm.getRange(searchCursor.from(), searchCursor.to());
+        var newText = text.replace(query, replaceWith);
+        searchCursor.replace(newText);
+      }
+      function next() {
+        // The below only loops to skip over multiple occurrences on the same
+        // line when 'global' is not true.
+        while(searchCursor.findNext() &&
+              isInRange(searchCursor.from(), lineStart, lineEnd)) {
+          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
+            continue;
+          }
+          cm.scrollIntoView(searchCursor.from(), 30);
+          cm.setSelection(searchCursor.from(), searchCursor.to());
+          lastPos = searchCursor.from();
+          done = false;
+          return;
+        }
+        done = true;
+      }
+      function stop(close) {
+        if (close) { close(); }
+        cm.focus();
+        if (lastPos) {
+          cm.setCursor(lastPos);
+          var vim = cm.state.vim;
+          vim.exMode = false;
+          vim.lastHPos = vim.lastHSPos = lastPos.ch;
+        }
+        if (callback) { callback(); }
+      }
+      function onPromptKeyDown(e, _value, close) {
+        // Swallow all keys.
+        CodeMirror.e_stop(e);
+        var keyName = CodeMirror.keyName(e);
+        switch (keyName) {
+          case 'Y':
+            replace(); next(); break;
+          case 'N':
+            next(); break;
+          case 'A':
+            // replaceAll contains a call to close of its own. We don't want it
+            // to fire too early or multiple times.
+            var savedCallback = callback;
+            callback = undefined;
+            cm.operation(replaceAll);
+            callback = savedCallback;
+            break;
+          case 'L':
+            replace();
+            // fall through and exit.
+          case 'Q':
+          case 'Esc':
+          case 'Ctrl-C':
+          case 'Ctrl-[':
+            stop(close);
+            break;
+        }
+        if (done) { stop(close); }
+        return true;
+      }
+
+      // Actually do replace.
+      next();
+      if (done) {
+        showConfirm(cm, 'No matches for ' + query.source);
+        return;
+      }
+      if (!confirm) {
+        replaceAll();
+        if (callback) { callback(); }
+        return;
+      }
+      showPrompt(cm, {
+        prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)',
+        onKeyDown: onPromptKeyDown
+      });
+    }
+
+    CodeMirror.keyMap.vim = {
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
+
+    function exitInsertMode(cm) {
+      var vim = cm.state.vim;
+      var macroModeState = vimGlobalState.macroModeState;
+      var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
+      var isPlaying = macroModeState.isPlaying;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      // In case of visual block, the insertModeChanges are not saved as a
+      // single word, so we convert them to a single word
+      // so as to update the ". register as expected in real vim.
+      var text = [];
+      if (!isPlaying) {
+        var selLength = lastChange.inVisualBlock && vim.lastSelection ?
+            vim.lastSelection.visualBlock.height : 1;
+        var changes = lastChange.changes;
+        var text = [];
+        var i = 0;
+        // In case of multiple selections in blockwise visual,
+        // the inserted text, for example: 'f<Backspace>oo', is stored as
+        // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
+        // We push the contents of the changes array as per the following:
+        // 1. In case of InsertModeKey, just increment by 1.
+        // 2. In case of a character, jump by selLength (2 in the example).
+        while (i < changes.length) {
+          // This loop will convert 'ff<bs>oooo' to 'f<bs>oo'.
+          text.push(changes[i]);
+          if (changes[i] instanceof InsertModeKey) {
+             i++;
+          } else {
+             i+= selLength;
+          }
+        }
+        lastChange.changes = text;
+        cm.off('change', onChange);
+        CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
+      }
+      if (!isPlaying && vim.insertModeRepeat > 1) {
+        // Perform insert mode repeat for commands like 3,a and 3,o.
+        repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
+            true /** repeatForInsert */);
+        vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
+      }
+      delete vim.insertModeRepeat;
+      vim.insertMode = false;
+      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
+      cm.setOption('keyMap', 'vim');
+      cm.setOption('disableInput', true);
+      cm.toggleOverwrite(false); // exit replace mode if we were in it.
+      // update the ". register before exiting insert mode
+      insertModeChangeRegister.setText(lastChange.changes.join(''));
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (macroModeState.isRecording) {
+        logInsertModeChange(macroModeState);
+      }
+    }
+
+    function _mapCommand(command) {
+      defaultKeymap.unshift(command);
+    }
+
+    function mapCommand(keys, type, name, args, extra) {
+      var command = {keys: keys, type: type};
+      command[type] = name;
+      command[type + "Args"] = args;
+      for (var key in extra)
+        command[key] = extra[key];
+      _mapCommand(command);
+    }
+
+    // The timeout in milliseconds for the two-character ESC keymap should be
+    // adjusted according to your typing speed to prevent false positives.
+    defineOption('insertModeEscKeysTimeout', 200, 'number');
+
+    CodeMirror.keyMap['vim-insert'] = {
+      // TODO: override navigation keys so that Esc will cancel automatic
+      // indentation from o, O, i_<CR>
+      fallthrough: ['default'],
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
+
+    CodeMirror.keyMap['vim-replace'] = {
+      'Backspace': 'goCharLeft',
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
+
+    function executeMacroRegister(cm, vim, macroModeState, registerName) {
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (registerName == ':') {
+        // Read-only register containing last Ex command.
+        if (register.keyBuffer[0]) {
+          exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
+        }
+        macroModeState.isPlaying = false;
+        return;
+      }
+      var keyBuffer = register.keyBuffer;
+      var imc = 0;
+      macroModeState.isPlaying = true;
+      macroModeState.replaySearchQueries = register.searchQueries.slice(0);
+      for (var i = 0; i < keyBuffer.length; i++) {
+        var text = keyBuffer[i];
+        var match, key;
+        while (text) {
+          // Pull off one command key, which is either a single character
+          // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
+          match = (/<\w+-.+?>|<\w+>|./).exec(text);
+          key = match[0];
+          text = text.substring(match.index + key.length);
+          CodeMirror.Vim.handleKey(cm, key, 'macro');
+          if (vim.insertMode) {
+            var changes = register.insertModeChanges[imc++].changes;
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
+                changes;
+            repeatInsertModeChanges(cm, changes, 1);
+            exitInsertMode(cm);
+          }
+        }
+      }
+      macroModeState.isPlaying = false;
+    }
+
+    function logKey(macroModeState, key) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register) {
+        register.pushText(key);
+      }
+    }
+
+    function logInsertModeChange(macroModeState) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register && register.pushInsertModeChanges) {
+        register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
+      }
+    }
+
+    function logSearchQuery(macroModeState, query) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register && register.pushSearchQuery) {
+        register.pushSearchQuery(query);
+      }
+    }
+
+    /**
+     * Listens for changes made in insert mode.
+     * Should only be active in insert mode.
+     */
+    function onChange(cm, changeObj) {
+      var macroModeState = vimGlobalState.macroModeState;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      if (!macroModeState.isPlaying) {
+        while(changeObj) {
+          lastChange.expectCursorActivityForChange = true;
+          if (changeObj.origin == '+input' || changeObj.origin == 'paste'
+              || changeObj.origin === undefined /* only in testing */) {
+            var text = changeObj.text.join('\n');
+            if (lastChange.maybeReset) {
+              lastChange.changes = [];
+              lastChange.maybeReset = false;
+            }
+            if (cm.state.overwrite && !/\n/.test(text)) {
+                lastChange.changes.push([text]);
+            } else {
+                lastChange.changes.push(text);
+            }
+          }
+          // Change objects may be chained with next.
+          changeObj = changeObj.next;
+        }
+      }
+    }
+
+    /**
+    * Listens for any kind of cursor activity on CodeMirror.
+    */
+    function onCursorActivity(cm) {
+      var vim = cm.state.vim;
+      if (vim.insertMode) {
+        // Tracking cursor activity in insert mode (for macro support).
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.isPlaying) { return; }
+        var lastChange = macroModeState.lastInsertModeChanges;
+        if (lastChange.expectCursorActivityForChange) {
+          lastChange.expectCursorActivityForChange = false;
+        } else {
+          // Cursor moved outside the context of an edit. Reset the change.
+          lastChange.maybeReset = true;
+        }
+      } else if (!cm.curOp.isVimOp) {
+        handleExternalSelection(cm, vim);
+      }
+      if (vim.visualMode) {
+        updateFakeCursor(cm);
+      }
+    }
+    function updateFakeCursor(cm) {
+      var vim = cm.state.vim;
+      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
+      var to = offsetCursor(from, 0, 1);
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+    }
+    function handleExternalSelection(cm, vim) {
+      var anchor = cm.getCursor('anchor');
+      var head = cm.getCursor('head');
+      // Enter or exit visual mode to match mouse selection.
+      if (vim.visualMode && !cm.somethingSelected()) {
+        exitVisualMode(cm, false);
+      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        vim.visualMode = true;
+        vim.visualLine = false;
+        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
+      }
+      if (vim.visualMode) {
+        // Bind CodeMirror selection model to vim selection model.
+        // Mouse selections are considered visual characterwise.
+        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
+        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
+        head = offsetCursor(head, 0, headOffset);
+        anchor = offsetCursor(anchor, 0, anchorOffset);
+        vim.sel = {
+          anchor: anchor,
+          head: head
+        };
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      } else if (!vim.insertMode) {
+        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+        vim.lastHPos = cm.getCursor().ch;
+      }
+    }
+
+    /** Wrapper for special keys pressed in insert mode */
+    function InsertModeKey(keyName) {
+      this.keyName = keyName;
+    }
+
+    /**
+    * Handles raw key down events from the text area.
+    * - Should only be active in insert mode.
+    * - For recording deletes in insert mode.
+    */
+    function onKeyEventTargetKeyDown(e) {
+      var macroModeState = vimGlobalState.macroModeState;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      var keyName = CodeMirror.keyName(e);
+      if (!keyName) { return; }
+      function onKeyFound() {
+        if (lastChange.maybeReset) {
+          lastChange.changes = [];
+          lastChange.maybeReset = false;
+        }
+        lastChange.changes.push(new InsertModeKey(keyName));
+        return true;
+      }
+      if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
+        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
+      }
+    }
+
+    /**
+     * Repeats the last edit, which includes exactly 1 command and at most 1
+     * insert. Operator and motion commands are read from lastEditInputState,
+     * while action commands are read from lastEditActionCommand.
+     *
+     * If repeatForInsert is true, then the function was called by
+     * exitInsertMode to repeat the insert mode changes the user just made. The
+     * corresponding enterInsertMode call was made with a count.
+     */
+    function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
+      var macroModeState = vimGlobalState.macroModeState;
+      macroModeState.isPlaying = true;
+      var isAction = !!vim.lastEditActionCommand;
+      var cachedInputState = vim.inputState;
+      function repeatCommand() {
+        if (isAction) {
+          commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
+        } else {
+          commandDispatcher.evalInput(cm, vim);
+        }
+      }
+      function repeatInsert(repeat) {
+        if (macroModeState.lastInsertModeChanges.changes.length > 0) {
+          // For some reason, repeat cw in desktop VIM does not repeat
+          // insert mode changes. Will conform to that behavior.
+          repeat = !vim.lastEditActionCommand ? 1 : repeat;
+          var changeObject = macroModeState.lastInsertModeChanges;
+          repeatInsertModeChanges(cm, changeObject.changes, repeat);
+        }
+      }
+      vim.inputState = vim.lastEditInputState;
+      if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
+        // o and O repeat have to be interlaced with insert repeats so that the
+        // insertions appear on separate lines instead of the last line.
+        for (var i = 0; i < repeat; i++) {
+          repeatCommand();
+          repeatInsert(1);
+        }
+      } else {
+        if (!repeatForInsert) {
+          // Hack to get the cursor to end up at the right place. If I is
+          // repeated in insert mode repeat, cursor will be 1 insert
+          // change set left of where it should be.
+          repeatCommand();
+        }
+        repeatInsert(repeat);
+      }
+      vim.inputState = cachedInputState;
+      if (vim.insertMode && !repeatForInsert) {
+        // Don't exit insert mode twice. If repeatForInsert is set, then we
+        // were called by an exitInsertMode call lower on the stack.
+        exitInsertMode(cm);
+      }
+      macroModeState.isPlaying = false;
+    }
+
+    function repeatInsertModeChanges(cm, changes, repeat) {
+      function keyHandler(binding) {
+        if (typeof binding == 'string') {
+          CodeMirror.commands[binding](cm);
+        } else {
+          binding(cm);
+        }
+        return true;
+      }
+      var head = cm.getCursor('head');
+      var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
+      if (inVisualBlock) {
+        // Set up block selection again for repeating the changes.
+        var vim = cm.state.vim;
+        var lastSel = vim.lastSelection;
+        var offset = getOffset(lastSel.anchor, lastSel.head);
+        selectForInsert(cm, head, offset.line + 1);
+        repeat = cm.listSelections().length;
+        cm.setCursor(head);
+      }
+      for (var i = 0; i < repeat; i++) {
+        if (inVisualBlock) {
+          cm.setCursor(offsetCursor(head, i, 0));
+        }
+        for (var j = 0; j < changes.length; j++) {
+          var change = changes[j];
+          if (change instanceof InsertModeKey) {
+            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
+          } else if (typeof change == "string") {
+            var cur = cm.getCursor();
+            cm.replaceRange(change, cur, cur);
+          } else {
+            var start = cm.getCursor();
+            var end = offsetCursor(start, 0, change[0].length);
+            cm.replaceRange(change[0], start, end);
+          }
+        }
+      }
+      if (inVisualBlock) {
+        cm.setCursor(offsetCursor(head, 0, 1));
+      }
+    }
+
+    resetVimGlobalState();
+    return vimApi;
+  };
+  // Initialize Vim and make it available as an API.
+  CodeMirror.Vim = Vim();
+});
diff --git a/core/media/editors/codemirror/keymap/vim.min.js b/core/media/editors/codemirror/keymap/vim.min.js
new file mode 100644
index 00000000..8e51b16a
--- /dev/null
+++ b/core/media/editors/codemirror/keymap/vim.min.js
@@ -0,0 +1,3 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror"),require("../addon/search/searchcursor"),require("../addon/dialog/dialog"),require("../addon/edit/matchbrackets.js")):"function"==typeof define&&define.amd?define(["../lib/codemirror","../addon/search/searchcursor","../addon/dialog/dialog","../addon/edit/matchbrackets"],a):a(CodeMirror)})((function(a){"use strict";var b=[{keys:"<Left>",type:"keyToKey",toKeys:"h"},{keys:"<Right>",type:"keyToKey",toKeys:"l"},{keys:"<Up>",type:"keyToKey",toKeys:"k"},{keys:"<Down>",type:"keyToKey",toKeys:"j"},{keys:"<Space>",type:"keyToKey",toKeys:"l"},{keys:"<BS>",type:"keyToKey",toKeys:"h",context:"normal"},{keys:"<C-Space>",type:"keyToKey",toKeys:"W"},{keys:"<C-BS>",type:"keyToKey",toKeys:"B",context:"normal"},{keys:"<S-Space>",type:"keyToKey",toKeys:"w"},{keys:"<S-BS>",type:"keyToKey",toKeys:"b",context:"normal"},{keys:"<C-n>",type:"keyToKey",toKeys:"j"},{keys:"<C-p>",type:"keyToKey",toKeys:"k"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>"},{keys:"<C-[>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"<C-c>",type:"keyToKey",toKeys:"<Esc>",context:"insert"},{keys:"s",type:"keyToKey",toKeys:"cl",context:"normal"},{keys:"s",type:"keyToKey",toKeys:"c",context:"visual"},{keys:"S",type:"keyToKey",toKeys:"cc",context:"normal"},{keys:"S",type:"keyToKey",toKeys:"VdO",context:"visual"},{keys:"<Home>",type:"keyToKey",toKeys:"0"},{keys:"<End>",type:"keyToKey",toKeys:"$"},{keys:"<PageUp>",type:"keyToKey",toKeys:"<C-b>"},{keys:"<PageDown>",type:"keyToKey",toKeys:"<C-f>"},{keys:"<CR>",type:"keyToKey",toKeys:"j^",context:"normal"},{keys:"<Ins>",type:"action",action:"toggleOverwrite",context:"insert"},{keys:"H",type:"motion",motion:"moveToTopLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"M",type:"motion",motion:"moveToMiddleLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"L",type:"motion",motion:"moveToBottomLine",motionArgs:{linewise:!0,toJumplist:!0}},{keys:"h",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!1}},{keys:"l",type:"motion",motion:"moveByCharacters",motionArgs:{forward:!0}},{keys:"j",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,linewise:!0}},{keys:"k",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,linewise:!0}},{keys:"gj",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!0}},{keys:"gk",type:"motion",motion:"moveByDisplayLines",motionArgs:{forward:!1}},{keys:"w",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1}},{keys:"W",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!1,bigWord:!0}},{keys:"e",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,inclusive:!0}},{keys:"E",type:"motion",motion:"moveByWords",motionArgs:{forward:!0,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"b",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1}},{keys:"B",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1,bigWord:!0}},{keys:"ge",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,inclusive:!0}},{keys:"gE",type:"motion",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!0,bigWord:!0,inclusive:!0}},{keys:"{",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!1,toJumplist:!0}},{keys:"}",type:"motion",motion:"moveByParagraph",motionArgs:{forward:!0,toJumplist:!0}},{keys:"(",type:"motion",motion:"moveBySentence",motionArgs:{forward:!1}},{keys:")",type:"motion",motion:"moveBySentence",motionArgs:{forward:!0}},{keys:"<C-f>",type:"motion",motion:"moveByPage",motionArgs:{forward:!0}},{keys:"<C-b>",type:"motion",motion:"moveByPage",motionArgs:{forward:!1}},{keys:"<C-d>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!0,explicitRepeat:!0}},{keys:"<C-u>",type:"motion",motion:"moveByScroll",motionArgs:{forward:!1,explicitRepeat:!0}},{keys:"gg",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"G",type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!0,explicitRepeat:!0,linewise:!0,toJumplist:!0}},{keys:"0",type:"motion",motion:"moveToStartOfLine"},{keys:"^",type:"motion",motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"+",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0}},{keys:"-",type:"motion",motion:"moveByLines",motionArgs:{forward:!1,toFirstChar:!0}},{keys:"_",type:"motion",motion:"moveByLines",motionArgs:{forward:!0,toFirstChar:!0,repeatOffset:-1}},{keys:"$",type:"motion",motion:"moveToEol",motionArgs:{inclusive:!0}},{keys:"%",type:"motion",motion:"moveToMatchedSymbol",motionArgs:{inclusive:!0,toJumplist:!0}},{keys:"f<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"F<character>",type:"motion",motion:"moveToCharacter",motionArgs:{forward:!1}},{keys:"t<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!0,inclusive:!0}},{keys:"T<character>",type:"motion",motion:"moveTillCharacter",motionArgs:{forward:!1}},{keys:";",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!0}},{keys:",",type:"motion",motion:"repeatLastCharacterSearch",motionArgs:{forward:!1}},{keys:"'<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0,linewise:!0}},{keys:"`<character>",type:"motion",motion:"goToMark",motionArgs:{toJumplist:!0}},{keys:"]`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0}},{keys:"[`",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1}},{keys:"]'",type:"motion",motion:"jumpToMark",motionArgs:{forward:!0,linewise:!0}},{keys:"['",type:"motion",motion:"jumpToMark",motionArgs:{forward:!1,linewise:!0}},{keys:"]p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0,matchIndent:!0}},{keys:"[p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0,matchIndent:!0}},{keys:"]<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!0,toJumplist:!0}},{keys:"[<character>",type:"motion",motion:"moveToSymbol",motionArgs:{forward:!1,toJumplist:!0}},{keys:"|",type:"motion",motion:"moveToColumn"},{keys:"o",type:"motion",motion:"moveToOtherHighlightedEnd",context:"visual"},{keys:"O",type:"motion",motion:"moveToOtherHighlightedEnd",motionArgs:{sameLine:!0},context:"visual"},{keys:"d",type:"operator",operator:"delete"},{keys:"y",type:"operator",operator:"yank"},{keys:"c",type:"operator",operator:"change"},{keys:">",type:"operator",operator:"indent",operatorArgs:{indentRight:!0}},{keys:"<",type:"operator",operator:"indent",operatorArgs:{indentRight:!1}},{keys:"g~",type:"operator",operator:"changeCase"},{keys:"gu",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},isEdit:!0},{keys:"gU",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},isEdit:!0},{keys:"n",type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:!0}},{keys:"N",type:"motion",motion:"findNext",motionArgs:{forward:!1,toJumplist:!0}},{keys:"x",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!0},operatorMotionArgs:{visualLine:!1}},{keys:"X",type:"operatorMotion",operator:"delete",motion:"moveByCharacters",motionArgs:{forward:!1},operatorMotionArgs:{visualLine:!0}},{keys:"D",type:"operatorMotion",operator:"delete",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"D",type:"operator",operator:"delete",operatorArgs:{linewise:!0},context:"visual"},{keys:"Y",type:"operatorMotion",operator:"yank",motion:"expandToLine",motionArgs:{linewise:!0},context:"normal"},{keys:"Y",type:"operator",operator:"yank",operatorArgs:{linewise:!0},context:"visual"},{keys:"C",type:"operatorMotion",operator:"change",motion:"moveToEol",motionArgs:{inclusive:!0},context:"normal"},{keys:"C",type:"operator",operator:"change",operatorArgs:{linewise:!0},context:"visual"},{keys:"~",type:"operatorMotion",operator:"changeCase",motion:"moveByCharacters",motionArgs:{forward:!0},operatorArgs:{shouldMoveCursor:!0},context:"normal"},{keys:"~",type:"operator",operator:"changeCase",context:"visual"},{keys:"<C-w>",type:"operatorMotion",operator:"delete",motion:"moveByWords",motionArgs:{forward:!1,wordEnd:!1},context:"insert"},{keys:"<C-i>",type:"action",action:"jumpListWalk",actionArgs:{forward:!0}},{keys:"<C-o>",type:"action",action:"jumpListWalk",actionArgs:{forward:!1}},{keys:"<C-e>",type:"action",action:"scroll",actionArgs:{forward:!0,linewise:!0}},{keys:"<C-y>",type:"action",action:"scroll",actionArgs:{forward:!1,linewise:!0}},{keys:"a",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"charAfter"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"eol"},context:"normal"},{keys:"A",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"endOfSelectedArea"},context:"visual"},{keys:"i",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"inplace"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"firstNonBlank"},context:"normal"},{keys:"I",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{insertAt:"startOfSelectedArea"},context:"visual"},{keys:"o",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!0},context:"normal"},{keys:"O",type:"action",action:"newLineAndEnterInsertMode",isEdit:!0,interlaceInsertRepeat:!0,actionArgs:{after:!1},context:"normal"},{keys:"v",type:"action",action:"toggleVisualMode"},{keys:"V",type:"action",action:"toggleVisualMode",actionArgs:{linewise:!0}},{keys:"<C-v>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"<C-q>",type:"action",action:"toggleVisualMode",actionArgs:{blockwise:!0}},{keys:"gv",type:"action",action:"reselectLastSelection"},{keys:"J",type:"action",action:"joinLines",isEdit:!0},{keys:"p",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!0,isEdit:!0}},{keys:"P",type:"action",action:"paste",isEdit:!0,actionArgs:{after:!1,isEdit:!0}},{keys:"r<character>",type:"action",action:"replace",isEdit:!0},{keys:"@<character>",type:"action",action:"replayMacro"},{keys:"q<character>",type:"action",action:"enterMacroRecordMode"},{keys:"R",type:"action",action:"enterInsertMode",isEdit:!0,actionArgs:{replace:!0}},{keys:"u",type:"action",action:"undo",context:"normal"},{keys:"u",type:"operator",operator:"changeCase",operatorArgs:{toLower:!0},context:"visual",isEdit:!0},{keys:"U",type:"operator",operator:"changeCase",operatorArgs:{toLower:!1},context:"visual",isEdit:!0},{keys:"<C-r>",type:"action",action:"redo"},{keys:"m<character>",type:"action",action:"setMark"},{keys:'"<character>',type:"action",action:"setRegister"},{keys:"zz",type:"action",action:"scrollToCursor",actionArgs:{position:"center"}},{keys:"z.",type:"action",action:"scrollToCursor",actionArgs:{position:"center"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"zt",type:"action",action:"scrollToCursor",actionArgs:{position:"top"}},{keys:"z<CR>",type:"action",action:"scrollToCursor",actionArgs:{position:"top"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:"z-",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"}},{keys:"zb",type:"action",action:"scrollToCursor",actionArgs:{position:"bottom"},motion:"moveToFirstNonWhiteSpaceCharacter"},{keys:".",type:"action",action:"repeatLastEdit"},{keys:"<C-a>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!0,backtrack:!1}},{keys:"<C-x>",type:"action",action:"incrementNumberToken",isEdit:!0,actionArgs:{increase:!1,backtrack:!1}},{keys:"<C-t>",type:"action",action:"indent",actionArgs:{indentRight:!0},context:"insert"},{keys:"<C-d>",type:"action",action:"indent",actionArgs:{indentRight:!1},context:"insert"},{keys:"a<character>",type:"motion",motion:"textObjectManipulation"},{keys:"i<character>",type:"motion",motion:"textObjectManipulation",motionArgs:{textObjectInner:!0}},{keys:"/",type:"search",searchArgs:{forward:!0,querySrc:"prompt",toJumplist:!0}},{keys:"?",type:"search",searchArgs:{forward:!1,querySrc:"prompt",toJumplist:!0}},{keys:"*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",wholeWordOnly:!0,toJumplist:!0}},{keys:"g*",type:"search",searchArgs:{forward:!0,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:"g#",type:"search",searchArgs:{forward:!1,querySrc:"wordUnderCursor",toJumplist:!0}},{keys:":",type:"ex"}],c=[{name:"colorscheme",shortName:"colo"},{name:"map"},{name:"imap",shortName:"im"},{name:"nmap",shortName:"nm"},{name:"vmap",shortName:"vm"},{name:"unmap"},{name:"write",shortName:"w"},{name:"undo",shortName:"u"},{name:"redo",shortName:"red"},{name:"set",shortName:"se"},{name:"set",shortName:"se"},{name:"setlocal",shortName:"setl"},{name:"setglobal",shortName:"setg"},{name:"sort",shortName:"sor"},{name:"substitute",shortName:"s",possiblyAsync:!0},{name:"nohlsearch",shortName:"noh"},{name:"yank",shortName:"y"},{name:"delmarks",shortName:"delm"},{name:"registers",shortName:"reg",excludeFromCommandHistory:!0},{name:"global",shortName:"g"}],d=a.Pos,e=function(){function e(b){b.setOption("disableInput",!0),b.setOption("showCursorWhenSelecting",!1),a.signal(b,"vim-mode-change",{mode:"normal"}),b.on("cursorActivity",jb),C(b),a.on(b.getInputField(),"paste",o(b))}function f(b){b.setOption("disableInput",!1),b.off("cursorActivity",jb),a.off(b.getInputField(),"paste",o(b)),b.state.vim=null}function g(b,c){this==a.keyMap.vim&&(a.rmClass(b.getWrapperElement(),"cm-fat-cursor"),"contenteditable"==b.getOption("inputStyle")&&null!=document.body.style.caretColor&&(l(b),b.getInputField().style.caretColor="")),c&&c.attach==h||f(b)}function h(b,c){this==a.keyMap.vim&&(a.addClass(b.getWrapperElement(),"cm-fat-cursor"),"contenteditable"==b.getOption("inputStyle")&&null!=document.body.style.caretColor&&(k(b),b.getInputField().style.caretColor="transparent")),c&&c.attach==h||e(b)}function i(a){for(var b=a.listSelections(),c=[],e=0;e<b.length;e++){var f=b[e];if(f.empty())if(f.anchor.ch<a.getLine(f.anchor.line).length)c.push(a.markText(f.anchor,d(f.anchor.line,f.anchor.ch+1),{className:"cm-fat-cursor-mark"}));else{var g=document.createElement("span");g.textContent=" ",g.className="cm-fat-cursor-mark",c.push(a.setBookmark(f.anchor,{widget:g}))}}return c}function j(a){var b=a.state.fatCursorMarks;if(b)for(var c=0;c<b.length;c++)b[c].clear();a.state.fatCursorMarks=i(a)}function k(a){a.state.fatCursorMarks=i(a),a.on("cursorActivity",j)}function l(a){var b=a.state.fatCursorMarks;if(b)for(var c=0;c<b.length;c++)b[c].clear();a.state.fatCursorMarks=null,a.off("cursorActivity",j)}function m(b,c){if(c){if(this[b])return this[b];var d=n(b);if(!d)return!1;var e=a.Vim.findKey(c,d);return"function"==typeof e&&a.signal(c,"vim-keypress",d),e}}function n(a){if("'"==a.charAt(0))return a.charAt(1);var b=a.split(/-(?!$)/),c=b[b.length-1];if(1==b.length&&1==b[0].length)return!1;if(2==b.length&&"Shift"==b[0]&&1==c.length)return!1;for(var d=!1,e=0;e<b.length;e++){var f=b[e];f in qb?b[e]=qb[f]:d=!0,f in rb&&(b[e]=rb[f])}return!!d&&(u(c)&&(b[b.length-1]=c.toLowerCase()),"<"+b.join("-")+">")}function o(a){var b=a.state.vim;return b.onPasteFn||(b.onPasteFn=function(){b.insertMode||(a.setCursor(Q(a.getCursor(),0,1)),Jb.enterInsertMode(a,{},b))}),b.onPasteFn}function p(a,b){for(var c=[],d=a;d<a+b;d++)c.push(String.fromCharCode(d));return c}function q(a,b){return b>=a.firstLine()&&b<=a.lastLine()}function r(a){return/^[a-z]$/.test(a)}function s(a){return"()[]{}".indexOf(a)!=-1}function t(a){return sb.test(a)}function u(a){return/^[A-Z]$/.test(a)}function v(a){return/^\s*$/.test(a)}function w(a){return".?!".indexOf(a)!=-1}function x(a,b){for(var c=0;c<b.length;c++)if(b[c]==a)return!0;return!1}function y(a,b,c,d,e){if(void 0===b&&!e)throw Error("defaultValue is required unless callback is provided");if(c||(c="string"),Ab[a]={type:c,defaultValue:b,callback:e},d)for(var f=0;f<d.length;f++)Ab[d[f]]=Ab[a];b&&z(a,b)}function z(a,b,c,d){var e=Ab[a];d=d||{};var f=d.scope;if(!e)return new Error("Unknown option: "+a);if("boolean"==e.type){if(b&&b!==!0)return new Error("Invalid argument: "+a+"="+b);b!==!1&&(b=!0)}e.callback?("local"!==f&&e.callback(b,void 0),"global"!==f&&c&&e.callback(b,c)):("local"!==f&&(e.value="boolean"==e.type?!!b:b),"global"!==f&&c&&(c.state.vim.options[a]={value:b}))}function A(a,b,c){var d=Ab[a];c=c||{};var e=c.scope;if(!d)return new Error("Unknown option: "+a);{if(!d.callback){var f="global"!==e&&b&&b.state.vim.options[a];return(f||"local"!==e&&d||{}).value}var f=b&&d.callback(void 0,b);if("global"!==e&&void 0!==f)return f;if("local"!==e)return d.callback()}}function B(){this.latestRegister=void 0,this.isPlaying=!1,this.isRecording=!1,this.replaySearchQueries=[],this.onRecordingDone=void 0,this.lastInsertModeChanges=Cb()}function C(a){return a.state.vim||(a.state.vim={inputState:new E,lastEditInputState:void 0,lastEditActionCommand:void 0,lastHPos:-1,lastHSPos:-1,lastMotion:null,marks:{},fakeCursor:null,insertMode:!1,insertModeRepeat:void 0,visualMode:!1,visualLine:!1,visualBlock:!1,lastSelection:null,lastPastedText:null,sel:{},options:{}}),a.state.vim}function D(){Db={searchQuery:null,searchIsReversed:!1,lastSubstituteReplacePart:void 0,jumpList:Bb(),macroModeState:new B,lastCharacterSearch:{increment:0,forward:!0,selectedCharacter:""},registerController:new I({}),searchHistoryController:new J,exCommandHistoryController:new J};for(var a in Ab){var b=Ab[a];b.value=b.defaultValue}}function E(){this.prefixRepeat=[],this.motionRepeat=[],this.operator=null,this.operatorArgs=null,this.motion=null,this.motionArgs=null,this.keyBuffer=[],this.registerName=null}function F(b,c){b.state.vim.inputState=new E,a.signal(b,"vim-command-done",c)}function G(a,b,c){this.clear(),this.keyBuffer=[a||""],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!!b,this.blockwise=!!c}function H(a,b){var c=Db.registerController.registers;if(!a||1!=a.length)throw Error("Register name must be 1 character");if(c[a])throw Error("Register already defined "+a);c[a]=b,zb.push(a)}function I(a){this.registers=a,this.unnamedRegister=a['"']=new G,a["."]=new G,a[":"]=new G,a["/"]=new G}function J(){this.historyBuffer=[],this.iterator=0,this.initialPrefix=null}function K(a,b){Hb[a]=b}function L(a,b){for(var c=[],d=0;d<b;d++)c.push(a);return c}function M(a,b){Ib[a]=b}function N(a,b){Jb[a]=b}function O(a,b,c){var e=Math.min(Math.max(a.firstLine(),b.line),a.lastLine()),f=aa(a,e)-1;f=c?f+1:f;var g=Math.min(Math.max(0,b.ch),f);return d(e,g)}function P(a){var b={};for(var c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function Q(a,b,c){return"object"==typeof b&&(c=b.ch,b=b.line),d(a.line+b,a.ch+c)}function R(a,b){return{line:b.line-a.line,ch:b.line-a.line}}function S(a,b,c,d){for(var e,f=[],g=[],h=0;h<b.length;h++){var i=b[h];"insert"==c&&"insert"!=i.context||i.context&&i.context!=c||d.operator&&"action"==i.type||!(e=T(a,i.keys))||("partial"==e&&f.push(i),"full"==e&&g.push(i))}return{partial:f.length&&f,full:g.length&&g}}function T(a,b){if("<character>"==b.slice(-11)){var c=b.length-11,d=a.slice(0,c),e=b.slice(0,c);return d==e&&a.length>c?"full":0==e.indexOf(d)&&"partial"}return a==b?"full":0==b.indexOf(a)&&"partial"}function U(a){var b=/^.*(<[^>]+>)$/.exec(a),c=b?b[1]:a.slice(-1);if(c.length>1)switch(c){case"<CR>":c="\n";break;case"<Space>":c=" ";break;default:c=""}return c}function V(a,b,c){return function(){for(var d=0;d<c;d++)b(a)}}function W(a){return d(a.line,a.ch)}function X(a,b){return a.ch==b.ch&&a.line==b.line}function Y(a,b){return a.line<b.line||a.line==b.line&&a.ch<b.ch}function Z(a,b){return arguments.length>2&&(b=Z.apply(void 0,Array.prototype.slice.call(arguments,1))),Y(a,b)?a:b}function $(a,b){return arguments.length>2&&(b=$.apply(void 0,Array.prototype.slice.call(arguments,1))),Y(a,b)?b:a}function _(a,b,c){var d=Y(a,b),e=Y(b,c);return d&&e}function aa(a,b){return a.getLine(b).length}function ba(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function ca(a){return a.replace(/([.?*+$\[\]\/\\(){}|\-])/g,"\\$1")}function da(a,b,c){var e=aa(a,b),f=new Array(c-e+1).join(" ");a.setCursor(d(b,e)),a.replaceRange(f,a.getCursor())}function ea(a,b){var c=[],e=a.listSelections(),f=W(a.clipPos(b)),g=!X(b,f),h=a.getCursor("head"),i=ga(e,h),j=X(e[i].head,e[i].anchor),k=e.length-1,l=k-i>i?k:0,m=e[l].anchor,n=Math.min(m.line,f.line),o=Math.max(m.line,f.line),p=m.ch,q=f.ch,r=e[l].head.ch-p,s=q-p;r>0&&s<=0?(p++,g||q--):r<0&&s>=0?(p--,j||q++):r<0&&s==-1&&(p--,q++);for(var t=n;t<=o;t++){var u={anchor:new d(t,p),head:new d(t,q)};c.push(u)}return a.setSelections(c),b.ch=q,m.ch=p,m}function fa(a,b,c){for(var d=[],e=0;e<c;e++){var f=Q(b,e,0);d.push({anchor:f,head:f})}a.setSelections(d,0)}function ga(a,b,c){for(var d=0;d<a.length;d++){var e="head"!=c&&X(a[d].anchor,b),f="anchor"!=c&&X(a[d].head,b);if(e||f)return d}return-1}function ha(a,b){var c=b.lastSelection,e=function(){var b=a.listSelections(),c=b[0],d=b[b.length-1],e=Y(c.anchor,c.head)?c.anchor:c.head,f=Y(d.anchor,d.head)?d.head:d.anchor;return[e,f]},f=function(){var b=a.getCursor(),e=a.getCursor(),f=c.visualBlock;if(f){var g=f.width,h=f.height;e=d(b.line+h,b.ch+g);for(var i=[],j=b.line;j<e.line;j++){var k=d(j,b.ch),l=d(j,e.ch),m={anchor:k,head:l};i.push(m)}a.setSelections(i)}else{var n=c.anchorMark.find(),o=c.headMark.find(),p=o.line-n.line,q=o.ch-n.ch;e={line:e.line+p,ch:p?e.ch:q+e.ch},c.visualLine&&(b=d(b.line,0),e=d(e.line,aa(a,e.line))),a.setSelection(b,e)}return[b,e]};return b.visualMode?e():f()}function ia(a,b){var c=b.sel.anchor,d=b.sel.head;b.lastPastedText&&(d=a.posFromIndex(a.indexFromPos(c)+b.lastPastedText.length),b.lastPastedText=null),b.lastSelection={anchorMark:a.setBookmark(c),headMark:a.setBookmark(d),anchor:W(c),head:W(d),visualMode:b.visualMode,visualLine:b.visualLine,visualBlock:b.visualBlock}}function ja(a,b,c){var e,f=a.state.vim.sel,g=f.head,h=f.anchor;return Y(c,b)&&(e=c,c=b,b=e),Y(g,h)?(g=Z(b,g),h=$(h,c)):(h=Z(b,h),g=$(g,c),g=Q(g,0,-1),g.ch==-1&&g.line!=a.firstLine()&&(g=d(g.line-1,aa(a,g.line-1)))),[h,g]}function ka(a,b,c){var d=a.state.vim;b=b||d.sel;var c=c||d.visualLine?"line":d.visualBlock?"block":"char",e=la(a,b,c);a.setSelections(e.ranges,e.primary),kb(a)}function la(a,b,c,e){var f=W(b.head),g=W(b.anchor);if("char"==c){var h=e||Y(b.head,b.anchor)?0:1,i=Y(b.head,b.anchor)?1:0;return f=Q(b.head,0,h),g=Q(b.anchor,0,i),{ranges:[{anchor:g,head:f}],primary:0}}if("line"==c){if(Y(b.head,b.anchor))f.ch=0,g.ch=aa(a,g.line);else{g.ch=0;var j=a.lastLine();f.line>j&&(f.line=j),f.ch=aa(a,f.line)}return{ranges:[{anchor:g,head:f}],primary:0}}if("block"==c){for(var k=Math.min(g.line,f.line),l=Math.min(g.ch,f.ch),m=Math.max(g.line,f.line),n=Math.max(g.ch,f.ch)+1,o=m-k+1,p=f.line==k?0:o-1,q=[],r=0;r<o;r++)q.push({anchor:d(k+r,l),head:d(k+r,n)});return{ranges:q,primary:p}}}function ma(a){var b=a.getCursor("head");return 1==a.getSelection().length&&(b=Z(b,a.getCursor("anchor"))),b}function na(b,c){var d=b.state.vim;c!==!1&&b.setCursor(O(b,d.sel.head)),ia(b,d),d.visualMode=!1,d.visualLine=!1,d.visualBlock=!1,a.signal(b,"vim-mode-change",{mode:"normal"}),d.fakeCursor&&d.fakeCursor.clear()}function oa(a,b,c){var d=a.getRange(b,c);if(/\n\s*$/.test(d)){var e=d.split("\n");e.pop();for(var f,f=e.pop();e.length>0&&f&&v(f);f=e.pop())c.line--,c.ch=0;f?(c.line--,c.ch=aa(a,c.line)):c.ch=0}}function pa(a,b,c){b.ch=0,c.ch=0,c.line++}function qa(a){if(!a)return 0;var b=a.search(/\S/);return b==-1?a.length:b}function ra(a,b,c,e,f){for(var g=ma(a),h=a.getLine(g.line),i=g.ch,j=f?tb[0]:ub[0];!j(h.charAt(i));)if(i++,i>=h.length)return null;e?j=ub[0]:(j=tb[0],j(h.charAt(i))||(j=tb[1]));for(var k=i,l=i;j(h.charAt(k))&&k<h.length;)k++;for(;j(h.charAt(l))&&l>=0;)l--;if(l++,b){for(var m=k;/\s/.test(h.charAt(k))&&k<h.length;)k++;if(m==k){for(var n=l;/\s/.test(h.charAt(l-1))&&l>0;)l--;l||(l=n)}}return{start:d(g.line,l),end:d(g.line,k)}}function sa(a,b,c){X(b,c)||Db.jumpList.add(a,b,c)}function ta(a,b){Db.lastCharacterSearch.increment=a,Db.lastCharacterSearch.forward=b.forward,Db.lastCharacterSearch.selectedCharacter=b.selectedCharacter}function ua(a,b,c,e){var f=W(a.getCursor()),g=c?1:-1,h=c?a.lineCount():-1,i=f.ch,j=f.line,k=a.getLine(j),l={lineText:k,nextCh:k.charAt(i),lastCh:null,index:i,symb:e,reverseSymb:(c?{")":"(","}":"{"}:{"(":")","{":"}"})[e],forward:c,depth:0,curMoveThrough:!1},m=Kb[e];if(!m)return f;var n=Lb[m].init,o=Lb[m].isComplete;for(n&&n(l);j!==h&&b;){if(l.index+=g,l.nextCh=l.lineText.charAt(l.index),!l.nextCh){if(j+=g,l.lineText=a.getLine(j)||"",g>0)l.index=0;else{var p=l.lineText.length;l.index=p>0?p-1:0}l.nextCh=l.lineText.charAt(l.index)}o(l)&&(f.line=j,f.ch=l.index,b--)}return l.nextCh||l.curMoveThrough?d(j,l.index):f}function va(a,b,c,d,e){var f=b.line,g=b.ch,h=a.getLine(f),i=c?1:-1,j=d?ub:tb;if(e&&""==h){if(f+=i,h=a.getLine(f),!q(a,f))return null;g=c?0:h.length}for(;;){if(e&&""==h)return{from:0,to:0,line:f};for(var k=i>0?h.length:-1,l=k,m=k;g!=k;){for(var n=!1,o=0;o<j.length&&!n;++o)if(j[o](h.charAt(g))){for(l=g;g!=k&&j[o](h.charAt(g));)g+=i;if(m=g,n=l!=m,l==b.ch&&f==b.line&&m==l+i)continue;return{from:Math.min(l,m+1),to:Math.max(l,m),line:f}}n||(g+=i)}if(f+=i,!q(a,f))return null;h=a.getLine(f),g=i>0?0:h.length}}function wa(a,b,c,e,f,g){var h=W(b),i=[];(e&&!f||!e&&f)&&c++;for(var j=!(e&&f),k=0;k<c;k++){var l=va(a,b,e,g,j);if(!l){var m=aa(a,a.lastLine());i.push(e?{line:a.lastLine(),from:m,to:m}:{line:0,from:0,to:0});break}i.push(l),b=d(l.line,e?l.to-1:l.from)}var n=i.length!=c,o=i[0],p=i.pop();return e&&!f?(n||o.from==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.from)):e&&f?d(p.line,p.to-1):!e&&f?(n||o.to==h.ch&&o.line==h.line||(p=i.pop()),d(p.line,p.to)):d(p.line,p.from)}function xa(a,b,c,e){for(var f,g=a.getCursor(),h=g.ch,i=0;i<b;i++){var j=a.getLine(g.line);if(f=Aa(h,j,e,c,!0),f==-1)return null;h=f}return d(a.getCursor().line,f)}function ya(a,b){var c=a.getCursor().line;return O(a,d(c,b-1))}function za(a,b,c,d){x(c,yb)&&(b.marks[c]&&b.marks[c].clear(),b.marks[c]=a.setBookmark(d))}function Aa(a,b,c,d,e){var f;return d?(f=b.indexOf(c,a+1),f==-1||e||(f-=1)):(f=b.lastIndexOf(c,a-1),f==-1||e||(f+=1)),f}function Ba(a,b,c,e,f){function g(b){return!a.getLine(b)}function h(a,b,c){return c?g(a)!=g(a+b):!g(a)&&g(a+b)}var i,j,k=b.line,l=a.firstLine(),m=a.lastLine(),n=k;if(e){for(;l<=n&&n<=m&&c>0;)h(n,e)&&c--,n+=e;return new d(n,0)}var o=a.state.vim;if(o.visualLine&&h(k,1,!0)){var p=o.sel.anchor;h(p.line,-1,!0)&&(f&&p.line==k||(k+=1))}var q=g(k);for(n=k;n<=m&&c;n++)h(n,1,!0)&&(f&&g(n)==q||c--);for(j=new d(n,0),n>m&&!q?q=!0:f=!1,n=k;n>l&&(f&&g(n)!=q&&n!=k||!h(n,-1,!0));n--);return i=new d(n,0),{start:i,end:j}}function Ca(a,b,c,e){function f(a,b){if(b.pos+b.dir<0||b.pos+b.dir>=b.line.length){if(b.ln+=b.dir,!q(a,b.ln))return b.line=null,b.ln=null,void(b.pos=null);b.line=a.getLine(b.ln),b.pos=b.dir>0?0:b.line.length-1}else b.pos+=b.dir}function g(a,b,c,d){var e=a.getLine(b),g=""===e,h={line:e,ln:b,pos:c,dir:d},i={ln:h.ln,pos:h.pos},j=""===h.line;for(f(a,h);null!==h.line;){if(i.ln=h.ln,i.pos=h.pos,""===h.line&&!j)return{ln:h.ln,pos:h.pos};if(g&&""!==h.line&&!v(h.line[h.pos]))return{ln:h.ln,pos:h.pos};!w(h.line[h.pos])||g||h.pos!==h.line.length-1&&!v(h.line[h.pos+1])||(g=!0),f(a,h)}var e=a.getLine(i.ln);i.pos=0;for(var k=e.length-1;k>=0;--k)if(!v(e[k])){i.pos=k;break}return i}function h(a,b,c,d){var e=a.getLine(b),g={line:e,ln:b,pos:c,dir:d},h={ln:g.ln,pos:null},i=""===g.line;for(f(a,g);null!==g.line;){if(""===g.line&&!i)return null!==h.pos?h:{ln:g.ln,pos:g.pos};if(w(g.line[g.pos])&&null!==h.pos&&(g.ln!==h.ln||g.pos+1!==h.pos))return h;""===g.line||v(g.line[g.pos])||(i=!1,h={ln:g.ln,pos:g.pos}),f(a,g)}var e=a.getLine(h.ln);h.pos=0;for(var j=0;j<e.length;++j)if(!v(e[j])){h.pos=j;break}return h}for(var i={ln:b.line,pos:b.ch};c>0;)i=e<0?h(a,i.ln,i.pos,e):g(a,i.ln,i.pos,e),c--;return d(i.ln,i.pos)}function Da(a,b,c,e){var f,g,h=b,i={"(":/[()]/,")":/[()]/,"[":/[[\]]/,"]":/[[\]]/,"{":/[{}]/,"}":/[{}]/}[c],j={"(":"(",")":"(","[":"[","]":"[","{":"{","}":"{"}[c],k=a.getLine(h.line).charAt(h.ch),l=k===j?1:0;if(f=a.scanForBracket(d(h.line,h.ch+l),-1,void 0,{bracketRegex:i}),g=a.scanForBracket(d(h.line,h.ch+l),1,void 0,{bracketRegex:i}),!f||!g)return{start:h,end:h};if(f=f.pos,g=g.pos,f.line==g.line&&f.ch>g.ch||f.line>g.line){var m=f;f=g,g=m}return e?g.ch+=1:f.ch+=1,{start:f,end:g}}function Ea(a,b,c,e){var f,g,h,i,j=W(b),k=a.getLine(j.line),l=k.split(""),m=l.indexOf(c);if(j.ch<m?j.ch=m:m<j.ch&&l[j.ch]==c&&(g=j.ch,--j.ch),l[j.ch]!=c||g)for(h=j.ch;h>-1&&!f;h--)l[h]==c&&(f=h+1);else f=j.ch+1;if(f&&!g)for(h=f,i=l.length;h<i&&!g;h++)l[h]==c&&(g=h);return f&&g?(e&&(--f,++g),{start:d(j.line,f),end:d(j.line,g)}):{start:j,end:j}}function Fa(){}function Ga(a){var b=a.state.vim;return b.searchState_||(b.searchState_=new Fa)}function Ha(a,b,c,d,e){a.openDialog?a.openDialog(b,d,{bottom:!0,value:e.value,onKeyDown:e.onKeyDown,onKeyUp:e.onKeyUp,selectValueOnOpen:!1}):d(prompt(c,""))}function Ia(a){return Ka(a,"/")}function Ja(a){return La(a,"/")}function Ka(a,b){var c=La(a,b)||[];if(!c.length)return[];var d=[];if(0===c[0]){for(var e=0;e<c.length;e++)"number"==typeof c[e]&&d.push(a.substring(c[e]+1,c[e+1]));return d}}function La(a,b){b||(b="/");for(var c=!1,d=[],e=0;e<a.length;e++){var f=a.charAt(e);c||f!=b||d.push(e),c=!c&&"\\"==f}return d}function Ma(a){for(var b="|(){",c="}",d=!1,e=[],f=-1;f<a.length;f++){var g=a.charAt(f)||"",h=a.charAt(f+1)||"",i=h&&b.indexOf(h)!=-1;d?("\\"===g&&i||e.push(g),d=!1):"\\"===g?(d=!0,h&&c.indexOf(h)!=-1&&(i=!0),i&&"\\"!==h||e.push(g)):(e.push(g),i&&"\\"!==h&&e.push("\\"))}return e.join("")}function Na(a){for(var b=!1,c=[],d=-1;d<a.length;d++){var e=a.charAt(d)||"",f=a.charAt(d+1)||"";Mb[e+f]?(c.push(Mb[e+f]),d++):b?(c.push(e),b=!1):"\\"===e?(b=!0,t(f)||"$"===f?c.push("$"):"/"!==f&&"\\"!==f&&c.push("\\")):("$"===e&&c.push("$"),c.push(e),"/"===f&&c.push("\\"))}return c.join("")}function Oa(b){for(var c=new a.StringStream(b),d=[];!c.eol();){for(;c.peek()&&"\\"!=c.peek();)d.push(c.next());var e=!1;for(var f in Nb)if(c.match(f,!0)){e=!0,d.push(Nb[f]);break}e||d.push(c.next())}return d.join("")}function Pa(a,b,c){var d=Db.registerController.getRegister("/");if(d.setText(a),a instanceof RegExp)return a;var e,f,g=Ja(a);if(g.length){e=a.substring(0,g[0]);var h=a.substring(g[0]);f=h.indexOf("i")!=-1}else e=a;if(!e)return null;A("pcre")||(e=Ma(e)),c&&(b=/^[^A-Z]*$/.test(e));var i=new RegExp(e,b||f?"i":void 0);return i}function Qa(a,b){a.openNotification?a.openNotification('<span style="color: red">'+b+"</span>",{bottom:!0,duration:5e3}):alert(b)}function Ra(a,b){var c='<span style="font-family: monospace; white-space: pre">'+(a||"")+'<input type="text"></span>';return b&&(c+=' <span style="color: #888">'+b+"</span>"),c}function Sa(a,b){var c=(b.prefix||"")+" "+(b.desc||""),d=Ra(b.prefix,b.desc);Ha(a,d,c,b.onClose,b)}function Ta(a,b){if(a instanceof RegExp&&b instanceof RegExp){for(var c=["global","multiline","ignoreCase","source"],d=0;d<c.length;d++){var e=c[d];if(a[e]!==b[e])return!1}return!0}return!1}function Ua(a,b,c,d){if(b){var e=Ga(a),f=Pa(b,!!c,!!d);if(f)return Wa(a,f),Ta(f,e.getQuery())?f:(e.setQuery(f),f)}}function Va(a){if("^"==a.source.charAt(0))var b=!0;return{token:function(c){if(b&&!c.sol())return void c.skipToEnd();var d=c.match(a,!1);if(d)return 0==d[0].length?(c.next(),"searching"):c.sol()||(c.backUp(1),a.exec(c.next()+d[0]))?(c.match(a),"searching"):(c.next(),null);for(;!c.eol()&&(c.next(),!c.match(a,!1)););},query:a}}function Wa(a,b){var c=Ga(a),d=c.getOverlay();d&&b==d.query||(d&&a.removeOverlay(d),d=Va(b),a.addOverlay(d),a.showMatchesOnScrollbar&&(c.getScrollbarAnnotate()&&c.getScrollbarAnnotate().clear(),c.setScrollbarAnnotate(a.showMatchesOnScrollbar(b))),c.setOverlay(d))}function Xa(a,b,c,e){return void 0===e&&(e=1),a.operation((function(){for(var f=a.getCursor(),g=a.getSearchCursor(c,f),h=0;h<e;h++){var i=g.find(b);if(0==h&&i&&X(g.from(),f)&&(i=g.find(b)),!i&&(g=a.getSearchCursor(c,b?d(a.lastLine()):d(a.firstLine(),0)),
+!g.find(b)))return}return g.from()}))}function Ya(a){var b=Ga(a);a.removeOverlay(Ga(a).getOverlay()),b.setOverlay(null),b.getScrollbarAnnotate()&&(b.getScrollbarAnnotate().clear(),b.setScrollbarAnnotate(null))}function Za(a,b,c){return"number"!=typeof a&&(a=a.line),b instanceof Array?x(a,b):c?a>=b&&a<=c:a==b}function $a(a){var b=a.getScrollInfo(),c=6,d=10,e=a.coordsChar({left:0,top:c+b.top},"local"),f=b.clientHeight-d+b.top,g=a.coordsChar({left:0,top:f},"local");return{top:e.line,bottom:g.line}}function _a(a,b,c){if("'"==c){var d=a.doc.history.done,e=d[d.length-2];return e&&e.ranges&&e.ranges[0].head}if("."==c){if(0==a.doc.history.lastModTime)return;var f=a.doc.history.done.filter((function(a){if(void 0!==a.changes)return a}));f.reverse();var g=f[0].changes[0].to;return g}var h=b.marks[c];return h&&h.find()}function ab(b,c,d,e,f,g,h,i,j){function k(){b.operation((function(){for(;!p;)l(),m();n()}))}function l(){var a=b.getRange(g.from(),g.to()),c=a.replace(h,i);g.replace(c)}function m(){for(;g.findNext()&&Za(g.from(),e,f);)if(d||!q||g.from().line!=q.line)return b.scrollIntoView(g.from(),30),b.setSelection(g.from(),g.to()),q=g.from(),void(p=!1);p=!0}function n(a){if(a&&a(),b.focus(),q){b.setCursor(q);var c=b.state.vim;c.exMode=!1,c.lastHPos=c.lastHSPos=q.ch}j&&j()}function o(c,d,e){a.e_stop(c);var f=a.keyName(c);switch(f){case"Y":l(),m();break;case"N":m();break;case"A":var g=j;j=void 0,b.operation(k),j=g;break;case"L":l();case"Q":case"Esc":case"Ctrl-C":case"Ctrl-[":n(e)}return p&&n(e),!0}b.state.vim.exMode=!0;var p=!1,q=g.from();return m(),p?void Qa(b,"No matches for "+h.source):c?void Sa(b,{prefix:"replace with <strong>"+i+"</strong> (y/n/a/q/l)",onKeyDown:o}):(k(),void(j&&j()))}function bb(b){var c=b.state.vim,d=Db.macroModeState,e=Db.registerController.getRegister("."),f=d.isPlaying,g=d.lastInsertModeChanges,h=[];if(!f){for(var i=g.inVisualBlock&&c.lastSelection?c.lastSelection.visualBlock.height:1,j=g.changes,h=[],k=0;k<j.length;)h.push(j[k]),j[k]instanceof mb?k++:k+=i;g.changes=h,b.off("change",ib),a.off(b.getInputField(),"keydown",nb)}!f&&c.insertModeRepeat>1&&(ob(b,c,c.insertModeRepeat-1,!0),c.lastEditInputState.repeatOverride=c.insertModeRepeat),delete c.insertModeRepeat,c.insertMode=!1,b.setCursor(b.getCursor().line,b.getCursor().ch-1),b.setOption("keyMap","vim"),b.setOption("disableInput",!0),b.toggleOverwrite(!1),e.setText(g.changes.join("")),a.signal(b,"vim-mode-change",{mode:"normal"}),d.isRecording&&gb(d)}function cb(a){b.unshift(a)}function db(a,b,c,d,e){var f={keys:a,type:b};f[b]=c,f[b+"Args"]=d;for(var g in e)f[g]=e[g];cb(f)}function eb(b,c,d,e){var f=Db.registerController.getRegister(e);if(":"==e)return f.keyBuffer[0]&&Rb.processCommand(b,f.keyBuffer[0]),void(d.isPlaying=!1);var g=f.keyBuffer,h=0;d.isPlaying=!0,d.replaySearchQueries=f.searchQueries.slice(0);for(var i=0;i<g.length;i++)for(var j,k,l=g[i];l;)if(j=/<\w+-.+?>|<\w+>|./.exec(l),k=j[0],l=l.substring(j.index+k.length),a.Vim.handleKey(b,k,"macro"),c.insertMode){var m=f.insertModeChanges[h++].changes;Db.macroModeState.lastInsertModeChanges.changes=m,pb(b,m,1),bb(b)}d.isPlaying=!1}function fb(a,b){if(!a.isPlaying){var c=a.latestRegister,d=Db.registerController.getRegister(c);d&&d.pushText(b)}}function gb(a){if(!a.isPlaying){var b=a.latestRegister,c=Db.registerController.getRegister(b);c&&c.pushInsertModeChanges&&c.pushInsertModeChanges(a.lastInsertModeChanges)}}function hb(a,b){if(!a.isPlaying){var c=a.latestRegister,d=Db.registerController.getRegister(c);d&&d.pushSearchQuery&&d.pushSearchQuery(b)}}function ib(a,b){var c=Db.macroModeState,d=c.lastInsertModeChanges;if(!c.isPlaying)for(;b;){if(d.expectCursorActivityForChange=!0,"+input"==b.origin||"paste"==b.origin||void 0===b.origin){var e=b.text.join("\n");d.maybeReset&&(d.changes=[],d.maybeReset=!1),a.state.overwrite&&!/\n/.test(e)?d.changes.push([e]):d.changes.push(e)}b=b.next}}function jb(a){var b=a.state.vim;if(b.insertMode){var c=Db.macroModeState;if(c.isPlaying)return;var d=c.lastInsertModeChanges;d.expectCursorActivityForChange?d.expectCursorActivityForChange=!1:d.maybeReset=!0}else a.curOp.isVimOp||lb(a,b);b.visualMode&&kb(a)}function kb(a){var b=a.state.vim,c=O(a,W(b.sel.head)),d=Q(c,0,1);b.fakeCursor&&b.fakeCursor.clear(),b.fakeCursor=a.markText(c,d,{className:"cm-animate-fat-cursor"})}function lb(b,c){var d=b.getCursor("anchor"),e=b.getCursor("head");if(c.visualMode&&!b.somethingSelected()?na(b,!1):c.visualMode||c.insertMode||!b.somethingSelected()||(c.visualMode=!0,c.visualLine=!1,a.signal(b,"vim-mode-change",{mode:"visual"})),c.visualMode){var f=Y(e,d)?0:-1,g=Y(e,d)?-1:0;e=Q(e,0,f),d=Q(d,0,g),c.sel={anchor:d,head:e},za(b,c,"<",Z(e,d)),za(b,c,">",$(e,d))}else c.insertMode||(c.lastHPos=b.getCursor().ch)}function mb(a){this.keyName=a}function nb(b){function c(){return e.maybeReset&&(e.changes=[],e.maybeReset=!1),e.changes.push(new mb(f)),!0}var d=Db.macroModeState,e=d.lastInsertModeChanges,f=a.keyName(b);f&&(f.indexOf("Delete")==-1&&f.indexOf("Backspace")==-1||a.lookupKey(f,"vim-insert",c))}function ob(a,b,c,d){function e(){h?Gb.processAction(a,b,b.lastEditActionCommand):Gb.evalInput(a,b)}function f(c){if(g.lastInsertModeChanges.changes.length>0){c=b.lastEditActionCommand?c:1;var d=g.lastInsertModeChanges;pb(a,d.changes,c)}}var g=Db.macroModeState;g.isPlaying=!0;var h=!!b.lastEditActionCommand,i=b.inputState;if(b.inputState=b.lastEditInputState,h&&b.lastEditActionCommand.interlaceInsertRepeat)for(var j=0;j<c;j++)e(),f(1);else d||e(),f(c);b.inputState=i,b.insertMode&&!d&&bb(a),g.isPlaying=!1}function pb(b,c,d){function e(c){return"string"==typeof c?a.commands[c](b):c(b),!0}var f=b.getCursor("head"),g=Db.macroModeState.lastInsertModeChanges.inVisualBlock;if(g){var h=b.state.vim,i=h.lastSelection,j=R(i.anchor,i.head);fa(b,f,j.line+1),d=b.listSelections().length,b.setCursor(f)}for(var k=0;k<d;k++){g&&b.setCursor(Q(f,k,0));for(var l=0;l<c.length;l++){var m=c[l];if(m instanceof mb)a.lookupKey(m.keyName,"vim-insert",e);else if("string"==typeof m){var n=b.getCursor();b.replaceRange(m,n,n)}else{var o=b.getCursor(),p=Q(o,0,m[0].length);b.replaceRange(m[0],o,p)}}}g&&b.setCursor(Q(f,0,1))}a.defineOption("vimMode",!1,(function(b,c,d){c&&"vim"!=b.getOption("keyMap")?b.setOption("keyMap","vim"):!c&&d!=a.Init&&/^vim/.test(b.getOption("keyMap"))&&b.setOption("keyMap","default")}));var qb={Shift:"S",Ctrl:"C",Alt:"A",Cmd:"D",Mod:"A"},rb={Enter:"CR",Backspace:"BS",Delete:"Del",Insert:"Ins"},sb=/[\d]/,tb=[a.isWordChar,function(b){return b&&!a.isWordChar(b)&&!/\s/.test(b)}],ub=[function(a){return/\S/.test(a)}],vb=p(65,26),wb=p(97,26),xb=p(48,10),yb=[].concat(vb,wb,xb,["<",">"]),zb=[].concat(vb,wb,xb,["-",'"',".",":","/"]),Ab={};y("filetype",void 0,"string",["ft"],(function(a,b){if(void 0!==b){if(void 0===a){var c=b.getOption("mode");return"null"==c?"":c}var c=""==a?"null":a;b.setOption("mode",c)}}));var Bb=function(){function a(a,b,h){function i(b){var e=++d%c,f=g[e];f&&f.clear(),g[e]=a.setBookmark(b)}var j=d%c,k=g[j];if(k){var l=k.find();l&&!X(l,b)&&i(b)}else i(b);i(h),e=d,f=d-c+1,f<0&&(f=0)}function b(a,b){d+=b,d>e?d=e:d<f&&(d=f);var h=g[(c+d)%c];if(h&&!h.find()){var i,j=b>0?1:-1,k=a.getCursor();do if(d+=j,h=g[(c+d)%c],h&&(i=h.find())&&!X(k,i))break;while(d<e&&d>f)}return h}var c=100,d=-1,e=0,f=0,g=new Array(c);return{cachedCursor:void 0,add:a,move:b}},Cb=function(a){return a?{changes:a.changes,expectCursorActivityForChange:a.expectCursorActivityForChange}:{changes:[],expectCursorActivityForChange:!1}};B.prototype={exitMacroRecordMode:function(){var a=Db.macroModeState;a.onRecordingDone&&a.onRecordingDone(),a.onRecordingDone=void 0,a.isRecording=!1},enterMacroRecordMode:function(a,b){var c=Db.registerController.getRegister(b);c&&(c.clear(),this.latestRegister=b,a.openDialog&&(this.onRecordingDone=a.openDialog("(recording)["+b+"]",null,{bottom:!0})),this.isRecording=!0)}};var Db,Eb,Fb={buildKeyMap:function(){},getRegisterController:function(){return Db.registerController},resetVimGlobalState_:D,getVimGlobalState_:function(){return Db},maybeInitVimState_:C,suppressErrorLogging:!1,InsertModeKey:mb,map:function(a,b,c){Rb.map(a,b,c)},unmap:function(a,b){Rb.unmap(a,b)},setOption:z,getOption:A,defineOption:y,defineEx:function(a,b,c){if(b){if(0!==a.indexOf(b))throw new Error('(Vim.defineEx) "'+b+'" is not a prefix of "'+a+'", command not registered')}else b=a;Qb[a]=c,Rb.commandMap_[b]={name:a,shortName:b,type:"api"}},handleKey:function(a,b,c){var d=this.findKey(a,b,c);if("function"==typeof d)return d()},findKey:function(c,d,e){function f(){var a=Db.macroModeState;if(a.isRecording){if("q"==d)return a.exitMacroRecordMode(),F(c),!0;"mapping"!=e&&fb(a,d)}}function g(){if("<Esc>"==d)return F(c),l.visualMode?na(c):l.insertMode&&bb(c),!0}function h(b){for(var e;b;)e=/<\w+-.+?>|<\w+>|./.exec(b),d=e[0],b=b.substring(e.index+d.length),a.Vim.handleKey(c,d,"mapping")}function i(){if(g())return!0;for(var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d,e=1==d.length,f=Gb.matchCommand(a,b,l.inputState,"insert");a.length>1&&"full"!=f.type;){var a=l.inputState.keyBuffer=a.slice(1),h=Gb.matchCommand(a,b,l.inputState,"insert");"none"!=h.type&&(f=h)}if("none"==f.type)return F(c),!1;if("partial"==f.type)return Eb&&window.clearTimeout(Eb),Eb=window.setTimeout((function(){l.insertMode&&l.inputState.keyBuffer&&F(c)}),A("insertModeEscKeysTimeout")),!e;if(Eb&&window.clearTimeout(Eb),e){for(var i=c.listSelections(),j=0;j<i.length;j++){var k=i[j].head;c.replaceRange("",Q(k,0,-(a.length-1)),k,"+input")}Db.macroModeState.lastInsertModeChanges.changes.pop()}return F(c),f.command}function j(){if(f()||g())return!0;var a=l.inputState.keyBuffer=l.inputState.keyBuffer+d;if(/^[1-9]\d*$/.test(a))return!0;var e=/^(\d*)(.*)$/.exec(a);if(!e)return F(c),!1;var h=l.visualMode?"visual":"normal",i=Gb.matchCommand(e[2]||e[1],b,l.inputState,h);if("none"==i.type)return F(c),!1;if("partial"==i.type)return!0;l.inputState.keyBuffer="";var e=/^(\d*)(.*)$/.exec(a);return e[1]&&"0"!=e[1]&&l.inputState.pushRepeatDigit(e[1]),i.command}var k,l=C(c);return k=l.insertMode?i():j(),k===!1?l.insertMode||1!==d.length?void 0:function(){return!0}:k===!0?function(){return!0}:function(){return c.operation((function(){c.curOp.isVimOp=!0;try{"keyToKey"==k.type?h(k.toKeys):Gb.processCommand(c,l,k)}catch(b){throw c.state.vim=void 0,C(c),a.Vim.suppressErrorLogging||console.log(b),b}return!0}))}},handleEx:function(a,b){Rb.processCommand(a,b)},defineMotion:K,defineAction:N,defineOperator:M,mapCommand:db,_mapCommand:cb,defineRegister:H,exitVisualMode:na,exitInsertMode:bb};E.prototype.pushRepeatDigit=function(a){this.operator?this.motionRepeat=this.motionRepeat.concat(a):this.prefixRepeat=this.prefixRepeat.concat(a)},E.prototype.getRepeat=function(){var a=0;return(this.prefixRepeat.length>0||this.motionRepeat.length>0)&&(a=1,this.prefixRepeat.length>0&&(a*=parseInt(this.prefixRepeat.join(""),10)),this.motionRepeat.length>0&&(a*=parseInt(this.motionRepeat.join(""),10))),a},G.prototype={setText:function(a,b,c){this.keyBuffer=[a||""],this.linewise=!!b,this.blockwise=!!c},pushText:function(a,b){b&&(this.linewise||this.keyBuffer.push("\n"),this.linewise=!0),this.keyBuffer.push(a)},pushInsertModeChanges:function(a){this.insertModeChanges.push(Cb(a))},pushSearchQuery:function(a){this.searchQueries.push(a)},clear:function(){this.keyBuffer=[],this.insertModeChanges=[],this.searchQueries=[],this.linewise=!1},toString:function(){return this.keyBuffer.join("")}},I.prototype={pushText:function(a,b,c,d,e){d&&"\n"!==c.charAt(c.length-1)&&(c+="\n");var f=this.isValidRegister(a)?this.getRegister(a):null;if(!f){switch(b){case"yank":this.registers[0]=new G(c,d,e);break;case"delete":case"change":c.indexOf("\n")==-1?this.registers["-"]=new G(c,d):(this.shiftNumericRegisters_(),this.registers[1]=new G(c,d))}return void this.unnamedRegister.setText(c,d,e)}var g=u(a);g?f.pushText(c,d):f.setText(c,d,e),this.unnamedRegister.setText(f.toString(),d)},getRegister:function(a){return this.isValidRegister(a)?(a=a.toLowerCase(),this.registers[a]||(this.registers[a]=new G),this.registers[a]):this.unnamedRegister},isValidRegister:function(a){return a&&x(a,zb)},shiftNumericRegisters_:function(){for(var a=9;a>=2;a--)this.registers[a]=this.getRegister(""+(a-1))}},J.prototype={nextMatch:function(a,b){var c=this.historyBuffer,d=b?-1:1;null===this.initialPrefix&&(this.initialPrefix=a);for(var e=this.iterator+d;b?e>=0:e<c.length;e+=d)for(var f=c[e],g=0;g<=f.length;g++)if(this.initialPrefix==f.substring(0,g))return this.iterator=e,f;return e>=c.length?(this.iterator=c.length,this.initialPrefix):e<0?a:void 0},pushInput:function(a){var b=this.historyBuffer.indexOf(a);b>-1&&this.historyBuffer.splice(b,1),a.length&&this.historyBuffer.push(a)},reset:function(){this.initialPrefix=null,this.iterator=this.historyBuffer.length}};var Gb={matchCommand:function(a,b,c,d){var e=S(a,b,d,c);if(!e.full&&!e.partial)return{type:"none"};if(!e.full&&e.partial)return{type:"partial"};for(var f,g=0;g<e.full.length;g++){var h=e.full[g];f||(f=h)}if("<character>"==f.keys.slice(-11)){var i=U(a);if(!i)return{type:"none"};c.selectedCharacter=i}return{type:"full",command:f}},processCommand:function(a,b,c){switch(b.inputState.repeatOverride=c.repeatOverride,c.type){case"motion":this.processMotion(a,b,c);break;case"operator":this.processOperator(a,b,c);break;case"operatorMotion":this.processOperatorMotion(a,b,c);break;case"action":this.processAction(a,b,c);break;case"search":this.processSearch(a,b,c);break;case"ex":case"keyToEx":this.processEx(a,b,c)}},processMotion:function(a,b,c){b.inputState.motion=c.motion,b.inputState.motionArgs=P(c.motionArgs),this.evalInput(a,b)},processOperator:function(a,b,c){var d=b.inputState;if(d.operator){if(d.operator==c.operator)return d.motion="expandToLine",d.motionArgs={linewise:!0},void this.evalInput(a,b);F(a)}d.operator=c.operator,d.operatorArgs=P(c.operatorArgs),b.visualMode&&this.evalInput(a,b)},processOperatorMotion:function(a,b,c){var d=b.visualMode,e=P(c.operatorMotionArgs);e&&d&&e.visualLine&&(b.visualLine=!0),this.processOperator(a,b,c),d||this.processMotion(a,b,c)},processAction:function(a,b,c){var d=b.inputState,e=d.getRepeat(),f=!!e,g=P(c.actionArgs)||{};d.selectedCharacter&&(g.selectedCharacter=d.selectedCharacter),c.operator&&this.processOperator(a,b,c),c.motion&&this.processMotion(a,b,c),(c.motion||c.operator)&&this.evalInput(a,b),g.repeat=e||1,g.repeatIsExplicit=f,g.registerName=d.registerName,F(a),b.lastMotion=null,c.isEdit&&this.recordLastEdit(b,d,c),Jb[c.action](a,g,b)},processSearch:function(b,c,d){function e(a,e,f){Db.searchHistoryController.pushInput(a),Db.searchHistoryController.reset();try{Ua(b,a,e,f)}catch(c){return Qa(b,"Invalid regex: "+a),void F(b)}Gb.processMotion(b,c,{type:"motion",motion:"findNext",motionArgs:{forward:!0,toJumplist:d.searchArgs.toJumplist}})}function f(a){b.scrollTo(m.left,m.top),e(a,!0,!0);var c=Db.macroModeState;c.isRecording&&hb(c,a)}function g(c,d,e){var f,g,h=a.keyName(c);"Up"==h||"Down"==h?(f="Up"==h,g=c.target?c.target.selectionEnd:0,d=Db.searchHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&Db.searchHistoryController.reset();var j;try{j=Ua(b,d,!0,!0)}catch(a){}j?b.scrollIntoView(Xa(b,!i,j),30):(Ya(b),b.scrollTo(m.left,m.top))}function h(c,d,e){var f=a.keyName(c);"Esc"==f||"Ctrl-C"==f||"Ctrl-["==f||"Backspace"==f&&""==d?(Db.searchHistoryController.pushInput(d),Db.searchHistoryController.reset(),Ua(b,l),Ya(b),b.scrollTo(m.left,m.top),a.e_stop(c),F(b),e(),b.focus()):"Up"==f||"Down"==f?a.e_stop(c):"Ctrl-U"==f&&(a.e_stop(c),e(""))}if(b.getSearchCursor){var i=d.searchArgs.forward,j=d.searchArgs.wholeWordOnly;Ga(b).setReversed(!i);var k=i?"/":"?",l=Ga(b).getQuery(),m=b.getScrollInfo();switch(d.searchArgs.querySrc){case"prompt":var n=Db.macroModeState;if(n.isPlaying){var o=n.replaySearchQueries.shift();e(o,!0,!1)}else Sa(b,{onClose:f,prefix:k,desc:Ob,onKeyUp:g,onKeyDown:h});break;case"wordUnderCursor":var p=ra(b,!1,!0,!1,!0),q=!0;if(p||(p=ra(b,!1,!0,!1,!1),q=!1),!p)return;var o=b.getLine(p.start.line).substring(p.start.ch,p.end.ch);o=q&&j?"\\b"+o+"\\b":ca(o),Db.jumpList.cachedCursor=b.getCursor(),b.setCursor(p.start),e(o,!0,!1)}}},processEx:function(b,c,d){function e(a){Db.exCommandHistoryController.pushInput(a),Db.exCommandHistoryController.reset(),Rb.processCommand(b,a)}function f(c,d,e){var f,g,h=a.keyName(c);("Esc"==h||"Ctrl-C"==h||"Ctrl-["==h||"Backspace"==h&&""==d)&&(Db.exCommandHistoryController.pushInput(d),Db.exCommandHistoryController.reset(),a.e_stop(c),F(b),e(),b.focus()),"Up"==h||"Down"==h?(a.e_stop(c),f="Up"==h,g=c.target?c.target.selectionEnd:0,d=Db.exCommandHistoryController.nextMatch(d,f)||"",e(d),g&&c.target&&(c.target.selectionEnd=c.target.selectionStart=Math.min(g,c.target.value.length))):"Ctrl-U"==h?(a.e_stop(c),e("")):"Left"!=h&&"Right"!=h&&"Ctrl"!=h&&"Alt"!=h&&"Shift"!=h&&Db.exCommandHistoryController.reset()}"keyToEx"==d.type?Rb.processCommand(b,d.exArgs.input):c.visualMode?Sa(b,{onClose:e,prefix:":",value:"'<,'>",onKeyDown:f,selectValueOnOpen:!1}):Sa(b,{onClose:e,prefix:":",onKeyDown:f})},evalInput:function(a,b){var c,e,f,g=b.inputState,h=g.motion,i=g.motionArgs||{},j=g.operator,k=g.operatorArgs||{},l=g.registerName,m=b.sel,n=W(b.visualMode?O(a,m.head):a.getCursor("head")),o=W(b.visualMode?O(a,m.anchor):a.getCursor("anchor")),p=W(n),q=W(o);if(j&&this.recordLastEdit(b,g),f=void 0!==g.repeatOverride?g.repeatOverride:g.getRepeat(),f>0&&i.explicitRepeat?i.repeatIsExplicit=!0:(i.noRepeat||!i.explicitRepeat&&0===f)&&(f=1,i.repeatIsExplicit=!1),g.selectedCharacter&&(i.selectedCharacter=k.selectedCharacter=g.selectedCharacter),i.repeat=f,F(a),h){var r=Hb[h](a,n,i,b);if(b.lastMotion=Hb[h],!r)return;if(i.toJumplist){var s=Db.jumpList,t=s.cachedCursor;t?(sa(a,t,r),delete s.cachedCursor):sa(a,n,r)}r instanceof Array?(e=r[0],c=r[1]):c=r,c||(c=W(n)),b.visualMode?(b.visualBlock&&c.ch===1/0||(c=O(a,c,b.visualBlock)),e&&(e=O(a,e,!0)),e=e||q,m.anchor=e,m.head=c,ka(a),za(a,b,"<",Y(e,c)?e:c),za(a,b,">",Y(e,c)?c:e)):j||(c=O(a,c),a.setCursor(c.line,c.ch))}if(j){if(k.lastSel){e=q;var u=k.lastSel,v=Math.abs(u.head.line-u.anchor.line),w=Math.abs(u.head.ch-u.anchor.ch);c=u.visualLine?d(q.line+v,q.ch):u.visualBlock?d(q.line+v,q.ch+w):u.head.line==u.anchor.line?d(q.line,q.ch+w):d(q.line+v,q.ch),b.visualMode=!0,b.visualLine=u.visualLine,b.visualBlock=u.visualBlock,m=b.sel={anchor:e,head:c},ka(a)}else b.visualMode&&(k.lastSel={anchor:W(m.anchor),head:W(m.head),visualBlock:b.visualBlock,visualLine:b.visualLine});var x,y,z,A,B;if(b.visualMode){if(x=Z(m.head,m.anchor),y=$(m.head,m.anchor),z=b.visualLine||k.linewise,A=b.visualBlock?"block":z?"line":"char",B=la(a,{anchor:x,head:y},A),z){var C=B.ranges;if("block"==A)for(var D=0;D<C.length;D++)C[D].head.ch=aa(a,C[D].head.line);else"line"==A&&(C[0].head=d(C[0].head.line+1,0))}}else{if(x=W(e||q),y=W(c||p),Y(y,x)){var E=x;x=y,y=E}z=i.linewise||k.linewise,z?pa(a,x,y):i.forward&&oa(a,x,y),A="char";var G=!i.inclusive||z;B=la(a,{anchor:x,head:y},A,G)}a.setSelections(B.ranges,B.primary),b.lastMotion=null,k.repeat=f,k.registerName=l,k.linewise=z;var H=Ib[j](a,k,B.ranges,q,c);b.visualMode&&na(a,null!=H),H&&a.setCursor(H)}},recordLastEdit:function(a,b,c){var d=Db.macroModeState;d.isPlaying||(a.lastEditInputState=b,a.lastEditActionCommand=c,d.lastInsertModeChanges.changes=[],d.lastInsertModeChanges.expectCursorActivityForChange=!1)}},Hb={moveToTopLine:function(a,b,c){var e=$a(a).top+c.repeat-1;return d(e,qa(a.getLine(e)))},moveToMiddleLine:function(a){var b=$a(a),c=Math.floor(.5*(b.top+b.bottom));return d(c,qa(a.getLine(c)))},moveToBottomLine:function(a,b,c){var e=$a(a).bottom-c.repeat+1;return d(e,qa(a.getLine(e)))},expandToLine:function(a,b,c){var e=b;return d(e.line+c.repeat-1,1/0)},findNext:function(a,b,c){var d=Ga(a),e=d.getQuery();if(e){var f=!c.forward;return f=d.isReversed()?!f:f,Wa(a,e),Xa(a,f,e,c.repeat)}},goToMark:function(a,b,c,d){var e=_a(a,d,c.selectedCharacter);return e?c.linewise?{line:e.line,ch:qa(a.getLine(e.line))}:e:null},moveToOtherHighlightedEnd:function(a,b,c,e){if(e.visualBlock&&c.sameLine){var f=e.sel;return[O(a,d(f.anchor.line,f.head.ch)),O(a,d(f.head.line,f.anchor.ch))]}return[e.sel.head,e.sel.anchor]},jumpToMark:function(a,b,c,e){for(var f=b,g=0;g<c.repeat;g++){var h=f;for(var i in e.marks)if(r(i)){var j=e.marks[i].find(),k=c.forward?Y(j,h):Y(h,j);if(!(k||c.linewise&&j.line==h.line)){var l=X(h,f),m=c.forward?_(h,j,f):_(f,j,h);(l||m)&&(f=j)}}}return c.linewise&&(f=d(f.line,qa(a.getLine(f.line)))),f},moveByCharacters:function(a,b,c){var e=b,f=c.repeat,g=c.forward?e.ch+f:e.ch-f;return d(e.line,g)},moveByLines:function(a,b,c,e){var f=b,g=f.ch;switch(e.lastMotion){case this.moveByLines:case this.moveByDisplayLines:case this.moveByScroll:case this.moveToColumn:case this.moveToEol:g=e.lastHPos;break;default:e.lastHPos=g}var h=c.repeat+(c.repeatOffset||0),i=c.forward?f.line+h:f.line-h,j=a.firstLine(),k=a.lastLine();return i<j&&f.line==j?this.moveToStartOfLine(a,b,c,e):i>k&&f.line==k?this.moveToEol(a,b,c,e):(c.toFirstChar&&(g=qa(a.getLine(i)),e.lastHPos=g),e.lastHSPos=a.charCoords(d(i,g),"div").left,d(i,g))},moveByDisplayLines:function(a,b,c,e){var f=b;switch(e.lastMotion){case this.moveByDisplayLines:case this.moveByScroll:case this.moveByLines:case this.moveToColumn:case this.moveToEol:break;default:e.lastHSPos=a.charCoords(f,"div").left}var g=c.repeat,h=a.findPosV(f,c.forward?g:-g,"line",e.lastHSPos);if(h.hitSide)if(c.forward)var i=a.charCoords(h,"div"),j={top:i.top+8,left:e.lastHSPos},h=a.coordsChar(j,"div");else{var k=a.charCoords(d(a.firstLine(),0),"div");k.left=e.lastHSPos,h=a.coordsChar(k,"div")}return e.lastHPos=h.ch,h},moveByPage:function(a,b,c){var d=b,e=c.repeat;return a.findPosV(d,c.forward?e:-e,"page")},moveByParagraph:function(a,b,c){var d=c.forward?1:-1;return Ba(a,b,c.repeat,d)},moveBySentence:function(a,b,c){var d=c.forward?1:-1;return Ca(a,b,c.repeat,d)},moveByScroll:function(a,b,c,d){var e=a.getScrollInfo(),f=null,g=c.repeat;g||(g=e.clientHeight/(2*a.defaultTextHeight()));var h=a.charCoords(b,"local");c.repeat=g;var f=Hb.moveByDisplayLines(a,b,c,d);if(!f)return null;var i=a.charCoords(f,"local");return a.scrollTo(null,e.top+i.top-h.top),f},moveByWords:function(a,b,c){return wa(a,b,c.repeat,!!c.forward,!!c.wordEnd,!!c.bigWord)},moveTillCharacter:function(a,b,c){var d=c.repeat,e=xa(a,d,c.forward,c.selectedCharacter),f=c.forward?-1:1;return ta(f,c),e?(e.ch+=f,e):null},moveToCharacter:function(a,b,c){var d=c.repeat;return ta(0,c),xa(a,d,c.forward,c.selectedCharacter)||b},moveToSymbol:function(a,b,c){var d=c.repeat;return ua(a,d,c.forward,c.selectedCharacter)||b},moveToColumn:function(a,b,c,d){var e=c.repeat;return d.lastHPos=e-1,d.lastHSPos=a.charCoords(b,"div").left,ya(a,e)},moveToEol:function(a,b,c,e){var f=b;e.lastHPos=1/0;var g=d(f.line+c.repeat-1,1/0),h=a.clipPos(g);return h.ch--,e.lastHSPos=a.charCoords(h,"div").left,g},moveToFirstNonWhiteSpaceCharacter:function(a,b){var c=b;return d(c.line,qa(a.getLine(c.line)))},moveToMatchedSymbol:function(a,b){for(var c,e=b,f=e.line,g=e.ch,h=a.getLine(f);g<h.length;g++)if(c=h.charAt(g),c&&s(c)){var i=a.getTokenTypeAt(d(f,g+1));if("string"!==i&&"comment"!==i)break}if(g<h.length){var j=a.findMatchingBracket(d(f,g));return j.to}return e},moveToStartOfLine:function(a,b){return d(b.line,0)},moveToLineOrEdgeOfDocument:function(a,b,c){var e=c.forward?a.lastLine():a.firstLine();return c.repeatIsExplicit&&(e=c.repeat-a.getOption("firstLineNumber")),d(e,qa(a.getLine(e)))},textObjectManipulation:function(a,b,c,d){var e={"(":")",")":"(","{":"}","}":"{","[":"]","]":"["},f={"'":!0,'"':!0},g=c.selectedCharacter;"b"==g?g="(":"B"==g&&(g="{");var h,i=!c.textObjectInner;if(e[g])h=Da(a,b,g,i);else if(f[g])h=Ea(a,b,g,i);else if("W"===g)h=ra(a,i,!0,!0);else if("w"===g)h=ra(a,i,!0,!1);else{if("p"!==g)return null;if(h=Ba(a,b,c.repeat,0,i),c.linewise=!0,d.visualMode)d.visualLine||(d.visualLine=!0);else{var j=d.inputState.operatorArgs;j&&(j.linewise=!0),h.end.line--}}return a.state.vim.visualMode?ja(a,h.start,h.end):[h.start,h.end]},repeatLastCharacterSearch:function(a,b,c){var d=Db.lastCharacterSearch,e=c.repeat,f=c.forward===d.forward,g=(d.increment?1:0)*(f?-1:1);a.moveH(-g,"char"),c.inclusive=!!f;var h=xa(a,e,f,d.selectedCharacter);return h?(h.ch+=g,h):(a.moveH(g,"char"),b)}},Ib={change:function(b,c,e){var f,g,h=b.state.vim;if(Db.macroModeState.lastInsertModeChanges.inVisualBlock=h.visualBlock,h.visualMode){g=b.getSelection();var i=L("",e.length);b.replaceSelections(i),f=Z(e[0].head,e[0].anchor)}else{var j=e[0].anchor,k=e[0].head;g=b.getRange(j,k);var l=h.lastEditInputState||{};if("moveByWords"==l.motion&&!v(g)){var m=/\s+$/.exec(g);m&&l.motionArgs&&l.motionArgs.forward&&(k=Q(k,0,-m[0].length),g=g.slice(0,-m[0].length))}var n=new d(j.line-1,Number.MAX_VALUE),o=b.firstLine()==b.lastLine();k.line>b.lastLine()&&c.linewise&&!o?b.replaceRange("",n,k):b.replaceRange("",j,k),c.linewise&&(o||(b.setCursor(n),a.commands.newlineAndIndent(b)),j.ch=Number.MAX_VALUE),f=j}Db.registerController.pushText(c.registerName,"change",g,c.linewise,e.length>1),Jb.enterInsertMode(b,{head:f},b.state.vim)},delete:function(a,b,c){var e,f,g=a.state.vim;if(g.visualBlock){f=a.getSelection();var h=L("",c.length);a.replaceSelections(h),e=c[0].anchor}else{var i=c[0].anchor,j=c[0].head;b.linewise&&j.line!=a.firstLine()&&i.line==a.lastLine()&&i.line==j.line-1&&(i.line==a.firstLine()?i.ch=0:i=d(i.line-1,aa(a,i.line-1))),f=a.getRange(i,j),a.replaceRange("",i,j),e=i,b.linewise&&(e=Hb.moveToFirstNonWhiteSpaceCharacter(a,i))}Db.registerController.pushText(b.registerName,"delete",f,b.linewise,g.visualBlock);var k=g.insertMode;return O(a,e,k)},indent:function(a,b,c){var d=a.state.vim,e=c[0].anchor.line,f=d.visualBlock?c[c.length-1].anchor.line:c[0].head.line,g=d.visualMode?b.repeat:1;b.linewise&&f--;for(var h=e;h<=f;h++)for(var i=0;i<g;i++)a.indentLine(h,b.indentRight);return Hb.moveToFirstNonWhiteSpaceCharacter(a,c[0].anchor)},changeCase:function(a,b,c,d,e){for(var f=a.getSelections(),g=[],h=b.toLower,i=0;i<f.length;i++){var j=f[i],k="";if(h===!0)k=j.toLowerCase();else if(h===!1)k=j.toUpperCase();else for(var l=0;l<j.length;l++){var m=j.charAt(l);k+=u(m)?m.toLowerCase():m.toUpperCase()}g.push(k)}return a.replaceSelections(g),b.shouldMoveCursor?e:!a.state.vim.visualMode&&b.linewise&&c[0].anchor.line+1==c[0].head.line?Hb.moveToFirstNonWhiteSpaceCharacter(a,d):b.linewise?d:Z(c[0].anchor,c[0].head)},yank:function(a,b,c,d){var e=a.state.vim,f=a.getSelection(),g=e.visualMode?Z(e.sel.anchor,e.sel.head,c[0].head,c[0].anchor):d;return Db.registerController.pushText(b.registerName,"yank",f,b.linewise,e.visualBlock),g}},Jb={jumpListWalk:function(a,b,c){if(!c.visualMode){var d=b.repeat,e=b.forward,f=Db.jumpList,g=f.move(a,e?d:-d),h=g?g.find():void 0;h=h?h:a.getCursor(),a.setCursor(h)}},scroll:function(a,b,c){if(!c.visualMode){var d=b.repeat||1,e=a.defaultTextHeight(),f=a.getScrollInfo().top,g=e*d,h=b.forward?f+g:f-g,i=W(a.getCursor()),j=a.charCoords(i,"local");if(b.forward)h>j.top?(i.line+=(h-j.top)/e,i.line=Math.ceil(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.top)):a.scrollTo(null,h);else{var k=h+a.getScrollInfo().clientHeight;k<j.bottom?(i.line-=(j.bottom-k)/e,i.line=Math.floor(i.line),a.setCursor(i),j=a.charCoords(i,"local"),a.scrollTo(null,j.bottom-a.getScrollInfo().clientHeight)):a.scrollTo(null,h)}}},scrollToCursor:function(a,b){var c=a.getCursor().line,e=a.charCoords(d(c,0),"local"),f=a.getScrollInfo().clientHeight,g=e.top,h=e.bottom-g;switch(b.position){case"center":g=g-f/2+h;break;case"bottom":g=g-f+h}a.scrollTo(null,g)},replayMacro:function(a,b,c){var d=b.selectedCharacter,e=b.repeat,f=Db.macroModeState;for("@"==d&&(d=f.latestRegister);e--;)eb(a,c,f,d)},enterMacroRecordMode:function(a,b){var c=Db.macroModeState,d=b.selectedCharacter;Db.registerController.isValidRegister(d)&&c.enterMacroRecordMode(a,d)},toggleOverwrite:function(b){b.state.overwrite?(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})):(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"}))},enterInsertMode:function(b,c,e){if(!b.getOption("readOnly")){e.insertMode=!0,e.insertModeRepeat=c&&c.repeat||1;var f=c?c.insertAt:null,g=e.sel,h=c.head||b.getCursor("head"),i=b.listSelections().length;if("eol"==f)h=d(h.line,aa(b,h.line));else if("charAfter"==f)h=Q(h,0,1);else if("firstNonBlank"==f)h=Hb.moveToFirstNonWhiteSpaceCharacter(b,h);else if("startOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.min(g.head.ch,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line<g.anchor.line?g.head:d(g.anchor.line,0);else if("endOfSelectedArea"==f)e.visualBlock?(h=d(Math.min(g.head.line,g.anchor.line),Math.max(g.head.ch+1,g.anchor.ch)),i=Math.abs(g.head.line-g.anchor.line)+1):h=g.head.line>=g.anchor.line?Q(g.head,0,1):d(g.anchor.line,0);else if("inplace"==f&&e.visualMode)return;b.setOption("disableInput",!1),c&&c.replace?(b.toggleOverwrite(!0),b.setOption("keyMap","vim-replace"),a.signal(b,"vim-mode-change",{mode:"replace"})):(b.toggleOverwrite(!1),b.setOption("keyMap","vim-insert"),a.signal(b,"vim-mode-change",{mode:"insert"})),Db.macroModeState.isPlaying||(b.on("change",ib),a.on(b.getInputField(),"keydown",nb)),e.visualMode&&na(b),fa(b,h,i)}},toggleVisualMode:function(b,c,e){var f,g=c.repeat,h=b.getCursor();e.visualMode?e.visualLine^c.linewise||e.visualBlock^c.blockwise?(e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),ka(b)):na(b):(e.visualMode=!0,e.visualLine=!!c.linewise,e.visualBlock=!!c.blockwise,f=O(b,d(h.line,h.ch+g-1),!0),e.sel={anchor:h,head:f},a.signal(b,"vim-mode-change",{mode:"visual",subMode:e.visualLine?"linewise":e.visualBlock?"blockwise":""}),ka(b),za(b,e,"<",Z(h,f)),za(b,e,">",$(h,f)))},reselectLastSelection:function(b,c,d){var e=d.lastSelection;if(d.visualMode&&ia(b,d),e){var f=e.anchorMark.find(),g=e.headMark.find();if(!f||!g)return;d.sel={anchor:f,head:g},d.visualMode=!0,d.visualLine=e.visualLine,d.visualBlock=e.visualBlock,ka(b),za(b,d,"<",Z(f,g)),za(b,d,">",$(f,g)),a.signal(b,"vim-mode-change",{mode:"visual",subMode:d.visualLine?"linewise":d.visualBlock?"blockwise":""})}},joinLines:function(a,b,c){var e,f;if(c.visualMode){if(e=a.getCursor("anchor"),f=a.getCursor("head"),Y(f,e)){var g=f;f=e,e=g}f.ch=aa(a,f.line)-1}else{var h=Math.max(b.repeat,2);e=a.getCursor(),f=O(a,d(e.line+h-1,1/0))}for(var i=0,j=e.line;j<f.line;j++){i=aa(a,e.line);var g=d(e.line+1,aa(a,e.line+1)),k=a.getRange(e,g);k=k.replace(/\n\s*/g," "),a.replaceRange(k,e,g)}var l=d(e.line,i);c.visualMode&&na(a,!1),a.setCursor(l)},newLineAndEnterInsertMode:function(b,c,e){e.insertMode=!0;var f=W(b.getCursor());if(f.line!==b.firstLine()||c.after){f.line=c.after?f.line:f.line-1,f.ch=aa(b,f.line),b.setCursor(f);var g=a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent;g(b)}else b.replaceRange("\n",d(b.firstLine(),0)),b.setCursor(b.firstLine(),0);this.enterInsertMode(b,{repeat:c.repeat},e)},paste:function(a,b,c){var e=W(a.getCursor()),f=Db.registerController.getRegister(b.registerName),g=f.toString();if(g){if(b.matchIndent){var h=a.getOption("tabSize"),i=function(a){var b=a.split("\t").length-1,c=a.split(" ").length-1;return b*h+1*c},j=a.getLine(a.getCursor().line),k=i(j.match(/^\s*/)[0]),l=g.replace(/\n$/,""),m=g!==l,n=i(g.match(/^\s*/)[0]),g=l.replace(/^\s*/gm,(function(b){var c=k+(i(b)-n);if(c<0)return"";if(a.getOption("indentWithTabs")){var d=Math.floor(c/h);return Array(d+1).join("\t")}return Array(c+1).join(" ")}));g+=m?"\n":""}if(b.repeat>1)var g=Array(b.repeat+1).join(g);var o=f.linewise,p=f.blockwise;if(o)c.visualMode?g=c.visualLine?g.slice(0,-1):"\n"+g.slice(0,g.length-1)+"\n":b.after?(g="\n"+g.slice(0,g.length-1),e.ch=aa(a,e.line)):e.ch=0;else{if(p){g=g.split("\n");for(var q=0;q<g.length;q++)g[q]=""==g[q]?" ":g[q]}e.ch+=b.after?1:0}var r,s;if(c.visualMode){
+c.lastPastedText=g;var t,u=ha(a,c),v=u[0],w=u[1],x=a.getSelection(),y=a.listSelections(),z=new Array(y.length).join("1").split("1");c.lastSelection&&(t=c.lastSelection.headMark.find()),Db.registerController.unnamedRegister.setText(x),p?(a.replaceSelections(z),w=d(v.line+g.length-1,v.ch),a.setCursor(v),ea(a,w),a.replaceSelections(g),r=v):c.visualBlock?(a.replaceSelections(z),a.setCursor(v),a.replaceRange(g,v,v),r=v):(a.replaceRange(g,v,w),r=a.posFromIndex(a.indexFromPos(v)+g.length-1)),t&&(c.lastSelection.headMark=a.setBookmark(t)),o&&(r.ch=0)}else if(p){a.setCursor(e);for(var q=0;q<g.length;q++){var A=e.line+q;A>a.lastLine()&&a.replaceRange("\n",d(A,0));var B=aa(a,A);B<e.ch&&da(a,A,e.ch)}a.setCursor(e),ea(a,d(e.line+g.length-1,e.ch)),a.replaceSelections(g),r=e}else a.replaceRange(g,e),o&&b.after?r=d(e.line+1,qa(a.getLine(e.line+1))):o&&!b.after?r=d(e.line,qa(a.getLine(e.line))):!o&&b.after?(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length-1)):(s=a.indexFromPos(e),r=a.posFromIndex(s+g.length));c.visualMode&&na(a,!1),a.setCursor(r)}},undo:function(b,c){b.operation((function(){V(b,a.commands.undo,c.repeat)(),b.setCursor(b.getCursor("anchor"))}))},redo:function(b,c){V(b,a.commands.redo,c.repeat)()},setRegister:function(a,b,c){c.inputState.registerName=b.selectedCharacter},setMark:function(a,b,c){var d=b.selectedCharacter;za(a,c,d,a.getCursor())},replace:function(b,c,e){var f,g,h=c.selectedCharacter,i=b.getCursor(),j=b.listSelections();if(e.visualMode)i=b.getCursor("start"),g=b.getCursor("end");else{var k=b.getLine(i.line);f=i.ch+c.repeat,f>k.length&&(f=k.length),g=d(i.line,f)}if("\n"==h)e.visualMode||b.replaceRange("",i,g),(a.commands.newlineAndIndentContinueComment||a.commands.newlineAndIndent)(b);else{var l=b.getRange(i,g);if(l=l.replace(/[^\n]/g,h),e.visualBlock){var m=new Array(b.getOption("tabSize")+1).join(" ");l=b.getSelection(),l=l.replace(/\t/g,m).replace(/[^\n]/g,h).split("\n"),b.replaceSelections(l)}else b.replaceRange(l,i,g);e.visualMode?(i=Y(j[0].anchor,j[0].head)?j[0].anchor:j[0].head,b.setCursor(i),na(b,!1)):b.setCursor(Q(g,0,-1))}},incrementNumberToken:function(a,b){for(var c,e,f,g,h=a.getCursor(),i=a.getLine(h.line),j=/(-?)(?:(0x)([\da-f]+)|(0b|0|)(\d+))/gi;null!==(c=j.exec(i))&&(e=c.index,f=e+c[0].length,!(h.ch<f)););if((b.backtrack||!(f<=h.ch))&&c){var k=c[2]||c[4],l=c[3]||c[5],m=b.increase?1:-1,n={"0b":2,0:8,"":10,"0x":16}[k.toLowerCase()],o=parseInt(c[1]+l,n)+m*b.repeat;g=o.toString(n);var p=k?new Array(l.length-g.length+1+c[1].length).join("0"):"";g="-"===g.charAt(0)?"-"+k+p+g.substr(1):k+p+g;var q=d(h.line,e),r=d(h.line,f);a.replaceRange(g,q,r),a.setCursor(d(h.line,e+g.length-1))}},repeatLastEdit:function(a,b,c){var d=c.lastEditInputState;if(d){var e=b.repeat;e&&b.repeatIsExplicit?c.lastEditInputState.repeatOverride=e:e=c.lastEditInputState.repeatOverride||e,ob(a,c,e,!1)}},indent:function(a,b){a.indentLine(a.getCursor().line,b.indentRight)},exitInsertMode:bb},Kb={"(":"bracket",")":"bracket","{":"bracket","}":"bracket","[":"section","]":"section","*":"comment","/":"comment",m:"method",M:"method","#":"preprocess"},Lb={bracket:{isComplete:function(a){if(a.nextCh===a.symb){if(a.depth++,a.depth>=1)return!0}else a.nextCh===a.reverseSymb&&a.depth--;return!1}},section:{init:function(a){a.curMoveThrough=!0,a.symb=(a.forward?"]":"[")===a.symb?"{":"}"},isComplete:function(a){return 0===a.index&&a.nextCh===a.symb}},comment:{isComplete:function(a){var b="*"===a.lastCh&&"/"===a.nextCh;return a.lastCh=a.nextCh,b}},method:{init:function(a){a.symb="m"===a.symb?"{":"}",a.reverseSymb="{"===a.symb?"}":"{"},isComplete:function(a){return a.nextCh===a.symb}},preprocess:{init:function(a){a.index=0},isComplete:function(a){if("#"===a.nextCh){var b=a.lineText.match(/#(\w+)/)[1];if("endif"===b){if(a.forward&&0===a.depth)return!0;a.depth++}else if("if"===b){if(!a.forward&&0===a.depth)return!0;a.depth--}if("else"===b&&0===a.depth)return!0}return!1}}};y("pcre",!0,"boolean"),Fa.prototype={getQuery:function(){return Db.query},setQuery:function(a){Db.query=a},getOverlay:function(){return this.searchOverlay},setOverlay:function(a){this.searchOverlay=a},isReversed:function(){return Db.isReversed},setReversed:function(a){Db.isReversed=a},getScrollbarAnnotate:function(){return this.annotate},setScrollbarAnnotate:function(a){this.annotate=a}};var Mb={"\\n":"\n","\\r":"\r","\\t":"\t"},Nb={"\\/":"/","\\\\":"\\","\\n":"\n","\\r":"\r","\\t":"\t"},Ob="(Javascript regexp)",Pb=function(){this.buildCommandMap_()};Pb.prototype={processCommand:function(a,b,c){var d=this;a.operation((function(){a.curOp.isVimOp=!0,d._processCommand(a,b,c)}))},_processCommand:function(b,c,d){var e=b.state.vim,f=Db.registerController.getRegister(":"),g=f.toString();e.visualMode&&na(b);var h=new a.StringStream(c);f.setText(c);var i=d||{};i.input=c;try{this.parseInput_(b,h,i)}catch(a){throw Qa(b,a),a}var j,k;if(i.commandName){if(j=this.matchCommand_(i.commandName)){if(k=j.name,j.excludeFromCommandHistory&&f.setText(g),this.parseCommandArgs_(h,i,j),"exToKey"==j.type){for(var l=0;l<j.toKeys.length;l++)a.Vim.handleKey(b,j.toKeys[l],"mapping");return}if("exToEx"==j.type)return void this.processCommand(b,j.toInput)}}else void 0!==i.line&&(k="move");if(!k)return void Qa(b,'Not an editor command ":'+c+'"');try{Qb[k](b,i),j&&j.possiblyAsync||!i.callback||i.callback()}catch(a){throw Qa(b,a),a}},parseInput_:function(a,b,c){b.eatWhile(":"),b.eat("%")?(c.line=a.firstLine(),c.lineEnd=a.lastLine()):(c.line=this.parseLineSpec_(a,b),void 0!==c.line&&b.eat(",")&&(c.lineEnd=this.parseLineSpec_(a,b)));var d=b.match(/^(\w+)/);return d?c.commandName=d[1]:c.commandName=b.match(/.*/)[0],c},parseLineSpec_:function(a,b){var c=b.match(/^(\d+)/);if(c)return parseInt(c[1],10)-1;switch(b.next()){case".":return this.parseLineSpecOffset_(b,a.getCursor().line);case"$":return this.parseLineSpecOffset_(b,a.lastLine());case"'":var d=b.next(),e=_a(a,a.state.vim,d);if(!e)throw new Error("Mark not set");return this.parseLineSpecOffset_(b,e.line);case"-":case"+":return b.backUp(1),this.parseLineSpecOffset_(b,a.getCursor().line);default:return void b.backUp(1)}},parseLineSpecOffset_:function(a,b){var c=a.match(/^([+-])?(\d+)/);if(c){var d=parseInt(c[2],10);"-"==c[1]?b-=d:b+=d}return b},parseCommandArgs_:function(a,b,c){if(!a.eol()){b.argString=a.match(/.*/)[0];var d=c.argDelimiter||/\s+/,e=ba(b.argString).split(d);e.length&&e[0]&&(b.args=e)}},matchCommand_:function(a){for(var b=a.length;b>0;b--){var c=a.substring(0,b);if(this.commandMap_[c]){var d=this.commandMap_[c];if(0===d.name.indexOf(a))return d}}return null},buildCommandMap_:function(){this.commandMap_={};for(var a=0;a<c.length;a++){var b=c[a],d=b.shortName||b.name;this.commandMap_[d]=b}},map:function(a,c,d){if(":"!=a&&":"==a.charAt(0)){if(d)throw Error("Mode not supported for ex mappings");var e=a.substring(1);":"!=c&&":"==c.charAt(0)?this.commandMap_[e]={name:e,type:"exToEx",toInput:c.substring(1),user:!0}:this.commandMap_[e]={name:e,type:"exToKey",toKeys:c,user:!0}}else if(":"!=c&&":"==c.charAt(0)){var f={keys:a,type:"keyToEx",exArgs:{input:c.substring(1)}};d&&(f.context=d),b.unshift(f)}else{var f={keys:a,type:"keyToKey",toKeys:c};d&&(f.context=d),b.unshift(f)}},unmap:function(a,c){if(":"!=a&&":"==a.charAt(0)){if(c)throw Error("Mode not supported for ex mappings");var d=a.substring(1);if(this.commandMap_[d]&&this.commandMap_[d].user)return void delete this.commandMap_[d]}else for(var e=a,f=0;f<b.length;f++)if(e==b[f].keys&&b[f].context===c)return void b.splice(f,1);throw Error("No such mapping.")}};var Qb={colorscheme:function(a,b){return!b.args||b.args.length<1?void Qa(a,a.getOption("theme")):void a.setOption("theme",b.args[0])},map:function(a,b,c){var d=b.args;return!d||d.length<2?void(a&&Qa(a,"Invalid mapping: "+b.input)):void Rb.map(d[0],d[1],c)},imap:function(a,b){this.map(a,b,"insert")},nmap:function(a,b){this.map(a,b,"normal")},vmap:function(a,b){this.map(a,b,"visual")},unmap:function(a,b,c){var d=b.args;return!d||d.length<1?void(a&&Qa(a,"No such mapping: "+b.input)):void Rb.unmap(d[0],c)},move:function(a,b){Gb.processCommand(a,a.state.vim,{type:"motion",motion:"moveToLineOrEdgeOfDocument",motionArgs:{forward:!1,explicitRepeat:!0,linewise:!0},repeatOverride:b.line+1})},set:function(a,b){var c=b.args,d=b.setCfg||{};if(!c||c.length<1)return void(a&&Qa(a,"Invalid mapping: "+b.input));var e=c[0].split("="),f=e[0],g=e[1],h=!1;if("?"==f.charAt(f.length-1)){if(g)throw Error("Trailing characters: "+b.argString);f=f.substring(0,f.length-1),h=!0}void 0===g&&"no"==f.substring(0,2)&&(f=f.substring(2),g=!1);var i=Ab[f]&&"boolean"==Ab[f].type;if(i&&void 0==g&&(g=!0),!i&&void 0===g||h){var j=A(f,a,d);j instanceof Error?Qa(a,j.message):j===!0||j===!1?Qa(a," "+(j?"":"no")+f):Qa(a,"  "+f+"="+j)}else{var k=z(f,g,a,d);k instanceof Error&&Qa(a,k.message)}},setlocal:function(a,b){b.setCfg={scope:"local"},this.set(a,b)},setglobal:function(a,b){b.setCfg={scope:"global"},this.set(a,b)},registers:function(a,b){var c=b.args,d=Db.registerController.registers,e="----------Registers----------<br><br>";if(c){var f;c=c.join("");for(var g=0;g<c.length;g++)if(f=c.charAt(g),Db.registerController.isValidRegister(f)){var h=d[f]||new G;e+='"'+f+"    "+h.toString()+"<br>"}}else for(var f in d){var i=d[f].toString();i.length&&(e+='"'+f+"    "+i+"<br>")}Qa(a,e)},sort:function(b,c){function e(){if(c.argString){var b=new a.StringStream(c.argString);if(b.eat("!")&&(h=!0),b.eol())return;if(!b.eatSpace())return"Invalid arguments";var d=b.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);if(!d&&!b.eol())return"Invalid arguments";if(d[1]){i=d[1].indexOf("i")!=-1,j=d[1].indexOf("u")!=-1;var e=d[1].indexOf("d")!=-1||d[1].indexOf("n")!=-1&&1,f=d[1].indexOf("x")!=-1&&1,g=d[1].indexOf("o")!=-1&&1;if(e+f+g>1)return"Invalid arguments";k=e&&"decimal"||f&&"hex"||g&&"octal"}d[2]&&(l=new RegExp(d[2].substr(1,d[2].length-2),i?"i":""))}}function f(a,b){if(h){var c;c=a,a=b,b=c}i&&(a=a.toLowerCase(),b=b.toLowerCase());var d=k&&s.exec(a),e=k&&s.exec(b);return d?(d=parseInt((d[1]+d[2]).toLowerCase(),t),e=parseInt((e[1]+e[2]).toLowerCase(),t),d-e):a<b?-1:1}function g(a,b){if(h){var c;c=a,a=b,b=c}return i&&(a[0]=a[0].toLowerCase(),b[0]=b[0].toLowerCase()),a[0]<b[0]?-1:1}var h,i,j,k,l,m=e();if(m)return void Qa(b,m+": "+c.argString);var n=c.line||b.firstLine(),o=c.lineEnd||c.line||b.lastLine();if(n!=o){var p=d(n,0),q=d(o,aa(b,o)),r=b.getRange(p,q).split("\n"),s=l?l:"decimal"==k?/(-?)([\d]+)/:"hex"==k?/(-?)(?:0x)?([0-9a-f]+)/i:"octal"==k?/([0-7]+)/:null,t="decimal"==k?10:"hex"==k?16:"octal"==k?8:null,u=[],v=[];if(k||l)for(var w=0;w<r.length;w++){var x=l?r[w].match(l):null;x&&""!=x[0]?u.push(x):!l&&s.exec(r[w])?u.push(r[w]):v.push(r[w])}else v=r;if(u.sort(l?g:f),l)for(var w=0;w<u.length;w++)u[w]=u[w].input;else k||v.sort(f);if(r=h?u.concat(v):v.concat(u),j){var y,z=r;r=[];for(var w=0;w<z.length;w++)z[w]!=y&&r.push(z[w]),y=z[w]}b.replaceRange(r.join("\n"),p,q)}},global:function(a,b){var c=b.argString;if(!c)return void Qa(a,"Regular Expression missing from global");var d,e=void 0!==b.line?b.line:a.firstLine(),f=b.lineEnd||b.line||a.lastLine(),g=Ia(c),h=c;if(g.length&&(h=g[0],d=g.slice(1,g.length).join("/")),h)try{Ua(a,h,!0,!0)}catch(b){return void Qa(a,"Invalid regex: "+h)}for(var i=Ga(a).getQuery(),j=[],k="",l=e;l<=f;l++){var m=i.test(a.getLine(l));m&&(j.push(l+1),k+=a.getLine(l)+"<br>")}if(!d)return void Qa(a,k);var n=0,o=function(){if(n<j.length){var b=j[n]+d;Rb.processCommand(a,b,{callback:o})}n++};o()},substitute:function(a,b){if(!a.getSearchCursor)throw new Error("Search feature not available. Requires searchcursor.js or any other getSearchCursor implementation.");var c,e,f,g,h=b.argString,i=h?Ka(h,h[0]):[],j="",k=!1,l=!1;if(i.length)c=i[0],j=i[1],c&&"$"===c[c.length-1]&&(c=c.slice(0,c.length-1)+"\\n",j=j?j+"\n":"\n"),void 0!==j&&(j=A("pcre")?Oa(j):Na(j),Db.lastSubstituteReplacePart=j),e=i[2]?i[2].split(" "):[];else if(h&&h.length)return void Qa(a,"Substitutions should be of the form :s/pattern/replace/");if(e&&(f=e[0],g=parseInt(e[1]),f&&(f.indexOf("c")!=-1&&(k=!0,f.replace("c","")),f.indexOf("g")!=-1&&(l=!0,f.replace("g","")),c=c.replace(/\//g,"\\/")+"/"+f)),c)try{Ua(a,c,!0,!0)}catch(b){return void Qa(a,"Invalid regex: "+c)}if(j=j||Db.lastSubstituteReplacePart,void 0===j)return void Qa(a,"No previous substitute regular expression");var m=Ga(a),n=m.getQuery(),o=void 0!==b.line?b.line:a.getCursor().line,p=b.lineEnd||o;o==a.firstLine()&&p==a.lastLine()&&(p=1/0),g&&(o=p,p=o+g-1);var q=O(a,d(o,0)),r=a.getSearchCursor(n,q);ab(a,k,l,o,p,r,n,j,b.callback)},redo:a.commands.redo,undo:a.commands.undo,write:function(b){a.commands.save?a.commands.save(b):b.save&&b.save()},nohlsearch:function(a){Ya(a)},yank:function(a){var b=W(a.getCursor()),c=b.line,d=a.getLine(c);Db.registerController.pushText("0","yank",d,!0,!0)},delmarks:function(b,c){if(!c.argString||!ba(c.argString))return void Qa(b,"Argument required");for(var d=b.state.vim,e=new a.StringStream(ba(c.argString));!e.eol();){e.eatSpace();var f=e.pos;if(!e.match(/[a-zA-Z]/,!1))return void Qa(b,"Invalid argument: "+c.argString.substring(f));var g=e.next();if(e.match("-",!0)){if(!e.match(/[a-zA-Z]/,!1))return void Qa(b,"Invalid argument: "+c.argString.substring(f));var h=g,i=e.next();if(!(r(h)&&r(i)||u(h)&&u(i)))return void Qa(b,"Invalid argument: "+h+"-");var j=h.charCodeAt(0),k=i.charCodeAt(0);if(j>=k)return void Qa(b,"Invalid argument: "+c.argString.substring(f));for(var l=0;l<=k-j;l++){var m=String.fromCharCode(j+l);delete d.marks[m]}}else delete d.marks[g]}}},Rb=new Pb;return a.keyMap.vim={attach:h,detach:g,call:m},y("insertModeEscKeysTimeout",200,"number"),a.keyMap["vim-insert"]={fallthrough:["default"],attach:h,detach:g,call:m},a.keyMap["vim-replace"]={Backspace:"goCharLeft",fallthrough:["vim-insert"],attach:h,detach:g,call:m},D(),Fb};a.Vim=e()}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/lib/addons.css b/core/media/editors/codemirror/lib/addons.css
new file mode 100644
index 00000000..ad952844
--- /dev/null
+++ b/core/media/editors/codemirror/lib/addons.css
@@ -0,0 +1,103 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9;
+}
+
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}
+
+.CodeMirror-search-match {
+  background: gold;
+  border-top: 1px solid orange;
+  border-bottom: 1px solid orange;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  opacity: .5;
+}
+
+.CodeMirror-simplescroll-horizontal div, .CodeMirror-simplescroll-vertical div {
+  position: absolute;
+  background: #ccc;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px solid #bbb;
+  border-radius: 2px;
+}
+
+.CodeMirror-simplescroll-horizontal, .CodeMirror-simplescroll-vertical {
+  position: absolute;
+  z-index: 6;
+  background: #eee;
+}
+
+.CodeMirror-simplescroll-horizontal {
+  bottom: 0; left: 0;
+  height: 8px;
+}
+.CodeMirror-simplescroll-horizontal div {
+  bottom: 0;
+  height: 100%;
+}
+
+.CodeMirror-simplescroll-vertical {
+  right: 0; top: 0;
+  width: 8px;
+}
+.CodeMirror-simplescroll-vertical div {
+  right: 0;
+  width: 100%;
+}
+
+
+.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler, .CodeMirror-overlayscroll .CodeMirror-gutter-filler {
+  display: none;
+}
+
+.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
+  position: absolute;
+  background: #bcd;
+  border-radius: 3px;
+}
+
+.CodeMirror-overlayscroll-horizontal, .CodeMirror-overlayscroll-vertical {
+  position: absolute;
+  z-index: 6;
+}
+
+.CodeMirror-overlayscroll-horizontal {
+  bottom: 0; left: 0;
+  height: 6px;
+}
+.CodeMirror-overlayscroll-horizontal div {
+  bottom: 0;
+  height: 100%;
+}
+
+.CodeMirror-overlayscroll-vertical {
+  right: 0; top: 0;
+  width: 6px;
+}
+.CodeMirror-overlayscroll-vertical div {
+  right: 0;
+  width: 100%;
+}
diff --git a/core/media/editors/codemirror/lib/addons.js b/core/media/editors/codemirror/lib/addons.js
new file mode 100644
index 00000000..8965b567
--- /dev/null
+++ b/core/media/editors/codemirror/lib/addons.js
@@ -0,0 +1,2662 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
+    if (old == CodeMirror.Init) old = false;
+    if (!old == !val) return;
+    if (val) setFullscreen(cm);
+    else setNormal(cm);
+  });
+
+  function setFullscreen(cm) {
+    var wrap = cm.getWrapperElement();
+    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
+                                  width: wrap.style.width, height: wrap.style.height};
+    wrap.style.width = "";
+    wrap.style.height = "auto";
+    wrap.className += " CodeMirror-fullscreen";
+    document.documentElement.style.overflow = "hidden";
+    cm.refresh();
+  }
+
+  function setNormal(cm) {
+    var wrap = cm.getWrapperElement();
+    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
+    document.documentElement.style.overflow = "";
+    var info = cm.state.fullScreenRestore;
+    wrap.style.width = info.width; wrap.style.height = info.height;
+    window.scrollTo(info.scrollLeft, info.scrollTop);
+    cm.refresh();
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineExtension("addPanel", function(node, options) {
+    options = options || {};
+
+    if (!this.state.panels) initPanels(this);
+
+    var info = this.state.panels;
+    var wrapper = info.wrapper;
+    var cmWrapper = this.getWrapperElement();
+
+    if (options.after instanceof Panel && !options.after.cleared) {
+      wrapper.insertBefore(node, options.before.node.nextSibling);
+    } else if (options.before instanceof Panel && !options.before.cleared) {
+      wrapper.insertBefore(node, options.before.node);
+    } else if (options.replace instanceof Panel && !options.replace.cleared) {
+      wrapper.insertBefore(node, options.replace.node);
+      options.replace.clear();
+    } else if (options.position == "bottom") {
+      wrapper.appendChild(node);
+    } else if (options.position == "before-bottom") {
+      wrapper.insertBefore(node, cmWrapper.nextSibling);
+    } else if (options.position == "after-top") {
+      wrapper.insertBefore(node, cmWrapper);
+    } else {
+      wrapper.insertBefore(node, wrapper.firstChild);
+    }
+
+    var height = (options && options.height) || node.offsetHeight;
+    this._setSize(null, info.heightLeft -= height);
+    info.panels++;
+    if (options.stable && isAtTop(this, node))
+      this.scrollTo(null, this.getScrollInfo().top + height)
+
+    return new Panel(this, node, options, height);
+  });
+
+  function Panel(cm, node, options, height) {
+    this.cm = cm;
+    this.node = node;
+    this.options = options;
+    this.height = height;
+    this.cleared = false;
+  }
+
+  Panel.prototype.clear = function() {
+    if (this.cleared) return;
+    this.cleared = true;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.heightLeft += this.height);
+    if (this.options.stable && isAtTop(this.cm, this.node))
+      this.cm.scrollTo(null, this.cm.getScrollInfo().top - this.height)
+    info.wrapper.removeChild(this.node);
+    if (--info.panels == 0) removePanels(this.cm);
+  };
+
+  Panel.prototype.changed = function(height) {
+    var newHeight = height == null ? this.node.offsetHeight : height;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.heightLeft -= (newHeight - this.height));
+    this.height = newHeight;
+  };
+
+  function initPanels(cm) {
+    var wrap = cm.getWrapperElement();
+    var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
+    var height = parseInt(style.height);
+    var info = cm.state.panels = {
+      setHeight: wrap.style.height,
+      heightLeft: height,
+      panels: 0,
+      wrapper: document.createElement("div")
+    };
+    wrap.parentNode.insertBefore(info.wrapper, wrap);
+    var hasFocus = cm.hasFocus();
+    info.wrapper.appendChild(wrap);
+    if (hasFocus) cm.focus();
+
+    cm._setSize = cm.setSize;
+    if (height != null) cm.setSize = function(width, newHeight) {
+      if (newHeight == null) return this._setSize(width, newHeight);
+      info.setHeight = newHeight;
+      if (typeof newHeight != "number") {
+        var px = /^(\d+\.?\d*)px$/.exec(newHeight);
+        if (px) {
+          newHeight = Number(px[1]);
+        } else {
+          info.wrapper.style.height = newHeight;
+          newHeight = info.wrapper.offsetHeight;
+          info.wrapper.style.height = "";
+        }
+      }
+      cm._setSize(width, info.heightLeft += (newHeight - height));
+      height = newHeight;
+    };
+  }
+
+  function removePanels(cm) {
+    var info = cm.state.panels;
+    cm.state.panels = null;
+
+    var wrap = cm.getWrapperElement();
+    info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
+    wrap.style.height = info.setHeight;
+    cm.setSize = cm._setSize;
+    cm.setSize();
+  }
+
+  function isAtTop(cm, dom) {
+    for (var sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
+      if (sibling == cm.getWrapperElement()) return true
+    return false
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var defaults = {
+    pairs: "()[]{}''\"\"",
+    triples: "",
+    explode: "[]{}"
+  };
+
+  var Pos = CodeMirror.Pos;
+
+  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.removeKeyMap(keyMap);
+      cm.state.closeBrackets = null;
+    }
+    if (val) {
+      ensureBound(getOption(val, "pairs"))
+      cm.state.closeBrackets = val;
+      cm.addKeyMap(keyMap);
+    }
+  });
+
+  function getOption(conf, name) {
+    if (name == "pairs" && typeof conf == "string") return conf;
+    if (typeof conf == "object" && conf[name] != null) return conf[name];
+    return defaults[name];
+  }
+
+  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+  function ensureBound(chars) {
+    for (var i = 0; i < chars.length; i++) {
+      var ch = chars.charAt(i), key = "'" + ch + "'"
+      if (!keyMap[key]) keyMap[key] = handler(ch)
+    }
+  }
+  ensureBound(defaults.pairs + "`")
+
+  function handler(ch) {
+    return function(cm) { return handleChar(cm, ch); };
+  }
+
+  function getConfig(cm) {
+    var deflt = cm.state.closeBrackets;
+    if (!deflt || deflt.override) return deflt;
+    var mode = cm.getModeAt(cm.getCursor());
+    return mode.closeBrackets || deflt;
+  }
+
+  function handleBackspace(cm) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var cur = ranges[i].head;
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
+    }
+  }
+
+  function handleEnter(cm) {
+    var conf = getConfig(cm);
+    var explode = conf && getOption(conf, "explode");
+    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    cm.operation(function() {
+      var linesep = cm.lineSeparator() || "\n";
+      cm.replaceSelection(linesep + linesep, null);
+      cm.execCommand("goCharLeft");
+      ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var line = ranges[i].head.line;
+        cm.indentLine(line, null, true);
+        cm.indentLine(line + 1, null, true);
+      }
+    });
+  }
+
+  function contractSelection(sel) {
+    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
+    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
+            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
+  }
+
+  function handleChar(cm, ch) {
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pairs = getOption(conf, "pairs");
+    var pos = pairs.indexOf(ch);
+    if (pos == -1) return CodeMirror.Pass;
+    var triples = getOption(conf, "triples");
+
+    var identical = pairs.charAt(pos + 1) == ch;
+    var ranges = cm.listSelections();
+    var opening = pos % 2 == 0;
+
+    var type;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], cur = range.head, curType;
+      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+      if (opening && !range.empty()) {
+        curType = "surround";
+      } else if ((identical || !opening) && next == ch) {
+        if (identical && stringStartsAfter(cm, cur))
+          curType = "both";
+        else if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+          curType = "skipThree";
+        else
+          curType = "skip";
+      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) {
+        if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass;
+        curType = "addFour";
+      } else if (identical) {
+        var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
+        if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
+        else return CodeMirror.Pass;
+      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
+                             isClosingBracket(next, pairs) ||
+                             /\s/.test(next))) {
+        curType = "both";
+      } else {
+        return CodeMirror.Pass;
+      }
+      if (!type) type = curType;
+      else if (type != curType) return CodeMirror.Pass;
+    }
+
+    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
+    cm.operation(function() {
+      if (type == "skip") {
+        cm.execCommand("goCharRight");
+      } else if (type == "skipThree") {
+        for (var i = 0; i < 3; i++)
+          cm.execCommand("goCharRight");
+      } else if (type == "surround") {
+        var sels = cm.getSelections();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = left + sels[i] + right;
+        cm.replaceSelections(sels, "around");
+        sels = cm.listSelections().slice();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = contractSelection(sels[i]);
+        cm.setSelections(sels);
+      } else if (type == "both") {
+        cm.replaceSelection(left + right, null);
+        cm.triggerElectric(left + right);
+        cm.execCommand("goCharLeft");
+      } else if (type == "addFour") {
+        cm.replaceSelection(left + left + left + left, "before");
+        cm.execCommand("goCharRight");
+      }
+    });
+  }
+
+  function isClosingBracket(ch, pairs) {
+    var pos = pairs.lastIndexOf(ch);
+    return pos > -1 && pos % 2 == 1;
+  }
+
+  function charsAround(cm, pos) {
+    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+                          Pos(pos.line, pos.ch + 1));
+    return str.length == 2 ? str : null;
+  }
+
+  function stringStartsAfter(cm, pos) {
+    var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
+    return /\bstring/.test(token.type) && token.start == pos.ch &&
+      (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos)))
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Tag-closer extension for CodeMirror.
+ *
+ * This extension adds an "autoCloseTags" option that can be set to
+ * either true to get the default behavior, or an object to further
+ * configure its behavior.
+ *
+ * These are supported options:
+ *
+ * `whenClosing` (default true)
+ *   Whether to autoclose when the '/' of a closing tag is typed.
+ * `whenOpening` (default true)
+ *   Whether to autoclose the tag when the final '>' of an opening
+ *   tag is typed.
+ * `dontCloseTags` (default is empty tags for HTML, none for XML)
+ *   An array of tag names that should not be autoclosed.
+ * `indentTags` (default is block tags for HTML, none for XML)
+ *   An array of tag names that should, when opened, cause a
+ *   blank line to be added inside the tag, and the blank line and
+ *   closing line to be indented.
+ *
+ * See demos/closetag.html for a usage example.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
+    if (old != CodeMirror.Init && old)
+      cm.removeKeyMap("autoCloseTags");
+    if (!val) return;
+    var map = {name: "autoCloseTags"};
+    if (typeof val != "object" || val.whenClosing)
+      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
+    if (typeof val != "object" || val.whenOpening)
+      map["'>'"] = function(cm) { return autoCloseGT(cm); };
+    cm.addKeyMap(map);
+  });
+
+  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
+                       "source", "track", "wbr"];
+  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
+                    "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
+
+  function autoCloseGT(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    var opt = cm.getOption("autoCloseTags");
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+
+      var html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+
+      var tagName = state.tagName;
+      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+      var lowerTagName = tagName.toLowerCase();
+      // Don't process the '>' at the end of an end-tag or self-closing tag
+      if (!tagName ||
+          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+          tok.type == "tag" && state.type == "closeTag" ||
+          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+          closingTagExists(cm, tagName, pos, state, true))
+        return CodeMirror.Pass;
+
+      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+      replacements[i] = {indent: indent,
+                         text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",
+                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
+    }
+
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnAutoClose);
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var info = replacements[i];
+      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
+      var sel = cm.listSelections().slice(0);
+      sel[i] = {head: info.newPos, anchor: info.newPos};
+      cm.setSelections(sel);
+      if (!dontIndentOnAutoClose && info.indent) {
+        cm.indentLine(info.newPos.line, null, true);
+        cm.indentLine(info.newPos.line + 1, null, true);
+      }
+    }
+  }
+
+  function autoCloseCurrent(cm, typingSlash) {
+    var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
+    var opt = cm.getOption("autoCloseTags");
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnSlash);
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
+        return CodeMirror.Pass;
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      var replacement;
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacement = head + "script";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacement = head + "style";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacement = head + state.context.tagName;
+      }
+      if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
+      replacements[i] = replacement;
+    }
+    cm.replaceSelections(replacements);
+    ranges = cm.listSelections();
+    if (!dontIndentOnAutoClose) {
+        for (var i = 0; i < ranges.length; i++)
+            if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+                cm.indentLine(ranges[i].head.line);
+    }
+  }
+
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    return autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
+  function indexOf(collection, elt) {
+    if (collection.indexOf) return collection.indexOf(elt);
+    for (var i = 0, e = collection.length; i < e; ++i)
+      if (collection[i] == elt) return i;
+    return -1;
+  }
+
+  // If xml-fold is loaded, we use its functionality to try and verify
+  // whether a given tag is actually unclosed.
+  function closingTagExists(cm, tagName, pos, state, newTag) {
+    if (!CodeMirror.scanForClosingTag) return false;
+    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
+    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
+    if (!nextClose || nextClose.tag != tagName) return false;
+    var cx = state.context;
+    // If the immediate wrapping context contains onCx instances of
+    // the same tag, a closing tag only exists if there are at least
+    // that many closing tags of that type following.
+    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
+    pos = nextClose.to;
+    for (var i = 1; i < onCx; i++) {
+      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
+      if (!next || next.tag != tagName) return false;
+      pos = next.to;
+    }
+    return true;
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
+    (document.documentMode == null || document.documentMode < 8);
+
+  var Pos = CodeMirror.Pos;
+
+  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
+
+  function findMatchingBracket(cm, where, config) {
+    var line = cm.getLineHandle(where.line), pos = where.ch - 1;
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+        matching[line.text.charAt(++pos)];
+    if (!match) return null;
+    var dir = match.charAt(1) == ">" ? 1 : -1;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
+    var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
+
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    if (found == null) return null;
+    return {from: Pos(where.line, pos), to: found && found.pos,
+            match: found && found.ch == match.charAt(0), forward: dir > 0};
+  }
+
+  // bracketRegex is used to specify which type of bracket to scan
+  // should be a regexp, e.g. /[[\]]/
+  //
+  // Note: If "where" is on an open bracket, then this bracket is ignored.
+  //
+  // Returns false when no bracket was found, null when it reached
+  // maxScanLines and gave up
+  function scanForBracket(cm, where, dir, style, config) {
+    var maxScanLen = (config && config.maxScanLineLength) || 10000;
+    var maxScanLines = (config && config.maxScanLines) || 1000;
+
+    var stack = [];
+    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
+    var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
+                          : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
+    for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
+      var line = cm.getLine(lineNo);
+      if (!line) continue;
+      var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1;
+      if (line.length > maxScanLen) continue;
+      if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
+      for (; pos != end; pos += dir) {
+        var ch = line.charAt(pos);
+        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
+          var match = matching[ch];
+          if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
+          else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
+          else stack.pop();
+        }
+      }
+    }
+    return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
+  }
+
+  function matchBrackets(cm, autoclear, config) {
+    // Disable brace matching in long lines, since it'll cause hugely slow updates
+    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
+    var marks = [], ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
+        var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
+        marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
+        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
+          marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
+      }
+    }
+
+    if (marks.length) {
+      // Kludge to work around the IE bug from issue #1193, where text
+      // input stops going to the textare whever this fires.
+      if (ie_lt8 && cm.state.focused) cm.focus();
+
+      var clear = function() {
+        cm.operation(function() {
+          for (var i = 0; i < marks.length; i++) marks[i].clear();
+        });
+      };
+      if (autoclear) setTimeout(clear, 800);
+      else return clear;
+    }
+  }
+
+  function doMatchBrackets(cm) {
+    cm.operation(function() {
+      if (cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+      cm.state.matchBrackets.currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
+    });
+  }
+
+  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchBrackets);
+      if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+    }
+    if (val) {
+      cm.state.matchBrackets = typeof val == "object" ? val : {};
+      cm.on("cursorActivity", doMatchBrackets);
+    }
+  });
+
+  CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
+  });
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
+    return scanForBracket(this, pos, dir, style, config);
+  });
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchTags);
+      cm.off("viewportChange", maybeUpdateMatch);
+      clear(cm);
+    }
+    if (val) {
+      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
+      cm.on("cursorActivity", doMatchTags);
+      cm.on("viewportChange", maybeUpdateMatch);
+      doMatchTags(cm);
+    }
+  });
+
+  function clear(cm) {
+    if (cm.state.tagHit) cm.state.tagHit.clear();
+    if (cm.state.tagOther) cm.state.tagOther.clear();
+    cm.state.tagHit = cm.state.tagOther = null;
+  }
+
+  function doMatchTags(cm) {
+    cm.state.failedTagMatch = false;
+    cm.operation(function() {
+      clear(cm);
+      if (cm.somethingSelected()) return;
+      var cur = cm.getCursor(), range = cm.getViewport();
+      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
+      var match = CodeMirror.findMatchingTag(cm, cur, range);
+      if (!match) return;
+      if (cm.state.matchBothTags) {
+        var hit = match.at == "open" ? match.open : match.close;
+        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
+      }
+      var other = match.at == "close" ? match.open : match.close;
+      if (other)
+        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+      else
+        cm.state.failedTagMatch = true;
+    });
+  }
+
+  function maybeUpdateMatch(cm) {
+    if (cm.state.failedTagMatch) doMatchTags(cm);
+  }
+
+  CodeMirror.commands.toMatchingTag = function(cm) {
+    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
+    if (found) {
+      var other = found.at == "close" ? found.open : found.close;
+      if (other) cm.extendSelection(other.to, other.from);
+    }
+  };
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("fold", "brace", function(cm, start) {
+  var line = start.line, lineText = cm.getLine(line);
+  var tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+      if (!/^(comment|string)/.test(tokenType)) return found + 1;
+      at = found - 1;
+    }
+  }
+
+  var startToken = "{", endToken = "}", startCh = findOpening("{");
+  if (startCh == null) {
+    startToken = "[", endToken = "]";
+    startCh = findOpening("[");
+  }
+
+  if (startCh == null) return;
+  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
+        if (pos == nextOpen) ++count;
+        else if (!--count) { end = i; endCh = pos; break outer; }
+      }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
+
+CodeMirror.registerHelper("fold", "import", function(cm, start) {
+  function hasImport(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type != "keyword" || start.string != "import") return null;
+    // Now find closing semicolon, return its position
+    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
+      var text = cm.getLine(i), semi = text.indexOf(";");
+      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
+    }
+  }
+
+  var startLine = start.line, has = hasImport(startLine), prev;
+  if (!has || hasImport(startLine - 1) || ((prev = hasImport(startLine - 2)) && prev.end.line == startLine - 1))
+    return null;
+  for (var end = has.end;;) {
+    var next = hasImport(end.line + 1);
+    if (next == null) break;
+    end = next.end;
+  }
+  return {from: cm.clipPos(CodeMirror.Pos(startLine, has.startCh + 1)), to: end};
+});
+
+CodeMirror.registerHelper("fold", "include", function(cm, start) {
+  function hasInclude(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
+  }
+
+  var startLine = start.line, has = hasInclude(startLine);
+  if (has == null || hasInclude(startLine - 1) != null) return null;
+  for (var end = startLine;;) {
+    var next = hasInclude(end + 1);
+    if (next == null) break;
+    ++end;
+  }
+  return {from: CodeMirror.Pos(startLine, has + 1),
+          to: cm.clipPos(CodeMirror.Pos(end))};
+});
+
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function doFold(cm, pos, options, force) {
+    if (options && options.call) {
+      var finder = options;
+      options = null;
+    } else {
+      var finder = getOption(cm, options, "rangeFinder");
+    }
+    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
+    var minSize = getOption(cm, options, "minFoldSize");
+
+    function getRange(allowFolded) {
+      var range = finder(cm, pos);
+      if (!range || range.to.line - range.from.line < minSize) return null;
+      var marks = cm.findMarksAt(range.from);
+      for (var i = 0; i < marks.length; ++i) {
+        if (marks[i].__isFold && force !== "fold") {
+          if (!allowFolded) return null;
+          range.cleared = true;
+          marks[i].clear();
+        }
+      }
+      return range;
+    }
+
+    var range = getRange(true);
+    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
+      pos = CodeMirror.Pos(pos.line - 1, 0);
+      range = getRange(false);
+    }
+    if (!range || range.cleared || force === "unfold") return;
+
+    var myWidget = makeWidget(cm, options);
+    CodeMirror.on(myWidget, "mousedown", function(e) {
+      myRange.clear();
+      CodeMirror.e_preventDefault(e);
+    });
+    var myRange = cm.markText(range.from, range.to, {
+      replacedWith: myWidget,
+      clearOnEnter: getOption(cm, options, "clearOnEnter"),
+      __isFold: true
+    });
+    myRange.on("clear", function(from, to) {
+      CodeMirror.signal(cm, "unfold", cm, from, to);
+    });
+    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
+  }
+
+  function makeWidget(cm, options) {
+    var widget = getOption(cm, options, "widget");
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    } else if (widget) {
+      widget = widget.cloneNode(true)
+    }
+    return widget;
+  }
+
+  // Clumsy backwards-compatible interface
+  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
+  };
+
+  // New-style interface
+  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
+    doFold(this, pos, options, force);
+  });
+
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
+  CodeMirror.commands.toggleFold = function(cm) {
+    cm.foldCode(cm.getCursor());
+  };
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "fold");
+  };
+  CodeMirror.commands.unfold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "unfold");
+  };
+  CodeMirror.commands.foldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+    });
+  };
+  CodeMirror.commands.unfoldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+    });
+  };
+
+  CodeMirror.registerHelper("fold", "combine", function() {
+    var funcs = Array.prototype.slice.call(arguments, 0);
+    return function(cm, start) {
+      for (var i = 0; i < funcs.length; ++i) {
+        var found = funcs[i](cm, start);
+        if (found) return found;
+      }
+    };
+  });
+
+  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
+    var helpers = cm.getHelpers(start, "fold");
+    for (var i = 0; i < helpers.length; i++) {
+      var cur = helpers[i](cm, start);
+      if (cur) return cur;
+    }
+  });
+
+  var defaultOptions = {
+    rangeFinder: CodeMirror.fold.auto,
+    widget: "\u2194",
+    minFoldSize: 0,
+    scanUp: false,
+    clearOnEnter: true
+  };
+
+  CodeMirror.defineOption("foldOptions", null);
+
+  function getOption(cm, options, name) {
+    if (options && options[name] !== undefined)
+      return options[name];
+    var editorOptions = cm.options.foldOptions;
+    if (editorOptions && editorOptions[name] !== undefined)
+      return editorOptions[name];
+    return defaultOptions[name];
+  }
+
+  CodeMirror.defineExtension("foldOption", function(options, name) {
+    return getOption(this, options, name);
+  });
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.clearGutter(cm.state.foldGutter.options.gutter);
+      cm.state.foldGutter = null;
+      cm.off("gutterClick", onGutterClick);
+      cm.off("change", onChange);
+      cm.off("viewportChange", onViewportChange);
+      cm.off("fold", onFold);
+      cm.off("unfold", onFold);
+      cm.off("swapDoc", onChange);
+    }
+    if (val) {
+      cm.state.foldGutter = new State(parseOptions(val));
+      updateInViewport(cm);
+      cm.on("gutterClick", onGutterClick);
+      cm.on("change", onChange);
+      cm.on("viewportChange", onViewportChange);
+      cm.on("fold", onFold);
+      cm.on("unfold", onFold);
+      cm.on("swapDoc", onChange);
+    }
+  });
+
+  var Pos = CodeMirror.Pos;
+
+  function State(options) {
+    this.options = options;
+    this.from = this.to = 0;
+  }
+
+  function parseOptions(opts) {
+    if (opts === true) opts = {};
+    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
+    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
+    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
+    return opts;
+  }
+
+  function isFolded(cm, line) {
+    var marks = cm.findMarks(Pos(line, 0), Pos(line + 1, 0));
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
+  }
+
+  function marker(spec) {
+    if (typeof spec == "string") {
+      var elt = document.createElement("div");
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
+      return elt;
+    } else {
+      return spec.cloneNode(true);
+    }
+  }
+
+  function updateFoldInfo(cm, from, to) {
+    var opts = cm.state.foldGutter.options, cur = from;
+    var minSize = cm.foldOption(opts, "minFoldSize");
+    var func = cm.foldOption(opts, "rangeFinder");
+    cm.eachLine(from, to, function(line) {
+      var mark = null;
+      if (isFolded(cm, cur)) {
+        mark = marker(opts.indicatorFolded);
+      } else {
+        var pos = Pos(cur, 0);
+        var range = func && func(cm, pos);
+        if (range && range.to.line - range.from.line >= minSize)
+          mark = marker(opts.indicatorOpen);
+      }
+      cm.setGutterMarker(line, opts.gutter, mark);
+      ++cur;
+    });
+  }
+
+  function updateInViewport(cm) {
+    var vp = cm.getViewport(), state = cm.state.foldGutter;
+    if (!state) return;
+    cm.operation(function() {
+      updateFoldInfo(cm, vp.from, vp.to);
+    });
+    state.from = vp.from; state.to = vp.to;
+  }
+
+  function onGutterClick(cm, line, gutter) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    if (gutter != opts.gutter) return;
+    var folded = isFolded(cm, line);
+    if (folded) folded.clear();
+    else cm.foldCode(Pos(line, 0), opts.rangeFinder);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    state.from = state.to = 0;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
+  }
+
+  function onViewportChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() {
+      var vp = cm.getViewport();
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        updateInViewport(cm);
+      } else {
+        cm.operation(function() {
+          if (vp.from < state.from) {
+            updateFoldInfo(cm, vp.from, state.from);
+            state.from = vp.from;
+          }
+          if (vp.to > state.to) {
+            updateFoldInfo(cm, state.to, vp.to);
+            state.to = vp.to;
+          }
+        });
+      }
+    }, opts.updateViewportTimeSpan || 400);
+  }
+
+  function onFold(cm, from) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
+    if (line >= state.from && line < state.to)
+      updateFoldInfo(cm, line, line + 1);
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
+
+  var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
+  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
+  var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
+
+  function Iter(cm, line, ch, range) {
+    this.line = line; this.ch = ch;
+    this.cm = cm; this.text = cm.getLine(line);
+    this.min = range ? Math.max(range.from, cm.firstLine()) : cm.firstLine();
+    this.max = range ? Math.min(range.to - 1, cm.lastLine()) : cm.lastLine();
+  }
+
+  function tagAt(iter, ch) {
+    var type = iter.cm.getTokenTypeAt(Pos(iter.line, ch));
+    return type && /\btag\b/.test(type);
+  }
+
+  function nextLine(iter) {
+    if (iter.line >= iter.max) return;
+    iter.ch = 0;
+    iter.text = iter.cm.getLine(++iter.line);
+    return true;
+  }
+  function prevLine(iter) {
+    if (iter.line <= iter.min) return;
+    iter.text = iter.cm.getLine(--iter.line);
+    iter.ch = iter.text.length;
+    return true;
+  }
+
+  function toTagEnd(iter) {
+    for (;;) {
+      var gt = iter.text.indexOf(">", iter.ch);
+      if (gt == -1) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt + 1; continue; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
+  function toTagStart(iter) {
+    for (;;) {
+      var lt = iter.ch ? iter.text.lastIndexOf("<", iter.ch - 1) : -1;
+      if (lt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
+      xmlTagStart.lastIndex = lt;
+      iter.ch = lt;
+      var match = xmlTagStart.exec(iter.text);
+      if (match && match.index == lt) return match;
+    }
+  }
+
+  function toNextTag(iter) {
+    for (;;) {
+      xmlTagStart.lastIndex = iter.ch;
+      var found = xmlTagStart.exec(iter.text);
+      if (!found) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, found.index + 1)) { iter.ch = found.index + 1; continue; }
+      iter.ch = found.index + found[0].length;
+      return found;
+    }
+  }
+  function toPrevTag(iter) {
+    for (;;) {
+      var gt = iter.ch ? iter.text.lastIndexOf(">", iter.ch - 1) : -1;
+      if (gt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
+
+  function findMatchingClose(iter, tag) {
+    var stack = [];
+    for (;;) {
+      var next = toNextTag(iter), end, startLine = iter.line, startCh = iter.ch - (next ? next[0].length : 0);
+      if (!next || !(end = toTagEnd(iter))) return;
+      if (end == "selfClose") continue;
+      if (next[1]) { // closing tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == next[2]) {
+          stack.length = i;
+          break;
+        }
+        if (i < 0 && (!tag || tag == next[2])) return {
+          tag: next[2],
+          from: Pos(startLine, startCh),
+          to: Pos(iter.line, iter.ch)
+        };
+      } else { // opening tag
+        stack.push(next[2]);
+      }
+    }
+  }
+  function findMatchingOpen(iter, tag) {
+    var stack = [];
+    for (;;) {
+      var prev = toPrevTag(iter);
+      if (!prev) return;
+      if (prev == "selfClose") { toTagStart(iter); continue; }
+      var endLine = iter.line, endCh = iter.ch;
+      var start = toTagStart(iter);
+      if (!start) return;
+      if (start[1]) { // closing tag
+        stack.push(start[2]);
+      } else { // opening tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == start[2]) {
+          stack.length = i;
+          break;
+        }
+        if (i < 0 && (!tag || tag == start[2])) return {
+          tag: start[2],
+          from: Pos(iter.line, iter.ch),
+          to: Pos(endLine, endCh)
+        };
+      }
+    }
+  }
+
+  CodeMirror.registerHelper("fold", "xml", function(cm, start) {
+    var iter = new Iter(cm, start.line, 0);
+    for (;;) {
+      var openTag = toNextTag(iter)
+      if (!openTag || iter.line != start.line) return
+      var end = toTagEnd(iter)
+      if (!end) return
+      if (!openTag[1] && end != "selfClose") {
+        var startPos = Pos(iter.line, iter.ch);
+        var endPos = findMatchingClose(iter, openTag[2]);
+        return endPos && cmp(endPos.from, startPos) > 0 ? {from: startPos, to: endPos.from} : null
+      }
+    }
+  });
+  CodeMirror.findMatchingTag = function(cm, pos, range) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
+    if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
+    var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
+    var start = end && toTagStart(iter);
+    if (!end || !start || cmp(iter, pos) > 0) return;
+    var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
+    if (end == "selfClose") return {open: here, close: null, at: "open"};
+
+    if (start[1]) { // closing tag
+      return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
+    } else { // opening tag
+      iter = new Iter(cm, to.line, to.ch, range);
+      return {open: here, close: findMatchingClose(iter, start[2]), at: "open"};
+    }
+  };
+
+  CodeMirror.findEnclosingTag = function(cm, pos, range, tag) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
+    for (;;) {
+      var open = findMatchingOpen(iter, tag);
+      if (!open) break;
+      var forward = new Iter(cm, pos.line, pos.ch, range);
+      var close = findMatchingClose(forward, open.tag);
+      if (close) return {open: open, close: close};
+    }
+  };
+
+  // Used by addon/edit/closetag.js
+  CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
+    var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
+    return findMatchingClose(iter, name);
+  };
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), "cjs");
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
+  else // Plain browser env
+    mod(CodeMirror, "plain");
+})(function(CodeMirror, env) {
+  if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
+
+  var loading = {};
+  function splitCallback(cont, n) {
+    var countDown = n;
+    return function() { if (--countDown == 0) cont(); };
+  }
+  function ensureDeps(mode, cont) {
+    var deps = CodeMirror.modes[mode].dependencies;
+    if (!deps) return cont();
+    var missing = [];
+    for (var i = 0; i < deps.length; ++i) {
+      if (!CodeMirror.modes.hasOwnProperty(deps[i]))
+        missing.push(deps[i]);
+    }
+    if (!missing.length) return cont();
+    var split = splitCallback(cont, missing.length);
+    for (var i = 0; i < missing.length; ++i)
+      CodeMirror.requireMode(missing[i], split);
+  }
+
+  CodeMirror.requireMode = function(mode, cont) {
+    if (typeof mode != "string") mode = mode.name;
+    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
+    if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
+
+    var file = CodeMirror.modeURL.replace(/%N/g, mode);
+    if (env == "plain") {
+      var script = document.createElement("script");
+      script.src = file;
+      var others = document.getElementsByTagName("script")[0];
+      var list = loading[mode] = [cont];
+      CodeMirror.on(script, "load", function() {
+        ensureDeps(mode, function() {
+          for (var i = 0; i < list.length; ++i) list[i]();
+        });
+      });
+      others.parentNode.insertBefore(script, others);
+    } else if (env == "cjs") {
+      require(file);
+      cont();
+    } else if (env == "amd") {
+      requirejs([file], cont);
+    }
+  };
+
+  CodeMirror.autoLoadMode = function(instance, mode) {
+    if (!CodeMirror.modes.hasOwnProperty(mode))
+      CodeMirror.requireMode(mode, function() {
+        instance.setOption("mode", instance.getOption("mode"));
+      });
+  };
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.multiplexingMode = function(outer /*, others */) {
+  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
+  var others = Array.prototype.slice.call(arguments, 1);
+
+  function indexOf(string, pattern, from, returnEnd) {
+    if (typeof pattern == "string") {
+      var found = string.indexOf(pattern, from);
+      return returnEnd && found > -1 ? found + pattern.length : found;
+    }
+    var m = pattern.exec(from ? string.slice(from) : string);
+    return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1;
+  }
+
+  return {
+    startState: function() {
+      return {
+        outer: CodeMirror.startState(outer),
+        innerActive: null,
+        inner: null
+      };
+    },
+
+    copyState: function(state) {
+      return {
+        outer: CodeMirror.copyState(outer, state.outer),
+        innerActive: state.innerActive,
+        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner)
+      };
+    },
+
+    token: function(stream, state) {
+      if (!state.innerActive) {
+        var cutOff = Infinity, oldContent = stream.string;
+        for (var i = 0; i < others.length; ++i) {
+          var other = others[i];
+          var found = indexOf(oldContent, other.open, stream.pos);
+          if (found == stream.pos) {
+            if (!other.parseDelimiters) stream.match(other.open);
+            state.innerActive = other;
+
+            // Get the outer indent, making sure to handle CodeMirror.Pass
+            var outerIndent = 0;
+            if (outer.indent) {
+              var possibleOuterIndent = outer.indent(state.outer, "");
+              if (possibleOuterIndent !== CodeMirror.Pass) outerIndent = possibleOuterIndent;
+            }
+
+            state.inner = CodeMirror.startState(other.mode, outerIndent);
+            return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
+          } else if (found != -1 && found < cutOff) {
+            cutOff = found;
+          }
+        }
+        if (cutOff != Infinity) stream.string = oldContent.slice(0, cutOff);
+        var outerToken = outer.token(stream, state.outer);
+        if (cutOff != Infinity) stream.string = oldContent;
+        return outerToken;
+      } else {
+        var curInner = state.innerActive, oldContent = stream.string;
+        if (!curInner.close && stream.sol()) {
+          state.innerActive = state.inner = null;
+          return this.token(stream, state);
+        }
+        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
+        if (found == stream.pos && !curInner.parseDelimiters) {
+          stream.match(curInner.close);
+          state.innerActive = state.inner = null;
+          return curInner.delimStyle && (curInner.delimStyle + " " + curInner.delimStyle + "-close");
+        }
+        if (found > -1) stream.string = oldContent.slice(0, found);
+        var innerToken = curInner.mode.token(stream, state.inner);
+        if (found > -1) stream.string = oldContent;
+
+        if (found == stream.pos && curInner.parseDelimiters)
+          state.innerActive = state.inner = null;
+
+        if (curInner.innerStyle) {
+          if (innerToken) innerToken = innerToken + " " + curInner.innerStyle;
+          else innerToken = curInner.innerStyle;
+        }
+
+        return innerToken;
+      }
+    },
+
+    indent: function(state, textAfter) {
+      var mode = state.innerActive ? state.innerActive.mode : outer;
+      if (!mode.indent) return CodeMirror.Pass;
+      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
+    },
+
+    blankLine: function(state) {
+      var mode = state.innerActive ? state.innerActive.mode : outer;
+      if (mode.blankLine) {
+        mode.blankLine(state.innerActive ? state.inner : state.outer);
+      }
+      if (!state.innerActive) {
+        for (var i = 0; i < others.length; ++i) {
+          var other = others[i];
+          if (other.open === "\n") {
+            state.innerActive = other;
+            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0);
+          }
+        }
+      } else if (state.innerActive.close === "\n") {
+        state.innerActive = state.inner = null;
+      }
+    },
+
+    electricChars: outer.electricChars,
+
+    innerMode: function(state) {
+      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
+    }
+  };
+};
+
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("annotateScrollbar", function(options) {
+    if (typeof options == "string") options = {className: options};
+    return new Annotation(this, options);
+  });
+
+  CodeMirror.defineOption("scrollButtonHeight", 0);
+
+  function Annotation(cm, options) {
+    this.cm = cm;
+    this.options = options;
+    this.buttonHeight = options.scrollButtonHeight || cm.getOption("scrollButtonHeight");
+    this.annotations = [];
+    this.doRedraw = this.doUpdate = null;
+    this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
+    this.div.style.cssText = "position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";
+    this.computeScale();
+
+    function scheduleRedraw(delay) {
+      clearTimeout(self.doRedraw);
+      self.doRedraw = setTimeout(function() { self.redraw(); }, delay);
+    }
+
+    var self = this;
+    cm.on("refresh", this.resizeHandler = function() {
+      clearTimeout(self.doUpdate);
+      self.doUpdate = setTimeout(function() {
+        if (self.computeScale()) scheduleRedraw(20);
+      }, 100);
+    });
+    cm.on("markerAdded", this.resizeHandler);
+    cm.on("markerCleared", this.resizeHandler);
+    if (options.listenForChanges !== false)
+      cm.on("change", this.changeHandler = function() {
+        scheduleRedraw(250);
+      });
+  }
+
+  Annotation.prototype.computeScale = function() {
+    var cm = this.cm;
+    var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight - this.buttonHeight * 2) /
+      cm.getScrollerElement().scrollHeight
+    if (hScale != this.hScale) {
+      this.hScale = hScale;
+      return true;
+    }
+  };
+
+  Annotation.prototype.update = function(annotations) {
+    this.annotations = annotations;
+    this.redraw();
+  };
+
+  Annotation.prototype.redraw = function(compute) {
+    if (compute !== false) this.computeScale();
+    var cm = this.cm, hScale = this.hScale;
+
+    var frag = document.createDocumentFragment(), anns = this.annotations;
+
+    var wrapping = cm.getOption("lineWrapping");
+    var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
+    var curLine = null, curLineObj = null;
+    function getY(pos, top) {
+      if (curLine != pos.line) {
+        curLine = pos.line;
+        curLineObj = cm.getLineHandle(curLine);
+      }
+      if ((curLineObj.widgets && curLineObj.widgets.length) ||
+          (wrapping && curLineObj.height > singleLineH))
+        return cm.charCoords(pos, "local")[top ? "top" : "bottom"];
+      var topY = cm.heightAtLine(curLineObj, "local");
+      return topY + (top ? 0 : curLineObj.height);
+    }
+
+    var lastLine = cm.lastLine()
+    if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
+      var ann = anns[i];
+      if (ann.to.line > lastLine) continue;
+      var top = nextTop || getY(ann.from, true) * hScale;
+      var bottom = getY(ann.to, false) * hScale;
+      while (i < anns.length - 1) {
+        if (anns[i + 1].to.line > lastLine) break;
+        nextTop = getY(anns[i + 1].from, true) * hScale;
+        if (nextTop > bottom + .9) break;
+        ann = anns[++i];
+        bottom = getY(ann.to, false) * hScale;
+      }
+      if (bottom == top) continue;
+      var height = Math.max(bottom - top, 3);
+
+      var elt = frag.appendChild(document.createElement("div"));
+      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: "
+        + (top + this.buttonHeight) + "px; height: " + height + "px";
+      elt.className = this.options.className;
+      if (ann.id) {
+        elt.setAttribute("annotation-id", ann.id);
+      }
+    }
+    this.div.textContent = "";
+    this.div.appendChild(frag);
+  };
+
+  Annotation.prototype.clear = function() {
+    this.cm.off("refresh", this.resizeHandler);
+    this.cm.off("markerAdded", this.resizeHandler);
+    this.cm.off("markerCleared", this.resizeHandler);
+    if (this.changeHandler) this.cm.off("change", this.changeHandler);
+    this.div.parentNode.removeChild(this.div);
+  };
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function Bar(cls, orientation, scroll) {
+    this.orientation = orientation;
+    this.scroll = scroll;
+    this.screen = this.total = this.size = 1;
+    this.pos = 0;
+
+    this.node = document.createElement("div");
+    this.node.className = cls + "-" + orientation;
+    this.inner = this.node.appendChild(document.createElement("div"));
+
+    var self = this;
+    CodeMirror.on(this.inner, "mousedown", function(e) {
+      if (e.which != 1) return;
+      CodeMirror.e_preventDefault(e);
+      var axis = self.orientation == "horizontal" ? "pageX" : "pageY";
+      var start = e[axis], startpos = self.pos;
+      function done() {
+        CodeMirror.off(document, "mousemove", move);
+        CodeMirror.off(document, "mouseup", done);
+      }
+      function move(e) {
+        if (e.which != 1) return done();
+        self.moveTo(startpos + (e[axis] - start) * (self.total / self.size));
+      }
+      CodeMirror.on(document, "mousemove", move);
+      CodeMirror.on(document, "mouseup", done);
+    });
+
+    CodeMirror.on(this.node, "click", function(e) {
+      CodeMirror.e_preventDefault(e);
+      var innerBox = self.inner.getBoundingClientRect(), where;
+      if (self.orientation == "horizontal")
+        where = e.clientX < innerBox.left ? -1 : e.clientX > innerBox.right ? 1 : 0;
+      else
+        where = e.clientY < innerBox.top ? -1 : e.clientY > innerBox.bottom ? 1 : 0;
+      self.moveTo(self.pos + where * self.screen);
+    });
+
+    function onWheel(e) {
+      var moved = CodeMirror.wheelEventPixels(e)[self.orientation == "horizontal" ? "x" : "y"];
+      var oldPos = self.pos;
+      self.moveTo(self.pos + moved);
+      if (self.pos != oldPos) CodeMirror.e_preventDefault(e);
+    }
+    CodeMirror.on(this.node, "mousewheel", onWheel);
+    CodeMirror.on(this.node, "DOMMouseScroll", onWheel);
+  }
+
+  Bar.prototype.setPos = function(pos, force) {
+    if (pos < 0) pos = 0;
+    if (pos > this.total - this.screen) pos = this.total - this.screen;
+    if (!force && pos == this.pos) return false;
+    this.pos = pos;
+    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
+      (pos * (this.size / this.total)) + "px";
+    return true
+  };
+
+  Bar.prototype.moveTo = function(pos) {
+    if (this.setPos(pos)) this.scroll(pos, this.orientation);
+  }
+
+  var minButtonSize = 10;
+
+  Bar.prototype.update = function(scrollSize, clientSize, barSize) {
+    var sizeChanged = this.screen != clientSize || this.total != scrollSize || this.size != barSize
+    if (sizeChanged) {
+      this.screen = clientSize;
+      this.total = scrollSize;
+      this.size = barSize;
+    }
+
+    var buttonSize = this.screen * (this.size / this.total);
+    if (buttonSize < minButtonSize) {
+      this.size -= minButtonSize - buttonSize;
+      buttonSize = minButtonSize;
+    }
+    this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
+      buttonSize + "px";
+    this.setPos(this.pos, sizeChanged);
+  };
+
+  function SimpleScrollbars(cls, place, scroll) {
+    this.addClass = cls;
+    this.horiz = new Bar(cls, "horizontal", scroll);
+    place(this.horiz.node);
+    this.vert = new Bar(cls, "vertical", scroll);
+    place(this.vert.node);
+    this.width = null;
+  }
+
+  SimpleScrollbars.prototype.update = function(measure) {
+    if (this.width == null) {
+      var style = window.getComputedStyle ? window.getComputedStyle(this.horiz.node) : this.horiz.node.currentStyle;
+      if (style) this.width = parseInt(style.height);
+    }
+    var width = this.width || 0;
+
+    var needsH = measure.scrollWidth > measure.clientWidth + 1;
+    var needsV = measure.scrollHeight > measure.clientHeight + 1;
+    this.vert.node.style.display = needsV ? "block" : "none";
+    this.horiz.node.style.display = needsH ? "block" : "none";
+
+    if (needsV) {
+      this.vert.update(measure.scrollHeight, measure.clientHeight,
+                       measure.viewHeight - (needsH ? width : 0));
+      this.vert.node.style.bottom = needsH ? width + "px" : "0";
+    }
+    if (needsH) {
+      this.horiz.update(measure.scrollWidth, measure.clientWidth,
+                        measure.viewWidth - (needsV ? width : 0) - measure.barLeft);
+      this.horiz.node.style.right = needsV ? width + "px" : "0";
+      this.horiz.node.style.left = measure.barLeft + "px";
+    }
+
+    return {right: needsV ? width : 0, bottom: needsH ? width : 0};
+  };
+
+  SimpleScrollbars.prototype.setScrollTop = function(pos) {
+    this.vert.setPos(pos);
+  };
+
+  SimpleScrollbars.prototype.setScrollLeft = function(pos) {
+    this.horiz.setPos(pos);
+  };
+
+  SimpleScrollbars.prototype.clear = function() {
+    var parent = this.horiz.node.parentNode;
+    parent.removeChild(this.horiz.node);
+    parent.removeChild(this.vert.node);
+  };
+
+  CodeMirror.scrollbarModel.simple = function(place, scroll) {
+    return new SimpleScrollbars("CodeMirror-simplescroll", place, scroll);
+  };
+  CodeMirror.scrollbarModel.overlay = function(place, scroll) {
+    return new SimpleScrollbars("CodeMirror-overlayscroll", place, scroll);
+  };
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../scroll/annotatescrollbar"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../scroll/annotatescrollbar"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, options) {
+    if (typeof options == "string") options = {className: options};
+    if (!options) options = {};
+    return new SearchAnnotation(this, query, caseFold, options);
+  });
+
+  function SearchAnnotation(cm, query, caseFold, options) {
+    this.cm = cm;
+    this.options = options;
+    var annotateOptions = {listenForChanges: false};
+    for (var prop in options) annotateOptions[prop] = options[prop];
+    if (!annotateOptions.className) annotateOptions.className = "CodeMirror-search-match";
+    this.annotation = cm.annotateScrollbar(annotateOptions);
+    this.query = query;
+    this.caseFold = caseFold;
+    this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};
+    this.matches = [];
+    this.update = null;
+
+    this.findMatches();
+    this.annotation.update(this.matches);
+
+    var self = this;
+    cm.on("change", this.changeHandler = function(_cm, change) { self.onChange(change); });
+  }
+
+  var MAX_MATCHES = 1000;
+
+  SearchAnnotation.prototype.findMatches = function() {
+    if (!this.gap) return;
+    for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      if (match.from.line >= this.gap.to) break;
+      if (match.to.line >= this.gap.from) this.matches.splice(i--, 1);
+    }
+    var cursor = this.cm.getSearchCursor(this.query, CodeMirror.Pos(this.gap.from, 0), this.caseFold);
+    var maxMatches = this.options && this.options.maxMatches || MAX_MATCHES;
+    while (cursor.findNext()) {
+      var match = {from: cursor.from(), to: cursor.to()};
+      if (match.from.line >= this.gap.to) break;
+      this.matches.splice(i++, 0, match);
+      if (this.matches.length > maxMatches) break;
+    }
+    this.gap = null;
+  };
+
+  function offsetLine(line, changeStart, sizeChange) {
+    if (line <= changeStart) return line;
+    return Math.max(changeStart, line + sizeChange);
+  }
+
+  SearchAnnotation.prototype.onChange = function(change) {
+    var startLine = change.from.line;
+    var endLine = CodeMirror.changeEnd(change).line;
+    var sizeChange = endLine - change.to.line;
+    if (this.gap) {
+      this.gap.from = Math.min(offsetLine(this.gap.from, startLine, sizeChange), change.from.line);
+      this.gap.to = Math.max(offsetLine(this.gap.to, startLine, sizeChange), change.from.line);
+    } else {
+      this.gap = {from: change.from.line, to: endLine + 1};
+    }
+
+    if (sizeChange) for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      var newFrom = offsetLine(match.from.line, startLine, sizeChange);
+      if (newFrom != match.from.line) match.from = CodeMirror.Pos(newFrom, match.from.ch);
+      var newTo = offsetLine(match.to.line, startLine, sizeChange);
+      if (newTo != match.to.line) match.to = CodeMirror.Pos(newTo, match.to.ch);
+    }
+    clearTimeout(this.update);
+    var self = this;
+    this.update = setTimeout(function() { self.updateAfterChange(); }, 250);
+  };
+
+  SearchAnnotation.prototype.updateAfterChange = function() {
+    this.findMatches();
+    this.annotation.update(this.matches);
+  };
+
+  SearchAnnotation.prototype.clear = function() {
+    this.cm.off("change", this.changeHandler);
+    this.annotation.clear();
+  };
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Highlighting text that matches the selection
+//
+// Defines an option highlightSelectionMatches, which, when enabled,
+// will style strings that match the selection throughout the
+// document.
+//
+// The option can be set to true to simply enable it, or to a
+// {minChars, style, wordsOnly, showToken, delay} object to explicitly
+// configure it. minChars is the minimum amount of characters that should be
+// selected for the behavior to occur, and style is the token style to
+// apply to the matches. This will be prefixed by "cm-" to create an
+// actual CSS class name. If wordsOnly is enabled, the matches will be
+// highlighted only if the selected text is a word. showToken, when enabled,
+// will cause the current token to be highlighted when nothing is selected.
+// delay is used to specify how much time to wait, in milliseconds, before
+// highlighting the matches. If annotateScrollbar is enabled, the occurences
+// will be highlighted on the scrollbar via the matchesonscrollbar addon.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./matchesonscrollbar"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./matchesonscrollbar"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var defaults = {
+    style: "matchhighlight",
+    minChars: 2,
+    delay: 100,
+    wordsOnly: false,
+    annotateScrollbar: false,
+    showToken: false,
+    trim: true
+  }
+
+  function State(options) {
+    this.options = {}
+    for (var name in defaults)
+      this.options[name] = (options && options.hasOwnProperty(name) ? options : defaults)[name]
+    this.overlay = this.timeout = null;
+    this.matchesonscroll = null;
+    this.active = false;
+  }
+
+  CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      removeOverlay(cm);
+      clearTimeout(cm.state.matchHighlighter.timeout);
+      cm.state.matchHighlighter = null;
+      cm.off("cursorActivity", cursorActivity);
+      cm.off("focus", onFocus)
+    }
+    if (val) {
+      var state = cm.state.matchHighlighter = new State(val);
+      if (cm.hasFocus()) {
+        state.active = true
+        highlightMatches(cm)
+      } else {
+        cm.on("focus", onFocus)
+      }
+      cm.on("cursorActivity", cursorActivity);
+    }
+  });
+
+  function cursorActivity(cm) {
+    var state = cm.state.matchHighlighter;
+    if (state.active || cm.hasFocus()) scheduleHighlight(cm, state)
+  }
+
+  function onFocus(cm) {
+    var state = cm.state.matchHighlighter
+    if (!state.active) {
+      state.active = true
+      scheduleHighlight(cm, state)
+    }
+  }
+
+  function scheduleHighlight(cm, state) {
+    clearTimeout(state.timeout);
+    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.options.delay);
+  }
+
+  function addOverlay(cm, query, hasBoundary, style) {
+    var state = cm.state.matchHighlighter;
+    cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
+    if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
+      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") + "\\b") : query;
+      state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
+        {className: "CodeMirror-selection-highlight-scrollbar"});
+    }
+  }
+
+  function removeOverlay(cm) {
+    var state = cm.state.matchHighlighter;
+    if (state.overlay) {
+      cm.removeOverlay(state.overlay);
+      state.overlay = null;
+      if (state.matchesonscroll) {
+        state.matchesonscroll.clear();
+        state.matchesonscroll = null;
+      }
+    }
+  }
+
+  function highlightMatches(cm) {
+    cm.operation(function() {
+      var state = cm.state.matchHighlighter;
+      removeOverlay(cm);
+      if (!cm.somethingSelected() && state.options.showToken) {
+        var re = state.options.showToken === true ? /[\w$]/ : state.options.showToken;
+        var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
+        while (start && re.test(line.charAt(start - 1))) --start;
+        while (end < line.length && re.test(line.charAt(end))) ++end;
+        if (start < end)
+          addOverlay(cm, line.slice(start, end), re, state.options.style);
+        return;
+      }
+      var from = cm.getCursor("from"), to = cm.getCursor("to");
+      if (from.line != to.line) return;
+      if (state.options.wordsOnly && !isWord(cm, from, to)) return;
+      var selection = cm.getRange(from, to)
+      if (state.options.trim) selection = selection.replace(/^\s+|\s+$/g, "")
+      if (selection.length >= state.options.minChars)
+        addOverlay(cm, selection, false, state.options.style);
+    });
+  }
+
+  function isWord(cm, from, to) {
+    var str = cm.getRange(from, to);
+    if (str.match(/^\w+$/) !== null) {
+        if (from.ch > 0) {
+            var pos = {line: from.line, ch: from.ch - 1};
+            var chr = cm.getRange(pos, from);
+            if (chr.match(/\W/) === null) return false;
+        }
+        if (to.ch < cm.getLine(from.line).length) {
+            var pos = {line: to.line, ch: to.ch + 1};
+            var chr = cm.getRange(to, pos);
+            if (chr.match(/\W/) === null) return false;
+        }
+        return true;
+    } else return false;
+  }
+
+  function boundariesAround(stream, re) {
+    return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
+      (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
+  }
+
+  function makeOverlay(query, hasBoundary, style) {
+    return {token: function(stream) {
+      if (stream.match(query) &&
+          (!hasBoundary || boundariesAround(stream, hasBoundary)))
+        return style;
+      stream.next();
+      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
+    }};
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+  var Pos = CodeMirror.Pos
+
+  function regexpFlags(regexp) {
+    var flags = regexp.flags
+    return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+      + (regexp.global ? "g" : "")
+      + (regexp.multiline ? "m" : "")
+  }
+
+  function ensureFlags(regexp, flags) {
+    var current = regexpFlags(regexp), target = current
+    for (var i = 0; i < flags.length; i++) if (target.indexOf(flags.charAt(i)) == -1)
+      target += flags.charAt(i)
+    return current == target ? regexp : new RegExp(regexp.source, target)
+  }
+
+  function maybeMultiline(regexp) {
+    return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
+  }
+
+  function searchRegexpForward(doc, regexp, start) {
+    regexp = ensureFlags(regexp, "g")
+    for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+      regexp.lastIndex = ch
+      var string = doc.getLine(line), match = regexp.exec(string)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpForwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+    regexp = ensureFlags(regexp, "gm")
+    var string, chunk = 1
+    for (var line = start.line, last = doc.lastLine(); line <= last;) {
+      // This grows the search buffer in exponentially-sized chunks
+      // between matches, so that nearby matches are fast and don't
+      // require concatenating the whole document (in case we're
+      // searching for something that has tons of matches), but at the
+      // same time, the amount of retries is limited.
+      for (var i = 0; i < chunk; i++) {
+        if (line > last) break
+        var curLine = doc.getLine(line++)
+        string = string == null ? curLine : string + "\n" + curLine
+      }
+      chunk = chunk * 2
+      regexp.lastIndex = start.ch
+      var match = regexp.exec(string)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  function lastMatchIn(string, regexp) {
+    var cutOff = 0, match
+    for (;;) {
+      regexp.lastIndex = cutOff
+      var newMatch = regexp.exec(string)
+      if (!newMatch) return match
+      match = newMatch
+      cutOff = match.index + (match[0].length || 1)
+      if (cutOff == string.length) return match
+    }
+  }
+
+  function searchRegexpBackward(doc, regexp, start) {
+    regexp = ensureFlags(regexp, "g")
+    for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+      var string = doc.getLine(line)
+      if (ch > -1) string = string.slice(0, ch)
+      var match = lastMatchIn(string, regexp)
+      if (match)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpBackwardMultiline(doc, regexp, start) {
+    regexp = ensureFlags(regexp, "gm")
+    var string, chunk = 1
+    for (var line = start.line, first = doc.firstLine(); line >= first;) {
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line--)
+        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+      }
+      chunk *= 2
+
+      var match = lastMatchIn(string, regexp)
+      if (match) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = line + before.length, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  var doFold, noFold
+  if (String.prototype.normalize) {
+    doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+    noFold = function(str) { return str.normalize("NFD") }
+  } else {
+    doFold = function(str) { return str.toLowerCase() }
+    noFold = function(str) { return str }
+  }
+
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos, foldFunc) {
+    if (orig.length == folded.length) return pos
+    for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
+      if (min == max) return min
+      var mid = (min + max) >> 1
+      var len = foldFunc(orig.slice(0, mid)).length
+      if (len == pos) return mid
+      else if (len > pos) max = mid
+      else min = mid + 1
+    }
+  }
+
+  function searchStringForward(doc, query, start, caseFold) {
+    // Empty string would match anything and never progress, so we
+    // define it to match nothing instead.
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+      var orig = doc.getLine(line).slice(ch), string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.indexOf(lines[0])
+        if (found == -1) continue search
+        var start = adjustPos(orig, string, found, fold) + ch
+        return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
+      } else {
+        var cutFrom = string.length - lines[0].length
+        if (string.slice(cutFrom) != lines[0]) continue search
+        for (var i = 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(line + i)) != lines[i]) continue search
+        var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+        if (endString.slice(0, lastLine.length) != lastLine) continue search
+        return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function searchStringBackward(doc, query, start, caseFold) {
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+      var orig = doc.getLine(line)
+      if (ch > -1) orig = orig.slice(0, ch)
+      var string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.lastIndexOf(lines[0])
+        if (found == -1) continue search
+        return {from: Pos(line, adjustPos(orig, string, found, fold)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
+      } else {
+        var lastLine = lines[lines.length - 1]
+        if (string.slice(0, lastLine.length) != lastLine) continue search
+        for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(start + i)) != lines[i]) continue search
+        var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+        if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
+      }
+    }
+  }
+
+  function SearchCursor(doc, query, pos, options) {
+    this.atOccurrence = false
+    this.doc = doc
+    pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+    this.pos = {from: pos, to: pos}
+
+    var caseFold
+    if (typeof options == "object") {
+      caseFold = options.caseFold
+    } else { // Backwards compat for when caseFold was the 4th argument
+      caseFold = options
+      options = null
+    }
+
+    if (typeof query == "string") {
+      if (caseFold == null) caseFold = false
+      this.matches = function(reverse, pos) {
+        return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+      }
+    } else {
+      query = ensureFlags(query, "gm")
+      if (!options || options.multiline !== false)
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
+        }
+      else
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+        }
+    }
+  }
+
+  SearchCursor.prototype = {
+    findNext: function() {return this.find(false)},
+    findPrevious: function() {return this.find(true)},
+
+    find: function(reverse) {
+      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
+
+      // Implements weird auto-growing behavior on null-matches for
+      // backwards-compatiblity with the vim code (unfortunately)
+      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+        if (reverse) {
+          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+          else if (result.from.line == this.doc.firstLine()) result = null
+          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+        } else {
+          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+          else if (result.to.line == this.doc.lastLine()) result = null
+          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
+        }
+      }
+
+      if (result) {
+        this.pos = result
+        this.atOccurrence = true
+        return this.pos.match || true
+      } else {
+        var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+        this.pos = {from: end, to: end}
+        return this.atOccurrence = false
+      }
+    },
+
+    from: function() {if (this.atOccurrence) return this.pos.from},
+    to: function() {if (this.atOccurrence) return this.pos.to},
+
+    replace: function(newText, origin) {
+      if (!this.atOccurrence) return
+      var lines = CodeMirror.splitLines(newText)
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin)
+      this.pos.to = Pos(this.pos.from.line + lines.length - 1,
+                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
+    }
+  }
+
+  CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
+    return new SearchCursor(this.doc, query, pos, caseFold)
+  })
+  CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
+    return new SearchCursor(this, query, pos, caseFold)
+  })
+
+  CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
+    var ranges = []
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
+    while (cur.findNext()) {
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+      ranges.push({anchor: cur.from(), head: cur.to()})
+    }
+    if (ranges.length)
+      this.setSelections(ranges, 0)
+  })
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var WRAP_CLASS = "CodeMirror-activeline";
+  var BACK_CLASS = "CodeMirror-activeline-background";
+  var GUTT_CLASS = "CodeMirror-activeline-gutter";
+
+  CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
+    var prev = old == CodeMirror.Init ? false : old;
+    if (val == prev) return
+    if (prev) {
+      cm.off("beforeSelectionChange", selectionChange);
+      clearActiveLines(cm);
+      delete cm.state.activeLines;
+    }
+    if (val) {
+      cm.state.activeLines = [];
+      updateActiveLines(cm, cm.listSelections());
+      cm.on("beforeSelectionChange", selectionChange);
+    }
+  });
+
+  function clearActiveLines(cm) {
+    for (var i = 0; i < cm.state.activeLines.length; i++) {
+      cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "gutter", GUTT_CLASS);
+    }
+  }
+
+  function sameArray(a, b) {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; i++)
+      if (a[i] != b[i]) return false;
+    return true;
+  }
+
+  function updateActiveLines(cm, ranges) {
+    var active = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      var option = cm.getOption("styleActiveLine");
+      if (typeof option == "object" && option.nonEmpty ? range.anchor.line != range.head.line : !range.empty())
+        continue
+      var line = cm.getLineHandleVisualStart(range.head.line);
+      if (active[active.length - 1] != line) active.push(line);
+    }
+    if (sameArray(cm.state.activeLines, active)) return;
+    cm.operation(function() {
+      clearActiveLines(cm);
+      for (var i = 0; i < active.length; i++) {
+        cm.addLineClass(active[i], "wrap", WRAP_CLASS);
+        cm.addLineClass(active[i], "background", BACK_CLASS);
+        cm.addLineClass(active[i], "gutter", GUTT_CLASS);
+      }
+      cm.state.activeLines = active;
+    });
+  }
+
+  function selectionChange(cm, sel) {
+    updateActiveLines(cm, sel.ranges);
+  }
+});
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.modeInfo = [
+    {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+    {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
+    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
+    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
+    {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
+    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
+    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
+    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
+    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
+    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
+    {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
+    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
+    {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
+    {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
+    {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
+    {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
+    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
+    {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "Django", mime: "text/x-django", mode: "django"},
+    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/},
+    {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
+    {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
+    {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
+    {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
+    {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
+    {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
+    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
+    {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Esper", mime: "text/x-esper", mode: "sql"},
+    {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
+    {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
+    {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
+    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
+    {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
+    {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
+    {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
+    {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
+    {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
+    {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
+    {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
+    {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
+    {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
+    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
+    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
+     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
+    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
+    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
+    {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
+    {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
+    {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
+    {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+    {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
+    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
+    {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
+    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
+    {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
+    {name: "mbox", mime: "application/mbox", mode: "mbox", ext: ["mbox"]},
+    {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
+    {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
+    {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
+    {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+     mode: "ntriples", ext: ["nt", "nq"]},
+    {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+    {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
+    {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
+    {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
+    {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
+    {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
+    {name: "PHP", mimes: ["text/x-php", "application/x-httpd-php", "application/x-httpd-php-open"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
+    {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
+    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
+    {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+    {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
+    {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
+    {name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
+    {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
+    {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r", "R"], alias: ["rscript"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
+    {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
+    {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
+    {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+    {name: "SAS", mime: "text/x-sas", mode: "sas", ext: ["sas"]},
+    {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
+    {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
+    {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
+    {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
+    {name: "Shell", mimes: ["text/x-sh", "application/x-sh"], mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+    {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
+    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
+    {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
+    {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
+    {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "SML", mime: "text/x-sml", mode: "mllike", ext: ["sml", "sig", "fun", "smackspec"]},
+    {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
+    {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
+    {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
+    {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "SQLite", mime: "text/x-sqlite", mode: "sql"},
+    {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
+    {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
+    {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
+    {name: "sTeX", mime: "text/x-stex", mode: "stex"},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx", "tex"], alias: ["tex"]},
+    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
+    {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
+    {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
+    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+    {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
+    {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
+    {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
+    {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+    {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
+    {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
+    {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+    {name: "TypeScript-JSX", mime: "text/typescript-jsx", mode: "jsx", ext: ["tsx"], alias: ["tsx"]},
+    {name: "Twig", mime: "text/x-twig", mode: "twig"},
+    {name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
+    {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
+    {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
+    {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
+    {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
+    {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd", "svg"], alias: ["rss", "wsdl", "xsd"]},
+    {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+    {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
+    {name: "YAML", mimes: ["text/x-yaml", "text/yaml"], mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
+    {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
+    {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
+    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
+  ];
+  // Ensure all modes have a mime property for backwards compatibility
+  for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+    var info = CodeMirror.modeInfo[i];
+    if (info.mimes) info.mime = info.mimes[0];
+  }
+
+  CodeMirror.findModeByMIME = function(mime) {
+    mime = mime.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.mime == mime) return info;
+      if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
+        if (info.mimes[j] == mime) return info;
+    }
+    if (/\+xml$/.test(mime)) return CodeMirror.findModeByMIME("application/xml")
+    if (/\+json$/.test(mime)) return CodeMirror.findModeByMIME("application/json")
+  };
+
+  CodeMirror.findModeByExtension = function(ext) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.ext) for (var j = 0; j < info.ext.length; j++)
+        if (info.ext[j] == ext) return info;
+    }
+  };
+
+  CodeMirror.findModeByFileName = function(filename) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.file && info.file.test(filename)) return info;
+    }
+    var dot = filename.lastIndexOf(".");
+    var ext = dot > -1 && filename.substring(dot + 1, filename.length);
+    if (ext) return CodeMirror.findModeByExtension(ext);
+  };
+
+  CodeMirror.findModeByName = function(name) {
+    name = name.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.name.toLowerCase() == name) return info;
+      if (info.alias) for (var j = 0; j < info.alias.length; j++)
+        if (info.alias[j].toLowerCase() == name) return info;
+    }
+  };
+});
diff --git a/core/media/editors/codemirror/lib/addons.min.css b/core/media/editors/codemirror/lib/addons.min.css
new file mode 100644
index 00000000..89d49b2e
--- /dev/null
+++ b/core/media/editors/codemirror/lib/addons.min.css
@@ -0,0 +1 @@
+.CodeMirror-fullscreen{position:fixed;top:0;left:0;right:0;bottom:0;height:auto;z-index:9}.CodeMirror-foldmarker{color:#00f;text-shadow:#b9f 1px 1px 2px,#b9f -1px -1px 2px,#b9f 1px -1px 2px,#b9f -1px 1px 2px;font-family:arial;line-height:.3;cursor:pointer}.CodeMirror-foldgutter{width:.7em}.CodeMirror-foldgutter-folded,.CodeMirror-foldgutter-open{cursor:pointer}.CodeMirror-foldgutter-open:after{content:"\25BE"}.CodeMirror-foldgutter-folded:after{content:"\25B8"}.CodeMirror-search-match{background:gold;border-top:1px solid orange;border-bottom:1px solid orange;-moz-box-sizing:border-box;box-sizing:border-box;opacity:.5}.CodeMirror-simplescroll-horizontal div,.CodeMirror-simplescroll-vertical div{position:absolute;background:#ccc;-moz-box-sizing:border-box;box-sizing:border-box;border:1px solid #bbb;border-radius:2px}.CodeMirror-simplescroll-horizontal,.CodeMirror-simplescroll-vertical{position:absolute;z-index:6;background:#eee}.CodeMirror-simplescroll-horizontal{bottom:0;left:0;height:8px}.CodeMirror-simplescroll-horizontal div{bottom:0;height:100%}.CodeMirror-simplescroll-vertical{right:0;top:0;width:8px}.CodeMirror-simplescroll-vertical div{right:0;width:100%}.CodeMirror-overlayscroll .CodeMirror-gutter-filler,.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler{display:none}.CodeMirror-overlayscroll-horizontal div,.CodeMirror-overlayscroll-vertical div{position:absolute;background:#bcd;border-radius:3px}.CodeMirror-overlayscroll-horizontal,.CodeMirror-overlayscroll-vertical{position:absolute;z-index:6}.CodeMirror-overlayscroll-horizontal{bottom:0;left:0;height:6px}.CodeMirror-overlayscroll-horizontal div{bottom:0;height:100%}.CodeMirror-overlayscroll-vertical{right:0;top:0;width:6px}.CodeMirror-overlayscroll-vertical div{right:0;width:100%}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/lib/addons.min.js b/core/media/editors/codemirror/lib/addons.min.js
new file mode 100644
index 00000000..b166ac85
--- /dev/null
+++ b/core/media/editors/codemirror/lib/addons.min.js
@@ -0,0 +1,2 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.getWrapperElement();a.state.fullScreenRestore={scrollTop:window.pageYOffset,scrollLeft:window.pageXOffset,width:b.style.width,height:b.style.height},b.style.width="",b.style.height="auto",b.className+=" CodeMirror-fullscreen",document.documentElement.style.overflow="hidden",a.refresh()}function c(a){var b=a.getWrapperElement();b.className=b.className.replace(/\s*CodeMirror-fullscreen\b/,""),document.documentElement.style.overflow="";var c=a.state.fullScreenRestore;b.style.width=c.width,b.style.height=c.height,window.scrollTo(c.scrollLeft,c.scrollTop),a.refresh()}a.defineOption("fullScreen",!1,(function(d,e,f){f==a.Init&&(f=!1),!f!=!e&&(e?b(d):c(d))}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,c,d){this.cm=a,this.node=b,this.options=c,this.height=d,this.cleared=!1}function c(a){var b=a.getWrapperElement(),c=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,d=parseInt(c.height),e=a.state.panels={setHeight:b.style.height,heightLeft:d,panels:0,wrapper:document.createElement("div")};b.parentNode.insertBefore(e.wrapper,b);var f=a.hasFocus();e.wrapper.appendChild(b),f&&a.focus(),a._setSize=a.setSize,null!=d&&(a.setSize=function(b,c){if(null==c)return this._setSize(b,c);if(e.setHeight=c,"number"!=typeof c){var f=/^(\d+\.?\d*)px$/.exec(c);f?c=Number(f[1]):(e.wrapper.style.height=c,c=e.wrapper.offsetHeight,e.wrapper.style.height="")}a._setSize(b,e.heightLeft+=c-d),d=c})}function d(a){var b=a.state.panels;a.state.panels=null;var c=a.getWrapperElement();b.wrapper.parentNode.replaceChild(c,b.wrapper),c.style.height=b.setHeight,a.setSize=a._setSize,a.setSize()}function e(a,b){for(var c=b.nextSibling;c;c=c.nextSibling)if(c==a.getWrapperElement())return!0;return!1}a.defineExtension("addPanel",(function(a,d){d=d||{},this.state.panels||c(this);var f=this.state.panels,g=f.wrapper,h=this.getWrapperElement();d.after instanceof b&&!d.after.cleared?g.insertBefore(a,d.before.node.nextSibling):d.before instanceof b&&!d.before.cleared?g.insertBefore(a,d.before.node):d.replace instanceof b&&!d.replace.cleared?(g.insertBefore(a,d.replace.node),d.replace.clear()):"bottom"==d.position?g.appendChild(a):"before-bottom"==d.position?g.insertBefore(a,h.nextSibling):"after-top"==d.position?g.insertBefore(a,h):g.insertBefore(a,g.firstChild);var i=d&&d.height||a.offsetHeight;return this._setSize(null,f.heightLeft-=i),f.panels++,d.stable&&e(this,a)&&this.scrollTo(null,this.getScrollInfo().top+i),new b(this,a,d,i)})),b.prototype.clear=function(){if(!this.cleared){this.cleared=!0;var a=this.cm.state.panels;this.cm._setSize(null,a.heightLeft+=this.height),this.options.stable&&e(this.cm,this.node)&&this.cm.scrollTo(null,this.cm.getScrollInfo().top-this.height),a.wrapper.removeChild(this.node),0==--a.panels&&d(this.cm)}},b.prototype.changed=function(a){var b=null==a?this.node.offsetHeight:a,c=this.cm.state.panels;this.cm._setSize(null,c.heightLeft-=b-this.height),this.height=b}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b){return"pairs"==b&&"string"==typeof a?a:"object"==typeof a&&null!=a[b]?a[b]:m[b]}function c(a){for(var b=0;b<a.length;b++){var c=a.charAt(b),e="'"+c+"'";o[e]||(o[e]=d(c))}}function d(a){return function(b){return i(b,a)}}function e(a){var b=a.state.closeBrackets;if(!b||b.override)return b;var c=a.getModeAt(a.getCursor());return c.closeBrackets||b}function f(c){var d=e(c);if(!d||c.getOption("disableInput"))return a.Pass;for(var f=b(d,"pairs"),g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=k(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}for(var h=g.length-1;h>=0;h--){var j=g[h].head;c.replaceRange("",n(j.line,j.ch-1),n(j.line,j.ch+1),"+delete")}}function g(c){var d=e(c),f=d&&b(d,"explode");if(!f||c.getOption("disableInput"))return a.Pass;for(var g=c.listSelections(),h=0;h<g.length;h++){if(!g[h].empty())return a.Pass;var i=k(c,g[h].head);if(!i||f.indexOf(i)%2!=0)return a.Pass}c.operation((function(){var a=c.lineSeparator()||"\n";c.replaceSelection(a+a,null),c.execCommand("goCharLeft"),g=c.listSelections();for(var b=0;b<g.length;b++){var d=g[b].head.line;c.indentLine(d,null,!0),c.indentLine(d+1,null,!0)}}))}function h(b){var c=a.cmpPos(b.anchor,b.head)>0;return{anchor:new n(b.anchor.line,b.anchor.ch+(c?-1:1)),head:new n(b.head.line,b.head.ch+(c?1:-1))}}function i(c,d){var f=e(c);if(!f||c.getOption("disableInput"))return a.Pass;var g=b(f,"pairs"),i=g.indexOf(d);if(i==-1)return a.Pass;for(var k,m=b(f,"triples"),o=g.charAt(i+1)==d,p=c.listSelections(),q=i%2==0,r=0;r<p.length;r++){var s,t=p[r],u=t.head,v=c.getRange(u,n(u.line,u.ch+1));if(q&&!t.empty())s="surround";else if(!o&&q||v!=d)if(o&&u.ch>1&&m.indexOf(d)>=0&&c.getRange(n(u.line,u.ch-2),u)==d+d){if(u.ch>2&&/\bstring/.test(c.getTokenTypeAt(n(u.line,u.ch-2))))return a.Pass;s="addFour"}else if(o){var w=0==u.ch?" ":c.getRange(n(u.line,u.ch-1),u);if(a.isWordChar(v)||w==d||a.isWordChar(w))return a.Pass;s="both"}else{if(!q||c.getLine(u.line).length!=u.ch&&!j(v,g)&&!/\s/.test(v))return a.Pass;s="both"}else s=o&&l(c,u)?"both":m.indexOf(d)>=0&&c.getRange(u,n(u.line,u.ch+3))==d+d+d?"skipThree":"skip";if(k){if(k!=s)return a.Pass}else k=s}var x=i%2?g.charAt(i-1):d,y=i%2?d:g.charAt(i+1);c.operation((function(){if("skip"==k)c.execCommand("goCharRight");else if("skipThree"==k)for(var a=0;a<3;a++)c.execCommand("goCharRight");else if("surround"==k){for(var b=c.getSelections(),a=0;a<b.length;a++)b[a]=x+b[a]+y;c.replaceSelections(b,"around"),b=c.listSelections().slice();for(var a=0;a<b.length;a++)b[a]=h(b[a]);c.setSelections(b)}else"both"==k?(c.replaceSelection(x+y,null),c.triggerElectric(x+y),c.execCommand("goCharLeft")):"addFour"==k&&(c.replaceSelection(x+x+x+x,"before"),c.execCommand("goCharRight"))}))}function j(a,b){var c=b.lastIndexOf(a);return c>-1&&c%2==1}function k(a,b){var c=a.getRange(n(b.line,b.ch-1),n(b.line,b.ch+1));return 2==c.length?c:null}function l(a,b){var c=a.getTokenAt(n(b.line,b.ch+1));return/\bstring/.test(c.type)&&c.start==b.ch&&(0==b.ch||!/\bstring/.test(a.getTokenTypeAt(b)))}var m={pairs:"()[]{}''\"\"",triples:"",explode:"[]{}"},n=a.Pos;a.defineOption("autoCloseBrackets",!1,(function(d,e,f){f&&f!=a.Init&&(d.removeKeyMap(o),d.state.closeBrackets=null),e&&(c(b(e,"pairs")),d.state.closeBrackets=e,d.addKeyMap(o))}));var o={Backspace:f,Enter:g};c(m.pairs+"`")})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){function b(b){if(b.getOption("disableInput"))return a.Pass;for(var c=b.listSelections(),d=[],i=b.getOption("autoCloseTags"),j=0;j<c.length;j++){if(!c[j].empty())return a.Pass;var k=c[j].head,l=b.getTokenAt(k),m=a.innerMode(b.getMode(),l.state),n=m.state;if("xml"!=m.mode.name||!n.tagName)return a.Pass;var o="html"==m.mode.configuration,p="object"==typeof i&&i.dontCloseTags||o&&g,q="object"==typeof i&&i.indentTags||o&&h,r=n.tagName;l.end>k.ch&&(r=r.slice(0,r.length-l.end+k.ch));var s=r.toLowerCase();if(!r||"string"==l.type&&(l.end!=k.ch||!/[\"\']/.test(l.string.charAt(l.string.length-1))||1==l.string.length)||"tag"==l.type&&"closeTag"==n.type||l.string.indexOf("/")==l.string.length-1||p&&e(p,s)>-1||f(b,r,k,n,!0))return a.Pass;var t=q&&e(q,s)>-1;d[j]={indent:t,text:">"+(t?"\n\n":"")+"</"+r+">",newPos:t?a.Pos(k.line+1,0):a.Pos(k.line,k.ch+1)}}for(var u="object"==typeof i&&i.dontIndentOnAutoClose,j=c.length-1;j>=0;j--){var v=d[j];b.replaceRange(v.text,c[j].head,c[j].anchor,"+insert");var w=b.listSelections().slice(0);w[j]={head:v.newPos,anchor:v.newPos},b.setSelections(w),!u&&v.indent&&(b.indentLine(v.newPos.line,null,!0),b.indentLine(v.newPos.line+1,null,!0))}}function c(b,c){for(var d=b.listSelections(),e=[],g=c?"/":"</",h=b.getOption("autoCloseTags"),i="object"==typeof h&&h.dontIndentOnSlash,j=0;j<d.length;j++){if(!d[j].empty())return a.Pass;var k=d[j].head,l=b.getTokenAt(k),m=a.innerMode(b.getMode(),l.state),n=m.state;if(c&&("string"==l.type||"<"!=l.string.charAt(0)||l.start!=k.ch-1))return a.Pass;var o;if("xml"!=m.mode.name)if("htmlmixed"==b.getMode().name&&"javascript"==m.mode.name)o=g+"script";else{if("htmlmixed"!=b.getMode().name||"css"!=m.mode.name)return a.Pass;o=g+"style"}else{if(!n.context||!n.context.tagName||f(b,n.context.tagName,k,n))return a.Pass;o=g+n.context.tagName}">"!=b.getLine(k.line).charAt(l.end)&&(o+=">"),e[j]=o}if(b.replaceSelections(e),d=b.listSelections(),!i)for(var j=0;j<d.length;j++)(j==d.length-1||d[j].head.line<d[j+1].head.line)&&b.indentLine(d[j].head.line)}function d(b){return b.getOption("disableInput")?a.Pass:c(b,!0)}function e(a,b){if(a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;++c)if(a[c]==b)return c;return-1}function f(b,c,d,e,f){if(!a.scanForClosingTag)return!1;var g=Math.min(b.lastLine()+1,d.line+500),h=a.scanForClosingTag(b,d,null,g);if(!h||h.tag!=c)return!1;for(var i=e.context,j=f?1:0;i&&i.tagName==c;i=i.prev)++j;d=h.to;for(var k=1;k<j;k++){var l=a.scanForClosingTag(b,d,null,g);if(!l||l.tag!=c)return!1;d=l.to}return!0}a.defineOption("autoCloseTags",!1,(function(c,e,f){if(f!=a.Init&&f&&c.removeKeyMap("autoCloseTags"),e){var g={name:"autoCloseTags"};("object"!=typeof e||e.whenClosing)&&(g["'/'"]=function(a){return d(a)}),("object"!=typeof e||e.whenOpening)&&(g["'>'"]=function(a){return b(a)}),c.addKeyMap(g)}}));var g=["area","base","br","col","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],h=["applet","blockquote","body","button","div","dl","fieldset","form","frameset","h1","h2","h3","h4","h5","h6","head","html","iframe","layer","legend","object","ol","p","select","table","ul"];a.commands.closeTag=function(a){return c(a)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){function b(a,b,d){var e=a.getLineHandle(b.line),f=b.ch-1,i=d&&d.afterCursor;null==i&&(i=/(^| )cm-fat-cursor($| )/.test(a.getWrapperElement().className));var j=!i&&f>=0&&h[e.text.charAt(f)]||h[e.text.charAt(++f)];if(!j)return null;var k=">"==j.charAt(1)?1:-1;if(d&&d.strict&&k>0!=(f==b.ch))return null;var l=a.getTokenTypeAt(g(b.line,f+1)),m=c(a,g(b.line,f+(k>0?1:0)),k,l||null,d);return null==m?null:{from:g(b.line,f),to:m&&m.pos,match:m&&m.ch==j.charAt(0),forward:k>0}}function c(a,b,c,d,e){for(var f=e&&e.maxScanLineLength||1e4,i=e&&e.maxScanLines||1e3,j=[],k=e&&e.bracketRegex?e.bracketRegex:/[(){}[\]]/,l=c>0?Math.min(b.line+i,a.lastLine()+1):Math.max(a.firstLine()-1,b.line-i),m=b.line;m!=l;m+=c){var n=a.getLine(m);if(n){var o=c>0?0:n.length-1,p=c>0?n.length:-1;if(!(n.length>f))for(m==b.line&&(o=b.ch-(c<0?1:0));o!=p;o+=c){var q=n.charAt(o);if(k.test(q)&&(void 0===d||a.getTokenTypeAt(g(m,o+1))==d)){var r=h[q];if(">"==r.charAt(1)==c>0)j.push(q);else{if(!j.length)return{pos:g(m,o),ch:q};j.pop()}}}}}return m-c!=(c>0?a.lastLine():a.firstLine())&&null}function d(a,c,d){for(var e=a.state.matchBrackets.maxHighlightLineLength||1e3,h=[],i=a.listSelections(),j=0;j<i.length;j++){var k=i[j].empty()&&b(a,i[j].head,d);if(k&&a.getLine(k.from.line).length<=e){var l=k.match?"CodeMirror-matchingbracket":"CodeMirror-nonmatchingbracket";h.push(a.markText(k.from,g(k.from.line,k.from.ch+1),{className:l})),k.to&&a.getLine(k.to.line).length<=e&&h.push(a.markText(k.to,g(k.to.line,k.to.ch+1),{className:l}))}}if(h.length){f&&a.state.focused&&a.focus();var m=function(){a.operation((function(){for(var a=0;a<h.length;a++)h[a].clear()}))};if(!c)return m;setTimeout(m,800)}}function e(a){a.operation((function(){a.state.matchBrackets.currentlyHighlighted&&(a.state.matchBrackets.currentlyHighlighted(),a.state.matchBrackets.currentlyHighlighted=null),a.state.matchBrackets.currentlyHighlighted=d(a,!1,a.state.matchBrackets)}))}var f=/MSIE \d/.test(navigator.userAgent)&&(null==document.documentMode||document.documentMode<8),g=a.Pos,h={"(":")>",")":"(<","[":"]>","]":"[<","{":"}>","}":"{<"};a.defineOption("matchBrackets",!1,(function(b,c,d){d&&d!=a.Init&&(b.off("cursorActivity",e),b.state.matchBrackets&&b.state.matchBrackets.currentlyHighlighted&&(b.state.matchBrackets.currentlyHighlighted(),b.state.matchBrackets.currentlyHighlighted=null)),c&&(b.state.matchBrackets="object"==typeof c?c:{},b.on("cursorActivity",e))})),a.defineExtension("matchBrackets",(function(){d(this,!0)})),a.defineExtension("findMatchingBracket",(function(a,c,d){return(d||"boolean"==typeof c)&&(d?(d.strict=c,c=d):c=c?{strict:!0}:null),b(this,a,c)})),a.defineExtension("scanForBracket",(function(a,b,d,e){return c(this,a,b,d,e)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../fold/xml-fold")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../fold/xml-fold"],a):a(CodeMirror)})((function(a){"use strict";function b(a){a.state.tagHit&&a.state.tagHit.clear(),a.state.tagOther&&a.state.tagOther.clear(),a.state.tagHit=a.state.tagOther=null}function c(c){c.state.failedTagMatch=!1,c.operation((function(){if(b(c),!c.somethingSelected()){var d=c.getCursor(),e=c.getViewport();e.from=Math.min(e.from,d.line),e.to=Math.max(d.line+1,e.to);var f=a.findMatchingTag(c,d,e);if(f){if(c.state.matchBothTags){var g="open"==f.at?f.open:f.close;g&&(c.state.tagHit=c.markText(g.from,g.to,{className:"CodeMirror-matchingtag"}))}var h="close"==f.at?f.open:f.close;h?c.state.tagOther=c.markText(h.from,h.to,{className:"CodeMirror-matchingtag"}):c.state.failedTagMatch=!0}}}))}function d(a){a.state.failedTagMatch&&c(a)}a.defineOption("matchTags",!1,(function(e,f,g){g&&g!=a.Init&&(e.off("cursorActivity",c),e.off("viewportChange",d),b(e)),f&&(e.state.matchBothTags="object"==typeof f&&f.bothTags,e.on("cursorActivity",c),e.on("viewportChange",d),c(e))})),a.commands.toMatchingTag=function(b){var c=a.findMatchingTag(b,b.getCursor());if(c){var d="close"==c.at?c.open:c.close;d&&b.extendSelection(d.to,d.from)}}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("fold","brace",(function(b,c){function d(d){for(var h=c.ch,i=0;;){var j=h<=0?-1:g.lastIndexOf(d,h-1);if(j!=-1){if(1==i&&j<c.ch)break;if(e=b.getTokenTypeAt(a.Pos(f,j+1)),!/^(comment|string)/.test(e))return j+1;h=j-1}else{if(1==i)break;i=1,h=g.length}}}var e,f=c.line,g=b.getLine(f),h="{",i="}",j=d("{");if(null==j&&(h="[",i="]",j=d("[")),null!=j){var k,l,m=1,n=b.lastLine();a:for(var o=f;o<=n;++o)for(var p=b.getLine(o),q=o==f?j:0;;){var r=p.indexOf(h,q),s=p.indexOf(i,q);if(r<0&&(r=p.length),s<0&&(s=p.length),q=Math.min(r,s),q==p.length)break;if(b.getTokenTypeAt(a.Pos(o,q+1))==e)if(q==r)++m;else if(!--m){k=o,l=q;break a}++q}if(null!=k&&(f!=k||l!=j))return{from:a.Pos(f,j),to:a.Pos(k,l)}}})),a.registerHelper("fold","import",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));if(/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"keyword"!=d.type||"import"!=d.string)return null;for(var e=c,f=Math.min(b.lastLine(),c+10);e<=f;++e){var g=b.getLine(e),h=g.indexOf(";");if(h!=-1)return{startCh:d.end,end:a.Pos(e,h)}}}var e,f=c.line,g=d(f);if(!g||d(f-1)||(e=d(f-2))&&e.end.line==f-1)return null;for(var h=g.end;;){var i=d(h.line+1);if(null==i)break;h=i.end}return{from:b.clipPos(a.Pos(f,g.startCh+1)),to:h}})),a.registerHelper("fold","include",(function(b,c){function d(c){if(c<b.firstLine()||c>b.lastLine())return null;var d=b.getTokenAt(a.Pos(c,1));return/\S/.test(d.string)||(d=b.getTokenAt(a.Pos(c,d.end+1))),"meta"==d.type&&"#include"==d.string.slice(0,8)?d.start+8:void 0}var e=c.line,f=d(e);if(null==f||null!=d(e-1))return null;for(var g=e;;){var h=d(g+1);if(null==h)break;++g}return{from:a.Pos(e,f+1),to:b.clipPos(a.Pos(g))}}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,e,f,g){function h(a){var c=i(b,e);if(!c||c.to.line-c.from.line<j)return null;for(var d=b.findMarksAt(c.from),f=0;f<d.length;++f)if(d[f].__isFold&&"fold"!==g){if(!a)return null;c.cleared=!0,d[f].clear()}return c}if(f&&f.call){var i=f;f=null}else var i=d(b,f,"rangeFinder");"number"==typeof e&&(e=a.Pos(e,0));var j=d(b,f,"minFoldSize"),k=h(!0);if(d(b,f,"scanUp"))for(;!k&&e.line>b.firstLine();)e=a.Pos(e.line-1,0),k=h(!1);if(k&&!k.cleared&&"unfold"!==g){var l=c(b,f);a.on(l,"mousedown",(function(b){m.clear(),a.e_preventDefault(b)}));var m=b.markText(k.from,k.to,{replacedWith:l,clearOnEnter:d(b,f,"clearOnEnter"),__isFold:!0});m.on("clear",(function(c,d){a.signal(b,"unfold",b,c,d)})),a.signal(b,"fold",b,k.from,k.to)}}function c(a,b){var c=d(a,b,"widget");if("string"==typeof c){var e=document.createTextNode(c);c=document.createElement("span"),c.appendChild(e),c.className="CodeMirror-foldmarker"}else c&&(c=c.cloneNode(!0));return c}function d(a,b,c){if(b&&void 0!==b[c])return b[c];var d=a.options.foldOptions;return d&&void 0!==d[c]?d[c]:e[c]}a.newFoldFunction=function(a,c){return function(d,e){b(d,e,{rangeFinder:a,widget:c})}},a.defineExtension("foldCode",(function(a,c,d){b(this,a,c,d)})),a.defineExtension("isFolded",(function(a){for(var b=this.findMarksAt(a),c=0;c<b.length;++c)if(b[c].__isFold)return!0})),a.commands.toggleFold=function(a){a.foldCode(a.getCursor())},a.commands.fold=function(a){a.foldCode(a.getCursor(),null,"fold")},a.commands.unfold=function(a){a.foldCode(a.getCursor(),null,"unfold")},a.commands.foldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"fold")}))},a.commands.unfoldAll=function(b){b.operation((function(){for(var c=b.firstLine(),d=b.lastLine();c<=d;c++)b.foldCode(a.Pos(c,0),null,"unfold")}))},a.registerHelper("fold","combine",(function(){var a=Array.prototype.slice.call(arguments,0);return function(b,c){for(var d=0;d<a.length;++d){var e=a[d](b,c);if(e)return e}}})),a.registerHelper("fold","auto",(function(a,b){for(var c=a.getHelpers(b,"fold"),d=0;d<c.length;d++){var e=c[d](a,b);if(e)return e}}));var e={rangeFinder:a.fold.auto,widget:"↔",minFoldSize:0,scanUp:!1,clearOnEnter:!0};a.defineOption("foldOptions",null),a.defineExtension("foldOption",(function(a,b){return d(this,a,b)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./foldcode")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./foldcode"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options=a,this.from=this.to=0}function c(a){return a===!0&&(a={}),null==a.gutter&&(a.gutter="CodeMirror-foldgutter"),null==a.indicatorOpen&&(a.indicatorOpen="CodeMirror-foldgutter-open"),null==a.indicatorFolded&&(a.indicatorFolded="CodeMirror-foldgutter-folded"),a}function d(a,b){for(var c=a.findMarks(l(b,0),l(b+1,0)),d=0;d<c.length;++d)if(c[d].__isFold&&c[d].find().from.line==b)return c[d]}function e(a){if("string"==typeof a){var b=document.createElement("div");return b.className=a+" CodeMirror-guttermarker-subtle",b}return a.cloneNode(!0)}function f(a,b,c){var f=a.state.foldGutter.options,g=b,h=a.foldOption(f,"minFoldSize"),i=a.foldOption(f,"rangeFinder");a.eachLine(b,c,(function(b){var c=null;if(d(a,g))c=e(f.indicatorFolded);else{var j=l(g,0),k=i&&i(a,j);k&&k.to.line-k.from.line>=h&&(c=e(f.indicatorOpen))}a.setGutterMarker(b,f.gutter,c),++g}))}function g(a){var b=a.getViewport(),c=a.state.foldGutter;c&&(a.operation((function(){f(a,b.from,b.to)})),c.from=b.from,c.to=b.to)}function h(a,b,c){var e=a.state.foldGutter;if(e){var f=e.options;if(c==f.gutter){var g=d(a,b);g?g.clear():a.foldCode(l(b,0),f.rangeFinder)}}}function i(a){var b=a.state.foldGutter;if(b){var c=b.options;b.from=b.to=0,clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){g(a)}),c.foldOnChangeTimeSpan||600)}}function j(a){var b=a.state.foldGutter;if(b){var c=b.options;clearTimeout(b.changeUpdate),b.changeUpdate=setTimeout((function(){var c=a.getViewport();b.from==b.to||c.from-b.to>20||b.from-c.to>20?g(a):a.operation((function(){c.from<b.from&&(f(a,c.from,b.from),b.from=c.from),c.to>b.to&&(f(a,b.to,c.to),b.to=c.to)}))}),c.updateViewportTimeSpan||400)}}function k(a,b){var c=a.state.foldGutter;if(c){var d=b.line;d>=c.from&&d<c.to&&f(a,d,d+1)}}a.defineOption("foldGutter",!1,(function(d,e,f){f&&f!=a.Init&&(d.clearGutter(d.state.foldGutter.options.gutter),d.state.foldGutter=null,d.off("gutterClick",h),d.off("change",i),d.off("viewportChange",j),d.off("fold",k),d.off("unfold",k),d.off("swapDoc",i)),e&&(d.state.foldGutter=new b(c(e)),g(d),d.on("gutterClick",h),d.on("change",i),d.on("viewportChange",j),d.on("fold",k),d.on("unfold",k),d.on("swapDoc",i))}));var l=a.Pos})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.line-b.line||a.ch-b.ch}function c(a,b,c,d){this.line=b,this.ch=c,this.cm=a,this.text=a.getLine(b),this.min=d?Math.max(d.from,a.firstLine()):a.firstLine(),this.max=d?Math.min(d.to-1,a.lastLine()):a.lastLine()}function d(a,b){var c=a.cm.getTokenTypeAt(m(a.line,b));return c&&/\btag\b/.test(c)}function e(a){if(!(a.line>=a.max))return a.ch=0,a.text=a.cm.getLine(++a.line),!0}function f(a){if(!(a.line<=a.min))return a.text=a.cm.getLine(--a.line),a.ch=a.text.length,!0}function g(a){for(;;){var b=a.text.indexOf(">",a.ch);if(b==-1){if(e(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),f=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,f?"selfClose":"regular"}a.ch=b+1}}}function h(a){for(;;){var b=a.ch?a.text.lastIndexOf("<",a.ch-1):-1;if(b==-1){if(f(a))continue;return}if(d(a,b+1)){p.lastIndex=b,a.ch=b;var c=p.exec(a.text);if(c&&c.index==b)return c}else a.ch=b}}function i(a){for(;;){p.lastIndex=a.ch;var b=p.exec(a.text);if(!b){if(e(a))continue;return}{if(d(a,b.index+1))return a.ch=b.index+b[0].length,b;a.ch=b.index+1}}}function j(a){for(;;){var b=a.ch?a.text.lastIndexOf(">",a.ch-1):-1;if(b==-1){if(f(a))continue;return}{if(d(a,b+1)){var c=a.text.lastIndexOf("/",b),e=c>-1&&!/\S/.test(a.text.slice(c+1,b));return a.ch=b+1,e?"selfClose":"regular"}a.ch=b}}}function k(a,b){for(var c=[];;){var d,e=i(a),f=a.line,h=a.ch-(e?e[0].length:0);if(!e||!(d=g(a)))return;if("selfClose"!=d)if(e[1]){for(var j=c.length-1;j>=0;--j)if(c[j]==e[2]){c.length=j;break}if(j<0&&(!b||b==e[2]))return{tag:e[2],from:m(f,h),to:m(a.line,a.ch)}}else c.push(e[2])}}function l(a,b){for(var c=[];;){var d=j(a);if(!d)return;if("selfClose"!=d){var e=a.line,f=a.ch,g=h(a);if(!g)return;if(g[1])c.push(g[2]);else{for(var i=c.length-1;i>=0;--i)if(c[i]==g[2]){c.length=i;break}if(i<0&&(!b||b==g[2]))return{tag:g[2],from:m(a.line,a.ch),to:m(e,f)}}}else h(a)}}var m=a.Pos,n="A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",o=n+"-:.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",p=new RegExp("<(/?)(["+n+"]["+o+"]*)","g");a.registerHelper("fold","xml",(function(a,d){for(var e=new c(a,d.line,0);;){var f=i(e);if(!f||e.line!=d.line)return;var h=g(e);if(!h)return;if(!f[1]&&"selfClose"!=h){var j=m(e.line,e.ch),l=k(e,f[2]);return l&&b(l.from,j)>0?{from:j,to:l.from}:null}}})),a.findMatchingTag=function(a,d,e){var f=new c(a,d.line,d.ch,e);if(f.text.indexOf(">")!=-1||f.text.indexOf("<")!=-1){var i=g(f),j=i&&m(f.line,f.ch),n=i&&h(f);if(i&&n&&!(b(f,d)>0)){var o={from:m(f.line,f.ch),to:j,tag:n[2]};return"selfClose"==i?{open:o,close:null,at:"open"}:n[1]?{open:l(f,n[2]),close:o,at:"close"}:(f=new c(a,j.line,j.ch,e),{open:o,close:k(f,n[2]),at:"open"})}}},a.findEnclosingTag=function(a,b,d,e){for(var f=new c(a,b.line,b.ch,d);;){var g=l(f,e);if(!g)break;var h=new c(a,b.line,b.ch,d),i=k(h,g.tag);if(i)return{open:g,close:i}}},a.scanForClosingTag=function(a,b,d,e){var f=new c(a,b.line,b.ch,e?{from:0,to:e}:null);return k(f,d)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),"cjs"):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],(function(b){a(b,"amd")})):a(CodeMirror,"plain")})((function(a,b){function c(a,b){var c=b;return function(){0==--c&&a()}}function d(b,d){var e=a.modes[b].dependencies;if(!e)return d();for(var f=[],g=0;g<e.length;++g)a.modes.hasOwnProperty(e[g])||f.push(e[g]);if(!f.length)return d();for(var h=c(d,f.length),g=0;g<f.length;++g)a.requireMode(f[g],h)}a.modeURL||(a.modeURL="../mode/%N/%N.js");var e={};a.requireMode=function(c,f){if("string"!=typeof c&&(c=c.name),a.modes.hasOwnProperty(c))return d(c,f);if(e.hasOwnProperty(c))return e[c].push(f);var g=a.modeURL.replace(/%N/g,c);if("plain"==b){var h=document.createElement("script");h.src=g;var i=document.getElementsByTagName("script")[0],j=e[c]=[f];a.on(h,"load",(function(){d(c,(function(){for(var a=0;a<j.length;++a)j[a]()}))})),i.parentNode.insertBefore(h,i)}else"cjs"==b?(require(g),f()):"amd"==b&&requirejs([g],f)},a.autoLoadMode=function(b,c){a.modes.hasOwnProperty(c)||a.requireMode(c,(function(){b.setOption("mode",b.getOption("mode"))}))}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.multiplexingMode=function(b){function c(a,b,c,d){if("string"==typeof b){var e=a.indexOf(b,c);return d&&e>-1?e+b.length:e}var f=b.exec(c?a.slice(c):a);return f?f.index+c+(d?f[0].length:0):-1}var d=Array.prototype.slice.call(arguments,1);return{startState:function(){return{outer:a.startState(b),innerActive:null,inner:null}},copyState:function(c){return{outer:a.copyState(b,c.outer),innerActive:c.innerActive,inner:c.innerActive&&a.copyState(c.innerActive.mode,c.inner)}},token:function(e,f){if(f.innerActive){var g=f.innerActive,h=e.string;if(!g.close&&e.sol())return f.innerActive=f.inner=null,this.token(e,f);var i=g.close?c(h,g.close,e.pos,g.parseDelimiters):-1;if(i==e.pos&&!g.parseDelimiters)return e.match(g.close),f.innerActive=f.inner=null,g.delimStyle&&g.delimStyle+" "+g.delimStyle+"-close";i>-1&&(e.string=h.slice(0,i));var j=g.mode.token(e,f.inner);return i>-1&&(e.string=h),i==e.pos&&g.parseDelimiters&&(f.innerActive=f.inner=null),g.innerStyle&&(j=j?j+" "+g.innerStyle:g.innerStyle),j}for(var k=1/0,h=e.string,l=0;l<d.length;++l){var m=d[l],i=c(h,m.open,e.pos);if(i==e.pos){m.parseDelimiters||e.match(m.open),f.innerActive=m;var n=0;if(b.indent){var o=b.indent(f.outer,"");o!==a.Pass&&(n=o)}return f.inner=a.startState(m.mode,n),m.delimStyle&&m.delimStyle+" "+m.delimStyle+"-open"}i!=-1&&i<k&&(k=i)}k!=1/0&&(e.string=h.slice(0,k));var p=b.token(e,f.outer);return k!=1/0&&(e.string=h),p},indent:function(c,d){var e=c.innerActive?c.innerActive.mode:b;return e.indent?e.indent(c.innerActive?c.inner:c.outer,d):a.Pass},blankLine:function(c){var e=c.innerActive?c.innerActive.mode:b;if(e.blankLine&&e.blankLine(c.innerActive?c.inner:c.outer),c.innerActive)"\n"===c.innerActive.close&&(c.innerActive=c.inner=null);else for(var f=0;f<d.length;++f){var g=d[f];"\n"===g.open&&(c.innerActive=g,c.inner=a.startState(g.mode,e.indent?e.indent(c.outer,""):0))}},electricChars:b.electricChars,innerMode:function(a){return a.inner?{state:a.inner,mode:a.innerActive.mode}:{state:a.outer,mode:b}}}}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){function c(a){clearTimeout(d.doRedraw),d.doRedraw=setTimeout((function(){d.redraw()}),a)}this.cm=a,this.options=b,this.buttonHeight=b.scrollButtonHeight||a.getOption("scrollButtonHeight"),this.annotations=[],this.doRedraw=this.doUpdate=null,this.div=a.getWrapperElement().appendChild(document.createElement("div")),this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none",this.computeScale();var d=this;a.on("refresh",this.resizeHandler=function(){clearTimeout(d.doUpdate),d.doUpdate=setTimeout((function(){d.computeScale()&&c(20)}),100)}),a.on("markerAdded",this.resizeHandler),a.on("markerCleared",this.resizeHandler),b.listenForChanges!==!1&&a.on("change",this.changeHandler=function(){c(250)})}a.defineExtension("annotateScrollbar",(function(a){return"string"==typeof a&&(a={className:a}),new b(this,a)})),a.defineOption("scrollButtonHeight",0),b.prototype.computeScale=function(){var a=this.cm,b=(a.getWrapperElement().clientHeight-a.display.barHeight-2*this.buttonHeight)/a.getScrollerElement().scrollHeight;if(b!=this.hScale)return this.hScale=b,!0},b.prototype.update=function(a){this.annotations=a,this.redraw()},b.prototype.redraw=function(a){function b(a,b){if(i!=a.line&&(i=a.line,j=c.getLineHandle(i)),j.widgets&&j.widgets.length||g&&j.height>h)return c.charCoords(a,"local")[b?"top":"bottom"];var d=c.heightAtLine(j,"local");return d+(b?0:j.height)}a!==!1&&this.computeScale();var c=this.cm,d=this.hScale,e=document.createDocumentFragment(),f=this.annotations,g=c.getOption("lineWrapping"),h=g&&1.5*c.defaultTextHeight(),i=null,j=null,k=c.lastLine();if(c.display.barWidth)for(var l,m=0;m<f.length;m++){var n=f[m];if(!(n.to.line>k)){for(var o=l||b(n.from,!0)*d,p=b(n.to,!1)*d;m<f.length-1&&!(f[m+1].to.line>k)&&(l=b(f[m+1].from,!0)*d,!(l>p+.9));)n=f[++m],p=b(n.to,!1)*d;if(p!=o){var q=Math.max(p-o,3),r=e.appendChild(document.createElement("div"));r.style.cssText="position: absolute; right: 0px; width: "+Math.max(c.display.barWidth-1,2)+"px; top: "+(o+this.buttonHeight)+"px; height: "+q+"px",r.className=this.options.className,n.id&&r.setAttribute("annotation-id",n.id)}}}this.div.textContent="",this.div.appendChild(e)},b.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("change",this.changeHandler),this.div.parentNode.removeChild(this.div)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(b,c,d){function e(b){var c=a.wheelEventPixels(b)["horizontal"==f.orientation?"x":"y"],d=f.pos;f.moveTo(f.pos+c),f.pos!=d&&a.e_preventDefault(b)}this.orientation=c,this.scroll=d,this.screen=this.total=this.size=1,this.pos=0,this.node=document.createElement("div"),this.node.className=b+"-"+c,this.inner=this.node.appendChild(document.createElement("div"));var f=this;a.on(this.inner,"mousedown",(function(b){function c(){a.off(document,"mousemove",d),a.off(document,"mouseup",c)}function d(a){return 1!=a.which?c():void f.moveTo(h+(a[e]-g)*(f.total/f.size))}if(1==b.which){a.e_preventDefault(b);var e="horizontal"==f.orientation?"pageX":"pageY",g=b[e],h=f.pos;a.on(document,"mousemove",d),a.on(document,"mouseup",c)}})),a.on(this.node,"click",(function(b){a.e_preventDefault(b);var c,d=f.inner.getBoundingClientRect();c="horizontal"==f.orientation?b.clientX<d.left?-1:b.clientX>d.right?1:0:b.clientY<d.top?-1:b.clientY>d.bottom?1:0,f.moveTo(f.pos+c*f.screen)})),a.on(this.node,"mousewheel",e),a.on(this.node,"DOMMouseScroll",e)}function c(a,c,d){this.addClass=a,this.horiz=new b(a,"horizontal",d),c(this.horiz.node),this.vert=new b(a,"vertical",d),c(this.vert.node),this.width=null;
+}b.prototype.setPos=function(a,b){return a<0&&(a=0),a>this.total-this.screen&&(a=this.total-this.screen),!(!b&&a==this.pos)&&(this.pos=a,this.inner.style["horizontal"==this.orientation?"left":"top"]=a*(this.size/this.total)+"px",!0)},b.prototype.moveTo=function(a){this.setPos(a)&&this.scroll(a,this.orientation)};var d=10;b.prototype.update=function(a,b,c){var e=this.screen!=b||this.total!=a||this.size!=c;e&&(this.screen=b,this.total=a,this.size=c);var f=this.screen*(this.size/this.total);f<d&&(this.size-=d-f,f=d),this.inner.style["horizontal"==this.orientation?"width":"height"]=f+"px",this.setPos(this.pos,e)},c.prototype.update=function(a){if(null==this.width){var b=window.getComputedStyle?window.getComputedStyle(this.horiz.node):this.horiz.node.currentStyle;b&&(this.width=parseInt(b.height))}var c=this.width||0,d=a.scrollWidth>a.clientWidth+1,e=a.scrollHeight>a.clientHeight+1;return this.vert.node.style.display=e?"block":"none",this.horiz.node.style.display=d?"block":"none",e&&(this.vert.update(a.scrollHeight,a.clientHeight,a.viewHeight-(d?c:0)),this.vert.node.style.bottom=d?c+"px":"0"),d&&(this.horiz.update(a.scrollWidth,a.clientWidth,a.viewWidth-(e?c:0)-a.barLeft),this.horiz.node.style.right=e?c+"px":"0",this.horiz.node.style.left=a.barLeft+"px"),{right:e?c:0,bottom:d?c:0}},c.prototype.setScrollTop=function(a){this.vert.setPos(a)},c.prototype.setScrollLeft=function(a){this.horiz.setPos(a)},c.prototype.clear=function(){var a=this.horiz.node.parentNode;a.removeChild(this.horiz.node),a.removeChild(this.vert.node)},a.scrollbarModel.simple=function(a,b){return new c("CodeMirror-simplescroll",a,b)},a.scrollbarModel.overlay=function(a,b){return new c("CodeMirror-overlayscroll",a,b)}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./searchcursor"),require("../scroll/annotatescrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./searchcursor","../scroll/annotatescrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d){this.cm=a,this.options=d;var e={listenForChanges:!1};for(var f in d)e[f]=d[f];e.className||(e.className="CodeMirror-search-match"),this.annotation=a.annotateScrollbar(e),this.query=b,this.caseFold=c,this.gap={from:a.firstLine(),to:a.lastLine()+1},this.matches=[],this.update=null,this.findMatches(),this.annotation.update(this.matches);var g=this;a.on("change",this.changeHandler=function(a,b){g.onChange(b)})}function c(a,b,c){return a<=b?a:Math.max(b,a+c)}a.defineExtension("showMatchesOnScrollbar",(function(a,c,d){return"string"==typeof d&&(d={className:d}),d||(d={}),new b(this,a,c,d)}));var d=1e3;b.prototype.findMatches=function(){if(this.gap){for(var b=0;b<this.matches.length;b++){var c=this.matches[b];if(c.from.line>=this.gap.to)break;c.to.line>=this.gap.from&&this.matches.splice(b--,1)}for(var e=this.cm.getSearchCursor(this.query,a.Pos(this.gap.from,0),this.caseFold),f=this.options&&this.options.maxMatches||d;e.findNext();){var c={from:e.from(),to:e.to()};if(c.from.line>=this.gap.to)break;if(this.matches.splice(b++,0,c),this.matches.length>f)break}this.gap=null}},b.prototype.onChange=function(b){var d=b.from.line,e=a.changeEnd(b).line,f=e-b.to.line;if(this.gap?(this.gap.from=Math.min(c(this.gap.from,d,f),b.from.line),this.gap.to=Math.max(c(this.gap.to,d,f),b.from.line)):this.gap={from:b.from.line,to:e+1},f)for(var g=0;g<this.matches.length;g++){var h=this.matches[g],i=c(h.from.line,d,f);i!=h.from.line&&(h.from=a.Pos(i,h.from.ch));var j=c(h.to.line,d,f);j!=h.to.line&&(h.to=a.Pos(j,h.to.ch))}clearTimeout(this.update);var k=this;this.update=setTimeout((function(){k.updateAfterChange()}),250)},b.prototype.updateAfterChange=function(){this.findMatches(),this.annotation.update(this.matches)},b.prototype.clear=function(){this.cm.off("change",this.changeHandler),this.annotation.clear()}})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("./matchesonscrollbar")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","./matchesonscrollbar"],a):a(CodeMirror)})((function(a){"use strict";function b(a){this.options={};for(var b in l)this.options[b]=(a&&a.hasOwnProperty(b)?a:l)[b];this.overlay=this.timeout=null,this.matchesonscroll=null,this.active=!1}function c(a){var b=a.state.matchHighlighter;(b.active||a.hasFocus())&&e(a,b)}function d(a){var b=a.state.matchHighlighter;b.active||(b.active=!0,e(a,b))}function e(a,b){clearTimeout(b.timeout),b.timeout=setTimeout((function(){h(a)}),b.options.delay)}function f(a,b,c,d){var e=a.state.matchHighlighter;if(a.addOverlay(e.overlay=k(b,c,d)),e.options.annotateScrollbar&&a.showMatchesOnScrollbar){var f=c?new RegExp("\\b"+b.replace(/[\\\[.+*?(){|^$]/g,"\\$&")+"\\b"):b;e.matchesonscroll=a.showMatchesOnScrollbar(f,!1,{className:"CodeMirror-selection-highlight-scrollbar"})}}function g(a){var b=a.state.matchHighlighter;b.overlay&&(a.removeOverlay(b.overlay),b.overlay=null,b.matchesonscroll&&(b.matchesonscroll.clear(),b.matchesonscroll=null))}function h(a){a.operation((function(){var b=a.state.matchHighlighter;if(g(a),!a.somethingSelected()&&b.options.showToken){for(var c=b.options.showToken===!0?/[\w$]/:b.options.showToken,d=a.getCursor(),e=a.getLine(d.line),h=d.ch,j=h;h&&c.test(e.charAt(h-1));)--h;for(;j<e.length&&c.test(e.charAt(j));)++j;return void(h<j&&f(a,e.slice(h,j),c,b.options.style))}var k=a.getCursor("from"),l=a.getCursor("to");if(k.line==l.line&&(!b.options.wordsOnly||i(a,k,l))){var m=a.getRange(k,l);b.options.trim&&(m=m.replace(/^\s+|\s+$/g,"")),m.length>=b.options.minChars&&f(a,m,!1,b.options.style)}}))}function i(a,b,c){var d=a.getRange(b,c);if(null!==d.match(/^\w+$/)){if(b.ch>0){var e={line:b.line,ch:b.ch-1},f=a.getRange(e,b);if(null===f.match(/\W/))return!1}if(c.ch<a.getLine(b.line).length){var e={line:c.line,ch:c.ch+1},f=a.getRange(c,e);if(null===f.match(/\W/))return!1}return!0}return!1}function j(a,b){return!(a.start&&b.test(a.string.charAt(a.start-1))||a.pos!=a.string.length&&b.test(a.string.charAt(a.pos)))}function k(a,b,c){return{token:function(d){return!d.match(a)||b&&!j(d,b)?(d.next(),void(d.skipTo(a.charAt(0))||d.skipToEnd())):c}}}var l={style:"matchhighlight",minChars:2,delay:100,wordsOnly:!1,annotateScrollbar:!1,showToken:!1,trim:!0};a.defineOption("highlightSelectionMatches",!1,(function(e,f,i){if(i&&i!=a.Init&&(g(e),clearTimeout(e.state.matchHighlighter.timeout),e.state.matchHighlighter=null,e.off("cursorActivity",c),e.off("focus",d)),f){var j=e.state.matchHighlighter=new b(f);e.hasFocus()?(j.active=!0,h(e)):e.on("focus",d),e.on("cursorActivity",c)}}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.flags;return null!=b?b:(a.ignoreCase?"i":"")+(a.global?"g":"")+(a.multiline?"m":"")}function c(a,c){for(var d=b(a),e=d,f=0;f<c.length;f++)e.indexOf(c.charAt(f))==-1&&(e+=c.charAt(f));return d==e?a:new RegExp(a.source,e)}function d(a){return/\\s|\\n|\n|\\W|\\D|\[\^/.test(a.source)}function e(a,b,d){b=c(b,"g");for(var e=d.line,f=d.ch,g=a.lastLine();e<=g;e++,f=0){b.lastIndex=f;var h=a.getLine(e),i=b.exec(h);if(i)return{from:p(e,i.index),to:p(e,i.index+i[0].length),match:i}}}function f(a,b,f){if(!d(b))return e(a,b,f);b=c(b,"gm");for(var g,h=1,i=f.line,j=a.lastLine();i<=j;){for(var k=0;k<h&&!(i>j);k++){var l=a.getLine(i++);g=null==g?l:g+"\n"+l}h=2*h,b.lastIndex=f.ch;var m=b.exec(g);if(m){var n=g.slice(0,m.index).split("\n"),o=m[0].split("\n"),q=f.line+n.length-1,r=n[n.length-1].length;return{from:p(q,r),to:p(q+o.length-1,1==o.length?r+o[0].length:o[o.length-1].length),match:m}}}}function g(a,b){for(var c,d=0;;){b.lastIndex=d;var e=b.exec(a);if(!e)return c;if(c=e,d=c.index+(c[0].length||1),d==a.length)return c}}function h(a,b,d){b=c(b,"g");for(var e=d.line,f=d.ch,h=a.firstLine();e>=h;e--,f=-1){var i=a.getLine(e);f>-1&&(i=i.slice(0,f));var j=g(i,b);if(j)return{from:p(e,j.index),to:p(e,j.index+j[0].length),match:j}}}function i(a,b,d){b=c(b,"gm");for(var e,f=1,h=d.line,i=a.firstLine();h>=i;){for(var j=0;j<f;j++){var k=a.getLine(h--);e=null==e?k.slice(0,d.ch):k+"\n"+e}f*=2;var l=g(e,b);if(l){var m=e.slice(0,l.index).split("\n"),n=l[0].split("\n"),o=h+m.length,q=m[m.length-1].length;return{from:p(o,q),to:p(o+n.length-1,1==n.length?q+n[0].length:n[n.length-1].length),match:l}}}}function j(a,b,c,d){if(a.length==b.length)return c;for(var e=0,f=c+Math.max(0,a.length-b.length);;){if(e==f)return e;var g=e+f>>1,h=d(a.slice(0,g)).length;if(h==c)return g;h>c?f=g:e=g+1}}function k(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.lastLine()+1-f.length;g<=i;g++,h=0){var k=a.getLine(g).slice(h),l=e(k);if(1==f.length){var m=l.indexOf(f[0]);if(m==-1)continue a;var c=j(k,l,m,e)+h;return{from:p(g,j(k,l,m,e)+h),to:p(g,j(k,l,m+f[0].length,e)+h)}}var q=l.length-f[0].length;if(l.slice(q)==f[0]){for(var r=1;r<f.length-1;r++)if(e(a.getLine(g+r))!=f[r])continue a;var s=a.getLine(g+f.length-1),t=e(s),u=f[f.length-1];if(t.slice(0,u.length)==u)return{from:p(g,j(k,l,q,e)+h),to:p(g+f.length-1,j(s,t,u.length,e))}}}}function l(a,b,c,d){if(!b.length)return null;var e=d?n:o,f=e(b).split(/\r|\n\r?/);a:for(var g=c.line,h=c.ch,i=a.firstLine()-1+f.length;g>=i;g--,h=-1){var k=a.getLine(g);h>-1&&(k=k.slice(0,h));var l=e(k);if(1==f.length){var m=l.lastIndexOf(f[0]);if(m==-1)continue a;return{from:p(g,j(k,l,m,e)),to:p(g,j(k,l,m+f[0].length,e))}}var q=f[f.length-1];if(l.slice(0,q.length)==q){for(var r=1,c=g-f.length+1;r<f.length-1;r++)if(e(a.getLine(c+r))!=f[r])continue a;var s=a.getLine(g+1-f.length),t=e(s);if(t.slice(t.length-f[0].length)==f[0])return{from:p(g+1-f.length,j(s,t,s.length-f[0].length,e)),to:p(g,j(k,l,q.length,e))}}}}function m(a,b,d,g){this.atOccurrence=!1,this.doc=a,d=d?a.clipPos(d):p(0,0),this.pos={from:d,to:d};var j;"object"==typeof g?j=g.caseFold:(j=g,g=null),"string"==typeof b?(null==j&&(j=!1),this.matches=function(c,d){return(c?l:k)(a,b,d,j)}):(b=c(b,"gm"),g&&g.multiline===!1?this.matches=function(c,d){return(c?h:e)(a,b,d)}:this.matches=function(c,d){return(c?i:f)(a,b,d)})}var n,o,p=a.Pos;String.prototype.normalize?(n=function(a){return a.normalize("NFD").toLowerCase()},o=function(a){return a.normalize("NFD")}):(n=function(a){return a.toLowerCase()},o=function(a){return a}),m.prototype={findNext:function(){return this.find(!1)},findPrevious:function(){return this.find(!0)},find:function(b){for(var c=this.matches(b,this.doc.clipPos(b?this.pos.from:this.pos.to));c&&0==a.cmpPos(c.from,c.to);)b?c.from.ch?c.from=p(c.from.line,c.from.ch-1):c=c.from.line==this.doc.firstLine()?null:this.matches(b,this.doc.clipPos(p(c.from.line-1))):c.to.ch<this.doc.getLine(c.to.line).length?c.to=p(c.to.line,c.to.ch+1):c=c.to.line==this.doc.lastLine()?null:this.matches(b,p(c.to.line+1,0));if(c)return this.pos=c,this.atOccurrence=!0,this.pos.match||!0;var d=p(b?this.doc.firstLine():this.doc.lastLine()+1,0);return this.pos={from:d,to:d},this.atOccurrence=!1},from:function(){if(this.atOccurrence)return this.pos.from},to:function(){if(this.atOccurrence)return this.pos.to},replace:function(b,c){if(this.atOccurrence){var d=a.splitLines(b);this.doc.replaceRange(d,this.pos.from,this.pos.to,c),this.pos.to=p(this.pos.from.line+d.length-1,d[d.length-1].length+(1==d.length?this.pos.from.ch:0))}}},a.defineExtension("getSearchCursor",(function(a,b,c){return new m(this.doc,a,b,c)})),a.defineDocExtension("getSearchCursor",(function(a,b,c){return new m(this,a,b,c)})),a.defineExtension("selectMatches",(function(b,c){for(var d=[],e=this.getSearchCursor(b,this.getCursor("from"),c);e.findNext()&&!(a.cmpPos(e.to(),this.getCursor("to"))>0);)d.push({anchor:e.from(),head:e.to()});d.length&&this.setSelections(d,0)}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b=0;b<a.state.activeLines.length;b++)a.removeLineClass(a.state.activeLines[b],"wrap",f),a.removeLineClass(a.state.activeLines[b],"background",g),a.removeLineClass(a.state.activeLines[b],"gutter",h)}function c(a,b){if(a.length!=b.length)return!1;for(var c=0;c<a.length;c++)if(a[c]!=b[c])return!1;return!0}function d(a,d){for(var e=[],i=0;i<d.length;i++){var j=d[i],k=a.getOption("styleActiveLine");if("object"==typeof k&&k.nonEmpty?j.anchor.line==j.head.line:j.empty()){var l=a.getLineHandleVisualStart(j.head.line);e[e.length-1]!=l&&e.push(l)}}c(a.state.activeLines,e)||a.operation((function(){b(a);for(var c=0;c<e.length;c++)a.addLineClass(e[c],"wrap",f),a.addLineClass(e[c],"background",g),a.addLineClass(e[c],"gutter",h);a.state.activeLines=e}))}function e(a,b){d(a,b.ranges)}var f="CodeMirror-activeline",g="CodeMirror-activeline-background",h="CodeMirror-activeline-gutter";a.defineOption("styleActiveLine",!1,(function(c,f,g){var h=g!=a.Init&&g;f!=h&&(h&&(c.off("beforeSelectionChange",e),b(c),delete c.state.activeLines),f&&(c.state.activeLines=[],d(c,c.listSelections()),c.on("beforeSelectionChange",e)))}))})),(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.modeInfo=[{name:"APL",mime:"text/apl",mode:"apl",ext:["dyalog","apl"]},{name:"PGP",mimes:["application/pgp","application/pgp-encrypted","application/pgp-keys","application/pgp-signature"],mode:"asciiarmor",ext:["asc","pgp","sig"]},{name:"ASN.1",mime:"text/x-ttcn-asn",mode:"asn.1",ext:["asn","asn1"]},{name:"Asterisk",mime:"text/x-asterisk",mode:"asterisk",file:/^extensions\.conf$/i},{name:"Brainfuck",mime:"text/x-brainfuck",mode:"brainfuck",ext:["b","bf"]},{name:"C",mime:"text/x-csrc",mode:"clike",ext:["c","h","ino"]},{name:"C++",mime:"text/x-c++src",mode:"clike",ext:["cpp","c++","cc","cxx","hpp","h++","hh","hxx"],alias:["cpp"]},{name:"Cobol",mime:"text/x-cobol",mode:"cobol",ext:["cob","cpy"]},{name:"C#",mime:"text/x-csharp",mode:"clike",ext:["cs"],alias:["csharp"]},{name:"Clojure",mime:"text/x-clojure",mode:"clojure",ext:["clj","cljc","cljx"]},{name:"ClojureScript",mime:"text/x-clojurescript",mode:"clojure",ext:["cljs"]},{name:"Closure Stylesheets (GSS)",mime:"text/x-gss",mode:"css",ext:["gss"]},{name:"CMake",mime:"text/x-cmake",mode:"cmake",ext:["cmake","cmake.in"],file:/^CMakeLists.txt$/},{name:"CoffeeScript",mimes:["application/vnd.coffeescript","text/coffeescript","text/x-coffeescript"],mode:"coffeescript",ext:["coffee"],alias:["coffee","coffee-script"]},{name:"Common Lisp",mime:"text/x-common-lisp",mode:"commonlisp",ext:["cl","lisp","el"],alias:["lisp"]},{name:"Cypher",mime:"application/x-cypher-query",mode:"cypher",ext:["cyp","cypher"]},{name:"Cython",mime:"text/x-cython",mode:"python",ext:["pyx","pxd","pxi"]},{name:"Crystal",mime:"text/x-crystal",mode:"crystal",ext:["cr"]},{name:"CSS",mime:"text/css",mode:"css",ext:["css"]},{name:"CQL",mime:"text/x-cassandra",mode:"sql",ext:["cql"]},{name:"D",mime:"text/x-d",mode:"d",ext:["d"]},{name:"Dart",mimes:["application/dart","text/x-dart"],mode:"dart",ext:["dart"]},{name:"diff",mime:"text/x-diff",mode:"diff",ext:["diff","patch"]},{name:"Django",mime:"text/x-django",mode:"django"},{name:"Dockerfile",mime:"text/x-dockerfile",mode:"dockerfile",file:/^Dockerfile$/},{name:"DTD",mime:"application/xml-dtd",mode:"dtd",ext:["dtd"]},{name:"Dylan",mime:"text/x-dylan",mode:"dylan",ext:["dylan","dyl","intr"]},{name:"EBNF",mime:"text/x-ebnf",mode:"ebnf"},{name:"ECL",mime:"text/x-ecl",mode:"ecl",ext:["ecl"]},{name:"edn",mime:"application/edn",mode:"clojure",ext:["edn"]},{name:"Eiffel",mime:"text/x-eiffel",mode:"eiffel",ext:["e"]},{name:"Elm",mime:"text/x-elm",mode:"elm",ext:["elm"]},{name:"Embedded Javascript",mime:"application/x-ejs",mode:"htmlembedded",ext:["ejs"]},{name:"Embedded Ruby",mime:"application/x-erb",mode:"htmlembedded",ext:["erb"]},{name:"Erlang",mime:"text/x-erlang",mode:"erlang",ext:["erl"]},{name:"Esper",mime:"text/x-esper",mode:"sql"},{name:"Factor",mime:"text/x-factor",mode:"factor",ext:["factor"]},{name:"FCL",mime:"text/x-fcl",mode:"fcl"},{name:"Forth",mime:"text/x-forth",mode:"forth",ext:["forth","fth","4th"]},{name:"Fortran",mime:"text/x-fortran",mode:"fortran",ext:["f","for","f77","f90"]},{name:"F#",mime:"text/x-fsharp",mode:"mllike",ext:["fs"],alias:["fsharp"]},{name:"Gas",mime:"text/x-gas",mode:"gas",ext:["s"]},{name:"Gherkin",mime:"text/x-feature",mode:"gherkin",ext:["feature"]},{name:"GitHub Flavored Markdown",mime:"text/x-gfm",mode:"gfm",file:/^(readme|contributing|history).md$/i},{name:"Go",mime:"text/x-go",mode:"go",ext:["go"]},{name:"Groovy",mime:"text/x-groovy",mode:"groovy",ext:["groovy","gradle"],file:/^Jenkinsfile$/},{name:"HAML",mime:"text/x-haml",mode:"haml",ext:["haml"]},{name:"Haskell",mime:"text/x-haskell",mode:"haskell",ext:["hs"]},{name:"Haskell (Literate)",mime:"text/x-literate-haskell",mode:"haskell-literate",ext:["lhs"]},{name:"Haxe",mime:"text/x-haxe",mode:"haxe",ext:["hx"]},{name:"HXML",mime:"text/x-hxml",mode:"haxe",ext:["hxml"]},{name:"ASP.NET",mime:"application/x-aspx",mode:"htmlembedded",ext:["aspx"],alias:["asp","aspx"]},{name:"HTML",mime:"text/html",mode:"htmlmixed",ext:["html","htm","handlebars","hbs"],alias:["xhtml"]},{name:"HTTP",mime:"message/http",mode:"http"},{name:"IDL",mime:"text/x-idl",mode:"idl",ext:["pro"]},{name:"Pug",mime:"text/x-pug",mode:"pug",ext:["jade","pug"],alias:["jade"]},{name:"Java",mime:"text/x-java",mode:"clike",ext:["java"]},{name:"Java Server Pages",mime:"application/x-jsp",mode:"htmlembedded",ext:["jsp"],alias:["jsp"]},{name:"JavaScript",mimes:["text/javascript","text/ecmascript","application/javascript","application/x-javascript","application/ecmascript"],mode:"javascript",ext:["js"],alias:["ecmascript","js","node"]},{name:"JSON",mimes:["application/json","application/x-json"],mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"JSON-LD",mime:"application/ld+json",mode:"javascript",ext:["jsonld"],alias:["jsonld"]},{name:"JSX",mime:"text/jsx",mode:"jsx",ext:["jsx"]},{name:"Jinja2",mime:"null",mode:"jinja2"},{name:"Julia",mime:"text/x-julia",mode:"julia",ext:["jl"]},{name:"Kotlin",mime:"text/x-kotlin",mode:"clike",ext:["kt"]},{name:"LESS",mime:"text/x-less",mode:"css",ext:["less"]},{name:"LiveScript",mime:"text/x-livescript",mode:"livescript",ext:["ls"],alias:["ls"]},{name:"Lua",mime:"text/x-lua",mode:"lua",ext:["lua"]},{name:"Markdown",mime:"text/x-markdown",mode:"markdown",ext:["markdown","md","mkd"]},{name:"mIRC",mime:"text/mirc",mode:"mirc"},{name:"MariaDB SQL",mime:"text/x-mariadb",mode:"sql"},{name:"Mathematica",mime:"text/x-mathematica",mode:"mathematica",ext:["m","nb"]},{name:"Modelica",mime:"text/x-modelica",mode:"modelica",ext:["mo"]},{name:"MUMPS",mime:"text/x-mumps",mode:"mumps",ext:["mps"]},{name:"MS SQL",mime:"text/x-mssql",mode:"sql"},{name:"mbox",mime:"application/mbox",mode:"mbox",ext:["mbox"]},{name:"MySQL",mime:"text/x-mysql",mode:"sql"},{name:"Nginx",mime:"text/x-nginx-conf",mode:"nginx",file:/nginx.*\.conf$/i},{name:"NSIS",mime:"text/x-nsis",mode:"nsis",ext:["nsh","nsi"]},{name:"NTriples",mimes:["application/n-triples","application/n-quads","text/n-triples"],mode:"ntriples",ext:["nt","nq"]},{name:"Objective-C",mime:"text/x-objectivec",mode:"clike",ext:["m","mm"],alias:["objective-c","objc"]},{name:"OCaml",mime:"text/x-ocaml",mode:"mllike",ext:["ml","mli","mll","mly"]},{name:"Octave",mime:"text/x-octave",mode:"octave",ext:["m"]},{name:"Oz",mime:"text/x-oz",mode:"oz",ext:["oz"]},{name:"Pascal",mime:"text/x-pascal",mode:"pascal",ext:["p","pas"]},{name:"PEG.js",mime:"null",mode:"pegjs",ext:["jsonld"]},{name:"Perl",mime:"text/x-perl",mode:"perl",ext:["pl","pm"]},{name:"PHP",mimes:["text/x-php","application/x-httpd-php","application/x-httpd-php-open"],mode:"php",ext:["php","php3","php4","php5","php7","phtml"]},{name:"Pig",mime:"text/x-pig",mode:"pig",ext:["pig"]},{name:"Plain Text",mime:"text/plain",mode:"null",ext:["txt","text","conf","def","list","log"]},{name:"PLSQL",mime:"text/x-plsql",mode:"sql",ext:["pls"]},{name:"PowerShell",mime:"application/x-powershell",mode:"powershell",ext:["ps1","psd1","psm1"]},{name:"Properties files",mime:"text/x-properties",mode:"properties",ext:["properties","ini","in"],alias:["ini","properties"]},{name:"ProtoBuf",mime:"text/x-protobuf",mode:"protobuf",ext:["proto"]},{name:"Python",mime:"text/x-python",mode:"python",ext:["BUILD","bzl","py","pyw"],file:/^(BUCK|BUILD)$/},{name:"Puppet",mime:"text/x-puppet",mode:"puppet",ext:["pp"]},{name:"Q",mime:"text/x-q",mode:"q",ext:["q"]},{name:"R",mime:"text/x-rsrc",mode:"r",ext:["r","R"],alias:["rscript"]},{name:"reStructuredText",mime:"text/x-rst",mode:"rst",ext:["rst"],alias:["rst"]},{name:"RPM Changes",mime:"text/x-rpm-changes",mode:"rpm"},{name:"RPM Spec",mime:"text/x-rpm-spec",mode:"rpm",ext:["spec"]},{name:"Ruby",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"Rust",mime:"text/x-rustsrc",mode:"rust",ext:["rs"]},{name:"SAS",mime:"text/x-sas",mode:"sas",ext:["sas"]},{name:"Sass",mime:"text/x-sass",mode:"sass",ext:["sass"]},{name:"Scala",mime:"text/x-scala",mode:"clike",ext:["scala"]},{name:"Scheme",mime:"text/x-scheme",mode:"scheme",ext:["scm","ss"]},{name:"SCSS",mime:"text/x-scss",mode:"css",ext:["scss"]},{name:"Shell",mimes:["text/x-sh","application/x-sh"],mode:"shell",ext:["sh","ksh","bash"],alias:["bash","sh","zsh"],file:/^PKGBUILD$/},{name:"Sieve",mime:"application/sieve",mode:"sieve",ext:["siv","sieve"]},{name:"Slim",mimes:["text/x-slim","application/x-slim"],mode:"slim",ext:["slim"]},{name:"Smalltalk",mime:"text/x-stsrc",mode:"smalltalk",ext:["st"]},{name:"Smarty",mime:"text/x-smarty",mode:"smarty",ext:["tpl"]},{name:"Solr",mime:"text/x-solr",mode:"solr"},{name:"SML",mime:"text/x-sml",mode:"mllike",ext:["sml","sig","fun","smackspec"]},{name:"Soy",mime:"text/x-soy",mode:"soy",ext:["soy"],alias:["closure template"]},{name:"SPARQL",mime:"application/sparql-query",mode:"sparql",ext:["rq","sparql"],alias:["sparul"]},{name:"Spreadsheet",mime:"text/x-spreadsheet",mode:"spreadsheet",alias:["excel","formula"]},{name:"SQL",mime:"text/x-sql",mode:"sql",ext:["sql"]},{name:"SQLite",mime:"text/x-sqlite",mode:"sql"},{name:"Squirrel",mime:"text/x-squirrel",mode:"clike",ext:["nut"]},{name:"Stylus",mime:"text/x-styl",mode:"stylus",ext:["styl"]},{name:"Swift",mime:"text/x-swift",mode:"swift",ext:["swift"]},{name:"sTeX",mime:"text/x-stex",mode:"stex"},{name:"LaTeX",mime:"text/x-latex",mode:"stex",ext:["text","ltx","tex"],alias:["tex"]},{name:"SystemVerilog",mime:"text/x-systemverilog",mode:"verilog",ext:["v","sv","svh"]},{name:"Tcl",mime:"text/x-tcl",mode:"tcl",ext:["tcl"]},{name:"Textile",mime:"text/x-textile",mode:"textile",ext:["textile"]},{name:"TiddlyWiki ",mime:"text/x-tiddlywiki",mode:"tiddlywiki"},{name:"Tiki wiki",mime:"text/tiki",mode:"tiki"},{name:"TOML",mime:"text/x-toml",mode:"toml",ext:["toml"]},{name:"Tornado",mime:"text/x-tornado",mode:"tornado"},{name:"troff",mime:"text/troff",mode:"troff",ext:["1","2","3","4","5","6","7","8","9"]},{name:"TTCN",mime:"text/x-ttcn",mode:"ttcn",ext:["ttcn","ttcn3","ttcnpp"]},{name:"TTCN_CFG",mime:"text/x-ttcn-cfg",mode:"ttcn-cfg",ext:["cfg"]},{name:"Turtle",mime:"text/turtle",mode:"turtle",ext:["ttl"]},{name:"TypeScript",mime:"application/typescript",mode:"javascript",ext:["ts"],alias:["ts"]},{name:"TypeScript-JSX",mime:"text/typescript-jsx",mode:"jsx",ext:["tsx"],alias:["tsx"]},{name:"Twig",mime:"text/x-twig",mode:"twig"},{name:"Web IDL",mime:"text/x-webidl",mode:"webidl",ext:["webidl"]},{name:"VB.NET",mime:"text/x-vb",mode:"vb",ext:["vb"]},{name:"VBScript",mime:"text/vbscript",mode:"vbscript",ext:["vbs"]},{name:"Velocity",mime:"text/velocity",mode:"velocity",ext:["vtl"]},{name:"Verilog",mime:"text/x-verilog",mode:"verilog",ext:["v"]},{name:"VHDL",mime:"text/x-vhdl",mode:"vhdl",ext:["vhd","vhdl"]},{name:"Vue.js Component",mimes:["script/x-vue","text/x-vue"],mode:"vue",ext:["vue"]},{name:"XML",mimes:["application/xml","text/xml"],mode:"xml",ext:["xml","xsl","xsd","svg"],alias:["rss","wsdl","xsd"]},{name:"XQuery",mime:"application/xquery",mode:"xquery",ext:["xy","xquery"]},{name:"Yacas",mime:"text/x-yacas",mode:"yacas",ext:["ys"]},{name:"YAML",mimes:["text/x-yaml","text/yaml"],mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"Z80",mime:"text/x-z80",mode:"z80",ext:["z80"]},{name:"mscgen",mime:"text/x-mscgen",mode:"mscgen",ext:["mscgen","mscin","msc"]},{name:"xu",mime:"text/x-xu",mode:"mscgen",ext:["xu"]},{name:"msgenny",mime:"text/x-msgenny",mode:"mscgen",ext:["msgenny"]}];for(var b=0;b<a.modeInfo.length;b++){var c=a.modeInfo[b];c.mimes&&(c.mime=c.mimes[0])}a.findModeByMIME=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.mime==b)return d;if(d.mimes)for(var e=0;e<d.mimes.length;e++)if(d.mimes[e]==b)return d}return/\+xml$/.test(b)?a.findModeByMIME("application/xml"):/\+json$/.test(b)?a.findModeByMIME("application/json"):void 0},a.findModeByExtension=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.ext)for(var e=0;e<d.ext.length;e++)if(d.ext[e]==b)return d}},a.findModeByFileName=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.file&&d.file.test(b))return d}var e=b.lastIndexOf("."),f=e>-1&&b.substring(e+1,b.length);if(f)return a.findModeByExtension(f)},a.findModeByName=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.name.toLowerCase()==b)return d;if(d.alias)for(var e=0;e<d.alias.length;e++)if(d.alias[e].toLowerCase()==b)return d}}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/lib/codemirror.css b/core/media/editors/codemirror/lib/codemirror.css
new file mode 100644
index 00000000..c7a8ae70
--- /dev/null
+++ b/core/media/editors/codemirror/lib/codemirror.css
@@ -0,0 +1,346 @@
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+  color: black;
+  direction: ltr;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+  white-space: nowrap;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+  white-space: nowrap;
+}
+
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
+/* CURSOR */
+
+.CodeMirror-cursor {
+  border-left: 1px solid black;
+  border-right: none;
+  width: 0;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror div.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.cm-fat-cursor .CodeMirror-cursor {
+  width: auto;
+  border: 0 !important;
+  background: #7e7;
+}
+.cm-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+.cm-fat-cursor-mark {
+  background-color: rgba(20, 255, 20, 0.5);
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+}
+.cm-animate-fat-cursor {
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
+}
+@-moz-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@-webkit-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
+
+.CodeMirror-rulers {
+  position: absolute;
+  left: 0; right: 0; top: -50px; bottom: -20px;
+  overflow: hidden;
+}
+.CodeMirror-ruler {
+  border-left: 1px solid #ccc;
+  top: 0; bottom: 0;
+  position: absolute;
+}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
+.CodeMirror-activeline-background {background: #e8f2ff;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  position: relative;
+  overflow: hidden;
+  background: white;
+}
+
+.CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
+  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror */
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+}
+.CodeMirror-sizer {
+  position: relative;
+  border-right: 30px solid transparent;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actual scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  min-height: 100%;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  white-space: normal;
+  height: 100%;
+  display: inline-block;
+  vertical-align: top;
+  margin-bottom: -30px;
+}
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
+
+.CodeMirror-lines {
+  cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
+}
+.CodeMirror pre {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: contextual;
+  font-variant-ligatures: contextual;
+}
+.CodeMirror-wrap pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+  padding: 0.1px; /* Force widget margins to stay inside of the container */
+}
+
+.CodeMirror-widget {}
+
+.CodeMirror-rtl pre { direction: rtl; }
+
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  visibility: hidden;
+}
+
+.CodeMirror-cursor {
+  position: absolute;
+  pointer-events: none;
+}
+.CodeMirror-measure pre { position: static; }
+
+div.CodeMirror-cursors {
+  visibility: hidden;
+  position: relative;
+  z-index: 3;
+}
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
+.CodeMirror-focused div.CodeMirror-cursors {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
+
+.cm-searching {
+  background-color: #ffa;
+  background-color: rgba(255, 255, 0, .4);
+}
+
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror div.CodeMirror-cursors {
+    visibility: hidden;
+  }
+}
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
diff --git a/core/media/editors/codemirror/lib/codemirror.js b/core/media/editors/codemirror/lib/codemirror.js
new file mode 100644
index 00000000..211af64f
--- /dev/null
+++ b/core/media/editors/codemirror/lib/codemirror.js
@@ -0,0 +1,9697 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// This is CodeMirror (http://codemirror.net), a code editor
+// implemented in JavaScript on top of the browser's DOM.
+//
+// You can find some technical background for some of the code below
+// at http://marijnhaverbeke.nl/blog/#cm-internals .
+
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global.CodeMirror = factory());
+}(this, (function () { 'use strict';
+
+// Kludges for bugs and behavior differences that can't be feature
+// detected are enabled based on userAgent etc sniffing.
+var userAgent = navigator.userAgent;
+var platform = navigator.platform;
+
+var gecko = /gecko\/\d/i.test(userAgent);
+var ie_upto10 = /MSIE \d/.test(userAgent);
+var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
+var edge = /Edge\/(\d+)/.exec(userAgent);
+var ie = ie_upto10 || ie_11up || edge;
+var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]);
+var webkit = !edge && /WebKit\//.test(userAgent);
+var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+var chrome = !edge && /Chrome\//.test(userAgent);
+var presto = /Opera\//.test(userAgent);
+var safari = /Apple Computer/.test(navigator.vendor);
+var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+var phantom = /PhantomJS/.test(userAgent);
+
+var ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
+var android = /Android/.test(userAgent);
+// This is woefully incomplete. Suggestions for alternative methods welcome.
+var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+var mac = ios || /Mac/.test(platform);
+var chromeOS = /\bCrOS\b/.test(userAgent);
+var windows = /win/i.test(platform);
+
+var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
+if (presto_version) { presto_version = Number(presto_version[1]); }
+if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
+// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
+var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
+var captureRightClick = gecko || (ie && ie_version >= 9);
+
+function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
+
+var rmClass = function(node, cls) {
+  var current = node.className;
+  var match = classTest(cls).exec(current);
+  if (match) {
+    var after = current.slice(match.index + match[0].length);
+    node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+  }
+};
+
+function removeChildren(e) {
+  for (var count = e.childNodes.length; count > 0; --count)
+    { e.removeChild(e.firstChild); }
+  return e
+}
+
+function removeChildrenAndAdd(parent, e) {
+  return removeChildren(parent).appendChild(e)
+}
+
+function elt(tag, content, className, style) {
+  var e = document.createElement(tag);
+  if (className) { e.className = className; }
+  if (style) { e.style.cssText = style; }
+  if (typeof content == "string") { e.appendChild(document.createTextNode(content)); }
+  else if (content) { for (var i = 0; i < content.length; ++i) { e.appendChild(content[i]); } }
+  return e
+}
+// wrapper for elt, which removes the elt from the accessibility tree
+function eltP(tag, content, className, style) {
+  var e = elt(tag, content, className, style);
+  e.setAttribute("role", "presentation");
+  return e
+}
+
+var range;
+if (document.createRange) { range = function(node, start, end, endNode) {
+  var r = document.createRange();
+  r.setEnd(endNode || node, end);
+  r.setStart(node, start);
+  return r
+}; }
+else { range = function(node, start, end) {
+  var r = document.body.createTextRange();
+  try { r.moveToElementText(node.parentNode); }
+  catch(e) { return r }
+  r.collapse(true);
+  r.moveEnd("character", end);
+  r.moveStart("character", start);
+  return r
+}; }
+
+function contains(parent, child) {
+  if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+    { child = child.parentNode; }
+  if (parent.contains)
+    { return parent.contains(child) }
+  do {
+    if (child.nodeType == 11) { child = child.host; }
+    if (child == parent) { return true }
+  } while (child = child.parentNode)
+}
+
+function activeElt() {
+  // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
+  // IE < 10 will throw when accessed while the page is loading or in an iframe.
+  // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
+  var activeElement;
+  try {
+    activeElement = document.activeElement;
+  } catch(e) {
+    activeElement = document.body || null;
+  }
+  while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
+    { activeElement = activeElement.shadowRoot.activeElement; }
+  return activeElement
+}
+
+function addClass(node, cls) {
+  var current = node.className;
+  if (!classTest(cls).test(current)) { node.className += (current ? " " : "") + cls; }
+}
+function joinClasses(a, b) {
+  var as = a.split(" ");
+  for (var i = 0; i < as.length; i++)
+    { if (as[i] && !classTest(as[i]).test(b)) { b += " " + as[i]; } }
+  return b
+}
+
+var selectInput = function(node) { node.select(); };
+if (ios) // Mobile Safari apparently has a bug where select() is broken.
+  { selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; }; }
+else if (ie) // Suppress mysterious IE10 errors
+  { selectInput = function(node) { try { node.select(); } catch(_e) {} }; }
+
+function bind(f) {
+  var args = Array.prototype.slice.call(arguments, 1);
+  return function(){return f.apply(null, args)}
+}
+
+function copyObj(obj, target, overwrite) {
+  if (!target) { target = {}; }
+  for (var prop in obj)
+    { if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+      { target[prop] = obj[prop]; } }
+  return target
+}
+
+// Counts the column offset in a string, taking tabs into account.
+// Used mostly to find indentation.
+function countColumn(string, end, tabSize, startIndex, startValue) {
+  if (end == null) {
+    end = string.search(/[^\s\u00a0]/);
+    if (end == -1) { end = string.length; }
+  }
+  for (var i = startIndex || 0, n = startValue || 0;;) {
+    var nextTab = string.indexOf("\t", i);
+    if (nextTab < 0 || nextTab >= end)
+      { return n + (end - i) }
+    n += nextTab - i;
+    n += tabSize - (n % tabSize);
+    i = nextTab + 1;
+  }
+}
+
+var Delayed = function() {this.id = null;};
+Delayed.prototype.set = function (ms, f) {
+  clearTimeout(this.id);
+  this.id = setTimeout(f, ms);
+};
+
+function indexOf(array, elt) {
+  for (var i = 0; i < array.length; ++i)
+    { if (array[i] == elt) { return i } }
+  return -1
+}
+
+// Number of pixels added to scroller and sizer to hide scrollbar
+var scrollerGap = 30;
+
+// Returned or thrown by various protocols to signal 'I'm not
+// handling this'.
+var Pass = {toString: function(){return "CodeMirror.Pass"}};
+
+// Reused option objects for setSelection & friends
+var sel_dontScroll = {scroll: false};
+var sel_mouse = {origin: "*mouse"};
+var sel_move = {origin: "+move"};
+
+// The inverse of countColumn -- find the offset that corresponds to
+// a particular column.
+function findColumn(string, goal, tabSize) {
+  for (var pos = 0, col = 0;;) {
+    var nextTab = string.indexOf("\t", pos);
+    if (nextTab == -1) { nextTab = string.length; }
+    var skipped = nextTab - pos;
+    if (nextTab == string.length || col + skipped >= goal)
+      { return pos + Math.min(skipped, goal - col) }
+    col += nextTab - pos;
+    col += tabSize - (col % tabSize);
+    pos = nextTab + 1;
+    if (col >= goal) { return pos }
+  }
+}
+
+var spaceStrs = [""];
+function spaceStr(n) {
+  while (spaceStrs.length <= n)
+    { spaceStrs.push(lst(spaceStrs) + " "); }
+  return spaceStrs[n]
+}
+
+function lst(arr) { return arr[arr.length-1] }
+
+function map(array, f) {
+  var out = [];
+  for (var i = 0; i < array.length; i++) { out[i] = f(array[i], i); }
+  return out
+}
+
+function insertSorted(array, value, score) {
+  var pos = 0, priority = score(value);
+  while (pos < array.length && score(array[pos]) <= priority) { pos++; }
+  array.splice(pos, 0, value);
+}
+
+function nothing() {}
+
+function createObj(base, props) {
+  var inst;
+  if (Object.create) {
+    inst = Object.create(base);
+  } else {
+    nothing.prototype = base;
+    inst = new nothing();
+  }
+  if (props) { copyObj(props, inst); }
+  return inst
+}
+
+var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+function isWordCharBasic(ch) {
+  return /\w/.test(ch) || ch > "\x80" &&
+    (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
+}
+function isWordChar(ch, helper) {
+  if (!helper) { return isWordCharBasic(ch) }
+  if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { return true }
+  return helper.test(ch)
+}
+
+function isEmpty(obj) {
+  for (var n in obj) { if (obj.hasOwnProperty(n) && obj[n]) { return false } }
+  return true
+}
+
+// Extending unicode characters. A series of a non-extending char +
+// any number of extending chars is treated as a single unit as far
+// as editing and measuring is concerned. This is not fully correct,
+// since some scripts/fonts/browsers also treat other configurations
+// of code points as a group.
+var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
+function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
+
+// Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range.
+function skipExtendingChars(str, pos, dir) {
+  while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) { pos += dir; }
+  return pos
+}
+
+// Returns the value from the range [`from`; `to`] that satisfies
+// `pred` and is closest to `from`. Assumes that at least `to`
+// satisfies `pred`. Supports `from` being greater than `to`.
+function findFirst(pred, from, to) {
+  // At any point we are certain `to` satisfies `pred`, don't know
+  // whether `from` does.
+  var dir = from > to ? -1 : 1;
+  for (;;) {
+    if (from == to) { return from }
+    var midF = (from + to) / 2, mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF);
+    if (mid == from) { return pred(mid) ? from : to }
+    if (pred(mid)) { to = mid; }
+    else { from = mid + dir; }
+  }
+}
+
+// The display handles the DOM integration, both for input reading
+// and content drawing. It holds references to DOM nodes and
+// display-related state.
+
+function Display(place, doc, input) {
+  var d = this;
+  this.input = input;
+
+  // Covers bottom-right square when both scrollbars are present.
+  d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+  d.scrollbarFiller.setAttribute("cm-not-content", "true");
+  // Covers bottom of gutter when coverGutterNextToScrollbar is on
+  // and h scrollbar is present.
+  d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
+  d.gutterFiller.setAttribute("cm-not-content", "true");
+  // Will contain the actual code, positioned to cover the viewport.
+  d.lineDiv = eltP("div", null, "CodeMirror-code");
+  // Elements are added to these to represent selection and cursors.
+  d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
+  d.cursorDiv = elt("div", null, "CodeMirror-cursors");
+  // A visibility: hidden element used to find the size of things.
+  d.measure = elt("div", null, "CodeMirror-measure");
+  // When lines outside of the viewport are measured, they are drawn in this.
+  d.lineMeasure = elt("div", null, "CodeMirror-measure");
+  // Wraps everything that needs to exist inside the vertically-padded coordinate system
+  d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
+                    null, "position: relative; outline: none");
+  var lines = eltP("div", [d.lineSpace], "CodeMirror-lines");
+  // Moved around its parent to cover visible view.
+  d.mover = elt("div", [lines], null, "position: relative");
+  // Set to the height of the document, allowing scrolling.
+  d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
+  d.sizerWidth = null;
+  // Behavior of elts with overflow: auto and padding is
+  // inconsistent across browsers. This is used to ensure the
+  // scrollable area is big enough.
+  d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
+  // Will contain the gutters, if any.
+  d.gutters = elt("div", null, "CodeMirror-gutters");
+  d.lineGutter = null;
+  // Actual scrollable element.
+  d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
+  d.scroller.setAttribute("tabIndex", "-1");
+  // The element in which the editor lives.
+  d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+
+  // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
+  if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+  if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true; }
+
+  if (place) {
+    if (place.appendChild) { place.appendChild(d.wrapper); }
+    else { place(d.wrapper); }
+  }
+
+  // Current rendered range (may be bigger than the view window).
+  d.viewFrom = d.viewTo = doc.first;
+  d.reportedViewFrom = d.reportedViewTo = doc.first;
+  // Information about the rendered lines.
+  d.view = [];
+  d.renderedView = null;
+  // Holds info about a single rendered line when it was rendered
+  // for measurement, while not in view.
+  d.externalMeasured = null;
+  // Empty space (in pixels) above the view
+  d.viewOffset = 0;
+  d.lastWrapHeight = d.lastWrapWidth = 0;
+  d.updateLineNumbers = null;
+
+  d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+  d.scrollbarsClipped = false;
+
+  // Used to only resize the line number gutter when necessary (when
+  // the amount of lines crosses a boundary that makes its width change)
+  d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
+  // Set to true when a non-horizontal-scrolling line widget is
+  // added. As an optimization, line widget aligning is skipped when
+  // this is false.
+  d.alignWidgets = false;
+
+  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+
+  // Tracks the maximum line length so that the horizontal scrollbar
+  // can be kept static when scrolling.
+  d.maxLine = null;
+  d.maxLineLength = 0;
+  d.maxLineChanged = false;
+
+  // Used for measuring wheel scrolling granularity
+  d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
+
+  // True when shift is held down.
+  d.shift = false;
+
+  // Used to track whether anything happened since the context menu
+  // was opened.
+  d.selForContextMenu = null;
+
+  d.activeTouch = null;
+
+  input.init(d);
+}
+
+// Find the line object corresponding to the given line number.
+function getLine(doc, n) {
+  n -= doc.first;
+  if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }
+  var chunk = doc;
+  while (!chunk.lines) {
+    for (var i = 0;; ++i) {
+      var child = chunk.children[i], sz = child.chunkSize();
+      if (n < sz) { chunk = child; break }
+      n -= sz;
+    }
+  }
+  return chunk.lines[n]
+}
+
+// Get the part of a document between two positions, as an array of
+// strings.
+function getBetween(doc, start, end) {
+  var out = [], n = start.line;
+  doc.iter(start.line, end.line + 1, function (line) {
+    var text = line.text;
+    if (n == end.line) { text = text.slice(0, end.ch); }
+    if (n == start.line) { text = text.slice(start.ch); }
+    out.push(text);
+    ++n;
+  });
+  return out
+}
+// Get the lines between from and to, as array of strings.
+function getLines(doc, from, to) {
+  var out = [];
+  doc.iter(from, to, function (line) { out.push(line.text); }); // iter aborts when callback returns truthy value
+  return out
+}
+
+// Update the height of a line, propagating the height change
+// upwards to parent nodes.
+function updateLineHeight(line, height) {
+  var diff = height - line.height;
+  if (diff) { for (var n = line; n; n = n.parent) { n.height += diff; } }
+}
+
+// Given a line object, find its line number by walking up through
+// its parent links.
+function lineNo(line) {
+  if (line.parent == null) { return null }
+  var cur = line.parent, no = indexOf(cur.lines, line);
+  for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+    for (var i = 0;; ++i) {
+      if (chunk.children[i] == cur) { break }
+      no += chunk.children[i].chunkSize();
+    }
+  }
+  return no + cur.first
+}
+
+// Find the line at the given vertical position, using the height
+// information in the document tree.
+function lineAtHeight(chunk, h) {
+  var n = chunk.first;
+  outer: do {
+    for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {
+      var child = chunk.children[i$1], ch = child.height;
+      if (h < ch) { chunk = child; continue outer }
+      h -= ch;
+      n += child.chunkSize();
+    }
+    return n
+  } while (!chunk.lines)
+  var i = 0;
+  for (; i < chunk.lines.length; ++i) {
+    var line = chunk.lines[i], lh = line.height;
+    if (h < lh) { break }
+    h -= lh;
+  }
+  return n + i
+}
+
+function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}
+
+function lineNumberFor(options, i) {
+  return String(options.lineNumberFormatter(i + options.firstLineNumber))
+}
+
+// A Pos instance represents a position within the text.
+function Pos(line, ch, sticky) {
+  if ( sticky === void 0 ) sticky = null;
+
+  if (!(this instanceof Pos)) { return new Pos(line, ch, sticky) }
+  this.line = line;
+  this.ch = ch;
+  this.sticky = sticky;
+}
+
+// Compare two positions, return 0 if they are the same, a negative
+// number when a is less, and a positive number otherwise.
+function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
+
+function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }
+
+function copyPos(x) {return Pos(x.line, x.ch)}
+function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
+function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
+
+// Most of the external API clips given positions to make sure they
+// actually exist within the document.
+function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
+function clipPos(doc, pos) {
+  if (pos.line < doc.first) { return Pos(doc.first, 0) }
+  var last = doc.first + doc.size - 1;
+  if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }
+  return clipToLen(pos, getLine(doc, pos.line).text.length)
+}
+function clipToLen(pos, linelen) {
+  var ch = pos.ch;
+  if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }
+  else if (ch < 0) { return Pos(pos.line, 0) }
+  else { return pos }
+}
+function clipPosArray(doc, array) {
+  var out = [];
+  for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]); }
+  return out
+}
+
+// Optimize some code when these features are not used.
+var sawReadOnlySpans = false;
+var sawCollapsedSpans = false;
+
+function seeReadOnlySpans() {
+  sawReadOnlySpans = true;
+}
+
+function seeCollapsedSpans() {
+  sawCollapsedSpans = true;
+}
+
+// TEXTMARKER SPANS
+
+function MarkedSpan(marker, from, to) {
+  this.marker = marker;
+  this.from = from; this.to = to;
+}
+
+// Search an array of spans for a span matching the given marker.
+function getMarkedSpanFor(spans, marker) {
+  if (spans) { for (var i = 0; i < spans.length; ++i) {
+    var span = spans[i];
+    if (span.marker == marker) { return span }
+  } }
+}
+// Remove a span from an array, returning undefined if no spans are
+// left (we don't store arrays for lines without spans).
+function removeMarkedSpan(spans, span) {
+  var r;
+  for (var i = 0; i < spans.length; ++i)
+    { if (spans[i] != span) { (r || (r = [])).push(spans[i]); } }
+  return r
+}
+// Add a span to a line.
+function addMarkedSpan(line, span) {
+  line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
+  span.marker.attachLine(line);
+}
+
+// Used for the algorithm that adjusts markers for a change in the
+// document. These functions cut an array of spans at a given
+// character position, returning an array of remaining chunks (or
+// undefined if nothing remains).
+function markedSpansBefore(old, startCh, isInsert) {
+  var nw;
+  if (old) { for (var i = 0; i < old.length; ++i) {
+    var span = old[i], marker = span.marker;
+    var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
+    if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
+      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
+    }
+  } }
+  return nw
+}
+function markedSpansAfter(old, endCh, isInsert) {
+  var nw;
+  if (old) { for (var i = 0; i < old.length; ++i) {
+    var span = old[i], marker = span.marker;
+    var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
+    if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
+      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
+                                            span.to == null ? null : span.to - endCh));
+    }
+  } }
+  return nw
+}
+
+// Given a change object, compute the new set of marker spans that
+// cover the line in which the change took place. Removes spans
+// entirely within the change, reconnects spans belonging to the
+// same marker that appear on both sides of the change, and cuts off
+// spans partially within the change. Returns an array of span
+// arrays with one element for each line in (after) the change.
+function stretchSpansOverChange(doc, change) {
+  if (change.full) { return null }
+  var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
+  var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
+  if (!oldFirst && !oldLast) { return null }
+
+  var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
+  // Get the spans that 'stick out' on both sides
+  var first = markedSpansBefore(oldFirst, startCh, isInsert);
+  var last = markedSpansAfter(oldLast, endCh, isInsert);
+
+  // Next, merge those two ends
+  var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
+  if (first) {
+    // Fix up .to properties of first
+    for (var i = 0; i < first.length; ++i) {
+      var span = first[i];
+      if (span.to == null) {
+        var found = getMarkedSpanFor(last, span.marker);
+        if (!found) { span.to = startCh; }
+        else if (sameLine) { span.to = found.to == null ? null : found.to + offset; }
+      }
+    }
+  }
+  if (last) {
+    // Fix up .from in last (or move them into first in case of sameLine)
+    for (var i$1 = 0; i$1 < last.length; ++i$1) {
+      var span$1 = last[i$1];
+      if (span$1.to != null) { span$1.to += offset; }
+      if (span$1.from == null) {
+        var found$1 = getMarkedSpanFor(first, span$1.marker);
+        if (!found$1) {
+          span$1.from = offset;
+          if (sameLine) { (first || (first = [])).push(span$1); }
+        }
+      } else {
+        span$1.from += offset;
+        if (sameLine) { (first || (first = [])).push(span$1); }
+      }
+    }
+  }
+  // Make sure we didn't create any zero-length spans
+  if (first) { first = clearEmptySpans(first); }
+  if (last && last != first) { last = clearEmptySpans(last); }
+
+  var newMarkers = [first];
+  if (!sameLine) {
+    // Fill gap with whole-line-spans
+    var gap = change.text.length - 2, gapMarkers;
+    if (gap > 0 && first)
+      { for (var i$2 = 0; i$2 < first.length; ++i$2)
+        { if (first[i$2].to == null)
+          { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); } } }
+    for (var i$3 = 0; i$3 < gap; ++i$3)
+      { newMarkers.push(gapMarkers); }
+    newMarkers.push(last);
+  }
+  return newMarkers
+}
+
+// Remove spans that are empty and don't have a clearWhenEmpty
+// option of false.
+function clearEmptySpans(spans) {
+  for (var i = 0; i < spans.length; ++i) {
+    var span = spans[i];
+    if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
+      { spans.splice(i--, 1); }
+  }
+  if (!spans.length) { return null }
+  return spans
+}
+
+// Used to 'clip' out readOnly ranges when making a change.
+function removeReadOnlyRanges(doc, from, to) {
+  var markers = null;
+  doc.iter(from.line, to.line + 1, function (line) {
+    if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
+      var mark = line.markedSpans[i].marker;
+      if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
+        { (markers || (markers = [])).push(mark); }
+    } }
+  });
+  if (!markers) { return null }
+  var parts = [{from: from, to: to}];
+  for (var i = 0; i < markers.length; ++i) {
+    var mk = markers[i], m = mk.find(0);
+    for (var j = 0; j < parts.length; ++j) {
+      var p = parts[j];
+      if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }
+      var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
+      if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
+        { newParts.push({from: p.from, to: m.from}); }
+      if (dto > 0 || !mk.inclusiveRight && !dto)
+        { newParts.push({from: m.to, to: p.to}); }
+      parts.splice.apply(parts, newParts);
+      j += newParts.length - 3;
+    }
+  }
+  return parts
+}
+
+// Connect or disconnect spans from a line.
+function detachMarkedSpans(line) {
+  var spans = line.markedSpans;
+  if (!spans) { return }
+  for (var i = 0; i < spans.length; ++i)
+    { spans[i].marker.detachLine(line); }
+  line.markedSpans = null;
+}
+function attachMarkedSpans(line, spans) {
+  if (!spans) { return }
+  for (var i = 0; i < spans.length; ++i)
+    { spans[i].marker.attachLine(line); }
+  line.markedSpans = spans;
+}
+
+// Helpers used when computing which overlapping collapsed span
+// counts as the larger one.
+function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }
+function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
+
+// Returns a number indicating which of two overlapping collapsed
+// spans is larger (and thus includes the other). Falls back to
+// comparing ids when the spans cover exactly the same range.
+function compareCollapsedMarkers(a, b) {
+  var lenDiff = a.lines.length - b.lines.length;
+  if (lenDiff != 0) { return lenDiff }
+  var aPos = a.find(), bPos = b.find();
+  var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
+  if (fromCmp) { return -fromCmp }
+  var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
+  if (toCmp) { return toCmp }
+  return b.id - a.id
+}
+
+// Find out whether a line ends or starts in a collapsed span. If
+// so, return the marker for that span.
+function collapsedSpanAtSide(line, start) {
+  var sps = sawCollapsedSpans && line.markedSpans, found;
+  if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
+    sp = sps[i];
+    if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
+        (!found || compareCollapsedMarkers(found, sp.marker) < 0))
+      { found = sp.marker; }
+  } }
+  return found
+}
+function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
+function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
+
+function collapsedSpanAround(line, ch) {
+  var sps = sawCollapsedSpans && line.markedSpans, found;
+  if (sps) { for (var i = 0; i < sps.length; ++i) {
+    var sp = sps[i];
+    if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
+        (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { found = sp.marker; }
+  } }
+  return found
+}
+
+// Test whether there exists a collapsed span that partially
+// overlaps (covers the start or end, but not both) of a new span.
+// Such overlap is not allowed.
+function conflictingCollapsedRange(doc, lineNo$$1, from, to, marker) {
+  var line = getLine(doc, lineNo$$1);
+  var sps = sawCollapsedSpans && line.markedSpans;
+  if (sps) { for (var i = 0; i < sps.length; ++i) {
+    var sp = sps[i];
+    if (!sp.marker.collapsed) { continue }
+    var found = sp.marker.find(0);
+    var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
+    var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
+    if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }
+    if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
+        fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
+      { return true }
+  } }
+}
+
+// A visual line is a line as drawn on the screen. Folding, for
+// example, can cause multiple logical lines to appear on the same
+// visual line. This finds the start of the visual line that the
+// given line is part of (usually that is the line itself).
+function visualLine(line) {
+  var merged;
+  while (merged = collapsedSpanAtStart(line))
+    { line = merged.find(-1, true).line; }
+  return line
+}
+
+function visualLineEnd(line) {
+  var merged;
+  while (merged = collapsedSpanAtEnd(line))
+    { line = merged.find(1, true).line; }
+  return line
+}
+
+// Returns an array of logical lines that continue the visual line
+// started by the argument, or undefined if there are no such lines.
+function visualLineContinued(line) {
+  var merged, lines;
+  while (merged = collapsedSpanAtEnd(line)) {
+    line = merged.find(1, true).line
+    ;(lines || (lines = [])).push(line);
+  }
+  return lines
+}
+
+// Get the line number of the start of the visual line that the
+// given line number is part of.
+function visualLineNo(doc, lineN) {
+  var line = getLine(doc, lineN), vis = visualLine(line);
+  if (line == vis) { return lineN }
+  return lineNo(vis)
+}
+
+// Get the line number of the start of the next visual line after
+// the given line.
+function visualLineEndNo(doc, lineN) {
+  if (lineN > doc.lastLine()) { return lineN }
+  var line = getLine(doc, lineN), merged;
+  if (!lineIsHidden(doc, line)) { return lineN }
+  while (merged = collapsedSpanAtEnd(line))
+    { line = merged.find(1, true).line; }
+  return lineNo(line) + 1
+}
+
+// Compute whether a line is hidden. Lines count as hidden when they
+// are part of a visual line that starts with another line, or when
+// they are entirely covered by collapsed, non-widget span.
+function lineIsHidden(doc, line) {
+  var sps = sawCollapsedSpans && line.markedSpans;
+  if (sps) { for (var sp = (void 0), i = 0; i < sps.length; ++i) {
+    sp = sps[i];
+    if (!sp.marker.collapsed) { continue }
+    if (sp.from == null) { return true }
+    if (sp.marker.widgetNode) { continue }
+    if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
+      { return true }
+  } }
+}
+function lineIsHiddenInner(doc, line, span) {
+  if (span.to == null) {
+    var end = span.marker.find(1, true);
+    return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
+  }
+  if (span.marker.inclusiveRight && span.to == line.text.length)
+    { return true }
+  for (var sp = (void 0), i = 0; i < line.markedSpans.length; ++i) {
+    sp = line.markedSpans[i];
+    if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
+        (sp.to == null || sp.to != span.from) &&
+        (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
+        lineIsHiddenInner(doc, line, sp)) { return true }
+  }
+}
+
+// Find the height above the given line.
+function heightAtLine(lineObj) {
+  lineObj = visualLine(lineObj);
+
+  var h = 0, chunk = lineObj.parent;
+  for (var i = 0; i < chunk.lines.length; ++i) {
+    var line = chunk.lines[i];
+    if (line == lineObj) { break }
+    else { h += line.height; }
+  }
+  for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
+    for (var i$1 = 0; i$1 < p.children.length; ++i$1) {
+      var cur = p.children[i$1];
+      if (cur == chunk) { break }
+      else { h += cur.height; }
+    }
+  }
+  return h
+}
+
+// Compute the character length of a line, taking into account
+// collapsed ranges (see markText) that might hide parts, and join
+// other lines onto it.
+function lineLength(line) {
+  if (line.height == 0) { return 0 }
+  var len = line.text.length, merged, cur = line;
+  while (merged = collapsedSpanAtStart(cur)) {
+    var found = merged.find(0, true);
+    cur = found.from.line;
+    len += found.from.ch - found.to.ch;
+  }
+  cur = line;
+  while (merged = collapsedSpanAtEnd(cur)) {
+    var found$1 = merged.find(0, true);
+    len -= cur.text.length - found$1.from.ch;
+    cur = found$1.to.line;
+    len += cur.text.length - found$1.to.ch;
+  }
+  return len
+}
+
+// Find the longest line in the document.
+function findMaxLine(cm) {
+  var d = cm.display, doc = cm.doc;
+  d.maxLine = getLine(doc, doc.first);
+  d.maxLineLength = lineLength(d.maxLine);
+  d.maxLineChanged = true;
+  doc.iter(function (line) {
+    var len = lineLength(line);
+    if (len > d.maxLineLength) {
+      d.maxLineLength = len;
+      d.maxLine = line;
+    }
+  });
+}
+
+// BIDI HELPERS
+
+function iterateBidiSections(order, from, to, f) {
+  if (!order) { return f(from, to, "ltr", 0) }
+  var found = false;
+  for (var i = 0; i < order.length; ++i) {
+    var part = order[i];
+    if (part.from < to && part.to > from || from == to && part.to == from) {
+      f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i);
+      found = true;
+    }
+  }
+  if (!found) { f(from, to, "ltr"); }
+}
+
+var bidiOther = null;
+function getBidiPartAt(order, ch, sticky) {
+  var found;
+  bidiOther = null;
+  for (var i = 0; i < order.length; ++i) {
+    var cur = order[i];
+    if (cur.from < ch && cur.to > ch) { return i }
+    if (cur.to == ch) {
+      if (cur.from != cur.to && sticky == "before") { found = i; }
+      else { bidiOther = i; }
+    }
+    if (cur.from == ch) {
+      if (cur.from != cur.to && sticky != "before") { found = i; }
+      else { bidiOther = i; }
+    }
+  }
+  return found != null ? found : bidiOther
+}
+
+// Bidirectional ordering algorithm
+// See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
+// that this (partially) implements.
+
+// One-char codes used for character types:
+// L (L):   Left-to-Right
+// R (R):   Right-to-Left
+// r (AL):  Right-to-Left Arabic
+// 1 (EN):  European Number
+// + (ES):  European Number Separator
+// % (ET):  European Number Terminator
+// n (AN):  Arabic Number
+// , (CS):  Common Number Separator
+// m (NSM): Non-Spacing Mark
+// b (BN):  Boundary Neutral
+// s (B):   Paragraph Separator
+// t (S):   Segment Separator
+// w (WS):  Whitespace
+// N (ON):  Other Neutrals
+
+// Returns null if characters are ordered as they appear
+// (left-to-right), or an array of sections ({from, to, level}
+// objects) in the order in which they occur visually.
+var bidiOrdering = (function() {
+  // Character types for codepoints 0 to 0xff
+  var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
+  // Character types for codepoints 0x600 to 0x6f9
+  var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111";
+  function charType(code) {
+    if (code <= 0xf7) { return lowTypes.charAt(code) }
+    else if (0x590 <= code && code <= 0x5f4) { return "R" }
+    else if (0x600 <= code && code <= 0x6f9) { return arabicTypes.charAt(code - 0x600) }
+    else if (0x6ee <= code && code <= 0x8ac) { return "r" }
+    else if (0x2000 <= code && code <= 0x200b) { return "w" }
+    else if (code == 0x200c) { return "b" }
+    else { return "L" }
+  }
+
+  var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
+  var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
+
+  function BidiSpan(level, from, to) {
+    this.level = level;
+    this.from = from; this.to = to;
+  }
+
+  return function(str, direction) {
+    var outerType = direction == "ltr" ? "L" : "R";
+
+    if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { return false }
+    var len = str.length, types = [];
+    for (var i = 0; i < len; ++i)
+      { types.push(charType(str.charCodeAt(i))); }
+
+    // W1. Examine each non-spacing mark (NSM) in the level run, and
+    // change the type of the NSM to the type of the previous
+    // character. If the NSM is at the start of the level run, it will
+    // get the type of sor.
+    for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {
+      var type = types[i$1];
+      if (type == "m") { types[i$1] = prev; }
+      else { prev = type; }
+    }
+
+    // W2. Search backwards from each instance of a European number
+    // until the first strong type (R, L, AL, or sor) is found. If an
+    // AL is found, change the type of the European number to Arabic
+    // number.
+    // W3. Change all ALs to R.
+    for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {
+      var type$1 = types[i$2];
+      if (type$1 == "1" && cur == "r") { types[i$2] = "n"; }
+      else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R"; } }
+    }
+
+    // W4. A single European separator between two European numbers
+    // changes to a European number. A single common separator between
+    // two numbers of the same type changes to that type.
+    for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {
+      var type$2 = types[i$3];
+      if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1"; }
+      else if (type$2 == "," && prev$1 == types[i$3+1] &&
+               (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1; }
+      prev$1 = type$2;
+    }
+
+    // W5. A sequence of European terminators adjacent to European
+    // numbers changes to all European numbers.
+    // W6. Otherwise, separators and terminators change to Other
+    // Neutral.
+    for (var i$4 = 0; i$4 < len; ++i$4) {
+      var type$3 = types[i$4];
+      if (type$3 == ",") { types[i$4] = "N"; }
+      else if (type$3 == "%") {
+        var end = (void 0);
+        for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}
+        var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
+        for (var j = i$4; j < end; ++j) { types[j] = replace; }
+        i$4 = end - 1;
+      }
+    }
+
+    // W7. Search backwards from each instance of a European number
+    // until the first strong type (R, L, or sor) is found. If an L is
+    // found, then change the type of the European number to L.
+    for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {
+      var type$4 = types[i$5];
+      if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L"; }
+      else if (isStrong.test(type$4)) { cur$1 = type$4; }
+    }
+
+    // N1. A sequence of neutrals takes the direction of the
+    // surrounding strong text if the text on both sides has the same
+    // direction. European and Arabic numbers act as if they were R in
+    // terms of their influence on neutrals. Start-of-level-run (sor)
+    // and end-of-level-run (eor) are used at level run boundaries.
+    // N2. Any remaining neutrals take the embedding direction.
+    for (var i$6 = 0; i$6 < len; ++i$6) {
+      if (isNeutral.test(types[i$6])) {
+        var end$1 = (void 0);
+        for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}
+        var before = (i$6 ? types[i$6-1] : outerType) == "L";
+        var after = (end$1 < len ? types[end$1] : outerType) == "L";
+        var replace$1 = before == after ? (before ? "L" : "R") : outerType;
+        for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1; }
+        i$6 = end$1 - 1;
+      }
+    }
+
+    // Here we depart from the documented algorithm, in order to avoid
+    // building up an actual levels array. Since there are only three
+    // levels (0, 1, 2) in an implementation that doesn't take
+    // explicit embedding into account, we can build up the order on
+    // the fly, without following the level-based algorithm.
+    var order = [], m;
+    for (var i$7 = 0; i$7 < len;) {
+      if (countsAsLeft.test(types[i$7])) {
+        var start = i$7;
+        for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}
+        order.push(new BidiSpan(0, start, i$7));
+      } else {
+        var pos = i$7, at = order.length;
+        for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}
+        for (var j$2 = pos; j$2 < i$7;) {
+          if (countsAsNum.test(types[j$2])) {
+            if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)); }
+            var nstart = j$2;
+            for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}
+            order.splice(at, 0, new BidiSpan(2, nstart, j$2));
+            pos = j$2;
+          } else { ++j$2; }
+        }
+        if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)); }
+      }
+    }
+    if (direction == "ltr") {
+      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
+        order[0].from = m[0].length;
+        order.unshift(new BidiSpan(0, 0, m[0].length));
+      }
+      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
+        lst(order).to -= m[0].length;
+        order.push(new BidiSpan(0, len - m[0].length, len));
+      }
+    }
+
+    return direction == "rtl" ? order.reverse() : order
+  }
+})();
+
+// Get the bidi ordering for the given line (and cache it). Returns
+// false for lines that are fully left-to-right, and an array of
+// BidiSpan objects otherwise.
+function getOrder(line, direction) {
+  var order = line.order;
+  if (order == null) { order = line.order = bidiOrdering(line.text, direction); }
+  return order
+}
+
+// EVENT HANDLING
+
+// Lightweight event framework. on/off also work on DOM nodes,
+// registering native DOM handlers.
+
+var noHandlers = [];
+
+var on = function(emitter, type, f) {
+  if (emitter.addEventListener) {
+    emitter.addEventListener(type, f, false);
+  } else if (emitter.attachEvent) {
+    emitter.attachEvent("on" + type, f);
+  } else {
+    var map$$1 = emitter._handlers || (emitter._handlers = {});
+    map$$1[type] = (map$$1[type] || noHandlers).concat(f);
+  }
+};
+
+function getHandlers(emitter, type) {
+  return emitter._handlers && emitter._handlers[type] || noHandlers
+}
+
+function off(emitter, type, f) {
+  if (emitter.removeEventListener) {
+    emitter.removeEventListener(type, f, false);
+  } else if (emitter.detachEvent) {
+    emitter.detachEvent("on" + type, f);
+  } else {
+    var map$$1 = emitter._handlers, arr = map$$1 && map$$1[type];
+    if (arr) {
+      var index = indexOf(arr, f);
+      if (index > -1)
+        { map$$1[type] = arr.slice(0, index).concat(arr.slice(index + 1)); }
+    }
+  }
+}
+
+function signal(emitter, type /*, values...*/) {
+  var handlers = getHandlers(emitter, type);
+  if (!handlers.length) { return }
+  var args = Array.prototype.slice.call(arguments, 2);
+  for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args); }
+}
+
+// The DOM events that CodeMirror handles can be overridden by
+// registering a (non-DOM) handler on the editor for the event name,
+// and preventDefault-ing the event in that handler.
+function signalDOMEvent(cm, e, override) {
+  if (typeof e == "string")
+    { e = {type: e, preventDefault: function() { this.defaultPrevented = true; }}; }
+  signal(cm, override || e.type, cm, e);
+  return e_defaultPrevented(e) || e.codemirrorIgnore
+}
+
+function signalCursorActivity(cm) {
+  var arr = cm._handlers && cm._handlers.cursorActivity;
+  if (!arr) { return }
+  var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
+  for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)
+    { set.push(arr[i]); } }
+}
+
+function hasHandler(emitter, type) {
+  return getHandlers(emitter, type).length > 0
+}
+
+// Add on and off methods to a constructor's prototype, to make
+// registering events on such objects more convenient.
+function eventMixin(ctor) {
+  ctor.prototype.on = function(type, f) {on(this, type, f);};
+  ctor.prototype.off = function(type, f) {off(this, type, f);};
+}
+
+// Due to the fact that we still support jurassic IE versions, some
+// compatibility wrappers are needed.
+
+function e_preventDefault(e) {
+  if (e.preventDefault) { e.preventDefault(); }
+  else { e.returnValue = false; }
+}
+function e_stopPropagation(e) {
+  if (e.stopPropagation) { e.stopPropagation(); }
+  else { e.cancelBubble = true; }
+}
+function e_defaultPrevented(e) {
+  return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false
+}
+function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
+
+function e_target(e) {return e.target || e.srcElement}
+function e_button(e) {
+  var b = e.which;
+  if (b == null) {
+    if (e.button & 1) { b = 1; }
+    else if (e.button & 2) { b = 3; }
+    else if (e.button & 4) { b = 2; }
+  }
+  if (mac && e.ctrlKey && b == 1) { b = 3; }
+  return b
+}
+
+// Detect drag-and-drop
+var dragAndDrop = function() {
+  // There is *some* kind of drag-and-drop support in IE6-8, but I
+  // couldn't get it to work yet.
+  if (ie && ie_version < 9) { return false }
+  var div = elt('div');
+  return "draggable" in div || "dragDrop" in div
+}();
+
+var zwspSupported;
+function zeroWidthElement(measure) {
+  if (zwspSupported == null) {
+    var test = elt("span", "\u200b");
+    removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
+    if (measure.firstChild.offsetHeight != 0)
+      { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); }
+  }
+  var node = zwspSupported ? elt("span", "\u200b") :
+    elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+  node.setAttribute("cm-text", "");
+  return node
+}
+
+// Feature-detect IE's crummy client rect reporting for bidi text
+var badBidiRects;
+function hasBadBidiRects(measure) {
+  if (badBidiRects != null) { return badBidiRects }
+  var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
+  var r0 = range(txt, 0, 1).getBoundingClientRect();
+  var r1 = range(txt, 1, 2).getBoundingClientRect();
+  removeChildren(measure);
+  if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)
+  return badBidiRects = (r1.right - r0.right < 3)
+}
+
+// See if "".split is the broken IE version, if so, provide an
+// alternative way to split lines.
+var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {
+  var pos = 0, result = [], l = string.length;
+  while (pos <= l) {
+    var nl = string.indexOf("\n", pos);
+    if (nl == -1) { nl = string.length; }
+    var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
+    var rt = line.indexOf("\r");
+    if (rt != -1) {
+      result.push(line.slice(0, rt));
+      pos += rt + 1;
+    } else {
+      result.push(line);
+      pos = nl + 1;
+    }
+  }
+  return result
+} : function (string) { return string.split(/\r\n?|\n/); };
+
+var hasSelection = window.getSelection ? function (te) {
+  try { return te.selectionStart != te.selectionEnd }
+  catch(e) { return false }
+} : function (te) {
+  var range$$1;
+  try {range$$1 = te.ownerDocument.selection.createRange();}
+  catch(e) {}
+  if (!range$$1 || range$$1.parentElement() != te) { return false }
+  return range$$1.compareEndPoints("StartToEnd", range$$1) != 0
+};
+
+var hasCopyEvent = (function () {
+  var e = elt("div");
+  if ("oncopy" in e) { return true }
+  e.setAttribute("oncopy", "return;");
+  return typeof e.oncopy == "function"
+})();
+
+var badZoomedRects = null;
+function hasBadZoomedRects(measure) {
+  if (badZoomedRects != null) { return badZoomedRects }
+  var node = removeChildrenAndAdd(measure, elt("span", "x"));
+  var normal = node.getBoundingClientRect();
+  var fromRange = range(node, 0, 1).getBoundingClientRect();
+  return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
+}
+
+// Known modes, by name and by MIME
+var modes = {};
+var mimeModes = {};
+
+// Extra arguments are stored as the mode's dependencies, which is
+// used by (legacy) mechanisms like loadmode.js to automatically
+// load a mode. (Preferred mechanism is the require/define calls.)
+function defineMode(name, mode) {
+  if (arguments.length > 2)
+    { mode.dependencies = Array.prototype.slice.call(arguments, 2); }
+  modes[name] = mode;
+}
+
+function defineMIME(mime, spec) {
+  mimeModes[mime] = spec;
+}
+
+// Given a MIME type, a {name, ...options} config object, or a name
+// string, return a mode config object.
+function resolveMode(spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
+    spec = mimeModes[spec];
+  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    var found = mimeModes[spec.name];
+    if (typeof found == "string") { found = {name: found}; }
+    spec = createObj(found, spec);
+    spec.name = found.name;
+  } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
+    return resolveMode("application/xml")
+  } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
+    return resolveMode("application/json")
+  }
+  if (typeof spec == "string") { return {name: spec} }
+  else { return spec || {name: "null"} }
+}
+
+// Given a mode spec (anything that resolveMode accepts), find and
+// initialize an actual mode object.
+function getMode(options, spec) {
+  spec = resolveMode(spec);
+  var mfactory = modes[spec.name];
+  if (!mfactory) { return getMode(options, "text/plain") }
+  var modeObj = mfactory(options, spec);
+  if (modeExtensions.hasOwnProperty(spec.name)) {
+    var exts = modeExtensions[spec.name];
+    for (var prop in exts) {
+      if (!exts.hasOwnProperty(prop)) { continue }
+      if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop]; }
+      modeObj[prop] = exts[prop];
+    }
+  }
+  modeObj.name = spec.name;
+  if (spec.helperType) { modeObj.helperType = spec.helperType; }
+  if (spec.modeProps) { for (var prop$1 in spec.modeProps)
+    { modeObj[prop$1] = spec.modeProps[prop$1]; } }
+
+  return modeObj
+}
+
+// This can be used to attach properties to mode objects from
+// outside the actual mode definition.
+var modeExtensions = {};
+function extendMode(mode, properties) {
+  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+  copyObj(properties, exts);
+}
+
+function copyState(mode, state) {
+  if (state === true) { return state }
+  if (mode.copyState) { return mode.copyState(state) }
+  var nstate = {};
+  for (var n in state) {
+    var val = state[n];
+    if (val instanceof Array) { val = val.concat([]); }
+    nstate[n] = val;
+  }
+  return nstate
+}
+
+// Given a mode and a state (for that mode), find the inner mode and
+// state at the position that the state refers to.
+function innerMode(mode, state) {
+  var info;
+  while (mode.innerMode) {
+    info = mode.innerMode(state);
+    if (!info || info.mode == mode) { break }
+    state = info.state;
+    mode = info.mode;
+  }
+  return info || {mode: mode, state: state}
+}
+
+function startState(mode, a1, a2) {
+  return mode.startState ? mode.startState(a1, a2) : true
+}
+
+// STRING STREAM
+
+// Fed to the mode parsers, provides helper functions to make
+// parsers more succinct.
+
+var StringStream = function(string, tabSize, lineOracle) {
+  this.pos = this.start = 0;
+  this.string = string;
+  this.tabSize = tabSize || 8;
+  this.lastColumnPos = this.lastColumnValue = 0;
+  this.lineStart = 0;
+  this.lineOracle = lineOracle;
+};
+
+StringStream.prototype.eol = function () {return this.pos >= this.string.length};
+StringStream.prototype.sol = function () {return this.pos == this.lineStart};
+StringStream.prototype.peek = function () {return this.string.charAt(this.pos) || undefined};
+StringStream.prototype.next = function () {
+  if (this.pos < this.string.length)
+    { return this.string.charAt(this.pos++) }
+};
+StringStream.prototype.eat = function (match) {
+  var ch = this.string.charAt(this.pos);
+  var ok;
+  if (typeof match == "string") { ok = ch == match; }
+  else { ok = ch && (match.test ? match.test(ch) : match(ch)); }
+  if (ok) {++this.pos; return ch}
+};
+StringStream.prototype.eatWhile = function (match) {
+  var start = this.pos;
+  while (this.eat(match)){}
+  return this.pos > start
+};
+StringStream.prototype.eatSpace = function () {
+    var this$1 = this;
+
+  var start = this.pos;
+  while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this$1.pos; }
+  return this.pos > start
+};
+StringStream.prototype.skipToEnd = function () {this.pos = this.string.length;};
+StringStream.prototype.skipTo = function (ch) {
+  var found = this.string.indexOf(ch, this.pos);
+  if (found > -1) {this.pos = found; return true}
+};
+StringStream.prototype.backUp = function (n) {this.pos -= n;};
+StringStream.prototype.column = function () {
+  if (this.lastColumnPos < this.start) {
+    this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
+    this.lastColumnPos = this.start;
+  }
+  return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
+};
+StringStream.prototype.indentation = function () {
+  return countColumn(this.string, null, this.tabSize) -
+    (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
+};
+StringStream.prototype.match = function (pattern, consume, caseInsensitive) {
+  if (typeof pattern == "string") {
+    var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; };
+    var substr = this.string.substr(this.pos, pattern.length);
+    if (cased(substr) == cased(pattern)) {
+      if (consume !== false) { this.pos += pattern.length; }
+      return true
+    }
+  } else {
+    var match = this.string.slice(this.pos).match(pattern);
+    if (match && match.index > 0) { return null }
+    if (match && consume !== false) { this.pos += match[0].length; }
+    return match
+  }
+};
+StringStream.prototype.current = function (){return this.string.slice(this.start, this.pos)};
+StringStream.prototype.hideFirstChars = function (n, inner) {
+  this.lineStart += n;
+  try { return inner() }
+  finally { this.lineStart -= n; }
+};
+StringStream.prototype.lookAhead = function (n) {
+  var oracle = this.lineOracle;
+  return oracle && oracle.lookAhead(n)
+};
+StringStream.prototype.baseToken = function () {
+  var oracle = this.lineOracle;
+  return oracle && oracle.baseToken(this.pos)
+};
+
+var SavedContext = function(state, lookAhead) {
+  this.state = state;
+  this.lookAhead = lookAhead;
+};
+
+var Context = function(doc, state, line, lookAhead) {
+  this.state = state;
+  this.doc = doc;
+  this.line = line;
+  this.maxLookAhead = lookAhead || 0;
+  this.baseTokens = null;
+  this.baseTokenPos = 1;
+};
+
+Context.prototype.lookAhead = function (n) {
+  var line = this.doc.getLine(this.line + n);
+  if (line != null && n > this.maxLookAhead) { this.maxLookAhead = n; }
+  return line
+};
+
+Context.prototype.baseToken = function (n) {
+    var this$1 = this;
+
+  if (!this.baseTokens) { return null }
+  while (this.baseTokens[this.baseTokenPos] <= n)
+    { this$1.baseTokenPos += 2; }
+  var type = this.baseTokens[this.baseTokenPos + 1];
+  return {type: type && type.replace(/( |^)overlay .*/, ""),
+          size: this.baseTokens[this.baseTokenPos] - n}
+};
+
+Context.prototype.nextLine = function () {
+  this.line++;
+  if (this.maxLookAhead > 0) { this.maxLookAhead--; }
+};
+
+Context.fromSaved = function (doc, saved, line) {
+  if (saved instanceof SavedContext)
+    { return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead) }
+  else
+    { return new Context(doc, copyState(doc.mode, saved), line) }
+};
+
+Context.prototype.save = function (copy) {
+  var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state;
+  return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
+};
+
+
+// Compute a style array (an array starting with a mode generation
+// -- for invalidation -- followed by pairs of end positions and
+// style strings), which is used to highlight the tokens on the
+// line.
+function highlightLine(cm, line, context, forceToEnd) {
+  // A styles array always starts with a number identifying the
+  // mode/overlays that it is based on (for easy invalidation).
+  var st = [cm.state.modeGen], lineClasses = {};
+  // Compute the base array of styles
+  runMode(cm, line.text, cm.doc.mode, context, function (end, style) { return st.push(end, style); },
+          lineClasses, forceToEnd);
+  var state = context.state;
+
+  // Run overlays, adjust style array.
+  var loop = function ( o ) {
+    context.baseTokens = st;
+    var overlay = cm.state.overlays[o], i = 1, at = 0;
+    context.state = true;
+    runMode(cm, line.text, overlay.mode, context, function (end, style) {
+      var start = i;
+      // Ensure there's a token end at the current position, and that i points at it
+      while (at < end) {
+        var i_end = st[i];
+        if (i_end > end)
+          { st.splice(i, 1, end, st[i+1], i_end); }
+        i += 2;
+        at = Math.min(end, i_end);
+      }
+      if (!style) { return }
+      if (overlay.opaque) {
+        st.splice(start, i - start, end, "overlay " + style);
+        i = start + 2;
+      } else {
+        for (; start < i; start += 2) {
+          var cur = st[start+1];
+          st[start+1] = (cur ? cur + " " : "") + "overlay " + style;
+        }
+      }
+    }, lineClasses);
+    context.state = state;
+    context.baseTokens = null;
+    context.baseTokenPos = 1;
+  };
+
+  for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );
+
+  return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
+}
+
+function getLineStyles(cm, line, updateFrontier) {
+  if (!line.styles || line.styles[0] != cm.state.modeGen) {
+    var context = getContextBefore(cm, lineNo(line));
+    var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state);
+    var result = highlightLine(cm, line, context);
+    if (resetState) { context.state = resetState; }
+    line.stateAfter = context.save(!resetState);
+    line.styles = result.styles;
+    if (result.classes) { line.styleClasses = result.classes; }
+    else if (line.styleClasses) { line.styleClasses = null; }
+    if (updateFrontier === cm.doc.highlightFrontier)
+      { cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); }
+  }
+  return line.styles
+}
+
+function getContextBefore(cm, n, precise) {
+  var doc = cm.doc, display = cm.display;
+  if (!doc.mode.startState) { return new Context(doc, true, n) }
+  var start = findStartLine(cm, n, precise);
+  var saved = start > doc.first && getLine(doc, start - 1).stateAfter;
+  var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start);
+
+  doc.iter(start, n, function (line) {
+    processLine(cm, line.text, context);
+    var pos = context.line;
+    line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null;
+    context.nextLine();
+  });
+  if (precise) { doc.modeFrontier = context.line; }
+  return context
+}
+
+// Lightweight form of highlight -- proceed over this line and
+// update state, but don't save a style array. Used for lines that
+// aren't currently visible.
+function processLine(cm, text, context, startAt) {
+  var mode = cm.doc.mode;
+  var stream = new StringStream(text, cm.options.tabSize, context);
+  stream.start = stream.pos = startAt || 0;
+  if (text == "") { callBlankLine(mode, context.state); }
+  while (!stream.eol()) {
+    readToken(mode, stream, context.state);
+    stream.start = stream.pos;
+  }
+}
+
+function callBlankLine(mode, state) {
+  if (mode.blankLine) { return mode.blankLine(state) }
+  if (!mode.innerMode) { return }
+  var inner = innerMode(mode, state);
+  if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }
+}
+
+function readToken(mode, stream, state, inner) {
+  for (var i = 0; i < 10; i++) {
+    if (inner) { inner[0] = innerMode(mode, state).mode; }
+    var style = mode.token(stream, state);
+    if (stream.pos > stream.start) { return style }
+  }
+  throw new Error("Mode " + mode.name + " failed to advance stream.")
+}
+
+var Token = function(stream, type, state) {
+  this.start = stream.start; this.end = stream.pos;
+  this.string = stream.current();
+  this.type = type || null;
+  this.state = state;
+};
+
+// Utility for getTokenAt and getLineTokens
+function takeToken(cm, pos, precise, asArray) {
+  var doc = cm.doc, mode = doc.mode, style;
+  pos = clipPos(doc, pos);
+  var line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise);
+  var stream = new StringStream(line.text, cm.options.tabSize, context), tokens;
+  if (asArray) { tokens = []; }
+  while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
+    stream.start = stream.pos;
+    style = readToken(mode, stream, context.state);
+    if (asArray) { tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); }
+  }
+  return asArray ? tokens : new Token(stream, style, context.state)
+}
+
+function extractLineClasses(type, output) {
+  if (type) { for (;;) {
+    var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
+    if (!lineClass) { break }
+    type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
+    var prop = lineClass[1] ? "bgClass" : "textClass";
+    if (output[prop] == null)
+      { output[prop] = lineClass[2]; }
+    else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+      { output[prop] += " " + lineClass[2]; }
+  } }
+  return type
+}
+
+// Run the given mode's parser over a line, calling f for each token.
+function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {
+  var flattenSpans = mode.flattenSpans;
+  if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans; }
+  var curStart = 0, curStyle = null;
+  var stream = new StringStream(text, cm.options.tabSize, context), style;
+  var inner = cm.options.addModeClass && [null];
+  if (text == "") { extractLineClasses(callBlankLine(mode, context.state), lineClasses); }
+  while (!stream.eol()) {
+    if (stream.pos > cm.options.maxHighlightLength) {
+      flattenSpans = false;
+      if (forceToEnd) { processLine(cm, text, context, stream.pos); }
+      stream.pos = text.length;
+      style = null;
+    } else {
+      style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses);
+    }
+    if (inner) {
+      var mName = inner[0].name;
+      if (mName) { style = "m-" + (style ? mName + " " + style : mName); }
+    }
+    if (!flattenSpans || curStyle != style) {
+      while (curStart < stream.start) {
+        curStart = Math.min(stream.start, curStart + 5000);
+        f(curStart, curStyle);
+      }
+      curStyle = style;
+    }
+    stream.start = stream.pos;
+  }
+  while (curStart < stream.pos) {
+    // Webkit seems to refuse to render text nodes longer than 57444
+    // characters, and returns inaccurate measurements in nodes
+    // starting around 5000 chars.
+    var pos = Math.min(stream.pos, curStart + 5000);
+    f(pos, curStyle);
+    curStart = pos;
+  }
+}
+
+// Finds the line to start with when starting a parse. Tries to
+// find a line with a stateAfter, so that it can start with a
+// valid state. If that fails, it returns the line with the
+// smallest indentation, which tends to need the least context to
+// parse correctly.
+function findStartLine(cm, n, precise) {
+  var minindent, minline, doc = cm.doc;
+  var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+  for (var search = n; search > lim; --search) {
+    if (search <= doc.first) { return doc.first }
+    var line = getLine(doc, search - 1), after = line.stateAfter;
+    if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))
+      { return search }
+    var indented = countColumn(line.text, null, cm.options.tabSize);
+    if (minline == null || minindent > indented) {
+      minline = search - 1;
+      minindent = indented;
+    }
+  }
+  return minline
+}
+
+function retreatFrontier(doc, n) {
+  doc.modeFrontier = Math.min(doc.modeFrontier, n);
+  if (doc.highlightFrontier < n - 10) { return }
+  var start = doc.first;
+  for (var line = n - 1; line > start; line--) {
+    var saved = getLine(doc, line).stateAfter;
+    // change is on 3
+    // state on line 1 looked ahead 2 -- so saw 3
+    // test 1 + 2 < 3 should cover this
+    if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {
+      start = line + 1;
+      break
+    }
+  }
+  doc.highlightFrontier = Math.min(doc.highlightFrontier, start);
+}
+
+// LINE DATA STRUCTURE
+
+// Line objects. These hold state related to a line, including
+// highlighting info (the styles array).
+var Line = function(text, markedSpans, estimateHeight) {
+  this.text = text;
+  attachMarkedSpans(this, markedSpans);
+  this.height = estimateHeight ? estimateHeight(this) : 1;
+};
+
+Line.prototype.lineNo = function () { return lineNo(this) };
+eventMixin(Line);
+
+// Change the content (text, markers) of a line. Automatically
+// invalidates cached information and tries to re-estimate the
+// line's height.
+function updateLine(line, text, markedSpans, estimateHeight) {
+  line.text = text;
+  if (line.stateAfter) { line.stateAfter = null; }
+  if (line.styles) { line.styles = null; }
+  if (line.order != null) { line.order = null; }
+  detachMarkedSpans(line);
+  attachMarkedSpans(line, markedSpans);
+  var estHeight = estimateHeight ? estimateHeight(line) : 1;
+  if (estHeight != line.height) { updateLineHeight(line, estHeight); }
+}
+
+// Detach a line from the document tree and its markers.
+function cleanUpLine(line) {
+  line.parent = null;
+  detachMarkedSpans(line);
+}
+
+// Convert a style as returned by a mode (either null, or a string
+// containing one or more styles) to a CSS style. This is cached,
+// and also looks for line-wide styles.
+var styleToClassCache = {};
+var styleToClassCacheWithMode = {};
+function interpretTokenStyle(style, options) {
+  if (!style || /^\s*$/.test(style)) { return null }
+  var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+  return cache[style] ||
+    (cache[style] = style.replace(/\S+/g, "cm-$&"))
+}
+
+// Render the DOM representation of the text of a line. Also builds
+// up a 'line map', which points at the DOM nodes that represent
+// specific stretches of text, and is used by the measuring code.
+// The returned object contains the DOM node, this map, and
+// information about line-wide styles that were set by the mode.
+function buildLineContent(cm, lineView) {
+  // The padding-right forces the element to have a 'border', which
+  // is needed on Webkit to be able to get line-level bounding
+  // rectangles for it (in measureChar).
+  var content = eltP("span", null, null, webkit ? "padding-right: .1px" : null);
+  var builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
+                 col: 0, pos: 0, cm: cm,
+                 trailingSpace: false,
+                 splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
+  lineView.measure = {};
+
+  // Iterate over the logical lines that make up this visual line.
+  for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
+    var line = i ? lineView.rest[i - 1] : lineView.line, order = (void 0);
+    builder.pos = 0;
+    builder.addToken = buildToken;
+    // Optionally wire in some hacks into the token-rendering
+    // algorithm, to deal with browser quirks.
+    if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
+      { builder.addToken = buildTokenBadBidi(builder.addToken, order); }
+    builder.map = [];
+    var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+    insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
+    if (line.styleClasses) {
+      if (line.styleClasses.bgClass)
+        { builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); }
+      if (line.styleClasses.textClass)
+        { builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); }
+    }
+
+    // Ensure at least a single node is present, for measuring.
+    if (builder.map.length == 0)
+      { builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); }
+
+    // Store the map and a cache object for the current logical line
+    if (i == 0) {
+      lineView.measure.map = builder.map;
+      lineView.measure.cache = {};
+    } else {
+      (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
+      ;(lineView.measure.caches || (lineView.measure.caches = [])).push({});
+    }
+  }
+
+  // See issue #2901
+  if (webkit) {
+    var last = builder.content.lastChild;
+    if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
+      { builder.content.className = "cm-tab-wrap-hack"; }
+  }
+
+  signal(cm, "renderLine", cm, lineView.line, builder.pre);
+  if (builder.pre.className)
+    { builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); }
+
+  return builder
+}
+
+function defaultSpecialCharPlaceholder(ch) {
+  var token = elt("span", "\u2022", "cm-invalidchar");
+  token.title = "\\u" + ch.charCodeAt(0).toString(16);
+  token.setAttribute("aria-label", token.title);
+  return token
+}
+
+// Build up the DOM representation for a single token, and add it to
+// the line map. Takes care to render special characters separately.
+function buildToken(builder, text, style, startStyle, endStyle, title, css) {
+  if (!text) { return }
+  var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text;
+  var special = builder.cm.state.specialChars, mustWrap = false;
+  var content;
+  if (!special.test(text)) {
+    builder.col += text.length;
+    content = document.createTextNode(displayText);
+    builder.map.push(builder.pos, builder.pos + text.length, content);
+    if (ie && ie_version < 9) { mustWrap = true; }
+    builder.pos += text.length;
+  } else {
+    content = document.createDocumentFragment();
+    var pos = 0;
+    while (true) {
+      special.lastIndex = pos;
+      var m = special.exec(text);
+      var skipped = m ? m.index - pos : text.length - pos;
+      if (skipped) {
+        var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
+        if (ie && ie_version < 9) { content.appendChild(elt("span", [txt])); }
+        else { content.appendChild(txt); }
+        builder.map.push(builder.pos, builder.pos + skipped, txt);
+        builder.col += skipped;
+        builder.pos += skipped;
+      }
+      if (!m) { break }
+      pos += skipped + 1;
+      var txt$1 = (void 0);
+      if (m[0] == "\t") {
+        var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
+        txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+        txt$1.setAttribute("role", "presentation");
+        txt$1.setAttribute("cm-text", "\t");
+        builder.col += tabWidth;
+      } else if (m[0] == "\r" || m[0] == "\n") {
+        txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
+        txt$1.setAttribute("cm-text", m[0]);
+        builder.col += 1;
+      } else {
+        txt$1 = builder.cm.options.specialCharPlaceholder(m[0]);
+        txt$1.setAttribute("cm-text", m[0]);
+        if (ie && ie_version < 9) { content.appendChild(elt("span", [txt$1])); }
+        else { content.appendChild(txt$1); }
+        builder.col += 1;
+      }
+      builder.map.push(builder.pos, builder.pos + 1, txt$1);
+      builder.pos++;
+    }
+  }
+  builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32;
+  if (style || startStyle || endStyle || mustWrap || css) {
+    var fullStyle = style || "";
+    if (startStyle) { fullStyle += startStyle; }
+    if (endStyle) { fullStyle += endStyle; }
+    var token = elt("span", [content], fullStyle, css);
+    if (title) { token.title = title; }
+    return builder.content.appendChild(token)
+  }
+  builder.content.appendChild(content);
+}
+
+function splitSpaces(text, trailingBefore) {
+  if (text.length > 1 && !/  /.test(text)) { return text }
+  var spaceBefore = trailingBefore, result = "";
+  for (var i = 0; i < text.length; i++) {
+    var ch = text.charAt(i);
+    if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
+      { ch = "\u00a0"; }
+    result += ch;
+    spaceBefore = ch == " ";
+  }
+  return result
+}
+
+// Work around nonsense dimensions being reported for stretches of
+// right-to-left text.
+function buildTokenBadBidi(inner, order) {
+  return function (builder, text, style, startStyle, endStyle, title, css) {
+    style = style ? style + " cm-force-border" : "cm-force-border";
+    var start = builder.pos, end = start + text.length;
+    for (;;) {
+      // Find the part that overlaps with the start of this text
+      var part = (void 0);
+      for (var i = 0; i < order.length; i++) {
+        part = order[i];
+        if (part.to > start && part.from <= start) { break }
+      }
+      if (part.to >= end) { return inner(builder, text, style, startStyle, endStyle, title, css) }
+      inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
+      startStyle = null;
+      text = text.slice(part.to - start);
+      start = part.to;
+    }
+  }
+}
+
+function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
+  var widget = !ignoreWidget && marker.widgetNode;
+  if (widget) { builder.map.push(builder.pos, builder.pos + size, widget); }
+  if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+    if (!widget)
+      { widget = builder.content.appendChild(document.createElement("span")); }
+    widget.setAttribute("cm-marker", marker.id);
+  }
+  if (widget) {
+    builder.cm.display.input.setUneditable(widget);
+    builder.content.appendChild(widget);
+  }
+  builder.pos += size;
+  builder.trailingSpace = false;
+}
+
+// Outputs a number of spans to make up a line, taking highlighting
+// and marked text into account.
+function insertLineContent(line, builder, styles) {
+  var spans = line.markedSpans, allText = line.text, at = 0;
+  if (!spans) {
+    for (var i$1 = 1; i$1 < styles.length; i$1+=2)
+      { builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1+1], builder.cm.options)); }
+    return
+  }
+
+  var len = allText.length, pos = 0, i = 1, text = "", style, css;
+  var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
+  for (;;) {
+    if (nextChange == pos) { // Update current marker set
+      spanStyle = spanEndStyle = spanStartStyle = title = css = "";
+      collapsed = null; nextChange = Infinity;
+      var foundBookmarks = [], endStyles = (void 0);
+      for (var j = 0; j < spans.length; ++j) {
+        var sp = spans[j], m = sp.marker;
+        if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
+          foundBookmarks.push(m);
+        } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
+          if (sp.to != null && sp.to != pos && nextChange > sp.to) {
+            nextChange = sp.to;
+            spanEndStyle = "";
+          }
+          if (m.className) { spanStyle += " " + m.className; }
+          if (m.css) { css = (css ? css + ";" : "") + m.css; }
+          if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; }
+          if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); }
+          if (m.title && !title) { title = m.title; }
+          if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
+            { collapsed = sp; }
+        } else if (sp.from > pos && nextChange > sp.from) {
+          nextChange = sp.from;
+        }
+      }
+      if (endStyles) { for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2)
+        { if (endStyles[j$1 + 1] == nextChange) { spanEndStyle += " " + endStyles[j$1]; } } }
+
+      if (!collapsed || collapsed.from == pos) { for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2)
+        { buildCollapsedSpan(builder, 0, foundBookmarks[j$2]); } }
+      if (collapsed && (collapsed.from || 0) == pos) {
+        buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
+                           collapsed.marker, collapsed.from == null);
+        if (collapsed.to == null) { return }
+        if (collapsed.to == pos) { collapsed = false; }
+      }
+    }
+    if (pos >= len) { break }
+
+    var upto = Math.min(len, nextChange);
+    while (true) {
+      if (text) {
+        var end = pos + text.length;
+        if (!collapsed) {
+          var tokenText = end > upto ? text.slice(0, upto - pos) : text;
+          builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
+                           spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
+        }
+        if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
+        pos = end;
+        spanStartStyle = "";
+      }
+      text = allText.slice(at, at = styles[i++]);
+      style = interpretTokenStyle(styles[i++], builder.cm.options);
+    }
+  }
+}
+
+
+// These objects are used to represent the visible (currently drawn)
+// part of the document. A LineView may correspond to multiple
+// logical lines, if those are connected by collapsed ranges.
+function LineView(doc, line, lineN) {
+  // The starting line
+  this.line = line;
+  // Continuing lines, if any
+  this.rest = visualLineContinued(line);
+  // Number of logical lines in this visual line
+  this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
+  this.node = this.text = null;
+  this.hidden = lineIsHidden(doc, line);
+}
+
+// Create a range of LineView objects for the given lines.
+function buildViewArray(cm, from, to) {
+  var array = [], nextPos;
+  for (var pos = from; pos < to; pos = nextPos) {
+    var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
+    nextPos = pos + view.size;
+    array.push(view);
+  }
+  return array
+}
+
+var operationGroup = null;
+
+function pushOperation(op) {
+  if (operationGroup) {
+    operationGroup.ops.push(op);
+  } else {
+    op.ownsGroup = operationGroup = {
+      ops: [op],
+      delayedCallbacks: []
+    };
+  }
+}
+
+function fireCallbacksForOps(group) {
+  // Calls delayed callbacks and cursorActivity handlers until no
+  // new ones appear
+  var callbacks = group.delayedCallbacks, i = 0;
+  do {
+    for (; i < callbacks.length; i++)
+      { callbacks[i].call(null); }
+    for (var j = 0; j < group.ops.length; j++) {
+      var op = group.ops[j];
+      if (op.cursorActivityHandlers)
+        { while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+          { op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); } }
+    }
+  } while (i < callbacks.length)
+}
+
+function finishOperation(op, endCb) {
+  var group = op.ownsGroup;
+  if (!group) { return }
+
+  try { fireCallbacksForOps(group); }
+  finally {
+    operationGroup = null;
+    endCb(group);
+  }
+}
+
+var orphanDelayedCallbacks = null;
+
+// Often, we want to signal events at a point where we are in the
+// middle of some work, but don't want the handler to start calling
+// other methods on the editor, which might be in an inconsistent
+// state or simply not expect any other events to happen.
+// signalLater looks whether there are any handlers, and schedules
+// them to be executed when the last operation ends, or, if no
+// operation is active, when a timeout fires.
+function signalLater(emitter, type /*, values...*/) {
+  var arr = getHandlers(emitter, type);
+  if (!arr.length) { return }
+  var args = Array.prototype.slice.call(arguments, 2), list;
+  if (operationGroup) {
+    list = operationGroup.delayedCallbacks;
+  } else if (orphanDelayedCallbacks) {
+    list = orphanDelayedCallbacks;
+  } else {
+    list = orphanDelayedCallbacks = [];
+    setTimeout(fireOrphanDelayed, 0);
+  }
+  var loop = function ( i ) {
+    list.push(function () { return arr[i].apply(null, args); });
+  };
+
+  for (var i = 0; i < arr.length; ++i)
+    loop( i );
+}
+
+function fireOrphanDelayed() {
+  var delayed = orphanDelayedCallbacks;
+  orphanDelayedCallbacks = null;
+  for (var i = 0; i < delayed.length; ++i) { delayed[i](); }
+}
+
+// When an aspect of a line changes, a string is added to
+// lineView.changes. This updates the relevant part of the line's
+// DOM structure.
+function updateLineForChanges(cm, lineView, lineN, dims) {
+  for (var j = 0; j < lineView.changes.length; j++) {
+    var type = lineView.changes[j];
+    if (type == "text") { updateLineText(cm, lineView); }
+    else if (type == "gutter") { updateLineGutter(cm, lineView, lineN, dims); }
+    else if (type == "class") { updateLineClasses(cm, lineView); }
+    else if (type == "widget") { updateLineWidgets(cm, lineView, dims); }
+  }
+  lineView.changes = null;
+}
+
+// Lines with gutter elements, widgets or a background class need to
+// be wrapped, and have the extra elements added to the wrapper div
+function ensureLineWrapped(lineView) {
+  if (lineView.node == lineView.text) {
+    lineView.node = elt("div", null, null, "position: relative");
+    if (lineView.text.parentNode)
+      { lineView.text.parentNode.replaceChild(lineView.node, lineView.text); }
+    lineView.node.appendChild(lineView.text);
+    if (ie && ie_version < 8) { lineView.node.style.zIndex = 2; }
+  }
+  return lineView.node
+}
+
+function updateLineBackground(cm, lineView) {
+  var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
+  if (cls) { cls += " CodeMirror-linebackground"; }
+  if (lineView.background) {
+    if (cls) { lineView.background.className = cls; }
+    else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
+  } else if (cls) {
+    var wrap = ensureLineWrapped(lineView);
+    lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
+    cm.display.input.setUneditable(lineView.background);
+  }
+}
+
+// Wrapper around buildLineContent which will reuse the structure
+// in display.externalMeasured when possible.
+function getLineContent(cm, lineView) {
+  var ext = cm.display.externalMeasured;
+  if (ext && ext.line == lineView.line) {
+    cm.display.externalMeasured = null;
+    lineView.measure = ext.measure;
+    return ext.built
+  }
+  return buildLineContent(cm, lineView)
+}
+
+// Redraw the line's text. Interacts with the background and text
+// classes because the mode may output tokens that influence these
+// classes.
+function updateLineText(cm, lineView) {
+  var cls = lineView.text.className;
+  var built = getLineContent(cm, lineView);
+  if (lineView.text == lineView.node) { lineView.node = built.pre; }
+  lineView.text.parentNode.replaceChild(built.pre, lineView.text);
+  lineView.text = built.pre;
+  if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
+    lineView.bgClass = built.bgClass;
+    lineView.textClass = built.textClass;
+    updateLineClasses(cm, lineView);
+  } else if (cls) {
+    lineView.text.className = cls;
+  }
+}
+
+function updateLineClasses(cm, lineView) {
+  updateLineBackground(cm, lineView);
+  if (lineView.line.wrapClass)
+    { ensureLineWrapped(lineView).className = lineView.line.wrapClass; }
+  else if (lineView.node != lineView.text)
+    { lineView.node.className = ""; }
+  var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
+  lineView.text.className = textClass || "";
+}
+
+function updateLineGutter(cm, lineView, lineN, dims) {
+  if (lineView.gutter) {
+    lineView.node.removeChild(lineView.gutter);
+    lineView.gutter = null;
+  }
+  if (lineView.gutterBackground) {
+    lineView.node.removeChild(lineView.gutterBackground);
+    lineView.gutterBackground = null;
+  }
+  if (lineView.line.gutterClass) {
+    var wrap = ensureLineWrapped(lineView);
+    lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                    ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + (dims.gutterTotalWidth) + "px"));
+    cm.display.input.setUneditable(lineView.gutterBackground);
+    wrap.insertBefore(lineView.gutterBackground, lineView.text);
+  }
+  var markers = lineView.line.gutterMarkers;
+  if (cm.options.lineNumbers || markers) {
+    var wrap$1 = ensureLineWrapped(lineView);
+    var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"));
+    cm.display.input.setUneditable(gutterWrap);
+    wrap$1.insertBefore(gutterWrap, lineView.text);
+    if (lineView.line.gutterClass)
+      { gutterWrap.className += " " + lineView.line.gutterClass; }
+    if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
+      { lineView.lineNumber = gutterWrap.appendChild(
+        elt("div", lineNumberFor(cm.options, lineN),
+            "CodeMirror-linenumber CodeMirror-gutter-elt",
+            ("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))); }
+    if (markers) { for (var k = 0; k < cm.options.gutters.length; ++k) {
+      var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
+      if (found)
+        { gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
+                                   ("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))); }
+    } }
+  }
+}
+
+function updateLineWidgets(cm, lineView, dims) {
+  if (lineView.alignable) { lineView.alignable = null; }
+  for (var node = lineView.node.firstChild, next = (void 0); node; node = next) {
+    next = node.nextSibling;
+    if (node.className == "CodeMirror-linewidget")
+      { lineView.node.removeChild(node); }
+  }
+  insertLineWidgets(cm, lineView, dims);
+}
+
+// Build a line's DOM representation from scratch
+function buildLineElement(cm, lineView, lineN, dims) {
+  var built = getLineContent(cm, lineView);
+  lineView.text = lineView.node = built.pre;
+  if (built.bgClass) { lineView.bgClass = built.bgClass; }
+  if (built.textClass) { lineView.textClass = built.textClass; }
+
+  updateLineClasses(cm, lineView);
+  updateLineGutter(cm, lineView, lineN, dims);
+  insertLineWidgets(cm, lineView, dims);
+  return lineView.node
+}
+
+// A lineView may contain multiple logical lines (when merged by
+// collapsed spans). The widgets for all of them need to be drawn.
+function insertLineWidgets(cm, lineView, dims) {
+  insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
+  if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
+    { insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false); } }
+}
+
+function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
+  if (!line.widgets) { return }
+  var wrap = ensureLineWrapped(lineView);
+  for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
+    var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
+    if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true"); }
+    positionLineWidget(widget, node, lineView, dims);
+    cm.display.input.setUneditable(node);
+    if (allowAbove && widget.above)
+      { wrap.insertBefore(node, lineView.gutter || lineView.text); }
+    else
+      { wrap.appendChild(node); }
+    signalLater(widget, "redraw");
+  }
+}
+
+function positionLineWidget(widget, node, lineView, dims) {
+  if (widget.noHScroll) {
+    (lineView.alignable || (lineView.alignable = [])).push(node);
+    var width = dims.wrapperWidth;
+    node.style.left = dims.fixedPos + "px";
+    if (!widget.coverGutter) {
+      width -= dims.gutterTotalWidth;
+      node.style.paddingLeft = dims.gutterTotalWidth + "px";
+    }
+    node.style.width = width + "px";
+  }
+  if (widget.coverGutter) {
+    node.style.zIndex = 5;
+    node.style.position = "relative";
+    if (!widget.noHScroll) { node.style.marginLeft = -dims.gutterTotalWidth + "px"; }
+  }
+}
+
+function widgetHeight(widget) {
+  if (widget.height != null) { return widget.height }
+  var cm = widget.doc.cm;
+  if (!cm) { return 0 }
+  if (!contains(document.body, widget.node)) {
+    var parentStyle = "position: relative;";
+    if (widget.coverGutter)
+      { parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; }
+    if (widget.noHScroll)
+      { parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; }
+    removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+  }
+  return widget.height = widget.node.parentNode.offsetHeight
+}
+
+// Return true when the given mouse event happened in a widget
+function eventInWidget(display, e) {
+  for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
+    if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+        (n.parentNode == display.sizer && n != display.mover))
+      { return true }
+  }
+}
+
+// POSITION MEASUREMENT
+
+function paddingTop(display) {return display.lineSpace.offsetTop}
+function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
+function paddingH(display) {
+  if (display.cachedPaddingH) { return display.cachedPaddingH }
+  var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
+  var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
+  var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
+  if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data; }
+  return data
+}
+
+function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth }
+function displayWidth(cm) {
+  return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth
+}
+function displayHeight(cm) {
+  return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight
+}
+
+// Ensure the lineView.wrapping.heights array is populated. This is
+// an array of bottom offsets for the lines that make up a drawn
+// line. When lineWrapping is on, there might be more than one
+// height.
+function ensureLineHeights(cm, lineView, rect) {
+  var wrapping = cm.options.lineWrapping;
+  var curWidth = wrapping && displayWidth(cm);
+  if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
+    var heights = lineView.measure.heights = [];
+    if (wrapping) {
+      lineView.measure.width = curWidth;
+      var rects = lineView.text.firstChild.getClientRects();
+      for (var i = 0; i < rects.length - 1; i++) {
+        var cur = rects[i], next = rects[i + 1];
+        if (Math.abs(cur.bottom - next.bottom) > 2)
+          { heights.push((cur.bottom + next.top) / 2 - rect.top); }
+      }
+    }
+    heights.push(rect.bottom - rect.top);
+  }
+}
+
+// Find a line map (mapping character offsets to text nodes) and a
+// measurement cache for the given line number. (A line view might
+// contain multiple lines when collapsed ranges are present.)
+function mapFromLineView(lineView, line, lineN) {
+  if (lineView.line == line)
+    { return {map: lineView.measure.map, cache: lineView.measure.cache} }
+  for (var i = 0; i < lineView.rest.length; i++)
+    { if (lineView.rest[i] == line)
+      { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }
+  for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)
+    { if (lineNo(lineView.rest[i$1]) > lineN)
+      { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }
+}
+
+// Render a line into the hidden node display.externalMeasured. Used
+// when measurement is needed for a line that's not in the viewport.
+function updateExternalMeasurement(cm, line) {
+  line = visualLine(line);
+  var lineN = lineNo(line);
+  var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
+  view.lineN = lineN;
+  var built = view.built = buildLineContent(cm, view);
+  view.text = built.pre;
+  removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
+  return view
+}
+
+// Get a {top, bottom, left, right} box (in line-local coordinates)
+// for a given character.
+function measureChar(cm, line, ch, bias) {
+  return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
+}
+
+// Find a line view that corresponds to the given line number.
+function findViewForLine(cm, lineN) {
+  if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
+    { return cm.display.view[findViewIndex(cm, lineN)] }
+  var ext = cm.display.externalMeasured;
+  if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
+    { return ext }
+}
+
+// Measurement can be split in two steps, the set-up work that
+// applies to the whole line, and the measurement of the actual
+// character. Functions like coordsChar, that need to do a lot of
+// measurements in a row, can thus ensure that the set-up work is
+// only done once.
+function prepareMeasureForLine(cm, line) {
+  var lineN = lineNo(line);
+  var view = findViewForLine(cm, lineN);
+  if (view && !view.text) {
+    view = null;
+  } else if (view && view.changes) {
+    updateLineForChanges(cm, view, lineN, getDimensions(cm));
+    cm.curOp.forceUpdate = true;
+  }
+  if (!view)
+    { view = updateExternalMeasurement(cm, line); }
+
+  var info = mapFromLineView(view, line, lineN);
+  return {
+    line: line, view: view, rect: null,
+    map: info.map, cache: info.cache, before: info.before,
+    hasHeights: false
+  }
+}
+
+// Given a prepared measurement object, measures the position of an
+// actual character (or fetches it from the cache).
+function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
+  if (prepared.before) { ch = -1; }
+  var key = ch + (bias || ""), found;
+  if (prepared.cache.hasOwnProperty(key)) {
+    found = prepared.cache[key];
+  } else {
+    if (!prepared.rect)
+      { prepared.rect = prepared.view.text.getBoundingClientRect(); }
+    if (!prepared.hasHeights) {
+      ensureLineHeights(cm, prepared.view, prepared.rect);
+      prepared.hasHeights = true;
+    }
+    found = measureCharInner(cm, prepared, ch, bias);
+    if (!found.bogus) { prepared.cache[key] = found; }
+  }
+  return {left: found.left, right: found.right,
+          top: varHeight ? found.rtop : found.top,
+          bottom: varHeight ? found.rbottom : found.bottom}
+}
+
+var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
+
+function nodeAndOffsetInLineMap(map$$1, ch, bias) {
+  var node, start, end, collapse, mStart, mEnd;
+  // First, search the line map for the text node corresponding to,
+  // or closest to, the target character.
+  for (var i = 0; i < map$$1.length; i += 3) {
+    mStart = map$$1[i];
+    mEnd = map$$1[i + 1];
+    if (ch < mStart) {
+      start = 0; end = 1;
+      collapse = "left";
+    } else if (ch < mEnd) {
+      start = ch - mStart;
+      end = start + 1;
+    } else if (i == map$$1.length - 3 || ch == mEnd && map$$1[i + 3] > ch) {
+      end = mEnd - mStart;
+      start = end - 1;
+      if (ch >= mEnd) { collapse = "right"; }
+    }
+    if (start != null) {
+      node = map$$1[i + 2];
+      if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
+        { collapse = bias; }
+      if (bias == "left" && start == 0)
+        { while (i && map$$1[i - 2] == map$$1[i - 3] && map$$1[i - 1].insertLeft) {
+          node = map$$1[(i -= 3) + 2];
+          collapse = "left";
+        } }
+      if (bias == "right" && start == mEnd - mStart)
+        { while (i < map$$1.length - 3 && map$$1[i + 3] == map$$1[i + 4] && !map$$1[i + 5].insertLeft) {
+          node = map$$1[(i += 3) + 2];
+          collapse = "right";
+        } }
+      break
+    }
+  }
+  return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}
+}
+
+function getUsefulRect(rects, bias) {
+  var rect = nullRect;
+  if (bias == "left") { for (var i = 0; i < rects.length; i++) {
+    if ((rect = rects[i]).left != rect.right) { break }
+  } } else { for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) {
+    if ((rect = rects[i$1]).left != rect.right) { break }
+  } }
+  return rect
+}
+
+function measureCharInner(cm, prepared, ch, bias) {
+  var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+  var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
+
+  var rect;
+  if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
+    for (var i$1 = 0; i$1 < 4; i$1++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+      while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { --start; }
+      while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { ++end; }
+      if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
+        { rect = node.parentNode.getBoundingClientRect(); }
+      else
+        { rect = getUsefulRect(range(node, start, end).getClientRects(), bias); }
+      if (rect.left || rect.right || start == 0) { break }
+      end = start;
+      start = start - 1;
+      collapse = "right";
+    }
+    if (ie && ie_version < 11) { rect = maybeUpdateRectForZooming(cm.display.measure, rect); }
+  } else { // If it is a widget, simply get the box for the whole widget.
+    if (start > 0) { collapse = bias = "right"; }
+    var rects;
+    if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
+      { rect = rects[bias == "right" ? rects.length - 1 : 0]; }
+    else
+      { rect = node.getBoundingClientRect(); }
+  }
+  if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
+    var rSpan = node.parentNode.getClientRects()[0];
+    if (rSpan)
+      { rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}; }
+    else
+      { rect = nullRect; }
+  }
+
+  var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+  var mid = (rtop + rbot) / 2;
+  var heights = prepared.view.measure.heights;
+  var i = 0;
+  for (; i < heights.length - 1; i++)
+    { if (mid < heights[i]) { break } }
+  var top = i ? heights[i - 1] : 0, bot = heights[i];
+  var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+                right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
+                top: top, bottom: bot};
+  if (!rect.left && !rect.right) { result.bogus = true; }
+  if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
+  return result
+}
+
+// Work around problem with bounding client rects on ranges being
+// returned incorrectly when zoomed on IE10 and below.
+function maybeUpdateRectForZooming(measure, rect) {
+  if (!window.screen || screen.logicalXDPI == null ||
+      screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+    { return rect }
+  var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+  var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+  return {left: rect.left * scaleX, right: rect.right * scaleX,
+          top: rect.top * scaleY, bottom: rect.bottom * scaleY}
+}
+
+function clearLineMeasurementCacheFor(lineView) {
+  if (lineView.measure) {
+    lineView.measure.cache = {};
+    lineView.measure.heights = null;
+    if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
+      { lineView.measure.caches[i] = {}; } }
+  }
+}
+
+function clearLineMeasurementCache(cm) {
+  cm.display.externalMeasure = null;
+  removeChildren(cm.display.lineMeasure);
+  for (var i = 0; i < cm.display.view.length; i++)
+    { clearLineMeasurementCacheFor(cm.display.view[i]); }
+}
+
+function clearCaches(cm) {
+  clearLineMeasurementCache(cm);
+  cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
+  if (!cm.options.lineWrapping) { cm.display.maxLineChanged = true; }
+  cm.display.lineNumChars = null;
+}
+
+function pageScrollX() {
+  // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206
+  // which causes page_Offset and bounding client rects to use
+  // different reference viewports and invalidate our calculations.
+  if (chrome && android) { return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft)) }
+  return window.pageXOffset || (document.documentElement || document.body).scrollLeft
+}
+function pageScrollY() {
+  if (chrome && android) { return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop)) }
+  return window.pageYOffset || (document.documentElement || document.body).scrollTop
+}
+
+function widgetTopHeight(lineObj) {
+  var height = 0;
+  if (lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above)
+    { height += widgetHeight(lineObj.widgets[i]); } } }
+  return height
+}
+
+// Converts a {top, bottom, left, right} box from line-local
+// coordinates into another coordinate system. Context may be one of
+// "line", "div" (display.lineDiv), "local"./null (editor), "window",
+// or "page".
+function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
+  if (!includeWidgets) {
+    var height = widgetTopHeight(lineObj);
+    rect.top += height; rect.bottom += height;
+  }
+  if (context == "line") { return rect }
+  if (!context) { context = "local"; }
+  var yOff = heightAtLine(lineObj);
+  if (context == "local") { yOff += paddingTop(cm.display); }
+  else { yOff -= cm.display.viewOffset; }
+  if (context == "page" || context == "window") {
+    var lOff = cm.display.lineSpace.getBoundingClientRect();
+    yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
+    var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
+    rect.left += xOff; rect.right += xOff;
+  }
+  rect.top += yOff; rect.bottom += yOff;
+  return rect
+}
+
+// Coverts a box from "div" coords to another coordinate system.
+// Context may be "window", "page", "div", or "local"./null.
+function fromCoordSystem(cm, coords, context) {
+  if (context == "div") { return coords }
+  var left = coords.left, top = coords.top;
+  // First move into "page" coordinate system
+  if (context == "page") {
+    left -= pageScrollX();
+    top -= pageScrollY();
+  } else if (context == "local" || !context) {
+    var localBox = cm.display.sizer.getBoundingClientRect();
+    left += localBox.left;
+    top += localBox.top;
+  }
+
+  var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
+  return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
+}
+
+function charCoords(cm, pos, context, lineObj, bias) {
+  if (!lineObj) { lineObj = getLine(cm.doc, pos.line); }
+  return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context)
+}
+
+// Returns a box for a given cursor position, which may have an
+// 'other' property containing the position of the secondary cursor
+// on a bidi boundary.
+// A cursor Pos(line, char, "before") is on the same visual line as `char - 1`
+// and after `char - 1` in writing order of `char - 1`
+// A cursor Pos(line, char, "after") is on the same visual line as `char`
+// and before `char` in writing order of `char`
+// Examples (upper-case letters are RTL, lower-case are LTR):
+//     Pos(0, 1, ...)
+//     before   after
+// ab     a|b     a|b
+// aB     a|B     aB|
+// Ab     |Ab     A|b
+// AB     B|A     B|A
+// Every position after the last character on a line is considered to stick
+// to the last character on the line.
+function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
+  lineObj = lineObj || getLine(cm.doc, pos.line);
+  if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); }
+  function get(ch, right) {
+    var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
+    if (right) { m.left = m.right; } else { m.right = m.left; }
+    return intoCoordSystem(cm, lineObj, m, context)
+  }
+  var order = getOrder(lineObj, cm.doc.direction), ch = pos.ch, sticky = pos.sticky;
+  if (ch >= lineObj.text.length) {
+    ch = lineObj.text.length;
+    sticky = "before";
+  } else if (ch <= 0) {
+    ch = 0;
+    sticky = "after";
+  }
+  if (!order) { return get(sticky == "before" ? ch - 1 : ch, sticky == "before") }
+
+  function getBidi(ch, partPos, invert) {
+    var part = order[partPos], right = part.level == 1;
+    return get(invert ? ch - 1 : ch, right != invert)
+  }
+  var partPos = getBidiPartAt(order, ch, sticky);
+  var other = bidiOther;
+  var val = getBidi(ch, partPos, sticky == "before");
+  if (other != null) { val.other = getBidi(ch, other, sticky != "before"); }
+  return val
+}
+
+// Used to cheaply estimate the coordinates for a position. Used for
+// intermediate scroll updates.
+function estimateCoords(cm, pos) {
+  var left = 0;
+  pos = clipPos(cm.doc, pos);
+  if (!cm.options.lineWrapping) { left = charWidth(cm.display) * pos.ch; }
+  var lineObj = getLine(cm.doc, pos.line);
+  var top = heightAtLine(lineObj) + paddingTop(cm.display);
+  return {left: left, right: left, top: top, bottom: top + lineObj.height}
+}
+
+// Positions returned by coordsChar contain some extra information.
+// xRel is the relative x position of the input coordinates compared
+// to the found position (so xRel > 0 means the coordinates are to
+// the right of the character position, for example). When outside
+// is true, that means the coordinates lie outside the line's
+// vertical range.
+function PosWithInfo(line, ch, sticky, outside, xRel) {
+  var pos = Pos(line, ch, sticky);
+  pos.xRel = xRel;
+  if (outside) { pos.outside = true; }
+  return pos
+}
+
+// Compute the character position closest to the given coordinates.
+// Input must be lineSpace-local ("div" coordinate system).
+function coordsChar(cm, x, y) {
+  var doc = cm.doc;
+  y += cm.display.viewOffset;
+  if (y < 0) { return PosWithInfo(doc.first, 0, null, true, -1) }
+  var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
+  if (lineN > last)
+    { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1) }
+  if (x < 0) { x = 0; }
+
+  var lineObj = getLine(doc, lineN);
+  for (;;) {
+    var found = coordsCharInner(cm, lineObj, lineN, x, y);
+    var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0));
+    if (!collapsed) { return found }
+    var rangeEnd = collapsed.find(1);
+    if (rangeEnd.line == lineN) { return rangeEnd }
+    lineObj = getLine(doc, lineN = rangeEnd.line);
+  }
+}
+
+function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
+  y -= widgetTopHeight(lineObj);
+  var end = lineObj.text.length;
+  var begin = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y; }, end, 0);
+  end = findFirst(function (ch) { return measureCharPrepared(cm, preparedMeasure, ch).top > y; }, begin, end);
+  return {begin: begin, end: end}
+}
+
+function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
+  if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj); }
+  var targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top;
+  return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
+}
+
+// Returns true if the given side of a box is after the given
+// coordinates, in top-to-bottom, left-to-right order.
+function boxIsAfter(box, x, y, left) {
+  return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x
+}
+
+function coordsCharInner(cm, lineObj, lineNo$$1, x, y) {
+  // Move y into line-local coordinate space
+  y -= heightAtLine(lineObj);
+  var preparedMeasure = prepareMeasureForLine(cm, lineObj);
+  // When directly calling `measureCharPrepared`, we have to adjust
+  // for the widgets at this line.
+  var widgetHeight$$1 = widgetTopHeight(lineObj);
+  var begin = 0, end = lineObj.text.length, ltr = true;
+
+  var order = getOrder(lineObj, cm.doc.direction);
+  // If the line isn't plain left-to-right text, first figure out
+  // which bidi section the coordinates fall into.
+  if (order) {
+    var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)
+                 (cm, lineObj, lineNo$$1, preparedMeasure, order, x, y);
+    ltr = part.level != 1;
+    // The awkward -1 offsets are needed because findFirst (called
+    // on these below) will treat its first bound as inclusive,
+    // second as exclusive, but we want to actually address the
+    // characters in the part's range
+    begin = ltr ? part.from : part.to - 1;
+    end = ltr ? part.to : part.from - 1;
+  }
+
+  // A binary search to find the first character whose bounding box
+  // starts after the coordinates. If we run across any whose box wrap
+  // the coordinates, store that.
+  var chAround = null, boxAround = null;
+  var ch = findFirst(function (ch) {
+    var box = measureCharPrepared(cm, preparedMeasure, ch);
+    box.top += widgetHeight$$1; box.bottom += widgetHeight$$1;
+    if (!boxIsAfter(box, x, y, false)) { return false }
+    if (box.top <= y && box.left <= x) {
+      chAround = ch;
+      boxAround = box;
+    }
+    return true
+  }, begin, end);
+
+  var baseX, sticky, outside = false;
+  // If a box around the coordinates was found, use that
+  if (boxAround) {
+    // Distinguish coordinates nearer to the left or right side of the box
+    var atLeft = x - boxAround.left < boxAround.right - x, atStart = atLeft == ltr;
+    ch = chAround + (atStart ? 0 : 1);
+    sticky = atStart ? "after" : "before";
+    baseX = atLeft ? boxAround.left : boxAround.right;
+  } else {
+    // (Adjust for extended bound, if necessary.)
+    if (!ltr && (ch == end || ch == begin)) { ch++; }
+    // To determine which side to associate with, get the box to the
+    // left of the character and compare it's vertical position to the
+    // coordinates
+    sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" :
+      (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight$$1 <= y) == ltr ?
+      "after" : "before";
+    // Now get accurate coordinates for this place, in order to get a
+    // base X position
+    var coords = cursorCoords(cm, Pos(lineNo$$1, ch, sticky), "line", lineObj, preparedMeasure);
+    baseX = coords.left;
+    outside = y < coords.top || y >= coords.bottom;
+  }
+
+  ch = skipExtendingChars(lineObj.text, ch, 1);
+  return PosWithInfo(lineNo$$1, ch, sticky, outside, x - baseX)
+}
+
+function coordsBidiPart(cm, lineObj, lineNo$$1, preparedMeasure, order, x, y) {
+  // Bidi parts are sorted left-to-right, and in a non-line-wrapping
+  // situation, we can take this ordering to correspond to the visual
+  // ordering. This finds the first part whose end is after the given
+  // coordinates.
+  var index = findFirst(function (i) {
+    var part = order[i], ltr = part.level != 1;
+    return boxIsAfter(cursorCoords(cm, Pos(lineNo$$1, ltr ? part.to : part.from, ltr ? "before" : "after"),
+                                   "line", lineObj, preparedMeasure), x, y, true)
+  }, 0, order.length - 1);
+  var part = order[index];
+  // If this isn't the first part, the part's start is also after
+  // the coordinates, and the coordinates aren't on the same line as
+  // that start, move one part back.
+  if (index > 0) {
+    var ltr = part.level != 1;
+    var start = cursorCoords(cm, Pos(lineNo$$1, ltr ? part.from : part.to, ltr ? "after" : "before"),
+                             "line", lineObj, preparedMeasure);
+    if (boxIsAfter(start, x, y, true) && start.top > y)
+      { part = order[index - 1]; }
+  }
+  return part
+}
+
+function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) {
+  // In a wrapped line, rtl text on wrapping boundaries can do things
+  // that don't correspond to the ordering in our `order` array at
+  // all, so a binary search doesn't work, and we want to return a
+  // part that only spans one line so that the binary search in
+  // coordsCharInner is safe. As such, we first find the extent of the
+  // wrapped line, and then do a flat search in which we discard any
+  // spans that aren't on the line.
+  var ref = wrappedLineExtent(cm, lineObj, preparedMeasure, y);
+  var begin = ref.begin;
+  var end = ref.end;
+  if (/\s/.test(lineObj.text.charAt(end - 1))) { end--; }
+  var part = null, closestDist = null;
+  for (var i = 0; i < order.length; i++) {
+    var p = order[i];
+    if (p.from >= end || p.to <= begin) { continue }
+    var ltr = p.level != 1;
+    var endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right;
+    // Weigh against spans ending before this, so that they are only
+    // picked if nothing ends after
+    var dist = endX < x ? x - endX + 1e9 : endX - x;
+    if (!part || closestDist > dist) {
+      part = p;
+      closestDist = dist;
+    }
+  }
+  if (!part) { part = order[order.length - 1]; }
+  // Clip the part to the wrapped line.
+  if (part.from < begin) { part = {from: begin, to: part.to, level: part.level}; }
+  if (part.to > end) { part = {from: part.from, to: end, level: part.level}; }
+  return part
+}
+
+var measureText;
+// Compute the default text height.
+function textHeight(display) {
+  if (display.cachedTextHeight != null) { return display.cachedTextHeight }
+  if (measureText == null) {
+    measureText = elt("pre");
+    // Measure a bunch of lines, for browsers that compute
+    // fractional heights.
+    for (var i = 0; i < 49; ++i) {
+      measureText.appendChild(document.createTextNode("x"));
+      measureText.appendChild(elt("br"));
+    }
+    measureText.appendChild(document.createTextNode("x"));
+  }
+  removeChildrenAndAdd(display.measure, measureText);
+  var height = measureText.offsetHeight / 50;
+  if (height > 3) { display.cachedTextHeight = height; }
+  removeChildren(display.measure);
+  return height || 1
+}
+
+// Compute the default character width.
+function charWidth(display) {
+  if (display.cachedCharWidth != null) { return display.cachedCharWidth }
+  var anchor = elt("span", "xxxxxxxxxx");
+  var pre = elt("pre", [anchor]);
+  removeChildrenAndAdd(display.measure, pre);
+  var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
+  if (width > 2) { display.cachedCharWidth = width; }
+  return width || 10
+}
+
+// Do a bulk-read of the DOM positions and sizes needed to draw the
+// view, so that we don't interleave reading and writing to the DOM.
+function getDimensions(cm) {
+  var d = cm.display, left = {}, width = {};
+  var gutterLeft = d.gutters.clientLeft;
+  for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
+    left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
+    width[cm.options.gutters[i]] = n.clientWidth;
+  }
+  return {fixedPos: compensateForHScroll(d),
+          gutterTotalWidth: d.gutters.offsetWidth,
+          gutterLeft: left,
+          gutterWidth: width,
+          wrapperWidth: d.wrapper.clientWidth}
+}
+
+// Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
+// but using getBoundingClientRect to get a sub-pixel-accurate
+// result.
+function compensateForHScroll(display) {
+  return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left
+}
+
+// Returns a function that estimates the height of a line, to use as
+// first approximation until the line becomes visible (and is thus
+// properly measurable).
+function estimateHeight(cm) {
+  var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
+  var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
+  return function (line) {
+    if (lineIsHidden(cm.doc, line)) { return 0 }
+
+    var widgetsHeight = 0;
+    if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) {
+      if (line.widgets[i].height) { widgetsHeight += line.widgets[i].height; }
+    } }
+
+    if (wrapping)
+      { return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th }
+    else
+      { return widgetsHeight + th }
+  }
+}
+
+function estimateLineHeights(cm) {
+  var doc = cm.doc, est = estimateHeight(cm);
+  doc.iter(function (line) {
+    var estHeight = est(line);
+    if (estHeight != line.height) { updateLineHeight(line, estHeight); }
+  });
+}
+
+// Given a mouse event, find the corresponding position. If liberal
+// is false, it checks whether a gutter or scrollbar was clicked,
+// and returns null if it was. forRect is used by rectangular
+// selections, and tries to estimate a character position even for
+// coordinates beyond the right of the text.
+function posFromMouse(cm, e, liberal, forRect) {
+  var display = cm.display;
+  if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { return null }
+
+  var x, y, space = display.lineSpace.getBoundingClientRect();
+  // Fails unpredictably on IE[67] when mouse is dragged around quickly.
+  try { x = e.clientX - space.left; y = e.clientY - space.top; }
+  catch (e) { return null }
+  var coords = coordsChar(cm, x, y), line;
+  if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+    var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
+    coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
+  }
+  return coords
+}
+
+// Find the view element corresponding to a given line. Return null
+// when the line isn't visible.
+function findViewIndex(cm, n) {
+  if (n >= cm.display.viewTo) { return null }
+  n -= cm.display.viewFrom;
+  if (n < 0) { return null }
+  var view = cm.display.view;
+  for (var i = 0; i < view.length; i++) {
+    n -= view[i].size;
+    if (n < 0) { return i }
+  }
+}
+
+function updateSelection(cm) {
+  cm.display.input.showSelection(cm.display.input.prepareSelection());
+}
+
+function prepareSelection(cm, primary) {
+  if ( primary === void 0 ) primary = true;
+
+  var doc = cm.doc, result = {};
+  var curFragment = result.cursors = document.createDocumentFragment();
+  var selFragment = result.selection = document.createDocumentFragment();
+
+  for (var i = 0; i < doc.sel.ranges.length; i++) {
+    if (!primary && i == doc.sel.primIndex) { continue }
+    var range$$1 = doc.sel.ranges[i];
+    if (range$$1.from().line >= cm.display.viewTo || range$$1.to().line < cm.display.viewFrom) { continue }
+    var collapsed = range$$1.empty();
+    if (collapsed || cm.options.showCursorWhenSelecting)
+      { drawSelectionCursor(cm, range$$1.head, curFragment); }
+    if (!collapsed)
+      { drawSelectionRange(cm, range$$1, selFragment); }
+  }
+  return result
+}
+
+// Draws a cursor for the given range
+function drawSelectionCursor(cm, head, output) {
+  var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+
+  var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
+  cursor.style.left = pos.left + "px";
+  cursor.style.top = pos.top + "px";
+  cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
+
+  if (pos.other) {
+    // Secondary cursor, shown when on a 'jump' in bi-directional text
+    var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
+    otherCursor.style.display = "";
+    otherCursor.style.left = pos.other.left + "px";
+    otherCursor.style.top = pos.other.top + "px";
+    otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
+  }
+}
+
+function cmpCoords(a, b) { return a.top - b.top || a.left - b.left }
+
+// Draws the given range as a highlighted selection
+function drawSelectionRange(cm, range$$1, output) {
+  var display = cm.display, doc = cm.doc;
+  var fragment = document.createDocumentFragment();
+  var padding = paddingH(cm.display), leftSide = padding.left;
+  var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
+  var docLTR = doc.direction == "ltr";
+
+  function add(left, top, width, bottom) {
+    if (top < 0) { top = 0; }
+    top = Math.round(top);
+    bottom = Math.round(bottom);
+    fragment.appendChild(elt("div", null, "CodeMirror-selected", ("position: absolute; left: " + left + "px;\n                             top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n                             height: " + (bottom - top) + "px")));
+  }
+
+  function drawForLine(line, fromArg, toArg) {
+    var lineObj = getLine(doc, line);
+    var lineLen = lineObj.text.length;
+    var start, end;
+    function coords(ch, bias) {
+      return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
+    }
+
+    function wrapX(pos, dir, side) {
+      var extent = wrappedLineExtentChar(cm, lineObj, null, pos);
+      var prop = (dir == "ltr") == (side == "after") ? "left" : "right";
+      var ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1);
+      return coords(ch, prop)[prop]
+    }
+
+    var order = getOrder(lineObj, doc.direction);
+    iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir, i) {
+      var ltr = dir == "ltr";
+      var fromPos = coords(from, ltr ? "left" : "right");
+      var toPos = coords(to - 1, ltr ? "right" : "left");
+
+      var openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen;
+      var first = i == 0, last = !order || i == order.length - 1;
+      if (toPos.top - fromPos.top <= 3) { // Single line
+        var openLeft = (docLTR ? openStart : openEnd) && first;
+        var openRight = (docLTR ? openEnd : openStart) && last;
+        var left = openLeft ? leftSide : (ltr ? fromPos : toPos).left;
+        var right = openRight ? rightSide : (ltr ? toPos : fromPos).right;
+        add(left, fromPos.top, right - left, fromPos.bottom);
+      } else { // Multiple lines
+        var topLeft, topRight, botLeft, botRight;
+        if (ltr) {
+          topLeft = docLTR && openStart && first ? leftSide : fromPos.left;
+          topRight = docLTR ? rightSide : wrapX(from, dir, "before");
+          botLeft = docLTR ? leftSide : wrapX(to, dir, "after");
+          botRight = docLTR && openEnd && last ? rightSide : toPos.right;
+        } else {
+          topLeft = !docLTR ? leftSide : wrapX(from, dir, "before");
+          topRight = !docLTR && openStart && first ? rightSide : fromPos.right;
+          botLeft = !docLTR && openEnd && last ? leftSide : toPos.left;
+          botRight = !docLTR ? rightSide : wrapX(to, dir, "after");
+        }
+        add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom);
+        if (fromPos.bottom < toPos.top) { add(leftSide, fromPos.bottom, null, toPos.top); }
+        add(botLeft, toPos.top, botRight - botLeft, toPos.bottom);
+      }
+
+      if (!start || cmpCoords(fromPos, start) < 0) { start = fromPos; }
+      if (cmpCoords(toPos, start) < 0) { start = toPos; }
+      if (!end || cmpCoords(fromPos, end) < 0) { end = fromPos; }
+      if (cmpCoords(toPos, end) < 0) { end = toPos; }
+    });
+    return {start: start, end: end}
+  }
+
+  var sFrom = range$$1.from(), sTo = range$$1.to();
+  if (sFrom.line == sTo.line) {
+    drawForLine(sFrom.line, sFrom.ch, sTo.ch);
+  } else {
+    var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
+    var singleVLine = visualLine(fromLine) == visualLine(toLine);
+    var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
+    var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
+    if (singleVLine) {
+      if (leftEnd.top < rightStart.top - 2) {
+        add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
+        add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
+      } else {
+        add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
+      }
+    }
+    if (leftEnd.bottom < rightStart.top)
+      { add(leftSide, leftEnd.bottom, null, rightStart.top); }
+  }
+
+  output.appendChild(fragment);
+}
+
+// Cursor-blinking
+function restartBlink(cm) {
+  if (!cm.state.focused) { return }
+  var display = cm.display;
+  clearInterval(display.blinker);
+  var on = true;
+  display.cursorDiv.style.visibility = "";
+  if (cm.options.cursorBlinkRate > 0)
+    { display.blinker = setInterval(function () { return display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; },
+      cm.options.cursorBlinkRate); }
+  else if (cm.options.cursorBlinkRate < 0)
+    { display.cursorDiv.style.visibility = "hidden"; }
+}
+
+function ensureFocus(cm) {
+  if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+}
+
+function delayBlurEvent(cm) {
+  cm.state.delayingBlurEvent = true;
+  setTimeout(function () { if (cm.state.delayingBlurEvent) {
+    cm.state.delayingBlurEvent = false;
+    onBlur(cm);
+  } }, 100);
+}
+
+function onFocus(cm, e) {
+  if (cm.state.delayingBlurEvent) { cm.state.delayingBlurEvent = false; }
+
+  if (cm.options.readOnly == "nocursor") { return }
+  if (!cm.state.focused) {
+    signal(cm, "focus", cm, e);
+    cm.state.focused = true;
+    addClass(cm.display.wrapper, "CodeMirror-focused");
+    // This test prevents this from firing when a context
+    // menu is closed (since the input reset would kill the
+    // select-all detection hack)
+    if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
+      cm.display.input.reset();
+      if (webkit) { setTimeout(function () { return cm.display.input.reset(true); }, 20); } // Issue #1730
+    }
+    cm.display.input.receivedFocus();
+  }
+  restartBlink(cm);
+}
+function onBlur(cm, e) {
+  if (cm.state.delayingBlurEvent) { return }
+
+  if (cm.state.focused) {
+    signal(cm, "blur", cm, e);
+    cm.state.focused = false;
+    rmClass(cm.display.wrapper, "CodeMirror-focused");
+  }
+  clearInterval(cm.display.blinker);
+  setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false; } }, 150);
+}
+
+// Read the actual heights of the rendered lines, and update their
+// stored heights to match.
+function updateHeightsInViewport(cm) {
+  var display = cm.display;
+  var prevBottom = display.lineDiv.offsetTop;
+  for (var i = 0; i < display.view.length; i++) {
+    var cur = display.view[i], height = (void 0);
+    if (cur.hidden) { continue }
+    if (ie && ie_version < 8) {
+      var bot = cur.node.offsetTop + cur.node.offsetHeight;
+      height = bot - prevBottom;
+      prevBottom = bot;
+    } else {
+      var box = cur.node.getBoundingClientRect();
+      height = box.bottom - box.top;
+    }
+    var diff = cur.line.height - height;
+    if (height < 2) { height = textHeight(display); }
+    if (diff > .005 || diff < -.005) {
+      updateLineHeight(cur.line, height);
+      updateWidgetHeight(cur.line);
+      if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)
+        { updateWidgetHeight(cur.rest[j]); } }
+    }
+  }
+}
+
+// Read and store the height of line widgets associated with the
+// given line.
+function updateWidgetHeight(line) {
+  if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i) {
+    var w = line.widgets[i], parent = w.node.parentNode;
+    if (parent) { w.height = parent.offsetHeight; }
+  } }
+}
+
+// Compute the lines that are visible in a given viewport (defaults
+// the the current scroll position). viewport may contain top,
+// height, and ensure (see op.scrollToPos) properties.
+function visibleLines(display, doc, viewport) {
+  var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
+  top = Math.floor(top - paddingTop(display));
+  var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
+
+  var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+  // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
+  // forces those lines into the viewport (if possible).
+  if (viewport && viewport.ensure) {
+    var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+    if (ensureFrom < from) {
+      from = ensureFrom;
+      to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+    } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+      from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+      to = ensureTo;
+    }
+  }
+  return {from: from, to: Math.max(to, from + 1)}
+}
+
+// Re-align line numbers and gutter marks to compensate for
+// horizontal scrolling.
+function alignHorizontally(cm) {
+  var display = cm.display, view = display.view;
+  if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
+  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
+  var gutterW = display.gutters.offsetWidth, left = comp + "px";
+  for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
+    if (cm.options.fixedGutter) {
+      if (view[i].gutter)
+        { view[i].gutter.style.left = left; }
+      if (view[i].gutterBackground)
+        { view[i].gutterBackground.style.left = left; }
+    }
+    var align = view[i].alignable;
+    if (align) { for (var j = 0; j < align.length; j++)
+      { align[j].style.left = left; } }
+  } }
+  if (cm.options.fixedGutter)
+    { display.gutters.style.left = (comp + gutterW) + "px"; }
+}
+
+// Used to ensure that the line number gutter is still the right
+// size for the current document size. Returns true when an update
+// is needed.
+function maybeUpdateLineNumberWidth(cm) {
+  if (!cm.options.lineNumbers) { return false }
+  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
+  if (last.length != display.lineNumChars) {
+    var test = display.measure.appendChild(elt("div", [elt("div", last)],
+                                               "CodeMirror-linenumber CodeMirror-gutter-elt"));
+    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
+    display.lineGutter.style.width = "";
+    display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
+    display.lineNumWidth = display.lineNumInnerWidth + padding;
+    display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
+    display.lineGutter.style.width = display.lineNumWidth + "px";
+    updateGutterSpace(cm);
+    return true
+  }
+  return false
+}
+
+// SCROLLING THINGS INTO VIEW
+
+// If an editor sits on the top or bottom of the window, partially
+// scrolled out of view, this ensures that the cursor is visible.
+function maybeScrollWindow(cm, rect) {
+  if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
+
+  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
+  if (rect.top + box.top < 0) { doScroll = true; }
+  else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false; }
+  if (doScroll != null && !phantom) {
+    var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n                         top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n                         height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n                         left: " + (rect.left) + "px; width: " + (Math.max(2, rect.right - rect.left)) + "px;"));
+    cm.display.lineSpace.appendChild(scrollNode);
+    scrollNode.scrollIntoView(doScroll);
+    cm.display.lineSpace.removeChild(scrollNode);
+  }
+}
+
+// Scroll a given position into view (immediately), verifying that
+// it actually became visible (as line heights are accurately
+// measured, the position of something may 'drift' during drawing).
+function scrollPosIntoView(cm, pos, end, margin) {
+  if (margin == null) { margin = 0; }
+  var rect;
+  if (!cm.options.lineWrapping && pos == end) {
+    // Set pos and end to the cursor positions around the character pos sticks to
+    // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
+    // If pos == Pos(_, 0, "before"), pos and end are unchanged
+    pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos;
+    end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos;
+  }
+  for (var limit = 0; limit < 5; limit++) {
+    var changed = false;
+    var coords = cursorCoords(cm, pos);
+    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+    rect = {left: Math.min(coords.left, endCoords.left),
+            top: Math.min(coords.top, endCoords.top) - margin,
+            right: Math.max(coords.left, endCoords.left),
+            bottom: Math.max(coords.bottom, endCoords.bottom) + margin};
+    var scrollPos = calculateScrollPos(cm, rect);
+    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
+    if (scrollPos.scrollTop != null) {
+      updateScrollTop(cm, scrollPos.scrollTop);
+      if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true; }
+    }
+    if (scrollPos.scrollLeft != null) {
+      setScrollLeft(cm, scrollPos.scrollLeft);
+      if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true; }
+    }
+    if (!changed) { break }
+  }
+  return rect
+}
+
+// Scroll a given set of coordinates into view (immediately).
+function scrollIntoView(cm, rect) {
+  var scrollPos = calculateScrollPos(cm, rect);
+  if (scrollPos.scrollTop != null) { updateScrollTop(cm, scrollPos.scrollTop); }
+  if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft); }
+}
+
+// Calculate a new scroll position needed to scroll the given
+// rectangle into view. Returns an object with scrollTop and
+// scrollLeft properties. When these are undefined, the
+// vertical/horizontal position does not need to be adjusted.
+function calculateScrollPos(cm, rect) {
+  var display = cm.display, snapMargin = textHeight(cm.display);
+  if (rect.top < 0) { rect.top = 0; }
+  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
+  var screen = displayHeight(cm), result = {};
+  if (rect.bottom - rect.top > screen) { rect.bottom = rect.top + screen; }
+  var docBottom = cm.doc.height + paddingVert(display);
+  var atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin;
+  if (rect.top < screentop) {
+    result.scrollTop = atTop ? 0 : rect.top;
+  } else if (rect.bottom > screentop + screen) {
+    var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen);
+    if (newTop != screentop) { result.scrollTop = newTop; }
+  }
+
+  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
+  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
+  var tooWide = rect.right - rect.left > screenw;
+  if (tooWide) { rect.right = rect.left + screenw; }
+  if (rect.left < 10)
+    { result.scrollLeft = 0; }
+  else if (rect.left < screenleft)
+    { result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10)); }
+  else if (rect.right > screenw + screenleft - 3)
+    { result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; }
+  return result
+}
+
+// Store a relative adjustment to the scroll position in the current
+// operation (to be applied when the operation finishes).
+function addToScrollTop(cm, top) {
+  if (top == null) { return }
+  resolveScrollToPos(cm);
+  cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
+}
+
+// Make sure that at the end of the operation the current cursor is
+// shown.
+function ensureCursorVisible(cm) {
+  resolveScrollToPos(cm);
+  var cur = cm.getCursor();
+  cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin};
+}
+
+function scrollToCoords(cm, x, y) {
+  if (x != null || y != null) { resolveScrollToPos(cm); }
+  if (x != null) { cm.curOp.scrollLeft = x; }
+  if (y != null) { cm.curOp.scrollTop = y; }
+}
+
+function scrollToRange(cm, range$$1) {
+  resolveScrollToPos(cm);
+  cm.curOp.scrollToPos = range$$1;
+}
+
+// When an operation has its scrollToPos property set, and another
+// scroll action is applied before the end of the operation, this
+// 'simulates' scrolling that position into view in a cheap way, so
+// that the effect of intermediate scroll commands is not ignored.
+function resolveScrollToPos(cm) {
+  var range$$1 = cm.curOp.scrollToPos;
+  if (range$$1) {
+    cm.curOp.scrollToPos = null;
+    var from = estimateCoords(cm, range$$1.from), to = estimateCoords(cm, range$$1.to);
+    scrollToCoordsRange(cm, from, to, range$$1.margin);
+  }
+}
+
+function scrollToCoordsRange(cm, from, to, margin) {
+  var sPos = calculateScrollPos(cm, {
+    left: Math.min(from.left, to.left),
+    top: Math.min(from.top, to.top) - margin,
+    right: Math.max(from.right, to.right),
+    bottom: Math.max(from.bottom, to.bottom) + margin
+  });
+  scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop);
+}
+
+// Sync the scrollable area and scrollbars, ensure the viewport
+// covers the visible area.
+function updateScrollTop(cm, val) {
+  if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
+  if (!gecko) { updateDisplaySimple(cm, {top: val}); }
+  setScrollTop(cm, val, true);
+  if (gecko) { updateDisplaySimple(cm); }
+  startWorker(cm, 100);
+}
+
+function setScrollTop(cm, val, forceScroll) {
+  val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val);
+  if (cm.display.scroller.scrollTop == val && !forceScroll) { return }
+  cm.doc.scrollTop = val;
+  cm.display.scrollbars.setScrollTop(val);
+  if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val; }
+}
+
+// Sync scroller and scrollbar, ensure the gutter elements are
+// aligned.
+function setScrollLeft(cm, val, isScroller, forceScroll) {
+  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
+  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { return }
+  cm.doc.scrollLeft = val;
+  alignHorizontally(cm);
+  if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val; }
+  cm.display.scrollbars.setScrollLeft(val);
+}
+
+// SCROLLBARS
+
+// Prepare DOM reads needed to update the scrollbars. Done in one
+// shot to minimize update/measure roundtrips.
+function measureForScrollbars(cm) {
+  var d = cm.display, gutterW = d.gutters.offsetWidth;
+  var docH = Math.round(cm.doc.height + paddingVert(cm.display));
+  return {
+    clientHeight: d.scroller.clientHeight,
+    viewHeight: d.wrapper.clientHeight,
+    scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+    viewWidth: d.wrapper.clientWidth,
+    barLeft: cm.options.fixedGutter ? gutterW : 0,
+    docHeight: docH,
+    scrollHeight: docH + scrollGap(cm) + d.barHeight,
+    nativeBarWidth: d.nativeBarWidth,
+    gutterWidth: gutterW
+  }
+}
+
+var NativeScrollbars = function(place, scroll, cm) {
+  this.cm = cm;
+  var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+  var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+  vert.tabIndex = horiz.tabIndex = -1;
+  place(vert); place(horiz);
+
+  on(vert, "scroll", function () {
+    if (vert.clientHeight) { scroll(vert.scrollTop, "vertical"); }
+  });
+  on(horiz, "scroll", function () {
+    if (horiz.clientWidth) { scroll(horiz.scrollLeft, "horizontal"); }
+  });
+
+  this.checkedZeroWidth = false;
+  // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+  if (ie && ie_version < 8) { this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; }
+};
+
+NativeScrollbars.prototype.update = function (measure) {
+  var needsH = measure.scrollWidth > measure.clientWidth + 1;
+  var needsV = measure.scrollHeight > measure.clientHeight + 1;
+  var sWidth = measure.nativeBarWidth;
+
+  if (needsV) {
+    this.vert.style.display = "block";
+    this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+    var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+    // A bug in IE8 can cause this value to be negative, so guard it.
+    this.vert.firstChild.style.height =
+      Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+  } else {
+    this.vert.style.display = "";
+    this.vert.firstChild.style.height = "0";
+  }
+
+  if (needsH) {
+    this.horiz.style.display = "block";
+    this.horiz.style.right = needsV ? sWidth + "px" : "0";
+    this.horiz.style.left = measure.barLeft + "px";
+    var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+    this.horiz.firstChild.style.width =
+      Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+  } else {
+    this.horiz.style.display = "";
+    this.horiz.firstChild.style.width = "0";
+  }
+
+  if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+    if (sWidth == 0) { this.zeroWidthHack(); }
+    this.checkedZeroWidth = true;
+  }
+
+  return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
+};
+
+NativeScrollbars.prototype.setScrollLeft = function (pos) {
+  if (this.horiz.scrollLeft != pos) { this.horiz.scrollLeft = pos; }
+  if (this.disableHoriz) { this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz"); }
+};
+
+NativeScrollbars.prototype.setScrollTop = function (pos) {
+  if (this.vert.scrollTop != pos) { this.vert.scrollTop = pos; }
+  if (this.disableVert) { this.enableZeroWidthBar(this.vert, this.disableVert, "vert"); }
+};
+
+NativeScrollbars.prototype.zeroWidthHack = function () {
+  var w = mac && !mac_geMountainLion ? "12px" : "18px";
+  this.horiz.style.height = this.vert.style.width = w;
+  this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+  this.disableHoriz = new Delayed;
+  this.disableVert = new Delayed;
+};
+
+NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) {
+  bar.style.pointerEvents = "auto";
+  function maybeDisable() {
+    // To find out whether the scrollbar is still visible, we
+    // check whether the element under the pixel in the bottom
+    // right corner of the scrollbar box is the scrollbar box
+    // itself (when the bar is still visible) or its filler child
+    // (when the bar is hidden). If it is still visible, we keep
+    // it enabled, if it's hidden, we disable pointer events.
+    var box = bar.getBoundingClientRect();
+    var elt$$1 = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)
+        : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1);
+    if (elt$$1 != bar) { bar.style.pointerEvents = "none"; }
+    else { delay.set(1000, maybeDisable); }
+  }
+  delay.set(1000, maybeDisable);
+};
+
+NativeScrollbars.prototype.clear = function () {
+  var parent = this.horiz.parentNode;
+  parent.removeChild(this.horiz);
+  parent.removeChild(this.vert);
+};
+
+var NullScrollbars = function () {};
+
+NullScrollbars.prototype.update = function () { return {bottom: 0, right: 0} };
+NullScrollbars.prototype.setScrollLeft = function () {};
+NullScrollbars.prototype.setScrollTop = function () {};
+NullScrollbars.prototype.clear = function () {};
+
+function updateScrollbars(cm, measure) {
+  if (!measure) { measure = measureForScrollbars(cm); }
+  var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+  updateScrollbarsInner(cm, measure);
+  for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+    if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+      { updateHeightsInViewport(cm); }
+    updateScrollbarsInner(cm, measureForScrollbars(cm));
+    startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+  }
+}
+
+// Re-synchronize the fake scrollbars with the actual size of the
+// content.
+function updateScrollbarsInner(cm, measure) {
+  var d = cm.display;
+  var sizes = d.scrollbars.update(measure);
+
+  d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+  d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+  d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent";
+
+  if (sizes.right && sizes.bottom) {
+    d.scrollbarFiller.style.display = "block";
+    d.scrollbarFiller.style.height = sizes.bottom + "px";
+    d.scrollbarFiller.style.width = sizes.right + "px";
+  } else { d.scrollbarFiller.style.display = ""; }
+  if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+    d.gutterFiller.style.display = "block";
+    d.gutterFiller.style.height = sizes.bottom + "px";
+    d.gutterFiller.style.width = measure.gutterWidth + "px";
+  } else { d.gutterFiller.style.display = ""; }
+}
+
+var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+function initScrollbars(cm) {
+  if (cm.display.scrollbars) {
+    cm.display.scrollbars.clear();
+    if (cm.display.scrollbars.addClass)
+      { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
+  }
+
+  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
+    cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+    // Prevent clicks in the scrollbars from killing focus
+    on(node, "mousedown", function () {
+      if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0); }
+    });
+    node.setAttribute("cm-not-content", "true");
+  }, function (pos, axis) {
+    if (axis == "horizontal") { setScrollLeft(cm, pos); }
+    else { updateScrollTop(cm, pos); }
+  }, cm);
+  if (cm.display.scrollbars.addClass)
+    { addClass(cm.display.wrapper, cm.display.scrollbars.addClass); }
+}
+
+// Operations are used to wrap a series of changes to the editor
+// state in such a way that each change won't have to update the
+// cursor and display (which would be awkward, slow, and
+// error-prone). Instead, display updates are batched and then all
+// combined and executed at once.
+
+var nextOpId = 0;
+// Start a new operation.
+function startOperation(cm) {
+  cm.curOp = {
+    cm: cm,
+    viewChanged: false,      // Flag that indicates that lines might need to be redrawn
+    startHeight: cm.doc.height, // Used to detect need to update scrollbar
+    forceUpdate: false,      // Used to force a redraw
+    updateInput: null,       // Whether to reset the input textarea
+    typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
+    changeObjs: null,        // Accumulated changes, for firing change events
+    cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
+    cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
+    selectionChanged: false, // Whether the selection needs to be redrawn
+    updateMaxLine: false,    // Set when the widest line needs to be determined anew
+    scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
+    scrollToPos: null,       // Used to scroll to a specific position
+    focus: false,
+    id: ++nextOpId           // Unique ID
+  };
+  pushOperation(cm.curOp);
+}
+
+// Finish an operation, updating the display and signalling delayed events
+function endOperation(cm) {
+  var op = cm.curOp;
+  finishOperation(op, function (group) {
+    for (var i = 0; i < group.ops.length; i++)
+      { group.ops[i].cm.curOp = null; }
+    endOperations(group);
+  });
+}
+
+// The DOM updates done when an operation finishes are batched so
+// that the minimum number of relayouts are required.
+function endOperations(group) {
+  var ops = group.ops;
+  for (var i = 0; i < ops.length; i++) // Read DOM
+    { endOperation_R1(ops[i]); }
+  for (var i$1 = 0; i$1 < ops.length; i$1++) // Write DOM (maybe)
+    { endOperation_W1(ops[i$1]); }
+  for (var i$2 = 0; i$2 < ops.length; i$2++) // Read DOM
+    { endOperation_R2(ops[i$2]); }
+  for (var i$3 = 0; i$3 < ops.length; i$3++) // Write DOM (maybe)
+    { endOperation_W2(ops[i$3]); }
+  for (var i$4 = 0; i$4 < ops.length; i$4++) // Read DOM
+    { endOperation_finish(ops[i$4]); }
+}
+
+function endOperation_R1(op) {
+  var cm = op.cm, display = cm.display;
+  maybeClipScrollbars(cm);
+  if (op.updateMaxLine) { findMaxLine(cm); }
+
+  op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+    op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                       op.scrollToPos.to.line >= display.viewTo) ||
+    display.maxLineChanged && cm.options.lineWrapping;
+  op.update = op.mustUpdate &&
+    new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+}
+
+function endOperation_W1(op) {
+  op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+}
+
+function endOperation_R2(op) {
+  var cm = op.cm, display = cm.display;
+  if (op.updatedDisplay) { updateHeightsInViewport(cm); }
+
+  op.barMeasure = measureForScrollbars(cm);
+
+  // If the max line changed since it was last measured, measure it,
+  // and ensure the document's width matches it.
+  // updateDisplay_W2 will use these properties to do the actual resizing
+  if (display.maxLineChanged && !cm.options.lineWrapping) {
+    op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+    cm.display.sizerWidth = op.adjustWidthTo;
+    op.barMeasure.scrollWidth =
+      Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
+    op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
+  }
+
+  if (op.updatedDisplay || op.selectionChanged)
+    { op.preparedSelection = display.input.prepareSelection(); }
+}
+
+function endOperation_W2(op) {
+  var cm = op.cm;
+
+  if (op.adjustWidthTo != null) {
+    cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+    if (op.maxScrollLeft < cm.doc.scrollLeft)
+      { setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); }
+    cm.display.maxLineChanged = false;
+  }
+
+  var takeFocus = op.focus && op.focus == activeElt();
+  if (op.preparedSelection)
+    { cm.display.input.showSelection(op.preparedSelection, takeFocus); }
+  if (op.updatedDisplay || op.startHeight != cm.doc.height)
+    { updateScrollbars(cm, op.barMeasure); }
+  if (op.updatedDisplay)
+    { setDocumentHeight(cm, op.barMeasure); }
+
+  if (op.selectionChanged) { restartBlink(cm); }
+
+  if (cm.state.focused && op.updateInput)
+    { cm.display.input.reset(op.typing); }
+  if (takeFocus) { ensureFocus(op.cm); }
+}
+
+function endOperation_finish(op) {
+  var cm = op.cm, display = cm.display, doc = cm.doc;
+
+  if (op.updatedDisplay) { postUpdateDisplay(cm, op.update); }
+
+  // Abort mouse wheel delta measurement, when scrolling explicitly
+  if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
+    { display.wheelStartX = display.wheelStartY = null; }
+
+  // Propagate the scroll position to the actual DOM scroller
+  if (op.scrollTop != null) { setScrollTop(cm, op.scrollTop, op.forceScroll); }
+
+  if (op.scrollLeft != null) { setScrollLeft(cm, op.scrollLeft, true, true); }
+  // If we need to scroll a specific position into view, do so.
+  if (op.scrollToPos) {
+    var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                 clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
+    maybeScrollWindow(cm, rect);
+  }
+
+  // Fire events for markers that are hidden/unidden by editing or
+  // undoing
+  var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
+  if (hidden) { for (var i = 0; i < hidden.length; ++i)
+    { if (!hidden[i].lines.length) { signal(hidden[i], "hide"); } } }
+  if (unhidden) { for (var i$1 = 0; i$1 < unhidden.length; ++i$1)
+    { if (unhidden[i$1].lines.length) { signal(unhidden[i$1], "unhide"); } } }
+
+  if (display.wrapper.offsetHeight)
+    { doc.scrollTop = cm.display.scroller.scrollTop; }
+
+  // Fire change events, and delayed event handlers
+  if (op.changeObjs)
+    { signal(cm, "changes", cm, op.changeObjs); }
+  if (op.update)
+    { op.update.finish(); }
+}
+
+// Run the given function in an operation
+function runInOp(cm, f) {
+  if (cm.curOp) { return f() }
+  startOperation(cm);
+  try { return f() }
+  finally { endOperation(cm); }
+}
+// Wraps a function in an operation. Returns the wrapped function.
+function operation(cm, f) {
+  return function() {
+    if (cm.curOp) { return f.apply(cm, arguments) }
+    startOperation(cm);
+    try { return f.apply(cm, arguments) }
+    finally { endOperation(cm); }
+  }
+}
+// Used to add methods to editor and doc instances, wrapping them in
+// operations.
+function methodOp(f) {
+  return function() {
+    if (this.curOp) { return f.apply(this, arguments) }
+    startOperation(this);
+    try { return f.apply(this, arguments) }
+    finally { endOperation(this); }
+  }
+}
+function docMethodOp(f) {
+  return function() {
+    var cm = this.cm;
+    if (!cm || cm.curOp) { return f.apply(this, arguments) }
+    startOperation(cm);
+    try { return f.apply(this, arguments) }
+    finally { endOperation(cm); }
+  }
+}
+
+// Updates the display.view data structure for a given change to the
+// document. From and to are in pre-change coordinates. Lendiff is
+// the amount of lines added or subtracted by the change. This is
+// used for changes that span multiple lines, or change the way
+// lines are divided into visual lines. regLineChange (below)
+// registers single-line changes.
+function regChange(cm, from, to, lendiff) {
+  if (from == null) { from = cm.doc.first; }
+  if (to == null) { to = cm.doc.first + cm.doc.size; }
+  if (!lendiff) { lendiff = 0; }
+
+  var display = cm.display;
+  if (lendiff && to < display.viewTo &&
+      (display.updateLineNumbers == null || display.updateLineNumbers > from))
+    { display.updateLineNumbers = from; }
+
+  cm.curOp.viewChanged = true;
+
+  if (from >= display.viewTo) { // Change after
+    if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
+      { resetView(cm); }
+  } else if (to <= display.viewFrom) { // Change before
+    if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
+      resetView(cm);
+    } else {
+      display.viewFrom += lendiff;
+      display.viewTo += lendiff;
+    }
+  } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
+    resetView(cm);
+  } else if (from <= display.viewFrom) { // Top overlap
+    var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
+    if (cut) {
+      display.view = display.view.slice(cut.index);
+      display.viewFrom = cut.lineN;
+      display.viewTo += lendiff;
+    } else {
+      resetView(cm);
+    }
+  } else if (to >= display.viewTo) { // Bottom overlap
+    var cut$1 = viewCuttingPoint(cm, from, from, -1);
+    if (cut$1) {
+      display.view = display.view.slice(0, cut$1.index);
+      display.viewTo = cut$1.lineN;
+    } else {
+      resetView(cm);
+    }
+  } else { // Gap in the middle
+    var cutTop = viewCuttingPoint(cm, from, from, -1);
+    var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
+    if (cutTop && cutBot) {
+      display.view = display.view.slice(0, cutTop.index)
+        .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
+        .concat(display.view.slice(cutBot.index));
+      display.viewTo += lendiff;
+    } else {
+      resetView(cm);
+    }
+  }
+
+  var ext = display.externalMeasured;
+  if (ext) {
+    if (to < ext.lineN)
+      { ext.lineN += lendiff; }
+    else if (from < ext.lineN + ext.size)
+      { display.externalMeasured = null; }
+  }
+}
+
+// Register a change to a single line. Type must be one of "text",
+// "gutter", "class", "widget"
+function regLineChange(cm, line, type) {
+  cm.curOp.viewChanged = true;
+  var display = cm.display, ext = cm.display.externalMeasured;
+  if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
+    { display.externalMeasured = null; }
+
+  if (line < display.viewFrom || line >= display.viewTo) { return }
+  var lineView = display.view[findViewIndex(cm, line)];
+  if (lineView.node == null) { return }
+  var arr = lineView.changes || (lineView.changes = []);
+  if (indexOf(arr, type) == -1) { arr.push(type); }
+}
+
+// Clear the view.
+function resetView(cm) {
+  cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
+  cm.display.view = [];
+  cm.display.viewOffset = 0;
+}
+
+function viewCuttingPoint(cm, oldN, newN, dir) {
+  var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
+  if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
+    { return {index: index, lineN: newN} }
+  var n = cm.display.viewFrom;
+  for (var i = 0; i < index; i++)
+    { n += view[i].size; }
+  if (n != oldN) {
+    if (dir > 0) {
+      if (index == view.length - 1) { return null }
+      diff = (n + view[index].size) - oldN;
+      index++;
+    } else {
+      diff = n - oldN;
+    }
+    oldN += diff; newN += diff;
+  }
+  while (visualLineNo(cm.doc, newN) != newN) {
+    if (index == (dir < 0 ? 0 : view.length - 1)) { return null }
+    newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
+    index += dir;
+  }
+  return {index: index, lineN: newN}
+}
+
+// Force the view to cover a given range, adding empty view element
+// or clipping off existing ones as needed.
+function adjustView(cm, from, to) {
+  var display = cm.display, view = display.view;
+  if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
+    display.view = buildViewArray(cm, from, to);
+    display.viewFrom = from;
+  } else {
+    if (display.viewFrom > from)
+      { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); }
+    else if (display.viewFrom < from)
+      { display.view = display.view.slice(findViewIndex(cm, from)); }
+    display.viewFrom = from;
+    if (display.viewTo < to)
+      { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); }
+    else if (display.viewTo > to)
+      { display.view = display.view.slice(0, findViewIndex(cm, to)); }
+  }
+  display.viewTo = to;
+}
+
+// Count the number of lines in the view whose DOM representation is
+// out of date (or nonexistent).
+function countDirtyView(cm) {
+  var view = cm.display.view, dirty = 0;
+  for (var i = 0; i < view.length; i++) {
+    var lineView = view[i];
+    if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty; }
+  }
+  return dirty
+}
+
+// HIGHLIGHT WORKER
+
+function startWorker(cm, time) {
+  if (cm.doc.highlightFrontier < cm.display.viewTo)
+    { cm.state.highlight.set(time, bind(highlightWorker, cm)); }
+}
+
+function highlightWorker(cm) {
+  var doc = cm.doc;
+  if (doc.highlightFrontier >= cm.display.viewTo) { return }
+  var end = +new Date + cm.options.workTime;
+  var context = getContextBefore(cm, doc.highlightFrontier);
+  var changedLines = [];
+
+  doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
+    if (context.line >= cm.display.viewFrom) { // Visible
+      var oldStyles = line.styles;
+      var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null;
+      var highlighted = highlightLine(cm, line, context, true);
+      if (resetState) { context.state = resetState; }
+      line.styles = highlighted.styles;
+      var oldCls = line.styleClasses, newCls = highlighted.classes;
+      if (newCls) { line.styleClasses = newCls; }
+      else if (oldCls) { line.styleClasses = null; }
+      var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+        oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
+      for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i]; }
+      if (ischange) { changedLines.push(context.line); }
+      line.stateAfter = context.save();
+      context.nextLine();
+    } else {
+      if (line.text.length <= cm.options.maxHighlightLength)
+        { processLine(cm, line.text, context); }
+      line.stateAfter = context.line % 5 == 0 ? context.save() : null;
+      context.nextLine();
+    }
+    if (+new Date > end) {
+      startWorker(cm, cm.options.workDelay);
+      return true
+    }
+  });
+  doc.highlightFrontier = context.line;
+  doc.modeFrontier = Math.max(doc.modeFrontier, context.line);
+  if (changedLines.length) { runInOp(cm, function () {
+    for (var i = 0; i < changedLines.length; i++)
+      { regLineChange(cm, changedLines[i], "text"); }
+  }); }
+}
+
+// DISPLAY DRAWING
+
+var DisplayUpdate = function(cm, viewport, force) {
+  var display = cm.display;
+
+  this.viewport = viewport;
+  // Store some values that we'll need later (but don't want to force a relayout for)
+  this.visible = visibleLines(display, cm.doc, viewport);
+  this.editorIsHidden = !display.wrapper.offsetWidth;
+  this.wrapperHeight = display.wrapper.clientHeight;
+  this.wrapperWidth = display.wrapper.clientWidth;
+  this.oldDisplayWidth = displayWidth(cm);
+  this.force = force;
+  this.dims = getDimensions(cm);
+  this.events = [];
+};
+
+DisplayUpdate.prototype.signal = function (emitter, type) {
+  if (hasHandler(emitter, type))
+    { this.events.push(arguments); }
+};
+DisplayUpdate.prototype.finish = function () {
+    var this$1 = this;
+
+  for (var i = 0; i < this.events.length; i++)
+    { signal.apply(null, this$1.events[i]); }
+};
+
+function maybeClipScrollbars(cm) {
+  var display = cm.display;
+  if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+    display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+    display.heightForcer.style.height = scrollGap(cm) + "px";
+    display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+    display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+    display.scrollbarsClipped = true;
+  }
+}
+
+function selectionSnapshot(cm) {
+  if (cm.hasFocus()) { return null }
+  var active = activeElt();
+  if (!active || !contains(cm.display.lineDiv, active)) { return null }
+  var result = {activeElt: active};
+  if (window.getSelection) {
+    var sel = window.getSelection();
+    if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
+      result.anchorNode = sel.anchorNode;
+      result.anchorOffset = sel.anchorOffset;
+      result.focusNode = sel.focusNode;
+      result.focusOffset = sel.focusOffset;
+    }
+  }
+  return result
+}
+
+function restoreSelection(snapshot) {
+  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { return }
+  snapshot.activeElt.focus();
+  if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+    var sel = window.getSelection(), range$$1 = document.createRange();
+    range$$1.setEnd(snapshot.anchorNode, snapshot.anchorOffset);
+    range$$1.collapse(false);
+    sel.removeAllRanges();
+    sel.addRange(range$$1);
+    sel.extend(snapshot.focusNode, snapshot.focusOffset);
+  }
+}
+
+// Does the actual updating of the line display. Bails out
+// (returning false) when there is nothing to be done and forced is
+// false.
+function updateDisplayIfNeeded(cm, update) {
+  var display = cm.display, doc = cm.doc;
+
+  if (update.editorIsHidden) {
+    resetView(cm);
+    return false
+  }
+
+  // Bail out if the visible area is already rendered and nothing changed.
+  if (!update.force &&
+      update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
+      (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
+      display.renderedView == display.view && countDirtyView(cm) == 0)
+    { return false }
+
+  if (maybeUpdateLineNumberWidth(cm)) {
+    resetView(cm);
+    update.dims = getDimensions(cm);
+  }
+
+  // Compute a suitable new viewport (from & to)
+  var end = doc.first + doc.size;
+  var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+  var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
+  if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom); }
+  if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo); }
+  if (sawCollapsedSpans) {
+    from = visualLineNo(cm.doc, from);
+    to = visualLineEndNo(cm.doc, to);
+  }
+
+  var different = from != display.viewFrom || to != display.viewTo ||
+    display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
+  adjustView(cm, from, to);
+
+  display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
+  // Position the mover div to align with the current scroll position
+  cm.display.mover.style.top = display.viewOffset + "px";
+
+  var toUpdate = countDirtyView(cm);
+  if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
+      (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+    { return false }
+
+  // For big changes, we hide the enclosing element during the
+  // update, since that speeds up the operations on most browsers.
+  var selSnapshot = selectionSnapshot(cm);
+  if (toUpdate > 4) { display.lineDiv.style.display = "none"; }
+  patchDisplay(cm, display.updateLineNumbers, update.dims);
+  if (toUpdate > 4) { display.lineDiv.style.display = ""; }
+  display.renderedView = display.view;
+  // There might have been a widget with a focused element that got
+  // hidden or updated, if so re-focus it.
+  restoreSelection(selSnapshot);
+
+  // Prevent selection and cursors from interfering with the scroll
+  // width and height.
+  removeChildren(display.cursorDiv);
+  removeChildren(display.selectionDiv);
+  display.gutters.style.height = display.sizer.style.minHeight = 0;
+
+  if (different) {
+    display.lastWrapHeight = update.wrapperHeight;
+    display.lastWrapWidth = update.wrapperWidth;
+    startWorker(cm, 400);
+  }
+
+  display.updateLineNumbers = null;
+
+  return true
+}
+
+function postUpdateDisplay(cm, update) {
+  var viewport = update.viewport;
+
+  for (var first = true;; first = false) {
+    if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
+      // Clip forced viewport to actual scrollable area.
+      if (viewport && viewport.top != null)
+        { viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)}; }
+      // Updated line heights might result in the drawn area not
+      // actually covering the viewport. Keep looping until it does.
+      update.visible = visibleLines(cm.display, cm.doc, viewport);
+      if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
+        { break }
+    }
+    if (!updateDisplayIfNeeded(cm, update)) { break }
+    updateHeightsInViewport(cm);
+    var barMeasure = measureForScrollbars(cm);
+    updateSelection(cm);
+    updateScrollbars(cm, barMeasure);
+    setDocumentHeight(cm, barMeasure);
+    update.force = false;
+  }
+
+  update.signal(cm, "update", cm);
+  if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
+    update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+    cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+  }
+}
+
+function updateDisplaySimple(cm, viewport) {
+  var update = new DisplayUpdate(cm, viewport);
+  if (updateDisplayIfNeeded(cm, update)) {
+    updateHeightsInViewport(cm);
+    postUpdateDisplay(cm, update);
+    var barMeasure = measureForScrollbars(cm);
+    updateSelection(cm);
+    updateScrollbars(cm, barMeasure);
+    setDocumentHeight(cm, barMeasure);
+    update.finish();
+  }
+}
+
+// Sync the actual display DOM structure with display.view, removing
+// nodes for lines that are no longer in view, and creating the ones
+// that are not there yet, and updating the ones that are out of
+// date.
+function patchDisplay(cm, updateNumbersFrom, dims) {
+  var display = cm.display, lineNumbers = cm.options.lineNumbers;
+  var container = display.lineDiv, cur = container.firstChild;
+
+  function rm(node) {
+    var next = node.nextSibling;
+    // Works around a throw-scroll bug in OS X Webkit
+    if (webkit && mac && cm.display.currentWheelTarget == node)
+      { node.style.display = "none"; }
+    else
+      { node.parentNode.removeChild(node); }
+    return next
+  }
+
+  var view = display.view, lineN = display.viewFrom;
+  // Loop over the elements in the view, syncing cur (the DOM nodes
+  // in display.lineDiv) with the view as we go.
+  for (var i = 0; i < view.length; i++) {
+    var lineView = view[i];
+    if (lineView.hidden) {
+    } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
+      var node = buildLineElement(cm, lineView, lineN, dims);
+      container.insertBefore(node, cur);
+    } else { // Already drawn
+      while (cur != lineView.node) { cur = rm(cur); }
+      var updateNumber = lineNumbers && updateNumbersFrom != null &&
+        updateNumbersFrom <= lineN && lineView.lineNumber;
+      if (lineView.changes) {
+        if (indexOf(lineView.changes, "gutter") > -1) { updateNumber = false; }
+        updateLineForChanges(cm, lineView, lineN, dims);
+      }
+      if (updateNumber) {
+        removeChildren(lineView.lineNumber);
+        lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
+      }
+      cur = lineView.node.nextSibling;
+    }
+    lineN += lineView.size;
+  }
+  while (cur) { cur = rm(cur); }
+}
+
+function updateGutterSpace(cm) {
+  var width = cm.display.gutters.offsetWidth;
+  cm.display.sizer.style.marginLeft = width + "px";
+}
+
+function setDocumentHeight(cm, measure) {
+  cm.display.sizer.style.minHeight = measure.docHeight + "px";
+  cm.display.heightForcer.style.top = measure.docHeight + "px";
+  cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
+}
+
+// Rebuild the gutter elements, ensure the margin to the left of the
+// code matches their width.
+function updateGutters(cm) {
+  var gutters = cm.display.gutters, specs = cm.options.gutters;
+  removeChildren(gutters);
+  var i = 0;
+  for (; i < specs.length; ++i) {
+    var gutterClass = specs[i];
+    var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
+    if (gutterClass == "CodeMirror-linenumbers") {
+      cm.display.lineGutter = gElt;
+      gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
+    }
+  }
+  gutters.style.display = i ? "" : "none";
+  updateGutterSpace(cm);
+}
+
+// Make sure the gutters options contains the element
+// "CodeMirror-linenumbers" when the lineNumbers option is true.
+function setGuttersForLineNumbers(options) {
+  var found = indexOf(options.gutters, "CodeMirror-linenumbers");
+  if (found == -1 && options.lineNumbers) {
+    options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
+  } else if (found > -1 && !options.lineNumbers) {
+    options.gutters = options.gutters.slice(0);
+    options.gutters.splice(found, 1);
+  }
+}
+
+// Since the delta values reported on mouse wheel events are
+// unstandardized between browsers and even browser versions, and
+// generally horribly unpredictable, this code starts by measuring
+// the scroll effect that the first few mouse wheel events have,
+// and, from that, detects the way it can convert deltas to pixel
+// offsets afterwards.
+//
+// The reason we want to know the amount a wheel event will scroll
+// is that it gives us a chance to update the display before the
+// actual scrolling happens, reducing flickering.
+
+var wheelSamples = 0;
+var wheelPixelsPerUnit = null;
+// Fill in a browser-detected starting value on browsers where we
+// know one. These don't have to be accurate -- the result of them
+// being wrong would just be a slight flicker on the first wheel
+// scroll (if it is large enough).
+if (ie) { wheelPixelsPerUnit = -.53; }
+else if (gecko) { wheelPixelsPerUnit = 15; }
+else if (chrome) { wheelPixelsPerUnit = -.7; }
+else if (safari) { wheelPixelsPerUnit = -1/3; }
+
+function wheelEventDelta(e) {
+  var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
+  if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail; }
+  if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail; }
+  else if (dy == null) { dy = e.wheelDelta; }
+  return {x: dx, y: dy}
+}
+function wheelEventPixels(e) {
+  var delta = wheelEventDelta(e);
+  delta.x *= wheelPixelsPerUnit;
+  delta.y *= wheelPixelsPerUnit;
+  return delta
+}
+
+function onScrollWheel(cm, e) {
+  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+
+  var display = cm.display, scroll = display.scroller;
+  // Quit if there's nothing to scroll here
+  var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+  var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+  if (!(dx && canScrollX || dy && canScrollY)) { return }
+
+  // Webkit browsers on OS X abort momentum scrolls when the target
+  // of the scroll event is removed from the scrollable element.
+  // This hack (see related code in patchDisplay) makes sure the
+  // element is kept around.
+  if (dy && mac && webkit) {
+    outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+      for (var i = 0; i < view.length; i++) {
+        if (view[i].node == cur) {
+          cm.display.currentWheelTarget = cur;
+          break outer
+        }
+      }
+    }
+  }
+
+  // On some browsers, horizontal scrolling will cause redraws to
+  // happen before the gutter has been realigned, causing it to
+  // wriggle around in a most unseemly way. When we have an
+  // estimated pixels/delta value, we just handle horizontal
+  // scrolling entirely here. It'll be slightly off from native, but
+  // better than glitching out.
+  if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
+    if (dy && canScrollY)
+      { updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit)); }
+    setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit));
+    // Only prevent default scrolling if vertical scrolling is
+    // actually possible. Otherwise, it causes vertical scroll
+    // jitter on OSX trackpads when deltaX is small and deltaY
+    // is large (issue #3579)
+    if (!dy || (dy && canScrollY))
+      { e_preventDefault(e); }
+    display.wheelStartX = null; // Abort measurement, if in progress
+    return
+  }
+
+  // 'Project' the visible viewport to cover the area that is being
+  // scrolled into view (if we know enough to estimate it).
+  if (dy && wheelPixelsPerUnit != null) {
+    var pixels = dy * wheelPixelsPerUnit;
+    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
+    if (pixels < 0) { top = Math.max(0, top + pixels - 50); }
+    else { bot = Math.min(cm.doc.height, bot + pixels + 50); }
+    updateDisplaySimple(cm, {top: top, bottom: bot});
+  }
+
+  if (wheelSamples < 20) {
+    if (display.wheelStartX == null) {
+      display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
+      display.wheelDX = dx; display.wheelDY = dy;
+      setTimeout(function () {
+        if (display.wheelStartX == null) { return }
+        var movedX = scroll.scrollLeft - display.wheelStartX;
+        var movedY = scroll.scrollTop - display.wheelStartY;
+        var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
+          (movedX && display.wheelDX && movedX / display.wheelDX);
+        display.wheelStartX = display.wheelStartY = null;
+        if (!sample) { return }
+        wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
+        ++wheelSamples;
+      }, 200);
+    } else {
+      display.wheelDX += dx; display.wheelDY += dy;
+    }
+  }
+}
+
+// Selection objects are immutable. A new one is created every time
+// the selection changes. A selection is one or more non-overlapping
+// (and non-touching) ranges, sorted, and an integer that indicates
+// which one is the primary selection (the one that's scrolled into
+// view, that getCursor returns, etc).
+var Selection = function(ranges, primIndex) {
+  this.ranges = ranges;
+  this.primIndex = primIndex;
+};
+
+Selection.prototype.primary = function () { return this.ranges[this.primIndex] };
+
+Selection.prototype.equals = function (other) {
+    var this$1 = this;
+
+  if (other == this) { return true }
+  if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false }
+  for (var i = 0; i < this.ranges.length; i++) {
+    var here = this$1.ranges[i], there = other.ranges[i];
+    if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { return false }
+  }
+  return true
+};
+
+Selection.prototype.deepCopy = function () {
+    var this$1 = this;
+
+  var out = [];
+  for (var i = 0; i < this.ranges.length; i++)
+    { out[i] = new Range(copyPos(this$1.ranges[i].anchor), copyPos(this$1.ranges[i].head)); }
+  return new Selection(out, this.primIndex)
+};
+
+Selection.prototype.somethingSelected = function () {
+    var this$1 = this;
+
+  for (var i = 0; i < this.ranges.length; i++)
+    { if (!this$1.ranges[i].empty()) { return true } }
+  return false
+};
+
+Selection.prototype.contains = function (pos, end) {
+    var this$1 = this;
+
+  if (!end) { end = pos; }
+  for (var i = 0; i < this.ranges.length; i++) {
+    var range = this$1.ranges[i];
+    if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
+      { return i }
+  }
+  return -1
+};
+
+var Range = function(anchor, head) {
+  this.anchor = anchor; this.head = head;
+};
+
+Range.prototype.from = function () { return minPos(this.anchor, this.head) };
+Range.prototype.to = function () { return maxPos(this.anchor, this.head) };
+Range.prototype.empty = function () { return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch };
+
+// Take an unsorted, potentially overlapping set of ranges, and
+// build a selection out of it. 'Consumes' ranges array (modifying
+// it).
+function normalizeSelection(ranges, primIndex) {
+  var prim = ranges[primIndex];
+  ranges.sort(function (a, b) { return cmp(a.from(), b.from()); });
+  primIndex = indexOf(ranges, prim);
+  for (var i = 1; i < ranges.length; i++) {
+    var cur = ranges[i], prev = ranges[i - 1];
+    if (cmp(prev.to(), cur.from()) >= 0) {
+      var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
+      var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
+      if (i <= primIndex) { --primIndex; }
+      ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
+    }
+  }
+  return new Selection(ranges, primIndex)
+}
+
+function simpleSelection(anchor, head) {
+  return new Selection([new Range(anchor, head || anchor)], 0)
+}
+
+// Compute the position of the end of a change (its 'to' property
+// refers to the pre-change end).
+function changeEnd(change) {
+  if (!change.text) { return change.to }
+  return Pos(change.from.line + change.text.length - 1,
+             lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0))
+}
+
+// Adjust a position to refer to the post-change position of the
+// same text, or the end of the change if the change covers it.
+function adjustForChange(pos, change) {
+  if (cmp(pos, change.from) < 0) { return pos }
+  if (cmp(pos, change.to) <= 0) { return changeEnd(change) }
+
+  var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
+  if (pos.line == change.to.line) { ch += changeEnd(change).ch - change.to.ch; }
+  return Pos(line, ch)
+}
+
+function computeSelAfterChange(doc, change) {
+  var out = [];
+  for (var i = 0; i < doc.sel.ranges.length; i++) {
+    var range = doc.sel.ranges[i];
+    out.push(new Range(adjustForChange(range.anchor, change),
+                       adjustForChange(range.head, change)));
+  }
+  return normalizeSelection(out, doc.sel.primIndex)
+}
+
+function offsetPos(pos, old, nw) {
+  if (pos.line == old.line)
+    { return Pos(nw.line, pos.ch - old.ch + nw.ch) }
+  else
+    { return Pos(nw.line + (pos.line - old.line), pos.ch) }
+}
+
+// Used by replaceSelections to allow moving the selection to the
+// start or around the replaced test. Hint may be "start" or "around".
+function computeReplacedSel(doc, changes, hint) {
+  var out = [];
+  var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
+  for (var i = 0; i < changes.length; i++) {
+    var change = changes[i];
+    var from = offsetPos(change.from, oldPrev, newPrev);
+    var to = offsetPos(changeEnd(change), oldPrev, newPrev);
+    oldPrev = change.to;
+    newPrev = to;
+    if (hint == "around") {
+      var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
+      out[i] = new Range(inv ? to : from, inv ? from : to);
+    } else {
+      out[i] = new Range(from, from);
+    }
+  }
+  return new Selection(out, doc.sel.primIndex)
+}
+
+// Used to get the editor into a consistent state again when options change.
+
+function loadMode(cm) {
+  cm.doc.mode = getMode(cm.options, cm.doc.modeOption);
+  resetModeState(cm);
+}
+
+function resetModeState(cm) {
+  cm.doc.iter(function (line) {
+    if (line.stateAfter) { line.stateAfter = null; }
+    if (line.styles) { line.styles = null; }
+  });
+  cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first;
+  startWorker(cm, 100);
+  cm.state.modeGen++;
+  if (cm.curOp) { regChange(cm); }
+}
+
+// DOCUMENT DATA STRUCTURE
+
+// By default, updates that start and end at the beginning of a line
+// are treated specially, in order to make the association of line
+// widgets and marker elements with the text behave more intuitive.
+function isWholeLineUpdate(doc, change) {
+  return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
+    (!doc.cm || doc.cm.options.wholeLineUpdateBefore)
+}
+
+// Perform a change on the document data structure.
+function updateDoc(doc, change, markedSpans, estimateHeight$$1) {
+  function spansFor(n) {return markedSpans ? markedSpans[n] : null}
+  function update(line, text, spans) {
+    updateLine(line, text, spans, estimateHeight$$1);
+    signalLater(line, "change", line, change);
+  }
+  function linesFor(start, end) {
+    var result = [];
+    for (var i = start; i < end; ++i)
+      { result.push(new Line(text[i], spansFor(i), estimateHeight$$1)); }
+    return result
+  }
+
+  var from = change.from, to = change.to, text = change.text;
+  var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
+  var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
+
+  // Adjust the line structure
+  if (change.full) {
+    doc.insert(0, linesFor(0, text.length));
+    doc.remove(text.length, doc.size - text.length);
+  } else if (isWholeLineUpdate(doc, change)) {
+    // This is a whole-line replace. Treated specially to make
+    // sure line objects move the way they are supposed to.
+    var added = linesFor(0, text.length - 1);
+    update(lastLine, lastLine.text, lastSpans);
+    if (nlines) { doc.remove(from.line, nlines); }
+    if (added.length) { doc.insert(from.line, added); }
+  } else if (firstLine == lastLine) {
+    if (text.length == 1) {
+      update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
+    } else {
+      var added$1 = linesFor(1, text.length - 1);
+      added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight$$1));
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+      doc.insert(from.line + 1, added$1);
+    }
+  } else if (text.length == 1) {
+    update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
+    doc.remove(from.line + 1, nlines);
+  } else {
+    update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+    update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
+    var added$2 = linesFor(1, text.length - 1);
+    if (nlines > 1) { doc.remove(from.line + 1, nlines - 1); }
+    doc.insert(from.line + 1, added$2);
+  }
+
+  signalLater(doc, "change", doc, change);
+}
+
+// Call f for all linked documents.
+function linkedDocs(doc, f, sharedHistOnly) {
+  function propagate(doc, skip, sharedHist) {
+    if (doc.linked) { for (var i = 0; i < doc.linked.length; ++i) {
+      var rel = doc.linked[i];
+      if (rel.doc == skip) { continue }
+      var shared = sharedHist && rel.sharedHist;
+      if (sharedHistOnly && !shared) { continue }
+      f(rel.doc, shared);
+      propagate(rel.doc, doc, shared);
+    } }
+  }
+  propagate(doc, null, true);
+}
+
+// Attach a document to an editor.
+function attachDoc(cm, doc) {
+  if (doc.cm) { throw new Error("This document is already in use.") }
+  cm.doc = doc;
+  doc.cm = cm;
+  estimateLineHeights(cm);
+  loadMode(cm);
+  setDirectionClass(cm);
+  if (!cm.options.lineWrapping) { findMaxLine(cm); }
+  cm.options.mode = doc.modeOption;
+  regChange(cm);
+}
+
+function setDirectionClass(cm) {
+  (cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl");
+}
+
+function directionChanged(cm) {
+  runInOp(cm, function () {
+    setDirectionClass(cm);
+    regChange(cm);
+  });
+}
+
+function History(startGen) {
+  // Arrays of change events and selections. Doing something adds an
+  // event to done and clears undo. Undoing moves events from done
+  // to undone, redoing moves them in the other direction.
+  this.done = []; this.undone = [];
+  this.undoDepth = Infinity;
+  // Used to track when changes can be merged into a single undo
+  // event
+  this.lastModTime = this.lastSelTime = 0;
+  this.lastOp = this.lastSelOp = null;
+  this.lastOrigin = this.lastSelOrigin = null;
+  // Used by the isClean() method
+  this.generation = this.maxGeneration = startGen || 1;
+}
+
+// Create a history change event from an updateDoc-style change
+// object.
+function historyChangeFromChange(doc, change) {
+  var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+  attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
+  linkedDocs(doc, function (doc) { return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); }, true);
+  return histChange
+}
+
+// Pop all selection events off the end of a history array. Stop at
+// a change event.
+function clearSelectionEvents(array) {
+  while (array.length) {
+    var last = lst(array);
+    if (last.ranges) { array.pop(); }
+    else { break }
+  }
+}
+
+// Find the top change event in the history. Pop off selection
+// events that are in the way.
+function lastChangeEvent(hist, force) {
+  if (force) {
+    clearSelectionEvents(hist.done);
+    return lst(hist.done)
+  } else if (hist.done.length && !lst(hist.done).ranges) {
+    return lst(hist.done)
+  } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
+    hist.done.pop();
+    return lst(hist.done)
+  }
+}
+
+// Register a change in the history. Merges changes that are within
+// a single operation, or are close together with an origin that
+// allows merging (starting with "+") into a single event.
+function addChangeToHistory(doc, change, selAfter, opId) {
+  var hist = doc.history;
+  hist.undone.length = 0;
+  var time = +new Date, cur;
+  var last;
+
+  if ((hist.lastOp == opId ||
+       hist.lastOrigin == change.origin && change.origin &&
+       ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
+        change.origin.charAt(0) == "*")) &&
+      (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
+    // Merge this change into the last event
+    last = lst(cur.changes);
+    if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
+      // Optimized case for simple insertion -- don't want to add
+      // new changesets for every character typed
+      last.to = changeEnd(change);
+    } else {
+      // Add new sub-event
+      cur.changes.push(historyChangeFromChange(doc, change));
+    }
+  } else {
+    // Can not be merged, start a new event.
+    var before = lst(hist.done);
+    if (!before || !before.ranges)
+      { pushSelectionToHistory(doc.sel, hist.done); }
+    cur = {changes: [historyChangeFromChange(doc, change)],
+           generation: hist.generation};
+    hist.done.push(cur);
+    while (hist.done.length > hist.undoDepth) {
+      hist.done.shift();
+      if (!hist.done[0].ranges) { hist.done.shift(); }
+    }
+  }
+  hist.done.push(selAfter);
+  hist.generation = ++hist.maxGeneration;
+  hist.lastModTime = hist.lastSelTime = time;
+  hist.lastOp = hist.lastSelOp = opId;
+  hist.lastOrigin = hist.lastSelOrigin = change.origin;
+
+  if (!last) { signal(doc, "historyAdded"); }
+}
+
+function selectionEventCanBeMerged(doc, origin, prev, sel) {
+  var ch = origin.charAt(0);
+  return ch == "*" ||
+    ch == "+" &&
+    prev.ranges.length == sel.ranges.length &&
+    prev.somethingSelected() == sel.somethingSelected() &&
+    new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500)
+}
+
+// Called whenever the selection changes, sets the new selection as
+// the pending selection in the history, and pushes the old pending
+// selection into the 'done' array when it was significantly
+// different (in number of selected ranges, emptiness, or time).
+function addSelectionToHistory(doc, sel, opId, options) {
+  var hist = doc.history, origin = options && options.origin;
+
+  // A new event is started when the previous origin does not match
+  // the current, or the origins don't allow matching. Origins
+  // starting with * are always merged, those starting with + are
+  // merged when similar and close together in time.
+  if (opId == hist.lastSelOp ||
+      (origin && hist.lastSelOrigin == origin &&
+       (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
+        selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
+    { hist.done[hist.done.length - 1] = sel; }
+  else
+    { pushSelectionToHistory(sel, hist.done); }
+
+  hist.lastSelTime = +new Date;
+  hist.lastSelOrigin = origin;
+  hist.lastSelOp = opId;
+  if (options && options.clearRedo !== false)
+    { clearSelectionEvents(hist.undone); }
+}
+
+function pushSelectionToHistory(sel, dest) {
+  var top = lst(dest);
+  if (!(top && top.ranges && top.equals(sel)))
+    { dest.push(sel); }
+}
+
+// Used to store marked span information in the history.
+function attachLocalSpans(doc, change, from, to) {
+  var existing = change["spans_" + doc.id], n = 0;
+  doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) {
+    if (line.markedSpans)
+      { (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; }
+    ++n;
+  });
+}
+
+// When un/re-doing restores text containing marked spans, those
+// that have been explicitly cleared should not be restored.
+function removeClearedSpans(spans) {
+  if (!spans) { return null }
+  var out;
+  for (var i = 0; i < spans.length; ++i) {
+    if (spans[i].marker.explicitlyCleared) { if (!out) { out = spans.slice(0, i); } }
+    else if (out) { out.push(spans[i]); }
+  }
+  return !out ? spans : out.length ? out : null
+}
+
+// Retrieve and filter the old marked spans stored in a change event.
+function getOldSpans(doc, change) {
+  var found = change["spans_" + doc.id];
+  if (!found) { return null }
+  var nw = [];
+  for (var i = 0; i < change.text.length; ++i)
+    { nw.push(removeClearedSpans(found[i])); }
+  return nw
+}
+
+// Used for un/re-doing changes from the history. Combines the
+// result of computing the existing spans with the set of spans that
+// existed in the history (so that deleting around a span and then
+// undoing brings back the span).
+function mergeOldSpans(doc, change) {
+  var old = getOldSpans(doc, change);
+  var stretched = stretchSpansOverChange(doc, change);
+  if (!old) { return stretched }
+  if (!stretched) { return old }
+
+  for (var i = 0; i < old.length; ++i) {
+    var oldCur = old[i], stretchCur = stretched[i];
+    if (oldCur && stretchCur) {
+      spans: for (var j = 0; j < stretchCur.length; ++j) {
+        var span = stretchCur[j];
+        for (var k = 0; k < oldCur.length; ++k)
+          { if (oldCur[k].marker == span.marker) { continue spans } }
+        oldCur.push(span);
+      }
+    } else if (stretchCur) {
+      old[i] = stretchCur;
+    }
+  }
+  return old
+}
+
+// Used both to provide a JSON-safe object in .getHistory, and, when
+// detaching a document, to split the history in two
+function copyHistoryArray(events, newGroup, instantiateSel) {
+  var copy = [];
+  for (var i = 0; i < events.length; ++i) {
+    var event = events[i];
+    if (event.ranges) {
+      copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
+      continue
+    }
+    var changes = event.changes, newChanges = [];
+    copy.push({changes: newChanges});
+    for (var j = 0; j < changes.length; ++j) {
+      var change = changes[j], m = (void 0);
+      newChanges.push({from: change.from, to: change.to, text: change.text});
+      if (newGroup) { for (var prop in change) { if (m = prop.match(/^spans_(\d+)$/)) {
+        if (indexOf(newGroup, Number(m[1])) > -1) {
+          lst(newChanges)[prop] = change[prop];
+          delete change[prop];
+        }
+      } } }
+    }
+  }
+  return copy
+}
+
+// The 'scroll' parameter given to many of these indicated whether
+// the new cursor position should be scrolled into view after
+// modifying the selection.
+
+// If shift is held or the extend flag is set, extends a range to
+// include a given position (and optionally a second position).
+// Otherwise, simply returns the range between the given positions.
+// Used for cursor motion and such.
+function extendRange(range, head, other, extend) {
+  if (extend) {
+    var anchor = range.anchor;
+    if (other) {
+      var posBefore = cmp(head, anchor) < 0;
+      if (posBefore != (cmp(other, anchor) < 0)) {
+        anchor = head;
+        head = other;
+      } else if (posBefore != (cmp(head, other) < 0)) {
+        head = other;
+      }
+    }
+    return new Range(anchor, head)
+  } else {
+    return new Range(other || head, head)
+  }
+}
+
+// Extend the primary selection range, discard the rest.
+function extendSelection(doc, head, other, options, extend) {
+  if (extend == null) { extend = doc.cm && (doc.cm.display.shift || doc.extend); }
+  setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options);
+}
+
+// Extend all selections (pos is an array of selections with length
+// equal the number of selections)
+function extendSelections(doc, heads, options) {
+  var out = [];
+  var extend = doc.cm && (doc.cm.display.shift || doc.extend);
+  for (var i = 0; i < doc.sel.ranges.length; i++)
+    { out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend); }
+  var newSel = normalizeSelection(out, doc.sel.primIndex);
+  setSelection(doc, newSel, options);
+}
+
+// Updates a single range in the selection.
+function replaceOneSelection(doc, i, range, options) {
+  var ranges = doc.sel.ranges.slice(0);
+  ranges[i] = range;
+  setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
+}
+
+// Reset the selection to a single range.
+function setSimpleSelection(doc, anchor, head, options) {
+  setSelection(doc, simpleSelection(anchor, head), options);
+}
+
+// Give beforeSelectionChange handlers a change to influence a
+// selection update.
+function filterSelectionChange(doc, sel, options) {
+  var obj = {
+    ranges: sel.ranges,
+    update: function(ranges) {
+      var this$1 = this;
+
+      this.ranges = [];
+      for (var i = 0; i < ranges.length; i++)
+        { this$1.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
+                                   clipPos(doc, ranges[i].head)); }
+    },
+    origin: options && options.origin
+  };
+  signal(doc, "beforeSelectionChange", doc, obj);
+  if (doc.cm) { signal(doc.cm, "beforeSelectionChange", doc.cm, obj); }
+  if (obj.ranges != sel.ranges) { return normalizeSelection(obj.ranges, obj.ranges.length - 1) }
+  else { return sel }
+}
+
+function setSelectionReplaceHistory(doc, sel, options) {
+  var done = doc.history.done, last = lst(done);
+  if (last && last.ranges) {
+    done[done.length - 1] = sel;
+    setSelectionNoUndo(doc, sel, options);
+  } else {
+    setSelection(doc, sel, options);
+  }
+}
+
+// Set a new selection.
+function setSelection(doc, sel, options) {
+  setSelectionNoUndo(doc, sel, options);
+  addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
+}
+
+function setSelectionNoUndo(doc, sel, options) {
+  if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
+    { sel = filterSelectionChange(doc, sel, options); }
+
+  var bias = options && options.bias ||
+    (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
+  setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+
+  if (!(options && options.scroll === false) && doc.cm)
+    { ensureCursorVisible(doc.cm); }
+}
+
+function setSelectionInner(doc, sel) {
+  if (sel.equals(doc.sel)) { return }
+
+  doc.sel = sel;
+
+  if (doc.cm) {
+    doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
+    signalCursorActivity(doc.cm);
+  }
+  signalLater(doc, "cursorActivity", doc);
+}
+
+// Verify that the selection does not partially select any atomic
+// marked ranges.
+function reCheckSelection(doc) {
+  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false));
+}
+
+// Return a selection that does not partially select any atomic
+// ranges.
+function skipAtomicInSelection(doc, sel, bias, mayClear) {
+  var out;
+  for (var i = 0; i < sel.ranges.length; i++) {
+    var range = sel.ranges[i];
+    var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+    var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+    var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
+    if (out || newAnchor != range.anchor || newHead != range.head) {
+      if (!out) { out = sel.ranges.slice(0, i); }
+      out[i] = new Range(newAnchor, newHead);
+    }
+  }
+  return out ? normalizeSelection(out, sel.primIndex) : sel
+}
+
+function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+  var line = getLine(doc, pos.line);
+  if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
+    var sp = line.markedSpans[i], m = sp.marker;
+    if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+        (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+      if (mayClear) {
+        signal(m, "beforeCursorEnter");
+        if (m.explicitlyCleared) {
+          if (!line.markedSpans) { break }
+          else {--i; continue}
+        }
+      }
+      if (!m.atomic) { continue }
+
+      if (oldPos) {
+        var near = m.find(dir < 0 ? 1 : -1), diff = (void 0);
+        if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+          { near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); }
+        if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+          { return skipAtomicInner(doc, near, pos, dir, mayClear) }
+      }
+
+      var far = m.find(dir < 0 ? -1 : 1);
+      if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+        { far = movePos(doc, far, dir, far.line == pos.line ? line : null); }
+      return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
+    }
+  } }
+  return pos
+}
+
+// Ensure a given position is not inside an atomic range.
+function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+  var dir = bias || 1;
+  var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+      (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+      skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+      (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+  if (!found) {
+    doc.cantEdit = true;
+    return Pos(doc.first, 0)
+  }
+  return found
+}
+
+function movePos(doc, pos, dir, line) {
+  if (dir < 0 && pos.ch == 0) {
+    if (pos.line > doc.first) { return clipPos(doc, Pos(pos.line - 1)) }
+    else { return null }
+  } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+    if (pos.line < doc.first + doc.size - 1) { return Pos(pos.line + 1, 0) }
+    else { return null }
+  } else {
+    return new Pos(pos.line, pos.ch + dir)
+  }
+}
+
+function selectAll(cm) {
+  cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);
+}
+
+// UPDATING
+
+// Allow "beforeChange" event handlers to influence a change
+function filterChange(doc, change, update) {
+  var obj = {
+    canceled: false,
+    from: change.from,
+    to: change.to,
+    text: change.text,
+    origin: change.origin,
+    cancel: function () { return obj.canceled = true; }
+  };
+  if (update) { obj.update = function (from, to, text, origin) {
+    if (from) { obj.from = clipPos(doc, from); }
+    if (to) { obj.to = clipPos(doc, to); }
+    if (text) { obj.text = text; }
+    if (origin !== undefined) { obj.origin = origin; }
+  }; }
+  signal(doc, "beforeChange", doc, obj);
+  if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj); }
+
+  if (obj.canceled) { return null }
+  return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
+}
+
+// Apply a change to a document, and add it to the document's
+// history, and propagating it to all linked documents.
+function makeChange(doc, change, ignoreReadOnly) {
+  if (doc.cm) {
+    if (!doc.cm.curOp) { return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly) }
+    if (doc.cm.state.suppressEdits) { return }
+  }
+
+  if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
+    change = filterChange(doc, change, true);
+    if (!change) { return }
+  }
+
+  // Possibly split or suppress the update based on the presence
+  // of read-only spans in its range.
+  var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
+  if (split) {
+    for (var i = split.length - 1; i >= 0; --i)
+      { makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text, origin: change.origin}); }
+  } else {
+    makeChangeInner(doc, change);
+  }
+}
+
+function makeChangeInner(doc, change) {
+  if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { return }
+  var selAfter = computeSelAfterChange(doc, change);
+  addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
+
+  makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
+  var rebased = [];
+
+  linkedDocs(doc, function (doc, sharedHist) {
+    if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+      rebaseHist(doc.history, change);
+      rebased.push(doc.history);
+    }
+    makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
+  });
+}
+
+// Revert a change stored in a document's history.
+function makeChangeFromHistory(doc, type, allowSelectionOnly) {
+  var suppress = doc.cm && doc.cm.state.suppressEdits;
+  if (suppress && !allowSelectionOnly) { return }
+
+  var hist = doc.history, event, selAfter = doc.sel;
+  var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+
+  // Verify that there is a useable event (so that ctrl-z won't
+  // needlessly clear selection events)
+  var i = 0;
+  for (; i < source.length; i++) {
+    event = source[i];
+    if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
+      { break }
+  }
+  if (i == source.length) { return }
+  hist.lastOrigin = hist.lastSelOrigin = null;
+
+  for (;;) {
+    event = source.pop();
+    if (event.ranges) {
+      pushSelectionToHistory(event, dest);
+      if (allowSelectionOnly && !event.equals(doc.sel)) {
+        setSelection(doc, event, {clearRedo: false});
+        return
+      }
+      selAfter = event;
+    } else if (suppress) {
+      source.push(event);
+      return
+    } else { break }
+  }
+
+  // Build up a reverse change object to add to the opposite history
+  // stack (redo when undoing, and vice versa).
+  var antiChanges = [];
+  pushSelectionToHistory(selAfter, dest);
+  dest.push({changes: antiChanges, generation: hist.generation});
+  hist.generation = event.generation || ++hist.maxGeneration;
+
+  var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
+
+  var loop = function ( i ) {
+    var change = event.changes[i];
+    change.origin = type;
+    if (filter && !filterChange(doc, change, false)) {
+      source.length = 0;
+      return {}
+    }
+
+    antiChanges.push(historyChangeFromChange(doc, change));
+
+    var after = i ? computeSelAfterChange(doc, change) : lst(source);
+    makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
+    if (!i && doc.cm) { doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}); }
+    var rebased = [];
+
+    // Propagate to the linked documents
+    linkedDocs(doc, function (doc, sharedHist) {
+      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+        rebaseHist(doc.history, change);
+        rebased.push(doc.history);
+      }
+      makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
+    });
+  };
+
+  for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) {
+    var returned = loop( i$1 );
+
+    if ( returned ) return returned.v;
+  }
+}
+
+// Sub-views need their line numbers shifted when text is added
+// above or below them in the parent document.
+function shiftDoc(doc, distance) {
+  if (distance == 0) { return }
+  doc.first += distance;
+  doc.sel = new Selection(map(doc.sel.ranges, function (range) { return new Range(
+    Pos(range.anchor.line + distance, range.anchor.ch),
+    Pos(range.head.line + distance, range.head.ch)
+  ); }), doc.sel.primIndex);
+  if (doc.cm) {
+    regChange(doc.cm, doc.first, doc.first - distance, distance);
+    for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
+      { regLineChange(doc.cm, l, "gutter"); }
+  }
+}
+
+// More lower-level change function, handling only a single document
+// (not linked ones).
+function makeChangeSingleDoc(doc, change, selAfter, spans) {
+  if (doc.cm && !doc.cm.curOp)
+    { return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans) }
+
+  if (change.to.line < doc.first) {
+    shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
+    return
+  }
+  if (change.from.line > doc.lastLine()) { return }
+
+  // Clip the change to the size of this doc
+  if (change.from.line < doc.first) {
+    var shift = change.text.length - 1 - (doc.first - change.from.line);
+    shiftDoc(doc, shift);
+    change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
+              text: [lst(change.text)], origin: change.origin};
+  }
+  var last = doc.lastLine();
+  if (change.to.line > last) {
+    change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
+              text: [change.text[0]], origin: change.origin};
+  }
+
+  change.removed = getBetween(doc, change.from, change.to);
+
+  if (!selAfter) { selAfter = computeSelAfterChange(doc, change); }
+  if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans); }
+  else { updateDoc(doc, change, spans); }
+  setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+}
+
+// Handle the interaction of a change to a document with the editor
+// that this document is part of.
+function makeChangeSingleDocInEditor(cm, change, spans) {
+  var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
+
+  var recomputeMaxLength = false, checkWidthStart = from.line;
+  if (!cm.options.lineWrapping) {
+    checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
+    doc.iter(checkWidthStart, to.line + 1, function (line) {
+      if (line == display.maxLine) {
+        recomputeMaxLength = true;
+        return true
+      }
+    });
+  }
+
+  if (doc.sel.contains(change.from, change.to) > -1)
+    { signalCursorActivity(cm); }
+
+  updateDoc(doc, change, spans, estimateHeight(cm));
+
+  if (!cm.options.lineWrapping) {
+    doc.iter(checkWidthStart, from.line + change.text.length, function (line) {
+      var len = lineLength(line);
+      if (len > display.maxLineLength) {
+        display.maxLine = line;
+        display.maxLineLength = len;
+        display.maxLineChanged = true;
+        recomputeMaxLength = false;
+      }
+    });
+    if (recomputeMaxLength) { cm.curOp.updateMaxLine = true; }
+  }
+
+  retreatFrontier(doc, from.line);
+  startWorker(cm, 400);
+
+  var lendiff = change.text.length - (to.line - from.line) - 1;
+  // Remember that these lines changed, for updating the display
+  if (change.full)
+    { regChange(cm); }
+  else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
+    { regLineChange(cm, from.line, "text"); }
+  else
+    { regChange(cm, from.line, to.line + 1, lendiff); }
+
+  var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
+  if (changeHandler || changesHandler) {
+    var obj = {
+      from: from, to: to,
+      text: change.text,
+      removed: change.removed,
+      origin: change.origin
+    };
+    if (changeHandler) { signalLater(cm, "change", cm, obj); }
+    if (changesHandler) { (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); }
+  }
+  cm.display.selForContextMenu = null;
+}
+
+function replaceRange(doc, code, from, to, origin) {
+  if (!to) { to = from; }
+  if (cmp(to, from) < 0) { var assign;
+    (assign = [to, from], from = assign[0], to = assign[1]); }
+  if (typeof code == "string") { code = doc.splitLines(code); }
+  makeChange(doc, {from: from, to: to, text: code, origin: origin});
+}
+
+// Rebasing/resetting history to deal with externally-sourced changes
+
+function rebaseHistSelSingle(pos, from, to, diff) {
+  if (to < pos.line) {
+    pos.line += diff;
+  } else if (from < pos.line) {
+    pos.line = from;
+    pos.ch = 0;
+  }
+}
+
+// Tries to rebase an array of history events given a change in the
+// document. If the change touches the same lines as the event, the
+// event, and everything 'behind' it, is discarded. If the change is
+// before the event, the event's positions are updated. Uses a
+// copy-on-write scheme for the positions, to avoid having to
+// reallocate them all on every rebase, but also avoid problems with
+// shared position objects being unsafely updated.
+function rebaseHistArray(array, from, to, diff) {
+  for (var i = 0; i < array.length; ++i) {
+    var sub = array[i], ok = true;
+    if (sub.ranges) {
+      if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
+      for (var j = 0; j < sub.ranges.length; j++) {
+        rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
+        rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
+      }
+      continue
+    }
+    for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) {
+      var cur = sub.changes[j$1];
+      if (to < cur.from.line) {
+        cur.from = Pos(cur.from.line + diff, cur.from.ch);
+        cur.to = Pos(cur.to.line + diff, cur.to.ch);
+      } else if (from <= cur.to.line) {
+        ok = false;
+        break
+      }
+    }
+    if (!ok) {
+      array.splice(0, i + 1);
+      i = 0;
+    }
+  }
+}
+
+function rebaseHist(hist, change) {
+  var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
+  rebaseHistArray(hist.done, from, to, diff);
+  rebaseHistArray(hist.undone, from, to, diff);
+}
+
+// Utility for applying a change to a line by handle or number,
+// returning the number and optionally registering the line as
+// changed.
+function changeLine(doc, handle, changeType, op) {
+  var no = handle, line = handle;
+  if (typeof handle == "number") { line = getLine(doc, clipLine(doc, handle)); }
+  else { no = lineNo(handle); }
+  if (no == null) { return null }
+  if (op(line, no) && doc.cm) { regLineChange(doc.cm, no, changeType); }
+  return line
+}
+
+// The document is represented as a BTree consisting of leaves, with
+// chunk of lines in them, and branches, with up to ten leaves or
+// other branch nodes below them. The top node is always a branch
+// node, and is the document object itself (meaning it has
+// additional methods and properties).
+//
+// All nodes have parent links. The tree is used both to go from
+// line numbers to line objects, and to go from objects to numbers.
+// It also indexes by height, and is used to convert between height
+// and line object, and to find the total height of the document.
+//
+// See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
+
+function LeafChunk(lines) {
+  var this$1 = this;
+
+  this.lines = lines;
+  this.parent = null;
+  var height = 0;
+  for (var i = 0; i < lines.length; ++i) {
+    lines[i].parent = this$1;
+    height += lines[i].height;
+  }
+  this.height = height;
+}
+
+LeafChunk.prototype = {
+  chunkSize: function() { return this.lines.length },
+
+  // Remove the n lines at offset 'at'.
+  removeInner: function(at, n) {
+    var this$1 = this;
+
+    for (var i = at, e = at + n; i < e; ++i) {
+      var line = this$1.lines[i];
+      this$1.height -= line.height;
+      cleanUpLine(line);
+      signalLater(line, "delete");
+    }
+    this.lines.splice(at, n);
+  },
+
+  // Helper used to collapse a small branch into a single leaf.
+  collapse: function(lines) {
+    lines.push.apply(lines, this.lines);
+  },
+
+  // Insert the given array of lines at offset 'at', count them as
+  // having the given height.
+  insertInner: function(at, lines, height) {
+    var this$1 = this;
+
+    this.height += height;
+    this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
+    for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1; }
+  },
+
+  // Used to iterate over a part of the tree.
+  iterN: function(at, n, op) {
+    var this$1 = this;
+
+    for (var e = at + n; at < e; ++at)
+      { if (op(this$1.lines[at])) { return true } }
+  }
+};
+
+function BranchChunk(children) {
+  var this$1 = this;
+
+  this.children = children;
+  var size = 0, height = 0;
+  for (var i = 0; i < children.length; ++i) {
+    var ch = children[i];
+    size += ch.chunkSize(); height += ch.height;
+    ch.parent = this$1;
+  }
+  this.size = size;
+  this.height = height;
+  this.parent = null;
+}
+
+BranchChunk.prototype = {
+  chunkSize: function() { return this.size },
+
+  removeInner: function(at, n) {
+    var this$1 = this;
+
+    this.size -= n;
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this$1.children[i], sz = child.chunkSize();
+      if (at < sz) {
+        var rm = Math.min(n, sz - at), oldHeight = child.height;
+        child.removeInner(at, rm);
+        this$1.height -= oldHeight - child.height;
+        if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null; }
+        if ((n -= rm) == 0) { break }
+        at = 0;
+      } else { at -= sz; }
+    }
+    // If the result is smaller than 25 lines, ensure that it is a
+    // single leaf node.
+    if (this.size - n < 25 &&
+        (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
+      var lines = [];
+      this.collapse(lines);
+      this.children = [new LeafChunk(lines)];
+      this.children[0].parent = this;
+    }
+  },
+
+  collapse: function(lines) {
+    var this$1 = this;
+
+    for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines); }
+  },
+
+  insertInner: function(at, lines, height) {
+    var this$1 = this;
+
+    this.size += lines.length;
+    this.height += height;
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this$1.children[i], sz = child.chunkSize();
+      if (at <= sz) {
+        child.insertInner(at, lines, height);
+        if (child.lines && child.lines.length > 50) {
+          // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
+          // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+          var remaining = child.lines.length % 25 + 25;
+          for (var pos = remaining; pos < child.lines.length;) {
+            var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
+            child.height -= leaf.height;
+            this$1.children.splice(++i, 0, leaf);
+            leaf.parent = this$1;
+          }
+          child.lines = child.lines.slice(0, remaining);
+          this$1.maybeSpill();
+        }
+        break
+      }
+      at -= sz;
+    }
+  },
+
+  // When a node has grown, check whether it should be split.
+  maybeSpill: function() {
+    if (this.children.length <= 10) { return }
+    var me = this;
+    do {
+      var spilled = me.children.splice(me.children.length - 5, 5);
+      var sibling = new BranchChunk(spilled);
+      if (!me.parent) { // Become the parent node
+        var copy = new BranchChunk(me.children);
+        copy.parent = me;
+        me.children = [copy, sibling];
+        me = copy;
+     } else {
+        me.size -= sibling.size;
+        me.height -= sibling.height;
+        var myIndex = indexOf(me.parent.children, me);
+        me.parent.children.splice(myIndex + 1, 0, sibling);
+      }
+      sibling.parent = me.parent;
+    } while (me.children.length > 10)
+    me.parent.maybeSpill();
+  },
+
+  iterN: function(at, n, op) {
+    var this$1 = this;
+
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this$1.children[i], sz = child.chunkSize();
+      if (at < sz) {
+        var used = Math.min(n, sz - at);
+        if (child.iterN(at, used, op)) { return true }
+        if ((n -= used) == 0) { break }
+        at = 0;
+      } else { at -= sz; }
+    }
+  }
+};
+
+// Line widgets are block elements displayed above or below a line.
+
+var LineWidget = function(doc, node, options) {
+  var this$1 = this;
+
+  if (options) { for (var opt in options) { if (options.hasOwnProperty(opt))
+    { this$1[opt] = options[opt]; } } }
+  this.doc = doc;
+  this.node = node;
+};
+
+LineWidget.prototype.clear = function () {
+    var this$1 = this;
+
+  var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
+  if (no == null || !ws) { return }
+  for (var i = 0; i < ws.length; ++i) { if (ws[i] == this$1) { ws.splice(i--, 1); } }
+  if (!ws.length) { line.widgets = null; }
+  var height = widgetHeight(this);
+  updateLineHeight(line, Math.max(0, line.height - height));
+  if (cm) {
+    runInOp(cm, function () {
+      adjustScrollWhenAboveVisible(cm, line, -height);
+      regLineChange(cm, no, "widget");
+    });
+    signalLater(cm, "lineWidgetCleared", cm, this, no);
+  }
+};
+
+LineWidget.prototype.changed = function () {
+    var this$1 = this;
+
+  var oldH = this.height, cm = this.doc.cm, line = this.line;
+  this.height = null;
+  var diff = widgetHeight(this) - oldH;
+  if (!diff) { return }
+  updateLineHeight(line, line.height + diff);
+  if (cm) {
+    runInOp(cm, function () {
+      cm.curOp.forceUpdate = true;
+      adjustScrollWhenAboveVisible(cm, line, diff);
+      signalLater(cm, "lineWidgetChanged", cm, this$1, lineNo(line));
+    });
+  }
+};
+eventMixin(LineWidget);
+
+function adjustScrollWhenAboveVisible(cm, line, diff) {
+  if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
+    { addToScrollTop(cm, diff); }
+}
+
+function addLineWidget(doc, handle, node, options) {
+  var widget = new LineWidget(doc, node, options);
+  var cm = doc.cm;
+  if (cm && widget.noHScroll) { cm.display.alignWidgets = true; }
+  changeLine(doc, handle, "widget", function (line) {
+    var widgets = line.widgets || (line.widgets = []);
+    if (widget.insertAt == null) { widgets.push(widget); }
+    else { widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget); }
+    widget.line = line;
+    if (cm && !lineIsHidden(doc, line)) {
+      var aboveVisible = heightAtLine(line) < doc.scrollTop;
+      updateLineHeight(line, line.height + widgetHeight(widget));
+      if (aboveVisible) { addToScrollTop(cm, widget.height); }
+      cm.curOp.forceUpdate = true;
+    }
+    return true
+  });
+  if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); }
+  return widget
+}
+
+// TEXTMARKERS
+
+// Created with markText and setBookmark methods. A TextMarker is a
+// handle that can be used to clear or find a marked position in the
+// document. Line objects hold arrays (markedSpans) containing
+// {from, to, marker} object pointing to such marker objects, and
+// indicating that such a marker is present on that line. Multiple
+// lines may point to the same marker when it spans across lines.
+// The spans will have null for their from/to properties when the
+// marker continues beyond the start/end of the line. Markers have
+// links back to the lines they currently touch.
+
+// Collapsed markers have unique ids, in order to be able to order
+// them, which is needed for uniquely determining an outer marker
+// when they overlap (they may nest, but not partially overlap).
+var nextMarkerId = 0;
+
+var TextMarker = function(doc, type) {
+  this.lines = [];
+  this.type = type;
+  this.doc = doc;
+  this.id = ++nextMarkerId;
+};
+
+// Clear the marker.
+TextMarker.prototype.clear = function () {
+    var this$1 = this;
+
+  if (this.explicitlyCleared) { return }
+  var cm = this.doc.cm, withOp = cm && !cm.curOp;
+  if (withOp) { startOperation(cm); }
+  if (hasHandler(this, "clear")) {
+    var found = this.find();
+    if (found) { signalLater(this, "clear", found.from, found.to); }
+  }
+  var min = null, max = null;
+  for (var i = 0; i < this.lines.length; ++i) {
+    var line = this$1.lines[i];
+    var span = getMarkedSpanFor(line.markedSpans, this$1);
+    if (cm && !this$1.collapsed) { regLineChange(cm, lineNo(line), "text"); }
+    else if (cm) {
+      if (span.to != null) { max = lineNo(line); }
+      if (span.from != null) { min = lineNo(line); }
+    }
+    line.markedSpans = removeMarkedSpan(line.markedSpans, span);
+    if (span.from == null && this$1.collapsed && !lineIsHidden(this$1.doc, line) && cm)
+      { updateLineHeight(line, textHeight(cm.display)); }
+  }
+  if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) {
+    var visual = visualLine(this$1.lines[i$1]), len = lineLength(visual);
+    if (len > cm.display.maxLineLength) {
+      cm.display.maxLine = visual;
+      cm.display.maxLineLength = len;
+      cm.display.maxLineChanged = true;
+    }
+  } }
+
+  if (min != null && cm && this.collapsed) { regChange(cm, min, max + 1); }
+  this.lines.length = 0;
+  this.explicitlyCleared = true;
+  if (this.atomic && this.doc.cantEdit) {
+    this.doc.cantEdit = false;
+    if (cm) { reCheckSelection(cm.doc); }
+  }
+  if (cm) { signalLater(cm, "markerCleared", cm, this, min, max); }
+  if (withOp) { endOperation(cm); }
+  if (this.parent) { this.parent.clear(); }
+};
+
+// Find the position of the marker in the document. Returns a {from,
+// to} object by default. Side can be passed to get a specific side
+// -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+// Pos objects returned contain a line object, rather than a line
+// number (used to prevent looking up the same line twice).
+TextMarker.prototype.find = function (side, lineObj) {
+    var this$1 = this;
+
+  if (side == null && this.type == "bookmark") { side = 1; }
+  var from, to;
+  for (var i = 0; i < this.lines.length; ++i) {
+    var line = this$1.lines[i];
+    var span = getMarkedSpanFor(line.markedSpans, this$1);
+    if (span.from != null) {
+      from = Pos(lineObj ? line : lineNo(line), span.from);
+      if (side == -1) { return from }
+    }
+    if (span.to != null) {
+      to = Pos(lineObj ? line : lineNo(line), span.to);
+      if (side == 1) { return to }
+    }
+  }
+  return from && {from: from, to: to}
+};
+
+// Signals that the marker's widget changed, and surrounding layout
+// should be recomputed.
+TextMarker.prototype.changed = function () {
+    var this$1 = this;
+
+  var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
+  if (!pos || !cm) { return }
+  runInOp(cm, function () {
+    var line = pos.line, lineN = lineNo(pos.line);
+    var view = findViewForLine(cm, lineN);
+    if (view) {
+      clearLineMeasurementCacheFor(view);
+      cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+    }
+    cm.curOp.updateMaxLine = true;
+    if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+      var oldHeight = widget.height;
+      widget.height = null;
+      var dHeight = widgetHeight(widget) - oldHeight;
+      if (dHeight)
+        { updateLineHeight(line, line.height + dHeight); }
+    }
+    signalLater(cm, "markerChanged", cm, this$1);
+  });
+};
+
+TextMarker.prototype.attachLine = function (line) {
+  if (!this.lines.length && this.doc.cm) {
+    var op = this.doc.cm.curOp;
+    if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
+      { (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); }
+  }
+  this.lines.push(line);
+};
+
+TextMarker.prototype.detachLine = function (line) {
+  this.lines.splice(indexOf(this.lines, line), 1);
+  if (!this.lines.length && this.doc.cm) {
+    var op = this.doc.cm.curOp;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
+  }
+};
+eventMixin(TextMarker);
+
+// Create a marker, wire it up to the right lines, and
+function markText(doc, from, to, options, type) {
+  // Shared markers (across linked documents) are handled separately
+  // (markTextShared will call out to this again, once per
+  // document).
+  if (options && options.shared) { return markTextShared(doc, from, to, options, type) }
+  // Ensure we are in an operation.
+  if (doc.cm && !doc.cm.curOp) { return operation(doc.cm, markText)(doc, from, to, options, type) }
+
+  var marker = new TextMarker(doc, type), diff = cmp(from, to);
+  if (options) { copyObj(options, marker, false); }
+  // Don't connect empty markers unless clearWhenEmpty is false
+  if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
+    { return marker }
+  if (marker.replacedWith) {
+    // Showing up as a widget implies collapsed (widget replaces text)
+    marker.collapsed = true;
+    marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget");
+    if (!options.handleMouseEvents) { marker.widgetNode.setAttribute("cm-ignore-events", "true"); }
+    if (options.insertLeft) { marker.widgetNode.insertLeft = true; }
+  }
+  if (marker.collapsed) {
+    if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
+        from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
+      { throw new Error("Inserting collapsed marker partially overlapping an existing one") }
+    seeCollapsedSpans();
+  }
+
+  if (marker.addToHistory)
+    { addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN); }
+
+  var curLine = from.line, cm = doc.cm, updateMaxLine;
+  doc.iter(curLine, to.line + 1, function (line) {
+    if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
+      { updateMaxLine = true; }
+    if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0); }
+    addMarkedSpan(line, new MarkedSpan(marker,
+                                       curLine == from.line ? from.ch : null,
+                                       curLine == to.line ? to.ch : null));
+    ++curLine;
+  });
+  // lineIsHidden depends on the presence of the spans, so needs a second pass
+  if (marker.collapsed) { doc.iter(from.line, to.line + 1, function (line) {
+    if (lineIsHidden(doc, line)) { updateLineHeight(line, 0); }
+  }); }
+
+  if (marker.clearOnEnter) { on(marker, "beforeCursorEnter", function () { return marker.clear(); }); }
+
+  if (marker.readOnly) {
+    seeReadOnlySpans();
+    if (doc.history.done.length || doc.history.undone.length)
+      { doc.clearHistory(); }
+  }
+  if (marker.collapsed) {
+    marker.id = ++nextMarkerId;
+    marker.atomic = true;
+  }
+  if (cm) {
+    // Sync editor state
+    if (updateMaxLine) { cm.curOp.updateMaxLine = true; }
+    if (marker.collapsed)
+      { regChange(cm, from.line, to.line + 1); }
+    else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
+      { for (var i = from.line; i <= to.line; i++) { regLineChange(cm, i, "text"); } }
+    if (marker.atomic) { reCheckSelection(cm.doc); }
+    signalLater(cm, "markerAdded", cm, marker);
+  }
+  return marker
+}
+
+// SHARED TEXTMARKERS
+
+// A shared marker spans multiple linked documents. It is
+// implemented as a meta-marker-object controlling multiple normal
+// markers.
+var SharedTextMarker = function(markers, primary) {
+  var this$1 = this;
+
+  this.markers = markers;
+  this.primary = primary;
+  for (var i = 0; i < markers.length; ++i)
+    { markers[i].parent = this$1; }
+};
+
+SharedTextMarker.prototype.clear = function () {
+    var this$1 = this;
+
+  if (this.explicitlyCleared) { return }
+  this.explicitlyCleared = true;
+  for (var i = 0; i < this.markers.length; ++i)
+    { this$1.markers[i].clear(); }
+  signalLater(this, "clear");
+};
+
+SharedTextMarker.prototype.find = function (side, lineObj) {
+  return this.primary.find(side, lineObj)
+};
+eventMixin(SharedTextMarker);
+
+function markTextShared(doc, from, to, options, type) {
+  options = copyObj(options);
+  options.shared = false;
+  var markers = [markText(doc, from, to, options, type)], primary = markers[0];
+  var widget = options.widgetNode;
+  linkedDocs(doc, function (doc) {
+    if (widget) { options.widgetNode = widget.cloneNode(true); }
+    markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
+    for (var i = 0; i < doc.linked.length; ++i)
+      { if (doc.linked[i].isParent) { return } }
+    primary = lst(markers);
+  });
+  return new SharedTextMarker(markers, primary)
+}
+
+function findSharedMarkers(doc) {
+  return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { return m.parent; })
+}
+
+function copySharedMarkers(doc, markers) {
+  for (var i = 0; i < markers.length; i++) {
+    var marker = markers[i], pos = marker.find();
+    var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+    if (cmp(mFrom, mTo)) {
+      var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
+      marker.markers.push(subMark);
+      subMark.parent = marker;
+    }
+  }
+}
+
+function detachSharedMarkers(markers) {
+  var loop = function ( i ) {
+    var marker = markers[i], linked = [marker.primary.doc];
+    linkedDocs(marker.primary.doc, function (d) { return linked.push(d); });
+    for (var j = 0; j < marker.markers.length; j++) {
+      var subMarker = marker.markers[j];
+      if (indexOf(linked, subMarker.doc) == -1) {
+        subMarker.parent = null;
+        marker.markers.splice(j--, 1);
+      }
+    }
+  };
+
+  for (var i = 0; i < markers.length; i++) loop( i );
+}
+
+var nextDocId = 0;
+var Doc = function(text, mode, firstLine, lineSep, direction) {
+  if (!(this instanceof Doc)) { return new Doc(text, mode, firstLine, lineSep, direction) }
+  if (firstLine == null) { firstLine = 0; }
+
+  BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
+  this.first = firstLine;
+  this.scrollTop = this.scrollLeft = 0;
+  this.cantEdit = false;
+  this.cleanGeneration = 1;
+  this.modeFrontier = this.highlightFrontier = firstLine;
+  var start = Pos(firstLine, 0);
+  this.sel = simpleSelection(start);
+  this.history = new History(null);
+  this.id = ++nextDocId;
+  this.modeOption = mode;
+  this.lineSep = lineSep;
+  this.direction = (direction == "rtl") ? "rtl" : "ltr";
+  this.extend = false;
+
+  if (typeof text == "string") { text = this.splitLines(text); }
+  updateDoc(this, {from: start, to: start, text: text});
+  setSelection(this, simpleSelection(start), sel_dontScroll);
+};
+
+Doc.prototype = createObj(BranchChunk.prototype, {
+  constructor: Doc,
+  // Iterate over the document. Supports two forms -- with only one
+  // argument, it calls that for each line in the document. With
+  // three, it iterates over the range given by the first two (with
+  // the second being non-inclusive).
+  iter: function(from, to, op) {
+    if (op) { this.iterN(from - this.first, to - from, op); }
+    else { this.iterN(this.first, this.first + this.size, from); }
+  },
+
+  // Non-public interface for adding and removing lines.
+  insert: function(at, lines) {
+    var height = 0;
+    for (var i = 0; i < lines.length; ++i) { height += lines[i].height; }
+    this.insertInner(at - this.first, lines, height);
+  },
+  remove: function(at, n) { this.removeInner(at - this.first, n); },
+
+  // From here, the methods are part of the public interface. Most
+  // are also available from CodeMirror (editor) instances.
+
+  getValue: function(lineSep) {
+    var lines = getLines(this, this.first, this.first + this.size);
+    if (lineSep === false) { return lines }
+    return lines.join(lineSep || this.lineSeparator())
+  },
+  setValue: docMethodOp(function(code) {
+    var top = Pos(this.first, 0), last = this.first + this.size - 1;
+    makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
+                      text: this.splitLines(code), origin: "setValue", full: true}, true);
+    if (this.cm) { scrollToCoords(this.cm, 0, 0); }
+    setSelection(this, simpleSelection(top), sel_dontScroll);
+  }),
+  replaceRange: function(code, from, to, origin) {
+    from = clipPos(this, from);
+    to = to ? clipPos(this, to) : from;
+    replaceRange(this, code, from, to, origin);
+  },
+  getRange: function(from, to, lineSep) {
+    var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
+    if (lineSep === false) { return lines }
+    return lines.join(lineSep || this.lineSeparator())
+  },
+
+  getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
+
+  getLineHandle: function(line) {if (isLine(this, line)) { return getLine(this, line) }},
+  getLineNumber: function(line) {return lineNo(line)},
+
+  getLineHandleVisualStart: function(line) {
+    if (typeof line == "number") { line = getLine(this, line); }
+    return visualLine(line)
+  },
+
+  lineCount: function() {return this.size},
+  firstLine: function() {return this.first},
+  lastLine: function() {return this.first + this.size - 1},
+
+  clipPos: function(pos) {return clipPos(this, pos)},
+
+  getCursor: function(start) {
+    var range$$1 = this.sel.primary(), pos;
+    if (start == null || start == "head") { pos = range$$1.head; }
+    else if (start == "anchor") { pos = range$$1.anchor; }
+    else if (start == "end" || start == "to" || start === false) { pos = range$$1.to(); }
+    else { pos = range$$1.from(); }
+    return pos
+  },
+  listSelections: function() { return this.sel.ranges },
+  somethingSelected: function() {return this.sel.somethingSelected()},
+
+  setCursor: docMethodOp(function(line, ch, options) {
+    setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
+  }),
+  setSelection: docMethodOp(function(anchor, head, options) {
+    setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
+  }),
+  extendSelection: docMethodOp(function(head, other, options) {
+    extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
+  }),
+  extendSelections: docMethodOp(function(heads, options) {
+    extendSelections(this, clipPosArray(this, heads), options);
+  }),
+  extendSelectionsBy: docMethodOp(function(f, options) {
+    var heads = map(this.sel.ranges, f);
+    extendSelections(this, clipPosArray(this, heads), options);
+  }),
+  setSelections: docMethodOp(function(ranges, primary, options) {
+    var this$1 = this;
+
+    if (!ranges.length) { return }
+    var out = [];
+    for (var i = 0; i < ranges.length; i++)
+      { out[i] = new Range(clipPos(this$1, ranges[i].anchor),
+                         clipPos(this$1, ranges[i].head)); }
+    if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex); }
+    setSelection(this, normalizeSelection(out, primary), options);
+  }),
+  addSelection: docMethodOp(function(anchor, head, options) {
+    var ranges = this.sel.ranges.slice(0);
+    ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
+    setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
+  }),
+
+  getSelection: function(lineSep) {
+    var this$1 = this;
+
+    var ranges = this.sel.ranges, lines;
+    for (var i = 0; i < ranges.length; i++) {
+      var sel = getBetween(this$1, ranges[i].from(), ranges[i].to());
+      lines = lines ? lines.concat(sel) : sel;
+    }
+    if (lineSep === false) { return lines }
+    else { return lines.join(lineSep || this.lineSeparator()) }
+  },
+  getSelections: function(lineSep) {
+    var this$1 = this;
+
+    var parts = [], ranges = this.sel.ranges;
+    for (var i = 0; i < ranges.length; i++) {
+      var sel = getBetween(this$1, ranges[i].from(), ranges[i].to());
+      if (lineSep !== false) { sel = sel.join(lineSep || this$1.lineSeparator()); }
+      parts[i] = sel;
+    }
+    return parts
+  },
+  replaceSelection: function(code, collapse, origin) {
+    var dup = [];
+    for (var i = 0; i < this.sel.ranges.length; i++)
+      { dup[i] = code; }
+    this.replaceSelections(dup, collapse, origin || "+input");
+  },
+  replaceSelections: docMethodOp(function(code, collapse, origin) {
+    var this$1 = this;
+
+    var changes = [], sel = this.sel;
+    for (var i = 0; i < sel.ranges.length; i++) {
+      var range$$1 = sel.ranges[i];
+      changes[i] = {from: range$$1.from(), to: range$$1.to(), text: this$1.splitLines(code[i]), origin: origin};
+    }
+    var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
+    for (var i$1 = changes.length - 1; i$1 >= 0; i$1--)
+      { makeChange(this$1, changes[i$1]); }
+    if (newSel) { setSelectionReplaceHistory(this, newSel); }
+    else if (this.cm) { ensureCursorVisible(this.cm); }
+  }),
+  undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
+  redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
+  undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
+  redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
+
+  setExtending: function(val) {this.extend = val;},
+  getExtending: function() {return this.extend},
+
+  historySize: function() {
+    var hist = this.history, done = 0, undone = 0;
+    for (var i = 0; i < hist.done.length; i++) { if (!hist.done[i].ranges) { ++done; } }
+    for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone; } }
+    return {undo: done, redo: undone}
+  },
+  clearHistory: function() {this.history = new History(this.history.maxGeneration);},
+
+  markClean: function() {
+    this.cleanGeneration = this.changeGeneration(true);
+  },
+  changeGeneration: function(forceSplit) {
+    if (forceSplit)
+      { this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; }
+    return this.history.generation
+  },
+  isClean: function (gen) {
+    return this.history.generation == (gen || this.cleanGeneration)
+  },
+
+  getHistory: function() {
+    return {done: copyHistoryArray(this.history.done),
+            undone: copyHistoryArray(this.history.undone)}
+  },
+  setHistory: function(histData) {
+    var hist = this.history = new History(this.history.maxGeneration);
+    hist.done = copyHistoryArray(histData.done.slice(0), null, true);
+    hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
+  },
+
+  setGutterMarker: docMethodOp(function(line, gutterID, value) {
+    return changeLine(this, line, "gutter", function (line) {
+      var markers = line.gutterMarkers || (line.gutterMarkers = {});
+      markers[gutterID] = value;
+      if (!value && isEmpty(markers)) { line.gutterMarkers = null; }
+      return true
+    })
+  }),
+
+  clearGutter: docMethodOp(function(gutterID) {
+    var this$1 = this;
+
+    this.iter(function (line) {
+      if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
+        changeLine(this$1, line, "gutter", function () {
+          line.gutterMarkers[gutterID] = null;
+          if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null; }
+          return true
+        });
+      }
+    });
+  }),
+
+  lineInfo: function(line) {
+    var n;
+    if (typeof line == "number") {
+      if (!isLine(this, line)) { return null }
+      n = line;
+      line = getLine(this, line);
+      if (!line) { return null }
+    } else {
+      n = lineNo(line);
+      if (n == null) { return null }
+    }
+    return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
+            textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
+            widgets: line.widgets}
+  },
+
+  addLineClass: docMethodOp(function(handle, where, cls) {
+    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
+      var prop = where == "text" ? "textClass"
+               : where == "background" ? "bgClass"
+               : where == "gutter" ? "gutterClass" : "wrapClass";
+      if (!line[prop]) { line[prop] = cls; }
+      else if (classTest(cls).test(line[prop])) { return false }
+      else { line[prop] += " " + cls; }
+      return true
+    })
+  }),
+  removeLineClass: docMethodOp(function(handle, where, cls) {
+    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
+      var prop = where == "text" ? "textClass"
+               : where == "background" ? "bgClass"
+               : where == "gutter" ? "gutterClass" : "wrapClass";
+      var cur = line[prop];
+      if (!cur) { return false }
+      else if (cls == null) { line[prop] = null; }
+      else {
+        var found = cur.match(classTest(cls));
+        if (!found) { return false }
+        var end = found.index + found[0].length;
+        line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+      }
+      return true
+    })
+  }),
+
+  addLineWidget: docMethodOp(function(handle, node, options) {
+    return addLineWidget(this, handle, node, options)
+  }),
+  removeLineWidget: function(widget) { widget.clear(); },
+
+  markText: function(from, to, options) {
+    return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
+  },
+  setBookmark: function(pos, options) {
+    var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
+                    insertLeft: options && options.insertLeft,
+                    clearWhenEmpty: false, shared: options && options.shared,
+                    handleMouseEvents: options && options.handleMouseEvents};
+    pos = clipPos(this, pos);
+    return markText(this, pos, pos, realOpts, "bookmark")
+  },
+  findMarksAt: function(pos) {
+    pos = clipPos(this, pos);
+    var markers = [], spans = getLine(this, pos.line).markedSpans;
+    if (spans) { for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if ((span.from == null || span.from <= pos.ch) &&
+          (span.to == null || span.to >= pos.ch))
+        { markers.push(span.marker.parent || span.marker); }
+    } }
+    return markers
+  },
+  findMarks: function(from, to, filter) {
+    from = clipPos(this, from); to = clipPos(this, to);
+    var found = [], lineNo$$1 = from.line;
+    this.iter(from.line, to.line + 1, function (line) {
+      var spans = line.markedSpans;
+      if (spans) { for (var i = 0; i < spans.length; i++) {
+        var span = spans[i];
+        if (!(span.to != null && lineNo$$1 == from.line && from.ch >= span.to ||
+              span.from == null && lineNo$$1 != from.line ||
+              span.from != null && lineNo$$1 == to.line && span.from >= to.ch) &&
+            (!filter || filter(span.marker)))
+          { found.push(span.marker.parent || span.marker); }
+      } }
+      ++lineNo$$1;
+    });
+    return found
+  },
+  getAllMarks: function() {
+    var markers = [];
+    this.iter(function (line) {
+      var sps = line.markedSpans;
+      if (sps) { for (var i = 0; i < sps.length; ++i)
+        { if (sps[i].from != null) { markers.push(sps[i].marker); } } }
+    });
+    return markers
+  },
+
+  posFromIndex: function(off) {
+    var ch, lineNo$$1 = this.first, sepSize = this.lineSeparator().length;
+    this.iter(function (line) {
+      var sz = line.text.length + sepSize;
+      if (sz > off) { ch = off; return true }
+      off -= sz;
+      ++lineNo$$1;
+    });
+    return clipPos(this, Pos(lineNo$$1, ch))
+  },
+  indexFromPos: function (coords) {
+    coords = clipPos(this, coords);
+    var index = coords.ch;
+    if (coords.line < this.first || coords.ch < 0) { return 0 }
+    var sepSize = this.lineSeparator().length;
+    this.iter(this.first, coords.line, function (line) { // iter aborts when callback returns a truthy value
+      index += line.text.length + sepSize;
+    });
+    return index
+  },
+
+  copy: function(copyHistory) {
+    var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                      this.modeOption, this.first, this.lineSep, this.direction);
+    doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
+    doc.sel = this.sel;
+    doc.extend = false;
+    if (copyHistory) {
+      doc.history.undoDepth = this.history.undoDepth;
+      doc.setHistory(this.getHistory());
+    }
+    return doc
+  },
+
+  linkedDoc: function(options) {
+    if (!options) { options = {}; }
+    var from = this.first, to = this.first + this.size;
+    if (options.from != null && options.from > from) { from = options.from; }
+    if (options.to != null && options.to < to) { to = options.to; }
+    var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction);
+    if (options.sharedHist) { copy.history = this.history
+    ; }(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
+    copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
+    copySharedMarkers(copy, findSharedMarkers(this));
+    return copy
+  },
+  unlinkDoc: function(other) {
+    var this$1 = this;
+
+    if (other instanceof CodeMirror$1) { other = other.doc; }
+    if (this.linked) { for (var i = 0; i < this.linked.length; ++i) {
+      var link = this$1.linked[i];
+      if (link.doc != other) { continue }
+      this$1.linked.splice(i, 1);
+      other.unlinkDoc(this$1);
+      detachSharedMarkers(findSharedMarkers(this$1));
+      break
+    } }
+    // If the histories were shared, split them again
+    if (other.history == this.history) {
+      var splitIds = [other.id];
+      linkedDocs(other, function (doc) { return splitIds.push(doc.id); }, true);
+      other.history = new History(null);
+      other.history.done = copyHistoryArray(this.history.done, splitIds);
+      other.history.undone = copyHistoryArray(this.history.undone, splitIds);
+    }
+  },
+  iterLinkedDocs: function(f) {linkedDocs(this, f);},
+
+  getMode: function() {return this.mode},
+  getEditor: function() {return this.cm},
+
+  splitLines: function(str) {
+    if (this.lineSep) { return str.split(this.lineSep) }
+    return splitLinesAuto(str)
+  },
+  lineSeparator: function() { return this.lineSep || "\n" },
+
+  setDirection: docMethodOp(function (dir) {
+    if (dir != "rtl") { dir = "ltr"; }
+    if (dir == this.direction) { return }
+    this.direction = dir;
+    this.iter(function (line) { return line.order = null; });
+    if (this.cm) { directionChanged(this.cm); }
+  })
+});
+
+// Public alias.
+Doc.prototype.eachLine = Doc.prototype.iter;
+
+// Kludge to work around strange IE behavior where it'll sometimes
+// re-fire a series of drag-related events right after the drop (#1551)
+var lastDrop = 0;
+
+function onDrop(e) {
+  var cm = this;
+  clearDragCursor(cm);
+  if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
+    { return }
+  e_preventDefault(e);
+  if (ie) { lastDrop = +new Date; }
+  var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
+  if (!pos || cm.isReadOnly()) { return }
+  // Might be a file drop, in which case we simply extract the text
+  // and insert it.
+  if (files && files.length && window.FileReader && window.File) {
+    var n = files.length, text = Array(n), read = 0;
+    var loadFile = function (file, i) {
+      if (cm.options.allowDropFileTypes &&
+          indexOf(cm.options.allowDropFileTypes, file.type) == -1)
+        { return }
+
+      var reader = new FileReader;
+      reader.onload = operation(cm, function () {
+        var content = reader.result;
+        if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { content = ""; }
+        text[i] = content;
+        if (++read == n) {
+          pos = clipPos(cm.doc, pos);
+          var change = {from: pos, to: pos,
+                        text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+                        origin: "paste"};
+          makeChange(cm.doc, change);
+          setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
+        }
+      });
+      reader.readAsText(file);
+    };
+    for (var i = 0; i < n; ++i) { loadFile(files[i], i); }
+  } else { // Normal drop
+    // Don't do a replace if the drop happened inside of the selected text.
+    if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
+      cm.state.draggingText(e);
+      // Ensure the editor is re-focused
+      setTimeout(function () { return cm.display.input.focus(); }, 20);
+      return
+    }
+    try {
+      var text$1 = e.dataTransfer.getData("Text");
+      if (text$1) {
+        var selected;
+        if (cm.state.draggingText && !cm.state.draggingText.copy)
+          { selected = cm.listSelections(); }
+        setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
+        if (selected) { for (var i$1 = 0; i$1 < selected.length; ++i$1)
+          { replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag"); } }
+        cm.replaceSelection(text$1, "around", "paste");
+        cm.display.input.focus();
+      }
+    }
+    catch(e){}
+  }
+}
+
+function onDragStart(cm, e) {
+  if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return }
+  if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { return }
+
+  e.dataTransfer.setData("Text", cm.getSelection());
+  e.dataTransfer.effectAllowed = "copyMove";
+
+  // Use dummy image instead of default browsers image.
+  // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
+  if (e.dataTransfer.setDragImage && !safari) {
+    var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
+    img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+    if (presto) {
+      img.width = img.height = 1;
+      cm.display.wrapper.appendChild(img);
+      // Force a relayout, or Opera won't use our image for some obscure reason
+      img._top = img.offsetTop;
+    }
+    e.dataTransfer.setDragImage(img, 0, 0);
+    if (presto) { img.parentNode.removeChild(img); }
+  }
+}
+
+function onDragOver(cm, e) {
+  var pos = posFromMouse(cm, e);
+  if (!pos) { return }
+  var frag = document.createDocumentFragment();
+  drawSelectionCursor(cm, pos, frag);
+  if (!cm.display.dragCursor) {
+    cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+    cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+  }
+  removeChildrenAndAdd(cm.display.dragCursor, frag);
+}
+
+function clearDragCursor(cm) {
+  if (cm.display.dragCursor) {
+    cm.display.lineSpace.removeChild(cm.display.dragCursor);
+    cm.display.dragCursor = null;
+  }
+}
+
+// These must be handled carefully, because naively registering a
+// handler for each editor will cause the editors to never be
+// garbage collected.
+
+function forEachCodeMirror(f) {
+  if (!document.getElementsByClassName) { return }
+  var byClass = document.getElementsByClassName("CodeMirror");
+  for (var i = 0; i < byClass.length; i++) {
+    var cm = byClass[i].CodeMirror;
+    if (cm) { f(cm); }
+  }
+}
+
+var globalsRegistered = false;
+function ensureGlobalHandlers() {
+  if (globalsRegistered) { return }
+  registerGlobalHandlers();
+  globalsRegistered = true;
+}
+function registerGlobalHandlers() {
+  // When the window resizes, we need to refresh active editors.
+  var resizeTimer;
+  on(window, "resize", function () {
+    if (resizeTimer == null) { resizeTimer = setTimeout(function () {
+      resizeTimer = null;
+      forEachCodeMirror(onResize);
+    }, 100); }
+  });
+  // When the window loses focus, we want to show the editor as blurred
+  on(window, "blur", function () { return forEachCodeMirror(onBlur); });
+}
+// Called when the window resizes
+function onResize(cm) {
+  var d = cm.display;
+  if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
+    { return }
+  // Might be a text scaling operation, clear size caches.
+  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+  d.scrollbarsClipped = false;
+  cm.setSize();
+}
+
+var keyNames = {
+  3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", 145: "ScrollLock",
+  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+};
+
+// Number keys
+for (var i = 0; i < 10; i++) { keyNames[i + 48] = keyNames[i + 96] = String(i); }
+// Alphabetic keys
+for (var i$1 = 65; i$1 <= 90; i$1++) { keyNames[i$1] = String.fromCharCode(i$1); }
+// Function keys
+for (var i$2 = 1; i$2 <= 12; i$2++) { keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2; }
+
+var keyMap = {};
+
+keyMap.basic = {
+  "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
+  "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
+  "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+  "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+  "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+  "Esc": "singleSelection"
+};
+// Note that the save and find-related commands aren't defined by
+// default. User code or addons can define them. Unknown commands
+// are simply ignored.
+keyMap.pcDefault = {
+  "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
+  "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
+  "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
+  "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
+  "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
+  "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
+  "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
+  fallthrough: "basic"
+};
+// Very basic readline/emacs-style bindings, which are standard on Mac.
+keyMap.emacsy = {
+  "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
+  "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+  "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
+  "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
+  "Ctrl-O": "openLine"
+};
+keyMap.macDefault = {
+  "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
+  "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+  "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
+  "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
+  "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
+  "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
+  "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
+  fallthrough: ["basic", "emacsy"]
+};
+keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
+
+// KEYMAP DISPATCH
+
+function normalizeKeyName(name) {
+  var parts = name.split(/-(?!$)/);
+  name = parts[parts.length - 1];
+  var alt, ctrl, shift, cmd;
+  for (var i = 0; i < parts.length - 1; i++) {
+    var mod = parts[i];
+    if (/^(cmd|meta|m)$/i.test(mod)) { cmd = true; }
+    else if (/^a(lt)?$/i.test(mod)) { alt = true; }
+    else if (/^(c|ctrl|control)$/i.test(mod)) { ctrl = true; }
+    else if (/^s(hift)?$/i.test(mod)) { shift = true; }
+    else { throw new Error("Unrecognized modifier name: " + mod) }
+  }
+  if (alt) { name = "Alt-" + name; }
+  if (ctrl) { name = "Ctrl-" + name; }
+  if (cmd) { name = "Cmd-" + name; }
+  if (shift) { name = "Shift-" + name; }
+  return name
+}
+
+// This is a kludge to keep keymaps mostly working as raw objects
+// (backwards compatibility) while at the same time support features
+// like normalization and multi-stroke key bindings. It compiles a
+// new normalized keymap, and then updates the old object to reflect
+// this.
+function normalizeKeyMap(keymap) {
+  var copy = {};
+  for (var keyname in keymap) { if (keymap.hasOwnProperty(keyname)) {
+    var value = keymap[keyname];
+    if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { continue }
+    if (value == "...") { delete keymap[keyname]; continue }
+
+    var keys = map(keyname.split(" "), normalizeKeyName);
+    for (var i = 0; i < keys.length; i++) {
+      var val = (void 0), name = (void 0);
+      if (i == keys.length - 1) {
+        name = keys.join(" ");
+        val = value;
+      } else {
+        name = keys.slice(0, i + 1).join(" ");
+        val = "...";
+      }
+      var prev = copy[name];
+      if (!prev) { copy[name] = val; }
+      else if (prev != val) { throw new Error("Inconsistent bindings for " + name) }
+    }
+    delete keymap[keyname];
+  } }
+  for (var prop in copy) { keymap[prop] = copy[prop]; }
+  return keymap
+}
+
+function lookupKey(key, map$$1, handle, context) {
+  map$$1 = getKeyMap(map$$1);
+  var found = map$$1.call ? map$$1.call(key, context) : map$$1[key];
+  if (found === false) { return "nothing" }
+  if (found === "...") { return "multi" }
+  if (found != null && handle(found)) { return "handled" }
+
+  if (map$$1.fallthrough) {
+    if (Object.prototype.toString.call(map$$1.fallthrough) != "[object Array]")
+      { return lookupKey(key, map$$1.fallthrough, handle, context) }
+    for (var i = 0; i < map$$1.fallthrough.length; i++) {
+      var result = lookupKey(key, map$$1.fallthrough[i], handle, context);
+      if (result) { return result }
+    }
+  }
+}
+
+// Modifier key presses don't count as 'real' key presses for the
+// purpose of keymap fallthrough.
+function isModifierKey(value) {
+  var name = typeof value == "string" ? value : keyNames[value.keyCode];
+  return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
+}
+
+function addModifierNames(name, event, noShift) {
+  var base = name;
+  if (event.altKey && base != "Alt") { name = "Alt-" + name; }
+  if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name; }
+  if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") { name = "Cmd-" + name; }
+  if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name; }
+  return name
+}
+
+// Look up the name of a key as indicated by an event object.
+function keyName(event, noShift) {
+  if (presto && event.keyCode == 34 && event["char"]) { return false }
+  var name = keyNames[event.keyCode];
+  if (name == null || event.altGraphKey) { return false }
+  // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause,
+  // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+)
+  if (event.keyCode == 3 && event.code) { name = event.code; }
+  return addModifierNames(name, event, noShift)
+}
+
+function getKeyMap(val) {
+  return typeof val == "string" ? keyMap[val] : val
+}
+
+// Helper for deleting text near the selection(s), used to implement
+// backspace, delete, and similar functionality.
+function deleteNearSelection(cm, compute) {
+  var ranges = cm.doc.sel.ranges, kill = [];
+  // Build up a set of ranges to kill first, merging overlapping
+  // ranges.
+  for (var i = 0; i < ranges.length; i++) {
+    var toKill = compute(ranges[i]);
+    while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
+      var replaced = kill.pop();
+      if (cmp(replaced.from, toKill.from) < 0) {
+        toKill.from = replaced.from;
+        break
+      }
+    }
+    kill.push(toKill);
+  }
+  // Next, remove those actual ranges.
+  runInOp(cm, function () {
+    for (var i = kill.length - 1; i >= 0; i--)
+      { replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); }
+    ensureCursorVisible(cm);
+  });
+}
+
+function moveCharLogically(line, ch, dir) {
+  var target = skipExtendingChars(line.text, ch + dir, dir);
+  return target < 0 || target > line.text.length ? null : target
+}
+
+function moveLogically(line, start, dir) {
+  var ch = moveCharLogically(line, start.ch, dir);
+  return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before")
+}
+
+function endOfLine(visually, cm, lineObj, lineNo, dir) {
+  if (visually) {
+    var order = getOrder(lineObj, cm.doc.direction);
+    if (order) {
+      var part = dir < 0 ? lst(order) : order[0];
+      var moveInStorageOrder = (dir < 0) == (part.level == 1);
+      var sticky = moveInStorageOrder ? "after" : "before";
+      var ch;
+      // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
+      // it could be that the last bidi part is not on the last visual line,
+      // since visual lines contain content order-consecutive chunks.
+      // Thus, in rtl, we are looking for the first (content-order) character
+      // in the rtl chunk that is on the last line (that is, the same line
+      // as the last (content-order) character).
+      if (part.level > 0 || cm.doc.direction == "rtl") {
+        var prep = prepareMeasureForLine(cm, lineObj);
+        ch = dir < 0 ? lineObj.text.length - 1 : 0;
+        var targetTop = measureCharPrepared(cm, prep, ch).top;
+        ch = findFirst(function (ch) { return measureCharPrepared(cm, prep, ch).top == targetTop; }, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch);
+        if (sticky == "before") { ch = moveCharLogically(lineObj, ch, 1); }
+      } else { ch = dir < 0 ? part.to : part.from; }
+      return new Pos(lineNo, ch, sticky)
+    }
+  }
+  return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
+}
+
+function moveVisually(cm, line, start, dir) {
+  var bidi = getOrder(line, cm.doc.direction);
+  if (!bidi) { return moveLogically(line, start, dir) }
+  if (start.ch >= line.text.length) {
+    start.ch = line.text.length;
+    start.sticky = "before";
+  } else if (start.ch <= 0) {
+    start.ch = 0;
+    start.sticky = "after";
+  }
+  var partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos];
+  if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
+    // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines,
+    // nothing interesting happens.
+    return moveLogically(line, start, dir)
+  }
+
+  var mv = function (pos, dir) { return moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir); };
+  var prep;
+  var getWrappedLineExtent = function (ch) {
+    if (!cm.options.lineWrapping) { return {begin: 0, end: line.text.length} }
+    prep = prep || prepareMeasureForLine(cm, line);
+    return wrappedLineExtentChar(cm, line, prep, ch)
+  };
+  var wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch);
+
+  if (cm.doc.direction == "rtl" || part.level == 1) {
+    var moveInStorageOrder = (part.level == 1) == (dir < 0);
+    var ch = mv(start, moveInStorageOrder ? 1 : -1);
+    if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
+      // Case 2: We move within an rtl part or in an rtl editor on the same visual line
+      var sticky = moveInStorageOrder ? "before" : "after";
+      return new Pos(start.line, ch, sticky)
+    }
+  }
+
+  // Case 3: Could not move within this bidi part in this visual line, so leave
+  // the current bidi part
+
+  var searchInVisualLine = function (partPos, dir, wrappedLineExtent) {
+    var getRes = function (ch, moveInStorageOrder) { return moveInStorageOrder
+      ? new Pos(start.line, mv(ch, 1), "before")
+      : new Pos(start.line, ch, "after"); };
+
+    for (; partPos >= 0 && partPos < bidi.length; partPos += dir) {
+      var part = bidi[partPos];
+      var moveInStorageOrder = (dir > 0) == (part.level != 1);
+      var ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1);
+      if (part.from <= ch && ch < part.to) { return getRes(ch, moveInStorageOrder) }
+      ch = moveInStorageOrder ? part.from : mv(part.to, -1);
+      if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) { return getRes(ch, moveInStorageOrder) }
+    }
+  };
+
+  // Case 3a: Look for other bidi parts on the same visual line
+  var res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent);
+  if (res) { return res }
+
+  // Case 3b: Look for other bidi parts on the next visual line
+  var nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1);
+  if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
+    res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh));
+    if (res) { return res }
+  }
+
+  // Case 4: Nowhere to move
+  return null
+}
+
+// Commands are parameter-less actions that can be performed on an
+// editor, mostly used for keybindings.
+var commands = {
+  selectAll: selectAll,
+  singleSelection: function (cm) { return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); },
+  killLine: function (cm) { return deleteNearSelection(cm, function (range) {
+    if (range.empty()) {
+      var len = getLine(cm.doc, range.head.line).text.length;
+      if (range.head.ch == len && range.head.line < cm.lastLine())
+        { return {from: range.head, to: Pos(range.head.line + 1, 0)} }
+      else
+        { return {from: range.head, to: Pos(range.head.line, len)} }
+    } else {
+      return {from: range.from(), to: range.to()}
+    }
+  }); },
+  deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({
+    from: Pos(range.from().line, 0),
+    to: clipPos(cm.doc, Pos(range.to().line + 1, 0))
+  }); }); },
+  delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({
+    from: Pos(range.from().line, 0), to: range.from()
+  }); }); },
+  delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) {
+    var top = cm.charCoords(range.head, "div").top + 5;
+    var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+    return {from: leftPos, to: range.from()}
+  }); },
+  delWrappedLineRight: function (cm) { return deleteNearSelection(cm, function (range) {
+    var top = cm.charCoords(range.head, "div").top + 5;
+    var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+    return {from: range.from(), to: rightPos }
+  }); },
+  undo: function (cm) { return cm.undo(); },
+  redo: function (cm) { return cm.redo(); },
+  undoSelection: function (cm) { return cm.undoSelection(); },
+  redoSelection: function (cm) { return cm.redoSelection(); },
+  goDocStart: function (cm) { return cm.extendSelection(Pos(cm.firstLine(), 0)); },
+  goDocEnd: function (cm) { return cm.extendSelection(Pos(cm.lastLine())); },
+  goLineStart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStart(cm, range.head.line); },
+    {origin: "+move", bias: 1}
+  ); },
+  goLineStartSmart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStartSmart(cm, range.head); },
+    {origin: "+move", bias: 1}
+  ); },
+  goLineEnd: function (cm) { return cm.extendSelectionsBy(function (range) { return lineEnd(cm, range.head.line); },
+    {origin: "+move", bias: -1}
+  ); },
+  goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) {
+    var top = cm.cursorCoords(range.head, "div").top + 5;
+    return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+  }, sel_move); },
+  goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) {
+    var top = cm.cursorCoords(range.head, "div").top + 5;
+    return cm.coordsChar({left: 0, top: top}, "div")
+  }, sel_move); },
+  goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) {
+    var top = cm.cursorCoords(range.head, "div").top + 5;
+    var pos = cm.coordsChar({left: 0, top: top}, "div");
+    if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) }
+    return pos
+  }, sel_move); },
+  goLineUp: function (cm) { return cm.moveV(-1, "line"); },
+  goLineDown: function (cm) { return cm.moveV(1, "line"); },
+  goPageUp: function (cm) { return cm.moveV(-1, "page"); },
+  goPageDown: function (cm) { return cm.moveV(1, "page"); },
+  goCharLeft: function (cm) { return cm.moveH(-1, "char"); },
+  goCharRight: function (cm) { return cm.moveH(1, "char"); },
+  goColumnLeft: function (cm) { return cm.moveH(-1, "column"); },
+  goColumnRight: function (cm) { return cm.moveH(1, "column"); },
+  goWordLeft: function (cm) { return cm.moveH(-1, "word"); },
+  goGroupRight: function (cm) { return cm.moveH(1, "group"); },
+  goGroupLeft: function (cm) { return cm.moveH(-1, "group"); },
+  goWordRight: function (cm) { return cm.moveH(1, "word"); },
+  delCharBefore: function (cm) { return cm.deleteH(-1, "char"); },
+  delCharAfter: function (cm) { return cm.deleteH(1, "char"); },
+  delWordBefore: function (cm) { return cm.deleteH(-1, "word"); },
+  delWordAfter: function (cm) { return cm.deleteH(1, "word"); },
+  delGroupBefore: function (cm) { return cm.deleteH(-1, "group"); },
+  delGroupAfter: function (cm) { return cm.deleteH(1, "group"); },
+  indentAuto: function (cm) { return cm.indentSelection("smart"); },
+  indentMore: function (cm) { return cm.indentSelection("add"); },
+  indentLess: function (cm) { return cm.indentSelection("subtract"); },
+  insertTab: function (cm) { return cm.replaceSelection("\t"); },
+  insertSoftTab: function (cm) {
+    var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].from();
+      var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
+      spaces.push(spaceStr(tabSize - col % tabSize));
+    }
+    cm.replaceSelections(spaces);
+  },
+  defaultTab: function (cm) {
+    if (cm.somethingSelected()) { cm.indentSelection("add"); }
+    else { cm.execCommand("insertTab"); }
+  },
+  // Swap the two chars left and right of each selection's head.
+  // Move cursor behind the two swapped characters afterwards.
+  //
+  // Doesn't consider line feeds a character.
+  // Doesn't scan more than one line above to find a character.
+  // Doesn't do anything on an empty line.
+  // Doesn't do anything with non-empty selections.
+  transposeChars: function (cm) { return runInOp(cm, function () {
+    var ranges = cm.listSelections(), newSel = [];
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) { continue }
+      var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
+      if (line) {
+        if (cur.ch == line.length) { cur = new Pos(cur.line, cur.ch - 1); }
+        if (cur.ch > 0) {
+          cur = new Pos(cur.line, cur.ch + 1);
+          cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
+                          Pos(cur.line, cur.ch - 2), cur, "+transpose");
+        } else if (cur.line > cm.doc.first) {
+          var prev = getLine(cm.doc, cur.line - 1).text;
+          if (prev) {
+            cur = new Pos(cur.line, 1);
+            cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                            prev.charAt(prev.length - 1),
+                            Pos(cur.line - 1, prev.length - 1), cur, "+transpose");
+          }
+        }
+      }
+      newSel.push(new Range(cur, cur));
+    }
+    cm.setSelections(newSel);
+  }); },
+  newlineAndIndent: function (cm) { return runInOp(cm, function () {
+    var sels = cm.listSelections();
+    for (var i = sels.length - 1; i >= 0; i--)
+      { cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input"); }
+    sels = cm.listSelections();
+    for (var i$1 = 0; i$1 < sels.length; i$1++)
+      { cm.indentLine(sels[i$1].from().line, null, true); }
+    ensureCursorVisible(cm);
+  }); },
+  openLine: function (cm) { return cm.replaceSelection("\n", "start"); },
+  toggleOverwrite: function (cm) { return cm.toggleOverwrite(); }
+};
+
+
+function lineStart(cm, lineN) {
+  var line = getLine(cm.doc, lineN);
+  var visual = visualLine(line);
+  if (visual != line) { lineN = lineNo(visual); }
+  return endOfLine(true, cm, visual, lineN, 1)
+}
+function lineEnd(cm, lineN) {
+  var line = getLine(cm.doc, lineN);
+  var visual = visualLineEnd(line);
+  if (visual != line) { lineN = lineNo(visual); }
+  return endOfLine(true, cm, line, lineN, -1)
+}
+function lineStartSmart(cm, pos) {
+  var start = lineStart(cm, pos.line);
+  var line = getLine(cm.doc, start.line);
+  var order = getOrder(line, cm.doc.direction);
+  if (!order || order[0].level == 0) {
+    var firstNonWS = Math.max(0, line.text.search(/\S/));
+    var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+    return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
+  }
+  return start
+}
+
+// Run a handler that was bound to a key.
+function doHandleBinding(cm, bound, dropShift) {
+  if (typeof bound == "string") {
+    bound = commands[bound];
+    if (!bound) { return false }
+  }
+  // Ensure previous input has been read, so that the handler sees a
+  // consistent view of the document
+  cm.display.input.ensurePolled();
+  var prevShift = cm.display.shift, done = false;
+  try {
+    if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+    if (dropShift) { cm.display.shift = false; }
+    done = bound(cm) != Pass;
+  } finally {
+    cm.display.shift = prevShift;
+    cm.state.suppressEdits = false;
+  }
+  return done
+}
+
+function lookupKeyForEditor(cm, name, handle) {
+  for (var i = 0; i < cm.state.keyMaps.length; i++) {
+    var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
+    if (result) { return result }
+  }
+  return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+    || lookupKey(name, cm.options.keyMap, handle, cm)
+}
+
+// Note that, despite the name, this function is also used to check
+// for bound mouse clicks.
+
+var stopSeq = new Delayed;
+
+function dispatchKey(cm, name, e, handle) {
+  var seq = cm.state.keySeq;
+  if (seq) {
+    if (isModifierKey(name)) { return "handled" }
+    if (/\'$/.test(name))
+      { cm.state.keySeq = null; }
+    else
+      { stopSeq.set(50, function () {
+        if (cm.state.keySeq == seq) {
+          cm.state.keySeq = null;
+          cm.display.input.reset();
+        }
+      }); }
+    if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { return true }
+  }
+  return dispatchKeyInner(cm, name, e, handle)
+}
+
+function dispatchKeyInner(cm, name, e, handle) {
+  var result = lookupKeyForEditor(cm, name, handle);
+
+  if (result == "multi")
+    { cm.state.keySeq = name; }
+  if (result == "handled")
+    { signalLater(cm, "keyHandled", cm, name, e); }
+
+  if (result == "handled" || result == "multi") {
+    e_preventDefault(e);
+    restartBlink(cm);
+  }
+
+  return !!result
+}
+
+// Handle a key from the keydown event.
+function handleKeyBinding(cm, e) {
+  var name = keyName(e, true);
+  if (!name) { return false }
+
+  if (e.shiftKey && !cm.state.keySeq) {
+    // First try to resolve full name (including 'Shift-'). Failing
+    // that, see if there is a cursor-motion command (starting with
+    // 'go') bound to the keyname without 'Shift-'.
+    return dispatchKey(cm, "Shift-" + name, e, function (b) { return doHandleBinding(cm, b, true); })
+        || dispatchKey(cm, name, e, function (b) {
+             if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+               { return doHandleBinding(cm, b) }
+           })
+  } else {
+    return dispatchKey(cm, name, e, function (b) { return doHandleBinding(cm, b); })
+  }
+}
+
+// Handle a key from the keypress event
+function handleCharBinding(cm, e, ch) {
+  return dispatchKey(cm, "'" + ch + "'", e, function (b) { return doHandleBinding(cm, b, true); })
+}
+
+var lastStoppedKey = null;
+function onKeyDown(e) {
+  var cm = this;
+  cm.curOp.focus = activeElt();
+  if (signalDOMEvent(cm, e)) { return }
+  // IE does strange things with escape.
+  if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false; }
+  var code = e.keyCode;
+  cm.display.shift = code == 16 || e.shiftKey;
+  var handled = handleKeyBinding(cm, e);
+  if (presto) {
+    lastStoppedKey = handled ? code : null;
+    // Opera has no cut event... we try to at least catch the key combo
+    if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
+      { cm.replaceSelection("", null, "cut"); }
+  }
+
+  // Turn mouse into crosshair when Alt is held on Mac.
+  if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
+    { showCrossHair(cm); }
+}
+
+function showCrossHair(cm) {
+  var lineDiv = cm.display.lineDiv;
+  addClass(lineDiv, "CodeMirror-crosshair");
+
+  function up(e) {
+    if (e.keyCode == 18 || !e.altKey) {
+      rmClass(lineDiv, "CodeMirror-crosshair");
+      off(document, "keyup", up);
+      off(document, "mouseover", up);
+    }
+  }
+  on(document, "keyup", up);
+  on(document, "mouseover", up);
+}
+
+function onKeyUp(e) {
+  if (e.keyCode == 16) { this.doc.sel.shift = false; }
+  signalDOMEvent(this, e);
+}
+
+function onKeyPress(e) {
+  var cm = this;
+  if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return }
+  var keyCode = e.keyCode, charCode = e.charCode;
+  if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
+  if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) { return }
+  var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
+  // Some browsers fire keypress events for backspace
+  if (ch == "\x08") { return }
+  if (handleCharBinding(cm, e, ch)) { return }
+  cm.display.input.onKeyPress(e);
+}
+
+var DOUBLECLICK_DELAY = 400;
+
+var PastClick = function(time, pos, button) {
+  this.time = time;
+  this.pos = pos;
+  this.button = button;
+};
+
+PastClick.prototype.compare = function (time, pos, button) {
+  return this.time + DOUBLECLICK_DELAY > time &&
+    cmp(pos, this.pos) == 0 && button == this.button
+};
+
+var lastClick;
+var lastDoubleClick;
+function clickRepeat(pos, button) {
+  var now = +new Date;
+  if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) {
+    lastClick = lastDoubleClick = null;
+    return "triple"
+  } else if (lastClick && lastClick.compare(now, pos, button)) {
+    lastDoubleClick = new PastClick(now, pos, button);
+    lastClick = null;
+    return "double"
+  } else {
+    lastClick = new PastClick(now, pos, button);
+    lastDoubleClick = null;
+    return "single"
+  }
+}
+
+// A mouse down can be a single click, double click, triple click,
+// start of selection drag, start of text drag, new cursor
+// (ctrl-click), rectangle drag (alt-drag), or xwin
+// middle-click-paste. Or it might be a click on something we should
+// not interfere with, such as a scrollbar or widget.
+function onMouseDown(e) {
+  var cm = this, display = cm.display;
+  if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { return }
+  display.input.ensurePolled();
+  display.shift = e.shiftKey;
+
+  if (eventInWidget(display, e)) {
+    if (!webkit) {
+      // Briefly turn off draggability, to allow widgets to do
+      // normal dragging things.
+      display.scroller.draggable = false;
+      setTimeout(function () { return display.scroller.draggable = true; }, 100);
+    }
+    return
+  }
+  if (clickInGutter(cm, e)) { return }
+  var pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single";
+  window.focus();
+
+  // #3261: make sure, that we're not starting a second selection
+  if (button == 1 && cm.state.selectingText)
+    { cm.state.selectingText(e); }
+
+  if (pos && handleMappedButton(cm, button, pos, repeat, e)) { return }
+
+  if (button == 1) {
+    if (pos) { leftButtonDown(cm, pos, repeat, e); }
+    else if (e_target(e) == display.scroller) { e_preventDefault(e); }
+  } else if (button == 2) {
+    if (pos) { extendSelection(cm.doc, pos); }
+    setTimeout(function () { return display.input.focus(); }, 20);
+  } else if (button == 3) {
+    if (captureRightClick) { onContextMenu(cm, e); }
+    else { delayBlurEvent(cm); }
+  }
+}
+
+function handleMappedButton(cm, button, pos, repeat, event) {
+  var name = "Click";
+  if (repeat == "double") { name = "Double" + name; }
+  else if (repeat == "triple") { name = "Triple" + name; }
+  name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name;
+
+  return dispatchKey(cm,  addModifierNames(name, event), event, function (bound) {
+    if (typeof bound == "string") { bound = commands[bound]; }
+    if (!bound) { return false }
+    var done = false;
+    try {
+      if (cm.isReadOnly()) { cm.state.suppressEdits = true; }
+      done = bound(cm, pos) != Pass;
+    } finally {
+      cm.state.suppressEdits = false;
+    }
+    return done
+  })
+}
+
+function configureMouse(cm, repeat, event) {
+  var option = cm.getOption("configureMouse");
+  var value = option ? option(cm, repeat, event) : {};
+  if (value.unit == null) {
+    var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey;
+    value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line";
+  }
+  if (value.extend == null || cm.doc.extend) { value.extend = cm.doc.extend || event.shiftKey; }
+  if (value.addNew == null) { value.addNew = mac ? event.metaKey : event.ctrlKey; }
+  if (value.moveOnDrag == null) { value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); }
+  return value
+}
+
+function leftButtonDown(cm, pos, repeat, event) {
+  if (ie) { setTimeout(bind(ensureFocus, cm), 0); }
+  else { cm.curOp.focus = activeElt(); }
+
+  var behavior = configureMouse(cm, repeat, event);
+
+  var sel = cm.doc.sel, contained;
+  if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
+      repeat == "single" && (contained = sel.contains(pos)) > -1 &&
+      (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) &&
+      (cmp(contained.to(), pos) > 0 || pos.xRel < 0))
+    { leftButtonStartDrag(cm, event, pos, behavior); }
+  else
+    { leftButtonSelect(cm, event, pos, behavior); }
+}
+
+// Start a text drag. When it ends, see if any dragging actually
+// happen, and treat as a click if it didn't.
+function leftButtonStartDrag(cm, event, pos, behavior) {
+  var display = cm.display, moved = false;
+  var dragEnd = operation(cm, function (e) {
+    if (webkit) { display.scroller.draggable = false; }
+    cm.state.draggingText = false;
+    off(display.wrapper.ownerDocument, "mouseup", dragEnd);
+    off(display.wrapper.ownerDocument, "mousemove", mouseMove);
+    off(display.scroller, "dragstart", dragStart);
+    off(display.scroller, "drop", dragEnd);
+    if (!moved) {
+      e_preventDefault(e);
+      if (!behavior.addNew)
+        { extendSelection(cm.doc, pos, null, null, behavior.extend); }
+      // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
+      if (webkit || ie && ie_version == 9)
+        { setTimeout(function () {display.wrapper.ownerDocument.body.focus(); display.input.focus();}, 20); }
+      else
+        { display.input.focus(); }
+    }
+  });
+  var mouseMove = function(e2) {
+    moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10;
+  };
+  var dragStart = function () { return moved = true; };
+  // Let the drag handler handle this.
+  if (webkit) { display.scroller.draggable = true; }
+  cm.state.draggingText = dragEnd;
+  dragEnd.copy = !behavior.moveOnDrag;
+  // IE's approach to draggable
+  if (display.scroller.dragDrop) { display.scroller.dragDrop(); }
+  on(display.wrapper.ownerDocument, "mouseup", dragEnd);
+  on(display.wrapper.ownerDocument, "mousemove", mouseMove);
+  on(display.scroller, "dragstart", dragStart);
+  on(display.scroller, "drop", dragEnd);
+
+  delayBlurEvent(cm);
+  setTimeout(function () { return display.input.focus(); }, 20);
+}
+
+function rangeForUnit(cm, pos, unit) {
+  if (unit == "char") { return new Range(pos, pos) }
+  if (unit == "word") { return cm.findWordAt(pos) }
+  if (unit == "line") { return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) }
+  var result = unit(cm, pos);
+  return new Range(result.from, result.to)
+}
+
+// Normal selection, as opposed to text dragging.
+function leftButtonSelect(cm, event, start, behavior) {
+  var display = cm.display, doc = cm.doc;
+  e_preventDefault(event);
+
+  var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
+  if (behavior.addNew && !behavior.extend) {
+    ourIndex = doc.sel.contains(start);
+    if (ourIndex > -1)
+      { ourRange = ranges[ourIndex]; }
+    else
+      { ourRange = new Range(start, start); }
+  } else {
+    ourRange = doc.sel.primary();
+    ourIndex = doc.sel.primIndex;
+  }
+
+  if (behavior.unit == "rectangle") {
+    if (!behavior.addNew) { ourRange = new Range(start, start); }
+    start = posFromMouse(cm, event, true, true);
+    ourIndex = -1;
+  } else {
+    var range$$1 = rangeForUnit(cm, start, behavior.unit);
+    if (behavior.extend)
+      { ourRange = extendRange(ourRange, range$$1.anchor, range$$1.head, behavior.extend); }
+    else
+      { ourRange = range$$1; }
+  }
+
+  if (!behavior.addNew) {
+    ourIndex = 0;
+    setSelection(doc, new Selection([ourRange], 0), sel_mouse);
+    startSel = doc.sel;
+  } else if (ourIndex == -1) {
+    ourIndex = ranges.length;
+    setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
+                 {scroll: false, origin: "*mouse"});
+  } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
+    setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                 {scroll: false, origin: "*mouse"});
+    startSel = doc.sel;
+  } else {
+    replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
+  }
+
+  var lastPos = start;
+  function extendTo(pos) {
+    if (cmp(lastPos, pos) == 0) { return }
+    lastPos = pos;
+
+    if (behavior.unit == "rectangle") {
+      var ranges = [], tabSize = cm.options.tabSize;
+      var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
+      var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
+      var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
+      for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+           line <= end; line++) {
+        var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
+        if (left == right)
+          { ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); }
+        else if (text.length > leftPos)
+          { ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); }
+      }
+      if (!ranges.length) { ranges.push(new Range(start, start)); }
+      setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+                   {origin: "*mouse", scroll: false});
+      cm.scrollIntoView(pos);
+    } else {
+      var oldRange = ourRange;
+      var range$$1 = rangeForUnit(cm, pos, behavior.unit);
+      var anchor = oldRange.anchor, head;
+      if (cmp(range$$1.anchor, anchor) > 0) {
+        head = range$$1.head;
+        anchor = minPos(oldRange.from(), range$$1.anchor);
+      } else {
+        head = range$$1.anchor;
+        anchor = maxPos(oldRange.to(), range$$1.head);
+      }
+      var ranges$1 = startSel.ranges.slice(0);
+      ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head));
+      setSelection(doc, normalizeSelection(ranges$1, ourIndex), sel_mouse);
+    }
+  }
+
+  var editorSize = display.wrapper.getBoundingClientRect();
+  // Used to ensure timeout re-tries don't fire when another extend
+  // happened in the meantime (clearTimeout isn't reliable -- at
+  // least on Chrome, the timeouts still happen even when cleared,
+  // if the clear happens after their scheduled firing time).
+  var counter = 0;
+
+  function extend(e) {
+    var curCount = ++counter;
+    var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle");
+    if (!cur) { return }
+    if (cmp(cur, lastPos) != 0) {
+      cm.curOp.focus = activeElt();
+      extendTo(cur);
+      var visible = visibleLines(display, doc);
+      if (cur.line >= visible.to || cur.line < visible.from)
+        { setTimeout(operation(cm, function () {if (counter == curCount) { extend(e); }}), 150); }
+    } else {
+      var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
+      if (outside) { setTimeout(operation(cm, function () {
+        if (counter != curCount) { return }
+        display.scroller.scrollTop += outside;
+        extend(e);
+      }), 50); }
+    }
+  }
+
+  function done(e) {
+    cm.state.selectingText = false;
+    counter = Infinity;
+    e_preventDefault(e);
+    display.input.focus();
+    off(display.wrapper.ownerDocument, "mousemove", move);
+    off(display.wrapper.ownerDocument, "mouseup", up);
+    doc.history.lastSelOrigin = null;
+  }
+
+  var move = operation(cm, function (e) {
+    if (e.buttons === 0 || !e_button(e)) { done(e); }
+    else { extend(e); }
+  });
+  var up = operation(cm, done);
+  cm.state.selectingText = up;
+  on(display.wrapper.ownerDocument, "mousemove", move);
+  on(display.wrapper.ownerDocument, "mouseup", up);
+}
+
+// Used when mouse-selecting to adjust the anchor to the proper side
+// of a bidi jump depending on the visual position of the head.
+function bidiSimplify(cm, range$$1) {
+  var anchor = range$$1.anchor;
+  var head = range$$1.head;
+  var anchorLine = getLine(cm.doc, anchor.line);
+  if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { return range$$1 }
+  var order = getOrder(anchorLine);
+  if (!order) { return range$$1 }
+  var index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index];
+  if (part.from != anchor.ch && part.to != anchor.ch) { return range$$1 }
+  var boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1);
+  if (boundary == 0 || boundary == order.length) { return range$$1 }
+
+  // Compute the relative visual position of the head compared to the
+  // anchor (<0 is to the left, >0 to the right)
+  var leftSide;
+  if (head.line != anchor.line) {
+    leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0;
+  } else {
+    var headIndex = getBidiPartAt(order, head.ch, head.sticky);
+    var dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1);
+    if (headIndex == boundary - 1 || headIndex == boundary)
+      { leftSide = dir < 0; }
+    else
+      { leftSide = dir > 0; }
+  }
+
+  var usePart = order[boundary + (leftSide ? -1 : 0)];
+  var from = leftSide == (usePart.level == 1);
+  var ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before";
+  return anchor.ch == ch && anchor.sticky == sticky ? range$$1 : new Range(new Pos(anchor.line, ch, sticky), head)
+}
+
+
+// Determines whether an event happened in the gutter, and fires the
+// handlers for the corresponding event.
+function gutterEvent(cm, e, type, prevent) {
+  var mX, mY;
+  if (e.touches) {
+    mX = e.touches[0].clientX;
+    mY = e.touches[0].clientY;
+  } else {
+    try { mX = e.clientX; mY = e.clientY; }
+    catch(e) { return false }
+  }
+  if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false }
+  if (prevent) { e_preventDefault(e); }
+
+  var display = cm.display;
+  var lineBox = display.lineDiv.getBoundingClientRect();
+
+  if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) }
+  mY -= lineBox.top - display.viewOffset;
+
+  for (var i = 0; i < cm.options.gutters.length; ++i) {
+    var g = display.gutters.childNodes[i];
+    if (g && g.getBoundingClientRect().right >= mX) {
+      var line = lineAtHeight(cm.doc, mY);
+      var gutter = cm.options.gutters[i];
+      signal(cm, type, cm, line, gutter, e);
+      return e_defaultPrevented(e)
+    }
+  }
+}
+
+function clickInGutter(cm, e) {
+  return gutterEvent(cm, e, "gutterClick", true)
+}
+
+// CONTEXT MENU HANDLING
+
+// To make the context menu work, we need to briefly unhide the
+// textarea (making it as unobtrusive as possible) to let the
+// right-click take effect on it.
+function onContextMenu(cm, e) {
+  if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { return }
+  if (signalDOMEvent(cm, e, "contextmenu")) { return }
+  cm.display.input.onContextMenu(e);
+}
+
+function contextMenuInGutter(cm, e) {
+  if (!hasHandler(cm, "gutterContextMenu")) { return false }
+  return gutterEvent(cm, e, "gutterContextMenu", false)
+}
+
+function themeChanged(cm) {
+  cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
+    cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
+  clearCaches(cm);
+}
+
+var Init = {toString: function(){return "CodeMirror.Init"}};
+
+var defaults = {};
+var optionHandlers = {};
+
+function defineOptions(CodeMirror) {
+  var optionHandlers = CodeMirror.optionHandlers;
+
+  function option(name, deflt, handle, notOnInit) {
+    CodeMirror.defaults[name] = deflt;
+    if (handle) { optionHandlers[name] =
+      notOnInit ? function (cm, val, old) {if (old != Init) { handle(cm, val, old); }} : handle; }
+  }
+
+  CodeMirror.defineOption = option;
+
+  // Passed to option handlers when there is no old value.
+  CodeMirror.Init = Init;
+
+  // These two are, on init, called from the constructor because they
+  // have to be initialized before the editor can start at all.
+  option("value", "", function (cm, val) { return cm.setValue(val); }, true);
+  option("mode", null, function (cm, val) {
+    cm.doc.modeOption = val;
+    loadMode(cm);
+  }, true);
+
+  option("indentUnit", 2, loadMode, true);
+  option("indentWithTabs", false);
+  option("smartIndent", true);
+  option("tabSize", 4, function (cm) {
+    resetModeState(cm);
+    clearCaches(cm);
+    regChange(cm);
+  }, true);
+
+  option("lineSeparator", null, function (cm, val) {
+    cm.doc.lineSep = val;
+    if (!val) { return }
+    var newBreaks = [], lineNo = cm.doc.first;
+    cm.doc.iter(function (line) {
+      for (var pos = 0;;) {
+        var found = line.text.indexOf(val, pos);
+        if (found == -1) { break }
+        pos = found + val.length;
+        newBreaks.push(Pos(lineNo, found));
+      }
+      lineNo++;
+    });
+    for (var i = newBreaks.length - 1; i >= 0; i--)
+      { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
+  });
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {
+    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+    if (old != Init) { cm.refresh(); }
+  });
+  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { return cm.refresh(); }, true);
+  option("electricChars", true);
+  option("inputStyle", mobile ? "contenteditable" : "textarea", function () {
+    throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
+  }, true);
+  option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true);
+  option("rtlMoveVisually", !windows);
+  option("wholeLineUpdateBefore", true);
+
+  option("theme", "default", function (cm) {
+    themeChanged(cm);
+    guttersChanged(cm);
+  }, true);
+  option("keyMap", "default", function (cm, val, old) {
+    var next = getKeyMap(val);
+    var prev = old != Init && getKeyMap(old);
+    if (prev && prev.detach) { prev.detach(cm, next); }
+    if (next.attach) { next.attach(cm, prev || null); }
+  });
+  option("extraKeys", null);
+  option("configureMouse", null);
+
+  option("lineWrapping", false, wrappingChanged, true);
+  option("gutters", [], function (cm) {
+    setGuttersForLineNumbers(cm.options);
+    guttersChanged(cm);
+  }, true);
+  option("fixedGutter", true, function (cm, val) {
+    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
+    cm.refresh();
+  }, true);
+  option("coverGutterNextToScrollbar", false, function (cm) { return updateScrollbars(cm); }, true);
+  option("scrollbarStyle", "native", function (cm) {
+    initScrollbars(cm);
+    updateScrollbars(cm);
+    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+  }, true);
+  option("lineNumbers", false, function (cm) {
+    setGuttersForLineNumbers(cm.options);
+    guttersChanged(cm);
+  }, true);
+  option("firstLineNumber", 1, guttersChanged, true);
+  option("lineNumberFormatter", function (integer) { return integer; }, guttersChanged, true);
+  option("showCursorWhenSelecting", false, updateSelection, true);
+
+  option("resetSelectionOnContextMenu", true);
+  option("lineWiseCopyCut", true);
+  option("pasteLinesPerSelection", true);
+
+  option("readOnly", false, function (cm, val) {
+    if (val == "nocursor") {
+      onBlur(cm);
+      cm.display.input.blur();
+    }
+    cm.display.input.readOnlyChanged(val);
+  });
+  option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset(); }}, true);
+  option("dragDrop", true, dragDropChanged);
+  option("allowDropFileTypes", null);
+
+  option("cursorBlinkRate", 530);
+  option("cursorScrollMargin", 0);
+  option("cursorHeight", 1, updateSelection, true);
+  option("singleCursorHeightPerLine", true, updateSelection, true);
+  option("workTime", 100);
+  option("workDelay", 100);
+  option("flattenSpans", true, resetModeState, true);
+  option("addModeClass", false, resetModeState, true);
+  option("pollInterval", 100);
+  option("undoDepth", 200, function (cm, val) { return cm.doc.history.undoDepth = val; });
+  option("historyEventDelay", 1250);
+  option("viewportMargin", 10, function (cm) { return cm.refresh(); }, true);
+  option("maxHighlightLength", 10000, resetModeState, true);
+  option("moveInputWithCursor", true, function (cm, val) {
+    if (!val) { cm.display.input.resetPosition(); }
+  });
+
+  option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; });
+  option("autofocus", null);
+  option("direction", "ltr", function (cm, val) { return cm.doc.setDirection(val); }, true);
+}
+
+function guttersChanged(cm) {
+  updateGutters(cm);
+  regChange(cm);
+  alignHorizontally(cm);
+}
+
+function dragDropChanged(cm, value, old) {
+  var wasOn = old && old != Init;
+  if (!value != !wasOn) {
+    var funcs = cm.display.dragFunctions;
+    var toggle = value ? on : off;
+    toggle(cm.display.scroller, "dragstart", funcs.start);
+    toggle(cm.display.scroller, "dragenter", funcs.enter);
+    toggle(cm.display.scroller, "dragover", funcs.over);
+    toggle(cm.display.scroller, "dragleave", funcs.leave);
+    toggle(cm.display.scroller, "drop", funcs.drop);
+  }
+}
+
+function wrappingChanged(cm) {
+  if (cm.options.lineWrapping) {
+    addClass(cm.display.wrapper, "CodeMirror-wrap");
+    cm.display.sizer.style.minWidth = "";
+    cm.display.sizerWidth = null;
+  } else {
+    rmClass(cm.display.wrapper, "CodeMirror-wrap");
+    findMaxLine(cm);
+  }
+  estimateLineHeights(cm);
+  regChange(cm);
+  clearCaches(cm);
+  setTimeout(function () { return updateScrollbars(cm); }, 100);
+}
+
+// A CodeMirror instance represents an editor. This is the object
+// that user code is usually dealing with.
+
+function CodeMirror$1(place, options) {
+  var this$1 = this;
+
+  if (!(this instanceof CodeMirror$1)) { return new CodeMirror$1(place, options) }
+
+  this.options = options = options ? copyObj(options) : {};
+  // Determine effective options based on given values and defaults.
+  copyObj(defaults, options, false);
+  setGuttersForLineNumbers(options);
+
+  var doc = options.value;
+  if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); }
+  this.doc = doc;
+
+  var input = new CodeMirror$1.inputStyles[options.inputStyle](this);
+  var display = this.display = new Display(place, doc, input);
+  display.wrapper.CodeMirror = this;
+  updateGutters(this);
+  themeChanged(this);
+  if (options.lineWrapping)
+    { this.display.wrapper.className += " CodeMirror-wrap"; }
+  initScrollbars(this);
+
+  this.state = {
+    keyMaps: [],  // stores maps added by addKeyMap
+    overlays: [], // highlighting overlays, as added by addOverlay
+    modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
+    overwrite: false,
+    delayingBlurEvent: false,
+    focused: false,
+    suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
+    pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+    selectingText: false,
+    draggingText: false,
+    highlight: new Delayed(), // stores highlight worker timeout
+    keySeq: null,  // Unfinished key sequence
+    specialChars: null
+  };
+
+  if (options.autofocus && !mobile) { display.input.focus(); }
+
+  // Override magic textarea content restore that IE sometimes does
+  // on our hidden textarea on reload
+  if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20); }
+
+  registerEventHandlers(this);
+  ensureGlobalHandlers();
+
+  startOperation(this);
+  this.curOp.forceUpdate = true;
+  attachDoc(this, doc);
+
+  if ((options.autofocus && !mobile) || this.hasFocus())
+    { setTimeout(bind(onFocus, this), 20); }
+  else
+    { onBlur(this); }
+
+  for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt))
+    { optionHandlers[opt](this$1, options[opt], Init); } }
+  maybeUpdateLineNumberWidth(this);
+  if (options.finishInit) { options.finishInit(this); }
+  for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this$1); }
+  endOperation(this);
+  // Suppress optimizelegibility in Webkit, since it breaks text
+  // measuring on line wrapping boundaries.
+  if (webkit && options.lineWrapping &&
+      getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+    { display.lineDiv.style.textRendering = "auto"; }
+}
+
+// The default configuration options.
+CodeMirror$1.defaults = defaults;
+// Functions to run when options are changed.
+CodeMirror$1.optionHandlers = optionHandlers;
+
+// Attach the necessary event handlers when initializing the editor
+function registerEventHandlers(cm) {
+  var d = cm.display;
+  on(d.scroller, "mousedown", operation(cm, onMouseDown));
+  // Older IE's will not fire a second mousedown for a double click
+  if (ie && ie_version < 11)
+    { on(d.scroller, "dblclick", operation(cm, function (e) {
+      if (signalDOMEvent(cm, e)) { return }
+      var pos = posFromMouse(cm, e);
+      if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { return }
+      e_preventDefault(e);
+      var word = cm.findWordAt(pos);
+      extendSelection(cm.doc, word.anchor, word.head);
+    })); }
+  else
+    { on(d.scroller, "dblclick", function (e) { return signalDOMEvent(cm, e) || e_preventDefault(e); }); }
+  // Some browsers fire contextmenu *after* opening the menu, at
+  // which point we can't mess with it anymore. Context menu is
+  // handled in onMouseDown for these browsers.
+  if (!captureRightClick) { on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); }); }
+
+  // Used to suppress mouse event handling when a touch happens
+  var touchFinished, prevTouch = {end: 0};
+  function finishTouch() {
+    if (d.activeTouch) {
+      touchFinished = setTimeout(function () { return d.activeTouch = null; }, 1000);
+      prevTouch = d.activeTouch;
+      prevTouch.end = +new Date;
+    }
+  }
+  function isMouseLikeTouchEvent(e) {
+    if (e.touches.length != 1) { return false }
+    var touch = e.touches[0];
+    return touch.radiusX <= 1 && touch.radiusY <= 1
+  }
+  function farAway(touch, other) {
+    if (other.left == null) { return true }
+    var dx = other.left - touch.left, dy = other.top - touch.top;
+    return dx * dx + dy * dy > 20 * 20
+  }
+  on(d.scroller, "touchstart", function (e) {
+    if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) {
+      d.input.ensurePolled();
+      clearTimeout(touchFinished);
+      var now = +new Date;
+      d.activeTouch = {start: now, moved: false,
+                       prev: now - prevTouch.end <= 300 ? prevTouch : null};
+      if (e.touches.length == 1) {
+        d.activeTouch.left = e.touches[0].pageX;
+        d.activeTouch.top = e.touches[0].pageY;
+      }
+    }
+  });
+  on(d.scroller, "touchmove", function () {
+    if (d.activeTouch) { d.activeTouch.moved = true; }
+  });
+  on(d.scroller, "touchend", function (e) {
+    var touch = d.activeTouch;
+    if (touch && !eventInWidget(d, e) && touch.left != null &&
+        !touch.moved && new Date - touch.start < 300) {
+      var pos = cm.coordsChar(d.activeTouch, "page"), range;
+      if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+        { range = new Range(pos, pos); }
+      else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+        { range = cm.findWordAt(pos); }
+      else // Triple tap
+        { range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); }
+      cm.setSelection(range.anchor, range.head);
+      cm.focus();
+      e_preventDefault(e);
+    }
+    finishTouch();
+  });
+  on(d.scroller, "touchcancel", finishTouch);
+
+  // Sync scrolling between fake scrollbars and real scrollable
+  // area, ensure viewport is updated when scrolling.
+  on(d.scroller, "scroll", function () {
+    if (d.scroller.clientHeight) {
+      updateScrollTop(cm, d.scroller.scrollTop);
+      setScrollLeft(cm, d.scroller.scrollLeft, true);
+      signal(cm, "scroll", cm);
+    }
+  });
+
+  // Listen to wheel events in order to try and update the viewport on time.
+  on(d.scroller, "mousewheel", function (e) { return onScrollWheel(cm, e); });
+  on(d.scroller, "DOMMouseScroll", function (e) { return onScrollWheel(cm, e); });
+
+  // Prevent wrapper from ever scrolling
+  on(d.wrapper, "scroll", function () { return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
+
+  d.dragFunctions = {
+    enter: function (e) {if (!signalDOMEvent(cm, e)) { e_stop(e); }},
+    over: function (e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
+    start: function (e) { return onDragStart(cm, e); },
+    drop: operation(cm, onDrop),
+    leave: function (e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
+  };
+
+  var inp = d.input.getField();
+  on(inp, "keyup", function (e) { return onKeyUp.call(cm, e); });
+  on(inp, "keydown", operation(cm, onKeyDown));
+  on(inp, "keypress", operation(cm, onKeyPress));
+  on(inp, "focus", function (e) { return onFocus(cm, e); });
+  on(inp, "blur", function (e) { return onBlur(cm, e); });
+}
+
+var initHooks = [];
+CodeMirror$1.defineInitHook = function (f) { return initHooks.push(f); };
+
+// Indent the given line. The how parameter can be "smart",
+// "add"/null, "subtract", or "prev". When aggressive is false
+// (typically set to true for forced single-line indents), empty
+// lines are not indented, and places where the mode returns Pass
+// are left alone.
+function indentLine(cm, n, how, aggressive) {
+  var doc = cm.doc, state;
+  if (how == null) { how = "add"; }
+  if (how == "smart") {
+    // Fall back to "prev" when the mode doesn't have an indentation
+    // method.
+    if (!doc.mode.indent) { how = "prev"; }
+    else { state = getContextBefore(cm, n).state; }
+  }
+
+  var tabSize = cm.options.tabSize;
+  var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
+  if (line.stateAfter) { line.stateAfter = null; }
+  var curSpaceString = line.text.match(/^\s*/)[0], indentation;
+  if (!aggressive && !/\S/.test(line.text)) {
+    indentation = 0;
+    how = "not";
+  } else if (how == "smart") {
+    indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+    if (indentation == Pass || indentation > 150) {
+      if (!aggressive) { return }
+      how = "prev";
+    }
+  }
+  if (how == "prev") {
+    if (n > doc.first) { indentation = countColumn(getLine(doc, n-1).text, null, tabSize); }
+    else { indentation = 0; }
+  } else if (how == "add") {
+    indentation = curSpace + cm.options.indentUnit;
+  } else if (how == "subtract") {
+    indentation = curSpace - cm.options.indentUnit;
+  } else if (typeof how == "number") {
+    indentation = curSpace + how;
+  }
+  indentation = Math.max(0, indentation);
+
+  var indentString = "", pos = 0;
+  if (cm.options.indentWithTabs)
+    { for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} }
+  if (pos < indentation) { indentString += spaceStr(indentation - pos); }
+
+  if (indentString != curSpaceString) {
+    replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+    line.stateAfter = null;
+    return true
+  } else {
+    // Ensure that, if the cursor was in the whitespace at the start
+    // of the line, it is moved to the end of that space.
+    for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) {
+      var range = doc.sel.ranges[i$1];
+      if (range.head.line == n && range.head.ch < curSpaceString.length) {
+        var pos$1 = Pos(n, curSpaceString.length);
+        replaceOneSelection(doc, i$1, new Range(pos$1, pos$1));
+        break
+      }
+    }
+  }
+}
+
+// This will be set to a {lineWise: bool, text: [string]} object, so
+// that, when pasting, we know what kind of selections the copied
+// text was made out of.
+var lastCopied = null;
+
+function setLastCopied(newLastCopied) {
+  lastCopied = newLastCopied;
+}
+
+function applyTextInput(cm, inserted, deleted, sel, origin) {
+  var doc = cm.doc;
+  cm.display.shift = false;
+  if (!sel) { sel = doc.sel; }
+
+  var paste = cm.state.pasteIncoming || origin == "paste";
+  var textLines = splitLinesAuto(inserted), multiPaste = null;
+  // When pasting N lines into N selections, insert one line per selection
+  if (paste && sel.ranges.length > 1) {
+    if (lastCopied && lastCopied.text.join("\n") == inserted) {
+      if (sel.ranges.length % lastCopied.text.length == 0) {
+        multiPaste = [];
+        for (var i = 0; i < lastCopied.text.length; i++)
+          { multiPaste.push(doc.splitLines(lastCopied.text[i])); }
+      }
+    } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) {
+      multiPaste = map(textLines, function (l) { return [l]; });
+    }
+  }
+
+  var updateInput;
+  // Normal behavior is to insert the new text into every selection
+  for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) {
+    var range$$1 = sel.ranges[i$1];
+    var from = range$$1.from(), to = range$$1.to();
+    if (range$$1.empty()) {
+      if (deleted && deleted > 0) // Handle deletion
+        { from = Pos(from.line, from.ch - deleted); }
+      else if (cm.state.overwrite && !paste) // Handle overwrite
+        { to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); }
+      else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
+        { from = to = Pos(from.line, 0); }
+    }
+    updateInput = cm.curOp.updateInput;
+    var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,
+                       origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
+    makeChange(cm.doc, changeEvent);
+    signalLater(cm, "inputRead", cm, changeEvent);
+  }
+  if (inserted && !paste)
+    { triggerElectric(cm, inserted); }
+
+  ensureCursorVisible(cm);
+  cm.curOp.updateInput = updateInput;
+  cm.curOp.typing = true;
+  cm.state.pasteIncoming = cm.state.cutIncoming = false;
+}
+
+function handlePaste(e, cm) {
+  var pasted = e.clipboardData && e.clipboardData.getData("Text");
+  if (pasted) {
+    e.preventDefault();
+    if (!cm.isReadOnly() && !cm.options.disableInput)
+      { runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }); }
+    return true
+  }
+}
+
+function triggerElectric(cm, inserted) {
+  // When an 'electric' character is inserted, immediately trigger a reindent
+  if (!cm.options.electricChars || !cm.options.smartIndent) { return }
+  var sel = cm.doc.sel;
+
+  for (var i = sel.ranges.length - 1; i >= 0; i--) {
+    var range$$1 = sel.ranges[i];
+    if (range$$1.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range$$1.head.line)) { continue }
+    var mode = cm.getModeAt(range$$1.head);
+    var indented = false;
+    if (mode.electricChars) {
+      for (var j = 0; j < mode.electricChars.length; j++)
+        { if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+          indented = indentLine(cm, range$$1.head.line, "smart");
+          break
+        } }
+    } else if (mode.electricInput) {
+      if (mode.electricInput.test(getLine(cm.doc, range$$1.head.line).text.slice(0, range$$1.head.ch)))
+        { indented = indentLine(cm, range$$1.head.line, "smart"); }
+    }
+    if (indented) { signalLater(cm, "electricInput", cm, range$$1.head.line); }
+  }
+}
+
+function copyableRanges(cm) {
+  var text = [], ranges = [];
+  for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+    var line = cm.doc.sel.ranges[i].head.line;
+    var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+    ranges.push(lineRange);
+    text.push(cm.getRange(lineRange.anchor, lineRange.head));
+  }
+  return {text: text, ranges: ranges}
+}
+
+function disableBrowserMagic(field, spellcheck) {
+  field.setAttribute("autocorrect", "off");
+  field.setAttribute("autocapitalize", "off");
+  field.setAttribute("spellcheck", !!spellcheck);
+}
+
+function hiddenTextarea() {
+  var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
+  var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+  // The textarea is kept positioned near the cursor to prevent the
+  // fact that it'll be scrolled into view on input from scrolling
+  // our fake cursor out of view. On webkit, when wrap=off, paste is
+  // very slow. So make the area wide instead.
+  if (webkit) { te.style.width = "1000px"; }
+  else { te.setAttribute("wrap", "off"); }
+  // If border: 0; -- iOS fails to open keyboard (issue #1287)
+  if (ios) { te.style.border = "1px solid black"; }
+  disableBrowserMagic(te);
+  return div
+}
+
+// The publicly visible API. Note that methodOp(f) means
+// 'wrap f in an operation, performed on its `this` parameter'.
+
+// This is not the complete set of editor methods. Most of the
+// methods defined on the Doc type are also injected into
+// CodeMirror.prototype, for backwards compatibility and
+// convenience.
+
+var addEditorMethods = function(CodeMirror) {
+  var optionHandlers = CodeMirror.optionHandlers;
+
+  var helpers = CodeMirror.helpers = {};
+
+  CodeMirror.prototype = {
+    constructor: CodeMirror,
+    focus: function(){window.focus(); this.display.input.focus();},
+
+    setOption: function(option, value) {
+      var options = this.options, old = options[option];
+      if (options[option] == value && option != "mode") { return }
+      options[option] = value;
+      if (optionHandlers.hasOwnProperty(option))
+        { operation(this, optionHandlers[option])(this, value, old); }
+      signal(this, "optionChange", this, option);
+    },
+
+    getOption: function(option) {return this.options[option]},
+    getDoc: function() {return this.doc},
+
+    addKeyMap: function(map$$1, bottom) {
+      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map$$1));
+    },
+    removeKeyMap: function(map$$1) {
+      var maps = this.state.keyMaps;
+      for (var i = 0; i < maps.length; ++i)
+        { if (maps[i] == map$$1 || maps[i].name == map$$1) {
+          maps.splice(i, 1);
+          return true
+        } }
+    },
+
+    addOverlay: methodOp(function(spec, options) {
+      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
+      if (mode.startState) { throw new Error("Overlays may not be stateful.") }
+      insertSorted(this.state.overlays,
+                   {mode: mode, modeSpec: spec, opaque: options && options.opaque,
+                    priority: (options && options.priority) || 0},
+                   function (overlay) { return overlay.priority; });
+      this.state.modeGen++;
+      regChange(this);
+    }),
+    removeOverlay: methodOp(function(spec) {
+      var this$1 = this;
+
+      var overlays = this.state.overlays;
+      for (var i = 0; i < overlays.length; ++i) {
+        var cur = overlays[i].modeSpec;
+        if (cur == spec || typeof spec == "string" && cur.name == spec) {
+          overlays.splice(i, 1);
+          this$1.state.modeGen++;
+          regChange(this$1);
+          return
+        }
+      }
+    }),
+
+    indentLine: methodOp(function(n, dir, aggressive) {
+      if (typeof dir != "string" && typeof dir != "number") {
+        if (dir == null) { dir = this.options.smartIndent ? "smart" : "prev"; }
+        else { dir = dir ? "add" : "subtract"; }
+      }
+      if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive); }
+    }),
+    indentSelection: methodOp(function(how) {
+      var this$1 = this;
+
+      var ranges = this.doc.sel.ranges, end = -1;
+      for (var i = 0; i < ranges.length; i++) {
+        var range$$1 = ranges[i];
+        if (!range$$1.empty()) {
+          var from = range$$1.from(), to = range$$1.to();
+          var start = Math.max(end, from.line);
+          end = Math.min(this$1.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
+          for (var j = start; j < end; ++j)
+            { indentLine(this$1, j, how); }
+          var newRanges = this$1.doc.sel.ranges;
+          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+            { replaceOneSelection(this$1.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); }
+        } else if (range$$1.head.line > end) {
+          indentLine(this$1, range$$1.head.line, how, true);
+          end = range$$1.head.line;
+          if (i == this$1.doc.sel.primIndex) { ensureCursorVisible(this$1); }
+        }
+      }
+    }),
+
+    // Fetch the parser token for a given character. Useful for hacks
+    // that want to inspect the mode state (say, for completion).
+    getTokenAt: function(pos, precise) {
+      return takeToken(this, pos, precise)
+    },
+
+    getLineTokens: function(line, precise) {
+      return takeToken(this, Pos(line), precise, true)
+    },
+
+    getTokenTypeAt: function(pos) {
+      pos = clipPos(this.doc, pos);
+      var styles = getLineStyles(this, getLine(this.doc, pos.line));
+      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+      var type;
+      if (ch == 0) { type = styles[2]; }
+      else { for (;;) {
+        var mid = (before + after) >> 1;
+        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { after = mid; }
+        else if (styles[mid * 2 + 1] < ch) { before = mid + 1; }
+        else { type = styles[mid * 2 + 2]; break }
+      } }
+      var cut = type ? type.indexOf("overlay ") : -1;
+      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
+    },
+
+    getModeAt: function(pos) {
+      var mode = this.doc.mode;
+      if (!mode.innerMode) { return mode }
+      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
+    },
+
+    getHelper: function(pos, type) {
+      return this.getHelpers(pos, type)[0]
+    },
+
+    getHelpers: function(pos, type) {
+      var this$1 = this;
+
+      var found = [];
+      if (!helpers.hasOwnProperty(type)) { return found }
+      var help = helpers[type], mode = this.getModeAt(pos);
+      if (typeof mode[type] == "string") {
+        if (help[mode[type]]) { found.push(help[mode[type]]); }
+      } else if (mode[type]) {
+        for (var i = 0; i < mode[type].length; i++) {
+          var val = help[mode[type][i]];
+          if (val) { found.push(val); }
+        }
+      } else if (mode.helperType && help[mode.helperType]) {
+        found.push(help[mode.helperType]);
+      } else if (help[mode.name]) {
+        found.push(help[mode.name]);
+      }
+      for (var i$1 = 0; i$1 < help._global.length; i$1++) {
+        var cur = help._global[i$1];
+        if (cur.pred(mode, this$1) && indexOf(found, cur.val) == -1)
+          { found.push(cur.val); }
+      }
+      return found
+    },
+
+    getStateAfter: function(line, precise) {
+      var doc = this.doc;
+      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
+      return getContextBefore(this, line + 1, precise).state
+    },
+
+    cursorCoords: function(start, mode) {
+      var pos, range$$1 = this.doc.sel.primary();
+      if (start == null) { pos = range$$1.head; }
+      else if (typeof start == "object") { pos = clipPos(this.doc, start); }
+      else { pos = start ? range$$1.from() : range$$1.to(); }
+      return cursorCoords(this, pos, mode || "page")
+    },
+
+    charCoords: function(pos, mode) {
+      return charCoords(this, clipPos(this.doc, pos), mode || "page")
+    },
+
+    coordsChar: function(coords, mode) {
+      coords = fromCoordSystem(this, coords, mode || "page");
+      return coordsChar(this, coords.left, coords.top)
+    },
+
+    lineAtHeight: function(height, mode) {
+      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
+      return lineAtHeight(this.doc, height + this.display.viewOffset)
+    },
+    heightAtLine: function(line, mode, includeWidgets) {
+      var end = false, lineObj;
+      if (typeof line == "number") {
+        var last = this.doc.first + this.doc.size - 1;
+        if (line < this.doc.first) { line = this.doc.first; }
+        else if (line > last) { line = last; end = true; }
+        lineObj = getLine(this.doc, line);
+      } else {
+        lineObj = line;
+      }
+      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets || end).top +
+        (end ? this.doc.height - heightAtLine(lineObj) : 0)
+    },
+
+    defaultTextHeight: function() { return textHeight(this.display) },
+    defaultCharWidth: function() { return charWidth(this.display) },
+
+    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
+
+    addWidget: function(pos, node, scroll, vert, horiz) {
+      var display = this.display;
+      pos = cursorCoords(this, clipPos(this.doc, pos));
+      var top = pos.bottom, left = pos.left;
+      node.style.position = "absolute";
+      node.setAttribute("cm-ignore-events", "true");
+      this.display.input.setUneditable(node);
+      display.sizer.appendChild(node);
+      if (vert == "over") {
+        top = pos.top;
+      } else if (vert == "above" || vert == "near") {
+        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
+        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
+        // Default to positioning above (if specified and possible); otherwise default to positioning below
+        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
+          { top = pos.top - node.offsetHeight; }
+        else if (pos.bottom + node.offsetHeight <= vspace)
+          { top = pos.bottom; }
+        if (left + node.offsetWidth > hspace)
+          { left = hspace - node.offsetWidth; }
+      }
+      node.style.top = top + "px";
+      node.style.left = node.style.right = "";
+      if (horiz == "right") {
+        left = display.sizer.clientWidth - node.offsetWidth;
+        node.style.right = "0px";
+      } else {
+        if (horiz == "left") { left = 0; }
+        else if (horiz == "middle") { left = (display.sizer.clientWidth - node.offsetWidth) / 2; }
+        node.style.left = left + "px";
+      }
+      if (scroll)
+        { scrollIntoView(this, {left: left, top: top, right: left + node.offsetWidth, bottom: top + node.offsetHeight}); }
+    },
+
+    triggerOnKeyDown: methodOp(onKeyDown),
+    triggerOnKeyPress: methodOp(onKeyPress),
+    triggerOnKeyUp: onKeyUp,
+    triggerOnMouseDown: methodOp(onMouseDown),
+
+    execCommand: function(cmd) {
+      if (commands.hasOwnProperty(cmd))
+        { return commands[cmd].call(null, this) }
+    },
+
+    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
+    findPosH: function(from, amount, unit, visually) {
+      var this$1 = this;
+
+      var dir = 1;
+      if (amount < 0) { dir = -1; amount = -amount; }
+      var cur = clipPos(this.doc, from);
+      for (var i = 0; i < amount; ++i) {
+        cur = findPosH(this$1.doc, cur, dir, unit, visually);
+        if (cur.hitSide) { break }
+      }
+      return cur
+    },
+
+    moveH: methodOp(function(dir, unit) {
+      var this$1 = this;
+
+      this.extendSelectionsBy(function (range$$1) {
+        if (this$1.display.shift || this$1.doc.extend || range$$1.empty())
+          { return findPosH(this$1.doc, range$$1.head, dir, unit, this$1.options.rtlMoveVisually) }
+        else
+          { return dir < 0 ? range$$1.from() : range$$1.to() }
+      }, sel_move);
+    }),
+
+    deleteH: methodOp(function(dir, unit) {
+      var sel = this.doc.sel, doc = this.doc;
+      if (sel.somethingSelected())
+        { doc.replaceSelection("", null, "+delete"); }
+      else
+        { deleteNearSelection(this, function (range$$1) {
+          var other = findPosH(doc, range$$1.head, dir, unit, false);
+          return dir < 0 ? {from: other, to: range$$1.head} : {from: range$$1.head, to: other}
+        }); }
+    }),
+
+    findPosV: function(from, amount, unit, goalColumn) {
+      var this$1 = this;
+
+      var dir = 1, x = goalColumn;
+      if (amount < 0) { dir = -1; amount = -amount; }
+      var cur = clipPos(this.doc, from);
+      for (var i = 0; i < amount; ++i) {
+        var coords = cursorCoords(this$1, cur, "div");
+        if (x == null) { x = coords.left; }
+        else { coords.left = x; }
+        cur = findPosV(this$1, coords, dir, unit);
+        if (cur.hitSide) { break }
+      }
+      return cur
+    },
+
+    moveV: methodOp(function(dir, unit) {
+      var this$1 = this;
+
+      var doc = this.doc, goals = [];
+      var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected();
+      doc.extendSelectionsBy(function (range$$1) {
+        if (collapse)
+          { return dir < 0 ? range$$1.from() : range$$1.to() }
+        var headPos = cursorCoords(this$1, range$$1.head, "div");
+        if (range$$1.goalColumn != null) { headPos.left = range$$1.goalColumn; }
+        goals.push(headPos.left);
+        var pos = findPosV(this$1, headPos, dir, unit);
+        if (unit == "page" && range$$1 == doc.sel.primary())
+          { addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); }
+        return pos
+      }, sel_move);
+      if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
+        { doc.sel.ranges[i].goalColumn = goals[i]; } }
+    }),
+
+    // Find the word at the given position (as returned by coordsChar).
+    findWordAt: function(pos) {
+      var doc = this.doc, line = getLine(doc, pos.line).text;
+      var start = pos.ch, end = pos.ch;
+      if (line) {
+        var helper = this.getHelper(pos, "wordChars");
+        if ((pos.sticky == "before" || end == line.length) && start) { --start; } else { ++end; }
+        var startChar = line.charAt(start);
+        var check = isWordChar(startChar, helper)
+          ? function (ch) { return isWordChar(ch, helper); }
+          : /\s/.test(startChar) ? function (ch) { return /\s/.test(ch); }
+          : function (ch) { return (!/\s/.test(ch) && !isWordChar(ch)); };
+        while (start > 0 && check(line.charAt(start - 1))) { --start; }
+        while (end < line.length && check(line.charAt(end))) { ++end; }
+      }
+      return new Range(Pos(pos.line, start), Pos(pos.line, end))
+    },
+
+    toggleOverwrite: function(value) {
+      if (value != null && value == this.state.overwrite) { return }
+      if (this.state.overwrite = !this.state.overwrite)
+        { addClass(this.display.cursorDiv, "CodeMirror-overwrite"); }
+      else
+        { rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); }
+
+      signal(this, "overwriteToggle", this, this.state.overwrite);
+    },
+    hasFocus: function() { return this.display.input.getField() == activeElt() },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
+
+    scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y); }),
+    getScrollInfo: function() {
+      var scroller = this.display.scroller;
+      return {left: scroller.scrollLeft, top: scroller.scrollTop,
+              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+              clientHeight: displayHeight(this), clientWidth: displayWidth(this)}
+    },
+
+    scrollIntoView: methodOp(function(range$$1, margin) {
+      if (range$$1 == null) {
+        range$$1 = {from: this.doc.sel.primary().head, to: null};
+        if (margin == null) { margin = this.options.cursorScrollMargin; }
+      } else if (typeof range$$1 == "number") {
+        range$$1 = {from: Pos(range$$1, 0), to: null};
+      } else if (range$$1.from == null) {
+        range$$1 = {from: range$$1, to: null};
+      }
+      if (!range$$1.to) { range$$1.to = range$$1.from; }
+      range$$1.margin = margin || 0;
+
+      if (range$$1.from.line != null) {
+        scrollToRange(this, range$$1);
+      } else {
+        scrollToCoordsRange(this, range$$1.from, range$$1.to, range$$1.margin);
+      }
+    }),
+
+    setSize: methodOp(function(width, height) {
+      var this$1 = this;
+
+      var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; };
+      if (width != null) { this.display.wrapper.style.width = interpret(width); }
+      if (height != null) { this.display.wrapper.style.height = interpret(height); }
+      if (this.options.lineWrapping) { clearLineMeasurementCache(this); }
+      var lineNo$$1 = this.display.viewFrom;
+      this.doc.iter(lineNo$$1, this.display.viewTo, function (line) {
+        if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)
+          { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo$$1, "widget"); break } } }
+        ++lineNo$$1;
+      });
+      this.curOp.forceUpdate = true;
+      signal(this, "refresh", this);
+    }),
+
+    operation: function(f){return runInOp(this, f)},
+    startOperation: function(){return startOperation(this)},
+    endOperation: function(){return endOperation(this)},
+
+    refresh: methodOp(function() {
+      var oldHeight = this.display.cachedTextHeight;
+      regChange(this);
+      this.curOp.forceUpdate = true;
+      clearCaches(this);
+      scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop);
+      updateGutterSpace(this);
+      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+        { estimateLineHeights(this); }
+      signal(this, "refresh", this);
+    }),
+
+    swapDoc: methodOp(function(doc) {
+      var old = this.doc;
+      old.cm = null;
+      attachDoc(this, doc);
+      clearCaches(this);
+      this.display.input.reset();
+      scrollToCoords(this, doc.scrollLeft, doc.scrollTop);
+      this.curOp.forceScroll = true;
+      signalLater(this, "swapDoc", this, old);
+      return old
+    }),
+
+    getInputField: function(){return this.display.input.getField()},
+    getWrapperElement: function(){return this.display.wrapper},
+    getScrollerElement: function(){return this.display.scroller},
+    getGutterElement: function(){return this.display.gutters}
+  };
+  eventMixin(CodeMirror);
+
+  CodeMirror.registerHelper = function(type, name, value) {
+    if (!helpers.hasOwnProperty(type)) { helpers[type] = CodeMirror[type] = {_global: []}; }
+    helpers[type][name] = value;
+  };
+  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
+    CodeMirror.registerHelper(type, name, value);
+    helpers[type]._global.push({pred: predicate, val: value});
+  };
+};
+
+// Used for horizontal relative motion. Dir is -1 or 1 (left or
+// right), unit can be "char", "column" (like char, but doesn't
+// cross line boundaries), "word" (across next word), or "group" (to
+// the start of next group of word or non-word-non-whitespace
+// chars). The visually param controls whether, in right-to-left
+// text, direction 1 means to move towards the next index in the
+// string, or towards the character to the right of the current
+// position. The resulting position will have a hitSide=true
+// property if it reached the end of the document.
+function findPosH(doc, pos, dir, unit, visually) {
+  var oldPos = pos;
+  var origDir = dir;
+  var lineObj = getLine(doc, pos.line);
+  function findNextLine() {
+    var l = pos.line + dir;
+    if (l < doc.first || l >= doc.first + doc.size) { return false }
+    pos = new Pos(l, pos.ch, pos.sticky);
+    return lineObj = getLine(doc, l)
+  }
+  function moveOnce(boundToLine) {
+    var next;
+    if (visually) {
+      next = moveVisually(doc.cm, lineObj, pos, dir);
+    } else {
+      next = moveLogically(lineObj, pos, dir);
+    }
+    if (next == null) {
+      if (!boundToLine && findNextLine())
+        { pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir); }
+      else
+        { return false }
+    } else {
+      pos = next;
+    }
+    return true
+  }
+
+  if (unit == "char") {
+    moveOnce();
+  } else if (unit == "column") {
+    moveOnce(true);
+  } else if (unit == "word" || unit == "group") {
+    var sawType = null, group = unit == "group";
+    var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
+    for (var first = true;; first = false) {
+      if (dir < 0 && !moveOnce(!first)) { break }
+      var cur = lineObj.text.charAt(pos.ch) || "\n";
+      var type = isWordChar(cur, helper) ? "w"
+        : group && cur == "\n" ? "n"
+        : !group || /\s/.test(cur) ? null
+        : "p";
+      if (group && !first && !type) { type = "s"; }
+      if (sawType && sawType != type) {
+        if (dir < 0) {dir = 1; moveOnce(); pos.sticky = "after";}
+        break
+      }
+
+      if (type) { sawType = type; }
+      if (dir > 0 && !moveOnce(!first)) { break }
+    }
+  }
+  var result = skipAtomic(doc, pos, oldPos, origDir, true);
+  if (equalCursorPos(oldPos, result)) { result.hitSide = true; }
+  return result
+}
+
+// For relative vertical movement. Dir may be -1 or 1. Unit can be
+// "page" or "line". The resulting position will have a hitSide=true
+// property if it reached the end of the document.
+function findPosV(cm, pos, dir, unit) {
+  var doc = cm.doc, x = pos.left, y;
+  if (unit == "page") {
+    var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
+    var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
+    y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
+
+  } else if (unit == "line") {
+    y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
+  }
+  var target;
+  for (;;) {
+    target = coordsChar(cm, x, y);
+    if (!target.outside) { break }
+    if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
+    y += dir * 5;
+  }
+  return target
+}
+
+// CONTENTEDITABLE INPUT STYLE
+
+var ContentEditableInput = function(cm) {
+  this.cm = cm;
+  this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+  this.polling = new Delayed();
+  this.composing = null;
+  this.gracePeriod = false;
+  this.readDOMTimeout = null;
+};
+
+ContentEditableInput.prototype.init = function (display) {
+    var this$1 = this;
+
+  var input = this, cm = input.cm;
+  var div = input.div = display.lineDiv;
+  disableBrowserMagic(div, cm.options.spellcheck);
+
+  on(div, "paste", function (e) {
+    if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+    // IE doesn't fire input events, so we schedule a read for the pasted content in this way
+    if (ie_version <= 11) { setTimeout(operation(cm, function () { return this$1.updateFromDOM(); }), 20); }
+  });
+
+  on(div, "compositionstart", function (e) {
+    this$1.composing = {data: e.data, done: false};
+  });
+  on(div, "compositionupdate", function (e) {
+    if (!this$1.composing) { this$1.composing = {data: e.data, done: false}; }
+  });
+  on(div, "compositionend", function (e) {
+    if (this$1.composing) {
+      if (e.data != this$1.composing.data) { this$1.readFromDOMSoon(); }
+      this$1.composing.done = true;
+    }
+  });
+
+  on(div, "touchstart", function () { return input.forceCompositionEnd(); });
+
+  on(div, "input", function () {
+    if (!this$1.composing) { this$1.readFromDOMSoon(); }
+  });
+
+  function onCopyCut(e) {
+    if (signalDOMEvent(cm, e)) { return }
+    if (cm.somethingSelected()) {
+      setLastCopied({lineWise: false, text: cm.getSelections()});
+      if (e.type == "cut") { cm.replaceSelection("", null, "cut"); }
+    } else if (!cm.options.lineWiseCopyCut) {
+      return
+    } else {
+      var ranges = copyableRanges(cm);
+      setLastCopied({lineWise: true, text: ranges.text});
+      if (e.type == "cut") {
+        cm.operation(function () {
+          cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+          cm.replaceSelection("", null, "cut");
+        });
+      }
+    }
+    if (e.clipboardData) {
+      e.clipboardData.clearData();
+      var content = lastCopied.text.join("\n");
+      // iOS exposes the clipboard API, but seems to discard content inserted into it
+      e.clipboardData.setData("Text", content);
+      if (e.clipboardData.getData("Text") == content) {
+        e.preventDefault();
+        return
+      }
+    }
+    // Old-fashioned briefly-focus-a-textarea hack
+    var kludge = hiddenTextarea(), te = kludge.firstChild;
+    cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+    te.value = lastCopied.text.join("\n");
+    var hadFocus = document.activeElement;
+    selectInput(te);
+    setTimeout(function () {
+      cm.display.lineSpace.removeChild(kludge);
+      hadFocus.focus();
+      if (hadFocus == div) { input.showPrimarySelection(); }
+    }, 50);
+  }
+  on(div, "copy", onCopyCut);
+  on(div, "cut", onCopyCut);
+};
+
+ContentEditableInput.prototype.prepareSelection = function () {
+  var result = prepareSelection(this.cm, false);
+  result.focus = this.cm.state.focused;
+  return result
+};
+
+ContentEditableInput.prototype.showSelection = function (info, takeFocus) {
+  if (!info || !this.cm.display.view.length) { return }
+  if (info.focus || takeFocus) { this.showPrimarySelection(); }
+  this.showMultipleSelections(info);
+};
+
+ContentEditableInput.prototype.getSelection = function () {
+  return this.cm.display.wrapper.ownerDocument.getSelection()
+};
+
+ContentEditableInput.prototype.showPrimarySelection = function () {
+  var sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary();
+  var from = prim.from(), to = prim.to();
+
+  if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
+    sel.removeAllRanges();
+    return
+  }
+
+  var curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+  var curFocus = domToPos(cm, sel.focusNode, sel.focusOffset);
+  if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+      cmp(minPos(curAnchor, curFocus), from) == 0 &&
+      cmp(maxPos(curAnchor, curFocus), to) == 0)
+    { return }
+
+  var view = cm.display.view;
+  var start = (from.line >= cm.display.viewFrom && posToDOM(cm, from)) ||
+      {node: view[0].measure.map[2], offset: 0};
+  var end = to.line < cm.display.viewTo && posToDOM(cm, to);
+  if (!end) {
+    var measure = view[view.length - 1].measure;
+    var map$$1 = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+    end = {node: map$$1[map$$1.length - 1], offset: map$$1[map$$1.length - 2] - map$$1[map$$1.length - 3]};
+  }
+
+  if (!start || !end) {
+    sel.removeAllRanges();
+    return
+  }
+
+  var old = sel.rangeCount && sel.getRangeAt(0), rng;
+  try { rng = range(start.node, start.offset, end.offset, end.node); }
+  catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+  if (rng) {
+    if (!gecko && cm.state.focused) {
+      sel.collapse(start.node, start.offset);
+      if (!rng.collapsed) {
+        sel.removeAllRanges();
+        sel.addRange(rng);
+      }
+    } else {
+      sel.removeAllRanges();
+      sel.addRange(rng);
+    }
+    if (old && sel.anchorNode == null) { sel.addRange(old); }
+    else if (gecko) { this.startGracePeriod(); }
+  }
+  this.rememberSelection();
+};
+
+ContentEditableInput.prototype.startGracePeriod = function () {
+    var this$1 = this;
+
+  clearTimeout(this.gracePeriod);
+  this.gracePeriod = setTimeout(function () {
+    this$1.gracePeriod = false;
+    if (this$1.selectionChanged())
+      { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }); }
+  }, 20);
+};
+
+ContentEditableInput.prototype.showMultipleSelections = function (info) {
+  removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+  removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+};
+
+ContentEditableInput.prototype.rememberSelection = function () {
+  var sel = this.getSelection();
+  this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+  this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+};
+
+ContentEditableInput.prototype.selectionInEditor = function () {
+  var sel = this.getSelection();
+  if (!sel.rangeCount) { return false }
+  var node = sel.getRangeAt(0).commonAncestorContainer;
+  return contains(this.div, node)
+};
+
+ContentEditableInput.prototype.focus = function () {
+  if (this.cm.options.readOnly != "nocursor") {
+    if (!this.selectionInEditor())
+      { this.showSelection(this.prepareSelection(), true); }
+    this.div.focus();
+  }
+};
+ContentEditableInput.prototype.blur = function () { this.div.blur(); };
+ContentEditableInput.prototype.getField = function () { return this.div };
+
+ContentEditableInput.prototype.supportsTouch = function () { return true };
+
+ContentEditableInput.prototype.receivedFocus = function () {
+  var input = this;
+  if (this.selectionInEditor())
+    { this.pollSelection(); }
+  else
+    { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }); }
+
+  function poll() {
+    if (input.cm.state.focused) {
+      input.pollSelection();
+      input.polling.set(input.cm.options.pollInterval, poll);
+    }
+  }
+  this.polling.set(this.cm.options.pollInterval, poll);
+};
+
+ContentEditableInput.prototype.selectionChanged = function () {
+  var sel = this.getSelection();
+  return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+    sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
+};
+
+ContentEditableInput.prototype.pollSelection = function () {
+  if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { return }
+  var sel = this.getSelection(), cm = this.cm;
+  // On Android Chrome (version 56, at least), backspacing into an
+  // uneditable block element will put the cursor in that element,
+  // and then, because it's not editable, hide the virtual keyboard.
+  // Because Android doesn't allow us to actually detect backspace
+  // presses in a sane way, this code checks for when that happens
+  // and simulates a backspace press in this case.
+  if (android && chrome && this.cm.options.gutters.length && isInGutter(sel.anchorNode)) {
+    this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs});
+    this.blur();
+    this.focus();
+    return
+  }
+  if (this.composing) { return }
+  this.rememberSelection();
+  var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+  var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+  if (anchor && head) { runInOp(cm, function () {
+    setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+    if (anchor.bad || head.bad) { cm.curOp.selectionChanged = true; }
+  }); }
+};
+
+ContentEditableInput.prototype.pollContent = function () {
+  if (this.readDOMTimeout != null) {
+    clearTimeout(this.readDOMTimeout);
+    this.readDOMTimeout = null;
+  }
+
+  var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+  var from = sel.from(), to = sel.to();
+  if (from.ch == 0 && from.line > cm.firstLine())
+    { from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length); }
+  if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine())
+    { to = Pos(to.line + 1, 0); }
+  if (from.line < display.viewFrom || to.line > display.viewTo - 1) { return false }
+
+  var fromIndex, fromLine, fromNode;
+  if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+    fromLine = lineNo(display.view[0].line);
+    fromNode = display.view[0].node;
+  } else {
+    fromLine = lineNo(display.view[fromIndex].line);
+    fromNode = display.view[fromIndex - 1].node.nextSibling;
+  }
+  var toIndex = findViewIndex(cm, to.line);
+  var toLine, toNode;
+  if (toIndex == display.view.length - 1) {
+    toLine = display.viewTo - 1;
+    toNode = display.lineDiv.lastChild;
+  } else {
+    toLine = lineNo(display.view[toIndex + 1].line) - 1;
+    toNode = display.view[toIndex + 1].node.previousSibling;
+  }
+
+  if (!fromNode) { return false }
+  var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+  var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+  while (newText.length > 1 && oldText.length > 1) {
+    if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+    else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+    else { break }
+  }
+
+  var cutFront = 0, cutEnd = 0;
+  var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+  while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+    { ++cutFront; }
+  var newBot = lst(newText), oldBot = lst(oldText);
+  var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+                           oldBot.length - (oldText.length == 1 ? cutFront : 0));
+  while (cutEnd < maxCutEnd &&
+         newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+    { ++cutEnd; }
+  // Try to move start of change to start of selection if ambiguous
+  if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) {
+    while (cutFront && cutFront > from.ch &&
+           newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) {
+      cutFront--;
+      cutEnd++;
+    }
+  }
+
+  newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "");
+  newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "");
+
+  var chFrom = Pos(fromLine, cutFront);
+  var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+  if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
+    replaceRange(cm.doc, newText, chFrom, chTo, "+input");
+    return true
+  }
+};
+
+ContentEditableInput.prototype.ensurePolled = function () {
+  this.forceCompositionEnd();
+};
+ContentEditableInput.prototype.reset = function () {
+  this.forceCompositionEnd();
+};
+ContentEditableInput.prototype.forceCompositionEnd = function () {
+  if (!this.composing) { return }
+  clearTimeout(this.readDOMTimeout);
+  this.composing = null;
+  this.updateFromDOM();
+  this.div.blur();
+  this.div.focus();
+};
+ContentEditableInput.prototype.readFromDOMSoon = function () {
+    var this$1 = this;
+
+  if (this.readDOMTimeout != null) { return }
+  this.readDOMTimeout = setTimeout(function () {
+    this$1.readDOMTimeout = null;
+    if (this$1.composing) {
+      if (this$1.composing.done) { this$1.composing = null; }
+      else { return }
+    }
+    this$1.updateFromDOM();
+  }, 80);
+};
+
+ContentEditableInput.prototype.updateFromDOM = function () {
+    var this$1 = this;
+
+  if (this.cm.isReadOnly() || !this.pollContent())
+    { runInOp(this.cm, function () { return regChange(this$1.cm); }); }
+};
+
+ContentEditableInput.prototype.setUneditable = function (node) {
+  node.contentEditable = "false";
+};
+
+ContentEditableInput.prototype.onKeyPress = function (e) {
+  if (e.charCode == 0 || this.composing) { return }
+  e.preventDefault();
+  if (!this.cm.isReadOnly())
+    { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); }
+};
+
+ContentEditableInput.prototype.readOnlyChanged = function (val) {
+  this.div.contentEditable = String(val != "nocursor");
+};
+
+ContentEditableInput.prototype.onContextMenu = function () {};
+ContentEditableInput.prototype.resetPosition = function () {};
+
+ContentEditableInput.prototype.needsContentAttribute = true;
+
+function posToDOM(cm, pos) {
+  var view = findViewForLine(cm, pos.line);
+  if (!view || view.hidden) { return null }
+  var line = getLine(cm.doc, pos.line);
+  var info = mapFromLineView(view, line, pos.line);
+
+  var order = getOrder(line, cm.doc.direction), side = "left";
+  if (order) {
+    var partPos = getBidiPartAt(order, pos.ch);
+    side = partPos % 2 ? "right" : "left";
+  }
+  var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
+  result.offset = result.collapse == "right" ? result.end : result.start;
+  return result
+}
+
+function isInGutter(node) {
+  for (var scan = node; scan; scan = scan.parentNode)
+    { if (/CodeMirror-gutter-wrapper/.test(scan.className)) { return true } }
+  return false
+}
+
+function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
+
+function domTextBetween(cm, from, to, fromLine, toLine) {
+  var text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false;
+  function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
+  function close() {
+    if (closing) {
+      text += lineSep;
+      if (extraLinebreak) { text += lineSep; }
+      closing = extraLinebreak = false;
+    }
+  }
+  function addText(str) {
+    if (str) {
+      close();
+      text += str;
+    }
+  }
+  function walk(node) {
+    if (node.nodeType == 1) {
+      var cmText = node.getAttribute("cm-text");
+      if (cmText) {
+        addText(cmText);
+        return
+      }
+      var markerID = node.getAttribute("cm-marker"), range$$1;
+      if (markerID) {
+        var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+        if (found.length && (range$$1 = found[0].find(0)))
+          { addText(getBetween(cm.doc, range$$1.from, range$$1.to).join(lineSep)); }
+        return
+      }
+      if (node.getAttribute("contenteditable") == "false") { return }
+      var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName);
+      if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { return }
+
+      if (isBlock) { close(); }
+      for (var i = 0; i < node.childNodes.length; i++)
+        { walk(node.childNodes[i]); }
+
+      if (/^(pre|p)$/i.test(node.nodeName)) { extraLinebreak = true; }
+      if (isBlock) { closing = true; }
+    } else if (node.nodeType == 3) {
+      addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "));
+    }
+  }
+  for (;;) {
+    walk(from);
+    if (from == to) { break }
+    from = from.nextSibling;
+    extraLinebreak = false;
+  }
+  return text
+}
+
+function domToPos(cm, node, offset) {
+  var lineNode;
+  if (node == cm.display.lineDiv) {
+    lineNode = cm.display.lineDiv.childNodes[offset];
+    if (!lineNode) { return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) }
+    node = null; offset = 0;
+  } else {
+    for (lineNode = node;; lineNode = lineNode.parentNode) {
+      if (!lineNode || lineNode == cm.display.lineDiv) { return null }
+      if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { break }
+    }
+  }
+  for (var i = 0; i < cm.display.view.length; i++) {
+    var lineView = cm.display.view[i];
+    if (lineView.node == lineNode)
+      { return locateNodeInLineView(lineView, node, offset) }
+  }
+}
+
+function locateNodeInLineView(lineView, node, offset) {
+  var wrapper = lineView.text.firstChild, bad = false;
+  if (!node || !contains(wrapper, node)) { return badPos(Pos(lineNo(lineView.line), 0), true) }
+  if (node == wrapper) {
+    bad = true;
+    node = wrapper.childNodes[offset];
+    offset = 0;
+    if (!node) {
+      var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+      return badPos(Pos(lineNo(line), line.text.length), bad)
+    }
+  }
+
+  var textNode = node.nodeType == 3 ? node : null, topNode = node;
+  if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+    textNode = node.firstChild;
+    if (offset) { offset = textNode.nodeValue.length; }
+  }
+  while (topNode.parentNode != wrapper) { topNode = topNode.parentNode; }
+  var measure = lineView.measure, maps = measure.maps;
+
+  function find(textNode, topNode, offset) {
+    for (var i = -1; i < (maps ? maps.length : 0); i++) {
+      var map$$1 = i < 0 ? measure.map : maps[i];
+      for (var j = 0; j < map$$1.length; j += 3) {
+        var curNode = map$$1[j + 2];
+        if (curNode == textNode || curNode == topNode) {
+          var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
+          var ch = map$$1[j] + offset;
+          if (offset < 0 || curNode != textNode) { ch = map$$1[j + (offset ? 1 : 0)]; }
+          return Pos(line, ch)
+        }
+      }
+    }
+  }
+  var found = find(textNode, topNode, offset);
+  if (found) { return badPos(found, bad) }
+
+  // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+  for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+    found = find(after, after.firstChild, 0);
+    if (found)
+      { return badPos(Pos(found.line, found.ch - dist), bad) }
+    else
+      { dist += after.textContent.length; }
+  }
+  for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) {
+    found = find(before, before.firstChild, -1);
+    if (found)
+      { return badPos(Pos(found.line, found.ch + dist$1), bad) }
+    else
+      { dist$1 += before.textContent.length; }
+  }
+}
+
+// TEXTAREA INPUT STYLE
+
+var TextareaInput = function(cm) {
+  this.cm = cm;
+  // See input.poll and input.reset
+  this.prevInput = "";
+
+  // Flag that indicates whether we expect input to appear real soon
+  // now (after some event like 'keypress' or 'input') and are
+  // polling intensively.
+  this.pollingFast = false;
+  // Self-resetting timeout for the poller
+  this.polling = new Delayed();
+  // Used to work around IE issue with selection being forgotten when focus moves away from textarea
+  this.hasSelection = false;
+  this.composing = null;
+};
+
+TextareaInput.prototype.init = function (display) {
+    var this$1 = this;
+
+  var input = this, cm = this.cm;
+  this.createField(display);
+  var te = this.textarea;
+
+  display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild);
+
+  // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+  if (ios) { te.style.width = "0px"; }
+
+  on(te, "input", function () {
+    if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null; }
+    input.poll();
+  });
+
+  on(te, "paste", function (e) {
+    if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
+
+    cm.state.pasteIncoming = true;
+    input.fastPoll();
+  });
+
+  function prepareCopyCut(e) {
+    if (signalDOMEvent(cm, e)) { return }
+    if (cm.somethingSelected()) {
+      setLastCopied({lineWise: false, text: cm.getSelections()});
+    } else if (!cm.options.lineWiseCopyCut) {
+      return
+    } else {
+      var ranges = copyableRanges(cm);
+      setLastCopied({lineWise: true, text: ranges.text});
+      if (e.type == "cut") {
+        cm.setSelections(ranges.ranges, null, sel_dontScroll);
+      } else {
+        input.prevInput = "";
+        te.value = ranges.text.join("\n");
+        selectInput(te);
+      }
+    }
+    if (e.type == "cut") { cm.state.cutIncoming = true; }
+  }
+  on(te, "cut", prepareCopyCut);
+  on(te, "copy", prepareCopyCut);
+
+  on(display.scroller, "paste", function (e) {
+    if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return }
+    cm.state.pasteIncoming = true;
+    input.focus();
+  });
+
+  // Prevent normal selection in the editor (we handle our own)
+  on(display.lineSpace, "selectstart", function (e) {
+    if (!eventInWidget(display, e)) { e_preventDefault(e); }
+  });
+
+  on(te, "compositionstart", function () {
+    var start = cm.getCursor("from");
+    if (input.composing) { input.composing.range.clear(); }
+    input.composing = {
+      start: start,
+      range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+    };
+  });
+  on(te, "compositionend", function () {
+    if (input.composing) {
+      input.poll();
+      input.composing.range.clear();
+      input.composing = null;
+    }
+  });
+};
+
+TextareaInput.prototype.createField = function (_display) {
+  // Wraps and hides input textarea
+  this.wrapper = hiddenTextarea();
+  // The semihidden textarea that is focused when the editor is
+  // focused, and receives input.
+  this.textarea = this.wrapper.firstChild;
+};
+
+TextareaInput.prototype.prepareSelection = function () {
+  // Redraw the selection and/or cursor
+  var cm = this.cm, display = cm.display, doc = cm.doc;
+  var result = prepareSelection(cm);
+
+  // Move the hidden textarea near the cursor to prevent scrolling artifacts
+  if (cm.options.moveInputWithCursor) {
+    var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+    var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+    result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                        headPos.top + lineOff.top - wrapOff.top));
+    result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                         headPos.left + lineOff.left - wrapOff.left));
+  }
+
+  return result
+};
+
+TextareaInput.prototype.showSelection = function (drawn) {
+  var cm = this.cm, display = cm.display;
+  removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+  removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+  if (drawn.teTop != null) {
+    this.wrapper.style.top = drawn.teTop + "px";
+    this.wrapper.style.left = drawn.teLeft + "px";
+  }
+};
+
+// Reset the input to correspond to the selection (or to be empty,
+// when not typing and nothing is selected)
+TextareaInput.prototype.reset = function (typing) {
+  if (this.contextMenuPending || this.composing) { return }
+  var cm = this.cm;
+  if (cm.somethingSelected()) {
+    this.prevInput = "";
+    var content = cm.getSelection();
+    this.textarea.value = content;
+    if (cm.state.focused) { selectInput(this.textarea); }
+    if (ie && ie_version >= 9) { this.hasSelection = content; }
+  } else if (!typing) {
+    this.prevInput = this.textarea.value = "";
+    if (ie && ie_version >= 9) { this.hasSelection = null; }
+  }
+};
+
+TextareaInput.prototype.getField = function () { return this.textarea };
+
+TextareaInput.prototype.supportsTouch = function () { return false };
+
+TextareaInput.prototype.focus = function () {
+  if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+    try { this.textarea.focus(); }
+    catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+  }
+};
+
+TextareaInput.prototype.blur = function () { this.textarea.blur(); };
+
+TextareaInput.prototype.resetPosition = function () {
+  this.wrapper.style.top = this.wrapper.style.left = 0;
+};
+
+TextareaInput.prototype.receivedFocus = function () { this.slowPoll(); };
+
+// Poll for input changes, using the normal rate of polling. This
+// runs as long as the editor is focused.
+TextareaInput.prototype.slowPoll = function () {
+    var this$1 = this;
+
+  if (this.pollingFast) { return }
+  this.polling.set(this.cm.options.pollInterval, function () {
+    this$1.poll();
+    if (this$1.cm.state.focused) { this$1.slowPoll(); }
+  });
+};
+
+// When an event has just come in that is likely to add or change
+// something in the input textarea, we poll faster, to ensure that
+// the change appears on the screen quickly.
+TextareaInput.prototype.fastPoll = function () {
+  var missed = false, input = this;
+  input.pollingFast = true;
+  function p() {
+    var changed = input.poll();
+    if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+    else {input.pollingFast = false; input.slowPoll();}
+  }
+  input.polling.set(20, p);
+};
+
+// Read input from the textarea, and update the document to match.
+// When something is selected, it is present in the textarea, and
+// selected (unless it is huge, in which case a placeholder is
+// used). When nothing is selected, the cursor sits after previously
+// seen text (can be empty), which is stored in prevInput (we must
+// not reset the textarea when typing, because that breaks IME).
+TextareaInput.prototype.poll = function () {
+    var this$1 = this;
+
+  var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+  // Since this is called a *lot*, try to bail out as cheaply as
+  // possible when it is clear that nothing happened. hasSelection
+  // will be the case when there is a lot of text in the textarea,
+  // in which case reading its value would be expensive.
+  if (this.contextMenuPending || !cm.state.focused ||
+      (hasSelection(input) && !prevInput && !this.composing) ||
+      cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
+    { return false }
+
+  var text = input.value;
+  // If nothing changed, bail.
+  if (text == prevInput && !cm.somethingSelected()) { return false }
+  // Work around nonsensical selection resetting in IE9/10, and
+  // inexplicable appearance of private area unicode characters on
+  // some key combos in Mac (#2689).
+  if (ie && ie_version >= 9 && this.hasSelection === text ||
+      mac && /[\uf700-\uf7ff]/.test(text)) {
+    cm.display.input.reset();
+    return false
+  }
+
+  if (cm.doc.sel == cm.display.selForContextMenu) {
+    var first = text.charCodeAt(0);
+    if (first == 0x200b && !prevInput) { prevInput = "\u200b"; }
+    if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") }
+  }
+  // Find the part of the input that is actually new
+  var same = 0, l = Math.min(prevInput.length, text.length);
+  while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { ++same; }
+
+  runInOp(cm, function () {
+    applyTextInput(cm, text.slice(same), prevInput.length - same,
+                   null, this$1.composing ? "*compose" : null);
+
+    // Don't leave long text in the textarea, since it makes further polling slow
+    if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = ""; }
+    else { this$1.prevInput = text; }
+
+    if (this$1.composing) {
+      this$1.composing.range.clear();
+      this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"),
+                                         {className: "CodeMirror-composing"});
+    }
+  });
+  return true
+};
+
+TextareaInput.prototype.ensurePolled = function () {
+  if (this.pollingFast && this.poll()) { this.pollingFast = false; }
+};
+
+TextareaInput.prototype.onKeyPress = function () {
+  if (ie && ie_version >= 9) { this.hasSelection = null; }
+  this.fastPoll();
+};
+
+TextareaInput.prototype.onContextMenu = function (e) {
+  var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+  var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+  if (!pos || presto) { return } // Opera is difficult.
+
+  // Reset the current text selection only if the click is done outside of the selection
+  // and 'resetSelectionOnContextMenu' option is true.
+  var reset = cm.options.resetSelectionOnContextMenu;
+  if (reset && cm.doc.sel.contains(pos) == -1)
+    { operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); }
+
+  var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+  input.wrapper.style.cssText = "position: absolute";
+  var wrapperBox = input.wrapper.getBoundingClientRect();
+  te.style.cssText = "position: absolute; width: 30px; height: 30px;\n      top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n      z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+  var oldScrollY;
+  if (webkit) { oldScrollY = window.scrollY; } // Work around Chrome issue (#2712)
+  display.input.focus();
+  if (webkit) { window.scrollTo(null, oldScrollY); }
+  display.input.reset();
+  // Adds "Select all" to context menu in FF
+  if (!cm.somethingSelected()) { te.value = input.prevInput = " "; }
+  input.contextMenuPending = true;
+  display.selForContextMenu = cm.doc.sel;
+  clearTimeout(display.detectingSelectAll);
+
+  // Select-all will be greyed out if there's nothing to select, so
+  // this adds a zero-width space so that we can later check whether
+  // it got selected.
+  function prepareSelectAllHack() {
+    if (te.selectionStart != null) {
+      var selected = cm.somethingSelected();
+      var extval = "\u200b" + (selected ? te.value : "");
+      te.value = "\u21da"; // Used to catch context-menu undo
+      te.value = extval;
+      input.prevInput = selected ? "" : "\u200b";
+      te.selectionStart = 1; te.selectionEnd = extval.length;
+      // Re-set this, in case some other handler touched the
+      // selection in the meantime.
+      display.selForContextMenu = cm.doc.sel;
+    }
+  }
+  function rehide() {
+    input.contextMenuPending = false;
+    input.wrapper.style.cssText = oldWrapperCSS;
+    te.style.cssText = oldCSS;
+    if (ie && ie_version < 9) { display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); }
+
+    // Try to detect the user choosing select-all
+    if (te.selectionStart != null) {
+      if (!ie || (ie && ie_version < 9)) { prepareSelectAllHack(); }
+      var i = 0, poll = function () {
+        if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
+            te.selectionEnd > 0 && input.prevInput == "\u200b") {
+          operation(cm, selectAll)(cm);
+        } else if (i++ < 10) {
+          display.detectingSelectAll = setTimeout(poll, 500);
+        } else {
+          display.selForContextMenu = null;
+          display.input.reset();
+        }
+      };
+      display.detectingSelectAll = setTimeout(poll, 200);
+    }
+  }
+
+  if (ie && ie_version >= 9) { prepareSelectAllHack(); }
+  if (captureRightClick) {
+    e_stop(e);
+    var mouseup = function () {
+      off(window, "mouseup", mouseup);
+      setTimeout(rehide, 20);
+    };
+    on(window, "mouseup", mouseup);
+  } else {
+    setTimeout(rehide, 50);
+  }
+};
+
+TextareaInput.prototype.readOnlyChanged = function (val) {
+  if (!val) { this.reset(); }
+  this.textarea.disabled = val == "nocursor";
+};
+
+TextareaInput.prototype.setUneditable = function () {};
+
+TextareaInput.prototype.needsContentAttribute = false;
+
+function fromTextArea(textarea, options) {
+  options = options ? copyObj(options) : {};
+  options.value = textarea.value;
+  if (!options.tabindex && textarea.tabIndex)
+    { options.tabindex = textarea.tabIndex; }
+  if (!options.placeholder && textarea.placeholder)
+    { options.placeholder = textarea.placeholder; }
+  // Set autofocus to true if this textarea is focused, or if it has
+  // autofocus and no other element is focused.
+  if (options.autofocus == null) {
+    var hasFocus = activeElt();
+    options.autofocus = hasFocus == textarea ||
+      textarea.getAttribute("autofocus") != null && hasFocus == document.body;
+  }
+
+  function save() {textarea.value = cm.getValue();}
+
+  var realSubmit;
+  if (textarea.form) {
+    on(textarea.form, "submit", save);
+    // Deplorable hack to make the submit method do the right thing.
+    if (!options.leaveSubmitMethodAlone) {
+      var form = textarea.form;
+      realSubmit = form.submit;
+      try {
+        var wrappedSubmit = form.submit = function () {
+          save();
+          form.submit = realSubmit;
+          form.submit();
+          form.submit = wrappedSubmit;
+        };
+      } catch(e) {}
+    }
+  }
+
+  options.finishInit = function (cm) {
+    cm.save = save;
+    cm.getTextArea = function () { return textarea; };
+    cm.toTextArea = function () {
+      cm.toTextArea = isNaN; // Prevent this from being ran twice
+      save();
+      textarea.parentNode.removeChild(cm.getWrapperElement());
+      textarea.style.display = "";
+      if (textarea.form) {
+        off(textarea.form, "submit", save);
+        if (typeof textarea.form.submit == "function")
+          { textarea.form.submit = realSubmit; }
+      }
+    };
+  };
+
+  textarea.style.display = "none";
+  var cm = CodeMirror$1(function (node) { return textarea.parentNode.insertBefore(node, textarea.nextSibling); },
+    options);
+  return cm
+}
+
+function addLegacyProps(CodeMirror) {
+  CodeMirror.off = off;
+  CodeMirror.on = on;
+  CodeMirror.wheelEventPixels = wheelEventPixels;
+  CodeMirror.Doc = Doc;
+  CodeMirror.splitLines = splitLinesAuto;
+  CodeMirror.countColumn = countColumn;
+  CodeMirror.findColumn = findColumn;
+  CodeMirror.isWordChar = isWordCharBasic;
+  CodeMirror.Pass = Pass;
+  CodeMirror.signal = signal;
+  CodeMirror.Line = Line;
+  CodeMirror.changeEnd = changeEnd;
+  CodeMirror.scrollbarModel = scrollbarModel;
+  CodeMirror.Pos = Pos;
+  CodeMirror.cmpPos = cmp;
+  CodeMirror.modes = modes;
+  CodeMirror.mimeModes = mimeModes;
+  CodeMirror.resolveMode = resolveMode;
+  CodeMirror.getMode = getMode;
+  CodeMirror.modeExtensions = modeExtensions;
+  CodeMirror.extendMode = extendMode;
+  CodeMirror.copyState = copyState;
+  CodeMirror.startState = startState;
+  CodeMirror.innerMode = innerMode;
+  CodeMirror.commands = commands;
+  CodeMirror.keyMap = keyMap;
+  CodeMirror.keyName = keyName;
+  CodeMirror.isModifierKey = isModifierKey;
+  CodeMirror.lookupKey = lookupKey;
+  CodeMirror.normalizeKeyMap = normalizeKeyMap;
+  CodeMirror.StringStream = StringStream;
+  CodeMirror.SharedTextMarker = SharedTextMarker;
+  CodeMirror.TextMarker = TextMarker;
+  CodeMirror.LineWidget = LineWidget;
+  CodeMirror.e_preventDefault = e_preventDefault;
+  CodeMirror.e_stopPropagation = e_stopPropagation;
+  CodeMirror.e_stop = e_stop;
+  CodeMirror.addClass = addClass;
+  CodeMirror.contains = contains;
+  CodeMirror.rmClass = rmClass;
+  CodeMirror.keyNames = keyNames;
+}
+
+// EDITOR CONSTRUCTOR
+
+defineOptions(CodeMirror$1);
+
+addEditorMethods(CodeMirror$1);
+
+// Set up methods on CodeMirror's prototype to redirect to the editor's document.
+var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
+for (var prop in Doc.prototype) { if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
+  { CodeMirror$1.prototype[prop] = (function(method) {
+    return function() {return method.apply(this.doc, arguments)}
+  })(Doc.prototype[prop]); } }
+
+eventMixin(Doc);
+
+// INPUT HANDLING
+
+CodeMirror$1.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
+// MODE DEFINITION AND QUERYING
+
+// Extra arguments are stored as the mode's dependencies, which is
+// used by (legacy) mechanisms like loadmode.js to automatically
+// load a mode. (Preferred mechanism is the require/define calls.)
+CodeMirror$1.defineMode = function(name/*, mode, …*/) {
+  if (!CodeMirror$1.defaults.mode && name != "null") { CodeMirror$1.defaults.mode = name; }
+  defineMode.apply(this, arguments);
+};
+
+CodeMirror$1.defineMIME = defineMIME;
+
+// Minimal default mode.
+CodeMirror$1.defineMode("null", function () { return ({token: function (stream) { return stream.skipToEnd(); }}); });
+CodeMirror$1.defineMIME("text/plain", "null");
+
+// EXTENSIONS
+
+CodeMirror$1.defineExtension = function (name, func) {
+  CodeMirror$1.prototype[name] = func;
+};
+CodeMirror$1.defineDocExtension = function (name, func) {
+  Doc.prototype[name] = func;
+};
+
+CodeMirror$1.fromTextArea = fromTextArea;
+
+addLegacyProps(CodeMirror$1);
+
+CodeMirror$1.version = "5.38.0";
+
+return CodeMirror$1;
+
+})));
diff --git a/core/media/editors/codemirror/lib/codemirror.min.css b/core/media/editors/codemirror/lib/codemirror.min.css
new file mode 100644
index 00000000..4a4a1055
--- /dev/null
+++ b/core/media/editors/codemirror/lib/codemirror.min.css
@@ -0,0 +1 @@
+.CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5);-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/lib/codemirror.min.js b/core/media/editors/codemirror/lib/codemirror.min.js
new file mode 100644
index 00000000..fa243f53
--- /dev/null
+++ b/core/media/editors/codemirror/lib/codemirror.min.js
@@ -0,0 +1,6 @@
+!(function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.CodeMirror=b()})(this,(function(){"use strict";function a(a){return new RegExp("(^|\\s)"+a+"(?:$|\\s)\\s*")}function b(a){for(var b=a.childNodes.length;b>0;--b)a.removeChild(a.firstChild);return a}function c(a,c){return b(a).appendChild(c)}function d(a,b,c,d){var e=document.createElement(a);if(c&&(e.className=c),d&&(e.style.cssText=d),"string"==typeof b)e.appendChild(document.createTextNode(b));else if(b)for(var f=0;f<b.length;++f)e.appendChild(b[f]);return e}function e(a,b,c,e){var f=d(a,b,c,e);return f.setAttribute("role","presentation"),f}function f(a,b){if(3==b.nodeType&&(b=b.parentNode),a.contains)return a.contains(b);do if(11==b.nodeType&&(b=b.host),b==a)return!0;while(b=b.parentNode)}function g(){var a;try{a=document.activeElement}catch(b){a=document.body||null}for(;a&&a.shadowRoot&&a.shadowRoot.activeElement;)a=a.shadowRoot.activeElement;return a}function h(b,c){var d=b.className;a(c).test(d)||(b.className+=(d?" ":"")+c)}function i(b,c){for(var d=b.split(" "),e=0;e<d.length;e++)d[e]&&!a(d[e]).test(c)&&(c+=" "+d[e]);return c}function j(a){var b=Array.prototype.slice.call(arguments,1);return function(){return a.apply(null,b)}}function k(a,b,c){b||(b={});for(var d in a)!a.hasOwnProperty(d)||c===!1&&b.hasOwnProperty(d)||(b[d]=a[d]);return b}function l(a,b,c,d,e){null==b&&(b=a.search(/[^\s\u00a0]/),b==-1&&(b=a.length));for(var f=d||0,g=e||0;;){var h=a.indexOf("\t",f);if(h<0||h>=b)return g+(b-f);g+=h-f,g+=c-g%c,f=h+1}}function m(a,b){for(var c=0;c<a.length;++c)if(a[c]==b)return c;return-1}function n(a,b,c){for(var d=0,e=0;;){var f=a.indexOf("\t",d);f==-1&&(f=a.length);var g=f-d;if(f==a.length||e+g>=b)return d+Math.min(g,b-e);if(e+=f-d,e+=c-e%c,d=f+1,e>=b)return d}}function o(a){for(;Xg.length<=a;)Xg.push(p(Xg)+" ");return Xg[a]}function p(a){return a[a.length-1]}function q(a,b){for(var c=[],d=0;d<a.length;d++)c[d]=b(a[d],d);return c}function r(a,b,c){for(var d=0,e=c(b);d<a.length&&c(a[d])<=e;)d++;a.splice(d,0,b)}function s(){}function t(a,b){var c;return Object.create?c=Object.create(a):(s.prototype=a,c=new s),b&&k(b,c),c}function u(a){return/\w/.test(a)||a>"€"&&(a.toUpperCase()!=a.toLowerCase()||Yg.test(a))}function v(a,b){return b?!!(b.source.indexOf("\\w")>-1&&u(a))||b.test(a):u(a)}function w(a){for(var b in a)if(a.hasOwnProperty(b)&&a[b])return!1;return!0}function x(a){return a.charCodeAt(0)>=768&&Zg.test(a)}function y(a,b,c){for(;(c<0?b>0:b<a.length)&&x(a.charAt(b));)b+=c;return b}function z(a,b,c){for(var d=b>c?-1:1;;){if(b==c)return b;var e=(b+c)/2,f=d<0?Math.ceil(e):Math.floor(e);if(f==b)return a(f)?b:c;a(f)?c=f:b=f+d}}function A(a,b,c){var f=this;this.input=c,f.scrollbarFiller=d("div",null,"CodeMirror-scrollbar-filler"),f.scrollbarFiller.setAttribute("cm-not-content","true"),f.gutterFiller=d("div",null,"CodeMirror-gutter-filler"),f.gutterFiller.setAttribute("cm-not-content","true"),f.lineDiv=e("div",null,"CodeMirror-code"),f.selectionDiv=d("div",null,null,"position: relative; z-index: 1"),f.cursorDiv=d("div",null,"CodeMirror-cursors"),f.measure=d("div",null,"CodeMirror-measure"),f.lineMeasure=d("div",null,"CodeMirror-measure"),f.lineSpace=e("div",[f.measure,f.lineMeasure,f.selectionDiv,f.cursorDiv,f.lineDiv],null,"position: relative; outline: none");var g=e("div",[f.lineSpace],"CodeMirror-lines");f.mover=d("div",[g],null,"position: relative"),f.sizer=d("div",[f.mover],"CodeMirror-sizer"),f.sizerWidth=null,f.heightForcer=d("div",null,null,"position: absolute; height: "+Sg+"px; width: 1px;"),f.gutters=d("div",null,"CodeMirror-gutters"),f.lineGutter=null,f.scroller=d("div",[f.sizer,f.heightForcer,f.gutters],"CodeMirror-scroll"),f.scroller.setAttribute("tabIndex","-1"),f.wrapper=d("div",[f.scrollbarFiller,f.gutterFiller,f.scroller],"CodeMirror"),ug&&vg<8&&(f.gutters.style.zIndex=-1,f.scroller.style.paddingRight=0),wg||qg&&Fg||(f.scroller.draggable=!0),a&&(a.appendChild?a.appendChild(f.wrapper):a(f.wrapper)),f.viewFrom=f.viewTo=b.first,f.reportedViewFrom=f.reportedViewTo=b.first,f.view=[],f.renderedView=null,f.externalMeasured=null,f.viewOffset=0,f.lastWrapHeight=f.lastWrapWidth=0,f.updateLineNumbers=null,f.nativeBarWidth=f.barHeight=f.barWidth=0,f.scrollbarsClipped=!1,f.lineNumWidth=f.lineNumInnerWidth=f.lineNumChars=null,f.alignWidgets=!1,f.cachedCharWidth=f.cachedTextHeight=f.cachedPaddingH=null,f.maxLine=null,f.maxLineLength=0,f.maxLineChanged=!1,f.wheelDX=f.wheelDY=f.wheelStartX=f.wheelStartY=null,f.shift=!1,f.selForContextMenu=null,f.activeTouch=null,c.init(f)}function B(a,b){if(b-=a.first,b<0||b>=a.size)throw new Error("There is no line "+(b+a.first)+" in the document.");for(var c=a;!c.lines;)for(var d=0;;++d){var e=c.children[d],f=e.chunkSize();if(b<f){c=e;break}b-=f}return c.lines[b]}function C(a,b,c){var d=[],e=b.line;return a.iter(b.line,c.line+1,(function(a){var f=a.text;e==c.line&&(f=f.slice(0,c.ch)),e==b.line&&(f=f.slice(b.ch)),d.push(f),++e})),d}function D(a,b,c){var d=[];return a.iter(b,c,(function(a){d.push(a.text)})),d}function E(a,b){var c=b-a.height;if(c)for(var d=a;d;d=d.parent)d.height+=c}function F(a){if(null==a.parent)return null;for(var b=a.parent,c=m(b.lines,a),d=b.parent;d;b=d,d=d.parent)for(var e=0;d.children[e]!=b;++e)c+=d.children[e].chunkSize();return c+b.first}function G(a,b){var c=a.first;a:do{for(var d=0;d<a.children.length;++d){var e=a.children[d],f=e.height;if(b<f){a=e;continue a}b-=f,c+=e.chunkSize()}return c}while(!a.lines);for(var g=0;g<a.lines.length;++g){var h=a.lines[g],i=h.height;if(b<i)break;b-=i}return c+g}function H(a,b){return b>=a.first&&b<a.first+a.size}function I(a,b){return String(a.lineNumberFormatter(b+a.firstLineNumber))}function J(a,b,c){return void 0===c&&(c=null),this instanceof J?(this.line=a,this.ch=b,void(this.sticky=c)):new J(a,b,c)}function K(a,b){return a.line-b.line||a.ch-b.ch}function L(a,b){return a.sticky==b.sticky&&0==K(a,b)}function M(a){return J(a.line,a.ch)}function N(a,b){return K(a,b)<0?b:a}function O(a,b){return K(a,b)<0?a:b}function P(a,b){return Math.max(a.first,Math.min(b,a.first+a.size-1))}function Q(a,b){if(b.line<a.first)return J(a.first,0);var c=a.first+a.size-1;return b.line>c?J(c,B(a,c).text.length):R(b,B(a,b.line).text.length)}function R(a,b){var c=a.ch;return null==c||c>b?J(a.line,b):c<0?J(a.line,0):a}function S(a,b){for(var c=[],d=0;d<b.length;d++)c[d]=Q(a,b[d]);return c}function T(){$g=!0}function U(){_g=!0}function V(a,b,c){this.marker=a,this.from=b,this.to=c}function W(a,b){if(a)for(var c=0;c<a.length;++c){var d=a[c];if(d.marker==b)return d}}function X(a,b){for(var c,d=0;d<a.length;++d)a[d]!=b&&(c||(c=[])).push(a[d]);return c}function Y(a,b){a.markedSpans=a.markedSpans?a.markedSpans.concat([b]):[b],b.marker.attachLine(a)}function Z(a,b,c){var d;if(a)for(var e=0;e<a.length;++e){var f=a[e],g=f.marker,h=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);if(h||f.from==b&&"bookmark"==g.type&&(!c||!f.marker.insertLeft)){var i=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);(d||(d=[])).push(new V(g,f.from,i?null:f.to))}}return d}function $(a,b,c){var d;if(a)for(var e=0;e<a.length;++e){var f=a[e],g=f.marker,h=null==f.to||(g.inclusiveRight?f.to>=b:f.to>b);if(h||f.from==b&&"bookmark"==g.type&&(!c||f.marker.insertLeft)){var i=null==f.from||(g.inclusiveLeft?f.from<=b:f.from<b);(d||(d=[])).push(new V(g,i?null:f.from-b,null==f.to?null:f.to-b))}}return d}function _(a,b){if(b.full)return null;var c=H(a,b.from.line)&&B(a,b.from.line).markedSpans,d=H(a,b.to.line)&&B(a,b.to.line).markedSpans;if(!c&&!d)return null;var e=b.from.ch,f=b.to.ch,g=0==K(b.from,b.to),h=Z(c,e,g),i=$(d,f,g),j=1==b.text.length,k=p(b.text).length+(j?e:0);if(h)for(var l=0;l<h.length;++l){var m=h[l];if(null==m.to){var n=W(i,m.marker);n?j&&(m.to=null==n.to?null:n.to+k):m.to=e}}if(i)for(var o=0;o<i.length;++o){var q=i[o];if(null!=q.to&&(q.to+=k),null==q.from){var r=W(h,q.marker);r||(q.from=k,j&&(h||(h=[])).push(q))}else q.from+=k,j&&(h||(h=[])).push(q)}h&&(h=aa(h)),i&&i!=h&&(i=aa(i));var s=[h];if(!j){var t,u=b.text.length-2;if(u>0&&h)for(var v=0;v<h.length;++v)null==h[v].to&&(t||(t=[])).push(new V(h[v].marker,null,null));for(var w=0;w<u;++w)s.push(t);s.push(i)}return s}function aa(a){for(var b=0;b<a.length;++b){var c=a[b];null!=c.from&&c.from==c.to&&c.marker.clearWhenEmpty!==!1&&a.splice(b--,1)}return a.length?a:null}function ba(a,b,c){var d=null;if(a.iter(b.line,c.line+1,(function(a){if(a.markedSpans)for(var b=0;b<a.markedSpans.length;++b){var c=a.markedSpans[b].marker;!c.readOnly||d&&m(d,c)!=-1||(d||(d=[])).push(c)}})),!d)return null;for(var e=[{from:b,to:c}],f=0;f<d.length;++f)for(var g=d[f],h=g.find(0),i=0;i<e.length;++i){var j=e[i];if(!(K(j.to,h.from)<0||K(j.from,h.to)>0)){var k=[i,1],l=K(j.from,h.from),n=K(j.to,h.to);(l<0||!g.inclusiveLeft&&!l)&&k.push({from:j.from,to:h.from}),(n>0||!g.inclusiveRight&&!n)&&k.push({from:h.to,to:j.to}),e.splice.apply(e,k),i+=k.length-3}}return e}function ca(a){var b=a.markedSpans;if(b){for(var c=0;c<b.length;++c)b[c].marker.detachLine(a);a.markedSpans=null}}function da(a,b){if(b){for(var c=0;c<b.length;++c)b[c].marker.attachLine(a);a.markedSpans=b}}function ea(a){return a.inclusiveLeft?-1:0}function fa(a){return a.inclusiveRight?1:0}function ga(a,b){var c=a.lines.length-b.lines.length;if(0!=c)return c;var d=a.find(),e=b.find(),f=K(d.from,e.from)||ea(a)-ea(b);if(f)return-f;var g=K(d.to,e.to)||fa(a)-fa(b);return g?g:b.id-a.id}function ha(a,b){var c,d=_g&&a.markedSpans;if(d)for(var e=void 0,f=0;f<d.length;++f)e=d[f],e.marker.collapsed&&null==(b?e.from:e.to)&&(!c||ga(c,e.marker)<0)&&(c=e.marker);return c}function ia(a){return ha(a,!0)}function ja(a){return ha(a,!1)}function ka(a,b){var c,d=_g&&a.markedSpans;if(d)for(var e=0;e<d.length;++e){var f=d[e];f.marker.collapsed&&(null==f.from||f.from<b)&&(null==f.to||f.to>b)&&(!c||ga(c,f.marker)<0)&&(c=f.marker)}return c}function la(a,b,c,d,e){var f=B(a,b),g=_g&&f.markedSpans;if(g)for(var h=0;h<g.length;++h){var i=g[h];if(i.marker.collapsed){var j=i.marker.find(0),k=K(j.from,c)||ea(i.marker)-ea(e),l=K(j.to,d)||fa(i.marker)-fa(e);if(!(k>=0&&l<=0||k<=0&&l>=0)&&(k<=0&&(i.marker.inclusiveRight&&e.inclusiveLeft?K(j.to,c)>=0:K(j.to,c)>0)||k>=0&&(i.marker.inclusiveRight&&e.inclusiveLeft?K(j.from,d)<=0:K(j.from,d)<0)))return!0}}}function ma(a){for(var b;b=ia(a);)a=b.find(-1,!0).line;return a}function na(a){for(var b;b=ja(a);)a=b.find(1,!0).line;return a}function oa(a){for(var b,c;b=ja(a);)a=b.find(1,!0).line,(c||(c=[])).push(a);return c}function pa(a,b){var c=B(a,b),d=ma(c);return c==d?b:F(d)}function qa(a,b){if(b>a.lastLine())return b;var c,d=B(a,b);if(!ra(a,d))return b;for(;c=ja(d);)d=c.find(1,!0).line;return F(d)+1}function ra(a,b){var c=_g&&b.markedSpans;if(c)for(var d=void 0,e=0;e<c.length;++e)if(d=c[e],d.marker.collapsed){if(null==d.from)return!0;if(!d.marker.widgetNode&&0==d.from&&d.marker.inclusiveLeft&&sa(a,b,d))return!0}}function sa(a,b,c){if(null==c.to){var d=c.marker.find(1,!0);return sa(a,d.line,W(d.line.markedSpans,c.marker))}if(c.marker.inclusiveRight&&c.to==b.text.length)return!0;for(var e=void 0,f=0;f<b.markedSpans.length;++f)if(e=b.markedSpans[f],e.marker.collapsed&&!e.marker.widgetNode&&e.from==c.to&&(null==e.to||e.to!=c.from)&&(e.marker.inclusiveLeft||c.marker.inclusiveRight)&&sa(a,b,e))return!0}function ta(a){a=ma(a);for(var b=0,c=a.parent,d=0;d<c.lines.length;++d){var e=c.lines[d];if(e==a)break;b+=e.height}for(var f=c.parent;f;c=f,f=c.parent)for(var g=0;g<f.children.length;++g){var h=f.children[g];if(h==c)break;b+=h.height}return b}function ua(a){if(0==a.height)return 0;for(var b,c=a.text.length,d=a;b=ia(d);){var e=b.find(0,!0);d=e.from.line,c+=e.from.ch-e.to.ch}for(d=a;b=ja(d);){var f=b.find(0,!0);c-=d.text.length-f.from.ch,d=f.to.line,c+=d.text.length-f.to.ch}return c}function va(a){var b=a.display,c=a.doc;b.maxLine=B(c,c.first),b.maxLineLength=ua(b.maxLine),b.maxLineChanged=!0,c.iter((function(a){var c=ua(a);c>b.maxLineLength&&(b.maxLineLength=c,b.maxLine=a)}))}function wa(a,b,c,d){if(!a)return d(b,c,"ltr",0);for(var e=!1,f=0;f<a.length;++f){var g=a[f];(g.from<c&&g.to>b||b==c&&g.to==b)&&(d(Math.max(g.from,b),Math.min(g.to,c),1==g.level?"rtl":"ltr",f),e=!0)}e||d(b,c,"ltr")}function xa(a,b,c){var d;ah=null;for(var e=0;e<a.length;++e){var f=a[e];if(f.from<b&&f.to>b)return e;f.to==b&&(f.from!=f.to&&"before"==c?d=e:ah=e),f.from==b&&(f.from!=f.to&&"before"!=c?d=e:ah=e)}return null!=d?d:ah}function ya(a,b){var c=a.order;return null==c&&(c=a.order=bh(a.text,b)),c}function za(a,b){return a._handlers&&a._handlers[b]||ch}function Aa(a,b,c){if(a.removeEventListener)a.removeEventListener(b,c,!1);else if(a.detachEvent)a.detachEvent("on"+b,c);else{var d=a._handlers,e=d&&d[b];if(e){var f=m(e,c);f>-1&&(d[b]=e.slice(0,f).concat(e.slice(f+1)))}}}function Ba(a,b){var c=za(a,b);if(c.length)for(var d=Array.prototype.slice.call(arguments,2),e=0;e<c.length;++e)c[e].apply(null,d)}function Ca(a,b,c){return"string"==typeof b&&(b={type:b,preventDefault:function(){this.defaultPrevented=!0}}),Ba(a,c||b.type,a,b),Ia(b)||b.codemirrorIgnore}function Da(a){var b=a._handlers&&a._handlers.cursorActivity;if(b)for(var c=a.curOp.cursorActivityHandlers||(a.curOp.cursorActivityHandlers=[]),d=0;d<b.length;++d)m(c,b[d])==-1&&c.push(b[d])}function Ea(a,b){return za(a,b).length>0}function Fa(a){a.prototype.on=function(a,b){dh(this,a,b)},a.prototype.off=function(a,b){Aa(this,a,b)}}function Ga(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function Ha(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0}function Ia(a){return null!=a.defaultPrevented?a.defaultPrevented:0==a.returnValue}function Ja(a){Ga(a),Ha(a)}function Ka(a){return a.target||a.srcElement}function La(a){var b=a.which;return null==b&&(1&a.button?b=1:2&a.button?b=3:4&a.button&&(b=2)),Gg&&a.ctrlKey&&1==b&&(b=3),b}function Ma(a){if(null==Qg){var b=d("span","​");c(a,d("span",[b,document.createTextNode("x")])),0!=a.firstChild.offsetHeight&&(Qg=b.offsetWidth<=1&&b.offsetHeight>2&&!(ug&&vg<8))}var e=Qg?d("span","​"):d("span"," ",null,"display: inline-block; width: 1px; margin-right: -1px");return e.setAttribute("cm-text",""),e}function Na(a){if(null!=Rg)return Rg;var d=c(a,document.createTextNode("AخA")),e=Kg(d,0,1).getBoundingClientRect(),f=Kg(d,1,2).getBoundingClientRect();return b(a),!(!e||e.left==e.right)&&(Rg=f.right-e.right<3)}function Oa(a){if(null!=ih)return ih;var b=c(a,d("span","x")),e=b.getBoundingClientRect(),f=Kg(b,0,1).getBoundingClientRect();return ih=Math.abs(e.left-f.left)>1}function Pa(a,b){arguments.length>2&&(b.dependencies=Array.prototype.slice.call(arguments,2)),jh[a]=b}function Qa(a,b){kh[a]=b}function Ra(a){if("string"==typeof a&&kh.hasOwnProperty(a))a=kh[a];else if(a&&"string"==typeof a.name&&kh.hasOwnProperty(a.name)){var b=kh[a.name];"string"==typeof b&&(b={name:b}),a=t(b,a),a.name=b.name}else{if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+xml$/.test(a))return Ra("application/xml");if("string"==typeof a&&/^[\w\-]+\/[\w\-]+\+json$/.test(a))return Ra("application/json")}return"string"==typeof a?{name:a}:a||{name:"null"}}function Sa(a,b){b=Ra(b);var c=jh[b.name];if(!c)return Sa(a,"text/plain");var d=c(a,b);if(lh.hasOwnProperty(b.name)){var e=lh[b.name];for(var f in e)e.hasOwnProperty(f)&&(d.hasOwnProperty(f)&&(d["_"+f]=d[f]),d[f]=e[f])}if(d.name=b.name,b.helperType&&(d.helperType=b.helperType),b.modeProps)for(var g in b.modeProps)d[g]=b.modeProps[g];return d}function Ta(a,b){var c=lh.hasOwnProperty(a)?lh[a]:lh[a]={};k(b,c)}function Ua(a,b){if(b===!0)return b;if(a.copyState)return a.copyState(b);var c={};for(var d in b){var e=b[d];e instanceof Array&&(e=e.concat([])),c[d]=e}return c}function Va(a,b){for(var c;a.innerMode&&(c=a.innerMode(b),c&&c.mode!=a);)b=c.state,a=c.mode;return c||{mode:a,state:b}}function Wa(a,b,c){return!a.startState||a.startState(b,c)}function Xa(a,b,c,d){var e=[a.state.modeGen],f={};db(a,b.text,a.doc.mode,c,(function(a,b){return e.push(a,b)}),f,d);for(var g=c.state,h=function(d){c.baseTokens=e;var h=a.state.overlays[d],i=1,j=0;c.state=!0,db(a,b.text,h.mode,c,(function(a,b){for(var c=i;j<a;){var d=e[i];d>a&&e.splice(i,1,a,e[i+1],d),i+=2,j=Math.min(a,d)}if(b)if(h.opaque)e.splice(c,i-c,a,"overlay "+b),i=c+2;else for(;c<i;c+=2){var f=e[c+1];e[c+1]=(f?f+" ":"")+"overlay "+b}}),f),c.state=g,c.baseTokens=null,c.baseTokenPos=1},i=0;i<a.state.overlays.length;++i)h(i);return{styles:e,classes:f.bgClass||f.textClass?f:null}}function Ya(a,b,c){if(!b.styles||b.styles[0]!=a.state.modeGen){var d=Za(a,F(b)),e=b.text.length>a.options.maxHighlightLength&&Ua(a.doc.mode,d.state),f=Xa(a,b,d);e&&(d.state=e),b.stateAfter=d.save(!e),b.styles=f.styles,f.classes?b.styleClasses=f.classes:b.styleClasses&&(b.styleClasses=null),c===a.doc.highlightFrontier&&(a.doc.modeFrontier=Math.max(a.doc.modeFrontier,++a.doc.highlightFrontier))}return b.styles}function Za(a,b,c){var d=a.doc,e=a.display;if(!d.mode.startState)return new oh(d,!0,b);var f=eb(a,b,c),g=f>d.first&&B(d,f-1).stateAfter,h=g?oh.fromSaved(d,g,f):new oh(d,Wa(d.mode),f);return d.iter(f,b,(function(c){$a(a,c.text,h);var d=h.line;c.stateAfter=d==b-1||d%5==0||d>=e.viewFrom&&d<e.viewTo?h.save():null,h.nextLine()})),c&&(d.modeFrontier=h.line),h}function $a(a,b,c,d){var e=a.doc.mode,f=new mh(b,a.options.tabSize,c);for(f.start=f.pos=d||0,""==b&&_a(e,c.state);!f.eol();)ab(e,f,c.state),f.start=f.pos}function _a(a,b){if(a.blankLine)return a.blankLine(b);if(a.innerMode){var c=Va(a,b);return c.mode.blankLine?c.mode.blankLine(c.state):void 0}}function ab(a,b,c,d){for(var e=0;e<10;e++){d&&(d[0]=Va(a,c).mode);var f=a.token(b,c);if(b.pos>b.start)return f}throw new Error("Mode "+a.name+" failed to advance stream.")}function bb(a,b,c,d){var e,f=a.doc,g=f.mode;b=Q(f,b);var h,i=B(f,b.line),j=Za(a,b.line,c),k=new mh(i.text,a.options.tabSize,j);for(d&&(h=[]);(d||k.pos<b.ch)&&!k.eol();)k.start=k.pos,e=ab(g,k,j.state),d&&h.push(new ph(k,e,Ua(f.mode,j.state)));return d?h:new ph(k,e,j.state)}function cb(a,b){if(a)for(;;){var c=a.match(/(?:^|\s+)line-(background-)?(\S+)/);if(!c)break;a=a.slice(0,c.index)+a.slice(c.index+c[0].length);var d=c[1]?"bgClass":"textClass";null==b[d]?b[d]=c[2]:new RegExp("(?:^|s)"+c[2]+"(?:$|s)").test(b[d])||(b[d]+=" "+c[2])}return a}function db(a,b,c,d,e,f,g){var h=c.flattenSpans;null==h&&(h=a.options.flattenSpans);var i,j=0,k=null,l=new mh(b,a.options.tabSize,d),m=a.options.addModeClass&&[null];for(""==b&&cb(_a(c,d.state),f);!l.eol();){if(l.pos>a.options.maxHighlightLength?(h=!1,g&&$a(a,b,d,l.pos),l.pos=b.length,i=null):i=cb(ab(c,l,d.state,m),f),m){var n=m[0].name;n&&(i="m-"+(i?n+" "+i:n))}if(!h||k!=i){for(;j<l.start;)j=Math.min(l.start,j+5e3),e(j,k);k=i}l.start=l.pos}for(;j<l.pos;){var o=Math.min(l.pos,j+5e3);e(o,k),j=o}}function eb(a,b,c){for(var d,e,f=a.doc,g=c?-1:b-(a.doc.mode.innerMode?1e3:100),h=b;h>g;--h){if(h<=f.first)return f.first;var i=B(f,h-1),j=i.stateAfter;if(j&&(!c||h+(j instanceof nh?j.lookAhead:0)<=f.modeFrontier))return h;var k=l(i.text,null,a.options.tabSize);(null==e||d>k)&&(e=h-1,d=k)}return e}function fb(a,b){if(a.modeFrontier=Math.min(a.modeFrontier,b),!(a.highlightFrontier<b-10)){for(var c=a.first,d=b-1;d>c;d--){var e=B(a,d).stateAfter;if(e&&(!(e instanceof nh)||d+e.lookAhead<b)){c=d+1;break}}a.highlightFrontier=Math.min(a.highlightFrontier,c)}}function gb(a,b,c,d){a.text=b,a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null),null!=a.order&&(a.order=null),ca(a),da(a,c);var e=d?d(a):1;e!=a.height&&E(a,e)}function hb(a){a.parent=null,ca(a)}function ib(a,b){if(!a||/^\s*$/.test(a))return null;var c=b.addModeClass?th:sh;return c[a]||(c[a]=a.replace(/\S+/g,"cm-$&"))}function jb(a,b){var c=e("span",null,null,wg?"padding-right: .1px":null),d={pre:e("pre",[c],"CodeMirror-line"),content:c,col:0,pos:0,cm:a,trailingSpace:!1,splitSpaces:(ug||wg)&&a.getOption("lineWrapping")};b.measure={};for(var f=0;f<=(b.rest?b.rest.length:0);f++){var g=f?b.rest[f-1]:b.line,h=void 0;d.pos=0,d.addToken=lb,Na(a.display.measure)&&(h=ya(g,a.doc.direction))&&(d.addToken=nb(d.addToken,h)),d.map=[];var j=b!=a.display.externalMeasured&&F(g);pb(g,d,Ya(a,g,j)),g.styleClasses&&(g.styleClasses.bgClass&&(d.bgClass=i(g.styleClasses.bgClass,d.bgClass||"")),g.styleClasses.textClass&&(d.textClass=i(g.styleClasses.textClass,d.textClass||""))),0==d.map.length&&d.map.push(0,0,d.content.appendChild(Ma(a.display.measure))),0==f?(b.measure.map=d.map,b.measure.cache={}):((b.measure.maps||(b.measure.maps=[])).push(d.map),(b.measure.caches||(b.measure.caches=[])).push({}))}if(wg){var k=d.content.lastChild;(/\bcm-tab\b/.test(k.className)||k.querySelector&&k.querySelector(".cm-tab"))&&(d.content.className="cm-tab-wrap-hack")}return Ba(a,"renderLine",a,b.line,d.pre),d.pre.className&&(d.textClass=i(d.pre.className,d.textClass||"")),d}function kb(a){var b=d("span","•","cm-invalidchar");return b.title="\\u"+a.charCodeAt(0).toString(16),b.setAttribute("aria-label",b.title),b}function lb(a,b,c,e,f,g,h){if(b){var i,j=a.splitSpaces?mb(b,a.trailingSpace):b,k=a.cm.state.specialChars,l=!1;if(k.test(b)){i=document.createDocumentFragment();for(var m=0;;){k.lastIndex=m;var n=k.exec(b),p=n?n.index-m:b.length-m;if(p){var q=document.createTextNode(j.slice(m,m+p));ug&&vg<9?i.appendChild(d("span",[q])):i.appendChild(q),a.map.push(a.pos,a.pos+p,q),a.col+=p,a.pos+=p}if(!n)break;m+=p+1;var r=void 0;if("\t"==n[0]){var s=a.cm.options.tabSize,t=s-a.col%s;r=i.appendChild(d("span",o(t),"cm-tab")),r.setAttribute("role","presentation"),r.setAttribute("cm-text","\t"),a.col+=t}else"\r"==n[0]||"\n"==n[0]?(r=i.appendChild(d("span","\r"==n[0]?"␍":"␤","cm-invalidchar")),r.setAttribute("cm-text",n[0]),a.col+=1):(r=a.cm.options.specialCharPlaceholder(n[0]),r.setAttribute("cm-text",n[0]),ug&&vg<9?i.appendChild(d("span",[r])):i.appendChild(r),a.col+=1);a.map.push(a.pos,a.pos+1,r),a.pos++}}else a.col+=b.length,i=document.createTextNode(j),a.map.push(a.pos,a.pos+b.length,i),ug&&vg<9&&(l=!0),a.pos+=b.length;if(a.trailingSpace=32==j.charCodeAt(b.length-1),c||e||f||l||h){var u=c||"";e&&(u+=e),f&&(u+=f);var v=d("span",[i],u,h);return g&&(v.title=g),a.content.appendChild(v)}a.content.appendChild(i)}}function mb(a,b){if(a.length>1&&!/  /.test(a))return a;for(var c=b,d="",e=0;e<a.length;e++){var f=a.charAt(e);" "!=f||!c||e!=a.length-1&&32!=a.charCodeAt(e+1)||(f=" "),d+=f,c=" "==f}return d}function nb(a,b){return function(c,d,e,f,g,h,i){e=e?e+" cm-force-border":"cm-force-border";for(var j=c.pos,k=j+d.length;;){for(var l=void 0,m=0;m<b.length&&(l=b[m],!(l.to>j&&l.from<=j));m++);if(l.to>=k)return a(c,d,e,f,g,h,i);a(c,d.slice(0,l.to-j),e,f,null,h,i),f=null,d=d.slice(l.to-j),j=l.to}}}function ob(a,b,c,d){var e=!d&&c.widgetNode;e&&a.map.push(a.pos,a.pos+b,e),!d&&a.cm.display.input.needsContentAttribute&&(e||(e=a.content.appendChild(document.createElement("span"))),e.setAttribute("cm-marker",c.id)),e&&(a.cm.display.input.setUneditable(e),a.content.appendChild(e)),a.pos+=b,a.trailingSpace=!1}function pb(a,b,c){var d=a.markedSpans,e=a.text,f=0;if(d)for(var g,h,i,j,k,l,m,n=e.length,o=0,p=1,q="",r=0;;){if(r==o){i=j=k=l=h="",m=null,r=1/0;for(var s=[],t=void 0,u=0;u<d.length;++u){var v=d[u],w=v.marker;"bookmark"==w.type&&v.from==o&&w.widgetNode?s.push(w):v.from<=o&&(null==v.to||v.to>o||w.collapsed&&v.to==o&&v.from==o)?(null!=v.to&&v.to!=o&&r>v.to&&(r=v.to,j=""),w.className&&(i+=" "+w.className),w.css&&(h=(h?h+";":"")+w.css),w.startStyle&&v.from==o&&(k+=" "+w.startStyle),w.endStyle&&v.to==r&&(t||(t=[])).push(w.endStyle,v.to),w.title&&!l&&(l=w.title),w.collapsed&&(!m||ga(m.marker,w)<0)&&(m=v)):v.from>o&&r>v.from&&(r=v.from)}if(t)for(var x=0;x<t.length;x+=2)t[x+1]==r&&(j+=" "+t[x]);if(!m||m.from==o)for(var y=0;y<s.length;++y)ob(b,0,s[y]);if(m&&(m.from||0)==o){if(ob(b,(null==m.to?n+1:m.to)-o,m.marker,null==m.from),null==m.to)return;m.to==o&&(m=!1)}}if(o>=n)break;for(var z=Math.min(n,r);;){if(q){var A=o+q.length;if(!m){var B=A>z?q.slice(0,z-o):q;b.addToken(b,B,g?g+i:i,k,o+B.length==r?j:"",l,h)}if(A>=z){q=q.slice(z-o),o=z;break}o=A,k=""}q=e.slice(f,f=c[p++]),g=ib(c[p++],b.cm.options)}}else for(var C=1;C<c.length;C+=2)b.addToken(b,e.slice(f,f=c[C]),ib(c[C+1],b.cm.options))}function qb(a,b,c){this.line=b,this.rest=oa(b),this.size=this.rest?F(p(this.rest))-c+1:1,this.node=this.text=null,this.hidden=ra(a,b)}function rb(a,b,c){for(var d,e=[],f=b;f<c;f=d){var g=new qb(a.doc,B(a.doc,f),f);d=f+g.size,e.push(g)}return e}function sb(a){uh?uh.ops.push(a):a.ownsGroup=uh={ops:[a],delayedCallbacks:[]}}function tb(a){var b=a.delayedCallbacks,c=0;do{for(;c<b.length;c++)b[c].call(null);for(var d=0;d<a.ops.length;d++){var e=a.ops[d];if(e.cursorActivityHandlers)for(;e.cursorActivityCalled<e.cursorActivityHandlers.length;)e.cursorActivityHandlers[e.cursorActivityCalled++].call(null,e.cm)}}while(c<b.length)}function ub(a,b){var c=a.ownsGroup;if(c)try{tb(c)}finally{uh=null,b(c)}}function vb(a,b){var c=za(a,b);if(c.length){var d,e=Array.prototype.slice.call(arguments,2);uh?d=uh.delayedCallbacks:vh?d=vh:(d=vh=[],setTimeout(wb,0));for(var f=function(a){d.push((function(){return c[a].apply(null,e)}))},g=0;g<c.length;++g)f(g)}}function wb(){var a=vh;vh=null;for(var b=0;b<a.length;++b)a[b]()}function xb(a,b,c,d){for(var e=0;e<b.changes.length;e++){var f=b.changes[e];"text"==f?Bb(a,b):"gutter"==f?Db(a,b,c,d):"class"==f?Cb(a,b):"widget"==f&&Eb(a,b,d)}b.changes=null}function yb(a){return a.node==a.text&&(a.node=d("div",null,null,"position: relative"),a.text.parentNode&&a.text.parentNode.replaceChild(a.node,a.text),a.node.appendChild(a.text),ug&&vg<8&&(a.node.style.zIndex=2)),a.node}function zb(a,b){var c=b.bgClass?b.bgClass+" "+(b.line.bgClass||""):b.line.bgClass;if(c&&(c+=" CodeMirror-linebackground"),b.background)c?b.background.className=c:(b.background.parentNode.removeChild(b.background),b.background=null);else if(c){var e=yb(b);b.background=e.insertBefore(d("div",null,c),e.firstChild),a.display.input.setUneditable(b.background)}}function Ab(a,b){var c=a.display.externalMeasured;return c&&c.line==b.line?(a.display.externalMeasured=null,b.measure=c.measure,c.built):jb(a,b)}function Bb(a,b){var c=b.text.className,d=Ab(a,b);b.text==b.node&&(b.node=d.pre),b.text.parentNode.replaceChild(d.pre,b.text),b.text=d.pre,d.bgClass!=b.bgClass||d.textClass!=b.textClass?(b.bgClass=d.bgClass,b.textClass=d.textClass,Cb(a,b)):c&&(b.text.className=c)}function Cb(a,b){zb(a,b),b.line.wrapClass?yb(b).className=b.line.wrapClass:b.node!=b.text&&(b.node.className="");var c=b.textClass?b.textClass+" "+(b.line.textClass||""):b.line.textClass;b.text.className=c||""}function Db(a,b,c,e){if(b.gutter&&(b.node.removeChild(b.gutter),b.gutter=null),b.gutterBackground&&(b.node.removeChild(b.gutterBackground),b.gutterBackground=null),b.line.gutterClass){var f=yb(b);b.gutterBackground=d("div",null,"CodeMirror-gutter-background "+b.line.gutterClass,"left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px; width: "+e.gutterTotalWidth+"px"),a.display.input.setUneditable(b.gutterBackground),f.insertBefore(b.gutterBackground,b.text)}var g=b.line.gutterMarkers;if(a.options.lineNumbers||g){var h=yb(b),i=b.gutter=d("div",null,"CodeMirror-gutter-wrapper","left: "+(a.options.fixedGutter?e.fixedPos:-e.gutterTotalWidth)+"px");if(a.display.input.setUneditable(i),h.insertBefore(i,b.text),b.line.gutterClass&&(i.className+=" "+b.line.gutterClass),!a.options.lineNumbers||g&&g["CodeMirror-linenumbers"]||(b.lineNumber=i.appendChild(d("div",I(a.options,c),"CodeMirror-linenumber CodeMirror-gutter-elt","left: "+e.gutterLeft["CodeMirror-linenumbers"]+"px; width: "+a.display.lineNumInnerWidth+"px"))),g)for(var j=0;j<a.options.gutters.length;++j){var k=a.options.gutters[j],l=g.hasOwnProperty(k)&&g[k];l&&i.appendChild(d("div",[l],"CodeMirror-gutter-elt","left: "+e.gutterLeft[k]+"px; width: "+e.gutterWidth[k]+"px"))}}}function Eb(a,b,c){b.alignable&&(b.alignable=null);for(var d=b.node.firstChild,e=void 0;d;d=e)e=d.nextSibling,"CodeMirror-linewidget"==d.className&&b.node.removeChild(d);Gb(a,b,c)}function Fb(a,b,c,d){var e=Ab(a,b);return b.text=b.node=e.pre,e.bgClass&&(b.bgClass=e.bgClass),e.textClass&&(b.textClass=e.textClass),Cb(a,b),Db(a,b,c,d),Gb(a,b,d),b.node}function Gb(a,b,c){if(Hb(a,b.line,b,c,!0),b.rest)for(var d=0;d<b.rest.length;d++)Hb(a,b.rest[d],b,c,!1)}function Hb(a,b,c,e,f){if(b.widgets)for(var g=yb(c),h=0,i=b.widgets;h<i.length;++h){var j=i[h],k=d("div",[j.node],"CodeMirror-linewidget");j.handleMouseEvents||k.setAttribute("cm-ignore-events","true"),Ib(j,k,c,e),a.display.input.setUneditable(k),f&&j.above?g.insertBefore(k,c.gutter||c.text):g.appendChild(k),vb(j,"redraw")}}function Ib(a,b,c,d){if(a.noHScroll){(c.alignable||(c.alignable=[])).push(b);var e=d.wrapperWidth;b.style.left=d.fixedPos+"px",a.coverGutter||(e-=d.gutterTotalWidth,b.style.paddingLeft=d.gutterTotalWidth+"px"),b.style.width=e+"px"}a.coverGutter&&(b.style.zIndex=5,b.style.position="relative",a.noHScroll||(b.style.marginLeft=-d.gutterTotalWidth+"px"))}function Jb(a){if(null!=a.height)return a.height;var b=a.doc.cm;if(!b)return 0;if(!f(document.body,a.node)){var e="position: relative;";a.coverGutter&&(e+="margin-left: -"+b.display.gutters.offsetWidth+"px;"),a.noHScroll&&(e+="width: "+b.display.wrapper.clientWidth+"px;"),c(b.display.measure,d("div",[a.node],null,e))}return a.height=a.node.parentNode.offsetHeight}function Kb(a,b){for(var c=Ka(b);c!=a.wrapper;c=c.parentNode)if(!c||1==c.nodeType&&"true"==c.getAttribute("cm-ignore-events")||c.parentNode==a.sizer&&c!=a.mover)return!0}function Lb(a){return a.lineSpace.offsetTop}function Mb(a){return a.mover.offsetHeight-a.lineSpace.offsetHeight}function Nb(a){if(a.cachedPaddingH)return a.cachedPaddingH;var b=c(a.measure,d("pre","x")),e=window.getComputedStyle?window.getComputedStyle(b):b.currentStyle,f={left:parseInt(e.paddingLeft),right:parseInt(e.paddingRight)};return isNaN(f.left)||isNaN(f.right)||(a.cachedPaddingH=f),f}function Ob(a){return Sg-a.display.nativeBarWidth}function Pb(a){return a.display.scroller.clientWidth-Ob(a)-a.display.barWidth}function Qb(a){return a.display.scroller.clientHeight-Ob(a)-a.display.barHeight}function Rb(a,b,c){var d=a.options.lineWrapping,e=d&&Pb(a);if(!b.measure.heights||d&&b.measure.width!=e){var f=b.measure.heights=[];if(d){b.measure.width=e;for(var g=b.text.firstChild.getClientRects(),h=0;h<g.length-1;h++){var i=g[h],j=g[h+1];Math.abs(i.bottom-j.bottom)>2&&f.push((i.bottom+j.top)/2-c.top)}}f.push(c.bottom-c.top)}}function Sb(a,b,c){if(a.line==b)return{map:a.measure.map,cache:a.measure.cache};for(var d=0;d<a.rest.length;d++)if(a.rest[d]==b)return{map:a.measure.maps[d],cache:a.measure.caches[d]};for(var e=0;e<a.rest.length;e++)if(F(a.rest[e])>c)return{map:a.measure.maps[e],cache:a.measure.caches[e],before:!0}}function Tb(a,b){b=ma(b);var d=F(b),e=a.display.externalMeasured=new qb(a.doc,b,d);e.lineN=d;var f=e.built=jb(a,e);return e.text=f.pre,c(a.display.lineMeasure,f.pre),e}function Ub(a,b,c,d){return Xb(a,Wb(a,b),c,d)}function Vb(a,b){if(b>=a.display.viewFrom&&b<a.display.viewTo)return a.display.view[Ac(a,b)];var c=a.display.externalMeasured;return c&&b>=c.lineN&&b<c.lineN+c.size?c:void 0}function Wb(a,b){var c=F(b),d=Vb(a,c);d&&!d.text?d=null:d&&d.changes&&(xb(a,d,c,vc(a)),a.curOp.forceUpdate=!0),d||(d=Tb(a,b));var e=Sb(d,b,c);return{line:b,view:d,rect:null,map:e.map,cache:e.cache,before:e.before,hasHeights:!1}}function Xb(a,b,c,d,e){b.before&&(c=-1);var f,g=c+(d||"");return b.cache.hasOwnProperty(g)?f=b.cache[g]:(b.rect||(b.rect=b.view.text.getBoundingClientRect()),b.hasHeights||(Rb(a,b.view,b.rect),b.hasHeights=!0),f=$b(a,b,c,d),f.bogus||(b.cache[g]=f)),{left:f.left,right:f.right,top:e?f.rtop:f.top,bottom:e?f.rbottom:f.bottom}}function Yb(a,b,c){for(var d,e,f,g,h,i,j=0;j<a.length;j+=3)if(h=a[j],i=a[j+1],b<h?(e=0,f=1,g="left"):b<i?(e=b-h,f=e+1):(j==a.length-3||b==i&&a[j+3]>b)&&(f=i-h,e=f-1,b>=i&&(g="right")),null!=e){if(d=a[j+2],h==i&&c==(d.insertLeft?"left":"right")&&(g=c),"left"==c&&0==e)for(;j&&a[j-2]==a[j-3]&&a[j-1].insertLeft;)d=a[(j-=3)+2],g="left";if("right"==c&&e==i-h)for(;j<a.length-3&&a[j+3]==a[j+4]&&!a[j+5].insertLeft;)d=a[(j+=3)+2],g="right";break}return{node:d,start:e,end:f,collapse:g,coverStart:h,coverEnd:i}}function Zb(a,b){var c=wh;
+if("left"==b)for(var d=0;d<a.length&&(c=a[d]).left==c.right;d++);else for(var e=a.length-1;e>=0&&(c=a[e]).left==c.right;e--);return c}function $b(a,b,c,d){var e,f=Yb(b.map,c,d),g=f.node,h=f.start,i=f.end,j=f.collapse;if(3==g.nodeType){for(var k=0;k<4;k++){for(;h&&x(b.line.text.charAt(f.coverStart+h));)--h;for(;f.coverStart+i<f.coverEnd&&x(b.line.text.charAt(f.coverStart+i));)++i;if(e=ug&&vg<9&&0==h&&i==f.coverEnd-f.coverStart?g.parentNode.getBoundingClientRect():Zb(Kg(g,h,i).getClientRects(),d),e.left||e.right||0==h)break;i=h,h-=1,j="right"}ug&&vg<11&&(e=_b(a.display.measure,e))}else{h>0&&(j=d="right");var l;e=a.options.lineWrapping&&(l=g.getClientRects()).length>1?l["right"==d?l.length-1:0]:g.getBoundingClientRect()}if(ug&&vg<9&&!h&&(!e||!e.left&&!e.right)){var m=g.parentNode.getClientRects()[0];e=m?{left:m.left,right:m.left+uc(a.display),top:m.top,bottom:m.bottom}:wh}for(var n=e.top-b.rect.top,o=e.bottom-b.rect.top,p=(n+o)/2,q=b.view.measure.heights,r=0;r<q.length-1&&!(p<q[r]);r++);var s=r?q[r-1]:0,t=q[r],u={left:("right"==j?e.right:e.left)-b.rect.left,right:("left"==j?e.left:e.right)-b.rect.left,top:s,bottom:t};return e.left||e.right||(u.bogus=!0),a.options.singleCursorHeightPerLine||(u.rtop=n,u.rbottom=o),u}function _b(a,b){if(!window.screen||null==screen.logicalXDPI||screen.logicalXDPI==screen.deviceXDPI||!Oa(a))return b;var c=screen.logicalXDPI/screen.deviceXDPI,d=screen.logicalYDPI/screen.deviceYDPI;return{left:b.left*c,right:b.right*c,top:b.top*d,bottom:b.bottom*d}}function ac(a){if(a.measure&&(a.measure.cache={},a.measure.heights=null,a.rest))for(var b=0;b<a.rest.length;b++)a.measure.caches[b]={}}function bc(a){a.display.externalMeasure=null,b(a.display.lineMeasure);for(var c=0;c<a.display.view.length;c++)ac(a.display.view[c])}function cc(a){bc(a),a.display.cachedCharWidth=a.display.cachedTextHeight=a.display.cachedPaddingH=null,a.options.lineWrapping||(a.display.maxLineChanged=!0),a.display.lineNumChars=null}function dc(){return yg&&Eg?-(document.body.getBoundingClientRect().left-parseInt(getComputedStyle(document.body).marginLeft)):window.pageXOffset||(document.documentElement||document.body).scrollLeft}function ec(){return yg&&Eg?-(document.body.getBoundingClientRect().top-parseInt(getComputedStyle(document.body).marginTop)):window.pageYOffset||(document.documentElement||document.body).scrollTop}function fc(a){var b=0;if(a.widgets)for(var c=0;c<a.widgets.length;++c)a.widgets[c].above&&(b+=Jb(a.widgets[c]));return b}function gc(a,b,c,d,e){if(!e){var f=fc(b);c.top+=f,c.bottom+=f}if("line"==d)return c;d||(d="local");var g=ta(b);if("local"==d?g+=Lb(a.display):g-=a.display.viewOffset,"page"==d||"window"==d){var h=a.display.lineSpace.getBoundingClientRect();g+=h.top+("window"==d?0:ec());var i=h.left+("window"==d?0:dc());c.left+=i,c.right+=i}return c.top+=g,c.bottom+=g,c}function hc(a,b,c){if("div"==c)return b;var d=b.left,e=b.top;if("page"==c)d-=dc(),e-=ec();else if("local"==c||!c){var f=a.display.sizer.getBoundingClientRect();d+=f.left,e+=f.top}var g=a.display.lineSpace.getBoundingClientRect();return{left:d-g.left,top:e-g.top}}function ic(a,b,c,d,e){return d||(d=B(a.doc,b.line)),gc(a,d,Ub(a,d,b.ch,e),c)}function jc(a,b,c,d,e,f){function g(b,g){var h=Xb(a,e,b,g?"right":"left",f);return g?h.left=h.right:h.right=h.left,gc(a,d,h,c)}function h(a,b,c){var d=i[b],e=1==d.level;return g(c?a-1:a,e!=c)}d=d||B(a.doc,b.line),e||(e=Wb(a,d));var i=ya(d,a.doc.direction),j=b.ch,k=b.sticky;if(j>=d.text.length?(j=d.text.length,k="before"):j<=0&&(j=0,k="after"),!i)return g("before"==k?j-1:j,"before"==k);var l=xa(i,j,k),m=ah,n=h(j,l,"before"==k);return null!=m&&(n.other=h(j,m,"before"!=k)),n}function kc(a,b){var c=0;b=Q(a.doc,b),a.options.lineWrapping||(c=uc(a.display)*b.ch);var d=B(a.doc,b.line),e=ta(d)+Lb(a.display);return{left:c,right:c,top:e,bottom:e+d.height}}function lc(a,b,c,d,e){var f=J(a,b,c);return f.xRel=e,d&&(f.outside=!0),f}function mc(a,b,c){var d=a.doc;if(c+=a.display.viewOffset,c<0)return lc(d.first,0,null,!0,-1);var e=G(d,c),f=d.first+d.size-1;if(e>f)return lc(d.first+d.size-1,B(d,f).text.length,null,!0,1);b<0&&(b=0);for(var g=B(d,e);;){var h=qc(a,g,e,b,c),i=ka(g,h.ch+(h.xRel>0?1:0));if(!i)return h;var j=i.find(1);if(j.line==e)return j;g=B(d,e=j.line)}}function nc(a,b,c,d){d-=fc(b);var e=b.text.length,f=z((function(b){return Xb(a,c,b-1).bottom<=d}),e,0);return e=z((function(b){return Xb(a,c,b).top>d}),f,e),{begin:f,end:e}}function oc(a,b,c,d){c||(c=Wb(a,b));var e=gc(a,b,Xb(a,c,d),"line").top;return nc(a,b,c,e)}function pc(a,b,c,d){return!(a.bottom<=c)&&(a.top>c||(d?a.left:a.right)>b)}function qc(a,b,c,d,e){e-=ta(b);var f=Wb(a,b),g=fc(b),h=0,i=b.text.length,j=!0,k=ya(b,a.doc.direction);if(k){var l=(a.options.lineWrapping?sc:rc)(a,b,c,f,k,d,e);j=1!=l.level,h=j?l.from:l.to-1,i=j?l.to:l.from-1}var m,n,o=null,p=null,q=z((function(b){var c=Xb(a,f,b);return c.top+=g,c.bottom+=g,!!pc(c,d,e,!1)&&(c.top<=e&&c.left<=d&&(o=b,p=c),!0)}),h,i),r=!1;if(p){var s=d-p.left<p.right-d,t=s==j;q=o+(t?0:1),n=t?"after":"before",m=s?p.left:p.right}else{j||q!=i&&q!=h||q++,n=0==q?"after":q==b.text.length?"before":Xb(a,f,q-(j?1:0)).bottom+g<=e==j?"after":"before";var u=jc(a,J(c,q,n),"line",b,f);m=u.left,r=e<u.top||e>=u.bottom}return q=y(b.text,q,1),lc(c,q,n,r,d-m)}function rc(a,b,c,d,e,f,g){var h=z((function(h){var i=e[h],j=1!=i.level;return pc(jc(a,J(c,j?i.to:i.from,j?"before":"after"),"line",b,d),f,g,!0)}),0,e.length-1),i=e[h];if(h>0){var j=1!=i.level,k=jc(a,J(c,j?i.from:i.to,j?"after":"before"),"line",b,d);pc(k,f,g,!0)&&k.top>g&&(i=e[h-1])}return i}function sc(a,b,c,d,e,f,g){var h=nc(a,b,d,g),i=h.begin,j=h.end;/\s/.test(b.text.charAt(j-1))&&j--;for(var k=null,l=null,m=0;m<e.length;m++){var n=e[m];if(!(n.from>=j||n.to<=i)){var o=1!=n.level,p=Xb(a,d,o?Math.min(j,n.to)-1:Math.max(i,n.from)).right,q=p<f?f-p+1e9:p-f;(!k||l>q)&&(k=n,l=q)}}return k||(k=e[e.length-1]),k.from<i&&(k={from:i,to:k.to,level:k.level}),k.to>j&&(k={from:k.from,to:j,level:k.level}),k}function tc(a){if(null!=a.cachedTextHeight)return a.cachedTextHeight;if(null==rh){rh=d("pre");for(var e=0;e<49;++e)rh.appendChild(document.createTextNode("x")),rh.appendChild(d("br"));rh.appendChild(document.createTextNode("x"))}c(a.measure,rh);var f=rh.offsetHeight/50;return f>3&&(a.cachedTextHeight=f),b(a.measure),f||1}function uc(a){if(null!=a.cachedCharWidth)return a.cachedCharWidth;var b=d("span","xxxxxxxxxx"),e=d("pre",[b]);c(a.measure,e);var f=b.getBoundingClientRect(),g=(f.right-f.left)/10;return g>2&&(a.cachedCharWidth=g),g||10}function vc(a){for(var b=a.display,c={},d={},e=b.gutters.clientLeft,f=b.gutters.firstChild,g=0;f;f=f.nextSibling,++g)c[a.options.gutters[g]]=f.offsetLeft+f.clientLeft+e,d[a.options.gutters[g]]=f.clientWidth;return{fixedPos:wc(b),gutterTotalWidth:b.gutters.offsetWidth,gutterLeft:c,gutterWidth:d,wrapperWidth:b.wrapper.clientWidth}}function wc(a){return a.scroller.getBoundingClientRect().left-a.sizer.getBoundingClientRect().left}function xc(a){var b=tc(a.display),c=a.options.lineWrapping,d=c&&Math.max(5,a.display.scroller.clientWidth/uc(a.display)-3);return function(e){if(ra(a.doc,e))return 0;var f=0;if(e.widgets)for(var g=0;g<e.widgets.length;g++)e.widgets[g].height&&(f+=e.widgets[g].height);return c?f+(Math.ceil(e.text.length/d)||1)*b:f+b}}function yc(a){var b=a.doc,c=xc(a);b.iter((function(a){var b=c(a);b!=a.height&&E(a,b)}))}function zc(a,b,c,d){var e=a.display;if(!c&&"true"==Ka(b).getAttribute("cm-not-content"))return null;var f,g,h=e.lineSpace.getBoundingClientRect();try{f=b.clientX-h.left,g=b.clientY-h.top}catch(a){return null}var i,j=mc(a,f,g);if(d&&1==j.xRel&&(i=B(a.doc,j.line).text).length==j.ch){var k=l(i,i.length,a.options.tabSize)-i.length;j=J(j.line,Math.max(0,Math.round((f-Nb(a.display).left)/uc(a.display))-k))}return j}function Ac(a,b){if(b>=a.display.viewTo)return null;if(b-=a.display.viewFrom,b<0)return null;for(var c=a.display.view,d=0;d<c.length;d++)if(b-=c[d].size,b<0)return d}function Bc(a){a.display.input.showSelection(a.display.input.prepareSelection())}function Cc(a,b){void 0===b&&(b=!0);for(var c=a.doc,d={},e=d.cursors=document.createDocumentFragment(),f=d.selection=document.createDocumentFragment(),g=0;g<c.sel.ranges.length;g++)if(b||g!=c.sel.primIndex){var h=c.sel.ranges[g];if(!(h.from().line>=a.display.viewTo||h.to().line<a.display.viewFrom)){var i=h.empty();(i||a.options.showCursorWhenSelecting)&&Dc(a,h.head,e),i||Fc(a,h,f)}}return d}function Dc(a,b,c){var e=jc(a,b,"div",null,null,!a.options.singleCursorHeightPerLine),f=c.appendChild(d("div"," ","CodeMirror-cursor"));if(f.style.left=e.left+"px",f.style.top=e.top+"px",f.style.height=Math.max(0,e.bottom-e.top)*a.options.cursorHeight+"px",e.other){var g=c.appendChild(d("div"," ","CodeMirror-cursor CodeMirror-secondarycursor"));g.style.display="",g.style.left=e.other.left+"px",g.style.top=e.other.top+"px",g.style.height=.85*(e.other.bottom-e.other.top)+"px"}}function Ec(a,b){return a.top-b.top||a.left-b.left}function Fc(a,b,c){function e(a,b,c,e){b<0&&(b=0),b=Math.round(b),e=Math.round(e),i.appendChild(d("div",null,"CodeMirror-selected","position: absolute; left: "+a+"px;\n                             top: "+b+"px; width: "+(null==c?l-a:c)+"px;\n                             height: "+(e-b)+"px"))}function f(b,c,d){function f(c,d){return ic(a,J(b,c),"div",n,d)}function g(b,c,d){var e=oc(a,n,null,b),g="ltr"==c==("after"==d)?"left":"right",h="after"==d?e.begin:e.end-(/\s/.test(n.text.charAt(e.end-1))?2:1);return f(h,g)[g]}var i,j,n=B(h,b),o=n.text.length,p=ya(n,h.direction);return wa(p,c||0,null==d?o:d,(function(a,b,h,n){var q="ltr"==h,r=f(a,q?"left":"right"),s=f(b-1,q?"right":"left"),t=null==c&&0==a,u=null==d&&b==o,v=0==n,w=!p||n==p.length-1;if(s.top-r.top<=3){var x=(m?t:u)&&v,y=(m?u:t)&&w,z=x?k:(q?r:s).left,A=y?l:(q?s:r).right;e(z,r.top,A-z,r.bottom)}else{var B,C,D,E;q?(B=m&&t&&v?k:r.left,C=m?l:g(a,h,"before"),D=m?k:g(b,h,"after"),E=m&&u&&w?l:s.right):(B=m?g(a,h,"before"):k,C=!m&&t&&v?l:r.right,D=!m&&u&&w?k:s.left,E=m?g(b,h,"after"):l),e(B,r.top,C-B,r.bottom),r.bottom<s.top&&e(k,r.bottom,null,s.top),e(D,s.top,E-D,s.bottom)}(!i||Ec(r,i)<0)&&(i=r),Ec(s,i)<0&&(i=s),(!j||Ec(r,j)<0)&&(j=r),Ec(s,j)<0&&(j=s)})),{start:i,end:j}}var g=a.display,h=a.doc,i=document.createDocumentFragment(),j=Nb(a.display),k=j.left,l=Math.max(g.sizerWidth,Pb(a)-g.sizer.offsetLeft)-j.right,m="ltr"==h.direction,n=b.from(),o=b.to();if(n.line==o.line)f(n.line,n.ch,o.ch);else{var p=B(h,n.line),q=B(h,o.line),r=ma(p)==ma(q),s=f(n.line,n.ch,r?p.text.length+1:null).end,t=f(o.line,r?0:null,o.ch).start;r&&(s.top<t.top-2?(e(s.right,s.top,null,s.bottom),e(k,t.top,t.left,t.bottom)):e(s.right,s.top,t.left-s.right,s.bottom)),s.bottom<t.top&&e(k,s.bottom,null,t.top)}c.appendChild(i)}function Gc(a){if(a.state.focused){var b=a.display;clearInterval(b.blinker);var c=!0;b.cursorDiv.style.visibility="",a.options.cursorBlinkRate>0?b.blinker=setInterval((function(){return b.cursorDiv.style.visibility=(c=!c)?"":"hidden"}),a.options.cursorBlinkRate):a.options.cursorBlinkRate<0&&(b.cursorDiv.style.visibility="hidden")}}function Hc(a){a.state.focused||(a.display.input.focus(),Jc(a))}function Ic(a){a.state.delayingBlurEvent=!0,setTimeout((function(){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1,Kc(a))}),100)}function Jc(a,b){a.state.delayingBlurEvent&&(a.state.delayingBlurEvent=!1),"nocursor"!=a.options.readOnly&&(a.state.focused||(Ba(a,"focus",a,b),a.state.focused=!0,h(a.display.wrapper,"CodeMirror-focused"),a.curOp||a.display.selForContextMenu==a.doc.sel||(a.display.input.reset(),wg&&setTimeout((function(){return a.display.input.reset(!0)}),20)),a.display.input.receivedFocus()),Gc(a))}function Kc(a,b){a.state.delayingBlurEvent||(a.state.focused&&(Ba(a,"blur",a,b),a.state.focused=!1,Ng(a.display.wrapper,"CodeMirror-focused")),clearInterval(a.display.blinker),setTimeout((function(){a.state.focused||(a.display.shift=!1)}),150))}function Lc(a){for(var b=a.display,c=b.lineDiv.offsetTop,d=0;d<b.view.length;d++){var e=b.view[d],f=void 0;if(!e.hidden){if(ug&&vg<8){var g=e.node.offsetTop+e.node.offsetHeight;f=g-c,c=g}else{var h=e.node.getBoundingClientRect();f=h.bottom-h.top}var i=e.line.height-f;if(f<2&&(f=tc(b)),(i>.005||i<-.005)&&(E(e.line,f),Mc(e.line),e.rest))for(var j=0;j<e.rest.length;j++)Mc(e.rest[j])}}}function Mc(a){if(a.widgets)for(var b=0;b<a.widgets.length;++b){var c=a.widgets[b],d=c.node.parentNode;d&&(c.height=d.offsetHeight)}}function Nc(a,b,c){var d=c&&null!=c.top?Math.max(0,c.top):a.scroller.scrollTop;d=Math.floor(d-Lb(a));var e=c&&null!=c.bottom?c.bottom:d+a.wrapper.clientHeight,f=G(b,d),g=G(b,e);if(c&&c.ensure){var h=c.ensure.from.line,i=c.ensure.to.line;h<f?(f=h,g=G(b,ta(B(b,h))+a.wrapper.clientHeight)):Math.min(i,b.lastLine())>=g&&(f=G(b,ta(B(b,i))-a.wrapper.clientHeight),g=i)}return{from:f,to:Math.max(g,f+1)}}function Oc(a){var b=a.display,c=b.view;if(b.alignWidgets||b.gutters.firstChild&&a.options.fixedGutter){for(var d=wc(b)-b.scroller.scrollLeft+a.doc.scrollLeft,e=b.gutters.offsetWidth,f=d+"px",g=0;g<c.length;g++)if(!c[g].hidden){a.options.fixedGutter&&(c[g].gutter&&(c[g].gutter.style.left=f),c[g].gutterBackground&&(c[g].gutterBackground.style.left=f));var h=c[g].alignable;if(h)for(var i=0;i<h.length;i++)h[i].style.left=f}a.options.fixedGutter&&(b.gutters.style.left=d+e+"px")}}function Pc(a){if(!a.options.lineNumbers)return!1;var b=a.doc,c=I(a.options,b.first+b.size-1),e=a.display;if(c.length!=e.lineNumChars){var f=e.measure.appendChild(d("div",[d("div",c)],"CodeMirror-linenumber CodeMirror-gutter-elt")),g=f.firstChild.offsetWidth,h=f.offsetWidth-g;return e.lineGutter.style.width="",e.lineNumInnerWidth=Math.max(g,e.lineGutter.offsetWidth-h)+1,e.lineNumWidth=e.lineNumInnerWidth+h,e.lineNumChars=e.lineNumInnerWidth?c.length:-1,e.lineGutter.style.width=e.lineNumWidth+"px",Gd(a),!0}return!1}function Qc(a,b){if(!Ca(a,"scrollCursorIntoView")){var c=a.display,e=c.sizer.getBoundingClientRect(),f=null;if(b.top+e.top<0?f=!0:b.bottom+e.top>(window.innerHeight||document.documentElement.clientHeight)&&(f=!1),null!=f&&!Cg){var g=d("div","​",null,"position: absolute;\n                         top: "+(b.top-c.viewOffset-Lb(a.display))+"px;\n                         height: "+(b.bottom-b.top+Ob(a)+c.barHeight)+"px;\n                         left: "+b.left+"px; width: "+Math.max(2,b.right-b.left)+"px;");a.display.lineSpace.appendChild(g),g.scrollIntoView(f),a.display.lineSpace.removeChild(g)}}}function Rc(a,b,c,d){null==d&&(d=0);var e;a.options.lineWrapping||b!=c||(b=b.ch?J(b.line,"before"==b.sticky?b.ch-1:b.ch,"after"):b,c="before"==b.sticky?J(b.line,b.ch+1,"before"):b);for(var f=0;f<5;f++){var g=!1,h=jc(a,b),i=c&&c!=b?jc(a,c):h;e={left:Math.min(h.left,i.left),top:Math.min(h.top,i.top)-d,right:Math.max(h.left,i.left),bottom:Math.max(h.bottom,i.bottom)+d};var j=Tc(a,e),k=a.doc.scrollTop,l=a.doc.scrollLeft;if(null!=j.scrollTop&&($c(a,j.scrollTop),Math.abs(a.doc.scrollTop-k)>1&&(g=!0)),null!=j.scrollLeft&&(ad(a,j.scrollLeft),Math.abs(a.doc.scrollLeft-l)>1&&(g=!0)),!g)break}return e}function Sc(a,b){var c=Tc(a,b);null!=c.scrollTop&&$c(a,c.scrollTop),null!=c.scrollLeft&&ad(a,c.scrollLeft)}function Tc(a,b){var c=a.display,d=tc(a.display);b.top<0&&(b.top=0);var e=a.curOp&&null!=a.curOp.scrollTop?a.curOp.scrollTop:c.scroller.scrollTop,f=Qb(a),g={};b.bottom-b.top>f&&(b.bottom=b.top+f);var h=a.doc.height+Mb(c),i=b.top<d,j=b.bottom>h-d;if(b.top<e)g.scrollTop=i?0:b.top;else if(b.bottom>e+f){var k=Math.min(b.top,(j?h:b.bottom)-f);k!=e&&(g.scrollTop=k)}var l=a.curOp&&null!=a.curOp.scrollLeft?a.curOp.scrollLeft:c.scroller.scrollLeft,m=Pb(a)-(a.options.fixedGutter?c.gutters.offsetWidth:0),n=b.right-b.left>m;return n&&(b.right=b.left+m),b.left<10?g.scrollLeft=0:b.left<l?g.scrollLeft=Math.max(0,b.left-(n?0:10)):b.right>m+l-3&&(g.scrollLeft=b.right+(n?0:10)-m),g}function Uc(a,b){null!=b&&(Yc(a),a.curOp.scrollTop=(null==a.curOp.scrollTop?a.doc.scrollTop:a.curOp.scrollTop)+b)}function Vc(a){Yc(a);var b=a.getCursor();a.curOp.scrollToPos={from:b,to:b,margin:a.options.cursorScrollMargin}}function Wc(a,b,c){null==b&&null==c||Yc(a),null!=b&&(a.curOp.scrollLeft=b),null!=c&&(a.curOp.scrollTop=c)}function Xc(a,b){Yc(a),a.curOp.scrollToPos=b}function Yc(a){var b=a.curOp.scrollToPos;if(b){a.curOp.scrollToPos=null;var c=kc(a,b.from),d=kc(a,b.to);Zc(a,c,d,b.margin)}}function Zc(a,b,c,d){var e=Tc(a,{left:Math.min(b.left,c.left),top:Math.min(b.top,c.top)-d,right:Math.max(b.right,c.right),bottom:Math.max(b.bottom,c.bottom)+d});Wc(a,e.scrollLeft,e.scrollTop)}function $c(a,b){Math.abs(a.doc.scrollTop-b)<2||(qg||Ed(a,{top:b}),_c(a,b,!0),qg&&Ed(a),xd(a,100))}function _c(a,b,c){b=Math.min(a.display.scroller.scrollHeight-a.display.scroller.clientHeight,b),(a.display.scroller.scrollTop!=b||c)&&(a.doc.scrollTop=b,a.display.scrollbars.setScrollTop(b),a.display.scroller.scrollTop!=b&&(a.display.scroller.scrollTop=b))}function ad(a,b,c,d){b=Math.min(b,a.display.scroller.scrollWidth-a.display.scroller.clientWidth),(c?b==a.doc.scrollLeft:Math.abs(a.doc.scrollLeft-b)<2)&&!d||(a.doc.scrollLeft=b,Oc(a),a.display.scroller.scrollLeft!=b&&(a.display.scroller.scrollLeft=b),a.display.scrollbars.setScrollLeft(b))}function bd(a){var b=a.display,c=b.gutters.offsetWidth,d=Math.round(a.doc.height+Mb(a.display));return{clientHeight:b.scroller.clientHeight,viewHeight:b.wrapper.clientHeight,scrollWidth:b.scroller.scrollWidth,clientWidth:b.scroller.clientWidth,viewWidth:b.wrapper.clientWidth,barLeft:a.options.fixedGutter?c:0,docHeight:d,scrollHeight:d+Ob(a)+b.barHeight,nativeBarWidth:b.nativeBarWidth,gutterWidth:c}}function cd(a,b){b||(b=bd(a));var c=a.display.barWidth,d=a.display.barHeight;dd(a,b);for(var e=0;e<4&&c!=a.display.barWidth||d!=a.display.barHeight;e++)c!=a.display.barWidth&&a.options.lineWrapping&&Lc(a),dd(a,bd(a)),c=a.display.barWidth,d=a.display.barHeight}function dd(a,b){var c=a.display,d=c.scrollbars.update(b);c.sizer.style.paddingRight=(c.barWidth=d.right)+"px",c.sizer.style.paddingBottom=(c.barHeight=d.bottom)+"px",c.heightForcer.style.borderBottom=d.bottom+"px solid transparent",d.right&&d.bottom?(c.scrollbarFiller.style.display="block",c.scrollbarFiller.style.height=d.bottom+"px",c.scrollbarFiller.style.width=d.right+"px"):c.scrollbarFiller.style.display="",d.bottom&&a.options.coverGutterNextToScrollbar&&a.options.fixedGutter?(c.gutterFiller.style.display="block",c.gutterFiller.style.height=d.bottom+"px",c.gutterFiller.style.width=b.gutterWidth+"px"):c.gutterFiller.style.display=""}function ed(a){a.display.scrollbars&&(a.display.scrollbars.clear(),a.display.scrollbars.addClass&&Ng(a.display.wrapper,a.display.scrollbars.addClass)),a.display.scrollbars=new zh[a.options.scrollbarStyle](function(b){a.display.wrapper.insertBefore(b,a.display.scrollbarFiller),dh(b,"mousedown",(function(){a.state.focused&&setTimeout((function(){return a.display.input.focus()}),0)})),b.setAttribute("cm-not-content","true")},function(b,c){"horizontal"==c?ad(a,b):$c(a,b)},a),a.display.scrollbars.addClass&&h(a.display.wrapper,a.display.scrollbars.addClass)}function fd(a){a.curOp={cm:a,viewChanged:!1,startHeight:a.doc.height,forceUpdate:!1,updateInput:null,typing:!1,changeObjs:null,cursorActivityHandlers:null,cursorActivityCalled:0,selectionChanged:!1,updateMaxLine:!1,scrollLeft:null,scrollTop:null,scrollToPos:null,focus:!1,id:++Ah},sb(a.curOp)}function gd(a){var b=a.curOp;ub(b,(function(a){for(var b=0;b<a.ops.length;b++)a.ops[b].cm.curOp=null;hd(a)}))}function hd(a){for(var b=a.ops,c=0;c<b.length;c++)id(b[c]);for(var d=0;d<b.length;d++)jd(b[d]);for(var e=0;e<b.length;e++)kd(b[e]);for(var f=0;f<b.length;f++)ld(b[f]);for(var g=0;g<b.length;g++)md(b[g])}function id(a){var b=a.cm,c=b.display;zd(b),a.updateMaxLine&&va(b),a.mustUpdate=a.viewChanged||a.forceUpdate||null!=a.scrollTop||a.scrollToPos&&(a.scrollToPos.from.line<c.viewFrom||a.scrollToPos.to.line>=c.viewTo)||c.maxLineChanged&&b.options.lineWrapping,a.update=a.mustUpdate&&new Bh(b,a.mustUpdate&&{top:a.scrollTop,ensure:a.scrollToPos},a.forceUpdate)}function jd(a){a.updatedDisplay=a.mustUpdate&&Cd(a.cm,a.update)}function kd(a){var b=a.cm,c=b.display;a.updatedDisplay&&Lc(b),a.barMeasure=bd(b),c.maxLineChanged&&!b.options.lineWrapping&&(a.adjustWidthTo=Ub(b,c.maxLine,c.maxLine.text.length).left+3,b.display.sizerWidth=a.adjustWidthTo,a.barMeasure.scrollWidth=Math.max(c.scroller.clientWidth,c.sizer.offsetLeft+a.adjustWidthTo+Ob(b)+b.display.barWidth),a.maxScrollLeft=Math.max(0,c.sizer.offsetLeft+a.adjustWidthTo-Pb(b))),(a.updatedDisplay||a.selectionChanged)&&(a.preparedSelection=c.input.prepareSelection())}function ld(a){var b=a.cm;null!=a.adjustWidthTo&&(b.display.sizer.style.minWidth=a.adjustWidthTo+"px",a.maxScrollLeft<b.doc.scrollLeft&&ad(b,Math.min(b.display.scroller.scrollLeft,a.maxScrollLeft),!0),b.display.maxLineChanged=!1);var c=a.focus&&a.focus==g();a.preparedSelection&&b.display.input.showSelection(a.preparedSelection,c),(a.updatedDisplay||a.startHeight!=b.doc.height)&&cd(b,a.barMeasure),a.updatedDisplay&&Hd(b,a.barMeasure),a.selectionChanged&&Gc(b),b.state.focused&&a.updateInput&&b.display.input.reset(a.typing),c&&Hc(a.cm)}function md(a){var b=a.cm,c=b.display,d=b.doc;if(a.updatedDisplay&&Dd(b,a.update),null==c.wheelStartX||null==a.scrollTop&&null==a.scrollLeft&&!a.scrollToPos||(c.wheelStartX=c.wheelStartY=null),null!=a.scrollTop&&_c(b,a.scrollTop,a.forceScroll),null!=a.scrollLeft&&ad(b,a.scrollLeft,!0,!0),a.scrollToPos){var e=Rc(b,Q(d,a.scrollToPos.from),Q(d,a.scrollToPos.to),a.scrollToPos.margin);Qc(b,e)}var f=a.maybeHiddenMarkers,g=a.maybeUnhiddenMarkers;if(f)for(var h=0;h<f.length;++h)f[h].lines.length||Ba(f[h],"hide");if(g)for(var i=0;i<g.length;++i)g[i].lines.length&&Ba(g[i],"unhide");c.wrapper.offsetHeight&&(d.scrollTop=b.display.scroller.scrollTop),a.changeObjs&&Ba(b,"changes",b,a.changeObjs),a.update&&a.update.finish()}function nd(a,b){if(a.curOp)return b();fd(a);try{return b()}finally{gd(a)}}function od(a,b){return function(){if(a.curOp)return b.apply(a,arguments);fd(a);try{return b.apply(a,arguments)}finally{gd(a)}}}function pd(a){return function(){if(this.curOp)return a.apply(this,arguments);fd(this);try{return a.apply(this,arguments)}finally{gd(this)}}}function qd(a){return function(){var b=this.cm;if(!b||b.curOp)return a.apply(this,arguments);fd(b);try{return a.apply(this,arguments)}finally{gd(b)}}}function rd(a,b,c,d){null==b&&(b=a.doc.first),null==c&&(c=a.doc.first+a.doc.size),d||(d=0);var e=a.display;if(d&&c<e.viewTo&&(null==e.updateLineNumbers||e.updateLineNumbers>b)&&(e.updateLineNumbers=b),a.curOp.viewChanged=!0,b>=e.viewTo)_g&&pa(a.doc,b)<e.viewTo&&td(a);else if(c<=e.viewFrom)_g&&qa(a.doc,c+d)>e.viewFrom?td(a):(e.viewFrom+=d,e.viewTo+=d);else if(b<=e.viewFrom&&c>=e.viewTo)td(a);else if(b<=e.viewFrom){var f=ud(a,c,c+d,1);f?(e.view=e.view.slice(f.index),e.viewFrom=f.lineN,e.viewTo+=d):td(a)}else if(c>=e.viewTo){var g=ud(a,b,b,-1);g?(e.view=e.view.slice(0,g.index),e.viewTo=g.lineN):td(a)}else{var h=ud(a,b,b,-1),i=ud(a,c,c+d,1);h&&i?(e.view=e.view.slice(0,h.index).concat(rb(a,h.lineN,i.lineN)).concat(e.view.slice(i.index)),e.viewTo+=d):td(a)}var j=e.externalMeasured;j&&(c<j.lineN?j.lineN+=d:b<j.lineN+j.size&&(e.externalMeasured=null))}function sd(a,b,c){a.curOp.viewChanged=!0;var d=a.display,e=a.display.externalMeasured;if(e&&b>=e.lineN&&b<e.lineN+e.size&&(d.externalMeasured=null),!(b<d.viewFrom||b>=d.viewTo)){var f=d.view[Ac(a,b)];if(null!=f.node){var g=f.changes||(f.changes=[]);m(g,c)==-1&&g.push(c)}}}function td(a){a.display.viewFrom=a.display.viewTo=a.doc.first,a.display.view=[],a.display.viewOffset=0}function ud(a,b,c,d){var e,f=Ac(a,b),g=a.display.view;if(!_g||c==a.doc.first+a.doc.size)return{index:f,lineN:c};for(var h=a.display.viewFrom,i=0;i<f;i++)h+=g[i].size;if(h!=b){if(d>0){if(f==g.length-1)return null;e=h+g[f].size-b,f++}else e=h-b;b+=e,c+=e}for(;pa(a.doc,c)!=c;){if(f==(d<0?0:g.length-1))return null;c+=d*g[f-(d<0?1:0)].size,f+=d}return{index:f,lineN:c}}function vd(a,b,c){var d=a.display,e=d.view;0==e.length||b>=d.viewTo||c<=d.viewFrom?(d.view=rb(a,b,c),d.viewFrom=b):(d.viewFrom>b?d.view=rb(a,b,d.viewFrom).concat(d.view):d.viewFrom<b&&(d.view=d.view.slice(Ac(a,b))),d.viewFrom=b,d.viewTo<c?d.view=d.view.concat(rb(a,d.viewTo,c)):d.viewTo>c&&(d.view=d.view.slice(0,Ac(a,c)))),d.viewTo=c}function wd(a){for(var b=a.display.view,c=0,d=0;d<b.length;d++){var e=b[d];e.hidden||e.node&&!e.changes||++c}return c}function xd(a,b){a.doc.highlightFrontier<a.display.viewTo&&a.state.highlight.set(b,j(yd,a))}function yd(a){var b=a.doc;if(!(b.highlightFrontier>=a.display.viewTo)){var c=+new Date+a.options.workTime,d=Za(a,b.highlightFrontier),e=[];b.iter(d.line,Math.min(b.first+b.size,a.display.viewTo+500),(function(f){if(d.line>=a.display.viewFrom){var g=f.styles,h=f.text.length>a.options.maxHighlightLength?Ua(b.mode,d.state):null,i=Xa(a,f,d,!0);h&&(d.state=h),f.styles=i.styles;var j=f.styleClasses,k=i.classes;k?f.styleClasses=k:j&&(f.styleClasses=null);for(var l=!g||g.length!=f.styles.length||j!=k&&(!j||!k||j.bgClass!=k.bgClass||j.textClass!=k.textClass),m=0;!l&&m<g.length;++m)l=g[m]!=f.styles[m];l&&e.push(d.line),f.stateAfter=d.save(),d.nextLine()}else f.text.length<=a.options.maxHighlightLength&&$a(a,f.text,d),f.stateAfter=d.line%5==0?d.save():null,d.nextLine();if(+new Date>c)return xd(a,a.options.workDelay),!0})),b.highlightFrontier=d.line,b.modeFrontier=Math.max(b.modeFrontier,d.line),e.length&&nd(a,(function(){for(var b=0;b<e.length;b++)sd(a,e[b],"text")}))}}function zd(a){var b=a.display;!b.scrollbarsClipped&&b.scroller.offsetWidth&&(b.nativeBarWidth=b.scroller.offsetWidth-b.scroller.clientWidth,b.heightForcer.style.height=Ob(a)+"px",b.sizer.style.marginBottom=-b.nativeBarWidth+"px",b.sizer.style.borderRightWidth=Ob(a)+"px",b.scrollbarsClipped=!0)}function Ad(a){if(a.hasFocus())return null;var b=g();if(!b||!f(a.display.lineDiv,b))return null;var c={activeElt:b};if(window.getSelection){var d=window.getSelection();d.anchorNode&&d.extend&&f(a.display.lineDiv,d.anchorNode)&&(c.anchorNode=d.anchorNode,c.anchorOffset=d.anchorOffset,c.focusNode=d.focusNode,c.focusOffset=d.focusOffset)}return c}function Bd(a){if(a&&a.activeElt&&a.activeElt!=g()&&(a.activeElt.focus(),a.anchorNode&&f(document.body,a.anchorNode)&&f(document.body,a.focusNode))){var b=window.getSelection(),c=document.createRange();c.setEnd(a.anchorNode,a.anchorOffset),c.collapse(!1),b.removeAllRanges(),b.addRange(c),b.extend(a.focusNode,a.focusOffset)}}function Cd(a,c){var d=a.display,e=a.doc;if(c.editorIsHidden)return td(a),!1;if(!c.force&&c.visible.from>=d.viewFrom&&c.visible.to<=d.viewTo&&(null==d.updateLineNumbers||d.updateLineNumbers>=d.viewTo)&&d.renderedView==d.view&&0==wd(a))return!1;Pc(a)&&(td(a),c.dims=vc(a));var f=e.first+e.size,g=Math.max(c.visible.from-a.options.viewportMargin,e.first),h=Math.min(f,c.visible.to+a.options.viewportMargin);d.viewFrom<g&&g-d.viewFrom<20&&(g=Math.max(e.first,d.viewFrom)),d.viewTo>h&&d.viewTo-h<20&&(h=Math.min(f,d.viewTo)),_g&&(g=pa(a.doc,g),h=qa(a.doc,h));var i=g!=d.viewFrom||h!=d.viewTo||d.lastWrapHeight!=c.wrapperHeight||d.lastWrapWidth!=c.wrapperWidth;vd(a,g,h),d.viewOffset=ta(B(a.doc,d.viewFrom)),a.display.mover.style.top=d.viewOffset+"px";var j=wd(a);if(!i&&0==j&&!c.force&&d.renderedView==d.view&&(null==d.updateLineNumbers||d.updateLineNumbers>=d.viewTo))return!1;var k=Ad(a);return j>4&&(d.lineDiv.style.display="none"),Fd(a,d.updateLineNumbers,c.dims),j>4&&(d.lineDiv.style.display=""),d.renderedView=d.view,Bd(k),b(d.cursorDiv),b(d.selectionDiv),d.gutters.style.height=d.sizer.style.minHeight=0,i&&(d.lastWrapHeight=c.wrapperHeight,d.lastWrapWidth=c.wrapperWidth,xd(a,400)),d.updateLineNumbers=null,!0}function Dd(a,b){for(var c=b.viewport,d=!0;(d&&a.options.lineWrapping&&b.oldDisplayWidth!=Pb(a)||(c&&null!=c.top&&(c={top:Math.min(a.doc.height+Mb(a.display)-Qb(a),c.top)}),b.visible=Nc(a.display,a.doc,c),!(b.visible.from>=a.display.viewFrom&&b.visible.to<=a.display.viewTo)))&&Cd(a,b);d=!1){Lc(a);var e=bd(a);Bc(a),cd(a,e),Hd(a,e),b.force=!1}b.signal(a,"update",a),a.display.viewFrom==a.display.reportedViewFrom&&a.display.viewTo==a.display.reportedViewTo||(b.signal(a,"viewportChange",a,a.display.viewFrom,a.display.viewTo),a.display.reportedViewFrom=a.display.viewFrom,a.display.reportedViewTo=a.display.viewTo)}function Ed(a,b){var c=new Bh(a,b);if(Cd(a,c)){Lc(a),Dd(a,c);var d=bd(a);Bc(a),cd(a,d),Hd(a,d),c.finish()}}function Fd(a,c,d){function e(b){var c=b.nextSibling;return wg&&Gg&&a.display.currentWheelTarget==b?b.style.display="none":b.parentNode.removeChild(b),c}for(var f=a.display,g=a.options.lineNumbers,h=f.lineDiv,i=h.firstChild,j=f.view,k=f.viewFrom,l=0;l<j.length;l++){var n=j[l];if(n.hidden);else if(n.node&&n.node.parentNode==h){for(;i!=n.node;)i=e(i);var o=g&&null!=c&&c<=k&&n.lineNumber;n.changes&&(m(n.changes,"gutter")>-1&&(o=!1),xb(a,n,k,d)),o&&(b(n.lineNumber),n.lineNumber.appendChild(document.createTextNode(I(a.options,k)))),i=n.node.nextSibling}else{var p=Fb(a,n,k,d);h.insertBefore(p,i)}k+=n.size}for(;i;)i=e(i)}function Gd(a){var b=a.display.gutters.offsetWidth;a.display.sizer.style.marginLeft=b+"px"}function Hd(a,b){a.display.sizer.style.minHeight=b.docHeight+"px",a.display.heightForcer.style.top=b.docHeight+"px",a.display.gutters.style.height=b.docHeight+a.display.barHeight+Ob(a)+"px"}function Id(a){var c=a.display.gutters,e=a.options.gutters;b(c);for(var f=0;f<e.length;++f){var g=e[f],h=c.appendChild(d("div",null,"CodeMirror-gutter "+g));"CodeMirror-linenumbers"==g&&(a.display.lineGutter=h,h.style.width=(a.display.lineNumWidth||1)+"px")}c.style.display=f?"":"none",Gd(a)}function Jd(a){var b=m(a.gutters,"CodeMirror-linenumbers");b==-1&&a.lineNumbers?a.gutters=a.gutters.concat(["CodeMirror-linenumbers"]):b>-1&&!a.lineNumbers&&(a.gutters=a.gutters.slice(0),a.gutters.splice(b,1))}function Kd(a){var b=a.wheelDeltaX,c=a.wheelDeltaY;return null==b&&a.detail&&a.axis==a.HORIZONTAL_AXIS&&(b=a.detail),null==c&&a.detail&&a.axis==a.VERTICAL_AXIS?c=a.detail:null==c&&(c=a.wheelDelta),{x:b,y:c}}function Ld(a){var b=Kd(a);return b.x*=Dh,b.y*=Dh,b}function Md(a,b){var c=Kd(b),d=c.x,e=c.y,f=a.display,g=f.scroller,h=g.scrollWidth>g.clientWidth,i=g.scrollHeight>g.clientHeight;if(d&&h||e&&i){if(e&&Gg&&wg)a:for(var j=b.target,k=f.view;j!=g;j=j.parentNode)for(var l=0;l<k.length;l++)if(k[l].node==j){a.display.currentWheelTarget=j;break a}if(d&&!qg&&!zg&&null!=Dh)return e&&i&&$c(a,Math.max(0,g.scrollTop+e*Dh)),ad(a,Math.max(0,g.scrollLeft+d*Dh)),(!e||e&&i)&&Ga(b),void(f.wheelStartX=null);if(e&&null!=Dh){var m=e*Dh,n=a.doc.scrollTop,o=n+f.wrapper.clientHeight;m<0?n=Math.max(0,n+m-50):o=Math.min(a.doc.height,o+m+50),Ed(a,{top:n,bottom:o})}Ch<20&&(null==f.wheelStartX?(f.wheelStartX=g.scrollLeft,f.wheelStartY=g.scrollTop,f.wheelDX=d,f.wheelDY=e,setTimeout((function(){if(null!=f.wheelStartX){var a=g.scrollLeft-f.wheelStartX,b=g.scrollTop-f.wheelStartY,c=b&&f.wheelDY&&b/f.wheelDY||a&&f.wheelDX&&a/f.wheelDX;f.wheelStartX=f.wheelStartY=null,c&&(Dh=(Dh*Ch+c)/(Ch+1),++Ch)}}),200)):(f.wheelDX+=d,f.wheelDY+=e))}}function Nd(a,b){var c=a[b];a.sort((function(a,b){return K(a.from(),b.from())})),b=m(a,c);for(var d=1;d<a.length;d++){var e=a[d],f=a[d-1];if(K(f.to(),e.from())>=0){var g=O(f.from(),e.from()),h=N(f.to(),e.to()),i=f.empty()?e.from()==e.head:f.from()==f.head;d<=b&&--b,a.splice(--d,2,new Fh(i?h:g,i?g:h))}}return new Eh(a,b)}function Od(a,b){return new Eh([new Fh(a,b||a)],0)}function Pd(a){return a.text?J(a.from.line+a.text.length-1,p(a.text).length+(1==a.text.length?a.from.ch:0)):a.to}function Qd(a,b){if(K(a,b.from)<0)return a;if(K(a,b.to)<=0)return Pd(b);var c=a.line+b.text.length-(b.to.line-b.from.line)-1,d=a.ch;return a.line==b.to.line&&(d+=Pd(b).ch-b.to.ch),J(c,d)}function Rd(a,b){for(var c=[],d=0;d<a.sel.ranges.length;d++){var e=a.sel.ranges[d];c.push(new Fh(Qd(e.anchor,b),Qd(e.head,b)))}return Nd(c,a.sel.primIndex)}function Sd(a,b,c){return a.line==b.line?J(c.line,a.ch-b.ch+c.ch):J(c.line+(a.line-b.line),a.ch)}function Td(a,b,c){for(var d=[],e=J(a.first,0),f=e,g=0;g<b.length;g++){var h=b[g],i=Sd(h.from,e,f),j=Sd(Pd(h),e,f);if(e=h.to,f=j,"around"==c){var k=a.sel.ranges[g],l=K(k.head,k.anchor)<0;d[g]=new Fh(l?j:i,l?i:j)}else d[g]=new Fh(i,i)}return new Eh(d,a.sel.primIndex);
+}function Ud(a){a.doc.mode=Sa(a.options,a.doc.modeOption),Vd(a)}function Vd(a){a.doc.iter((function(a){a.stateAfter&&(a.stateAfter=null),a.styles&&(a.styles=null)})),a.doc.modeFrontier=a.doc.highlightFrontier=a.doc.first,xd(a,100),a.state.modeGen++,a.curOp&&rd(a)}function Wd(a,b){return 0==b.from.ch&&0==b.to.ch&&""==p(b.text)&&(!a.cm||a.cm.options.wholeLineUpdateBefore)}function Xd(a,b,c,d){function e(a){return c?c[a]:null}function f(a,c,e){gb(a,c,e,d),vb(a,"change",a,b)}function g(a,b){for(var c=[],f=a;f<b;++f)c.push(new qh(j[f],e(f),d));return c}var h=b.from,i=b.to,j=b.text,k=B(a,h.line),l=B(a,i.line),m=p(j),n=e(j.length-1),o=i.line-h.line;if(b.full)a.insert(0,g(0,j.length)),a.remove(j.length,a.size-j.length);else if(Wd(a,b)){var q=g(0,j.length-1);f(l,l.text,n),o&&a.remove(h.line,o),q.length&&a.insert(h.line,q)}else if(k==l)if(1==j.length)f(k,k.text.slice(0,h.ch)+m+k.text.slice(i.ch),n);else{var r=g(1,j.length-1);r.push(new qh(m+k.text.slice(i.ch),n,d)),f(k,k.text.slice(0,h.ch)+j[0],e(0)),a.insert(h.line+1,r)}else if(1==j.length)f(k,k.text.slice(0,h.ch)+j[0]+l.text.slice(i.ch),e(0)),a.remove(h.line+1,o);else{f(k,k.text.slice(0,h.ch)+j[0],e(0)),f(l,m+l.text.slice(i.ch),n);var s=g(1,j.length-1);o>1&&a.remove(h.line+1,o-1),a.insert(h.line+1,s)}vb(a,"change",a,b)}function Yd(a,b,c){function d(a,e,f){if(a.linked)for(var g=0;g<a.linked.length;++g){var h=a.linked[g];if(h.doc!=e){var i=f&&h.sharedHist;c&&!i||(b(h.doc,i),d(h.doc,a,i))}}}d(a,null,!0)}function Zd(a,b){if(b.cm)throw new Error("This document is already in use.");a.doc=b,b.cm=a,yc(a),Ud(a),$d(a),a.options.lineWrapping||va(a),a.options.mode=b.modeOption,rd(a)}function $d(a){("rtl"==a.doc.direction?h:Ng)(a.display.lineDiv,"CodeMirror-rtl")}function _d(a){nd(a,(function(){$d(a),rd(a)}))}function ae(a){this.done=[],this.undone=[],this.undoDepth=1/0,this.lastModTime=this.lastSelTime=0,this.lastOp=this.lastSelOp=null,this.lastOrigin=this.lastSelOrigin=null,this.generation=this.maxGeneration=a||1}function be(a,b){var c={from:M(b.from),to:Pd(b),text:C(a,b.from,b.to)};return ie(a,c,b.from.line,b.to.line+1),Yd(a,(function(a){return ie(a,c,b.from.line,b.to.line+1)}),!0),c}function ce(a){for(;a.length;){var b=p(a);if(!b.ranges)break;a.pop()}}function de(a,b){return b?(ce(a.done),p(a.done)):a.done.length&&!p(a.done).ranges?p(a.done):a.done.length>1&&!a.done[a.done.length-2].ranges?(a.done.pop(),p(a.done)):void 0}function ee(a,b,c,d){var e=a.history;e.undone.length=0;var f,g,h=+new Date;if((e.lastOp==d||e.lastOrigin==b.origin&&b.origin&&("+"==b.origin.charAt(0)&&e.lastModTime>h-(a.cm?a.cm.options.historyEventDelay:500)||"*"==b.origin.charAt(0)))&&(f=de(e,e.lastOp==d)))g=p(f.changes),0==K(b.from,b.to)&&0==K(b.from,g.to)?g.to=Pd(b):f.changes.push(be(a,b));else{var i=p(e.done);for(i&&i.ranges||he(a.sel,e.done),f={changes:[be(a,b)],generation:e.generation},e.done.push(f);e.done.length>e.undoDepth;)e.done.shift(),e.done[0].ranges||e.done.shift()}e.done.push(c),e.generation=++e.maxGeneration,e.lastModTime=e.lastSelTime=h,e.lastOp=e.lastSelOp=d,e.lastOrigin=e.lastSelOrigin=b.origin,g||Ba(a,"historyAdded")}function fe(a,b,c,d){var e=b.charAt(0);return"*"==e||"+"==e&&c.ranges.length==d.ranges.length&&c.somethingSelected()==d.somethingSelected()&&new Date-a.history.lastSelTime<=(a.cm?a.cm.options.historyEventDelay:500)}function ge(a,b,c,d){var e=a.history,f=d&&d.origin;c==e.lastSelOp||f&&e.lastSelOrigin==f&&(e.lastModTime==e.lastSelTime&&e.lastOrigin==f||fe(a,f,p(e.done),b))?e.done[e.done.length-1]=b:he(b,e.done),e.lastSelTime=+new Date,e.lastSelOrigin=f,e.lastSelOp=c,d&&d.clearRedo!==!1&&ce(e.undone)}function he(a,b){var c=p(b);c&&c.ranges&&c.equals(a)||b.push(a)}function ie(a,b,c,d){var e=b["spans_"+a.id],f=0;a.iter(Math.max(a.first,c),Math.min(a.first+a.size,d),(function(c){c.markedSpans&&((e||(e=b["spans_"+a.id]={}))[f]=c.markedSpans),++f}))}function je(a){if(!a)return null;for(var b,c=0;c<a.length;++c)a[c].marker.explicitlyCleared?b||(b=a.slice(0,c)):b&&b.push(a[c]);return b?b.length?b:null:a}function ke(a,b){var c=b["spans_"+a.id];if(!c)return null;for(var d=[],e=0;e<b.text.length;++e)d.push(je(c[e]));return d}function le(a,b){var c=ke(a,b),d=_(a,b);if(!c)return d;if(!d)return c;for(var e=0;e<c.length;++e){var f=c[e],g=d[e];if(f&&g)a:for(var h=0;h<g.length;++h){for(var i=g[h],j=0;j<f.length;++j)if(f[j].marker==i.marker)continue a;f.push(i)}else g&&(c[e]=g)}return c}function me(a,b,c){for(var d=[],e=0;e<a.length;++e){var f=a[e];if(f.ranges)d.push(c?Eh.prototype.deepCopy.call(f):f);else{var g=f.changes,h=[];d.push({changes:h});for(var i=0;i<g.length;++i){var j=g[i],k=void 0;if(h.push({from:j.from,to:j.to,text:j.text}),b)for(var l in j)(k=l.match(/^spans_(\d+)$/))&&m(b,Number(k[1]))>-1&&(p(h)[l]=j[l],delete j[l])}}}return d}function ne(a,b,c,d){if(d){var e=a.anchor;if(c){var f=K(b,e)<0;f!=K(c,e)<0?(e=b,b=c):f!=K(b,c)<0&&(b=c)}return new Fh(e,b)}return new Fh(c||b,b)}function oe(a,b,c,d,e){null==e&&(e=a.cm&&(a.cm.display.shift||a.extend)),ue(a,new Eh([ne(a.sel.primary(),b,c,e)],0),d)}function pe(a,b,c){for(var d=[],e=a.cm&&(a.cm.display.shift||a.extend),f=0;f<a.sel.ranges.length;f++)d[f]=ne(a.sel.ranges[f],b[f],null,e);var g=Nd(d,a.sel.primIndex);ue(a,g,c)}function qe(a,b,c,d){var e=a.sel.ranges.slice(0);e[b]=c,ue(a,Nd(e,a.sel.primIndex),d)}function re(a,b,c,d){ue(a,Od(b,c),d)}function se(a,b,c){var d={ranges:b.ranges,update:function(b){var c=this;this.ranges=[];for(var d=0;d<b.length;d++)c.ranges[d]=new Fh(Q(a,b[d].anchor),Q(a,b[d].head))},origin:c&&c.origin};return Ba(a,"beforeSelectionChange",a,d),a.cm&&Ba(a.cm,"beforeSelectionChange",a.cm,d),d.ranges!=b.ranges?Nd(d.ranges,d.ranges.length-1):b}function te(a,b,c){var d=a.history.done,e=p(d);e&&e.ranges?(d[d.length-1]=b,ve(a,b,c)):ue(a,b,c)}function ue(a,b,c){ve(a,b,c),ge(a,a.sel,a.cm?a.cm.curOp.id:NaN,c)}function ve(a,b,c){(Ea(a,"beforeSelectionChange")||a.cm&&Ea(a.cm,"beforeSelectionChange"))&&(b=se(a,b,c));var d=c&&c.bias||(K(b.primary().head,a.sel.primary().head)<0?-1:1);we(a,ye(a,b,d,!0)),c&&c.scroll===!1||!a.cm||Vc(a.cm)}function we(a,b){b.equals(a.sel)||(a.sel=b,a.cm&&(a.cm.curOp.updateInput=a.cm.curOp.selectionChanged=!0,Da(a.cm)),vb(a,"cursorActivity",a))}function xe(a){we(a,ye(a,a.sel,null,!1))}function ye(a,b,c,d){for(var e,f=0;f<b.ranges.length;f++){var g=b.ranges[f],h=b.ranges.length==a.sel.ranges.length&&a.sel.ranges[f],i=Ae(a,g.anchor,h&&h.anchor,c,d),j=Ae(a,g.head,h&&h.head,c,d);(e||i!=g.anchor||j!=g.head)&&(e||(e=b.ranges.slice(0,f)),e[f]=new Fh(i,j))}return e?Nd(e,b.primIndex):b}function ze(a,b,c,d,e){var f=B(a,b.line);if(f.markedSpans)for(var g=0;g<f.markedSpans.length;++g){var h=f.markedSpans[g],i=h.marker;if((null==h.from||(i.inclusiveLeft?h.from<=b.ch:h.from<b.ch))&&(null==h.to||(i.inclusiveRight?h.to>=b.ch:h.to>b.ch))){if(e&&(Ba(i,"beforeCursorEnter"),i.explicitlyCleared)){if(f.markedSpans){--g;continue}break}if(!i.atomic)continue;if(c){var j=i.find(d<0?1:-1),k=void 0;if((d<0?i.inclusiveRight:i.inclusiveLeft)&&(j=Be(a,j,-d,j&&j.line==b.line?f:null)),j&&j.line==b.line&&(k=K(j,c))&&(d<0?k<0:k>0))return ze(a,j,b,d,e)}var l=i.find(d<0?-1:1);return(d<0?i.inclusiveLeft:i.inclusiveRight)&&(l=Be(a,l,d,l.line==b.line?f:null)),l?ze(a,l,b,d,e):null}}return b}function Ae(a,b,c,d,e){var f=d||1,g=ze(a,b,c,f,e)||!e&&ze(a,b,c,f,!0)||ze(a,b,c,-f,e)||!e&&ze(a,b,c,-f,!0);return g?g:(a.cantEdit=!0,J(a.first,0))}function Be(a,b,c,d){return c<0&&0==b.ch?b.line>a.first?Q(a,J(b.line-1)):null:c>0&&b.ch==(d||B(a,b.line)).text.length?b.line<a.first+a.size-1?J(b.line+1,0):null:new J(b.line,b.ch+c)}function Ce(a){a.setSelection(J(a.firstLine(),0),J(a.lastLine()),Ug)}function De(a,b,c){var d={canceled:!1,from:b.from,to:b.to,text:b.text,origin:b.origin,cancel:function(){return d.canceled=!0}};return c&&(d.update=function(b,c,e,f){b&&(d.from=Q(a,b)),c&&(d.to=Q(a,c)),e&&(d.text=e),void 0!==f&&(d.origin=f)}),Ba(a,"beforeChange",a,d),a.cm&&Ba(a.cm,"beforeChange",a.cm,d),d.canceled?null:{from:d.from,to:d.to,text:d.text,origin:d.origin}}function Ee(a,b,c){if(a.cm){if(!a.cm.curOp)return od(a.cm,Ee)(a,b,c);if(a.cm.state.suppressEdits)return}if(!(Ea(a,"beforeChange")||a.cm&&Ea(a.cm,"beforeChange"))||(b=De(a,b,!0))){var d=$g&&!c&&ba(a,b.from,b.to);if(d)for(var e=d.length-1;e>=0;--e)Fe(a,{from:d[e].from,to:d[e].to,text:e?[""]:b.text,origin:b.origin});else Fe(a,b)}}function Fe(a,b){if(1!=b.text.length||""!=b.text[0]||0!=K(b.from,b.to)){var c=Rd(a,b);ee(a,b,c,a.cm?a.cm.curOp.id:NaN),Ie(a,b,c,_(a,b));var d=[];Yd(a,(function(a,c){c||m(d,a.history)!=-1||(Ne(a.history,b),d.push(a.history)),Ie(a,b,null,_(a,b))}))}}function Ge(a,b,c){var d=a.cm&&a.cm.state.suppressEdits;if(!d||c){for(var e,f=a.history,g=a.sel,h="undo"==b?f.done:f.undone,i="undo"==b?f.undone:f.done,j=0;j<h.length&&(e=h[j],c?!e.ranges||e.equals(a.sel):e.ranges);j++);if(j!=h.length){for(f.lastOrigin=f.lastSelOrigin=null;;){if(e=h.pop(),!e.ranges){if(d)return void h.push(e);break}if(he(e,i),c&&!e.equals(a.sel))return void ue(a,e,{clearRedo:!1});g=e}var k=[];he(g,i),i.push({changes:k,generation:f.generation}),f.generation=e.generation||++f.maxGeneration;for(var l=Ea(a,"beforeChange")||a.cm&&Ea(a.cm,"beforeChange"),n=function(c){var d=e.changes[c];if(d.origin=b,l&&!De(a,d,!1))return h.length=0,{};k.push(be(a,d));var f=c?Rd(a,d):p(h);Ie(a,d,f,le(a,d)),!c&&a.cm&&a.cm.scrollIntoView({from:d.from,to:Pd(d)});var g=[];Yd(a,(function(a,b){b||m(g,a.history)!=-1||(Ne(a.history,d),g.push(a.history)),Ie(a,d,null,le(a,d))}))},o=e.changes.length-1;o>=0;--o){var q=n(o);if(q)return q.v}}}}function He(a,b){if(0!=b&&(a.first+=b,a.sel=new Eh(q(a.sel.ranges,(function(a){return new Fh(J(a.anchor.line+b,a.anchor.ch),J(a.head.line+b,a.head.ch))})),a.sel.primIndex),a.cm)){rd(a.cm,a.first,a.first-b,b);for(var c=a.cm.display,d=c.viewFrom;d<c.viewTo;d++)sd(a.cm,d,"gutter")}}function Ie(a,b,c,d){if(a.cm&&!a.cm.curOp)return od(a.cm,Ie)(a,b,c,d);if(b.to.line<a.first)return void He(a,b.text.length-1-(b.to.line-b.from.line));if(!(b.from.line>a.lastLine())){if(b.from.line<a.first){var e=b.text.length-1-(a.first-b.from.line);He(a,e),b={from:J(a.first,0),to:J(b.to.line+e,b.to.ch),text:[p(b.text)],origin:b.origin}}var f=a.lastLine();b.to.line>f&&(b={from:b.from,to:J(f,B(a,f).text.length),text:[b.text[0]],origin:b.origin}),b.removed=C(a,b.from,b.to),c||(c=Rd(a,b)),a.cm?Je(a.cm,b,d):Xd(a,b,d),ve(a,c,Ug)}}function Je(a,b,c){var d=a.doc,e=a.display,f=b.from,g=b.to,h=!1,i=f.line;a.options.lineWrapping||(i=F(ma(B(d,f.line))),d.iter(i,g.line+1,(function(a){if(a==e.maxLine)return h=!0,!0}))),d.sel.contains(b.from,b.to)>-1&&Da(a),Xd(d,b,c,xc(a)),a.options.lineWrapping||(d.iter(i,f.line+b.text.length,(function(a){var b=ua(a);b>e.maxLineLength&&(e.maxLine=a,e.maxLineLength=b,e.maxLineChanged=!0,h=!1)})),h&&(a.curOp.updateMaxLine=!0)),fb(d,f.line),xd(a,400);var j=b.text.length-(g.line-f.line)-1;b.full?rd(a):f.line!=g.line||1!=b.text.length||Wd(a.doc,b)?rd(a,f.line,g.line+1,j):sd(a,f.line,"text");var k=Ea(a,"changes"),l=Ea(a,"change");if(l||k){var m={from:f,to:g,text:b.text,removed:b.removed,origin:b.origin};l&&vb(a,"change",a,m),k&&(a.curOp.changeObjs||(a.curOp.changeObjs=[])).push(m)}a.display.selForContextMenu=null}function Ke(a,b,c,d,e){if(d||(d=c),K(d,c)<0){var f;f=[d,c],c=f[0],d=f[1]}"string"==typeof b&&(b=a.splitLines(b)),Ee(a,{from:c,to:d,text:b,origin:e})}function Le(a,b,c,d){c<a.line?a.line+=d:b<a.line&&(a.line=b,a.ch=0)}function Me(a,b,c,d){for(var e=0;e<a.length;++e){var f=a[e],g=!0;if(f.ranges){f.copied||(f=a[e]=f.deepCopy(),f.copied=!0);for(var h=0;h<f.ranges.length;h++)Le(f.ranges[h].anchor,b,c,d),Le(f.ranges[h].head,b,c,d)}else{for(var i=0;i<f.changes.length;++i){var j=f.changes[i];if(c<j.from.line)j.from=J(j.from.line+d,j.from.ch),j.to=J(j.to.line+d,j.to.ch);else if(b<=j.to.line){g=!1;break}}g||(a.splice(0,e+1),e=0)}}}function Ne(a,b){var c=b.from.line,d=b.to.line,e=b.text.length-(d-c)-1;Me(a.done,c,d,e),Me(a.undone,c,d,e)}function Oe(a,b,c,d){var e=b,f=b;return"number"==typeof b?f=B(a,P(a,b)):e=F(b),null==e?null:(d(f,e)&&a.cm&&sd(a.cm,e,c),f)}function Pe(a){var b=this;this.lines=a,this.parent=null;for(var c=0,d=0;d<a.length;++d)a[d].parent=b,c+=a[d].height;this.height=c}function Qe(a){var b=this;this.children=a;for(var c=0,d=0,e=0;e<a.length;++e){var f=a[e];c+=f.chunkSize(),d+=f.height,f.parent=b}this.size=c,this.height=d,this.parent=null}function Re(a,b,c){ta(b)<(a.curOp&&a.curOp.scrollTop||a.doc.scrollTop)&&Uc(a,c)}function Se(a,b,c,d){var e=new Gh(a,c,d),f=a.cm;return f&&e.noHScroll&&(f.display.alignWidgets=!0),Oe(a,b,"widget",(function(b){var c=b.widgets||(b.widgets=[]);if(null==e.insertAt?c.push(e):c.splice(Math.min(c.length-1,Math.max(0,e.insertAt)),0,e),e.line=b,f&&!ra(a,b)){var d=ta(b)<a.scrollTop;E(b,b.height+Jb(e)),d&&Uc(f,e.height),f.curOp.forceUpdate=!0}return!0})),f&&vb(f,"lineWidgetAdded",f,e,"number"==typeof b?b:F(b)),e}function Te(a,b,c,d,f){if(d&&d.shared)return Ue(a,b,c,d,f);if(a.cm&&!a.cm.curOp)return od(a.cm,Te)(a,b,c,d,f);var g=new Ih(a,f),h=K(b,c);if(d&&k(d,g,!1),h>0||0==h&&g.clearWhenEmpty!==!1)return g;if(g.replacedWith&&(g.collapsed=!0,g.widgetNode=e("span",[g.replacedWith],"CodeMirror-widget"),d.handleMouseEvents||g.widgetNode.setAttribute("cm-ignore-events","true"),d.insertLeft&&(g.widgetNode.insertLeft=!0)),g.collapsed){if(la(a,b.line,b,c,g)||b.line!=c.line&&la(a,c.line,b,c,g))throw new Error("Inserting collapsed marker partially overlapping an existing one");U()}g.addToHistory&&ee(a,{from:b,to:c,origin:"markText"},a.sel,NaN);var i,j=b.line,l=a.cm;if(a.iter(j,c.line+1,(function(a){l&&g.collapsed&&!l.options.lineWrapping&&ma(a)==l.display.maxLine&&(i=!0),g.collapsed&&j!=b.line&&E(a,0),Y(a,new V(g,j==b.line?b.ch:null,j==c.line?c.ch:null)),++j})),g.collapsed&&a.iter(b.line,c.line+1,(function(b){ra(a,b)&&E(b,0)})),g.clearOnEnter&&dh(g,"beforeCursorEnter",(function(){return g.clear()})),g.readOnly&&(T(),(a.history.done.length||a.history.undone.length)&&a.clearHistory()),g.collapsed&&(g.id=++Hh,g.atomic=!0),l){if(i&&(l.curOp.updateMaxLine=!0),g.collapsed)rd(l,b.line,c.line+1);else if(g.className||g.title||g.startStyle||g.endStyle||g.css)for(var m=b.line;m<=c.line;m++)sd(l,m,"text");g.atomic&&xe(l.doc),vb(l,"markerAdded",l,g)}return g}function Ue(a,b,c,d,e){d=k(d),d.shared=!1;var f=[Te(a,b,c,d,e)],g=f[0],h=d.widgetNode;return Yd(a,(function(a){h&&(d.widgetNode=h.cloneNode(!0)),f.push(Te(a,Q(a,b),Q(a,c),d,e));for(var i=0;i<a.linked.length;++i)if(a.linked[i].isParent)return;g=p(f)})),new Jh(f,g)}function Ve(a){return a.findMarks(J(a.first,0),a.clipPos(J(a.lastLine())),(function(a){return a.parent}))}function We(a,b){for(var c=0;c<b.length;c++){var d=b[c],e=d.find(),f=a.clipPos(e.from),g=a.clipPos(e.to);if(K(f,g)){var h=Te(a,f,g,d.primary,d.primary.type);d.markers.push(h),h.parent=d}}}function Xe(a){for(var b=function(b){var c=a[b],d=[c.primary.doc];Yd(c.primary.doc,(function(a){return d.push(a)}));for(var e=0;e<c.markers.length;e++){var f=c.markers[e];m(d,f.doc)==-1&&(f.parent=null,c.markers.splice(e--,1))}},c=0;c<a.length;c++)b(c)}function Ye(a){var b=this;if(_e(b),!Ca(b,a)&&!Kb(b.display,a)){Ga(a),ug&&(Mh=+new Date);var c=zc(b,a,!0),d=a.dataTransfer.files;if(c&&!b.isReadOnly())if(d&&d.length&&window.FileReader&&window.File)for(var e=d.length,f=Array(e),g=0,h=function(a,d){if(!b.options.allowDropFileTypes||m(b.options.allowDropFileTypes,a.type)!=-1){var h=new FileReader;h.onload=od(b,(function(){var a=h.result;if(/[\x00-\x08\x0e-\x1f]{2}/.test(a)&&(a=""),f[d]=a,++g==e){c=Q(b.doc,c);var i={from:c,to:c,text:b.doc.splitLines(f.join(b.doc.lineSeparator())),origin:"paste"};Ee(b.doc,i),te(b.doc,Od(c,Pd(i)))}})),h.readAsText(a)}},i=0;i<e;++i)h(d[i],i);else{if(b.state.draggingText&&b.doc.sel.contains(c)>-1)return b.state.draggingText(a),void setTimeout((function(){return b.display.input.focus()}),20);try{var j=a.dataTransfer.getData("Text");if(j){var k;if(b.state.draggingText&&!b.state.draggingText.copy&&(k=b.listSelections()),ve(b.doc,Od(c,c)),k)for(var l=0;l<k.length;++l)Ke(b.doc,"",k[l].anchor,k[l].head,"drag");b.replaceSelection(j,"around","paste"),b.display.input.focus()}}catch(a){}}}}function Ze(a,b){if(ug&&(!a.state.draggingText||+new Date-Mh<100))return void Ja(b);if(!Ca(a,b)&&!Kb(a.display,b)&&(b.dataTransfer.setData("Text",a.getSelection()),b.dataTransfer.effectAllowed="copyMove",b.dataTransfer.setDragImage&&!Ag)){var c=d("img",null,null,"position: fixed; left: 0; top: 0;");c.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",zg&&(c.width=c.height=1,a.display.wrapper.appendChild(c),c._top=c.offsetTop),b.dataTransfer.setDragImage(c,0,0),zg&&c.parentNode.removeChild(c)}}function $e(a,b){var e=zc(a,b);if(e){var f=document.createDocumentFragment();Dc(a,e,f),a.display.dragCursor||(a.display.dragCursor=d("div",null,"CodeMirror-cursors CodeMirror-dragcursors"),a.display.lineSpace.insertBefore(a.display.dragCursor,a.display.cursorDiv)),c(a.display.dragCursor,f)}}function _e(a){a.display.dragCursor&&(a.display.lineSpace.removeChild(a.display.dragCursor),a.display.dragCursor=null)}function af(a){if(document.getElementsByClassName)for(var b=document.getElementsByClassName("CodeMirror"),c=0;c<b.length;c++){var d=b[c].CodeMirror;d&&a(d)}}function bf(){Nh||(cf(),Nh=!0)}function cf(){var a;dh(window,"resize",(function(){null==a&&(a=setTimeout((function(){a=null,af(df)}),100))})),dh(window,"blur",(function(){return af(Kc)}))}function df(a){var b=a.display;b.lastWrapHeight==b.wrapper.clientHeight&&b.lastWrapWidth==b.wrapper.clientWidth||(b.cachedCharWidth=b.cachedTextHeight=b.cachedPaddingH=null,b.scrollbarsClipped=!1,a.setSize())}function ef(a){var b=a.split(/-(?!$)/);a=b[b.length-1];for(var c,d,e,f,g=0;g<b.length-1;g++){var h=b[g];if(/^(cmd|meta|m)$/i.test(h))f=!0;else if(/^a(lt)?$/i.test(h))c=!0;else if(/^(c|ctrl|control)$/i.test(h))d=!0;else{if(!/^s(hift)?$/i.test(h))throw new Error("Unrecognized modifier name: "+h);e=!0}}return c&&(a="Alt-"+a),d&&(a="Ctrl-"+a),f&&(a="Cmd-"+a),e&&(a="Shift-"+a),a}function ff(a){var b={};for(var c in a)if(a.hasOwnProperty(c)){var d=a[c];if(/^(name|fallthrough|(de|at)tach)$/.test(c))continue;if("..."==d){delete a[c];continue}for(var e=q(c.split(" "),ef),f=0;f<e.length;f++){var g=void 0,h=void 0;f==e.length-1?(h=e.join(" "),g=d):(h=e.slice(0,f+1).join(" "),g="...");var i=b[h];if(i){if(i!=g)throw new Error("Inconsistent bindings for "+h)}else b[h]=g}delete a[c]}for(var j in b)a[j]=b[j];return a}function gf(a,b,c,d){b=lf(b);var e=b.call?b.call(a,d):b[a];if(e===!1)return"nothing";if("..."===e)return"multi";if(null!=e&&c(e))return"handled";if(b.fallthrough){if("[object Array]"!=Object.prototype.toString.call(b.fallthrough))return gf(a,b.fallthrough,c,d);for(var f=0;f<b.fallthrough.length;f++){var g=gf(a,b.fallthrough[f],c,d);if(g)return g}}}function hf(a){var b="string"==typeof a?a:Oh[a.keyCode];return"Ctrl"==b||"Alt"==b||"Shift"==b||"Mod"==b}function jf(a,b,c){var d=a;return b.altKey&&"Alt"!=d&&(a="Alt-"+a),(Lg?b.metaKey:b.ctrlKey)&&"Ctrl"!=d&&(a="Ctrl-"+a),(Lg?b.ctrlKey:b.metaKey)&&"Cmd"!=d&&(a="Cmd-"+a),!c&&b.shiftKey&&"Shift"!=d&&(a="Shift-"+a),a}function kf(a,b){if(zg&&34==a.keyCode&&a.char)return!1;var c=Oh[a.keyCode];return null!=c&&!a.altGraphKey&&(3==a.keyCode&&a.code&&(c=a.code),jf(c,a,b))}function lf(a){return"string"==typeof a?Sh[a]:a}function mf(a,b){for(var c=a.doc.sel.ranges,d=[],e=0;e<c.length;e++){for(var f=b(c[e]);d.length&&K(f.from,p(d).to)<=0;){var g=d.pop();if(K(g.from,f.from)<0){f.from=g.from;break}}d.push(f)}nd(a,(function(){for(var b=d.length-1;b>=0;b--)Ke(a.doc,"",d[b].from,d[b].to,"+delete");Vc(a)}))}function nf(a,b,c){var d=y(a.text,b+c,c);return d<0||d>a.text.length?null:d}function of(a,b,c){var d=nf(a,b.ch,c);return null==d?null:new J(b.line,d,c<0?"after":"before")}function pf(a,b,c,d,e){if(a){var f=ya(c,b.doc.direction);if(f){var g,h=e<0?p(f):f[0],i=e<0==(1==h.level),j=i?"after":"before";if(h.level>0||"rtl"==b.doc.direction){var k=Wb(b,c);g=e<0?c.text.length-1:0;var l=Xb(b,k,g).top;g=z((function(a){return Xb(b,k,a).top==l}),e<0==(1==h.level)?h.from:h.to-1,g),"before"==j&&(g=nf(c,g,1))}else g=e<0?h.to:h.from;return new J(d,g,j)}}return new J(d,e<0?c.text.length:0,e<0?"before":"after")}function qf(a,b,c,d){var e=ya(b,a.doc.direction);if(!e)return of(b,c,d);c.ch>=b.text.length?(c.ch=b.text.length,c.sticky="before"):c.ch<=0&&(c.ch=0,c.sticky="after");var f=xa(e,c.ch,c.sticky),g=e[f];if("ltr"==a.doc.direction&&g.level%2==0&&(d>0?g.to>c.ch:g.from<c.ch))return of(b,c,d);var h,i=function(a,c){return nf(b,a instanceof J?a.ch:a,c)},j=function(c){return a.options.lineWrapping?(h=h||Wb(a,b),oc(a,b,h,c)):{begin:0,end:b.text.length}},k=j("before"==c.sticky?i(c,-1):c.ch);if("rtl"==a.doc.direction||1==g.level){var l=1==g.level==d<0,m=i(c,l?1:-1);if(null!=m&&(l?m<=g.to&&m<=k.end:m>=g.from&&m>=k.begin)){var n=l?"before":"after";return new J(c.line,m,n)}}var o=function(a,b,d){for(var f=function(a,b){return b?new J(c.line,i(a,1),"before"):new J(c.line,a,"after")};a>=0&&a<e.length;a+=b){var g=e[a],h=b>0==(1!=g.level),j=h?d.begin:i(d.end,-1);if(g.from<=j&&j<g.to)return f(j,h);if(j=h?g.from:i(g.to,-1),d.begin<=j&&j<d.end)return f(j,h)}},p=o(f+d,d,k);if(p)return p;var q=d>0?k.end:i(k.begin,-1);return null==q||d>0&&q==b.text.length||!(p=o(d>0?0:e.length-1,d,j(q)))?null:p}function rf(a,b){var c=B(a.doc,b),d=ma(c);return d!=c&&(b=F(d)),pf(!0,a,d,b,1)}function sf(a,b){var c=B(a.doc,b),d=na(c);return d!=c&&(b=F(d)),pf(!0,a,c,b,-1)}function tf(a,b){var c=rf(a,b.line),d=B(a.doc,c.line),e=ya(d,a.doc.direction);if(!e||0==e[0].level){var f=Math.max(0,d.text.search(/\S/)),g=b.line==c.line&&b.ch<=f&&b.ch;return J(c.line,g?0:f,c.sticky)}return c}function uf(a,b,c){if("string"==typeof b&&(b=Th[b],!b))return!1;a.display.input.ensurePolled();var d=a.display.shift,e=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),c&&(a.display.shift=!1),e=b(a)!=Tg}finally{a.display.shift=d,a.state.suppressEdits=!1}return e}function vf(a,b,c){for(var d=0;d<a.state.keyMaps.length;d++){var e=gf(b,a.state.keyMaps[d],c,a);if(e)return e}return a.options.extraKeys&&gf(b,a.options.extraKeys,c,a)||gf(b,a.options.keyMap,c,a)}function wf(a,b,c,d){var e=a.state.keySeq;if(e){if(hf(b))return"handled";if(/\'$/.test(b)?a.state.keySeq=null:Uh.set(50,(function(){a.state.keySeq==e&&(a.state.keySeq=null,a.display.input.reset())})),xf(a,e+" "+b,c,d))return!0}return xf(a,b,c,d)}function xf(a,b,c,d){var e=vf(a,b,d);return"multi"==e&&(a.state.keySeq=b),"handled"==e&&vb(a,"keyHandled",a,b,c),"handled"!=e&&"multi"!=e||(Ga(c),Gc(a)),!!e}function yf(a,b){var c=kf(b,!0);return!!c&&(b.shiftKey&&!a.state.keySeq?wf(a,"Shift-"+c,b,(function(b){return uf(a,b,!0)}))||wf(a,c,b,(function(b){if("string"==typeof b?/^go[A-Z]/.test(b):b.motion)return uf(a,b)})):wf(a,c,b,(function(b){return uf(a,b)})))}function zf(a,b,c){return wf(a,"'"+c+"'",b,(function(b){return uf(a,b,!0)}))}function Af(a){var b=this;if(b.curOp.focus=g(),!Ca(b,a)){ug&&vg<11&&27==a.keyCode&&(a.returnValue=!1);var c=a.keyCode;b.display.shift=16==c||a.shiftKey;var d=yf(b,a);zg&&(Vh=d?c:null,!d&&88==c&&!hh&&(Gg?a.metaKey:a.ctrlKey)&&b.replaceSelection("",null,"cut")),18!=c||/\bCodeMirror-crosshair\b/.test(b.display.lineDiv.className)||Bf(b)}}function Bf(a){function b(a){18!=a.keyCode&&a.altKey||(Ng(c,"CodeMirror-crosshair"),Aa(document,"keyup",b),Aa(document,"mouseover",b))}var c=a.display.lineDiv;h(c,"CodeMirror-crosshair"),dh(document,"keyup",b),dh(document,"mouseover",b)}function Cf(a){16==a.keyCode&&(this.doc.sel.shift=!1),Ca(this,a)}function Df(a){var b=this;if(!(Kb(b.display,a)||Ca(b,a)||a.ctrlKey&&!a.altKey||Gg&&a.metaKey)){var c=a.keyCode,d=a.charCode;if(zg&&c==Vh)return Vh=null,void Ga(a);if(!zg||a.which&&!(a.which<10)||!yf(b,a)){var e=String.fromCharCode(null==d?c:d);"\b"!=e&&(zf(b,a,e)||b.display.input.onKeyPress(a))}}}function Ef(a,b){var c=+new Date;return Zh&&Zh.compare(c,a,b)?(Yh=Zh=null,"triple"):Yh&&Yh.compare(c,a,b)?(Zh=new Xh(c,a,b),Yh=null,"double"):(Yh=new Xh(c,a,b),Zh=null,"single")}function Ff(a){var b=this,c=b.display;if(!(Ca(b,a)||c.activeTouch&&c.input.supportsTouch())){if(c.input.ensurePolled(),c.shift=a.shiftKey,Kb(c,a))return void(wg||(c.scroller.draggable=!1,setTimeout((function(){return c.scroller.draggable=!0}),100)));if(!Of(b,a)){var d=zc(b,a),e=La(a),f=d?Ef(d,e):"single";window.focus(),1==e&&b.state.selectingText&&b.state.selectingText(a),d&&Gf(b,e,d,f,a)||(1==e?d?If(b,d,f,a):Ka(a)==c.scroller&&Ga(a):2==e?(d&&oe(b.doc,d),setTimeout((function(){return c.input.focus()}),20)):3==e&&(Mg?Pf(b,a):Ic(b)))}}}function Gf(a,b,c,d,e){var f="Click";return"double"==d?f="Double"+f:"triple"==d&&(f="Triple"+f),f=(1==b?"Left":2==b?"Middle":"Right")+f,wf(a,jf(f,e),e,(function(b){if("string"==typeof b&&(b=Th[b]),!b)return!1;var d=!1;try{a.isReadOnly()&&(a.state.suppressEdits=!0),d=b(a,c)!=Tg}finally{a.state.suppressEdits=!1}return d}))}function Hf(a,b,c){var d=a.getOption("configureMouse"),e=d?d(a,b,c):{};if(null==e.unit){var f=Hg?c.shiftKey&&c.metaKey:c.altKey;e.unit=f?"rectangle":"single"==b?"char":"double"==b?"word":"line"}return(null==e.extend||a.doc.extend)&&(e.extend=a.doc.extend||c.shiftKey),null==e.addNew&&(e.addNew=Gg?c.metaKey:c.ctrlKey),null==e.moveOnDrag&&(e.moveOnDrag=!(Gg?c.altKey:c.ctrlKey)),e}function If(a,b,c,d){ug?setTimeout(j(Hc,a),0):a.curOp.focus=g();var e,f=Hf(a,c,d),h=a.doc.sel;a.options.dragDrop&&eh&&!a.isReadOnly()&&"single"==c&&(e=h.contains(b))>-1&&(K((e=h.ranges[e]).from(),b)<0||b.xRel>0)&&(K(e.to(),b)>0||b.xRel<0)?Jf(a,d,b,f):Lf(a,d,b,f)}function Jf(a,b,c,d){var e=a.display,f=!1,g=od(a,(function(b){wg&&(e.scroller.draggable=!1),a.state.draggingText=!1,Aa(e.wrapper.ownerDocument,"mouseup",g),Aa(e.wrapper.ownerDocument,"mousemove",h),Aa(e.scroller,"dragstart",i),Aa(e.scroller,"drop",g),f||(Ga(b),d.addNew||oe(a.doc,c,null,null,d.extend),wg||ug&&9==vg?setTimeout((function(){e.wrapper.ownerDocument.body.focus(),e.input.focus()}),20):e.input.focus())})),h=function(a){f=f||Math.abs(b.clientX-a.clientX)+Math.abs(b.clientY-a.clientY)>=10},i=function(){return f=!0};wg&&(e.scroller.draggable=!0),a.state.draggingText=g,g.copy=!d.moveOnDrag,e.scroller.dragDrop&&e.scroller.dragDrop(),dh(e.wrapper.ownerDocument,"mouseup",g),dh(e.wrapper.ownerDocument,"mousemove",h),dh(e.scroller,"dragstart",i),dh(e.scroller,"drop",g),Ic(a),setTimeout((function(){return e.input.focus()}),20)}function Kf(a,b,c){if("char"==c)return new Fh(b,b);if("word"==c)return a.findWordAt(b);if("line"==c)return new Fh(J(b.line,0),Q(a.doc,J(b.line+1,0)));var d=c(a,b);return new Fh(d.from,d.to)}function Lf(a,b,c,d){function e(b){if(0!=K(r,b))if(r=b,"rectangle"==d.unit){for(var e=[],f=a.options.tabSize,g=l(B(j,c.line).text,c.ch,f),h=l(B(j,b.line).text,b.ch,f),i=Math.min(g,h),p=Math.max(g,h),q=Math.min(c.line,b.line),s=Math.min(a.lastLine(),Math.max(c.line,b.line));q<=s;q++){var t=B(j,q).text,u=n(t,i,f);i==p?e.push(new Fh(J(q,u),J(q,u))):t.length>u&&e.push(new Fh(J(q,u),J(q,n(t,p,f))))}e.length||e.push(new Fh(c,c)),ue(j,Nd(o.ranges.slice(0,m).concat(e),m),{origin:"*mouse",scroll:!1}),a.scrollIntoView(b)}else{var v,w=k,x=Kf(a,b,d.unit),y=w.anchor;K(x.anchor,y)>0?(v=x.head,y=O(w.from(),x.anchor)):(v=x.anchor,y=N(w.to(),x.head));var z=o.ranges.slice(0);z[m]=Mf(a,new Fh(Q(j,y),v)),ue(j,Nd(z,m),Vg)}}function f(b){var c=++t,h=zc(a,b,!0,"rectangle"==d.unit);if(h)if(0!=K(h,r)){a.curOp.focus=g(),e(h);var k=Nc(i,j);(h.line>=k.to||h.line<k.from)&&setTimeout(od(a,(function(){t==c&&f(b)})),150)}else{var l=b.clientY<s.top?-20:b.clientY>s.bottom?20:0;l&&setTimeout(od(a,(function(){t==c&&(i.scroller.scrollTop+=l,f(b))})),50)}}function h(b){a.state.selectingText=!1,t=1/0,Ga(b),i.input.focus(),Aa(i.wrapper.ownerDocument,"mousemove",u),Aa(i.wrapper.ownerDocument,"mouseup",v),j.history.lastSelOrigin=null}var i=a.display,j=a.doc;Ga(b);var k,m,o=j.sel,p=o.ranges;if(d.addNew&&!d.extend?(m=j.sel.contains(c),k=m>-1?p[m]:new Fh(c,c)):(k=j.sel.primary(),m=j.sel.primIndex),"rectangle"==d.unit)d.addNew||(k=new Fh(c,c)),c=zc(a,b,!0,!0),m=-1;else{var q=Kf(a,c,d.unit);k=d.extend?ne(k,q.anchor,q.head,d.extend):q}d.addNew?m==-1?(m=p.length,ue(j,Nd(p.concat([k]),m),{scroll:!1,origin:"*mouse"})):p.length>1&&p[m].empty()&&"char"==d.unit&&!d.extend?(ue(j,Nd(p.slice(0,m).concat(p.slice(m+1)),0),{scroll:!1,origin:"*mouse"}),o=j.sel):qe(j,m,k,Vg):(m=0,ue(j,new Eh([k],0),Vg),o=j.sel);var r=c,s=i.wrapper.getBoundingClientRect(),t=0,u=od(a,(function(a){0!==a.buttons&&La(a)?f(a):h(a)})),v=od(a,h);a.state.selectingText=v,dh(i.wrapper.ownerDocument,"mousemove",u),dh(i.wrapper.ownerDocument,"mouseup",v)}function Mf(a,b){var c=b.anchor,d=b.head,e=B(a.doc,c.line);if(0==K(c,d)&&c.sticky==d.sticky)return b;var f=ya(e);if(!f)return b;var g=xa(f,c.ch,c.sticky),h=f[g];if(h.from!=c.ch&&h.to!=c.ch)return b;var i=g+(h.from==c.ch==(1!=h.level)?0:1);if(0==i||i==f.length)return b;var j;if(d.line!=c.line)j=(d.line-c.line)*("ltr"==a.doc.direction?1:-1)>0;else{var k=xa(f,d.ch,d.sticky),l=k-g||(d.ch-c.ch)*(1==h.level?-1:1);j=k==i-1||k==i?l<0:l>0}var m=f[i+(j?-1:0)],n=j==(1==m.level),o=n?m.from:m.to,p=n?"after":"before";return c.ch==o&&c.sticky==p?b:new Fh(new J(c.line,o,p),d)}function Nf(a,b,c,d){var e,f;if(b.touches)e=b.touches[0].clientX,f=b.touches[0].clientY;else try{e=b.clientX,f=b.clientY}catch(a){return!1}if(e>=Math.floor(a.display.gutters.getBoundingClientRect().right))return!1;d&&Ga(b);var g=a.display,h=g.lineDiv.getBoundingClientRect();if(f>h.bottom||!Ea(a,c))return Ia(b);f-=h.top-g.viewOffset;for(var i=0;i<a.options.gutters.length;++i){var j=g.gutters.childNodes[i];if(j&&j.getBoundingClientRect().right>=e){var k=G(a.doc,f),l=a.options.gutters[i];return Ba(a,c,a,k,l,b),Ia(b)}}}function Of(a,b){return Nf(a,b,"gutterClick",!0)}function Pf(a,b){Kb(a.display,b)||Qf(a,b)||Ca(a,b,"contextmenu")||a.display.input.onContextMenu(b)}function Qf(a,b){return!!Ea(a,"gutterContextMenu")&&Nf(a,b,"gutterContextMenu",!1)}function Rf(a){a.display.wrapper.className=a.display.wrapper.className.replace(/\s*cm-s-\S+/g,"")+a.options.theme.replace(/(^|\s)\s*/g," cm-s-"),cc(a)}function Sf(a){function b(b,d,e,f){a.defaults[b]=d,e&&(c[b]=f?function(a,b,c){c!=$h&&e(a,b,c)}:e)}var c=a.optionHandlers;a.defineOption=b,a.Init=$h,b("value","",(function(a,b){return a.setValue(b)}),!0),b("mode",null,(function(a,b){a.doc.modeOption=b,Ud(a)}),!0),b("indentUnit",2,Ud,!0),b("indentWithTabs",!1),b("smartIndent",!0),b("tabSize",4,(function(a){Vd(a),cc(a),rd(a)}),!0),b("lineSeparator",null,(function(a,b){if(a.doc.lineSep=b,b){var c=[],d=a.doc.first;a.doc.iter((function(a){for(var e=0;;){var f=a.text.indexOf(b,e);if(f==-1)break;e=f+b.length,c.push(J(d,f))}d++}));for(var e=c.length-1;e>=0;e--)Ke(a.doc,b,c[e],J(c[e].line,c[e].ch+b.length))}})),b("specialChars",/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g,(function(a,b,c){a.state.specialChars=new RegExp(b.source+(b.test("\t")?"":"|\t"),"g"),c!=$h&&a.refresh()})),b("specialCharPlaceholder",kb,(function(a){return a.refresh()}),!0),b("electricChars",!0),b("inputStyle",Fg?"contenteditable":"textarea",(function(){throw new Error("inputStyle can not (yet) be changed in a running editor")}),!0),b("spellcheck",!1,(function(a,b){return a.getInputField().spellcheck=b}),!0),b("rtlMoveVisually",!Ig),b("wholeLineUpdateBefore",!0),b("theme","default",(function(a){Rf(a),Tf(a)}),!0),b("keyMap","default",(function(a,b,c){var d=lf(b),e=c!=$h&&lf(c);e&&e.detach&&e.detach(a,d),d.attach&&d.attach(a,e||null)})),b("extraKeys",null),b("configureMouse",null),b("lineWrapping",!1,Vf,!0),b("gutters",[],(function(a){Jd(a.options),Tf(a)}),!0),b("fixedGutter",!0,(function(a,b){a.display.gutters.style.left=b?wc(a.display)+"px":"0",a.refresh()}),!0),b("coverGutterNextToScrollbar",!1,(function(a){return cd(a)}),!0),b("scrollbarStyle","native",(function(a){ed(a),cd(a),a.display.scrollbars.setScrollTop(a.doc.scrollTop),a.display.scrollbars.setScrollLeft(a.doc.scrollLeft)}),!0),b("lineNumbers",!1,(function(a){Jd(a.options),Tf(a)}),!0),b("firstLineNumber",1,Tf,!0),b("lineNumberFormatter",(function(a){return a}),Tf,!0),b("showCursorWhenSelecting",!1,Bc,!0),b("resetSelectionOnContextMenu",!0),b("lineWiseCopyCut",!0),b("pasteLinesPerSelection",!0),b("readOnly",!1,(function(a,b){"nocursor"==b&&(Kc(a),a.display.input.blur()),a.display.input.readOnlyChanged(b)})),b("disableInput",!1,(function(a,b){b||a.display.input.reset();
+}),!0),b("dragDrop",!0,Uf),b("allowDropFileTypes",null),b("cursorBlinkRate",530),b("cursorScrollMargin",0),b("cursorHeight",1,Bc,!0),b("singleCursorHeightPerLine",!0,Bc,!0),b("workTime",100),b("workDelay",100),b("flattenSpans",!0,Vd,!0),b("addModeClass",!1,Vd,!0),b("pollInterval",100),b("undoDepth",200,(function(a,b){return a.doc.history.undoDepth=b})),b("historyEventDelay",1250),b("viewportMargin",10,(function(a){return a.refresh()}),!0),b("maxHighlightLength",1e4,Vd,!0),b("moveInputWithCursor",!0,(function(a,b){b||a.display.input.resetPosition()})),b("tabindex",null,(function(a,b){return a.display.input.getField().tabIndex=b||""})),b("autofocus",null),b("direction","ltr",(function(a,b){return a.doc.setDirection(b)}),!0)}function Tf(a){Id(a),rd(a),Oc(a)}function Uf(a,b,c){var d=c&&c!=$h;if(!b!=!d){var e=a.display.dragFunctions,f=b?dh:Aa;f(a.display.scroller,"dragstart",e.start),f(a.display.scroller,"dragenter",e.enter),f(a.display.scroller,"dragover",e.over),f(a.display.scroller,"dragleave",e.leave),f(a.display.scroller,"drop",e.drop)}}function Vf(a){a.options.lineWrapping?(h(a.display.wrapper,"CodeMirror-wrap"),a.display.sizer.style.minWidth="",a.display.sizerWidth=null):(Ng(a.display.wrapper,"CodeMirror-wrap"),va(a)),yc(a),rd(a),cc(a),setTimeout((function(){return cd(a)}),100)}function Wf(a,b){var c=this;if(!(this instanceof Wf))return new Wf(a,b);this.options=b=b?k(b):{},k(_h,b,!1),Jd(b);var d=b.value;"string"==typeof d&&(d=new Lh(d,b.mode,null,b.lineSeparator,b.direction)),this.doc=d;var e=new Wf.inputStyles[b.inputStyle](this),f=this.display=new A(a,d,e);f.wrapper.CodeMirror=this,Id(this),Rf(this),b.lineWrapping&&(this.display.wrapper.className+=" CodeMirror-wrap"),ed(this),this.state={keyMaps:[],overlays:[],modeGen:0,overwrite:!1,delayingBlurEvent:!1,focused:!1,suppressEdits:!1,pasteIncoming:!1,cutIncoming:!1,selectingText:!1,draggingText:!1,highlight:new Pg,keySeq:null,specialChars:null},b.autofocus&&!Fg&&f.input.focus(),ug&&vg<11&&setTimeout((function(){return c.display.input.reset(!0)}),20),Xf(this),bf(),fd(this),this.curOp.forceUpdate=!0,Zd(this,d),b.autofocus&&!Fg||this.hasFocus()?setTimeout(j(Jc,this),20):Kc(this);for(var g in ai)ai.hasOwnProperty(g)&&ai[g](c,b[g],$h);Pc(this),b.finishInit&&b.finishInit(this);for(var h=0;h<bi.length;++h)bi[h](c);gd(this),wg&&b.lineWrapping&&"optimizelegibility"==getComputedStyle(f.lineDiv).textRendering&&(f.lineDiv.style.textRendering="auto")}function Xf(a){function b(){e.activeTouch&&(f=setTimeout((function(){return e.activeTouch=null}),1e3),g=e.activeTouch,g.end=+new Date)}function c(a){if(1!=a.touches.length)return!1;var b=a.touches[0];return b.radiusX<=1&&b.radiusY<=1}function d(a,b){if(null==b.left)return!0;var c=b.left-a.left,d=b.top-a.top;return c*c+d*d>400}var e=a.display;dh(e.scroller,"mousedown",od(a,Ff)),ug&&vg<11?dh(e.scroller,"dblclick",od(a,(function(b){if(!Ca(a,b)){var c=zc(a,b);if(c&&!Of(a,b)&&!Kb(a.display,b)){Ga(b);var d=a.findWordAt(c);oe(a.doc,d.anchor,d.head)}}}))):dh(e.scroller,"dblclick",(function(b){return Ca(a,b)||Ga(b)})),Mg||dh(e.scroller,"contextmenu",(function(b){return Pf(a,b)}));var f,g={end:0};dh(e.scroller,"touchstart",(function(b){if(!Ca(a,b)&&!c(b)&&!Of(a,b)){e.input.ensurePolled(),clearTimeout(f);var d=+new Date;e.activeTouch={start:d,moved:!1,prev:d-g.end<=300?g:null},1==b.touches.length&&(e.activeTouch.left=b.touches[0].pageX,e.activeTouch.top=b.touches[0].pageY)}})),dh(e.scroller,"touchmove",(function(){e.activeTouch&&(e.activeTouch.moved=!0)})),dh(e.scroller,"touchend",(function(c){var f=e.activeTouch;if(f&&!Kb(e,c)&&null!=f.left&&!f.moved&&new Date-f.start<300){var g,h=a.coordsChar(e.activeTouch,"page");g=!f.prev||d(f,f.prev)?new Fh(h,h):!f.prev.prev||d(f,f.prev.prev)?a.findWordAt(h):new Fh(J(h.line,0),Q(a.doc,J(h.line+1,0))),a.setSelection(g.anchor,g.head),a.focus(),Ga(c)}b()})),dh(e.scroller,"touchcancel",b),dh(e.scroller,"scroll",(function(){e.scroller.clientHeight&&($c(a,e.scroller.scrollTop),ad(a,e.scroller.scrollLeft,!0),Ba(a,"scroll",a))})),dh(e.scroller,"mousewheel",(function(b){return Md(a,b)})),dh(e.scroller,"DOMMouseScroll",(function(b){return Md(a,b)})),dh(e.wrapper,"scroll",(function(){return e.wrapper.scrollTop=e.wrapper.scrollLeft=0})),e.dragFunctions={enter:function(b){Ca(a,b)||Ja(b)},over:function(b){Ca(a,b)||($e(a,b),Ja(b))},start:function(b){return Ze(a,b)},drop:od(a,Ye),leave:function(b){Ca(a,b)||_e(a)}};var h=e.input.getField();dh(h,"keyup",(function(b){return Cf.call(a,b)})),dh(h,"keydown",od(a,Af)),dh(h,"keypress",od(a,Df)),dh(h,"focus",(function(b){return Jc(a,b)})),dh(h,"blur",(function(b){return Kc(a,b)}))}function Yf(a,b,c,d){var e,f=a.doc;null==c&&(c="add"),"smart"==c&&(f.mode.indent?e=Za(a,b).state:c="prev");var g=a.options.tabSize,h=B(f,b),i=l(h.text,null,g);h.stateAfter&&(h.stateAfter=null);var j,k=h.text.match(/^\s*/)[0];if(d||/\S/.test(h.text)){if("smart"==c&&(j=f.mode.indent(e,h.text.slice(k.length),h.text),j==Tg||j>150)){if(!d)return;c="prev"}}else j=0,c="not";"prev"==c?j=b>f.first?l(B(f,b-1).text,null,g):0:"add"==c?j=i+a.options.indentUnit:"subtract"==c?j=i-a.options.indentUnit:"number"==typeof c&&(j=i+c),j=Math.max(0,j);var m="",n=0;if(a.options.indentWithTabs)for(var p=Math.floor(j/g);p;--p)n+=g,m+="\t";if(n<j&&(m+=o(j-n)),m!=k)return Ke(f,m,J(b,0),J(b,k.length),"+input"),h.stateAfter=null,!0;for(var q=0;q<f.sel.ranges.length;q++){var r=f.sel.ranges[q];if(r.head.line==b&&r.head.ch<k.length){var s=J(b,k.length);qe(f,q,new Fh(s,s));break}}}function Zf(a){ci=a}function $f(a,b,c,d,e){var f=a.doc;a.display.shift=!1,d||(d=f.sel);var g=a.state.pasteIncoming||"paste"==e,h=fh(b),i=null;if(g&&d.ranges.length>1)if(ci&&ci.text.join("\n")==b){if(d.ranges.length%ci.text.length==0){i=[];for(var j=0;j<ci.text.length;j++)i.push(f.splitLines(ci.text[j]))}}else h.length==d.ranges.length&&a.options.pasteLinesPerSelection&&(i=q(h,(function(a){return[a]})));for(var k,l=d.ranges.length-1;l>=0;l--){var m=d.ranges[l],n=m.from(),o=m.to();m.empty()&&(c&&c>0?n=J(n.line,n.ch-c):a.state.overwrite&&!g?o=J(o.line,Math.min(B(f,o.line).text.length,o.ch+p(h).length)):ci&&ci.lineWise&&ci.text.join("\n")==b&&(n=o=J(n.line,0))),k=a.curOp.updateInput;var r={from:n,to:o,text:i?i[l%i.length]:h,origin:e||(g?"paste":a.state.cutIncoming?"cut":"+input")};Ee(a.doc,r),vb(a,"inputRead",a,r)}b&&!g&&ag(a,b),Vc(a),a.curOp.updateInput=k,a.curOp.typing=!0,a.state.pasteIncoming=a.state.cutIncoming=!1}function _f(a,b){var c=a.clipboardData&&a.clipboardData.getData("Text");if(c)return a.preventDefault(),b.isReadOnly()||b.options.disableInput||nd(b,(function(){return $f(b,c,0,null,"paste")})),!0}function ag(a,b){if(a.options.electricChars&&a.options.smartIndent)for(var c=a.doc.sel,d=c.ranges.length-1;d>=0;d--){var e=c.ranges[d];if(!(e.head.ch>100||d&&c.ranges[d-1].head.line==e.head.line)){var f=a.getModeAt(e.head),g=!1;if(f.electricChars){for(var h=0;h<f.electricChars.length;h++)if(b.indexOf(f.electricChars.charAt(h))>-1){g=Yf(a,e.head.line,"smart");break}}else f.electricInput&&f.electricInput.test(B(a.doc,e.head.line).text.slice(0,e.head.ch))&&(g=Yf(a,e.head.line,"smart"));g&&vb(a,"electricInput",a,e.head.line)}}}function bg(a){for(var b=[],c=[],d=0;d<a.doc.sel.ranges.length;d++){var e=a.doc.sel.ranges[d].head.line,f={anchor:J(e,0),head:J(e+1,0)};c.push(f),b.push(a.getRange(f.anchor,f.head))}return{text:b,ranges:c}}function cg(a,b){a.setAttribute("autocorrect","off"),a.setAttribute("autocapitalize","off"),a.setAttribute("spellcheck",!!b)}function dg(){var a=d("textarea",null,null,"position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none"),b=d("div",[a],null,"overflow: hidden; position: relative; width: 3px; height: 0px;");return wg?a.style.width="1000px":a.setAttribute("wrap","off"),Dg&&(a.style.border="1px solid black"),cg(a),b}function eg(a,b,c,d,e){function f(){var d=b.line+c;return!(d<a.first||d>=a.first+a.size)&&(b=new J(d,b.ch,b.sticky),j=B(a,d))}function g(d){var g;if(g=e?qf(a.cm,j,b,c):of(j,b,c),null==g){if(d||!f())return!1;b=pf(e,a.cm,j,b.line,c)}else b=g;return!0}var h=b,i=c,j=B(a,b.line);if("char"==d)g();else if("column"==d)g(!0);else if("word"==d||"group"==d)for(var k=null,l="group"==d,m=a.cm&&a.cm.getHelper(b,"wordChars"),n=!0;!(c<0)||g(!n);n=!1){var o=j.text.charAt(b.ch)||"\n",p=v(o,m)?"w":l&&"\n"==o?"n":!l||/\s/.test(o)?null:"p";if(!l||n||p||(p="s"),k&&k!=p){c<0&&(c=1,g(),b.sticky="after");break}if(p&&(k=p),c>0&&!g(!n))break}var q=Ae(a,b,h,i,!0);return L(h,q)&&(q.hitSide=!0),q}function fg(a,b,c,d){var e,f=a.doc,g=b.left;if("page"==d){var h=Math.min(a.display.wrapper.clientHeight,window.innerHeight||document.documentElement.clientHeight),i=Math.max(h-.5*tc(a.display),3);e=(c>0?b.bottom:b.top)+c*i}else"line"==d&&(e=c>0?b.bottom+3:b.top-3);for(var j;j=mc(a,g,e),j.outside;){if(c<0?e<=0:e>=f.height){j.hitSide=!0;break}e+=5*c}return j}function gg(a,b){var c=Vb(a,b.line);if(!c||c.hidden)return null;var d=B(a.doc,b.line),e=Sb(c,d,b.line),f=ya(d,a.doc.direction),g="left";if(f){var h=xa(f,b.ch);g=h%2?"right":"left"}var i=Yb(e.map,b.ch,g);return i.offset="right"==i.collapse?i.end:i.start,i}function hg(a){for(var b=a;b;b=b.parentNode)if(/CodeMirror-gutter-wrapper/.test(b.className))return!0;return!1}function ig(a,b){return b&&(a.bad=!0),a}function jg(a,b,c,d,e){function f(a){return function(b){return b.id==a}}function g(){k&&(j+=l,m&&(j+=l),k=m=!1)}function h(a){a&&(g(),j+=a)}function i(b){if(1==b.nodeType){var c=b.getAttribute("cm-text");if(c)return void h(c);var j,n=b.getAttribute("cm-marker");if(n){var o=a.findMarks(J(d,0),J(e+1,0),f(+n));return void(o.length&&(j=o[0].find(0))&&h(C(a.doc,j.from,j.to).join(l)))}if("false"==b.getAttribute("contenteditable"))return;var p=/^(pre|div|p|li|table|br)$/i.test(b.nodeName);if(!/^br$/i.test(b.nodeName)&&0==b.textContent.length)return;p&&g();for(var q=0;q<b.childNodes.length;q++)i(b.childNodes[q]);/^(pre|p)$/i.test(b.nodeName)&&(m=!0),p&&(k=!0)}else 3==b.nodeType&&h(b.nodeValue.replace(/\u200b/g,"").replace(/\u00a0/g," "))}for(var j="",k=!1,l=a.doc.lineSeparator(),m=!1;i(b),b!=c;)b=b.nextSibling,m=!1;return j}function kg(a,b,c){var d;if(b==a.display.lineDiv){if(d=a.display.lineDiv.childNodes[c],!d)return ig(a.clipPos(J(a.display.viewTo-1)),!0);b=null,c=0}else for(d=b;;d=d.parentNode){if(!d||d==a.display.lineDiv)return null;if(d.parentNode&&d.parentNode==a.display.lineDiv)break}for(var e=0;e<a.display.view.length;e++){var f=a.display.view[e];if(f.node==d)return lg(f,b,c)}}function lg(a,b,c){function d(b,c,d){for(var e=-1;e<(l?l.length:0);e++)for(var f=e<0?k.map:l[e],g=0;g<f.length;g+=3){var h=f[g+2];if(h==b||h==c){var i=F(e<0?a.line:a.rest[e]),j=f[g]+d;return(d<0||h!=b)&&(j=f[g+(d?1:0)]),J(i,j)}}}var e=a.text.firstChild,g=!1;if(!b||!f(e,b))return ig(J(F(a.line),0),!0);if(b==e&&(g=!0,b=e.childNodes[c],c=0,!b)){var h=a.rest?p(a.rest):a.line;return ig(J(F(h),h.text.length),g)}var i=3==b.nodeType?b:null,j=b;for(i||1!=b.childNodes.length||3!=b.firstChild.nodeType||(i=b.firstChild,c&&(c=i.nodeValue.length));j.parentNode!=e;)j=j.parentNode;var k=a.measure,l=k.maps,m=d(i,j,c);if(m)return ig(m,g);for(var n=j.nextSibling,o=i?i.nodeValue.length-c:0;n;n=n.nextSibling){if(m=d(n,n.firstChild,0))return ig(J(m.line,m.ch-o),g);o+=n.textContent.length}for(var q=j.previousSibling,r=c;q;q=q.previousSibling){if(m=d(q,q.firstChild,-1))return ig(J(m.line,m.ch+r),g);r+=q.textContent.length}}function mg(a,b){function c(){a.value=i.getValue()}if(b=b?k(b):{},b.value=a.value,!b.tabindex&&a.tabIndex&&(b.tabindex=a.tabIndex),!b.placeholder&&a.placeholder&&(b.placeholder=a.placeholder),null==b.autofocus){var d=g();b.autofocus=d==a||null!=a.getAttribute("autofocus")&&d==document.body}var e;if(a.form&&(dh(a.form,"submit",c),!b.leaveSubmitMethodAlone)){var f=a.form;e=f.submit;try{var h=f.submit=function(){c(),f.submit=e,f.submit(),f.submit=h}}catch(a){}}b.finishInit=function(b){b.save=c,b.getTextArea=function(){return a},b.toTextArea=function(){b.toTextArea=isNaN,c(),a.parentNode.removeChild(b.getWrapperElement()),a.style.display="",a.form&&(Aa(a.form,"submit",c),"function"==typeof a.form.submit&&(a.form.submit=e))}},a.style.display="none";var i=Wf((function(b){return a.parentNode.insertBefore(b,a.nextSibling)}),b);return i}function ng(a){a.off=Aa,a.on=dh,a.wheelEventPixels=Ld,a.Doc=Lh,a.splitLines=fh,a.countColumn=l,a.findColumn=n,a.isWordChar=u,a.Pass=Tg,a.signal=Ba,a.Line=qh,a.changeEnd=Pd,a.scrollbarModel=zh,a.Pos=J,a.cmpPos=K,a.modes=jh,a.mimeModes=kh,a.resolveMode=Ra,a.getMode=Sa,a.modeExtensions=lh,a.extendMode=Ta,a.copyState=Ua,a.startState=Wa,a.innerMode=Va,a.commands=Th,a.keyMap=Sh,a.keyName=kf,a.isModifierKey=hf,a.lookupKey=gf,a.normalizeKeyMap=ff,a.StringStream=mh,a.SharedTextMarker=Jh,a.TextMarker=Ih,a.LineWidget=Gh,a.e_preventDefault=Ga,a.e_stopPropagation=Ha,a.e_stop=Ja,a.addClass=h,a.contains=f,a.rmClass=Ng,a.keyNames=Oh}var og=navigator.userAgent,pg=navigator.platform,qg=/gecko\/\d/i.test(og),rg=/MSIE \d/.test(og),sg=/Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(og),tg=/Edge\/(\d+)/.exec(og),ug=rg||sg||tg,vg=ug&&(rg?document.documentMode||6:+(tg||sg)[1]),wg=!tg&&/WebKit\//.test(og),xg=wg&&/Qt\/\d+\.\d+/.test(og),yg=!tg&&/Chrome\//.test(og),zg=/Opera\//.test(og),Ag=/Apple Computer/.test(navigator.vendor),Bg=/Mac OS X 1\d\D([8-9]|\d\d)\D/.test(og),Cg=/PhantomJS/.test(og),Dg=!tg&&/AppleWebKit/.test(og)&&/Mobile\/\w+/.test(og),Eg=/Android/.test(og),Fg=Dg||Eg||/webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(og),Gg=Dg||/Mac/.test(pg),Hg=/\bCrOS\b/.test(og),Ig=/win/i.test(pg),Jg=zg&&og.match(/Version\/(\d*\.\d*)/);Jg&&(Jg=Number(Jg[1])),Jg&&Jg>=15&&(zg=!1,wg=!0);var Kg,Lg=Gg&&(xg||zg&&(null==Jg||Jg<12.11)),Mg=qg||ug&&vg>=9,Ng=function(b,c){var d=b.className,e=a(c).exec(d);if(e){var f=d.slice(e.index+e[0].length);b.className=d.slice(0,e.index)+(f?e[1]+f:"")}};Kg=document.createRange?function(a,b,c,d){var e=document.createRange();return e.setEnd(d||a,c),e.setStart(a,b),e}:function(a,b,c){var d=document.body.createTextRange();try{d.moveToElementText(a.parentNode)}catch(a){return d}return d.collapse(!0),d.moveEnd("character",c),d.moveStart("character",b),d};var Og=function(a){a.select()};Dg?Og=function(a){a.selectionStart=0,a.selectionEnd=a.value.length}:ug&&(Og=function(a){try{a.select()}catch(a){}});var Pg=function(){this.id=null};Pg.prototype.set=function(a,b){clearTimeout(this.id),this.id=setTimeout(b,a)};var Qg,Rg,Sg=30,Tg={toString:function(){return"CodeMirror.Pass"}},Ug={scroll:!1},Vg={origin:"*mouse"},Wg={origin:"+move"},Xg=[""],Yg=/[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/,Zg=/[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/,$g=!1,_g=!1,ah=null,bh=(function(){function a(a){return a<=247?c.charAt(a):1424<=a&&a<=1524?"R":1536<=a&&a<=1785?d.charAt(a-1536):1774<=a&&a<=2220?"r":8192<=a&&a<=8203?"w":8204==a?"b":"L"}function b(a,b,c){this.level=a,this.from=b,this.to=c}var c="bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN",d="nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111",e=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/,f=/[stwN]/,g=/[LRr]/,h=/[Lb1n]/,i=/[1n]/;return function(c,d){var j="ltr"==d?"L":"R";if(0==c.length||"ltr"==d&&!e.test(c))return!1;for(var k=c.length,l=[],m=0;m<k;++m)l.push(a(c.charCodeAt(m)));for(var n=0,o=j;n<k;++n){var q=l[n];"m"==q?l[n]=o:o=q}for(var r=0,s=j;r<k;++r){var t=l[r];"1"==t&&"r"==s?l[r]="n":g.test(t)&&(s=t,"r"==t&&(l[r]="R"))}for(var u=1,v=l[0];u<k-1;++u){var w=l[u];"+"==w&&"1"==v&&"1"==l[u+1]?l[u]="1":","!=w||v!=l[u+1]||"1"!=v&&"n"!=v||(l[u]=v),v=w}for(var x=0;x<k;++x){var y=l[x];if(","==y)l[x]="N";else if("%"==y){var z=void 0;for(z=x+1;z<k&&"%"==l[z];++z);for(var A=x&&"!"==l[x-1]||z<k&&"1"==l[z]?"1":"N",B=x;B<z;++B)l[B]=A;x=z-1}}for(var C=0,D=j;C<k;++C){var E=l[C];"L"==D&&"1"==E?l[C]="L":g.test(E)&&(D=E)}for(var F=0;F<k;++F)if(f.test(l[F])){var G=void 0;for(G=F+1;G<k&&f.test(l[G]);++G);for(var H="L"==(F?l[F-1]:j),I="L"==(G<k?l[G]:j),J=H==I?H?"L":"R":j,K=F;K<G;++K)l[K]=J;F=G-1}for(var L,M=[],N=0;N<k;)if(h.test(l[N])){var O=N;for(++N;N<k&&h.test(l[N]);++N);M.push(new b(0,O,N))}else{var P=N,Q=M.length;for(++N;N<k&&"L"!=l[N];++N);for(var R=P;R<N;)if(i.test(l[R])){P<R&&M.splice(Q,0,new b(1,P,R));var S=R;for(++R;R<N&&i.test(l[R]);++R);M.splice(Q,0,new b(2,S,R)),P=R}else++R;P<N&&M.splice(Q,0,new b(1,P,N))}return"ltr"==d&&(1==M[0].level&&(L=c.match(/^\s+/))&&(M[0].from=L[0].length,M.unshift(new b(0,0,L[0].length))),1==p(M).level&&(L=c.match(/\s+$/))&&(p(M).to-=L[0].length,M.push(new b(0,k-L[0].length,k)))),"rtl"==d?M.reverse():M}})(),ch=[],dh=function(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+b,c);else{var d=a._handlers||(a._handlers={});d[b]=(d[b]||ch).concat(c)}},eh=(function(){if(ug&&vg<9)return!1;var a=d("div");return"draggable"in a||"dragDrop"in a})(),fh=3!="\n\nb".split(/\n/).length?function(a){for(var b=0,c=[],d=a.length;b<=d;){var e=a.indexOf("\n",b);e==-1&&(e=a.length);var f=a.slice(b,"\r"==a.charAt(e-1)?e-1:e),g=f.indexOf("\r");g!=-1?(c.push(f.slice(0,g)),b+=g+1):(c.push(f),b=e+1)}return c}:function(a){return a.split(/\r\n?|\n/)},gh=window.getSelection?function(a){try{return a.selectionStart!=a.selectionEnd}catch(a){return!1}}:function(a){var b;try{b=a.ownerDocument.selection.createRange()}catch(a){}return!(!b||b.parentElement()!=a)&&0!=b.compareEndPoints("StartToEnd",b)},hh=(function(){var a=d("div");return"oncopy"in a||(a.setAttribute("oncopy","return;"),"function"==typeof a.oncopy)})(),ih=null,jh={},kh={},lh={},mh=function(a,b,c){this.pos=this.start=0,this.string=a,this.tabSize=b||8,this.lastColumnPos=this.lastColumnValue=0,this.lineStart=0,this.lineOracle=c};mh.prototype.eol=function(){return this.pos>=this.string.length},mh.prototype.sol=function(){return this.pos==this.lineStart},mh.prototype.peek=function(){return this.string.charAt(this.pos)||void 0},mh.prototype.next=function(){if(this.pos<this.string.length)return this.string.charAt(this.pos++)},mh.prototype.eat=function(a){var b,c=this.string.charAt(this.pos);if(b="string"==typeof a?c==a:c&&(a.test?a.test(c):a(c)))return++this.pos,c},mh.prototype.eatWhile=function(a){for(var b=this.pos;this.eat(a););return this.pos>b},mh.prototype.eatSpace=function(){for(var a=this,b=this.pos;/[\s\u00a0]/.test(this.string.charAt(this.pos));)++a.pos;return this.pos>b},mh.prototype.skipToEnd=function(){this.pos=this.string.length},mh.prototype.skipTo=function(a){var b=this.string.indexOf(a,this.pos);if(b>-1)return this.pos=b,!0},mh.prototype.backUp=function(a){this.pos-=a},mh.prototype.column=function(){return this.lastColumnPos<this.start&&(this.lastColumnValue=l(this.string,this.start,this.tabSize,this.lastColumnPos,this.lastColumnValue),this.lastColumnPos=this.start),this.lastColumnValue-(this.lineStart?l(this.string,this.lineStart,this.tabSize):0)},mh.prototype.indentation=function(){return l(this.string,null,this.tabSize)-(this.lineStart?l(this.string,this.lineStart,this.tabSize):0)},mh.prototype.match=function(a,b,c){if("string"!=typeof a){var d=this.string.slice(this.pos).match(a);return d&&d.index>0?null:(d&&b!==!1&&(this.pos+=d[0].length),d)}var e=function(a){return c?a.toLowerCase():a},f=this.string.substr(this.pos,a.length);if(e(f)==e(a))return b!==!1&&(this.pos+=a.length),!0},mh.prototype.current=function(){return this.string.slice(this.start,this.pos)},mh.prototype.hideFirstChars=function(a,b){this.lineStart+=a;try{return b()}finally{this.lineStart-=a}},mh.prototype.lookAhead=function(a){var b=this.lineOracle;return b&&b.lookAhead(a)},mh.prototype.baseToken=function(){var a=this.lineOracle;return a&&a.baseToken(this.pos)};var nh=function(a,b){this.state=a,this.lookAhead=b},oh=function(a,b,c,d){this.state=b,this.doc=a,this.line=c,this.maxLookAhead=d||0,this.baseTokens=null,this.baseTokenPos=1};oh.prototype.lookAhead=function(a){var b=this.doc.getLine(this.line+a);return null!=b&&a>this.maxLookAhead&&(this.maxLookAhead=a),b},oh.prototype.baseToken=function(a){var b=this;if(!this.baseTokens)return null;for(;this.baseTokens[this.baseTokenPos]<=a;)b.baseTokenPos+=2;var c=this.baseTokens[this.baseTokenPos+1];return{type:c&&c.replace(/( |^)overlay .*/,""),size:this.baseTokens[this.baseTokenPos]-a}},oh.prototype.nextLine=function(){this.line++,this.maxLookAhead>0&&this.maxLookAhead--},oh.fromSaved=function(a,b,c){return b instanceof nh?new oh(a,Ua(a.mode,b.state),c,b.lookAhead):new oh(a,Ua(a.mode,b),c)},oh.prototype.save=function(a){var b=a!==!1?Ua(this.doc.mode,this.state):this.state;return this.maxLookAhead>0?new nh(b,this.maxLookAhead):b};var ph=function(a,b,c){this.start=a.start,this.end=a.pos,this.string=a.current(),this.type=b||null,this.state=c},qh=function(a,b,c){this.text=a,da(this,b),this.height=c?c(this):1};qh.prototype.lineNo=function(){return F(this)},Fa(qh);var rh,sh={},th={},uh=null,vh=null,wh={left:0,right:0,top:0,bottom:0},xh=function(a,b,c){this.cm=c;var e=this.vert=d("div",[d("div",null,null,"min-width: 1px")],"CodeMirror-vscrollbar"),f=this.horiz=d("div",[d("div",null,null,"height: 100%; min-height: 1px")],"CodeMirror-hscrollbar");e.tabIndex=f.tabIndex=-1,a(e),a(f),dh(e,"scroll",(function(){e.clientHeight&&b(e.scrollTop,"vertical")})),dh(f,"scroll",(function(){f.clientWidth&&b(f.scrollLeft,"horizontal")})),this.checkedZeroWidth=!1,ug&&vg<8&&(this.horiz.style.minHeight=this.vert.style.minWidth="18px")};xh.prototype.update=function(a){var b=a.scrollWidth>a.clientWidth+1,c=a.scrollHeight>a.clientHeight+1,d=a.nativeBarWidth;if(c){this.vert.style.display="block",this.vert.style.bottom=b?d+"px":"0";var e=a.viewHeight-(b?d:0);this.vert.firstChild.style.height=Math.max(0,a.scrollHeight-a.clientHeight+e)+"px"}else this.vert.style.display="",this.vert.firstChild.style.height="0";if(b){this.horiz.style.display="block",this.horiz.style.right=c?d+"px":"0",this.horiz.style.left=a.barLeft+"px";var f=a.viewWidth-a.barLeft-(c?d:0);this.horiz.firstChild.style.width=Math.max(0,a.scrollWidth-a.clientWidth+f)+"px"}else this.horiz.style.display="",this.horiz.firstChild.style.width="0";return!this.checkedZeroWidth&&a.clientHeight>0&&(0==d&&this.zeroWidthHack(),this.checkedZeroWidth=!0),{right:c?d:0,bottom:b?d:0}},xh.prototype.setScrollLeft=function(a){this.horiz.scrollLeft!=a&&(this.horiz.scrollLeft=a),this.disableHoriz&&this.enableZeroWidthBar(this.horiz,this.disableHoriz,"horiz")},xh.prototype.setScrollTop=function(a){this.vert.scrollTop!=a&&(this.vert.scrollTop=a),this.disableVert&&this.enableZeroWidthBar(this.vert,this.disableVert,"vert")},xh.prototype.zeroWidthHack=function(){var a=Gg&&!Bg?"12px":"18px";this.horiz.style.height=this.vert.style.width=a,this.horiz.style.pointerEvents=this.vert.style.pointerEvents="none",this.disableHoriz=new Pg,this.disableVert=new Pg},xh.prototype.enableZeroWidthBar=function(a,b,c){function d(){var e=a.getBoundingClientRect(),f="vert"==c?document.elementFromPoint(e.right-1,(e.top+e.bottom)/2):document.elementFromPoint((e.right+e.left)/2,e.bottom-1);f!=a?a.style.pointerEvents="none":b.set(1e3,d)}a.style.pointerEvents="auto",b.set(1e3,d)},xh.prototype.clear=function(){var a=this.horiz.parentNode;a.removeChild(this.horiz),a.removeChild(this.vert)};var yh=function(){};yh.prototype.update=function(){return{bottom:0,right:0}},yh.prototype.setScrollLeft=function(){},yh.prototype.setScrollTop=function(){},yh.prototype.clear=function(){};var zh={native:xh,null:yh},Ah=0,Bh=function(a,b,c){var d=a.display;this.viewport=b,this.visible=Nc(d,a.doc,b),this.editorIsHidden=!d.wrapper.offsetWidth,this.wrapperHeight=d.wrapper.clientHeight,this.wrapperWidth=d.wrapper.clientWidth,this.oldDisplayWidth=Pb(a),this.force=c,this.dims=vc(a),this.events=[]};Bh.prototype.signal=function(a,b){Ea(a,b)&&this.events.push(arguments)},Bh.prototype.finish=function(){for(var a=this,b=0;b<this.events.length;b++)Ba.apply(null,a.events[b])};var Ch=0,Dh=null;ug?Dh=-.53:qg?Dh=15:yg?Dh=-.7:Ag&&(Dh=-1/3);var Eh=function(a,b){this.ranges=a,this.primIndex=b};Eh.prototype.primary=function(){return this.ranges[this.primIndex]},Eh.prototype.equals=function(a){var b=this;if(a==this)return!0;if(a.primIndex!=this.primIndex||a.ranges.length!=this.ranges.length)return!1;for(var c=0;c<this.ranges.length;c++){var d=b.ranges[c],e=a.ranges[c];if(!L(d.anchor,e.anchor)||!L(d.head,e.head))return!1}return!0},Eh.prototype.deepCopy=function(){for(var a=this,b=[],c=0;c<this.ranges.length;c++)b[c]=new Fh(M(a.ranges[c].anchor),M(a.ranges[c].head));return new Eh(b,this.primIndex)},Eh.prototype.somethingSelected=function(){for(var a=this,b=0;b<this.ranges.length;b++)if(!a.ranges[b].empty())return!0;return!1},Eh.prototype.contains=function(a,b){var c=this;b||(b=a);for(var d=0;d<this.ranges.length;d++){var e=c.ranges[d];if(K(b,e.from())>=0&&K(a,e.to())<=0)return d}return-1};var Fh=function(a,b){this.anchor=a,this.head=b};Fh.prototype.from=function(){return O(this.anchor,this.head)},Fh.prototype.to=function(){return N(this.anchor,this.head)},Fh.prototype.empty=function(){return this.head.line==this.anchor.line&&this.head.ch==this.anchor.ch},Pe.prototype={chunkSize:function(){return this.lines.length},removeInner:function(a,b){for(var c=this,d=a,e=a+b;d<e;++d){var f=c.lines[d];c.height-=f.height,hb(f),vb(f,"delete")}this.lines.splice(a,b)},collapse:function(a){a.push.apply(a,this.lines)},insertInner:function(a,b,c){var d=this;this.height+=c,this.lines=this.lines.slice(0,a).concat(b).concat(this.lines.slice(a));for(var e=0;e<b.length;++e)b[e].parent=d},iterN:function(a,b,c){for(var d=this,e=a+b;a<e;++a)if(c(d.lines[a]))return!0}},Qe.prototype={chunkSize:function(){return this.size},removeInner:function(a,b){var c=this;this.size-=b;for(var d=0;d<this.children.length;++d){var e=c.children[d],f=e.chunkSize();if(a<f){var g=Math.min(b,f-a),h=e.height;if(e.removeInner(a,g),c.height-=h-e.height,f==g&&(c.children.splice(d--,1),e.parent=null),0==(b-=g))break;a=0}else a-=f}if(this.size-b<25&&(this.children.length>1||!(this.children[0]instanceof Pe))){var i=[];this.collapse(i),this.children=[new Pe(i)],this.children[0].parent=this}},collapse:function(a){for(var b=this,c=0;c<this.children.length;++c)b.children[c].collapse(a)},insertInner:function(a,b,c){var d=this;this.size+=b.length,this.height+=c;for(var e=0;e<this.children.length;++e){var f=d.children[e],g=f.chunkSize();if(a<=g){if(f.insertInner(a,b,c),f.lines&&f.lines.length>50){for(var h=f.lines.length%25+25,i=h;i<f.lines.length;){var j=new Pe(f.lines.slice(i,i+=25));f.height-=j.height,d.children.splice(++e,0,j),j.parent=d}f.lines=f.lines.slice(0,h),d.maybeSpill()}break}a-=g}},maybeSpill:function(){if(!(this.children.length<=10)){var a=this;do{var b=a.children.splice(a.children.length-5,5),c=new Qe(b);if(a.parent){a.size-=c.size,a.height-=c.height;var d=m(a.parent.children,a);a.parent.children.splice(d+1,0,c)}else{var e=new Qe(a.children);e.parent=a,a.children=[e,c],a=e}c.parent=a.parent}while(a.children.length>10);a.parent.maybeSpill()}},iterN:function(a,b,c){for(var d=this,e=0;e<this.children.length;++e){var f=d.children[e],g=f.chunkSize();if(a<g){var h=Math.min(b,g-a);if(f.iterN(a,h,c))return!0;if(0==(b-=h))break;a=0}else a-=g}}};var Gh=function(a,b,c){var d=this;if(c)for(var e in c)c.hasOwnProperty(e)&&(d[e]=c[e]);this.doc=a,this.node=b};Gh.prototype.clear=function(){var a=this,b=this.doc.cm,c=this.line.widgets,d=this.line,e=F(d);if(null!=e&&c){for(var f=0;f<c.length;++f)c[f]==a&&c.splice(f--,1);c.length||(d.widgets=null);var g=Jb(this);E(d,Math.max(0,d.height-g)),b&&(nd(b,(function(){Re(b,d,-g),sd(b,e,"widget")})),vb(b,"lineWidgetCleared",b,this,e))}},Gh.prototype.changed=function(){var a=this,b=this.height,c=this.doc.cm,d=this.line;this.height=null;var e=Jb(this)-b;e&&(E(d,d.height+e),c&&nd(c,(function(){c.curOp.forceUpdate=!0,Re(c,d,e),vb(c,"lineWidgetChanged",c,a,F(d))})))},Fa(Gh);var Hh=0,Ih=function(a,b){this.lines=[],this.type=b,this.doc=a,this.id=++Hh};Ih.prototype.clear=function(){var a=this;if(!this.explicitlyCleared){var b=this.doc.cm,c=b&&!b.curOp;if(c&&fd(b),Ea(this,"clear")){var d=this.find();d&&vb(this,"clear",d.from,d.to)}for(var e=null,f=null,g=0;g<this.lines.length;++g){var h=a.lines[g],i=W(h.markedSpans,a);b&&!a.collapsed?sd(b,F(h),"text"):b&&(null!=i.to&&(f=F(h)),null!=i.from&&(e=F(h))),h.markedSpans=X(h.markedSpans,i),null==i.from&&a.collapsed&&!ra(a.doc,h)&&b&&E(h,tc(b.display))}if(b&&this.collapsed&&!b.options.lineWrapping)for(var j=0;j<this.lines.length;++j){var k=ma(a.lines[j]),l=ua(k);l>b.display.maxLineLength&&(b.display.maxLine=k,b.display.maxLineLength=l,b.display.maxLineChanged=!0)}null!=e&&b&&this.collapsed&&rd(b,e,f+1),this.lines.length=0,this.explicitlyCleared=!0,this.atomic&&this.doc.cantEdit&&(this.doc.cantEdit=!1,b&&xe(b.doc)),b&&vb(b,"markerCleared",b,this,e,f),c&&gd(b),this.parent&&this.parent.clear()}},Ih.prototype.find=function(a,b){var c=this;null==a&&"bookmark"==this.type&&(a=1);for(var d,e,f=0;f<this.lines.length;++f){var g=c.lines[f],h=W(g.markedSpans,c);if(null!=h.from&&(d=J(b?g:F(g),h.from),a==-1))return d;if(null!=h.to&&(e=J(b?g:F(g),h.to),1==a))return e}return d&&{from:d,to:e}},Ih.prototype.changed=function(){var a=this,b=this.find(-1,!0),c=this,d=this.doc.cm;b&&d&&nd(d,(function(){var e=b.line,f=F(b.line),g=Vb(d,f);if(g&&(ac(g),d.curOp.selectionChanged=d.curOp.forceUpdate=!0),d.curOp.updateMaxLine=!0,!ra(c.doc,e)&&null!=c.height){var h=c.height;c.height=null;var i=Jb(c)-h;i&&E(e,e.height+i)}vb(d,"markerChanged",d,a)}))},Ih.prototype.attachLine=function(a){if(!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;b.maybeHiddenMarkers&&m(b.maybeHiddenMarkers,this)!=-1||(b.maybeUnhiddenMarkers||(b.maybeUnhiddenMarkers=[])).push(this)}this.lines.push(a)},Ih.prototype.detachLine=function(a){if(this.lines.splice(m(this.lines,a),1),!this.lines.length&&this.doc.cm){var b=this.doc.cm.curOp;(b.maybeHiddenMarkers||(b.maybeHiddenMarkers=[])).push(this)}},Fa(Ih);var Jh=function(a,b){var c=this;this.markers=a,this.primary=b;for(var d=0;d<a.length;++d)a[d].parent=c;
+};Jh.prototype.clear=function(){var a=this;if(!this.explicitlyCleared){this.explicitlyCleared=!0;for(var b=0;b<this.markers.length;++b)a.markers[b].clear();vb(this,"clear")}},Jh.prototype.find=function(a,b){return this.primary.find(a,b)},Fa(Jh);var Kh=0,Lh=function(a,b,c,d,e){if(!(this instanceof Lh))return new Lh(a,b,c,d,e);null==c&&(c=0),Qe.call(this,[new Pe([new qh("",null)])]),this.first=c,this.scrollTop=this.scrollLeft=0,this.cantEdit=!1,this.cleanGeneration=1,this.modeFrontier=this.highlightFrontier=c;var f=J(c,0);this.sel=Od(f),this.history=new ae(null),this.id=++Kh,this.modeOption=b,this.lineSep=d,this.direction="rtl"==e?"rtl":"ltr",this.extend=!1,"string"==typeof a&&(a=this.splitLines(a)),Xd(this,{from:f,to:f,text:a}),ue(this,Od(f),Ug)};Lh.prototype=t(Qe.prototype,{constructor:Lh,iter:function(a,b,c){c?this.iterN(a-this.first,b-a,c):this.iterN(this.first,this.first+this.size,a)},insert:function(a,b){for(var c=0,d=0;d<b.length;++d)c+=b[d].height;this.insertInner(a-this.first,b,c)},remove:function(a,b){this.removeInner(a-this.first,b)},getValue:function(a){var b=D(this,this.first,this.first+this.size);return a===!1?b:b.join(a||this.lineSeparator())},setValue:qd((function(a){var b=J(this.first,0),c=this.first+this.size-1;Ee(this,{from:b,to:J(c,B(this,c).text.length),text:this.splitLines(a),origin:"setValue",full:!0},!0),this.cm&&Wc(this.cm,0,0),ue(this,Od(b),Ug)})),replaceRange:function(a,b,c,d){b=Q(this,b),c=c?Q(this,c):b,Ke(this,a,b,c,d)},getRange:function(a,b,c){var d=C(this,Q(this,a),Q(this,b));return c===!1?d:d.join(c||this.lineSeparator())},getLine:function(a){var b=this.getLineHandle(a);return b&&b.text},getLineHandle:function(a){if(H(this,a))return B(this,a)},getLineNumber:function(a){return F(a)},getLineHandleVisualStart:function(a){return"number"==typeof a&&(a=B(this,a)),ma(a)},lineCount:function(){return this.size},firstLine:function(){return this.first},lastLine:function(){return this.first+this.size-1},clipPos:function(a){return Q(this,a)},getCursor:function(a){var b,c=this.sel.primary();return b=null==a||"head"==a?c.head:"anchor"==a?c.anchor:"end"==a||"to"==a||a===!1?c.to():c.from()},listSelections:function(){return this.sel.ranges},somethingSelected:function(){return this.sel.somethingSelected()},setCursor:qd((function(a,b,c){re(this,Q(this,"number"==typeof a?J(a,b||0):a),null,c)})),setSelection:qd((function(a,b,c){re(this,Q(this,a),Q(this,b||a),c)})),extendSelection:qd((function(a,b,c){oe(this,Q(this,a),b&&Q(this,b),c)})),extendSelections:qd((function(a,b){pe(this,S(this,a),b)})),extendSelectionsBy:qd((function(a,b){var c=q(this.sel.ranges,a);pe(this,S(this,c),b)})),setSelections:qd((function(a,b,c){var d=this;if(a.length){for(var e=[],f=0;f<a.length;f++)e[f]=new Fh(Q(d,a[f].anchor),Q(d,a[f].head));null==b&&(b=Math.min(a.length-1,this.sel.primIndex)),ue(this,Nd(e,b),c)}})),addSelection:qd((function(a,b,c){var d=this.sel.ranges.slice(0);d.push(new Fh(Q(this,a),Q(this,b||a))),ue(this,Nd(d,d.length-1),c)})),getSelection:function(a){for(var b,c=this,d=this.sel.ranges,e=0;e<d.length;e++){var f=C(c,d[e].from(),d[e].to());b=b?b.concat(f):f}return a===!1?b:b.join(a||this.lineSeparator())},getSelections:function(a){for(var b=this,c=[],d=this.sel.ranges,e=0;e<d.length;e++){var f=C(b,d[e].from(),d[e].to());a!==!1&&(f=f.join(a||b.lineSeparator())),c[e]=f}return c},replaceSelection:function(a,b,c){for(var d=[],e=0;e<this.sel.ranges.length;e++)d[e]=a;this.replaceSelections(d,b,c||"+input")},replaceSelections:qd((function(a,b,c){for(var d=this,e=[],f=this.sel,g=0;g<f.ranges.length;g++){var h=f.ranges[g];e[g]={from:h.from(),to:h.to(),text:d.splitLines(a[g]),origin:c}}for(var i=b&&"end"!=b&&Td(this,e,b),j=e.length-1;j>=0;j--)Ee(d,e[j]);i?te(this,i):this.cm&&Vc(this.cm)})),undo:qd((function(){Ge(this,"undo")})),redo:qd((function(){Ge(this,"redo")})),undoSelection:qd((function(){Ge(this,"undo",!0)})),redoSelection:qd((function(){Ge(this,"redo",!0)})),setExtending:function(a){this.extend=a},getExtending:function(){return this.extend},historySize:function(){for(var a=this.history,b=0,c=0,d=0;d<a.done.length;d++)a.done[d].ranges||++b;for(var e=0;e<a.undone.length;e++)a.undone[e].ranges||++c;return{undo:b,redo:c}},clearHistory:function(){this.history=new ae(this.history.maxGeneration)},markClean:function(){this.cleanGeneration=this.changeGeneration(!0)},changeGeneration:function(a){return a&&(this.history.lastOp=this.history.lastSelOp=this.history.lastOrigin=null),this.history.generation},isClean:function(a){return this.history.generation==(a||this.cleanGeneration)},getHistory:function(){return{done:me(this.history.done),undone:me(this.history.undone)}},setHistory:function(a){var b=this.history=new ae(this.history.maxGeneration);b.done=me(a.done.slice(0),null,!0),b.undone=me(a.undone.slice(0),null,!0)},setGutterMarker:qd((function(a,b,c){return Oe(this,a,"gutter",(function(a){var d=a.gutterMarkers||(a.gutterMarkers={});return d[b]=c,!c&&w(d)&&(a.gutterMarkers=null),!0}))})),clearGutter:qd((function(a){var b=this;this.iter((function(c){c.gutterMarkers&&c.gutterMarkers[a]&&Oe(b,c,"gutter",(function(){return c.gutterMarkers[a]=null,w(c.gutterMarkers)&&(c.gutterMarkers=null),!0}))}))})),lineInfo:function(a){var b;if("number"==typeof a){if(!H(this,a))return null;if(b=a,a=B(this,a),!a)return null}else if(b=F(a),null==b)return null;return{line:b,handle:a,text:a.text,gutterMarkers:a.gutterMarkers,textClass:a.textClass,bgClass:a.bgClass,wrapClass:a.wrapClass,widgets:a.widgets}},addLineClass:qd((function(b,c,d){return Oe(this,b,"gutter"==c?"gutter":"class",(function(b){var e="text"==c?"textClass":"background"==c?"bgClass":"gutter"==c?"gutterClass":"wrapClass";if(b[e]){if(a(d).test(b[e]))return!1;b[e]+=" "+d}else b[e]=d;return!0}))})),removeLineClass:qd((function(b,c,d){return Oe(this,b,"gutter"==c?"gutter":"class",(function(b){var e="text"==c?"textClass":"background"==c?"bgClass":"gutter"==c?"gutterClass":"wrapClass",f=b[e];if(!f)return!1;if(null==d)b[e]=null;else{var g=f.match(a(d));if(!g)return!1;var h=g.index+g[0].length;b[e]=f.slice(0,g.index)+(g.index&&h!=f.length?" ":"")+f.slice(h)||null}return!0}))})),addLineWidget:qd((function(a,b,c){return Se(this,a,b,c)})),removeLineWidget:function(a){a.clear()},markText:function(a,b,c){return Te(this,Q(this,a),Q(this,b),c,c&&c.type||"range")},setBookmark:function(a,b){var c={replacedWith:b&&(null==b.nodeType?b.widget:b),insertLeft:b&&b.insertLeft,clearWhenEmpty:!1,shared:b&&b.shared,handleMouseEvents:b&&b.handleMouseEvents};return a=Q(this,a),Te(this,a,a,c,"bookmark")},findMarksAt:function(a){a=Q(this,a);var b=[],c=B(this,a.line).markedSpans;if(c)for(var d=0;d<c.length;++d){var e=c[d];(null==e.from||e.from<=a.ch)&&(null==e.to||e.to>=a.ch)&&b.push(e.marker.parent||e.marker)}return b},findMarks:function(a,b,c){a=Q(this,a),b=Q(this,b);var d=[],e=a.line;return this.iter(a.line,b.line+1,(function(f){var g=f.markedSpans;if(g)for(var h=0;h<g.length;h++){var i=g[h];null!=i.to&&e==a.line&&a.ch>=i.to||null==i.from&&e!=a.line||null!=i.from&&e==b.line&&i.from>=b.ch||c&&!c(i.marker)||d.push(i.marker.parent||i.marker)}++e})),d},getAllMarks:function(){var a=[];return this.iter((function(b){var c=b.markedSpans;if(c)for(var d=0;d<c.length;++d)null!=c[d].from&&a.push(c[d].marker)})),a},posFromIndex:function(a){var b,c=this.first,d=this.lineSeparator().length;return this.iter((function(e){var f=e.text.length+d;return f>a?(b=a,!0):(a-=f,void++c)})),Q(this,J(c,b))},indexFromPos:function(a){a=Q(this,a);var b=a.ch;if(a.line<this.first||a.ch<0)return 0;var c=this.lineSeparator().length;return this.iter(this.first,a.line,(function(a){b+=a.text.length+c})),b},copy:function(a){var b=new Lh(D(this,this.first,this.first+this.size),this.modeOption,this.first,this.lineSep,this.direction);return b.scrollTop=this.scrollTop,b.scrollLeft=this.scrollLeft,b.sel=this.sel,b.extend=!1,a&&(b.history.undoDepth=this.history.undoDepth,b.setHistory(this.getHistory())),b},linkedDoc:function(a){a||(a={});var b=this.first,c=this.first+this.size;null!=a.from&&a.from>b&&(b=a.from),null!=a.to&&a.to<c&&(c=a.to);var d=new Lh(D(this,b,c),a.mode||this.modeOption,b,this.lineSep,this.direction);return a.sharedHist&&(d.history=this.history),(this.linked||(this.linked=[])).push({doc:d,sharedHist:a.sharedHist}),d.linked=[{doc:this,isParent:!0,sharedHist:a.sharedHist}],We(d,Ve(this)),d},unlinkDoc:function(a){var b=this;if(a instanceof Wf&&(a=a.doc),this.linked)for(var c=0;c<this.linked.length;++c){var d=b.linked[c];if(d.doc==a){b.linked.splice(c,1),a.unlinkDoc(b),Xe(Ve(b));break}}if(a.history==this.history){var e=[a.id];Yd(a,(function(a){return e.push(a.id)}),!0),a.history=new ae(null),a.history.done=me(this.history.done,e),a.history.undone=me(this.history.undone,e)}},iterLinkedDocs:function(a){Yd(this,a)},getMode:function(){return this.mode},getEditor:function(){return this.cm},splitLines:function(a){return this.lineSep?a.split(this.lineSep):fh(a)},lineSeparator:function(){return this.lineSep||"\n"},setDirection:qd((function(a){"rtl"!=a&&(a="ltr"),a!=this.direction&&(this.direction=a,this.iter((function(a){return a.order=null})),this.cm&&_d(this.cm))}))}),Lh.prototype.eachLine=Lh.prototype.iter;for(var Mh=0,Nh=!1,Oh={3:"Pause",8:"Backspace",9:"Tab",13:"Enter",16:"Shift",17:"Ctrl",18:"Alt",19:"Pause",20:"CapsLock",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"PrintScrn",45:"Insert",46:"Delete",59:";",61:"=",91:"Mod",92:"Mod",93:"Mod",106:"*",107:"=",109:"-",110:".",111:"/",127:"Delete",145:"ScrollLock",173:"-",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",63232:"Up",63233:"Down",63234:"Left",63235:"Right",63272:"Delete",63273:"Home",63275:"End",63276:"PageUp",63277:"PageDown",63302:"Insert"},Ph=0;Ph<10;Ph++)Oh[Ph+48]=Oh[Ph+96]=String(Ph);for(var Qh=65;Qh<=90;Qh++)Oh[Qh]=String.fromCharCode(Qh);for(var Rh=1;Rh<=12;Rh++)Oh[Rh+111]=Oh[Rh+63235]="F"+Rh;var Sh={};Sh.basic={Left:"goCharLeft",Right:"goCharRight",Up:"goLineUp",Down:"goLineDown",End:"goLineEnd",Home:"goLineStartSmart",PageUp:"goPageUp",PageDown:"goPageDown",Delete:"delCharAfter",Backspace:"delCharBefore","Shift-Backspace":"delCharBefore",Tab:"defaultTab","Shift-Tab":"indentAuto",Enter:"newlineAndIndent",Insert:"toggleOverwrite",Esc:"singleSelection"},Sh.pcDefault={"Ctrl-A":"selectAll","Ctrl-D":"deleteLine","Ctrl-Z":"undo","Shift-Ctrl-Z":"redo","Ctrl-Y":"redo","Ctrl-Home":"goDocStart","Ctrl-End":"goDocEnd","Ctrl-Up":"goLineUp","Ctrl-Down":"goLineDown","Ctrl-Left":"goGroupLeft","Ctrl-Right":"goGroupRight","Alt-Left":"goLineStart","Alt-Right":"goLineEnd","Ctrl-Backspace":"delGroupBefore","Ctrl-Delete":"delGroupAfter","Ctrl-S":"save","Ctrl-F":"find","Ctrl-G":"findNext","Shift-Ctrl-G":"findPrev","Shift-Ctrl-F":"replace","Shift-Ctrl-R":"replaceAll","Ctrl-[":"indentLess","Ctrl-]":"indentMore","Ctrl-U":"undoSelection","Shift-Ctrl-U":"redoSelection","Alt-U":"redoSelection",fallthrough:"basic"},Sh.emacsy={"Ctrl-F":"goCharRight","Ctrl-B":"goCharLeft","Ctrl-P":"goLineUp","Ctrl-N":"goLineDown","Alt-F":"goWordRight","Alt-B":"goWordLeft","Ctrl-A":"goLineStart","Ctrl-E":"goLineEnd","Ctrl-V":"goPageDown","Shift-Ctrl-V":"goPageUp","Ctrl-D":"delCharAfter","Ctrl-H":"delCharBefore","Alt-D":"delWordAfter","Alt-Backspace":"delWordBefore","Ctrl-K":"killLine","Ctrl-T":"transposeChars","Ctrl-O":"openLine"},Sh.macDefault={"Cmd-A":"selectAll","Cmd-D":"deleteLine","Cmd-Z":"undo","Shift-Cmd-Z":"redo","Cmd-Y":"redo","Cmd-Home":"goDocStart","Cmd-Up":"goDocStart","Cmd-End":"goDocEnd","Cmd-Down":"goDocEnd","Alt-Left":"goGroupLeft","Alt-Right":"goGroupRight","Cmd-Left":"goLineLeft","Cmd-Right":"goLineRight","Alt-Backspace":"delGroupBefore","Ctrl-Alt-Backspace":"delGroupAfter","Alt-Delete":"delGroupAfter","Cmd-S":"save","Cmd-F":"find","Cmd-G":"findNext","Shift-Cmd-G":"findPrev","Cmd-Alt-F":"replace","Shift-Cmd-Alt-F":"replaceAll","Cmd-[":"indentLess","Cmd-]":"indentMore","Cmd-Backspace":"delWrappedLineLeft","Cmd-Delete":"delWrappedLineRight","Cmd-U":"undoSelection","Shift-Cmd-U":"redoSelection","Ctrl-Up":"goDocStart","Ctrl-Down":"goDocEnd",fallthrough:["basic","emacsy"]},Sh.default=Gg?Sh.macDefault:Sh.pcDefault;var Th={selectAll:Ce,singleSelection:function(a){return a.setSelection(a.getCursor("anchor"),a.getCursor("head"),Ug)},killLine:function(a){return mf(a,(function(b){if(b.empty()){var c=B(a.doc,b.head.line).text.length;return b.head.ch==c&&b.head.line<a.lastLine()?{from:b.head,to:J(b.head.line+1,0)}:{from:b.head,to:J(b.head.line,c)}}return{from:b.from(),to:b.to()}}))},deleteLine:function(a){return mf(a,(function(b){return{from:J(b.from().line,0),to:Q(a.doc,J(b.to().line+1,0))}}))},delLineLeft:function(a){return mf(a,(function(a){return{from:J(a.from().line,0),to:a.from()}}))},delWrappedLineLeft:function(a){return mf(a,(function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:0,top:c},"div");return{from:d,to:b.from()}}))},delWrappedLineRight:function(a){return mf(a,(function(b){var c=a.charCoords(b.head,"div").top+5,d=a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div");return{from:b.from(),to:d}}))},undo:function(a){return a.undo()},redo:function(a){return a.redo()},undoSelection:function(a){return a.undoSelection()},redoSelection:function(a){return a.redoSelection()},goDocStart:function(a){return a.extendSelection(J(a.firstLine(),0))},goDocEnd:function(a){return a.extendSelection(J(a.lastLine()))},goLineStart:function(a){return a.extendSelectionsBy((function(b){return rf(a,b.head.line)}),{origin:"+move",bias:1})},goLineStartSmart:function(a){return a.extendSelectionsBy((function(b){return tf(a,b.head)}),{origin:"+move",bias:1})},goLineEnd:function(a){return a.extendSelectionsBy((function(b){return sf(a,b.head.line)}),{origin:"+move",bias:-1})},goLineRight:function(a){return a.extendSelectionsBy((function(b){var c=a.cursorCoords(b.head,"div").top+5;return a.coordsChar({left:a.display.lineDiv.offsetWidth+100,top:c},"div")}),Wg)},goLineLeft:function(a){return a.extendSelectionsBy((function(b){var c=a.cursorCoords(b.head,"div").top+5;return a.coordsChar({left:0,top:c},"div")}),Wg)},goLineLeftSmart:function(a){return a.extendSelectionsBy((function(b){var c=a.cursorCoords(b.head,"div").top+5,d=a.coordsChar({left:0,top:c},"div");return d.ch<a.getLine(d.line).search(/\S/)?tf(a,b.head):d}),Wg)},goLineUp:function(a){return a.moveV(-1,"line")},goLineDown:function(a){return a.moveV(1,"line")},goPageUp:function(a){return a.moveV(-1,"page")},goPageDown:function(a){return a.moveV(1,"page")},goCharLeft:function(a){return a.moveH(-1,"char")},goCharRight:function(a){return a.moveH(1,"char")},goColumnLeft:function(a){return a.moveH(-1,"column")},goColumnRight:function(a){return a.moveH(1,"column")},goWordLeft:function(a){return a.moveH(-1,"word")},goGroupRight:function(a){return a.moveH(1,"group")},goGroupLeft:function(a){return a.moveH(-1,"group")},goWordRight:function(a){return a.moveH(1,"word")},delCharBefore:function(a){return a.deleteH(-1,"char")},delCharAfter:function(a){return a.deleteH(1,"char")},delWordBefore:function(a){return a.deleteH(-1,"word")},delWordAfter:function(a){return a.deleteH(1,"word")},delGroupBefore:function(a){return a.deleteH(-1,"group")},delGroupAfter:function(a){return a.deleteH(1,"group")},indentAuto:function(a){return a.indentSelection("smart")},indentMore:function(a){return a.indentSelection("add")},indentLess:function(a){return a.indentSelection("subtract")},insertTab:function(a){return a.replaceSelection("\t")},insertSoftTab:function(a){for(var b=[],c=a.listSelections(),d=a.options.tabSize,e=0;e<c.length;e++){var f=c[e].from(),g=l(a.getLine(f.line),f.ch,d);b.push(o(d-g%d))}a.replaceSelections(b)},defaultTab:function(a){a.somethingSelected()?a.indentSelection("add"):a.execCommand("insertTab")},transposeChars:function(a){return nd(a,(function(){for(var b=a.listSelections(),c=[],d=0;d<b.length;d++)if(b[d].empty()){var e=b[d].head,f=B(a.doc,e.line).text;if(f)if(e.ch==f.length&&(e=new J(e.line,e.ch-1)),e.ch>0)e=new J(e.line,e.ch+1),a.replaceRange(f.charAt(e.ch-1)+f.charAt(e.ch-2),J(e.line,e.ch-2),e,"+transpose");else if(e.line>a.doc.first){var g=B(a.doc,e.line-1).text;g&&(e=new J(e.line,1),a.replaceRange(f.charAt(0)+a.doc.lineSeparator()+g.charAt(g.length-1),J(e.line-1,g.length-1),e,"+transpose"))}c.push(new Fh(e,e))}a.setSelections(c)}))},newlineAndIndent:function(a){return nd(a,(function(){for(var b=a.listSelections(),c=b.length-1;c>=0;c--)a.replaceRange(a.doc.lineSeparator(),b[c].anchor,b[c].head,"+input");b=a.listSelections();for(var d=0;d<b.length;d++)a.indentLine(b[d].from().line,null,!0);Vc(a)}))},openLine:function(a){return a.replaceSelection("\n","start")},toggleOverwrite:function(a){return a.toggleOverwrite()}},Uh=new Pg,Vh=null,Wh=400,Xh=function(a,b,c){this.time=a,this.pos=b,this.button=c};Xh.prototype.compare=function(a,b,c){return this.time+Wh>a&&0==K(b,this.pos)&&c==this.button};var Yh,Zh,$h={toString:function(){return"CodeMirror.Init"}},_h={},ai={};Wf.defaults=_h,Wf.optionHandlers=ai;var bi=[];Wf.defineInitHook=function(a){return bi.push(a)};var ci=null,di=function(a){var b=a.optionHandlers,c=a.helpers={};a.prototype={constructor:a,focus:function(){window.focus(),this.display.input.focus()},setOption:function(a,c){var d=this.options,e=d[a];d[a]==c&&"mode"!=a||(d[a]=c,b.hasOwnProperty(a)&&od(this,b[a])(this,c,e),Ba(this,"optionChange",this,a))},getOption:function(a){return this.options[a]},getDoc:function(){return this.doc},addKeyMap:function(a,b){this.state.keyMaps[b?"push":"unshift"](lf(a))},removeKeyMap:function(a){for(var b=this.state.keyMaps,c=0;c<b.length;++c)if(b[c]==a||b[c].name==a)return b.splice(c,1),!0},addOverlay:pd((function(b,c){var d=b.token?b:a.getMode(this.options,b);if(d.startState)throw new Error("Overlays may not be stateful.");r(this.state.overlays,{mode:d,modeSpec:b,opaque:c&&c.opaque,priority:c&&c.priority||0},(function(a){return a.priority})),this.state.modeGen++,rd(this)})),removeOverlay:pd((function(a){for(var b=this,c=this.state.overlays,d=0;d<c.length;++d){var e=c[d].modeSpec;if(e==a||"string"==typeof a&&e.name==a)return c.splice(d,1),b.state.modeGen++,void rd(b)}})),indentLine:pd((function(a,b,c){"string"!=typeof b&&"number"!=typeof b&&(b=null==b?this.options.smartIndent?"smart":"prev":b?"add":"subtract"),H(this.doc,a)&&Yf(this,a,b,c)})),indentSelection:pd((function(a){for(var b=this,c=this.doc.sel.ranges,d=-1,e=0;e<c.length;e++){var f=c[e];if(f.empty())f.head.line>d&&(Yf(b,f.head.line,a,!0),d=f.head.line,e==b.doc.sel.primIndex&&Vc(b));else{var g=f.from(),h=f.to(),i=Math.max(d,g.line);d=Math.min(b.lastLine(),h.line-(h.ch?0:1))+1;for(var j=i;j<d;++j)Yf(b,j,a);var k=b.doc.sel.ranges;0==g.ch&&c.length==k.length&&k[e].from().ch>0&&qe(b.doc,e,new Fh(g,k[e].to()),Ug)}}})),getTokenAt:function(a,b){return bb(this,a,b)},getLineTokens:function(a,b){return bb(this,J(a),b,!0)},getTokenTypeAt:function(a){a=Q(this.doc,a);var b,c=Ya(this,B(this.doc,a.line)),d=0,e=(c.length-1)/2,f=a.ch;if(0==f)b=c[2];else for(;;){var g=d+e>>1;if((g?c[2*g-1]:0)>=f)e=g;else{if(!(c[2*g+1]<f)){b=c[2*g+2];break}d=g+1}}var h=b?b.indexOf("overlay "):-1;return h<0?b:0==h?null:b.slice(0,h-1)},getModeAt:function(b){var c=this.doc.mode;return c.innerMode?a.innerMode(c,this.getTokenAt(b).state).mode:c},getHelper:function(a,b){return this.getHelpers(a,b)[0]},getHelpers:function(a,b){var d=this,e=[];if(!c.hasOwnProperty(b))return e;var f=c[b],g=this.getModeAt(a);if("string"==typeof g[b])f[g[b]]&&e.push(f[g[b]]);else if(g[b])for(var h=0;h<g[b].length;h++){var i=f[g[b][h]];i&&e.push(i)}else g.helperType&&f[g.helperType]?e.push(f[g.helperType]):f[g.name]&&e.push(f[g.name]);for(var j=0;j<f._global.length;j++){var k=f._global[j];k.pred(g,d)&&m(e,k.val)==-1&&e.push(k.val)}return e},getStateAfter:function(a,b){var c=this.doc;return a=P(c,null==a?c.first+c.size-1:a),Za(this,a+1,b).state},cursorCoords:function(a,b){var c,d=this.doc.sel.primary();return c=null==a?d.head:"object"==typeof a?Q(this.doc,a):a?d.from():d.to(),jc(this,c,b||"page")},charCoords:function(a,b){return ic(this,Q(this.doc,a),b||"page")},coordsChar:function(a,b){return a=hc(this,a,b||"page"),mc(this,a.left,a.top)},lineAtHeight:function(a,b){return a=hc(this,{top:a,left:0},b||"page").top,G(this.doc,a+this.display.viewOffset)},heightAtLine:function(a,b,c){var d,e=!1;if("number"==typeof a){var f=this.doc.first+this.doc.size-1;a<this.doc.first?a=this.doc.first:a>f&&(a=f,e=!0),d=B(this.doc,a)}else d=a;return gc(this,d,{top:0,left:0},b||"page",c||e).top+(e?this.doc.height-ta(d):0)},defaultTextHeight:function(){return tc(this.display)},defaultCharWidth:function(){return uc(this.display)},getViewport:function(){return{from:this.display.viewFrom,to:this.display.viewTo}},addWidget:function(a,b,c,d,e){var f=this.display;a=jc(this,Q(this.doc,a));var g=a.bottom,h=a.left;if(b.style.position="absolute",b.setAttribute("cm-ignore-events","true"),this.display.input.setUneditable(b),f.sizer.appendChild(b),"over"==d)g=a.top;else if("above"==d||"near"==d){var i=Math.max(f.wrapper.clientHeight,this.doc.height),j=Math.max(f.sizer.clientWidth,f.lineSpace.clientWidth);("above"==d||a.bottom+b.offsetHeight>i)&&a.top>b.offsetHeight?g=a.top-b.offsetHeight:a.bottom+b.offsetHeight<=i&&(g=a.bottom),h+b.offsetWidth>j&&(h=j-b.offsetWidth)}b.style.top=g+"px",b.style.left=b.style.right="","right"==e?(h=f.sizer.clientWidth-b.offsetWidth,b.style.right="0px"):("left"==e?h=0:"middle"==e&&(h=(f.sizer.clientWidth-b.offsetWidth)/2),b.style.left=h+"px"),c&&Sc(this,{left:h,top:g,right:h+b.offsetWidth,bottom:g+b.offsetHeight})},triggerOnKeyDown:pd(Af),triggerOnKeyPress:pd(Df),triggerOnKeyUp:Cf,triggerOnMouseDown:pd(Ff),execCommand:function(a){if(Th.hasOwnProperty(a))return Th[a].call(null,this)},triggerElectric:pd((function(a){ag(this,a)})),findPosH:function(a,b,c,d){var e=this,f=1;b<0&&(f=-1,b=-b);for(var g=Q(this.doc,a),h=0;h<b&&(g=eg(e.doc,g,f,c,d),!g.hitSide);++h);return g},moveH:pd((function(a,b){var c=this;this.extendSelectionsBy((function(d){return c.display.shift||c.doc.extend||d.empty()?eg(c.doc,d.head,a,b,c.options.rtlMoveVisually):a<0?d.from():d.to()}),Wg)})),deleteH:pd((function(a,b){var c=this.doc.sel,d=this.doc;c.somethingSelected()?d.replaceSelection("",null,"+delete"):mf(this,(function(c){var e=eg(d,c.head,a,b,!1);return a<0?{from:e,to:c.head}:{from:c.head,to:e}}))})),findPosV:function(a,b,c,d){var e=this,f=1,g=d;b<0&&(f=-1,b=-b);for(var h=Q(this.doc,a),i=0;i<b;++i){var j=jc(e,h,"div");if(null==g?g=j.left:j.left=g,h=fg(e,j,f,c),h.hitSide)break}return h},moveV:pd((function(a,b){var c=this,d=this.doc,e=[],f=!this.display.shift&&!d.extend&&d.sel.somethingSelected();if(d.extendSelectionsBy((function(g){if(f)return a<0?g.from():g.to();var h=jc(c,g.head,"div");null!=g.goalColumn&&(h.left=g.goalColumn),e.push(h.left);var i=fg(c,h,a,b);return"page"==b&&g==d.sel.primary()&&Uc(c,ic(c,i,"div").top-h.top),i}),Wg),e.length)for(var g=0;g<d.sel.ranges.length;g++)d.sel.ranges[g].goalColumn=e[g]})),findWordAt:function(a){var b=this.doc,c=B(b,a.line).text,d=a.ch,e=a.ch;if(c){var f=this.getHelper(a,"wordChars");"before"!=a.sticky&&e!=c.length||!d?++e:--d;for(var g=c.charAt(d),h=v(g,f)?function(a){return v(a,f)}:/\s/.test(g)?function(a){return/\s/.test(a)}:function(a){return!/\s/.test(a)&&!v(a)};d>0&&h(c.charAt(d-1));)--d;for(;e<c.length&&h(c.charAt(e));)++e}return new Fh(J(a.line,d),J(a.line,e))},toggleOverwrite:function(a){null!=a&&a==this.state.overwrite||((this.state.overwrite=!this.state.overwrite)?h(this.display.cursorDiv,"CodeMirror-overwrite"):Ng(this.display.cursorDiv,"CodeMirror-overwrite"),Ba(this,"overwriteToggle",this,this.state.overwrite))},hasFocus:function(){return this.display.input.getField()==g()},isReadOnly:function(){return!(!this.options.readOnly&&!this.doc.cantEdit)},scrollTo:pd((function(a,b){Wc(this,a,b)})),getScrollInfo:function(){var a=this.display.scroller;return{left:a.scrollLeft,top:a.scrollTop,height:a.scrollHeight-Ob(this)-this.display.barHeight,width:a.scrollWidth-Ob(this)-this.display.barWidth,clientHeight:Qb(this),clientWidth:Pb(this)}},scrollIntoView:pd((function(a,b){null==a?(a={from:this.doc.sel.primary().head,to:null},null==b&&(b=this.options.cursorScrollMargin)):"number"==typeof a?a={from:J(a,0),to:null}:null==a.from&&(a={from:a,to:null}),a.to||(a.to=a.from),a.margin=b||0,null!=a.from.line?Xc(this,a):Zc(this,a.from,a.to,a.margin)})),setSize:pd((function(a,b){var c=this,d=function(a){return"number"==typeof a||/^\d+$/.test(String(a))?a+"px":a};null!=a&&(this.display.wrapper.style.width=d(a)),null!=b&&(this.display.wrapper.style.height=d(b)),this.options.lineWrapping&&bc(this);var e=this.display.viewFrom;this.doc.iter(e,this.display.viewTo,(function(a){if(a.widgets)for(var b=0;b<a.widgets.length;b++)if(a.widgets[b].noHScroll){sd(c,e,"widget");break}++e})),this.curOp.forceUpdate=!0,Ba(this,"refresh",this)})),operation:function(a){return nd(this,a)},startOperation:function(){return fd(this)},endOperation:function(){return gd(this)},refresh:pd((function(){var a=this.display.cachedTextHeight;rd(this),this.curOp.forceUpdate=!0,cc(this),Wc(this,this.doc.scrollLeft,this.doc.scrollTop),Gd(this),(null==a||Math.abs(a-tc(this.display))>.5)&&yc(this),Ba(this,"refresh",this)})),swapDoc:pd((function(a){var b=this.doc;return b.cm=null,Zd(this,a),cc(this),this.display.input.reset(),Wc(this,a.scrollLeft,a.scrollTop),this.curOp.forceScroll=!0,vb(this,"swapDoc",this,b),b})),getInputField:function(){return this.display.input.getField()},getWrapperElement:function(){return this.display.wrapper},getScrollerElement:function(){return this.display.scroller},getGutterElement:function(){return this.display.gutters}},Fa(a),a.registerHelper=function(b,d,e){c.hasOwnProperty(b)||(c[b]=a[b]={_global:[]}),c[b][d]=e},a.registerGlobalHelper=function(b,d,e,f){a.registerHelper(b,d,f),c[b]._global.push({pred:e,val:f})}},ei=function(a){this.cm=a,this.lastAnchorNode=this.lastAnchorOffset=this.lastFocusNode=this.lastFocusOffset=null,this.polling=new Pg,this.composing=null,this.gracePeriod=!1,this.readDOMTimeout=null};ei.prototype.init=function(a){function b(a){if(!Ca(e,a)){if(e.somethingSelected())Zf({lineWise:!1,text:e.getSelections()}),"cut"==a.type&&e.replaceSelection("",null,"cut");else{if(!e.options.lineWiseCopyCut)return;var b=bg(e);Zf({lineWise:!0,text:b.text}),"cut"==a.type&&e.operation((function(){e.setSelections(b.ranges,0,Ug),e.replaceSelection("",null,"cut")}))}if(a.clipboardData){a.clipboardData.clearData();var c=ci.text.join("\n");if(a.clipboardData.setData("Text",c),a.clipboardData.getData("Text")==c)return void a.preventDefault()}var g=dg(),h=g.firstChild;e.display.lineSpace.insertBefore(g,e.display.lineSpace.firstChild),h.value=ci.text.join("\n");var i=document.activeElement;Og(h),setTimeout((function(){e.display.lineSpace.removeChild(g),i.focus(),i==f&&d.showPrimarySelection()}),50)}}var c=this,d=this,e=d.cm,f=d.div=a.lineDiv;cg(f,e.options.spellcheck),dh(f,"paste",(function(a){Ca(e,a)||_f(a,e)||vg<=11&&setTimeout(od(e,(function(){return c.updateFromDOM()})),20)})),dh(f,"compositionstart",(function(a){c.composing={data:a.data,done:!1}})),dh(f,"compositionupdate",(function(a){c.composing||(c.composing={data:a.data,done:!1})})),dh(f,"compositionend",(function(a){c.composing&&(a.data!=c.composing.data&&c.readFromDOMSoon(),c.composing.done=!0)})),dh(f,"touchstart",(function(){return d.forceCompositionEnd()})),dh(f,"input",(function(){c.composing||c.readFromDOMSoon()})),dh(f,"copy",b),dh(f,"cut",b)},ei.prototype.prepareSelection=function(){var a=Cc(this.cm,!1);return a.focus=this.cm.state.focused,a},ei.prototype.showSelection=function(a,b){a&&this.cm.display.view.length&&((a.focus||b)&&this.showPrimarySelection(),this.showMultipleSelections(a))},ei.prototype.getSelection=function(){return this.cm.display.wrapper.ownerDocument.getSelection()},ei.prototype.showPrimarySelection=function(){var a=this.getSelection(),b=this.cm,c=b.doc.sel.primary(),d=c.from(),e=c.to();if(b.display.viewTo==b.display.viewFrom||d.line>=b.display.viewTo||e.line<b.display.viewFrom)return void a.removeAllRanges();var f=kg(b,a.anchorNode,a.anchorOffset),g=kg(b,a.focusNode,a.focusOffset);if(!f||f.bad||!g||g.bad||0!=K(O(f,g),d)||0!=K(N(f,g),e)){var h=b.display.view,i=d.line>=b.display.viewFrom&&gg(b,d)||{node:h[0].measure.map[2],offset:0},j=e.line<b.display.viewTo&&gg(b,e);if(!j){var k=h[h.length-1].measure,l=k.maps?k.maps[k.maps.length-1]:k.map;j={node:l[l.length-1],offset:l[l.length-2]-l[l.length-3]}}if(!i||!j)return void a.removeAllRanges();var m,n=a.rangeCount&&a.getRangeAt(0);try{m=Kg(i.node,i.offset,j.offset,j.node)}catch(a){}m&&(!qg&&b.state.focused?(a.collapse(i.node,i.offset),m.collapsed||(a.removeAllRanges(),a.addRange(m))):(a.removeAllRanges(),a.addRange(m)),n&&null==a.anchorNode?a.addRange(n):qg&&this.startGracePeriod()),this.rememberSelection()}},ei.prototype.startGracePeriod=function(){var a=this;clearTimeout(this.gracePeriod),this.gracePeriod=setTimeout((function(){a.gracePeriod=!1,a.selectionChanged()&&a.cm.operation((function(){return a.cm.curOp.selectionChanged=!0}))}),20)},ei.prototype.showMultipleSelections=function(a){c(this.cm.display.cursorDiv,a.cursors),c(this.cm.display.selectionDiv,a.selection)},ei.prototype.rememberSelection=function(){var a=this.getSelection();this.lastAnchorNode=a.anchorNode,this.lastAnchorOffset=a.anchorOffset,this.lastFocusNode=a.focusNode,this.lastFocusOffset=a.focusOffset},ei.prototype.selectionInEditor=function(){var a=this.getSelection();if(!a.rangeCount)return!1;var b=a.getRangeAt(0).commonAncestorContainer;return f(this.div,b)},ei.prototype.focus=function(){"nocursor"!=this.cm.options.readOnly&&(this.selectionInEditor()||this.showSelection(this.prepareSelection(),!0),this.div.focus())},ei.prototype.blur=function(){this.div.blur()},ei.prototype.getField=function(){return this.div},ei.prototype.supportsTouch=function(){return!0},ei.prototype.receivedFocus=function(){function a(){b.cm.state.focused&&(b.pollSelection(),b.polling.set(b.cm.options.pollInterval,a))}var b=this;this.selectionInEditor()?this.pollSelection():nd(this.cm,(function(){return b.cm.curOp.selectionChanged=!0})),this.polling.set(this.cm.options.pollInterval,a)},ei.prototype.selectionChanged=function(){var a=this.getSelection();return a.anchorNode!=this.lastAnchorNode||a.anchorOffset!=this.lastAnchorOffset||a.focusNode!=this.lastFocusNode||a.focusOffset!=this.lastFocusOffset},ei.prototype.pollSelection=function(){if(null==this.readDOMTimeout&&!this.gracePeriod&&this.selectionChanged()){var a=this.getSelection(),b=this.cm;if(Eg&&yg&&this.cm.options.gutters.length&&hg(a.anchorNode))return this.cm.triggerOnKeyDown({type:"keydown",keyCode:8,preventDefault:Math.abs}),this.blur(),void this.focus();if(!this.composing){this.rememberSelection();var c=kg(b,a.anchorNode,a.anchorOffset),d=kg(b,a.focusNode,a.focusOffset);c&&d&&nd(b,(function(){ue(b.doc,Od(c,d),Ug),(c.bad||d.bad)&&(b.curOp.selectionChanged=!0)}))}}},ei.prototype.pollContent=function(){null!=this.readDOMTimeout&&(clearTimeout(this.readDOMTimeout),this.readDOMTimeout=null);var a=this.cm,b=a.display,c=a.doc.sel.primary(),d=c.from(),e=c.to();if(0==d.ch&&d.line>a.firstLine()&&(d=J(d.line-1,B(a.doc,d.line-1).length)),e.ch==B(a.doc,e.line).text.length&&e.line<a.lastLine()&&(e=J(e.line+1,0)),d.line<b.viewFrom||e.line>b.viewTo-1)return!1;var f,g,h;d.line==b.viewFrom||0==(f=Ac(a,d.line))?(g=F(b.view[0].line),h=b.view[0].node):(g=F(b.view[f].line),h=b.view[f-1].node.nextSibling);var i,j,k=Ac(a,e.line);if(k==b.view.length-1?(i=b.viewTo-1,j=b.lineDiv.lastChild):(i=F(b.view[k+1].line)-1,j=b.view[k+1].node.previousSibling),!h)return!1;for(var l=a.doc.splitLines(jg(a,h,j,g,i)),m=C(a.doc,J(g,0),J(i,B(a.doc,i).text.length));l.length>1&&m.length>1;)if(p(l)==p(m))l.pop(),m.pop(),i--;else{if(l[0]!=m[0])break;l.shift(),m.shift(),g++}for(var n=0,o=0,q=l[0],r=m[0],s=Math.min(q.length,r.length);n<s&&q.charCodeAt(n)==r.charCodeAt(n);)++n;for(var t=p(l),u=p(m),v=Math.min(t.length-(1==l.length?n:0),u.length-(1==m.length?n:0));o<v&&t.charCodeAt(t.length-o-1)==u.charCodeAt(u.length-o-1);)++o;if(1==l.length&&1==m.length&&g==d.line)for(;n&&n>d.ch&&t.charCodeAt(t.length-o-1)==u.charCodeAt(u.length-o-1);)n--,o++;l[l.length-1]=t.slice(0,t.length-o).replace(/^\u200b+/,""),
+l[0]=l[0].slice(n).replace(/\u200b+$/,"");var w=J(g,n),x=J(i,m.length?p(m).length-o:0);return l.length>1||l[0]||K(w,x)?(Ke(a.doc,l,w,x,"+input"),!0):void 0},ei.prototype.ensurePolled=function(){this.forceCompositionEnd()},ei.prototype.reset=function(){this.forceCompositionEnd()},ei.prototype.forceCompositionEnd=function(){this.composing&&(clearTimeout(this.readDOMTimeout),this.composing=null,this.updateFromDOM(),this.div.blur(),this.div.focus())},ei.prototype.readFromDOMSoon=function(){var a=this;null==this.readDOMTimeout&&(this.readDOMTimeout=setTimeout((function(){if(a.readDOMTimeout=null,a.composing){if(!a.composing.done)return;a.composing=null}a.updateFromDOM()}),80))},ei.prototype.updateFromDOM=function(){var a=this;!this.cm.isReadOnly()&&this.pollContent()||nd(this.cm,(function(){return rd(a.cm)}))},ei.prototype.setUneditable=function(a){a.contentEditable="false"},ei.prototype.onKeyPress=function(a){0==a.charCode||this.composing||(a.preventDefault(),this.cm.isReadOnly()||od(this.cm,$f)(this.cm,String.fromCharCode(null==a.charCode?a.keyCode:a.charCode),0))},ei.prototype.readOnlyChanged=function(a){this.div.contentEditable=String("nocursor"!=a)},ei.prototype.onContextMenu=function(){},ei.prototype.resetPosition=function(){},ei.prototype.needsContentAttribute=!0;var fi=function(a){this.cm=a,this.prevInput="",this.pollingFast=!1,this.polling=new Pg,this.hasSelection=!1,this.composing=null};fi.prototype.init=function(a){function b(a){if(!Ca(e,a)){if(e.somethingSelected())Zf({lineWise:!1,text:e.getSelections()});else{if(!e.options.lineWiseCopyCut)return;var b=bg(e);Zf({lineWise:!0,text:b.text}),"cut"==a.type?e.setSelections(b.ranges,null,Ug):(d.prevInput="",f.value=b.text.join("\n"),Og(f))}"cut"==a.type&&(e.state.cutIncoming=!0)}}var c=this,d=this,e=this.cm;this.createField(a);var f=this.textarea;a.wrapper.insertBefore(this.wrapper,a.wrapper.firstChild),Dg&&(f.style.width="0px"),dh(f,"input",(function(){ug&&vg>=9&&c.hasSelection&&(c.hasSelection=null),d.poll()})),dh(f,"paste",(function(a){Ca(e,a)||_f(a,e)||(e.state.pasteIncoming=!0,d.fastPoll())})),dh(f,"cut",b),dh(f,"copy",b),dh(a.scroller,"paste",(function(b){Kb(a,b)||Ca(e,b)||(e.state.pasteIncoming=!0,d.focus())})),dh(a.lineSpace,"selectstart",(function(b){Kb(a,b)||Ga(b)})),dh(f,"compositionstart",(function(){var a=e.getCursor("from");d.composing&&d.composing.range.clear(),d.composing={start:a,range:e.markText(a,e.getCursor("to"),{className:"CodeMirror-composing"})}})),dh(f,"compositionend",(function(){d.composing&&(d.poll(),d.composing.range.clear(),d.composing=null)}))},fi.prototype.createField=function(a){this.wrapper=dg(),this.textarea=this.wrapper.firstChild},fi.prototype.prepareSelection=function(){var a=this.cm,b=a.display,c=a.doc,d=Cc(a);if(a.options.moveInputWithCursor){var e=jc(a,c.sel.primary().head,"div"),f=b.wrapper.getBoundingClientRect(),g=b.lineDiv.getBoundingClientRect();d.teTop=Math.max(0,Math.min(b.wrapper.clientHeight-10,e.top+g.top-f.top)),d.teLeft=Math.max(0,Math.min(b.wrapper.clientWidth-10,e.left+g.left-f.left))}return d},fi.prototype.showSelection=function(a){var b=this.cm,d=b.display;c(d.cursorDiv,a.cursors),c(d.selectionDiv,a.selection),null!=a.teTop&&(this.wrapper.style.top=a.teTop+"px",this.wrapper.style.left=a.teLeft+"px")},fi.prototype.reset=function(a){if(!this.contextMenuPending&&!this.composing){var b=this.cm;if(b.somethingSelected()){this.prevInput="";var c=b.getSelection();this.textarea.value=c,b.state.focused&&Og(this.textarea),ug&&vg>=9&&(this.hasSelection=c)}else a||(this.prevInput=this.textarea.value="",ug&&vg>=9&&(this.hasSelection=null))}},fi.prototype.getField=function(){return this.textarea},fi.prototype.supportsTouch=function(){return!1},fi.prototype.focus=function(){if("nocursor"!=this.cm.options.readOnly&&(!Fg||g()!=this.textarea))try{this.textarea.focus()}catch(a){}},fi.prototype.blur=function(){this.textarea.blur()},fi.prototype.resetPosition=function(){this.wrapper.style.top=this.wrapper.style.left=0},fi.prototype.receivedFocus=function(){this.slowPoll()},fi.prototype.slowPoll=function(){var a=this;this.pollingFast||this.polling.set(this.cm.options.pollInterval,(function(){a.poll(),a.cm.state.focused&&a.slowPoll()}))},fi.prototype.fastPoll=function(){function a(){var d=c.poll();d||b?(c.pollingFast=!1,c.slowPoll()):(b=!0,c.polling.set(60,a))}var b=!1,c=this;c.pollingFast=!0,c.polling.set(20,a)},fi.prototype.poll=function(){var a=this,b=this.cm,c=this.textarea,d=this.prevInput;if(this.contextMenuPending||!b.state.focused||gh(c)&&!d&&!this.composing||b.isReadOnly()||b.options.disableInput||b.state.keySeq)return!1;var e=c.value;if(e==d&&!b.somethingSelected())return!1;if(ug&&vg>=9&&this.hasSelection===e||Gg&&/[\uf700-\uf7ff]/.test(e))return b.display.input.reset(),!1;if(b.doc.sel==b.display.selForContextMenu){var f=e.charCodeAt(0);if(8203!=f||d||(d="​"),8666==f)return this.reset(),this.cm.execCommand("undo")}for(var g=0,h=Math.min(d.length,e.length);g<h&&d.charCodeAt(g)==e.charCodeAt(g);)++g;return nd(b,(function(){$f(b,e.slice(g),d.length-g,null,a.composing?"*compose":null),e.length>1e3||e.indexOf("\n")>-1?c.value=a.prevInput="":a.prevInput=e,a.composing&&(a.composing.range.clear(),a.composing.range=b.markText(a.composing.start,b.getCursor("to"),{className:"CodeMirror-composing"}))})),!0},fi.prototype.ensurePolled=function(){this.pollingFast&&this.poll()&&(this.pollingFast=!1)},fi.prototype.onKeyPress=function(){ug&&vg>=9&&(this.hasSelection=null),this.fastPoll()},fi.prototype.onContextMenu=function(a){function b(){if(null!=g.selectionStart){var a=e.somethingSelected(),b="​"+(a?g.value:"");g.value="⇚",g.value=b,d.prevInput=a?"":"​",g.selectionStart=1,g.selectionEnd=b.length,f.selForContextMenu=e.doc.sel}}function c(){if(d.contextMenuPending=!1,d.wrapper.style.cssText=l,g.style.cssText=k,ug&&vg<9&&f.scrollbars.setScrollTop(f.scroller.scrollTop=i),null!=g.selectionStart){(!ug||ug&&vg<9)&&b();var a=0,c=function(){f.selForContextMenu==e.doc.sel&&0==g.selectionStart&&g.selectionEnd>0&&"​"==d.prevInput?od(e,Ce)(e):a++<10?f.detectingSelectAll=setTimeout(c,500):(f.selForContextMenu=null,f.input.reset())};f.detectingSelectAll=setTimeout(c,200)}}var d=this,e=d.cm,f=e.display,g=d.textarea,h=zc(e,a),i=f.scroller.scrollTop;if(h&&!zg){var j=e.options.resetSelectionOnContextMenu;j&&e.doc.sel.contains(h)==-1&&od(e,ue)(e.doc,Od(h),Ug);var k=g.style.cssText,l=d.wrapper.style.cssText;d.wrapper.style.cssText="position: absolute";var m=d.wrapper.getBoundingClientRect();g.style.cssText="position: absolute; width: 30px; height: 30px;\n      top: "+(a.clientY-m.top-5)+"px; left: "+(a.clientX-m.left-5)+"px;\n      z-index: 1000; background: "+(ug?"rgba(255, 255, 255, .05)":"transparent")+";\n      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";var n;if(wg&&(n=window.scrollY),f.input.focus(),wg&&window.scrollTo(null,n),f.input.reset(),e.somethingSelected()||(g.value=d.prevInput=" "),d.contextMenuPending=!0,f.selForContextMenu=e.doc.sel,clearTimeout(f.detectingSelectAll),ug&&vg>=9&&b(),Mg){Ja(a);var o=function(){Aa(window,"mouseup",o),setTimeout(c,20)};dh(window,"mouseup",o)}else setTimeout(c,50)}},fi.prototype.readOnlyChanged=function(a){a||this.reset(),this.textarea.disabled="nocursor"==a},fi.prototype.setUneditable=function(){},fi.prototype.needsContentAttribute=!1,Sf(Wf),di(Wf);var gi="iter insert remove copy getEditor constructor".split(" ");for(var hi in Lh.prototype)Lh.prototype.hasOwnProperty(hi)&&m(gi,hi)<0&&(Wf.prototype[hi]=(function(a){return function(){return a.apply(this.doc,arguments)}})(Lh.prototype[hi]));return Fa(Lh),Wf.inputStyles={textarea:fi,contenteditable:ei},Wf.defineMode=function(a){Wf.defaults.mode||"null"==a||(Wf.defaults.mode=a),Pa.apply(this,arguments)},Wf.defineMIME=Qa,Wf.defineMode("null",(function(){return{token:function(a){return a.skipToEnd()}}})),Wf.defineMIME("text/plain","null"),Wf.defineExtension=function(a,b){Wf.prototype[a]=b},Wf.defineDocExtension=function(a,b){Lh.prototype[a]=b},Wf.fromTextArea=mg,ng(Wf),Wf.version="5.38.0",Wf}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/apl/apl.js b/core/media/editors/codemirror/mode/apl/apl.js
new file mode 100644
index 00000000..caafe4e9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/apl/apl.js
@@ -0,0 +1,174 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("apl", function() {
+  var builtInOps = {
+    ".": "innerProduct",
+    "\\": "scan",
+    "/": "reduce",
+    "⌿": "reduce1Axis",
+    "⍀": "scan1Axis",
+    "¨": "each",
+    "⍣": "power"
+  };
+  var builtInFuncs = {
+    "+": ["conjugate", "add"],
+    "−": ["negate", "subtract"],
+    "×": ["signOf", "multiply"],
+    "÷": ["reciprocal", "divide"],
+    "⌈": ["ceiling", "greaterOf"],
+    "⌊": ["floor", "lesserOf"],
+    "∣": ["absolute", "residue"],
+    "⍳": ["indexGenerate", "indexOf"],
+    "?": ["roll", "deal"],
+    "⋆": ["exponentiate", "toThePowerOf"],
+    "⍟": ["naturalLog", "logToTheBase"],
+    "○": ["piTimes", "circularFuncs"],
+    "!": ["factorial", "binomial"],
+    "⌹": ["matrixInverse", "matrixDivide"],
+    "<": [null, "lessThan"],
+    "≤": [null, "lessThanOrEqual"],
+    "=": [null, "equals"],
+    ">": [null, "greaterThan"],
+    "≥": [null, "greaterThanOrEqual"],
+    "≠": [null, "notEqual"],
+    "≡": ["depth", "match"],
+    "≢": [null, "notMatch"],
+    "∈": ["enlist", "membership"],
+    "⍷": [null, "find"],
+    "∪": ["unique", "union"],
+    "∩": [null, "intersection"],
+    "∼": ["not", "without"],
+    "∨": [null, "or"],
+    "∧": [null, "and"],
+    "⍱": [null, "nor"],
+    "⍲": [null, "nand"],
+    "⍴": ["shapeOf", "reshape"],
+    ",": ["ravel", "catenate"],
+    "⍪": [null, "firstAxisCatenate"],
+    "⌽": ["reverse", "rotate"],
+    "⊖": ["axis1Reverse", "axis1Rotate"],
+    "⍉": ["transpose", null],
+    "↑": ["first", "take"],
+    "↓": [null, "drop"],
+    "⊂": ["enclose", "partitionWithAxis"],
+    "⊃": ["diclose", "pick"],
+    "⌷": [null, "index"],
+    "⍋": ["gradeUp", null],
+    "⍒": ["gradeDown", null],
+    "⊤": ["encode", null],
+    "⊥": ["decode", null],
+    "⍕": ["format", "formatByExample"],
+    "⍎": ["execute", null],
+    "⊣": ["stop", "left"],
+    "⊢": ["pass", "right"]
+  };
+
+  var isOperator = /[\.\/⌿⍀¨⍣]/;
+  var isNiladic = /⍬/;
+  var isFunction = /[\+−×÷⌈⌊∣⍳\?⋆⍟○!⌹<≤=>≥≠≡≢∈⍷∪∩∼∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢]/;
+  var isArrow = /←/;
+  var isComment = /[⍝#].*$/;
+
+  var stringEater = function(type) {
+    var prev;
+    prev = false;
+    return function(c) {
+      prev = c;
+      if (c === type) {
+        return prev === "\\";
+      }
+      return true;
+    };
+  };
+  return {
+    startState: function() {
+      return {
+        prev: false,
+        func: false,
+        op: false,
+        string: false,
+        escape: false
+      };
+    },
+    token: function(stream, state) {
+      var ch, funcName;
+      if (stream.eatSpace()) {
+        return null;
+      }
+      ch = stream.next();
+      if (ch === '"' || ch === "'") {
+        stream.eatWhile(stringEater(ch));
+        stream.next();
+        state.prev = true;
+        return "string";
+      }
+      if (/[\[{\(]/.test(ch)) {
+        state.prev = false;
+        return null;
+      }
+      if (/[\]}\)]/.test(ch)) {
+        state.prev = true;
+        return null;
+      }
+      if (isNiladic.test(ch)) {
+        state.prev = false;
+        return "niladic";
+      }
+      if (/[¯\d]/.test(ch)) {
+        if (state.func) {
+          state.func = false;
+          state.prev = false;
+        } else {
+          state.prev = true;
+        }
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (isOperator.test(ch)) {
+        return "operator apl-" + builtInOps[ch];
+      }
+      if (isArrow.test(ch)) {
+        return "apl-arrow";
+      }
+      if (isFunction.test(ch)) {
+        funcName = "apl-";
+        if (builtInFuncs[ch] != null) {
+          if (state.prev) {
+            funcName += builtInFuncs[ch][1];
+          } else {
+            funcName += builtInFuncs[ch][0];
+          }
+        }
+        state.func = true;
+        state.prev = false;
+        return "function " + funcName;
+      }
+      if (isComment.test(ch)) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (ch === "∘" && stream.peek() === ".") {
+        stream.next();
+        return "function jot-dot";
+      }
+      stream.eatWhile(/[\w\$_]/);
+      state.prev = true;
+      return "keyword";
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/apl", "apl");
+
+});
diff --git a/core/media/editors/codemirror/mode/apl/apl.min.js b/core/media/editors/codemirror/mode/apl/apl.min.js
new file mode 100644
index 00000000..237d17ad
--- /dev/null
+++ b/core/media/editors/codemirror/mode/apl/apl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("apl",(function(){var a={".":"innerProduct","\\":"scan","/":"reduce","⌿":"reduce1Axis","⍀":"scan1Axis","¨":"each","⍣":"power"},b={"+":["conjugate","add"],"−":["negate","subtract"],"×":["signOf","multiply"],"÷":["reciprocal","divide"],"⌈":["ceiling","greaterOf"],"⌊":["floor","lesserOf"],"∣":["absolute","residue"],"⍳":["indexGenerate","indexOf"],"?":["roll","deal"],"⋆":["exponentiate","toThePowerOf"],"⍟":["naturalLog","logToTheBase"],"○":["piTimes","circularFuncs"],"!":["factorial","binomial"],"⌹":["matrixInverse","matrixDivide"],"<":[null,"lessThan"],"≤":[null,"lessThanOrEqual"],"=":[null,"equals"],">":[null,"greaterThan"],"≥":[null,"greaterThanOrEqual"],"≠":[null,"notEqual"],"≡":["depth","match"],"≢":[null,"notMatch"],"∈":["enlist","membership"],"⍷":[null,"find"],"∪":["unique","union"],"∩":[null,"intersection"],"∼":["not","without"],"∨":[null,"or"],"∧":[null,"and"],"⍱":[null,"nor"],"⍲":[null,"nand"],"⍴":["shapeOf","reshape"],",":["ravel","catenate"],"⍪":[null,"firstAxisCatenate"],"⌽":["reverse","rotate"],"⊖":["axis1Reverse","axis1Rotate"],"⍉":["transpose",null],"↑":["first","take"],"↓":[null,"drop"],"⊂":["enclose","partitionWithAxis"],"⊃":["diclose","pick"],"⌷":[null,"index"],"⍋":["gradeUp",null],"⍒":["gradeDown",null],"⊤":["encode",null],"⊥":["decode",null],"⍕":["format","formatByExample"],"⍎":["execute",null],"⊣":["stop","left"],"⊢":["pass","right"]},c=/[\.\/⌿⍀¨⍣]/,d=/⍬/,e=/[\+−×÷⌈⌊∣⍳\?⋆⍟○!⌹<≤=>≥≠≡≢∈⍷∪∩∼∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢]/,f=/←/,g=/[⍝#].*$/,h=function(a){var b;return b=!1,function(c){return b=c,c!==a||"\\"===b}};return{startState:function(){return{prev:!1,func:!1,op:!1,string:!1,escape:!1}},token:function(i,j){var k,l;return i.eatSpace()?null:(k=i.next(),'"'===k||"'"===k?(i.eatWhile(h(k)),i.next(),j.prev=!0,"string"):/[\[{\(]/.test(k)?(j.prev=!1,null):/[\]}\)]/.test(k)?(j.prev=!0,null):d.test(k)?(j.prev=!1,"niladic"):/[¯\d]/.test(k)?(j.func?(j.func=!1,j.prev=!1):j.prev=!0,i.eatWhile(/[\w\.]/),"number"):c.test(k)?"operator apl-"+a[k]:f.test(k)?"apl-arrow":e.test(k)?(l="apl-",null!=b[k]&&(l+=j.prev?b[k][1]:b[k][0]),j.func=!0,j.prev=!1,"function "+l):g.test(k)?(i.skipToEnd(),"comment"):"∘"===k&&"."===i.peek()?(i.next(),"function jot-dot"):(i.eatWhile(/[\w\$_]/),j.prev=!0,"keyword"))}}})),a.defineMIME("text/apl","apl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/asciiarmor/asciiarmor.js b/core/media/editors/codemirror/mode/asciiarmor/asciiarmor.js
new file mode 100644
index 00000000..fa1b0f8c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/asciiarmor/asciiarmor.js
@@ -0,0 +1,74 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function errorIfNotEmpty(stream) {
+    var nonWS = stream.match(/^\s*\S/);
+    stream.skipToEnd();
+    return nonWS ? "error" : null;
+  }
+
+  CodeMirror.defineMode("asciiarmor", function() {
+    return {
+      token: function(stream, state) {
+        var m;
+        if (state.state == "top") {
+          if (stream.sol() && (m = stream.match(/^-----BEGIN (.*)?-----\s*$/))) {
+            state.state = "headers";
+            state.type = m[1];
+            return "tag";
+          }
+          return errorIfNotEmpty(stream);
+        } else if (state.state == "headers") {
+          if (stream.sol() && stream.match(/^\w+:/)) {
+            state.state = "header";
+            return "atom";
+          } else {
+            var result = errorIfNotEmpty(stream);
+            if (result) state.state = "body";
+            return result;
+          }
+        } else if (state.state == "header") {
+          stream.skipToEnd();
+          state.state = "headers";
+          return "string";
+        } else if (state.state == "body") {
+          if (stream.sol() && (m = stream.match(/^-----END (.*)?-----\s*$/))) {
+            if (m[1] != state.type) return "error";
+            state.state = "end";
+            return "tag";
+          } else {
+            if (stream.eatWhile(/[A-Za-z0-9+\/=]/)) {
+              return null;
+            } else {
+              stream.next();
+              return "error";
+            }
+          }
+        } else if (state.state == "end") {
+          return errorIfNotEmpty(stream);
+        }
+      },
+      blankLine: function(state) {
+        if (state.state == "headers") state.state = "body";
+      },
+      startState: function() {
+        return {state: "top", type: null};
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("application/pgp", "asciiarmor");
+  CodeMirror.defineMIME("application/pgp-encrypted", "asciiarmor");
+  CodeMirror.defineMIME("application/pgp-keys", "asciiarmor");
+  CodeMirror.defineMIME("application/pgp-signature", "asciiarmor");
+});
diff --git a/core/media/editors/codemirror/mode/asciiarmor/asciiarmor.min.js b/core/media/editors/codemirror/mode/asciiarmor/asciiarmor.min.js
new file mode 100644
index 00000000..7c74b20e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/asciiarmor/asciiarmor.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=a.match(/^\s*\S/);return a.skipToEnd(),b?"error":null}a.defineMode("asciiarmor",(function(){return{token:function(a,c){var d;if("top"==c.state)return a.sol()&&(d=a.match(/^-----BEGIN (.*)?-----\s*$/))?(c.state="headers",c.type=d[1],"tag"):b(a);if("headers"==c.state){if(a.sol()&&a.match(/^\w+:/))return c.state="header","atom";var e=b(a);return e&&(c.state="body"),e}return"header"==c.state?(a.skipToEnd(),c.state="headers","string"):"body"==c.state?a.sol()&&(d=a.match(/^-----END (.*)?-----\s*$/))?d[1]!=c.type?"error":(c.state="end","tag"):a.eatWhile(/[A-Za-z0-9+\/=]/)?null:(a.next(),"error"):"end"==c.state?b(a):void 0},blankLine:function(a){"headers"==a.state&&(a.state="body")},startState:function(){return{state:"top",type:null}}}})),a.defineMIME("application/pgp","asciiarmor"),a.defineMIME("application/pgp-encrypted","asciiarmor"),a.defineMIME("application/pgp-keys","asciiarmor"),a.defineMIME("application/pgp-signature","asciiarmor")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/asn.1/asn.1.js b/core/media/editors/codemirror/mode/asn.1/asn.1.js
new file mode 100644
index 00000000..9600247e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/asn.1/asn.1.js
@@ -0,0 +1,204 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("asn.1", function(config, parserConfig) {
+    var indentUnit = config.indentUnit,
+        keywords = parserConfig.keywords || {},
+        cmipVerbs = parserConfig.cmipVerbs || {},
+        compareTypes = parserConfig.compareTypes || {},
+        status = parserConfig.status || {},
+        tags = parserConfig.tags || {},
+        storage = parserConfig.storage || {},
+        modifier = parserConfig.modifier || {},
+        accessTypes = parserConfig.accessTypes|| {},
+        multiLineStrings = parserConfig.multiLineStrings,
+        indentStatements = parserConfig.indentStatements !== false;
+    var isOperatorChar = /[\|\^]/;
+    var curPunc;
+
+    function tokenBase(stream, state) {
+      var ch = stream.next();
+      if (ch == '"' || ch == "'") {
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      if (/[\[\]\(\){}:=,;]/.test(ch)) {
+        curPunc = ch;
+        return "punctuation";
+      }
+      if (ch == "-"){
+        if (stream.eat("-")) {
+          stream.skipToEnd();
+          return "comment";
+        }
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (isOperatorChar.test(ch)) {
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+
+      stream.eatWhile(/[\w\-]/);
+      var cur = stream.current();
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      if (cmipVerbs.propertyIsEnumerable(cur)) return "variable cmipVerbs";
+      if (compareTypes.propertyIsEnumerable(cur)) return "atom compareTypes";
+      if (status.propertyIsEnumerable(cur)) return "comment status";
+      if (tags.propertyIsEnumerable(cur)) return "variable-3 tags";
+      if (storage.propertyIsEnumerable(cur)) return "builtin storage";
+      if (modifier.propertyIsEnumerable(cur)) return "string-2 modifier";
+      if (accessTypes.propertyIsEnumerable(cur)) return "atom accessTypes";
+
+      return "variable";
+    }
+
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, next, end = false;
+        while ((next = stream.next()) != null) {
+          if (next == quote && !escaped){
+            var afterNext = stream.peek();
+            //look if the character if the quote is like the B in '10100010'B
+            if (afterNext){
+              afterNext = afterNext.toLowerCase();
+              if(afterNext == "b" || afterNext == "h" || afterNext == "o")
+                stream.next();
+            }
+            end = true; break;
+          }
+          escaped = !escaped && next == "\\";
+        }
+        if (end || !(escaped || multiLineStrings))
+          state.tokenize = null;
+        return "string";
+      };
+    }
+
+    function Context(indented, column, type, align, prev) {
+      this.indented = indented;
+      this.column = column;
+      this.type = type;
+      this.align = align;
+      this.prev = prev;
+    }
+    function pushContext(state, col, type) {
+      var indent = state.indented;
+      if (state.context && state.context.type == "statement")
+        indent = state.context.indented;
+      return state.context = new Context(indent, col, type, null, state.context);
+    }
+    function popContext(state) {
+      var t = state.context.type;
+      if (t == ")" || t == "]" || t == "}")
+        state.indented = state.context.indented;
+      return state.context = state.context.prev;
+    }
+
+    //Interface
+    return {
+      startState: function(basecolumn) {
+        return {
+          tokenize: null,
+          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+          indented: 0,
+          startOfLine: true
+        };
+      },
+
+      token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+          if (ctx.align == null) ctx.align = false;
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        curPunc = null;
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
+            && ctx.type == "statement"){
+          popContext(state);
+        }
+        else if (curPunc == "{") pushContext(state, stream.column(), "}");
+        else if (curPunc == "[") pushContext(state, stream.column(), "]");
+        else if (curPunc == "(") pushContext(state, stream.column(), ")");
+        else if (curPunc == "}") {
+          while (ctx.type == "statement") ctx = popContext(state);
+          if (ctx.type == "}") ctx = popContext(state);
+          while (ctx.type == "statement") ctx = popContext(state);
+        }
+        else if (curPunc == ctx.type) popContext(state);
+        else if (indentStatements && (((ctx.type == "}" || ctx.type == "top")
+            && curPunc != ';') || (ctx.type == "statement"
+            && curPunc == "newstatement")))
+          pushContext(state, stream.column(), "statement");
+
+        state.startOfLine = false;
+        return style;
+      },
+
+      electricChars: "{}",
+      lineComment: "--",
+      fold: "brace"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  CodeMirror.defineMIME("text/x-ttcn-asn", {
+    name: "asn.1",
+    keywords: words("DEFINITIONS OBJECTS IF DERIVED INFORMATION ACTION" +
+    " REPLY ANY NAMED CHARACTERIZED BEHAVIOUR REGISTERED" +
+    " WITH AS IDENTIFIED CONSTRAINED BY PRESENT BEGIN" +
+    " IMPORTS FROM UNITS SYNTAX MIN-ACCESS MAX-ACCESS" +
+    " MINACCESS MAXACCESS REVISION STATUS DESCRIPTION" +
+    " SEQUENCE SET COMPONENTS OF CHOICE DistinguishedName" +
+    " ENUMERATED SIZE MODULE END INDEX AUGMENTS EXTENSIBILITY" +
+    " IMPLIED EXPORTS"),
+    cmipVerbs: words("ACTIONS ADD GET NOTIFICATIONS REPLACE REMOVE"),
+    compareTypes: words("OPTIONAL DEFAULT MANAGED MODULE-TYPE MODULE_IDENTITY" +
+    " MODULE-COMPLIANCE OBJECT-TYPE OBJECT-IDENTITY" +
+    " OBJECT-COMPLIANCE MODE CONFIRMED CONDITIONAL" +
+    " SUBORDINATE SUPERIOR CLASS TRUE FALSE NULL" +
+    " TEXTUAL-CONVENTION"),
+    status: words("current deprecated mandatory obsolete"),
+    tags: words("APPLICATION AUTOMATIC EXPLICIT IMPLICIT PRIVATE TAGS" +
+    " UNIVERSAL"),
+    storage: words("BOOLEAN INTEGER OBJECT IDENTIFIER BIT OCTET STRING" +
+    " UTCTime InterfaceIndex IANAifType CMIP-Attribute" +
+    " REAL PACKAGE PACKAGES IpAddress PhysAddress" +
+    " NetworkAddress BITS BMPString TimeStamp TimeTicks" +
+    " TruthValue RowStatus DisplayString GeneralString" +
+    " GraphicString IA5String NumericString" +
+    " PrintableString SnmpAdminAtring TeletexString" +
+    " UTF8String VideotexString VisibleString StringStore" +
+    " ISO646String T61String UniversalString Unsigned32" +
+    " Integer32 Gauge Gauge32 Counter Counter32 Counter64"),
+    modifier: words("ATTRIBUTE ATTRIBUTES MANDATORY-GROUP MANDATORY-GROUPS" +
+    " GROUP GROUPS ELEMENTS EQUALITY ORDERING SUBSTRINGS" +
+    " DEFINED"),
+    accessTypes: words("not-accessible accessible-for-notify read-only" +
+    " read-create read-write"),
+    multiLineStrings: true
+  });
+});
diff --git a/core/media/editors/codemirror/mode/asn.1/asn.min.js b/core/media/editors/codemirror/mode/asn.1/asn.min.js
new file mode 100644
index 00000000..75127ff7
--- /dev/null
+++ b/core/media/editors/codemirror/mode/asn.1/asn.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}a.defineMode("asn.1",(function(a,b){function c(a,b){var c=a.next();if('"'==c||"'"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[\[\]\(\){}:=,;]/.test(c))return h=c,"punctuation";if("-"==c&&a.eat("-"))return a.skipToEnd(),"comment";if(/\d/.test(c))return a.eatWhile(/[\w\.]/),"number";if(t.test(c))return a.eatWhile(t),"operator";a.eatWhile(/[\w\-]/);var e=a.current();return j.propertyIsEnumerable(e)?"keyword":k.propertyIsEnumerable(e)?"variable cmipVerbs":l.propertyIsEnumerable(e)?"atom compareTypes":m.propertyIsEnumerable(e)?"comment status":n.propertyIsEnumerable(e)?"variable-3 tags":o.propertyIsEnumerable(e)?"builtin storage":p.propertyIsEnumerable(e)?"string-2 modifier":q.propertyIsEnumerable(e)?"atom accessTypes":"variable"}function d(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){var g=b.peek();g&&(g=g.toLowerCase(),"b"!=g&&"h"!=g&&"o"!=g||b.next()),f=!0;break}e=!e&&"\\"==d}return(f||!e&&!r)&&(c.tokenize=null),"string"}}function e(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function f(a,b,c){var d=a.indented;return a.context&&"statement"==a.context.type&&(d=a.context.indented),a.context=new e(d,b,c,null,a.context)}function g(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var h,i=a.indentUnit,j=b.keywords||{},k=b.cmipVerbs||{},l=b.compareTypes||{},m=b.status||{},n=b.tags||{},o=b.storage||{},p=b.modifier||{},q=b.accessTypes||{},r=b.multiLineStrings,s=b.indentStatements!==!1,t=/[\|\^]/;return{startState:function(a){return{tokenize:null,context:new e((a||0)-i,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var d=b.context;if(a.sol()&&(null==d.align&&(d.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;h=null;var e=(b.tokenize||c)(a,b);if("comment"==e)return e;if(null==d.align&&(d.align=!0),";"!=h&&":"!=h&&","!=h||"statement"!=d.type)if("{"==h)f(b,a.column(),"}");else if("["==h)f(b,a.column(),"]");else if("("==h)f(b,a.column(),")");else if("}"==h){for(;"statement"==d.type;)d=g(b);for("}"==d.type&&(d=g(b));"statement"==d.type;)d=g(b)}else h==d.type?g(b):s&&(("}"==d.type||"top"==d.type)&&";"!=h||"statement"==d.type&&"newstatement"==h)&&f(b,a.column(),"statement");else g(b);return b.startOfLine=!1,e},electricChars:"{}",lineComment:"--",fold:"brace"}})),a.defineMIME("text/x-ttcn-asn",{name:"asn.1",keywords:b("DEFINITIONS OBJECTS IF DERIVED INFORMATION ACTION REPLY ANY NAMED CHARACTERIZED BEHAVIOUR REGISTERED WITH AS IDENTIFIED CONSTRAINED BY PRESENT BEGIN IMPORTS FROM UNITS SYNTAX MIN-ACCESS MAX-ACCESS MINACCESS MAXACCESS REVISION STATUS DESCRIPTION SEQUENCE SET COMPONENTS OF CHOICE DistinguishedName ENUMERATED SIZE MODULE END INDEX AUGMENTS EXTENSIBILITY IMPLIED EXPORTS"),cmipVerbs:b("ACTIONS ADD GET NOTIFICATIONS REPLACE REMOVE"),compareTypes:b("OPTIONAL DEFAULT MANAGED MODULE-TYPE MODULE_IDENTITY MODULE-COMPLIANCE OBJECT-TYPE OBJECT-IDENTITY OBJECT-COMPLIANCE MODE CONFIRMED CONDITIONAL SUBORDINATE SUPERIOR CLASS TRUE FALSE NULL TEXTUAL-CONVENTION"),status:b("current deprecated mandatory obsolete"),tags:b("APPLICATION AUTOMATIC EXPLICIT IMPLICIT PRIVATE TAGS UNIVERSAL"),storage:b("BOOLEAN INTEGER OBJECT IDENTIFIER BIT OCTET STRING UTCTime InterfaceIndex IANAifType CMIP-Attribute REAL PACKAGE PACKAGES IpAddress PhysAddress NetworkAddress BITS BMPString TimeStamp TimeTicks TruthValue RowStatus DisplayString GeneralString GraphicString IA5String NumericString PrintableString SnmpAdminAtring TeletexString UTF8String VideotexString VisibleString StringStore ISO646String T61String UniversalString Unsigned32 Integer32 Gauge Gauge32 Counter Counter32 Counter64"),modifier:b("ATTRIBUTE ATTRIBUTES MANDATORY-GROUP MANDATORY-GROUPS GROUP GROUPS ELEMENTS EQUALITY ORDERING SUBSTRINGS DEFINED"),accessTypes:b("not-accessible accessible-for-notify read-only read-create read-write"),multiLineStrings:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/asterisk/asterisk.js b/core/media/editors/codemirror/mode/asterisk/asterisk.js
new file mode 100644
index 00000000..b7ebfc5a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/asterisk/asterisk.js
@@ -0,0 +1,196 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+ * =====================================================================================
+ *
+ *       Filename:  mode/asterisk/asterisk.js
+ *
+ *    Description:  CodeMirror mode for Asterisk dialplan
+ *
+ *        Created:  05/17/2012 09:20:25 PM
+ *       Revision:  none
+ *
+ *         Author:  Stas Kobzar (stas@modulis.ca),
+ *        Company:  Modulis.ca Inc.
+ *
+ * =====================================================================================
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("asterisk", function() {
+  var atoms    = ["exten", "same", "include","ignorepat","switch"],
+      dpcmd    = ["#include","#exec"],
+      apps     = [
+                  "addqueuemember","adsiprog","aelsub","agentlogin","agentmonitoroutgoing","agi",
+                  "alarmreceiver","amd","answer","authenticate","background","backgrounddetect",
+                  "bridge","busy","callcompletioncancel","callcompletionrequest","celgenuserevent",
+                  "changemonitor","chanisavail","channelredirect","chanspy","clearhash","confbridge",
+                  "congestion","continuewhile","controlplayback","dahdiacceptr2call","dahdibarge",
+                  "dahdiras","dahdiscan","dahdisendcallreroutingfacility","dahdisendkeypadfacility",
+                  "datetime","dbdel","dbdeltree","deadagi","dial","dictate","directory","disa",
+                  "dumpchan","eagi","echo","endwhile","exec","execif","execiftime","exitwhile","extenspy",
+                  "externalivr","festival","flash","followme","forkcdr","getcpeid","gosub","gosubif",
+                  "goto","gotoif","gotoiftime","hangup","iax2provision","ices","importvar","incomplete",
+                  "ivrdemo","jabberjoin","jabberleave","jabbersend","jabbersendgroup","jabberstatus",
+                  "jack","log","macro","macroexclusive","macroexit","macroif","mailboxexists","meetme",
+                  "meetmeadmin","meetmechanneladmin","meetmecount","milliwatt","minivmaccmess","minivmdelete",
+                  "minivmgreet","minivmmwi","minivmnotify","minivmrecord","mixmonitor","monitor","morsecode",
+                  "mp3player","mset","musiconhold","nbscat","nocdr","noop","odbc","odbc","odbcfinish",
+                  "originate","ospauth","ospfinish","osplookup","ospnext","page","park","parkandannounce",
+                  "parkedcall","pausemonitor","pausequeuemember","pickup","pickupchan","playback","playtones",
+                  "privacymanager","proceeding","progress","queue","queuelog","raiseexception","read","readexten",
+                  "readfile","receivefax","receivefax","receivefax","record","removequeuemember",
+                  "resetcdr","retrydial","return","ringing","sayalpha","saycountedadj","saycountednoun",
+                  "saycountpl","saydigits","saynumber","sayphonetic","sayunixtime","senddtmf","sendfax",
+                  "sendfax","sendfax","sendimage","sendtext","sendurl","set","setamaflags",
+                  "setcallerpres","setmusiconhold","sipaddheader","sipdtmfmode","sipremoveheader","skel",
+                  "slastation","slatrunk","sms","softhangup","speechactivategrammar","speechbackground",
+                  "speechcreate","speechdeactivategrammar","speechdestroy","speechloadgrammar","speechprocessingsound",
+                  "speechstart","speechunloadgrammar","stackpop","startmusiconhold","stopmixmonitor","stopmonitor",
+                  "stopmusiconhold","stopplaytones","system","testclient","testserver","transfer","tryexec",
+                  "trysystem","unpausemonitor","unpausequeuemember","userevent","verbose","vmauthenticate",
+                  "vmsayname","voicemail","voicemailmain","wait","waitexten","waitfornoise","waitforring",
+                  "waitforsilence","waitmusiconhold","waituntil","while","zapateller"
+                 ];
+
+  function basicToken(stream,state){
+    var cur = '';
+    var ch = stream.next();
+    // comment
+    if(ch == ";") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    // context
+    if(ch == '[') {
+      stream.skipTo(']');
+      stream.eat(']');
+      return "header";
+    }
+    // string
+    if(ch == '"') {
+      stream.skipTo('"');
+      return "string";
+    }
+    if(ch == "'") {
+      stream.skipTo("'");
+      return "string-2";
+    }
+    // dialplan commands
+    if(ch == '#') {
+      stream.eatWhile(/\w/);
+      cur = stream.current();
+      if(dpcmd.indexOf(cur) !== -1) {
+        stream.skipToEnd();
+        return "strong";
+      }
+    }
+    // application args
+    if(ch == '$'){
+      var ch1 = stream.peek();
+      if(ch1 == '{'){
+        stream.skipTo('}');
+        stream.eat('}');
+        return "variable-3";
+      }
+    }
+    // extension
+    stream.eatWhile(/\w/);
+    cur = stream.current();
+    if(atoms.indexOf(cur) !== -1) {
+      state.extenStart = true;
+      switch(cur) {
+        case 'same': state.extenSame = true; break;
+        case 'include':
+        case 'switch':
+        case 'ignorepat':
+          state.extenInclude = true;break;
+        default:break;
+      }
+      return "atom";
+    }
+  }
+
+  return {
+    startState: function() {
+      return {
+        extenStart: false,
+        extenSame:  false,
+        extenInclude: false,
+        extenExten: false,
+        extenPriority: false,
+        extenApplication: false
+      };
+    },
+    token: function(stream, state) {
+
+      var cur = '';
+      if(stream.eatSpace()) return null;
+      // extension started
+      if(state.extenStart){
+        stream.eatWhile(/[^\s]/);
+        cur = stream.current();
+        if(/^=>?$/.test(cur)){
+          state.extenExten = true;
+          state.extenStart = false;
+          return "strong";
+        } else {
+          state.extenStart = false;
+          stream.skipToEnd();
+          return "error";
+        }
+      } else if(state.extenExten) {
+        // set exten and priority
+        state.extenExten = false;
+        state.extenPriority = true;
+        stream.eatWhile(/[^,]/);
+        if(state.extenInclude) {
+          stream.skipToEnd();
+          state.extenPriority = false;
+          state.extenInclude = false;
+        }
+        if(state.extenSame) {
+          state.extenPriority = false;
+          state.extenSame = false;
+          state.extenApplication = true;
+        }
+        return "tag";
+      } else if(state.extenPriority) {
+        state.extenPriority = false;
+        state.extenApplication = true;
+        stream.next(); // get comma
+        if(state.extenSame) return null;
+        stream.eatWhile(/[^,]/);
+        return "number";
+      } else if(state.extenApplication) {
+        stream.eatWhile(/,/);
+        cur = stream.current();
+        if(cur === ',') return null;
+        stream.eatWhile(/\w/);
+        cur = stream.current().toLowerCase();
+        state.extenApplication = false;
+        if(apps.indexOf(cur) !== -1){
+          return "def strong";
+        }
+      } else{
+        return basicToken(stream,state);
+      }
+
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-asterisk", "asterisk");
+
+});
diff --git a/core/media/editors/codemirror/mode/asterisk/asterisk.min.js b/core/media/editors/codemirror/mode/asterisk/asterisk.min.js
new file mode 100644
index 00000000..6936a1d3
--- /dev/null
+++ b/core/media/editors/codemirror/mode/asterisk/asterisk.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("asterisk",(function(){function a(a,d){var e="",f=a.next();if(";"==f)return a.skipToEnd(),"comment";if("["==f)return a.skipTo("]"),a.eat("]"),"header";if('"'==f)return a.skipTo('"'),"string";if("'"==f)return a.skipTo("'"),"string-2";if("#"==f&&(a.eatWhile(/\w/),e=a.current(),c.indexOf(e)!==-1))return a.skipToEnd(),"strong";if("$"==f){var g=a.peek();if("{"==g)return a.skipTo("}"),a.eat("}"),"variable-3"}if(a.eatWhile(/\w/),e=a.current(),b.indexOf(e)!==-1){switch(d.extenStart=!0,e){case"same":d.extenSame=!0;break;case"include":case"switch":case"ignorepat":d.extenInclude=!0}return"atom"}}var b=["exten","same","include","ignorepat","switch"],c=["#include","#exec"],d=["addqueuemember","adsiprog","aelsub","agentlogin","agentmonitoroutgoing","agi","alarmreceiver","amd","answer","authenticate","background","backgrounddetect","bridge","busy","callcompletioncancel","callcompletionrequest","celgenuserevent","changemonitor","chanisavail","channelredirect","chanspy","clearhash","confbridge","congestion","continuewhile","controlplayback","dahdiacceptr2call","dahdibarge","dahdiras","dahdiscan","dahdisendcallreroutingfacility","dahdisendkeypadfacility","datetime","dbdel","dbdeltree","deadagi","dial","dictate","directory","disa","dumpchan","eagi","echo","endwhile","exec","execif","execiftime","exitwhile","extenspy","externalivr","festival","flash","followme","forkcdr","getcpeid","gosub","gosubif","goto","gotoif","gotoiftime","hangup","iax2provision","ices","importvar","incomplete","ivrdemo","jabberjoin","jabberleave","jabbersend","jabbersendgroup","jabberstatus","jack","log","macro","macroexclusive","macroexit","macroif","mailboxexists","meetme","meetmeadmin","meetmechanneladmin","meetmecount","milliwatt","minivmaccmess","minivmdelete","minivmgreet","minivmmwi","minivmnotify","minivmrecord","mixmonitor","monitor","morsecode","mp3player","mset","musiconhold","nbscat","nocdr","noop","odbc","odbc","odbcfinish","originate","ospauth","ospfinish","osplookup","ospnext","page","park","parkandannounce","parkedcall","pausemonitor","pausequeuemember","pickup","pickupchan","playback","playtones","privacymanager","proceeding","progress","queue","queuelog","raiseexception","read","readexten","readfile","receivefax","receivefax","receivefax","record","removequeuemember","resetcdr","retrydial","return","ringing","sayalpha","saycountedadj","saycountednoun","saycountpl","saydigits","saynumber","sayphonetic","sayunixtime","senddtmf","sendfax","sendfax","sendfax","sendimage","sendtext","sendurl","set","setamaflags","setcallerpres","setmusiconhold","sipaddheader","sipdtmfmode","sipremoveheader","skel","slastation","slatrunk","sms","softhangup","speechactivategrammar","speechbackground","speechcreate","speechdeactivategrammar","speechdestroy","speechloadgrammar","speechprocessingsound","speechstart","speechunloadgrammar","stackpop","startmusiconhold","stopmixmonitor","stopmonitor","stopmusiconhold","stopplaytones","system","testclient","testserver","transfer","tryexec","trysystem","unpausemonitor","unpausequeuemember","userevent","verbose","vmauthenticate","vmsayname","voicemail","voicemailmain","wait","waitexten","waitfornoise","waitforring","waitforsilence","waitmusiconhold","waituntil","while","zapateller"];return{startState:function(){return{extenStart:!1,extenSame:!1,extenInclude:!1,extenExten:!1,extenPriority:!1,extenApplication:!1}},token:function(b,c){var e="";return b.eatSpace()?null:c.extenStart?(b.eatWhile(/[^\s]/),e=b.current(),/^=>?$/.test(e)?(c.extenExten=!0,c.extenStart=!1,"strong"):(c.extenStart=!1,b.skipToEnd(),"error")):c.extenExten?(c.extenExten=!1,c.extenPriority=!0,b.eatWhile(/[^,]/),c.extenInclude&&(b.skipToEnd(),c.extenPriority=!1,c.extenInclude=!1),c.extenSame&&(c.extenPriority=!1,c.extenSame=!1,c.extenApplication=!0),"tag"):c.extenPriority?(c.extenPriority=!1,c.extenApplication=!0,b.next(),c.extenSame?null:(b.eatWhile(/[^,]/),"number")):c.extenApplication?(b.eatWhile(/,/),e=b.current(),","===e?null:(b.eatWhile(/\w/),e=b.current().toLowerCase(),c.extenApplication=!1,d.indexOf(e)!==-1?"def strong":null)):a(b,c)}}})),a.defineMIME("text/x-asterisk","asterisk")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/brainfuck/brainfuck.js b/core/media/editors/codemirror/mode/brainfuck/brainfuck.js
new file mode 100644
index 00000000..3becf2a5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/brainfuck/brainfuck.js
@@ -0,0 +1,85 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Brainfuck mode created by Michael Kaminsky https://github.com/mkaminsky11
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod)
+  else
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+  var reserve = "><+-.,[]".split("");
+  /*
+  comments can be either:
+  placed behind lines
+
+        +++    this is a comment
+
+  where reserved characters cannot be used
+  or in a loop
+  [
+    this is ok to use [ ] and stuff
+  ]
+  or preceded by #
+  */
+  CodeMirror.defineMode("brainfuck", function() {
+    return {
+      startState: function() {
+        return {
+          commentLine: false,
+          left: 0,
+          right: 0,
+          commentLoop: false
+        }
+      },
+      token: function(stream, state) {
+        if (stream.eatSpace()) return null
+        if(stream.sol()){
+          state.commentLine = false;
+        }
+        var ch = stream.next().toString();
+        if(reserve.indexOf(ch) !== -1){
+          if(state.commentLine === true){
+            if(stream.eol()){
+              state.commentLine = false;
+            }
+            return "comment";
+          }
+          if(ch === "]" || ch === "["){
+            if(ch === "["){
+              state.left++;
+            }
+            else{
+              state.right++;
+            }
+            return "bracket";
+          }
+          else if(ch === "+" || ch === "-"){
+            return "keyword";
+          }
+          else if(ch === "<" || ch === ">"){
+            return "atom";
+          }
+          else if(ch === "." || ch === ","){
+            return "def";
+          }
+        }
+        else{
+          state.commentLine = true;
+          if(stream.eol()){
+            state.commentLine = false;
+          }
+          return "comment";
+        }
+        if(stream.eol()){
+          state.commentLine = false;
+        }
+      }
+    };
+  });
+CodeMirror.defineMIME("text/x-brainfuck","brainfuck")
+});
diff --git a/core/media/editors/codemirror/mode/brainfuck/brainfuck.min.js b/core/media/editors/codemirror/mode/brainfuck/brainfuck.min.js
new file mode 100644
index 00000000..a2a8d2c1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/brainfuck/brainfuck.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";var b="><+-.,[]".split("");a.defineMode("brainfuck",(function(){return{startState:function(){return{commentLine:!1,left:0,right:0,commentLoop:!1}},token:function(a,c){if(a.eatSpace())return null;a.sol()&&(c.commentLine=!1);var d=a.next().toString();return b.indexOf(d)===-1?(c.commentLine=!0,a.eol()&&(c.commentLine=!1),"comment"):c.commentLine===!0?(a.eol()&&(c.commentLine=!1),"comment"):"]"===d||"["===d?("["===d?c.left++:c.right++,"bracket"):"+"===d||"-"===d?"keyword":"<"===d||">"===d?"atom":"."===d||","===d?"def":void(a.eol()&&(c.commentLine=!1))}}})),a.defineMIME("text/x-brainfuck","brainfuck")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/clike/clike.js b/core/media/editors/codemirror/mode/clike/clike.js
new file mode 100644
index 00000000..d5c8bf5d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/clike/clike.js
@@ -0,0 +1,823 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function Context(indented, column, type, info, align, prev) {
+  this.indented = indented;
+  this.column = column;
+  this.type = type;
+  this.info = info;
+  this.align = align;
+  this.prev = prev;
+}
+function pushContext(state, col, type, info) {
+  var indent = state.indented;
+  if (state.context && state.context.type == "statement" && type != "statement")
+    indent = state.context.indented;
+  return state.context = new Context(indent, col, type, info, null, state.context);
+}
+function popContext(state) {
+  var t = state.context.type;
+  if (t == ")" || t == "]" || t == "}")
+    state.indented = state.context.indented;
+  return state.context = state.context.prev;
+}
+
+function typeBefore(stream, state, pos) {
+  if (state.prevToken == "variable" || state.prevToken == "type") return true;
+  if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, pos))) return true;
+  if (state.typeAtEndOfLine && stream.column() == stream.indentation()) return true;
+}
+
+function isTopScope(context) {
+  for (;;) {
+    if (!context || context.type == "top") return true;
+    if (context.type == "}" && context.prev.info != "namespace") return false;
+    context = context.prev;
+  }
+}
+
+CodeMirror.defineMode("clike", function(config, parserConfig) {
+  var indentUnit = config.indentUnit,
+      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
+      dontAlignCalls = parserConfig.dontAlignCalls,
+      keywords = parserConfig.keywords || {},
+      types = parserConfig.types || {},
+      builtin = parserConfig.builtin || {},
+      blockKeywords = parserConfig.blockKeywords || {},
+      defKeywords = parserConfig.defKeywords || {},
+      atoms = parserConfig.atoms || {},
+      hooks = parserConfig.hooks || {},
+      multiLineStrings = parserConfig.multiLineStrings,
+      indentStatements = parserConfig.indentStatements !== false,
+      indentSwitch = parserConfig.indentSwitch !== false,
+      namespaceSeparator = parserConfig.namespaceSeparator,
+      isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
+      numberStart = parserConfig.numberStart || /[\d\.]/,
+      number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
+      isIdentifierChar = parserConfig.isIdentifierChar || /[\w\$_\xa1-\uffff]/;
+
+  var curPunc, isDefKeyword;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (hooks[ch]) {
+      var result = hooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (isPunctuationChar.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (numberStart.test(ch)) {
+      stream.backUp(1)
+      if (stream.match(number)) return "number"
+      stream.next()
+    }
+    if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      while (!stream.match(/^\/[\/*]/, false) && stream.eat(isOperatorChar)) {}
+      return "operator";
+    }
+    stream.eatWhile(isIdentifierChar);
+    if (namespaceSeparator) while (stream.match(namespaceSeparator))
+      stream.eatWhile(isIdentifierChar);
+
+    var cur = stream.current();
+    if (contains(keywords, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
+      if (contains(defKeywords, cur)) isDefKeyword = true;
+      return "keyword";
+    }
+    if (contains(types, cur)) return "type";
+    if (contains(builtin, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
+      return "builtin";
+    }
+    if (contains(atoms, cur)) return "atom";
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = null;
+      return "string";
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function maybeEOL(stream, state) {
+    if (parserConfig.typeFirstDefinitions && stream.eol() && isTopScope(state.context))
+      state.typeAtEndOfLine = typeBefore(stream, state, stream.pos)
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", null, false),
+        indented: 0,
+        startOfLine: true,
+        prevToken: null
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
+      if (stream.eatSpace()) { maybeEOL(stream, state); return null; }
+      curPunc = isDefKeyword = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if (curPunc == ";" || curPunc == ":" || (curPunc == "," && stream.match(/^\s*(?:\/\/.*)?$/, false)))
+        while (state.context.type == "statement") popContext(state);
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (indentStatements &&
+               (((ctx.type == "}" || ctx.type == "top") && curPunc != ";") ||
+                (ctx.type == "statement" && curPunc == "newstatement"))) {
+        pushContext(state, stream.column(), "statement", stream.current());
+      }
+
+      if (style == "variable" &&
+          ((state.prevToken == "def" ||
+            (parserConfig.typeFirstDefinitions && typeBefore(stream, state, stream.start) &&
+             isTopScope(state.context) && stream.match(/^\s*\(/, false)))))
+        style = "def";
+
+      if (hooks.token) {
+        var result = hooks.token(stream, state, style);
+        if (result !== undefined) style = result;
+      }
+
+      if (style == "def" && parserConfig.styleDefs === false) style = "variable";
+
+      state.startOfLine = false;
+      state.prevToken = isDefKeyword ? "def" : style || curPunc;
+      maybeEOL(stream, state);
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null || state.typeAtEndOfLine) return CodeMirror.Pass;
+      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      if (parserConfig.dontIndentStatements)
+        while (ctx.type == "statement" && parserConfig.dontIndentStatements.test(ctx.info))
+          ctx = ctx.prev
+      if (hooks.indent) {
+        var hook = hooks.indent(state, ctx, textAfter);
+        if (typeof hook == "number") return hook
+      }
+      var closing = firstChar == ctx.type;
+      var switchBlock = ctx.prev && ctx.prev.info == "switch";
+      if (parserConfig.allmanIndentation && /[{(]/.test(firstChar)) {
+        while (ctx.type != "top" && ctx.type != "}") ctx = ctx.prev
+        return ctx.indented
+      }
+      if (ctx.type == "statement")
+        return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
+      if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
+        return ctx.column + (closing ? 0 : 1);
+      if (ctx.type == ")" && !closing)
+        return ctx.indented + statementIndentUnit;
+
+      return ctx.indented + (closing ? 0 : indentUnit) +
+        (!closing && switchBlock && !/^(?:case|default)\b/.test(textAfter) ? indentUnit : 0);
+    },
+
+    electricInput: indentSwitch ? /^\s*(?:case .*?:|default:|\{\}?|\})$/ : /^\s*[{}]$/,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    blockCommentContinue: " * ",
+    lineComment: "//",
+    fold: "brace"
+  };
+});
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+  function contains(words, word) {
+    if (typeof words === "function") {
+      return words(word);
+    } else {
+      return words.propertyIsEnumerable(word);
+    }
+  }
+  var cKeywords = "auto if break case register continue return default do sizeof " +
+    "static else struct switch extern typedef union for goto while enum const volatile";
+  var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
+
+  function cppHook(stream, state) {
+    if (!state.startOfLine) return false
+    for (var ch, next = null; ch = stream.peek();) {
+      if (ch == "\\" && stream.match(/^.$/)) {
+        next = cppHook
+        break
+      } else if (ch == "/" && stream.match(/^\/[\/\*]/, false)) {
+        break
+      }
+      stream.next()
+    }
+    state.tokenize = next
+    return "meta"
+  }
+
+  function pointerHook(_stream, state) {
+    if (state.prevToken == "type") return "type";
+    return false;
+  }
+
+  function cpp14Literal(stream) {
+    stream.eatWhile(/[\w\.']/);
+    return "number";
+  }
+
+  function cpp11StringHook(stream, state) {
+    stream.backUp(1);
+    // Raw strings.
+    if (stream.match(/(R|u8R|uR|UR|LR)/)) {
+      var match = stream.match(/"([^\s\\()]{0,16})\(/);
+      if (!match) {
+        return false;
+      }
+      state.cpp11RawStringDelim = match[1];
+      state.tokenize = tokenRawString;
+      return tokenRawString(stream, state);
+    }
+    // Unicode strings/chars.
+    if (stream.match(/(u8|u|U|L)/)) {
+      if (stream.match(/["']/, /* eat */ false)) {
+        return "string";
+      }
+      return false;
+    }
+    // Ignore this hook.
+    stream.next();
+    return false;
+  }
+
+  function cppLooksLikeConstructor(word) {
+    var lastTwo = /(\w+)::~?(\w+)$/.exec(word);
+    return lastTwo && lastTwo[1] == lastTwo[2];
+  }
+
+  // C#-style strings where "" escapes a quote.
+  function tokenAtString(stream, state) {
+    var next;
+    while ((next = stream.next()) != null) {
+      if (next == '"' && !stream.eat('"')) {
+        state.tokenize = null;
+        break;
+      }
+    }
+    return "string";
+  }
+
+  // C++11 raw string literal is <prefix>"<delim>( anything )<delim>", where
+  // <delim> can be a string up to 16 characters long.
+  function tokenRawString(stream, state) {
+    // Escape characters that have special regex meanings.
+    var delim = state.cpp11RawStringDelim.replace(/[^\w\s]/g, '\\$&');
+    var match = stream.match(new RegExp(".*?\\)" + delim + '"'));
+    if (match)
+      state.tokenize = null;
+    else
+      stream.skipToEnd();
+    return "string";
+  }
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string") mimes = [mimes];
+    var words = [];
+    function add(obj) {
+      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
+        words.push(prop);
+    }
+    add(mode.keywords);
+    add(mode.types);
+    add(mode.builtin);
+    add(mode.atoms);
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i = 0; i < mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  def(["text/x-csrc", "text/x-c", "text/x-chdr"], {
+    name: "clike",
+    keywords: words(cKeywords),
+    types: words(cTypes + " bool _Complex _Bool float_t double_t intptr_t intmax_t " +
+                 "int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t " +
+                 "uint32_t uint64_t"),
+    blockKeywords: words("case do else for if switch while struct"),
+    defKeywords: words("struct"),
+    typeFirstDefinitions: true,
+    atoms: words("NULL true false"),
+    hooks: {"#": cppHook, "*": pointerHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
+  def(["text/x-c++src", "text/x-c++hdr"], {
+    name: "clike",
+    keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try explicit new " +
+                    "static_cast typeid catch operator template typename class friend private " +
+                    "this using const_cast inline public throw virtual delete mutable protected " +
+                    "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
+                    "static_assert override"),
+    types: words(cTypes + " bool wchar_t"),
+    blockKeywords: words("catch class do else finally for if struct switch try while"),
+    defKeywords: words("class namespace struct enum union"),
+    typeFirstDefinitions: true,
+    atoms: words("true false NULL"),
+    dontIndentStatements: /^template$/,
+    isIdentifierChar: /[\w\$_~\xa1-\uffff]/,
+    hooks: {
+      "#": cppHook,
+      "*": pointerHook,
+      "u": cpp11StringHook,
+      "U": cpp11StringHook,
+      "L": cpp11StringHook,
+      "R": cpp11StringHook,
+      "0": cpp14Literal,
+      "1": cpp14Literal,
+      "2": cpp14Literal,
+      "3": cpp14Literal,
+      "4": cpp14Literal,
+      "5": cpp14Literal,
+      "6": cpp14Literal,
+      "7": cpp14Literal,
+      "8": cpp14Literal,
+      "9": cpp14Literal,
+      token: function(stream, state, style) {
+        if (style == "variable" && stream.peek() == "(" &&
+            (state.prevToken == ";" || state.prevToken == null ||
+             state.prevToken == "}") &&
+            cppLooksLikeConstructor(stream.current()))
+          return "def";
+      }
+    },
+    namespaceSeparator: "::",
+    modeProps: {fold: ["brace", "include"]}
+  });
+
+  def("text/x-java", {
+    name: "clike",
+    keywords: words("abstract assert break case catch class const continue default " +
+                    "do else enum extends final finally float for goto if implements import " +
+                    "instanceof interface native new package private protected public " +
+                    "return static strictfp super switch synchronized this throw throws transient " +
+                    "try volatile while @interface"),
+    types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
+                 "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
+    blockKeywords: words("catch class do else finally for if switch try while"),
+    defKeywords: words("class interface enum @interface"),
+    typeFirstDefinitions: true,
+    atoms: words("true false null"),
+    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
+    hooks: {
+      "@": function(stream) {
+        // Don't match the @interface keyword.
+        if (stream.match('interface', false)) return false;
+
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      }
+    },
+    modeProps: {fold: ["brace", "import"]}
+  });
+
+  def("text/x-csharp", {
+    name: "clike",
+    keywords: words("abstract as async await base break case catch checked class const continue" +
+                    " default delegate do else enum event explicit extern finally fixed for" +
+                    " foreach goto if implicit in interface internal is lock namespace new" +
+                    " operator out override params private protected public readonly ref return sealed" +
+                    " sizeof stackalloc static struct switch this throw try typeof unchecked" +
+                    " unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
+                    " global group into join let orderby partial remove select set value var yield"),
+    types: words("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func" +
+                 " Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32" +
+                 " UInt64 bool byte char decimal double short int long object"  +
+                 " sbyte float string ushort uint ulong"),
+    blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
+    defKeywords: words("class interface namespace struct var"),
+    typeFirstDefinitions: true,
+    atoms: words("true false null"),
+    hooks: {
+      "@": function(stream, state) {
+        if (stream.eat('"')) {
+          state.tokenize = tokenAtString;
+          return tokenAtString(stream, state);
+        }
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      }
+    }
+  });
+
+  function tokenTripleString(stream, state) {
+    var escaped = false;
+    while (!stream.eol()) {
+      if (!escaped && stream.match('"""')) {
+        state.tokenize = null;
+        break;
+      }
+      escaped = stream.next() == "\\" && !escaped;
+    }
+    return "string";
+  }
+
+  function tokenNestedComment(depth) {
+    return function (stream, state) {
+      var ch
+      while (ch = stream.next()) {
+        if (ch == "*" && stream.eat("/")) {
+          if (depth == 1) {
+            state.tokenize = null
+            break
+          } else {
+            state.tokenize = tokenNestedComment(depth - 1)
+            return state.tokenize(stream, state)
+          }
+        } else if (ch == "/" && stream.eat("*")) {
+          state.tokenize = tokenNestedComment(depth + 1)
+          return state.tokenize(stream, state)
+        }
+      }
+      return "comment"
+    }
+  }
+
+  def("text/x-scala", {
+    name: "clike",
+    keywords: words(
+
+      /* scala */
+      "abstract case catch class def do else extends final finally for forSome if " +
+      "implicit import lazy match new null object override package private protected return " +
+      "sealed super this throw trait try type val var while with yield _ " +
+
+      /* package scala */
+      "assert assume require print println printf readLine readBoolean readByte readShort " +
+      "readChar readInt readLong readFloat readDouble"
+    ),
+    types: words(
+      "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
+      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable " +
+      "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
+      "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
+      "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector " +
+
+      /* package java.lang */
+      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
+      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
+      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
+      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
+    ),
+    multiLineStrings: true,
+    blockKeywords: words("catch class enum do else finally for forSome if match switch try while"),
+    defKeywords: words("class enum def object package trait type val var"),
+    atoms: words("true false null"),
+    indentStatements: false,
+    indentSwitch: false,
+    isOperatorChar: /[+\-*&%=<>!?|\/#:@]/,
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
+      '"': function(stream, state) {
+        if (!stream.match('""')) return false;
+        state.tokenize = tokenTripleString;
+        return state.tokenize(stream, state);
+      },
+      "'": function(stream) {
+        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+        return "atom";
+      },
+      "=": function(stream, state) {
+        var cx = state.context
+        if (cx.type == "}" && cx.align && stream.eat(">")) {
+          state.context = new Context(cx.indented, cx.column, cx.type, cx.info, null, cx.prev)
+          return "operator"
+        } else {
+          return false
+        }
+      },
+
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false
+        state.tokenize = tokenNestedComment(1)
+        return state.tokenize(stream, state)
+      }
+    },
+    modeProps: {closeBrackets: {triples: '"'}}
+  });
+
+  function tokenKotlinString(tripleString){
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!tripleString && !escaped && stream.match('"') ) {end = true; break;}
+        if (tripleString && stream.match('"""')) {end = true; break;}
+        next = stream.next();
+        if(!escaped && next == "$" && stream.match('{'))
+          stream.skipTo("}");
+        escaped = !escaped && next == "\\" && !tripleString;
+      }
+      if (end || !tripleString)
+        state.tokenize = null;
+      return "string";
+    }
+  }
+
+  def("text/x-kotlin", {
+    name: "clike",
+    keywords: words(
+      /*keywords*/
+      "package as typealias class interface this super val operator " +
+      "var fun for is in This throw return annotation " +
+      "break continue object if else while do try when !in !is as? " +
+
+      /*soft keywords*/
+      "file import where by get set abstract enum open inner override private public internal " +
+      "protected catch finally out final vararg reified dynamic companion constructor init " +
+      "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
+      "external annotation crossinline const operator infix suspend actual expect setparam"
+    ),
+    types: words(
+      /* package java.lang */
+      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
+      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
+      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
+      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void Annotation Any BooleanArray " +
+      "ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy " +
+      "LazyThreadSafetyMode LongArray Nothing ShortArray Unit"
+    ),
+    intendSwitch: false,
+    indentStatements: false,
+    multiLineStrings: true,
+    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
+    blockKeywords: words("catch class do else finally for if where try while enum"),
+    defKeywords: words("class val var object interface fun"),
+    atoms: words("true false null this"),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
+      '"': function(stream, state) {
+        state.tokenize = tokenKotlinString(stream.match('""'));
+        return state.tokenize(stream, state);
+      }
+    },
+    modeProps: {closeBrackets: {triples: '"'}}
+  });
+
+  def(["x-shader/x-vertex", "x-shader/x-fragment"], {
+    name: "clike",
+    keywords: words("sampler1D sampler2D sampler3D samplerCube " +
+                    "sampler1DShadow sampler2DShadow " +
+                    "const attribute uniform varying " +
+                    "break continue discard return " +
+                    "for while do if else struct " +
+                    "in out inout"),
+    types: words("float int bool void " +
+                 "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
+                 "mat2 mat3 mat4"),
+    blockKeywords: words("for while do if else struct"),
+    builtin: words("radians degrees sin cos tan asin acos atan " +
+                    "pow exp log exp2 sqrt inversesqrt " +
+                    "abs sign floor ceil fract mod min max clamp mix step smoothstep " +
+                    "length distance dot cross normalize ftransform faceforward " +
+                    "reflect refract matrixCompMult " +
+                    "lessThan lessThanEqual greaterThan greaterThanEqual " +
+                    "equal notEqual any all not " +
+                    "texture1D texture1DProj texture1DLod texture1DProjLod " +
+                    "texture2D texture2DProj texture2DLod texture2DProjLod " +
+                    "texture3D texture3DProj texture3DLod texture3DProjLod " +
+                    "textureCube textureCubeLod " +
+                    "shadow1D shadow2D shadow1DProj shadow2DProj " +
+                    "shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod " +
+                    "dFdx dFdy fwidth " +
+                    "noise1 noise2 noise3 noise4"),
+    atoms: words("true false " +
+                "gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex " +
+                "gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 " +
+                "gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 " +
+                "gl_FogCoord gl_PointCoord " +
+                "gl_Position gl_PointSize gl_ClipVertex " +
+                "gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor " +
+                "gl_TexCoord gl_FogFragCoord " +
+                "gl_FragCoord gl_FrontFacing " +
+                "gl_FragData gl_FragDepth " +
+                "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " +
+                "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " +
+                "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " +
+                "gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose " +
+                "gl_ProjectionMatrixInverseTranspose " +
+                "gl_ModelViewProjectionMatrixInverseTranspose " +
+                "gl_TextureMatrixInverseTranspose " +
+                "gl_NormalScale gl_DepthRange gl_ClipPlane " +
+                "gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel " +
+                "gl_FrontLightModelProduct gl_BackLightModelProduct " +
+                "gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ " +
+                "gl_FogParameters " +
+                "gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords " +
+                "gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats " +
+                "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " +
+                "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " +
+                "gl_MaxDrawBuffers"),
+    indentSwitch: false,
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
+  def("text/x-nesc", {
+    name: "clike",
+    keywords: words(cKeywords + "as atomic async call command component components configuration event generic " +
+                    "implementation includes interface module new norace nx_struct nx_union post provides " +
+                    "signal task uses abstract extends"),
+    types: words(cTypes),
+    blockKeywords: words("case do else for if switch while struct"),
+    atoms: words("null true false"),
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
+  def("text/x-objectivec", {
+    name: "clike",
+    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in " +
+                    "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
+    types: words(cTypes),
+    atoms: words("YES NO NULL NILL ON OFF true false"),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$]/);
+        return "keyword";
+      },
+      "#": cppHook,
+      indent: function(_state, ctx, textAfter) {
+        if (ctx.type == "statement" && /^@\w/.test(textAfter)) return ctx.indented
+      }
+    },
+    modeProps: {fold: "brace"}
+  });
+
+  def("text/x-squirrel", {
+    name: "clike",
+    keywords: words("base break clone continue const default delete enum extends function in class" +
+                    " foreach local resume return this throw typeof yield constructor instanceof static"),
+    types: words(cTypes),
+    blockKeywords: words("case catch class else for foreach if switch try while"),
+    defKeywords: words("function local class"),
+    typeFirstDefinitions: true,
+    atoms: words("true false null"),
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
+  // Ceylon Strings need to deal with interpolation
+  var stringTokenizer = null;
+  function tokenCeylonString(type) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!escaped && stream.match('"') &&
+              (type == "single" || stream.match('""'))) {
+          end = true;
+          break;
+        }
+        if (!escaped && stream.match('``')) {
+          stringTokenizer = tokenCeylonString(type);
+          end = true;
+          break;
+        }
+        next = stream.next();
+        escaped = type == "single" && !escaped && next == "\\";
+      }
+      if (end)
+          state.tokenize = null;
+      return "string";
+    }
+  }
+
+  def("text/x-ceylon", {
+    name: "clike",
+    keywords: words("abstracts alias assembly assert assign break case catch class continue dynamic else" +
+                    " exists extends finally for function given if import in interface is let module new" +
+                    " nonempty object of out outer package return satisfies super switch then this throw" +
+                    " try value void while"),
+    types: function(word) {
+        // In Ceylon all identifiers that start with an uppercase are types
+        var first = word.charAt(0);
+        return (first === first.toUpperCase() && first !== first.toLowerCase());
+    },
+    blockKeywords: words("case catch class dynamic else finally for function if interface module new object switch try while"),
+    defKeywords: words("class dynamic function interface module object package value"),
+    builtin: words("abstract actual aliased annotation by default deprecated doc final formal late license" +
+                   " native optional sealed see serializable shared suppressWarnings tagged throws variable"),
+    isPunctuationChar: /[\[\]{}\(\),;\:\.`]/,
+    isOperatorChar: /[+\-*&%=<>!?|^~:\/]/,
+    numberStart: /[\d#$]/,
+    number: /^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,
+    multiLineStrings: true,
+    typeFirstDefinitions: true,
+    atoms: words("true false null larger smaller equal empty finished"),
+    indentSwitch: false,
+    styleDefs: false,
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
+      '"': function(stream, state) {
+          state.tokenize = tokenCeylonString(stream.match('""') ? "triple" : "single");
+          return state.tokenize(stream, state);
+        },
+      '`': function(stream, state) {
+          if (!stringTokenizer || !stream.match('`')) return false;
+          state.tokenize = stringTokenizer;
+          stringTokenizer = null;
+          return state.tokenize(stream, state);
+        },
+      "'": function(stream) {
+        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+        return "atom";
+      },
+      token: function(_stream, state, style) {
+          if ((style == "variable" || style == "type") &&
+              state.prevToken == ".") {
+            return "variable-2";
+          }
+        }
+    },
+    modeProps: {
+        fold: ["brace", "import"],
+        closeBrackets: {triples: '"'}
+    }
+  });
+
+});
diff --git a/core/media/editors/codemirror/mode/clike/clike.min.js b/core/media/editors/codemirror/mode/clike/clike.min.js
new file mode 100644
index 00000000..f9ce2d86
--- /dev/null
+++ b/core/media/editors/codemirror/mode/clike/clike.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.info=d,this.align=e,this.prev=f}function c(a,c,d,e){var f=a.indented;return a.context&&"statement"==a.context.type&&"statement"!=d&&(f=a.context.indented),a.context=new b(f,c,d,e,null,a.context)}function d(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function e(a,b,c){return"variable"==b.prevToken||"type"==b.prevToken||(!!/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(a.string.slice(0,c))||(!(!b.typeAtEndOfLine||a.column()!=a.indentation())||void 0))}function f(a){for(;;){if(!a||"top"==a.type)return!0;if("}"==a.type&&"namespace"!=a.prev.info)return!1;a=a.prev}}function g(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function h(a,b){return"function"==typeof a?a(b):a.propertyIsEnumerable(b)}function i(a,b){if(!b.startOfLine)return!1;for(var c,d=null;c=a.peek();){if("\\"==c&&a.match(/^.$/)){d=i;break}if("/"==c&&a.match(/^\/[\/\*]/,!1))break;a.next()}return b.tokenize=d,"meta"}function j(a,b){return"type"==b.prevToken&&"type"}function k(a){return a.eatWhile(/[\w\.']/),"number"}function l(a,b){if(a.backUp(1),a.match(/(R|u8R|uR|UR|LR)/)){var c=a.match(/"([^\s\\()]{0,16})\(/);return!!c&&(b.cpp11RawStringDelim=c[1],b.tokenize=o,o(a,b))}return a.match(/(u8|u|U|L)/)?!!a.match(/["']/,!1)&&"string":(a.next(),!1)}function m(a){var b=/(\w+)::~?(\w+)$/.exec(a);return b&&b[1]==b[2]}function n(a,b){for(var c;null!=(c=a.next());)if('"'==c&&!a.eat('"')){b.tokenize=null;break}return"string"}function o(a,b){var c=b.cpp11RawStringDelim.replace(/[^\w\s]/g,"\\$&"),d=a.match(new RegExp(".*?\\)"+c+'"'));return d?b.tokenize=null:a.skipToEnd(),"string"}function p(b,c){function d(a){if(a)for(var b in a)a.hasOwnProperty(b)&&e.push(b)}"string"==typeof b&&(b=[b]);var e=[];d(c.keywords),d(c.types),d(c.builtin),d(c.atoms),e.length&&(c.helperType=b[0],a.registerHelper("hintWords",b[0],e));for(var f=0;f<b.length;++f)a.defineMIME(b[f],c)}function q(a,b){for(var c=!1;!a.eol();){if(!c&&a.match('"""')){b.tokenize=null;break}c="\\"==a.next()&&!c}return"string"}function r(a){return function(b,c){for(var d;d=b.next();){if("*"==d&&b.eat("/")){if(1==a){c.tokenize=null;break}return c.tokenize=r(a-1),c.tokenize(b,c)}if("/"==d&&b.eat("*"))return c.tokenize=r(a+1),c.tokenize(b,c)}return"comment"}}function s(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!a&&!e&&b.match('"')){f=!0;break}if(a&&b.match('"""')){f=!0;break}d=b.next(),!e&&"$"==d&&b.match("{")&&b.skipTo("}"),e=!e&&"\\"==d&&!a}return!f&&a||(c.tokenize=null),"string"}}function t(a){return function(b,c){for(var d,e=!1,f=!1;!b.eol();){if(!e&&b.match('"')&&("single"==a||b.match('""'))){f=!0;break}if(!e&&b.match("``")){w=t(a),f=!0;break}d=b.next(),e="single"==a&&!e&&"\\"==d}return f&&(c.tokenize=null),"string"}}a.defineMode("clike",(function(g,i){function j(a,b){var c=a.next();if(y[c]){var d=y[c](a,b);if(d!==!1)return d}if('"'==c||"'"==c)return b.tokenize=k(c),b.tokenize(a,b);if(D.test(c))return n=c,null;if(E.test(c)){if(a.backUp(1),a.match(F))return"number";a.next()}if("/"==c){if(a.eat("*"))return b.tokenize=l,l(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(G.test(c)){for(;!a.match(/^\/[\/*]/,!1)&&a.eat(G););return"operator"}if(a.eatWhile(H),C)for(;a.match(C);)a.eatWhile(H);var e=a.current();return h(s,e)?(h(v,e)&&(n="newstatement"),h(w,e)&&(o=!0),"keyword"):h(t,e)?"type":h(u,e)?(h(v,e)&&(n="newstatement"),"builtin"):h(x,e)?"atom":"variable"}function k(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){f=!0;break}e=!e&&"\\"==d}return(f||!e&&!z)&&(c.tokenize=null),"string"}}function l(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}function m(a,b){i.typeFirstDefinitions&&a.eol()&&f(b.context)&&(b.typeAtEndOfLine=e(a,b,a.pos))}var n,o,p=g.indentUnit,q=i.statementIndentUnit||p,r=i.dontAlignCalls,s=i.keywords||{},t=i.types||{},u=i.builtin||{},v=i.blockKeywords||{},w=i.defKeywords||{},x=i.atoms||{},y=i.hooks||{},z=i.multiLineStrings,A=i.indentStatements!==!1,B=i.indentSwitch!==!1,C=i.namespaceSeparator,D=i.isPunctuationChar||/[\[\]{}\(\),;\:\.]/,E=i.numberStart||/[\d\.]/,F=i.number||/^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,G=i.isOperatorChar||/[+\-*&%=<>!?|\/]/,H=i.isIdentifierChar||/[\w\$_\xa1-\uffff]/;return{startState:function(a){return{tokenize:null,context:new b((a||0)-p,0,"top",null,!1),indented:0,startOfLine:!0,prevToken:null}},token:function(a,b){var g=b.context;if(a.sol()&&(null==g.align&&(g.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return m(a,b),null;n=o=null;var h=(b.tokenize||j)(a,b);if("comment"==h||"meta"==h)return h;if(null==g.align&&(g.align=!0),";"==n||":"==n||","==n&&a.match(/^\s*(?:\/\/.*)?$/,!1))for(;"statement"==b.context.type;)d(b);else if("{"==n)c(b,a.column(),"}");else if("["==n)c(b,a.column(),"]");else if("("==n)c(b,a.column(),")");else if("}"==n){for(;"statement"==g.type;)g=d(b);for("}"==g.type&&(g=d(b));"statement"==g.type;)g=d(b)}else n==g.type?d(b):A&&(("}"==g.type||"top"==g.type)&&";"!=n||"statement"==g.type&&"newstatement"==n)&&c(b,a.column(),"statement",a.current());if("variable"==h&&("def"==b.prevToken||i.typeFirstDefinitions&&e(a,b,a.start)&&f(b.context)&&a.match(/^\s*\(/,!1))&&(h="def"),y.token){var k=y.token(a,b,h);void 0!==k&&(h=k)}return"def"==h&&i.styleDefs===!1&&(h="variable"),b.startOfLine=!1,b.prevToken=o?"def":h||n,m(a,b),h},indent:function(b,c){if(b.tokenize!=j&&null!=b.tokenize||b.typeAtEndOfLine)return a.Pass;var d=b.context,e=c&&c.charAt(0);if("statement"==d.type&&"}"==e&&(d=d.prev),i.dontIndentStatements)for(;"statement"==d.type&&i.dontIndentStatements.test(d.info);)d=d.prev;if(y.indent){var f=y.indent(b,d,c);if("number"==typeof f)return f}var g=e==d.type,h=d.prev&&"switch"==d.prev.info;if(i.allmanIndentation&&/[{(]/.test(e)){for(;"top"!=d.type&&"}"!=d.type;)d=d.prev;return d.indented}return"statement"==d.type?d.indented+("{"==e?0:q):!d.align||r&&")"==d.type?")"!=d.type||g?d.indented+(g?0:p)+(g||!h||/^(?:case|default)\b/.test(c)?0:p):d.indented+q:d.column+(g?0:1)},electricInput:B?/^\s*(?:case .*?:|default:|\{\}?|\})$/:/^\s*[{}]$/,blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:"//",fold:"brace"}}));var u="auto if break case register continue return default do sizeof static else struct switch extern typedef union for goto while enum const volatile",v="int long char short double float unsigned signed void size_t ptrdiff_t";p(["text/x-csrc","text/x-c","text/x-chdr"],{name:"clike",keywords:g(u),types:g(v+" bool _Complex _Bool float_t double_t intptr_t intmax_t int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),blockKeywords:g("case do else for if switch while struct"),defKeywords:g("struct"),typeFirstDefinitions:!0,atoms:g("NULL true false"),hooks:{"#":i,"*":j},modeProps:{fold:["brace","include"]}}),p(["text/x-c++src","text/x-c++hdr"],{name:"clike",keywords:g(u+" asm dynamic_cast namespace reinterpret_cast try explicit new static_cast typeid catch operator template typename class friend private this using const_cast inline public throw virtual delete mutable protected alignas alignof constexpr decltype nullptr noexcept thread_local final static_assert override"),types:g(v+" bool wchar_t"),blockKeywords:g("catch class do else finally for if struct switch try while"),defKeywords:g("class namespace struct enum union"),typeFirstDefinitions:!0,atoms:g("true false NULL"),dontIndentStatements:/^template$/,isIdentifierChar:/[\w\$_~\xa1-\uffff]/,hooks:{"#":i,"*":j,u:l,U:l,L:l,R:l,0:k,1:k,2:k,3:k,4:k,5:k,6:k,7:k,8:k,9:k,token:function(a,b,c){if("variable"==c&&"("==a.peek()&&(";"==b.prevToken||null==b.prevToken||"}"==b.prevToken)&&m(a.current()))return"def"}},namespaceSeparator:"::",modeProps:{fold:["brace","include"]}}),p("text/x-java",{name:"clike",keywords:g("abstract assert break case catch class const continue default do else enum extends final finally float for goto if implements import instanceof interface native new package private protected public return static strictfp super switch synchronized this throw throws transient try volatile while @interface"),types:g("byte short int long float double boolean char void Boolean Byte Character Double Float Integer Long Number Object Short String StringBuffer StringBuilder Void"),blockKeywords:g("catch class do else finally for if switch try while"),defKeywords:g("class interface enum @interface"),typeFirstDefinitions:!0,atoms:g("true false null"),number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,hooks:{"@":function(a){return!a.match("interface",!1)&&(a.eatWhile(/[\w\$_]/),"meta")}},modeProps:{fold:["brace","import"]}}),p("text/x-csharp",{name:"clike",keywords:g("abstract as async await base break case catch checked class const continue default delegate do else enum event explicit extern finally fixed for foreach goto if implicit in interface internal is lock namespace new operator out override params private protected public readonly ref return sealed sizeof stackalloc static struct switch this throw try typeof unchecked unsafe using virtual void volatile while add alias ascending descending dynamic from get global group into join let orderby partial remove select set value var yield"),types:g("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32 UInt64 bool byte char decimal double short int long object sbyte float string ushort uint ulong"),blockKeywords:g("catch class do else finally for foreach if struct switch try while"),defKeywords:g("class interface namespace struct var"),typeFirstDefinitions:!0,atoms:g("true false null"),hooks:{"@":function(a,b){return a.eat('"')?(b.tokenize=n,n(a,b)):(a.eatWhile(/[\w\$_]/),"meta")}}}),p("text/x-scala",{name:"clike",keywords:g("abstract case catch class def do else extends final finally for forSome if implicit import lazy match new null object override package private protected return sealed super this throw trait try type val var while with yield _ assert assume require print println printf readLine readBoolean readByte readShort readChar readInt readLong readFloat readDouble"),types:g("AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"),multiLineStrings:!0,blockKeywords:g("catch class enum do else finally for forSome if match switch try while"),defKeywords:g("class enum def object package trait type val var"),atoms:g("true false null"),indentStatements:!1,indentSwitch:!1,isOperatorChar:/[+\-*&%=<>!?|\/#:@]/,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return!!a.match('""')&&(b.tokenize=q,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},"=":function(a,c){var d=c.context;return!("}"!=d.type||!d.align||!a.eat(">"))&&(c.context=new b(d.indented,d.column,d.type,d.info,null,d.prev),"operator")},"/":function(a,b){return!!a.eat("*")&&(b.tokenize=r(1),b.tokenize(a,b))}},modeProps:{closeBrackets:{triples:'"'}}}),p("text/x-kotlin",{name:"clike",keywords:g("package as typealias class interface this super val operator var fun for is in This throw return annotation break continue object if else while do try when !in !is as? file import where by get set abstract enum open inner override private public internal protected catch finally out final vararg reified dynamic companion constructor init sealed field property receiver param sparam lateinit data inline noinline tailrec external annotation crossinline const operator infix suspend actual expect setparam"),types:g("Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable Compiler Double Exception Float Integer Long Math Number Object Package Pair Process Runtime Runnable SecurityManager Short StackTraceElement StrictMath String StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void Annotation Any BooleanArray ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy LazyThreadSafetyMode LongArray Nothing ShortArray Unit"),intendSwitch:!1,indentStatements:!1,multiLineStrings:!0,number:/^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,blockKeywords:g("catch class do else finally for if where try while enum"),defKeywords:g("class val var object interface fun"),atoms:g("true false null this"),hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return b.tokenize=s(a.match('""')),b.tokenize(a,b)}},modeProps:{closeBrackets:{triples:'"'}}}),p(["x-shader/x-vertex","x-shader/x-fragment"],{name:"clike",keywords:g("sampler1D sampler2D sampler3D samplerCube sampler1DShadow sampler2DShadow const attribute uniform varying break continue discard return for while do if else struct in out inout"),types:g("float int bool void vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 mat2 mat3 mat4"),blockKeywords:g("for while do if else struct"),builtin:g("radians degrees sin cos tan asin acos atan pow exp log exp2 sqrt inversesqrt abs sign floor ceil fract mod min max clamp mix step smoothstep length distance dot cross normalize ftransform faceforward reflect refract matrixCompMult lessThan lessThanEqual greaterThan greaterThanEqual equal notEqual any all not texture1D texture1DProj texture1DLod texture1DProjLod texture2D texture2DProj texture2DLod texture2DProjLod texture3D texture3DProj texture3DLod texture3DProjLod textureCube textureCubeLod shadow1D shadow2D shadow1DProj shadow2DProj shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod dFdx dFdy fwidth noise1 noise2 noise3 noise4"),atoms:g("true false gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_FogCoord gl_PointCoord gl_Position gl_PointSize gl_ClipVertex gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor gl_TexCoord gl_FogFragCoord gl_FragCoord gl_FrontFacing gl_FragData gl_FragDepth gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose gl_ProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixInverseTranspose gl_TextureMatrixInverseTranspose gl_NormalScale gl_DepthRange gl_ClipPlane gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel gl_FrontLightModelProduct gl_BackLightModelProduct gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ gl_FogParameters gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits gl_MaxDrawBuffers"),indentSwitch:!1,hooks:{"#":i},modeProps:{fold:["brace","include"]}}),p("text/x-nesc",{name:"clike",keywords:g(u+"as atomic async call command component components configuration event generic implementation includes interface module new norace nx_struct nx_union post provides signal task uses abstract extends"),types:g(v),blockKeywords:g("case do else for if switch while struct"),atoms:g("null true false"),hooks:{"#":i},modeProps:{fold:["brace","include"]}}),p("text/x-objectivec",{name:"clike",keywords:g(u+"inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),types:g(v),atoms:g("YES NO NULL NILL ON OFF true false"),hooks:{"@":function(a){return a.eatWhile(/[\w\$]/),"keyword"},"#":i,indent:function(a,b,c){if("statement"==b.type&&/^@\w/.test(c))return b.indented}},modeProps:{fold:"brace"}}),p("text/x-squirrel",{name:"clike",keywords:g("base break clone continue const default delete enum extends function in class foreach local resume return this throw typeof yield constructor instanceof static"),types:g(v),blockKeywords:g("case catch class else for foreach if switch try while"),defKeywords:g("function local class"),typeFirstDefinitions:!0,atoms:g("true false null"),hooks:{"#":i},modeProps:{fold:["brace","include"]}});var w=null;p("text/x-ceylon",{name:"clike",keywords:g("abstracts alias assembly assert assign break case catch class continue dynamic else exists extends finally for function given if import in interface is let module new nonempty object of out outer package return satisfies super switch then this throw try value void while"),types:function(a){var b=a.charAt(0);return b===b.toUpperCase()&&b!==b.toLowerCase()},blockKeywords:g("case catch class dynamic else finally for function if interface module new object switch try while"),defKeywords:g("class dynamic function interface module object package value"),builtin:g("abstract actual aliased annotation by default deprecated doc final formal late license native optional sealed see serializable shared suppressWarnings tagged throws variable"),isPunctuationChar:/[\[\]{}\(\),;\:\.`]/,isOperatorChar:/[+\-*&%=<>!?|^~:\/]/,numberStart:/[\d#$]/,number:/^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,multiLineStrings:!0,typeFirstDefinitions:!0,atoms:g("true false null larger smaller equal empty finished"),indentSwitch:!1,styleDefs:!1,hooks:{"@":function(a){return a.eatWhile(/[\w\$_]/),"meta"},'"':function(a,b){return b.tokenize=t(a.match('""')?"triple":"single"),b.tokenize(a,b)},"`":function(a,b){return!(!w||!a.match("`"))&&(b.tokenize=w,w=null,b.tokenize(a,b))},"'":function(a){return a.eatWhile(/[\w\$_\xa1-\uffff]/),"atom"},token:function(a,b,c){if(("variable"==c||"type"==c)&&"."==b.prevToken)return"variable-2"}},modeProps:{fold:["brace","import"],closeBrackets:{triples:'"'}}})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/clojure/clojure.js b/core/media/editors/codemirror/mode/clojure/clojure.js
new file mode 100644
index 00000000..ed6af2c8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/clojure/clojure.js
@@ -0,0 +1,306 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Author: Hans Engel
+ * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("clojure", function (options) {
+    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
+        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
+    var INDENT_WORD_SKIP = options.indentUnit || 2;
+    var NORMAL_INDENT_UNIT = options.indentUnit || 2;
+
+    function makeKeywords(str) {
+        var obj = {}, words = str.split(" ");
+        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+        return obj;
+    }
+
+    var atoms = makeKeywords("true false nil");
+
+    var keywords = makeKeywords(
+      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest " +
+      "slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn " +
+      "do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync " +
+      "doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars " +
+      "binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
+
+    var builtins = makeKeywords(
+        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* " +
+        "*compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* " +
+        "*math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* " +
+        "*source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> " +
+        "->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor " +
+        "aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! " +
+        "alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double " +
+        "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 " +
+        "bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set " +
+        "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast " +
+        "byte byte-array bytes case cat cast char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
+        "chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors " +
+        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond condp " +
+        "conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? " +
+        "declare dedupe default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
+        "defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc " +
+        "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last " +
+        "drop-while eduction empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
+        "extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword " +
+        "find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? " +
+        "fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? " +
+        "gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash " +
+        "hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? " +
+        "int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep " +
+        "keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file " +
+        "load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array " +
+        "make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods " +
+        "min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty " +
+        "not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias " +
+        "ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all " +
+        "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers " +
+        "primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str " +
+        "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues " +
+        "quot rand rand-int rand-nth random-sample range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
+        "re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history " +
+        "ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods " +
+        "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest " +
+        "restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? " +
+        "seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
+        "shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
+        "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol " +
+        "symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce " +
+        "transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec " +
+        "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int " +
+        "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int "+
+        "unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote " +
+        "unquote-splicing update update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of " +
+        "vector? volatile! volatile? vreset! vswap! when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context " +
+        "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap " +
+        "*default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! " +
+        "set-agent-send-off-executor! some-> some->>");
+
+    var indentKeys = makeKeywords(
+        // Built-ins
+        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto " +
+        "locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type " +
+        "try catch " +
+
+        // Binding forms
+        "let letfn binding loop for doseq dotimes when-let if-let " +
+
+        // Data structures
+        "defstruct struct-map assoc " +
+
+        // clojure.test
+        "testing deftest " +
+
+        // contrib
+        "handler-case handle dotrace deftrace");
+
+    var tests = {
+        digit: /\d/,
+        digit_or_colon: /[\d:]/,
+        hex: /[0-9a-f]/i,
+        sign: /[+-]/,
+        exponent: /e/i,
+        keyword_char: /[^\s\(\[\;\)\]]/,
+        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/,
+        block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
+    };
+
+    function stateStack(indent, type, prev) { // represents a state stack object
+        this.indent = indent;
+        this.type = type;
+        this.prev = prev;
+    }
+
+    function pushStack(state, indent, type) {
+        state.indentStack = new stateStack(indent, type, state.indentStack);
+    }
+
+    function popStack(state) {
+        state.indentStack = state.indentStack.prev;
+    }
+
+    function isNumber(ch, stream){
+        // hex
+        if ( ch === '0' && stream.eat(/x/i) ) {
+            stream.eatWhile(tests.hex);
+            return true;
+        }
+
+        // leading sign
+        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
+          stream.eat(tests.sign);
+          ch = stream.next();
+        }
+
+        if ( tests.digit.test(ch) ) {
+            stream.eat(ch);
+            stream.eatWhile(tests.digit);
+
+            if ( '.' == stream.peek() ) {
+                stream.eat('.');
+                stream.eatWhile(tests.digit);
+            } else if ('/' == stream.peek() ) {
+                stream.eat('/');
+                stream.eatWhile(tests.digit);
+            }
+
+            if ( stream.eat(tests.exponent) ) {
+                stream.eat(tests.sign);
+                stream.eatWhile(tests.digit);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    // Eat character that starts after backslash \
+    function eatCharacter(stream) {
+        var first = stream.next();
+        // Read special literals: backspace, newline, space, return.
+        // Just read all lowercase letters.
+        if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
+            return;
+        }
+        // Read unicode character: \u1000 \uA0a1
+        if (first === "u") {
+            stream.match(/[0-9a-z]{4}/i, true);
+        }
+    }
+
+    return {
+        startState: function () {
+            return {
+                indentStack: null,
+                indentation: 0,
+                mode: false
+            };
+        },
+
+        token: function (stream, state) {
+            if (state.indentStack == null && stream.sol()) {
+                // update indentation, but only if indentStack is empty
+                state.indentation = stream.indentation();
+            }
+
+            // skip spaces
+            if (state.mode != "string" && stream.eatSpace()) {
+                return null;
+            }
+            var returnType = null;
+
+            switch(state.mode){
+                case "string": // multi-line string parsing mode
+                    var next, escaped = false;
+                    while ((next = stream.next()) != null) {
+                        if (next == "\"" && !escaped) {
+
+                            state.mode = false;
+                            break;
+                        }
+                        escaped = !escaped && next == "\\";
+                    }
+                    returnType = STRING; // continue on in string mode
+                    break;
+                default: // default parsing mode
+                    var ch = stream.next();
+
+                    if (ch == "\"") {
+                        state.mode = "string";
+                        returnType = STRING;
+                    } else if (ch == "\\") {
+                        eatCharacter(stream);
+                        returnType = CHARACTER;
+                    } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
+                        returnType = ATOM;
+                    } else if (ch == ";") { // comment
+                        stream.skipToEnd(); // rest of the line is a comment
+                        returnType = COMMENT;
+                    } else if (isNumber(ch,stream)){
+                        returnType = NUMBER;
+                    } else if (ch == "(" || ch == "[" || ch == "{" ) {
+                        var keyWord = '', indentTemp = stream.column(), letter;
+                        /**
+                        Either
+                        (indent-word ..
+                        (non-indent-word ..
+                        (;something else, bracket, etc.
+                        */
+
+                        if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
+                            keyWord += letter;
+                        }
+
+                        if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
+                                                   tests.block_indent.test(keyWord))) { // indent-word
+                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
+                        } else { // non-indent word
+                            // we continue eating the spaces
+                            stream.eatSpace();
+                            if (stream.eol() || stream.peek() == ";") {
+                                // nothing significant after
+                                // we restart indentation the user defined spaces after
+                                pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch);
+                            } else {
+                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
+                            }
+                        }
+                        stream.backUp(stream.current().length - 1); // undo all the eating
+
+                        returnType = BRACKET;
+                    } else if (ch == ")" || ch == "]" || ch == "}") {
+                        returnType = BRACKET;
+                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) {
+                            popStack(state);
+                        }
+                    } else if ( ch == ":" ) {
+                        stream.eatWhile(tests.symbol);
+                        return ATOM;
+                    } else {
+                        stream.eatWhile(tests.symbol);
+
+                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
+                            returnType = KEYWORD;
+                        } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
+                            returnType = BUILTIN;
+                        } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
+                            returnType = ATOM;
+                        } else {
+                          returnType = VAR;
+                        }
+                    }
+            }
+
+            return returnType;
+        },
+
+        indent: function (state) {
+            if (state.indentStack == null) return state.indentation;
+            return state.indentStack.indent;
+        },
+
+        closeBrackets: {pairs: "()[]{}\"\""},
+        lineComment: ";;"
+    };
+});
+
+CodeMirror.defineMIME("text/x-clojure", "clojure");
+CodeMirror.defineMIME("text/x-clojurescript", "clojure");
+CodeMirror.defineMIME("application/edn", "clojure");
+
+});
diff --git a/core/media/editors/codemirror/mode/clojure/clojure.min.js b/core/media/editors/codemirror/mode/clojure/clojure.min.js
new file mode 100644
index 00000000..2dfcbf9b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/clojure/clojure.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("clojure",(function(a){function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(a,b,c){this.indent=a,this.type=b,this.prev=c}function d(a,b,d){a.indentStack=new c(b,d,a.indentStack)}function e(a){a.indentStack=a.indentStack.prev}function f(a,b){return"0"===a&&b.eat(/x/i)?(b.eatWhile(w.hex),!0):("+"!=a&&"-"!=a||!w.digit.test(b.peek())||(b.eat(w.sign),a=b.next()),!!w.digit.test(a)&&(b.eat(a),b.eatWhile(w.digit),"."==b.peek()?(b.eat("."),b.eatWhile(w.digit)):"/"==b.peek()&&(b.eat("/"),b.eatWhile(w.digit)),b.eat(w.exponent)&&(b.eat(w.sign),b.eatWhile(w.digit)),!0))}function g(a){var b=a.next();b&&b.match(/[a-z]/)&&a.match(/[a-z]+/,!0)||"u"===b&&a.match(/[0-9a-z]{4}/i,!0)}var h="builtin",i="comment",j="string",k="string-2",l="atom",m="number",n="bracket",o="keyword",p="variable",q=a.indentUnit||2,r=a.indentUnit||2,s=b("true false nil"),t=b("defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle"),u=b("* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> ->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast byte byte-array bytes case cat cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? declare dedupe default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while eduction empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int rand-nth random-sample range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote unquote-splicing update update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? volatile! volatile? vreset! vswap! when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap *default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! set-agent-send-off-executor! some-> some->>"),v=b("ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch let letfn binding loop for doseq dotimes when-let if-let defstruct struct-map assoc testing deftest handler-case handle dotrace deftrace"),w={digit:/\d/,digit_or_colon:/[\d:]/,hex:/[0-9a-f]/i,sign:/[+-]/,exponent:/e/i,keyword_char:/[^\s\(\[\;\)\]]/,symbol:/[\w*+!\-\._?:<>\/\xa1-\uffff]/,block_indent:/^(?:def|with)[^\/]+$|\/(?:def|with)/};return{startState:function(){return{indentStack:null,indentation:0,mode:!1}},token:function(a,b){if(null==b.indentStack&&a.sol()&&(b.indentation=a.indentation()),"string"!=b.mode&&a.eatSpace())return null;var c=null;switch(b.mode){case"string":for(var x,y=!1;null!=(x=a.next());){if('"'==x&&!y){b.mode=!1;break}y=!y&&"\\"==x}c=j;break;default:var z=a.next();if('"'==z)b.mode="string",c=j;else if("\\"==z)g(a),c=k;else if("'"!=z||w.digit_or_colon.test(a.peek()))if(";"==z)a.skipToEnd(),c=i;else if(f(z,a))c=m;else if("("==z||"["==z||"{"==z){var A,B="",C=a.column();if("("==z)for(;null!=(A=a.eat(w.keyword_char));)B+=A;B.length>0&&(v.propertyIsEnumerable(B)||w.block_indent.test(B))?d(b,C+q,z):(a.eatSpace(),a.eol()||";"==a.peek()?d(b,C+r,z):d(b,C+a.current().length,z)),a.backUp(a.current().length-1),c=n}else if(")"==z||"]"==z||"}"==z)c=n,null!=b.indentStack&&b.indentStack.type==(")"==z?"(":"]"==z?"[":"{")&&e(b);else{if(":"==z)return a.eatWhile(w.symbol),l;a.eatWhile(w.symbol),c=t&&t.propertyIsEnumerable(a.current())?o:u&&u.propertyIsEnumerable(a.current())?h:s&&s.propertyIsEnumerable(a.current())?l:p}else c=l}return c},indent:function(a){return null==a.indentStack?a.indentation:a.indentStack.indent},closeBrackets:{pairs:'()[]{}""'},lineComment:";;"}})),a.defineMIME("text/x-clojure","clojure"),a.defineMIME("text/x-clojurescript","clojure"),a.defineMIME("application/edn","clojure")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/cmake/cmake.js b/core/media/editors/codemirror/mode/cmake/cmake.js
new file mode 100644
index 00000000..9f9eda54
--- /dev/null
+++ b/core/media/editors/codemirror/mode/cmake/cmake.js
@@ -0,0 +1,97 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod);
+  else
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("cmake", function () {
+  var variable_regex = /({)?[a-zA-Z0-9_]+(})?/;
+
+  function tokenString(stream, state) {
+    var current, prev, found_var = false;
+    while (!stream.eol() && (current = stream.next()) != state.pending) {
+      if (current === '$' && prev != '\\' && state.pending == '"') {
+        found_var = true;
+        break;
+      }
+      prev = current;
+    }
+    if (found_var) {
+      stream.backUp(1);
+    }
+    if (current == state.pending) {
+      state.continueString = false;
+    } else {
+      state.continueString = true;
+    }
+    return "string";
+  }
+
+  function tokenize(stream, state) {
+    var ch = stream.next();
+
+    // Have we found a variable?
+    if (ch === '$') {
+      if (stream.match(variable_regex)) {
+        return 'variable-2';
+      }
+      return 'variable';
+    }
+    // Should we still be looking for the end of a string?
+    if (state.continueString) {
+      // If so, go through the loop again
+      stream.backUp(1);
+      return tokenString(stream, state);
+    }
+    // Do we just have a function on our hands?
+    // In 'cmake_minimum_required (VERSION 2.8.8)', 'cmake_minimum_required' is matched
+    if (stream.match(/(\s+)?\w+\(/) || stream.match(/(\s+)?\w+\ \(/)) {
+      stream.backUp(1);
+      return 'def';
+    }
+    if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    // Have we found a string?
+    if (ch == "'" || ch == '"') {
+      // Store the type (single or double)
+      state.pending = ch;
+      // Perform the looping function to find the end
+      return tokenString(stream, state);
+    }
+    if (ch == '(' || ch == ')') {
+      return 'bracket';
+    }
+    if (ch.match(/[0-9]/)) {
+      return 'number';
+    }
+    stream.eatWhile(/[\w-]/);
+    return null;
+  }
+  return {
+    startState: function () {
+      var state = {};
+      state.inDefinition = false;
+      state.inInclude = false;
+      state.continueString = false;
+      state.pending = false;
+      return state;
+    },
+    token: function (stream, state) {
+      if (stream.eatSpace()) return null;
+      return tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-cmake", "cmake");
+
+});
diff --git a/core/media/editors/codemirror/mode/cmake/cmake.min.js b/core/media/editors/codemirror/mode/cmake/cmake.min.js
new file mode 100644
index 00000000..28ec84b9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/cmake/cmake.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("cmake",(function(){function a(a,b){for(var c,d,e=!1;!a.eol()&&(c=a.next())!=b.pending;){if("$"===c&&"\\"!=d&&'"'==b.pending){e=!0;break}d=c}return e&&a.backUp(1),c==b.pending?b.continueString=!1:b.continueString=!0,"string"}function b(b,d){var e=b.next();return"$"===e?b.match(c)?"variable-2":"variable":d.continueString?(b.backUp(1),a(b,d)):b.match(/(\s+)?\w+\(/)||b.match(/(\s+)?\w+\ \(/)?(b.backUp(1),"def"):"#"==e?(b.skipToEnd(),"comment"):"'"==e||'"'==e?(d.pending=e,a(b,d)):"("==e||")"==e?"bracket":e.match(/[0-9]/)?"number":(b.eatWhile(/[\w-]/),null)}var c=/({)?[a-zA-Z0-9_]+(})?/;return{startState:function(){var a={};return a.inDefinition=!1,a.inInclude=!1,a.continueString=!1,a.pending=!1,a},token:function(a,c){return a.eatSpace()?null:b(a,c)}}})),a.defineMIME("text/x-cmake","cmake")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/cobol/cobol.js b/core/media/editors/codemirror/mode/cobol/cobol.js
new file mode 100644
index 00000000..897022b1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/cobol/cobol.js
@@ -0,0 +1,255 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Author: Gautam Mehta
+ * Branched from CodeMirror's Scheme mode
+ */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("cobol", function () {
+  var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
+      ATOM = "atom", NUMBER = "number", KEYWORD = "keyword", MODTAG = "header",
+      COBOLLINENUM = "def", PERIOD = "link";
+  function makeKeywords(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+  var atoms = makeKeywords("TRUE FALSE ZEROES ZEROS ZERO SPACES SPACE LOW-VALUE LOW-VALUES ");
+  var keywords = makeKeywords(
+      "ACCEPT ACCESS ACQUIRE ADD ADDRESS " +
+      "ADVANCING AFTER ALIAS ALL ALPHABET " +
+      "ALPHABETIC ALPHABETIC-LOWER ALPHABETIC-UPPER ALPHANUMERIC ALPHANUMERIC-EDITED " +
+      "ALSO ALTER ALTERNATE AND ANY " +
+      "ARE AREA AREAS ARITHMETIC ASCENDING " +
+      "ASSIGN AT ATTRIBUTE AUTHOR AUTO " +
+      "AUTO-SKIP AUTOMATIC B-AND B-EXOR B-LESS " +
+      "B-NOT B-OR BACKGROUND-COLOR BACKGROUND-COLOUR BEEP " +
+      "BEFORE BELL BINARY BIT BITS " +
+      "BLANK BLINK BLOCK BOOLEAN BOTTOM " +
+      "BY CALL CANCEL CD CF " +
+      "CH CHARACTER CHARACTERS CLASS CLOCK-UNITS " +
+      "CLOSE COBOL CODE CODE-SET COL " +
+      "COLLATING COLUMN COMMA COMMIT COMMITMENT " +
+      "COMMON COMMUNICATION COMP COMP-0 COMP-1 " +
+      "COMP-2 COMP-3 COMP-4 COMP-5 COMP-6 " +
+      "COMP-7 COMP-8 COMP-9 COMPUTATIONAL COMPUTATIONAL-0 " +
+      "COMPUTATIONAL-1 COMPUTATIONAL-2 COMPUTATIONAL-3 COMPUTATIONAL-4 COMPUTATIONAL-5 " +
+      "COMPUTATIONAL-6 COMPUTATIONAL-7 COMPUTATIONAL-8 COMPUTATIONAL-9 COMPUTE " +
+      "CONFIGURATION CONNECT CONSOLE CONTAINED CONTAINS " +
+      "CONTENT CONTINUE CONTROL CONTROL-AREA CONTROLS " +
+      "CONVERTING COPY CORR CORRESPONDING COUNT " +
+      "CRT CRT-UNDER CURRENCY CURRENT CURSOR " +
+      "DATA DATE DATE-COMPILED DATE-WRITTEN DAY " +
+      "DAY-OF-WEEK DB DB-ACCESS-CONTROL-KEY DB-DATA-NAME DB-EXCEPTION " +
+      "DB-FORMAT-NAME DB-RECORD-NAME DB-SET-NAME DB-STATUS DBCS " +
+      "DBCS-EDITED DE DEBUG-CONTENTS DEBUG-ITEM DEBUG-LINE " +
+      "DEBUG-NAME DEBUG-SUB-1 DEBUG-SUB-2 DEBUG-SUB-3 DEBUGGING " +
+      "DECIMAL-POINT DECLARATIVES DEFAULT DELETE DELIMITED " +
+      "DELIMITER DEPENDING DESCENDING DESCRIBED DESTINATION " +
+      "DETAIL DISABLE DISCONNECT DISPLAY DISPLAY-1 " +
+      "DISPLAY-2 DISPLAY-3 DISPLAY-4 DISPLAY-5 DISPLAY-6 " +
+      "DISPLAY-7 DISPLAY-8 DISPLAY-9 DIVIDE DIVISION " +
+      "DOWN DROP DUPLICATE DUPLICATES DYNAMIC " +
+      "EBCDIC EGI EJECT ELSE EMI " +
+      "EMPTY EMPTY-CHECK ENABLE END END. END-ACCEPT END-ACCEPT. " +
+      "END-ADD END-CALL END-COMPUTE END-DELETE END-DISPLAY " +
+      "END-DIVIDE END-EVALUATE END-IF END-INVOKE END-MULTIPLY " +
+      "END-OF-PAGE END-PERFORM END-READ END-RECEIVE END-RETURN " +
+      "END-REWRITE END-SEARCH END-START END-STRING END-SUBTRACT " +
+      "END-UNSTRING END-WRITE END-XML ENTER ENTRY " +
+      "ENVIRONMENT EOP EQUAL EQUALS ERASE " +
+      "ERROR ESI EVALUATE EVERY EXCEEDS " +
+      "EXCEPTION EXCLUSIVE EXIT EXTEND EXTERNAL " +
+      "EXTERNALLY-DESCRIBED-KEY FD FETCH FILE FILE-CONTROL " +
+      "FILE-STREAM FILES FILLER FINAL FIND " +
+      "FINISH FIRST FOOTING FOR FOREGROUND-COLOR " +
+      "FOREGROUND-COLOUR FORMAT FREE FROM FULL " +
+      "FUNCTION GENERATE GET GIVING GLOBAL " +
+      "GO GOBACK GREATER GROUP HEADING " +
+      "HIGH-VALUE HIGH-VALUES HIGHLIGHT I-O I-O-CONTROL " +
+      "ID IDENTIFICATION IF IN INDEX " +
+      "INDEX-1 INDEX-2 INDEX-3 INDEX-4 INDEX-5 " +
+      "INDEX-6 INDEX-7 INDEX-8 INDEX-9 INDEXED " +
+      "INDIC INDICATE INDICATOR INDICATORS INITIAL " +
+      "INITIALIZE INITIATE INPUT INPUT-OUTPUT INSPECT " +
+      "INSTALLATION INTO INVALID INVOKE IS " +
+      "JUST JUSTIFIED KANJI KEEP KEY " +
+      "LABEL LAST LD LEADING LEFT " +
+      "LEFT-JUSTIFY LENGTH LENGTH-CHECK LESS LIBRARY " +
+      "LIKE LIMIT LIMITS LINAGE LINAGE-COUNTER " +
+      "LINE LINE-COUNTER LINES LINKAGE LOCAL-STORAGE " +
+      "LOCALE LOCALLY LOCK " +
+      "MEMBER MEMORY MERGE MESSAGE METACLASS " +
+      "MODE MODIFIED MODIFY MODULES MOVE " +
+      "MULTIPLE MULTIPLY NATIONAL NATIVE NEGATIVE " +
+      "NEXT NO NO-ECHO NONE NOT " +
+      "NULL NULL-KEY-MAP NULL-MAP NULLS NUMBER " +
+      "NUMERIC NUMERIC-EDITED OBJECT OBJECT-COMPUTER OCCURS " +
+      "OF OFF OMITTED ON ONLY " +
+      "OPEN OPTIONAL OR ORDER ORGANIZATION " +
+      "OTHER OUTPUT OVERFLOW OWNER PACKED-DECIMAL " +
+      "PADDING PAGE PAGE-COUNTER PARSE PERFORM " +
+      "PF PH PIC PICTURE PLUS " +
+      "POINTER POSITION POSITIVE PREFIX PRESENT " +
+      "PRINTING PRIOR PROCEDURE PROCEDURE-POINTER PROCEDURES " +
+      "PROCEED PROCESS PROCESSING PROGRAM PROGRAM-ID " +
+      "PROMPT PROTECTED PURGE QUEUE QUOTE " +
+      "QUOTES RANDOM RD READ READY " +
+      "REALM RECEIVE RECONNECT RECORD RECORD-NAME " +
+      "RECORDS RECURSIVE REDEFINES REEL REFERENCE " +
+      "REFERENCE-MONITOR REFERENCES RELATION RELATIVE RELEASE " +
+      "REMAINDER REMOVAL RENAMES REPEATED REPLACE " +
+      "REPLACING REPORT REPORTING REPORTS REPOSITORY " +
+      "REQUIRED RERUN RESERVE RESET RETAINING " +
+      "RETRIEVAL RETURN RETURN-CODE RETURNING REVERSE-VIDEO " +
+      "REVERSED REWIND REWRITE RF RH " +
+      "RIGHT RIGHT-JUSTIFY ROLLBACK ROLLING ROUNDED " +
+      "RUN SAME SCREEN SD SEARCH " +
+      "SECTION SECURE SECURITY SEGMENT SEGMENT-LIMIT " +
+      "SELECT SEND SENTENCE SEPARATE SEQUENCE " +
+      "SEQUENTIAL SET SHARED SIGN SIZE " +
+      "SKIP1 SKIP2 SKIP3 SORT SORT-MERGE " +
+      "SORT-RETURN SOURCE SOURCE-COMPUTER SPACE-FILL " +
+      "SPECIAL-NAMES STANDARD STANDARD-1 STANDARD-2 " +
+      "START STARTING STATUS STOP STORE " +
+      "STRING SUB-QUEUE-1 SUB-QUEUE-2 SUB-QUEUE-3 SUB-SCHEMA " +
+      "SUBFILE SUBSTITUTE SUBTRACT SUM SUPPRESS " +
+      "SYMBOLIC SYNC SYNCHRONIZED SYSIN SYSOUT " +
+      "TABLE TALLYING TAPE TENANT TERMINAL " +
+      "TERMINATE TEST TEXT THAN THEN " +
+      "THROUGH THRU TIME TIMES TITLE " +
+      "TO TOP TRAILING TRAILING-SIGN TRANSACTION " +
+      "TYPE TYPEDEF UNDERLINE UNEQUAL UNIT " +
+      "UNSTRING UNTIL UP UPDATE UPON " +
+      "USAGE USAGE-MODE USE USING VALID " +
+      "VALIDATE VALUE VALUES VARYING VLR " +
+      "WAIT WHEN WHEN-COMPILED WITH WITHIN " +
+      "WORDS WORKING-STORAGE WRITE XML XML-CODE " +
+      "XML-EVENT XML-NTEXT XML-TEXT ZERO ZERO-FILL " );
+
+  var builtins = makeKeywords("- * ** / + < <= = > >= ");
+  var tests = {
+    digit: /\d/,
+    digit_or_colon: /[\d:]/,
+    hex: /[0-9a-f]/i,
+    sign: /[+-]/,
+    exponent: /e/i,
+    keyword_char: /[^\s\(\[\;\)\]]/,
+    symbol: /[\w*+\-]/
+  };
+  function isNumber(ch, stream){
+    // hex
+    if ( ch === '0' && stream.eat(/x/i) ) {
+      stream.eatWhile(tests.hex);
+      return true;
+    }
+    // leading sign
+    if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
+      stream.eat(tests.sign);
+      ch = stream.next();
+    }
+    if ( tests.digit.test(ch) ) {
+      stream.eat(ch);
+      stream.eatWhile(tests.digit);
+      if ( '.' == stream.peek()) {
+        stream.eat('.');
+        stream.eatWhile(tests.digit);
+      }
+      if ( stream.eat(tests.exponent) ) {
+        stream.eat(tests.sign);
+        stream.eatWhile(tests.digit);
+      }
+      return true;
+    }
+    return false;
+  }
+  return {
+    startState: function () {
+      return {
+        indentStack: null,
+        indentation: 0,
+        mode: false
+      };
+    },
+    token: function (stream, state) {
+      if (state.indentStack == null && stream.sol()) {
+        // update indentation, but only if indentStack is empty
+        state.indentation = 6 ; //stream.indentation();
+      }
+      // skip spaces
+      if (stream.eatSpace()) {
+        return null;
+      }
+      var returnType = null;
+      switch(state.mode){
+      case "string": // multi-line string parsing mode
+        var next = false;
+        while ((next = stream.next()) != null) {
+          if (next == "\"" || next == "\'") {
+            state.mode = false;
+            break;
+          }
+        }
+        returnType = STRING; // continue on in string mode
+        break;
+      default: // default parsing mode
+        var ch = stream.next();
+        var col = stream.column();
+        if (col >= 0 && col <= 5) {
+          returnType = COBOLLINENUM;
+        } else if (col >= 72 && col <= 79) {
+          stream.skipToEnd();
+          returnType = MODTAG;
+        } else if (ch == "*" && col == 6) { // comment
+          stream.skipToEnd(); // rest of the line is a comment
+          returnType = COMMENT;
+        } else if (ch == "\"" || ch == "\'") {
+          state.mode = "string";
+          returnType = STRING;
+        } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
+          returnType = ATOM;
+        } else if (ch == ".") {
+          returnType = PERIOD;
+        } else if (isNumber(ch,stream)){
+          returnType = NUMBER;
+        } else {
+          if (stream.current().match(tests.symbol)) {
+            while (col < 71) {
+              if (stream.eat(tests.symbol) === undefined) {
+                break;
+              } else {
+                col++;
+              }
+            }
+          }
+          if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
+            returnType = KEYWORD;
+          } else if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase())) {
+            returnType = BUILTIN;
+          } else if (atoms && atoms.propertyIsEnumerable(stream.current().toUpperCase())) {
+            returnType = ATOM;
+          } else returnType = null;
+        }
+      }
+      return returnType;
+    },
+    indent: function (state) {
+      if (state.indentStack == null) return state.indentation;
+      return state.indentStack.indent;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-cobol", "cobol");
+
+});
diff --git a/core/media/editors/codemirror/mode/cobol/cobol.min.js b/core/media/editors/codemirror/mode/cobol/cobol.min.js
new file mode 100644
index 00000000..a16e9230
--- /dev/null
+++ b/core/media/editors/codemirror/mode/cobol/cobol.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("cobol",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b){return"0"===a&&b.eat(/x/i)?(b.eatWhile(o.hex),!0):("+"!=a&&"-"!=a||!o.digit.test(b.peek())||(b.eat(o.sign),a=b.next()),!!o.digit.test(a)&&(b.eat(a),b.eatWhile(o.digit),"."==b.peek()&&(b.eat("."),b.eatWhile(o.digit)),b.eat(o.exponent)&&(b.eat(o.sign),b.eatWhile(o.digit)),!0))}var c="builtin",d="comment",e="string",f="atom",g="number",h="keyword",i="header",j="def",k="link",l=a("TRUE FALSE ZEROES ZEROS ZERO SPACES SPACE LOW-VALUE LOW-VALUES "),m=a("ACCEPT ACCESS ACQUIRE ADD ADDRESS ADVANCING AFTER ALIAS ALL ALPHABET ALPHABETIC ALPHABETIC-LOWER ALPHABETIC-UPPER ALPHANUMERIC ALPHANUMERIC-EDITED ALSO ALTER ALTERNATE AND ANY ARE AREA AREAS ARITHMETIC ASCENDING ASSIGN AT ATTRIBUTE AUTHOR AUTO AUTO-SKIP AUTOMATIC B-AND B-EXOR B-LESS B-NOT B-OR BACKGROUND-COLOR BACKGROUND-COLOUR BEEP BEFORE BELL BINARY BIT BITS BLANK BLINK BLOCK BOOLEAN BOTTOM BY CALL CANCEL CD CF CH CHARACTER CHARACTERS CLASS CLOCK-UNITS CLOSE COBOL CODE CODE-SET COL COLLATING COLUMN COMMA COMMIT COMMITMENT COMMON COMMUNICATION COMP COMP-0 COMP-1 COMP-2 COMP-3 COMP-4 COMP-5 COMP-6 COMP-7 COMP-8 COMP-9 COMPUTATIONAL COMPUTATIONAL-0 COMPUTATIONAL-1 COMPUTATIONAL-2 COMPUTATIONAL-3 COMPUTATIONAL-4 COMPUTATIONAL-5 COMPUTATIONAL-6 COMPUTATIONAL-7 COMPUTATIONAL-8 COMPUTATIONAL-9 COMPUTE CONFIGURATION CONNECT CONSOLE CONTAINED CONTAINS CONTENT CONTINUE CONTROL CONTROL-AREA CONTROLS CONVERTING COPY CORR CORRESPONDING COUNT CRT CRT-UNDER CURRENCY CURRENT CURSOR DATA DATE DATE-COMPILED DATE-WRITTEN DAY DAY-OF-WEEK DB DB-ACCESS-CONTROL-KEY DB-DATA-NAME DB-EXCEPTION DB-FORMAT-NAME DB-RECORD-NAME DB-SET-NAME DB-STATUS DBCS DBCS-EDITED DE DEBUG-CONTENTS DEBUG-ITEM DEBUG-LINE DEBUG-NAME DEBUG-SUB-1 DEBUG-SUB-2 DEBUG-SUB-3 DEBUGGING DECIMAL-POINT DECLARATIVES DEFAULT DELETE DELIMITED DELIMITER DEPENDING DESCENDING DESCRIBED DESTINATION DETAIL DISABLE DISCONNECT DISPLAY DISPLAY-1 DISPLAY-2 DISPLAY-3 DISPLAY-4 DISPLAY-5 DISPLAY-6 DISPLAY-7 DISPLAY-8 DISPLAY-9 DIVIDE DIVISION DOWN DROP DUPLICATE DUPLICATES DYNAMIC EBCDIC EGI EJECT ELSE EMI EMPTY EMPTY-CHECK ENABLE END END. END-ACCEPT END-ACCEPT. END-ADD END-CALL END-COMPUTE END-DELETE END-DISPLAY END-DIVIDE END-EVALUATE END-IF END-INVOKE END-MULTIPLY END-OF-PAGE END-PERFORM END-READ END-RECEIVE END-RETURN END-REWRITE END-SEARCH END-START END-STRING END-SUBTRACT END-UNSTRING END-WRITE END-XML ENTER ENTRY ENVIRONMENT EOP EQUAL EQUALS ERASE ERROR ESI EVALUATE EVERY EXCEEDS EXCEPTION EXCLUSIVE EXIT EXTEND EXTERNAL EXTERNALLY-DESCRIBED-KEY FD FETCH FILE FILE-CONTROL FILE-STREAM FILES FILLER FINAL FIND FINISH FIRST FOOTING FOR FOREGROUND-COLOR FOREGROUND-COLOUR FORMAT FREE FROM FULL FUNCTION GENERATE GET GIVING GLOBAL GO GOBACK GREATER GROUP HEADING HIGH-VALUE HIGH-VALUES HIGHLIGHT I-O I-O-CONTROL ID IDENTIFICATION IF IN INDEX INDEX-1 INDEX-2 INDEX-3 INDEX-4 INDEX-5 INDEX-6 INDEX-7 INDEX-8 INDEX-9 INDEXED INDIC INDICATE INDICATOR INDICATORS INITIAL INITIALIZE INITIATE INPUT INPUT-OUTPUT INSPECT INSTALLATION INTO INVALID INVOKE IS JUST JUSTIFIED KANJI KEEP KEY LABEL LAST LD LEADING LEFT LEFT-JUSTIFY LENGTH LENGTH-CHECK LESS LIBRARY LIKE LIMIT LIMITS LINAGE LINAGE-COUNTER LINE LINE-COUNTER LINES LINKAGE LOCAL-STORAGE LOCALE LOCALLY LOCK MEMBER MEMORY MERGE MESSAGE METACLASS MODE MODIFIED MODIFY MODULES MOVE MULTIPLE MULTIPLY NATIONAL NATIVE NEGATIVE NEXT NO NO-ECHO NONE NOT NULL NULL-KEY-MAP NULL-MAP NULLS NUMBER NUMERIC NUMERIC-EDITED OBJECT OBJECT-COMPUTER OCCURS OF OFF OMITTED ON ONLY OPEN OPTIONAL OR ORDER ORGANIZATION OTHER OUTPUT OVERFLOW OWNER PACKED-DECIMAL PADDING PAGE PAGE-COUNTER PARSE PERFORM PF PH PIC PICTURE PLUS POINTER POSITION POSITIVE PREFIX PRESENT PRINTING PRIOR PROCEDURE PROCEDURE-POINTER PROCEDURES PROCEED PROCESS PROCESSING PROGRAM PROGRAM-ID PROMPT PROTECTED PURGE QUEUE QUOTE QUOTES RANDOM RD READ READY REALM RECEIVE RECONNECT RECORD RECORD-NAME RECORDS RECURSIVE REDEFINES REEL REFERENCE REFERENCE-MONITOR REFERENCES RELATION RELATIVE RELEASE REMAINDER REMOVAL RENAMES REPEATED REPLACE REPLACING REPORT REPORTING REPORTS REPOSITORY REQUIRED RERUN RESERVE RESET RETAINING RETRIEVAL RETURN RETURN-CODE RETURNING REVERSE-VIDEO REVERSED REWIND REWRITE RF RH RIGHT RIGHT-JUSTIFY ROLLBACK ROLLING ROUNDED RUN SAME SCREEN SD SEARCH SECTION SECURE SECURITY SEGMENT SEGMENT-LIMIT SELECT SEND SENTENCE SEPARATE SEQUENCE SEQUENTIAL SET SHARED SIGN SIZE SKIP1 SKIP2 SKIP3 SORT SORT-MERGE SORT-RETURN SOURCE SOURCE-COMPUTER SPACE-FILL SPECIAL-NAMES STANDARD STANDARD-1 STANDARD-2 START STARTING STATUS STOP STORE STRING SUB-QUEUE-1 SUB-QUEUE-2 SUB-QUEUE-3 SUB-SCHEMA SUBFILE SUBSTITUTE SUBTRACT SUM SUPPRESS SYMBOLIC SYNC SYNCHRONIZED SYSIN SYSOUT TABLE TALLYING TAPE TENANT TERMINAL TERMINATE TEST TEXT THAN THEN THROUGH THRU TIME TIMES TITLE TO TOP TRAILING TRAILING-SIGN TRANSACTION TYPE TYPEDEF UNDERLINE UNEQUAL UNIT UNSTRING UNTIL UP UPDATE UPON USAGE USAGE-MODE USE USING VALID VALIDATE VALUE VALUES VARYING VLR WAIT WHEN WHEN-COMPILED WITH WITHIN WORDS WORKING-STORAGE WRITE XML XML-CODE XML-EVENT XML-NTEXT XML-TEXT ZERO ZERO-FILL "),n=a("- * ** / + < <= = > >= "),o={digit:/\d/,digit_or_colon:/[\d:]/,hex:/[0-9a-f]/i,sign:/[+-]/,exponent:/e/i,keyword_char:/[^\s\(\[\;\)\]]/,symbol:/[\w*+\-]/};return{startState:function(){return{indentStack:null,indentation:0,mode:!1}},token:function(a,p){if(null==p.indentStack&&a.sol()&&(p.indentation=6),a.eatSpace())return null;var q=null;switch(p.mode){case"string":for(var r=!1;null!=(r=a.next());)if('"'==r||"'"==r){p.mode=!1;break}q=e;break;default:var s=a.next(),t=a.column();if(t>=0&&t<=5)q=j;else if(t>=72&&t<=79)a.skipToEnd(),q=i;else if("*"==s&&6==t)a.skipToEnd(),q=d;else if('"'==s||"'"==s)p.mode="string",q=e;else if("'"!=s||o.digit_or_colon.test(a.peek()))if("."==s)q=k;else if(b(s,a))q=g;else{if(a.current().match(o.symbol))for(;t<71&&void 0!==a.eat(o.symbol);)t++;q=m&&m.propertyIsEnumerable(a.current().toUpperCase())?h:n&&n.propertyIsEnumerable(a.current().toUpperCase())?c:l&&l.propertyIsEnumerable(a.current().toUpperCase())?f:null}else q=f}return q},indent:function(a){return null==a.indentStack?a.indentation:a.indentStack.indent}}})),a.defineMIME("text/x-cobol","cobol")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/coffeescript/coffeescript.js b/core/media/editors/codemirror/mode/coffeescript/coffeescript.js
new file mode 100644
index 00000000..ae955db3
--- /dev/null
+++ b/core/media/editors/codemirror/mode/coffeescript/coffeescript.js
@@ -0,0 +1,359 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Link to the project's GitHub page:
+ * https://github.com/pickhardt/coffeescript-codemirror-mode
+ */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
+  var ERRORCLASS = "error";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
+  var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
+  var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
+  var atProp = /^@[_A-Za-z$][_A-Za-z$0-9]*/;
+
+  var wordOperators = wordRegexp(["and", "or", "not",
+                                  "is", "isnt", "in",
+                                  "instanceof", "typeof"]);
+  var indentKeywords = ["for", "while", "loop", "if", "unless", "else",
+                        "switch", "try", "catch", "finally", "class"];
+  var commonKeywords = ["break", "by", "continue", "debugger", "delete",
+                        "do", "in", "of", "new", "return", "then",
+                        "this", "@", "throw", "when", "until", "extends"];
+
+  var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
+
+  indentKeywords = wordRegexp(indentKeywords);
+
+
+  var stringPrefixes = /^('{3}|\"{3}|['\"])/;
+  var regexPrefixes = /^(\/{3}|\/)/;
+  var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"];
+  var constants = wordRegexp(commonConstants);
+
+  // Tokenizers
+  function tokenBase(stream, state) {
+    // Handle scope changes
+    if (stream.sol()) {
+      if (state.scope.align === null) state.scope.align = false;
+      var scopeOffset = state.scope.offset;
+      if (stream.eatSpace()) {
+        var lineOffset = stream.indentation();
+        if (lineOffset > scopeOffset && state.scope.type == "coffee") {
+          return "indent";
+        } else if (lineOffset < scopeOffset) {
+          return "dedent";
+        }
+        return null;
+      } else {
+        if (scopeOffset > 0) {
+          dedent(stream, state);
+        }
+      }
+    }
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    var ch = stream.peek();
+
+    // Handle docco title comment (single line)
+    if (stream.match("####")) {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    // Handle multi line comments
+    if (stream.match("###")) {
+      state.tokenize = longComment;
+      return state.tokenize(stream, state);
+    }
+
+    // Single line comment
+    if (ch === "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    // Handle number literals
+    if (stream.match(/^-?[0-9\.]/, false)) {
+      var floatLiteral = false;
+      // Floats
+      if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
+        floatLiteral = true;
+      }
+      if (stream.match(/^-?\d+\.\d*/)) {
+        floatLiteral = true;
+      }
+      if (stream.match(/^-?\.\d+/)) {
+        floatLiteral = true;
+      }
+
+      if (floatLiteral) {
+        // prevent from getting extra . on 1..
+        if (stream.peek() == "."){
+          stream.backUp(1);
+        }
+        return "number";
+      }
+      // Integers
+      var intLiteral = false;
+      // Hex
+      if (stream.match(/^-?0x[0-9a-f]+/i)) {
+        intLiteral = true;
+      }
+      // Decimal
+      if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
+        intLiteral = true;
+      }
+      // Zero by itself with no other piece of number.
+      if (stream.match(/^-?0(?![\dx])/i)) {
+        intLiteral = true;
+      }
+      if (intLiteral) {
+        return "number";
+      }
+    }
+
+    // Handle strings
+    if (stream.match(stringPrefixes)) {
+      state.tokenize = tokenFactory(stream.current(), false, "string");
+      return state.tokenize(stream, state);
+    }
+    // Handle regex literals
+    if (stream.match(regexPrefixes)) {
+      if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
+        state.tokenize = tokenFactory(stream.current(), true, "string-2");
+        return state.tokenize(stream, state);
+      } else {
+        stream.backUp(1);
+      }
+    }
+
+
+
+    // Handle operators and delimiters
+    if (stream.match(operators) || stream.match(wordOperators)) {
+      return "operator";
+    }
+    if (stream.match(delimiters)) {
+      return "punctuation";
+    }
+
+    if (stream.match(constants)) {
+      return "atom";
+    }
+
+    if (stream.match(atProp) || state.prop && stream.match(identifiers)) {
+      return "property";
+    }
+
+    if (stream.match(keywords)) {
+      return "keyword";
+    }
+
+    if (stream.match(identifiers)) {
+      return "variable";
+    }
+
+    // Handle non-detected items
+    stream.next();
+    return ERRORCLASS;
+  }
+
+  function tokenFactory(delimiter, singleline, outclass) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        stream.eatWhile(/[^'"\/\\]/);
+        if (stream.eat("\\")) {
+          stream.next();
+          if (singleline && stream.eol()) {
+            return outclass;
+          }
+        } else if (stream.match(delimiter)) {
+          state.tokenize = tokenBase;
+          return outclass;
+        } else {
+          stream.eat(/['"\/]/);
+        }
+      }
+      if (singleline) {
+        if (parserConf.singleLineStringErrors) {
+          outclass = ERRORCLASS;
+        } else {
+          state.tokenize = tokenBase;
+        }
+      }
+      return outclass;
+    };
+  }
+
+  function longComment(stream, state) {
+    while (!stream.eol()) {
+      stream.eatWhile(/[^#]/);
+      if (stream.match("###")) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      stream.eatWhile("#");
+    }
+    return "comment";
+  }
+
+  function indent(stream, state, type) {
+    type = type || "coffee";
+    var offset = 0, align = false, alignOffset = null;
+    for (var scope = state.scope; scope; scope = scope.prev) {
+      if (scope.type === "coffee" || scope.type == "}") {
+        offset = scope.offset + conf.indentUnit;
+        break;
+      }
+    }
+    if (type !== "coffee") {
+      align = null;
+      alignOffset = stream.column() + stream.current().length;
+    } else if (state.scope.align) {
+      state.scope.align = false;
+    }
+    state.scope = {
+      offset: offset,
+      type: type,
+      prev: state.scope,
+      align: align,
+      alignOffset: alignOffset
+    };
+  }
+
+  function dedent(stream, state) {
+    if (!state.scope.prev) return;
+    if (state.scope.type === "coffee") {
+      var _indent = stream.indentation();
+      var matched = false;
+      for (var scope = state.scope; scope; scope = scope.prev) {
+        if (_indent === scope.offset) {
+          matched = true;
+          break;
+        }
+      }
+      if (!matched) {
+        return true;
+      }
+      while (state.scope.prev && state.scope.offset !== _indent) {
+        state.scope = state.scope.prev;
+      }
+      return false;
+    } else {
+      state.scope = state.scope.prev;
+      return false;
+    }
+  }
+
+  function tokenLexer(stream, state) {
+    var style = state.tokenize(stream, state);
+    var current = stream.current();
+
+    // Handle scope changes.
+    if (current === "return") {
+      state.dedent = true;
+    }
+    if (((current === "->" || current === "=>") && stream.eol())
+        || style === "indent") {
+      indent(stream, state);
+    }
+    var delimiter_index = "[({".indexOf(current);
+    if (delimiter_index !== -1) {
+      indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+    }
+    if (indentKeywords.exec(current)){
+      indent(stream, state);
+    }
+    if (current == "then"){
+      dedent(stream, state);
+    }
+
+
+    if (style === "dedent") {
+      if (dedent(stream, state)) {
+        return ERRORCLASS;
+      }
+    }
+    delimiter_index = "])}".indexOf(current);
+    if (delimiter_index !== -1) {
+      while (state.scope.type == "coffee" && state.scope.prev)
+        state.scope = state.scope.prev;
+      if (state.scope.type == current)
+        state.scope = state.scope.prev;
+    }
+    if (state.dedent && stream.eol()) {
+      if (state.scope.type == "coffee" && state.scope.prev)
+        state.scope = state.scope.prev;
+      state.dedent = false;
+    }
+
+    return style;
+  }
+
+  var external = {
+    startState: function(basecolumn) {
+      return {
+        tokenize: tokenBase,
+        scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
+        prop: false,
+        dedent: 0
+      };
+    },
+
+    token: function(stream, state) {
+      var fillAlign = state.scope.align === null && state.scope;
+      if (fillAlign && stream.sol()) fillAlign.align = false;
+
+      var style = tokenLexer(stream, state);
+      if (style && style != "comment") {
+        if (fillAlign) fillAlign.align = true;
+        state.prop = style == "punctuation" && stream.current() == "."
+      }
+
+      return style;
+    },
+
+    indent: function(state, text) {
+      if (state.tokenize != tokenBase) return 0;
+      var scope = state.scope;
+      var closer = text && "])}".indexOf(text.charAt(0)) > -1;
+      if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev;
+      var closes = closer && scope.type === text.charAt(0);
+      if (scope.align)
+        return scope.alignOffset - (closes ? 1 : 0);
+      else
+        return (closes ? scope.prev : scope).offset;
+    },
+
+    lineComment: "#",
+    fold: "indent"
+  };
+  return external;
+});
+
+// IANA registered media type
+// https://www.iana.org/assignments/media-types/
+CodeMirror.defineMIME("application/vnd.coffeescript", "coffeescript");
+
+CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
+CodeMirror.defineMIME("text/coffeescript", "coffeescript");
+
+});
diff --git a/core/media/editors/codemirror/mode/coffeescript/coffeescript.min.js b/core/media/editors/codemirror/mode/coffeescript/coffeescript.min.js
new file mode 100644
index 00000000..af327228
--- /dev/null
+++ b/core/media/editors/codemirror/mode/coffeescript/coffeescript.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("coffeescript",(function(a,b){function c(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function d(a,b){if(a.sol()){null===b.scope.align&&(b.scope.align=!1);var c=b.scope.offset;if(a.eatSpace()){var d=a.indentation();return d>c&&"coffee"==b.scope.type?"indent":d<c?"dedent":null}c>0&&h(a,b)}if(a.eatSpace())return null;var g=a.peek();if(a.match("####"))return a.skipToEnd(),"comment";if(a.match("###"))return b.tokenize=f,b.tokenize(a,b);if("#"===g)return a.skipToEnd(),"comment";if(a.match(/^-?[0-9\.]/,!1)){var i=!1;if(a.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)&&(i=!0),a.match(/^-?\d+\.\d*/)&&(i=!0),a.match(/^-?\.\d+/)&&(i=!0),i)return"."==a.peek()&&a.backUp(1),"number";var p=!1;if(a.match(/^-?0x[0-9a-f]+/i)&&(p=!0),a.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)&&(p=!0),a.match(/^-?0(?![\dx])/i)&&(p=!0),p)return"number"}if(a.match(s))return b.tokenize=e(a.current(),!1,"string"),b.tokenize(a,b);if(a.match(t)){if("/"!=a.current()||a.match(/^.*\//,!1))return b.tokenize=e(a.current(),!0,"string-2"),b.tokenize(a,b);a.backUp(1)}return a.match(k)||a.match(o)?"operator":a.match(l)?"punctuation":a.match(v)?"atom":a.match(n)||b.prop&&a.match(m)?"property":a.match(r)?"keyword":a.match(m)?"variable":(a.next(),j)}function e(a,c,e){return function(f,g){for(;!f.eol();)if(f.eatWhile(/[^'"\/\\]/),f.eat("\\")){if(f.next(),c&&f.eol())return e}else{if(f.match(a))return g.tokenize=d,e;f.eat(/['"\/]/)}return c&&(b.singleLineStringErrors?e=j:g.tokenize=d),e}}function f(a,b){for(;!a.eol();){if(a.eatWhile(/[^#]/),a.match("###")){b.tokenize=d;break}a.eatWhile("#")}return"comment"}function g(b,c,d){d=d||"coffee";for(var e=0,f=!1,g=null,h=c.scope;h;h=h.prev)if("coffee"===h.type||"}"==h.type){e=h.offset+a.indentUnit;break}"coffee"!==d?(f=null,g=b.column()+b.current().length):c.scope.align&&(c.scope.align=!1),c.scope={offset:e,type:d,prev:c.scope,align:f,alignOffset:g}}function h(a,b){if(b.scope.prev){if("coffee"===b.scope.type){for(var c=a.indentation(),d=!1,e=b.scope;e;e=e.prev)if(c===e.offset){d=!0;break}if(!d)return!0;for(;b.scope.prev&&b.scope.offset!==c;)b.scope=b.scope.prev;return!1}return b.scope=b.scope.prev,!1}}function i(a,b){var c=b.tokenize(a,b),d=a.current();"return"===d&&(b.dedent=!0),(("->"===d||"=>"===d)&&a.eol()||"indent"===c)&&g(a,b);var e="[({".indexOf(d);if(e!==-1&&g(a,b,"])}".slice(e,e+1)),p.exec(d)&&g(a,b),"then"==d&&h(a,b),"dedent"===c&&h(a,b))return j;if(e="])}".indexOf(d),e!==-1){for(;"coffee"==b.scope.type&&b.scope.prev;)b.scope=b.scope.prev;b.scope.type==d&&(b.scope=b.scope.prev)}return b.dedent&&a.eol()&&("coffee"==b.scope.type&&b.scope.prev&&(b.scope=b.scope.prev),b.dedent=!1),c}var j="error",k=/^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/,l=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/,m=/^[_A-Za-z$][_A-Za-z$0-9]*/,n=/^@[_A-Za-z$][_A-Za-z$0-9]*/,o=c(["and","or","not","is","isnt","in","instanceof","typeof"]),p=["for","while","loop","if","unless","else","switch","try","catch","finally","class"],q=["break","by","continue","debugger","delete","do","in","of","new","return","then","this","@","throw","when","until","extends"],r=c(p.concat(q));p=c(p);var s=/^('{3}|\"{3}|['\"])/,t=/^(\/{3}|\/)/,u=["Infinity","NaN","undefined","null","true","false","on","off","yes","no"],v=c(u),w={startState:function(a){return{tokenize:d,scope:{offset:a||0,type:"coffee",prev:null,align:!1},prop:!1,dedent:0}},token:function(a,b){var c=null===b.scope.align&&b.scope;c&&a.sol()&&(c.align=!1);var d=i(a,b);return d&&"comment"!=d&&(c&&(c.align=!0),b.prop="punctuation"==d&&"."==a.current()),d},indent:function(a,b){if(a.tokenize!=d)return 0;var c=a.scope,e=b&&"])}".indexOf(b.charAt(0))>-1;if(e)for(;"coffee"==c.type&&c.prev;)c=c.prev;var f=e&&c.type===b.charAt(0);return c.align?c.alignOffset-(f?1:0):(f?c.prev:c).offset},lineComment:"#",fold:"indent"};return w})),a.defineMIME("application/vnd.coffeescript","coffeescript"),a.defineMIME("text/x-coffeescript","coffeescript"),a.defineMIME("text/coffeescript","coffeescript")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/commonlisp/commonlisp.js b/core/media/editors/codemirror/mode/commonlisp/commonlisp.js
new file mode 100644
index 00000000..8cd212d3
--- /dev/null
+++ b/core/media/editors/codemirror/mode/commonlisp/commonlisp.js
@@ -0,0 +1,124 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("commonlisp", function (config) {
+  var specialForm = /^(block|let*|return-from|catch|load-time-value|setq|eval-when|locally|symbol-macrolet|flet|macrolet|tagbody|function|multiple-value-call|the|go|multiple-value-prog1|throw|if|progn|unwind-protect|labels|progv|let|quote)$/;
+  var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
+  var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
+  var symbol = /[^\s'`,@()\[\]";]/;
+  var type;
+
+  function readSym(stream) {
+    var ch;
+    while (ch = stream.next()) {
+      if (ch == "\\") stream.next();
+      else if (!symbol.test(ch)) { stream.backUp(1); break; }
+    }
+    return stream.current();
+  }
+
+  function base(stream, state) {
+    if (stream.eatSpace()) {type = "ws"; return null;}
+    if (stream.match(numLiteral)) return "number";
+    var ch = stream.next();
+    if (ch == "\\") ch = stream.next();
+
+    if (ch == '"') return (state.tokenize = inString)(stream, state);
+    else if (ch == "(") { type = "open"; return "bracket"; }
+    else if (ch == ")" || ch == "]") { type = "close"; return "bracket"; }
+    else if (ch == ";") { stream.skipToEnd(); type = "ws"; return "comment"; }
+    else if (/['`,@]/.test(ch)) return null;
+    else if (ch == "|") {
+      if (stream.skipTo("|")) { stream.next(); return "symbol"; }
+      else { stream.skipToEnd(); return "error"; }
+    } else if (ch == "#") {
+      var ch = stream.next();
+      if (ch == "(") { type = "open"; return "bracket"; }
+      else if (/[+\-=\.']/.test(ch)) return null;
+      else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
+      else if (ch == "|") return (state.tokenize = inComment)(stream, state);
+      else if (ch == ":") { readSym(stream); return "meta"; }
+      else if (ch == "\\") { stream.next(); readSym(stream); return "string-2" }
+      else return "error";
+    } else {
+      var name = readSym(stream);
+      if (name == ".") return null;
+      type = "symbol";
+      if (name == "nil" || name == "t" || name.charAt(0) == ":") return "atom";
+      if (state.lastType == "open" && (specialForm.test(name) || assumeBody.test(name))) return "keyword";
+      if (name.charAt(0) == "&") return "variable-2";
+      return "variable";
+    }
+  }
+
+  function inString(stream, state) {
+    var escaped = false, next;
+    while (next = stream.next()) {
+      if (next == '"' && !escaped) { state.tokenize = base; break; }
+      escaped = !escaped && next == "\\";
+    }
+    return "string";
+  }
+
+  function inComment(stream, state) {
+    var next, last;
+    while (next = stream.next()) {
+      if (next == "#" && last == "|") { state.tokenize = base; break; }
+      last = next;
+    }
+    type = "ws";
+    return "comment";
+  }
+
+  return {
+    startState: function () {
+      return {ctx: {prev: null, start: 0, indentTo: 0}, lastType: null, tokenize: base};
+    },
+
+    token: function (stream, state) {
+      if (stream.sol() && typeof state.ctx.indentTo != "number")
+        state.ctx.indentTo = state.ctx.start + 1;
+
+      type = null;
+      var style = state.tokenize(stream, state);
+      if (type != "ws") {
+        if (state.ctx.indentTo == null) {
+          if (type == "symbol" && assumeBody.test(stream.current()))
+            state.ctx.indentTo = state.ctx.start + config.indentUnit;
+          else
+            state.ctx.indentTo = "next";
+        } else if (state.ctx.indentTo == "next") {
+          state.ctx.indentTo = stream.column();
+        }
+        state.lastType = type;
+      }
+      if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
+      else if (type == "close") state.ctx = state.ctx.prev || state.ctx;
+      return style;
+    },
+
+    indent: function (state, _textAfter) {
+      var i = state.ctx.indentTo;
+      return typeof i == "number" ? i : state.ctx.start + 1;
+    },
+
+    closeBrackets: {pairs: "()[]{}\"\""},
+    lineComment: ";;",
+    blockCommentStart: "#|",
+    blockCommentEnd: "|#"
+  };
+});
+
+CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
+
+});
diff --git a/core/media/editors/codemirror/mode/commonlisp/commonlisp.min.js b/core/media/editors/codemirror/mode/commonlisp/commonlisp.min.js
new file mode 100644
index 00000000..6e6a2d97
--- /dev/null
+++ b/core/media/editors/codemirror/mode/commonlisp/commonlisp.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("commonlisp",(function(a){function b(a){for(var b;b=a.next();)if("\\"==b)a.next();else if(!j.test(b)){a.backUp(1);break}return a.current()}function c(a,c){if(a.eatSpace())return f="ws",null;if(a.match(i))return"number";var j=a.next();if("\\"==j&&(j=a.next()),'"'==j)return(c.tokenize=d)(a,c);if("("==j)return f="open","bracket";if(")"==j||"]"==j)return f="close","bracket";if(";"==j)return a.skipToEnd(),f="ws","comment";if(/['`,@]/.test(j))return null;if("|"==j)return a.skipTo("|")?(a.next(),"symbol"):(a.skipToEnd(),"error");if("#"==j){var j=a.next();return"("==j?(f="open","bracket"):/[+\-=\.']/.test(j)?null:/\d/.test(j)&&a.match(/^\d*#/)?null:"|"==j?(c.tokenize=e)(a,c):":"==j?(b(a),"meta"):"\\"==j?(a.next(),b(a),"string-2"):"error"}var k=b(a);return"."==k?null:(f="symbol","nil"==k||"t"==k||":"==k.charAt(0)?"atom":"open"==c.lastType&&(g.test(k)||h.test(k))?"keyword":"&"==k.charAt(0)?"variable-2":"variable")}function d(a,b){for(var d,e=!1;d=a.next();){if('"'==d&&!e){b.tokenize=c;break}e=!e&&"\\"==d}return"string"}function e(a,b){for(var d,e;d=a.next();){if("#"==d&&"|"==e){b.tokenize=c;break}e=d}return f="ws","comment"}var f,g=/^(block|let*|return-from|catch|load-time-value|setq|eval-when|locally|symbol-macrolet|flet|macrolet|tagbody|function|multiple-value-call|the|go|multiple-value-prog1|throw|if|progn|unwind-protect|labels|progv|let|quote)$/,h=/^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/,i=/^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/,j=/[^\s'`,@()\[\]";]/;return{startState:function(){return{ctx:{prev:null,start:0,indentTo:0},lastType:null,tokenize:c}},token:function(b,c){b.sol()&&"number"!=typeof c.ctx.indentTo&&(c.ctx.indentTo=c.ctx.start+1),f=null;var d=c.tokenize(b,c);return"ws"!=f&&(null==c.ctx.indentTo?"symbol"==f&&h.test(b.current())?c.ctx.indentTo=c.ctx.start+a.indentUnit:c.ctx.indentTo="next":"next"==c.ctx.indentTo&&(c.ctx.indentTo=b.column()),c.lastType=f),"open"==f?c.ctx={prev:c.ctx,start:b.column(),indentTo:null}:"close"==f&&(c.ctx=c.ctx.prev||c.ctx),d},indent:function(a,b){var c=a.ctx.indentTo;return"number"==typeof c?c:a.ctx.start+1},closeBrackets:{pairs:'()[]{}""'},lineComment:";;",blockCommentStart:"#|",blockCommentEnd:"|#"}})),a.defineMIME("text/x-common-lisp","commonlisp")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/crystal/crystal.js b/core/media/editors/codemirror/mode/crystal/crystal.js
new file mode 100644
index 00000000..dada112d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/crystal/crystal.js
@@ -0,0 +1,433 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("crystal", function(config) {
+    function wordRegExp(words, end) {
+      return new RegExp((end ? "" : "^") + "(?:" + words.join("|") + ")" + (end ? "$" : "\\b"));
+    }
+
+    function chain(tokenize, stream, state) {
+      state.tokenize.push(tokenize);
+      return tokenize(stream, state);
+    }
+
+    var operators = /^(?:[-+/%|&^]|\*\*?|[<>]{2})/;
+    var conditionalOperators = /^(?:[=!]~|===|<=>|[<>=!]=?|[|&]{2}|~)/;
+    var indexingOperators = /^(?:\[\][?=]?)/;
+    var anotherOperators = /^(?:\.(?:\.{2})?|->|[?:])/;
+    var idents = /^[a-z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
+    var types = /^[A-Z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
+    var keywords = wordRegExp([
+      "abstract", "alias", "as", "asm", "begin", "break", "case", "class", "def", "do",
+      "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if",
+      "include", "instance_sizeof", "lib", "macro", "module", "next", "of", "out", "pointerof",
+      "private", "protected", "rescue", "return", "require", "select", "sizeof", "struct",
+      "super", "then", "type", "typeof", "uninitialized", "union", "unless", "until", "when", "while", "with",
+      "yield", "__DIR__", "__END_LINE__", "__FILE__", "__LINE__"
+    ]);
+    var atomWords = wordRegExp(["true", "false", "nil", "self"]);
+    var indentKeywordsArray = [
+      "def", "fun", "macro",
+      "class", "module", "struct", "lib", "enum", "union",
+      "do", "for"
+    ];
+    var indentKeywords = wordRegExp(indentKeywordsArray);
+    var indentExpressionKeywordsArray = ["if", "unless", "case", "while", "until", "begin", "then"];
+    var indentExpressionKeywords = wordRegExp(indentExpressionKeywordsArray);
+    var dedentKeywordsArray = ["end", "else", "elsif", "rescue", "ensure"];
+    var dedentKeywords = wordRegExp(dedentKeywordsArray);
+    var dedentPunctualsArray = ["\\)", "\\}", "\\]"];
+    var dedentPunctuals = new RegExp("^(?:" + dedentPunctualsArray.join("|") + ")$");
+    var nextTokenizer = {
+      "def": tokenFollowIdent, "fun": tokenFollowIdent, "macro": tokenMacroDef,
+      "class": tokenFollowType, "module": tokenFollowType, "struct": tokenFollowType,
+      "lib": tokenFollowType, "enum": tokenFollowType, "union": tokenFollowType
+    };
+    var matching = {"[": "]", "{": "}", "(": ")", "<": ">"};
+
+    function tokenBase(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      // Macros
+      if (state.lastToken != "\\" && stream.match("{%", false)) {
+        return chain(tokenMacro("%", "%"), stream, state);
+      }
+
+      if (state.lastToken != "\\" && stream.match("{{", false)) {
+        return chain(tokenMacro("{", "}"), stream, state);
+      }
+
+      // Comments
+      if (stream.peek() == "#") {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      // Variables and keywords
+      var matched;
+      if (stream.match(idents)) {
+        stream.eat(/[?!]/);
+
+        matched = stream.current();
+        if (stream.eat(":")) {
+          return "atom";
+        } else if (state.lastToken == ".") {
+          return "property";
+        } else if (keywords.test(matched)) {
+          if (indentKeywords.test(matched)) {
+            if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0) && !(matched == "def" && state.lastToken == "abstract")) {
+              state.blocks.push(matched);
+              state.currentIndent += 1;
+            }
+          } else if ((state.lastStyle == "operator" || !state.lastStyle) && indentExpressionKeywords.test(matched)) {
+            state.blocks.push(matched);
+            state.currentIndent += 1;
+          } else if (matched == "end") {
+            state.blocks.pop();
+            state.currentIndent -= 1;
+          }
+
+          if (nextTokenizer.hasOwnProperty(matched)) {
+            state.tokenize.push(nextTokenizer[matched]);
+          }
+
+          return "keyword";
+        } else if (atomWords.test(matched)) {
+          return "atom";
+        }
+
+        return "variable";
+      }
+
+      // Class variables and instance variables
+      // or attributes
+      if (stream.eat("@")) {
+        if (stream.peek() == "[") {
+          return chain(tokenNest("[", "]", "meta"), stream, state);
+        }
+
+        stream.eat("@");
+        stream.match(idents) || stream.match(types);
+        return "variable-2";
+      }
+
+      // Constants and types
+      if (stream.match(types)) {
+        return "tag";
+      }
+
+      // Symbols or ':' operator
+      if (stream.eat(":")) {
+        if (stream.eat("\"")) {
+          return chain(tokenQuote("\"", "atom", false), stream, state);
+        } else if (stream.match(idents) || stream.match(types) ||
+                   stream.match(operators) || stream.match(conditionalOperators) || stream.match(indexingOperators)) {
+          return "atom";
+        }
+        stream.eat(":");
+        return "operator";
+      }
+
+      // Strings
+      if (stream.eat("\"")) {
+        return chain(tokenQuote("\"", "string", true), stream, state);
+      }
+
+      // Strings or regexps or macro variables or '%' operator
+      if (stream.peek() == "%") {
+        var style = "string";
+        var embed = true;
+        var delim;
+
+        if (stream.match("%r")) {
+          // Regexps
+          style = "string-2";
+          delim = stream.next();
+        } else if (stream.match("%w")) {
+          embed = false;
+          delim = stream.next();
+        } else if (stream.match("%q")) {
+          embed = false;
+          delim = stream.next();
+        } else {
+          if(delim = stream.match(/^%([^\w\s=])/)) {
+            delim = delim[1];
+          } else if (stream.match(/^%[a-zA-Z0-9_\u009F-\uFFFF]*/)) {
+            // Macro variables
+            return "meta";
+          } else {
+            // '%' operator
+            return "operator";
+          }
+        }
+
+        if (matching.hasOwnProperty(delim)) {
+          delim = matching[delim];
+        }
+        return chain(tokenQuote(delim, style, embed), stream, state);
+      }
+
+      // Here Docs
+      if (matched = stream.match(/^<<-('?)([A-Z]\w*)\1/)) {
+        return chain(tokenHereDoc(matched[2], !matched[1]), stream, state)
+      }
+
+      // Characters
+      if (stream.eat("'")) {
+        stream.match(/^(?:[^']|\\(?:[befnrtv0'"]|[0-7]{3}|u(?:[0-9a-fA-F]{4}|\{[0-9a-fA-F]{1,6}\})))/);
+        stream.eat("'");
+        return "atom";
+      }
+
+      // Numbers
+      if (stream.eat("0")) {
+        if (stream.eat("x")) {
+          stream.match(/^[0-9a-fA-F]+/);
+        } else if (stream.eat("o")) {
+          stream.match(/^[0-7]+/);
+        } else if (stream.eat("b")) {
+          stream.match(/^[01]+/);
+        }
+        return "number";
+      }
+
+      if (stream.eat(/^\d/)) {
+        stream.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/);
+        return "number";
+      }
+
+      // Operators
+      if (stream.match(operators)) {
+        stream.eat("="); // Operators can follow assign symbol.
+        return "operator";
+      }
+
+      if (stream.match(conditionalOperators) || stream.match(anotherOperators)) {
+        return "operator";
+      }
+
+      // Parens and braces
+      if (matched = stream.match(/[({[]/, false)) {
+        matched = matched[0];
+        return chain(tokenNest(matched, matching[matched], null), stream, state);
+      }
+
+      // Escapes
+      if (stream.eat("\\")) {
+        stream.next();
+        return "meta";
+      }
+
+      stream.next();
+      return null;
+    }
+
+    function tokenNest(begin, end, style, started) {
+      return function (stream, state) {
+        if (!started && stream.match(begin)) {
+          state.tokenize[state.tokenize.length - 1] = tokenNest(begin, end, style, true);
+          state.currentIndent += 1;
+          return style;
+        }
+
+        var nextStyle = tokenBase(stream, state);
+        if (stream.current() === end) {
+          state.tokenize.pop();
+          state.currentIndent -= 1;
+          nextStyle = style;
+        }
+
+        return nextStyle;
+      };
+    }
+
+    function tokenMacro(begin, end, started) {
+      return function (stream, state) {
+        if (!started && stream.match("{" + begin)) {
+          state.currentIndent += 1;
+          state.tokenize[state.tokenize.length - 1] = tokenMacro(begin, end, true);
+          return "meta";
+        }
+
+        if (stream.match(end + "}")) {
+          state.currentIndent -= 1;
+          state.tokenize.pop();
+          return "meta";
+        }
+
+        return tokenBase(stream, state);
+      };
+    }
+
+    function tokenMacroDef(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      var matched;
+      if (matched = stream.match(idents)) {
+        if (matched == "def") {
+          return "keyword";
+        }
+        stream.eat(/[?!]/);
+      }
+
+      state.tokenize.pop();
+      return "def";
+    }
+
+    function tokenFollowIdent(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      if (stream.match(idents)) {
+        stream.eat(/[!?]/);
+      } else {
+        stream.match(operators) || stream.match(conditionalOperators) || stream.match(indexingOperators);
+      }
+      state.tokenize.pop();
+      return "def";
+    }
+
+    function tokenFollowType(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      stream.match(types);
+      state.tokenize.pop();
+      return "def";
+    }
+
+    function tokenQuote(end, style, embed) {
+      return function (stream, state) {
+        var escaped = false;
+
+        while (stream.peek()) {
+          if (!escaped) {
+            if (stream.match("{%", false)) {
+              state.tokenize.push(tokenMacro("%", "%"));
+              return style;
+            }
+
+            if (stream.match("{{", false)) {
+              state.tokenize.push(tokenMacro("{", "}"));
+              return style;
+            }
+
+            if (embed && stream.match("#{", false)) {
+              state.tokenize.push(tokenNest("#{", "}", "meta"));
+              return style;
+            }
+
+            var ch = stream.next();
+
+            if (ch == end) {
+              state.tokenize.pop();
+              return style;
+            }
+
+            escaped = embed && ch == "\\";
+          } else {
+            stream.next();
+            escaped = false;
+          }
+        }
+
+        return style;
+      };
+    }
+
+    function tokenHereDoc(phrase, embed) {
+      return function (stream, state) {
+        if (stream.sol()) {
+          stream.eatSpace()
+          if (stream.match(phrase)) {
+            state.tokenize.pop();
+            return "string";
+          }
+        }
+
+        var escaped = false;
+        while (stream.peek()) {
+          if (!escaped) {
+            if (stream.match("{%", false)) {
+              state.tokenize.push(tokenMacro("%", "%"));
+              return "string";
+            }
+
+            if (stream.match("{{", false)) {
+              state.tokenize.push(tokenMacro("{", "}"));
+              return "string";
+            }
+
+            if (embed && stream.match("#{", false)) {
+              state.tokenize.push(tokenNest("#{", "}", "meta"));
+              return "string";
+            }
+
+            escaped = embed && stream.next() == "\\";
+          } else {
+            stream.next();
+            escaped = false;
+          }
+        }
+
+        return "string";
+      }
+    }
+
+    return {
+      startState: function () {
+        return {
+          tokenize: [tokenBase],
+          currentIndent: 0,
+          lastToken: null,
+          lastStyle: null,
+          blocks: []
+        };
+      },
+
+      token: function (stream, state) {
+        var style = state.tokenize[state.tokenize.length - 1](stream, state);
+        var token = stream.current();
+
+        if (style && style != "comment") {
+          state.lastToken = token;
+          state.lastStyle = style;
+        }
+
+        return style;
+      },
+
+      indent: function (state, textAfter) {
+        textAfter = textAfter.replace(/^\s*(?:\{%)?\s*|\s*(?:%\})?\s*$/g, "");
+
+        if (dedentKeywords.test(textAfter) || dedentPunctuals.test(textAfter)) {
+          return config.indentUnit * (state.currentIndent - 1);
+        }
+
+        return config.indentUnit * state.currentIndent;
+      },
+
+      fold: "indent",
+      electricInput: wordRegExp(dedentPunctualsArray.concat(dedentKeywordsArray), true),
+      lineComment: '#'
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-crystal", "crystal");
+});
diff --git a/core/media/editors/codemirror/mode/crystal/crystal.min.js b/core/media/editors/codemirror/mode/crystal/crystal.min.js
new file mode 100644
index 00000000..bb970f08
--- /dev/null
+++ b/core/media/editors/codemirror/mode/crystal/crystal.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("crystal",(function(a){function b(a,b){return new RegExp((b?"":"^")+"(?:"+a.join("|")+")"+(b?"$":"\\b"))}function c(a,b,c){return c.tokenize.push(a),a(b,c)}function d(a,b){if(a.eatSpace())return null;if("\\"!=b.lastToken&&a.match("{%",!1))return c(f("%","%"),a,b);if("\\"!=b.lastToken&&a.match("{{",!1))return c(f("{","}"),a,b);if("#"==a.peek())return a.skipToEnd(),"comment";var d;if(a.match(p))return a.eat(/[?!]/),d=a.current(),a.eat(":")?"atom":"."==b.lastToken?"property":r.test(d)?(u.test(d)?"fun"==d&&b.blocks.indexOf("lib")>=0||"def"==d&&"abstract"==b.lastToken||(b.blocks.push(d),b.currentIndent+=1):"operator"!=b.lastStyle&&b.lastStyle||!w.test(d)?"end"==d&&(b.blocks.pop(),b.currentIndent-=1):(b.blocks.push(d),b.currentIndent+=1),B.hasOwnProperty(d)&&b.tokenize.push(B[d]),"keyword"):s.test(d)?"atom":"variable";if(a.eat("@"))return"["==a.peek()?c(e("[","]","meta"),a,b):(a.eat("@"),a.match(p)||a.match(q),"variable-2");if(a.match(q))return"tag";if(a.eat(":"))return a.eat('"')?c(j('"',"atom",!1),a,b):a.match(p)||a.match(q)||a.match(l)||a.match(m)||a.match(n)?"atom":(a.eat(":"),"operator");if(a.eat('"'))return c(j('"',"string",!0),a,b);if("%"==a.peek()){var g,h="string",i=!0;if(a.match("%r"))h="string-2",g=a.next();else if(a.match("%w"))i=!1,g=a.next();else if(a.match("%q"))i=!1,g=a.next();else{if(!(g=a.match(/^%([^\w\s=])/)))return a.match(/^%[a-zA-Z0-9_\u009F-\uFFFF]*/)?"meta":"operator";g=g[1]}return C.hasOwnProperty(g)&&(g=C[g]),c(j(g,h,i),a,b)}return(d=a.match(/^<<-('?)([A-Z]\w*)\1/))?c(k(d[2],!d[1]),a,b):a.eat("'")?(a.match(/^(?:[^']|\\(?:[befnrtv0'"]|[0-7]{3}|u(?:[0-9a-fA-F]{4}|\{[0-9a-fA-F]{1,6}\})))/),a.eat("'"),"atom"):a.eat("0")?(a.eat("x")?a.match(/^[0-9a-fA-F]+/):a.eat("o")?a.match(/^[0-7]+/):a.eat("b")&&a.match(/^[01]+/),"number"):a.eat(/^\d/)?(a.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/),"number"):a.match(l)?(a.eat("="),"operator"):a.match(m)||a.match(o)?"operator":(d=a.match(/[({[]/,!1))?(d=d[0],c(e(d,C[d],null),a,b)):a.eat("\\")?(a.next(),"meta"):(a.next(),null)}function e(a,b,c,f){return function(g,h){if(!f&&g.match(a))return h.tokenize[h.tokenize.length-1]=e(a,b,c,!0),h.currentIndent+=1,c;var i=d(g,h);return g.current()===b&&(h.tokenize.pop(),h.currentIndent-=1,i=c),i}}function f(a,b,c){return function(e,g){return!c&&e.match("{"+a)?(g.currentIndent+=1,g.tokenize[g.tokenize.length-1]=f(a,b,!0),"meta"):e.match(b+"}")?(g.currentIndent-=1,g.tokenize.pop(),"meta"):d(e,g)}}function g(a,b){if(a.eatSpace())return null;var c;if(c=a.match(p)){if("def"==c)return"keyword";a.eat(/[?!]/)}return b.tokenize.pop(),"def"}function h(a,b){return a.eatSpace()?null:(a.match(p)?a.eat(/[!?]/):a.match(l)||a.match(m)||a.match(n),b.tokenize.pop(),"def")}function i(a,b){return a.eatSpace()?null:(a.match(q),b.tokenize.pop(),"def")}function j(a,b,c){return function(d,g){for(var h=!1;d.peek();)if(h)d.next(),h=!1;else{if(d.match("{%",!1))return g.tokenize.push(f("%","%")),b;if(d.match("{{",!1))return g.tokenize.push(f("{","}")),b;if(c&&d.match("#{",!1))return g.tokenize.push(e("#{","}","meta")),b;var i=d.next();if(i==a)return g.tokenize.pop(),b;h=c&&"\\"==i}return b}}function k(a,b){return function(c,d){if(c.sol()&&(c.eatSpace(),c.match(a)))return d.tokenize.pop(),"string";for(var g=!1;c.peek();)if(g)c.next(),g=!1;else{if(c.match("{%",!1))return d.tokenize.push(f("%","%")),"string";if(c.match("{{",!1))return d.tokenize.push(f("{","}")),"string";if(b&&c.match("#{",!1))return d.tokenize.push(e("#{","}","meta")),"string";g=b&&"\\"==c.next()}return"string"}}var l=/^(?:[-+\/%|&^]|\*\*?|[<>]{2})/,m=/^(?:[=!]~|===|<=>|[<>=!]=?|[|&]{2}|~)/,n=/^(?:\[\][?=]?)/,o=/^(?:\.(?:\.{2})?|->|[?:])/,p=/^[a-z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/,q=/^[A-Z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/,r=b(["abstract","alias","as","asm","begin","break","case","class","def","do","else","elsif","end","ensure","enum","extend","for","fun","if","include","instance_sizeof","lib","macro","module","next","of","out","pointerof","private","protected","rescue","return","require","select","sizeof","struct","super","then","type","typeof","uninitialized","union","unless","until","when","while","with","yield","__DIR__","__END_LINE__","__FILE__","__LINE__"]),s=b(["true","false","nil","self"]),t=["def","fun","macro","class","module","struct","lib","enum","union","do","for"],u=b(t),v=["if","unless","case","while","until","begin","then"],w=b(v),x=["end","else","elsif","rescue","ensure"],y=b(x),z=["\\)","\\}","\\]"],A=new RegExp("^(?:"+z.join("|")+")$"),B={def:h,fun:h,macro:g,class:i,module:i,struct:i,lib:i,enum:i,union:i},C={"[":"]","{":"}","(":")","<":">"};return{startState:function(){return{tokenize:[d],currentIndent:0,lastToken:null,lastStyle:null,blocks:[]}},token:function(a,b){var c=b.tokenize[b.tokenize.length-1](a,b),d=a.current();return c&&"comment"!=c&&(b.lastToken=d,b.lastStyle=c),c},indent:function(b,c){return c=c.replace(/^\s*(?:\{%)?\s*|\s*(?:%\})?\s*$/g,""),y.test(c)||A.test(c)?a.indentUnit*(b.currentIndent-1):a.indentUnit*b.currentIndent},fold:"indent",electricInput:b(z.concat(x),!0),lineComment:"#"}})),a.defineMIME("text/x-crystal","crystal")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/css/css.js b/core/media/editors/codemirror/mode/css/css.js
new file mode 100644
index 00000000..f5f3a41b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/css/css.js
@@ -0,0 +1,832 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("css", function(config, parserConfig) {
+  var inline = parserConfig.inline
+  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
+
+  var indentUnit = config.indentUnit,
+      tokenHooks = parserConfig.tokenHooks,
+      documentTypes = parserConfig.documentTypes || {},
+      mediaTypes = parserConfig.mediaTypes || {},
+      mediaFeatures = parserConfig.mediaFeatures || {},
+      mediaValueKeywords = parserConfig.mediaValueKeywords || {},
+      propertyKeywords = parserConfig.propertyKeywords || {},
+      nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
+      fontProperties = parserConfig.fontProperties || {},
+      counterDescriptors = parserConfig.counterDescriptors || {},
+      colorKeywords = parserConfig.colorKeywords || {},
+      valueKeywords = parserConfig.valueKeywords || {},
+      allowNested = parserConfig.allowNested,
+      lineComment = parserConfig.lineComment,
+      supportsAtComponent = parserConfig.supportsAtComponent === true;
+
+  var type, override;
+  function ret(style, tp) { type = tp; return style; }
+
+  // Tokenizers
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (tokenHooks[ch]) {
+      var result = tokenHooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == "@") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("def", stream.current());
+    } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) {
+      return ret(null, "compare");
+    } else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (ch == "#") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("atom", "hash");
+    } else if (ch == "!") {
+      stream.match(/^\s*\w*/);
+      return ret("keyword", "important");
+    } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
+      stream.eatWhile(/[\w.%]/);
+      return ret("number", "unit");
+    } else if (ch === "-") {
+      if (/[\d.]/.test(stream.peek())) {
+        stream.eatWhile(/[\w.%]/);
+        return ret("number", "unit");
+      } else if (stream.match(/^-[\w\\\-]+/)) {
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ret("variable-2", "variable-definition");
+        return ret("variable-2", "variable");
+      } else if (stream.match(/^\w+-/)) {
+        return ret("meta", "meta");
+      }
+    } else if (/[,+>*\/]/.test(ch)) {
+      return ret(null, "select-op");
+    } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
+      return ret("qualifier", "qualifier");
+    } else if (/[:;{}\[\]\(\)]/.test(ch)) {
+      return ret(null, ch);
+    } else if (((ch == "u" || ch == "U") && stream.match(/rl(-prefix)?\(/i)) ||
+               ((ch == "d" || ch == "D") && stream.match("omain(", true, true)) ||
+               ((ch == "r" || ch == "R") && stream.match("egexp(", true, true))) {
+      stream.backUp(1);
+      state.tokenize = tokenParenthesized;
+      return ret("property", "word");
+    } else if (/[\w\\\-]/.test(ch)) {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("property", "word");
+    } else {
+      return ret(null, null);
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          if (quote == ")") stream.backUp(1);
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      if (ch == quote || !escaped && quote != ")") state.tokenize = null;
+      return ret("string", "string");
+    };
+  }
+
+  function tokenParenthesized(stream, state) {
+    stream.next(); // Must be '('
+    if (!stream.match(/\s*[\"\')]/, false))
+      state.tokenize = tokenString(")");
+    else
+      state.tokenize = null;
+    return ret(null, "(");
+  }
+
+  // Context management
+
+  function Context(type, indent, prev) {
+    this.type = type;
+    this.indent = indent;
+    this.prev = prev;
+  }
+
+  function pushContext(state, stream, type, indent) {
+    state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context);
+    return type;
+  }
+
+  function popContext(state) {
+    if (state.context.prev)
+      state.context = state.context.prev;
+    return state.context.type;
+  }
+
+  function pass(type, stream, state) {
+    return states[state.context.type](type, stream, state);
+  }
+  function popAndPass(type, stream, state, n) {
+    for (var i = n || 1; i > 0; i--)
+      state.context = state.context.prev;
+    return pass(type, stream, state);
+  }
+
+  // Parser
+
+  function wordAsValue(stream) {
+    var word = stream.current().toLowerCase();
+    if (valueKeywords.hasOwnProperty(word))
+      override = "atom";
+    else if (colorKeywords.hasOwnProperty(word))
+      override = "keyword";
+    else
+      override = "variable";
+  }
+
+  var states = {};
+
+  states.top = function(type, stream, state) {
+    if (type == "{") {
+      return pushContext(state, stream, "block");
+    } else if (type == "}" && state.context.prev) {
+      return popContext(state);
+    } else if (supportsAtComponent && /@component/i.test(type)) {
+      return pushContext(state, stream, "atComponentBlock");
+    } else if (/^@(-moz-)?document$/i.test(type)) {
+      return pushContext(state, stream, "documentTypes");
+    } else if (/^@(media|supports|(-moz-)?document|import)$/i.test(type)) {
+      return pushContext(state, stream, "atBlock");
+    } else if (/^@(font-face|counter-style)/i.test(type)) {
+      state.stateArg = type;
+      return "restricted_atBlock_before";
+    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(type)) {
+      return "keyframes";
+    } else if (type && type.charAt(0) == "@") {
+      return pushContext(state, stream, "at");
+    } else if (type == "hash") {
+      override = "builtin";
+    } else if (type == "word") {
+      override = "tag";
+    } else if (type == "variable-definition") {
+      return "maybeprop";
+    } else if (type == "interpolation") {
+      return pushContext(state, stream, "interpolation");
+    } else if (type == ":") {
+      return "pseudo";
+    } else if (allowNested && type == "(") {
+      return pushContext(state, stream, "parens");
+    }
+    return state.context.type;
+  };
+
+  states.block = function(type, stream, state) {
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (propertyKeywords.hasOwnProperty(word)) {
+        override = "property";
+        return "maybeprop";
+      } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {
+        override = "string-2";
+        return "maybeprop";
+      } else if (allowNested) {
+        override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
+        return "block";
+      } else {
+        override += " error";
+        return "maybeprop";
+      }
+    } else if (type == "meta") {
+      return "block";
+    } else if (!allowNested && (type == "hash" || type == "qualifier")) {
+      override = "error";
+      return "block";
+    } else {
+      return states.top(type, stream, state);
+    }
+  };
+
+  states.maybeprop = function(type, stream, state) {
+    if (type == ":") return pushContext(state, stream, "prop");
+    return pass(type, stream, state);
+  };
+
+  states.prop = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" && allowNested) return pushContext(state, stream, "propBlock");
+    if (type == "}" || type == "{") return popAndPass(type, stream, state);
+    if (type == "(") return pushContext(state, stream, "parens");
+
+    if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {
+      override += " error";
+    } else if (type == "word") {
+      wordAsValue(stream);
+    } else if (type == "interpolation") {
+      return pushContext(state, stream, "interpolation");
+    }
+    return "prop";
+  };
+
+  states.propBlock = function(type, _stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "word") { override = "property"; return "maybeprop"; }
+    return state.context.type;
+  };
+
+  states.parens = function(type, stream, state) {
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == ")") return popContext(state);
+    if (type == "(") return pushContext(state, stream, "parens");
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+    if (type == "word") wordAsValue(stream);
+    return "parens";
+  };
+
+  states.pseudo = function(type, stream, state) {
+    if (type == "meta") return "pseudo";
+
+    if (type == "word") {
+      override = "variable-3";
+      return state.context.type;
+    }
+    return pass(type, stream, state);
+  };
+
+  states.documentTypes = function(type, stream, state) {
+    if (type == "word" && documentTypes.hasOwnProperty(stream.current())) {
+      override = "tag";
+      return state.context.type;
+    } else {
+      return states.atBlock(type, stream, state);
+    }
+  };
+
+  states.atBlock = function(type, stream, state) {
+    if (type == "(") return pushContext(state, stream, "atBlock_parens");
+    if (type == "}" || type == ";") return popAndPass(type, stream, state);
+    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
+
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (word == "only" || word == "not" || word == "and" || word == "or")
+        override = "keyword";
+      else if (mediaTypes.hasOwnProperty(word))
+        override = "attribute";
+      else if (mediaFeatures.hasOwnProperty(word))
+        override = "property";
+      else if (mediaValueKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else if (propertyKeywords.hasOwnProperty(word))
+        override = "property";
+      else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+        override = "string-2";
+      else if (valueKeywords.hasOwnProperty(word))
+        override = "atom";
+      else if (colorKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else
+        override = "error";
+    }
+    return state.context.type;
+  };
+
+  states.atComponentBlock = function(type, stream, state) {
+    if (type == "}")
+      return popAndPass(type, stream, state);
+    if (type == "{")
+      return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false);
+    if (type == "word")
+      override = "error";
+    return state.context.type;
+  };
+
+  states.atBlock_parens = function(type, stream, state) {
+    if (type == ")") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
+    return states.atBlock(type, stream, state);
+  };
+
+  states.restricted_atBlock_before = function(type, stream, state) {
+    if (type == "{")
+      return pushContext(state, stream, "restricted_atBlock");
+    if (type == "word" && state.stateArg == "@counter-style") {
+      override = "variable";
+      return "restricted_atBlock_before";
+    }
+    return pass(type, stream, state);
+  };
+
+  states.restricted_atBlock = function(type, stream, state) {
+    if (type == "}") {
+      state.stateArg = null;
+      return popContext(state);
+    }
+    if (type == "word") {
+      if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
+          (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
+        override = "error";
+      else
+        override = "property";
+      return "maybeprop";
+    }
+    return "restricted_atBlock";
+  };
+
+  states.keyframes = function(type, stream, state) {
+    if (type == "word") { override = "variable"; return "keyframes"; }
+    if (type == "{") return pushContext(state, stream, "top");
+    return pass(type, stream, state);
+  };
+
+  states.at = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == "word") override = "tag";
+    else if (type == "hash") override = "builtin";
+    return "at";
+  };
+
+  states.interpolation = function(type, stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "{" || type == ";") return popAndPass(type, stream, state);
+    if (type == "word") override = "variable";
+    else if (type != "variable" && type != "(" && type != ")") override = "error";
+    return "interpolation";
+  };
+
+  return {
+    startState: function(base) {
+      return {tokenize: null,
+              state: inline ? "block" : "top",
+              stateArg: null,
+              context: new Context(inline ? "block" : "top", base || 0, null)};
+    },
+
+    token: function(stream, state) {
+      if (!state.tokenize && stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style && typeof style == "object") {
+        type = style[1];
+        style = style[0];
+      }
+      override = style;
+      if (type != "comment")
+        state.state = states[state.state](type, stream, state);
+      return override;
+    },
+
+    indent: function(state, textAfter) {
+      var cx = state.context, ch = textAfter && textAfter.charAt(0);
+      var indent = cx.indent;
+      if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
+      if (cx.prev) {
+        if (ch == "}" && (cx.type == "block" || cx.type == "top" ||
+                          cx.type == "interpolation" || cx.type == "restricted_atBlock")) {
+          // Resume indentation from parent context.
+          cx = cx.prev;
+          indent = cx.indent;
+        } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+            ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
+          // Dedent relative to current context.
+          indent = Math.max(0, cx.indent - indentUnit);
+        }
+      }
+      return indent;
+    },
+
+    electricChars: "}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    blockCommentContinue: " * ",
+    lineComment: lineComment,
+    fold: "brace"
+  };
+});
+
+  function keySet(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) {
+      keys[array[i].toLowerCase()] = true;
+    }
+    return keys;
+  }
+
+  var documentTypes_ = [
+    "domain", "regexp", "url", "url-prefix"
+  ], documentTypes = keySet(documentTypes_);
+
+  var mediaTypes_ = [
+    "all", "aural", "braille", "handheld", "print", "projection", "screen",
+    "tty", "tv", "embossed"
+  ], mediaTypes = keySet(mediaTypes_);
+
+  var mediaFeatures_ = [
+    "width", "min-width", "max-width", "height", "min-height", "max-height",
+    "device-width", "min-device-width", "max-device-width", "device-height",
+    "min-device-height", "max-device-height", "aspect-ratio",
+    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
+    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
+    "max-color", "color-index", "min-color-index", "max-color-index",
+    "monochrome", "min-monochrome", "max-monochrome", "resolution",
+    "min-resolution", "max-resolution", "scan", "grid", "orientation",
+    "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
+    "pointer", "any-pointer", "hover", "any-hover"
+  ], mediaFeatures = keySet(mediaFeatures_);
+
+  var mediaValueKeywords_ = [
+    "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
+    "interlace", "progressive"
+  ], mediaValueKeywords = keySet(mediaValueKeywords_);
+
+  var propertyKeywords_ = [
+    "align-content", "align-items", "align-self", "alignment-adjust",
+    "alignment-baseline", "anchor-point", "animation", "animation-delay",
+    "animation-direction", "animation-duration", "animation-fill-mode",
+    "animation-iteration-count", "animation-name", "animation-play-state",
+    "animation-timing-function", "appearance", "azimuth", "backface-visibility",
+    "background", "background-attachment", "background-blend-mode", "background-clip",
+    "background-color", "background-image", "background-origin", "background-position",
+    "background-repeat", "background-size", "baseline-shift", "binding",
+    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
+    "bookmark-target", "border", "border-bottom", "border-bottom-color",
+    "border-bottom-left-radius", "border-bottom-right-radius",
+    "border-bottom-style", "border-bottom-width", "border-collapse",
+    "border-color", "border-image", "border-image-outset",
+    "border-image-repeat", "border-image-slice", "border-image-source",
+    "border-image-width", "border-left", "border-left-color",
+    "border-left-style", "border-left-width", "border-radius", "border-right",
+    "border-right-color", "border-right-style", "border-right-width",
+    "border-spacing", "border-style", "border-top", "border-top-color",
+    "border-top-left-radius", "border-top-right-radius", "border-top-style",
+    "border-top-width", "border-width", "bottom", "box-decoration-break",
+    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
+    "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
+    "column-fill", "column-gap", "column-rule", "column-rule-color",
+    "column-rule-style", "column-rule-width", "column-span", "column-width",
+    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
+    "cue-after", "cue-before", "cursor", "direction", "display",
+    "dominant-baseline", "drop-initial-after-adjust",
+    "drop-initial-after-align", "drop-initial-before-adjust",
+    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
+    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
+    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
+    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
+    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
+    "font-stretch", "font-style", "font-synthesis", "font-variant",
+    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
+    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
+    "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
+    "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap",
+    "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap",
+    "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-template-rows", "hanging-punctuation", "height", "hyphens",
+    "icon", "image-orientation", "image-rendering", "image-resolution",
+    "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
+    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+    "line-stacking-shift", "line-stacking-strategy", "list-style",
+    "list-style-image", "list-style-position", "list-style-type", "margin",
+    "margin-bottom", "margin-left", "margin-right", "margin-top",
+    "marks", "marquee-direction", "marquee-loop",
+    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
+    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
+    "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
+    "opacity", "order", "orphans", "outline",
+    "outline-color", "outline-offset", "outline-style", "outline-width",
+    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
+    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
+    "page", "page-break-after", "page-break-before", "page-break-inside",
+    "page-policy", "pause", "pause-after", "pause-before", "perspective",
+    "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
+    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
+    "region-break-before", "region-break-inside", "region-fragment",
+    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
+    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
+    "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
+    "shape-outside", "size", "speak", "speak-as", "speak-header",
+    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
+    "tab-size", "table-layout", "target", "target-name", "target-new",
+    "target-position", "text-align", "text-align-last", "text-decoration",
+    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
+    "text-decoration-style", "text-emphasis", "text-emphasis-color",
+    "text-emphasis-position", "text-emphasis-style", "text-height",
+    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
+    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
+    "text-wrap", "top", "transform", "transform-origin", "transform-style",
+    "transition", "transition-delay", "transition-duration",
+    "transition-property", "transition-timing-function", "unicode-bidi",
+    "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
+    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
+    "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
+    "word-spacing", "word-wrap", "z-index",
+    // SVG-specific
+    "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
+    "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
+    "color-interpolation", "color-interpolation-filters",
+    "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
+    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
+    "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
+    "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
+    "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
+    "glyph-orientation-vertical", "text-anchor", "writing-mode"
+  ], propertyKeywords = keySet(propertyKeywords_);
+
+  var nonStandardPropertyKeywords_ = [
+    "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
+    "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
+    "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
+    "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
+    "searchfield-results-decoration", "zoom"
+  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
+
+  var fontProperties_ = [
+    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
+    "font-stretch", "font-weight", "font-style"
+  ], fontProperties = keySet(fontProperties_);
+
+  var counterDescriptors_ = [
+    "additive-symbols", "fallback", "negative", "pad", "prefix", "range",
+    "speak-as", "suffix", "symbols", "system"
+  ], counterDescriptors = keySet(counterDescriptors_);
+
+  var colorKeywords_ = [
+    "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
+    "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
+    "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
+    "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",
+    "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",
+    "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
+    "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
+    "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
+    "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
+    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
+    "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
+    "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
+    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
+    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",
+    "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta",
+    "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
+    "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
+    "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin",
+    "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
+    "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
+    "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
+    "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
+    "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
+    "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
+    "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
+    "whitesmoke", "yellow", "yellowgreen"
+  ], colorKeywords = keySet(colorKeywords_);
+
+  var valueKeywords_ = [
+    "above", "absolute", "activeborder", "additive", "activecaption", "afar",
+    "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
+    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
+    "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
+    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
+    "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
+    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
+    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
+    "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
+    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
+    "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
+    "compact", "condensed", "contain", "content", "contents",
+    "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
+    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
+    "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
+    "destination-in", "destination-out", "destination-over", "devanagari", "difference",
+    "disc", "discard", "disclosure-closed", "disclosure-open", "document",
+    "dot-dash", "dot-dot-dash",
+    "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
+    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
+    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
+    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
+    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
+    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
+    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
+    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
+    "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
+    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
+    "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
+    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
+    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
+    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
+    "inline-block", "inline-flex", "inline-grid", "inline-table", "inset", "inside", "intrinsic", "invert",
+    "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
+    "katakana", "katakana-iroha", "keep-all", "khmer",
+    "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten",
+    "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
+    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
+    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
+    "media-controls-background", "media-current-time-display",
+    "media-fullscreen-button", "media-mute-button", "media-play-button",
+    "media-return-to-realtime-button", "media-rewind-button",
+    "media-seek-back-button", "media-seek-forward-button", "media-slider",
+    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
+    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
+    "menu", "menulist", "menulist-button", "menulist-text",
+    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
+    "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
+    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
+    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
+    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
+    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
+    "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
+    "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
+    "progress", "push-button", "radial-gradient", "radio", "read-only",
+    "read-write", "read-write-plaintext-only", "rectangle", "region",
+    "relative", "repeat", "repeating-linear-gradient",
+    "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+    "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
+    "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
+    "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
+    "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
+    "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
+    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
+    "simp-chinese-formal", "simp-chinese-informal", "single",
+    "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
+    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
+    "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
+    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
+    "table-caption", "table-cell", "table-column", "table-column-group",
+    "table-footer-group", "table-header-group", "table-row", "table-row-group",
+    "tamil",
+    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
+    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
+    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
+    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
+    "trad-chinese-formal", "trad-chinese-informal", "transform",
+    "translate", "translate3d", "translateX", "translateY", "translateZ",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",
+    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
+    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
+    "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
+    "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
+    "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
+    "xx-large", "xx-small"
+  ], valueKeywords = keySet(valueKeywords_);
+
+  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
+    .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
+    .concat(valueKeywords_);
+  CodeMirror.registerHelper("hintWords", "css", allWords);
+
+  function tokenCComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "/") {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ["comment", "comment"];
+  }
+
+  CodeMirror.defineMIME("text/css", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css"
+  });
+
+  CodeMirror.defineMIME("text/x-scss", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
+    allowNested: true,
+    lineComment: "//",
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      ":": function(stream) {
+        if (stream.match(/\s*\{/, false))
+          return [null, null]
+        return false;
+      },
+      "$": function(stream) {
+        stream.match(/^[\w-]+/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "#": function(stream) {
+        if (!stream.eat("{")) return false;
+        return [null, "interpolation"];
+      }
+    },
+    name: "css",
+    helperType: "scss"
+  });
+
+  CodeMirror.defineMIME("text/x-less", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
+    allowNested: true,
+    lineComment: "//",
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      "@": function(stream) {
+        if (stream.eat("{")) return [null, "interpolation"];
+        if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i, false)) return false;
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "&": function() {
+        return ["atom", "atom"];
+      }
+    },
+    name: "css",
+    helperType: "less"
+  });
+
+  CodeMirror.defineMIME("text/x-gss", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    supportsAtComponent: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css",
+    helperType: "gss"
+  });
+
+});
diff --git a/core/media/editors/codemirror/mode/css/css.min.js b/core/media/editors/codemirror/mode/css/css.min.js
new file mode 100644
index 00000000..4b8837a0
--- /dev/null
+++ b/core/media/editors/codemirror/mode/css/css.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;++c)b[a[c].toLowerCase()]=!0;return b}function c(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}a.defineMode("css",(function(b,c){function d(a,b){return o=b,a}function e(a,b){var c=a.next();if(r[c]){var e=r[c](a,b);if(e!==!1)return e}return"@"==c?(a.eatWhile(/[\w\\\-]/),d("def",a.current())):"="==c||("~"==c||"|"==c)&&a.eat("=")?d(null,"compare"):'"'==c||"'"==c?(b.tokenize=f(c),b.tokenize(a,b)):"#"==c?(a.eatWhile(/[\w\\\-]/),d("atom","hash")):"!"==c?(a.match(/^\s*\w*/),d("keyword","important")):/\d/.test(c)||"."==c&&a.eat(/\d/)?(a.eatWhile(/[\w.%]/),d("number","unit")):"-"!==c?/[,+>*\/]/.test(c)?d(null,"select-op"):"."==c&&a.match(/^-?[_a-z][_a-z0-9-]*/i)?d("qualifier","qualifier"):/[:;{}\[\]\(\)]/.test(c)?d(null,c):("u"==c||"U"==c)&&a.match(/rl(-prefix)?\(/i)||("d"==c||"D"==c)&&a.match("omain(",!0,!0)||("r"==c||"R"==c)&&a.match("egexp(",!0,!0)?(a.backUp(1),b.tokenize=g,d("property","word")):/[\w\\\-]/.test(c)?(a.eatWhile(/[\w\\\-]/),d("property","word")):d(null,null):/[\d.]/.test(a.peek())?(a.eatWhile(/[\w.%]/),d("number","unit")):a.match(/^-[\w\\\-]+/)?(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?d("variable-2","variable-definition"):d("variable-2","variable")):a.match(/^\w+-/)?d("meta","meta"):void 0}function f(a){return function(b,c){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){")"==a&&b.backUp(1);break}f=!f&&"\\"==e}return(e==a||!f&&")"!=a)&&(c.tokenize=null),d("string","string")}}function g(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=f(")"),d(null,"(")}function h(a,b,c){this.type=a,this.indent=b,this.prev=c}function i(a,b,c,d){return a.context=new h(c,b.indentation()+(d===!1?0:q),a.context),c}function j(a){return a.context.prev&&(a.context=a.context.prev),a.context.type}function k(a,b,c){return F[c.context.type](a,b,c)}function l(a,b,c,d){for(var e=d||1;e>0;e--)c.context=c.context.prev;return k(a,b,c)}function m(a){var b=a.current().toLowerCase();p=B.hasOwnProperty(b)?"atom":A.hasOwnProperty(b)?"keyword":"variable"}var n=c.inline;c.propertyKeywords||(c=a.resolveMode("text/css"));var o,p,q=b.indentUnit,r=c.tokenHooks,s=c.documentTypes||{},t=c.mediaTypes||{},u=c.mediaFeatures||{},v=c.mediaValueKeywords||{},w=c.propertyKeywords||{},x=c.nonStandardPropertyKeywords||{},y=c.fontProperties||{},z=c.counterDescriptors||{},A=c.colorKeywords||{},B=c.valueKeywords||{},C=c.allowNested,D=c.lineComment,E=c.supportsAtComponent===!0,F={};return F.top=function(a,b,c){if("{"==a)return i(c,b,"block");if("}"==a&&c.context.prev)return j(c);if(E&&/@component/i.test(a))return i(c,b,"atComponentBlock");if(/^@(-moz-)?document$/i.test(a))return i(c,b,"documentTypes");if(/^@(media|supports|(-moz-)?document|import)$/i.test(a))return i(c,b,"atBlock");if(/^@(font-face|counter-style)/i.test(a))return c.stateArg=a,"restricted_atBlock_before";if(/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(a))return"keyframes";if(a&&"@"==a.charAt(0))return i(c,b,"at");if("hash"==a)p="builtin";else if("word"==a)p="tag";else{if("variable-definition"==a)return"maybeprop";if("interpolation"==a)return i(c,b,"interpolation");if(":"==a)return"pseudo";if(C&&"("==a)return i(c,b,"parens")}return c.context.type},F.block=function(a,b,c){if("word"==a){var d=b.current().toLowerCase();return w.hasOwnProperty(d)?(p="property","maybeprop"):x.hasOwnProperty(d)?(p="string-2","maybeprop"):C?(p=b.match(/^\s*:(?:\s|$)/,!1)?"property":"tag","block"):(p+=" error","maybeprop")}return"meta"==a?"block":C||"hash"!=a&&"qualifier"!=a?F.top(a,b,c):(p="error","block")},F.maybeprop=function(a,b,c){return":"==a?i(c,b,"prop"):k(a,b,c)},F.prop=function(a,b,c){if(";"==a)return j(c);if("{"==a&&C)return i(c,b,"propBlock");if("}"==a||"{"==a)return l(a,b,c);if("("==a)return i(c,b,"parens");if("hash"!=a||/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(b.current())){if("word"==a)m(b);else if("interpolation"==a)return i(c,b,"interpolation")}else p+=" error";return"prop"},F.propBlock=function(a,b,c){return"}"==a?j(c):"word"==a?(p="property","maybeprop"):c.context.type},F.parens=function(a,b,c){return"{"==a||"}"==a?l(a,b,c):")"==a?j(c):"("==a?i(c,b,"parens"):"interpolation"==a?i(c,b,"interpolation"):("word"==a&&m(b),"parens")},F.pseudo=function(a,b,c){return"meta"==a?"pseudo":"word"==a?(p="variable-3",c.context.type):k(a,b,c)},F.documentTypes=function(a,b,c){return"word"==a&&s.hasOwnProperty(b.current())?(p="tag",c.context.type):F.atBlock(a,b,c)},F.atBlock=function(a,b,c){if("("==a)return i(c,b,"atBlock_parens");if("}"==a||";"==a)return l(a,b,c);if("{"==a)return j(c)&&i(c,b,C?"block":"top");if("interpolation"==a)return i(c,b,"interpolation");if("word"==a){var d=b.current().toLowerCase();p="only"==d||"not"==d||"and"==d||"or"==d?"keyword":t.hasOwnProperty(d)?"attribute":u.hasOwnProperty(d)?"property":v.hasOwnProperty(d)?"keyword":w.hasOwnProperty(d)?"property":x.hasOwnProperty(d)?"string-2":B.hasOwnProperty(d)?"atom":A.hasOwnProperty(d)?"keyword":"error"}return c.context.type},F.atComponentBlock=function(a,b,c){return"}"==a?l(a,b,c):"{"==a?j(c)&&i(c,b,C?"block":"top",!1):("word"==a&&(p="error"),c.context.type)},F.atBlock_parens=function(a,b,c){return")"==a?j(c):"{"==a||"}"==a?l(a,b,c,2):F.atBlock(a,b,c)},F.restricted_atBlock_before=function(a,b,c){return"{"==a?i(c,b,"restricted_atBlock"):"word"==a&&"@counter-style"==c.stateArg?(p="variable","restricted_atBlock_before"):k(a,b,c)},F.restricted_atBlock=function(a,b,c){return"}"==a?(c.stateArg=null,j(c)):"word"==a?(p="@font-face"==c.stateArg&&!y.hasOwnProperty(b.current().toLowerCase())||"@counter-style"==c.stateArg&&!z.hasOwnProperty(b.current().toLowerCase())?"error":"property","maybeprop"):"restricted_atBlock"},F.keyframes=function(a,b,c){return"word"==a?(p="variable","keyframes"):"{"==a?i(c,b,"top"):k(a,b,c)},F.at=function(a,b,c){return";"==a?j(c):"{"==a||"}"==a?l(a,b,c):("word"==a?p="tag":"hash"==a&&(p="builtin"),"at")},F.interpolation=function(a,b,c){return"}"==a?j(c):"{"==a||";"==a?l(a,b,c):("word"==a?p="variable":"variable"!=a&&"("!=a&&")"!=a&&(p="error"),"interpolation")},{startState:function(a){return{tokenize:null,state:n?"block":"top",stateArg:null,context:new h(n?"block":"top",a||0,null)}},token:function(a,b){if(!b.tokenize&&a.eatSpace())return null;var c=(b.tokenize||e)(a,b);return c&&"object"==typeof c&&(o=c[1],c=c[0]),p=c,"comment"!=o&&(b.state=F[b.state](o,a,b)),p},indent:function(a,b){var c=a.context,d=b&&b.charAt(0),e=c.indent;return"prop"!=c.type||"}"!=d&&")"!=d||(c=c.prev),c.prev&&("}"!=d||"block"!=c.type&&"top"!=c.type&&"interpolation"!=c.type&&"restricted_atBlock"!=c.type?(")"!=d||"parens"!=c.type&&"atBlock_parens"!=c.type)&&("{"!=d||"at"!=c.type&&"atBlock"!=c.type)||(e=Math.max(0,c.indent-q)):(c=c.prev,e=c.indent)),e},electricChars:"}",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",lineComment:D,fold:"brace"}}));var d=["domain","regexp","url","url-prefix"],e=b(d),f=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],g=b(f),h=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","orientation","device-pixel-ratio","min-device-pixel-ratio","max-device-pixel-ratio","pointer","any-pointer","hover","any-hover"],i=b(h),j=["landscape","portrait","none","coarse","fine","on-demand","hover","interlace","progressive"],k=b(j),l=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-blend-mode","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","caret-color","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-rows","grid-column","grid-column-end","grid-column-gap","grid-column-start","grid-gap","grid-row","grid-row-end","grid-row-gap","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","justify-items","justify-self","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","place-content","place-items","place-self","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","user-select","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode"],m=b(l),n=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],o=b(n),p=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],q=b(p),r=["additive-symbols","fallback","negative","pad","prefix","range","speak-as","suffix","symbols","system"],s=b(r),t=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],u=b(t),v=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","auto-flow","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","color","color-burn","color-dodge","column","column-reverse","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","darken","dashed","decimal","decimal-leading-zero","default","default-button","dense","destination-atop","destination-in","destination-out","destination-over","devanagari","difference","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","exclusion","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","flex-end","flex-start","footnotes","forwards","from","geometricPrecision","georgian","graytext","grid","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hard-light","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","hue","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-grid","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","lighten","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","luminosity","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","multiply","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","opacity","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row","row-resize","row-reverse","rtl","run-in","running","s-resize","sans-serif","saturation","scale","scale3d","scaleX","scaleY","scaleZ","screen","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","self-start","self-end","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","soft-light","solid","somali","source-atop","source-in","source-out","source-over","space","space-around","space-between","space-evenly","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","system-ui","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","transform","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","unset","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","wrap","wrap-reverse","x-large","x-small","xor","xx-large","xx-small"],w=b(v),x=d.concat(f).concat(h).concat(j).concat(l).concat(n).concat(t).concat(v);a.registerHelper("hintWords","css",x),a.defineMIME("text/css",{documentTypes:e,mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,fontProperties:q,counterDescriptors:s,colorKeywords:u,valueKeywords:w,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=c,c(a,b))}},name:"css"}),a.defineMIME("text/x-scss",{mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,colorKeywords:u,valueKeywords:w,fontProperties:q,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=c,c(a,b)):["operator","operator"]},":":function(a){return!!a.match(/\s*\{/,!1)&&[null,null]},$:function(a){return a.match(/^[\w-]+/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"]},"#":function(a){return!!a.eat("{")&&[null,"interpolation"]}},name:"css",helperType:"scss"}),a.defineMIME("text/x-less",{mediaTypes:g,mediaFeatures:i,mediaValueKeywords:k,propertyKeywords:m,nonStandardPropertyKeywords:o,colorKeywords:u,valueKeywords:w,fontProperties:q,allowNested:!0,lineComment:"//",tokenHooks:{"/":function(a,b){return a.eat("/")?(a.skipToEnd(),["comment","comment"]):a.eat("*")?(b.tokenize=c,c(a,b)):["operator","operator"]},"@":function(a){return a.eat("{")?[null,"interpolation"]:!a.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i,!1)&&(a.eatWhile(/[\w\\\-]/),a.match(/^\s*:/,!1)?["variable-2","variable-definition"]:["variable-2","variable"])},"&":function(){return["atom","atom"]}},name:"css",helperType:"less"}),a.defineMIME("text/x-gss",{documentTypes:e,mediaTypes:g,mediaFeatures:i,propertyKeywords:m,nonStandardPropertyKeywords:o,fontProperties:q,counterDescriptors:s,colorKeywords:u,valueKeywords:w,supportsAtComponent:!0,tokenHooks:{"/":function(a,b){return!!a.eat("*")&&(b.tokenize=c,c(a,b))}},name:"css",helperType:"gss"})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/cypher/cypher.js b/core/media/editors/codemirror/mode/cypher/cypher.js
new file mode 100644
index 00000000..9b249001
--- /dev/null
+++ b/core/media/editors/codemirror/mode/cypher/cypher.js
@@ -0,0 +1,150 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// By the Neo4j Team and contributors.
+// https://github.com/neo4j-contrib/CodeMirror
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+  var wordRegexp = function(words) {
+    return new RegExp("^(?:" + words.join("|") + ")$", "i");
+  };
+
+  CodeMirror.defineMode("cypher", function(config) {
+    var tokenBase = function(stream/*, state*/) {
+      var ch = stream.next();
+      if (ch ==='"') {
+        stream.match(/.*?"/);
+        return "string";
+      }
+      if (ch === "'") {
+        stream.match(/.*?'/);
+        return "string";
+      }
+      if (/[{}\(\),\.;\[\]]/.test(ch)) {
+        curPunc = ch;
+        return "node";
+      } else if (ch === "/" && stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      } else if (operatorChars.test(ch)) {
+        stream.eatWhile(operatorChars);
+        return null;
+      } else {
+        stream.eatWhile(/[_\w\d]/);
+        if (stream.eat(":")) {
+          stream.eatWhile(/[\w\d_\-]/);
+          return "atom";
+        }
+        var word = stream.current();
+        if (funcs.test(word)) return "builtin";
+        if (preds.test(word)) return "def";
+        if (keywords.test(word)) return "keyword";
+        return "variable";
+      }
+    };
+    var pushContext = function(state, type, col) {
+      return state.context = {
+        prev: state.context,
+        indent: state.indent,
+        col: col,
+        type: type
+      };
+    };
+    var popContext = function(state) {
+      state.indent = state.context.indent;
+      return state.context = state.context.prev;
+    };
+    var indentUnit = config.indentUnit;
+    var curPunc;
+    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
+    var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with", "call", "yield"]);
+    var operatorChars = /[*+\-<>=&|~%^]/;
+
+    return {
+      startState: function(/*base*/) {
+        return {
+          tokenize: tokenBase,
+          context: null,
+          indent: 0,
+          col: 0
+        };
+      },
+      token: function(stream, state) {
+        if (stream.sol()) {
+          if (state.context && (state.context.align == null)) {
+            state.context.align = false;
+          }
+          state.indent = stream.indentation();
+        }
+        if (stream.eatSpace()) {
+          return null;
+        }
+        var style = state.tokenize(stream, state);
+        if (style !== "comment" && state.context && (state.context.align == null) && state.context.type !== "pattern") {
+          state.context.align = true;
+        }
+        if (curPunc === "(") {
+          pushContext(state, ")", stream.column());
+        } else if (curPunc === "[") {
+          pushContext(state, "]", stream.column());
+        } else if (curPunc === "{") {
+          pushContext(state, "}", stream.column());
+        } else if (/[\]\}\)]/.test(curPunc)) {
+          while (state.context && state.context.type === "pattern") {
+            popContext(state);
+          }
+          if (state.context && curPunc === state.context.type) {
+            popContext(state);
+          }
+        } else if (curPunc === "." && state.context && state.context.type === "pattern") {
+          popContext(state);
+        } else if (/atom|string|variable/.test(style) && state.context) {
+          if (/[\}\]]/.test(state.context.type)) {
+            pushContext(state, "pattern", stream.column());
+          } else if (state.context.type === "pattern" && !state.context.align) {
+            state.context.align = true;
+            state.context.col = stream.column();
+          }
+        }
+        return style;
+      },
+      indent: function(state, textAfter) {
+        var firstChar = textAfter && textAfter.charAt(0);
+        var context = state.context;
+        if (/[\]\}]/.test(firstChar)) {
+          while (context && context.type === "pattern") {
+            context = context.prev;
+          }
+        }
+        var closing = context && firstChar === context.type;
+        if (!context) return 0;
+        if (context.type === "keywords") return CodeMirror.commands.newlineAndIndent;
+        if (context.align) return context.col + (closing ? 0 : 1);
+        return context.indent + (closing ? 0 : indentUnit);
+      }
+    };
+  });
+
+  CodeMirror.modeExtensions["cypher"] = {
+    autoFormatLineBreaks: function(text) {
+      var i, lines, reProcessedPortion;
+      var lines = text.split("\n");
+      var reProcessedPortion = /\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g;
+      for (var i = 0; i < lines.length; i++)
+        lines[i] = lines[i].replace(reProcessedPortion, " \n$1 ").trim();
+      return lines.join("\n");
+    }
+  };
+
+  CodeMirror.defineMIME("application/x-cypher-query", "cypher");
+
+});
diff --git a/core/media/editors/codemirror/mode/cypher/cypher.min.js b/core/media/editors/codemirror/mode/cypher/cypher.min.js
new file mode 100644
index 00000000..bfb64c80
--- /dev/null
+++ b/core/media/editors/codemirror/mode/cypher/cypher.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";var b=function(a){return new RegExp("^(?:"+a.join("|")+")$","i")};a.defineMode("cypher",(function(c){var d,e=function(a){var b=a.next();if('"'===b)return a.match(/.*?"/),"string";if("'"===b)return a.match(/.*?'/),"string";if(/[{}\(\),\.;\[\]]/.test(b))return d=b,"node";if("/"===b&&a.eat("/"))return a.skipToEnd(),"comment";if(l.test(b))return a.eatWhile(l),null;if(a.eatWhile(/[_\w\d]/),a.eat(":"))return a.eatWhile(/[\w\d_\-]/),"atom";var c=a.current();return i.test(c)?"builtin":j.test(c)?"def":k.test(c)?"keyword":"variable"},f=function(a,b,c){return a.context={prev:a.context,indent:a.indent,col:c,type:b}},g=function(a){return a.indent=a.context.indent,a.context=a.context.prev},h=c.indentUnit,i=b(["abs","acos","allShortestPaths","asin","atan","atan2","avg","ceil","coalesce","collect","cos","cot","count","degrees","e","endnode","exp","extract","filter","floor","haversin","head","id","keys","labels","last","left","length","log","log10","lower","ltrim","max","min","node","nodes","percentileCont","percentileDisc","pi","radians","rand","range","reduce","rel","relationship","relationships","replace","reverse","right","round","rtrim","shortestPath","sign","sin","size","split","sqrt","startnode","stdev","stdevp","str","substring","sum","tail","tan","timestamp","toFloat","toInt","toString","trim","type","upper"]),j=b(["all","and","any","contains","exists","has","in","none","not","or","single","xor"]),k=b(["as","asc","ascending","assert","by","case","commit","constraint","create","csv","cypher","delete","desc","descending","detach","distinct","drop","else","end","ends","explain","false","fieldterminator","foreach","from","headers","in","index","is","join","limit","load","match","merge","null","on","optional","order","periodic","profile","remove","return","scan","set","skip","start","starts","then","true","union","unique","unwind","using","when","where","with","call","yield"]),l=/[*+\-<>=&|~%^]/;return{startState:function(){return{tokenize:e,context:null,indent:0,col:0}},token:function(a,b){if(a.sol()&&(b.context&&null==b.context.align&&(b.context.align=!1),b.indent=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);if("comment"!==c&&b.context&&null==b.context.align&&"pattern"!==b.context.type&&(b.context.align=!0),"("===d)f(b,")",a.column());else if("["===d)f(b,"]",a.column());else if("{"===d)f(b,"}",a.column());else if(/[\]\}\)]/.test(d)){for(;b.context&&"pattern"===b.context.type;)g(b);b.context&&d===b.context.type&&g(b)}else"."===d&&b.context&&"pattern"===b.context.type?g(b):/atom|string|variable/.test(c)&&b.context&&(/[\}\]]/.test(b.context.type)?f(b,"pattern",a.column()):"pattern"!==b.context.type||b.context.align||(b.context.align=!0,b.context.col=a.column()));return c},indent:function(b,c){var d=c&&c.charAt(0),e=b.context;if(/[\]\}]/.test(d))for(;e&&"pattern"===e.type;)e=e.prev;var f=e&&d===e.type;return e?"keywords"===e.type?a.commands.newlineAndIndent:e.align?e.col+(f?0:1):e.indent+(f?0:h):0}}})),a.modeExtensions.cypher={autoFormatLineBreaks:function(a){for(var b,c,d,c=a.split("\n"),d=/\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g,b=0;b<c.length;b++)c[b]=c[b].replace(d," \n$1 ").trim();return c.join("\n")}},a.defineMIME("application/x-cypher-query","cypher")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/d/d.js b/core/media/editors/codemirror/mode/d/d.js
new file mode 100644
index 00000000..77b09c22
--- /dev/null
+++ b/core/media/editors/codemirror/mode/d/d.js
@@ -0,0 +1,218 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("d", function(config, parserConfig) {
+  var indentUnit = config.indentUnit,
+      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
+      keywords = parserConfig.keywords || {},
+      builtin = parserConfig.builtin || {},
+      blockKeywords = parserConfig.blockKeywords || {},
+      atoms = parserConfig.atoms || {},
+      hooks = parserConfig.hooks || {},
+      multiLineStrings = parserConfig.multiLineStrings;
+  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (hooks[ch]) {
+      var result = hooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == '"' || ch == "'" || ch == "`") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    if (ch == "/") {
+      if (stream.eat("+")) {
+        state.tokenize = tokenNestedComment;
+        return tokenNestedComment(stream, state);
+      }
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+    var cur = stream.current();
+    if (keywords.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "keyword";
+    }
+    if (builtin.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "builtin";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = null;
+      return "string";
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function tokenNestedComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "+");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    var indent = state.indented;
+    if (state.context && state.context.type == "statement")
+      indent = state.context.indented;
+    return state.context = new Context(indent, col, type, null, state.context);
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state);
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
+      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      var closing = firstChar == ctx.type;
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "{}"
+  };
+});
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var blockKeywords = "body catch class do else enum for foreach foreach_reverse if in interface mixin " +
+                      "out scope struct switch try union unittest version while with";
+
+  CodeMirror.defineMIME("text/x-d", {
+    name: "d",
+    keywords: words("abstract alias align asm assert auto break case cast cdouble cent cfloat const continue " +
+                    "debug default delegate delete deprecated export extern final finally function goto immutable " +
+                    "import inout invariant is lazy macro module new nothrow override package pragma private " +
+                    "protected public pure ref return shared short static super synchronized template this " +
+                    "throw typedef typeid typeof volatile __FILE__ __LINE__ __gshared __traits __vector __parameters " +
+                    blockKeywords),
+    blockKeywords: words(blockKeywords),
+    builtin: words("bool byte char creal dchar double float idouble ifloat int ireal long real short ubyte " +
+                   "ucent uint ulong ushort wchar wstring void size_t sizediff_t"),
+    atoms: words("exit failure success true false null"),
+    hooks: {
+      "@": function(stream, _state) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      }
+    }
+  });
+
+});
diff --git a/core/media/editors/codemirror/mode/d/d.min.js b/core/media/editors/codemirror/mode/d/d.min.js
new file mode 100644
index 00000000..2b92d1ca
--- /dev/null
+++ b/core/media/editors/codemirror/mode/d/d.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}a.defineMode("d",(function(b,c){function d(a,b){var c=a.next();if(r[c]){var d=r[c](a,b);if(d!==!1)return d}if('"'==c||"'"==c||"`"==c)return b.tokenize=e(c),b.tokenize(a,b);if(/[\[\]{}\(\),;\:\.]/.test(c))return k=c,null;if(/\d/.test(c))return a.eatWhile(/[\w\.]/),"number";if("/"==c){if(a.eat("+"))return b.tokenize=g,g(a,b);if(a.eat("*"))return b.tokenize=f,f(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(t.test(c))return a.eatWhile(t),"operator";a.eatWhile(/[\w\$_\xa1-\uffff]/);var h=a.current();return n.propertyIsEnumerable(h)?(p.propertyIsEnumerable(h)&&(k="newstatement"),"keyword"):o.propertyIsEnumerable(h)?(p.propertyIsEnumerable(h)&&(k="newstatement"),"builtin"):q.propertyIsEnumerable(h)?"atom":"variable"}function e(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){f=!0;break}e=!e&&"\\"==d}return(f||!e&&!s)&&(c.tokenize=null),"string"}}function f(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="+"==c}return"comment"}function h(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function i(a,b,c){var d=a.indented;return a.context&&"statement"==a.context.type&&(d=a.context.indented),a.context=new h(d,b,c,null,a.context)}function j(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var k,l=b.indentUnit,m=c.statementIndentUnit||l,n=c.keywords||{},o=c.builtin||{},p=c.blockKeywords||{},q=c.atoms||{},r=c.hooks||{},s=c.multiLineStrings,t=/[+\-*&%=<>!?|\/]/;return{startState:function(a){return{tokenize:null,context:new h((a||0)-l,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;k=null;var e=(b.tokenize||d)(a,b);if("comment"==e||"meta"==e)return e;if(null==c.align&&(c.align=!0),";"!=k&&":"!=k&&","!=k||"statement"!=c.type)if("{"==k)i(b,a.column(),"}");else if("["==k)i(b,a.column(),"]");else if("("==k)i(b,a.column(),")");else if("}"==k){for(;"statement"==c.type;)c=j(b);for("}"==c.type&&(c=j(b));"statement"==c.type;)c=j(b)}else k==c.type?j(b):(("}"==c.type||"top"==c.type)&&";"!=k||"statement"==c.type&&"newstatement"==k)&&i(b,a.column(),"statement");else j(b);return b.startOfLine=!1,e},indent:function(b,c){if(b.tokenize!=d&&null!=b.tokenize)return a.Pass;var e=b.context,f=c&&c.charAt(0);"statement"==e.type&&"}"==f&&(e=e.prev);var g=f==e.type;return"statement"==e.type?e.indented+("{"==f?0:m):e.align?e.column+(g?0:1):e.indented+(g?0:l)},electricChars:"{}"}}));var c="body catch class do else enum for foreach foreach_reverse if in interface mixin out scope struct switch try union unittest version while with";a.defineMIME("text/x-d",{name:"d",keywords:b("abstract alias align asm assert auto break case cast cdouble cent cfloat const continue debug default delegate delete deprecated export extern final finally function goto immutable import inout invariant is lazy macro module new nothrow override package pragma private protected public pure ref return shared short static super synchronized template this throw typedef typeid typeof volatile __FILE__ __LINE__ __gshared __traits __vector __parameters "+c),blockKeywords:b(c),builtin:b("bool byte char creal dchar double float idouble ifloat int ireal long real short ubyte ucent uint ulong ushort wchar wstring void size_t sizediff_t"),atoms:b("exit failure success true false null"),hooks:{"@":function(a,b){return a.eatWhile(/[\w\$_]/),"meta"}}})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/dart/dart.js b/core/media/editors/codemirror/mode/dart/dart.js
new file mode 100644
index 00000000..4db0d371
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dart/dart.js
@@ -0,0 +1,157 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../clike/clike"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../clike/clike"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var keywords = ("this super static final const abstract class extends external factory " +
+    "implements get native set typedef with enum throw rethrow " +
+    "assert break case continue default in return new deferred async await covariant " +
+    "try catch finally do else for if switch while import library export " +
+    "part of show hide is as").split(" ");
+  var blockKeywords = "try catch finally do else for if switch while".split(" ");
+  var atoms = "true false null".split(" ");
+  var builtins = "void bool num int double dynamic var String".split(" ");
+
+  function set(words) {
+    var obj = {};
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  function pushInterpolationStack(state) {
+    (state.interpolationStack || (state.interpolationStack = [])).push(state.tokenize);
+  }
+
+  function popInterpolationStack(state) {
+    return (state.interpolationStack || (state.interpolationStack = [])).pop();
+  }
+
+  function sizeInterpolationStack(state) {
+    return state.interpolationStack ? state.interpolationStack.length : 0;
+  }
+
+  CodeMirror.defineMIME("application/dart", {
+    name: "clike",
+    keywords: set(keywords),
+    blockKeywords: set(blockKeywords),
+    builtin: set(builtins),
+    atoms: set(atoms),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_\.]/);
+        return "meta";
+      },
+
+      // custom string handling to deal with triple-quoted strings and string interpolation
+      "'": function(stream, state) {
+        return tokenString("'", stream, state, false);
+      },
+      "\"": function(stream, state) {
+        return tokenString("\"", stream, state, false);
+      },
+      "r": function(stream, state) {
+        var peek = stream.peek();
+        if (peek == "'" || peek == "\"") {
+          return tokenString(stream.next(), stream, state, true);
+        }
+        return false;
+      },
+
+      "}": function(_stream, state) {
+        // "}" is end of interpolation, if interpolation stack is non-empty
+        if (sizeInterpolationStack(state) > 0) {
+          state.tokenize = popInterpolationStack(state);
+          return null;
+        }
+        return false;
+      },
+
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false
+        state.tokenize = tokenNestedComment(1)
+        return state.tokenize(stream, state)
+      }
+    }
+  });
+
+  function tokenString(quote, stream, state, raw) {
+    var tripleQuoted = false;
+    if (stream.eat(quote)) {
+      if (stream.eat(quote)) tripleQuoted = true;
+      else return "string"; //empty string
+    }
+    function tokenStringHelper(stream, state) {
+      var escaped = false;
+      while (!stream.eol()) {
+        if (!raw && !escaped && stream.peek() == "$") {
+          pushInterpolationStack(state);
+          state.tokenize = tokenInterpolation;
+          return "string";
+        }
+        var next = stream.next();
+        if (next == quote && !escaped && (!tripleQuoted || stream.match(quote + quote))) {
+          state.tokenize = null;
+          break;
+        }
+        escaped = !raw && !escaped && next == "\\";
+      }
+      return "string";
+    }
+    state.tokenize = tokenStringHelper;
+    return tokenStringHelper(stream, state);
+  }
+
+  function tokenInterpolation(stream, state) {
+    stream.eat("$");
+    if (stream.eat("{")) {
+      // let clike handle the content of ${...},
+      // we take over again when "}" appears (see hooks).
+      state.tokenize = null;
+    } else {
+      state.tokenize = tokenInterpolationIdentifier;
+    }
+    return null;
+  }
+
+  function tokenInterpolationIdentifier(stream, state) {
+    stream.eatWhile(/[\w_]/);
+    state.tokenize = popInterpolationStack(state);
+    return "variable";
+  }
+
+  function tokenNestedComment(depth) {
+    return function (stream, state) {
+      var ch
+      while (ch = stream.next()) {
+        if (ch == "*" && stream.eat("/")) {
+          if (depth == 1) {
+            state.tokenize = null
+            break
+          } else {
+            state.tokenize = tokenNestedComment(depth - 1)
+            return state.tokenize(stream, state)
+          }
+        } else if (ch == "/" && stream.eat("*")) {
+          state.tokenize = tokenNestedComment(depth + 1)
+          return state.tokenize(stream, state)
+        }
+      }
+      return "comment"
+    }
+  }
+
+  CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
+
+  // This is needed to make loading through meta.js work.
+  CodeMirror.defineMode("dart", function(conf) {
+    return CodeMirror.getMode(conf, "application/dart");
+  }, "clike");
+});
diff --git a/core/media/editors/codemirror/mode/dart/dart.min.js b/core/media/editors/codemirror/mode/dart/dart.min.js
new file mode 100644
index 00000000..70ce28f8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dart/dart.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../clike/clike")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../clike/clike"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function c(a){(a.interpolationStack||(a.interpolationStack=[])).push(a.tokenize)}function d(a){return(a.interpolationStack||(a.interpolationStack=[])).pop()}function e(a){return a.interpolationStack?a.interpolationStack.length:0}function f(a,b,d,e){function f(b,d){for(var f=!1;!b.eol();){if(!e&&!f&&"$"==b.peek())return c(d),d.tokenize=g,"string";var i=b.next();if(i==a&&!f&&(!h||b.match(a+a))){d.tokenize=null;break}f=!e&&!f&&"\\"==i}return"string"}var h=!1;if(b.eat(a)){if(!b.eat(a))return"string";h=!0}return d.tokenize=f,f(b,d)}function g(a,b){return a.eat("$"),a.eat("{")?b.tokenize=null:b.tokenize=h,null}function h(a,b){return a.eatWhile(/[\w_]/),b.tokenize=d(b),"variable"}function i(a){return function(b,c){for(var d;d=b.next();){if("*"==d&&b.eat("/")){if(1==a){c.tokenize=null;break}return c.tokenize=i(a-1),c.tokenize(b,c)}if("/"==d&&b.eat("*"))return c.tokenize=i(a+1),c.tokenize(b,c)}return"comment"}}var j="this super static final const abstract class extends external factory implements get native set typedef with enum throw rethrow assert break case continue default in return new deferred async await covariant try catch finally do else for if switch while import library export part of show hide is as".split(" "),k="try catch finally do else for if switch while".split(" "),l="true false null".split(" "),m="void bool num int double dynamic var String".split(" ");a.defineMIME("application/dart",{name:"clike",keywords:b(j),blockKeywords:b(k),builtin:b(m),atoms:b(l),hooks:{"@":function(a){return a.eatWhile(/[\w\$_\.]/),"meta"},"'":function(a,b){return f("'",a,b,!1)},'"':function(a,b){return f('"',a,b,!1)},r:function(a,b){var c=a.peek();return("'"==c||'"'==c)&&f(a.next(),a,b,!0)},"}":function(a,b){return e(b)>0&&(b.tokenize=d(b),null)},"/":function(a,b){return!!a.eat("*")&&(b.tokenize=i(1),b.tokenize(a,b))}}}),a.registerHelper("hintWords","application/dart",j.concat(l).concat(m)),a.defineMode("dart",(function(b){return a.getMode(b,"application/dart")}),"clike")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/diff/diff.js b/core/media/editors/codemirror/mode/diff/diff.js
new file mode 100644
index 00000000..fe0305e7
--- /dev/null
+++ b/core/media/editors/codemirror/mode/diff/diff.js
@@ -0,0 +1,47 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("diff", function() {
+
+  var TOKEN_NAMES = {
+    '+': 'positive',
+    '-': 'negative',
+    '@': 'meta'
+  };
+
+  return {
+    token: function(stream) {
+      var tw_pos = stream.string.search(/[\t ]+?$/);
+
+      if (!stream.sol() || tw_pos === 0) {
+        stream.skipToEnd();
+        return ("error " + (
+          TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');
+      }
+
+      var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();
+
+      if (tw_pos === -1) {
+        stream.skipToEnd();
+      } else {
+        stream.pos = tw_pos;
+      }
+
+      return token_name;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-diff", "diff");
+
+});
diff --git a/core/media/editors/codemirror/mode/diff/diff.min.js b/core/media/editors/codemirror/mode/diff/diff.min.js
new file mode 100644
index 00000000..7d868460
--- /dev/null
+++ b/core/media/editors/codemirror/mode/diff/diff.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("diff",(function(){var a={"+":"positive","-":"negative","@":"meta"};return{token:function(b){var c=b.string.search(/[\t ]+?$/);if(!b.sol()||0===c)return b.skipToEnd(),("error "+(a[b.string.charAt(0)]||"")).replace(/ $/,"");var d=a[b.peek()]||b.skipToEnd();return c===-1?b.skipToEnd():b.pos=c,d}}})),a.defineMIME("text/x-diff","diff")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/django/django.js b/core/media/editors/codemirror/mode/django/django.js
new file mode 100644
index 00000000..7b4ef3b5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/django/django.js
@@ -0,0 +1,356 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("django:inner", function() {
+    var keywords = ["block", "endblock", "for", "endfor", "true", "false", "filter", "endfilter",
+                    "loop", "none", "self", "super", "if", "elif", "endif", "as", "else", "import",
+                    "with", "endwith", "without", "context", "ifequal", "endifequal", "ifnotequal",
+                    "endifnotequal", "extends", "include", "load", "comment", "endcomment",
+                    "empty", "url", "static", "trans", "blocktrans", "endblocktrans", "now",
+                    "regroup", "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle",
+                    "csrf_token", "autoescape", "endautoescape", "spaceless", "endspaceless",
+                    "ssi", "templatetag", "verbatim", "endverbatim", "widthratio"],
+        filters = ["add", "addslashes", "capfirst", "center", "cut", "date",
+                   "default", "default_if_none", "dictsort",
+                   "dictsortreversed", "divisibleby", "escape", "escapejs",
+                   "filesizeformat", "first", "floatformat", "force_escape",
+                   "get_digit", "iriencode", "join", "last", "length",
+                   "length_is", "linebreaks", "linebreaksbr", "linenumbers",
+                   "ljust", "lower", "make_list", "phone2numeric", "pluralize",
+                   "pprint", "random", "removetags", "rjust", "safe",
+                   "safeseq", "slice", "slugify", "stringformat", "striptags",
+                   "time", "timesince", "timeuntil", "title", "truncatechars",
+                   "truncatechars_html", "truncatewords", "truncatewords_html",
+                   "unordered_list", "upper", "urlencode", "urlize",
+                   "urlizetrunc", "wordcount", "wordwrap", "yesno"],
+        operators = ["==", "!=", "<", ">", "<=", ">="],
+        wordOperators = ["in", "not", "or", "and"];
+
+    keywords = new RegExp("^\\b(" + keywords.join("|") + ")\\b");
+    filters = new RegExp("^\\b(" + filters.join("|") + ")\\b");
+    operators = new RegExp("^\\b(" + operators.join("|") + ")\\b");
+    wordOperators = new RegExp("^\\b(" + wordOperators.join("|") + ")\\b");
+
+    // We have to return "null" instead of null, in order to avoid string
+    // styling as the default, when using Django templates inside HTML
+    // element attributes
+    function tokenBase (stream, state) {
+      // Attempt to identify a variable, template or comment tag respectively
+      if (stream.match("{{")) {
+        state.tokenize = inVariable;
+        return "tag";
+      } else if (stream.match("{%")) {
+        state.tokenize = inTag;
+        return "tag";
+      } else if (stream.match("{#")) {
+        state.tokenize = inComment;
+        return "comment";
+      }
+
+      // Ignore completely any stream series that do not match the
+      // Django template opening tags.
+      while (stream.next() != null && !stream.match(/\{[{%#]/, false)) {}
+      return null;
+    }
+
+    // A string can be included in either single or double quotes (this is
+    // the delimiter). Mark everything as a string until the start delimiter
+    // occurs again.
+    function inString (delimiter, previousTokenizer) {
+      return function (stream, state) {
+        if (!state.escapeNext && stream.eat(delimiter)) {
+          state.tokenize = previousTokenizer;
+        } else {
+          if (state.escapeNext) {
+            state.escapeNext = false;
+          }
+
+          var ch = stream.next();
+
+          // Take into account the backslash for escaping characters, such as
+          // the string delimiter.
+          if (ch == "\\") {
+            state.escapeNext = true;
+          }
+        }
+
+        return "string";
+      };
+    }
+
+    // Apply Django template variable syntax highlighting
+    function inVariable (stream, state) {
+      // Attempt to match a dot that precedes a property
+      if (state.waitDot) {
+        state.waitDot = false;
+
+        if (stream.peek() != ".") {
+          return "null";
+        }
+
+        // Dot followed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat(".")) {
+          state.waitProperty = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for property.");
+        }
+      }
+
+      // Attempt to match a pipe that precedes a filter
+      if (state.waitPipe) {
+        state.waitPipe = false;
+
+        if (stream.peek() != "|") {
+          return "null";
+        }
+
+        // Pipe followed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat("|")) {
+          state.waitFilter = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for filter.");
+        }
+      }
+
+      // Highlight properties
+      if (state.waitProperty) {
+        state.waitProperty = false;
+        if (stream.match(/\b(\w+)\b/)) {
+          state.waitDot = true;  // A property can be followed by another property
+          state.waitPipe = true;  // A property can be followed by a filter
+          return "property";
+        }
+      }
+
+      // Highlight filters
+      if (state.waitFilter) {
+          state.waitFilter = false;
+        if (stream.match(filters)) {
+          return "variable-2";
+        }
+      }
+
+      // Ignore all white spaces
+      if (stream.eatSpace()) {
+        state.waitProperty = false;
+        return "null";
+      }
+
+      // Identify numbers
+      if (stream.match(/\b\d+(\.\d+)?\b/)) {
+        return "number";
+      }
+
+      // Identify strings
+      if (stream.match("'")) {
+        state.tokenize = inString("'", state.tokenize);
+        return "string";
+      } else if (stream.match('"')) {
+        state.tokenize = inString('"', state.tokenize);
+        return "string";
+      }
+
+      // Attempt to find the variable
+      if (stream.match(/\b(\w+)\b/) && !state.foundVariable) {
+        state.waitDot = true;
+        state.waitPipe = true;  // A property can be followed by a filter
+        return "variable";
+      }
+
+      // If found closing tag reset
+      if (stream.match("}}")) {
+        state.waitProperty = null;
+        state.waitFilter = null;
+        state.waitDot = null;
+        state.waitPipe = null;
+        state.tokenize = tokenBase;
+        return "tag";
+      }
+
+      // If nothing was found, advance to the next character
+      stream.next();
+      return "null";
+    }
+
+    function inTag (stream, state) {
+      // Attempt to match a dot that precedes a property
+      if (state.waitDot) {
+        state.waitDot = false;
+
+        if (stream.peek() != ".") {
+          return "null";
+        }
+
+        // Dot followed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat(".")) {
+          state.waitProperty = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for property.");
+        }
+      }
+
+      // Attempt to match a pipe that precedes a filter
+      if (state.waitPipe) {
+        state.waitPipe = false;
+
+        if (stream.peek() != "|") {
+          return "null";
+        }
+
+        // Pipe followed by a non-word character should be considered an error.
+        if (stream.match(/\.\W+/)) {
+          return "error";
+        } else if (stream.eat("|")) {
+          state.waitFilter = true;
+          return "null";
+        } else {
+          throw Error ("Unexpected error while waiting for filter.");
+        }
+      }
+
+      // Highlight properties
+      if (state.waitProperty) {
+        state.waitProperty = false;
+        if (stream.match(/\b(\w+)\b/)) {
+          state.waitDot = true;  // A property can be followed by another property
+          state.waitPipe = true;  // A property can be followed by a filter
+          return "property";
+        }
+      }
+
+      // Highlight filters
+      if (state.waitFilter) {
+          state.waitFilter = false;
+        if (stream.match(filters)) {
+          return "variable-2";
+        }
+      }
+
+      // Ignore all white spaces
+      if (stream.eatSpace()) {
+        state.waitProperty = false;
+        return "null";
+      }
+
+      // Identify numbers
+      if (stream.match(/\b\d+(\.\d+)?\b/)) {
+        return "number";
+      }
+
+      // Identify strings
+      if (stream.match("'")) {
+        state.tokenize = inString("'", state.tokenize);
+        return "string";
+      } else if (stream.match('"')) {
+        state.tokenize = inString('"', state.tokenize);
+        return "string";
+      }
+
+      // Attempt to match an operator
+      if (stream.match(operators)) {
+        return "operator";
+      }
+
+      // Attempt to match a word operator
+      if (stream.match(wordOperators)) {
+        return "keyword";
+      }
+
+      // Attempt to match a keyword
+      var keywordMatch = stream.match(keywords);
+      if (keywordMatch) {
+        if (keywordMatch[0] == "comment") {
+          state.blockCommentTag = true;
+        }
+        return "keyword";
+      }
+
+      // Attempt to match a variable
+      if (stream.match(/\b(\w+)\b/)) {
+        state.waitDot = true;
+        state.waitPipe = true;  // A property can be followed by a filter
+        return "variable";
+      }
+
+      // If found closing tag reset
+      if (stream.match("%}")) {
+        state.waitProperty = null;
+        state.waitFilter = null;
+        state.waitDot = null;
+        state.waitPipe = null;
+        // If the tag that closes is a block comment tag, we want to mark the
+        // following code as comment, until the tag closes.
+        if (state.blockCommentTag) {
+          state.blockCommentTag = false;  // Release the "lock"
+          state.tokenize = inBlockComment;
+        } else {
+          state.tokenize = tokenBase;
+        }
+        return "tag";
+      }
+
+      // If nothing was found, advance to the next character
+      stream.next();
+      return "null";
+    }
+
+    // Mark everything as comment inside the tag and the tag itself.
+    function inComment (stream, state) {
+      if (stream.match(/^.*?#\}/)) state.tokenize = tokenBase
+      else stream.skipToEnd()
+      return "comment";
+    }
+
+    // Mark everything as a comment until the `blockcomment` tag closes.
+    function inBlockComment (stream, state) {
+      if (stream.match(/\{%\s*endcomment\s*%\}/, false)) {
+        state.tokenize = inTag;
+        stream.match("{%");
+        return "tag";
+      } else {
+        stream.next();
+        return "comment";
+      }
+    }
+
+    return {
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      },
+      blockCommentStart: "{% comment %}",
+      blockCommentEnd: "{% endcomment %}"
+    };
+  });
+
+  CodeMirror.defineMode("django", function(config) {
+    var htmlBase = CodeMirror.getMode(config, "text/html");
+    var djangoInner = CodeMirror.getMode(config, "django:inner");
+    return CodeMirror.overlayMode(htmlBase, djangoInner);
+  });
+
+  CodeMirror.defineMIME("text/x-django", "django");
+});
diff --git a/core/media/editors/codemirror/mode/django/django.min.js b/core/media/editors/codemirror/mode/django/django.min.js
new file mode 100644
index 00000000..89198e1a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/django/django.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../../addon/mode/overlay")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../../addon/mode/overlay"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("django:inner",(function(){function a(a,b){if(a.match("{{"))return b.tokenize=c,"tag";if(a.match("{%"))return b.tokenize=d,"tag";if(a.match("{#"))return b.tokenize=e,"comment";for(;null!=a.next()&&!a.match(/\{[{%#]/,!1););return null}function b(a,b){return function(c,d){if(!d.escapeNext&&c.eat(a))d.tokenize=b;else{d.escapeNext&&(d.escapeNext=!1);var e=c.next();"\\"==e&&(d.escapeNext=!0)}return"string"}}function c(c,d){if(d.waitDot){if(d.waitDot=!1,"."!=c.peek())return"null";if(c.match(/\.\W+/))return"error";if(c.eat("."))return d.waitProperty=!0,"null";throw Error("Unexpected error while waiting for property.")}if(d.waitPipe){if(d.waitPipe=!1,"|"!=c.peek())return"null";if(c.match(/\.\W+/))return"error";if(c.eat("|"))return d.waitFilter=!0,"null";throw Error("Unexpected error while waiting for filter.")}return d.waitProperty&&(d.waitProperty=!1,c.match(/\b(\w+)\b/))?(d.waitDot=!0,d.waitPipe=!0,"property"):d.waitFilter&&(d.waitFilter=!1,c.match(h))?"variable-2":c.eatSpace()?(d.waitProperty=!1,"null"):c.match(/\b\d+(\.\d+)?\b/)?"number":c.match("'")?(d.tokenize=b("'",d.tokenize),"string"):c.match('"')?(d.tokenize=b('"',d.tokenize),"string"):c.match(/\b(\w+)\b/)&&!d.foundVariable?(d.waitDot=!0,d.waitPipe=!0,"variable"):c.match("}}")?(d.waitProperty=null,d.waitFilter=null,d.waitDot=null,d.waitPipe=null,d.tokenize=a,"tag"):(c.next(),"null")}function d(c,d){if(d.waitDot){if(d.waitDot=!1,"."!=c.peek())return"null";if(c.match(/\.\W+/))return"error";if(c.eat("."))return d.waitProperty=!0,"null";throw Error("Unexpected error while waiting for property.")}if(d.waitPipe){if(d.waitPipe=!1,"|"!=c.peek())return"null";if(c.match(/\.\W+/))return"error";if(c.eat("|"))return d.waitFilter=!0,"null";throw Error("Unexpected error while waiting for filter.")}if(d.waitProperty&&(d.waitProperty=!1,c.match(/\b(\w+)\b/)))return d.waitDot=!0,d.waitPipe=!0,"property";if(d.waitFilter&&(d.waitFilter=!1,c.match(h)))return"variable-2";if(c.eatSpace())return d.waitProperty=!1,"null";if(c.match(/\b\d+(\.\d+)?\b/))return"number";if(c.match("'"))return d.tokenize=b("'",d.tokenize),"string";if(c.match('"'))return d.tokenize=b('"',d.tokenize),"string";if(c.match(i))return"operator";if(c.match(j))return"keyword";var e=c.match(g);return e?("comment"==e[0]&&(d.blockCommentTag=!0),"keyword"):c.match(/\b(\w+)\b/)?(d.waitDot=!0,d.waitPipe=!0,"variable"):c.match("%}")?(d.waitProperty=null,d.waitFilter=null,d.waitDot=null,d.waitPipe=null,d.blockCommentTag?(d.blockCommentTag=!1,d.tokenize=f):d.tokenize=a,"tag"):(c.next(),"null")}function e(b,c){return b.match(/^.*?#\}/)?c.tokenize=a:b.skipToEnd(),"comment"}function f(a,b){return a.match(/\{%\s*endcomment\s*%\}/,!1)?(b.tokenize=d,a.match("{%"),"tag"):(a.next(),"comment")}var g=["block","endblock","for","endfor","true","false","filter","endfilter","loop","none","self","super","if","elif","endif","as","else","import","with","endwith","without","context","ifequal","endifequal","ifnotequal","endifnotequal","extends","include","load","comment","endcomment","empty","url","static","trans","blocktrans","endblocktrans","now","regroup","lorem","ifchanged","endifchanged","firstof","debug","cycle","csrf_token","autoescape","endautoescape","spaceless","endspaceless","ssi","templatetag","verbatim","endverbatim","widthratio"],h=["add","addslashes","capfirst","center","cut","date","default","default_if_none","dictsort","dictsortreversed","divisibleby","escape","escapejs","filesizeformat","first","floatformat","force_escape","get_digit","iriencode","join","last","length","length_is","linebreaks","linebreaksbr","linenumbers","ljust","lower","make_list","phone2numeric","pluralize","pprint","random","removetags","rjust","safe","safeseq","slice","slugify","stringformat","striptags","time","timesince","timeuntil","title","truncatechars","truncatechars_html","truncatewords","truncatewords_html","unordered_list","upper","urlencode","urlize","urlizetrunc","wordcount","wordwrap","yesno"],i=["==","!=","<",">","<=",">="],j=["in","not","or","and"];return g=new RegExp("^\\b("+g.join("|")+")\\b"),h=new RegExp("^\\b("+h.join("|")+")\\b"),i=new RegExp("^\\b("+i.join("|")+")\\b"),j=new RegExp("^\\b("+j.join("|")+")\\b"),{startState:function(){return{tokenize:a}},token:function(a,b){return b.tokenize(a,b)},blockCommentStart:"{% comment %}",blockCommentEnd:"{% endcomment %}"}})),a.defineMode("django",(function(b){var c=a.getMode(b,"text/html"),d=a.getMode(b,"django:inner");return a.overlayMode(c,d)})),a.defineMIME("text/x-django","django")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/dockerfile/dockerfile.js b/core/media/editors/codemirror/mode/dockerfile/dockerfile.js
new file mode 100644
index 00000000..769e787e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dockerfile/dockerfile.js
@@ -0,0 +1,211 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var from = "from";
+  var fromRegex = new RegExp("^(\\s*)\\b(" + from + ")\\b", "i");
+
+  var shells = ["run", "cmd", "entrypoint", "shell"];
+  var shellsAsArrayRegex = new RegExp("^(\\s*)(" + shells.join('|') + ")(\\s+\\[)", "i");
+
+  var expose = "expose";
+  var exposeRegex = new RegExp("^(\\s*)(" + expose + ")(\\s+)", "i");
+
+  var others = [
+    "arg", "from", "maintainer", "label", "env",
+    "add", "copy", "volume", "user",
+    "workdir", "onbuild", "stopsignal", "healthcheck", "shell"
+  ];
+
+  // Collect all Dockerfile directives
+  var instructions = [from, expose].concat(shells).concat(others),
+      instructionRegex = "(" + instructions.join('|') + ")",
+      instructionOnlyLine = new RegExp("^(\\s*)" + instructionRegex + "(\\s*)(#.*)?$", "i"),
+      instructionWithArguments = new RegExp("^(\\s*)" + instructionRegex + "(\\s+)", "i");
+
+  CodeMirror.defineSimpleMode("dockerfile", {
+    start: [
+      // Block comment: This is a line starting with a comment
+      {
+        regex: /^\s*#.*$/,
+        sol: true,
+        token: "comment"
+      },
+      {
+        regex: fromRegex,
+        token: [null, "keyword"],
+        sol: true,
+        next: "from"
+      },
+      // Highlight an instruction without any arguments (for convenience)
+      {
+        regex: instructionOnlyLine,
+        token: [null, "keyword", null, "error"],
+        sol: true
+      },
+      {
+        regex: shellsAsArrayRegex,
+        token: [null, "keyword", null],
+        sol: true,
+        next: "array"
+      },
+      {
+        regex: exposeRegex,
+        token: [null, "keyword", null],
+        sol: true,
+        next: "expose"
+      },
+      // Highlight an instruction followed by arguments
+      {
+        regex: instructionWithArguments,
+        token: [null, "keyword", null],
+        sol: true,
+        next: "arguments"
+      },
+      {
+        regex: /./,
+        token: null
+      }
+    ],
+    from: [
+      {
+        regex: /\s*$/,
+        token: null,
+        next: "start"
+      },
+      {
+        // Line comment without instruction arguments is an error
+        regex: /(\s*)(#.*)$/,
+        token: [null, "error"],
+        next: "start"
+      },
+      {
+        regex: /(\s*\S+\s+)(as)/i,
+        token: [null, "keyword"],
+        next: "start"
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    single: [
+      {
+        regex: /(?:[^\\']|\\.)/,
+        token: "string"
+      },
+      {
+        regex: /'/,
+        token: "string",
+        pop: true
+      }
+    ],
+    double: [
+      {
+        regex: /(?:[^\\"]|\\.)/,
+        token: "string"
+      },
+      {
+        regex: /"/,
+        token: "string",
+        pop: true
+      }
+    ],
+    array: [
+      {
+        regex: /\]/,
+        token: null,
+        next: "start"
+      },
+      {
+        regex: /"(?:[^\\"]|\\.)*"?/,
+        token: "string"
+      }
+    ],
+    expose: [
+      {
+        regex: /\d+$/,
+        token: "number",
+        next: "start"
+      },
+      {
+        regex: /[^\d]+$/,
+        token: null,
+        next: "start"
+      },
+      {
+        regex: /\d+/,
+        token: "number"
+      },
+      {
+        regex: /[^\d]+/,
+        token: null
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    arguments: [
+      {
+        regex: /^\s*#.*$/,
+        sol: true,
+        token: "comment"
+      },
+      {
+        regex: /"(?:[^\\"]|\\.)*"?$/,
+        token: "string",
+        next: "start"
+      },
+      {
+        regex: /"/,
+        token: "string",
+        push: "double"
+      },
+      {
+        regex: /'(?:[^\\']|\\.)*'?$/,
+        token: "string",
+        next: "start"
+      },
+      {
+        regex: /'/,
+        token: "string",
+        push: "single"
+      },
+      {
+        regex: /[^#"']+[\\`]$/,
+        token: null
+      },
+      {
+        regex: /[^#"']+$/,
+        token: null,
+        next: "start"
+      },
+      {
+        regex: /[^#"']+/,
+        token: null
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    meta: {
+      lineComment: "#"
+    }
+  });
+
+  CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
+});
diff --git a/core/media/editors/codemirror/mode/dockerfile/dockerfile.min.js b/core/media/editors/codemirror/mode/dockerfile/dockerfile.min.js
new file mode 100644
index 00000000..d0aa2271
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dockerfile/dockerfile.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";var b="from",c=new RegExp("^(\\s*)\\b("+b+")\\b","i"),d=["run","cmd","entrypoint","shell"],e=new RegExp("^(\\s*)("+d.join("|")+")(\\s+\\[)","i"),f="expose",g=new RegExp("^(\\s*)("+f+")(\\s+)","i"),h=["arg","from","maintainer","label","env","add","copy","volume","user","workdir","onbuild","stopsignal","healthcheck","shell"],i=[b,f].concat(d).concat(h),j="("+i.join("|")+")",k=new RegExp("^(\\s*)"+j+"(\\s*)(#.*)?$","i"),l=new RegExp("^(\\s*)"+j+"(\\s+)","i");a.defineSimpleMode("dockerfile",{start:[{regex:/^\s*#.*$/,sol:!0,token:"comment"},{regex:c,token:[null,"keyword"],sol:!0,next:"from"},{regex:k,token:[null,"keyword",null,"error"],sol:!0},{regex:e,token:[null,"keyword",null],sol:!0,next:"array"},{regex:g,token:[null,"keyword",null],sol:!0,next:"expose"},{regex:l,token:[null,"keyword",null],sol:!0,next:"arguments"},{regex:/./,token:null}],from:[{regex:/\s*$/,token:null,next:"start"},{regex:/(\s*)(#.*)$/,token:[null,"error"],next:"start"},{regex:/(\s*\S+\s+)(as)/i,token:[null,"keyword"],next:"start"},{token:null,next:"start"}],single:[{regex:/(?:[^\\']|\\.)/,token:"string"},{regex:/'/,token:"string",pop:!0}],double:[{regex:/(?:[^\\"]|\\.)/,token:"string"},{regex:/"/,token:"string",pop:!0}],array:[{regex:/\]/,token:null,next:"start"},{regex:/"(?:[^\\"]|\\.)*"?/,token:"string"}],expose:[{regex:/\d+$/,token:"number",next:"start"},{regex:/[^\d]+$/,token:null,next:"start"},{regex:/\d+/,token:"number"},{regex:/[^\d]+/,token:null},{token:null,next:"start"}],arguments:[{regex:/^\s*#.*$/,sol:!0,token:"comment"},{regex:/"(?:[^\\"]|\\.)*"?$/,token:"string",next:"start"},{regex:/"/,token:"string",push:"double"},{regex:/'(?:[^\\']|\\.)*'?$/,token:"string",next:"start"},{regex:/'/,token:"string",push:"single"},{regex:/[^#"']+[\\`]$/,token:null},{regex:/[^#"']+$/,token:null,next:"start"},{regex:/[^#"']+/,token:null},{token:null,next:"start"}],meta:{lineComment:"#"}}),a.defineMIME("text/x-dockerfile","dockerfile")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/dtd/dtd.js b/core/media/editors/codemirror/mode/dtd/dtd.js
new file mode 100644
index 00000000..52d76ee1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dtd/dtd.js
@@ -0,0 +1,142 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+  DTD mode
+  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
+  GitHub: @peterkroon
+*/
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("dtd", function(config) {
+  var indentUnit = config.indentUnit, type;
+  function ret(style, tp) {type = tp; return style;}
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    if (ch == "<" && stream.eat("!") ) {
+      if (stream.eatWhile(/[\-]/)) {
+        state.tokenize = tokenSGMLComment;
+        return tokenSGMLComment(stream, state);
+      } else if (stream.eatWhile(/[\w]/)) return ret("keyword", "doindent");
+    } else if (ch == "<" && stream.eat("?")) { //xml declaration
+      state.tokenize = inBlock("meta", "?>");
+      return ret("meta", ch);
+    } else if (ch == "#" && stream.eatWhile(/[\w]/)) return ret("atom", "tag");
+    else if (ch == "|") return ret("keyword", "seperator");
+    else if (ch.match(/[\(\)\[\]\-\.,\+\?>]/)) return ret(null, ch);//if(ch === ">") return ret(null, "endtag"); else
+    else if (ch.match(/[\[\]]/)) return ret("rule", ch);
+    else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (stream.eatWhile(/[a-zA-Z\?\+\d]/)) {
+      var sc = stream.current();
+      if( sc.substr(sc.length-1,sc.length).match(/\?|\+/) !== null )stream.backUp(1);
+      return ret("tag", "tag");
+    } else if (ch == "%" || ch == "*" ) return ret("number", "number");
+    else {
+      stream.eatWhile(/[\w\\\-_%.{,]/);
+      return ret(null, null);
+    }
+  }
+
+  function tokenSGMLComment(stream, state) {
+    var dashes = 0, ch;
+    while ((ch = stream.next()) != null) {
+      if (dashes >= 2 && ch == ">") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      dashes = (ch == "-") ? dashes + 1 : 0;
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return ret("string", "tag");
+    };
+  }
+
+  function inBlock(style, terminator) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.match(terminator)) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        stream.next();
+      }
+      return style;
+    };
+  }
+
+  return {
+    startState: function(base) {
+      return {tokenize: tokenBase,
+              baseIndent: base || 0,
+              stack: []};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+
+      var context = state.stack[state.stack.length-1];
+      if (stream.current() == "[" || type === "doindent" || type == "[") state.stack.push("rule");
+      else if (type === "endtag") state.stack[state.stack.length-1] = "endtag";
+      else if (stream.current() == "]" || type == "]" || (type == ">" && context == "rule")) state.stack.pop();
+      else if (type == "[") state.stack.push("[");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var n = state.stack.length;
+
+      if( textAfter.match(/\]\s+|\]/) )n=n-1;
+      else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
+        if(textAfter.substr(0,1) === "<") {}
+        else if( type == "doindent" && textAfter.length > 1 ) {}
+        else if( type == "doindent")n--;
+        else if( type == ">" && textAfter.length > 1) {}
+        else if( type == "tag" && textAfter !== ">") {}
+        else if( type == "tag" && state.stack[state.stack.length-1] == "rule")n--;
+        else if( type == "tag")n++;
+        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule" && type === ">")n--;
+        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule") {}
+        else if( textAfter.substr(0,1) !== "<" && textAfter.substr(0,1) === ">" )n=n-1;
+        else if( textAfter === ">") {}
+        else n=n-1;
+        //over rule them all
+        if(type == null || type == "]")n--;
+      }
+
+      return state.baseIndent + n * indentUnit;
+    },
+
+    electricChars: "]>"
+  };
+});
+
+CodeMirror.defineMIME("application/xml-dtd", "dtd");
+
+});
diff --git a/core/media/editors/codemirror/mode/dtd/dtd.min.js b/core/media/editors/codemirror/mode/dtd/dtd.min.js
new file mode 100644
index 00000000..f35de4d3
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dtd/dtd.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("dtd",(function(a){function b(a,b){return g=b,a}function c(a,c){var g=a.next();if("<"!=g||!a.eat("!")){if("<"==g&&a.eat("?"))return c.tokenize=f("meta","?>"),b("meta",g);if("#"==g&&a.eatWhile(/[\w]/))return b("atom","tag");if("|"==g)return b("keyword","seperator");if(g.match(/[\(\)\[\]\-\.,\+\?>]/))return b(null,g);if(g.match(/[\[\]]/))return b("rule",g);if('"'==g||"'"==g)return c.tokenize=e(g),c.tokenize(a,c);if(a.eatWhile(/[a-zA-Z\?\+\d]/)){var h=a.current();return null!==h.substr(h.length-1,h.length).match(/\?|\+/)&&a.backUp(1),b("tag","tag")}return"%"==g||"*"==g?b("number","number"):(a.eatWhile(/[\w\\\-_%.{,]/),b(null,null))}return a.eatWhile(/[\-]/)?(c.tokenize=d,d(a,c)):a.eatWhile(/[\w]/)?b("keyword","doindent"):void 0}function d(a,d){for(var e,f=0;null!=(e=a.next());){if(f>=2&&">"==e){d.tokenize=c;break}f="-"==e?f+1:0}return b("comment","comment")}function e(a){return function(d,e){for(var f,g=!1;null!=(f=d.next());){if(f==a&&!g){e.tokenize=c;break}g=!g&&"\\"==f}return b("string","tag")}}function f(a,b){return function(d,e){for(;!d.eol();){if(d.match(b)){e.tokenize=c;break}d.next()}return a}}var g,h=a.indentUnit;return{startState:function(a){return{tokenize:c,baseIndent:a||0,stack:[]}},token:function(a,b){if(a.eatSpace())return null;var c=b.tokenize(a,b),d=b.stack[b.stack.length-1];return"["==a.current()||"doindent"===g||"["==g?b.stack.push("rule"):"endtag"===g?b.stack[b.stack.length-1]="endtag":"]"==a.current()||"]"==g||">"==g&&"rule"==d?b.stack.pop():"["==g&&b.stack.push("["),c},indent:function(a,b){var c=a.stack.length;return b.match(/\]\s+|\]/)?c-=1:">"===b.substr(b.length-1,b.length)&&("<"===b.substr(0,1)||"doindent"==g&&b.length>1||("doindent"==g?c--:">"==g&&b.length>1||"tag"==g&&">"!==b||("tag"==g&&"rule"==a.stack[a.stack.length-1]?c--:"tag"==g?c++:">"===b&&"rule"==a.stack[a.stack.length-1]&&">"===g?c--:">"===b&&"rule"==a.stack[a.stack.length-1]||("<"!==b.substr(0,1)&&">"===b.substr(0,1)?c-=1:">"===b||(c-=1)))),null!=g&&"]"!=g||c--),a.baseIndent+c*h},electricChars:"]>"}})),a.defineMIME("application/xml-dtd","dtd")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/dylan/dylan.js b/core/media/editors/codemirror/mode/dylan/dylan.js
new file mode 100644
index 00000000..0acc1a38
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dylan/dylan.js
@@ -0,0 +1,352 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function forEach(arr, f) {
+  for (var i = 0; i < arr.length; i++) f(arr[i], i)
+}
+function some(arr, f) {
+  for (var i = 0; i < arr.length; i++) if (f(arr[i], i)) return true
+  return false
+}
+
+CodeMirror.defineMode("dylan", function(_config) {
+  // Words
+  var words = {
+    // Words that introduce unnamed definitions like "define interface"
+    unnamedDefinition: ["interface"],
+
+    // Words that introduce simple named definitions like "define library"
+    namedDefinition: ["module", "library", "macro",
+                      "C-struct", "C-union",
+                      "C-function", "C-callable-wrapper"
+                     ],
+
+    // Words that introduce type definitions like "define class".
+    // These are also parameterized like "define method" and are
+    // appended to otherParameterizedDefinitionWords
+    typeParameterizedDefinition: ["class", "C-subtype", "C-mapped-subtype"],
+
+    // Words that introduce trickier definitions like "define method".
+    // These require special definitions to be added to startExpressions
+    otherParameterizedDefinition: ["method", "function",
+                                   "C-variable", "C-address"
+                                  ],
+
+    // Words that introduce module constant definitions.
+    // These must also be simple definitions and are
+    // appended to otherSimpleDefinitionWords
+    constantSimpleDefinition: ["constant"],
+
+    // Words that introduce module variable definitions.
+    // These must also be simple definitions and are
+    // appended to otherSimpleDefinitionWords
+    variableSimpleDefinition: ["variable"],
+
+    // Other words that introduce simple definitions
+    // (without implicit bodies).
+    otherSimpleDefinition: ["generic", "domain",
+                            "C-pointer-type",
+                            "table"
+                           ],
+
+    // Words that begin statements with implicit bodies.
+    statement: ["if", "block", "begin", "method", "case",
+                "for", "select", "when", "unless", "until",
+                "while", "iterate", "profiling", "dynamic-bind"
+               ],
+
+    // Patterns that act as separators in compound statements.
+    // This may include any general pattern that must be indented
+    // specially.
+    separator: ["finally", "exception", "cleanup", "else",
+                "elseif", "afterwards"
+               ],
+
+    // Keywords that do not require special indentation handling,
+    // but which should be highlighted
+    other: ["above", "below", "by", "from", "handler", "in",
+            "instance", "let", "local", "otherwise", "slot",
+            "subclass", "then", "to", "keyed-by", "virtual"
+           ],
+
+    // Condition signaling function calls
+    signalingCalls: ["signal", "error", "cerror",
+                     "break", "check-type", "abort"
+                    ]
+  };
+
+  words["otherDefinition"] =
+    words["unnamedDefinition"]
+    .concat(words["namedDefinition"])
+    .concat(words["otherParameterizedDefinition"]);
+
+  words["definition"] =
+    words["typeParameterizedDefinition"]
+    .concat(words["otherDefinition"]);
+
+  words["parameterizedDefinition"] =
+    words["typeParameterizedDefinition"]
+    .concat(words["otherParameterizedDefinition"]);
+
+  words["simpleDefinition"] =
+    words["constantSimpleDefinition"]
+    .concat(words["variableSimpleDefinition"])
+    .concat(words["otherSimpleDefinition"]);
+
+  words["keyword"] =
+    words["statement"]
+    .concat(words["separator"])
+    .concat(words["other"]);
+
+  // Patterns
+  var symbolPattern = "[-_a-zA-Z?!*@<>$%]+";
+  var symbol = new RegExp("^" + symbolPattern);
+  var patterns = {
+    // Symbols with special syntax
+    symbolKeyword: symbolPattern + ":",
+    symbolClass: "<" + symbolPattern + ">",
+    symbolGlobal: "\\*" + symbolPattern + "\\*",
+    symbolConstant: "\\$" + symbolPattern
+  };
+  var patternStyles = {
+    symbolKeyword: "atom",
+    symbolClass: "tag",
+    symbolGlobal: "variable-2",
+    symbolConstant: "variable-3"
+  };
+
+  // Compile all patterns to regular expressions
+  for (var patternName in patterns)
+    if (patterns.hasOwnProperty(patternName))
+      patterns[patternName] = new RegExp("^" + patterns[patternName]);
+
+  // Names beginning "with-" and "without-" are commonly
+  // used as statement macro
+  patterns["keyword"] = [/^with(?:out)?-[-_a-zA-Z?!*@<>$%]+/];
+
+  var styles = {};
+  styles["keyword"] = "keyword";
+  styles["definition"] = "def";
+  styles["simpleDefinition"] = "def";
+  styles["signalingCalls"] = "builtin";
+
+  // protected words lookup table
+  var wordLookup = {};
+  var styleLookup = {};
+
+  forEach([
+    "keyword",
+    "definition",
+    "simpleDefinition",
+    "signalingCalls"
+  ], function(type) {
+    forEach(words[type], function(word) {
+      wordLookup[word] = type;
+      styleLookup[word] = styles[type];
+    });
+  });
+
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    // String
+    var ch = stream.peek();
+    if (ch == "'" || ch == '"') {
+      stream.next();
+      return chain(stream, state, tokenString(ch, "string"));
+    }
+    // Comment
+    else if (ch == "/") {
+      stream.next();
+      if (stream.eat("*")) {
+        return chain(stream, state, tokenComment);
+      } else if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      stream.backUp(1);
+    }
+    // Decimal
+    else if (/[+\-\d\.]/.test(ch)) {
+      if (stream.match(/^[+-]?[0-9]*\.[0-9]*([esdx][+-]?[0-9]+)?/i) ||
+          stream.match(/^[+-]?[0-9]+([esdx][+-]?[0-9]+)/i) ||
+          stream.match(/^[+-]?\d+/)) {
+        return "number";
+      }
+    }
+    // Hash
+    else if (ch == "#") {
+      stream.next();
+      // Symbol with string syntax
+      ch = stream.peek();
+      if (ch == '"') {
+        stream.next();
+        return chain(stream, state, tokenString('"', "string"));
+      }
+      // Binary number
+      else if (ch == "b") {
+        stream.next();
+        stream.eatWhile(/[01]/);
+        return "number";
+      }
+      // Hex number
+      else if (ch == "x") {
+        stream.next();
+        stream.eatWhile(/[\da-f]/i);
+        return "number";
+      }
+      // Octal number
+      else if (ch == "o") {
+        stream.next();
+        stream.eatWhile(/[0-7]/);
+        return "number";
+      }
+      // Token concatenation in macros
+      else if (ch == '#') {
+        stream.next();
+        return "punctuation";
+      }
+      // Sequence literals
+      else if ((ch == '[') || (ch == '(')) {
+        stream.next();
+        return "bracket";
+      // Hash symbol
+      } else if (stream.match(/f|t|all-keys|include|key|next|rest/i)) {
+        return "atom";
+      } else {
+        stream.eatWhile(/[-a-zA-Z]/);
+        return "error";
+      }
+    } else if (ch == "~") {
+      stream.next();
+      ch = stream.peek();
+      if (ch == "=") {
+        stream.next();
+        ch = stream.peek();
+        if (ch == "=") {
+          stream.next();
+          return "operator";
+        }
+        return "operator";
+      }
+      return "operator";
+    } else if (ch == ":") {
+      stream.next();
+      ch = stream.peek();
+      if (ch == "=") {
+        stream.next();
+        return "operator";
+      } else if (ch == ":") {
+        stream.next();
+        return "punctuation";
+      }
+    } else if ("[](){}".indexOf(ch) != -1) {
+      stream.next();
+      return "bracket";
+    } else if (".,".indexOf(ch) != -1) {
+      stream.next();
+      return "punctuation";
+    } else if (stream.match("end")) {
+      return "keyword";
+    }
+    for (var name in patterns) {
+      if (patterns.hasOwnProperty(name)) {
+        var pattern = patterns[name];
+        if ((pattern instanceof Array && some(pattern, function(p) {
+          return stream.match(p);
+        })) || stream.match(pattern))
+          return patternStyles[name];
+      }
+    }
+    if (/[+\-*\/^=<>&|]/.test(ch)) {
+      stream.next();
+      return "operator";
+    }
+    if (stream.match("define")) {
+      return "def";
+    } else {
+      stream.eatWhile(/[\w\-]/);
+      // Keyword
+      if (wordLookup.hasOwnProperty(stream.current())) {
+        return styleLookup[stream.current()];
+      } else if (stream.current().match(symbol)) {
+        return "variable";
+      } else {
+        stream.next();
+        return "variable-2";
+      }
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, maybeNested = false, nestedCount = 0, ch;
+    while ((ch = stream.next())) {
+      if (ch == "/" && maybeEnd) {
+        if (nestedCount > 0) {
+          nestedCount--;
+        } else {
+          state.tokenize = tokenBase;
+          break;
+        }
+      } else if (ch == "*" && maybeNested) {
+        nestedCount++;
+      }
+      maybeEnd = (ch == "*");
+      maybeNested = (ch == "/");
+    }
+    return "comment";
+  }
+
+  function tokenString(quote, style) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          end = true;
+          break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped) {
+        state.tokenize = tokenBase;
+      }
+      return style;
+    };
+  }
+
+  // Interface
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        currentIndent: 0
+      };
+    },
+    token: function(stream, state) {
+      if (stream.eatSpace())
+        return null;
+      var style = state.tokenize(stream, state);
+      return style;
+    },
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
+  };
+});
+
+CodeMirror.defineMIME("text/x-dylan", "dylan");
+
+});
diff --git a/core/media/editors/codemirror/mode/dylan/dylan.min.js b/core/media/editors/codemirror/mode/dylan/dylan.min.js
new file mode 100644
index 00000000..0779297a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/dylan/dylan.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){for(var c=0;c<a.length;c++)b(a[c],c)}function c(a,b){for(var c=0;c<a.length;c++)if(b(a[c],c))return!0;return!1}a.defineMode("dylan",(function(a){function d(a,b,c){return b.tokenize=c,c(a,b)}function e(a,b){var e=a.peek();if("'"==e||'"'==e)return a.next(),d(a,b,g(e,"string"));if("/"==e){if(a.next(),a.eat("*"))return d(a,b,f);if(a.eat("/"))return a.skipToEnd(),"comment";a.backUp(1)}else if(/[+\-\d\.]/.test(e)){if(a.match(/^[+-]?[0-9]*\.[0-9]*([esdx][+-]?[0-9]+)?/i)||a.match(/^[+-]?[0-9]+([esdx][+-]?[0-9]+)/i)||a.match(/^[+-]?\d+/))return"number"}else{if("#"==e)return a.next(),e=a.peek(),'"'==e?(a.next(),d(a,b,g('"',"string"))):"b"==e?(a.next(),a.eatWhile(/[01]/),"number"):"x"==e?(a.next(),a.eatWhile(/[\da-f]/i),"number"):"o"==e?(a.next(),a.eatWhile(/[0-7]/),"number"):"#"==e?(a.next(),"punctuation"):"["==e||"("==e?(a.next(),"bracket"):a.match(/f|t|all-keys|include|key|next|rest/i)?"atom":(a.eatWhile(/[-a-zA-Z]/),"error");if("~"==e)return a.next(),e=a.peek(),"="==e?(a.next(),e=a.peek(),"="==e?(a.next(),"operator"):"operator"):"operator";if(":"==e){if(a.next(),e=a.peek(),"="==e)return a.next(),"operator";if(":"==e)return a.next(),"punctuation"}else{if("[](){}".indexOf(e)!=-1)return a.next(),"bracket";if(".,".indexOf(e)!=-1)return a.next(),"punctuation";if(a.match("end"))return"keyword"}}for(var h in k)if(k.hasOwnProperty(h)){var i=k[h];if(i instanceof Array&&c(i,(function(b){return a.match(b)}))||a.match(i))return l[h]}return/[+\-*\/^=<>&|]/.test(e)?(a.next(),"operator"):a.match("define")?"def":(a.eatWhile(/[\w\-]/),o.hasOwnProperty(a.current())?p[a.current()]:a.current().match(j)?"variable":(a.next(),"variable-2"))}function f(a,b){for(var c,d=!1,f=!1,g=0;c=a.next();){if("/"==c&&d){if(!(g>0)){b.tokenize=e;break}g--}else"*"==c&&f&&g++;d="*"==c,f="/"==c}return"comment"}function g(a,b){return function(c,d){for(var f,g=!1,h=!1;null!=(f=c.next());){if(f==a&&!g){h=!0;break}g=!g&&"\\"==f}return!h&&g||(d.tokenize=e),b}}var h={unnamedDefinition:["interface"],namedDefinition:["module","library","macro","C-struct","C-union","C-function","C-callable-wrapper"],typeParameterizedDefinition:["class","C-subtype","C-mapped-subtype"],otherParameterizedDefinition:["method","function","C-variable","C-address"],constantSimpleDefinition:["constant"],variableSimpleDefinition:["variable"],otherSimpleDefinition:["generic","domain","C-pointer-type","table"],statement:["if","block","begin","method","case","for","select","when","unless","until","while","iterate","profiling","dynamic-bind"],separator:["finally","exception","cleanup","else","elseif","afterwards"],other:["above","below","by","from","handler","in","instance","let","local","otherwise","slot","subclass","then","to","keyed-by","virtual"],signalingCalls:["signal","error","cerror","break","check-type","abort"]};h.otherDefinition=h.unnamedDefinition.concat(h.namedDefinition).concat(h.otherParameterizedDefinition),h.definition=h.typeParameterizedDefinition.concat(h.otherDefinition),h.parameterizedDefinition=h.typeParameterizedDefinition.concat(h.otherParameterizedDefinition),h.simpleDefinition=h.constantSimpleDefinition.concat(h.variableSimpleDefinition).concat(h.otherSimpleDefinition),h.keyword=h.statement.concat(h.separator).concat(h.other);var i="[-_a-zA-Z?!*@<>$%]+",j=new RegExp("^"+i),k={symbolKeyword:i+":",symbolClass:"<"+i+">",symbolGlobal:"\\*"+i+"\\*",symbolConstant:"\\$"+i},l={symbolKeyword:"atom",symbolClass:"tag",symbolGlobal:"variable-2",symbolConstant:"variable-3"};for(var m in k)k.hasOwnProperty(m)&&(k[m]=new RegExp("^"+k[m]));k.keyword=[/^with(?:out)?-[-_a-zA-Z?!*@<>$%]+/];var n={};n.keyword="keyword",n.definition="def",n.simpleDefinition="def",n.signalingCalls="builtin";var o={},p={};return b(["keyword","definition","simpleDefinition","signalingCalls"],(function(a){b(h[a],(function(b){o[b]=a,p[b]=n[a]}))})),{startState:function(){return{tokenize:e,currentIndent:0}},token:function(a,b){if(a.eatSpace())return null;var c=b.tokenize(a,b);return c},blockCommentStart:"/*",blockCommentEnd:"*/"}})),a.defineMIME("text/x-dylan","dylan")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ebnf/ebnf.js b/core/media/editors/codemirror/mode/ebnf/ebnf.js
new file mode 100644
index 00000000..9618f8e4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ebnf/ebnf.js
@@ -0,0 +1,195 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("ebnf", function (config) {
+    var commentType = {slash: 0, parenthesis: 1};
+    var stateType = {comment: 0, _string: 1, characterClass: 2};
+    var bracesMode = null;
+
+    if (config.bracesMode)
+      bracesMode = CodeMirror.getMode(config, config.bracesMode);
+
+    return {
+      startState: function () {
+        return {
+          stringType: null,
+          commentType: null,
+          braced: 0,
+          lhs: true,
+          localState: null,
+          stack: [],
+          inDefinition: false
+        };
+      },
+      token: function (stream, state) {
+        if (!stream) return;
+
+        //check for state changes
+        if (state.stack.length === 0) {
+          //strings
+          if ((stream.peek() == '"') || (stream.peek() == "'")) {
+            state.stringType = stream.peek();
+            stream.next(); // Skip quote
+            state.stack.unshift(stateType._string);
+          } else if (stream.match(/^\/\*/)) { //comments starting with /*
+            state.stack.unshift(stateType.comment);
+            state.commentType = commentType.slash;
+          } else if (stream.match(/^\(\*/)) { //comments starting with (*
+            state.stack.unshift(stateType.comment);
+            state.commentType = commentType.parenthesis;
+          }
+        }
+
+        //return state
+        //stack has
+        switch (state.stack[0]) {
+        case stateType._string:
+          while (state.stack[0] === stateType._string && !stream.eol()) {
+            if (stream.peek() === state.stringType) {
+              stream.next(); // Skip quote
+              state.stack.shift(); // Clear flag
+            } else if (stream.peek() === "\\") {
+              stream.next();
+              stream.next();
+            } else {
+              stream.match(/^.[^\\\"\']*/);
+            }
+          }
+          return state.lhs ? "property string" : "string"; // Token style
+
+        case stateType.comment:
+          while (state.stack[0] === stateType.comment && !stream.eol()) {
+            if (state.commentType === commentType.slash && stream.match(/\*\//)) {
+              state.stack.shift(); // Clear flag
+              state.commentType = null;
+            } else if (state.commentType === commentType.parenthesis && stream.match(/\*\)/)) {
+              state.stack.shift(); // Clear flag
+              state.commentType = null;
+            } else {
+              stream.match(/^.[^\*]*/);
+            }
+          }
+          return "comment";
+
+        case stateType.characterClass:
+          while (state.stack[0] === stateType.characterClass && !stream.eol()) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+              state.stack.shift();
+            }
+          }
+          return "operator";
+        }
+
+        var peek = stream.peek();
+
+        if (bracesMode !== null && (state.braced || peek === "{")) {
+          if (state.localState === null)
+            state.localState = CodeMirror.startState(bracesMode);
+
+          var token = bracesMode.token(stream, state.localState),
+          text = stream.current();
+
+          if (!token) {
+            for (var i = 0; i < text.length; i++) {
+              if (text[i] === "{") {
+                if (state.braced === 0) {
+                  token = "matchingbracket";
+                }
+                state.braced++;
+              } else if (text[i] === "}") {
+                state.braced--;
+                if (state.braced === 0) {
+                  token = "matchingbracket";
+                }
+              }
+            }
+          }
+          return token;
+        }
+
+        //no stack
+        switch (peek) {
+        case "[":
+          stream.next();
+          state.stack.unshift(stateType.characterClass);
+          return "bracket";
+        case ":":
+        case "|":
+        case ";":
+          stream.next();
+          return "operator";
+        case "%":
+          if (stream.match("%%")) {
+            return "header";
+          } else if (stream.match(/[%][A-Za-z]+/)) {
+            return "keyword";
+          } else if (stream.match(/[%][}]/)) {
+            return "matchingbracket";
+          }
+          break;
+        case "/":
+          if (stream.match(/[\/][A-Za-z]+/)) {
+          return "keyword";
+        }
+        case "\\":
+          if (stream.match(/[\][a-z]+/)) {
+            return "string-2";
+          }
+        case ".":
+          if (stream.match(".")) {
+            return "atom";
+          }
+        case "*":
+        case "-":
+        case "+":
+        case "^":
+          if (stream.match(peek)) {
+            return "atom";
+          }
+        case "$":
+          if (stream.match("$$")) {
+            return "builtin";
+          } else if (stream.match(/[$][0-9]+/)) {
+            return "variable-3";
+          }
+        case "<":
+          if (stream.match(/<<[a-zA-Z_]+>>/)) {
+            return "builtin";
+          }
+        }
+
+        if (stream.match(/^\/\//)) {
+          stream.skipToEnd();
+          return "comment";
+        } else if (stream.match(/return/)) {
+          return "operator";
+        } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
+          if (stream.match(/(?=[\(.])/)) {
+            return "variable";
+          } else if (stream.match(/(?=[\s\n]*[:=])/)) {
+            return "def";
+          }
+          return "variable-2";
+        } else if (["[", "]", "(", ")"].indexOf(stream.peek()) != -1) {
+          stream.next();
+          return "bracket";
+        } else if (!stream.eatSpace()) {
+          stream.next();
+        }
+        return null;
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-ebnf", "ebnf");
+});
diff --git a/core/media/editors/codemirror/mode/ebnf/ebnf.min.js b/core/media/editors/codemirror/mode/ebnf/ebnf.min.js
new file mode 100644
index 00000000..8d600179
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ebnf/ebnf.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("ebnf",(function(b){var c={slash:0,parenthesis:1},d={comment:0,_string:1,characterClass:2},e=null;return b.bracesMode&&(e=a.getMode(b,b.bracesMode)),{startState:function(){return{stringType:null,commentType:null,braced:0,lhs:!0,localState:null,stack:[],inDefinition:!1}},token:function(b,f){if(b){switch(0===f.stack.length&&('"'==b.peek()||"'"==b.peek()?(f.stringType=b.peek(),b.next(),f.stack.unshift(d._string)):b.match(/^\/\*/)?(f.stack.unshift(d.comment),f.commentType=c.slash):b.match(/^\(\*/)&&(f.stack.unshift(d.comment),f.commentType=c.parenthesis)),f.stack[0]){case d._string:for(;f.stack[0]===d._string&&!b.eol();)b.peek()===f.stringType?(b.next(),f.stack.shift()):"\\"===b.peek()?(b.next(),b.next()):b.match(/^.[^\\\"\']*/);return f.lhs?"property string":"string";case d.comment:for(;f.stack[0]===d.comment&&!b.eol();)f.commentType===c.slash&&b.match(/\*\//)?(f.stack.shift(),f.commentType=null):f.commentType===c.parenthesis&&b.match(/\*\)/)?(f.stack.shift(),f.commentType=null):b.match(/^.[^\*]*/);return"comment";case d.characterClass:for(;f.stack[0]===d.characterClass&&!b.eol();)b.match(/^[^\]\\]+/)||b.match(/^\\./)||f.stack.shift();return"operator"}var g=b.peek();if(null!==e&&(f.braced||"{"===g)){null===f.localState&&(f.localState=a.startState(e));var h=e.token(b,f.localState),i=b.current();if(!h)for(var j=0;j<i.length;j++)"{"===i[j]?(0===f.braced&&(h="matchingbracket"),f.braced++):"}"===i[j]&&(f.braced--,0===f.braced&&(h="matchingbracket"));return h}switch(g){case"[":return b.next(),f.stack.unshift(d.characterClass),"bracket";case":":case"|":case";":return b.next(),"operator";case"%":if(b.match("%%"))return"header";if(b.match(/[%][A-Za-z]+/))return"keyword";if(b.match(/[%][}]/))return"matchingbracket";break;case"/":if(b.match(/[\/][A-Za-z]+/))return"keyword";case"\\":if(b.match(/[\][a-z]+/))return"string-2";case".":if(b.match("."))return"atom";case"*":case"-":case"+":case"^":if(b.match(g))return"atom";case"$":if(b.match("$$"))return"builtin";if(b.match(/[$][0-9]+/))return"variable-3";case"<":if(b.match(/<<[a-zA-Z_]+>>/))return"builtin"}return b.match(/^\/\//)?(b.skipToEnd(),"comment"):b.match(/return/)?"operator":b.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)?b.match(/(?=[\(.])/)?"variable":b.match(/(?=[\s\n]*[:=])/)?"def":"variable-2":["[","]","(",")"].indexOf(b.peek())!=-1?(b.next(),"bracket"):(b.eatSpace()||b.next(),null)}}}})),a.defineMIME("text/x-ebnf","ebnf")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ecl/ecl.js b/core/media/editors/codemirror/mode/ecl/ecl.js
new file mode 100644
index 00000000..8df7ebe4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ecl/ecl.js
@@ -0,0 +1,206 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("ecl", function(config) {
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  function metaHook(stream, state) {
+    if (!state.startOfLine) return false;
+    stream.skipToEnd();
+    return "meta";
+  }
+
+  var indentUnit = config.indentUnit;
+  var keyword = words("abs acos allnodes ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize combine correlation cos cosh count covariance cron dataset dedup define denormalize distribute distributed distribution ebcdic enth error evaluate event eventextra eventname exists exp failcode failmessage fetch fromunicode getisvalid global graph group hash hash32 hash64 hashcrc hashmd5 having if index intformat isvalid iterate join keyunicode length library limit ln local log loop map matched matchlength matchposition matchtext matchunicode max merge mergejoin min nolocal nonempty normalize parse pipe power preload process project pull random range rank ranked realformat recordof regexfind regexreplace regroup rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt stepped stored sum table tan tanh thisnode topn tounicode transfer trim truncate typeof ungroup unicodeorder variance which workunit xmldecode xmlencode xmltext xmlunicode");
+  var variable = words("apply assert build buildindex evaluate fail keydiff keypatch loadxml nothor notify output parallel sequential soapcall wait");
+  var variable_2 = words("__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat from full function group header heading hole ifblock import in interface joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath");
+  var variable_3 = words("ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode");
+  var builtin = words("checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when");
+  var blockKeywords = words("catch class do else finally for if switch try while");
+  var atoms = words("true false null");
+  var hooks = {"#": metaHook};
+  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (hooks[ch]) {
+      var result = hooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    var cur = stream.current().toLowerCase();
+    if (keyword.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "keyword";
+    } else if (variable.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "variable";
+    } else if (variable_2.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "variable-2";
+    } else if (variable_3.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "variable-3";
+    } else if (builtin.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "builtin";
+    } else { //Data types are of from KEYWORD##
+                var i = cur.length - 1;
+                while(i >= 0 && (!isNaN(cur[i]) || cur[i] == '_'))
+                        --i;
+
+                if (i > 0) {
+                        var cur2 = cur.substr(0, i + 1);
+                if (variable_3.propertyIsEnumerable(cur2)) {
+                        if (blockKeywords.propertyIsEnumerable(cur2)) curPunc = "newstatement";
+                        return "variable-3";
+                }
+            }
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return null;
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped)
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      var closing = firstChar == ctx.type;
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "{}"
+  };
+});
+
+CodeMirror.defineMIME("text/x-ecl", "ecl");
+
+});
diff --git a/core/media/editors/codemirror/mode/ecl/ecl.min.js b/core/media/editors/codemirror/mode/ecl/ecl.min.js
new file mode 100644
index 00000000..bf8cf7de
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ecl/ecl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("ecl",(function(a){function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(a,b){return!!b.startOfLine&&(a.skipToEnd(),"meta")}function d(a,b){var c=a.next();if(s[c]){var d=s[c](a,b);if(d!==!1)return d}if('"'==c||"'"==c)return b.tokenize=e(c),b.tokenize(a,b);if(/[\[\]{}\(\),;\:\.]/.test(c))return j=c,null;if(/\d/.test(c))return a.eatWhile(/[\w\.]/),"number";if("/"==c){if(a.eat("*"))return b.tokenize=f,f(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(t.test(c))return a.eatWhile(t),"operator";a.eatWhile(/[\w\$_]/);var g=a.current().toLowerCase();if(l.propertyIsEnumerable(g))return q.propertyIsEnumerable(g)&&(j="newstatement"),"keyword";if(m.propertyIsEnumerable(g))return q.propertyIsEnumerable(g)&&(j="newstatement"),"variable";if(n.propertyIsEnumerable(g))return q.propertyIsEnumerable(g)&&(j="newstatement"),"variable-2";if(o.propertyIsEnumerable(g))return q.propertyIsEnumerable(g)&&(j="newstatement"),"variable-3";if(p.propertyIsEnumerable(g))return q.propertyIsEnumerable(g)&&(j="newstatement"),"builtin";for(var h=g.length-1;h>=0&&(!isNaN(g[h])||"_"==g[h]);)--h;if(h>0){var i=g.substr(0,h+1);if(o.propertyIsEnumerable(i))return q.propertyIsEnumerable(i)&&(j="newstatement"),"variable-3"}return r.propertyIsEnumerable(g)?"atom":null}function e(a){return function(b,c){for(var e,f=!1,g=!1;null!=(e=b.next());){if(e==a&&!f){g=!0;break}f=!f&&"\\"==e}return!g&&f||(c.tokenize=d),"string"}}function f(a,b){for(var c,e=!1;c=a.next();){if("/"==c&&e){b.tokenize=d;break}e="*"==c}return"comment"}function g(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function h(a,b,c){return a.context=new g(a.indented,b,c,null,a.context)}function i(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var j,k=a.indentUnit,l=b("abs acos allnodes ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize combine correlation cos cosh count covariance cron dataset dedup define denormalize distribute distributed distribution ebcdic enth error evaluate event eventextra eventname exists exp failcode failmessage fetch fromunicode getisvalid global graph group hash hash32 hash64 hashcrc hashmd5 having if index intformat isvalid iterate join keyunicode length library limit ln local log loop map matched matchlength matchposition matchtext matchunicode max merge mergejoin min nolocal nonempty normalize parse pipe power preload process project pull random range rank ranked realformat recordof regexfind regexreplace regroup rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt stepped stored sum table tan tanh thisnode topn tounicode transfer trim truncate typeof ungroup unicodeorder variance which workunit xmldecode xmlencode xmltext xmlunicode"),m=b("apply assert build buildindex evaluate fail keydiff keypatch loadxml nothor notify output parallel sequential soapcall wait"),n=b("__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat from full function group header heading hole ifblock import in interface joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath"),o=b("ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode"),p=b("checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when"),q=b("catch class do else finally for if switch try while"),r=b("true false null"),s={"#":c},t=/[+\-*&%=<>!?|\/]/;return{startState:function(a){return{tokenize:null,context:new g((a||0)-k,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;j=null;var e=(b.tokenize||d)(a,b);if("comment"==e||"meta"==e)return e;if(null==c.align&&(c.align=!0),";"!=j&&":"!=j||"statement"!=c.type)if("{"==j)h(b,a.column(),"}");else if("["==j)h(b,a.column(),"]");else if("("==j)h(b,a.column(),")");else if("}"==j){for(;"statement"==c.type;)c=i(b);for("}"==c.type&&(c=i(b));"statement"==c.type;)c=i(b)}else j==c.type?i(b):("}"==c.type||"top"==c.type||"statement"==c.type&&"newstatement"==j)&&h(b,a.column(),"statement");else i(b);return b.startOfLine=!1,e},indent:function(a,b){if(a.tokenize!=d&&null!=a.tokenize)return 0;var c=a.context,e=b&&b.charAt(0);"statement"==c.type&&"}"==e&&(c=c.prev);var f=e==c.type;return"statement"==c.type?c.indented+("{"==e?0:k):c.align?c.column+(f?0:1):c.indented+(f?0:k)},electricChars:"{}"}})),a.defineMIME("text/x-ecl","ecl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/eiffel/eiffel.js b/core/media/editors/codemirror/mode/eiffel/eiffel.js
new file mode 100644
index 00000000..b8b70e36
--- /dev/null
+++ b/core/media/editors/codemirror/mode/eiffel/eiffel.js
@@ -0,0 +1,160 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("eiffel", function() {
+  function wordObj(words) {
+    var o = {};
+    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+    return o;
+  }
+  var keywords = wordObj([
+    'note',
+    'across',
+    'when',
+    'variant',
+    'until',
+    'unique',
+    'undefine',
+    'then',
+    'strip',
+    'select',
+    'retry',
+    'rescue',
+    'require',
+    'rename',
+    'reference',
+    'redefine',
+    'prefix',
+    'once',
+    'old',
+    'obsolete',
+    'loop',
+    'local',
+    'like',
+    'is',
+    'inspect',
+    'infix',
+    'include',
+    'if',
+    'frozen',
+    'from',
+    'external',
+    'export',
+    'ensure',
+    'end',
+    'elseif',
+    'else',
+    'do',
+    'creation',
+    'create',
+    'check',
+    'alias',
+    'agent',
+    'separate',
+    'invariant',
+    'inherit',
+    'indexing',
+    'feature',
+    'expanded',
+    'deferred',
+    'class',
+    'Void',
+    'True',
+    'Result',
+    'Precursor',
+    'False',
+    'Current',
+    'create',
+    'attached',
+    'detachable',
+    'as',
+    'and',
+    'implies',
+    'not',
+    'or'
+  ]);
+  var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
+
+  function chain(newtok, stream, state) {
+    state.tokenize.push(newtok);
+    return newtok(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    if (stream.eatSpace()) return null;
+    var ch = stream.next();
+    if (ch == '"'||ch == "'") {
+      return chain(readQuoted(ch, "string"), stream, state);
+    } else if (ch == "-"&&stream.eat("-")) {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == ":"&&stream.eat("=")) {
+      return "operator";
+    } else if (/[0-9]/.test(ch)) {
+      stream.eatWhile(/[xXbBCc0-9\.]/);
+      stream.eat(/[\?\!]/);
+      return "ident";
+    } else if (/[a-zA-Z_0-9]/.test(ch)) {
+      stream.eatWhile(/[a-zA-Z_0-9]/);
+      stream.eat(/[\?\!]/);
+      return "ident";
+    } else if (/[=+\-\/*^%<>~]/.test(ch)) {
+      stream.eatWhile(/[=+\-\/*^%<>~]/);
+      return "operator";
+    } else {
+      return null;
+    }
+  }
+
+  function readQuoted(quote, style,  unescaped) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && (unescaped || !escaped)) {
+          state.tokenize.pop();
+          break;
+        }
+        escaped = !escaped && ch == "%";
+      }
+      return style;
+    };
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: [tokenBase]};
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize[state.tokenize.length-1](stream, state);
+      if (style == "ident") {
+        var word = stream.current();
+        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+          : operators.propertyIsEnumerable(stream.current()) ? "operator"
+          : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag"
+          : /^0[bB][0-1]+$/g.test(word) ? "number"
+          : /^0[cC][0-7]+$/g.test(word) ? "number"
+          : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number"
+          : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number"
+          : /^[0-9]+$/g.test(word) ? "number"
+          : "variable";
+      }
+      return style;
+    },
+    lineComment: "--"
+  };
+});
+
+CodeMirror.defineMIME("text/x-eiffel", "eiffel");
+
+});
diff --git a/core/media/editors/codemirror/mode/eiffel/eiffel.min.js b/core/media/editors/codemirror/mode/eiffel/eiffel.min.js
new file mode 100644
index 00000000..0eedc2e5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/eiffel/eiffel.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("eiffel",(function(){function a(a){for(var b={},c=0,d=a.length;c<d;++c)b[a[c]]=!0;return b}function b(a,b,c){return c.tokenize.push(a),a(b,c)}function c(a,c){if(a.eatSpace())return null;var e=a.next();return'"'==e||"'"==e?b(d(e,"string"),a,c):"-"==e&&a.eat("-")?(a.skipToEnd(),"comment"):":"==e&&a.eat("=")?"operator":/[0-9]/.test(e)?(a.eatWhile(/[xXbBCc0-9\.]/),a.eat(/[\?\!]/),"ident"):/[a-zA-Z_0-9]/.test(e)?(a.eatWhile(/[a-zA-Z_0-9]/),a.eat(/[\?\!]/),"ident"):/[=+\-\/*^%<>~]/.test(e)?(a.eatWhile(/[=+\-\/*^%<>~]/),"operator"):null}function d(a,b,c){return function(d,e){for(var f,g=!1;null!=(f=d.next());){if(f==a&&(c||!g)){e.tokenize.pop();break}g=!g&&"%"==f}return b}}var e=a(["note","across","when","variant","until","unique","undefine","then","strip","select","retry","rescue","require","rename","reference","redefine","prefix","once","old","obsolete","loop","local","like","is","inspect","infix","include","if","frozen","from","external","export","ensure","end","elseif","else","do","creation","create","check","alias","agent","separate","invariant","inherit","indexing","feature","expanded","deferred","class","Void","True","Result","Precursor","False","Current","create","attached","detachable","as","and","implies","not","or"]),f=a([":=","and then","and","or","<<",">>"]);return{startState:function(){return{tokenize:[c]}},token:function(a,b){var c=b.tokenize[b.tokenize.length-1](a,b);if("ident"==c){var d=a.current();c=e.propertyIsEnumerable(a.current())?"keyword":f.propertyIsEnumerable(a.current())?"operator":/^[A-Z][A-Z_0-9]*$/g.test(d)?"tag":/^0[bB][0-1]+$/g.test(d)?"number":/^0[cC][0-7]+$/g.test(d)?"number":/^0[xX][a-fA-F0-9]+$/g.test(d)?"number":/^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(d)?"number":/^[0-9]+$/g.test(d)?"number":"variable"}return c},lineComment:"--"}})),a.defineMIME("text/x-eiffel","eiffel")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/elm/elm.js b/core/media/editors/codemirror/mode/elm/elm.js
new file mode 100644
index 00000000..9fcfc883
--- /dev/null
+++ b/core/media/editors/codemirror/mode/elm/elm.js
@@ -0,0 +1,205 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("elm", function() {
+
+    function switchState(source, setState, f) {
+      setState(f);
+      return f(source, setState);
+    }
+
+    // These should all be Unicode extended, as per the Haskell 2010 report
+    var smallRE = /[a-z_]/;
+    var largeRE = /[A-Z]/;
+    var digitRE = /[0-9]/;
+    var hexitRE = /[0-9A-Fa-f]/;
+    var octitRE = /[0-7]/;
+    var idRE = /[a-z_A-Z0-9\']/;
+    var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/;
+    var specialRE = /[(),;[\]`{}]/;
+    var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
+
+    function normal() {
+      return function (source, setState) {
+        if (source.eatWhile(whiteCharRE)) {
+          return null;
+        }
+
+        var ch = source.next();
+        if (specialRE.test(ch)) {
+          if (ch == '{' && source.eat('-')) {
+            var t = "comment";
+            if (source.eat('#')) t = "meta";
+            return switchState(source, setState, ncomment(t, 1));
+          }
+          return null;
+        }
+
+        if (ch == '\'') {
+          if (source.eat('\\'))
+            source.next();  // should handle other escapes here
+          else
+            source.next();
+
+          if (source.eat('\''))
+            return "string";
+          return "error";
+        }
+
+        if (ch == '"') {
+          return switchState(source, setState, stringLiteral);
+        }
+
+        if (largeRE.test(ch)) {
+          source.eatWhile(idRE);
+          if (source.eat('.'))
+            return "qualifier";
+          return "variable-2";
+        }
+
+        if (smallRE.test(ch)) {
+          var isDef = source.pos === 1;
+          source.eatWhile(idRE);
+          return isDef ? "type" : "variable";
+        }
+
+        if (digitRE.test(ch)) {
+          if (ch == '0') {
+            if (source.eat(/[xX]/)) {
+              source.eatWhile(hexitRE); // should require at least 1
+              return "integer";
+            }
+            if (source.eat(/[oO]/)) {
+              source.eatWhile(octitRE); // should require at least 1
+              return "number";
+            }
+          }
+          source.eatWhile(digitRE);
+          var t = "number";
+          if (source.eat('.')) {
+            t = "number";
+            source.eatWhile(digitRE); // should require at least 1
+          }
+          if (source.eat(/[eE]/)) {
+            t = "number";
+            source.eat(/[-+]/);
+            source.eatWhile(digitRE); // should require at least 1
+          }
+          return t;
+        }
+
+        if (symbolRE.test(ch)) {
+          if (ch == '-' && source.eat(/-/)) {
+            source.eatWhile(/-/);
+            if (!source.eat(symbolRE)) {
+              source.skipToEnd();
+              return "comment";
+            }
+          }
+          source.eatWhile(symbolRE);
+          return "builtin";
+        }
+
+        return "error";
+      }
+    }
+
+    function ncomment(type, nest) {
+      if (nest == 0) {
+        return normal();
+      }
+      return function(source, setState) {
+        var currNest = nest;
+        while (!source.eol()) {
+          var ch = source.next();
+          if (ch == '{' && source.eat('-')) {
+            ++currNest;
+          } else if (ch == '-' && source.eat('}')) {
+            --currNest;
+            if (currNest == 0) {
+              setState(normal());
+              return type;
+            }
+          }
+        }
+        setState(ncomment(type, currNest));
+        return type;
+      }
+    }
+
+    function stringLiteral(source, setState) {
+      while (!source.eol()) {
+        var ch = source.next();
+        if (ch == '"') {
+          setState(normal());
+          return "string";
+        }
+        if (ch == '\\') {
+          if (source.eol() || source.eat(whiteCharRE)) {
+            setState(stringGap);
+            return "string";
+          }
+          if (!source.eat('&')) source.next(); // should handle other escapes here
+        }
+      }
+      setState(normal());
+      return "error";
+    }
+
+    function stringGap(source, setState) {
+      if (source.eat('\\')) {
+        return switchState(source, setState, stringLiteral);
+      }
+      source.next();
+      setState(normal());
+      return "error";
+    }
+
+
+    var wellKnownWords = (function() {
+      var wkw = {};
+
+      var keywords = [
+        "case", "of", "as",
+        "if", "then", "else",
+        "let", "in",
+        "infix", "infixl", "infixr",
+        "type", "alias",
+        "input", "output", "foreign", "loopback",
+        "module", "where", "import", "exposing",
+        "_", "..", "|", ":", "=", "\\", "\"", "->", "<-"
+      ];
+
+      for (var i = keywords.length; i--;)
+        wkw[keywords[i]] = "keyword";
+
+      return wkw;
+    })();
+
+
+
+    return {
+      startState: function ()  { return { f: normal() }; },
+      copyState:  function (s) { return { f: s.f }; },
+
+      token: function(stream, state) {
+        var t = state.f(stream, function(s) { state.f = s; });
+        var w = stream.current();
+        return (wellKnownWords.hasOwnProperty(w)) ? wellKnownWords[w] : t;
+      }
+    };
+
+  });
+
+  CodeMirror.defineMIME("text/x-elm", "elm");
+});
diff --git a/core/media/editors/codemirror/mode/elm/elm.min.js b/core/media/editors/codemirror/mode/elm/elm.min.js
new file mode 100644
index 00000000..2635adb8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/elm/elm.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("elm",(function(){function a(a,b,c){return b(c),c(a,b)}function b(){return function(b,e){if(b.eatWhile(n))return null;var o=b.next();if(m.test(o)){if("{"==o&&b.eat("-")){var p="comment";return b.eat("#")&&(p="meta"),a(b,e,c(p,1))}return null}if("'"==o)return b.eat("\\")?b.next():b.next(),b.eat("'")?"string":"error";if('"'==o)return a(b,e,d);if(g.test(o))return b.eatWhile(k),b.eat(".")?"qualifier":"variable-2";if(f.test(o)){var q=1===b.pos;return b.eatWhile(k),q?"type":"variable"}if(h.test(o)){if("0"==o){if(b.eat(/[xX]/))return b.eatWhile(i),"integer";if(b.eat(/[oO]/))return b.eatWhile(j),"number"}b.eatWhile(h);var p="number";return b.eat(".")&&(p="number",b.eatWhile(h)),b.eat(/[eE]/)&&(p="number",b.eat(/[-+]/),b.eatWhile(h)),p}return l.test(o)?"-"==o&&b.eat(/-/)&&(b.eatWhile(/-/),!b.eat(l))?(b.skipToEnd(),"comment"):(b.eatWhile(l),"builtin"):"error"}}function c(a,d){return 0==d?b():function(e,f){for(var g=d;!e.eol();){var h=e.next();if("{"==h&&e.eat("-"))++g;else if("-"==h&&e.eat("}")&&(--g,0==g))return f(b()),a}return f(c(a,g)),a}}function d(a,c){for(;!a.eol();){var d=a.next();if('"'==d)return c(b()),"string";if("\\"==d){if(a.eol()||a.eat(n))return c(e),"string";a.eat("&")||a.next()}}return c(b()),"error"}function e(c,e){return c.eat("\\")?a(c,e,d):(c.next(),e(b()),"error")}var f=/[a-z_]/,g=/[A-Z]/,h=/[0-9]/,i=/[0-9A-Fa-f]/,j=/[0-7]/,k=/[a-z_A-Z0-9\']/,l=/[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/,m=/[(),;[\]`{}]/,n=/[ \t\v\f]/,o=(function(){for(var a={},b=["case","of","as","if","then","else","let","in","infix","infixl","infixr","type","alias","input","output","foreign","loopback","module","where","import","exposing","_","..","|",":","=","\\",'"',"->","<-"],c=b.length;c--;)a[b[c]]="keyword";return a})();return{startState:function(){return{f:b()}},copyState:function(a){return{f:a.f}},token:function(a,b){var c=b.f(a,(function(a){b.f=a})),d=a.current();return o.hasOwnProperty(d)?o[d]:c}}})),a.defineMIME("text/x-elm","elm")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/erlang/erlang.js b/core/media/editors/codemirror/mode/erlang/erlang.js
new file mode 100644
index 00000000..9528e19f
--- /dev/null
+++ b/core/media/editors/codemirror/mode/erlang/erlang.js
@@ -0,0 +1,619 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*jshint unused:true, eqnull:true, curly:true, bitwise:true */
+/*jshint undef:true, latedef:true, trailing:true */
+/*global CodeMirror:true */
+
+// erlang mode.
+// tokenizer -> token types -> CodeMirror styles
+// tokenizer maintains a parse stack
+// indenter uses the parse stack
+
+// TODO indenter:
+//   bit syntax
+//   old guard/bif/conversion clashes (e.g. "float/1")
+//   type/spec/opaque
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMIME("text/x-erlang", "erlang");
+
+CodeMirror.defineMode("erlang", function(cmCfg) {
+  "use strict";
+
+/////////////////////////////////////////////////////////////////////////////
+// constants
+
+  var typeWords = [
+    "-type", "-spec", "-export_type", "-opaque"];
+
+  var keywordWords = [
+    "after","begin","catch","case","cond","end","fun","if",
+    "let","of","query","receive","try","when"];
+
+  var separatorRE    = /[\->,;]/;
+  var separatorWords = [
+    "->",";",","];
+
+  var operatorAtomWords = [
+    "and","andalso","band","bnot","bor","bsl","bsr","bxor",
+    "div","not","or","orelse","rem","xor"];
+
+  var operatorSymbolRE    = /[\+\-\*\/<>=\|:!]/;
+  var operatorSymbolWords = [
+    "=","+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
+
+  var openParenRE    = /[<\(\[\{]/;
+  var openParenWords = [
+    "<<","(","[","{"];
+
+  var closeParenRE    = /[>\)\]\}]/;
+  var closeParenWords = [
+    "}","]",")",">>"];
+
+  var guardWords = [
+    "is_atom","is_binary","is_bitstring","is_boolean","is_float",
+    "is_function","is_integer","is_list","is_number","is_pid",
+    "is_port","is_record","is_reference","is_tuple",
+    "atom","binary","bitstring","boolean","function","integer","list",
+    "number","pid","port","record","reference","tuple"];
+
+  var bifWords = [
+    "abs","adler32","adler32_combine","alive","apply","atom_to_binary",
+    "atom_to_list","binary_to_atom","binary_to_existing_atom",
+    "binary_to_list","binary_to_term","bit_size","bitstring_to_list",
+    "byte_size","check_process_code","contact_binary","crc32",
+    "crc32_combine","date","decode_packet","delete_module",
+    "disconnect_node","element","erase","exit","float","float_to_list",
+    "garbage_collect","get","get_keys","group_leader","halt","hd",
+    "integer_to_list","internal_bif","iolist_size","iolist_to_binary",
+    "is_alive","is_atom","is_binary","is_bitstring","is_boolean",
+    "is_float","is_function","is_integer","is_list","is_number","is_pid",
+    "is_port","is_process_alive","is_record","is_reference","is_tuple",
+    "length","link","list_to_atom","list_to_binary","list_to_bitstring",
+    "list_to_existing_atom","list_to_float","list_to_integer",
+    "list_to_pid","list_to_tuple","load_module","make_ref","module_loaded",
+    "monitor_node","node","node_link","node_unlink","nodes","notalive",
+    "now","open_port","pid_to_list","port_close","port_command",
+    "port_connect","port_control","pre_loaded","process_flag",
+    "process_info","processes","purge_module","put","register",
+    "registered","round","self","setelement","size","spawn","spawn_link",
+    "spawn_monitor","spawn_opt","split_binary","statistics",
+    "term_to_binary","time","throw","tl","trunc","tuple_size",
+    "tuple_to_list","unlink","unregister","whereis"];
+
+// upper case: [A-Z] [Ø-Þ] [À-Ö]
+// lower case: [a-z] [ß-ö] [ø-ÿ]
+  var anumRE       = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
+  var escapesRE    =
+    /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;
+
+/////////////////////////////////////////////////////////////////////////////
+// tokenizer
+
+  function tokenizer(stream,state) {
+    // in multi-line string
+    if (state.in_string) {
+      state.in_string = (!doubleQuote(stream));
+      return rval(state,stream,"string");
+    }
+
+    // in multi-line atom
+    if (state.in_atom) {
+      state.in_atom = (!singleQuote(stream));
+      return rval(state,stream,"atom");
+    }
+
+    // whitespace
+    if (stream.eatSpace()) {
+      return rval(state,stream,"whitespace");
+    }
+
+    // attributes and type specs
+    if (!peekToken(state) &&
+        stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
+      if (is_member(stream.current(),typeWords)) {
+        return rval(state,stream,"type");
+      }else{
+        return rval(state,stream,"attribute");
+      }
+    }
+
+    var ch = stream.next();
+
+    // comment
+    if (ch == '%') {
+      stream.skipToEnd();
+      return rval(state,stream,"comment");
+    }
+
+    // colon
+    if (ch == ":") {
+      return rval(state,stream,"colon");
+    }
+
+    // macro
+    if (ch == '?') {
+      stream.eatSpace();
+      stream.eatWhile(anumRE);
+      return rval(state,stream,"macro");
+    }
+
+    // record
+    if (ch == "#") {
+      stream.eatSpace();
+      stream.eatWhile(anumRE);
+      return rval(state,stream,"record");
+    }
+
+    // dollar escape
+    if (ch == "$") {
+      if (stream.next() == "\\" && !stream.match(escapesRE)) {
+        return rval(state,stream,"error");
+      }
+      return rval(state,stream,"number");
+    }
+
+    // dot
+    if (ch == ".") {
+      return rval(state,stream,"dot");
+    }
+
+    // quoted atom
+    if (ch == '\'') {
+      if (!(state.in_atom = (!singleQuote(stream)))) {
+        if (stream.match(/\s*\/\s*[0-9]/,false)) {
+          stream.match(/\s*\/\s*[0-9]/,true);
+          return rval(state,stream,"fun");      // 'f'/0 style fun
+        }
+        if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
+          return rval(state,stream,"function");
+        }
+      }
+      return rval(state,stream,"atom");
+    }
+
+    // string
+    if (ch == '"') {
+      state.in_string = (!doubleQuote(stream));
+      return rval(state,stream,"string");
+    }
+
+    // variable
+    if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) {
+      stream.eatWhile(anumRE);
+      return rval(state,stream,"variable");
+    }
+
+    // atom/keyword/BIF/function
+    if (/[a-z_ß-öø-ÿ]/.test(ch)) {
+      stream.eatWhile(anumRE);
+
+      if (stream.match(/\s*\/\s*[0-9]/,false)) {
+        stream.match(/\s*\/\s*[0-9]/,true);
+        return rval(state,stream,"fun");      // f/0 style fun
+      }
+
+      var w = stream.current();
+
+      if (is_member(w,keywordWords)) {
+        return rval(state,stream,"keyword");
+      }else if (is_member(w,operatorAtomWords)) {
+        return rval(state,stream,"operator");
+      }else if (stream.match(/\s*\(/,false)) {
+        // 'put' and 'erlang:put' are bifs, 'foo:put' is not
+        if (is_member(w,bifWords) &&
+            ((peekToken(state).token != ":") ||
+             (peekToken(state,2).token == "erlang"))) {
+          return rval(state,stream,"builtin");
+        }else if (is_member(w,guardWords)) {
+          return rval(state,stream,"guard");
+        }else{
+          return rval(state,stream,"function");
+        }
+      }else if (lookahead(stream) == ":") {
+        if (w == "erlang") {
+          return rval(state,stream,"builtin");
+        } else {
+          return rval(state,stream,"function");
+        }
+      }else if (is_member(w,["true","false"])) {
+        return rval(state,stream,"boolean");
+      }else{
+        return rval(state,stream,"atom");
+      }
+    }
+
+    // number
+    var digitRE      = /[0-9]/;
+    var radixRE      = /[0-9a-zA-Z]/;         // 36#zZ style int
+    if (digitRE.test(ch)) {
+      stream.eatWhile(digitRE);
+      if (stream.eat('#')) {                // 36#aZ  style integer
+        if (!stream.eatWhile(radixRE)) {
+          stream.backUp(1);                 //"36#" - syntax error
+        }
+      } else if (stream.eat('.')) {       // float
+        if (!stream.eatWhile(digitRE)) {
+          stream.backUp(1);        // "3." - probably end of function
+        } else {
+          if (stream.eat(/[eE]/)) {        // float with exponent
+            if (stream.eat(/[-+]/)) {
+              if (!stream.eatWhile(digitRE)) {
+                stream.backUp(2);            // "2e-" - syntax error
+              }
+            } else {
+              if (!stream.eatWhile(digitRE)) {
+                stream.backUp(1);            // "2e" - syntax error
+              }
+            }
+          }
+        }
+      }
+      return rval(state,stream,"number");   // normal integer
+    }
+
+    // open parens
+    if (nongreedy(stream,openParenRE,openParenWords)) {
+      return rval(state,stream,"open_paren");
+    }
+
+    // close parens
+    if (nongreedy(stream,closeParenRE,closeParenWords)) {
+      return rval(state,stream,"close_paren");
+    }
+
+    // separators
+    if (greedy(stream,separatorRE,separatorWords)) {
+      return rval(state,stream,"separator");
+    }
+
+    // operators
+    if (greedy(stream,operatorSymbolRE,operatorSymbolWords)) {
+      return rval(state,stream,"operator");
+    }
+
+    return rval(state,stream,null);
+  }
+
+/////////////////////////////////////////////////////////////////////////////
+// utilities
+  function nongreedy(stream,re,words) {
+    if (stream.current().length == 1 && re.test(stream.current())) {
+      stream.backUp(1);
+      while (re.test(stream.peek())) {
+        stream.next();
+        if (is_member(stream.current(),words)) {
+          return true;
+        }
+      }
+      stream.backUp(stream.current().length-1);
+    }
+    return false;
+  }
+
+  function greedy(stream,re,words) {
+    if (stream.current().length == 1 && re.test(stream.current())) {
+      while (re.test(stream.peek())) {
+        stream.next();
+      }
+      while (0 < stream.current().length) {
+        if (is_member(stream.current(),words)) {
+          return true;
+        }else{
+          stream.backUp(1);
+        }
+      }
+      stream.next();
+    }
+    return false;
+  }
+
+  function doubleQuote(stream) {
+    return quote(stream, '"', '\\');
+  }
+
+  function singleQuote(stream) {
+    return quote(stream,'\'','\\');
+  }
+
+  function quote(stream,quoteChar,escapeChar) {
+    while (!stream.eol()) {
+      var ch = stream.next();
+      if (ch == quoteChar) {
+        return true;
+      }else if (ch == escapeChar) {
+        stream.next();
+      }
+    }
+    return false;
+  }
+
+  function lookahead(stream) {
+    var m = stream.match(/([\n\s]+|%[^\n]*\n)*(.)/,false);
+    return m ? m.pop() : "";
+  }
+
+  function is_member(element,list) {
+    return (-1 < list.indexOf(element));
+  }
+
+  function rval(state,stream,type) {
+
+    // parse stack
+    pushToken(state,realToken(type,stream));
+
+    // map erlang token type to CodeMirror style class
+    //     erlang             -> CodeMirror tag
+    switch (type) {
+      case "atom":        return "atom";
+      case "attribute":   return "attribute";
+      case "boolean":     return "atom";
+      case "builtin":     return "builtin";
+      case "close_paren": return null;
+      case "colon":       return null;
+      case "comment":     return "comment";
+      case "dot":         return null;
+      case "error":       return "error";
+      case "fun":         return "meta";
+      case "function":    return "tag";
+      case "guard":       return "property";
+      case "keyword":     return "keyword";
+      case "macro":       return "variable-2";
+      case "number":      return "number";
+      case "open_paren":  return null;
+      case "operator":    return "operator";
+      case "record":      return "bracket";
+      case "separator":   return null;
+      case "string":      return "string";
+      case "type":        return "def";
+      case "variable":    return "variable";
+      default:            return null;
+    }
+  }
+
+  function aToken(tok,col,ind,typ) {
+    return {token:  tok,
+            column: col,
+            indent: ind,
+            type:   typ};
+  }
+
+  function realToken(type,stream) {
+    return aToken(stream.current(),
+                 stream.column(),
+                 stream.indentation(),
+                 type);
+  }
+
+  function fakeToken(type) {
+    return aToken(type,0,0,type);
+  }
+
+  function peekToken(state,depth) {
+    var len = state.tokenStack.length;
+    var dep = (depth ? depth : 1);
+
+    if (len < dep) {
+      return false;
+    }else{
+      return state.tokenStack[len-dep];
+    }
+  }
+
+  function pushToken(state,token) {
+
+    if (!(token.type == "comment" || token.type == "whitespace")) {
+      state.tokenStack = maybe_drop_pre(state.tokenStack,token);
+      state.tokenStack = maybe_drop_post(state.tokenStack);
+    }
+  }
+
+  function maybe_drop_pre(s,token) {
+    var last = s.length-1;
+
+    if (0 < last && s[last].type === "record" && token.type === "dot") {
+      s.pop();
+    }else if (0 < last && s[last].type === "group") {
+      s.pop();
+      s.push(token);
+    }else{
+      s.push(token);
+    }
+    return s;
+  }
+
+  function maybe_drop_post(s) {
+    if (!s.length) return s
+    var last = s.length-1;
+
+    if (s[last].type === "dot") {
+      return [];
+    }
+    if (last > 1 && s[last].type === "fun" && s[last-1].token === "fun") {
+      return s.slice(0,last-1);
+    }
+    switch (s[last].token) {
+      case "}":    return d(s,{g:["{"]});
+      case "]":    return d(s,{i:["["]});
+      case ")":    return d(s,{i:["("]});
+      case ">>":   return d(s,{i:["<<"]});
+      case "end":  return d(s,{i:["begin","case","fun","if","receive","try"]});
+      case ",":    return d(s,{e:["begin","try","when","->",
+                                  ",","(","[","{","<<"]});
+      case "->":   return d(s,{r:["when"],
+                               m:["try","if","case","receive"]});
+      case ";":    return d(s,{E:["case","fun","if","receive","try","when"]});
+      case "catch":return d(s,{e:["try"]});
+      case "of":   return d(s,{e:["case"]});
+      case "after":return d(s,{e:["receive","try"]});
+      default:     return s;
+    }
+  }
+
+  function d(stack,tt) {
+    // stack is a stack of Token objects.
+    // tt is an object; {type:tokens}
+    // type is a char, tokens is a list of token strings.
+    // The function returns (possibly truncated) stack.
+    // It will descend the stack, looking for a Token such that Token.token
+    //  is a member of tokens. If it does not find that, it will normally (but
+    //  see "E" below) return stack. If it does find a match, it will remove
+    //  all the Tokens between the top and the matched Token.
+    // If type is "m", that is all it does.
+    // If type is "i", it will also remove the matched Token and the top Token.
+    // If type is "g", like "i", but add a fake "group" token at the top.
+    // If type is "r", it will remove the matched Token, but not the top Token.
+    // If type is "e", it will keep the matched Token but not the top Token.
+    // If type is "E", it behaves as for type "e", except if there is no match,
+    //  in which case it will return an empty stack.
+
+    for (var type in tt) {
+      var len = stack.length-1;
+      var tokens = tt[type];
+      for (var i = len-1; -1 < i ; i--) {
+        if (is_member(stack[i].token,tokens)) {
+          var ss = stack.slice(0,i);
+          switch (type) {
+              case "m": return ss.concat(stack[i]).concat(stack[len]);
+              case "r": return ss.concat(stack[len]);
+              case "i": return ss;
+              case "g": return ss.concat(fakeToken("group"));
+              case "E": return ss.concat(stack[i]);
+              case "e": return ss.concat(stack[i]);
+          }
+        }
+      }
+    }
+    return (type == "E" ? [] : stack);
+  }
+
+/////////////////////////////////////////////////////////////////////////////
+// indenter
+
+  function indenter(state,textAfter) {
+    var t;
+    var unit = cmCfg.indentUnit;
+    var wordAfter = wordafter(textAfter);
+    var currT = peekToken(state,1);
+    var prevT = peekToken(state,2);
+
+    if (state.in_string || state.in_atom) {
+      return CodeMirror.Pass;
+    }else if (!prevT) {
+      return 0;
+    }else if (currT.token == "when") {
+      return currT.column+unit;
+    }else if (wordAfter === "when" && prevT.type === "function") {
+      return prevT.indent+unit;
+    }else if (wordAfter === "(" && currT.token === "fun") {
+      return  currT.column+3;
+    }else if (wordAfter === "catch" && (t = getToken(state,["try"]))) {
+      return t.column;
+    }else if (is_member(wordAfter,["end","after","of"])) {
+      t = getToken(state,["begin","case","fun","if","receive","try"]);
+      return t ? t.column : CodeMirror.Pass;
+    }else if (is_member(wordAfter,closeParenWords)) {
+      t = getToken(state,openParenWords);
+      return t ? t.column : CodeMirror.Pass;
+    }else if (is_member(currT.token,[",","|","||"]) ||
+              is_member(wordAfter,[",","|","||"])) {
+      t = postcommaToken(state);
+      return t ? t.column+t.token.length : unit;
+    }else if (currT.token == "->") {
+      if (is_member(prevT.token, ["receive","case","if","try"])) {
+        return prevT.column+unit+unit;
+      }else{
+        return prevT.column+unit;
+      }
+    }else if (is_member(currT.token,openParenWords)) {
+      return currT.column+currT.token.length;
+    }else{
+      t = defaultToken(state);
+      return truthy(t) ? t.column+unit : 0;
+    }
+  }
+
+  function wordafter(str) {
+    var m = str.match(/,|[a-z]+|\}|\]|\)|>>|\|+|\(/);
+
+    return truthy(m) && (m.index === 0) ? m[0] : "";
+  }
+
+  function postcommaToken(state) {
+    var objs = state.tokenStack.slice(0,-1);
+    var i = getTokenIndex(objs,"type",["open_paren"]);
+
+    return truthy(objs[i]) ? objs[i] : false;
+  }
+
+  function defaultToken(state) {
+    var objs = state.tokenStack;
+    var stop = getTokenIndex(objs,"type",["open_paren","separator","keyword"]);
+    var oper = getTokenIndex(objs,"type",["operator"]);
+
+    if (truthy(stop) && truthy(oper) && stop < oper) {
+      return objs[stop+1];
+    } else if (truthy(stop)) {
+      return objs[stop];
+    } else {
+      return false;
+    }
+  }
+
+  function getToken(state,tokens) {
+    var objs = state.tokenStack;
+    var i = getTokenIndex(objs,"token",tokens);
+
+    return truthy(objs[i]) ? objs[i] : false;
+  }
+
+  function getTokenIndex(objs,propname,propvals) {
+
+    for (var i = objs.length-1; -1 < i ; i--) {
+      if (is_member(objs[i][propname],propvals)) {
+        return i;
+      }
+    }
+    return false;
+  }
+
+  function truthy(x) {
+    return (x !== false) && (x != null);
+  }
+
+/////////////////////////////////////////////////////////////////////////////
+// this object defines the mode
+
+  return {
+    startState:
+      function() {
+        return {tokenStack: [],
+                in_string:  false,
+                in_atom:    false};
+      },
+
+    token:
+      function(stream, state) {
+        return tokenizer(stream, state);
+      },
+
+    indent:
+      function(state, textAfter) {
+        return indenter(state,textAfter);
+      },
+
+    lineComment: "%"
+  };
+});
+
+});
diff --git a/core/media/editors/codemirror/mode/erlang/erlang.min.js b/core/media/editors/codemirror/mode/erlang/erlang.min.js
new file mode 100644
index 00000000..0b1656ed
--- /dev/null
+++ b/core/media/editors/codemirror/mode/erlang/erlang.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMIME("text/x-erlang","erlang"),a.defineMode("erlang",(function(b){function c(a,b){if(b.in_string)return b.in_string=!f(a),k(b,a,"string");if(b.in_atom)return b.in_atom=!g(a),k(b,a,"atom");if(a.eatSpace())return k(b,a,"whitespace");if(!o(b)&&a.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/))return j(a.current(),A)?k(b,a,"type"):k(b,a,"attribute");var c=a.next();if("%"==c)return a.skipToEnd(),k(b,a,"comment");if(":"==c)return k(b,a,"colon");if("?"==c)return a.eatSpace(),a.eatWhile(N),k(b,a,"macro");if("#"==c)return a.eatSpace(),a.eatWhile(N),k(b,a,"record");if("$"==c)return"\\"!=a.next()||a.match(O)?k(b,a,"number"):k(b,a,"error");if("."==c)return k(b,a,"dot");if("'"==c){if(!(b.in_atom=!g(a))){if(a.match(/\s*\/\s*[0-9]/,!1))return a.match(/\s*\/\s*[0-9]/,!0),k(b,a,"fun");if(a.match(/\s*\(/,!1)||a.match(/\s*:/,!1))return k(b,a,"function")}return k(b,a,"atom")}if('"'==c)return b.in_string=!f(a),k(b,a,"string");if(/[A-Z_Ø-ÞÀ-Ö]/.test(c))return a.eatWhile(N),k(b,a,"variable");if(/[a-z_ß-öø-ÿ]/.test(c)){if(a.eatWhile(N),a.match(/\s*\/\s*[0-9]/,!1))return a.match(/\s*\/\s*[0-9]/,!0),k(b,a,"fun");var h=a.current();return j(h,B)?k(b,a,"keyword"):j(h,E)?k(b,a,"operator"):a.match(/\s*\(/,!1)?!j(h,M)||":"==o(b).token&&"erlang"!=o(b,2).token?j(h,L)?k(b,a,"guard"):k(b,a,"function"):k(b,a,"builtin"):":"==i(a)?"erlang"==h?k(b,a,"builtin"):k(b,a,"function"):j(h,["true","false"])?k(b,a,"boolean"):k(b,a,"atom")}var l=/[0-9]/,m=/[0-9a-zA-Z]/;return l.test(c)?(a.eatWhile(l),a.eat("#")?a.eatWhile(m)||a.backUp(1):a.eat(".")&&(a.eatWhile(l)?a.eat(/[eE]/)&&(a.eat(/[-+]/)?a.eatWhile(l)||a.backUp(2):a.eatWhile(l)||a.backUp(1)):a.backUp(1)),k(b,a,"number")):d(a,H,I)?k(b,a,"open_paren"):d(a,J,K)?k(b,a,"close_paren"):e(a,C,D)?k(b,a,"separator"):e(a,F,G)?k(b,a,"operator"):k(b,a,null)}function d(a,b,c){if(1==a.current().length&&b.test(a.current())){for(a.backUp(1);b.test(a.peek());)if(a.next(),j(a.current(),c))return!0;a.backUp(a.current().length-1)}return!1}function e(a,b,c){if(1==a.current().length&&b.test(a.current())){for(;b.test(a.peek());)a.next();for(;0<a.current().length;){if(j(a.current(),c))return!0;a.backUp(1)}a.next()}return!1}function f(a){return h(a,'"',"\\")}function g(a){return h(a,"'","\\")}function h(a,b,c){for(;!a.eol();){var d=a.next();if(d==b)return!0;d==c&&a.next()}return!1}function i(a){var b=a.match(/([\n\s]+|%[^\n]*\n)*(.)/,!1);return b?b.pop():""}function j(a,b){return-1<b.indexOf(a)}function k(a,b,c){switch(p(a,m(c,b)),c){case"atom":return"atom";case"attribute":return"attribute";case"boolean":return"atom";case"builtin":return"builtin";case"close_paren":return null;case"colon":return null;case"comment":return"comment";case"dot":return null;case"error":return"error";case"fun":return"meta";case"function":return"tag";case"guard":return"property";case"keyword":return"keyword";case"macro":return"variable-2";case"number":return"number";case"open_paren":return null;case"operator":return"operator";case"record":return"bracket";case"separator":return null;case"string":return"string";case"type":return"def";case"variable":return"variable";default:return null}}function l(a,b,c,d){return{token:a,column:b,indent:c,type:d}}function m(a,b){return l(b.current(),b.column(),b.indentation(),a)}function n(a){return l(a,0,0,a)}function o(a,b){var c=a.tokenStack.length,d=b?b:1;return!(c<d)&&a.tokenStack[c-d]}function p(a,b){"comment"!=b.type&&"whitespace"!=b.type&&(a.tokenStack=q(a.tokenStack,b),a.tokenStack=r(a.tokenStack))}function q(a,b){var c=a.length-1;return 0<c&&"record"===a[c].type&&"dot"===b.type?a.pop():0<c&&"group"===a[c].type?(a.pop(),a.push(b)):a.push(b),a}function r(a){if(!a.length)return a;var b=a.length-1;if("dot"===a[b].type)return[];if(b>1&&"fun"===a[b].type&&"fun"===a[b-1].token)return a.slice(0,b-1);switch(a[b].token){case"}":return s(a,{g:["{"]});case"]":return s(a,{i:["["]});case")":return s(a,{i:["("]});case">>":return s(a,{i:["<<"]});case"end":return s(a,{i:["begin","case","fun","if","receive","try"]});case",":return s(a,{e:["begin","try","when","->",",","(","[","{","<<"]});case"->":return s(a,{r:["when"],m:["try","if","case","receive"]});case";":return s(a,{E:["case","fun","if","receive","try","when"]});case"catch":return s(a,{e:["try"]});case"of":return s(a,{e:["case"]});case"after":return s(a,{e:["receive","try"]});default:return a}}function s(a,b){for(var c in b)for(var d=a.length-1,e=b[c],f=d-1;-1<f;f--)if(j(a[f].token,e)){var g=a.slice(0,f);switch(c){case"m":return g.concat(a[f]).concat(a[d]);case"r":return g.concat(a[d]);case"i":return g;case"g":return g.concat(n("group"));case"E":return g.concat(a[f]);case"e":return g.concat(a[f])}}return"E"==c?[]:a}function t(c,d){var e,f=b.indentUnit,g=u(d),h=o(c,1),i=o(c,2);return c.in_string||c.in_atom?a.Pass:i?"when"==h.token?h.column+f:"when"===g&&"function"===i.type?i.indent+f:"("===g&&"fun"===h.token?h.column+3:"catch"===g&&(e=x(c,["try"]))?e.column:j(g,["end","after","of"])?(e=x(c,["begin","case","fun","if","receive","try"]),e?e.column:a.Pass):j(g,K)?(e=x(c,I),e?e.column:a.Pass):j(h.token,[",","|","||"])||j(g,[",","|","||"])?(e=v(c),e?e.column+e.token.length:f):"->"==h.token?j(i.token,["receive","case","if","try"])?i.column+f+f:i.column+f:j(h.token,I)?h.column+h.token.length:(e=w(c),z(e)?e.column+f:0):0}function u(a){var b=a.match(/,|[a-z]+|\}|\]|\)|>>|\|+|\(/);return z(b)&&0===b.index?b[0]:""}function v(a){var b=a.tokenStack.slice(0,-1),c=y(b,"type",["open_paren"]);return!!z(b[c])&&b[c]}function w(a){var b=a.tokenStack,c=y(b,"type",["open_paren","separator","keyword"]),d=y(b,"type",["operator"]);return z(c)&&z(d)&&c<d?b[c+1]:!!z(c)&&b[c]}function x(a,b){var c=a.tokenStack,d=y(c,"token",b);return!!z(c[d])&&c[d]}function y(a,b,c){for(var d=a.length-1;-1<d;d--)if(j(a[d][b],c))return d;return!1}function z(a){return a!==!1&&null!=a}var A=["-type","-spec","-export_type","-opaque"],B=["after","begin","catch","case","cond","end","fun","if","let","of","query","receive","try","when"],C=/[\->,;]/,D=["->",";",","],E=["and","andalso","band","bnot","bor","bsl","bsr","bxor","div","not","or","orelse","rem","xor"],F=/[\+\-\*\/<>=\|:!]/,G=["=","+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"],H=/[<\(\[\{]/,I=["<<","(","[","{"],J=/[>\)\]\}]/,K=["}","]",")",">>"],L=["is_atom","is_binary","is_bitstring","is_boolean","is_float","is_function","is_integer","is_list","is_number","is_pid","is_port","is_record","is_reference","is_tuple","atom","binary","bitstring","boolean","function","integer","list","number","pid","port","record","reference","tuple"],M=["abs","adler32","adler32_combine","alive","apply","atom_to_binary","atom_to_list","binary_to_atom","binary_to_existing_atom","binary_to_list","binary_to_term","bit_size","bitstring_to_list","byte_size","check_process_code","contact_binary","crc32","crc32_combine","date","decode_packet","delete_module","disconnect_node","element","erase","exit","float","float_to_list","garbage_collect","get","get_keys","group_leader","halt","hd","integer_to_list","internal_bif","iolist_size","iolist_to_binary","is_alive","is_atom","is_binary","is_bitstring","is_boolean","is_float","is_function","is_integer","is_list","is_number","is_pid","is_port","is_process_alive","is_record","is_reference","is_tuple","length","link","list_to_atom","list_to_binary","list_to_bitstring","list_to_existing_atom","list_to_float","list_to_integer","list_to_pid","list_to_tuple","load_module","make_ref","module_loaded","monitor_node","node","node_link","node_unlink","nodes","notalive","now","open_port","pid_to_list","port_close","port_command","port_connect","port_control","pre_loaded","process_flag","process_info","processes","purge_module","put","register","registered","round","self","setelement","size","spawn","spawn_link","spawn_monitor","spawn_opt","split_binary","statistics","term_to_binary","time","throw","tl","trunc","tuple_size","tuple_to_list","unlink","unregister","whereis"],N=/[\w@Ø-ÞÀ-Öß-öø-ÿ]/,O=/[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;return{startState:function(){return{tokenStack:[],in_string:!1,in_atom:!1}},token:function(a,b){return c(a,b)},indent:function(a,b){return t(a,b)},lineComment:"%"}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/factor/factor.js b/core/media/editors/codemirror/mode/factor/factor.js
new file mode 100644
index 00000000..e238c5ea
--- /dev/null
+++ b/core/media/editors/codemirror/mode/factor/factor.js
@@ -0,0 +1,85 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Factor syntax highlight - simple mode
+//
+// by Dimage Sapelkin (https://github.com/kerabromsmu)
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode("factor", {
+    // The start state contains the rules that are intially used
+    start: [
+      // comments
+      {regex: /#?!.*/, token: "comment"},
+      // strings """, multiline --> state
+      {regex: /"""/, token: "string", next: "string3"},
+      {regex: /(STRING:)(\s)/, token: ["keyword", null], next: "string2"},
+      {regex: /\S*?"/, token: "string", next: "string"},
+      // numbers: dec, hex, unicode, bin, fractional, complex
+      {regex: /(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/, token: "number"},
+      //{regex: /[+-]?/} //fractional
+      // definition: defining word, defined word, etc
+      {regex: /((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "bracket"], next: "stack"},
+      // method definition: defining word, type, defined word, etc
+      {regex: /(M\:)(\s+)(\S+)(\s+)(\S+)/, token: ["keyword", null, "def", null, "tag"]},
+      // vocabulary using --> state
+      {regex: /USING\:/, token: "keyword", next: "vocabulary"},
+      // vocabulary definition/use
+      {regex: /(USE\:|IN\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "tag"]},
+      // definition: a defining word, defined word
+      {regex: /(\S+\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "def"]},
+      // "keywords", incl. ; t f . [ ] { } defining words
+      {regex: /(?:;|\\|t|f|if|loop|while|until|do|PRIVATE>|<PRIVATE|\.|\S*\[|\]|\S*\{|\})(?=\s|$)/, token: "keyword"},
+      // <constructors> and the like
+      {regex: /\S+[\)>\.\*\?]+(?=\s|$)/, token: "builtin"},
+      {regex: /[\)><]+\S+(?=\s|$)/, token: "builtin"},
+      // operators
+      {regex: /(?:[\+\-\=\/\*<>])(?=\s|$)/, token: "keyword"},
+      // any id (?)
+      {regex: /\S+/, token: "variable"},
+      {regex: /\s+|./, token: null}
+    ],
+    vocabulary: [
+      {regex: /;/, token: "keyword", next: "start"},
+      {regex: /\S+/, token: "tag"},
+      {regex: /\s+|./, token: null}
+    ],
+    string: [
+      {regex: /(?:[^\\]|\\.)*?"/, token: "string", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
+    string2: [
+      {regex: /^;/, token: "keyword", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
+    string3: [
+      {regex: /(?:[^\\]|\\.)*?"""/, token: "string", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
+    stack: [
+      {regex: /\)/, token: "bracket", next: "start"},
+      {regex: /--/, token: "bracket"},
+      {regex: /\S+/, token: "meta"},
+      {regex: /\s+|./, token: null}
+    ],
+    // The meta property contains global information about the mode. It
+    // can contain properties like lineComment, which are supported by
+    // all modes, and also directives like dontIndentStates, which are
+    // specific to simple modes.
+    meta: {
+      dontIndentStates: ["start", "vocabulary", "string", "string3", "stack"],
+      lineComment: [ "!", "#!" ]
+    }
+  });
+
+  CodeMirror.defineMIME("text/x-factor", "factor");
+});
diff --git a/core/media/editors/codemirror/mode/factor/factor.min.js b/core/media/editors/codemirror/mode/factor/factor.min.js
new file mode 100644
index 00000000..9bfe380d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/factor/factor.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("factor",{start:[{regex:/#?!.*/,token:"comment"},{regex:/"""/,token:"string",next:"string3"},{regex:/(STRING:)(\s)/,token:["keyword",null],next:"string2"},{regex:/\S*?"/,token:"string",next:"string"},{regex:/(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/,token:"number"},{regex:/((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/,token:["keyword",null,"def",null,"bracket"],next:"stack"},{regex:/(M\:)(\s+)(\S+)(\s+)(\S+)/,token:["keyword",null,"def",null,"tag"]},{regex:/USING\:/,token:"keyword",next:"vocabulary"},{regex:/(USE\:|IN\:)(\s+)(\S+)(?=\s|$)/,token:["keyword",null,"tag"]},{regex:/(\S+\:)(\s+)(\S+)(?=\s|$)/,token:["keyword",null,"def"]},{regex:/(?:;|\\|t|f|if|loop|while|until|do|PRIVATE>|<PRIVATE|\.|\S*\[|\]|\S*\{|\})(?=\s|$)/,token:"keyword"},{regex:/\S+[\)>\.\*\?]+(?=\s|$)/,token:"builtin"},{regex:/[\)><]+\S+(?=\s|$)/,token:"builtin"},{regex:/(?:[\+\-\=\/\*<>])(?=\s|$)/,token:"keyword"},{regex:/\S+/,token:"variable"},{regex:/\s+|./,token:null}],vocabulary:[{regex:/;/,token:"keyword",next:"start"},{regex:/\S+/,token:"tag"},{regex:/\s+|./,token:null}],string:[{regex:/(?:[^\\]|\\.)*?"/,token:"string",next:"start"},{regex:/.*/,token:"string"}],string2:[{regex:/^;/,token:"keyword",next:"start"},{regex:/.*/,token:"string"}],string3:[{regex:/(?:[^\\]|\\.)*?"""/,token:"string",next:"start"},{regex:/.*/,token:"string"}],stack:[{regex:/\)/,token:"bracket",next:"start"},{regex:/--/,token:"bracket"},{regex:/\S+/,token:"meta"},{regex:/\s+|./,token:null}],meta:{dontIndentStates:["start","vocabulary","string","string3","stack"],lineComment:["!","#!"]}}),a.defineMIME("text/x-factor","factor")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/fcl/fcl.js b/core/media/editors/codemirror/mode/fcl/fcl.js
new file mode 100644
index 00000000..51811697
--- /dev/null
+++ b/core/media/editors/codemirror/mode/fcl/fcl.js
@@ -0,0 +1,173 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("fcl", function(config) {
+  var indentUnit = config.indentUnit;
+
+  var keywords = {
+      "term": true,
+      "method": true, "accu": true,
+      "rule": true, "then": true, "is": true, "and": true, "or": true,
+      "if": true, "default": true
+  };
+
+  var start_blocks = {
+      "var_input": true,
+      "var_output": true,
+      "fuzzify": true,
+      "defuzzify": true,
+      "function_block": true,
+      "ruleblock": true
+  };
+
+  var end_blocks = {
+      "end_ruleblock": true,
+      "end_defuzzify": true,
+      "end_function_block": true,
+      "end_fuzzify": true,
+      "end_var": true
+  };
+
+  var atoms = {
+      "true": true, "false": true, "nan": true,
+      "real": true, "min": true, "max": true, "cog": true, "cogs": true
+  };
+
+  var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    if (/[\d\.]/.test(ch)) {
+      if (ch == ".") {
+        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+      } else if (ch == "0") {
+        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+      } else {
+        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+      }
+      return "number";
+    }
+
+    if (ch == "/" || ch == "(") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+
+    var cur = stream.current().toLowerCase();
+    if (keywords.propertyIsEnumerable(cur) ||
+        start_blocks.propertyIsEnumerable(cur) ||
+        end_blocks.propertyIsEnumerable(cur)) {
+      return "keyword";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if ((ch == "/" || ch == ")") && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+
+  function popContext(state) {
+    if (!state.context.prev) return;
+    var t = state.context.type;
+    if (t == "end_block")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+            if (ctx.align == null) ctx.align = false;
+            state.indented = stream.indentation();
+            state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        var cur = stream.current().toLowerCase();
+
+        if (start_blocks.propertyIsEnumerable(cur)) pushContext(state, stream.column(), "end_block");
+        else if (end_blocks.propertyIsEnumerable(cur))  popContext(state);
+
+        state.startOfLine = false;
+        return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      var ctx = state.context;
+
+      var closing = end_blocks.propertyIsEnumerable(textAfter);
+      if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "ryk",
+    fold: "brace",
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME("text/x-fcl", "fcl");
+});
diff --git a/core/media/editors/codemirror/mode/fcl/fcl.min.js b/core/media/editors/codemirror/mode/fcl/fcl.min.js
new file mode 100644
index 00000000..300a01dd
--- /dev/null
+++ b/core/media/editors/codemirror/mode/fcl/fcl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("fcl",(function(a){function b(a,b){var d=a.next();if(/[\d\.]/.test(d))return"."==d?a.match(/^[0-9]+([eE][\-+]?[0-9]+)?/):"0"==d?a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^0[0-7]+/):a.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/),"number";if("/"==d||"("==d){if(a.eat("*"))return b.tokenize=c,c(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(l.test(d))return a.eatWhile(l),"operator";a.eatWhile(/[\w\$_\xa1-\uffff]/);var e=a.current().toLowerCase();return h.propertyIsEnumerable(e)||i.propertyIsEnumerable(e)||j.propertyIsEnumerable(e)?"keyword":k.propertyIsEnumerable(e)?"atom":"variable"}function c(a,c){for(var d,e=!1;d=a.next();){if(("/"==d||")"==d)&&e){c.tokenize=b;break}e="*"==d}return"comment"}function d(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function e(a,b,c){return a.context=new d(a.indented,b,c,null,a.context)}function f(a){if(a.context.prev){var b=a.context.type;return"end_block"==b&&(a.indented=a.context.indented),a.context=a.context.prev}}var g=a.indentUnit,h={term:!0,method:!0,accu:!0,rule:!0,then:!0,is:!0,and:!0,or:!0,if:!0,default:!0},i={var_input:!0,var_output:!0,fuzzify:!0,defuzzify:!0,function_block:!0,ruleblock:!0},j={end_ruleblock:!0,end_defuzzify:!0,end_function_block:!0,end_fuzzify:!0,end_var:!0},k={true:!0,false:!0,nan:!0,real:!0,min:!0,max:!0,cog:!0,cogs:!0},l=/[+\-*&^%:=<>!|\/]/;return{startState:function(a){return{tokenize:null,context:new d((a||0)-g,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,c){var d=c.context;if(a.sol()&&(null==d.align&&(d.align=!1),c.indented=a.indentation(),c.startOfLine=!0),a.eatSpace())return null;var g=(c.tokenize||b)(a,c);if("comment"==g)return g;null==d.align&&(d.align=!0);var h=a.current().toLowerCase();return i.propertyIsEnumerable(h)?e(c,a.column(),"end_block"):j.propertyIsEnumerable(h)&&f(c),c.startOfLine=!1,g},indent:function(a,c){if(a.tokenize!=b&&null!=a.tokenize)return 0;var d=a.context,e=j.propertyIsEnumerable(c);return d.align?d.column+(e?0:1):d.indented+(e?0:g)},electricChars:"ryk",fold:"brace",blockCommentStart:"(*",blockCommentEnd:"*)",lineComment:"//"}})),a.defineMIME("text/x-fcl","fcl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/forth/forth.js b/core/media/editors/codemirror/mode/forth/forth.js
new file mode 100644
index 00000000..1f519d88
--- /dev/null
+++ b/core/media/editors/codemirror/mode/forth/forth.js
@@ -0,0 +1,180 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Author: Aliaksei Chapyzhenka
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function toWordList(words) {
+    var ret = [];
+    words.split(' ').forEach(function(e){
+      ret.push({name: e});
+    });
+    return ret;
+  }
+
+  var coreWordList = toWordList(
+'INVERT AND OR XOR\
+ 2* 2/ LSHIFT RSHIFT\
+ 0= = 0< < > U< MIN MAX\
+ 2DROP 2DUP 2OVER 2SWAP ?DUP DEPTH DROP DUP OVER ROT SWAP\
+ >R R> R@\
+ + - 1+ 1- ABS NEGATE\
+ S>D * M* UM*\
+ FM/MOD SM/REM UM/MOD */ */MOD / /MOD MOD\
+ HERE , @ ! CELL+ CELLS C, C@ C! CHARS 2@ 2!\
+ ALIGN ALIGNED +! ALLOT\
+ CHAR [CHAR] [ ] BL\
+ FIND EXECUTE IMMEDIATE COUNT LITERAL STATE\
+ ; DOES> >BODY\
+ EVALUATE\
+ SOURCE >IN\
+ <# # #S #> HOLD SIGN BASE >NUMBER HEX DECIMAL\
+ FILL MOVE\
+ . CR EMIT SPACE SPACES TYPE U. .R U.R\
+ ACCEPT\
+ TRUE FALSE\
+ <> U> 0<> 0>\
+ NIP TUCK ROLL PICK\
+ 2>R 2R@ 2R>\
+ WITHIN UNUSED MARKER\
+ I J\
+ TO\
+ COMPILE, [COMPILE]\
+ SAVE-INPUT RESTORE-INPUT\
+ PAD ERASE\
+ 2LITERAL DNEGATE\
+ D- D+ D0< D0= D2* D2/ D< D= DMAX DMIN D>S DABS\
+ M+ M*/ D. D.R 2ROT DU<\
+ CATCH THROW\
+ FREE RESIZE ALLOCATE\
+ CS-PICK CS-ROLL\
+ GET-CURRENT SET-CURRENT FORTH-WORDLIST GET-ORDER SET-ORDER\
+ PREVIOUS SEARCH-WORDLIST WORDLIST FIND ALSO ONLY FORTH DEFINITIONS ORDER\
+ -TRAILING /STRING SEARCH COMPARE CMOVE CMOVE> BLANK SLITERAL');
+
+  var immediateWordList = toWordList('IF ELSE THEN BEGIN WHILE REPEAT UNTIL RECURSE [IF] [ELSE] [THEN] ?DO DO LOOP +LOOP UNLOOP LEAVE EXIT AGAIN CASE OF ENDOF ENDCASE');
+
+  CodeMirror.defineMode('forth', function() {
+    function searchWordList (wordList, word) {
+      var i;
+      for (i = wordList.length - 1; i >= 0; i--) {
+        if (wordList[i].name === word.toUpperCase()) {
+          return wordList[i];
+        }
+      }
+      return undefined;
+    }
+  return {
+    startState: function() {
+      return {
+        state: '',
+        base: 10,
+        coreWordList: coreWordList,
+        immediateWordList: immediateWordList,
+        wordList: []
+      };
+    },
+    token: function (stream, stt) {
+      var mat;
+      if (stream.eatSpace()) {
+        return null;
+      }
+      if (stt.state === '') { // interpretation
+        if (stream.match(/^(\]|:NONAME)(\s|$)/i)) {
+          stt.state = ' compilation';
+          return 'builtin compilation';
+        }
+        mat = stream.match(/^(\:)\s+(\S+)(\s|$)+/);
+        if (mat) {
+          stt.wordList.push({name: mat[2].toUpperCase()});
+          stt.state = ' compilation';
+          return 'def' + stt.state;
+        }
+        mat = stream.match(/^(VARIABLE|2VARIABLE|CONSTANT|2CONSTANT|CREATE|POSTPONE|VALUE|WORD)\s+(\S+)(\s|$)+/i);
+        if (mat) {
+          stt.wordList.push({name: mat[2].toUpperCase()});
+          return 'def' + stt.state;
+        }
+        mat = stream.match(/^(\'|\[\'\])\s+(\S+)(\s|$)+/);
+        if (mat) {
+          return 'builtin' + stt.state;
+        }
+        } else { // compilation
+        // ; [
+        if (stream.match(/^(\;|\[)(\s)/)) {
+          stt.state = '';
+          stream.backUp(1);
+          return 'builtin compilation';
+        }
+        if (stream.match(/^(\;|\[)($)/)) {
+          stt.state = '';
+          return 'builtin compilation';
+        }
+        if (stream.match(/^(POSTPONE)\s+\S+(\s|$)+/)) {
+          return 'builtin';
+        }
+      }
+
+      // dynamic wordlist
+      mat = stream.match(/^(\S+)(\s+|$)/);
+      if (mat) {
+        if (searchWordList(stt.wordList, mat[1]) !== undefined) {
+          return 'variable' + stt.state;
+        }
+
+        // comments
+        if (mat[1] === '\\') {
+          stream.skipToEnd();
+            return 'comment' + stt.state;
+          }
+
+          // core words
+          if (searchWordList(stt.coreWordList, mat[1]) !== undefined) {
+            return 'builtin' + stt.state;
+          }
+          if (searchWordList(stt.immediateWordList, mat[1]) !== undefined) {
+            return 'keyword' + stt.state;
+          }
+
+          if (mat[1] === '(') {
+            stream.eatWhile(function (s) { return s !== ')'; });
+            stream.eat(')');
+            return 'comment' + stt.state;
+          }
+
+          // // strings
+          if (mat[1] === '.(') {
+            stream.eatWhile(function (s) { return s !== ')'; });
+            stream.eat(')');
+            return 'string' + stt.state;
+          }
+          if (mat[1] === 'S"' || mat[1] === '."' || mat[1] === 'C"') {
+            stream.eatWhile(function (s) { return s !== '"'; });
+            stream.eat('"');
+            return 'string' + stt.state;
+          }
+
+          // numbers
+          if (mat[1] - 0xfffffffff) {
+            return 'number' + stt.state;
+          }
+          // if (mat[1].match(/^[-+]?[0-9]+\.[0-9]*/)) {
+          //     return 'number' + stt.state;
+          // }
+
+          return 'atom' + stt.state;
+        }
+      }
+    };
+  });
+  CodeMirror.defineMIME("text/x-forth", "forth");
+});
diff --git a/core/media/editors/codemirror/mode/forth/forth.min.js b/core/media/editors/codemirror/mode/forth/forth.min.js
new file mode 100644
index 00000000..81d2fa6b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/forth/forth.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){var b=[];return a.split(" ").forEach((function(a){b.push({name:a})})),b}var c=b("INVERT AND OR XOR 2* 2/ LSHIFT RSHIFT 0= = 0< < > U< MIN MAX 2DROP 2DUP 2OVER 2SWAP ?DUP DEPTH DROP DUP OVER ROT SWAP >R R> R@ + - 1+ 1- ABS NEGATE S>D * M* UM* FM/MOD SM/REM UM/MOD */ */MOD / /MOD MOD HERE , @ ! CELL+ CELLS C, C@ C! CHARS 2@ 2! ALIGN ALIGNED +! ALLOT CHAR [CHAR] [ ] BL FIND EXECUTE IMMEDIATE COUNT LITERAL STATE ; DOES> >BODY EVALUATE SOURCE >IN <# # #S #> HOLD SIGN BASE >NUMBER HEX DECIMAL FILL MOVE . CR EMIT SPACE SPACES TYPE U. .R U.R ACCEPT TRUE FALSE <> U> 0<> 0> NIP TUCK ROLL PICK 2>R 2R@ 2R> WITHIN UNUSED MARKER I J TO COMPILE, [COMPILE] SAVE-INPUT RESTORE-INPUT PAD ERASE 2LITERAL DNEGATE D- D+ D0< D0= D2* D2/ D< D= DMAX DMIN D>S DABS M+ M*/ D. D.R 2ROT DU< CATCH THROW FREE RESIZE ALLOCATE CS-PICK CS-ROLL GET-CURRENT SET-CURRENT FORTH-WORDLIST GET-ORDER SET-ORDER PREVIOUS SEARCH-WORDLIST WORDLIST FIND ALSO ONLY FORTH DEFINITIONS ORDER -TRAILING /STRING SEARCH COMPARE CMOVE CMOVE> BLANK SLITERAL"),d=b("IF ELSE THEN BEGIN WHILE REPEAT UNTIL RECURSE [IF] [ELSE] [THEN] ?DO DO LOOP +LOOP UNLOOP LEAVE EXIT AGAIN CASE OF ENDOF ENDCASE");a.defineMode("forth",(function(){function a(a,b){var c;for(c=a.length-1;c>=0;c--)if(a[c].name===b.toUpperCase())return a[c]}return{startState:function(){return{state:"",base:10,coreWordList:c,immediateWordList:d,wordList:[]}},token:function(b,c){var d;if(b.eatSpace())return null;if(""===c.state){if(b.match(/^(\]|:NONAME)(\s|$)/i))return c.state=" compilation","builtin compilation";if(d=b.match(/^(\:)\s+(\S+)(\s|$)+/))return c.wordList.push({name:d[2].toUpperCase()}),c.state=" compilation","def"+c.state;if(d=b.match(/^(VARIABLE|2VARIABLE|CONSTANT|2CONSTANT|CREATE|POSTPONE|VALUE|WORD)\s+(\S+)(\s|$)+/i))return c.wordList.push({name:d[2].toUpperCase()}),"def"+c.state;if(d=b.match(/^(\'|\[\'\])\s+(\S+)(\s|$)+/))return"builtin"+c.state}else{if(b.match(/^(\;|\[)(\s)/))return c.state="",b.backUp(1),"builtin compilation";if(b.match(/^(\;|\[)($)/))return c.state="","builtin compilation";if(b.match(/^(POSTPONE)\s+\S+(\s|$)+/))return"builtin"}return d=b.match(/^(\S+)(\s+|$)/),d?void 0!==a(c.wordList,d[1])?"variable"+c.state:"\\"===d[1]?(b.skipToEnd(),"comment"+c.state):void 0!==a(c.coreWordList,d[1])?"builtin"+c.state:void 0!==a(c.immediateWordList,d[1])?"keyword"+c.state:"("===d[1]?(b.eatWhile((function(a){return")"!==a})),b.eat(")"),"comment"+c.state):".("===d[1]?(b.eatWhile((function(a){return")"!==a})),b.eat(")"),"string"+c.state):'S"'===d[1]||'."'===d[1]||'C"'===d[1]?(b.eatWhile((function(a){return'"'!==a})),b.eat('"'),"string"+c.state):d[1]-68719476735?"number"+c.state:"atom"+c.state:void 0}}})),a.defineMIME("text/x-forth","forth")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/fortran/fortran.js b/core/media/editors/codemirror/mode/fortran/fortran.js
new file mode 100644
index 00000000..4d88f006
--- /dev/null
+++ b/core/media/editors/codemirror/mode/fortran/fortran.js
@@ -0,0 +1,188 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("fortran", function() {
+  function words(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) {
+      keys[array[i]] = true;
+    }
+    return keys;
+  }
+
+  var keywords = words([
+                  "abstract", "accept", "allocatable", "allocate",
+                  "array", "assign", "asynchronous", "backspace",
+                  "bind", "block", "byte", "call", "case",
+                  "class", "close", "common", "contains",
+                  "continue", "cycle", "data", "deallocate",
+                  "decode", "deferred", "dimension", "do",
+                  "elemental", "else", "encode", "end",
+                  "endif", "entry", "enumerator", "equivalence",
+                  "exit", "external", "extrinsic", "final",
+                  "forall", "format", "function", "generic",
+                  "go", "goto", "if", "implicit", "import", "include",
+                  "inquire", "intent", "interface", "intrinsic",
+                  "module", "namelist", "non_intrinsic",
+                  "non_overridable", "none", "nopass",
+                  "nullify", "open", "optional", "options",
+                  "parameter", "pass", "pause", "pointer",
+                  "print", "private", "program", "protected",
+                  "public", "pure", "read", "recursive", "result",
+                  "return", "rewind", "save", "select", "sequence",
+                  "stop", "subroutine", "target", "then", "to", "type",
+                  "use", "value", "volatile", "where", "while",
+                  "write"]);
+  var builtins = words(["abort", "abs", "access", "achar", "acos",
+                          "adjustl", "adjustr", "aimag", "aint", "alarm",
+                          "all", "allocated", "alog", "amax", "amin",
+                          "amod", "and", "anint", "any", "asin",
+                          "associated", "atan", "besj", "besjn", "besy",
+                          "besyn", "bit_size", "btest", "cabs", "ccos",
+                          "ceiling", "cexp", "char", "chdir", "chmod",
+                          "clog", "cmplx", "command_argument_count",
+                          "complex", "conjg", "cos", "cosh", "count",
+                          "cpu_time", "cshift", "csin", "csqrt", "ctime",
+                          "c_funloc", "c_loc", "c_associated", "c_null_ptr",
+                          "c_null_funptr", "c_f_pointer", "c_null_char",
+                          "c_alert", "c_backspace", "c_form_feed",
+                          "c_new_line", "c_carriage_return",
+                          "c_horizontal_tab", "c_vertical_tab", "dabs",
+                          "dacos", "dasin", "datan", "date_and_time",
+                          "dbesj", "dbesj", "dbesjn", "dbesy", "dbesy",
+                          "dbesyn", "dble", "dcos", "dcosh", "ddim", "derf",
+                          "derfc", "dexp", "digits", "dim", "dint", "dlog",
+                          "dlog", "dmax", "dmin", "dmod", "dnint",
+                          "dot_product", "dprod", "dsign", "dsinh",
+                          "dsin", "dsqrt", "dtanh", "dtan", "dtime",
+                          "eoshift", "epsilon", "erf", "erfc", "etime",
+                          "exit", "exp", "exponent", "extends_type_of",
+                          "fdate", "fget", "fgetc", "float", "floor",
+                          "flush", "fnum", "fputc", "fput", "fraction",
+                          "fseek", "fstat", "ftell", "gerror", "getarg",
+                          "get_command", "get_command_argument",
+                          "get_environment_variable", "getcwd",
+                          "getenv", "getgid", "getlog", "getpid",
+                          "getuid", "gmtime", "hostnm", "huge", "iabs",
+                          "iachar", "iand", "iargc", "ibclr", "ibits",
+                          "ibset", "ichar", "idate", "idim", "idint",
+                          "idnint", "ieor", "ierrno", "ifix", "imag",
+                          "imagpart", "index", "int", "ior", "irand",
+                          "isatty", "ishft", "ishftc", "isign",
+                          "iso_c_binding", "is_iostat_end", "is_iostat_eor",
+                          "itime", "kill", "kind", "lbound", "len", "len_trim",
+                          "lge", "lgt", "link", "lle", "llt", "lnblnk", "loc",
+                          "log", "logical", "long", "lshift", "lstat", "ltime",
+                          "matmul", "max", "maxexponent", "maxloc", "maxval",
+                          "mclock", "merge", "move_alloc", "min", "minexponent",
+                          "minloc", "minval", "mod", "modulo", "mvbits",
+                          "nearest", "new_line", "nint", "not", "or", "pack",
+                          "perror", "precision", "present", "product", "radix",
+                          "rand", "random_number", "random_seed", "range",
+                          "real", "realpart", "rename", "repeat", "reshape",
+                          "rrspacing", "rshift", "same_type_as", "scale",
+                          "scan", "second", "selected_int_kind",
+                          "selected_real_kind", "set_exponent", "shape",
+                          "short", "sign", "signal", "sinh", "sin", "sleep",
+                          "sngl", "spacing", "spread", "sqrt", "srand", "stat",
+                          "sum", "symlnk", "system", "system_clock", "tan",
+                          "tanh", "time", "tiny", "transfer", "transpose",
+                          "trim", "ttynam", "ubound", "umask", "unlink",
+                          "unpack", "verify", "xor", "zabs", "zcos", "zexp",
+                          "zlog", "zsin", "zsqrt"]);
+
+    var dataTypes =  words(["c_bool", "c_char", "c_double", "c_double_complex",
+                     "c_float", "c_float_complex", "c_funptr", "c_int",
+                     "c_int16_t", "c_int32_t", "c_int64_t", "c_int8_t",
+                     "c_int_fast16_t", "c_int_fast32_t", "c_int_fast64_t",
+                     "c_int_fast8_t", "c_int_least16_t", "c_int_least32_t",
+                     "c_int_least64_t", "c_int_least8_t", "c_intmax_t",
+                     "c_intptr_t", "c_long", "c_long_double",
+                     "c_long_double_complex", "c_long_long", "c_ptr",
+                     "c_short", "c_signed_char", "c_size_t", "character",
+                     "complex", "double", "integer", "logical", "real"]);
+  var isOperatorChar = /[+\-*&=<>\/\:]/;
+  var litOperator = new RegExp("(\.and\.|\.or\.|\.eq\.|\.lt\.|\.le\.|\.gt\.|\.ge\.|\.ne\.|\.not\.|\.eqv\.|\.neqv\.)", "i");
+
+  function tokenBase(stream, state) {
+
+    if (stream.match(litOperator)){
+        return 'operator';
+    }
+
+    var ch = stream.next();
+    if (ch == "!") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\[\]\(\),]/.test(ch)) {
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    var word = stream.current().toLowerCase();
+
+    if (keywords.hasOwnProperty(word)){
+            return 'keyword';
+    }
+    if (builtins.hasOwnProperty(word) || dataTypes.hasOwnProperty(word)) {
+            return 'builtin';
+    }
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+            end = true;
+            break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped) state.tokenize = null;
+      return "string";
+    };
+  }
+
+  // Interface
+
+  return {
+    startState: function() {
+      return {tokenize: null};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-fortran", "fortran");
+
+});
diff --git a/core/media/editors/codemirror/mode/fortran/fortran.min.js b/core/media/editors/codemirror/mode/fortran/fortran.min.js
new file mode 100644
index 00000000..376ba32e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/fortran/fortran.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("fortran",(function(){function a(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function b(a,b){if(a.match(h))return"operator";var i=a.next();if("!"==i)return a.skipToEnd(),"comment";if('"'==i||"'"==i)return b.tokenize=c(i),b.tokenize(a,b);if(/[\[\]\(\),]/.test(i))return null;if(/\d/.test(i))return a.eatWhile(/[\w\.]/),"number";if(g.test(i))return a.eatWhile(g),"operator";a.eatWhile(/[\w\$_]/);var j=a.current().toLowerCase();return d.hasOwnProperty(j)?"keyword":e.hasOwnProperty(j)||f.hasOwnProperty(j)?"builtin":"variable"}function c(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){f=!0;break}e=!e&&"\\"==d}return!f&&e||(c.tokenize=null),"string"}}var d=a(["abstract","accept","allocatable","allocate","array","assign","asynchronous","backspace","bind","block","byte","call","case","class","close","common","contains","continue","cycle","data","deallocate","decode","deferred","dimension","do","elemental","else","encode","end","endif","entry","enumerator","equivalence","exit","external","extrinsic","final","forall","format","function","generic","go","goto","if","implicit","import","include","inquire","intent","interface","intrinsic","module","namelist","non_intrinsic","non_overridable","none","nopass","nullify","open","optional","options","parameter","pass","pause","pointer","print","private","program","protected","public","pure","read","recursive","result","return","rewind","save","select","sequence","stop","subroutine","target","then","to","type","use","value","volatile","where","while","write"]),e=a(["abort","abs","access","achar","acos","adjustl","adjustr","aimag","aint","alarm","all","allocated","alog","amax","amin","amod","and","anint","any","asin","associated","atan","besj","besjn","besy","besyn","bit_size","btest","cabs","ccos","ceiling","cexp","char","chdir","chmod","clog","cmplx","command_argument_count","complex","conjg","cos","cosh","count","cpu_time","cshift","csin","csqrt","ctime","c_funloc","c_loc","c_associated","c_null_ptr","c_null_funptr","c_f_pointer","c_null_char","c_alert","c_backspace","c_form_feed","c_new_line","c_carriage_return","c_horizontal_tab","c_vertical_tab","dabs","dacos","dasin","datan","date_and_time","dbesj","dbesj","dbesjn","dbesy","dbesy","dbesyn","dble","dcos","dcosh","ddim","derf","derfc","dexp","digits","dim","dint","dlog","dlog","dmax","dmin","dmod","dnint","dot_product","dprod","dsign","dsinh","dsin","dsqrt","dtanh","dtan","dtime","eoshift","epsilon","erf","erfc","etime","exit","exp","exponent","extends_type_of","fdate","fget","fgetc","float","floor","flush","fnum","fputc","fput","fraction","fseek","fstat","ftell","gerror","getarg","get_command","get_command_argument","get_environment_variable","getcwd","getenv","getgid","getlog","getpid","getuid","gmtime","hostnm","huge","iabs","iachar","iand","iargc","ibclr","ibits","ibset","ichar","idate","idim","idint","idnint","ieor","ierrno","ifix","imag","imagpart","index","int","ior","irand","isatty","ishft","ishftc","isign","iso_c_binding","is_iostat_end","is_iostat_eor","itime","kill","kind","lbound","len","len_trim","lge","lgt","link","lle","llt","lnblnk","loc","log","logical","long","lshift","lstat","ltime","matmul","max","maxexponent","maxloc","maxval","mclock","merge","move_alloc","min","minexponent","minloc","minval","mod","modulo","mvbits","nearest","new_line","nint","not","or","pack","perror","precision","present","product","radix","rand","random_number","random_seed","range","real","realpart","rename","repeat","reshape","rrspacing","rshift","same_type_as","scale","scan","second","selected_int_kind","selected_real_kind","set_exponent","shape","short","sign","signal","sinh","sin","sleep","sngl","spacing","spread","sqrt","srand","stat","sum","symlnk","system","system_clock","tan","tanh","time","tiny","transfer","transpose","trim","ttynam","ubound","umask","unlink","unpack","verify","xor","zabs","zcos","zexp","zlog","zsin","zsqrt"]),f=a(["c_bool","c_char","c_double","c_double_complex","c_float","c_float_complex","c_funptr","c_int","c_int16_t","c_int32_t","c_int64_t","c_int8_t","c_int_fast16_t","c_int_fast32_t","c_int_fast64_t","c_int_fast8_t","c_int_least16_t","c_int_least32_t","c_int_least64_t","c_int_least8_t","c_intmax_t","c_intptr_t","c_long","c_long_double","c_long_double_complex","c_long_long","c_ptr","c_short","c_signed_char","c_size_t","character","complex","double","integer","logical","real"]),g=/[+\-*&=<>\/\:]/,h=new RegExp("(.and.|.or.|.eq.|.lt.|.le.|.gt.|.ge.|.ne.|.not.|.eqv.|.neqv.)","i");return{startState:function(){return{tokenize:null}},token:function(a,c){if(a.eatSpace())return null;var d=(c.tokenize||b)(a,c);return"comment"==d||"meta"==d?d:d}}})),a.defineMIME("text/x-fortran","fortran")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/gas/gas.js b/core/media/editors/codemirror/mode/gas/gas.js
new file mode 100644
index 00000000..0c74bedc
--- /dev/null
+++ b/core/media/editors/codemirror/mode/gas/gas.js
@@ -0,0 +1,345 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("gas", function(_config, parserConfig) {
+  'use strict';
+
+  // If an architecture is specified, its initialization function may
+  // populate this array with custom parsing functions which will be
+  // tried in the event that the standard functions do not find a match.
+  var custom = [];
+
+  // The symbol used to start a line comment changes based on the target
+  // architecture.
+  // If no architecture is pased in "parserConfig" then only multiline
+  // comments will have syntax support.
+  var lineCommentStartSymbol = "";
+
+  // These directives are architecture independent.
+  // Machine specific directives should go in their respective
+  // architecture initialization function.
+  // Reference:
+  // http://sourceware.org/binutils/docs/as/Pseudo-Ops.html#Pseudo-Ops
+  var directives = {
+    ".abort" : "builtin",
+    ".align" : "builtin",
+    ".altmacro" : "builtin",
+    ".ascii" : "builtin",
+    ".asciz" : "builtin",
+    ".balign" : "builtin",
+    ".balignw" : "builtin",
+    ".balignl" : "builtin",
+    ".bundle_align_mode" : "builtin",
+    ".bundle_lock" : "builtin",
+    ".bundle_unlock" : "builtin",
+    ".byte" : "builtin",
+    ".cfi_startproc" : "builtin",
+    ".comm" : "builtin",
+    ".data" : "builtin",
+    ".def" : "builtin",
+    ".desc" : "builtin",
+    ".dim" : "builtin",
+    ".double" : "builtin",
+    ".eject" : "builtin",
+    ".else" : "builtin",
+    ".elseif" : "builtin",
+    ".end" : "builtin",
+    ".endef" : "builtin",
+    ".endfunc" : "builtin",
+    ".endif" : "builtin",
+    ".equ" : "builtin",
+    ".equiv" : "builtin",
+    ".eqv" : "builtin",
+    ".err" : "builtin",
+    ".error" : "builtin",
+    ".exitm" : "builtin",
+    ".extern" : "builtin",
+    ".fail" : "builtin",
+    ".file" : "builtin",
+    ".fill" : "builtin",
+    ".float" : "builtin",
+    ".func" : "builtin",
+    ".global" : "builtin",
+    ".gnu_attribute" : "builtin",
+    ".hidden" : "builtin",
+    ".hword" : "builtin",
+    ".ident" : "builtin",
+    ".if" : "builtin",
+    ".incbin" : "builtin",
+    ".include" : "builtin",
+    ".int" : "builtin",
+    ".internal" : "builtin",
+    ".irp" : "builtin",
+    ".irpc" : "builtin",
+    ".lcomm" : "builtin",
+    ".lflags" : "builtin",
+    ".line" : "builtin",
+    ".linkonce" : "builtin",
+    ".list" : "builtin",
+    ".ln" : "builtin",
+    ".loc" : "builtin",
+    ".loc_mark_labels" : "builtin",
+    ".local" : "builtin",
+    ".long" : "builtin",
+    ".macro" : "builtin",
+    ".mri" : "builtin",
+    ".noaltmacro" : "builtin",
+    ".nolist" : "builtin",
+    ".octa" : "builtin",
+    ".offset" : "builtin",
+    ".org" : "builtin",
+    ".p2align" : "builtin",
+    ".popsection" : "builtin",
+    ".previous" : "builtin",
+    ".print" : "builtin",
+    ".protected" : "builtin",
+    ".psize" : "builtin",
+    ".purgem" : "builtin",
+    ".pushsection" : "builtin",
+    ".quad" : "builtin",
+    ".reloc" : "builtin",
+    ".rept" : "builtin",
+    ".sbttl" : "builtin",
+    ".scl" : "builtin",
+    ".section" : "builtin",
+    ".set" : "builtin",
+    ".short" : "builtin",
+    ".single" : "builtin",
+    ".size" : "builtin",
+    ".skip" : "builtin",
+    ".sleb128" : "builtin",
+    ".space" : "builtin",
+    ".stab" : "builtin",
+    ".string" : "builtin",
+    ".struct" : "builtin",
+    ".subsection" : "builtin",
+    ".symver" : "builtin",
+    ".tag" : "builtin",
+    ".text" : "builtin",
+    ".title" : "builtin",
+    ".type" : "builtin",
+    ".uleb128" : "builtin",
+    ".val" : "builtin",
+    ".version" : "builtin",
+    ".vtable_entry" : "builtin",
+    ".vtable_inherit" : "builtin",
+    ".warning" : "builtin",
+    ".weak" : "builtin",
+    ".weakref" : "builtin",
+    ".word" : "builtin"
+  };
+
+  var registers = {};
+
+  function x86(_parserConfig) {
+    lineCommentStartSymbol = "#";
+
+    registers.ax  = "variable";
+    registers.eax = "variable-2";
+    registers.rax = "variable-3";
+
+    registers.bx  = "variable";
+    registers.ebx = "variable-2";
+    registers.rbx = "variable-3";
+
+    registers.cx  = "variable";
+    registers.ecx = "variable-2";
+    registers.rcx = "variable-3";
+
+    registers.dx  = "variable";
+    registers.edx = "variable-2";
+    registers.rdx = "variable-3";
+
+    registers.si  = "variable";
+    registers.esi = "variable-2";
+    registers.rsi = "variable-3";
+
+    registers.di  = "variable";
+    registers.edi = "variable-2";
+    registers.rdi = "variable-3";
+
+    registers.sp  = "variable";
+    registers.esp = "variable-2";
+    registers.rsp = "variable-3";
+
+    registers.bp  = "variable";
+    registers.ebp = "variable-2";
+    registers.rbp = "variable-3";
+
+    registers.ip  = "variable";
+    registers.eip = "variable-2";
+    registers.rip = "variable-3";
+
+    registers.cs  = "keyword";
+    registers.ds  = "keyword";
+    registers.ss  = "keyword";
+    registers.es  = "keyword";
+    registers.fs  = "keyword";
+    registers.gs  = "keyword";
+  }
+
+  function armv6(_parserConfig) {
+    // Reference:
+    // http://infocenter.arm.com/help/topic/com.arm.doc.qrc0001l/QRC0001_UAL.pdf
+    // http://infocenter.arm.com/help/topic/com.arm.doc.ddi0301h/DDI0301H_arm1176jzfs_r0p7_trm.pdf
+    lineCommentStartSymbol = "@";
+    directives.syntax = "builtin";
+
+    registers.r0  = "variable";
+    registers.r1  = "variable";
+    registers.r2  = "variable";
+    registers.r3  = "variable";
+    registers.r4  = "variable";
+    registers.r5  = "variable";
+    registers.r6  = "variable";
+    registers.r7  = "variable";
+    registers.r8  = "variable";
+    registers.r9  = "variable";
+    registers.r10 = "variable";
+    registers.r11 = "variable";
+    registers.r12 = "variable";
+
+    registers.sp  = "variable-2";
+    registers.lr  = "variable-2";
+    registers.pc  = "variable-2";
+    registers.r13 = registers.sp;
+    registers.r14 = registers.lr;
+    registers.r15 = registers.pc;
+
+    custom.push(function(ch, stream) {
+      if (ch === '#') {
+        stream.eatWhile(/\w/);
+        return "number";
+      }
+    });
+  }
+
+  var arch = (parserConfig.architecture || "x86").toLowerCase();
+  if (arch === "x86") {
+    x86(parserConfig);
+  } else if (arch === "arm" || arch === "armv6") {
+    armv6(parserConfig);
+  }
+
+  function nextUntilUnescaped(stream, end) {
+    var escaped = false, next;
+    while ((next = stream.next()) != null) {
+      if (next === end && !escaped) {
+        return false;
+      }
+      escaped = !escaped && next === "\\";
+    }
+    return escaped;
+  }
+
+  function clikeComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (ch === "/" && maybeEnd) {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch === "*");
+    }
+    return "comment";
+  }
+
+  return {
+    startState: function() {
+      return {
+        tokenize: null
+      };
+    },
+
+    token: function(stream, state) {
+      if (state.tokenize) {
+        return state.tokenize(stream, state);
+      }
+
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      var style, cur, ch = stream.next();
+
+      if (ch === "/") {
+        if (stream.eat("*")) {
+          state.tokenize = clikeComment;
+          return clikeComment(stream, state);
+        }
+      }
+
+      if (ch === lineCommentStartSymbol) {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      if (ch === '"') {
+        nextUntilUnescaped(stream, '"');
+        return "string";
+      }
+
+      if (ch === '.') {
+        stream.eatWhile(/\w/);
+        cur = stream.current().toLowerCase();
+        style = directives[cur];
+        return style || null;
+      }
+
+      if (ch === '=') {
+        stream.eatWhile(/\w/);
+        return "tag";
+      }
+
+      if (ch === '{') {
+        return "braket";
+      }
+
+      if (ch === '}') {
+        return "braket";
+      }
+
+      if (/\d/.test(ch)) {
+        if (ch === "0" && stream.eat("x")) {
+          stream.eatWhile(/[0-9a-fA-F]/);
+          return "number";
+        }
+        stream.eatWhile(/\d/);
+        return "number";
+      }
+
+      if (/\w/.test(ch)) {
+        stream.eatWhile(/\w/);
+        if (stream.eat(":")) {
+          return 'tag';
+        }
+        cur = stream.current().toLowerCase();
+        style = registers[cur];
+        return style || null;
+      }
+
+      for (var i = 0; i < custom.length; i++) {
+        style = custom[i](ch, stream, state);
+        if (style) {
+          return style;
+        }
+      }
+    },
+
+    lineComment: lineCommentStartSymbol,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
+  };
+});
+
+});
diff --git a/core/media/editors/codemirror/mode/gas/gas.min.js b/core/media/editors/codemirror/mode/gas/gas.min.js
new file mode 100644
index 00000000..46738d35
--- /dev/null
+++ b/core/media/editors/codemirror/mode/gas/gas.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("gas",(function(a,b){function c(a){h="#",j.ax="variable",j.eax="variable-2",j.rax="variable-3",j.bx="variable",j.ebx="variable-2",j.rbx="variable-3",j.cx="variable",j.ecx="variable-2",j.rcx="variable-3",j.dx="variable",j.edx="variable-2",j.rdx="variable-3",j.si="variable",j.esi="variable-2",j.rsi="variable-3",j.di="variable",j.edi="variable-2",j.rdi="variable-3",j.sp="variable",j.esp="variable-2",j.rsp="variable-3",j.bp="variable",j.ebp="variable-2",j.rbp="variable-3",j.ip="variable",j.eip="variable-2",j.rip="variable-3",j.cs="keyword",j.ds="keyword",j.ss="keyword",j.es="keyword",j.fs="keyword",j.gs="keyword"}function d(a){h="@",i.syntax="builtin",j.r0="variable",j.r1="variable",j.r2="variable",j.r3="variable",j.r4="variable",j.r5="variable",j.r6="variable",j.r7="variable",j.r8="variable",j.r9="variable",j.r10="variable",j.r11="variable",j.r12="variable",j.sp="variable-2",j.lr="variable-2",j.pc="variable-2",j.r13=j.sp,j.r14=j.lr,j.r15=j.pc,g.push((function(a,b){if("#"===a)return b.eatWhile(/\w/),"number"}))}function e(a,b){for(var c,d=!1;null!=(c=a.next());){if(c===b&&!d)return!1;d=!d&&"\\"===c}return d}function f(a,b){for(var c,d=!1;null!=(c=a.next());){if("/"===c&&d){b.tokenize=null;break}d="*"===c}return"comment"}var g=[],h="",i={".abort":"builtin",".align":"builtin",".altmacro":"builtin",".ascii":"builtin",".asciz":"builtin",".balign":"builtin",".balignw":"builtin",".balignl":"builtin",".bundle_align_mode":"builtin",".bundle_lock":"builtin",".bundle_unlock":"builtin",".byte":"builtin",".cfi_startproc":"builtin",".comm":"builtin",".data":"builtin",".def":"builtin",".desc":"builtin",".dim":"builtin",".double":"builtin",".eject":"builtin",".else":"builtin",".elseif":"builtin",".end":"builtin",".endef":"builtin",".endfunc":"builtin",".endif":"builtin",".equ":"builtin",".equiv":"builtin",".eqv":"builtin",".err":"builtin",".error":"builtin",".exitm":"builtin",".extern":"builtin",".fail":"builtin",".file":"builtin",".fill":"builtin",".float":"builtin",".func":"builtin",".global":"builtin",".gnu_attribute":"builtin",".hidden":"builtin",".hword":"builtin",".ident":"builtin",".if":"builtin",".incbin":"builtin",".include":"builtin",".int":"builtin",".internal":"builtin",".irp":"builtin",".irpc":"builtin",".lcomm":"builtin",".lflags":"builtin",".line":"builtin",".linkonce":"builtin",".list":"builtin",".ln":"builtin",".loc":"builtin",".loc_mark_labels":"builtin",".local":"builtin",".long":"builtin",".macro":"builtin",".mri":"builtin",".noaltmacro":"builtin",".nolist":"builtin",".octa":"builtin",".offset":"builtin",".org":"builtin",".p2align":"builtin",".popsection":"builtin",".previous":"builtin",".print":"builtin",".protected":"builtin",".psize":"builtin",".purgem":"builtin",".pushsection":"builtin",".quad":"builtin",".reloc":"builtin",".rept":"builtin",".sbttl":"builtin",".scl":"builtin",".section":"builtin",".set":"builtin",".short":"builtin",".single":"builtin",".size":"builtin",".skip":"builtin",".sleb128":"builtin",".space":"builtin",".stab":"builtin",".string":"builtin",".struct":"builtin",".subsection":"builtin",".symver":"builtin",".tag":"builtin",".text":"builtin",".title":"builtin",".type":"builtin",".uleb128":"builtin",".val":"builtin",".version":"builtin",".vtable_entry":"builtin",".vtable_inherit":"builtin",".warning":"builtin",".weak":"builtin",".weakref":"builtin",".word":"builtin"},j={},k=(b.architecture||"x86").toLowerCase();return"x86"===k?c(b):"arm"!==k&&"armv6"!==k||d(b),{startState:function(){return{tokenize:null}},token:function(a,b){if(b.tokenize)return b.tokenize(a,b);if(a.eatSpace())return null;var c,d,k=a.next();if("/"===k&&a.eat("*"))return b.tokenize=f,f(a,b);if(k===h)return a.skipToEnd(),"comment";if('"'===k)return e(a,'"'),"string";if("."===k)return a.eatWhile(/\w/),d=a.current().toLowerCase(),c=i[d],c||null;if("="===k)return a.eatWhile(/\w/),"tag";if("{"===k)return"braket";if("}"===k)return"braket";if(/\d/.test(k))return"0"===k&&a.eat("x")?(a.eatWhile(/[0-9a-fA-F]/),"number"):(a.eatWhile(/\d/),"number");if(/\w/.test(k))return a.eatWhile(/\w/),a.eat(":")?"tag":(d=a.current().toLowerCase(),c=j[d],c||null);for(var l=0;l<g.length;l++)if(c=g[l](k,a,b))return c},lineComment:h,blockCommentStart:"/*",blockCommentEnd:"*/"}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/gfm/gfm.js b/core/media/editors/codemirror/mode/gfm/gfm.js
new file mode 100644
index 00000000..471ae906
--- /dev/null
+++ b/core/media/editors/codemirror/mode/gfm/gfm.js
@@ -0,0 +1,129 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../markdown/markdown"), require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../markdown/markdown", "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
+
+CodeMirror.defineMode("gfm", function(config, modeConfig) {
+  var codeDepth = 0;
+  function blankLine(state) {
+    state.code = false;
+    return null;
+  }
+  var gfmOverlay = {
+    startState: function() {
+      return {
+        code: false,
+        codeBlock: false,
+        ateSpace: false
+      };
+    },
+    copyState: function(s) {
+      return {
+        code: s.code,
+        codeBlock: s.codeBlock,
+        ateSpace: s.ateSpace
+      };
+    },
+    token: function(stream, state) {
+      state.combineTokens = null;
+
+      // Hack to prevent formatting override inside code blocks (block and inline)
+      if (state.codeBlock) {
+        if (stream.match(/^```+/)) {
+          state.codeBlock = false;
+          return null;
+        }
+        stream.skipToEnd();
+        return null;
+      }
+      if (stream.sol()) {
+        state.code = false;
+      }
+      if (stream.sol() && stream.match(/^```+/)) {
+        stream.skipToEnd();
+        state.codeBlock = true;
+        return null;
+      }
+      // If this block is changed, it may need to be updated in Markdown mode
+      if (stream.peek() === '`') {
+        stream.next();
+        var before = stream.pos;
+        stream.eatWhile('`');
+        var difference = 1 + stream.pos - before;
+        if (!state.code) {
+          codeDepth = difference;
+          state.code = true;
+        } else {
+          if (difference === codeDepth) { // Must be exact
+            state.code = false;
+          }
+        }
+        return null;
+      } else if (state.code) {
+        stream.next();
+        return null;
+      }
+      // Check if space. If so, links can be formatted later on
+      if (stream.eatSpace()) {
+        state.ateSpace = true;
+        return null;
+      }
+      if (stream.sol() || state.ateSpace) {
+        state.ateSpace = false;
+        if (modeConfig.gitHubSpice !== false) {
+          if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?=.{0,6}\d)(?:[a-f0-9]{7,40}\b)/)) {
+            // User/Project@SHA
+            // User@SHA
+            // SHA
+            state.combineTokens = true;
+            return "link";
+          } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
+            // User/Project#Num
+            // User#Num
+            // #Num
+            state.combineTokens = true;
+            return "link";
+          }
+        }
+      }
+      if (stream.match(urlRE) &&
+          stream.string.slice(stream.start - 2, stream.start) != "](" &&
+          (stream.start == 0 || /\W/.test(stream.string.charAt(stream.start - 1)))) {
+        // URLs
+        // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
+        // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
+        // And then limited url schemes to the CommonMark list, so foo:bar isn't matched as a URL
+        state.combineTokens = true;
+        return "link";
+      }
+      stream.next();
+      return null;
+    },
+    blankLine: blankLine
+  };
+
+  var markdownConfig = {
+    taskLists: true,
+    strikethrough: true,
+    emoji: true
+  };
+  for (var attr in modeConfig) {
+    markdownConfig[attr] = modeConfig[attr];
+  }
+  markdownConfig.name = "markdown";
+  return CodeMirror.overlayMode(CodeMirror.getMode(config, markdownConfig), gfmOverlay);
+
+}, "markdown");
+
+  CodeMirror.defineMIME("text/x-gfm", "gfm");
+});
diff --git a/core/media/editors/codemirror/mode/gfm/gfm.min.js b/core/media/editors/codemirror/mode/gfm/gfm.min.js
new file mode 100644
index 00000000..22b0c6c5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/gfm/gfm.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../markdown/markdown"),require("../../addon/mode/overlay")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../markdown/markdown","../../addon/mode/overlay"],a):a(CodeMirror)})((function(a){"use strict";var b=/^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i;a.defineMode("gfm",(function(c,d){function e(a){return a.code=!1,null}var f=0,g={startState:function(){return{code:!1,codeBlock:!1,ateSpace:!1}},copyState:function(a){return{code:a.code,codeBlock:a.codeBlock,ateSpace:a.ateSpace}},token:function(a,c){if(c.combineTokens=null,c.codeBlock)return a.match(/^```+/)?(c.codeBlock=!1,null):(a.skipToEnd(),null);if(a.sol()&&(c.code=!1),a.sol()&&a.match(/^```+/))return a.skipToEnd(),c.codeBlock=!0,null;if("`"===a.peek()){a.next();var e=a.pos;a.eatWhile("`");var g=1+a.pos-e;return c.code?g===f&&(c.code=!1):(f=g,c.code=!0),null}if(c.code)return a.next(),null;if(a.eatSpace())return c.ateSpace=!0,null;if((a.sol()||c.ateSpace)&&(c.ateSpace=!1,d.gitHubSpice!==!1)){if(a.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?=.{0,6}\d)(?:[a-f0-9]{7,40}\b)/))return c.combineTokens=!0,"link";if(a.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/))return c.combineTokens=!0,"link"}return a.match(b)&&"]("!=a.string.slice(a.start-2,a.start)&&(0==a.start||/\W/.test(a.string.charAt(a.start-1)))?(c.combineTokens=!0,"link"):(a.next(),null)},blankLine:e},h={taskLists:!0,strikethrough:!0,emoji:!0};for(var i in d)h[i]=d[i];return h.name="markdown",a.overlayMode(a.getMode(c,h),g)}),"markdown"),a.defineMIME("text/x-gfm","gfm")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/gherkin/gherkin.js b/core/media/editors/codemirror/mode/gherkin/gherkin.js
new file mode 100644
index 00000000..fc2ebee1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/gherkin/gherkin.js
@@ -0,0 +1,178 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+Gherkin mode - http://www.cukes.info/
+Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
+*/
+
+// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
+//var Quotes = {
+//  SINGLE: 1,
+//  DOUBLE: 2
+//};
+
+//var regex = {
+//  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
+//};
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("gherkin", function () {
+  return {
+    startState: function () {
+      return {
+        lineNumber: 0,
+        tableHeaderLine: false,
+        allowFeature: true,
+        allowBackground: false,
+        allowScenario: false,
+        allowSteps: false,
+        allowPlaceholders: false,
+        allowMultilineArgument: false,
+        inMultilineString: false,
+        inMultilineTable: false,
+        inKeywordLine: false
+      };
+    },
+    token: function (stream, state) {
+      if (stream.sol()) {
+        state.lineNumber++;
+        state.inKeywordLine = false;
+        if (state.inMultilineTable) {
+            state.tableHeaderLine = false;
+            if (!stream.match(/\s*\|/, false)) {
+              state.allowMultilineArgument = false;
+              state.inMultilineTable = false;
+            }
+        }
+      }
+
+      stream.eatSpace();
+
+      if (state.allowMultilineArgument) {
+
+        // STRING
+        if (state.inMultilineString) {
+          if (stream.match('"""')) {
+            state.inMultilineString = false;
+            state.allowMultilineArgument = false;
+          } else {
+            stream.match(/.*/);
+          }
+          return "string";
+        }
+
+        // TABLE
+        if (state.inMultilineTable) {
+          if (stream.match(/\|\s*/)) {
+            return "bracket";
+          } else {
+            stream.match(/[^\|]*/);
+            return state.tableHeaderLine ? "header" : "string";
+          }
+        }
+
+        // DETECT START
+        if (stream.match('"""')) {
+          // String
+          state.inMultilineString = true;
+          return "string";
+        } else if (stream.match("|")) {
+          // Table
+          state.inMultilineTable = true;
+          state.tableHeaderLine = true;
+          return "bracket";
+        }
+
+      }
+
+      // LINE COMMENT
+      if (stream.match(/#.*/)) {
+        return "comment";
+
+      // TAG
+      } else if (!state.inKeywordLine && stream.match(/@\S+/)) {
+        return "tag";
+
+      // FEATURE
+      } else if (!state.inKeywordLine && state.allowFeature && stream.match(/(機能|功能|フィーチャ|기능|โครงหลัก|ความสามารถ|ความต้องการทางธุรกิจ|ಹೆಚ್ಚಳ|గుణము|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ|ਖਾਸੀਅਤ|रूप लेख|وِیژگی|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Үзенчәлеклелек|Свойство|Особина|Мөмкинлек|Могућност|Λειτουργία|Δυνατότητα|Właściwość|Vlastnosť|Trajto|Tính năng|Savybė|Pretty much|Požiadavka|Požadavek|Potrzeba biznesowa|Özellik|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Hwæt|Hwaet|Funzionalità|Funktionalitéit|Funktionalität|Funkcja|Funkcionalnost|Funkcionalitāte|Funkcia|Fungsi|Functionaliteit|Funcționalitate|Funcţionalitate|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Fīča|Feature|Eiginleiki|Egenskap|Egenskab|Característica|Caracteristica|Business Need|Aspekt|Arwedd|Ahoy matey!|Ability):/)) {
+        state.allowScenario = true;
+        state.allowBackground = true;
+        state.allowPlaceholders = false;
+        state.allowSteps = false;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
+        return "keyword";
+
+      // BACKGROUND
+      } else if (!state.inKeywordLine && state.allowBackground && stream.match(/(背景|배경|แนวคิด|ಹಿನ್ನೆಲೆ|నేపథ్యం|ਪਿਛੋਕੜ|पृष्ठभूमि|زمینه|الخلفية|רקע|Тарих|Предыстория|Предистория|Позадина|Передумова|Основа|Контекст|Кереш|Υπόβαθρο|Założenia|Yo\-ho\-ho|Tausta|Taust|Situācija|Rerefons|Pozadina|Pozadie|Pozadí|Osnova|Latar Belakang|Kontext|Konteksts|Kontekstas|Kontekst|Háttér|Hannergrond|Grundlage|Geçmiş|Fundo|Fono|First off|Dis is what went down|Dasar|Contexto|Contexte|Context|Contesto|Cenário de Fundo|Cenario de Fundo|Cefndir|Bối cảnh|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|Ær|Aer|Achtergrond):/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
+        return "keyword";
+
+      // SCENARIO OUTLINE
+      } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景大綱|场景大纲|劇本大綱|剧本大纲|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|시나리오 개요|สรุปเหตุการณ์|โครงสร้างของเหตุการณ์|ವಿವರಣೆ|కథనం|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਟਕਥਾ ਢਾਂਚਾ|परिदृश्य रूपरेखा|سيناريو مخطط|الگوی سناریو|תבנית תרחיש|Сценарийның төзелеше|Сценарий структураси|Структура сценарію|Структура сценария|Структура сценарија|Скица|Рамка на сценарий|Концепт|Περιγραφή Σεναρίου|Wharrimean is|Template Situai|Template Senario|Template Keadaan|Tapausaihio|Szenariogrundriss|Szablon scenariusza|Swa hwær swa|Swa hwaer swa|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Shiver me timbers|Senaryo taslağı|Schema dello scenario|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenārijs pēc parauga|Scenarijaus šablonas|Reckon it's like|Raamstsenaarium|Plang vum Szenario|Plan du Scénario|Plan du scénario|Osnova scénáře|Osnova Scenára|Náčrt Scenáru|Náčrt Scénáře|Náčrt Scenára|MISHUN SRSLY|Menggariskan Senario|Lýsing Dæma|Lýsing Atburðarásar|Konturo de la scenaro|Koncept|Khung tình huống|Khung kịch bản|Forgatókönyv vázlat|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esbozo do escenario|Delineação do Cenário|Delineacao do Cenario|All y'all|Abstrakt Scenario|Abstract Scenario):/)) {
+        state.allowPlaceholders = true;
+        state.allowSteps = true;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
+        return "keyword";
+
+      // EXAMPLES
+      } else if (state.allowScenario && stream.match(/(例子|例|サンプル|예|ชุดของเหตุการณ์|ชุดของตัวอย่าง|ಉದಾಹರಣೆಗಳು|ఉదాహరణలు|ਉਦਾਹਰਨਾਂ|उदाहरण|نمونه ها|امثلة|דוגמאות|Үрнәкләр|Сценарији|Примеры|Примери|Приклади|Мисоллар|Мисаллар|Σενάρια|Παραδείγματα|You'll wanna|Voorbeelden|Variantai|Tapaukset|Se þe|Se the|Se ðe|Scenarios|Scenariji|Scenarijai|Przykłady|Primjeri|Primeri|Příklady|Príklady|Piemēri|Példák|Pavyzdžiai|Paraugs|Örnekler|Juhtumid|Exemplos|Exemples|Exemple|Exempel|EXAMPLZ|Examples|Esempi|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|Dữ liệu|Dead men tell no tales|Dæmi|Contoh|Cenários|Cenarios|Beispiller|Beispiele|Atburðarásir):/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.allowMultilineArgument = true;
+        return "keyword";
+
+      // SCENARIO
+      } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景|场景|劇本|剧本|シナリオ|시나리오|เหตุการณ์|ಕಥಾಸಾರಾಂಶ|సన్నివేశం|ਪਟਕਥਾ|परिदृश्य|سيناريو|سناریو|תרחיש|Сценарій|Сценарио|Сценарий|Пример|Σενάριο|Tình huống|The thing of it is|Tapaus|Szenario|Swa|Stsenaarium|Skenario|Situai|Senaryo|Senario|Scenaro|Scenariusz|Scenariu|Scénario|Scenario|Scenarijus|Scenārijs|Scenarij|Scenarie|Scénář|Scenár|Primer|MISHUN|Kịch bản|Keadaan|Heave to|Forgatókönyv|Escenario|Escenari|Cenário|Cenario|Awww, look mate|Atburðarás):/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
+        return "keyword";
+
+      // STEPS
+      } else if (!state.inKeywordLine && state.allowSteps && stream.match(/(那麼|那么|而且|當|当|并且|同時|同时|前提|假设|假設|假定|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|하지만|조건|먼저|만일|만약|단|그리고|그러면|และ |เมื่อ |แต่ |ดังนั้น |กำหนดให้ |ಸ್ಥಿತಿಯನ್ನು |ಮತ್ತು |ನೀಡಿದ |ನಂತರ |ಆದರೆ |మరియు |చెప్పబడినది |కాని |ఈ పరిస్థితిలో |అప్పుడు |ਪਰ |ਤਦ |ਜੇਕਰ |ਜਿਵੇਂ ਕਿ |ਜਦੋਂ |ਅਤੇ |यदि |परन्तु |पर |तब |तदा |तथा |जब |चूंकि |किन्तु |कदा |और |अगर |و |هنگامی |متى |لكن |عندما |ثم |بفرض |با فرض |اما |اذاً |آنگاه |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Һәм |Унда |Тоді |Тогда |То |Также |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Нәтиҗәдә |Лекин |Ләкин |Коли |Когда |Когато |Када |Кад |К тому же |І |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Вә |Ва |Бирок |Әмма |Әйтик |Әгәр |Аммо |Али |Але |Агар |А також |А |Τότε |Όταν |Και |Δεδομένου |Αλλά |Þurh |Þegar |Þa þe |Þá |Þa |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Za předpokladu |Za predpokladu |Youse know when youse got |Youse know like when |Yna |Yeah nah |Y'know |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |wann |Ve |Và |Und |Un |ugeholl |Too right |Thurh |Thì |Then y'all |Then |Tha the |Tha |Tetapi |Tapi |Tak |Tada |Tad |Stel |Soit |Siis |Și |Şi |Si |Sed |Se |Så |Quando |Quand |Quan |Pryd |Potom |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Niin |Nhưng |När |Når |Mutta |Men |Mas |Maka |Majd |Mając |Mais |Maar |mä |Ma |Lorsque |Lorsqu'|Logo |Let go and haul |Kun |Kuid |Kui |Kiedy |Khi |Ketika |Kemudian |Keď |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |It's just unbelievable |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben seien |Gegeben sei |Gdy |Gangway! |Fakat |Étant donnés |Etant donnés |Étant données |Etant données |Étant donnée |Etant donnée |Étant donné |Etant donné |Et |És |Entonces |Entón |Então |Entao |En |Eğer ki |Ef |Eeldades |E |Ðurh |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Diberi |Dengan |Den youse gotta |DEN |De |Dato |Dați fiind |Daţi fiind |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |dann |Dan |Dados |Dado |Dadas |Dada |Ða ðe |Ða |Cuando |Cho |Cando |Când |Cand |Cal |But y'all |But at the end of the day I reckon |BUT |But |Buh |Blimey! |Biết |Bet |Bagi |Aye |awer |Avast! |Atunci |Atesa |Atès |Apabila |Anrhegedig a |Angenommen |And y'all |And |AN |An |an |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Ak |Adott |Ac |Aber |A zároveň |A tiež |A taktiež |A také |A |a |7 |\* )/)) {
+        state.inStep = true;
+        state.allowPlaceholders = true;
+        state.allowMultilineArgument = true;
+        state.inKeywordLine = true;
+        return "keyword";
+
+      // INLINE STRING
+      } else if (stream.match(/"[^"]*"?/)) {
+        return "string";
+
+      // PLACEHOLDER
+      } else if (state.allowPlaceholders && stream.match(/<[^>]*>?/)) {
+        return "variable";
+
+      // Fall through
+      } else {
+        stream.next();
+        stream.eatWhile(/[^@"<#]/);
+        return null;
+      }
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-feature", "gherkin");
+
+});
diff --git a/core/media/editors/codemirror/mode/gherkin/gherkin.min.js b/core/media/editors/codemirror/mode/gherkin/gherkin.min.js
new file mode 100644
index 00000000..6777afa9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/gherkin/gherkin.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("gherkin",(function(){return{startState:function(){return{lineNumber:0,tableHeaderLine:!1,allowFeature:!0,allowBackground:!1,allowScenario:!1,allowSteps:!1,allowPlaceholders:!1,allowMultilineArgument:!1,inMultilineString:!1,inMultilineTable:!1,inKeywordLine:!1}},token:function(a,b){if(a.sol()&&(b.lineNumber++,b.inKeywordLine=!1,b.inMultilineTable&&(b.tableHeaderLine=!1,a.match(/\s*\|/,!1)||(b.allowMultilineArgument=!1,b.inMultilineTable=!1))),a.eatSpace(),b.allowMultilineArgument){if(b.inMultilineString)return a.match('"""')?(b.inMultilineString=!1,b.allowMultilineArgument=!1):a.match(/.*/),"string";if(b.inMultilineTable)return a.match(/\|\s*/)?"bracket":(a.match(/[^\|]*/),b.tableHeaderLine?"header":"string");if(a.match('"""'))return b.inMultilineString=!0,"string";if(a.match("|"))return b.inMultilineTable=!0,b.tableHeaderLine=!0,"bracket"}return a.match(/#.*/)?"comment":!b.inKeywordLine&&a.match(/@\S+/)?"tag":!b.inKeywordLine&&b.allowFeature&&a.match(/(機能|功能|フィーチャ|기능|โครงหลัก|ความสามารถ|ความต้องการทางธุรกิจ|ಹೆಚ್ಚಳ|గుణము|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ|ਖਾਸੀਅਤ|रूप लेख|وِیژگی|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Үзенчәлеклелек|Свойство|Особина|Мөмкинлек|Могућност|Λειτουργία|Δυνατότητα|Właściwość|Vlastnosť|Trajto|Tính năng|Savybė|Pretty much|Požiadavka|Požadavek|Potrzeba biznesowa|Özellik|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Hwæt|Hwaet|Funzionalità|Funktionalitéit|Funktionalität|Funkcja|Funkcionalnost|Funkcionalitāte|Funkcia|Fungsi|Functionaliteit|Funcționalitate|Funcţionalitate|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Fīča|Feature|Eiginleiki|Egenskap|Egenskab|Característica|Caracteristica|Business Need|Aspekt|Arwedd|Ahoy matey!|Ability):/)?(b.allowScenario=!0,b.allowBackground=!0,b.allowPlaceholders=!1,b.allowSteps=!1,b.allowMultilineArgument=!1,b.inKeywordLine=!0,"keyword"):!b.inKeywordLine&&b.allowBackground&&a.match(/(背景|배경|แนวคิด|ಹಿನ್ನೆಲೆ|నేపథ్యం|ਪਿਛੋਕੜ|पृष्ठभूमि|زمینه|الخلفية|רקע|Тарих|Предыстория|Предистория|Позадина|Передумова|Основа|Контекст|Кереш|Υπόβαθρο|Założenia|Yo\-ho\-ho|Tausta|Taust|Situācija|Rerefons|Pozadina|Pozadie|Pozadí|Osnova|Latar Belakang|Kontext|Konteksts|Kontekstas|Kontekst|Háttér|Hannergrond|Grundlage|Geçmiş|Fundo|Fono|First off|Dis is what went down|Dasar|Contexto|Contexte|Context|Contesto|Cenário de Fundo|Cenario de Fundo|Cefndir|Bối cảnh|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|Ær|Aer|Achtergrond):/)?(b.allowPlaceholders=!1,b.allowSteps=!0,b.allowBackground=!1,b.allowMultilineArgument=!1,b.inKeywordLine=!0,"keyword"):!b.inKeywordLine&&b.allowScenario&&a.match(/(場景大綱|场景大纲|劇本大綱|剧本大纲|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|시나리오 개요|สรุปเหตุการณ์|โครงสร้างของเหตุการณ์|ವಿವರಣೆ|కథనం|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਟਕਥਾ ਢਾਂਚਾ|परिदृश्य रूपरेखा|سيناريو مخطط|الگوی سناریو|תבנית תרחיש|Сценарийның төзелеше|Сценарий структураси|Структура сценарію|Структура сценария|Структура сценарија|Скица|Рамка на сценарий|Концепт|Περιγραφή Σεναρίου|Wharrimean is|Template Situai|Template Senario|Template Keadaan|Tapausaihio|Szenariogrundriss|Szablon scenariusza|Swa hwær swa|Swa hwaer swa|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Shiver me timbers|Senaryo taslağı|Schema dello scenario|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenārijs pēc parauga|Scenarijaus šablonas|Reckon it's like|Raamstsenaarium|Plang vum Szenario|Plan du Scénario|Plan du scénario|Osnova scénáře|Osnova Scenára|Náčrt Scenáru|Náčrt Scénáře|Náčrt Scenára|MISHUN SRSLY|Menggariskan Senario|Lýsing Dæma|Lýsing Atburðarásar|Konturo de la scenaro|Koncept|Khung tình huống|Khung kịch bản|Forgatókönyv vázlat|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esbozo do escenario|Delineação do Cenário|Delineacao do Cenario|All y'all|Abstrakt Scenario|Abstract Scenario):/)?(b.allowPlaceholders=!0,b.allowSteps=!0,b.allowMultilineArgument=!1,b.inKeywordLine=!0,"keyword"):b.allowScenario&&a.match(/(例子|例|サンプル|예|ชุดของเหตุการณ์|ชุดของตัวอย่าง|ಉದಾಹರಣೆಗಳು|ఉదాహరణలు|ਉਦਾਹਰਨਾਂ|उदाहरण|نمونه ها|امثلة|דוגמאות|Үрнәкләр|Сценарији|Примеры|Примери|Приклади|Мисоллар|Мисаллар|Σενάρια|Παραδείγματα|You'll wanna|Voorbeelden|Variantai|Tapaukset|Se þe|Se the|Se ðe|Scenarios|Scenariji|Scenarijai|Przykłady|Primjeri|Primeri|Příklady|Príklady|Piemēri|Példák|Pavyzdžiai|Paraugs|Örnekler|Juhtumid|Exemplos|Exemples|Exemple|Exempel|EXAMPLZ|Examples|Esempi|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|Dữ liệu|Dead men tell no tales|Dæmi|Contoh|Cenários|Cenarios|Beispiller|Beispiele|Atburðarásir):/)?(b.allowPlaceholders=!1,b.allowSteps=!0,b.allowBackground=!1,b.allowMultilineArgument=!0,"keyword"):!b.inKeywordLine&&b.allowScenario&&a.match(/(場景|场景|劇本|剧本|シナリオ|시나리오|เหตุการณ์|ಕಥಾಸಾರಾಂಶ|సన్నివేశం|ਪਟਕਥਾ|परिदृश्य|سيناريو|سناریو|תרחיש|Сценарій|Сценарио|Сценарий|Пример|Σενάριο|Tình huống|The thing of it is|Tapaus|Szenario|Swa|Stsenaarium|Skenario|Situai|Senaryo|Senario|Scenaro|Scenariusz|Scenariu|Scénario|Scenario|Scenarijus|Scenārijs|Scenarij|Scenarie|Scénář|Scenár|Primer|MISHUN|Kịch bản|Keadaan|Heave to|Forgatókönyv|Escenario|Escenari|Cenário|Cenario|Awww, look mate|Atburðarás):/)?(b.allowPlaceholders=!1,b.allowSteps=!0,b.allowBackground=!1,b.allowMultilineArgument=!1,b.inKeywordLine=!0,"keyword"):!b.inKeywordLine&&b.allowSteps&&a.match(/(那麼|那么|而且|當|当|并且|同時|同时|前提|假设|假設|假定|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|하지만|조건|먼저|만일|만약|단|그리고|그러면|และ |เมื่อ |แต่ |ดังนั้น |กำหนดให้ |ಸ್ಥಿತಿಯನ್ನು |ಮತ್ತು |ನೀಡಿದ |ನಂತರ |ಆದರೆ |మరియు |చెప్పబడినది |కాని |ఈ పరిస్థితిలో |అప్పుడు |ਪਰ |ਤਦ |ਜੇਕਰ |ਜਿਵੇਂ ਕਿ |ਜਦੋਂ |ਅਤੇ |यदि |परन्तु |पर |तब |तदा |तथा |जब |चूंकि |किन्तु |कदा |और |अगर |و |هنگامی |متى |لكن |عندما |ثم |بفرض |با فرض |اما |اذاً |آنگاه |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Һәм |Унда |Тоді |Тогда |То |Также |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Нәтиҗәдә |Лекин |Ләкин |Коли |Когда |Когато |Када |Кад |К тому же |І |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Вә |Ва |Бирок |Әмма |Әйтик |Әгәр |Аммо |Али |Але |Агар |А також |А |Τότε |Όταν |Και |Δεδομένου |Αλλά |Þurh |Þegar |Þa þe |Þá |Þa |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Za předpokladu |Za predpokladu |Youse know when youse got |Youse know like when |Yna |Yeah nah |Y'know |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |wann |Ve |Và |Und |Un |ugeholl |Too right |Thurh |Thì |Then y'all |Then |Tha the |Tha |Tetapi |Tapi |Tak |Tada |Tad |Stel |Soit |Siis |Și |Şi |Si |Sed |Se |Så |Quando |Quand |Quan |Pryd |Potom |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Niin |Nhưng |När |Når |Mutta |Men |Mas |Maka |Majd |Mając |Mais |Maar |mä |Ma |Lorsque |Lorsqu'|Logo |Let go and haul |Kun |Kuid |Kui |Kiedy |Khi |Ketika |Kemudian |Keď |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |It's just unbelievable |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben seien |Gegeben sei |Gdy |Gangway! |Fakat |Étant donnés |Etant donnés |Étant données |Etant données |Étant donnée |Etant donnée |Étant donné |Etant donné |Et |És |Entonces |Entón |Então |Entao |En |Eğer ki |Ef |Eeldades |E |Ðurh |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Diberi |Dengan |Den youse gotta |DEN |De |Dato |Dați fiind |Daţi fiind |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |dann |Dan |Dados |Dado |Dadas |Dada |Ða ðe |Ða |Cuando |Cho |Cando |Când |Cand |Cal |But y'all |But at the end of the day I reckon |BUT |But |Buh |Blimey! |Biết |Bet |Bagi |Aye |awer |Avast! |Atunci |Atesa |Atès |Apabila |Anrhegedig a |Angenommen |And y'all |And |AN |An |an |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Ak |Adott |Ac |Aber |A zároveň |A tiež |A taktiež |A také |A |a |7 |\* )/)?(b.inStep=!0,b.allowPlaceholders=!0,b.allowMultilineArgument=!0,b.inKeywordLine=!0,"keyword"):a.match(/"[^"]*"?/)?"string":b.allowPlaceholders&&a.match(/<[^>]*>?/)?"variable":(a.next(),a.eatWhile(/[^@"<#]/),null)}}})),a.defineMIME("text/x-feature","gherkin")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/go/go.js b/core/media/editors/codemirror/mode/go/go.js
new file mode 100644
index 00000000..36131f10
--- /dev/null
+++ b/core/media/editors/codemirror/mode/go/go.js
@@ -0,0 +1,187 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("go", function(config) {
+  var indentUnit = config.indentUnit;
+
+  var keywords = {
+    "break":true, "case":true, "chan":true, "const":true, "continue":true,
+    "default":true, "defer":true, "else":true, "fallthrough":true, "for":true,
+    "func":true, "go":true, "goto":true, "if":true, "import":true,
+    "interface":true, "map":true, "package":true, "range":true, "return":true,
+    "select":true, "struct":true, "switch":true, "type":true, "var":true,
+    "bool":true, "byte":true, "complex64":true, "complex128":true,
+    "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
+    "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
+    "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true,
+    "rune":true
+  };
+
+  var atoms = {
+    "true":true, "false":true, "iota":true, "nil":true, "append":true,
+    "cap":true, "close":true, "complex":true, "copy":true, "delete":true, "imag":true,
+    "len":true, "make":true, "new":true, "panic":true, "print":true,
+    "println":true, "real":true, "recover":true
+  };
+
+  var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
+
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"' || ch == "'" || ch == "`") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\d\.]/.test(ch)) {
+      if (ch == ".") {
+        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+      } else if (ch == "0") {
+        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+      } else {
+        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+      }
+      return "number";
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+    var cur = stream.current();
+    if (keywords.propertyIsEnumerable(cur)) {
+      if (cur == "case" || cur == "default") curPunc = "case";
+      return "keyword";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && quote != "`" && next == "\\";
+      }
+      if (end || !(escaped || quote == "`"))
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+  function popContext(state) {
+    if (!state.context.prev) return;
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+        if (ctx.type == "case") ctx.type = "}";
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "case") ctx.type = "case";
+      else if (curPunc == "}" && ctx.type == "}") popContext(state);
+      else if (curPunc == ctx.type) popContext(state);
+      state.startOfLine = false;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
+      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
+        state.context.type = "}";
+        return ctx.indented;
+      }
+      var closing = firstChar == ctx.type;
+      if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "{}):",
+    closeBrackets: "()[]{}''\"\"``",
+    fold: "brace",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME("text/x-go", "go");
+
+});
diff --git a/core/media/editors/codemirror/mode/go/go.min.js b/core/media/editors/codemirror/mode/go/go.min.js
new file mode 100644
index 00000000..0bf4182f
--- /dev/null
+++ b/core/media/editors/codemirror/mode/go/go.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("go",(function(b){function c(a,b){var c=a.next();if('"'==c||"'"==c||"`"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[\d\.]/.test(c))return"."==c?a.match(/^[0-9]+([eE][\-+]?[0-9]+)?/):"0"==c?a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^0[0-7]+/):a.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/),"number";if(/[\[\]{}\(\),;\:\.]/.test(c))return i=c,null;if("/"==c){if(a.eat("*"))return b.tokenize=e,e(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(m.test(c))return a.eatWhile(m),"operator";a.eatWhile(/[\w\$_\xa1-\uffff]/);var f=a.current();return k.propertyIsEnumerable(f)?("case"!=f&&"default"!=f||(i="case"),"keyword"):l.propertyIsEnumerable(f)?"atom":"variable"}function d(a){return function(b,d){for(var e,f=!1,g=!1;null!=(e=b.next());){if(e==a&&!f){g=!0;break}f=!f&&"`"!=a&&"\\"==e}return(g||!f&&"`"!=a)&&(d.tokenize=c),"string"}}function e(a,b){for(var d,e=!1;d=a.next();){if("/"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function f(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function g(a,b,c){return a.context=new f(a.indented,b,c,null,a.context)}function h(a){if(a.context.prev){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}}var i,j=b.indentUnit,k={break:!0,case:!0,chan:!0,const:!0,continue:!0,default:!0,defer:!0,else:!0,fallthrough:!0,for:!0,func:!0,go:!0,goto:!0,if:!0,import:!0,interface:!0,map:!0,package:!0,range:!0,return:!0,select:!0,struct:!0,switch:!0,type:!0,var:!0,bool:!0,byte:!0,complex64:!0,complex128:!0,float32:!0,float64:!0,int8:!0,int16:!0,int32:!0,int64:!0,string:!0,uint8:!0,uint16:!0,uint32:!0,uint64:!0,int:!0,uint:!0,uintptr:!0,error:!0,rune:!0},l={true:!0,false:!0,iota:!0,nil:!0,append:!0,cap:!0,close:!0,complex:!0,copy:!0,delete:!0,imag:!0,len:!0,make:!0,new:!0,panic:!0,print:!0,println:!0,real:!0,recover:!0},m=/[+\-*&^%:=<>!|\/]/;return{startState:function(a){return{tokenize:null,context:new f((a||0)-j,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var d=b.context;if(a.sol()&&(null==d.align&&(d.align=!1),b.indented=a.indentation(),b.startOfLine=!0,"case"==d.type&&(d.type="}")),a.eatSpace())return null;i=null;var e=(b.tokenize||c)(a,b);return"comment"==e?e:(null==d.align&&(d.align=!0),"{"==i?g(b,a.column(),"}"):"["==i?g(b,a.column(),"]"):"("==i?g(b,a.column(),")"):"case"==i?d.type="case":"}"==i&&"}"==d.type?h(b):i==d.type&&h(b),b.startOfLine=!1,e)},indent:function(b,d){if(b.tokenize!=c&&null!=b.tokenize)return a.Pass;var e=b.context,f=d&&d.charAt(0);if("case"==e.type&&/^(?:case|default)\b/.test(d))return b.context.type="}",e.indented;var g=f==e.type;return e.align?e.column+(g?0:1):e.indented+(g?0:j)},electricChars:"{}):",closeBrackets:"()[]{}''\"\"``",fold:"brace",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-go","go")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/groovy/groovy.js b/core/media/editors/codemirror/mode/groovy/groovy.js
new file mode 100644
index 00000000..0df97dd0
--- /dev/null
+++ b/core/media/editors/codemirror/mode/groovy/groovy.js
@@ -0,0 +1,230 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("groovy", function(config) {
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+  var keywords = words(
+    "abstract as assert boolean break byte case catch char class const continue def default " +
+    "do double else enum extends final finally float for goto if implements import in " +
+    "instanceof int interface long native new package private protected public return " +
+    "short static strictfp super switch synchronized threadsafe throw throws trait transient " +
+    "try void volatile while");
+  var blockKeywords = words("catch class def do else enum finally for if interface switch trait try while");
+  var standaloneKeywords = words("return break continue");
+  var atoms = words("null true false this");
+
+  var curPunc;
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"' || ch == "'") {
+      return startString(ch, stream, state);
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      if (stream.eat(/eE/)) { stream.eat(/\+\-/); stream.eatWhile(/\d/); }
+      return "number";
+    }
+    if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize.push(tokenComment);
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (expectExpression(state.lastToken, false)) {
+        return startString(ch, stream, state);
+      }
+    }
+    if (ch == "-" && stream.eat(">")) {
+      curPunc = "->";
+      return null;
+    }
+    if (/[+\-*&%=<>!?|\/~]/.test(ch)) {
+      stream.eatWhile(/[+\-*&%=<>|~]/);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    if (ch == "@") { stream.eatWhile(/[\w\$_\.]/); return "meta"; }
+    if (state.lastToken == ".") return "property";
+    if (stream.eat(":")) { curPunc = "proplabel"; return "property"; }
+    var cur = stream.current();
+    if (atoms.propertyIsEnumerable(cur)) { return "atom"; }
+    if (keywords.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      else if (standaloneKeywords.propertyIsEnumerable(cur)) curPunc = "standalone";
+      return "keyword";
+    }
+    return "variable";
+  }
+  tokenBase.isBase = true;
+
+  function startString(quote, stream, state) {
+    var tripleQuoted = false;
+    if (quote != "/" && stream.eat(quote)) {
+      if (stream.eat(quote)) tripleQuoted = true;
+      else return "string";
+    }
+    function t(stream, state) {
+      var escaped = false, next, end = !tripleQuoted;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          if (!tripleQuoted) { break; }
+          if (stream.match(quote + quote)) { end = true; break; }
+        }
+        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
+          state.tokenize.push(tokenBaseUntilBrace());
+          return "string";
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end) state.tokenize.pop();
+      return "string";
+    }
+    state.tokenize.push(t);
+    return t(stream, state);
+  }
+
+  function tokenBaseUntilBrace() {
+    var depth = 1;
+    function t(stream, state) {
+      if (stream.peek() == "}") {
+        depth--;
+        if (depth == 0) {
+          state.tokenize.pop();
+          return state.tokenize[state.tokenize.length-1](stream, state);
+        }
+      } else if (stream.peek() == "{") {
+        depth++;
+      }
+      return tokenBase(stream, state);
+    }
+    t.isBase = true;
+    return t;
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize.pop();
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function expectExpression(last, newline) {
+    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
+      last == "newstatement" || last == "keyword" || last == "proplabel" ||
+      (last == "standalone" && !newline);
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: [tokenBase],
+        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true,
+        lastToken: null
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+        // Automatic semicolon insertion
+        if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) {
+          popContext(state); ctx = state.context;
+        }
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = state.tokenize[state.tokenize.length-1](stream, state);
+      if (style == "comment") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
+      // Handle indentation for {x -> \n ... }
+      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
+        popContext(state);
+        state.context.align = false;
+      }
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
+      state.lastToken = curPunc || style;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (!state.tokenize[state.tokenize.length-1].isBase) return CodeMirror.Pass;
+      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
+      if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
+      var closing = firstChar == ctx.type;
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : config.indentUnit);
+    },
+
+    electricChars: "{}",
+    closeBrackets: {triples: "'\""},
+    fold: "brace"
+  };
+});
+
+CodeMirror.defineMIME("text/x-groovy", "groovy");
+
+});
diff --git a/core/media/editors/codemirror/mode/groovy/groovy.min.js b/core/media/editors/codemirror/mode/groovy/groovy.min.js
new file mode 100644
index 00000000..bb9abef5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/groovy/groovy.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("groovy",(function(b){function c(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function d(a,b){var c=a.next();if('"'==c||"'"==c)return e(c,a,b);if(/[\[\]{}\(\),;\:\.]/.test(c))return l=c,null;if(/\d/.test(c))return a.eatWhile(/[\w\.]/),a.eat(/eE/)&&(a.eat(/\+\-/),a.eatWhile(/\d/)),"number";if("/"==c){if(a.eat("*"))return b.tokenize.push(g),g(a,b);if(a.eat("/"))return a.skipToEnd(),"comment";if(h(b.lastToken,!1))return e(c,a,b)}if("-"==c&&a.eat(">"))return l="->",null;if(/[+\-*&%=<>!?|\/~]/.test(c))return a.eatWhile(/[+\-*&%=<>|~]/),"operator";if(a.eatWhile(/[\w\$_]/),"@"==c)return a.eatWhile(/[\w\$_\.]/),"meta";if("."==b.lastToken)return"property";if(a.eat(":"))return l="proplabel","property";var d=a.current();return p.propertyIsEnumerable(d)?"atom":m.propertyIsEnumerable(d)?(n.propertyIsEnumerable(d)?l="newstatement":o.propertyIsEnumerable(d)&&(l="standalone"),"keyword"):"variable"}function e(a,b,c){function d(b,c){for(var d,g=!1,h=!e;null!=(d=b.next());){if(d==a&&!g){if(!e)break;if(b.match(a+a)){h=!0;break}}if('"'==a&&"$"==d&&!g&&b.eat("{"))return c.tokenize.push(f()),"string";g=!g&&"\\"==d}return h&&c.tokenize.pop(),"string"}var e=!1;if("/"!=a&&b.eat(a)){if(!b.eat(a))return"string";e=!0}return c.tokenize.push(d),d(b,c)}function f(){function a(a,c){if("}"==a.peek()){if(b--,0==b)return c.tokenize.pop(),c.tokenize[c.tokenize.length-1](a,c)}else"{"==a.peek()&&b++;return d(a,c)}var b=1;return a.isBase=!0,a}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize.pop();break}d="*"==c}return"comment"}function h(a,b){return!a||"operator"==a||"->"==a||/[\.\[\{\(,;:]/.test(a)||"newstatement"==a||"keyword"==a||"proplabel"==a||"standalone"==a&&!b}function i(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function j(a,b,c){return a.context=new i(a.indented,b,c,null,a.context)}function k(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var l,m=c("abstract as assert boolean break byte case catch char class const continue def default do double else enum extends final finally float for goto if implements import in instanceof int interface long native new package private protected public return short static strictfp super switch synchronized threadsafe throw throws trait transient try void volatile while"),n=c("catch class def do else enum finally for if interface switch trait try while"),o=c("return break continue"),p=c("null true false this");return d.isBase=!0,{startState:function(a){return{tokenize:[d],context:new i((a||0)-b.indentUnit,0,"top",!1),indented:0,startOfLine:!0,lastToken:null}},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0,"statement"!=c.type||h(b.lastToken,!0)||(k(b),c=b.context)),a.eatSpace())return null;l=null;var d=b.tokenize[b.tokenize.length-1](a,b);if("comment"==d)return d;if(null==c.align&&(c.align=!0),";"!=l&&":"!=l||"statement"!=c.type)if("->"==l&&"statement"==c.type&&"}"==c.prev.type)k(b),b.context.align=!1;else if("{"==l)j(b,a.column(),"}");else if("["==l)j(b,a.column(),"]");else if("("==l)j(b,a.column(),")");else if("}"==l){for(;"statement"==c.type;)c=k(b);for("}"==c.type&&(c=k(b));"statement"==c.type;)c=k(b)}else l==c.type?k(b):("}"==c.type||"top"==c.type||"statement"==c.type&&"newstatement"==l)&&j(b,a.column(),"statement");else k(b);return b.startOfLine=!1,b.lastToken=l||d,d},indent:function(c,d){if(!c.tokenize[c.tokenize.length-1].isBase)return a.Pass;var e=d&&d.charAt(0),f=c.context;"statement"!=f.type||h(c.lastToken,!0)||(f=f.prev);var g=e==f.type;return"statement"==f.type?f.indented+("{"==e?0:b.indentUnit):f.align?f.column+(g?0:1):f.indented+(g?0:b.indentUnit)},electricChars:"{}",closeBrackets:{triples:"'\""},fold:"brace"}})),a.defineMIME("text/x-groovy","groovy")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/haml/haml.js b/core/media/editors/codemirror/mode/haml/haml.js
new file mode 100644
index 00000000..20ae1e19
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haml/haml.js
@@ -0,0 +1,161 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+  // full haml mode. This handled embedded ruby and html fragments too
+  CodeMirror.defineMode("haml", function(config) {
+    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
+    var rubyMode = CodeMirror.getMode(config, "ruby");
+
+    function rubyInQuote(endQuote) {
+      return function(stream, state) {
+        var ch = stream.peek();
+        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
+          // step out of ruby context as it seems to complete processing all the braces
+          stream.next();
+          state.tokenize = html;
+          return "closeAttributeTag";
+        } else {
+          return ruby(stream, state);
+        }
+      };
+    }
+
+    function ruby(stream, state) {
+      if (stream.match("-#")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      return rubyMode.token(stream, state.rubyState);
+    }
+
+    function html(stream, state) {
+      var ch = stream.peek();
+
+      // handle haml declarations. All declarations that cant be handled here
+      // will be passed to html mode
+      if (state.previousToken.style == "comment" ) {
+        if (state.indented > state.previousToken.indented) {
+          stream.skipToEnd();
+          return "commentLine";
+        }
+      }
+
+      if (state.startOfLine) {
+        if (ch == "!" && stream.match("!!")) {
+          stream.skipToEnd();
+          return "tag";
+        } else if (stream.match(/^%[\w:#\.]+=/)) {
+          state.tokenize = ruby;
+          return "hamlTag";
+        } else if (stream.match(/^%[\w:]+/)) {
+          return "hamlTag";
+        } else if (ch == "/" ) {
+          stream.skipToEnd();
+          return "comment";
+        }
+      }
+
+      if (state.startOfLine || state.previousToken.style == "hamlTag") {
+        if ( ch == "#" || ch == ".") {
+          stream.match(/[\w-#\.]*/);
+          return "hamlAttribute";
+        }
+      }
+
+      // donot handle --> as valid ruby, make it HTML close comment instead
+      if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
+        state.tokenize = ruby;
+        return state.tokenize(stream, state);
+      }
+
+      if (state.previousToken.style == "hamlTag" ||
+          state.previousToken.style == "closeAttributeTag" ||
+          state.previousToken.style == "hamlAttribute") {
+        if (ch == "(") {
+          state.tokenize = rubyInQuote(")");
+          return state.tokenize(stream, state);
+        } else if (ch == "{") {
+          if (!stream.match(/^\{%.*/)) {
+            state.tokenize = rubyInQuote("}");
+            return state.tokenize(stream, state);
+          }
+        }
+      }
+
+      return htmlMode.token(stream, state.htmlState);
+    }
+
+    return {
+      // default to html mode
+      startState: function() {
+        var htmlState = CodeMirror.startState(htmlMode);
+        var rubyState = CodeMirror.startState(rubyMode);
+        return {
+          htmlState: htmlState,
+          rubyState: rubyState,
+          indented: 0,
+          previousToken: { style: null, indented: 0},
+          tokenize: html
+        };
+      },
+
+      copyState: function(state) {
+        return {
+          htmlState : CodeMirror.copyState(htmlMode, state.htmlState),
+          rubyState: CodeMirror.copyState(rubyMode, state.rubyState),
+          indented: state.indented,
+          previousToken: state.previousToken,
+          tokenize: state.tokenize
+        };
+      },
+
+      token: function(stream, state) {
+        if (stream.sol()) {
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        var style = state.tokenize(stream, state);
+        state.startOfLine = false;
+        // dont record comment line as we only want to measure comment line with
+        // the opening comment block
+        if (style && style != "commentLine") {
+          state.previousToken = { style: style, indented: state.indented };
+        }
+        // if current state is ruby and the previous token is not `,` reset the
+        // tokenize to html
+        if (stream.eol() && state.tokenize == ruby) {
+          stream.backUp(1);
+          var ch = stream.peek();
+          stream.next();
+          if (ch && ch != ",") {
+            state.tokenize = html;
+          }
+        }
+        // reprocess some of the specific style tag when finish setting previousToken
+        if (style == "hamlTag") {
+          style = "tag";
+        } else if (style == "commentLine") {
+          style = "comment";
+        } else if (style == "hamlAttribute") {
+          style = "attribute";
+        } else if (style == "closeAttributeTag") {
+          style = null;
+        }
+        return style;
+      }
+    };
+  }, "htmlmixed", "ruby");
+
+  CodeMirror.defineMIME("text/x-haml", "haml");
+});
diff --git a/core/media/editors/codemirror/mode/haml/haml.min.js b/core/media/editors/codemirror/mode/haml/haml.min.js
new file mode 100644
index 00000000..9d9d9e86
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haml/haml.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../ruby/ruby")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../ruby/ruby"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("haml",(function(b){function c(a){return function(b,c){var f=b.peek();return f==a&&1==c.rubyState.tokenize.length?(b.next(),c.tokenize=e,"closeAttributeTag"):d(b,c)}}function d(a,b){return a.match("-#")?(a.skipToEnd(),"comment"):g.token(a,b.rubyState)}function e(a,b){var e=a.peek();if("comment"==b.previousToken.style&&b.indented>b.previousToken.indented)return a.skipToEnd(),"commentLine";if(b.startOfLine){if("!"==e&&a.match("!!"))return a.skipToEnd(),"tag";if(a.match(/^%[\w:#\.]+=/))return b.tokenize=d,"hamlTag";if(a.match(/^%[\w:]+/))return"hamlTag";if("/"==e)return a.skipToEnd(),"comment"}if((b.startOfLine||"hamlTag"==b.previousToken.style)&&("#"==e||"."==e))return a.match(/[\w-#\.]*/),"hamlAttribute";if(b.startOfLine&&!a.match("-->",!1)&&("="==e||"-"==e))return b.tokenize=d,b.tokenize(a,b);if("hamlTag"==b.previousToken.style||"closeAttributeTag"==b.previousToken.style||"hamlAttribute"==b.previousToken.style){if("("==e)return b.tokenize=c(")"),b.tokenize(a,b);if("{"==e&&!a.match(/^\{%.*/))return b.tokenize=c("}"),b.tokenize(a,b)}return f.token(a,b.htmlState)}var f=a.getMode(b,{name:"htmlmixed"}),g=a.getMode(b,"ruby");return{startState:function(){var b=a.startState(f),c=a.startState(g);return{htmlState:b,rubyState:c,indented:0,previousToken:{style:null,indented:0},tokenize:e}},copyState:function(b){return{htmlState:a.copyState(f,b.htmlState),rubyState:a.copyState(g,b.rubyState),indented:b.indented,previousToken:b.previousToken,tokenize:b.tokenize}},token:function(a,b){if(a.sol()&&(b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;var c=b.tokenize(a,b);if(b.startOfLine=!1,c&&"commentLine"!=c&&(b.previousToken={style:c,indented:b.indented}),a.eol()&&b.tokenize==d){a.backUp(1);var f=a.peek();a.next(),f&&","!=f&&(b.tokenize=e)}return"hamlTag"==c?c="tag":"commentLine"==c?c="comment":"hamlAttribute"==c?c="attribute":"closeAttributeTag"==c&&(c=null),c}}}),"htmlmixed","ruby"),a.defineMIME("text/x-haml","haml")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/handlebars/handlebars.js b/core/media/editors/codemirror/mode/handlebars/handlebars.js
new file mode 100644
index 00000000..2174e538
--- /dev/null
+++ b/core/media/editors/codemirror/mode/handlebars/handlebars.js
@@ -0,0 +1,62 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"), require("../../addon/mode/multiplex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple", "../../addon/mode/multiplex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode("handlebars-tags", {
+    start: [
+      { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
+      { regex: /\{\{!/,   push: "comment", token: "comment" },
+      { regex: /\{\{/,    push: "handlebars", token: "tag" }
+    ],
+    handlebars: [
+      { regex: /\}\}/, pop: true, token: "tag" },
+
+      // Double and single quotes
+      { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+      { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
+
+      // Handlebars keywords
+      { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
+      { regex: /(?:else|this)\b/, token: "keyword" },
+
+      // Numeral
+      { regex: /\d+/i, token: "number" },
+
+      // Atoms like = and .
+      { regex: /=|~|@|true|false/, token: "atom" },
+
+      // Paths
+      { regex: /(?:\.\.\/)*(?:[A-Za-z_][\w\.]*)+/, token: "variable-2" }
+    ],
+    dash_comment: [
+      { regex: /--\}\}/, pop: true, token: "comment" },
+
+      // Commented code
+      { regex: /./, token: "comment"}
+    ],
+    comment: [
+      { regex: /\}\}/, pop: true, token: "comment" },
+      { regex: /./, token: "comment" }
+    ]
+  });
+
+  CodeMirror.defineMode("handlebars", function(config, parserConfig) {
+    var handlebars = CodeMirror.getMode(config, "handlebars-tags");
+    if (!parserConfig || !parserConfig.base) return handlebars;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base),
+      {open: "{{", close: "}}", mode: handlebars, parseDelimiters: true}
+    );
+  });
+
+  CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
+});
diff --git a/core/media/editors/codemirror/mode/handlebars/handlebars.min.js b/core/media/editors/codemirror/mode/handlebars/handlebars.min.js
new file mode 100644
index 00000000..aa39c113
--- /dev/null
+++ b/core/media/editors/codemirror/mode/handlebars/handlebars.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple","../../addon/mode/multiplex"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("handlebars-tags",{start:[{regex:/\{\{!--/,push:"dash_comment",token:"comment"},{regex:/\{\{!/,push:"comment",token:"comment"},{regex:/\{\{/,push:"handlebars",token:"tag"}],handlebars:[{regex:/\}\}/,pop:!0,token:"tag"},{regex:/"(?:[^\\"]|\\.)*"?/,token:"string"},{regex:/'(?:[^\\']|\\.)*'?/,token:"string"},{regex:/>|[#\/]([A-Za-z_]\w*)/,token:"keyword"},{regex:/(?:else|this)\b/,token:"keyword"},{regex:/\d+/i,token:"number"},{regex:/=|~|@|true|false/,token:"atom"},{regex:/(?:\.\.\/)*(?:[A-Za-z_][\w\.]*)+/,token:"variable-2"}],dash_comment:[{regex:/--\}\}/,pop:!0,token:"comment"},{regex:/./,token:"comment"}],comment:[{regex:/\}\}/,pop:!0,token:"comment"},{regex:/./,token:"comment"}]}),a.defineMode("handlebars",(function(b,c){var d=a.getMode(b,"handlebars-tags");return c&&c.base?a.multiplexingMode(a.getMode(b,c.base),{open:"{{",close:"}}",mode:d,parseDelimiters:!0}):d})),a.defineMIME("text/x-handlebars-template","handlebars")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/haskell-literate/haskell-literate.js b/core/media/editors/codemirror/mode/haskell-literate/haskell-literate.js
new file mode 100644
index 00000000..906415b4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haskell-literate/haskell-literate.js
@@ -0,0 +1,43 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function (mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../haskell/haskell"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../haskell/haskell"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function (CodeMirror) {
+  "use strict"
+
+  CodeMirror.defineMode("haskell-literate", function (config, parserConfig) {
+    var baseMode = CodeMirror.getMode(config, (parserConfig && parserConfig.base) || "haskell")
+
+    return {
+      startState: function () {
+        return {
+          inCode: false,
+          baseState: CodeMirror.startState(baseMode)
+        }
+      },
+      token: function (stream, state) {
+        if (stream.sol()) {
+          if (state.inCode = stream.eat(">"))
+            return "meta"
+        }
+        if (state.inCode) {
+          return baseMode.token(stream, state.baseState)
+        } else {
+          stream.skipToEnd()
+          return "comment"
+        }
+      },
+      innerMode: function (state) {
+        return state.inCode ? {state: state.baseState, mode: baseMode} : null
+      }
+    }
+  }, "haskell")
+
+  CodeMirror.defineMIME("text/x-literate-haskell", "haskell-literate")
+});
diff --git a/core/media/editors/codemirror/mode/haskell-literate/haskell-literate.min.js b/core/media/editors/codemirror/mode/haskell-literate/haskell-literate.min.js
new file mode 100644
index 00000000..ba0b0c6e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haskell-literate/haskell-literate.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../haskell/haskell")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../haskell/haskell"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("haskell-literate",(function(b,c){var d=a.getMode(b,c&&c.base||"haskell");return{startState:function(){return{inCode:!1,baseState:a.startState(d)}},token:function(a,b){return a.sol()&&(b.inCode=a.eat(">"))?"meta":b.inCode?d.token(a,b.baseState):(a.skipToEnd(),"comment")},innerMode:function(a){return a.inCode?{state:a.baseState,mode:d}:null}}}),"haskell"),a.defineMIME("text/x-literate-haskell","haskell-literate")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/haskell/haskell.js b/core/media/editors/codemirror/mode/haskell/haskell.js
new file mode 100644
index 00000000..acc52b5c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haskell/haskell.js
@@ -0,0 +1,268 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("haskell", function(_config, modeConfig) {
+
+  function switchState(source, setState, f) {
+    setState(f);
+    return f(source, setState);
+  }
+
+  // These should all be Unicode extended, as per the Haskell 2010 report
+  var smallRE = /[a-z_]/;
+  var largeRE = /[A-Z]/;
+  var digitRE = /\d/;
+  var hexitRE = /[0-9A-Fa-f]/;
+  var octitRE = /[0-7]/;
+  var idRE = /[a-z_A-Z0-9'\xa1-\uffff]/;
+  var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/;
+  var specialRE = /[(),;[\]`{}]/;
+  var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
+
+  function normal(source, setState) {
+    if (source.eatWhile(whiteCharRE)) {
+      return null;
+    }
+
+    var ch = source.next();
+    if (specialRE.test(ch)) {
+      if (ch == '{' && source.eat('-')) {
+        var t = "comment";
+        if (source.eat('#')) {
+          t = "meta";
+        }
+        return switchState(source, setState, ncomment(t, 1));
+      }
+      return null;
+    }
+
+    if (ch == '\'') {
+      if (source.eat('\\')) {
+        source.next();  // should handle other escapes here
+      }
+      else {
+        source.next();
+      }
+      if (source.eat('\'')) {
+        return "string";
+      }
+      return "string error";
+    }
+
+    if (ch == '"') {
+      return switchState(source, setState, stringLiteral);
+    }
+
+    if (largeRE.test(ch)) {
+      source.eatWhile(idRE);
+      if (source.eat('.')) {
+        return "qualifier";
+      }
+      return "variable-2";
+    }
+
+    if (smallRE.test(ch)) {
+      source.eatWhile(idRE);
+      return "variable";
+    }
+
+    if (digitRE.test(ch)) {
+      if (ch == '0') {
+        if (source.eat(/[xX]/)) {
+          source.eatWhile(hexitRE); // should require at least 1
+          return "integer";
+        }
+        if (source.eat(/[oO]/)) {
+          source.eatWhile(octitRE); // should require at least 1
+          return "number";
+        }
+      }
+      source.eatWhile(digitRE);
+      var t = "number";
+      if (source.match(/^\.\d+/)) {
+        t = "number";
+      }
+      if (source.eat(/[eE]/)) {
+        t = "number";
+        source.eat(/[-+]/);
+        source.eatWhile(digitRE); // should require at least 1
+      }
+      return t;
+    }
+
+    if (ch == "." && source.eat("."))
+      return "keyword";
+
+    if (symbolRE.test(ch)) {
+      if (ch == '-' && source.eat(/-/)) {
+        source.eatWhile(/-/);
+        if (!source.eat(symbolRE)) {
+          source.skipToEnd();
+          return "comment";
+        }
+      }
+      var t = "variable";
+      if (ch == ':') {
+        t = "variable-2";
+      }
+      source.eatWhile(symbolRE);
+      return t;
+    }
+
+    return "error";
+  }
+
+  function ncomment(type, nest) {
+    if (nest == 0) {
+      return normal;
+    }
+    return function(source, setState) {
+      var currNest = nest;
+      while (!source.eol()) {
+        var ch = source.next();
+        if (ch == '{' && source.eat('-')) {
+          ++currNest;
+        }
+        else if (ch == '-' && source.eat('}')) {
+          --currNest;
+          if (currNest == 0) {
+            setState(normal);
+            return type;
+          }
+        }
+      }
+      setState(ncomment(type, currNest));
+      return type;
+    };
+  }
+
+  function stringLiteral(source, setState) {
+    while (!source.eol()) {
+      var ch = source.next();
+      if (ch == '"') {
+        setState(normal);
+        return "string";
+      }
+      if (ch == '\\') {
+        if (source.eol() || source.eat(whiteCharRE)) {
+          setState(stringGap);
+          return "string";
+        }
+        if (source.eat('&')) {
+        }
+        else {
+          source.next(); // should handle other escapes here
+        }
+      }
+    }
+    setState(normal);
+    return "string error";
+  }
+
+  function stringGap(source, setState) {
+    if (source.eat('\\')) {
+      return switchState(source, setState, stringLiteral);
+    }
+    source.next();
+    setState(normal);
+    return "error";
+  }
+
+
+  var wellKnownWords = (function() {
+    var wkw = {};
+    function setType(t) {
+      return function () {
+        for (var i = 0; i < arguments.length; i++)
+          wkw[arguments[i]] = t;
+      };
+    }
+
+    setType("keyword")(
+      "case", "class", "data", "default", "deriving", "do", "else", "foreign",
+      "if", "import", "in", "infix", "infixl", "infixr", "instance", "let",
+      "module", "newtype", "of", "then", "type", "where", "_");
+
+    setType("keyword")(
+      "\.\.", ":", "::", "=", "\\", "<-", "->", "@", "~", "=>");
+
+    setType("builtin")(
+      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<*", "<=",
+      "<$>", "<*>", "=<<", "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*",
+      "*>", "**");
+
+    setType("builtin")(
+      "Applicative", "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum",
+      "Eq", "False", "FilePath", "Float", "Floating", "Fractional", "Functor",
+      "GT", "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
+      "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read",
+      "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS",
+      "String", "True");
+
+    setType("builtin")(
+      "abs", "acos", "acosh", "all", "and", "any", "appendFile", "asTypeOf",
+      "asin", "asinh", "atan", "atan2", "atanh", "break", "catch", "ceiling",
+      "compare", "concat", "concatMap", "const", "cos", "cosh", "curry",
+      "cycle", "decodeFloat", "div", "divMod", "drop", "dropWhile", "either",
+      "elem", "encodeFloat", "enumFrom", "enumFromThen", "enumFromThenTo",
+      "enumFromTo", "error", "even", "exp", "exponent", "fail", "filter",
+      "flip", "floatDigits", "floatRadix", "floatRange", "floor", "fmap",
+      "foldl", "foldl1", "foldr", "foldr1", "fromEnum", "fromInteger",
+      "fromIntegral", "fromRational", "fst", "gcd", "getChar", "getContents",
+      "getLine", "head", "id", "init", "interact", "ioError", "isDenormalized",
+      "isIEEE", "isInfinite", "isNaN", "isNegativeZero", "iterate", "last",
+      "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map",
+      "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound",
+      "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or",
+      "otherwise", "pi", "pred", "print", "product", "properFraction", "pure",
+      "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile",
+      "readIO", "readList", "readLn", "readParen", "reads", "readsPrec",
+      "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse",
+      "round", "scaleFloat", "scanl", "scanl1", "scanr", "scanr1", "seq",
+      "sequence", "sequence_", "show", "showChar", "showList", "showParen",
+      "showString", "shows", "showsPrec", "significand", "signum", "sin",
+      "sinh", "snd", "span", "splitAt", "sqrt", "subtract", "succ", "sum",
+      "tail", "take", "takeWhile", "tan", "tanh", "toEnum", "toInteger",
+      "toRational", "truncate", "uncurry", "undefined", "unlines", "until",
+      "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip",
+      "zip3", "zipWith", "zipWith3");
+
+    var override = modeConfig.overrideKeywords;
+    if (override) for (var word in override) if (override.hasOwnProperty(word))
+      wkw[word] = override[word];
+
+    return wkw;
+  })();
+
+
+
+  return {
+    startState: function ()  { return { f: normal }; },
+    copyState:  function (s) { return { f: s.f }; },
+
+    token: function(stream, state) {
+      var t = state.f(stream, function(s) { state.f = s; });
+      var w = stream.current();
+      return wellKnownWords.hasOwnProperty(w) ? wellKnownWords[w] : t;
+    },
+
+    blockCommentStart: "{-",
+    blockCommentEnd: "-}",
+    lineComment: "--"
+  };
+
+});
+
+CodeMirror.defineMIME("text/x-haskell", "haskell");
+
+});
diff --git a/core/media/editors/codemirror/mode/haskell/haskell.min.js b/core/media/editors/codemirror/mode/haskell/haskell.min.js
new file mode 100644
index 00000000..0f76165a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haskell/haskell.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("haskell",(function(a,b){function c(a,b,c){return b(c),c(a,b)}function d(a,b){if(a.eatWhile(p))return null;var d=a.next();if(o.test(d)){if("{"==d&&a.eat("-")){var g="comment";return a.eat("#")&&(g="meta"),c(a,b,e(g,1))}return null}if("'"==d)return a.eat("\\")?a.next():a.next(),a.eat("'")?"string":"string error";if('"'==d)return c(a,b,f);if(i.test(d))return a.eatWhile(m),a.eat(".")?"qualifier":"variable-2";if(h.test(d))return a.eatWhile(m),"variable";if(j.test(d)){if("0"==d){if(a.eat(/[xX]/))return a.eatWhile(k),"integer";if(a.eat(/[oO]/))return a.eatWhile(l),"number"}a.eatWhile(j);var g="number";return a.match(/^\.\d+/)&&(g="number"),a.eat(/[eE]/)&&(g="number",a.eat(/[-+]/),a.eatWhile(j)),g}if("."==d&&a.eat("."))return"keyword";if(n.test(d)){if("-"==d&&a.eat(/-/)&&(a.eatWhile(/-/),!a.eat(n)))return a.skipToEnd(),"comment";var g="variable";return":"==d&&(g="variable-2"),a.eatWhile(n),g}return"error"}function e(a,b){return 0==b?d:function(c,f){for(var g=b;!c.eol();){var h=c.next();if("{"==h&&c.eat("-"))++g;else if("-"==h&&c.eat("}")&&(--g,0==g))return f(d),a}return f(e(a,g)),a}}function f(a,b){for(;!a.eol();){var c=a.next();if('"'==c)return b(d),"string";if("\\"==c){if(a.eol()||a.eat(p))return b(g),"string";a.eat("&")||a.next()}}return b(d),"string error"}function g(a,b){return a.eat("\\")?c(a,b,f):(a.next(),b(d),"error")}var h=/[a-z_]/,i=/[A-Z]/,j=/\d/,k=/[0-9A-Fa-f]/,l=/[0-7]/,m=/[a-z_A-Z0-9'\xa1-\uffff]/,n=/[-!#$%&*+.\/<=>?@\\^|~:]/,o=/[(),;[\]`{}]/,p=/[ \t\v\f]/,q=(function(){function a(a){return function(){for(var b=0;b<arguments.length;b++)c[arguments[b]]=a}}var c={};a("keyword")("case","class","data","default","deriving","do","else","foreign","if","import","in","infix","infixl","infixr","instance","let","module","newtype","of","then","type","where","_"),a("keyword")("..",":","::","=","\\","<-","->","@","~","=>"),a("builtin")("!!","$!","$","&&","+","++","-",".","/","/=","<","<*","<=","<$>","<*>","=<<","==",">",">=",">>",">>=","^","^^","||","*","*>","**"),a("builtin")("Applicative","Bool","Bounded","Char","Double","EQ","Either","Enum","Eq","False","FilePath","Float","Floating","Fractional","Functor","GT","IO","IOError","Int","Integer","Integral","Just","LT","Left","Maybe","Monad","Nothing","Num","Ord","Ordering","Rational","Read","ReadS","Real","RealFloat","RealFrac","Right","Show","ShowS","String","True"),a("builtin")("abs","acos","acosh","all","and","any","appendFile","asTypeOf","asin","asinh","atan","atan2","atanh","break","catch","ceiling","compare","concat","concatMap","const","cos","cosh","curry","cycle","decodeFloat","div","divMod","drop","dropWhile","either","elem","encodeFloat","enumFrom","enumFromThen","enumFromThenTo","enumFromTo","error","even","exp","exponent","fail","filter","flip","floatDigits","floatRadix","floatRange","floor","fmap","foldl","foldl1","foldr","foldr1","fromEnum","fromInteger","fromIntegral","fromRational","fst","gcd","getChar","getContents","getLine","head","id","init","interact","ioError","isDenormalized","isIEEE","isInfinite","isNaN","isNegativeZero","iterate","last","lcm","length","lex","lines","log","logBase","lookup","map","mapM","mapM_","max","maxBound","maximum","maybe","min","minBound","minimum","mod","negate","not","notElem","null","odd","or","otherwise","pi","pred","print","product","properFraction","pure","putChar","putStr","putStrLn","quot","quotRem","read","readFile","readIO","readList","readLn","readParen","reads","readsPrec","realToFrac","recip","rem","repeat","replicate","return","reverse","round","scaleFloat","scanl","scanl1","scanr","scanr1","seq","sequence","sequence_","show","showChar","showList","showParen","showString","shows","showsPrec","significand","signum","sin","sinh","snd","span","splitAt","sqrt","subtract","succ","sum","tail","take","takeWhile","tan","tanh","toEnum","toInteger","toRational","truncate","uncurry","undefined","unlines","until","unwords","unzip","unzip3","userError","words","writeFile","zip","zip3","zipWith","zipWith3");var d=b.overrideKeywords;if(d)for(var e in d)d.hasOwnProperty(e)&&(c[e]=d[e]);return c})();return{startState:function(){return{f:d}},copyState:function(a){return{f:a.f}},token:function(a,b){var c=b.f(a,(function(a){b.f=a})),d=a.current();return q.hasOwnProperty(d)?q[d]:c},blockCommentStart:"{-",blockCommentEnd:"-}",lineComment:"--"}})),a.defineMIME("text/x-haskell","haskell")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/haxe/haxe.js b/core/media/editors/codemirror/mode/haxe/haxe.js
new file mode 100644
index 00000000..d159d082
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haxe/haxe.js
@@ -0,0 +1,515 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("haxe", function(config, parserConfig) {
+  var indentUnit = config.indentUnit;
+
+  // Tokenizer
+
+  function kw(type) {return {type: type, style: "keyword"};}
+  var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
+  var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
+  var type = kw("typedef");
+  var keywords = {
+    "if": A, "while": A, "else": B, "do": B, "try": B,
+    "return": C, "break": C, "continue": C, "new": C, "throw": C,
+    "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
+    "public": attribute, "private": attribute, "cast": kw("cast"), "import": kw("import"), "macro": kw("macro"),
+    "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
+    "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
+    "in": operator, "never": kw("property_access"), "trace":kw("trace"),
+    "class": type, "abstract":type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
+    "true": atom, "false": atom, "null": atom
+  };
+
+  var isOperatorChar = /[+\-*&%=<>!?|]/;
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  function toUnescaped(stream, end) {
+    var escaped = false, next;
+    while ((next = stream.next()) != null) {
+      if (next == end && !escaped)
+        return true;
+      escaped = !escaped && next == "\\";
+    }
+  }
+
+  // Used as scratch variables to communicate multiple values without
+  // consing up tons of objects.
+  var type, content;
+  function ret(tp, style, cont) {
+    type = tp; content = cont;
+    return style;
+  }
+
+  function haxeTokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"' || ch == "'") {
+      return chain(stream, state, haxeTokenString(ch));
+    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      return ret(ch);
+    } else if (ch == "0" && stream.eat(/x/i)) {
+      stream.eatWhile(/[\da-f]/i);
+      return ret("number", "number");
+    } else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
+      stream.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/);
+      return ret("number", "number");
+    } else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
+      toUnescaped(stream, "/");
+      stream.eatWhile(/[gimsu]/);
+      return ret("regexp", "string-2");
+    } else if (ch == "/") {
+      if (stream.eat("*")) {
+        return chain(stream, state, haxeTokenComment);
+      } else if (stream.eat("/")) {
+        stream.skipToEnd();
+        return ret("comment", "comment");
+      } else {
+        stream.eatWhile(isOperatorChar);
+        return ret("operator", null, stream.current());
+      }
+    } else if (ch == "#") {
+        stream.skipToEnd();
+        return ret("conditional", "meta");
+    } else if (ch == "@") {
+      stream.eat(/:/);
+      stream.eatWhile(/[\w_]/);
+      return ret ("metadata", "meta");
+    } else if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return ret("operator", null, stream.current());
+    } else {
+      var word;
+      if(/[A-Z]/.test(ch)) {
+        stream.eatWhile(/[\w_<>]/);
+        word = stream.current();
+        return ret("type", "variable-3", word);
+      } else {
+        stream.eatWhile(/[\w_]/);
+        var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
+        return (known && state.kwAllowed) ? ret(known.type, known.style, word) :
+                       ret("variable", "variable", word);
+      }
+    }
+  }
+
+  function haxeTokenString(quote) {
+    return function(stream, state) {
+      if (toUnescaped(stream, quote))
+        state.tokenize = haxeTokenBase;
+      return ret("string", "string");
+    };
+  }
+
+  function haxeTokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = haxeTokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ret("comment", "comment");
+  }
+
+  // Parser
+
+  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true};
+
+  function HaxeLexical(indented, column, type, align, prev, info) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.prev = prev;
+    this.info = info;
+    if (align != null) this.align = align;
+  }
+
+  function inScope(state, varname) {
+    for (var v = state.localVars; v; v = v.next)
+      if (v.name == varname) return true;
+  }
+
+  function parseHaxe(state, style, type, content, stream) {
+    var cc = state.cc;
+    // Communicate our context to the combinators.
+    // (Less wasteful than consing up a hundred closures on every call.)
+    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
+
+    if (!state.lexical.hasOwnProperty("align"))
+      state.lexical.align = true;
+
+    while(true) {
+      var combinator = cc.length ? cc.pop() : statement;
+      if (combinator(type, content)) {
+        while(cc.length && cc[cc.length - 1].lex)
+          cc.pop()();
+        if (cx.marked) return cx.marked;
+        if (type == "variable" && inScope(state, content)) return "variable-2";
+        if (type == "variable" && imported(state, content)) return "variable-3";
+        return style;
+      }
+    }
+  }
+
+  function imported(state, typename) {
+    if (/[a-z]/.test(typename.charAt(0)))
+      return false;
+    var len = state.importedtypes.length;
+    for (var i = 0; i<len; i++)
+      if(state.importedtypes[i]==typename) return true;
+  }
+
+  function registerimport(importname) {
+    var state = cx.state;
+    for (var t = state.importedtypes; t; t = t.next)
+      if(t.name == importname) return;
+    state.importedtypes = { name: importname, next: state.importedtypes };
+  }
+  // Combinator utils
+
+  var cx = {state: null, column: null, marked: null, cc: null};
+  function pass() {
+    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
+  }
+  function cont() {
+    pass.apply(null, arguments);
+    return true;
+  }
+  function inList(name, list) {
+    for (var v = list; v; v = v.next)
+      if (v.name == name) return true;
+    return false;
+  }
+  function register(varname) {
+    var state = cx.state;
+    if (state.context) {
+      cx.marked = "def";
+      if (inList(varname, state.localVars)) return;
+      state.localVars = {name: varname, next: state.localVars};
+    } else if (state.globalVars) {
+      if (inList(varname, state.globalVars)) return;
+      state.globalVars = {name: varname, next: state.globalVars};
+    }
+  }
+
+  // Combinators
+
+  var defaultVars = {name: "this", next: null};
+  function pushcontext() {
+    if (!cx.state.context) cx.state.localVars = defaultVars;
+    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
+  }
+  function popcontext() {
+    cx.state.localVars = cx.state.context.vars;
+    cx.state.context = cx.state.context.prev;
+  }
+  popcontext.lex = true;
+  function pushlex(type, info) {
+    var result = function() {
+      var state = cx.state;
+      state.lexical = new HaxeLexical(state.indented, cx.stream.column(), type, null, state.lexical, info);
+    };
+    result.lex = true;
+    return result;
+  }
+  function poplex() {
+    var state = cx.state;
+    if (state.lexical.prev) {
+      if (state.lexical.type == ")")
+        state.indented = state.lexical.indented;
+      state.lexical = state.lexical.prev;
+    }
+  }
+  poplex.lex = true;
+
+  function expect(wanted) {
+    function f(type) {
+      if (type == wanted) return cont();
+      else if (wanted == ";") return pass();
+      else return cont(f);
+    }
+    return f;
+  }
+
+  function statement(type) {
+    if (type == "@") return cont(metadef);
+    if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex);
+    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
+    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
+    if (type == "{") return cont(pushlex("}"), pushcontext, block, poplex, popcontext);
+    if (type == ";") return cont();
+    if (type == "attribute") return cont(maybeattribute);
+    if (type == "function") return cont(functiondef);
+    if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
+                                   poplex, statement, poplex);
+    if (type == "variable") return cont(pushlex("stat"), maybelabel);
+    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
+                                      block, poplex, poplex);
+    if (type == "case") return cont(expression, expect(":"));
+    if (type == "default") return cont(expect(":"));
+    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
+                                     statement, poplex, popcontext);
+    if (type == "import") return cont(importdef, expect(";"));
+    if (type == "typedef") return cont(typedef);
+    return pass(pushlex("stat"), expression, expect(";"), poplex);
+  }
+  function expression(type) {
+    if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
+    if (type == "type" ) return cont(maybeoperator);
+    if (type == "function") return cont(functiondef);
+    if (type == "keyword c") return cont(maybeexpression);
+    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
+    if (type == "operator") return cont(expression);
+    if (type == "[") return cont(pushlex("]"), commasep(maybeexpression, "]"), poplex, maybeoperator);
+    if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);
+    return cont();
+  }
+  function maybeexpression(type) {
+    if (type.match(/[;\}\)\],]/)) return pass();
+    return pass(expression);
+  }
+
+  function maybeoperator(type, value) {
+    if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator);
+    if (type == "operator" || type == ":") return cont(expression);
+    if (type == ";") return;
+    if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator);
+    if (type == ".") return cont(property, maybeoperator);
+    if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator);
+  }
+
+  function maybeattribute(type) {
+    if (type == "attribute") return cont(maybeattribute);
+    if (type == "function") return cont(functiondef);
+    if (type == "var") return cont(vardef1);
+  }
+
+  function metadef(type) {
+    if(type == ":") return cont(metadef);
+    if(type == "variable") return cont(metadef);
+    if(type == "(") return cont(pushlex(")"), commasep(metaargs, ")"), poplex, statement);
+  }
+  function metaargs(type) {
+    if(type == "variable") return cont();
+  }
+
+  function importdef (type, value) {
+    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+    else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
+  }
+
+  function typedef (type, value)
+  {
+    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+    else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
+  }
+
+  function maybelabel(type) {
+    if (type == ":") return cont(poplex, statement);
+    return pass(maybeoperator, expect(";"), poplex);
+  }
+  function property(type) {
+    if (type == "variable") {cx.marked = "property"; return cont();}
+  }
+  function objprop(type) {
+    if (type == "variable") cx.marked = "property";
+    if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression);
+  }
+  function commasep(what, end) {
+    function proceed(type) {
+      if (type == ",") return cont(what, proceed);
+      if (type == end) return cont();
+      return cont(expect(end));
+    }
+    return function(type) {
+      if (type == end) return cont();
+      else return pass(what, proceed);
+    };
+  }
+  function block(type) {
+    if (type == "}") return cont();
+    return pass(statement, block);
+  }
+  function vardef1(type, value) {
+    if (type == "variable"){register(value); return cont(typeuse, vardef2);}
+    return cont();
+  }
+  function vardef2(type, value) {
+    if (value == "=") return cont(expression, vardef2);
+    if (type == ",") return cont(vardef1);
+  }
+  function forspec1(type, value) {
+    if (type == "variable") {
+      register(value);
+      return cont(forin, expression)
+    } else {
+      return pass()
+    }
+  }
+  function forin(_type, value) {
+    if (value == "in") return cont();
+  }
+  function functiondef(type, value) {
+    //function names starting with upper-case letters are recognised as types, so cludging them together here.
+    if (type == "variable" || type == "type") {register(value); return cont(functiondef);}
+    if (value == "new") return cont(functiondef);
+    if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, typeuse, statement, popcontext);
+  }
+  function typeuse(type) {
+    if(type == ":") return cont(typestring);
+  }
+  function typestring(type) {
+    if(type == "type") return cont();
+    if(type == "variable") return cont();
+    if(type == "{") return cont(pushlex("}"), commasep(typeprop, "}"), poplex);
+  }
+  function typeprop(type) {
+    if(type == "variable") return cont(typeuse);
+  }
+  function funarg(type, value) {
+    if (type == "variable") {register(value); return cont(typeuse);}
+  }
+
+  // Interface
+  return {
+    startState: function(basecolumn) {
+      var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
+      var state = {
+        tokenize: haxeTokenBase,
+        reAllowed: true,
+        kwAllowed: true,
+        cc: [],
+        lexical: new HaxeLexical((basecolumn || 0) - indentUnit, 0, "block", false),
+        localVars: parserConfig.localVars,
+        importedtypes: defaulttypes,
+        context: parserConfig.localVars && {vars: parserConfig.localVars},
+        indented: 0
+      };
+      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
+        state.globalVars = parserConfig.globalVars;
+      return state;
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        if (!state.lexical.hasOwnProperty("align"))
+          state.lexical.align = false;
+        state.indented = stream.indentation();
+      }
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      if (type == "comment") return style;
+      state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/));
+      state.kwAllowed = type != '.';
+      return parseHaxe(state, style, type, content, stream);
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != haxeTokenBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
+      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
+      var type = lexical.type, closing = firstChar == type;
+      if (type == "vardef") return lexical.indented + 4;
+      else if (type == "form" && firstChar == "{") return lexical.indented;
+      else if (type == "stat" || type == "form") return lexical.indented + indentUnit;
+      else if (lexical.info == "switch" && !closing)
+        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
+      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
+      else return lexical.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME("text/x-haxe", "haxe");
+
+CodeMirror.defineMode("hxml", function () {
+
+  return {
+    startState: function () {
+      return {
+        define: false,
+        inString: false
+      };
+    },
+    token: function (stream, state) {
+      var ch = stream.peek();
+      var sol = stream.sol();
+
+      ///* comments */
+      if (ch == "#") {
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (sol && ch == "-") {
+        var style = "variable-2";
+
+        stream.eat(/-/);
+
+        if (stream.peek() == "-") {
+          stream.eat(/-/);
+          style = "keyword a";
+        }
+
+        if (stream.peek() == "D") {
+          stream.eat(/[D]/);
+          style = "keyword c";
+          state.define = true;
+        }
+
+        stream.eatWhile(/[A-Z]/i);
+        return style;
+      }
+
+      var ch = stream.peek();
+
+      if (state.inString == false && ch == "'") {
+        state.inString = true;
+        stream.next();
+      }
+
+      if (state.inString == true) {
+        if (stream.skipTo("'")) {
+
+        } else {
+          stream.skipToEnd();
+        }
+
+        if (stream.peek() == "'") {
+          stream.next();
+          state.inString = false;
+        }
+
+        return "string";
+      }
+
+      stream.next();
+      return null;
+    },
+    lineComment: "#"
+  };
+});
+
+CodeMirror.defineMIME("text/x-hxml", "hxml");
+
+});
diff --git a/core/media/editors/codemirror/mode/haxe/haxe.min.js b/core/media/editors/codemirror/mode/haxe/haxe.min.js
new file mode 100644
index 00000000..edadfa62
--- /dev/null
+++ b/core/media/editors/codemirror/mode/haxe/haxe.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("haxe",(function(a,b){function c(a){return{type:a,style:"keyword"}}function d(a,b,c){return b.tokenize=c,c(a,b)}function e(a,b){for(var c,d=!1;null!=(c=a.next());){if(c==b&&!d)return!0;d=!d&&"\\"==c}}function f(a,b,c){return U=a,V=c,b}function g(a,b){var c=a.next();if('"'==c||"'"==c)return d(a,b,h(c));if(/[\[\]{}\(\),;\:\.]/.test(c))return f(c);if("0"==c&&a.eat(/x/i))return a.eatWhile(/[\da-f]/i),f("number","number");if(/\d/.test(c)||"-"==c&&a.eat(/\d/))return a.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/),f("number","number");if(b.reAllowed&&"~"==c&&a.eat(/\//))return e(a,"/"),a.eatWhile(/[gimsu]/),f("regexp","string-2");if("/"==c)return a.eat("*")?d(a,b,i):a.eat("/")?(a.skipToEnd(),f("comment","comment")):(a.eatWhile(ca),f("operator",null,a.current()));if("#"==c)return a.skipToEnd(),f("conditional","meta");if("@"==c)return a.eat(/:/),a.eatWhile(/[\w_]/),f("metadata","meta");if(ca.test(c))return a.eatWhile(ca),f("operator",null,a.current());var g;if(/[A-Z]/.test(c))return a.eatWhile(/[\w_<>]/),g=a.current(),f("type","variable-3",g);a.eatWhile(/[\w_]/);var g=a.current(),j=ba.propertyIsEnumerable(g)&&ba[g];return j&&b.kwAllowed?f(j.type,j.style,g):f("variable","variable",g)}function h(a){return function(b,c){return e(b,a)&&(c.tokenize=g),f("string","string")}}function i(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=g;break}d="*"==c}return f("comment","comment")}function j(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function k(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0}function l(a,b,c,d,e){var f=a.cc;for(ea.state=a,ea.stream=e,ea.marked=null,ea.cc=f,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var g=f.length?f.pop():x;if(g(c,d)){for(;f.length&&f[f.length-1].lex;)f.pop()();return ea.marked?ea.marked:"variable"==c&&k(a,d)?"variable-2":"variable"==c&&m(a,d)?"variable-3":b}}}function m(a,b){if(/[a-z]/.test(b.charAt(0)))return!1;for(var c=a.importedtypes.length,d=0;d<c;d++)if(a.importedtypes[d]==b)return!0}function n(a){for(var b=ea.state,c=b.importedtypes;c;c=c.next)if(c.name==a)return;b.importedtypes={name:a,next:b.importedtypes}}function o(){for(var a=arguments.length-1;a>=0;a--)ea.cc.push(arguments[a])}function p(){return o.apply(null,arguments),!0}function q(a,b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}function r(a){var b=ea.state;if(b.context){if(ea.marked="def",q(a,b.localVars))return;b.localVars={name:a,next:b.localVars}}else if(b.globalVars){if(q(a,b.globalVars))return;b.globalVars={name:a,next:b.globalVars}}}function s(){ea.state.context||(ea.state.localVars=fa),ea.state.context={prev:ea.state.context,vars:ea.state.localVars}}function t(){ea.state.localVars=ea.state.context.vars,ea.state.context=ea.state.context.prev}function u(a,b){var c=function(){var c=ea.state;c.lexical=new j(c.indented,ea.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function v(){var a=ea.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function w(a){function b(c){return c==a?p():";"==a?o():p(b)}return b}function x(a){return"@"==a?p(C):"var"==a?p(u("vardef"),L,w(";"),v):"keyword a"==a?p(u("form"),y,x,v):"keyword b"==a?p(u("form"),x,v):"{"==a?p(u("}"),s,K,v,t):";"==a?p():"attribute"==a?p(B):"function"==a?p(P):"for"==a?p(u("form"),w("("),u(")"),N,w(")"),v,x,v):"variable"==a?p(u("stat"),G):"switch"==a?p(u("form"),y,u("}","switch"),w("{"),K,v,v):"case"==a?p(y,w(":")):"default"==a?p(w(":")):"catch"==a?p(u("form"),s,w("("),T,w(")"),x,v,t):"import"==a?p(E,w(";")):"typedef"==a?p(F):o(u("stat"),y,w(";"),v)}function y(a){return da.hasOwnProperty(a)?p(A):"type"==a?p(A):"function"==a?p(P):"keyword c"==a?p(z):"("==a?p(u(")"),z,w(")"),v,A):"operator"==a?p(y):"["==a?p(u("]"),J(z,"]"),v,A):"{"==a?p(u("}"),J(I,"}"),v,A):p()}function z(a){return a.match(/[;\}\)\],]/)?o():o(y)}function A(a,b){if("operator"==a&&/\+\+|--/.test(b))return p(A);if("operator"==a||":"==a)return p(y);if(";"!=a)return"("==a?p(u(")"),J(y,")"),v,A):"."==a?p(H,A):"["==a?p(u("]"),y,w("]"),v,A):void 0}function B(a){return"attribute"==a?p(B):"function"==a?p(P):"var"==a?p(L):void 0}function C(a){return":"==a?p(C):"variable"==a?p(C):"("==a?p(u(")"),J(D,")"),v,x):void 0}function D(a){if("variable"==a)return p()}function E(a,b){return"variable"==a&&/[A-Z]/.test(b.charAt(0))?(n(b),p()):"variable"==a||"property"==a||"."==a||"*"==b?p(E):void 0}function F(a,b){return"variable"==a&&/[A-Z]/.test(b.charAt(0))?(n(b),p()):"type"==a&&/[A-Z]/.test(b.charAt(0))?p():void 0}function G(a){return":"==a?p(v,x):o(A,w(";"),v)}function H(a){if("variable"==a)return ea.marked="property",p()}function I(a){if("variable"==a&&(ea.marked="property"),da.hasOwnProperty(a))return p(w(":"),y)}function J(a,b){function c(d){return","==d?p(a,c):d==b?p():p(w(b))}return function(d){return d==b?p():o(a,c)}}function K(a){return"}"==a?p():o(x,K)}function L(a,b){return"variable"==a?(r(b),p(Q,M)):p()}function M(a,b){return"="==b?p(y,M):","==a?p(L):void 0}function N(a,b){return"variable"==a?(r(b),p(O,y)):o()}function O(a,b){if("in"==b)return p()}function P(a,b){return"variable"==a||"type"==a?(r(b),p(P)):"new"==b?p(P):"("==a?p(u(")"),s,J(T,")"),v,Q,x,t):void 0}function Q(a){if(":"==a)return p(R)}function R(a){return"type"==a?p():"variable"==a?p():"{"==a?p(u("}"),J(S,"}"),v):void 0}function S(a){if("variable"==a)return p(Q)}function T(a,b){if("variable"==a)return r(b),p(Q)}var U,V,W=a.indentUnit,X=c("keyword a"),Y=c("keyword b"),Z=c("keyword c"),$=c("operator"),_={type:"atom",style:"atom"},aa={type:"attribute",style:"attribute"},U=c("typedef"),ba={if:X,while:X,else:Y,do:Y,try:Y,return:Z,break:Z,continue:Z,new:Z,throw:Z,var:c("var"),inline:aa,static:aa,using:c("import"),public:aa,private:aa,cast:c("cast"),import:c("import"),macro:c("macro"),function:c("function"),catch:c("catch"),untyped:c("untyped"),callback:c("cb"),for:c("for"),switch:c("switch"),case:c("case"),default:c("default"),in:$,never:c("property_access"),trace:c("trace"),class:U,abstract:U,enum:U,interface:U,typedef:U,extends:U,implements:U,dynamic:U,true:_,false:_,null:_},ca=/[+\-*&%=<>!?|]/,da={atom:!0,number:!0,variable:!0,string:!0,regexp:!0},ea={state:null,column:null,marked:null,cc:null},fa={name:"this",next:null};return t.lex=!0,v.lex=!0,{startState:function(a){var c=["Int","Float","String","Void","Std","Bool","Dynamic","Array"],d={tokenize:g,reAllowed:!0,kwAllowed:!0,cc:[],lexical:new j((a||0)-W,0,"block",!1),localVars:b.localVars,importedtypes:c,context:b.localVars&&{vars:b.localVars},indented:0};return b.globalVars&&"object"==typeof b.globalVars&&(d.globalVars=b.globalVars),d},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==U?c:(b.reAllowed=!("operator"!=U&&"keyword c"!=U&&!U.match(/^[\[{}\(,;:]$/)),b.kwAllowed="."!=U,l(b,c,U,V,a))},indent:function(a,b){if(a.tokenize!=g)return 0;var c=b&&b.charAt(0),d=a.lexical;"stat"==d.type&&"}"==c&&(d=d.prev);var e=d.type,f=c==e;return"vardef"==e?d.indented+4:"form"==e&&"{"==c?d.indented:"stat"==e||"form"==e?d.indented+W:"switch"!=d.info||f?d.align?d.column+(f?0:1):d.indented+(f?0:W):d.indented+(/^(?:case|default)\b/.test(b)?W:2*W)},electricChars:"{}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-haxe","haxe"),a.defineMode("hxml",(function(){return{startState:function(){return{define:!1,inString:!1}},token:function(a,b){var c=a.peek(),d=a.sol();if("#"==c)return a.skipToEnd(),"comment";if(d&&"-"==c){var e="variable-2";return a.eat(/-/),"-"==a.peek()&&(a.eat(/-/),e="keyword a"),"D"==a.peek()&&(a.eat(/[D]/),e="keyword c",b.define=!0),a.eatWhile(/[A-Z]/i),e}var c=a.peek();return 0==b.inString&&"'"==c&&(b.inString=!0,a.next()),1==b.inString?(a.skipTo("'")||a.skipToEnd(),"'"==a.peek()&&(a.next(),b.inString=!1),"string"):(a.next(),null)},lineComment:"#"}})),a.defineMIME("text/x-hxml","hxml")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/htmlembedded/htmlembedded.js b/core/media/editors/codemirror/mode/htmlembedded/htmlembedded.js
new file mode 100644
index 00000000..8099d370
--- /dev/null
+++ b/core/media/editors/codemirror/mode/htmlembedded/htmlembedded.js
@@ -0,0 +1,37 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/multiplex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/multiplex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+    var closeComment = parserConfig.closeComment || "--%>"
+    return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
+      open: parserConfig.openComment || "<%--",
+      close: closeComment,
+      delimStyle: "comment",
+      mode: {token: function(stream) {
+        stream.skipTo(closeComment) || stream.skipToEnd()
+        return "comment"
+      }}
+    }, {
+      open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
+      close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
+      mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
+    });
+  }, "htmlmixed");
+
+  CodeMirror.defineMIME("application/x-ejs", {name: "htmlembedded", scriptingModeSpec:"javascript"});
+  CodeMirror.defineMIME("application/x-aspx", {name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
+  CodeMirror.defineMIME("application/x-jsp", {name: "htmlembedded", scriptingModeSpec:"text/x-java"});
+  CodeMirror.defineMIME("application/x-erb", {name: "htmlembedded", scriptingModeSpec:"ruby"});
+});
diff --git a/core/media/editors/codemirror/mode/htmlembedded/htmlembedded.min.js b/core/media/editors/codemirror/mode/htmlembedded/htmlembedded.min.js
new file mode 100644
index 00000000..05fe675b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/htmlembedded/htmlembedded.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../../addon/mode/multiplex"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("htmlembedded",(function(b,c){var d=c.closeComment||"--%>";return a.multiplexingMode(a.getMode(b,"htmlmixed"),{open:c.openComment||"<%--",close:d,delimStyle:"comment",mode:{token:function(a){return a.skipTo(d)||a.skipToEnd(),"comment"}}},{open:c.open||c.scriptStartRegex||"<%",close:c.close||c.scriptEndRegex||"%>",mode:a.getMode(b,c.scriptingModeSpec)})}),"htmlmixed"),a.defineMIME("application/x-ejs",{name:"htmlembedded",scriptingModeSpec:"javascript"}),a.defineMIME("application/x-aspx",{name:"htmlembedded",scriptingModeSpec:"text/x-csharp"}),a.defineMIME("application/x-jsp",{name:"htmlembedded",scriptingModeSpec:"text/x-java"}),a.defineMIME("application/x-erb",{name:"htmlembedded",scriptingModeSpec:"ruby"})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/htmlmixed/htmlmixed.js b/core/media/editors/codemirror/mode/htmlmixed/htmlmixed.js
new file mode 100644
index 00000000..33398ec5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/htmlmixed/htmlmixed.js
@@ -0,0 +1,152 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var defaultTags = {
+    script: [
+      ["lang", /(javascript|babel)/i, "javascript"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],
+      ["type", /./, "text/plain"],
+      [null, null, "javascript"]
+    ],
+    style:  [
+      ["lang", /^css$/i, "css"],
+      ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"],
+      ["type", /./, "text/plain"],
+      [null, null, "css"]
+    ]
+  };
+
+  function maybeBackup(stream, pat, style) {
+    var cur = stream.current(), close = cur.search(pat);
+    if (close > -1) {
+      stream.backUp(cur.length - close);
+    } else if (cur.match(/<\/?$/)) {
+      stream.backUp(cur.length);
+      if (!stream.match(pat, false)) stream.match(cur);
+    }
+    return style;
+  }
+
+  var attrRegexpCache = {};
+  function getAttrRegexp(attr) {
+    var regexp = attrRegexpCache[attr];
+    if (regexp) return regexp;
+    return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
+  }
+
+  function getAttrValue(text, attr) {
+    var match = text.match(getAttrRegexp(attr))
+    return match ? /^\s*(.*?)\s*$/.exec(match[2])[1] : ""
+  }
+
+  function getTagRegexp(tagName, anchored) {
+    return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
+  }
+
+  function addTags(from, to) {
+    for (var tag in from) {
+      var dest = to[tag] || (to[tag] = []);
+      var source = from[tag];
+      for (var i = source.length - 1; i >= 0; i--)
+        dest.unshift(source[i])
+    }
+  }
+
+  function findMatchingMode(tagInfo, tagText) {
+    for (var i = 0; i < tagInfo.length; i++) {
+      var spec = tagInfo[i];
+      if (!spec[0] || spec[1].test(getAttrValue(tagText, spec[0]))) return spec[2];
+    }
+  }
+
+  CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
+    var htmlMode = CodeMirror.getMode(config, {
+      name: "xml",
+      htmlMode: true,
+      multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
+    });
+
+    var tags = {};
+    var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes;
+    addTags(defaultTags, tags);
+    if (configTags) addTags(configTags, tags);
+    if (configScript) for (var i = configScript.length - 1; i >= 0; i--)
+      tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
+
+    function html(stream, state) {
+      var style = htmlMode.token(stream, state.htmlState), tag = /\btag\b/.test(style), tagName
+      if (tag && !/[<>\s\/]/.test(stream.current()) &&
+          (tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase()) &&
+          tags.hasOwnProperty(tagName)) {
+        state.inTag = tagName + " "
+      } else if (state.inTag && tag && />$/.test(stream.current())) {
+        var inTag = /^([\S]+) (.*)/.exec(state.inTag)
+        state.inTag = null
+        var modeSpec = stream.current() == ">" && findMatchingMode(tags[inTag[1]], inTag[2])
+        var mode = CodeMirror.getMode(config, modeSpec)
+        var endTagA = getTagRegexp(inTag[1], true), endTag = getTagRegexp(inTag[1], false);
+        state.token = function (stream, state) {
+          if (stream.match(endTagA, false)) {
+            state.token = html;
+            state.localState = state.localMode = null;
+            return null;
+          }
+          return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
+        };
+        state.localMode = mode;
+        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+      } else if (state.inTag) {
+        state.inTag += stream.current()
+        if (stream.eol()) state.inTag += " "
+      }
+      return style;
+    };
+
+    return {
+      startState: function () {
+        var state = CodeMirror.startState(htmlMode);
+        return {token: html, inTag: null, localMode: null, localState: null, htmlState: state};
+      },
+
+      copyState: function (state) {
+        var local;
+        if (state.localState) {
+          local = CodeMirror.copyState(state.localMode, state.localState);
+        }
+        return {token: state.token, inTag: state.inTag,
+                localMode: state.localMode, localState: local,
+                htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
+      },
+
+      token: function (stream, state) {
+        return state.token(stream, state);
+      },
+
+      indent: function (state, textAfter, line) {
+        if (!state.localMode || /^\s*<\//.test(textAfter))
+          return htmlMode.indent(state.htmlState, textAfter);
+        else if (state.localMode.indent)
+          return state.localMode.indent(state.localState, textAfter, line);
+        else
+          return CodeMirror.Pass;
+      },
+
+      innerMode: function (state) {
+        return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
+      }
+    };
+  }, "xml", "javascript", "css");
+
+  CodeMirror.defineMIME("text/html", "htmlmixed");
+});
diff --git a/core/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js b/core/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js
new file mode 100644
index 00000000..a30b454e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/htmlmixed/htmlmixed.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=a.current(),e=d.search(b);return e>-1?a.backUp(d.length-e):d.match(/<\/?$/)&&(a.backUp(d.length),a.match(b,!1)||a.match(d)),c}function c(a){var b=i[a];return b?b:i[a]=new RegExp("\\s+"+a+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*")}function d(a,b){var d=a.match(c(b));return d?/^\s*(.*?)\s*$/.exec(d[2])[1]:""}function e(a,b){return new RegExp((b?"^":"")+"</s*"+a+"s*>","i")}function f(a,b){for(var c in a)for(var d=b[c]||(b[c]=[]),e=a[c],f=e.length-1;f>=0;f--)d.unshift(e[f])}function g(a,b){for(var c=0;c<a.length;c++){var e=a[c];if(!e[0]||e[1].test(d(b,e[0])))return e[2]}}var h={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]},i={};a.defineMode("htmlmixed",(function(c,d){function i(d,f){var h,l=j.token(d,f.htmlState),m=/\btag\b/.test(l);if(m&&!/[<>\s\/]/.test(d.current())&&(h=f.htmlState.tagName&&f.htmlState.tagName.toLowerCase())&&k.hasOwnProperty(h))f.inTag=h+" ";else if(f.inTag&&m&&/>$/.test(d.current())){var n=/^([\S]+) (.*)/.exec(f.inTag);f.inTag=null;var o=">"==d.current()&&g(k[n[1]],n[2]),p=a.getMode(c,o),q=e(n[1],!0),r=e(n[1],!1);f.token=function(a,c){return a.match(q,!1)?(c.token=i,c.localState=c.localMode=null,null):b(a,r,c.localMode.token(a,c.localState))},f.localMode=p,f.localState=a.startState(p,j.indent(f.htmlState,""))}else f.inTag&&(f.inTag+=d.current(),d.eol()&&(f.inTag+=" "));return l}var j=a.getMode(c,{name:"xml",htmlMode:!0,multilineTagIndentFactor:d.multilineTagIndentFactor,multilineTagIndentPastTag:d.multilineTagIndentPastTag}),k={},l=d&&d.tags,m=d&&d.scriptTypes;if(f(h,k),l&&f(l,k),m)for(var n=m.length-1;n>=0;n--)k.script.unshift(["type",m[n].matches,m[n].mode]);return{startState:function(){var b=a.startState(j);return{token:i,inTag:null,localMode:null,localState:null,htmlState:b}},copyState:function(b){var c;return b.localState&&(c=a.copyState(b.localMode,b.localState)),{token:b.token,inTag:b.inTag,localMode:b.localMode,localState:c,htmlState:a.copyState(j,b.htmlState)}},token:function(a,b){return b.token(a,b)},indent:function(b,c,d){return!b.localMode||/^\s*<\//.test(c)?j.indent(b.htmlState,c):b.localMode.indent?b.localMode.indent(b.localState,c,d):a.Pass},innerMode:function(a){return{state:a.localState||a.htmlState,mode:a.localMode||j}}}}),"xml","javascript","css"),a.defineMIME("text/html","htmlmixed")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/http/http.js b/core/media/editors/codemirror/mode/http/http.js
new file mode 100644
index 00000000..9a3c5f9f
--- /dev/null
+++ b/core/media/editors/codemirror/mode/http/http.js
@@ -0,0 +1,113 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("http", function() {
+  function failFirstLine(stream, state) {
+    stream.skipToEnd();
+    state.cur = header;
+    return "error";
+  }
+
+  function start(stream, state) {
+    if (stream.match(/^HTTP\/\d\.\d/)) {
+      state.cur = responseStatusCode;
+      return "keyword";
+    } else if (stream.match(/^[A-Z]+/) && /[ \t]/.test(stream.peek())) {
+      state.cur = requestPath;
+      return "keyword";
+    } else {
+      return failFirstLine(stream, state);
+    }
+  }
+
+  function responseStatusCode(stream, state) {
+    var code = stream.match(/^\d+/);
+    if (!code) return failFirstLine(stream, state);
+
+    state.cur = responseStatusText;
+    var status = Number(code[0]);
+    if (status >= 100 && status < 200) {
+      return "positive informational";
+    } else if (status >= 200 && status < 300) {
+      return "positive success";
+    } else if (status >= 300 && status < 400) {
+      return "positive redirect";
+    } else if (status >= 400 && status < 500) {
+      return "negative client-error";
+    } else if (status >= 500 && status < 600) {
+      return "negative server-error";
+    } else {
+      return "error";
+    }
+  }
+
+  function responseStatusText(stream, state) {
+    stream.skipToEnd();
+    state.cur = header;
+    return null;
+  }
+
+  function requestPath(stream, state) {
+    stream.eatWhile(/\S/);
+    state.cur = requestProtocol;
+    return "string-2";
+  }
+
+  function requestProtocol(stream, state) {
+    if (stream.match(/^HTTP\/\d\.\d$/)) {
+      state.cur = header;
+      return "keyword";
+    } else {
+      return failFirstLine(stream, state);
+    }
+  }
+
+  function header(stream) {
+    if (stream.sol() && !stream.eat(/[ \t]/)) {
+      if (stream.match(/^.*?:/)) {
+        return "atom";
+      } else {
+        stream.skipToEnd();
+        return "error";
+      }
+    } else {
+      stream.skipToEnd();
+      return "string";
+    }
+  }
+
+  function body(stream) {
+    stream.skipToEnd();
+    return null;
+  }
+
+  return {
+    token: function(stream, state) {
+      var cur = state.cur;
+      if (cur != header && cur != body && stream.eatSpace()) return null;
+      return cur(stream, state);
+    },
+
+    blankLine: function(state) {
+      state.cur = body;
+    },
+
+    startState: function() {
+      return {cur: start};
+    }
+  };
+});
+
+CodeMirror.defineMIME("message/http", "http");
+
+});
diff --git a/core/media/editors/codemirror/mode/http/http.min.js b/core/media/editors/codemirror/mode/http/http.min.js
new file mode 100644
index 00000000..353ea369
--- /dev/null
+++ b/core/media/editors/codemirror/mode/http/http.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("http",(function(){function a(a,b){return a.skipToEnd(),b.cur=g,"error"}function b(b,d){return b.match(/^HTTP\/\d\.\d/)?(d.cur=c,"keyword"):b.match(/^[A-Z]+/)&&/[ \t]/.test(b.peek())?(d.cur=e,"keyword"):a(b,d)}function c(b,c){var e=b.match(/^\d+/);if(!e)return a(b,c);c.cur=d;var f=Number(e[0]);return f>=100&&f<200?"positive informational":f>=200&&f<300?"positive success":f>=300&&f<400?"positive redirect":f>=400&&f<500?"negative client-error":f>=500&&f<600?"negative server-error":"error"}function d(a,b){return a.skipToEnd(),b.cur=g,null}function e(a,b){return a.eatWhile(/\S/),b.cur=f,"string-2"}function f(b,c){return b.match(/^HTTP\/\d\.\d$/)?(c.cur=g,"keyword"):a(b,c)}function g(a){return a.sol()&&!a.eat(/[ \t]/)?a.match(/^.*?:/)?"atom":(a.skipToEnd(),"error"):(a.skipToEnd(),"string")}function h(a){return a.skipToEnd(),null}return{token:function(a,b){var c=b.cur;return c!=g&&c!=h&&a.eatSpace()?null:c(a,b)},blankLine:function(a){a.cur=h},startState:function(){return{cur:b}}}})),a.defineMIME("message/http","http")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/idl/idl.js b/core/media/editors/codemirror/mode/idl/idl.js
new file mode 100644
index 00000000..07308d71
--- /dev/null
+++ b/core/media/editors/codemirror/mode/idl/idl.js
@@ -0,0 +1,290 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function wordRegexp(words) {
+    return new RegExp('^((' + words.join(')|(') + '))\\b', 'i');
+  };
+
+  var builtinArray = [
+    'a_correlate', 'abs', 'acos', 'adapt_hist_equal', 'alog',
+    'alog2', 'alog10', 'amoeba', 'annotate', 'app_user_dir',
+    'app_user_dir_query', 'arg_present', 'array_equal', 'array_indices',
+    'arrow', 'ascii_template', 'asin', 'assoc', 'atan',
+    'axis', 'axis', 'bandpass_filter', 'bandreject_filter', 'barplot',
+    'bar_plot', 'beseli', 'beselj', 'beselk', 'besely',
+    'beta', 'biginteger', 'bilinear', 'bin_date', 'binary_template',
+    'bindgen', 'binomial', 'bit_ffs', 'bit_population', 'blas_axpy',
+    'blk_con', 'boolarr', 'boolean', 'boxplot', 'box_cursor',
+    'breakpoint', 'broyden', 'bubbleplot', 'butterworth', 'bytarr',
+    'byte', 'byteorder', 'bytscl', 'c_correlate', 'calendar',
+    'caldat', 'call_external', 'call_function', 'call_method',
+    'call_procedure', 'canny', 'catch', 'cd', 'cdf', 'ceil',
+    'chebyshev', 'check_math', 'chisqr_cvf', 'chisqr_pdf', 'choldc',
+    'cholsol', 'cindgen', 'cir_3pnt', 'clipboard', 'close',
+    'clust_wts', 'cluster', 'cluster_tree', 'cmyk_convert', 'code_coverage',
+    'color_convert', 'color_exchange', 'color_quan', 'color_range_map',
+    'colorbar', 'colorize_sample', 'colormap_applicable',
+    'colormap_gradient', 'colormap_rotation', 'colortable',
+    'comfit', 'command_line_args', 'common', 'compile_opt', 'complex',
+    'complexarr', 'complexround', 'compute_mesh_normals', 'cond', 'congrid',
+    'conj', 'constrained_min', 'contour', 'contour', 'convert_coord',
+    'convol', 'convol_fft', 'coord2to3', 'copy_lun', 'correlate',
+    'cos', 'cosh', 'cpu', 'cramer', 'createboxplotdata',
+    'create_cursor', 'create_struct', 'create_view', 'crossp', 'crvlength',
+    'ct_luminance', 'cti_test', 'cursor', 'curvefit', 'cv_coord',
+    'cvttobm', 'cw_animate', 'cw_animate_getp', 'cw_animate_load',
+    'cw_animate_run', 'cw_arcball', 'cw_bgroup', 'cw_clr_index',
+    'cw_colorsel', 'cw_defroi', 'cw_field', 'cw_filesel', 'cw_form',
+    'cw_fslider', 'cw_light_editor', 'cw_light_editor_get',
+    'cw_light_editor_set', 'cw_orient', 'cw_palette_editor',
+    'cw_palette_editor_get', 'cw_palette_editor_set', 'cw_pdmenu',
+    'cw_rgbslider', 'cw_tmpl', 'cw_zoom', 'db_exists',
+    'dblarr', 'dcindgen', 'dcomplex', 'dcomplexarr', 'define_key',
+    'define_msgblk', 'define_msgblk_from_file', 'defroi', 'defsysv',
+    'delvar', 'dendro_plot', 'dendrogram', 'deriv', 'derivsig',
+    'determ', 'device', 'dfpmin', 'diag_matrix', 'dialog_dbconnect',
+    'dialog_message', 'dialog_pickfile', 'dialog_printersetup',
+    'dialog_printjob', 'dialog_read_image',
+    'dialog_write_image', 'dictionary', 'digital_filter', 'dilate', 'dindgen',
+    'dissolve', 'dist', 'distance_measure', 'dlm_load', 'dlm_register',
+    'doc_library', 'double', 'draw_roi', 'edge_dog', 'efont',
+    'eigenql', 'eigenvec', 'ellipse', 'elmhes', 'emboss',
+    'empty', 'enable_sysrtn', 'eof', 'eos', 'erase',
+    'erf', 'erfc', 'erfcx', 'erode', 'errorplot',
+    'errplot', 'estimator_filter', 'execute', 'exit', 'exp',
+    'expand', 'expand_path', 'expint', 'extrac', 'extract_slice',
+    'f_cvf', 'f_pdf', 'factorial', 'fft', 'file_basename',
+    'file_chmod', 'file_copy', 'file_delete', 'file_dirname',
+    'file_expand_path', 'file_gunzip', 'file_gzip', 'file_info',
+    'file_lines', 'file_link', 'file_mkdir', 'file_move',
+    'file_poll_input', 'file_readlink', 'file_same',
+    'file_search', 'file_tar', 'file_test', 'file_untar', 'file_unzip',
+    'file_which', 'file_zip', 'filepath', 'findgen', 'finite',
+    'fix', 'flick', 'float', 'floor', 'flow3',
+    'fltarr', 'flush', 'format_axis_values', 'forward_function', 'free_lun',
+    'fstat', 'fulstr', 'funct', 'function', 'fv_test',
+    'fx_root', 'fz_roots', 'gamma', 'gamma_ct', 'gauss_cvf',
+    'gauss_pdf', 'gauss_smooth', 'gauss2dfit', 'gaussfit',
+    'gaussian_function', 'gaussint', 'get_drive_list', 'get_dxf_objects',
+    'get_kbrd', 'get_login_info',
+    'get_lun', 'get_screen_size', 'getenv', 'getwindows', 'greg2jul',
+    'grib', 'grid_input', 'grid_tps', 'grid3', 'griddata',
+    'gs_iter', 'h_eq_ct', 'h_eq_int', 'hanning', 'hash',
+    'hdf', 'hdf5', 'heap_free', 'heap_gc', 'heap_nosave',
+    'heap_refcount', 'heap_save', 'help', 'hilbert', 'hist_2d',
+    'hist_equal', 'histogram', 'hls', 'hough', 'hqr',
+    'hsv', 'i18n_multibytetoutf8',
+    'i18n_multibytetowidechar', 'i18n_utf8tomultibyte',
+    'i18n_widechartomultibyte',
+    'ibeta', 'icontour', 'iconvertcoord', 'idelete', 'identity',
+    'idl_base64', 'idl_container', 'idl_validname',
+    'idlexbr_assistant', 'idlitsys_createtool',
+    'idlunit', 'iellipse', 'igamma', 'igetcurrent', 'igetdata',
+    'igetid', 'igetproperty', 'iimage', 'image', 'image_cont',
+    'image_statistics', 'image_threshold', 'imaginary', 'imap', 'indgen',
+    'int_2d', 'int_3d', 'int_tabulated', 'intarr', 'interpol',
+    'interpolate', 'interval_volume', 'invert', 'ioctl', 'iopen',
+    'ir_filter', 'iplot', 'ipolygon', 'ipolyline', 'iputdata',
+    'iregister', 'ireset', 'iresolve', 'irotate', 'isa',
+    'isave', 'iscale', 'isetcurrent', 'isetproperty', 'ishft',
+    'isocontour', 'isosurface', 'isurface', 'itext', 'itranslate',
+    'ivector', 'ivolume', 'izoom', 'journal', 'json_parse',
+    'json_serialize', 'jul2greg', 'julday', 'keyword_set', 'krig2d',
+    'kurtosis', 'kw_test', 'l64indgen', 'la_choldc', 'la_cholmprove',
+    'la_cholsol', 'la_determ', 'la_eigenproblem', 'la_eigenql', 'la_eigenvec',
+    'la_elmhes', 'la_gm_linear_model', 'la_hqr', 'la_invert',
+    'la_least_square_equality', 'la_least_squares', 'la_linear_equation',
+    'la_ludc', 'la_lumprove', 'la_lusol',
+    'la_svd', 'la_tridc', 'la_trimprove', 'la_triql', 'la_trired',
+    'la_trisol', 'label_date', 'label_region', 'ladfit', 'laguerre',
+    'lambda', 'lambdap', 'lambertw', 'laplacian', 'least_squares_filter',
+    'leefilt', 'legend', 'legendre', 'linbcg', 'lindgen',
+    'linfit', 'linkimage', 'list', 'll_arc_distance', 'lmfit',
+    'lmgr', 'lngamma', 'lnp_test', 'loadct', 'locale_get',
+    'logical_and', 'logical_or', 'logical_true', 'lon64arr', 'lonarr',
+    'long', 'long64', 'lsode', 'lu_complex', 'ludc',
+    'lumprove', 'lusol', 'm_correlate', 'machar', 'make_array',
+    'make_dll', 'make_rt', 'map', 'mapcontinents', 'mapgrid',
+    'map_2points', 'map_continents', 'map_grid', 'map_image', 'map_patch',
+    'map_proj_forward', 'map_proj_image', 'map_proj_info',
+    'map_proj_init', 'map_proj_inverse',
+    'map_set', 'matrix_multiply', 'matrix_power', 'max', 'md_test',
+    'mean', 'meanabsdev', 'mean_filter', 'median', 'memory',
+    'mesh_clip', 'mesh_decimate', 'mesh_issolid',
+    'mesh_merge', 'mesh_numtriangles',
+    'mesh_obj', 'mesh_smooth', 'mesh_surfacearea',
+    'mesh_validate', 'mesh_volume',
+    'message', 'min', 'min_curve_surf', 'mk_html_help', 'modifyct',
+    'moment', 'morph_close', 'morph_distance',
+    'morph_gradient', 'morph_hitormiss',
+    'morph_open', 'morph_thin', 'morph_tophat', 'multi', 'n_elements',
+    'n_params', 'n_tags', 'ncdf', 'newton', 'noise_hurl',
+    'noise_pick', 'noise_scatter', 'noise_slur', 'norm', 'obj_class',
+    'obj_destroy', 'obj_hasmethod', 'obj_isa', 'obj_new', 'obj_valid',
+    'objarr', 'on_error', 'on_ioerror', 'online_help', 'openr',
+    'openu', 'openw', 'oplot', 'oploterr', 'orderedhash',
+    'p_correlate', 'parse_url', 'particle_trace', 'path_cache', 'path_sep',
+    'pcomp', 'plot', 'plot3d', 'plot', 'plot_3dbox',
+    'plot_field', 'ploterr', 'plots', 'polar_contour', 'polar_surface',
+    'polyfill', 'polyshade', 'pnt_line', 'point_lun', 'polarplot',
+    'poly', 'poly_2d', 'poly_area', 'poly_fit', 'polyfillv',
+    'polygon', 'polyline', 'polywarp', 'popd', 'powell',
+    'pref_commit', 'pref_get', 'pref_set', 'prewitt', 'primes',
+    'print', 'printf', 'printd', 'pro', 'product',
+    'profile', 'profiler', 'profiles', 'project_vol', 'ps_show_fonts',
+    'psafm', 'pseudo', 'ptr_free', 'ptr_new', 'ptr_valid',
+    'ptrarr', 'pushd', 'qgrid3', 'qhull', 'qromb',
+    'qromo', 'qsimp', 'query_*', 'query_ascii', 'query_bmp',
+    'query_csv', 'query_dicom', 'query_gif', 'query_image', 'query_jpeg',
+    'query_jpeg2000', 'query_mrsid', 'query_pict', 'query_png', 'query_ppm',
+    'query_srf', 'query_tiff', 'query_video', 'query_wav', 'r_correlate',
+    'r_test', 'radon', 'randomn', 'randomu', 'ranks',
+    'rdpix', 'read', 'readf', 'read_ascii', 'read_binary',
+    'read_bmp', 'read_csv', 'read_dicom', 'read_gif', 'read_image',
+    'read_interfile', 'read_jpeg', 'read_jpeg2000', 'read_mrsid', 'read_pict',
+    'read_png', 'read_ppm', 'read_spr', 'read_srf', 'read_sylk',
+    'read_tiff', 'read_video', 'read_wav', 'read_wave', 'read_x11_bitmap',
+    'read_xwd', 'reads', 'readu', 'real_part', 'rebin',
+    'recall_commands', 'recon3', 'reduce_colors', 'reform', 'region_grow',
+    'register_cursor', 'regress', 'replicate',
+    'replicate_inplace', 'resolve_all',
+    'resolve_routine', 'restore', 'retall', 'return', 'reverse',
+    'rk4', 'roberts', 'rot', 'rotate', 'round',
+    'routine_filepath', 'routine_info', 'rs_test', 's_test', 'save',
+    'savgol', 'scale3', 'scale3d', 'scatterplot', 'scatterplot3d',
+    'scope_level', 'scope_traceback', 'scope_varfetch',
+    'scope_varname', 'search2d',
+    'search3d', 'sem_create', 'sem_delete', 'sem_lock', 'sem_release',
+    'set_plot', 'set_shading', 'setenv', 'sfit', 'shade_surf',
+    'shade_surf_irr', 'shade_volume', 'shift', 'shift_diff', 'shmdebug',
+    'shmmap', 'shmunmap', 'shmvar', 'show3', 'showfont',
+    'signum', 'simplex', 'sin', 'sindgen', 'sinh',
+    'size', 'skewness', 'skip_lun', 'slicer3', 'slide_image',
+    'smooth', 'sobel', 'socket', 'sort', 'spawn',
+    'sph_4pnt', 'sph_scat', 'spher_harm', 'spl_init', 'spl_interp',
+    'spline', 'spline_p', 'sprsab', 'sprsax', 'sprsin',
+    'sprstp', 'sqrt', 'standardize', 'stddev', 'stop',
+    'strarr', 'strcmp', 'strcompress', 'streamline', 'streamline',
+    'stregex', 'stretch', 'string', 'strjoin', 'strlen',
+    'strlowcase', 'strmatch', 'strmessage', 'strmid', 'strpos',
+    'strput', 'strsplit', 'strtrim', 'struct_assign', 'struct_hide',
+    'strupcase', 'surface', 'surface', 'surfr', 'svdc',
+    'svdfit', 'svsol', 'swap_endian', 'swap_endian_inplace', 'symbol',
+    'systime', 't_cvf', 't_pdf', 't3d', 'tag_names',
+    'tan', 'tanh', 'tek_color', 'temporary', 'terminal_size',
+    'tetra_clip', 'tetra_surface', 'tetra_volume', 'text', 'thin',
+    'thread', 'threed', 'tic', 'time_test2', 'timegen',
+    'timer', 'timestamp', 'timestamptovalues', 'tm_test', 'toc',
+    'total', 'trace', 'transpose', 'tri_surf', 'triangulate',
+    'trigrid', 'triql', 'trired', 'trisol', 'truncate_lun',
+    'ts_coef', 'ts_diff', 'ts_fcast', 'ts_smooth', 'tv',
+    'tvcrs', 'tvlct', 'tvrd', 'tvscl', 'typename',
+    'uindgen', 'uint', 'uintarr', 'ul64indgen', 'ulindgen',
+    'ulon64arr', 'ulonarr', 'ulong', 'ulong64', 'uniq',
+    'unsharp_mask', 'usersym', 'value_locate', 'variance', 'vector',
+    'vector_field', 'vel', 'velovect', 'vert_t3d', 'voigt',
+    'volume', 'voronoi', 'voxel_proj', 'wait', 'warp_tri',
+    'watershed', 'wdelete', 'wf_draw', 'where', 'widget_base',
+    'widget_button', 'widget_combobox', 'widget_control',
+    'widget_displaycontextmenu', 'widget_draw',
+    'widget_droplist', 'widget_event', 'widget_info',
+    'widget_label', 'widget_list',
+    'widget_propertysheet', 'widget_slider', 'widget_tab',
+    'widget_table', 'widget_text',
+    'widget_tree', 'widget_tree_move', 'widget_window',
+    'wiener_filter', 'window',
+    'window', 'write_bmp', 'write_csv', 'write_gif', 'write_image',
+    'write_jpeg', 'write_jpeg2000', 'write_nrif', 'write_pict', 'write_png',
+    'write_ppm', 'write_spr', 'write_srf', 'write_sylk', 'write_tiff',
+    'write_video', 'write_wav', 'write_wave', 'writeu', 'wset',
+    'wshow', 'wtn', 'wv_applet', 'wv_cwt', 'wv_cw_wavelet',
+    'wv_denoise', 'wv_dwt', 'wv_fn_coiflet',
+    'wv_fn_daubechies', 'wv_fn_gaussian',
+    'wv_fn_haar', 'wv_fn_morlet', 'wv_fn_paul',
+    'wv_fn_symlet', 'wv_import_data',
+    'wv_import_wavelet', 'wv_plot3d_wps', 'wv_plot_multires',
+    'wv_pwt', 'wv_tool_denoise',
+    'xbm_edit', 'xdisplayfile', 'xdxf', 'xfont', 'xinteranimate',
+    'xloadct', 'xmanager', 'xmng_tmpl', 'xmtool', 'xobjview',
+    'xobjview_rotate', 'xobjview_write_image',
+    'xpalette', 'xpcolor', 'xplot3d',
+    'xregistered', 'xroi', 'xsq_test', 'xsurface', 'xvaredit',
+    'xvolume', 'xvolume_rotate', 'xvolume_write_image',
+    'xyouts', 'zlib_compress', 'zlib_uncompress', 'zoom', 'zoom_24'
+  ];
+  var builtins = wordRegexp(builtinArray);
+
+  var keywordArray = [
+    'begin', 'end', 'endcase', 'endfor',
+    'endwhile', 'endif', 'endrep', 'endforeach',
+    'break', 'case', 'continue', 'for',
+    'foreach', 'goto', 'if', 'then', 'else',
+    'repeat', 'until', 'switch', 'while',
+    'do', 'pro', 'function'
+  ];
+  var keywords = wordRegexp(keywordArray);
+
+  CodeMirror.registerHelper("hintWords", "idl", builtinArray.concat(keywordArray));
+
+  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
+
+  var singleOperators = /[+\-*&=<>\/@#~$]/;
+  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
+
+  function tokenBase(stream) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match(';')) {
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
+        return 'number';
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
+        return 'number';
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
+        return 'number';
+    }
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; }
+    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; }
+
+    // Handle words
+    if (stream.match(keywords)) { return 'keyword'; }
+    if (stream.match(builtins)) { return 'builtin'; }
+    if (stream.match(identifiers)) { return 'variable'; }
+
+    if (stream.match(singleOperators) || stream.match(boolOperators)) {
+      return 'operator'; }
+
+    // Handle non-detected items
+    stream.next();
+    return null;
+  };
+
+  CodeMirror.defineMode('idl', function() {
+    return {
+      token: function(stream) {
+        return tokenBase(stream);
+      }
+    };
+  });
+
+  CodeMirror.defineMIME('text/x-idl', 'idl');
+});
diff --git a/core/media/editors/codemirror/mode/idl/idl.min.js b/core/media/editors/codemirror/mode/idl/idl.min.js
new file mode 100644
index 00000000..3fba7d44
--- /dev/null
+++ b/core/media/editors/codemirror/mode/idl/idl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function c(a){if(a.eatSpace())return null;if(a.match(";"))return a.skipToEnd(),"comment";if(a.match(/^[0-9\.+-]/,!1)){if(a.match(/^[+-]?0x[0-9a-fA-F]+/))return"number";if(a.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))return"number";if(a.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))return"number"}return a.match(/^"([^"]|(""))*"/)?"string":a.match(/^'([^']|(''))*'/)?"string":a.match(g)?"keyword":a.match(e)?"builtin":a.match(h)?"variable":a.match(i)||a.match(j)?"operator":(a.next(),null)}var d=["a_correlate","abs","acos","adapt_hist_equal","alog","alog2","alog10","amoeba","annotate","app_user_dir","app_user_dir_query","arg_present","array_equal","array_indices","arrow","ascii_template","asin","assoc","atan","axis","axis","bandpass_filter","bandreject_filter","barplot","bar_plot","beseli","beselj","beselk","besely","beta","biginteger","bilinear","bin_date","binary_template","bindgen","binomial","bit_ffs","bit_population","blas_axpy","blk_con","boolarr","boolean","boxplot","box_cursor","breakpoint","broyden","bubbleplot","butterworth","bytarr","byte","byteorder","bytscl","c_correlate","calendar","caldat","call_external","call_function","call_method","call_procedure","canny","catch","cd","cdf","ceil","chebyshev","check_math","chisqr_cvf","chisqr_pdf","choldc","cholsol","cindgen","cir_3pnt","clipboard","close","clust_wts","cluster","cluster_tree","cmyk_convert","code_coverage","color_convert","color_exchange","color_quan","color_range_map","colorbar","colorize_sample","colormap_applicable","colormap_gradient","colormap_rotation","colortable","comfit","command_line_args","common","compile_opt","complex","complexarr","complexround","compute_mesh_normals","cond","congrid","conj","constrained_min","contour","contour","convert_coord","convol","convol_fft","coord2to3","copy_lun","correlate","cos","cosh","cpu","cramer","createboxplotdata","create_cursor","create_struct","create_view","crossp","crvlength","ct_luminance","cti_test","cursor","curvefit","cv_coord","cvttobm","cw_animate","cw_animate_getp","cw_animate_load","cw_animate_run","cw_arcball","cw_bgroup","cw_clr_index","cw_colorsel","cw_defroi","cw_field","cw_filesel","cw_form","cw_fslider","cw_light_editor","cw_light_editor_get","cw_light_editor_set","cw_orient","cw_palette_editor","cw_palette_editor_get","cw_palette_editor_set","cw_pdmenu","cw_rgbslider","cw_tmpl","cw_zoom","db_exists","dblarr","dcindgen","dcomplex","dcomplexarr","define_key","define_msgblk","define_msgblk_from_file","defroi","defsysv","delvar","dendro_plot","dendrogram","deriv","derivsig","determ","device","dfpmin","diag_matrix","dialog_dbconnect","dialog_message","dialog_pickfile","dialog_printersetup","dialog_printjob","dialog_read_image","dialog_write_image","dictionary","digital_filter","dilate","dindgen","dissolve","dist","distance_measure","dlm_load","dlm_register","doc_library","double","draw_roi","edge_dog","efont","eigenql","eigenvec","ellipse","elmhes","emboss","empty","enable_sysrtn","eof","eos","erase","erf","erfc","erfcx","erode","errorplot","errplot","estimator_filter","execute","exit","exp","expand","expand_path","expint","extrac","extract_slice","f_cvf","f_pdf","factorial","fft","file_basename","file_chmod","file_copy","file_delete","file_dirname","file_expand_path","file_gunzip","file_gzip","file_info","file_lines","file_link","file_mkdir","file_move","file_poll_input","file_readlink","file_same","file_search","file_tar","file_test","file_untar","file_unzip","file_which","file_zip","filepath","findgen","finite","fix","flick","float","floor","flow3","fltarr","flush","format_axis_values","forward_function","free_lun","fstat","fulstr","funct","function","fv_test","fx_root","fz_roots","gamma","gamma_ct","gauss_cvf","gauss_pdf","gauss_smooth","gauss2dfit","gaussfit","gaussian_function","gaussint","get_drive_list","get_dxf_objects","get_kbrd","get_login_info","get_lun","get_screen_size","getenv","getwindows","greg2jul","grib","grid_input","grid_tps","grid3","griddata","gs_iter","h_eq_ct","h_eq_int","hanning","hash","hdf","hdf5","heap_free","heap_gc","heap_nosave","heap_refcount","heap_save","help","hilbert","hist_2d","hist_equal","histogram","hls","hough","hqr","hsv","i18n_multibytetoutf8","i18n_multibytetowidechar","i18n_utf8tomultibyte","i18n_widechartomultibyte","ibeta","icontour","iconvertcoord","idelete","identity","idl_base64","idl_container","idl_validname","idlexbr_assistant","idlitsys_createtool","idlunit","iellipse","igamma","igetcurrent","igetdata","igetid","igetproperty","iimage","image","image_cont","image_statistics","image_threshold","imaginary","imap","indgen","int_2d","int_3d","int_tabulated","intarr","interpol","interpolate","interval_volume","invert","ioctl","iopen","ir_filter","iplot","ipolygon","ipolyline","iputdata","iregister","ireset","iresolve","irotate","isa","isave","iscale","isetcurrent","isetproperty","ishft","isocontour","isosurface","isurface","itext","itranslate","ivector","ivolume","izoom","journal","json_parse","json_serialize","jul2greg","julday","keyword_set","krig2d","kurtosis","kw_test","l64indgen","la_choldc","la_cholmprove","la_cholsol","la_determ","la_eigenproblem","la_eigenql","la_eigenvec","la_elmhes","la_gm_linear_model","la_hqr","la_invert","la_least_square_equality","la_least_squares","la_linear_equation","la_ludc","la_lumprove","la_lusol","la_svd","la_tridc","la_trimprove","la_triql","la_trired","la_trisol","label_date","label_region","ladfit","laguerre","lambda","lambdap","lambertw","laplacian","least_squares_filter","leefilt","legend","legendre","linbcg","lindgen","linfit","linkimage","list","ll_arc_distance","lmfit","lmgr","lngamma","lnp_test","loadct","locale_get","logical_and","logical_or","logical_true","lon64arr","lonarr","long","long64","lsode","lu_complex","ludc","lumprove","lusol","m_correlate","machar","make_array","make_dll","make_rt","map","mapcontinents","mapgrid","map_2points","map_continents","map_grid","map_image","map_patch","map_proj_forward","map_proj_image","map_proj_info","map_proj_init","map_proj_inverse","map_set","matrix_multiply","matrix_power","max","md_test","mean","meanabsdev","mean_filter","median","memory","mesh_clip","mesh_decimate","mesh_issolid","mesh_merge","mesh_numtriangles","mesh_obj","mesh_smooth","mesh_surfacearea","mesh_validate","mesh_volume","message","min","min_curve_surf","mk_html_help","modifyct","moment","morph_close","morph_distance","morph_gradient","morph_hitormiss","morph_open","morph_thin","morph_tophat","multi","n_elements","n_params","n_tags","ncdf","newton","noise_hurl","noise_pick","noise_scatter","noise_slur","norm","obj_class","obj_destroy","obj_hasmethod","obj_isa","obj_new","obj_valid","objarr","on_error","on_ioerror","online_help","openr","openu","openw","oplot","oploterr","orderedhash","p_correlate","parse_url","particle_trace","path_cache","path_sep","pcomp","plot","plot3d","plot","plot_3dbox","plot_field","ploterr","plots","polar_contour","polar_surface","polyfill","polyshade","pnt_line","point_lun","polarplot","poly","poly_2d","poly_area","poly_fit","polyfillv","polygon","polyline","polywarp","popd","powell","pref_commit","pref_get","pref_set","prewitt","primes","print","printf","printd","pro","product","profile","profiler","profiles","project_vol","ps_show_fonts","psafm","pseudo","ptr_free","ptr_new","ptr_valid","ptrarr","pushd","qgrid3","qhull","qromb","qromo","qsimp","query_*","query_ascii","query_bmp","query_csv","query_dicom","query_gif","query_image","query_jpeg","query_jpeg2000","query_mrsid","query_pict","query_png","query_ppm","query_srf","query_tiff","query_video","query_wav","r_correlate","r_test","radon","randomn","randomu","ranks","rdpix","read","readf","read_ascii","read_binary","read_bmp","read_csv","read_dicom","read_gif","read_image","read_interfile","read_jpeg","read_jpeg2000","read_mrsid","read_pict","read_png","read_ppm","read_spr","read_srf","read_sylk","read_tiff","read_video","read_wav","read_wave","read_x11_bitmap","read_xwd","reads","readu","real_part","rebin","recall_commands","recon3","reduce_colors","reform","region_grow","register_cursor","regress","replicate","replicate_inplace","resolve_all","resolve_routine","restore","retall","return","reverse","rk4","roberts","rot","rotate","round","routine_filepath","routine_info","rs_test","s_test","save","savgol","scale3","scale3d","scatterplot","scatterplot3d","scope_level","scope_traceback","scope_varfetch","scope_varname","search2d","search3d","sem_create","sem_delete","sem_lock","sem_release","set_plot","set_shading","setenv","sfit","shade_surf","shade_surf_irr","shade_volume","shift","shift_diff","shmdebug","shmmap","shmunmap","shmvar","show3","showfont","signum","simplex","sin","sindgen","sinh","size","skewness","skip_lun","slicer3","slide_image","smooth","sobel","socket","sort","spawn","sph_4pnt","sph_scat","spher_harm","spl_init","spl_interp","spline","spline_p","sprsab","sprsax","sprsin","sprstp","sqrt","standardize","stddev","stop","strarr","strcmp","strcompress","streamline","streamline","stregex","stretch","string","strjoin","strlen","strlowcase","strmatch","strmessage","strmid","strpos","strput","strsplit","strtrim","struct_assign","struct_hide","strupcase","surface","surface","surfr","svdc","svdfit","svsol","swap_endian","swap_endian_inplace","symbol","systime","t_cvf","t_pdf","t3d","tag_names","tan","tanh","tek_color","temporary","terminal_size","tetra_clip","tetra_surface","tetra_volume","text","thin","thread","threed","tic","time_test2","timegen","timer","timestamp","timestamptovalues","tm_test","toc","total","trace","transpose","tri_surf","triangulate","trigrid","triql","trired","trisol","truncate_lun","ts_coef","ts_diff","ts_fcast","ts_smooth","tv","tvcrs","tvlct","tvrd","tvscl","typename","uindgen","uint","uintarr","ul64indgen","ulindgen","ulon64arr","ulonarr","ulong","ulong64","uniq","unsharp_mask","usersym","value_locate","variance","vector","vector_field","vel","velovect","vert_t3d","voigt","volume","voronoi","voxel_proj","wait","warp_tri","watershed","wdelete","wf_draw","where","widget_base","widget_button","widget_combobox","widget_control","widget_displaycontextmenu","widget_draw","widget_droplist","widget_event","widget_info","widget_label","widget_list","widget_propertysheet","widget_slider","widget_tab","widget_table","widget_text","widget_tree","widget_tree_move","widget_window","wiener_filter","window","window","write_bmp","write_csv","write_gif","write_image","write_jpeg","write_jpeg2000","write_nrif","write_pict","write_png","write_ppm","write_spr","write_srf","write_sylk","write_tiff","write_video","write_wav","write_wave","writeu","wset","wshow","wtn","wv_applet","wv_cwt","wv_cw_wavelet","wv_denoise","wv_dwt","wv_fn_coiflet","wv_fn_daubechies","wv_fn_gaussian","wv_fn_haar","wv_fn_morlet","wv_fn_paul","wv_fn_symlet","wv_import_data","wv_import_wavelet","wv_plot3d_wps","wv_plot_multires","wv_pwt","wv_tool_denoise","xbm_edit","xdisplayfile","xdxf","xfont","xinteranimate","xloadct","xmanager","xmng_tmpl","xmtool","xobjview","xobjview_rotate","xobjview_write_image","xpalette","xpcolor","xplot3d","xregistered","xroi","xsq_test","xsurface","xvaredit","xvolume","xvolume_rotate","xvolume_write_image","xyouts","zlib_compress","zlib_uncompress","zoom","zoom_24"],e=b(d),f=["begin","end","endcase","endfor","endwhile","endif","endrep","endforeach","break","case","continue","for","foreach","goto","if","then","else","repeat","until","switch","while","do","pro","function"],g=b(f);a.registerHelper("hintWords","idl",d.concat(f));var h=new RegExp("^[_a-z¡-￿][_a-z0-9¡-￿]*","i"),i=/[+\-*&=<>\/@#~$]/,j=new RegExp("(and|or|eq|lt|le|gt|ge|ne|not)","i");a.defineMode("idl",(function(){return{token:function(a){return c(a)}}})),a.defineMIME("text/x-idl","idl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/javascript/javascript.js b/core/media/editors/codemirror/mode/javascript/javascript.js
new file mode 100644
index 00000000..097c0bbe
--- /dev/null
+++ b/core/media/editors/codemirror/mode/javascript/javascript.js
@@ -0,0 +1,896 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("javascript", function(config, parserConfig) {
+  var indentUnit = config.indentUnit;
+  var statementIndent = parserConfig.statementIndent;
+  var jsonldMode = parserConfig.jsonld;
+  var jsonMode = parserConfig.json || jsonldMode;
+  var isTS = parserConfig.typescript;
+  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
+
+  // Tokenizer
+
+  var keywords = function(){
+    function kw(type) {return {type: type, style: "keyword"};}
+    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d");
+    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
+
+    return {
+      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
+      "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C,
+      "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"),
+      "function": kw("function"), "catch": kw("catch"),
+      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
+      "in": operator, "typeof": operator, "instanceof": operator,
+      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
+      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
+      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
+      "await": C
+    };
+  }();
+
+  var isOperatorChar = /[+\-*&%=<>!?|~^@]/;
+  var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
+
+  function readRegexp(stream) {
+    var escaped = false, next, inSet = false;
+    while ((next = stream.next()) != null) {
+      if (!escaped) {
+        if (next == "/" && !inSet) return;
+        if (next == "[") inSet = true;
+        else if (inSet && next == "]") inSet = false;
+      }
+      escaped = !escaped && next == "\\";
+    }
+  }
+
+  // Used as scratch variables to communicate multiple values without
+  // consing up tons of objects.
+  var type, content;
+  function ret(tp, style, cont) {
+    type = tp; content = cont;
+    return style;
+  }
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
+      return ret("number", "number");
+    } else if (ch == "." && stream.match("..")) {
+      return ret("spread", "meta");
+    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      return ret(ch);
+    } else if (ch == "=" && stream.eat(">")) {
+      return ret("=>", "operator");
+    } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
+      return ret("number", "number");
+    } else if (/\d/.test(ch)) {
+      stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
+      return ret("number", "number");
+    } else if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      } else if (stream.eat("/")) {
+        stream.skipToEnd();
+        return ret("comment", "comment");
+      } else if (expressionAllowed(stream, state, 1)) {
+        readRegexp(stream);
+        stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/);
+        return ret("regexp", "string-2");
+      } else {
+        stream.eat("=");
+        return ret("operator", "operator", stream.current());
+      }
+    } else if (ch == "`") {
+      state.tokenize = tokenQuasi;
+      return tokenQuasi(stream, state);
+    } else if (ch == "#") {
+      stream.skipToEnd();
+      return ret("error", "error");
+    } else if (isOperatorChar.test(ch)) {
+      if (ch != ">" || !state.lexical || state.lexical.type != ">") {
+        if (stream.eat("=")) {
+          if (ch == "!" || ch == "=") stream.eat("=")
+        } else if (/[<>*+\-]/.test(ch)) {
+          stream.eat(ch)
+          if (ch == ">") stream.eat(ch)
+        }
+      }
+      return ret("operator", "operator", stream.current());
+    } else if (wordRE.test(ch)) {
+      stream.eatWhile(wordRE);
+      var word = stream.current()
+      if (state.lastType != ".") {
+        if (keywords.propertyIsEnumerable(word)) {
+          var kw = keywords[word]
+          return ret(kw.type, kw.style, word)
+        }
+        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
+          return ret("async", "keyword", word)
+      }
+      return ret("variable", "variable", word)
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next;
+      if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
+        state.tokenize = tokenBase;
+        return ret("jsonld-keyword", "meta");
+      }
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) break;
+        escaped = !escaped && next == "\\";
+      }
+      if (!escaped) state.tokenize = tokenBase;
+      return ret("string", "string");
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenQuasi(stream, state) {
+    var escaped = false, next;
+    while ((next = stream.next()) != null) {
+      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      escaped = !escaped && next == "\\";
+    }
+    return ret("quasi", "string-2", stream.current());
+  }
+
+  var brackets = "([{}])";
+  // This is a crude lookahead trick to try and notice that we're
+  // parsing the argument patterns for a fat-arrow function before we
+  // actually hit the arrow token. It only works if the arrow is on
+  // the same line as the arguments and there's no strange noise
+  // (comments) in between. Fallback is to only notice when we hit the
+  // arrow, and not declare the arguments as locals for the arrow
+  // body.
+  function findFatArrow(stream, state) {
+    if (state.fatArrowAt) state.fatArrowAt = null;
+    var arrow = stream.string.indexOf("=>", stream.start);
+    if (arrow < 0) return;
+
+    if (isTS) { // Try to skip TypeScript return type declarations after the arguments
+      var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow))
+      if (m) arrow = m.index
+    }
+
+    var depth = 0, sawSomething = false;
+    for (var pos = arrow - 1; pos >= 0; --pos) {
+      var ch = stream.string.charAt(pos);
+      var bracket = brackets.indexOf(ch);
+      if (bracket >= 0 && bracket < 3) {
+        if (!depth) { ++pos; break; }
+        if (--depth == 0) { if (ch == "(") sawSomething = true; break; }
+      } else if (bracket >= 3 && bracket < 6) {
+        ++depth;
+      } else if (wordRE.test(ch)) {
+        sawSomething = true;
+      } else if (/["'\/]/.test(ch)) {
+        return;
+      } else if (sawSomething && !depth) {
+        ++pos;
+        break;
+      }
+    }
+    if (sawSomething && !depth) state.fatArrowAt = pos;
+  }
+
+  // Parser
+
+  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
+
+  function JSLexical(indented, column, type, align, prev, info) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.prev = prev;
+    this.info = info;
+    if (align != null) this.align = align;
+  }
+
+  function inScope(state, varname) {
+    for (var v = state.localVars; v; v = v.next)
+      if (v.name == varname) return true;
+    for (var cx = state.context; cx; cx = cx.prev) {
+      for (var v = cx.vars; v; v = v.next)
+        if (v.name == varname) return true;
+    }
+  }
+
+  function parseJS(state, style, type, content, stream) {
+    var cc = state.cc;
+    // Communicate our context to the combinators.
+    // (Less wasteful than consing up a hundred closures on every call.)
+    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
+
+    if (!state.lexical.hasOwnProperty("align"))
+      state.lexical.align = true;
+
+    while(true) {
+      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
+      if (combinator(type, content)) {
+        while(cc.length && cc[cc.length - 1].lex)
+          cc.pop()();
+        if (cx.marked) return cx.marked;
+        if (type == "variable" && inScope(state, content)) return "variable-2";
+        return style;
+      }
+    }
+  }
+
+  // Combinator utils
+
+  var cx = {state: null, column: null, marked: null, cc: null};
+  function pass() {
+    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
+  }
+  function cont() {
+    pass.apply(null, arguments);
+    return true;
+  }
+  function inList(name, list) {
+    for (var v = list; v; v = v.next) if (v.name == name) return true
+    return false;
+  }
+  function register(varname) {
+    var state = cx.state;
+    cx.marked = "def";
+    if (state.context) {
+      if (state.lexical.info == "var" && state.context && state.context.block) {
+        // FIXME function decls are also not block scoped
+        var newContext = registerVarScoped(varname, state.context)
+        if (newContext != null) {
+          state.context = newContext
+          return
+        }
+      } else if (!inList(varname, state.localVars)) {
+        state.localVars = new Var(varname, state.localVars)
+        return
+      }
+    }
+    // Fall through means this is global
+    if (parserConfig.globalVars && !inList(varname, state.globalVars))
+      state.globalVars = new Var(varname, state.globalVars)
+  }
+  function registerVarScoped(varname, context) {
+    if (!context) {
+      return null
+    } else if (context.block) {
+      var inner = registerVarScoped(varname, context.prev)
+      if (!inner) return null
+      if (inner == context.prev) return context
+      return new Context(inner, context.vars, true)
+    } else if (inList(varname, context.vars)) {
+      return context
+    } else {
+      return new Context(context.prev, new Var(varname, context.vars), false)
+    }
+  }
+
+  function isModifier(name) {
+    return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"
+  }
+
+  // Combinators
+
+  function Context(prev, vars, block) { this.prev = prev; this.vars = vars; this.block = block }
+  function Var(name, next) { this.name = name; this.next = next }
+
+  var defaultVars = new Var("this", new Var("arguments", null))
+  function pushcontext() {
+    cx.state.context = new Context(cx.state.context, cx.state.localVars, false)
+    cx.state.localVars = defaultVars
+  }
+  function pushblockcontext() {
+    cx.state.context = new Context(cx.state.context, cx.state.localVars, true)
+    cx.state.localVars = null
+  }
+  function popcontext() {
+    cx.state.localVars = cx.state.context.vars
+    cx.state.context = cx.state.context.prev
+  }
+  popcontext.lex = true
+  function pushlex(type, info) {
+    var result = function() {
+      var state = cx.state, indent = state.indented;
+      if (state.lexical.type == "stat") indent = state.lexical.indented;
+      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
+        indent = outer.indented;
+      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
+    };
+    result.lex = true;
+    return result;
+  }
+  function poplex() {
+    var state = cx.state;
+    if (state.lexical.prev) {
+      if (state.lexical.type == ")")
+        state.indented = state.lexical.indented;
+      state.lexical = state.lexical.prev;
+    }
+  }
+  poplex.lex = true;
+
+  function expect(wanted) {
+    function exp(type) {
+      if (type == wanted) return cont();
+      else if (wanted == ";") return pass();
+      else return cont(exp);
+    };
+    return exp;
+  }
+
+  function statement(type, value) {
+    if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex);
+    if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
+    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
+    if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
+    if (type == "debugger") return cont(expect(";"));
+    if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext);
+    if (type == ";") return cont();
+    if (type == "if") {
+      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
+        cx.state.cc.pop()();
+      return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);
+    }
+    if (type == "function") return cont(functiondef);
+    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
+    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), className, poplex); }
+    if (type == "variable") {
+      if (isTS && value == "declare") {
+        cx.marked = "keyword"
+        return cont(statement)
+      } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) {
+        cx.marked = "keyword"
+        if (value == "enum") return cont(enumdef);
+        else if (value == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+        else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
+      } else if (isTS && value == "namespace") {
+        cx.marked = "keyword"
+        return cont(pushlex("form"), expression, block, poplex)
+      } else if (isTS && value == "abstract") {
+        cx.marked = "keyword"
+        return cont(statement)
+      } else {
+        return cont(pushlex("stat"), maybelabel);
+      }
+    }
+    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext,
+                                      block, poplex, poplex, popcontext);
+    if (type == "case") return cont(expression, expect(":"));
+    if (type == "default") return cont(expect(":"));
+    if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext);
+    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
+    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
+    if (type == "async") return cont(statement)
+    if (value == "@") return cont(expression, statement)
+    return pass(pushlex("stat"), expression, expect(";"), poplex);
+  }
+  function maybeCatchBinding(type) {
+    if (type == "(") return cont(funarg, expect(")"))
+  }
+  function expression(type, value) {
+    return expressionInner(type, value, false);
+  }
+  function expressionNoComma(type, value) {
+    return expressionInner(type, value, true);
+  }
+  function parenExpr(type) {
+    if (type != "(") return pass()
+    return cont(pushlex(")"), expression, expect(")"), poplex)
+  }
+  function expressionInner(type, value, noComma) {
+    if (cx.state.fatArrowAt == cx.stream.start) {
+      var body = noComma ? arrowBodyNoComma : arrowBody;
+      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);
+      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
+    }
+
+    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
+    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
+    if (type == "function") return cont(functiondef, maybeop);
+    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), classExpression, poplex); }
+    if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression);
+    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
+    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
+    if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
+    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
+    if (type == "quasi") return pass(quasi, maybeop);
+    if (type == "new") return cont(maybeTarget(noComma));
+    if (type == "import") return cont(expression);
+    return cont();
+  }
+  function maybeexpression(type) {
+    if (type.match(/[;\}\)\],]/)) return pass();
+    return pass(expression);
+  }
+
+  function maybeoperatorComma(type, value) {
+    if (type == ",") return cont(expression);
+    return maybeoperatorNoComma(type, value, false);
+  }
+  function maybeoperatorNoComma(type, value, noComma) {
+    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
+    var expr = noComma == false ? expression : expressionNoComma;
+    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
+    if (type == "operator") {
+      if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
+      if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+        return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
+      if (value == "?") return cont(expression, expect(":"), expr);
+      return cont(expr);
+    }
+    if (type == "quasi") { return pass(quasi, me); }
+    if (type == ";") return;
+    if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
+    if (type == ".") return cont(property, me);
+    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
+    if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
+    if (type == "regexp") {
+      cx.state.lastType = cx.marked = "operator"
+      cx.stream.backUp(cx.stream.pos - cx.stream.start - 1)
+      return cont(expr)
+    }
+  }
+  function quasi(type, value) {
+    if (type != "quasi") return pass();
+    if (value.slice(value.length - 2) != "${") return cont(quasi);
+    return cont(expression, continueQuasi);
+  }
+  function continueQuasi(type) {
+    if (type == "}") {
+      cx.marked = "string-2";
+      cx.state.tokenize = tokenQuasi;
+      return cont(quasi);
+    }
+  }
+  function arrowBody(type) {
+    findFatArrow(cx.stream, cx.state);
+    return pass(type == "{" ? statement : expression);
+  }
+  function arrowBodyNoComma(type) {
+    findFatArrow(cx.stream, cx.state);
+    return pass(type == "{" ? statement : expressionNoComma);
+  }
+  function maybeTarget(noComma) {
+    return function(type) {
+      if (type == ".") return cont(noComma ? targetNoComma : target);
+      else if (type == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma)
+      else return pass(noComma ? expressionNoComma : expression);
+    };
+  }
+  function target(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
+  }
+  function targetNoComma(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
+  }
+  function maybelabel(type) {
+    if (type == ":") return cont(poplex, statement);
+    return pass(maybeoperatorComma, expect(";"), poplex);
+  }
+  function property(type) {
+    if (type == "variable") {cx.marked = "property"; return cont();}
+  }
+  function objprop(type, value) {
+    if (type == "async") {
+      cx.marked = "property";
+      return cont(objprop);
+    } else if (type == "variable" || cx.style == "keyword") {
+      cx.marked = "property";
+      if (value == "get" || value == "set") return cont(getterSetter);
+      var m // Work around fat-arrow-detection complication for detecting typescript typed arrow params
+      if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false)))
+        cx.state.fatArrowAt = cx.stream.pos + m[0].length
+      return cont(afterprop);
+    } else if (type == "number" || type == "string") {
+      cx.marked = jsonldMode ? "property" : (cx.style + " property");
+      return cont(afterprop);
+    } else if (type == "jsonld-keyword") {
+      return cont(afterprop);
+    } else if (isTS && isModifier(value)) {
+      cx.marked = "keyword"
+      return cont(objprop)
+    } else if (type == "[") {
+      return cont(expression, maybetype, expect("]"), afterprop);
+    } else if (type == "spread") {
+      return cont(expressionNoComma, afterprop);
+    } else if (value == "*") {
+      cx.marked = "keyword";
+      return cont(objprop);
+    } else if (type == ":") {
+      return pass(afterprop)
+    }
+  }
+  function getterSetter(type) {
+    if (type != "variable") return pass(afterprop);
+    cx.marked = "property";
+    return cont(functiondef);
+  }
+  function afterprop(type) {
+    if (type == ":") return cont(expressionNoComma);
+    if (type == "(") return pass(functiondef);
+  }
+  function commasep(what, end, sep) {
+    function proceed(type, value) {
+      if (sep ? sep.indexOf(type) > -1 : type == ",") {
+        var lex = cx.state.lexical;
+        if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
+        return cont(function(type, value) {
+          if (type == end || value == end) return pass()
+          return pass(what)
+        }, proceed);
+      }
+      if (type == end || value == end) return cont();
+      return cont(expect(end));
+    }
+    return function(type, value) {
+      if (type == end || value == end) return cont();
+      return pass(what, proceed);
+    };
+  }
+  function contCommasep(what, end, info) {
+    for (var i = 3; i < arguments.length; i++)
+      cx.cc.push(arguments[i]);
+    return cont(pushlex(end, info), commasep(what, end), poplex);
+  }
+  function block(type) {
+    if (type == "}") return cont();
+    return pass(statement, block);
+  }
+  function maybetype(type, value) {
+    if (isTS) {
+      if (type == ":") return cont(typeexpr);
+      if (value == "?") return cont(maybetype);
+    }
+  }
+  function mayberettype(type) {
+    if (isTS && type == ":") {
+      if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
+      else return cont(typeexpr)
+    }
+  }
+  function isKW(_, value) {
+    if (value == "is") {
+      cx.marked = "keyword"
+      return cont()
+    }
+  }
+  function typeexpr(type, value) {
+    if (value == "keyof" || value == "typeof") {
+      cx.marked = "keyword"
+      return cont(value == "keyof" ? typeexpr : expressionNoComma)
+    }
+    if (type == "variable" || value == "void") {
+      cx.marked = "type"
+      return cont(afterType)
+    }
+    if (type == "string" || type == "number" || type == "atom") return cont(afterType);
+    if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
+    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
+    if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
+    if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
+  }
+  function maybeReturnType(type) {
+    if (type == "=>") return cont(typeexpr)
+  }
+  function typeprop(type, value) {
+    if (type == "variable" || cx.style == "keyword") {
+      cx.marked = "property"
+      return cont(typeprop)
+    } else if (value == "?") {
+      return cont(typeprop)
+    } else if (type == ":") {
+      return cont(typeexpr)
+    } else if (type == "[") {
+      return cont(expression, maybetype, expect("]"), typeprop)
+    }
+  }
+  function typearg(type, value) {
+    if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
+    if (type == ":") return cont(typeexpr)
+    return pass(typeexpr)
+  }
+  function afterType(type, value) {
+    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
+    if (value == "|" || type == "." || value == "&") return cont(typeexpr)
+    if (type == "[") return cont(expect("]"), afterType)
+    if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
+  }
+  function maybeTypeArgs(_, value) {
+    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
+  }
+  function typeparam() {
+    return pass(typeexpr, maybeTypeDefault)
+  }
+  function maybeTypeDefault(_, value) {
+    if (value == "=") return cont(typeexpr)
+  }
+  function vardef(_, value) {
+    if (value == "enum") {cx.marked = "keyword"; return cont(enumdef)}
+    return pass(pattern, maybetype, maybeAssign, vardefCont);
+  }
+  function pattern(type, value) {
+    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
+    if (type == "variable") { register(value); return cont(); }
+    if (type == "spread") return cont(pattern);
+    if (type == "[") return contCommasep(pattern, "]");
+    if (type == "{") return contCommasep(proppattern, "}");
+  }
+  function proppattern(type, value) {
+    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
+      register(value);
+      return cont(maybeAssign);
+    }
+    if (type == "variable") cx.marked = "property";
+    if (type == "spread") return cont(pattern);
+    if (type == "}") return pass();
+    return cont(expect(":"), pattern, maybeAssign);
+  }
+  function maybeAssign(_type, value) {
+    if (value == "=") return cont(expressionNoComma);
+  }
+  function vardefCont(type) {
+    if (type == ",") return cont(vardef);
+  }
+  function maybeelse(type, value) {
+    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
+  }
+  function forspec(type, value) {
+    if (value == "await") return cont(forspec);
+    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
+  }
+  function forspec1(type) {
+    if (type == "var") return cont(vardef, expect(";"), forspec2);
+    if (type == ";") return cont(forspec2);
+    if (type == "variable") return cont(formaybeinof);
+    return pass(expression, expect(";"), forspec2);
+  }
+  function formaybeinof(_type, value) {
+    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
+    return cont(maybeoperatorComma, forspec2);
+  }
+  function forspec2(type, value) {
+    if (type == ";") return cont(forspec3);
+    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
+    return pass(expression, expect(";"), forspec3);
+  }
+  function forspec3(type) {
+    if (type != ")") cont(expression);
+  }
+  function functiondef(type, value) {
+    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
+    if (type == "variable") {register(value); return cont(functiondef);}
+    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext);
+    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
+  }
+  function funarg(type, value) {
+    if (value == "@") cont(expression, funarg)
+    if (type == "spread") return cont(funarg);
+    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); }
+    return pass(pattern, maybetype, maybeAssign);
+  }
+  function classExpression(type, value) {
+    // Class expressions may have an optional name.
+    if (type == "variable") return className(type, value);
+    return classNameAfter(type, value);
+  }
+  function className(type, value) {
+    if (type == "variable") {register(value); return cont(classNameAfter);}
+  }
+  function classNameAfter(type, value) {
+    if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
+    if (value == "extends" || value == "implements" || (isTS && type == ",")) {
+      if (value == "implements") cx.marked = "keyword";
+      return cont(isTS ? typeexpr : expression, classNameAfter);
+    }
+    if (type == "{") return cont(pushlex("}"), classBody, poplex);
+  }
+  function classBody(type, value) {
+    if (type == "async" ||
+        (type == "variable" &&
+         (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
+         cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
+      cx.marked = "keyword";
+      return cont(classBody);
+    }
+    if (type == "variable" || cx.style == "keyword") {
+      cx.marked = "property";
+      return cont(isTS ? classfield : functiondef, classBody);
+    }
+    if (type == "[")
+      return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
+    if (value == "*") {
+      cx.marked = "keyword";
+      return cont(classBody);
+    }
+    if (type == ";") return cont(classBody);
+    if (type == "}") return cont();
+    if (value == "@") return cont(expression, classBody)
+  }
+  function classfield(type, value) {
+    if (value == "?") return cont(classfield)
+    if (type == ":") return cont(typeexpr, maybeAssign)
+    if (value == "=") return cont(expressionNoComma)
+    return pass(functiondef)
+  }
+  function afterExport(type, value) {
+    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
+    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
+    if (type == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";"));
+    return pass(statement);
+  }
+  function exportField(type, value) {
+    if (value == "as") { cx.marked = "keyword"; return cont(expect("variable")); }
+    if (type == "variable") return pass(expressionNoComma, exportField);
+  }
+  function afterImport(type) {
+    if (type == "string") return cont();
+    if (type == "(") return pass(expression);
+    return pass(importSpec, maybeMoreImports, maybeFrom);
+  }
+  function importSpec(type, value) {
+    if (type == "{") return contCommasep(importSpec, "}");
+    if (type == "variable") register(value);
+    if (value == "*") cx.marked = "keyword";
+    return cont(maybeAs);
+  }
+  function maybeMoreImports(type) {
+    if (type == ",") return cont(importSpec, maybeMoreImports)
+  }
+  function maybeAs(_type, value) {
+    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
+  }
+  function maybeFrom(_type, value) {
+    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
+  }
+  function arrayLiteral(type) {
+    if (type == "]") return cont();
+    return pass(commasep(expressionNoComma, "]"));
+  }
+  function enumdef() {
+    return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex)
+  }
+  function enummember() {
+    return pass(pattern, maybeAssign);
+  }
+
+  function isContinuedStatement(state, textAfter) {
+    return state.lastType == "operator" || state.lastType == "," ||
+      isOperatorChar.test(textAfter.charAt(0)) ||
+      /[,.]/.test(textAfter.charAt(0));
+  }
+
+  function expressionAllowed(stream, state, backUp) {
+    return state.tokenize == tokenBase &&
+      /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+      (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      var state = {
+        tokenize: tokenBase,
+        lastType: "sof",
+        cc: [],
+        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
+        localVars: parserConfig.localVars,
+        context: parserConfig.localVars && new Context(null, null, false),
+        indented: basecolumn || 0
+      };
+      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
+        state.globalVars = parserConfig.globalVars;
+      return state;
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        if (!state.lexical.hasOwnProperty("align"))
+          state.lexical.align = false;
+        state.indented = stream.indentation();
+        findFatArrow(stream, state);
+      }
+      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      if (type == "comment") return style;
+      state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
+      return parseJS(state, style, type, content, stream);
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize == tokenComment) return CodeMirror.Pass;
+      if (state.tokenize != tokenBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
+      // Kludge to prevent 'maybelse' from blocking lexical scope pops
+      if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
+        var c = state.cc[i];
+        if (c == poplex) lexical = lexical.prev;
+        else if (c != maybeelse) break;
+      }
+      while ((lexical.type == "stat" || lexical.type == "form") &&
+             (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&
+                                   (top == maybeoperatorComma || top == maybeoperatorNoComma) &&
+                                   !/^[,\.=+\-*:?[\(]/.test(textAfter))))
+        lexical = lexical.prev;
+      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
+        lexical = lexical.prev;
+      var type = lexical.type, closing = firstChar == type;
+
+      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);
+      else if (type == "form" && firstChar == "{") return lexical.indented;
+      else if (type == "form") return lexical.indented + indentUnit;
+      else if (type == "stat")
+        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
+      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
+        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
+      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
+      else return lexical.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
+    blockCommentStart: jsonMode ? null : "/*",
+    blockCommentEnd: jsonMode ? null : "*/",
+    blockCommentContinue: jsonMode ? null : " * ",
+    lineComment: jsonMode ? null : "//",
+    fold: "brace",
+    closeBrackets: "()[]{}''\"\"``",
+
+    helperType: jsonMode ? "json" : "javascript",
+    jsonldMode: jsonldMode,
+    jsonMode: jsonMode,
+
+    expressionAllowed: expressionAllowed,
+
+    skipExpression: function(state) {
+      var top = state.cc[state.cc.length - 1]
+      if (top == expression || top == expressionNoComma) state.cc.pop()
+    }
+  };
+});
+
+CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
+
+CodeMirror.defineMIME("text/javascript", "javascript");
+CodeMirror.defineMIME("text/ecmascript", "javascript");
+CodeMirror.defineMIME("application/javascript", "javascript");
+CodeMirror.defineMIME("application/x-javascript", "javascript");
+CodeMirror.defineMIME("application/ecmascript", "javascript");
+CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
+CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
+CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
+CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
+CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
+
+});
diff --git a/core/media/editors/codemirror/mode/javascript/javascript.min.js b/core/media/editors/codemirror/mode/javascript/javascript.min.js
new file mode 100644
index 00000000..a41beec6
--- /dev/null
+++ b/core/media/editors/codemirror/mode/javascript/javascript.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("javascript",(function(b,c){function d(a){for(var b,c=!1,d=!1;null!=(b=a.next());){if(!c){if("/"==b&&!d)return;"["==b?d=!0:d&&"]"==b&&(d=!1)}c=!c&&"\\"==b}}function e(a,b,c){return Ma=a,Na=c,b}function f(a,b){var c=a.next();if('"'==c||"'"==c)return b.tokenize=g(c),b.tokenize(a,b);if("."==c&&a.match(/^\d+(?:[eE][+\-]?\d+)?/))return e("number","number");if("."==c&&a.match(".."))return e("spread","meta");if(/[\[\]{}\(\),;\:\.]/.test(c))return e(c);if("="==c&&a.eat(">"))return e("=>","operator");if("0"==c&&a.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i))return e("number","number");if(/\d/.test(c))return a.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/),e("number","number");if("/"==c)return a.eat("*")?(b.tokenize=h,h(a,b)):a.eat("/")?(a.skipToEnd(),e("comment","comment")):La(a,b,1)?(d(a),a.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/),e("regexp","string-2")):(a.eat("="),e("operator","operator",a.current()));if("`"==c)return b.tokenize=i,i(a,b);if("#"==c)return a.skipToEnd(),e("error","error");if(Va.test(c))return">"==c&&b.lexical&&">"==b.lexical.type||(a.eat("=")?"!"!=c&&"="!=c||a.eat("="):/[<>*+\-]/.test(c)&&(a.eat(c),">"==c&&a.eat(c))),e("operator","operator",a.current());if(Ta.test(c)){a.eatWhile(Ta);var f=a.current();if("."!=b.lastType){if(Ua.propertyIsEnumerable(f)){var j=Ua[f];return e(j.type,j.style,f)}if("async"==f&&a.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/,!1))return e("async","keyword",f)}return e("variable","variable",f)}}function g(a){return function(b,c){var d,g=!1;if(Qa&&"@"==b.peek()&&b.match(Wa))return c.tokenize=f,e("jsonld-keyword","meta");for(;null!=(d=b.next())&&(d!=a||g);)g=!g&&"\\"==d;return g||(c.tokenize=f),e("string","string")}}function h(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=f;break}d="*"==c}return e("comment","comment")}function i(a,b){for(var c,d=!1;null!=(c=a.next());){if(!d&&("`"==c||"$"==c&&a.eat("{"))){b.tokenize=f;break}d=!d&&"\\"==c}return e("quasi","string-2",a.current())}function j(a,b){b.fatArrowAt&&(b.fatArrowAt=null);var c=a.string.indexOf("=>",a.start);if(!(c<0)){if(Sa){var d=/:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(a.string.slice(a.start,c));d&&(c=d.index)}for(var e=0,f=!1,g=c-1;g>=0;--g){var h=a.string.charAt(g),i=Xa.indexOf(h);if(i>=0&&i<3){if(!e){++g;break}if(0==--e){"("==h&&(f=!0);break}}else if(i>=3&&i<6)++e;else if(Ta.test(h))f=!0;else{if(/["'\/]/.test(h))return;if(f&&!e){++g;break}}}f&&!e&&(b.fatArrowAt=g)}}function k(a,b,c,d,e,f){this.indented=a,this.column=b,this.type=c,this.prev=e,this.info=f,null!=d&&(this.align=d)}function l(a,b){for(var c=a.localVars;c;c=c.next)if(c.name==b)return!0;for(var d=a.context;d;d=d.prev)for(var c=d.vars;c;c=c.next)if(c.name==b)return!0}function m(a,b,c,d,e){var f=a.cc;for(Za.state=a,Za.stream=e,Za.marked=null,Za.cc=f,Za.style=b,a.lexical.hasOwnProperty("align")||(a.lexical.align=!0);;){var g=f.length?f.pop():Ra?D:B;if(g(c,d)){for(;f.length&&f[f.length-1].lex;)f.pop()();return Za.marked?Za.marked:"variable"==c&&l(a,d)?"variable-2":b}}}function n(){for(var a=arguments.length-1;a>=0;a--)Za.cc.push(arguments[a])}function o(){return n.apply(null,arguments),!0}function p(a,b){for(var c=b;c;c=c.next)if(c.name==a)return!0;return!1}function q(a){var b=Za.state;if(Za.marked="def",b.context)if("var"==b.lexical.info&&b.context&&b.context.block){var d=r(a,b.context);if(null!=d)return void(b.context=d)}else if(!p(a,b.localVars))return void(b.localVars=new u(a,b.localVars));c.globalVars&&!p(a,b.globalVars)&&(b.globalVars=new u(a,b.globalVars))}function r(a,b){if(b){if(b.block){var c=r(a,b.prev);return c?c==b.prev?b:new t(c,b.vars,!0):null}return p(a,b.vars)?b:new t(b.prev,new u(a,b.vars),!1)}return null}function s(a){return"public"==a||"private"==a||"protected"==a||"abstract"==a||"readonly"==a}function t(a,b,c){this.prev=a,this.vars=b,this.block=c}function u(a,b){this.name=a,this.next=b}function v(){Za.state.context=new t(Za.state.context,Za.state.localVars,!1),Za.state.localVars=$a}function w(){Za.state.context=new t(Za.state.context,Za.state.localVars,!0),Za.state.localVars=null}function x(){Za.state.localVars=Za.state.context.vars,Za.state.context=Za.state.context.prev}function y(a,b){var c=function(){var c=Za.state,d=c.indented;if("stat"==c.lexical.type)d=c.lexical.indented;else for(var e=c.lexical;e&&")"==e.type&&e.align;e=e.prev)d=e.indented;c.lexical=new k(d,Za.stream.column(),a,null,c.lexical,b)};return c.lex=!0,c}function z(){var a=Za.state;a.lexical.prev&&(")"==a.lexical.type&&(a.indented=a.lexical.indented),a.lexical=a.lexical.prev)}function A(a){function b(c){return c==a?o():";"==a?n():o(b)}return b}function B(a,b){return"var"==a?o(y("vardef",b),ia,A(";"),z):"keyword a"==a?o(y("form"),F,B,z):"keyword b"==a?o(y("form"),B,z):"keyword d"==a?Za.stream.match(/^\s*$/,!1)?o():o(y("stat"),H,A(";"),z):"debugger"==a?o(A(";")):"{"==a?o(y("}"),w,Y,z,x):";"==a?o():"if"==a?("else"==Za.state.lexical.info&&Za.state.cc[Za.state.cc.length-1]==z&&Za.state.cc.pop()(),o(y("form"),F,B,z,na)):"function"==a?o(ta):"for"==a?o(y("form"),oa,B,z):"class"==a||Sa&&"interface"==b?(Za.marked="keyword",o(y("form"),wa,z)):"variable"==a?Sa&&"declare"==b?(Za.marked="keyword",o(B)):Sa&&("module"==b||"enum"==b||"type"==b)&&Za.stream.match(/^\s*\w/,!1)?(Za.marked="keyword","enum"==b?o(Ia):"type"==b?o(aa,A("operator"),aa,A(";")):o(y("form"),ja,A("{"),y("}"),Y,z,z)):Sa&&"namespace"==b?(Za.marked="keyword",o(y("form"),D,Y,z)):Sa&&"abstract"==b?(Za.marked="keyword",o(B)):o(y("stat"),R):"switch"==a?o(y("form"),F,A("{"),y("}","switch"),w,Y,z,z,x):"case"==a?o(D,A(":")):"default"==a?o(A(":")):"catch"==a?o(y("form"),v,C,B,z,x):"export"==a?o(y("stat"),Aa,z):"import"==a?o(y("stat"),Ca,z):"async"==a?o(B):"@"==b?o(D,B):n(y("stat"),D,A(";"),z)}function C(a){if("("==a)return o(ua,A(")"))}function D(a,b){return G(a,b,!1)}function E(a,b){return G(a,b,!0)}function F(a){return"("!=a?n():o(y(")"),D,A(")"),z)}function G(a,b,c){if(Za.state.fatArrowAt==Za.stream.start){var d=c?N:M;if("("==a)return o(v,y(")"),W(ua,")"),z,A("=>"),d,x);if("variable"==a)return n(v,ja,A("=>"),d,x)}var e=c?J:I;return Ya.hasOwnProperty(a)?o(e):"function"==a?o(ta,e):"class"==a||Sa&&"interface"==b?(Za.marked="keyword",o(y("form"),va,z)):"keyword c"==a||"async"==a?o(c?E:D):"("==a?o(y(")"),H,A(")"),z,e):"operator"==a||"spread"==a?o(c?E:D):"["==a?o(y("]"),Ha,z,e):"{"==a?X(T,"}",null,e):"quasi"==a?n(K,e):"new"==a?o(O(c)):"import"==a?o(D):o()}function H(a){return a.match(/[;\}\)\],]/)?n():n(D)}function I(a,b){return","==a?o(D):J(a,b,!1)}function J(a,b,c){var d=0==c?I:J,e=0==c?D:E;return"=>"==a?o(v,c?N:M,x):"operator"==a?/\+\+|--/.test(b)||Sa&&"!"==b?o(d):Sa&&"<"==b&&Za.stream.match(/^([^>]|<.*?>)*>\s*\(/,!1)?o(y(">"),W(aa,">"),z,d):"?"==b?o(D,A(":"),e):o(e):"quasi"==a?n(K,d):";"!=a?"("==a?X(E,")","call",d):"."==a?o(S,d):"["==a?o(y("]"),H,A("]"),z,d):Sa&&"as"==b?(Za.marked="keyword",o(aa,d)):"regexp"==a?(Za.state.lastType=Za.marked="operator",Za.stream.backUp(Za.stream.pos-Za.stream.start-1),o(e)):void 0:void 0}function K(a,b){return"quasi"!=a?n():"${"!=b.slice(b.length-2)?o(K):o(D,L)}function L(a){if("}"==a)return Za.marked="string-2",Za.state.tokenize=i,o(K)}function M(a){return j(Za.stream,Za.state),n("{"==a?B:D)}function N(a){return j(Za.stream,Za.state),n("{"==a?B:E)}function O(a){return function(b){return"."==b?o(a?Q:P):"variable"==b&&Sa?o(fa,a?J:I):n(a?E:D)}}function P(a,b){if("target"==b)return Za.marked="keyword",o(I)}function Q(a,b){if("target"==b)return Za.marked="keyword",o(J)}function R(a){return":"==a?o(z,B):n(I,A(";"),z)}function S(a){if("variable"==a)return Za.marked="property",o()}function T(a,b){if("async"==a)return Za.marked="property",o(T);if("variable"==a||"keyword"==Za.style){if(Za.marked="property","get"==b||"set"==b)return o(U);var c;return Sa&&Za.state.fatArrowAt==Za.stream.start&&(c=Za.stream.match(/^\s*:\s*/,!1))&&(Za.state.fatArrowAt=Za.stream.pos+c[0].length),o(V)}return"number"==a||"string"==a?(Za.marked=Qa?"property":Za.style+" property",o(V)):"jsonld-keyword"==a?o(V):Sa&&s(b)?(Za.marked="keyword",o(T)):"["==a?o(D,Z,A("]"),V):"spread"==a?o(E,V):"*"==b?(Za.marked="keyword",o(T)):":"==a?n(V):void 0}function U(a){return"variable"!=a?n(V):(Za.marked="property",o(ta))}function V(a){return":"==a?o(E):"("==a?n(ta):void 0}function W(a,b,c){function d(e,f){if(c?c.indexOf(e)>-1:","==e){var g=Za.state.lexical;return"call"==g.info&&(g.pos=(g.pos||0)+1),o((function(c,d){return c==b||d==b?n():n(a)}),d)}return e==b||f==b?o():o(A(b))}return function(c,e){return c==b||e==b?o():n(a,d)}}function X(a,b,c){for(var d=3;d<arguments.length;d++)Za.cc.push(arguments[d]);return o(y(b,c),W(a,b),z)}function Y(a){return"}"==a?o():n(B,Y)}function Z(a,b){if(Sa){if(":"==a)return o(aa);if("?"==b)return o(Z)}}function $(a){if(Sa&&":"==a)return Za.stream.match(/^\s*\w+\s+is\b/,!1)?o(D,_,aa):o(aa)}function _(a,b){if("is"==b)return Za.marked="keyword",o()}function aa(a,b){return"keyof"==b||"typeof"==b?(Za.marked="keyword",o("keyof"==b?aa:E)):"variable"==a||"void"==b?(Za.marked="type",o(ea)):"string"==a||"number"==a||"atom"==a?o(ea):"["==a?o(y("]"),W(aa,"]",","),z,ea):"{"==a?o(y("}"),W(ca,"}",",;"),z,ea):"("==a?o(W(da,")"),ba):"<"==a?o(W(aa,">"),aa):void 0}function ba(a){if("=>"==a)return o(aa)}function ca(a,b){return"variable"==a||"keyword"==Za.style?(Za.marked="property",o(ca)):"?"==b?o(ca):":"==a?o(aa):"["==a?o(D,Z,A("]"),ca):void 0}function da(a,b){return"variable"==a&&Za.stream.match(/^\s*[?:]/,!1)||"?"==b?o(da):":"==a?o(aa):n(aa)}function ea(a,b){return"<"==b?o(y(">"),W(aa,">"),z,ea):"|"==b||"."==a||"&"==b?o(aa):"["==a?o(A("]"),ea):"extends"==b||"implements"==b?(Za.marked="keyword",o(aa)):void 0}function fa(a,b){if("<"==b)return o(y(">"),W(aa,">"),z,ea)}function ga(){return n(aa,ha)}function ha(a,b){if("="==b)return o(aa)}function ia(a,b){return"enum"==b?(Za.marked="keyword",o(Ia)):n(ja,Z,la,ma)}function ja(a,b){return Sa&&s(b)?(Za.marked="keyword",o(ja)):"variable"==a?(q(b),o()):"spread"==a?o(ja):"["==a?X(ja,"]"):"{"==a?X(ka,"}"):void 0}function ka(a,b){return"variable"!=a||Za.stream.match(/^\s*:/,!1)?("variable"==a&&(Za.marked="property"),"spread"==a?o(ja):"}"==a?n():o(A(":"),ja,la)):(q(b),o(la))}function la(a,b){if("="==b)return o(E)}function ma(a){if(","==a)return o(ia)}function na(a,b){if("keyword b"==a&&"else"==b)return o(y("form","else"),B,z)}function oa(a,b){return"await"==b?o(oa):"("==a?o(y(")"),pa,A(")"),z):void 0}function pa(a){return"var"==a?o(ia,A(";"),ra):";"==a?o(ra):"variable"==a?o(qa):n(D,A(";"),ra)}function qa(a,b){return"in"==b||"of"==b?(Za.marked="keyword",o(D)):o(I,ra)}function ra(a,b){return";"==a?o(sa):"in"==b||"of"==b?(Za.marked="keyword",o(D)):n(D,A(";"),sa)}function sa(a){")"!=a&&o(D)}function ta(a,b){return"*"==b?(Za.marked="keyword",o(ta)):"variable"==a?(q(b),o(ta)):"("==a?o(v,y(")"),W(ua,")"),z,$,B,x):Sa&&"<"==b?o(y(">"),W(ga,">"),z,ta):void 0}function ua(a,b){return"@"==b&&o(D,ua),"spread"==a?o(ua):Sa&&s(b)?(Za.marked="keyword",o(ua)):n(ja,Z,la)}function va(a,b){return"variable"==a?wa(a,b):xa(a,b)}function wa(a,b){if("variable"==a)return q(b),o(xa)}function xa(a,b){return"<"==b?o(y(">"),W(ga,">"),z,xa):"extends"==b||"implements"==b||Sa&&","==a?("implements"==b&&(Za.marked="keyword"),o(Sa?aa:D,xa)):"{"==a?o(y("}"),ya,z):void 0}function ya(a,b){return"async"==a||"variable"==a&&("static"==b||"get"==b||"set"==b||Sa&&s(b))&&Za.stream.match(/^\s+[\w$\xa1-\uffff]/,!1)?(Za.marked="keyword",o(ya)):"variable"==a||"keyword"==Za.style?(Za.marked="property",o(Sa?za:ta,ya)):"["==a?o(D,Z,A("]"),Sa?za:ta,ya):"*"==b?(Za.marked="keyword",o(ya)):";"==a?o(ya):"}"==a?o():"@"==b?o(D,ya):void 0}function za(a,b){return"?"==b?o(za):":"==a?o(aa,la):"="==b?o(E):n(ta)}function Aa(a,b){return"*"==b?(Za.marked="keyword",o(Ga,A(";"))):"default"==b?(Za.marked="keyword",o(D,A(";"))):"{"==a?o(W(Ba,"}"),Ga,A(";")):n(B)}function Ba(a,b){return"as"==b?(Za.marked="keyword",o(A("variable"))):"variable"==a?n(E,Ba):void 0}function Ca(a){return"string"==a?o():"("==a?n(D):n(Da,Ea,Ga)}function Da(a,b){return"{"==a?X(Da,"}"):("variable"==a&&q(b),"*"==b&&(Za.marked="keyword"),o(Fa))}function Ea(a){if(","==a)return o(Da,Ea)}function Fa(a,b){if("as"==b)return Za.marked="keyword",o(Da)}function Ga(a,b){if("from"==b)return Za.marked="keyword",o(D)}function Ha(a){return"]"==a?o():n(W(E,"]"))}function Ia(){return n(y("form"),ja,A("{"),y("}"),W(Ja,"}"),z,z)}function Ja(){return n(ja,la)}function Ka(a,b){return"operator"==a.lastType||","==a.lastType||Va.test(b.charAt(0))||/[,.]/.test(b.charAt(0))}function La(a,b,c){return b.tokenize==f&&/^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(b.lastType)||"quasi"==b.lastType&&/\{\s*$/.test(a.string.slice(0,a.pos-(c||0)))}var Ma,Na,Oa=b.indentUnit,Pa=c.statementIndent,Qa=c.jsonld,Ra=c.json||Qa,Sa=c.typescript,Ta=c.wordCharacters||/[\w$\xa1-\uffff]/,Ua=(function(){function a(a){return{type:a,style:"keyword"}}var b=a("keyword a"),c=a("keyword b"),d=a("keyword c"),e=a("keyword d"),f=a("operator"),g={type:"atom",style:"atom"};return{if:a("if"),while:b,with:b,else:c,do:c,try:c,finally:c,return:e,break:e,continue:e,new:a("new"),delete:d,void:d,throw:d,debugger:a("debugger"),var:a("var"),const:a("var"),let:a("var"),function:a("function"),catch:a("catch"),for:a("for"),switch:a("switch"),case:a("case"),default:a("default"),in:f,typeof:f,instanceof:f,true:g,false:g,null:g,undefined:g,NaN:g,Infinity:g,this:a("this"),class:a("class"),super:a("atom"),yield:d,export:a("export"),import:a("import"),extends:d,await:d}})(),Va=/[+\-*&%=<>!?|~^@]/,Wa=/^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/,Xa="([{}])",Ya={atom:!0,number:!0,variable:!0,string:!0,regexp:!0,this:!0,"jsonld-keyword":!0},Za={state:null,column:null,marked:null,cc:null},$a=new u("this",new u("arguments",null));return x.lex=!0,z.lex=!0,{startState:function(a){var b={tokenize:f,lastType:"sof",cc:[],lexical:new k((a||0)-Oa,0,"block",!1),localVars:c.localVars,context:c.localVars&&new t(null,null,!1),indented:a||0};return c.globalVars&&"object"==typeof c.globalVars&&(b.globalVars=c.globalVars),b},token:function(a,b){if(a.sol()&&(b.lexical.hasOwnProperty("align")||(b.lexical.align=!1),b.indented=a.indentation(),j(a,b)),b.tokenize!=h&&a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"==Ma?c:(b.lastType="operator"!=Ma||"++"!=Na&&"--"!=Na?Ma:"incdec",m(b,c,Ma,Na,a))},indent:function(b,d){if(b.tokenize==h)return a.Pass;if(b.tokenize!=f)return 0;var e,g=d&&d.charAt(0),i=b.lexical;if(!/^\s*else\b/.test(d))for(var j=b.cc.length-1;j>=0;--j){var k=b.cc[j];if(k==z)i=i.prev;else if(k!=na)break}for(;("stat"==i.type||"form"==i.type)&&("}"==g||(e=b.cc[b.cc.length-1])&&(e==I||e==J)&&!/^[,\.=+\-*:?[\(]/.test(d));)i=i.prev;Pa&&")"==i.type&&"stat"==i.prev.type&&(i=i.prev);var l=i.type,m=g==l;return"vardef"==l?i.indented+("operator"==b.lastType||","==b.lastType?i.info.length+1:0):"form"==l&&"{"==g?i.indented:"form"==l?i.indented+Oa:"stat"==l?i.indented+(Ka(b,d)?Pa||Oa:0):"switch"!=i.info||m||0==c.doubleIndentSwitch?i.align?i.column+(m?0:1):i.indented+(m?0:Oa):i.indented+(/^(?:case|default)\b/.test(d)?Oa:2*Oa)},electricInput:/^\s*(?:case .*?:|default:|\{|\})$/,blockCommentStart:Ra?null:"/*",blockCommentEnd:Ra?null:"*/",blockCommentContinue:Ra?null:" * ",lineComment:Ra?null:"//",fold:"brace",closeBrackets:"()[]{}''\"\"``",helperType:Ra?"json":"javascript",jsonldMode:Qa,jsonMode:Ra,expressionAllowed:La,skipExpression:function(a){var b=a.cc[a.cc.length-1];b!=D&&b!=E||a.cc.pop()}}})),a.registerHelper("wordChars","javascript",/[\w$]/),a.defineMIME("text/javascript","javascript"),a.defineMIME("text/ecmascript","javascript"),a.defineMIME("application/javascript","javascript"),a.defineMIME("application/x-javascript","javascript"),a.defineMIME("application/ecmascript","javascript"),a.defineMIME("application/json",{name:"javascript",json:!0}),a.defineMIME("application/x-json",{name:"javascript",json:!0}),a.defineMIME("application/ld+json",{name:"javascript",jsonld:!0}),a.defineMIME("text/typescript",{name:"javascript",typescript:!0}),a.defineMIME("application/typescript",{name:"javascript",typescript:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/jinja2/jinja2.js b/core/media/editors/codemirror/mode/jinja2/jinja2.js
new file mode 100644
index 00000000..5d57d134
--- /dev/null
+++ b/core/media/editors/codemirror/mode/jinja2/jinja2.js
@@ -0,0 +1,142 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("jinja2", function() {
+    var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
+      "extends", "filter", "endfilter", "firstof", "for",
+      "endfor", "if", "endif", "ifchanged", "endifchanged",
+      "ifequal", "endifequal", "ifnotequal",
+      "endifnotequal", "in", "include", "load", "not", "now", "or",
+      "parsed", "regroup", "reversed", "spaceless",
+      "endspaceless", "ssi", "templatetag", "openblock",
+      "closeblock", "openvariable", "closevariable",
+      "openbrace", "closebrace", "opencomment",
+      "closecomment", "widthratio", "url", "with", "endwith",
+      "get_current_language", "trans", "endtrans", "noop", "blocktrans",
+      "endblocktrans", "get_available_languages",
+      "get_current_language_bidi", "plural"],
+    operator = /^[+\-*&%=<>!?|~^]/,
+    sign = /^[:\[\(\{]/,
+    atom = ["true", "false"],
+    number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
+
+    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
+    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      var ch = stream.peek();
+
+      //Comment
+      if (state.incomment) {
+        if(!stream.skipTo("#}")) {
+          stream.skipToEnd();
+        } else {
+          stream.eatWhile(/\#|}/);
+          state.incomment = false;
+        }
+        return "comment";
+      //Tag
+      } else if (state.intag) {
+        //After operator
+        if(state.operator) {
+          state.operator = false;
+          if(stream.match(atom)) {
+            return "atom";
+          }
+          if(stream.match(number)) {
+            return "number";
+          }
+        }
+        //After sign
+        if(state.sign) {
+          state.sign = false;
+          if(stream.match(atom)) {
+            return "atom";
+          }
+          if(stream.match(number)) {
+            return "number";
+          }
+        }
+
+        if(state.instring) {
+          if(ch == state.instring) {
+            state.instring = false;
+          }
+          stream.next();
+          return "string";
+        } else if(ch == "'" || ch == '"') {
+          state.instring = ch;
+          stream.next();
+          return "string";
+        } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+          state.intag = false;
+          return "tag";
+        } else if(stream.match(operator)) {
+          state.operator = true;
+          return "operator";
+        } else if(stream.match(sign)) {
+          state.sign = true;
+        } else {
+          if(stream.eat(" ") || stream.sol()) {
+            if(stream.match(keywords)) {
+              return "keyword";
+            }
+            if(stream.match(atom)) {
+              return "atom";
+            }
+            if(stream.match(number)) {
+              return "number";
+            }
+            if(stream.sol()) {
+              stream.next();
+            }
+          } else {
+            stream.next();
+          }
+
+        }
+        return "variable";
+      } else if (stream.eat("{")) {
+        if (stream.eat("#")) {
+          state.incomment = true;
+          if(!stream.skipTo("#}")) {
+            stream.skipToEnd();
+          } else {
+            stream.eatWhile(/\#|}/);
+            state.incomment = false;
+          }
+          return "comment";
+        //Open tag
+        } else if (ch = stream.eat(/\{|%/)) {
+          //Cache close tag
+          state.intag = ch;
+          if(ch == "{") {
+            state.intag = "}";
+          }
+          stream.eat("-");
+          return "tag";
+        }
+      }
+      stream.next();
+    };
+
+    return {
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
+    };
+  });
+});
diff --git a/core/media/editors/codemirror/mode/jinja2/jinja2.min.js b/core/media/editors/codemirror/mode/jinja2/jinja2.min.js
new file mode 100644
index 00000000..d30b0ca9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/jinja2/jinja2.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("jinja2",(function(){function a(a,g){var h=a.peek();if(g.incomment)return a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(g.intag){if(g.operator){if(g.operator=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.sign){if(g.sign=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.instring)return h==g.instring&&(g.instring=!1),a.next(),"string";if("'"==h||'"'==h)return g.instring=h,a.next(),"string";if(a.match(g.intag+"}")||a.eat("-")&&a.match(g.intag+"}"))return g.intag=!1,"tag";if(a.match(c))return g.operator=!0,"operator";if(a.match(d))g.sign=!0;else if(a.eat(" ")||a.sol()){if(a.match(b))return"keyword";if(a.match(e))return"atom";if(a.match(f))return"number";a.sol()&&a.next()}else a.next();return"variable"}if(a.eat("{")){if(a.eat("#"))return g.incomment=!0,a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(h=a.eat(/\{|%/))return g.intag=h,"{"==h&&(g.intag="}"),a.eat("-"),"tag"}a.next()}var b=["and","as","block","endblock","by","cycle","debug","else","elif","extends","filter","endfilter","firstof","for","endfor","if","endif","ifchanged","endifchanged","ifequal","endifequal","ifnotequal","endifnotequal","in","include","load","not","now","or","parsed","regroup","reversed","spaceless","endspaceless","ssi","templatetag","openblock","closeblock","openvariable","closevariable","openbrace","closebrace","opencomment","closecomment","widthratio","url","with","endwith","get_current_language","trans","endtrans","noop","blocktrans","endblocktrans","get_available_languages","get_current_language_bidi","plural"],c=/^[+\-*&%=<>!?|~^]/,d=/^[:\[\(\{]/,e=["true","false"],f=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return b=new RegExp("(("+b.join(")|(")+"))\\b"),e=new RegExp("(("+e.join(")|(")+"))\\b"),{startState:function(){return{tokenize:a}},token:function(a,b){return b.tokenize(a,b)}}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/jsx/jsx.js b/core/media/editors/codemirror/mode/jsx/jsx.js
new file mode 100644
index 00000000..039e37bb
--- /dev/null
+++ b/core/media/editors/codemirror/mode/jsx/jsx.js
@@ -0,0 +1,148 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  // Depth means the amount of open braces in JS context, in XML
+  // context 0 means not in tag, 1 means in tag, and 2 means in tag
+  // and js block comment.
+  function Context(state, mode, depth, prev) {
+    this.state = state; this.mode = mode; this.depth = depth; this.prev = prev
+  }
+
+  function copyContext(context) {
+    return new Context(CodeMirror.copyState(context.mode, context.state),
+                       context.mode,
+                       context.depth,
+                       context.prev && copyContext(context.prev))
+  }
+
+  CodeMirror.defineMode("jsx", function(config, modeConfig) {
+    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false, allowMissingTagName: true})
+    var jsMode = CodeMirror.getMode(config, modeConfig && modeConfig.base || "javascript")
+
+    function flatXMLIndent(state) {
+      var tagName = state.tagName
+      state.tagName = null
+      var result = xmlMode.indent(state, "")
+      state.tagName = tagName
+      return result
+    }
+
+    function token(stream, state) {
+      if (state.context.mode == xmlMode)
+        return xmlToken(stream, state, state.context)
+      else
+        return jsToken(stream, state, state.context)
+    }
+
+    function xmlToken(stream, state, cx) {
+      if (cx.depth == 2) { // Inside a JS /* */ comment
+        if (stream.match(/^.*?\*\//)) cx.depth = 1
+        else stream.skipToEnd()
+        return "comment"
+      }
+
+      if (stream.peek() == "{") {
+        xmlMode.skipAttribute(cx.state)
+
+        var indent = flatXMLIndent(cx.state), xmlContext = cx.state.context
+        // If JS starts on same line as tag
+        if (xmlContext && stream.match(/^[^>]*>\s*$/, false)) {
+          while (xmlContext.prev && !xmlContext.startOfLine)
+            xmlContext = xmlContext.prev
+          // If tag starts the line, use XML indentation level
+          if (xmlContext.startOfLine) indent -= config.indentUnit
+          // Else use JS indentation level
+          else if (cx.prev.state.lexical) indent = cx.prev.state.lexical.indented
+        // Else if inside of tag
+        } else if (cx.depth == 1) {
+          indent += config.indentUnit
+        }
+
+        state.context = new Context(CodeMirror.startState(jsMode, indent),
+                                    jsMode, 0, state.context)
+        return null
+      }
+
+      if (cx.depth == 1) { // Inside of tag
+        if (stream.peek() == "<") { // Tag inside of tag
+          xmlMode.skipAttribute(cx.state)
+          state.context = new Context(CodeMirror.startState(xmlMode, flatXMLIndent(cx.state)),
+                                      xmlMode, 0, state.context)
+          return null
+        } else if (stream.match("//")) {
+          stream.skipToEnd()
+          return "comment"
+        } else if (stream.match("/*")) {
+          cx.depth = 2
+          return token(stream, state)
+        }
+      }
+
+      var style = xmlMode.token(stream, cx.state), cur = stream.current(), stop
+      if (/\btag\b/.test(style)) {
+        if (/>$/.test(cur)) {
+          if (cx.state.context) cx.depth = 0
+          else state.context = state.context.prev
+        } else if (/^</.test(cur)) {
+          cx.depth = 1
+        }
+      } else if (!style && (stop = cur.indexOf("{")) > -1) {
+        stream.backUp(cur.length - stop)
+      }
+      return style
+    }
+
+    function jsToken(stream, state, cx) {
+      if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+        jsMode.skipExpression(cx.state)
+        state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+                                    xmlMode, 0, state.context)
+        return null
+      }
+
+      var style = jsMode.token(stream, cx.state)
+      if (!style && cx.depth != null) {
+        var cur = stream.current()
+        if (cur == "{") {
+          cx.depth++
+        } else if (cur == "}") {
+          if (--cx.depth == 0) state.context = state.context.prev
+        }
+      }
+      return style
+    }
+
+    return {
+      startState: function() {
+        return {context: new Context(CodeMirror.startState(jsMode), jsMode)}
+      },
+
+      copyState: function(state) {
+        return {context: copyContext(state.context)}
+      },
+
+      token: token,
+
+      indent: function(state, textAfter, fullLine) {
+        return state.context.mode.indent(state.context.state, textAfter, fullLine)
+      },
+
+      innerMode: function(state) {
+        return state.context
+      }
+    }
+  }, "xml", "javascript")
+
+  CodeMirror.defineMIME("text/jsx", "jsx")
+  CodeMirror.defineMIME("text/typescript-jsx", {name: "jsx", base: {name: "javascript", typescript: true}})
+});
diff --git a/core/media/editors/codemirror/mode/jsx/jsx.min.js b/core/media/editors/codemirror/mode/jsx/jsx.min.js
new file mode 100644
index 00000000..46da0655
--- /dev/null
+++ b/core/media/editors/codemirror/mode/jsx/jsx.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c,d){this.state=a,this.mode=b,this.depth=c,this.prev=d}function c(d){return new b(a.copyState(d.mode,d.state),d.mode,d.depth,d.prev&&c(d.prev))}a.defineMode("jsx",(function(d,e){function f(a){var b=a.tagName;a.tagName=null;var c=j.indent(a,"");return a.tagName=b,c}function g(a,b){return b.context.mode==j?h(a,b,b.context):i(a,b,b.context)}function h(c,e,h){if(2==h.depth)return c.match(/^.*?\*\//)?h.depth=1:c.skipToEnd(),"comment";if("{"==c.peek()){j.skipAttribute(h.state);var i=f(h.state),l=h.state.context;if(l&&c.match(/^[^>]*>\s*$/,!1)){for(;l.prev&&!l.startOfLine;)l=l.prev;l.startOfLine?i-=d.indentUnit:h.prev.state.lexical&&(i=h.prev.state.lexical.indented)}else 1==h.depth&&(i+=d.indentUnit);return e.context=new b(a.startState(k,i),k,0,e.context),null}if(1==h.depth){if("<"==c.peek())return j.skipAttribute(h.state),e.context=new b(a.startState(j,f(h.state)),j,0,e.context),null;if(c.match("//"))return c.skipToEnd(),"comment";if(c.match("/*"))return h.depth=2,g(c,e)}var m,n=j.token(c,h.state),o=c.current();return/\btag\b/.test(n)?/>$/.test(o)?h.state.context?h.depth=0:e.context=e.context.prev:/^</.test(o)&&(h.depth=1):!n&&(m=o.indexOf("{"))>-1&&c.backUp(o.length-m),n}function i(c,d,e){if("<"==c.peek()&&k.expressionAllowed(c,e.state))return k.skipExpression(e.state),d.context=new b(a.startState(j,k.indent(e.state,"")),j,0,d.context),null;var f=k.token(c,e.state);if(!f&&null!=e.depth){var g=c.current();"{"==g?e.depth++:"}"==g&&0==--e.depth&&(d.context=d.context.prev)}return f}var j=a.getMode(d,{name:"xml",allowMissing:!0,multilineTagIndentPastTag:!1,allowMissingTagName:!0}),k=a.getMode(d,e&&e.base||"javascript");return{startState:function(){return{context:new b(a.startState(k),k)}},copyState:function(a){return{context:c(a.context)}},token:g,indent:function(a,b,c){return a.context.mode.indent(a.context.state,b,c)},innerMode:function(a){return a.context}}}),"xml","javascript"),a.defineMIME("text/jsx","jsx"),a.defineMIME("text/typescript-jsx",{name:"jsx",base:{name:"javascript",typescript:!0}})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/julia/julia.js b/core/media/editors/codemirror/mode/julia/julia.js
new file mode 100644
index 00000000..9a36fd05
--- /dev/null
+++ b/core/media/editors/codemirror/mode/julia/julia.js
@@ -0,0 +1,418 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("julia", function(config, parserConf) {
+  function wordRegexp(words, end) {
+    if (typeof end === "undefined") { end = "\\b"; }
+    return new RegExp("^((" + words.join(")|(") + "))" + end);
+  }
+
+  var octChar = "\\\\[0-7]{1,3}";
+  var hexChar = "\\\\x[A-Fa-f0-9]{1,2}";
+  var sChar = "\\\\[abefnrtv0%?'\"\\\\]";
+  var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
+
+  var operators = parserConf.operators || wordRegexp([
+      "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "->", "\\/\\/",
+      "[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
+      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
+      "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
+      "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
+      "\\b(in|isa)\\b(?!\.?\\()"], "");
+  var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
+  var identifiers = parserConf.identifiers ||
+      /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
+
+  var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
+  var openers = wordRegexp(["begin", "function", "type", "struct", "immutable",
+      "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try",
+      "finally", "catch", "do"]);
+  var closers = wordRegexp(["end", "else", "elseif", "catch", "finally"]);
+  var keywords = wordRegexp(["if", "else", "elseif", "while", "for", "begin",
+      "let", "end", "do", "try", "catch", "finally", "return", "break",
+      "continue", "global", "local", "const", "export", "import", "importall",
+      "using", "function", "where", "macro", "module", "baremodule", "struct",
+      "type", "mutable", "immutable", "quote", "typealias", "abstract",
+      "primitive", "bitstype"]);
+  var builtins = wordRegexp(["true", "false", "nothing", "NaN", "Inf"]);
+
+  var macro = /^@[_A-Za-z][\w]*/;
+  var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var stringPrefixes = /^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/;
+
+  function inArray(state) {
+    return inGenerator(state, '[')
+  }
+
+  function inGenerator(state, bracket) {
+    var curr = currentScope(state),
+        prev = currentScope(state, 1);
+    if (typeof(bracket) === "undefined") { bracket = '('; }
+    if (curr === bracket || (prev === bracket && curr === "for")) {
+      return true;
+    }
+    return false;
+  }
+
+  function currentScope(state, n) {
+    if (typeof(n) === "undefined") { n = 0; }
+    if (state.scopes.length <= n) {
+      return null;
+    }
+    return state.scopes[state.scopes.length - (n + 1)];
+  }
+
+  // tokenizers
+  function tokenBase(stream, state) {
+    // Handle multiline comments
+    if (stream.match(/^#=/, false)) {
+      state.tokenize = tokenComment;
+      return state.tokenize(stream, state);
+    }
+
+    // Handle scope changes
+    var leavingExpr = state.leavingExpr;
+    if (stream.sol()) {
+      leavingExpr = false;
+    }
+    state.leavingExpr = false;
+
+    if (leavingExpr) {
+      if (stream.match(/^'+/)) {
+        return "operator";
+      }
+    }
+
+    if (stream.match(/\.{4,}/)) {
+      return "error";
+    } else if (stream.match(/\.{1,3}/)) {
+      return "operator";
+    }
+
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    var ch = stream.peek();
+
+    // Handle single line comments
+    if (ch === '#') {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    if (ch === '[') {
+      state.scopes.push('[');
+    }
+
+    if (ch === '(') {
+      state.scopes.push('(');
+    }
+
+    var scope = currentScope(state);
+
+    if (inArray(state) && ch === ']') {
+      if (scope === "for") { state.scopes.pop(); }
+      state.scopes.pop();
+      state.leavingExpr = true;
+    }
+
+    if (inGenerator(state) && ch === ')') {
+      if (scope === "for") { state.scopes.pop(); }
+      state.scopes.pop();
+      state.leavingExpr = true;
+    }
+
+    if (inArray(state)) {
+      if (state.lastToken == "end" && stream.match(/^:/)) {
+        return "operator";
+      }
+      if (stream.match(/^end/)) {
+        return "number";
+      }
+    }
+
+    var match;
+    if (match = stream.match(openers, false)) {
+      state.scopes.push(match[0]);
+    }
+
+    if (stream.match(closers, false)) {
+      state.scopes.pop();
+    }
+
+    // Handle type annotations
+    if (stream.match(/^::(?![:\$])/)) {
+      state.tokenize = tokenAnnotation;
+      return state.tokenize(stream, state);
+    }
+
+    // Handle symbols
+    if (!leavingExpr && stream.match(symbol) ||
+        stream.match(/:([<>]:|<<=?|>>>?=?|->|\/\/|\.{2,3}|[\.\\%*+\-<>!\/^|&]=?|[~\?\$])/)) {
+      return "builtin";
+    }
+
+    // Handle parametric types
+    //if (stream.match(/^{[^}]*}(?=\()/)) {
+    //  return "builtin";
+    //}
+
+    // Handle operators and Delimiters
+    if (stream.match(operators)) {
+      return "operator";
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^\.?\d/, false)) {
+      var imMatcher = RegExp(/^im\b/);
+      var numberLiteral = false;
+      // Floats
+      if (stream.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)) { numberLiteral = true; }
+      if (stream.match(/^\d+\.(?!\.)\d*/)) { numberLiteral = true; }
+      if (stream.match(/^\.\d+/)) { numberLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { numberLiteral = true; }
+      // Integers
+      if (stream.match(/^0x[0-9a-f]+/i)) { numberLiteral = true; } // Hex
+      if (stream.match(/^0b[01]+/i)) { numberLiteral = true; } // Binary
+      if (stream.match(/^0o[0-7]+/i)) { numberLiteral = true; } // Octal
+      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
+      // Zero by itself with no other piece of number.
+      if (stream.match(/^0(?![\dx])/i)) { numberLiteral = true; }
+      if (numberLiteral) {
+          // Integer literals may be "long"
+          stream.match(imMatcher);
+          state.leavingExpr = true;
+          return "number";
+      }
+    }
+
+    // Handle Chars
+    if (stream.match(/^'/)) {
+      state.tokenize = tokenChar;
+      return state.tokenize(stream, state);
+    }
+
+    // Handle Strings
+    if (stream.match(stringPrefixes)) {
+      state.tokenize = tokenStringFactory(stream.current());
+      return state.tokenize(stream, state);
+    }
+
+    if (stream.match(macro)) {
+      return "meta";
+    }
+
+    if (stream.match(delimiters)) {
+      return null;
+    }
+
+    if (stream.match(keywords)) {
+      return "keyword";
+    }
+
+    if (stream.match(builtins)) {
+      return "builtin";
+    }
+
+    var isDefinition = state.isDefinition || state.lastToken == "function" ||
+                       state.lastToken == "macro" || state.lastToken == "type" ||
+                       state.lastToken == "struct" || state.lastToken == "immutable";
+
+    if (stream.match(identifiers)) {
+      if (isDefinition) {
+        if (stream.peek() === '.') {
+          state.isDefinition = true;
+          return "variable";
+        }
+        state.isDefinition = false;
+        return "def";
+      }
+      if (stream.match(/^({[^}]*})*\(/, false)) {
+        state.tokenize = tokenCallOrDef;
+        return state.tokenize(stream, state);
+      }
+      state.leavingExpr = true;
+      return "variable";
+    }
+
+    // Handle non-detected items
+    stream.next();
+    return "error";
+  }
+
+  function tokenCallOrDef(stream, state) {
+    var match = stream.match(/^(\(\s*)/);
+    if (match) {
+      if (state.firstParenPos < 0)
+        state.firstParenPos = state.scopes.length;
+      state.scopes.push('(');
+      state.charsAdvanced += match[1].length;
+    }
+    if (currentScope(state) == '(' && stream.match(/^\)/)) {
+      state.scopes.pop();
+      state.charsAdvanced += 1;
+      if (state.scopes.length <= state.firstParenPos) {
+        var isDefinition = stream.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/, false);
+        stream.backUp(state.charsAdvanced);
+        state.firstParenPos = -1;
+        state.charsAdvanced = 0;
+        state.tokenize = tokenBase;
+        if (isDefinition)
+          return "def";
+        return "builtin";
+      }
+    }
+    // Unfortunately javascript does not support multiline strings, so we have
+    // to undo anything done upto here if a function call or definition splits
+    // over two or more lines.
+    if (stream.match(/^$/g, false)) {
+      stream.backUp(state.charsAdvanced);
+      while (state.scopes.length > state.firstParenPos)
+        state.scopes.pop();
+      state.firstParenPos = -1;
+      state.charsAdvanced = 0;
+      state.tokenize = tokenBase;
+      return "builtin";
+    }
+    state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
+    return state.tokenize(stream, state);
+  }
+
+  function tokenAnnotation(stream, state) {
+    stream.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/);
+    if (stream.match(/^{/)) {
+      state.nestedLevels++;
+    } else if (stream.match(/^}/)) {
+      state.nestedLevels--;
+    }
+    if (state.nestedLevels > 0) {
+      stream.match(/.*?(?={|})/) || stream.next();
+    } else if (state.nestedLevels == 0) {
+      state.tokenize = tokenBase;
+    }
+    return "builtin";
+  }
+
+  function tokenComment(stream, state) {
+    if (stream.match(/^#=/)) {
+      state.nestedLevels++;
+    }
+    if (!stream.match(/.*?(?=(#=|=#))/)) {
+      stream.skipToEnd();
+    }
+    if (stream.match(/^=#/)) {
+      state.nestedLevels--;
+      if (state.nestedLevels == 0)
+        state.tokenize = tokenBase;
+    }
+    return "comment";
+  }
+
+  function tokenChar(stream, state) {
+    var isChar = false, match;
+    if (stream.match(chars)) {
+      isChar = true;
+    } else if (match = stream.match(/\\u([a-f0-9]{1,4})(?=')/i)) {
+      var value = parseInt(match[1], 16);
+      if (value <= 55295 || value >= 57344) { // (U+0,U+D7FF), (U+E000,U+FFFF)
+        isChar = true;
+        stream.next();
+      }
+    } else if (match = stream.match(/\\U([A-Fa-f0-9]{5,8})(?=')/)) {
+      var value = parseInt(match[1], 16);
+      if (value <= 1114111) { // U+10FFFF
+        isChar = true;
+        stream.next();
+      }
+    }
+    if (isChar) {
+      state.leavingExpr = true;
+      state.tokenize = tokenBase;
+      return "string";
+    }
+    if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }
+    if (stream.match(/^'/)) { state.tokenize = tokenBase; }
+    return "error";
+  }
+
+  function tokenStringFactory(delimiter) {
+    if (delimiter.substr(-3) === '"""') {
+      delimiter = '"""';
+    } else if (delimiter.substr(-1) === '"') {
+      delimiter = '"';
+    }
+    function tokenString(stream, state) {
+      if (stream.eat('\\')) {
+        stream.next();
+      } else if (stream.match(delimiter)) {
+        state.tokenize = tokenBase;
+        state.leavingExpr = true;
+        return "string";
+      } else {
+        stream.eat(/[`"]/);
+      }
+      stream.eatWhile(/[^\\`"]/);
+      return "string";
+    }
+    return tokenString;
+  }
+
+  var external = {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        scopes: [],
+        lastToken: null,
+        leavingExpr: false,
+        isDefinition: false,
+        nestedLevels: 0,
+        charsAdvanced: 0,
+        firstParenPos: -1
+      };
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize(stream, state);
+      var current = stream.current();
+
+      if (current && style) {
+        state.lastToken = current;
+      }
+
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var delta = 0;
+      if ( textAfter === ']' || textAfter === ')' || textAfter === "end" ||
+           textAfter === "else" || textAfter === "catch" || textAfter === "elseif" ||
+           textAfter === "finally" ) {
+        delta = -1;
+      }
+      return (state.scopes.length + delta) * config.indentUnit;
+    },
+
+    electricInput: /\b(end|else|catch|finally)\b/,
+    blockCommentStart: "#=",
+    blockCommentEnd: "=#",
+    lineComment: "#",
+    fold: "indent"
+  };
+  return external;
+});
+
+
+CodeMirror.defineMIME("text/x-julia", "julia");
+
+});
diff --git a/core/media/editors/codemirror/mode/julia/julia.min.js b/core/media/editors/codemirror/mode/julia/julia.min.js
new file mode 100644
index 00000000..40ddf6a8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/julia/julia.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("julia",(function(a,b){function c(a,b){return"undefined"==typeof b&&(b="\\b"),new RegExp("^(("+a.join(")|(")+"))"+b)}function d(a){return e(a,"[")}function e(a,b){var c=f(a),d=f(a,1);return"undefined"==typeof b&&(b="("),c===b||d===b&&"for"===c}function f(a,b){return"undefined"==typeof b&&(b=0),a.scopes.length<=b?null:a.scopes[a.scopes.length-(b+1)]}function g(a,b){if(a.match(/^#=/,!1))return b.tokenize=j,b.tokenize(a,b);var c=b.leavingExpr;if(a.sol()&&(c=!1),b.leavingExpr=!1,c&&a.match(/^'+/))return"operator";if(a.match(/\.{4,}/))return"error";if(a.match(/\.{1,3}/))return"operator";if(a.eatSpace())return null;var g=a.peek();if("#"===g)return a.skipToEnd(),"comment";"["===g&&b.scopes.push("["),"("===g&&b.scopes.push("(");var m=f(b);if(d(b)&&"]"===g&&("for"===m&&b.scopes.pop(),b.scopes.pop(),b.leavingExpr=!0),e(b)&&")"===g&&("for"===m&&b.scopes.pop(),b.scopes.pop(),b.leavingExpr=!0),d(b)){if("end"==b.lastToken&&a.match(/^:/))return"operator";if(a.match(/^end/))return"number"}var n;if((n=a.match(u,!1))&&b.scopes.push(n[0]),a.match(v,!1)&&b.scopes.pop(),a.match(/^::(?![:\$])/))return b.tokenize=i,b.tokenize(a,b);if(!c&&a.match(z)||a.match(/:([<>]:|<<=?|>>>?=?|->|\/\/|\.{2,3}|[\.\\%*+\-<>!\/^|&]=?|[~\?\$])/))return"builtin";if(a.match(q))return"operator";if(a.match(/^\.?\d/,!1)){var o=RegExp(/^im\b/),p=!1;if(a.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)&&(p=!0),a.match(/^\d+\.(?!\.)\d*/)&&(p=!0),a.match(/^\.\d+/)&&(p=!0),a.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)&&(p=!0),a.match(/^0x[0-9a-f]+/i)&&(p=!0),a.match(/^0b[01]+/i)&&(p=!0),a.match(/^0o[0-7]+/i)&&(p=!0),a.match(/^[1-9]\d*(e[\+\-]?\d+)?/)&&(p=!0),a.match(/^0(?![\dx])/i)&&(p=!0),p)return a.match(o),b.leavingExpr=!0,"number"}if(a.match(/^'/))return b.tokenize=k,b.tokenize(a,b);if(a.match(A))return b.tokenize=l(a.current()),b.tokenize(a,b);if(a.match(y))return"meta";if(a.match(r))return null;if(a.match(w))return"keyword";if(a.match(x))return"builtin";var t=b.isDefinition||"function"==b.lastToken||"macro"==b.lastToken||"type"==b.lastToken||"struct"==b.lastToken||"immutable"==b.lastToken;return a.match(s)?t?"."===a.peek()?(b.isDefinition=!0,"variable"):(b.isDefinition=!1,"def"):a.match(/^({[^}]*})*\(/,!1)?(b.tokenize=h,b.tokenize(a,b)):(b.leavingExpr=!0,"variable"):(a.next(),"error")}function h(a,b){var c=a.match(/^(\(\s*)/);if(c&&(b.firstParenPos<0&&(b.firstParenPos=b.scopes.length),b.scopes.push("("),b.charsAdvanced+=c[1].length),"("==f(b)&&a.match(/^\)/)&&(b.scopes.pop(),b.charsAdvanced+=1,b.scopes.length<=b.firstParenPos)){var d=a.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/,!1);return a.backUp(b.charsAdvanced),b.firstParenPos=-1,b.charsAdvanced=0,b.tokenize=g,d?"def":"builtin"}if(a.match(/^$/g,!1)){for(a.backUp(b.charsAdvanced);b.scopes.length>b.firstParenPos;)b.scopes.pop();return b.firstParenPos=-1,b.charsAdvanced=0,b.tokenize=g,"builtin"}return b.charsAdvanced+=a.match(/^([^()]*)/)[1].length,b.tokenize(a,b)}function i(a,b){return a.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/),a.match(/^{/)?b.nestedLevels++:a.match(/^}/)&&b.nestedLevels--,b.nestedLevels>0?a.match(/.*?(?={|})/)||a.next():0==b.nestedLevels&&(b.tokenize=g),"builtin"}function j(a,b){return a.match(/^#=/)&&b.nestedLevels++,a.match(/.*?(?=(#=|=#))/)||a.skipToEnd(),a.match(/^=#/)&&(b.nestedLevels--,0==b.nestedLevels&&(b.tokenize=g)),"comment"}function k(a,b){var c,d=!1;if(a.match(t))d=!0;else if(c=a.match(/\\u([a-f0-9]{1,4})(?=')/i)){var e=parseInt(c[1],16);(e<=55295||e>=57344)&&(d=!0,a.next())}else if(c=a.match(/\\U([A-Fa-f0-9]{5,8})(?=')/)){var e=parseInt(c[1],16);e<=1114111&&(d=!0,a.next())}return d?(b.leavingExpr=!0,b.tokenize=g,"string"):(a.match(/^[^']+(?=')/)||a.skipToEnd(),a.match(/^'/)&&(b.tokenize=g),"error")}function l(a){function b(b,c){if(b.eat("\\"))b.next();else{if(b.match(a))return c.tokenize=g,c.leavingExpr=!0,"string";b.eat(/[`"]/)}return b.eatWhile(/[^\\`"]/),"string"}return'"""'===a.substr(-3)?a='"""':'"'===a.substr(-1)&&(a='"'),b}var m="\\\\[0-7]{1,3}",n="\\\\x[A-Fa-f0-9]{1,2}",o="\\\\[abefnrtv0%?'\"\\\\]",p="([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])",q=b.operators||c(["[<>]:","[<>=]=","<<=?",">>>?=?","=>","->","\\/\\/","[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?","\\?","\\$","~",":","\\u00D7","\\u2208","\\u2209","\\u220B","\\u220C","\\u2218","\\u221A","\\u221B","\\u2229","\\u222A","\\u2260","\\u2264","\\u2265","\\u2286","\\u2288","\\u228A","\\u22C5","\\b(in|isa)\\b(?!.?\\()"],""),r=b.delimiters||/^[;,()[\]{}]/,s=b.identifiers||/^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/,t=c([m,n,o,p],"'"),u=c(["begin","function","type","struct","immutable","let","macro","for","while","quote","if","else","elseif","try","finally","catch","do"]),v=c(["end","else","elseif","catch","finally"]),w=c(["if","else","elseif","while","for","begin","let","end","do","try","catch","finally","return","break","continue","global","local","const","export","import","importall","using","function","where","macro","module","baremodule","struct","type","mutable","immutable","quote","typealias","abstract","primitive","bitstype"]),x=c(["true","false","nothing","NaN","Inf"]),y=/^@[_A-Za-z][\w]*/,z=/^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/,A=/^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/,B={startState:function(){return{tokenize:g,scopes:[],lastToken:null,leavingExpr:!1,isDefinition:!1,nestedLevels:0,charsAdvanced:0,firstParenPos:-1}},token:function(a,b){var c=b.tokenize(a,b),d=a.current();return d&&c&&(b.lastToken=d),c},indent:function(b,c){var d=0;return"]"!==c&&")"!==c&&"end"!==c&&"else"!==c&&"catch"!==c&&"elseif"!==c&&"finally"!==c||(d=-1),(b.scopes.length+d)*a.indentUnit},electricInput:/\b(end|else|catch|finally)\b/,blockCommentStart:"#=",blockCommentEnd:"=#",lineComment:"#",fold:"indent"};return B})),a.defineMIME("text/x-julia","julia")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/livescript/livescript.js b/core/media/editors/codemirror/mode/livescript/livescript.js
new file mode 100644
index 00000000..1e363f87
--- /dev/null
+++ b/core/media/editors/codemirror/mode/livescript/livescript.js
@@ -0,0 +1,280 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Link to the project's GitHub page:
+ * https://github.com/duralog/CodeMirror
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode('livescript', function(){
+    var tokenBase = function(stream, state) {
+      var next_rule = state.next || "start";
+      if (next_rule) {
+        state.next = state.next;
+        var nr = Rules[next_rule];
+        if (nr.splice) {
+          for (var i$ = 0; i$ < nr.length; ++i$) {
+            var r = nr[i$];
+            if (r.regex && stream.match(r.regex)) {
+              state.next = r.next || state.next;
+              return r.token;
+            }
+          }
+          stream.next();
+          return 'error';
+        }
+        if (stream.match(r = Rules[next_rule])) {
+          if (r.regex && stream.match(r.regex)) {
+            state.next = r.next;
+            return r.token;
+          } else {
+            stream.next();
+            return 'error';
+          }
+        }
+      }
+      stream.next();
+      return 'error';
+    };
+    var external = {
+      startState: function(){
+        return {
+          next: 'start',
+          lastToken: {style: null, indent: 0, content: ""}
+        };
+      },
+      token: function(stream, state){
+        while (stream.pos == stream.start)
+          var style = tokenBase(stream, state);
+        state.lastToken = {
+          style: style,
+          indent: stream.indentation(),
+          content: stream.current()
+        };
+        return style.replace(/\./g, ' ');
+      },
+      indent: function(state){
+        var indentation = state.lastToken.indent;
+        if (state.lastToken.content.match(indenter)) {
+          indentation += 2;
+        }
+        return indentation;
+      }
+    };
+    return external;
+  });
+
+  var identifier = '(?![\\d\\s])[$\\w\\xAA-\\uFFDC](?:(?!\\s)[$\\w\\xAA-\\uFFDC]|-[A-Za-z])*';
+  var indenter = RegExp('(?:[({[=:]|[-~]>|\\b(?:e(?:lse|xport)|d(?:o|efault)|t(?:ry|hen)|finally|import(?:\\s*all)?|const|var|let|new|catch(?:\\s*' + identifier + ')?))\\s*$');
+  var keywordend = '(?![$\\w]|-[A-Za-z]|\\s*:(?![:=]))';
+  var stringfill = {
+    token: 'string',
+    regex: '.+'
+  };
+  var Rules = {
+    start: [
+      {
+        token: 'comment.doc',
+        regex: '/\\*',
+        next: 'comment'
+      }, {
+        token: 'comment',
+        regex: '#.*'
+      }, {
+        token: 'keyword',
+        regex: '(?:t(?:h(?:is|row|en)|ry|ypeof!?)|c(?:on(?:tinue|st)|a(?:se|tch)|lass)|i(?:n(?:stanceof)?|mp(?:ort(?:\\s+all)?|lements)|[fs])|d(?:e(?:fault|lete|bugger)|o)|f(?:or(?:\\s+own)?|inally|unction)|s(?:uper|witch)|e(?:lse|x(?:tends|port)|val)|a(?:nd|rguments)|n(?:ew|ot)|un(?:less|til)|w(?:hile|ith)|o[fr]|return|break|let|var|loop)' + keywordend
+      }, {
+        token: 'constant.language',
+        regex: '(?:true|false|yes|no|on|off|null|void|undefined)' + keywordend
+      }, {
+        token: 'invalid.illegal',
+        regex: '(?:p(?:ackage|r(?:ivate|otected)|ublic)|i(?:mplements|nterface)|enum|static|yield)' + keywordend
+      }, {
+        token: 'language.support.class',
+        regex: '(?:R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|Array|Boolean|Date|Function|Number|Object|TypeError|URIError)' + keywordend
+      }, {
+        token: 'language.support.function',
+        regex: '(?:is(?:NaN|Finite)|parse(?:Int|Float)|Math|JSON|(?:en|de)codeURI(?:Component)?)' + keywordend
+      }, {
+        token: 'variable.language',
+        regex: '(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)' + keywordend
+      }, {
+        token: 'identifier',
+        regex: identifier + '\\s*:(?![:=])'
+      }, {
+        token: 'variable',
+        regex: identifier
+      }, {
+        token: 'keyword.operator',
+        regex: '(?:\\.{3}|\\s+\\?)'
+      }, {
+        token: 'keyword.variable',
+        regex: '(?:@+|::|\\.\\.)',
+        next: 'key'
+      }, {
+        token: 'keyword.operator',
+        regex: '\\.\\s*',
+        next: 'key'
+      }, {
+        token: 'string',
+        regex: '\\\\\\S[^\\s,;)}\\]]*'
+      }, {
+        token: 'string.doc',
+        regex: '\'\'\'',
+        next: 'qdoc'
+      }, {
+        token: 'string.doc',
+        regex: '"""',
+        next: 'qqdoc'
+      }, {
+        token: 'string',
+        regex: '\'',
+        next: 'qstring'
+      }, {
+        token: 'string',
+        regex: '"',
+        next: 'qqstring'
+      }, {
+        token: 'string',
+        regex: '`',
+        next: 'js'
+      }, {
+        token: 'string',
+        regex: '<\\[',
+        next: 'words'
+      }, {
+        token: 'string.regex',
+        regex: '//',
+        next: 'heregex'
+      }, {
+        token: 'string.regex',
+        regex: '\\/(?:[^[\\/\\n\\\\]*(?:(?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[\\/\\n\\\\]*)*)\\/[gimy$]{0,4}',
+        next: 'key'
+      }, {
+        token: 'constant.numeric',
+        regex: '(?:0x[\\da-fA-F][\\da-fA-F_]*|(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*|(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)(?:e[+-]?\\d[\\d_]*)?[\\w$]*)'
+      }, {
+        token: 'lparen',
+        regex: '[({[]'
+      }, {
+        token: 'rparen',
+        regex: '[)}\\]]',
+        next: 'key'
+      }, {
+        token: 'keyword.operator',
+        regex: '\\S+'
+      }, {
+        token: 'text',
+        regex: '\\s+'
+      }
+    ],
+    heregex: [
+      {
+        token: 'string.regex',
+        regex: '.*?//[gimy$?]{0,4}',
+        next: 'start'
+      }, {
+        token: 'string.regex',
+        regex: '\\s*#{'
+      }, {
+        token: 'comment.regex',
+        regex: '\\s+(?:#.*)?'
+      }, {
+        token: 'string.regex',
+        regex: '\\S+'
+      }
+    ],
+    key: [
+      {
+        token: 'keyword.operator',
+        regex: '[.?@!]+'
+      }, {
+        token: 'identifier',
+        regex: identifier,
+        next: 'start'
+      }, {
+        token: 'text',
+        regex: '',
+        next: 'start'
+      }
+    ],
+    comment: [
+      {
+        token: 'comment.doc',
+        regex: '.*?\\*/',
+        next: 'start'
+      }, {
+        token: 'comment.doc',
+        regex: '.+'
+      }
+    ],
+    qdoc: [
+      {
+        token: 'string',
+        regex: ".*?'''",
+        next: 'key'
+      }, stringfill
+    ],
+    qqdoc: [
+      {
+        token: 'string',
+        regex: '.*?"""',
+        next: 'key'
+      }, stringfill
+    ],
+    qstring: [
+      {
+        token: 'string',
+        regex: '[^\\\\\']*(?:\\\\.[^\\\\\']*)*\'',
+        next: 'key'
+      }, stringfill
+    ],
+    qqstring: [
+      {
+        token: 'string',
+        regex: '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
+        next: 'key'
+      }, stringfill
+    ],
+    js: [
+      {
+        token: 'string',
+        regex: '[^\\\\`]*(?:\\\\.[^\\\\`]*)*`',
+        next: 'key'
+      }, stringfill
+    ],
+    words: [
+      {
+        token: 'string',
+        regex: '.*?\\]>',
+        next: 'key'
+      }, stringfill
+    ]
+  };
+  for (var idx in Rules) {
+    var r = Rules[idx];
+    if (r.splice) {
+      for (var i = 0, len = r.length; i < len; ++i) {
+        var rr = r[i];
+        if (typeof rr.regex === 'string') {
+          Rules[idx][i].regex = new RegExp('^' + rr.regex);
+        }
+      }
+    } else if (typeof rr.regex === 'string') {
+      Rules[idx].regex = new RegExp('^' + r.regex);
+    }
+  }
+
+  CodeMirror.defineMIME('text/x-livescript', 'livescript');
+
+});
diff --git a/core/media/editors/codemirror/mode/livescript/livescript.min.js b/core/media/editors/codemirror/mode/livescript/livescript.min.js
new file mode 100644
index 00000000..475975d1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/livescript/livescript.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("livescript",(function(){var a=function(a,b){var c=b.next||"start";if(c){b.next=b.next;var d=f[c];if(d.splice){for(var e=0;e<d.length;++e){var g=d[e];if(g.regex&&a.match(g.regex))return b.next=g.next||b.next,g.token}return a.next(),"error"}if(a.match(g=f[c]))return g.regex&&a.match(g.regex)?(b.next=g.next,g.token):(a.next(),"error")}return a.next(),"error"},b={startState:function(){return{next:"start",lastToken:{style:null,indent:0,content:""}}},token:function(b,c){for(;b.pos==b.start;)var d=a(b,c);return c.lastToken={style:d,indent:b.indentation(),content:b.current()},d.replace(/\./g," ")},indent:function(a){var b=a.lastToken.indent;return a.lastToken.content.match(c)&&(b+=2),b}};return b}));var b="(?![\\d\\s])[$\\w\\xAA-\\uFFDC](?:(?!\\s)[$\\w\\xAA-\\uFFDC]|-[A-Za-z])*",c=RegExp("(?:[({[=:]|[-~]>|\\b(?:e(?:lse|xport)|d(?:o|efault)|t(?:ry|hen)|finally|import(?:\\s*all)?|const|var|let|new|catch(?:\\s*"+b+")?))\\s*$"),d="(?![$\\w]|-[A-Za-z]|\\s*:(?![:=]))",e={token:"string",regex:".+"},f={start:[{token:"comment.doc",regex:"/\\*",next:"comment"},{token:"comment",regex:"#.*"},{token:"keyword",regex:"(?:t(?:h(?:is|row|en)|ry|ypeof!?)|c(?:on(?:tinue|st)|a(?:se|tch)|lass)|i(?:n(?:stanceof)?|mp(?:ort(?:\\s+all)?|lements)|[fs])|d(?:e(?:fault|lete|bugger)|o)|f(?:or(?:\\s+own)?|inally|unction)|s(?:uper|witch)|e(?:lse|x(?:tends|port)|val)|a(?:nd|rguments)|n(?:ew|ot)|un(?:less|til)|w(?:hile|ith)|o[fr]|return|break|let|var|loop)"+d},{token:"constant.language",regex:"(?:true|false|yes|no|on|off|null|void|undefined)"+d},{token:"invalid.illegal",regex:"(?:p(?:ackage|r(?:ivate|otected)|ublic)|i(?:mplements|nterface)|enum|static|yield)"+d},{token:"language.support.class",regex:"(?:R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|Array|Boolean|Date|Function|Number|Object|TypeError|URIError)"+d},{token:"language.support.function",regex:"(?:is(?:NaN|Finite)|parse(?:Int|Float)|Math|JSON|(?:en|de)codeURI(?:Component)?)"+d},{token:"variable.language",regex:"(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)"+d},{token:"identifier",regex:b+"\\s*:(?![:=])"},{token:"variable",regex:b},{token:"keyword.operator",regex:"(?:\\.{3}|\\s+\\?)"},{token:"keyword.variable",regex:"(?:@+|::|\\.\\.)",next:"key"},{token:"keyword.operator",regex:"\\.\\s*",next:"key"},{token:"string",regex:"\\\\\\S[^\\s,;)}\\]]*"},{token:"string.doc",regex:"'''",next:"qdoc"},{token:"string.doc",regex:'"""',next:"qqdoc"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"string",regex:"`",next:"js"},{token:"string",regex:"<\\[",next:"words"},{token:"string.regex",regex:"//",next:"heregex"},{token:"string.regex",regex:"\\/(?:[^[\\/\\n\\\\]*(?:(?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[\\/\\n\\\\]*)*)\\/[gimy$]{0,4}",next:"key"},{token:"constant.numeric",regex:"(?:0x[\\da-fA-F][\\da-fA-F_]*|(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*|(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)(?:e[+-]?\\d[\\d_]*)?[\\w$]*)"},{token:"lparen",regex:"[({[]"},{token:"rparen",regex:"[)}\\]]",next:"key"},{token:"keyword.operator",regex:"\\S+"},{token:"text",regex:"\\s+"}],heregex:[{token:"string.regex",regex:".*?//[gimy$?]{0,4}",next:"start"},{token:"string.regex",regex:"\\s*#{"},{token:"comment.regex",regex:"\\s+(?:#.*)?"},{token:"string.regex",regex:"\\S+"}],key:[{token:"keyword.operator",regex:"[.?@!]+"},{token:"identifier",regex:b,next:"start"},{token:"text",regex:"",next:"start"}],comment:[{token:"comment.doc",regex:".*?\\*/",next:"start"},{token:"comment.doc",regex:".+"}],qdoc:[{token:"string",regex:".*?'''",next:"key"},e],qqdoc:[{token:"string",regex:'.*?"""',next:"key"},e],qstring:[{token:"string",regex:"[^\\\\']*(?:\\\\.[^\\\\']*)*'",next:"key"},e],qqstring:[{token:"string",regex:'[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',next:"key"},e],js:[{token:"string",regex:"[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",next:"key"},e],words:[{token:"string",regex:".*?\\]>",next:"key"},e]};for(var g in f){var h=f[g];if(h.splice)for(var i=0,j=h.length;i<j;++i){var k=h[i];"string"==typeof k.regex&&(f[g][i].regex=new RegExp("^"+k.regex))}else"string"==typeof k.regex&&(f[g].regex=new RegExp("^"+h.regex))}a.defineMIME("text/x-livescript","livescript")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/lua/lua.js b/core/media/editors/codemirror/mode/lua/lua.js
new file mode 100644
index 00000000..0b19abd3
--- /dev/null
+++ b/core/media/editors/codemirror/mode/lua/lua.js
@@ -0,0 +1,159 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
+// CodeMirror 1 mode.
+// highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("lua", function(config, parserConfig) {
+  var indentUnit = config.indentUnit;
+
+  function prefixRE(words) {
+    return new RegExp("^(?:" + words.join("|") + ")", "i");
+  }
+  function wordRE(words) {
+    return new RegExp("^(?:" + words.join("|") + ")$", "i");
+  }
+  var specials = wordRE(parserConfig.specials || []);
+
+  // long list of standard functions from lua manual
+  var builtins = wordRE([
+    "_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load",
+    "loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require",
+    "select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall",
+
+    "coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield",
+
+    "debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable",
+    "debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable",
+    "debug.setupvalue","debug.traceback",
+
+    "close","flush","lines","read","seek","setvbuf","write",
+
+    "io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin",
+    "io.stdout","io.tmpfile","io.type","io.write",
+
+    "math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg",
+    "math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max",
+    "math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh",
+    "math.sqrt","math.tan","math.tanh",
+
+    "os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale",
+    "os.time","os.tmpname",
+
+    "package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload",
+    "package.seeall",
+
+    "string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub",
+    "string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper",
+
+    "table.concat","table.insert","table.maxn","table.remove","table.sort"
+  ]);
+  var keywords = wordRE(["and","break","elseif","false","nil","not","or","return",
+                         "true","function", "end", "if", "then", "else", "do",
+                         "while", "repeat", "until", "for", "in", "local" ]);
+
+  var indentTokens = wordRE(["function", "if","repeat","do", "\\(", "{"]);
+  var dedentTokens = wordRE(["end", "until", "\\)", "}"]);
+  var dedentPartial = prefixRE(["end", "until", "\\)", "}", "else", "elseif"]);
+
+  function readBracket(stream) {
+    var level = 0;
+    while (stream.eat("=")) ++level;
+    stream.eat("[");
+    return level;
+  }
+
+  function normal(stream, state) {
+    var ch = stream.next();
+    if (ch == "-" && stream.eat("-")) {
+      if (stream.eat("[") && stream.eat("["))
+        return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state);
+      stream.skipToEnd();
+      return "comment";
+    }
+    if (ch == "\"" || ch == "'")
+      return (state.cur = string(ch))(stream, state);
+    if (ch == "[" && /[\[=]/.test(stream.peek()))
+      return (state.cur = bracketed(readBracket(stream), "string"))(stream, state);
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w.%]/);
+      return "number";
+    }
+    if (/[\w_]/.test(ch)) {
+      stream.eatWhile(/[\w\\\-_.]/);
+      return "variable";
+    }
+    return null;
+  }
+
+  function bracketed(level, style) {
+    return function(stream, state) {
+      var curlev = null, ch;
+      while ((ch = stream.next()) != null) {
+        if (curlev == null) {if (ch == "]") curlev = 0;}
+        else if (ch == "=") ++curlev;
+        else if (ch == "]" && curlev == level) { state.cur = normal; break; }
+        else curlev = null;
+      }
+      return style;
+    };
+  }
+
+  function string(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) break;
+        escaped = !escaped && ch == "\\";
+      }
+      if (!escaped) state.cur = normal;
+      return "string";
+    };
+  }
+
+  return {
+    startState: function(basecol) {
+      return {basecol: basecol || 0, indentDepth: 0, cur: normal};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.cur(stream, state);
+      var word = stream.current();
+      if (style == "variable") {
+        if (keywords.test(word)) style = "keyword";
+        else if (builtins.test(word)) style = "builtin";
+        else if (specials.test(word)) style = "variable-2";
+      }
+      if ((style != "comment") && (style != "string")){
+        if (indentTokens.test(word)) ++state.indentDepth;
+        else if (dedentTokens.test(word)) --state.indentDepth;
+      }
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var closing = dedentPartial.test(textAfter);
+      return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
+    },
+
+    lineComment: "--",
+    blockCommentStart: "--[[",
+    blockCommentEnd: "]]"
+  };
+});
+
+CodeMirror.defineMIME("text/x-lua", "lua");
+
+});
diff --git a/core/media/editors/codemirror/mode/lua/lua.min.js b/core/media/editors/codemirror/mode/lua/lua.min.js
new file mode 100644
index 00000000..42c45c47
--- /dev/null
+++ b/core/media/editors/codemirror/mode/lua/lua.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("lua",(function(a,b){function c(a){return new RegExp("^(?:"+a.join("|")+")","i")}function d(a){return new RegExp("^(?:"+a.join("|")+")$","i")}function e(a){for(var b=0;a.eat("=");)++b;return a.eat("["),b}function f(a,b){var c=a.next();return"-"==c&&a.eat("-")?a.eat("[")&&a.eat("[")?(b.cur=g(e(a),"comment"))(a,b):(a.skipToEnd(),"comment"):'"'==c||"'"==c?(b.cur=h(c))(a,b):"["==c&&/[\[=]/.test(a.peek())?(b.cur=g(e(a),"string"))(a,b):/\d/.test(c)?(a.eatWhile(/[\w.%]/),"number"):/[\w_]/.test(c)?(a.eatWhile(/[\w\\\-_.]/),"variable"):null}function g(a,b){return function(c,d){for(var e,g=null;null!=(e=c.next());)if(null==g)"]"==e&&(g=0);else if("="==e)++g;else{if("]"==e&&g==a){d.cur=f;break}g=null}return b}}function h(a){return function(b,c){for(var d,e=!1;null!=(d=b.next())&&(d!=a||e);)e=!e&&"\\"==d;return e||(c.cur=f),"string"}}var i=a.indentUnit,j=d(b.specials||[]),k=d(["_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load","loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require","select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall","coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield","debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable","debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable","debug.setupvalue","debug.traceback","close","flush","lines","read","seek","setvbuf","write","io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin","io.stdout","io.tmpfile","io.type","io.write","math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg","math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max","math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh","math.sqrt","math.tan","math.tanh","os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale","os.time","os.tmpname","package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload","package.seeall","string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub","string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper","table.concat","table.insert","table.maxn","table.remove","table.sort"]),l=d(["and","break","elseif","false","nil","not","or","return","true","function","end","if","then","else","do","while","repeat","until","for","in","local"]),m=d(["function","if","repeat","do","\\(","{"]),n=d(["end","until","\\)","}"]),o=c(["end","until","\\)","}","else","elseif"]);return{startState:function(a){return{basecol:a||0,indentDepth:0,cur:f}},token:function(a,b){if(a.eatSpace())return null;var c=b.cur(a,b),d=a.current();return"variable"==c&&(l.test(d)?c="keyword":k.test(d)?c="builtin":j.test(d)&&(c="variable-2")),"comment"!=c&&"string"!=c&&(m.test(d)?++b.indentDepth:n.test(d)&&--b.indentDepth),c},indent:function(a,b){var c=o.test(b);return a.basecol+i*(a.indentDepth-(c?1:0))},lineComment:"--",blockCommentStart:"--[[",blockCommentEnd:"]]"}})),a.defineMIME("text/x-lua","lua")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/markdown/markdown.js b/core/media/editors/codemirror/mode/markdown/markdown.js
new file mode 100644
index 00000000..88ecc57c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/markdown/markdown.js
@@ -0,0 +1,872 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../meta"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
+
+  var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
+  var htmlModeMissing = htmlMode.name == "null"
+
+  function getMode(name) {
+    if (CodeMirror.findModeByName) {
+      var found = CodeMirror.findModeByName(name);
+      if (found) name = found.mime || found.mimes[0];
+    }
+    var mode = CodeMirror.getMode(cmCfg, name);
+    return mode.name == "null" ? null : mode;
+  }
+
+  // Should characters that affect highlighting be highlighted separate?
+  // Does not include characters that will be output (such as `1.` and `-` for lists)
+  if (modeCfg.highlightFormatting === undefined)
+    modeCfg.highlightFormatting = false;
+
+  // Maximum number of nested blockquotes. Set to 0 for infinite nesting.
+  // Excess `>` will emit `error` token.
+  if (modeCfg.maxBlockquoteDepth === undefined)
+    modeCfg.maxBlockquoteDepth = 0;
+
+  // Turn on task lists? ("- [ ] " and "- [x] ")
+  if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
+
+  // Turn on strikethrough syntax
+  if (modeCfg.strikethrough === undefined)
+    modeCfg.strikethrough = false;
+
+  if (modeCfg.emoji === undefined)
+    modeCfg.emoji = false;
+
+  if (modeCfg.fencedCodeBlockHighlighting === undefined)
+    modeCfg.fencedCodeBlockHighlighting = true;
+
+  if (modeCfg.xml === undefined)
+    modeCfg.xml = true;
+
+  // Allow token types to be overridden by user-provided token types.
+  if (modeCfg.tokenTypeOverrides === undefined)
+    modeCfg.tokenTypeOverrides = {};
+
+  var tokenTypes = {
+    header: "header",
+    code: "comment",
+    quote: "quote",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    hr: "hr",
+    image: "image",
+    imageAltText: "image-alt-text",
+    imageMarker: "image-marker",
+    formatting: "formatting",
+    linkInline: "link",
+    linkEmail: "link",
+    linkText: "link",
+    linkHref: "string",
+    em: "em",
+    strong: "strong",
+    strikethrough: "strikethrough",
+    emoji: "builtin"
+  };
+
+  for (var tokenType in tokenTypes) {
+    if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) {
+      tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType];
+    }
+  }
+
+  var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
+  ,   listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/
+  ,   taskListRE = /^\[(x| )\](?=\s)/i // Must follow listRE
+  ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
+  ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
+  ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
+  ,   linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
+  ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
+  ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
+
+  function switchInline(stream, state, f) {
+    state.f = state.inline = f;
+    return f(stream, state);
+  }
+
+  function switchBlock(stream, state, f) {
+    state.f = state.block = f;
+    return f(stream, state);
+  }
+
+  function lineIsEmpty(line) {
+    return !line || !/\S/.test(line.string)
+  }
+
+  // Blocks
+
+  function blankLine(state) {
+    // Reset linkTitle state
+    state.linkTitle = false;
+    state.linkHref = false;
+    state.linkText = false;
+    // Reset EM state
+    state.em = false;
+    // Reset STRONG state
+    state.strong = false;
+    // Reset strikethrough state
+    state.strikethrough = false;
+    // Reset state.quote
+    state.quote = 0;
+    // Reset state.indentedCode
+    state.indentedCode = false;
+    if (state.f == htmlBlock) {
+      state.f = inlineNormal;
+      state.block = blockNormal;
+    }
+    // Reset state.trailingSpace
+    state.trailingSpace = 0;
+    state.trailingSpaceNewLine = false;
+    // Mark this line as blank
+    state.prevLine = state.thisLine
+    state.thisLine = {stream: null}
+    return null;
+  }
+
+  function blockNormal(stream, state) {
+    var firstTokenOnLine = stream.column() === state.indentation;
+    var prevLineLineIsEmpty = lineIsEmpty(state.prevLine.stream);
+    var prevLineIsIndentedCode = state.indentedCode;
+    var prevLineIsHr = state.prevLine.hr;
+    var prevLineIsList = state.list !== false;
+    var maxNonCodeIndentation = (state.listStack[state.listStack.length - 1] || 0) + 3;
+
+    state.indentedCode = false;
+
+    var lineIndentation = state.indentation;
+    // compute once per line (on first token)
+    if (state.indentationDiff === null) {
+      state.indentationDiff = state.indentation;
+      if (prevLineIsList) {
+        // Reset inline styles which shouldn't propagate aross list items
+        state.em = false;
+        state.strong = false;
+        state.code = false;
+        state.strikethrough = false;
+
+        state.list = null;
+        // While this list item's marker's indentation is less than the deepest
+        //  list item's content's indentation,pop the deepest list item
+        //  indentation off the stack, and update block indentation state
+        while (lineIndentation < state.listStack[state.listStack.length - 1]) {
+          state.listStack.pop();
+          if (state.listStack.length) {
+            state.indentation = state.listStack[state.listStack.length - 1];
+          // less than the first list's indent -> the line is no longer a list
+          } else {
+            state.list = false;
+          }
+        }
+        if (state.list !== false) {
+          state.indentationDiff = lineIndentation - state.listStack[state.listStack.length - 1]
+        }
+      }
+    }
+
+    // not comprehensive (currently only for setext detection purposes)
+    var allowsInlineContinuation = (
+        !prevLineLineIsEmpty && !prevLineIsHr && !state.prevLine.header &&
+        (!prevLineIsList || !prevLineIsIndentedCode) &&
+        !state.prevLine.fencedCodeEnd
+    );
+
+    var isHr = (state.list === false || prevLineIsHr || prevLineLineIsEmpty) &&
+      state.indentation <= maxNonCodeIndentation && stream.match(hrRE);
+
+    var match = null;
+    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || state.prevLine.fencedCodeEnd ||
+         state.prevLine.header || prevLineLineIsEmpty)) {
+      stream.skipToEnd();
+      state.indentedCode = true;
+      return tokenTypes.code;
+    } else if (stream.eatSpace()) {
+      return null;
+    } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+      state.quote = 0;
+      state.header = match[1].length;
+      state.thisLine.header = true;
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      state.f = state.inline;
+      return getType(state);
+    } else if (state.indentation <= maxNonCodeIndentation && stream.eat('>')) {
+      state.quote = firstTokenOnLine ? 1 : state.quote + 1;
+      if (modeCfg.highlightFormatting) state.formatting = "quote";
+      stream.eatSpace();
+      return getType(state);
+    } else if (!isHr && !state.setext && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
+      var listType = match[1] ? "ol" : "ul";
+
+      state.indentation = lineIndentation + stream.current().length;
+      state.list = true;
+      state.quote = 0;
+
+      // Add this list item's content's indentation to the stack
+      state.listStack.push(state.indentation);
+
+      if (modeCfg.taskLists && stream.match(taskListRE, false)) {
+        state.taskList = true;
+      }
+      state.f = state.inline;
+      if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
+      return getType(state);
+    } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) {
+      state.quote = 0;
+      state.fencedEndRE = new RegExp(match[1] + "+ *$");
+      // try switching mode
+      state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
+      if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
+      state.f = state.block = local;
+      if (modeCfg.highlightFormatting) state.formatting = "code-block";
+      state.code = -1
+      return getType(state);
+    // SETEXT has lowest block-scope precedence after HR, so check it after
+    //  the others (code, blockquote, list...)
+    } else if (
+      // if setext set, indicates line after ---/===
+      state.setext || (
+        // line before ---/===
+        (!allowsInlineContinuation || !prevLineIsList) && !state.quote && state.list === false &&
+        !state.code && !isHr && !linkDefRE.test(stream.string) &&
+        (match = stream.lookAhead(1)) && (match = match.match(setextHeaderRE))
+      )
+    ) {
+      if ( !state.setext ) {
+        state.header = match[0].charAt(0) == '=' ? 1 : 2;
+        state.setext = state.header;
+      } else {
+        state.header = state.setext;
+        // has no effect on type so we can reset it now
+        state.setext = 0;
+        stream.skipToEnd();
+        if (modeCfg.highlightFormatting) state.formatting = "header";
+      }
+      state.thisLine.header = true;
+      state.f = state.inline;
+      return getType(state);
+    } else if (isHr) {
+      stream.skipToEnd();
+      state.hr = true;
+      state.thisLine.hr = true;
+      return tokenTypes.hr;
+    } else if (stream.peek() === '[') {
+      return switchInline(stream, state, footnoteLink);
+    }
+
+    return switchInline(stream, state, state.inline);
+  }
+
+  function htmlBlock(stream, state) {
+    var style = htmlMode.token(stream, state.htmlState);
+    if (!htmlModeMissing) {
+      var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
+      if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
+           (!inner.state.context && inner.state.tokenize.isInText)) ||
+          (state.md_inside && stream.current().indexOf(">") > -1)) {
+        state.f = inlineNormal;
+        state.block = blockNormal;
+        state.htmlState = null;
+      }
+    }
+    return style;
+  }
+
+  function local(stream, state) {
+    var currListInd = state.listStack[state.listStack.length - 1] || 0;
+    var hasExitedList = state.indentation < currListInd;
+    var maxFencedEndInd = currListInd + 3;
+    if (state.fencedEndRE && state.indentation <= maxFencedEndInd && (hasExitedList || stream.match(state.fencedEndRE))) {
+      if (modeCfg.highlightFormatting) state.formatting = "code-block";
+      var returnType;
+      if (!hasExitedList) returnType = getType(state)
+      state.localMode = state.localState = null;
+      state.block = blockNormal;
+      state.f = inlineNormal;
+      state.fencedEndRE = null;
+      state.code = 0
+      state.thisLine.fencedCodeEnd = true;
+      if (hasExitedList) return switchBlock(stream, state, state.block);
+      return returnType;
+    } else if (state.localMode) {
+      return state.localMode.token(stream, state.localState);
+    } else {
+      stream.skipToEnd();
+      return tokenTypes.code;
+    }
+  }
+
+  // Inline
+  function getType(state) {
+    var styles = [];
+
+    if (state.formatting) {
+      styles.push(tokenTypes.formatting);
+
+      if (typeof state.formatting === "string") state.formatting = [state.formatting];
+
+      for (var i = 0; i < state.formatting.length; i++) {
+        styles.push(tokenTypes.formatting + "-" + state.formatting[i]);
+
+        if (state.formatting[i] === "header") {
+          styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header);
+        }
+
+        // Add `formatting-quote` and `formatting-quote-#` for blockquotes
+        // Add `error` instead if the maximum blockquote nesting depth is passed
+        if (state.formatting[i] === "quote") {
+          if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
+            styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote);
+          } else {
+            styles.push("error");
+          }
+        }
+      }
+    }
+
+    if (state.taskOpen) {
+      styles.push("meta");
+      return styles.length ? styles.join(' ') : null;
+    }
+    if (state.taskClosed) {
+      styles.push("property");
+      return styles.length ? styles.join(' ') : null;
+    }
+
+    if (state.linkHref) {
+      styles.push(tokenTypes.linkHref, "url");
+    } else { // Only apply inline styles to non-url text
+      if (state.strong) { styles.push(tokenTypes.strong); }
+      if (state.em) { styles.push(tokenTypes.em); }
+      if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.emoji) { styles.push(tokenTypes.emoji); }
+      if (state.linkText) { styles.push(tokenTypes.linkText); }
+      if (state.code) { styles.push(tokenTypes.code); }
+      if (state.image) { styles.push(tokenTypes.image); }
+      if (state.imageAltText) { styles.push(tokenTypes.imageAltText, "link"); }
+      if (state.imageMarker) { styles.push(tokenTypes.imageMarker); }
+    }
+
+    if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
+
+    if (state.quote) {
+      styles.push(tokenTypes.quote);
+
+      // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
+      if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
+        styles.push(tokenTypes.quote + "-" + state.quote);
+      } else {
+        styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth);
+      }
+    }
+
+    if (state.list !== false) {
+      var listMod = (state.listStack.length - 1) % 3;
+      if (!listMod) {
+        styles.push(tokenTypes.list1);
+      } else if (listMod === 1) {
+        styles.push(tokenTypes.list2);
+      } else {
+        styles.push(tokenTypes.list3);
+      }
+    }
+
+    if (state.trailingSpaceNewLine) {
+      styles.push("trailing-space-new-line");
+    } else if (state.trailingSpace) {
+      styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b"));
+    }
+
+    return styles.length ? styles.join(' ') : null;
+  }
+
+  function handleText(stream, state) {
+    if (stream.match(textRE, true)) {
+      return getType(state);
+    }
+    return undefined;
+  }
+
+  function inlineNormal(stream, state) {
+    var style = state.text(stream, state);
+    if (typeof style !== 'undefined')
+      return style;
+
+    if (state.list) { // List marker (*, +, -, 1., etc)
+      state.list = null;
+      return getType(state);
+    }
+
+    if (state.taskList) {
+      var taskOpen = stream.match(taskListRE, true)[1] === " ";
+      if (taskOpen) state.taskOpen = true;
+      else state.taskClosed = true;
+      if (modeCfg.highlightFormatting) state.formatting = "task";
+      state.taskList = false;
+      return getType(state);
+    }
+
+    state.taskOpen = false;
+    state.taskClosed = false;
+
+    if (state.header && stream.match(/^#+$/, true)) {
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      return getType(state);
+    }
+
+    var ch = stream.next();
+
+    // Matches link titles present on next line
+    if (state.linkTitle) {
+      state.linkTitle = false;
+      var matchCh = ch;
+      if (ch === '(') {
+        matchCh = ')';
+      }
+      matchCh = (matchCh+'').replace(/([.?*+^\[\]\\(){}|-])/g, "\\$1");
+      var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
+      if (stream.match(new RegExp(regex), true)) {
+        return tokenTypes.linkHref;
+      }
+    }
+
+    // If this block is changed, it may need to be updated in GFM mode
+    if (ch === '`') {
+      var previousFormatting = state.formatting;
+      if (modeCfg.highlightFormatting) state.formatting = "code";
+      stream.eatWhile('`');
+      var count = stream.current().length
+      if (state.code == 0 && (!state.quote || count == 1)) {
+        state.code = count
+        return getType(state)
+      } else if (count == state.code) { // Must be exact
+        var t = getType(state)
+        state.code = 0
+        return t
+      } else {
+        state.formatting = previousFormatting
+        return getType(state)
+      }
+    } else if (state.code) {
+      return getType(state);
+    }
+
+    if (ch === '\\') {
+      stream.next();
+      if (modeCfg.highlightFormatting) {
+        var type = getType(state);
+        var formattingEscape = tokenTypes.formatting + "-escape";
+        return type ? type + " " + formattingEscape : formattingEscape;
+      }
+    }
+
+    if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
+      state.imageMarker = true;
+      state.image = true;
+      if (modeCfg.highlightFormatting) state.formatting = "image";
+      return getType(state);
+    }
+
+    if (ch === '[' && state.imageMarker && stream.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/, false)) {
+      state.imageMarker = false;
+      state.imageAltText = true
+      if (modeCfg.highlightFormatting) state.formatting = "image";
+      return getType(state);
+    }
+
+    if (ch === ']' && state.imageAltText) {
+      if (modeCfg.highlightFormatting) state.formatting = "image";
+      var type = getType(state);
+      state.imageAltText = false;
+      state.image = false;
+      state.inline = state.f = linkHref;
+      return type;
+    }
+
+    if (ch === '[' && !state.image) {
+      state.linkText = true;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      return getType(state);
+    }
+
+    if (ch === ']' && state.linkText) {
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      state.linkText = false;
+      state.inline = state.f = stream.match(/\(.*?\)| ?\[.*?\]/, false) ? linkHref : inlineNormal
+      return type;
+    }
+
+    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
+      state.f = state.inline = linkInline;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + tokenTypes.linkInline;
+    }
+
+    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
+      state.f = state.inline = linkInline;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + tokenTypes.linkEmail;
+    }
+
+    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i, false)) {
+      var end = stream.string.indexOf(">", stream.pos);
+      if (end != -1) {
+        var atts = stream.string.substring(stream.start, end);
+        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true;
+      }
+      stream.backUp(1);
+      state.htmlState = CodeMirror.startState(htmlMode);
+      return switchBlock(stream, state, htmlBlock);
+    }
+
+    if (modeCfg.xml && ch === '<' && stream.match(/^\/\w*?>/)) {
+      state.md_inside = false;
+      return "tag";
+    } else if (ch === "*" || ch === "_") {
+      var len = 1, before = stream.pos == 1 ? " " : stream.string.charAt(stream.pos - 2)
+      while (len < 3 && stream.eat(ch)) len++
+      var after = stream.peek() || " "
+      // See http://spec.commonmark.org/0.27/#emphasis-and-strong-emphasis
+      var leftFlanking = !/\s/.test(after) && (!punctuation.test(after) || /\s/.test(before) || punctuation.test(before))
+      var rightFlanking = !/\s/.test(before) && (!punctuation.test(before) || /\s/.test(after) || punctuation.test(after))
+      var setEm = null, setStrong = null
+      if (len % 2) { // Em
+        if (!state.em && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before)))
+          setEm = true
+        else if (state.em == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after)))
+          setEm = false
+      }
+      if (len > 1) { // Strong
+        if (!state.strong && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before)))
+          setStrong = true
+        else if (state.strong == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after)))
+          setStrong = false
+      }
+      if (setStrong != null || setEm != null) {
+        if (modeCfg.highlightFormatting) state.formatting = setEm == null ? "strong" : setStrong == null ? "em" : "strong em"
+        if (setEm === true) state.em = ch
+        if (setStrong === true) state.strong = ch
+        var t = getType(state)
+        if (setEm === false) state.em = false
+        if (setStrong === false) state.strong = false
+        return t
+      }
+    } else if (ch === ' ') {
+      if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
+        if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+          return getType(state);
+        } else { // Not surrounded by spaces, back up pointer
+          stream.backUp(1);
+        }
+      }
+    }
+
+    if (modeCfg.strikethrough) {
+      if (ch === '~' && stream.eatWhile(ch)) {
+        if (state.strikethrough) {// Remove strikethrough
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          var t = getType(state);
+          state.strikethrough = false;
+          return t;
+        } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough
+          state.strikethrough = true;
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          return getType(state);
+        }
+      } else if (ch === ' ') {
+        if (stream.match(/^~~/, true)) { // Probably surrounded by space
+          if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+            return getType(state);
+          } else { // Not surrounded by spaces, back up pointer
+            stream.backUp(2);
+          }
+        }
+      }
+    }
+
+    if (modeCfg.emoji && ch === ":" && stream.match(/^[a-z_\d+-]+:/)) {
+      state.emoji = true;
+      if (modeCfg.highlightFormatting) state.formatting = "emoji";
+      var retType = getType(state);
+      state.emoji = false;
+      return retType;
+    }
+
+    if (ch === ' ') {
+      if (stream.match(/^ +$/, false)) {
+        state.trailingSpace++;
+      } else if (state.trailingSpace) {
+        state.trailingSpaceNewLine = true;
+      }
+    }
+
+    return getType(state);
+  }
+
+  function linkInline(stream, state) {
+    var ch = stream.next();
+
+    if (ch === ">") {
+      state.f = state.inline = inlineNormal;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + tokenTypes.linkInline;
+    }
+
+    stream.match(/^[^>]+/, true);
+
+    return tokenTypes.linkInline;
+  }
+
+  function linkHref(stream, state) {
+    // Check if space, and return NULL if so (to avoid marking the space)
+    if(stream.eatSpace()){
+      return null;
+    }
+    var ch = stream.next();
+    if (ch === '(' || ch === '[') {
+      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
+      if (modeCfg.highlightFormatting) state.formatting = "link-string";
+      state.linkHref = true;
+      return getType(state);
+    }
+    return 'error';
+  }
+
+  var linkRE = {
+    ")": /^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,
+    "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/
+  }
+
+  function getLinkHrefInside(endChar) {
+    return function(stream, state) {
+      var ch = stream.next();
+
+      if (ch === endChar) {
+        state.f = state.inline = inlineNormal;
+        if (modeCfg.highlightFormatting) state.formatting = "link-string";
+        var returnState = getType(state);
+        state.linkHref = false;
+        return returnState;
+      }
+
+      stream.match(linkRE[endChar])
+      state.linkHref = true;
+      return getType(state);
+    };
+  }
+
+  function footnoteLink(stream, state) {
+    if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
+      state.f = footnoteLinkInside;
+      stream.next(); // Consume [
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      state.linkText = true;
+      return getType(state);
+    }
+    return switchInline(stream, state, inlineNormal);
+  }
+
+  function footnoteLinkInside(stream, state) {
+    if (stream.match(/^\]:/, true)) {
+      state.f = state.inline = footnoteUrl;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var returnType = getType(state);
+      state.linkText = false;
+      return returnType;
+    }
+
+    stream.match(/^([^\]\\]|\\.)+/, true);
+
+    return tokenTypes.linkText;
+  }
+
+  function footnoteUrl(stream, state) {
+    // Check if space, and return NULL if so (to avoid marking the space)
+    if(stream.eatSpace()){
+      return null;
+    }
+    // Match URL
+    stream.match(/^[^\s]+/, true);
+    // Check for link title
+    if (stream.peek() === undefined) { // End of line, set flag to check next line
+      state.linkTitle = true;
+    } else { // More content on line, check if link title
+      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
+    }
+    state.f = state.inline = inlineNormal;
+    return tokenTypes.linkHref + " url";
+  }
+
+  var mode = {
+    startState: function() {
+      return {
+        f: blockNormal,
+
+        prevLine: {stream: null},
+        thisLine: {stream: null},
+
+        block: blockNormal,
+        htmlState: null,
+        indentation: 0,
+
+        inline: inlineNormal,
+        text: handleText,
+
+        formatting: false,
+        linkText: false,
+        linkHref: false,
+        linkTitle: false,
+        code: 0,
+        em: false,
+        strong: false,
+        header: 0,
+        setext: 0,
+        hr: false,
+        taskList: false,
+        list: false,
+        listStack: [],
+        quote: 0,
+        trailingSpace: 0,
+        trailingSpaceNewLine: false,
+        strikethrough: false,
+        emoji: false,
+        fencedEndRE: null
+      };
+    },
+
+    copyState: function(s) {
+      return {
+        f: s.f,
+
+        prevLine: s.prevLine,
+        thisLine: s.thisLine,
+
+        block: s.block,
+        htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
+        indentation: s.indentation,
+
+        localMode: s.localMode,
+        localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
+
+        inline: s.inline,
+        text: s.text,
+        formatting: false,
+        linkText: s.linkText,
+        linkTitle: s.linkTitle,
+        linkHref: s.linkHref,
+        code: s.code,
+        em: s.em,
+        strong: s.strong,
+        strikethrough: s.strikethrough,
+        emoji: s.emoji,
+        header: s.header,
+        setext: s.setext,
+        hr: s.hr,
+        taskList: s.taskList,
+        list: s.list,
+        listStack: s.listStack.slice(0),
+        quote: s.quote,
+        indentedCode: s.indentedCode,
+        trailingSpace: s.trailingSpace,
+        trailingSpaceNewLine: s.trailingSpaceNewLine,
+        md_inside: s.md_inside,
+        fencedEndRE: s.fencedEndRE
+      };
+    },
+
+    token: function(stream, state) {
+
+      // Reset state.formatting
+      state.formatting = false;
+
+      if (stream != state.thisLine.stream) {
+        state.header = 0;
+        state.hr = false;
+
+        if (stream.match(/^\s*$/, true)) {
+          blankLine(state);
+          return null;
+        }
+
+        state.prevLine = state.thisLine
+        state.thisLine = {stream: stream}
+
+        // Reset state.taskList
+        state.taskList = false;
+
+        // Reset state.trailingSpace
+        state.trailingSpace = 0;
+        state.trailingSpaceNewLine = false;
+
+        if (!state.localState) {
+          state.f = state.block;
+          if (state.f != htmlBlock) {
+            var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length;
+            state.indentation = indentation;
+            state.indentationDiff = null;
+            if (indentation > 0) return null;
+          }
+        }
+      }
+      return state.f(stream, state);
+    },
+
+    innerMode: function(state) {
+      if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode};
+      if (state.localState) return {state: state.localState, mode: state.localMode};
+      return {state: state, mode: mode};
+    },
+
+    indent: function(state, textAfter, line) {
+      if (state.block == htmlBlock && htmlMode.indent) return htmlMode.indent(state.htmlState, textAfter, line)
+      if (state.localState && state.localMode.indent) return state.localMode.indent(state.localState, textAfter, line)
+      return CodeMirror.Pass
+    },
+
+    blankLine: blankLine,
+
+    getType: getType,
+
+    closeBrackets: "()[]{}''\"\"``",
+    fold: "markdown"
+  };
+  return mode;
+}, "xml");
+
+CodeMirror.defineMIME("text/markdown", "markdown");
+
+CodeMirror.defineMIME("text/x-markdown", "markdown");
+
+});
diff --git a/core/media/editors/codemirror/mode/markdown/markdown.min.js b/core/media/editors/codemirror/mode/markdown/markdown.min.js
new file mode 100644
index 00000000..67f4666a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/markdown/markdown.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../xml/xml"),require("../meta")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../meta"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("markdown",(function(b,c){function d(c){if(a.findModeByName){var d=a.findModeByName(c);d&&(c=d.mime||d.mimes[0])}var e=a.getMode(b,c);return"null"==e.name?null:e}function e(a,b,c){return b.f=b.inline=c,c(a,b)}function f(a,b,c){return b.f=b.block=c,c(a,b)}function g(a){return!a||!/\S/.test(a.string)}function h(a){return a.linkTitle=!1,a.linkHref=!1,a.linkText=!1,a.em=!1,a.strong=!1,a.strikethrough=!1,a.quote=0,a.indentedCode=!1,a.f==j&&(a.f=n,a.block=i),a.trailingSpace=0,a.trailingSpaceNewLine=!1,a.prevLine=a.thisLine,a.thisLine={stream:null},null}function i(b,f){var h=b.column()===f.indentation,i=g(f.prevLine.stream),j=f.indentedCode,m=f.prevLine.hr,n=f.list!==!1,o=(f.listStack[f.listStack.length-1]||0)+3;f.indentedCode=!1;var p=f.indentation;if(null===f.indentationDiff&&(f.indentationDiff=f.indentation,n)){for(f.em=!1,f.strong=!1,f.code=!1,f.strikethrough=!1,f.list=null;p<f.listStack[f.listStack.length-1];)f.listStack.pop(),f.listStack.length?f.indentation=f.listStack[f.listStack.length-1]:f.list=!1;f.list!==!1&&(f.indentationDiff=p-f.listStack[f.listStack.length-1])}var q=!(i||m||f.prevLine.header||n&&j||f.prevLine.fencedCodeEnd),s=(f.list===!1||m||i)&&f.indentation<=o&&b.match(y),t=null;if(f.indentationDiff>=4&&(j||f.prevLine.fencedCodeEnd||f.prevLine.header||i))return b.skipToEnd(),f.indentedCode=!0,w.code;if(b.eatSpace())return null;if(h&&f.indentation<=o&&(t=b.match(B))&&t[1].length<=6)return f.quote=0,f.header=t[1].length,f.thisLine.header=!0,c.highlightFormatting&&(f.formatting="header"),f.f=f.inline,l(f);if(f.indentation<=o&&b.eat(">"))return f.quote=h?1:f.quote+1,c.highlightFormatting&&(f.formatting="quote"),b.eatSpace(),l(f);if(!s&&!f.setext&&h&&f.indentation<=o&&(t=b.match(z))){var u=t[1]?"ol":"ul";return f.indentation=p+b.current().length,f.list=!0,f.quote=0,f.listStack.push(f.indentation),c.taskLists&&b.match(A,!1)&&(f.taskList=!0),f.f=f.inline,c.highlightFormatting&&(f.formatting=["list","list-"+u]),l(f)}return h&&f.indentation<=o&&(t=b.match(E,!0))?(f.quote=0,f.fencedEndRE=new RegExp(t[1]+"+ *$"),f.localMode=c.fencedCodeBlockHighlighting&&d(t[2]),f.localMode&&(f.localState=a.startState(f.localMode)),f.f=f.block=k,c.highlightFormatting&&(f.formatting="code-block"),f.code=-1,l(f)):f.setext||!(q&&n||f.quote||f.list!==!1||f.code||s||F.test(b.string))&&(t=b.lookAhead(1))&&(t=t.match(C))?(f.setext?(f.header=f.setext,f.setext=0,b.skipToEnd(),c.highlightFormatting&&(f.formatting="header")):(f.header="="==t[0].charAt(0)?1:2,f.setext=f.header),f.thisLine.header=!0,f.f=f.inline,l(f)):s?(b.skipToEnd(),f.hr=!0,f.thisLine.hr=!0,w.hr):"["===b.peek()?e(b,f,r):e(b,f,f.inline)}function j(b,c){var d=u.token(b,c.htmlState);if(!v){var e=a.innerMode(u,c.htmlState);("xml"==e.mode.name&&null===e.state.tagStart&&!e.state.context&&e.state.tokenize.isInText||c.md_inside&&b.current().indexOf(">")>-1)&&(c.f=n,c.block=i,c.htmlState=null)}return d}function k(a,b){var d=b.listStack[b.listStack.length-1]||0,e=b.indentation<d,g=d+3;if(b.fencedEndRE&&b.indentation<=g&&(e||a.match(b.fencedEndRE))){c.highlightFormatting&&(b.formatting="code-block");var h;return e||(h=l(b)),b.localMode=b.localState=null,b.block=i,b.f=n,b.fencedEndRE=null,b.code=0,b.thisLine.fencedCodeEnd=!0,e?f(a,b,b.block):h}return b.localMode?b.localMode.token(a,b.localState):(a.skipToEnd(),w.code)}function l(a){var b=[];if(a.formatting){b.push(w.formatting),"string"==typeof a.formatting&&(a.formatting=[a.formatting]);for(var d=0;d<a.formatting.length;d++)b.push(w.formatting+"-"+a.formatting[d]),"header"===a.formatting[d]&&b.push(w.formatting+"-"+a.formatting[d]+"-"+a.header),"quote"===a.formatting[d]&&(!c.maxBlockquoteDepth||c.maxBlockquoteDepth>=a.quote?b.push(w.formatting+"-"+a.formatting[d]+"-"+a.quote):b.push("error"))}if(a.taskOpen)return b.push("meta"),b.length?b.join(" "):null;if(a.taskClosed)return b.push("property"),b.length?b.join(" "):null;if(a.linkHref?b.push(w.linkHref,"url"):(a.strong&&b.push(w.strong),a.em&&b.push(w.em),a.strikethrough&&b.push(w.strikethrough),a.emoji&&b.push(w.emoji),a.linkText&&b.push(w.linkText),a.code&&b.push(w.code),a.image&&b.push(w.image),a.imageAltText&&b.push(w.imageAltText,"link"),a.imageMarker&&b.push(w.imageMarker)),a.header&&b.push(w.header,w.header+"-"+a.header),a.quote&&(b.push(w.quote),!c.maxBlockquoteDepth||c.maxBlockquoteDepth>=a.quote?b.push(w.quote+"-"+a.quote):b.push(w.quote+"-"+c.maxBlockquoteDepth)),a.list!==!1){var e=(a.listStack.length-1)%3;e?1===e?b.push(w.list2):b.push(w.list3):b.push(w.list1)}return a.trailingSpaceNewLine?b.push("trailing-space-new-line"):a.trailingSpace&&b.push("trailing-space-"+(a.trailingSpace%2?"a":"b")),b.length?b.join(" "):null}function m(a,b){if(a.match(D,!0))return l(b)}function n(b,d){var e=d.text(b,d);if("undefined"!=typeof e)return e;if(d.list)return d.list=null,l(d);if(d.taskList){var g=" "===b.match(A,!0)[1];return g?d.taskOpen=!0:d.taskClosed=!0,c.highlightFormatting&&(d.formatting="task"),d.taskList=!1,l(d)}if(d.taskOpen=!1,d.taskClosed=!1,d.header&&b.match(/^#+$/,!0))return c.highlightFormatting&&(d.formatting="header"),l(d);var h=b.next();if(d.linkTitle){d.linkTitle=!1;var i=h;"("===h&&(i=")"),i=(i+"").replace(/([.?*+^\[\]\\(){}|-])/g,"\\$1");var k="^\\s*(?:[^"+i+"\\\\]+|\\\\\\\\|\\\\.)"+i;if(b.match(new RegExp(k),!0))return w.linkHref}if("`"===h){var m=d.formatting;c.highlightFormatting&&(d.formatting="code"),b.eatWhile("`");var q=b.current().length;if(0!=d.code||d.quote&&1!=q){if(q==d.code){var r=l(d);return d.code=0,r}return d.formatting=m,l(d)}return d.code=q,l(d)}if(d.code)return l(d);if("\\"===h&&(b.next(),c.highlightFormatting)){var s=l(d),t=w.formatting+"-escape";return s?s+" "+t:t}if("!"===h&&b.match(/\[[^\]]*\] ?(?:\(|\[)/,!1))return d.imageMarker=!0,d.image=!0,c.highlightFormatting&&(d.formatting="image"),l(d);if("["===h&&d.imageMarker&&b.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/,!1))return d.imageMarker=!1,d.imageAltText=!0,c.highlightFormatting&&(d.formatting="image"),l(d);if("]"===h&&d.imageAltText){c.highlightFormatting&&(d.formatting="image");var s=l(d);return d.imageAltText=!1,d.image=!1,d.inline=d.f=p,s}if("["===h&&!d.image)return d.linkText=!0,c.highlightFormatting&&(d.formatting="link"),l(d);if("]"===h&&d.linkText){c.highlightFormatting&&(d.formatting="link");var s=l(d);return d.linkText=!1,d.inline=d.f=b.match(/\(.*?\)| ?\[.*?\]/,!1)?p:n,s}if("<"===h&&b.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/,!1)){d.f=d.inline=o,c.highlightFormatting&&(d.formatting="link");var s=l(d);return s?s+=" ":s="",s+w.linkInline}if("<"===h&&b.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/,!1)){d.f=d.inline=o,c.highlightFormatting&&(d.formatting="link");var s=l(d);return s?s+=" ":s="",s+w.linkEmail}if(c.xml&&"<"===h&&b.match(/^(!--|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i,!1)){var v=b.string.indexOf(">",b.pos);if(v!=-1){var x=b.string.substring(b.start,v);/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(x)&&(d.md_inside=!0)}return b.backUp(1),d.htmlState=a.startState(u),f(b,d,j)}if(c.xml&&"<"===h&&b.match(/^\/\w*?>/))return d.md_inside=!1,"tag";if("*"===h||"_"===h){for(var y=1,z=1==b.pos?" ":b.string.charAt(b.pos-2);y<3&&b.eat(h);)y++;var B=b.peek()||" ",C=!/\s/.test(B)&&(!G.test(B)||/\s/.test(z)||G.test(z)),D=!/\s/.test(z)&&(!G.test(z)||/\s/.test(B)||G.test(B)),E=null,F=null;if(y%2&&(d.em||!C||"*"!==h&&D&&!G.test(z)?d.em!=h||!D||"*"!==h&&C&&!G.test(B)||(E=!1):E=!0),y>1&&(d.strong||!C||"*"!==h&&D&&!G.test(z)?d.strong!=h||!D||"*"!==h&&C&&!G.test(B)||(F=!1):F=!0),null!=F||null!=E){c.highlightFormatting&&(d.formatting=null==E?"strong":null==F?"em":"strong em"),E===!0&&(d.em=h),F===!0&&(d.strong=h);var r=l(d);return E===!1&&(d.em=!1),F===!1&&(d.strong=!1),r}}else if(" "===h&&(b.eat("*")||b.eat("_"))){if(" "===b.peek())return l(d);b.backUp(1)}if(c.strikethrough)if("~"===h&&b.eatWhile(h)){if(d.strikethrough){c.highlightFormatting&&(d.formatting="strikethrough");var r=l(d);return d.strikethrough=!1,r}if(b.match(/^[^\s]/,!1))return d.strikethrough=!0,c.highlightFormatting&&(d.formatting="strikethrough"),l(d)}else if(" "===h&&b.match(/^~~/,!0)){if(" "===b.peek())return l(d);b.backUp(2)}if(c.emoji&&":"===h&&b.match(/^[a-z_\d+-]+:/)){d.emoji=!0,c.highlightFormatting&&(d.formatting="emoji");var H=l(d);return d.emoji=!1,H}return" "===h&&(b.match(/^ +$/,!1)?d.trailingSpace++:d.trailingSpace&&(d.trailingSpaceNewLine=!0)),l(d)}function o(a,b){var d=a.next();if(">"===d){b.f=b.inline=n,c.highlightFormatting&&(b.formatting="link");var e=l(b);return e?e+=" ":e="",e+w.linkInline}return a.match(/^[^>]+/,!0),w.linkInline}function p(a,b){if(a.eatSpace())return null;var d=a.next();return"("===d||"["===d?(b.f=b.inline=q("("===d?")":"]"),c.highlightFormatting&&(b.formatting="link-string"),b.linkHref=!0,l(b)):"error"}function q(a){return function(b,d){var e=b.next();if(e===a){d.f=d.inline=n,c.highlightFormatting&&(d.formatting="link-string");var f=l(d);return d.linkHref=!1,f}return b.match(I[a]),d.linkHref=!0,l(d)}}function r(a,b){return a.match(/^([^\]\\]|\\.)*\]:/,!1)?(b.f=s,a.next(),c.highlightFormatting&&(b.formatting="link"),b.linkText=!0,l(b)):e(a,b,n)}function s(a,b){if(a.match(/^\]:/,!0)){b.f=b.inline=t,c.highlightFormatting&&(b.formatting="link");var d=l(b);return b.linkText=!1,d}return a.match(/^([^\]\\]|\\.)+/,!0),w.linkText}function t(a,b){return a.eatSpace()?null:(a.match(/^[^\s]+/,!0),void 0===a.peek()?b.linkTitle=!0:a.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/,!0),b.f=b.inline=n,w.linkHref+" url")}var u=a.getMode(b,"text/html"),v="null"==u.name;void 0===c.highlightFormatting&&(c.highlightFormatting=!1),void 0===c.maxBlockquoteDepth&&(c.maxBlockquoteDepth=0),void 0===c.taskLists&&(c.taskLists=!1),void 0===c.strikethrough&&(c.strikethrough=!1),void 0===c.emoji&&(c.emoji=!1),void 0===c.fencedCodeBlockHighlighting&&(c.fencedCodeBlockHighlighting=!0),void 0===c.xml&&(c.xml=!0),void 0===c.tokenTypeOverrides&&(c.tokenTypeOverrides={});var w={header:"header",code:"comment",quote:"quote",list1:"variable-2",list2:"variable-3",list3:"keyword",hr:"hr",image:"image",imageAltText:"image-alt-text",imageMarker:"image-marker",formatting:"formatting",linkInline:"link",linkEmail:"link",linkText:"link",linkHref:"string",em:"em",strong:"strong",strikethrough:"strikethrough",emoji:"builtin"};for(var x in w)w.hasOwnProperty(x)&&c.tokenTypeOverrides[x]&&(w[x]=c.tokenTypeOverrides[x]);var y=/^([*\-_])(?:\s*\1){2,}\s*$/,z=/^(?:[*\-+]|^[0-9]+([.)]))\s+/,A=/^\[(x| )\](?=\s)/i,B=c.allowAtxHeaderWithoutSpace?/^(#+)/:/^(#+)(?: |$)/,C=/^ *(?:\={1,}|-{1,})\s*$/,D=/^[^#!\[\]*_\\<>` "'(~:]+/,E=/^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/,F=/^\s*\[[^\]]+?\]:.*$/,G=/[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/,H="    ",I={")":/^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,"]":/^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/},J={startState:function(){return{f:i,prevLine:{stream:null},thisLine:{stream:null},block:i,htmlState:null,indentation:0,inline:n,text:m,formatting:!1,linkText:!1,linkHref:!1,linkTitle:!1,code:0,em:!1,strong:!1,header:0,setext:0,hr:!1,taskList:!1,list:!1,listStack:[],quote:0,trailingSpace:0,trailingSpaceNewLine:!1,strikethrough:!1,emoji:!1,fencedEndRE:null}},copyState:function(b){return{f:b.f,prevLine:b.prevLine,thisLine:b.thisLine,block:b.block,htmlState:b.htmlState&&a.copyState(u,b.htmlState),indentation:b.indentation,localMode:b.localMode,localState:b.localMode?a.copyState(b.localMode,b.localState):null,inline:b.inline,text:b.text,formatting:!1,linkText:b.linkText,linkTitle:b.linkTitle,linkHref:b.linkHref,code:b.code,em:b.em,strong:b.strong,strikethrough:b.strikethrough,emoji:b.emoji,header:b.header,setext:b.setext,hr:b.hr,taskList:b.taskList,list:b.list,listStack:b.listStack.slice(0),quote:b.quote,indentedCode:b.indentedCode,trailingSpace:b.trailingSpace,trailingSpaceNewLine:b.trailingSpaceNewLine,md_inside:b.md_inside,fencedEndRE:b.fencedEndRE}},token:function(a,b){if(b.formatting=!1,a!=b.thisLine.stream){if(b.header=0,b.hr=!1,a.match(/^\s*$/,!0))return h(b),null;if(b.prevLine=b.thisLine,b.thisLine={stream:a},b.taskList=!1,b.trailingSpace=0,b.trailingSpaceNewLine=!1,!b.localState&&(b.f=b.block,b.f!=j)){var c=a.match(/^\s*/,!0)[0].replace(/\t/g,H).length;if(b.indentation=c,b.indentationDiff=null,c>0)return null}}return b.f(a,b)},innerMode:function(a){return a.block==j?{state:a.htmlState,mode:u}:a.localState?{state:a.localState,mode:a.localMode}:{state:a,mode:J}},indent:function(b,c,d){return b.block==j&&u.indent?u.indent(b.htmlState,c,d):b.localState&&b.localMode.indent?b.localMode.indent(b.localState,c,d):a.Pass},blankLine:h,getType:l,closeBrackets:"()[]{}''\"\"``",fold:"markdown"};return J}),"xml"),a.defineMIME("text/markdown","markdown"),a.defineMIME("text/x-markdown","markdown")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/mathematica/mathematica.js b/core/media/editors/codemirror/mode/mathematica/mathematica.js
new file mode 100644
index 00000000..07e808b1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mathematica/mathematica.js
@@ -0,0 +1,176 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Mathematica mode copyright (c) 2015 by Calin Barbat
+// Based on code by Patrick Scheibe (halirutan)
+// See: https://github.com/halirutan/Mathematica-Source-Highlighting/tree/master/src/lang-mma.js
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('mathematica', function(_config, _parserConfig) {
+
+  // used pattern building blocks
+  var Identifier = '[a-zA-Z\\$][a-zA-Z0-9\\$]*';
+  var pBase      = "(?:\\d+)";
+  var pFloat     = "(?:\\.\\d+|\\d+\\.\\d*|\\d+)";
+  var pFloatBase = "(?:\\.\\w+|\\w+\\.\\w*|\\w+)";
+  var pPrecision = "(?:`(?:`?"+pFloat+")?)";
+
+  // regular expressions
+  var reBaseForm        = new RegExp('(?:'+pBase+'(?:\\^\\^'+pFloatBase+pPrecision+'?(?:\\*\\^[+-]?\\d+)?))');
+  var reFloatForm       = new RegExp('(?:' + pFloat + pPrecision + '?(?:\\*\\^[+-]?\\d+)?)');
+  var reIdInContext     = new RegExp('(?:`?)(?:' + Identifier + ')(?:`(?:' + Identifier + '))*(?:`?)');
+
+  function tokenBase(stream, state) {
+    var ch;
+
+    // get next character
+    ch = stream.next();
+
+    // string
+    if (ch === '"') {
+      state.tokenize = tokenString;
+      return state.tokenize(stream, state);
+    }
+
+    // comment
+    if (ch === '(') {
+      if (stream.eat('*')) {
+        state.commentLevel++;
+        state.tokenize = tokenComment;
+        return state.tokenize(stream, state);
+      }
+    }
+
+    // go back one character
+    stream.backUp(1);
+
+    // look for numbers
+    // Numbers in a baseform
+    if (stream.match(reBaseForm, true, false)) {
+      return 'number';
+    }
+
+    // Mathematica numbers. Floats (1.2, .2, 1.) can have optionally a precision (`float) or an accuracy definition
+    // (``float). Note: while 1.2` is possible 1.2`` is not. At the end an exponent (float*^+12) can follow.
+    if (stream.match(reFloatForm, true, false)) {
+      return 'number';
+    }
+
+    /* In[23] and Out[34] */
+    if (stream.match(/(?:In|Out)\[[0-9]*\]/, true, false)) {
+      return 'atom';
+    }
+
+    // usage
+    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::usage)/, true, false)) {
+      return 'meta';
+    }
+
+    // message
+    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
+      return 'string-2';
+    }
+
+    // this makes a look-ahead match for something like variable:{_Integer}
+    // the match is then forwarded to the mma-patterns tokenizer.
+    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*\s*:)(?:(?:[a-zA-Z\$][a-zA-Z0-9\$]*)|(?:[^:=>~@\^\&\*\)\[\]'\?,\|])).*/, true, false)) {
+      return 'variable-2';
+    }
+
+    // catch variables which are used together with Blank (_), BlankSequence (__) or BlankNullSequence (___)
+    // Cannot start with a number, but can have numbers at any other position. Examples
+    // blub__Integer, a1_, b34_Integer32
+    if (stream.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+[a-zA-Z\$][a-zA-Z0-9\$]*/, true, false)) {
+      return 'variable-2';
+    }
+    if (stream.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+/, true, false)) {
+      return 'variable-2';
+    }
+    if (stream.match(/_+[a-zA-Z\$][a-zA-Z0-9\$]*/, true, false)) {
+      return 'variable-2';
+    }
+
+    // Named characters in Mathematica, like \[Gamma].
+    if (stream.match(/\\\[[a-zA-Z\$][a-zA-Z0-9\$]*\]/, true, false)) {
+      return 'variable-3';
+    }
+
+    // Match all braces separately
+    if (stream.match(/(?:\[|\]|{|}|\(|\))/, true, false)) {
+      return 'bracket';
+    }
+
+    // Catch Slots (#, ##, #3, ##9 and the V10 named slots #name). I have never seen someone using more than one digit after #, so we match
+    // only one.
+    if (stream.match(/(?:#[a-zA-Z\$][a-zA-Z0-9\$]*|#+[0-9]?)/, true, false)) {
+      return 'variable-2';
+    }
+
+    // Literals like variables, keywords, functions
+    if (stream.match(reIdInContext, true, false)) {
+      return 'keyword';
+    }
+
+    // operators. Note that operators like @@ or /; are matched separately for each symbol.
+    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
+      return 'operator';
+    }
+
+    // everything else is an error
+    stream.next(); // advance the stream.
+    return 'error';
+  }
+
+  function tokenString(stream, state) {
+    var next, end = false, escaped = false;
+    while ((next = stream.next()) != null) {
+      if (next === '"' && !escaped) {
+        end = true;
+        break;
+      }
+      escaped = !escaped && next === '\\';
+    }
+    if (end && !escaped) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  };
+
+  function tokenComment(stream, state) {
+    var prev, next;
+    while(state.commentLevel > 0 && (next = stream.next()) != null) {
+      if (prev === '(' && next === '*') state.commentLevel++;
+      if (prev === '*' && next === ')') state.commentLevel--;
+      prev = next;
+    }
+    if (state.commentLevel <= 0) {
+      state.tokenize = tokenBase;
+    }
+    return 'comment';
+  }
+
+  return {
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    },
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)"
+  };
+});
+
+CodeMirror.defineMIME('text/x-mathematica', {
+  name: 'mathematica'
+});
+
+});
diff --git a/core/media/editors/codemirror/mode/mathematica/mathematica.min.js b/core/media/editors/codemirror/mode/mathematica/mathematica.min.js
new file mode 100644
index 00000000..50ca448e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mathematica/mathematica.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("mathematica",(function(a,b){function c(a,b){var c;return c=a.next(),'"'===c?(b.tokenize=d,b.tokenize(a,b)):"("===c&&a.eat("*")?(b.commentLevel++,b.tokenize=e,b.tokenize(a,b)):(a.backUp(1),a.match(k,!0,!1)?"number":a.match(l,!0,!1)?"number":a.match(/(?:In|Out)\[[0-9]*\]/,!0,!1)?"atom":a.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::usage)/,!0,!1)?"meta":a.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/,!0,!1)?"string-2":a.match(/([a-zA-Z\$][a-zA-Z0-9\$]*\s*:)(?:(?:[a-zA-Z\$][a-zA-Z0-9\$]*)|(?:[^:=>~@\^\&\*\)\[\]'\?,\|])).*/,!0,!1)?"variable-2":a.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+[a-zA-Z\$][a-zA-Z0-9\$]*/,!0,!1)?"variable-2":a.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+/,!0,!1)?"variable-2":a.match(/_+[a-zA-Z\$][a-zA-Z0-9\$]*/,!0,!1)?"variable-2":a.match(/\\\[[a-zA-Z\$][a-zA-Z0-9\$]*\]/,!0,!1)?"variable-3":a.match(/(?:\[|\]|{|}|\(|\))/,!0,!1)?"bracket":a.match(/(?:#[a-zA-Z\$][a-zA-Z0-9\$]*|#+[0-9]?)/,!0,!1)?"variable-2":a.match(m,!0,!1)?"keyword":a.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/,!0,!1)?"operator":(a.next(),"error"))}function d(a,b){for(var d,e=!1,f=!1;null!=(d=a.next());){if('"'===d&&!f){e=!0;break}f=!f&&"\\"===d}return e&&!f&&(b.tokenize=c),"string"}function e(a,b){for(var d,e;b.commentLevel>0&&null!=(e=a.next());)"("===d&&"*"===e&&b.commentLevel++,"*"===d&&")"===e&&b.commentLevel--,d=e;return b.commentLevel<=0&&(b.tokenize=c),"comment"}var f="[a-zA-Z\\$][a-zA-Z0-9\\$]*",g="(?:\\d+)",h="(?:\\.\\d+|\\d+\\.\\d*|\\d+)",i="(?:\\.\\w+|\\w+\\.\\w*|\\w+)",j="(?:`(?:`?"+h+")?)",k=new RegExp("(?:"+g+"(?:\\^\\^"+i+j+"?(?:\\*\\^[+-]?\\d+)?))"),l=new RegExp("(?:"+h+j+"?(?:\\*\\^[+-]?\\d+)?)"),m=new RegExp("(?:`?)(?:"+f+")(?:`(?:"+f+"))*(?:`?)");return{startState:function(){return{tokenize:c,commentLevel:0}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)},blockCommentStart:"(*",blockCommentEnd:"*)"}})),a.defineMIME("text/x-mathematica",{name:"mathematica"})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/mbox/mbox.js b/core/media/editors/codemirror/mode/mbox/mbox.js
new file mode 100644
index 00000000..ba2416ac
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mbox/mbox.js
@@ -0,0 +1,129 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+var rfc2822 = [
+  "From", "Sender", "Reply-To", "To", "Cc", "Bcc", "Message-ID",
+  "In-Reply-To", "References", "Resent-From", "Resent-Sender", "Resent-To",
+  "Resent-Cc", "Resent-Bcc", "Resent-Message-ID", "Return-Path", "Received"
+];
+var rfc2822NoEmail = [
+  "Date", "Subject", "Comments", "Keywords", "Resent-Date"
+];
+
+CodeMirror.registerHelper("hintWords", "mbox", rfc2822.concat(rfc2822NoEmail));
+
+var whitespace = /^[ \t]/;
+var separator = /^From /; // See RFC 4155
+var rfc2822Header = new RegExp("^(" + rfc2822.join("|") + "): ");
+var rfc2822HeaderNoEmail = new RegExp("^(" + rfc2822NoEmail.join("|") + "): ");
+var header = /^[^:]+:/; // Optional fields defined in RFC 2822
+var email = /^[^ ]+@[^ ]+/;
+var untilEmail = /^.*?(?=[^ ]+?@[^ ]+)/;
+var bracketedEmail = /^<.*?>/;
+var untilBracketedEmail = /^.*?(?=<.*>)/;
+
+function styleForHeader(header) {
+  if (header === "Subject") return "header";
+  return "string";
+}
+
+function readToken(stream, state) {
+  if (stream.sol()) {
+    // From last line
+    state.inSeparator = false;
+    if (state.inHeader && stream.match(whitespace)) {
+      // Header folding
+      return null;
+    } else {
+      state.inHeader = false;
+      state.header = null;
+    }
+
+    if (stream.match(separator)) {
+      state.inHeaders = true;
+      state.inSeparator = true;
+      return "atom";
+    }
+
+    var match;
+    var emailPermitted = false;
+    if ((match = stream.match(rfc2822HeaderNoEmail)) ||
+        (emailPermitted = true) && (match = stream.match(rfc2822Header))) {
+      state.inHeaders = true;
+      state.inHeader = true;
+      state.emailPermitted = emailPermitted;
+      state.header = match[1];
+      return "atom";
+    }
+
+    // Use vim's heuristics: recognize custom headers only if the line is in a
+    // block of legitimate headers.
+    if (state.inHeaders && (match = stream.match(header))) {
+      state.inHeader = true;
+      state.emailPermitted = true;
+      state.header = match[1];
+      return "atom";
+    }
+
+    state.inHeaders = false;
+    stream.skipToEnd();
+    return null;
+  }
+
+  if (state.inSeparator) {
+    if (stream.match(email)) return "link";
+    if (stream.match(untilEmail)) return "atom";
+    stream.skipToEnd();
+    return "atom";
+  }
+
+  if (state.inHeader) {
+    var style = styleForHeader(state.header);
+
+    if (state.emailPermitted) {
+      if (stream.match(bracketedEmail)) return style + " link";
+      if (stream.match(untilBracketedEmail)) return style;
+    }
+    stream.skipToEnd();
+    return style;
+  }
+
+  stream.skipToEnd();
+  return null;
+};
+
+CodeMirror.defineMode("mbox", function() {
+  return {
+    startState: function() {
+      return {
+        // Is in a mbox separator
+        inSeparator: false,
+        // Is in a mail header
+        inHeader: false,
+        // If bracketed email is permitted. Only applicable when inHeader
+        emailPermitted: false,
+        // Name of current header
+        header: null,
+        // Is in a region of mail headers
+        inHeaders: false
+      };
+    },
+    token: readToken,
+    blankLine: function(state) {
+      state.inHeaders = state.inSeparator = state.inHeader = false;
+    }
+  };
+});
+
+CodeMirror.defineMIME("application/mbox", "mbox");
+});
diff --git a/core/media/editors/codemirror/mode/mbox/mbox.min.js b/core/media/editors/codemirror/mode/mbox/mbox.min.js
new file mode 100644
index 00000000..7b2af884
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mbox/mbox.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return"Subject"===a?"header":"string"}function c(a,c){if(a.sol()){if(c.inSeparator=!1,c.inHeader&&a.match(f))return null;if(c.inHeader=!1,c.header=null,a.match(g))return c.inHeaders=!0,c.inSeparator=!0,"atom";var d,e=!1;return(d=a.match(i))||(e=!0)&&(d=a.match(h))?(c.inHeaders=!0,c.inHeader=!0,c.emailPermitted=e,c.header=d[1],"atom"):c.inHeaders&&(d=a.match(j))?(c.inHeader=!0,c.emailPermitted=!0,c.header=d[1],"atom"):(c.inHeaders=!1,a.skipToEnd(),null)}if(c.inSeparator)return a.match(k)?"link":a.match(l)?"atom":(a.skipToEnd(),"atom");if(c.inHeader){var o=b(c.header);if(c.emailPermitted){if(a.match(m))return o+" link";if(a.match(n))return o}return a.skipToEnd(),o}return a.skipToEnd(),null}var d=["From","Sender","Reply-To","To","Cc","Bcc","Message-ID","In-Reply-To","References","Resent-From","Resent-Sender","Resent-To","Resent-Cc","Resent-Bcc","Resent-Message-ID","Return-Path","Received"],e=["Date","Subject","Comments","Keywords","Resent-Date"];a.registerHelper("hintWords","mbox",d.concat(e));var f=/^[ \t]/,g=/^From /,h=new RegExp("^("+d.join("|")+"): "),i=new RegExp("^("+e.join("|")+"): "),j=/^[^:]+:/,k=/^[^ ]+@[^ ]+/,l=/^.*?(?=[^ ]+?@[^ ]+)/,m=/^<.*?>/,n=/^.*?(?=<.*>)/;a.defineMode("mbox",(function(){return{startState:function(){return{inSeparator:!1,inHeader:!1,emailPermitted:!1,header:null,inHeaders:!1}},token:c,blankLine:function(a){a.inHeaders=a.inSeparator=a.inHeader=!1}}})),a.defineMIME("application/mbox","mbox")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/meta.js b/core/media/editors/codemirror/mode/meta.js
new file mode 100644
index 00000000..615b6a58
--- /dev/null
+++ b/core/media/editors/codemirror/mode/meta.js
@@ -0,0 +1,217 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.modeInfo = [
+    {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+    {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
+    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
+    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
+    {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
+    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
+    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
+    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
+    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
+    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
+    {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
+    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
+    {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
+    {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
+    {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
+    {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
+    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
+    {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "Django", mime: "text/x-django", mode: "django"},
+    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/},
+    {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
+    {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
+    {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
+    {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
+    {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
+    {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
+    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
+    {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Esper", mime: "text/x-esper", mode: "sql"},
+    {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
+    {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
+    {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
+    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
+    {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
+    {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
+    {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
+    {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
+    {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
+    {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
+    {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
+    {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
+    {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
+    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
+    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
+     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
+    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
+    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
+    {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
+    {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
+    {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
+    {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+    {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
+    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
+    {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
+    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
+    {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
+    {name: "mbox", mime: "application/mbox", mode: "mbox", ext: ["mbox"]},
+    {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
+    {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
+    {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
+    {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+     mode: "ntriples", ext: ["nt", "nq"]},
+    {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+    {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
+    {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
+    {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
+    {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
+    {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
+    {name: "PHP", mimes: ["text/x-php", "application/x-httpd-php", "application/x-httpd-php-open"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
+    {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
+    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
+    {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+    {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
+    {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
+    {name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
+    {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
+    {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r", "R"], alias: ["rscript"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
+    {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
+    {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
+    {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+    {name: "SAS", mime: "text/x-sas", mode: "sas", ext: ["sas"]},
+    {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
+    {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
+    {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
+    {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
+    {name: "Shell", mimes: ["text/x-sh", "application/x-sh"], mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+    {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
+    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
+    {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
+    {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
+    {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "SML", mime: "text/x-sml", mode: "mllike", ext: ["sml", "sig", "fun", "smackspec"]},
+    {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
+    {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
+    {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
+    {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "SQLite", mime: "text/x-sqlite", mode: "sql"},
+    {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
+    {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
+    {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
+    {name: "sTeX", mime: "text/x-stex", mode: "stex"},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx", "tex"], alias: ["tex"]},
+    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
+    {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
+    {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
+    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+    {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
+    {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
+    {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
+    {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+    {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
+    {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
+    {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+    {name: "TypeScript-JSX", mime: "text/typescript-jsx", mode: "jsx", ext: ["tsx"], alias: ["tsx"]},
+    {name: "Twig", mime: "text/x-twig", mode: "twig"},
+    {name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
+    {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
+    {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
+    {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
+    {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
+    {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd", "svg"], alias: ["rss", "wsdl", "xsd"]},
+    {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+    {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
+    {name: "YAML", mimes: ["text/x-yaml", "text/yaml"], mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
+    {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
+    {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
+    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
+  ];
+  // Ensure all modes have a mime property for backwards compatibility
+  for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+    var info = CodeMirror.modeInfo[i];
+    if (info.mimes) info.mime = info.mimes[0];
+  }
+
+  CodeMirror.findModeByMIME = function(mime) {
+    mime = mime.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.mime == mime) return info;
+      if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
+        if (info.mimes[j] == mime) return info;
+    }
+    if (/\+xml$/.test(mime)) return CodeMirror.findModeByMIME("application/xml")
+    if (/\+json$/.test(mime)) return CodeMirror.findModeByMIME("application/json")
+  };
+
+  CodeMirror.findModeByExtension = function(ext) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.ext) for (var j = 0; j < info.ext.length; j++)
+        if (info.ext[j] == ext) return info;
+    }
+  };
+
+  CodeMirror.findModeByFileName = function(filename) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.file && info.file.test(filename)) return info;
+    }
+    var dot = filename.lastIndexOf(".");
+    var ext = dot > -1 && filename.substring(dot + 1, filename.length);
+    if (ext) return CodeMirror.findModeByExtension(ext);
+  };
+
+  CodeMirror.findModeByName = function(name) {
+    name = name.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.name.toLowerCase() == name) return info;
+      if (info.alias) for (var j = 0; j < info.alias.length; j++)
+        if (info.alias[j].toLowerCase() == name) return info;
+    }
+  };
+});
diff --git a/core/media/editors/codemirror/mode/meta.min.js b/core/media/editors/codemirror/mode/meta.min.js
new file mode 100644
index 00000000..1509e8ab
--- /dev/null
+++ b/core/media/editors/codemirror/mode/meta.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../lib/codemirror")):"function"==typeof define&&define.amd?define(["../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.modeInfo=[{name:"APL",mime:"text/apl",mode:"apl",ext:["dyalog","apl"]},{name:"PGP",mimes:["application/pgp","application/pgp-encrypted","application/pgp-keys","application/pgp-signature"],mode:"asciiarmor",ext:["asc","pgp","sig"]},{name:"ASN.1",mime:"text/x-ttcn-asn",mode:"asn.1",ext:["asn","asn1"]},{name:"Asterisk",mime:"text/x-asterisk",mode:"asterisk",file:/^extensions\.conf$/i},{name:"Brainfuck",mime:"text/x-brainfuck",mode:"brainfuck",ext:["b","bf"]},{name:"C",mime:"text/x-csrc",mode:"clike",ext:["c","h","ino"]},{name:"C++",mime:"text/x-c++src",mode:"clike",ext:["cpp","c++","cc","cxx","hpp","h++","hh","hxx"],alias:["cpp"]},{name:"Cobol",mime:"text/x-cobol",mode:"cobol",ext:["cob","cpy"]},{name:"C#",mime:"text/x-csharp",mode:"clike",ext:["cs"],alias:["csharp"]},{name:"Clojure",mime:"text/x-clojure",mode:"clojure",ext:["clj","cljc","cljx"]},{name:"ClojureScript",mime:"text/x-clojurescript",mode:"clojure",ext:["cljs"]},{name:"Closure Stylesheets (GSS)",mime:"text/x-gss",mode:"css",ext:["gss"]},{name:"CMake",mime:"text/x-cmake",mode:"cmake",ext:["cmake","cmake.in"],file:/^CMakeLists.txt$/},{name:"CoffeeScript",mimes:["application/vnd.coffeescript","text/coffeescript","text/x-coffeescript"],mode:"coffeescript",ext:["coffee"],alias:["coffee","coffee-script"]},{name:"Common Lisp",mime:"text/x-common-lisp",mode:"commonlisp",ext:["cl","lisp","el"],alias:["lisp"]},{name:"Cypher",mime:"application/x-cypher-query",mode:"cypher",ext:["cyp","cypher"]},{name:"Cython",mime:"text/x-cython",mode:"python",ext:["pyx","pxd","pxi"]},{name:"Crystal",mime:"text/x-crystal",mode:"crystal",ext:["cr"]},{name:"CSS",mime:"text/css",mode:"css",ext:["css"]},{name:"CQL",mime:"text/x-cassandra",mode:"sql",ext:["cql"]},{name:"D",mime:"text/x-d",mode:"d",ext:["d"]},{name:"Dart",mimes:["application/dart","text/x-dart"],mode:"dart",ext:["dart"]},{name:"diff",mime:"text/x-diff",mode:"diff",ext:["diff","patch"]},{name:"Django",mime:"text/x-django",mode:"django"},{name:"Dockerfile",mime:"text/x-dockerfile",mode:"dockerfile",file:/^Dockerfile$/},{name:"DTD",mime:"application/xml-dtd",mode:"dtd",ext:["dtd"]},{name:"Dylan",mime:"text/x-dylan",mode:"dylan",ext:["dylan","dyl","intr"]},{name:"EBNF",mime:"text/x-ebnf",mode:"ebnf"},{name:"ECL",mime:"text/x-ecl",mode:"ecl",ext:["ecl"]},{name:"edn",mime:"application/edn",mode:"clojure",ext:["edn"]},{name:"Eiffel",mime:"text/x-eiffel",mode:"eiffel",ext:["e"]},{name:"Elm",mime:"text/x-elm",mode:"elm",ext:["elm"]},{name:"Embedded Javascript",mime:"application/x-ejs",mode:"htmlembedded",ext:["ejs"]},{name:"Embedded Ruby",mime:"application/x-erb",mode:"htmlembedded",ext:["erb"]},{name:"Erlang",mime:"text/x-erlang",mode:"erlang",ext:["erl"]},{name:"Esper",mime:"text/x-esper",mode:"sql"},{name:"Factor",mime:"text/x-factor",mode:"factor",ext:["factor"]},{name:"FCL",mime:"text/x-fcl",mode:"fcl"},{name:"Forth",mime:"text/x-forth",mode:"forth",ext:["forth","fth","4th"]},{name:"Fortran",mime:"text/x-fortran",mode:"fortran",ext:["f","for","f77","f90"]},{name:"F#",mime:"text/x-fsharp",mode:"mllike",ext:["fs"],alias:["fsharp"]},{name:"Gas",mime:"text/x-gas",mode:"gas",ext:["s"]},{name:"Gherkin",mime:"text/x-feature",mode:"gherkin",ext:["feature"]},{name:"GitHub Flavored Markdown",mime:"text/x-gfm",mode:"gfm",file:/^(readme|contributing|history).md$/i},{name:"Go",mime:"text/x-go",mode:"go",ext:["go"]},{name:"Groovy",mime:"text/x-groovy",mode:"groovy",ext:["groovy","gradle"],file:/^Jenkinsfile$/},{name:"HAML",mime:"text/x-haml",mode:"haml",ext:["haml"]},{name:"Haskell",mime:"text/x-haskell",mode:"haskell",ext:["hs"]},{name:"Haskell (Literate)",mime:"text/x-literate-haskell",mode:"haskell-literate",ext:["lhs"]},{name:"Haxe",mime:"text/x-haxe",mode:"haxe",ext:["hx"]},{name:"HXML",mime:"text/x-hxml",mode:"haxe",ext:["hxml"]},{name:"ASP.NET",mime:"application/x-aspx",mode:"htmlembedded",ext:["aspx"],alias:["asp","aspx"]},{name:"HTML",mime:"text/html",mode:"htmlmixed",ext:["html","htm","handlebars","hbs"],alias:["xhtml"]},{name:"HTTP",mime:"message/http",mode:"http"},{name:"IDL",mime:"text/x-idl",mode:"idl",ext:["pro"]},{name:"Pug",mime:"text/x-pug",mode:"pug",ext:["jade","pug"],alias:["jade"]},{name:"Java",mime:"text/x-java",mode:"clike",ext:["java"]},{name:"Java Server Pages",mime:"application/x-jsp",mode:"htmlembedded",ext:["jsp"],alias:["jsp"]},{name:"JavaScript",mimes:["text/javascript","text/ecmascript","application/javascript","application/x-javascript","application/ecmascript"],mode:"javascript",ext:["js"],alias:["ecmascript","js","node"]},{name:"JSON",mimes:["application/json","application/x-json"],mode:"javascript",ext:["json","map"],alias:["json5"]},{name:"JSON-LD",mime:"application/ld+json",mode:"javascript",ext:["jsonld"],alias:["jsonld"]},{name:"JSX",mime:"text/jsx",mode:"jsx",ext:["jsx"]},{name:"Jinja2",mime:"null",mode:"jinja2"},{name:"Julia",mime:"text/x-julia",mode:"julia",ext:["jl"]},{name:"Kotlin",mime:"text/x-kotlin",mode:"clike",ext:["kt"]},{name:"LESS",mime:"text/x-less",mode:"css",ext:["less"]},{name:"LiveScript",mime:"text/x-livescript",mode:"livescript",ext:["ls"],alias:["ls"]},{name:"Lua",mime:"text/x-lua",mode:"lua",ext:["lua"]},{name:"Markdown",mime:"text/x-markdown",mode:"markdown",ext:["markdown","md","mkd"]},{name:"mIRC",mime:"text/mirc",mode:"mirc"},{name:"MariaDB SQL",mime:"text/x-mariadb",mode:"sql"},{name:"Mathematica",mime:"text/x-mathematica",mode:"mathematica",ext:["m","nb"]},{name:"Modelica",mime:"text/x-modelica",mode:"modelica",ext:["mo"]},{name:"MUMPS",mime:"text/x-mumps",mode:"mumps",ext:["mps"]},{name:"MS SQL",mime:"text/x-mssql",mode:"sql"},{name:"mbox",mime:"application/mbox",mode:"mbox",ext:["mbox"]},{name:"MySQL",mime:"text/x-mysql",mode:"sql"},{name:"Nginx",mime:"text/x-nginx-conf",mode:"nginx",file:/nginx.*\.conf$/i},{name:"NSIS",mime:"text/x-nsis",mode:"nsis",ext:["nsh","nsi"]},{name:"NTriples",mimes:["application/n-triples","application/n-quads","text/n-triples"],mode:"ntriples",ext:["nt","nq"]},{name:"Objective-C",mime:"text/x-objectivec",mode:"clike",ext:["m","mm"],alias:["objective-c","objc"]},{name:"OCaml",mime:"text/x-ocaml",mode:"mllike",ext:["ml","mli","mll","mly"]},{name:"Octave",mime:"text/x-octave",mode:"octave",ext:["m"]},{name:"Oz",mime:"text/x-oz",mode:"oz",ext:["oz"]},{name:"Pascal",mime:"text/x-pascal",mode:"pascal",ext:["p","pas"]},{name:"PEG.js",mime:"null",mode:"pegjs",ext:["jsonld"]},{name:"Perl",mime:"text/x-perl",mode:"perl",ext:["pl","pm"]},{name:"PHP",mimes:["text/x-php","application/x-httpd-php","application/x-httpd-php-open"],mode:"php",ext:["php","php3","php4","php5","php7","phtml"]},{name:"Pig",mime:"text/x-pig",mode:"pig",ext:["pig"]},{name:"Plain Text",mime:"text/plain",mode:"null",ext:["txt","text","conf","def","list","log"]},{name:"PLSQL",mime:"text/x-plsql",mode:"sql",ext:["pls"]},{name:"PowerShell",mime:"application/x-powershell",mode:"powershell",ext:["ps1","psd1","psm1"]},{name:"Properties files",mime:"text/x-properties",mode:"properties",ext:["properties","ini","in"],alias:["ini","properties"]},{name:"ProtoBuf",mime:"text/x-protobuf",mode:"protobuf",ext:["proto"]},{name:"Python",mime:"text/x-python",mode:"python",ext:["BUILD","bzl","py","pyw"],file:/^(BUCK|BUILD)$/},{name:"Puppet",mime:"text/x-puppet",mode:"puppet",ext:["pp"]},{name:"Q",mime:"text/x-q",mode:"q",ext:["q"]},{name:"R",mime:"text/x-rsrc",mode:"r",ext:["r","R"],alias:["rscript"]},{name:"reStructuredText",mime:"text/x-rst",mode:"rst",ext:["rst"],alias:["rst"]},{name:"RPM Changes",mime:"text/x-rpm-changes",mode:"rpm"},{name:"RPM Spec",mime:"text/x-rpm-spec",mode:"rpm",ext:["spec"]},{name:"Ruby",mime:"text/x-ruby",mode:"ruby",ext:["rb"],alias:["jruby","macruby","rake","rb","rbx"]},{name:"Rust",mime:"text/x-rustsrc",mode:"rust",ext:["rs"]},{name:"SAS",mime:"text/x-sas",mode:"sas",ext:["sas"]},{name:"Sass",mime:"text/x-sass",mode:"sass",ext:["sass"]},{name:"Scala",mime:"text/x-scala",mode:"clike",ext:["scala"]},{name:"Scheme",mime:"text/x-scheme",mode:"scheme",ext:["scm","ss"]},{name:"SCSS",mime:"text/x-scss",mode:"css",ext:["scss"]},{name:"Shell",mimes:["text/x-sh","application/x-sh"],mode:"shell",ext:["sh","ksh","bash"],alias:["bash","sh","zsh"],file:/^PKGBUILD$/},{name:"Sieve",mime:"application/sieve",mode:"sieve",ext:["siv","sieve"]},{name:"Slim",mimes:["text/x-slim","application/x-slim"],mode:"slim",ext:["slim"]},{name:"Smalltalk",mime:"text/x-stsrc",mode:"smalltalk",ext:["st"]},{name:"Smarty",mime:"text/x-smarty",mode:"smarty",ext:["tpl"]},{name:"Solr",mime:"text/x-solr",mode:"solr"},{name:"SML",mime:"text/x-sml",mode:"mllike",ext:["sml","sig","fun","smackspec"]},{name:"Soy",mime:"text/x-soy",mode:"soy",ext:["soy"],alias:["closure template"]},{name:"SPARQL",mime:"application/sparql-query",mode:"sparql",ext:["rq","sparql"],alias:["sparul"]},{name:"Spreadsheet",mime:"text/x-spreadsheet",mode:"spreadsheet",alias:["excel","formula"]},{name:"SQL",mime:"text/x-sql",mode:"sql",ext:["sql"]},{name:"SQLite",mime:"text/x-sqlite",mode:"sql"},{name:"Squirrel",mime:"text/x-squirrel",mode:"clike",ext:["nut"]},{name:"Stylus",mime:"text/x-styl",mode:"stylus",ext:["styl"]},{name:"Swift",mime:"text/x-swift",mode:"swift",ext:["swift"]},{name:"sTeX",mime:"text/x-stex",mode:"stex"},{name:"LaTeX",mime:"text/x-latex",mode:"stex",ext:["text","ltx","tex"],alias:["tex"]},{name:"SystemVerilog",mime:"text/x-systemverilog",mode:"verilog",ext:["v","sv","svh"]},{name:"Tcl",mime:"text/x-tcl",mode:"tcl",ext:["tcl"]},{name:"Textile",mime:"text/x-textile",mode:"textile",ext:["textile"]},{name:"TiddlyWiki ",mime:"text/x-tiddlywiki",mode:"tiddlywiki"},{name:"Tiki wiki",mime:"text/tiki",mode:"tiki"},{name:"TOML",mime:"text/x-toml",mode:"toml",ext:["toml"]},{name:"Tornado",mime:"text/x-tornado",mode:"tornado"},{name:"troff",mime:"text/troff",mode:"troff",ext:["1","2","3","4","5","6","7","8","9"]},{name:"TTCN",mime:"text/x-ttcn",mode:"ttcn",ext:["ttcn","ttcn3","ttcnpp"]},{name:"TTCN_CFG",mime:"text/x-ttcn-cfg",mode:"ttcn-cfg",ext:["cfg"]},{name:"Turtle",mime:"text/turtle",mode:"turtle",ext:["ttl"]},{name:"TypeScript",mime:"application/typescript",mode:"javascript",ext:["ts"],alias:["ts"]},{name:"TypeScript-JSX",mime:"text/typescript-jsx",mode:"jsx",ext:["tsx"],alias:["tsx"]},{name:"Twig",mime:"text/x-twig",mode:"twig"},{name:"Web IDL",mime:"text/x-webidl",mode:"webidl",ext:["webidl"]},{name:"VB.NET",mime:"text/x-vb",mode:"vb",ext:["vb"]},{name:"VBScript",mime:"text/vbscript",mode:"vbscript",ext:["vbs"]},{name:"Velocity",mime:"text/velocity",mode:"velocity",ext:["vtl"]},{name:"Verilog",mime:"text/x-verilog",mode:"verilog",ext:["v"]},{name:"VHDL",mime:"text/x-vhdl",mode:"vhdl",ext:["vhd","vhdl"]},{name:"Vue.js Component",mimes:["script/x-vue","text/x-vue"],mode:"vue",ext:["vue"]},{name:"XML",mimes:["application/xml","text/xml"],mode:"xml",ext:["xml","xsl","xsd","svg"],alias:["rss","wsdl","xsd"]},{name:"XQuery",mime:"application/xquery",mode:"xquery",ext:["xy","xquery"]},{name:"Yacas",mime:"text/x-yacas",mode:"yacas",ext:["ys"]},{name:"YAML",mimes:["text/x-yaml","text/yaml"],mode:"yaml",ext:["yaml","yml"],alias:["yml"]},{name:"Z80",mime:"text/x-z80",mode:"z80",ext:["z80"]},{name:"mscgen",mime:"text/x-mscgen",mode:"mscgen",ext:["mscgen","mscin","msc"]},{name:"xu",mime:"text/x-xu",mode:"mscgen",ext:["xu"]},{name:"msgenny",mime:"text/x-msgenny",mode:"mscgen",ext:["msgenny"]}];for(var b=0;b<a.modeInfo.length;b++){var c=a.modeInfo[b];c.mimes&&(c.mime=c.mimes[0])}a.findModeByMIME=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.mime==b)return d;if(d.mimes)for(var e=0;e<d.mimes.length;e++)if(d.mimes[e]==b)return d}return/\+xml$/.test(b)?a.findModeByMIME("application/xml"):/\+json$/.test(b)?a.findModeByMIME("application/json"):void 0},a.findModeByExtension=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.ext)for(var e=0;e<d.ext.length;e++)if(d.ext[e]==b)return d}},a.findModeByFileName=function(b){for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.file&&d.file.test(b))return d}var e=b.lastIndexOf("."),f=e>-1&&b.substring(e+1,b.length);if(f)return a.findModeByExtension(f)},a.findModeByName=function(b){b=b.toLowerCase();for(var c=0;c<a.modeInfo.length;c++){var d=a.modeInfo[c];if(d.name.toLowerCase()==b)return d;if(d.alias)for(var e=0;e<d.alias.length;e++)if(d.alias[e].toLowerCase()==b)return d}}}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/mirc/mirc.js b/core/media/editors/codemirror/mode/mirc/mirc.js
new file mode 100644
index 00000000..71ac4ddf
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mirc/mirc.js
@@ -0,0 +1,193 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+//mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMIME("text/mirc", "mirc");
+CodeMirror.defineMode("mirc", function() {
+  function parseWords(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+  var specials = parseWords("$! $$ $& $? $+ $abook $abs $active $activecid " +
+                            "$activewid $address $addtok $agent $agentname $agentstat $agentver " +
+                            "$alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime " +
+                            "$asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind " +
+                            "$binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes " +
+                            "$chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color " +
+                            "$com $comcall $comchan $comerr $compact $compress $comval $cos $count " +
+                            "$cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight " +
+                            "$dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress " +
+                            "$deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll " +
+                            "$dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error " +
+                            "$eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir " +
+                            "$finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve " +
+                            "$fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt " +
+                            "$group $halted $hash $height $hfind $hget $highlight $hnick $hotline " +
+                            "$hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil " +
+                            "$inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect " +
+                            "$insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile " +
+                            "$isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive " +
+                            "$lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock " +
+                            "$lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer " +
+                            "$maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext " +
+                            "$menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode " +
+                            "$modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile " +
+                            "$nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly " +
+                            "$opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree " +
+                            "$pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo " +
+                            "$readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex " +
+                            "$reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline " +
+                            "$sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin " +
+                            "$site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname " +
+                            "$sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped " +
+                            "$syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp " +
+                            "$timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel " +
+                            "$ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver " +
+                            "$version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor");
+  var keywords = parseWords("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice " +
+                            "away background ban bcopy beep bread break breplace bset btrunc bunset bwrite " +
+                            "channel clear clearall cline clipboard close cnick color comclose comopen " +
+                            "comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver " +
+                            "debug dec describe dialog did didtok disable disconnect dlevel dline dll " +
+                            "dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace " +
+                            "drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable " +
+                            "events exit fclose filter findtext finger firewall flash flist flood flush " +
+                            "flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove " +
+                            "gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd " +
+                            "halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear " +
+                            "ialmark identd if ignore iline inc invite iuser join kick linesep links list " +
+                            "load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice " +
+                            "notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice " +
+                            "qme qmsg query queryn quit raw reload remini remote remove rename renwin " +
+                            "reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini " +
+                            "say scid scon server set showmirc signam sline sockaccept sockclose socklist " +
+                            "socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite " +
+                            "sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize " +
+                            "toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho " +
+                            "var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum " +
+                            "isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower " +
+                            "isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs " +
+                            "elseif else goto menu nicklist status title icon size option text edit " +
+                            "button check radio box scroll list combo link tab item");
+  var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch");
+  var isOperatorChar = /[+\-*&%=<>!?^\/\|]/;
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+  function tokenBase(stream, state) {
+    var beforeParams = state.beforeParams;
+    state.beforeParams = false;
+    var ch = stream.next();
+    if (/[\[\]{}\(\),\.]/.test(ch)) {
+      if (ch == "(" && beforeParams) state.inParams = true;
+      else if (ch == ")") state.inParams = false;
+      return null;
+    }
+    else if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    else if (ch == "\\") {
+      stream.eat("\\");
+      stream.eat(/./);
+      return "number";
+    }
+    else if (ch == "/" && stream.eat("*")) {
+      return chain(stream, state, tokenComment);
+    }
+    else if (ch == ";" && stream.match(/ *\( *\(/)) {
+      return chain(stream, state, tokenUnparsed);
+    }
+    else if (ch == ";" && !state.inParams) {
+      stream.skipToEnd();
+      return "comment";
+    }
+    else if (ch == '"') {
+      stream.eat(/"/);
+      return "keyword";
+    }
+    else if (ch == "$") {
+      stream.eatWhile(/[$_a-z0-9A-Z\.:]/);
+      if (specials && specials.propertyIsEnumerable(stream.current().toLowerCase())) {
+        return "keyword";
+      }
+      else {
+        state.beforeParams = true;
+        return "builtin";
+      }
+    }
+    else if (ch == "%") {
+      stream.eatWhile(/[^,\s()]/);
+      state.beforeParams = true;
+      return "string";
+    }
+    else if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    else {
+      stream.eatWhile(/[\w\$_{}]/);
+      var word = stream.current().toLowerCase();
+      if (keywords && keywords.propertyIsEnumerable(word))
+        return "keyword";
+      if (functions && functions.propertyIsEnumerable(word)) {
+        state.beforeParams = true;
+        return "keyword";
+      }
+      return null;
+    }
+  }
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+  function tokenUnparsed(stream, state) {
+    var maybeEnd = 0, ch;
+    while (ch = stream.next()) {
+      if (ch == ";" && maybeEnd == 2) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      if (ch == ")")
+        maybeEnd++;
+      else if (ch != " ")
+        maybeEnd = 0;
+    }
+    return "meta";
+  }
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        beforeParams: false,
+        inParams: false
+      };
+    },
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    }
+  };
+});
+
+});
diff --git a/core/media/editors/codemirror/mode/mirc/mirc.min.js b/core/media/editors/codemirror/mode/mirc/mirc.min.js
new file mode 100644
index 00000000..5985d05a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mirc/mirc.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMIME("text/mirc","mirc"),a.defineMode("mirc",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){return b.tokenize=c,c(a,b)}function c(a,c){var j=c.beforeParams;c.beforeParams=!1;var k=a.next();if(/[\[\]{}\(\),\.]/.test(k))return"("==k&&j?c.inParams=!0:")"==k&&(c.inParams=!1),null;if(/\d/.test(k))return a.eatWhile(/[\w\.]/),"number";if("\\"==k)return a.eat("\\"),a.eat(/./),"number";if("/"==k&&a.eat("*"))return b(a,c,d);if(";"==k&&a.match(/ *\( *\(/))return b(a,c,e);if(";"!=k||c.inParams){if('"'==k)return a.eat(/"/),"keyword";if("$"==k)return a.eatWhile(/[$_a-z0-9A-Z\.:]/),f&&f.propertyIsEnumerable(a.current().toLowerCase())?"keyword":(c.beforeParams=!0,"builtin");if("%"==k)return a.eatWhile(/[^,\s()]/),c.beforeParams=!0,"string";if(i.test(k))return a.eatWhile(i),"operator";a.eatWhile(/[\w\$_{}]/);var l=a.current().toLowerCase();return g&&g.propertyIsEnumerable(l)?"keyword":h&&h.propertyIsEnumerable(l)?(c.beforeParams=!0,"keyword"):null}return a.skipToEnd(),"comment"}function d(a,b){for(var d,e=!1;d=a.next();){if("/"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function e(a,b){for(var d,e=0;d=a.next();){if(";"==d&&2==e){b.tokenize=c;break}")"==d?e++:" "!=d&&(e=0)}return"meta"}var f=a("$! $$ $& $? $+ $abook $abs $active $activecid $activewid $address $addtok $agent $agentname $agentstat $agentver $alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime $asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind $binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes $chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color $com $comcall $comchan $comerr $compact $compress $comval $cos $count $cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight $dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress $deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll $dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error $eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir $finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve $fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt $group $halted $hash $height $hfind $hget $highlight $hnick $hotline $hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil $inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect $insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile $isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive $lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock $lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer $maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext $menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode $modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile $nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly $opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree $pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo $readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex $reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline $sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin $site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname $sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped $syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp $timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel $ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver $version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor"),g=a("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice away background ban bcopy beep bread break breplace bset btrunc bunset bwrite channel clear clearall cline clipboard close cnick color comclose comopen comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver debug dec describe dialog did didtok disable disconnect dlevel dline dll dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable events exit fclose filter findtext finger firewall flash flist flood flush flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear ialmark identd if ignore iline inc invite iuser join kick linesep links list load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice qme qmsg query queryn quit raw reload remini remote remove rename renwin reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini say scid scon server set showmirc signam sline sockaccept sockclose socklist socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs elseif else goto menu nicklist status title icon size option text edit button check radio box scroll list combo link tab item"),h=a("if elseif else and not or eq ne in ni for foreach while switch"),i=/[+\-*&%=<>!?^\/\|]/;return{startState:function(){return{tokenize:c,beforeParams:!1,inParams:!1}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/mllike/mllike.js b/core/media/editors/codemirror/mode/mllike/mllike.js
new file mode 100644
index 00000000..92b51cbc
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mllike/mllike.js
@@ -0,0 +1,356 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('mllike', function(_config, parserConfig) {
+  var words = {
+    'as': 'keyword',
+    'do': 'keyword',
+    'else': 'keyword',
+    'end': 'keyword',
+    'exception': 'keyword',
+    'fun': 'keyword',
+    'functor': 'keyword',
+    'if': 'keyword',
+    'in': 'keyword',
+    'include': 'keyword',
+    'let': 'keyword',
+    'of': 'keyword',
+    'open': 'keyword',
+    'rec': 'keyword',
+    'struct': 'keyword',
+    'then': 'keyword',
+    'type': 'keyword',
+    'val': 'keyword',
+    'while': 'keyword',
+    'with': 'keyword'
+  };
+
+  var extraWords = parserConfig.extraWords || {};
+  for (var prop in extraWords) {
+    if (extraWords.hasOwnProperty(prop)) {
+      words[prop] = parserConfig.extraWords[prop];
+    }
+  }
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    if (ch === '"') {
+      state.tokenize = tokenString;
+      return state.tokenize(stream, state);
+    }
+    if (ch === '{') {
+      if (stream.eat('|')) {
+        state.longString = true;
+        state.tokenize = tokenLongString;
+        return state.tokenize(stream, state);
+      }
+    }
+    if (ch === '(') {
+      if (stream.eat('*')) {
+        state.commentLevel++;
+        state.tokenize = tokenComment;
+        return state.tokenize(stream, state);
+      }
+    }
+    if (ch === '~' || ch === '?') {
+      stream.eatWhile(/\w/);
+      return 'variable-2';
+    }
+    if (ch === '`') {
+      stream.eatWhile(/\w/);
+      return 'quote';
+    }
+    if (ch === '/' && parserConfig.slashComments && stream.eat('/')) {
+      stream.skipToEnd();
+      return 'comment';
+    }
+    if (/\d/.test(ch)) {
+      if (ch === '0' && stream.eat(/[bB]/)) {
+        stream.eatWhile(/[01]/);
+      } if (ch === '0' && stream.eat(/[xX]/)) {
+        stream.eatWhile(/[0-9a-fA-F]/)
+      } if (ch === '0' && stream.eat(/[oO]/)) {
+        stream.eatWhile(/[0-7]/);
+      } else {
+        stream.eatWhile(/[\d_]/);
+        if (stream.eat('.')) {
+          stream.eatWhile(/[\d]/);
+        }
+        if (stream.eat(/[eE]/)) {
+          stream.eatWhile(/[\d\-+]/);
+        }
+      }
+      return 'number';
+    }
+    if ( /[+\-*&%=<>!?|@\.~:]/.test(ch)) {
+      return 'operator';
+    }
+    if (/[\w\xa1-\uffff]/.test(ch)) {
+      stream.eatWhile(/[\w\xa1-\uffff]/);
+      var cur = stream.current();
+      return words.hasOwnProperty(cur) ? words[cur] : 'variable';
+    }
+    return null
+  }
+
+  function tokenString(stream, state) {
+    var next, end = false, escaped = false;
+    while ((next = stream.next()) != null) {
+      if (next === '"' && !escaped) {
+        end = true;
+        break;
+      }
+      escaped = !escaped && next === '\\';
+    }
+    if (end && !escaped) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  };
+
+  function tokenComment(stream, state) {
+    var prev, next;
+    while(state.commentLevel > 0 && (next = stream.next()) != null) {
+      if (prev === '(' && next === '*') state.commentLevel++;
+      if (prev === '*' && next === ')') state.commentLevel--;
+      prev = next;
+    }
+    if (state.commentLevel <= 0) {
+      state.tokenize = tokenBase;
+    }
+    return 'comment';
+  }
+
+  function tokenLongString(stream, state) {
+    var prev, next;
+    while (state.longString && (next = stream.next()) != null) {
+      if (prev === '|' && next === '}') state.longString = false;
+      prev = next;
+    }
+    if (!state.longString) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  }
+
+  return {
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0, longString: false};},
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    },
+
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)",
+    lineComment: parserConfig.slashComments ? "//" : null
+  };
+});
+
+CodeMirror.defineMIME('text/x-ocaml', {
+  name: 'mllike',
+  extraWords: {
+    'and': 'keyword',
+    'assert': 'keyword',
+    'begin': 'keyword',
+    'class': 'keyword',
+    'constraint': 'keyword',
+    'done': 'keyword',
+    'downto': 'keyword',
+    'external': 'keyword',
+    'function': 'keyword',
+    'initializer': 'keyword',
+    'lazy': 'keyword',
+    'match': 'keyword',
+    'method': 'keyword',
+    'module': 'keyword',
+    'mutable': 'keyword',
+    'new': 'keyword',
+    'nonrec': 'keyword',
+    'object': 'keyword',
+    'private': 'keyword',
+    'sig': 'keyword',
+    'to': 'keyword',
+    'try': 'keyword',
+    'value': 'keyword',
+    'virtual': 'keyword',
+    'when': 'keyword',
+
+    // builtins
+    'raise': 'builtin',
+    'failwith': 'builtin',
+    'true': 'builtin',
+    'false': 'builtin',
+
+    // Pervasives builtins
+    'asr': 'builtin',
+    'land': 'builtin',
+    'lor': 'builtin',
+    'lsl': 'builtin',
+    'lsr': 'builtin',
+    'lxor': 'builtin',
+    'mod': 'builtin',
+    'or': 'builtin',
+
+    // More Pervasives
+    'raise_notrace': 'builtin',
+    'trace': 'builtin',
+    'exit': 'builtin',
+    'print_string': 'builtin',
+    'print_endline': 'builtin',
+
+     'int': 'type',
+     'float': 'type',
+     'bool': 'type',
+     'char': 'type',
+     'string': 'type',
+     'unit': 'type',
+
+     // Modules
+     'List': 'builtin'
+  }
+});
+
+CodeMirror.defineMIME('text/x-fsharp', {
+  name: 'mllike',
+  extraWords: {
+    'abstract': 'keyword',
+    'assert': 'keyword',
+    'base': 'keyword',
+    'begin': 'keyword',
+    'class': 'keyword',
+    'default': 'keyword',
+    'delegate': 'keyword',
+    'do!': 'keyword',
+    'done': 'keyword',
+    'downcast': 'keyword',
+    'downto': 'keyword',
+    'elif': 'keyword',
+    'extern': 'keyword',
+    'finally': 'keyword',
+    'for': 'keyword',
+    'function': 'keyword',
+    'global': 'keyword',
+    'inherit': 'keyword',
+    'inline': 'keyword',
+    'interface': 'keyword',
+    'internal': 'keyword',
+    'lazy': 'keyword',
+    'let!': 'keyword',
+    'match': 'keyword',
+    'member': 'keyword',
+    'module': 'keyword',
+    'mutable': 'keyword',
+    'namespace': 'keyword',
+    'new': 'keyword',
+    'null': 'keyword',
+    'override': 'keyword',
+    'private': 'keyword',
+    'public': 'keyword',
+    'return!': 'keyword',
+    'return': 'keyword',
+    'select': 'keyword',
+    'static': 'keyword',
+    'to': 'keyword',
+    'try': 'keyword',
+    'upcast': 'keyword',
+    'use!': 'keyword',
+    'use': 'keyword',
+    'void': 'keyword',
+    'when': 'keyword',
+    'yield!': 'keyword',
+    'yield': 'keyword',
+
+    // Reserved words
+    'atomic': 'keyword',
+    'break': 'keyword',
+    'checked': 'keyword',
+    'component': 'keyword',
+    'const': 'keyword',
+    'constraint': 'keyword',
+    'constructor': 'keyword',
+    'continue': 'keyword',
+    'eager': 'keyword',
+    'event': 'keyword',
+    'external': 'keyword',
+    'fixed': 'keyword',
+    'method': 'keyword',
+    'mixin': 'keyword',
+    'object': 'keyword',
+    'parallel': 'keyword',
+    'process': 'keyword',
+    'protected': 'keyword',
+    'pure': 'keyword',
+    'sealed': 'keyword',
+    'tailcall': 'keyword',
+    'trait': 'keyword',
+    'virtual': 'keyword',
+    'volatile': 'keyword',
+
+    // builtins
+    'List': 'builtin',
+    'Seq': 'builtin',
+    'Map': 'builtin',
+    'Set': 'builtin',
+    'Option': 'builtin',
+    'int': 'builtin',
+    'string': 'builtin',
+    'not': 'builtin',
+    'true': 'builtin',
+    'false': 'builtin',
+
+    'raise': 'builtin',
+    'failwith': 'builtin'
+  },
+  slashComments: true
+});
+
+
+CodeMirror.defineMIME('text/x-sml', {
+  name: 'mllike',
+  extraWords: {
+    'abstype': 'keyword',
+    'and': 'keyword',
+    'andalso': 'keyword',
+    'case': 'keyword',
+    'datatype': 'keyword',
+    'fn': 'keyword',
+    'handle': 'keyword',
+    'infix': 'keyword',
+    'infixr': 'keyword',
+    'local': 'keyword',
+    'nonfix': 'keyword',
+    'op': 'keyword',
+    'orelse': 'keyword',
+    'raise': 'keyword',
+    'withtype': 'keyword',
+    'eqtype': 'keyword',
+    'sharing': 'keyword',
+    'sig': 'keyword',
+    'signature': 'keyword',
+    'structure': 'keyword',
+    'where': 'keyword',
+    'true': 'keyword',
+    'false': 'keyword',
+
+    // types
+    'int': 'builtin',
+    'real': 'builtin',
+    'string': 'builtin',
+    'char': 'builtin',
+    'bool': 'builtin'
+  },
+  slashComments: true
+});
+
+});
diff --git a/core/media/editors/codemirror/mode/mllike/mllike.min.js b/core/media/editors/codemirror/mode/mllike/mllike.min.js
new file mode 100644
index 00000000..963063ce
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mllike/mllike.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("mllike",(function(a,b){function c(a,c){var h=a.next();if('"'===h)return c.tokenize=d,c.tokenize(a,c);if("{"===h&&a.eat("|"))return c.longString=!0,c.tokenize=f,c.tokenize(a,c);if("("===h&&a.eat("*"))return c.commentLevel++,c.tokenize=e,c.tokenize(a,c);if("~"===h||"?"===h)return a.eatWhile(/\w/),"variable-2";if("`"===h)return a.eatWhile(/\w/),"quote";if("/"===h&&b.slashComments&&a.eat("/"))return a.skipToEnd(),"comment";if(/\d/.test(h))return"0"===h&&a.eat(/[bB]/)&&a.eatWhile(/[01]/),"0"===h&&a.eat(/[xX]/)&&a.eatWhile(/[0-9a-fA-F]/),"0"===h&&a.eat(/[oO]/)?a.eatWhile(/[0-7]/):(a.eatWhile(/[\d_]/),a.eat(".")&&a.eatWhile(/[\d]/),a.eat(/[eE]/)&&a.eatWhile(/[\d\-+]/)),"number";if(/[+\-*&%=<>!?|@\.~:]/.test(h))return"operator";if(/[\w\xa1-\uffff]/.test(h)){a.eatWhile(/[\w\xa1-\uffff]/);var i=a.current();return g.hasOwnProperty(i)?g[i]:"variable"}return null}function d(a,b){for(var d,e=!1,f=!1;null!=(d=a.next());){if('"'===d&&!f){e=!0;break}f=!f&&"\\"===d}return e&&!f&&(b.tokenize=c),"string"}function e(a,b){for(var d,e;b.commentLevel>0&&null!=(e=a.next());)"("===d&&"*"===e&&b.commentLevel++,"*"===d&&")"===e&&b.commentLevel--,d=e;return b.commentLevel<=0&&(b.tokenize=c),"comment"}function f(a,b){for(var d,e;b.longString&&null!=(e=a.next());)"|"===d&&"}"===e&&(b.longString=!1),d=e;return b.longString||(b.tokenize=c),"string"}var g={as:"keyword",do:"keyword",else:"keyword",end:"keyword",exception:"keyword",fun:"keyword",functor:"keyword",if:"keyword",in:"keyword",include:"keyword",let:"keyword",of:"keyword",open:"keyword",rec:"keyword",struct:"keyword",then:"keyword",type:"keyword",val:"keyword",while:"keyword",with:"keyword"},h=b.extraWords||{};for(var i in h)h.hasOwnProperty(i)&&(g[i]=b.extraWords[i]);return{startState:function(){return{tokenize:c,commentLevel:0,longString:!1}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)},blockCommentStart:"(*",blockCommentEnd:"*)",lineComment:b.slashComments?"//":null}})),a.defineMIME("text/x-ocaml",{name:"mllike",extraWords:{and:"keyword",assert:"keyword",begin:"keyword",class:"keyword",constraint:"keyword",done:"keyword",downto:"keyword",external:"keyword",function:"keyword",initializer:"keyword",lazy:"keyword",match:"keyword",method:"keyword",module:"keyword",mutable:"keyword",new:"keyword",nonrec:"keyword",object:"keyword",private:"keyword",sig:"keyword",to:"keyword",try:"keyword",value:"keyword",virtual:"keyword",when:"keyword",raise:"builtin",failwith:"builtin",true:"builtin",false:"builtin",asr:"builtin",land:"builtin",lor:"builtin",lsl:"builtin",lsr:"builtin",lxor:"builtin",mod:"builtin",or:"builtin",raise_notrace:"builtin",trace:"builtin",exit:"builtin",print_string:"builtin",print_endline:"builtin",int:"type",float:"type",bool:"type",char:"type",string:"type",unit:"type",List:"builtin"}}),a.defineMIME("text/x-fsharp",{name:"mllike",extraWords:{abstract:"keyword",assert:"keyword",base:"keyword",begin:"keyword",class:"keyword",default:"keyword",delegate:"keyword","do!":"keyword",done:"keyword",downcast:"keyword",downto:"keyword",elif:"keyword",extern:"keyword",finally:"keyword",for:"keyword",function:"keyword",global:"keyword",inherit:"keyword",inline:"keyword",interface:"keyword",internal:"keyword",lazy:"keyword","let!":"keyword",match:"keyword",member:"keyword",module:"keyword",mutable:"keyword",namespace:"keyword",new:"keyword",null:"keyword",override:"keyword",private:"keyword",public:"keyword","return!":"keyword",return:"keyword",select:"keyword",static:"keyword",to:"keyword",try:"keyword",upcast:"keyword","use!":"keyword",use:"keyword",void:"keyword",when:"keyword","yield!":"keyword",yield:"keyword",atomic:"keyword",break:"keyword",checked:"keyword",component:"keyword",const:"keyword",constraint:"keyword",constructor:"keyword",continue:"keyword",eager:"keyword",event:"keyword",external:"keyword",fixed:"keyword",method:"keyword",mixin:"keyword",object:"keyword",parallel:"keyword",process:"keyword",protected:"keyword",pure:"keyword",sealed:"keyword",tailcall:"keyword",trait:"keyword",virtual:"keyword",volatile:"keyword",List:"builtin",Seq:"builtin",Map:"builtin",Set:"builtin",Option:"builtin",int:"builtin",string:"builtin",not:"builtin",true:"builtin",false:"builtin",raise:"builtin",failwith:"builtin"},slashComments:!0}),a.defineMIME("text/x-sml",{name:"mllike",extraWords:{abstype:"keyword",and:"keyword",andalso:"keyword",case:"keyword",datatype:"keyword",fn:"keyword",handle:"keyword",infix:"keyword",infixr:"keyword",local:"keyword",nonfix:"keyword",op:"keyword",orelse:"keyword",raise:"keyword",withtype:"keyword",eqtype:"keyword",sharing:"keyword",sig:"keyword",signature:"keyword",structure:"keyword",where:"keyword",true:"keyword",false:"keyword",int:"builtin",real:"builtin",string:"builtin",char:"builtin",bool:"builtin"},slashComments:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/modelica/modelica.js b/core/media/editors/codemirror/mode/modelica/modelica.js
new file mode 100644
index 00000000..77ec7a3c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/modelica/modelica.js
@@ -0,0 +1,245 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Modelica support for CodeMirror, copyright (c) by Lennart Ochel
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})
+
+(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("modelica", function(config, parserConfig) {
+
+    var indentUnit = config.indentUnit;
+    var keywords = parserConfig.keywords || {};
+    var builtin = parserConfig.builtin || {};
+    var atoms = parserConfig.atoms || {};
+
+    var isSingleOperatorChar = /[;=\(:\),{}.*<>+\-\/^\[\]]/;
+    var isDoubleOperatorChar = /(:=|<=|>=|==|<>|\.\+|\.\-|\.\*|\.\/|\.\^)/;
+    var isDigit = /[0-9]/;
+    var isNonDigit = /[_a-zA-Z]/;
+
+    function tokenLineComment(stream, state) {
+      stream.skipToEnd();
+      state.tokenize = null;
+      return "comment";
+    }
+
+    function tokenBlockComment(stream, state) {
+      var maybeEnd = false, ch;
+      while (ch = stream.next()) {
+        if (maybeEnd && ch == "/") {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return "comment";
+    }
+
+    function tokenString(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == '"' && !escaped) {
+          state.tokenize = null;
+          state.sol = false;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+
+      return "string";
+    }
+
+    function tokenIdent(stream, state) {
+      stream.eatWhile(isDigit);
+      while (stream.eat(isDigit) || stream.eat(isNonDigit)) { }
+
+
+      var cur = stream.current();
+
+      if(state.sol && (cur == "package" || cur == "model" || cur == "when" || cur == "connector")) state.level++;
+      else if(state.sol && cur == "end" && state.level > 0) state.level--;
+
+      state.tokenize = null;
+      state.sol = false;
+
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      else if (builtin.propertyIsEnumerable(cur)) return "builtin";
+      else if (atoms.propertyIsEnumerable(cur)) return "atom";
+      else return "variable";
+    }
+
+    function tokenQIdent(stream, state) {
+      while (stream.eat(/[^']/)) { }
+
+      state.tokenize = null;
+      state.sol = false;
+
+      if(stream.eat("'"))
+        return "variable";
+      else
+        return "error";
+    }
+
+    function tokenUnsignedNuber(stream, state) {
+      stream.eatWhile(isDigit);
+      if (stream.eat('.')) {
+        stream.eatWhile(isDigit);
+      }
+      if (stream.eat('e') || stream.eat('E')) {
+        if (!stream.eat('-'))
+          stream.eat('+');
+        stream.eatWhile(isDigit);
+      }
+
+      state.tokenize = null;
+      state.sol = false;
+      return "number";
+    }
+
+    // Interface
+    return {
+      startState: function() {
+        return {
+          tokenize: null,
+          level: 0,
+          sol: true
+        };
+      },
+
+      token: function(stream, state) {
+        if(state.tokenize != null) {
+          return state.tokenize(stream, state);
+        }
+
+        if(stream.sol()) {
+          state.sol = true;
+        }
+
+        // WHITESPACE
+        if(stream.eatSpace()) {
+          state.tokenize = null;
+          return null;
+        }
+
+        var ch = stream.next();
+
+        // LINECOMMENT
+        if(ch == '/' && stream.eat('/')) {
+          state.tokenize = tokenLineComment;
+        }
+        // BLOCKCOMMENT
+        else if(ch == '/' && stream.eat('*')) {
+          state.tokenize = tokenBlockComment;
+        }
+        // TWO SYMBOL TOKENS
+        else if(isDoubleOperatorChar.test(ch+stream.peek())) {
+          stream.next();
+          state.tokenize = null;
+          return "operator";
+        }
+        // SINGLE SYMBOL TOKENS
+        else if(isSingleOperatorChar.test(ch)) {
+          state.tokenize = null;
+          return "operator";
+        }
+        // IDENT
+        else if(isNonDigit.test(ch)) {
+          state.tokenize = tokenIdent;
+        }
+        // Q-IDENT
+        else if(ch == "'" && stream.peek() && stream.peek() != "'") {
+          state.tokenize = tokenQIdent;
+        }
+        // STRING
+        else if(ch == '"') {
+          state.tokenize = tokenString;
+        }
+        // UNSIGNED_NUBER
+        else if(isDigit.test(ch)) {
+          state.tokenize = tokenUnsignedNuber;
+        }
+        // ERROR
+        else {
+          state.tokenize = null;
+          return "error";
+        }
+
+        return state.tokenize(stream, state);
+      },
+
+      indent: function(state, textAfter) {
+        if (state.tokenize != null) return CodeMirror.Pass;
+
+        var level = state.level;
+        if(/(algorithm)/.test(textAfter)) level--;
+        if(/(equation)/.test(textAfter)) level--;
+        if(/(initial algorithm)/.test(textAfter)) level--;
+        if(/(initial equation)/.test(textAfter)) level--;
+        if(/(end)/.test(textAfter)) level--;
+
+        if(level > 0)
+          return indentUnit*level;
+        else
+          return 0;
+      },
+
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i=0; i<words.length; ++i)
+      obj[words[i]] = true;
+    return obj;
+  }
+
+  var modelicaKeywords = "algorithm and annotation assert block break class connect connector constant constrainedby der discrete each else elseif elsewhen encapsulated end enumeration equation expandable extends external false final flow for function if import impure in initial inner input loop model not operator or outer output package parameter partial protected public pure record redeclare replaceable return stream then true type when while within";
+  var modelicaBuiltin = "abs acos actualStream asin atan atan2 cardinality ceil cos cosh delay div edge exp floor getInstanceName homotopy inStream integer log log10 mod pre reinit rem semiLinear sign sin sinh spatialDistribution sqrt tan tanh";
+  var modelicaAtoms = "Real Boolean Integer String";
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string")
+      mimes = [mimes];
+
+    var words = [];
+
+    function add(obj) {
+      if (obj)
+        for (var prop in obj)
+          if (obj.hasOwnProperty(prop))
+            words.push(prop);
+    }
+
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.atoms);
+
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i=0; i<mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  def(["text/x-modelica"], {
+    name: "modelica",
+    keywords: words(modelicaKeywords),
+    builtin: words(modelicaBuiltin),
+    atoms: words(modelicaAtoms)
+  });
+});
diff --git a/core/media/editors/codemirror/mode/modelica/modelica.min.js b/core/media/editors/codemirror/mode/modelica/modelica.min.js
new file mode 100644
index 00000000..4875901b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/modelica/modelica.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(b,c){function d(a){if(a)for(var b in a)a.hasOwnProperty(b)&&e.push(b)}"string"==typeof b&&(b=[b]);var e=[];d(c.keywords),d(c.builtin),d(c.atoms),e.length&&(c.helperType=b[0],a.registerHelper("hintWords",b[0],e));for(var f=0;f<b.length;++f)a.defineMIME(b[f],c)}a.defineMode("modelica",(function(b,c){function d(a,b){return a.skipToEnd(),b.tokenize=null,"comment"}function e(a,b){for(var c,d=!1;c=a.next();){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return"comment"}function f(a,b){for(var c,d=!1;null!=(c=a.next());){if('"'==c&&!d){b.tokenize=null,b.sol=!1;break}d=!d&&"\\"==c}return"string"}function g(a,b){for(a.eatWhile(p);a.eat(p)||a.eat(q););var c=a.current();return!b.sol||"package"!=c&&"model"!=c&&"when"!=c&&"connector"!=c?b.sol&&"end"==c&&b.level>0&&b.level--:b.level++,b.tokenize=null,b.sol=!1,k.propertyIsEnumerable(c)?"keyword":l.propertyIsEnumerable(c)?"builtin":m.propertyIsEnumerable(c)?"atom":"variable"}function h(a,b){for(;a.eat(/[^']/););return b.tokenize=null,b.sol=!1,a.eat("'")?"variable":"error"}function i(a,b){return a.eatWhile(p),a.eat(".")&&a.eatWhile(p),(a.eat("e")||a.eat("E"))&&(a.eat("-")||a.eat("+"),a.eatWhile(p)),b.tokenize=null,b.sol=!1,"number"}var j=b.indentUnit,k=c.keywords||{},l=c.builtin||{},m=c.atoms||{},n=/[;=\(:\),{}.*<>+\-\/^\[\]]/,o=/(:=|<=|>=|==|<>|\.\+|\.\-|\.\*|\.\/|\.\^)/,p=/[0-9]/,q=/[_a-zA-Z]/;return{startState:function(){return{tokenize:null,level:0,sol:!0}},token:function(a,b){if(null!=b.tokenize)return b.tokenize(a,b);if(a.sol()&&(b.sol=!0),a.eatSpace())return b.tokenize=null,null;var c=a.next();if("/"==c&&a.eat("/"))b.tokenize=d;else if("/"==c&&a.eat("*"))b.tokenize=e;else{if(o.test(c+a.peek()))return a.next(),b.tokenize=null,"operator";if(n.test(c))return b.tokenize=null,"operator";if(q.test(c))b.tokenize=g;else if("'"==c&&a.peek()&&"'"!=a.peek())b.tokenize=h;else if('"'==c)b.tokenize=f;else{if(!p.test(c))return b.tokenize=null,"error";b.tokenize=i}}return b.tokenize(a,b)},indent:function(b,c){if(null!=b.tokenize)return a.Pass;var d=b.level;return/(algorithm)/.test(c)&&d--,/(equation)/.test(c)&&d--,/(initial algorithm)/.test(c)&&d--,/(initial equation)/.test(c)&&d--,/(end)/.test(c)&&d--,d>0?j*d:0},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}}));var d="algorithm and annotation assert block break class connect connector constant constrainedby der discrete each else elseif elsewhen encapsulated end enumeration equation expandable extends external false final flow for function if import impure in initial inner input loop model not operator or outer output package parameter partial protected public pure record redeclare replaceable return stream then true type when while within",e="abs acos actualStream asin atan atan2 cardinality ceil cos cosh delay div edge exp floor getInstanceName homotopy inStream integer log log10 mod pre reinit rem semiLinear sign sin sinh spatialDistribution sqrt tan tanh",f="Real Boolean Integer String";c(["text/x-modelica"],{name:"modelica",keywords:b(d),builtin:b(e),atoms:b(f)})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/mscgen/mscgen.js b/core/media/editors/codemirror/mode/mscgen/mscgen.js
new file mode 100644
index 00000000..2cd6f427
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mscgen/mscgen.js
@@ -0,0 +1,175 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// mode(s) for the sequence chart dsl's mscgen, xù and msgenny
+// For more information on mscgen, see the site of the original author:
+// http://www.mcternan.me.uk/mscgen
+//
+// This mode for mscgen and the two derivative languages were
+// originally made for use in the mscgen_js interpreter
+// (https://sverweij.github.io/mscgen_js)
+
+(function(mod) {
+  if ( typeof exports == "object" && typeof module == "object")// CommonJS
+    mod(require("../../lib/codemirror"));
+  else if ( typeof define == "function" && define.amd)// AMD
+    define(["../../lib/codemirror"], mod);
+  else// Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var languages = {
+    mscgen: {
+      "keywords" : ["msc"],
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
+      "constants" : ["true", "false", "on", "off"],
+      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+      "brackets" : ["\\{", "\\}"], // [ and  ] are brackets too, but these get handled in with lists
+      "arcsWords" : ["note", "abox", "rbox", "box"],
+      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+      "singlecomment" : ["//", "#"],
+      "operators" : ["="]
+    },
+    xu: {
+      "keywords" : ["msc", "xu"],
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "constants" : ["true", "false", "on", "off", "auto"],
+      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+      "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
+      "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
+      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+      "singlecomment" : ["//", "#"],
+      "operators" : ["="]
+    },
+    msgenny: {
+      "keywords" : null,
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "constants" : ["true", "false", "on", "off", "auto"],
+      "attributes" : null,
+      "brackets" : ["\\{", "\\}"],
+      "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
+      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+      "singlecomment" : ["//", "#"],
+      "operators" : ["="]
+    }
+  }
+
+  CodeMirror.defineMode("mscgen", function(_, modeConfig) {
+    var language = languages[modeConfig && modeConfig.language || "mscgen"]
+    return {
+      startState: startStateFn,
+      copyState: copyStateFn,
+      token: produceTokenFunction(language),
+      lineComment : "#",
+      blockCommentStart : "/*",
+      blockCommentEnd : "*/"
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-mscgen", "mscgen");
+  CodeMirror.defineMIME("text/x-xu", {name: "mscgen", language: "xu"});
+  CodeMirror.defineMIME("text/x-msgenny", {name: "mscgen", language: "msgenny"});
+
+  function wordRegexpBoundary(pWords) {
+    return new RegExp("\\b(" + pWords.join("|") + ")\\b", "i");
+  }
+
+  function wordRegexp(pWords) {
+    return new RegExp("(" + pWords.join("|") + ")", "i");
+  }
+
+  function startStateFn() {
+    return {
+      inComment : false,
+      inString : false,
+      inAttributeList : false,
+      inScript : false
+    };
+  }
+
+  function copyStateFn(pState) {
+    return {
+      inComment : pState.inComment,
+      inString : pState.inString,
+      inAttributeList : pState.inAttributeList,
+      inScript : pState.inScript
+    };
+  }
+
+  function produceTokenFunction(pConfig) {
+
+    return function(pStream, pState) {
+      if (pStream.match(wordRegexp(pConfig.brackets), true, true)) {
+        return "bracket";
+      }
+      /* comments */
+      if (!pState.inComment) {
+        if (pStream.match(/\/\*[^\*\/]*/, true, true)) {
+          pState.inComment = true;
+          return "comment";
+        }
+        if (pStream.match(wordRegexp(pConfig.singlecomment), true, true)) {
+          pStream.skipToEnd();
+          return "comment";
+        }
+      }
+      if (pState.inComment) {
+        if (pStream.match(/[^\*\/]*\*\//, true, true))
+          pState.inComment = false;
+        else
+          pStream.skipToEnd();
+        return "comment";
+      }
+      /* strings */
+      if (!pState.inString && pStream.match(/\"(\\\"|[^\"])*/, true, true)) {
+        pState.inString = true;
+        return "string";
+      }
+      if (pState.inString) {
+        if (pStream.match(/[^\"]*\"/, true, true))
+          pState.inString = false;
+        else
+          pStream.skipToEnd();
+        return "string";
+      }
+      /* keywords & operators */
+      if (!!pConfig.keywords && pStream.match(wordRegexpBoundary(pConfig.keywords), true, true))
+        return "keyword";
+
+      if (pStream.match(wordRegexpBoundary(pConfig.options), true, true))
+        return "keyword";
+
+      if (pStream.match(wordRegexpBoundary(pConfig.arcsWords), true, true))
+        return "keyword";
+
+      if (pStream.match(wordRegexp(pConfig.arcsOthers), true, true))
+        return "keyword";
+
+      if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true))
+        return "operator";
+
+      if (!!pConfig.constants && pStream.match(wordRegexp(pConfig.constants), true, true))
+        return "variable";
+
+      /* attribute lists */
+      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
+        pConfig.inAttributeList = true;
+        return "bracket";
+      }
+      if (pConfig.inAttributeList) {
+        if (pConfig.attributes !== null && pStream.match(wordRegexpBoundary(pConfig.attributes), true, true)) {
+          return "attribute";
+        }
+        if (pStream.match(/]/, true, true)) {
+          pConfig.inAttributeList = false;
+          return "bracket";
+        }
+      }
+
+      pStream.next();
+      return "base";
+    };
+  }
+
+});
diff --git a/core/media/editors/codemirror/mode/mscgen/mscgen.min.js b/core/media/editors/codemirror/mode/mscgen/mscgen.min.js
new file mode 100644
index 00000000..6527165c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mscgen/mscgen.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("\\b("+a.join("|")+")\\b","i")}function c(a){return new RegExp("("+a.join("|")+")","i")}function d(){return{inComment:!1,inString:!1,inAttributeList:!1,inScript:!1}}function e(a){return{inComment:a.inComment,inString:a.inString,inAttributeList:a.inAttributeList,inScript:a.inScript}}function f(a){return function(d,e){if(d.match(c(a.brackets),!0,!0))return"bracket";if(!e.inComment){if(d.match(/\/\*[^\*\/]*/,!0,!0))return e.inComment=!0,"comment";if(d.match(c(a.singlecomment),!0,!0))return d.skipToEnd(),"comment"}if(e.inComment)return d.match(/[^\*\/]*\*\//,!0,!0)?e.inComment=!1:d.skipToEnd(),"comment";if(!e.inString&&d.match(/\"(\\\"|[^\"])*/,!0,!0))return e.inString=!0,"string";if(e.inString)return d.match(/[^\"]*\"/,!0,!0)?e.inString=!1:d.skipToEnd(),"string";if(a.keywords&&d.match(b(a.keywords),!0,!0))return"keyword";if(d.match(b(a.options),!0,!0))return"keyword";if(d.match(b(a.arcsWords),!0,!0))return"keyword";if(d.match(c(a.arcsOthers),!0,!0))return"keyword";if(a.operators&&d.match(c(a.operators),!0,!0))return"operator";if(a.constants&&d.match(c(a.constants),!0,!0))return"variable";if(!a.inAttributeList&&a.attributes&&d.match(/\[/,!0,!0))return a.inAttributeList=!0,"bracket";if(a.inAttributeList){if(null!==a.attributes&&d.match(b(a.attributes),!0,!0))return"attribute";if(d.match(/]/,!0,!0))return a.inAttributeList=!1,"bracket"}return d.next(),"base"}}var g={mscgen:{keywords:["msc"],options:["hscale","width","arcgradient","wordwraparcs"],constants:["true","false","on","off"],attributes:["label","idurl","id","url","linecolor","linecolour","textcolor","textcolour","textbgcolor","textbgcolour","arclinecolor","arclinecolour","arctextcolor","arctextcolour","arctextbgcolor","arctextbgcolour","arcskip"],brackets:["\\{","\\}"],arcsWords:["note","abox","rbox","box"],arcsOthers:["\\|\\|\\|","\\.\\.\\.","---","--","<->","==","<<=>>","<=>","\\.\\.","<<>>","::","<:>","->","=>>","=>",">>",":>","<-","<<=","<=","<<","<:","x-","-x"],singlecomment:["//","#"],operators:["="]},xu:{keywords:["msc","xu"],options:["hscale","width","arcgradient","wordwraparcs","watermark"],constants:["true","false","on","off","auto"],attributes:["label","idurl","id","url","linecolor","linecolour","textcolor","textcolour","textbgcolor","textbgcolour","arclinecolor","arclinecolour","arctextcolor","arctextcolour","arctextbgcolor","arctextbgcolour","arcskip"],brackets:["\\{","\\}"],arcsWords:["note","abox","rbox","box","alt","else","opt","break","par","seq","strict","neg","critical","ignore","consider","assert","loop","ref","exc"],arcsOthers:["\\|\\|\\|","\\.\\.\\.","---","--","<->","==","<<=>>","<=>","\\.\\.","<<>>","::","<:>","->","=>>","=>",">>",":>","<-","<<=","<=","<<","<:","x-","-x"],singlecomment:["//","#"],operators:["="]},msgenny:{keywords:null,options:["hscale","width","arcgradient","wordwraparcs","watermark"],constants:["true","false","on","off","auto"],attributes:null,brackets:["\\{","\\}"],arcsWords:["note","abox","rbox","box","alt","else","opt","break","par","seq","strict","neg","critical","ignore","consider","assert","loop","ref","exc"],arcsOthers:["\\|\\|\\|","\\.\\.\\.","---","--","<->","==","<<=>>","<=>","\\.\\.","<<>>","::","<:>","->","=>>","=>",">>",":>","<-","<<=","<=","<<","<:","x-","-x"],singlecomment:["//","#"],operators:["="]}};a.defineMode("mscgen",(function(a,b){var c=g[b&&b.language||"mscgen"];return{startState:d,copyState:e,token:f(c),lineComment:"#",blockCommentStart:"/*",blockCommentEnd:"*/"}})),a.defineMIME("text/x-mscgen","mscgen"),a.defineMIME("text/x-xu",{name:"mscgen",language:"xu"}),a.defineMIME("text/x-msgenny",{name:"mscgen",language:"msgenny"})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/mumps/mumps.js b/core/media/editors/codemirror/mode/mumps/mumps.js
new file mode 100644
index 00000000..469f8c3d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mumps/mumps.js
@@ -0,0 +1,148 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+  This MUMPS Language script was constructed using vbscript.js as a template.
+*/
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("mumps", function() {
+    function wordRegexp(words) {
+      return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+    }
+
+    var singleOperators = new RegExp("^[\\+\\-\\*/&#!_?\\\\<>=\\'\\[\\]]");
+    var doubleOperators = new RegExp("^(('=)|(<=)|(>=)|('>)|('<)|([[)|(]])|(^$))");
+    var singleDelimiters = new RegExp("^[\\.,:]");
+    var brackets = new RegExp("[()]");
+    var identifiers = new RegExp("^[%A-Za-z][A-Za-z0-9]*");
+    var commandKeywords = ["break","close","do","else","for","goto", "halt", "hang", "if", "job","kill","lock","merge","new","open", "quit", "read", "set", "tcommit", "trollback", "tstart", "use", "view", "write", "xecute", "b","c","d","e","f","g", "h", "i", "j","k","l","m","n","o", "q", "r", "s", "tc", "tro", "ts", "u", "v", "w", "x"];
+    // The following list includes instrinsic functions _and_ special variables
+    var intrinsicFuncsWords = ["\\$ascii", "\\$char", "\\$data", "\\$ecode", "\\$estack", "\\$etrap", "\\$extract", "\\$find", "\\$fnumber", "\\$get", "\\$horolog", "\\$io", "\\$increment", "\\$job", "\\$justify", "\\$length", "\\$name", "\\$next", "\\$order", "\\$piece", "\\$qlength", "\\$qsubscript", "\\$query", "\\$quit", "\\$random", "\\$reverse", "\\$select", "\\$stack", "\\$test", "\\$text", "\\$translate", "\\$view", "\\$x", "\\$y", "\\$a", "\\$c", "\\$d", "\\$e", "\\$ec", "\\$es", "\\$et", "\\$f", "\\$fn", "\\$g", "\\$h", "\\$i", "\\$j", "\\$l", "\\$n", "\\$na", "\\$o", "\\$p", "\\$q", "\\$ql", "\\$qs", "\\$r", "\\$re", "\\$s", "\\$st", "\\$t", "\\$tr", "\\$v", "\\$z"];
+    var intrinsicFuncs = wordRegexp(intrinsicFuncsWords);
+    var command = wordRegexp(commandKeywords);
+
+    function tokenBase(stream, state) {
+      if (stream.sol()) {
+        state.label = true;
+        state.commandMode = 0;
+      }
+
+      // The <space> character has meaning in MUMPS. Ignoring consecutive
+      // spaces would interfere with interpreting whether the next non-space
+      // character belongs to the command or argument context.
+
+      // Examine each character and update a mode variable whose interpretation is:
+      //   >0 => command    0 => argument    <0 => command post-conditional
+      var ch = stream.peek();
+
+      if (ch == " " || ch == "\t") { // Pre-process <space>
+        state.label = false;
+        if (state.commandMode == 0)
+          state.commandMode = 1;
+        else if ((state.commandMode < 0) || (state.commandMode == 2))
+          state.commandMode = 0;
+      } else if ((ch != ".") && (state.commandMode > 0)) {
+        if (ch == ":")
+          state.commandMode = -1;   // SIS - Command post-conditional
+        else
+          state.commandMode = 2;
+      }
+
+      // Do not color parameter list as line tag
+      if ((ch === "(") || (ch === "\u0009"))
+        state.label = false;
+
+      // MUMPS comment starts with ";"
+      if (ch === ";") {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      // Number Literals // SIS/RLM - MUMPS permits canonic number followed by concatenate operator
+      if (stream.match(/^[-+]?\d+(\.\d+)?([eE][-+]?\d+)?/))
+        return "number";
+
+      // Handle Strings
+      if (ch == '"') {
+        if (stream.skipTo('"')) {
+          stream.next();
+          return "string";
+        } else {
+          stream.skipToEnd();
+          return "error";
+        }
+      }
+
+      // Handle operators and Delimiters
+      if (stream.match(doubleOperators) || stream.match(singleOperators))
+        return "operator";
+
+      // Prevents leading "." in DO block from falling through to error
+      if (stream.match(singleDelimiters))
+        return null;
+
+      if (brackets.test(ch)) {
+        stream.next();
+        return "bracket";
+      }
+
+      if (state.commandMode > 0 && stream.match(command))
+        return "variable-2";
+
+      if (stream.match(intrinsicFuncs))
+        return "builtin";
+
+      if (stream.match(identifiers))
+        return "variable";
+
+      // Detect dollar-sign when not a documented intrinsic function
+      // "^" may introduce a GVN or SSVN - Color same as function
+      if (ch === "$" || ch === "^") {
+        stream.next();
+        return "builtin";
+      }
+
+      // MUMPS Indirection
+      if (ch === "@") {
+        stream.next();
+        return "string-2";
+      }
+
+      if (/[\w%]/.test(ch)) {
+        stream.eatWhile(/[\w%]/);
+        return "variable";
+      }
+
+      // Handle non-detected items
+      stream.next();
+      return "error";
+    }
+
+    return {
+      startState: function() {
+        return {
+          label: false,
+          commandMode: 0
+        };
+      },
+
+      token: function(stream, state) {
+        var style = tokenBase(stream, state);
+        if (state.label) return "tag";
+        return style;
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-mumps", "mumps");
+});
diff --git a/core/media/editors/codemirror/mode/mumps/mumps.min.js b/core/media/editors/codemirror/mode/mumps/mumps.min.js
new file mode 100644
index 00000000..0293a20b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/mumps/mumps.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("mumps",(function(){function a(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function b(a,b){a.sol()&&(b.label=!0,b.commandMode=0);var h=a.peek();return" "==h||"\t"==h?(b.label=!1,0==b.commandMode?b.commandMode=1:(b.commandMode<0||2==b.commandMode)&&(b.commandMode=0)):"."!=h&&b.commandMode>0&&(":"==h?b.commandMode=-1:b.commandMode=2),"("!==h&&"\t"!==h||(b.label=!1),";"===h?(a.skipToEnd(),"comment"):a.match(/^[-+]?\d+(\.\d+)?([eE][-+]?\d+)?/)?"number":'"'==h?a.skipTo('"')?(a.next(),"string"):(a.skipToEnd(),"error"):a.match(d)||a.match(c)?"operator":a.match(e)?null:f.test(h)?(a.next(),"bracket"):b.commandMode>0&&a.match(k)?"variable-2":a.match(j)?"builtin":a.match(g)?"variable":"$"===h||"^"===h?(a.next(),"builtin"):"@"===h?(a.next(),"string-2"):/[\w%]/.test(h)?(a.eatWhile(/[\w%]/),"variable"):(a.next(),"error")}var c=new RegExp("^[\\+\\-\\*/&#!_?\\\\<>=\\'\\[\\]]"),d=new RegExp("^(('=)|(<=)|(>=)|('>)|('<)|([[)|(]])|(^$))"),e=new RegExp("^[\\.,:]"),f=new RegExp("[()]"),g=new RegExp("^[%A-Za-z][A-Za-z0-9]*"),h=["break","close","do","else","for","goto","halt","hang","if","job","kill","lock","merge","new","open","quit","read","set","tcommit","trollback","tstart","use","view","write","xecute","b","c","d","e","f","g","h","i","j","k","l","m","n","o","q","r","s","tc","tro","ts","u","v","w","x"],i=["\\$ascii","\\$char","\\$data","\\$ecode","\\$estack","\\$etrap","\\$extract","\\$find","\\$fnumber","\\$get","\\$horolog","\\$io","\\$increment","\\$job","\\$justify","\\$length","\\$name","\\$next","\\$order","\\$piece","\\$qlength","\\$qsubscript","\\$query","\\$quit","\\$random","\\$reverse","\\$select","\\$stack","\\$test","\\$text","\\$translate","\\$view","\\$x","\\$y","\\$a","\\$c","\\$d","\\$e","\\$ec","\\$es","\\$et","\\$f","\\$fn","\\$g","\\$h","\\$i","\\$j","\\$l","\\$n","\\$na","\\$o","\\$p","\\$q","\\$ql","\\$qs","\\$r","\\$re","\\$s","\\$st","\\$t","\\$tr","\\$v","\\$z"],j=a(i),k=a(h);return{startState:function(){return{label:!1,commandMode:0}},token:function(a,c){var d=b(a,c);return c.label?"tag":d}}})),a.defineMIME("text/x-mumps","mumps")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/nginx/nginx.js b/core/media/editors/codemirror/mode/nginx/nginx.js
new file mode 100644
index 00000000..00a32249
--- /dev/null
+++ b/core/media/editors/codemirror/mode/nginx/nginx.js
@@ -0,0 +1,178 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("nginx", function(config) {
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var keywords = words(
+    /* ngxDirectiveControl */ "break return rewrite set" +
+    /* ngxDirective */ " accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23"
+    );
+
+  var keywords_block = words(
+    /* ngxDirectiveBlock */ "http mail events server types location upstream charset_map limit_except if geo map"
+    );
+
+  var keywords_important = words(
+    /* ngxDirectiveImportant */ "include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files"
+    );
+
+  var indentUnit = config.indentUnit, type;
+  function ret(style, tp) {type = tp; return style;}
+
+  function tokenBase(stream, state) {
+
+
+    stream.eatWhile(/[\w\$_]/);
+
+    var cur = stream.current();
+
+
+    if (keywords.propertyIsEnumerable(cur)) {
+      return "keyword";
+    }
+    else if (keywords_block.propertyIsEnumerable(cur)) {
+      return "variable-2";
+    }
+    else if (keywords_important.propertyIsEnumerable(cur)) {
+      return "string-2";
+    }
+    /**/
+
+    var ch = stream.next();
+    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
+    else if (ch == "/" && stream.eat("*")) {
+      state.tokenize = tokenCComment;
+      return tokenCComment(stream, state);
+    }
+    else if (ch == "<" && stream.eat("!")) {
+      state.tokenize = tokenSGMLComment;
+      return tokenSGMLComment(stream, state);
+    }
+    else if (ch == "=") ret(null, "compare");
+    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
+    else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    else if (ch == "#") {
+      stream.skipToEnd();
+      return ret("comment", "comment");
+    }
+    else if (ch == "!") {
+      stream.match(/^\s*\w*/);
+      return ret("keyword", "important");
+    }
+    else if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w.%]/);
+      return ret("number", "unit");
+    }
+    else if (/[,.+>*\/]/.test(ch)) {
+      return ret(null, "select-op");
+    }
+    else if (/[;{}:\[\]]/.test(ch)) {
+      return ret(null, ch);
+    }
+    else {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("variable", "variable");
+    }
+  }
+
+  function tokenCComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "/") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenSGMLComment(stream, state) {
+    var dashes = 0, ch;
+    while ((ch = stream.next()) != null) {
+      if (dashes >= 2 && ch == ">") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      dashes = (ch == "-") ? dashes + 1 : 0;
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped)
+          break;
+        escaped = !escaped && ch == "\\";
+      }
+      if (!escaped) state.tokenize = tokenBase;
+      return ret("string", "string");
+    };
+  }
+
+  return {
+    startState: function(base) {
+      return {tokenize: tokenBase,
+              baseIndent: base || 0,
+              stack: []};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      type = null;
+      var style = state.tokenize(stream, state);
+
+      var context = state.stack[state.stack.length-1];
+      if (type == "hash" && context == "rule") style = "atom";
+      else if (style == "variable") {
+        if (context == "rule") style = "number";
+        else if (!context || context == "@media{") style = "tag";
+      }
+
+      if (context == "rule" && /^[\{\};]$/.test(type))
+        state.stack.pop();
+      if (type == "{") {
+        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
+        else state.stack.push("{");
+      }
+      else if (type == "}") state.stack.pop();
+      else if (type == "@media") state.stack.push("@media");
+      else if (context == "{" && type != "comment") state.stack.push("rule");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var n = state.stack.length;
+      if (/^\}/.test(textAfter))
+        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
+      return state.baseIndent + n * indentUnit;
+    },
+
+    electricChars: "}"
+  };
+});
+
+CodeMirror.defineMIME("text/x-nginx-conf", "nginx");
+
+});
diff --git a/core/media/editors/codemirror/mode/nginx/nginx.min.js b/core/media/editors/codemirror/mode/nginx/nginx.min.js
new file mode 100644
index 00000000..6ecec6e8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/nginx/nginx.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("nginx",(function(a){function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(a,b){return h=b,a}function d(a,b){a.eatWhile(/[\w\$_]/);var d=a.current();if(i.propertyIsEnumerable(d))return"keyword";if(j.propertyIsEnumerable(d))return"variable-2";if(k.propertyIsEnumerable(d))return"string-2";var h=a.next();return"@"==h?(a.eatWhile(/[\w\\\-]/),c("meta",a.current())):"/"==h&&a.eat("*")?(b.tokenize=e,e(a,b)):"<"==h&&a.eat("!")?(b.tokenize=f,f(a,b)):"="!=h?"~"!=h&&"|"!=h||!a.eat("=")?'"'==h||"'"==h?(b.tokenize=g(h),b.tokenize(a,b)):"#"==h?(a.skipToEnd(),c("comment","comment")):"!"==h?(a.match(/^\s*\w*/),c("keyword","important")):/\d/.test(h)?(a.eatWhile(/[\w.%]/),c("number","unit")):/[,.+>*\/]/.test(h)?c(null,"select-op"):/[;{}:\[\]]/.test(h)?c(null,h):(a.eatWhile(/[\w\\\-]/),c("variable","variable")):c(null,"compare"):void c(null,"compare")}function e(a,b){for(var e,f=!1;null!=(e=a.next());){if(f&&"/"==e){b.tokenize=d;break}f="*"==e}return c("comment","comment")}function f(a,b){for(var e,f=0;null!=(e=a.next());){if(f>=2&&">"==e){b.tokenize=d;break}f="-"==e?f+1:0}return c("comment","comment")}function g(a){return function(b,e){for(var f,g=!1;null!=(f=b.next())&&(f!=a||g);)g=!g&&"\\"==f;return g||(e.tokenize=d),c("string","string")}}var h,i=b("break return rewrite set accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23"),j=b("http mail events server types location upstream charset_map limit_except if geo map"),k=b("include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files"),l=a.indentUnit;return{startState:function(a){return{tokenize:d,baseIndent:a||0,stack:[]}},token:function(a,b){if(a.eatSpace())return null;h=null;var c=b.tokenize(a,b),d=b.stack[b.stack.length-1];return"hash"==h&&"rule"==d?c="atom":"variable"==c&&("rule"==d?c="number":d&&"@media{"!=d||(c="tag")),"rule"==d&&/^[\{\};]$/.test(h)&&b.stack.pop(),"{"==h?"@media"==d?b.stack[b.stack.length-1]="@media{":b.stack.push("{"):"}"==h?b.stack.pop():"@media"==h?b.stack.push("@media"):"{"==d&&"comment"!=h&&b.stack.push("rule"),c},indent:function(a,b){var c=a.stack.length;return/^\}/.test(b)&&(c-="rule"==a.stack[a.stack.length-1]?2:1),a.baseIndent+c*l},electricChars:"}"}})),a.defineMIME("text/x-nginx-conf","nginx")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/nsis/nsis.js b/core/media/editors/codemirror/mode/nsis/nsis.js
new file mode 100644
index 00000000..69bc9507
--- /dev/null
+++ b/core/media/editors/codemirror/mode/nsis/nsis.js
@@ -0,0 +1,95 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Author: Jan T. Sott (http://github.com/idleberg)
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineSimpleMode("nsis",{
+  start:[
+    // Numbers
+    {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+
+    // Strings
+    { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+    { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
+    { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
+
+    // Compile Time Commands
+    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+
+    // Conditional Compilation
+    {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
+    {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+
+    // Runtime Commands
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+    {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
+
+    // Command Options
+    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+
+    // LogicLib.nsh
+    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
+
+    // FileFunc.nsh
+    {regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/, token: "variable-2", dedent: true},
+
+    // Memento.nsh
+    {regex: /\$\{(?:Memento(?:Section(?:Done|End|Restore|Save)?|UnselectedSection))\}/, token: "variable-2", dedent: true},
+
+    // TextFunc.nsh
+    {regex: /\$\{(?:Config(?:Read|ReadS|Write|WriteS)|File(?:Join|ReadFromEnd|Recode)|Line(?:Find|Read|Sum)|Text(?:Compare|CompareS)|TrimNewLines)\}/, token: "variable-2", dedent: true},
+
+    // WinVer.nsh
+    {regex: /\$\{(?:(?:At(?:Least|Most)|Is)(?:ServicePack|Win(?:7|8|10|95|98|200(?:0|3|8(?:R2)?)|ME|NT4|Vista|XP))|Is(?:NT|Server))\}/, token: "variable", dedent: true},
+
+    // WordFunc.nsh
+    {regex: /\$\{(?:StrFilterS?|Version(?:Compare|Convert)|Word(?:AddS?|Find(?:(?:2|3)X)?S?|InsertS?|ReplaceS?))\}/, token: "variable-2", dedent: true},
+
+    // x64.nsh
+    {regex: /\$\{(?:RunningX64)\}/, token: "variable", dedent: true},
+    {regex: /\$\{(?:Disable|Enable)X64FSRedirection\}/, token: "variable-2", dedent: true},
+
+    // Line Comment
+    {regex: /(#|;).*/, token: "comment"},
+
+    // Block Comment
+    {regex: /\/\*/, token: "comment", next: "comment"},
+
+    // Operator
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+
+    // Variable
+    {regex: /\$\w+/, token: "variable"},
+
+    // Constant
+    {regex: /\${[\w\.:-]+}/, token: "variable-2"},
+
+    // Language String
+    {regex: /\$\([\w\.:-]+\)/, token: "variable-3"}
+  ],
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  meta: {
+    electricInput: /^\s*((Function|PageEx|Section|Section(Group)?)End|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: ["#", ";"]
+  }
+});
+
+CodeMirror.defineMIME("text/x-nsis", "nsis");
+});
diff --git a/core/media/editors/codemirror/mode/nsis/nsis.min.js b/core/media/editors/codemirror/mode/nsis/nsis.min.js
new file mode 100644
index 00000000..d7a1291a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/nsis/nsis.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("nsis",{start:[{regex:/(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/,token:"number"},{regex:/"(?:[^\\"]|\\.)*"?/,token:"string"},{regex:/'(?:[^\\']|\\.)*'?/,token:"string"},{regex:/`(?:[^\\`]|\\.)*`?/,token:"string"},{regex:/^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/,token:"keyword"},{regex:/^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/,token:"keyword",indent:!0},{regex:/^\s*(?:\!(else|endif|macroend))\b/,token:"keyword",dedent:!0},{regex:/^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/,token:"keyword"},{regex:/^\s*(?:Function|PageEx|Section(?:Group)?)\b/,token:"keyword",indent:!0},{regex:/^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/,token:"keyword",dedent:!0},{regex:/\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/,token:"atom"},{regex:/\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/,token:"builtin"},{regex:/\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/,token:"variable-2",indent:!0},{regex:/\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/,token:"variable-2",dedent:!0},{regex:/\$\{(?:Memento(?:Section(?:Done|End|Restore|Save)?|UnselectedSection))\}/,token:"variable-2",dedent:!0},{regex:/\$\{(?:Config(?:Read|ReadS|Write|WriteS)|File(?:Join|ReadFromEnd|Recode)|Line(?:Find|Read|Sum)|Text(?:Compare|CompareS)|TrimNewLines)\}/,token:"variable-2",dedent:!0},{regex:/\$\{(?:(?:At(?:Least|Most)|Is)(?:ServicePack|Win(?:7|8|10|95|98|200(?:0|3|8(?:R2)?)|ME|NT4|Vista|XP))|Is(?:NT|Server))\}/,token:"variable",dedent:!0},{regex:/\$\{(?:StrFilterS?|Version(?:Compare|Convert)|Word(?:AddS?|Find(?:(?:2|3)X)?S?|InsertS?|ReplaceS?))\}/,token:"variable-2",dedent:!0},{regex:/\$\{(?:RunningX64)\}/,token:"variable",dedent:!0},{regex:/\$\{(?:Disable|Enable)X64FSRedirection\}/,token:"variable-2",dedent:!0},{regex:/(#|;).*/,token:"comment"},{regex:/\/\*/,token:"comment",next:"comment"},{regex:/[-+\/*=<>!]+/,token:"operator"},{regex:/\$\w+/,token:"variable"},{regex:/\${[\w\.:-]+}/,token:"variable-2"},{regex:/\$\([\w\.:-]+\)/,token:"variable-3"}],comment:[{regex:/.*?\*\//,token:"comment",next:"start"},{regex:/.*/,token:"comment"}],meta:{electricInput:/^\s*((Function|PageEx|Section|Section(Group)?)End|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:["#",";"]}}),a.defineMIME("text/x-nsis","nsis")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ntriples/ntriples.js b/core/media/editors/codemirror/mode/ntriples/ntriples.js
new file mode 100644
index 00000000..148272e1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ntriples/ntriples.js
@@ -0,0 +1,195 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**********************************************************
+* This script provides syntax highlighting support for
+* the N-Triples format.
+* N-Triples format specification:
+*     https://www.w3.org/TR/n-triples/
+***********************************************************/
+
+/*
+    The following expression defines the defined ASF grammar transitions.
+
+    pre_subject ->
+        {
+        ( writing_subject_uri | writing_bnode_uri )
+            -> pre_predicate
+                -> writing_predicate_uri
+                    -> pre_object
+                        -> writing_object_uri | writing_object_bnode |
+                          (
+                            writing_object_literal
+                                -> writing_literal_lang | writing_literal_type
+                          )
+                            -> post_object
+                                -> BEGIN
+         } otherwise {
+             -> ERROR
+         }
+*/
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("ntriples", function() {
+
+  var Location = {
+    PRE_SUBJECT         : 0,
+    WRITING_SUB_URI     : 1,
+    WRITING_BNODE_URI   : 2,
+    PRE_PRED            : 3,
+    WRITING_PRED_URI    : 4,
+    PRE_OBJ             : 5,
+    WRITING_OBJ_URI     : 6,
+    WRITING_OBJ_BNODE   : 7,
+    WRITING_OBJ_LITERAL : 8,
+    WRITING_LIT_LANG    : 9,
+    WRITING_LIT_TYPE    : 10,
+    POST_OBJ            : 11,
+    ERROR               : 12
+  };
+  function transitState(currState, c) {
+    var currLocation = currState.location;
+    var ret;
+
+    // Opening.
+    if     (currLocation == Location.PRE_SUBJECT && c == '<') ret = Location.WRITING_SUB_URI;
+    else if(currLocation == Location.PRE_SUBJECT && c == '_') ret = Location.WRITING_BNODE_URI;
+    else if(currLocation == Location.PRE_PRED    && c == '<') ret = Location.WRITING_PRED_URI;
+    else if(currLocation == Location.PRE_OBJ     && c == '<') ret = Location.WRITING_OBJ_URI;
+    else if(currLocation == Location.PRE_OBJ     && c == '_') ret = Location.WRITING_OBJ_BNODE;
+    else if(currLocation == Location.PRE_OBJ     && c == '"') ret = Location.WRITING_OBJ_LITERAL;
+
+    // Closing.
+    else if(currLocation == Location.WRITING_SUB_URI     && c == '>') ret = Location.PRE_PRED;
+    else if(currLocation == Location.WRITING_BNODE_URI   && c == ' ') ret = Location.PRE_PRED;
+    else if(currLocation == Location.WRITING_PRED_URI    && c == '>') ret = Location.PRE_OBJ;
+    else if(currLocation == Location.WRITING_OBJ_URI     && c == '>') ret = Location.POST_OBJ;
+    else if(currLocation == Location.WRITING_OBJ_BNODE   && c == ' ') ret = Location.POST_OBJ;
+    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '"') ret = Location.POST_OBJ;
+    else if(currLocation == Location.WRITING_LIT_LANG && c == ' ') ret = Location.POST_OBJ;
+    else if(currLocation == Location.WRITING_LIT_TYPE && c == '>') ret = Location.POST_OBJ;
+
+    // Closing typed and language literal.
+    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '@') ret = Location.WRITING_LIT_LANG;
+    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '^') ret = Location.WRITING_LIT_TYPE;
+
+    // Spaces.
+    else if( c == ' ' &&
+             (
+               currLocation == Location.PRE_SUBJECT ||
+               currLocation == Location.PRE_PRED    ||
+               currLocation == Location.PRE_OBJ     ||
+               currLocation == Location.POST_OBJ
+             )
+           ) ret = currLocation;
+
+    // Reset.
+    else if(currLocation == Location.POST_OBJ && c == '.') ret = Location.PRE_SUBJECT;
+
+    // Error
+    else ret = Location.ERROR;
+
+    currState.location=ret;
+  }
+
+  return {
+    startState: function() {
+       return {
+           location : Location.PRE_SUBJECT,
+           uris     : [],
+           anchors  : [],
+           bnodes   : [],
+           langs    : [],
+           types    : []
+       };
+    },
+    token: function(stream, state) {
+      var ch = stream.next();
+      if(ch == '<') {
+         transitState(state, ch);
+         var parsedURI = '';
+         stream.eatWhile( function(c) { if( c != '#' && c != '>' ) { parsedURI += c; return true; } return false;} );
+         state.uris.push(parsedURI);
+         if( stream.match('#', false) ) return 'variable';
+         stream.next();
+         transitState(state, '>');
+         return 'variable';
+      }
+      if(ch == '#') {
+        var parsedAnchor = '';
+        stream.eatWhile(function(c) { if(c != '>' && c != ' ') { parsedAnchor+= c; return true; } return false;});
+        state.anchors.push(parsedAnchor);
+        return 'variable-2';
+      }
+      if(ch == '>') {
+          transitState(state, '>');
+          return 'variable';
+      }
+      if(ch == '_') {
+          transitState(state, ch);
+          var parsedBNode = '';
+          stream.eatWhile(function(c) { if( c != ' ' ) { parsedBNode += c; return true; } return false;});
+          state.bnodes.push(parsedBNode);
+          stream.next();
+          transitState(state, ' ');
+          return 'builtin';
+      }
+      if(ch == '"') {
+          transitState(state, ch);
+          stream.eatWhile( function(c) { return c != '"'; } );
+          stream.next();
+          if( stream.peek() != '@' && stream.peek() != '^' ) {
+              transitState(state, '"');
+          }
+          return 'string';
+      }
+      if( ch == '@' ) {
+          transitState(state, '@');
+          var parsedLang = '';
+          stream.eatWhile(function(c) { if( c != ' ' ) { parsedLang += c; return true; } return false;});
+          state.langs.push(parsedLang);
+          stream.next();
+          transitState(state, ' ');
+          return 'string-2';
+      }
+      if( ch == '^' ) {
+          stream.next();
+          transitState(state, '^');
+          var parsedType = '';
+          stream.eatWhile(function(c) { if( c != '>' ) { parsedType += c; return true; } return false;} );
+          state.types.push(parsedType);
+          stream.next();
+          transitState(state, '>');
+          return 'variable';
+      }
+      if( ch == ' ' ) {
+          transitState(state, ch);
+      }
+      if( ch == '.' ) {
+          transitState(state, ch);
+      }
+    }
+  };
+});
+
+// define the registered Media Type for n-triples:
+// https://www.w3.org/TR/n-triples/#n-triples-mediatype
+CodeMirror.defineMIME("application/n-triples", "ntriples");
+
+// N-Quads is based on the N-Triples format (so same highlighting works)
+// https://www.w3.org/TR/n-quads/
+CodeMirror.defineMIME("application/n-quads", "ntriples");
+
+// previously used, though technically incorrect media type for n-triples
+CodeMirror.defineMIME("text/n-triples", "ntriples");
+
+});
diff --git a/core/media/editors/codemirror/mode/ntriples/ntriples.min.js b/core/media/editors/codemirror/mode/ntriples/ntriples.min.js
new file mode 100644
index 00000000..5362d5da
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ntriples/ntriples.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("ntriples",(function(){function a(a,c){var d,e=a.location;d=e==b.PRE_SUBJECT&&"<"==c?b.WRITING_SUB_URI:e==b.PRE_SUBJECT&&"_"==c?b.WRITING_BNODE_URI:e==b.PRE_PRED&&"<"==c?b.WRITING_PRED_URI:e==b.PRE_OBJ&&"<"==c?b.WRITING_OBJ_URI:e==b.PRE_OBJ&&"_"==c?b.WRITING_OBJ_BNODE:e==b.PRE_OBJ&&'"'==c?b.WRITING_OBJ_LITERAL:e==b.WRITING_SUB_URI&&">"==c?b.PRE_PRED:e==b.WRITING_BNODE_URI&&" "==c?b.PRE_PRED:e==b.WRITING_PRED_URI&&">"==c?b.PRE_OBJ:e==b.WRITING_OBJ_URI&&">"==c?b.POST_OBJ:e==b.WRITING_OBJ_BNODE&&" "==c?b.POST_OBJ:e==b.WRITING_OBJ_LITERAL&&'"'==c?b.POST_OBJ:e==b.WRITING_LIT_LANG&&" "==c?b.POST_OBJ:e==b.WRITING_LIT_TYPE&&">"==c?b.POST_OBJ:e==b.WRITING_OBJ_LITERAL&&"@"==c?b.WRITING_LIT_LANG:e==b.WRITING_OBJ_LITERAL&&"^"==c?b.WRITING_LIT_TYPE:" "!=c||e!=b.PRE_SUBJECT&&e!=b.PRE_PRED&&e!=b.PRE_OBJ&&e!=b.POST_OBJ?e==b.POST_OBJ&&"."==c?b.PRE_SUBJECT:b.ERROR:e,a.location=d}var b={PRE_SUBJECT:0,WRITING_SUB_URI:1,WRITING_BNODE_URI:2,PRE_PRED:3,WRITING_PRED_URI:4,PRE_OBJ:5,WRITING_OBJ_URI:6,WRITING_OBJ_BNODE:7,WRITING_OBJ_LITERAL:8,WRITING_LIT_LANG:9,WRITING_LIT_TYPE:10,POST_OBJ:11,ERROR:12};return{startState:function(){return{location:b.PRE_SUBJECT,uris:[],anchors:[],bnodes:[],langs:[],types:[]}},token:function(b,c){var d=b.next();if("<"==d){a(c,d);var e="";return b.eatWhile((function(a){return"#"!=a&&">"!=a&&(e+=a,!0)})),c.uris.push(e),b.match("#",!1)?"variable":(b.next(),a(c,">"),"variable")}if("#"==d){var f="";return b.eatWhile((function(a){return">"!=a&&" "!=a&&(f+=a,!0)})),c.anchors.push(f),"variable-2"}if(">"==d)return a(c,">"),"variable";if("_"==d){a(c,d);var g="";return b.eatWhile((function(a){return" "!=a&&(g+=a,!0)})),c.bnodes.push(g),b.next(),a(c," "),"builtin"}if('"'==d)return a(c,d),b.eatWhile((function(a){return'"'!=a})),b.next(),"@"!=b.peek()&&"^"!=b.peek()&&a(c,'"'),"string";if("@"==d){a(c,"@");var h="";return b.eatWhile((function(a){return" "!=a&&(h+=a,!0)})),c.langs.push(h),b.next(),a(c," "),"string-2"}if("^"==d){b.next(),a(c,"^");var i="";return b.eatWhile((function(a){return">"!=a&&(i+=a,!0)})),c.types.push(i),b.next(),a(c,">"),"variable"}" "==d&&a(c,d),"."==d&&a(c,d)}}})),a.defineMIME("application/n-triples","ntriples"),a.defineMIME("application/n-quads","ntriples"),a.defineMIME("text/n-triples","ntriples")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/octave/octave.js b/core/media/editors/codemirror/mode/octave/octave.js
new file mode 100644
index 00000000..b77ad682
--- /dev/null
+++ b/core/media/editors/codemirror/mode/octave/octave.js
@@ -0,0 +1,139 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("octave", function() {
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
+  var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
+  var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
+  var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
+  var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
+  var expressionEnd = new RegExp("^[\\]\\)]");
+  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
+
+  var builtins = wordRegexp([
+    'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
+    'cosh', 'exp', 'log', 'prod', 'sum', 'log10', 'max', 'min', 'sign', 'sin', 'sinh',
+    'sqrt', 'tan', 'reshape', 'break', 'zeros', 'default', 'margin', 'round', 'ones',
+    'rand', 'syn', 'ceil', 'floor', 'size', 'clear', 'zeros', 'eye', 'mean', 'std', 'cov',
+    'det', 'eig', 'inv', 'norm', 'rank', 'trace', 'expm', 'logm', 'sqrtm', 'linspace', 'plot',
+    'title', 'xlabel', 'ylabel', 'legend', 'text', 'grid', 'meshgrid', 'mesh', 'num2str',
+    'fft', 'ifft', 'arrayfun', 'cellfun', 'input', 'fliplr', 'flipud', 'ismember'
+  ]);
+
+  var keywords = wordRegexp([
+    'return', 'case', 'switch', 'else', 'elseif', 'end', 'endif', 'endfunction',
+    'if', 'otherwise', 'do', 'for', 'while', 'try', 'catch', 'classdef', 'properties', 'events',
+    'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'sprintf', 'disp', 'until',
+    'continue', 'pkg'
+  ]);
+
+
+  // tokenizers
+  function tokenTranspose(stream, state) {
+    if (!stream.sol() && stream.peek() === '\'') {
+      stream.next();
+      state.tokenize = tokenBase;
+      return 'operator';
+    }
+    state.tokenize = tokenBase;
+    return tokenBase(stream, state);
+  }
+
+
+  function tokenComment(stream, state) {
+    if (stream.match(/^.*%}/)) {
+      state.tokenize = tokenBase;
+      return 'comment';
+    };
+    stream.skipToEnd();
+    return 'comment';
+  }
+
+  function tokenBase(stream, state) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match('%{')){
+      state.tokenize = tokenComment;
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    if (stream.match(/^[%#]/)){
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+[ij]?/)) {
+        stream.tokenize = tokenBase;
+        return 'number'; };
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
+    }
+    if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
+
+    // Handle Strings
+    var m = stream.match(/^"(?:[^"]|"")*("|$)/) || stream.match(/^'(?:[^']|'')*('|$)/)
+    if (m) { return m[1] ? 'string' : "string error"; }
+
+    // Handle words
+    if (stream.match(keywords)) { return 'keyword'; } ;
+    if (stream.match(builtins)) { return 'builtin'; } ;
+    if (stream.match(identifiers)) { return 'variable'; } ;
+
+    if (stream.match(singleOperators) || stream.match(doubleOperators)) { return 'operator'; };
+    if (stream.match(singleDelimiters) || stream.match(doubleDelimiters) || stream.match(tripleDelimiters)) { return null; };
+
+    if (stream.match(expressionEnd)) {
+      state.tokenize = tokenTranspose;
+      return null;
+    };
+
+
+    // Handle non-detected items
+    stream.next();
+    return 'error';
+  };
+
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize(stream, state);
+      if (style === 'number' || style === 'variable'){
+        state.tokenize = tokenTranspose;
+      }
+      return style;
+    },
+
+    lineComment: '%',
+
+    fold: 'indent'
+  };
+});
+
+CodeMirror.defineMIME("text/x-octave", "octave");
+
+});
diff --git a/core/media/editors/codemirror/mode/octave/octave.min.js b/core/media/editors/codemirror/mode/octave/octave.min.js
new file mode 100644
index 00000000..9da64f4e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/octave/octave.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("octave",(function(){function a(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function b(a,b){return a.sol()||"'"!==a.peek()?(b.tokenize=d,d(a,b)):(a.next(),b.tokenize=d,"operator")}function c(a,b){return a.match(/^.*%}/)?(b.tokenize=d,"comment"):(a.skipToEnd(),"comment")}function d(n,o){if(n.eatSpace())return null;if(n.match("%{"))return o.tokenize=c,n.skipToEnd(),"comment";if(n.match(/^[%#]/))return n.skipToEnd(),"comment";if(n.match(/^[0-9\.+-]/,!1)){if(n.match(/^[+-]?0x[0-9a-fA-F]+[ij]?/))return n.tokenize=d,"number";if(n.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?[ij]?/))return"number";if(n.match(/^[+-]?\d+([EeDd][+-]?\d+)?[ij]?/))return"number"}if(n.match(a(["nan","NaN","inf","Inf"])))return"number";var p=n.match(/^"(?:[^"]|"")*("|$)/)||n.match(/^'(?:[^']|'')*('|$)/);return p?p[1]?"string":"string error":n.match(m)?"keyword":n.match(l)?"builtin":n.match(k)?"variable":n.match(e)||n.match(g)?"operator":n.match(f)||n.match(h)||n.match(i)?null:n.match(j)?(o.tokenize=b,null):(n.next(),"error")}var e=new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]"),f=new RegExp("^[\\(\\[\\{\\},:=;]"),g=new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))"),h=new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))"),i=new RegExp("^((>>=)|(<<=))"),j=new RegExp("^[\\]\\)]"),k=new RegExp("^[_A-Za-z¡-￿][_A-Za-z0-9¡-￿]*"),l=a(["error","eval","function","abs","acos","atan","asin","cos","cosh","exp","log","prod","sum","log10","max","min","sign","sin","sinh","sqrt","tan","reshape","break","zeros","default","margin","round","ones","rand","syn","ceil","floor","size","clear","zeros","eye","mean","std","cov","det","eig","inv","norm","rank","trace","expm","logm","sqrtm","linspace","plot","title","xlabel","ylabel","legend","text","grid","meshgrid","mesh","num2str","fft","ifft","arrayfun","cellfun","input","fliplr","flipud","ismember"]),m=a(["return","case","switch","else","elseif","end","endif","endfunction","if","otherwise","do","for","while","try","catch","classdef","properties","events","methods","global","persistent","endfor","endwhile","printf","sprintf","disp","until","continue","pkg"]);return{startState:function(){return{tokenize:d}},token:function(a,c){var d=c.tokenize(a,c);return"number"!==d&&"variable"!==d||(c.tokenize=b),d},lineComment:"%",fold:"indent"}})),a.defineMIME("text/x-octave","octave")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/oz/oz.js b/core/media/editors/codemirror/mode/oz/oz.js
new file mode 100644
index 00000000..50ffda37
--- /dev/null
+++ b/core/media/editors/codemirror/mode/oz/oz.js
@@ -0,0 +1,252 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("oz", function (conf) {
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var singleOperators = /[\^@!\|<>#~\.\*\-\+\\/,=]/;
+  var doubleOperators = /(<-)|(:=)|(=<)|(>=)|(<=)|(<:)|(>:)|(=:)|(\\=)|(\\=:)|(!!)|(==)|(::)/;
+  var tripleOperators = /(:::)|(\.\.\.)|(=<:)|(>=:)/;
+
+  var middle = ["in", "then", "else", "of", "elseof", "elsecase", "elseif", "catch",
+    "finally", "with", "require", "prepare", "import", "export", "define", "do"];
+  var end = ["end"];
+
+  var atoms = wordRegexp(["true", "false", "nil", "unit"]);
+  var commonKeywords = wordRegexp(["andthen", "at", "attr", "declare", "feat", "from", "lex",
+    "mod", "div", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
+  var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
+    "choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
+  var middleKeywords = wordRegexp(middle);
+  var endKeywords = wordRegexp(end);
+
+  // Tokenizers
+  function tokenBase(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    // Brackets
+    if(stream.match(/[{}]/)) {
+      return "bracket";
+    }
+
+    // Special [] keyword
+    if (stream.match(/(\[])/)) {
+        return "keyword"
+    }
+
+    // Operators
+    if (stream.match(tripleOperators) || stream.match(doubleOperators)) {
+      return "operator";
+    }
+
+    // Atoms
+    if(stream.match(atoms)) {
+      return 'atom';
+    }
+
+    // Opening keywords
+    var matched = stream.match(openingKeywords);
+    if (matched) {
+      if (!state.doInCurrentLine)
+        state.currentIndent++;
+      else
+        state.doInCurrentLine = false;
+
+      // Special matching for signatures
+      if(matched[0] == "proc" || matched[0] == "fun")
+        state.tokenize = tokenFunProc;
+      else if(matched[0] == "class")
+        state.tokenize = tokenClass;
+      else if(matched[0] == "meth")
+        state.tokenize = tokenMeth;
+
+      return 'keyword';
+    }
+
+    // Middle and other keywords
+    if (stream.match(middleKeywords) || stream.match(commonKeywords)) {
+      return "keyword"
+    }
+
+    // End keywords
+    if (stream.match(endKeywords)) {
+      state.currentIndent--;
+      return 'keyword';
+    }
+
+    // Eat the next char for next comparisons
+    var ch = stream.next();
+
+    // Strings
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+
+    // Numbers
+    if (/[~\d]/.test(ch)) {
+      if (ch == "~") {
+        if(! /^[0-9]/.test(stream.peek()))
+          return null;
+        else if (( stream.next() == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) || stream.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))
+          return "number";
+      }
+
+      if ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) || stream.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))
+        return "number";
+
+      return null;
+    }
+
+    // Comments
+    if (ch == "%") {
+      stream.skipToEnd();
+      return 'comment';
+    }
+    else if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+    }
+
+    // Single operators
+    if(singleOperators.test(ch)) {
+      return "operator";
+    }
+
+    // If nothing match, we skip the entire alphanumerical block
+    stream.eatWhile(/\w/);
+
+    return "variable";
+  }
+
+  function tokenClass(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+    stream.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)/);
+    state.tokenize = tokenBase;
+    return "variable-3"
+  }
+
+  function tokenMeth(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+    stream.match(/([a-zA-Z][A-Za-z0-9_]*)|(`.+`)/);
+    state.tokenize = tokenBase;
+    return "def"
+  }
+
+  function tokenFunProc(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    if(!state.hasPassedFirstStage && stream.eat("{")) {
+      state.hasPassedFirstStage = true;
+      return "bracket";
+    }
+    else if(state.hasPassedFirstStage) {
+      stream.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)|\$/);
+      state.hasPassedFirstStage = false;
+      state.tokenize = tokenBase;
+      return "def"
+    }
+    else {
+      state.tokenize = tokenBase;
+      return null;
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function tokenString(quote) {
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          end = true;
+          break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped)
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  function buildElectricInputRegEx() {
+    // Reindentation should occur on [] or on a match of any of
+    // the block closing keywords, at the end of a line.
+    var allClosings = middle.concat(end);
+    return new RegExp("[\\[\\]]|(" + allClosings.join("|") + ")$");
+  }
+
+  return {
+
+    startState: function () {
+      return {
+        tokenize: tokenBase,
+        currentIndent: 0,
+        doInCurrentLine: false,
+        hasPassedFirstStage: false
+      };
+    },
+
+    token: function (stream, state) {
+      if (stream.sol())
+        state.doInCurrentLine = 0;
+
+      return state.tokenize(stream, state);
+    },
+
+    indent: function (state, textAfter) {
+      var trueText = textAfter.replace(/^\s+|\s+$/g, '');
+
+      if (trueText.match(endKeywords) || trueText.match(middleKeywords) || trueText.match(/(\[])/))
+        return conf.indentUnit * (state.currentIndent - 1);
+
+      if (state.currentIndent < 0)
+        return 0;
+
+      return state.currentIndent * conf.indentUnit;
+    },
+    fold: "indent",
+    electricInput: buildElectricInputRegEx(),
+    lineComment: "%",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
+  };
+});
+
+CodeMirror.defineMIME("text/x-oz", "oz");
+
+});
diff --git a/core/media/editors/codemirror/mode/oz/oz.min.js b/core/media/editors/codemirror/mode/oz/oz.min.js
new file mode 100644
index 00000000..b7d42a39
--- /dev/null
+++ b/core/media/editors/codemirror/mode/oz/oz.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("oz",(function(a){function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a,b){if(a.eatSpace())return null;if(a.match(/[{}]/))return"bracket";if(a.match(/(\[])/))return"keyword";if(a.match(l)||a.match(k))return"operator";if(a.match(o))return"atom";var c=a.match(q);if(c)return b.doInCurrentLine?b.doInCurrentLine=!1:b.currentIndent++,"proc"==c[0]||"fun"==c[0]?b.tokenize=f:"class"==c[0]?b.tokenize=d:"meth"==c[0]&&(b.tokenize=e),"keyword";if(a.match(r)||a.match(p))return"keyword";if(a.match(s))return b.currentIndent--,"keyword";var i=a.next();if('"'==i||"'"==i)return b.tokenize=h(i),b.tokenize(a,b);if(/[~\d]/.test(i)){if("~"==i){if(!/^[0-9]/.test(a.peek()))return null;if("0"==a.next()&&a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))return"number"}return"0"==i&&a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/)?"number":null}return"%"==i?(a.skipToEnd(),"comment"):"/"==i&&a.eat("*")?(b.tokenize=g,g(a,b)):j.test(i)?"operator":(a.eatWhile(/\w/),"variable")}function d(a,b){return a.eatSpace()?null:(a.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)/),b.tokenize=c,"variable-3")}function e(a,b){return a.eatSpace()?null:(a.match(/([a-zA-Z][A-Za-z0-9_]*)|(`.+`)/),b.tokenize=c,"def")}function f(a,b){return a.eatSpace()?null:!b.hasPassedFirstStage&&a.eat("{")?(b.hasPassedFirstStage=!0,"bracket"):b.hasPassedFirstStage?(a.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)|\$/),b.hasPassedFirstStage=!1,b.tokenize=c,"def"):(b.tokenize=c,null)}function g(a,b){for(var d,e=!1;d=a.next();){if("/"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function h(a){return function(b,d){for(var e,f=!1,g=!1;null!=(e=b.next());){if(e==a&&!f){g=!0;break}f=!f&&"\\"==e}return!g&&f||(d.tokenize=c),"string"}}function i(){var a=m.concat(n);return new RegExp("[\\[\\]]|("+a.join("|")+")$")}var j=/[\^@!\|<>#~\.\*\-\+\\\/,=]/,k=/(<-)|(:=)|(=<)|(>=)|(<=)|(<:)|(>:)|(=:)|(\\=)|(\\=:)|(!!)|(==)|(::)/,l=/(:::)|(\.\.\.)|(=<:)|(>=:)/,m=["in","then","else","of","elseof","elsecase","elseif","catch","finally","with","require","prepare","import","export","define","do"],n=["end"],o=b(["true","false","nil","unit"]),p=b(["andthen","at","attr","declare","feat","from","lex","mod","div","mode","orelse","parser","prod","prop","scanner","self","syn","token"]),q=b(["local","proc","fun","case","class","if","cond","or","dis","choice","not","thread","try","raise","lock","for","suchthat","meth","functor"]),r=b(m),s=b(n);return{startState:function(){return{tokenize:c,currentIndent:0,doInCurrentLine:!1,hasPassedFirstStage:!1}},token:function(a,b){return a.sol()&&(b.doInCurrentLine=0),b.tokenize(a,b)},indent:function(b,c){var d=c.replace(/^\s+|\s+$/g,"");return d.match(s)||d.match(r)||d.match(/(\[])/)?a.indentUnit*(b.currentIndent-1):b.currentIndent<0?0:b.currentIndent*a.indentUnit},fold:"indent",electricInput:i(),lineComment:"%",blockCommentStart:"/*",blockCommentEnd:"*/"}})),a.defineMIME("text/x-oz","oz")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/pascal/pascal.js b/core/media/editors/codemirror/mode/pascal/pascal.js
new file mode 100644
index 00000000..2d0c3d42
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pascal/pascal.js
@@ -0,0 +1,109 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("pascal", function() {
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+  var keywords = words("and array begin case const div do downto else end file for forward integer " +
+                       "boolean char function goto if in label mod nil not of or packed procedure " +
+                       "program record repeat set string then to type until var while with");
+  var atoms = {"null": true};
+
+  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == "#" && state.startOfLine) {
+      stream.skipToEnd();
+      return "meta";
+    }
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (ch == "(" && stream.eat("*")) {
+      state.tokenize = tokenComment;
+      return tokenComment(stream, state);
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    if (ch == "/") {
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    var cur = stream.current();
+    if (keywords.propertyIsEnumerable(cur)) return "keyword";
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped) state.tokenize = null;
+      return "string";
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == ")" && maybeEnd) {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  // Interface
+
+  return {
+    startState: function() {
+      return {tokenize: null};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      return style;
+    },
+
+    electricChars: "{}"
+  };
+});
+
+CodeMirror.defineMIME("text/x-pascal", "pascal");
+
+});
diff --git a/core/media/editors/codemirror/mode/pascal/pascal.min.js b/core/media/editors/codemirror/mode/pascal/pascal.min.js
new file mode 100644
index 00000000..78d3eeb8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pascal/pascal.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("pascal",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b){var h=a.next();if("#"==h&&b.startOfLine)return a.skipToEnd(),"meta";if('"'==h||"'"==h)return b.tokenize=c(h),b.tokenize(a,b);if("("==h&&a.eat("*"))return b.tokenize=d,d(a,b);if(/[\[\]{}\(\),;\:\.]/.test(h))return null;if(/\d/.test(h))return a.eatWhile(/[\w\.]/),"number";if("/"==h&&a.eat("/"))return a.skipToEnd(),"comment";if(g.test(h))return a.eatWhile(g),"operator";a.eatWhile(/[\w\$_]/);var i=a.current();return e.propertyIsEnumerable(i)?"keyword":f.propertyIsEnumerable(i)?"atom":"variable"}function c(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){f=!0;break}e=!e&&"\\"==d}return!f&&e||(c.tokenize=null),"string"}}function d(a,b){for(var c,d=!1;c=a.next();){if(")"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}var e=a("and array begin case const div do downto else end file for forward integer boolean char function goto if in label mod nil not of or packed procedure program record repeat set string then to type until var while with"),f={null:!0},g=/[+\-*&%=<>!?|\/]/;return{startState:function(){return{tokenize:null}},token:function(a,c){if(a.eatSpace())return null;var d=(c.tokenize||b)(a,c);return"comment"==d||"meta"==d?d:d},electricChars:"{}"}})),a.defineMIME("text/x-pascal","pascal")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/pegjs/pegjs.js b/core/media/editors/codemirror/mode/pegjs/pegjs.js
new file mode 100644
index 00000000..6c720746
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pegjs/pegjs.js
@@ -0,0 +1,114 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../javascript/javascript"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../javascript/javascript"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("pegjs", function (config) {
+  var jsMode = CodeMirror.getMode(config, "javascript");
+
+  function identifier(stream) {
+    return stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/);
+  }
+
+  return {
+    startState: function () {
+      return {
+        inString: false,
+        stringType: null,
+        inComment: false,
+        inCharacterClass: false,
+        braced: 0,
+        lhs: true,
+        localState: null
+      };
+    },
+    token: function (stream, state) {
+      if (stream)
+
+      //check for state changes
+      if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+        state.stringType = stream.peek();
+        stream.next(); // Skip quote
+        state.inString = true; // Update state
+      }
+      if (!state.inString && !state.inComment && stream.match(/^\/\*/)) {
+        state.inComment = true;
+      }
+
+      //return state
+      if (state.inString) {
+        while (state.inString && !stream.eol()) {
+          if (stream.peek() === state.stringType) {
+            stream.next(); // Skip quote
+            state.inString = false; // Clear flag
+          } else if (stream.peek() === '\\') {
+            stream.next();
+            stream.next();
+          } else {
+            stream.match(/^.[^\\\"\']*/);
+          }
+        }
+        return state.lhs ? "property string" : "string"; // Token style
+      } else if (state.inComment) {
+        while (state.inComment && !stream.eol()) {
+          if (stream.match(/\*\//)) {
+            state.inComment = false; // Clear flag
+          } else {
+            stream.match(/^.[^\*]*/);
+          }
+        }
+        return "comment";
+      } else if (state.inCharacterClass) {
+          while (state.inCharacterClass && !stream.eol()) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+              state.inCharacterClass = false;
+            }
+          }
+      } else if (stream.peek() === '[') {
+        stream.next();
+        state.inCharacterClass = true;
+        return 'bracket';
+      } else if (stream.match(/^\/\//)) {
+        stream.skipToEnd();
+        return "comment";
+      } else if (state.braced || stream.peek() === '{') {
+        if (state.localState === null) {
+          state.localState = CodeMirror.startState(jsMode);
+        }
+        var token = jsMode.token(stream, state.localState);
+        var text = stream.current();
+        if (!token) {
+          for (var i = 0; i < text.length; i++) {
+            if (text[i] === '{') {
+              state.braced++;
+            } else if (text[i] === '}') {
+              state.braced--;
+            }
+          };
+        }
+        return token;
+      } else if (identifier(stream)) {
+        if (stream.peek() === ':') {
+          return 'variable';
+        }
+        return 'variable-2';
+      } else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) {
+        stream.next();
+        return 'bracket';
+      } else if (!stream.eatSpace()) {
+        stream.next();
+      }
+      return null;
+    }
+  };
+}, "javascript");
+
+});
diff --git a/core/media/editors/codemirror/mode/pegjs/pegjs.min.js b/core/media/editors/codemirror/mode/pegjs/pegjs.min.js
new file mode 100644
index 00000000..e34a542e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pegjs/pegjs.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../javascript/javascript")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../javascript/javascript"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("pegjs",(function(b){function c(a){return a.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)}var d=a.getMode(b,"javascript");return{startState:function(){return{inString:!1,stringType:null,inComment:!1,inCharacterClass:!1,braced:0,lhs:!0,localState:null}},token:function(b,e){if(b&&(e.inString||e.inComment||'"'!=b.peek()&&"'"!=b.peek()||(e.stringType=b.peek(),b.next(),e.inString=!0)),e.inString||e.inComment||!b.match(/^\/\*/)||(e.inComment=!0),e.inString){for(;e.inString&&!b.eol();)b.peek()===e.stringType?(b.next(),e.inString=!1):"\\"===b.peek()?(b.next(),b.next()):b.match(/^.[^\\\"\']*/);return e.lhs?"property string":"string"}if(e.inComment){for(;e.inComment&&!b.eol();)b.match(/\*\//)?e.inComment=!1:b.match(/^.[^\*]*/);return"comment"}if(e.inCharacterClass)for(;e.inCharacterClass&&!b.eol();)b.match(/^[^\]\\]+/)||b.match(/^\\./)||(e.inCharacterClass=!1);else{if("["===b.peek())return b.next(),e.inCharacterClass=!0,"bracket";if(b.match(/^\/\//))return b.skipToEnd(),"comment";if(e.braced||"{"===b.peek()){null===e.localState&&(e.localState=a.startState(d));var f=d.token(b,e.localState),g=b.current();if(!f)for(var h=0;h<g.length;h++)"{"===g[h]?e.braced++:"}"===g[h]&&e.braced--;return f}if(c(b))return":"===b.peek()?"variable":"variable-2";if(["[","]","(",")"].indexOf(b.peek())!=-1)return b.next(),"bracket";b.eatSpace()||b.next()}return null}}}),"javascript")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/perl/perl.js b/core/media/editors/codemirror/mode/perl/perl.js
new file mode 100644
index 00000000..66e4ed03
--- /dev/null
+++ b/core/media/editors/codemirror/mode/perl/perl.js
@@ -0,0 +1,837 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
+// This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("perl",function(){
+        // http://perldoc.perl.org
+        var PERL={                                      //   null - magic touch
+                                                        //   1 - keyword
+                                                        //   2 - def
+                                                        //   3 - atom
+                                                        //   4 - operator
+                                                        //   5 - variable-2 (predefined)
+                                                        //   [x,y] - x=1,2,3; y=must be defined if x{...}
+                                                //      PERL operators
+                '->'                            :   4,
+                '++'                            :   4,
+                '--'                            :   4,
+                '**'                            :   4,
+                                                        //   ! ~ \ and unary + and -
+                '=~'                            :   4,
+                '!~'                            :   4,
+                '*'                             :   4,
+                '/'                             :   4,
+                '%'                             :   4,
+                'x'                             :   4,
+                '+'                             :   4,
+                '-'                             :   4,
+                '.'                             :   4,
+                '<<'                            :   4,
+                '>>'                            :   4,
+                                                        //   named unary operators
+                '<'                             :   4,
+                '>'                             :   4,
+                '<='                            :   4,
+                '>='                            :   4,
+                'lt'                            :   4,
+                'gt'                            :   4,
+                'le'                            :   4,
+                'ge'                            :   4,
+                '=='                            :   4,
+                '!='                            :   4,
+                '<=>'                           :   4,
+                'eq'                            :   4,
+                'ne'                            :   4,
+                'cmp'                           :   4,
+                '~~'                            :   4,
+                '&'                             :   4,
+                '|'                             :   4,
+                '^'                             :   4,
+                '&&'                            :   4,
+                '||'                            :   4,
+                '//'                            :   4,
+                '..'                            :   4,
+                '...'                           :   4,
+                '?'                             :   4,
+                ':'                             :   4,
+                '='                             :   4,
+                '+='                            :   4,
+                '-='                            :   4,
+                '*='                            :   4,  //   etc. ???
+                ','                             :   4,
+                '=>'                            :   4,
+                '::'                            :   4,
+                                                        //   list operators (rightward)
+                'not'                           :   4,
+                'and'                           :   4,
+                'or'                            :   4,
+                'xor'                           :   4,
+                                                //      PERL predefined variables (I know, what this is a paranoid idea, but may be needed for people, who learn PERL, and for me as well, ...and may be for you?;)
+                'BEGIN'                         :   [5,1],
+                'END'                           :   [5,1],
+                'PRINT'                         :   [5,1],
+                'PRINTF'                        :   [5,1],
+                'GETC'                          :   [5,1],
+                'READ'                          :   [5,1],
+                'READLINE'                      :   [5,1],
+                'DESTROY'                       :   [5,1],
+                'TIE'                           :   [5,1],
+                'TIEHANDLE'                     :   [5,1],
+                'UNTIE'                         :   [5,1],
+                'STDIN'                         :    5,
+                'STDIN_TOP'                     :    5,
+                'STDOUT'                        :    5,
+                'STDOUT_TOP'                    :    5,
+                'STDERR'                        :    5,
+                'STDERR_TOP'                    :    5,
+                '$ARG'                          :    5,
+                '$_'                            :    5,
+                '@ARG'                          :    5,
+                '@_'                            :    5,
+                '$LIST_SEPARATOR'               :    5,
+                '$"'                            :    5,
+                '$PROCESS_ID'                   :    5,
+                '$PID'                          :    5,
+                '$$'                            :    5,
+                '$REAL_GROUP_ID'                :    5,
+                '$GID'                          :    5,
+                '$('                            :    5,
+                '$EFFECTIVE_GROUP_ID'           :    5,
+                '$EGID'                         :    5,
+                '$)'                            :    5,
+                '$PROGRAM_NAME'                 :    5,
+                '$0'                            :    5,
+                '$SUBSCRIPT_SEPARATOR'          :    5,
+                '$SUBSEP'                       :    5,
+                '$;'                            :    5,
+                '$REAL_USER_ID'                 :    5,
+                '$UID'                          :    5,
+                '$<'                            :    5,
+                '$EFFECTIVE_USER_ID'            :    5,
+                '$EUID'                         :    5,
+                '$>'                            :    5,
+                '$a'                            :    5,
+                '$b'                            :    5,
+                '$COMPILING'                    :    5,
+                '$^C'                           :    5,
+                '$DEBUGGING'                    :    5,
+                '$^D'                           :    5,
+                '${^ENCODING}'                  :    5,
+                '$ENV'                          :    5,
+                '%ENV'                          :    5,
+                '$SYSTEM_FD_MAX'                :    5,
+                '$^F'                           :    5,
+                '@F'                            :    5,
+                '${^GLOBAL_PHASE}'              :    5,
+                '$^H'                           :    5,
+                '%^H'                           :    5,
+                '@INC'                          :    5,
+                '%INC'                          :    5,
+                '$INPLACE_EDIT'                 :    5,
+                '$^I'                           :    5,
+                '$^M'                           :    5,
+                '$OSNAME'                       :    5,
+                '$^O'                           :    5,
+                '${^OPEN}'                      :    5,
+                '$PERLDB'                       :    5,
+                '$^P'                           :    5,
+                '$SIG'                          :    5,
+                '%SIG'                          :    5,
+                '$BASETIME'                     :    5,
+                '$^T'                           :    5,
+                '${^TAINT}'                     :    5,
+                '${^UNICODE}'                   :    5,
+                '${^UTF8CACHE}'                 :    5,
+                '${^UTF8LOCALE}'                :    5,
+                '$PERL_VERSION'                 :    5,
+                '$^V'                           :    5,
+                '${^WIN32_SLOPPY_STAT}'         :    5,
+                '$EXECUTABLE_NAME'              :    5,
+                '$^X'                           :    5,
+                '$1'                            :    5, // - regexp $1, $2...
+                '$MATCH'                        :    5,
+                '$&'                            :    5,
+                '${^MATCH}'                     :    5,
+                '$PREMATCH'                     :    5,
+                '$`'                            :    5,
+                '${^PREMATCH}'                  :    5,
+                '$POSTMATCH'                    :    5,
+                "$'"                            :    5,
+                '${^POSTMATCH}'                 :    5,
+                '$LAST_PAREN_MATCH'             :    5,
+                '$+'                            :    5,
+                '$LAST_SUBMATCH_RESULT'         :    5,
+                '$^N'                           :    5,
+                '@LAST_MATCH_END'               :    5,
+                '@+'                            :    5,
+                '%LAST_PAREN_MATCH'             :    5,
+                '%+'                            :    5,
+                '@LAST_MATCH_START'             :    5,
+                '@-'                            :    5,
+                '%LAST_MATCH_START'             :    5,
+                '%-'                            :    5,
+                '$LAST_REGEXP_CODE_RESULT'      :    5,
+                '$^R'                           :    5,
+                '${^RE_DEBUG_FLAGS}'            :    5,
+                '${^RE_TRIE_MAXBUF}'            :    5,
+                '$ARGV'                         :    5,
+                '@ARGV'                         :    5,
+                'ARGV'                          :    5,
+                'ARGVOUT'                       :    5,
+                '$OUTPUT_FIELD_SEPARATOR'       :    5,
+                '$OFS'                          :    5,
+                '$,'                            :    5,
+                '$INPUT_LINE_NUMBER'            :    5,
+                '$NR'                           :    5,
+                '$.'                            :    5,
+                '$INPUT_RECORD_SEPARATOR'       :    5,
+                '$RS'                           :    5,
+                '$/'                            :    5,
+                '$OUTPUT_RECORD_SEPARATOR'      :    5,
+                '$ORS'                          :    5,
+                '$\\'                           :    5,
+                '$OUTPUT_AUTOFLUSH'             :    5,
+                '$|'                            :    5,
+                '$ACCUMULATOR'                  :    5,
+                '$^A'                           :    5,
+                '$FORMAT_FORMFEED'              :    5,
+                '$^L'                           :    5,
+                '$FORMAT_PAGE_NUMBER'           :    5,
+                '$%'                            :    5,
+                '$FORMAT_LINES_LEFT'            :    5,
+                '$-'                            :    5,
+                '$FORMAT_LINE_BREAK_CHARACTERS' :    5,
+                '$:'                            :    5,
+                '$FORMAT_LINES_PER_PAGE'        :    5,
+                '$='                            :    5,
+                '$FORMAT_TOP_NAME'              :    5,
+                '$^'                            :    5,
+                '$FORMAT_NAME'                  :    5,
+                '$~'                            :    5,
+                '${^CHILD_ERROR_NATIVE}'        :    5,
+                '$EXTENDED_OS_ERROR'            :    5,
+                '$^E'                           :    5,
+                '$EXCEPTIONS_BEING_CAUGHT'      :    5,
+                '$^S'                           :    5,
+                '$WARNING'                      :    5,
+                '$^W'                           :    5,
+                '${^WARNING_BITS}'              :    5,
+                '$OS_ERROR'                     :    5,
+                '$ERRNO'                        :    5,
+                '$!'                            :    5,
+                '%OS_ERROR'                     :    5,
+                '%ERRNO'                        :    5,
+                '%!'                            :    5,
+                '$CHILD_ERROR'                  :    5,
+                '$?'                            :    5,
+                '$EVAL_ERROR'                   :    5,
+                '$@'                            :    5,
+                '$OFMT'                         :    5,
+                '$#'                            :    5,
+                '$*'                            :    5,
+                '$ARRAY_BASE'                   :    5,
+                '$['                            :    5,
+                '$OLD_PERL_VERSION'             :    5,
+                '$]'                            :    5,
+                                                //      PERL blocks
+                'if'                            :[1,1],
+                elsif                           :[1,1],
+                'else'                          :[1,1],
+                'while'                         :[1,1],
+                unless                          :[1,1],
+                'for'                           :[1,1],
+                foreach                         :[1,1],
+                                                //      PERL functions
+                'abs'                           :1,     // - absolute value function
+                accept                          :1,     // - accept an incoming socket connect
+                alarm                           :1,     // - schedule a SIGALRM
+                'atan2'                         :1,     // - arctangent of Y/X in the range -PI to PI
+                bind                            :1,     // - binds an address to a socket
+                binmode                         :1,     // - prepare binary files for I/O
+                bless                           :1,     // - create an object
+                bootstrap                       :1,     //
+                'break'                         :1,     // - break out of a "given" block
+                caller                          :1,     // - get context of the current subroutine call
+                chdir                           :1,     // - change your current working directory
+                chmod                           :1,     // - changes the permissions on a list of files
+                chomp                           :1,     // - remove a trailing record separator from a string
+                chop                            :1,     // - remove the last character from a string
+                chown                           :1,     // - change the ownership on a list of files
+                chr                             :1,     // - get character this number represents
+                chroot                          :1,     // - make directory new root for path lookups
+                close                           :1,     // - close file (or pipe or socket) handle
+                closedir                        :1,     // - close directory handle
+                connect                         :1,     // - connect to a remote socket
+                'continue'                      :[1,1], // - optional trailing block in a while or foreach
+                'cos'                           :1,     // - cosine function
+                crypt                           :1,     // - one-way passwd-style encryption
+                dbmclose                        :1,     // - breaks binding on a tied dbm file
+                dbmopen                         :1,     // - create binding on a tied dbm file
+                'default'                       :1,     //
+                defined                         :1,     // - test whether a value, variable, or function is defined
+                'delete'                        :1,     // - deletes a value from a hash
+                die                             :1,     // - raise an exception or bail out
+                'do'                            :1,     // - turn a BLOCK into a TERM
+                dump                            :1,     // - create an immediate core dump
+                each                            :1,     // - retrieve the next key/value pair from a hash
+                endgrent                        :1,     // - be done using group file
+                endhostent                      :1,     // - be done using hosts file
+                endnetent                       :1,     // - be done using networks file
+                endprotoent                     :1,     // - be done using protocols file
+                endpwent                        :1,     // - be done using passwd file
+                endservent                      :1,     // - be done using services file
+                eof                             :1,     // - test a filehandle for its end
+                'eval'                          :1,     // - catch exceptions or compile and run code
+                'exec'                          :1,     // - abandon this program to run another
+                exists                          :1,     // - test whether a hash key is present
+                exit                            :1,     // - terminate this program
+                'exp'                           :1,     // - raise I to a power
+                fcntl                           :1,     // - file control system call
+                fileno                          :1,     // - return file descriptor from filehandle
+                flock                           :1,     // - lock an entire file with an advisory lock
+                fork                            :1,     // - create a new process just like this one
+                format                          :1,     // - declare a picture format with use by the write() function
+                formline                        :1,     // - internal function used for formats
+                getc                            :1,     // - get the next character from the filehandle
+                getgrent                        :1,     // - get next group record
+                getgrgid                        :1,     // - get group record given group user ID
+                getgrnam                        :1,     // - get group record given group name
+                gethostbyaddr                   :1,     // - get host record given its address
+                gethostbyname                   :1,     // - get host record given name
+                gethostent                      :1,     // - get next hosts record
+                getlogin                        :1,     // - return who logged in at this tty
+                getnetbyaddr                    :1,     // - get network record given its address
+                getnetbyname                    :1,     // - get networks record given name
+                getnetent                       :1,     // - get next networks record
+                getpeername                     :1,     // - find the other end of a socket connection
+                getpgrp                         :1,     // - get process group
+                getppid                         :1,     // - get parent process ID
+                getpriority                     :1,     // - get current nice value
+                getprotobyname                  :1,     // - get protocol record given name
+                getprotobynumber                :1,     // - get protocol record numeric protocol
+                getprotoent                     :1,     // - get next protocols record
+                getpwent                        :1,     // - get next passwd record
+                getpwnam                        :1,     // - get passwd record given user login name
+                getpwuid                        :1,     // - get passwd record given user ID
+                getservbyname                   :1,     // - get services record given its name
+                getservbyport                   :1,     // - get services record given numeric port
+                getservent                      :1,     // - get next services record
+                getsockname                     :1,     // - retrieve the sockaddr for a given socket
+                getsockopt                      :1,     // - get socket options on a given socket
+                given                           :1,     //
+                glob                            :1,     // - expand filenames using wildcards
+                gmtime                          :1,     // - convert UNIX time into record or string using Greenwich time
+                'goto'                          :1,     // - create spaghetti code
+                grep                            :1,     // - locate elements in a list test true against a given criterion
+                hex                             :1,     // - convert a string to a hexadecimal number
+                'import'                        :1,     // - patch a module's namespace into your own
+                index                           :1,     // - find a substring within a string
+                'int'                           :1,     // - get the integer portion of a number
+                ioctl                           :1,     // - system-dependent device control system call
+                'join'                          :1,     // - join a list into a string using a separator
+                keys                            :1,     // - retrieve list of indices from a hash
+                kill                            :1,     // - send a signal to a process or process group
+                last                            :1,     // - exit a block prematurely
+                lc                              :1,     // - return lower-case version of a string
+                lcfirst                         :1,     // - return a string with just the next letter in lower case
+                length                          :1,     // - return the number of bytes in a string
+                'link'                          :1,     // - create a hard link in the filesytem
+                listen                          :1,     // - register your socket as a server
+                local                           : 2,    // - create a temporary value for a global variable (dynamic scoping)
+                localtime                       :1,     // - convert UNIX time into record or string using local time
+                lock                            :1,     // - get a thread lock on a variable, subroutine, or method
+                'log'                           :1,     // - retrieve the natural logarithm for a number
+                lstat                           :1,     // - stat a symbolic link
+                m                               :null,  // - match a string with a regular expression pattern
+                map                             :1,     // - apply a change to a list to get back a new list with the changes
+                mkdir                           :1,     // - create a directory
+                msgctl                          :1,     // - SysV IPC message control operations
+                msgget                          :1,     // - get SysV IPC message queue
+                msgrcv                          :1,     // - receive a SysV IPC message from a message queue
+                msgsnd                          :1,     // - send a SysV IPC message to a message queue
+                my                              : 2,    // - declare and assign a local variable (lexical scoping)
+                'new'                           :1,     //
+                next                            :1,     // - iterate a block prematurely
+                no                              :1,     // - unimport some module symbols or semantics at compile time
+                oct                             :1,     // - convert a string to an octal number
+                open                            :1,     // - open a file, pipe, or descriptor
+                opendir                         :1,     // - open a directory
+                ord                             :1,     // - find a character's numeric representation
+                our                             : 2,    // - declare and assign a package variable (lexical scoping)
+                pack                            :1,     // - convert a list into a binary representation
+                'package'                       :1,     // - declare a separate global namespace
+                pipe                            :1,     // - open a pair of connected filehandles
+                pop                             :1,     // - remove the last element from an array and return it
+                pos                             :1,     // - find or set the offset for the last/next m//g search
+                print                           :1,     // - output a list to a filehandle
+                printf                          :1,     // - output a formatted list to a filehandle
+                prototype                       :1,     // - get the prototype (if any) of a subroutine
+                push                            :1,     // - append one or more elements to an array
+                q                               :null,  // - singly quote a string
+                qq                              :null,  // - doubly quote a string
+                qr                              :null,  // - Compile pattern
+                quotemeta                       :null,  // - quote regular expression magic characters
+                qw                              :null,  // - quote a list of words
+                qx                              :null,  // - backquote quote a string
+                rand                            :1,     // - retrieve the next pseudorandom number
+                read                            :1,     // - fixed-length buffered input from a filehandle
+                readdir                         :1,     // - get a directory from a directory handle
+                readline                        :1,     // - fetch a record from a file
+                readlink                        :1,     // - determine where a symbolic link is pointing
+                readpipe                        :1,     // - execute a system command and collect standard output
+                recv                            :1,     // - receive a message over a Socket
+                redo                            :1,     // - start this loop iteration over again
+                ref                             :1,     // - find out the type of thing being referenced
+                rename                          :1,     // - change a filename
+                require                         :1,     // - load in external functions from a library at runtime
+                reset                           :1,     // - clear all variables of a given name
+                'return'                        :1,     // - get out of a function early
+                reverse                         :1,     // - flip a string or a list
+                rewinddir                       :1,     // - reset directory handle
+                rindex                          :1,     // - right-to-left substring search
+                rmdir                           :1,     // - remove a directory
+                s                               :null,  // - replace a pattern with a string
+                say                             :1,     // - print with newline
+                scalar                          :1,     // - force a scalar context
+                seek                            :1,     // - reposition file pointer for random-access I/O
+                seekdir                         :1,     // - reposition directory pointer
+                select                          :1,     // - reset default output or do I/O multiplexing
+                semctl                          :1,     // - SysV semaphore control operations
+                semget                          :1,     // - get set of SysV semaphores
+                semop                           :1,     // - SysV semaphore operations
+                send                            :1,     // - send a message over a socket
+                setgrent                        :1,     // - prepare group file for use
+                sethostent                      :1,     // - prepare hosts file for use
+                setnetent                       :1,     // - prepare networks file for use
+                setpgrp                         :1,     // - set the process group of a process
+                setpriority                     :1,     // - set a process's nice value
+                setprotoent                     :1,     // - prepare protocols file for use
+                setpwent                        :1,     // - prepare passwd file for use
+                setservent                      :1,     // - prepare services file for use
+                setsockopt                      :1,     // - set some socket options
+                shift                           :1,     // - remove the first element of an array, and return it
+                shmctl                          :1,     // - SysV shared memory operations
+                shmget                          :1,     // - get SysV shared memory segment identifier
+                shmread                         :1,     // - read SysV shared memory
+                shmwrite                        :1,     // - write SysV shared memory
+                shutdown                        :1,     // - close down just half of a socket connection
+                'sin'                           :1,     // - return the sine of a number
+                sleep                           :1,     // - block for some number of seconds
+                socket                          :1,     // - create a socket
+                socketpair                      :1,     // - create a pair of sockets
+                'sort'                          :1,     // - sort a list of values
+                splice                          :1,     // - add or remove elements anywhere in an array
+                'split'                         :1,     // - split up a string using a regexp delimiter
+                sprintf                         :1,     // - formatted print into a string
+                'sqrt'                          :1,     // - square root function
+                srand                           :1,     // - seed the random number generator
+                stat                            :1,     // - get a file's status information
+                state                           :1,     // - declare and assign a state variable (persistent lexical scoping)
+                study                           :1,     // - optimize input data for repeated searches
+                'sub'                           :1,     // - declare a subroutine, possibly anonymously
+                'substr'                        :1,     // - get or alter a portion of a stirng
+                symlink                         :1,     // - create a symbolic link to a file
+                syscall                         :1,     // - execute an arbitrary system call
+                sysopen                         :1,     // - open a file, pipe, or descriptor
+                sysread                         :1,     // - fixed-length unbuffered input from a filehandle
+                sysseek                         :1,     // - position I/O pointer on handle used with sysread and syswrite
+                system                          :1,     // - run a separate program
+                syswrite                        :1,     // - fixed-length unbuffered output to a filehandle
+                tell                            :1,     // - get current seekpointer on a filehandle
+                telldir                         :1,     // - get current seekpointer on a directory handle
+                tie                             :1,     // - bind a variable to an object class
+                tied                            :1,     // - get a reference to the object underlying a tied variable
+                time                            :1,     // - return number of seconds since 1970
+                times                           :1,     // - return elapsed time for self and child processes
+                tr                              :null,  // - transliterate a string
+                truncate                        :1,     // - shorten a file
+                uc                              :1,     // - return upper-case version of a string
+                ucfirst                         :1,     // - return a string with just the next letter in upper case
+                umask                           :1,     // - set file creation mode mask
+                undef                           :1,     // - remove a variable or function definition
+                unlink                          :1,     // - remove one link to a file
+                unpack                          :1,     // - convert binary structure into normal perl variables
+                unshift                         :1,     // - prepend more elements to the beginning of a list
+                untie                           :1,     // - break a tie binding to a variable
+                use                             :1,     // - load in a module at compile time
+                utime                           :1,     // - set a file's last access and modify times
+                values                          :1,     // - return a list of the values in a hash
+                vec                             :1,     // - test or set particular bits in a string
+                wait                            :1,     // - wait for any child process to die
+                waitpid                         :1,     // - wait for a particular child process to die
+                wantarray                       :1,     // - get void vs scalar vs list context of current subroutine call
+                warn                            :1,     // - print debugging info
+                when                            :1,     //
+                write                           :1,     // - print a picture record
+                y                               :null}; // - transliterate a string
+
+        var RXstyle="string-2";
+        var RXmodifiers=/[goseximacplud]/;              // NOTE: "m", "s", "y" and "tr" need to correct real modifiers for each regexp type
+
+        function tokenChain(stream,state,chain,style,tail){     // NOTE: chain.length > 2 is not working now (it's for s[...][...]geos;)
+                state.chain=null;                               //                                                          12   3tail
+                state.style=null;
+                state.tail=null;
+                state.tokenize=function(stream,state){
+                        var e=false,c,i=0;
+                        while(c=stream.next()){
+                                if(c===chain[i]&&!e){
+                                        if(chain[++i]!==undefined){
+                                                state.chain=chain[i];
+                                                state.style=style;
+                                                state.tail=tail;}
+                                        else if(tail)
+                                                stream.eatWhile(tail);
+                                        state.tokenize=tokenPerl;
+                                        return style;}
+                                e=!e&&c=="\\";}
+                        return style;};
+                return state.tokenize(stream,state);}
+
+        function tokenSOMETHING(stream,state,string){
+                state.tokenize=function(stream,state){
+                        if(stream.string==string)
+                                state.tokenize=tokenPerl;
+                        stream.skipToEnd();
+                        return "string";};
+                return state.tokenize(stream,state);}
+
+        function tokenPerl(stream,state){
+                if(stream.eatSpace())
+                        return null;
+                if(state.chain)
+                        return tokenChain(stream,state,state.chain,state.style,state.tail);
+                if(stream.match(/^\-?[\d\.]/,false))
+                        if(stream.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/))
+                                return 'number';
+                if(stream.match(/^<<(?=\w)/)){                  // NOTE: <<SOMETHING\n...\nSOMETHING\n
+                        stream.eatWhile(/\w/);
+                        return tokenSOMETHING(stream,state,stream.current().substr(2));}
+                if(stream.sol()&&stream.match(/^\=item(?!\w)/)){// NOTE: \n=item...\n=cut\n
+                        return tokenSOMETHING(stream,state,'=cut');}
+                var ch=stream.next();
+                if(ch=='"'||ch=="'"){                           // NOTE: ' or " or <<'SOMETHING'\n...\nSOMETHING\n or <<"SOMETHING"\n...\nSOMETHING\n
+                        if(prefix(stream, 3)=="<<"+ch){
+                                var p=stream.pos;
+                                stream.eatWhile(/\w/);
+                                var n=stream.current().substr(1);
+                                if(n&&stream.eat(ch))
+                                        return tokenSOMETHING(stream,state,n);
+                                stream.pos=p;}
+                        return tokenChain(stream,state,[ch],"string");}
+                if(ch=="q"){
+                        var c=look(stream, -2);
+                        if(!(c&&/\w/.test(c))){
+                                c=look(stream, 0);
+                                if(c=="x"){
+                                        c=look(stream, 1);
+                                        if(c=="("){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
+                                        if(c=="["){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
+                                        if(c=="{"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
+                                        if(c=="<"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
+                                        if(/[\^'"!~\/]/.test(c)){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
+                                else if(c=="q"){
+                                        c=look(stream, 1);
+                                        if(c=="("){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[")"],"string");}
+                                        if(c=="["){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["]"],"string");}
+                                        if(c=="{"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["}"],"string");}
+                                        if(c=="<"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[">"],"string");}
+                                        if(/[\^'"!~\/]/.test(c)){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,[stream.eat(c)],"string");}}
+                                else if(c=="w"){
+                                        c=look(stream, 1);
+                                        if(c=="("){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[")"],"bracket");}
+                                        if(c=="["){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["]"],"bracket");}
+                                        if(c=="{"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["}"],"bracket");}
+                                        if(c=="<"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[">"],"bracket");}
+                                        if(/[\^'"!~\/]/.test(c)){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,[stream.eat(c)],"bracket");}}
+                                else if(c=="r"){
+                                        c=look(stream, 1);
+                                        if(c=="("){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
+                                        if(c=="["){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
+                                        if(c=="{"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
+                                        if(c=="<"){
+                                                eatSuffix(stream, 2);
+                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
+                                        if(/[\^'"!~\/]/.test(c)){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
+                                else if(/[\^'"!~\/(\[{<]/.test(c)){
+                                        if(c=="("){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,[")"],"string");}
+                                        if(c=="["){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,["]"],"string");}
+                                        if(c=="{"){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,["}"],"string");}
+                                        if(c=="<"){
+                                                eatSuffix(stream, 1);
+                                                return tokenChain(stream,state,[">"],"string");}
+                                        if(/[\^'"!~\/]/.test(c)){
+                                                return tokenChain(stream,state,[stream.eat(c)],"string");}}}}
+                if(ch=="m"){
+                        var c=look(stream, -2);
+                        if(!(c&&/\w/.test(c))){
+                                c=stream.eat(/[(\[{<\^'"!~\/]/);
+                                if(c){
+                                        if(/[\^'"!~\/]/.test(c)){
+                                                return tokenChain(stream,state,[c],RXstyle,RXmodifiers);}
+                                        if(c=="("){
+                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
+                                        if(c=="["){
+                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
+                                        if(c=="{"){
+                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
+                                        if(c=="<"){
+                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}}
+                if(ch=="s"){
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
+                        if(!c){
+                                c=stream.eat(/[(\[{<\^'"!~\/]/);
+                                if(c){
+                                        if(c=="[")
+                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
+                                        if(c=="{")
+                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
+                                        if(c=="<")
+                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
+                                        if(c=="(")
+                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
+                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
+                if(ch=="y"){
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
+                        if(!c){
+                                c=stream.eat(/[(\[{<\^'"!~\/]/);
+                                if(c){
+                                        if(c=="[")
+                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
+                                        if(c=="{")
+                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
+                                        if(c=="<")
+                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
+                                        if(c=="(")
+                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
+                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
+                if(ch=="t"){
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
+                        if(!c){
+                                c=stream.eat("r");if(c){
+                                c=stream.eat(/[(\[{<\^'"!~\/]/);
+                                if(c){
+                                        if(c=="[")
+                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
+                                        if(c=="{")
+                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
+                                        if(c=="<")
+                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
+                                        if(c=="(")
+                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
+                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}}
+                if(ch=="`"){
+                        return tokenChain(stream,state,[ch],"variable-2");}
+                if(ch=="/"){
+                        if(!/~\s*$/.test(prefix(stream)))
+                                return "operator";
+                        else
+                                return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);}
+                if(ch=="$"){
+                        var p=stream.pos;
+                        if(stream.eatWhile(/\d/)||stream.eat("{")&&stream.eatWhile(/\d/)&&stream.eat("}"))
+                                return "variable-2";
+                        else
+                                stream.pos=p;}
+                if(/[$@%]/.test(ch)){
+                        var p=stream.pos;
+                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(look(stream, -2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
+                                var c=stream.current();
+                                if(PERL[c])
+                                        return "variable-2";}
+                        stream.pos=p;}
+                if(/[$@%&]/.test(ch)){
+                        if(stream.eatWhile(/[\w$\[\]]/)||stream.eat("{")&&stream.eatWhile(/[\w$\[\]]/)&&stream.eat("}")){
+                                var c=stream.current();
+                                if(PERL[c])
+                                        return "variable-2";
+                                else
+                                        return "variable";}}
+                if(ch=="#"){
+                        if(look(stream, -2)!="$"){
+                                stream.skipToEnd();
+                                return "comment";}}
+                if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){
+                        var p=stream.pos;
+                        stream.eatWhile(/[:+\-\^*$&%@=<>!?|\/~\.]/);
+                        if(PERL[stream.current()])
+                                return "operator";
+                        else
+                                stream.pos=p;}
+                if(ch=="_"){
+                        if(stream.pos==1){
+                                if(suffix(stream, 6)=="_END__"){
+                                        return tokenChain(stream,state,['\0'],"comment");}
+                                else if(suffix(stream, 7)=="_DATA__"){
+                                        return tokenChain(stream,state,['\0'],"variable-2");}
+                                else if(suffix(stream, 7)=="_C__"){
+                                        return tokenChain(stream,state,['\0'],"string");}}}
+                if(/\w/.test(ch)){
+                        var p=stream.pos;
+                        if(look(stream, -2)=="{"&&(look(stream, 0)=="}"||stream.eatWhile(/\w/)&&look(stream, 0)=="}"))
+                                return "string";
+                        else
+                                stream.pos=p;}
+                if(/[A-Z]/.test(ch)){
+                        var l=look(stream, -2);
+                        var p=stream.pos;
+                        stream.eatWhile(/[A-Z_]/);
+                        if(/[\da-z]/.test(look(stream, 0))){
+                                stream.pos=p;}
+                        else{
+                                var c=PERL[stream.current()];
+                                if(!c)
+                                        return "meta";
+                                if(c[1])
+                                        c=c[0];
+                                if(l!=":"){
+                                        if(c==1)
+                                                return "keyword";
+                                        else if(c==2)
+                                                return "def";
+                                        else if(c==3)
+                                                return "atom";
+                                        else if(c==4)
+                                                return "operator";
+                                        else if(c==5)
+                                                return "variable-2";
+                                        else
+                                                return "meta";}
+                                else
+                                        return "meta";}}
+                if(/[a-zA-Z_]/.test(ch)){
+                        var l=look(stream, -2);
+                        stream.eatWhile(/\w/);
+                        var c=PERL[stream.current()];
+                        if(!c)
+                                return "meta";
+                        if(c[1])
+                                c=c[0];
+                        if(l!=":"){
+                                if(c==1)
+                                        return "keyword";
+                                else if(c==2)
+                                        return "def";
+                                else if(c==3)
+                                        return "atom";
+                                else if(c==4)
+                                        return "operator";
+                                else if(c==5)
+                                        return "variable-2";
+                                else
+                                        return "meta";}
+                        else
+                                return "meta";}
+                return null;}
+
+        return {
+            startState: function() {
+                return {
+                    tokenize: tokenPerl,
+                    chain: null,
+                    style: null,
+                    tail: null
+                };
+            },
+            token: function(stream, state) {
+                return (state.tokenize || tokenPerl)(stream, state);
+            },
+            lineComment: '#'
+        };
+});
+
+CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
+
+CodeMirror.defineMIME("text/x-perl", "perl");
+
+// it's like "peek", but need for look-ahead or look-behind if index < 0
+function look(stream, c){
+  return stream.string.charAt(stream.pos+(c||0));
+}
+
+// return a part of prefix of current stream from current position
+function prefix(stream, c){
+  if(c){
+    var x=stream.pos-c;
+    return stream.string.substr((x>=0?x:0),c);}
+  else{
+    return stream.string.substr(0,stream.pos-1);
+  }
+}
+
+// return a part of suffix of current stream from current position
+function suffix(stream, c){
+  var y=stream.string.length;
+  var x=y-stream.pos+1;
+  return stream.string.substr(stream.pos,(c&&c<y?c:x));
+}
+
+// eating and vomiting a part of stream from current position
+function eatSuffix(stream, c){
+  var x=stream.pos+c;
+  var y;
+  if(x<=0)
+    stream.pos=0;
+  else if(x>=(y=stream.string.length-1))
+    stream.pos=y;
+  else
+    stream.pos=x;
+}
+
+});
diff --git a/core/media/editors/codemirror/mode/perl/perl.min.js b/core/media/editors/codemirror/mode/perl/perl.min.js
new file mode 100644
index 00000000..361068d9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/perl/perl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){return a.string.charAt(a.pos+(b||0))}function c(a,b){if(b){var c=a.pos-b;return a.string.substr(c>=0?c:0,b)}return a.string.substr(0,a.pos-1)}function d(a,b){var c=a.string.length,d=c-a.pos+1;return a.string.substr(a.pos,b&&b<c?b:d)}function e(a,b){var c,d=a.pos+b;d<=0?a.pos=0:d>=(c=a.string.length-1)?a.pos=c:a.pos=d}a.defineMode("perl",(function(){function a(a,b,c,d,e){return b.chain=null,b.style=null,b.tail=null,b.tokenize=function(a,b){for(var f,h=!1,i=0;f=a.next();){if(f===c[i]&&!h)return void 0!==c[++i]?(b.chain=c[i],b.style=d,b.tail=e):e&&a.eatWhile(e),b.tokenize=g,d;h=!h&&"\\"==f}return d},b.tokenize(a,b)}function f(a,b,c){return b.tokenize=function(a,b){return a.string==c&&(b.tokenize=g),a.skipToEnd(),"string"},b.tokenize(a,b)}function g(g,k){if(g.eatSpace())return null;if(k.chain)return a(g,k,k.chain,k.style,k.tail);if(g.match(/^\-?[\d\.]/,!1)&&g.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/))return"number";if(g.match(/^<<(?=\w)/))return g.eatWhile(/\w/),f(g,k,g.current().substr(2));if(g.sol()&&g.match(/^\=item(?!\w)/))return f(g,k,"=cut");var l=g.next();if('"'==l||"'"==l){if(c(g,3)=="<<"+l){var m=g.pos;g.eatWhile(/\w/);var n=g.current().substr(1);if(n&&g.eat(l))return f(g,k,n);g.pos=m}return a(g,k,[l],"string")}if("q"==l){var o=b(g,-2);if(!o||!/\w/.test(o))if(o=b(g,0),"x"==o){if(o=b(g,1),"("==o)return e(g,2),a(g,k,[")"],i,j);if("["==o)return e(g,2),a(g,k,["]"],i,j);if("{"==o)return e(g,2),a(g,k,["}"],i,j);if("<"==o)return e(g,2),a(g,k,[">"],i,j);if(/[\^'"!~\/]/.test(o))return e(g,1),a(g,k,[g.eat(o)],i,j)}else if("q"==o){if(o=b(g,1),"("==o)return e(g,2),a(g,k,[")"],"string");if("["==o)return e(g,2),a(g,k,["]"],"string");if("{"==o)return e(g,2),a(g,k,["}"],"string");if("<"==o)return e(g,2),a(g,k,[">"],"string");if(/[\^'"!~\/]/.test(o))return e(g,1),a(g,k,[g.eat(o)],"string")}else if("w"==o){if(o=b(g,1),"("==o)return e(g,2),a(g,k,[")"],"bracket");if("["==o)return e(g,2),a(g,k,["]"],"bracket");if("{"==o)return e(g,2),a(g,k,["}"],"bracket");if("<"==o)return e(g,2),a(g,k,[">"],"bracket");if(/[\^'"!~\/]/.test(o))return e(g,1),a(g,k,[g.eat(o)],"bracket")}else if("r"==o){if(o=b(g,1),"("==o)return e(g,2),a(g,k,[")"],i,j);if("["==o)return e(g,2),a(g,k,["]"],i,j);if("{"==o)return e(g,2),a(g,k,["}"],i,j);if("<"==o)return e(g,2),a(g,k,[">"],i,j);if(/[\^'"!~\/]/.test(o))return e(g,1),a(g,k,[g.eat(o)],i,j)}else if(/[\^'"!~\/(\[{<]/.test(o)){if("("==o)return e(g,1),a(g,k,[")"],"string");if("["==o)return e(g,1),a(g,k,["]"],"string");if("{"==o)return e(g,1),a(g,k,["}"],"string");if("<"==o)return e(g,1),a(g,k,[">"],"string");if(/[\^'"!~\/]/.test(o))return a(g,k,[g.eat(o)],"string")}}if("m"==l){var o=b(g,-2);if((!o||!/\w/.test(o))&&(o=g.eat(/[(\[{<\^'"!~\/]/))){if(/[\^'"!~\/]/.test(o))return a(g,k,[o],i,j);if("("==o)return a(g,k,[")"],i,j);if("["==o)return a(g,k,["]"],i,j);if("{"==o)return a(g,k,["}"],i,j);if("<"==o)return a(g,k,[">"],i,j)}}if("s"==l){var o=/[\/>\]})\w]/.test(b(g,-2));if(!o&&(o=g.eat(/[(\[{<\^'"!~\/]/)))return"["==o?a(g,k,["]","]"],i,j):"{"==o?a(g,k,["}","}"],i,j):"<"==o?a(g,k,[">",">"],i,j):"("==o?a(g,k,[")",")"],i,j):a(g,k,[o,o],i,j)}if("y"==l){var o=/[\/>\]})\w]/.test(b(g,-2));if(!o&&(o=g.eat(/[(\[{<\^'"!~\/]/)))return"["==o?a(g,k,["]","]"],i,j):"{"==o?a(g,k,["}","}"],i,j):"<"==o?a(g,k,[">",">"],i,j):"("==o?a(g,k,[")",")"],i,j):a(g,k,[o,o],i,j)}if("t"==l){var o=/[\/>\]})\w]/.test(b(g,-2));if(!o&&(o=g.eat("r"),o&&(o=g.eat(/[(\[{<\^'"!~\/]/))))return"["==o?a(g,k,["]","]"],i,j):"{"==o?a(g,k,["}","}"],i,j):"<"==o?a(g,k,[">",">"],i,j):"("==o?a(g,k,[")",")"],i,j):a(g,k,[o,o],i,j)}if("`"==l)return a(g,k,[l],"variable-2");if("/"==l)return/~\s*$/.test(c(g))?a(g,k,[l],i,j):"operator";if("$"==l){var m=g.pos;if(g.eatWhile(/\d/)||g.eat("{")&&g.eatWhile(/\d/)&&g.eat("}"))return"variable-2";g.pos=m}if(/[$@%]/.test(l)){var m=g.pos;if(g.eat("^")&&g.eat(/[A-Z]/)||!/[@$%&]/.test(b(g,-2))&&g.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){var o=g.current();if(h[o])return"variable-2"}g.pos=m}if(/[$@%&]/.test(l)&&(g.eatWhile(/[\w$\[\]]/)||g.eat("{")&&g.eatWhile(/[\w$\[\]]/)&&g.eat("}"))){var o=g.current();return h[o]?"variable-2":"variable"}if("#"==l&&"$"!=b(g,-2))return g.skipToEnd(),"comment";if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(l)){var m=g.pos;if(g.eatWhile(/[:+\-\^*$&%@=<>!?|\/~\.]/),h[g.current()])return"operator";g.pos=m}if("_"==l&&1==g.pos){if("_END__"==d(g,6))return a(g,k,["\0"],"comment");if("_DATA__"==d(g,7))return a(g,k,["\0"],"variable-2");if("_C__"==d(g,7))return a(g,k,["\0"],"string")}if(/\w/.test(l)){var m=g.pos;if("{"==b(g,-2)&&("}"==b(g,0)||g.eatWhile(/\w/)&&"}"==b(g,0)))return"string";g.pos=m}if(/[A-Z]/.test(l)){var p=b(g,-2),m=g.pos;if(g.eatWhile(/[A-Z_]/),!/[\da-z]/.test(b(g,0))){var o=h[g.current()];return o?(o[1]&&(o=o[0]),":"!=p?1==o?"keyword":2==o?"def":3==o?"atom":4==o?"operator":5==o?"variable-2":"meta":"meta"):"meta"}g.pos=m}if(/[a-zA-Z_]/.test(l)){var p=b(g,-2);g.eatWhile(/\w/);var o=h[g.current()];return o?(o[1]&&(o=o[0]),":"!=p?1==o?"keyword":2==o?"def":3==o?"atom":4==o?"operator":5==o?"variable-2":"meta":"meta"):"meta"}return null}var h={"->":4,"++":4,"--":4,"**":4,"=~":4,"!~":4,"*":4,"/":4,"%":4,x:4,"+":4,"-":4,".":4,"<<":4,">>":4,"<":4,">":4,"<=":4,">=":4,lt:4,gt:4,le:4,ge:4,"==":4,"!=":4,"<=>":4,eq:4,ne:4,cmp:4,"~~":4,"&":4,"|":4,"^":4,"&&":4,"||":4,"//":4,"..":4,"...":4,"?":4,":":4,"=":4,"+=":4,"-=":4,"*=":4,",":4,"=>":4,"::":4,not:4,and:4,or:4,xor:4,BEGIN:[5,1],END:[5,1],PRINT:[5,1],PRINTF:[5,1],GETC:[5,1],READ:[5,1],READLINE:[5,1],DESTROY:[5,1],TIE:[5,1],TIEHANDLE:[5,1],UNTIE:[5,1],STDIN:5,STDIN_TOP:5,STDOUT:5,STDOUT_TOP:5,STDERR:5,STDERR_TOP:5,$ARG:5,$_:5,"@ARG":5,"@_":5,$LIST_SEPARATOR:5,'$"':5,$PROCESS_ID:5,$PID:5,$$:5,$REAL_GROUP_ID:5,$GID:5,"$(":5,$EFFECTIVE_GROUP_ID:5,$EGID:5,"$)":5,$PROGRAM_NAME:5,$0:5,$SUBSCRIPT_SEPARATOR:5,$SUBSEP:5,"$;":5,$REAL_USER_ID:5,$UID:5,"$<":5,$EFFECTIVE_USER_ID:5,$EUID:5,"$>":5,$a:5,$b:5,$COMPILING:5,"$^C":5,$DEBUGGING:5,"$^D":5,"${^ENCODING}":5,$ENV:5,"%ENV":5,$SYSTEM_FD_MAX:5,"$^F":5,"@F":5,"${^GLOBAL_PHASE}":5,"$^H":5,"%^H":5,"@INC":5,"%INC":5,$INPLACE_EDIT:5,"$^I":5,"$^M":5,$OSNAME:5,"$^O":5,"${^OPEN}":5,$PERLDB:5,"$^P":5,$SIG:5,"%SIG":5,$BASETIME:5,"$^T":5,"${^TAINT}":5,"${^UNICODE}":5,"${^UTF8CACHE}":5,"${^UTF8LOCALE}":5,$PERL_VERSION:5,"$^V":5,"${^WIN32_SLOPPY_STAT}":5,$EXECUTABLE_NAME:5,"$^X":5,$1:5,$MATCH:5,"$&":5,"${^MATCH}":5,$PREMATCH:5,"$`":5,"${^PREMATCH}":5,$POSTMATCH:5,"$'":5,"${^POSTMATCH}":5,$LAST_PAREN_MATCH:5,"$+":5,$LAST_SUBMATCH_RESULT:5,"$^N":5,"@LAST_MATCH_END":5,"@+":5,"%LAST_PAREN_MATCH":5,"%+":5,"@LAST_MATCH_START":5,"@-":5,"%LAST_MATCH_START":5,"%-":5,$LAST_REGEXP_CODE_RESULT:5,"$^R":5,"${^RE_DEBUG_FLAGS}":5,"${^RE_TRIE_MAXBUF}":5,$ARGV:5,"@ARGV":5,ARGV:5,ARGVOUT:5,$OUTPUT_FIELD_SEPARATOR:5,$OFS:5,"$,":5,$INPUT_LINE_NUMBER:5,$NR:5,"$.":5,$INPUT_RECORD_SEPARATOR:5,$RS:5,"$/":5,$OUTPUT_RECORD_SEPARATOR:5,$ORS:5,"$\\":5,$OUTPUT_AUTOFLUSH:5,"$|":5,$ACCUMULATOR:5,"$^A":5,$FORMAT_FORMFEED:5,"$^L":5,$FORMAT_PAGE_NUMBER:5,"$%":5,$FORMAT_LINES_LEFT:5,"$-":5,$FORMAT_LINE_BREAK_CHARACTERS:5,"$:":5,$FORMAT_LINES_PER_PAGE:5,"$=":5,$FORMAT_TOP_NAME:5,"$^":5,$FORMAT_NAME:5,"$~":5,"${^CHILD_ERROR_NATIVE}":5,$EXTENDED_OS_ERROR:5,"$^E":5,$EXCEPTIONS_BEING_CAUGHT:5,"$^S":5,$WARNING:5,"$^W":5,"${^WARNING_BITS}":5,$OS_ERROR:5,$ERRNO:5,"$!":5,"%OS_ERROR":5,"%ERRNO":5,"%!":5,$CHILD_ERROR:5,"$?":5,$EVAL_ERROR:5,"$@":5,$OFMT:5,"$#":5,"$*":5,$ARRAY_BASE:5,"$[":5,$OLD_PERL_VERSION:5,"$]":5,if:[1,1],elsif:[1,1],else:[1,1],while:[1,1],unless:[1,1],for:[1,1],foreach:[1,1],abs:1,accept:1,alarm:1,atan2:1,bind:1,binmode:1,bless:1,bootstrap:1,break:1,caller:1,chdir:1,chmod:1,chomp:1,chop:1,chown:1,chr:1,chroot:1,close:1,closedir:1,connect:1,continue:[1,1],cos:1,crypt:1,dbmclose:1,dbmopen:1,default:1,defined:1,delete:1,die:1,do:1,dump:1,each:1,endgrent:1,endhostent:1,endnetent:1,endprotoent:1,endpwent:1,endservent:1,eof:1,eval:1,exec:1,exists:1,exit:1,exp:1,fcntl:1,fileno:1,flock:1,fork:1,format:1,formline:1,getc:1,getgrent:1,getgrgid:1,getgrnam:1,gethostbyaddr:1,gethostbyname:1,gethostent:1,getlogin:1,getnetbyaddr:1,getnetbyname:1,getnetent:1,getpeername:1,getpgrp:1,getppid:1,getpriority:1,getprotobyname:1,getprotobynumber:1,getprotoent:1,getpwent:1,getpwnam:1,getpwuid:1,getservbyname:1,getservbyport:1,getservent:1,getsockname:1,getsockopt:1,given:1,glob:1,gmtime:1,goto:1,grep:1,hex:1,import:1,index:1,int:1,ioctl:1,join:1,keys:1,kill:1,last:1,lc:1,lcfirst:1,length:1,link:1,listen:1,local:2,localtime:1,lock:1,log:1,lstat:1,m:null,map:1,mkdir:1,msgctl:1,msgget:1,msgrcv:1,msgsnd:1,my:2,new:1,next:1,no:1,oct:1,open:1,opendir:1,ord:1,our:2,pack:1,package:1,pipe:1,pop:1,pos:1,print:1,printf:1,prototype:1,push:1,q:null,qq:null,qr:null,quotemeta:null,qw:null,qx:null,rand:1,read:1,readdir:1,readline:1,readlink:1,readpipe:1,recv:1,redo:1,ref:1,rename:1,require:1,reset:1,return:1,reverse:1,rewinddir:1,rindex:1,rmdir:1,s:null,say:1,scalar:1,seek:1,seekdir:1,select:1,semctl:1,semget:1,semop:1,send:1,setgrent:1,sethostent:1,setnetent:1,setpgrp:1,setpriority:1,setprotoent:1,setpwent:1,setservent:1,setsockopt:1,shift:1,shmctl:1,shmget:1,shmread:1,shmwrite:1,shutdown:1,sin:1,sleep:1,socket:1,socketpair:1,sort:1,splice:1,split:1,sprintf:1,sqrt:1,srand:1,stat:1,state:1,study:1,sub:1,substr:1,symlink:1,syscall:1,sysopen:1,sysread:1,sysseek:1,system:1,syswrite:1,tell:1,telldir:1,tie:1,tied:1,time:1,times:1,tr:null,truncate:1,uc:1,ucfirst:1,umask:1,undef:1,unlink:1,unpack:1,unshift:1,untie:1,use:1,utime:1,values:1,vec:1,wait:1,waitpid:1,wantarray:1,warn:1,when:1,write:1,y:null},i="string-2",j=/[goseximacplud]/;return{startState:function(){return{tokenize:g,chain:null,style:null,tail:null}},token:function(a,b){return(b.tokenize||g)(a,b)},lineComment:"#"}})),a.registerHelper("wordChars","perl",/[\w$]/),a.defineMIME("text/x-perl","perl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/php/php.js b/core/media/editors/codemirror/mode/php/php.js
new file mode 100644
index 00000000..589c9a66
--- /dev/null
+++ b/core/media/editors/codemirror/mode/php/php.js
@@ -0,0 +1,234 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../clike/clike"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function keywords(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  // Helper for phpString
+  function matchSequence(list, end, escapes) {
+    if (list.length == 0) return phpString(end);
+    return function (stream, state) {
+      var patterns = list[0];
+      for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
+        state.tokenize = matchSequence(list.slice(1), end);
+        return patterns[i][1];
+      }
+      state.tokenize = phpString(end, escapes);
+      return "string";
+    };
+  }
+  function phpString(closing, escapes) {
+    return function(stream, state) { return phpString_(stream, state, closing, escapes); };
+  }
+  function phpString_(stream, state, closing, escapes) {
+    // "Complex" syntax
+    if (escapes !== false && stream.match("${", false) || stream.match("{$", false)) {
+      state.tokenize = null;
+      return "string";
+    }
+
+    // Simple syntax
+    if (escapes !== false && stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
+      // After the variable name there may appear array or object operator.
+      if (stream.match("[", false)) {
+        // Match array operator
+        state.tokenize = matchSequence([
+          [["[", null]],
+          [[/\d[\w\.]*/, "number"],
+           [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
+           [/[\w\$]+/, "variable"]],
+          [["]", null]]
+        ], closing, escapes);
+      }
+      if (stream.match(/\-\>\w/, false)) {
+        // Match object operator
+        state.tokenize = matchSequence([
+          [["->", null]],
+          [[/[\w]+/, "variable"]]
+        ], closing, escapes);
+      }
+      return "variable-2";
+    }
+
+    var escaped = false;
+    // Normal string
+    while (!stream.eol() &&
+           (escaped || escapes === false ||
+            (!stream.match("{$", false) &&
+             !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
+      if (!escaped && stream.match(closing)) {
+        state.tokenize = null;
+        state.tokStack.pop(); state.tokStack.pop();
+        break;
+      }
+      escaped = stream.next() == "\\" && !escaped;
+    }
+    return "string";
+  }
+
+  var phpKeywords = "abstract and array as break case catch class clone const continue declare default " +
+    "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
+    "for foreach function global goto if implements interface instanceof namespace " +
+    "new or private protected public static switch throw trait try use var while xor " +
+    "die echo empty exit eval include include_once isset list require require_once return " +
+    "print unset __halt_compiler self static parent yield insteadof finally";
+  var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
+  CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
+  CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
+
+  var phpConfig = {
+    name: "clike",
+    helperType: "php",
+    keywords: keywords(phpKeywords),
+    blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
+    defKeywords: keywords("class function interface namespace trait"),
+    atoms: keywords(phpAtoms),
+    builtin: keywords(phpBuiltin),
+    multiLineStrings: true,
+    hooks: {
+      "$": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "variable-2";
+      },
+      "<": function(stream, state) {
+        var before;
+        if (before = stream.match(/<<\s*/)) {
+          var quoted = stream.eat(/['"]/);
+          stream.eatWhile(/[\w\.]/);
+          var delim = stream.current().slice(before[0].length + (quoted ? 2 : 1));
+          if (quoted) stream.eat(quoted);
+          if (delim) {
+            (state.tokStack || (state.tokStack = [])).push(delim, 0);
+            state.tokenize = phpString(delim, quoted != "'");
+            return "string";
+          }
+        }
+        return false;
+      },
+      "#": function(stream) {
+        while (!stream.eol() && !stream.match("?>", false)) stream.next();
+        return "comment";
+      },
+      "/": function(stream) {
+        if (stream.eat("/")) {
+          while (!stream.eol() && !stream.match("?>", false)) stream.next();
+          return "comment";
+        }
+        return false;
+      },
+      '"': function(_stream, state) {
+        (state.tokStack || (state.tokStack = [])).push('"', 0);
+        state.tokenize = phpString('"');
+        return "string";
+      },
+      "{": function(_stream, state) {
+        if (state.tokStack && state.tokStack.length)
+          state.tokStack[state.tokStack.length - 1]++;
+        return false;
+      },
+      "}": function(_stream, state) {
+        if (state.tokStack && state.tokStack.length > 0 &&
+            !--state.tokStack[state.tokStack.length - 1]) {
+          state.tokenize = phpString(state.tokStack[state.tokStack.length - 2]);
+        }
+        return false;
+      }
+    }
+  };
+
+  CodeMirror.defineMode("php", function(config, parserConfig) {
+    var htmlMode = CodeMirror.getMode(config, (parserConfig && parserConfig.htmlMode) || "text/html");
+    var phpMode = CodeMirror.getMode(config, phpConfig);
+
+    function dispatch(stream, state) {
+      var isPHP = state.curMode == phpMode;
+      if (stream.sol() && state.pending && state.pending != '"' && state.pending != "'") state.pending = null;
+      if (!isPHP) {
+        if (stream.match(/^<\?\w*/)) {
+          state.curMode = phpMode;
+          if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
+          state.curState = state.php;
+          return "meta";
+        }
+        if (state.pending == '"' || state.pending == "'") {
+          while (!stream.eol() && stream.next() != state.pending) {}
+          var style = "string";
+        } else if (state.pending && stream.pos < state.pending.end) {
+          stream.pos = state.pending.end;
+          var style = state.pending.style;
+        } else {
+          var style = htmlMode.token(stream, state.curState);
+        }
+        if (state.pending) state.pending = null;
+        var cur = stream.current(), openPHP = cur.search(/<\?/), m;
+        if (openPHP != -1) {
+          if (style == "string" && (m = cur.match(/[\'\"]$/)) && !/\?>/.test(cur)) state.pending = m[0];
+          else state.pending = {end: stream.pos, style: style};
+          stream.backUp(cur.length - openPHP);
+        }
+        return style;
+      } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
+        state.curMode = htmlMode;
+        state.curState = state.html;
+        if (!state.php.context.prev) state.php = null;
+        return "meta";
+      } else {
+        return phpMode.token(stream, state.curState);
+      }
+    }
+
+    return {
+      startState: function() {
+        var html = CodeMirror.startState(htmlMode)
+        var php = parserConfig.startOpen ? CodeMirror.startState(phpMode) : null
+        return {html: html,
+                php: php,
+                curMode: parserConfig.startOpen ? phpMode : htmlMode,
+                curState: parserConfig.startOpen ? php : html,
+                pending: null};
+      },
+
+      copyState: function(state) {
+        var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
+            php = state.php, phpNew = php && CodeMirror.copyState(phpMode, php), cur;
+        if (state.curMode == htmlMode) cur = htmlNew;
+        else cur = phpNew;
+        return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,
+                pending: state.pending};
+      },
+
+      token: dispatch,
+
+      indent: function(state, textAfter) {
+        if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
+            (state.curMode == phpMode && /^\?>/.test(textAfter)))
+          return htmlMode.indent(state.html, textAfter);
+        return state.curMode.indent(state.curState, textAfter);
+      },
+
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//",
+
+      innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
+    };
+  }, "htmlmixed", "clike");
+
+  CodeMirror.defineMIME("application/x-httpd-php", "php");
+  CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
+  CodeMirror.defineMIME("text/x-php", phpConfig);
+});
diff --git a/core/media/editors/codemirror/mode/php/php.min.js b/core/media/editors/codemirror/mode/php/php.min.js
new file mode 100644
index 00000000..e9f5b964
--- /dev/null
+++ b/core/media/editors/codemirror/mode/php/php.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../clike/clike")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../clike/clike"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(a,b,e){return 0==a.length?d(b):function(f,g){for(var h=a[0],i=0;i<h.length;i++)if(f.match(h[i][0]))return g.tokenize=c(a.slice(1),b),h[i][1];return g.tokenize=d(b,e),"string"}}function d(a,b){return function(c,d){return e(c,d,a,b)}}function e(a,b,d,e){if(e!==!1&&a.match("${",!1)||a.match("{$",!1))return b.tokenize=null,"string";if(e!==!1&&a.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/))return a.match("[",!1)&&(b.tokenize=c([[["[",null]],[[/\d[\w\.]*/,"number"],[/\$[a-zA-Z_][a-zA-Z0-9_]*/,"variable-2"],[/[\w\$]+/,"variable"]],[["]",null]]],d,e)),a.match(/\-\>\w/,!1)&&(b.tokenize=c([[["->",null]],[[/[\w]+/,"variable"]]],d,e)),"variable-2";for(var f=!1;!a.eol()&&(f||e===!1||!a.match("{$",!1)&&!a.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/,!1));){if(!f&&a.match(d)){b.tokenize=null,b.tokStack.pop(),b.tokStack.pop();break}f="\\"==a.next()&&!f}return"string"}var f="abstract and array as break case catch class clone const continue declare default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final for foreach function global goto if implements interface instanceof namespace new or private protected public static switch throw trait try use var while xor die echo empty exit eval include include_once isset list require require_once return print unset __halt_compiler self static parent yield insteadof finally",g="true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__",h="func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";a.registerHelper("hintWords","php",[f,g,h].join(" ").split(" ")),a.registerHelper("wordChars","php",/[\w$]/);var i={name:"clike",helperType:"php",keywords:b(f),blockKeywords:b("catch do else elseif for foreach if switch try while finally"),defKeywords:b("class function interface namespace trait"),atoms:b(g),builtin:b(h),multiLineStrings:!0,hooks:{$:function(a){return a.eatWhile(/[\w\$_]/),"variable-2"},"<":function(a,b){var c;if(c=a.match(/<<\s*/)){var e=a.eat(/['"]/);a.eatWhile(/[\w\.]/);var f=a.current().slice(c[0].length+(e?2:1));if(e&&a.eat(e),f)return(b.tokStack||(b.tokStack=[])).push(f,0),b.tokenize=d(f,"'"!=e),"string"}return!1},"#":function(a){for(;!a.eol()&&!a.match("?>",!1);)a.next();return"comment"},"/":function(a){if(a.eat("/")){for(;!a.eol()&&!a.match("?>",!1);)a.next();return"comment"}return!1},'"':function(a,b){return(b.tokStack||(b.tokStack=[])).push('"',0),b.tokenize=d('"'),"string"},"{":function(a,b){return b.tokStack&&b.tokStack.length&&b.tokStack[b.tokStack.length-1]++,!1},"}":function(a,b){return b.tokStack&&b.tokStack.length>0&&!--b.tokStack[b.tokStack.length-1]&&(b.tokenize=d(b.tokStack[b.tokStack.length-2])),!1}}};a.defineMode("php",(function(b,c){function d(b,c){var d=c.curMode==f;if(b.sol()&&c.pending&&'"'!=c.pending&&"'"!=c.pending&&(c.pending=null),d)return d&&null==c.php.tokenize&&b.match("?>")?(c.curMode=e,c.curState=c.html,c.php.context.prev||(c.php=null),"meta"):f.token(b,c.curState);if(b.match(/^<\?\w*/))return c.curMode=f,c.php||(c.php=a.startState(f,e.indent(c.html,""))),c.curState=c.php,"meta";if('"'==c.pending||"'"==c.pending){for(;!b.eol()&&b.next()!=c.pending;);var g="string"}else if(c.pending&&b.pos<c.pending.end){b.pos=c.pending.end;var g=c.pending.style}else var g=e.token(b,c.curState);c.pending&&(c.pending=null);var h,i=b.current(),j=i.search(/<\?/);return j!=-1&&("string"==g&&(h=i.match(/[\'\"]$/))&&!/\?>/.test(i)?c.pending=h[0]:c.pending={end:b.pos,style:g},b.backUp(i.length-j)),g}var e=a.getMode(b,c&&c.htmlMode||"text/html"),f=a.getMode(b,i);return{startState:function(){var b=a.startState(e),d=c.startOpen?a.startState(f):null;return{html:b,php:d,curMode:c.startOpen?f:e,curState:c.startOpen?d:b,pending:null}},copyState:function(b){var c,d=b.html,g=a.copyState(e,d),h=b.php,i=h&&a.copyState(f,h);return c=b.curMode==e?g:i,{html:g,php:i,curMode:b.curMode,curState:c,pending:b.pending}},token:d,indent:function(a,b){return a.curMode!=f&&/^\s*<\//.test(b)||a.curMode==f&&/^\?>/.test(b)?e.indent(a.html,b):a.curMode.indent(a.curState,b)},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",innerMode:function(a){return{state:a.curState,mode:a.curMode}}}}),"htmlmixed","clike"),a.defineMIME("application/x-httpd-php","php"),a.defineMIME("application/x-httpd-php-open",{name:"php",startOpen:!0}),a.defineMIME("text/x-php",i)}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/pig/pig.js b/core/media/editors/codemirror/mode/pig/pig.js
new file mode 100644
index 00000000..5b567272
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pig/pig.js
@@ -0,0 +1,178 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+ *      Pig Latin Mode for CodeMirror 2
+ *      @author Prasanth Jayachandran
+ *      @link   https://github.com/prasanthj/pig-codemirror-2
+ *  This implementation is adapted from PL/SQL mode in CodeMirror 2.
+ */
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("pig", function(_config, parserConfig) {
+  var keywords = parserConfig.keywords,
+  builtins = parserConfig.builtins,
+  types = parserConfig.types,
+  multiLineStrings = parserConfig.multiLineStrings;
+
+  var isOperatorChar = /[*+\-%<>=&?:\/!|]/;
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  function tokenComment(stream, state) {
+    var isEnd = false;
+    var ch;
+    while(ch = stream.next()) {
+      if(ch == "/" && isEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      isEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          end = true; break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = tokenBase;
+      return "error";
+    };
+  }
+
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    // is a start of string?
+    if (ch == '"' || ch == "'")
+      return chain(stream, state, tokenString(ch));
+    // is it one of the special chars
+    else if(/[\[\]{}\(\),;\.]/.test(ch))
+      return null;
+    // is it a number?
+    else if(/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    // multi line comment or operator
+    else if (ch == "/") {
+      if (stream.eat("*")) {
+        return chain(stream, state, tokenComment);
+      }
+      else {
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+    }
+    // single line comment or operator
+    else if (ch=="-") {
+      if(stream.eat("-")){
+        stream.skipToEnd();
+        return "comment";
+      }
+      else {
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+    }
+    // is it an operator
+    else if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    else {
+      // get the while word
+      stream.eatWhile(/[\w\$_]/);
+      // is it one of the listed keywords?
+      if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
+        //keywords can be used as variables like flatten(group), group.$0 etc..
+        if (!stream.eat(")") && !stream.eat("."))
+          return "keyword";
+      }
+      // is it one of the builtin functions?
+      if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase()))
+        return "variable-2";
+      // is it one of the listed types?
+      if (types && types.propertyIsEnumerable(stream.current().toUpperCase()))
+        return "variable-3";
+      // default is a 'variable'
+      return "variable";
+    }
+  }
+
+  // Interface
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+      if(stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      return style;
+    }
+  };
+});
+
+(function() {
+  function keywords(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  // builtin funcs taken from trunk revision 1303237
+  var pBuiltins = "ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL "
+    + "CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS "
+    + "DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG "
+    + "FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN "
+    + "INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER "
+    + "ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS "
+    + "LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA  "
+    + "PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE "
+    + "SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG "
+    + "TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER ";
+
+  // taken from QueryLexer.g
+  var pKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
+    + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
+    + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE "
+    + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE "
+    + "NEQ MATCHES TRUE FALSE DUMP";
+
+  // data types
+  var pTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP ";
+
+  CodeMirror.defineMIME("text/x-pig", {
+    name: "pig",
+    builtins: keywords(pBuiltins),
+    keywords: keywords(pKeywords),
+    types: keywords(pTypes)
+  });
+
+  CodeMirror.registerHelper("hintWords", "pig", (pBuiltins + pTypes + pKeywords).split(" "));
+}());
+
+});
diff --git a/core/media/editors/codemirror/mode/pig/pig.min.js b/core/media/editors/codemirror/mode/pig/pig.min.js
new file mode 100644
index 00000000..e636825b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pig/pig.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("pig",(function(a,b){function c(a,b,c){return b.tokenize=c,c(a,b)}function d(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=f;break}d="*"==c}return"comment"}function e(a){return function(b,c){for(var d,e=!1,g=!1;null!=(d=b.next());){if(d==a&&!e){g=!0;break}e=!e&&"\\"==d}return(g||!e&&!j)&&(c.tokenize=f),"error"}}function f(a,b){var f=a.next();return'"'==f||"'"==f?c(a,b,e(f)):/[\[\]{}\(\),;\.]/.test(f)?null:/\d/.test(f)?(a.eatWhile(/[\w\.]/),"number"):"/"==f?a.eat("*")?c(a,b,d):(a.eatWhile(k),"operator"):"-"==f?a.eat("-")?(a.skipToEnd(),"comment"):(a.eatWhile(k),"operator"):k.test(f)?(a.eatWhile(k),"operator"):(a.eatWhile(/[\w\$_]/),g&&g.propertyIsEnumerable(a.current().toUpperCase())&&!a.eat(")")&&!a.eat(".")?"keyword":h&&h.propertyIsEnumerable(a.current().toUpperCase())?"variable-2":i&&i.propertyIsEnumerable(a.current().toUpperCase())?"variable-3":"variable")}var g=b.keywords,h=b.builtins,i=b.types,j=b.multiLineStrings,k=/[*+\-%<>=&?:\/!|]/;return{startState:function(){return{tokenize:f,startOfLine:!0}},token:function(a,b){if(a.eatSpace())return null;var c=b.tokenize(a,b);return c}}})),(function(){function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}var c="ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA  PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER ",d="VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE NEQ MATCHES TRUE FALSE DUMP",e="BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP ";a.defineMIME("text/x-pig",{name:"pig",builtins:b(c),keywords:b(d),types:b(e)}),a.registerHelper("hintWords","pig",(c+e+d).split(" "))})()}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/powershell/powershell.js b/core/media/editors/codemirror/mode/powershell/powershell.js
new file mode 100644
index 00000000..2728ef9d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/powershell/powershell.js
@@ -0,0 +1,398 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  'use strict';
+  if (typeof exports == 'object' && typeof module == 'object') // CommonJS
+    mod(require('../../lib/codemirror'));
+  else if (typeof define == 'function' && define.amd) // AMD
+    define(['../../lib/codemirror'], mod);
+  else // Plain browser env
+    mod(window.CodeMirror);
+})(function(CodeMirror) {
+'use strict';
+
+CodeMirror.defineMode('powershell', function() {
+  function buildRegexp(patterns, options) {
+    options = options || {};
+    var prefix = options.prefix !== undefined ? options.prefix : '^';
+    var suffix = options.suffix !== undefined ? options.suffix : '\\b';
+
+    for (var i = 0; i < patterns.length; i++) {
+      if (patterns[i] instanceof RegExp) {
+        patterns[i] = patterns[i].source;
+      }
+      else {
+        patterns[i] = patterns[i].replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+      }
+    }
+
+    return new RegExp(prefix + '(' + patterns.join('|') + ')' + suffix, 'i');
+  }
+
+  var notCharacterOrDash = '(?=[^A-Za-z\\d\\-_]|$)';
+  var varNames = /[\w\-:]/
+  var keywords = buildRegexp([
+    /begin|break|catch|continue|data|default|do|dynamicparam/,
+    /else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,
+    /param|process|return|switch|throw|trap|try|until|where|while/
+  ], { suffix: notCharacterOrDash });
+
+  var punctuation = /[\[\]{},;`\.]|@[({]/;
+  var wordOperators = buildRegexp([
+    'f',
+    /b?not/,
+    /[ic]?split/, 'join',
+    /is(not)?/, 'as',
+    /[ic]?(eq|ne|[gl][te])/,
+    /[ic]?(not)?(like|match|contains)/,
+    /[ic]?replace/,
+    /b?(and|or|xor)/
+  ], { prefix: '-' });
+  var symbolOperators = /[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/;
+  var operators = buildRegexp([wordOperators, symbolOperators], { suffix: '' });
+
+  var numbers = /^((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i;
+
+  var identifiers = /^[A-Za-z\_][A-Za-z\-\_\d]*\b/;
+
+  var symbolBuiltins = /[A-Z]:|%|\?/i;
+  var namedBuiltins = buildRegexp([
+    /Add-(Computer|Content|History|Member|PSSnapin|Type)/,
+    /Checkpoint-Computer/,
+    /Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,
+    /Compare-Object/,
+    /Complete-Transaction/,
+    /Connect-PSSession/,
+    /ConvertFrom-(Csv|Json|SecureString|StringData)/,
+    /Convert-Path/,
+    /ConvertTo-(Csv|Html|Json|SecureString|Xml)/,
+    /Copy-Item(Property)?/,
+    /Debug-Process/,
+    /Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
+    /Disconnect-PSSession/,
+    /Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
+    /(Enter|Exit)-PSSession/,
+    /Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,
+    /ForEach-Object/,
+    /Format-(Custom|List|Table|Wide)/,
+    new RegExp('Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential'
+      + '|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job'
+      + '|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration'
+      + '|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)'),
+    /Group-Object/,
+    /Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,
+    /ImportSystemModules/,
+    /Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,
+    /Join-Path/,
+    /Limit-EventLog/,
+    /Measure-(Command|Object)/,
+    /Move-Item(Property)?/,
+    new RegExp('New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile'
+      + '|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)'),
+    /Out-(Default|File|GridView|Host|Null|Printer|String)/,
+    /Pause/,
+    /(Pop|Push)-Location/,
+    /Read-Host/,
+    /Receive-(Job|PSSession)/,
+    /Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,
+    /Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,
+    /Rename-(Computer|Item(Property)?)/,
+    /Reset-ComputerMachinePassword/,
+    /Resolve-Path/,
+    /Restart-(Computer|Service)/,
+    /Restore-Computer/,
+    /Resume-(Job|Service)/,
+    /Save-Help/,
+    /Select-(Object|String|Xml)/,
+    /Send-MailMessage/,
+    new RegExp('Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug' +
+               '|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)'),
+    /Show-(Command|ControlPanelItem|EventLog)/,
+    /Sort-Object/,
+    /Split-Path/,
+    /Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,
+    /Stop-(Computer|Job|Process|Service|Transcript)/,
+    /Suspend-(Job|Service)/,
+    /TabExpansion2/,
+    /Tee-Object/,
+    /Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,
+    /Trace-Command/,
+    /Unblock-File/,
+    /Undo-Transaction/,
+    /Unregister-(Event|PSSessionConfiguration)/,
+    /Update-(FormatData|Help|List|TypeData)/,
+    /Use-Transaction/,
+    /Wait-(Event|Job|Process)/,
+    /Where-Object/,
+    /Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,
+    /cd|help|mkdir|more|oss|prompt/,
+    /ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,
+    /echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,
+    /group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,
+    /measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,
+    /rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,
+    /sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/
+  ], { prefix: '', suffix: '' });
+  var variableBuiltins = buildRegexp([
+    /[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,
+    /FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,
+    /MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,
+    /PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,
+    /PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,
+    /WarningPreference|WhatIfPreference/,
+
+    /Event|EventArgs|EventSubscriber|Sender/,
+    /Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,
+    /true|false|null/
+  ], { prefix: '\\$', suffix: '' });
+
+  var builtins = buildRegexp([symbolBuiltins, namedBuiltins, variableBuiltins], { suffix: notCharacterOrDash });
+
+  var grammar = {
+    keyword: keywords,
+    number: numbers,
+    operator: operators,
+    builtin: builtins,
+    punctuation: punctuation,
+    identifier: identifiers
+  };
+
+  // tokenizers
+  function tokenBase(stream, state) {
+    // Handle Comments
+    //var ch = stream.peek();
+
+    var parent = state.returnStack[state.returnStack.length - 1];
+    if (parent && parent.shouldReturnFrom(state)) {
+      state.tokenize = parent.tokenize;
+      state.returnStack.pop();
+      return state.tokenize(stream, state);
+    }
+
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    if (stream.eat('(')) {
+      state.bracketNesting += 1;
+      return 'punctuation';
+    }
+
+    if (stream.eat(')')) {
+      state.bracketNesting -= 1;
+      return 'punctuation';
+    }
+
+    for (var key in grammar) {
+      if (stream.match(grammar[key])) {
+        return key;
+      }
+    }
+
+    var ch = stream.next();
+
+    // single-quote string
+    if (ch === "'") {
+      return tokenSingleQuoteString(stream, state);
+    }
+
+    if (ch === '$') {
+      return tokenVariable(stream, state);
+    }
+
+    // double-quote string
+    if (ch === '"') {
+      return tokenDoubleQuoteString(stream, state);
+    }
+
+    if (ch === '<' && stream.eat('#')) {
+      state.tokenize = tokenComment;
+      return tokenComment(stream, state);
+    }
+
+    if (ch === '#') {
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    if (ch === '@') {
+      var quoteMatch = stream.eat(/["']/);
+      if (quoteMatch && stream.eol()) {
+        state.tokenize = tokenMultiString;
+        state.startQuote = quoteMatch[0];
+        return tokenMultiString(stream, state);
+      } else if (stream.eol()) {
+        return 'error';
+      } else if (stream.peek().match(/[({]/)) {
+        return 'punctuation';
+      } else if (stream.peek().match(varNames)) {
+        // splatted variable
+        return tokenVariable(stream, state);
+      }
+    }
+    return 'error';
+  }
+
+  function tokenSingleQuoteString(stream, state) {
+    var ch;
+    while ((ch = stream.peek()) != null) {
+      stream.next();
+
+      if (ch === "'" && !stream.eat("'")) {
+        state.tokenize = tokenBase;
+        return 'string';
+      }
+    }
+
+    return 'error';
+  }
+
+  function tokenDoubleQuoteString(stream, state) {
+    var ch;
+    while ((ch = stream.peek()) != null) {
+      if (ch === '$') {
+        state.tokenize = tokenStringInterpolation;
+        return 'string';
+      }
+
+      stream.next();
+      if (ch === '`') {
+        stream.next();
+        continue;
+      }
+
+      if (ch === '"' && !stream.eat('"')) {
+        state.tokenize = tokenBase;
+        return 'string';
+      }
+    }
+
+    return 'error';
+  }
+
+  function tokenStringInterpolation(stream, state) {
+    return tokenInterpolation(stream, state, tokenDoubleQuoteString);
+  }
+
+  function tokenMultiStringReturn(stream, state) {
+    state.tokenize = tokenMultiString;
+    state.startQuote = '"'
+    return tokenMultiString(stream, state);
+  }
+
+  function tokenHereStringInterpolation(stream, state) {
+    return tokenInterpolation(stream, state, tokenMultiStringReturn);
+  }
+
+  function tokenInterpolation(stream, state, parentTokenize) {
+    if (stream.match('$(')) {
+      var savedBracketNesting = state.bracketNesting;
+      state.returnStack.push({
+        /*jshint loopfunc:true */
+        shouldReturnFrom: function(state) {
+          return state.bracketNesting === savedBracketNesting;
+        },
+        tokenize: parentTokenize
+      });
+      state.tokenize = tokenBase;
+      state.bracketNesting += 1;
+      return 'punctuation';
+    } else {
+      stream.next();
+      state.returnStack.push({
+        shouldReturnFrom: function() { return true; },
+        tokenize: parentTokenize
+      });
+      state.tokenize = tokenVariable;
+      return state.tokenize(stream, state);
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == '>') {
+          state.tokenize = tokenBase;
+          break;
+      }
+      maybeEnd = (ch === '#');
+    }
+    return 'comment';
+  }
+
+  function tokenVariable(stream, state) {
+    var ch = stream.peek();
+    if (stream.eat('{')) {
+      state.tokenize = tokenVariableWithBraces;
+      return tokenVariableWithBraces(stream, state);
+    } else if (ch != undefined && ch.match(varNames)) {
+      stream.eatWhile(varNames);
+      state.tokenize = tokenBase;
+      return 'variable-2';
+    } else {
+      state.tokenize = tokenBase;
+      return 'error';
+    }
+  }
+
+  function tokenVariableWithBraces(stream, state) {
+    var ch;
+    while ((ch = stream.next()) != null) {
+      if (ch === '}') {
+        state.tokenize = tokenBase;
+        break;
+      }
+    }
+    return 'variable-2';
+  }
+
+  function tokenMultiString(stream, state) {
+    var quote = state.startQuote;
+    if (stream.sol() && stream.match(new RegExp(quote + '@'))) {
+      state.tokenize = tokenBase;
+    }
+    else if (quote === '"') {
+      while (!stream.eol()) {
+        var ch = stream.peek();
+        if (ch === '$') {
+          state.tokenize = tokenHereStringInterpolation;
+          return 'string';
+        }
+
+        stream.next();
+        if (ch === '`') {
+          stream.next();
+        }
+      }
+    }
+    else {
+      stream.skipToEnd();
+    }
+
+    return 'string';
+  }
+
+  var external = {
+    startState: function() {
+      return {
+        returnStack: [],
+        bracketNesting: 0,
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream, state) {
+      return state.tokenize(stream, state);
+    },
+
+    blockCommentStart: '<#',
+    blockCommentEnd: '#>',
+    lineComment: '#',
+    fold: 'brace'
+  };
+  return external;
+});
+
+CodeMirror.defineMIME('application/x-powershell', 'powershell');
+});
diff --git a/core/media/editors/codemirror/mode/powershell/powershell.min.js b/core/media/editors/codemirror/mode/powershell/powershell.min.js
new file mode 100644
index 00000000..2a6a708d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/powershell/powershell.min.js
@@ -0,0 +1 @@
+!(function(a){"use strict";"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(window.CodeMirror)})((function(a){"use strict";a.defineMode("powershell",(function(){function a(a,b){b=b||{};for(var c=void 0!==b.prefix?b.prefix:"^",d=void 0!==b.suffix?b.suffix:"\\b",e=0;e<a.length;e++)a[e]instanceof RegExp?a[e]=a[e].source:a[e]=a[e].replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");return new RegExp(c+"("+a.join("|")+")"+d,"i")}function b(a,b){var e=b.returnStack[b.returnStack.length-1];if(e&&e.shouldReturnFrom(b))return b.tokenize=e.tokenize,b.returnStack.pop(),b.tokenize(a,b);if(a.eatSpace())return null;if(a.eat("("))return b.bracketNesting+=1,"punctuation";if(a.eat(")"))return b.bracketNesting-=1,"punctuation";for(var f in z)if(a.match(z[f]))return f;var g=a.next();if("'"===g)return c(a,b);if("$"===g)return j(a,b);if('"'===g)return d(a,b);if("<"===g&&a.eat("#"))return b.tokenize=i,i(a,b);if("#"===g)return a.skipToEnd(),"comment";if("@"===g){var h=a.eat(/["']/);if(h&&a.eol())return b.tokenize=l,b.startQuote=h[0],l(a,b);if(a.eol())return"error";if(a.peek().match(/[({]/))return"punctuation";if(a.peek().match(n))return j(a,b)}return"error"}function c(a,c){for(var d;null!=(d=a.peek());)if(a.next(),"'"===d&&!a.eat("'"))return c.tokenize=b,"string";return"error"}function d(a,c){for(var d;null!=(d=a.peek());){if("$"===d)return c.tokenize=e,"string";if(a.next(),"`"!==d){if('"'===d&&!a.eat('"'))return c.tokenize=b,"string"}else a.next()}return"error"}function e(a,b){return h(a,b,d)}function f(a,b){return b.tokenize=l,b.startQuote='"',l(a,b)}function g(a,b){return h(a,b,f)}function h(a,c,d){if(a.match("$(")){var e=c.bracketNesting;return c.returnStack.push({shouldReturnFrom:function(a){return a.bracketNesting===e},tokenize:d}),c.tokenize=b,c.bracketNesting+=1,"punctuation"}return a.next(),c.returnStack.push({shouldReturnFrom:function(){return!0},tokenize:d}),c.tokenize=j,c.tokenize(a,c)}function i(a,c){for(var d,e=!1;null!=(d=a.next());){if(e&&">"==d){c.tokenize=b;break}e="#"===d}return"comment"}function j(a,c){var d=a.peek();return a.eat("{")?(c.tokenize=k,k(a,c)):void 0!=d&&d.match(n)?(a.eatWhile(n),c.tokenize=b,"variable-2"):(c.tokenize=b,"error")}function k(a,c){for(var d;null!=(d=a.next());)if("}"===d){c.tokenize=b;break}return"variable-2"}function l(a,c){var d=c.startQuote;if(a.sol()&&a.match(new RegExp(d+"@")))c.tokenize=b;else if('"'===d)for(;!a.eol();){var e=a.peek();if("$"===e)return c.tokenize=g,"string";a.next(),"`"===e&&a.next()}else a.skipToEnd();return"string"}var m="(?=[^A-Za-z\\d\\-_]|$)",n=/[\w\-:]/,o=a([/begin|break|catch|continue|data|default|do|dynamicparam/,/else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,/param|process|return|switch|throw|trap|try|until|where|while/],{suffix:m}),p=/[\[\]{},;`\.]|@[({]/,q=a(["f",/b?not/,/[ic]?split/,"join",/is(not)?/,"as",/[ic]?(eq|ne|[gl][te])/,/[ic]?(not)?(like|match|contains)/,/[ic]?replace/,/b?(and|or|xor)/],{prefix:"-"}),r=/[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/,s=a([q,r],{suffix:""}),t=/^((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i,u=/^[A-Za-z\_][A-Za-z\-\_\d]*\b/,v=/[A-Z]:|%|\?/i,w=a([/Add-(Computer|Content|History|Member|PSSnapin|Type)/,/Checkpoint-Computer/,/Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,/Compare-Object/,/Complete-Transaction/,/Connect-PSSession/,/ConvertFrom-(Csv|Json|SecureString|StringData)/,/Convert-Path/,/ConvertTo-(Csv|Html|Json|SecureString|Xml)/,/Copy-Item(Property)?/,/Debug-Process/,/Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,/Disconnect-PSSession/,/Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,/(Enter|Exit)-PSSession/,/Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,/ForEach-Object/,/Format-(Custom|List|Table|Wide)/,new RegExp("Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)"),/Group-Object/,/Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,/ImportSystemModules/,/Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,/Join-Path/,/Limit-EventLog/,/Measure-(Command|Object)/,/Move-Item(Property)?/,new RegExp("New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)"),/Out-(Default|File|GridView|Host|Null|Printer|String)/,/Pause/,/(Pop|Push)-Location/,/Read-Host/,/Receive-(Job|PSSession)/,/Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,/Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,/Rename-(Computer|Item(Property)?)/,/Reset-ComputerMachinePassword/,/Resolve-Path/,/Restart-(Computer|Service)/,/Restore-Computer/,/Resume-(Job|Service)/,/Save-Help/,/Select-(Object|String|Xml)/,/Send-MailMessage/,new RegExp("Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)"),/Show-(Command|ControlPanelItem|EventLog)/,/Sort-Object/,/Split-Path/,/Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,/Stop-(Computer|Job|Process|Service|Transcript)/,/Suspend-(Job|Service)/,/TabExpansion2/,/Tee-Object/,/Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,/Trace-Command/,/Unblock-File/,/Undo-Transaction/,/Unregister-(Event|PSSessionConfiguration)/,/Update-(FormatData|Help|List|TypeData)/,/Use-Transaction/,/Wait-(Event|Job|Process)/,/Where-Object/,/Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,/cd|help|mkdir|more|oss|prompt/,/ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,/echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,/group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,/measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,/rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,/sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/],{prefix:"",suffix:""}),x=a([/[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,/FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,/MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,/PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,/PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,/WarningPreference|WhatIfPreference/,/Event|EventArgs|EventSubscriber|Sender/,/Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,/true|false|null/],{prefix:"\\$",suffix:""}),y=a([v,w,x],{suffix:m}),z={keyword:o,number:t,operator:s,builtin:y,punctuation:p,identifier:u},A={startState:function(){return{returnStack:[],bracketNesting:0,tokenize:b}},token:function(a,b){return b.tokenize(a,b)},blockCommentStart:"<#",blockCommentEnd:"#>",lineComment:"#",fold:"brace"};return A})),a.defineMIME("application/x-powershell","powershell")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/properties/properties.js b/core/media/editors/codemirror/mode/properties/properties.js
new file mode 100644
index 00000000..ef8bf37e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/properties/properties.js
@@ -0,0 +1,78 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("properties", function() {
+  return {
+    token: function(stream, state) {
+      var sol = stream.sol() || state.afterSection;
+      var eol = stream.eol();
+
+      state.afterSection = false;
+
+      if (sol) {
+        if (state.nextMultiline) {
+          state.inMultiline = true;
+          state.nextMultiline = false;
+        } else {
+          state.position = "def";
+        }
+      }
+
+      if (eol && ! state.nextMultiline) {
+        state.inMultiline = false;
+        state.position = "def";
+      }
+
+      if (sol) {
+        while(stream.eatSpace()) {}
+      }
+
+      var ch = stream.next();
+
+      if (sol && (ch === "#" || ch === "!" || ch === ";")) {
+        state.position = "comment";
+        stream.skipToEnd();
+        return "comment";
+      } else if (sol && ch === "[") {
+        state.afterSection = true;
+        stream.skipTo("]"); stream.eat("]");
+        return "header";
+      } else if (ch === "=" || ch === ":") {
+        state.position = "quote";
+        return null;
+      } else if (ch === "\\" && state.position === "quote") {
+        if (stream.eol()) {  // end of line?
+          // Multiline value
+          state.nextMultiline = true;
+        }
+      }
+
+      return state.position;
+    },
+
+    startState: function() {
+      return {
+        position : "def",       // Current position, "def", "quote" or "comment"
+        nextMultiline : false,  // Is the next line multiline value
+        inMultiline : false,    // Is the current line a multiline value
+        afterSection : false    // Did we just open a section
+      };
+    }
+
+  };
+});
+
+CodeMirror.defineMIME("text/x-properties", "properties");
+CodeMirror.defineMIME("text/x-ini", "properties");
+
+});
diff --git a/core/media/editors/codemirror/mode/properties/properties.min.js b/core/media/editors/codemirror/mode/properties/properties.min.js
new file mode 100644
index 00000000..d68740ad
--- /dev/null
+++ b/core/media/editors/codemirror/mode/properties/properties.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("properties",(function(){return{token:function(a,b){var c=a.sol()||b.afterSection,d=a.eol();if(b.afterSection=!1,c&&(b.nextMultiline?(b.inMultiline=!0,b.nextMultiline=!1):b.position="def"),d&&!b.nextMultiline&&(b.inMultiline=!1,b.position="def"),c)for(;a.eatSpace(););var e=a.next();return!c||"#"!==e&&"!"!==e&&";"!==e?c&&"["===e?(b.afterSection=!0,a.skipTo("]"),a.eat("]"),"header"):"="===e||":"===e?(b.position="quote",null):("\\"===e&&"quote"===b.position&&a.eol()&&(b.nextMultiline=!0),b.position):(b.position="comment",a.skipToEnd(),"comment")},startState:function(){return{position:"def",nextMultiline:!1,inMultiline:!1,afterSection:!1}}}})),a.defineMIME("text/x-properties","properties"),a.defineMIME("text/x-ini","properties")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/protobuf/protobuf.js b/core/media/editors/codemirror/mode/protobuf/protobuf.js
new file mode 100644
index 00000000..93cb3b0e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/protobuf/protobuf.js
@@ -0,0 +1,69 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+  };
+
+  var keywordArray = [
+    "package", "message", "import", "syntax",
+    "required", "optional", "repeated", "reserved", "default", "extensions", "packed",
+    "bool", "bytes", "double", "enum", "float", "string",
+    "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64",
+    "option", "service", "rpc", "returns"
+  ];
+  var keywords = wordRegexp(keywordArray);
+
+  CodeMirror.registerHelper("hintWords", "protobuf", keywordArray);
+
+  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
+
+  function tokenBase(stream) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match("//")) {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
+        return "number";
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
+        return "number";
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
+        return "number";
+    }
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return "string"; }
+    if (stream.match(/^'([^']|(''))*'/)) { return "string"; }
+
+    // Handle words
+    if (stream.match(keywords)) { return "keyword"; }
+    if (stream.match(identifiers)) { return "variable"; } ;
+
+    // Handle non-detected items
+    stream.next();
+    return null;
+  };
+
+  CodeMirror.defineMode("protobuf", function() {
+    return {token: tokenBase};
+  });
+
+  CodeMirror.defineMIME("text/x-protobuf", "protobuf");
+});
diff --git a/core/media/editors/codemirror/mode/protobuf/protobuf.min.js b/core/media/editors/codemirror/mode/protobuf/protobuf.min.js
new file mode 100644
index 00000000..c4513934
--- /dev/null
+++ b/core/media/editors/codemirror/mode/protobuf/protobuf.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function c(a){if(a.eatSpace())return null;if(a.match("//"))return a.skipToEnd(),"comment";if(a.match(/^[0-9\.+-]/,!1)){if(a.match(/^[+-]?0x[0-9a-fA-F]+/))return"number";if(a.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))return"number";if(a.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))return"number"}return a.match(/^"([^"]|(""))*"/)?"string":a.match(/^'([^']|(''))*'/)?"string":a.match(e)?"keyword":a.match(f)?"variable":(a.next(),null)}var d=["package","message","import","syntax","required","optional","repeated","reserved","default","extensions","packed","bool","bytes","double","enum","float","string","int32","int64","uint32","uint64","sint32","sint64","fixed32","fixed64","sfixed32","sfixed64","option","service","rpc","returns"],e=b(d);a.registerHelper("hintWords","protobuf",d);var f=new RegExp("^[_A-Za-z¡-￿][_A-Za-z0-9¡-￿]*");a.defineMode("protobuf",(function(){return{token:c}})),a.defineMIME("text/x-protobuf","protobuf")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/pug/pug.js b/core/media/editors/codemirror/mode/pug/pug.js
new file mode 100644
index 00000000..40182336
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pug/pug.js
@@ -0,0 +1,591 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../javascript/javascript"), require("../css/css"), require("../htmlmixed/htmlmixed"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../javascript/javascript", "../css/css", "../htmlmixed/htmlmixed"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("pug", function (config) {
+  // token types
+  var KEYWORD = 'keyword';
+  var DOCTYPE = 'meta';
+  var ID = 'builtin';
+  var CLASS = 'qualifier';
+
+  var ATTRS_NEST = {
+    '{': '}',
+    '(': ')',
+    '[': ']'
+  };
+
+  var jsMode = CodeMirror.getMode(config, 'javascript');
+
+  function State() {
+    this.javaScriptLine = false;
+    this.javaScriptLineExcludesColon = false;
+
+    this.javaScriptArguments = false;
+    this.javaScriptArgumentsDepth = 0;
+
+    this.isInterpolating = false;
+    this.interpolationNesting = 0;
+
+    this.jsState = CodeMirror.startState(jsMode);
+
+    this.restOfLine = '';
+
+    this.isIncludeFiltered = false;
+    this.isEach = false;
+
+    this.lastTag = '';
+    this.scriptType = '';
+
+    // Attributes Mode
+    this.isAttrs = false;
+    this.attrsNest = [];
+    this.inAttributeName = true;
+    this.attributeIsType = false;
+    this.attrValue = '';
+
+    // Indented Mode
+    this.indentOf = Infinity;
+    this.indentToken = '';
+
+    this.innerMode = null;
+    this.innerState = null;
+
+    this.innerModeForLine = false;
+  }
+  /**
+   * Safely copy a state
+   *
+   * @return {State}
+   */
+  State.prototype.copy = function () {
+    var res = new State();
+    res.javaScriptLine = this.javaScriptLine;
+    res.javaScriptLineExcludesColon = this.javaScriptLineExcludesColon;
+    res.javaScriptArguments = this.javaScriptArguments;
+    res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth;
+    res.isInterpolating = this.isInterpolating;
+    res.interpolationNesting = this.interpolationNesting;
+
+    res.jsState = CodeMirror.copyState(jsMode, this.jsState);
+
+    res.innerMode = this.innerMode;
+    if (this.innerMode && this.innerState) {
+      res.innerState = CodeMirror.copyState(this.innerMode, this.innerState);
+    }
+
+    res.restOfLine = this.restOfLine;
+
+    res.isIncludeFiltered = this.isIncludeFiltered;
+    res.isEach = this.isEach;
+    res.lastTag = this.lastTag;
+    res.scriptType = this.scriptType;
+    res.isAttrs = this.isAttrs;
+    res.attrsNest = this.attrsNest.slice();
+    res.inAttributeName = this.inAttributeName;
+    res.attributeIsType = this.attributeIsType;
+    res.attrValue = this.attrValue;
+    res.indentOf = this.indentOf;
+    res.indentToken = this.indentToken;
+
+    res.innerModeForLine = this.innerModeForLine;
+
+    return res;
+  };
+
+  function javaScript(stream, state) {
+    if (stream.sol()) {
+      // if javaScriptLine was set at end of line, ignore it
+      state.javaScriptLine = false;
+      state.javaScriptLineExcludesColon = false;
+    }
+    if (state.javaScriptLine) {
+      if (state.javaScriptLineExcludesColon && stream.peek() === ':') {
+        state.javaScriptLine = false;
+        state.javaScriptLineExcludesColon = false;
+        return;
+      }
+      var tok = jsMode.token(stream, state.jsState);
+      if (stream.eol()) state.javaScriptLine = false;
+      return tok || true;
+    }
+  }
+  function javaScriptArguments(stream, state) {
+    if (state.javaScriptArguments) {
+      if (state.javaScriptArgumentsDepth === 0 && stream.peek() !== '(') {
+        state.javaScriptArguments = false;
+        return;
+      }
+      if (stream.peek() === '(') {
+        state.javaScriptArgumentsDepth++;
+      } else if (stream.peek() === ')') {
+        state.javaScriptArgumentsDepth--;
+      }
+      if (state.javaScriptArgumentsDepth === 0) {
+        state.javaScriptArguments = false;
+        return;
+      }
+
+      var tok = jsMode.token(stream, state.jsState);
+      return tok || true;
+    }
+  }
+
+  function yieldStatement(stream) {
+    if (stream.match(/^yield\b/)) {
+        return 'keyword';
+    }
+  }
+
+  function doctype(stream) {
+    if (stream.match(/^(?:doctype) *([^\n]+)?/)) {
+        return DOCTYPE;
+    }
+  }
+
+  function interpolation(stream, state) {
+    if (stream.match('#{')) {
+      state.isInterpolating = true;
+      state.interpolationNesting = 0;
+      return 'punctuation';
+    }
+  }
+
+  function interpolationContinued(stream, state) {
+    if (state.isInterpolating) {
+      if (stream.peek() === '}') {
+        state.interpolationNesting--;
+        if (state.interpolationNesting < 0) {
+          stream.next();
+          state.isInterpolating = false;
+          return 'punctuation';
+        }
+      } else if (stream.peek() === '{') {
+        state.interpolationNesting++;
+      }
+      return jsMode.token(stream, state.jsState) || true;
+    }
+  }
+
+  function caseStatement(stream, state) {
+    if (stream.match(/^case\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+
+  function when(stream, state) {
+    if (stream.match(/^when\b/)) {
+      state.javaScriptLine = true;
+      state.javaScriptLineExcludesColon = true;
+      return KEYWORD;
+    }
+  }
+
+  function defaultStatement(stream) {
+    if (stream.match(/^default\b/)) {
+      return KEYWORD;
+    }
+  }
+
+  function extendsStatement(stream, state) {
+    if (stream.match(/^extends?\b/)) {
+      state.restOfLine = 'string';
+      return KEYWORD;
+    }
+  }
+
+  function append(stream, state) {
+    if (stream.match(/^append\b/)) {
+      state.restOfLine = 'variable';
+      return KEYWORD;
+    }
+  }
+  function prepend(stream, state) {
+    if (stream.match(/^prepend\b/)) {
+      state.restOfLine = 'variable';
+      return KEYWORD;
+    }
+  }
+  function block(stream, state) {
+    if (stream.match(/^block\b *(?:(prepend|append)\b)?/)) {
+      state.restOfLine = 'variable';
+      return KEYWORD;
+    }
+  }
+
+  function include(stream, state) {
+    if (stream.match(/^include\b/)) {
+      state.restOfLine = 'string';
+      return KEYWORD;
+    }
+  }
+
+  function includeFiltered(stream, state) {
+    if (stream.match(/^include:([a-zA-Z0-9\-]+)/, false) && stream.match('include')) {
+      state.isIncludeFiltered = true;
+      return KEYWORD;
+    }
+  }
+
+  function includeFilteredContinued(stream, state) {
+    if (state.isIncludeFiltered) {
+      var tok = filter(stream, state);
+      state.isIncludeFiltered = false;
+      state.restOfLine = 'string';
+      return tok;
+    }
+  }
+
+  function mixin(stream, state) {
+    if (stream.match(/^mixin\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+
+  function call(stream, state) {
+    if (stream.match(/^\+([-\w]+)/)) {
+      if (!stream.match(/^\( *[-\w]+ *=/, false)) {
+        state.javaScriptArguments = true;
+        state.javaScriptArgumentsDepth = 0;
+      }
+      return 'variable';
+    }
+    if (stream.match(/^\+#{/, false)) {
+      stream.next();
+      state.mixinCallAfter = true;
+      return interpolation(stream, state);
+    }
+  }
+  function callArguments(stream, state) {
+    if (state.mixinCallAfter) {
+      state.mixinCallAfter = false;
+      if (!stream.match(/^\( *[-\w]+ *=/, false)) {
+        state.javaScriptArguments = true;
+        state.javaScriptArgumentsDepth = 0;
+      }
+      return true;
+    }
+  }
+
+  function conditional(stream, state) {
+    if (stream.match(/^(if|unless|else if|else)\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+
+  function each(stream, state) {
+    if (stream.match(/^(- *)?(each|for)\b/)) {
+      state.isEach = true;
+      return KEYWORD;
+    }
+  }
+  function eachContinued(stream, state) {
+    if (state.isEach) {
+      if (stream.match(/^ in\b/)) {
+        state.javaScriptLine = true;
+        state.isEach = false;
+        return KEYWORD;
+      } else if (stream.sol() || stream.eol()) {
+        state.isEach = false;
+      } else if (stream.next()) {
+        while (!stream.match(/^ in\b/, false) && stream.next());
+        return 'variable';
+      }
+    }
+  }
+
+  function whileStatement(stream, state) {
+    if (stream.match(/^while\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+
+  function tag(stream, state) {
+    var captures;
+    if (captures = stream.match(/^(\w(?:[-:\w]*\w)?)\/?/)) {
+      state.lastTag = captures[1].toLowerCase();
+      if (state.lastTag === 'script') {
+        state.scriptType = 'application/javascript';
+      }
+      return 'tag';
+    }
+  }
+
+  function filter(stream, state) {
+    if (stream.match(/^:([\w\-]+)/)) {
+      var innerMode;
+      if (config && config.innerModes) {
+        innerMode = config.innerModes(stream.current().substring(1));
+      }
+      if (!innerMode) {
+        innerMode = stream.current().substring(1);
+      }
+      if (typeof innerMode === 'string') {
+        innerMode = CodeMirror.getMode(config, innerMode);
+      }
+      setInnerMode(stream, state, innerMode);
+      return 'atom';
+    }
+  }
+
+  function code(stream, state) {
+    if (stream.match(/^(!?=|-)/)) {
+      state.javaScriptLine = true;
+      return 'punctuation';
+    }
+  }
+
+  function id(stream) {
+    if (stream.match(/^#([\w-]+)/)) {
+      return ID;
+    }
+  }
+
+  function className(stream) {
+    if (stream.match(/^\.([\w-]+)/)) {
+      return CLASS;
+    }
+  }
+
+  function attrs(stream, state) {
+    if (stream.peek() == '(') {
+      stream.next();
+      state.isAttrs = true;
+      state.attrsNest = [];
+      state.inAttributeName = true;
+      state.attrValue = '';
+      state.attributeIsType = false;
+      return 'punctuation';
+    }
+  }
+
+  function attrsContinued(stream, state) {
+    if (state.isAttrs) {
+      if (ATTRS_NEST[stream.peek()]) {
+        state.attrsNest.push(ATTRS_NEST[stream.peek()]);
+      }
+      if (state.attrsNest[state.attrsNest.length - 1] === stream.peek()) {
+        state.attrsNest.pop();
+      } else  if (stream.eat(')')) {
+        state.isAttrs = false;
+        return 'punctuation';
+      }
+      if (state.inAttributeName && stream.match(/^[^=,\)!]+/)) {
+        if (stream.peek() === '=' || stream.peek() === '!') {
+          state.inAttributeName = false;
+          state.jsState = CodeMirror.startState(jsMode);
+          if (state.lastTag === 'script' && stream.current().trim().toLowerCase() === 'type') {
+            state.attributeIsType = true;
+          } else {
+            state.attributeIsType = false;
+          }
+        }
+        return 'attribute';
+      }
+
+      var tok = jsMode.token(stream, state.jsState);
+      if (state.attributeIsType && tok === 'string') {
+        state.scriptType = stream.current().toString();
+      }
+      if (state.attrsNest.length === 0 && (tok === 'string' || tok === 'variable' || tok === 'keyword')) {
+        try {
+          Function('', 'var x ' + state.attrValue.replace(/,\s*$/, '').replace(/^!/, ''));
+          state.inAttributeName = true;
+          state.attrValue = '';
+          stream.backUp(stream.current().length);
+          return attrsContinued(stream, state);
+        } catch (ex) {
+          //not the end of an attribute
+        }
+      }
+      state.attrValue += stream.current();
+      return tok || true;
+    }
+  }
+
+  function attributesBlock(stream, state) {
+    if (stream.match(/^&attributes\b/)) {
+      state.javaScriptArguments = true;
+      state.javaScriptArgumentsDepth = 0;
+      return 'keyword';
+    }
+  }
+
+  function indent(stream) {
+    if (stream.sol() && stream.eatSpace()) {
+      return 'indent';
+    }
+  }
+
+  function comment(stream, state) {
+    if (stream.match(/^ *\/\/(-)?([^\n]*)/)) {
+      state.indentOf = stream.indentation();
+      state.indentToken = 'comment';
+      return 'comment';
+    }
+  }
+
+  function colon(stream) {
+    if (stream.match(/^: */)) {
+      return 'colon';
+    }
+  }
+
+  function text(stream, state) {
+    if (stream.match(/^(?:\| ?| )([^\n]+)/)) {
+      return 'string';
+    }
+    if (stream.match(/^(<[^\n]*)/, false)) {
+      // html string
+      setInnerMode(stream, state, 'htmlmixed');
+      state.innerModeForLine = true;
+      return innerMode(stream, state, true);
+    }
+  }
+
+  function dot(stream, state) {
+    if (stream.eat('.')) {
+      var innerMode = null;
+      if (state.lastTag === 'script' && state.scriptType.toLowerCase().indexOf('javascript') != -1) {
+        innerMode = state.scriptType.toLowerCase().replace(/"|'/g, '');
+      } else if (state.lastTag === 'style') {
+        innerMode = 'css';
+      }
+      setInnerMode(stream, state, innerMode);
+      return 'dot';
+    }
+  }
+
+  function fail(stream) {
+    stream.next();
+    return null;
+  }
+
+
+  function setInnerMode(stream, state, mode) {
+    mode = CodeMirror.mimeModes[mode] || mode;
+    mode = config.innerModes ? config.innerModes(mode) || mode : mode;
+    mode = CodeMirror.mimeModes[mode] || mode;
+    mode = CodeMirror.getMode(config, mode);
+    state.indentOf = stream.indentation();
+
+    if (mode && mode.name !== 'null') {
+      state.innerMode = mode;
+    } else {
+      state.indentToken = 'string';
+    }
+  }
+  function innerMode(stream, state, force) {
+    if (stream.indentation() > state.indentOf || (state.innerModeForLine && !stream.sol()) || force) {
+      if (state.innerMode) {
+        if (!state.innerState) {
+          state.innerState = state.innerMode.startState ? CodeMirror.startState(state.innerMode, stream.indentation()) : {};
+        }
+        return stream.hideFirstChars(state.indentOf + 2, function () {
+          return state.innerMode.token(stream, state.innerState) || true;
+        });
+      } else {
+        stream.skipToEnd();
+        return state.indentToken;
+      }
+    } else if (stream.sol()) {
+      state.indentOf = Infinity;
+      state.indentToken = null;
+      state.innerMode = null;
+      state.innerState = null;
+    }
+  }
+  function restOfLine(stream, state) {
+    if (stream.sol()) {
+      // if restOfLine was set at end of line, ignore it
+      state.restOfLine = '';
+    }
+    if (state.restOfLine) {
+      stream.skipToEnd();
+      var tok = state.restOfLine;
+      state.restOfLine = '';
+      return tok;
+    }
+  }
+
+
+  function startState() {
+    return new State();
+  }
+  function copyState(state) {
+    return state.copy();
+  }
+  /**
+   * Get the next token in the stream
+   *
+   * @param {Stream} stream
+   * @param {State} state
+   */
+  function nextToken(stream, state) {
+    var tok = innerMode(stream, state)
+      || restOfLine(stream, state)
+      || interpolationContinued(stream, state)
+      || includeFilteredContinued(stream, state)
+      || eachContinued(stream, state)
+      || attrsContinued(stream, state)
+      || javaScript(stream, state)
+      || javaScriptArguments(stream, state)
+      || callArguments(stream, state)
+
+      || yieldStatement(stream, state)
+      || doctype(stream, state)
+      || interpolation(stream, state)
+      || caseStatement(stream, state)
+      || when(stream, state)
+      || defaultStatement(stream, state)
+      || extendsStatement(stream, state)
+      || append(stream, state)
+      || prepend(stream, state)
+      || block(stream, state)
+      || include(stream, state)
+      || includeFiltered(stream, state)
+      || mixin(stream, state)
+      || call(stream, state)
+      || conditional(stream, state)
+      || each(stream, state)
+      || whileStatement(stream, state)
+      || tag(stream, state)
+      || filter(stream, state)
+      || code(stream, state)
+      || id(stream, state)
+      || className(stream, state)
+      || attrs(stream, state)
+      || attributesBlock(stream, state)
+      || indent(stream, state)
+      || text(stream, state)
+      || comment(stream, state)
+      || colon(stream, state)
+      || dot(stream, state)
+      || fail(stream, state);
+
+    return tok === true ? null : tok;
+  }
+  return {
+    startState: startState,
+    copyState: copyState,
+    token: nextToken
+  };
+}, 'javascript', 'css', 'htmlmixed');
+
+CodeMirror.defineMIME('text/x-pug', 'pug');
+CodeMirror.defineMIME('text/x-jade', 'pug');
+
+});
diff --git a/core/media/editors/codemirror/mode/pug/pug.min.js b/core/media/editors/codemirror/mode/pug/pug.min.js
new file mode 100644
index 00000000..dbde3e79
--- /dev/null
+++ b/core/media/editors/codemirror/mode/pug/pug.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../javascript/javascript"),require("../css/css"),require("../htmlmixed/htmlmixed")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../javascript/javascript","../css/css","../htmlmixed/htmlmixed"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("pug",(function(b){function c(){this.javaScriptLine=!1,this.javaScriptLineExcludesColon=!1,this.javaScriptArguments=!1,this.javaScriptArgumentsDepth=0,this.isInterpolating=!1,this.interpolationNesting=0,this.jsState=a.startState(Z),this.restOfLine="",this.isIncludeFiltered=!1,this.isEach=!1,this.lastTag="",this.scriptType="",this.isAttrs=!1,this.attrsNest=[],this.inAttributeName=!0,this.attributeIsType=!1,this.attrValue="",this.indentOf=1/0,this.indentToken="",this.innerMode=null,this.innerState=null,this.innerModeForLine=!1}function d(a,b){if(a.sol()&&(b.javaScriptLine=!1,b.javaScriptLineExcludesColon=!1),b.javaScriptLine){if(b.javaScriptLineExcludesColon&&":"===a.peek())return b.javaScriptLine=!1,void(b.javaScriptLineExcludesColon=!1);var c=Z.token(a,b.jsState);return a.eol()&&(b.javaScriptLine=!1),c||!0}}function e(a,b){if(b.javaScriptArguments){if(0===b.javaScriptArgumentsDepth&&"("!==a.peek())return void(b.javaScriptArguments=!1);if("("===a.peek()?b.javaScriptArgumentsDepth++:")"===a.peek()&&b.javaScriptArgumentsDepth--,0===b.javaScriptArgumentsDepth)return void(b.javaScriptArguments=!1);var c=Z.token(a,b.jsState);return c||!0}}function f(a){if(a.match(/^yield\b/))return"keyword"}function g(a){if(a.match(/^(?:doctype) *([^\n]+)?/))return V}function h(a,b){if(a.match("#{"))return b.isInterpolating=!0,b.interpolationNesting=0,"punctuation"}function i(a,b){if(b.isInterpolating){if("}"===a.peek()){if(b.interpolationNesting--,b.interpolationNesting<0)return a.next(),b.isInterpolating=!1,"punctuation"}else"{"===a.peek()&&b.interpolationNesting++;return Z.token(a,b.jsState)||!0}}function j(a,b){if(a.match(/^case\b/))return b.javaScriptLine=!0,U}function k(a,b){if(a.match(/^when\b/))return b.javaScriptLine=!0,b.javaScriptLineExcludesColon=!0,U}function l(a){if(a.match(/^default\b/))return U}function m(a,b){if(a.match(/^extends?\b/))return b.restOfLine="string",U}function n(a,b){if(a.match(/^append\b/))return b.restOfLine="variable",U}function o(a,b){if(a.match(/^prepend\b/))return b.restOfLine="variable",U}function p(a,b){if(a.match(/^block\b *(?:(prepend|append)\b)?/))return b.restOfLine="variable",U}function q(a,b){if(a.match(/^include\b/))return b.restOfLine="string",U}function r(a,b){if(a.match(/^include:([a-zA-Z0-9\-]+)/,!1)&&a.match("include"))return b.isIncludeFiltered=!0,U}function s(a,b){if(b.isIncludeFiltered){var c=B(a,b);return b.isIncludeFiltered=!1,b.restOfLine="string",c}}function t(a,b){if(a.match(/^mixin\b/))return b.javaScriptLine=!0,U}function u(a,b){return a.match(/^\+([-\w]+)/)?(a.match(/^\( *[-\w]+ *=/,!1)||(b.javaScriptArguments=!0,b.javaScriptArgumentsDepth=0),"variable"):a.match(/^\+#{/,!1)?(a.next(),b.mixinCallAfter=!0,h(a,b)):void 0}function v(a,b){if(b.mixinCallAfter)return b.mixinCallAfter=!1,a.match(/^\( *[-\w]+ *=/,!1)||(b.javaScriptArguments=!0,b.javaScriptArgumentsDepth=0),!0}function w(a,b){if(a.match(/^(if|unless|else if|else)\b/))return b.javaScriptLine=!0,U}function x(a,b){if(a.match(/^(- *)?(each|for)\b/))return b.isEach=!0,U}function y(a,b){if(b.isEach){if(a.match(/^ in\b/))return b.javaScriptLine=!0,b.isEach=!1,U;if(a.sol()||a.eol())b.isEach=!1;else if(a.next()){for(;!a.match(/^ in\b/,!1)&&a.next(););return"variable"}}}function z(a,b){if(a.match(/^while\b/))return b.javaScriptLine=!0,U}function A(a,b){var c;if(c=a.match(/^(\w(?:[-:\w]*\w)?)\/?/))return b.lastTag=c[1].toLowerCase(),"script"===b.lastTag&&(b.scriptType="application/javascript"),"tag"}function B(c,d){if(c.match(/^:([\w\-]+)/)){var e;return b&&b.innerModes&&(e=b.innerModes(c.current().substring(1))),e||(e=c.current().substring(1)),"string"==typeof e&&(e=a.getMode(b,e)),O(c,d,e),"atom"}}function C(a,b){if(a.match(/^(!?=|-)/))return b.javaScriptLine=!0,"punctuation"}function D(a){if(a.match(/^#([\w-]+)/))return W}function E(a){if(a.match(/^\.([\w-]+)/))return X}function F(a,b){if("("==a.peek())return a.next(),b.isAttrs=!0,b.attrsNest=[],b.inAttributeName=!0,b.attrValue="",b.attributeIsType=!1,"punctuation"}function G(b,c){if(c.isAttrs){if(Y[b.peek()]&&c.attrsNest.push(Y[b.peek()]),c.attrsNest[c.attrsNest.length-1]===b.peek())c.attrsNest.pop();else if(b.eat(")"))return c.isAttrs=!1,"punctuation";if(c.inAttributeName&&b.match(/^[^=,\)!]+/))return"="!==b.peek()&&"!"!==b.peek()||(c.inAttributeName=!1,c.jsState=a.startState(Z),"script"===c.lastTag&&"type"===b.current().trim().toLowerCase()?c.attributeIsType=!0:c.attributeIsType=!1),"attribute";var d=Z.token(b,c.jsState);if(c.attributeIsType&&"string"===d&&(c.scriptType=b.current().toString()),0===c.attrsNest.length&&("string"===d||"variable"===d||"keyword"===d))try{return Function("","var x "+c.attrValue.replace(/,\s*$/,"").replace(/^!/,"")),c.inAttributeName=!0,c.attrValue="",b.backUp(b.current().length),G(b,c)}catch(a){}return c.attrValue+=b.current(),d||!0}}function H(a,b){if(a.match(/^&attributes\b/))return b.javaScriptArguments=!0,b.javaScriptArgumentsDepth=0,"keyword"}function I(a){if(a.sol()&&a.eatSpace())return"indent"}function J(a,b){if(a.match(/^ *\/\/(-)?([^\n]*)/))return b.indentOf=a.indentation(),b.indentToken="comment","comment"}function K(a){if(a.match(/^: */))return"colon"}function L(a,b){return a.match(/^(?:\| ?| )([^\n]+)/)?"string":a.match(/^(<[^\n]*)/,!1)?(O(a,b,"htmlmixed"),b.innerModeForLine=!0,P(a,b,!0)):void 0}function M(a,b){if(a.eat(".")){var c=null;return"script"===b.lastTag&&b.scriptType.toLowerCase().indexOf("javascript")!=-1?c=b.scriptType.toLowerCase().replace(/"|'/g,""):"style"===b.lastTag&&(c="css"),O(a,b,c),"dot"}}function N(a){return a.next(),null}function O(c,d,e){e=a.mimeModes[e]||e,e=b.innerModes?b.innerModes(e)||e:e,e=a.mimeModes[e]||e,e=a.getMode(b,e),d.indentOf=c.indentation(),e&&"null"!==e.name?d.innerMode=e:d.indentToken="string"}function P(b,c,d){return b.indentation()>c.indentOf||c.innerModeForLine&&!b.sol()||d?c.innerMode?(c.innerState||(c.innerState=c.innerMode.startState?a.startState(c.innerMode,b.indentation()):{}),b.hideFirstChars(c.indentOf+2,(function(){return c.innerMode.token(b,c.innerState)||!0}))):(b.skipToEnd(),c.indentToken):void(b.sol()&&(c.indentOf=1/0,c.indentToken=null,c.innerMode=null,c.innerState=null))}function Q(a,b){if(a.sol()&&(b.restOfLine=""),b.restOfLine){a.skipToEnd();var c=b.restOfLine;return b.restOfLine="",c}}function R(){return new c}function S(a){return a.copy()}function T(a,b){var c=P(a,b)||Q(a,b)||i(a,b)||s(a,b)||y(a,b)||G(a,b)||d(a,b)||e(a,b)||v(a,b)||f(a,b)||g(a,b)||h(a,b)||j(a,b)||k(a,b)||l(a,b)||m(a,b)||n(a,b)||o(a,b)||p(a,b)||q(a,b)||r(a,b)||t(a,b)||u(a,b)||w(a,b)||x(a,b)||z(a,b)||A(a,b)||B(a,b)||C(a,b)||D(a,b)||E(a,b)||F(a,b)||H(a,b)||I(a,b)||L(a,b)||J(a,b)||K(a,b)||M(a,b)||N(a,b);return c===!0?null:c}var U="keyword",V="meta",W="builtin",X="qualifier",Y={"{":"}","(":")","[":"]"},Z=a.getMode(b,"javascript");return c.prototype.copy=function(){var b=new c;return b.javaScriptLine=this.javaScriptLine,b.javaScriptLineExcludesColon=this.javaScriptLineExcludesColon,b.javaScriptArguments=this.javaScriptArguments,b.javaScriptArgumentsDepth=this.javaScriptArgumentsDepth,b.isInterpolating=this.isInterpolating,b.interpolationNesting=this.interpolationNesting,b.jsState=a.copyState(Z,this.jsState),b.innerMode=this.innerMode,this.innerMode&&this.innerState&&(b.innerState=a.copyState(this.innerMode,this.innerState)),b.restOfLine=this.restOfLine,b.isIncludeFiltered=this.isIncludeFiltered,b.isEach=this.isEach,b.lastTag=this.lastTag,b.scriptType=this.scriptType,b.isAttrs=this.isAttrs,b.attrsNest=this.attrsNest.slice(),b.inAttributeName=this.inAttributeName,b.attributeIsType=this.attributeIsType,b.attrValue=this.attrValue,b.indentOf=this.indentOf,b.indentToken=this.indentToken,b.innerModeForLine=this.innerModeForLine,b},{startState:R,copyState:S,token:T}}),"javascript","css","htmlmixed"),a.defineMIME("text/x-pug","pug"),a.defineMIME("text/x-jade","pug")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/puppet/puppet.js b/core/media/editors/codemirror/mode/puppet/puppet.js
new file mode 100644
index 00000000..57041300
--- /dev/null
+++ b/core/media/editors/codemirror/mode/puppet/puppet.js
@@ -0,0 +1,220 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("puppet", function () {
+  // Stores the words from the define method
+  var words = {};
+  // Taken, mostly, from the Puppet official variable standards regex
+  var variable_regex = /({)?([a-z][a-z0-9_]*)?((::[a-z][a-z0-9_]*)*::)?[a-zA-Z0-9_]+(})?/;
+
+  // Takes a string of words separated by spaces and adds them as
+  // keys with the value of the first argument 'style'
+  function define(style, string) {
+    var split = string.split(' ');
+    for (var i = 0; i < split.length; i++) {
+      words[split[i]] = style;
+    }
+  }
+
+  // Takes commonly known puppet types/words and classifies them to a style
+  define('keyword', 'class define site node include import inherits');
+  define('keyword', 'case if else in and elsif default or');
+  define('atom', 'false true running present absent file directory undef');
+  define('builtin', 'action augeas burst chain computer cron destination dport exec ' +
+    'file filebucket group host icmp iniface interface jump k5login limit log_level ' +
+    'log_prefix macauthorization mailalias maillist mcx mount nagios_command ' +
+    'nagios_contact nagios_contactgroup nagios_host nagios_hostdependency ' +
+    'nagios_hostescalation nagios_hostextinfo nagios_hostgroup nagios_service ' +
+    'nagios_servicedependency nagios_serviceescalation nagios_serviceextinfo ' +
+    'nagios_servicegroup nagios_timeperiod name notify outiface package proto reject ' +
+    'resources router schedule scheduled_task selboolean selmodule service source ' +
+    'sport ssh_authorized_key sshkey stage state table tidy todest toports tosource ' +
+    'user vlan yumrepo zfs zone zpool');
+
+  // After finding a start of a string ('|") this function attempts to find the end;
+  // If a variable is encountered along the way, we display it differently when it
+  // is encapsulated in a double-quoted string.
+  function tokenString(stream, state) {
+    var current, prev, found_var = false;
+    while (!stream.eol() && (current = stream.next()) != state.pending) {
+      if (current === '$' && prev != '\\' && state.pending == '"') {
+        found_var = true;
+        break;
+      }
+      prev = current;
+    }
+    if (found_var) {
+      stream.backUp(1);
+    }
+    if (current == state.pending) {
+      state.continueString = false;
+    } else {
+      state.continueString = true;
+    }
+    return "string";
+  }
+
+  // Main function
+  function tokenize(stream, state) {
+    // Matches one whole word
+    var word = stream.match(/[\w]+/, false);
+    // Matches attributes (i.e. ensure => present ; 'ensure' would be matched)
+    var attribute = stream.match(/(\s+)?\w+\s+=>.*/, false);
+    // Matches non-builtin resource declarations
+    // (i.e. "apache::vhost {" or "mycustomclasss {" would be matched)
+    var resource = stream.match(/(\s+)?[\w:_]+(\s+)?{/, false);
+    // Matches virtual and exported resources (i.e. @@user { ; and the like)
+    var special_resource = stream.match(/(\s+)?[@]{1,2}[\w:_]+(\s+)?{/, false);
+
+    // Finally advance the stream
+    var ch = stream.next();
+
+    // Have we found a variable?
+    if (ch === '$') {
+      if (stream.match(variable_regex)) {
+        // If so, and its in a string, assign it a different color
+        return state.continueString ? 'variable-2' : 'variable';
+      }
+      // Otherwise return an invalid variable
+      return "error";
+    }
+    // Should we still be looking for the end of a string?
+    if (state.continueString) {
+      // If so, go through the loop again
+      stream.backUp(1);
+      return tokenString(stream, state);
+    }
+    // Are we in a definition (class, node, define)?
+    if (state.inDefinition) {
+      // If so, return def (i.e. for 'class myclass {' ; 'myclass' would be matched)
+      if (stream.match(/(\s+)?[\w:_]+(\s+)?/)) {
+        return 'def';
+      }
+      // Match the rest it the next time around
+      stream.match(/\s+{/);
+      state.inDefinition = false;
+    }
+    // Are we in an 'include' statement?
+    if (state.inInclude) {
+      // Match and return the included class
+      stream.match(/(\s+)?\S+(\s+)?/);
+      state.inInclude = false;
+      return 'def';
+    }
+    // Do we just have a function on our hands?
+    // In 'ensure_resource("myclass")', 'ensure_resource' is matched
+    if (stream.match(/(\s+)?\w+\(/)) {
+      stream.backUp(1);
+      return 'def';
+    }
+    // Have we matched the prior attribute regex?
+    if (attribute) {
+      stream.match(/(\s+)?\w+/);
+      return 'tag';
+    }
+    // Do we have Puppet specific words?
+    if (word && words.hasOwnProperty(word)) {
+      // Negates the initial next()
+      stream.backUp(1);
+      // rs move the stream
+      stream.match(/[\w]+/);
+      // We want to process these words differently
+      // do to the importance they have in Puppet
+      if (stream.match(/\s+\S+\s+{/, false)) {
+        state.inDefinition = true;
+      }
+      if (word == 'include') {
+        state.inInclude = true;
+      }
+      // Returns their value as state in the prior define methods
+      return words[word];
+    }
+    // Is there a match on a reference?
+    if (/(^|\s+)[A-Z][\w:_]+/.test(word)) {
+      // Negate the next()
+      stream.backUp(1);
+      // Match the full reference
+      stream.match(/(^|\s+)[A-Z][\w:_]+/);
+      return 'def';
+    }
+    // Have we matched the prior resource regex?
+    if (resource) {
+      stream.match(/(\s+)?[\w:_]+/);
+      return 'def';
+    }
+    // Have we matched the prior special_resource regex?
+    if (special_resource) {
+      stream.match(/(\s+)?[@]{1,2}/);
+      return 'special';
+    }
+    // Match all the comments. All of them.
+    if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    // Have we found a string?
+    if (ch == "'" || ch == '"') {
+      // Store the type (single or double)
+      state.pending = ch;
+      // Perform the looping function to find the end
+      return tokenString(stream, state);
+    }
+    // Match all the brackets
+    if (ch == '{' || ch == '}') {
+      return 'bracket';
+    }
+    // Match characters that we are going to assume
+    // are trying to be regex
+    if (ch == '/') {
+      stream.match(/.*?\//);
+      return 'variable-3';
+    }
+    // Match all the numbers
+    if (ch.match(/[0-9]/)) {
+      stream.eatWhile(/[0-9]+/);
+      return 'number';
+    }
+    // Match the '=' and '=>' operators
+    if (ch == '=') {
+      if (stream.peek() == '>') {
+          stream.next();
+      }
+      return "operator";
+    }
+    // Keep advancing through all the rest
+    stream.eatWhile(/[\w-]/);
+    // Return a blank line for everything else
+    return null;
+  }
+  // Start it all
+  return {
+    startState: function () {
+      var state = {};
+      state.inDefinition = false;
+      state.inInclude = false;
+      state.continueString = false;
+      state.pending = false;
+      return state;
+    },
+    token: function (stream, state) {
+      // Strip the spaces, but regex will account for them eitherway
+      if (stream.eatSpace()) return null;
+      // Go through the main process
+      return tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-puppet", "puppet");
+
+});
diff --git a/core/media/editors/codemirror/mode/puppet/puppet.min.js b/core/media/editors/codemirror/mode/puppet/puppet.min.js
new file mode 100644
index 00000000..39002f7c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/puppet/puppet.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("puppet",(function(){function a(a,b){for(var c=b.split(" "),e=0;e<c.length;e++)d[c[e]]=a}function b(a,b){for(var c,d,e=!1;!a.eol()&&(c=a.next())!=b.pending;){if("$"===c&&"\\"!=d&&'"'==b.pending){e=!0;break}d=c}return e&&a.backUp(1),c==b.pending?b.continueString=!1:b.continueString=!0,"string"}function c(a,c){var f=a.match(/[\w]+/,!1),g=a.match(/(\s+)?\w+\s+=>.*/,!1),h=a.match(/(\s+)?[\w:_]+(\s+)?{/,!1),i=a.match(/(\s+)?[@]{1,2}[\w:_]+(\s+)?{/,!1),j=a.next();if("$"===j)return a.match(e)?c.continueString?"variable-2":"variable":"error";if(c.continueString)return a.backUp(1),b(a,c);if(c.inDefinition){if(a.match(/(\s+)?[\w:_]+(\s+)?/))return"def";a.match(/\s+{/),c.inDefinition=!1}return c.inInclude?(a.match(/(\s+)?\S+(\s+)?/),c.inInclude=!1,"def"):a.match(/(\s+)?\w+\(/)?(a.backUp(1),"def"):g?(a.match(/(\s+)?\w+/),"tag"):f&&d.hasOwnProperty(f)?(a.backUp(1),a.match(/[\w]+/),a.match(/\s+\S+\s+{/,!1)&&(c.inDefinition=!0),"include"==f&&(c.inInclude=!0),d[f]):/(^|\s+)[A-Z][\w:_]+/.test(f)?(a.backUp(1),a.match(/(^|\s+)[A-Z][\w:_]+/),"def"):h?(a.match(/(\s+)?[\w:_]+/),"def"):i?(a.match(/(\s+)?[@]{1,2}/),"special"):"#"==j?(a.skipToEnd(),"comment"):"'"==j||'"'==j?(c.pending=j,b(a,c)):"{"==j||"}"==j?"bracket":"/"==j?(a.match(/.*?\//),"variable-3"):j.match(/[0-9]/)?(a.eatWhile(/[0-9]+/),"number"):"="==j?(">"==a.peek()&&a.next(),"operator"):(a.eatWhile(/[\w-]/),null)}var d={},e=/({)?([a-z][a-z0-9_]*)?((::[a-z][a-z0-9_]*)*::)?[a-zA-Z0-9_]+(})?/;return a("keyword","class define site node include import inherits"),a("keyword","case if else in and elsif default or"),a("atom","false true running present absent file directory undef"),a("builtin","action augeas burst chain computer cron destination dport exec file filebucket group host icmp iniface interface jump k5login limit log_level log_prefix macauthorization mailalias maillist mcx mount nagios_command nagios_contact nagios_contactgroup nagios_host nagios_hostdependency nagios_hostescalation nagios_hostextinfo nagios_hostgroup nagios_service nagios_servicedependency nagios_serviceescalation nagios_serviceextinfo nagios_servicegroup nagios_timeperiod name notify outiface package proto reject resources router schedule scheduled_task selboolean selmodule service source sport ssh_authorized_key sshkey stage state table tidy todest toports tosource user vlan yumrepo zfs zone zpool"),{startState:function(){var a={};return a.inDefinition=!1,a.inInclude=!1,a.continueString=!1,a.pending=!1,a},token:function(a,b){return a.eatSpace()?null:c(a,b)}}})),a.defineMIME("text/x-puppet","puppet")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/python/python.js b/core/media/editors/codemirror/mode/python/python.js
new file mode 100644
index 00000000..a13a8509
--- /dev/null
+++ b/core/media/editors/codemirror/mode/python/python.js
@@ -0,0 +1,409 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var wordOperators = wordRegexp(["and", "or", "not", "is"]);
+  var commonKeywords = ["as", "assert", "break", "class", "continue",
+                        "def", "del", "elif", "else", "except", "finally",
+                        "for", "from", "global", "if", "import",
+                        "lambda", "pass", "raise", "return",
+                        "try", "while", "with", "yield", "in"];
+  var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
+                        "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
+                        "enumerate", "eval", "filter", "float", "format", "frozenset",
+                        "getattr", "globals", "hasattr", "hash", "help", "hex", "id",
+                        "input", "int", "isinstance", "issubclass", "iter", "len",
+                        "list", "locals", "map", "max", "memoryview", "min", "next",
+                        "object", "oct", "open", "ord", "pow", "property", "range",
+                        "repr", "reversed", "round", "set", "setattr", "slice",
+                        "sorted", "staticmethod", "str", "sum", "super", "tuple",
+                        "type", "vars", "zip", "__import__", "NotImplemented",
+                        "Ellipsis", "__debug__"];
+  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
+
+  function top(state) {
+    return state.scopes[state.scopes.length - 1];
+  }
+
+  CodeMirror.defineMode("python", function(conf, parserConf) {
+    var ERRORCLASS = "error";
+
+    var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.\\]/;
+    //               (Backwards-compatiblity with old, cumbersome config system)
+    var operators = [parserConf.singleOperators, parserConf.doubleOperators, parserConf.doubleDelimiters, parserConf.tripleDelimiters,
+                     parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@])/]
+    for (var i = 0; i < operators.length; i++) if (!operators[i]) operators.splice(i--, 1)
+
+    var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
+
+    var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
+    if (parserConf.extra_keywords != undefined)
+      myKeywords = myKeywords.concat(parserConf.extra_keywords);
+
+    if (parserConf.extra_builtins != undefined)
+      myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
+
+    var py3 = !(parserConf.version && Number(parserConf.version) < 3)
+    if (py3) {
+      // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
+      var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
+      myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
+      myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
+      var stringPrefixes = new RegExp("^(([rbuf]|(br)|(fr))?('{3}|\"{3}|['\"]))", "i");
+    } else {
+      var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
+      myKeywords = myKeywords.concat(["exec", "print"]);
+      myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
+                                      "file", "intern", "long", "raw_input", "reduce", "reload",
+                                      "unichr", "unicode", "xrange", "False", "True", "None"]);
+      var stringPrefixes = new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
+    }
+    var keywords = wordRegexp(myKeywords);
+    var builtins = wordRegexp(myBuiltins);
+
+    // tokenizers
+    function tokenBase(stream, state) {
+      var sol = stream.sol() && state.lastToken != "\\"
+      if (sol) state.indent = stream.indentation()
+      // Handle scope changes
+      if (sol && top(state).type == "py") {
+        var scopeOffset = top(state).offset;
+        if (stream.eatSpace()) {
+          var lineOffset = stream.indentation();
+          if (lineOffset > scopeOffset)
+            pushPyScope(state);
+          else if (lineOffset < scopeOffset && dedent(stream, state) && stream.peek() != "#")
+            state.errorToken = true;
+          return null;
+        } else {
+          var style = tokenBaseInner(stream, state);
+          if (scopeOffset > 0 && dedent(stream, state))
+            style += " " + ERRORCLASS;
+          return style;
+        }
+      }
+      return tokenBaseInner(stream, state);
+    }
+
+    function tokenBaseInner(stream, state) {
+      if (stream.eatSpace()) return null;
+
+      // Handle Comments
+      if (stream.match(/^#.*/)) return "comment";
+
+      // Handle Number Literals
+      if (stream.match(/^[0-9\.]/, false)) {
+        var floatLiteral = false;
+        // Floats
+        if (stream.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+        if (stream.match(/^[\d_]+\.\d*/)) { floatLiteral = true; }
+        if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+        if (floatLiteral) {
+          // Float literals may be "imaginary"
+          stream.eat(/J/i);
+          return "number";
+        }
+        // Integers
+        var intLiteral = false;
+        // Hex
+        if (stream.match(/^0x[0-9a-f_]+/i)) intLiteral = true;
+        // Binary
+        if (stream.match(/^0b[01_]+/i)) intLiteral = true;
+        // Octal
+        if (stream.match(/^0o[0-7_]+/i)) intLiteral = true;
+        // Decimal
+        if (stream.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)) {
+          // Decimal literals may be "imaginary"
+          stream.eat(/J/i);
+          // TODO - Can you have imaginary longs?
+          intLiteral = true;
+        }
+        // Zero by itself with no other piece of number.
+        if (stream.match(/^0(?![\dx])/i)) intLiteral = true;
+        if (intLiteral) {
+          // Integer literals may be "long"
+          stream.eat(/L/i);
+          return "number";
+        }
+      }
+
+      // Handle Strings
+      if (stream.match(stringPrefixes)) {
+        var isFmtString = stream.current().toLowerCase().indexOf('f') !== -1;
+        if (!isFmtString) {
+          state.tokenize = tokenStringFactory(stream.current());
+          return state.tokenize(stream, state);
+        } else {
+          state.tokenize = formatStringFactory(stream.current(), state.tokenize);
+          return state.tokenize(stream, state);
+        }
+      }
+
+      for (var i = 0; i < operators.length; i++)
+        if (stream.match(operators[i])) return "operator"
+
+      if (stream.match(delimiters)) return "punctuation";
+
+      if (state.lastToken == "." && stream.match(identifiers))
+        return "property";
+
+      if (stream.match(keywords) || stream.match(wordOperators))
+        return "keyword";
+
+      if (stream.match(builtins))
+        return "builtin";
+
+      if (stream.match(/^(self|cls)\b/))
+        return "variable-2";
+
+      if (stream.match(identifiers)) {
+        if (state.lastToken == "def" || state.lastToken == "class")
+          return "def";
+        return "variable";
+      }
+
+      // Handle non-detected items
+      stream.next();
+      return ERRORCLASS;
+    }
+
+    function formatStringFactory(delimiter, tokenOuter) {
+      while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
+        delimiter = delimiter.substr(1);
+
+      var singleline = delimiter.length == 1;
+      var OUTCLASS = "string";
+
+      function tokenFString(stream, state) {
+        // inside f-str Expression
+        if (stream.match(delimiter)) {
+          // expression ends pre-maturally, but very common in editing
+          // Could show error to remind users to close brace here
+          state.tokenize = tokenString
+          return OUTCLASS;
+        } else if (stream.match('{')) {
+          // starting brace, if not eaten below
+          return "punctuation";
+        } else if (stream.match('}')) {
+          // return to regular inside string state
+          state.tokenize = tokenString
+          return "punctuation";
+        } else {
+          // use tokenBaseInner to parse the expression
+          return tokenBaseInner(stream, state);
+        }
+      }
+
+      function tokenString(stream, state) {
+        while (!stream.eol()) {
+          stream.eatWhile(/[^'"\{\}\\]/);
+          if (stream.eat("\\")) {
+            stream.next();
+            if (singleline && stream.eol())
+              return OUTCLASS;
+          } else if (stream.match(delimiter)) {
+            state.tokenize = tokenOuter;
+            return OUTCLASS;
+          } else if (stream.match('{{')) {
+            // ignore {{ in f-str
+            return OUTCLASS;
+          } else if (stream.match('{', false)) {
+            // switch to nested mode
+            state.tokenize = tokenFString
+            if (stream.current()) {
+              return OUTCLASS;
+            } else {
+              // need to return something, so eat the starting {
+              stream.next();
+              return "punctuation";
+            }
+          } else if (stream.match('}}')) {
+            return OUTCLASS;
+          } else if (stream.match('}')) {
+            // single } in f-string is an error
+            return ERRORCLASS;
+          } else {
+            stream.eat(/['"]/);
+          }
+        }
+        if (singleline) {
+          if (parserConf.singleLineStringErrors)
+            return ERRORCLASS;
+          else
+            state.tokenize = tokenOuter;
+        }
+        return OUTCLASS;
+      }
+      tokenString.isString = true;
+      return tokenString;
+    }
+
+    function tokenStringFactory(delimiter) {
+      while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
+        delimiter = delimiter.substr(1);
+
+      var singleline = delimiter.length == 1;
+      var OUTCLASS = "string";
+
+      function tokenString(stream, state) {
+        while (!stream.eol()) {
+          stream.eatWhile(/[^'"\\]/);
+          if (stream.eat("\\")) {
+            stream.next();
+            if (singleline && stream.eol())
+              return OUTCLASS;
+          } else if (stream.match(delimiter)) {
+            state.tokenize = tokenBase;
+            return OUTCLASS;
+          } else {
+            stream.eat(/['"]/);
+          }
+        }
+        if (singleline) {
+          if (parserConf.singleLineStringErrors)
+            return ERRORCLASS;
+          else
+            state.tokenize = tokenBase;
+        }
+        return OUTCLASS;
+      }
+      tokenString.isString = true;
+      return tokenString;
+    }
+
+    function pushPyScope(state) {
+      while (top(state).type != "py") state.scopes.pop()
+      state.scopes.push({offset: top(state).offset + conf.indentUnit,
+                         type: "py",
+                         align: null})
+    }
+
+    function pushBracketScope(stream, state, type) {
+      var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
+      state.scopes.push({offset: state.indent + hangingIndent,
+                         type: type,
+                         align: align})
+    }
+
+    function dedent(stream, state) {
+      var indented = stream.indentation();
+      while (state.scopes.length > 1 && top(state).offset > indented) {
+        if (top(state).type != "py") return true;
+        state.scopes.pop();
+      }
+      return top(state).offset != indented;
+    }
+
+    function tokenLexer(stream, state) {
+      if (stream.sol()) state.beginningOfLine = true;
+
+      var style = state.tokenize(stream, state);
+      var current = stream.current();
+
+      // Handle decorators
+      if (state.beginningOfLine && current == "@")
+        return stream.match(identifiers, false) ? "meta" : py3 ? "operator" : ERRORCLASS;
+
+      if (/\S/.test(current)) state.beginningOfLine = false;
+
+      if ((style == "variable" || style == "builtin")
+          && state.lastToken == "meta")
+        style = "meta";
+
+      // Handle scope changes.
+      if (current == "pass" || current == "return")
+        state.dedent += 1;
+
+      if (current == "lambda") state.lambda = true;
+      if (current == ":" && !state.lambda && top(state).type == "py")
+        pushPyScope(state);
+
+      if (current.length == 1 && !/string|comment/.test(style)) {
+        var delimiter_index = "[({".indexOf(current);
+        if (delimiter_index != -1)
+          pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+
+        delimiter_index = "])}".indexOf(current);
+        if (delimiter_index != -1) {
+          if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
+          else return ERRORCLASS;
+        }
+      }
+      if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
+        if (state.scopes.length > 1) state.scopes.pop();
+        state.dedent -= 1;
+      }
+
+      return style;
+    }
+
+    var external = {
+      startState: function(basecolumn) {
+        return {
+          tokenize: tokenBase,
+          scopes: [{offset: basecolumn || 0, type: "py", align: null}],
+          indent: basecolumn || 0,
+          lastToken: null,
+          lambda: false,
+          dedent: 0
+        };
+      },
+
+      token: function(stream, state) {
+        var addErr = state.errorToken;
+        if (addErr) state.errorToken = false;
+        var style = tokenLexer(stream, state);
+
+        if (style && style != "comment")
+          state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
+        if (style == "punctuation") style = null;
+
+        if (stream.eol() && state.lambda)
+          state.lambda = false;
+        return addErr ? style + " " + ERRORCLASS : style;
+      },
+
+      indent: function(state, textAfter) {
+        if (state.tokenize != tokenBase)
+          return state.tokenize.isString ? CodeMirror.Pass : 0;
+
+        var scope = top(state), closing = scope.type == textAfter.charAt(0)
+        if (scope.align != null)
+          return scope.align - (closing ? 1 : 0)
+        else
+          return scope.offset - (closing ? hangingIndent : 0)
+      },
+
+      electricInput: /^\s*[\}\]\)]$/,
+      closeBrackets: {triples: "'\""},
+      lineComment: "#",
+      fold: "indent"
+    };
+    return external;
+  });
+
+  CodeMirror.defineMIME("text/x-python", "python");
+
+  var words = function(str) { return str.split(" "); };
+
+  CodeMirror.defineMIME("text/x-cython", {
+    name: "python",
+    extra_keywords: words("by cdef cimport cpdef ctypedef enum except "+
+                          "extern gil include nogil property public "+
+                          "readonly struct union DEF IF ELIF ELSE")
+  });
+
+});
diff --git a/core/media/editors/codemirror/mode/python/python.min.js b/core/media/editors/codemirror/mode/python/python.min.js
new file mode 100644
index 00000000..75c93c06
--- /dev/null
+++ b/core/media/editors/codemirror/mode/python/python.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a){return a.scopes[a.scopes.length-1]}var d=b(["and","or","not","is"]),e=["as","assert","break","class","continue","def","del","elif","else","except","finally","for","from","global","if","import","lambda","pass","raise","return","try","while","with","yield","in"],f=["abs","all","any","bin","bool","bytearray","callable","chr","classmethod","compile","complex","delattr","dict","dir","divmod","enumerate","eval","filter","float","format","frozenset","getattr","globals","hasattr","hash","help","hex","id","input","int","isinstance","issubclass","iter","len","list","locals","map","max","memoryview","min","next","object","oct","open","ord","pow","property","range","repr","reversed","round","set","setattr","slice","sorted","staticmethod","str","sum","super","tuple","type","vars","zip","__import__","NotImplemented","Ellipsis","__debug__"];a.registerHelper("hintWords","python",e.concat(f)),a.defineMode("python",(function(g,h){function i(a,b){var d=a.sol()&&"\\"!=b.lastToken;if(d&&(b.indent=a.indentation()),d&&"py"==c(b).type){var e=c(b).offset;if(a.eatSpace()){var f=a.indentation();return f>e?m(b):f<e&&o(a,b)&&"#"!=a.peek()&&(b.errorToken=!0),null}var g=j(a,b);return e>0&&o(a,b)&&(g+=" "+q),g}return j(a,b)}function j(a,b){if(a.eatSpace())return null;if(a.match(/^#.*/))return"comment";if(a.match(/^[0-9\.]/,!1)){var c=!1;if(a.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)&&(c=!0),a.match(/^[\d_]+\.\d*/)&&(c=!0),a.match(/^\.\d+/)&&(c=!0),c)return a.eat(/J/i),"number";var e=!1;if(a.match(/^0x[0-9a-f_]+/i)&&(e=!0),a.match(/^0b[01_]+/i)&&(e=!0),a.match(/^0o[0-7_]+/i)&&(e=!0),a.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)&&(a.eat(/J/i),e=!0),a.match(/^0(?![\dx])/i)&&(e=!0),e)return a.eat(/L/i),"number"}if(a.match(z)){var f=a.current().toLowerCase().indexOf("f")!==-1;return f?(b.tokenize=k(a.current(),b.tokenize),b.tokenize(a,b)):(b.tokenize=l(a.current()),b.tokenize(a,b))}for(var g=0;g<s.length;g++)if(a.match(s[g]))return"operator";return a.match(r)?"punctuation":"."==b.lastToken&&a.match(y)?"property":a.match(A)||a.match(d)?"keyword":a.match(B)?"builtin":a.match(/^(self|cls)\b/)?"variable-2":a.match(y)?"def"==b.lastToken||"class"==b.lastToken?"def":"variable":(a.next(),q)}function k(a,b){function c(b,c){return b.match(a)?(c.tokenize=d,f):b.match("{")?"punctuation":b.match("}")?(c.tokenize=d,"punctuation"):j(b,c)}function d(d,g){for(;!d.eol();)if(d.eatWhile(/[^'"\{\}\\]/),d.eat("\\")){if(d.next(),e&&d.eol())return f}else{if(d.match(a))return g.tokenize=b,f;if(d.match("{{"))return f;if(d.match("{",!1))return g.tokenize=c,d.current()?f:(d.next(),"punctuation");if(d.match("}}"))return f;if(d.match("}"))return q;d.eat(/['"]/)}if(e){if(h.singleLineStringErrors)return q;g.tokenize=b}return f}for(;"rubf".indexOf(a.charAt(0).toLowerCase())>=0;)a=a.substr(1);var e=1==a.length,f="string";return d.isString=!0,d}function l(a){function b(b,e){for(;!b.eol();)if(b.eatWhile(/[^'"\\]/),b.eat("\\")){if(b.next(),c&&b.eol())return d}else{if(b.match(a))return e.tokenize=i,d;b.eat(/['"]/)}if(c){if(h.singleLineStringErrors)return q;e.tokenize=i}return d}for(;"rubf".indexOf(a.charAt(0).toLowerCase())>=0;)a=a.substr(1);var c=1==a.length,d="string";return b.isString=!0,b}function m(a){for(;"py"!=c(a).type;)a.scopes.pop();a.scopes.push({offset:c(a).offset+g.indentUnit,type:"py",align:null})}function n(a,b,c){var d=a.match(/^([\s\[\{\(]|#.*)*$/,!1)?null:a.column()+1;b.scopes.push({offset:b.indent+u,type:c,align:d})}function o(a,b){for(var d=a.indentation();b.scopes.length>1&&c(b).offset>d;){if("py"!=c(b).type)return!0;b.scopes.pop()}return c(b).offset!=d}function p(a,b){a.sol()&&(b.beginningOfLine=!0);var d=b.tokenize(a,b),e=a.current();if(b.beginningOfLine&&"@"==e)return a.match(y,!1)?"meta":x?"operator":q;if(/\S/.test(e)&&(b.beginningOfLine=!1),"variable"!=d&&"builtin"!=d||"meta"!=b.lastToken||(d="meta"),"pass"!=e&&"return"!=e||(b.dedent+=1),"lambda"==e&&(b.lambda=!0),":"!=e||b.lambda||"py"!=c(b).type||m(b),1==e.length&&!/string|comment/.test(d)){var f="[({".indexOf(e);if(f!=-1&&n(a,b,"])}".slice(f,f+1)),f="])}".indexOf(e),f!=-1){if(c(b).type!=e)return q;b.indent=b.scopes.pop().offset-u}}return b.dedent>0&&a.eol()&&"py"==c(b).type&&(b.scopes.length>1&&b.scopes.pop(),b.dedent-=1),d}for(var q="error",r=h.delimiters||h.singleDelimiters||/^[\(\)\[\]\{\}@,:`=;\.\\]/,s=[h.singleOperators,h.doubleOperators,h.doubleDelimiters,h.tripleDelimiters,h.operators||/^([-+*\/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@])/],t=0;t<s.length;t++)s[t]||s.splice(t--,1);var u=h.hangingIndent||g.indentUnit,v=e,w=f;void 0!=h.extra_keywords&&(v=v.concat(h.extra_keywords)),void 0!=h.extra_builtins&&(w=w.concat(h.extra_builtins));var x=!(h.version&&Number(h.version)<3);if(x){var y=h.identifiers||/^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;v=v.concat(["nonlocal","False","True","None","async","await"]),w=w.concat(["ascii","bytes","exec","print"]);var z=new RegExp("^(([rbuf]|(br)|(fr))?('{3}|\"{3}|['\"]))","i")}else{var y=h.identifiers||/^[_A-Za-z][_A-Za-z0-9]*/;v=v.concat(["exec","print"]),w=w.concat(["apply","basestring","buffer","cmp","coerce","execfile","file","intern","long","raw_input","reduce","reload","unichr","unicode","xrange","False","True","None"]);var z=new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))","i")}var A=b(v),B=b(w),C={startState:function(a){return{tokenize:i,scopes:[{offset:a||0,type:"py",align:null}],indent:a||0,lastToken:null,lambda:!1,dedent:0}},token:function(a,b){var c=b.errorToken;c&&(b.errorToken=!1);var d=p(a,b);return d&&"comment"!=d&&(b.lastToken="keyword"==d||"punctuation"==d?a.current():d),"punctuation"==d&&(d=null),a.eol()&&b.lambda&&(b.lambda=!1),c?d+" "+q:d},indent:function(b,d){if(b.tokenize!=i)return b.tokenize.isString?a.Pass:0;var e=c(b),f=e.type==d.charAt(0);return null!=e.align?e.align-(f?1:0):e.offset-(f?u:0)},electricInput:/^\s*[\}\]\)]$/,closeBrackets:{triples:"'\""},lineComment:"#",fold:"indent"};return C})),a.defineMIME("text/x-python","python");var g=function(a){return a.split(" ")};a.defineMIME("text/x-cython",{name:"python",extra_keywords:g("by cdef cimport cpdef ctypedef enum except extern gil include nogil property public readonly struct union DEF IF ELIF ELSE")})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/q/q.js b/core/media/editors/codemirror/mode/q/q.js
new file mode 100644
index 00000000..9aee18ab
--- /dev/null
+++ b/core/media/editors/codemirror/mode/q/q.js
@@ -0,0 +1,139 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("q",function(config){
+  var indentUnit=config.indentUnit,
+      curPunc,
+      keywords=buildRE(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]),
+      E=/[|/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/;
+  function buildRE(w){return new RegExp("^("+w.join("|")+")$");}
+  function tokenBase(stream,state){
+    var sol=stream.sol(),c=stream.next();
+    curPunc=null;
+    if(sol)
+      if(c=="/")
+        return(state.tokenize=tokenLineComment)(stream,state);
+      else if(c=="\\"){
+        if(stream.eol()||/\s/.test(stream.peek()))
+          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream):state.tokenize=tokenBase,"comment";
+        else
+          return state.tokenize=tokenBase,"builtin";
+      }
+    if(/\s/.test(c))
+      return stream.peek()=="/"?(stream.skipToEnd(),"comment"):"whitespace";
+    if(c=='"')
+      return(state.tokenize=tokenString)(stream,state);
+    if(c=='`')
+      return stream.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";
+    if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
+      var t=null;
+      stream.backUp(1);
+      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
+      || stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
+      || stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
+      || stream.match(/^\d+[ptuv]{1}/))
+        t="temporal";
+      else if(stream.match(/^0[NwW]{1}/)
+      || stream.match(/^0x[\da-fA-F]*/)
+      || stream.match(/^[01]+[b]{1}/)
+      || stream.match(/^\d+[chijn]{1}/)
+      || stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
+        t="number";
+      return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
+    }
+    if(/[A-Za-z]|\./.test(c))
+      return stream.eatWhile(/[A-Za-z._\d]/),keywords.test(stream.current())?"keyword":"variable";
+    if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
+      return null;
+    if(/[{}\(\[\]\)]/.test(c))
+      return null;
+    return"error";
+  }
+  function tokenLineComment(stream,state){
+    return stream.skipToEnd(),/\/\s*$/.test(stream.current())?(state.tokenize=tokenBlockComment)(stream,state):(state.tokenize=tokenBase),"comment";
+  }
+  function tokenBlockComment(stream,state){
+    var f=stream.sol()&&stream.peek()=="\\";
+    stream.skipToEnd();
+    if(f&&/^\\\s*$/.test(stream.current()))
+      state.tokenize=tokenBase;
+    return"comment";
+  }
+  function tokenCommentToEOF(stream){return stream.skipToEnd(),"comment";}
+  function tokenString(stream,state){
+    var escaped=false,next,end=false;
+    while((next=stream.next())){
+      if(next=="\""&&!escaped){end=true;break;}
+      escaped=!escaped&&next=="\\";
+    }
+    if(end)state.tokenize=tokenBase;
+    return"string";
+  }
+  function pushContext(state,type,col){state.context={prev:state.context,indent:state.indent,col:col,type:type};}
+  function popContext(state){state.indent=state.context.indent;state.context=state.context.prev;}
+  return{
+    startState:function(){
+      return{tokenize:tokenBase,
+             context:null,
+             indent:0,
+             col:0};
+    },
+    token:function(stream,state){
+      if(stream.sol()){
+        if(state.context&&state.context.align==null)
+          state.context.align=false;
+        state.indent=stream.indentation();
+      }
+      //if (stream.eatSpace()) return null;
+      var style=state.tokenize(stream,state);
+      if(style!="comment"&&state.context&&state.context.align==null&&state.context.type!="pattern"){
+        state.context.align=true;
+      }
+      if(curPunc=="(")pushContext(state,")",stream.column());
+      else if(curPunc=="[")pushContext(state,"]",stream.column());
+      else if(curPunc=="{")pushContext(state,"}",stream.column());
+      else if(/[\]\}\)]/.test(curPunc)){
+        while(state.context&&state.context.type=="pattern")popContext(state);
+        if(state.context&&curPunc==state.context.type)popContext(state);
+      }
+      else if(curPunc=="."&&state.context&&state.context.type=="pattern")popContext(state);
+      else if(/atom|string|variable/.test(style)&&state.context){
+        if(/[\}\]]/.test(state.context.type))
+          pushContext(state,"pattern",stream.column());
+        else if(state.context.type=="pattern"&&!state.context.align){
+          state.context.align=true;
+          state.context.col=stream.column();
+        }
+      }
+      return style;
+    },
+    indent:function(state,textAfter){
+      var firstChar=textAfter&&textAfter.charAt(0);
+      var context=state.context;
+      if(/[\]\}]/.test(firstChar))
+        while (context&&context.type=="pattern")context=context.prev;
+      var closing=context&&firstChar==context.type;
+      if(!context)
+        return 0;
+      else if(context.type=="pattern")
+        return context.col;
+      else if(context.align)
+        return context.col+(closing?0:1);
+      else
+        return context.indent+(closing?0:indentUnit);
+    }
+  };
+});
+CodeMirror.defineMIME("text/x-q","q");
+
+});
diff --git a/core/media/editors/codemirror/mode/q/q.min.js b/core/media/editors/codemirror/mode/q/q.min.js
new file mode 100644
index 00000000..01f3e7e9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/q/q.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("q",(function(a){function b(a){return new RegExp("^("+a.join("|")+")$")}function c(a,b){var e=a.sol(),h=a.next();if(j=null,e){if("/"==h)return(b.tokenize=d)(a,b);if("\\"==h)return a.eol()||/\s/.test(a.peek())?(a.skipToEnd(),/^\\\s*$/.test(a.current())?(b.tokenize=f)(a):b.tokenize=c,"comment"):(b.tokenize=c,"builtin")}if(/\s/.test(h))return"/"==a.peek()?(a.skipToEnd(),"comment"):"whitespace";if('"'==h)return(b.tokenize=g)(a,b);if("`"==h)return a.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";if("."==h&&/\d/.test(a.peek())||/\d/.test(h)){var i=null;return a.backUp(1),a.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)||a.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)||a.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)||a.match(/^\d+[ptuv]{1}/)?i="temporal":(a.match(/^0[NwW]{1}/)||a.match(/^0x[\da-fA-F]*/)||a.match(/^[01]+[b]{1}/)||a.match(/^\d+[chijn]{1}/)||a.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))&&(i="number"),!i||(h=a.peek())&&!m.test(h)?(a.next(),"error"):i}return/[A-Za-z]|\./.test(h)?(a.eatWhile(/[A-Za-z._\d]/),l.test(a.current())?"keyword":"variable"):/[|\/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(h)?null:/[{}\(\[\]\)]/.test(h)?null:"error"}function d(a,b){return a.skipToEnd(),/\/\s*$/.test(a.current())?(b.tokenize=e)(a,b):b.tokenize=c,"comment"}function e(a,b){var d=a.sol()&&"\\"==a.peek();return a.skipToEnd(),d&&/^\\\s*$/.test(a.current())&&(b.tokenize=c),"comment"}function f(a){return a.skipToEnd(),"comment"}function g(a,b){for(var d,e=!1,f=!1;d=a.next();){if('"'==d&&!e){f=!0;break}e=!e&&"\\"==d}return f&&(b.tokenize=c),"string"}function h(a,b,c){a.context={prev:a.context,indent:a.indent,col:c,type:b}}function i(a){a.indent=a.context.indent,a.context=a.context.prev}var j,k=a.indentUnit,l=b(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]),m=/[|\/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/;return{startState:function(){return{tokenize:c,context:null,indent:0,col:0}},token:function(a,b){a.sol()&&(b.context&&null==b.context.align&&(b.context.align=!1),b.indent=a.indentation());var c=b.tokenize(a,b);if("comment"!=c&&b.context&&null==b.context.align&&"pattern"!=b.context.type&&(b.context.align=!0),"("==j)h(b,")",a.column());else if("["==j)h(b,"]",a.column());else if("{"==j)h(b,"}",a.column());else if(/[\]\}\)]/.test(j)){for(;b.context&&"pattern"==b.context.type;)i(b);b.context&&j==b.context.type&&i(b)}else"."==j&&b.context&&"pattern"==b.context.type?i(b):/atom|string|variable/.test(c)&&b.context&&(/[\}\]]/.test(b.context.type)?h(b,"pattern",a.column()):"pattern"!=b.context.type||b.context.align||(b.context.align=!0,b.context.col=a.column()));return c},indent:function(a,b){var c=b&&b.charAt(0),d=a.context;if(/[\]\}]/.test(c))for(;d&&"pattern"==d.type;)d=d.prev;var e=d&&c==d.type;return d?"pattern"==d.type?d.col:d.align?d.col+(e?0:1):d.indent+(e?0:k):0}}})),a.defineMIME("text/x-q","q")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/r/r.js b/core/media/editors/codemirror/mode/r/r.js
new file mode 100644
index 00000000..be7db46b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/r/r.js
@@ -0,0 +1,183 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.registerHelper("wordChars", "r", /[\w.]/);
+
+CodeMirror.defineMode("r", function(config) {
+  function wordObj(str) {
+    var words = str.split(" "), res = {};
+    for (var i = 0; i < words.length; ++i) res[words[i]] = true;
+    return res;
+  }
+  var atoms = wordObj("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_");
+  var builtins = wordObj("list quote bquote eval return call parse deparse");
+  var keywords = wordObj("if else repeat while function for in next break");
+  var blockkeywords = wordObj("if else repeat while function for");
+  var opChars = /[+\-*\/^<>=!&|~$:]/;
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    curPunc = null;
+    var ch = stream.next();
+    if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == "0" && stream.eat("x")) {
+      stream.eatWhile(/[\da-f]/i);
+      return "number";
+    } else if (ch == "." && stream.eat(/\d/)) {
+      stream.match(/\d*(?:e[+\-]?\d+)?/);
+      return "number";
+    } else if (/\d/.test(ch)) {
+      stream.match(/\d*(?:\.\d+)?(?:e[+\-]\d+)?L?/);
+      return "number";
+    } else if (ch == "'" || ch == '"') {
+      state.tokenize = tokenString(ch);
+      return "string";
+    } else if (ch == "`") {
+      stream.match(/[^`]+`/);
+      return "variable-3";
+    } else if (ch == "." && stream.match(/.[.\d]+/)) {
+      return "keyword";
+    } else if (/[\w\.]/.test(ch) && ch != "_") {
+      stream.eatWhile(/[\w\.]/);
+      var word = stream.current();
+      if (atoms.propertyIsEnumerable(word)) return "atom";
+      if (keywords.propertyIsEnumerable(word)) {
+        // Block keywords start new blocks, except 'else if', which only starts
+        // one new block for the 'if', no block for the 'else'.
+        if (blockkeywords.propertyIsEnumerable(word) &&
+            !stream.match(/\s*if(\s+|$)/, false))
+          curPunc = "block";
+        return "keyword";
+      }
+      if (builtins.propertyIsEnumerable(word)) return "builtin";
+      return "variable";
+    } else if (ch == "%") {
+      if (stream.skipTo("%")) stream.next();
+      return "operator variable-2";
+    } else if (
+        (ch == "<" && stream.eat("-")) ||
+        (ch == "<" && stream.match("<-")) ||
+        (ch == "-" && stream.match(/>>?/))
+      ) {
+      return "operator arrow";
+    } else if (ch == "=" && state.ctx.argList) {
+      return "arg-is";
+    } else if (opChars.test(ch)) {
+      if (ch == "$") return "operator dollar";
+      stream.eatWhile(opChars);
+      return "operator";
+    } else if (/[\(\){}\[\];]/.test(ch)) {
+      curPunc = ch;
+      if (ch == ";") return "semi";
+      return null;
+    } else {
+      return null;
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      if (stream.eat("\\")) {
+        var ch = stream.next();
+        if (ch == "x") stream.match(/^[a-f0-9]{2}/i);
+        else if ((ch == "u" || ch == "U") && stream.eat("{") && stream.skipTo("}")) stream.next();
+        else if (ch == "u") stream.match(/^[a-f0-9]{4}/i);
+        else if (ch == "U") stream.match(/^[a-f0-9]{8}/i);
+        else if (/[0-7]/.test(ch)) stream.match(/^[0-7]{1,2}/);
+        return "string-2";
+      } else {
+        var next;
+        while ((next = stream.next()) != null) {
+          if (next == quote) { state.tokenize = tokenBase; break; }
+          if (next == "\\") { stream.backUp(1); break; }
+        }
+        return "string";
+      }
+    };
+  }
+
+  var ALIGN_YES = 1, ALIGN_NO = 2, BRACELESS = 4
+
+  function push(state, type, stream) {
+    state.ctx = {type: type,
+                 indent: state.indent,
+                 flags: 0,
+                 column: stream.column(),
+                 prev: state.ctx};
+  }
+  function setFlag(state, flag) {
+    var ctx = state.ctx
+    state.ctx = {type: ctx.type,
+                 indent: ctx.indent,
+                 flags: ctx.flags | flag,
+                 column: ctx.column,
+                 prev: ctx.prev}
+  }
+  function pop(state) {
+    state.indent = state.ctx.indent;
+    state.ctx = state.ctx.prev;
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: tokenBase,
+              ctx: {type: "top",
+                    indent: -config.indentUnit,
+                    flags: ALIGN_NO},
+              indent: 0,
+              afterIdent: false};
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        if ((state.ctx.flags & 3) == 0) state.ctx.flags |= ALIGN_NO
+        if (state.ctx.flags & BRACELESS) pop(state)
+        state.indent = stream.indentation();
+      }
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      if (style != "comment" && (state.ctx.flags & ALIGN_NO) == 0) setFlag(state, ALIGN_YES)
+
+      if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && state.ctx.type == "block") pop(state);
+      if (curPunc == "{") push(state, "}", stream);
+      else if (curPunc == "(") {
+        push(state, ")", stream);
+        if (state.afterIdent) state.ctx.argList = true;
+      }
+      else if (curPunc == "[") push(state, "]", stream);
+      else if (curPunc == "block") push(state, "block", stream);
+      else if (curPunc == state.ctx.type) pop(state);
+      else if (state.ctx.type == "block" && style != "comment") setFlag(state, BRACELESS)
+      state.afterIdent = style == "variable" || style == "keyword";
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx,
+          closing = firstChar == ctx.type;
+      if (ctx.flags & BRACELESS) ctx = ctx.prev
+      if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
+      else if (ctx.flags & ALIGN_YES) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indent + (closing ? 0 : config.indentUnit);
+    },
+
+    lineComment: "#"
+  };
+});
+
+CodeMirror.defineMIME("text/x-rsrc", "r");
+
+});
diff --git a/core/media/editors/codemirror/mode/r/r.min.js b/core/media/editors/codemirror/mode/r/r.min.js
new file mode 100644
index 00000000..3c17f634
--- /dev/null
+++ b/core/media/editors/codemirror/mode/r/r.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.registerHelper("wordChars","r",/[\w.]/),a.defineMode("r",(function(a){function b(a){for(var b=a.split(" "),c={},d=0;d<b.length;++d)c[b[d]]=!0;return c}function c(a,b){h=null;var c=a.next();if("#"==c)return a.skipToEnd(),"comment";if("0"==c&&a.eat("x"))return a.eatWhile(/[\da-f]/i),"number";if("."==c&&a.eat(/\d/))return a.match(/\d*(?:e[+\-]?\d+)?/),"number";if(/\d/.test(c))return a.match(/\d*(?:\.\d+)?(?:e[+\-]\d+)?L?/),"number";if("'"==c||'"'==c)return b.tokenize=d(c),"string";if("`"==c)return a.match(/[^`]+`/),"variable-3";if("."==c&&a.match(/.[.\d]+/))return"keyword";if(/[\w\.]/.test(c)&&"_"!=c){a.eatWhile(/[\w\.]/);var e=a.current();return i.propertyIsEnumerable(e)?"atom":k.propertyIsEnumerable(e)?(l.propertyIsEnumerable(e)&&!a.match(/\s*if(\s+|$)/,!1)&&(h="block"),"keyword"):j.propertyIsEnumerable(e)?"builtin":"variable"}return"%"==c?(a.skipTo("%")&&a.next(),"operator variable-2"):"<"==c&&a.eat("-")||"<"==c&&a.match("<-")||"-"==c&&a.match(/>>?/)?"operator arrow":"="==c&&b.ctx.argList?"arg-is":m.test(c)?"$"==c?"operator dollar":(a.eatWhile(m),"operator"):/[\(\){}\[\];]/.test(c)?(h=c,";"==c?"semi":null):null}function d(a){return function(b,d){if(b.eat("\\")){var e=b.next();return"x"==e?b.match(/^[a-f0-9]{2}/i):("u"==e||"U"==e)&&b.eat("{")&&b.skipTo("}")?b.next():"u"==e?b.match(/^[a-f0-9]{4}/i):"U"==e?b.match(/^[a-f0-9]{8}/i):/[0-7]/.test(e)&&b.match(/^[0-7]{1,2}/),"string-2"}for(var f;null!=(f=b.next());){if(f==a){d.tokenize=c;break}if("\\"==f){b.backUp(1);break}}return"string"}}function e(a,b,c){a.ctx={type:b,indent:a.indent,flags:0,column:c.column(),prev:a.ctx}}function f(a,b){var c=a.ctx;a.ctx={type:c.type,indent:c.indent,flags:c.flags|b,column:c.column,prev:c.prev}}function g(a){a.indent=a.ctx.indent,a.ctx=a.ctx.prev}var h,i=b("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_"),j=b("list quote bquote eval return call parse deparse"),k=b("if else repeat while function for in next break"),l=b("if else repeat while function for"),m=/[+\-*\/^<>=!&|~$:]/,n=1,o=2,p=4;return{startState:function(){return{tokenize:c,ctx:{type:"top",indent:-a.indentUnit,flags:o},indent:0,afterIdent:!1}},token:function(a,b){if(a.sol()&&(0==(3&b.ctx.flags)&&(b.ctx.flags|=o),b.ctx.flags&p&&g(b),b.indent=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);return"comment"!=c&&0==(b.ctx.flags&o)&&f(b,n),";"!=h&&"{"!=h&&"}"!=h||"block"!=b.ctx.type||g(b),"{"==h?e(b,"}",a):"("==h?(e(b,")",a),b.afterIdent&&(b.ctx.argList=!0)):"["==h?e(b,"]",a):"block"==h?e(b,"block",a):h==b.ctx.type?g(b):"block"==b.ctx.type&&"comment"!=c&&f(b,p),b.afterIdent="variable"==c||"keyword"==c,c},indent:function(b,d){if(b.tokenize!=c)return 0;var e=d&&d.charAt(0),f=b.ctx,g=e==f.type;return f.flags&p&&(f=f.prev),"block"==f.type?f.indent+("{"==e?0:a.indentUnit):f.flags&n?f.column+(g?0:1):f.indent+(g?0:a.indentUnit)},lineComment:"#"}})),a.defineMIME("text/x-rsrc","r")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/rpm/changes/index.html b/core/media/editors/codemirror/mode/rpm/changes/index.html
new file mode 100644
index 00000000..6e5031bd
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rpm/changes/index.html
@@ -0,0 +1,66 @@
+<!doctype html>
+
+<title>CodeMirror: RPM changes mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+    <link rel="stylesheet" href="../../../lib/codemirror.css">
+    <script src="../../../lib/codemirror.js"></script>
+    <script src="changes.js"></script>
+    <link rel="stylesheet" href="../../../doc/docs.css">
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+
+<div id=nav>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
+
+  <ul>
+    <li><a href="../../../index.html">Home</a>
+    <li><a href="../../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../../index.html">Language modes</a>
+    <li><a class=active href="#">RPM changes</a>
+  </ul>
+</div>
+
+<article>
+<h2>RPM changes mode</h2>
+
+    <div><textarea id="code" name="code">
+-------------------------------------------------------------------
+Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
+
+- Update to r60.3
+- Fixes bug in the reflect package
+  * disallow Interface method on Value obtained via unexported name
+
+-------------------------------------------------------------------
+Thu Oct  6 08:14:24 UTC 2011 - misterx@example.com
+
+- Update to r60.2
+- Fixes memory leak in certain map types
+
+-------------------------------------------------------------------
+Wed Oct  5 14:34:10 UTC 2011 - misterx@example.com
+
+- Tweaks for gdb debugging
+- go.spec changes:
+  - move %go_arch definition to %prep section
+  - pass correct location of go specific gdb pretty printer and
+    functions to cpp as HOST_EXTRA_CFLAGS macro
+  - install go gdb functions & printer
+- gdb-printer.patch
+  - patch linker (src/cmd/ld/dwarf.c) to emit correct location of go
+    gdb functions and pretty printer
+</textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "changes"},
+        lineNumbers: true,
+        indentUnit: 4
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-rpm-changes</code>.</p>
+</article>
diff --git a/core/media/editors/codemirror/mode/rpm/rpm.js b/core/media/editors/codemirror/mode/rpm/rpm.js
new file mode 100644
index 00000000..87cde591
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rpm/rpm.js
@@ -0,0 +1,109 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("rpm-changes", function() {
+  var headerSeperator = /^-+$/;
+  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
+  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
+
+  return {
+    token: function(stream) {
+      if (stream.sol()) {
+        if (stream.match(headerSeperator)) { return 'tag'; }
+        if (stream.match(headerLine)) { return 'tag'; }
+      }
+      if (stream.match(simpleEmail)) { return 'string'; }
+      stream.next();
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes");
+
+// Quick and dirty spec file highlighting
+
+CodeMirror.defineMode("rpm-spec", function() {
+  var arch = /^(i386|i586|i686|x86_64|ppc64le|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
+
+  var preamble = /^[a-zA-Z0-9()]+:/;
+  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pretrans|posttrans|pre|post|triggerin|triggerun|verifyscript|check|triggerpostun|triggerprein|trigger)/;
+  var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
+  var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
+  var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros
+
+  return {
+    startState: function () {
+        return {
+          controlFlow: false,
+          macroParameters: false,
+          section: false
+        };
+    },
+    token: function (stream, state) {
+      var ch = stream.peek();
+      if (ch == "#") { stream.skipToEnd(); return "comment"; }
+
+      if (stream.sol()) {
+        if (stream.match(preamble)) { return "header"; }
+        if (stream.match(section)) { return "atom"; }
+      }
+
+      if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT'
+      if (stream.match(/^\$\{\w+\}/)) { return "def"; } // Variables like '${RPM_BUILD_ROOT}'
+
+      if (stream.match(control_flow_simple)) { return "keyword"; }
+      if (stream.match(control_flow_complex)) {
+        state.controlFlow = true;
+        return "keyword";
+      }
+      if (state.controlFlow) {
+        if (stream.match(operators)) { return "operator"; }
+        if (stream.match(/^(\d+)/)) { return "number"; }
+        if (stream.eol()) { state.controlFlow = false; }
+      }
+
+      if (stream.match(arch)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "number";
+      }
+
+      // Macros like '%make_install' or '%attr(0775,root,root)'
+      if (stream.match(/^%[\w]+/)) {
+        if (stream.match(/^\(/)) { state.macroParameters = true; }
+        return "keyword";
+      }
+      if (state.macroParameters) {
+        if (stream.match(/^\d+/)) { return "number";}
+        if (stream.match(/^\)/)) {
+          state.macroParameters = false;
+          return "keyword";
+        }
+      }
+
+      // Macros like '%{defined fedora}'
+      if (stream.match(/^%\{\??[\w \-\:\!]+\}/)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "def";
+      }
+
+      //TODO: Include bash script sub-parser (CodeMirror supports that)
+      stream.next();
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-rpm-spec", "rpm-spec");
+
+});
diff --git a/core/media/editors/codemirror/mode/rpm/rpm.min.js b/core/media/editors/codemirror/mode/rpm/rpm.min.js
new file mode 100644
index 00000000..eec5399b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rpm/rpm.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("rpm-changes",(function(){var a=/^-+$/,b=/^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /,c=/^[\w+.-]+@[\w.-]+/;return{token:function(d){if(d.sol()){if(d.match(a))return"tag";if(d.match(b))return"tag"}return d.match(c)?"string":(d.next(),null)}}})),a.defineMIME("text/x-rpm-changes","rpm-changes"),a.defineMode("rpm-spec",(function(){var a=/^(i386|i586|i686|x86_64|ppc64le|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/,b=/^[a-zA-Z0-9()]+:/,c=/^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pretrans|posttrans|pre|post|triggerin|triggerun|verifyscript|check|triggerpostun|triggerprein|trigger)/,d=/^%(ifnarch|ifarch|if)/,e=/^%(else|endif)/,f=/^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/;return{startState:function(){return{controlFlow:!1,macroParameters:!1,section:!1}},token:function(g,h){var i=g.peek();if("#"==i)return g.skipToEnd(),"comment";if(g.sol()){if(g.match(b))return"header";if(g.match(c))return"atom"}if(g.match(/^\$\w+/))return"def";if(g.match(/^\$\{\w+\}/))return"def";if(g.match(e))return"keyword";if(g.match(d))return h.controlFlow=!0,"keyword";if(h.controlFlow){if(g.match(f))return"operator";if(g.match(/^(\d+)/))return"number";g.eol()&&(h.controlFlow=!1)}if(g.match(a))return g.eol()&&(h.controlFlow=!1),"number";if(g.match(/^%[\w]+/))return g.match(/^\(/)&&(h.macroParameters=!0),"keyword";if(h.macroParameters){if(g.match(/^\d+/))return"number";if(g.match(/^\)/))return h.macroParameters=!1,"keyword"}return g.match(/^%\{\??[\w \-\:\!]+\}/)?(g.eol()&&(h.controlFlow=!1),"def"):(g.next(),null)}}})),a.defineMIME("text/x-rpm-spec","rpm-spec")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/rst/rst.js b/core/media/editors/codemirror/mode/rst/rst.js
new file mode 100644
index 00000000..bcf110c1
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rst/rst.js
@@ -0,0 +1,557 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"), require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../python/python", "../stex/stex", "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('rst', function (config, options) {
+
+  var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/;
+  var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/;
+  var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/;
+
+  var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
+  var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
+  var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
+
+  var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://";
+  var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})";
+  var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*";
+  var rx_uri = new RegExp("^" + rx_uri_protocol + rx_uri_domain + rx_uri_path);
+
+  var overlay = {
+    token: function (stream) {
+
+      if (stream.match(rx_strong) && stream.match (/\W+|$/, false))
+        return 'strong';
+      if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false))
+        return 'em';
+      if (stream.match(rx_literal) && stream.match (/\W+|$/, false))
+        return 'string-2';
+      if (stream.match(rx_number))
+        return 'number';
+      if (stream.match(rx_positive))
+        return 'positive';
+      if (stream.match(rx_negative))
+        return 'negative';
+      if (stream.match(rx_uri))
+        return 'link';
+
+      while (stream.next() != null) {
+        if (stream.match(rx_strong, false)) break;
+        if (stream.match(rx_emphasis, false)) break;
+        if (stream.match(rx_literal, false)) break;
+        if (stream.match(rx_number, false)) break;
+        if (stream.match(rx_positive, false)) break;
+        if (stream.match(rx_negative, false)) break;
+        if (stream.match(rx_uri, false)) break;
+      }
+
+      return null;
+    }
+  };
+
+  var mode = CodeMirror.getMode(
+    config, options.backdrop || 'rst-base'
+  );
+
+  return CodeMirror.overlayMode(mode, overlay, true); // combine
+}, 'python', 'stex');
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+CodeMirror.defineMode('rst-base', function (config) {
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function format(string) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    return string.replace(/{(\d+)}/g, function (match, n) {
+      return typeof args[n] != 'undefined' ? args[n] : match;
+    });
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  var mode_python = CodeMirror.getMode(config, 'python');
+  var mode_stex = CodeMirror.getMode(config, 'stex');
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  var SEPA = "\\s+";
+  var TAIL = "(?:\\s*|\\W|$)",
+  rx_TAIL = new RegExp(format('^{0}', TAIL));
+
+  var NAME =
+    "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)",
+  rx_NAME = new RegExp(format('^{0}', NAME));
+  var NAME_WWS =
+    "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)";
+  var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS);
+
+  var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)";
+  var TEXT2 = "(?:[^\\`]+)",
+  rx_TEXT2 = new RegExp(format('^{0}', TEXT2));
+
+  var rx_section = new RegExp(
+    "^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$");
+  var rx_explicit = new RegExp(
+    format('^\\.\\.{0}', SEPA));
+  var rx_link = new RegExp(
+    format('^_{0}:{1}|^__:{1}', REF_NAME, TAIL));
+  var rx_directive = new RegExp(
+    format('^{0}::{1}', REF_NAME, TAIL));
+  var rx_substitution = new RegExp(
+    format('^\\|{0}\\|{1}{2}::{3}', TEXT1, SEPA, REF_NAME, TAIL));
+  var rx_footnote = new RegExp(
+    format('^\\[(?:\\d+|#{0}?|\\*)]{1}', REF_NAME, TAIL));
+  var rx_citation = new RegExp(
+    format('^\\[{0}\\]{1}', REF_NAME, TAIL));
+
+  var rx_substitution_ref = new RegExp(
+    format('^\\|{0}\\|', TEXT1));
+  var rx_footnote_ref = new RegExp(
+    format('^\\[(?:\\d+|#{0}?|\\*)]_', REF_NAME));
+  var rx_citation_ref = new RegExp(
+    format('^\\[{0}\\]_', REF_NAME));
+  var rx_link_ref1 = new RegExp(
+    format('^{0}__?', REF_NAME));
+  var rx_link_ref2 = new RegExp(
+    format('^`{0}`_', TEXT2));
+
+  var rx_role_pre = new RegExp(
+    format('^:{0}:`{1}`{2}', NAME, TEXT2, TAIL));
+  var rx_role_suf = new RegExp(
+    format('^`{1}`:{0}:{2}', NAME, TEXT2, TAIL));
+  var rx_role = new RegExp(
+    format('^:{0}:{1}', NAME, TAIL));
+
+  var rx_directive_name = new RegExp(format('^{0}', REF_NAME));
+  var rx_directive_tail = new RegExp(format('^::{0}', TAIL));
+  var rx_substitution_text = new RegExp(format('^\\|{0}\\|', TEXT1));
+  var rx_substitution_sepa = new RegExp(format('^{0}', SEPA));
+  var rx_substitution_name = new RegExp(format('^{0}', REF_NAME));
+  var rx_substitution_tail = new RegExp(format('^::{0}', TAIL));
+  var rx_link_head = new RegExp("^_");
+  var rx_link_name = new RegExp(format('^{0}|_', REF_NAME));
+  var rx_link_tail = new RegExp(format('^:{0}', TAIL));
+
+  var rx_verbatim = new RegExp('^::\\s*$');
+  var rx_examples = new RegExp('^\\s+(?:>>>|In \\[\\d+\\]:)\\s');
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function to_normal(stream, state) {
+    var token = null;
+
+    if (stream.sol() && stream.match(rx_examples, false)) {
+      change(state, to_mode, {
+        mode: mode_python, local: CodeMirror.startState(mode_python)
+      });
+    } else if (stream.sol() && stream.match(rx_explicit)) {
+      change(state, to_explicit);
+      token = 'meta';
+    } else if (stream.sol() && stream.match(rx_section)) {
+      change(state, to_normal);
+      token = 'header';
+    } else if (phase(state) == rx_role_pre ||
+               stream.match(rx_role_pre, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_role_pre, 1));
+        stream.match(/^:/);
+        token = 'meta';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_role_pre, 2));
+        stream.match(rx_NAME);
+        token = 'keyword';
+
+        if (stream.current().match(/^(?:math|latex)/)) {
+          state.tmp_stex = true;
+        }
+        break;
+      case 2:
+        change(state, to_normal, context(rx_role_pre, 3));
+        stream.match(/^:`/);
+        token = 'meta';
+        break;
+      case 3:
+        if (state.tmp_stex) {
+          state.tmp_stex = undefined; state.tmp = {
+            mode: mode_stex, local: CodeMirror.startState(mode_stex)
+          };
+        }
+
+        if (state.tmp) {
+          if (stream.peek() == '`') {
+            change(state, to_normal, context(rx_role_pre, 4));
+            state.tmp = undefined;
+            break;
+          }
+
+          token = state.tmp.mode.token(stream, state.tmp.local);
+          break;
+        }
+
+        change(state, to_normal, context(rx_role_pre, 4));
+        stream.match(rx_TEXT2);
+        token = 'string';
+        break;
+      case 4:
+        change(state, to_normal, context(rx_role_pre, 5));
+        stream.match(/^`/);
+        token = 'meta';
+        break;
+      case 5:
+        change(state, to_normal, context(rx_role_pre, 6));
+        stream.match(rx_TAIL);
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (phase(state) == rx_role_suf ||
+               stream.match(rx_role_suf, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_role_suf, 1));
+        stream.match(/^`/);
+        token = 'meta';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_role_suf, 2));
+        stream.match(rx_TEXT2);
+        token = 'string';
+        break;
+      case 2:
+        change(state, to_normal, context(rx_role_suf, 3));
+        stream.match(/^`:/);
+        token = 'meta';
+        break;
+      case 3:
+        change(state, to_normal, context(rx_role_suf, 4));
+        stream.match(rx_NAME);
+        token = 'keyword';
+        break;
+      case 4:
+        change(state, to_normal, context(rx_role_suf, 5));
+        stream.match(/^:/);
+        token = 'meta';
+        break;
+      case 5:
+        change(state, to_normal, context(rx_role_suf, 6));
+        stream.match(rx_TAIL);
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_role, 1));
+        stream.match(/^:/);
+        token = 'meta';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_role, 2));
+        stream.match(rx_NAME);
+        token = 'keyword';
+        break;
+      case 2:
+        change(state, to_normal, context(rx_role, 3));
+        stream.match(/^:/);
+        token = 'meta';
+        break;
+      case 3:
+        change(state, to_normal, context(rx_role, 4));
+        stream.match(rx_TAIL);
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (phase(state) == rx_substitution_ref ||
+               stream.match(rx_substitution_ref, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_substitution_ref, 1));
+        stream.match(rx_substitution_text);
+        token = 'variable-2';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_substitution_ref, 2));
+        if (stream.match(/^_?_?/)) token = 'link';
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (stream.match(rx_footnote_ref)) {
+      change(state, to_normal);
+      token = 'quote';
+    } else if (stream.match(rx_citation_ref)) {
+      change(state, to_normal);
+      token = 'quote';
+    } else if (stream.match(rx_link_ref1)) {
+      change(state, to_normal);
+      if (!stream.peek() || stream.peek().match(/^\W$/)) {
+        token = 'link';
+      }
+    } else if (phase(state) == rx_link_ref2 ||
+               stream.match(rx_link_ref2, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        if (!stream.peek() || stream.peek().match(/^\W$/)) {
+          change(state, to_normal, context(rx_link_ref2, 1));
+        } else {
+          stream.match(rx_link_ref2);
+        }
+        break;
+      case 1:
+        change(state, to_normal, context(rx_link_ref2, 2));
+        stream.match(/^`/);
+        token = 'link';
+        break;
+      case 2:
+        change(state, to_normal, context(rx_link_ref2, 3));
+        stream.match(rx_TEXT2);
+        break;
+      case 3:
+        change(state, to_normal, context(rx_link_ref2, 4));
+        stream.match(/^`_/);
+        token = 'link';
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (stream.match(rx_verbatim)) {
+      change(state, to_verbatim);
+    }
+
+    else {
+      if (stream.next()) change(state, to_normal);
+    }
+
+    return token;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function to_explicit(stream, state) {
+    var token = null;
+
+    if (phase(state) == rx_substitution ||
+        stream.match(rx_substitution, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_explicit, context(rx_substitution, 1));
+        stream.match(rx_substitution_text);
+        token = 'variable-2';
+        break;
+      case 1:
+        change(state, to_explicit, context(rx_substitution, 2));
+        stream.match(rx_substitution_sepa);
+        break;
+      case 2:
+        change(state, to_explicit, context(rx_substitution, 3));
+        stream.match(rx_substitution_name);
+        token = 'keyword';
+        break;
+      case 3:
+        change(state, to_explicit, context(rx_substitution, 4));
+        stream.match(rx_substitution_tail);
+        token = 'meta';
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (phase(state) == rx_directive ||
+               stream.match(rx_directive, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_explicit, context(rx_directive, 1));
+        stream.match(rx_directive_name);
+        token = 'keyword';
+
+        if (stream.current().match(/^(?:math|latex)/))
+          state.tmp_stex = true;
+        else if (stream.current().match(/^python/))
+          state.tmp_py = true;
+        break;
+      case 1:
+        change(state, to_explicit, context(rx_directive, 2));
+        stream.match(rx_directive_tail);
+        token = 'meta';
+
+        if (stream.match(/^latex\s*$/) || state.tmp_stex) {
+          state.tmp_stex = undefined; change(state, to_mode, {
+            mode: mode_stex, local: CodeMirror.startState(mode_stex)
+          });
+        }
+        break;
+      case 2:
+        change(state, to_explicit, context(rx_directive, 3));
+        if (stream.match(/^python\s*$/) || state.tmp_py) {
+          state.tmp_py = undefined; change(state, to_mode, {
+            mode: mode_python, local: CodeMirror.startState(mode_python)
+          });
+        }
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_explicit, context(rx_link, 1));
+        stream.match(rx_link_head);
+        stream.match(rx_link_name);
+        token = 'link';
+        break;
+      case 1:
+        change(state, to_explicit, context(rx_link, 2));
+        stream.match(rx_link_tail);
+        token = 'meta';
+        break;
+      default:
+        change(state, to_normal);
+      }
+    } else if (stream.match(rx_footnote)) {
+      change(state, to_normal);
+      token = 'quote';
+    } else if (stream.match(rx_citation)) {
+      change(state, to_normal);
+      token = 'quote';
+    }
+
+    else {
+      stream.eatSpace();
+      if (stream.eol()) {
+        change(state, to_normal);
+      } else {
+        stream.skipToEnd();
+        change(state, to_comment);
+        token = 'comment';
+      }
+    }
+
+    return token;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function to_comment(stream, state) {
+    return as_block(stream, state, 'comment');
+  }
+
+  function to_verbatim(stream, state) {
+    return as_block(stream, state, 'meta');
+  }
+
+  function as_block(stream, state, token) {
+    if (stream.eol() || stream.eatSpace()) {
+      stream.skipToEnd();
+      return token;
+    } else {
+      change(state, to_normal);
+      return null;
+    }
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function to_mode(stream, state) {
+
+    if (state.ctx.mode && state.ctx.local) {
+
+      if (stream.sol()) {
+        if (!stream.eatSpace()) change(state, to_normal);
+        return null;
+      }
+
+      return state.ctx.mode.token(stream, state.ctx.local);
+    }
+
+    change(state, to_normal);
+    return null;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function context(phase, stage, mode, local) {
+    return {phase: phase, stage: stage, mode: mode, local: local};
+  }
+
+  function change(state, tok, ctx) {
+    state.tok = tok;
+    state.ctx = ctx || {};
+  }
+
+  function stage(state) {
+    return state.ctx.stage || 0;
+  }
+
+  function phase(state) {
+    return state.ctx.phase;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  return {
+    startState: function () {
+      return {tok: to_normal, ctx: context(undefined, 0)};
+    },
+
+    copyState: function (state) {
+      var ctx = state.ctx, tmp = state.tmp;
+      if (ctx.local)
+        ctx = {mode: ctx.mode, local: CodeMirror.copyState(ctx.mode, ctx.local)};
+      if (tmp)
+        tmp = {mode: tmp.mode, local: CodeMirror.copyState(tmp.mode, tmp.local)};
+      return {tok: state.tok, ctx: ctx, tmp: tmp};
+    },
+
+    innerMode: function (state) {
+      return state.tmp      ? {state: state.tmp.local, mode: state.tmp.mode}
+      : state.ctx.mode ? {state: state.ctx.local, mode: state.ctx.mode}
+      : null;
+    },
+
+    token: function (stream, state) {
+      return state.tok(stream, state);
+    }
+  };
+}, 'python', 'stex');
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+CodeMirror.defineMIME('text/x-rst', 'rst');
+
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+});
diff --git a/core/media/editors/codemirror/mode/rst/rst.min.js b/core/media/editors/codemirror/mode/rst/rst.min.js
new file mode 100644
index 00000000..38757067
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rst/rst.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../python/python"),require("../stex/stex"),require("../../addon/mode/overlay")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../python/python","../stex/stex","../../addon/mode/overlay"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("rst",(function(b,c){var d=/^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/,e=/^\*[^\*\s](?:[^\*]*[^\*\s])?\*/,f=/^``[^`\s](?:[^`]*[^`\s])``/,g=/^(?:[\d]+(?:[\.,]\d+)*)/,h=/^(?:\s\+[\d]+(?:[\.,]\d+)*)/,i=/^(?:\s\-[\d]+(?:[\.,]\d+)*)/,j="[Hh][Tt][Tt][Pp][Ss]?://",k="(?:[\\d\\w.-]+)\\.(?:\\w{2,6})",l="(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*",m=new RegExp("^"+j+k+l),n={token:function(a){if(a.match(d)&&a.match(/\W+|$/,!1))return"strong";if(a.match(e)&&a.match(/\W+|$/,!1))return"em";if(a.match(f)&&a.match(/\W+|$/,!1))return"string-2";if(a.match(g))return"number";if(a.match(h))return"positive";if(a.match(i))return"negative";if(a.match(m))return"link";for(;!(null==a.next()||a.match(d,!1)||a.match(e,!1)||a.match(f,!1)||a.match(g,!1)||a.match(h,!1)||a.match(i,!1)||a.match(m,!1)););return null}},o=a.getMode(b,c.backdrop||"rst-base");return a.overlayMode(o,n,!0)}),"python","stex"),a.defineMode("rst-base",(function(b){function c(a){var b=Array.prototype.slice.call(arguments,1);return a.replace(/{(\d+)}/g,(function(a,c){return"undefined"!=typeof b[c]?b[c]:a}))}function d(b,c){var f=null;if(b.sol()&&b.match(Y,!1))k(c,i,{mode:n,local:a.startState(n)});else if(b.sol()&&b.match(A))k(c,e),f="meta";else if(b.sol()&&b.match(z))k(c,d),f="header";else if(m(c)==L||b.match(L,!1))switch(l(c)){case 0:k(c,d,j(L,1)),b.match(/^:/),f="meta";break;case 1:k(c,d,j(L,2)),b.match(t),f="keyword",b.current().match(/^(?:math|latex)/)&&(c.tmp_stex=!0);break;case 2:k(c,d,j(L,3)),b.match(/^:`/),f="meta";break;case 3:if(c.tmp_stex&&(c.tmp_stex=void 0,c.tmp={mode:o,local:a.startState(o)}),c.tmp){if("`"==b.peek()){k(c,d,j(L,4)),c.tmp=void 0;break}f=c.tmp.mode.token(b,c.tmp.local);break}k(c,d,j(L,4)),b.match(y),f="string";break;case 4:k(c,d,j(L,5)),b.match(/^`/),f="meta";break;case 5:k(c,d,j(L,6)),b.match(r);break;default:k(c,d)}else if(m(c)==M||b.match(M,!1))switch(l(c)){case 0:k(c,d,j(M,1)),b.match(/^`/),f="meta";break;case 1:k(c,d,j(M,2)),b.match(y),f="string";break;case 2:k(c,d,j(M,3)),b.match(/^`:/),f="meta";break;case 3:k(c,d,j(M,4)),b.match(t),f="keyword";break;case 4:k(c,d,j(M,5)),b.match(/^:/),f="meta";break;case 5:k(c,d,j(M,6)),b.match(r);break;default:k(c,d)}else if(m(c)==N||b.match(N,!1))switch(l(c)){case 0:k(c,d,j(N,1)),b.match(/^:/),f="meta";break;case 1:k(c,d,j(N,2)),b.match(t),f="keyword";break;case 2:k(c,d,j(N,3)),b.match(/^:/),f="meta";break;case 3:k(c,d,j(N,4)),b.match(r);break;default:k(c,d)}else if(m(c)==G||b.match(G,!1))switch(l(c)){case 0:k(c,d,j(G,1)),b.match(Q),f="variable-2";break;case 1:k(c,d,j(G,2)),b.match(/^_?_?/)&&(f="link");break;default:k(c,d)}else if(b.match(H))k(c,d),f="quote";else if(b.match(I))k(c,d),f="quote";else if(b.match(J))k(c,d),b.peek()&&!b.peek().match(/^\W$/)||(f="link");else if(m(c)==K||b.match(K,!1))switch(l(c)){case 0:!b.peek()||b.peek().match(/^\W$/)?k(c,d,j(K,1)):b.match(K);break;case 1:k(c,d,j(K,2)),b.match(/^`/),f="link";break;case 2:k(c,d,j(K,3)),b.match(y);break;case 3:k(c,d,j(K,4)),b.match(/^`_/),f="link";break;default:k(c,d)}else b.match(X)?k(c,g):b.next()&&k(c,d);return f}function e(b,c){var g=null;if(m(c)==D||b.match(D,!1))switch(l(c)){case 0:k(c,e,j(D,1)),b.match(Q),g="variable-2";break;case 1:k(c,e,j(D,2)),b.match(R);break;case 2:k(c,e,j(D,3)),b.match(S),g="keyword";break;case 3:k(c,e,j(D,4)),b.match(T),g="meta";break;default:k(c,d)}else if(m(c)==C||b.match(C,!1))switch(l(c)){case 0:k(c,e,j(C,1)),b.match(O),g="keyword",b.current().match(/^(?:math|latex)/)?c.tmp_stex=!0:b.current().match(/^python/)&&(c.tmp_py=!0);break;case 1:k(c,e,j(C,2)),b.match(P),g="meta",(b.match(/^latex\s*$/)||c.tmp_stex)&&(c.tmp_stex=void 0,k(c,i,{mode:o,local:a.startState(o)}));break;case 2:k(c,e,j(C,3)),(b.match(/^python\s*$/)||c.tmp_py)&&(c.tmp_py=void 0,k(c,i,{mode:n,local:a.startState(n)}));break;default:k(c,d)}else if(m(c)==B||b.match(B,!1))switch(l(c)){case 0:k(c,e,j(B,1)),b.match(U),b.match(V),g="link";break;case 1:k(c,e,j(B,2)),b.match(W),g="meta";break;default:k(c,d)}else b.match(E)?(k(c,d),g="quote"):b.match(F)?(k(c,d),g="quote"):(b.eatSpace(),b.eol()?k(c,d):(b.skipToEnd(),k(c,f),g="comment"));return g}function f(a,b){return h(a,b,"comment")}function g(a,b){return h(a,b,"meta")}function h(a,b,c){return a.eol()||a.eatSpace()?(a.skipToEnd(),c):(k(b,d),null)}function i(a,b){return b.ctx.mode&&b.ctx.local?a.sol()?(a.eatSpace()||k(b,d),null):b.ctx.mode.token(a,b.ctx.local):(k(b,d),null)}function j(a,b,c,d){return{phase:a,stage:b,mode:c,local:d}}function k(a,b,c){a.tok=b,a.ctx=c||{}}function l(a){return a.ctx.stage||0}function m(a){return a.ctx.phase}var n=a.getMode(b,"python"),o=a.getMode(b,"stex"),p="\\s+",q="(?:\\s*|\\W|$)",r=new RegExp(c("^{0}",q)),s="(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\./:;<=>\\?]*[^\\W_])?)",t=new RegExp(c("^{0}",s)),u="(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\./:;<=>\\?]*[^\\W_])?)",v=c("(?:{0}|`{1}`)",s,u),w="(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)",x="(?:[^\\`]+)",y=new RegExp(c("^{0}",x)),z=new RegExp("^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$"),A=new RegExp(c("^\\.\\.{0}",p)),B=new RegExp(c("^_{0}:{1}|^__:{1}",v,q)),C=new RegExp(c("^{0}::{1}",v,q)),D=new RegExp(c("^\\|{0}\\|{1}{2}::{3}",w,p,v,q)),E=new RegExp(c("^\\[(?:\\d+|#{0}?|\\*)]{1}",v,q)),F=new RegExp(c("^\\[{0}\\]{1}",v,q)),G=new RegExp(c("^\\|{0}\\|",w)),H=new RegExp(c("^\\[(?:\\d+|#{0}?|\\*)]_",v)),I=new RegExp(c("^\\[{0}\\]_",v)),J=new RegExp(c("^{0}__?",v)),K=new RegExp(c("^`{0}`_",x)),L=new RegExp(c("^:{0}:`{1}`{2}",s,x,q)),M=new RegExp(c("^`{1}`:{0}:{2}",s,x,q)),N=new RegExp(c("^:{0}:{1}",s,q)),O=new RegExp(c("^{0}",v)),P=new RegExp(c("^::{0}",q)),Q=new RegExp(c("^\\|{0}\\|",w)),R=new RegExp(c("^{0}",p)),S=new RegExp(c("^{0}",v)),T=new RegExp(c("^::{0}",q)),U=new RegExp("^_"),V=new RegExp(c("^{0}|_",v)),W=new RegExp(c("^:{0}",q)),X=new RegExp("^::\\s*$"),Y=new RegExp("^\\s+(?:>>>|In \\[\\d+\\]:)\\s");return{startState:function(){return{tok:d,ctx:j(void 0,0)}},copyState:function(b){var c=b.ctx,d=b.tmp;return c.local&&(c={mode:c.mode,local:a.copyState(c.mode,c.local)}),d&&(d={mode:d.mode,local:a.copyState(d.mode,d.local)}),{tok:b.tok,ctx:c,tmp:d}},innerMode:function(a){return a.tmp?{state:a.tmp.local,mode:a.tmp.mode}:a.ctx.mode?{state:a.ctx.local,mode:a.ctx.mode}:null},token:function(a,b){return b.tok(a,b)}}}),"python","stex"),a.defineMIME("text/x-rst","rst")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ruby/ruby.js b/core/media/editors/codemirror/mode/ruby/ruby.js
new file mode 100644
index 00000000..874c1830
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ruby/ruby.js
@@ -0,0 +1,296 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("ruby", function(config) {
+  function wordObj(words) {
+    var o = {};
+    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+    return o;
+  }
+  var keywords = wordObj([
+    "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
+    "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
+    "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
+    "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
+    "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
+    "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
+  ]);
+  var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
+                             "catch", "loop", "proc", "begin"]);
+  var dedentWords = wordObj(["end", "until"]);
+  var matching = {"[": "]", "{": "}", "(": ")"};
+  var curPunc;
+
+  function chain(newtok, stream, state) {
+    state.tokenize.push(newtok);
+    return newtok(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    if (stream.sol() && stream.match("=begin") && stream.eol()) {
+      state.tokenize.push(readBlockComment);
+      return "comment";
+    }
+    if (stream.eatSpace()) return null;
+    var ch = stream.next(), m;
+    if (ch == "`" || ch == "'" || ch == '"') {
+      return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
+    } else if (ch == "/") {
+      if (regexpAhead(stream))
+        return chain(readQuoted(ch, "string-2", true), stream, state);
+      else
+        return "operator";
+    } else if (ch == "%") {
+      var style = "string", embed = true;
+      if (stream.eat("s")) style = "atom";
+      else if (stream.eat(/[WQ]/)) style = "string";
+      else if (stream.eat(/[r]/)) style = "string-2";
+      else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
+      var delim = stream.eat(/[^\w\s=]/);
+      if (!delim) return "operator";
+      if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
+      return chain(readQuoted(delim, style, embed, true), stream, state);
+    } else if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+      return chain(readHereDoc(m[1]), stream, state);
+    } else if (ch == "0") {
+      if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
+      else if (stream.eat("b")) stream.eatWhile(/[01]/);
+      else stream.eatWhile(/[0-7]/);
+      return "number";
+    } else if (/\d/.test(ch)) {
+      stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/);
+      return "number";
+    } else if (ch == "?") {
+      while (stream.match(/^\\[CM]-/)) {}
+      if (stream.eat("\\")) stream.eatWhile(/\w/);
+      else stream.next();
+      return "string";
+    } else if (ch == ":") {
+      if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state);
+      if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state);
+
+      // :> :>> :< :<< are valid symbols
+      if (stream.eat(/[\<\>]/)) {
+        stream.eat(/[\<\>]/);
+        return "atom";
+      }
+
+      // :+ :- :/ :* :| :& :! are valid symbols
+      if (stream.eat(/[\+\-\*\/\&\|\:\!]/)) {
+        return "atom";
+      }
+
+      // Symbols can't start by a digit
+      if (stream.eat(/[a-zA-Z$@_\xa1-\uffff]/)) {
+        stream.eatWhile(/[\w$\xa1-\uffff]/);
+        // Only one ? ! = is allowed and only as the last character
+        stream.eat(/[\?\!\=]/);
+        return "atom";
+      }
+      return "operator";
+    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_\xa1-\uffff]/)) {
+      stream.eat("@");
+      stream.eatWhile(/[\w\xa1-\uffff]/);
+      return "variable-2";
+    } else if (ch == "$") {
+      if (stream.eat(/[a-zA-Z_]/)) {
+        stream.eatWhile(/[\w]/);
+      } else if (stream.eat(/\d/)) {
+        stream.eat(/\d/);
+      } else {
+        stream.next(); // Must be a special global like $: or $!
+      }
+      return "variable-3";
+    } else if (/[a-zA-Z_\xa1-\uffff]/.test(ch)) {
+      stream.eatWhile(/[\w\xa1-\uffff]/);
+      stream.eat(/[\?\!]/);
+      if (stream.eat(":")) return "atom";
+      return "ident";
+    } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) {
+      curPunc = "|";
+      return null;
+    } else if (/[\(\)\[\]{}\\;]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    } else if (ch == "-" && stream.eat(">")) {
+      return "arrow";
+    } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
+      var more = stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+      if (ch == "." && !more) curPunc = ".";
+      return "operator";
+    } else {
+      return null;
+    }
+  }
+
+  function regexpAhead(stream) {
+    var start = stream.pos, depth = 0, next, found = false, escaped = false
+    while ((next = stream.next()) != null) {
+      if (!escaped) {
+        if ("[{(".indexOf(next) > -1) {
+          depth++
+        } else if ("]})".indexOf(next) > -1) {
+          depth--
+          if (depth < 0) break
+        } else if (next == "/" && depth == 0) {
+          found = true
+          break
+        }
+        escaped = next == "\\"
+      } else {
+        escaped = false
+      }
+    }
+    stream.backUp(stream.pos - start)
+    return found
+  }
+
+  function tokenBaseUntilBrace(depth) {
+    if (!depth) depth = 1;
+    return function(stream, state) {
+      if (stream.peek() == "}") {
+        if (depth == 1) {
+          state.tokenize.pop();
+          return state.tokenize[state.tokenize.length-1](stream, state);
+        } else {
+          state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);
+        }
+      } else if (stream.peek() == "{") {
+        state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);
+      }
+      return tokenBase(stream, state);
+    };
+  }
+  function tokenBaseOnce() {
+    var alreadyCalled = false;
+    return function(stream, state) {
+      if (alreadyCalled) {
+        state.tokenize.pop();
+        return state.tokenize[state.tokenize.length-1](stream, state);
+      }
+      alreadyCalled = true;
+      return tokenBase(stream, state);
+    };
+  }
+  function readQuoted(quote, style, embed, unescaped) {
+    return function(stream, state) {
+      var escaped = false, ch;
+
+      if (state.context.type === 'read-quoted-paused') {
+        state.context = state.context.prev;
+        stream.eat("}");
+      }
+
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && (unescaped || !escaped)) {
+          state.tokenize.pop();
+          break;
+        }
+        if (embed && ch == "#" && !escaped) {
+          if (stream.eat("{")) {
+            if (quote == "}") {
+              state.context = {prev: state.context, type: 'read-quoted-paused'};
+            }
+            state.tokenize.push(tokenBaseUntilBrace());
+            break;
+          } else if (/[@\$]/.test(stream.peek())) {
+            state.tokenize.push(tokenBaseOnce());
+            break;
+          }
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return style;
+    };
+  }
+  function readHereDoc(phrase) {
+    return function(stream, state) {
+      if (stream.match(phrase)) state.tokenize.pop();
+      else stream.skipToEnd();
+      return "string";
+    };
+  }
+  function readBlockComment(stream, state) {
+    if (stream.sol() && stream.match("=end") && stream.eol())
+      state.tokenize.pop();
+    stream.skipToEnd();
+    return "comment";
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: [tokenBase],
+              indented: 0,
+              context: {type: "top", indented: -config.indentUnit},
+              continuedLine: false,
+              lastTok: null,
+              varList: false};
+    },
+
+    token: function(stream, state) {
+      curPunc = null;
+      if (stream.sol()) state.indented = stream.indentation();
+      var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
+      var thisTok = curPunc;
+      if (style == "ident") {
+        var word = stream.current();
+        style = state.lastTok == "." ? "property"
+          : keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+          : /^[A-Z]/.test(word) ? "tag"
+          : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
+          : "variable";
+        if (style == "keyword") {
+          thisTok = word;
+          if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
+          else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
+          else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
+            kwtype = "indent";
+          else if (word == "do" && state.context.indented < state.indented)
+            kwtype = "indent";
+        }
+      }
+      if (curPunc || (style && style != "comment")) state.lastTok = thisTok;
+      if (curPunc == "|") state.varList = !state.varList;
+
+      if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))
+        state.context = {prev: state.context, type: curPunc || style, indented: state.indented};
+      else if ((kwtype == "dedent" || /[\)\]\}]/.test(curPunc)) && state.context.prev)
+        state.context = state.context.prev;
+
+      if (stream.eol())
+        state.continuedLine = (curPunc == "\\" || style == "operator");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0);
+      var ct = state.context;
+      var closing = ct.type == matching[firstChar] ||
+        ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
+      return ct.indented + (closing ? 0 : config.indentUnit) +
+        (state.continuedLine ? config.indentUnit : 0);
+    },
+
+    electricInput: /^\s*(?:end|rescue|elsif|else|\})$/,
+    lineComment: "#",
+    fold: "indent"
+  };
+});
+
+CodeMirror.defineMIME("text/x-ruby", "ruby");
+
+});
diff --git a/core/media/editors/codemirror/mode/ruby/ruby.min.js b/core/media/editors/codemirror/mode/ruby/ruby.min.js
new file mode 100644
index 00000000..3a50544a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ruby/ruby.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("ruby",(function(a){function b(a){for(var b={},c=0,d=a.length;c<d;++c)b[a[c]]=!0;return b}function c(a,b,c){return c.tokenize.push(a),a(b,c)}function d(a,b){if(a.sol()&&a.match("=begin")&&a.eol())return b.tokenize.push(j),"comment";if(a.eatSpace())return null;var d,f=a.next();if("`"==f||"'"==f||'"'==f)return c(h(f,"string",'"'==f||"`"==f),a,b);if("/"==f)return e(a)?c(h(f,"string-2",!0),a,b):"operator";if("%"==f){var g="string",l=!0;a.eat("s")?g="atom":a.eat(/[WQ]/)?g="string":a.eat(/[r]/)?g="string-2":a.eat(/[wxq]/)&&(g="string",l=!1);var m=a.eat(/[^\w\s=]/);return m?(o.propertyIsEnumerable(m)&&(m=o[m]),c(h(m,g,l,!0),a,b)):"operator"}if("#"==f)return a.skipToEnd(),"comment";if("<"==f&&(d=a.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/)))return c(i(d[1]),a,b);if("0"==f)return a.eat("x")?a.eatWhile(/[\da-fA-F]/):a.eat("b")?a.eatWhile(/[01]/):a.eatWhile(/[0-7]/),"number";if(/\d/.test(f))return a.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/),"number";if("?"==f){for(;a.match(/^\\[CM]-/););return a.eat("\\")?a.eatWhile(/\w/):a.next(),"string"}if(":"==f)return a.eat("'")?c(h("'","atom",!1),a,b):a.eat('"')?c(h('"',"atom",!0),a,b):a.eat(/[\<\>]/)?(a.eat(/[\<\>]/),"atom"):a.eat(/[\+\-\*\/\&\|\:\!]/)?"atom":a.eat(/[a-zA-Z$@_\xa1-\uffff]/)?(a.eatWhile(/[\w$\xa1-\uffff]/),a.eat(/[\?\!\=]/),"atom"):"operator";if("@"==f&&a.match(/^@?[a-zA-Z_\xa1-\uffff]/))return a.eat("@"),a.eatWhile(/[\w\xa1-\uffff]/),"variable-2";if("$"==f)return a.eat(/[a-zA-Z_]/)?a.eatWhile(/[\w]/):a.eat(/\d/)?a.eat(/\d/):a.next(),"variable-3";if(/[a-zA-Z_\xa1-\uffff]/.test(f))return a.eatWhile(/[\w\xa1-\uffff]/),a.eat(/[\?\!]/),a.eat(":")?"atom":"ident";if("|"!=f||!b.varList&&"{"!=b.lastTok&&"do"!=b.lastTok){if(/[\(\)\[\]{}\\;]/.test(f))return k=f,null;if("-"==f&&a.eat(">"))return"arrow";if(/[=+\-\/*:\.^%<>~|]/.test(f)){var n=a.eatWhile(/[=+\-\/*:\.^%<>~|]/);return"."!=f||n||(k="."),"operator"}return null}return k="|",null}function e(a){for(var b,c=a.pos,d=0,e=!1,f=!1;null!=(b=a.next());)if(f)f=!1;else{if("[{(".indexOf(b)>-1)d++;else if("]})".indexOf(b)>-1){if(d--,d<0)break}else if("/"==b&&0==d){e=!0;break}f="\\"==b}return a.backUp(a.pos-c),e}function f(a){return a||(a=1),function(b,c){if("}"==b.peek()){if(1==a)return c.tokenize.pop(),c.tokenize[c.tokenize.length-1](b,c);c.tokenize[c.tokenize.length-1]=f(a-1)}else"{"==b.peek()&&(c.tokenize[c.tokenize.length-1]=f(a+1));return d(b,c)}}function g(){var a=!1;return function(b,c){return a?(c.tokenize.pop(),c.tokenize[c.tokenize.length-1](b,c)):(a=!0,d(b,c))}}function h(a,b,c,d){return function(e,h){var i,j=!1;for("read-quoted-paused"===h.context.type&&(h.context=h.context.prev,e.eat("}"));null!=(i=e.next());){if(i==a&&(d||!j)){h.tokenize.pop();break}if(c&&"#"==i&&!j){if(e.eat("{")){"}"==a&&(h.context={prev:h.context,type:"read-quoted-paused"}),h.tokenize.push(f());break}if(/[@\$]/.test(e.peek())){h.tokenize.push(g());break}}j=!j&&"\\"==i}return b}}function i(a){return function(b,c){return b.match(a)?c.tokenize.pop():b.skipToEnd(),"string"}}function j(a,b){return a.sol()&&a.match("=end")&&a.eol()&&b.tokenize.pop(),a.skipToEnd(),"comment"}var k,l=b(["alias","and","BEGIN","begin","break","case","class","def","defined?","do","else","elsif","END","end","ensure","false","for","if","in","module","next","not","or","redo","rescue","retry","return","self","super","then","true","undef","unless","until","when","while","yield","nil","raise","throw","catch","fail","loop","callcc","caller","lambda","proc","public","protected","private","require","load","require_relative","extend","autoload","__END__","__FILE__","__LINE__","__dir__"]),m=b(["def","class","case","for","while","until","module","then","catch","loop","proc","begin"]),n=b(["end","until"]),o={"[":"]","{":"}","(":")"};return{startState:function(){return{tokenize:[d],indented:0,context:{type:"top",indented:-a.indentUnit},continuedLine:!1,lastTok:null,varList:!1}},token:function(a,b){k=null,a.sol()&&(b.indented=a.indentation());var c,d=b.tokenize[b.tokenize.length-1](a,b),e=k;if("ident"==d){var f=a.current();d="."==b.lastTok?"property":l.propertyIsEnumerable(a.current())?"keyword":/^[A-Z]/.test(f)?"tag":"def"==b.lastTok||"class"==b.lastTok||b.varList?"def":"variable","keyword"==d&&(e=f,m.propertyIsEnumerable(f)?c="indent":n.propertyIsEnumerable(f)?c="dedent":"if"!=f&&"unless"!=f||a.column()!=a.indentation()?"do"==f&&b.context.indented<b.indented&&(c="indent"):c="indent")}return(k||d&&"comment"!=d)&&(b.lastTok=e),"|"==k&&(b.varList=!b.varList),"indent"==c||/[\(\[\{]/.test(k)?b.context={prev:b.context,type:k||d,indented:b.indented}:("dedent"==c||/[\)\]\}]/.test(k))&&b.context.prev&&(b.context=b.context.prev),a.eol()&&(b.continuedLine="\\"==k||"operator"==d),d},indent:function(b,c){if(b.tokenize[b.tokenize.length-1]!=d)return 0;var e=c&&c.charAt(0),f=b.context,g=f.type==o[e]||"keyword"==f.type&&/^(?:end|until|else|elsif|when|rescue)\b/.test(c);return f.indented+(g?0:a.indentUnit)+(b.continuedLine?a.indentUnit:0)},electricInput:/^\s*(?:end|rescue|elsif|else|\})$/,lineComment:"#",fold:"indent"}})),a.defineMIME("text/x-ruby","ruby")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/rust/rust.js b/core/media/editors/codemirror/mode/rust/rust.js
new file mode 100644
index 00000000..b635563a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rust/rust.js
@@ -0,0 +1,72 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineSimpleMode("rust",{
+  start: [
+    // string and byte string
+    {regex: /b?"/, token: "string", next: "string"},
+    // raw string and raw byte string
+    {regex: /b?r"/, token: "string", next: "string_raw"},
+    {regex: /b?r#+"/, token: "string", next: "string_raw_hash"},
+    // character
+    {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
+    // byte
+    {regex: /b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/, token: "string-2"},
+
+    {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,
+     token: "number"},
+    {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]},
+    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
+    {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"},
+    {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"},
+    {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,
+     token: ["keyword", null ,"def"]},
+    {regex: /#!?\[.*\]/, token: "meta"},
+    {regex: /\/\/.*/, token: "comment"},
+    {regex: /\/\*/, token: "comment", next: "comment"},
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+    {regex: /[a-zA-Z_]\w*!/,token: "variable-3"},
+    {regex: /[a-zA-Z_]\w*/, token: "variable"},
+    {regex: /[\{\[\(]/, indent: true},
+    {regex: /[\}\]\)]/, dedent: true}
+  ],
+  string: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /(?:[^\\"]|\\(?:.|$))*/, token: "string"}
+  ],
+  string_raw: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /[^"]*/, token: "string"}
+  ],
+  string_raw_hash: [
+    {regex: /"#+/, token: "string", next: "start"},
+    {regex: /(?:[^"]|"(?!#))*/, token: "string"}
+  ],
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  meta: {
+    dontIndentStates: ["comment"],
+    electricInput: /^\s*\}$/,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//",
+    fold: "brace"
+  }
+});
+
+
+CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
+});
diff --git a/core/media/editors/codemirror/mode/rust/rust.min.js b/core/media/editors/codemirror/mode/rust/rust.min.js
new file mode 100644
index 00000000..06bbcc7b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/rust/rust.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/simple")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/simple"],a):a(CodeMirror)})((function(a){"use strict";a.defineSimpleMode("rust",{start:[{regex:/b?"/,token:"string",next:"string"},{regex:/b?r"/,token:"string",next:"string_raw"},{regex:/b?r#+"/,token:"string",next:"string_raw_hash"},{regex:/'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/,token:"string-2"},{regex:/b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/,token:"string-2"},{regex:/(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,token:"number"},{regex:/(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,token:"keyword"},{regex:/\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/,token:"atom"},{regex:/\b(?:true|false|Some|None|Ok|Err)\b/,token:"builtin"},{regex:/\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,token:["keyword",null,"def"]},{regex:/#!?\[.*\]/,token:"meta"},{regex:/\/\/.*/,token:"comment"},{regex:/\/\*/,token:"comment",next:"comment"},{regex:/[-+\/*=<>!]+/,token:"operator"},{regex:/[a-zA-Z_]\w*!/,token:"variable-3"},{regex:/[a-zA-Z_]\w*/,token:"variable"},{regex:/[\{\[\(]/,indent:!0},{regex:/[\}\]\)]/,dedent:!0}],string:[{regex:/"/,token:"string",next:"start"},{regex:/(?:[^\\"]|\\(?:.|$))*/,token:"string"}],string_raw:[{regex:/"/,token:"string",next:"start"},{regex:/[^"]*/,token:"string"}],string_raw_hash:[{regex:/"#+/,token:"string",next:"start"},{regex:/(?:[^"]|"(?!#))*/,token:"string"}],comment:[{regex:/.*?\*\//,token:"comment",next:"start"},{regex:/.*/,token:"comment"}],meta:{dontIndentStates:["comment"],electricInput:/^\s*\}$/,blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}}),a.defineMIME("text/x-rustsrc","rust"),a.defineMIME("text/rust","rust")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/sas/sas.js b/core/media/editors/codemirror/mode/sas/sas.js
new file mode 100644
index 00000000..d85b3353
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sas/sas.js
@@ -0,0 +1,303 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+
+// SAS mode copyright (c) 2016 Jared Dean, SAS Institute
+// Created by Jared Dean
+
+// TODO
+// indent and de-indent
+// identify macro variables
+
+
+//Definitions
+//  comment -- text within * ; or /* */
+//  keyword -- SAS language variable
+//  variable -- macro variables starts with '&' or variable formats
+//  variable-2 -- DATA Step, proc, or macro names
+//  string -- text within ' ' or " "
+//  operator -- numeric operator + / - * ** le eq ge ... and so on
+//  builtin -- proc %macro data run mend
+//  atom
+//  def
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("sas", function () {
+    var words = {};
+    var isDoubleOperatorSym = {
+      eq: 'operator',
+      lt: 'operator',
+      le: 'operator',
+      gt: 'operator',
+      ge: 'operator',
+      "in": 'operator',
+      ne: 'operator',
+      or: 'operator'
+    };
+    var isDoubleOperatorChar = /(<=|>=|!=|<>)/;
+    var isSingleOperatorChar = /[=\(:\),{}.*<>+\-\/^\[\]]/;
+
+    // Takes a string of words separated by spaces and adds them as
+    // keys with the value of the first argument 'style'
+    function define(style, string, context) {
+      if (context) {
+        var split = string.split(' ');
+        for (var i = 0; i < split.length; i++) {
+          words[split[i]] = {style: style, state: context};
+        }
+      }
+    }
+    //datastep
+    define('def', 'stack pgm view source debug nesting nolist', ['inDataStep']);
+    define('def', 'if while until for do do; end end; then else cancel', ['inDataStep']);
+    define('def', 'label format _n_ _error_', ['inDataStep']);
+    define('def', 'ALTER BUFNO BUFSIZE CNTLLEV COMPRESS DLDMGACTION ENCRYPT ENCRYPTKEY EXTENDOBSCOUNTER GENMAX GENNUM INDEX LABEL OBSBUF OUTREP PW PWREQ READ REPEMPTY REPLACE REUSE ROLE SORTEDBY SPILL TOBSNO TYPE WRITE FILECLOSE FIRSTOBS IN OBS POINTOBS WHERE WHEREUP IDXNAME IDXWHERE DROP KEEP RENAME', ['inDataStep']);
+    define('def', 'filevar finfo finv fipname fipnamel fipstate first firstobs floor', ['inDataStep']);
+    define('def', 'varfmt varinfmt varlabel varlen varname varnum varray varrayx vartype verify vformat vformatd vformatdx vformatn vformatnx vformatw vformatwx vformatx vinarray vinarrayx vinformat vinformatd vinformatdx vinformatn vinformatnx vinformatw vinformatwx vinformatx vlabel vlabelx vlength vlengthx vname vnamex vnferr vtype vtypex weekday', ['inDataStep']);
+    define('def', 'zipfips zipname zipnamel zipstate', ['inDataStep']);
+    define('def', 'put putc putn', ['inDataStep']);
+    define('builtin', 'data run', ['inDataStep']);
+
+
+    //proc
+    define('def', 'data', ['inProc']);
+
+    // flow control for macros
+    define('def', '%if %end %end; %else %else; %do %do; %then', ['inMacro']);
+
+    //everywhere
+    define('builtin', 'proc run; quit; libname filename %macro %mend option options', ['ALL']);
+
+    define('def', 'footnote title libname ods', ['ALL']);
+    define('def', '%let %put %global %sysfunc %eval ', ['ALL']);
+    // automatic macro variables http://support.sas.com/documentation/cdl/en/mcrolref/61885/HTML/default/viewer.htm#a003167023.htm
+    define('variable', '&sysbuffr &syscc &syscharwidth &syscmd &sysdate &sysdate9 &sysday &sysdevic &sysdmg &sysdsn &sysencoding &sysenv &syserr &syserrortext &sysfilrc &syshostname &sysindex &sysinfo &sysjobid &syslast &syslckrc &syslibrc &syslogapplname &sysmacroname &sysmenv &sysmsg &sysncpu &sysodspath &sysparm &syspbuff &sysprocessid &sysprocessname &sysprocname &sysrc &sysscp &sysscpl &sysscpl &syssite &sysstartid &sysstartname &systcpiphostname &systime &sysuserid &sysver &sysvlong &sysvlong4 &syswarningtext', ['ALL']);
+
+    //footnote[1-9]? title[1-9]?
+
+    //options statement
+    define('def', 'source2 nosource2 page pageno pagesize', ['ALL']);
+
+    //proc and datastep
+    define('def', '_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni read recfm register regr remote remove rename repeat replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max', ['inDataStep', 'inProc']);
+    define('operator', 'and not ', ['inDataStep', 'inProc']);
+
+    // Main function
+    function tokenize(stream, state) {
+      // Finally advance the stream
+      var ch = stream.next();
+
+      // BLOCKCOMMENT
+      if (ch === '/' && stream.eat('*')) {
+        state.continueComment = true;
+        return "comment";
+      } else if (state.continueComment === true) { // in comment block
+        //comment ends at the beginning of the line
+        if (ch === '*' && stream.peek() === '/') {
+          stream.next();
+          state.continueComment = false;
+        } else if (stream.skipTo('*')) { //comment is potentially later in line
+          stream.skipTo('*');
+          stream.next();
+          if (stream.eat('/'))
+            state.continueComment = false;
+        } else {
+          stream.skipToEnd();
+        }
+        return "comment";
+      }
+
+      if (ch == "*" && stream.column() == stream.indentation()) {
+        stream.skipToEnd()
+        return "comment"
+      }
+
+      // DoubleOperator match
+      var doubleOperator = ch + stream.peek();
+
+      if ((ch === '"' || ch === "'") && !state.continueString) {
+        state.continueString = ch
+        return "string"
+      } else if (state.continueString) {
+        if (state.continueString == ch) {
+          state.continueString = null;
+        } else if (stream.skipTo(state.continueString)) {
+          // quote found on this line
+          stream.next();
+          state.continueString = null;
+        } else {
+          stream.skipToEnd();
+        }
+        return "string";
+      } else if (state.continueString !== null && stream.eol()) {
+        stream.skipTo(state.continueString) || stream.skipToEnd();
+        return "string";
+      } else if (/[\d\.]/.test(ch)) { //find numbers
+        if (ch === ".")
+          stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+        else if (ch === "0")
+          stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+        else
+          stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+        return "number";
+      } else if (isDoubleOperatorChar.test(ch + stream.peek())) { // TWO SYMBOL TOKENS
+        stream.next();
+        return "operator";
+      } else if (isDoubleOperatorSym.hasOwnProperty(doubleOperator)) {
+        stream.next();
+        if (stream.peek() === ' ')
+          return isDoubleOperatorSym[doubleOperator.toLowerCase()];
+      } else if (isSingleOperatorChar.test(ch)) { // SINGLE SYMBOL TOKENS
+        return "operator";
+      }
+
+      // Matches one whole word -- even if the word is a character
+      var word;
+      if (stream.match(/[%&;\w]+/, false) != null) {
+        word = ch + stream.match(/[%&;\w]+/, true);
+        if (/&/.test(word)) return 'variable'
+      } else {
+        word = ch;
+      }
+      // the word after DATA PROC or MACRO
+      if (state.nextword) {
+        stream.match(/[\w]+/);
+        // match memname.libname
+        if (stream.peek() === '.') stream.skipTo(' ');
+        state.nextword = false;
+        return 'variable-2';
+      }
+
+      word = word.toLowerCase()
+      // Are we in a DATA Step?
+      if (state.inDataStep) {
+        if (word === 'run;' || stream.match(/run\s;/)) {
+          state.inDataStep = false;
+          return 'builtin';
+        }
+        // variable formats
+        if ((word) && stream.next() === '.') {
+          //either a format or libname.memname
+          if (/\w/.test(stream.peek())) return 'variable-2';
+          else return 'variable';
+        }
+        // do we have a DATA Step keyword
+        if (word && words.hasOwnProperty(word) &&
+            (words[word].state.indexOf("inDataStep") !== -1 ||
+             words[word].state.indexOf("ALL") !== -1)) {
+          //backup to the start of the word
+          if (stream.start < stream.pos)
+            stream.backUp(stream.pos - stream.start);
+          //advance the length of the word and return
+          for (var i = 0; i < word.length; ++i) stream.next();
+          return words[word].style;
+        }
+      }
+      // Are we in an Proc statement?
+      if (state.inProc) {
+        if (word === 'run;' || word === 'quit;') {
+          state.inProc = false;
+          return 'builtin';
+        }
+        // do we have a proc keyword
+        if (word && words.hasOwnProperty(word) &&
+            (words[word].state.indexOf("inProc") !== -1 ||
+             words[word].state.indexOf("ALL") !== -1)) {
+          stream.match(/[\w]+/);
+          return words[word].style;
+        }
+      }
+      // Are we in a Macro statement?
+      if (state.inMacro) {
+        if (word === '%mend') {
+          if (stream.peek() === ';') stream.next();
+          state.inMacro = false;
+          return 'builtin';
+        }
+        if (word && words.hasOwnProperty(word) &&
+            (words[word].state.indexOf("inMacro") !== -1 ||
+             words[word].state.indexOf("ALL") !== -1)) {
+          stream.match(/[\w]+/);
+          return words[word].style;
+        }
+
+        return 'atom';
+      }
+      // Do we have Keywords specific words?
+      if (word && words.hasOwnProperty(word)) {
+        // Negates the initial next()
+        stream.backUp(1);
+        // Actually move the stream
+        stream.match(/[\w]+/);
+        if (word === 'data' && /=/.test(stream.peek()) === false) {
+          state.inDataStep = true;
+          state.nextword = true;
+          return 'builtin';
+        }
+        if (word === 'proc') {
+          state.inProc = true;
+          state.nextword = true;
+          return 'builtin';
+        }
+        if (word === '%macro') {
+          state.inMacro = true;
+          state.nextword = true;
+          return 'builtin';
+        }
+        if (/title[1-9]/.test(word)) return 'def';
+
+        if (word === 'footnote') {
+          stream.eat(/[1-9]/);
+          return 'def';
+        }
+
+        // Returns their value as state in the prior define methods
+        if (state.inDataStep === true && words[word].state.indexOf("inDataStep") !== -1)
+          return words[word].style;
+        if (state.inProc === true && words[word].state.indexOf("inProc") !== -1)
+          return words[word].style;
+        if (state.inMacro === true && words[word].state.indexOf("inMacro") !== -1)
+          return words[word].style;
+        if (words[word].state.indexOf("ALL") !== -1)
+          return words[word].style;
+        return null;
+      }
+      // Unrecognized syntax
+      return null;
+    }
+
+    return {
+      startState: function () {
+        return {
+          inDataStep: false,
+          inProc: false,
+          inMacro: false,
+          nextword: false,
+          continueString: null,
+          continueComment: false
+        };
+      },
+      token: function (stream, state) {
+        // Strip the spaces, but regex will account for them either way
+        if (stream.eatSpace()) return null;
+        // Go through the main process
+        return tokenize(stream, state);
+      },
+
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/"
+    };
+
+  });
+
+  CodeMirror.defineMIME("text/x-sas", "sas");
+});
diff --git a/core/media/editors/codemirror/mode/sas/sas.min.js b/core/media/editors/codemirror/mode/sas/sas.min.js
new file mode 100644
index 00000000..492a127a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sas/sas.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sas",(function(){function a(a,b,d){if(d)for(var e=b.split(" "),f=0;f<e.length;f++)c[e[f]]={style:a,state:d}}function b(a,b){var g=a.next();if("/"===g&&a.eat("*"))return b.continueComment=!0,"comment";if(b.continueComment===!0)return"*"===g&&"/"===a.peek()?(a.next(),b.continueComment=!1):a.skipTo("*")?(a.skipTo("*"),a.next(),a.eat("/")&&(b.continueComment=!1)):a.skipToEnd(),"comment";if("*"==g&&a.column()==a.indentation())return a.skipToEnd(),"comment";var h=g+a.peek();if(!('"'!==g&&"'"!==g||b.continueString))return b.continueString=g,"string";if(b.continueString)return b.continueString==g?b.continueString=null:a.skipTo(b.continueString)?(a.next(),b.continueString=null):a.skipToEnd(),"string";if(null!==b.continueString&&a.eol())return a.skipTo(b.continueString)||a.skipToEnd(),"string";if(/[\d\.]/.test(g))return"."===g?a.match(/^[0-9]+([eE][\-+]?[0-9]+)?/):"0"===g?a.match(/^[xX][0-9a-fA-F]+/)||a.match(/^0[0-7]+/):a.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/),"number";if(e.test(g+a.peek()))return a.next(),"operator";if(d.hasOwnProperty(h)){if(a.next()," "===a.peek())return d[h.toLowerCase()]}else if(f.test(g))return"operator";var i;if(null!=a.match(/[%&;\w]+/,!1)){if(i=g+a.match(/[%&;\w]+/,!0),/&/.test(i))return"variable"}else i=g;if(b.nextword)return a.match(/[\w]+/),"."===a.peek()&&a.skipTo(" "),b.nextword=!1,"variable-2";if(i=i.toLowerCase(),b.inDataStep){if("run;"===i||a.match(/run\s;/))return b.inDataStep=!1,"builtin";if(i&&"."===a.next())return/\w/.test(a.peek())?"variable-2":"variable";if(i&&c.hasOwnProperty(i)&&(c[i].state.indexOf("inDataStep")!==-1||c[i].state.indexOf("ALL")!==-1)){a.start<a.pos&&a.backUp(a.pos-a.start);for(var j=0;j<i.length;++j)a.next();return c[i].style}}if(b.inProc){if("run;"===i||"quit;"===i)return b.inProc=!1,"builtin";if(i&&c.hasOwnProperty(i)&&(c[i].state.indexOf("inProc")!==-1||c[i].state.indexOf("ALL")!==-1))return a.match(/[\w]+/),c[i].style}return b.inMacro?"%mend"===i?(";"===a.peek()&&a.next(),b.inMacro=!1,"builtin"):i&&c.hasOwnProperty(i)&&(c[i].state.indexOf("inMacro")!==-1||c[i].state.indexOf("ALL")!==-1)?(a.match(/[\w]+/),c[i].style):"atom":i&&c.hasOwnProperty(i)?(a.backUp(1),a.match(/[\w]+/),"data"===i&&/=/.test(a.peek())===!1?(b.inDataStep=!0,b.nextword=!0,"builtin"):"proc"===i?(b.inProc=!0,b.nextword=!0,"builtin"):"%macro"===i?(b.inMacro=!0,b.nextword=!0,"builtin"):/title[1-9]/.test(i)?"def":"footnote"===i?(a.eat(/[1-9]/),"def"):b.inDataStep===!0&&c[i].state.indexOf("inDataStep")!==-1?c[i].style:b.inProc===!0&&c[i].state.indexOf("inProc")!==-1?c[i].style:b.inMacro===!0&&c[i].state.indexOf("inMacro")!==-1?c[i].style:c[i].state.indexOf("ALL")!==-1?c[i].style:null):null}var c={},d={eq:"operator",lt:"operator",le:"operator",gt:"operator",ge:"operator",in:"operator",ne:"operator",or:"operator"},e=/(<=|>=|!=|<>)/,f=/[=\(:\),{}.*<>+\-\/^\[\]]/;return a("def","stack pgm view source debug nesting nolist",["inDataStep"]),a("def","if while until for do do; end end; then else cancel",["inDataStep"]),a("def","label format _n_ _error_",["inDataStep"]),a("def","ALTER BUFNO BUFSIZE CNTLLEV COMPRESS DLDMGACTION ENCRYPT ENCRYPTKEY EXTENDOBSCOUNTER GENMAX GENNUM INDEX LABEL OBSBUF OUTREP PW PWREQ READ REPEMPTY REPLACE REUSE ROLE SORTEDBY SPILL TOBSNO TYPE WRITE FILECLOSE FIRSTOBS IN OBS POINTOBS WHERE WHEREUP IDXNAME IDXWHERE DROP KEEP RENAME",["inDataStep"]),a("def","filevar finfo finv fipname fipnamel fipstate first firstobs floor",["inDataStep"]),a("def","varfmt varinfmt varlabel varlen varname varnum varray varrayx vartype verify vformat vformatd vformatdx vformatn vformatnx vformatw vformatwx vformatx vinarray vinarrayx vinformat vinformatd vinformatdx vinformatn vinformatnx vinformatw vinformatwx vinformatx vlabel vlabelx vlength vlengthx vname vnamex vnferr vtype vtypex weekday",["inDataStep"]),a("def","zipfips zipname zipnamel zipstate",["inDataStep"]),a("def","put putc putn",["inDataStep"]),a("builtin","data run",["inDataStep"]),a("def","data",["inProc"]),a("def","%if %end %end; %else %else; %do %do; %then",["inMacro"]),a("builtin","proc run; quit; libname filename %macro %mend option options",["ALL"]),a("def","footnote title libname ods",["ALL"]),a("def","%let %put %global %sysfunc %eval ",["ALL"]),a("variable","&sysbuffr &syscc &syscharwidth &syscmd &sysdate &sysdate9 &sysday &sysdevic &sysdmg &sysdsn &sysencoding &sysenv &syserr &syserrortext &sysfilrc &syshostname &sysindex &sysinfo &sysjobid &syslast &syslckrc &syslibrc &syslogapplname &sysmacroname &sysmenv &sysmsg &sysncpu &sysodspath &sysparm &syspbuff &sysprocessid &sysprocessname &sysprocname &sysrc &sysscp &sysscpl &sysscpl &syssite &sysstartid &sysstartname &systcpiphostname &systime &sysuserid &sysver &sysvlong &sysvlong4 &syswarningtext",["ALL"]),a("def","source2 nosource2 page pageno pagesize",["ALL"]),a("def","_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni read recfm register regr remote remove rename repeat replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max",["inDataStep","inProc"]),a("operator","and not ",["inDataStep","inProc"]),{startState:function(){return{inDataStep:!1,inProc:!1,inMacro:!1,nextword:!1,continueString:null,continueComment:!1}},token:function(a,c){return a.eatSpace()?null:b(a,c)},blockCommentStart:"/*",blockCommentEnd:"*/"}})),a.defineMIME("text/x-sas","sas")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/sass/sass.js b/core/media/editors/codemirror/mode/sass/sass.js
new file mode 100644
index 00000000..7d8135bf
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sass/sass.js
@@ -0,0 +1,454 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("sass", function(config) {
+  var cssMode = CodeMirror.mimeModes["text/css"];
+  var propertyKeywords = cssMode.propertyKeywords || {},
+      colorKeywords = cssMode.colorKeywords || {},
+      valueKeywords = cssMode.valueKeywords || {},
+      fontProperties = cssMode.fontProperties || {};
+
+  function tokenRegexp(words) {
+    return new RegExp("^" + words.join("|"));
+  }
+
+  var keywords = ["true", "false", "null", "auto"];
+  var keywordsRegexp = new RegExp("^" + keywords.join("|"));
+
+  var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-",
+                   "\\!=", "/", "\\*", "%", "and", "or", "not", ";","\\{","\\}",":"];
+  var opRegexp = tokenRegexp(operators);
+
+  var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
+
+  var word;
+
+  function isEndLine(stream) {
+    return !stream.peek() || stream.match(/\s+$/, false);
+  }
+
+  function urlTokens(stream, state) {
+    var ch = stream.peek();
+
+    if (ch === ")") {
+      stream.next();
+      state.tokenizer = tokenBase;
+      return "operator";
+    } else if (ch === "(") {
+      stream.next();
+      stream.eatSpace();
+
+      return "operator";
+    } else if (ch === "'" || ch === '"') {
+      state.tokenizer = buildStringTokenizer(stream.next());
+      return "string";
+    } else {
+      state.tokenizer = buildStringTokenizer(")", false);
+      return "string";
+    }
+  }
+  function comment(indentation, multiLine) {
+    return function(stream, state) {
+      if (stream.sol() && stream.indentation() <= indentation) {
+        state.tokenizer = tokenBase;
+        return tokenBase(stream, state);
+      }
+
+      if (multiLine && stream.skipTo("*/")) {
+        stream.next();
+        stream.next();
+        state.tokenizer = tokenBase;
+      } else {
+        stream.skipToEnd();
+      }
+
+      return "comment";
+    };
+  }
+
+  function buildStringTokenizer(quote, greedy) {
+    if (greedy == null) { greedy = true; }
+
+    function stringTokenizer(stream, state) {
+      var nextChar = stream.next();
+      var peekChar = stream.peek();
+      var previousChar = stream.string.charAt(stream.pos-2);
+
+      var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\"));
+
+      if (endingString) {
+        if (nextChar !== quote && greedy) { stream.next(); }
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        state.tokenizer = tokenBase;
+        return "string";
+      } else if (nextChar === "#" && peekChar === "{") {
+        state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
+        stream.next();
+        return "operator";
+      } else {
+        return "string";
+      }
+    }
+
+    return stringTokenizer;
+  }
+
+  function buildInterpolationTokenizer(currentTokenizer) {
+    return function(stream, state) {
+      if (stream.peek() === "}") {
+        stream.next();
+        state.tokenizer = currentTokenizer;
+        return "operator";
+      } else {
+        return tokenBase(stream, state);
+      }
+    };
+  }
+
+  function indent(state) {
+    if (state.indentCount == 0) {
+      state.indentCount++;
+      var lastScopeOffset = state.scopes[0].offset;
+      var currentOffset = lastScopeOffset + config.indentUnit;
+      state.scopes.unshift({ offset:currentOffset });
+    }
+  }
+
+  function dedent(state) {
+    if (state.scopes.length == 1) return;
+
+    state.scopes.shift();
+  }
+
+  function tokenBase(stream, state) {
+    var ch = stream.peek();
+
+    // Comment
+    if (stream.match("/*")) {
+      state.tokenizer = comment(stream.indentation(), true);
+      return state.tokenizer(stream, state);
+    }
+    if (stream.match("//")) {
+      state.tokenizer = comment(stream.indentation(), false);
+      return state.tokenizer(stream, state);
+    }
+
+    // Interpolation
+    if (stream.match("#{")) {
+      state.tokenizer = buildInterpolationTokenizer(tokenBase);
+      return "operator";
+    }
+
+    // Strings
+    if (ch === '"' || ch === "'") {
+      stream.next();
+      state.tokenizer = buildStringTokenizer(ch);
+      return "string";
+    }
+
+    if(!state.cursorHalf){// state.cursorHalf === 0
+    // first half i.e. before : for key-value pairs
+    // including selectors
+
+      if (ch === "-") {
+        if (stream.match(/^-\w+-/)) {
+          return "meta";
+        }
+      }
+
+      if (ch === ".") {
+        stream.next();
+        if (stream.match(/^[\w-]+/)) {
+          indent(state);
+          return "qualifier";
+        } else if (stream.peek() === "#") {
+          indent(state);
+          return "tag";
+        }
+      }
+
+      if (ch === "#") {
+        stream.next();
+        // ID selectors
+        if (stream.match(/^[\w-]+/)) {
+          indent(state);
+          return "builtin";
+        }
+        if (stream.peek() === "#") {
+          indent(state);
+          return "tag";
+        }
+      }
+
+      // Variables
+      if (ch === "$") {
+        stream.next();
+        stream.eatWhile(/[\w-]/);
+        return "variable-2";
+      }
+
+      // Numbers
+      if (stream.match(/^-?[0-9\.]+/))
+        return "number";
+
+      // Units
+      if (stream.match(/^(px|em|in)\b/))
+        return "unit";
+
+      if (stream.match(keywordsRegexp))
+        return "keyword";
+
+      if (stream.match(/^url/) && stream.peek() === "(") {
+        state.tokenizer = urlTokens;
+        return "atom";
+      }
+
+      if (ch === "=") {
+        // Match shortcut mixin definition
+        if (stream.match(/^=[\w-]+/)) {
+          indent(state);
+          return "meta";
+        }
+      }
+
+      if (ch === "+") {
+        // Match shortcut mixin definition
+        if (stream.match(/^\+[\w-]+/)){
+          return "variable-3";
+        }
+      }
+
+      if(ch === "@"){
+        if(stream.match(/@extend/)){
+          if(!stream.match(/\s*[\w]/))
+            dedent(state);
+        }
+      }
+
+
+      // Indent Directives
+      if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
+        indent(state);
+        return "def";
+      }
+
+      // Other Directives
+      if (ch === "@") {
+        stream.next();
+        stream.eatWhile(/[\w-]/);
+        return "def";
+      }
+
+      if (stream.eatWhile(/[\w-]/)){
+        if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
+          word = stream.current().toLowerCase();
+          var prop = state.prevProp + "-" + word;
+          if (propertyKeywords.hasOwnProperty(prop)) {
+            return "property";
+          } else if (propertyKeywords.hasOwnProperty(word)) {
+            state.prevProp = word;
+            return "property";
+          } else if (fontProperties.hasOwnProperty(word)) {
+            return "property";
+          }
+          return "tag";
+        }
+        else if(stream.match(/ *:/,false)){
+          indent(state);
+          state.cursorHalf = 1;
+          state.prevProp = stream.current().toLowerCase();
+          return "property";
+        }
+        else if(stream.match(/ *,/,false)){
+          return "tag";
+        }
+        else{
+          indent(state);
+          return "tag";
+        }
+      }
+
+      if(ch === ":"){
+        if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
+          return "variable-3";
+        }
+        stream.next();
+        state.cursorHalf=1;
+        return "operator";
+      }
+
+    } // cursorHalf===0 ends here
+    else{
+
+      if (ch === "#") {
+        stream.next();
+        // Hex numbers
+        if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
+          if (isEndLine(stream)) {
+            state.cursorHalf = 0;
+          }
+          return "number";
+        }
+      }
+
+      // Numbers
+      if (stream.match(/^-?[0-9\.]+/)){
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        return "number";
+      }
+
+      // Units
+      if (stream.match(/^(px|em|in)\b/)){
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        return "unit";
+      }
+
+      if (stream.match(keywordsRegexp)){
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        return "keyword";
+      }
+
+      if (stream.match(/^url/) && stream.peek() === "(") {
+        state.tokenizer = urlTokens;
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        return "atom";
+      }
+
+      // Variables
+      if (ch === "$") {
+        stream.next();
+        stream.eatWhile(/[\w-]/);
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        return "variable-2";
+      }
+
+      // bang character for !important, !default, etc.
+      if (ch === "!") {
+        stream.next();
+        state.cursorHalf = 0;
+        return stream.match(/^[\w]+/) ? "keyword": "operator";
+      }
+
+      if (stream.match(opRegexp)){
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        return "operator";
+      }
+
+      // attributes
+      if (stream.eatWhile(/[\w-]/)) {
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
+        word = stream.current().toLowerCase();
+        if (valueKeywords.hasOwnProperty(word)) {
+          return "atom";
+        } else if (colorKeywords.hasOwnProperty(word)) {
+          return "keyword";
+        } else if (propertyKeywords.hasOwnProperty(word)) {
+          state.prevProp = stream.current().toLowerCase();
+          return "property";
+        } else {
+          return "tag";
+        }
+      }
+
+      //stream.eatSpace();
+      if (isEndLine(stream)) {
+        state.cursorHalf = 0;
+        return null;
+      }
+
+    } // else ends here
+
+    if (stream.match(opRegexp))
+      return "operator";
+
+    // If we haven't returned by now, we move 1 character
+    // and return an error
+    stream.next();
+    return null;
+  }
+
+  function tokenLexer(stream, state) {
+    if (stream.sol()) state.indentCount = 0;
+    var style = state.tokenizer(stream, state);
+    var current = stream.current();
+
+    if (current === "@return" || current === "}"){
+      dedent(state);
+    }
+
+    if (style !== null) {
+      var startOfToken = stream.pos - current.length;
+
+      var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
+
+      var newScopes = [];
+
+      for (var i = 0; i < state.scopes.length; i++) {
+        var scope = state.scopes[i];
+
+        if (scope.offset <= withCurrentIndent)
+          newScopes.push(scope);
+      }
+
+      state.scopes = newScopes;
+    }
+
+
+    return style;
+  }
+
+  return {
+    startState: function() {
+      return {
+        tokenizer: tokenBase,
+        scopes: [{offset: 0, type: "sass"}],
+        indentCount: 0,
+        cursorHalf: 0,  // cursor half tells us if cursor lies after (1)
+                        // or before (0) colon (well... more or less)
+        definedVars: [],
+        definedMixins: []
+      };
+    },
+    token: function(stream, state) {
+      var style = tokenLexer(stream, state);
+
+      state.lastToken = { style: style, content: stream.current() };
+
+      return style;
+    },
+
+    indent: function(state) {
+      return state.scopes[0].offset;
+    }
+  };
+}, "css");
+
+CodeMirror.defineMIME("text/x-sass", "sass");
+
+});
diff --git a/core/media/editors/codemirror/mode/sass/sass.min.js b/core/media/editors/codemirror/mode/sass/sass.min.js
new file mode 100644
index 00000000..06072b7e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sass/sass.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../css/css"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sass",(function(b){function c(a){return new RegExp("^"+a.join("|"))}function d(a){return!a.peek()||a.match(/\s+$/,!1)}function e(a,b){var c=a.peek();return")"===c?(a.next(),b.tokenizer=k,"operator"):"("===c?(a.next(),a.eatSpace(),"operator"):"'"===c||'"'===c?(b.tokenizer=g(a.next()),"string"):(b.tokenizer=g(")",!1),"string")}function f(a,b){return function(c,d){return c.sol()&&c.indentation()<=a?(d.tokenizer=k,k(c,d)):(b&&c.skipTo("*/")?(c.next(),c.next(),d.tokenizer=k):c.skipToEnd(),"comment")}}function g(a,b){function c(e,f){var g=e.next(),i=e.peek(),j=e.string.charAt(e.pos-2),l="\\"!==g&&i===a||g===a&&"\\"!==j;return l?(g!==a&&b&&e.next(),d(e)&&(f.cursorHalf=0),f.tokenizer=k,"string"):"#"===g&&"{"===i?(f.tokenizer=h(c),e.next(),"operator"):"string"}return null==b&&(b=!0),c}function h(a){return function(b,c){return"}"===b.peek()?(b.next(),c.tokenizer=a,"operator"):k(b,c)}}function i(a){if(0==a.indentCount){a.indentCount++;var c=a.scopes[0].offset,d=c+b.indentUnit;a.scopes.unshift({offset:d})}}function j(a){1!=a.scopes.length&&a.scopes.shift()}function k(a,b){var c=a.peek();if(a.match("/*"))return b.tokenizer=f(a.indentation(),!0),b.tokenizer(a,b);if(a.match("//"))return b.tokenizer=f(a.indentation(),!1),b.tokenizer(a,b);if(a.match("#{"))return b.tokenizer=h(k),"operator";if('"'===c||"'"===c)return a.next(),b.tokenizer=g(c),"string";if(b.cursorHalf){if("#"===c&&(a.next(),a.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)))return d(a)&&(b.cursorHalf=0),"number";if(a.match(/^-?[0-9\.]+/))return d(a)&&(b.cursorHalf=0),"number";if(a.match(/^(px|em|in)\b/))return d(a)&&(b.cursorHalf=0),"unit";if(a.match(t))return d(a)&&(b.cursorHalf=0),"keyword";if(a.match(/^url/)&&"("===a.peek())return b.tokenizer=e,d(a)&&(b.cursorHalf=0),"atom";if("$"===c)return a.next(),a.eatWhile(/[\w-]/),d(a)&&(b.cursorHalf=0),"variable-2";if("!"===c)return a.next(),b.cursorHalf=0,a.match(/^[\w]+/)?"keyword":"operator";if(a.match(v))return d(a)&&(b.cursorHalf=0),"operator";if(a.eatWhile(/[\w-]/))return d(a)&&(b.cursorHalf=0),m=a.current().toLowerCase(),q.hasOwnProperty(m)?"atom":p.hasOwnProperty(m)?"keyword":o.hasOwnProperty(m)?(b.prevProp=a.current().toLowerCase(),"property"):"tag";if(d(a))return b.cursorHalf=0,null}else{if("-"===c&&a.match(/^-\w+-/))return"meta";if("."===c){if(a.next(),a.match(/^[\w-]+/))return i(b),"qualifier";if("#"===a.peek())return i(b),"tag"}if("#"===c){if(a.next(),a.match(/^[\w-]+/))return i(b),"builtin";if("#"===a.peek())return i(b),"tag"}if("$"===c)return a.next(),a.eatWhile(/[\w-]/),"variable-2";if(a.match(/^-?[0-9\.]+/))return"number";if(a.match(/^(px|em|in)\b/))return"unit";if(a.match(t))return"keyword";if(a.match(/^url/)&&"("===a.peek())return b.tokenizer=e,"atom";if("="===c&&a.match(/^=[\w-]+/))return i(b),"meta";if("+"===c&&a.match(/^\+[\w-]+/))return"variable-3";if("@"===c&&a.match(/@extend/)&&(a.match(/\s*[\w]/)||j(b)),a.match(/^@(else if|if|media|else|for|each|while|mixin|function)/))return i(b),"def";if("@"===c)return a.next(),a.eatWhile(/[\w-]/),"def";if(a.eatWhile(/[\w-]/)){if(a.match(/ *: *[\w-\+\$#!\("']/,!1)){m=a.current().toLowerCase();var l=b.prevProp+"-"+m;return o.hasOwnProperty(l)?"property":o.hasOwnProperty(m)?(b.prevProp=m,"property"):r.hasOwnProperty(m)?"property":"tag"}return a.match(/ *:/,!1)?(i(b),b.cursorHalf=1,b.prevProp=a.current().toLowerCase(),"property"):a.match(/ *,/,!1)?"tag":(i(b),"tag")}if(":"===c)return a.match(w)?"variable-3":(a.next(),b.cursorHalf=1,"operator")}return a.match(v)?"operator":(a.next(),null)}function l(a,c){a.sol()&&(c.indentCount=0);var d=c.tokenizer(a,c),e=a.current();if("@return"!==e&&"}"!==e||j(c),null!==d){for(var f=a.pos-e.length,g=f+b.indentUnit*c.indentCount,h=[],i=0;i<c.scopes.length;i++){var k=c.scopes[i];k.offset<=g&&h.push(k)}c.scopes=h}return d}var m,n=a.mimeModes["text/css"],o=n.propertyKeywords||{},p=n.colorKeywords||{},q=n.valueKeywords||{},r=n.fontProperties||{},s=["true","false","null","auto"],t=new RegExp("^"+s.join("|")),u=["\\(","\\)","=",">","<","==",">=","<=","\\+","-","\\!=","/","\\*","%","and","or","not",";","\\{","\\}",":"],v=c(u),w=/^::?[a-zA-Z_][\w\-]*/;return{startState:function(){return{tokenizer:k,scopes:[{offset:0,type:"sass"}],indentCount:0,cursorHalf:0,definedVars:[],definedMixins:[]}},token:function(a,b){var c=l(a,b);return b.lastToken={style:c,content:a.current()},c},indent:function(a){return a.scopes[0].offset}}}),"css"),a.defineMIME("text/x-sass","sass")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/scheme/scheme.js b/core/media/editors/codemirror/mode/scheme/scheme.js
new file mode 100644
index 00000000..1d8f7d17
--- /dev/null
+++ b/core/media/editors/codemirror/mode/scheme/scheme.js
@@ -0,0 +1,249 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Author: Koh Zi Han, based on implementation by Koh Zi Chun
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("scheme", function () {
+    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
+        ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
+    var INDENT_WORD_SKIP = 2;
+
+    function makeKeywords(str) {
+        var obj = {}, words = str.split(" ");
+        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+        return obj;
+    }
+
+    var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
+    var indentKeys = makeKeywords("define let letrec let* lambda");
+
+    function stateStack(indent, type, prev) { // represents a state stack object
+        this.indent = indent;
+        this.type = type;
+        this.prev = prev;
+    }
+
+    function pushStack(state, indent, type) {
+        state.indentStack = new stateStack(indent, type, state.indentStack);
+    }
+
+    function popStack(state) {
+        state.indentStack = state.indentStack.prev;
+    }
+
+    var binaryMatcher = new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i);
+    var octalMatcher = new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i);
+    var hexMatcher = new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i);
+    var decimalMatcher = new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);
+
+    function isBinaryNumber (stream) {
+        return stream.match(binaryMatcher);
+    }
+
+    function isOctalNumber (stream) {
+        return stream.match(octalMatcher);
+    }
+
+    function isDecimalNumber (stream, backup) {
+        if (backup === true) {
+            stream.backUp(1);
+        }
+        return stream.match(decimalMatcher);
+    }
+
+    function isHexNumber (stream) {
+        return stream.match(hexMatcher);
+    }
+
+    return {
+        startState: function () {
+            return {
+                indentStack: null,
+                indentation: 0,
+                mode: false,
+                sExprComment: false
+            };
+        },
+
+        token: function (stream, state) {
+            if (state.indentStack == null && stream.sol()) {
+                // update indentation, but only if indentStack is empty
+                state.indentation = stream.indentation();
+            }
+
+            // skip spaces
+            if (stream.eatSpace()) {
+                return null;
+            }
+            var returnType = null;
+
+            switch(state.mode){
+                case "string": // multi-line string parsing mode
+                    var next, escaped = false;
+                    while ((next = stream.next()) != null) {
+                        if (next == "\"" && !escaped) {
+
+                            state.mode = false;
+                            break;
+                        }
+                        escaped = !escaped && next == "\\";
+                    }
+                    returnType = STRING; // continue on in scheme-string mode
+                    break;
+                case "comment": // comment parsing mode
+                    var next, maybeEnd = false;
+                    while ((next = stream.next()) != null) {
+                        if (next == "#" && maybeEnd) {
+
+                            state.mode = false;
+                            break;
+                        }
+                        maybeEnd = (next == "|");
+                    }
+                    returnType = COMMENT;
+                    break;
+                case "s-expr-comment": // s-expr commenting mode
+                    state.mode = false;
+                    if(stream.peek() == "(" || stream.peek() == "["){
+                        // actually start scheme s-expr commenting mode
+                        state.sExprComment = 0;
+                    }else{
+                        // if not we just comment the entire of the next token
+                        stream.eatWhile(/[^/s]/); // eat non spaces
+                        returnType = COMMENT;
+                        break;
+                    }
+                default: // default parsing mode
+                    var ch = stream.next();
+
+                    if (ch == "\"") {
+                        state.mode = "string";
+                        returnType = STRING;
+
+                    } else if (ch == "'") {
+                        returnType = ATOM;
+                    } else if (ch == '#') {
+                        if (stream.eat("|")) {                    // Multi-line comment
+                            state.mode = "comment"; // toggle to comment mode
+                            returnType = COMMENT;
+                        } else if (stream.eat(/[tf]/i)) {            // #t/#f (atom)
+                            returnType = ATOM;
+                        } else if (stream.eat(';')) {                // S-Expr comment
+                            state.mode = "s-expr-comment";
+                            returnType = COMMENT;
+                        } else {
+                            var numTest = null, hasExactness = false, hasRadix = true;
+                            if (stream.eat(/[ei]/i)) {
+                                hasExactness = true;
+                            } else {
+                                stream.backUp(1);       // must be radix specifier
+                            }
+                            if (stream.match(/^#b/i)) {
+                                numTest = isBinaryNumber;
+                            } else if (stream.match(/^#o/i)) {
+                                numTest = isOctalNumber;
+                            } else if (stream.match(/^#x/i)) {
+                                numTest = isHexNumber;
+                            } else if (stream.match(/^#d/i)) {
+                                numTest = isDecimalNumber;
+                            } else if (stream.match(/^[-+0-9.]/, false)) {
+                                hasRadix = false;
+                                numTest = isDecimalNumber;
+                            // re-consume the intial # if all matches failed
+                            } else if (!hasExactness) {
+                                stream.eat('#');
+                            }
+                            if (numTest != null) {
+                                if (hasRadix && !hasExactness) {
+                                    // consume optional exactness after radix
+                                    stream.match(/^#[ei]/i);
+                                }
+                                if (numTest(stream))
+                                    returnType = NUMBER;
+                            }
+                        }
+                    } else if (/^[-+0-9.]/.test(ch) && isDecimalNumber(stream, true)) { // match non-prefixed number, must be decimal
+                        returnType = NUMBER;
+                    } else if (ch == ";") { // comment
+                        stream.skipToEnd(); // rest of the line is a comment
+                        returnType = COMMENT;
+                    } else if (ch == "(" || ch == "[") {
+                      var keyWord = ''; var indentTemp = stream.column(), letter;
+                        /**
+                        Either
+                        (indent-word ..
+                        (non-indent-word ..
+                        (;something else, bracket, etc.
+                        */
+
+                        while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) {
+                            keyWord += letter;
+                        }
+
+                        if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
+
+                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
+                        } else { // non-indent word
+                            // we continue eating the spaces
+                            stream.eatSpace();
+                            if (stream.eol() || stream.peek() == ";") {
+                                // nothing significant after
+                                // we restart indentation 1 space after
+                                pushStack(state, indentTemp + 1, ch);
+                            } else {
+                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
+                            }
+                        }
+                        stream.backUp(stream.current().length - 1); // undo all the eating
+
+                        if(typeof state.sExprComment == "number") state.sExprComment++;
+
+                        returnType = BRACKET;
+                    } else if (ch == ")" || ch == "]") {
+                        returnType = BRACKET;
+                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
+                            popStack(state);
+
+                            if(typeof state.sExprComment == "number"){
+                                if(--state.sExprComment == 0){
+                                    returnType = COMMENT; // final closing bracket
+                                    state.sExprComment = false; // turn off s-expr commenting mode
+                                }
+                            }
+                        }
+                    } else {
+                        stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
+
+                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
+                            returnType = BUILTIN;
+                        } else returnType = "variable";
+                    }
+            }
+            return (typeof state.sExprComment == "number") ? COMMENT : returnType;
+        },
+
+        indent: function (state) {
+            if (state.indentStack == null) return state.indentation;
+            return state.indentStack.indent;
+        },
+
+        closeBrackets: {pairs: "()[]{}\"\""},
+        lineComment: ";;"
+    };
+});
+
+CodeMirror.defineMIME("text/x-scheme", "scheme");
+
+});
diff --git a/core/media/editors/codemirror/mode/scheme/scheme.min.js b/core/media/editors/codemirror/mode/scheme/scheme.min.js
new file mode 100644
index 00000000..82fdeff5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/scheme/scheme.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("scheme",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){this.indent=a,this.type=b,this.prev=c}function c(a,c,d){a.indentStack=new b(c,d,a.indentStack)}function d(a){a.indentStack=a.indentStack.prev}function e(a){return a.match(r)}function f(a){return a.match(s)}function g(a,b){return b===!0&&a.backUp(1),a.match(u)}function h(a){return a.match(t)}var i="builtin",j="comment",k="string",l="atom",m="number",n="bracket",o=2,p=a("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"),q=a("define let letrec let* lambda"),r=new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i),s=new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i),t=new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i),u=new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);return{startState:function(){return{indentStack:null,indentation:0,mode:!1,sExprComment:!1}},token:function(a,b){if(null==b.indentStack&&a.sol()&&(b.indentation=a.indentation()),a.eatSpace())return null;var r=null;switch(b.mode){case"string":for(var s,t=!1;null!=(s=a.next());){if('"'==s&&!t){b.mode=!1;break}t=!t&&"\\"==s}r=k;break;case"comment":for(var s,u=!1;null!=(s=a.next());){if("#"==s&&u){b.mode=!1;break}u="|"==s}r=j;break;case"s-expr-comment":if(b.mode=!1,"("!=a.peek()&&"["!=a.peek()){a.eatWhile(/[^\/s]/),r=j;break}b.sExprComment=0;default:var v=a.next();if('"'==v)b.mode="string",r=k;else if("'"==v)r=l;else if("#"==v)if(a.eat("|"))b.mode="comment",r=j;else if(a.eat(/[tf]/i))r=l;else if(a.eat(";"))b.mode="s-expr-comment",r=j;else{var w=null,x=!1,y=!0;a.eat(/[ei]/i)?x=!0:a.backUp(1),a.match(/^#b/i)?w=e:a.match(/^#o/i)?w=f:a.match(/^#x/i)?w=h:a.match(/^#d/i)?w=g:a.match(/^[-+0-9.]/,!1)?(y=!1,w=g):x||a.eat("#"),null!=w&&(y&&!x&&a.match(/^#[ei]/i),w(a)&&(r=m))}else if(/^[-+0-9.]/.test(v)&&g(a,!0))r=m;else if(";"==v)a.skipToEnd(),r=j;else if("("==v||"["==v){for(var z,A="",B=a.column();null!=(z=a.eat(/[^\s\(\[\;\)\]]/));)A+=z;A.length>0&&q.propertyIsEnumerable(A)?c(b,B+o,v):(a.eatSpace(),a.eol()||";"==a.peek()?c(b,B+1,v):c(b,B+a.current().length,v)),a.backUp(a.current().length-1),"number"==typeof b.sExprComment&&b.sExprComment++,r=n}else")"==v||"]"==v?(r=n,null!=b.indentStack&&b.indentStack.type==(")"==v?"(":"[")&&(d(b),"number"==typeof b.sExprComment&&0==--b.sExprComment&&(r=j,b.sExprComment=!1))):(a.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/),r=p&&p.propertyIsEnumerable(a.current())?i:"variable")}return"number"==typeof b.sExprComment?j:r},indent:function(a){return null==a.indentStack?a.indentation:a.indentStack.indent},closeBrackets:{pairs:'()[]{}""'},lineComment:";;"}})),a.defineMIME("text/x-scheme","scheme")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/shell/shell.js b/core/media/editors/codemirror/mode/shell/shell.js
new file mode 100644
index 00000000..b806c2bc
--- /dev/null
+++ b/core/media/editors/codemirror/mode/shell/shell.js
@@ -0,0 +1,151 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('shell', function() {
+
+  var words = {};
+  function define(style, string) {
+    var split = string.split(' ');
+    for(var i = 0; i < split.length; i++) {
+      words[split[i]] = style;
+    }
+  };
+
+  // Atoms
+  define('atom', 'true false');
+
+  // Keywords
+  define('keyword', 'if then do else elif while until for in esac fi fin ' +
+    'fil done exit set unset export function');
+
+  // Commands
+  define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
+    'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
+    'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
+    'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
+    'touch vi vim wall wc wget who write yes zsh');
+
+  function tokenBase(stream, state) {
+    if (stream.eatSpace()) return null;
+
+    var sol = stream.sol();
+    var ch = stream.next();
+
+    if (ch === '\\') {
+      stream.next();
+      return null;
+    }
+    if (ch === '\'' || ch === '"' || ch === '`') {
+      state.tokens.unshift(tokenString(ch, ch === "`" ? "quote" : "string"));
+      return tokenize(stream, state);
+    }
+    if (ch === '#') {
+      if (sol && stream.eat('!')) {
+        stream.skipToEnd();
+        return 'meta'; // 'comment'?
+      }
+      stream.skipToEnd();
+      return 'comment';
+    }
+    if (ch === '$') {
+      state.tokens.unshift(tokenDollar);
+      return tokenize(stream, state);
+    }
+    if (ch === '+' || ch === '=') {
+      return 'operator';
+    }
+    if (ch === '-') {
+      stream.eat('-');
+      stream.eatWhile(/\w/);
+      return 'attribute';
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/\d/);
+      if(stream.eol() || !/\w/.test(stream.peek())) {
+        return 'number';
+      }
+    }
+    stream.eatWhile(/[\w-]/);
+    var cur = stream.current();
+    if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
+    return words.hasOwnProperty(cur) ? words[cur] : null;
+  }
+
+  function tokenString(quote, style) {
+    var close = quote == "(" ? ")" : quote == "{" ? "}" : quote
+    return function(stream, state) {
+      var next, escaped = false;
+      while ((next = stream.next()) != null) {
+        if (next === close && !escaped) {
+          state.tokens.shift();
+          break;
+        } else if (next === '$' && !escaped && quote !== "'" && stream.peek() != close) {
+          escaped = true;
+          stream.backUp(1);
+          state.tokens.unshift(tokenDollar);
+          break;
+        } else if (!escaped && quote !== close && next === quote) {
+          state.tokens.unshift(tokenString(quote, style))
+          return tokenize(stream, state)
+        } else if (!escaped && /['"]/.test(next) && !/['"]/.test(quote)) {
+          state.tokens.unshift(tokenStringStart(next, "string"));
+          stream.backUp(1);
+          break;
+        }
+        escaped = !escaped && next === '\\';
+      }
+      return style;
+    };
+  };
+
+  function tokenStringStart(quote, style) {
+    return function(stream, state) {
+      state.tokens[0] = tokenString(quote, style)
+      stream.next()
+      return tokenize(stream, state)
+    }
+  }
+
+  var tokenDollar = function(stream, state) {
+    if (state.tokens.length > 1) stream.eat('$');
+    var ch = stream.next()
+    if (/['"({]/.test(ch)) {
+      state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : ch == "{" ? "def" : "string");
+      return tokenize(stream, state);
+    }
+    if (!/\d/.test(ch)) stream.eatWhile(/\w/);
+    state.tokens.shift();
+    return 'def';
+  };
+
+  function tokenize(stream, state) {
+    return (state.tokens[0] || tokenBase) (stream, state);
+  };
+
+  return {
+    startState: function() {return {tokens:[]};},
+    token: function(stream, state) {
+      return tokenize(stream, state);
+    },
+    closeBrackets: "()[]{}''\"\"``",
+    lineComment: '#',
+    fold: "brace"
+  };
+});
+
+CodeMirror.defineMIME('text/x-sh', 'shell');
+// Apache uses a slightly different Media Type for Shell scripts
+// http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+CodeMirror.defineMIME('application/x-sh', 'shell');
+
+});
diff --git a/core/media/editors/codemirror/mode/shell/shell.min.js b/core/media/editors/codemirror/mode/shell/shell.min.js
new file mode 100644
index 00000000..a1760e50
--- /dev/null
+++ b/core/media/editors/codemirror/mode/shell/shell.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("shell",(function(){function a(a,b){for(var c=b.split(" "),d=0;d<c.length;d++)f[c[d]]=a}function b(a,b){if(a.eatSpace())return null;var d=a.sol(),h=a.next();if("\\"===h)return a.next(),null;if("'"===h||'"'===h||"`"===h)return b.tokens.unshift(c(h,"`"===h?"quote":"string")),e(a,b);if("#"===h)return d&&a.eat("!")?(a.skipToEnd(),"meta"):(a.skipToEnd(),"comment");if("$"===h)return b.tokens.unshift(g),e(a,b);if("+"===h||"="===h)return"operator";if("-"===h)return a.eat("-"),a.eatWhile(/\w/),"attribute";if(/\d/.test(h)&&(a.eatWhile(/\d/),a.eol()||!/\w/.test(a.peek())))return"number";a.eatWhile(/[\w-]/);var i=a.current();return"="===a.peek()&&/\w+/.test(i)?"def":f.hasOwnProperty(i)?f[i]:null}function c(a,b){var f="("==a?")":"{"==a?"}":a;return function(h,i){for(var j,k=!1;null!=(j=h.next());){if(j===f&&!k){i.tokens.shift();break}if("$"===j&&!k&&"'"!==a&&h.peek()!=f){k=!0,h.backUp(1),i.tokens.unshift(g);break}if(!k&&a!==f&&j===a)return i.tokens.unshift(c(a,b)),e(h,i);if(!k&&/['"]/.test(j)&&!/['"]/.test(a)){i.tokens.unshift(d(j,"string")),h.backUp(1);break}k=!k&&"\\"===j}return b}}function d(a,b){return function(d,f){return f.tokens[0]=c(a,b),d.next(),e(d,f)}}function e(a,c){return(c.tokens[0]||b)(a,c)}var f={};a("atom","true false"),a("keyword","if then do else elif while until for in esac fi fin fil done exit set unset export function"),a("builtin","ab awk bash beep cat cc cd chown chmod chroot clear cp curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh shopt shred source sort sleep ssh start stop su sudo svn tee telnet top touch vi vim wall wc wget who write yes zsh");var g=function(a,b){b.tokens.length>1&&a.eat("$");var d=a.next();return/['"({]/.test(d)?(b.tokens[0]=c(d,"("==d?"quote":"{"==d?"def":"string"),e(a,b)):(/\d/.test(d)||a.eatWhile(/\w/),b.tokens.shift(),"def")};return{startState:function(){return{tokens:[]}},token:function(a,b){return e(a,b)},closeBrackets:"()[]{}''\"\"``",lineComment:"#",fold:"brace"}})),a.defineMIME("text/x-sh","shell"),a.defineMIME("application/x-sh","shell")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/sieve/sieve.js b/core/media/editors/codemirror/mode/sieve/sieve.js
new file mode 100644
index 00000000..0920d0ba
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sieve/sieve.js
@@ -0,0 +1,193 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("sieve", function(config) {
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var keywords = words("if elsif else stop require");
+  var atoms = words("true false not");
+  var indentUnit = config.indentUnit;
+
+  function tokenBase(stream, state) {
+
+    var ch = stream.next();
+    if (ch == "/" && stream.eat("*")) {
+      state.tokenize = tokenCComment;
+      return tokenCComment(stream, state);
+    }
+
+    if (ch === '#') {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    if (ch == "\"") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+
+    if (ch == "(") {
+      state._indent.push("(");
+      // add virtual angel wings so that editor behaves...
+      // ...more sane incase of broken brackets
+      state._indent.push("{");
+      return null;
+    }
+
+    if (ch === "{") {
+      state._indent.push("{");
+      return null;
+    }
+
+    if (ch == ")")  {
+      state._indent.pop();
+      state._indent.pop();
+    }
+
+    if (ch === "}") {
+      state._indent.pop();
+      return null;
+    }
+
+    if (ch == ",")
+      return null;
+
+    if (ch == ";")
+      return null;
+
+
+    if (/[{}\(\),;]/.test(ch))
+      return null;
+
+    // 1*DIGIT "K" / "M" / "G"
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\d]/);
+      stream.eat(/[KkMmGg]/);
+      return "number";
+    }
+
+    // ":" (ALPHA / "_") *(ALPHA / DIGIT / "_")
+    if (ch == ":") {
+      stream.eatWhile(/[a-zA-Z_]/);
+      stream.eatWhile(/[a-zA-Z0-9_]/);
+
+      return "operator";
+    }
+
+    stream.eatWhile(/\w/);
+    var cur = stream.current();
+
+    // "text:" *(SP / HTAB) (hash-comment / CRLF)
+    // *(multiline-literal / multiline-dotstart)
+    // "." CRLF
+    if ((cur == "text") && stream.eat(":"))
+    {
+      state.tokenize = tokenMultiLineString;
+      return "string";
+    }
+
+    if (keywords.propertyIsEnumerable(cur))
+      return "keyword";
+
+    if (atoms.propertyIsEnumerable(cur))
+      return "atom";
+
+    return null;
+  }
+
+  function tokenMultiLineString(stream, state)
+  {
+    state._multiLineString = true;
+    // the first line is special it may contain a comment
+    if (!stream.sol()) {
+      stream.eatSpace();
+
+      if (stream.peek() == "#") {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      stream.skipToEnd();
+      return "string";
+    }
+
+    if ((stream.next() == ".")  && (stream.eol()))
+    {
+      state._multiLineString = false;
+      state.tokenize = tokenBase;
+    }
+
+    return "string";
+  }
+
+  function tokenCComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "/") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped)
+          break;
+        escaped = !escaped && ch == "\\";
+      }
+      if (!escaped) state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  return {
+    startState: function(base) {
+      return {tokenize: tokenBase,
+              baseIndent: base || 0,
+              _indent: []};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace())
+        return null;
+
+      return (state.tokenize || tokenBase)(stream, state);
+    },
+
+    indent: function(state, _textAfter) {
+      var length = state._indent.length;
+      if (_textAfter && (_textAfter[0] == "}"))
+        length--;
+
+      if (length <0)
+        length = 0;
+
+      return length * indentUnit;
+    },
+
+    electricChars: "}"
+  };
+});
+
+CodeMirror.defineMIME("application/sieve", "sieve");
+
+});
diff --git a/core/media/editors/codemirror/mode/sieve/sieve.min.js b/core/media/editors/codemirror/mode/sieve/sieve.min.js
new file mode 100644
index 00000000..1cbcb223
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sieve/sieve.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sieve",(function(a){function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(a,b){var c=a.next();if("/"==c&&a.eat("*"))return b.tokenize=e,e(a,b);if("#"===c)return a.skipToEnd(),"comment";if('"'==c)return b.tokenize=f(c),b.tokenize(a,b);if("("==c)return b._indent.push("("),b._indent.push("{"),null;if("{"===c)return b._indent.push("{"),null;if(")"==c&&(b._indent.pop(),b._indent.pop()),"}"===c)return b._indent.pop(),null;if(","==c)return null;if(";"==c)return null;if(/[{}\(\),;]/.test(c))return null;if(/\d/.test(c))return a.eatWhile(/[\d]/),a.eat(/[KkMmGg]/),"number";if(":"==c)return a.eatWhile(/[a-zA-Z_]/),a.eatWhile(/[a-zA-Z0-9_]/),"operator";a.eatWhile(/\w/);var i=a.current();return"text"==i&&a.eat(":")?(b.tokenize=d,"string"):g.propertyIsEnumerable(i)?"keyword":h.propertyIsEnumerable(i)?"atom":null}function d(a,b){return b._multiLineString=!0,a.sol()?("."==a.next()&&a.eol()&&(b._multiLineString=!1,b.tokenize=c),"string"):(a.eatSpace(),"#"==a.peek()?(a.skipToEnd(),"comment"):(a.skipToEnd(),"string"))}function e(a,b){for(var d,e=!1;null!=(d=a.next());){if(e&&"/"==d){b.tokenize=c;break}e="*"==d}return"comment"}function f(a){return function(b,d){for(var e,f=!1;null!=(e=b.next())&&(e!=a||f);)f=!f&&"\\"==e;return f||(d.tokenize=c),"string"}}var g=b("if elsif else stop require"),h=b("true false not"),i=a.indentUnit;return{startState:function(a){return{tokenize:c,baseIndent:a||0,_indent:[]}},token:function(a,b){return a.eatSpace()?null:(b.tokenize||c)(a,b)},indent:function(a,b){var c=a._indent.length;return b&&"}"==b[0]&&c--,c<0&&(c=0),c*i},electricChars:"}"}})),a.defineMIME("application/sieve","sieve")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/slim/slim.js b/core/media/editors/codemirror/mode/slim/slim.js
new file mode 100644
index 00000000..991a97ef
--- /dev/null
+++ b/core/media/editors/codemirror/mode/slim/slim.js
@@ -0,0 +1,575 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+  CodeMirror.defineMode("slim", function(config) {
+    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
+    var rubyMode = CodeMirror.getMode(config, "ruby");
+    var modes = { html: htmlMode, ruby: rubyMode };
+    var embedded = {
+      ruby: "ruby",
+      javascript: "javascript",
+      css: "text/css",
+      sass: "text/x-sass",
+      scss: "text/x-scss",
+      less: "text/x-less",
+      styl: "text/x-styl", // no highlighting so far
+      coffee: "coffeescript",
+      asciidoc: "text/x-asciidoc",
+      markdown: "text/x-markdown",
+      textile: "text/x-textile", // no highlighting so far
+      creole: "text/x-creole", // no highlighting so far
+      wiki: "text/x-wiki", // no highlighting so far
+      mediawiki: "text/x-mediawiki", // no highlighting so far
+      rdoc: "text/x-rdoc", // no highlighting so far
+      builder: "text/x-builder", // no highlighting so far
+      nokogiri: "text/x-nokogiri", // no highlighting so far
+      erb: "application/x-erb"
+    };
+    var embeddedRegexp = function(map){
+      var arr = [];
+      for(var key in map) arr.push(key);
+      return new RegExp("^("+arr.join('|')+"):");
+    }(embedded);
+
+    var styleMap = {
+      "commentLine": "comment",
+      "slimSwitch": "operator special",
+      "slimTag": "tag",
+      "slimId": "attribute def",
+      "slimClass": "attribute qualifier",
+      "slimAttribute": "attribute",
+      "slimSubmode": "keyword special",
+      "closeAttributeTag": null,
+      "slimDoctype": null,
+      "lineContinuation": null
+    };
+    var closing = {
+      "{": "}",
+      "[": "]",
+      "(": ")"
+    };
+
+    var nameStartChar = "_a-zA-Z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD";
+    var nameChar = nameStartChar + "\\-0-9\xB7\u0300-\u036F\u203F-\u2040";
+    var nameRegexp = new RegExp("^[:"+nameStartChar+"](?::["+nameChar+"]|["+nameChar+"]*)");
+    var attributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*(?=\\s*=)");
+    var wrappedAttributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*");
+    var classNameRegexp = /^\.-?[_a-zA-Z]+[\w\-]*/;
+    var classIdRegexp = /^#[_a-zA-Z]+[\w\-]*/;
+
+    function backup(pos, tokenize, style) {
+      var restore = function(stream, state) {
+        state.tokenize = tokenize;
+        if (stream.pos < pos) {
+          stream.pos = pos;
+          return style;
+        }
+        return state.tokenize(stream, state);
+      };
+      return function(stream, state) {
+        state.tokenize = restore;
+        return tokenize(stream, state);
+      };
+    }
+
+    function maybeBackup(stream, state, pat, offset, style) {
+      var cur = stream.current();
+      var idx = cur.search(pat);
+      if (idx > -1) {
+        state.tokenize = backup(stream.pos, state.tokenize, style);
+        stream.backUp(cur.length - idx - offset);
+      }
+      return style;
+    }
+
+    function continueLine(state, column) {
+      state.stack = {
+        parent: state.stack,
+        style: "continuation",
+        indented: column,
+        tokenize: state.line
+      };
+      state.line = state.tokenize;
+    }
+    function finishContinue(state) {
+      if (state.line == state.tokenize) {
+        state.line = state.stack.tokenize;
+        state.stack = state.stack.parent;
+      }
+    }
+
+    function lineContinuable(column, tokenize) {
+      return function(stream, state) {
+        finishContinue(state);
+        if (stream.match(/^\\$/)) {
+          continueLine(state, column);
+          return "lineContinuation";
+        }
+        var style = tokenize(stream, state);
+        if (stream.eol() && stream.current().match(/(?:^|[^\\])(?:\\\\)*\\$/)) {
+          stream.backUp(1);
+        }
+        return style;
+      };
+    }
+    function commaContinuable(column, tokenize) {
+      return function(stream, state) {
+        finishContinue(state);
+        var style = tokenize(stream, state);
+        if (stream.eol() && stream.current().match(/,$/)) {
+          continueLine(state, column);
+        }
+        return style;
+      };
+    }
+
+    function rubyInQuote(endQuote, tokenize) {
+      // TODO: add multi line support
+      return function(stream, state) {
+        var ch = stream.peek();
+        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
+          // step out of ruby context as it seems to complete processing all the braces
+          stream.next();
+          state.tokenize = tokenize;
+          return "closeAttributeTag";
+        } else {
+          return ruby(stream, state);
+        }
+      };
+    }
+    function startRubySplat(tokenize) {
+      var rubyState;
+      var runSplat = function(stream, state) {
+        if (state.rubyState.tokenize.length == 1 && !state.rubyState.context.prev) {
+          stream.backUp(1);
+          if (stream.eatSpace()) {
+            state.rubyState = rubyState;
+            state.tokenize = tokenize;
+            return tokenize(stream, state);
+          }
+          stream.next();
+        }
+        return ruby(stream, state);
+      };
+      return function(stream, state) {
+        rubyState = state.rubyState;
+        state.rubyState = CodeMirror.startState(rubyMode);
+        state.tokenize = runSplat;
+        return ruby(stream, state);
+      };
+    }
+
+    function ruby(stream, state) {
+      return rubyMode.token(stream, state.rubyState);
+    }
+
+    function htmlLine(stream, state) {
+      if (stream.match(/^\\$/)) {
+        return "lineContinuation";
+      }
+      return html(stream, state);
+    }
+    function html(stream, state) {
+      if (stream.match(/^#\{/)) {
+        state.tokenize = rubyInQuote("}", state.tokenize);
+        return null;
+      }
+      return maybeBackup(stream, state, /[^\\]#\{/, 1, htmlMode.token(stream, state.htmlState));
+    }
+
+    function startHtmlLine(lastTokenize) {
+      return function(stream, state) {
+        var style = htmlLine(stream, state);
+        if (stream.eol()) state.tokenize = lastTokenize;
+        return style;
+      };
+    }
+
+    function startHtmlMode(stream, state, offset) {
+      state.stack = {
+        parent: state.stack,
+        style: "html",
+        indented: stream.column() + offset, // pipe + space
+        tokenize: state.line
+      };
+      state.line = state.tokenize = html;
+      return null;
+    }
+
+    function comment(stream, state) {
+      stream.skipToEnd();
+      return state.stack.style;
+    }
+
+    function commentMode(stream, state) {
+      state.stack = {
+        parent: state.stack,
+        style: "comment",
+        indented: state.indented + 1,
+        tokenize: state.line
+      };
+      state.line = comment;
+      return comment(stream, state);
+    }
+
+    function attributeWrapper(stream, state) {
+      if (stream.eat(state.stack.endQuote)) {
+        state.line = state.stack.line;
+        state.tokenize = state.stack.tokenize;
+        state.stack = state.stack.parent;
+        return null;
+      }
+      if (stream.match(wrappedAttributeNameRegexp)) {
+        state.tokenize = attributeWrapperAssign;
+        return "slimAttribute";
+      }
+      stream.next();
+      return null;
+    }
+    function attributeWrapperAssign(stream, state) {
+      if (stream.match(/^==?/)) {
+        state.tokenize = attributeWrapperValue;
+        return null;
+      }
+      return attributeWrapper(stream, state);
+    }
+    function attributeWrapperValue(stream, state) {
+      var ch = stream.peek();
+      if (ch == '"' || ch == "\'") {
+        state.tokenize = readQuoted(ch, "string", true, false, attributeWrapper);
+        stream.next();
+        return state.tokenize(stream, state);
+      }
+      if (ch == '[') {
+        return startRubySplat(attributeWrapper)(stream, state);
+      }
+      if (stream.match(/^(true|false|nil)\b/)) {
+        state.tokenize = attributeWrapper;
+        return "keyword";
+      }
+      return startRubySplat(attributeWrapper)(stream, state);
+    }
+
+    function startAttributeWrapperMode(state, endQuote, tokenize) {
+      state.stack = {
+        parent: state.stack,
+        style: "wrapper",
+        indented: state.indented + 1,
+        tokenize: tokenize,
+        line: state.line,
+        endQuote: endQuote
+      };
+      state.line = state.tokenize = attributeWrapper;
+      return null;
+    }
+
+    function sub(stream, state) {
+      if (stream.match(/^#\{/)) {
+        state.tokenize = rubyInQuote("}", state.tokenize);
+        return null;
+      }
+      var subStream = new CodeMirror.StringStream(stream.string.slice(state.stack.indented), stream.tabSize);
+      subStream.pos = stream.pos - state.stack.indented;
+      subStream.start = stream.start - state.stack.indented;
+      subStream.lastColumnPos = stream.lastColumnPos - state.stack.indented;
+      subStream.lastColumnValue = stream.lastColumnValue - state.stack.indented;
+      var style = state.subMode.token(subStream, state.subState);
+      stream.pos = subStream.pos + state.stack.indented;
+      return style;
+    }
+    function firstSub(stream, state) {
+      state.stack.indented = stream.column();
+      state.line = state.tokenize = sub;
+      return state.tokenize(stream, state);
+    }
+
+    function createMode(mode) {
+      var query = embedded[mode];
+      var spec = CodeMirror.mimeModes[query];
+      if (spec) {
+        return CodeMirror.getMode(config, spec);
+      }
+      var factory = CodeMirror.modes[query];
+      if (factory) {
+        return factory(config, {name: query});
+      }
+      return CodeMirror.getMode(config, "null");
+    }
+
+    function getMode(mode) {
+      if (!modes.hasOwnProperty(mode)) {
+        return modes[mode] = createMode(mode);
+      }
+      return modes[mode];
+    }
+
+    function startSubMode(mode, state) {
+      var subMode = getMode(mode);
+      var subState = CodeMirror.startState(subMode);
+
+      state.subMode = subMode;
+      state.subState = subState;
+
+      state.stack = {
+        parent: state.stack,
+        style: "sub",
+        indented: state.indented + 1,
+        tokenize: state.line
+      };
+      state.line = state.tokenize = firstSub;
+      return "slimSubmode";
+    }
+
+    function doctypeLine(stream, _state) {
+      stream.skipToEnd();
+      return "slimDoctype";
+    }
+
+    function startLine(stream, state) {
+      var ch = stream.peek();
+      if (ch == '<') {
+        return (state.tokenize = startHtmlLine(state.tokenize))(stream, state);
+      }
+      if (stream.match(/^[|']/)) {
+        return startHtmlMode(stream, state, 1);
+      }
+      if (stream.match(/^\/(!|\[\w+])?/)) {
+        return commentMode(stream, state);
+      }
+      if (stream.match(/^(-|==?[<>]?)/)) {
+        state.tokenize = lineContinuable(stream.column(), commaContinuable(stream.column(), ruby));
+        return "slimSwitch";
+      }
+      if (stream.match(/^doctype\b/)) {
+        state.tokenize = doctypeLine;
+        return "keyword";
+      }
+
+      var m = stream.match(embeddedRegexp);
+      if (m) {
+        return startSubMode(m[1], state);
+      }
+
+      return slimTag(stream, state);
+    }
+
+    function slim(stream, state) {
+      if (state.startOfLine) {
+        return startLine(stream, state);
+      }
+      return slimTag(stream, state);
+    }
+
+    function slimTag(stream, state) {
+      if (stream.eat('*')) {
+        state.tokenize = startRubySplat(slimTagExtras);
+        return null;
+      }
+      if (stream.match(nameRegexp)) {
+        state.tokenize = slimTagExtras;
+        return "slimTag";
+      }
+      return slimClass(stream, state);
+    }
+    function slimTagExtras(stream, state) {
+      if (stream.match(/^(<>?|><?)/)) {
+        state.tokenize = slimClass;
+        return null;
+      }
+      return slimClass(stream, state);
+    }
+    function slimClass(stream, state) {
+      if (stream.match(classIdRegexp)) {
+        state.tokenize = slimClass;
+        return "slimId";
+      }
+      if (stream.match(classNameRegexp)) {
+        state.tokenize = slimClass;
+        return "slimClass";
+      }
+      return slimAttribute(stream, state);
+    }
+    function slimAttribute(stream, state) {
+      if (stream.match(/^([\[\{\(])/)) {
+        return startAttributeWrapperMode(state, closing[RegExp.$1], slimAttribute);
+      }
+      if (stream.match(attributeNameRegexp)) {
+        state.tokenize = slimAttributeAssign;
+        return "slimAttribute";
+      }
+      if (stream.peek() == '*') {
+        stream.next();
+        state.tokenize = startRubySplat(slimContent);
+        return null;
+      }
+      return slimContent(stream, state);
+    }
+    function slimAttributeAssign(stream, state) {
+      if (stream.match(/^==?/)) {
+        state.tokenize = slimAttributeValue;
+        return null;
+      }
+      // should never happen, because of forward lookup
+      return slimAttribute(stream, state);
+    }
+
+    function slimAttributeValue(stream, state) {
+      var ch = stream.peek();
+      if (ch == '"' || ch == "\'") {
+        state.tokenize = readQuoted(ch, "string", true, false, slimAttribute);
+        stream.next();
+        return state.tokenize(stream, state);
+      }
+      if (ch == '[') {
+        return startRubySplat(slimAttribute)(stream, state);
+      }
+      if (ch == ':') {
+        return startRubySplat(slimAttributeSymbols)(stream, state);
+      }
+      if (stream.match(/^(true|false|nil)\b/)) {
+        state.tokenize = slimAttribute;
+        return "keyword";
+      }
+      return startRubySplat(slimAttribute)(stream, state);
+    }
+    function slimAttributeSymbols(stream, state) {
+      stream.backUp(1);
+      if (stream.match(/^[^\s],(?=:)/)) {
+        state.tokenize = startRubySplat(slimAttributeSymbols);
+        return null;
+      }
+      stream.next();
+      return slimAttribute(stream, state);
+    }
+    function readQuoted(quote, style, embed, unescaped, nextTokenize) {
+      return function(stream, state) {
+        finishContinue(state);
+        var fresh = stream.current().length == 0;
+        if (stream.match(/^\\$/, fresh)) {
+          if (!fresh) return style;
+          continueLine(state, state.indented);
+          return "lineContinuation";
+        }
+        if (stream.match(/^#\{/, fresh)) {
+          if (!fresh) return style;
+          state.tokenize = rubyInQuote("}", state.tokenize);
+          return null;
+        }
+        var escaped = false, ch;
+        while ((ch = stream.next()) != null) {
+          if (ch == quote && (unescaped || !escaped)) {
+            state.tokenize = nextTokenize;
+            break;
+          }
+          if (embed && ch == "#" && !escaped) {
+            if (stream.eat("{")) {
+              stream.backUp(2);
+              break;
+            }
+          }
+          escaped = !escaped && ch == "\\";
+        }
+        if (stream.eol() && escaped) {
+          stream.backUp(1);
+        }
+        return style;
+      };
+    }
+    function slimContent(stream, state) {
+      if (stream.match(/^==?/)) {
+        state.tokenize = ruby;
+        return "slimSwitch";
+      }
+      if (stream.match(/^\/$/)) { // tag close hint
+        state.tokenize = slim;
+        return null;
+      }
+      if (stream.match(/^:/)) { // inline tag
+        state.tokenize = slimTag;
+        return "slimSwitch";
+      }
+      startHtmlMode(stream, state, 0);
+      return state.tokenize(stream, state);
+    }
+
+    var mode = {
+      // default to html mode
+      startState: function() {
+        var htmlState = CodeMirror.startState(htmlMode);
+        var rubyState = CodeMirror.startState(rubyMode);
+        return {
+          htmlState: htmlState,
+          rubyState: rubyState,
+          stack: null,
+          last: null,
+          tokenize: slim,
+          line: slim,
+          indented: 0
+        };
+      },
+
+      copyState: function(state) {
+        return {
+          htmlState : CodeMirror.copyState(htmlMode, state.htmlState),
+          rubyState: CodeMirror.copyState(rubyMode, state.rubyState),
+          subMode: state.subMode,
+          subState: state.subMode && CodeMirror.copyState(state.subMode, state.subState),
+          stack: state.stack,
+          last: state.last,
+          tokenize: state.tokenize,
+          line: state.line
+        };
+      },
+
+      token: function(stream, state) {
+        if (stream.sol()) {
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+          state.tokenize = state.line;
+          while (state.stack && state.stack.indented > state.indented && state.last != "slimSubmode") {
+            state.line = state.tokenize = state.stack.tokenize;
+            state.stack = state.stack.parent;
+            state.subMode = null;
+            state.subState = null;
+          }
+        }
+        if (stream.eatSpace()) return null;
+        var style = state.tokenize(stream, state);
+        state.startOfLine = false;
+        if (style) state.last = style;
+        return styleMap.hasOwnProperty(style) ? styleMap[style] : style;
+      },
+
+      blankLine: function(state) {
+        if (state.subMode && state.subMode.blankLine) {
+          return state.subMode.blankLine(state.subState);
+        }
+      },
+
+      innerMode: function(state) {
+        if (state.subMode) return {state: state.subState, mode: state.subMode};
+        return {state: state, mode: mode};
+      }
+
+      //indent: function(state) {
+      //  return state.indented;
+      //}
+    };
+    return mode;
+  }, "htmlmixed", "ruby");
+
+  CodeMirror.defineMIME("text/x-slim", "slim");
+  CodeMirror.defineMIME("application/x-slim", "slim");
+});
diff --git a/core/media/editors/codemirror/mode/slim/slim.min.js b/core/media/editors/codemirror/mode/slim/slim.min.js
new file mode 100644
index 00000000..c5e6c926
--- /dev/null
+++ b/core/media/editors/codemirror/mode/slim/slim.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../ruby/ruby")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../ruby/ruby"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("slim",(function(b){function c(a,b,c){var d=function(d,e){return e.tokenize=b,d.pos<a?(d.pos=a,c):e.tokenize(d,e)};return function(a,c){return c.tokenize=d,b(a,c)}}function d(a,b,d,e,f){var g=a.current(),h=g.search(d);return h>-1&&(b.tokenize=c(a.pos,b.tokenize,f),a.backUp(g.length-h-e)),f}function e(a,b){a.stack={parent:a.stack,style:"continuation",indented:b,tokenize:a.line},a.line=a.tokenize}function f(a){a.line==a.tokenize&&(a.line=a.stack.tokenize,a.stack=a.stack.parent)}function g(a,b){return function(c,d){if(f(d),c.match(/^\\$/))return e(d,a),"lineContinuation";var g=b(c,d);return c.eol()&&c.current().match(/(?:^|[^\\])(?:\\\\)*\\$/)&&c.backUp(1),g}}function h(a,b){return function(c,d){f(d);var g=b(c,d);return c.eol()&&c.current().match(/,$/)&&e(d,a),g}}function i(a,b){return function(c,d){var e=c.peek();return e==a&&1==d.rubyState.tokenize.length?(c.next(),d.tokenize=b,"closeAttributeTag"):k(c,d)}}function j(b){var c,d=function(a,d){if(1==d.rubyState.tokenize.length&&!d.rubyState.context.prev){if(a.backUp(1),a.eatSpace())return d.rubyState=c,d.tokenize=b,b(a,d);a.next()}return k(a,d)};return function(b,e){return c=e.rubyState,e.rubyState=a.startState(N),e.tokenize=d,k(b,e)}}function k(a,b){return N.token(a,b.rubyState)}function l(a,b){return a.match(/^\\$/)?"lineContinuation":m(a,b)}function m(a,b){return a.match(/^#\{/)?(b.tokenize=i("}",b.tokenize),null):d(a,b,/[^\\]#\{/,1,M.token(a,b.htmlState))}function n(a){return function(b,c){var d=l(b,c);return b.eol()&&(c.tokenize=a),d}}function o(a,b,c){return b.stack={parent:b.stack,style:"html",indented:a.column()+c,tokenize:b.line},b.line=b.tokenize=m,null}function p(a,b){return a.skipToEnd(),b.stack.style}function q(a,b){return b.stack={parent:b.stack,style:"comment",indented:b.indented+1,tokenize:b.line},b.line=p,p(a,b)}function r(a,b){return a.eat(b.stack.endQuote)?(b.line=b.stack.line,b.tokenize=b.stack.tokenize,b.stack=b.stack.parent,null):a.match(X)?(b.tokenize=s,"slimAttribute"):(a.next(),null)}function s(a,b){return a.match(/^==?/)?(b.tokenize=t,null):r(a,b)}function t(a,b){var c=a.peek();return'"'==c||"'"==c?(b.tokenize=K(c,"string",!0,!1,r),a.next(),b.tokenize(a,b)):"["==c?j(r)(a,b):a.match(/^(true|false|nil)\b/)?(b.tokenize=r,"keyword"):j(r)(a,b)}function u(a,b,c){return a.stack={parent:a.stack,style:"wrapper",indented:a.indented+1,tokenize:c,line:a.line,endQuote:b},a.line=a.tokenize=r,null}function v(b,c){if(b.match(/^#\{/))return c.tokenize=i("}",c.tokenize),null;var d=new a.StringStream(b.string.slice(c.stack.indented),b.tabSize);d.pos=b.pos-c.stack.indented,d.start=b.start-c.stack.indented,d.lastColumnPos=b.lastColumnPos-c.stack.indented,d.lastColumnValue=b.lastColumnValue-c.stack.indented;var e=c.subMode.token(d,c.subState);return b.pos=d.pos+c.stack.indented,e}function w(a,b){return b.stack.indented=a.column(),b.line=b.tokenize=v,b.tokenize(a,b)}function x(c){var d=P[c],e=a.mimeModes[d];if(e)return a.getMode(b,e);var f=a.modes[d];return f?f(b,{name:d}):a.getMode(b,"null")}function y(a){return O.hasOwnProperty(a)?O[a]:O[a]=x(a)}function z(b,c){var d=y(b),e=a.startState(d);return c.subMode=d,c.subState=e,c.stack={parent:c.stack,style:"sub",indented:c.indented+1,tokenize:c.line},c.line=c.tokenize=w,"slimSubmode"}function A(a,b){return a.skipToEnd(),"slimDoctype"}function B(a,b){var c=a.peek();if("<"==c)return(b.tokenize=n(b.tokenize))(a,b);if(a.match(/^[|']/))return o(a,b,1);if(a.match(/^\/(!|\[\w+])?/))return q(a,b);if(a.match(/^(-|==?[<>]?)/))return b.tokenize=g(a.column(),h(a.column(),k)),"slimSwitch";if(a.match(/^doctype\b/))return b.tokenize=A,"keyword";var d=a.match(Q);return d?z(d[1],b):D(a,b)}function C(a,b){return b.startOfLine?B(a,b):D(a,b)}function D(a,b){return a.eat("*")?(b.tokenize=j(E),null):a.match(V)?(b.tokenize=E,"slimTag"):F(a,b)}function E(a,b){return a.match(/^(<>?|><?)/)?(b.tokenize=F,null):F(a,b)}function F(a,b){return a.match(Z)?(b.tokenize=F,"slimId"):a.match(Y)?(b.tokenize=F,"slimClass"):G(a,b)}function G(a,b){return a.match(/^([\[\{\(])/)?u(b,S[RegExp.$1],G):a.match(W)?(b.tokenize=H,"slimAttribute"):"*"==a.peek()?(a.next(),b.tokenize=j(L),null):L(a,b)}function H(a,b){return a.match(/^==?/)?(b.tokenize=I,null):G(a,b)}function I(a,b){var c=a.peek();return'"'==c||"'"==c?(b.tokenize=K(c,"string",!0,!1,G),a.next(),b.tokenize(a,b)):"["==c?j(G)(a,b):":"==c?j(J)(a,b):a.match(/^(true|false|nil)\b/)?(b.tokenize=G,"keyword"):j(G)(a,b)}function J(a,b){return a.backUp(1),a.match(/^[^\s],(?=:)/)?(b.tokenize=j(J),null):(a.next(),G(a,b))}function K(a,b,c,d,g){return function(h,j){f(j);var k=0==h.current().length;if(h.match(/^\\$/,k))return k?(e(j,j.indented),"lineContinuation"):b;if(h.match(/^#\{/,k))return k?(j.tokenize=i("}",j.tokenize),null):b;for(var l,m=!1;null!=(l=h.next());){if(l==a&&(d||!m)){j.tokenize=g;break}if(c&&"#"==l&&!m&&h.eat("{")){h.backUp(2);break}m=!m&&"\\"==l}return h.eol()&&m&&h.backUp(1),b}}function L(a,b){return a.match(/^==?/)?(b.tokenize=k,"slimSwitch"):a.match(/^\/$/)?(b.tokenize=C,null):a.match(/^:/)?(b.tokenize=D,"slimSwitch"):(o(a,b,0),b.tokenize(a,b))}var M=a.getMode(b,{name:"htmlmixed"}),N=a.getMode(b,"ruby"),O={html:M,ruby:N},P={ruby:"ruby",javascript:"javascript",css:"text/css",sass:"text/x-sass",scss:"text/x-scss",less:"text/x-less",styl:"text/x-styl",coffee:"coffeescript",asciidoc:"text/x-asciidoc",markdown:"text/x-markdown",textile:"text/x-textile",creole:"text/x-creole",wiki:"text/x-wiki",mediawiki:"text/x-mediawiki",rdoc:"text/x-rdoc",builder:"text/x-builder",nokogiri:"text/x-nokogiri",erb:"application/x-erb"},Q=(function(a){var b=[];for(var c in a)b.push(c);return new RegExp("^("+b.join("|")+"):")})(P),R={commentLine:"comment",slimSwitch:"operator special",slimTag:"tag",slimId:"attribute def",slimClass:"attribute qualifier",slimAttribute:"attribute",slimSubmode:"keyword special",closeAttributeTag:null,slimDoctype:null,lineContinuation:null},S={"{":"}","[":"]","(":")"},T="_a-zA-ZÀ-ÖØ-öø-˿Ͱ-ͽͿ-῿‌-‍⁰-↏Ⰰ-⿯、-퟿豈-﷏ﷰ-�",U=T+"\\-0-9·̀-ͯ‿-⁀",V=new RegExp("^[:"+T+"](?::["+U+"]|["+U+"]*)"),W=new RegExp("^[:"+T+"][:\\."+U+"]*(?=\\s*=)"),X=new RegExp("^[:"+T+"][:\\."+U+"]*"),Y=/^\.-?[_a-zA-Z]+[\w\-]*/,Z=/^#[_a-zA-Z]+[\w\-]*/,$={startState:function(){var b=a.startState(M),c=a.startState(N);return{htmlState:b,rubyState:c,stack:null,last:null,tokenize:C,line:C,indented:0}},copyState:function(b){return{htmlState:a.copyState(M,b.htmlState),rubyState:a.copyState(N,b.rubyState),subMode:b.subMode,subState:b.subMode&&a.copyState(b.subMode,b.subState),stack:b.stack,last:b.last,tokenize:b.tokenize,line:b.line}},token:function(a,b){if(a.sol())for(b.indented=a.indentation(),b.startOfLine=!0,b.tokenize=b.line;b.stack&&b.stack.indented>b.indented&&"slimSubmode"!=b.last;)b.line=b.tokenize=b.stack.tokenize,b.stack=b.stack.parent,b.subMode=null,b.subState=null;if(a.eatSpace())return null;var c=b.tokenize(a,b);return b.startOfLine=!1,c&&(b.last=c),R.hasOwnProperty(c)?R[c]:c},blankLine:function(a){if(a.subMode&&a.subMode.blankLine)return a.subMode.blankLine(a.subState)},innerMode:function(a){return a.subMode?{state:a.subState,mode:a.subMode}:{state:a,mode:$}}};return $}),"htmlmixed","ruby"),a.defineMIME("text/x-slim","slim"),a.defineMIME("application/x-slim","slim")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/smalltalk/smalltalk.js b/core/media/editors/codemirror/mode/smalltalk/smalltalk.js
new file mode 100644
index 00000000..bb510ba2
--- /dev/null
+++ b/core/media/editors/codemirror/mode/smalltalk/smalltalk.js
@@ -0,0 +1,168 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('smalltalk', function(config) {
+
+  var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
+  var keywords = /true|false|nil|self|super|thisContext/;
+
+  var Context = function(tokenizer, parent) {
+    this.next = tokenizer;
+    this.parent = parent;
+  };
+
+  var Token = function(name, context, eos) {
+    this.name = name;
+    this.context = context;
+    this.eos = eos;
+  };
+
+  var State = function() {
+    this.context = new Context(next, null);
+    this.expectVariable = true;
+    this.indentation = 0;
+    this.userIndentationDelta = 0;
+  };
+
+  State.prototype.userIndent = function(indentation) {
+    this.userIndentationDelta = indentation > 0 ? (indentation / config.indentUnit - this.indentation) : 0;
+  };
+
+  var next = function(stream, context, state) {
+    var token = new Token(null, context, false);
+    var aChar = stream.next();
+
+    if (aChar === '"') {
+      token = nextComment(stream, new Context(nextComment, context));
+
+    } else if (aChar === '\'') {
+      token = nextString(stream, new Context(nextString, context));
+
+    } else if (aChar === '#') {
+      if (stream.peek() === '\'') {
+        stream.next();
+        token = nextSymbol(stream, new Context(nextSymbol, context));
+      } else {
+        if (stream.eatWhile(/[^\s.{}\[\]()]/))
+          token.name = 'string-2';
+        else
+          token.name = 'meta';
+      }
+
+    } else if (aChar === '$') {
+      if (stream.next() === '<') {
+        stream.eatWhile(/[^\s>]/);
+        stream.next();
+      }
+      token.name = 'string-2';
+
+    } else if (aChar === '|' && state.expectVariable) {
+      token.context = new Context(nextTemporaries, context);
+
+    } else if (/[\[\]{}()]/.test(aChar)) {
+      token.name = 'bracket';
+      token.eos = /[\[{(]/.test(aChar);
+
+      if (aChar === '[') {
+        state.indentation++;
+      } else if (aChar === ']') {
+        state.indentation = Math.max(0, state.indentation - 1);
+      }
+
+    } else if (specialChars.test(aChar)) {
+      stream.eatWhile(specialChars);
+      token.name = 'operator';
+      token.eos = aChar !== ';'; // ; cascaded message expression
+
+    } else if (/\d/.test(aChar)) {
+      stream.eatWhile(/[\w\d]/);
+      token.name = 'number';
+
+    } else if (/[\w_]/.test(aChar)) {
+      stream.eatWhile(/[\w\d_]/);
+      token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null;
+
+    } else {
+      token.eos = state.expectVariable;
+    }
+
+    return token;
+  };
+
+  var nextComment = function(stream, context) {
+    stream.eatWhile(/[^"]/);
+    return new Token('comment', stream.eat('"') ? context.parent : context, true);
+  };
+
+  var nextString = function(stream, context) {
+    stream.eatWhile(/[^']/);
+    return new Token('string', stream.eat('\'') ? context.parent : context, false);
+  };
+
+  var nextSymbol = function(stream, context) {
+    stream.eatWhile(/[^']/);
+    return new Token('string-2', stream.eat('\'') ? context.parent : context, false);
+  };
+
+  var nextTemporaries = function(stream, context) {
+    var token = new Token(null, context, false);
+    var aChar = stream.next();
+
+    if (aChar === '|') {
+      token.context = context.parent;
+      token.eos = true;
+
+    } else {
+      stream.eatWhile(/[^|]/);
+      token.name = 'variable';
+    }
+
+    return token;
+  };
+
+  return {
+    startState: function() {
+      return new State;
+    },
+
+    token: function(stream, state) {
+      state.userIndent(stream.indentation());
+
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      var token = state.context.next(stream, state.context, state);
+      state.context = token.context;
+      state.expectVariable = token.eos;
+
+      return token.name;
+    },
+
+    blankLine: function(state) {
+      state.userIndent(0);
+    },
+
+    indent: function(state, textAfter) {
+      var i = state.context.next === next && textAfter && textAfter.charAt(0) === ']' ? -1 : state.userIndentationDelta;
+      return (state.indentation + i) * config.indentUnit;
+    },
+
+    electricChars: ']'
+  };
+
+});
+
+CodeMirror.defineMIME('text/x-stsrc', {name: 'smalltalk'});
+
+});
diff --git a/core/media/editors/codemirror/mode/smalltalk/smalltalk.min.js b/core/media/editors/codemirror/mode/smalltalk/smalltalk.min.js
new file mode 100644
index 00000000..436d06e8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/smalltalk/smalltalk.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("smalltalk",(function(a){var b=/[+\-\/\\*~<>=@%|&?!.,:;^]/,c=/true|false|nil|self|super|thisContext/,d=function(a,b){this.next=a,this.parent=b},e=function(a,b,c){this.name=a,this.context=b,this.eos=c},f=function(){this.context=new d(g,null),this.expectVariable=!0,this.indentation=0,this.userIndentationDelta=0};f.prototype.userIndent=function(b){this.userIndentationDelta=b>0?b/a.indentUnit-this.indentation:0};var g=function(a,f,g){var l=new e(null,f,!1),m=a.next();return'"'===m?l=h(a,new d(h,f)):"'"===m?l=i(a,new d(i,f)):"#"===m?"'"===a.peek()?(a.next(),l=j(a,new d(j,f))):a.eatWhile(/[^\s.{}\[\]()]/)?l.name="string-2":l.name="meta":"$"===m?("<"===a.next()&&(a.eatWhile(/[^\s>]/),a.next()),l.name="string-2"):"|"===m&&g.expectVariable?l.context=new d(k,f):/[\[\]{}()]/.test(m)?(l.name="bracket",l.eos=/[\[{(]/.test(m),"["===m?g.indentation++:"]"===m&&(g.indentation=Math.max(0,g.indentation-1))):b.test(m)?(a.eatWhile(b),l.name="operator",l.eos=";"!==m):/\d/.test(m)?(a.eatWhile(/[\w\d]/),l.name="number"):/[\w_]/.test(m)?(a.eatWhile(/[\w\d_]/),l.name=g.expectVariable?c.test(a.current())?"keyword":"variable":null):l.eos=g.expectVariable,l},h=function(a,b){return a.eatWhile(/[^"]/),new e("comment",a.eat('"')?b.parent:b,!0)},i=function(a,b){return a.eatWhile(/[^']/),new e("string",a.eat("'")?b.parent:b,!1)},j=function(a,b){return a.eatWhile(/[^']/),new e("string-2",a.eat("'")?b.parent:b,!1)},k=function(a,b){var c=new e(null,b,!1),d=a.next();return"|"===d?(c.context=b.parent,c.eos=!0):(a.eatWhile(/[^|]/),c.name="variable"),c};return{startState:function(){return new f},token:function(a,b){if(b.userIndent(a.indentation()),a.eatSpace())return null;var c=b.context.next(a,b.context,b);return b.context=c.context,b.expectVariable=c.eos,c.name},blankLine:function(a){a.userIndent(0)},indent:function(b,c){var d=b.context.next===g&&c&&"]"===c.charAt(0)?-1:b.userIndentationDelta;return(b.indentation+d)*a.indentUnit},electricChars:"]"}})),a.defineMIME("text/x-stsrc",{name:"smalltalk"})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/smarty/smarty.js b/core/media/editors/codemirror/mode/smarty/smarty.js
new file mode 100644
index 00000000..6e0fbed4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/smarty/smarty.js
@@ -0,0 +1,225 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Smarty 2 and 3 mode.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("smarty", function(config, parserConf) {
+    var rightDelimiter = parserConf.rightDelimiter || "}";
+    var leftDelimiter = parserConf.leftDelimiter || "{";
+    var version = parserConf.version || 2;
+    var baseMode = CodeMirror.getMode(config, parserConf.baseMode || "null");
+
+    var keyFunctions = ["debug", "extends", "function", "include", "literal"];
+    var regs = {
+      operatorChars: /[+\-*&%=<>!?]/,
+      validIdentifier: /[a-zA-Z0-9_]/,
+      stringChar: /['"]/
+    };
+
+    var last;
+    function cont(style, lastType) {
+      last = lastType;
+      return style;
+    }
+
+    function chain(stream, state, parser) {
+      state.tokenize = parser;
+      return parser(stream, state);
+    }
+
+    // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode
+    function doesNotCount(stream, pos) {
+      if (pos == null) pos = stream.pos;
+      return version === 3 && leftDelimiter == "{" &&
+        (pos == stream.string.length || /\s/.test(stream.string.charAt(pos)));
+    }
+
+    function tokenTop(stream, state) {
+      var string = stream.string;
+      for (var scan = stream.pos;;) {
+        var nextMatch = string.indexOf(leftDelimiter, scan);
+        scan = nextMatch + leftDelimiter.length;
+        if (nextMatch == -1 || !doesNotCount(stream, nextMatch + leftDelimiter.length)) break;
+      }
+      if (nextMatch == stream.pos) {
+        stream.match(leftDelimiter);
+        if (stream.eat("*")) {
+          return chain(stream, state, tokenBlock("comment", "*" + rightDelimiter));
+        } else {
+          state.depth++;
+          state.tokenize = tokenSmarty;
+          last = "startTag";
+          return "tag";
+        }
+      }
+
+      if (nextMatch > -1) stream.string = string.slice(0, nextMatch);
+      var token = baseMode.token(stream, state.base);
+      if (nextMatch > -1) stream.string = string;
+      return token;
+    }
+
+    // parsing Smarty content
+    function tokenSmarty(stream, state) {
+      if (stream.match(rightDelimiter, true)) {
+        if (version === 3) {
+          state.depth--;
+          if (state.depth <= 0) {
+            state.tokenize = tokenTop;
+          }
+        } else {
+          state.tokenize = tokenTop;
+        }
+        return cont("tag", null);
+      }
+
+      if (stream.match(leftDelimiter, true)) {
+        state.depth++;
+        return cont("tag", "startTag");
+      }
+
+      var ch = stream.next();
+      if (ch == "$") {
+        stream.eatWhile(regs.validIdentifier);
+        return cont("variable-2", "variable");
+      } else if (ch == "|") {
+        return cont("operator", "pipe");
+      } else if (ch == ".") {
+        return cont("operator", "property");
+      } else if (regs.stringChar.test(ch)) {
+        state.tokenize = tokenAttribute(ch);
+        return cont("string", "string");
+      } else if (regs.operatorChars.test(ch)) {
+        stream.eatWhile(regs.operatorChars);
+        return cont("operator", "operator");
+      } else if (ch == "[" || ch == "]") {
+        return cont("bracket", "bracket");
+      } else if (ch == "(" || ch == ")") {
+        return cont("bracket", "operator");
+      } else if (/\d/.test(ch)) {
+        stream.eatWhile(/\d/);
+        return cont("number", "number");
+      } else {
+
+        if (state.last == "variable") {
+          if (ch == "@") {
+            stream.eatWhile(regs.validIdentifier);
+            return cont("property", "property");
+          } else if (ch == "|") {
+            stream.eatWhile(regs.validIdentifier);
+            return cont("qualifier", "modifier");
+          }
+        } else if (state.last == "pipe") {
+          stream.eatWhile(regs.validIdentifier);
+          return cont("qualifier", "modifier");
+        } else if (state.last == "whitespace") {
+          stream.eatWhile(regs.validIdentifier);
+          return cont("attribute", "modifier");
+        } if (state.last == "property") {
+          stream.eatWhile(regs.validIdentifier);
+          return cont("property", null);
+        } else if (/\s/.test(ch)) {
+          last = "whitespace";
+          return null;
+        }
+
+        var str = "";
+        if (ch != "/") {
+          str += ch;
+        }
+        var c = null;
+        while (c = stream.eat(regs.validIdentifier)) {
+          str += c;
+        }
+        for (var i=0, j=keyFunctions.length; i<j; i++) {
+          if (keyFunctions[i] == str) {
+            return cont("keyword", "keyword");
+          }
+        }
+        if (/\s/.test(ch)) {
+          return null;
+        }
+        return cont("tag", "tag");
+      }
+    }
+
+    function tokenAttribute(quote) {
+      return function(stream, state) {
+        var prevChar = null;
+        var currChar = null;
+        while (!stream.eol()) {
+          currChar = stream.peek();
+          if (stream.next() == quote && prevChar !== '\\') {
+            state.tokenize = tokenSmarty;
+            break;
+          }
+          prevChar = currChar;
+        }
+        return "string";
+      };
+    }
+
+    function tokenBlock(style, terminator) {
+      return function(stream, state) {
+        while (!stream.eol()) {
+          if (stream.match(terminator)) {
+            state.tokenize = tokenTop;
+            break;
+          }
+          stream.next();
+        }
+        return style;
+      };
+    }
+
+    return {
+      startState: function() {
+        return {
+          base: CodeMirror.startState(baseMode),
+          tokenize: tokenTop,
+          last: null,
+          depth: 0
+        };
+      },
+      copyState: function(state) {
+        return {
+          base: CodeMirror.copyState(baseMode, state.base),
+          tokenize: state.tokenize,
+          last: state.last,
+          depth: state.depth
+        };
+      },
+      innerMode: function(state) {
+        if (state.tokenize == tokenTop)
+          return {mode: baseMode, state: state.base};
+      },
+      token: function(stream, state) {
+        var style = state.tokenize(stream, state);
+        state.last = last;
+        return style;
+      },
+      indent: function(state, text) {
+        if (state.tokenize == tokenTop && baseMode.indent)
+          return baseMode.indent(state.base, text);
+        else
+          return CodeMirror.Pass;
+      },
+      blockCommentStart: leftDelimiter + "*",
+      blockCommentEnd: "*" + rightDelimiter
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-smarty", "smarty");
+});
diff --git a/core/media/editors/codemirror/mode/smarty/smarty.min.js b/core/media/editors/codemirror/mode/smarty/smarty.min.js
new file mode 100644
index 00000000..fa02bb1e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/smarty/smarty.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("smarty",(function(b,c){function d(a,b){return k=b,a}function e(a,b,c){return b.tokenize=c,c(a,b)}function f(a,b){return null==b&&(b=a.pos),3===n&&"{"==m&&(b==a.string.length||/\s/.test(a.string.charAt(b)))}function g(a,b){for(var c=a.string,d=a.pos;;){var g=c.indexOf(m,d);if(d=g+m.length,g==-1||!f(a,g+m.length))break}if(g==a.pos)return a.match(m),a.eat("*")?e(a,b,j("comment","*"+l)):(b.depth++,b.tokenize=h,k="startTag","tag");g>-1&&(a.string=c.slice(0,g));var i=o.token(a,b.base);return g>-1&&(a.string=c),i}function h(a,b){if(a.match(l,!0))return 3===n?(b.depth--,b.depth<=0&&(b.tokenize=g)):b.tokenize=g,d("tag",null);if(a.match(m,!0))return b.depth++,d("tag","startTag");var c=a.next();if("$"==c)return a.eatWhile(q.validIdentifier),d("variable-2","variable");if("|"==c)return d("operator","pipe");if("."==c)return d("operator","property");if(q.stringChar.test(c))return b.tokenize=i(c),d("string","string");if(q.operatorChars.test(c))return a.eatWhile(q.operatorChars),d("operator","operator");if("["==c||"]"==c)return d("bracket","bracket");if("("==c||")"==c)return d("bracket","operator");if(/\d/.test(c))return a.eatWhile(/\d/),d("number","number");if("variable"==b.last){if("@"==c)return a.eatWhile(q.validIdentifier),d("property","property");if("|"==c)return a.eatWhile(q.validIdentifier),d("qualifier","modifier")}else{if("pipe"==b.last)return a.eatWhile(q.validIdentifier),d("qualifier","modifier");if("whitespace"==b.last)return a.eatWhile(q.validIdentifier),d("attribute","modifier")}if("property"==b.last)return a.eatWhile(q.validIdentifier),d("property",null);if(/\s/.test(c))return k="whitespace",null;var e="";"/"!=c&&(e+=c);for(var f=null;f=a.eat(q.validIdentifier);)e+=f;for(var h=0,j=p.length;h<j;h++)if(p[h]==e)return d("keyword","keyword");return/\s/.test(c)?null:d("tag","tag")}function i(a){return function(b,c){for(var d=null,e=null;!b.eol();){if(e=b.peek(),b.next()==a&&"\\"!==d){c.tokenize=h;break}d=e}return"string"}}function j(a,b){return function(c,d){for(;!c.eol();){if(c.match(b)){d.tokenize=g;break}c.next()}return a}}var k,l=c.rightDelimiter||"}",m=c.leftDelimiter||"{",n=c.version||2,o=a.getMode(b,c.baseMode||"null"),p=["debug","extends","function","include","literal"],q={operatorChars:/[+\-*&%=<>!?]/,validIdentifier:/[a-zA-Z0-9_]/,stringChar:/['"]/};return{startState:function(){return{base:a.startState(o),tokenize:g,last:null,depth:0}},copyState:function(b){return{base:a.copyState(o,b.base),tokenize:b.tokenize,last:b.last,depth:b.depth}},innerMode:function(a){if(a.tokenize==g)return{mode:o,state:a.base}},token:function(a,b){var c=b.tokenize(a,b);return b.last=k,c},indent:function(b,c){return b.tokenize==g&&o.indent?o.indent(b.base,c):a.Pass},blockCommentStart:m+"*",blockCommentEnd:"*"+l}})),a.defineMIME("text/x-smarty","smarty")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/solr/solr.js b/core/media/editors/codemirror/mode/solr/solr.js
new file mode 100644
index 00000000..dc8b8250
--- /dev/null
+++ b/core/media/editors/codemirror/mode/solr/solr.js
@@ -0,0 +1,104 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("solr", function() {
+  "use strict";
+
+  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\"\\]/;
+  var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/;
+  var isOperatorString = /^(OR|AND|NOT|TO)$/i;
+
+  function isNumber(word) {
+    return parseFloat(word).toString() === word;
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) break;
+        escaped = !escaped && next == "\\";
+      }
+
+      if (!escaped) state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  function tokenOperator(operator) {
+    return function(stream, state) {
+      var style = "operator";
+      if (operator == "+")
+        style += " positive";
+      else if (operator == "-")
+        style += " negative";
+      else if (operator == "|")
+        stream.eat(/\|/);
+      else if (operator == "&")
+        stream.eat(/\&/);
+      else if (operator == "^")
+        style += " boost";
+
+      state.tokenize = tokenBase;
+      return style;
+    };
+  }
+
+  function tokenWord(ch) {
+    return function(stream, state) {
+      var word = ch;
+      while ((ch = stream.peek()) && ch.match(isStringChar) != null) {
+        word += stream.next();
+      }
+
+      state.tokenize = tokenBase;
+      if (isOperatorString.test(word))
+        return "operator";
+      else if (isNumber(word))
+        return "number";
+      else if (stream.peek() == ":")
+        return "field";
+      else
+        return "string";
+    };
+  }
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"')
+      state.tokenize = tokenString(ch);
+    else if (isOperatorChar.test(ch))
+      state.tokenize = tokenOperator(ch);
+    else if (isStringChar.test(ch))
+      state.tokenize = tokenWord(ch);
+
+    return (state.tokenize != tokenBase) ? state.tokenize(stream, state) : null;
+  }
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-solr", "solr");
+
+});
diff --git a/core/media/editors/codemirror/mode/solr/solr.min.js b/core/media/editors/codemirror/mode/solr/solr.min.js
new file mode 100644
index 00000000..7c503d03
--- /dev/null
+++ b/core/media/editors/codemirror/mode/solr/solr.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("solr",(function(){function a(a){return parseFloat(a).toString()===a}function b(a){return function(b,c){for(var d,f=!1;null!=(d=b.next())&&(d!=a||f);)f=!f&&"\\"==d;return f||(c.tokenize=e),"string"}}function c(a){return function(b,c){var d="operator";return"+"==a?d+=" positive":"-"==a?d+=" negative":"|"==a?b.eat(/\|/):"&"==a?b.eat(/\&/):"^"==a&&(d+=" boost"),c.tokenize=e,d}}function d(b){return function(c,d){for(var g=b;(b=c.peek())&&null!=b.match(f);)g+=c.next();return d.tokenize=e,h.test(g)?"operator":a(g)?"number":":"==c.peek()?"field":"string"}}function e(a,h){var i=a.next();return'"'==i?h.tokenize=b(i):g.test(i)?h.tokenize=c(i):f.test(i)&&(h.tokenize=d(i)),h.tokenize!=e?h.tokenize(a,h):null}var f=/[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\"\\]/,g=/[\|\!\+\-\*\?\~\^\&]/,h=/^(OR|AND|NOT|TO)$/i;return{startState:function(){return{tokenize:e}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}})),a.defineMIME("text/x-solr","solr")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/soy/soy.js b/core/media/editors/codemirror/mode/soy/soy.js
new file mode 100644
index 00000000..de544015
--- /dev/null
+++ b/core/media/editors/codemirror/mode/soy/soy.js
@@ -0,0 +1,355 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
+                       "else", "switch", "case", "default", "foreach", "ifempty", "for",
+                       "call", "param", "deltemplate", "delcall", "log"];
+
+  CodeMirror.defineMode("soy", function(config) {
+    var textMode = CodeMirror.getMode(config, "text/plain");
+    var modes = {
+      html: CodeMirror.getMode(config, {name: "text/html", multilineTagIndentFactor: 2, multilineTagIndentPastTag: false}),
+      attributes: textMode,
+      text: textMode,
+      uri: textMode,
+      trusted_resource_uri: textMode,
+      css: CodeMirror.getMode(config, "text/css"),
+      js: CodeMirror.getMode(config, {name: "text/javascript", statementIndent: 2 * config.indentUnit})
+    };
+
+    function last(array) {
+      return array[array.length - 1];
+    }
+
+    function tokenUntil(stream, state, untilRegExp) {
+      if (stream.sol()) {
+        for (var indent = 0; indent < state.indent; indent++) {
+          if (!stream.eat(/\s/)) break;
+        }
+        if (indent) return null;
+      }
+      var oldString = stream.string;
+      var match = untilRegExp.exec(oldString.substr(stream.pos));
+      if (match) {
+        // We don't use backUp because it backs up just the position, not the state.
+        // This uses an undocumented API.
+        stream.string = oldString.substr(0, stream.pos + match.index);
+      }
+      var result = stream.hideFirstChars(state.indent, function() {
+        var localState = last(state.localStates);
+        return localState.mode.token(stream, localState.state);
+      });
+      stream.string = oldString;
+      return result;
+    }
+
+    function contains(list, element) {
+      while (list) {
+        if (list.element === element) return true;
+        list = list.next;
+      }
+      return false;
+    }
+
+    function prepend(list, element) {
+      return {
+        element: element,
+        next: list
+      };
+    }
+
+    // Reference a variable `name` in `list`.
+    // Let `loose` be truthy to ignore missing identifiers.
+    function ref(list, name, loose) {
+      return contains(list, name) ? "variable-2" : (loose ? "variable" : "variable-2 error");
+    }
+
+    function popscope(state) {
+      if (state.scopes) {
+        state.variables = state.scopes.element;
+        state.scopes = state.scopes.next;
+      }
+    }
+
+    return {
+      startState: function() {
+        return {
+          kind: [],
+          kindTag: [],
+          soyState: [],
+          templates: null,
+          variables: prepend(null, 'ij'),
+          scopes: null,
+          indent: 0,
+          quoteKind: null,
+          localStates: [{
+            mode: modes.html,
+            state: CodeMirror.startState(modes.html)
+          }]
+        };
+      },
+
+      copyState: function(state) {
+        return {
+          tag: state.tag, // Last seen Soy tag.
+          kind: state.kind.concat([]), // Values of kind="" attributes.
+          kindTag: state.kindTag.concat([]), // Opened tags with kind="" attributes.
+          soyState: state.soyState.concat([]),
+          templates: state.templates,
+          variables: state.variables,
+          scopes: state.scopes,
+          indent: state.indent, // Indentation of the following line.
+          quoteKind: state.quoteKind,
+          localStates: state.localStates.map(function(localState) {
+            return {
+              mode: localState.mode,
+              state: CodeMirror.copyState(localState.mode, localState.state)
+            };
+          })
+        };
+      },
+
+      token: function(stream, state) {
+        var match;
+
+        switch (last(state.soyState)) {
+          case "comment":
+            if (stream.match(/^.*?\*\//)) {
+              state.soyState.pop();
+            } else {
+              stream.skipToEnd();
+            }
+            if (!state.scopes) {
+              var paramRe = /@param\??\s+(\S+)/g;
+              var current = stream.current();
+              for (var match; (match = paramRe.exec(current)); ) {
+                state.variables = prepend(state.variables, match[1]);
+              }
+            }
+            return "comment";
+
+          case "string":
+            var match = stream.match(/^.*?(["']|\\[\s\S])/);
+            if (!match) {
+              stream.skipToEnd();
+            } else if (match[1] == state.quoteKind) {
+              state.quoteKind = null;
+              state.soyState.pop();
+            }
+            return "string";
+        }
+
+        if (stream.match(/^\/\*/)) {
+          state.soyState.push("comment");
+          return "comment";
+        } else if (stream.match(stream.sol() || (state.soyState.length && last(state.soyState) != "literal") ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
+          return "comment";
+        }
+
+        switch (last(state.soyState)) {
+          case "templ-def":
+            if (match = stream.match(/^\.?([\w]+(?!\.[\w]+)*)/)) {
+              state.templates = prepend(state.templates, match[1]);
+              state.scopes = prepend(state.scopes, state.variables);
+              state.soyState.pop();
+              return "def";
+            }
+            stream.next();
+            return null;
+
+          case "templ-ref":
+            if (match = stream.match(/^\.?([\w]+)/)) {
+              state.soyState.pop();
+              // If the first character is '.', try to match against a local template name.
+              if (match[0][0] == '.') {
+                return ref(state.templates, match[1], true);
+              }
+              // Otherwise
+              return "variable";
+            }
+            stream.next();
+            return null;
+
+          case "param-def":
+            if (match = stream.match(/^\w+/)) {
+              state.variables = prepend(state.variables, match[0]);
+              state.soyState.pop();
+              state.soyState.push("param-type");
+              return "def";
+            }
+            stream.next();
+            return null;
+
+          case "param-type":
+            if (stream.peek() == "}") {
+              state.soyState.pop();
+              return null;
+            }
+            if (stream.eatWhile(/^[\w]+/)) {
+              return "variable-3";
+            }
+            stream.next();
+            return null;
+
+          case "var-def":
+            if (match = stream.match(/^\$([\w]+)/)) {
+              state.variables = prepend(state.variables, match[1]);
+              state.soyState.pop();
+              return "def";
+            }
+            stream.next();
+            return null;
+
+          case "tag":
+            if (stream.match(/^\/?}/)) {
+              if (state.tag == "/template" || state.tag == "/deltemplate") {
+                popscope(state);
+                state.variables = prepend(null, 'ij');
+                state.indent = 0;
+              } else {
+                if (state.tag == "/for" || state.tag == "/foreach") {
+                  popscope(state);
+                }
+                state.indent -= config.indentUnit *
+                    (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1);
+              }
+              state.soyState.pop();
+              return "keyword";
+            } else if (stream.match(/^([\w?]+)(?==)/)) {
+              if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
+                var kind = match[1];
+                state.kind.push(kind);
+                state.kindTag.push(state.tag);
+                var mode = modes[kind] || modes.html;
+                var localState = last(state.localStates);
+                if (localState.mode.indent) {
+                  state.indent += localState.mode.indent(localState.state, "");
+                }
+                state.localStates.push({
+                  mode: mode,
+                  state: CodeMirror.startState(mode)
+                });
+              }
+              return "attribute";
+            } else if (match = stream.match(/^["']/)) {
+              state.soyState.push("string");
+              state.quoteKind = match;
+              return "string";
+            }
+            if (match = stream.match(/^\$([\w]+)/)) {
+              return ref(state.variables, match[1]);
+            }
+            if (match = stream.match(/^\w+/)) {
+              return /^(?:as|and|or|not|in)$/.test(match[0]) ? "keyword" : null;
+            }
+            stream.next();
+            return null;
+
+          case "literal":
+            if (stream.match(/^(?=\{\/literal})/)) {
+              state.indent -= config.indentUnit;
+              state.soyState.pop();
+              return this.token(stream, state);
+            }
+            return tokenUntil(stream, state, /\{\/literal}/);
+        }
+
+        if (stream.match(/^\{literal}/)) {
+          state.indent += config.indentUnit;
+          state.soyState.push("literal");
+          return "keyword";
+
+        // A tag-keyword must be followed by whitespace, comment or a closing tag.
+        } else if (match = stream.match(/^\{([\/@\\]?\w+\??)(?=[\s\}]|\/[/*])/)) {
+          if (match[1] != "/switch")
+            state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
+          state.tag = match[1];
+          if (state.tag == "/" + last(state.kindTag)) {
+            // We found the tag that opened the current kind="".
+            state.kind.pop();
+            state.kindTag.pop();
+            state.localStates.pop();
+            var localState = last(state.localStates);
+            if (localState.mode.indent) {
+              state.indent -= localState.mode.indent(localState.state, "");
+            }
+          }
+          state.soyState.push("tag");
+          if (state.tag == "template" || state.tag == "deltemplate") {
+            state.soyState.push("templ-def");
+          } else if (state.tag == "call" || state.tag == "delcall") {
+            state.soyState.push("templ-ref");
+          } else if (state.tag == "let") {
+            state.soyState.push("var-def");
+          } else if (state.tag == "for" || state.tag == "foreach") {
+            state.scopes = prepend(state.scopes, state.variables);
+            state.soyState.push("var-def");
+          } else if (state.tag == "namespace") {
+            if (!state.scopes) {
+              state.variables = prepend(null, 'ij');
+            }
+          } else if (state.tag.match(/^@(?:param\??|inject)/)) {
+            state.soyState.push("param-def");
+          }
+          return "keyword";
+
+        // Not a tag-keyword; it's an implicit print tag.
+        } else if (stream.eat('{')) {
+          state.tag = "print";
+          state.indent += 2 * config.indentUnit;
+          state.soyState.push("tag");
+          return "keyword";
+        }
+
+        return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
+      },
+
+      indent: function(state, textAfter) {
+        var indent = state.indent, top = last(state.soyState);
+        if (top == "comment") return CodeMirror.Pass;
+
+        if (top == "literal") {
+          if (/^\{\/literal}/.test(textAfter)) indent -= config.indentUnit;
+        } else {
+          if (/^\s*\{\/(template|deltemplate)\b/.test(textAfter)) return 0;
+          if (/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter)) indent -= config.indentUnit;
+          if (state.tag != "switch" && /^\{(case|default)\b/.test(textAfter)) indent -= config.indentUnit;
+          if (/^\{\/switch\b/.test(textAfter)) indent -= config.indentUnit;
+        }
+        var localState = last(state.localStates);
+        if (indent && localState.mode.indent) {
+          indent += localState.mode.indent(localState.state, textAfter);
+        }
+        return indent;
+      },
+
+      innerMode: function(state) {
+        if (state.soyState.length && last(state.soyState) != "literal") return null;
+        else return last(state.localStates);
+      },
+
+      electricInput: /^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
+      lineComment: "//",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      blockCommentContinue: " * ",
+      useInnerComments: false,
+      fold: "indent"
+    };
+  }, "htmlmixed");
+
+  CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
+      ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
+
+  CodeMirror.defineMIME("text/x-soy", "soy");
+});
diff --git a/core/media/editors/codemirror/mode/soy/soy.min.js b/core/media/editors/codemirror/mode/soy/soy.min.js
new file mode 100644
index 00000000..a74b222d
--- /dev/null
+++ b/core/media/editors/codemirror/mode/soy/soy.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed"],a):a(CodeMirror)})((function(a){"use strict";var b=["template","literal","msg","fallbackmsg","let","if","elseif","else","switch","case","default","foreach","ifempty","for","call","param","deltemplate","delcall","log"];a.defineMode("soy",(function(c){function d(a){return a[a.length-1]}function e(a,b,c){if(a.sol()){for(var e=0;e<b.indent&&a.eat(/\s/);e++);if(e)return null}var f=a.string,g=c.exec(f.substr(a.pos));g&&(a.string=f.substr(0,a.pos+g.index));var h=a.hideFirstChars(b.indent,(function(){var c=d(b.localStates);return c.mode.token(a,c.state)}));return a.string=f,h}function f(a,b){for(;a;){if(a.element===b)return!0;a=a.next}return!1}function g(a,b){return{element:b,next:a}}function h(a,b,c){return f(a,b)?"variable-2":c?"variable":"variable-2 error"}function i(a){a.scopes&&(a.variables=a.scopes.element,a.scopes=a.scopes.next)}var j=a.getMode(c,"text/plain"),k={html:a.getMode(c,{name:"text/html",multilineTagIndentFactor:2,multilineTagIndentPastTag:!1}),attributes:j,text:j,uri:j,trusted_resource_uri:j,css:a.getMode(c,"text/css"),js:a.getMode(c,{name:"text/javascript",statementIndent:2*c.indentUnit})};return{startState:function(){return{kind:[],kindTag:[],soyState:[],templates:null,variables:g(null,"ij"),scopes:null,indent:0,quoteKind:null,localStates:[{mode:k.html,state:a.startState(k.html)}]}},copyState:function(b){return{tag:b.tag,kind:b.kind.concat([]),kindTag:b.kindTag.concat([]),soyState:b.soyState.concat([]),templates:b.templates,variables:b.variables,scopes:b.scopes,indent:b.indent,quoteKind:b.quoteKind,localStates:b.localStates.map((function(b){return{mode:b.mode,state:a.copyState(b.mode,b.state)}}))}},token:function(f,j){var l;switch(d(j.soyState)){case"comment":if(f.match(/^.*?\*\//)?j.soyState.pop():f.skipToEnd(),!j.scopes)for(var l,m=/@param\??\s+(\S+)/g,n=f.current();l=m.exec(n);)j.variables=g(j.variables,l[1]);return"comment";case"string":var l=f.match(/^.*?(["']|\\[\s\S])/);return l?l[1]==j.quoteKind&&(j.quoteKind=null,j.soyState.pop()):f.skipToEnd(),"string"}if(f.match(/^\/\*/))return j.soyState.push("comment"),"comment";if(f.match(f.sol()||j.soyState.length&&"literal"!=d(j.soyState)?/^\s*\/\/.*/:/^\s+\/\/.*/))return"comment";switch(d(j.soyState)){case"templ-def":return(l=f.match(/^\.?([\w]+(?!\.[\w]+)*)/))?(j.templates=g(j.templates,l[1]),j.scopes=g(j.scopes,j.variables),j.soyState.pop(),"def"):(f.next(),null);case"templ-ref":return(l=f.match(/^\.?([\w]+)/))?(j.soyState.pop(),"."==l[0][0]?h(j.templates,l[1],!0):"variable"):(f.next(),null);case"param-def":return(l=f.match(/^\w+/))?(j.variables=g(j.variables,l[0]),j.soyState.pop(),j.soyState.push("param-type"),"def"):(f.next(),null);case"param-type":return"}"==f.peek()?(j.soyState.pop(),null):f.eatWhile(/^[\w]+/)?"variable-3":(f.next(),null);case"var-def":return(l=f.match(/^\$([\w]+)/))?(j.variables=g(j.variables,l[1]),j.soyState.pop(),"def"):(f.next(),null);case"tag":if(f.match(/^\/?}/))return"/template"==j.tag||"/deltemplate"==j.tag?(i(j),j.variables=g(null,"ij"),j.indent=0):("/for"!=j.tag&&"/foreach"!=j.tag||i(j),j.indent-=c.indentUnit*("/}"==f.current()||b.indexOf(j.tag)==-1?2:1)),j.soyState.pop(),"keyword";if(f.match(/^([\w?]+)(?==)/)){if("kind"==f.current()&&(l=f.match(/^="([^"]+)/,!1))){var o=l[1];j.kind.push(o),j.kindTag.push(j.tag);var p=k[o]||k.html,q=d(j.localStates);q.mode.indent&&(j.indent+=q.mode.indent(q.state,"")),j.localStates.push({mode:p,state:a.startState(p)})}return"attribute"}return(l=f.match(/^["']/))?(j.soyState.push("string"),j.quoteKind=l,"string"):(l=f.match(/^\$([\w]+)/))?h(j.variables,l[1]):(l=f.match(/^\w+/))?/^(?:as|and|or|not|in)$/.test(l[0])?"keyword":null:(f.next(),null);case"literal":return f.match(/^(?=\{\/literal})/)?(j.indent-=c.indentUnit,j.soyState.pop(),this.token(f,j)):e(f,j,/\{\/literal}/)}if(f.match(/^\{literal}/))return j.indent+=c.indentUnit,j.soyState.push("literal"),"keyword";if(l=f.match(/^\{([\/@\\]?\w+\??)(?=[\s\}]|\/[\/*])/)){if("/switch"!=l[1]&&(j.indent+=(/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(l[1])&&"switch"!=j.tag?1:2)*c.indentUnit),j.tag=l[1],j.tag=="/"+d(j.kindTag)){j.kind.pop(),j.kindTag.pop(),j.localStates.pop();var q=d(j.localStates);q.mode.indent&&(j.indent-=q.mode.indent(q.state,""))}return j.soyState.push("tag"),"template"==j.tag||"deltemplate"==j.tag?j.soyState.push("templ-def"):"call"==j.tag||"delcall"==j.tag?j.soyState.push("templ-ref"):"let"==j.tag?j.soyState.push("var-def"):"for"==j.tag||"foreach"==j.tag?(j.scopes=g(j.scopes,j.variables),j.soyState.push("var-def")):"namespace"==j.tag?j.scopes||(j.variables=g(null,"ij")):j.tag.match(/^@(?:param\??|inject)/)&&j.soyState.push("param-def"),"keyword"}return f.eat("{")?(j.tag="print",j.indent+=2*c.indentUnit,j.soyState.push("tag"),"keyword"):e(f,j,/\{|\s+\/\/|\/\*/)},indent:function(b,e){var f=b.indent,g=d(b.soyState);if("comment"==g)return a.Pass;if("literal"==g)/^\{\/literal}/.test(e)&&(f-=c.indentUnit);else{if(/^\s*\{\/(template|deltemplate)\b/.test(e))return 0;/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(e)&&(f-=c.indentUnit),"switch"!=b.tag&&/^\{(case|default)\b/.test(e)&&(f-=c.indentUnit),/^\{\/switch\b/.test(e)&&(f-=c.indentUnit)}var h=d(b.localStates);return f&&h.mode.indent&&(f+=h.mode.indent(h.state,e)),f},innerMode:function(a){return a.soyState.length&&"literal"!=d(a.soyState)?null:d(a.localStates)},electricInput:/^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,lineComment:"//",blockCommentStart:"/*",blockCommentEnd:"*/",blockCommentContinue:" * ",useInnerComments:!1,fold:"indent"}}),"htmlmixed"),a.registerHelper("hintWords","soy",b.concat(["delpackage","namespace","alias","print","css","debugger"])),a.defineMIME("text/x-soy","soy")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/sparql/sparql.js b/core/media/editors/codemirror/mode/sparql/sparql.js
new file mode 100644
index 00000000..095dcca6
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sparql/sparql.js
@@ -0,0 +1,180 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("sparql", function(config) {
+  var indentUnit = config.indentUnit;
+  var curPunc;
+
+  function wordRegexp(words) {
+    return new RegExp("^(?:" + words.join("|") + ")$", "i");
+  }
+  var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
+                        "iri", "uri", "bnode", "count", "sum", "min", "max", "avg", "sample",
+                        "group_concat", "rand", "abs", "ceil", "floor", "round", "concat", "substr", "strlen",
+                        "replace", "ucase", "lcase", "encode_for_uri", "contains", "strstarts", "strends",
+                        "strbefore", "strafter", "year", "month", "day", "hours", "minutes", "seconds",
+                        "timezone", "tz", "now", "uuid", "struuid", "md5", "sha1", "sha256", "sha384",
+                        "sha512", "coalesce", "if", "strlang", "strdt", "isnumeric", "regex", "exists",
+                        "isblank", "isliteral", "a", "bind"]);
+  var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
+                             "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
+                             "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
+                             "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
+                             "true", "false", "with",
+                             "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
+  var operatorChars = /[*+\-<>=&|\^\/!\?]/;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    curPunc = null;
+    if (ch == "$" || ch == "?") {
+      if(ch == "?" && stream.match(/\s/, false)){
+        return "operator";
+      }
+      stream.match(/^[\w\d]*/);
+      return "variable-2";
+    }
+    else if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
+      stream.match(/^[^\s\u00a0>]*>?/);
+      return "atom";
+    }
+    else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenLiteral(ch);
+      return state.tokenize(stream, state);
+    }
+    else if (/[{}\(\),\.;\[\]]/.test(ch)) {
+      curPunc = ch;
+      return "bracket";
+    }
+    else if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    else if (operatorChars.test(ch)) {
+      stream.eatWhile(operatorChars);
+      return "operator";
+    }
+    else if (ch == ":") {
+      stream.eatWhile(/[\w\d\._\-]/);
+      return "atom";
+    }
+    else if (ch == "@") {
+      stream.eatWhile(/[a-z\d\-]/i);
+      return "meta";
+    }
+    else {
+      stream.eatWhile(/[_\w\d]/);
+      if (stream.eat(":")) {
+        stream.eatWhile(/[\w\d_\-]/);
+        return "atom";
+      }
+      var word = stream.current();
+      if (ops.test(word))
+        return "builtin";
+      else if (keywords.test(word))
+        return "keyword";
+      else
+        return "variable";
+    }
+  }
+
+  function tokenLiteral(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return "string";
+    };
+  }
+
+  function pushContext(state, type, col) {
+    state.context = {prev: state.context, indent: state.indent, col: col, type: type};
+  }
+  function popContext(state) {
+    state.indent = state.context.indent;
+    state.context = state.context.prev;
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: tokenBase,
+              context: null,
+              indent: 0,
+              col: 0};
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        if (state.context && state.context.align == null) state.context.align = false;
+        state.indent = stream.indentation();
+      }
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+
+      if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") {
+        state.context.align = true;
+      }
+
+      if (curPunc == "(") pushContext(state, ")", stream.column());
+      else if (curPunc == "[") pushContext(state, "]", stream.column());
+      else if (curPunc == "{") pushContext(state, "}", stream.column());
+      else if (/[\]\}\)]/.test(curPunc)) {
+        while (state.context && state.context.type == "pattern") popContext(state);
+        if (state.context && curPunc == state.context.type) {
+          popContext(state);
+          if (curPunc == "}" && state.context && state.context.type == "pattern")
+            popContext(state);
+        }
+      }
+      else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
+      else if (/atom|string|variable/.test(style) && state.context) {
+        if (/[\}\]]/.test(state.context.type))
+          pushContext(state, "pattern", stream.column());
+        else if (state.context.type == "pattern" && !state.context.align) {
+          state.context.align = true;
+          state.context.col = stream.column();
+        }
+      }
+
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var firstChar = textAfter && textAfter.charAt(0);
+      var context = state.context;
+      if (/[\]\}]/.test(firstChar))
+        while (context && context.type == "pattern") context = context.prev;
+
+      var closing = context && firstChar == context.type;
+      if (!context)
+        return 0;
+      else if (context.type == "pattern")
+        return context.col;
+      else if (context.align)
+        return context.col + (closing ? 0 : 1);
+      else
+        return context.indent + (closing ? 0 : indentUnit);
+    },
+
+    lineComment: "#"
+  };
+});
+
+CodeMirror.defineMIME("application/sparql-query", "sparql");
+
+});
diff --git a/core/media/editors/codemirror/mode/sparql/sparql.min.js b/core/media/editors/codemirror/mode/sparql/sparql.min.js
new file mode 100644
index 00000000..fbc57f26
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sparql/sparql.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sparql",(function(a){function b(a){return new RegExp("^(?:"+a.join("|")+")$","i")}function c(a,b){var c=a.next();if(g=null,"$"==c||"?"==c)return"?"==c&&a.match(/\s/,!1)?"operator":(a.match(/^[\w\d]*/),"variable-2");if("<"!=c||a.match(/^[\s\u00a0=]/,!1)){if('"'==c||"'"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[{}\(\),\.;\[\]]/.test(c))return g=c,"bracket";if("#"==c)return a.skipToEnd(),"comment";if(k.test(c))return a.eatWhile(k),"operator";if(":"==c)return a.eatWhile(/[\w\d\._\-]/),"atom";if("@"==c)return a.eatWhile(/[a-z\d\-]/i),"meta";if(a.eatWhile(/[_\w\d]/),a.eat(":"))return a.eatWhile(/[\w\d_\-]/),"atom";var e=a.current();return i.test(e)?"builtin":j.test(e)?"keyword":"variable"}return a.match(/^[^\s\u00a0>]*>?/),"atom"}function d(a){return function(b,d){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){d.tokenize=c;break}f=!f&&"\\"==e}return"string"}}function e(a,b,c){a.context={prev:a.context,indent:a.indent,col:c,type:b}}function f(a){a.indent=a.context.indent,a.context=a.context.prev}var g,h=a.indentUnit,i=b(["str","lang","langmatches","datatype","bound","sameterm","isiri","isuri","iri","uri","bnode","count","sum","min","max","avg","sample","group_concat","rand","abs","ceil","floor","round","concat","substr","strlen","replace","ucase","lcase","encode_for_uri","contains","strstarts","strends","strbefore","strafter","year","month","day","hours","minutes","seconds","timezone","tz","now","uuid","struuid","md5","sha1","sha256","sha384","sha512","coalesce","if","strlang","strdt","isnumeric","regex","exists","isblank","isliteral","a","bind"]),j=b(["base","prefix","select","distinct","reduced","construct","describe","ask","from","named","where","order","limit","offset","filter","optional","graph","by","asc","desc","as","having","undef","values","group","minus","in","not","service","silent","using","insert","delete","union","true","false","with","data","copy","to","move","add","create","drop","clear","load"]),k=/[*+\-<>=&|\^\/!\?]/;return{startState:function(){return{tokenize:c,context:null,indent:0,col:0}},token:function(a,b){if(a.sol()&&(b.context&&null==b.context.align&&(b.context.align=!1),b.indent=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);if("comment"!=c&&b.context&&null==b.context.align&&"pattern"!=b.context.type&&(b.context.align=!0),"("==g)e(b,")",a.column());else if("["==g)e(b,"]",a.column());else if("{"==g)e(b,"}",a.column());else if(/[\]\}\)]/.test(g)){for(;b.context&&"pattern"==b.context.type;)f(b);b.context&&g==b.context.type&&(f(b),"}"==g&&b.context&&"pattern"==b.context.type&&f(b))}else"."==g&&b.context&&"pattern"==b.context.type?f(b):/atom|string|variable/.test(c)&&b.context&&(/[\}\]]/.test(b.context.type)?e(b,"pattern",a.column()):"pattern"!=b.context.type||b.context.align||(b.context.align=!0,b.context.col=a.column()));return c},indent:function(a,b){var c=b&&b.charAt(0),d=a.context;if(/[\]\}]/.test(c))for(;d&&"pattern"==d.type;)d=d.prev;var e=d&&c==d.type;return d?"pattern"==d.type?d.col:d.align?d.col+(e?0:1):d.indent+(e?0:h):0},lineComment:"#"}})),a.defineMIME("application/sparql-query","sparql")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/spreadsheet/spreadsheet.js b/core/media/editors/codemirror/mode/spreadsheet/spreadsheet.js
new file mode 100644
index 00000000..222f2976
--- /dev/null
+++ b/core/media/editors/codemirror/mode/spreadsheet/spreadsheet.js
@@ -0,0 +1,112 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("spreadsheet", function () {
+    return {
+      startState: function () {
+        return {
+          stringType: null,
+          stack: []
+        };
+      },
+      token: function (stream, state) {
+        if (!stream) return;
+
+        //check for state changes
+        if (state.stack.length === 0) {
+          //strings
+          if ((stream.peek() == '"') || (stream.peek() == "'")) {
+            state.stringType = stream.peek();
+            stream.next(); // Skip quote
+            state.stack.unshift("string");
+          }
+        }
+
+        //return state
+        //stack has
+        switch (state.stack[0]) {
+        case "string":
+          while (state.stack[0] === "string" && !stream.eol()) {
+            if (stream.peek() === state.stringType) {
+              stream.next(); // Skip quote
+              state.stack.shift(); // Clear flag
+            } else if (stream.peek() === "\\") {
+              stream.next();
+              stream.next();
+            } else {
+              stream.match(/^.[^\\\"\']*/);
+            }
+          }
+          return "string";
+
+        case "characterClass":
+          while (state.stack[0] === "characterClass" && !stream.eol()) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./)))
+              state.stack.shift();
+          }
+          return "operator";
+        }
+
+        var peek = stream.peek();
+
+        //no stack
+        switch (peek) {
+        case "[":
+          stream.next();
+          state.stack.unshift("characterClass");
+          return "bracket";
+        case ":":
+          stream.next();
+          return "operator";
+        case "\\":
+          if (stream.match(/\\[a-z]+/)) return "string-2";
+          else {
+            stream.next();
+            return "atom";
+          }
+        case ".":
+        case ",":
+        case ";":
+        case "*":
+        case "-":
+        case "+":
+        case "^":
+        case "<":
+        case "/":
+        case "=":
+          stream.next();
+          return "atom";
+        case "$":
+          stream.next();
+          return "builtin";
+        }
+
+        if (stream.match(/\d+/)) {
+          if (stream.match(/^\w+/)) return "error";
+          return "number";
+        } else if (stream.match(/^[a-zA-Z_]\w*/)) {
+          if (stream.match(/(?=[\(.])/, false)) return "keyword";
+          return "variable-2";
+        } else if (["[", "]", "(", ")", "{", "}"].indexOf(peek) != -1) {
+          stream.next();
+          return "bracket";
+        } else if (!stream.eatSpace()) {
+          stream.next();
+        }
+        return null;
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-spreadsheet", "spreadsheet");
+});
diff --git a/core/media/editors/codemirror/mode/spreadsheet/spreadsheet.min.js b/core/media/editors/codemirror/mode/spreadsheet/spreadsheet.min.js
new file mode 100644
index 00000000..7baab62c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/spreadsheet/spreadsheet.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("spreadsheet",(function(){return{startState:function(){return{stringType:null,stack:[]}},token:function(a,b){if(a){switch(0===b.stack.length&&('"'!=a.peek()&&"'"!=a.peek()||(b.stringType=a.peek(),a.next(),b.stack.unshift("string"))),b.stack[0]){case"string":for(;"string"===b.stack[0]&&!a.eol();)a.peek()===b.stringType?(a.next(),b.stack.shift()):"\\"===a.peek()?(a.next(),a.next()):a.match(/^.[^\\\"\']*/);return"string";case"characterClass":for(;"characterClass"===b.stack[0]&&!a.eol();)a.match(/^[^\]\\]+/)||a.match(/^\\./)||b.stack.shift();return"operator"}var c=a.peek();switch(c){case"[":return a.next(),b.stack.unshift("characterClass"),"bracket";case":":return a.next(),"operator";case"\\":return a.match(/\\[a-z]+/)?"string-2":(a.next(),"atom");case".":case",":case";":case"*":case"-":case"+":case"^":case"<":case"/":case"=":return a.next(),"atom";case"$":return a.next(),"builtin"}return a.match(/\d+/)?a.match(/^\w+/)?"error":"number":a.match(/^[a-zA-Z_]\w*/)?a.match(/(?=[\(.])/,!1)?"keyword":"variable-2":["[","]","(",")","{","}"].indexOf(c)!=-1?(a.next(),"bracket"):(a.eatSpace()||a.next(),null)}}}})),a.defineMIME("text/x-spreadsheet","spreadsheet")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/sql/sql.js b/core/media/editors/codemirror/mode/sql/sql.js
new file mode 100644
index 00000000..fddbabae
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sql/sql.js
@@ -0,0 +1,500 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("sql", function(config, parserConfig) {
+  "use strict";
+
+  var client         = parserConfig.client || {},
+      atoms          = parserConfig.atoms || {"false": true, "true": true, "null": true},
+      builtin        = parserConfig.builtin || {},
+      keywords       = parserConfig.keywords || {},
+      operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
+      support        = parserConfig.support || {},
+      hooks          = parserConfig.hooks || {},
+      dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true},
+      backslashStringEscapes = parserConfig.backslashStringEscapes !== false,
+      brackets       = parserConfig.brackets || /^[\{}\(\)\[\]]/,
+      punctuation    = parserConfig.punctuation || /^[;.,:]/
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    // call hooks from the mime type
+    if (hooks[ch]) {
+      var result = hooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+
+    if (support.hexNumber &&
+      ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
+      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
+      // hex
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
+      return "number";
+    } else if (support.binaryNumber &&
+      (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
+      || (ch == "0" && stream.match(/^b[01]+/)))) {
+      // bitstring
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
+      return "number";
+    } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
+      // numbers
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
+      stream.match(/^[0-9]*(\.[0-9]+)?([eE][-+]?[0-9]+)?/);
+      support.decimallessFloat && stream.match(/^\.(?!\.)/);
+      return "number";
+    } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
+      // placeholders
+      return "variable-3";
+    } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
+      // strings
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
+      state.tokenize = tokenLiteral(ch);
+      return state.tokenize(stream, state);
+    } else if ((((support.nCharCast && (ch == "n" || ch == "N"))
+        || (support.charsetCast && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
+        && (stream.peek() == "'" || stream.peek() == '"'))) {
+      // charset casting: _utf8'str', N'str', n'str'
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
+      return "keyword";
+    } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
+      // 1-line comment
+      stream.skipToEnd();
+      return "comment";
+    } else if ((support.commentHash && ch == "#")
+        || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
+      // 1-line comments
+      // ref: https://kb.askmonty.org/en/comment-syntax/
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == "/" && stream.eat("*")) {
+      // multi-line comments
+      // ref: https://kb.askmonty.org/en/comment-syntax/
+      state.tokenize = tokenComment(1);
+      return state.tokenize(stream, state);
+    } else if (ch == ".") {
+      // .1 for 0.1
+      if (support.zerolessFloat && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i))
+        return "number";
+      if (stream.match(/^\.+/))
+        return null
+      // .table_name (ODBC)
+      // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
+      if (support.ODBCdotTable && stream.match(/^[\w\d_]+/))
+        return "variable-2";
+    } else if (operatorChars.test(ch)) {
+      // operators
+      stream.eatWhile(operatorChars);
+      return "operator";
+    } else if (brackets.test(ch)) {
+      // brackets
+      stream.eatWhile(brackets);
+      return "bracket";
+    } else if (punctuation.test(ch)) {
+      // punctuation
+      stream.eatWhile(punctuation);
+      return "punctuation";
+    } else if (ch == '{' &&
+        (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
+      // dates (weird ODBC syntax)
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
+      return "number";
+    } else {
+      stream.eatWhile(/^[_\w\d]/);
+      var word = stream.current().toLowerCase();
+      // dates (standard SQL syntax)
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
+      if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
+        return "number";
+      if (atoms.hasOwnProperty(word)) return "atom";
+      if (builtin.hasOwnProperty(word)) return "builtin";
+      if (keywords.hasOwnProperty(word)) return "keyword";
+      if (client.hasOwnProperty(word)) return "string-2";
+      return null;
+    }
+  }
+
+  // 'string', with char specified in quote escaped by '\'
+  function tokenLiteral(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        escaped = backslashStringEscapes && !escaped && ch == "\\";
+      }
+      return "string";
+    };
+  }
+  function tokenComment(depth) {
+    return function(stream, state) {
+      var m = stream.match(/^.*?(\/\*|\*\/)/)
+      if (!m) stream.skipToEnd()
+      else if (m[1] == "/*") state.tokenize = tokenComment(depth + 1)
+      else if (depth > 1) state.tokenize = tokenComment(depth - 1)
+      else state.tokenize = tokenBase
+      return "comment"
+    }
+  }
+
+  function pushContext(stream, state, type) {
+    state.context = {
+      prev: state.context,
+      indent: stream.indentation(),
+      col: stream.column(),
+      type: type
+    };
+  }
+
+  function popContext(state) {
+    state.indent = state.context.indent;
+    state.context = state.context.prev;
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: tokenBase, context: null};
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        if (state.context && state.context.align == null)
+          state.context.align = false;
+      }
+      if (state.tokenize == tokenBase && stream.eatSpace()) return null;
+
+      var style = state.tokenize(stream, state);
+      if (style == "comment") return style;
+
+      if (state.context && state.context.align == null)
+        state.context.align = true;
+
+      var tok = stream.current();
+      if (tok == "(")
+        pushContext(stream, state, ")");
+      else if (tok == "[")
+        pushContext(stream, state, "]");
+      else if (state.context && state.context.type == tok)
+        popContext(state);
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var cx = state.context;
+      if (!cx) return CodeMirror.Pass;
+      var closing = textAfter.charAt(0) == cx.type;
+      if (cx.align) return cx.col + (closing ? 0 : 1);
+      else return cx.indent + (closing ? 0 : config.indentUnit);
+    },
+
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--",
+    closeBrackets: "()[]{}''\"\"``"
+  };
+});
+
+(function() {
+  "use strict";
+
+  // `identifier`
+  function hookIdentifier(stream) {
+    // MySQL/MariaDB identifiers
+    // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
+    var ch;
+    while ((ch = stream.next()) != null) {
+      if (ch == "`" && !stream.eat("`")) return "variable-2";
+    }
+    stream.backUp(stream.current().length - 1);
+    return stream.eatWhile(/\w/) ? "variable-2" : null;
+  }
+
+  // "identifier"
+  function hookIdentifierDoublequote(stream) {
+    // Standard SQL /SQLite identifiers
+    // ref: http://web.archive.org/web/20160813185132/http://savage.net.au/SQL/sql-99.bnf.html#delimited%20identifier
+    // ref: http://sqlite.org/lang_keywords.html
+    var ch;
+    while ((ch = stream.next()) != null) {
+      if (ch == "\"" && !stream.eat("\"")) return "variable-2";
+    }
+    stream.backUp(stream.current().length - 1);
+    return stream.eatWhile(/\w/) ? "variable-2" : null;
+  }
+
+  // variable token
+  function hookVar(stream) {
+    // variables
+    // @@prefix.varName @varName
+    // varName can be quoted with ` or ' or "
+    // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
+    if (stream.eat("@")) {
+      stream.match(/^session\./);
+      stream.match(/^local\./);
+      stream.match(/^global\./);
+    }
+
+    if (stream.eat("'")) {
+      stream.match(/^.*'/);
+      return "variable-2";
+    } else if (stream.eat('"')) {
+      stream.match(/^.*"/);
+      return "variable-2";
+    } else if (stream.eat("`")) {
+      stream.match(/^.*`/);
+      return "variable-2";
+    } else if (stream.match(/^[0-9a-zA-Z$\.\_]+/)) {
+      return "variable-2";
+    }
+    return null;
+  };
+
+  // short client keyword token
+  function hookClient(stream) {
+    // \N means NULL
+    // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
+    if (stream.eat("N")) {
+        return "atom";
+    }
+    // \g, etc
+    // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
+    return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
+  }
+
+  // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
+  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit ";
+
+  // turn a space-separated list into an array
+  function set(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
+  CodeMirror.defineMIME("text/x-sql", {
+    name: "sql",
+    keywords: set(sqlKeywords + "begin"),
+    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+  });
+
+  CodeMirror.defineMIME("text/x-mssql", {
+    name: "sql",
+    client: set("$partition binary_checksum checksum connectionproperty context_info current_request_id error_line error_message error_number error_procedure error_severity error_state formatmessage get_filestream_transaction_context getansinull host_id host_name isnull isnumeric min_active_rowversion newid newsequentialid rowcount_big xact_state object_id"),
+    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec go if use index holdlock nolock nowait paglock readcommitted readcommittedlock readpast readuncommitted repeatableread rowlock serializable snapshot tablock tablockx updlock with"),
+    builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),
+    atoms: set("is not null like and or in left right between inner outer join all any some cross unpivot pivot exists"),
+    operatorChars: /^[*+\-%<>!=^\&|\/]/,
+    brackets: /^[\{}\(\)]/,
+    punctuation: /^[;.,:/]/,
+    backslashStringEscapes: false,
+    dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
+    hooks: {
+      "@":   hookVar
+    }
+  });
+
+  CodeMirror.defineMIME("text/x-mysql", {
+    name: "sql",
+    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
+    keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
+    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=&|^]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+    hooks: {
+      "@":   hookVar,
+      "`":   hookIdentifier,
+      "\\":  hookClient
+    }
+  });
+
+  CodeMirror.defineMIME("text/x-mariadb", {
+    name: "sql",
+    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
+    keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
+    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=&|^]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+    hooks: {
+      "@":   hookVar,
+      "`":   hookIdentifier,
+      "\\":  hookClient
+    }
+  });
+
+  // provided by the phpLiteAdmin project - phpliteadmin.org
+  CodeMirror.defineMIME("text/x-sqlite", {
+    name: "sql",
+    // commands of the official SQLite client, ref: https://www.sqlite.org/cli.html#dotcmd
+    client: set("auth backup bail binary changes check clone databases dbinfo dump echo eqp exit explain fullschema headers help import imposter indexes iotrace limit lint load log mode nullvalue once open output print prompt quit read restore save scanstats schema separator session shell show stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width"),
+    // ref: http://sqlite.org/lang_keywords.html
+    keywords: set(sqlKeywords + "abort action add after all analyze attach autoincrement before begin cascade case cast check collate column commit conflict constraint cross current_date current_time current_timestamp database default deferrable deferred detach each else end escape except exclusive exists explain fail for foreign full glob if ignore immediate index indexed initially inner instead intersect isnull key left limit match natural no notnull null of offset outer plan pragma primary query raise recursive references regexp reindex release rename replace restrict right rollback row savepoint temp temporary then to transaction trigger unique using vacuum view virtual when with without"),
+    // SQLite is weakly typed, ref: http://sqlite.org/datatype3.html. This is just a list of some common types.
+    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text clob bigint int int2 int8 integer float double char varchar date datetime year unsigned signed numeric real"),
+    // ref: http://sqlite.org/syntax/literal-value.html
+    atoms: set("null current_date current_time current_timestamp"),
+    // ref: http://sqlite.org/lang_expr.html#binaryops
+    operatorChars: /^[*+\-%<>!=&|/~]/,
+    // SQLite is weakly typed, ref: http://sqlite.org/datatype3.html. This is just a list of some common types.
+    dateSQL: set("date time timestamp datetime"),
+    support: set("decimallessFloat zerolessFloat"),
+    identifierQuote: "\"",  //ref: http://sqlite.org/lang_keywords.html
+    hooks: {
+      // bind-parameters ref:http://sqlite.org/lang_expr.html#varparam
+      "@":   hookVar,
+      ":":   hookVar,
+      "?":   hookVar,
+      "$":   hookVar,
+      // The preferred way to escape Identifiers is using double quotes, ref: http://sqlite.org/lang_keywords.html
+      "\"":   hookIdentifierDoublequote,
+      // there is also support for backtics, ref: http://sqlite.org/lang_keywords.html
+      "`":   hookIdentifier
+    }
+  });
+
+  // the query language used by Apache Cassandra is called CQL, but this mime type
+  // is called Cassandra to avoid confusion with Contextual Query Language
+  CodeMirror.defineMIME("text/x-cassandra", {
+    name: "sql",
+    client: { },
+    keywords: set("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),
+    builtin: set("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),
+    atoms: set("false true infinity NaN"),
+    operatorChars: /^[<>=]/,
+    dateSQL: { },
+    support: set("commentSlashSlash decimallessFloat"),
+    hooks: { }
+  });
+
+  // this is based on Peter Raganitsch's 'plsql' mode
+  CodeMirror.defineMIME("text/x-plsql", {
+    name:       "sql",
+    client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
+    keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
+    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
+    operatorChars: /^[*+\-%<>!=~]/,
+    dateSQL:    set("date time timestamp"),
+    support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
+  });
+
+  // Created to support specific hive keywords
+  CodeMirror.defineMIME("text/x-hive", {
+    name: "sql",
+    keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),
+    builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=]/,
+    dateSQL: set("date timestamp"),
+    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+  });
+
+  CodeMirror.defineMIME("text/x-pgsql", {
+    name: "sql",
+    client: set("source"),
+    // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    // https://www.postgresql.org/docs/10/static/datatype.html
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
+  });
+
+  // Google's SQL-like query language, GQL
+  CodeMirror.defineMIME("text/x-gql", {
+    name: "sql",
+    keywords: set("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),
+    atoms: set("false true"),
+    builtin: set("blob datetime first key __key__ string integer double boolean null"),
+    operatorChars: /^[*+\-%<>!=]/
+  });
+
+  // Greenplum
+  CodeMirror.defineMIME("text/x-gpsql", {
+    name: "sql",
+    client: set("source"),
+    //https://github.com/greenplum-db/gpdb/blob/master/src/include/parser/kwlist.h
+    keywords: set("abort absolute access action active add admin after aggregate all also alter always analyse analyze and any array as asc assertion assignment asymmetric at authorization backward before begin between bigint binary bit boolean both by cache called cascade cascaded case cast chain char character characteristics check checkpoint class close cluster coalesce codegen collate column comment commit committed concurrency concurrently configuration connection constraint constraints contains content continue conversion copy cost cpu_rate_limit create createdb createexttable createrole createuser cross csv cube current current_catalog current_date current_role current_schema current_time current_timestamp current_user cursor cycle data database day deallocate dec decimal declare decode default defaults deferrable deferred definer delete delimiter delimiters deny desc dictionary disable discard distinct distributed do document domain double drop dxl each else enable encoding encrypted end enum errors escape every except exchange exclude excluding exclusive execute exists explain extension external extract false family fetch fields filespace fill filter first float following for force foreign format forward freeze from full function global grant granted greatest group group_id grouping handler hash having header hold host hour identity if ignore ilike immediate immutable implicit in including inclusive increment index indexes inherit inherits initially inline inner inout input insensitive insert instead int integer intersect interval into invoker is isnull isolation join key language large last leading least left level like limit list listen load local localtime localtimestamp location lock log login mapping master match maxvalue median merge minute minvalue missing mode modifies modify month move name names national natural nchar new newline next no nocreatedb nocreateexttable nocreaterole nocreateuser noinherit nologin none noovercommit nosuperuser not nothing notify notnull nowait null nullif nulls numeric object of off offset oids old on only operator option options or order ordered others out outer over overcommit overlaps overlay owned owner parser partial partition partitions passing password percent percentile_cont percentile_disc placing plans position preceding precision prepare prepared preserve primary prior privileges procedural procedure protocol queue quote randomly range read readable reads real reassign recheck recursive ref references reindex reject relative release rename repeatable replace replica reset resource restart restrict returning returns revoke right role rollback rollup rootpartition row rows rule savepoint scatter schema scroll search second security segment select sequence serializable session session_user set setof sets share show similar simple smallint some split sql stable standalone start statement statistics stdin stdout storage strict strip subpartition subpartitions substring superuser symmetric sysid system table tablespace temp template temporary text then threshold ties time timestamp to trailing transaction treat trigger trim true truncate trusted type unbounded uncommitted unencrypted union unique unknown unlisten until update user using vacuum valid validation validator value values varchar variadic varying verbose version view volatile web when where whitespace window with within without work writable write xml xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlparse xmlpi xmlroot xmlserialize year yes zone"),
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
+  });
+
+  // Spark SQL
+  CodeMirror.defineMIME("text/x-sparksql", {
+    name: "sql",
+    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
+    builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
+    atoms: set("false true null"),
+    operatorChars: /^[*+\-%<>!=~&|^]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable doubleQuote zerolessFloat")
+  });
+
+  // Esper
+  CodeMirror.defineMIME("text/x-esper", {
+    name: "sql",
+    client: set("source"),
+    // http://www.espertech.com/esper/release-5.5.0/esper-reference/html/appendix_keywords.html
+    keywords: set("alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit after all and as at asc avedev avg between by case cast coalesce count create current_timestamp day days delete define desc distinct else end escape events every exists false first from full group having hour hours in inner insert instanceof into irstream is istream join last lastweekday left limit like max match_recognize matches median measures metadatasql min minute minutes msec millisecond milliseconds not null offset on or order outer output partition pattern prev prior regexp retain-union retain-intersection right rstream sec second seconds select set some snapshot sql stddev sum then true unidirectional until update variable weekday when where window"),
+    builtin: {},
+    atoms: set("false true null"),
+    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
+    dateSQL: set("time"),
+    support: set("decimallessFloat zerolessFloat binaryNumber hexNumber")
+  });
+}());
+
+});
+
+/*
+  How Properties of Mime Types are used by SQL Mode
+  =================================================
+
+  keywords:
+    A list of keywords you want to be highlighted.
+  builtin:
+    A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
+  operatorChars:
+    All characters that must be handled as operators.
+  client:
+    Commands parsed and executed by the client (not the server).
+  support:
+    A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
+    * ODBCdotTable: .tableName
+    * zerolessFloat: .1
+    * doubleQuote
+    * nCharCast: N'string'
+    * charsetCast: _utf8'string'
+    * commentHash: use # char for comments
+    * commentSlashSlash: use // for comments
+    * commentSpaceRequired: require a space after -- for comments
+  atoms:
+    Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
+    UNKNOWN, INFINITY, UNDERFLOW, NaN...
+  dateSQL:
+    Used for date/time SQL standard syntax, because not all DBMS's support same temporal types.
+*/
diff --git a/core/media/editors/codemirror/mode/sql/sql.min.js b/core/media/editors/codemirror/mode/sql/sql.min.js
new file mode 100644
index 00000000..f6d2c11e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/sql/sql.min.js
@@ -0,0 +1,2 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("sql",(function(b,c){function d(a,b){var c=a.next();if(o[c]){var d=o[c](a,b);if(d!==!1)return d}if(n.hexNumber&&("0"==c&&a.match(/^[xX][0-9a-fA-F]+/)||("x"==c||"X"==c)&&a.match(/^'[0-9a-fA-F]+'/)))return"number";if(n.binaryNumber&&(("b"==c||"B"==c)&&a.match(/^'[01]+'/)||"0"==c&&a.match(/^b[01]+/)))return"number";if(c.charCodeAt(0)>47&&c.charCodeAt(0)<58)return a.match(/^[0-9]*(\.[0-9]+)?([eE][-+]?[0-9]+)?/),n.decimallessFloat&&a.match(/^\.(?!\.)/),"number";if("?"==c&&(a.eatSpace()||a.eol()||a.eat(";")))return"variable-3";if("'"==c||'"'==c&&n.doubleQuote)return b.tokenize=e(c),b.tokenize(a,b);if((n.nCharCast&&("n"==c||"N"==c)||n.charsetCast&&"_"==c&&a.match(/[a-z][a-z0-9]*/i))&&("'"==a.peek()||'"'==a.peek()))return"keyword";if(n.commentSlashSlash&&"/"==c&&a.eat("/"))return a.skipToEnd(),"comment";if(n.commentHash&&"#"==c||"-"==c&&a.eat("-")&&(!n.commentSpaceRequired||a.eat(" ")))return a.skipToEnd(),"comment";if("/"==c&&a.eat("*"))return b.tokenize=f(1),b.tokenize(a,b);if("."!=c){if(m.test(c))return a.eatWhile(m),"operator";if(r.test(c))return a.eatWhile(r),"bracket";if(s.test(c))return a.eatWhile(s),"punctuation";if("{"==c&&(a.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/)||a.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/)))return"number";a.eatWhile(/^[_\w\d]/);var g=a.current().toLowerCase();return p.hasOwnProperty(g)&&(a.match(/^( )+'[^']*'/)||a.match(/^( )+"[^"]*"/))?"number":j.hasOwnProperty(g)?"atom":k.hasOwnProperty(g)?"builtin":l.hasOwnProperty(g)?"keyword":i.hasOwnProperty(g)?"string-2":null}return n.zerolessFloat&&a.match(/^(?:\d+(?:e[+-]?\d+)?)/i)?"number":a.match(/^\.+/)?null:n.ODBCdotTable&&a.match(/^[\w\d_]+/)?"variable-2":void 0}function e(a){return function(b,c){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){c.tokenize=d;break}f=q&&!f&&"\\"==e}return"string"}}function f(a){return function(b,c){var e=b.match(/^.*?(\/\*|\*\/)/);return e?"/*"==e[1]?c.tokenize=f(a+1):a>1?c.tokenize=f(a-1):c.tokenize=d:b.skipToEnd(),"comment"}}function g(a,b,c){b.context={prev:b.context,indent:a.indentation(),col:a.column(),type:c}}function h(a){a.indent=a.context.indent,a.context=a.context.prev}var i=c.client||{},j=c.atoms||{false:!0,true:!0,null:!0},k=c.builtin||{},l=c.keywords||{},m=c.operatorChars||/^[*+\-%<>!=&|~^]/,n=c.support||{},o=c.hooks||{},p=c.dateSQL||{date:!0,time:!0,timestamp:!0},q=c.backslashStringEscapes!==!1,r=c.brackets||/^[\{}\(\)\[\]]/,s=c.punctuation||/^[;.,:]/;return{startState:function(){return{tokenize:d,context:null}},token:function(a,b){if(a.sol()&&b.context&&null==b.context.align&&(b.context.align=!1),b.tokenize==d&&a.eatSpace())return null;var c=b.tokenize(a,b);if("comment"==c)return c;b.context&&null==b.context.align&&(b.context.align=!0);var e=a.current();return"("==e?g(a,b,")"):"["==e?g(a,b,"]"):b.context&&b.context.type==e&&h(b),c},indent:function(c,d){var e=c.context;if(!e)return a.Pass;var f=d.charAt(0)==e.type;return e.align?e.col+(f?0:1):e.indent+(f?0:b.indentUnit)},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:n.commentSlashSlash?"//":n.commentHash?"#":"--",closeBrackets:"()[]{}''\"\"``"}})),(function(){function b(a){for(var b;null!=(b=a.next());)if("`"==b&&!a.eat("`"))return"variable-2";return a.backUp(a.current().length-1),a.eatWhile(/\w/)?"variable-2":null}function c(a){for(var b;null!=(b=a.next());)if('"'==b&&!a.eat('"'))return"variable-2";return a.backUp(a.current().length-1),a.eatWhile(/\w/)?"variable-2":null}function d(a){return a.eat("@")&&(a.match(/^session\./),a.match(/^local\./),a.match(/^global\./)),a.eat("'")?(a.match(/^.*'/),"variable-2"):a.eat('"')?(a.match(/^.*"/),"variable-2"):a.eat("`")?(a.match(/^.*`/),"variable-2"):a.match(/^[0-9a-zA-Z$\.\_]+/)?"variable-2":null}function e(a){return a.eat("N")?"atom":a.match(/^[a-zA-Z.#!?]/)?"variable-2":null}function f(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}var g="alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit ";a.defineMIME("text/x-sql",{name:"sql",keywords:f(g+"begin"),builtin:f("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable doubleQuote binaryNumber hexNumber")}),a.defineMIME("text/x-mssql",{name:"sql",client:f("$partition binary_checksum checksum connectionproperty context_info current_request_id error_line error_message error_number error_procedure error_severity error_state formatmessage get_filestream_transaction_context getansinull host_id host_name isnull isnumeric min_active_rowversion newid newsequentialid rowcount_big xact_state object_id"),keywords:f(g+"begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec go if use index holdlock nolock nowait paglock readcommitted readcommittedlock readpast readuncommitted repeatableread rowlock serializable snapshot tablock tablockx updlock with"),builtin:f("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),atoms:f("is not null like and or in left right between inner outer join all any some cross unpivot pivot exists"),operatorChars:/^[*+\-%<>!=^\&|\/]/,brackets:/^[\{}\(\)]/,punctuation:/^[;.,:\/]/,backslashStringEscapes:!1,dateSQL:f("date datetimeoffset datetime2 smalldatetime datetime time"),hooks:{"@":d}}),a.defineMIME("text/x-mysql",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":d,"`":b,"\\":e}}),a.defineMIME("text/x-mariadb",{name:"sql",client:f("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),keywords:f(g+"accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),hooks:{"@":d,"`":b,"\\":e}}),a.defineMIME("text/x-sqlite",{name:"sql",client:f("auth backup bail binary changes check clone databases dbinfo dump echo eqp exit explain fullschema headers help import imposter indexes iotrace limit lint load log mode nullvalue once open output print prompt quit read restore save scanstats schema separator session shell show stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width"),keywords:f(g+"abort action add after all analyze attach autoincrement before begin cascade case cast check collate column commit conflict constraint cross current_date current_time current_timestamp database default deferrable deferred detach each else end escape except exclusive exists explain fail for foreign full glob if ignore immediate index indexed initially inner instead intersect isnull key left limit match natural no notnull null of offset outer plan pragma primary query raise recursive references regexp reindex release rename replace restrict right rollback row savepoint temp temporary then to transaction trigger unique using vacuum view virtual when with without"),builtin:f("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text clob bigint int int2 int8 integer float double char varchar date datetime year unsigned signed numeric real"),atoms:f("null current_date current_time current_timestamp"),operatorChars:/^[*+\-%<>!=&|\/~]/,dateSQL:f("date time timestamp datetime"),support:f("decimallessFloat zerolessFloat"),identifierQuote:'"',hooks:{"@":d,":":d,"?":d,$:d,'"':c,"`":b}}),a.defineMIME("text/x-cassandra",{name:"sql",client:{},keywords:f("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),builtin:f("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),atoms:f("false true infinity NaN"),operatorChars:/^[<>=]/,dateSQL:{},support:f("commentSlashSlash decimallessFloat"),hooks:{}}),a.defineMIME("text/x-plsql",{name:"sql",client:f("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),keywords:f("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),builtin:f("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),operatorChars:/^[*+\-%<>!=~]/,dateSQL:f("date time timestamp"),support:f("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")}),a.defineMIME("text/x-hive",{name:"sql",keywords:f("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),builtin:f("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=]/,dateSQL:f("date timestamp"),support:f("ODBCdotTable doubleQuote binaryNumber hexNumber")}),a.defineMIME("text/x-pgsql",{name:"sql",client:f("source"),keywords:f(g+"a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),builtin:f("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^\/#@?~]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")}),a.defineMIME("text/x-gql",{name:"sql",keywords:f("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),atoms:f("false true"),builtin:f("blob datetime first key __key__ string integer double boolean null"),operatorChars:/^[*+\-%<>!=]/}),a.defineMIME("text/x-gpsql",{name:"sql",client:f("source"),keywords:f("abort absolute access action active add admin after aggregate all also alter always analyse analyze and any array as asc assertion assignment asymmetric at authorization backward before begin between bigint binary bit boolean both by cache called cascade cascaded case cast chain char character characteristics check checkpoint class close cluster coalesce codegen collate column comment commit committed concurrency concurrently configuration connection constraint constraints contains content continue conversion copy cost cpu_rate_limit create createdb createexttable createrole createuser cross csv cube current current_catalog current_date current_role current_schema current_time current_timestamp current_user cursor cycle data database day deallocate dec decimal declare decode default defaults deferrable deferred definer delete delimiter delimiters deny desc dictionary disable discard distinct distributed do document domain double drop dxl each else enable encoding encrypted end enum errors escape every except exchange exclude excluding exclusive execute exists explain extension external extract false family fetch fields filespace fill filter first float following for force foreign format forward freeze from full function global grant granted greatest group group_id grouping handler hash having header hold host hour identity if ignore ilike immediate immutable implicit in including inclusive increment index indexes inherit inherits initially inline inner inout input insensitive insert instead int integer intersect interval into invoker is isnull isolation join key language large last leading least left level like limit list listen load local localtime localtimestamp location lock log login mapping master match maxvalue median merge minute minvalue missing mode modifies modify month move name names national natural nchar new newline next no nocreatedb nocreateexttable nocreaterole nocreateuser noinherit nologin none noovercommit nosuperuser not nothing notify notnull nowait null nullif nulls numeric object of off offset oids old on only operator option options or order ordered others out outer over overcommit overlaps overlay owned owner parser partial partition partitions passing password percent percentile_cont percentile_disc placing plans position preceding precision prepare prepared preserve primary prior privileges procedural procedure protocol queue quote randomly range read readable reads real reassign recheck recursive ref references reindex reject relative release rename repeatable replace replica reset resource restart restrict returning returns revoke right role rollback rollup rootpartition row rows rule savepoint scatter schema scroll search second security segment select sequence serializable session session_user set setof sets share show similar simple smallint some split sql stable standalone start statement statistics stdin stdout storage strict strip subpartition subpartitions substring superuser symmetric sysid system table tablespace temp template temporary text then threshold ties time timestamp to trailing transaction treat trigger trim true truncate trusted type unbounded uncommitted unencrypted union unique unknown unlisten until update user using vacuum valid validation validator value values varchar variadic varying verbose version view volatile web when where whitespace window with within without work writable write xml xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlparse xmlpi xmlroot xmlserialize year yes zone"),
+builtin:f("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),atoms:f("false true null unknown"),operatorChars:/^[*+\-%<>!=&|^\/#@?~]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")}),a.defineMIME("text/x-sparksql",{name:"sql",keywords:f("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),builtin:f("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),atoms:f("false true null"),operatorChars:/^[*+\-%<>!=~&|^]/,dateSQL:f("date time timestamp"),support:f("ODBCdotTable doubleQuote zerolessFloat")}),a.defineMIME("text/x-esper",{name:"sql",client:f("source"),keywords:f("alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit after all and as at asc avedev avg between by case cast coalesce count create current_timestamp day days delete define desc distinct else end escape events every exists false first from full group having hour hours in inner insert instanceof into irstream is istream join last lastweekday left limit like max match_recognize matches median measures metadatasql min minute minutes msec millisecond milliseconds not null offset on or order outer output partition pattern prev prior regexp retain-union retain-intersection right rstream sec second seconds select set some snapshot sql stddev sum then true unidirectional until update variable weekday when where window"),builtin:{},atoms:f("false true null"),operatorChars:/^[*+\-%<>!=&|^\/#@?~]/,dateSQL:f("time"),support:f("decimallessFloat zerolessFloat binaryNumber hexNumber")})})()}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/stex/stex.js b/core/media/editors/codemirror/mode/stex/stex.js
new file mode 100644
index 00000000..12e5750b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/stex/stex.js
@@ -0,0 +1,263 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+ * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
+ * Licence: MIT
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("stex", function() {
+    "use strict";
+
+    function pushCommand(state, command) {
+      state.cmdState.push(command);
+    }
+
+    function peekCommand(state) {
+      if (state.cmdState.length > 0) {
+        return state.cmdState[state.cmdState.length - 1];
+      } else {
+        return null;
+      }
+    }
+
+    function popCommand(state) {
+      var plug = state.cmdState.pop();
+      if (plug) {
+        plug.closeBracket();
+      }
+    }
+
+    // returns the non-default plugin closest to the end of the list
+    function getMostPowerful(state) {
+      var context = state.cmdState;
+      for (var i = context.length - 1; i >= 0; i--) {
+        var plug = context[i];
+        if (plug.name == "DEFAULT") {
+          continue;
+        }
+        return plug;
+      }
+      return { styleIdentifier: function() { return null; } };
+    }
+
+    function addPluginPattern(pluginName, cmdStyle, styles) {
+      return function () {
+        this.name = pluginName;
+        this.bracketNo = 0;
+        this.style = cmdStyle;
+        this.styles = styles;
+        this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
+
+        this.styleIdentifier = function() {
+          return this.styles[this.bracketNo - 1] || null;
+        };
+        this.openBracket = function() {
+          this.bracketNo++;
+          return "bracket";
+        };
+        this.closeBracket = function() {};
+      };
+    }
+
+    var plugins = {};
+
+    plugins["importmodule"] = addPluginPattern("importmodule", "tag", ["string", "builtin"]);
+    plugins["documentclass"] = addPluginPattern("documentclass", "tag", ["", "atom"]);
+    plugins["usepackage"] = addPluginPattern("usepackage", "tag", ["atom"]);
+    plugins["begin"] = addPluginPattern("begin", "tag", ["atom"]);
+    plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
+
+    plugins["label"    ] = addPluginPattern("label"    , "tag", ["atom"]);
+    plugins["ref"      ] = addPluginPattern("ref"      , "tag", ["atom"]);
+    plugins["eqref"    ] = addPluginPattern("eqref"    , "tag", ["atom"]);
+    plugins["cite"     ] = addPluginPattern("cite"     , "tag", ["atom"]);
+    plugins["bibitem"  ] = addPluginPattern("bibitem"  , "tag", ["atom"]);
+    plugins["Bibitem"  ] = addPluginPattern("Bibitem"  , "tag", ["atom"]);
+    plugins["RBibitem" ] = addPluginPattern("RBibitem" , "tag", ["atom"]);
+
+    plugins["DEFAULT"] = function () {
+      this.name = "DEFAULT";
+      this.style = "tag";
+
+      this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
+    };
+
+    function setState(state, f) {
+      state.f = f;
+    }
+
+    // called when in a normal (no environment) context
+    function normal(source, state) {
+      var plug;
+      // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
+      if (source.match(/^\\[a-zA-Z@]+/)) {
+        var cmdName = source.current().slice(1);
+        plug = plugins[cmdName] || plugins["DEFAULT"];
+        plug = new plug();
+        pushCommand(state, plug);
+        setState(state, beginParams);
+        return plug.style;
+      }
+
+      // escape characters
+      if (source.match(/^\\[$&%#{}_]/)) {
+        return "tag";
+      }
+
+      // white space control characters
+      if (source.match(/^\\[,;!\/\\]/)) {
+        return "tag";
+      }
+
+      // find if we're starting various math modes
+      if (source.match("\\[")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
+        return "keyword";
+      }
+      if (source.match("\\(")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "\\)"); });
+        return "keyword";
+      }
+      if (source.match("$$")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
+        return "keyword";
+      }
+      if (source.match("$")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "$"); });
+        return "keyword";
+      }
+
+      var ch = source.next();
+      if (ch == "%") {
+        source.skipToEnd();
+        return "comment";
+      } else if (ch == '}' || ch == ']') {
+        plug = peekCommand(state);
+        if (plug) {
+          plug.closeBracket(ch);
+          setState(state, beginParams);
+        } else {
+          return "error";
+        }
+        return "bracket";
+      } else if (ch == '{' || ch == '[') {
+        plug = plugins["DEFAULT"];
+        plug = new plug();
+        pushCommand(state, plug);
+        return "bracket";
+      } else if (/\d/.test(ch)) {
+        source.eatWhile(/[\w.%]/);
+        return "atom";
+      } else {
+        source.eatWhile(/[\w\-_]/);
+        plug = getMostPowerful(state);
+        if (plug.name == 'begin') {
+          plug.argument = source.current();
+        }
+        return plug.styleIdentifier();
+      }
+    }
+
+    function inMathMode(source, state, endModeSeq) {
+      if (source.eatSpace()) {
+        return null;
+      }
+      if (source.match(endModeSeq)) {
+        setState(state, normal);
+        return "keyword";
+      }
+      if (source.match(/^\\[a-zA-Z@]+/)) {
+        return "tag";
+      }
+      if (source.match(/^[a-zA-Z]+/)) {
+        return "variable-2";
+      }
+      // escape characters
+      if (source.match(/^\\[$&%#{}_]/)) {
+        return "tag";
+      }
+      // white space control characters
+      if (source.match(/^\\[,;!\/]/)) {
+        return "tag";
+      }
+      // special math-mode characters
+      if (source.match(/^[\^_&]/)) {
+        return "tag";
+      }
+      // non-special characters
+      if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
+        return null;
+      }
+      if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
+        return "number";
+      }
+      var ch = source.next();
+      if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
+        return "bracket";
+      }
+
+      if (ch == "%") {
+        source.skipToEnd();
+        return "comment";
+      }
+      return "error";
+    }
+
+    function beginParams(source, state) {
+      var ch = source.peek(), lastPlug;
+      if (ch == '{' || ch == '[') {
+        lastPlug = peekCommand(state);
+        lastPlug.openBracket(ch);
+        source.eat(ch);
+        setState(state, normal);
+        return "bracket";
+      }
+      if (/[ \t\r]/.test(ch)) {
+        source.eat(ch);
+        return null;
+      }
+      setState(state, normal);
+      popCommand(state);
+
+      return normal(source, state);
+    }
+
+    return {
+      startState: function() {
+        return {
+          cmdState: [],
+          f: normal
+        };
+      },
+      copyState: function(s) {
+        return {
+          cmdState: s.cmdState.slice(),
+          f: s.f
+        };
+      },
+      token: function(stream, state) {
+        return state.f(stream, state);
+      },
+      blankLine: function(state) {
+        state.f = normal;
+        state.cmdState.length = 0;
+      },
+      lineComment: "%"
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-stex", "stex");
+  CodeMirror.defineMIME("text/x-latex", "stex");
+
+});
diff --git a/core/media/editors/codemirror/mode/stex/stex.min.js b/core/media/editors/codemirror/mode/stex/stex.min.js
new file mode 100644
index 00000000..2a2a0740
--- /dev/null
+++ b/core/media/editors/codemirror/mode/stex/stex.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("stex",(function(){function a(a,b){a.cmdState.push(b)}function b(a){return a.cmdState.length>0?a.cmdState[a.cmdState.length-1]:null}function c(a){var b=a.cmdState.pop();b&&b.closeBracket()}function d(a){for(var b=a.cmdState,c=b.length-1;c>=0;c--){var d=b[c];if("DEFAULT"!=d.name)return d}return{styleIdentifier:function(){return null}}}function e(a,b,c){return function(){this.name=a,this.bracketNo=0,this.style=b,this.styles=c,this.argument=null,this.styleIdentifier=function(){return this.styles[this.bracketNo-1]||null},this.openBracket=function(){return this.bracketNo++,"bracket"},this.closeBracket=function(){}}}function f(a,b){a.f=b}function g(c,e){var g;if(c.match(/^\\[a-zA-Z@]+/)){var k=c.current().slice(1);return g=j[k]||j.DEFAULT,g=new g,a(e,g),f(e,i),g.style}if(c.match(/^\\[$&%#{}_]/))return"tag";if(c.match(/^\\[,;!\/\\]/))return"tag";if(c.match("\\["))return f(e,(function(a,b){return h(a,b,"\\]")})),"keyword";if(c.match("\\("))return f(e,(function(a,b){return h(a,b,"\\)")})),"keyword";if(c.match("$$"))return f(e,(function(a,b){return h(a,b,"$$")})),"keyword";if(c.match("$"))return f(e,(function(a,b){return h(a,b,"$")})),"keyword";var l=c.next();return"%"==l?(c.skipToEnd(),"comment"):"}"==l||"]"==l?(g=b(e))?(g.closeBracket(l),f(e,i),"bracket"):"error":"{"==l||"["==l?(g=j.DEFAULT,g=new g,a(e,g),"bracket"):/\d/.test(l)?(c.eatWhile(/[\w.%]/),"atom"):(c.eatWhile(/[\w\-_]/),g=d(e),"begin"==g.name&&(g.argument=c.current()),g.styleIdentifier())}function h(a,b,c){if(a.eatSpace())return null;if(a.match(c))return f(b,g),"keyword";if(a.match(/^\\[a-zA-Z@]+/))return"tag";if(a.match(/^[a-zA-Z]+/))return"variable-2";if(a.match(/^\\[$&%#{}_]/))return"tag";if(a.match(/^\\[,;!\/]/))return"tag";if(a.match(/^[\^_&]/))return"tag";if(a.match(/^[+\-<>|=,\/@!*:;'"`~#?]/))return null;if(a.match(/^(\d+\.\d*|\d*\.\d+|\d+)/))return"number";var d=a.next();return"{"==d||"}"==d||"["==d||"]"==d||"("==d||")"==d?"bracket":"%"==d?(a.skipToEnd(),"comment"):"error"}function i(a,d){var e,h=a.peek();return"{"==h||"["==h?(e=b(d),e.openBracket(h),a.eat(h),f(d,g),"bracket"):/[ \t\r]/.test(h)?(a.eat(h),null):(f(d,g),c(d),g(a,d))}var j={};return j.importmodule=e("importmodule","tag",["string","builtin"]),j.documentclass=e("documentclass","tag",["","atom"]),j.usepackage=e("usepackage","tag",["atom"]),j.begin=e("begin","tag",["atom"]),j.end=e("end","tag",["atom"]),j.label=e("label","tag",["atom"]),j.ref=e("ref","tag",["atom"]),j.eqref=e("eqref","tag",["atom"]),j.cite=e("cite","tag",["atom"]),j.bibitem=e("bibitem","tag",["atom"]),j.Bibitem=e("Bibitem","tag",["atom"]),j.RBibitem=e("RBibitem","tag",["atom"]),j.DEFAULT=function(){this.name="DEFAULT",this.style="tag",this.styleIdentifier=this.openBracket=this.closeBracket=function(){}},{startState:function(){return{cmdState:[],f:g}},copyState:function(a){return{cmdState:a.cmdState.slice(),f:a.f}},token:function(a,b){return b.f(a,b)},blankLine:function(a){a.f=g,a.cmdState.length=0},lineComment:"%"}})),a.defineMIME("text/x-stex","stex"),a.defineMIME("text/x-latex","stex")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/stylus/stylus.js b/core/media/editors/codemirror/mode/stylus/stylus.js
new file mode 100644
index 00000000..a9f50c05
--- /dev/null
+++ b/core/media/editors/codemirror/mode/stylus/stylus.js
@@ -0,0 +1,771 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Stylus mode created by Dmitry Kiselyov http://git.io/AaRB
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("stylus", function(config) {
+    var indentUnit = config.indentUnit,
+        indentUnitString = '',
+        tagKeywords = keySet(tagKeywords_),
+        tagVariablesRegexp = /^(a|b|i|s|col|em)$/i,
+        propertyKeywords = keySet(propertyKeywords_),
+        nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_),
+        valueKeywords = keySet(valueKeywords_),
+        colorKeywords = keySet(colorKeywords_),
+        documentTypes = keySet(documentTypes_),
+        documentTypesRegexp = wordRegexp(documentTypes_),
+        mediaFeatures = keySet(mediaFeatures_),
+        mediaTypes = keySet(mediaTypes_),
+        fontProperties = keySet(fontProperties_),
+        operatorsRegexp = /^\s*([.]{2,3}|&&|\|\||\*\*|[?!=:]?=|[-+*\/%<>]=?|\?:|\~)/,
+        wordOperatorKeywordsRegexp = wordRegexp(wordOperatorKeywords_),
+        blockKeywords = keySet(blockKeywords_),
+        vendorPrefixesRegexp = new RegExp(/^\-(moz|ms|o|webkit)-/i),
+        commonAtoms = keySet(commonAtoms_),
+        firstWordMatch = "",
+        states = {},
+        ch,
+        style,
+        type,
+        override;
+
+    while (indentUnitString.length < indentUnit) indentUnitString += ' ';
+
+    /**
+     * Tokenizers
+     */
+    function tokenBase(stream, state) {
+      firstWordMatch = stream.string.match(/(^[\w-]+\s*=\s*$)|(^\s*[\w-]+\s*=\s*[\w-])|(^\s*(\.|#|@|\$|\&|\[|\d|\+|::?|\{|\>|~|\/)?\s*[\w-]*([a-z0-9-]|\*|\/\*)(\(|,)?)/);
+      state.context.line.firstWord = firstWordMatch ? firstWordMatch[0].replace(/^\s*/, "") : "";
+      state.context.line.indent = stream.indentation();
+      ch = stream.peek();
+
+      // Line comment
+      if (stream.match("//")) {
+        stream.skipToEnd();
+        return ["comment", "comment"];
+      }
+      // Block comment
+      if (stream.match("/*")) {
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+      // String
+      if (ch == "\"" || ch == "'") {
+        stream.next();
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      // Def
+      if (ch == "@") {
+        stream.next();
+        stream.eatWhile(/[\w\\-]/);
+        return ["def", stream.current()];
+      }
+      // ID selector or Hex color
+      if (ch == "#") {
+        stream.next();
+        // Hex color
+        if (stream.match(/^[0-9a-f]{3}([0-9a-f]([0-9a-f]{2}){0,2})?\b/i)) {
+          return ["atom", "atom"];
+        }
+        // ID selector
+        if (stream.match(/^[a-z][\w-]*/i)) {
+          return ["builtin", "hash"];
+        }
+      }
+      // Vendor prefixes
+      if (stream.match(vendorPrefixesRegexp)) {
+        return ["meta", "vendor-prefixes"];
+      }
+      // Numbers
+      if (stream.match(/^-?[0-9]?\.?[0-9]/)) {
+        stream.eatWhile(/[a-z%]/i);
+        return ["number", "unit"];
+      }
+      // !important|optional
+      if (ch == "!") {
+        stream.next();
+        return [stream.match(/^(important|optional)/i) ? "keyword": "operator", "important"];
+      }
+      // Class
+      if (ch == "." && stream.match(/^\.[a-z][\w-]*/i)) {
+        return ["qualifier", "qualifier"];
+      }
+      // url url-prefix domain regexp
+      if (stream.match(documentTypesRegexp)) {
+        if (stream.peek() == "(") state.tokenize = tokenParenthesized;
+        return ["property", "word"];
+      }
+      // Mixins / Functions
+      if (stream.match(/^[a-z][\w-]*\(/i)) {
+        stream.backUp(1);
+        return ["keyword", "mixin"];
+      }
+      // Block mixins
+      if (stream.match(/^(\+|-)[a-z][\w-]*\(/i)) {
+        stream.backUp(1);
+        return ["keyword", "block-mixin"];
+      }
+      // Parent Reference BEM naming
+      if (stream.string.match(/^\s*&/) && stream.match(/^[-_]+[a-z][\w-]*/)) {
+        return ["qualifier", "qualifier"];
+      }
+      // / Root Reference & Parent Reference
+      if (stream.match(/^(\/|&)(-|_|:|\.|#|[a-z])/)) {
+        stream.backUp(1);
+        return ["variable-3", "reference"];
+      }
+      if (stream.match(/^&{1}\s*$/)) {
+        return ["variable-3", "reference"];
+      }
+      // Word operator
+      if (stream.match(wordOperatorKeywordsRegexp)) {
+        return ["operator", "operator"];
+      }
+      // Word
+      if (stream.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)) {
+        // Variable
+        if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
+          if (!wordIsTag(stream.current())) {
+            stream.match(/\./);
+            return ["variable-2", "variable-name"];
+          }
+        }
+        return ["variable-2", "word"];
+      }
+      // Operators
+      if (stream.match(operatorsRegexp)) {
+        return ["operator", stream.current()];
+      }
+      // Delimiters
+      if (/[:;,{}\[\]\(\)]/.test(ch)) {
+        stream.next();
+        return [null, ch];
+      }
+      // Non-detected items
+      stream.next();
+      return [null, null];
+    }
+
+    /**
+     * Token comment
+     */
+    function tokenCComment(stream, state) {
+      var maybeEnd = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (maybeEnd && ch == "/") {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return ["comment", "comment"];
+    }
+
+    /**
+     * Token string
+     */
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, ch;
+        while ((ch = stream.next()) != null) {
+          if (ch == quote && !escaped) {
+            if (quote == ")") stream.backUp(1);
+            break;
+          }
+          escaped = !escaped && ch == "\\";
+        }
+        if (ch == quote || !escaped && quote != ")") state.tokenize = null;
+        return ["string", "string"];
+      };
+    }
+
+    /**
+     * Token parenthesized
+     */
+    function tokenParenthesized(stream, state) {
+      stream.next(); // Must be "("
+      if (!stream.match(/\s*[\"\')]/, false))
+        state.tokenize = tokenString(")");
+      else
+        state.tokenize = null;
+      return [null, "("];
+    }
+
+    /**
+     * Context management
+     */
+    function Context(type, indent, prev, line) {
+      this.type = type;
+      this.indent = indent;
+      this.prev = prev;
+      this.line = line || {firstWord: "", indent: 0};
+    }
+
+    function pushContext(state, stream, type, indent) {
+      indent = indent >= 0 ? indent : indentUnit;
+      state.context = new Context(type, stream.indentation() + indent, state.context);
+      return type;
+    }
+
+    function popContext(state, currentIndent) {
+      var contextIndent = state.context.indent - indentUnit;
+      currentIndent = currentIndent || false;
+      state.context = state.context.prev;
+      if (currentIndent) state.context.indent = contextIndent;
+      return state.context.type;
+    }
+
+    function pass(type, stream, state) {
+      return states[state.context.type](type, stream, state);
+    }
+
+    function popAndPass(type, stream, state, n) {
+      for (var i = n || 1; i > 0; i--)
+        state.context = state.context.prev;
+      return pass(type, stream, state);
+    }
+
+
+    /**
+     * Parser
+     */
+    function wordIsTag(word) {
+      return word.toLowerCase() in tagKeywords;
+    }
+
+    function wordIsProperty(word) {
+      word = word.toLowerCase();
+      return word in propertyKeywords || word in fontProperties;
+    }
+
+    function wordIsBlock(word) {
+      return word.toLowerCase() in blockKeywords;
+    }
+
+    function wordIsVendorPrefix(word) {
+      return word.toLowerCase().match(vendorPrefixesRegexp);
+    }
+
+    function wordAsValue(word) {
+      var wordLC = word.toLowerCase();
+      var override = "variable-2";
+      if (wordIsTag(word)) override = "tag";
+      else if (wordIsBlock(word)) override = "block-keyword";
+      else if (wordIsProperty(word)) override = "property";
+      else if (wordLC in valueKeywords || wordLC in commonAtoms) override = "atom";
+      else if (wordLC == "return" || wordLC in colorKeywords) override = "keyword";
+
+      // Font family
+      else if (word.match(/^[A-Z]/)) override = "string";
+      return override;
+    }
+
+    function typeIsBlock(type, stream) {
+      return ((endOfLine(stream) && (type == "{" || type == "]" || type == "hash" || type == "qualifier")) || type == "block-mixin");
+    }
+
+    function typeIsInterpolation(type, stream) {
+      return type == "{" && stream.match(/^\s*\$?[\w-]+/i, false);
+    }
+
+    function typeIsPseudo(type, stream) {
+      return type == ":" && stream.match(/^[a-z-]+/, false);
+    }
+
+    function startOfLine(stream) {
+      return stream.sol() || stream.string.match(new RegExp("^\\s*" + escapeRegExp(stream.current())));
+    }
+
+    function endOfLine(stream) {
+      return stream.eol() || stream.match(/^\s*$/, false);
+    }
+
+    function firstWordOfLine(line) {
+      var re = /^\s*[-_]*[a-z0-9]+[\w-]*/i;
+      var result = typeof line == "string" ? line.match(re) : line.string.match(re);
+      return result ? result[0].replace(/^\s*/, "") : "";
+    }
+
+
+    /**
+     * Block
+     */
+    states.block = function(type, stream, state) {
+      if ((type == "comment" && startOfLine(stream)) ||
+          (type == "," && endOfLine(stream)) ||
+          type == "mixin") {
+        return pushContext(state, stream, "block", 0);
+      }
+      if (typeIsInterpolation(type, stream)) {
+        return pushContext(state, stream, "interpolation");
+      }
+      if (endOfLine(stream) && type == "]") {
+        if (!/^\s*(\.|#|:|\[|\*|&)/.test(stream.string) && !wordIsTag(firstWordOfLine(stream))) {
+          return pushContext(state, stream, "block", 0);
+        }
+      }
+      if (typeIsBlock(type, stream)) {
+        return pushContext(state, stream, "block");
+      }
+      if (type == "}" && endOfLine(stream)) {
+        return pushContext(state, stream, "block", 0);
+      }
+      if (type == "variable-name") {
+        if (stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/) || wordIsBlock(firstWordOfLine(stream))) {
+          return pushContext(state, stream, "variableName");
+        }
+        else {
+          return pushContext(state, stream, "variableName", 0);
+        }
+      }
+      if (type == "=") {
+        if (!endOfLine(stream) && !wordIsBlock(firstWordOfLine(stream))) {
+          return pushContext(state, stream, "block", 0);
+        }
+        return pushContext(state, stream, "block");
+      }
+      if (type == "*") {
+        if (endOfLine(stream) || stream.match(/\s*(,|\.|#|\[|:|{)/,false)) {
+          override = "tag";
+          return pushContext(state, stream, "block");
+        }
+      }
+      if (typeIsPseudo(type, stream)) {
+        return pushContext(state, stream, "pseudo");
+      }
+      if (/@(font-face|media|supports|(-moz-)?document)/.test(type)) {
+        return pushContext(state, stream, endOfLine(stream) ? "block" : "atBlock");
+      }
+      if (/@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+        return pushContext(state, stream, "keyframes");
+      }
+      if (/@extends?/.test(type)) {
+        return pushContext(state, stream, "extend", 0);
+      }
+      if (type && type.charAt(0) == "@") {
+
+        // Property Lookup
+        if (stream.indentation() > 0 && wordIsProperty(stream.current().slice(1))) {
+          override = "variable-2";
+          return "block";
+        }
+        if (/(@import|@require|@charset)/.test(type)) {
+          return pushContext(state, stream, "block", 0);
+        }
+        return pushContext(state, stream, "block");
+      }
+      if (type == "reference" && endOfLine(stream)) {
+        return pushContext(state, stream, "block");
+      }
+      if (type == "(") {
+        return pushContext(state, stream, "parens");
+      }
+
+      if (type == "vendor-prefixes") {
+        return pushContext(state, stream, "vendorPrefixes");
+      }
+      if (type == "word") {
+        var word = stream.current();
+        override = wordAsValue(word);
+
+        if (override == "property") {
+          if (startOfLine(stream)) {
+            return pushContext(state, stream, "block", 0);
+          } else {
+            override = "atom";
+            return "block";
+          }
+        }
+
+        if (override == "tag") {
+
+          // tag is a css value
+          if (/embed|menu|pre|progress|sub|table/.test(word)) {
+            if (wordIsProperty(firstWordOfLine(stream))) {
+              override = "atom";
+              return "block";
+            }
+          }
+
+          // tag is an attribute
+          if (stream.string.match(new RegExp("\\[\\s*" + word + "|" + word +"\\s*\\]"))) {
+            override = "atom";
+            return "block";
+          }
+
+          // tag is a variable
+          if (tagVariablesRegexp.test(word)) {
+            if ((startOfLine(stream) && stream.string.match(/=/)) ||
+                (!startOfLine(stream) &&
+                 !stream.string.match(/^(\s*\.|#|\&|\[|\/|>|\*)/) &&
+                 !wordIsTag(firstWordOfLine(stream)))) {
+              override = "variable-2";
+              if (wordIsBlock(firstWordOfLine(stream)))  return "block";
+              return pushContext(state, stream, "block", 0);
+            }
+          }
+
+          if (endOfLine(stream)) return pushContext(state, stream, "block");
+        }
+        if (override == "block-keyword") {
+          override = "keyword";
+
+          // Postfix conditionals
+          if (stream.current(/(if|unless)/) && !startOfLine(stream)) {
+            return "block";
+          }
+          return pushContext(state, stream, "block");
+        }
+        if (word == "return") return pushContext(state, stream, "block", 0);
+
+        // Placeholder selector
+        if (override == "variable-2" && stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)) {
+          return pushContext(state, stream, "block");
+        }
+      }
+      return state.context.type;
+    };
+
+
+    /**
+     * Parens
+     */
+    states.parens = function(type, stream, state) {
+      if (type == "(") return pushContext(state, stream, "parens");
+      if (type == ")") {
+        if (state.context.prev.type == "parens") {
+          return popContext(state);
+        }
+        if ((stream.string.match(/^[a-z][\w-]*\(/i) && endOfLine(stream)) ||
+            wordIsBlock(firstWordOfLine(stream)) ||
+            /(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(firstWordOfLine(stream)) ||
+            (!stream.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/) &&
+             wordIsTag(firstWordOfLine(stream)))) {
+          return pushContext(state, stream, "block");
+        }
+        if (stream.string.match(/^[\$-]?[a-z][\w-\.\[\]\'\"]*\s*=/) ||
+            stream.string.match(/^\s*(\(|\)|[0-9])/) ||
+            stream.string.match(/^\s+[a-z][\w-]*\(/i) ||
+            stream.string.match(/^\s+[\$-]?[a-z]/i)) {
+          return pushContext(state, stream, "block", 0);
+        }
+        if (endOfLine(stream)) return pushContext(state, stream, "block");
+        else return pushContext(state, stream, "block", 0);
+      }
+      if (type && type.charAt(0) == "@" && wordIsProperty(stream.current().slice(1))) {
+        override = "variable-2";
+      }
+      if (type == "word") {
+        var word = stream.current();
+        override = wordAsValue(word);
+        if (override == "tag" && tagVariablesRegexp.test(word)) {
+          override = "variable-2";
+        }
+        if (override == "property" || word == "to") override = "atom";
+      }
+      if (type == "variable-name") {
+        return pushContext(state, stream, "variableName");
+      }
+      if (typeIsPseudo(type, stream)) {
+        return pushContext(state, stream, "pseudo");
+      }
+      return state.context.type;
+    };
+
+
+    /**
+     * Vendor prefixes
+     */
+    states.vendorPrefixes = function(type, stream, state) {
+      if (type == "word") {
+        override = "property";
+        return pushContext(state, stream, "block", 0);
+      }
+      return popContext(state);
+    };
+
+
+    /**
+     * Pseudo
+     */
+    states.pseudo = function(type, stream, state) {
+      if (!wordIsProperty(firstWordOfLine(stream.string))) {
+        stream.match(/^[a-z-]+/);
+        override = "variable-3";
+        if (endOfLine(stream)) return pushContext(state, stream, "block");
+        return popContext(state);
+      }
+      return popAndPass(type, stream, state);
+    };
+
+
+    /**
+     * atBlock
+     */
+    states.atBlock = function(type, stream, state) {
+      if (type == "(") return pushContext(state, stream, "atBlock_parens");
+      if (typeIsBlock(type, stream)) {
+        return pushContext(state, stream, "block");
+      }
+      if (typeIsInterpolation(type, stream)) {
+        return pushContext(state, stream, "interpolation");
+      }
+      if (type == "word") {
+        var word = stream.current().toLowerCase();
+        if (/^(only|not|and|or)$/.test(word))
+          override = "keyword";
+        else if (documentTypes.hasOwnProperty(word))
+          override = "tag";
+        else if (mediaTypes.hasOwnProperty(word))
+          override = "attribute";
+        else if (mediaFeatures.hasOwnProperty(word))
+          override = "property";
+        else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+          override = "string-2";
+        else override = wordAsValue(stream.current());
+        if (override == "tag" && endOfLine(stream)) {
+          return pushContext(state, stream, "block");
+        }
+      }
+      if (type == "operator" && /^(not|and|or)$/.test(stream.current())) {
+        override = "keyword";
+      }
+      return state.context.type;
+    };
+
+    states.atBlock_parens = function(type, stream, state) {
+      if (type == "{" || type == "}") return state.context.type;
+      if (type == ")") {
+        if (endOfLine(stream)) return pushContext(state, stream, "block");
+        else return pushContext(state, stream, "atBlock");
+      }
+      if (type == "word") {
+        var word = stream.current().toLowerCase();
+        override = wordAsValue(word);
+        if (/^(max|min)/.test(word)) override = "property";
+        if (override == "tag") {
+          tagVariablesRegexp.test(word) ? override = "variable-2" : override = "atom";
+        }
+        return state.context.type;
+      }
+      return states.atBlock(type, stream, state);
+    };
+
+
+    /**
+     * Keyframes
+     */
+    states.keyframes = function(type, stream, state) {
+      if (stream.indentation() == "0" && ((type == "}" && startOfLine(stream)) || type == "]" || type == "hash"
+                                          || type == "qualifier" || wordIsTag(stream.current()))) {
+        return popAndPass(type, stream, state);
+      }
+      if (type == "{") return pushContext(state, stream, "keyframes");
+      if (type == "}") {
+        if (startOfLine(stream)) return popContext(state, true);
+        else return pushContext(state, stream, "keyframes");
+      }
+      if (type == "unit" && /^[0-9]+\%$/.test(stream.current())) {
+        return pushContext(state, stream, "keyframes");
+      }
+      if (type == "word") {
+        override = wordAsValue(stream.current());
+        if (override == "block-keyword") {
+          override = "keyword";
+          return pushContext(state, stream, "keyframes");
+        }
+      }
+      if (/@(font-face|media|supports|(-moz-)?document)/.test(type)) {
+        return pushContext(state, stream, endOfLine(stream) ? "block" : "atBlock");
+      }
+      if (type == "mixin") {
+        return pushContext(state, stream, "block", 0);
+      }
+      return state.context.type;
+    };
+
+
+    /**
+     * Interpolation
+     */
+    states.interpolation = function(type, stream, state) {
+      if (type == "{") popContext(state) && pushContext(state, stream, "block");
+      if (type == "}") {
+        if (stream.string.match(/^\s*(\.|#|:|\[|\*|&|>|~|\+|\/)/i) ||
+            (stream.string.match(/^\s*[a-z]/i) && wordIsTag(firstWordOfLine(stream)))) {
+          return pushContext(state, stream, "block");
+        }
+        if (!stream.string.match(/^(\{|\s*\&)/) ||
+            stream.match(/\s*[\w-]/,false)) {
+          return pushContext(state, stream, "block", 0);
+        }
+        return pushContext(state, stream, "block");
+      }
+      if (type == "variable-name") {
+        return pushContext(state, stream, "variableName", 0);
+      }
+      if (type == "word") {
+        override = wordAsValue(stream.current());
+        if (override == "tag") override = "atom";
+      }
+      return state.context.type;
+    };
+
+
+    /**
+     * Extend/s
+     */
+    states.extend = function(type, stream, state) {
+      if (type == "[" || type == "=") return "extend";
+      if (type == "]") return popContext(state);
+      if (type == "word") {
+        override = wordAsValue(stream.current());
+        return "extend";
+      }
+      return popContext(state);
+    };
+
+
+    /**
+     * Variable name
+     */
+    states.variableName = function(type, stream, state) {
+      if (type == "string" || type == "[" || type == "]" || stream.current().match(/^(\.|\$)/)) {
+        if (stream.current().match(/^\.[\w-]+/i)) override = "variable-2";
+        return "variableName";
+      }
+      return popAndPass(type, stream, state);
+    };
+
+
+    return {
+      startState: function(base) {
+        return {
+          tokenize: null,
+          state: "block",
+          context: new Context("block", base || 0, null)
+        };
+      },
+      token: function(stream, state) {
+        if (!state.tokenize && stream.eatSpace()) return null;
+        style = (state.tokenize || tokenBase)(stream, state);
+        if (style && typeof style == "object") {
+          type = style[1];
+          style = style[0];
+        }
+        override = style;
+        state.state = states[state.state](type, stream, state);
+        return override;
+      },
+      indent: function(state, textAfter, line) {
+
+        var cx = state.context,
+            ch = textAfter && textAfter.charAt(0),
+            indent = cx.indent,
+            lineFirstWord = firstWordOfLine(textAfter),
+            lineIndent = line.match(/^\s*/)[0].replace(/\t/g, indentUnitString).length,
+            prevLineFirstWord = state.context.prev ? state.context.prev.line.firstWord : "",
+            prevLineIndent = state.context.prev ? state.context.prev.line.indent : lineIndent;
+
+        if (cx.prev &&
+            (ch == "}" && (cx.type == "block" || cx.type == "atBlock" || cx.type == "keyframes") ||
+             ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+             ch == "{" && (cx.type == "at"))) {
+          indent = cx.indent - indentUnit;
+        } else if (!(/(\})/.test(ch))) {
+          if (/@|\$|\d/.test(ch) ||
+              /^\{/.test(textAfter) ||
+/^\s*\/(\/|\*)/.test(textAfter) ||
+              /^\s*\/\*/.test(prevLineFirstWord) ||
+              /^\s*[\w-\.\[\]\'\"]+\s*(\?|:|\+)?=/i.test(textAfter) ||
+/^(\+|-)?[a-z][\w-]*\(/i.test(textAfter) ||
+/^return/.test(textAfter) ||
+              wordIsBlock(lineFirstWord)) {
+            indent = lineIndent;
+          } else if (/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(ch) || wordIsTag(lineFirstWord)) {
+            if (/\,\s*$/.test(prevLineFirstWord)) {
+              indent = prevLineIndent;
+            } else if (/^\s+/.test(line) && (/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(prevLineFirstWord) || wordIsTag(prevLineFirstWord))) {
+              indent = lineIndent <= prevLineIndent ? prevLineIndent : prevLineIndent + indentUnit;
+            } else {
+              indent = lineIndent;
+            }
+          } else if (!/,\s*$/.test(line) && (wordIsVendorPrefix(lineFirstWord) || wordIsProperty(lineFirstWord))) {
+            if (wordIsBlock(prevLineFirstWord)) {
+              indent = lineIndent <= prevLineIndent ? prevLineIndent : prevLineIndent + indentUnit;
+            } else if (/^\{/.test(prevLineFirstWord)) {
+              indent = lineIndent <= prevLineIndent ? lineIndent : prevLineIndent + indentUnit;
+            } else if (wordIsVendorPrefix(prevLineFirstWord) || wordIsProperty(prevLineFirstWord)) {
+              indent = lineIndent >= prevLineIndent ? prevLineIndent : lineIndent;
+            } else if (/^(\.|#|:|\[|\*|&|@|\+|\-|>|~|\/)/.test(prevLineFirstWord) ||
+                      /=\s*$/.test(prevLineFirstWord) ||
+                      wordIsTag(prevLineFirstWord) ||
+                      /^\$[\w-\.\[\]\'\"]/.test(prevLineFirstWord)) {
+              indent = prevLineIndent + indentUnit;
+            } else {
+              indent = lineIndent;
+            }
+          }
+        }
+        return indent;
+      },
+      electricChars: "}",
+      lineComment: "//",
+      fold: "indent"
+    };
+  });
+
+  // developer.mozilla.org/en-US/docs/Web/HTML/Element
+  var tagKeywords_ = ["a","abbr","address","area","article","aside","audio", "b", "base","bdi", "bdo","bgsound","blockquote","body","br","button","canvas","caption","cite", "code","col","colgroup","data","datalist","dd","del","details","dfn","div", "dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1", "h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe", "img","input","ins","kbd","keygen","label","legend","li","link","main","map", "mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes", "noscript","object","ol","optgroup","option","output","p","param","pre", "progress","q","rp","rt","ruby","s","samp","script","section","select", "small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track", "u","ul","var","video"];
+
+  // github.com/codemirror/CodeMirror/blob/master/mode/css/css.js
+  var documentTypes_ = ["domain", "regexp", "url", "url-prefix"];
+  var mediaTypes_ = ["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"];
+  var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"];
+  var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];
+  var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
+  var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
+  var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
+
+  var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
+      blockKeywords_ = ["for","if","else","unless", "from", "to"],
+      commonAtoms_ = ["null","true","false","href","title","type","not-allowed","readonly","disabled"],
+      commonDef_ = ["@font-face", "@keyframes", "@media", "@viewport", "@page", "@host", "@supports", "@block", "@css"];
+
+  var hintWords = tagKeywords_.concat(documentTypes_,mediaTypes_,mediaFeatures_,
+                                      propertyKeywords_,nonStandardPropertyKeywords_,
+                                      colorKeywords_,valueKeywords_,fontProperties_,
+                                      wordOperatorKeywords_,blockKeywords_,
+                                      commonAtoms_,commonDef_);
+
+  function wordRegexp(words) {
+    words = words.sort(function(a,b){return b > a;});
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  function keySet(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) keys[array[i]] = true;
+    return keys;
+  }
+
+  function escapeRegExp(text) {
+    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+  }
+
+  CodeMirror.registerHelper("hintWords", "stylus", hintWords);
+  CodeMirror.defineMIME("text/x-styl", "stylus");
+});
diff --git a/core/media/editors/codemirror/mode/stylus/stylus.min.js b/core/media/editors/codemirror/mode/stylus/stylus.min.js
new file mode 100644
index 00000000..84efcd1a
--- /dev/null
+++ b/core/media/editors/codemirror/mode/stylus/stylus.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return a=a.sort((function(a,b){return b>a})),new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a){for(var b={},c=0;c<a.length;++c)b[a[c]]=!0;return b}function d(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")}a.defineMode("stylus",(function(a){function q(a,b){if(ea=a.string.match(/(^[\w-]+\s*=\s*$)|(^\s*[\w-]+\s*=\s*[\w-])|(^\s*(\.|#|@|\$|\&|\[|\d|\+|::?|\{|\>|~|\/)?\s*[\w-]*([a-z0-9-]|\*|\/\*)(\(|,)?)/),b.context.line.firstWord=ea?ea[0].replace(/^\s*/,""):"",b.context.line.indent=a.indentation(),K=a.peek(),a.match("//"))return a.skipToEnd(),["comment","comment"];if(a.match("/*"))return b.tokenize=r,r(a,b);if('"'==K||"'"==K)return a.next(),b.tokenize=s(K),b.tokenize(a,b);if("@"==K)return a.next(),a.eatWhile(/[\w\\-]/),["def",a.current()];if("#"==K){if(a.next(),a.match(/^[0-9a-f]{3}([0-9a-f]([0-9a-f]{2}){0,2})?\b/i))return["atom","atom"];if(a.match(/^[a-z][\w-]*/i))return["builtin","hash"]}return a.match(ca)?["meta","vendor-prefixes"]:a.match(/^-?[0-9]?\.?[0-9]/)?(a.eatWhile(/[a-z%]/i),["number","unit"]):"!"==K?(a.next(),[a.match(/^(important|optional)/i)?"keyword":"operator","important"]):"."==K&&a.match(/^\.[a-z][\w-]*/i)?["qualifier","qualifier"]:a.match(X)?("("==a.peek()&&(b.tokenize=t),["property","word"]):a.match(/^[a-z][\w-]*\(/i)?(a.backUp(1),["keyword","mixin"]):a.match(/^(\+|-)[a-z][\w-]*\(/i)?(a.backUp(1),["keyword","block-mixin"]):a.string.match(/^\s*&/)&&a.match(/^[-_]+[a-z][\w-]*/)?["qualifier","qualifier"]:a.match(/^(\/|&)(-|_|:|\.|#|[a-z])/)?(a.backUp(1),["variable-3","reference"]):a.match(/^&{1}\s*$/)?["variable-3","reference"]:a.match(aa)?["operator","operator"]:a.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)?a.match(/^(\.|\[)[\w-\'\"\]]+/i,!1)&&!z(a.current())?(a.match(/\./),["variable-2","variable-name"]):["variable-2","word"]:a.match(_)?["operator",a.current()]:/[:;,{}\[\]\(\)]/.test(K)?(a.next(),[null,K]):(a.next(),[null,null])}function r(a,b){for(var c,d=!1;null!=(c=a.next());){if(d&&"/"==c){b.tokenize=null;break}d="*"==c}return["comment","comment"]}function s(a){return function(b,c){for(var d,e=!1;null!=(d=b.next());){if(d==a&&!e){")"==a&&b.backUp(1);break}e=!e&&"\\"==d}return(d==a||!e&&")"!=a)&&(c.tokenize=null),["string","string"]}}function t(a,b){return a.next(),a.match(/\s*[\"\')]/,!1)?b.tokenize=null:b.tokenize=s(")"),[null,"("]}function u(a,b,c,d){this.type=a,this.indent=b,this.prev=c,this.line=d||{firstWord:"",indent:0}}function v(a,b,c,d){return d=d>=0?d:O,a.context=new u(c,b.indentation()+d,a.context),c}function w(a,b){var c=a.context.indent-O;return b=b||!1,a.context=a.context.prev,b&&(a.context.indent=c),a.context.type}function x(a,b,c){return fa[c.context.type](a,b,c)}function y(a,b,c,d){for(var e=d||1;e>0;e--)c.context=c.context.prev;return x(a,b,c)}function z(a){return a.toLowerCase()in Q}function A(a){return a=a.toLowerCase(),a in S||a in $}function B(a){return a.toLowerCase()in ba}function C(a){return a.toLowerCase().match(ca)}function D(a){var b=a.toLowerCase(),c="variable-2";return z(a)?c="tag":B(a)?c="block-keyword":A(a)?c="property":b in U||b in da?c="atom":"return"==b||b in V?c="keyword":a.match(/^[A-Z]/)&&(c="string"),c}function E(a,b){return I(b)&&("{"==a||"]"==a||"hash"==a||"qualifier"==a)||"block-mixin"==a}function F(a,b){return"{"==a&&b.match(/^\s*\$?[\w-]+/i,!1)}function G(a,b){return":"==a&&b.match(/^[a-z-]+/,!1)}function H(a){return a.sol()||a.string.match(new RegExp("^\\s*"+d(a.current())))}function I(a){return a.eol()||a.match(/^\s*$/,!1)}function J(a){var b=/^\s*[-_]*[a-z0-9]+[\w-]*/i,c="string"==typeof a?a.match(b):a.string.match(b);return c?c[0].replace(/^\s*/,""):""}for(var K,L,M,N,O=a.indentUnit,P="",Q=c(e),R=/^(a|b|i|s|col|em)$/i,S=c(i),T=c(j),U=c(m),V=c(l),W=c(f),X=b(f),Y=c(h),Z=c(g),$=c(k),_=/^\s*([.]{2,3}|&&|\|\||\*\*|[?!=:]?=|[-+*\/%<>]=?|\?:|\~)/,aa=b(n),ba=c(o),ca=new RegExp(/^\-(moz|ms|o|webkit)-/i),da=c(p),ea="",fa={};P.length<O;)P+=" ";return fa.block=function(a,b,c){if("comment"==a&&H(b)||","==a&&I(b)||"mixin"==a)return v(c,b,"block",0);if(F(a,b))return v(c,b,"interpolation");if(I(b)&&"]"==a&&!/^\s*(\.|#|:|\[|\*|&)/.test(b.string)&&!z(J(b)))return v(c,b,"block",0);if(E(a,b))return v(c,b,"block");if("}"==a&&I(b))return v(c,b,"block",0);if("variable-name"==a)return b.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)||B(J(b))?v(c,b,"variableName"):v(c,b,"variableName",0);if("="==a)return I(b)||B(J(b))?v(c,b,"block"):v(c,b,"block",0);if("*"==a&&(I(b)||b.match(/\s*(,|\.|#|\[|:|{)/,!1)))return N="tag",v(c,b,"block");if(G(a,b))return v(c,b,"pseudo");if(/@(font-face|media|supports|(-moz-)?document)/.test(a))return v(c,b,I(b)?"block":"atBlock");if(/@(-(moz|ms|o|webkit)-)?keyframes$/.test(a))return v(c,b,"keyframes");if(/@extends?/.test(a))return v(c,b,"extend",0);if(a&&"@"==a.charAt(0))return b.indentation()>0&&A(b.current().slice(1))?(N="variable-2","block"):/(@import|@require|@charset)/.test(a)?v(c,b,"block",0):v(c,b,"block");if("reference"==a&&I(b))return v(c,b,"block");if("("==a)return v(c,b,"parens");if("vendor-prefixes"==a)return v(c,b,"vendorPrefixes");if("word"==a){var d=b.current();if(N=D(d),"property"==N)return H(b)?v(c,b,"block",0):(N="atom","block");if("tag"==N){if(/embed|menu|pre|progress|sub|table/.test(d)&&A(J(b)))return N="atom","block";if(b.string.match(new RegExp("\\[\\s*"+d+"|"+d+"\\s*\\]")))return N="atom","block";if(R.test(d)&&(H(b)&&b.string.match(/=/)||!H(b)&&!b.string.match(/^(\s*\.|#|\&|\[|\/|>|\*)/)&&!z(J(b))))return N="variable-2",B(J(b))?"block":v(c,b,"block",0);if(I(b))return v(c,b,"block")}if("block-keyword"==N)return N="keyword",b.current(/(if|unless)/)&&!H(b)?"block":v(c,b,"block");if("return"==d)return v(c,b,"block",0);if("variable-2"==N&&b.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/))return v(c,b,"block")}return c.context.type},fa.parens=function(a,b,c){if("("==a)return v(c,b,"parens");if(")"==a)return"parens"==c.context.prev.type?w(c):b.string.match(/^[a-z][\w-]*\(/i)&&I(b)||B(J(b))||/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(J(b))||!b.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/)&&z(J(b))?v(c,b,"block"):b.string.match(/^[\$-]?[a-z][\w-\.\[\]\'\"]*\s*=/)||b.string.match(/^\s*(\(|\)|[0-9])/)||b.string.match(/^\s+[a-z][\w-]*\(/i)||b.string.match(/^\s+[\$-]?[a-z]/i)?v(c,b,"block",0):I(b)?v(c,b,"block"):v(c,b,"block",0);if(a&&"@"==a.charAt(0)&&A(b.current().slice(1))&&(N="variable-2"),"word"==a){var d=b.current();N=D(d),"tag"==N&&R.test(d)&&(N="variable-2"),"property"!=N&&"to"!=d||(N="atom")}return"variable-name"==a?v(c,b,"variableName"):G(a,b)?v(c,b,"pseudo"):c.context.type},fa.vendorPrefixes=function(a,b,c){return"word"==a?(N="property",v(c,b,"block",0)):w(c)},fa.pseudo=function(a,b,c){return A(J(b.string))?y(a,b,c):(b.match(/^[a-z-]+/),N="variable-3",I(b)?v(c,b,"block"):w(c))},fa.atBlock=function(a,b,c){if("("==a)return v(c,b,"atBlock_parens");if(E(a,b))return v(c,b,"block");if(F(a,b))return v(c,b,"interpolation");if("word"==a){var d=b.current().toLowerCase();if(N=/^(only|not|and|or)$/.test(d)?"keyword":W.hasOwnProperty(d)?"tag":Z.hasOwnProperty(d)?"attribute":Y.hasOwnProperty(d)?"property":T.hasOwnProperty(d)?"string-2":D(b.current()),"tag"==N&&I(b))return v(c,b,"block")}return"operator"==a&&/^(not|and|or)$/.test(b.current())&&(N="keyword"),c.context.type},fa.atBlock_parens=function(a,b,c){if("{"==a||"}"==a)return c.context.type;if(")"==a)return I(b)?v(c,b,"block"):v(c,b,"atBlock");if("word"==a){var d=b.current().toLowerCase();return N=D(d),/^(max|min)/.test(d)&&(N="property"),"tag"==N&&(N=R.test(d)?"variable-2":"atom"),c.context.type}return fa.atBlock(a,b,c)},fa.keyframes=function(a,b,c){return"0"==b.indentation()&&("}"==a&&H(b)||"]"==a||"hash"==a||"qualifier"==a||z(b.current()))?y(a,b,c):"{"==a?v(c,b,"keyframes"):"}"==a?H(b)?w(c,!0):v(c,b,"keyframes"):"unit"==a&&/^[0-9]+\%$/.test(b.current())?v(c,b,"keyframes"):"word"==a&&(N=D(b.current()),"block-keyword"==N)?(N="keyword",v(c,b,"keyframes")):/@(font-face|media|supports|(-moz-)?document)/.test(a)?v(c,b,I(b)?"block":"atBlock"):"mixin"==a?v(c,b,"block",0):c.context.type},fa.interpolation=function(a,b,c){return"{"==a&&w(c)&&v(c,b,"block"),"}"==a?b.string.match(/^\s*(\.|#|:|\[|\*|&|>|~|\+|\/)/i)||b.string.match(/^\s*[a-z]/i)&&z(J(b))?v(c,b,"block"):!b.string.match(/^(\{|\s*\&)/)||b.match(/\s*[\w-]/,!1)?v(c,b,"block",0):v(c,b,"block"):"variable-name"==a?v(c,b,"variableName",0):("word"==a&&(N=D(b.current()),"tag"==N&&(N="atom")),c.context.type)},fa.extend=function(a,b,c){return"["==a||"="==a?"extend":"]"==a?w(c):"word"==a?(N=D(b.current()),"extend"):w(c)},fa.variableName=function(a,b,c){return"string"==a||"["==a||"]"==a||b.current().match(/^(\.|\$)/)?(b.current().match(/^\.[\w-]+/i)&&(N="variable-2"),"variableName"):y(a,b,c)},{startState:function(a){return{tokenize:null,state:"block",context:new u("block",a||0,null)}},token:function(a,b){return!b.tokenize&&a.eatSpace()?null:(L=(b.tokenize||q)(a,b),L&&"object"==typeof L&&(M=L[1],L=L[0]),N=L,b.state=fa[b.state](M,a,b),N)},indent:function(a,b,c){var d=a.context,e=b&&b.charAt(0),f=d.indent,g=J(b),h=c.match(/^\s*/)[0].replace(/\t/g,P).length,i=a.context.prev?a.context.prev.line.firstWord:"",j=a.context.prev?a.context.prev.line.indent:h;return d.prev&&("}"==e&&("block"==d.type||"atBlock"==d.type||"keyframes"==d.type)||")"==e&&("parens"==d.type||"atBlock_parens"==d.type)||"{"==e&&"at"==d.type)?f=d.indent-O:/(\})/.test(e)||(/@|\$|\d/.test(e)||/^\{/.test(b)||/^\s*\/(\/|\*)/.test(b)||/^\s*\/\*/.test(i)||/^\s*[\w-\.\[\]\'\"]+\s*(\?|:|\+)?=/i.test(b)||/^(\+|-)?[a-z][\w-]*\(/i.test(b)||/^return/.test(b)||B(g)?f=h:/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(e)||z(g)?f=/\,\s*$/.test(i)?j:/^\s+/.test(c)&&(/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(i)||z(i))?h<=j?j:j+O:h:/,\s*$/.test(c)||!C(g)&&!A(g)||(f=B(i)?h<=j?j:j+O:/^\{/.test(i)?h<=j?h:j+O:C(i)||A(i)?h>=j?j:h:/^(\.|#|:|\[|\*|&|@|\+|\-|>|~|\/)/.test(i)||/=\s*$/.test(i)||z(i)||/^\$[\w-\.\[\]\'\"]/.test(i)?j+O:h)),f},electricChars:"}",lineComment:"//",fold:"indent"}}));var e=["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","bgsound","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes","noscript","object","ol","optgroup","option","output","p","param","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track","u","ul","var","video"],f=["domain","regexp","url","url-prefix"],g=["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"],h=["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"],i=["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"],j=["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"],k=["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"],l=["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"],m=["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around","unset"],n=["in","and","or","not","is not","is a","is","isnt","defined","if unless"],o=["for","if","else","unless","from","to"],p=["null","true","false","href","title","type","not-allowed","readonly","disabled"],q=["@font-face","@keyframes","@media","@viewport","@page","@host","@supports","@block","@css"],r=e.concat(f,g,h,i,j,l,m,k,n,o,p,q);a.registerHelper("hintWords","stylus",r),a.defineMIME("text/x-styl","stylus")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/swift/swift.js b/core/media/editors/codemirror/mode/swift/swift.js
new file mode 100644
index 00000000..1795d86e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/swift/swift.js
@@ -0,0 +1,219 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod)
+  else
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  function wordSet(words) {
+    var set = {}
+    for (var i = 0; i < words.length; i++) set[words[i]] = true
+    return set
+  }
+
+  var keywords = wordSet(["_","var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype",
+                          "open","public","internal","fileprivate","private","deinit","init","new","override","self","subscript","super",
+                          "convenience","dynamic","final","indirect","lazy","required","static","unowned","unowned(safe)","unowned(unsafe)","weak","as","is",
+                          "break","case","continue","default","else","fallthrough","for","guard","if","in","repeat","switch","where","while",
+                          "defer","return","inout","mutating","nonmutating","catch","do","rethrows","throw","throws","try","didSet","get","set","willSet",
+                          "assignment","associativity","infix","left","none","operator","postfix","precedence","precedencegroup","prefix","right",
+                          "Any","AnyObject","Type","dynamicType","Self","Protocol","__COLUMN__","__FILE__","__FUNCTION__","__LINE__"])
+  var definingKeywords = wordSet(["var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype","for"])
+  var atoms = wordSet(["true","false","nil","self","super","_"])
+  var types = wordSet(["Array","Bool","Character","Dictionary","Double","Float","Int","Int8","Int16","Int32","Int64","Never","Optional","Set","String",
+                       "UInt8","UInt16","UInt32","UInt64","Void"])
+  var operators = "+-/*%=|&<>~^?!"
+  var punc = ":;,.(){}[]"
+  var binary = /^\-?0b[01][01_]*/
+  var octal = /^\-?0o[0-7][0-7_]*/
+  var hexadecimal = /^\-?0x[\dA-Fa-f][\dA-Fa-f_]*(?:(?:\.[\dA-Fa-f][\dA-Fa-f_]*)?[Pp]\-?\d[\d_]*)?/
+  var decimal = /^\-?\d[\d_]*(?:\.\d[\d_]*)?(?:[Ee]\-?\d[\d_]*)?/
+  var identifier = /^\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1/
+  var property = /^\.(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/
+  var instruction = /^\#[A-Za-z]+/
+  var attribute = /^@(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/
+  //var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
+
+  function tokenBase(stream, state, prev) {
+    if (stream.sol()) state.indented = stream.indentation()
+    if (stream.eatSpace()) return null
+
+    var ch = stream.peek()
+    if (ch == "/") {
+      if (stream.match("//")) {
+        stream.skipToEnd()
+        return "comment"
+      }
+      if (stream.match("/*")) {
+        state.tokenize.push(tokenComment)
+        return tokenComment(stream, state)
+      }
+    }
+    if (stream.match(instruction)) return "builtin"
+    if (stream.match(attribute)) return "attribute"
+    if (stream.match(binary)) return "number"
+    if (stream.match(octal)) return "number"
+    if (stream.match(hexadecimal)) return "number"
+    if (stream.match(decimal)) return "number"
+    if (stream.match(property)) return "property"
+    if (operators.indexOf(ch) > -1) {
+      stream.next()
+      return "operator"
+    }
+    if (punc.indexOf(ch) > -1) {
+      stream.next()
+      stream.match("..")
+      return "punctuation"
+    }
+    if (ch == '"' || ch == "'") {
+      stream.next()
+      var tokenize = tokenString(ch)
+      state.tokenize.push(tokenize)
+      return tokenize(stream, state)
+    }
+
+    if (stream.match(identifier)) {
+      var ident = stream.current()
+      if (types.hasOwnProperty(ident)) return "variable-2"
+      if (atoms.hasOwnProperty(ident)) return "atom"
+      if (keywords.hasOwnProperty(ident)) {
+        if (definingKeywords.hasOwnProperty(ident))
+          state.prev = "define"
+        return "keyword"
+      }
+      if (prev == "define") return "def"
+      return "variable"
+    }
+
+    stream.next()
+    return null
+  }
+
+  function tokenUntilClosingParen() {
+    var depth = 0
+    return function(stream, state, prev) {
+      var inner = tokenBase(stream, state, prev)
+      if (inner == "punctuation") {
+        if (stream.current() == "(") ++depth
+        else if (stream.current() == ")") {
+          if (depth == 0) {
+            stream.backUp(1)
+            state.tokenize.pop()
+            return state.tokenize[state.tokenize.length - 1](stream, state)
+          }
+          else --depth
+        }
+      }
+      return inner
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var ch, escaped = false
+      while (ch = stream.next()) {
+        if (escaped) {
+          if (ch == "(") {
+            state.tokenize.push(tokenUntilClosingParen())
+            return "string"
+          }
+          escaped = false
+        } else if (ch == quote) {
+          break
+        } else {
+          escaped = ch == "\\"
+        }
+      }
+      state.tokenize.pop()
+      return "string"
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var ch
+    while (true) {
+      stream.match(/^[^/*]+/, true)
+      ch = stream.next()
+      if (!ch) break
+      if (ch === "/" && stream.eat("*")) {
+        state.tokenize.push(tokenComment)
+      } else if (ch === "*" && stream.eat("/")) {
+        state.tokenize.pop()
+      }
+    }
+    return "comment"
+  }
+
+  function Context(prev, align, indented) {
+    this.prev = prev
+    this.align = align
+    this.indented = indented
+  }
+
+  function pushContext(state, stream) {
+    var align = stream.match(/^\s*($|\/[\/\*])/, false) ? null : stream.column() + 1
+    state.context = new Context(state.context, align, state.indented)
+  }
+
+  function popContext(state) {
+    if (state.context) {
+      state.indented = state.context.indented
+      state.context = state.context.prev
+    }
+  }
+
+  CodeMirror.defineMode("swift", function(config) {
+    return {
+      startState: function() {
+        return {
+          prev: null,
+          context: null,
+          indented: 0,
+          tokenize: []
+        }
+      },
+
+      token: function(stream, state) {
+        var prev = state.prev
+        state.prev = null
+        var tokenize = state.tokenize[state.tokenize.length - 1] || tokenBase
+        var style = tokenize(stream, state, prev)
+        if (!style || style == "comment") state.prev = prev
+        else if (!state.prev) state.prev = style
+
+        if (style == "punctuation") {
+          var bracket = /[\(\[\{]|([\]\)\}])/.exec(stream.current())
+          if (bracket) (bracket[1] ? popContext : pushContext)(state, stream)
+        }
+
+        return style
+      },
+
+      indent: function(state, textAfter) {
+        var cx = state.context
+        if (!cx) return 0
+        var closing = /^[\]\}\)]/.test(textAfter)
+        if (cx.align != null) return cx.align - (closing ? 1 : 0)
+        return cx.indented + (closing ? 0 : config.indentUnit)
+      },
+
+      electricInput: /^\s*[\)\}\]]$/,
+
+      lineComment: "//",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      fold: "brace",
+      closeBrackets: "()[]{}''\"\"``"
+    }
+  })
+
+  CodeMirror.defineMIME("text/x-swift","swift")
+});
diff --git a/core/media/editors/codemirror/mode/swift/swift.min.js b/core/media/editors/codemirror/mode/swift/swift.min.js
new file mode 100644
index 00000000..3db612ba
--- /dev/null
+++ b/core/media/editors/codemirror/mode/swift/swift.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=0;c<a.length;c++)b[a[c]]=!0;return b}function c(a,b,c){if(a.sol()&&(b.indented=a.indentation()),a.eatSpace())return null;var d=a.peek();if("/"==d){if(a.match("//"))return a.skipToEnd(),"comment";if(a.match("/*"))return b.tokenize.push(f),f(a,b)}if(a.match(v))return"builtin";if(a.match(w))return"attribute";if(a.match(p))return"number";if(a.match(q))return"number";if(a.match(r))return"number";if(a.match(s))return"number";if(a.match(u))return"property";if(n.indexOf(d)>-1)return a.next(),"operator";if(o.indexOf(d)>-1)return a.next(),a.match(".."),"punctuation";if('"'==d||"'"==d){a.next();var g=e(d);return b.tokenize.push(g),g(a,b)}if(a.match(t)){var h=a.current();return m.hasOwnProperty(h)?"variable-2":l.hasOwnProperty(h)?"atom":j.hasOwnProperty(h)?(k.hasOwnProperty(h)&&(b.prev="define"),"keyword"):"define"==c?"def":"variable"}return a.next(),null}function d(){var a=0;return function(b,d,e){var f=c(b,d,e);if("punctuation"==f)if("("==b.current())++a;else if(")"==b.current()){if(0==a)return b.backUp(1),d.tokenize.pop(),d.tokenize[d.tokenize.length-1](b,d);--a}return f}}function e(a){return function(b,c){for(var e,f=!1;e=b.next();)if(f){if("("==e)return c.tokenize.push(d()),"string";f=!1}else{if(e==a)break;f="\\"==e}return c.tokenize.pop(),"string"}}function f(a,b){for(var c;;){if(a.match(/^[^\/*]+/,!0),c=a.next(),!c)break;"/"===c&&a.eat("*")?b.tokenize.push(f):"*"===c&&a.eat("/")&&b.tokenize.pop()}return"comment"}function g(a,b,c){this.prev=a,this.align=b,this.indented=c}function h(a,b){var c=b.match(/^\s*($|\/[\/\*])/,!1)?null:b.column()+1;a.context=new g(a.context,c,a.indented)}function i(a){a.context&&(a.indented=a.context.indented,a.context=a.context.prev)}var j=b(["_","var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype","open","public","internal","fileprivate","private","deinit","init","new","override","self","subscript","super","convenience","dynamic","final","indirect","lazy","required","static","unowned","unowned(safe)","unowned(unsafe)","weak","as","is","break","case","continue","default","else","fallthrough","for","guard","if","in","repeat","switch","where","while","defer","return","inout","mutating","nonmutating","catch","do","rethrows","throw","throws","try","didSet","get","set","willSet","assignment","associativity","infix","left","none","operator","postfix","precedence","precedencegroup","prefix","right","Any","AnyObject","Type","dynamicType","Self","Protocol","__COLUMN__","__FILE__","__FUNCTION__","__LINE__"]),k=b(["var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype","for"]),l=b(["true","false","nil","self","super","_"]),m=b(["Array","Bool","Character","Dictionary","Double","Float","Int","Int8","Int16","Int32","Int64","Never","Optional","Set","String","UInt8","UInt16","UInt32","UInt64","Void"]),n="+-/*%=|&<>~^?!",o=":;,.(){}[]",p=/^\-?0b[01][01_]*/,q=/^\-?0o[0-7][0-7_]*/,r=/^\-?0x[\dA-Fa-f][\dA-Fa-f_]*(?:(?:\.[\dA-Fa-f][\dA-Fa-f_]*)?[Pp]\-?\d[\d_]*)?/,s=/^\-?\d[\d_]*(?:\.\d[\d_]*)?(?:[Ee]\-?\d[\d_]*)?/,t=/^\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1/,u=/^\.(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/,v=/^\#[A-Za-z]+/,w=/^@(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/;a.defineMode("swift",(function(a){return{startState:function(){return{prev:null,context:null,indented:0,tokenize:[]}},token:function(a,b){var d=b.prev;b.prev=null;var e=b.tokenize[b.tokenize.length-1]||c,f=e(a,b,d);if(f&&"comment"!=f?b.prev||(b.prev=f):b.prev=d,"punctuation"==f){var g=/[\(\[\{]|([\]\)\}])/.exec(a.current());g&&(g[1]?i:h)(b,a)}return f},indent:function(b,c){var d=b.context;if(!d)return 0;var e=/^[\]\}\)]/.test(c);return null!=d.align?d.align-(e?1:0):d.indented+(e?0:a.indentUnit)},electricInput:/^\s*[\)\}\]]$/,lineComment:"//",blockCommentStart:"/*",blockCommentEnd:"*/",fold:"brace",closeBrackets:"()[]{}''\"\"``"}})),a.defineMIME("text/x-swift","swift")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tcl/tcl.js b/core/media/editors/codemirror/mode/tcl/tcl.js
new file mode 100644
index 00000000..8c76d52c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tcl/tcl.js
@@ -0,0 +1,139 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+//tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("tcl", function() {
+  function parseWords(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+  var keywords = parseWords("Tcl safe after append array auto_execok auto_import auto_load " +
+        "auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror " +
+        "binary break catch cd close concat continue dde eof encoding error " +
+        "eval exec exit expr fblocked fconfigure fcopy file fileevent filename " +
+        "filename flush for foreach format gets glob global history http if " +
+        "incr info interp join lappend lindex linsert list llength load lrange " +
+        "lreplace lsearch lset lsort memory msgcat namespace open package parray " +
+        "pid pkg::create pkg_mkIndex proc puts pwd re_syntax read regex regexp " +
+        "registry regsub rename resource return scan seek set socket source split " +
+        "string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord " +
+        "tcl_wordBreakAfter tcl_startOfPreviousWord tcl_wordBreakBefore tcltest " +
+        "tclvars tell time trace unknown unset update uplevel upvar variable " +
+    "vwait");
+    var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch");
+    var isOperatorChar = /[+\-*&%=<>!?^\/\|]/;
+    function chain(stream, state, f) {
+      state.tokenize = f;
+      return f(stream, state);
+    }
+    function tokenBase(stream, state) {
+      var beforeParams = state.beforeParams;
+      state.beforeParams = false;
+      var ch = stream.next();
+      if ((ch == '"' || ch == "'") && state.inParams) {
+        return chain(stream, state, tokenString(ch));
+      } else if (/[\[\]{}\(\),;\.]/.test(ch)) {
+        if (ch == "(" && beforeParams) state.inParams = true;
+        else if (ch == ")") state.inParams = false;
+          return null;
+      } else if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      } else if (ch == "#") {
+        if (stream.eat("*"))
+          return chain(stream, state, tokenComment);
+        if (ch == "#" && stream.match(/ *\[ *\[/))
+          return chain(stream, state, tokenUnparsed);
+        stream.skipToEnd();
+        return "comment";
+      } else if (ch == '"') {
+        stream.skipTo(/"/);
+        return "comment";
+      } else if (ch == "$") {
+        stream.eatWhile(/[$_a-z0-9A-Z\.{:]/);
+        stream.eatWhile(/}/);
+        state.beforeParams = true;
+        return "builtin";
+      } else if (isOperatorChar.test(ch)) {
+        stream.eatWhile(isOperatorChar);
+        return "comment";
+      } else {
+        stream.eatWhile(/[\w\$_{}\xa1-\uffff]/);
+        var word = stream.current().toLowerCase();
+        if (keywords && keywords.propertyIsEnumerable(word))
+          return "keyword";
+        if (functions && functions.propertyIsEnumerable(word)) {
+          state.beforeParams = true;
+          return "keyword";
+        }
+        return null;
+      }
+    }
+    function tokenString(quote) {
+      return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          end = true;
+          break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end) state.tokenize = tokenBase;
+        return "string";
+      };
+    }
+    function tokenComment(stream, state) {
+      var maybeEnd = false, ch;
+      while (ch = stream.next()) {
+        if (ch == "#" && maybeEnd) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return "comment";
+    }
+    function tokenUnparsed(stream, state) {
+      var maybeEnd = 0, ch;
+      while (ch = stream.next()) {
+        if (ch == "#" && maybeEnd == 2) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        if (ch == "]")
+          maybeEnd++;
+        else if (ch != " ")
+          maybeEnd = 0;
+      }
+      return "meta";
+    }
+    return {
+      startState: function() {
+        return {
+          tokenize: tokenBase,
+          beforeParams: false,
+          inParams: false
+        };
+      },
+      token: function(stream, state) {
+        if (stream.eatSpace()) return null;
+        return state.tokenize(stream, state);
+      }
+    };
+});
+CodeMirror.defineMIME("text/x-tcl", "tcl");
+
+});
diff --git a/core/media/editors/codemirror/mode/tcl/tcl.min.js b/core/media/editors/codemirror/mode/tcl/tcl.min.js
new file mode 100644
index 00000000..2dd7cc34
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tcl/tcl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("tcl",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){return b.tokenize=c,c(a,b)}function c(a,c){var j=c.beforeParams;c.beforeParams=!1;var k=a.next();if('"'!=k&&"'"!=k||!c.inParams){if(/[\[\]{}\(\),;\.]/.test(k))return"("==k&&j?c.inParams=!0:")"==k&&(c.inParams=!1),null;if(/\d/.test(k))return a.eatWhile(/[\w\.]/),"number";if("#"==k)return a.eat("*")?b(a,c,e):"#"==k&&a.match(/ *\[ *\[/)?b(a,c,f):(a.skipToEnd(),"comment");if('"'==k)return a.skipTo(/"/),"comment";if("$"==k)return a.eatWhile(/[$_a-z0-9A-Z\.{:]/),a.eatWhile(/}/),c.beforeParams=!0,"builtin";if(i.test(k))return a.eatWhile(i),"comment";a.eatWhile(/[\w\$_{}\xa1-\uffff]/);var l=a.current().toLowerCase();return g&&g.propertyIsEnumerable(l)?"keyword":h&&h.propertyIsEnumerable(l)?(c.beforeParams=!0,"keyword"):null}return b(a,c,d(k))}function d(a){return function(b,d){for(var e,f=!1,g=!1;null!=(e=b.next());){if(e==a&&!f){g=!0;break}f=!f&&"\\"==e}return g&&(d.tokenize=c),"string"}}function e(a,b){for(var d,e=!1;d=a.next();){if("#"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function f(a,b){for(var d,e=0;d=a.next();){if("#"==d&&2==e){b.tokenize=c;break}"]"==d?e++:" "!=d&&(e=0)}return"meta"}var g=a("Tcl safe after append array auto_execok auto_import auto_load auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror binary break catch cd close concat continue dde eof encoding error eval exec exit expr fblocked fconfigure fcopy file fileevent filename filename flush for foreach format gets glob global history http if incr info interp join lappend lindex linsert list llength load lrange lreplace lsearch lset lsort memory msgcat namespace open package parray pid pkg::create pkg_mkIndex proc puts pwd re_syntax read regex regexp registry regsub rename resource return scan seek set socket source split string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord tcl_wordBreakAfter tcl_startOfPreviousWord tcl_wordBreakBefore tcltest tclvars tell time trace unknown unset update uplevel upvar variable vwait"),h=a("if elseif else and not or eq ne in ni for foreach while switch"),i=/[+\-*&%=<>!?^\/\|]/;return{startState:function(){return{tokenize:c,beforeParams:!1,inParams:!1}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)}}})),a.defineMIME("text/x-tcl","tcl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/textile/textile.js b/core/media/editors/codemirror/mode/textile/textile.js
new file mode 100644
index 00000000..bc5a2f36
--- /dev/null
+++ b/core/media/editors/codemirror/mode/textile/textile.js
@@ -0,0 +1,469 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") { // CommonJS
+    mod(require("../../lib/codemirror"));
+  } else if (typeof define == "function" && define.amd) { // AMD
+    define(["../../lib/codemirror"], mod);
+  } else { // Plain browser env
+    mod(CodeMirror);
+  }
+})(function(CodeMirror) {
+  "use strict";
+
+  var TOKEN_STYLES = {
+    addition: "positive",
+    attributes: "attribute",
+    bold: "strong",
+    cite: "keyword",
+    code: "atom",
+    definitionList: "number",
+    deletion: "negative",
+    div: "punctuation",
+    em: "em",
+    footnote: "variable",
+    footCite: "qualifier",
+    header: "header",
+    html: "comment",
+    image: "string",
+    italic: "em",
+    link: "link",
+    linkDefinition: "link",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    notextile: "string-2",
+    pre: "operator",
+    p: "property",
+    quote: "bracket",
+    span: "quote",
+    specialChar: "tag",
+    strong: "strong",
+    sub: "builtin",
+    sup: "builtin",
+    table: "variable-3",
+    tableHeading: "operator"
+  };
+
+  function startNewLine(stream, state) {
+    state.mode = Modes.newLayout;
+    state.tableHeading = false;
+
+    if (state.layoutType === "definitionList" && state.spanningLayout &&
+        stream.match(RE("definitionListEnd"), false))
+      state.spanningLayout = false;
+  }
+
+  function handlePhraseModifier(stream, state, ch) {
+    if (ch === "_") {
+      if (stream.eat("_"))
+        return togglePhraseModifier(stream, state, "italic", /__/, 2);
+      else
+        return togglePhraseModifier(stream, state, "em", /_/, 1);
+    }
+
+    if (ch === "*") {
+      if (stream.eat("*")) {
+        return togglePhraseModifier(stream, state, "bold", /\*\*/, 2);
+      }
+      return togglePhraseModifier(stream, state, "strong", /\*/, 1);
+    }
+
+    if (ch === "[") {
+      if (stream.match(/\d+\]/)) state.footCite = true;
+      return tokenStyles(state);
+    }
+
+    if (ch === "(") {
+      var spec = stream.match(/^(r|tm|c)\)/);
+      if (spec)
+        return tokenStylesWith(state, TOKEN_STYLES.specialChar);
+    }
+
+    if (ch === "<" && stream.match(/(\w+)[^>]+>[^<]+<\/\1>/))
+      return tokenStylesWith(state, TOKEN_STYLES.html);
+
+    if (ch === "?" && stream.eat("?"))
+      return togglePhraseModifier(stream, state, "cite", /\?\?/, 2);
+
+    if (ch === "=" && stream.eat("="))
+      return togglePhraseModifier(stream, state, "notextile", /==/, 2);
+
+    if (ch === "-" && !stream.eat("-"))
+      return togglePhraseModifier(stream, state, "deletion", /-/, 1);
+
+    if (ch === "+")
+      return togglePhraseModifier(stream, state, "addition", /\+/, 1);
+
+    if (ch === "~")
+      return togglePhraseModifier(stream, state, "sub", /~/, 1);
+
+    if (ch === "^")
+      return togglePhraseModifier(stream, state, "sup", /\^/, 1);
+
+    if (ch === "%")
+      return togglePhraseModifier(stream, state, "span", /%/, 1);
+
+    if (ch === "@")
+      return togglePhraseModifier(stream, state, "code", /@/, 1);
+
+    if (ch === "!") {
+      var type = togglePhraseModifier(stream, state, "image", /(?:\([^\)]+\))?!/, 1);
+      stream.match(/^:\S+/); // optional Url portion
+      return type;
+    }
+    return tokenStyles(state);
+  }
+
+  function togglePhraseModifier(stream, state, phraseModifier, closeRE, openSize) {
+    var charBefore = stream.pos > openSize ? stream.string.charAt(stream.pos - openSize - 1) : null;
+    var charAfter = stream.peek();
+    if (state[phraseModifier]) {
+      if ((!charAfter || /\W/.test(charAfter)) && charBefore && /\S/.test(charBefore)) {
+        var type = tokenStyles(state);
+        state[phraseModifier] = false;
+        return type;
+      }
+    } else if ((!charBefore || /\W/.test(charBefore)) && charAfter && /\S/.test(charAfter) &&
+               stream.match(new RegExp("^.*\\S" + closeRE.source + "(?:\\W|$)"), false)) {
+      state[phraseModifier] = true;
+      state.mode = Modes.attributes;
+    }
+    return tokenStyles(state);
+  };
+
+  function tokenStyles(state) {
+    var disabled = textileDisabled(state);
+    if (disabled) return disabled;
+
+    var styles = [];
+    if (state.layoutType) styles.push(TOKEN_STYLES[state.layoutType]);
+
+    styles = styles.concat(activeStyles(
+      state, "addition", "bold", "cite", "code", "deletion", "em", "footCite",
+      "image", "italic", "link", "span", "strong", "sub", "sup", "table", "tableHeading"));
+
+    if (state.layoutType === "header")
+      styles.push(TOKEN_STYLES.header + "-" + state.header);
+
+    return styles.length ? styles.join(" ") : null;
+  }
+
+  function textileDisabled(state) {
+    var type = state.layoutType;
+
+    switch(type) {
+    case "notextile":
+    case "code":
+    case "pre":
+      return TOKEN_STYLES[type];
+    default:
+      if (state.notextile)
+        return TOKEN_STYLES.notextile + (type ? (" " + TOKEN_STYLES[type]) : "");
+      return null;
+    }
+  }
+
+  function tokenStylesWith(state, extraStyles) {
+    var disabled = textileDisabled(state);
+    if (disabled) return disabled;
+
+    var type = tokenStyles(state);
+    if (extraStyles)
+      return type ? (type + " " + extraStyles) : extraStyles;
+    else
+      return type;
+  }
+
+  function activeStyles(state) {
+    var styles = [];
+    for (var i = 1; i < arguments.length; ++i) {
+      if (state[arguments[i]])
+        styles.push(TOKEN_STYLES[arguments[i]]);
+    }
+    return styles;
+  }
+
+  function blankLine(state) {
+    var spanningLayout = state.spanningLayout, type = state.layoutType;
+
+    for (var key in state) if (state.hasOwnProperty(key))
+      delete state[key];
+
+    state.mode = Modes.newLayout;
+    if (spanningLayout) {
+      state.layoutType = type;
+      state.spanningLayout = true;
+    }
+  }
+
+  var REs = {
+    cache: {},
+    single: {
+      bc: "bc",
+      bq: "bq",
+      definitionList: /- .*?:=+/,
+      definitionListEnd: /.*=:\s*$/,
+      div: "div",
+      drawTable: /\|.*\|/,
+      foot: /fn\d+/,
+      header: /h[1-6]/,
+      html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,
+      link: /[^"]+":\S/,
+      linkDefinition: /\[[^\s\]]+\]\S+/,
+      list: /(?:#+|\*+)/,
+      notextile: "notextile",
+      para: "p",
+      pre: "pre",
+      table: "table",
+      tableCellAttributes: /[\/\\]\d+/,
+      tableHeading: /\|_\./,
+      tableText: /[^"_\*\[\(\?\+~\^%@|-]+/,
+      text: /[^!"_=\*\[\(<\?\+~\^%@-]+/
+    },
+    attributes: {
+      align: /(?:<>|<|>|=)/,
+      selector: /\([^\(][^\)]+\)/,
+      lang: /\[[^\[\]]+\]/,
+      pad: /(?:\(+|\)+){1,2}/,
+      css: /\{[^\}]+\}/
+    },
+    createRe: function(name) {
+      switch (name) {
+      case "drawTable":
+        return REs.makeRe("^", REs.single.drawTable, "$");
+      case "html":
+        return REs.makeRe("^", REs.single.html, "(?:", REs.single.html, ")*", "$");
+      case "linkDefinition":
+        return REs.makeRe("^", REs.single.linkDefinition, "$");
+      case "listLayout":
+        return REs.makeRe("^", REs.single.list, RE("allAttributes"), "*\\s+");
+      case "tableCellAttributes":
+        return REs.makeRe("^", REs.choiceRe(REs.single.tableCellAttributes,
+                                            RE("allAttributes")), "+\\.");
+      case "type":
+        return REs.makeRe("^", RE("allTypes"));
+      case "typeLayout":
+        return REs.makeRe("^", RE("allTypes"), RE("allAttributes"),
+                          "*\\.\\.?", "(\\s+|$)");
+      case "attributes":
+        return REs.makeRe("^", RE("allAttributes"), "+");
+
+      case "allTypes":
+        return REs.choiceRe(REs.single.div, REs.single.foot,
+                            REs.single.header, REs.single.bc, REs.single.bq,
+                            REs.single.notextile, REs.single.pre, REs.single.table,
+                            REs.single.para);
+
+      case "allAttributes":
+        return REs.choiceRe(REs.attributes.selector, REs.attributes.css,
+                            REs.attributes.lang, REs.attributes.align, REs.attributes.pad);
+
+      default:
+        return REs.makeRe("^", REs.single[name]);
+      }
+    },
+    makeRe: function() {
+      var pattern = "";
+      for (var i = 0; i < arguments.length; ++i) {
+        var arg = arguments[i];
+        pattern += (typeof arg === "string") ? arg : arg.source;
+      }
+      return new RegExp(pattern);
+    },
+    choiceRe: function() {
+      var parts = [arguments[0]];
+      for (var i = 1; i < arguments.length; ++i) {
+        parts[i * 2 - 1] = "|";
+        parts[i * 2] = arguments[i];
+      }
+
+      parts.unshift("(?:");
+      parts.push(")");
+      return REs.makeRe.apply(null, parts);
+    }
+  };
+
+  function RE(name) {
+    return (REs.cache[name] || (REs.cache[name] = REs.createRe(name)));
+  }
+
+  var Modes = {
+    newLayout: function(stream, state) {
+      if (stream.match(RE("typeLayout"), false)) {
+        state.spanningLayout = false;
+        return (state.mode = Modes.blockType)(stream, state);
+      }
+      var newMode;
+      if (!textileDisabled(state)) {
+        if (stream.match(RE("listLayout"), false))
+          newMode = Modes.list;
+        else if (stream.match(RE("drawTable"), false))
+          newMode = Modes.table;
+        else if (stream.match(RE("linkDefinition"), false))
+          newMode = Modes.linkDefinition;
+        else if (stream.match(RE("definitionList")))
+          newMode = Modes.definitionList;
+        else if (stream.match(RE("html"), false))
+          newMode = Modes.html;
+      }
+      return (state.mode = (newMode || Modes.text))(stream, state);
+    },
+
+    blockType: function(stream, state) {
+      var match, type;
+      state.layoutType = null;
+
+      if (match = stream.match(RE("type")))
+        type = match[0];
+      else
+        return (state.mode = Modes.text)(stream, state);
+
+      if (match = type.match(RE("header"))) {
+        state.layoutType = "header";
+        state.header = parseInt(match[0][1]);
+      } else if (type.match(RE("bq"))) {
+        state.layoutType = "quote";
+      } else if (type.match(RE("bc"))) {
+        state.layoutType = "code";
+      } else if (type.match(RE("foot"))) {
+        state.layoutType = "footnote";
+      } else if (type.match(RE("notextile"))) {
+        state.layoutType = "notextile";
+      } else if (type.match(RE("pre"))) {
+        state.layoutType = "pre";
+      } else if (type.match(RE("div"))) {
+        state.layoutType = "div";
+      } else if (type.match(RE("table"))) {
+        state.layoutType = "table";
+      }
+
+      state.mode = Modes.attributes;
+      return tokenStyles(state);
+    },
+
+    text: function(stream, state) {
+      if (stream.match(RE("text"))) return tokenStyles(state);
+
+      var ch = stream.next();
+      if (ch === '"')
+        return (state.mode = Modes.link)(stream, state);
+      return handlePhraseModifier(stream, state, ch);
+    },
+
+    attributes: function(stream, state) {
+      state.mode = Modes.layoutLength;
+
+      if (stream.match(RE("attributes")))
+        return tokenStylesWith(state, TOKEN_STYLES.attributes);
+      else
+        return tokenStyles(state);
+    },
+
+    layoutLength: function(stream, state) {
+      if (stream.eat(".") && stream.eat("."))
+        state.spanningLayout = true;
+
+      state.mode = Modes.text;
+      return tokenStyles(state);
+    },
+
+    list: function(stream, state) {
+      var match = stream.match(RE("list"));
+      state.listDepth = match[0].length;
+      var listMod = (state.listDepth - 1) % 3;
+      if (!listMod)
+        state.layoutType = "list1";
+      else if (listMod === 1)
+        state.layoutType = "list2";
+      else
+        state.layoutType = "list3";
+
+      state.mode = Modes.attributes;
+      return tokenStyles(state);
+    },
+
+    link: function(stream, state) {
+      state.mode = Modes.text;
+      if (stream.match(RE("link"))) {
+        stream.match(/\S+/);
+        return tokenStylesWith(state, TOKEN_STYLES.link);
+      }
+      return tokenStyles(state);
+    },
+
+    linkDefinition: function(stream, state) {
+      stream.skipToEnd();
+      return tokenStylesWith(state, TOKEN_STYLES.linkDefinition);
+    },
+
+    definitionList: function(stream, state) {
+      stream.match(RE("definitionList"));
+
+      state.layoutType = "definitionList";
+
+      if (stream.match(/\s*$/))
+        state.spanningLayout = true;
+      else
+        state.mode = Modes.attributes;
+
+      return tokenStyles(state);
+    },
+
+    html: function(stream, state) {
+      stream.skipToEnd();
+      return tokenStylesWith(state, TOKEN_STYLES.html);
+    },
+
+    table: function(stream, state) {
+      state.layoutType = "table";
+      return (state.mode = Modes.tableCell)(stream, state);
+    },
+
+    tableCell: function(stream, state) {
+      if (stream.match(RE("tableHeading")))
+        state.tableHeading = true;
+      else
+        stream.eat("|");
+
+      state.mode = Modes.tableCellAttributes;
+      return tokenStyles(state);
+    },
+
+    tableCellAttributes: function(stream, state) {
+      state.mode = Modes.tableText;
+
+      if (stream.match(RE("tableCellAttributes")))
+        return tokenStylesWith(state, TOKEN_STYLES.attributes);
+      else
+        return tokenStyles(state);
+    },
+
+    tableText: function(stream, state) {
+      if (stream.match(RE("tableText")))
+        return tokenStyles(state);
+
+      if (stream.peek() === "|") { // end of cell
+        state.mode = Modes.tableCell;
+        return tokenStyles(state);
+      }
+      return handlePhraseModifier(stream, state, stream.next());
+    }
+  };
+
+  CodeMirror.defineMode("textile", function() {
+    return {
+      startState: function() {
+        return { mode: Modes.newLayout };
+      },
+      token: function(stream, state) {
+        if (stream.sol()) startNewLine(stream, state);
+        return state.mode(stream, state);
+      },
+      blankLine: blankLine
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-textile", "textile");
+});
diff --git a/core/media/editors/codemirror/mode/textile/textile.min.js b/core/media/editors/codemirror/mode/textile/textile.min.js
new file mode 100644
index 00000000..974cb536
--- /dev/null
+++ b/core/media/editors/codemirror/mode/textile/textile.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b){b.mode=m.newLayout,b.tableHeading=!1,"definitionList"===b.layoutType&&b.spanningLayout&&a.match(j("definitionListEnd"),!1)&&(b.spanningLayout=!1)}function c(a,b,c){if("_"===c)return a.eat("_")?d(a,b,"italic",/__/,2):d(a,b,"em",/_/,1);if("*"===c)return a.eat("*")?d(a,b,"bold",/\*\*/,2):d(a,b,"strong",/\*/,1);if("["===c)return a.match(/\d+\]/)&&(b.footCite=!0),e(b);if("("===c){var f=a.match(/^(r|tm|c)\)/);if(f)return g(b,k.specialChar)}if("<"===c&&a.match(/(\w+)[^>]+>[^<]+<\/\1>/))return g(b,k.html);if("?"===c&&a.eat("?"))return d(a,b,"cite",/\?\?/,2);if("="===c&&a.eat("="))return d(a,b,"notextile",/==/,2);if("-"===c&&!a.eat("-"))return d(a,b,"deletion",/-/,1);if("+"===c)return d(a,b,"addition",/\+/,1);if("~"===c)return d(a,b,"sub",/~/,1);if("^"===c)return d(a,b,"sup",/\^/,1);if("%"===c)return d(a,b,"span",/%/,1);if("@"===c)return d(a,b,"code",/@/,1);if("!"===c){var h=d(a,b,"image",/(?:\([^\)]+\))?!/,1);return a.match(/^:\S+/),h}return e(b)}function d(a,b,c,d,f){var g=a.pos>f?a.string.charAt(a.pos-f-1):null,h=a.peek();if(b[c]){if((!h||/\W/.test(h))&&g&&/\S/.test(g)){var i=e(b);return b[c]=!1,i}}else(!g||/\W/.test(g))&&h&&/\S/.test(h)&&a.match(new RegExp("^.*\\S"+d.source+"(?:\\W|$)"),!1)&&(b[c]=!0,b.mode=m.attributes);return e(b)}function e(a){var b=f(a);if(b)return b;var c=[];return a.layoutType&&c.push(k[a.layoutType]),c=c.concat(h(a,"addition","bold","cite","code","deletion","em","footCite","image","italic","link","span","strong","sub","sup","table","tableHeading")),"header"===a.layoutType&&c.push(k.header+"-"+a.header),c.length?c.join(" "):null}function f(a){var b=a.layoutType;switch(b){case"notextile":case"code":case"pre":return k[b];default:return a.notextile?k.notextile+(b?" "+k[b]:""):null}}function g(a,b){var c=f(a);if(c)return c;var d=e(a);return b?d?d+" "+b:b:d}function h(a){for(var b=[],c=1;c<arguments.length;++c)a[arguments[c]]&&b.push(k[arguments[c]]);return b}function i(a){var b=a.spanningLayout,c=a.layoutType;for(var d in a)a.hasOwnProperty(d)&&delete a[d];a.mode=m.newLayout,b&&(a.layoutType=c,a.spanningLayout=!0)}function j(a){return l.cache[a]||(l.cache[a]=l.createRe(a))}var k={addition:"positive",attributes:"attribute",bold:"strong",cite:"keyword",code:"atom",definitionList:"number",deletion:"negative",div:"punctuation",em:"em",footnote:"variable",footCite:"qualifier",header:"header",html:"comment",image:"string",italic:"em",link:"link",linkDefinition:"link",list1:"variable-2",list2:"variable-3",list3:"keyword",notextile:"string-2",pre:"operator",p:"property",quote:"bracket",span:"quote",specialChar:"tag",strong:"strong",sub:"builtin",sup:"builtin",table:"variable-3",tableHeading:"operator"},l={cache:{},single:{bc:"bc",bq:"bq",definitionList:/- .*?:=+/,definitionListEnd:/.*=:\s*$/,div:"div",drawTable:/\|.*\|/,foot:/fn\d+/,header:/h[1-6]/,html:/\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,link:/[^"]+":\S/,linkDefinition:/\[[^\s\]]+\]\S+/,list:/(?:#+|\*+)/,notextile:"notextile",para:"p",pre:"pre",table:"table",tableCellAttributes:/[\/\\]\d+/,tableHeading:/\|_\./,tableText:/[^"_\*\[\(\?\+~\^%@|-]+/,text:/[^!"_=\*\[\(<\?\+~\^%@-]+/},attributes:{align:/(?:<>|<|>|=)/,selector:/\([^\(][^\)]+\)/,lang:/\[[^\[\]]+\]/,pad:/(?:\(+|\)+){1,2}/,css:/\{[^\}]+\}/},createRe:function(a){switch(a){case"drawTable":return l.makeRe("^",l.single.drawTable,"$");case"html":return l.makeRe("^",l.single.html,"(?:",l.single.html,")*","$");case"linkDefinition":return l.makeRe("^",l.single.linkDefinition,"$");case"listLayout":return l.makeRe("^",l.single.list,j("allAttributes"),"*\\s+");case"tableCellAttributes":return l.makeRe("^",l.choiceRe(l.single.tableCellAttributes,j("allAttributes")),"+\\.");case"type":return l.makeRe("^",j("allTypes"));case"typeLayout":return l.makeRe("^",j("allTypes"),j("allAttributes"),"*\\.\\.?","(\\s+|$)");case"attributes":return l.makeRe("^",j("allAttributes"),"+");case"allTypes":return l.choiceRe(l.single.div,l.single.foot,l.single.header,l.single.bc,l.single.bq,l.single.notextile,l.single.pre,l.single.table,l.single.para);case"allAttributes":return l.choiceRe(l.attributes.selector,l.attributes.css,l.attributes.lang,l.attributes.align,l.attributes.pad);default:return l.makeRe("^",l.single[a])}},makeRe:function(){for(var a="",b=0;b<arguments.length;++b){var c=arguments[b];a+="string"==typeof c?c:c.source}return new RegExp(a)},choiceRe:function(){for(var a=[arguments[0]],b=1;b<arguments.length;++b)a[2*b-1]="|",a[2*b]=arguments[b];return a.unshift("(?:"),a.push(")"),l.makeRe.apply(null,a)}},m={newLayout:function(a,b){if(a.match(j("typeLayout"),!1))return b.spanningLayout=!1,(b.mode=m.blockType)(a,b);var c;return f(b)||(a.match(j("listLayout"),!1)?c=m.list:a.match(j("drawTable"),!1)?c=m.table:a.match(j("linkDefinition"),!1)?c=m.linkDefinition:a.match(j("definitionList"))?c=m.definitionList:a.match(j("html"),!1)&&(c=m.html)),(b.mode=c||m.text)(a,b)},blockType:function(a,b){var c,d;return b.layoutType=null,(c=a.match(j("type")))?(d=c[0],(c=d.match(j("header")))?(b.layoutType="header",b.header=parseInt(c[0][1])):d.match(j("bq"))?b.layoutType="quote":d.match(j("bc"))?b.layoutType="code":d.match(j("foot"))?b.layoutType="footnote":d.match(j("notextile"))?b.layoutType="notextile":d.match(j("pre"))?b.layoutType="pre":d.match(j("div"))?b.layoutType="div":d.match(j("table"))&&(b.layoutType="table"),b.mode=m.attributes,e(b)):(b.mode=m.text)(a,b)},text:function(a,b){if(a.match(j("text")))return e(b);var d=a.next();return'"'===d?(b.mode=m.link)(a,b):c(a,b,d)},attributes:function(a,b){return b.mode=m.layoutLength,a.match(j("attributes"))?g(b,k.attributes):e(b)},layoutLength:function(a,b){return a.eat(".")&&a.eat(".")&&(b.spanningLayout=!0),b.mode=m.text,e(b)},list:function(a,b){var c=a.match(j("list"));b.listDepth=c[0].length;var d=(b.listDepth-1)%3;return d?1===d?b.layoutType="list2":b.layoutType="list3":b.layoutType="list1",b.mode=m.attributes,e(b)},link:function(a,b){return b.mode=m.text,a.match(j("link"))?(a.match(/\S+/),g(b,k.link)):e(b)},linkDefinition:function(a,b){return a.skipToEnd(),g(b,k.linkDefinition)},definitionList:function(a,b){return a.match(j("definitionList")),b.layoutType="definitionList",a.match(/\s*$/)?b.spanningLayout=!0:b.mode=m.attributes,e(b)},html:function(a,b){return a.skipToEnd(),g(b,k.html)},table:function(a,b){return b.layoutType="table",(b.mode=m.tableCell)(a,b)},tableCell:function(a,b){return a.match(j("tableHeading"))?b.tableHeading=!0:a.eat("|"),b.mode=m.tableCellAttributes,e(b)},tableCellAttributes:function(a,b){return b.mode=m.tableText,a.match(j("tableCellAttributes"))?g(b,k.attributes):e(b)},tableText:function(a,b){return a.match(j("tableText"))?e(b):"|"===a.peek()?(b.mode=m.tableCell,e(b)):c(a,b,a.next())}};a.defineMode("textile",(function(){return{startState:function(){return{mode:m.newLayout}},token:function(a,c){return a.sol()&&b(a,c),c.mode(a,c)},blankLine:i}})),a.defineMIME("text/x-textile","textile")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.css b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.css
new file mode 100644
index 00000000..9a69b639
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.css
@@ -0,0 +1,14 @@
+span.cm-underlined {
+  text-decoration: underline;
+}
+span.cm-strikethrough {
+  text-decoration: line-through;
+}
+span.cm-brace {
+  color: #170;
+  font-weight: bold;
+}
+span.cm-table {
+  color: blue;
+  font-weight: bold;
+}
diff --git a/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.js b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.js
new file mode 100644
index 00000000..1a3b3bc6
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.js
@@ -0,0 +1,308 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/***
+    |''Name''|tiddlywiki.js|
+    |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
+    |''Author''|PMario|
+    |''Version''|0.1.7|
+    |''Status''|''stable''|
+    |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
+    |''Documentation''|http://codemirror.tiddlyspace.com/|
+    |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
+    |''CoreVersion''|2.5.0|
+    |''Requires''|codemirror.js|
+    |''Keywords''|syntax highlighting color code mirror codemirror|
+    ! Info
+    CoreVersion parameter is needed for TiddlyWiki only!
+***/
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("tiddlywiki", function () {
+  // Tokenizer
+  var textwords = {};
+
+  var keywords = {
+    "allTags": true, "closeAll": true, "list": true,
+    "newJournal": true, "newTiddler": true,
+    "permaview": true, "saveChanges": true,
+    "search": true, "slider": true, "tabs": true,
+    "tag": true, "tagging": true, "tags": true,
+    "tiddler": true, "timeline": true,
+    "today": true, "version": true, "option": true,
+    "with": true, "filter": true
+  };
+
+  var isSpaceName = /[\w_\-]/i,
+      reHR = /^\-\-\-\-+$/,                                 // <hr>
+      reWikiCommentStart = /^\/\*\*\*$/,            // /***
+      reWikiCommentStop = /^\*\*\*\/$/,             // ***/
+      reBlockQuote = /^<<<$/,
+
+      reJsCodeStart = /^\/\/\{\{\{$/,                       // //{{{ js block start
+      reJsCodeStop = /^\/\/\}\}\}$/,                        // //}}} js stop
+      reXmlCodeStart = /^<!--\{\{\{-->$/,           // xml block start
+      reXmlCodeStop = /^<!--\}\}\}-->$/,            // xml stop
+
+      reCodeBlockStart = /^\{\{\{$/,                        // {{{ TW text div block start
+      reCodeBlockStop = /^\}\}\}$/,                 // }}} TW text stop
+
+      reUntilCodeStop = /.*?\}\}\}/;
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    var sol = stream.sol(), ch = stream.peek();
+
+    state.block = false;        // indicates the start of a code block.
+
+    // check start of  blocks
+    if (sol && /[<\/\*{}\-]/.test(ch)) {
+      if (stream.match(reCodeBlockStart)) {
+        state.block = true;
+        return chain(stream, state, twTokenCode);
+      }
+      if (stream.match(reBlockQuote))
+        return 'quote';
+      if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop))
+        return 'comment';
+      if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop))
+        return 'comment';
+      if (stream.match(reHR))
+        return 'hr';
+    }
+
+    stream.next();
+    if (sol && /[\/\*!#;:>|]/.test(ch)) {
+      if (ch == "!") { // tw header
+        stream.skipToEnd();
+        return "header";
+      }
+      if (ch == "*") { // tw list
+        stream.eatWhile('*');
+        return "comment";
+      }
+      if (ch == "#") { // tw numbered list
+        stream.eatWhile('#');
+        return "comment";
+      }
+      if (ch == ";") { // definition list, term
+        stream.eatWhile(';');
+        return "comment";
+      }
+      if (ch == ":") { // definition list, description
+        stream.eatWhile(':');
+        return "comment";
+      }
+      if (ch == ">") { // single line quote
+        stream.eatWhile(">");
+        return "quote";
+      }
+      if (ch == '|')
+        return 'header';
+    }
+
+    if (ch == '{' && stream.match(/\{\{/))
+      return chain(stream, state, twTokenCode);
+
+    // rudimentary html:// file:// link matching. TW knows much more ...
+    if (/[hf]/i.test(ch) &&
+        /[ti]/i.test(stream.peek()) &&
+        stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i))
+      return "link";
+
+    // just a little string indicator, don't want to have the whole string covered
+    if (ch == '"')
+      return 'string';
+
+    if (ch == '~')    // _no_ CamelCase indicator should be bold
+      return 'brace';
+
+    if (/[\[\]]/.test(ch) && stream.match(ch)) // check for [[..]]
+      return 'brace';
+
+    if (ch == "@") {    // check for space link. TODO fix @@...@@ highlighting
+      stream.eatWhile(isSpaceName);
+      return "link";
+    }
+
+    if (/\d/.test(ch)) {        // numbers
+      stream.eatWhile(/\d/);
+      return "number";
+    }
+
+    if (ch == "/") { // tw invisible comment
+      if (stream.eat("%")) {
+        return chain(stream, state, twTokenComment);
+      } else if (stream.eat("/")) { //
+        return chain(stream, state, twTokenEm);
+      }
+    }
+
+    if (ch == "_" && stream.eat("_")) // tw underline
+        return chain(stream, state, twTokenUnderline);
+
+    // strikethrough and mdash handling
+    if (ch == "-" && stream.eat("-")) {
+      // if strikethrough looks ugly, change CSS.
+      if (stream.peek() != ' ')
+        return chain(stream, state, twTokenStrike);
+      // mdash
+      if (stream.peek() == ' ')
+        return 'brace';
+    }
+
+    if (ch == "'" && stream.eat("'")) // tw bold
+      return chain(stream, state, twTokenStrong);
+
+    if (ch == "<" && stream.eat("<")) // tw macro
+      return chain(stream, state, twTokenMacro);
+
+    // core macro handling
+    stream.eatWhile(/[\w\$_]/);
+    return textwords.propertyIsEnumerable(stream.current()) ? "keyword" : null
+  }
+
+  // tw invisible comment
+  function twTokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "%");
+    }
+    return "comment";
+  }
+
+  // tw strong / bold
+  function twTokenStrong(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "'" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "'");
+    }
+    return "strong";
+  }
+
+  // tw code
+  function twTokenCode(stream, state) {
+    var sb = state.block;
+
+    if (sb && stream.current()) {
+      return "comment";
+    }
+
+    if (!sb && stream.match(reUntilCodeStop)) {
+      state.tokenize = tokenBase;
+      return "comment";
+    }
+
+    if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
+      state.tokenize = tokenBase;
+      return "comment";
+    }
+
+    stream.next();
+    return "comment";
+  }
+
+  // tw em / italic
+  function twTokenEm(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "/");
+    }
+    return "em";
+  }
+
+  // tw underlined text
+  function twTokenUnderline(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "_" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "_");
+    }
+    return "underlined";
+  }
+
+  // tw strike through text looks ugly
+  // change CSS if needed
+  function twTokenStrike(stream, state) {
+    var maybeEnd = false, ch;
+
+    while (ch = stream.next()) {
+      if (ch == "-" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "-");
+    }
+    return "strikethrough";
+  }
+
+  // macro
+  function twTokenMacro(stream, state) {
+    if (stream.current() == '<<') {
+      return 'macro';
+    }
+
+    var ch = stream.next();
+    if (!ch) {
+      state.tokenize = tokenBase;
+      return null;
+    }
+    if (ch == ">") {
+      if (stream.peek() == '>') {
+        stream.next();
+        state.tokenize = tokenBase;
+        return "macro";
+      }
+    }
+
+    stream.eatWhile(/[\w\$_]/);
+    return keywords.propertyIsEnumerable(stream.current()) ? "keyword" : null
+  }
+
+  // Interface
+  return {
+    startState: function () {
+      return {tokenize: tokenBase};
+    },
+
+    token: function (stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
+});
diff --git a/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.css b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.css
new file mode 100644
index 00000000..0311c955
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.css
@@ -0,0 +1 @@
+span.cm-underlined{text-decoration:underline}span.cm-strikethrough{text-decoration:line-through}span.cm-brace{color:#170;font-weight:700}span.cm-table{color:#00f;font-weight:700}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.js b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.js
new file mode 100644
index 00000000..7f250140
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiddlywiki/tiddlywiki.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("tiddlywiki",(function(){function a(a,b,c){return b.tokenize=c,c(a,b)}function b(b,k){var v=b.sol(),w=b.peek();if(k.block=!1,v&&/[<\/\*{}\-]/.test(w)){if(b.match(u))return k.block=!0,a(b,k,e);if(b.match(p))return"quote";if(b.match(n)||b.match(o))return"comment";if(b.match(q)||b.match(r)||b.match(s)||b.match(t))return"comment";if(b.match(m))return"hr"}if(b.next(),v&&/[\/\*!#;:>|]/.test(w)){if("!"==w)return b.skipToEnd(),"header";if("*"==w)return b.eatWhile("*"),"comment";if("#"==w)return b.eatWhile("#"),"comment";if(";"==w)return b.eatWhile(";"),"comment";if(":"==w)return b.eatWhile(":"),"comment";if(">"==w)return b.eatWhile(">"),"quote";if("|"==w)return"header"}if("{"==w&&b.match(/\{\{/))return a(b,k,e);if(/[hf]/i.test(w)&&/[ti]/i.test(b.peek())&&b.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i))return"link";if('"'==w)return"string";if("~"==w)return"brace";if(/[\[\]]/.test(w)&&b.match(w))return"brace";if("@"==w)return b.eatWhile(l),"link";if(/\d/.test(w))return b.eatWhile(/\d/),"number";if("/"==w){if(b.eat("%"))return a(b,k,c);if(b.eat("/"))return a(b,k,f)}if("_"==w&&b.eat("_"))return a(b,k,g);if("-"==w&&b.eat("-")){if(" "!=b.peek())return a(b,k,h);if(" "==b.peek())return"brace"}return"'"==w&&b.eat("'")?a(b,k,d):"<"==w&&b.eat("<")?a(b,k,i):(b.eatWhile(/[\w\$_]/),j.propertyIsEnumerable(b.current())?"keyword":null)}function c(a,c){for(var d,e=!1;d=a.next();){if("/"==d&&e){c.tokenize=b;break}e="%"==d}return"comment"}function d(a,c){for(var d,e=!1;d=a.next();){if("'"==d&&e){c.tokenize=b;break}e="'"==d}return"strong"}function e(a,c){var d=c.block;return d&&a.current()?"comment":!d&&a.match(w)?(c.tokenize=b,"comment"):d&&a.sol()&&a.match(v)?(c.tokenize=b,"comment"):(a.next(),"comment")}function f(a,c){for(var d,e=!1;d=a.next();){if("/"==d&&e){c.tokenize=b;break}e="/"==d}return"em"}function g(a,c){for(var d,e=!1;d=a.next();){if("_"==d&&e){c.tokenize=b;break}e="_"==d}return"underlined"}function h(a,c){for(var d,e=!1;d=a.next();){if("-"==d&&e){c.tokenize=b;break}e="-"==d}return"strikethrough"}function i(a,c){if("<<"==a.current())return"macro";var d=a.next();return d?">"==d&&">"==a.peek()?(a.next(),c.tokenize=b,"macro"):(a.eatWhile(/[\w\$_]/),k.propertyIsEnumerable(a.current())?"keyword":null):(c.tokenize=b,null)}var j={},k={allTags:!0,closeAll:!0,list:!0,newJournal:!0,newTiddler:!0,permaview:!0,saveChanges:!0,search:!0,slider:!0,tabs:!0,tag:!0,tagging:!0,tags:!0,tiddler:!0,timeline:!0,today:!0,version:!0,option:!0,with:!0,filter:!0},l=/[\w_\-]/i,m=/^\-\-\-\-+$/,n=/^\/\*\*\*$/,o=/^\*\*\*\/$/,p=/^<<<$/,q=/^\/\/\{\{\{$/,r=/^\/\/\}\}\}$/,s=/^<!--\{\{\{-->$/,t=/^<!--\}\}\}-->$/,u=/^\{\{\{$/,v=/^\}\}\}$/,w=/.*?\}\}\}/;return{startState:function(){return{tokenize:b}},token:function(a,b){if(a.eatSpace())return null;var c=b.tokenize(a,b);return c}}})),a.defineMIME("text/x-tiddlywiki","tiddlywiki")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tiki/tiki.css b/core/media/editors/codemirror/mode/tiki/tiki.css
new file mode 100644
index 00000000..1d8704c7
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiki/tiki.css
@@ -0,0 +1,26 @@
+.cm-tw-syntaxerror {
+	color: #FFF;
+	background-color: #900;
+}
+
+.cm-tw-deleted {
+	text-decoration: line-through;
+}
+
+.cm-tw-header5 {
+	font-weight: bold;
+}
+.cm-tw-listitem:first-child { /*Added first child to fix duplicate padding when highlighting*/
+	padding-left: 10px;
+}
+
+.cm-tw-box {
+	border-top-width: 0px !important;
+	border-style: solid;
+	border-width: 1px;
+	border-color: inherit;
+}
+
+.cm-tw-underline {
+	text-decoration: underline;
+}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tiki/tiki.js b/core/media/editors/codemirror/mode/tiki/tiki.js
new file mode 100644
index 00000000..b4794e43
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiki/tiki.js
@@ -0,0 +1,312 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('tiki', function(config) {
+  function inBlock(style, terminator, returnTokenizer) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.match(terminator)) {
+          state.tokenize = inText;
+          break;
+        }
+        stream.next();
+      }
+
+      if (returnTokenizer) state.tokenize = returnTokenizer;
+
+      return style;
+    };
+  }
+
+  function inLine(style) {
+    return function(stream, state) {
+      while(!stream.eol()) {
+        stream.next();
+      }
+      state.tokenize = inText;
+      return style;
+    };
+  }
+
+  function inText(stream, state) {
+    function chain(parser) {
+      state.tokenize = parser;
+      return parser(stream, state);
+    }
+
+    var sol = stream.sol();
+    var ch = stream.next();
+
+    //non start of line
+    switch (ch) { //switch is generally much faster than if, so it is used here
+    case "{": //plugin
+      stream.eat("/");
+      stream.eatSpace();
+      stream.eatWhile(/[^\s\u00a0=\"\'\/?(}]/);
+      state.tokenize = inPlugin;
+      return "tag";
+    case "_": //bold
+      if (stream.eat("_"))
+        return chain(inBlock("strong", "__", inText));
+      break;
+    case "'": //italics
+      if (stream.eat("'"))
+        return chain(inBlock("em", "''", inText));
+      break;
+    case "(":// Wiki Link
+      if (stream.eat("("))
+        return chain(inBlock("variable-2", "))", inText));
+      break;
+    case "[":// Weblink
+      return chain(inBlock("variable-3", "]", inText));
+      break;
+    case "|": //table
+      if (stream.eat("|"))
+        return chain(inBlock("comment", "||"));
+      break;
+    case "-":
+      if (stream.eat("=")) {//titleBar
+        return chain(inBlock("header string", "=-", inText));
+      } else if (stream.eat("-")) {//deleted
+        return chain(inBlock("error tw-deleted", "--", inText));
+      }
+      break;
+    case "=": //underline
+      if (stream.match("=="))
+        return chain(inBlock("tw-underline", "===", inText));
+      break;
+    case ":":
+      if (stream.eat(":"))
+        return chain(inBlock("comment", "::"));
+      break;
+    case "^": //box
+      return chain(inBlock("tw-box", "^"));
+      break;
+    case "~": //np
+      if (stream.match("np~"))
+        return chain(inBlock("meta", "~/np~"));
+      break;
+    }
+
+    //start of line types
+    if (sol) {
+      switch (ch) {
+      case "!": //header at start of line
+        if (stream.match('!!!!!')) {
+          return chain(inLine("header string"));
+        } else if (stream.match('!!!!')) {
+          return chain(inLine("header string"));
+        } else if (stream.match('!!!')) {
+          return chain(inLine("header string"));
+        } else if (stream.match('!!')) {
+          return chain(inLine("header string"));
+        } else {
+          return chain(inLine("header string"));
+        }
+        break;
+      case "*": //unordered list line item, or <li /> at start of line
+      case "#": //ordered list line item, or <li /> at start of line
+      case "+": //ordered list line item, or <li /> at start of line
+        return chain(inLine("tw-listitem bracket"));
+        break;
+      }
+    }
+
+    //stream.eatWhile(/[&{]/); was eating up plugins, turned off to act less like html and more like tiki
+    return null;
+  }
+
+  var indentUnit = config.indentUnit;
+
+  // Return variables for tokenizers
+  var pluginName, type;
+  function inPlugin(stream, state) {
+    var ch = stream.next();
+    var peek = stream.peek();
+
+    if (ch == "}") {
+      state.tokenize = inText;
+      //type = ch == ")" ? "endPlugin" : "selfclosePlugin"; inPlugin
+      return "tag";
+    } else if (ch == "(" || ch == ")") {
+      return "bracket";
+    } else if (ch == "=") {
+      type = "equals";
+
+      if (peek == ">") {
+        stream.next();
+        peek = stream.peek();
+      }
+
+      //here we detect values directly after equal character with no quotes
+      if (!/[\'\"]/.test(peek)) {
+        state.tokenize = inAttributeNoQuote();
+      }
+      //end detect values
+
+      return "operator";
+    } else if (/[\'\"]/.test(ch)) {
+      state.tokenize = inAttribute(ch);
+      return state.tokenize(stream, state);
+    } else {
+      stream.eatWhile(/[^\s\u00a0=\"\'\/?]/);
+      return "keyword";
+    }
+  }
+
+  function inAttribute(quote) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.next() == quote) {
+          state.tokenize = inPlugin;
+          break;
+        }
+      }
+      return "string";
+    };
+  }
+
+  function inAttributeNoQuote() {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        var ch = stream.next();
+        var peek = stream.peek();
+        if (ch == " " || ch == "," || /[ )}]/.test(peek)) {
+      state.tokenize = inPlugin;
+      break;
+    }
+  }
+  return "string";
+};
+                     }
+
+var curState, setStyle;
+function pass() {
+  for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]);
+}
+
+function cont() {
+  pass.apply(null, arguments);
+  return true;
+}
+
+function pushContext(pluginName, startOfLine) {
+  var noIndent = curState.context && curState.context.noIndent;
+  curState.context = {
+    prev: curState.context,
+    pluginName: pluginName,
+    indent: curState.indented,
+    startOfLine: startOfLine,
+    noIndent: noIndent
+  };
+}
+
+function popContext() {
+  if (curState.context) curState.context = curState.context.prev;
+}
+
+function element(type) {
+  if (type == "openPlugin") {curState.pluginName = pluginName; return cont(attributes, endplugin(curState.startOfLine));}
+  else if (type == "closePlugin") {
+    var err = false;
+    if (curState.context) {
+      err = curState.context.pluginName != pluginName;
+      popContext();
+    } else {
+      err = true;
+    }
+    if (err) setStyle = "error";
+    return cont(endcloseplugin(err));
+  }
+  else if (type == "string") {
+    if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata");
+    if (curState.tokenize == inText) popContext();
+    return cont();
+  }
+  else return cont();
+}
+
+function endplugin(startOfLine) {
+  return function(type) {
+    if (
+      type == "selfclosePlugin" ||
+        type == "endPlugin"
+    )
+      return cont();
+    if (type == "endPlugin") {pushContext(curState.pluginName, startOfLine); return cont();}
+    return cont();
+  };
+}
+
+function endcloseplugin(err) {
+  return function(type) {
+    if (err) setStyle = "error";
+    if (type == "endPlugin") return cont();
+    return pass();
+  };
+}
+
+function attributes(type) {
+  if (type == "keyword") {setStyle = "attribute"; return cont(attributes);}
+  if (type == "equals") return cont(attvalue, attributes);
+  return pass();
+}
+function attvalue(type) {
+  if (type == "keyword") {setStyle = "string"; return cont();}
+  if (type == "string") return cont(attvaluemaybe);
+  return pass();
+}
+function attvaluemaybe(type) {
+  if (type == "string") return cont(attvaluemaybe);
+  else return pass();
+}
+return {
+  startState: function() {
+    return {tokenize: inText, cc: [], indented: 0, startOfLine: true, pluginName: null, context: null};
+  },
+  token: function(stream, state) {
+    if (stream.sol()) {
+      state.startOfLine = true;
+      state.indented = stream.indentation();
+    }
+    if (stream.eatSpace()) return null;
+
+    setStyle = type = pluginName = null;
+    var style = state.tokenize(stream, state);
+    if ((style || type) && style != "comment") {
+      curState = state;
+      while (true) {
+        var comb = state.cc.pop() || element;
+        if (comb(type || style)) break;
+      }
+    }
+    state.startOfLine = false;
+    return setStyle || style;
+  },
+  indent: function(state, textAfter) {
+    var context = state.context;
+    if (context && context.noIndent) return 0;
+    if (context && /^{\//.test(textAfter))
+        context = context.prev;
+    while (context && !context.startOfLine)
+        context = context.prev;
+    if (context) return context.indent + indentUnit;
+    else return 0;
+  },
+  electricChars: "/"
+};
+});
+
+CodeMirror.defineMIME("text/tiki", "tiki");
+
+});
diff --git a/core/media/editors/codemirror/mode/tiki/tiki.min.css b/core/media/editors/codemirror/mode/tiki/tiki.min.css
new file mode 100644
index 00000000..fdd7f4ac
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiki/tiki.min.css
@@ -0,0 +1 @@
+.cm-tw-syntaxerror{color:#FFF;background-color:#900}.cm-tw-deleted{text-decoration:line-through}.cm-tw-header5{font-weight:700}.cm-tw-listitem:first-child{padding-left:10px}.cm-tw-box{border-top-width:0!important;border-style:solid;border-width:1px;border-color:inherit}.cm-tw-underline{text-decoration:underline}
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tiki/tiki.min.js b/core/media/editors/codemirror/mode/tiki/tiki.min.js
new file mode 100644
index 00000000..c613d529
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tiki/tiki.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("tiki",(function(a){function b(a,b,c){return function(e,f){for(;!e.eol();){if(e.match(b)){f.tokenize=d;break}e.next()}return c&&(f.tokenize=c),a}}function c(a){return function(b,c){for(;!b.eol();)b.next();return c.tokenize=d,a}}function d(a,f){function g(b){return f.tokenize=b,b(a,f)}var h=a.sol(),i=a.next();switch(i){case"{":return a.eat("/"),a.eatSpace(),a.eatWhile(/[^\s\u00a0=\"\'\/?(}]/),f.tokenize=e,"tag";case"_":if(a.eat("_"))return g(b("strong","__",d));break;case"'":if(a.eat("'"))return g(b("em","''",d));break;case"(":if(a.eat("("))return g(b("variable-2","))",d));break;case"[":return g(b("variable-3","]",d));case"|":if(a.eat("|"))return g(b("comment","||"));break;case"-":if(a.eat("="))return g(b("header string","=-",d));if(a.eat("-"))return g(b("error tw-deleted","--",d));break;case"=":if(a.match("=="))return g(b("tw-underline","===",d));break;case":":if(a.eat(":"))return g(b("comment","::"));break;case"^":return g(b("tw-box","^"));case"~":if(a.match("np~"))return g(b("meta","~/np~"))}if(h)switch(i){case"!":return g(a.match("!!!!!")?c("header string"):a.match("!!!!")?c("header string"):a.match("!!!")?c("header string"):a.match("!!")?c("header string"):c("header string"));case"*":case"#":case"+":return g(c("tw-listitem bracket"))}return null}function e(a,b){var c=a.next(),e=a.peek();return"}"==c?(b.tokenize=d,"tag"):"("==c||")"==c?"bracket":"="==c?(s="equals",">"==e&&(a.next(),e=a.peek()),/[\'\"]/.test(e)||(b.tokenize=g()),"operator"):/[\'\"]/.test(c)?(b.tokenize=f(c),b.tokenize(a,b)):(a.eatWhile(/[^\s\u00a0=\"\'\/?]/),"keyword")}function f(a){return function(b,c){for(;!b.eol();)if(b.next()==a){c.tokenize=e;break}return"string"}}function g(){return function(a,b){for(;!a.eol();){var c=a.next(),d=a.peek();if(" "==c||","==c||/[ )}]/.test(d)){b.tokenize=e;break}}return"string"}}function h(){for(var a=arguments.length-1;a>=0;a--)t.cc.push(arguments[a])}function i(){return h.apply(null,arguments),!0}function j(a,b){var c=t.context&&t.context.noIndent;t.context={prev:t.context,pluginName:a,indent:t.indented,startOfLine:b,noIndent:c}}function k(){t.context&&(t.context=t.context.prev)}function l(a){if("openPlugin"==a)return t.pluginName=r,i(o,m(t.startOfLine));if("closePlugin"==a){var b=!1;return t.context?(b=t.context.pluginName!=r,k()):b=!0,b&&(u="error"),i(n(b))}return"string"==a?(t.context&&"!cdata"==t.context.name||j("!cdata"),t.tokenize==d&&k(),i()):i()}function m(a){return function(b){return"selfclosePlugin"==b||"endPlugin"==b?i():"endPlugin"==b?(j(t.pluginName,a),i()):i()}}function n(a){return function(b){return a&&(u="error"),"endPlugin"==b?i():h()}}function o(a){return"keyword"==a?(u="attribute",i(o)):"equals"==a?i(p,o):h()}function p(a){return"keyword"==a?(u="string",i()):"string"==a?i(q):h()}function q(a){return"string"==a?i(q):h()}var r,s,t,u,v=a.indentUnit;return{startState:function(){return{tokenize:d,cc:[],indented:0,startOfLine:!0,pluginName:null,context:null}},token:function(a,b){if(a.sol()&&(b.startOfLine=!0,b.indented=a.indentation()),a.eatSpace())return null;u=s=r=null;var c=b.tokenize(a,b);if((c||s)&&"comment"!=c)for(t=b;;){var d=b.cc.pop()||l;if(d(s||c))break}return b.startOfLine=!1,u||c},indent:function(a,b){var c=a.context;if(c&&c.noIndent)return 0;for(c&&/^{\//.test(b)&&(c=c.prev);c&&!c.startOfLine;)c=c.prev;return c?c.indent+v:0},electricChars:"/"}})),a.defineMIME("text/tiki","tiki")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/toml/toml.js b/core/media/editors/codemirror/mode/toml/toml.js
new file mode 100644
index 00000000..baeca155
--- /dev/null
+++ b/core/media/editors/codemirror/mode/toml/toml.js
@@ -0,0 +1,88 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("toml", function () {
+  return {
+    startState: function () {
+      return {
+        inString: false,
+        stringType: "",
+        lhs: true,
+        inArray: 0
+      };
+    },
+    token: function (stream, state) {
+      //check for state changes
+      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+        state.stringType = stream.peek();
+        stream.next(); // Skip quote
+        state.inString = true; // Update state
+      }
+      if (stream.sol() && state.inArray === 0) {
+        state.lhs = true;
+      }
+      //return state
+      if (state.inString) {
+        while (state.inString && !stream.eol()) {
+          if (stream.peek() === state.stringType) {
+            stream.next(); // Skip quote
+            state.inString = false; // Clear flag
+          } else if (stream.peek() === '\\') {
+            stream.next();
+            stream.next();
+          } else {
+            stream.match(/^.[^\\\"\']*/);
+          }
+        }
+        return state.lhs ? "property string" : "string"; // Token style
+      } else if (state.inArray && stream.peek() === ']') {
+        stream.next();
+        state.inArray--;
+        return 'bracket';
+      } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
+        stream.next();//skip closing ]
+        // array of objects has an extra open & close []
+        if (stream.peek() === ']') stream.next();
+        return "atom";
+      } else if (stream.peek() === "#") {
+        stream.skipToEnd();
+        return "comment";
+      } else if (stream.eatSpace()) {
+        return null;
+      } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) {
+        return "property";
+      } else if (state.lhs && stream.peek() === "=") {
+        stream.next();
+        state.lhs = false;
+        return null;
+      } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) {
+        return 'atom'; //date
+      } else if (!state.lhs && (stream.match('true') || stream.match('false'))) {
+        return 'atom';
+      } else if (!state.lhs && stream.peek() === '[') {
+        state.inArray++;
+        stream.next();
+        return 'bracket';
+      } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) {
+        return 'number';
+      } else if (!stream.eatSpace()) {
+        stream.next();
+      }
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-toml', 'toml');
+
+});
diff --git a/core/media/editors/codemirror/mode/toml/toml.min.js b/core/media/editors/codemirror/mode/toml/toml.min.js
new file mode 100644
index 00000000..6f2519a4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/toml/toml.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("toml",(function(){return{startState:function(){return{inString:!1,stringType:"",lhs:!0,inArray:0}},token:function(a,b){if(b.inString||'"'!=a.peek()&&"'"!=a.peek()||(b.stringType=a.peek(),a.next(),b.inString=!0),a.sol()&&0===b.inArray&&(b.lhs=!0),b.inString){for(;b.inString&&!a.eol();)a.peek()===b.stringType?(a.next(),b.inString=!1):"\\"===a.peek()?(a.next(),a.next()):a.match(/^.[^\\\"\']*/);return b.lhs?"property string":"string"}return b.inArray&&"]"===a.peek()?(a.next(),b.inArray--,"bracket"):b.lhs&&"["===a.peek()&&a.skipTo("]")?(a.next(),"]"===a.peek()&&a.next(),"atom"):"#"===a.peek()?(a.skipToEnd(),"comment"):a.eatSpace()?null:b.lhs&&a.eatWhile((function(a){return"="!=a&&" "!=a}))?"property":b.lhs&&"="===a.peek()?(a.next(),b.lhs=!1,null):!b.lhs&&a.match(/^\d\d\d\d[\d\-\:\.T]*Z/)?"atom":b.lhs||!a.match("true")&&!a.match("false")?b.lhs||"["!==a.peek()?!b.lhs&&a.match(/^\-?\d+(?:\.\d+)?/)?"number":(a.eatSpace()||a.next(),null):(b.inArray++,a.next(),"bracket"):"atom"}}})),a.defineMIME("text/x-toml","toml")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/tornado/tornado.js b/core/media/editors/codemirror/mode/tornado/tornado.js
new file mode 100644
index 00000000..dbfbc348
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tornado/tornado.js
@@ -0,0 +1,68 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("tornado:inner", function() {
+    var keywords = ["and","as","assert","autoescape","block","break","class","comment","context",
+                    "continue","datetime","def","del","elif","else","end","escape","except",
+                    "exec","extends","false","finally","for","from","global","if","import","in",
+                    "include","is","json_encode","lambda","length","linkify","load","module",
+                    "none","not","or","pass","print","put","raise","raw","return","self","set",
+                    "squeeze","super","true","try","url_escape","while","with","without","xhtml_escape","yield"];
+    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      stream.eatWhile(/[^\{]/);
+      var ch = stream.next();
+      if (ch == "{") {
+        if (ch = stream.eat(/\{|%|#/)) {
+          state.tokenize = inTag(ch);
+          return "tag";
+        }
+      }
+    }
+    function inTag (close) {
+      if (close == "{") {
+        close = "}";
+      }
+      return function (stream, state) {
+        var ch = stream.next();
+        if ((ch == close) && stream.eat("}")) {
+          state.tokenize = tokenBase;
+          return "tag";
+        }
+        if (stream.match(keywords)) {
+          return "keyword";
+        }
+        return close == "#" ? "comment" : "string";
+      };
+    }
+    return {
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
+    };
+  });
+
+  CodeMirror.defineMode("tornado", function(config) {
+    var htmlBase = CodeMirror.getMode(config, "text/html");
+    var tornadoInner = CodeMirror.getMode(config, "tornado:inner");
+    return CodeMirror.overlayMode(htmlBase, tornadoInner);
+  });
+
+  CodeMirror.defineMIME("text/x-tornado", "tornado");
+});
diff --git a/core/media/editors/codemirror/mode/tornado/tornado.min.js b/core/media/editors/codemirror/mode/tornado/tornado.min.js
new file mode 100644
index 00000000..51b1dee7
--- /dev/null
+++ b/core/media/editors/codemirror/mode/tornado/tornado.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../htmlmixed/htmlmixed"),require("../../addon/mode/overlay")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../htmlmixed/htmlmixed","../../addon/mode/overlay"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("tornado:inner",(function(){function a(a,c){a.eatWhile(/[^\{]/);var d=a.next();if("{"==d&&(d=a.eat(/\{|%|#/)))return c.tokenize=b(d),"tag"}function b(b){return"{"==b&&(b="}"),function(d,e){var f=d.next();return f==b&&d.eat("}")?(e.tokenize=a,"tag"):d.match(c)?"keyword":"#"==b?"comment":"string"}}var c=["and","as","assert","autoescape","block","break","class","comment","context","continue","datetime","def","del","elif","else","end","escape","except","exec","extends","false","finally","for","from","global","if","import","in","include","is","json_encode","lambda","length","linkify","load","module","none","not","or","pass","print","put","raise","raw","return","self","set","squeeze","super","true","try","url_escape","while","with","without","xhtml_escape","yield"];return c=new RegExp("^(("+c.join(")|(")+"))\\b"),{startState:function(){return{tokenize:a}},token:function(a,b){return b.tokenize(a,b)}}})),a.defineMode("tornado",(function(b){var c=a.getMode(b,"text/html"),d=a.getMode(b,"tornado:inner");return a.overlayMode(c,d)})),a.defineMIME("text/x-tornado","tornado")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/troff/troff.js b/core/media/editors/codemirror/mode/troff/troff.js
new file mode 100644
index 00000000..86154b6e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/troff/troff.js
@@ -0,0 +1,84 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod);
+  else
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('troff', function() {
+
+  var words = {};
+
+  function tokenBase(stream) {
+    if (stream.eatSpace()) return null;
+
+    var sol = stream.sol();
+    var ch = stream.next();
+
+    if (ch === '\\') {
+      if (stream.match('fB') || stream.match('fR') || stream.match('fI') ||
+          stream.match('u')  || stream.match('d')  ||
+          stream.match('%')  || stream.match('&')) {
+        return 'string';
+      }
+      if (stream.match('m[')) {
+        stream.skipTo(']');
+        stream.next();
+        return 'string';
+      }
+      if (stream.match('s+') || stream.match('s-')) {
+        stream.eatWhile(/[\d-]/);
+        return 'string';
+      }
+      if (stream.match('\(') || stream.match('*\(')) {
+        stream.eatWhile(/[\w-]/);
+        return 'string';
+      }
+      return 'string';
+    }
+    if (sol && (ch === '.' || ch === '\'')) {
+      if (stream.eat('\\') && stream.eat('\"')) {
+        stream.skipToEnd();
+        return 'comment';
+      }
+    }
+    if (sol && ch === '.') {
+      if (stream.match('B ') || stream.match('I ') || stream.match('R ')) {
+        return 'attribute';
+      }
+      if (stream.match('TH ') || stream.match('SH ') || stream.match('SS ') || stream.match('HP ')) {
+        stream.skipToEnd();
+        return 'quote';
+      }
+      if ((stream.match(/[A-Z]/) && stream.match(/[A-Z]/)) || (stream.match(/[a-z]/) && stream.match(/[a-z]/))) {
+        return 'attribute';
+      }
+    }
+    stream.eatWhile(/[\w-]/);
+    var cur = stream.current();
+    return words.hasOwnProperty(cur) ? words[cur] : null;
+  }
+
+  function tokenize(stream, state) {
+    return (state.tokens[0] || tokenBase) (stream, state);
+  };
+
+  return {
+    startState: function() {return {tokens:[]};},
+    token: function(stream, state) {
+      return tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/troff', 'troff');
+CodeMirror.defineMIME('text/x-troff', 'troff');
+CodeMirror.defineMIME('application/x-troff', 'troff');
+
+});
diff --git a/core/media/editors/codemirror/mode/troff/troff.min.js b/core/media/editors/codemirror/mode/troff/troff.min.js
new file mode 100644
index 00000000..29013d45
--- /dev/null
+++ b/core/media/editors/codemirror/mode/troff/troff.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("troff",(function(){function a(a){if(a.eatSpace())return null;var b=a.sol(),d=a.next();if("\\"===d)return a.match("fB")||a.match("fR")||a.match("fI")||a.match("u")||a.match("d")||a.match("%")||a.match("&")?"string":a.match("m[")?(a.skipTo("]"),a.next(),"string"):a.match("s+")||a.match("s-")?(a.eatWhile(/[\d-]/),"string"):a.match("(")||a.match("*(")?(a.eatWhile(/[\w-]/),"string"):"string";if(b&&("."===d||"'"===d)&&a.eat("\\")&&a.eat('"'))return a.skipToEnd(),"comment";if(b&&"."===d){if(a.match("B ")||a.match("I ")||a.match("R "))return"attribute";if(a.match("TH ")||a.match("SH ")||a.match("SS ")||a.match("HP "))return a.skipToEnd(),"quote";if(a.match(/[A-Z]/)&&a.match(/[A-Z]/)||a.match(/[a-z]/)&&a.match(/[a-z]/))return"attribute"}a.eatWhile(/[\w-]/);var e=a.current();return c.hasOwnProperty(e)?c[e]:null}function b(b,c){return(c.tokens[0]||a)(b,c)}var c={};return{startState:function(){return{tokens:[]}},token:function(a,c){return b(a,c)}}})),a.defineMIME("text/troff","troff"),a.defineMIME("text/x-troff","troff"),a.defineMIME("application/x-troff","troff")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.js b/core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.js
new file mode 100644
index 00000000..e1080511
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.js
@@ -0,0 +1,214 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("ttcn-cfg", function(config, parserConfig) {
+    var indentUnit = config.indentUnit,
+        keywords = parserConfig.keywords || {},
+        fileNCtrlMaskOptions = parserConfig.fileNCtrlMaskOptions || {},
+        externalCommands = parserConfig.externalCommands || {},
+        multiLineStrings = parserConfig.multiLineStrings,
+        indentStatements = parserConfig.indentStatements !== false;
+    var isOperatorChar = /[\|]/;
+    var curPunc;
+
+    function tokenBase(stream, state) {
+      var ch = stream.next();
+      if (ch == '"' || ch == "'") {
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      if (/[:=]/.test(ch)) {
+        curPunc = ch;
+        return "punctuation";
+      }
+      if (ch == "#"){
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (isOperatorChar.test(ch)) {
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+      if (ch == "["){
+        stream.eatWhile(/[\w_\]]/);
+        return "number sectionTitle";
+      }
+
+      stream.eatWhile(/[\w\$_]/);
+      var cur = stream.current();
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      if (fileNCtrlMaskOptions.propertyIsEnumerable(cur))
+        return "negative fileNCtrlMaskOptions";
+      if (externalCommands.propertyIsEnumerable(cur)) return "negative externalCommands";
+
+      return "variable";
+    }
+
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, next, end = false;
+        while ((next = stream.next()) != null) {
+          if (next == quote && !escaped){
+            var afterNext = stream.peek();
+            //look if the character if the quote is like the B in '10100010'B
+            if (afterNext){
+              afterNext = afterNext.toLowerCase();
+              if(afterNext == "b" || afterNext == "h" || afterNext == "o")
+                stream.next();
+            }
+            end = true; break;
+          }
+          escaped = !escaped && next == "\\";
+        }
+        if (end || !(escaped || multiLineStrings))
+          state.tokenize = null;
+        return "string";
+      };
+    }
+
+    function Context(indented, column, type, align, prev) {
+      this.indented = indented;
+      this.column = column;
+      this.type = type;
+      this.align = align;
+      this.prev = prev;
+    }
+    function pushContext(state, col, type) {
+      var indent = state.indented;
+      if (state.context && state.context.type == "statement")
+        indent = state.context.indented;
+      return state.context = new Context(indent, col, type, null, state.context);
+    }
+    function popContext(state) {
+      var t = state.context.type;
+      if (t == ")" || t == "]" || t == "}")
+        state.indented = state.context.indented;
+      return state.context = state.context.prev;
+    }
+
+    //Interface
+    return {
+      startState: function(basecolumn) {
+        return {
+          tokenize: null,
+          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+          indented: 0,
+          startOfLine: true
+        };
+      },
+
+      token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+          if (ctx.align == null) ctx.align = false;
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        curPunc = null;
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
+            && ctx.type == "statement"){
+          popContext(state);
+        }
+        else if (curPunc == "{") pushContext(state, stream.column(), "}");
+        else if (curPunc == "[") pushContext(state, stream.column(), "]");
+        else if (curPunc == "(") pushContext(state, stream.column(), ")");
+        else if (curPunc == "}") {
+          while (ctx.type == "statement") ctx = popContext(state);
+          if (ctx.type == "}") ctx = popContext(state);
+          while (ctx.type == "statement") ctx = popContext(state);
+        }
+        else if (curPunc == ctx.type) popContext(state);
+        else if (indentStatements && (((ctx.type == "}" || ctx.type == "top")
+            && curPunc != ';') || (ctx.type == "statement"
+            && curPunc == "newstatement")))
+          pushContext(state, stream.column(), "statement");
+        state.startOfLine = false;
+        return style;
+      },
+
+      electricChars: "{}",
+      lineComment: "#",
+      fold: "brace"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i)
+      obj[words[i]] = true;
+    return obj;
+  }
+
+  CodeMirror.defineMIME("text/x-ttcn-cfg", {
+    name: "ttcn-cfg",
+    keywords: words("Yes No LogFile FileMask ConsoleMask AppendFile" +
+    " TimeStampFormat LogEventTypes SourceInfoFormat" +
+    " LogEntityName LogSourceInfo DiskFullAction" +
+    " LogFileNumber LogFileSize MatchingHints Detailed" +
+    " Compact SubCategories Stack Single None Seconds" +
+    " DateTime Time Stop Error Retry Delete TCPPort KillTimer" +
+    " NumHCs UnixSocketsEnabled LocalAddress"),
+    fileNCtrlMaskOptions: words("TTCN_EXECUTOR TTCN_ERROR TTCN_WARNING" +
+    " TTCN_PORTEVENT TTCN_TIMEROP TTCN_VERDICTOP" +
+    " TTCN_DEFAULTOP TTCN_TESTCASE TTCN_ACTION" +
+    " TTCN_USER TTCN_FUNCTION TTCN_STATISTICS" +
+    " TTCN_PARALLEL TTCN_MATCHING TTCN_DEBUG" +
+    " EXECUTOR ERROR WARNING PORTEVENT TIMEROP" +
+    " VERDICTOP DEFAULTOP TESTCASE ACTION USER" +
+    " FUNCTION STATISTICS PARALLEL MATCHING DEBUG" +
+    " LOG_ALL LOG_NOTHING ACTION_UNQUALIFIED" +
+    " DEBUG_ENCDEC DEBUG_TESTPORT" +
+    " DEBUG_UNQUALIFIED DEFAULTOP_ACTIVATE" +
+    " DEFAULTOP_DEACTIVATE DEFAULTOP_EXIT" +
+    " DEFAULTOP_UNQUALIFIED ERROR_UNQUALIFIED" +
+    " EXECUTOR_COMPONENT EXECUTOR_CONFIGDATA" +
+    " EXECUTOR_EXTCOMMAND EXECUTOR_LOGOPTIONS" +
+    " EXECUTOR_RUNTIME EXECUTOR_UNQUALIFIED" +
+    " FUNCTION_RND FUNCTION_UNQUALIFIED" +
+    " MATCHING_DONE MATCHING_MCSUCCESS" +
+    " MATCHING_MCUNSUCC MATCHING_MMSUCCESS" +
+    " MATCHING_MMUNSUCC MATCHING_PCSUCCESS" +
+    " MATCHING_PCUNSUCC MATCHING_PMSUCCESS" +
+    " MATCHING_PMUNSUCC MATCHING_PROBLEM" +
+    " MATCHING_TIMEOUT MATCHING_UNQUALIFIED" +
+    " PARALLEL_PORTCONN PARALLEL_PORTMAP" +
+    " PARALLEL_PTC PARALLEL_UNQUALIFIED" +
+    " PORTEVENT_DUALRECV PORTEVENT_DUALSEND" +
+    " PORTEVENT_MCRECV PORTEVENT_MCSEND" +
+    " PORTEVENT_MMRECV PORTEVENT_MMSEND" +
+    " PORTEVENT_MQUEUE PORTEVENT_PCIN" +
+    " PORTEVENT_PCOUT PORTEVENT_PMIN" +
+    " PORTEVENT_PMOUT PORTEVENT_PQUEUE" +
+    " PORTEVENT_STATE PORTEVENT_UNQUALIFIED" +
+    " STATISTICS_UNQUALIFIED STATISTICS_VERDICT" +
+    " TESTCASE_FINISH TESTCASE_START" +
+    " TESTCASE_UNQUALIFIED TIMEROP_GUARD" +
+    " TIMEROP_READ TIMEROP_START TIMEROP_STOP" +
+    " TIMEROP_TIMEOUT TIMEROP_UNQUALIFIED" +
+    " USER_UNQUALIFIED VERDICTOP_FINAL" +
+    " VERDICTOP_GETVERDICT VERDICTOP_SETVERDICT" +
+    " VERDICTOP_UNQUALIFIED WARNING_UNQUALIFIED"),
+    externalCommands: words("BeginControlPart EndControlPart BeginTestCase" +
+    " EndTestCase"),
+    multiLineStrings: true
+  });
+});
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.min.js b/core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.min.js
new file mode 100644
index 00000000..8ad75eee
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ttcn-cfg/ttcn-cfg.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}a.defineMode("ttcn-cfg",(function(a,b){function c(a,b){var c=a.next();if('"'==c||"'"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[:=]/.test(c))return h=c,"punctuation";if("#"==c)return a.skipToEnd(),"comment";if(/\d/.test(c))return a.eatWhile(/[\w\.]/),"number";if(o.test(c))return a.eatWhile(o),"operator";if("["==c)return a.eatWhile(/[\w_\]]/),"number sectionTitle";a.eatWhile(/[\w\$_]/);var e=a.current();return j.propertyIsEnumerable(e)?"keyword":k.propertyIsEnumerable(e)?"negative fileNCtrlMaskOptions":l.propertyIsEnumerable(e)?"negative externalCommands":"variable"}function d(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){var g=b.peek();g&&(g=g.toLowerCase(),"b"!=g&&"h"!=g&&"o"!=g||b.next()),f=!0;break}e=!e&&"\\"==d}return(f||!e&&!m)&&(c.tokenize=null),"string"}}function e(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function f(a,b,c){var d=a.indented;return a.context&&"statement"==a.context.type&&(d=a.context.indented),a.context=new e(d,b,c,null,a.context)}function g(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var h,i=a.indentUnit,j=b.keywords||{},k=b.fileNCtrlMaskOptions||{},l=b.externalCommands||{},m=b.multiLineStrings,n=b.indentStatements!==!1,o=/[\|]/;return{startState:function(a){return{tokenize:null,context:new e((a||0)-i,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var d=b.context;if(a.sol()&&(null==d.align&&(d.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;h=null;var e=(b.tokenize||c)(a,b);if("comment"==e)return e;if(null==d.align&&(d.align=!0),";"!=h&&":"!=h&&","!=h||"statement"!=d.type)if("{"==h)f(b,a.column(),"}");else if("["==h)f(b,a.column(),"]");else if("("==h)f(b,a.column(),")");else if("}"==h){for(;"statement"==d.type;)d=g(b);for("}"==d.type&&(d=g(b));"statement"==d.type;)d=g(b)}else h==d.type?g(b):n&&(("}"==d.type||"top"==d.type)&&";"!=h||"statement"==d.type&&"newstatement"==h)&&f(b,a.column(),"statement");else g(b);return b.startOfLine=!1,e},electricChars:"{}",lineComment:"#",fold:"brace"}})),a.defineMIME("text/x-ttcn-cfg",{name:"ttcn-cfg",keywords:b("Yes No LogFile FileMask ConsoleMask AppendFile TimeStampFormat LogEventTypes SourceInfoFormat LogEntityName LogSourceInfo DiskFullAction LogFileNumber LogFileSize MatchingHints Detailed Compact SubCategories Stack Single None Seconds DateTime Time Stop Error Retry Delete TCPPort KillTimer NumHCs UnixSocketsEnabled LocalAddress"),fileNCtrlMaskOptions:b("TTCN_EXECUTOR TTCN_ERROR TTCN_WARNING TTCN_PORTEVENT TTCN_TIMEROP TTCN_VERDICTOP TTCN_DEFAULTOP TTCN_TESTCASE TTCN_ACTION TTCN_USER TTCN_FUNCTION TTCN_STATISTICS TTCN_PARALLEL TTCN_MATCHING TTCN_DEBUG EXECUTOR ERROR WARNING PORTEVENT TIMEROP VERDICTOP DEFAULTOP TESTCASE ACTION USER FUNCTION STATISTICS PARALLEL MATCHING DEBUG LOG_ALL LOG_NOTHING ACTION_UNQUALIFIED DEBUG_ENCDEC DEBUG_TESTPORT DEBUG_UNQUALIFIED DEFAULTOP_ACTIVATE DEFAULTOP_DEACTIVATE DEFAULTOP_EXIT DEFAULTOP_UNQUALIFIED ERROR_UNQUALIFIED EXECUTOR_COMPONENT EXECUTOR_CONFIGDATA EXECUTOR_EXTCOMMAND EXECUTOR_LOGOPTIONS EXECUTOR_RUNTIME EXECUTOR_UNQUALIFIED FUNCTION_RND FUNCTION_UNQUALIFIED MATCHING_DONE MATCHING_MCSUCCESS MATCHING_MCUNSUCC MATCHING_MMSUCCESS MATCHING_MMUNSUCC MATCHING_PCSUCCESS MATCHING_PCUNSUCC MATCHING_PMSUCCESS MATCHING_PMUNSUCC MATCHING_PROBLEM MATCHING_TIMEOUT MATCHING_UNQUALIFIED PARALLEL_PORTCONN PARALLEL_PORTMAP PARALLEL_PTC PARALLEL_UNQUALIFIED PORTEVENT_DUALRECV PORTEVENT_DUALSEND PORTEVENT_MCRECV PORTEVENT_MCSEND PORTEVENT_MMRECV PORTEVENT_MMSEND PORTEVENT_MQUEUE PORTEVENT_PCIN PORTEVENT_PCOUT PORTEVENT_PMIN PORTEVENT_PMOUT PORTEVENT_PQUEUE PORTEVENT_STATE PORTEVENT_UNQUALIFIED STATISTICS_UNQUALIFIED STATISTICS_VERDICT TESTCASE_FINISH TESTCASE_START TESTCASE_UNQUALIFIED TIMEROP_GUARD TIMEROP_READ TIMEROP_START TIMEROP_STOP TIMEROP_TIMEOUT TIMEROP_UNQUALIFIED USER_UNQUALIFIED VERDICTOP_FINAL VERDICTOP_GETVERDICT VERDICTOP_SETVERDICT VERDICTOP_UNQUALIFIED WARNING_UNQUALIFIED"),externalCommands:b("BeginControlPart EndControlPart BeginTestCase EndTestCase"),multiLineStrings:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/ttcn/ttcn.js b/core/media/editors/codemirror/mode/ttcn/ttcn.js
new file mode 100644
index 00000000..30518517
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ttcn/ttcn.js
@@ -0,0 +1,283 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("ttcn", function(config, parserConfig) {
+    var indentUnit = config.indentUnit,
+        keywords = parserConfig.keywords || {},
+        builtin = parserConfig.builtin || {},
+        timerOps = parserConfig.timerOps || {},
+        portOps  = parserConfig.portOps || {},
+        configOps = parserConfig.configOps || {},
+        verdictOps = parserConfig.verdictOps || {},
+        sutOps = parserConfig.sutOps || {},
+        functionOps = parserConfig.functionOps || {},
+
+        verdictConsts = parserConfig.verdictConsts || {},
+        booleanConsts = parserConfig.booleanConsts || {},
+        otherConsts   = parserConfig.otherConsts || {},
+
+        types = parserConfig.types || {},
+        visibilityModifiers = parserConfig.visibilityModifiers || {},
+        templateMatch = parserConfig.templateMatch || {},
+        multiLineStrings = parserConfig.multiLineStrings,
+        indentStatements = parserConfig.indentStatements !== false;
+    var isOperatorChar = /[+\-*&@=<>!\/]/;
+    var curPunc;
+
+    function tokenBase(stream, state) {
+      var ch = stream.next();
+
+      if (ch == '"' || ch == "'") {
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      if (/[\[\]{}\(\),;\\:\?\.]/.test(ch)) {
+        curPunc = ch;
+        return "punctuation";
+      }
+      if (ch == "#"){
+        stream.skipToEnd();
+        return "atom preprocessor";
+      }
+      if (ch == "%"){
+        stream.eatWhile(/\b/);
+        return "atom ttcn3Macros";
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (ch == "/") {
+        if (stream.eat("*")) {
+          state.tokenize = tokenComment;
+          return tokenComment(stream, state);
+        }
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return "comment";
+        }
+      }
+      if (isOperatorChar.test(ch)) {
+        if(ch == "@"){
+          if(stream.match("try") || stream.match("catch")
+              || stream.match("lazy")){
+            return "keyword";
+          }
+        }
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+      stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+      var cur = stream.current();
+
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      if (builtin.propertyIsEnumerable(cur)) return "builtin";
+
+      if (timerOps.propertyIsEnumerable(cur)) return "def timerOps";
+      if (configOps.propertyIsEnumerable(cur)) return "def configOps";
+      if (verdictOps.propertyIsEnumerable(cur)) return "def verdictOps";
+      if (portOps.propertyIsEnumerable(cur)) return "def portOps";
+      if (sutOps.propertyIsEnumerable(cur)) return "def sutOps";
+      if (functionOps.propertyIsEnumerable(cur)) return "def functionOps";
+
+      if (verdictConsts.propertyIsEnumerable(cur)) return "string verdictConsts";
+      if (booleanConsts.propertyIsEnumerable(cur)) return "string booleanConsts";
+      if (otherConsts.propertyIsEnumerable(cur)) return "string otherConsts";
+
+      if (types.propertyIsEnumerable(cur)) return "builtin types";
+      if (visibilityModifiers.propertyIsEnumerable(cur))
+        return "builtin visibilityModifiers";
+      if (templateMatch.propertyIsEnumerable(cur)) return "atom templateMatch";
+
+      return "variable";
+    }
+
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, next, end = false;
+        while ((next = stream.next()) != null) {
+          if (next == quote && !escaped){
+            var afterQuote = stream.peek();
+            //look if the character after the quote is like the B in '10100010'B
+            if (afterQuote){
+              afterQuote = afterQuote.toLowerCase();
+              if(afterQuote == "b" || afterQuote == "h" || afterQuote == "o")
+                stream.next();
+            }
+            end = true; break;
+          }
+          escaped = !escaped && next == "\\";
+        }
+        if (end || !(escaped || multiLineStrings))
+          state.tokenize = null;
+        return "string";
+      };
+    }
+
+    function tokenComment(stream, state) {
+      var maybeEnd = false, ch;
+      while (ch = stream.next()) {
+        if (ch == "/" && maybeEnd) {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return "comment";
+    }
+
+    function Context(indented, column, type, align, prev) {
+      this.indented = indented;
+      this.column = column;
+      this.type = type;
+      this.align = align;
+      this.prev = prev;
+    }
+
+    function pushContext(state, col, type) {
+      var indent = state.indented;
+      if (state.context && state.context.type == "statement")
+        indent = state.context.indented;
+      return state.context = new Context(indent, col, type, null, state.context);
+    }
+
+    function popContext(state) {
+      var t = state.context.type;
+      if (t == ")" || t == "]" || t == "}")
+        state.indented = state.context.indented;
+      return state.context = state.context.prev;
+    }
+
+    //Interface
+    return {
+      startState: function(basecolumn) {
+        return {
+          tokenize: null,
+          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+          indented: 0,
+          startOfLine: true
+        };
+      },
+
+      token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+          if (ctx.align == null) ctx.align = false;
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        curPunc = null;
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
+            && ctx.type == "statement"){
+          popContext(state);
+        }
+        else if (curPunc == "{") pushContext(state, stream.column(), "}");
+        else if (curPunc == "[") pushContext(state, stream.column(), "]");
+        else if (curPunc == "(") pushContext(state, stream.column(), ")");
+        else if (curPunc == "}") {
+          while (ctx.type == "statement") ctx = popContext(state);
+          if (ctx.type == "}") ctx = popContext(state);
+          while (ctx.type == "statement") ctx = popContext(state);
+        }
+        else if (curPunc == ctx.type) popContext(state);
+        else if (indentStatements &&
+            (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
+            (ctx.type == "statement" && curPunc == "newstatement")))
+          pushContext(state, stream.column(), "statement");
+
+        state.startOfLine = false;
+
+        return style;
+      },
+
+      electricChars: "{}",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//",
+      fold: "brace"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string") mimes = [mimes];
+    var words = [];
+    function add(obj) {
+      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
+        words.push(prop);
+    }
+
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.timerOps);
+    add(mode.portOps);
+
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i = 0; i < mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  def(["text/x-ttcn", "text/x-ttcn3", "text/x-ttcnpp"], {
+    name: "ttcn",
+    keywords: words("activate address alive all alt altstep and and4b any" +
+    " break case component const continue control deactivate" +
+    " display do else encode enumerated except exception" +
+    " execute extends extension external for from function" +
+    " goto group if import in infinity inout interleave" +
+    " label language length log match message mixed mod" +
+    " modifies module modulepar mtc noblock not not4b nowait" +
+    " of on optional or or4b out override param pattern port" +
+    " procedure record recursive rem repeat return runs select" +
+    " self sender set signature system template testcase to" +
+    " type union value valueof var variant while with xor xor4b"),
+    builtin: words("bit2hex bit2int bit2oct bit2str char2int char2oct encvalue" +
+    " decomp decvalue float2int float2str hex2bit hex2int" +
+    " hex2oct hex2str int2bit int2char int2float int2hex" +
+    " int2oct int2str int2unichar isbound ischosen ispresent" +
+    " isvalue lengthof log2str oct2bit oct2char oct2hex oct2int" +
+    " oct2str regexp replace rnd sizeof str2bit str2float" +
+    " str2hex str2int str2oct substr unichar2int unichar2char" +
+    " enum2int"),
+    types: words("anytype bitstring boolean char charstring default float" +
+    " hexstring integer objid octetstring universal verdicttype timer"),
+    timerOps: words("read running start stop timeout"),
+    portOps: words("call catch check clear getcall getreply halt raise receive" +
+    " reply send trigger"),
+    configOps: words("create connect disconnect done kill killed map unmap"),
+    verdictOps: words("getverdict setverdict"),
+    sutOps: words("action"),
+    functionOps: words("apply derefers refers"),
+
+    verdictConsts: words("error fail inconc none pass"),
+    booleanConsts: words("true false"),
+    otherConsts: words("null NULL omit"),
+
+    visibilityModifiers: words("private public friend"),
+    templateMatch: words("complement ifpresent subset superset permutation"),
+    multiLineStrings: true
+  });
+});
diff --git a/core/media/editors/codemirror/mode/ttcn/ttcn.min.js b/core/media/editors/codemirror/mode/ttcn/ttcn.min.js
new file mode 100644
index 00000000..14a905c2
--- /dev/null
+++ b/core/media/editors/codemirror/mode/ttcn/ttcn.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function c(b,c){function d(a){if(a)for(var b in a)a.hasOwnProperty(b)&&e.push(b)}"string"==typeof b&&(b=[b]);var e=[];d(c.keywords),d(c.builtin),d(c.timerOps),d(c.portOps),e.length&&(c.helperType=b[0],a.registerHelper("hintWords",b[0],e));for(var f=0;f<b.length;++f)a.defineMIME(b[f],c)}a.defineMode("ttcn",(function(a,b){function c(a,b){var c=a.next();if('"'==c||"'"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[\[\]{}\(\),;\\:\?\.]/.test(c))return i=c,"punctuation";if("#"==c)return a.skipToEnd(),"atom preprocessor";if("%"==c)return a.eatWhile(/\b/),"atom ttcn3Macros";if(/\d/.test(c))return a.eatWhile(/[\w\.]/),"number";if("/"==c){if(a.eat("*"))return b.tokenize=e,e(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}if(A.test(c))return"@"==c&&(a.match("try")||a.match("catch")||a.match("lazy"))?"keyword":(a.eatWhile(A),"operator");a.eatWhile(/[\w\$_\xa1-\uffff]/);var f=a.current();return k.propertyIsEnumerable(f)?"keyword":l.propertyIsEnumerable(f)?"builtin":m.propertyIsEnumerable(f)?"def timerOps":o.propertyIsEnumerable(f)?"def configOps":p.propertyIsEnumerable(f)?"def verdictOps":n.propertyIsEnumerable(f)?"def portOps":q.propertyIsEnumerable(f)?"def sutOps":r.propertyIsEnumerable(f)?"def functionOps":s.propertyIsEnumerable(f)?"string verdictConsts":t.propertyIsEnumerable(f)?"string booleanConsts":u.propertyIsEnumerable(f)?"string otherConsts":v.propertyIsEnumerable(f)?"builtin types":w.propertyIsEnumerable(f)?"builtin visibilityModifiers":x.propertyIsEnumerable(f)?"atom templateMatch":"variable"}function d(a){return function(b,c){for(var d,e=!1,f=!1;null!=(d=b.next());){if(d==a&&!e){var g=b.peek();g&&(g=g.toLowerCase(),"b"!=g&&"h"!=g&&"o"!=g||b.next()),f=!0;break}e=!e&&"\\"==d}return(f||!e&&!y)&&(c.tokenize=null),"string"}}function e(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=null;break}d="*"==c}return"comment"}function f(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function g(a,b,c){var d=a.indented;return a.context&&"statement"==a.context.type&&(d=a.context.indented),a.context=new f(d,b,c,null,a.context)}function h(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var i,j=a.indentUnit,k=b.keywords||{},l=b.builtin||{},m=b.timerOps||{},n=b.portOps||{},o=b.configOps||{},p=b.verdictOps||{},q=b.sutOps||{},r=b.functionOps||{},s=b.verdictConsts||{},t=b.booleanConsts||{},u=b.otherConsts||{},v=b.types||{},w=b.visibilityModifiers||{},x=b.templateMatch||{},y=b.multiLineStrings,z=b.indentStatements!==!1,A=/[+\-*&@=<>!\/]/;return{startState:function(a){return{tokenize:null,context:new f((a||0)-j,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var d=b.context;if(a.sol()&&(null==d.align&&(d.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;i=null;var e=(b.tokenize||c)(a,b);if("comment"==e)return e;if(null==d.align&&(d.align=!0),";"!=i&&":"!=i&&","!=i||"statement"!=d.type)if("{"==i)g(b,a.column(),"}");else if("["==i)g(b,a.column(),"]");else if("("==i)g(b,a.column(),")");else if("}"==i){for(;"statement"==d.type;)d=h(b);for("}"==d.type&&(d=h(b));"statement"==d.type;)d=h(b)}else i==d.type?h(b):z&&(("}"==d.type||"top"==d.type)&&";"!=i||"statement"==d.type&&"newstatement"==i)&&g(b,a.column(),"statement");else h(b);return b.startOfLine=!1,e},electricChars:"{}",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//",fold:"brace"}})),c(["text/x-ttcn","text/x-ttcn3","text/x-ttcnpp"],{name:"ttcn",keywords:b("activate address alive all alt altstep and and4b any break case component const continue control deactivate display do else encode enumerated except exception execute extends extension external for from function goto group if import in infinity inout interleave label language length log match message mixed mod modifies module modulepar mtc noblock not not4b nowait of on optional or or4b out override param pattern port procedure record recursive rem repeat return runs select self sender set signature system template testcase to type union value valueof var variant while with xor xor4b"),builtin:b("bit2hex bit2int bit2oct bit2str char2int char2oct encvalue decomp decvalue float2int float2str hex2bit hex2int hex2oct hex2str int2bit int2char int2float int2hex int2oct int2str int2unichar isbound ischosen ispresent isvalue lengthof log2str oct2bit oct2char oct2hex oct2int oct2str regexp replace rnd sizeof str2bit str2float str2hex str2int str2oct substr unichar2int unichar2char enum2int"),types:b("anytype bitstring boolean char charstring default float hexstring integer objid octetstring universal verdicttype timer"),timerOps:b("read running start stop timeout"),portOps:b("call catch check clear getcall getreply halt raise receive reply send trigger"),configOps:b("create connect disconnect done kill killed map unmap"),verdictOps:b("getverdict setverdict"),sutOps:b("action"),functionOps:b("apply derefers refers"),verdictConsts:b("error fail inconc none pass"),booleanConsts:b("true false"),otherConsts:b("null NULL omit"),visibilityModifiers:b("private public friend"),templateMatch:b("complement ifpresent subset superset permutation"),multiLineStrings:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/turtle/turtle.js b/core/media/editors/codemirror/mode/turtle/turtle.js
new file mode 100644
index 00000000..0988f0a4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/turtle/turtle.js
@@ -0,0 +1,162 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("turtle", function(config) {
+  var indentUnit = config.indentUnit;
+  var curPunc;
+
+  function wordRegexp(words) {
+    return new RegExp("^(?:" + words.join("|") + ")$", "i");
+  }
+  var ops = wordRegexp([]);
+  var keywords = wordRegexp(["@prefix", "@base", "a"]);
+  var operatorChars = /[*+\-<>=&|]/;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    curPunc = null;
+    if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
+      stream.match(/^[^\s\u00a0>]*>?/);
+      return "atom";
+    }
+    else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenLiteral(ch);
+      return state.tokenize(stream, state);
+    }
+    else if (/[{}\(\),\.;\[\]]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    else if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    else if (operatorChars.test(ch)) {
+      stream.eatWhile(operatorChars);
+      return null;
+    }
+    else if (ch == ":") {
+          return "operator";
+        } else {
+      stream.eatWhile(/[_\w\d]/);
+      if(stream.peek() == ":") {
+        return "variable-3";
+      } else {
+             var word = stream.current();
+
+             if(keywords.test(word)) {
+                        return "meta";
+             }
+
+             if(ch >= "A" && ch <= "Z") {
+                    return "comment";
+                 } else {
+                        return "keyword";
+                 }
+      }
+      var word = stream.current();
+      if (ops.test(word))
+        return null;
+      else if (keywords.test(word))
+        return "meta";
+      else
+        return "variable";
+    }
+  }
+
+  function tokenLiteral(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return "string";
+    };
+  }
+
+  function pushContext(state, type, col) {
+    state.context = {prev: state.context, indent: state.indent, col: col, type: type};
+  }
+  function popContext(state) {
+    state.indent = state.context.indent;
+    state.context = state.context.prev;
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: tokenBase,
+              context: null,
+              indent: 0,
+              col: 0};
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        if (state.context && state.context.align == null) state.context.align = false;
+        state.indent = stream.indentation();
+      }
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+
+      if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") {
+        state.context.align = true;
+      }
+
+      if (curPunc == "(") pushContext(state, ")", stream.column());
+      else if (curPunc == "[") pushContext(state, "]", stream.column());
+      else if (curPunc == "{") pushContext(state, "}", stream.column());
+      else if (/[\]\}\)]/.test(curPunc)) {
+        while (state.context && state.context.type == "pattern") popContext(state);
+        if (state.context && curPunc == state.context.type) popContext(state);
+      }
+      else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
+      else if (/atom|string|variable/.test(style) && state.context) {
+        if (/[\}\]]/.test(state.context.type))
+          pushContext(state, "pattern", stream.column());
+        else if (state.context.type == "pattern" && !state.context.align) {
+          state.context.align = true;
+          state.context.col = stream.column();
+        }
+      }
+
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var firstChar = textAfter && textAfter.charAt(0);
+      var context = state.context;
+      if (/[\]\}]/.test(firstChar))
+        while (context && context.type == "pattern") context = context.prev;
+
+      var closing = context && firstChar == context.type;
+      if (!context)
+        return 0;
+      else if (context.type == "pattern")
+        return context.col;
+      else if (context.align)
+        return context.col + (closing ? 0 : 1);
+      else
+        return context.indent + (closing ? 0 : indentUnit);
+    },
+
+    lineComment: "#"
+  };
+});
+
+CodeMirror.defineMIME("text/turtle", "turtle");
+
+});
diff --git a/core/media/editors/codemirror/mode/turtle/turtle.min.js b/core/media/editors/codemirror/mode/turtle/turtle.min.js
new file mode 100644
index 00000000..f49db67e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/turtle/turtle.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("turtle",(function(a){function b(a){return new RegExp("^(?:"+a.join("|")+")$","i")}function c(a,b){var c=a.next();if(g=null,"<"==c&&!a.match(/^[\s\u00a0=]/,!1))return a.match(/^[^\s\u00a0>]*>?/),"atom";if('"'==c||"'"==c)return b.tokenize=d(c),b.tokenize(a,b);if(/[{}\(\),\.;\[\]]/.test(c))return g=c,null;if("#"==c)return a.skipToEnd(),"comment";if(j.test(c))return a.eatWhile(j),null;if(":"==c)return"operator";if(a.eatWhile(/[_\w\d]/),":"==a.peek())return"variable-3";var e=a.current();return i.test(e)?"meta":c>="A"&&c<="Z"?"comment":"keyword";var e}function d(a){return function(b,d){for(var e,f=!1;null!=(e=b.next());){if(e==a&&!f){d.tokenize=c;break}f=!f&&"\\"==e}return"string"}}function e(a,b,c){a.context={prev:a.context,indent:a.indent,col:c,type:b}}function f(a){a.indent=a.context.indent,a.context=a.context.prev}var g,h=a.indentUnit,i=(b([]),b(["@prefix","@base","a"])),j=/[*+\-<>=&|]/;return{startState:function(){return{tokenize:c,context:null,indent:0,col:0}},token:function(a,b){if(a.sol()&&(b.context&&null==b.context.align&&(b.context.align=!1),b.indent=a.indentation()),a.eatSpace())return null;var c=b.tokenize(a,b);if("comment"!=c&&b.context&&null==b.context.align&&"pattern"!=b.context.type&&(b.context.align=!0),"("==g)e(b,")",a.column());else if("["==g)e(b,"]",a.column());else if("{"==g)e(b,"}",a.column());else if(/[\]\}\)]/.test(g)){for(;b.context&&"pattern"==b.context.type;)f(b);b.context&&g==b.context.type&&f(b)}else"."==g&&b.context&&"pattern"==b.context.type?f(b):/atom|string|variable/.test(c)&&b.context&&(/[\}\]]/.test(b.context.type)?e(b,"pattern",a.column()):"pattern"!=b.context.type||b.context.align||(b.context.align=!0,b.context.col=a.column()));return c},indent:function(a,b){var c=b&&b.charAt(0),d=a.context;if(/[\]\}]/.test(c))for(;d&&"pattern"==d.type;)d=d.prev;var e=d&&c==d.type;return d?"pattern"==d.type?d.col:d.align?d.col+(e?0:1):d.indent+(e?0:h):0},lineComment:"#"}})),a.defineMIME("text/turtle","turtle")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/twig/twig.js b/core/media/editors/codemirror/mode/twig/twig.js
new file mode 100644
index 00000000..b4e98972
--- /dev/null
+++ b/core/media/editors/codemirror/mode/twig/twig.js
@@ -0,0 +1,141 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"),  require("../../addon/mode/multiplex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/multiplex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("twig:inner", function() {
+    var keywords = ["and", "as", "autoescape", "endautoescape", "block", "do", "endblock", "else", "elseif", "extends", "for", "endfor", "embed", "endembed", "filter", "endfilter", "flush", "from", "if", "endif", "in", "is", "include", "import", "not", "or", "set", "spaceless", "endspaceless", "with", "endwith", "trans", "endtrans", "blocktrans", "endblocktrans", "macro", "endmacro", "use", "verbatim", "endverbatim"],
+        operator = /^[+\-*&%=<>!?|~^]/,
+        sign = /^[:\[\(\{]/,
+        atom = ["true", "false", "null", "empty", "defined", "divisibleby", "divisible by", "even", "odd", "iterable", "sameas", "same as"],
+        number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
+
+    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
+    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      var ch = stream.peek();
+
+      //Comment
+      if (state.incomment) {
+        if (!stream.skipTo("#}")) {
+          stream.skipToEnd();
+        } else {
+          stream.eatWhile(/\#|}/);
+          state.incomment = false;
+        }
+        return "comment";
+      //Tag
+      } else if (state.intag) {
+        //After operator
+        if (state.operator) {
+          state.operator = false;
+          if (stream.match(atom)) {
+            return "atom";
+          }
+          if (stream.match(number)) {
+            return "number";
+          }
+        }
+        //After sign
+        if (state.sign) {
+          state.sign = false;
+          if (stream.match(atom)) {
+            return "atom";
+          }
+          if (stream.match(number)) {
+            return "number";
+          }
+        }
+
+        if (state.instring) {
+          if (ch == state.instring) {
+            state.instring = false;
+          }
+          stream.next();
+          return "string";
+        } else if (ch == "'" || ch == '"') {
+          state.instring = ch;
+          stream.next();
+          return "string";
+        } else if (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+          state.intag = false;
+          return "tag";
+        } else if (stream.match(operator)) {
+          state.operator = true;
+          return "operator";
+        } else if (stream.match(sign)) {
+          state.sign = true;
+        } else {
+          if (stream.eat(" ") || stream.sol()) {
+            if (stream.match(keywords)) {
+              return "keyword";
+            }
+            if (stream.match(atom)) {
+              return "atom";
+            }
+            if (stream.match(number)) {
+              return "number";
+            }
+            if (stream.sol()) {
+              stream.next();
+            }
+          } else {
+            stream.next();
+          }
+
+        }
+        return "variable";
+      } else if (stream.eat("{")) {
+        if (stream.eat("#")) {
+          state.incomment = true;
+          if (!stream.skipTo("#}")) {
+            stream.skipToEnd();
+          } else {
+            stream.eatWhile(/\#|}/);
+            state.incomment = false;
+          }
+          return "comment";
+        //Open tag
+        } else if (ch = stream.eat(/\{|%/)) {
+          //Cache close tag
+          state.intag = ch;
+          if (ch == "{") {
+            state.intag = "}";
+          }
+          stream.eat("-");
+          return "tag";
+        }
+      }
+      stream.next();
+    };
+
+    return {
+      startState: function () {
+        return {};
+      },
+      token: function (stream, state) {
+        return tokenBase(stream, state);
+      }
+    };
+  });
+
+  CodeMirror.defineMode("twig", function(config, parserConfig) {
+    var twigInner = CodeMirror.getMode(config, "twig:inner");
+    if (!parserConfig || !parserConfig.base) return twigInner;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base), {
+        open: /\{[{#%]/, close: /[}#%]\}/, mode: twigInner, parseDelimiters: true
+      }
+    );
+  });
+  CodeMirror.defineMIME("text/x-twig", "twig");
+});
diff --git a/core/media/editors/codemirror/mode/twig/twig.min.js b/core/media/editors/codemirror/mode/twig/twig.min.js
new file mode 100644
index 00000000..27146cde
--- /dev/null
+++ b/core/media/editors/codemirror/mode/twig/twig.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/multiplex")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/multiplex"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("twig:inner",(function(){function a(a,g){var h=a.peek();if(g.incomment)return a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(g.intag){if(g.operator){if(g.operator=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.sign){if(g.sign=!1,a.match(e))return"atom";if(a.match(f))return"number"}if(g.instring)return h==g.instring&&(g.instring=!1),a.next(),"string";if("'"==h||'"'==h)return g.instring=h,a.next(),"string";if(a.match(g.intag+"}")||a.eat("-")&&a.match(g.intag+"}"))return g.intag=!1,"tag";if(a.match(c))return g.operator=!0,"operator";if(a.match(d))g.sign=!0;else if(a.eat(" ")||a.sol()){if(a.match(b))return"keyword";if(a.match(e))return"atom";if(a.match(f))return"number";a.sol()&&a.next()}else a.next();return"variable"}if(a.eat("{")){if(a.eat("#"))return g.incomment=!0,a.skipTo("#}")?(a.eatWhile(/\#|}/),g.incomment=!1):a.skipToEnd(),"comment";if(h=a.eat(/\{|%/))return g.intag=h,"{"==h&&(g.intag="}"),a.eat("-"),"tag"}a.next()}var b=["and","as","autoescape","endautoescape","block","do","endblock","else","elseif","extends","for","endfor","embed","endembed","filter","endfilter","flush","from","if","endif","in","is","include","import","not","or","set","spaceless","endspaceless","with","endwith","trans","endtrans","blocktrans","endblocktrans","macro","endmacro","use","verbatim","endverbatim"],c=/^[+\-*&%=<>!?|~^]/,d=/^[:\[\(\{]/,e=["true","false","null","empty","defined","divisibleby","divisible by","even","odd","iterable","sameas","same as"],f=/^(\d[+\-\*\/])?\d+(\.\d+)?/;return b=new RegExp("(("+b.join(")|(")+"))\\b"),e=new RegExp("(("+e.join(")|(")+"))\\b"),{startState:function(){return{}},token:function(b,c){return a(b,c)}}})),a.defineMode("twig",(function(b,c){var d=a.getMode(b,"twig:inner");return c&&c.base?a.multiplexingMode(a.getMode(b,c.base),{open:/\{[{#%]/,close:/[}#%]\}/,mode:d,parseDelimiters:!0}):d})),a.defineMIME("text/x-twig","twig")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/vb/vb.js b/core/media/editors/codemirror/mode/vb/vb.js
new file mode 100644
index 00000000..735eb7f7
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vb/vb.js
@@ -0,0 +1,275 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("vb", function(conf, parserConf) {
+    var ERRORCLASS = 'error';
+
+    function wordRegexp(words) {
+        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+    }
+
+    var singleOperators = new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]");
+    var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
+    var doubleOperators = new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
+    var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
+    var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
+    var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+
+    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property', 'try'];
+    var middleKeywords = ['else','elseif','case', 'catch'];
+    var endKeywords = ['next','loop'];
+
+    var operatorKeywords = ['and', 'or', 'not', 'xor', 'in'];
+    var wordOperators = wordRegexp(operatorKeywords);
+    var commonKeywords = ['as', 'dim', 'break',  'continue','optional', 'then',  'until',
+                          'goto', 'byval','byref','new','handles','property', 'return',
+                          'const','private', 'protected', 'friend', 'public', 'shared', 'static', 'true','false'];
+    var commontypes = ['integer','string','double','decimal','boolean','short','char', 'float','single'];
+
+    var keywords = wordRegexp(commonKeywords);
+    var types = wordRegexp(commontypes);
+    var stringPrefixes = '"';
+
+    var opening = wordRegexp(openingKeywords);
+    var middle = wordRegexp(middleKeywords);
+    var closing = wordRegexp(endKeywords);
+    var doubleClosing = wordRegexp(['end']);
+    var doOpening = wordRegexp(['do']);
+
+    var indentInfo = null;
+
+    CodeMirror.registerHelper("hintWords", "vb", openingKeywords.concat(middleKeywords).concat(endKeywords)
+                                .concat(operatorKeywords).concat(commonKeywords).concat(commontypes));
+
+    function indent(_stream, state) {
+      state.currentIndent++;
+    }
+
+    function dedent(_stream, state) {
+      state.currentIndent--;
+    }
+    // tokenizers
+    function tokenBase(stream, state) {
+        if (stream.eatSpace()) {
+            return null;
+        }
+
+        var ch = stream.peek();
+
+        // Handle Comments
+        if (ch === "'") {
+            stream.skipToEnd();
+            return 'comment';
+        }
+
+
+        // Handle Number Literals
+        if (stream.match(/^((&H)|(&O))?[0-9\.a-f]/i, false)) {
+            var floatLiteral = false;
+            // Floats
+            if (stream.match(/^\d*\.\d+F?/i)) { floatLiteral = true; }
+            else if (stream.match(/^\d+\.\d*F?/)) { floatLiteral = true; }
+            else if (stream.match(/^\.\d+F?/)) { floatLiteral = true; }
+
+            if (floatLiteral) {
+                // Float literals may be "imaginary"
+                stream.eat(/J/i);
+                return 'number';
+            }
+            // Integers
+            var intLiteral = false;
+            // Hex
+            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
+            // Octal
+            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
+            // Decimal
+            else if (stream.match(/^[1-9]\d*F?/)) {
+                // Decimal literals may be "imaginary"
+                stream.eat(/J/i);
+                // TODO - Can you have imaginary longs?
+                intLiteral = true;
+            }
+            // Zero by itself with no other piece of number.
+            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+            if (intLiteral) {
+                // Integer literals may be "long"
+                stream.eat(/L/i);
+                return 'number';
+            }
+        }
+
+        // Handle Strings
+        if (stream.match(stringPrefixes)) {
+            state.tokenize = tokenStringFactory(stream.current());
+            return state.tokenize(stream, state);
+        }
+
+        // Handle operators and Delimiters
+        if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
+            return null;
+        }
+        if (stream.match(doubleOperators)
+            || stream.match(singleOperators)
+            || stream.match(wordOperators)) {
+            return 'operator';
+        }
+        if (stream.match(singleDelimiters)) {
+            return null;
+        }
+        if (stream.match(doOpening)) {
+            indent(stream,state);
+            state.doInCurrentLine = true;
+            return 'keyword';
+        }
+        if (stream.match(opening)) {
+            if (! state.doInCurrentLine)
+              indent(stream,state);
+            else
+              state.doInCurrentLine = false;
+            return 'keyword';
+        }
+        if (stream.match(middle)) {
+            return 'keyword';
+        }
+
+        if (stream.match(doubleClosing)) {
+            dedent(stream,state);
+            dedent(stream,state);
+            return 'keyword';
+        }
+        if (stream.match(closing)) {
+            dedent(stream,state);
+            return 'keyword';
+        }
+
+        if (stream.match(types)) {
+            return 'keyword';
+        }
+
+        if (stream.match(keywords)) {
+            return 'keyword';
+        }
+
+        if (stream.match(identifiers)) {
+            return 'variable';
+        }
+
+        // Handle non-detected items
+        stream.next();
+        return ERRORCLASS;
+    }
+
+    function tokenStringFactory(delimiter) {
+        var singleline = delimiter.length == 1;
+        var OUTCLASS = 'string';
+
+        return function(stream, state) {
+            while (!stream.eol()) {
+                stream.eatWhile(/[^'"]/);
+                if (stream.match(delimiter)) {
+                    state.tokenize = tokenBase;
+                    return OUTCLASS;
+                } else {
+                    stream.eat(/['"]/);
+                }
+            }
+            if (singleline) {
+                if (parserConf.singleLineStringErrors) {
+                    return ERRORCLASS;
+                } else {
+                    state.tokenize = tokenBase;
+                }
+            }
+            return OUTCLASS;
+        };
+    }
+
+
+    function tokenLexer(stream, state) {
+        var style = state.tokenize(stream, state);
+        var current = stream.current();
+
+        // Handle '.' connected identifiers
+        if (current === '.') {
+            style = state.tokenize(stream, state);
+            if (style === 'variable') {
+                return 'variable';
+            } else {
+                return ERRORCLASS;
+            }
+        }
+
+
+        var delimiter_index = '[({'.indexOf(current);
+        if (delimiter_index !== -1) {
+            indent(stream, state );
+        }
+        if (indentInfo === 'dedent') {
+            if (dedent(stream, state)) {
+                return ERRORCLASS;
+            }
+        }
+        delimiter_index = '])}'.indexOf(current);
+        if (delimiter_index !== -1) {
+            if (dedent(stream, state)) {
+                return ERRORCLASS;
+            }
+        }
+
+        return style;
+    }
+
+    var external = {
+        electricChars:"dDpPtTfFeE ",
+        startState: function() {
+            return {
+              tokenize: tokenBase,
+              lastToken: null,
+              currentIndent: 0,
+              nextLineIndent: 0,
+              doInCurrentLine: false
+
+
+          };
+        },
+
+        token: function(stream, state) {
+            if (stream.sol()) {
+              state.currentIndent += state.nextLineIndent;
+              state.nextLineIndent = 0;
+              state.doInCurrentLine = 0;
+            }
+            var style = tokenLexer(stream, state);
+
+            state.lastToken = {style:style, content: stream.current()};
+
+
+
+            return style;
+        },
+
+        indent: function(state, textAfter) {
+            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
+            if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
+            if(state.currentIndent < 0) return 0;
+            return state.currentIndent * conf.indentUnit;
+        },
+
+        lineComment: "'"
+    };
+    return external;
+});
+
+CodeMirror.defineMIME("text/x-vb", "vb");
+
+});
diff --git a/core/media/editors/codemirror/mode/vb/vb.min.js b/core/media/editors/codemirror/mode/vb/vb.min.js
new file mode 100644
index 00000000..4104aef4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vb/vb.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("vb",(function(b,c){function d(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function e(a,b){b.currentIndent++}function f(a,b){b.currentIndent--}function g(a,b){if(a.eatSpace())return null;var c=a.peek();if("'"===c)return a.skipToEnd(),"comment";if(a.match(/^((&H)|(&O))?[0-9\.a-f]/i,!1)){var d=!1;if(a.match(/^\d*\.\d+F?/i)?d=!0:a.match(/^\d+\.\d*F?/)?d=!0:a.match(/^\.\d+F?/)&&(d=!0),d)return a.eat(/J/i),"number";var g=!1;if(a.match(/^&H[0-9a-f]+/i)?g=!0:a.match(/^&O[0-7]+/i)?g=!0:a.match(/^[1-9]\d*F?/)?(a.eat(/J/i),g=!0):a.match(/^0(?![\dx])/i)&&(g=!0),g)return a.eat(/L/i),"number"}return a.match(z)?(b.tokenize=h(a.current()),b.tokenize(a,b)):a.match(o)||a.match(n)?null:a.match(m)||a.match(k)||a.match(u)?"operator":a.match(l)?null:a.match(E)?(e(a,b),b.doInCurrentLine=!0,"keyword"):a.match(A)?(b.doInCurrentLine?b.doInCurrentLine=!1:e(a,b),"keyword"):a.match(B)?"keyword":a.match(D)?(f(a,b),f(a,b),"keyword"):a.match(C)?(f(a,b),"keyword"):a.match(y)?"keyword":a.match(x)?"keyword":a.match(p)?"variable":(a.next(),j)}function h(a){var b=1==a.length,d="string";return function(e,f){for(;!e.eol();){if(e.eatWhile(/[^'"]/),e.match(a))return f.tokenize=g,d;e.eat(/['"]/)}if(b){if(c.singleLineStringErrors)return j;f.tokenize=g}return d}}function i(a,b){var c=b.tokenize(a,b),d=a.current();if("."===d)return c=b.tokenize(a,b),"variable"===c?"variable":j;var g="[({".indexOf(d);return g!==-1&&e(a,b),"dedent"===F&&f(a,b)?j:(g="])}".indexOf(d),g!==-1&&f(a,b)?j:c)}var j="error",k=new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]"),l=new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]"),m=new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"),n=new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"),o=new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))"),p=new RegExp("^[_A-Za-z][_A-Za-z0-9]*"),q=["class","module","sub","enum","select","while","if","function","get","set","property","try"],r=["else","elseif","case","catch"],s=["next","loop"],t=["and","or","not","xor","in"],u=d(t),v=["as","dim","break","continue","optional","then","until","goto","byval","byref","new","handles","property","return","const","private","protected","friend","public","shared","static","true","false"],w=["integer","string","double","decimal","boolean","short","char","float","single"],x=d(v),y=d(w),z='"',A=d(q),B=d(r),C=d(s),D=d(["end"]),E=d(["do"]),F=null;a.registerHelper("hintWords","vb",q.concat(r).concat(s).concat(t).concat(v).concat(w));var G={electricChars:"dDpPtTfFeE ",startState:function(){return{tokenize:g,lastToken:null,currentIndent:0,nextLineIndent:0,doInCurrentLine:!1}},token:function(a,b){a.sol()&&(b.currentIndent+=b.nextLineIndent,b.nextLineIndent=0,b.doInCurrentLine=0);var c=i(a,b);return b.lastToken={style:c,content:a.current()},c},indent:function(a,c){var d=c.replace(/^\s+|\s+$/g,"");return d.match(C)||d.match(D)||d.match(B)?b.indentUnit*(a.currentIndent-1):a.currentIndent<0?0:a.currentIndent*b.indentUnit},lineComment:"'"};return G})),a.defineMIME("text/x-vb","vb")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/vbscript/vbscript.js b/core/media/editors/codemirror/mode/vbscript/vbscript.js
new file mode 100644
index 00000000..b66df223
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vbscript/vbscript.js
@@ -0,0 +1,350 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/*
+For extra ASP classic objects, initialize CodeMirror instance with this option:
+    isASP: true
+
+E.G.:
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        isASP: true
+      });
+*/
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("vbscript", function(conf, parserConf) {
+    var ERRORCLASS = 'error';
+
+    function wordRegexp(words) {
+        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+    }
+
+    var singleOperators = new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]");
+    var doubleOperators = new RegExp("^((<>)|(<=)|(>=))");
+    var singleDelimiters = new RegExp('^[\\.,]');
+    var brakets = new RegExp('^[\\(\\)]');
+    var identifiers = new RegExp("^[A-Za-z][_A-Za-z0-9]*");
+
+    var openingKeywords = ['class','sub','select','while','if','function', 'property', 'with', 'for'];
+    var middleKeywords = ['else','elseif','case'];
+    var endKeywords = ['next','loop','wend'];
+
+    var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'is', 'mod', 'eqv', 'imp']);
+    var commonkeywords = ['dim', 'redim', 'then',  'until', 'randomize',
+                          'byval','byref','new','property', 'exit', 'in',
+                          'const','private', 'public',
+                          'get','set','let', 'stop', 'on error resume next', 'on error goto 0', 'option explicit', 'call', 'me'];
+
+    //This list was from: http://msdn.microsoft.com/en-us/library/f8tbc79x(v=vs.84).aspx
+    var atomWords = ['true', 'false', 'nothing', 'empty', 'null'];
+    //This list was from: http://msdn.microsoft.com/en-us/library/3ca8tfek(v=vs.84).aspx
+    var builtinFuncsWords = ['abs', 'array', 'asc', 'atn', 'cbool', 'cbyte', 'ccur', 'cdate', 'cdbl', 'chr', 'cint', 'clng', 'cos', 'csng', 'cstr', 'date', 'dateadd', 'datediff', 'datepart',
+                        'dateserial', 'datevalue', 'day', 'escape', 'eval', 'execute', 'exp', 'filter', 'formatcurrency', 'formatdatetime', 'formatnumber', 'formatpercent', 'getlocale', 'getobject',
+                        'getref', 'hex', 'hour', 'inputbox', 'instr', 'instrrev', 'int', 'fix', 'isarray', 'isdate', 'isempty', 'isnull', 'isnumeric', 'isobject', 'join', 'lbound', 'lcase', 'left',
+                        'len', 'loadpicture', 'log', 'ltrim', 'rtrim', 'trim', 'maths', 'mid', 'minute', 'month', 'monthname', 'msgbox', 'now', 'oct', 'replace', 'rgb', 'right', 'rnd', 'round',
+                        'scriptengine', 'scriptenginebuildversion', 'scriptenginemajorversion', 'scriptengineminorversion', 'second', 'setlocale', 'sgn', 'sin', 'space', 'split', 'sqr', 'strcomp',
+                        'string', 'strreverse', 'tan', 'time', 'timer', 'timeserial', 'timevalue', 'typename', 'ubound', 'ucase', 'unescape', 'vartype', 'weekday', 'weekdayname', 'year'];
+
+    //This list was from: http://msdn.microsoft.com/en-us/library/ydz4cfk3(v=vs.84).aspx
+    var builtinConsts = ['vbBlack', 'vbRed', 'vbGreen', 'vbYellow', 'vbBlue', 'vbMagenta', 'vbCyan', 'vbWhite', 'vbBinaryCompare', 'vbTextCompare',
+                         'vbSunday', 'vbMonday', 'vbTuesday', 'vbWednesday', 'vbThursday', 'vbFriday', 'vbSaturday', 'vbUseSystemDayOfWeek', 'vbFirstJan1', 'vbFirstFourDays', 'vbFirstFullWeek',
+                         'vbGeneralDate', 'vbLongDate', 'vbShortDate', 'vbLongTime', 'vbShortTime', 'vbObjectError',
+                         'vbOKOnly', 'vbOKCancel', 'vbAbortRetryIgnore', 'vbYesNoCancel', 'vbYesNo', 'vbRetryCancel', 'vbCritical', 'vbQuestion', 'vbExclamation', 'vbInformation', 'vbDefaultButton1', 'vbDefaultButton2',
+                         'vbDefaultButton3', 'vbDefaultButton4', 'vbApplicationModal', 'vbSystemModal', 'vbOK', 'vbCancel', 'vbAbort', 'vbRetry', 'vbIgnore', 'vbYes', 'vbNo',
+                         'vbCr', 'VbCrLf', 'vbFormFeed', 'vbLf', 'vbNewLine', 'vbNullChar', 'vbNullString', 'vbTab', 'vbVerticalTab', 'vbUseDefault', 'vbTrue', 'vbFalse',
+                         'vbEmpty', 'vbNull', 'vbInteger', 'vbLong', 'vbSingle', 'vbDouble', 'vbCurrency', 'vbDate', 'vbString', 'vbObject', 'vbError', 'vbBoolean', 'vbVariant', 'vbDataObject', 'vbDecimal', 'vbByte', 'vbArray'];
+    //This list was from: http://msdn.microsoft.com/en-us/library/hkc375ea(v=vs.84).aspx
+    var builtinObjsWords = ['WScript', 'err', 'debug', 'RegExp'];
+    var knownProperties = ['description', 'firstindex', 'global', 'helpcontext', 'helpfile', 'ignorecase', 'length', 'number', 'pattern', 'source', 'value', 'count'];
+    var knownMethods = ['clear', 'execute', 'raise', 'replace', 'test', 'write', 'writeline', 'close', 'open', 'state', 'eof', 'update', 'addnew', 'end', 'createobject', 'quit'];
+
+    var aspBuiltinObjsWords = ['server', 'response', 'request', 'session', 'application'];
+    var aspKnownProperties = ['buffer', 'cachecontrol', 'charset', 'contenttype', 'expires', 'expiresabsolute', 'isclientconnected', 'pics', 'status', //response
+                              'clientcertificate', 'cookies', 'form', 'querystring', 'servervariables', 'totalbytes', //request
+                              'contents', 'staticobjects', //application
+                              'codepage', 'lcid', 'sessionid', 'timeout', //session
+                              'scripttimeout']; //server
+    var aspKnownMethods = ['addheader', 'appendtolog', 'binarywrite', 'end', 'flush', 'redirect', //response
+                           'binaryread', //request
+                           'remove', 'removeall', 'lock', 'unlock', //application
+                           'abandon', //session
+                           'getlasterror', 'htmlencode', 'mappath', 'transfer', 'urlencode']; //server
+
+    var knownWords = knownMethods.concat(knownProperties);
+
+    builtinObjsWords = builtinObjsWords.concat(builtinConsts);
+
+    if (conf.isASP){
+        builtinObjsWords = builtinObjsWords.concat(aspBuiltinObjsWords);
+        knownWords = knownWords.concat(aspKnownMethods, aspKnownProperties);
+    };
+
+    var keywords = wordRegexp(commonkeywords);
+    var atoms = wordRegexp(atomWords);
+    var builtinFuncs = wordRegexp(builtinFuncsWords);
+    var builtinObjs = wordRegexp(builtinObjsWords);
+    var known = wordRegexp(knownWords);
+    var stringPrefixes = '"';
+
+    var opening = wordRegexp(openingKeywords);
+    var middle = wordRegexp(middleKeywords);
+    var closing = wordRegexp(endKeywords);
+    var doubleClosing = wordRegexp(['end']);
+    var doOpening = wordRegexp(['do']);
+    var noIndentWords = wordRegexp(['on error resume next', 'exit']);
+    var comment = wordRegexp(['rem']);
+
+
+    function indent(_stream, state) {
+      state.currentIndent++;
+    }
+
+    function dedent(_stream, state) {
+      state.currentIndent--;
+    }
+    // tokenizers
+    function tokenBase(stream, state) {
+        if (stream.eatSpace()) {
+            return 'space';
+            //return null;
+        }
+
+        var ch = stream.peek();
+
+        // Handle Comments
+        if (ch === "'") {
+            stream.skipToEnd();
+            return 'comment';
+        }
+        if (stream.match(comment)){
+            stream.skipToEnd();
+            return 'comment';
+        }
+
+
+        // Handle Number Literals
+        if (stream.match(/^((&H)|(&O))?[0-9\.]/i, false) && !stream.match(/^((&H)|(&O))?[0-9\.]+[a-z_]/i, false)) {
+            var floatLiteral = false;
+            // Floats
+            if (stream.match(/^\d*\.\d+/i)) { floatLiteral = true; }
+            else if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+            else if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+
+            if (floatLiteral) {
+                // Float literals may be "imaginary"
+                stream.eat(/J/i);
+                return 'number';
+            }
+            // Integers
+            var intLiteral = false;
+            // Hex
+            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
+            // Octal
+            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
+            // Decimal
+            else if (stream.match(/^[1-9]\d*F?/)) {
+                // Decimal literals may be "imaginary"
+                stream.eat(/J/i);
+                // TODO - Can you have imaginary longs?
+                intLiteral = true;
+            }
+            // Zero by itself with no other piece of number.
+            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+            if (intLiteral) {
+                // Integer literals may be "long"
+                stream.eat(/L/i);
+                return 'number';
+            }
+        }
+
+        // Handle Strings
+        if (stream.match(stringPrefixes)) {
+            state.tokenize = tokenStringFactory(stream.current());
+            return state.tokenize(stream, state);
+        }
+
+        // Handle operators and Delimiters
+        if (stream.match(doubleOperators)
+            || stream.match(singleOperators)
+            || stream.match(wordOperators)) {
+            return 'operator';
+        }
+        if (stream.match(singleDelimiters)) {
+            return null;
+        }
+
+        if (stream.match(brakets)) {
+            return "bracket";
+        }
+
+        if (stream.match(noIndentWords)) {
+            state.doInCurrentLine = true;
+
+            return 'keyword';
+        }
+
+        if (stream.match(doOpening)) {
+            indent(stream,state);
+            state.doInCurrentLine = true;
+
+            return 'keyword';
+        }
+        if (stream.match(opening)) {
+            if (! state.doInCurrentLine)
+              indent(stream,state);
+            else
+              state.doInCurrentLine = false;
+
+            return 'keyword';
+        }
+        if (stream.match(middle)) {
+            return 'keyword';
+        }
+
+
+        if (stream.match(doubleClosing)) {
+            dedent(stream,state);
+            dedent(stream,state);
+
+            return 'keyword';
+        }
+        if (stream.match(closing)) {
+            if (! state.doInCurrentLine)
+              dedent(stream,state);
+            else
+              state.doInCurrentLine = false;
+
+            return 'keyword';
+        }
+
+        if (stream.match(keywords)) {
+            return 'keyword';
+        }
+
+        if (stream.match(atoms)) {
+            return 'atom';
+        }
+
+        if (stream.match(known)) {
+            return 'variable-2';
+        }
+
+        if (stream.match(builtinFuncs)) {
+            return 'builtin';
+        }
+
+        if (stream.match(builtinObjs)){
+            return 'variable-2';
+        }
+
+        if (stream.match(identifiers)) {
+            return 'variable';
+        }
+
+        // Handle non-detected items
+        stream.next();
+        return ERRORCLASS;
+    }
+
+    function tokenStringFactory(delimiter) {
+        var singleline = delimiter.length == 1;
+        var OUTCLASS = 'string';
+
+        return function(stream, state) {
+            while (!stream.eol()) {
+                stream.eatWhile(/[^'"]/);
+                if (stream.match(delimiter)) {
+                    state.tokenize = tokenBase;
+                    return OUTCLASS;
+                } else {
+                    stream.eat(/['"]/);
+                }
+            }
+            if (singleline) {
+                if (parserConf.singleLineStringErrors) {
+                    return ERRORCLASS;
+                } else {
+                    state.tokenize = tokenBase;
+                }
+            }
+            return OUTCLASS;
+        };
+    }
+
+
+    function tokenLexer(stream, state) {
+        var style = state.tokenize(stream, state);
+        var current = stream.current();
+
+        // Handle '.' connected identifiers
+        if (current === '.') {
+            style = state.tokenize(stream, state);
+
+            current = stream.current();
+            if (style && (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword')){//|| knownWords.indexOf(current.substring(1)) > -1) {
+                if (style === 'builtin' || style === 'keyword') style='variable';
+                if (knownWords.indexOf(current.substr(1)) > -1) style='variable-2';
+
+                return style;
+            } else {
+                return ERRORCLASS;
+            }
+        }
+
+        return style;
+    }
+
+    var external = {
+        electricChars:"dDpPtTfFeE ",
+        startState: function() {
+            return {
+              tokenize: tokenBase,
+              lastToken: null,
+              currentIndent: 0,
+              nextLineIndent: 0,
+              doInCurrentLine: false,
+              ignoreKeyword: false
+
+
+          };
+        },
+
+        token: function(stream, state) {
+            if (stream.sol()) {
+              state.currentIndent += state.nextLineIndent;
+              state.nextLineIndent = 0;
+              state.doInCurrentLine = 0;
+            }
+            var style = tokenLexer(stream, state);
+
+            state.lastToken = {style:style, content: stream.current()};
+
+            if (style==='space') style=null;
+
+            return style;
+        },
+
+        indent: function(state, textAfter) {
+            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
+            if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
+            if(state.currentIndent < 0) return 0;
+            return state.currentIndent * conf.indentUnit;
+        }
+
+    };
+    return external;
+});
+
+CodeMirror.defineMIME("text/vbscript", "vbscript");
+
+});
diff --git a/core/media/editors/codemirror/mode/vbscript/vbscript.min.js b/core/media/editors/codemirror/mode/vbscript/vbscript.min.js
new file mode 100644
index 00000000..ed07beb9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vbscript/vbscript.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("vbscript",(function(a,b){function c(a){return new RegExp("^(("+a.join(")|(")+"))\\b","i")}function d(a,b){b.currentIndent++}function e(a,b){b.currentIndent--}function f(a,b){if(a.eatSpace())return"space";var c=a.peek();if("'"===c)return a.skipToEnd(),"comment";if(a.match(P))return a.skipToEnd(),"comment";if(a.match(/^((&H)|(&O))?[0-9\.]/i,!1)&&!a.match(/^((&H)|(&O))?[0-9\.]+[a-z_]/i,!1)){var f=!1;if(a.match(/^\d*\.\d+/i)?f=!0:a.match(/^\d+\.\d*/)?f=!0:a.match(/^\.\d+/)&&(f=!0),f)return a.eat(/J/i),"number";var h=!1;if(a.match(/^&H[0-9a-f]+/i)?h=!0:a.match(/^&O[0-7]+/i)?h=!0:a.match(/^[1-9]\d*F?/)?(a.eat(/J/i),h=!0):a.match(/^0(?![\dx])/i)&&(h=!0),h)return a.eat(/L/i),"number"}return a.match(I)?(b.tokenize=g(a.current()),b.tokenize(a,b)):a.match(k)||a.match(j)||a.match(r)?"operator":a.match(l)?null:a.match(m)?"bracket":a.match(O)?(b.doInCurrentLine=!0,"keyword"):a.match(N)?(d(a,b),b.doInCurrentLine=!0,"keyword"):a.match(J)?(b.doInCurrentLine?b.doInCurrentLine=!1:d(a,b),"keyword"):a.match(K)?"keyword":a.match(M)?(e(a,b),e(a,b),"keyword"):a.match(L)?(b.doInCurrentLine?b.doInCurrentLine=!1:e(a,b),"keyword"):a.match(D)?"keyword":a.match(E)?"atom":a.match(H)?"variable-2":a.match(F)?"builtin":a.match(G)?"variable-2":a.match(n)?"variable":(a.next(),i)}function g(a){var c=1==a.length,d="string";return function(e,g){for(;!e.eol();){if(e.eatWhile(/[^'"]/),e.match(a))return g.tokenize=f,d;e.eat(/['"]/)}if(c){if(b.singleLineStringErrors)return i;g.tokenize=f}return d}}function h(a,b){var c=b.tokenize(a,b),d=a.current();return"."===d?(c=b.tokenize(a,b),d=a.current(),!c||"variable"!==c.substr(0,8)&&"builtin"!==c&&"keyword"!==c?i:("builtin"!==c&&"keyword"!==c||(c="variable"),C.indexOf(d.substr(1))>-1&&(c="variable-2"),c)):c}var i="error",j=new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]"),k=new RegExp("^((<>)|(<=)|(>=))"),l=new RegExp("^[\\.,]"),m=new RegExp("^[\\(\\)]"),n=new RegExp("^[A-Za-z][_A-Za-z0-9]*"),o=["class","sub","select","while","if","function","property","with","for"],p=["else","elseif","case"],q=["next","loop","wend"],r=c(["and","or","not","xor","is","mod","eqv","imp"]),s=["dim","redim","then","until","randomize","byval","byref","new","property","exit","in","const","private","public","get","set","let","stop","on error resume next","on error goto 0","option explicit","call","me"],t=["true","false","nothing","empty","null"],u=["abs","array","asc","atn","cbool","cbyte","ccur","cdate","cdbl","chr","cint","clng","cos","csng","cstr","date","dateadd","datediff","datepart","dateserial","datevalue","day","escape","eval","execute","exp","filter","formatcurrency","formatdatetime","formatnumber","formatpercent","getlocale","getobject","getref","hex","hour","inputbox","instr","instrrev","int","fix","isarray","isdate","isempty","isnull","isnumeric","isobject","join","lbound","lcase","left","len","loadpicture","log","ltrim","rtrim","trim","maths","mid","minute","month","monthname","msgbox","now","oct","replace","rgb","right","rnd","round","scriptengine","scriptenginebuildversion","scriptenginemajorversion","scriptengineminorversion","second","setlocale","sgn","sin","space","split","sqr","strcomp","string","strreverse","tan","time","timer","timeserial","timevalue","typename","ubound","ucase","unescape","vartype","weekday","weekdayname","year"],v=["vbBlack","vbRed","vbGreen","vbYellow","vbBlue","vbMagenta","vbCyan","vbWhite","vbBinaryCompare","vbTextCompare","vbSunday","vbMonday","vbTuesday","vbWednesday","vbThursday","vbFriday","vbSaturday","vbUseSystemDayOfWeek","vbFirstJan1","vbFirstFourDays","vbFirstFullWeek","vbGeneralDate","vbLongDate","vbShortDate","vbLongTime","vbShortTime","vbObjectError","vbOKOnly","vbOKCancel","vbAbortRetryIgnore","vbYesNoCancel","vbYesNo","vbRetryCancel","vbCritical","vbQuestion","vbExclamation","vbInformation","vbDefaultButton1","vbDefaultButton2","vbDefaultButton3","vbDefaultButton4","vbApplicationModal","vbSystemModal","vbOK","vbCancel","vbAbort","vbRetry","vbIgnore","vbYes","vbNo","vbCr","VbCrLf","vbFormFeed","vbLf","vbNewLine","vbNullChar","vbNullString","vbTab","vbVerticalTab","vbUseDefault","vbTrue","vbFalse","vbEmpty","vbNull","vbInteger","vbLong","vbSingle","vbDouble","vbCurrency","vbDate","vbString","vbObject","vbError","vbBoolean","vbVariant","vbDataObject","vbDecimal","vbByte","vbArray"],w=["WScript","err","debug","RegExp"],x=["description","firstindex","global","helpcontext","helpfile","ignorecase","length","number","pattern","source","value","count"],y=["clear","execute","raise","replace","test","write","writeline","close","open","state","eof","update","addnew","end","createobject","quit"],z=["server","response","request","session","application"],A=["buffer","cachecontrol","charset","contenttype","expires","expiresabsolute","isclientconnected","pics","status","clientcertificate","cookies","form","querystring","servervariables","totalbytes","contents","staticobjects","codepage","lcid","sessionid","timeout","scripttimeout"],B=["addheader","appendtolog","binarywrite","end","flush","redirect","binaryread","remove","removeall","lock","unlock","abandon","getlasterror","htmlencode","mappath","transfer","urlencode"],C=y.concat(x);w=w.concat(v),a.isASP&&(w=w.concat(z),C=C.concat(B,A));var D=c(s),E=c(t),F=c(u),G=c(w),H=c(C),I='"',J=c(o),K=c(p),L=c(q),M=c(["end"]),N=c(["do"]),O=c(["on error resume next","exit"]),P=c(["rem"]),Q={electricChars:"dDpPtTfFeE ",startState:function(){return{tokenize:f,lastToken:null,currentIndent:0,nextLineIndent:0,doInCurrentLine:!1,ignoreKeyword:!1}},token:function(a,b){a.sol()&&(b.currentIndent+=b.nextLineIndent,b.nextLineIndent=0,b.doInCurrentLine=0);var c=h(a,b);return b.lastToken={style:c,content:a.current()},"space"===c&&(c=null),c},indent:function(b,c){var d=c.replace(/^\s+|\s+$/g,"");return d.match(L)||d.match(M)||d.match(K)?a.indentUnit*(b.currentIndent-1):b.currentIndent<0?0:b.currentIndent*a.indentUnit}};return Q})),a.defineMIME("text/vbscript","vbscript")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/velocity/velocity.js b/core/media/editors/codemirror/mode/velocity/velocity.js
new file mode 100644
index 00000000..2525fda5
--- /dev/null
+++ b/core/media/editors/codemirror/mode/velocity/velocity.js
@@ -0,0 +1,201 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("velocity", function() {
+    function parseWords(str) {
+        var obj = {}, words = str.split(" ");
+        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+        return obj;
+    }
+
+    var keywords = parseWords("#end #else #break #stop #[[ #]] " +
+                              "#{end} #{else} #{break} #{stop}");
+    var functions = parseWords("#if #elseif #foreach #set #include #parse #macro #define #evaluate " +
+                               "#{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}");
+    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent");
+    var isOperatorChar = /[+\-*&%=<>!?:\/|]/;
+
+    function chain(stream, state, f) {
+        state.tokenize = f;
+        return f(stream, state);
+    }
+    function tokenBase(stream, state) {
+        var beforeParams = state.beforeParams;
+        state.beforeParams = false;
+        var ch = stream.next();
+        // start of unparsed string?
+        if ((ch == "'") && !state.inString && state.inParams) {
+            state.lastTokenWasBuiltin = false;
+            return chain(stream, state, tokenString(ch));
+        }
+        // start of parsed string?
+        else if ((ch == '"')) {
+            state.lastTokenWasBuiltin = false;
+            if (state.inString) {
+                state.inString = false;
+                return "string";
+            }
+            else if (state.inParams)
+                return chain(stream, state, tokenString(ch));
+        }
+        // is it one of the special signs []{}().,;? Seperator?
+        else if (/[\[\]{}\(\),;\.]/.test(ch)) {
+            if (ch == "(" && beforeParams)
+                state.inParams = true;
+            else if (ch == ")") {
+                state.inParams = false;
+                state.lastTokenWasBuiltin = true;
+            }
+            return null;
+        }
+        // start of a number value?
+        else if (/\d/.test(ch)) {
+            state.lastTokenWasBuiltin = false;
+            stream.eatWhile(/[\w\.]/);
+            return "number";
+        }
+        // multi line comment?
+        else if (ch == "#" && stream.eat("*")) {
+            state.lastTokenWasBuiltin = false;
+            return chain(stream, state, tokenComment);
+        }
+        // unparsed content?
+        else if (ch == "#" && stream.match(/ *\[ *\[/)) {
+            state.lastTokenWasBuiltin = false;
+            return chain(stream, state, tokenUnparsed);
+        }
+        // single line comment?
+        else if (ch == "#" && stream.eat("#")) {
+            state.lastTokenWasBuiltin = false;
+            stream.skipToEnd();
+            return "comment";
+        }
+        // variable?
+        else if (ch == "$") {
+            stream.eatWhile(/[\w\d\$_\.{}-]/);
+            // is it one of the specials?
+            if (specials && specials.propertyIsEnumerable(stream.current())) {
+                return "keyword";
+            }
+            else {
+                state.lastTokenWasBuiltin = true;
+                state.beforeParams = true;
+                return "builtin";
+            }
+        }
+        // is it a operator?
+        else if (isOperatorChar.test(ch)) {
+            state.lastTokenWasBuiltin = false;
+            stream.eatWhile(isOperatorChar);
+            return "operator";
+        }
+        else {
+            // get the whole word
+            stream.eatWhile(/[\w\$_{}@]/);
+            var word = stream.current();
+            // is it one of the listed keywords?
+            if (keywords && keywords.propertyIsEnumerable(word))
+                return "keyword";
+            // is it one of the listed functions?
+            if (functions && functions.propertyIsEnumerable(word) ||
+                    (stream.current().match(/^#@?[a-z0-9_]+ *$/i) && stream.peek()=="(") &&
+                     !(functions && functions.propertyIsEnumerable(word.toLowerCase()))) {
+                state.beforeParams = true;
+                state.lastTokenWasBuiltin = false;
+                return "keyword";
+            }
+            if (state.inString) {
+                state.lastTokenWasBuiltin = false;
+                return "string";
+            }
+            if (stream.pos > word.length && stream.string.charAt(stream.pos-word.length-1)=="." && state.lastTokenWasBuiltin)
+                return "builtin";
+            // default: just a "word"
+            state.lastTokenWasBuiltin = false;
+            return null;
+        }
+    }
+
+    function tokenString(quote) {
+        return function(stream, state) {
+            var escaped = false, next, end = false;
+            while ((next = stream.next()) != null) {
+                if ((next == quote) && !escaped) {
+                    end = true;
+                    break;
+                }
+                if (quote=='"' && stream.peek() == '$' && !escaped) {
+                    state.inString = true;
+                    end = true;
+                    break;
+                }
+                escaped = !escaped && next == "\\";
+            }
+            if (end) state.tokenize = tokenBase;
+            return "string";
+        };
+    }
+
+    function tokenComment(stream, state) {
+        var maybeEnd = false, ch;
+        while (ch = stream.next()) {
+            if (ch == "#" && maybeEnd) {
+                state.tokenize = tokenBase;
+                break;
+            }
+            maybeEnd = (ch == "*");
+        }
+        return "comment";
+    }
+
+    function tokenUnparsed(stream, state) {
+        var maybeEnd = 0, ch;
+        while (ch = stream.next()) {
+            if (ch == "#" && maybeEnd == 2) {
+                state.tokenize = tokenBase;
+                break;
+            }
+            if (ch == "]")
+                maybeEnd++;
+            else if (ch != " ")
+                maybeEnd = 0;
+        }
+        return "meta";
+    }
+    // Interface
+
+    return {
+        startState: function() {
+            return {
+                tokenize: tokenBase,
+                beforeParams: false,
+                inParams: false,
+                inString: false,
+                lastTokenWasBuiltin: false
+            };
+        },
+
+        token: function(stream, state) {
+            if (stream.eatSpace()) return null;
+            return state.tokenize(stream, state);
+        },
+        blockCommentStart: "#*",
+        blockCommentEnd: "*#",
+        lineComment: "##",
+        fold: "velocity"
+    };
+});
+
+CodeMirror.defineMIME("text/velocity", "velocity");
+
+});
diff --git a/core/media/editors/codemirror/mode/velocity/velocity.min.js b/core/media/editors/codemirror/mode/velocity/velocity.min.js
new file mode 100644
index 00000000..57004aaf
--- /dev/null
+++ b/core/media/editors/codemirror/mode/velocity/velocity.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("velocity",(function(){function a(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function b(a,b,c){return b.tokenize=c,c(a,b)}function c(a,c){var k=c.beforeParams;c.beforeParams=!1;var l=a.next();if("'"==l&&!c.inString&&c.inParams)return c.lastTokenWasBuiltin=!1,b(a,c,d(l));if('"'!=l){if(/[\[\]{}\(\),;\.]/.test(l))return"("==l&&k?c.inParams=!0:")"==l&&(c.inParams=!1,c.lastTokenWasBuiltin=!0),null;if(/\d/.test(l))return c.lastTokenWasBuiltin=!1,a.eatWhile(/[\w\.]/),"number";if("#"==l&&a.eat("*"))return c.lastTokenWasBuiltin=!1,b(a,c,e);if("#"==l&&a.match(/ *\[ *\[/))return c.lastTokenWasBuiltin=!1,b(a,c,f);if("#"==l&&a.eat("#"))return c.lastTokenWasBuiltin=!1,a.skipToEnd(),"comment";if("$"==l)return a.eatWhile(/[\w\d\$_\.{}-]/),i&&i.propertyIsEnumerable(a.current())?"keyword":(c.lastTokenWasBuiltin=!0,c.beforeParams=!0,"builtin");if(j.test(l))return c.lastTokenWasBuiltin=!1,a.eatWhile(j),"operator";a.eatWhile(/[\w\$_{}@]/);var m=a.current();return g&&g.propertyIsEnumerable(m)?"keyword":h&&h.propertyIsEnumerable(m)||a.current().match(/^#@?[a-z0-9_]+ *$/i)&&"("==a.peek()&&(!h||!h.propertyIsEnumerable(m.toLowerCase()))?(c.beforeParams=!0,c.lastTokenWasBuiltin=!1,"keyword"):c.inString?(c.lastTokenWasBuiltin=!1,"string"):a.pos>m.length&&"."==a.string.charAt(a.pos-m.length-1)&&c.lastTokenWasBuiltin?"builtin":(c.lastTokenWasBuiltin=!1,null)}return c.lastTokenWasBuiltin=!1,c.inString?(c.inString=!1,"string"):c.inParams?b(a,c,d(l)):void 0}function d(a){return function(b,d){for(var e,f=!1,g=!1;null!=(e=b.next());){if(e==a&&!f){g=!0;break}if('"'==a&&"$"==b.peek()&&!f){d.inString=!0,g=!0;break}f=!f&&"\\"==e}return g&&(d.tokenize=c),"string"}}function e(a,b){for(var d,e=!1;d=a.next();){if("#"==d&&e){b.tokenize=c;break}e="*"==d}return"comment"}function f(a,b){for(var d,e=0;d=a.next();){if("#"==d&&2==e){b.tokenize=c;break}"]"==d?e++:" "!=d&&(e=0)}return"meta"}var g=a("#end #else #break #stop #[[ #]] #{end} #{else} #{break} #{stop}"),h=a("#if #elseif #foreach #set #include #parse #macro #define #evaluate #{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}"),i=a("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent"),j=/[+\-*&%=<>!?:\/|]/;return{startState:function(){return{tokenize:c,beforeParams:!1,inParams:!1,inString:!1,lastTokenWasBuiltin:!1}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)},blockCommentStart:"#*",blockCommentEnd:"*#",lineComment:"##",fold:"velocity"}})),a.defineMIME("text/velocity","velocity")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/verilog/verilog.js b/core/media/editors/codemirror/mode/verilog/verilog.js
new file mode 100644
index 00000000..34046860
--- /dev/null
+++ b/core/media/editors/codemirror/mode/verilog/verilog.js
@@ -0,0 +1,675 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("verilog", function(config, parserConfig) {
+
+  var indentUnit = config.indentUnit,
+      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
+      dontAlignCalls = parserConfig.dontAlignCalls,
+      noIndentKeywords = parserConfig.noIndentKeywords || [],
+      multiLineStrings = parserConfig.multiLineStrings,
+      hooks = parserConfig.hooks || {};
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  /**
+   * Keywords from IEEE 1800-2012
+   */
+  var keywords = words(
+    "accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind " +
+    "bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config " +
+    "const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable " +
+    "dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup " +
+    "endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask " +
+    "enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin " +
+    "function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import " +
+    "incdir include initial inout input inside instance int integer interconnect interface intersect join join_any " +
+    "join_none large let liblist library local localparam logic longint macromodule matches medium modport module " +
+    "nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed " +
+    "parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup " +
+    "pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg " +
+    "reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime " +
+    "s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify " +
+    "specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on " +
+    "table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior " +
+    "trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void " +
+    "wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor");
+
+  /** Operators from IEEE 1800-2012
+     unary_operator ::=
+       + | - | ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~
+     binary_operator ::=
+       + | - | * | / | % | == | != | === | !== | ==? | !=? | && | || | **
+       | < | <= | > | >= | & | | | ^ | ^~ | ~^ | >> | << | >>> | <<<
+       | -> | <->
+     inc_or_dec_operator ::= ++ | --
+     unary_module_path_operator ::=
+       ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~
+     binary_module_path_operator ::=
+       == | != | && | || | & | | | ^ | ^~ | ~^
+  */
+  var isOperatorChar = /[\+\-\*\/!~&|^%=?:]/;
+  var isBracketChar = /[\[\]{}()]/;
+
+  var unsignedNumber = /\d[0-9_]*/;
+  var decimalLiteral = /\d*\s*'s?d\s*\d[0-9_]*/i;
+  var binaryLiteral = /\d*\s*'s?b\s*[xz01][xz01_]*/i;
+  var octLiteral = /\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i;
+  var hexLiteral = /\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i;
+  var realLiteral = /(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i;
+
+  var closingBracketOrWord = /^((\w+)|[)}\]])/;
+  var closingBracket = /[)}\]]/;
+
+  var curPunc;
+  var curKeyword;
+
+  // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
+  // E.g. "task" => "endtask"
+  var blockKeywords = words(
+    "case checker class clocking config function generate interface module package " +
+    "primitive program property specify sequence table task"
+  );
+
+  // Opening/closing pairs
+  var openClose = {};
+  for (var keyword in blockKeywords) {
+    openClose[keyword] = "end" + keyword;
+  }
+  openClose["begin"] = "end";
+  openClose["casex"] = "endcase";
+  openClose["casez"] = "endcase";
+  openClose["do"   ] = "while";
+  openClose["fork" ] = "join;join_any;join_none";
+  openClose["covergroup"] = "endgroup";
+
+  for (var i in noIndentKeywords) {
+    var keyword = noIndentKeywords[i];
+    if (openClose[keyword]) {
+      openClose[keyword] = undefined;
+    }
+  }
+
+  // Keywords which open statements that are ended with a semi-colon
+  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");
+
+  function tokenBase(stream, state) {
+    var ch = stream.peek(), style;
+    if (hooks[ch] && (style = hooks[ch](stream, state)) != false) return style;
+    if (hooks.tokenBase && (style = hooks.tokenBase(stream, state)) != false)
+      return style;
+
+    if (/[,;:\.]/.test(ch)) {
+      curPunc = stream.next();
+      return null;
+    }
+    if (isBracketChar.test(ch)) {
+      curPunc = stream.next();
+      return "bracket";
+    }
+    // Macros (tick-defines)
+    if (ch == '`') {
+      stream.next();
+      if (stream.eatWhile(/[\w\$_]/)) {
+        return "def";
+      } else {
+        return null;
+      }
+    }
+    // System calls
+    if (ch == '$') {
+      stream.next();
+      if (stream.eatWhile(/[\w\$_]/)) {
+        return "meta";
+      } else {
+        return null;
+      }
+    }
+    // Time literals
+    if (ch == '#') {
+      stream.next();
+      stream.eatWhile(/[\d_.]/);
+      return "def";
+    }
+    // Strings
+    if (ch == '"') {
+      stream.next();
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    // Comments
+    if (ch == "/") {
+      stream.next();
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      stream.backUp(1);
+    }
+
+    // Numeric literals
+    if (stream.match(realLiteral) ||
+        stream.match(decimalLiteral) ||
+        stream.match(binaryLiteral) ||
+        stream.match(octLiteral) ||
+        stream.match(hexLiteral) ||
+        stream.match(unsignedNumber) ||
+        stream.match(realLiteral)) {
+      return "number";
+    }
+
+    // Operators
+    if (stream.eatWhile(isOperatorChar)) {
+      return "meta";
+    }
+
+    // Keywords / plain variables
+    if (stream.eatWhile(/[\w\$_]/)) {
+      var cur = stream.current();
+      if (keywords[cur]) {
+        if (openClose[cur]) {
+          curPunc = "newblock";
+        }
+        if (statementKeywords[cur]) {
+          curPunc = "newstatement";
+        }
+        curKeyword = cur;
+        return "keyword";
+      }
+      return "variable";
+    }
+
+    stream.next();
+    return null;
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    var indent = state.indented;
+    var c = new Context(indent, col, type, null, state.context);
+    return state.context = c;
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}") {
+      state.indented = state.context.indented;
+    }
+    return state.context = state.context.prev;
+  }
+
+  function isClosing(text, contextClosing) {
+    if (text == contextClosing) {
+      return true;
+    } else {
+      // contextClosing may be multiple keywords separated by ;
+      var closingKeywords = contextClosing.split(";");
+      for (var i in closingKeywords) {
+        if (text == closingKeywords[i]) {
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+
+  function buildElectricInputRegEx() {
+    // Reindentation should occur on any bracket char: {}()[]
+    // or on a match of any of the block closing keywords, at
+    // the end of a line
+    var allClosings = [];
+    for (var i in openClose) {
+      if (openClose[i]) {
+        var closings = openClose[i].split(";");
+        for (var j in closings) {
+          allClosings.push(closings[j]);
+        }
+      }
+    }
+    var re = new RegExp("[{}()\\[\\]]|(" + allClosings.join("|") + ")$");
+    return re;
+  }
+
+  // Interface
+  return {
+
+    // Regex to force current line to reindent
+    electricInput: buildElectricInputRegEx(),
+
+    startState: function(basecolumn) {
+      var state = {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+      if (hooks.startState) hooks.startState(state);
+      return state;
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
+      if (hooks.token) {
+        // Call hook, with an optional return value of a style to override verilog styling.
+        var style = hooks.token(stream, state);
+        if (style !== undefined) {
+          return style;
+        }
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      curKeyword = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta" || style == "variable") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if (curPunc == ctx.type) {
+        popContext(state);
+      } else if ((curPunc == ";" && ctx.type == "statement") ||
+               (ctx.type && isClosing(curKeyword, ctx.type))) {
+        ctx = popContext(state);
+        while (ctx && ctx.type == "statement") ctx = popContext(state);
+      } else if (curPunc == "{") {
+        pushContext(state, stream.column(), "}");
+      } else if (curPunc == "[") {
+        pushContext(state, stream.column(), "]");
+      } else if (curPunc == "(") {
+        pushContext(state, stream.column(), ")");
+      } else if (ctx && ctx.type == "endcase" && curPunc == ":") {
+        pushContext(state, stream.column(), "statement");
+      } else if (curPunc == "newstatement") {
+        pushContext(state, stream.column(), "statement");
+      } else if (curPunc == "newblock") {
+        if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) {
+          // The 'function' keyword can appear in some other contexts where it actually does not
+          // indicate a function (import/export DPI and covergroup definitions).
+          // Do nothing in this case
+        } else if (curKeyword == "task" && ctx && ctx.type == "statement") {
+          // Same thing for task
+        } else {
+          var close = openClose[curKeyword];
+          pushContext(state, stream.column(), close);
+        }
+      }
+
+      state.startOfLine = false;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
+      if (hooks.indent) {
+        var fromHook = hooks.indent(state);
+        if (fromHook >= 0) return fromHook;
+      }
+      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      var closing = false;
+      var possibleClosing = textAfter.match(closingBracketOrWord);
+      if (possibleClosing)
+        closing = isClosing(possibleClosing[0], ctx.type);
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
+      else if (closingBracket.test(ctx.type) && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1);
+      else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
+  };
+});
+
+  CodeMirror.defineMIME("text/x-verilog", {
+    name: "verilog"
+  });
+
+  CodeMirror.defineMIME("text/x-systemverilog", {
+    name: "verilog"
+  });
+
+
+
+  // TL-Verilog mode.
+  // See tl-x.org for language spec.
+  // See the mode in action at makerchip.com.
+  // Contact: steve.hoover@redwoodeda.com
+
+  // TLV Identifier prefixes.
+  // Note that sign is not treated separately, so "+/-" versions of numeric identifiers
+  // are included.
+  var tlvIdentifierStyle = {
+    "|": "link",
+    ">": "property",  // Should condition this off for > TLV 1c.
+    "$": "variable",
+    "$$": "variable",
+    "?$": "qualifier",
+    "?*": "qualifier",
+    "-": "hr",
+    "/": "property",
+    "/-": "property",
+    "@": "variable-3",
+    "@-": "variable-3",
+    "@++": "variable-3",
+    "@+=": "variable-3",
+    "@+=-": "variable-3",
+    "@--": "variable-3",
+    "@-=": "variable-3",
+    "%+": "tag",
+    "%-": "tag",
+    "%": "tag",
+    ">>": "tag",
+    "<<": "tag",
+    "<>": "tag",
+    "#": "tag",  // Need to choose a style for this.
+    "^": "attribute",
+    "^^": "attribute",
+    "^!": "attribute",
+    "*": "variable-2",
+    "**": "variable-2",
+    "\\": "keyword",
+    "\"": "comment"
+  };
+
+  // Lines starting with these characters define scope (result in indentation).
+  var tlvScopePrefixChars = {
+    "/": "beh-hier",
+    ">": "beh-hier",
+    "-": "phys-hier",
+    "|": "pipe",
+    "?": "when",
+    "@": "stage",
+    "\\": "keyword"
+  };
+  var tlvIndentUnit = 3;
+  var tlvTrackStatements = false;
+  var tlvIdentMatch = /^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/;  // Matches an identifiere.
+  // Note that ':' is excluded, because of it's use in [:].
+  var tlvFirstLevelIndentMatch = /^[! ]  /;
+  var tlvLineIndentationMatch = /^[! ] */;
+  var tlvCommentMatch = /^\/[\/\*]/;
+
+
+  // Returns a style specific to the scope at the given indentation column.
+  // Type is one of: "indent", "scope-ident", "before-scope-ident".
+  function tlvScopeStyle(state, indentation, type) {
+    // Begin scope.
+    var depth = indentation / tlvIndentUnit;  // TODO: Pass this in instead.
+    return "tlv-" + state.tlvIndentationStyle[depth] + "-" + type;
+  }
+
+  // Return true if the next thing in the stream is an identifier with a mnemonic.
+  function tlvIdentNext(stream) {
+    var match;
+    return (match = stream.match(tlvIdentMatch, false)) && match[2].length > 0;
+  }
+
+  CodeMirror.defineMIME("text/x-tlv", {
+    name: "verilog",
+
+    hooks: {
+
+      electricInput: false,
+
+
+      // Return undefined for verilog tokenizing, or style for TLV token (null not used).
+      // Standard CM styles are used for most formatting, but some TL-Verilog-specific highlighting
+      // can be enabled with the definition of cm-tlv-* styles, including highlighting for:
+      //   - M4 tokens
+      //   - TLV scope indentation
+      //   - Statement delimitation (enabled by tlvTrackStatements)
+      token: function(stream, state) {
+        var style = undefined;
+        var match;  // Return value of pattern matches.
+
+        // Set highlighting mode based on code region (TLV or SV).
+        if (stream.sol() && ! state.tlvInBlockComment) {
+          // Process region.
+          if (stream.peek() == '\\') {
+            style = "def";
+            stream.skipToEnd();
+            if (stream.string.match(/\\SV/)) {
+              state.tlvCodeActive = false;
+            } else if (stream.string.match(/\\TLV/)){
+              state.tlvCodeActive = true;
+            }
+          }
+          // Correct indentation in the face of a line prefix char.
+          if (state.tlvCodeActive && stream.pos == 0 &&
+              (state.indented == 0) && (match = stream.match(tlvLineIndentationMatch, false))) {
+            state.indented = match[0].length;
+          }
+
+          // Compute indentation state:
+          //   o Auto indentation on next line
+          //   o Indentation scope styles
+          var indented = state.indented;
+          var depth = indented / tlvIndentUnit;
+          if (depth <= state.tlvIndentationStyle.length) {
+            // not deeper than current scope
+
+            var blankline = stream.string.length == indented;
+            var chPos = depth * tlvIndentUnit;
+            if (chPos < stream.string.length) {
+              var bodyString = stream.string.slice(chPos);
+              var ch = bodyString[0];
+              if (tlvScopePrefixChars[ch] && ((match = bodyString.match(tlvIdentMatch)) &&
+                  tlvIdentifierStyle[match[1]])) {
+                // This line begins scope.
+                // Next line gets indented one level.
+                indented += tlvIndentUnit;
+                // Style the next level of indentation (except non-region keyword identifiers,
+                //   which are statements themselves)
+                if (!(ch == "\\" && chPos > 0)) {
+                  state.tlvIndentationStyle[depth] = tlvScopePrefixChars[ch];
+                  if (tlvTrackStatements) {state.statementComment = false;}
+                  depth++;
+                }
+              }
+            }
+            // Clear out deeper indentation levels unless line is blank.
+            if (!blankline) {
+              while (state.tlvIndentationStyle.length > depth) {
+                state.tlvIndentationStyle.pop();
+              }
+            }
+          }
+          // Set next level of indentation.
+          state.tlvNextIndent = indented;
+        }
+
+        if (state.tlvCodeActive) {
+          // Highlight as TLV.
+
+          var beginStatement = false;
+          if (tlvTrackStatements) {
+            // This starts a statement if the position is at the scope level
+            // and we're not within a statement leading comment.
+            beginStatement =
+                   (stream.peek() != " ") &&   // not a space
+                   (style === undefined) &&    // not a region identifier
+                   !state.tlvInBlockComment && // not in block comment
+                   //!stream.match(tlvCommentMatch, false) && // not comment start
+                   (stream.column() == state.tlvIndentationStyle.length * tlvIndentUnit);  // at scope level
+            if (beginStatement) {
+              if (state.statementComment) {
+                // statement already started by comment
+                beginStatement = false;
+              }
+              state.statementComment =
+                   stream.match(tlvCommentMatch, false); // comment start
+            }
+          }
+
+          var match;
+          if (style !== undefined) {
+            // Region line.
+            style += " " + tlvScopeStyle(state, 0, "scope-ident")
+          } else if (((stream.pos / tlvIndentUnit) < state.tlvIndentationStyle.length) &&
+                     (match = stream.match(stream.sol() ? tlvFirstLevelIndentMatch : /^   /))) {
+            // Indentation
+            style = // make this style distinct from the previous one to prevent
+                    // codemirror from combining spans
+                    "tlv-indent-" + (((stream.pos % 2) == 0) ? "even" : "odd") +
+                    // and style it
+                    " " + tlvScopeStyle(state, stream.pos - tlvIndentUnit, "indent");
+            // Style the line prefix character.
+            if (match[0].charAt(0) == "!") {
+              style += " tlv-alert-line-prefix";
+            }
+            // Place a class before a scope identifier.
+            if (tlvIdentNext(stream)) {
+              style += " " + tlvScopeStyle(state, stream.pos, "before-scope-ident");
+            }
+          } else if (state.tlvInBlockComment) {
+            // In a block comment.
+            if (stream.match(/^.*?\*\//)) {
+              // Exit block comment.
+              state.tlvInBlockComment = false;
+              if (tlvTrackStatements && !stream.eol()) {
+                // Anything after comment is assumed to be real statement content.
+                state.statementComment = false;
+              }
+            } else {
+              stream.skipToEnd();
+            }
+            style = "comment";
+          } else if ((match = stream.match(tlvCommentMatch)) && !state.tlvInBlockComment) {
+            // Start comment.
+            if (match[0] == "//") {
+              // Line comment.
+              stream.skipToEnd();
+            } else {
+              // Block comment.
+              state.tlvInBlockComment = true;
+            }
+            style = "comment";
+          } else if (match = stream.match(tlvIdentMatch)) {
+            // looks like an identifier (or identifier prefix)
+            var prefix = match[1];
+            var mnemonic = match[2];
+            if (// is identifier prefix
+                tlvIdentifierStyle.hasOwnProperty(prefix) &&
+                // has mnemonic or we're at the end of the line (maybe it hasn't been typed yet)
+                (mnemonic.length > 0 || stream.eol())) {
+              style = tlvIdentifierStyle[prefix];
+              if (stream.column() == state.indented) {
+                // Begin scope.
+                style += " " + tlvScopeStyle(state, stream.column(), "scope-ident")
+              }
+            } else {
+              // Just swallow one character and try again.
+              // This enables subsequent identifier match with preceding symbol character, which
+              //   is legal within a statement.  (Eg, !$reset).  It also enables detection of
+              //   comment start with preceding symbols.
+              stream.backUp(stream.current().length - 1);
+              style = "tlv-default";
+            }
+          } else if (stream.match(/^\t+/)) {
+            // Highlight tabs, which are illegal.
+            style = "tlv-tab";
+          } else if (stream.match(/^[\[\]{}\(\);\:]+/)) {
+            // [:], (), {}, ;.
+            style = "meta";
+          } else if (match = stream.match(/^[mM]4([\+_])?[\w\d_]*/)) {
+            // m4 pre proc
+            style = (match[1] == "+") ? "tlv-m4-plus" : "tlv-m4";
+          } else if (stream.match(/^ +/)){
+            // Skip over spaces.
+            if (stream.eol()) {
+              // Trailing spaces.
+              style = "error";
+            } else {
+              // Non-trailing spaces.
+              style = "tlv-default";
+            }
+          } else if (stream.match(/^[\w\d_]+/)) {
+            // alpha-numeric token.
+            style = "number";
+          } else {
+            // Eat the next char w/ no formatting.
+            stream.next();
+            style = "tlv-default";
+          }
+          if (beginStatement) {
+            style += " tlv-statement";
+          }
+        } else {
+          if (stream.match(/^[mM]4([\w\d_]*)/)) {
+            // m4 pre proc
+            style = "tlv-m4";
+          }
+        }
+        return style;
+      },
+
+      indent: function(state) {
+        return (state.tlvCodeActive == true) ? state.tlvNextIndent : -1;
+      },
+
+      startState: function(state) {
+        state.tlvIndentationStyle = [];  // Styles to use for each level of indentation.
+        state.tlvCodeActive = true;  // True when we're in a TLV region (and at beginning of file).
+        state.tlvNextIndent = -1;    // The number of spaces to autoindent the next line if tlvCodeActive.
+        state.tlvInBlockComment = false;  // True inside /**/ comment.
+        if (tlvTrackStatements) {
+          state.statementComment = false;  // True inside a statement's header comment.
+        }
+      }
+
+    }
+  });
+});
diff --git a/core/media/editors/codemirror/mode/verilog/verilog.min.js b/core/media/editors/codemirror/mode/verilog/verilog.min.js
new file mode 100644
index 00000000..35367f67
--- /dev/null
+++ b/core/media/editors/codemirror/mode/verilog/verilog.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a,b,c){var d=b/f;return"tlv-"+a.tlvIndentationStyle[d]+"-"+c}function c(a){var b;return(b=a.match(h,!1))&&b[2].length>0}a.defineMode("verilog",(function(b,c){function d(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function e(a,b){var c,d=a.peek();if(t[d]&&0!=(c=t[d](a,b)))return c;if(t.tokenBase&&0!=(c=t.tokenBase(a,b)))return c;if(/[,;:\.]/.test(d))return m=a.next(),null;if(w.test(d))return m=a.next(),"bracket";if("`"==d)return a.next(),a.eatWhile(/[\w\$_]/)?"def":null;if("$"==d)return a.next(),a.eatWhile(/[\w\$_]/)?"meta":null;if("#"==d)return a.next(),a.eatWhile(/[\d_.]/),"def";if('"'==d)return a.next(),b.tokenize=f(d),b.tokenize(a,b);if("/"==d){if(a.next(),a.eat("*"))return b.tokenize=g,g(a,b);if(a.eat("/"))return a.skipToEnd(),"comment";a.backUp(1)}if(a.match(C)||a.match(y)||a.match(z)||a.match(A)||a.match(B)||a.match(x)||a.match(C))return"number";if(a.eatWhile(v))return"meta";if(a.eatWhile(/[\w\$_]/)){var e=a.current();return u[e]?(G[e]&&(m="newblock"),J[e]&&(m="newstatement"),n=e,"keyword"):"variable"}return a.next(),null}function f(a){return function(b,c){for(var d,f=!1,g=!1;null!=(d=b.next());){if(d==a&&!f){g=!0;break}f=!f&&"\\"==d}return(g||!f&&!s)&&(c.tokenize=e),"string"}}function g(a,b){for(var c,d=!1;c=a.next();){if("/"==c&&d){b.tokenize=e;break}d="*"==c}return"comment"}function h(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function i(a,b,c){var d=a.indented,e=new h(d,b,c,null,a.context);return a.context=e}function j(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}function k(a,b){if(a==b)return!0;var c=b.split(";");for(var d in c)if(a==c[d])return!0;return!1}function l(){var a=[];for(var b in G)if(G[b]){var c=G[b].split(";");for(var d in c)a.push(c[d])}var e=new RegExp("[{}()\\[\\]]|("+a.join("|")+")$");return e}var m,n,o=b.indentUnit,p=c.statementIndentUnit||o,q=c.dontAlignCalls,r=c.noIndentKeywords||[],s=c.multiLineStrings,t=c.hooks||{},u=d("accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor"),v=/[\+\-\*\/!~&|^%=?:]/,w=/[\[\]{}()]/,x=/\d[0-9_]*/,y=/\d*\s*'s?d\s*\d[0-9_]*/i,z=/\d*\s*'s?b\s*[xz01][xz01_]*/i,A=/\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i,B=/\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i,C=/(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i,D=/^((\w+)|[)}\]])/,E=/[)}\]]/,F=d("case checker class clocking config function generate interface module package primitive program property specify sequence table task"),G={};for(var H in F)G[H]="end"+H;G.begin="end",G.casex="endcase",G.casez="endcase",G.do="while",G.fork="join;join_any;join_none",G.covergroup="endgroup";for(var I in r){var H=r[I];G[H]&&(G[H]=void 0)}var J=d("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");return{electricInput:l(),startState:function(a){var b={tokenize:null,context:new h((a||0)-o,0,"top",!1),indented:0,startOfLine:!0};return t.startState&&t.startState(b),b},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0),t.token){var d=t.token(a,b);if(void 0!==d)return d}if(a.eatSpace())return null;m=null,n=null;var d=(b.tokenize||e)(a,b);if("comment"==d||"meta"==d||"variable"==d)return d;if(null==c.align&&(c.align=!0),m==c.type)j(b);else if(";"==m&&"statement"==c.type||c.type&&k(n,c.type))for(c=j(b);c&&"statement"==c.type;)c=j(b);else if("{"==m)i(b,a.column(),"}");else if("["==m)i(b,a.column(),"]");else if("("==m)i(b,a.column(),")");else if(c&&"endcase"==c.type&&":"==m)i(b,a.column(),"statement");else if("newstatement"==m)i(b,a.column(),"statement");else if("newblock"==m)if("function"!=n||!c||"statement"!=c.type&&"endgroup"!=c.type)if("task"==n&&c&&"statement"==c.type);else{var f=G[n];i(b,a.column(),f)}else;return b.startOfLine=!1,d},indent:function(b,c){if(b.tokenize!=e&&null!=b.tokenize)return a.Pass;if(t.indent){var d=t.indent(b);if(d>=0)return d}var f=b.context,g=c&&c.charAt(0);"statement"==f.type&&"}"==g&&(f=f.prev);var h=!1,i=c.match(D);return i&&(h=k(i[0],f.type)),"statement"==f.type?f.indented+("{"==g?0:p):E.test(f.type)&&f.align&&!q?f.column+(h?0:1):")"!=f.type||h?f.indented+(h?0:o):f.indented+p},blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-verilog",{name:"verilog"}),a.defineMIME("text/x-systemverilog",{name:"verilog"});var d={"|":"link",">":"property",$:"variable",$$:"variable","?$":"qualifier","?*":"qualifier","-":"hr","/":"property","/-":"property","@":"variable-3","@-":"variable-3","@++":"variable-3","@+=":"variable-3","@+=-":"variable-3","@--":"variable-3","@-=":"variable-3","%+":"tag","%-":"tag","%":"tag",">>":"tag","<<":"tag","<>":"tag","#":"tag","^":"attribute","^^":"attribute","^!":"attribute","*":"variable-2","**":"variable-2","\\":"keyword",'"':"comment"},e={"/":"beh-hier",">":"beh-hier","-":"phys-hier","|":"pipe","?":"when","@":"stage","\\":"keyword"},f=3,g=!1,h=/^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/,i=/^[! ]  /,j=/^[! ] */,k=/^\/[\/\*]/;a.defineMIME("text/x-tlv",{name:"verilog",hooks:{electricInput:!1,token:function(a,l){var m,n=void 0;if(a.sol()&&!l.tlvInBlockComment){"\\"==a.peek()&&(n="def",a.skipToEnd(),a.string.match(/\\SV/)?l.tlvCodeActive=!1:a.string.match(/\\TLV/)&&(l.tlvCodeActive=!0)),l.tlvCodeActive&&0==a.pos&&0==l.indented&&(m=a.match(j,!1))&&(l.indented=m[0].length);var o=l.indented,p=o/f;if(p<=l.tlvIndentationStyle.length){var q=a.string.length==o,r=p*f;if(r<a.string.length){var s=a.string.slice(r),t=s[0];e[t]&&(m=s.match(h))&&d[m[1]]&&(o+=f,"\\"==t&&r>0||(l.tlvIndentationStyle[p]=e[t],g&&(l.statementComment=!1),p++))}if(!q)for(;l.tlvIndentationStyle.length>p;)l.tlvIndentationStyle.pop()}l.tlvNextIndent=o}if(l.tlvCodeActive){var u=!1;g&&(u=" "!=a.peek()&&void 0===n&&!l.tlvInBlockComment&&a.column()==l.tlvIndentationStyle.length*f,u&&(l.statementComment&&(u=!1),l.statementComment=a.match(k,!1)));var m;if(void 0!==n)n+=" "+b(l,0,"scope-ident");else if(a.pos/f<l.tlvIndentationStyle.length&&(m=a.match(a.sol()?i:/^   /)))n="tlv-indent-"+(a.pos%2==0?"even":"odd")+" "+b(l,a.pos-f,"indent"),"!"==m[0].charAt(0)&&(n+=" tlv-alert-line-prefix"),c(a)&&(n+=" "+b(l,a.pos,"before-scope-ident"));else if(l.tlvInBlockComment)a.match(/^.*?\*\//)?(l.tlvInBlockComment=!1,g&&!a.eol()&&(l.statementComment=!1)):a.skipToEnd(),n="comment";else if((m=a.match(k))&&!l.tlvInBlockComment)"//"==m[0]?a.skipToEnd():l.tlvInBlockComment=!0,n="comment";else if(m=a.match(h)){var v=m[1],w=m[2];d.hasOwnProperty(v)&&(w.length>0||a.eol())?(n=d[v],a.column()==l.indented&&(n+=" "+b(l,a.column(),"scope-ident"))):(a.backUp(a.current().length-1),n="tlv-default")}else a.match(/^\t+/)?n="tlv-tab":a.match(/^[\[\]{}\(\);\:]+/)?n="meta":(m=a.match(/^[mM]4([\+_])?[\w\d_]*/))?n="+"==m[1]?"tlv-m4-plus":"tlv-m4":a.match(/^ +/)?n=a.eol()?"error":"tlv-default":a.match(/^[\w\d_]+/)?n="number":(a.next(),n="tlv-default");u&&(n+=" tlv-statement")}else a.match(/^[mM]4([\w\d_]*)/)&&(n="tlv-m4");return n},indent:function(a){return 1==a.tlvCodeActive?a.tlvNextIndent:-1},startState:function(a){a.tlvIndentationStyle=[],a.tlvCodeActive=!0,a.tlvNextIndent=-1,a.tlvInBlockComment=!1,g&&(a.statementComment=!1)}}})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/vhdl/vhdl.js b/core/media/editors/codemirror/mode/vhdl/vhdl.js
new file mode 100644
index 00000000..97e086e4
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vhdl/vhdl.js
@@ -0,0 +1,189 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Originally written by Alf Nielsen, re-written by Michael Zhou
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function words(str) {
+  var obj = {}, words = str.split(",");
+  for (var i = 0; i < words.length; ++i) {
+    var allCaps = words[i].toUpperCase();
+    var firstCap = words[i].charAt(0).toUpperCase() + words[i].slice(1);
+    obj[words[i]] = true;
+    obj[allCaps] = true;
+    obj[firstCap] = true;
+  }
+  return obj;
+}
+
+function metaHook(stream) {
+  stream.eatWhile(/[\w\$_]/);
+  return "meta";
+}
+
+CodeMirror.defineMode("vhdl", function(config, parserConfig) {
+  var indentUnit = config.indentUnit,
+      atoms = parserConfig.atoms || words("null"),
+      hooks = parserConfig.hooks || {"`": metaHook, "$": metaHook},
+      multiLineStrings = parserConfig.multiLineStrings;
+
+  var keywords = words("abs,access,after,alias,all,and,architecture,array,assert,attribute,begin,block," +
+      "body,buffer,bus,case,component,configuration,constant,disconnect,downto,else,elsif,end,end block,end case," +
+      "end component,end for,end generate,end if,end loop,end process,end record,end units,entity,exit,file,for," +
+      "function,generate,generic,generic map,group,guarded,if,impure,in,inertial,inout,is,label,library,linkage," +
+      "literal,loop,map,mod,nand,new,next,nor,null,of,on,open,or,others,out,package,package body,port,port map," +
+      "postponed,procedure,process,pure,range,record,register,reject,rem,report,return,rol,ror,select,severity,signal," +
+      "sla,sll,sra,srl,subtype,then,to,transport,type,unaffected,units,until,use,variable,wait,when,while,with,xnor,xor");
+
+  var blockKeywords = words("architecture,entity,begin,case,port,else,elsif,end,for,function,if");
+
+  var isOperatorChar = /[&|~><!\)\(*#%@+\/=?\:;}{,\.\^\-\[\]]/;
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (hooks[ch]) {
+      var result = hooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == '"') {
+      state.tokenize = tokenString2(ch);
+      return state.tokenize(stream, state);
+    }
+    if (ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (/[\d']/.test(ch)) {
+      stream.eatWhile(/[\w\.']/);
+      return "number";
+    }
+    if (ch == "-") {
+      if (stream.eat("-")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    var cur = stream.current();
+    if (keywords.propertyIsEnumerable(cur.toLowerCase())) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "keyword";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "--";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+  function tokenString2(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "--";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = tokenBase;
+      return "string-2";
+    };
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type;
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "{}"
+  };
+});
+
+CodeMirror.defineMIME("text/x-vhdl", "vhdl");
+
+});
diff --git a/core/media/editors/codemirror/mode/vhdl/vhdl.min.js b/core/media/editors/codemirror/mode/vhdl/vhdl.min.js
new file mode 100644
index 00000000..47cfe0d8
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vhdl/vhdl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){for(var b={},c=a.split(","),d=0;d<c.length;++d){var e=c[d].toUpperCase(),f=c[d].charAt(0).toUpperCase()+c[d].slice(1);b[c[d]]=!0,b[e]=!0,b[f]=!0}return b}function c(a){return a.eatWhile(/[\w\$_]/),"meta"}a.defineMode("vhdl",(function(a,d){function e(a,b){var c=a.next();if(n[c]){var d=n[c](a,b);if(d!==!1)return d}if('"'==c)return b.tokenize=g(c),b.tokenize(a,b);if("'"==c)return b.tokenize=f(c),b.tokenize(a,b);if(/[\[\]{}\(\),;\:\.]/.test(c))return k=c,null;if(/[\d']/.test(c))return a.eatWhile(/[\w\.']/),"number";if("-"==c&&a.eat("-"))return a.skipToEnd(),"comment";if(r.test(c))return a.eatWhile(r),"operator";a.eatWhile(/[\w\$_]/);var e=a.current();return p.propertyIsEnumerable(e.toLowerCase())?(q.propertyIsEnumerable(e)&&(k="newstatement"),"keyword"):m.propertyIsEnumerable(e)?"atom":"variable"}function f(a){return function(b,c){for(var d,f=!1,g=!1;null!=(d=b.next());){if(d==a&&!f){g=!0;break}f=!f&&"--"==d}return(g||!f&&!o)&&(c.tokenize=e),"string"}}function g(a){return function(b,c){for(var d,f=!1,g=!1;null!=(d=b.next());){if(d==a&&!f){g=!0;break}f=!f&&"--"==d}return(g||!f&&!o)&&(c.tokenize=e),"string-2"}}function h(a,b,c,d,e){this.indented=a,this.column=b,this.type=c,this.align=d,this.prev=e}function i(a,b,c){return a.context=new h(a.indented,b,c,null,a.context)}function j(a){var b=a.context.type;return")"!=b&&"]"!=b&&"}"!=b||(a.indented=a.context.indented),a.context=a.context.prev}var k,l=a.indentUnit,m=d.atoms||b("null"),n=d.hooks||{"`":c,$:c},o=d.multiLineStrings,p=b("abs,access,after,alias,all,and,architecture,array,assert,attribute,begin,block,body,buffer,bus,case,component,configuration,constant,disconnect,downto,else,elsif,end,end block,end case,end component,end for,end generate,end if,end loop,end process,end record,end units,entity,exit,file,for,function,generate,generic,generic map,group,guarded,if,impure,in,inertial,inout,is,label,library,linkage,literal,loop,map,mod,nand,new,next,nor,null,of,on,open,or,others,out,package,package body,port,port map,postponed,procedure,process,pure,range,record,register,reject,rem,report,return,rol,ror,select,severity,signal,sla,sll,sra,srl,subtype,then,to,transport,type,unaffected,units,until,use,variable,wait,when,while,with,xnor,xor"),q=b("architecture,entity,begin,case,port,else,elsif,end,for,function,if"),r=/[&|~><!\)\(*#%@+\/=?\:;}{,\.\^\-\[\]]/;return{startState:function(a){return{tokenize:null,context:new h((a||0)-l,0,"top",!1),indented:0,startOfLine:!0}},token:function(a,b){var c=b.context;if(a.sol()&&(null==c.align&&(c.align=!1),b.indented=a.indentation(),b.startOfLine=!0),a.eatSpace())return null;k=null;var d=(b.tokenize||e)(a,b);if("comment"==d||"meta"==d)return d;if(null==c.align&&(c.align=!0),";"!=k&&":"!=k||"statement"!=c.type)if("{"==k)i(b,a.column(),"}");else if("["==k)i(b,a.column(),"]");else if("("==k)i(b,a.column(),")");else if("}"==k){for(;"statement"==c.type;)c=j(b);for("}"==c.type&&(c=j(b));"statement"==c.type;)c=j(b)}else k==c.type?j(b):("}"==c.type||"top"==c.type||"statement"==c.type&&"newstatement"==k)&&i(b,a.column(),"statement");else j(b);return b.startOfLine=!1,d},indent:function(a,b){if(a.tokenize!=e&&null!=a.tokenize)return 0;var c=b&&b.charAt(0),d=a.context,f=c==d.type;return"statement"==d.type?d.indented+("{"==c?0:l):d.align?d.column+(f?0:1):d.indented+(f?0:l)},electricChars:"{}"}})),a.defineMIME("text/x-vhdl","vhdl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/vue/vue.js b/core/media/editors/codemirror/mode/vue/vue.js
new file mode 100644
index 00000000..84cd07c9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vue/vue.js
@@ -0,0 +1,77 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function (mod) {
+  "use strict";
+  if (typeof exports === "object" && typeof module === "object") {// CommonJS
+    mod(require("../../lib/codemirror"),
+        require("../../addon/mode/overlay"),
+        require("../xml/xml"),
+        require("../javascript/javascript"),
+        require("../coffeescript/coffeescript"),
+        require("../css/css"),
+        require("../sass/sass"),
+        require("../stylus/stylus"),
+        require("../pug/pug"),
+        require("../handlebars/handlebars"));
+  } else if (typeof define === "function" && define.amd) { // AMD
+    define(["../../lib/codemirror",
+            "../../addon/mode/overlay",
+            "../xml/xml",
+            "../javascript/javascript",
+            "../coffeescript/coffeescript",
+            "../css/css",
+            "../sass/sass",
+            "../stylus/stylus",
+            "../pug/pug",
+            "../handlebars/handlebars"], mod);
+  } else { // Plain browser env
+    mod(CodeMirror);
+  }
+})(function (CodeMirror) {
+  var tagLanguages = {
+    script: [
+      ["lang", /coffee(script)?/, "coffeescript"],
+      ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"],
+      ["lang", /^babel$/, "javascript"],
+      ["type", /^text\/babel$/, "javascript"],
+      ["type", /^text\/ecmascript-\d+$/, "javascript"]
+    ],
+    style: [
+      ["lang", /^stylus$/i, "stylus"],
+      ["lang", /^sass$/i, "sass"],
+      ["lang", /^less$/i, "text/x-less"],
+      ["lang", /^scss$/i, "text/x-scss"],
+      ["type", /^(text\/)?(x-)?styl(us)?$/i, "stylus"],
+      ["type", /^text\/sass/i, "sass"],
+      ["type", /^(text\/)?(x-)?scss$/i, "text/x-scss"],
+      ["type", /^(text\/)?(x-)?less$/i, "text/x-less"]
+    ],
+    template: [
+      ["lang", /^vue-template$/i, "vue"],
+      ["lang", /^pug$/i, "pug"],
+      ["lang", /^handlebars$/i, "handlebars"],
+      ["type", /^(text\/)?(x-)?pug$/i, "pug"],
+      ["type", /^text\/x-handlebars-template$/i, "handlebars"],
+      [null, null, "vue-template"]
+    ]
+  };
+
+  CodeMirror.defineMode("vue-template", function (config, parserConfig) {
+    var mustacheOverlay = {
+      token: function (stream) {
+        if (stream.match(/^\{\{.*?\}\}/)) return "meta mustache";
+        while (stream.next() && !stream.match("{{", false)) {}
+        return null;
+      }
+    };
+    return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay);
+  });
+
+  CodeMirror.defineMode("vue", function (config) {
+    return CodeMirror.getMode(config, {name: "htmlmixed", tags: tagLanguages});
+  }, "htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "pug", "handlebars");
+
+  CodeMirror.defineMIME("script/x-vue", "vue");
+  CodeMirror.defineMIME("text/x-vue", "vue");
+});
diff --git a/core/media/editors/codemirror/mode/vue/vue.min.js b/core/media/editors/codemirror/mode/vue/vue.min.js
new file mode 100644
index 00000000..47211a7b
--- /dev/null
+++ b/core/media/editors/codemirror/mode/vue/vue.min.js
@@ -0,0 +1 @@
+!(function(a){"use strict";"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../../addon/mode/overlay"),require("../xml/xml"),require("../javascript/javascript"),require("../coffeescript/coffeescript"),require("../css/css"),require("../sass/sass"),require("../stylus/stylus"),require("../pug/pug"),require("../handlebars/handlebars")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../../addon/mode/overlay","../xml/xml","../javascript/javascript","../coffeescript/coffeescript","../css/css","../sass/sass","../stylus/stylus","../pug/pug","../handlebars/handlebars"],a):a(CodeMirror)})((function(a){var b={script:[["lang",/coffee(script)?/,"coffeescript"],["type",/^(?:text|application)\/(?:x-)?coffee(?:script)?$/,"coffeescript"],["lang",/^babel$/,"javascript"],["type",/^text\/babel$/,"javascript"],["type",/^text\/ecmascript-\d+$/,"javascript"]],style:[["lang",/^stylus$/i,"stylus"],["lang",/^sass$/i,"sass"],["lang",/^less$/i,"text/x-less"],["lang",/^scss$/i,"text/x-scss"],["type",/^(text\/)?(x-)?styl(us)?$/i,"stylus"],["type",/^text\/sass/i,"sass"],["type",/^(text\/)?(x-)?scss$/i,"text/x-scss"],["type",/^(text\/)?(x-)?less$/i,"text/x-less"]],template:[["lang",/^vue-template$/i,"vue"],["lang",/^pug$/i,"pug"],["lang",/^handlebars$/i,"handlebars"],["type",/^(text\/)?(x-)?pug$/i,"pug"],["type",/^text\/x-handlebars-template$/i,"handlebars"],[null,null,"vue-template"]]};a.defineMode("vue-template",(function(b,c){var d={token:function(a){if(a.match(/^\{\{.*?\}\}/))return"meta mustache";for(;a.next()&&!a.match("{{",!1););return null}};return a.overlayMode(a.getMode(b,c.backdrop||"text/html"),d)})),a.defineMode("vue",(function(c){return a.getMode(c,{name:"htmlmixed",tags:b})}),"htmlmixed","xml","javascript","coffeescript","css","sass","stylus","pug","handlebars"),a.defineMIME("script/x-vue","vue"),a.defineMIME("text/x-vue","vue")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/webidl/webidl.js b/core/media/editors/codemirror/mode/webidl/webidl.js
new file mode 100644
index 00000000..81433362
--- /dev/null
+++ b/core/media/editors/codemirror/mode/webidl/webidl.js
@@ -0,0 +1,195 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function wordRegexp(words) {
+  return new RegExp("^((" + words.join(")|(") + "))\\b");
+};
+
+var builtinArray = [
+  "Clamp",
+  "Constructor",
+  "EnforceRange",
+  "Exposed",
+  "ImplicitThis",
+  "Global", "PrimaryGlobal",
+  "LegacyArrayClass",
+  "LegacyUnenumerableNamedProperties",
+  "LenientThis",
+  "NamedConstructor",
+  "NewObject",
+  "NoInterfaceObject",
+  "OverrideBuiltins",
+  "PutForwards",
+  "Replaceable",
+  "SameObject",
+  "TreatNonObjectAsNull",
+  "TreatNullAs",
+    "EmptyString",
+  "Unforgeable",
+  "Unscopeable"
+];
+var builtins = wordRegexp(builtinArray);
+
+var typeArray = [
+  "unsigned", "short", "long",                  // UnsignedIntegerType
+  "unrestricted", "float", "double",            // UnrestrictedFloatType
+  "boolean", "byte", "octet",                   // Rest of PrimitiveType
+  "Promise",                                    // PromiseType
+  "ArrayBuffer", "DataView", "Int8Array", "Int16Array", "Int32Array",
+  "Uint8Array", "Uint16Array", "Uint32Array", "Uint8ClampedArray",
+  "Float32Array", "Float64Array",               // BufferRelatedType
+  "ByteString", "DOMString", "USVString", "sequence", "object", "RegExp",
+  "Error", "DOMException", "FrozenArray",       // Rest of NonAnyType
+  "any",                                        // Rest of SingleType
+  "void"                                        // Rest of ReturnType
+];
+var types = wordRegexp(typeArray);
+
+var keywordArray = [
+  "attribute", "callback", "const", "deleter", "dictionary", "enum", "getter",
+  "implements", "inherit", "interface", "iterable", "legacycaller", "maplike",
+  "partial", "required", "serializer", "setlike", "setter", "static",
+  "stringifier", "typedef",                     // ArgumentNameKeyword except
+                                                // "unrestricted"
+  "optional", "readonly", "or"
+];
+var keywords = wordRegexp(keywordArray);
+
+var atomArray = [
+  "true", "false",                              // BooleanLiteral
+  "Infinity", "NaN",                            // FloatLiteral
+  "null"                                        // Rest of ConstValue
+];
+var atoms = wordRegexp(atomArray);
+
+CodeMirror.registerHelper("hintWords", "webidl",
+    builtinArray.concat(typeArray).concat(keywordArray).concat(atomArray));
+
+var startDefArray = ["callback", "dictionary", "enum", "interface"];
+var startDefs = wordRegexp(startDefArray);
+
+var endDefArray = ["typedef"];
+var endDefs = wordRegexp(endDefArray);
+
+var singleOperators = /^[:<=>?]/;
+var integers = /^-?([1-9][0-9]*|0[Xx][0-9A-Fa-f]+|0[0-7]*)/;
+var floats = /^-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+)/;
+var identifiers = /^_?[A-Za-z][0-9A-Z_a-z-]*/;
+var identifiersEnd = /^_?[A-Za-z][0-9A-Z_a-z-]*(?=\s*;)/;
+var strings = /^"[^"]*"/;
+var multilineComments = /^\/\*.*?\*\//;
+var multilineCommentsStart = /^\/\*.*/;
+var multilineCommentsEnd = /^.*?\*\//;
+
+function readToken(stream, state) {
+  // whitespace
+  if (stream.eatSpace()) return null;
+
+  // comment
+  if (state.inComment) {
+    if (stream.match(multilineCommentsEnd)) {
+      state.inComment = false;
+      return "comment";
+    }
+    stream.skipToEnd();
+    return "comment";
+  }
+  if (stream.match("//")) {
+    stream.skipToEnd();
+    return "comment";
+  }
+  if (stream.match(multilineComments)) return "comment";
+  if (stream.match(multilineCommentsStart)) {
+    state.inComment = true;
+    return "comment";
+  }
+
+  // integer and float
+  if (stream.match(/^-?[0-9\.]/, false)) {
+    if (stream.match(integers) || stream.match(floats)) return "number";
+  }
+
+  // string
+  if (stream.match(strings)) return "string";
+
+  // identifier
+  if (state.startDef && stream.match(identifiers)) return "def";
+
+  if (state.endDef && stream.match(identifiersEnd)) {
+    state.endDef = false;
+    return "def";
+  }
+
+  if (stream.match(keywords)) return "keyword";
+
+  if (stream.match(types)) {
+    var lastToken = state.lastToken;
+    var nextToken = (stream.match(/^\s*(.+?)\b/, false) || [])[1];
+
+    if (lastToken === ":" || lastToken === "implements" ||
+        nextToken === "implements" || nextToken === "=") {
+      // Used as identifier
+      return "builtin";
+    } else {
+      // Used as type
+      return "variable-3";
+    }
+  }
+
+  if (stream.match(builtins)) return "builtin";
+  if (stream.match(atoms)) return "atom";
+  if (stream.match(identifiers)) return "variable";
+
+  // other
+  if (stream.match(singleOperators)) return "operator";
+
+  // unrecognized
+  stream.next();
+  return null;
+};
+
+CodeMirror.defineMode("webidl", function() {
+  return {
+    startState: function() {
+      return {
+        // Is in multiline comment
+        inComment: false,
+        // Last non-whitespace, matched token
+        lastToken: "",
+        // Next token is a definition
+        startDef: false,
+        // Last token of the statement is a definition
+        endDef: false
+      };
+    },
+    token: function(stream, state) {
+      var style = readToken(stream, state);
+
+      if (style) {
+        var cur = stream.current();
+        state.lastToken = cur;
+        if (style === "keyword") {
+          state.startDef = startDefs.test(cur);
+          state.endDef = state.endDef || endDefs.test(cur);
+        } else {
+          state.startDef = false;
+        }
+      }
+
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-webidl", "webidl");
+});
diff --git a/core/media/editors/codemirror/mode/webidl/webidl.min.js b/core/media/editors/codemirror/mode/webidl/webidl.min.js
new file mode 100644
index 00000000..669f13c9
--- /dev/null
+++ b/core/media/editors/codemirror/mode/webidl/webidl.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";function b(a){return new RegExp("^(("+a.join(")|(")+"))\\b")}function c(a,b){if(a.eatSpace())return null;if(b.inComment)return a.match(x)?(b.inComment=!1,"comment"):(a.skipToEnd(),"comment");if(a.match("//"))return a.skipToEnd(),"comment";if(a.match(v))return"comment";if(a.match(w))return b.inComment=!0,"comment";if(a.match(/^-?[0-9\.]/,!1)&&(a.match(q)||a.match(r)))return"number";if(a.match(u))return"string";if(b.startDef&&a.match(s))return"def";if(b.endDef&&a.match(t))return b.endDef=!1,"def";if(a.match(i))return"keyword";if(a.match(g)){var c=b.lastToken,d=(a.match(/^\s*(.+?)\b/,!1)||[])[1];return":"===c||"implements"===c||"implements"===d||"="===d?"builtin":"variable-3"}return a.match(e)?"builtin":a.match(k)?"atom":a.match(s)?"variable":a.match(p)?"operator":(a.next(),null)}var d=["Clamp","Constructor","EnforceRange","Exposed","ImplicitThis","Global","PrimaryGlobal","LegacyArrayClass","LegacyUnenumerableNamedProperties","LenientThis","NamedConstructor","NewObject","NoInterfaceObject","OverrideBuiltins","PutForwards","Replaceable","SameObject","TreatNonObjectAsNull","TreatNullAs","EmptyString","Unforgeable","Unscopeable"],e=b(d),f=["unsigned","short","long","unrestricted","float","double","boolean","byte","octet","Promise","ArrayBuffer","DataView","Int8Array","Int16Array","Int32Array","Uint8Array","Uint16Array","Uint32Array","Uint8ClampedArray","Float32Array","Float64Array","ByteString","DOMString","USVString","sequence","object","RegExp","Error","DOMException","FrozenArray","any","void"],g=b(f),h=["attribute","callback","const","deleter","dictionary","enum","getter","implements","inherit","interface","iterable","legacycaller","maplike","partial","required","serializer","setlike","setter","static","stringifier","typedef","optional","readonly","or"],i=b(h),j=["true","false","Infinity","NaN","null"],k=b(j);a.registerHelper("hintWords","webidl",d.concat(f).concat(h).concat(j));var l=["callback","dictionary","enum","interface"],m=b(l),n=["typedef"],o=b(n),p=/^[:<=>?]/,q=/^-?([1-9][0-9]*|0[Xx][0-9A-Fa-f]+|0[0-7]*)/,r=/^-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+)/,s=/^_?[A-Za-z][0-9A-Z_a-z-]*/,t=/^_?[A-Za-z][0-9A-Z_a-z-]*(?=\s*;)/,u=/^"[^"]*"/,v=/^\/\*.*?\*\//,w=/^\/\*.*/,x=/^.*?\*\//;a.defineMode("webidl",(function(){return{startState:function(){return{inComment:!1,lastToken:"",startDef:!1,endDef:!1}},token:function(a,b){var d=c(a,b);if(d){var e=a.current();b.lastToken=e,"keyword"===d?(b.startDef=m.test(e),b.endDef=b.endDef||o.test(e)):b.startDef=!1}return d}}})),a.defineMIME("text/x-webidl","webidl")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/xml/xml.js b/core/media/editors/codemirror/mode/xml/xml.js
new file mode 100644
index 00000000..0f1c9b17
--- /dev/null
+++ b/core/media/editors/codemirror/mode/xml/xml.js
@@ -0,0 +1,401 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+var htmlConfig = {
+  autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
+                    'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
+                    'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
+                    'track': true, 'wbr': true, 'menuitem': true},
+  implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
+                     'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
+                     'th': true, 'tr': true},
+  contextGrabbers: {
+    'dd': {'dd': true, 'dt': true},
+    'dt': {'dd': true, 'dt': true},
+    'li': {'li': true},
+    'option': {'option': true, 'optgroup': true},
+    'optgroup': {'optgroup': true},
+    'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
+          'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
+          'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
+          'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
+          'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
+    'rp': {'rp': true, 'rt': true},
+    'rt': {'rp': true, 'rt': true},
+    'tbody': {'tbody': true, 'tfoot': true},
+    'td': {'td': true, 'th': true},
+    'tfoot': {'tbody': true},
+    'th': {'td': true, 'th': true},
+    'thead': {'tbody': true, 'tfoot': true},
+    'tr': {'tr': true}
+  },
+  doNotIndent: {"pre": true},
+  allowUnquoted: true,
+  allowMissing: true,
+  caseFold: true
+}
+
+var xmlConfig = {
+  autoSelfClosers: {},
+  implicitlyClosed: {},
+  contextGrabbers: {},
+  doNotIndent: {},
+  allowUnquoted: false,
+  allowMissing: false,
+  allowMissingTagName: false,
+  caseFold: false
+}
+
+CodeMirror.defineMode("xml", function(editorConf, config_) {
+  var indentUnit = editorConf.indentUnit
+  var config = {}
+  var defaults = config_.htmlMode ? htmlConfig : xmlConfig
+  for (var prop in defaults) config[prop] = defaults[prop]
+  for (var prop in config_) config[prop] = config_[prop]
+
+  // Return variables for tokenizers
+  var type, setStyle;
+
+  function inText(stream, state) {
+    function chain(parser) {
+      state.tokenize = parser;
+      return parser(stream, state);
+    }
+
+    var ch = stream.next();
+    if (ch == "<") {
+      if (stream.eat("!")) {
+        if (stream.eat("[")) {
+          if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
+          else return null;
+        } else if (stream.match("--")) {
+          return chain(inBlock("comment", "-->"));
+        } else if (stream.match("DOCTYPE", true, true)) {
+          stream.eatWhile(/[\w\._\-]/);
+          return chain(doctype(1));
+        } else {
+          return null;
+        }
+      } else if (stream.eat("?")) {
+        stream.eatWhile(/[\w\._\-]/);
+        state.tokenize = inBlock("meta", "?>");
+        return "meta";
+      } else {
+        type = stream.eat("/") ? "closeTag" : "openTag";
+        state.tokenize = inTag;
+        return "tag bracket";
+      }
+    } else if (ch == "&") {
+      var ok;
+      if (stream.eat("#")) {
+        if (stream.eat("x")) {
+          ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";");
+        } else {
+          ok = stream.eatWhile(/[\d]/) && stream.eat(";");
+        }
+      } else {
+        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
+      }
+      return ok ? "atom" : "error";
+    } else {
+      stream.eatWhile(/[^&<]/);
+      return null;
+    }
+  }
+  inText.isInText = true;
+
+  function inTag(stream, state) {
+    var ch = stream.next();
+    if (ch == ">" || (ch == "/" && stream.eat(">"))) {
+      state.tokenize = inText;
+      type = ch == ">" ? "endTag" : "selfcloseTag";
+      return "tag bracket";
+    } else if (ch == "=") {
+      type = "equals";
+      return null;
+    } else if (ch == "<") {
+      state.tokenize = inText;
+      state.state = baseState;
+      state.tagName = state.tagStart = null;
+      var next = state.tokenize(stream, state);
+      return next ? next + " tag error" : "tag error";
+    } else if (/[\'\"]/.test(ch)) {
+      state.tokenize = inAttribute(ch);
+      state.stringStartCol = stream.column();
+      return state.tokenize(stream, state);
+    } else {
+      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
+      return "word";
+    }
+  }
+
+  function inAttribute(quote) {
+    var closure = function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.next() == quote) {
+          state.tokenize = inTag;
+          break;
+        }
+      }
+      return "string";
+    };
+    closure.isInAttribute = true;
+    return closure;
+  }
+
+  function inBlock(style, terminator) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.match(terminator)) {
+          state.tokenize = inText;
+          break;
+        }
+        stream.next();
+      }
+      return style;
+    };
+  }
+  function doctype(depth) {
+    return function(stream, state) {
+      var ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == "<") {
+          state.tokenize = doctype(depth + 1);
+          return state.tokenize(stream, state);
+        } else if (ch == ">") {
+          if (depth == 1) {
+            state.tokenize = inText;
+            break;
+          } else {
+            state.tokenize = doctype(depth - 1);
+            return state.tokenize(stream, state);
+          }
+        }
+      }
+      return "meta";
+    };
+  }
+
+  function Context(state, tagName, startOfLine) {
+    this.prev = state.context;
+    this.tagName = tagName;
+    this.indent = state.indented;
+    this.startOfLine = startOfLine;
+    if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
+      this.noIndent = true;
+  }
+  function popContext(state) {
+    if (state.context) state.context = state.context.prev;
+  }
+  function maybePopContext(state, nextTagName) {
+    var parentTagName;
+    while (true) {
+      if (!state.context) {
+        return;
+      }
+      parentTagName = state.context.tagName;
+      if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
+          !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+        return;
+      }
+      popContext(state);
+    }
+  }
+
+  function baseState(type, stream, state) {
+    if (type == "openTag") {
+      state.tagStart = stream.column();
+      return tagNameState;
+    } else if (type == "closeTag") {
+      return closeTagNameState;
+    } else {
+      return baseState;
+    }
+  }
+  function tagNameState(type, stream, state) {
+    if (type == "word") {
+      state.tagName = stream.current();
+      setStyle = "tag";
+      return attrState;
+    } else if (config.allowMissingTagName && type == "endTag") {
+      setStyle = "tag bracket";
+      return attrState(type, stream, state);
+    } else {
+      setStyle = "error";
+      return tagNameState;
+    }
+  }
+  function closeTagNameState(type, stream, state) {
+    if (type == "word") {
+      var tagName = stream.current();
+      if (state.context && state.context.tagName != tagName &&
+          config.implicitlyClosed.hasOwnProperty(state.context.tagName))
+        popContext(state);
+      if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
+        setStyle = "tag";
+        return closeState;
+      } else {
+        setStyle = "tag error";
+        return closeStateErr;
+      }
+    } else if (config.allowMissingTagName && type == "endTag") {
+      setStyle = "tag bracket";
+      return closeState(type, stream, state);
+    } else {
+      setStyle = "error";
+      return closeStateErr;
+    }
+  }
+
+  function closeState(type, _stream, state) {
+    if (type != "endTag") {
+      setStyle = "error";
+      return closeState;
+    }
+    popContext(state);
+    return baseState;
+  }
+  function closeStateErr(type, stream, state) {
+    setStyle = "error";
+    return closeState(type, stream, state);
+  }
+
+  function attrState(type, _stream, state) {
+    if (type == "word") {
+      setStyle = "attribute";
+      return attrEqState;
+    } else if (type == "endTag" || type == "selfcloseTag") {
+      var tagName = state.tagName, tagStart = state.tagStart;
+      state.tagName = state.tagStart = null;
+      if (type == "selfcloseTag" ||
+          config.autoSelfClosers.hasOwnProperty(tagName)) {
+        maybePopContext(state, tagName);
+      } else {
+        maybePopContext(state, tagName);
+        state.context = new Context(state, tagName, tagStart == state.indented);
+      }
+      return baseState;
+    }
+    setStyle = "error";
+    return attrState;
+  }
+  function attrEqState(type, stream, state) {
+    if (type == "equals") return attrValueState;
+    if (!config.allowMissing) setStyle = "error";
+    return attrState(type, stream, state);
+  }
+  function attrValueState(type, stream, state) {
+    if (type == "string") return attrContinuedState;
+    if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;}
+    setStyle = "error";
+    return attrState(type, stream, state);
+  }
+  function attrContinuedState(type, stream, state) {
+    if (type == "string") return attrContinuedState;
+    return attrState(type, stream, state);
+  }
+
+  return {
+    startState: function(baseIndent) {
+      var state = {tokenize: inText,
+                   state: baseState,
+                   indented: baseIndent || 0,
+                   tagName: null, tagStart: null,
+                   context: null}
+      if (baseIndent != null) state.baseIndent = baseIndent
+      return state
+    },
+
+    token: function(stream, state) {
+      if (!state.tagName && stream.sol())
+        state.indented = stream.indentation();
+
+      if (stream.eatSpace()) return null;
+      type = null;
+      var style = state.tokenize(stream, state);
+      if ((style || type) && style != "comment") {
+        setStyle = null;
+        state.state = state.state(type || style, stream, state);
+        if (setStyle)
+          style = setStyle == "error" ? style + " error" : setStyle;
+      }
+      return style;
+    },
+
+    indent: function(state, textAfter, fullLine) {
+      var context = state.context;
+      // Indent multi-line strings (e.g. css).
+      if (state.tokenize.isInAttribute) {
+        if (state.tagStart == state.indented)
+          return state.stringStartCol + 1;
+        else
+          return state.indented + indentUnit;
+      }
+      if (context && context.noIndent) return CodeMirror.Pass;
+      if (state.tokenize != inTag && state.tokenize != inText)
+        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
+      // Indent the starts of attribute names.
+      if (state.tagName) {
+        if (config.multilineTagIndentPastTag !== false)
+          return state.tagStart + state.tagName.length + 2;
+        else
+          return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1);
+      }
+      if (config.alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
+      var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
+      if (tagAfter && tagAfter[1]) { // Closing tag spotted
+        while (context) {
+          if (context.tagName == tagAfter[2]) {
+            context = context.prev;
+            break;
+          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {
+            context = context.prev;
+          } else {
+            break;
+          }
+        }
+      } else if (tagAfter) { // Opening tag spotted
+        while (context) {
+          var grabbers = config.contextGrabbers[context.tagName];
+          if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
+            context = context.prev;
+          else
+            break;
+        }
+      }
+      while (context && context.prev && !context.startOfLine)
+        context = context.prev;
+      if (context) return context.indent + indentUnit;
+      else return state.baseIndent || 0;
+    },
+
+    electricInput: /<\/[\s\w:]+>$/,
+    blockCommentStart: "<!--",
+    blockCommentEnd: "-->",
+
+    configuration: config.htmlMode ? "html" : "xml",
+    helperType: config.htmlMode ? "html" : "xml",
+
+    skipAttribute: function(state) {
+      if (state.state == attrValueState)
+        state.state = attrState
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/xml", "xml");
+CodeMirror.defineMIME("application/xml", "xml");
+if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
+  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
+
+});
diff --git a/core/media/editors/codemirror/mode/xml/xml.min.js b/core/media/editors/codemirror/mode/xml/xml.min.js
new file mode 100644
index 00000000..6018e928
--- /dev/null
+++ b/core/media/editors/codemirror/mode/xml/xml.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";var b={autoSelfClosers:{area:!0,base:!0,br:!0,col:!0,command:!0,embed:!0,frame:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0,menuitem:!0},implicitlyClosed:{dd:!0,li:!0,optgroup:!0,option:!0,p:!0,rp:!0,rt:!0,tbody:!0,td:!0,tfoot:!0,th:!0,tr:!0},contextGrabbers:{dd:{dd:!0,dt:!0},dt:{dd:!0,dt:!0},li:{li:!0},option:{option:!0,optgroup:!0},optgroup:{optgroup:!0},p:{address:!0,article:!0,aside:!0,blockquote:!0,dir:!0,div:!0,dl:!0,fieldset:!0,footer:!0,form:!0,h1:!0,h2:!0,h3:!0,h4:!0,h5:!0,h6:!0,header:!0,hgroup:!0,hr:!0,menu:!0,nav:!0,ol:!0,p:!0,pre:!0,section:!0,table:!0,ul:!0},rp:{rp:!0,rt:!0},rt:{rp:!0,rt:!0},tbody:{tbody:!0,tfoot:!0},td:{td:!0,th:!0},tfoot:{tbody:!0},th:{td:!0,th:!0},thead:{tbody:!0,tfoot:!0},tr:{tr:!0}},doNotIndent:{pre:!0},allowUnquoted:!0,allowMissing:!0,caseFold:!0},c={autoSelfClosers:{},implicitlyClosed:{},contextGrabbers:{},doNotIndent:{},allowUnquoted:!1,allowMissing:!1,allowMissingTagName:!1,caseFold:!1};a.defineMode("xml",(function(d,e){function f(a,b){function c(c){return b.tokenize=c,c(a,b)}var d=a.next();if("<"==d)return a.eat("!")?a.eat("[")?a.match("CDATA[")?c(i("atom","]]>")):null:a.match("--")?c(i("comment","-->")):a.match("DOCTYPE",!0,!0)?(a.eatWhile(/[\w\._\-]/),c(j(1))):null:a.eat("?")?(a.eatWhile(/[\w\._\-]/),b.tokenize=i("meta","?>"),"meta"):(A=a.eat("/")?"closeTag":"openTag",b.tokenize=g,"tag bracket");if("&"==d){var e;return e=a.eat("#")?a.eat("x")?a.eatWhile(/[a-fA-F\d]/)&&a.eat(";"):a.eatWhile(/[\d]/)&&a.eat(";"):a.eatWhile(/[\w\.\-:]/)&&a.eat(";"),e?"atom":"error"}return a.eatWhile(/[^&<]/),null}function g(a,b){var c=a.next();if(">"==c||"/"==c&&a.eat(">"))return b.tokenize=f,A=">"==c?"endTag":"selfcloseTag","tag bracket";if("="==c)return A="equals",null;if("<"==c){b.tokenize=f,b.state=n,b.tagName=b.tagStart=null;var d=b.tokenize(a,b);return d?d+" tag error":"tag error"}return/[\'\"]/.test(c)?(b.tokenize=h(c),b.stringStartCol=a.column(),b.tokenize(a,b)):(a.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/),"word")}function h(a){var b=function(b,c){for(;!b.eol();)if(b.next()==a){c.tokenize=g;break}return"string"};return b.isInAttribute=!0,b}function i(a,b){return function(c,d){for(;!c.eol();){if(c.match(b)){d.tokenize=f;break}c.next()}return a}}function j(a){return function(b,c){for(var d;null!=(d=b.next());){if("<"==d)return c.tokenize=j(a+1),c.tokenize(b,c);if(">"==d){if(1==a){c.tokenize=f;break}return c.tokenize=j(a-1),c.tokenize(b,c)}}return"meta"}}function k(a,b,c){this.prev=a.context,this.tagName=b,this.indent=a.indented,this.startOfLine=c,(x.doNotIndent.hasOwnProperty(b)||a.context&&a.context.noIndent)&&(this.noIndent=!0)}function l(a){a.context&&(a.context=a.context.prev)}function m(a,b){for(var c;;){if(!a.context)return;if(c=a.context.tagName,!x.contextGrabbers.hasOwnProperty(c)||!x.contextGrabbers[c].hasOwnProperty(b))return;l(a)}}function n(a,b,c){return"openTag"==a?(c.tagStart=b.column(),o):"closeTag"==a?p:n}function o(a,b,c){return"word"==a?(c.tagName=b.current(),B="tag",s):x.allowMissingTagName&&"endTag"==a?(B="tag bracket",s(a,b,c)):(B="error",o)}function p(a,b,c){if("word"==a){var d=b.current();return c.context&&c.context.tagName!=d&&x.implicitlyClosed.hasOwnProperty(c.context.tagName)&&l(c),c.context&&c.context.tagName==d||x.matchClosing===!1?(B="tag",q):(B="tag error",r)}return x.allowMissingTagName&&"endTag"==a?(B="tag bracket",q(a,b,c)):(B="error",r)}function q(a,b,c){return"endTag"!=a?(B="error",q):(l(c),n)}function r(a,b,c){return B="error",q(a,b,c)}function s(a,b,c){if("word"==a)return B="attribute",t;if("endTag"==a||"selfcloseTag"==a){var d=c.tagName,e=c.tagStart;return c.tagName=c.tagStart=null,"selfcloseTag"==a||x.autoSelfClosers.hasOwnProperty(d)?m(c,d):(m(c,d),c.context=new k(c,d,e==c.indented)),n}return B="error",s}function t(a,b,c){return"equals"==a?u:(x.allowMissing||(B="error"),s(a,b,c))}function u(a,b,c){return"string"==a?v:"word"==a&&x.allowUnquoted?(B="string",s):(B="error",s(a,b,c))}function v(a,b,c){return"string"==a?v:s(a,b,c)}var w=d.indentUnit,x={},y=e.htmlMode?b:c;for(var z in y)x[z]=y[z];for(var z in e)x[z]=e[z];var A,B;return f.isInText=!0,{startState:function(a){var b={tokenize:f,state:n,indented:a||0,tagName:null,tagStart:null,context:null};return null!=a&&(b.baseIndent=a),b},token:function(a,b){if(!b.tagName&&a.sol()&&(b.indented=a.indentation()),a.eatSpace())return null;A=null;var c=b.tokenize(a,b);return(c||A)&&"comment"!=c&&(B=null,b.state=b.state(A||c,a,b),B&&(c="error"==B?c+" error":B)),c},indent:function(b,c,d){var e=b.context;if(b.tokenize.isInAttribute)return b.tagStart==b.indented?b.stringStartCol+1:b.indented+w;if(e&&e.noIndent)return a.Pass;if(b.tokenize!=g&&b.tokenize!=f)return d?d.match(/^(\s*)/)[0].length:0;if(b.tagName)return x.multilineTagIndentPastTag!==!1?b.tagStart+b.tagName.length+2:b.tagStart+w*(x.multilineTagIndentFactor||1);if(x.alignCDATA&&/<!\[CDATA\[/.test(c))return 0;var h=c&&/^<(\/)?([\w_:\.-]*)/.exec(c);if(h&&h[1])for(;e;){if(e.tagName==h[2]){e=e.prev;break}if(!x.implicitlyClosed.hasOwnProperty(e.tagName))break;e=e.prev}else if(h)for(;e;){var i=x.contextGrabbers[e.tagName];if(!i||!i.hasOwnProperty(h[2]))break;e=e.prev}for(;e&&e.prev&&!e.startOfLine;)e=e.prev;return e?e.indent+w:b.baseIndent||0},electricInput:/<\/[\s\w:]+>$/,blockCommentStart:"<!--",blockCommentEnd:"-->",configuration:x.htmlMode?"html":"xml",helperType:x.htmlMode?"html":"xml",skipAttribute:function(a){a.state==u&&(a.state=s)}}})),a.defineMIME("text/xml","xml"),a.defineMIME("application/xml","xml"),a.mimeModes.hasOwnProperty("text/html")||a.defineMIME("text/html",{name:"xml",htmlMode:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/xquery/xquery.js b/core/media/editors/codemirror/mode/xquery/xquery.js
new file mode 100644
index 00000000..f5db831c
--- /dev/null
+++ b/core/media/editors/codemirror/mode/xquery/xquery.js
@@ -0,0 +1,448 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("xquery", function() {
+
+  // The keywords object is set to the result of this self executing
+  // function. Each keyword is a property of the keywords object whose
+  // value is {type: atype, style: astyle}
+  var keywords = function(){
+    // convenience functions used to build keywords object
+    function kw(type) {return {type: type, style: "keyword"};}
+    var operator = kw("operator")
+      , atom = {type: "atom", style: "atom"}
+      , punctuation = {type: "punctuation", style: null}
+      , qualifier = {type: "axis_specifier", style: "qualifier"};
+
+    // kwObj is what is return from this function at the end
+    var kwObj = {
+      ',': punctuation
+    };
+
+    // a list of 'basic' keywords. For each add a property to kwObj with the value of
+    // {type: basic[i], style: "keyword"} e.g. 'after' --> {type: "after", style: "keyword"}
+    var basic = ['after', 'all', 'allowing', 'ancestor', 'ancestor-or-self', 'any', 'array', 'as',
+    'ascending', 'at', 'attribute', 'base-uri', 'before', 'boundary-space', 'by', 'case', 'cast',
+    'castable', 'catch', 'child', 'collation', 'comment', 'construction', 'contains', 'content',
+    'context', 'copy', 'copy-namespaces', 'count', 'decimal-format', 'declare', 'default', 'delete',
+    'descendant', 'descendant-or-self', 'descending', 'diacritics', 'different', 'distance',
+    'document', 'document-node', 'element', 'else', 'empty', 'empty-sequence', 'encoding', 'end',
+    'entire', 'every', 'exactly', 'except', 'external', 'first', 'following', 'following-sibling',
+    'for', 'from', 'ftand', 'ftnot', 'ft-option', 'ftor', 'function', 'fuzzy', 'greatest', 'group',
+    'if', 'import', 'in', 'inherit', 'insensitive', 'insert', 'instance', 'intersect', 'into',
+    'invoke', 'is', 'item', 'language', 'last', 'lax', 'least', 'let', 'levels', 'lowercase', 'map',
+    'modify', 'module', 'most', 'namespace', 'next', 'no', 'node', 'nodes', 'no-inherit',
+    'no-preserve', 'not', 'occurs', 'of', 'only', 'option', 'order', 'ordered', 'ordering',
+    'paragraph', 'paragraphs', 'parent', 'phrase', 'preceding', 'preceding-sibling', 'preserve',
+    'previous', 'processing-instruction', 'relationship', 'rename', 'replace', 'return',
+    'revalidation', 'same', 'satisfies', 'schema', 'schema-attribute', 'schema-element', 'score',
+    'self', 'sensitive', 'sentence', 'sentences', 'sequence', 'skip', 'sliding', 'some', 'stable',
+    'start', 'stemming', 'stop', 'strict', 'strip', 'switch', 'text', 'then', 'thesaurus', 'times',
+    'to', 'transform', 'treat', 'try', 'tumbling', 'type', 'typeswitch', 'union', 'unordered',
+    'update', 'updating', 'uppercase', 'using', 'validate', 'value', 'variable', 'version',
+    'weight', 'when', 'where', 'wildcards', 'window', 'with', 'without', 'word', 'words', 'xquery'];
+    for(var i=0, l=basic.length; i < l; i++) { kwObj[basic[i]] = kw(basic[i]);};
+
+    // a list of types. For each add a property to kwObj with the value of
+    // {type: "atom", style: "atom"}
+    var types = ['xs:anyAtomicType', 'xs:anySimpleType', 'xs:anyType', 'xs:anyURI',
+    'xs:base64Binary', 'xs:boolean', 'xs:byte', 'xs:date', 'xs:dateTime', 'xs:dateTimeStamp',
+    'xs:dayTimeDuration', 'xs:decimal', 'xs:double', 'xs:duration', 'xs:ENTITIES', 'xs:ENTITY',
+    'xs:float', 'xs:gDay', 'xs:gMonth', 'xs:gMonthDay', 'xs:gYear', 'xs:gYearMonth', 'xs:hexBinary',
+    'xs:ID', 'xs:IDREF', 'xs:IDREFS', 'xs:int', 'xs:integer', 'xs:item', 'xs:java', 'xs:language',
+    'xs:long', 'xs:Name', 'xs:NCName', 'xs:negativeInteger', 'xs:NMTOKEN', 'xs:NMTOKENS',
+    'xs:nonNegativeInteger', 'xs:nonPositiveInteger', 'xs:normalizedString', 'xs:NOTATION',
+    'xs:numeric', 'xs:positiveInteger', 'xs:precisionDecimal', 'xs:QName', 'xs:short', 'xs:string',
+    'xs:time', 'xs:token', 'xs:unsignedByte', 'xs:unsignedInt', 'xs:unsignedLong',
+    'xs:unsignedShort', 'xs:untyped', 'xs:untypedAtomic', 'xs:yearMonthDuration'];
+    for(var i=0, l=types.length; i < l; i++) { kwObj[types[i]] = atom;};
+
+    // each operator will add a property to kwObj with value of {type: "operator", style: "keyword"}
+    var operators = ['eq', 'ne', 'lt', 'le', 'gt', 'ge', ':=', '=', '>', '>=', '<', '<=', '.', '|', '?', 'and', 'or', 'div', 'idiv', 'mod', '*', '/', '+', '-'];
+    for(var i=0, l=operators.length; i < l; i++) { kwObj[operators[i]] = operator;};
+
+    // each axis_specifiers will add a property to kwObj with value of {type: "axis_specifier", style: "qualifier"}
+    var axis_specifiers = ["self::", "attribute::", "child::", "descendant::", "descendant-or-self::", "parent::",
+    "ancestor::", "ancestor-or-self::", "following::", "preceding::", "following-sibling::", "preceding-sibling::"];
+    for(var i=0, l=axis_specifiers.length; i < l; i++) { kwObj[axis_specifiers[i]] = qualifier; };
+
+    return kwObj;
+  }();
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  // the primary mode tokenizer
+  function tokenBase(stream, state) {
+    var ch = stream.next(),
+        mightBeFunction = false,
+        isEQName = isEQNameAhead(stream);
+
+    // an XML tag (if not in some sub, chained tokenizer)
+    if (ch == "<") {
+      if(stream.match("!--", true))
+        return chain(stream, state, tokenXMLComment);
+
+      if(stream.match("![CDATA", false)) {
+        state.tokenize = tokenCDATA;
+        return "tag";
+      }
+
+      if(stream.match("?", false)) {
+        return chain(stream, state, tokenPreProcessing);
+      }
+
+      var isclose = stream.eat("/");
+      stream.eatSpace();
+      var tagName = "", c;
+      while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
+
+      return chain(stream, state, tokenTag(tagName, isclose));
+    }
+    // start code block
+    else if(ch == "{") {
+      pushStateStack(state, { type: "codeblock"});
+      return null;
+    }
+    // end code block
+    else if(ch == "}") {
+      popStateStack(state);
+      return null;
+    }
+    // if we're in an XML block
+    else if(isInXmlBlock(state)) {
+      if(ch == ">")
+        return "tag";
+      else if(ch == "/" && stream.eat(">")) {
+        popStateStack(state);
+        return "tag";
+      }
+      else
+        return "variable";
+    }
+    // if a number
+    else if (/\d/.test(ch)) {
+      stream.match(/^\d*(?:\.\d*)?(?:E[+\-]?\d+)?/);
+      return "atom";
+    }
+    // comment start
+    else if (ch === "(" && stream.eat(":")) {
+      pushStateStack(state, { type: "comment"});
+      return chain(stream, state, tokenComment);
+    }
+    // quoted string
+    else if (!isEQName && (ch === '"' || ch === "'"))
+      return chain(stream, state, tokenString(ch));
+    // variable
+    else if(ch === "$") {
+      return chain(stream, state, tokenVariable);
+    }
+    // assignment
+    else if(ch ===":" && stream.eat("=")) {
+      return "keyword";
+    }
+    // open paren
+    else if(ch === "(") {
+      pushStateStack(state, { type: "paren"});
+      return null;
+    }
+    // close paren
+    else if(ch === ")") {
+      popStateStack(state);
+      return null;
+    }
+    // open paren
+    else if(ch === "[") {
+      pushStateStack(state, { type: "bracket"});
+      return null;
+    }
+    // close paren
+    else if(ch === "]") {
+      popStateStack(state);
+      return null;
+    }
+    else {
+      var known = keywords.propertyIsEnumerable(ch) && keywords[ch];
+
+      // if there's a EQName ahead, consume the rest of the string portion, it's likely a function
+      if(isEQName && ch === '\"') while(stream.next() !== '"'){}
+      if(isEQName && ch === '\'') while(stream.next() !== '\''){}
+
+      // gobble up a word if the character is not known
+      if(!known) stream.eatWhile(/[\w\$_-]/);
+
+      // gobble a colon in the case that is a lib func type call fn:doc
+      var foundColon = stream.eat(":");
+
+      // if there's not a second colon, gobble another word. Otherwise, it's probably an axis specifier
+      // which should get matched as a keyword
+      if(!stream.eat(":") && foundColon) {
+        stream.eatWhile(/[\w\$_-]/);
+      }
+      // if the next non whitespace character is an open paren, this is probably a function (if not a keyword of other sort)
+      if(stream.match(/^[ \t]*\(/, false)) {
+        mightBeFunction = true;
+      }
+      // is the word a keyword?
+      var word = stream.current();
+      known = keywords.propertyIsEnumerable(word) && keywords[word];
+
+      // if we think it's a function call but not yet known,
+      // set style to variable for now for lack of something better
+      if(mightBeFunction && !known) known = {type: "function_call", style: "variable def"};
+
+      // if the previous word was element, attribute, axis specifier, this word should be the name of that
+      if(isInXmlConstructor(state)) {
+        popStateStack(state);
+        return "variable";
+      }
+      // as previously checked, if the word is element,attribute, axis specifier, call it an "xmlconstructor" and
+      // push the stack so we know to look for it on the next word
+      if(word == "element" || word == "attribute" || known.type == "axis_specifier") pushStateStack(state, {type: "xmlconstructor"});
+
+      // if the word is known, return the details of that else just call this a generic 'word'
+      return known ? known.style : "variable";
+    }
+  }
+
+  // handle comments, including nested
+  function tokenComment(stream, state) {
+    var maybeEnd = false, maybeNested = false, nestedCount = 0, ch;
+    while (ch = stream.next()) {
+      if (ch == ")" && maybeEnd) {
+        if(nestedCount > 0)
+          nestedCount--;
+        else {
+          popStateStack(state);
+          break;
+        }
+      }
+      else if(ch == ":" && maybeNested) {
+        nestedCount++;
+      }
+      maybeEnd = (ch == ":");
+      maybeNested = (ch == "(");
+    }
+
+    return "comment";
+  }
+
+  // tokenizer for string literals
+  // optionally pass a tokenizer function to set state.tokenize back to when finished
+  function tokenString(quote, f) {
+    return function(stream, state) {
+      var ch;
+
+      if(isInString(state) && stream.current() == quote) {
+        popStateStack(state);
+        if(f) state.tokenize = f;
+        return "string";
+      }
+
+      pushStateStack(state, { type: "string", name: quote, tokenize: tokenString(quote, f) });
+
+      // if we're in a string and in an XML block, allow an embedded code block
+      if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
+        state.tokenize = tokenBase;
+        return "string";
+      }
+
+
+      while (ch = stream.next()) {
+        if (ch ==  quote) {
+          popStateStack(state);
+          if(f) state.tokenize = f;
+          break;
+        }
+        else {
+          // if we're in a string and in an XML block, allow an embedded code block in an attribute
+          if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
+            state.tokenize = tokenBase;
+            return "string";
+          }
+
+        }
+      }
+
+      return "string";
+    };
+  }
+
+  // tokenizer for variables
+  function tokenVariable(stream, state) {
+    var isVariableChar = /[\w\$_-]/;
+
+    // a variable may start with a quoted EQName so if the next character is quote, consume to the next quote
+    if(stream.eat("\"")) {
+      while(stream.next() !== '\"'){};
+      stream.eat(":");
+    } else {
+      stream.eatWhile(isVariableChar);
+      if(!stream.match(":=", false)) stream.eat(":");
+    }
+    stream.eatWhile(isVariableChar);
+    state.tokenize = tokenBase;
+    return "variable";
+  }
+
+  // tokenizer for XML tags
+  function tokenTag(name, isclose) {
+    return function(stream, state) {
+      stream.eatSpace();
+      if(isclose && stream.eat(">")) {
+        popStateStack(state);
+        state.tokenize = tokenBase;
+        return "tag";
+      }
+      // self closing tag without attributes?
+      if(!stream.eat("/"))
+        pushStateStack(state, { type: "tag", name: name, tokenize: tokenBase});
+      if(!stream.eat(">")) {
+        state.tokenize = tokenAttribute;
+        return "tag";
+      }
+      else {
+        state.tokenize = tokenBase;
+      }
+      return "tag";
+    };
+  }
+
+  // tokenizer for XML attributes
+  function tokenAttribute(stream, state) {
+    var ch = stream.next();
+
+    if(ch == "/" && stream.eat(">")) {
+      if(isInXmlAttributeBlock(state)) popStateStack(state);
+      if(isInXmlBlock(state)) popStateStack(state);
+      return "tag";
+    }
+    if(ch == ">") {
+      if(isInXmlAttributeBlock(state)) popStateStack(state);
+      return "tag";
+    }
+    if(ch == "=")
+      return null;
+    // quoted string
+    if (ch == '"' || ch == "'")
+      return chain(stream, state, tokenString(ch, tokenAttribute));
+
+    if(!isInXmlAttributeBlock(state))
+      pushStateStack(state, { type: "attribute", tokenize: tokenAttribute});
+
+    stream.eat(/[a-zA-Z_:]/);
+    stream.eatWhile(/[-a-zA-Z0-9_:.]/);
+    stream.eatSpace();
+
+    // the case where the attribute has not value and the tag was closed
+    if(stream.match(">", false) || stream.match("/", false)) {
+      popStateStack(state);
+      state.tokenize = tokenBase;
+    }
+
+    return "attribute";
+  }
+
+  // handle comments, including nested
+  function tokenXMLComment(stream, state) {
+    var ch;
+    while (ch = stream.next()) {
+      if (ch == "-" && stream.match("->", true)) {
+        state.tokenize = tokenBase;
+        return "comment";
+      }
+    }
+  }
+
+
+  // handle CDATA
+  function tokenCDATA(stream, state) {
+    var ch;
+    while (ch = stream.next()) {
+      if (ch == "]" && stream.match("]", true)) {
+        state.tokenize = tokenBase;
+        return "comment";
+      }
+    }
+  }
+
+  // handle preprocessing instructions
+  function tokenPreProcessing(stream, state) {
+    var ch;
+    while (ch = stream.next()) {
+      if (ch == "?" && stream.match(">", true)) {
+        state.tokenize = tokenBase;
+        return "comment meta";
+      }
+    }
+  }
+
+
+  // functions to test the current context of the state
+  function isInXmlBlock(state) { return isIn(state, "tag"); }
+  function isInXmlAttributeBlock(state) { return isIn(state, "attribute"); }
+  function isInXmlConstructor(state) { return isIn(state, "xmlconstructor"); }
+  function isInString(state) { return isIn(state, "string"); }
+
+  function isEQNameAhead(stream) {
+    // assume we've already eaten a quote (")
+    if(stream.current() === '"')
+      return stream.match(/^[^\"]+\"\:/, false);
+    else if(stream.current() === '\'')
+      return stream.match(/^[^\"]+\'\:/, false);
+    else
+      return false;
+  }
+
+  function isIn(state, type) {
+    return (state.stack.length && state.stack[state.stack.length - 1].type == type);
+  }
+
+  function pushStateStack(state, newState) {
+    state.stack.push(newState);
+  }
+
+  function popStateStack(state) {
+    state.stack.pop();
+    var reinstateTokenize = state.stack.length && state.stack[state.stack.length-1].tokenize;
+    state.tokenize = reinstateTokenize || tokenBase;
+  }
+
+  // the interface for the mode API
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        cc: [],
+        stack: []
+      };
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      return style;
+    },
+
+    blockCommentStart: "(:",
+    blockCommentEnd: ":)"
+
+  };
+
+});
+
+CodeMirror.defineMIME("application/xquery", "xquery");
+
+});
diff --git a/core/media/editors/codemirror/mode/xquery/xquery.min.js b/core/media/editors/codemirror/mode/xquery/xquery.min.js
new file mode 100644
index 00000000..e3bac49f
--- /dev/null
+++ b/core/media/editors/codemirror/mode/xquery/xquery.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("xquery",(function(){function a(a,b,c){return b.tokenize=c,c(a,b)}function b(b,g){var l=b.next(),n=!1,p=o(b);if("<"==l){if(b.match("!--",!0))return a(b,g,h);if(b.match("![CDATA",!1))return g.tokenize=i,"tag";if(b.match("?",!1))return a(b,g,j);var t=b.eat("/");b.eatSpace();for(var u,v="";u=b.eat(/[^\s\u00a0=<>\"\'\/?]/);)v+=u;return a(b,g,f(v,t))}if("{"==l)return q(g,{type:"codeblock"}),null;if("}"==l)return r(g),null;if(k(g))return">"==l?"tag":"/"==l&&b.eat(">")?(r(g),"tag"):"variable";if(/\d/.test(l))return b.match(/^\d*(?:\.\d*)?(?:E[+\-]?\d+)?/),"atom";if("("===l&&b.eat(":"))return q(g,{type:"comment"}),a(b,g,c);if(p||'"'!==l&&"'"!==l){if("$"===l)return a(b,g,e);if(":"===l&&b.eat("="))return"keyword";if("("===l)return q(g,{type:"paren"}),null;if(")"===l)return r(g),null;if("["===l)return q(g,{type:"bracket"}),null;if("]"===l)return r(g),null;var w=s.propertyIsEnumerable(l)&&s[l];if(p&&'"'===l)for(;'"'!==b.next(););if(p&&"'"===l)for(;"'"!==b.next(););w||b.eatWhile(/[\w\$_-]/);var x=b.eat(":");!b.eat(":")&&x&&b.eatWhile(/[\w\$_-]/),b.match(/^[ \t]*\(/,!1)&&(n=!0);var y=b.current();return w=s.propertyIsEnumerable(y)&&s[y],n&&!w&&(w={type:"function_call",style:"variable def"}),m(g)?(r(g),"variable"):("element"!=y&&"attribute"!=y&&"axis_specifier"!=w.type||q(g,{type:"xmlconstructor"}),w?w.style:"variable")}return a(b,g,d(l))}function c(a,b){for(var c,d=!1,e=!1,f=0;c=a.next();){if(")"==c&&d){if(!(f>0)){r(b);break}f--}else":"==c&&e&&f++;d=":"==c,e="("==c}return"comment"}function d(a,c){return function(e,f){var g;if(n(f)&&e.current()==a)return r(f),c&&(f.tokenize=c),"string";if(q(f,{type:"string",name:a,tokenize:d(a,c)}),e.match("{",!1)&&l(f))return f.tokenize=b,"string";for(;g=e.next();){if(g==a){r(f),c&&(f.tokenize=c);break}if(e.match("{",!1)&&l(f))return f.tokenize=b,"string"}return"string"}}function e(a,c){var d=/[\w\$_-]/;if(a.eat('"')){for(;'"'!==a.next(););a.eat(":")}else a.eatWhile(d),a.match(":=",!1)||a.eat(":");return a.eatWhile(d),c.tokenize=b,"variable"}function f(a,c){return function(d,e){return d.eatSpace(),c&&d.eat(">")?(r(e),e.tokenize=b,"tag"):(d.eat("/")||q(e,{type:"tag",name:a,tokenize:b}),d.eat(">")?(e.tokenize=b,"tag"):(e.tokenize=g,"tag"))}}function g(c,e){var f=c.next();return"/"==f&&c.eat(">")?(l(e)&&r(e),k(e)&&r(e),"tag"):">"==f?(l(e)&&r(e),"tag"):"="==f?null:'"'==f||"'"==f?a(c,e,d(f,g)):(l(e)||q(e,{type:"attribute",tokenize:g}),c.eat(/[a-zA-Z_:]/),c.eatWhile(/[-a-zA-Z0-9_:.]/),c.eatSpace(),(c.match(">",!1)||c.match("/",!1))&&(r(e),e.tokenize=b),"attribute")}function h(a,c){for(var d;d=a.next();)if("-"==d&&a.match("->",!0))return c.tokenize=b,"comment"}function i(a,c){for(var d;d=a.next();)if("]"==d&&a.match("]",!0))return c.tokenize=b,"comment"}function j(a,c){for(var d;d=a.next();)if("?"==d&&a.match(">",!0))return c.tokenize=b,"comment meta"}function k(a){return p(a,"tag")}function l(a){return p(a,"attribute")}function m(a){return p(a,"xmlconstructor")}function n(a){return p(a,"string")}function o(a){return'"'===a.current()?a.match(/^[^\"]+\"\:/,!1):"'"===a.current()&&a.match(/^[^\"]+\'\:/,!1)}function p(a,b){return a.stack.length&&a.stack[a.stack.length-1].type==b}function q(a,b){a.stack.push(b)}function r(a){a.stack.pop();var c=a.stack.length&&a.stack[a.stack.length-1].tokenize;a.tokenize=c||b}var s=(function(){function a(a){return{type:a,style:"keyword"}}for(var b=a("operator"),c={type:"atom",style:"atom"},d={type:"punctuation",style:null},e={type:"axis_specifier",style:"qualifier"},f={",":d},g=["after","all","allowing","ancestor","ancestor-or-self","any","array","as","ascending","at","attribute","base-uri","before","boundary-space","by","case","cast","castable","catch","child","collation","comment","construction","contains","content","context","copy","copy-namespaces","count","decimal-format","declare","default","delete","descendant","descendant-or-self","descending","diacritics","different","distance","document","document-node","element","else","empty","empty-sequence","encoding","end","entire","every","exactly","except","external","first","following","following-sibling","for","from","ftand","ftnot","ft-option","ftor","function","fuzzy","greatest","group","if","import","in","inherit","insensitive","insert","instance","intersect","into","invoke","is","item","language","last","lax","least","let","levels","lowercase","map","modify","module","most","namespace","next","no","node","nodes","no-inherit","no-preserve","not","occurs","of","only","option","order","ordered","ordering","paragraph","paragraphs","parent","phrase","preceding","preceding-sibling","preserve","previous","processing-instruction","relationship","rename","replace","return","revalidation","same","satisfies","schema","schema-attribute","schema-element","score","self","sensitive","sentence","sentences","sequence","skip","sliding","some","stable","start","stemming","stop","strict","strip","switch","text","then","thesaurus","times","to","transform","treat","try","tumbling","type","typeswitch","union","unordered","update","updating","uppercase","using","validate","value","variable","version","weight","when","where","wildcards","window","with","without","word","words","xquery"],h=0,i=g.length;h<i;h++)f[g[h]]=a(g[h]);for(var j=["xs:anyAtomicType","xs:anySimpleType","xs:anyType","xs:anyURI","xs:base64Binary","xs:boolean","xs:byte","xs:date","xs:dateTime","xs:dateTimeStamp","xs:dayTimeDuration","xs:decimal","xs:double","xs:duration","xs:ENTITIES","xs:ENTITY","xs:float","xs:gDay","xs:gMonth","xs:gMonthDay","xs:gYear","xs:gYearMonth","xs:hexBinary","xs:ID","xs:IDREF","xs:IDREFS","xs:int","xs:integer","xs:item","xs:java","xs:language","xs:long","xs:Name","xs:NCName","xs:negativeInteger","xs:NMTOKEN","xs:NMTOKENS","xs:nonNegativeInteger","xs:nonPositiveInteger","xs:normalizedString","xs:NOTATION","xs:numeric","xs:positiveInteger","xs:precisionDecimal","xs:QName","xs:short","xs:string","xs:time","xs:token","xs:unsignedByte","xs:unsignedInt","xs:unsignedLong","xs:unsignedShort","xs:untyped","xs:untypedAtomic","xs:yearMonthDuration"],h=0,i=j.length;h<i;h++)f[j[h]]=c;for(var k=["eq","ne","lt","le","gt","ge",":=","=",">",">=","<","<=",".","|","?","and","or","div","idiv","mod","*","/","+","-"],h=0,i=k.length;h<i;h++)f[k[h]]=b;for(var l=["self::","attribute::","child::","descendant::","descendant-or-self::","parent::","ancestor::","ancestor-or-self::","following::","preceding::","following-sibling::","preceding-sibling::"],h=0,i=l.length;h<i;h++)f[l[h]]=e;return f})();return{startState:function(){return{tokenize:b,cc:[],stack:[]}},token:function(a,b){if(a.eatSpace())return null;var c=b.tokenize(a,b);return c},blockCommentStart:"(:",blockCommentEnd:":)"}})),a.defineMIME("application/xquery","xquery")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/yacas/yacas.js b/core/media/editors/codemirror/mode/yacas/yacas.js
new file mode 100644
index 00000000..34c84fbd
--- /dev/null
+++ b/core/media/editors/codemirror/mode/yacas/yacas.js
@@ -0,0 +1,204 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Yacas mode copyright (c) 2015 by Grzegorz Mazur
+// Loosely based on mathematica mode by Calin Barbat
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var bodiedOps = words("Assert BackQuote D Defun Deriv For ForEach FromFile " +
+                        "FromString Function Integrate InverseTaylor Limit " +
+                        "LocalSymbols Macro MacroRule MacroRulePattern " +
+                        "NIntegrate Rule RulePattern Subst TD TExplicitSum " +
+                        "TSum Taylor Taylor1 Taylor2 Taylor3 ToFile " +
+                        "ToStdout ToString TraceRule Until While");
+
+  // patterns
+  var pFloatForm  = "(?:(?:\\.\\d+|\\d+\\.\\d*|\\d+)(?:[eE][+-]?\\d+)?)";
+  var pIdentifier = "(?:[a-zA-Z\\$'][a-zA-Z0-9\\$']*)";
+
+  // regular expressions
+  var reFloatForm    = new RegExp(pFloatForm);
+  var reIdentifier   = new RegExp(pIdentifier);
+  var rePattern      = new RegExp(pIdentifier + "?_" + pIdentifier);
+  var reFunctionLike = new RegExp(pIdentifier + "\\s*\\(");
+
+  function tokenBase(stream, state) {
+    var ch;
+
+    // get next character
+    ch = stream.next();
+
+    // string
+    if (ch === '"') {
+      state.tokenize = tokenString;
+      return state.tokenize(stream, state);
+    }
+
+    // comment
+    if (ch === '/') {
+      if (stream.eat('*')) {
+        state.tokenize = tokenComment;
+        return state.tokenize(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+
+    // go back one character
+    stream.backUp(1);
+
+    // update scope info
+    var m = stream.match(/^(\w+)\s*\(/, false);
+    if (m !== null && bodiedOps.hasOwnProperty(m[1]))
+      state.scopes.push('bodied');
+
+    var scope = currentScope(state);
+
+    if (scope === 'bodied' && ch === '[')
+      state.scopes.pop();
+
+    if (ch === '[' || ch === '{' || ch === '(')
+      state.scopes.push(ch);
+
+    scope = currentScope(state);
+
+    if (scope === '[' && ch === ']' ||
+        scope === '{' && ch === '}' ||
+        scope === '(' && ch === ')')
+      state.scopes.pop();
+
+    if (ch === ';') {
+      while (scope === 'bodied') {
+        state.scopes.pop();
+        scope = currentScope(state);
+      }
+    }
+
+    // look for ordered rules
+    if (stream.match(/\d+ *#/, true, false)) {
+      return 'qualifier';
+    }
+
+    // look for numbers
+    if (stream.match(reFloatForm, true, false)) {
+      return 'number';
+    }
+
+    // look for placeholders
+    if (stream.match(rePattern, true, false)) {
+      return 'variable-3';
+    }
+
+    // match all braces separately
+    if (stream.match(/(?:\[|\]|{|}|\(|\))/, true, false)) {
+      return 'bracket';
+    }
+
+    // literals looking like function calls
+    if (stream.match(reFunctionLike, true, false)) {
+      stream.backUp(1);
+      return 'variable';
+    }
+
+    // all other identifiers
+    if (stream.match(reIdentifier, true, false)) {
+      return 'variable-2';
+    }
+
+    // operators; note that operators like @@ or /; are matched separately for each symbol.
+    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%|#)/, true, false)) {
+      return 'operator';
+    }
+
+    // everything else is an error
+    return 'error';
+  }
+
+  function tokenString(stream, state) {
+    var next, end = false, escaped = false;
+    while ((next = stream.next()) != null) {
+      if (next === '"' && !escaped) {
+        end = true;
+        break;
+      }
+      escaped = !escaped && next === '\\';
+    }
+    if (end && !escaped) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  };
+
+  function tokenComment(stream, state) {
+    var prev, next;
+    while((next = stream.next()) != null) {
+      if (prev === '*' && next === '/') {
+        state.tokenize = tokenBase;
+        break;
+      }
+      prev = next;
+    }
+    return 'comment';
+  }
+
+  function currentScope(state) {
+    var scope = null;
+    if (state.scopes.length > 0)
+      scope = state.scopes[state.scopes.length - 1];
+    return scope;
+  }
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        scopes: []
+      };
+    },
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    },
+    indent: function(state, textAfter) {
+      if (state.tokenize !== tokenBase && state.tokenize !== null)
+        return CodeMirror.Pass;
+
+      var delta = 0;
+      if (textAfter === ']' || textAfter === '];' ||
+          textAfter === '}' || textAfter === '};' ||
+          textAfter === ');')
+        delta = -1;
+
+      return (state.scopes.length + delta) * _config.indentUnit;
+    },
+    electricChars: "{}[]();",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME('text/x-yacas', {
+  name: 'yacas'
+});
+
+});
diff --git a/core/media/editors/codemirror/mode/yacas/yacas.min.js b/core/media/editors/codemirror/mode/yacas/yacas.min.js
new file mode 100644
index 00000000..3cc2f724
--- /dev/null
+++ b/core/media/editors/codemirror/mode/yacas/yacas.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("yacas",(function(b,c){function d(a){for(var b={},c=a.split(" "),d=0;d<c.length;++d)b[c[d]]=!0;return b}function e(a,b){var c;if(c=a.next(),'"'===c)return b.tokenize=f,b.tokenize(a,b);if("/"===c){if(a.eat("*"))return b.tokenize=g,b.tokenize(a,b);if(a.eat("/"))return a.skipToEnd(),"comment"}a.backUp(1);var d=a.match(/^(\w+)\s*\(/,!1);null!==d&&i.hasOwnProperty(d[1])&&b.scopes.push("bodied");var e=h(b);if("bodied"===e&&"["===c&&b.scopes.pop(),"["!==c&&"{"!==c&&"("!==c||b.scopes.push(c),e=h(b),("["===e&&"]"===c||"{"===e&&"}"===c||"("===e&&")"===c)&&b.scopes.pop(),";"===c)for(;"bodied"===e;)b.scopes.pop(),e=h(b);return a.match(/\d+ *#/,!0,!1)?"qualifier":a.match(l,!0,!1)?"number":a.match(n,!0,!1)?"variable-3":a.match(/(?:\[|\]|{|}|\(|\))/,!0,!1)?"bracket":a.match(o,!0,!1)?(a.backUp(1),"variable"):a.match(m,!0,!1)?"variable-2":a.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%|#)/,!0,!1)?"operator":"error"}function f(a,b){for(var c,d=!1,f=!1;null!=(c=a.next());){if('"'===c&&!f){d=!0;break}f=!f&&"\\"===c}return d&&!f&&(b.tokenize=e),"string"}function g(a,b){for(var c,d;null!=(d=a.next());){if("*"===c&&"/"===d){b.tokenize=e;break}c=d}return"comment"}function h(a){var b=null;return a.scopes.length>0&&(b=a.scopes[a.scopes.length-1]),b}var i=d("Assert BackQuote D Defun Deriv For ForEach FromFile FromString Function Integrate InverseTaylor Limit LocalSymbols Macro MacroRule MacroRulePattern NIntegrate Rule RulePattern Subst TD TExplicitSum TSum Taylor Taylor1 Taylor2 Taylor3 ToFile ToStdout ToString TraceRule Until While"),j="(?:(?:\\.\\d+|\\d+\\.\\d*|\\d+)(?:[eE][+-]?\\d+)?)",k="(?:[a-zA-Z\\$'][a-zA-Z0-9\\$']*)",l=new RegExp(j),m=new RegExp(k),n=new RegExp(k+"?_"+k),o=new RegExp(k+"\\s*\\(");return{startState:function(){return{tokenize:e,scopes:[]}},token:function(a,b){return a.eatSpace()?null:b.tokenize(a,b)},indent:function(c,d){if(c.tokenize!==e&&null!==c.tokenize)return a.Pass;var f=0;return"]"!==d&&"];"!==d&&"}"!==d&&"};"!==d&&");"!==d||(f=-1),(c.scopes.length+f)*b.indentUnit},electricChars:"{}[]();",blockCommentStart:"/*",blockCommentEnd:"*/",lineComment:"//"}})),a.defineMIME("text/x-yacas",{name:"yacas"})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js b/core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
new file mode 100644
index 00000000..5f497723
--- /dev/null
+++ b/core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -0,0 +1,68 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function (mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../yaml/yaml"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../yaml/yaml"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function (CodeMirror) {
+
+  var START = 0, FRONTMATTER = 1, BODY = 2
+
+  // a mixed mode for Markdown text with an optional YAML front matter
+  CodeMirror.defineMode("yaml-frontmatter", function (config, parserConfig) {
+    var yamlMode = CodeMirror.getMode(config, "yaml")
+    var innerMode = CodeMirror.getMode(config, parserConfig && parserConfig.base || "gfm")
+
+    function curMode(state) {
+      return state.state == BODY ? innerMode : yamlMode
+    }
+
+    return {
+      startState: function () {
+        return {
+          state: START,
+          inner: CodeMirror.startState(yamlMode)
+        }
+      },
+      copyState: function (state) {
+        return {
+          state: state.state,
+          inner: CodeMirror.copyState(curMode(state), state.inner)
+        }
+      },
+      token: function (stream, state) {
+        if (state.state == START) {
+          if (stream.match(/---/, false)) {
+            state.state = FRONTMATTER
+            return yamlMode.token(stream, state.inner)
+          } else {
+            state.state = BODY
+            state.inner = CodeMirror.startState(innerMode)
+            return innerMode.token(stream, state.inner)
+          }
+        } else if (state.state == FRONTMATTER) {
+          var end = stream.sol() && stream.match(/---/, false)
+          var style = yamlMode.token(stream, state.inner)
+          if (end) {
+            state.state = BODY
+            state.inner = CodeMirror.startState(innerMode)
+          }
+          return style
+        } else {
+          return innerMode.token(stream, state.inner)
+        }
+      },
+      innerMode: function (state) {
+        return {mode: curMode(state), state: state.inner}
+      },
+      blankLine: function (state) {
+        var mode = curMode(state)
+        if (mode.blankLine) return mode.blankLine(state.inner)
+      }
+    }
+  })
+});
diff --git a/core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.min.js b/core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.min.js
new file mode 100644
index 00000000..e1681429
--- /dev/null
+++ b/core/media/editors/codemirror/mode/yaml-frontmatter/yaml-frontmatter.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror"),require("../yaml/yaml")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../yaml/yaml"],a):a(CodeMirror)})((function(a){var b=0,c=1,d=2;a.defineMode("yaml-frontmatter",(function(e,f){function g(a){return a.state==d?i:h}var h=a.getMode(e,"yaml"),i=a.getMode(e,f&&f.base||"gfm");return{startState:function(){return{state:b,inner:a.startState(h)}},copyState:function(b){return{state:b.state,inner:a.copyState(g(b),b.inner)}},token:function(e,f){if(f.state==b)return e.match(/---/,!1)?(f.state=c,h.token(e,f.inner)):(f.state=d,f.inner=a.startState(i),i.token(e,f.inner));if(f.state==c){var g=e.sol()&&e.match(/---/,!1),j=h.token(e,f.inner);return g&&(f.state=d,f.inner=a.startState(i)),j}return i.token(e,f.inner)},innerMode:function(a){return{mode:g(a),state:a.inner}},blankLine:function(a){var b=g(a);if(b.blankLine)return b.blankLine(a.inner)}}}))}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/yaml/yaml.js b/core/media/editors/codemirror/mode/yaml/yaml.js
new file mode 100644
index 00000000..f35a4013
--- /dev/null
+++ b/core/media/editors/codemirror/mode/yaml/yaml.js
@@ -0,0 +1,119 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("yaml", function() {
+
+  var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
+  var keywordRegex = new RegExp("\\b(("+cons.join(")|(")+"))$", 'i');
+
+  return {
+    token: function(stream, state) {
+      var ch = stream.peek();
+      var esc = state.escaped;
+      state.escaped = false;
+      /* comments */
+      if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      if (stream.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))
+        return "string";
+
+      if (state.literal && stream.indentation() > state.keyCol) {
+        stream.skipToEnd(); return "string";
+      } else if (state.literal) { state.literal = false; }
+      if (stream.sol()) {
+        state.keyCol = 0;
+        state.pair = false;
+        state.pairStart = false;
+        /* document start */
+        if(stream.match(/---/)) { return "def"; }
+        /* document end */
+        if (stream.match(/\.\.\./)) { return "def"; }
+        /* array list item */
+        if (stream.match(/\s*-\s+/)) { return 'meta'; }
+      }
+      /* inline pairs/lists */
+      if (stream.match(/^(\{|\}|\[|\])/)) {
+        if (ch == '{')
+          state.inlinePairs++;
+        else if (ch == '}')
+          state.inlinePairs--;
+        else if (ch == '[')
+          state.inlineList++;
+        else
+          state.inlineList--;
+        return 'meta';
+      }
+
+      /* list seperator */
+      if (state.inlineList > 0 && !esc && ch == ',') {
+        stream.next();
+        return 'meta';
+      }
+      /* pairs seperator */
+      if (state.inlinePairs > 0 && !esc && ch == ',') {
+        state.keyCol = 0;
+        state.pair = false;
+        state.pairStart = false;
+        stream.next();
+        return 'meta';
+      }
+
+      /* start of value of a pair */
+      if (state.pairStart) {
+        /* block literals */
+        if (stream.match(/^\s*(\||\>)\s*/)) { state.literal = true; return 'meta'; };
+        /* references */
+        if (stream.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i)) { return 'variable-2'; }
+        /* numbers */
+        if (state.inlinePairs == 0 && stream.match(/^\s*-?[0-9\.\,]+\s?$/)) { return 'number'; }
+        if (state.inlinePairs > 0 && stream.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/)) { return 'number'; }
+        /* keywords */
+        if (stream.match(keywordRegex)) { return 'keyword'; }
+      }
+
+      /* pairs (associative arrays) -> key */
+      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {
+        state.pair = true;
+        state.keyCol = stream.indentation();
+        return "atom";
+      }
+      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
+
+      /* nothing found, continue */
+      state.pairStart = false;
+      state.escaped = (ch == '\\');
+      stream.next();
+      return null;
+    },
+    startState: function() {
+      return {
+        pair: false,
+        pairStart: false,
+        keyCol: 0,
+        inlinePairs: 0,
+        inlineList: 0,
+        literal: false,
+        escaped: false
+      };
+    },
+    lineComment: "#"
+  };
+});
+
+CodeMirror.defineMIME("text/x-yaml", "yaml");
+CodeMirror.defineMIME("text/yaml", "yaml");
+
+});
diff --git a/core/media/editors/codemirror/mode/yaml/yaml.min.js b/core/media/editors/codemirror/mode/yaml/yaml.min.js
new file mode 100644
index 00000000..2a4eebd6
--- /dev/null
+++ b/core/media/editors/codemirror/mode/yaml/yaml.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("yaml",(function(){var a=["true","false","on","off","yes","no"],b=new RegExp("\\b(("+a.join(")|(")+"))$","i");return{token:function(a,c){var d=a.peek(),e=c.escaped;if(c.escaped=!1,"#"==d&&(0==a.pos||/\s/.test(a.string.charAt(a.pos-1))))return a.skipToEnd(),"comment";if(a.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))return"string";if(c.literal&&a.indentation()>c.keyCol)return a.skipToEnd(),"string";if(c.literal&&(c.literal=!1),a.sol()){if(c.keyCol=0,c.pair=!1,c.pairStart=!1,a.match(/---/))return"def";if(a.match(/\.\.\./))return"def";if(a.match(/\s*-\s+/))return"meta"}if(a.match(/^(\{|\}|\[|\])/))return"{"==d?c.inlinePairs++:"}"==d?c.inlinePairs--:"["==d?c.inlineList++:c.inlineList--,"meta";if(c.inlineList>0&&!e&&","==d)return a.next(),"meta";if(c.inlinePairs>0&&!e&&","==d)return c.keyCol=0,c.pair=!1,c.pairStart=!1,a.next(),"meta";if(c.pairStart){if(a.match(/^\s*(\||\>)\s*/))return c.literal=!0,"meta";if(a.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i))return"variable-2";if(0==c.inlinePairs&&a.match(/^\s*-?[0-9\.\,]+\s?$/))return"number";if(c.inlinePairs>0&&a.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/))return"number";if(a.match(b))return"keyword"}return!c.pair&&a.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)?(c.pair=!0,c.keyCol=a.indentation(),"atom"):c.pair&&a.match(/^:\s*/)?(c.pairStart=!0,"meta"):(c.pairStart=!1,c.escaped="\\"==d,a.next(),null)},startState:function(){return{pair:!1,pairStart:!1,keyCol:0,inlinePairs:0,inlineList:0,literal:!1,escaped:!1}},lineComment:"#"}})),a.defineMIME("text/x-yaml","yaml"),a.defineMIME("text/yaml","yaml")}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/mode/z80/z80.js b/core/media/editors/codemirror/mode/z80/z80.js
new file mode 100644
index 00000000..aae70216
--- /dev/null
+++ b/core/media/editors/codemirror/mode/z80/z80.js
@@ -0,0 +1,116 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+  mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+  define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+  mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('z80', function(_config, parserConfig) {
+  var ez80 = parserConfig.ez80;
+  var keywords1, keywords2;
+  if (ez80) {
+    keywords1 = /^(exx?|(ld|cp)([di]r?)?|[lp]ea|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|[de]i|halt|im|in([di]mr?|ir?|irx|2r?)|ot(dmr?|[id]rx|imr?)|out(0?|[di]r?|[di]2r?)|tst(io)?|slp)(\.([sl]?i)?[sl])?\b/i;
+    keywords2 = /^(((call|j[pr]|rst|ret[in]?)(\.([sl]?i)?[sl])?)|(rs|st)mix)\b/i;
+  } else {
+    keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i;
+    keywords2 = /^(call|j[pr]|ret[in]?|b_?(call|jump))\b/i;
+  }
+
+  var variables1 = /^(af?|bc?|c|de?|e|hl?|l|i[xy]?|r|sp)\b/i;
+  var variables2 = /^(n?[zc]|p[oe]?|m)\b/i;
+  var errors = /^([hl][xy]|i[xy][hl]|slia|sll)\b/i;
+  var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+d?)\b/i;
+
+  return {
+    startState: function() {
+      return {
+        context: 0
+      };
+    },
+    token: function(stream, state) {
+      if (!stream.column())
+        state.context = 0;
+
+      if (stream.eatSpace())
+        return null;
+
+      var w;
+
+      if (stream.eatWhile(/\w/)) {
+        if (ez80 && stream.eat('.')) {
+          stream.eatWhile(/\w/);
+        }
+        w = stream.current();
+
+        if (stream.indentation()) {
+          if ((state.context == 1 || state.context == 4) && variables1.test(w)) {
+            state.context = 4;
+            return 'var2';
+          }
+
+          if (state.context == 2 && variables2.test(w)) {
+            state.context = 4;
+            return 'var3';
+          }
+
+          if (keywords1.test(w)) {
+            state.context = 1;
+            return 'keyword';
+          } else if (keywords2.test(w)) {
+            state.context = 2;
+            return 'keyword';
+          } else if (state.context == 4 && numbers.test(w)) {
+            return 'number';
+          }
+
+          if (errors.test(w))
+            return 'error';
+        } else if (stream.match(numbers)) {
+          return 'number';
+        } else {
+          return null;
+        }
+      } else if (stream.eat(';')) {
+        stream.skipToEnd();
+        return 'comment';
+      } else if (stream.eat('"')) {
+        while (w = stream.next()) {
+          if (w == '"')
+            break;
+
+          if (w == '\\')
+            stream.next();
+        }
+        return 'string';
+      } else if (stream.eat('\'')) {
+        if (stream.match(/\\?.'/))
+          return 'number';
+      } else if (stream.eat('.') || stream.sol() && stream.eat('#')) {
+        state.context = 5;
+
+        if (stream.eatWhile(/\w/))
+          return 'def';
+      } else if (stream.eat('$')) {
+        if (stream.eatWhile(/[\da-f]/i))
+          return 'number';
+      } else if (stream.eat('%')) {
+        if (stream.eatWhile(/[01]/))
+          return 'number';
+      } else {
+        stream.next();
+      }
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-z80", "z80");
+CodeMirror.defineMIME("text/x-ez80", { name: "z80", ez80: true });
+
+});
diff --git a/core/media/editors/codemirror/mode/z80/z80.min.js b/core/media/editors/codemirror/mode/z80/z80.min.js
new file mode 100644
index 00000000..4c18040e
--- /dev/null
+++ b/core/media/editors/codemirror/mode/z80/z80.min.js
@@ -0,0 +1 @@
+!(function(a){"object"==typeof exports&&"object"==typeof module?a(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],a):a(CodeMirror)})((function(a){"use strict";a.defineMode("z80",(function(a,b){var c,d,e=b.ez80;e?(c=/^(exx?|(ld|cp)([di]r?)?|[lp]ea|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|[de]i|halt|im|in([di]mr?|ir?|irx|2r?)|ot(dmr?|[id]rx|imr?)|out(0?|[di]r?|[di]2r?)|tst(io)?|slp)(\.([sl]?i)?[sl])?\b/i,d=/^(((call|j[pr]|rst|ret[in]?)(\.([sl]?i)?[sl])?)|(rs|st)mix)\b/i):(c=/^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i,d=/^(call|j[pr]|ret[in]?|b_?(call|jump))\b/i);var f=/^(af?|bc?|c|de?|e|hl?|l|i[xy]?|r|sp)\b/i,g=/^(n?[zc]|p[oe]?|m)\b/i,h=/^([hl][xy]|i[xy][hl]|slia|sll)\b/i,i=/^([\da-f]+h|[0-7]+o|[01]+b|\d+d?)\b/i;return{startState:function(){return{context:0}},token:function(a,b){if(a.column()||(b.context=0),a.eatSpace())return null;var j;if(a.eatWhile(/\w/)){if(e&&a.eat(".")&&a.eatWhile(/\w/),j=a.current(),!a.indentation())return a.match(i)?"number":null;if((1==b.context||4==b.context)&&f.test(j))return b.context=4,"var2";if(2==b.context&&g.test(j))return b.context=4,"var3";if(c.test(j))return b.context=1,"keyword";if(d.test(j))return b.context=2,"keyword";if(4==b.context&&i.test(j))return"number";if(h.test(j))return"error"}else{if(a.eat(";"))return a.skipToEnd(),"comment";if(a.eat('"')){for(;(j=a.next())&&'"'!=j;)"\\"==j&&a.next();return"string"}if(a.eat("'")){if(a.match(/\\?.'/))return"number"}else if(a.eat(".")||a.sol()&&a.eat("#")){if(b.context=5,a.eatWhile(/\w/))return"def"}else if(a.eat("$")){if(a.eatWhile(/[\da-f]/i))return"number"}else if(a.eat("%")){if(a.eatWhile(/[01]/))return"number"}else a.next()}return null}}})),a.defineMIME("text/x-z80","z80"),a.defineMIME("text/x-ez80",{name:"z80",ez80:!0})}));
\ No newline at end of file
diff --git a/core/media/editors/codemirror/theme/3024-day.css b/core/media/editors/codemirror/theme/3024-day.css
new file mode 100644
index 00000000..71326553
--- /dev/null
+++ b/core/media/editors/codemirror/theme/3024-day.css
@@ -0,0 +1,41 @@
+/*
+
+    Name:       3024 day
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
+.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
+
+.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
+.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
+
+.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
+.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
+.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
+
+.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
+
+.cm-s-3024-day span.cm-comment { color: #cdab53; }
+.cm-s-3024-day span.cm-atom { color: #a16a94; }
+.cm-s-3024-day span.cm-number { color: #a16a94; }
+
+.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
+.cm-s-3024-day span.cm-keyword { color: #db2d20; }
+.cm-s-3024-day span.cm-string { color: #fded02; }
+
+.cm-s-3024-day span.cm-variable { color: #01a252; }
+.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-day span.cm-def { color: #e8bbd0; }
+.cm-s-3024-day span.cm-bracket { color: #3a3432; }
+.cm-s-3024-day span.cm-tag { color: #db2d20; }
+.cm-s-3024-day span.cm-link { color: #a16a94; }
+.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
+
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/core/media/editors/codemirror/theme/3024-night.css b/core/media/editors/codemirror/theme/3024-night.css
new file mode 100644
index 00000000..adc5900a
--- /dev/null
+++ b/core/media/editors/codemirror/theme/3024-night.css
@@ -0,0 +1,39 @@
+/*
+
+    Name:       3024 night
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
+.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
+.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
+.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
+.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
+
+.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
+
+.cm-s-3024-night span.cm-comment { color: #cdab53; }
+.cm-s-3024-night span.cm-atom { color: #a16a94; }
+.cm-s-3024-night span.cm-number { color: #a16a94; }
+
+.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
+.cm-s-3024-night span.cm-keyword { color: #db2d20; }
+.cm-s-3024-night span.cm-string { color: #fded02; }
+
+.cm-s-3024-night span.cm-variable { color: #01a252; }
+.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-night span.cm-def { color: #e8bbd0; }
+.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
+.cm-s-3024-night span.cm-tag { color: #db2d20; }
+.cm-s-3024-night span.cm-link { color: #a16a94; }
+.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
+
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
+.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/abcdef.css b/core/media/editors/codemirror/theme/abcdef.css
new file mode 100644
index 00000000..cf935309
--- /dev/null
+++ b/core/media/editors/codemirror/theme/abcdef.css
@@ -0,0 +1,32 @@
+.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
+.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
+.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
+.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
+.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
+.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
+.cm-s-abcdef span.cm-atom { color: #77F; }
+.cm-s-abcdef span.cm-number { color: violet; }
+.cm-s-abcdef span.cm-def { color: #fffabc; }
+.cm-s-abcdef span.cm-variable { color: #abcdef; }
+.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
+.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
+.cm-s-abcdef span.cm-property { color: #fedcba; }
+.cm-s-abcdef span.cm-operator { color: #ff0; }
+.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
+.cm-s-abcdef span.cm-string { color: #2b4; }
+.cm-s-abcdef span.cm-meta { color: #C9F; }
+.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
+.cm-s-abcdef span.cm-builtin { color: #30aabc; }
+.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
+.cm-s-abcdef span.cm-tag { color: #FFDD44; }
+.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
+.cm-s-abcdef span.cm-error { color: #FF0000; }
+.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
+.cm-s-abcdef span.cm-link { color: blueviolet; }
+
+.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/core/media/editors/codemirror/theme/ambiance-mobile.css b/core/media/editors/codemirror/theme/ambiance-mobile.css
new file mode 100644
index 00000000..88d332e1
--- /dev/null
+++ b/core/media/editors/codemirror/theme/ambiance-mobile.css
@@ -0,0 +1,5 @@
+.cm-s-ambiance.CodeMirror {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
diff --git a/core/media/editors/codemirror/theme/ambiance.css b/core/media/editors/codemirror/theme/ambiance.css
new file mode 100644
index 00000000..782fca43
--- /dev/null
+++ b/core/media/editors/codemirror/theme/ambiance.css
@@ -0,0 +1,74 @@
+/* ambiance theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-ambiance .cm-header { color: blue; }
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+
+.cm-s-ambiance .cm-keyword { color: #cda869; }
+.cm-s-ambiance .cm-atom { color: #CF7EA9; }
+.cm-s-ambiance .cm-number { color: #78CF8A; }
+.cm-s-ambiance .cm-def { color: #aac6e3; }
+.cm-s-ambiance .cm-variable { color: #ffb795; }
+.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
+.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
+.cm-s-ambiance .cm-property { color: #eed1b3; }
+.cm-s-ambiance .cm-operator { color: #fa8d6a; }
+.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
+.cm-s-ambiance .cm-string { color: #8f9d6a; }
+.cm-s-ambiance .cm-string-2 { color: #9d937c; }
+.cm-s-ambiance .cm-meta { color: #D2A8A1; }
+.cm-s-ambiance .cm-qualifier { color: yellow; }
+.cm-s-ambiance .cm-builtin { color: #9999cc; }
+.cm-s-ambiance .cm-bracket { color: #24C2C7; }
+.cm-s-ambiance .cm-tag { color: #fee4ff; }
+.cm-s-ambiance .cm-attribute { color: #9B859D; }
+.cm-s-ambiance .cm-hr { color: pink; }
+.cm-s-ambiance .cm-link { color: #F4C20B; }
+.cm-s-ambiance .cm-special { color: #FF9D00; }
+.cm-s-ambiance .cm-error { color: #AF2018; }
+
+.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
+.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
+
+.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+/* Editor styling */
+
+.cm-s-ambiance.CodeMirror {
+  line-height: 1.40em;
+  color: #E6E1DC;
+  background-color: #202020;
+  -webkit-box-shadow: inset 0 0 10px black;
+  -moz-box-shadow: inset 0 0 10px black;
+  box-shadow: inset 0 0 10px black;
+}
+
+.cm-s-ambiance .CodeMirror-gutters {
+  background: #3D3D3D;
+  border-right: 1px solid #4D4D4D;
+  box-shadow: 0 10px 20px black;
+}
+
+.cm-s-ambiance .CodeMirror-linenumber {
+  text-shadow: 0px 1px 1px #4d4d4d;
+  color: #111;
+  padding: 0 5px;
+}
+
+.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
+.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
+
+.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
+
+.cm-s-ambiance .CodeMirror-activeline-background {
+  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
+}
+
+.cm-s-ambiance.CodeMirror,
+.cm-s-ambiance .CodeMirror-gutters {
+  background-image: url("data:image/png;base64,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");
+}
diff --git a/core/media/editors/codemirror/theme/base16-dark.css b/core/media/editors/codemirror/theme/base16-dark.css
new file mode 100644
index 00000000..026a8168
--- /dev/null
+++ b/core/media/editors/codemirror/theme/base16-dark.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Dark
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
+.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
+.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
+.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
+.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
+.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
+
+.cm-s-base16-dark span.cm-comment { color: #8f5536; }
+.cm-s-base16-dark span.cm-atom { color: #aa759f; }
+.cm-s-base16-dark span.cm-number { color: #aa759f; }
+
+.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
+.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
+.cm-s-base16-dark span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-dark span.cm-variable { color: #90a959; }
+.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-dark span.cm-def { color: #d28445; }
+.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
+.cm-s-base16-dark span.cm-tag { color: #ac4142; }
+.cm-s-base16-dark span.cm-link { color: #aa759f; }
+.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
+
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
+.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/base16-light.css b/core/media/editors/codemirror/theme/base16-light.css
new file mode 100644
index 00000000..474e0ca9
--- /dev/null
+++ b/core/media/editors/codemirror/theme/base16-light.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Light
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
+.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
+.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
+
+.cm-s-base16-light span.cm-comment { color: #8f5536; }
+.cm-s-base16-light span.cm-atom { color: #aa759f; }
+.cm-s-base16-light span.cm-number { color: #aa759f; }
+
+.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
+.cm-s-base16-light span.cm-keyword { color: #ac4142; }
+.cm-s-base16-light span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-light span.cm-variable { color: #90a959; }
+.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-light span.cm-def { color: #d28445; }
+.cm-s-base16-light span.cm-bracket { color: #202020; }
+.cm-s-base16-light span.cm-tag { color: #ac4142; }
+.cm-s-base16-light span.cm-link { color: #aa759f; }
+.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
+
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
+.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/bespin.css b/core/media/editors/codemirror/theme/bespin.css
new file mode 100644
index 00000000..60913ba9
--- /dev/null
+++ b/core/media/editors/codemirror/theme/bespin.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Bespin
+    Author:     Mozilla / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
+.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
+.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
+.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
+.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
+
+.cm-s-bespin span.cm-comment {color: #937121;}
+.cm-s-bespin span.cm-atom {color: #9b859d;}
+.cm-s-bespin span.cm-number {color: #9b859d;}
+
+.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
+.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
+.cm-s-bespin span.cm-string {color: #f9ee98;}
+
+.cm-s-bespin span.cm-variable {color: #54be0d;}
+.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
+.cm-s-bespin span.cm-def {color: #cf7d34;}
+.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
+.cm-s-bespin span.cm-bracket {color: #9d9b97;}
+.cm-s-bespin span.cm-tag {color: #cf6a4c;}
+.cm-s-bespin span.cm-link {color: #9b859d;}
+
+.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/core/media/editors/codemirror/theme/blackboard.css b/core/media/editors/codemirror/theme/blackboard.css
new file mode 100644
index 00000000..b6eaedb1
--- /dev/null
+++ b/core/media/editors/codemirror/theme/blackboard.css
@@ -0,0 +1,32 @@
+/* Port of TextMate's Blackboard theme */
+
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+
+.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard .cm-number { color: #D8FA3C; }
+.cm-s-blackboard .cm-def { color: #8DA6CE; }
+.cm-s-blackboard .cm-variable { color: #FF6400; }
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
+.cm-s-blackboard .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard .cm-string { color: #61CE3C; }
+.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard .cm-header { color: #FF6400; }
+.cm-s-blackboard .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/core/media/editors/codemirror/theme/cobalt.css b/core/media/editors/codemirror/theme/cobalt.css
new file mode 100644
index 00000000..bbbda3b5
--- /dev/null
+++ b/core/media/editors/codemirror/theme/cobalt.css
@@ -0,0 +1,25 @@
+.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
+.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
+.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-cobalt span.cm-comment { color: #08f; }
+.cm-s-cobalt span.cm-atom { color: #845dc4; }
+.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
+.cm-s-cobalt span.cm-keyword { color: #ffee80; }
+.cm-s-cobalt span.cm-string { color: #3ad900; }
+.cm-s-cobalt span.cm-meta { color: #ff9d00; }
+.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
+.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
+.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
+.cm-s-cobalt span.cm-link { color: #845dc4; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
+
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
+.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/core/media/editors/codemirror/theme/colorforth.css b/core/media/editors/codemirror/theme/colorforth.css
new file mode 100644
index 00000000..19095e41
--- /dev/null
+++ b/core/media/editors/codemirror/theme/colorforth.css
@@ -0,0 +1,33 @@
+.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
+.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
+.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
+.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-colorforth span.cm-comment     { color: #ededed; }
+.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
+.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
+.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
+.cm-s-colorforth span.cm-variable    { color: #73ff00; }
+.cm-s-colorforth span.cm-string      { color: #007bff; }
+.cm-s-colorforth span.cm-number      { color: #00c4ff; }
+.cm-s-colorforth span.cm-atom        { color: #606060; }
+
+.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
+.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
+.cm-s-colorforth span.cm-property    {}
+.cm-s-colorforth span.cm-operator    {}
+
+.cm-s-colorforth span.cm-meta        { color: yellow; }
+.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
+.cm-s-colorforth span.cm-bracket     { color: #cc7; }
+.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
+.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
+.cm-s-colorforth span.cm-error       { color: #f00; }
+
+.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
+
+.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
+
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/core/media/editors/codemirror/theme/darcula.css b/core/media/editors/codemirror/theme/darcula.css
new file mode 100644
index 00000000..c7894591
--- /dev/null
+++ b/core/media/editors/codemirror/theme/darcula.css
@@ -0,0 +1,34 @@
+/**
+    Name:       IntelliJ IDEA darcula theme
+    From IntelliJ IDEA by JetBrains
+ */
+
+.cm-s-darcula span.cm-meta { color: #BBB529; }
+.cm-s-darcula span.cm-number { color: #6897BB; }
+.cm-s-darcula span.cm-keyword { line-height: 1em; font-weight: bold; color: #CC7832; }
+.cm-s-darcula span.cm-def { color: #FFC66D; }
+.cm-s-darcula span.cm-variable { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-2 { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-3, .cm-s-darcula span.cm-type { color: #A9B7C6; }
+.cm-s-darcula span.cm-property { color: #A9B7C6; }
+.cm-s-darcula span.cm-operator { color: #A9B7C6; }
+.cm-s-darcula span.cm-string { color: #6A8759; }
+.cm-s-darcula span.cm-string-2 { color: #6A8759; }
+.cm-s-darcula span.cm-comment { color: #808080; }
+.cm-s-darcula span.cm-link { color: #287BDE; }
+.cm-s-darcula span.cm-atom { font-weight: bold; color: #CC7832; }
+.cm-s-darcula span.cm-error { color: #BC3F3C; }
+.cm-s-darcula span.cm-tag { color: #CC7832; }
+.cm-s-darcula span.cm-attribute { color: #6A8759; }
+.cm-s-darcula span.cm-qualifier { color: #6A8759; }
+.cm-s-darcula span.cm-bracket { color: #A9B7C6; }
+.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; }
+
+
+.cm-s-darcula .CodeMirror-activeline-background { background: #3A3A3A; }
+.cm-s-darcula div.CodeMirror-selected { background: #085a9c; }
+.cm-s-darcula .CodeMirror-gutters { background: rgb(72, 72, 72); border-right: 1px solid grey; color: #606366 }
+
+.cm-s-darcula span.cm-builtin { color: #A9B7C6; }
+.cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
+.cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }
\ No newline at end of file
diff --git a/core/media/editors/codemirror/theme/dracula.css b/core/media/editors/codemirror/theme/dracula.css
new file mode 100644
index 00000000..253133ef
--- /dev/null
+++ b/core/media/editors/codemirror/theme/dracula.css
@@ -0,0 +1,40 @@
+/*
+
+    Name:       dracula
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
+
+*/
+
+
+.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
+  background-color: #282a36 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
+.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-dracula .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula span.cm-comment { color: #6272a4; }
+.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
+.cm-s-dracula span.cm-number { color: #bd93f9; }
+.cm-s-dracula span.cm-variable { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-2 { color: white; }
+.cm-s-dracula span.cm-def { color: #50fa7b; }
+.cm-s-dracula span.cm-operator { color: #ff79c6; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-atom { color: #bd93f9; }
+.cm-s-dracula span.cm-meta { color: #f8f8f2; }
+.cm-s-dracula span.cm-tag { color: #ff79c6; }
+.cm-s-dracula span.cm-attribute { color: #50fa7b; }
+.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
+.cm-s-dracula span.cm-property { color: #66d9ef; }
+.cm-s-dracula span.cm-builtin { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
+
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/duotone-dark.css b/core/media/editors/codemirror/theme/duotone-dark.css
new file mode 100644
index 00000000..88fdc76c
--- /dev/null
+++ b/core/media/editors/codemirror/theme/duotone-dark.css
@@ -0,0 +1,35 @@
+/*
+Name:   DuoTone-Dark
+Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
+
+CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
+*/
+
+.cm-s-duotone-dark.CodeMirror { background: #2a2734; color: #6c6783; }
+.cm-s-duotone-dark div.CodeMirror-selected { background: #545167!important; }
+.cm-s-duotone-dark .CodeMirror-gutters { background: #2a2734; border-right: 0px; }
+.cm-s-duotone-dark .CodeMirror-linenumber { color: #545167; }
+
+/* begin cursor */
+.cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
+.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280;  */ opacity: .5;}
+.cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
+/* end cursor */
+
+.cm-s-duotone-dark span.cm-atom, .cm-s-duotone-dark span.cm-number, .cm-s-duotone-dark span.cm-keyword, .cm-s-duotone-dark span.cm-variable, .cm-s-duotone-dark span.cm-attribute, .cm-s-duotone-dark span.cm-quote, .cm-s-duotone-dark span.cm-hr, .cm-s-duotone-dark span.cm-link { color: #ffcc99; }
+
+.cm-s-duotone-dark span.cm-property { color: #9a86fd; }
+.cm-s-duotone-dark span.cm-punctuation, .cm-s-duotone-dark span.cm-unit, .cm-s-duotone-dark span.cm-negative { color: #e09142; }
+.cm-s-duotone-dark span.cm-string { color: #ffb870; }
+.cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
+.cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
+
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
+.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
+
+/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
+.cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }
+
+.cm-s-duotone-dark span.cm-header { font-weight: normal; }
+.cm-s-duotone-dark .CodeMirror-matchingbracket { text-decoration: underline; color: #eeebff !important; } 
diff --git a/core/media/editors/codemirror/theme/duotone-light.css b/core/media/editors/codemirror/theme/duotone-light.css
new file mode 100644
index 00000000..d99480f7
--- /dev/null
+++ b/core/media/editors/codemirror/theme/duotone-light.css
@@ -0,0 +1,36 @@
+/*
+Name:   DuoTone-Light
+Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
+
+CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
+*/
+
+.cm-s-duotone-light.CodeMirror { background: #faf8f5; color: #b29762; }
+.cm-s-duotone-light div.CodeMirror-selected { background: #e3dcce !important; }
+.cm-s-duotone-light .CodeMirror-gutters { background: #faf8f5; border-right: 0px; }
+.cm-s-duotone-light .CodeMirror-linenumber { color: #cdc4b1; }
+
+/* begin cursor */
+.cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
+.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
+.cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
+/* end cursor */
+
+.cm-s-duotone-light span.cm-atom, .cm-s-duotone-light span.cm-number, .cm-s-duotone-light span.cm-keyword, .cm-s-duotone-light span.cm-variable, .cm-s-duotone-light span.cm-attribute, .cm-s-duotone-light span.cm-quote, .cm-s-duotone-light-light span.cm-hr, .cm-s-duotone-light-light span.cm-link { color: #063289; }
+
+.cm-s-duotone-light span.cm-property { color: #b29762; }
+.cm-s-duotone-light span.cm-punctuation, .cm-s-duotone-light span.cm-unit, .cm-s-duotone-light span.cm-negative { color: #063289; }
+.cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
+.cm-s-duotone-light span.cm-positive { color: #896724; }
+
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
+.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
+
+/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
+/* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */
+.cm-s-duotone-light span.cm-error, .cm-s-duotone-light span.cm-invalidchar { color: #f00; }
+
+.cm-s-duotone-light span.cm-header { font-weight: normal; }
+.cm-s-duotone-light .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; }
+
diff --git a/core/media/editors/codemirror/theme/eclipse.css b/core/media/editors/codemirror/theme/eclipse.css
new file mode 100644
index 00000000..800d603f
--- /dev/null
+++ b/core/media/editors/codemirror/theme/eclipse.css
@@ -0,0 +1,23 @@
+.cm-s-eclipse span.cm-meta { color: #FF1717; }
+.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-atom { color: #219; }
+.cm-s-eclipse span.cm-number { color: #164; }
+.cm-s-eclipse span.cm-def { color: #00f; }
+.cm-s-eclipse span.cm-variable { color: black; }
+.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
+.cm-s-eclipse span.cm-property { color: black; }
+.cm-s-eclipse span.cm-operator { color: black; }
+.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
+.cm-s-eclipse span.cm-string { color: #2A00FF; }
+.cm-s-eclipse span.cm-string-2 { color: #f50; }
+.cm-s-eclipse span.cm-qualifier { color: #555; }
+.cm-s-eclipse span.cm-builtin { color: #30a; }
+.cm-s-eclipse span.cm-bracket { color: #cc7; }
+.cm-s-eclipse span.cm-tag { color: #170; }
+.cm-s-eclipse span.cm-attribute { color: #00c; }
+.cm-s-eclipse span.cm-link { color: #219; }
+.cm-s-eclipse span.cm-error { color: #f00; }
+
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/core/media/editors/codemirror/theme/elegant.css b/core/media/editors/codemirror/theme/elegant.css
new file mode 100644
index 00000000..45b3ea65
--- /dev/null
+++ b/core/media/editors/codemirror/theme/elegant.css
@@ -0,0 +1,13 @@
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
+.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-variable { color: black; }
+.cm-s-elegant span.cm-variable-2 { color: #b11; }
+.cm-s-elegant span.cm-qualifier { color: #555; }
+.cm-s-elegant span.cm-keyword { color: #730; }
+.cm-s-elegant span.cm-builtin { color: #30a; }
+.cm-s-elegant span.cm-link { color: #762; }
+.cm-s-elegant span.cm-error { background-color: #fdd; }
+
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/core/media/editors/codemirror/theme/erlang-dark.css b/core/media/editors/codemirror/theme/erlang-dark.css
new file mode 100644
index 00000000..8c8a4171
--- /dev/null
+++ b/core/media/editors/codemirror/theme/erlang-dark.css
@@ -0,0 +1,34 @@
+.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
+.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
+.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
+.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
+.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
+.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
+.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
+.cm-s-erlang-dark span.cm-comment    { color: #77f; }
+.cm-s-erlang-dark span.cm-def        { color: #e7a; }
+.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
+.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
+.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
+.cm-s-erlang-dark span.cm-operator   { color: #d55; }
+.cm-s-erlang-dark span.cm-property   { color: #ccc; }
+.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
+.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
+.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
+.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
+.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
+.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
+.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
+.cm-s-erlang-dark span.cm-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
+.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
+
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
+.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/core/media/editors/codemirror/theme/gruvbox-dark.css b/core/media/editors/codemirror/theme/gruvbox-dark.css
new file mode 100644
index 00000000..01ca7bb7
--- /dev/null
+++ b/core/media/editors/codemirror/theme/gruvbox-dark.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       gruvbox-dark
+    Author:     kRkk (https://github.com/krkk)
+
+    Original gruvbox color scheme by Pavel Pertsev (https://github.com/morhetz/gruvbox)
+
+*/
+
+.cm-s-gruvbox-dark.CodeMirror, .cm-s-gruvbox-dark .CodeMirror-gutters { background-color: #282828; color: #bdae93; }
+.cm-s-gruvbox-dark .CodeMirror-gutters {background: #282828; border-right: 0px;}
+.cm-s-gruvbox-dark .CodeMirror-linenumber {color: #7c6f64;}
+.cm-s-gruvbox-dark .CodeMirror-cursor { border-left: 1px solid #ebdbb2; }
+.cm-s-gruvbox-dark div.CodeMirror-selected { background: #928374; }
+.cm-s-gruvbox-dark span.cm-meta { color: #808000; }
+
+.cm-s-gruvbox-dark span.cm-comment { color: #928374; }
+.cm-s-gruvbox-dark span.cm-number, span.cm-atom { color: #d3869b; }
+.cm-s-gruvbox-dark span.cm-keyword { color: #f84934; }
+
+.cm-s-gruvbox-dark span.cm-variable { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-variable-2 { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-variable-3, .cm-s-gruvbox-dark span.cm-type { color: black; }
+.cm-s-gruvbox-dark span.cm-operator { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-def { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-string { color: #b8bb26; }
+.cm-s-gruvbox-dark span.cm-string-2 { color: #8ec07c; }
+.cm-s-gruvbox-dark span.cm-qualifier { color: #555; }
+.cm-s-gruvbox-dark span.cm-attribute { color: #8ec07c; }
+
+.cm-s-gruvbox-dark .CodeMirror-activeline-background { background: #3c3836; }
+.cm-s-gruvbox-dark .CodeMirror-matchingbracket { background: #928374; color:#282828 !important; }
+
+.cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }
diff --git a/core/media/editors/codemirror/theme/hopscotch.css b/core/media/editors/codemirror/theme/hopscotch.css
new file mode 100644
index 00000000..7d05431b
--- /dev/null
+++ b/core/media/editors/codemirror/theme/hopscotch.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Hopscotch
+    Author:     Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
+.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
+.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
+.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
+.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
+
+.cm-s-hopscotch span.cm-comment {color: #b33508;}
+.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
+.cm-s-hopscotch span.cm-number {color: #c85e7c;}
+
+.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
+.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
+.cm-s-hopscotch span.cm-string {color: #fdcc59;}
+
+.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
+.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
+.cm-s-hopscotch span.cm-def {color: #fd8b19;}
+.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
+.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
+.cm-s-hopscotch span.cm-tag {color: #dd464c;}
+.cm-s-hopscotch span.cm-link {color: #c85e7c;}
+
+.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/core/media/editors/codemirror/theme/icecoder.css b/core/media/editors/codemirror/theme/icecoder.css
new file mode 100644
index 00000000..5440fbe2
--- /dev/null
+++ b/core/media/editors/codemirror/theme/icecoder.css
@@ -0,0 +1,43 @@
+/*
+ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
+*/
+
+.cm-s-icecoder { color: #666; background: #1d1d1b; }
+
+.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
+.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
+.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
+
+.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
+.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
+.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
+
+.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
+.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
+.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
+
+.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
+.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
+
+.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
+
+.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
+.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
+.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
+
+.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
+.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
+
+.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
+.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
+.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
+.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
+
+.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
+.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
+.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
+.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
diff --git a/core/media/editors/codemirror/theme/idea.css b/core/media/editors/codemirror/theme/idea.css
new file mode 100644
index 00000000..28c5c40d
--- /dev/null
+++ b/core/media/editors/codemirror/theme/idea.css
@@ -0,0 +1,31 @@
+/**
+    Name:       IDEA default theme
+    From IntelliJ IDEA by JetBrains
+ */
+
+.cm-s-idea span.cm-meta { color: #808000; }
+.cm-s-idea span.cm-number { color: #0000FF; }
+.cm-s-idea span.cm-keyword { line-height: 1em; font-weight: bold; color: #000080; }
+.cm-s-idea span.cm-atom { font-weight: bold; color: #000080; }
+.cm-s-idea span.cm-def { color: #000000; }
+.cm-s-idea span.cm-variable { color: black; }
+.cm-s-idea span.cm-variable-2 { color: black; }
+.cm-s-idea span.cm-variable-3, .cm-s-idea span.cm-type { color: black; }
+.cm-s-idea span.cm-property { color: black; }
+.cm-s-idea span.cm-operator { color: black; }
+.cm-s-idea span.cm-comment { color: #808080; }
+.cm-s-idea span.cm-string { color: #008000; }
+.cm-s-idea span.cm-string-2 { color: #008000; }
+.cm-s-idea span.cm-qualifier { color: #555; }
+.cm-s-idea span.cm-error { color: #FF0000; }
+.cm-s-idea span.cm-attribute { color: #0000FF; }
+.cm-s-idea span.cm-tag { color: #000080; }
+.cm-s-idea span.cm-link { color: #0000FF; }
+.cm-s-idea .CodeMirror-activeline-background { background: #FFFAE3; }
+
+.cm-s-idea span.cm-builtin { color: #30a; }
+.cm-s-idea span.cm-bracket { color: #cc7; }
+.cm-s-idea  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
+
+
+.cm-s-idea .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/core/media/editors/codemirror/theme/isotope.css b/core/media/editors/codemirror/theme/isotope.css
new file mode 100644
index 00000000..d0d6263c
--- /dev/null
+++ b/core/media/editors/codemirror/theme/isotope.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Isotope
+    Author:     David Desandro / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
+.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
+.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
+.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
+
+.cm-s-isotope span.cm-comment {color: #3300ff;}
+.cm-s-isotope span.cm-atom {color: #cc00ff;}
+.cm-s-isotope span.cm-number {color: #cc00ff;}
+
+.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
+.cm-s-isotope span.cm-keyword {color: #ff0000;}
+.cm-s-isotope span.cm-string {color: #ff0099;}
+
+.cm-s-isotope span.cm-variable {color: #33ff00;}
+.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
+.cm-s-isotope span.cm-def {color: #ff9900;}
+.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
+.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
+.cm-s-isotope span.cm-tag {color: #ff0000;}
+.cm-s-isotope span.cm-link {color: #cc00ff;}
+
+.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/core/media/editors/codemirror/theme/lesser-dark.css b/core/media/editors/codemirror/theme/lesser-dark.css
new file mode 100644
index 00000000..4b347db0
--- /dev/null
+++ b/core/media/editors/codemirror/theme/lesser-dark.css
@@ -0,0 +1,47 @@
+/*
+http://lesscss.org/ dark theme
+Ported to CodeMirror by Peter Kroon
+*/
+.cm-s-lesser-dark {
+  line-height: 1.3em;
+}
+.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
+.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
+.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
+
+.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
+
+.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
+.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
+.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
+
+.cm-s-lesser-dark span.cm-header { color: #a0a; }
+.cm-s-lesser-dark span.cm-quote { color: #090; }
+.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
+.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
+.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
+.cm-s-lesser-dark span.cm-def { color: white; }
+.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
+.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
+.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
+.cm-s-lesser-dark span.cm-property { color: #92A75C; }
+.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
+.cm-s-lesser-dark span.cm-comment { color: #666; }
+.cm-s-lesser-dark span.cm-string { color: #BCD279; }
+.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
+.cm-s-lesser-dark span.cm-meta { color: #738C73; }
+.cm-s-lesser-dark span.cm-qualifier { color: #555; }
+.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
+.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
+.cm-s-lesser-dark span.cm-tag { color: #669199; }
+.cm-s-lesser-dark span.cm-attribute { color: #81a4d5; }
+.cm-s-lesser-dark span.cm-hr { color: #999; }
+.cm-s-lesser-dark span.cm-link { color: #00c; }
+.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
+
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
+.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/core/media/editors/codemirror/theme/liquibyte.css b/core/media/editors/codemirror/theme/liquibyte.css
new file mode 100644
index 00000000..393825e0
--- /dev/null
+++ b/core/media/editors/codemirror/theme/liquibyte.css
@@ -0,0 +1,95 @@
+.cm-s-liquibyte.CodeMirror {
+	background-color: #000;
+	color: #fff;
+	line-height: 1.2em;
+	font-size: 1em;
+}
+.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
+	text-decoration: underline;
+	text-decoration-color: #0f0;
+	text-decoration-style: wavy;
+}
+.cm-s-liquibyte .cm-trailingspace {
+	text-decoration: line-through;
+	text-decoration-color: #f00;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .cm-tab {
+	text-decoration: line-through;
+	text-decoration-color: #404040;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
+.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
+.cm-s-liquibyte .CodeMirror-guttermarker {  }
+.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
+.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
+.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
+
+.cm-s-liquibyte span.cm-comment     { color: #008000; }
+.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-string      { color: #ff8000; }
+.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
+
+.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
+.cm-s-liquibyte span.cm-operator    { color: #fff; }
+
+.cm-s-liquibyte span.cm-meta        { color: #0f0; }
+.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
+.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
+.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
+.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-error       { color: #f00; }
+
+.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
+
+.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
+
+.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
+
+/* Default styles for common addons */
+.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
+.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
+/* Scrollbars */
+/* Simple */
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
+	background-color: rgba(80, 80, 80, .7);
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
+	background-color: rgba(80, 80, 80, .3);
+	border: 1px solid #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
+	border-top: 1px solid #404040;
+	border-bottom: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
+	border-left: 1px solid #404040;
+	border-right: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
+	background-color: #262626;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
+	background-color: #262626;
+	border-top: 1px solid #404040;
+}
+/* Overlay */
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
+	background-color: #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
+	border: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
+	border: 1px solid #404040;
+}
diff --git a/core/media/editors/codemirror/theme/lucario.css b/core/media/editors/codemirror/theme/lucario.css
new file mode 100644
index 00000000..17a15510
--- /dev/null
+++ b/core/media/editors/codemirror/theme/lucario.css
@@ -0,0 +1,37 @@
+/*
+  Name:       lucario
+  Author:     Raphael Amorim
+
+  Original Lucario color scheme (https://github.com/raphamorim/lucario)
+*/
+
+.cm-s-lucario.CodeMirror, .cm-s-lucario .CodeMirror-gutters {
+  background-color: #2b3e50 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-lucario .CodeMirror-gutters { color: #2b3e50; }
+.cm-s-lucario .CodeMirror-cursor { border-left: solid thin #E6C845; }
+.cm-s-lucario .CodeMirror-linenumber { color: #f8f8f2; }
+.cm-s-lucario .CodeMirror-selected { background: #243443; }
+.cm-s-lucario .CodeMirror-line::selection, .cm-s-lucario .CodeMirror-line > span::selection, .cm-s-lucario .CodeMirror-line > span > span::selection { background: #243443; }
+.cm-s-lucario .CodeMirror-line::-moz-selection, .cm-s-lucario .CodeMirror-line > span::-moz-selection, .cm-s-lucario .CodeMirror-line > span > span::-moz-selection { background: #243443; }
+.cm-s-lucario span.cm-comment { color: #5c98cd; }
+.cm-s-lucario span.cm-string, .cm-s-lucario span.cm-string-2 { color: #E6DB74; }
+.cm-s-lucario span.cm-number { color: #ca94ff; }
+.cm-s-lucario span.cm-variable { color: #f8f8f2; }
+.cm-s-lucario span.cm-variable-2 { color: #f8f8f2; }
+.cm-s-lucario span.cm-def { color: #72C05D; }
+.cm-s-lucario span.cm-operator { color: #66D9EF; }
+.cm-s-lucario span.cm-keyword { color: #ff6541; }
+.cm-s-lucario span.cm-atom { color: #bd93f9; }
+.cm-s-lucario span.cm-meta { color: #f8f8f2; }
+.cm-s-lucario span.cm-tag { color: #ff6541; }
+.cm-s-lucario span.cm-attribute { color: #66D9EF; }
+.cm-s-lucario span.cm-qualifier { color: #72C05D; }
+.cm-s-lucario span.cm-property { color: #f8f8f2; }
+.cm-s-lucario span.cm-builtin { color: #72C05D; }
+.cm-s-lucario span.cm-variable-3, .cm-s-lucario span.cm-type { color: #ffb86c; }
+
+.cm-s-lucario .CodeMirror-activeline-background { background: #243443; }
+.cm-s-lucario .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/material.css b/core/media/editors/codemirror/theme/material.css
new file mode 100644
index 00000000..84962a24
--- /dev/null
+++ b/core/media/editors/codemirror/theme/material.css
@@ -0,0 +1,53 @@
+/*
+
+    Name:       material
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
+
+*/
+
+.cm-s-material.CodeMirror {
+  background-color: #263238;
+  color: rgba(233, 237, 237, 1);
+}
+.cm-s-material .CodeMirror-gutters {
+  background: #263238;
+  color: rgb(83,127,126);
+  border: none;
+}
+.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
+.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
+.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
+.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-variable-2 { color: #80CBC4; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
+.cm-s-material .cm-builtin { color: #DECB6B; }
+.cm-s-material .cm-atom { color: #F77669; }
+.cm-s-material .cm-number { color: #F77669; }
+.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-string { color: #C3E88D; }
+.cm-s-material .cm-string-2 { color: #80CBC4; }
+.cm-s-material .cm-comment { color: #546E7A; }
+.cm-s-material .cm-variable { color: #82B1FF; }
+.cm-s-material .cm-tag { color: #80CBC4; }
+.cm-s-material .cm-meta { color: #80CBC4; }
+.cm-s-material .cm-attribute { color: #FFCB6B; }
+.cm-s-material .cm-property { color: #80CBAE; }
+.cm-s-material .cm-qualifier { color: #DECB6B; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
+.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
+.cm-s-material .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #EC5F67;
+}
+.cm-s-material .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/core/media/editors/codemirror/theme/mbo.css b/core/media/editors/codemirror/theme/mbo.css
new file mode 100644
index 00000000..e164fcf4
--- /dev/null
+++ b/core/media/editors/codemirror/theme/mbo.css
@@ -0,0 +1,37 @@
+/****************************************************************/
+/*   Based on mbonaci's Brackets mbo theme                      */
+/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
+/*   Create your own: http://tmtheme-editor.herokuapp.com       */
+/****************************************************************/
+
+.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
+.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
+.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
+.cm-s-mbo .CodeMirror-guttermarker { color: white; }
+.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
+.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
+.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
+
+.cm-s-mbo span.cm-comment { color: #95958a; }
+.cm-s-mbo span.cm-atom { color: #00a8c6; }
+.cm-s-mbo span.cm-number { color: #00a8c6; }
+
+.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
+.cm-s-mbo span.cm-keyword { color: #ffb928; }
+.cm-s-mbo span.cm-string { color: #ffcf6c; }
+.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
+
+.cm-s-mbo span.cm-variable { color: #ffffec; }
+.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
+.cm-s-mbo span.cm-def { color: #ffffec; }
+.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
+.cm-s-mbo span.cm-tag { color: #9ddfe9; }
+.cm-s-mbo span.cm-link { color: #f54b07; }
+.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
+.cm-s-mbo span.cm-qualifier { color: #ffffec; }
+
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
+.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
+.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/core/media/editors/codemirror/theme/mdn-like.css b/core/media/editors/codemirror/theme/mdn-like.css
new file mode 100644
index 00000000..622ed3ef
--- /dev/null
+++ b/core/media/editors/codemirror/theme/mdn-like.css
@@ -0,0 +1,46 @@
+/*
+  MDN-LIKE Theme - Mozilla
+  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
+  GitHub: @peterkroon
+
+  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
+
+*/
+.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
+.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
+
+.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
+.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
+
+.cm-s-mdn-like .cm-keyword { color: #6262FF; }
+.cm-s-mdn-like .cm-atom { color: #F90; }
+.cm-s-mdn-like .cm-number { color:  #ca7841; }
+.cm-s-mdn-like .cm-def { color: #8DA6CE; }
+.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
+
+.cm-s-mdn-like .cm-variable { color: #07a; }
+.cm-s-mdn-like .cm-property { color: #905; }
+.cm-s-mdn-like .cm-qualifier { color: #690; }
+
+.cm-s-mdn-like .cm-operator { color: #cda869; }
+.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
+.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
+.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
+.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
+.cm-s-mdn-like .cm-tag { color: #997643; }
+.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-mdn-like .cm-header { color: #FF6400; }
+.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
+.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
+.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
+
+div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
+div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
+
+.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,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); }
diff --git a/core/media/editors/codemirror/theme/midnight.css b/core/media/editors/codemirror/theme/midnight.css
new file mode 100644
index 00000000..17ed39c8
--- /dev/null
+++ b/core/media/editors/codemirror/theme/midnight.css
@@ -0,0 +1,43 @@
+/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
+
+/*<!--match-->*/
+.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
+.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
+
+/*<!--activeline-->*/
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
+
+.cm-s-midnight.CodeMirror {
+    background: #0F192A;
+    color: #D1EDFF;
+}
+
+.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
+.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
+.cm-s-midnight .CodeMirror-guttermarker { color: white; }
+.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
+.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
+
+.cm-s-midnight span.cm-comment { color: #428BDD; }
+.cm-s-midnight span.cm-atom { color: #AE81FF; }
+.cm-s-midnight span.cm-number { color: #D1EDFF; }
+
+.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
+.cm-s-midnight span.cm-keyword { color: #E83737; }
+.cm-s-midnight span.cm-string { color: #1DC116; }
+
+.cm-s-midnight span.cm-variable { color: #FFAA3E; }
+.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
+.cm-s-midnight span.cm-def { color: #4DD; }
+.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
+.cm-s-midnight span.cm-tag { color: #449; }
+.cm-s-midnight span.cm-link { color: #AE81FF; }
+.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
+
+.cm-s-midnight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/core/media/editors/codemirror/theme/monokai.css b/core/media/editors/codemirror/theme/monokai.css
new file mode 100644
index 00000000..cd4cd557
--- /dev/null
+++ b/core/media/editors/codemirror/theme/monokai.css
@@ -0,0 +1,41 @@
+/* Based on Sublime Text's Monokai theme */
+
+.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
+.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
+.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
+.cm-s-monokai .CodeMirror-guttermarker { color: white; }
+.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-monokai span.cm-comment { color: #75715e; }
+.cm-s-monokai span.cm-atom { color: #ae81ff; }
+.cm-s-monokai span.cm-number { color: #ae81ff; }
+
+.cm-s-monokai span.cm-comment.cm-attribute { color: #97b757; }
+.cm-s-monokai span.cm-comment.cm-def { color: #bc9262; }
+.cm-s-monokai span.cm-comment.cm-tag { color: #bc6283; }
+.cm-s-monokai span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
+.cm-s-monokai span.cm-keyword { color: #f92672; }
+.cm-s-monokai span.cm-builtin { color: #66d9ef; }
+.cm-s-monokai span.cm-string { color: #e6db74; }
+
+.cm-s-monokai span.cm-variable { color: #f8f8f2; }
+.cm-s-monokai span.cm-variable-2 { color: #9effff; }
+.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
+.cm-s-monokai span.cm-def { color: #fd971f; }
+.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
+.cm-s-monokai span.cm-tag { color: #f92672; }
+.cm-s-monokai span.cm-header { color: #ae81ff; }
+.cm-s-monokai span.cm-link { color: #ae81ff; }
+.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
+
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
+.cm-s-monokai .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/core/media/editors/codemirror/theme/neat.css b/core/media/editors/codemirror/theme/neat.css
new file mode 100644
index 00000000..4267b1a3
--- /dev/null
+++ b/core/media/editors/codemirror/theme/neat.css
@@ -0,0 +1,12 @@
+.cm-s-neat span.cm-comment { color: #a86; }
+.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
+.cm-s-neat span.cm-string { color: #a22; }
+.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
+.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
+.cm-s-neat span.cm-variable { color: black; }
+.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
+.cm-s-neat span.cm-meta { color: #555; }
+.cm-s-neat span.cm-link { color: #3a3; }
+
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/core/media/editors/codemirror/theme/neo.css b/core/media/editors/codemirror/theme/neo.css
new file mode 100644
index 00000000..b28d5c65
--- /dev/null
+++ b/core/media/editors/codemirror/theme/neo.css
@@ -0,0 +1,43 @@
+/* neo theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-neo.CodeMirror {
+  background-color:#ffffff;
+  color:#2e383c;
+  line-height:1.4375;
+}
+.cm-s-neo .cm-comment { color:#75787b; }
+.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
+.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
+.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
+.cm-s-neo .cm-string { color:#b35e14; }
+.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
+
+
+/* Editor styling */
+
+.cm-s-neo pre {
+  padding:0;
+}
+
+.cm-s-neo .CodeMirror-gutters {
+  border:none;
+  border-right:10px solid transparent;
+  background-color:transparent;
+}
+
+.cm-s-neo .CodeMirror-linenumber {
+  padding:0;
+  color:#e0e2e5;
+}
+
+.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
+.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
+
+.cm-s-neo .CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: rgba(155,157,162,0.37);
+  z-index: 1;
+}
diff --git a/core/media/editors/codemirror/theme/night.css b/core/media/editors/codemirror/theme/night.css
new file mode 100644
index 00000000..f631bf42
--- /dev/null
+++ b/core/media/editors/codemirror/theme/night.css
@@ -0,0 +1,27 @@
+/* Loosely based on the Midnight Textmate theme */
+
+.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
+.cm-s-night div.CodeMirror-selected { background: #447; }
+.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-guttermarker { color: white; }
+.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
+.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-night span.cm-comment { color: #8900d1; }
+.cm-s-night span.cm-atom { color: #845dc4; }
+.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
+.cm-s-night span.cm-keyword { color: #599eff; }
+.cm-s-night span.cm-string { color: #37f14a; }
+.cm-s-night span.cm-meta { color: #7678e2; }
+.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
+.cm-s-night span.cm-bracket { color: #8da6ce; }
+.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
+.cm-s-night span.cm-link { color: #845dc4; }
+.cm-s-night span.cm-error { color: #9d1e15; }
+
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
+.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/core/media/editors/codemirror/theme/oceanic-next.css b/core/media/editors/codemirror/theme/oceanic-next.css
new file mode 100644
index 00000000..296277ba
--- /dev/null
+++ b/core/media/editors/codemirror/theme/oceanic-next.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       oceanic-next
+    Author:     Filype Pereira (https://github.com/fpereira1)
+
+    Original oceanic-next color scheme by Dmitri Voronianski (https://github.com/voronianski/oceanic-next-color-scheme)
+
+*/
+
+.cm-s-oceanic-next.CodeMirror { background: #304148; color: #f8f8f2; }
+.cm-s-oceanic-next div.CodeMirror-selected { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-line::selection, .cm-s-oceanic-next .CodeMirror-line > span::selection, .cm-s-oceanic-next .CodeMirror-line > span > span::selection { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-line::-moz-selection, .cm-s-oceanic-next .CodeMirror-line > span::-moz-selection, .cm-s-oceanic-next .CodeMirror-line > span > span::-moz-selection { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-gutters { background: #304148; border-right: 10px; }
+.cm-s-oceanic-next .CodeMirror-guttermarker { color: white; }
+.cm-s-oceanic-next .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-oceanic-next .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-oceanic-next .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-oceanic-next span.cm-comment { color: #65737E; }
+.cm-s-oceanic-next span.cm-atom { color: #C594C5; }
+.cm-s-oceanic-next span.cm-number { color: #F99157; }
+
+.cm-s-oceanic-next span.cm-property { color: #99C794; }
+.cm-s-oceanic-next span.cm-attribute,
+.cm-s-oceanic-next span.cm-keyword { color: #C594C5; }
+.cm-s-oceanic-next span.cm-builtin { color: #66d9ef; }
+.cm-s-oceanic-next span.cm-string { color: #99C794; }
+
+.cm-s-oceanic-next span.cm-variable,
+.cm-s-oceanic-next span.cm-variable-2,
+.cm-s-oceanic-next span.cm-variable-3 { color: #f8f8f2; }
+.cm-s-oceanic-next span.cm-def { color: #6699CC; }
+.cm-s-oceanic-next span.cm-bracket { color: #5FB3B3; }
+.cm-s-oceanic-next span.cm-tag { color: #C594C5; }
+.cm-s-oceanic-next span.cm-header { color: #C594C5; }
+.cm-s-oceanic-next span.cm-link { color: #C594C5; }
+.cm-s-oceanic-next span.cm-error { background: #C594C5; color: #f8f8f0; }
+
+.cm-s-oceanic-next .CodeMirror-activeline-background { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/core/media/editors/codemirror/theme/panda-syntax.css b/core/media/editors/codemirror/theme/panda-syntax.css
new file mode 100644
index 00000000..6de58b56
--- /dev/null
+++ b/core/media/editors/codemirror/theme/panda-syntax.css
@@ -0,0 +1,85 @@
+/*
+	Name:       Panda Syntax
+	Author:     Siamak Mokhtari (http://github.com/siamak/)
+	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
+*/
+.cm-s-panda-syntax {
+	background: #292A2B;
+	color: #E6E6E6;
+	line-height: 1.5;
+	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
+}
+.cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
+.cm-s-panda-syntax .CodeMirror-activeline-background {
+	background: rgba(99, 123, 156, 0.1);
+}
+.cm-s-panda-syntax .CodeMirror-selected {
+	background: #FFF;
+}
+.cm-s-panda-syntax .cm-comment {
+	font-style: italic;
+	color: #676B79;
+}
+.cm-s-panda-syntax .cm-operator {
+	color: #f3f3f3;
+}
+.cm-s-panda-syntax .cm-string {
+	color: #19F9D8;
+}
+.cm-s-panda-syntax .cm-string-2 {
+    color: #FFB86C;
+}
+
+.cm-s-panda-syntax .cm-tag {
+	color: #ff2c6d;
+}
+.cm-s-panda-syntax .cm-meta {
+	color: #b084eb;
+}
+
+.cm-s-panda-syntax .cm-number {
+	color: #FFB86C;
+}
+.cm-s-panda-syntax .cm-atom {
+	color: #ff2c6d;
+}
+.cm-s-panda-syntax .cm-keyword {
+	color: #FF75B5;
+}
+.cm-s-panda-syntax .cm-variable {
+	color: #ffb86c;
+}
+.cm-s-panda-syntax .cm-variable-2 {
+	color: #ff9ac1;
+}
+.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
+	color: #ff9ac1;
+}
+
+.cm-s-panda-syntax .cm-def {
+	color: #e6e6e6;
+}
+.cm-s-panda-syntax .cm-property {
+	color: #f3f3f3;
+}
+.cm-s-panda-syntax .cm-unit {
+    color: #ffb86c;
+}
+
+.cm-s-panda-syntax .cm-attribute {
+    color: #ffb86c;
+}
+
+.cm-s-panda-syntax .CodeMirror-matchingbracket {
+    border-bottom: 1px dotted #19F9D8;
+    padding-bottom: 2px;
+    color: #e6e6e6;
+}
+.cm-s-panda-syntax .CodeMirror-gutters {
+    background: #292a2b;
+    border-right-color: rgba(255, 255, 255, 0.1);
+}
+.cm-s-panda-syntax .CodeMirror-linenumber {
+    color: #e6e6e6;
+    opacity: 0.6;
+}
diff --git a/core/media/editors/codemirror/theme/paraiso-dark.css b/core/media/editors/codemirror/theme/paraiso-dark.css
new file mode 100644
index 00000000..aa9d207e
--- /dev/null
+++ b/core/media/editors/codemirror/theme/paraiso-dark.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraíso (Dark)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
+.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
+.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
+
+.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
+.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
+.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
+.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
+
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
+.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/paraiso-light.css b/core/media/editors/codemirror/theme/paraiso-light.css
new file mode 100644
index 00000000..ae0c755f
--- /dev/null
+++ b/core/media/editors/codemirror/theme/paraiso-light.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraíso (Light)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
+.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
+.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
+.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
+
+.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-light span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-light span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-light span.cm-variable { color: #48b685; }
+.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-light span.cm-def { color: #f99b15; }
+.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
+.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-light span.cm-link { color: #815ba4; }
+.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
+
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
+.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/pastel-on-dark.css b/core/media/editors/codemirror/theme/pastel-on-dark.css
new file mode 100644
index 00000000..60435dd1
--- /dev/null
+++ b/core/media/editors/codemirror/theme/pastel-on-dark.css
@@ -0,0 +1,52 @@
+/**
+ * Pastel On Dark theme ported from ACE editor
+ * @license MIT
+ * @copyright AtomicPages LLC 2014
+ * @author Dennis Thompson, AtomicPages LLC
+ * @version 1.1
+ * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
+ */
+
+.cm-s-pastel-on-dark.CodeMirror {
+	background: #2c2827;
+	color: #8F938F;
+	line-height: 1.5;
+}
+.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
+
+.cm-s-pastel-on-dark .CodeMirror-gutters {
+	background: #34302f;
+	border-right: 0px;
+	padding: 0 3px;
+}
+.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
+.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
+.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
+.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
+.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
+.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
+.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
+.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
+.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
+.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-error {
+	background: #757aD8;
+	color: #f8f8f0;
+}
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
+.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
+	border: 1px solid rgba(255,255,255,0.25);
+	color: #8F938F !important;
+	margin: -1px -1px 0 -1px;
+}
diff --git a/core/media/editors/codemirror/theme/railscasts.css b/core/media/editors/codemirror/theme/railscasts.css
new file mode 100644
index 00000000..aeff0449
--- /dev/null
+++ b/core/media/editors/codemirror/theme/railscasts.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Railscasts
+    Author:     Ryan Bates (http://railscasts.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
+.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
+.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
+.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
+.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
+
+.cm-s-railscasts span.cm-comment {color: #bc9458;}
+.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
+.cm-s-railscasts span.cm-number {color: #b6b3eb;}
+
+.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
+.cm-s-railscasts span.cm-keyword {color: #da4939;}
+.cm-s-railscasts span.cm-string {color: #ffc66d;}
+
+.cm-s-railscasts span.cm-variable {color: #a5c261;}
+.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
+.cm-s-railscasts span.cm-def {color: #cc7833;}
+.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
+.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
+.cm-s-railscasts span.cm-tag {color: #da4939;}
+.cm-s-railscasts span.cm-link {color: #b6b3eb;}
+
+.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
diff --git a/core/media/editors/codemirror/theme/rubyblue.css b/core/media/editors/codemirror/theme/rubyblue.css
new file mode 100644
index 00000000..1f181b06
--- /dev/null
+++ b/core/media/editors/codemirror/theme/rubyblue.css
@@ -0,0 +1,25 @@
+.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
+.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
+.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
+.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
+.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
+.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
+.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
+.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
+.cm-s-rubyblue span.cm-keyword { color: #F0F; }
+.cm-s-rubyblue span.cm-string { color: #F08047; }
+.cm-s-rubyblue span.cm-meta { color: #F0F; }
+.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
+.cm-s-rubyblue span.cm-bracket { color: #F0F; }
+.cm-s-rubyblue span.cm-link { color: #F4C20B; }
+.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
+.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
+.cm-s-rubyblue span.cm-error { color: #AF2018; }
+
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/core/media/editors/codemirror/theme/seti.css b/core/media/editors/codemirror/theme/seti.css
new file mode 100644
index 00000000..814f76f7
--- /dev/null
+++ b/core/media/editors/codemirror/theme/seti.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       seti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
+
+*/
+
+
+.cm-s-seti.CodeMirror {
+  background-color: #151718 !important;
+  color: #CFD2D1 !important;
+  border: none;
+}
+.cm-s-seti .CodeMirror-gutters {
+  color: #404b53;
+  background-color: #0E1112;
+  border: none;
+}
+.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti span.cm-comment { color: #41535b; }
+.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
+.cm-s-seti span.cm-number { color: #cd3f45; }
+.cm-s-seti span.cm-variable { color: #55b5db; }
+.cm-s-seti span.cm-variable-2 { color: #a074c4; }
+.cm-s-seti span.cm-def { color: #55b5db; }
+.cm-s-seti span.cm-keyword { color: #ff79c6; }
+.cm-s-seti span.cm-operator { color: #9fca56; }
+.cm-s-seti span.cm-keyword { color: #e6cd69; }
+.cm-s-seti span.cm-atom { color: #cd3f45; }
+.cm-s-seti span.cm-meta { color: #55b5db; }
+.cm-s-seti span.cm-tag { color: #55b5db; }
+.cm-s-seti span.cm-attribute { color: #9fca56; }
+.cm-s-seti span.cm-qualifier { color: #9fca56; }
+.cm-s-seti span.cm-property { color: #a074c4; }
+.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
+.cm-s-seti span.cm-builtin { color: #9fca56; }
+.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/shadowfox.css b/core/media/editors/codemirror/theme/shadowfox.css
new file mode 100644
index 00000000..32d59b13
--- /dev/null
+++ b/core/media/editors/codemirror/theme/shadowfox.css
@@ -0,0 +1,52 @@
+/*
+
+    Name:       shadowfox
+    Author:     overdodactyl (http://github.com/overdodactyl)
+
+    Original shadowfox color scheme by Firefox
+
+*/
+
+.cm-s-shadowfox.CodeMirror { background: #2a2a2e; color: #b1b1b3; }
+.cm-s-shadowfox div.CodeMirror-selected { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-line::selection, .cm-s-shadowfox .CodeMirror-line > span::selection, .cm-s-shadowfox .CodeMirror-line > span > span::selection { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-line::-moz-selection, .cm-s-shadowfox .CodeMirror-line > span::-moz-selection, .cm-s-shadowfox .CodeMirror-line > span > span::-moz-selection { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-gutters { background: #0c0c0d ; border-right: 1px solid #0c0c0d; }
+.cm-s-shadowfox .CodeMirror-guttermarker { color: #555; }
+.cm-s-shadowfox .CodeMirror-linenumber { color: #939393; }
+.cm-s-shadowfox .CodeMirror-cursor { border-left: 1px solid #fff; }
+
+.cm-s-shadowfox span.cm-comment { color: #939393; }
+.cm-s-shadowfox span.cm-atom { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-quote { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-builtin { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-attribute { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-keyword { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-error { color: #FF7DE9; }
+
+.cm-s-shadowfox span.cm-number { color: #6B89FF; }
+.cm-s-shadowfox span.cm-string { color: #6B89FF; }
+.cm-s-shadowfox span.cm-string-2 { color: #6B89FF; }
+
+.cm-s-shadowfox span.cm-meta { color: #939393; }
+.cm-s-shadowfox span.cm-hr { color: #939393; }
+
+.cm-s-shadowfox span.cm-header { color: #75BFFF; }
+.cm-s-shadowfox span.cm-qualifier { color: #75BFFF; }
+.cm-s-shadowfox span.cm-variable-2 { color: #75BFFF; }
+
+.cm-s-shadowfox span.cm-property { color: #86DE74; }
+
+.cm-s-shadowfox span.cm-def { color: #75BFFF; }
+.cm-s-shadowfox span.cm-bracket { color: #75BFFF; }
+.cm-s-shadowfox span.cm-tag { color: #75BFFF; }
+.cm-s-shadowfox span.cm-link:visited { color: #75BFFF; }
+
+.cm-s-shadowfox span.cm-variable { color: #B98EFF; }
+.cm-s-shadowfox span.cm-variable-3 { color: #d7d7db; }
+.cm-s-shadowfox span.cm-link { color: #737373; }
+.cm-s-shadowfox span.cm-operator { color: #b1b1b3; }
+.cm-s-shadowfox span.cm-special { color: #d7d7db; }
+
+.cm-s-shadowfox .CodeMirror-activeline-background { background: rgba(185, 215, 253, .15) }
+.cm-s-shadowfox .CodeMirror-matchingbracket { outline: solid 1px rgba(255, 255, 255, .25); color: white !important; }
diff --git a/core/media/editors/codemirror/theme/solarized.css b/core/media/editors/codemirror/theme/solarized.css
new file mode 100644
index 00000000..fcd1d70d
--- /dev/null
+++ b/core/media/editors/codemirror/theme/solarized.css
@@ -0,0 +1,168 @@
+/*
+Solarized theme for code-mirror
+http://ethanschoonover.com/solarized
+*/
+
+/*
+Solarized color palette
+http://ethanschoonover.com/solarized/img/solarized-palette.png
+*/
+
+.solarized.base03 { color: #002b36; }
+.solarized.base02 { color: #073642; }
+.solarized.base01 { color: #586e75; }
+.solarized.base00 { color: #657b83; }
+.solarized.base0 { color: #839496; }
+.solarized.base1 { color: #93a1a1; }
+.solarized.base2 { color: #eee8d5; }
+.solarized.base3  { color: #fdf6e3; }
+.solarized.solar-yellow  { color: #b58900; }
+.solarized.solar-orange  { color: #cb4b16; }
+.solarized.solar-red { color: #dc322f; }
+.solarized.solar-magenta { color: #d33682; }
+.solarized.solar-violet  { color: #6c71c4; }
+.solarized.solar-blue { color: #268bd2; }
+.solarized.solar-cyan { color: #2aa198; }
+.solarized.solar-green { color: #859900; }
+
+/* Color scheme for code-mirror */
+
+.cm-s-solarized {
+  line-height: 1.45em;
+  color-profile: sRGB;
+  rendering-intent: auto;
+}
+.cm-s-solarized.cm-s-dark {
+  color: #839496;
+  background-color: #002b36;
+  text-shadow: #002b36 0 1px;
+}
+.cm-s-solarized.cm-s-light {
+  background-color: #fdf6e3;
+  color: #657b83;
+  text-shadow: #eee8d5 0 1px;
+}
+
+.cm-s-solarized .CodeMirror-widget {
+  text-shadow: none;
+}
+
+.cm-s-solarized .cm-header { color: #586e75; }
+.cm-s-solarized .cm-quote { color: #93a1a1; }
+
+.cm-s-solarized .cm-keyword { color: #cb4b16; }
+.cm-s-solarized .cm-atom { color: #d33682; }
+.cm-s-solarized .cm-number { color: #d33682; }
+.cm-s-solarized .cm-def { color: #2aa198; }
+
+.cm-s-solarized .cm-variable { color: #839496; }
+.cm-s-solarized .cm-variable-2 { color: #b58900; }
+.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
+
+.cm-s-solarized .cm-property { color: #2aa198; }
+.cm-s-solarized .cm-operator { color: #6c71c4; }
+
+.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
+
+.cm-s-solarized .cm-string { color: #859900; }
+.cm-s-solarized .cm-string-2 { color: #b58900; }
+
+.cm-s-solarized .cm-meta { color: #859900; }
+.cm-s-solarized .cm-qualifier { color: #b58900; }
+.cm-s-solarized .cm-builtin { color: #d33682; }
+.cm-s-solarized .cm-bracket { color: #cb4b16; }
+.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
+.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
+.cm-s-solarized .cm-tag { color: #93a1a1; }
+.cm-s-solarized .cm-attribute { color: #2aa198; }
+.cm-s-solarized .cm-hr {
+  color: transparent;
+  border-top: 1px solid #586e75;
+  display: block;
+}
+.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
+.cm-s-solarized .cm-special { color: #6c71c4; }
+.cm-s-solarized .cm-em {
+  color: #999;
+  text-decoration: underline;
+  text-decoration-style: dotted;
+}
+.cm-s-solarized .cm-error,
+.cm-s-solarized .cm-invalidchar {
+  color: #586e75;
+  border-bottom: 1px dotted #dc322f;
+}
+
+.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
+.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
+
+.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
+
+/* Editor styling */
+
+
+
+/* Little shadow on the view-port of the buffer view */
+.cm-s-solarized.CodeMirror {
+  -moz-box-shadow: inset 7px 0 12px -6px #000;
+  -webkit-box-shadow: inset 7px 0 12px -6px #000;
+  box-shadow: inset 7px 0 12px -6px #000;
+}
+
+/* Remove gutter border */
+.cm-s-solarized .CodeMirror-gutters {
+  border-right: 0;
+}
+
+/* Gutter colors and line number styling based of color scheme (dark / light) */
+
+/* Dark */
+.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
+  background-color: #073642;
+}
+
+.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
+  color: #586e75;
+  text-shadow: #021014 0 -1px;
+}
+
+/* Light */
+.cm-s-solarized.cm-s-light .CodeMirror-gutters {
+  background-color: #eee8d5;
+}
+
+.cm-s-solarized.cm-s-light .CodeMirror-linenumber {
+  color: #839496;
+}
+
+/* Common */
+.cm-s-solarized .CodeMirror-linenumber {
+  padding: 0 5px;
+}
+.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
+.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
+.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
+
+.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
+  color: #586e75;
+}
+
+/* Cursor */
+.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
+
+/* Fat cursor */
+.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
+.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
+.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
+.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
+
+/* Active line */
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
+  background: rgba(255, 255, 255, 0.06);
+}
+.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.06);
+}
diff --git a/core/media/editors/codemirror/theme/ssms.css b/core/media/editors/codemirror/theme/ssms.css
new file mode 100644
index 00000000..9494c14c
--- /dev/null
+++ b/core/media/editors/codemirror/theme/ssms.css
@@ -0,0 +1,16 @@
+.cm-s-ssms span.cm-keyword { color: blue; }
+.cm-s-ssms span.cm-comment { color: darkgreen; }
+.cm-s-ssms span.cm-string { color: red; }
+.cm-s-ssms span.cm-def { color: black; }
+.cm-s-ssms span.cm-variable { color: black; }
+.cm-s-ssms span.cm-variable-2 { color: black; }
+.cm-s-ssms span.cm-atom { color: darkgray; }
+.cm-s-ssms .CodeMirror-linenumber { color: teal; }
+.cm-s-ssms .CodeMirror-activeline-background { background: #ffffff; }
+.cm-s-ssms span.cm-string-2 { color: #FF00FF; }
+.cm-s-ssms span.cm-operator, 
+.cm-s-ssms span.cm-bracket, 
+.cm-s-ssms span.cm-punctuation { color: darkgray; }
+.cm-s-ssms .CodeMirror-gutters { border-right: 3px solid #ffee62; background-color: #ffffff; }
+.cm-s-ssms div.CodeMirror-selected { background: #ADD6FF; }
+
diff --git a/core/media/editors/codemirror/theme/the-matrix.css b/core/media/editors/codemirror/theme/the-matrix.css
new file mode 100644
index 00000000..c4c93c11
--- /dev/null
+++ b/core/media/editors/codemirror/theme/the-matrix.css
@@ -0,0 +1,30 @@
+.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
+.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
+.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
+.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
+.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
+.cm-s-the-matrix span.cm-atom { color: #3FF; }
+.cm-s-the-matrix span.cm-number { color: #FFB94F; }
+.cm-s-the-matrix span.cm-def { color: #99C; }
+.cm-s-the-matrix span.cm-variable { color: #F6C; }
+.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
+.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
+.cm-s-the-matrix span.cm-property { color: #62FFA0; }
+.cm-s-the-matrix span.cm-operator { color: #999; }
+.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
+.cm-s-the-matrix span.cm-string { color: #39C; }
+.cm-s-the-matrix span.cm-meta { color: #C9F; }
+.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
+.cm-s-the-matrix span.cm-builtin { color: #30a; }
+.cm-s-the-matrix span.cm-bracket { color: #cc7; }
+.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
+.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
+.cm-s-the-matrix span.cm-error { color: #FF0000; }
+
+.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/core/media/editors/codemirror/theme/tomorrow-night-bright.css b/core/media/editors/codemirror/theme/tomorrow-night-bright.css
new file mode 100644
index 00000000..b6dd4a92
--- /dev/null
+++ b/core/media/editors/codemirror/theme/tomorrow-night-bright.css
@@ -0,0 +1,35 @@
+/*
+
+    Name:       Tomorrow Night - Bright
+    Author:     Chris Kempson
+
+    Port done by Gerard Braad <me@gbraad.nl>
+
+*/
+
+.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
+.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
+
+.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
+.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
+.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
+.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
+.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
+.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/tomorrow-night-eighties.css b/core/media/editors/codemirror/theme/tomorrow-night-eighties.css
new file mode 100644
index 00000000..2a9debc3
--- /dev/null
+++ b/core/media/editors/codemirror/theme/tomorrow-night-eighties.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Tomorrow Night - Eighties
+    Author:     Chris Kempson
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
+
+.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
+.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
+.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
+.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/core/media/editors/codemirror/theme/ttcn.css b/core/media/editors/codemirror/theme/ttcn.css
new file mode 100644
index 00000000..0b14ac35
--- /dev/null
+++ b/core/media/editors/codemirror/theme/ttcn.css
@@ -0,0 +1,64 @@
+.cm-s-ttcn .cm-quote { color: #090; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-link { text-decoration: underline; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
+
+.cm-s-ttcn .cm-atom { color: #219; }
+.cm-s-ttcn .cm-attribute { color: #00c; }
+.cm-s-ttcn .cm-bracket { color: #997; }
+.cm-s-ttcn .cm-comment { color: #333333; }
+.cm-s-ttcn .cm-def { color: #00f; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-error { color: #f00; }
+.cm-s-ttcn .cm-hr { color: #999; }
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+.cm-s-ttcn .cm-keyword { font-weight:bold; }
+.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
+.cm-s-ttcn .cm-meta { color: #555; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-qualifier { color: #555; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-string { color: #006400; }
+.cm-s-ttcn .cm-string-2 { color: #f50; }
+.cm-s-ttcn .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-tag { color: #170; }
+.cm-s-ttcn .cm-variable { color: #8B2252; }
+.cm-s-ttcn .cm-variable-2 { color: #05a; }
+.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
+
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+
+/* ASN */
+.cm-s-ttcn .cm-accessTypes,
+.cm-s-ttcn .cm-compareTypes { color: #27408B; }
+.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
+.cm-s-ttcn .cm-modifier { color:#D2691E; }
+.cm-s-ttcn .cm-status { color:#8B4545; }
+.cm-s-ttcn .cm-storage { color:#A020F0; }
+.cm-s-ttcn .cm-tags { color:#006400; }
+
+/* CFG */
+.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
+.cm-s-ttcn .cm-fileNCtrlMaskOptions,
+.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
+
+/* TTCN */
+.cm-s-ttcn .cm-booleanConsts,
+.cm-s-ttcn .cm-otherConsts,
+.cm-s-ttcn .cm-verdictConsts { color: #006400; }
+.cm-s-ttcn .cm-configOps,
+.cm-s-ttcn .cm-functionOps,
+.cm-s-ttcn .cm-portOps,
+.cm-s-ttcn .cm-sutOps,
+.cm-s-ttcn .cm-timerOps,
+.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
+.cm-s-ttcn .cm-preprocessor,
+.cm-s-ttcn .cm-templateMatch,
+.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
+.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
+.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/core/media/editors/codemirror/theme/twilight.css b/core/media/editors/codemirror/theme/twilight.css
new file mode 100644
index 00000000..b2b1b2aa
--- /dev/null
+++ b/core/media/editors/codemirror/theme/twilight.css
@@ -0,0 +1,32 @@
+.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
+.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
+.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
+
+.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
+.cm-s-twilight .CodeMirror-guttermarker { color: white; }
+.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
+.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
+.cm-s-twilight .cm-atom { color: #FC0; }
+.cm-s-twilight .cm-number { color:  #ca7841; } /**/
+.cm-s-twilight .cm-def { color: #8DA6CE; }
+.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
+.cm-s-twilight .cm-operator { color: #cda869; } /**/
+.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
+.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
+.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
+.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
+.cm-s-twilight .cm-tag { color: #997643; } /**/
+.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-twilight .cm-header { color: #FF6400; }
+.cm-s-twilight .cm-hr { color: #AEAEAE; }
+.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
+
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/core/media/editors/codemirror/theme/vibrant-ink.css b/core/media/editors/codemirror/theme/vibrant-ink.css
new file mode 100644
index 00000000..b13ecf21
--- /dev/null
+++ b/core/media/editors/codemirror/theme/vibrant-ink.css
@@ -0,0 +1,34 @@
+/* Taken from the popular Visual Studio Vibrant Ink Schema */
+
+.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
+.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
+.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
+
+.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
+.cm-s-vibrant-ink .cm-atom { color: #FC0; }
+.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
+.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
+.cm-s-vibrant-ink .cm-operator { color: #888; }
+.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
+.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
+.cm-s-vibrant-ink .cm-string-2 { color: red; }
+.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
+.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-header { color: #FF6400; }
+.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
+.cm-s-vibrant-ink .cm-link { color: blue; }
+.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
+
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/core/media/editors/codemirror/theme/xq-dark.css b/core/media/editors/codemirror/theme/xq-dark.css
new file mode 100644
index 00000000..7da1a0f7
--- /dev/null
+++ b/core/media/editors/codemirror/theme/xq-dark.css
@@ -0,0 +1,53 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort <mike@brevoort.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
+.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
+.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
+.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-dark span.cm-number { color: #164; }
+.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
+.cm-s-xq-dark span.cm-variable { color: #FFF; }
+.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
+.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
+.cm-s-xq-dark span.cm-property {}
+.cm-s-xq-dark span.cm-operator {}
+.cm-s-xq-dark span.cm-comment { color: gray; }
+.cm-s-xq-dark span.cm-string { color: #9FEE00; }
+.cm-s-xq-dark span.cm-meta { color: yellow; }
+.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
+.cm-s-xq-dark span.cm-builtin { color: #30a; }
+.cm-s-xq-dark span.cm-bracket { color: #cc7; }
+.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
+.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
+.cm-s-xq-dark span.cm-error { color: #f00; }
+
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/core/media/editors/codemirror/theme/xq-light.css b/core/media/editors/codemirror/theme/xq-light.css
new file mode 100644
index 00000000..7b182ea9
--- /dev/null
+++ b/core/media/editors/codemirror/theme/xq-light.css
@@ -0,0 +1,43 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort <mike@brevoort.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
+.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-light span.cm-number { color: #164; }
+.cm-s-xq-light span.cm-def { text-decoration:underline; }
+.cm-s-xq-light span.cm-variable { color: black; }
+.cm-s-xq-light span.cm-variable-2 { color:black; }
+.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
+.cm-s-xq-light span.cm-property {}
+.cm-s-xq-light span.cm-operator {}
+.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
+.cm-s-xq-light span.cm-string { color: red; }
+.cm-s-xq-light span.cm-meta { color: yellow; }
+.cm-s-xq-light span.cm-qualifier { color: grey; }
+.cm-s-xq-light span.cm-builtin { color: #7EA656; }
+.cm-s-xq-light span.cm-bracket { color: #cc7; }
+.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
+.cm-s-xq-light span.cm-attribute { color: #7F007F; }
+.cm-s-xq-light span.cm-error { color: #f00; }
+
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/core/media/editors/codemirror/theme/yeti.css b/core/media/editors/codemirror/theme/yeti.css
new file mode 100644
index 00000000..d085f724
--- /dev/null
+++ b/core/media/editors/codemirror/theme/yeti.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       yeti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
+
+*/
+
+
+.cm-s-yeti.CodeMirror {
+  background-color: #ECEAE8 !important;
+  color: #d1c9c0 !important;
+  border: none;
+}
+
+.cm-s-yeti .CodeMirror-gutters {
+  color: #adaba6;
+  background-color: #E5E1DB;
+  border: none;
+}
+.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
+.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
+.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
+.cm-s-yeti span.cm-comment { color: #d4c8be; }
+.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
+.cm-s-yeti span.cm-number { color: #a074c4; }
+.cm-s-yeti span.cm-variable { color: #55b5db; }
+.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
+.cm-s-yeti span.cm-def { color: #55b5db; }
+.cm-s-yeti span.cm-operator { color: #9fb96e; }
+.cm-s-yeti span.cm-keyword { color: #9fb96e; }
+.cm-s-yeti span.cm-atom { color: #a074c4; }
+.cm-s-yeti span.cm-meta { color: #96c0d8; }
+.cm-s-yeti span.cm-tag { color: #96c0d8; }
+.cm-s-yeti span.cm-attribute { color: #9fb96e; }
+.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
+.cm-s-yeti span.cm-property { color: #a074c4; }
+.cm-s-yeti span.cm-builtin { color: #a074c4; }
+.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/core/media/editors/codemirror/theme/zenburn.css b/core/media/editors/codemirror/theme/zenburn.css
new file mode 100644
index 00000000..781c40ac
--- /dev/null
+++ b/core/media/editors/codemirror/theme/zenburn.css
@@ -0,0 +1,37 @@
+/**
+ * "
+ *  Using Zenburn color palette from the Emacs Zenburn Theme
+ *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
+ *
+ *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
+ * "
+ * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
+ */
+
+.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
+.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
+.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
+.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
+.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
+.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
+.cm-s-zenburn span.cm-atom { color: #bfebbf; }
+.cm-s-zenburn span.cm-def { color: #dcdccc; }
+.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
+.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
+.cm-s-zenburn span.cm-string { color: #cc9393; }
+.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
+.cm-s-zenburn span.cm-number { color: #dcdccc; }
+.cm-s-zenburn span.cm-tag { color: #93e0e3; }
+.cm-s-zenburn span.cm-property { color: #dfaf8f; }
+.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
+.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
+.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
+.cm-s-zenburn span.cm-header { color: #f0efd0; }
+.cm-s-zenburn span.cm-operator { color: #f0efd0; }
+.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
+.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
+.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
+.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
+.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }
diff --git a/core/media/editors/none/js/none.js b/core/media/editors/none/js/none.js
new file mode 100644
index 00000000..d2611b26
--- /dev/null
+++ b/core/media/editors/none/js/none.js
@@ -0,0 +1,49 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Editor None
+ */
+;(function(Joomla, window, document){
+
+	function insertAtCursor(myField, myValue) {
+		if (document.selection) {
+			// IE support
+			myField.focus();
+			var sel = document.selection.createRange();
+			sel.text = myValue;
+		} else if (myField.selectionStart || myField.selectionStart == '0') {
+			// MOZILLA/NETSCAPE support
+			var startPos = myField.selectionStart;
+			var endPos = myField.selectionEnd;
+			myField.value = myField.value.substring(0, startPos)
+				+ myValue
+				+ myField.value.substring(endPos, myField.value.length);
+		} else {
+			myField.value += myValue;
+		}
+	}
+
+	// @deprecated 4.0 Use directly Joomla.editors.instances[editor].replaceSelection(text);
+	window.jInsertEditorText = function(text, editor) {
+		Joomla.editors.instances[editor].replaceSelection(text);
+	};
+
+	document.addEventListener('DOMContentLoaded', function() {
+		var editors = document.querySelectorAll('.js-editor-none');
+
+		for(var i = 0, l = editors.length; i < l; i++) {
+			/** Register Editor */
+			Joomla.editors.instances[editors[i].childNodes[0].id] = {
+				'id': editors[i].childNodes[0].id,
+				'element':  editors[i].childNodes[0],
+				'getValue': function () { return this.element.value; },
+				'setValue': function (text) { return this.element.value = text; },
+				'replaceSelection': function (text) { return insertAtCursor(this.element, text); },
+				'onSave': function() { return ''; }
+			};
+		}
+	});
+}(Joomla, window, document));
\ No newline at end of file
diff --git a/core/media/editors/none/js/none.min.js b/core/media/editors/none/js/none.min.js
new file mode 100644
index 00000000..3841593f
--- /dev/null
+++ b/core/media/editors/none/js/none.min.js
@@ -0,0 +1 @@
+!function(a,b,c){function d(a,b){if(c.selection){a.focus();var d=c.selection.createRange();d.text=b}else if(a.selectionStart||"0"==a.selectionStart){var e=a.selectionStart,f=a.selectionEnd;a.value=a.value.substring(0,e)+b+a.value.substring(f,a.value.length)}else a.value+=b}b.jInsertEditorText=function(a,b){d(c.getElementById(b),a)},c.addEventListener("DOMContentLoaded",function(){for(var b=c.querySelectorAll(".js-editor-none"),e=0,f=b.length;e<f;e++)a.editors.instances[b[e].childNodes[0].id]={id:b[e].childNodes[0].id,element:b[e].childNodes[0],getValue:function(){return this.element.value},setValue:function(a){return this.element.value=a},replaceSelection:function(a){return d(this.element,a)},onSave:function(){return""}}})}(Joomla,window,document);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/changelog.txt b/core/media/editors/tinymce/changelog.txt
new file mode 100644
index 00000000..70a4c754
--- /dev/null
+++ b/core/media/editors/tinymce/changelog.txt
@@ -0,0 +1,625 @@
+Version 4.5.8 (2017-10-05)
+	Fixed bug where paste on Edge wouldn't paste UTF characters since Microsoft didn't implement the html5 clipboard api correctly.
+	Fixed bug where it was hard to focus the editor on IE 10 since the body element didn't have full height.
+	Fixed bug where malformed blob urls wouldn't be handled correctly by the editor.
+Version 4.5.7 (2017-04-25)
+	Fixed bug with selection around inline contenteditable false would get collapsed incorrectly.
+	Fixed bug where pasting on Microsoft Edge 40+ would produce clipboard fragment headers.
+Version 4.5.6 (2017-03-30)
+	Fixed bug where it wasn't possible to select floated images in some cases.
+Version 4.5.5 (2017-03-07)
+	Fixed text formatting bug with fontsize could not be changed after changing the text color.
+Version 4.5.4 (2017-02-23)
+	Fixed bug where setBaseAndExtend would throw exceptions on Chrome 58 when selecting images.
+	Fixed bug where deleting partially selected contents could remove all contents in some edge cases on WebKit.
+Version 4.5.3 (2017-02-01)
+	Added keyboard navigation for menu buttons when the menu is in focus.
+	Added api to the list plugin for setting custom classes/attributes on lists.
+	Added validation for the anchor plugin input field according to W3C id naming specifications.
+	Fixed bug where media placeholders were removed after resize with the forced_root_block setting set to false.
+	Fixed bug where deleting selections with similar sibling nodes sometimes deleted the whole document.
+	Fixed bug with inlite theme where several toolbars would appear scrolling when more than one instance of the editor was in use.
+	Fixed bug where the editor would throw error with the fontselect plugin on hidden editor instances in Firefox.
+	Fixed bug where the background color would not stretch to the font size.
+	Fixed bug where font size would be removed when changing background color.
+	Fixed bug where the undomanager trimmed away whitespace between nodes on undo/redo.
+	Fixed bug where media_dimensions=false in media plugin caused the editor to throw an error.
+	Fixed bug where IE was producing font/u elements within links on paste.
+	Fixed bug where some button tooltips were broken when compat3x was in use.
+	Fixed bug where backspace/delete/typeover would remove the caption element.
+	Fixed bug where powerspell failed to function when compat3x was enabled.
+	Fixed bug where it wasn't possible to apply sub/sup on text with large font size.
+	Fixed bug where pre tags with spaces weren't treated as content.
+	Fixed bug where Meta+A would select the entire document instead of all contents in nested ce=true elements.
+Version 4.5.2 (2017-01-04)
+	Added missing keyboard shortcut description for the underline menu item in the format menu.
+	Fixed bug where external blob urls wasn't properly handled by editor upload logic. Patch contributed by David Oviedo.
+	Fixed bug where urls wasn't treated as a single word by the wordcount plugin.
+	Fixed bug where nbsp characters wasn't treated as word delimiters by the wordcount plugin.
+	Fixed bug where editor instance wasn't properly passed to the format preview logic. Patch contributed by NullQuery.
+	Fixed bug where the fake caret wasn't hidden when you moved selection to a cE=false element.
+	Fixed bug where it wasn't possible to edit existing code sample blocks.
+	Fixed bug where it wasn't possible to delete editor contents if the selection included an empty block.
+	Fixed bug where the formatter wasn't expanding words on some international characters. Patch contributed by Martin Larochelle.
+	Fixed bug where the open link feature wasn't working correctly on IE 11.
+	Fixed bug where enter before/after a cE=false block wouldn't properly padd the paragraph with an br element.
+	Fixed so font size and font family select boxes always displays a value by using the runtime style as a fallback.
+	Fixed so missing plugins will be logged to console as warnings rather than halting the initialization of the editor.
+	Fixed so splitbuttons become normal buttons in advlist plugin if styles are empty. Patch contributed by René Schleusner.
+	Fixed so you can multi insert rows/cols by selecting table cells and using insert rows/columns.
+Version 4.5.1 (2016-12-07)
+	Fixed bug where the lists plugin wouldn't initialize without the advlist plugins if served from cdn.
+	Fixed bug where selectors with "*" would cause the style format preview to throw an error.
+	Fixed bug with toggling lists off on lists with empty list items would throw an error.
+	Fixed bug where editing images would produce non existing blob uris.
+	Fixed bug where the offscreen toc selection would be treated as the real toc element.
+	Fixed bug where the aria level attribute for element path would have an incorrect start index.
+	Fixed bug where the offscreen selection of cE=false that where very wide would be shown onscreen. Patch contributed by Steven Bufton.
+	Fixed so the default_link_target gets applied to links created by the autolink plugin.
+	Fixed so that the name attribute gets removed by the anchor plugin if editing anchors.
+Version 4.5.0 (2016-11-23)
+	Added new toc plugin allows you to insert table of contents based on editor headings.
+	Added new auto complete menu to all url fields. Adds history, link to anchors etc.
+	Added new sidebar api that allows you to add custom sidebar panels and buttons to toggle these.
+	Added new insert menu button that allows you to have multiple insert functions under the same menu button.
+	Added new open link feature to ctrl+click, alt+enter and context menu.
+	Added new media_embed_handler option to allow the media plugin to be populated with custom embeds.
+	Added new support for editing transparent images using the image tools dialog.
+	Added new images_reuse_filename option to allow filenames of images to be retained for upload.
+	Added new security feature where links with target="_blank" will by default get rel="noopener noreferrer".
+	Added new allow_unsafe_link_target to allow you to opt-out of the target="_blank" security feature.
+	Added new style_formats_autohide option to automatically hide styles based on context.
+	Added new codesample_content_css option to specify where the code sample prism css is loaded from.
+	Added new support for Japanese/Chinese word count following the unicode standards on this.
+	Added new fragmented undo levels this dramatically reduces flicker on contents with iframes.
+	Added new live previews for complex elements like table or lists.
+	Fixed bug where it wasn't possible to properly tab between controls in a dialog with a disabled form item control.
+	Fixed bug where firefox would generate a rectangle on elements produced after/before a cE=false elements.
+	Fixed bug with advlist plugin not switching list element format properly in some edge cases.
+	Fixed bug where col/rowspans wasn't correctly computed by the table plugin in some cases.
+	Fixed bug where the table plugin would thrown an error if object_resizing was disabled.
+	Fixed bug where some invalid markup would cause issues when running in XHTML mode. Patch contributed by Charles Bourasseau.
+	Fixed bug where the fullscreen class wouldn't be removed properly when closing dialogs.
+	Fixed bug where the PastePlainTextToggle event wasn't fired by the paste plugin when the state changed.
+	Fixed bug where table the row type wasn't properly updated in table row dialog. Patch contributed by Matthias Balmer.
+	Fixed bug where select all and cut wouldn't place caret focus back to the editor in WebKit. Patch contributed by Daniel Jalkut.
+	Fixed bug where applying cell/row properties to multiple cells/rows would reset other unchanged properties.
+	Fixed bug where some elements in the schema would have redundant/incorrect children.
+	Fixed bug where selector and target options would cause issues if used together.
+	Fixed bug where drag/drop of images from desktop on chrome would thrown an error.
+	Fixed bug where cut on WebKit/Blink wouldn't add an undo level.
+	Fixed bug where IE 11 would scroll to the cE=false elements when they where selected.
+	Fixed bug where keys like F5 wouldn't work when a cE=false element was selected.
+	Fixed bug where the undo manager wouldn't stop the typing state when commands where executed.
+	Fixed bug where unlink on wrapped links wouldn't work properly.
+	Fixed bug with drag/drop of images on WebKit where the image would be deleted form the source editor.
+	Fixed bug where the visual characters mode would be disabled when contents was extracted from the editor.
+	Fixed bug where some browsers would toggle of formats applied to the caret when clicking in the editor toolbar.
+	Fixed bug where the custom theme function wasn't working correctly.
+	Fixed bug where image option for custom buttons required you to have icon specified as well.
+	Fixed bug where the context menu and contextual toolbars would be visible at the same time and sometimes overlapping.
+	Fixed bug where the noneditable plugin would double wrap elements when using the noneditable_regexp option.
+	Fixed bug where tables would get padding instead of margin when you used the indent button.
+	Fixed bug where the charmap plugin wouldn't properly insert non breaking spaces.
+	Fixed bug where the color previews in color input boxes wasn't properly updated.
+	Fixed bug where the list items of previous lists wasn't merged in the right order.
+	Fixed bug where it wasn't possible to drag/drop inline-block cE=false elements on IE 11.
+	Fixed bug where some table cell merges would produce incorrect rowspan/colspan.
+	Fixed so the font size of the editor defaults to 14px instead of 11px this can be overridden by custom css.
+	Fixed so wordcount is debounced to reduce cpu hogging on larger texts.
+	Fixed so tinymce global gets properly exported as a module when used with some module bundlers.
+	Fixed so it's possible to specify what css properties you want to preview on specific formats.
+	Fixed so anchors are contentEditable=false while within the editor.
+	Fixed so selected contents gets wrapped in a inline code element by the codesample plugin.
+	Fixed so conditional comments gets properly stripped independent of case. Patch contributed by Georgii Dolzhykov.
+	Fixed so some escaped css sequences gets properly handled. Patch contributed by Georgii Dolzhykov.
+	Fixed so notifications with the same message doesn't get displayed at the same time.
+	Fixed so F10 can be used as an alternative key to focus to the toolbar.
+	Fixed various api documentation issues and typos.
+	Removed layer plugin since it wasn't really ported from 3.x and there doesn't seem to be much use for it.
+	Removed moxieplayer.swf from the media plugin since it wasn't used by the media plugin.
+	Removed format state from the advlist plugin to be more consistent with common word processors.
+Version 4.4.3 (2016-09-01)
+	Fixed bug where copy would produce an exception on Chrome.
+	Fixed bug where deleting lists on IE 11 would merge in correct text nodes.
+	Fixed bug where deleting partial lists with indentation wouldn't cause proper normalization.
+Version 4.4.2 (2016-08-25)
+	Added new importcss_exclusive option to disable unique selectors per group.
+	Added new group specific selector_converter option to importcss plugin.
+	Added new codesample_languages option to apply custom languages to codesample plugin.
+	Added new codesample_dialog_width/codesample_dialog_height options.
+	Fixed bug where fullscreen button had an incorrect keyboard shortcut.
+	Fixed bug where backspace/delete wouldn't work correctly from a block to a cE=false element.
+	Fixed bug where smartpaste wasn't detecting links with special characters in them like tilde.
+	Fixed bug where the editor wouldn't get proper focus if you clicked on a cE=false element.
+	Fixed bug where it wasn't possible to copy/paste table rows that had merged cells.
+	Fixed bug where merging cells could some times produce invalid col/rowspan attibute values.
+	Fixed bug where getBody would sometimes thrown an exception now it just returns null if the iframe is clobbered.
+	Fixed bug where drag/drop of cE=false element wasn't properly constrained to viewport.
+	Fixed bug where contextmenu on Mac would collapse any selection to a caret.
+	Fixed bug where rtl mode wasn't rendered properly when loading a language pack with the rtl flag.
+	Fixed bug where Kamer word bounderies would be stripped from contents.
+	Fixed bug where lists would sometimes render two dots or numbers on the same line.
+	Fixed bug where the skin_url wasn't used by the inlite theme.
+	Fixed so data attributes are ignored when comparing formats in the formatter.
+	Fixed so it's possible to disable inline toolbars in the inlite theme.
+	Fixed so template dialog gets resized if it doesn't fit the window viewport.
+Version 4.4.1 (2016-07-26)
+	Added smart_paste option to paste plugin to allow disabling the paste behavior if needed.
+	Fixed bug where png urls wasn't properly detected by the smart paste logic.
+	Fixed bug where the element path wasn't working properly when multiple editor instances where used.
+	Fixed bug with creating lists out of multiple paragraphs would just create one list item instead of multiple.
+	Fixed bug where scroll position wasn't properly handled by the inlite theme to place the toolbar properly.
+	Fixed bug where multiple instances of the editor using the inlite theme didn't render the toolbar properly.
+	Fixed bug where the shortcut label for fullscreen mode didn't match the actual shortcut key.
+	Fixed bug where it wasn't possible to select cE=false blocks using touch devices on for example iOS.
+	Fixed bug where it was possible to select the child image within a cE=false on IE 11.
+	Fixed so inserts of html containing lists doesn't merge with any existing lists unless it's a paste operation.
+Version 4.4.0 (2016-06-30)
+	Added new inlite theme this is a more lightweight inline UI.
+	Added smarter paste logic that auto detects urls in the clipboard and inserts images/links based on that.
+	Added a better image resize algorithm for better image quality in the imagetools plugin.
+	Fixed bug where it wasn't possible to drag/dropping cE=false elements on FF.
+	Fixed bug where backspace/delete before/after a cE=false block would produce a new paragraph.
+	Fixed bug where list style type css property wasn't preserved when indenting lists.
+	Fixed bug where merging of lists where done even if the list style type was different.
+	Fixed bug where the image_dataimg_filter function wasn't used when pasting images.
+	Fixed bug where nested editable within a non editable element would cause scroll on focus in Chrome.
+	Fixed so invalid targets for inline mode is blocked on initialization. We only support elements that can have children.
+Version 4.3.13 (2016-06-08)
+	Added characters with a diacritical mark to charmap plugin. Patch contributed by Dominik Schilling.
+	Added better error handling if the image proxy service would produce errors.
+	Fixed issue with pasting list items into list items would produce nested list rather than a merged list.
+	Fixed bug where table selection could get stuck in selection mode for inline editors.
+	Fixed bug where it was possible to place the caret inside the resize grid elements.
+	Fixed bug where it wasn't possible to place in elements horizontally adjacent cE=false blocks.
+	Fixed bug where multiple notifications wouldn't be properly placed on screen.
+	Fixed bug where multiple editor instance of the same id could be produces in some specific integrations.
+Version 4.3.12 (2016-05-10)
+	Fixed bug where focus calls couldn't be made inside the editors PostRender event handler.
+	Fixed bug where some translations wouldn't work as expected due to a bug in editor.translate.
+	Fixed bug where the node change event could fire with a node out side the root of the editor.
+	Fixed bug where Chrome wouldn't properly present the keyboard paste clipboard details when paste was clicked.
+	Fixed bug where merged cells in tables couldn't be selected from right to left.
+	Fixed bug where insert row wouldn't properly update a merged cells rowspan property.
+	Fixed bug where the color input boxes preview field wasn't properly set on initialization.
+	Fixed bug where IME composition inside table cells wouldn't work as expected on IE 11.
+	Fixed so all shadow dom support is under and experimental flag due to flaky browser support.
+Version 4.3.11 (2016-04-25)
+	Fixed bug where it wasn't possible to insert empty blocks though the API unless they where padded.
+	Fixed bug where you couldn't type the Euro character on Windows.
+	Fixed bug where backspace/delete from a cE=false element to a text block didn't work properly.
+	Fixed bug where the text color default grid would render incorrectly.
+	Fixed bug where the codesample plugin wouldn't load the css in the editor for multiple editors.
+	Fixed so the codesample plugin textarea gets focused by default.
+Version 4.3.10 (2016-04-12)
+	Fixed bug where the key "y" on WebKit couldn't be entered due to conflict with keycode for F10 on keypress.
+Version 4.3.9 (2016-04-12)
+	Added support for focusing the contextual toolbars using keyboard.
+	Added keyboard support for slider UI controls. You can no increase/decrease using arrow keys.
+	Added url pattern matching for Dailymotion to media plugin. Patch contributed by Bertrand Darbon.
+	Added body_class to template plugin preview. Patch contributed by Milen Petrinski.
+	Added options to better override textcolor pickers with custom colors. Patch contributed by Xavier Boubert.
+	Added visual arrows to inline contextual toolbars so that they point to the element being active.
+	Fixed so toolbars for tables or other larger elements get better positioned below the scrollable viewport.
+	Fixed bug where it was possible to click links inside cE=false blocks.
+	Fixed bug where event targets wasn't properly handled in Safari Technical Preview.
+	Fixed bug where drag/drop text in FF 45 would make the editor caret invisible.
+	Fixed bug where the remove state wasn't properly set on editor instances when detected as clobbered.
+	Fixed bug where offscreen selection of some cE=false elements would render onscreen. Patch contributed by Steven Bufton
+	Fixed bug where enter would clone styles out side the root on editors inside a span. Patch contributed by ChristophKaser.
+	Fixed bug where drag/drop of images into the editor didn't work correctly in FF.
+	Fixed so the first item in panels for the imagetools dialog gets proper keyboard focus.
+	Changed the Meta+Shift+F shortcut to Ctrl+Shift+F since Czech, Slovak, Polish languages used the first one for input.
+Version 4.3.8 (2016-03-15)
+	Fixed bug where inserting HR at the end of a block element would produce an extra empty block.
+	Fixed bug where links would be clickable when readonly mode was enabled.
+	Fixed bug where the formatter would normalize to the wrong node on very specific content.
+	Fixed bug where some nested list items couldn't be indented properly.
+	Fixed bug where links where clickable in the preview dialog.
+	Fixed so the alt attribute doesn't get padded with an empty value by default.
+	Fixed so nested alignment works more correctly. You will now alter the alignment to the closest block parent.
+Version 4.3.7 (2016-03-02)
+	Fixed bug where incorrect icons would be rendered for imagetools edit and color levels.
+	Fixed bug where navigation using arrow keys inside a SelectBox didn't move up/down.
+	Fixed bug where the visualblocks plugin would render borders round internal UI elements.
+Version 4.3.6 (2016-03-01)
+	Added new paste_remember_plaintext_info option to allow a global disable of the plain text mode notification.
+	Added new PastePlainTextToggle event that fires when plain text mode toggles on/off.
+	Fixed bug where it wasn't possible to select media elements since the drag logic would snap it to mouse cursor.
+	Fixed bug where it was hard to place the caret inside nested cE=true elements when the outer cE=false element was focused.
+	Fixed bug where editors wouldn't properly initialize if both selector and mode where used.
+	Fixed bug where IME input inside table cells would switch the IME off.
+	Fixed bug where selection inside the first table cell would cause the whole table cell to get selected.
+	Fixed bug where error handling of images being uploaded wouldn't properly handle faulty statuses.
+	Fixed bug where inserting contents before a HR would cause an exception to be thrown.
+	Fixed bug where copy/paste of Excel data would be inserted as an image.
+	Fixed caret position issues with copy/paste of inline block cE=false elements.
+	Fixed issues with various menu item focus bugs in Chrome. Where the focused menu bar item wasn't properly blurred.
+	Fixed so the notifications have a solid background since it would be hard to read if there where text under it.
+	Fixed so notifications gets animated similar to the ones used by dialogs.
+	Fixed so larger images that gets pasted is handled better.
+	Fixed so the window close button is more uniform on various platform and also increased it's hit area.
+Version 4.3.5 (2016-02-11)
+	Npm version bump due to package not being fully updated.
+Version 4.3.4 (2016-02-11)
+	Added new OpenWindow/CloseWindow events that gets fired when windows open/close.
+	Added new NewCell/NewRow events that gets fired when table cells/rows are created.
+	Added new Promise return value to tinymce.init makes it easier to handle initialization.
+	Removed the jQuery version the jQuery plugin is now moved into the main package.
+	Removed jscs from build process since eslint can now handle code style checking.
+	Fixed various bugs with drag/drop of contentEditable:false elements.
+	Fixed bug where deleting of very specific nested list items would result in an odd list.
+	Fixed bug where lists would get merged with adjacent lists outside the editable inline root.
+	Fixed bug where MS Edge would crash when closing a dialog then clicking a menu item.
+	Fixed bug where table cell selection would add undo levels.
+	Fixed bug where table cell selection wasn't removed when inline editor where removed.
+	Fixed bug where table cell selection wouldn't work properly on nested tables.
+	Fixed bug where table merge menu would be available when merging between thead and tbody.
+	Fixed bug where table row/column resize wouldn't get properly removed when the editor was removed.
+	Fixed bug where Chrome would scroll to the editor if there where a empty hash value in document url.
+	Fixed bug where the cache suffix wouldn't work correctly with the importcss plugin.
+	Fixed bug where selection wouldn't work properly on MS Edge on Windows Phone 10.
+	Fixed so adjacent pre blocks gets joined into one pre block since that seems like the user intent.
+	Fixed so events gets properly dispatched in shadow dom. Patch provided by Nazar Mokrynskyi.
+Version 4.3.3 (2016-01-14)
+	Added new table_resize_bars configuration setting.  This setting allows you to disable the table resize bars.
+	Added new beforeInitialize event to tinymce.util.XHR lets you modify XHR properties before open. Patch contributed by Brent Clintel.
+	Added new autolink_pattern setting to autolink plugin. Enables you to override the default autolink formats. Patch contributed by Ben Tiedt.
+	Added new charmap option that lets you override the default charmap of the charmap plugin.
+	Added new charmap_append option that lets you add new characters to the default charmap of the charmap plugin.
+	Added new insertCustomChar event that gets fired when a character is inserted by the charmap plugin.
+	Fixed bug where table cells started with a superfluous &nbsp; in IE10+.
+	Fixed bug where table plugin would retain all BR tags when cells were merged.
+	Fixed bug where media plugin would strip underscores from youtube urls.
+	Fixed bug where IME input would fail on IE 11 if you typed within a table.
+	Fixed bug where double click selection of a word would remove the space before the word on insert contents.
+	Fixed bug where table plugin would produce exceptions when hovering tables with invalid structure.
+	Fixed bug where fullscreen wouldn't scroll back to it's original position when untoggled.
+	Fixed so the template plugins templates setting can be a function that gets a callback that can provide templates.
+Version 4.3.2 (2015-12-14)
+	Fixed bug where the resize bars for table cells were not affected by the object_resizing property.
+	Fixed bug where the contextual table toolbar would appear incorrectly if TinyMCE was initialized inline inside a table.
+	Fixed bug where resizing table cells did not fire a node change event or add an undo level.
+	Fixed bug where double click selection of text on IE 11 wouldn't work properly.
+	Fixed bug where codesample plugin would incorrectly produce br elements inside code elements.
+	Fixed bug where media plugin would strip dashes from youtube urls.
+	Fixed bug where it was possible to move the caret into the table resize bars.
+	Fixed bug where drag/drop into a cE=false element was possible on IE.
+Version 4.3.1 (2015-11-30)
+	Fixed so it's possible to disable the table inline toolbar by setting it to false or an empty string.
+	Fixed bug where it wasn't possible to resize some tables using the drag handles.
+	Fixed bug where unique id:s would clash for multiple editor instances and cE=false selections.
+	Fixed bug where the same plugin could be initialized multiple times.
+	Fixed bug where the table inline toolbars would be displayed at the same time as the image toolbars.
+	Fixed bug where the table selection rect wouldn't be removed when selecting another control element.
+Version 4.3.0 (2015-11-23)
+	Added new table column/row resize support. Makes it a lot more easy to resize the columns/rows in a table.
+	Added new table inline toolbar. Makes it easier to for example add new rows or columns to a table.
+	Added new notification API. Lets you display floating notifications to the end user.
+	Added new codesample plugin that lets you insert syntax highlighted pre elements into the editor.
+	Added new image_caption to images. Lets you create images with captions using a HTML5 figure/figcaption elements.
+	Added new live previews of embeded videos. Lets you play the video right inside the editor.
+	Added new setDirty method and "dirty" event to the editor. Makes it easier to track the dirty state change.
+	Added new setMode method to Editor instances that lets you dynamically switch between design/readonly.
+	Added new core support for contentEditable=false elements within the editor overrides the browsers broken behavior.
+	Rewrote the noneditable plugin to use the new contentEditable false core logic.
+	Fixed so the dirty state doesn't set set to false automatically when the undo index is set to 0.
+	Fixed the Selection.placeCaretAt so it works better on IE when the coordinate is between paragraphs.
+	Fixed bug where data-mce-bogus="all" element contents where counted by the word count plugin.
+	Fixed bug where contentEditable=false elements would be indented by the indent buttons.
+	Fixed bug where images within contentEditable=false would be selected in WebKit on mouse click.
+	Fixed bug in DOMUntils split method where the replacement parameter wouldn't work on specific cases.
+	Fixed bug where the importcss plugin would import classes from the skin content css file.
+	Fixed so all button variants have a wrapping span for it's text to make it easier to skin.
+	Fixed so it's easier to exit pre block using the arrow keys.
+	Fixed bug where listboxes with fix widths didn't render correctly.
+Version 4.2.8 (2015-11-13)
+	Fixed bug where it was possible to delete tables as the inline root element if all columns where selected.
+	Fixed bug where the UI buttons active state wasn't properly updated due to recent refactoring of that logic.
+Version 4.2.7 (2015-10-27)
+	Fixed bug where backspace/delete would remove all formats on the last paragraph character in WebKit/Blink.
+	Fixed bug where backspace within a inline format element with a bogus caret container would move the caret.
+	Fixed bug where backspace/delete on selected table cells wouldn't add an undo level.
+	Fixed bug where script tags embedded within the editor could sometimes get a mce- prefix prepended to them
+	Fixed bug where validate: false option could produce an error to be thrown from the Serialization step.
+	Fixed bug where inline editing of a table as the root element could let the user delete that table.
+	Fixed bug where inline editing of a table as the root element wouldn't properly handle enter key.
+	Fixed bug where inline editing of a table as the root element would normalize the selection incorrectly.
+	Fixed bug where inline editing of a list as the root element could let the user delete that list.
+	Fixed bug where inline editing of a list as the root element could let the user split that list.
+	Fixed bug where resize handles would be rendered on editable root elements such as table.
+Version 4.2.6 (2015-09-28)
+	Added capability to set request headers when using XHRs.
+	Added capability to upload local images automatically default delay is set to 30 seconds after editing images.
+	Added commands ids mceEditImage, mceAchor and mceMedia to be avaiable from execCommand.
+	Added Edge browser to saucelabs grunt task. Patch contributed by John-David Dalton.
+	Fixed bug where blob uris not produced by tinymce would produce HTML invalid markup.
+	Fixed bug where selection of contents of a nearly empty editor in Edge would sometimes fail.
+	Fixed bug where color styles woudln't be retained on copy/paste in Blink/Webkit.
+	Fixed bug where the table plugin would throw an error when inserting rows after a child table.
+	Fixed bug where the template plugin wouldn't handle functions as variable replacements.
+	Fixed bug where undo/redo sometimes wouldn't work properly when applying formatting collapsed ranges.
+	Fixed bug where shift+delete wouldn't do a cut operation on Blink/WebKit.
+	Fixed bug where cut action wouldn't properly store the before selection bookmark for the undo level.
+	Fixed bug where backspace in side an empty list element on IE would loose editor focus.
+	Fixed bug where the save plugin wouldn't enable the buttons when a change occurred.
+	Fixed bug where Edge wouldn't initialize the editor if a document.domain was specified.
+	Fixed bug where enter key before nested images would sometimes not properly expand the previous block.
+	Fixed bug where the inline toolbars wouldn't get properly hidden when blurring the editor instance.
+	Fixed bug where Edge would paste Chinese characters on some Windows 10 installations.
+	Fixed bug where IME would loose focus on IE 11 due to the double trailing br bug fix.
+	Fixed bug where the proxy url in imagetools was incorrect. Patch contributed by Wong Ho Wang.
+Version 4.2.5 (2015-08-31)
+	Added fullscreen capability to embedded youtube and vimeo videos.
+	Fixed bug where the uploadImages call didn't work on IE 10.
+	Fixed bug where image place holders would be uploaded by uploadImages call.
+	Fixed bug where images marked with bogus would be uploaded by the uploadImages call.
+	Fixed bug where multiple calls to uploadImages would result in decreased performance.
+	Fixed bug where pagebreaks were editable to imagetools patch contributed by Rasmus Wallin.
+	Fixed bug where the element path could cause too much recursion exception.
+	Fixed bug for domains containing ".min". Patch contributed by Loïc Février.
+	Fixed so validation of external links to accept a number after www. Patch contributed by Victor Carvalho.
+	Fixed so the charmap is exposed though execCommand. Patch contributed by Matthew Will.
+	Fixed so that the image uploads are concurrent for improved performance.
+	Fixed various grammar problems in inline documentation. Patches provided by nikolas.
+Version 4.2.4 (2015-08-17)
+	Added picture as a valid element to the HTML 5 schema. Patch contributed by Adam Taylor.
+	Fixed bug where contents would be duplicated on drag/drop within the same editor.
+	Fixed bug where floating/alignment of images on Edge wouldn't work properly.
+	Fixed bug where it wasn't possible to drag images on IE 11.
+	Fixed bug where image selection on Edge would sometimes fail.
+	Fixed bug where contextual toolbars icons wasn't rendered properly when using the toolbar_items_size.
+	Fixed bug where searchreplace dialog doesn't get prefilled with the selected text.
+	Fixed bug where fragmented matches wouldn't get properly replaced by the searchreplace plugin.
+	Fixed bug where enter key wouldn't place the caret if was after a trailing space within an inline element.
+	Fixed bug where the autolink plugin could produce multiple links for the same text on Gecko.
+	Fixed bug where EditorUpload could sometimes throw an exception if the blob wasn't found.
+	Fixed xss issues with media plugin not properly filtering out some script attributes.
+Version 4.2.3 (2015-07-30)
+	Fixed bug where image selection wasn't possible on Edge due to incompatible setBaseAndExtend API.
+	Fixed bug where image blobs urls where not properly destroyed by the imagetools plugin.
+	Fixed bug where keyboard shortcuts wasn't working correctly on IE 8.
+	Fixed skin issue where the borders of panels where not visible on IE 8.
+Version 4.2.2 (2015-07-22)
+	Fixed bug where float panels were not being hidden on inline editor blur when fixed_toolbar_container config option was in use.
+	Fixed bug where combobox states wasn't properly updated if contents where updated without keyboard.
+	Fixed bug where pasting into textbox or combobox would move the caret to the end of text.
+	Fixed bug where removal of bogus span elements before block elements would remove whitespace between nodes.
+	Fixed bug where repositioning of inline toolbars where async and producing errors if the editor was removed from DOM to early. Patch by iseulde.
+	Fixed bug where element path wasn't working correctly. Patch contributed by iseulde.
+	Fixed bug where menus wasn't rendered correctly when custom images where added to a menu. Patch contributed by Naim Hammadi.
+Version 4.2.1 (2015-06-29)
+	Fixed bug where back/forward buttons in the browser would render blob images as broken images.
+	Fixed bug where Firefox would throw regexp to big error when replacing huge base64 chunks.
+	Fixed bug rendering issues with resize and context toolbars not being placed properly until next animation frame.
+	Fixed bug where the rendering of the image while cropping would some times not be centered correctly.
+	Fixed bug where listbox items with submenus would me selected as active.
+	Fixed bug where context menu where throwing an error when rendering.
+	Fixed bug where resize both option wasn't working due to resent addClass API change. Patch contributed by Jogai.
+	Fixed bug where a hideAll call for container rendered inline toolbars would throw an error.
+	Fixed bug where onclick event handler on combobox could cause issues if element.id was a function by some polluting libraries.
+	Fixed bug where listboxes wouldn't get proper selected sub menu item when using link_list or image_list.
+	Fixed so the UI controls are as wide as 4.1.x to avoid wrapping controls in toolbars.
+	Fixed so the imagetools dialog is adaptive for smaller screen sizes.
+Version 4.2.0 (2015-06-25)
+	Added new flat default skin to make the UI more modern.
+	Added new imagetools plugin, lets you crop/resize and apply filters to images.
+	Added new contextual toolbars support to the API lets you add floating toolbars for specific CSS selectors.
+	Added new promise feature fill as tinymce.util.Promise.
+	Added new built in image upload feature lets you upload any base64 encoded image within the editor as files.
+	Fixed bug where resize handles would appear in the right position in the wrong editor when switching between resizable content in different inline editors.
+	Fixed bug where tables would not be inserted in inline mode due to previous float panel fix.
+	Fixed bug where floating panels would remain open when focus was lost on inline editors.
+	Fixed bug where cut command on Chrome would thrown a browser security exception.
+	Fixed bug where IE 11 sometimes would report an incorrect size for images in the image dialog.
+	Fixed bug where it wasn't possible to remove inline formatting at the end of block elements.
+	Fixed bug where it wasn't possible to delete table cell contents when cell selection was vertical.
+	Fixed bug where table cell wasn't emptied from block elements if delete/backspace where pressed in empty cell.
+	Fixed bug where cmd+shift+arrow didn't work correctly on Firefox mac when selecting to start/end of line.
+	Fixed bug where removal of bogus elements would sometimes remove whitespace between nodes.
+	Fixed bug where the resize handles wasn't updated when the main window was resized.
+	Fixed so script elements gets removed by default to prevent possible XSS issues in default config implementations.
+	Fixed so the UI doesn't need manual reflows when using non native layout managers.
+	Fixed so base64 encoded images doesn't slow down the editor on modern browsers while editing.
+	Fixed so all UI elements uses touch events to improve mobile device support.
+	Removed the touch click quirks patch for iOS since it did more harm than good.
+	Removed the non proportional resize handles since. Unproportional resize can still be done by holding the shift key.
+Version 4.1.10 (2015-05-05)
+	Fixed bug where plugins loaded with compat3x would sometimes throw errors when loading using the jQuery version.
+	Fixed bug where extra empty paragraphs would get deleted in WebKit/Blink due to recent Quriks fix.
+	Fixed bug where the editor wouldn't work properly on IE 12 due to some required browser sniffing.
+	Fixed bug where formatting shortcut keys where interfering with Mac OS X screenshot keys.
+	Fixed bug where the caret wouldn't move to the next/previous line boundary on Cmd+Left/Right on Gecko.
+	Fixed bug where it wasn't possible to remove formats from very specific nested contents.
+	Fixed bug where undo levels wasn't produced when typing letters using the shift or alt+ctrl modifiers.
+	Fixed bug where the dirty state wasn't properly updated when typing using the shift or alt+ctrl modifiers.
+	Fixed bug where an error would be thrown if an autofocused editor was destroyed quickly after its initialization. Patch provided by thorn0.
+	Fixed issue with dirty state not being properly updated on redo operation.
+	Fixed issue with entity decoder not handling incorrectly written numeric entities.
+	Fixed issue where some PI element values wouldn't be properly encoded.
+Version 4.1.9 (2015-03-10)
+	Fixed bug where indentation wouldn't work properly for non list elements.
+	Fixed bug with image plugin not pulling the image dimensions out correctly if a custom document_base_url was used.
+	Fixed bug where ctrl+alt+[1-9] would conflict with the AltGr+[1-9] on Windows. New shortcuts is ctrl+shift+[1-9].
+	Fixed bug with removing formatting on nodes in inline mode would sometimes include nodes outside the editor body.
+	Fixed bug where extra nbsp:s would be inserted when you replaced a word surrounded by spaces using insertContent.
+	Fixed bug with pasting from Google Docs would produce extra strong elements and line feeds.
+Version 4.1.8 (2015-03-05)
+	Added new html5 sizes attribute to img elements used together with srcset.
+	Added new elementpath option that makes it possible to disable the element path but keep the statusbar.
+	Added new option table_style_by_css for the table plugin to set table styling with css rather than table attributes.
+	Added new link_assume_external_targets option to prompt the user to prepend http:// prefix if the supplied link does not contain a protocol prefix.
+	Added new image_prepend_url option to allow a custom base path/url to be added to images.
+	Added new table_appearance_options option to make it possible to disable some options.
+	Added new image_title option to make it possible to alter the title of the image, disabled by default.
+	Fixed bug where selection starting from out side of the body wouldn't produce a proper selection range on IE 11.
+	Fixed bug where pressing enter twice before a table moves the cursor in the table and causes a javascript error.
+	Fixed bug where advanced image styles were not respected.
+	Fixed bug where the less common Shift+Delete didn't produce a proper cut operation on WebKit browsers.
+	Fixed bug where image/media size constrain logic would produce NaN when handling non number values.
+	Fixed bug where internal classes where removed by the removeformat command.
+	Fixed bug with creating links table cell contents with a specific selection would throw a exceptions on WebKit/Blink.
+	Fixed bug where valid_classes option didn't work as expected according to docs. Patch provided by thorn0.
+	Fixed bug where jQuery plugin would patch the internal methods multiple times. Patch provided by Drew Martin.
+	Fixed bug where backspace key wouldn't delete the current selection of newly formatted content.
+	Fixed bug where type over of inline formatting elements wouldn't properly keep the format on WebKit/Blink.
+	Fixed bug where selection needed to be properly normalized on modern IE versions.
+	Fixed bug where Command+Backspace didn't properly delete the whole line of text but the previous word.
+	Fixed bug where UI active states wheren't properly updated on IE if you placed caret within the current range.
+	Fixed bug where delete/backspace on WebKit/Blink would remove span elements created by the user.
+	Fixed bug where delete/backspace would produce incorrect results when deleting between two text blocks with br elements.
+	Fixed bug where captions where removed when pasting from MS Office.
+	Fixed bug where lists plugin wouldn't properly remove fully selected nested lists.
+	Fixed bug where the ttf font used for icons would throw an warning message on Gecko on Mac OS X.
+	Fixed a bug where applying a color to text did not update the undo/redo history.
+	Fixed so shy entities gets displayed when using the visualchars plugin.
+	Fixed so removeformat removes ins/del by default since these might be used for strikethough.
+	Fixed so multiple language packs can be loaded and added to the global I18n data structure.
+	Fixed so transparent color selection gets treated as a normal color selection. Patch contributed by Alexander Hofbauer.
+	Fixed so it's possible to disable autoresize_overflow_padding, autoresize_bottom_margin options by setting them to false.
+	Fixed so the charmap plugin shows the description of the character in the dialog. Patch contributed by Jelle Hissink.
+	Removed address from the default list of block formats since it tends to be missused.
+	Fixed so the pre block format is called preformatted to make it more verbose.
+	Fixed so it's possible to context scope translation strings this isn't needed most of the time.
+	Fixed so the max length of the width/height input fields of the media dialog is 5 instead of 3.
+	Fixed so drag/dropped contents gets properly processed by paste plugin since it's basically a paste. Patch contributed by Greg Fairbanks.
+	Fixed so shortcut keys for headers is ctrl+alt+[1-9] instead of ctrl+[1-9] since these are for switching tabs in the browsers.
+	Fixed so "u" doesn't get converted into a span element by the legacy input filter. Since this is now a valid HTML5 element.
+	Fixed font families in order to provide appropriate web-safe fonts.
+Version 4.1.7 (2014-11-27)
+	Added HTML5 schema support for srcset, source and picture. Patch contributed by mattheu.
+	Added new cache_suffix setting to enable cache busting by producing unique urls.
+	Added new paste_convert_word_fake_lists option to enable users to disable the fake lists convert logic.
+	Fixed so advlist style changes adds undo levels for each change.
+	Fixed bug where WebKit would sometimes produce an exception when the autolink plugin where looking for URLs.
+	Fixed bug where IE 7 wouldn't be rendered properly due to to aggressive css compression.
+	Fixed bug where DomQuery wouldn't accept window as constructor element.
+	Fixed bug where the color picker in 3.x dialogs wouldn't work properly. Patch contributed by Callidior.
+	Fixed bug where the image plugin wouldn't respect the document_base_url.
+	Fixed bug where the jQuery plugin would fail to append to elements named array prototype names.
+Version 4.1.6 (2014-10-08)
+	Fixed bug with clicking on the scrollbar of the iframe would cause a JS error to be thrown.
+	Fixed bug where null would produce an exception if you passed it to selection.setRng.
+	Fixed bug where Ctrl/Cmd+Tab would indent the current list item if you switched tabs in the browser.
+	Fixed bug where pasting empty cells from Excel would result in a broken table.
+	Fixed bug where it wasn't possible to switch back to default list style type.
+	Fixed issue where the select all quirk fix would fire for other modifiers than Ctrl/Cmd combinations.
+	Replaced jake with grunt since it is more mainstream and has better plugin support.
+Version 4.1.5 (2014-09-09)
+	Fixed bug where sometimes the resize rectangles wouldn't properly render on images on WebKit/Blink.
+	Fixed bug in list plugin where delete/backspace would merge empty LI elements in lists incorrectly.
+	Fixed bug where empty list elements would result in empty LI elements without it's parent container.
+	Fixed bug where backspace in empty caret formatted element could produce an type error exception of Gecko.
+	Fixed bug where lists pasted from word with a custom start index above 9 wouldn't be properly handled.
+	Fixed bug where tabfocus plugin would tab out of the editor instance even if the default action was prevented.
+	Fixed bug where tabfocus wouldn't tab properly to other adjacent editor instances.
+	Fixed bug where the DOMUtils setStyles wouldn't properly removed or update the data-mce-style attribute.
+	Fixed bug where dialog select boxes would be placed incorrectly if document.body wasn't statically positioned.
+	Fixed bug where pasting would sometimes scroll to the top of page if the user was using the autoresize plugin.
+	Fixed bug where caret wouldn't be properly rendered by Chrome when clicking on the iframes documentElement.
+	Fixed so custom images for menubutton/splitbutton can be provided. Patch contributed by Naim Hammadi.
+	Fixed so the default action of windows closing can be prevented by blocking the default action of the close event.
+	Fixed so nodeChange and focus of the editor isn't automatically performed when opening sub dialogs.
+Version 4.1.4 (2014-08-21)
+	Added new media_filter_html option to media plugin that blocks any conditional comments, scripts etc within a video element.
+	Added new content_security_policy option allows you to set custom policy for iframe contents. Patch contributed by Francois Chagnon.
+	Fixed bug where activate/deactivate events wasn't firing properly when switching between editors.
+	Fixed bug where placing the caret on iOS was difficult due to a WebKit bug with touch events.
+	Fixed bug where the resize helper wouldn't render properly on older IE versions.
+	Fixed bug where resizing images inside tables on older IE versions would sometimes fail depending mouse position.
+	Fixed bug where editor.insertContent would produce an exception when inserting select/option elements.
+	Fixed bug where extra empty paragraphs would be produced if block elements where inserted inside span elements.
+	Fixed bug where the spellchecker menu item wouldn't be properly checked if spell checking was started before it was rendered.
+	Fixed bug where the DomQuery filter function wouldn't remove non elements from collection.
+	Fixed bug where document with custom document.domain wouldn't properly render the editor.
+	Fixed bug where IE 8 would throw exception when trying to enter invalid color values into colorboxes.
+	Fixed bug where undo manager could incorrectly add an extra undo level when custom resize handles was removed.
+	Fixed bug where it wouldn't be possible to alter cell properties properly on table cells on IE 8.
+	Fixed so the color picker button in table dialog isn't shown unless you include the colorpicker plugin or add your own custom color picker.
+	Fixed so activate/deactivate events fire when windowManager opens a window since.
+	Fixed so the table advtab options isn't separated by an underscore to normalize naming with image_advtab option.
+	Fixed so the table cell dialog has proper padding when the advanced tab in disabled.
+Version 4.1.3 (2014-07-29)
+	Added event binding logic to tinymce.util.XHR making it possible to override headers and settings before any request is made.
+	Fixed bug where drag events wasn't fireing properly on older IE versions since the event handlers where bound to document.
+	Fixed bug where drag/dropping contents within the editor on IE would force the contents into plain text mode even if it was internal content.
+	Fixed bug where IE 7 wouldn't open menus properly due to a resize bug in the browser auto closing them immediately.
+	Fixed bug where the DOMUtils getPos logic wouldn't produce a valid coordinate inside the body if the body was positioned non static.
+	Fixed bug where the element path and format state wasn't properly updated if you had the wordcount plugin enabled.
+	Fixed bug where a comment at the beginning of source would produce an exception in the formatter logic.
+	Fixed bug where setAttrib/getAttrib on null would throw exception together with any hooked attributes like style.
+	Fixed bug where table sizes wasn't properly retained when copy/pasting on WebKit/Blink.
+	Fixed bug where WebKit/Blink would produce colors in RGB format instead of the forced HEX format when deleting contents.
+	Fixed bug where the width attribute wasn't updated on tables if you changed the size inside the table dialog.
+	Fixed bug where control selection wasn't properly handled when the caret was placed directly after an image.
+	Fixed bug where selecting the contents of table cells using the selection.select method wouldn't place the caret properly.
+	Fixed bug where the selection state for images wasn't removed when placing the caret right after an image on WebKit/Blink.
+	Fixed bug where all events wasn't properly unbound when and editor instance was removed or destroyed by some external innerHTML call.
+	Fixed bug where it wasn't possible or very hard to select images on iOS when the onscreen keyboard was visible.
+	Fixed so auto_focus can take a boolean argument this will auto focus the last initialized editor might be useful for single inits.
+	Fixed so word auto detect lists logic works better for faked lists that doesn't have specific markup.
+	Fixed so nodeChange gets fired on mouseup as it used to before 4.1.1 we optimized that event to fire less often.
+	Removed the finish menu item from spellchecker menu since it's redundant you can stop spellchecking by toggling menu item or button.
+Version 4.1.2 (2014-07-15)
+	Added offset/grep to DomQuery class works basically the same as it's jQuery equivalent.
+	Fixed bug where backspace/delete or setContent with an empty string would remove header data when using the fullpage plugin.
+	Fixed bug where tinymce.remove with a selector not matching any editors would remove all editors.
+	Fixed bug where resizing of the editor didn't work since the theme was calling setStyles instead of setStyle.
+	Fixed bug where IE 7 would fail to append html fragments to iframe document when using DomQuery.
+	Fixed bug where the getStyle DOMUtils method would produce an exception if it was called with null as it's element.
+	Fixed bug where the paste plugin would remove the element if the none of the paste_webkit_styles rules matched the current style.
+	Fixed bug where contextmenu table items wouldn't work properly on IE since it would some times fire an incorrect selection change.
+	Fixed bug where the padding/border values wasn't used in the size calculation for the body size when using autoresize. Patch contributed by Matt Whelan.
+	Fixed bug where conditional word comments wouldn't be properly removed when pasting plain text.
+	Fixed bug where resizing would sometime fail on IE 11 when the mouseup occurred inside the resizable element.
+	Fixed so the iframe gets initialized without any inline event handlers for better CSP support. Patch contributed by Matt Whelan.
+	Fixed so the tinymce.dom.Sizzle is the latest version of sizzle this resolves the document context bug.
+Version 4.1.1 (2014-07-08)
+	Fixed bug where pasting plain text on some WebKit versions would result in an empty line.
+	Fixed bug where resizing images inside tables on IE 11 wouldn't work properly.
+	Fixed bug where IE 11 would sometimes throw "Invalid argument" exception when editor contents was set to an empty string.
+	Fixed bug where document.activeElement would throw exceptions on IE 9 when that element was hidden or removed from dom.
+	Fixed bug where WebKit/Blink sometimes produced br elements with the Apple-interchange-newline class.
+	Fixed bug where table cell selection wasn't properly removed when copy/pasting table cells.
+	Fixed bug where pasting nested list items from Word wouldn't produce proper semantic nested lists.
+	Fixed bug where right clicking using the contextmenu plugin on WebKit/Blink on Mac OS X would select the target current word or line.
+	Fixed bug where it wasn't possible to alter table cell properties on IE 8 using the context menu.
+	Fixed bug where the resize helper wouldn't be correctly positioned on older IE versions.
+	Fixed bug where fullpage plugin would produce an error if you didn't specify a doctype encoding.
+	Fixed bug where anchor plugin would get the name/id of the current element even if it wasn't anchor element.
+	Fixed bug where visual aids for tables wouldn't be properly disabled when changing the border size.
+	Fixed bug where some control selection events wasn't properly fired on older IE versions.
+	Fixed bug where table cell selection on older IE versions would prevent resizing of images.
+	Fixed bug with paste_data_images paste option not working properly on modern IE versions.
+	Fixed bug where custom elements with underscores in the name wasn't properly parsed/serialized.
+	Fixed bug where applying inline formats to nested list elements would produce an incorrect formatting result.
+	Fixed so it's possible to hide items from elements path by using preventDefault/stopPropagation.
+	Fixed so inline mode toolbar gets rendered right aligned if the editable element positioned to the documents right edge.
+	Fixed so empty inline elements inside empty block elements doesn't get removed if configured to be kept intact.
+	Fixed so DomQuery parentsUntil/prevUntil/nextUntil supports selectors/elements/filters etc.
+	Fixed so legacyoutput plugin overrides fontselect and fontsizeselect controls and handles font elements properly.
+Version 4.1.0 (2014-06-18)
+	Added new file_picker_callback option to replace the old file_browser_callback the latter will still work though.
+	Added new custom colors to textcolor plugin will be displayed if a color picker is provided also shows the latest colors.
+	Added new color_picker_callback option to enable you to add custom color pickers to the editor.
+	Added new advanced tabs to table/cell/row dialogs to enable you to select colors for border/background.
+	Added new colorpicker plugin that lets you select colors from a hsv color picker.
+	Added new tinymce.util.Color class to handle color parsing and converting.
+	Added new colorpicker UI widget element lets you add a hsv color picker to any form/window.
+	Added new textpattern plugin that allows you to use markdown like text patterns to format contents.
+	Added new resize helper element that shows the current width & height while resizing.
+	Added new "once" method to Editor and EventDispatcher enables since callback execution events.
+	Added new jQuery like class under tinymce.dom.DomQuery it's exposed on editor instances (editor.$) and globally under (tinymce.$).
+	Fixed so the default resize method for images are proportional shift/ctrl can be used to make an unproportional size.
+	Fixed bug where the image_dimensions option of the image plugin would cause exceptions when it tried to update the size.
+	Fixed bug where table cell dialog class field wasn't properly updated when editing an a table cell with an existing class.
+	Fixed bug where Safari on Mac would produce webkit-fake-url for pasted images so these are now removed.
+	Fixed bug where the nodeChange event would get fired before the selection was changed when clicking inside the current selection range.
+	Fixed bug where valid_classes option would cause exception when it removed internal prefixed classes like mce-item-.
+	Fixed bug where backspace would cause navigation in IE 8 on an inline element and after a caret formatting was applied.
+	Fixed so placeholder images produced by the media plugin gets selected when inserted/edited.
+	Fixed so it's possible to drag in images when the paste_data_images option is enabled. Might be useful for mail clients.
+	Fixed so images doesn't get a width/height applied if the image_dimensions option is set to false useful for responsive contents.
+	Fixed so it's possible to pass in an optional arguments object for the nodeChanged function to be passed to all nodechange event listeners.
+	Fixed bug where media plugin embed code didn't update correctly.
diff --git a/core/media/editors/tinymce/js/plugins/dragdrop/plugin.js b/core/media/editors/tinymce/js/plugins/dragdrop/plugin.js
new file mode 100644
index 00000000..35e17564
--- /dev/null
+++ b/core/media/editors/tinymce/js/plugins/dragdrop/plugin.js
@@ -0,0 +1,131 @@
+tinymce.PluginManager.add('jdragdrop', function(editor) {
+
+	// Reset the drop area border
+	tinyMCE.DOM.bind(document, 'dragleave', function(e) {
+		e.stopPropagation();
+		e.preventDefault();
+		tinyMCE.activeEditor.contentAreaContainer.style.borderWidth = '1px 0 0';
+
+		return false;
+	});
+
+	// The upload logic
+	function UploadFile(file) {
+		var fd = new FormData();
+		fd.append('Filedata', file);
+		fd.append('folder', tinyMCE.activeEditor.settings.mediaUploadPath);
+
+		var xhr = new XMLHttpRequest();
+
+		xhr.upload.onprogress = function(e) {
+			var percentComplete = (e.loaded / e.total) * 100;
+			document.querySelector('.bar').style.width = percentComplete + '%';
+		};
+
+		removeProgessBar = function(){
+			setTimeout(function(){
+				var loader = document.querySelector('#jloader');
+				loader.parentNode.removeChild(loader);
+				editor.contentAreaContainer.style.borderWidth = '1px 0 0 0';
+			}, 200);
+		};
+
+		xhr.onload = function() {
+			var resp = JSON.parse(xhr.responseText);
+
+			if (xhr.status == 200) {
+				if (resp.status == '0') {
+					removeProgessBar();
+
+					editor.windowManager.alert(resp.message + ': ' + tinyMCE.activeEditor.settings.setCustomDir + resp.location);
+
+				}
+
+				if (resp.status == '1') {
+					removeProgessBar();
+
+					// Create the image tag
+					var newNode = tinyMCE.activeEditor.getDoc().createElement ('img');
+					newNode.src= tinyMCE.activeEditor.settings.setCustomDir + resp.location;
+					tinyMCE.activeEditor.execCommand('mceInsertContent', false, newNode.outerHTML);
+				}
+			} else {
+				removeProgessBar();
+			}
+		};
+
+		xhr.onerror = function() {
+			removeProgessBar();
+		};
+
+		xhr.open("POST", tinyMCE.activeEditor.settings.uploadUri, true);
+		xhr.send(fd);
+
+	}
+
+	// Listers for drag and drop
+	if (typeof FormData != 'undefined'){
+
+		// Fix for Chrome
+		editor.on('dragenter', function(e) {
+			e.stopPropagation();
+
+			return false;
+		});
+
+
+		// Notify user when file is over the drop area
+		editor.on('dragover', function(e) {
+			e.preventDefault();
+			editor.contentAreaContainer.style.borderStyle = 'dashed';
+			editor.contentAreaContainer.style.borderWidth = '5px';
+
+			return false;
+		});
+
+		// Logic for the dropped file
+		editor.on('drop', function(e) {
+
+			// We override only for files
+			if (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length > 0) {
+				for (var i = 0, f; f = e.dataTransfer.files[i]; i++) {
+
+					// Only images allowed
+					if (f.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)) {
+
+						// Create and display the progress bar
+						var container, innerDiv, progressBar = '';
+						container = document.createElement('div');
+						container.id = 'jloader';
+						innerDiv = document.createElement('div');
+						innerDiv.classList.add('progress');
+						innerDiv.classList.add('progress-success');
+						innerDiv.classList.add('progress-striped');
+						innerDiv.classList.add('active');
+						innerDiv.style.width = '100%';
+						innerDiv.style.height = '30px';
+						progressBar = document.createElement('div');
+						progressBar.classList.add('bar');
+						progressBar.style.width = '0';
+						innerDiv.appendChild(progressBar);
+						container.appendChild(innerDiv);
+						document.querySelector('.mce-toolbar-grp').appendChild(container);
+
+						// Upload the file(s)
+						UploadFile(f);
+					}
+
+					e.preventDefault();
+				}
+			}
+			editor.contentAreaContainer.style.borderWidth = '1px 0 0';
+		});
+	} else {
+		Joomla.renderMessages({'error': [Joomla.JText._("PLG_TINY_ERR_UNSUPPORTEDBROWSER")]});
+		editor.on('drop', function(e) {
+			e.preventDefault();
+
+			return false;
+		});
+	}
+});
diff --git a/core/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js b/core/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
new file mode 100644
index 00000000..1cdeb276
--- /dev/null
+++ b/core/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("jdragdrop",function(e){function t(t){var r=new FormData;r.append("Filedata",t),r.append("folder",tinyMCE.activeEditor.settings.mediaUploadPath);var n=new XMLHttpRequest;n.upload.onprogress=function(e){var t=e.loaded/e.total*100;document.querySelector(".bar").style.width=t+"%"},removeProgessBar=function(){setTimeout(function(){var t=document.querySelector("#jloader");t.parentNode.removeChild(t),e.contentAreaContainer.style.borderWidth="1px 0 0 0"},200)},n.onload=function(){var t=JSON.parse(n.responseText);if(200==n.status){if("0"==t.status&&(removeProgessBar(),e.windowManager.alert(t.message+": "+tinyMCE.activeEditor.settings.setCustomDir+t.location)),"1"==t.status){removeProgessBar();var r=tinyMCE.activeEditor.getDoc().createElement("img");r.src=tinyMCE.activeEditor.settings.setCustomDir+t.location,tinyMCE.activeEditor.execCommand("mceInsertContent",!1,r.outerHTML)}}else removeProgessBar()},n.onerror=function(){removeProgessBar()},n.open("POST",tinyMCE.activeEditor.settings.uploadUri,!0),n.send(r)}tinyMCE.DOM.bind(document,"dragleave",function(e){return e.stopPropagation(),e.preventDefault(),tinyMCE.activeEditor.contentAreaContainer.style.borderWidth="1px 0 0",!1}),"undefined"!=typeof FormData?(e.on("dragenter",function(e){return e.stopPropagation(),!1}),e.on("dragover",function(t){return t.preventDefault(),e.contentAreaContainer.style.borderStyle="dashed",e.contentAreaContainer.style.borderWidth="5px",!1}),e.on("drop",function(r){if(r.dataTransfer&&r.dataTransfer.files&&r.dataTransfer.files.length>0)for(var n,a=0;n=r.dataTransfer.files[a];a++){if(n.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)){var o,i,s="";(o=document.createElement("div")).id="jloader",(i=document.createElement("div")).classList.add("progress"),i.classList.add("progress-success"),i.classList.add("progress-striped"),i.classList.add("active"),i.style.width="100%",i.style.height="30px",(s=document.createElement("div")).classList.add("bar"),s.style.width="0",i.appendChild(s),o.appendChild(i),document.querySelector(".mce-toolbar-grp").appendChild(o),t(n)}r.preventDefault()}e.contentAreaContainer.style.borderWidth="1px 0 0"})):(Joomla.renderMessages({error:[Joomla.JText._("PLG_TINY_ERR_UNSUPPORTEDBROWSER")]}),e.on("drop",function(e){return e.preventDefault(),!1}))});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/js/tiny-close.js b/core/media/editors/tinymce/js/tiny-close.js
new file mode 100644
index 00000000..ecbdeb79
--- /dev/null
+++ b/core/media/editors/tinymce/js/tiny-close.js
@@ -0,0 +1,35 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * This is used by tinyMCE in order to allow both mootools and bootstrap modals
+ * to close correctly, more tinyMCE related functionality maybe added in the future
+ *
+ * @package     Joomla
+ * @since       3.5.1
+ * @version     1.0
+ */
+document.addEventListener('DOMContentLoaded', function () {
+	if (typeof window.jModalClose_no_tinyMCE === 'undefined')
+	{
+		window.jModalClose_no_tinyMCE = typeof(jModalClose) == 'function'  ?  jModalClose  :  false;
+
+		jModalClose = function () {
+			if (window.jModalClose_no_tinyMCE) window.jModalClose_no_tinyMCE.apply(this, arguments);
+			tinyMCE.activeEditor.windowManager.close();
+		};
+	}
+
+	if (typeof window.SqueezeBoxClose_no_tinyMCE === 'undefined')
+	{
+		if (typeof(SqueezeBox) == 'undefined')  SqueezeBox = {};
+		window.SqueezeBoxClose_no_tinyMCE = typeof(SqueezeBox.close) == 'function'  ?  SqueezeBox.close  :  false;
+
+		SqueezeBox.close = function () {
+			if (window.SqueezeBoxClose_no_tinyMCE)  window.SqueezeBoxClose_no_tinyMCE.apply(this, arguments);
+			tinyMCE.activeEditor.windowManager.close();
+		};
+	}
+});
diff --git a/core/media/editors/tinymce/js/tiny-close.min.js b/core/media/editors/tinymce/js/tiny-close.min.js
new file mode 100644
index 00000000..c9846602
--- /dev/null
+++ b/core/media/editors/tinymce/js/tiny-close.min.js
@@ -0,0 +1 @@
+document.addEventListener("DOMContentLoaded",function(){"undefined"==typeof window.jModalClose_no_tinyMCE&&(window.jModalClose_no_tinyMCE="function"==typeof jModalClose&&jModalClose,jModalClose=function(){window.jModalClose_no_tinyMCE&&window.jModalClose_no_tinyMCE.apply(this,arguments),tinyMCE.activeEditor.windowManager.close()}),"undefined"==typeof window.SqueezeBoxClose_no_tinyMCE&&("undefined"==typeof SqueezeBox&&(SqueezeBox={}),window.SqueezeBoxClose_no_tinyMCE="function"==typeof SqueezeBox.close&&SqueezeBox.close,SqueezeBox.close=function(){window.SqueezeBoxClose_no_tinyMCE&&window.SqueezeBoxClose_no_tinyMCE.apply(this,arguments),tinyMCE.activeEditor.windowManager.close()})});
diff --git a/core/media/editors/tinymce/js/tinymce-builder.js b/core/media/editors/tinymce/js/tinymce-builder.js
new file mode 100644
index 00000000..d590c290
--- /dev/null
+++ b/core/media/editors/tinymce/js/tinymce-builder.js
@@ -0,0 +1,316 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+;(function($) {
+    "use strict";
+
+    /**
+     * Fake TinyMCE object to allow to use TinyMCE translation for the button labels
+     *
+     * @since  3.7.0
+     */
+    window.tinymce = {
+        langCode: 'en',
+        langStrings: {},
+        addI18n: function (code, strings){
+            this.langCode    = code;
+            this.langStrings = strings || {};
+        },
+        translate: function (string){
+            return this.langStrings[string] ? this.langStrings[string] : string;
+        }
+    };
+
+    /**
+     * Joomla TinyMCE Builder
+     *
+     * @param {HTMLElement} container
+     * @param {Object}      options
+     * @constructor
+     *
+     * @since  3.7.0
+     */
+    var JoomlaTinyMCEBuilder = function(container, options) {
+        this.$container = $(container);
+        this.options    = options;
+
+        // Find source containers
+        this.$sourceMenu    = this.$container.find('.timymce-builder-menu.source');
+        this.$sourceToolbar = this.$container.find('.timymce-builder-toolbar.source');
+
+        // Find target containers
+        this.$targetMenu    = this.$container.find('.timymce-builder-menu.target');
+        this.$targetToolbar = this.$container.find('.timymce-builder-toolbar.target');
+
+        // Render Source elements
+        this.$sourceMenu.each(function(i, element){
+            this.renderBar(element, 'menu');
+        }.bind(this));
+        this.$sourceToolbar.each(function(i, element){
+            this.renderBar(element, 'toolbar');
+        }.bind(this));
+
+        // Render Target elements
+        this.$targetMenu.each(function(i, element){
+            this.renderBar(element, 'menu', null, true);
+        }.bind(this));
+        this.$targetToolbar.each(function(i, element){
+            this.renderBar(element, 'toolbar', null, true);
+        }.bind(this));
+
+        // Set up "drag&drop" stuff
+        var $copyHelper = null, removeIntent = false, self = this;
+        this.$sourceMenu.sortable({
+            connectWith: this.$targetMenu,
+            items: '.mce-btn',
+            cancel: '',
+            placeholder: 'mce-btn ui-state-highlight',
+            start: function(event, ui) {
+                self.$targetMenu.addClass('drop-area-highlight');
+            },
+            helper: function(event, el) {
+                $copyHelper = el.clone().insertAfter(el);
+                return el;
+            },
+            stop: function() {
+                $copyHelper && $copyHelper.remove();
+                self.$targetMenu.removeClass('drop-area-highlight');
+            }
+        });
+
+        this.$sourceToolbar.sortable({
+            connectWith: this.$targetToolbar,
+            items: '.mce-btn',
+            cancel: '',
+            placeholder: 'mce-btn ui-state-highlight',
+            start: function(event, ui) {
+                self.$targetToolbar.addClass('drop-area-highlight');
+            },
+            helper: function(event, el) {
+                $copyHelper = el.clone().insertAfter(el);
+                return el;
+            },
+            stop: function() {
+                $copyHelper && $copyHelper.remove();
+                self.$targetToolbar.removeClass('drop-area-highlight');
+            }
+        });
+
+        $().add(this.$targetMenu).add(this.$targetToolbar).sortable({
+            items: '.mce-btn',
+            cancel: '',
+            placeholder: 'mce-btn ui-state-highlight',
+            receive: function(event, ui) {
+                $copyHelper = null;
+                var $el = ui.item, $cont = $(this);
+                self.appendInput($el, $cont.data('group'), $cont.data('set'))
+            },
+            over: function (event, ui) {
+                removeIntent = false;
+            },
+            out: function (event, ui) {
+                removeIntent = true;
+            },
+            beforeStop: function (event, ui) {
+                if(removeIntent){
+                    ui.item.remove();
+                }
+            }
+        });
+
+        // Bind actions buttons
+        this.$container.on('click', '.button-action', function(event){
+            var $btn = $(event.target), action = $btn.data('action'), options = $btn.data();
+
+            if (this[action]) {
+                this[action].call(this, options);
+            } else {
+                throw new Error('Unsupported action ' + action);
+            }
+        }.bind(this));
+
+    };
+
+    /**
+     * Render the toolbar/menubar
+     *
+     * @param {HTMLElement} container  The toolbar container
+     * @param {String}      type       The type toolbar or menu
+     * @param {Array|null}  value      The value
+     * @param {Boolean}     withInput  Whether append input
+     *
+     * @since  3.7.0
+     */
+    JoomlaTinyMCEBuilder.prototype.renderBar = function(container, type, value, withInput) {
+        var $container = $(container),
+            group = $container.data('group'),
+            set = $container.data('set'),
+            items = type === 'menu' ? this.options.menus : this.options.buttons,
+            value = value ? value : ($container.data('value') || []),
+            item, name, $btn;
+
+        for ( var i = 0, l = value.length; i < l; i++ ) {
+            name = value[i];
+            item = items[name];
+
+            if (!item) {
+                continue;
+            }
+
+            $btn = this.createButton(name, item, type);
+            $container.append($btn);
+
+            // Enable tooltip
+            if ($btn.tooltip) {
+                $btn.tooltip({trigger: 'hover'});
+            }
+
+            // Add input
+            if (withInput) {
+                this.appendInput($btn, group, set);
+            }
+        }
+    };
+
+    /**
+     * Create the element needed for renderBar()
+     * @param {String} name
+     * @param {Object} info
+     * @param {String} type
+     *
+     * @return {jQuery}
+     *
+     * @since  3.7.0
+     */
+    JoomlaTinyMCEBuilder.prototype.createButton = function(name, info, type){
+        var $element = $('<div />', {
+            'class': 'mce-btn',
+            'data-name': name,
+            'data-toggle': 'tooltip',
+            'title': tinymce.translate(info.label)
+        });
+        var $btn = $('<button/>', {
+            'type': 'button'
+        });
+        $element.append($btn);
+
+        if (type === 'menu') {
+            $btn.html('<span class="mce-txt">' + tinymce.translate(info.label) + '</span> <i class="mce-caret"></i>');
+        } else {
+            $element.addClass('mce-btn-small');
+            $btn.html(info.text ? tinymce.translate(info.text) : '<i class="mce-ico mce-i-' + name + '"></i>');
+        }
+
+        return $element;
+    };
+
+    /**
+     * Append input to the button item
+     * @param {HTMLElement} element
+     * @param {String}      group
+     * @param {String}      set
+     *
+     * @since  3.7.0
+     */
+    JoomlaTinyMCEBuilder.prototype.appendInput = function (element, group, set) {
+        var $el    = $(element),
+            name   = this.options.formControl + '[' + set + '][' + group + '][]',
+            $input = $('<input/>', {
+                type: 'hidden',
+                name:  name,
+                value: $el.data('name')
+            });
+
+        $el.append($input);
+    };
+
+    /**
+     * Set Selected preset to specific  set
+     * @param {Object} options Options {set: 1, preset: 'presetName'}
+     */
+    JoomlaTinyMCEBuilder.prototype.setPreset = function (options) {
+        var set = options.set, preset = this.options.toolbarPreset[options.preset] || null;
+
+        if (!preset) {
+            throw new Error('Unknown Preset "' + options.preset + '"');
+        }
+
+        var $container, type;
+        for (var group in preset) {
+            if (!preset.hasOwnProperty(group)) {
+                continue;
+            }
+
+            // Find correct container for current set
+            if (group === 'menu') {
+                type = 'menu';
+                $container = this.$targetMenu.filter('[data-group="' + group + '"][data-set="' + set + '"]');
+            } else {
+                type = 'toolbar'
+                $container = this.$targetToolbar.filter('[data-group="' + group + '"][data-set="' + set + '"]');
+            }
+
+            // Reset existing values
+            $container.empty();
+
+            // Set new
+            this.renderBar($container, type, preset[group], true);
+        }
+    };
+
+    /**
+     * Clear the pane for specific set
+     * @param {Object} options Options {set: 1}
+     */
+    JoomlaTinyMCEBuilder.prototype.clearPane = function (options) {
+        var set = options.set;
+
+        this.$targetMenu.filter('[data-set="' + set + '"]').empty();
+        this.$targetToolbar.filter('[data-set="' + set + '"]').empty();
+    };
+
+
+    // Init the builder
+    $(document).ready(function(){
+        var options = Joomla.getOptions ? Joomla.getOptions('plg_editors_tinymce_builder', {})
+        			:  (Joomla.optionsStorage.plg_editors_tinymce_builder || {});
+
+        new JoomlaTinyMCEBuilder($('#joomla-tinymce-builder'), options);
+
+        $("#set-tabs a").on('click', function (event) {
+            event.preventDefault();
+            $(this).tab("show");
+        });
+
+        // Allow to select the group only once per the set
+        var $accessSelects = $('#joomla-tinymce-builder').find('.access-select');
+        toggleAvailableOption();
+        $accessSelects.on('change', function () {
+            toggleAvailableOption();
+        });
+
+        function toggleAvailableOption () {
+            $accessSelects.find('option[disabled]').removeAttr('disabled');
+
+            // Disable already selected options
+            $accessSelects.each(function () {
+                var $select = $(this), val = $select.val() || [], query = [],
+                    $options = $accessSelects.not(this).find('option');
+
+                for (var i = 0, l = val.length; i < l; i++ ) {
+                    if (!val[i]) continue;
+                    query.push('[value="' + val[i] + '"]');
+                }
+
+                if (query.length) {
+                    $options.filter(query.join(',')).attr('disabled', 'disabled');
+                }
+            });
+
+            // Update Chosen
+            $accessSelects.trigger('liszt:updated');
+        }
+    });
+}(jQuery));
diff --git a/core/media/editors/tinymce/js/tinymce.js b/core/media/editors/tinymce/js/tinymce.js
new file mode 100644
index 00000000..159c8346
--- /dev/null
+++ b/core/media/editors/tinymce/js/tinymce.js
@@ -0,0 +1,116 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+;(function(tinyMCE, Joomla, window, document){
+	"use strict";
+
+	// This line is for Mootools b/c
+	window.getSize = window.getSize || function(){return {x: window.innerWidth, y: window.innerHeight};};
+
+	// @deprecated 4.0 Use directly Joomla.editors.instances[editor].replaceSelection(text);
+	window.jInsertEditorText = function ( text, editor ) {
+		Joomla.editors.instances[editor].replaceSelection(text);
+	};
+
+	var JoomlaTinyMCE = {
+
+		/**
+		 * Find all TinyMCE elements and initialize TinyMCE instance for each
+		 *
+		 * @param {HTMLElement}  target  Target Element where to search for the editor element
+		 *
+		 * @since 3.7.0
+		 */
+		setupEditors: function ( target ) {
+			target = target || document;
+			var pluginOptions = Joomla.getOptions ? Joomla.getOptions('plg_editor_tinymce', {})
+					:  (Joomla.optionsStorage.plg_editor_tinymce || {}),
+				editors = target.querySelectorAll('.js-editor-tinymce');
+
+			for(var i = 0, l = editors.length; i < l; i++) {
+				var editor = editors[i].querySelector('textarea');
+				this.setupEditor(editor, pluginOptions);
+			}
+		},
+
+		/**
+		 * Initialize TinyMCE editor instance
+		 *
+		 * @param {HTMLElement}  element
+		 * @param {Object}       pluginOptions
+		 *
+		 * @since 3.7.0
+		 */
+		setupEditor: function ( element, pluginOptions ) {
+			var name = element ? element.getAttribute('name').replace(/\[\]|\]/g, '').split('[').pop() : 'default', // Get Editor name
+			    tinyMCEOptions = pluginOptions ? pluginOptions.tinyMCE || {} : {},
+			    defaultOptions = tinyMCEOptions['default'] || {},
+			    options = tinyMCEOptions[name] ? tinyMCEOptions[name] : defaultOptions; // Check specific options by the name
+
+			// Avoid an unexpected changes, and copy the options object
+			if (options.joomlaMergeDefaults) {
+				options = Joomla.extend(Joomla.extend({}, defaultOptions), options);
+			} else {
+				options = Joomla.extend({}, options);
+			}
+
+			if (element) {
+				// We already have the Target, so reset the selector and assign given element as target
+				options.selector = null;
+				options.target   = element;
+			}
+
+			// @TODO: the ext-buttons should be as TinyMCE plugins, not the callback hack
+			if (options.joomlaExtButtons && options.joomlaExtButtons.names && options.joomlaExtButtons.names.length) {
+				options.toolbar1 += ' | ' + options.joomlaExtButtons.names.join(' ');
+				var callbackString = options.joomlaExtButtons.script.join(';');
+				options.setupCallbackString = options.setupCallbackString || '';
+				options.setupCallbackString = options.setupCallbackString + ';' + callbackString;
+				options.joomlaExtButtons = null;
+			}
+
+			if (options.setupCallbackString && !options.setup) {
+				options.setup = new Function('editor', options.setupCallbackString);
+			}
+
+			// Create a new instance
+			var ed = new tinyMCE.Editor(element.id, options, tinymce.EditorManager);
+			ed.render();
+
+			/** Register the editor's instance to Joomla Object */
+			Joomla.editors.instances[element.id] = {
+				// Required by Joomla's API for the XTD-Buttons
+				'getValue': function () { return this.instance.getContent(); },
+				'setValue': function (text) { return this.instance.setContent(text); },
+				'replaceSelection': function (text) { return this.instance.execCommand('mceInsertContent', false, text); },
+				// Some extra instance dependent
+				'id': element.id,
+				'instance': ed,
+				'onSave': function() { if (this.instance.isHidden()) { this.instance.show()}; return '';},
+			};
+
+			/** On save **/
+			document.getElementById(ed.id).form.addEventListener('submit', function() {
+				Joomla.editors.instances[ed.targetElm.id].onSave();
+			})
+		}
+
+	};
+
+	Joomla.JoomlaTinyMCE = JoomlaTinyMCE;
+
+	// Init on DOMContentLoaded
+	document.addEventListener('DOMContentLoaded', function () {
+		Joomla.JoomlaTinyMCE.setupEditors();
+
+		// Init in subform field
+		if(window.jQuery) {
+			jQuery(document).on('subform-row-add', function (event, row) {
+				Joomla.JoomlaTinyMCE.setupEditors(row);
+			});
+		}
+	});
+
+}(tinyMCE, Joomla, window, document));
diff --git a/core/media/editors/tinymce/js/tinymce.min.js b/core/media/editors/tinymce/js/tinymce.min.js
new file mode 100644
index 00000000..91725b10
--- /dev/null
+++ b/core/media/editors/tinymce/js/tinymce.min.js
@@ -0,0 +1 @@
+(function(tinyMCE,Joomla,window,document){"use strict";window.getSize=window.getSize||function(){return{x:window.innerWidth,y:window.innerHeight}};window.jInsertEditorText=function(text,editor){Joomla.editors.instances[editor].replaceSelection(text)};var JoomlaTinyMCE={setupEditors:function(target){target=target||document;var pluginOptions=Joomla.getOptions?Joomla.getOptions("plg_editor_tinymce",{}):Joomla.optionsStorage.plg_editor_tinymce||{},editors=target.querySelectorAll(".js-editor-tinymce");for(var i=0,l=editors.length;i<l;i++){var editor=editors[i].querySelector("textarea");this.setupEditor(editor,pluginOptions)}},setupEditor:function(element,pluginOptions){var name=element?element.getAttribute("name").replace(/\[\]|\]/g,"").split("[").pop():"default",tinyMCEOptions=pluginOptions?pluginOptions.tinyMCE||{}:{},defaultOptions=tinyMCEOptions["default"]||{},options=tinyMCEOptions[name]?tinyMCEOptions[name]:defaultOptions;if(options.joomlaMergeDefaults){options=Joomla.extend(Joomla.extend({},defaultOptions),options)}else{options=Joomla.extend({},options)}if(element){options.selector=null;options.target=element}if(options.joomlaExtButtons&&options.joomlaExtButtons.names&&options.joomlaExtButtons.names.length){options.toolbar1+=" | "+options.joomlaExtButtons.names.join(" ");var callbackString=options.joomlaExtButtons.script.join(";");options.setupCallbackString=options.setupCallbackString||"";options.setupCallbackString=options.setupCallbackString+";"+callbackString;options.joomlaExtButtons=null}if(options.setupCallbackString&&!options.setup){options.setup=new Function("editor",options.setupCallbackString)}var ed=new tinyMCE.Editor(element.id,options,tinymce.EditorManager);ed.render();Joomla.editors.instances[element.id]={getValue:function(){return this.instance.getContent()},setValue:function(text){return this.instance.setContent(text)},replaceSelection:function(text){return this.instance.execCommand("mceInsertContent",false,text)},id:element.id,instance:ed,onSave:function(){if(this.instance.isHidden()){this.instance.show()}return""}};document.getElementById(ed.id).form.addEventListener("submit",function(){Joomla.editors.instances[ed.targetElm.id].onSave()})}};Joomla.JoomlaTinyMCE=JoomlaTinyMCE;document.addEventListener("DOMContentLoaded",function(){Joomla.JoomlaTinyMCE.setupEditors();if(window.jQuery){jQuery(document).on("subform-row-add",function(event,row){Joomla.JoomlaTinyMCE.setupEditors(row)})}})})(tinyMCE,Joomla,window,document);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/af.js b/core/media/editors/tinymce/langs/af.js
new file mode 100644
index 00000000..8e758c94
--- /dev/null
+++ b/core/media/editors/tinymce/langs/af.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('af',{
+"Cut": "Knip",
+"Heading 5": "Hooflyn 5",
+"Header 2": "Hooflyn 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Jou webblaaier ondersteun nie toegang tot die knipbord nie. Gebruik asb. Ctrl+X\/C\/V.",
+"Heading 4": "Hooflyn 4",
+"Div": "Div",
+"Heading 2": "Hooflyn 2",
+"Paste": "Plak",
+"Close": "Sluit",
+"Font Family": "Font Familie",
+"Pre": "Pre",
+"Align right": "Regs-gerig",
+"New document": "Nuwe dokument",
+"Blockquote": "Aanhaaling",
+"Numbered list": "Genommerde lys",
+"Heading 1": "Hooflyn 1",
+"Headings": "Koppe",
+"Increase indent": "Inkeping vergroot",
+"Formats": "Formate",
+"Headers": "Hooflyn-tekste",
+"Select all": "Alles selekteer",
+"Header 3": "Hooflyn 3",
+"Blocks": "Blok",
+"Undo": "Ongedaan maak",
+"Strikethrough": "Deurhaal",
+"Bullet list": "Opsommingsteken-lys",
+"Header 1": "Hooflyn 1",
+"Superscript": "Superskrif",
+"Clear formatting": "Herstel Formateering",
+"Font Sizes": "Tekengrootte",
+"Subscript": "Subskrif",
+"Header 6": "Hooflyn 6",
+"Redo": "Herdoen",
+"Paragraph": "Paragraaf",
+"Ok": "OK",
+"Bold": "Vetdruk",
+"Code": "Kode",
+"Italic": "Kursief",
+"Align center": "Sentreer",
+"Header 5": "Hooflyn 5",
+"Heading 6": "Hooflyn 6",
+"Heading 3": "Hooflyn 3",
+"Decrease indent": "Inkeping verklein",
+"Header 4": "Hooflyn 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Die plak funksie is nou in plat-teks modus. Teks word ingevoeg sonder enige formateering, todat jy hierdie opsie wissel.",
+"Underline": "Onderlyn",
+"Cancel": "Kanselleer",
+"Justify": "Gerigstelling",
+"Inline": "Inlyn",
+"Copy": "Kopieer",
+"Align left": "Linksgerig",
+"Visual aids": "Hulpmiddels",
+"Lower Greek": "Griekse letters",
+"Square": "Vierkantjie",
+"Default": "Verstek",
+"Lower Alpha": "Klein letters",
+"Circle": "Sirkeltjie",
+"Disc": "Balletjie",
+"Upper Alpha": "Hoofletters",
+"Upper Roman": "Romeinse syfers groot",
+"Lower Roman": "Romeinse syfers klein",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id moet met 'n letter begin en kan slegs deur letters, koppeltekens, syfers, punte en onderstreep-karakters gevolg word",
+"Name": "Naam",
+"Anchor": "Anker",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Jy het ongestoorde wysigings op hierdier bladsy - is jy seker dat jy die bladsy wil verlaat?",
+"Restore last draft": "Herstel die laatste konsep",
+"Special character": "Spesiaale karakter",
+"Source code": "Bronkode",
+"Language": "Taal",
+"Insert\/Edit code sample": "Voeg\/Redigeer voorbeeld-kode",
+"B": "Blou",
+"R": "Rooi",
+"G": "Groen",
+"Color": "Kleur",
+"Right to left": "Regs na links",
+"Left to right": "Links na regs",
+"Emoticons": "Emotikons",
+"Robots": "Robotte",
+"Document properties": "Dokument eienskappe",
+"Title": "Titel",
+"Keywords": "Sleutelwoorde",
+"Encoding": "Kodering",
+"Description": "Beskrywing",
+"Author": "Outeur",
+"Fullscreen": "Voll-skerm",
+"Horizontal line": "Horisontale lyn",
+"Horizontal space": "Horisontale ruimte",
+"Insert\/edit image": "Afbeelding invoeg\/bewerk",
+"General": "Algemeen",
+"Advanced": "Gevorderd",
+"Source": "Bron",
+"Border": "Rand",
+"Constrain proportions": "Behou verhoudings",
+"Vertical space": "Vertikale ruimte",
+"Image description": "Afbeelding bemskrywing",
+"Style": "Styl",
+"Dimensions": "Afmetings",
+"Insert image": "Afbeelding invoeg",
+"Image": "Afbeelding",
+"Zoom in": "Inzoem",
+"Contrast": "Kontras",
+"Back": "Terug",
+"Gamma": "Gamma",
+"Flip horizontally": "Horisontaal weerspie\u00ebl",
+"Resize": "Grootte wysig",
+"Sharpen": "Verskerp",
+"Zoom out": "Uitzoem",
+"Image options": "Afbeelding opsies",
+"Apply": "Toepas",
+"Brightness": "Helderheid",
+"Rotate clockwise": "Regsom draai",
+"Rotate counterclockwise": "Linksom draai",
+"Edit image": "Bewerk afbeelding",
+"Color levels": "Kleurvlakke",
+"Crop": "Afknip",
+"Orientation": "Orienteering",
+"Flip vertically": "Vertikaal weerspie\u00ebl",
+"Invert": "Omkeer",
+"Date\/time": "Datum\/tyd",
+"Insert date\/time": "Voeg datum\/tyd in",
+"Remove link": "Skakel verwyder",
+"Url": "URL",
+"Text to display": "Skakelteks",
+"Anchors": "Anker",
+"Insert link": "Skakel invoeg",
+"Link":"Skakel",
+"New window": "Nuwe venster",
+"None": "Geen",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Die URL verwys na 'n eksterne adres. Wil jy die \"http:\/\/\" voorvoegsel byvoeg?",
+"Paste or type a link": "Plak of tik 'n skalel in",
+"Target": "Teiken",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Die URL lyk soos 'n eposadres. Wil jy die \"mailto:\" voorvoegsel byvoeg?",
+"Insert\/edit link": "Skakel invoeg\/bewerk",
+"Insert\/edit video": "Video invoeg\/bewerk",
+"Poster": "Plakaat",
+"Insert\/edit media": "Voeg in\/Redigeer media",
+"Media": "Media",
+"Alternative source": "Alternatiewe bron",
+"Paste your embed code below:": "Plak jou ingesluite kode hieronder in:",
+"Insert video": "Video invoeg",
+"Embed": "Insluit",
+"Nonbreaking space": "Vaste spasie invoeg",
+"Page break": "Nuwe Bladsy",
+"Paste as text": "As teks plak",
+"Preview": "Voorbeeld",
+"Print": "Druk",
+"Save": "Stoor",
+"Could not find the specified string.": "Kon nie die gesoekde string vind nie",
+"Replace": "Vervang",
+"Next": "Volgende",
+"Whole words": "Sleg hele woorde",
+"Find and replace": "Soek-en-Vervang",
+"Replace with": "Vervang met",
+"Find": "Soek",
+"Replace all": "Alles vervang",
+"Match case": "Kassensitief",
+"Prev": "Vorige",
+"Spellcheck": "Speltoets",
+"Finish": "Einde",
+"Ignore all": "Alles ignoreer",
+"Ignore": "Ignoreer",
+"Add to Dictionary": "Aan woordelys byvoeg",
+"Insert row before": "Voeg nuwe ry boaan",
+"Rows": "Rye",
+"Height": "Hoogte",
+"Paste row after": "Plak ry onder",
+"Alignment": "Gerigdheid",
+"Border color": "Randkleur",
+"Column group": "Kolomgroep",
+"Row": "Ry",
+"Insert column before": "Voeg kolom vooraan",
+"Split cell": "Split sel",
+"Cell padding": "Ruimte binnein sel",
+"Cell spacing": "Ruimte rondom sel",
+"Row type": "Ry tipe",
+"Insert table": "Tabel invoeg",
+"Body": "Tabel Inhoud",
+"Caption": "Onderskrif",
+"Footer": "Voetskrif",
+"Delete row": "Verwyder ry",
+"Paste row before": "Plak ry vooraan",
+"Scope": "Bereik",
+"Delete table": "Verwyder tabel",
+"H Align": "Horisontaal-gerigdheid",
+"Top": "Bo",
+"Header cell": "Kop sel",
+"Column": "Kolom",
+"Row group": "Rygroep",
+"Cell": "Sel",
+"Middle": "Sentreer",
+"Cell type": "Seltipe",
+"Copy row": "Kopieer ry",
+"Row properties": "Ry eienskappe",
+"Table properties": "Tabel eienskappe",
+"Bottom": "Onder",
+"V Align": "Vertikaal-rerigdheid",
+"Header": "Kopteks",
+"Right": "Regs",
+"Insert column after": "Voeg kolom na",
+"Cols": "Kolomme",
+"Insert row after": "Voeg ry onderaan",
+"Width": "Breedte",
+"Cell properties": "Sel eienskappe",
+"Left": "Links",
+"Cut row": "Knip ry",
+"Delete column": "Verwyder kolom",
+"Center": "Middel",
+"Merge cells": "Selle saamvoeg",
+"Insert template": "Sjabloon invoeg",
+"Templates": "Sjablone",
+"Background color": "Agtergrondkleur",
+"Custom...": "Pasgemaakte...",
+"Custom color": "Pasgemaakte kleur",
+"No color": "Geen kleur",
+"Text color": "Tekskleur",
+"Table of Contents":"Inhouds-opgawe",
+"Show blocks": "Blokke vertoon",
+"Show invisible characters": "Onsigbare karakters vertoon",
+"Words: {0}": "Woorde: {0}",
+"Insert": "Invoeg",
+"File": "L\u00eaer",
+"Edit": "Bewerk",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ryk Teks Area. Druk ALT-F9 vir menu, ALT-F10 vir die nutsbalk, ALT-0 vir hulp.",
+"Tools": "Gereedskap",
+"View": "Beeld",
+"Table": "Tabel",
+"Format": "Formateering"
+});
diff --git a/core/media/editors/tinymce/langs/ar.js b/core/media/editors/tinymce/langs/ar.js
new file mode 100644
index 00000000..c632810b
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ar.js
@@ -0,0 +1,231 @@
+tinymce.addI18n('ar',{
+"Cut": "\u0642\u0635",
+"Heading 5": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 5",
+"Header 2": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u062a\u0635\u0641\u062d\u0643 \u0644\u0627 \u064a\u062f\u0639\u0645 \u0627\u0644\u0648\u0635\u0648\u0644 \u0627\u0644\u0645\u0628\u0627\u0634\u0631 \u0625\u0644\u0649 \u0627\u0644\u062d\u0627\u0641\u0638\u0629. \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u062e\u062a\u0635\u0627\u0631\u0627\u062a \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d Ctrl+X\/C\/V \u0628\u062f\u0644\u0627 \u0645\u0646 \u0630\u0644\u0643.",
+"Heading 4": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 4",
+"Div": "Div",
+"Heading 2": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 2",
+"Paste": "\u0644\u0635\u0642",
+"Close": "\u0625\u063a\u0644\u0627\u0642",
+"Font Family": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u062e\u0637",
+"Pre": "\u0633\u0627\u0628\u0642",
+"Align right": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0627\u0644\u0646\u0635 \u0644\u0644\u064a\u0645\u064a\u0646",
+"New document": "\u0645\u0633\u062a\u0646\u062f \u062c\u062f\u064a\u062f",
+"Blockquote": "\u0639\u0644\u0627\u0645\u0627\u062a \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633",
+"Numbered list": "\u062a\u0631\u0642\u064a\u0645",
+"Heading 1": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 1",
+"Headings": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629",
+"Increase indent": "\u0632\u064a\u0627\u062f\u0629 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
+"Formats": "\u0627\u0644\u062a\u0646\u0633\u064a\u0642\u0627\u062a",
+"Headers": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646",
+"Select all": "\u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0643\u0644",
+"Header 3": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 3",
+"Blocks": "\u0627\u0644\u0623\u0642\u0633\u0627\u0645",
+"Undo": "\u062a\u0631\u0627\u062c\u0639",
+"Strikethrough": "\u064a\u062a\u0648\u0633\u0637 \u062e\u0637",
+"Bullet list": "\u062a\u0639\u062f\u0627\u062f \u0646\u0642\u0637\u064a",
+"Header 1": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 1",
+"Superscript": "\u0645\u0631\u062a\u0641\u0639",
+"Clear formatting": "\u0645\u0633\u062d \u0627\u0644\u062a\u0646\u0633\u064a\u0642",
+"Font Sizes": "\u062d\u062c\u0645 \u0627\u0644\u062e\u0637",
+"Subscript": "\u0645\u0646\u062e\u0641\u0636",
+"Header 6": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 6",
+"Redo": "\u0625\u0639\u0627\u062f\u0629",
+"Paragraph": "\u0641\u0642\u0631\u0629",
+"Ok": "\u0645\u0648\u0627\u0641\u0642",
+"Bold": "\u063a\u0627\u0645\u0642",
+"Code": "\u0631\u0645\u0632",
+"Italic": "\u0645\u0627\u0626\u0644",
+"Align center": "\u062a\u0648\u0633\u064a\u0637",
+"Header 5": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 5",
+"Heading 6": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 6",
+"Heading 3": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 3",
+"Decrease indent": "\u0625\u0646\u0642\u0627\u0635 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
+"Header 4": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u064a\u062a\u0645 \u0627\u0644\u0644\u0635\u0642 \u062d\u0627\u0644\u064a\u0627\u064b \u0643\u0646\u0635 \u0639\u0627\u062f\u064a. \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u0633\u064a\u0628\u0642\u0649 \u0643\u0646\u0635 \u0639\u0627\u062f\u064a \u062d\u062a\u0649 \u062a\u0642\u0648\u0645 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631.",
+"Underline": "\u062a\u0633\u0637\u064a\u0631",
+"Cancel": "\u0625\u0644\u063a\u0627\u0621",
+"Justify": "\u0636\u0628\u0637",
+"Inline": "\u062e\u0644\u0627\u0644",
+"Copy": "\u0646\u0633\u062e",
+"Align left": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0627\u0644\u0646\u0635 \u0644\u0644\u064a\u0633\u0627\u0631",
+"Visual aids": "\u0627\u0644\u0645\u0639\u064a\u0646\u0627\u062a \u0627\u0644\u0628\u0635\u0631\u064a\u0629",
+"Lower Greek": "\u062a\u0631\u0642\u064a\u0645 \u064a\u0648\u0646\u0627\u0646\u064a \u0635\u063a\u064a\u0631",
+"Square": "\u0645\u0631\u0628\u0639",
+"Default": "\u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a",
+"Lower Alpha": "\u062a\u0631\u0642\u064a\u0645 \u0623\u062e\u0631\u0641 \u0635\u063a\u064a\u0631\u0629",
+"Circle": "\u062f\u0627\u0626\u0631\u0629",
+"Disc": "\u0642\u0631\u0635",
+"Upper Alpha": "\u062a\u0631\u0642\u064a\u0645 \u0623\u062d\u0631\u0641 \u0643\u0628\u064a\u0631\u0629",
+"Upper Roman": "\u062a\u0631\u0642\u064a\u0645 \u0631\u0648\u0645\u0627\u0646\u064a \u0643\u0628\u064a\u0631",
+"Lower Roman": "\u062a\u0631\u0642\u064a\u0645 \u0631\u0648\u0645\u0627\u0646\u064a \u0635\u063a\u064a\u0631",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0639\u0631\u0641 \u064a\u062c\u0628 \u0623\u0646 \u062a\u0628\u062f\u0623 \u0628\u062d\u0631\u0641\u060c \u064a\u062a\u0628\u0639 \u0641\u0642\u0637 \u0628\u062d\u0631\u0648\u0641 \u0648\u0623\u0631\u0642\u0627\u0645\u060c \u0634\u0631\u0637\u0627\u062a\u060c \u0623\u0648 \u0627\u0644\u0646\u0642\u0627\u0637\u060c \u0627\u0644\u0646\u0642\u0637\u062a\u064a\u0646 \u0623\u0648 \u0627\u0644\u0634\u0631\u0637\u0627\u062a \u0627\u0644\u0633\u0641\u0644\u064a\u0629.",
+"Name": "\u0627\u0644\u0627\u0633\u0645",
+"Anchor": "\u0645\u0631\u0633\u0627\u0629",
+"Id": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0639\u0631\u0641",
+"You have unsaved changes are you sure you want to navigate away?": "\u0644\u062f\u064a\u0643 \u062a\u063a\u064a\u064a\u0631\u0627\u062a \u0644\u0645 \u064a\u062a\u0645 \u062d\u0641\u0638\u0647\u0627 \u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0628\u0639\u064a\u062f\u0627\u061f",
+"Restore last draft": "\u0627\u0633\u062a\u0639\u0627\u062f\u0629 \u0623\u062e\u0631 \u0645\u0633\u0648\u062f\u0629",
+"Special character": "\u0631\u0645\u0632",
+"Source code": "\u0634\u0641\u0631\u0629 \u0627\u0644\u0645\u0635\u062f\u0631",
+"Language": "\u0627\u0644\u0644\u063a\u0629",
+"Insert\/Edit code sample": "\u0625\u062f\u0631\u0627\u062c/\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0643\u0648\u062f",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u0627\u0644\u0644\u0648\u0646",
+"Right to left": "\u0645\u0646 \u0627\u0644\u064a\u0645\u064a\u0646 \u0644\u0644\u064a\u0633\u0627\u0631",
+"Left to right": "\u0645\u0646 \u0627\u0644\u064a\u0633\u0627\u0631 \u0644\u0644\u064a\u0645\u064a\u0646",
+"Emoticons": "\u0627\u0644\u0631\u0645\u0648\u0632",
+"Robots": "\u0627\u0644\u0631\u0648\u0628\u0648\u062a\u0627\u062a",
+"Document properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0645\u0633\u062a\u0646\u062f",
+"Title": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
+"Keywords": "\u0643\u0644\u0645\u0627\u062a \u0627\u0644\u0628\u062d\u062b",
+"Encoding": "\u0627\u0644\u062a\u0631\u0645\u064a\u0632",
+"Description": "\u0627\u0644\u0648\u0635\u0641",
+"Author": "\u0627\u0644\u0643\u0627\u062a\u0628",
+"Fullscreen": "\u0645\u0644\u0621 \u0627\u0644\u0634\u0627\u0634\u0629",
+"Horizontal line": "\u062e\u0637 \u0623\u0641\u0642\u064a",
+"Horizontal space": "\u0645\u0633\u0627\u0641\u0629 \u0623\u0641\u0642\u064a\u0629",
+"Insert\/edit image": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0635\u0648\u0631\u0629",
+"General": "\u0639\u0627\u0645",
+"Advanced": "\u062e\u0635\u0627\u0626\u0635 \u0645\u062a\u0642\u062f\u0645\u0647",
+"Source": "\u0627\u0644\u0645\u0635\u062f\u0631",
+"Border": "\u062d\u062f\u0648\u062f",
+"Constrain proportions": "\u0627\u0644\u062a\u0646\u0627\u0633\u0628",
+"Vertical space": "\u0645\u0633\u0627\u0641\u0629 \u0639\u0645\u0648\u062f\u064a\u0629",
+"Image description": "\u0648\u0635\u0641 \u0627\u0644\u0635\u0648\u0631\u0629",
+"Style": "\u0627\u0644\u0646\u0645\u0637 \/ \u0627\u0644\u0634\u0643\u0644",
+"Dimensions": "\u0627\u0644\u0623\u0628\u0639\u0627\u062f",
+"Insert image": "\u0625\u062f\u0631\u0627\u062c \u0635\u0648\u0631\u0629",
+"Image": "\u0627\u0644\u0635\u0648\u0631\u0629",
+"Zoom in": "\u062a\u0643\u0628\u064a\u0631",
+"Contrast": "\u0627\u0644\u062a\u0628\u0627\u064a\u0646",
+"Back": "\u0644\u0644\u062e\u0644\u0641",
+"Gamma": "\u063a\u0627\u0645\u0627",
+"Flip horizontally": "\u0627\u0646\u0639\u0643\u0627\u0633 \u0623\u0641\u0642\u064a",
+"Resize": "\u062a\u063a\u064a\u064a\u0631 \u062d\u062c\u0645",
+"Sharpen": "\u062d\u0627\u062f\u0629",
+"Zoom out": "\u062a\u0635\u063a\u064a\u0631",
+"Image options": "\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0635\u0648\u0631\u0629",
+"Apply": "\u062a\u0637\u0628\u064a\u0642",
+"Brightness": "\u0627\u0644\u0625\u0636\u0627\u0621\u0629",
+"Rotate clockwise": "\u062a\u062f\u0648\u064a\u0631 \u0641\u064a \u0627\u062a\u062c\u0627\u0647 \u0639\u0642\u0627\u0631\u0628 \u0627\u0644\u0633\u0627\u0639\u0629",
+"Rotate counterclockwise": "\u062a\u062f\u0648\u064a\u0631 \u0639\u0643\u0633 \u0627\u062a\u062c\u0627\u0647 \u0639\u0642\u0627\u0631\u0628 \u0627\u0644\u0633\u0627\u0639\u0629",
+"Edit image": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0635\u0648\u0631\u0629",
+"Color levels": "\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u0644\u0648\u0646",
+"Crop": "\u0642\u0635",
+"Orientation": "\u0627\u0644\u0645\u062d\u0627\u0630\u0627\u0629",
+"Flip vertically": "\u0627\u0646\u0639\u0643\u0627\u0633 \u0639\u0627\u0645\u0648\u062f\u064a",
+"Invert": "\u0639\u0643\u0633",
+"Date\/time": "\u0627\u0644\u062a\u0627\u0631\u064a\u062e/\u0627\u0644\u0648\u0642\u062a",
+"Insert date\/time": "\u0625\u062f\u0631\u0627\u062c \u062a\u0627\u0631\u064a\u062e\/\u0648\u0642\u062a",
+"Remove link": "\u062d\u0630\u0641 \u0627\u0644\u0631\u0627\u0628\u0637",
+"Url": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
+"Text to display": "\u0627\u0644\u0646\u0635 \u0627\u0644\u0645\u0637\u0644\u0648\u0628 \u0639\u0631\u0636\u0647",
+"Anchors": "\u0627\u0644\u0645\u0631\u0633\u0627\u0629",
+"Insert link": "\u0625\u062f\u0631\u0627\u062c \u0631\u0627\u0628\u0637",
+"Link": "\u0627\u0644\u0631\u0627\u0628\u0637",
+"New window": "\u0646\u0627\u0641\u0630\u0629 \u062c\u062f\u064a\u062f\u0629",
+"None": "\u0628\u0644\u0627",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0646\u062a\u0648\u0642\u0639 \u0627\u0646\u0643 \u0642\u0645\u062a \u0628\u0625\u062f\u0631\u0627\u062c \u0631\u0627\u0628\u0637 \u0644\u0645\u0648\u0642\u0639 \u062e\u0627\u0631\u062c\u064a. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0646 \u0646\u0636\u064a\u0641 \u0627\u0644\u0644\u0627\u062d\u0642\u0629 http:\/\/ \u0644\u0644\u0631\u0627\u0628\u0637 \u0627\u0644\u0630\u064a \u0627\u062f\u062e\u0644\u062a\u0647\u061f",
+"Paste or type a link": "\u0623\u062f\u062e\u0644 \u0623\u0648 \u0627\u0643\u062a\u0628 \u0627\u0644\u0631\u0627\u0628\u0637",
+"Target": "\u0627\u0644\u0625\u0637\u0627\u0631 \u0627\u0644\u0647\u062f\u0641",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0627\u0644\u0631\u0627\u0628\u0637 \u0627\u0644\u0630\u064a \u0642\u0645\u062a \u0628\u0625\u062f\u0631\u0627\u062c\u0647 \u064a\u0634\u0627\u0628\u0647 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0646 \u062a\u0636\u064a\u0641 \u0627\u0644\u0644\u0627\u062d\u0642\u0629 mailto: \u0645\u0639\u062a\u0628\u0631\u0627\u064b \u0647\u0630\u0627 \u0627\u0644\u0631\u0627\u0628\u0637 \u0628\u0631\u064a\u062f\u0627 \u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u0627\u064b\u061f",
+"Insert\/edit link": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0631\u0627\u0628\u0637",
+"Insert\/edit video": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0641\u064a\u062f\u064a\u0648",
+"Media": "\u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0627\u0644\u0645\u062a\u0639\u062f\u062f\u0629",
+"Alternative source": "\u0645\u0635\u062f\u0631 \u0628\u062f\u064a\u0644",
+"Paste your embed code below:": "\u0644\u0635\u0642 \u0643\u0648\u062f \u0627\u0644\u062a\u0636\u0645\u064a\u0646 \u0647\u0646\u0627:",
+"Insert video": "\u0625\u062f\u0631\u0627\u062c \u0641\u064a\u062f\u064a\u0648",
+"Poster": "\u0645\u0644\u0635\u0642",
+"Insert\/edit media": "\u0625\u062f\u0631\u0627\u062c/\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0627\u0644\u0645\u062a\u0639\u062f\u062f\u0629",
+"Embed": "\u062a\u0636\u0645\u064a\u0646",
+"Nonbreaking space": "\u0645\u0633\u0627\u0641\u0629 \u063a\u064a\u0631 \u0645\u0646\u0642\u0633\u0645\u0629",
+"Page break": "\u0641\u0627\u0635\u0644 \u0644\u0644\u0635\u0641\u062d\u0629",
+"Paste as text": "\u0644\u0635\u0642 \u0643\u0646\u0635",
+"Preview": "\u0645\u0639\u0627\u064a\u0646\u0629",
+"Print": "\u0637\u0628\u0627\u0639\u0629",
+"Save": "\u062d\u0641\u0638",
+"Could not find the specified string.": "\u062a\u0639\u0630\u0631 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0627\u0644\u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u062d\u062f\u062f\u0629",
+"Replace": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644",
+"Next": "\u0627\u0644\u062a\u0627\u0644\u064a",
+"Whole words": "\u0645\u0637\u0627\u0628\u0642\u0629 \u0627\u0644\u0643\u0644\u0645\u0627\u062a \u0628\u0627\u0644\u0643\u0627\u0645\u0644",
+"Find and replace": "\u0628\u062d\u062b \u0648\u0627\u0633\u062a\u0628\u062f\u0627\u0644",
+"Replace with": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0628\u0640",
+"Find": "\u0628\u062d\u062b",
+"Replace all": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0627\u0644\u0643\u0644",
+"Match case": "\u0645\u0637\u0627\u0628\u0642\u0629 \u062d\u0627\u0644\u0629 \u0627\u0644\u0623\u062d\u0631\u0641",
+"Prev": "\u0627\u0644\u0633\u0627\u0628\u0642",
+"Spellcheck": "\u062a\u062f\u0642\u064a\u0642 \u0625\u0645\u0644\u0627\u0626\u064a",
+"Finish": "\u0627\u0646\u062a\u0647\u064a",
+"Ignore all": "\u062a\u062c\u0627\u0647\u0644 \u0627\u0644\u0643\u0644",
+"Ignore": "\u062a\u062c\u0627\u0647\u0644",
+"Add to Dictionary": "\u0627\u0636\u0641 \u0627\u0644\u064a \u0627\u0644\u0642\u0627\u0645\u0648\u0633",
+"Insert row before": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
+"Rows": "\u0639\u062f\u062f \u0627\u0644\u0635\u0641\u0648\u0641",
+"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
+"Paste row after": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
+"Alignment": "\u0645\u062d\u0627\u0630\u0627\u0629",
+"Border color": "\u0644\u0648\u0646 \u0627\u0644\u0625\u0637\u0627\u0631",
+"Column group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0639\u0645\u0648\u062f",
+"Row": "\u0635\u0641",
+"Insert column before": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0633\u0627\u0631",
+"Split cell": "\u062a\u0642\u0633\u064a\u0645 \u0627\u0644\u062e\u0644\u0627\u064a\u0627",
+"Cell padding": "\u062a\u0628\u0627\u0639\u062f \u0627\u0644\u062e\u0644\u064a\u0629",
+"Cell spacing": "\u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0628\u064a\u0646 \u0627\u0644\u062e\u0644\u0627\u064a\u0627",
+"Row type": "\u0646\u0648\u0639 \u0627\u0644\u0635\u0641",
+"Insert table": "\u0625\u062f\u0631\u0627\u062c \u062c\u062f\u0648\u0644",
+"Body": "\u0647\u064a\u0643\u0644",
+"Caption": "\u0634\u0631\u062d",
+"Footer": "\u062a\u0630\u064a\u064a\u0644",
+"Delete row": "\u062d\u0630\u0641 \u0635\u0641",
+"Paste row before": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
+"Scope": "\u0627\u0644\u0645\u062c\u0627\u0644",
+"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
+"H Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
+"Top": "\u0623\u0639\u0644\u064a",
+"Header cell": "\u0631\u0623\u0633 \u0627\u0644\u062e\u0644\u064a\u0629",
+"Column": "\u0639\u0645\u0648\u062f",
+"Row group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0635\u0641",
+"Cell": "\u062e\u0644\u064a\u0629",
+"Middle": "\u0627\u0644\u0648\u0633\u0637",
+"Cell type": "\u0646\u0648\u0639 \u0627\u0644\u062e\u0644\u064a\u0629",
+"Copy row": "\u0646\u0633\u062e \u0627\u0644\u0635\u0641",
+"Row properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0635\u0641",
+"Table properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062c\u062f\u0648\u0644",
+"Bottom": "\u0627\u0644\u0623\u0633\u0641\u0644",
+"V Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0631\u0623\u0633\u064a\u0629",
+"Header": "\u0627\u0644\u0631\u0623\u0633",
+"Right": "\u064a\u0645\u064a\u0646",
+"Insert column after": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0645\u064a\u0646",
+"Cols": "\u0639\u062f\u062f \u0627\u0644\u0623\u0639\u0645\u062f\u0629",
+"Insert row after": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
+"Width": "\u0639\u0631\u0636",
+"Cell properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062e\u0644\u064a\u0629",
+"Left": "\u064a\u0633\u0627\u0631",
+"Cut row": "\u0642\u0635 \u0627\u0644\u0635\u0641",
+"Delete column": "\u062d\u0630\u0641 \u0639\u0645\u0648\u062f",
+"Center": "\u062a\u0648\u0633\u064a\u0637",
+"Merge cells": "\u062f\u0645\u062c \u062e\u0644\u0627\u064a\u0627",
+"Insert template": "\u0625\u062f\u0631\u0627\u062c \u0642\u0627\u0644\u0628",
+"Templates": "\u0642\u0648\u0627\u0644\u0628",
+"Background color": "\u0644\u0648\u0646 \u0627\u0644\u062e\u0644\u0641\u064a\u0629",
+"Custom...": "\u062a\u062e\u0635\u064a\u0635 ...",
+"Custom color": "\u0644\u0648\u0646 \u0645\u062e\u0635\u0635",
+"No color": "\u0628\u062f\u0648\u0646 \u0644\u0648\u0646",
+"Text color": "\u0644\u0648\u0646 \u0627\u0644\u0646\u0635",
+"Table of Contents": "\u062c\u062f\u0648\u0644 \u0627\u0644\u0645\u062d\u062a\u0648\u064a\u0627\u062a",
+"Show blocks": "\u0645\u0634\u0627\u0647\u062f\u0629 \u0627\u0644\u0643\u062a\u0644",
+"Show invisible characters": "\u0623\u0638\u0647\u0631 \u0627\u0644\u0623\u062d\u0631\u0641 \u0627\u0644\u063a\u064a\u0631 \u0645\u0631\u0626\u064a\u0629",
+"Words: {0}": "\u0627\u0644\u0643\u0644\u0645\u0627\u062a:{0}",
+"Insert": "\u0625\u062f\u0631\u0627\u062c",
+"File": "\u0645\u0644\u0641",
+"Edit": "\u062a\u062d\u0631\u064a\u0631",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0645\u0646\u0637\u0642\u0629 \u0646\u0635 \u0645\u0646\u0633\u0642. \u0627\u0636\u063a\u0637 ALT-F9 \u0644\u0644\u0642\u0627\u0626\u0645\u0629. \u0627\u0636\u063a\u0637 ALT-F10 \u0644\u0634\u0631\u064a\u0637 \u0627\u0644\u0623\u062f\u0648\u0627\u062a. \u0627\u0636\u063a\u0637 ALT-0 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629",
+"Tools": "\u0623\u062f\u0627\u0648\u0627\u062a",
+"View": "\u0639\u0631\u0636",
+"Table": "\u062c\u062f\u0648\u0644",
+"Format": "\u062a\u0646\u0633\u064a\u0642",
+"_dir": "rtl"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/be.js b/core/media/editors/tinymce/langs/be.js
new file mode 100644
index 00000000..ec4e13f1
--- /dev/null
+++ b/core/media/editors/tinymce/langs/be.js
@@ -0,0 +1,197 @@
+tinymce.addI18n('be',{
+"Cut": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c",
+"Heading 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
+"Header 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u045e\u0437\u044d\u0440 \u043d\u0435 \u043f\u0430\u0434\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0435 \u043f\u0440\u0430\u043c\u044b \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0430\u0431\u043c\u0435\u043d\u0443. \u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u043a\u0430\u0440\u044b\u0441\u0442\u043e\u045e\u0432\u0430\u0439\u0446\u0435 \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u044b\u044f \u0441\u043f\u0430\u043b\u0443\u0447\u044d\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448: Ctrl + X\/C\/V.",
+"Heading 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
+"Div": "\u0411\u043b\u043e\u043a",
+"Heading 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
+"Paste": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
+"Close": "\u0417\u0430\u0447\u044b\u043d\u0456\u0446\u044c",
+"Font Family": "\u0428\u0440\u044b\u0444\u0442",
+"Pre": "\u041f\u0440\u0430\u0434\u0444\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u043d\u0435",
+"Align right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"New document": "\u041d\u043e\u0432\u044b \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442",
+"Blockquote": "\u0426\u044b\u0442\u0430\u0442\u0430",
+"Numbered list": "\u041d\u0443\u043c\u0430\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
+"Heading 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
+"Headings": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
+"Increase indent": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Formats": "\u0424\u0430\u0440\u043c\u0430\u0442",
+"Headers": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
+"Select all": "\u0412\u044b\u043b\u0443\u0447\u044b\u0446\u044c \u0443\u0441\u0451",
+"Header 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
+"Blocks": "\u0411\u043b\u043e\u043a\u0456",
+"Undo": "\u0412\u044f\u0440\u043d\u0443\u0446\u044c",
+"Strikethrough": "\u0417\u0430\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
+"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
+"Header 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
+"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
+"Clear formatting": "\u0410\u0447\u044b\u0441\u0446\u0456\u0446\u044c \u0444\u0430\u0440\u043c\u0430\u0442",
+"Font Sizes": "\u041f\u0430\u043c\u0435\u0440 \u0448\u0440\u044b\u0444\u0442\u0430",
+"Subscript": "\u041d\u0456\u0436\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
+"Header 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
+"Redo": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
+"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
+"Ok": "Ok",
+"Bold": "\u0422\u043b\u0443\u0441\u0442\u044b",
+"Code": "\u041a\u043e\u0434",
+"Italic": "\u041a\u0443\u0440\u0441\u0456\u045e",
+"Align center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
+"Header 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
+"Heading 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
+"Heading 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
+"Decrease indent": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Header 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0423\u0441\u0442\u0430\u045e\u043a\u0430 \u0437\u0434\u0437\u044f\u0439\u0441\u043d\u044f\u0435\u0446\u0446\u0430 \u045e \u0432\u044b\u0433\u043b\u044f\u0434\u0437\u0435 \u043f\u0440\u043e\u0441\u0442\u0430\u0433\u0430 \u0442\u044d\u043a\u0441\u0442\u0443, \u043f\u0430\u043a\u0443\u043b\u044c \u043d\u0435 \u0430\u0434\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0434\u0430\u0434\u0437\u0435\u043d\u0443\u044e \u043e\u043f\u0446\u044b\u044e.",
+"Underline": "\u041f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
+"Cancel": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
+"Justify": "\u041f\u0430 \u0448\u044b\u0440\u044b\u043d\u0456",
+"Inline": "\u0420\u0430\u0434\u043a\u043e\u0432\u044b",
+"Copy": "\u041a\u0430\u043f\u0456\u0440\u0430\u0432\u0430\u0446\u044c",
+"Align left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"Visual aids": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
+"Lower Greek": "\u041c\u0430\u043b\u044b\u044f \u0433\u0440\u044d\u0447\u0430\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
+"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
+"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b",
+"Lower Alpha": "\u041c\u0430\u043b\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
+"Circle": "\u0410\u043a\u0440\u0443\u0436\u043d\u0430\u0441\u0446\u0456",
+"Disc": "\u041a\u0440\u0443\u0433\u0456",
+"Upper Alpha": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
+"Upper Roman": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
+"Lower Roman": "\u041c\u0430\u043b\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
+"Name": "\u0406\u043c\u044f",
+"Anchor": "\u042f\u043a\u0430\u0440",
+"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0451\u0441\u0446\u044c \u043d\u0435\u0437\u0430\u0445\u0430\u0432\u0430\u043d\u044b\u044f \u0437\u043c\u0435\u043d\u044b. \u0412\u044b \u045e\u043f\u044d\u045e\u043d\u0435\u043d\u044b\u044f, \u0448\u0442\u043e \u0445\u043e\u0447\u0430\u0446\u0435 \u0432\u044b\u0439\u0441\u0446\u0456?",
+"Restore last draft": "\u0410\u0434\u043d\u0430\u045e\u043b\u0435\u043d\u043d\u0435 \u0430\u043f\u043e\u0448\u043d\u044f\u0433\u0430 \u043f\u0440\u0430\u0435\u043a\u0442\u0430",
+"Special character": "\u0421\u043f\u0435\u0446\u044b\u044f\u043b\u044c\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
+"Source code": "\u0417\u044b\u0445\u043e\u0434\u043d\u044b \u043a\u043e\u0434",
+"Color": "\u041a\u043e\u043b\u0435\u0440",
+"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u0430",
+"Left to right": "\u0417\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u0430",
+"Emoticons": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043c\u0430\u0439\u043b",
+"Robots": "\u0420\u043e\u0431\u0430\u0442\u044b",
+"Document properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"Title": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
+"Keywords": "\u041a\u043b\u044e\u0447\u0430\u0432\u044b\u044f \u0441\u043b\u043e\u0432\u044b",
+"Encoding": "\u041a\u0430\u0434\u044b\u0440\u043e\u045e\u043a\u0430",
+"Description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435",
+"Author": "\u0410\u045e\u0442\u0430\u0440",
+"Fullscreen": "\u041f\u043e\u045e\u043d\u0430\u044d\u043a\u0440\u0430\u043d\u043d\u044b \u0440\u044d\u0436\u044b\u043c",
+"Horizontal line": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0456\u043d\u0456\u044f",
+"Horizontal space": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
+"Insert\/edit image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
+"General": "\u0410\u0433\u0443\u043b\u044c\u043d\u0430\u0435",
+"Advanced": "\u041f\u0430\u0448\u044b\u0440\u0430\u043d\u0430\u0435",
+"Source": "\u041a\u0440\u044b\u043d\u0456\u0446\u0430",
+"Border": "\u041c\u044f\u0436\u0430",
+"Constrain proportions": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c \u043f\u0440\u0430\u043f\u043e\u0440\u0446\u044b\u0456",
+"Vertical space": "\u0412\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
+"Image description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435 \u0432\u044b\u044f\u0432\u044b",
+"Style": "\u0421\u0442\u044b\u043b\u044c",
+"Dimensions": "\u041f\u0430\u043c\u0435\u0440",
+"Insert image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
+"Insert date\/time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
+"Remove link": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"Url": "\u0410\u0434\u0440\u0430\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
+"Text to display": "\u0422\u044d\u043a\u0441\u0442 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
+"Anchors": "\u042f\u043a\u0430\u0440\u044b",
+"Insert link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"New window": "\u0423 \u043d\u043e\u0432\u044b\u043c \u0430\u043a\u043d\u0435",
+"None": "\u041d\u044f\u043c\u0430",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0437\u043d\u0435\u0448\u043d\u044e\u044e \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b http:\/\/ \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
+"Target": "\u0410\u0434\u043a\u0440\u044b\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0430\u0434\u0440\u0430\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u0439 \u043f\u043e\u0448\u0442\u044b. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b mailto: \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
+"Insert\/edit link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"Insert\/edit video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
+"Poster": "\u0412\u044b\u044f\u0432\u0430",
+"Alternative source": "\u0410\u043b\u044c\u0442\u044d\u0440\u043d\u0430\u0442\u044b\u045e\u043d\u0430\u044f \u043a\u0440\u044b\u043d\u0456\u0446\u0430",
+"Paste your embed code below:": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0456\u0436\u044d\u0439:",
+"Insert video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
+"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u045e\u0441\u0442\u0430\u045e\u043a\u0456",
+"Nonbreaking space": "\u041d\u0435\u043f\u0430\u0440\u044b\u045e\u043d\u044b \u043f\u0440\u0430\u0431\u0435\u043b",
+"Page break": "\u0420\u0430\u0437\u0440\u044b\u045e \u0441\u0442\u0430\u0440\u043e\u043d\u043a\u0456",
+"Paste as text": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u044f\u043a \u0442\u044d\u043a\u0441\u0442",
+"Preview": "\u041f\u0440\u0430\u0434\u043f\u0440\u0430\u0433\u043b\u044f\u0434",
+"Print": "\u0414\u0440\u0443\u043a",
+"Save": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c",
+"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u0434\u0437\u0435\u043d\u044b \u0440\u0430\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u043e\u0439\u0434\u0437\u0435\u043d\u044b",
+"Replace": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
+"Next": "\u0423\u043d\u0456\u0437",
+"Whole words": "\u0421\u043b\u043e\u0432\u044b \u0446\u0430\u043b\u043a\u0430\u043c",
+"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0435\u043d\u0430",
+"Replace with": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043d\u0430",
+"Find": "\u0417\u043d\u0430\u0439\u0441\u0446\u0456",
+"Replace all": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u0443\u0441\u0435",
+"Match case": "\u0423\u043b\u0456\u0447\u0432\u0430\u0446\u044c \u0440\u044d\u0433\u0456\u0441\u0442\u0440",
+"Prev": "\u0423\u0432\u0435\u0440\u0445",
+"Spellcheck": "\u041f\u0440\u0430\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u0430\u043f\u0456\u0441\u0443",
+"Finish": "\u0421\u043a\u043e\u043d\u0447\u044b\u0446\u044c",
+"Ignore all": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c \u0443\u0441\u0435",
+"Ignore": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c",
+"Add to Dictionary": "\u0414\u0430\u0434\u0430\u0446\u044c \u0443 \u0441\u043b\u043e\u045e\u043d\u0456\u043a",
+"Insert row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
+"Rows": "\u0420\u0430\u0434\u043a\u0456",
+"Height": "\u0412\u044b\u0448\u044b\u043d\u044f",
+"Paste row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
+"Alignment": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
+"Border color": "\u041a\u043e\u043b\u0435\u0440 \u043c\u044f\u0436\u044b",
+"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u043b\u0443\u043f\u043a\u043e\u045e",
+"Row": "\u0420\u0430\u0434\u043e\u043a",
+"Insert column before": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0437\u043b\u0435\u0432\u0430",
+"Split cell": "\u0420\u0430\u0437\u0431\u0456\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0443",
+"Cell padding": "\u0423\u043d\u0443\u0442\u0440\u0430\u043d\u044b \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Cell spacing": "\u0417\u043d\u0435\u0448\u043d\u0456 \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Row type": "\u0422\u044b\u043f \u0440\u0430\u0434\u043a\u0430",
+"Insert table": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
+"Body": "\u0426\u0435\u043b\u0430",
+"Caption": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
+"Footer": "\u041d\u0456\u0437",
+"Delete row": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
+"Paste row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
+"Scope": "\u0421\u0444\u0435\u0440\u0430",
+"Delete table": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
+"H Align": "\u0413\u0430\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
+"Top": "\u0412\u0435\u0440\u0445",
+"Header cell": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
+"Column": "\u0421\u043b\u0443\u043f\u043e\u043a",
+"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0430\u0434\u043a\u043e\u045e",
+"Cell": "\u042f\u0447\u044d\u0439\u043a\u0430",
+"Middle": "\u0421\u044f\u0440\u044d\u0434\u0437\u0456\u043d\u0430",
+"Cell type": "\u0422\u044b\u043f \u044f\u0447\u044d\u0439\u043a\u0456",
+"Copy row": "\u041a\u0430\u043f\u0456\u044f\u0432\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
+"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0440\u0430\u0434\u043a\u0430",
+"Table properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0442\u0430\u0431\u043b\u0456\u0446\u044b",
+"Bottom": "\u041d\u0456\u0437",
+"V Align": "\u0412\u0435\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
+"Header": "\u0428\u0430\u043f\u043a\u0430",
+"Right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"Insert column after": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0441\u043f\u0440\u0430\u0432\u0430",
+"Cols": "\u0421\u043b\u0443\u043f\u043a\u0456",
+"Insert row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
+"Width": "\u0428\u044b\u0440\u044b\u043d\u044f",
+"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u044d\u0439\u043a\u0456",
+"Left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"Cut row": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
+"Delete column": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a",
+"Center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
+"Merge cells": "\u0410\u0431'\u044f\u0434\u043d\u0430\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0456",
+"Insert template": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
+"Background color": "\u041a\u043e\u043b\u0435\u0440 \u0444\u043e\u043d\u0443",
+"Custom...": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456...",
+"Custom color": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456 \u043a\u043e\u043b\u0435\u0440",
+"No color": "\u0411\u0435\u0437 \u043a\u043e\u043b\u0435\u0440\u0443",
+"Text color": "\u041a\u043e\u043b\u0435\u0440 \u0442\u044d\u043a\u0441\u0442\u0443",
+"Show blocks": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u0431\u043b\u043e\u043a\u0456",
+"Show invisible characters": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043d\u044f\u0431\u0430\u0447\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
+"Words: {0}": "\u041a\u043e\u043b\u044c\u043a\u0430\u0441\u0446\u044c \u0441\u043b\u043e\u045e: {0}",
+"Insert": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
+"File": "\u0424\u0430\u0439\u043b",
+"Edit": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u044d\u043a\u0441\u0442\u0430\u0432\u0430\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0446\u0456\u0441\u043d\u0456\u0446\u0435 ALT-F9, \u043a\u0430\u0431 \u0432\u044b\u043a\u043b\u0456\u043a\u0430\u0446\u044c \u043c\u0435\u043d\u044e, ALT-F10 - \u043f\u0430\u043d\u044d\u043b\u044c \u043f\u0440\u044b\u043b\u0430\u0434\u0430\u045e, ALT-0 - \u0434\u043b\u044f \u0432\u044b\u043a\u043b\u0456\u043a\u0443 \u0434\u0430\u043f\u0430\u043c\u043e\u0433\u0456.",
+"Tools": "\u041f\u0440\u044b\u043b\u0430\u0434\u044b",
+"View": "\u0412\u044b\u0433\u043b\u044f\u0434",
+"Table": "\u0422\u0430\u0431\u043b\u0456\u0446\u0430",
+"Format": "\u0424\u0430\u0440\u043c\u0430\u0442"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/bg.js b/core/media/editors/tinymce/langs/bg.js
new file mode 100644
index 00000000..4fa87455
--- /dev/null
+++ b/core/media/editors/tinymce/langs/bg.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('bg',{
+"Cut": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
+"Header 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u044f\u0442 \u0431\u0440\u0430\u0443\u0437\u044a\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u0434\u043e\u0441\u0442\u044a\u043f \u0434\u043e \u043a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430. \u0412\u043c\u0435\u0441\u0442\u043e \u0442\u043e\u0432\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 Ctrl+X (\u0437\u0430 \u0438\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435), Ctrl+C (\u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435) \u0438 Ctrl+V (\u0437\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435).",
+"Div": "\u0411\u043b\u043e\u043a",
+"Paste": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435",
+"Close": "\u0417\u0430\u0442\u0432\u0430\u0440\u044f\u043d\u0435",
+"Font Family": "\u0428\u0440\u0438\u0444\u0442",
+"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u043d\u043e \u043e\u0444\u043e\u0440\u043c\u0435\u043d \u0442\u0435\u043a\u0441\u0442",
+"Align right": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u0434\u044f\u0441\u043d\u043e",
+"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
+"Numbered list": "\u041d\u043e\u043c\u0435\u0440\u0438\u0440\u0430\u043d \u0441\u043f\u0438\u0441\u044a\u043a",
+"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
+"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
+"Headers": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
+"Select all": "\u041c\u0430\u0440\u043a\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u044f\u043b\u043e\u0442\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
+"Header 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
+"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0435",
+"Undo": "\u0412\u044a\u0440\u043d\u0438",
+"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
+"Bullet list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u043e\u0434\u0430\u0447\u0438",
+"Header 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
+"Superscript": "\u0413\u043e\u0440\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
+"Clear formatting": "\u0418\u0437\u0447\u0438\u0441\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
+"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
+"Subscript": "\u0414\u043e\u043b\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
+"Header 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
+"Redo": "\u041e\u0442\u043c\u0435\u043d\u0438",
+"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
+"Ok": "\u0414\u043e\u0431\u0440\u0435",
+"Bold": "\u0423\u0434\u0435\u0431\u0435\u043b\u0435\u043d (\u043f\u043e\u043b\u0443\u0447\u0435\u0440)",
+"Code": "\u041a\u043e\u0434",
+"Italic": "\u041d\u0430\u043a\u043b\u043e\u043d\u0435\u043d (\u043a\u0443\u0440\u0441\u0438\u0432)",
+"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
+"Header 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
+"Decrease indent": "\u041d\u0430\u043c\u0430\u043b\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
+"Header 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435\u0442\u043e \u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0435 \u0432 \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0440\u0435\u0436\u0438\u043c. \u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e \u0449\u0435 \u0431\u044a\u0434\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e \u043a\u0430\u0442\u043e \u043d\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442, \u0434\u043e\u043a\u0430\u0442\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0442\u0430\u0437\u0438 \u043e\u043f\u0446\u0438\u044f.",
+"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u0442\u0430\u043d",
+"Cancel": "\u041e\u0442\u043a\u0430\u0437",
+"Justify": "\u0414\u0432\u0443\u0441\u0442\u0440\u0430\u043d\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
+"Inline": "\u041d\u0430 \u0435\u0434\u0438\u043d \u0440\u0435\u0434",
+"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435",
+"Align left": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u043b\u044f\u0432\u043e",
+"Visual aids": "\u0412\u0438\u0437\u0443\u0430\u043b\u043d\u043e \u043e\u0442\u043a\u0440\u043e\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0438 \u0431\u0435\u0437 \u043a\u0430\u043d\u0442\u043e\u0432\u0435 (\u0440\u0430\u043c\u043a\u0438)",
+"Lower Greek": "\u041c\u0430\u043b\u043a\u0438 \u0433\u0440\u044a\u0446\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
+"Square": "\u0417\u0430\u043f\u044a\u043b\u043d\u0435\u043d\u0438 \u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
+"Default": "\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
+"Lower Alpha": "\u041c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
+"Circle": "\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0438",
+"Disc": "\u041a\u0440\u044a\u0433\u0447\u0435\u0442\u0430",
+"Upper Alpha": "\u0413\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
+"Upper Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
+"Lower Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
+"Name": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
+"Anchor": "\u041a\u043e\u0442\u0432\u0430 (\u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430)",
+"You have unsaved changes are you sure you want to navigate away?": "\u0412 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0438\u043c\u0430 \u043d\u0435\u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438. \u0429\u0435 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u043b\u0438?",
+"Restore last draft": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u0447\u0435\u0440\u043d\u043e\u0432\u0430",
+"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0437\u043d\u0430\u043a",
+"Source code": "\u0418\u0437\u0445\u043e\u0434\u0435\u043d \u043a\u043e\u0434 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0432 HTML",
+"Right to left": "\u041e\u0442\u0434\u044f\u0441\u043d\u043e \u043d\u0430\u043b\u044f\u0432\u043e",
+"Left to right": "\u041e\u0442\u043b\u044f\u0432\u043e \u043d\u0430\u0434\u044f\u0441\u043d\u043e",
+"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
+"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438 \u043d\u0430 \u0443\u0435\u0431 \u0442\u044a\u0440\u0441\u0430\u0447\u043a\u0438",
+"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"Title": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
+"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0438 \u0434\u0443\u043c\u0438",
+"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0437\u043d\u0430\u0446\u0438\u0442\u0435",
+"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Author": "\u0410\u0432\u0442\u043e\u0440",
+"Fullscreen": "\u041d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
+"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u0447\u0435\u0440\u0442\u0430",
+"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
+"Insert\/edit image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
+"General": "\u041e\u0431\u0449\u043e",
+"Advanced": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e",
+"Source": "\u0410\u0434\u0440\u0435\u0441",
+"Border": "\u041a\u0430\u043d\u0442 (\u0440\u0430\u043c\u043a\u0430)",
+"Constrain proportions": "\u0417\u0430\u0432\u0430\u0437\u043d\u0430\u0432\u0435 \u043d\u0430 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438\u0442\u0435",
+"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
+"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430\u0442\u0430",
+"Style": "\u0421\u0442\u0438\u043b",
+"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
+"Insert image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Insert date\/time": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0434\u0430\u0442\u0430\/\u0447\u0430\u0441",
+"Remove link": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430",
+"Url": "\u0410\u0434\u0440\u0435\u0441 (URL)",
+"Text to display": "\u0422\u0435\u043a\u0441\u0442",
+"Anchors": "\u041a\u043e\u0442\u0432\u0438",
+"Insert link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
+"New window": "\u0412 \u043d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 (\u043f\u043e\u0434\u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446)",
+"None": "\u0411\u0435\u0437",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u0426\u0435\u043b \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
+"Insert\/edit video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
+"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
+"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441",
+"Paste your embed code below:": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043a\u043e\u0434\u0430 \u0437\u0430 \u0432\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u0432 \u043f\u043e\u043b\u0435\u0442\u043e \u043f\u043e-\u0434\u043e\u043b\u0443:",
+"Insert video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
+"Embed": "\u0412\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435",
+"Nonbreaking space": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
+"Page break": "\u041d\u043e\u0432\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
+"Paste as text": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u043a\u0430\u0442\u043e \u0442\u0435\u043a\u0441\u0442",
+"Preview": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u0438\u0437\u0433\u043b\u0435\u0434",
+"Print": "\u041f\u0435\u0447\u0430\u0442",
+"Save": "\u0421\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435",
+"Could not find the specified string.": "\u0422\u044a\u0440\u0441\u0435\u043d\u0438\u044f\u0442 \u0442\u0435\u043a\u0441\u0442 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.",
+"Replace": "\u0417\u0430\u043c\u044f\u043d\u0430",
+"Next": "\u0421\u043b\u0435\u0434\u0432\u0430\u0449",
+"Whole words": "\u0421\u0430\u043c\u043e \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
+"Find and replace": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430",
+"Replace with": "\u0417\u0430\u043c\u044f\u043d\u0430 \u0441",
+"Find": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0437\u0430",
+"Replace all": "\u0417\u0430\u043c\u044f\u043d\u0430 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u0440\u0435\u0449\u0430\u043d\u0438\u044f",
+"Match case": "\u0421\u044a\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u044a\u0440\u0430 (\u043c\u0430\u043b\u043a\u0438\/\u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438)",
+"Prev": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
+"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
+"Finish": "\u041a\u0440\u0430\u0439",
+"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u043e",
+"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435",
+"Insert row before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
+"Rows": "\u0420\u0435\u0434\u043e\u0432\u0435",
+"Height": "\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430",
+"Paste row after": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
+"Alignment": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
+"Column group": "Column group",
+"Row": "\u0420\u0435\u0434",
+"Insert column before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434\u0438",
+"Split cell": "\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430",
+"Cell padding": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0434\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e",
+"Cell spacing": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
+"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434\u0430",
+"Insert table": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430",
+"Body": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 (body)",
+"Caption": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043f\u0440\u0435\u0434\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
+"Footer": "\u0414\u043e\u043b\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (footer)",
+"Delete row": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434\u0430",
+"Paste row before": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
+"Scope": "\u041e\u0431\u0445\u0432\u0430\u0442",
+"Delete table": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
+"Header cell": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430 (\u0430\u043d\u0442\u0435\u0442\u043a\u0430)",
+"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
+"Cell": "\u041a\u043b\u0435\u0442\u043a\u0430",
+"Header": "\u0413\u043e\u0440\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (header)",
+"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
+"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
+"Row properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0440\u0435\u0434\u0430",
+"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
+"Row group": "Row group",
+"Right": "\u0414\u044f\u0441\u043d\u043e",
+"Insert column after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u0441\u043b\u0435\u0434",
+"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
+"Insert row after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
+"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
+"Cell properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
+"Left": "\u041b\u044f\u0432\u043e",
+"Cut row": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
+"Delete column": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430",
+"Center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
+"Merge cells": "\u0421\u043b\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
+"Insert template": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
+"Background color": "\u0424\u043e\u043d\u043e\u0432 \u0446\u0432\u044f\u0442",
+"Text color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
+"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u043b\u043e\u043a\u043e\u0432\u0435\u0442\u0435",
+"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u043f\u0435\u0447\u0430\u0442\u0430\u0435\u043c\u0438 \u0437\u043d\u0430\u0446\u0438",
+"Words: {0}": "\u0411\u0440\u043e\u0439 \u0434\u0443\u043c\u0438: {0}",
+"Insert": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435",
+"File": "\u0424\u0430\u0439\u043b",
+"Edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Alt+F9 \u0437\u0430 \u043c\u0435\u043d\u044e; Alt+F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438; Alt+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449.",
+"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
+"View": "\u0418\u0437\u0433\u043b\u0435\u0434",
+"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
+"Format": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/bs.js b/core/media/editors/tinymce/langs/bs.js
new file mode 100644
index 00000000..eaf0b2c9
--- /dev/null
+++ b/core/media/editors/tinymce/langs/bs.js
@@ -0,0 +1,231 @@
+tinymce.addI18n('bs',{
+"Cut": "Izre\u017ei",
+"Heading 5": "Naslov 5",
+"Header 2": "Zaglavlje 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 preglednik ne podr\u017eava direktan pristup me\u0111uspremniku (clipboard). Molimo Vas da umjesto toga koristite kratice na tastaturi Ctrl+X\/C\/V.",
+"Heading 4": "Naslov 4",
+"Div": "Div",
+"Heading 2": "Naslov 2",
+"Paste": "Zalijepi",
+"Close": "Zatvori",
+"Font Family": "Vrsta pisma",
+"Pre": "Pre",
+"Align right": "Poravnaj desno",
+"New document": "Novi dokument",
+"Blockquote": "Blockquote",
+"Numbered list": "Numerisana lista",
+"Heading 1": "Naslov 1",
+"Headings": "Naslovi",
+"Increase indent": "Pove\u0107aj uvla\u010denje",
+"Formats": "Formati",
+"Headers": "Zaglavlja",
+"Select all": "Ozna\u010di sve",
+"Header 3": "Zaglavlje 3",
+"Blocks": "Blokovi",
+"Undo": "Poni\u0161ti",
+"Strikethrough": "Crta kroz sredinu",
+"Bullet list": "Lista",
+"Header 1": "Zaglavlje 1",
+"Superscript": "Eksponent",
+"Clear formatting": "Ukloni oblikovanje",
+"Font Sizes": "Veli\u010dine fonta",
+"Subscript": "Indeks",
+"Header 6": "Zaglavlje 6",
+"Redo": "Vrati",
+"Paragraph": "Paragraf",
+"Ok": "U redu",
+"Bold": "Podebljano",
+"Code": "Kod",
+"Italic": "Kurziv",
+"Align center": "Poravnaj po sredini",
+"Header 5": "Zaglavlje 5",
+"Heading 6": "Naslov 6",
+"Heading 3": "Naslov 3",
+"Decrease indent": "Smanji uvla\u010denje",
+"Header 4": "Zaglavlje 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Akcija zalijepi od sada lijepi \u010disti tekst. Sadr\u017eaj \u0107e biti zaljepljen kao \u010disti tekst sve dok ne isklju\u010dite ovu opciju.",
+"Underline": "Linija ispod",
+"Cancel": "Odustani",
+"Justify": "Obostrano poravnanje",
+"Inline": "Unutra\u0161nje",
+"Copy": "Kopiraj",
+"Align left": "Poravnaj lijevo",
+"Visual aids": "Vizualna pomo\u0107",
+"Lower Greek": "Mala gr\u010dka slova",
+"Square": "Kvadrat",
+"Default": "Zadano",
+"Lower Alpha": "Mala slova",
+"Circle": "Krug",
+"Disc": "Disk",
+"Upper Alpha": "Velika slova",
+"Upper Roman": "Velika rimska slova",
+"Lower Roman": "Mala rimska slova",
+"Name": "Ime",
+"Anchor": "Sidro",
+"You have unsaved changes are you sure you want to navigate away?": "Postoje izmjene koje nisu snimljene, jeste li sigurni da \u017eelite iza\u0107i?",
+"Restore last draft": "Vrati posljednju skicu",
+"Special character": "Poseban znak",
+"Source code": "Izvorni kod",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Boja",
+"Right to left": "S desna na lijevo",
+"Left to right": "S lijeva na desno",
+"Emoticons": "Emotikoni",
+"Robots": "Roboti pretra\u017eiva\u010da",
+"Document properties": "Svojstva dokumenta",
+"Title": "Naslov",
+"Keywords": "Klju\u010dne rije\u010di",
+"Encoding": "Kodna stranica",
+"Description": "Opis",
+"Author": "Autor",
+"Fullscreen": "Cijeli ekran",
+"Horizontal line": "Horizontalna linija",
+"Horizontal space": "Horizontalan razmak",
+"Insert\/edit image": "Ubaci\/izmijeni sliku",
+"Insert\/Edit code sample": "Ubaci\/izmijeni uzorak koda",
+"General": "Op\u0107enito",
+"Advanced": "Napredno",
+"Source": "Izvor",
+"Border": "Ivica",
+"Constrain proportions": "Zadr\u017ei proporcije",
+"Vertical space": "Vertikalni razmak",
+"Image description": "Opis slike",
+"Style": "Stil",
+"Dimensions": "Dimenzije",
+"Insert image": "Ubaci sliku",
+"Zoom in": "Pove\u0107aj",
+"Contrast": "Kontrast",
+"Back": "Nazad",
+"Gamma": "Gamma",
+"Flip horizontally": "Obrni horizontalno",
+"Resize": "Promjeni veli\u010dinu",
+"Sharpen": "Izo\u0161travanje",
+"Zoom out": "Smanji",
+"Insert image": "Ubaci sliku",
+"Apply": "Primijeni",
+"Brightness": "Svjetlina",
+"Rotate clockwise": "Rotiraj desno",
+"Rotate counterclockwise": "Rotiraj lijevo",
+"Edit image": "Uredi sliku",
+"Color levels": "Nivoi boje",
+"Crop": "Obre\u017ei",
+"Orientation": "Orijentacija",
+"Flip vertically": "Obrni vertikalno",
+"Invert": "Invertuj",
+"Insert date\/time": "Ubaci datum\/vrijeme",
+"Remove link": "Ukloni poveznicu",
+"Url": "Url",
+"Text to display": "Tekst za prikaz",
+"Anchors": "Kra\u0107e poveznice",
+"Insert link": "Ubaci poveznicu",
+"New window": "Novi prozor",
+"None": "Ni\u0161ta",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL koji ste unijeli izgleda da je eksterni link. \u017delite li dodati potrebni http:\/\/ prefiks?",
+"Target": "Meta",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL koji ste unijeli izgleda da je adresa e-po\u0161te. \u017delite li dodati potrebni mailto: prefiks?",
+"Insert\/edit link": "Umetni\/izmijeni link",
+"Insert\/edit video": "Umetni\/izmijeni video",
+"Poster": "Poster",
+"Alternative source": "Alternativni izvor",
+"Paste your embed code below:": "Umetnite va\u0161 kod za ugradnju ispod:",
+"Insert video": "Umetni video",
+"Embed": "Ugradi",
+"Nonbreaking space": "Neprekidaju\u0107i razmak",
+"Page break": "Prijelom stranice",
+"Paste as text": "Zalijepi kao tekst",
+"Preview": "Pregled",
+"Print": "Ispis",
+"Save": "Spremi",
+"Could not find the specified string.": "Tra\u017eeni tekst nije prona\u0111en",
+"Replace": "Zamijeni",
+"Next": "Sljede\u0107i",
+"Whole words": "Cijele rije\u010di",
+"Find and replace": "Prona\u0111i i zamijeni",
+"Replace with": "Zamijeni sa",
+"Find": "Tra\u017ei",
+"Replace all": "Zamijeni sve",
+"Match case": "Pazi na mala i velika slova",
+"Prev": "Prethodni",
+"Spellcheck": "Provjeri pravopis",
+"Finish": "Zavr\u0161i",
+"Ignore all": "Zanemari sve",
+"Ignore": "Zanemari",
+"Add to Dictionary": "Dodaj u rje\u010dnik",
+"Insert row before": "Umetni redak prije",
+"Rows": "Redovi",
+"Height": "Visina",
+"Paste row after": "Zalijepi redak nakon",
+"Alignment": "Poravnanje",
+"Border color": "Boja ivice",
+"Column group": "Grupirane kolone",
+"Row": "Redak",
+"Insert column before": "Umetni kolonu prije",
+"Split cell": "Razdvoji polja",
+"Cell padding": "Razmak unutar polja",
+"Cell spacing": "Razmak izme\u0111u polja",
+"Row type": "Vrsta redka",
+"Insert table": "Umetni tablicu",
+"Body": "Sadr\u017eaj",
+"Caption": "Naslov",
+"Footer": "Podno\u017eje",
+"Delete row": "Izbri\u0161i redak",
+"Paste row before": "Zalijepi redak prije",
+"Scope": "Doseg",
+"Delete table": "Izbri\u0161i tablicu",
+"H Align": "H Poravnavanje",
+"Top": "Vrh",
+"Header cell": "Polje zaglavlja",
+"Column": "Kolona",
+"Row group": "Grupirani redovi",
+"Cell": "Polje",
+"Middle": "Sredina",
+"Cell type": "Vrsta polja",
+"Copy row": "Kopiraj redak",
+"Row properties": "Svojstva redka",
+"Table properties": "Svojstva tablice",
+"Bottom": "Dno",
+"V Align": "V Poravnavanje",
+"Header": "Zaglavlje",
+"Right": "Desno",
+"Insert column after": "Umetni kolonu poslije",
+"Cols": "Stupci",
+"Insert row after": "Umetni redak poslije",
+"Width": "\u0160irina",
+"Cell properties": "Svojstva polja",
+"Left": "Lijevo",
+"Cut row": "Izre\u017ei redak",
+"Delete column": "Izbri\u0161i kolonu",
+"Center": "Sredina",
+"Merge cells": "Spoji polja",
+"Insert template": "Umetni predlo\u017eak",
+"Templates": "Predlo\u0161ci",
+"Background color": "Boja pozadine",
+"Custom...": "Prilago\u0111eno...",
+"Custom color": "Prilago\u0111ena boja",
+"No color": "Bez boje",
+"Text color": "Boja teksta",
+"Show blocks": "Prika\u017ei blokove",
+"Show invisible characters": "Prika\u017ei nevidljive znakove",
+"Words: {0}": "Rije\u010di: {0}",
+"Insert": "Umetni",
+"File": "Datoteka",
+"Edit": "Izmijeni",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107",
+"Tools": "Alati",
+"View": "Pogled",
+"Table": "Tablica",
+"Format": "Format",
+"Id": "Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id treba da po\u010dinje sa slovom, i pored slova mogu se koristiti samo brojevi, crtice, ta\u010dke, zarezi ili donje crte.",
+"Insert/Edit code sample": "Ubaci/Izmijeni primjer koda",
+"Language": "Jezik",
+"Image": "Image",
+"Date/time": "Datum/vrijeme",
+"Link": "Link",
+"Paste or type a link": "Zalijepi ili unesi link",
+"Insert/Edit Media": "Ubaci/Izmijeni medij",
+"Media": "Medij",
+"Table of Contents": "Sadr\u017eaj"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ca.js b/core/media/editors/tinymce/langs/ca.js
new file mode 100644
index 00000000..6491aa09
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ca.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('ca',{
+"Cut": "Retalla",
+"Heading 5": "Encap\u00e7alament 5",
+"Header 2": "Cap\u00e7alera 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "El vostre navegador no suporta l'acc\u00e9s directe al portaobjectes. Si us plau, feu servir les dreceres de teclat Ctrl+X\/C\/V.",
+"Heading 4": "Encap\u00e7alament 4",
+"Div": "Div",
+"Heading 2": "Encap\u00e7alament 2",
+"Paste": "Enganxa",
+"Close": "Tanca",
+"Font Family": "Fam\u00edlia de la font",
+"Pre": "Pre",
+"Align right": "Aliniat a la dreta",
+"New document": "Nou document",
+"Blockquote": "Cita",
+"Numbered list": "Llista enumerada",
+"Heading 1": "Encap\u00e7alament 1",
+"Headings": "Encap\u00e7alaments",
+"Increase indent": "Augmentar sagnat",
+"Formats": "Formats",
+"Headers": "Cap\u00e7aleres",
+"Select all": "Seleccionar-ho tot",
+"Header 3": "Cap\u00e7alera 3",
+"Blocks": "Blocs",
+"Undo": "Desfer",
+"Strikethrough": "Ratllat",
+"Bullet list": "Llista no ordenada",
+"Header 1": "Cap\u00e7alera 1",
+"Superscript": "Super\u00edndex",
+"Clear formatting": "Eliminar format",
+"Font Sizes": "Mides de la font",
+"Subscript": "Sub\u00edndex",
+"Header 6": "Cap\u00e7alera 6",
+"Redo": "Refer",
+"Paragraph": "Par\u00e0graf",
+"Ok": "Acceptar",
+"Bold": "Negreta",
+"Code": "Codi",
+"Italic": "Cursiva",
+"Align center": "Centrat",
+"Header 5": "Cap\u00e7alera 5",
+"Heading 6": "Encap\u00e7alament 6",
+"Heading 3": "Encap\u00e7alament 3",
+"Decrease indent": "Disminuir sagnat",
+"Header 4": "Cap\u00e7alera 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Enganxar ara est\u00e0 en mode text pla. Els continguts s'enganxaran com a text pla fins que desactivis aquesta opci\u00f3. ",
+"Underline": "Subratllat",
+"Cancel": "Cancel\u00b7la",
+"Justify": "Justificat",
+"Inline": "En l\u00ednia",
+"Copy": "Copia",
+"Align left": "Aliniat a l'esquerra",
+"Visual aids": "Assist\u00e8ncia visual",
+"Lower Greek": "Grec menor",
+"Square": "Quadrat",
+"Default": "Per defecte",
+"Lower Alpha": "Alfa menor",
+"Circle": "Cercle",
+"Disc": "Disc",
+"Upper Alpha": "Alfa major",
+"Upper Roman": "Roman major",
+"Lower Roman": "Roman menor",
+"Name": "Nom",
+"Anchor": "\u00c0ncora",
+"You have unsaved changes are you sure you want to navigate away?": "Teniu canvis sense desar, esteu segur que voleu deixar-ho ara?",
+"Restore last draft": "Restaurar l'\u00faltim esborrany",
+"Special character": "Car\u00e0cter especial",
+"Source code": "Codi font",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Color",
+"Right to left": "De dreta a esquerra",
+"Left to right": "D'esquerra a dreta",
+"Emoticons": "Emoticones",
+"Robots": "Robots",
+"Document properties": "Propietats del document",
+"Title": "T\u00edtol",
+"Keywords": "Paraules clau",
+"Encoding": "Codificaci\u00f3",
+"Description": "Descripci\u00f3",
+"Author": "Autor",
+"Fullscreen": "Pantalla completa",
+"Horizontal line": "L\u00ednia horitzontal",
+"Horizontal space": "Espai horitzontal",
+"Insert\/edit image": "Inserir\/editar imatge",
+"General": "General",
+"Advanced": "Avan\u00e7at",
+"Source": "Font",
+"Border": "Vora",
+"Constrain proportions": "Mantenir proporcions",
+"Vertical space": "Espai vertical",
+"Image description": "Descripci\u00f3 de la imatge",
+"Style": "Estil",
+"Dimensions": "Dimensions",
+"Insert image": "Inserir imatge",
+"Zoom in": "Ampliar",
+"Contrast": "Contrast",
+"Back": "Tornar",
+"Gamma": "Gamma",
+"Flip horizontally": "Capgirar horitzontalment",
+"Resize": "Canviar mida",
+"Sharpen": "Remarcar vores",
+"Zoom out": "Empetitir",
+"Image options": "Opcions d'imatge",
+"Apply": "Aplicar",
+"Brightness": "Brillantor",
+"Rotate clockwise": "Girar a la dreta",
+"Rotate counterclockwise": "Girar a l'esquerra",
+"Edit image": "Editar imatge",
+"Color levels": "Nivells de color",
+"Crop": "Escap\u00e7ar",
+"Orientation": "Orientaci\u00f3",
+"Flip vertically": "Capgirar verticalment",
+"Invert": "Invertir",
+"Insert date\/time": "Inserir data\/hora",
+"Remove link": "Treure enlla\u00e7",
+"Url": "URL",
+"Text to display": "Text per mostrar",
+"Anchors": "\u00c0ncores",
+"Insert link": "Inserir enlla\u00e7",
+"New window": "Finestra nova",
+"None": "Cap",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que has escrit sembla un enlla\u00e7 extern. Vols afegir-li el prefix obligatori http:\/\/ ?",
+"Target": "Dest\u00ed",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que has escrit sembla una adre\u00e7a de correu electr\u00f2nic. Vols afegir-li el prefix obligatori mailto: ?",
+"Insert\/edit link": "Inserir\/editar enlla\u00e7",
+"Insert\/edit video": "Inserir\/editar v\u00eddeo",
+"Poster": "P\u00f3ster",
+"Alternative source": "Font alternativa",
+"Paste your embed code below:": "Enganxau el codi a sota:",
+"Insert video": "Inserir v\u00eddeo",
+"Embed": "Incloure",
+"Nonbreaking space": "Espai fixe",
+"Page break": "Salt de p\u00e0gina",
+"Paste as text": "Enganxar com a text",
+"Preview": "Previsualitzaci\u00f3",
+"Print": "Imprimir",
+"Save": "Desa",
+"Could not find the specified string.": "No es pot trobar el text especificat.",
+"Replace": "Rempla\u00e7ar",
+"Next": "Seg\u00fcent",
+"Whole words": "Paraules senceres",
+"Find and replace": "Buscar i rempla\u00e7ar",
+"Replace with": "Rempla\u00e7ar amb",
+"Find": "Buscar",
+"Replace all": "Rempla\u00e7ar-ho tot",
+"Match case": "Coincidir maj\u00fascules",
+"Prev": "Anterior",
+"Spellcheck": "Comprovar ortrografia",
+"Finish": "Finalitzar",
+"Ignore all": "Ignorar tots",
+"Ignore": "Ignorar",
+"Add to Dictionary": "Afegir al diccionari",
+"Insert row before": "Inserir fila a sobre",
+"Rows": "Files",
+"Height": "Al\u00e7ada",
+"Paste row after": "Enganxar fila a sota",
+"Alignment": "Aliniament",
+"Border color": "Color de vora",
+"Column group": "Grup de columna",
+"Row": "Fila",
+"Insert column before": "Inserir columna abans",
+"Split cell": "Dividir cel\u00b7les",
+"Cell padding": "Marge intern",
+"Cell spacing": "Espai entre cel\u00b7les",
+"Row type": "Tipus de fila",
+"Insert table": "Inserir taula",
+"Body": "Cos",
+"Caption": "Encap\u00e7alament",
+"Footer": "Peu",
+"Delete row": "Esborrar fila",
+"Paste row before": "Enganxar fila a sobre",
+"Scope": "\u00c0mbit",
+"Delete table": "Esborrar taula",
+"H Align": "Al\u00edniament H",
+"Top": "Superior",
+"Header cell": "Cel\u00b7la de cap\u00e7alera",
+"Column": "Columna",
+"Row group": "Grup de fila",
+"Cell": "Cel\u00b7la",
+"Middle": "Mitj\u00e0",
+"Cell type": "Tipus de cel\u00b7la",
+"Copy row": "Copiar fila",
+"Row properties": "Propietats de fila",
+"Table properties": "Propietats de taula",
+"Bottom": "Inferior",
+"V Align": "Al\u00edniament V",
+"Header": "Cap\u00e7alera",
+"Right": "A la dreta",
+"Insert column after": "Inserir columna despr\u00e9s",
+"Cols": "Cols",
+"Insert row after": "Inserir fila a sota",
+"Width": "Amplada",
+"Cell properties": "Propietats de cel\u00b7la",
+"Left": "A l'esquerra",
+"Cut row": "Retallar fila",
+"Delete column": "Esborrar columna",
+"Center": "Centrat",
+"Merge cells": "Fusionar cel\u00b7les",
+"Insert template": "Inserir plantilla",
+"Templates": "Plantilles",
+"Background color": "Color del fons",
+"Custom...": "Personalitzar...",
+"Custom color": "Personalitzar el color",
+"No color": "Sense color",
+"Text color": "Color del text",
+"Show blocks": "Mostrar blocs",
+"Show invisible characters": "Mostrar car\u00e0cters invisibles",
+"Words: {0}": "Paraules: {0}",
+"Insert": "Inserir",
+"File": "Arxiu",
+"Edit": "Edici\u00f3",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c0rea de text amb format. Premeu ALT-F9 per mostrar el men\u00fa, ALT F10 per la barra d'eines i ALT-0 per ajuda.",
+"Tools": "Eines",
+"View": "Veure",
+"Table": "Taula",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/cs.js b/core/media/editors/tinymce/langs/cs.js
new file mode 100644
index 00000000..1bd64cee
--- /dev/null
+++ b/core/media/editors/tinymce/langs/cs.js
@@ -0,0 +1,196 @@
+tinymce.addI18n('cs',{
+"Cut": "Vyjmout",
+"Heading 5": "Nadpis 5",
+"Header 2": "Nadpis 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prohl\u00ed\u017ee\u010d nepodporuje p\u0159\u00edm\u00fd p\u0159\u00edstup do schr\u00e1nky. Pou\u017eijte pros\u00edm kl\u00e1vesov\u00e9 zkratky Ctrl+X\/C\/V.",
+"Heading 4": "Nadpis 4",
+"Div": "Div (blok)",
+"Heading 2": "Nadpis 2",
+"Paste": "Vlo\u017eit",
+"Close": "Zav\u0159\u00edt",
+"Font Family": "Typ p\u00edsma",
+"Pre": "Pre (p\u0159edform\u00e1tov\u00e1no)",
+"Align right": "Zarovnat vpravo",
+"New document": "Nov\u00fd dokument",
+"Blockquote": "Citace",
+"Numbered list": "\u010c\u00edslov\u00e1n\u00ed",
+"Heading 1": "Nadpis 1",
+"Headings": "Nadpisy",
+"Increase indent": "Zv\u011bt\u0161it odsazen\u00ed",
+"Formats": "Form\u00e1ty",
+"Headers": "Nadpisy",
+"Select all": "Vybrat v\u0161e",
+"Header 3": "Nadpis 3",
+"Blocks": "Blokov\u00e9 zobrazen\u00ed (block)",
+"Undo": "Zp\u011bt",
+"Strikethrough": "P\u0159e\u0161rktnut\u00e9",
+"Bullet list": "Odr\u00e1\u017eky",
+"Header 1": "Nadpis 1",
+"Superscript": "Horn\u00ed index",
+"Clear formatting": "Vymazat form\u00e1tov\u00e1n\u00ed",
+"Font Sizes": "Velikost p\u00edsma",
+"Subscript": "Doln\u00ed index",
+"Header 6": "Nadpis 6",
+"Redo": "Znovu",
+"Paragraph": "Odstavec",
+"Ok": "OK",
+"Bold": "Tu\u010dn\u00e9",
+"Code": "Code (k\u00f3d)",
+"Italic": "Kurz\u00edva",
+"Align center": "Zarovnat na st\u0159ed",
+"Header 5": "Nadpis 5",
+"Heading 6": "Nadpis 6",
+"Heading 3": "Nadpis 3",
+"Decrease indent": "Zmen\u0161it odsazen\u00ed",
+"Header 4": "Nadpis 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Je zapnuto vkl\u00e1d\u00e1n\u00ed \u010dist\u00e9ho textu. Dokud nebude tato volba vypnuta, bude ve\u0161ker\u00fd obsah vlo\u017een jako \u010dist\u00fd text.",
+"Underline": "Podtr\u017een\u00e9",
+"Cancel": "Zru\u0161it",
+"Justify": "Zarovnat do bloku",
+"Inline": "\u0158\u00e1dkov\u00e9 zobrazen\u00ed (inline)",
+"Copy": "Kop\u00edrovat",
+"Align left": "Zarovnat vlevo",
+"Visual aids": "Vizu\u00e1ln\u00ed pom\u016fcky",
+"Lower Greek": "Mal\u00e9 p\u00edsmenkov\u00e1n\u00ed",
+"Square": "\u010ctvere\u010dek",
+"Default": "V\u00fdchoz\u00ed",
+"Lower Alpha": "Norm\u00e1ln\u00ed \u010d\u00edslov\u00e1n\u00ed",
+"Circle": "Kole\u010dko",
+"Disc": "Punt\u00edk",
+"Upper Alpha": "velk\u00e9 p\u00edsmenkov\u00e1n\u00ed",
+"Upper Roman": "\u0158\u00edmsk\u00e9 \u010d\u00edslice",
+"Lower Roman": "Mal\u00e9 \u0159\u00edmsk\u00e9 \u010d\u00edslice",
+"Name": "N\u00e1zev",
+"Anchor": "Kotva",
+"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zm\u011bny. Opravdu chcete opustit str\u00e1nku?",
+"Restore last draft": "Obnovit posledn\u00ed koncept",
+"Special character": "Speci\u00e1ln\u00ed znak",
+"Source code": "Zdrojov\u00fd k\u00f3d",
+"Color": "Barva",
+"Right to left": "Zprava doleva",
+"Left to right": "Zleva doprava",
+"Emoticons": "Emotikony",
+"Robots": "Roboti",
+"Document properties": "Vlastnosti dokumentu",
+"Title": "Titulek",
+"Keywords": "Kl\u00ed\u010dov\u00e1 slova",
+"Encoding": "K\u00f3dov\u00e1n\u00ed",
+"Description": "Popis",
+"Author": "Autor",
+"Fullscreen": "Na celou obrazovku",
+"Horizontal line": "Vodorovn\u00e1 \u010d\u00e1ra",
+"Horizontal space": "Horizont\u00e1ln\u00ed mezera",
+"Insert\/edit image": "Vlo\u017eit \/ upravit obr\u00e1zek",
+"General": "Obecn\u00e9",
+"Advanced": "Pokro\u010dil\u00e9",
+"Source": "Url",
+"Border": "R\u00e1me\u010dek",
+"Constrain proportions": "Zachovat proporce",
+"Vertical space": "Vertik\u00e1ln\u00ed mezera",
+"Image description": "Popis obr\u00e1zku",
+"Style": "Styl",
+"Dimensions": "Rozm\u011bry",
+"Insert image": "Vlo\u017eit obr\u00e1zek",
+"Insert date\/time": "Vlo\u017eit datum \/ \u010das",
+"Remove link": "Odstranit odkaz",
+"Url": "Odkaz",
+"Text to display": "Text k zobrazen\u00ed",
+"Anchors": "Kotvy",
+"Insert link": "Vlo\u017eit odkaz",
+"New window": "Nov\u00e9 okno",
+"None": "\u017d\u00e1dn\u00e9",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix http:\/\/?",
+"Target": "C\u00edl",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Zadan\u00e9 URL vypad\u00e1 jako e-mailov\u00e1 adresa. Chcete doplnit povinn\u00fd prefix mailto:?",
+"Insert\/edit link": "Vlo\u017eit \/ upravit odkaz",
+"Insert\/edit video": "Vlo\u017eit \/ upravit video",
+"Poster": "N\u00e1hled",
+"Alternative source": "Alternativn\u00ed zdroj",
+"Paste your embed code below:": "Vlo\u017ete k\u00f3d pro vlo\u017een\u00ed n\u00ed\u017ee:",
+"Insert video": "Vlo\u017eit video",
+"Embed": "Vlo\u017eit",
+"Nonbreaking space": "Pevn\u00e1 mezera",
+"Page break": "Konec str\u00e1nky",
+"Paste as text": "Vlo\u017eit jako \u010dist\u00fd text",
+"Preview": "N\u00e1hled",
+"Print": "Tisk",
+"Save": "Ulo\u017eit",
+"Could not find the specified string.": "Zadan\u00fd \u0159et\u011bzec nebyl nalezen.",
+"Replace": "Nahradit",
+"Next": "Dal\u0161\u00ed",
+"Whole words": "Pouze cel\u00e1 slova",
+"Find and replace": "Naj\u00edt a nahradit",
+"Replace with": "Nahradit za",
+"Find": "Naj\u00edt",
+"Replace all": "Nahradit v\u0161e",
+"Match case": "Rozli\u0161ovat mal\u00e1 a velk\u00e1 p\u00edsmena",
+"Prev": "P\u0159edchoz\u00ed",
+"Spellcheck": "Kontrola pravopisu",
+"Finish": "Ukon\u010dit",
+"Ignore all": "Ignorovat v\u0161e",
+"Ignore": "Ignorovat",
+"Add to Dictionary": "P\u0159idat do slovn\u00edku",
+"Insert row before": "Vlo\u017eit \u0159\u00e1dek nad",
+"Rows": "\u0158\u00e1dek",
+"Height": "V\u00fd\u0161ka",
+"Paste row after": "Vlo\u017eit \u0159\u00e1dek pod",
+"Alignment": "Zarovn\u00e1n\u00ed",
+"Column group": "Skupina sloupc\u016f",
+"Row": "\u0158\u00e1dek",
+"Insert column before": "Vlo\u017eit sloupec vlevo",
+"Split cell": "Rozd\u011blit bu\u0148ky",
+"Cell padding": "Vnit\u0159n\u00ed okraj bun\u011bk",
+"Cell spacing": "Vn\u011bj\u0161\u00ed okraj bun\u011bk",
+"Row type": "Typ \u0159\u00e1dku",
+"Insert table": "Vlo\u017eit tabulku",
+"Body": "T\u011blo",
+"Caption": "Nadpis",
+"Footer": "Pati\u010dka",
+"Delete row": "Smazat \u0159\u00e1dek",
+"Paste row before": "Vlo\u017eit \u0159\u00e1dek nad",
+"Scope": "Rozsah",
+"Delete table": "Smazat tabulku",
+"H Align": "Horizont\u00e1ln\u00ed zarovn\u00e1n\u00ed",
+"Top": "Nahoru",
+"Header cell": "Hlavi\u010dkov\u00e1 bu\u0148ka",
+"Column": "Sloupec",
+"Row group": "Skupina \u0159\u00e1dk\u016f",
+"Cell": "Bu\u0148ka",
+"Middle": "Uprost\u0159ed",
+"Cell type": "Typ bu\u0148ky",
+"Copy row": "Kop\u00edrovat \u0159\u00e1dek",
+"Row properties": "Vlastnosti \u0159\u00e1dku",
+"Table properties": "Vlastnosti tabulky",
+"Bottom": "Dol\u016f",
+"V Align": "Vertik\u00e1ln\u00ed zarovn\u00e1n\u00ed",
+"Header": "Hlavi\u010dka",
+"Right": "Vpravo",
+"Insert column after": "Vlo\u017eit sloupec vpravo",
+"Cols": "Sloupc\u016f",
+"Insert row after": "Vlo\u017eit \u0159\u00e1dek pod",
+"Width": "\u0160\u00ed\u0159ka",
+"Cell properties": "Vlastnosti bu\u0148ky",
+"Left": "Vlevo",
+"Cut row": "Vyjmout \u0159\u00e1dek",
+"Delete column": "Smazat sloupec",
+"Center": "Na st\u0159ed",
+"Merge cells": "Slou\u010dit bu\u0148ky",
+"Insert template": "Vlo\u017eit \u0161ablonu",
+"Templates": "\u0160ablony",
+"Background color": "Barva pozad\u00ed",
+"Custom...": "Vlastn\u00ed...",
+"Custom color": "Vlastn\u00ed barva",
+"No color": "Bez barvy",
+"Text color": "Barva p\u00edsma",
+"Show blocks": "Uk\u00e1zat bloky",
+"Show invisible characters": "Zobrazit speci\u00e1ln\u00ed znaky",
+"Words: {0}": "Po\u010det slov: {0}",
+"Insert": "Vlo\u017eit",
+"File": "Soubor",
+"Edit": "\u00dapravy",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Editor. Stiskn\u011bte ALT-F9 pro menu, ALT-F10 pro n\u00e1strojovou li\u0161tu a ALT-0 pro n\u00e1pov\u011bdu.",
+"Tools": "N\u00e1stroje",
+"View": "Zobrazit",
+"Table": "Tabulka",
+"Format": "Form\u00e1t"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/cy.js b/core/media/editors/tinymce/langs/cy.js
new file mode 100644
index 00000000..d2fdd077
--- /dev/null
+++ b/core/media/editors/tinymce/langs/cy.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('cy',{
+"Cut": "Torri",
+"Heading 5": "Pennawd 5",
+"Header 2": "Pennawd 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Dyw eich porwr ddim yn cynnal mynediad uniongyrchol i'r clipfwrdd. Yn hytrach defnyddiwch y bysellau llwybrau byr Ctrl+X\/C\/V.",
+"Heading 4": "Pennawd 4",
+"Div": "Div",
+"Heading 2": "Pennawd 2",
+"Paste": "Gludo",
+"Close": "Cau",
+"Font Family": "Teulu Ffont",
+"Pre": "Pre",
+"Align right": "Aliniad de",
+"New document": "Dogfen newydd",
+"Blockquote": "Dyfyniad bloc",
+"Numbered list": "Rhestr rifol",
+"Heading 1": "Pennawd 1",
+"Headings": "Penawdau",
+"Increase indent": "Cynyddu mewnoliad",
+"Formats": "Fformatau",
+"Headers": "Penawdau",
+"Select all": "Dewis popeth",
+"Header 3": "Pennawd 3",
+"Blocks": "Blociau",
+"Undo": "Dadwneud",
+"Strikethrough": "Llinell drwodd",
+"Bullet list": "Rhestr fwled",
+"Header 1": "Pennawd 1",
+"Superscript": "Uwchsgript",
+"Clear formatting": "Clirio pob fformat",
+"Font Sizes": "Meintiau Ffont",
+"Subscript": "Is-sgript",
+"Header 6": "Pennawd 6",
+"Redo": "Ailwneud",
+"Paragraph": "Paragraff",
+"Ok": "Iawn",
+"Bold": "Bras",
+"Code": "Cod",
+"Italic": "Italig",
+"Align center": "Aliniad canol",
+"Header 5": "Pennawd 5",
+"Heading 6": "Pennawd 6",
+"Heading 3": "Pennawd 3",
+"Decrease indent": "Lleihau mewnoliad",
+"Header 4": "Pennawd 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Mae gludo nawr yn gweithio yn y modd testun plaen.  Caiff testun plaen ei ludo nawr tan gaiff yr opsiwn ei doglo i'w ddiffodd.",
+"Underline": "Tanlinellu",
+"Cancel": "Canslo",
+"Justify": "Unioni",
+"Inline": "Mewnlin",
+"Copy": "Cop\u00efo",
+"Align left": "Aliniad chwith",
+"Visual aids": "Cymorth gweledol",
+"Lower Greek": "Groeg Is",
+"Square": "Sgw\u00e2r",
+"Default": "Diofyn",
+"Lower Alpha": "Alffa Is",
+"Circle": "Cylch",
+"Disc": "Disg",
+"Upper Alpha": "Alffa Uwch",
+"Upper Roman": "Rhufeinig Uwch",
+"Lower Roman": "Rhufeinig Is",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Dylai Id gychwyn gyda llythyren ac yna dim ond llythrennau, rhifau, llinellau toriad,dotiau, colonau neu danlinellau.",
+"Name": "Enw",
+"Anchor": "Angor",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Mae newidiadau heb eu cadw - ydych chi wir am symud i ffwrdd?",
+"Restore last draft": "Adfer y drafft olaf",
+"Special character": "Nod arbennig",
+"Source code": "Cod gwreiddiol",
+"Language": "Iaith",
+"Insert\/Edit code sample": "Mewnosod\/golygu sampl cod",
+"B": "Gl",
+"R": "C",
+"G": "Gw",
+"Color": "Lliw",
+"Right to left": "De i'r chwith",
+"Left to right": "Chwith i'r dde",
+"Emoticons": "Gwenogluniau",
+"Robots": "Robotiaid",
+"Document properties": "Priodweddau'r ddogfen",
+"Title": "Teitl",
+"Keywords": "Allweddeiriau",
+"Encoding": "Amgodiad",
+"Description": "Disgrifiad",
+"Author": "Awdur",
+"Fullscreen": "Sgrin llawn",
+"Horizontal line": "Llinell lorweddol",
+"Horizontal space": "Gofod llorweddol",
+"Insert\/edit image": "Mewnosod\/golygu delwedd",
+"General": "Cyffredinol",
+"Advanced": "Uwch",
+"Source": "Ffynhonnell",
+"Border": "Border",
+"Constrain proportions": "Gorfodi cyfrannedd",
+"Vertical space": "Gofod fertigol",
+"Image description": "Disgrifiad y ddelwedd",
+"Style": "Arddull",
+"Dimensions": "Dimensiynau",
+"Insert image": "Mewnosod delwedd",
+"Image": "Delwedd",
+"Zoom in": "Chwyddo mewn",
+"Contrast": "Cyferbynnedd",
+"Back": "Nol",
+"Gamma": "Gamma",
+"Flip horizontally": "Fflipio llorweddol",
+"Resize": "Ailfeintio",
+"Sharpen": "Hogi",
+"Zoom out": "Chwyddo allan",
+"Image options": "Dewisiadau delwedd",
+"Apply": "Rhoi ar waith",
+"Brightness": "Disgleirdeb",
+"Rotate clockwise": "Troi clocwedd",
+"Rotate counterclockwise": "Troi gwrthgloc",
+"Edit image": "Golygu delwedd",
+"Color levels": "Lefelau Lliw",
+"Crop": "Tocio",
+"Orientation": "Cyfeiriadaeth",
+"Flip vertically": "Fflipio fertigol",
+"Invert": "Gwrthdroi",
+"Date\/time": "Dyddiad\/amser",
+"Insert date\/time": "Mewnosod dyddiad\/amser",
+"Remove link": "Tynnu dolen",
+"Url": "Url",
+"Text to display": "Testun i'w ddangos",
+"Anchors": "Angorau",
+"Insert link": "Mewnosod dolen",
+"Link": "Dolen",
+"New window": "Ffenest newydd",
+"None": "Dim",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Mae'n debyg mai dolen allanol yw'r URL hwn. Ydych chi am ychwanegu'r rhagddodiad http:\/\/ ?",
+"Paste or type a link": "Pastio neu deipio dolen",
+"Target": "Targed",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Mae'n debyg mai cyfeiriad e-bost yw'r URL hwn. Ydych chi am ychwanegu'r rhagddoddiad mailto:?",
+"Insert\/edit link": "Mewnosod\/golygu dolen",
+"Insert\/edit video": "Mewnosod\/golygu fideo",
+"Media": "Cyfrwng",
+"Alternative source": "Ffynhonnell amgen",
+"Paste your embed code below:": "Gludwch eich cod mewnosod isod:",
+"Insert video": "Mewnosod fideo",
+"Poster": "Poster",
+"Insert\/edit media": "Mewnosod\/golygu cyfrwng",
+"Embed": "Mewnosod",
+"Nonbreaking space": "Bwlch heb dorri",
+"Page break": "Toriad tudalen",
+"Paste as text": "Gludo fel testun",
+"Preview": "Rhagolwg",
+"Print": "Argraffu",
+"Save": "Cadw",
+"Could not find the specified string.": "Methu ffeindio'r llinyn hwnnw.",
+"Replace": "Amnewid",
+"Next": "Nesaf",
+"Whole words": "Geiriau cyfan",
+"Find and replace": "Chwilio ac amnewid",
+"Replace with": "Amnewid gyda",
+"Find": "Chwilio",
+"Replace all": "Amnewid y cwbl",
+"Match case": "Cas yn cyfateb",
+"Prev": "Blaenorol",
+"Spellcheck": "Sillafydd",
+"Finish": "Gorffen",
+"Ignore all": "Amwybyddu pob",
+"Ignore": "Anwybyddu",
+"Add to Dictionary": "Adio i'r Geiriadur",
+"Insert row before": "Mewnosod rhes cyn",
+"Rows": "Rhesi",
+"Height": "Uchder",
+"Paste row after": "Gludo rhes ar \u00f4l",
+"Alignment": "Aliniad",
+"Border color": "Lliw Border",
+"Column group": "Gr\u0175p colofn",
+"Row": "Rhes",
+"Insert column before": "Mewnosod colofn cyn",
+"Split cell": "Hollti celloedd",
+"Cell padding": "Padio celloedd",
+"Cell spacing": "Bylchiad celloedd",
+"Row type": "Math y rhes",
+"Insert table": "Mewnosod tabl",
+"Body": "Corff",
+"Caption": "Pennawd",
+"Footer": "Troedyn",
+"Delete row": "Dileu rhes",
+"Paste row before": "Gludo rhes cyn",
+"Scope": "Cwmpas",
+"Delete table": "Dileu'r tabl",
+"H Align": "Aliniad Ll",
+"Top": "Brig",
+"Header cell": "Cell bennawd",
+"Column": "Colofn",
+"Row group": "Gr\u0175p rhes",
+"Cell": "Cell",
+"Middle": "Canol",
+"Cell type": "Math y gell",
+"Copy row": "Cop\u00efo rhes",
+"Row properties": "Priodweddau rhes",
+"Table properties": "Priodweddau tabl",
+"Bottom": "Gwaelod",
+"V Align": "Aliniad F",
+"Header": "Pennyn",
+"Right": "De",
+"Insert column after": "Mewnosod colofn ar \u00f4l",
+"Cols": "Colofnau",
+"Insert row after": "Mewnosod rhes ar \u00f4l",
+"Width": "Lled",
+"Cell properties": "Priodweddau'r gell",
+"Left": "Chwith",
+"Cut row": "Torri rhes",
+"Delete column": "Dileu colofn",
+"Center": "Canol",
+"Merge cells": "Cyfuno celloedd",
+"Insert template": "Mewnosod templed",
+"Templates": "Templedi",
+"Background color": "Lliw cefndir",
+"Custom...": "Personol...",
+"Custom color": "Lliw personol",
+"No color": "Dim Lliw",
+"Text color": "Lliw testun",
+"Table of Contents": "Tabl Cynnwys",
+"Show blocks": "Dangos blociau",
+"Show invisible characters": "Dangos nodau anweledig",
+"Words: {0}": "Geiriau: {0}",
+"Insert": "Mewnosod",
+"File": "Ffeil",
+"Edit": "Golygu",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ardal Testun Uwch. Pwyswch ALT-F9 ar gyfer y ddewislen, Pwyswch ALT-F10 ar gyfer y bar offer. Pwyswch ALT-0 am gymorth",
+"Tools": "Offer",
+"View": "Dangos",
+"Table": "Tabl",
+"Format": "Fformat"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/da.js b/core/media/editors/tinymce/langs/da.js
new file mode 100644
index 00000000..7637800c
--- /dev/null
+++ b/core/media/editors/tinymce/langs/da.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('da',{
+"Cut": "Klip",
+"Heading 5": "Overskrift 5",
+"Header 2": "Overskrift 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din browser underst\u00f8tter ikke direkte adgang til clipboard. Benyt Ctrl+X\/C\/ keybord shortcuts i stedet for.",
+"Heading 4": "Overskrift 4",
+"Div": "Div",
+"Heading 2": "Overskrift 2",
+"Paste": "Inds\u00e6t",
+"Close": "Luk",
+"Font Family": "Skrifttype",
+"Pre": "Pre",
+"Align right": "H\u00f8jrejusteret",
+"New document": "Nyt dokument",
+"Blockquote": "Indrykning",
+"Numbered list": "Nummerering",
+"Heading 1": "Overskrift 1",
+"Headings": "Overskrifter",
+"Increase indent": "For\u00f8g indrykning",
+"Formats": "Formater",
+"Headers": "Overskrifter",
+"Select all": "V\u00e6lg alle",
+"Header 3": "Overskrift 3",
+"Blocks": "Blokke",
+"Undo": "Fortryd",
+"Strikethrough": "Gennemstreg",
+"Bullet list": "Punkt tegn",
+"Header 1": "Overskrift 1",
+"Superscript": "H\u00e6vet",
+"Clear formatting": "Nulstil formattering",
+"Font Sizes": "Skriftst\u00f8rrelse",
+"Subscript": "S\u00e6nket",
+"Header 6": "Overskrift 6",
+"Redo": "Genopret",
+"Paragraph": "S\u00e6tning",
+"Ok": "Ok",
+"Bold": "Fed",
+"Code": "Code",
+"Italic": "Kursiv",
+"Align center": "Centreret",
+"Header 5": "Overskrift 5",
+"Heading 6": "Overskrift 6",
+"Heading 3": "Overskrift 3",
+"Decrease indent": "Formindsk indrykning",
+"Header 4": "Overskrift 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "S\u00e6t ind er indstillet til at inds\u00e6tte som ren tekst. Indhold bliver nu indsat uden formatering indtil du \u00e6ndrer indstillingen.",
+"Underline": "Understreg",
+"Cancel": "Fortryd",
+"Justify": "Justering",
+"Inline": "Inline",
+"Copy": "Kopier",
+"Align left": "Venstrejusteret",
+"Visual aids": "Visuel hj\u00e6lp",
+"Lower Greek": "Lower Gr\u00e6sk",
+"Square": "Kvadrat",
+"Default": "Standard",
+"Lower Alpha": "Lower Alpha",
+"Circle": "Cirkel",
+"Disc": "Disk",
+"Upper Alpha": "Upper Alpha",
+"Upper Roman": "Upper Roman",
+"Lower Roman": "Lower Roman",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id b\u00f8r starte med et bogstav, efterfulgt af bogstaver, tal, bindestreger, punktummer, koloner eller underscores.",
+"Name": "Navn",
+"Anchor": "Anchor",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Du har ikke gemte \u00e6ndringer. Er du sikker p\u00e5 at du vil forts\u00e6tte?",
+"Restore last draft": "Genopret sidste kladde",
+"Special character": "Specielle tegn",
+"Source code": "Kildekode",
+"Language": "Sprog",
+"Insert\/Edit code sample": "Inds\u00e6t\/Ret kodeeksempel",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Farve",
+"Right to left": "H\u00f8jre til venstre",
+"Left to right": "Venstre til h\u00f8jre",
+"Emoticons": "Emot-ikoner",
+"Robots": "Robotter",
+"Document properties": "Dokument egenskaber",
+"Title": "Titel",
+"Keywords": "S\u00f8geord",
+"Encoding": "Kodning",
+"Description": "Beskrivelse",
+"Author": "Forfatter",
+"Fullscreen": "Fuldsk\u00e6rm",
+"Horizontal line": "Vandret linie",
+"Horizontal space": "Vandret afstand",
+"Insert\/edit image": "Inds\u00e6t\/ret billede",
+"General": "Generet",
+"Advanced": "Avanceret",
+"Source": "Kilde",
+"Border": "Kant",
+"Constrain proportions": "Behold propertioner",
+"Vertical space": "Lodret afstand",
+"Image description": "Billede beskrivelse",
+"Style": "Stil",
+"Dimensions": "Dimensioner",
+"Insert image": "Inds\u00e6t billede",
+"Image": "Billede",
+"Zoom in": "Zoom ind",
+"Contrast": "Kontrast",
+"Back": "Tilbage",
+"Gamma": "Gamma",
+"Flip horizontally": "Flip horisontalt",
+"Resize": "Skaler",
+"Sharpen": "G\u00f8r skarpere",
+"Zoom out": "Zoom ud",
+"Image options": "Billede indstillinger",
+"Apply": "Anvend",
+"Brightness": "Lysstyrke",
+"Rotate clockwise": "Drej med urets retning",
+"Rotate counterclockwise": "Drej modsat urets retning",
+"Edit image": "Rediger billede",
+"Color levels": "Farve niveauer",
+"Crop": "Besk\u00e6r",
+"Orientation": "Retning",
+"Flip vertically": "Flip vertikalt",
+"Invert": "Inverter",
+"Date\/time": "Dato\/klokkeslet",
+"Insert date\/time": "Inds\u00e6t dato\/klokkeslet",
+"Remove link": "Fjern link",
+"Url": "Url",
+"Text to display": "Vis tekst",
+"Anchors": "Ankre",
+"Insert link": "Inds\u00e6t link",
+"Link": "Link",
+"New window": "Nyt vindue",
+"None": "Ingen",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen som du angav ser ud til at v\u00e6re et eksternt link. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks http:\/\/ ?",
+"Paste or type a link": "Inds\u00e6t eller skriv et link",
+"Target": "Target",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen som du angav ser ud til at v\u00e6re en email adresse. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks  mailto: ?",
+"Insert\/edit link": "Inds\u00e6t\/ret link",
+"Insert\/edit video": "Inds\u00e6t\/ret video",
+"Media": "Medier",
+"Alternative source": "Alternativ kilde",
+"Paste your embed code below:": "Inds\u00e6t din embed kode herunder:",
+"Insert video": "Inds\u00e6t video",
+"Poster": "Poster",
+"Insert\/edit media": "Inds\u00e6t\/ret medier",
+"Embed": "Integrer",
+"Nonbreaking space": "H\u00e5rdt mellemrum",
+"Page break": "Sideskift",
+"Paste as text": "Inds\u00e6t som ren tekst",
+"Preview": "Forh\u00e5ndsvisning",
+"Print": "Udskriv",
+"Save": "Gem",
+"Could not find the specified string.": "Kunne ikke finde s\u00f8getekst",
+"Replace": "Erstat",
+"Next": "N\u00e6ste",
+"Whole words": "Hele ord",
+"Find and replace": "Find og erstat",
+"Replace with": "Erstat med",
+"Find": "Find",
+"Replace all": "Erstat alt",
+"Match case": "STORE og sm\u00e5 bogstaver",
+"Prev": "Forrige",
+"Spellcheck": "Stavekontrol",
+"Finish": "F\u00e6rdig",
+"Ignore all": "Ignorer alt",
+"Ignore": "Ignorer",
+"Add to Dictionary": "Tilf\u00f8j til ordbog",
+"Insert row before": "Inds\u00e6t r\u00e6kke f\u00f8r",
+"Rows": "R\u00e6kker",
+"Height": "H\u00f8jde",
+"Paste row after": "Inds\u00e6t r\u00e6kke efter",
+"Alignment": "Tilpasning",
+"Border color": "Kant farve",
+"Column group": "Kolonne gruppe",
+"Row": "R\u00e6kke",
+"Insert column before": "Inds\u00e6t kolonne f\u00f8r",
+"Split cell": "Split celle",
+"Cell padding": "Celle padding",
+"Cell spacing": "Celle afstand",
+"Row type": "R\u00e6kke type",
+"Insert table": "Inds\u00e6t tabel",
+"Body": "Krop",
+"Caption": "Tekst",
+"Footer": "Sidefod",
+"Delete row": "Slet r\u00e6kke",
+"Paste row before": "Inds\u00e6t r\u00e6kke f\u00f8r",
+"Scope": "Anvendelsesomr\u00e5de",
+"Delete table": "Slet tabel",
+"H Align": "H juster",
+"Top": "Top",
+"Header cell": "Sidehoved celle",
+"Column": "Kolonne",
+"Row group": "R\u00e6kke gruppe",
+"Cell": "Celle",
+"Middle": "Midt",
+"Cell type": "Celle type",
+"Copy row": "Kopier r\u00e6kke",
+"Row properties": "R\u00e6kke egenskaber",
+"Table properties": "Tabel egenskaber",
+"Bottom": "Bund",
+"V Align": "V juster",
+"Header": "Sidehoved",
+"Right": "H\u00f8jre",
+"Insert column after": "Inds\u00e6t kolonne efter",
+"Cols": "Kolonne",
+"Insert row after": "Inds\u00e6t r\u00e6kke efter",
+"Width": "Bredde",
+"Cell properties": "Celle egenskaber",
+"Left": "Venstre",
+"Cut row": "Klip r\u00e6kke",
+"Delete column": "Slet kolonne",
+"Center": "Centrering",
+"Merge cells": "Flet celler",
+"Insert template": "Inds\u00e6t skabelon",
+"Templates": "Skabeloner",
+"Background color": "Baggrunds farve",
+"Custom...": "Brugerdefineret...",
+"Custom color": "Brugerdefineret farve",
+"No color": "Ingen farve",
+"Text color": "Tekst farve",
+"Table of Contents": "Indholdsfortegnelse",
+"Show blocks": "Vis klokke",
+"Show invisible characters": "Vis usynlige tegn",
+"Words: {0}": "Ord: {0}",
+"Insert": "Inds\u00e6t",
+"File": "Fil",
+"Edit": "Rediger",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text omr\u00e5de. Tryk ALT-F9 for menu. Tryk ALT-F10 for toolbar. Tryk ALT-0 for hj\u00e6lp",
+"Tools": "V\u00e6rkt\u00f8j",
+"View": "Vis",
+"Table": "Tabel",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/de.js b/core/media/editors/tinymce/langs/de.js
new file mode 100644
index 00000000..cf185893
--- /dev/null
+++ b/core/media/editors/tinymce/langs/de.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('de',{
+"Cut": "Ausschneiden",
+"Heading 5": "\u00dcberschrift 5",
+"Header 2": "\u00dcberschrift 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Ihr Browser unterst\u00fctzt leider keinen direkten Zugriff auf die Zwischenablage. Bitte benutzen Sie die Strg + X \/ C \/ V Tastenkombinationen.",
+"Heading 4": "\u00dcberschrift 4",
+"Div": "Textblock",
+"Heading 2": "\u00dcberschrift 2",
+"Paste": "Einf\u00fcgen",
+"Close": "Schlie\u00dfen",
+"Font Family": "Schriftart",
+"Pre": "Vorformatierter Text",
+"Align right": "Rechtsb\u00fcndig ausrichten",
+"New document": "Neues Dokument",
+"Blockquote": "Zitat",
+"Numbered list": "Nummerierte Liste",
+"Heading 1": "\u00dcberschrift 1",
+"Headings": "\u00dcberschriften",
+"Increase indent": "Einzug vergr\u00f6\u00dfern",
+"Formats": "Formate",
+"Headers": "\u00dcberschriften",
+"Select all": "Alles ausw\u00e4hlen",
+"Header 3": "\u00dcberschrift 3",
+"Blocks": "Absatzformate",
+"Undo": "R\u00fcckg\u00e4ngig",
+"Strikethrough": "Durchgestrichen",
+"Bullet list": "Aufz\u00e4hlung",
+"Header 1": "\u00dcberschrift 1",
+"Superscript": "Hochgestellt",
+"Clear formatting": "Formatierung entfernen",
+"Font Sizes": "Schriftgr\u00f6\u00dfe",
+"Subscript": "Tiefgestellt",
+"Header 6": "\u00dcberschrift 6",
+"Redo": "Wiederholen",
+"Paragraph": "Absatz",
+"Ok": "Ok",
+"Bold": "Fett",
+"Code": "Quelltext",
+"Italic": "Kursiv",
+"Align center": "Zentriert ausrichten",
+"Header 5": "\u00dcberschrift 5",
+"Heading 6": "\u00dcberschrift 6",
+"Heading 3": "\u00dcberschrift 3",
+"Decrease indent": "Einzug verkleinern",
+"Header 4": "\u00dcberschrift 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Einf\u00fcgen ist nun im einfachen Textmodus. Inhalte werden ab jetzt als unformatierter Text eingef\u00fcgt, bis Sie diese Einstellung wieder ausschalten!",
+"Underline": "Unterstrichen",
+"Cancel": "Abbrechen",
+"Justify": "Blocksatz",
+"Inline": "Zeichenformate",
+"Copy": "Kopieren",
+"Align left": "Linksb\u00fcndig ausrichten",
+"Visual aids": "Visuelle Hilfen",
+"Lower Greek": "Griechische Kleinbuchstaben",
+"Square": "Quadrat",
+"Default": "Standard",
+"Lower Alpha": "Kleinbuchstaben",
+"Circle": "Kreis",
+"Disc": "Punkt",
+"Upper Alpha": "Gro\u00dfbuchstaben",
+"Upper Roman": "R\u00f6mische Zahlen (Gro\u00dfbuchstaben)",
+"Lower Roman": "R\u00f6mische Zahlen (Kleinbuchstaben)",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Die Kennung sollte mit einem Buchstaben anfangen. Nachfolgend nur Buchstaben, Zahlen, Striche (Minus), Punkte, Kommas und Unterstriche.",
+"Name": "Name",
+"Anchor": "Textmarke",
+"Id": "Kennung",
+"You have unsaved changes are you sure you want to navigate away?": "Die \u00c4nderungen wurden noch nicht gespeichert, sind Sie sicher, dass Sie diese Seite verlassen wollen?",
+"Restore last draft": "Letzten Entwurf wiederherstellen",
+"Special character": "Sonderzeichen",
+"Source code": "Quelltext",
+"Language": "Sprache",
+"Insert\/Edit code sample": "Codebeispiel einf\u00fcgen\/bearbeiten",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Farbe",
+"Right to left": "Von rechts nach links",
+"Left to right": "Von links nach rechts",
+"Emoticons": "Emoticons",
+"Robots": "Robots",
+"Document properties": "Dokumenteigenschaften",
+"Title": "Titel",
+"Keywords": "Sch\u00fcsselw\u00f6rter",
+"Encoding": "Zeichenkodierung",
+"Description": "Beschreibung",
+"Author": "Verfasser",
+"Fullscreen": "Vollbild",
+"Horizontal line": "Horizontale Linie",
+"Horizontal space": "Horizontaler Abstand",
+"Insert\/edit image": "Bild einf\u00fcgen\/bearbeiten",
+"General": "Allgemein",
+"Advanced": "Erweitert",
+"Source": "Quelle",
+"Border": "Rahmen",
+"Constrain proportions": "Seitenverh\u00e4ltnis beibehalten",
+"Vertical space": "Vertikaler Abstand",
+"Image description": "Bildbeschreibung",
+"Style": "Stil",
+"Dimensions": "Abmessungen",
+"Insert image": "Bild einf\u00fcgen",
+"Image": "Bild",
+"Zoom in": "Ansicht vergr\u00f6\u00dfern",
+"Contrast": "Kontrast",
+"Back": "Zur\u00fcck",
+"Gamma": "Gamma",
+"Flip horizontally": "Horizontal spiegeln",
+"Resize": "Skalieren",
+"Sharpen": "Sch\u00e4rfen",
+"Zoom out": "Ansicht verkleinern",
+"Image options": "Bildeigenschaften",
+"Apply": "Anwenden",
+"Brightness": "Helligkeit",
+"Rotate clockwise": "Im Uhrzeigersinn drehen",
+"Rotate counterclockwise": "Gegen den Uhrzeigersinn drehen",
+"Edit image": "Bild bearbeiten",
+"Color levels": "Farbwerte",
+"Crop": "Bescheiden",
+"Orientation": "Ausrichtung",
+"Flip vertically": "Vertikal spiegeln",
+"Invert": "Invertieren",
+"Date\/time": "Datum\/Uhrzeit",
+"Insert date\/time": "Datum\/Uhrzeit einf\u00fcgen ",
+"Remove link": "Link entfernen",
+"Url": "URL",
+"Text to display": "Anzuzeigender Text",
+"Anchors": "Textmarken",
+"Insert link": "Link einf\u00fcgen",
+"Link": "Link",
+"New window": "Neues Fenster",
+"None": "Keine",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Diese Adresse scheint ein externer Link zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"http:\/\/\" voranstellen?",
+"Paste or type a link": "Link einf\u00fcgen oder eintippen",
+"Target": "Ziel",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Diese Adresse scheint eine E-Mail-Adresse zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"mailto:\" voranstellen?",
+"Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
+"Insert\/edit video": "Video einf\u00fcgen\/bearbeiten",
+"Media": "Medium",
+"Alternative source": "Alternative Quelle",
+"Paste your embed code below:": "F\u00fcgen Sie Ihren Einbettungscode hier ein:",
+"Insert video": "Video einf\u00fcgen",
+"Poster": "Poster",
+"Insert\/edit media": "Medien einf\u00fcgen\/bearbeiten",
+"Embed": "Einbetten",
+"Nonbreaking space": "Gesch\u00fctztes Leerzeichen",
+"Page break": "Seitenumbruch",
+"Paste as text": "Als Text einf\u00fcgen",
+"Preview": "Vorschau",
+"Print": "Drucken",
+"Save": "Speichern",
+"Could not find the specified string.": "Die Zeichenfolge wurde nicht gefunden.",
+"Replace": "Ersetzen",
+"Next": "Weiter",
+"Whole words": "Nur ganze W\u00f6rter",
+"Find and replace": "Suchen und ersetzen",
+"Replace with": "Ersetzen durch",
+"Find": "Suchen",
+"Replace all": "Alles ersetzen",
+"Match case": "Gro\u00df-\/Kleinschreibung beachten",
+"Prev": "Zur\u00fcck",
+"Spellcheck": "Rechtschreibpr\u00fcfung",
+"Finish": "Ende",
+"Ignore all": "Alles Ignorieren",
+"Ignore": "Ignorieren",
+"Add to Dictionary": "Zum W\u00f6rterbuch hinzuf\u00fcgen",
+"Insert row before": "Neue Zeile davor einf\u00fcgen ",
+"Rows": "Zeilen",
+"Height": "H\u00f6he",
+"Paste row after": "Zeile danach einf\u00fcgen",
+"Alignment": "Ausrichtung",
+"Border color": "Rahmenfarbe",
+"Column group": "Spaltengruppe",
+"Row": "Zeile",
+"Insert column before": "Neue Spalte davor einf\u00fcgen",
+"Split cell": "Zelle aufteilen",
+"Cell padding": "Zelleninnenabstand",
+"Cell spacing": "Zellenabstand",
+"Row type": "Zeilentyp",
+"Insert table": "Tabelle einf\u00fcgen",
+"Body": "Inhalt",
+"Caption": "Beschriftung",
+"Footer": "Fu\u00dfzeile",
+"Delete row": "Zeile l\u00f6schen",
+"Paste row before": "Zeile davor einf\u00fcgen",
+"Scope": "G\u00fcltigkeitsbereich",
+"Delete table": "Tabelle l\u00f6schen",
+"H Align": "Horizontale Ausrichtung",
+"Top": "Oben",
+"Header cell": "Kopfzelle",
+"Column": "Spalte",
+"Row group": "Zeilengruppe",
+"Cell": "Zelle",
+"Middle": "Mitte",
+"Cell type": "Zellentyp",
+"Copy row": "Zeile kopieren",
+"Row properties": "Zeileneigenschaften",
+"Table properties": "Tabelleneigenschaften",
+"Bottom": "Unten",
+"V Align": "Vertikale Ausrichtung",
+"Header": "Kopfzeile",
+"Right": "Rechtsb\u00fcndig",
+"Insert column after": "Neue Spalte danach einf\u00fcgen",
+"Cols": "Spalten",
+"Insert row after": "Neue Zeile danach einf\u00fcgen",
+"Width": "Breite",
+"Cell properties": "Zelleneigenschaften",
+"Left": "Linksb\u00fcndig",
+"Cut row": "Zeile ausschneiden",
+"Delete column": "Spalte l\u00f6schen",
+"Center": "Zentriert",
+"Merge cells": "Zellen verbinden",
+"Insert template": "Vorlage einf\u00fcgen ",
+"Templates": "Vorlagen",
+"Background color": "Hintergrundfarbe",
+"Custom...": "Benutzerdefiniert...",
+"Custom color": "Benutzerdefinierte Farbe",
+"No color": "Keine Farbe",
+"Text color": "Textfarbe",
+"Table of Contents": "Inhaltsverzeichnis",
+"Show blocks": "Bl\u00f6cke anzeigen",
+"Show invisible characters": "Unsichtbare Zeichen anzeigen",
+"Words: {0}": "W\u00f6rter: {0}",
+"Insert": "Einf\u00fcgen",
+"File": "Datei",
+"Edit": "Bearbeiten",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich-Text- Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr Symbolleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe",
+"Tools": "Werkzeuge",
+"View": "Ansicht",
+"Table": "Tabelle",
+"Format": "Format"
+});
diff --git a/core/media/editors/tinymce/langs/el.js b/core/media/editors/tinymce/langs/el.js
new file mode 100644
index 00000000..9e74da4d
--- /dev/null
+++ b/core/media/editors/tinymce/langs/el.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('el',{
+"Cut": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae",
+"Header 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u039f \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9 \u03ac\u03bc\u03b5\u03c3\u03b7 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c7\u03b5\u03b9\u03c1\u03bf. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03af\u03bf\u03c5 Ctrl+X\/C\/V.",
+"Div": "Div",
+"Paste": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7",
+"Close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
+"Font Family": "\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac",
+"Pre": "Pre",
+"Align right": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b4\u03b5\u03be\u03b9\u03ac",
+"New document": "\u039d\u03ad\u03bf \u03ad\u03b3\u03b3\u03c1\u03b1\u03c6\u03bf",
+"Blockquote": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2",
+"Numbered list": "\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1",
+"Increase indent": "\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
+"Formats": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Headers": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
+"Select all": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd",
+"Header 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
+"Blocks": "\u03a4\u03bc\u03ae\u03bc\u03b1\u03c4\u03b1",
+"Undo": "\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7",
+"Strikethrough": "\u0394\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03ae \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Bullet list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03ba\u03bf\u03c5\u03ba\u03ba\u03af\u03b4\u03b5\u03c2",
+"Header 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
+"Superscript": "\u0395\u03ba\u03b8\u03ad\u03c4\u03b7\u03c2",
+"Clear formatting": "\u0391\u03c0\u03b1\u03bb\u03bf\u03b9\u03c6\u03ae \u03bc\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
+"Font Sizes": "\u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2",
+"Subscript": "\u0394\u03b5\u03af\u03ba\u03c4\u03b7\u03c2",
+"Header 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
+"Redo": "\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7",
+"Paragraph": "\u03a0\u03b1\u03c1\u03ac\u03b3\u03c1\u03b1\u03c6\u03bf\u03c2",
+"Ok": "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
+"Bold": "\u0388\u03bd\u03c4\u03bf\u03bd\u03b7",
+"Code": "\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
+"Italic": "\u03a0\u03bb\u03ac\u03b3\u03b9\u03b1",
+"Align center": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03ba\u03ad\u03bd\u03c4\u03c1\u03bf",
+"Header 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
+"Decrease indent": "\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
+"Header 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0397 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03ce\u03c1\u03b1 \u03c3\u03b5 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c0\u03bb\u03bf\u03cd \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a4\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03b1 \u03bc\u03b9\u03b1\u03c2 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7\u03c2 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03b1\u03c0\u03bb\u03cc \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03cc\u03c3\u03bf \u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c5\u03c4\u03ae \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03ae.",
+"Underline": "\u03a5\u03c0\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b9\u03c3\u03b7",
+"Cancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
+"Justify": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Inline": "\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7",
+"Copy": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Align left": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Visual aids": "O\u03c0\u03c4\u03b9\u03ba\u03ac \u03b2\u03bf\u03b7\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 ",
+"Lower Greek": "\u03a0\u03b5\u03b6\u03ac \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac",
+"Square": "\u03a4\u03b5\u03c4\u03c1\u03ac\u03b3\u03c9\u03bd\u03bf",
+"Default": "\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf",
+"Lower Alpha": "\u03a0\u03b5\u03b6\u03ac \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
+"Circle": "\u039a\u03cd\u03ba\u03bb\u03bf\u03c2",
+"Disc": "\u0394\u03af\u03c3\u03ba\u03bf\u03c2",
+"Upper Alpha": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
+"Upper Roman": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
+"Lower Roman": "\u03a0\u03b5\u03b6\u03ac \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
+"Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
+"Anchor": "\u0391\u03b3\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
+"You have unsaved changes are you sure you want to navigate away?": "\u0388\u03c7\u03b5\u03c4\u03b5 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2. \u0395\u03af\u03c3\u03c4\u03b5 \u03b2\u03ad\u03b2\u03b1\u03b9\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03c3\u03b5\u03bb\u03af\u03b4\u03b1;",
+"Restore last draft": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c5 \u03c3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5",
+"Special character": "\u0395\u03b9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03b1\u03c2",
+"Source code": "\u03a0\u03b7\u03b3\u03b1\u03af\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
+"Right to left": "\u0391\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Left to right": "\u0391\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Emoticons": "\u03a6\u03b1\u03c4\u03c3\u03bf\u03cd\u03bb\u03b5\u03c2",
+"Robots": "\u03a1\u03bf\u03bc\u03c0\u03cc\u03c4",
+"Document properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b5\u03b3\u03b3\u03c1\u03ac\u03c6\u03bf\u03c5",
+"Title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
+"Keywords": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ac",
+"Encoding": "\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+"Description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
+"Author": "\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2",
+"Fullscreen": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7",
+"Horizontal line": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae",
+"Horizontal space": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
+"Insert\/edit image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"General": "\u0393\u03b5\u03bd\u03b9\u03ba\u03ac",
+"Advanced": "\u0393\u03b9\u03b1 \u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2",
+"Source": "\u03a0\u03b7\u03b3\u03ae",
+"Border": "\u03a0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf",
+"Constrain proportions": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b1\u03bd\u03b1\u03bb\u03bf\u03b3\u03b9\u03ce\u03bd",
+"Vertical space": "\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
+"Image description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Style": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
+"Dimensions": "\u0394\u03b9\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2",
+"Insert image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
+"Insert date\/time": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\u03c2\/\u03ce\u03c1\u03b1\u03c2",
+"Remove link": "\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Url": "URL",
+"Text to display": "\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03b3\u03b9\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
+"Anchors": "\u0386\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2",
+"Insert link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"New window": "\u039d\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
+"None": "\u039a\u03b1\u03bc\u03af\u03b1",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 http:\/\/;",
+"Target": "\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 email. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 mailto:;",
+"Insert\/edit link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
+"Insert\/edit video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
+"Poster": "\u0391\u03c6\u03af\u03c3\u03b1",
+"Alternative source": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7",
+"Paste your embed code below:": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9:",
+"Insert video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
+"Embed": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7",
+"Nonbreaking space": "\u039a\u03b5\u03bd\u03cc \u03c7\u03c9\u03c1\u03af\u03c2 \u03b4\u03b9\u03b1\u03ba\u03bf\u03c0\u03ae",
+"Page break": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2",
+"Paste as text": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03c9\u03c2 \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf",
+"Preview": "\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7",
+"Print": "\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7",
+"Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
+"Could not find the specified string.": "\u0394\u03b5\u03bd \u03ae\u03c4\u03b1\u03bd \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03bb\u03c6\u03b1\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd.",
+"Replace": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+"Next": "\u0395\u03c0\u03cc\u03bc.",
+"Whole words": "\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03b5\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
+"Find and replace": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+"Replace with": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03bc\u03b5",
+"Find": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7",
+"Replace all": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03cc\u03bb\u03c9\u03bd",
+"Match case": "\u03a4\u03b1\u03af\u03c1\u03b9\u03b1\u03c3\u03bc\u03b1 \u03c0\u03b5\u03b6\u03ce\u03bd\/\u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03c9\u03bd",
+"Prev": "\u03a0\u03c1\u03bf\u03b7\u03b3.",
+"Spellcheck": "\u039f\u03c1\u03b8\u03bf\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 ",
+"Finish": "\u03a4\u03ad\u03bb\u03bf\u03c2",
+"Ignore all": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7 \u03cc\u03bb\u03c9\u03bd",
+"Ignore": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7",
+"Insert row before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
+"Rows": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2",
+"Height": "\u038e\u03c8\u03bf\u03c2",
+"Paste row after": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
+"Alignment": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
+"Column group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03c3\u03c4\u03b7\u03bb\u03ce\u03bd",
+"Row": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ae",
+"Insert column before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Split cell": "\u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Cell padding": "\u0391\u03bd\u03b1\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Cell spacing": "\u0391\u03c0\u03cc\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Row type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Insert table": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Body": "\u03a3\u03ce\u03bc\u03b1",
+"Caption": "\u039b\u03b5\u03b6\u03ac\u03bd\u03c4\u03b1",
+"Footer": "\u03a5\u03c0\u03bf\u03c3\u03ad\u03bb\u03b9\u03b4\u03bf",
+"Delete row": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Paste row before": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
+"Scope": "\u0388\u03ba\u03c4\u03b1\u03c3\u03b7",
+"Delete table": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Header cell": "\u039a\u03b5\u03bb\u03af-\u03ba\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
+"Column": "\u03a3\u03c4\u03ae\u03bb\u03b7",
+"Cell": "\u039a\u03b5\u03bb\u03af",
+"Header": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
+"Cell type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Copy row": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Row properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Table properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
+"Row group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd",
+"Right": "\u0394\u03b5\u03be\u03b9\u03ac",
+"Insert column after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac",
+"Cols": "\u03a3\u03c4\u03ae\u03bb\u03b5\u03c2",
+"Insert row after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
+"Width": "\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2",
+"Cell properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
+"Left": "\u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
+"Cut row": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+"Delete column": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2",
+"Center": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b1\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7",
+"Merge cells": "\u03a3\u03c5\u03b3\u03c7\u03ce\u03bd\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
+"Insert template": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 ",
+"Templates": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03b1",
+"Background color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c6\u03cc\u03bd\u03c4\u03bf\u03c5",
+"Text color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 ",
+"Show blocks": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bc\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd",
+"Show invisible characters": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03ba\u03c1\u03c5\u03c6\u03ce\u03bd \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd",
+"Words: {0}": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2: {0}",
+"Insert": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae",
+"File": "\u0391\u03c1\u03c7\u03b5\u03af\u03bf",
+"Edit": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u0395\u03bc\u03c0\u03bb\u03bf\u03c5\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F9 \u03b3\u03b9\u03b1 \u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F10 \u03b3\u03b9\u03b1  \u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-0 \u03b3\u03b9\u03b1 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
+"Tools": "\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1",
+"View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
+"Table": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2",
+"Format": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/es.js b/core/media/editors/tinymce/langs/es.js
new file mode 100644
index 00000000..e5f8926e
--- /dev/null
+++ b/core/media/editors/tinymce/langs/es.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('es',{
+"Cut": "Cortar",
+"Header 2": "Encabezado 2 ",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tu navegador no soporta acceso directo al portapapeles. Por favor usa las teclas Crtl+X\/C\/V de tu teclado",
+"Div": "Capa",
+"Paste": "Pegar",
+"Close": "Cerrar",
+"Font Family": "Familia de fuentes",
+"Pre": "Pre",
+"Align right": "Alinear a la derecha",
+"New document": "Nuevo documento",
+"Blockquote": "Bloque de cita",
+"Numbered list": "Lista numerada",
+"Increase indent": "Incrementar sangr\u00eda",
+"Formats": "Formatos",
+"Headers": "Encabezado",
+"Select all": "Seleccionar todo",
+"Header 3": "Encabezado 3",
+"Blocks": "Bloques",
+"Undo": "Deshacer",
+"Strikethrough": "Tachado",
+"Bullet list": "Lista de vi\u00f1etas",
+"Header 1": "Encabezado 1",
+"Superscript": "Super\u00edndice",
+"Clear formatting": "Limpiar formato",
+"Font Sizes": "Tama\u00f1os de fuente",
+"Subscript": "Sub\u00edndice",
+"Header 6": "Encabezado 6",
+"Redo": "Rehacer",
+"Paragraph": "P\u00e1rrafo",
+"Ok": "Ok",
+"Bold": "Negrita",
+"Code": "C\u00f3digo",
+"Italic": "It\u00e1lica",
+"Align center": "Alinear al centro",
+"Header 5": "Encabezado 5 ",
+"Decrease indent": "Disminuir sangr\u00eda",
+"Header 4": "Encabezado 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Pegar est\u00e1 ahora en modo de texto plano. El contenido se pegar\u00e1 como texto plano hasta que desactive esta opci\u00f3n.",
+"Underline": "Subrayado",
+"Cancel": "Cancelar",
+"Justify": "Justificar",
+"Inline": "en l\u00ednea",
+"Copy": "Copiar",
+"Align left": "Alinear a la izquierda",
+"Visual aids": "Ayudas visuales",
+"Lower Greek": "Inferior Griega",
+"Square": "Cuadrado",
+"Default": "Por defecto",
+"Lower Alpha": "Inferior Alfa",
+"Circle": "C\u00edrculo",
+"Disc": "Disco",
+"Upper Alpha": "Superior Alfa",
+"Upper Roman": "Superior Romana",
+"Lower Roman": "Inferior Romana",
+"Name": "Nombre",
+"Anchor": "Ancla",
+"You have unsaved changes are you sure you want to navigate away?": "Tiene cambios sin guardar. \u00bfEst\u00e1 seguro de que quiere salir?",
+"Restore last draft": "Restaurar el \u00faltimo borrador",
+"Special character": "Car\u00e1cter especial",
+"Source code": "C\u00f3digo fuente",
+"Right to left": "De derecha a izquierda",
+"Left to right": "De izquierda a derecha",
+"Emoticons": "Emoticonos",
+"Robots": "Robots",
+"Document properties": "Propiedades del documento",
+"Title": "T\u00edtulo",
+"Keywords": "Palabras clave",
+"Encoding": "Codificaci\u00f3n",
+"Description": "Descripci\u00f3n",
+"Author": "Autor",
+"Fullscreen": "Pantalla completa",
+"Horizontal line": "L\u00ednea horizontal",
+"Horizontal space": "Espacio horizontal",
+"Insert\/edit image": "Insertar\/editar imagen",
+"General": "General",
+"Advanced": "Avanzado",
+"Source": "Fuente",
+"Border": "Borde",
+"Constrain proportions": "Restringir proporciones",
+"Vertical space": "Espacio vertical",
+"Image description": "Descripci\u00f3n de la imagen",
+"Style": "Estilo",
+"Dimensions": "Dimensiones",
+"Insert image": "Insertar imagen",
+"Insert date\/time": "Insertar fecha\/hora",
+"Remove link": "Quitar enlace",
+"Url": "URL",
+"Text to display": "Texto para mostrar",
+"Anchors": "Anclas",
+"Insert link": "Insertar enlace",
+"New window": "Nueva ventana",
+"None": "Ninguno",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Destino",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Insertar\/editar enlace",
+"Insert\/edit video": "Insertar\/editar video",
+"Poster": "Miniatura",
+"Alternative source": "Fuente alternativa",
+"Paste your embed code below:": "Pega tu c\u00f3digo embebido debajo",
+"Insert video": "Insertar video",
+"Embed": "Incrustado",
+"Nonbreaking space": "Espacio fijo",
+"Page break": "Salto de p\u00e1gina",
+"Paste as text": "Pegar como texto",
+"Preview": "Previsualizar",
+"Print": "Imprimir",
+"Save": "Guardar",
+"Could not find the specified string.": "No se encuentra la cadena de texto especificada",
+"Replace": "Reemplazar",
+"Next": "Siguiente",
+"Whole words": "Palabras completas",
+"Find and replace": "Buscar y reemplazar",
+"Replace with": "Reemplazar con",
+"Find": "Buscar",
+"Replace all": "Reemplazar todo",
+"Match case": "Coincidencia exacta",
+"Prev": "Anterior",
+"Spellcheck": "Corrector ortogr\u00e1fico",
+"Finish": "Finalizar",
+"Ignore all": "Ignorar todos",
+"Ignore": "Ignorar",
+"Insert row before": "Insertar fila antes",
+"Rows": "Filas",
+"Height": "Alto",
+"Paste row after": "Pegar la fila despu\u00e9s",
+"Alignment": "Alineaci\u00f3n",
+"Column group": "Grupo de columnas",
+"Row": "Fila",
+"Insert column before": "Insertar columna antes",
+"Split cell": "Dividir celdas",
+"Cell padding": "Relleno de celda",
+"Cell spacing": "Espacio entre celdas",
+"Row type": "Tipo de fila",
+"Insert table": "Insertar tabla",
+"Body": "Cuerpo",
+"Caption": "Subt\u00edtulo",
+"Footer": "Pie de p\u00e1gina",
+"Delete row": "Eliminar fila",
+"Paste row before": "Pegar la fila antes",
+"Scope": "\u00c1mbito",
+"Delete table": "Eliminar tabla",
+"Header cell": "Celda de la cebecera",
+"Column": "Columna",
+"Cell": "Celda",
+"Header": "Cabecera",
+"Cell type": "Tipo de celda",
+"Copy row": "Copiar fila",
+"Row properties": "Propiedades de la fila",
+"Table properties": "Propiedades de la tabla",
+"Row group": "Grupo de filas",
+"Right": "Derecha",
+"Insert column after": "Insertar columna despu\u00e9s",
+"Cols": "Columnas",
+"Insert row after": "Insertar fila despu\u00e9s ",
+"Width": "Ancho",
+"Cell properties": "Propiedades de la celda",
+"Left": "Izquierda",
+"Cut row": "Cortar fila",
+"Delete column": "Eliminar columna",
+"Center": "Centrado",
+"Merge cells": "Combinar celdas",
+"Insert template": "Insertar plantilla",
+"Templates": "Plantillas",
+"Background color": "Color de fondo",
+"Text color": "Color del texto",
+"Show blocks": "Mostrar bloques",
+"Show invisible characters": "Mostrar caracteres invisibles",
+"Words: {0}": "Palabras: {0}",
+"Insert": "Insertar",
+"File": "Archivo",
+"Edit": "Editar",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto enriquecido. Pulse ALT-F9 para el menu. Pulse ALT-F10 para la barra de herramientas. Pulse ALT-0 para ayuda",
+"Tools": "Herramientas",
+"View": "Ver",
+"Table": "Tabla",
+"Format": "Formato"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/et.js b/core/media/editors/tinymce/langs/et.js
new file mode 100644
index 00000000..752cc59f
--- /dev/null
+++ b/core/media/editors/tinymce/langs/et.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('et',{
+"Cut": "L\u00f5ika",
+"Header 2": "Pealkiri 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sinu veebilehitseja ei toeta otsest ligip\u00e4\u00e4su l\u00f5ikelauale. Palun kasuta selle asemel klaviatuuri kiirk\u00e4sklusi Ctrl+X\/C\/V.",
+"Div": "Sektsioon",
+"Paste": "Kleebi",
+"Close": "Sulge",
+"Font Family": "Kirjastiilid",
+"Pre": "Eelvormindatud",
+"Align right": "Joonda paremale",
+"New document": "Uus dokument",
+"Blockquote": "Plokktsitaat",
+"Numbered list": "J\u00e4rjestatud loend",
+"Increase indent": "Suurenda taanet",
+"Formats": "Vormingud",
+"Headers": "P\u00e4ised",
+"Select all": "Vali k\u00f5ik",
+"Header 3": "Pealkiri 3",
+"Blocks": "Plokid",
+"Undo": "V\u00f5ta tagasi",
+"Strikethrough": "L\u00e4bikriipsutatud",
+"Bullet list": "J\u00e4rjestamata loend",
+"Header 1": "Pealkiri 1",
+"Superscript": "\u00dclaindeks",
+"Clear formatting": "Puhasta vorming",
+"Font Sizes": "Kirja suurused",
+"Subscript": "Alaindeks",
+"Header 6": "Pealkiri 6",
+"Redo": "Tee uuesti",
+"Paragraph": "L\u00f5ik",
+"Ok": "Ok",
+"Bold": "Rasvane",
+"Code": "Kood",
+"Italic": "Kaldkiri",
+"Align center": "Joonda keskele",
+"Header 5": "Pealkiri 5",
+"Decrease indent": "V\u00e4henda taanet",
+"Header 4": "Pealkiri 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Asetamine on n\u00fc\u00fcd tekstire\u017eiimis. Sisu asetatakse n\u00fc\u00fcd lihttekstina, kuni sa l\u00fclitad selle valiku v\u00e4lja.",
+"Underline": "Allakriipsutatud",
+"Cancel": "Katkesta",
+"Justify": "Joonda r\u00f6\u00f6pselt",
+"Inline": "Reasisene",
+"Copy": "Kopeeri",
+"Align left": "Joonda vasakule",
+"Visual aids": "N\u00e4itevahendid",
+"Lower Greek": "Kreeka v\u00e4iket\u00e4hed (\u03b1, \u03b2, \u03b3)",
+"Square": "Ruut",
+"Default": "Vaikimisi",
+"Lower Alpha": "V\u00e4iket\u00e4hed (a, b, c)",
+"Circle": "Ring",
+"Disc": "Ketas",
+"Upper Alpha": "Suurt\u00e4hed (A, B, C)",
+"Upper Roman": "Rooma suurt\u00e4hed (I, II, III)",
+"Lower Roman": "Rooma v\u00e4iket\u00e4hed (i, ii, iii)",
+"Name": "Nimi",
+"Anchor": "Ankur",
+"You have unsaved changes are you sure you want to navigate away?": "Sul on salvestamata muudatusi. Oled Sa kindel, et soovid mujale navigeeruda?",
+"Restore last draft": "Taasta viimane mustand",
+"Special character": "Erim\u00e4rk",
+"Source code": "L\u00e4htekood",
+"Right to left": "Paremalt vasakule",
+"Left to right": "Vasakult paremale",
+"Emoticons": "Emotikonid",
+"Robots": "Robotid",
+"Document properties": "Dokumendi omadused",
+"Title": "Pealkiri",
+"Keywords": "M\u00e4rks\u00f5nad",
+"Encoding": "M\u00e4rgistik",
+"Description": "Kirjeldus",
+"Author": "Autor",
+"Fullscreen": "T\u00e4isekraan",
+"Horizontal line": "Horisontaaljoon",
+"Horizontal space": "Reavahe",
+"Insert\/edit image": "Lisa\/muuda pilt",
+"General": "\u00dcldine",
+"Advanced": "T\u00e4iendavad seaded",
+"Source": "Allikas",
+"Border": "\u00c4\u00e4ris",
+"Constrain proportions": "S\u00e4ilita kuvasuhe",
+"Vertical space": "P\u00fcstine vahe",
+"Image description": "Pildi kirjeldus",
+"Style": "Stiil",
+"Dimensions": "M\u00f5\u00f5tmed",
+"Insert image": "Lisa pilt",
+"Insert date\/time": "Lisa kuup\u00e4ev\/kellaaeg",
+"Remove link": "Eemalda link",
+"Url": "Viide (url)",
+"Text to display": "Kuvatav tekst",
+"Anchors": "Ankrud",
+"Insert link": "Lisa link",
+"New window": "Uus aken",
+"None": "Puudub",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Sihtm\u00e4rk",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Lisa\/muuda link",
+"Insert\/edit video": "Lisa\/muuda video",
+"Poster": "Lisaja",
+"Alternative source": "Teine allikas",
+"Paste your embed code below:": "Kleebi oma manustamiskood siia alla:",
+"Insert video": "Lisa video",
+"Embed": "Manusta",
+"Nonbreaking space": "T\u00fchim\u00e4rk (nbsp)",
+"Page break": "Lehevahetus",
+"Paste as text": "Aseta tekstina",
+"Preview": "Eelvaade",
+"Print": "Tr\u00fcki",
+"Save": "Salvesta",
+"Could not find the specified string.": "Ei suutnud leida etteantud s\u00f5net.",
+"Replace": "Asenda",
+"Next": "J\u00e4rg",
+"Whole words": "Terviks\u00f5nad",
+"Find and replace": "Otsi ja asenda",
+"Replace with": "Asendus",
+"Find": "Otsi",
+"Replace all": "Asenda k\u00f5ik",
+"Match case": "Erista suur- ja v\u00e4iket\u00e4hti",
+"Prev": "Eelm",
+"Spellcheck": "\u00d5igekirja kontroll",
+"Finish": "L\u00f5peta",
+"Ignore all": "Eira k\u00f5iki",
+"Ignore": "Eira",
+"Insert row before": "Lisa rida enne",
+"Rows": "Read",
+"Height": "K\u00f5rgus",
+"Paste row after": "Kleebi rida j\u00e4rele",
+"Alignment": "Joondus",
+"Column group": "Veergude r\u00fchm",
+"Row": "Rida",
+"Insert column before": "Lisa tulp enne",
+"Split cell": "T\u00fckelda lahter",
+"Cell padding": "Lahtri sisu ja tabeli \u00e4\u00e4rise vahe",
+"Cell spacing": "Lahtrivahe",
+"Row type": "Rea t\u00fc\u00fcp",
+"Insert table": "Lisa tabel",
+"Body": "P\u00f5hiosa",
+"Caption": "Alapealkiri",
+"Footer": "Jalus",
+"Delete row": "Kustuta rida",
+"Paste row before": "Kleebi rida enne",
+"Scope": "Ulatus",
+"Delete table": "Kustuta tabel",
+"Header cell": "P\u00e4islahter",
+"Column": "Tulp",
+"Cell": "Lahter",
+"Header": "P\u00e4is",
+"Cell type": "Lahtri t\u00fc\u00fcp",
+"Copy row": "Kopeeri rida",
+"Row properties": "Rea omadused",
+"Table properties": "Tabeli omadused",
+"Row group": "Ridade r\u00fchm",
+"Right": "Paremal",
+"Insert column after": "Lisa tulp j\u00e4rele",
+"Cols": "Veerud",
+"Insert row after": "Lisa rida j\u00e4rele",
+"Width": "Laius",
+"Cell properties": "Lahtri omadused",
+"Left": "Vasakul",
+"Cut row": "L\u00f5ika rida",
+"Delete column": "Kustuta tulp",
+"Center": "Keskel",
+"Merge cells": "\u00dchenda lahtrid",
+"Insert template": "Lisa mall",
+"Templates": "Mallid",
+"Background color": "Tausta v\u00e4rv",
+"Text color": "Teksti v\u00e4rv",
+"Show blocks": "N\u00e4ita plokke",
+"Show invisible characters": "N\u00e4ita peidetud m\u00e4rke",
+"Words: {0}": "S\u00f5nu: {0}",
+"Insert": "Sisesta",
+"File": "Fail",
+"Edit": "Muuda",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastatud teksti ala. Men\u00fc\u00fc jaoks vajuta ALT-F9. T\u00f6\u00f6riistariba jaoks vajuta ALT-F10. Abi saamiseks vajuta ALT-0.",
+"Tools": "T\u00f6\u00f6riistad",
+"View": "Vaade",
+"Table": "Tabel",
+"Format": "Vorming"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/eu.js b/core/media/editors/tinymce/langs/eu.js
new file mode 100644
index 00000000..ac1edd49
--- /dev/null
+++ b/core/media/editors/tinymce/langs/eu.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('eu',{
+"Cut": "Ebaki",
+"Heading 5": "5 Izenburua",
+"Header 2": "2 Goiburua",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Zure nabigatzaileak ez du arbela zuzenean erabiltzeko euskarririk. Mesedez erabili CTRL+X\/C\/V teklatuko lasterbideak.",
+"Heading 4": "4 Izenburua",
+"Div": "Div",
+"Heading 2": "2 Izenburua",
+"Paste": "Itsatsi",
+"Close": "Itxi",
+"Font Family": "Letra-tipo familia",
+"Pre": "Pre",
+"Align right": "Lerrokatu eskuinean",
+"New document": "Dokumentu berria",
+"Blockquote": "Blockquote",
+"Numbered list": "Zerrenda  zenbakiduna",
+"Heading 1": "1 Izenburua",
+"Headings": "Izenburuak",
+"Increase indent": "Handitu koska",
+"Formats": "Formatuak",
+"Headers": "Goiburuak",
+"Select all": "Hautatu dena",
+"Header 3": "3 Goiburua",
+"Blocks": "Blokeak",
+"Undo": "Desegin",
+"Strikethrough": "Marratua",
+"Bullet list": "Bulet zerrenda",
+"Header 1": "1 Goiburua",
+"Superscript": "Goi-indizea",
+"Clear formatting": "Garbitu formatua",
+"Font Sizes": "Letra-tamainak",
+"Subscript": "Azpiindize",
+"Header 6": "6 Goiburua",
+"Redo": "Berregin",
+"Paragraph": "Paragrafoa",
+"Ok": "Ados",
+"Bold": "Lodia",
+"Code": "Kodea",
+"Italic": "Etzana",
+"Align center": "Lerrokatu erdian",
+"Header 5": "5 Goiburua",
+"Heading 6": "6 Izenburua",
+"Heading 3": "3 Izenburua",
+"Decrease indent": "Txikitu koska",
+"Header 4": "4 Goiburua",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Itsatsi testu arrunt moduan dago orain. Edukiak testu arruntak bezala itsatsiko dira aukera hau desaktibatu arte.",
+"Underline": "Azpimarratua",
+"Cancel": "Utzi",
+"Justify": "Justifikatuta",
+"Inline": "Lerroan",
+"Copy": "Kopiatu",
+"Align left": "Lerrokatu ezkerrean",
+"Visual aids": "Laguntza bisualak",
+"Lower Greek": "Greko minuskula",
+"Square": "Karratua",
+"Default": "Lehenetsia",
+"Lower Alpha": "Letra minuskula",
+"Circle": "Zirkulua",
+"Disc": "Diskoa",
+"Upper Alpha": "Letra maiuskula",
+"Upper Roman": "Erromatar maiuskula",
+"Lower Roman": "Erromatar minuskula",
+"Name": "Izena",
+"Anchor": "Esteka",
+"You have unsaved changes are you sure you want to navigate away?": "Gorde gabeko aldaketak dituzu, ziur zaude hemendik irten nahi duzula?",
+"Restore last draft": "Leheneratu azken zirriborroa",
+"Special character": "Karaktere berezia",
+"Source code": "Iturburu-kodea",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Kolorea",
+"Right to left": "Eskuinetik ezkerrera",
+"Left to right": "Ezkerretik eskuinera",
+"Emoticons": "Aurpegierak",
+"Robots": "Robotak",
+"Document properties": "Dokumentuaren propietateak",
+"Title": "Titulua",
+"Keywords": "Gako-hitzak",
+"Encoding": "Kodeketa",
+"Description": "Deskribapena",
+"Author": "Egilea",
+"Fullscreen": "Pantaila osoa",
+"Horizontal line": "Marra horizontala",
+"Horizontal space": "Tarte horizontala",
+"Insert\/edit image": "Txertatu\/editatu irudia",
+"General": "Orokorra",
+"Advanced": "Aurreratua",
+"Source": "Iturburua",
+"Border": "Ertza",
+"Constrain proportions": "Mugatu proportzioak",
+"Vertical space": "Tarte bertikala",
+"Image description": "Irudiaren deskribapena",
+"Style": "Estiloa",
+"Dimensions": "Neurriak",
+"Insert image": "Txertatu irudia",
+"Zoom in": "Handiagotu",
+"Contrast": "Kontrastea",
+"Back": "Atzera",
+"Gamma": "Gamma",
+"Flip horizontally": "Irauli horizontalki",
+"Resize": "Aldatu tamaina",
+"Sharpen": "Araztu",
+"Zoom out": "Txikiagotu",
+"Image options": "Irudiaren aukerak",
+"Apply": "Aplikatu",
+"Brightness": "Distira",
+"Rotate clockwise": "Biratu erlojuaren noranzkoan",
+"Rotate counterclockwise": "Biratu erlojuaren aurkako noranzkoan",
+"Edit image": "Editatu irudia",
+"Color levels": "Kolore-mailak",
+"Crop": "Moztu",
+"Orientation": "Orientazioa",
+"Flip vertically": "Irauli bertikalki",
+"Invert": "Alderantzikatu",
+"Insert date\/time": "Txertatu data\/ordua",
+"Remove link": "Kendu esteka",
+"Url": "Url",
+"Text to display": "Bistaratzeko testua",
+"Anchors": "Estekak",
+"Insert link": "Txertatu esteka",
+"New window": "Leiho berria",
+"None": "Bat ere ez",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Sartu duzun URL-ak kanpoko esteka dirudi. Nahi duzu dagokion http:\/\/ aurrizkia gehitzea?",
+"Target": "Helburua",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Sartu duzun URL-ak posta helbide elektronikoa dirudi. Nahi duzu dagokion mailto: aurrizkia gehitzea?",
+"Insert\/edit link": "Txertatu\/editatu esteka",
+"Insert\/edit video": "Txertatu\/editatu bideoa",
+"Poster": "Posterra",
+"Alternative source": "Ordezko iturburua",
+"Paste your embed code below:": "Itsatsi hemen zure kapsulatze-kodea:",
+"Insert video": "Txertatu bideoa",
+"Embed": "Kapsulatu",
+"Nonbreaking space": "Zuriune zatiezina",
+"Page break": "Orrialde-jauzia",
+"Paste as text": "Itsatsi testu gisa",
+"Preview": "Aurrebista",
+"Print": "Inprimatu",
+"Save": "Gorde",
+"Could not find the specified string.": "Ezin izan da zehaztutako katea aurkitu.",
+"Replace": "Ordeztu",
+"Next": "Hurrengoa",
+"Whole words": "hitz osoak",
+"Find and replace": "Bilatu eta ordeztu",
+"Replace with": "Ordeztu honekin",
+"Find": "Bilatu",
+"Replace all": "Ordeztu dena",
+"Match case": "Maiuskula\/minuskula",
+"Prev": "Aurrekoa",
+"Spellcheck": "Ortografia-egiaztapena",
+"Finish": "Amaitu",
+"Ignore all": "Ez ikusi egin dena",
+"Ignore": "Ez ikusi egin",
+"Add to Dictionary": "Gehitu hiztegian",
+"Insert row before": "Txertatu errenkada aurretik",
+"Rows": "Errenkadak",
+"Height": "Altuera",
+"Paste row after": "Itsatsi errenkada ondoren",
+"Alignment": "Lerrokatzea",
+"Border color": "Ertzaren kolorea",
+"Column group": "Zutabe taldea",
+"Row": "Errenkada",
+"Insert column before": "Txertatu zutabea aurretik",
+"Split cell": "Zatitu gelaxka",
+"Cell padding": "Gelaxka-betegarria",
+"Cell spacing": "Gelaxka-bitartea",
+"Row type": "Lerro mota",
+"Insert table": "Txertatu taula",
+"Body": "Gorputza",
+"Caption": "Epigrafea",
+"Footer": "Oina",
+"Delete row": "Ezabatu errenkada",
+"Paste row before": "Itsatsi errenkada aurretik",
+"Scope": "Esparrua",
+"Delete table": "Ezabatu taula",
+"H Align": "Lerrokatze horizontala",
+"Top": "Goian",
+"Header cell": "Goiburu-gelaxka",
+"Column": "Zutabea",
+"Row group": "Lerro taldea",
+"Cell": "Gelaxka",
+"Middle": "Erdian",
+"Cell type": "Gelaxka mota",
+"Copy row": "Kopiatu errenkada",
+"Row properties": "Errenkadaren propietateak",
+"Table properties": "Taularen propietateak",
+"Bottom": "Behean",
+"V Align": "Lerrokatze bertikala",
+"Header": "Goiburua",
+"Right": "Eskuina",
+"Insert column after": "Txertatu zutabea ondoren",
+"Cols": "Zutabeak",
+"Insert row after": "Txertatu errenkada ondoren",
+"Width": "Zabalera",
+"Cell properties": "Gelaxkaren propietateak",
+"Left": "Ezkerra",
+"Cut row": "Ebaki errenkada",
+"Delete column": "Ezabatu zutabea",
+"Center": "Erdia",
+"Merge cells": "Konbinatu gelaxkak",
+"Insert template": "Txertatu txantiloia",
+"Templates": "Txantiloiak",
+"Background color": "Atzeko planoaren kolorea",
+"Custom...": "Pertsonalizatua...",
+"Custom color": "Kolore pertsonalizatua",
+"No color": "Kolorerik gabe",
+"Text color": "Testuaren kolorea",
+"Show blocks": "Erakutsi blokeak",
+"Show invisible characters": "Erakutsi karaktere ikusezinak",
+"Words: {0}": "Hitzak: {0}",
+"Insert": "Txertatu",
+"File": "Fitxategia",
+"Edit": "Editatu",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Testu aberastuaren area. Sakatu ALT-F9 menurako. Sakatu ALT-F10 tresna-barrarako. Sakatu ALT-0 laguntzarako",
+"Tools": "Tresnak",
+"View": "Ikusi",
+"Table": "Taula",
+"Format": "Formatua"
+});
diff --git a/core/media/editors/tinymce/langs/fa.js b/core/media/editors/tinymce/langs/fa.js
new file mode 100644
index 00000000..385c0ab6
--- /dev/null
+++ b/core/media/editors/tinymce/langs/fa.js
@@ -0,0 +1,180 @@
+tinymce.addI18n('fa',{
+"Cut": "\u0628\u0631\u062f\u0627\u0634\u062a\u0646",
+"Header 2": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u0631\u0648\u0631\u06af\u0631 \u0634\u0645\u0627 \u0627\u0632 \u062f\u0633\u062a\u0631\u0633\u06cc \u0645\u0633\u062a\u0642\u06cc\u0645 \u0628\u0647 \u062d\u0627\u0641\u0638\u0647 \u06a9\u067e\u06cc \u067e\u0634\u062a\u06cc\u0628\u0627\u0646\u06cc \u0646\u0645\u06cc \u06a9\u0646\u062f. \u0644\u0637\u0641\u0627 \u0627\u0632 \u06a9\u0644\u06cc\u062f \u0647\u0627\u06cc Ctrl+X\/C\/V \u062f\u0631 \u06a9\u06cc\u0628\u0648\u0631\u062f \u0628\u0631\u0627\u06cc \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f.",
+"Div": "\u062a\u06af \u0628\u062e\u0634 - Div",
+"Paste": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646",
+"Close": "\u0628\u0633\u062a\u0646",
+"Font Family": "\u0641\u0648\u0646\u062a",
+"Pre": "\u062a\u06af \u062a\u0628\u062f\u06cc\u0644 \u0628\u0647 \u0645\u062a\u0646 \u0633\u0627\u062f\u0647 - Pre",
+"Align right": "\u0631\u0627\u0633\u062a \u0686\u06cc\u0646",
+"New document": "\u0633\u0646\u062f \u062c\u062f\u06cc\u062f",
+"Blockquote": "\u062a\u06af \u0646\u0642\u0644 \u0642\u0648\u0644 - Blockquote",
+"Numbered list": "\u0644\u06cc\u0633\u062a \u0634\u0645\u0627\u0631\u0647 \u0627\u06cc",
+"Increase indent": "\u0627\u0641\u0632\u0627\u06cc\u0634 \u062a\u0648 \u0631\u0641\u062a\u06af\u06cc",
+"Formats": "\u0642\u0627\u0644\u0628",
+"Headers": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647\u200c\u0647\u0627",
+"Select all": "\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647",
+"Header 3": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 3",
+"Blocks": "\u0628\u0644\u0648\u06a9",
+"Undo": "\t\n\u0628\u0627\u0637\u0644 \u06a9\u0631\u062f\u0646",
+"Strikethrough": "\u062e\u0637 \u062e\u0648\u0631\u062f\u0647",
+"Bullet list": "\u0644\u06cc\u0633\u062a \u062f\u0627\u06cc\u0631\u0647 \u0627\u06cc",
+"Header 1": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 1",
+"Superscript": "\u0628\u0627\u0644\u0627\u0646\u0648\u06cc\u0633 - \u062d\u0627\u0644\u062a \u062a\u0648\u0627\u0646",
+"Clear formatting": "\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc",
+"Font Sizes": "\u0627\u0646\u062f\u0627\u0632\u0647 \u0641\u0648\u0646\u062a",
+"Subscript": "\u0632\u06cc\u0631 \u0646\u0648\u06cc\u0633 - \u062d\u0627\u0644\u062a \u0627\u0646\u062f\u06cc\u0633",
+"Header 6": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 6",
+"Redo": "\u0627\u0646\u062c\u0627\u0645 \u062f\u0648\u0628\u0627\u0631\u0647",
+"Paragraph": "\u062a\u06af \u067e\u0627\u0631\u0627\u06af\u0631\u0627\u0641 - Paragraph",
+"Ok": "\u0628\u0627\u0634\u0647",
+"Bold": "\u062f\u0631\u0634\u062a",
+"Code": "\u062a\u06af \u06a9\u062f - Code",
+"Italic": "\u062e\u0637 \u06a9\u062c",
+"Align center": "\u0648\u0633\u0637 \u0686\u06cc\u0646",
+"Header 5": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 5",
+"Decrease indent": "\u06a9\u0627\u0647\u0634 \u062a\u0648 \u0631\u0641\u062a\u06af\u06cc",
+"Header 4": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0647\u0645 \u0627\u06a9\u0646\u0648\u0646 \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u0633\u0627\u062f\u0647 \u0627\u0633\u062a. \u062a\u0627 \u0632\u0645\u0627\u0646\u06cc \u06a9\u0647 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a \u0631\u0627 \u063a\u06cc\u0631\u200c\u0641\u0639\u0627\u0644 \u0646\u06a9\u0646\u06cc\u062f\u060c \u0645\u062d\u062a\u0648\u0627 \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u0633\u0627\u062f\u0647 \u0627\u0636\u0627\u0641\u0647 \u0645\u06cc\u200c\u0634\u0648\u062f.",
+"Underline": "\u062e\u0637 \u0632\u06cc\u0631",
+"Cancel": "\u0644\u063a\u0648",
+"Justify": "\u0645\u0633\u0627\u0648\u06cc \u0627\u0632 \u0637\u0631\u0641\u06cc\u0646",
+"Inline": "\u062e\u0637\u06cc",
+"Copy": "\u06a9\u067e\u06cc",
+"Align left": "\u0686\u067e \u0686\u06cc\u0646",
+"Visual aids": "\u06a9\u0645\u06a9 \u0647\u0627\u06cc \u0628\u0635\u0631\u06cc",
+"Lower Greek": "\u06cc\u0648\u0646\u0627\u0646\u06cc \u06a9\u0648\u0686\u06a9",
+"Square": "\u0645\u0631\u0628\u0639",
+"Default": "\u067e\u06cc\u0634\u0641\u0631\u0636",
+"Lower Alpha": "\u0622\u0644\u0641\u0627\u0621 \u06a9\u0648\u0686\u06a9",
+"Circle": "\u062f\u0627\u06cc\u0631\u0647",
+"Disc": "\u062f\u06cc\u0633\u06a9",
+"Upper Alpha": "\u0622\u0644\u0641\u0627\u0621 \u0628\u0632\u0631\u06af",
+"Upper Roman": "\u0631\u0648\u0645\u06cc \u0628\u0632\u0631\u06af",
+"Lower Roman": "\u0631\u0648\u0645\u06cc \u06a9\u0648\u0686\u06a9",
+"Name": "\u0646\u0627\u0645",
+"Anchor": "\u0644\u0646\u06af\u0631 - \u0644\u06cc\u0646\u06a9",
+"You have unsaved changes are you sure you want to navigate away?": "\u0634\u0645\u0627 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0630\u062e\u06cc\u0631\u0647 \u0646\u0634\u062f\u0647 \u0627\u06cc \u062f\u0627\u0631\u06cc\u062f\u060c \u0622\u06cc\u0627 \u0645\u0637\u0645\u0626\u0646\u06cc\u062f \u06a9\u0647 \u0645\u06cc\u062e\u0648\u0627\u0647\u06cc\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0635\u0641\u062d\u0647 \u0628\u0631\u0648\u06cc\u062f\u061f",
+"Restore last draft": "\u0628\u0627\u0632\u06af\u0631\u062f\u0627\u0646\u062f\u0646 \u0622\u062e\u0631\u06cc\u0646 \u067e\u06cc\u0634 \u0646\u0648\u06cc\u0633",
+"Special character": "\u06a9\u0627\u0631\u0627\u06a9\u062a\u0631 \u0647\u0627\u06cc \u062e\u0627\u0635",
+"Source code": "\u06a9\u062f \u0645\u0646\u0628\u0639",
+"Right to left": "\u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e",
+"Left to right": "\u0686\u067e \u0628\u0647 \u0631\u0627\u0633\u062a",
+"Emoticons": "\u0634\u06a9\u0644\u06a9\u200c\u0647\u0627",
+"Robots": "\u0631\u0628\u0627\u062a\u200c\u0647\u0627",
+"Document properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0646\u062f",
+"Title": "\u0639\u0646\u0648\u0627\u0646",
+"Keywords": "\u06a9\u0644\u0645\u0627\u062a \u06a9\u0644\u06cc\u062f\u06cc",
+"Encoding": "\u06a9\u062f \u06af\u0630\u0627\u0631\u06cc",
+"Description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a",
+"Author": "\u0646\u0648\u06cc\u0633\u0646\u062f\u0647",
+"Fullscreen": "\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647",
+"Horizontal line": "\u062e\u0637 \u0627\u0641\u0642\u06cc",
+"Horizontal space": "\u0641\u0636\u0627\u06cc \u0627\u0641\u0642\u06cc",
+"Insert\/edit image": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u062a\u0635\u0648\u06cc\u0631",
+"General": "\u0639\u0645\u0648\u0645\u06cc",
+"Advanced": "\u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
+"Source": "\u0645\u0646\u0628\u0639",
+"Border": "\u062d\u0627\u0634\u06cc\u0647",
+"Constrain proportions": "\u062d\u0641\u0638 \u062a\u0646\u0627\u0633\u0628",
+"Vertical space": "\u0641\u0636\u0627\u06cc \u0639\u0645\u0648\u062f\u06cc",
+"Image description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a \u0639\u06a9\u0633",
+"Style": "\u0633\u0628\u06a9",
+"Dimensions": "\u0627\u0628\u0639\u0627\u062f",
+"Insert image": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0635\u0648\u06cc\u0631",
+"Insert date\/time": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
+"Remove link": "\u062d\u0630\u0641 \u0644\u06cc\u0646\u06a9",
+"Url": "\u0627\u062f\u0631\u0633 \u0644\u06cc\u0646\u06a9",
+"Text to display": "\u0645\u062a\u0646 \u0628\u0631\u0627\u06cc \u0646\u0645\u0627\u06cc\u0634",
+"Anchors": "\u0644\u0646\u06af\u0631 - \u0644\u06cc\u0646\u06a9 \u062f\u0627\u062e\u0644 \u0635\u0641\u062d\u0647",
+"Insert link": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
+"New window": "\u067e\u0646\u062c\u0631\u0647 \u062c\u062f\u06cc\u062f",
+"None": "\u0647\u06cc\u0686 \u06a9\u062f\u0627\u0645",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u0646\u062d\u0648\u0647 \u0628\u0627\u0632 \u0634\u062f\u0646 \u062f\u0631 \u0645\u0631\u0648\u0631\u06af\u0631",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
+"Insert\/edit video": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u0641\u0627\u06cc\u0644 \u062a\u0635\u0648\u06cc\u0631\u06cc",
+"Poster": "\u067e\u0648\u0633\u062a\u0631",
+"Alternative source": "\u0645\u0646\u0628\u0639 \u062f\u06cc\u06af\u0631",
+"Paste your embed code below:": "\u06a9\u062f \u062e\u0648\u062f \u0631\u0627 \u0628\u0631\u0627\u06cc \u062c\u0627 \u062f\u0627\u062f\u0646 \u062f\u0631 \u0633\u0627\u06cc\u062a - embed - \u060c \u062f\u0631 \u0632\u06cc\u0631 \u0642\u0631\u0627\u0631 \u062f\u0647\u06cc\u062f:",
+"Insert video": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0641\u0627\u06cc\u0644 \u062a\u0635\u0648\u06cc\u0631\u06cc",
+"Embed": "\u062c\u0627 \u062f\u0627\u062f\u0646",
+"Nonbreaking space": "\u0641\u0636\u0627\u06cc \u063a\u06cc\u0631 \u0634\u06a9\u0633\u062a\u0646",
+"Page break": "\u0634\u06a9\u0633\u062a\u0646 \u0635\u0641\u062d\u0647",
+"Paste as text": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u062a\u0646",
+"Preview": "\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634",
+"Print": "\u0686\u0627\u067e",
+"Save": "\u0630\u062e\u06cc\u0631\u0647",
+"Could not find the specified string.": "\u0631\u0634\u062a\u0647 \u0645\u062a\u0646\u06cc \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u067e\u06cc\u062f\u0627 \u0646\u0634\u062f.",
+"Replace": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646",
+"Next": "\u0628\u0639\u062f\u06cc",
+"Whole words": "\u0647\u0645\u0647 \u06a9\u0644\u0645\u0647\u200c\u0647\u0627",
+"Find and replace": "\u062c\u0633\u062a\u200c\u0648\u200c\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646",
+"Replace with": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646 \u0628\u0627",
+"Find": "\u062c\u0633\u062a\u200c\u0648\u200c\u062c\u0648",
+"Replace all": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646 \u0647\u0645\u0647",
+"Match case": "\u062d\u0633\u0627\u0633 \u0628\u0647 \u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9 \u0648 \u0628\u0632\u0631\u06af",
+"Prev": "\u0642\u0628\u0644\u06cc",
+"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u06cc\u06cc",
+"Finish": "\u067e\u0627\u06cc\u0627\u0646",
+"Ignore all": "\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u062a\u0646 \u0647\u0645\u0647",
+"Ignore": "\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u062a\u0646",
+"Insert row before": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u0637\u0631 \u062c\u062f\u06cc\u062f \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
+"Rows": "\u062a\u0639\u062f\u0627\u062f \u0633\u0637\u0631\u200c\u0647\u0627",
+"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
+"Paste row after": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631\u060c \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
+"Alignment": "\u0631\u062f\u06cc\u0641 \u0628\u0646\u062f\u06cc \u0646\u0648\u0634\u062a\u0647",
+"Column group": "\u06af\u0631\u0648\u0647 \u0633\u062a\u0648\u0646",
+"Row": "\u0633\u0637\u0631",
+"Insert column before": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u062a\u0648\u0646 \u062c\u062f\u06cc\u062f \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u062a\u0648\u0646",
+"Split cell": "\u062a\u0642\u0633\u06cc\u0645 \u0633\u0644\u0648\u0644 \u062c\u062f\u0648\u0644",
+"Cell padding": "\u062d\u0627\u0634\u06cc\u0647 \u0633\u0644\u0648\u0644 \u0647\u0627",
+"Cell spacing": "\u0641\u0627\u0635\u0644\u0647\u200c\u06cc \u0628\u06cc\u0646 \u0633\u0644\u0648\u0644 \u0647\u0627",
+"Row type": "\u0646\u0648\u0639 \u0633\u0637\u0631",
+"Insert table": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062c\u062f\u0648\u0644",
+"Body": "\u0628\u062f\u0646\u0647",
+"Caption": "\u0639\u0646\u0648\u0627\u0646",
+"Footer": "\u067e\u0627\u0646\u0648\u06cc\u0633",
+"Delete row": "\u062d\u0630\u0641 \u0633\u0637\u0631",
+"Paste row before": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631\u060c \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
+"Scope": "\u0645\u062d\u062f\u0648\u062f\u0647\u200c\u06cc \u0639\u0646\u0648\u0627\u0646",
+"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
+"Header cell": "\u0633\u0631\u0622\u06cc\u0646\u062f \u0633\u0644\u0648\u0644",
+"Column": "\u0633\u062a\u0648\u0646",
+"Cell": "\u0633\u0644\u0648\u0644",
+"Header": "\u0633\u0631\u0622\u06cc\u0646\u062f",
+"Cell type": "\u0646\u0648\u0639 \u0633\u0644\u0648\u0644",
+"Copy row": "\u06a9\u067e\u06cc \u0633\u0637\u0631",
+"Row properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0637\u0631",
+"Table properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u062c\u062f\u0648\u0644",
+"Row group": "\u06af\u0631\u0648\u0647 \u0633\u0637\u0631",
+"Right": "\u0631\u0627\u0633\u062a",
+"Insert column after": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u062a\u0648\u0646 \u062c\u062f\u06cc\u062f \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0633\u062a\u0648\u0646",
+"Cols": "\u062a\u0639\u062f\u0627\u062f \u0633\u062a\u0648\u0646\u200c\u0647\u0627",
+"Insert row after": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u0637\u0631 \u062c\u062f\u06cc\u062f \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
+"Width": "\u0639\u0631\u0636",
+"Cell properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0644\u0648\u0644",
+"Left": "\u0686\u067e",
+"Cut row": "\u0628\u0631\u0634 \u0633\u0637\u0631",
+"Delete column": "\u062d\u0630\u0641 \u0633\u062a\u0648\u0646",
+"Center": "\u0648\u0633\u0637",
+"Merge cells": "\u0627\u062f\u063a\u0627\u0645 \u0633\u0644\u0648\u0644\u200c\u0647\u0627",
+"Insert template": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0627\u0644\u06af\u0648",
+"Templates": "\u0627\u0644\u06af\u0648\u200c\u0647\u0627",
+"Background color": "\u0631\u0646\u06af \u0632\u0645\u06cc\u0646\u0647 \u0645\u062a\u0646",
+"Text color": "\u0631\u0646\u06af \u0645\u062a\u0646",
+"Show blocks": "\u0646\u0645\u0627\u06cc\u0634 \u0628\u062e\u0634\u200c\u0647\u0627",
+"Show invisible characters": "\u0646\u0645\u0627\u06cc\u0634 \u06a9\u0627\u0631\u0627\u06a9\u062a\u0631\u0647\u0627\u06cc \u063a\u06cc\u0631 \u0642\u0627\u0628\u0644 \u0686\u0627\u067e",
+"Words: {0}": "\u06a9\u0644\u0645\u0627\u062a : {0}",
+"Insert": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646",
+"File": "\u067e\u0631\u0648\u0646\u062f\u0647",
+"Edit": "\u0648\u06cc\u0631\u0627\u06cc\u0634",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0648\u06cc\u0631\u0627\u06cc\u0634\u06af\u0631 \u067e\u06cc\u0634\u0631\u0641\u062a\u0647\u200c\u06cc \u0645\u062a\u0646. \u0628\u0631\u0627\u06cc \u062f\u0633\u062a\u0631\u0633\u06cc \u0628\u0647 \u0645\u0646\u0648 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc ALT-F9\u060c \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 ALT-F10 \u0648 \u0628\u0631\u0627\u06cc \u0645\u0634\u0627\u0647\u062f\u0647\u200c\u06cc \u0631\u0627\u0647\u0646\u0645\u0627 ALT-0 \u0631\u0627 \u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f.",
+"Tools": "\u0627\u0628\u0632\u0627\u0631\u0647\u0627",
+"View": "\u0646\u0645\u0627\u06cc\u0634",
+"Table": "\u062c\u062f\u0648\u0644",
+"Format": "\u0642\u0627\u0644\u0628",
+"_dir": "rtl"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/fi.js b/core/media/editors/tinymce/langs/fi.js
new file mode 100644
index 00000000..ee74c58e
--- /dev/null
+++ b/core/media/editors/tinymce/langs/fi.js
@@ -0,0 +1,197 @@
+tinymce.addI18n('fi',{
+"Cut": "Leikkaa",
+"Heading 5": "Otsikko 5",
+"Header 2": "Otsikko 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Selaimesi ei tue leikekirjan suoraa k\u00e4ytt\u00e4mist\u00e4. Ole hyv\u00e4 ja k\u00e4yt\u00e4 n\u00e4pp\u00e4imist\u00f6n Ctrl+X ja Ctrl+V n\u00e4pp\u00e4inyhdistelmi\u00e4.",
+"Heading 4": "Otsikko 4",
+"Div": "Div",
+"Heading 2": "Otsikko 2",
+"Paste": "Liit\u00e4",
+"Close": "Sulje",
+"Font Family": "Fontti",
+"Pre": "Esimuotoiltu",
+"Align right": "Tasaa oikealle",
+"New document": "Uusi dokumentti",
+"Blockquote": "Lainauslohko",
+"Numbered list": "J\u00e4rjestetty lista",
+"Heading 1": "Otsikko 1",
+"Headings": "Otsikot",
+"Increase indent": "Loitonna",
+"Formats": "Muotoilut",
+"Headers": "Otsikot",
+"Select all": "Valitse kaikki",
+"Header 3": "Otsikko 3",
+"Blocks": "Lohkot",
+"Undo": "Peru",
+"Strikethrough": "Yliviivaus",
+"Bullet list": "J\u00e4rjest\u00e4m\u00e4t\u00f6n lista",
+"Header 1": "Otsikko 1",
+"Superscript": "Yl\u00e4indeksi",
+"Clear formatting": "Poista muotoilu",
+"Font Sizes": "Fonttikoko",
+"Subscript": "Alaindeksi",
+"Header 6": "Otsikko 6",
+"Redo": "Tee uudelleen",
+"Paragraph": "Kappale",
+"Ok": "Ok",
+"Bold": "Lihavointi",
+"Code": "Koodi",
+"Italic": "Kursivointi",
+"Align center": "Keskit\u00e4",
+"Header 5": "Otsikko 5",
+"Heading 6": "Otsikko 6",
+"Heading 3": "Otsikko 3",
+"Decrease indent": "Sisenn\u00e4",
+"Header 4": "Otsikko 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Liitt\u00e4minen on nyt pelk\u00e4n tekstin -tilassa. Sis\u00e4ll\u00f6t liitet\u00e4\u00e4n nyt pelkk\u00e4n\u00e4 tekstin\u00e4, kunnes otat vaihtoehdon pois k\u00e4yt\u00f6st\u00e4.",
+"Underline": "Alleviivaus",
+"Cancel": "Peruuta",
+"Justify": "Tasaa",
+"Inline": "Samalla rivill\u00e4",
+"Copy": "Kopioi",
+"Align left": "Tasaa vasemmalle",
+"Visual aids": "Visuaaliset neuvot",
+"Lower Greek": "pienet kirjaimet: \u03b1, \u03b2, \u03b3",
+"Square": "Neli\u00f6",
+"Default": "Oletus",
+"Lower Alpha": "pienet kirjaimet: a, b, c",
+"Circle": "Pallo",
+"Disc": "Ympyr\u00e4",
+"Upper Alpha": "isot kirjaimet: A, B, C",
+"Upper Roman": "isot kirjaimet: I, II, III",
+"Lower Roman": "pienet kirjaimet: i, ii, iii",
+"Name": "Nimi",
+"Anchor": "Ankkuri",
+"You have unsaved changes are you sure you want to navigate away?": "Sinulla on tallentamattomia muutoksia, haluatko varmasti siirty\u00e4 toiselle sivulle?",
+"Restore last draft": "Palauta aiempi luonnos",
+"Special character": "Erikoismerkki",
+"Source code": "L\u00e4hdekoodi",
+"Color": "V\u00e4ri",
+"Right to left": "Oikealta vasemmalle",
+"Left to right": "Vasemmalta oikealle",
+"Emoticons": "Hymi\u00f6t",
+"Robots": "Robotit",
+"Document properties": "Dokumentin ominaisuudet",
+"Title": "Otsikko",
+"Keywords": "Avainsanat",
+"Encoding": "Merkist\u00f6",
+"Description": "Kuvaus",
+"Author": "Tekij\u00e4",
+"Fullscreen": "Koko ruutu",
+"Horizontal line": "Vaakasuora viiva",
+"Horizontal space": "Horisontaalinen tila",
+"Insert\/edit image": "Lis\u00e4\u00e4\/muokkaa kuva",
+"General": "Yleiset",
+"Advanced": "Lis\u00e4asetukset",
+"Source": "L\u00e4hde",
+"Border": "Reunus",
+"Constrain proportions": "S\u00e4ilyt\u00e4 mittasuhteet",
+"Vertical space": "Vertikaalinen tila",
+"Image description": "Kuvaus",
+"Style": "Tyyli",
+"Dimensions": "Mittasuhteet",
+"Insert image": "Lis\u00e4\u00e4 kuva",
+"Insert date\/time": "Lis\u00e4\u00e4 p\u00e4iv\u00e4m\u00e4\u00e4r\u00e4 tai aika",
+"Remove link": "Poista linkki",
+"Url": "Osoite",
+"Text to display": "N\u00e4ytett\u00e4v\u00e4 teksti",
+"Anchors": "Ankkurit",
+"Insert link": "Lis\u00e4\u00e4 linkki",
+"New window": "Uusi ikkuna",
+"None": "Ei mit\u00e4\u00e4n",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan ulkoinen linkki. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun http:\/\/ -etuliitteen?",
+"Target": "Kohde",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan s\u00e4hk\u00f6postiosoite. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun mailto: -etuliitteen?",
+"Insert\/edit link": "Lis\u00e4\u00e4 tai muokkaa linkki",
+"Insert\/edit video": "Lis\u00e4\u00e4\/muokkaa video",
+"Poster": "L\u00e4hett\u00e4j\u00e4",
+"Alternative source": "Vaihtoehtoinen l\u00e4hde",
+"Paste your embed code below:": "Liit\u00e4 upotuskoodisi alapuolelle:",
+"Insert video": "Lis\u00e4\u00e4 video",
+"Embed": "Upota",
+"Nonbreaking space": "Sitova v\u00e4lily\u00f6nti",
+"Page break": "Sivunvaihto",
+"Paste as text": "Liit\u00e4 tekstin\u00e4",
+"Preview": "Esikatselu",
+"Print": "Tulosta",
+"Save": "Tallenna",
+"Could not find the specified string.": "Haettua merkkijonoa ei l\u00f6ytynyt.",
+"Replace": "Korvaa",
+"Next": "Seur.",
+"Whole words": "Koko sanat",
+"Find and replace": "Etsi ja korvaa",
+"Replace with": "Korvaa",
+"Find": "Etsi",
+"Replace all": "Korvaa kaikki",
+"Match case": "Erota isot ja pienet kirjaimet",
+"Prev": "Edel.",
+"Spellcheck": "Oikolue",
+"Finish": "Lopeta",
+"Ignore all": "\u00c4l\u00e4 huomioi mit\u00e4\u00e4n",
+"Ignore": "\u00c4l\u00e4 huomioi",
+"Add to Dictionary": "Lis\u00e4\u00e4 sanakirjaan",
+"Insert row before": "Lis\u00e4\u00e4 rivi ennen",
+"Rows": "Rivit",
+"Height": "Korkeus",
+"Paste row after": "Liit\u00e4 rivi j\u00e4lkeen",
+"Alignment": "Tasaus",
+"Border color": "Reunuksen v\u00e4ri",
+"Column group": "Sarakeryhm\u00e4",
+"Row": "Rivi",
+"Insert column before": "Lis\u00e4\u00e4 rivi ennen",
+"Split cell": "Jaa solu",
+"Cell padding": "Solun tyhj\u00e4 tila",
+"Cell spacing": "Solun v\u00e4li",
+"Row type": "Rivityyppi",
+"Insert table": "Lis\u00e4\u00e4 taulukko",
+"Body": "Runko",
+"Caption": "Seloste",
+"Footer": "Alaosa",
+"Delete row": "Poista rivi",
+"Paste row before": "Liit\u00e4 rivi ennen",
+"Scope": "Laajuus",
+"Delete table": "Poista taulukko",
+"H Align": "H tasaus",
+"Top": "Yl\u00e4reuna",
+"Header cell": "Otsikkosolu",
+"Column": "Sarake",
+"Row group": "Riviryhm\u00e4",
+"Cell": "Solu",
+"Middle": "Keskikohta",
+"Cell type": "Solun tyyppi",
+"Copy row": "Kopioi rivi",
+"Row properties": "Rivin ominaisuudet",
+"Table properties": "Taulukon ominaisuudet",
+"Bottom": "Alareuna",
+"V Align": "V tasaus",
+"Header": "Otsikko",
+"Right": "Oikea",
+"Insert column after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
+"Cols": "Sarakkeet",
+"Insert row after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
+"Width": "Leveys",
+"Cell properties": "Solun ominaisuudet",
+"Left": "Vasen",
+"Cut row": "Leikkaa rivi",
+"Delete column": "Poista sarake",
+"Center": "Keskell\u00e4",
+"Merge cells": "Yhdist\u00e4 solut",
+"Insert template": "Lis\u00e4\u00e4 pohja",
+"Templates": "Pohjat",
+"Background color": "Taustan v\u00e4ri",
+"Custom...": "Mukauta...",
+"Custom color": "Mukautettu v\u00e4ri",
+"No color": "Ei v\u00e4ri\u00e4",
+"Text color": "Tekstin v\u00e4ri",
+"Show blocks": "N\u00e4yt\u00e4 lohkot",
+"Show invisible characters": "N\u00e4yt\u00e4 n\u00e4kym\u00e4tt\u00f6m\u00e4t merkit",
+"Words: {0}": "Sanat: {0}",
+"Insert": "Lis\u00e4\u00e4",
+"File": "Tiedosto",
+"Edit": "Muokkaa",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastetun tekstin alue. Paina ALT-F9 valikkoon. Paina ALT-F10 ty\u00f6kaluriviin. Paina ALT-0 ohjeeseen.",
+"Tools": "Ty\u00f6kalut",
+"View": "N\u00e4yt\u00e4",
+"Table": "Taulukko",
+"Format": "Muotoilu"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/fo.js b/core/media/editors/tinymce/langs/fo.js
new file mode 100644
index 00000000..ad64ec81
--- /dev/null
+++ b/core/media/editors/tinymce/langs/fo.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('fo',{
+"Cut": "Klipp",
+"Header 2": "Header 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "T\u00edn kagi hevur ikki beinlei\u00f0is atgongd til setibor\u00f0i\u00f0. Vinarliga br\u00faka CTRL+X\/C\/V snarvegirnar \u00edsta\u00f0in.",
+"Div": "Div",
+"Paste": "L\u00edma",
+"Close": "Lat aftur",
+"Font Family": "Font Family",
+"Pre": "Pre",
+"Align right": "H\u00f8gra stilla",
+"New document": "N\u00fdtt skjal",
+"Blockquote": "Blockquote",
+"Numbered list": "Tal listi",
+"Increase indent": "vaks inndr\u00e1tt",
+"Formats": "Sni\u00f0",
+"Headers": "Headers",
+"Select all": "Vel alt",
+"Header 3": "Header 3",
+"Blocks": "Blocks",
+"Undo": "Angra ger",
+"Strikethrough": "Strika \u00edgj\u00f8gnum",
+"Bullet list": "Punkt listi",
+"Header 1": "Header 1",
+"Superscript": "H\u00e1skrift",
+"Clear formatting": "Strika sni\u00f0",
+"Font Sizes": "Font Sizes",
+"Subscript": "L\u00e1gskrift",
+"Header 6": "Header 6",
+"Redo": "Ger aftur",
+"Paragraph": "Paragraph",
+"Ok": "Ok",
+"Bold": "Feit",
+"Code": "Code",
+"Italic": "Sk\u00e1ktekstur",
+"Align center": "Mi\u00f0set",
+"Header 5": "Header 5",
+"Decrease indent": "Minka inndr\u00e1tt",
+"Header 4": "Header 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
+"Underline": "Undirstrika",
+"Cancel": "\u00d3gilda",
+"Justify": "L\u00edka breddar",
+"Inline": "Inline",
+"Copy": "Avrita",
+"Align left": "Vinstra stilla",
+"Visual aids": "Sj\u00f3nhj\u00e1lp",
+"Lower Greek": "L\u00edti Grikskt",
+"Square": "Fj\u00f3rhyrningur",
+"Default": "Forsettur",
+"Lower Alpha": "L\u00edti Alfa",
+"Circle": "Ringur",
+"Disc": "Skiva",
+"Upper Alpha": "St\u00f3rt Alfa",
+"Upper Roman": "St\u00f3rt R\u00f3mverskt",
+"Lower Roman": "L\u00edti R\u00f3mverskt",
+"Name": "Navn",
+"Anchor": "Akker",
+"You have unsaved changes are you sure you want to navigate away?": "T\u00fa hevur ikki goymdar broytingar. Ert t\u00fa v\u00edsur \u00ed at t\u00fa vilt halda fram?",
+"Restore last draft": "Endurskapa seinasta uppkast",
+"Special character": "Serst\u00f8k tekn",
+"Source code": "keldukoda",
+"Right to left": "H\u00f8gra til vinstra",
+"Left to right": "Vinstra til h\u00f8gra",
+"Emoticons": "Emotikonur",
+"Robots": "Robottar",
+"Document properties": "Skjal eginleikar",
+"Title": "Heiti",
+"Keywords": "Leitior\u00f0",
+"Encoding": "Koding",
+"Description": "L\u00fdsing",
+"Author": "H\u00f8vundur",
+"Fullscreen": "Fullan sk\u00edggja",
+"Horizontal line": "Vatnr\u00f8tt linja",
+"Horizontal space": "Vatnr\u00e6tt fr\u00e1st\u00f8\u00f0a",
+"Insert\/edit image": "Innset\/r\u00e6tta mynd",
+"General": "Vanligt",
+"Advanced": "Framkomi",
+"Source": "Kelda",
+"Border": "Rammi",
+"Constrain proportions": "Var\u00f0veit lutfall",
+"Vertical space": "Loddr\u00e6t fr\u00e1st\u00f8\u00f0a",
+"Image description": "L\u00fdsing av mynd",
+"Style": "St\u00edlur",
+"Dimensions": "St\u00f8dd",
+"Insert image": "Insert image",
+"Insert date\/time": "Innset dag\/t\u00ed\u00f0",
+"Remove link": "Remove link",
+"Url": "Url",
+"Text to display": "Tekstur at v\u00edsa",
+"Anchors": "Anchors",
+"Insert link": "Innset leinkju",
+"New window": "N\u00fdggjan glugga",
+"None": "Eingin",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "M\u00e1l",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Innset\/r\u00e6tta leinkju",
+"Insert\/edit video": "Innset\/r\u00e6tta kykmynd",
+"Poster": "Uppslag",
+"Alternative source": "Onnur kelda",
+"Paste your embed code below:": "Innset ta\u00f0 kodu, sum skal leggjast inn \u00ed, ni\u00f0anfyri:",
+"Insert video": "Innset kykmynd",
+"Embed": "Legg inn \u00ed",
+"Nonbreaking space": "Hart millumr\u00fam",
+"Page break": "S\u00ed\u00f0uskift",
+"Paste as text": "Paste as text",
+"Preview": "V\u00eds frammanundan",
+"Print": "Prenta",
+"Save": "Goym",
+"Could not find the specified string.": "Kundi ikki finna leititekst",
+"Replace": "Set \u00edsta\u00f0in",
+"Next": "N\u00e6sta",
+"Whole words": "Heil or\u00f0",
+"Find and replace": "Finn og set \u00edsta\u00f0in",
+"Replace with": "Set \u00edsta\u00f0in",
+"Find": "Finn",
+"Replace all": "Set \u00edsta\u00f0in fyri \u00f8ll",
+"Match case": "ST\u00d3RIR og l\u00edtlir b\u00f3kstavir",
+"Prev": "Fyrra",
+"Spellcheck": "R\u00e6ttstavari",
+"Finish": "Enda",
+"Ignore all": "Leyp alt um",
+"Ignore": "Leyp um",
+"Insert row before": "Innset ra\u00f0 \u00e1\u00f0renn",
+"Rows": "R\u00f8\u00f0",
+"Height": "H\u00e6dd",
+"Paste row after": "L\u00edma ra\u00f0 aftan\u00e1",
+"Alignment": "Stilling",
+"Column group": "Teig b\u00f3lkur",
+"Row": "Ra\u00f0",
+"Insert column before": "Innset teig \u00e1\u00f0renn",
+"Split cell": "Syndra puntar",
+"Cell padding": "Punt fylling",
+"Cell spacing": "Punt fr\u00e1st\u00f8\u00f0a",
+"Row type": "Ra\u00f0 slag",
+"Insert table": "Innset talvu",
+"Body": "Likam",
+"Caption": "Tekstur",
+"Footer": "F\u00f3tur",
+"Delete row": "Skrika ra\u00f0",
+"Paste row before": "L\u00edma ra\u00f0 \u00e1\u00f0renn",
+"Scope": "N\u00fdtslu\u00f8ki",
+"Delete table": "Strika talvu",
+"Header cell": "H\u00f8vd puntur",
+"Column": "Teigur",
+"Cell": "Puntur",
+"Header": "H\u00f8vd",
+"Cell type": "Punt slag",
+"Copy row": "Avrita ra\u00f0",
+"Row properties": "Ra\u00f0 eginleikar",
+"Table properties": "Talvu eginleikar",
+"Row group": "Ra\u00f0 b\u00f3lkur",
+"Right": "H\u00f8gra",
+"Insert column after": "Innset teig aftan\u00e1",
+"Cols": "Teigar",
+"Insert row after": "Innset ra\u00f0 aftan\u00e1",
+"Width": "Breidd",
+"Cell properties": "Punt eginleikar",
+"Left": "Vinstra",
+"Cut row": "Klipp ra\u00f0",
+"Delete column": "Strika teig",
+"Center": "Mi\u00f0a",
+"Merge cells": "Fl\u00e6tta puntar",
+"Insert template": "Innset form",
+"Templates": "Formur",
+"Background color": "Bakgrundslitur",
+"Text color": "Tekst litur",
+"Show blocks": "V\u00eds blokkar",
+"Show invisible characters": "V\u00eds \u00f3sj\u00f3nlig tekn",
+"Words: {0}": "Or\u00f0: {0}",
+"Insert": "Innset",
+"File": "F\u00edla",
+"Edit": "Ritstj\u00f3rna",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "R\u00edkt Tekst \u00d8ki. Tr\u00fdst ALT-F9 fyri valmynd. Tr\u00fdst ALT-F10 fyri ambo\u00f0slinju. Tr\u00fdst ALT-0 fyri hj\u00e1lp",
+"Tools": "Ambo\u00f0",
+"View": "V\u00eds",
+"Table": "Talva",
+"Format": "Smi\u00f0"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/fr.js b/core/media/editors/tinymce/langs/fr.js
new file mode 100644
index 00000000..28899ba5
--- /dev/null
+++ b/core/media/editors/tinymce/langs/fr.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('fr',{
+"Cut": "Couper",
+"Heading 5": "En-t\u00eate 5",
+"Header 2": "Titre 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas la copie directe. Merci d'utiliser les touches Ctrl+X\/C\/V.",
+"Heading 4": "En-t\u00eate 4",
+"Div": "Div",
+"Heading 2": "En-t\u00eate 2",
+"Paste": "Coller",
+"Close": "Fermer",
+"Font Family": "Police",
+"Pre": "Pre",
+"Align right": "Aligner \u00e0 droite",
+"New document": "Nouveau document",
+"Blockquote": "Citation",
+"Numbered list": "Num\u00e9rotation",
+"Heading 1": "En-t\u00eate 1",
+"Headings": "En-t\u00eates",
+"Increase indent": "Augmenter le retrait",
+"Formats": "Formats",
+"Headers": "Titres",
+"Select all": "Tout s\u00e9lectionner",
+"Header 3": "Titre 3",
+"Blocks": "Blocs",
+"Undo": "Annuler",
+"Strikethrough": "Barr\u00e9",
+"Bullet list": "Puces",
+"Header 1": "Titre 1",
+"Superscript": "Exposant",
+"Clear formatting": "Effacer la mise en forme",
+"Font Sizes": "Taille de police",
+"Subscript": "Indice",
+"Header 6": "Titre 6",
+"Redo": "R\u00e9tablir",
+"Paragraph": "Paragraphe",
+"Ok": "Ok",
+"Bold": "Gras",
+"Code": "Code",
+"Italic": "Italique",
+"Align center": "Centrer",
+"Header 5": "Titre 5",
+"Heading 6": "En-t\u00eate 6",
+"Heading 3": "En-t\u00eate 3",
+"Decrease indent": "Diminuer le retrait",
+"Header 4": "Titre 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
+"Underline": "Soulign\u00e9",
+"Cancel": "Annuler",
+"Justify": "Justifier",
+"Inline": "En ligne",
+"Copy": "Copier",
+"Align left": "Aligner \u00e0 gauche",
+"Visual aids": "Aides visuelle",
+"Lower Greek": "Grec minuscule",
+"Square": "Carr\u00e9",
+"Default": "Par d\u00e9faut",
+"Lower Alpha": "Alpha minuscule",
+"Circle": "Cercle",
+"Disc": "Disque",
+"Upper Alpha": "Alpha majuscule",
+"Upper Roman": "Romain majuscule",
+"Lower Roman": "Romain minuscule",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'Id doit commencer par une lettre suivi par des lettres, nombres, tirets, points, deux-points ou underscores",
+"Name": "Nom",
+"Anchor": "Ancre",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Vous avez des modifications non enregistr\u00e9es, \u00eates-vous s\u00fbr de quitter la page?",
+"Restore last draft": "Restaurer le dernier brouillon",
+"Special character": "Caract\u00e8res sp\u00e9ciaux",
+"Source code": "Code source",
+"Language": "Langue",
+"Insert\/Edit code sample": "Ins\u00e9rer \/ modifier une exemple de code",
+"B": "B",
+"R": "R",
+"G": "V",
+"Color": "Couleur",
+"Right to left": "Droite \u00e0 gauche",
+"Left to right": "Gauche \u00e0 droite",
+"Emoticons": "Emotic\u00f4nes",
+"Robots": "Robots",
+"Document properties": "Propri\u00e9t\u00e9 du document",
+"Title": "Titre",
+"Keywords": "Mots-cl\u00e9s",
+"Encoding": "Encodage",
+"Description": "Description",
+"Author": "Auteur",
+"Fullscreen": "Plein \u00e9cran",
+"Horizontal line": "Ligne horizontale",
+"Horizontal space": "Espacement horizontal",
+"Insert\/edit image": "Ins\u00e9rer\/modifier une image",
+"General": "G\u00e9n\u00e9ral",
+"Advanced": "Avanc\u00e9",
+"Source": "Source",
+"Border": "Bordure",
+"Constrain proportions": "Conserver les proportions",
+"Vertical space": "Espacement vertical",
+"Image description": "Description de l'image",
+"Style": "Style",
+"Dimensions": "Dimensions",
+"Insert image": "Ins\u00e9rer une image",
+"Image": "Image",
+"Zoom in": "Zoomer",
+"Contrast": "Contraste",
+"Back": "Retour",
+"Gamma": "Gamma",
+"Flip horizontally": "Retournement horizontal",
+"Resize": "Redimensionner",
+"Sharpen": "Affiner",
+"Zoom out": "D\u00e9zoomer",
+"Image options": "Options de l'image",
+"Apply": "Appliquer",
+"Brightness": "Luminosit\u00e9",
+"Rotate clockwise": "Rotation horaire",
+"Rotate counterclockwise": "Rotation anti-horaire",
+"Edit image": "Modifier l'image",
+"Color levels": "Niveaux de couleur",
+"Crop": "Rogner",
+"Orientation": "Orientation",
+"Flip vertically": "Retournement vertical",
+"Invert": "Inverser",
+"Date\/time": "Date\/heure",
+"Insert date\/time": "Ins\u00e9rer date\/heure",
+"Remove link": "Enlever le lien",
+"Url": "Url",
+"Text to display": "Texte \u00e0 afficher",
+"Anchors": "Ancres",
+"Insert link": "Ins\u00e9rer un lien",
+"Link": "Lien",
+"New window": "Nouvelle fen\u00eatre",
+"None": "n\/a",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
+"Paste or type a link": "Coller ou taper un lien",
+"Target": "Cible",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
+"Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
+"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
+"Media": "M\u00e9dia",
+"Alternative source": "Source alternative",
+"Paste your embed code below:": "Collez votre code d'int\u00e9gration ci-dessous :",
+"Insert video": "Ins\u00e9rer une vid\u00e9o",
+"Poster": "Publier",
+"Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia",
+"Embed": "Int\u00e9grer",
+"Nonbreaking space": "Espace ins\u00e9cable",
+"Page break": "Saut de page",
+"Paste as text": "Coller comme texte",
+"Preview": "Pr\u00e9visualiser",
+"Print": "Imprimer",
+"Save": "Enregistrer",
+"Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
+"Replace": "Remplacer",
+"Next": "Suiv",
+"Whole words": "Mots entiers",
+"Find and replace": "Trouver et remplacer",
+"Replace with": "Remplacer par",
+"Find": "Chercher",
+"Replace all": "Tout remplacer",
+"Match case": "Respecter la casse",
+"Prev": "Pr\u00e9c ",
+"Spellcheck": "V\u00e9rification orthographique",
+"Finish": "Finie",
+"Ignore all": "Tout ignorer",
+"Ignore": "Ignorer",
+"Add to Dictionary": "Ajouter au dictionnaire",
+"Insert row before": "Ins\u00e9rer une ligne avant",
+"Rows": "Lignes",
+"Height": "Hauteur",
+"Paste row after": "Coller la ligne apr\u00e8s",
+"Alignment": "Alignement",
+"Border color": "Couleur de la bordure",
+"Column group": "Groupe de colonnes",
+"Row": "Ligne",
+"Insert column before": "Ins\u00e9rer une colonne avant",
+"Split cell": "Diviser la cellule",
+"Cell padding": "Espacement interne cellule",
+"Cell spacing": "Espacement inter-cellulles",
+"Row type": "Type de ligne",
+"Insert table": "Ins\u00e9rer un tableau",
+"Body": "Corps",
+"Caption": "Titre",
+"Footer": "Pied",
+"Delete row": "Effacer la ligne",
+"Paste row before": "Coller la ligne avant",
+"Scope": "Etendue",
+"Delete table": "Supprimer le tableau",
+"H Align": "Alignement H",
+"Top": "Haut",
+"Header cell": "Cellule d'en-t\u00eate",
+"Column": "Colonne",
+"Row group": "Groupe de lignes",
+"Cell": "Cellule",
+"Middle": "Milieu",
+"Cell type": "Type de cellule",
+"Copy row": "Copier la ligne",
+"Row properties": "Propri\u00e9t\u00e9s de la ligne",
+"Table properties": "Propri\u00e9t\u00e9s du tableau",
+"Bottom": "Bas",
+"V Align": "Alignement V",
+"Header": "En-t\u00eate",
+"Right": "Droite",
+"Insert column after": "Ins\u00e9rer une colonne apr\u00e8s",
+"Cols": "Colonnes",
+"Insert row after": "Ins\u00e9rer une ligne apr\u00e8s",
+"Width": "Largeur",
+"Cell properties": "Propri\u00e9t\u00e9s de la cellule",
+"Left": "Gauche",
+"Cut row": "Couper la ligne",
+"Delete column": "Effacer la colonne",
+"Center": "Centr\u00e9",
+"Merge cells": "Fusionner les cellules",
+"Insert template": "Ajouter un th\u00e8me",
+"Templates": "Th\u00e8mes",
+"Background color": "Couleur d'arri\u00e8re-plan",
+"Custom...": "Personnalis\u00e9...",
+"Custom color": "Couleur personnalis\u00e9e",
+"No color": "Aucune couleur",
+"Text color": "Couleur du texte",
+"Table of Contents": "Table des mati\u00e8res",
+"Show blocks": "Afficher les blocs",
+"Show invisible characters": "Afficher les caract\u00e8res invisibles",
+"Words: {0}": "Mots : {0}",
+"Insert": "Ins\u00e9rer",
+"File": "Fichier",
+"Edit": "Editer",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide.",
+"Tools": "Outils",
+"View": "Voir",
+"Table": "Tableau",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ga.js b/core/media/editors/tinymce/langs/ga.js
new file mode 100644
index 00000000..847877a0
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ga.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('ga',{
+"Cut": "Gearr",
+"Heading 5": "Ceannteideal 5",
+"Header 2": "Ceannt\u00e1sc 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "N\u00ed f\u00e9idir le do bhrabhs\u00e1la\u00ed teacht go d\u00edreach ar an ngearrthaisce. Bain \u00fas\u00e1id as na haicearra\u00ed Ctrl+X\/C\/V. ",
+"Heading 4": "Ceannteideal 4",
+"Div": "Deighilt",
+"Heading 2": "Ceannteideal 2",
+"Paste": "Greamaigh",
+"Close": "D\u00fan",
+"Font Family": "Cl\u00f3fhoireann",
+"Pre": "R\u00e9amh",
+"Align right": "Ail\u00ednigh ar dheis",
+"New document": "C\u00e1ip\u00e9is nua",
+"Blockquote": "Athfhriotal",
+"Numbered list": "Liosta Uimhrithe",
+"Heading 1": "Ceannteideal 1",
+"Headings": "Ceannteidil",
+"Increase indent": "M\u00e9adaigh eang",
+"Formats": "Form\u00e1id\u00ed",
+"Headers": "Ceannt\u00e1sca",
+"Select all": "Roghnaigh uile",
+"Header 3": "Ceannt\u00e1sc 3",
+"Blocks": "Blocanna",
+"Undo": "Cealaigh",
+"Strikethrough": "L\u00edne tr\u00edd",
+"Bullet list": "Liosta Urchar",
+"Header 1": "Ceannt\u00e1sc 1",
+"Superscript": "Forscript",
+"Clear formatting": "Glan form\u00e1idi\u00fa",
+"Font Sizes": "Cl\u00f3mh\u00e9ideanna",
+"Subscript": "Foscript",
+"Header 6": "Ceannt\u00e1sc 6",
+"Redo": "Athdh\u00e9an",
+"Paragraph": "Alt",
+"Ok": "OK",
+"Bold": "Trom",
+"Code": "C\u00f3d",
+"Italic": "Iod\u00e1lach",
+"Align center": "Ail\u00ednigh sa l\u00e1r",
+"Header 5": "Ceannt\u00e1sc 5",
+"Heading 6": "Ceannteideal 6",
+"Heading 3": "Ceannteideal 3",
+"Decrease indent": "Laghdaigh eang",
+"Header 4": "Ceannt\u00e1sc 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Sa m\u00f3d gn\u00e1th-th\u00e9acs anois. Gream\u00f3far \u00e1bhar mar ghn\u00e1th-th\u00e9acs go dt\u00ed go m\u00fachfaidh t\u00fa an rogha seo.",
+"Underline": "Fol\u00edne",
+"Cancel": "Cealaigh",
+"Justify": "Comhfhadaigh",
+"Inline": "Inl\u00edne",
+"Copy": "C\u00f3ipe\u00e1il",
+"Align left": "Ail\u00ednigh ar chl\u00e9",
+"Visual aids": "\u00c1iseanna amhairc",
+"Lower Greek": "Litir Bheag Ghr\u00e9agach",
+"Square": "Cearn\u00f3g",
+"Default": "R\u00e9amhshocr\u00fa",
+"Lower Alpha": "Alfa Beag",
+"Circle": "Ciorcal",
+"Disc": "Diosca",
+"Upper Alpha": "Alfa M\u00f3r",
+"Upper Roman": "Litir Mh\u00f3r R\u00f3mh\u00e1nach",
+"Lower Roman": "Litir Bheag R\u00f3mh\u00e1nach",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "N\u00ed m\u00f3r don aitheantas tos\u00fa le litir, agus gan ach litreacha, uimhreacha, daiseanna, poncanna, idirstadanna, n\u00f3 fostr\u00edoca ina dhiaidh sin.",
+"Name": "Ainm",
+"Anchor": "Ancaire",
+"Id": "Aitheantas",
+"You have unsaved changes are you sure you want to navigate away?": "T\u00e1 athruithe gan s\u00e1bh\u00e1il ann. An bhfuil t\u00fa cinnte gur mhaith leat imeacht amach as seo?",
+"Restore last draft": "Oscail an dr\u00e9acht is d\u00e9ana\u00ed",
+"Special character": "Carachtar speisialta",
+"Source code": "C\u00f3d foinseach",
+"Language": "Teanga",
+"Insert\/Edit code sample": "Cuir sampla c\u00f3id isteach\/in eagar",
+"B": "G",
+"R": "D",
+"G": "U",
+"Color": "Dath",
+"Right to left": "Deas-go-cl\u00e9",
+"Left to right": "Cl\u00e9-go-deas",
+"Emoticons": "Straoiseoga",
+"Robots": "R\u00f3bait",
+"Document properties": "Air\u00edonna na C\u00e1ip\u00e9ise",
+"Title": "Teideal",
+"Keywords": "Lorgfhocail",
+"Encoding": "Ionch\u00f3d\u00fa",
+"Description": "Cur S\u00edos",
+"Author": "\u00dadar",
+"Fullscreen": "L\u00e1nsc\u00e1ile\u00e1n",
+"Horizontal line": "L\u00edne chothrom\u00e1nach",
+"Horizontal space": "Sp\u00e1s cothrom\u00e1nach",
+"Insert\/edit image": "Cuir \u00edomh\u00e1 isteach\/in eagar",
+"General": "Ginear\u00e1lta",
+"Advanced": "Casta",
+"Source": "Foinse",
+"Border": "Iml\u00edne",
+"Constrain proportions": "Comhr\u00e9ir faoi ghlas",
+"Vertical space": "Sp\u00e1s ingearach",
+"Image description": "Cur s\u00edos ar an \u00edomh\u00e1",
+"Style": "St\u00edl",
+"Dimensions": "Tois\u00ed",
+"Insert image": "Cuir \u00edomh\u00e1 isteach",
+"Image": "\u00cdomh\u00e1",
+"Zoom in": "Z\u00fam\u00e1il isteach",
+"Contrast": "Codarsnacht",
+"Back": "Siar",
+"Gamma": "G\u00e1ma",
+"Flip horizontally": "Cas go cothrom\u00e1nach",
+"Resize": "Athraigh m\u00e9id",
+"Sharpen": "G\u00e9araigh",
+"Zoom out": "Z\u00fam\u00e1il amach",
+"Image options": "Roghanna \u00edomh\u00e1",
+"Apply": "Cuir i bhfeidhm",
+"Brightness": "Gile",
+"Rotate clockwise": "Rothlaigh ar deiseal",
+"Rotate counterclockwise": "Rothlaigh ar tuathal",
+"Edit image": "Cuir an \u00edomh\u00e1 in eagar",
+"Color levels": "Leibh\u00e9il datha",
+"Crop": "Bear",
+"Orientation": "Treoshu\u00edomh",
+"Flip vertically": "Cas go hingearach",
+"Invert": "Inbh\u00e9artaigh",
+"Date\/time": "D\u00e1ta\/am",
+"Insert date\/time": "Cuir d\u00e1ta\/am isteach",
+"Remove link": "Bain an nasc",
+"Url": "URL",
+"Text to display": "T\u00e9acs le taispe\u00e1int",
+"Anchors": "Ancair\u00ed",
+"Insert link": "Cuir nasc isteach",
+"Link": "Nasc",
+"New window": "Fuinneog nua",
+"None": "Dada",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Is nasc seachtrach \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach http:\/\/ a chur leis?",
+"Paste or type a link": "Greamaigh n\u00f3 cl\u00f3scr\u00edobh nasc",
+"Target": "Sprioc",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Is seoladh r\u00edomhphoist \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach mailto: a chur leis?",
+"Insert\/edit link": "Cuir nasc isteach\/in eagar",
+"Insert\/edit video": "Cuir f\u00edse\u00e1n isteach\/in eagar",
+"Media": "Me\u00e1in",
+"Alternative source": "Foinse mhalartach",
+"Paste your embed code below:": "Greamaigh do ch\u00f3d leabaithe th\u00edos:",
+"Insert video": "Cuir f\u00edse\u00e1n isteach",
+"Poster": "P\u00f3staer",
+"Insert\/edit media": "Cuir me\u00e1n isteach\/in eagar",
+"Embed": "Leabaigh",
+"Nonbreaking space": "Sp\u00e1s neamhbhristeach",
+"Page break": "Briseadh leathanaigh",
+"Paste as text": "Greamaigh mar th\u00e9acs",
+"Preview": "R\u00e9amhamharc",
+"Print": "Priont\u00e1il",
+"Save": "S\u00e1bh\u00e1il",
+"Could not find the specified string.": "N\u00edor aims\u00edodh an teaghr\u00e1n.",
+"Replace": "Ionadaigh",
+"Next": "Ar aghaidh",
+"Whole words": "Focail ioml\u00e1na",
+"Find and replace": "Aimsigh agus ionadaigh",
+"Replace with": "Ionadaigh le",
+"Find": "Aimsigh",
+"Replace all": "Ionadaigh uile",
+"Match case": "C\u00e1s-\u00edogair",
+"Prev": "Siar",
+"Spellcheck": "Seice\u00e1il an litri\u00fa",
+"Finish": "Cr\u00edochnaigh",
+"Ignore all": "D\u00e9an neamhaird orthu go l\u00e9ir",
+"Ignore": "D\u00e9an neamhaird air",
+"Add to Dictionary": "Cuir leis an bhFocl\u00f3ir \u00e9",
+"Insert row before": "Ions\u00e1igh r\u00f3 os a chionn",
+"Rows": "R\u00f3nna",
+"Height": "Airde",
+"Paste row after": "Greamaigh r\u00f3 faoi",
+"Alignment": "Ail\u00edni\u00fa",
+"Border color": "Dath na himl\u00edne",
+"Column group": "Gr\u00fapa col\u00fan",
+"Row": "R\u00f3",
+"Insert column before": "Ions\u00e1igh col\u00fan ar chl\u00e9",
+"Split cell": "Roinn cill",
+"Cell padding": "Stu\u00e1il ceall",
+"Cell spacing": "Sp\u00e1s\u00e1il ceall",
+"Row type": "Cine\u00e1l an r\u00f3",
+"Insert table": "Ions\u00e1igh t\u00e1bla",
+"Body": "Corp",
+"Caption": "Fotheideal",
+"Footer": "Bunt\u00e1sc",
+"Delete row": "Scrios an r\u00f3",
+"Paste row before": "Greamaigh r\u00f3 os a chionn",
+"Scope": "Sc\u00f3ip",
+"Delete table": "Scrios an t\u00e1bla",
+"H Align": "Ail\u00edni\u00fa C.",
+"Top": "Barr",
+"Header cell": "Cill cheannt\u00e1isc",
+"Column": "Col\u00fan",
+"Row group": "Gr\u00fapa r\u00f3nna",
+"Cell": "Cill",
+"Middle": "L\u00e1r",
+"Cell type": "Cine\u00e1l na cille",
+"Copy row": "C\u00f3ipe\u00e1il an r\u00f3",
+"Row properties": "Air\u00edonna an r\u00f3",
+"Table properties": "Air\u00edonna an t\u00e1bla",
+"Bottom": "Bun",
+"V Align": "Ail\u00edni\u00fa I.",
+"Header": "Ceannt\u00e1sc",
+"Right": "Ar Dheis",
+"Insert column after": "Ions\u00e1igh col\u00fan ar dheis",
+"Cols": "Col\u00fain",
+"Insert row after": "Ions\u00e1igh r\u00f3 faoi",
+"Width": "Leithead",
+"Cell properties": "Air\u00edonna na cille",
+"Left": "Ar Chl\u00e9",
+"Cut row": "Gearr an r\u00f3",
+"Delete column": "Scrios an col\u00fan",
+"Center": "Sa L\u00e1r",
+"Merge cells": "Cumaisc cealla",
+"Insert template": "Ions\u00e1igh teimpl\u00e9ad",
+"Templates": "Teimpl\u00e9id",
+"Background color": "Dath an ch\u00falra",
+"Custom...": "Saincheap...",
+"Custom color": "Dath saincheaptha",
+"No color": "Gan dath",
+"Text color": "Dath an t\u00e9acs",
+"Table of Contents": "Cl\u00e1r na n\u00c1bhar",
+"Show blocks": "Taispe\u00e1in blocanna",
+"Show invisible characters": "Taispe\u00e1in carachtair dhofheicthe",
+"Words: {0}": "Focail: {0}",
+"Insert": "Ions\u00e1ig",
+"File": "Comhad",
+"Edit": "Eagar",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Limist\u00e9ar M\u00e9ith-Th\u00e9acs. Br\u00faigh ALT-F9 le haghaidh roghchl\u00e1ir, ALT-F10 le haghaidh barra uirlis\u00ed, agus ALT-0 le c\u00fanamh a fh\u00e1il",
+"Tools": "Uirlis\u00ed",
+"View": "Amharc",
+"Table": "T\u00e1bla",
+"Format": "Form\u00e1id"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/gl.js b/core/media/editors/tinymce/langs/gl.js
new file mode 100644
index 00000000..2f0365ee
--- /dev/null
+++ b/core/media/editors/tinymce/langs/gl.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('gl',{
+"Cut": "Cortar",
+"Header 2": "Cabeceira 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador non admite o acceso directo ao portapapeis. Empregue os atallos de teclado Ctrl+X\/C\/V no seu canto.",
+"Div": "Div",
+"Paste": "Pegar",
+"Close": "Pechar",
+"Font Family": "Tipo de letra",
+"Pre": "Pre",
+"Align right": "Ali\u00f1ar \u00e1 dereita",
+"New document": "Novo documento",
+"Blockquote": "Bloque entre comi\u00f1as",
+"Numbered list": "Lista numerada",
+"Increase indent": "Aumentar a sangr\u00eda",
+"Formats": "Formatos",
+"Headers": "Cabeceiras",
+"Select all": "Seleccionar todo",
+"Header 3": "Cabeceira 3",
+"Blocks": "Bloques",
+"Undo": "Desfacer",
+"Strikethrough": "Riscado",
+"Bullet list": "Lista de vi\u00f1etas",
+"Header 1": "Cabeceira 1",
+"Superscript": "Super\u00edndice",
+"Clear formatting": "Limpar o formato",
+"Font Sizes": "Tama\u00f1o da letra",
+"Subscript": "Sub\u00edndice",
+"Header 6": "Cabeceira 6",
+"Redo": "Refacer",
+"Paragraph": "Par\u00e1grafo",
+"Ok": "Aceptar",
+"Bold": "Negra",
+"Code": "C\u00f3digo",
+"Italic": "Cursiva",
+"Align center": "Ali\u00f1ar ao centro",
+"Header 5": "Cabeceira 5",
+"Decrease indent": "Reducir a sangr\u00eda",
+"Header 4": "Cabeceira 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Neste momento o pegado est\u00e1 definido en modo de texto simple. Os contidos p\u00e9garanse como texto sen formato ata que se active esta opci\u00f3n.",
+"Underline": "Subli\u00f1ado",
+"Cancel": "Cancelar",
+"Justify": "Xustificar",
+"Inline": "En li\u00f1a",
+"Copy": "Copiar",
+"Align left": "Ali\u00f1ar \u00e1 esquerda",
+"Visual aids": "Axudas visuais",
+"Lower Greek": "Grega min\u00fascula",
+"Square": "Cadrado",
+"Default": "Predeterminada",
+"Lower Alpha": "Alfa min\u00fascula",
+"Circle": "Circulo",
+"Disc": "Disco",
+"Upper Alpha": "Alfa mai\u00fascula",
+"Upper Roman": "Romana mai\u00fascula",
+"Lower Roman": "Romana min\u00fascula",
+"Name": "Nome",
+"Anchor": "Ancoraxe",
+"You have unsaved changes are you sure you want to navigate away?": "Ten cambios sen gardar. Confirma que quere sa\u00edr?",
+"Restore last draft": "Restaurar o \u00faltimo borrador",
+"Special character": "Car\u00e1cter especial",
+"Source code": "C\u00f3digo fonte",
+"Right to left": "De dereita a esquerda",
+"Left to right": "De esquerda a dereita",
+"Emoticons": "Emoticonas",
+"Robots": "Robots",
+"Document properties": "Propiedades do documento",
+"Title": "T\u00edtulo",
+"Keywords": "Palabras clave",
+"Encoding": "Codificaci\u00f3n",
+"Description": "Descrici\u00f3n",
+"Author": "Autor",
+"Fullscreen": "Pantalla completa",
+"Horizontal line": "Li\u00f1a horizontal",
+"Horizontal space": "Espazo horizontal",
+"Insert\/edit image": "Inserir\/editar imaxe",
+"General": "Xeral",
+"Advanced": "Avanzado",
+"Source": "Orixe",
+"Border": "Bordo",
+"Constrain proportions": "Restrinxir as proporci\u00f3ns",
+"Vertical space": "Espazo vertical",
+"Image description": "Descrici\u00f3n da imaxe",
+"Style": "Estilo",
+"Dimensions": "Dimensi\u00f3ns",
+"Insert image": "Inserir imaxe",
+"Insert date\/time": "Inserir data\/hora",
+"Remove link": "Retirar a ligaz\u00f3n",
+"Url": "URL",
+"Text to display": "Texto que amosar",
+"Anchors": "Ancoraxes",
+"Insert link": "Inserir ligaz\u00f3n",
+"New window": "Nova xanela",
+"None": "Ning\u00fan",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Destino",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Inserir\/editar ligaz\u00f3n",
+"Insert\/edit video": "Inserir\/editar v\u00eddeo",
+"Poster": "Cartel",
+"Alternative source": "Orixe alternativa",
+"Paste your embed code below:": "Pegue embaixo o c\u00f3digo integrado:",
+"Insert video": "Inserir v\u00eddeo",
+"Embed": "Integrado",
+"Nonbreaking space": "Espazo irromp\u00edbel",
+"Page break": "Quebra de p\u00e1xina",
+"Paste as text": "Pegar como texto",
+"Preview": "Vista previa",
+"Print": "Imprimir",
+"Save": "Gardar",
+"Could not find the specified string.": "Non foi pos\u00edbel atopar a cadea de texto especificada.",
+"Replace": "Substitu\u00edr",
+"Next": "Seguinte",
+"Whole words": "Palabras completas",
+"Find and replace": "Buscar e substitu\u00edr",
+"Replace with": "Substitu\u00edr con",
+"Find": "Buscar",
+"Replace all": "Substitu\u00edr todo",
+"Match case": "Distinguir mai\u00fasculas",
+"Prev": "Anterior",
+"Spellcheck": "Corrector ortogr\u00e1fico",
+"Finish": "Rematar",
+"Ignore all": "Ignorar todo",
+"Ignore": "Ignorar",
+"Insert row before": "Inserir unha fila enriba",
+"Rows": "Filas",
+"Height": "Alto",
+"Paste row after": "Pegar fila enriba",
+"Alignment": "Ali\u00f1amento",
+"Column group": "Grupo de columnas",
+"Row": "Fila",
+"Insert column before": "Inserir columna \u00e1 esquerda",
+"Split cell": "Dividir celas",
+"Cell padding": "Marxe interior da cela",
+"Cell spacing": "Marxe entre celas",
+"Row type": "Tipo de fila",
+"Insert table": "Inserir t\u00e1boa",
+"Body": "Corpo",
+"Caption": "Subt\u00edtulo",
+"Footer": "Rodap\u00e9",
+"Delete row": "Eliminar fila",
+"Paste row before": "Pegar fila embaixo",
+"Scope": "\u00c1mbito",
+"Delete table": "Eliminar t\u00e1boa",
+"Header cell": "Cela de cabeceira",
+"Column": "Columna",
+"Cell": "Cela",
+"Header": "Cabeceira",
+"Cell type": "Tipo de cela",
+"Copy row": "Copiar fila",
+"Row properties": "Propiedades das filas",
+"Table properties": "Propiedades da t\u00e1boa",
+"Row group": "Grupo de filas",
+"Right": "Dereita",
+"Insert column after": "Inserir columna \u00e1 dereita",
+"Cols": "Cols.",
+"Insert row after": "Inserir unha fila embaixo",
+"Width": "Largo",
+"Cell properties": "Propiedades da cela",
+"Left": "Esquerda",
+"Cut row": "Cortar fila",
+"Delete column": "Eliminar columna",
+"Center": "Centro",
+"Merge cells": "Combinar celas",
+"Insert template": "Inserir modelo",
+"Templates": "Modelos",
+"Background color": "Cor do fondo",
+"Text color": "Cor do texto",
+"Show blocks": "Amosar os bloques",
+"Show invisible characters": "Amosar caracteres invis\u00edbeis",
+"Words: {0}": "Palabras: {0}",
+"Insert": "Inserir",
+"File": "Ficheiro",
+"Edit": "Editar",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto mellorado. Prema ALT-F9 para o men\u00fa. Prema ALT-F10 para a barra de ferramentas. Prema ALT-0 para a axuda",
+"Tools": "Ferramentas",
+"View": "Ver",
+"Table": "T\u00e1boa",
+"Format": "Formato"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/he.js b/core/media/editors/tinymce/langs/he.js
new file mode 100644
index 00000000..6c0760e6
--- /dev/null
+++ b/core/media/editors/tinymce/langs/he.js
@@ -0,0 +1,180 @@
+tinymce.addI18n('he',{
+"Cut": "\u05d2\u05d6\u05d5\u05e8",
+"Header 2": "\u05db\u05d5\u05ea\u05e8\u05ea 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u05d4\u05d3\u05e4\u05d3\u05e4\u05df \u05e9\u05dc\u05da \u05d0\u05d9\u05e0\u05d5 \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05dc\u05d5\u05d7. \u05d0\u05e0\u05d0 \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e7\u05d9\u05e6\u05d5\u05e8\u05d9 \u05d4\u05de\u05e7\u05dc\u05d3\u05ea Ctrl+X\/C\/V \u05d1\u05de\u05e7\u05d5\u05dd.",
+"Div": "\u05de\u05e7\u05d8\u05e2 \u05e7\u05d5\u05d3 Div",
+"Paste": "\u05d4\u05d3\u05d1\u05e7",
+"Close": "\u05e1\u05d2\u05d5\u05e8",
+"Font Family": "\u05e1\u05d5\u05d2 \u05d2\u05d5\u05e4\u05df",
+"Pre": "\u05e7\u05d8\u05e2 \u05de\u05e7\u05d3\u05d9\u05dd Pre",
+"Align right": "\u05d9\u05d9\u05e9\u05e8 \u05dc\u05e9\u05de\u05d0\u05dc",
+"New document": "\u05de\u05e1\u05de\u05da \u05d7\u05d3\u05e9",
+"Blockquote": "\u05de\u05e7\u05d8\u05e2 \u05e6\u05d9\u05d8\u05d5\u05d8",
+"Numbered list": "\u05e8\u05e9\u05d9\u05de\u05d4 \u05de\u05de\u05d5\u05e1\u05e4\u05e8\u05ea",
+"Increase indent": "\u05d4\u05d2\u05d3\u05dc \u05d4\u05d6\u05d7\u05d4",
+"Formats": "\u05e4\u05d5\u05e8\u05de\u05d8\u05d9\u05dd",
+"Headers": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea",
+"Select all": "\u05d1\u05d7\u05e8 \u05d4\u05db\u05dc",
+"Header 3": "\u05db\u05d5\u05ea\u05e8\u05ea 3",
+"Blocks": "\u05de\u05d1\u05e0\u05d9\u05dd",
+"Undo": "\u05d1\u05d8\u05dc \u05e4\u05e2\u05d5\u05dc\u05d4",
+"Strikethrough": "\u05e7\u05d5 \u05d7\u05d5\u05e6\u05d4",
+"Bullet list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05ea\u05d1\u05dc\u05d9\u05d8\u05d9\u05dd",
+"Header 1": "\u05db\u05d5\u05ea\u05e8\u05ea 1",
+"Superscript": "\u05db\u05ea\u05d1 \u05e2\u05d9\u05dc\u05d9",
+"Clear formatting": "\u05e0\u05e7\u05d4 \u05e4\u05d5\u05e8\u05de\u05d8\u05d9\u05dd",
+"Font Sizes": "\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df",
+"Subscript": "\u05db\u05ea\u05d1 \u05ea\u05d7\u05ea\u05d9",
+"Header 6": "\u05db\u05d5\u05ea\u05e8\u05ea 6",
+"Redo": "\u05d1\u05e6\u05e2 \u05e9\u05d5\u05d1",
+"Paragraph": "\u05e4\u05d9\u05e1\u05e7\u05d4",
+"Ok": "\u05d0\u05d9\u05e9\u05d5\u05e8",
+"Bold": "\u05de\u05d5\u05d3\u05d2\u05e9",
+"Code": "\u05e7\u05d5\u05d3",
+"Italic": "\u05e0\u05d8\u05d5\u05d9",
+"Align center": "\u05de\u05e8\u05db\u05d6",
+"Header 5": "\u05db\u05d5\u05ea\u05e8\u05ea 5",
+"Decrease indent": "\u05d4\u05e7\u05d8\u05df \u05d4\u05d6\u05d7\u05d4",
+"Header 4": "\u05db\u05d5\u05ea\u05e8\u05ea 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u05d4\u05d3\u05d1\u05e7\u05d4 \u05d1\u05de\u05e6\u05d1 \u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc. \u05ea\u05db\u05e0\u05d9\u05dd \u05d9\u05d5\u05d3\u05d1\u05e7\u05d5 \u05de\u05e2\u05ea\u05d4 \u05db\u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc \u05e2\u05d3 \u05e9\u05ea\u05db\u05d1\u05d4 \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05d6\u05d5.",
+"Underline": "\u05e7\u05d5 \u05ea\u05d7\u05ea\u05d9",
+"Cancel": "\u05d1\u05d8\u05dc",
+"Justify": "\u05de\u05ea\u05d7 \u05dc\u05e6\u05d3\u05d3\u05d9\u05dd",
+"Inline": "\u05d1\u05d2\u05d5\u05e3 \u05d4\u05d8\u05e7\u05e1\u05d8",
+"Copy": "\u05d4\u05e2\u05ea\u05e7",
+"Align left": "\u05d9\u05d9\u05e9\u05e8 \u05dc\u05e9\u05de\u05d0\u05dc",
+"Visual aids": "\u05e2\u05d6\u05e8\u05d9\u05dd \u05d7\u05d6\u05d5\u05ea\u05d9\u05d9\u05dd",
+"Lower Greek": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d9\u05d5\u05d5\u05e0\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
+"Square": "\u05e8\u05d9\u05d1\u05d5\u05e2",
+"Default": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc",
+"Lower Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
+"Circle": "\u05e2\u05d9\u05d2\u05d5\u05dc",
+"Disc": "\u05d7\u05d9\u05e9\u05d5\u05e7",
+"Upper Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
+"Upper Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
+"Lower Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
+"Name": "\u05e9\u05dd",
+"Anchor": "\u05de\u05e7\u05d5\u05dd \u05e2\u05d9\u05d2\u05d5\u05df",
+"You have unsaved changes are you sure you want to navigate away?": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5. \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e6\u05d0\u05ea \u05de\u05d4\u05d3\u05e3?",
+"Restore last draft": "\u05e9\u05d7\u05d6\u05e8 \u05d8\u05d9\u05d5\u05d8\u05d4 \u05d0\u05d7\u05e8\u05d5\u05e0\u05d4",
+"Special character": "\u05ea\u05d5\u05d5\u05d9\u05dd \u05de\u05d9\u05d5\u05d7\u05d3\u05d9\u05dd",
+"Source code": "\u05e7\u05d5\u05d3 \u05de\u05e7\u05d5\u05e8",
+"Right to left": "\u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc",
+"Left to right": "\u05de\u05e9\u05de\u05d0\u05dc \u05dc\u05d9\u05de\u05d9\u05df",
+"Emoticons": "\u05de\u05d7\u05d5\u05d5\u05ea",
+"Robots": "\u05e8\u05d5\u05d1\u05d5\u05d8\u05d9\u05dd",
+"Document properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05e1\u05de\u05da",
+"Title": "\u05db\u05d5\u05ea\u05e8\u05ea",
+"Keywords": "\u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7",
+"Encoding": "\u05e7\u05d9\u05d3\u05d5\u05d3",
+"Description": "\u05ea\u05d9\u05d0\u05d5\u05e8",
+"Author": "\u05de\u05d7\u05d1\u05e8",
+"Fullscreen": "\u05de\u05e1\u05da \u05de\u05dc\u05d0",
+"Horizontal line": "\u05e7\u05d5 \u05d0\u05d5\u05e4\u05e7\u05d9",
+"Horizontal space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05d5\u05e4\u05e7\u05d9",
+"Insert\/edit image": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05ea\u05de\u05d5\u05e0\u05d4",
+"General": "\u05db\u05dc\u05dc\u05d9",
+"Advanced": "\u05de\u05ea\u05e7\u05d3\u05dd",
+"Source": "\u05de\u05e7\u05d5\u05e8",
+"Border": "\u05de\u05e1\u05d2\u05e8\u05ea",
+"Constrain proportions": "\u05d4\u05d2\u05d1\u05dc\u05ea \u05e4\u05e8\u05d5\u05e4\u05d5\u05e8\u05e6\u05d9\u05d5\u05ea",
+"Vertical space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05e0\u05db\u05d9",
+"Image description": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05ea\u05de\u05d5\u05e0\u05d4",
+"Style": "\u05e1\u05d2\u05e0\u05d5\u05df",
+"Dimensions": "\u05de\u05d9\u05de\u05d3\u05d9\u05dd",
+"Insert image": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05de\u05d5\u05e0\u05d4",
+"Insert date\/time": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d0\u05e8\u05d9\u05da\/\u05e9\u05e2\u05d4",
+"Remove link": "\u05de\u05d7\u05e7 \u05e7\u05d9\u05e9\u05d5\u05e8",
+"Url": "\u05db\u05ea\u05d5\u05d1\u05ea \u05e7\u05d9\u05e9\u05d5\u05e8",
+"Text to display": "\u05d8\u05e7\u05e1\u05d8 \u05dc\u05d4\u05e6\u05d2\u05d4",
+"Anchors": "\u05e2\u05d5\u05d2\u05e0\u05d9\u05dd",
+"Insert link": "\u05d4\u05db\u05e0\u05e1 \u05e7\u05d9\u05e9\u05d5\u05e8",
+"New window": "\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9",
+"None": "\u05dc\u05dc\u05d0",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u05de\u05d8\u05e8\u05d4",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e7\u05d9\u05e9\u05d5\u05e8",
+"Insert\/edit video": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e1\u05e8\u05d8\u05d5\u05df",
+"Poster": "\u05e4\u05d5\u05e1\u05d8\u05e8",
+"Alternative source": "\u05de\u05e7\u05d5\u05e8 \u05de\u05e9\u05e0\u05d9",
+"Paste your embed code below:": "\u05d4\u05d3\u05d1\u05e7 \u05e7\u05d5\u05d3 \u05d4\u05d8\u05de\u05e2\u05d4 \u05de\u05ea\u05d7\u05ea:",
+"Insert video": "\u05d4\u05db\u05e0\u05e1 \u05e1\u05e8\u05d8\u05d5\u05df",
+"Embed": "\u05d4\u05d8\u05de\u05e2",
+"Nonbreaking space": "\u05e8\u05d5\u05d5\u05d7 (\u05dc\u05dc\u05d0 \u05e9\u05d1\u05d9\u05e8\u05ea \u05e9\u05d5\u05e8\u05d4)",
+"Page break": "\u05d3\u05e3 \u05d7\u05d3\u05e9",
+"Paste as text": "\u05d4\u05d3\u05d1\u05e7 \u05db\u05d8\u05e7\u05e1\u05d8",
+"Preview": "\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e7\u05d3\u05d9\u05de\u05d4",
+"Print": "\u05d4\u05d3\u05e4\u05e1",
+"Save": "\u05e9\u05de\u05d9\u05e8\u05d4",
+"Could not find the specified string.": "\u05de\u05d7\u05e8\u05d5\u05d6\u05ea \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d4",
+"Replace": "\u05d4\u05d7\u05dc\u05e3",
+"Next": "\u05d4\u05d1\u05d0",
+"Whole words": "\u05de\u05d9\u05dc\u05d4 \u05e9\u05dc\u05de\u05d4",
+"Find and replace": "\u05d7\u05e4\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e3",
+"Replace with": "\u05d4\u05d7\u05dc\u05e3 \u05d1",
+"Find": "\u05d7\u05e4\u05e9",
+"Replace all": "\u05d4\u05d7\u05dc\u05e3 \u05d4\u05db\u05dc",
+"Match case": "\u05d4\u05d1\u05d7\u05df \u05d1\u05d9\u05df \u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea \u05dc\u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
+"Prev": "\u05e7\u05d5\u05d3\u05dd",
+"Spellcheck": "\u05d1\u05d5\u05d3\u05e7 \u05d0\u05d9\u05d5\u05ea",
+"Finish": "\u05e1\u05d9\u05d9\u05dd",
+"Ignore all": "\u05d4\u05ea\u05e2\u05dc\u05dd \u05de\u05d4\u05db\u05dc",
+"Ignore": "\u05d4\u05ea\u05e2\u05dc\u05dd",
+"Insert row before": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
+"Rows": "\u05e9\u05d5\u05e8\u05d5\u05ea",
+"Height": "\u05d2\u05d5\u05d1\u05d4",
+"Paste row after": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
+"Alignment": "\u05d9\u05d9\u05e9\u05d5\u05e8",
+"Column group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
+"Row": "\u05e9\u05d5\u05e8\u05d4",
+"Insert column before": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05dc\u05e4\u05e0\u05d9",
+"Split cell": "\u05e4\u05e6\u05dc \u05ea\u05d0",
+"Cell padding": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e4\u05e0\u05d9\u05de\u05d9\u05d9\u05dd \u05dc\u05ea\u05d0",
+"Cell spacing": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05d7\u05d9\u05e6\u05d5\u05e0\u05d9\u05dd \u05dc\u05ea\u05d0",
+"Row type": "\u05e1\u05d5\u05d2 \u05e9\u05d5\u05e8\u05d4",
+"Insert table": "\u05d4\u05db\u05e0\u05e1 \u05d8\u05d1\u05dc\u05d4",
+"Body": "\u05d2\u05d5\u05e3 \u05d4\u05d8\u05d1\u05dc\u05d0",
+"Caption": "\u05db\u05d9\u05ea\u05d5\u05d1",
+"Footer": "\u05db\u05d5\u05ea\u05e8\u05ea \u05ea\u05d7\u05ea\u05d5\u05e0\u05d4",
+"Delete row": "\u05de\u05d7\u05e7 \u05e9\u05d5\u05e8\u05d4",
+"Paste row before": "\u05d4\u05d3\u05d1\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
+"Scope": "\u05d4\u05d9\u05e7\u05e3",
+"Delete table": "\u05de\u05d7\u05e7 \u05d8\u05d1\u05dc\u05d4",
+"Header cell": "\u05db\u05d5\u05ea\u05e8\u05ea \u05dc\u05ea\u05d0",
+"Column": "\u05e2\u05de\u05d5\u05d3\u05d4",
+"Cell": "\u05ea\u05d0",
+"Header": "\u05db\u05d5\u05ea\u05e8\u05ea",
+"Cell type": "\u05e1\u05d5\u05d2 \u05ea\u05d0",
+"Copy row": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4",
+"Row properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e9\u05d5\u05e8\u05d4",
+"Table properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05d8\u05d1\u05dc\u05d4",
+"Row group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e9\u05d5\u05e8\u05d5\u05ea",
+"Right": "\u05d9\u05de\u05d9\u05df",
+"Insert column after": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05d0\u05d7\u05e8\u05d9",
+"Cols": "\u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
+"Insert row after": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
+"Width": "\u05e8\u05d5\u05d7\u05d1",
+"Cell properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05ea\u05d0",
+"Left": "\u05e9\u05de\u05d0\u05dc",
+"Cut row": "\u05d2\u05d6\u05d5\u05e8 \u05e9\u05d5\u05e8\u05d4",
+"Delete column": "\u05de\u05d7\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4",
+"Center": "\u05de\u05e8\u05db\u05d6",
+"Merge cells": "\u05de\u05d6\u05d2 \u05ea\u05d0\u05d9\u05dd",
+"Insert template": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d1\u05e0\u05d9\u05ea",
+"Templates": "\u05ea\u05d1\u05e0\u05d9\u05d5\u05ea",
+"Background color": "\u05e6\u05d1\u05e2 \u05e8\u05e7\u05e2",
+"Text color": "\u05e6\u05d1\u05e2 \u05d4\u05db\u05ea\u05d1",
+"Show blocks": "\u05d4\u05e6\u05d2 \u05ea\u05d9\u05d1\u05d5\u05ea",
+"Show invisible characters": "\u05d4\u05e6\u05d2 \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e8\u05d0\u05d9\u05dd",
+"Words: {0}": "\u05de\u05d9\u05dc\u05d9\u05dd: {0}",
+"Insert": "\u05d4\u05d5\u05e1\u05e4\u05d4",
+"File": "\u05e7\u05d5\u05d1\u05e5",
+"Edit": "\u05e2\u05e8\u05d9\u05db\u05d4",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u05ea\u05d9\u05d1\u05ea \u05e2\u05e8\u05d9\u05db\u05d4 \u05d7\u05db\u05de\u05d4. \u05dc\u05d7\u05e5 Alt-F9 \u05dc\u05ea\u05e4\u05e8\u05d9\u05d8. Alt-F10 \u05dc\u05ea\u05e6\u05d5\u05d2\u05ea \u05db\u05e4\u05ea\u05d5\u05e8\u05d9\u05dd, Alt-0 \u05dc\u05e2\u05d6\u05e8\u05d4",
+"Tools": "\u05db\u05dc\u05d9\u05dd",
+"View": "\u05ea\u05e6\u05d5\u05d2\u05d4",
+"Table": "\u05d8\u05d1\u05dc\u05d4",
+"Format": "\u05e4\u05d5\u05e8\u05de\u05d8",
+"_dir": "rtl"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/hr.js b/core/media/editors/tinymce/langs/hr.js
new file mode 100644
index 00000000..330ac1ac
--- /dev/null
+++ b/core/media/editors/tinymce/langs/hr.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('hr',{
+"Cut": "Izre\u017ei",
+"Heading 5": "Naslov 5",
+"Header 2": "Zaglavlje 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 preglednik ne podr\u017eava direktan pristup me\u0111uspremniku. Molimo Vas da umjesto toga koristite tipkovni\u010dke kratice Ctrl+X\/C\/V.",
+"Heading 4": "Naslov 4",
+"Div": "DIV",
+"Heading 2": "Naslov 2",
+"Paste": "Zalijepi",
+"Close": "Zatvori",
+"Font Family": "Obitelj fonta",
+"Pre": "PRE",
+"Align right": "Poravnaj desno",
+"New document": "Novi dokument",
+"Blockquote": "BLOCKQUOTE",
+"Numbered list": "Numerirana lista",
+"Heading 1": "Naslov 1",
+"Headings": "Naslovi",
+"Increase indent": "Pove\u0107aj uvla\u010denje",
+"Formats": "Formati",
+"Headers": "Zaglavlja",
+"Select all": "Ozna\u010di sve",
+"Header 3": "Zaglavlje 3",
+"Blocks": "Blokovi",
+"Undo": "Poni\u0161ti",
+"Strikethrough": "Crta kroz sredinu",
+"Bullet list": "Lista",
+"Header 1": "Zaglavlje 1",
+"Superscript": "Eksponent",
+"Clear formatting": "Ukloni oblikovanje",
+"Font Sizes": "Veli\u010dine fonta",
+"Subscript": "Indeks",
+"Header 6": "Zaglavlje 6",
+"Redo": "Vrati",
+"Paragraph": "Paragraf",
+"Ok": "U redu",
+"Bold": "Podebljano",
+"Code": "CODE oznaka",
+"Italic": "Kurziv",
+"Align center": "Poravnaj po sredini",
+"Header 5": "Zaglavlje 5",
+"Heading 6": "Naslov 6",
+"Heading 3": "Naslov 3",
+"Decrease indent": "Smanji uvla\u010denje",
+"Header 4": "Zaglavlje 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Akcija zalijepi od sada lijepi \u010disti tekst. Sadr\u017eaj \u0107e biti zaljepljen kao \u010disti tekst sve dok ne isklju\u010dite ovu opciju.",
+"Underline": "Crta ispod",
+"Cancel": "Odustani",
+"Justify": "Obostrano poravnanje",
+"Inline": "Unutarnje",
+"Copy": "Kopiraj",
+"Align left": "Poravnaj lijevo",
+"Visual aids": "Vizualna pomo\u0107",
+"Lower Greek": "Mala gr\u010dka slova",
+"Square": "Kvadrat",
+"Default": "Zadano",
+"Lower Alpha": "Mala slova",
+"Circle": "Krug",
+"Disc": "To\u010dka",
+"Upper Alpha": "Velika slova",
+"Upper Roman": "Velika rimska slova",
+"Lower Roman": "Mala rimska slova",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id treba po\u010dinjati slovom, a nakon toga slijede samo slova, brojevi, crtice, to\u010dke, dvoto\u010dke i podvlake.",
+"Name": "Ime",
+"Anchor": "Sidro",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Postoje ne pohranjene izmjene, jeste li sigurni da \u017eelite oti\u0107i?",
+"Restore last draft": "Vrati posljednju skicu",
+"Special character": "Poseban znak",
+"Source code": "Izvorni kod",
+"Language": "Jezik",
+"Insert\/Edit code sample": "Umetni\/Uredi primjer k\u00f4da",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Boja",
+"Right to left": "S desna na lijevo",
+"Left to right": "S lijeva na desno",
+"Emoticons": "Emotikoni",
+"Robots": "Roboti pretra\u017eiva\u010da",
+"Document properties": "Svojstva dokumenta",
+"Title": "Naslov",
+"Keywords": "Klju\u010dne rije\u010di",
+"Encoding": "Kodna stranica",
+"Description": "Opis",
+"Author": "Autor",
+"Fullscreen": "Cijeli ekran",
+"Horizontal line": "Horizontalna linija",
+"Horizontal space": "Horizontalan razmak",
+"Insert\/edit image": "Umetni\/izmijeni sliku",
+"General": "Op\u0107enito",
+"Advanced": "Napredno",
+"Source": "Izvor",
+"Border": "Rub",
+"Constrain proportions": "Zadr\u017ei proporcije",
+"Vertical space": "Okomit razmak",
+"Image description": "Opis slike",
+"Style": "Stil",
+"Dimensions": "Dimenzije",
+"Insert image": "Umetni sliku",
+"Image": "Slika",
+"Zoom in": "Pove\u0107aj",
+"Contrast": "Kontrast",
+"Back": "Natrag",
+"Gamma": "Gamma",
+"Flip horizontally": "Obrni horizontalno",
+"Resize": "Promjeni veli\u010dinu",
+"Sharpen": "Izo\u0161travanje",
+"Zoom out": "Smanji",
+"Image options": "Opcije slike",
+"Apply": "Primijeni",
+"Brightness": "Svjetlina",
+"Rotate clockwise": "Rotiraj desno",
+"Rotate counterclockwise": "Rotiraj lijevo",
+"Edit image": "Uredi sliku",
+"Color levels": "Razine boje",
+"Crop": "Obre\u017ei",
+"Orientation": "Orijentacija",
+"Flip vertically": "Obrni vertikalno",
+"Invert": "Invertiraj",
+"Date\/time": "Datum\/vrijeme",
+"Insert date\/time": "Umetni datum\/vrijeme",
+"Remove link": "Ukloni poveznicu",
+"Url": "Url",
+"Text to display": "Tekst za prikaz",
+"Anchors": "Kra\u0107e poveznice",
+"Insert link": "Umetni poveznicu",
+"Link": "Link",
+"New window": "Novi prozor",
+"None": "Ni\u0161ta",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Izgleda da je URL koji ste upisali vanjski link. \u017delite li dodati obavezan http:\/\/ prefiks?",
+"Paste or type a link": "Zalijepi ili upi\u0161i link",
+"Target": "Meta",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Izgleda da je URL koji ste upisali e-mail adresa. \u017delite li dodati obavezan mailto: prefiks?",
+"Insert\/edit link": "Umetni\/izmijeni poveznicu",
+"Insert\/edit video": "Umetni\/izmijeni video",
+"Media": "Media",
+"Alternative source": "Alternativni izvor",
+"Paste your embed code below:": "Umetnite va\u0161 kod za ugradnju ispod:",
+"Insert video": "Umetni video",
+"Poster": "Poster",
+"Insert\/edit media": "Umetni\/uredi mediju",
+"Embed": "Ugradi",
+"Nonbreaking space": "Neprekidaju\u0107i razmak",
+"Page break": "Prijelom stranice",
+"Paste as text": "Zalijepi kao tekst",
+"Preview": "Pregled",
+"Print": "Ispis",
+"Save": "Spremi",
+"Could not find the specified string.": "Tra\u017eeni tekst nije prona\u0111en",
+"Replace": "Zamijeni",
+"Next": "Slijede\u0107i",
+"Whole words": "Cijele rije\u010di",
+"Find and replace": "Prona\u0111i i zamijeni",
+"Replace with": "Zamijeni s",
+"Find": "Tra\u017ei",
+"Replace all": "Zamijeni sve",
+"Match case": "Pazi na mala i velika slova",
+"Prev": "Prethodni",
+"Spellcheck": "Provjeri pravopis",
+"Finish": "Zavr\u0161i",
+"Ignore all": "Zanemari sve",
+"Ignore": "Zanemari",
+"Add to Dictionary": "Dodaj u rje\u010dnik",
+"Insert row before": "Umetni redak prije",
+"Rows": "Redci",
+"Height": "Visina",
+"Paste row after": "Zalijepi redak nakon",
+"Alignment": "Poravnanje",
+"Border color": "Boja ruba",
+"Column group": "Grupirani stupci",
+"Row": "Redak",
+"Insert column before": "Umetni stupac prije",
+"Split cell": "Razdvoji polja",
+"Cell padding": "Razmak unutar polja",
+"Cell spacing": "Razmak izme\u0111u polja",
+"Row type": "Vrsta redka",
+"Insert table": "Umetni tablicu",
+"Body": "Sadr\u017eaj",
+"Caption": "Natpis",
+"Footer": "Podno\u017eje",
+"Delete row": "Izbri\u0161i redak",
+"Paste row before": "Zalijepi redak prije",
+"Scope": "Doseg",
+"Delete table": "Izbri\u0161i tablicu",
+"H Align": "H Poravnavanje",
+"Top": "Vrh",
+"Header cell": "Polje zaglavlja",
+"Column": "Stupac",
+"Row group": "Grupirani redci",
+"Cell": "Polje",
+"Middle": "Sredina",
+"Cell type": "Vrsta polja",
+"Copy row": "Kopiraj redak",
+"Row properties": "Svojstva redka",
+"Table properties": "Svojstva tablice",
+"Bottom": "Dno",
+"V Align": "V Poravnavanje",
+"Header": "Zaglavlje",
+"Right": "Desno",
+"Insert column after": "Umetni stupac nakon",
+"Cols": "Stupci",
+"Insert row after": "Umetni redak nakon",
+"Width": "\u0160irina",
+"Cell properties": "Svojstva polja",
+"Left": "Lijevo",
+"Cut row": "Izre\u017ei redak",
+"Delete column": "Izbri\u0161i stupac",
+"Center": "Sredina",
+"Merge cells": "Spoji polja",
+"Insert template": "Umetni predlo\u017eak",
+"Templates": "Predlo\u0161ci",
+"Background color": "Boja pozadine",
+"Custom...": "Prilago\u0111eno...",
+"Custom color": "Prilago\u0111ena boja",
+"No color": "Bez boje",
+"Text color": "Boja teksta",
+"Table of Contents": "Sadr\u017eaj",
+"Show blocks": "Prika\u017ei blokove",
+"Show invisible characters": "Prika\u017ei nevidljive znakove",
+"Words: {0}": "Rije\u010di: {0}",
+"Insert": "Umetni",
+"File": "Datoteka",
+"Edit": "Izmijeni",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107",
+"Tools": "Alati",
+"View": "Pogled",
+"Table": "Tablica",
+"Format": "Oblikuj"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/hu.js b/core/media/editors/tinymce/langs/hu.js
new file mode 100644
index 00000000..813b67e1
--- /dev/null
+++ b/core/media/editors/tinymce/langs/hu.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('hu',{
+"Cut": "Kiv\u00e1g\u00e1s",
+"Heading 5": "Fejl\u00e9c 5",
+"Header 2": "C\u00edmsor 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "A b\u00f6ng\u00e9sz\u0151d nem t\u00e1mogatja a k\u00f6zvetlen hozz\u00e1f\u00e9r\u00e9st a v\u00e1g\u00f3laphoz. K\u00e9rlek haszn\u00e1ld a Ctrl+X\/C\/V billenty\u0171ket.",
+"Heading 4": "Fejl\u00e9c 4",
+"Div": "Div",
+"Heading 2": "Fejl\u00e9c 2",
+"Paste": "Beilleszt\u00e9s",
+"Close": "Bez\u00e1r",
+"Font Family": "Bet\u0171t\u00edpus",
+"Pre": "El\u0151",
+"Align right": "Jobbra igaz\u00edt",
+"New document": "\u00daj dokumentum",
+"Blockquote": "Id\u00e9zetblokk",
+"Numbered list": "Sz\u00e1moz\u00e1s",
+"Heading 1": "Fejl\u00e9c 1",
+"Headings": "Fejl\u00e9cek",
+"Increase indent": "Beh\u00faz\u00e1s n\u00f6vel\u00e9se",
+"Formats": "Form\u00e1tumok",
+"Headers": "C\u00edmsorok",
+"Select all": "Minden kijel\u00f6l\u00e9se",
+"Header 3": "C\u00edmsor 3",
+"Blocks": "Blokkok",
+"Undo": "Visszavon\u00e1s",
+"Strikethrough": "\u00c1th\u00fazott",
+"Bullet list": "Felsorol\u00e1s",
+"Header 1": "C\u00edmsor 1",
+"Superscript": "Fels\u0151 index",
+"Clear formatting": "Form\u00e1z\u00e1s t\u00f6rl\u00e9se",
+"Font Sizes": "Bet\u0171m\u00e9retek",
+"Subscript": "Als\u00f3 index",
+"Header 6": "C\u00edmsor 6",
+"Redo": "Ism\u00e9t",
+"Paragraph": "Bekezd\u00e9s",
+"Ok": "Rendben",
+"Bold": "F\u00e9lk\u00f6v\u00e9r",
+"Code": "K\u00f3d",
+"Italic": "D\u0151lt",
+"Align center": "K\u00f6z\u00e9pre z\u00e1r",
+"Header 5": "C\u00edmsor 5",
+"Heading 6": "Fejl\u00e9c 6",
+"Heading 3": "Fejl\u00e9c 3",
+"Decrease indent": "Beh\u00faz\u00e1s cs\u00f6kkent\u00e9se",
+"Header 4": "C\u00edmsor 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Beilleszt\u00e9s mostant\u00f3l egyszer\u0171 sz\u00f6veg m\u00f3dban. A tartalmak mostant\u00f3l egyszer\u0171 sz\u00f6vegk\u00e9nt lesznek beillesztve, am\u00edg nem kapcsolod ki ezt az opci\u00f3t.",
+"Underline": "Al\u00e1h\u00fazott",
+"Cancel": "M\u00e9gse",
+"Justify": "Sorkiz\u00e1r\u00e1s",
+"Inline": "Vonalon bel\u00fcl",
+"Copy": "M\u00e1sol\u00e1s",
+"Align left": "Balra igaz\u00edt",
+"Visual aids": "Vizu\u00e1lis seg\u00e9deszk\u00f6z\u00f6k",
+"Lower Greek": "Kis g\u00f6r\u00f6g sz\u00e1m",
+"Square": "N\u00e9gyzet",
+"Default": "Alap\u00e9rtelmezett",
+"Lower Alpha": "Kisbet\u0171",
+"Circle": "K\u00f6r",
+"Disc": "Pont",
+"Upper Alpha": "Nagybet\u0171",
+"Upper Roman": "Nagy r\u00f3mai sz\u00e1m",
+"Lower Roman": "Kis r\u00f3mai sz\u00e1m",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Az azonos\u00edt\u00f3nak bet\u0171vel kell kezd\u0151dnie, azut\u00e1n csak bet\u0171ket, sz\u00e1mokat, gondolatjeleket, pontokat, kett\u0151spontokat vagy al\u00e1h\u00faz\u00e1st tartalmazhat.",
+"Name": "N\u00e9v",
+"Anchor": "Horgony",
+"Id": "Azonos\u00edt\u00f3",
+"You have unsaved changes are you sure you want to navigate away?": "Nem mentett m\u00f3dos\u00edt\u00e1said vannak, biztos hogy el akarsz navig\u00e1lni?",
+"Restore last draft": "Utols\u00f3 piszkozat vissza\u00e1ll\u00edt\u00e1sa",
+"Special character": "Speci\u00e1lis karakter",
+"Source code": "Forr\u00e1sk\u00f3d",
+"Language": "Nyelv",
+"Insert\/Edit code sample": "K\u00f3dminta besz\u00far\u00e1sa\/szerkeszt\u00e9se",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Sz\u00edn",
+"Right to left": "Jobbr\u00f3l balra",
+"Left to right": "Balr\u00f3l jobbra",
+"Emoticons": "Vigyorok",
+"Robots": "Robotok",
+"Document properties": "Dokumentum tulajdons\u00e1gai",
+"Title": "C\u00edm",
+"Keywords": "Kulcsszavak",
+"Encoding": "K\u00f3dol\u00e1s",
+"Description": "Le\u00edr\u00e1s",
+"Author": "Szerz\u0151",
+"Fullscreen": "Teljes k\u00e9perny\u0151",
+"Horizontal line": "V\u00edzszintes vonal",
+"Horizontal space": "Horizont\u00e1lis hely",
+"Insert\/edit image": "K\u00e9p beilleszt\u00e9se\/szerkeszt\u00e9se",
+"General": "\u00c1ltal\u00e1nos",
+"Advanced": "Halad\u00f3",
+"Source": "Forr\u00e1s",
+"Border": "Szeg\u00e9ly",
+"Constrain proportions": "M\u00e9retar\u00e1ny",
+"Vertical space": "Vertik\u00e1lis hely",
+"Image description": "K\u00e9p le\u00edr\u00e1sa",
+"Style": "St\u00edlus",
+"Dimensions": "M\u00e9retek",
+"Insert image": "K\u00e9p besz\u00far\u00e1sa",
+"Image": "K\u00e9p",
+"Zoom in": "Nagy\u00edt\u00e1s",
+"Contrast": "Kontraszt",
+"Back": "Vissza",
+"Gamma": "Gamma",
+"Flip horizontally": "V\u00edzszintes t\u00fckr\u00f6z\u00e9s",
+"Resize": "\u00c1tm\u00e9retez\u00e9s",
+"Sharpen": "\u00c9less\u00e9g",
+"Zoom out": "Kicsiny\u00edt\u00e9s",
+"Image options": "K\u00e9p be\u00e1ll\u00edt\u00e1sok",
+"Apply": "Ment\u00e9s",
+"Brightness": "F\u00e9nyer\u0151",
+"Rotate clockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val megegyez\u0151en",
+"Rotate counterclockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val ellent\u00e9tesen",
+"Edit image": "K\u00e9p szerkeszt\u00e9se",
+"Color levels": "Sz\u00ednszint",
+"Crop": "K\u00e9p v\u00e1g\u00e1s",
+"Orientation": "K\u00e9p t\u00e1jol\u00e1s",
+"Flip vertically": "F\u00fcgg\u0151leges t\u00fckr\u00f6z\u00e9s",
+"Invert": "Inverz k\u00e9p",
+"Date\/time": "D\u00e1tum\/id\u0151",
+"Insert date\/time": "D\u00e1tum\/id\u0151 beilleszt\u00e9se",
+"Remove link": "Hivatkoz\u00e1s t\u00f6rl\u00e9se",
+"Url": "Url",
+"Text to display": "Megjelen\u0151 sz\u00f6veg",
+"Anchors": "Horgonyok",
+"Insert link": "Link beilleszt\u00e9se",
+"Link": "Link",
+"New window": "\u00daj ablak",
+"None": "Nincs",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Az URL amit megadt\u00e1l k\u00fcls\u0151 c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges http:\/\/ el\u0151tagot?",
+"Paste or type a link": "Link be\u00edr\u00e1sa vagy beilleszt\u00e9se",
+"Target": "C\u00e9l",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Az URL amit megadt\u00e1l email c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges mailto: el\u0151tagot?",
+"Insert\/edit link": "Link beilleszt\u00e9se\/szerkeszt\u00e9se",
+"Insert\/edit video": "Vide\u00f3 beilleszt\u00e9se\/szerkeszt\u00e9se",
+"Media": "M\u00e9dia",
+"Alternative source": "Alternat\u00edv forr\u00e1s",
+"Paste your embed code below:": "Illeszd be a be\u00e1gyaz\u00f3 k\u00f3dot alulra:",
+"Insert video": "Vide\u00f3 beilleszt\u00e9se",
+"Poster": "El\u0151n\u00e9zeti k\u00e9p",
+"Insert\/edit media": "M\u00e9dia besz\u00far\u00e1sa\/beilleszt\u00e9se",
+"Embed": "Be\u00e1gyaz\u00e1s",
+"Nonbreaking space": "Nem t\u00f6rhet\u0151 hely",
+"Page break": "Oldalt\u00f6r\u00e9s",
+"Paste as text": "Beilleszt\u00e9s sz\u00f6vegk\u00e9nt",
+"Preview": "El\u0151n\u00e9zet",
+"Print": "Nyomtat\u00e1s",
+"Save": "Ment\u00e9s",
+"Could not find the specified string.": "A be\u00edrt kifejez\u00e9s nem tal\u00e1lhat\u00f3.",
+"Replace": "Csere",
+"Next": "K\u00f6vetkez\u0151",
+"Whole words": "Csak ha ez a teljes sz\u00f3",
+"Find and replace": "Keres\u00e9s \u00e9s csere",
+"Replace with": "Csere erre",
+"Find": "Keres\u00e9s",
+"Replace all": "Az \u00f6sszes cser\u00e9je",
+"Match case": "Kis \u00e9s nagybet\u0171k megk\u00fcl\u00f6nb\u00f6ztet\u00e9se",
+"Prev": "El\u0151z\u0151",
+"Spellcheck": "Helyes\u00edr\u00e1s ellen\u0151rz\u00e9s",
+"Finish": "Befejez\u00e9s",
+"Ignore all": "Mindent figyelmen k\u00edv\u00fcl hagy",
+"Ignore": "Figyelmen k\u00edv\u00fcl hagy",
+"Add to Dictionary": "Sz\u00f3t\u00e1rhoz ad",
+"Insert row before": "Sor besz\u00far\u00e1sa el\u00e9",
+"Rows": "Sorok",
+"Height": "Magass\u00e1g",
+"Paste row after": "Sor beilleszt\u00e9se m\u00f6g\u00e9",
+"Alignment": "Igaz\u00edt\u00e1s",
+"Border color": "Szeg\u00e9ly sz\u00edne",
+"Column group": "Oszlop csoport",
+"Row": "Sor",
+"Insert column before": "Oszlop besz\u00far\u00e1sa el\u00e9",
+"Split cell": "Cell\u00e1k sz\u00e9tv\u00e1laszt\u00e1sa",
+"Cell padding": "Cella m\u00e9rete",
+"Cell spacing": "Cell\u00e1k t\u00e1vols\u00e1ga",
+"Row type": "Sor t\u00edpus",
+"Insert table": "T\u00e1bl\u00e1zat beilleszt\u00e9se",
+"Body": "Sz\u00f6vegt\u00f6rzs",
+"Caption": "Felirat",
+"Footer": "L\u00e1bl\u00e9c",
+"Delete row": "Sor t\u00f6rl\u00e9se",
+"Paste row before": "Sor beilleszt\u00e9se el\u00e9",
+"Scope": "Hat\u00f3k\u00f6r",
+"Delete table": "T\u00e1bl\u00e1zat t\u00f6rl\u00e9se",
+"H Align": "V\u00edzszintes igaz\u00edt\u00e1s",
+"Top": "Fel\u00fcl",
+"Header cell": "Fejl\u00e9c cella",
+"Column": "Oszlop",
+"Row group": "Sor csoport",
+"Cell": "Cella",
+"Middle": "K\u00f6z\u00e9pen",
+"Cell type": "Cella t\u00edpusa",
+"Copy row": "Sor m\u00e1sol\u00e1sa",
+"Row properties": "Sor tulajdons\u00e1gai",
+"Table properties": "T\u00e1bl\u00e1zat tulajdons\u00e1gok",
+"Bottom": "Alul",
+"V Align": "F\u00fcgg\u0151leges igaz\u00edt\u00e1s",
+"Header": "Fejl\u00e9c",
+"Right": "Jobb",
+"Insert column after": "Oszlop besz\u00far\u00e1sa m\u00f6g\u00e9",
+"Cols": "Oszlopok",
+"Insert row after": "Sor besz\u00far\u00e1sa m\u00f6g\u00e9",
+"Width": "Sz\u00e9less\u00e9g",
+"Cell properties": "Cella tulajdons\u00e1gok",
+"Left": "Bal",
+"Cut row": "Sor kiv\u00e1g\u00e1sa",
+"Delete column": "Oszlop t\u00f6rl\u00e9se",
+"Center": "K\u00f6z\u00e9p",
+"Merge cells": "Cell\u00e1k egyes\u00edt\u00e9se",
+"Insert template": "Sablon beilleszt\u00e9se",
+"Templates": "Sablonok",
+"Background color": "H\u00e1tt\u00e9r sz\u00edn",
+"Custom...": "Egy\u00e9ni...",
+"Custom color": "Egy\u00e9ni sz\u00edn",
+"No color": "Nincs sz\u00edn",
+"Text color": "Sz\u00f6veg sz\u00edne",
+"Table of Contents": "Tartalomjegyz\u00e9k",
+"Show blocks": "Blokkok mutat\u00e1sa",
+"Show invisible characters": "L\u00e1thatatlan karakterek mutat\u00e1sa",
+"Words: {0}": "Szavak: {0}",
+"Insert": "Beilleszt\u00e9s",
+"File": "F\u00e1jl",
+"Edit": "Szerkeszt\u00e9s",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text ter\u00fclet. Nyomj ALT-F9-et a men\u00fch\u00f6z. Nyomj ALT-F10-et az eszk\u00f6zt\u00e1rhoz. Nyomj ALT-0-t a s\u00fag\u00f3hoz",
+"Tools": "Eszk\u00f6z\u00f6k",
+"View": "N\u00e9zet",
+"Table": "T\u00e1bl\u00e1zat",
+"Format": "Form\u00e1tum"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/id.js b/core/media/editors/tinymce/langs/id.js
new file mode 100644
index 00000000..c02b821c
--- /dev/null
+++ b/core/media/editors/tinymce/langs/id.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('id',{
+"Cut": "Penggal",
+"Heading 5": "Judul 5",
+"Header 2": "Judul 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browser anda tidak mendukung akses langsung ke clipboard. Silahkan gunakan Ctrl+X\/C\/V dari keyboard.",
+"Heading 4": "Judul 4",
+"Div": "Div",
+"Heading 2": "Judul 2",
+"Paste": "Tempel",
+"Close": "Tutup",
+"Font Family": "Jenis Huruf",
+"Pre": "Pre",
+"Align right": "Rata kanan",
+"New document": "Dokumen baru",
+"Blockquote": "Kutipan",
+"Numbered list": "Daftar bernomor",
+"Heading 1": "Judul 1",
+"Headings": "Judul",
+"Increase indent": "Tambah inden",
+"Formats": "Format",
+"Headers": "Judul",
+"Select all": "Pilih semua",
+"Header 3": "Judul 3",
+"Blocks": "Blok",
+"Undo": "Batalkan",
+"Strikethrough": "Coret",
+"Bullet list": "Daftar bersimbol",
+"Header 1": "Judul 1",
+"Superscript": "Superskrip",
+"Clear formatting": "Hapus format",
+"Font Sizes": "Ukuran Huruf",
+"Subscript": "Subskrip",
+"Header 6": "Judul 6",
+"Redo": "Ulangi",
+"Paragraph": "Paragraf",
+"Ok": "Ok",
+"Bold": "Tebal",
+"Code": "Code",
+"Italic": "Miring",
+"Align center": "Rata tengah",
+"Header 5": "Judul 5",
+"Heading 6": "Judul 6",
+"Heading 3": "Judul 3",
+"Decrease indent": "Turunkan inden",
+"Header 4": "Judul 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Penempelan sekarang dalam modus teks biasa. Konten sekarang akan disisipkan sebagai teks biasa sampai Anda mamatikan pilihan ini.",
+"Underline": "Garis bawah",
+"Cancel": "Batal",
+"Justify": "Penuh",
+"Inline" : "Baris",
+"Copy": "Salin",
+"Align left": "Rata kiri",
+"Visual aids": "Alat bantu visual",
+"Lower Greek": "Huruf Kecil Yunani",
+"Square": "Kotak",
+"Default": "Bawaan",
+"Lower Alpha": "Huruf Kecil",
+"Circle": "Lingkaran",
+"Disc": "Cakram",
+"Upper Alpha": "Huruf Besar",
+"Upper Roman": "Huruf Besar Romawi",
+"Lower Roman": "Huruf Kecil Romawi",
+"Name": "Nama",
+"Anchor": "Jangkar",
+"You have unsaved changes are you sure you want to navigate away?": "Anda memiliki perubahan yang belum disimpan, yakin ingin beralih ?",
+"Restore last draft": "Muat kembali draft sebelumnya",
+"Special character": "Karakter khusus",
+"Source code": "Kode sumber",
+"B": "B",
+"R": "M",
+"G": "H",
+"Color": "Warna",
+"Right to left": "Kanan ke kiri",
+"Left to right": "Kiri ke kanan",
+"Emoticons": "Emotikon",
+"Robots": "Robot",
+"Document properties": "Properti dokumwn",
+"Title": "Judul",
+"Keywords": "Kata kunci",
+"Encoding": "Enkoding",
+"Description": "Description",
+"Author": "Penulis",
+"Fullscreen": "Layar penuh",
+"Horizontal line": "Garis horisontal",
+"Horizontal space": "Spasi Horisontal",
+"Insert\/edit image": "Sisip\/sunting gambar",
+"General": "Umum",
+"Advanced": "Lanjutan",
+"Source": "Sumber",
+"Border": "Batas",
+"Constrain proportions": "Samakan proporsi",
+"Vertical space": "Spasi vertikal",
+"Image description": "Deskripsi Gambar",
+"Style": "Gaya",
+"Dimensions": "Dimensi",
+"Insert image": "Sisipkan gambar",
+"Zoom in": "Perbesar",
+"Contrast": "Kontras",
+"Back": "Kembali",
+"Gamma": "Gamma",
+"Flip horizontally": "Balik horisontal",
+"Resize": "Ubah ukuran",
+"Sharpen": "Ketajaman",
+"Zoom out": "Perkecil",
+"Image options": "Opsi Gambar",
+"Apply": "Terapkan",
+"Brightness": "Kecerahan",
+"Rotate clockwise": "Putar searahjarumjam",
+"Rotate counterclockwise": "Putar berlawananjarumjam",
+"Edit image": "Sunting gambar",
+"Color levels": "Tingkat warna",
+"Crop": "Krop",
+"Orientation": "Orientasi",
+"Flip vertically": "Balik vertikal",
+"Invert": "Kebalikan",
+"Insert date\/time": "Sisipkan tanggal\/waktu",
+"Remove link": "Buang tautan",
+"Url": "Tautan",
+"Text to display": "Teks yang ditampilkan",
+"Anchors": "Jangkar",
+"Insert link": "Sisipkan tautan",
+"New window": "Jendela baru",
+"None": "Tdk ada",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Tautan yang anda masukkan sepertinya adalah tautan eksternal. Apakah Anda ingin menambahkan prefiks http:\/\/ yang dibutuhkan?",
+"Target": "Jendela Tujuan",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Tautan yang anda masukkan sepertinya adalah alamat email. Apakah Anda ingin menambahkan prefiks mailto: yang dibutuhkan?",
+"Insert\/edit link": "Sisip\/sunting tautan",
+"Insert\/edit video": "Sisip\/sunting video",
+"Poster": "Penulis",
+"Alternative source": "Sumber Alternatif",
+"Paste your embed code below:": "Tempel kode yang diembed dibawah ini:",
+"Insert video": "Sisipkan video",
+"Embed": "Embed",
+"Nonbreaking space": "Spasi ",
+"Page break": "Baris baru",
+"Paste as text": "Tempel sebagai teks biasa",
+"Preview": "Pratinjau",
+"Print": "Cetak",
+"Save": "Simpan",
+"Could not find the specified string.": "Tidak dapat menemukan string yang dimaksud.",
+"Replace": "Ganti",
+"Next": "Berikutnya",
+"Whole words": "Semua kata",
+"Find and replace": "Cari dan Ganti",
+"Replace with": "Ganti dengan",
+"Find": "Cari",
+"Replace all": "Ganti semua",
+"Match case": "Samakan besar kecil huruf",
+"Prev": "Sebelumnya",
+"Spellcheck": "Spellcheck",
+"Finish": "Selesai",
+"Ignore all": "Abaikan semua",
+"Ignore": "Abaikan",
+"Add to Dictionary": "Tambahkan ke kamus",
+"Insert row before": "Sisipkan baris sebelum",
+"Rows": "Barisan",
+"Height": "Tinggi",
+"Paste row after": "Tempel baris setelah",
+"Alignment": "Penjajaran",
+"Border color": "Warna batas",
+"Column group": "Kelompok kolom",
+"Row": "Baris",
+"Insert column before": "Sisipkan kolom sebelum",
+"Split cell": "Bagi sel",
+"Cell padding": "Lapisan sel",
+"Cell spacing": "Spasi sel",
+"Row type": "Tipe baris",
+"Insert table": "Sisipkan tabel",
+"Body": "Body",
+"Caption": "Caption",
+"Footer": "Footer",
+"Delete row": "Hapus baris",
+"Paste row before": "Tempel baris sebelum",
+"Scope": "Skup",
+"Delete table": "Hapus tabel",
+"H Align": "Rata Samping",
+"Top": "Atas",
+"Header cell": "Sel Header",
+"Column": "Kolom",
+"Row group": "Kelompok baris",
+"Cell": "Sel",
+"Middle": "Tengah",
+"Cell type": "Tipe sel",
+"Copy row": "Salin baris",
+"Row properties": "Properti baris",
+"Table properties": "Properti tabel",
+"Bottom": "bawah",
+"V Align": "Rata Atas",
+"Header": "Header",
+"Right": "Kanan",
+"Insert column after": "Sisipkan kolom setelah",
+"Cols": "Kolom",
+"Insert row after": "Sisipkan baris setelah",
+"Width": "Lebar",
+"Cell properties": "Properti sel",
+"Left": "Kiri",
+"Cut row": "Penggal baris",
+"Delete column": "Hapus kolom",
+"Center": "Tengah",
+"Merge cells": "Gabung sel",
+"Insert template": "Sisipkan templat",
+"Templates": "Templat",
+"Background color": "Warna latar",
+"Custom...": "Atur sendiri...",
+"Custom color": "Warna Sendiri",
+"No color": "Tidak berwarna",
+"Text color": "Warna teks",
+"Show blocks": "Tampilkan blok",
+"Show invisible characters": "Tampilkan karakter tak tampak",
+"Words: {0}": "Kata: {0}",
+"Insert": "Sisip",
+"File": "Berkas",
+"Edit": "Sunting",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Area teks kaya. Tekan ALT-F9 untuk menu. Tekan ALT-F10 untuk toolbar. Tekan ALT-0 untuk bantuan",
+"Tools": "Alat",
+"View": "Tampilan",
+"Table": "Tabel",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/it.js b/core/media/editors/tinymce/langs/it.js
new file mode 100644
index 00000000..9e9eb828
--- /dev/null
+++ b/core/media/editors/tinymce/langs/it.js
@@ -0,0 +1,232 @@
+tinymce.addI18n('it',{
+"Cut": "Taglia",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Il tuo browser non supporta l'accesso diretto negli Appunti. Per favore usa i tasti di scelta rapida Ctrl+X\/C\/V.",
+"Paste": "Incolla",
+"Paste as text": "Incolla come testo",
+"Close": "Chiudi",
+"Align right": "Allinea a Destra",
+"New document": "Nuovo Documento",
+"Numbered list": "Elenchi Numerati",
+"Increase indent": "Aumenta rientro",
+"Formats": "Formattazioni",
+"Select all": "Seleziona tutto",
+"Undo": "Annulla",
+"Strikethrough": "Barrato",
+"Bullet list": "Elenchi Puntati",
+"Superscript": "Apice",
+"Clear formatting": "Cancella formattazione",
+"Subscript": "Pedice",
+"Redo": "Ripristina",
+"Ok": "Ok",
+"Bold": "Grassetto",
+"Italic": "Corsivo",
+"Align center": "Allinea al Centro",
+"Decrease indent": "Riduci rientro",
+"Underline": "Sottolineato",
+"Cancel": "Cancella",
+"Justify": "Giustifica",
+"Copy": "Copia",
+"Align left": "Allinea a Sinistra",
+"Visual aids": "Elementi Visivi",
+"Lower Greek": "Minuscolo lettere greche",
+"Square": "Quadrato",
+"Default": "Predefinito",
+"Lower Alpha": "Minuscolo alfanumerico",
+"Circle": "Cerchio",
+"Disc": "Disco",
+"Upper Alpha": "Maiuscolo alfanumerico",
+"Upper Roman": "Maiuscolo lettere romane",
+"Lower Roman": "Minuscolo lettere romane",
+"Name": "Nome",
+"Anchor": "Ancora",
+"Anchors": "Ancora",
+"You have unsaved changes are you sure you want to navigate away?": "Non hai salvato delle modifiche, sei sicuro di andartene?",
+"Restore last draft": "Ripristina l'ultima bozza.",
+"Special character": "Inserisci Carattere Speciale",
+"Source code": "Codice Sorgente",
+"Right to left": "Da Destra a Sinistra",
+"Left to right": "Da Sinistra a Destra",
+"Emoticons": "Faccine",
+"Robots": "Robot",
+"Document properties": "Propriet\u00e0 Documento",
+"Title": "Titolo",
+"Keywords": "Parola Chiave",
+"Encoding": "Codifica",
+"Description": "Descrizione",
+"Author": "Autore",
+"Fullscreen": "Schermo Intero",
+"Horizontal line": "Linea Orizzontale",
+"Horizontal space": "Spazio Orizzontale",
+"Insert\/edit image": "Aggiungi\/Modifica Immagine",
+"General": "Generale",
+"Advanced": "Avanzato",
+"Source": "URL",
+"Border": "Bordo",
+"Constrain proportions": "Mantieni Proporzioni",
+"Vertical space": "Spazio Verticale",
+"Image description": "Descrizione Immagine",
+"Style": "Stile",
+"Dimensions": "Dimensioni",
+"Insert image": "Inserisci immagine",
+"Insert date\/time": "Inserisci Data\/Ora",
+"Remove link": "Rimuovi Link",
+"Url": "Url",
+"Text to display": "Testo da Visualizzare",
+"Insert link": "Inserisci Link",
+"New window": "Nuova Finestra",
+"None": "No",
+"Target": "Target",
+"Insert\/edit link": "Inserisci\/Modifica link",
+"Insert\/edit video": "Inserisci\/Modifica video",
+"Poster": "Anteprima",
+"Alternative source": "Alternativo",
+"Paste your embed code below:": "Incolla qui il codice da incorporare:",
+"Insert video": "Inserisci Video",
+"Embed": "Incorporare",
+"Nonbreaking space": "Spazio unificatore",
+"Preview": "Anteprima",
+"Print": "Stampa",
+"Save": "Salva",
+"Could not find the specified string.": "Impossibile trovare la parola specifica.",
+"Replace": "Sostituisci",
+"Next": "Successivo",
+"Whole words": "Parole intere",
+"Find and replace": "Trova e Sostituisci",
+"Replace with": "Sostituisci con",
+"Find": "Trova",
+"Replace all": "Sostituisci tutto",
+"Match case": "Maiuscole\/Minuscole ",
+"Prev": "Precedente",
+"Spellcheck": "Controllo ortografico",
+"Finish": "Termina",
+"Ignore all": "Ignora tutto",
+"Ignore": "Ignora",
+"Insert row before": "Inserisci una Riga prima",
+"Rows": "Righe",
+"Height": "Altezza",
+"Paste row after": "Incolla una Riga dopo",
+"Alignment": "Allineamento",
+"Column group": "Gruppo di Colonne",
+"Row": "Riga",
+"Insert column before": "Inserisci una Colonna prima",
+"Split cell": "Dividi Cella",
+"Cell padding": "Padding della Cella",
+"Cell spacing": "Spaziatura della Cella",
+"Row type": "Tipo di Riga",
+"Insert table": "Inserisci Tabella",
+"Body": "Body",
+"Caption": "Didascalia",
+"Footer": "Footer",
+"Delete row": "Cancella Riga",
+"Paste row before": "Incolla una Riga prima",
+"Scope": "Campo",
+"Delete table": "Cancella Tabella",
+"Header cell": "cella d'intestazione",
+"Column": "Colonna",
+"Cell": "Cella",
+"Header": "Header",
+"Cell type": "Tipo di Cella",
+"Copy row": "Copia Riga",
+"Row properties": "Propriet\u00e0 della Riga",
+"Table properties": "Propriet\u00e0 della Tabella",
+"Row group": "Gruppo di Righe",
+"Right": "Destra",
+"Insert column after": "Inserisci una Colonna dopo",
+"Cols": "Colonne",
+"Insert row after": "Inserisci una Riga dopo",
+"Width": "Larghezza",
+"Cell properties": "Propriet\u00e0 della Cella",
+"Left": "Sinistra",
+"Cut row": "Taglia Riga",
+"Delete column": "Cancella Colonna",
+"Center": "Centro",
+"Merge cells": "Unisci Cella",
+"Insert template": "Inserisci Template",
+"Templates": "Template",
+"Background color": "Colore Sfondo",
+"Text color": "Colore Testo",
+"Show blocks": "Mostra Blocchi",
+"Show invisible characters": "Mostra Caratteri Invisibili",
+"Words: {0}": "Parole: {0}",
+"Insert": "Inserisci",
+"File": "File",
+"Edit": "Modifica",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Premi ALT-F9 per il men\u00f9. Premi ALT-F10 per la barra degli strumenti. Premi ALT-0 per l'aiuto.",
+"Tools": "Strumenti",
+"View": "Visualizza",
+"Table": "Tabella",
+"Format": "Formato",
+"Inline": "Formato",
+"Blocks": "Blocchi",
+"Zoom in": "Zoom",
+"Contrast": "Contrasto",
+"Back": "Indietro",
+"Gamma": "Gamma",
+"Flip horizontally": "Capovolgi orizzontalmente",
+"Resize": "Ridimensiona",
+"Sharpen": "Affila",
+"Zoom out": "Zoom indietro",
+"Image options": "Opzioni immagine",
+"Apply": "Applica",
+"Brightness": "Luminosit\u00e0",
+"Rotate clockwise": "Ruota in senso orario",
+"Rotate counterclockwise": "Ruota in senso antiorario",
+"Edit image": "Modifica Immagine",
+"Color levels": "Livelli colore",
+"Crop": "Rifila",
+"Orientation": "Orientamento",
+"Flip vertically": "Capovolgi verticalmente",
+"Invert": "Inverti",
+"Font Family": "Famiglia Carattere",
+"Font Sizes": "Grandezza Carattere",
+"Paragraph": "Paragrafo",
+"Address": "Indirizzo",
+"Blockquote": "Citazione",
+"Pre": "Preformattato",
+"Code": "Codice",
+"H Align": "Allineamento orizzontale",
+"V Align": "Allineamento verticale",
+"Top": "Sopra",
+"Middle": "Al centro",
+"Bottom": "Sotto",
+"Headers": "Intestazioni",
+"Header 1": "Intestazione 1",
+"Header 2": "Intestazione 2",
+"Header 3": "Intestazione 3",
+"Header 4": "Intestazione 4",
+"Header 5": "Intestazione 5",
+"Header 6": "Intestazione 6",
+"Headings": "Intestazioni",
+"Heading 1": "Intestazione 1",
+"Heading 2": "Intestazione 2",
+"Heading 3": "Intestazione 3",
+"Heading 4": "Intestazione 4",
+"Heading 5": "Intestazione 5",
+"Heading 6": "Intestazione 6",
+"Preformatted": "Preformattato",
+"Add to Dictionary": "Aggiungi al dizionario",
+"Insert Time": "Inserisci ora",
+"Insert nonbreaking space": "Inserisci uno spazio",
+"Insert\/Edit code sample": "Inserisci\/modifica codice da mostrare",
+"Language": "Linguaggio",
+"Toggle blockquote": "Testo quotato",
+"Border color": "Colore bordo",
+"Color": "Colore",
+"Custom...": "Personalizza...",
+"Custom color": "Personalizza colore",
+"No color": "Nessun colore",
+"Id": "Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'Id dovrebbe iniziare con una lettera, seguita solo da lettere, numeri, trattini, due punti, virgole o underscore.",
+"Insert/Edit code sample": "Inserisci/Modifica codice di esempio",
+"Language": "Lingua",
+"Image": "Immagine",
+"Date/time": "Data/ora",
+"Link": "Link",
+"Paste or type a link": "Incolla o scrivi un link",
+"Insert/Edit Media": "Inserisci/Modifica oggetto multimediale",
+"Media": "Media",
+"Table of Contents": "Tabella di contenuti",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "L'incolla è ora in modalità di testo normale. I contenuti verranno incollati come testo normale fino a quando non disattiverai questa opzione.",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Vuoi aggiungere il prefisso necessario http:\/\/?",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Vuoi aggiungere il prefisso necessario mailto:?"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ja.js b/core/media/editors/tinymce/langs/ja.js
new file mode 100644
index 00000000..b9cc6a21
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ja.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('ja',{
+"Cut": "\u5207\u308a\u53d6\u308a",
+"Heading 5": "\u898b\u51fa\u3057 5",
+"Header 2": "\u30d8\u30c3\u30c0\u30fc 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u304a\u4f7f\u3044\u306e\u30d6\u30e9\u30a6\u30b6\u3067\u306f\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002\u30ad\u30fc\u30dc\u30fc\u30c9\u306e\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\uff08Ctrl+X, Ctrl+C, Ctrl+V\uff09\u3092\u304a\u4f7f\u3044\u4e0b\u3055\u3044\u3002",
+"Heading 4": "\u898b\u51fa\u3057 4",
+"Div": "Div",
+"Heading 2": "\u898b\u51fa\u3057 2",
+"Paste": "\u8cbc\u308a\u4ed8\u3051",
+"Close": "\u9589\u3058\u308b",
+"Font Family": "\u30d5\u30a9\u30f3\u30c8\u30d5\u30a1\u30df\u30ea\u30fc",
+"Pre": "Pre",
+"Align right": "\u53f3\u5bc4\u305b",
+"New document": "\u65b0\u898f\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8",
+"Blockquote": "\u5f15\u7528",
+"Numbered list": "\u756a\u53f7\u4ed8\u304d\u7b87\u6761\u66f8\u304d",
+"Heading 1": "\u898b\u51fa\u3057 1",
+"Headings": "\u898b\u51fa\u3057",
+"Increase indent": "\u30a4\u30f3\u30c7\u30f3\u30c8\u3092\u5897\u3084\u3059",
+"Formats": "\u66f8\u5f0f",
+"Headers": "\u30d8\u30c3\u30c0\u30fc",
+"Select all": "\u5168\u3066\u3092\u9078\u629e",
+"Header 3": "\u30d8\u30c3\u30c0\u30fc 3",
+"Blocks": "\u30d6\u30ed\u30c3\u30af",
+"Undo": "\u5143\u306b\u623b\u3059",
+"Strikethrough": "\u53d6\u308a\u6d88\u3057\u7dda",
+"Bullet list": "\u7b87\u6761\u66f8\u304d",
+"Header 1": "\u30d8\u30c3\u30c0\u30fc 1",
+"Superscript": "\u4e0a\u4ed8\u304d\u6587\u5b57",
+"Clear formatting": "\u66f8\u5f0f\u3092\u30af\u30ea\u30a2",
+"Font Sizes": "\u30d5\u30a9\u30f3\u30c8\u30b5\u30a4\u30ba",
+"Subscript": "\u4e0b\u4ed8\u304d\u6587\u5b57",
+"Header 6": "\u30d8\u30c3\u30c0\u30fc 6",
+"Redo": "\u3084\u308a\u76f4\u3059",
+"Paragraph": "\u6bb5\u843d",
+"Ok": "OK",
+"Bold": "\u592a\u5b57",
+"Code": "\u30b3\u30fc\u30c9",
+"Italic": "\u659c\u4f53",
+"Align center": "\u4e2d\u592e\u63c3\u3048",
+"Header 5": "\u30d8\u30c3\u30c0\u30fc 5",
+"Heading 6": "\u898b\u51fa\u3057 6",
+"Heading 3": "\u898b\u51fa\u3057 3",
+"Decrease indent": "\u30a4\u30f3\u30c7\u30f3\u30c8\u3092\u6e1b\u3089\u3059",
+"Header 4": "\u30d8\u30c3\u30c0\u30fc 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u8cbc\u308a\u4ed8\u3051\u306f\u73fe\u5728\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u30e2\u30fc\u30c9\u3067\u3059\u3002\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u30aa\u30d5\u306b\u3057\u306a\u3044\u9650\u308a\u5185\u5bb9\u306f\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u3068\u3057\u3066\u8cbc\u308a\u4ed8\u3051\u3089\u308c\u307e\u3059\u3002",
+"Underline": "\u4e0b\u7dda",
+"Cancel": "\u30ad\u30e3\u30f3\u30bb\u30eb",
+"Justify": "\u4e21\u7aef\u63c3\u3048",
+"Inline": "\u30a4\u30f3\u30e9\u30a4\u30f3",
+"Copy": "\u30b3\u30d4\u30fc",
+"Align left": "\u5de6\u5bc4\u305b",
+"Visual aids": "\u8868\u306e\u67a0\u7dda\u3092\u70b9\u7dda\u3067\u8868\u793a",
+"Lower Greek": "\u5c0f\u6587\u5b57\u306e\u30ae\u30ea\u30b7\u30e3\u6587\u5b57",
+"Square": "\u56db\u89d2",
+"Default": "\u30c7\u30d5\u30a9\u30eb\u30c8",
+"Lower Alpha": "\u5c0f\u6587\u5b57\u306e\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8",
+"Circle": "\u5186",
+"Disc": "\u70b9",
+"Upper Alpha": "\u5927\u6587\u5b57\u306e\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8",
+"Upper Roman": "\u5927\u6587\u5b57\u306e\u30ed\u30fc\u30de\u6570\u5b57",
+"Lower Roman": "\u5c0f\u6587\u5b57\u306e\u30ed\u30fc\u30de\u6570\u5b57",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID\u306f\u6587\u5b57\u3067\u59cb\u307e\u308a\u3001\u6587\u5b57\u3001\u6570\u5b57\u3001\u30c0\u30c3\u30b7\u30e5\u3001\u30c9\u30c3\u30c8\u3001\u30b3\u30ed\u30f3\u307e\u305f\u306f\u30a2\u30f3\u30c0\u30fc\u30b9\u30b3\u30a2\u3067\u59cb\u307e\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002",
+"Name": "\u30a2\u30f3\u30ab\u30fc\u540d",
+"Anchor": "\u30a2\u30f3\u30ab\u30fc\uff08\u30ea\u30f3\u30af\u306e\u5230\u9054\u70b9\uff09",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "\u307e\u3060\u4fdd\u5b58\u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u672c\u5f53\u306b\u3053\u306e\u30da\u30fc\u30b8\u3092\u96e2\u308c\u307e\u3059\u304b\uff1f",
+"Restore last draft": "\u524d\u56de\u306e\u4e0b\u66f8\u304d\u3092\u5fa9\u6d3b\u3055\u305b\u308b",
+"Special character": "\u7279\u6b8a\u6587\u5b57",
+"Source code": "\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9",
+"Language": "\u8a00\u8a9e",
+"Insert\/Edit code sample": "\u30b3\u30fc\u30c9\u30b5\u30f3\u30d7\u30eb\u306e\u633f\u5165\u30fb\u7de8\u96c6",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u30ab\u30e9\u30fc",
+"Right to left": "\u53f3\u304b\u3089\u5de6",
+"Left to right": "\u5de6\u304b\u3089\u53f3",
+"Emoticons": "\u7d75\u6587\u5b57",
+"Robots": "\u30ed\u30dc\u30c3\u30c4",
+"Document properties": "\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3",
+"Title": "\u30bf\u30a4\u30c8\u30eb",
+"Keywords": "\u30ad\u30fc\u30ef\u30fc\u30c9",
+"Encoding": "\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0",
+"Description": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5185\u5bb9",
+"Author": "\u8457\u8005",
+"Fullscreen": "\u5168\u753b\u9762\u8868\u793a",
+"Horizontal line": "\u6c34\u5e73\u7f6b\u7dda",
+"Horizontal space": "\u6a2a\u65b9\u5411\u306e\u4f59\u767d",
+"Insert\/edit image": "\u753b\u50cf\u306e\u633f\u5165\u30fb\u7de8\u96c6",
+"General": "\u4e00\u822c",
+"Advanced": "\u8a73\u7d30\u8a2d\u5b9a",
+"Source": "\u753b\u50cf\u306e\u30bd\u30fc\u30b9",
+"Border": "\u67a0\u7dda",
+"Constrain proportions": "\u7e26\u6a2a\u6bd4\u3092\u4fdd\u6301\u3059\u308b",
+"Vertical space": "\u7e26\u65b9\u5411\u306e\u4f59\u767d",
+"Image description": "\u753b\u50cf\u306e\u8aac\u660e\u6587",
+"Style": "\u30b9\u30bf\u30a4\u30eb",
+"Dimensions": "\u753b\u50cf\u30b5\u30a4\u30ba\uff08\u6a2a\u30fb\u7e26\uff09",
+"Insert image": "\u753b\u50cf\u306e\u633f\u5165",
+"Image": "\u753b\u50cf",
+"Zoom in": "\u30ba\u30fc\u30e0\u30a4\u30f3",
+"Contrast": "\u30b3\u30f3\u30c8\u30e9\u30b9\u30c8",
+"Back": "\u623b\u308b",
+"Gamma": "\u30ac\u30f3\u30de",
+"Flip horizontally": "\u6c34\u5e73\u306b\u53cd\u8ee2",
+"Resize": "\u30ea\u30b5\u30a4\u30ba",
+"Sharpen": "\u30b7\u30e3\u30fc\u30d7\u5316",
+"Zoom out": "\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8",
+"Image options": "\u753b\u50cf\u30aa\u30d7\u30b7\u30e7\u30f3",
+"Apply": "\u9069\u7528",
+"Brightness": "\u660e\u308b\u3055",
+"Rotate clockwise": "\u6642\u8a08\u56de\u308a\u306b\u56de\u8ee2",
+"Rotate counterclockwise": "\u53cd\u6642\u8a08\u56de\u308a\u306b\u56de\u8ee2",
+"Edit image": "\u753b\u50cf\u306e\u7de8\u96c6",
+"Color levels": "\u30ab\u30e9\u30fc\u30ec\u30d9\u30eb",
+"Crop": "\u30af\u30ed\u30c3\u30d7",
+"Orientation": "\u5411\u304d",
+"Flip vertically": "\u4e0a\u4e0b\u306b\u53cd\u8ee2",
+"Invert": "\u53cd\u8ee2",
+"Date\/time": "\u65e5\u4ed8\u30fb\u6642\u523b",
+"Insert date\/time": "\u65e5\u4ed8\u30fb\u6642\u523b",
+"Remove link": "\u30ea\u30f3\u30af\u306e\u524a\u9664",
+"Url": "\u30ea\u30f3\u30af\u5148URL",
+"Text to display": "\u30ea\u30f3\u30af\u5143\u30c6\u30ad\u30b9\u30c8",
+"Anchors": "\u30a2\u30f3\u30ab\u30fc\uff08\u30ea\u30f3\u30af\u306e\u5230\u9054\u70b9\uff09",
+"Insert link": "\u30ea\u30f3\u30af",
+"Link": "\u30ea\u30f3\u30af",
+"New window": "\u65b0\u898f\u30a6\u30a3\u30f3\u30c9\u30a6",
+"None": "\u306a\u3057",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u5165\u529b\u3055\u308c\u305fURL\u306f\u5916\u90e8\u30ea\u30f3\u30af\u306e\u3088\u3046\u3067\u3059\u3002\u300chttp:\/\/\u300d\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f",
+"Paste or type a link": "\u30ea\u30f3\u30af\u3092\u30da\u30fc\u30b9\u30c8\u307e\u305f\u306f\u5165\u529b",
+"Target": "\u30bf\u30fc\u30b2\u30c3\u30c8\u5c5e\u6027",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u5165\u529b\u3055\u308c\u305fURL\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u3088\u3046\u3067\u3059\u3002\u300cmailto:\u300d\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f",
+"Insert\/edit link": "\u30ea\u30f3\u30af\u306e\u633f\u5165\u30fb\u7de8\u96c6",
+"Insert\/edit video": "\u52d5\u753b\u306e\u633f\u5165\u30fb\u7de8\u96c6",
+"Media": "\u30e1\u30c7\u30a3\u30a2",
+"Alternative source": "\u4ee3\u66ff\u52d5\u753b\u306e\u5834\u6240",
+"Paste your embed code below:": "\u57cb\u3081\u8fbc\u307f\u7528\u30b3\u30fc\u30c9\u3092\u4e0b\u8a18\u306b\u8cbc\u308a\u4ed8\u3051\u3066\u304f\u3060\u3055\u3044\u3002",
+"Insert video": "\u52d5\u753b",
+"Poster": "\u4ee3\u66ff\u753b\u50cf\u306e\u5834\u6240",
+"Insert\/edit media": "\u30e1\u30c7\u30a3\u30a2\u306e\u633f\u5165\u30fb\u7de8\u96c6",
+"Embed": "\u57cb\u3081\u8fbc\u307f",
+"Nonbreaking space": "\u56fa\u5b9a\u30b9\u30da\u30fc\u30b9\uff08&nbsp;\uff09",
+"Page break": "\u30da\u30fc\u30b8\u533a\u5207\u308a",
+"Paste as text": "\u30c6\u30ad\u30b9\u30c8\u3068\u3057\u3066\u8cbc\u308a\u4ed8\u3051",
+"Preview": "\u30d7\u30ec\u30d3\u30e5\u30fc",
+"Print": "\u5370\u5237",
+"Save": "\u4fdd\u5b58",
+"Could not find the specified string.": "\u304a\u63a2\u3057\u306e\u6587\u5b57\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002",
+"Replace": "\u7f6e\u304d\u63db\u3048",
+"Next": "\u6b21",
+"Whole words": "\u5358\u8a9e\u5358\u4f4d\u3067\u691c\u7d22\u3059\u308b",
+"Find and replace": "\u691c\u7d22\u3068\u7f6e\u304d\u63db\u3048",
+"Replace with": "\u7f6e\u304d\u63db\u3048\u308b\u6587\u5b57",
+"Find": "\u691c\u7d22",
+"Replace all": "\u5168\u3066\u3092\u7f6e\u304d\u63db\u3048\u308b",
+"Match case": "\u5927\u6587\u5b57\u30fb\u5c0f\u6587\u5b57\u3092\u533a\u5225\u3059\u308b",
+"Prev": "\u524d",
+"Spellcheck": "\u30b9\u30da\u30eb\u30c1\u30a7\u30c3\u30af",
+"Finish": "\u7d42\u4e86",
+"Ignore all": "\u5168\u3066\u3092\u7121\u8996",
+"Ignore": "\u7121\u8996",
+"Add to Dictionary": "\u8f9e\u66f8\u306b\u8ffd\u52a0",
+"Insert row before": "\u4e0a\u5074\u306b\u884c\u3092\u633f\u5165",
+"Rows": "\u884c\u6570",
+"Height": "\u9ad8\u3055",
+"Paste row after": "\u4e0b\u5074\u306b\u884c\u3092\u8cbc\u308a\u4ed8\u3051",
+"Alignment": "\u914d\u7f6e",
+"Border color": "\u67a0\u7dda\u306e\u8272",
+"Column group": "\u5217\u30b0\u30eb\u30fc\u30d7",
+"Row": "\u884c",
+"Insert column before": "\u5de6\u5074\u306b\u5217\u3092\u633f\u5165",
+"Split cell": "\u30bb\u30eb\u306e\u5206\u5272",
+"Cell padding": "\u30bb\u30eb\u5185\u4f59\u767d\uff08\u30d1\u30c7\u30a3\u30f3\u30b0\uff09",
+"Cell spacing": "\u30bb\u30eb\u306e\u9593\u9694",
+"Row type": "\u884c\u30bf\u30a4\u30d7",
+"Insert table": "\u8868\u306e\u633f\u5165",
+"Body": "\u30dc\u30c7\u30a3\u30fc",
+"Caption": "\u8868\u984c",
+"Footer": "\u30d5\u30c3\u30bf\u30fc",
+"Delete row": "\u884c\u306e\u524a\u9664",
+"Paste row before": "\u4e0a\u5074\u306b\u884c\u3092\u8cbc\u308a\u4ed8\u3051",
+"Scope": "\u30b9\u30b3\u30fc\u30d7",
+"Delete table": "\u8868\u306e\u524a\u9664",
+"H Align": "\u6c34\u5e73\u65b9\u5411\u306e\u914d\u7f6e",
+"Top": "\u4e0a",
+"Header cell": "\u30d8\u30c3\u30c0\u30fc\u30bb\u30eb",
+"Column": "\u5217",
+"Row group": "\u884c\u30b0\u30eb\u30fc\u30d7",
+"Cell": "\u30bb\u30eb",
+"Middle": "\u4e2d\u592e",
+"Cell type": "\u30bb\u30eb\u30bf\u30a4\u30d7",
+"Copy row": "\u884c\u306e\u30b3\u30d4\u30fc",
+"Row properties": "\u884c\u306e\u8a73\u7d30\u8a2d\u5b9a",
+"Table properties": "\u8868\u306e\u8a73\u7d30\u8a2d\u5b9a",
+"Bottom": "\u4e0b",
+"V Align": "\u5782\u76f4\u65b9\u5411\u306e\u914d\u7f6e",
+"Header": "\u30d8\u30c3\u30c0\u30fc",
+"Right": "\u53f3\u5bc4\u305b",
+"Insert column after": "\u53f3\u5074\u306b\u5217\u3092\u633f\u5165",
+"Cols": "\u5217\u6570",
+"Insert row after": "\u4e0b\u5074\u306b\u884c\u3092\u633f\u5165",
+"Width": "\u5e45",
+"Cell properties": "\u30bb\u30eb\u306e\u8a73\u7d30\u8a2d\u5b9a",
+"Left": "\u5de6\u5bc4\u305b",
+"Cut row": "\u884c\u306e\u5207\u308a\u53d6\u308a",
+"Delete column": "\u5217\u306e\u524a\u9664",
+"Center": "\u4e2d\u592e\u63c3\u3048",
+"Merge cells": "\u30bb\u30eb\u306e\u7d50\u5408",
+"Insert template": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u633f\u5165",
+"Templates": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u540d",
+"Background color": "\u80cc\u666f\u8272",
+"Custom...": "\u30ab\u30b9\u30bf\u30e0...",
+"Custom color": "\u30ab\u30b9\u30bf\u30e0\u30ab\u30e9\u30fc",
+"No color": "\u30ab\u30e9\u30fc\u306a\u3057",
+"Text color": "\u30c6\u30ad\u30b9\u30c8\u306e\u8272",
+"Table of Contents": "\u76ee\u6b21",
+"Show blocks": "\u6587\u7ae0\u306e\u533a\u5207\u308a\u3092\u70b9\u7dda\u3067\u8868\u793a",
+"Show invisible characters": "\u4e0d\u53ef\u8996\u6587\u5b57\u3092\u8868\u793a",
+"Words: {0}": "\u5358\u8a9e\u6570: {0}",
+"Insert": "\u633f\u5165",
+"File": "\u30d5\u30a1\u30a4\u30eb",
+"Edit": "\u7de8\u96c6",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u66f8\u5f0f\u4ed8\u304d\u30c6\u30ad\u30b9\u30c8\u306e\u7de8\u96c6\u753b\u9762\u3002ALT-F9\u3067\u30e1\u30cb\u30e5\u30fc\u3001ALT-F10\u3067\u30c4\u30fc\u30eb\u30d0\u30fc\u3001ALT-0\u3067\u30d8\u30eb\u30d7\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002",
+"Tools": "\u30c4\u30fc\u30eb",
+"View": "\u8868\u793a",
+"Table": "\u8868",
+"Format": "\u66f8\u5f0f"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ka.js b/core/media/editors/tinymce/langs/ka.js
new file mode 100644
index 00000000..75881da5
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ka.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('ka',{
+"Cut": "\u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
+"Heading 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
+"Header 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d1\u10e0\u10d0\u10e3\u10d6\u10d4\u10e0\u10e1 \u10d0\u10e0 \u10d0\u10e5\u10d5\u10e1 \u10d1\u10e3\u10e4\u10e0\u10e2\u10e8\u10d8 \u10e8\u10d4\u10ee\u10ec\u10d4\u10d5\u10d8\u10e1 \u10db\u10ee\u10d0\u10e0\u10d3\u10d0\u10ed\u10d4\u10e0\u10d0. \u10d2\u10d7\u10ee\u10dd\u10d5\u10d7 \u10e1\u10d0\u10dc\u10d0\u10ea\u10d5\u10da\u10dd\u10d3 \u10d8\u10e1\u10d0\u10e0\u10d2\u10d4\u10d1\u10da\u10dd\u10d7 Ctrl+X\/C\/V \u10db\u10d0\u10da\u10e1\u10d0\u10ee\u10db\u10dd\u10d1\u10d8 \u10d9\u10dd\u10db\u10d1\u10d8\u10dc\u10d0\u10ea\u10d8\u10d4\u10d1\u10d8\u10d7.",
+"Heading 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
+"Div": "\u10d2\u10d0\u10dc\u10d0\u10ec\u10d8\u10da\u10d4\u10d1\u10d0",
+"Heading 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
+"Paste": "\u10e9\u10d0\u10e1\u10db\u10d0",
+"Close": "\u10d3\u10d0\u10ee\u10e3\u10e0\u10d5\u10d0",
+"Font Family": "\u10e4\u10dd\u10dc\u10e2\u10d8",
+"Pre": "\u10de\u10e0\u10d4\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8",
+"Align right": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
+"New document": "\u10d0\u10ee\u10d0\u10da\u10d8 \u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8",
+"Blockquote": "\u10d1\u10da\u10dd\u10d9\u10d8\u10e0\u10d4\u10d1\u10e3\u10da\u10d8 \u10ea\u10d8\u10e2\u10d0\u10e2\u10d0",
+"Numbered list": "\u10d3\u10d0\u10dc\u10dd\u10db\u10e0\u10d8\u10da\u10d8 \u10e1\u10d8\u10d0",
+"Heading 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
+"Headings": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
+"Increase indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10d2\u10d0\u10d6\u10e0\u10d3\u10d0",
+"Formats": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8",
+"Headers": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d4\u10d1\u10d8",
+"Select all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10db\u10dd\u10e6\u10dc\u10d8\u10e8\u10d5\u10dc\u10d0",
+"Header 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
+"Blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8",
+"Undo": "\u10d3\u10d0\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
+"Strikethrough": "\u10e8\u10e3\u10d0 \u10ee\u10d0\u10d6\u10d8",
+"Bullet list": "\u10d1\u10e3\u10da\u10d4\u10e2 \u10e1\u10d8\u10d0",
+"Header 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
+"Superscript": "\u10d6\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
+"Clear formatting": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10e1\u10e3\u10e4\u10d7\u10d0\u10d5\u10d4\u10d1\u10d0",
+"Font Sizes": "\u10e4\u10dd\u10dc\u10e2\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
+"Subscript": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
+"Header 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
+"Redo": "\u10d2\u10d0\u10db\u10d4\u10dd\u10e0\u10d4\u10d1\u10d0",
+"Paragraph": "\u10de\u10d0\u10e0\u10d0\u10d2\u10e0\u10d0\u10e4\u10d8",
+"Ok": "\u10d9\u10d0\u10e0\u10d2\u10d8",
+"Bold": "\u10db\u10d9\u10d5\u10d4\u10d7\u10e0\u10d8",
+"Code": "\u10d9\u10dd\u10d3\u10d8",
+"Italic": "\u10d3\u10d0\u10ee\u10e0\u10d8\u10da\u10d8",
+"Align center": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
+"Header 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
+"Heading 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
+"Heading 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
+"Decrease indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10e8\u10d4\u10db\u10ea\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Header 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0 \u10e9\u10d5\u10d4\u10e3\u10da\u10d4\u10d1\u10e0\u10d8\u10d5 \u10e0\u10d4\u10df\u10d8\u10db\u10e8\u10d8\u10d0. \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8 \u10e9\u10d0\u10d8\u10e1\u10db\u10d4\u10d5\u10d0 \u10e3\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10dd\u10d7 \u10e1\u10d0\u10dc\u10d0\u10db \u10d0\u10db \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d0\u10e1 \u10d0\u10e0 \u10d2\u10d0\u10d7\u10d8\u10e8\u10d0\u10d5\u10d7.",
+"Underline": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10ee\u10d0\u10d6\u10d8",
+"Cancel": "\u10d2\u10d0\u10e3\u10e5\u10db\u10d4\u10d1\u10d0",
+"Justify": "\u10d2\u10d0\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d8",
+"Inline": "\u10ee\u10d0\u10d6\u10e8\u10d8\u10d3\u10d0",
+"Copy": "\u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Align left": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
+"Visual aids": "\u10d5\u10d8\u10d6\u10e3\u10d0\u10da\u10d8\u10d6\u10d0\u10ea\u10d8\u10d0",
+"Lower Greek": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d1\u10d4\u10e0\u10eb\u10dc\u10e3\u10da\u10d8",
+"Square": "\u10d9\u10d5\u10d0\u10d3\u10e0\u10d0\u10e2\u10d8",
+"Default": "\u10e1\u10e2\u10d0\u10dc\u10d3\u10d0\u10e0\u10e2\u10e3\u10da\u10d8",
+"Lower Alpha": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
+"Circle": "\u10ec\u10e0\u10d4",
+"Disc": "\u10d3\u10d8\u10e1\u10d9\u10d8",
+"Upper Alpha": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
+"Upper Roman": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
+"Lower Roman": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id \u10e3\u10dc\u10d3\u10d0 \u10d8\u10ec\u10e7\u10d4\u10d1\u10dd\u10d3\u10d4\u10e1 \u10d0\u10e1\u10dd\u10d7\u10d8, \u10e0\u10dd\u10db\u10d4\u10da\u10e1\u10d0\u10ea \u10db\u10dd\u10e7\u10d5\u10d4\u10d1\u10d0 \u10db\u10ee\u10dd\u10da\u10dd\u10d3 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8, \u10ea\u10d8\u10e4\u10e0\u10d4\u10d1\u10d8, \u10e2\u10d8\u10e0\u10d4, \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d4\u10d1\u10d8, \u10dd\u10e0\u10d8 \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d8 \u10d0\u10dc \u10e5\u10d5\u10d4\u10d3\u10d0 \u10e2\u10d8\u10e0\u10d4. ",
+"Name": "\u10e1\u10d0\u10ee\u10d4\u10da\u10d8",
+"Anchor": "\u10e6\u10e3\u10d6\u10d0",
+"Id": "id",
+"You have unsaved changes are you sure you want to navigate away?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d2\u10d0\u10e5\u10d5\u10d7 \u10e8\u10d4\u10e3\u10dc\u10d0\u10ee\u10d0\u10d5\u10d8 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10d1\u10d8, \u10d3\u10d0\u10e0\u10ec\u10db\u10e3\u10dc\u10d4\u10d1\u10e3\u10da\u10d8 \u10ee\u10d0\u10d7 \u10e0\u10dd\u10db \u10e1\u10ee\u10d5\u10d0\u10d2\u10d0\u10dc \u10d2\u10d0\u10d3\u10d0\u10e1\u10d5\u10da\u10d0 \u10d2\u10e1\u10e3\u10e0\u10d7?",
+"Restore last draft": "\u10d1\u10dd\u10da\u10dd\u10e1 \u10e8\u10d4\u10dc\u10d0\u10ee\u10e3\u10da\u10d8\u10e1 \u10d0\u10e6\u10d3\u10d2\u10d4\u10dc\u10d0",
+"Special character": "\u10e1\u10de\u10d4\u10ea\u10d8\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd",
+"Source code": "\u10ec\u10e7\u10d0\u10e0\u10dd\u10e1 \u10d9\u10dd\u10d3\u10d8",
+"Language": "\u10d4\u10dc\u10d0",
+"Insert\/Edit code sample": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10d9\u10dd\u10d3\u10d8\u10e1 \u10db\u10d0\u10d2\u10d0\u10da\u10d8\u10d7\u10d8",
+"B": "\u10da",
+"R": "\u10ec",
+"G": "\u10db",
+"Color": "\u10e4\u10d4\u10e0\u10d8",
+"Right to left": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
+"Left to right": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
+"Emoticons": "\u10e1\u10db\u10d0\u10d8\u10da\u10d8\u10d9\u10d4\u10d1\u10d8",
+"Robots": "\u10e0\u10dd\u10d1\u10dd\u10d4\u10d1\u10d8",
+"Document properties": "\u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
+"Title": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
+"Keywords": "\u10e1\u10d0\u10d9\u10d5\u10d0\u10dc\u10eb\u10dd \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
+"Encoding": "\u10d9\u10dd\u10d3\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Description": "\u10d0\u10ee\u10ec\u10d4\u10e0\u10d0",
+"Author": "\u10d0\u10d5\u10e2\u10dd\u10e0\u10d8",
+"Fullscreen": "\u10e1\u10d0\u10d5\u10e1\u10d4 \u10d4\u10d9\u10e0\u10d0\u10dc\u10d8",
+"Horizontal line": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10ee\u10d0\u10d6\u10d8",
+"Horizontal space": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
+"Insert\/edit image": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10e1\u10e3\u10e0\u10d0\u10d7\u10d8",
+"General": "\u10db\u10d7\u10d0\u10d5\u10d0\u10e0\u10d8",
+"Advanced": "\u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8\u10d7\u10d8",
+"Source": "\u10d1\u10db\u10e3\u10da\u10d8",
+"Border": "\u10e1\u10d0\u10d6\u10e6\u10d5\u10d0\u10e0\u10d8",
+"Constrain proportions": "\u10de\u10e0\u10dd\u10de\u10dd\u10e0\u10ea\u10d8\u10d8\u10e1 \u10d3\u10d0\u10ea\u10d5\u10d0",
+"Vertical space": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
+"Image description": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10d3\u10d0\u10ee\u10d0\u10e1\u10d8\u10d0\u10d7\u10d4\u10d1\u10d0",
+"Style": "\u10e1\u10e2\u10d8\u10da\u10d8",
+"Dimensions": "\u10d2\u10d0\u10dc\u10d6\u10dd\u10db\u10d8\u10da\u10d4\u10d1\u10d0",
+"Insert image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Image": "\u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10ee\u10e3\u10da\u10d4\u10d1\u10d0",
+"Zoom in": "\u10d2\u10d0\u10d3\u10d8\u10d3\u10d8\u10d4\u10d1\u10d0",
+"Contrast": "\u10d9\u10dd\u10dc\u10e2\u10e0\u10d0\u10e1\u10e2\u10d8",
+"Back": "\u10e3\u10d9\u10d0\u10dc",
+"Gamma": "\u10d2\u10d0\u10db\u10d0",
+"Flip horizontally": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10e8\u10d4\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
+"Resize": "\u10d6\u10dd\u10db\u10d8\u10e1 \u10e8\u10d4\u10ea\u10d5\u10da\u10d0",
+"Sharpen": "\u10d2\u10d0\u10da\u10d4\u10e1\u10d5\u10d0",
+"Zoom out": "\u10d3\u10d0\u10de\u10d0\u10e2\u10d0\u10e0\u10d0\u10d5\u10d4\u10d1\u10d0",
+"Image options": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10de\u10d0\u10e0\u10d0\u10db\u10d4\u10e2\u10e0\u10d4\u10d1\u10d8",
+"Apply": "\u10db\u10d8\u10e6\u10d4\u10d1\u10d0",
+"Brightness": "\u10e1\u10d8\u10d9\u10d0\u10e8\u10d9\u10d0\u10e8\u10d4",
+"Rotate clockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10d7 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
+"Rotate counterclockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10e1 \u10e1\u10d0\u10ec\u10d8\u10dc\u10d0\u10d0\u10e6\u10db\u10d3\u10d4\u10d2\u10dd\u10d2 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
+"Edit image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Color levels": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d3\u10dd\u10dc\u10d4",
+"Crop": "\u10db\u10dd\u10ed\u10e0\u10d0",
+"Orientation": "\u10dd\u10e0\u10d8\u10d4\u10dc\u10e2\u10d0\u10ea\u10d8\u10d0",
+"Flip vertically": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10d0\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
+"Invert": "\u10e8\u10d4\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
+"Date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd",
+"Insert date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Remove link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
+"Url": "Url",
+"Text to display": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
+"Anchors": "\u10e6\u10e3\u10d6\u10d0",
+"Insert link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Link": "\u10d1\u10db\u10e3\u10da\u10d8",
+"New window": "\u10d0\u10ee\u10d0\u10da \u10e4\u10d0\u10dc\u10ef\u10d0\u10e0\u10d0\u10e8\u10d8",
+"None": "\u10d0\u10e0\u10ea\u10d4\u10e0\u10d7\u10d8",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc\u10e1 \u10db\u10d8\u10d4\u10e0 \u10db\u10d8\u10d7\u10d8\u10d7\u10d4\u10d1\u10e3\u10da\u10d8 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10ec\u10d0\u10e0\u10db\u10dd\u10d0\u10d3\u10d2\u10d4\u10dc\u10e1 \u10d2\u10d0\u10e0\u10d4 \u10d1\u10db\u10e3\u10da\u10e1. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd http:\/\/ \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
+"Paste or type a link": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d0\u10dc \u10e8\u10d4\u10d8\u10e7\u10d5\u10d0\u10dc\u10d4\u10d7 \u10d1\u10db\u10e3\u10da\u10d8",
+"Target": "\u10d2\u10d0\u10ee\u10e1\u10dc\u10d0",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10db\u10d8\u10e3\u10d7\u10d8\u10d7\u10d4\u10d7 \u10d4\u10da-\u10e4\u10dd\u10e1\u10e2\u10d8\u10e1 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10dc\u10d0\u10ea\u10d5\u10da\u10d0\u10d3 \u10d5\u10d4\u10d1-\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1\u10d0. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd mailto: \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
+"Insert\/edit link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d0",
+"Insert\/edit video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Media": "\u10db\u10d4\u10d3\u10d8\u10d0",
+"Alternative source": "\u10d0\u10da\u10e2\u10d4\u10e0\u10dc\u10d0\u10e2\u10d8\u10e3\u10da\u10d8 \u10ec\u10e7\u10d0\u10e0\u10dd",
+"Paste your embed code below:": "\u10d0\u10e5 \u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d7\u10e5\u10d5\u10d4\u10dc\u10d8 \u10d9\u10dd\u10d3\u10d8:",
+"Insert video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Poster": "\u10de\u10da\u10d0\u10d9\u10d0\u10e2\u10d8",
+"Insert\/edit media": "\u10db\u10d4\u10d3\u10d8\u10d0\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Embed": "\u10e9\u10d0\u10e8\u10d4\u10dc\u10d4\u10d1\u10d0",
+"Nonbreaking space": "\u10e3\u10ec\u10e7\u10d5\u10d4\u10e2\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
+"Page break": "\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1 \u10d2\u10d0\u10ec\u10e7\u10d5\u10d4\u10e2\u10d0",
+"Paste as text": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10e0\u10dd\u10d2\u10dd\u10e0\u10ea \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
+"Preview": "\u10ec\u10d8\u10dc\u10d0\u10e1\u10ec\u10d0\u10e0 \u10dc\u10d0\u10ee\u10d5\u10d0",
+"Print": "\u10d0\u10db\u10dd\u10d1\u10d4\u10ed\u10d5\u10d3\u10d0",
+"Save": "\u10e8\u10d4\u10dc\u10d0\u10ee\u10d5\u10d0",
+"Could not find the specified string.": "\u10db\u10dd\u10ea\u10d4\u10db\u10e3\u10da\u10d8 \u10e9\u10d0\u10dc\u10d0\u10ec\u10d4\u10e0\u10d8 \u10d5\u10d4\u10e0 \u10db\u10dd\u10d8\u10eb\u10d4\u10d1\u10dc\u10d0.",
+"Replace": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
+"Next": "\u10e8\u10d4\u10db\u10d3\u10d4\u10d2\u10d8",
+"Whole words": "\u10e1\u10e0\u10e3\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
+"Find and replace": "\u10db\u10dd\u10eb\u10d4\u10d1\u10dc\u10d4 \u10d3\u10d0 \u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4",
+"Replace with": "\u10e8\u10d4\u10e1\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d0",
+"Find": "\u10eb\u10d4\u10d1\u10dc\u10d0",
+"Replace all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
+"Match case": "\u10d3\u10d0\u10d0\u10db\u10d7\u10ee\u10d5\u10d8\u10d4 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
+"Prev": "\u10ec\u10d8\u10dc\u10d0",
+"Spellcheck": "\u10db\u10d0\u10e0\u10d7\u10da\u10ec\u10d4\u10e0\u10d8\u10e1 \u10e8\u10d4\u10db\u10dd\u10ec\u10db\u10d4\u10d1\u10d0",
+"Finish": "\u10d3\u10d0\u10e1\u10d0\u10e1\u10e0\u10e3\u10da\u10d8",
+"Ignore all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Ignore": "\u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Add to Dictionary": "\u10da\u10d4\u10e5\u10e1\u10d8\u10d9\u10dd\u10dc\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
+"Insert row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
+"Rows": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d4\u10d1\u10d8",
+"Height": "\u10e1\u10d8\u10db\u10d0\u10e6\u10da\u10d4",
+"Paste row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Alignment": "\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
+"Border color": "\u10e1\u10d0\u10d6\u10d0\u10e0\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
+"Column group": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
+"Row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8",
+"Insert column before": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
+"Split cell": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e7\u10dd\u10e4\u10d0",
+"Cell padding": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10dd\u10d1\u10d8",
+"Cell spacing": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d3\u10d0\u10e8\u10dd\u10e0\u10d4\u10d1\u10d0",
+"Row type": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
+"Insert table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Body": "\u10e2\u10d0\u10dc\u10d8",
+"Caption": "\u10ec\u10d0\u10e0\u10ec\u10d4\u10e0\u10d0",
+"Footer": "\u10eb\u10d8\u10e0\u10d8",
+"Delete row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
+"Paste row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Scope": "\u10e9\u10d0\u10e0\u10e9\u10dd",
+"Delete table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
+"H Align": "H \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
+"Top": "\u10db\u10d0\u10e6\u10da\u10d0",
+"Header cell": "\u10d7\u10d0\u10d5\u10d8\u10e1 \u10e3\u10ef\u10e0\u10d0",
+"Column": "\u10e1\u10d5\u10d4\u10e2\u10d8",
+"Row group": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
+"Cell": "\u10e3\u10ef\u10e0\u10d0",
+"Middle": "\u10e8\u10e3\u10d0",
+"Cell type": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
+"Copy row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
+"Row properties": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
+"Table properties": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
+"Bottom": "\u10e5\u10d5\u10d4\u10d3\u10d0",
+"V Align": "V \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
+"Header": "\u10d7\u10d0\u10d5\u10d8",
+"Right": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
+"Insert column after": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
+"Cols": "\u10e1\u10d5\u10d4\u10e2\u10d4\u10d1\u10d8",
+"Insert row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
+"Width": "\u10e1\u10d8\u10d2\u10d0\u10dc\u10d4",
+"Cell properties": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
+"Left": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
+"Cut row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
+"Delete column": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
+"Center": "\u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
+"Merge cells": "\u10e3\u10ef\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10d4\u10e0\u10d7\u10d8\u10d0\u10dc\u10d4\u10d1\u10d0",
+"Insert template": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
+"Templates": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d4\u10d1\u10d8",
+"Background color": "\u10e3\u10d9\u10d0\u10dc\u10d0 \u10e4\u10d4\u10e0\u10d8",
+"Custom...": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8",
+"Custom color": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8 \u10e4\u10d4\u10e0\u10d8",
+"No color": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e0\u10d4\u10e8\u10d4",
+"Text color": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
+"Table of Contents": "\u10e1\u10d0\u10e0\u10e9\u10d4\u10d5\u10d8",
+"Show blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
+"Show invisible characters": "\u10e3\u10ee\u10d8\u10da\u10d0\u10d5\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
+"Words: {0}": "\u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8: {0}",
+"Insert": "\u10e9\u10d0\u10e1\u10db\u10d0",
+"File": "\u10e4\u10d0\u10d8\u10da\u10d8",
+"Edit": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10d8. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F9\u10e1 \u10db\u10d4\u10dc\u10d8\u10e3\u10e1 \u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10eb\u10d0\u10ee\u10d4\u10d1\u10da\u10d0\u10d3. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F10\u10e1 \u10de\u10d0\u10dc\u10d4\u10da\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-0\u10e1 \u10d3\u10d0\u10ee\u10db\u10d0\u10e0\u10d4\u10d1\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1",
+"Tools": "\u10d8\u10d0\u10e0\u10d0\u10e6\u10d4\u10d1\u10d8",
+"View": "\u10dc\u10d0\u10ee\u10d5\u10d0",
+"Table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8",
+"Format": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/km.js b/core/media/editors/tinymce/langs/km.js
new file mode 100644
index 00000000..8d456334
--- /dev/null
+++ b/core/media/editors/tinymce/langs/km.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('km',{
+"Cut": "\u1780\u17b6\u178f\u17cb",
+"Heading 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
+"Header 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u17a2\u17ca\u17b8\u1793\u1792\u17ba\u178e\u17b7\u178f\u200b\u179a\u1794\u179f\u17cb\u200b\u17a2\u17d2\u1793\u1780\u200b\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u1785\u17bc\u179b\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1791\u17c5\u200b\u1780\u17b6\u1793\u17cb\u200b\u1780\u17d2\u178a\u17b6\u179a\u200b\u178f\u1798\u17d2\u1794\u17c0\u178f\u200b\u1781\u17d2\u1791\u17b6\u179f\u17cb\u200b\u17a1\u17be\u1799\u17d4 \u179f\u17bc\u1798\u200b\u1794\u17d2\u179a\u17be Ctrl+X\/C\/V \u179b\u17be\u200b\u1780\u17d2\u178a\u17b6\u179a\u200b\u1785\u17bb\u1785\u200b\u1787\u17c6\u1793\u17bd\u179f\u200b\u179c\u17b7\u1789\u17d4",
+"Heading 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
+"Div": "Div",
+"Heading 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
+"Paste": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb",
+"Close": "\u1794\u17b7\u1791",
+"Font Family": "\u1796\u17bb\u1798\u17d2\u1796\u200b\u17a2\u1780\u17d2\u179f\u179a",
+"Pre": "Pre",
+"Align right": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
+"New document": "\u17af\u1780\u179f\u17b6\u179a\u200b\u17a2\u178f\u17d2\u1790\u1794\u1791\u200b\u1790\u17d2\u1798\u17b8",
+"Blockquote": "\u1794\u17d2\u179b\u1780\u17cb\u200b\u1796\u17b6\u1780\u17d2\u1799\u200b\u179f\u1798\u17d2\u179a\u1784\u17cb",
+"Numbered list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u179b\u17c1\u1781",
+"Heading 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
+"Headings": "\u1780\u17d2\u1794\u17b6\u179b",
+"Increase indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17bc\u179b",
+"Formats": "\u1791\u1798\u17d2\u179a\u1784\u17cb",
+"Headers": "\u1780\u17d2\u1794\u17b6\u179b",
+"Select all": "\u1787\u17d2\u179a\u17be\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
+"Header 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
+"Blocks": "\u1794\u17d2\u179b\u1780\u17cb",
+"Undo": "\u1798\u17b7\u1793\u200b\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
+"Strikethrough": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1780\u178e\u17d2\u178a\u17b6\u179b",
+"Bullet list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u1785\u17c6\u178e\u17bb\u1785",
+"Header 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
+"Superscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u179b\u17be",
+"Clear formatting": "\u179f\u1798\u17d2\u17a2\u17b6\u178f\u200b\u1791\u1798\u17d2\u179a\u1784\u17cb",
+"Font Sizes": "\u1791\u17c6\u17a0\u17c6\u200b\u17a2\u1780\u17d2\u179f\u179a",
+"Subscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u1780\u17d2\u179a\u17c4\u1798",
+"Header 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
+"Redo": "\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
+"Paragraph": "\u1780\u178b\u17b6\u1781\u178e\u17d2\u178c",
+"Ok": "\u1796\u17d2\u179a\u1798",
+"Bold": "\u178a\u17b7\u178f",
+"Code": "\u1780\u17bc\u178a",
+"Italic": "\u1791\u17d2\u179a\u17c1\u178f",
+"Align center": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1780\u178e\u17d2\u178a\u17b6\u179b",
+"Header 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
+"Heading 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
+"Heading 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
+"Decrease indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17c1\u1789",
+"Header 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u1780\u17b6\u179a\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1796\u17c1\u179b\u200b\u1793\u17c1\u17c7 \u179f\u17d2\u1790\u17b7\u178f\u200b\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u17c2\u1794\u200b\u1795\u17c2\u1793\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6\u17d4 \u1794\u1785\u17d2\u1785\u17bb\u1794\u17d2\u1794\u1793\u17d2\u1793\u200b\u1793\u17c1\u17c7 \u1798\u17b6\u178f\u17b7\u1780\u17b6\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a1\u17b6\u1799\u200b\u1793\u17b9\u1784\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u17b6\u1793\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6 \u179b\u17bb\u17c7\u178f\u17d2\u179a\u17b6\u200b\u178f\u17c2\u200b\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b7\u1791\u200b\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u1793\u17c1\u17c7\u17d4",
+"Underline": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1798",
+"Cancel": "\u1794\u17c4\u17c7\u200b\u1794\u1784\u17cb",
+"Justify": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1796\u17c1\u1789",
+"Inline": "\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb",
+"Copy": "\u1785\u1798\u17d2\u179b\u1784",
+"Align left": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
+"Visual aids": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796\u200b\u1787\u17c6\u1793\u17bd\u1799",
+"Lower Greek": "\u179b\u17c1\u1781\u200b\u1780\u17d2\u179a\u17b7\u1780\u200b\u178f\u17bc\u1785",
+"Square": "\u1787\u17d2\u179a\u17bb\u1784",
+"Default": "\u179b\u17c6\u1793\u17b6\u17c6\u200b\u178a\u17be\u1798",
+"Lower Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785",
+"Circle": "\u1798\u17bc\u179b",
+"Disc": "\u1790\u17b6\u179f",
+"Upper Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u17c6",
+"Upper Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u1792\u17c6",
+"Lower Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u178f\u17bc\u1785",
+"Name": "\u1788\u17d2\u1798\u17c4\u17c7",
+"Anchor": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
+"You have unsaved changes are you sure you want to navigate away?": "\u1798\u17b6\u1793\u200b\u1794\u1793\u17d2\u179b\u17b6\u179f\u17cb\u200b\u1794\u17d2\u178a\u17bc\u179a\u200b\u1798\u17b7\u1793\u200b\u1791\u17b6\u1793\u17cb\u200b\u1794\u17b6\u1793\u200b\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1796\u17b7\u178f\u200b\u1787\u17b6\u200b\u1785\u1784\u17cb\u200b\u1785\u17b6\u1780\u200b\u1785\u17c1\u1789\u200b\u1796\u17b8\u1791\u17b8\u1793\u17c1\u17c7\u200b\u1798\u17c2\u1793\u1791\u17c1?",
+"Restore last draft": "\u179f\u17d2\u178a\u17b6\u179a\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u1796\u17d2\u179a\u17b6\u1784\u200b\u1796\u17b8\u200b\u1798\u17bb\u1793",
+"Special character": "\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1796\u17b7\u179f\u17c1\u179f",
+"Source code": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17bc\u178a",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u1796\u178e\u17cc",
+"Right to left": "\u179f\u17d2\u178a\u17b6\u17c6\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
+"Left to right": "\u1786\u17d2\u179c\u17c1\u1784\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
+"Emoticons": "\u179a\u17bc\u1794\u200b\u179f\u1789\u17d2\u1789\u17b6\u178e\u200b\u17a2\u17b6\u179a\u1798\u17d2\u1798\u178e\u17cd",
+"Robots": "\u179a\u17bc\u1794\u1799\u1793\u17d2\u178f",
+"Document properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u179f\u1798\u17d2\u1794\u178f\u17d2\u178f\u17b7\u200b\u17af\u1780\u179f\u17b6\u179a",
+"Title": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
+"Keywords": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1782\u1793\u17d2\u179b\u17b9\u17c7",
+"Encoding": "\u1780\u17b6\u179a\u200b\u17a2\u17ca\u17b8\u1793\u1780\u17bc\u178a",
+"Description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799",
+"Author": "\u17a2\u17d2\u1793\u1780\u200b\u1793\u17b7\u1796\u1793\u17d2\u1792",
+"Fullscreen": "\u1796\u17c1\u1789\u200b\u17a2\u17c1\u1780\u17d2\u179a\u1784\u17cb",
+"Horizontal line": "\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u178a\u17c1\u1780",
+"Horizontal space": "\u179b\u17c6\u17a0\u200b\u1795\u17d2\u178a\u17c1\u1780",
+"Insert\/edit image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
+"General": "\u1791\u17bc\u1791\u17c5",
+"Advanced": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1781\u17d2\u1796\u179f\u17cb",
+"Source": "\u1794\u17d2\u179a\u1797\u1796",
+"Border": "\u179f\u17ca\u17bb\u1798",
+"Constrain proportions": " \u1794\u1784\u17d2\u1781\u17c6\u200b\u17b2\u17d2\u1799\u200b\u1798\u17b6\u1793\u200b\u179f\u1798\u17b6\u1798\u17b6\u178f\u17d2\u179a",
+"Vertical space": "\u179b\u17c6\u17a0\u200b\u1794\u1789\u17d2\u1788\u179a",
+"Image description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799\u200b\u1796\u17b8\u200b\u179a\u17bc\u1794",
+"Style": "\u179a\u1785\u1793\u17b6\u1794\u1790",
+"Dimensions": "\u179c\u17b7\u1798\u17b6\u178f\u17d2\u179a",
+"Insert image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
+"Zoom in": "\u1796\u1784\u17d2\u179a\u17b8\u1780",
+"Contrast": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
+"Back": "\u1790\u1799\u1780\u17d2\u179a\u17c4\u1799",
+"Gamma": "\u17a0\u17d2\u1782\u17b6\u1798\u17c9\u17b6",
+"Flip horizontally": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1795\u17d2\u178a\u17c1\u1780",
+"Resize": "\u1794\u17d2\u178a\u17bc\u179a\u200b\u1791\u17c6\u17a0\u17c6",
+"Sharpen": "\u1785\u17d2\u1794\u17b6\u179f\u17cb",
+"Zoom out": "\u1794\u1784\u17d2\u179a\u17bd\u1798",
+"Image options": "\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
+"Apply": "\u17a2\u1793\u17bb\u179c\u178f\u17d2\u178f",
+"Brightness": "\u1796\u1793\u17d2\u179b\u17ba",
+"Rotate clockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u179f\u17d2\u179a\u1794\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
+"Rotate counterclockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u1785\u17d2\u179a\u17b6\u179f\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
+"Edit image": "\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
+"Color levels": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
+"Crop": "\u1785\u17d2\u179a\u17b9\u1794",
+"Orientation": "\u1791\u17b7\u179f",
+"Flip vertically": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1794\u1789\u17d2\u1788\u179a",
+"Invert": "\u178a\u17b6\u1780\u17cb\u200b\u1794\u1789\u17d2\u1785\u17d2\u179a\u17b6\u179f",
+"Insert date\/time": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17b6\u179b\u200b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\/\u1798\u17c9\u17c4\u1784",
+"Remove link": "\u178a\u1780\u200b\u178f\u17c6\u178e\u200b\u1785\u17c1\u1789",
+"Url": "Url",
+"Text to display": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u1784\u17d2\u17a0\u17b6\u1789",
+"Anchors": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
+"Insert link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
+"New window": "\u1795\u17d2\u1791\u17b6\u17c6\u1784\u200b\u179c\u17b8\u1793\u178a\u17bc\u200b\u1790\u17d2\u1798\u17b8",
+"None": "\u1798\u17b7\u1793\u200b\u1798\u17b6\u1793",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1787\u17b6\u200b\u178f\u17c6\u178e\u200b\u1791\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c5\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 http:\/\/ \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
+"Target": "\u1791\u17b7\u179f\u178a\u17c5",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1798\u17b6\u1793\u200b\u179f\u178e\u17d2\u178b\u17b6\u1793\u200b\u178a\u17bc\u1785\u200b\u17a2\u17b6\u179f\u1799\u178a\u17d2\u178b\u17b6\u1793\u200b\u17a2\u17ca\u17b8\u1798\u17c2\u179b\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 mailto: \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
+"Insert\/edit link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u178f\u17c6\u178e",
+"Insert\/edit video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179c\u17b8\u178a\u17c1\u17a2\u17bc",
+"Poster": "\u17a2\u17d2\u1793\u1780\u200b\u1795\u17d2\u179f\u17b6\u1799",
+"Alternative source": "\u1794\u17d2\u179a\u1797\u1796\u200b\u178a\u1791\u17c3\u200b\u1791\u17c0\u178f",
+"Paste your embed code below:": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1780\u17bc\u178a\u200b\u1794\u1784\u17d2\u1780\u1794\u17cb\u200b\u1793\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c4\u1798:",
+"Insert video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179c\u17b8\u178a\u17c1\u17a2\u17bc",
+"Embed": "\u1794\u1784\u17d2\u1780\u1794\u17cb",
+"Nonbreaking space": "\u178a\u17c6\u178e\u1780\u200b\u1783\u17d2\u179b\u17b6\u200b\u1798\u17b7\u1793\u200b\u1794\u17c6\u1794\u17c2\u1780",
+"Page break": "\u1794\u17c6\u1794\u17c2\u1780\u200b\u1791\u17c6\u1796\u17d0\u179a",
+"Paste as text": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a",
+"Preview": "\u1798\u17be\u179b\u200b\u1787\u17b6\u200b\u1798\u17bb\u1793",
+"Print": "\u1794\u17c4\u17c7\u200b\u1796\u17bb\u1798\u17d2\u1796",
+"Save": "\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780",
+"Could not find the specified string.": "\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u179a\u1780\u200b\u1783\u17be\u1789\u200b\u1781\u17d2\u179f\u17c2\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u178a\u17c2\u179b\u200b\u1794\u17b6\u1793\u200b\u1780\u17c6\u178e\u178f\u17cb\u17d4",
+"Replace": "\u1787\u17c6\u1793\u17bd\u179f",
+"Next": "\u1798\u17bb\u1781",
+"Whole words": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1791\u17b6\u17c6\u1784\u200b\u1798\u17bc\u179b",
+"Find and replace": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780\u200b\u1793\u17b7\u1784\u200b\u1787\u17c6\u1793\u17bd\u179f",
+"Replace with": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u178a\u17c4\u1799",
+"Find": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780",
+"Replace all": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
+"Match case": "\u1780\u179a\u178e\u17b8\u200b\u178a\u17c6\u178e\u17bc\u1785",
+"Prev": "\u1780\u17d2\u179a\u17c4\u1799",
+"Spellcheck": "\u1796\u17b7\u1793\u17b7\u178f\u17d2\u1799\u200b\u17a2\u1780\u17d2\u1781\u179a\u17b6\u179c\u17b7\u179a\u17bb\u1791\u17d2\u1792",
+"Finish": "\u1794\u1789\u17d2\u1785\u1794\u17cb",
+"Ignore all": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u1796\u17be\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
+"Ignore": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u200b\u1796\u17be",
+"Add to Dictionary": "\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1791\u17c5\u200b\u179c\u1785\u1793\u17b6\u1793\u17bb\u1780\u17d2\u179a\u1798",
+"Insert row before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1788\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
+"Rows": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Height": "\u1780\u1798\u17d2\u1796\u179f\u17cb",
+"Paste row after": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
+"Alignment": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798",
+"Border color": "\u1796\u178e\u17cc\u200b\u179f\u17ca\u17bb\u1798",
+"Column group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
+"Row": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Insert column before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u1788\u179a\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
+"Split cell": "\u1789\u17c2\u1780\u200b\u1780\u17d2\u179a\u17a1\u17b6",
+"Cell padding": "\u1785\u1793\u17d2\u179b\u17c4\u17c7\u200b\u1780\u17d2\u179a\u17a1\u17b6",
+"Cell spacing": "\u1782\u1798\u17d2\u179b\u17b6\u178f\u200b\u1780\u17d2\u179a\u17a1\u17b6",
+"Row type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Insert table": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17b6\u179a\u17b6\u1784",
+"Body": "\u178f\u17bd\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8",
+"Caption": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
+"Footer": "\u1794\u178b\u1798\u200b\u1780\u1790\u17b6",
+"Delete row": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Paste row before": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
+"Scope": "\u179c\u17b7\u179f\u17b6\u179b\u200b\u1797\u17b6\u1796",
+"Delete table": "\u179b\u17bb\u1794\u200b\u178f\u17b6\u179a\u17b6\u1784",
+"H Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1795\u17d2\u178a\u17c1\u1780",
+"Top": "\u179b\u17be",
+"Header cell": "\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
+"Column": "\u1787\u17bd\u179a\u200b\u1788\u179a",
+"Row group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Cell": "\u1780\u17d2\u179a\u17a1\u17b6",
+"Middle": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
+"Cell type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1780\u17d2\u179a\u17a1\u17b6",
+"Copy row": "\u1785\u1798\u17d2\u179b\u1784\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Row properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Table properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u178f\u17b6\u179a\u17b6\u1784",
+"Bottom": "\u1780\u17d2\u179a\u17c4\u1798",
+"V Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1794\u1789\u17d2\u1788\u179a",
+"Header": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
+"Right": "\u179f\u17d2\u178a\u17b6\u17c6",
+"Insert column after": "\u1794\u1789\u17d2\u1787\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
+"Cols": "\u1787\u17bd\u179a\u200b\u1788\u179a",
+"Insert row after": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
+"Width": "\u1791\u1791\u17b9\u1784",
+"Cell properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1780\u17d2\u179a\u17a1\u17b6",
+"Left": "\u1786\u17d2\u179c\u17c1\u1784",
+"Cut row": "\u1780\u17b6\u178f\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
+"Delete column": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
+"Center": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
+"Merge cells": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17bc\u179b\u200b\u1782\u17d2\u1793\u17b6",
+"Insert template": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u1798\u17d2\u179a\u17bc",
+"Templates": "\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u1798\u17d2\u179a\u17bc",
+"Background color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17c3\u200b\u1780\u17d2\u179a\u17c4\u1799",
+"Custom...": "\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793...",
+"Custom color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793",
+"No color": "\u1782\u17d2\u1798\u17b6\u1793\u200b\u1796\u178e\u17cc",
+"Text color": "\u1796\u178e\u17cc\u200b\u17a2\u1780\u17d2\u179f\u179a",
+"Show blocks": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u1794\u17d2\u179b\u17bb\u1780",
+"Show invisible characters": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17c6\u1794\u17b6\u17c6\u1784",
+"Words: {0}": "\u1796\u17b6\u1780\u17d2\u1799: {0}",
+"Insert": "\u1794\u1789\u17d2\u1785\u17bc\u179b",
+"File": "\u17af\u1780\u179f\u17b6\u179a",
+"Edit": "\u1780\u17c2\u1794\u17d2\u179a\u17c2",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u179f\u17c6\u1794\u17bc\u179a\u1794\u17c2\u1794\u17d4 \u1785\u17bb\u1785 ALT-F9 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u17d4 \u1785\u17bb\u1785 ALT-F10 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd\u17d4 \u1785\u17bb\u1785 ALT-0 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1787\u17c6\u1793\u17bd\u1799\u17d4",
+"Tools": "\u17a7\u1794\u1780\u179a\u178e\u17cd",
+"View": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796",
+"Table": "\u178f\u17b6\u179a\u17b6\u1784",
+"Format": "\u1791\u1798\u17d2\u179a\u1784\u17cb"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ko.js b/core/media/editors/tinymce/langs/ko.js
new file mode 100644
index 00000000..6e536112
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ko.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('ko',{
+"Cut": "\uc798\ub77c\ub0b4\uae30",
+"Header 2": "\uc81c\ubaa9 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc838\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ud0a4\ub97c \uc774\uc6a9\ud574 \uc8fc\uc138\uc694.",
+"Div": "\uad6c\ubd84",
+"Paste": "\ubd99\uc5ec\ub123\uae30",
+"Close": "\ub2eb\uae30",
+"Font Family": "Font Family",
+"Pre": "Pre",
+"Align right": "\uc624\ub978\ucabd\uc815\ub82c",
+"New document": "\uc0c8 \ubb38\uc11c",
+"Blockquote": "\uad6c\ud68d",
+"Numbered list": "\uc22b\uc790\ub9ac\uc2a4\ud2b8",
+"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
+"Formats": "\ud3ec\ub9f7",
+"Headers": "\uc2a4\ud0c0\uc77c",
+"Select all": "\uc804\uccb4\uc120\ud0dd",
+"Header 3": "\uc81c\ubaa9 3",
+"Blocks": "\ube14\ub85d \uc124\uc815",
+"Undo": "\uc2e4\ud589\ucde8\uc18c",
+"Strikethrough": "\ucde8\uc18c\uc120",
+"Bullet list": "\uc810\ub9ac\uc2a4\ud2b8",
+"Header 1": "\uc81c\ubaa9 1",
+"Superscript": "\uc717\ucca8\uc790",
+"Clear formatting": "\ud3ec\ub9f7\ucd08\uae30\ud654",
+"Font Sizes": "Font Sizes",
+"Subscript": "\uc544\ub798\ucca8\uc790",
+"Header 6": "\uc81c\ubaa9 6",
+"Redo": "\ub2e4\uc2dc\uc2e4\ud589",
+"Paragraph": "\ub2e8\ub77d",
+"Ok": "\ud655\uc778",
+"Bold": "\uad75\uac8c",
+"Code": "\ucf54\ub4dc",
+"Italic": "\uae30\uc6b8\uc784\uaf34",
+"Align center": "\uac00\uc6b4\ub370\uc815\ub82c",
+"Header 5": "\uc81c\ubaa9 5",
+"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
+"Header 4": "\uc81c\ubaa9 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
+"Underline": "\ubc11\uc904",
+"Cancel": "\ucde8\uc18c",
+"Justify": "\uc591\ucabd\uc815\ub82c",
+"Inline": "\ub77c\uc778 \uc124\uc815",
+"Copy": "\ubcf5\uc0ac\ud558\uae30",
+"Align left": "\uc67c\ucabd\uc815\ub82c",
+"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
+"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
+"Square": "\uc0ac\uac01",
+"Default": "\uae30\ubcf8",
+"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
+"Circle": "\uc6d0",
+"Disc": "\uc6d0\ubc18",
+"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
+"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
+"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
+"Name": "\uc774\ub984",
+"Anchor": "\uc575\ucee4",
+"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
+"Special character": "\ud2b9\uc218\ubb38\uc790",
+"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
+"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
+"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
+"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
+"Robots": "\ub85c\ubd07",
+"Document properties": "\ubb38\uc11c \uc18d\uc131",
+"Title": "\uc81c\ubaa9",
+"Keywords": "\ud0a4\uc6cc\ub4dc",
+"Encoding": "\uc778\ucf54\ub529",
+"Description": "\uc124\uba85",
+"Author": "\uc800\uc790",
+"Fullscreen": "\uc804\uccb4\ud654\uba74",
+"Horizontal line": "\uac00\ub85c",
+"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
+"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
+"General": "\uc77c\ubc18",
+"Advanced": "\uace0\uae09",
+"Source": "\uc18c\uc2a4",
+"Border": "\ud14c\ub450\ub9ac",
+"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
+"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
+"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
+"Style": "\uc2a4\ud0c0\uc77c",
+"Dimensions": "\ud06c\uae30",
+"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
+"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
+"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
+"Url": "\uc8fc\uc18c",
+"Text to display": "\ubcf8\ubb38",
+"Anchors": "\ucc45\uac08\ud53c",
+"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
+"New window": "\uc0c8\ucc3d",
+"None": "\uc5c6\uc74c",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\ub300\uc0c1",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
+"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
+"Poster": "\ud3ec\uc2a4\ud130",
+"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
+"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
+"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
+"Embed": "\uc0bd\uc785",
+"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
+"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
+"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
+"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
+"Print": "\ucd9c\ub825",
+"Save": "\uc800\uc7a5",
+"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
+"Replace": "\uad50\uccb4",
+"Next": "\ub2e4\uc74c",
+"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
+"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
+"Replace with": "\uad50\uccb4",
+"Find": "\ucc3e\uae30",
+"Replace all": "\uc804\uccb4 \uad50\uccb4",
+"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
+"Prev": "\uc774\uc804",
+"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
+"Finish": "\uc644\ub8cc",
+"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
+"Ignore": "\ubb34\uc2dc",
+"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
+"Rows": "\ud589",
+"Height": "\ub192\uc774",
+"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
+"Alignment": "\uc815\ub82c",
+"Column group": "\uc5f4 \uadf8\ub8f9",
+"Row": "\uc5f4",
+"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
+"Split cell": "\uc140 \ub098\ub204\uae30",
+"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
+"Cell spacing": "\uc140 \uac04\uaca9",
+"Row type": "\ud589 \ud0c0\uc785",
+"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
+"Body": "\ubc14\ub514",
+"Caption": "\ucea1\uc158",
+"Footer": "\ud478\ud130",
+"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
+"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
+"Scope": "\ubc94\uc704",
+"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
+"Header cell": "\ud5e4\ub354 \uc140",
+"Column": "\ud589",
+"Cell": "\uc140",
+"Header": "\ud5e4\ub354",
+"Cell type": "\uc140 \ud0c0\uc785",
+"Copy row": "\ud589 \ubcf5\uc0ac",
+"Row properties": "\ud589 \uc18d\uc131",
+"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
+"Row group": "\ud589 \uadf8\ub8f9",
+"Right": "\uc624\ub978\ucabd",
+"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
+"Cols": "\uc5f4",
+"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
+"Width": "\ub113\uc774",
+"Cell properties": "\uc140 \uc18d",
+"Left": "\uc67c\ucabd",
+"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
+"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
+"Center": "\uac00\uc6b4\ub370",
+"Merge cells": "\uc140 \ud569\uce58\uae30",
+"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785",
+"Templates": "\ud15c\ud50c\ub9bf",
+"Background color": "\ubc30\uacbd\uc0c9",
+"Text color": "\ubb38\uc790 \uc0c9\uae54",
+"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
+"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
+"Words: {0}": "\ub2e8\uc5b4: {0}",
+"Insert": "\uc0bd\uc785",
+"File": "\ud30c\uc77c",
+"Edit": "\uc218\uc815",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
+"Tools": "\ub3c4\uad6c",
+"View": "\ubcf4\uae30",
+"Table": "\ud14c\uc774\ube14",
+"Format": "\ud3ec\ub9f7"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/lb.js b/core/media/editors/tinymce/langs/lb.js
new file mode 100644
index 00000000..53e43ae9
--- /dev/null
+++ b/core/media/editors/tinymce/langs/lb.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('lb',{
+"Cut": "Ausschneiden",
+"Header 2": "Titel 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "D\u00e4i Web-Browser \u00ebnnerst\u00ebtzt keen direkten Acc\u00e8s op d'Zw\u00ebschenaplag. Benotz w.e.gl. CTRL+C fir den ausgewielten Text ze kop\u00e9ieren an CTRL+V fir en anzepechen.",
+"Div": "DIV",
+"Paste": "Apechen",
+"Close": "Zoumaachen",
+"Font Family": "Schr\u00ebft-Famill",
+"Pre": "PRE",
+"Align right": "Riets align\u00e9iert",
+"New document": "Neit Dokument",
+"Blockquote": "Zitat",
+"Numbered list": "Nummer\u00e9iert L\u00ebscht",
+"Increase indent": "Ident\u00e9ierung vergr\u00e9isseren",
+"Formats": "Formater",
+"Headers": "Titelen",
+"Select all": "Alles auswielen",
+"Header 3": "Titel 3",
+"Blocks": "Bl\u00e9ck",
+"Undo": "R\u00e9ckg\u00e4ngeg maachen",
+"Strikethrough": "Duerchgestrach",
+"Bullet list": "Opzielung",
+"Header 1": "Titel 1",
+"Superscript": "H\u00e9ichgestallt",
+"Clear formatting": "Format\u00e9ierung l\u00e4schen",
+"Font Sizes": "Schr\u00ebft-Gr\u00e9issten",
+"Subscript": "Erofgestallt",
+"Header 6": "Titel 6",
+"Redo": "Widderhuelen",
+"Paragraph": "Paragraph",
+"Ok": "Okee",
+"Bold": "Fett",
+"Code": "CODE",
+"Italic": "Kursiv",
+"Align center": "Zentr\u00e9iert",
+"Header 5": "Titel 5",
+"Decrease indent": "Ident\u00e9ierung verklengeren",
+"Header 4": "Titel 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\"Apechen\" ass elo am Textmodus. Inhalter ginn elo ouni Format\u00e9ierungen agepecht bis du d\u00ebs Optioun ausm\u00e9chs.",
+"Underline": "\u00cbnnerstrach",
+"Cancel": "Ofbriechen",
+"Justify": "Blocksaz",
+"Inline": "Inline",
+"Copy": "Kop\u00e9ieren",
+"Align left": "L\u00e9nks align\u00e9iert",
+"Visual aids": "Visuell H\u00ebllefen",
+"Lower Greek": "Klengt griichescht Alphabet",
+"Square": "Quadrat",
+"Default": "Standard",
+"Lower Alpha": "Klengt Alphabet",
+"Circle": "Krees",
+"Disc": "Scheif",
+"Upper Alpha": "Grousst Alphabet",
+"Upper Roman": "Grousst r\u00e9imescht Alphabet",
+"Lower Roman": "Klengt r\u00e9imescht Alphabet",
+"Name": "Numm",
+"Anchor": "Anker",
+"You have unsaved changes are you sure you want to navigate away?": "Du hues ongesp\u00e4ichert \u00c4nnerungen. W\u00eblls du s\u00e9cher ewechnavig\u00e9ieren?",
+"Restore last draft": "Leschten Entworf er\u00ebm zr\u00e9cksetzen",
+"Special character": "Speziell Zeechen",
+"Source code": "Quelltext",
+"Right to left": "Vu riets no l\u00e9nks",
+"Left to right": "Vu l\u00e9nks no riets",
+"Emoticons": "Smileyen",
+"Robots": "Robotter",
+"Document properties": "Eegeschafte vum Dokument",
+"Title": "Titel",
+"Keywords": "Schl\u00ebsselwierder",
+"Encoding": "Cod\u00e9ierung",
+"Description": "Beschreiwung",
+"Author": "Auteur",
+"Fullscreen": "Vollbildschierm",
+"Horizontal line": "Horizontal Linn",
+"Horizontal space": "Horizontalen Espace",
+"Insert\/edit image": "Bild af\u00fcgen\/\u00e4nneren",
+"General": "Allgemeng",
+"Advanced": "Erweidert",
+"Source": "Quell",
+"Border": "Rand",
+"Constrain proportions": "Proportioune b\u00e4ibehalen",
+"Vertical space": "Vertikalen Espace",
+"Image description": "Bildbeschreiwung",
+"Style": "Stil",
+"Dimensions": "Dimensiounen",
+"Insert image": "Bild af\u00fcgen",
+"Insert date\/time": "Datum\/Z\u00e4it drasetzen",
+"Remove link": "Link l\u00e4schen",
+"Url": "URL",
+"Text to display": "Text deen unzeweisen ass",
+"Anchors": "Ankeren",
+"Insert link": "Link drasetzen",
+"New window": "Nei F\u00ebnster",
+"None": "Keen",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "D'URL d\u00e9i s du aginn hues sch\u00e9ngt en externe Link ze sinn. W\u00eblls du den \"http:\/\/\"-Pr\u00e4fix dob\u00e4isetzen?",
+"Target": "Zil",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "D'URL d\u00e9i s du aginn hues sch\u00e9ngt eng Email-Adress ze sinn. W\u00eblls du de \"mailto:\"-Pr\u00e4fix dob\u00e4isetzen?",
+"Insert\/edit link": "Link drasetzen\/\u00e4nneren",
+"Insert\/edit video": "Video drasetzen\/\u00e4nneren",
+"Poster": "Pouster",
+"Alternative source": "Alternativ Quell",
+"Paste your embed code below:": "Abannungscode hei apechen:",
+"Insert video": "Video drasetzen",
+"Embed": "Abannen",
+"Nonbreaking space": "Net\u00ebmbriechenden Espace",
+"Page break": "S\u00e4iten\u00ebmbroch",
+"Paste as text": "Als Text apechen",
+"Preview": "Kucken",
+"Print": "Dr\u00e9cken",
+"Save": "Sp\u00e4icheren",
+"Could not find the specified string.": "Den Text konnt net fonnt ginn.",
+"Replace": "Ersetzen",
+"Next": "Weider",
+"Whole words": "Ganz Wierder",
+"Find and replace": "Fannen an ersetzen",
+"Replace with": "Ersetze mat",
+"Find": "Fannen",
+"Replace all": "All ersetzen",
+"Match case": "Grouss-\/Klengschreiwung respekt\u00e9ieren",
+"Prev": "Zr\u00e9ck",
+"Spellcheck": "Verbesseren",
+"Finish": "Ofschl\u00e9issen",
+"Ignore all": "All ignor\u00e9ieren",
+"Ignore": "Ignor\u00e9ieren",
+"Insert row before": "Rei virdrun drasetzen",
+"Rows": "Reien",
+"Height": "H\u00e9icht",
+"Paste row after": "Rei herno apechen",
+"Alignment": "Align\u00e9ierung",
+"Column group": "Kolonnegrupp",
+"Row": "Rei",
+"Insert column before": "Kolonn virdrun drasetzen",
+"Split cell": "Zell opspl\u00e9cken",
+"Cell padding": "Zellenopf\u00ebllung",
+"Cell spacing": "Zellenofstand",
+"Row type": "Reientyp",
+"Insert table": "Tabell drasetzen",
+"Body": "Kierper",
+"Caption": "Beschr\u00ebftung",
+"Footer": "Fouss",
+"Delete row": "Rei l\u00e4schen",
+"Paste row before": "Rei virdrun apechen",
+"Scope": "Ber\u00e4ich",
+"Delete table": "Tabell l\u00e4schen",
+"Header cell": "Kappzell",
+"Column": "Kolonn",
+"Cell": "Zell",
+"Header": "Kapp",
+"Cell type": "Zellentyp",
+"Copy row": "Rei kop\u00e9ieren",
+"Row properties": "Eegeschafte vu Reien",
+"Table properties": "Eegeschafte vun Tabellen",
+"Row group": "Reiegrupp",
+"Right": "Riets",
+"Insert column after": "Kolonn herno drasetzen",
+"Cols": "Kolonnen",
+"Insert row after": "Rei herno drasetzen",
+"Width": "Breet",
+"Cell properties": "Eegeschafte vun Zellen",
+"Left": "L\u00e9nks",
+"Cut row": "Rei ausschneiden",
+"Delete column": "Kolonn l\u00e4schen",
+"Center": "M\u00ebtt",
+"Merge cells": "Zelle fusion\u00e9ieren",
+"Insert template": "Virlag drasetzen",
+"Templates": "Virlagen",
+"Background color": "Hanndergrondfaarf",
+"Text color": "Textfaarf",
+"Show blocks": "Bl\u00e9ck weisen",
+"Show invisible characters": "Onsiichtbar Zeeche weisen",
+"Words: {0}": "Wierder: {0}",
+"Insert": "Drasetzen",
+"File": "Fichier",
+"Edit": "\u00c4nneren",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ber\u00e4ich fir format\u00e9ierten Text. Dr\u00e9ck ALT+F9 fir de Men\u00fc. Dr\u00e9ck ALT+F10 fir d'Geschirleescht. Dr\u00e9ck ALT+0 fir d'H\u00ebllef.",
+"Tools": "Geschir",
+"View": "Kucken",
+"Table": "Tabell",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/lt.js b/core/media/editors/tinymce/langs/lt.js
new file mode 100644
index 00000000..f13e305f
--- /dev/null
+++ b/core/media/editors/tinymce/langs/lt.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('lt',{
+"Redo": "Gr\u0105\u017einti",
+"Undo": "Atstatyti",
+"Cut": "I\u0161kirpti",
+"Copy": "Kopijuoti",
+"Paste": "\u012ed\u0117ti",
+"Select all": "Pa\u017eym\u0117ti visk\u0105",
+"New document": "Naujas dokumentas",
+"Ok": "Gerai",
+"Cancel": "Atsisakyti",
+"Visual aids": "Vaizdin\u0117s priemon\u0117s",
+"Bold": "Pary\u0161kintas",
+"Italic": "Kursyvinis",
+"Underline": "Pabrauktas",
+"Strikethrough": "Perbrauktas",
+"Superscript": "Vir\u0161utinis indeksas",
+"Subscript": "Apatinis indeksas",
+"Clear formatting": "Naikinti formatavim\u0105",
+"Align left": "Lygiuoti kair\u0117je",
+"Align center": "Centruoti",
+"Align right": "Lygiuoti de\u0161in\u0117je",
+"Justify": "I\u0161d\u0117styti per vis\u0105 plot\u012f",
+"Bullet list": "\u017denklinimo s\u0105ra\u0161as",
+"Numbered list": "Skaitmeninis s\u0105ra\u0161as",
+"Decrease indent": "Ma\u017einti \u012ftrauk\u0105",
+"Increase indent": "Didinti \u012ftrauk\u0105",
+"Close": "U\u017edaryti",
+"Formats": "Formatai",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nar\u0161ykl\u0117s nustatymai neleid\u017eia redaktoriui tiesiogiai pasiekti laikinosios atminties. Pra\u0161ome naudoti klaviat\u016bros klavi\u0161us Ctrl+X\/C\/V.",
+"Headers": "Antra\u0161t\u0117s",
+"Header 1": "Antra\u0161t\u0117 1",
+"Header 2": "Antra\u0161t\u0117 2",
+"Header 3": "Antra\u0161t\u0117 3",
+"Header 4": "Antra\u0161t\u0117 4",
+"Header 5": "Antra\u0161t\u0117 5",
+"Header 6": "Antra\u0161t\u0117 6",
+"Headings": "Antra\u0161t\u0117s",
+"Heading 1": "Antra\u0161t\u0117 1",
+"Heading 2": "Antra\u0161t\u0117 2",
+"Heading 3": "Antra\u0161t\u0117 3",
+"Heading 4": "Antra\u0161t\u0117 4",
+"Heading 5": "Antra\u0161t\u0117 5",
+"Heading 6": "Antra\u0161t\u0117 6",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "Kodas",
+"Paragraph": "Paragrafas",
+"Blockquote": "Citata",
+"Inline": "Inline",
+"Blocks": "Blokai",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Dabar \u012fterpiama paprastojo teksto re\u017eimu. Kol \u0161i parinktis \u012fjungta, turinys bus \u012fterptas kaip paprastas tekstas.",
+"Font Family": "\u0160riftas",
+"Font Sizes": "\u0160rifto dyd\u017eiai",
+"Default": "Pagrindinis",
+"Circle": "Apskritimas",
+"Disc": "Diskas",
+"Square": "Kvadratas",
+"Lower Alpha": "Ma\u017eosios raid\u0117s",
+"Lower Greek": "Ma\u017eosios graik\u0173",
+"Lower Roman": "Ma\u017eosios rom\u0117n\u0173",
+"Upper Alpha": "Did\u017eiosios raid\u0117s",
+"Upper Roman": "Did\u017eiosios rom\u0117n\u0173",
+"Anchor": "\u017dym\u0117",
+"Name": "Pavadinimas",
+"Id": "ID",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID turi prasid\u0117ti raide, po kurios gali b\u016bti raid\u0117s, skai\u010diai, br\u016bk\u0161niai, ta\u0161kai, kabliata\u0161kiai ar apatiniai pabraukimai.",
+"You have unsaved changes are you sure you want to navigate away?": "Turite nei\u0161saugot\u0173 pakeitim\u0173! Ar tikrai norite i\u0161eiti?",
+"Restore last draft": "Atstatyti paskutin\u012f projekt\u0105",
+"Special character": "Specialus simbolis",
+"Source code": "Pirminis \u0161altinis",
+"Insert\/Edit code sample": "Prid\u0117ti \/ keisti kodo pavyzd\u012f",
+"Language": "Kalba",
+"Color": "Spalva",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "I\u0161 kair\u0117s \u012f de\u0161in\u0119",
+"Right to left": "I\u0161 de\u0161in\u0117s \u012f kair\u0119",
+"Emoticons": "Jaustukai",
+"Document properties": "Dokumento savyb\u0117s",
+"Title": "Pavadinimas",
+"Keywords": "\u017dymos",
+"Description": "Apra\u0161as",
+"Robots": "Robotai",
+"Author": "Autorius",
+"Encoding": "Kodavimas",
+"Fullscreen": "Visas ekranas",
+"Horizontal line": "Horizontali linija",
+"Insert\/edit image": "\u012eterpti|Tvarkyti paveiksl\u0117l\u012f",
+"Image description": "Paveiksl\u0117lio apra\u0161as",
+"Source": "Pirmin\u0117 nuoroda",
+"Dimensions": "Matmenys",
+"Constrain proportions": "Laikytis proporcij\u0173",
+"General": "Bendra",
+"Advanced": "I\u0161pl\u0117stas",
+"Style": "Stilius",
+"Vertical space": "Vertikalus tarpas",
+"Horizontal space": "Horizontalus tarpas",
+"Border": "R\u0117melis",
+"Insert image": "\u012eterpti paveiksl\u0117l\u012f",
+"Image": "Paveiksl\u0117lis",
+"Rotate counterclockwise": "Pasukti prie\u0161 laikrod\u017eio rodykl\u0119",
+"Rotate clockwise": "Pasukti pagal laikrod\u017eio rodykl\u0119",
+"Flip vertically": "Apversti vertikaliai",
+"Flip horizontally": "Apversti horizontaliai",
+"Edit image": "Redaguoti paveiksl\u0117l\u012f",
+"Image options": "Paveiksl\u0117lio nustatymai",
+"Zoom in": "Priartinti",
+"Zoom out": "Atitolinti",
+"Crop": "Atkarpyti",
+"Resize": "Keisti dyd\u012f",
+"Orientation": "Pasukimas",
+"Brightness": "\u0160viesumas",
+"Sharpen": "Ry\u0161kumas",
+"Contrast": "Kontrastas",
+"Color levels": "Spalv\u0173 lygiai",
+"Gamma": "Gama",
+"Invert": "Prie\u0161ingos spalvos",
+"Apply": "Taikyti",
+"Back": "Atgal",
+"Insert date\/time": "\u012eterpti dat\u0105\/laik\u0105",
+"Date\/time": "Data \/ laikas",
+"Insert link": "\u012eterpti nuorod\u0105",
+"Insert\/edit link": "\u012eterpti\/taisyti nuorod\u0105",
+"Text to display": "Rodomas tekstas",
+"Url": "Nuoroda",
+"Target": "Tikslin\u0117 nuoroda",
+"None": "Nieko",
+"New window": "Naujas langas",
+"Remove link": "\u0160alinti nuorod\u0105",
+"Anchors": "\u017dym\u0117",
+"Link": "Nuoroda",
+"Paste or type a link": "\u012eklijuokite arba \u012fra\u0161ykite nuorod\u0105",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Atrodo, kad \u012fvesta nuoroda yra elektroninio pa\u0161to adresas. Ar norite prie\u0161 j\u012f \u012fvesti reikalaujam\u0105 \u201emailto:\u201c?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Atrodo, kad \u012fved\u0117te nuotolin\u0119 nuorod\u0105. Ar norite prie\u0161 j\u0105 \u012fvesti reikalaujam\u0105 \u201ehttp:\/\/\u201c?",
+"Insert video": "\u012eterpti video",
+"Insert\/edit video": "\u012eterpti\/tvarkyti video",
+"Insert\/edit media": "Prid\u0117ti \/ keisti medij\u0105",
+"Alternative source": "Alternatyvus \u0161altinis",
+"Poster": "Plakatas",
+"Paste your embed code below:": "\u012eterpkite kod\u0105 \u017eemiau:",
+"Embed": "\u012eterpti",
+"Media": "Medija",
+"Nonbreaking space": "Nepertraukiamos vietos",
+"Page break": "Puslapio skirtukas",
+"Paste as text": "\u012eklijuoti kaip tekst\u0105",
+"Preview": "Per\u017ei\u016bra",
+"Print": "Spausdinti",
+"Save": "I\u0161saugoti",
+"Find": "Ie\u0161koti",
+"Replace with": "Kuo pakeisti",
+"Replace": "Pakeisti",
+"Replace all": "Pakeisti visk\u0105",
+"Prev": "Ankstesnis",
+"Next": "Sekantis",
+"Find and replace": "Surasti ir pakeisti",
+"Could not find the specified string.": "Nepavyko rasti nurodytos eilut\u0117s.",
+"Match case": "Atitinkamus",
+"Whole words": "Visus \u017eod\u017eius",
+"Spellcheck": "Ra\u0161ybos tikrinimas",
+"Ignore": "Ignoruoti",
+"Ignore all": "Ignoruoti visk\u0105",
+"Finish": "Baigti",
+"Add to Dictionary": "Prid\u0117ti \u012f \u017dodyn\u0105",
+"Insert table": "\u012eterpti lentel\u0119",
+"Table properties": "Lentel\u0117s savyb\u0117s",
+"Delete table": "\u0160alinti lentel\u0119",
+"Cell": "Langeliai",
+"Row": "Eilut\u0117s",
+"Column": "Stulpelis",
+"Cell properties": "Langelio savyb\u0117s",
+"Merge cells": "Sujungti langelius",
+"Split cell": "Skaidyti langelius",
+"Insert row before": "\u012eterpti eilut\u0119 prie\u0161",
+"Insert row after": "\u012eterpti eilut\u0119 po",
+"Delete row": "Naikinti eilut\u0119",
+"Row properties": "Eilut\u0117s savyb\u0117s",
+"Cut row": "I\u0161kirpti eilut\u0119",
+"Copy row": "Kopijuoti eilut\u0119",
+"Paste row before": "\u012ed\u0117ti eilut\u0119 prie\u0161",
+"Paste row after": "\u012ed\u0117ti eilut\u0119 po",
+"Insert column before": "\u012eterpti stulpel\u012f prie\u0161",
+"Insert column after": "\u012eterpti stulpel\u012f po",
+"Delete column": "Naikinti stulpel\u012f",
+"Cols": "Stulpeliai",
+"Rows": "Eilut\u0117s",
+"Width": "Plotis",
+"Height": "Auk\u0161tis",
+"Cell spacing": "Tarpas tarp langeli\u0173",
+"Cell padding": "Tarpas nuo langelio iki teksto",
+"Caption": "Antra\u0161t\u0117",
+"Left": "Kair\u0117",
+"Center": "Centras",
+"Right": "De\u0161in\u0117",
+"Cell type": "Langelio tipas",
+"Scope": "Strukt\u016bra",
+"Alignment": "Lygiavimas",
+"H Align": "H Lygiavimas",
+"V Align": "V Lygiavimas",
+"Top": "Vir\u0161uje",
+"Middle": "Viduryje",
+"Bottom": "Apa\u010dioje",
+"Header cell": "Antra\u0161t\u0117s langelis",
+"Row group": "Eilu\u010di\u0173 grup\u0117",
+"Column group": "Stulpeli\u0173 grup\u0117",
+"Row type": "Eilu\u010di\u0173 tipas",
+"Header": "Antra\u0161t\u0117",
+"Body": "Turinys",
+"Footer": "Apa\u010dia",
+"Border color": "R\u0117melio spalva",
+"Insert template": "\u012eterpti \u0161ablon\u0105",
+"Templates": "\u0160ablonai",
+"Text color": "Teksto spalva",
+"Background color": "Fono spalva",
+"Custom...": "Pasirinktinas...",
+"Custom color": "Pasirinktina spalva",
+"No color": "Jokios spalvos",
+"Table of Contents": "Turinys",
+"Show blocks": "Rodyti blokus",
+"Show invisible characters": "Rodyti nematomus simbolius",
+"Words: {0}": "\u017dod\u017eiai: {0}",
+"File": "Failas",
+"Edit": "Redaguoti",
+"Insert": "\u012eterpti",
+"View": "Per\u017ei\u016bra",
+"Format": "Formatas",
+"Table": "Lentel\u0117",
+"Tools": "\u012erankiai",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Suformatuoto teksto laukas. D\u0117l meniu spauskite ALT-F9. U\u017eduo\u010di\u0173 juostos \u012fjungimui spauskite ALT-F10. Pagalbai - spauskite ALT-0."
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/lv.js b/core/media/editors/tinymce/langs/lv.js
new file mode 100644
index 00000000..4adc6fe5
--- /dev/null
+++ b/core/media/editors/tinymce/langs/lv.js
@@ -0,0 +1,197 @@
+tinymce.addI18n('lv',{
+"Cut": "Izgriezt",
+"Header 2": "Otr\u0101 l\u012bme\u0146a virsraksts",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "J\u016bsu p\u0101rl\u016bkprogramma neatbalsta piek\u013cuvi starpliktuvei. L\u016bdzu izmantojiet Ctrl+X\/C\/V klaviat\u016bras sa\u012bsnes.",
+"Div": "Div elements",
+"Paste": "Iel\u012bm\u0113t",
+"Close": "Aizv\u0113rt",
+"Font Family": "Font Family",
+"Pre": "Pre elements",
+"Align right": "L\u012bdzin\u0101t pa labi",
+"New document": "Jauns dokuments",
+"Blockquote": "Cit\u0101ts",
+"Numbered list": "Numur\u0113ts saraksts",
+"Increase indent": "Palielin\u0101t atk\u0101pi",
+"Formats": "Form\u0101ti",
+"Headers": "Virsraksti",
+"Select all": "Iez\u012bm\u0113t",
+"Header 3": "Tre\u0161\u0101 l\u012bme\u0146a virsraksts",
+"Blocks": "Bloka elements",
+"Undo": "Atsaukt",
+"Strikethrough": "P\u0101rsv\u012btrot",
+"Bullet list": "Nenumuer\u0113ts saraksts",
+"Header 1": "Pirm\u0101 l\u012bme\u0146a virsraksts",
+"Superscript": "Aug\u0161raksts",
+"Clear formatting": "No\u0146emt format\u0113jumu",
+"Font Sizes": "Font Sizes",
+"Subscript": "Apak\u0161raksts",
+"Header 6": "Sest\u0101 l\u012bme\u0146a virsraksts",
+"Redo": "Atcelt atsauk\u0161anu",
+"Paragraph": "Paragr\u0101fs",
+"Ok": "Labi",
+"Bold": "Treknraksts",
+"Code": "Koda elements",
+"Italic": "Kurs\u012bvs",
+"Align center": "Centr\u0113t",
+"Header 5": "Piekt\u0101 l\u012bme\u0146a virsraksts",
+"Decrease indent": "Samazin\u0101t atk\u0101pi",
+"Header 4": "Ceturt\u0101 l\u012bme\u0146a virsraksts",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Iel\u012bm\u0113\u0161ana tagad ir vienk\u0101r\u0161teksta re\u017e\u012bm\u0101. Saturs tiks iel\u012bm\u0113ts k\u0101 vienk\u0101r\u0161teksts, l\u012bdz \u0161\u012b opcija tiks atsl\u0113gta.",
+"Underline": "Pasv\u012btrot",
+"Cancel": "Atcelt",
+"Justify": "L\u012bdzin\u0101t abas malas",
+"Inline": "Rindi\u0146as elements",
+"Copy": "Kop\u0113t",
+"Align left": "L\u012bdzin\u0101t pa kreisi",
+"Visual aids": "Uzskates l\u012bdzek\u013ci",
+"Lower Greek": "Grie\u0137u mazie burti",
+"Square": "Kvadr\u0101ts",
+"Default": "Noklus\u0113juma",
+"Lower Alpha": "Lat\u012b\u0146u mazie burti",
+"Circle": "Aplis",
+"Disc": "Disks",
+"Upper Alpha": "Lat\u012b\u0146u lielie burti",
+"Upper Roman": "Romie\u0161u lielie burti",
+"Lower Roman": "Romie\u0161u mazie burti",
+"Name": "V\u0101rds",
+"Anchor": "Enkurelements",
+"You have unsaved changes are you sure you want to navigate away?": "Jums ir nesaglab\u0101tas izmai\u0146as, esat dro\u0161s, ka v\u0113laties doties prom",
+"Restore last draft": "Atjaunot p\u0113d\u0113jo melnrakstu",
+"Special character": "\u012apa\u0161ais simbols",
+"Source code": "Pirmkods",
+"Right to left": "No lab\u0101s uz kreiso",
+"Left to right": "No kreis\u0101s uz labo",
+"Emoticons": "Emocijas",
+"Robots": "Programmas",
+"Document properties": "Dokumenta uzst\u0101d\u012bjumi",
+"Title": "Nosaukums",
+"Keywords": "Atsl\u0113gv\u0101rdi",
+"Encoding": "Kod\u0113jums",
+"Description": "Apraksts",
+"Author": "Autors",
+"Fullscreen": "Pilnekr\u0101na re\u017e\u012bms",
+"Horizontal line": "Horizont\u0101la l\u012bnija",
+"Horizontal space": "Horizont\u0101l\u0101 vieta",
+"Insert\/edit image": "Ievietot\/labot att\u0113lu",
+"General": "Visp\u0101r\u012bgi",
+"Advanced": "Papildus",
+"Source": "Avots",
+"Border": "Apmale",
+"Constrain proportions": "Saglab\u0101t malu attiec\u012bbu",
+"Vertical space": "Vertik\u0101l\u0101 vieta",
+"Image description": "Att\u0113la apraksts",
+"Style": "Stils",
+"Dimensions": "Izm\u0113ri",
+"Insert image": "Ievietot att\u0113lu",
+"Insert date\/time": "Ievietot datumu\/laiku",
+"Remove link": "No\u0146emt saiti",
+"Url": "Adrese",
+"Text to display": "Teksts",
+"Anchors": "Enkurelements",
+"Insert link": "Ievietot saiti",
+"New window": "Jauns logs",
+"None": "Nek\u0101",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "M\u0113r\u0137is",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Ievietot\/labot saiti",
+"Insert\/edit video": "Ievietot\/redi\u0123\u0113t video",
+"Poster": "Att\u0113ls",
+"Alternative source": "Alternat\u012bvs avots",
+"Paste your embed code below:": "Iekop\u0113jiet embed kodu zem\u0101k:",
+"Insert video": "Ievietot video",
+"Embed": "Embed",
+"Nonbreaking space": "L\u012bnij-nedalo\u0161s atstarpes simbols",
+"Page break": "P\u0101rnest jaun\u0101 lap\u0101",
+"Paste as text": "Iel\u012bm\u0113t k\u0101 tekstu",
+"Preview": "Priek\u0161skat\u012bjums",
+"Print": "Print\u0113t",
+"Save": "Saglab\u0101t",
+"Could not find the specified string.": "Mekl\u0113tais teksts netika atrasts",
+"Replace": "Aizvietot",
+"Next": "N\u0101ko\u0161ais",
+"Whole words": "Pilnus v\u0101rdus",
+"Find and replace": "Mekl\u0113t un aizvietot",
+"Replace with": "Aizvietot ar",
+"Find": "Mekl\u0113t",
+"Replace all": "Aizvietot visu",
+"Match case": "Re\u0123istrj\u016bt\u012bgs",
+"Prev": "Iepriek\u0161\u0113jais",
+"Spellcheck": "Pareizrakst\u012bbas p\u0101rbaude",
+"Finish": "Beigt",
+"Ignore all": "Ignor\u0113t visu",
+"Ignore": "Ignor\u0113t",
+"Insert row before": "Ievietot rindu pirms",
+"Rows": "Rindas",
+"Height": "Augstums",
+"Paste row after": "Iel\u012bm\u0113t rindu p\u0113c",
+"Alignment": "L\u012bdzin\u0101jums",
+"Column group": "Kolonnu grupa",
+"Row": "Rinda",
+"Insert column before": "Ievietot kolonu pirms",
+"Split cell": "Sadal\u012bt \u0161\u016bnas",
+"Cell padding": "\u0160\u016bnas atstatumi",
+"Cell spacing": "\u0160\u016bnu atstarpes",
+"Row type": "Rindas tips",
+"Insert table": "Ievietot tabulu",
+"Body": "\u0136ermenis",
+"Caption": "Virsraksts",
+"Footer": "K\u0101jene",
+"Delete row": "Dz\u0113st rindu",
+"Paste row before": "Iel\u012bm\u0113t rindu pirms",
+"Scope": "Apgabals",
+"Delete table": "Dz\u0113st tabulu",
+"Header cell": "Galvenes \u0161\u016bna",
+"Column": "Kolona",
+"Cell": "\u0160\u016bna",
+"Header": "Galvene",
+"Cell type": "\u0160\u016bnas tips",
+"Copy row": "Kop\u0113t rindu",
+"Row properties": "Rindas uzst\u0101d\u012bjumi",
+"Table properties": "Tabulas uzst\u0101d\u012bjumi",
+"Row group": "Rindu grupa",
+"Right": "Pa labi",
+"Insert column after": "Ievietot kolonu p\u0113c",
+"Cols": "Kolonas",
+"Insert row after": "Ievietot rindu p\u0113c",
+"Width": "Platums",
+"Cell properties": "\u0160\u016bnas uzst\u0101d\u012bjumi",
+"Left": "Pa kreisi",
+"Cut row": "Izgriezt rindu",
+"Delete column": "Dz\u0113st kolonu",
+"Center": "Centr\u0113t",
+"Merge cells": "Apvienot \u0161\u016bnas",
+"Insert template": "Ievietot \u0161ablonu",
+"Templates": "\u0160abloni",
+"Background color": "Fona kr\u0101sa",
+"Text color": "Teksta kr\u0101sa",
+"Show blocks": "R\u0101d\u012bt blokus",
+"Show invisible characters": "R\u0101d\u012bt neredzam\u0101s rakstz\u012bmes",
+"Words: {0}": "V\u0101rdi: {0}",
+"Insert": "Ievietot",
+"File": "Fails",
+"Edit": "Labot",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Vizu\u0101li redi\u0123\u0113jama teksta apgabals. Nospiediet ALT-F9 izv\u0113lnei, ALT-F10 r\u012bkjoslai vai ALT-0 pal\u012bdz\u012bbai.",
+"Tools": "R\u012bki",
+"View": "Skat\u012bt",
+"Table": "Tabula",
+"Format": "Form\u0101ts",
+"H Align": "Horizont\u0101lais l\u012bdzin\u0101jums",
+"V Align": "Vertik\u0101lais l\u012bdzin\u0101jums",
+"Top": "Aug\u0161\u0101",
+"Middle": "Vid\u016b",
+"Bottom": "Apak\u0161\u0101",
+"Headings": "Virsraksti",
+"Heading 1": "1. virsraksts",
+"Heading 2": "2. virsraksts",
+"Heading 3": "3. virsraksts",
+"Heading 4": "4. virsraksts",
+"Heading 5": "5. virsraksts",
+"Heading 6": "6. virsraksts",
+"Add to Dictionary": "Pievienot v\u0101rdn\u012bcai",
+"Border color": "Apmales kr\u0101sa",
+"Color": "Kr\u0101sa",
+"Custom...": "Piel\u0101gots...",
+"Custom color": "Nestandarta kr\u0101sa",
+"No color": "Bez kr\u0101sas"
+});
diff --git a/core/media/editors/tinymce/langs/mk.js b/core/media/editors/tinymce/langs/mk.js
new file mode 100644
index 00000000..f5171a1d
--- /dev/null
+++ b/core/media/editors/tinymce/langs/mk.js
@@ -0,0 +1,233 @@
+tinymce.addI18n('mk',{
+"Cut": "\u0418\u0441\u0435\u0447\u0438",
+"Heading 5": "\u041d\u0430\u0441\u043b\u043e\u0432 5",
+"Header 2": "\u041d\u0430\u0441\u043b\u043e\u0432 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u043e\u0442 \u043f\u0440\u0435\u043b\u0438\u0441\u0442\u0443\u0432\u0430\u0447 \u043d\u0435 \u043f\u043e\u0434\u0434\u0440\u0436\u0443\u0432\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u043f\u0440\u0438\u0441\u0442\u0430\u043f \u0434\u043e \u043c\u0435\u043c\u043e\u0440\u0438\u0458\u0430\u0442\u0430.\u041a\u043e\u0440\u0438\u0441\u0442\u0435\u0442\u0435 \u0433\u0438 Ctrl+X\/C\/V \u043a\u0440\u0430\u0442\u0435\u043d\u043a\u0438\u0442\u0435 \u043d\u0430 \u0442\u0430\u0441\u0442\u0430\u0442\u0443\u0440\u0430\u0442\u0430.",
+"Heading 4": "\u041d\u0430\u0441\u043b\u043e\u0432 4",
+"Div": "DIV",
+"Heading 2": "\u041d\u0430\u0441\u043b\u043e\u0432 2",
+"Paste": "\u0412\u043c\u0435\u0442\u043d\u0438",
+"Close": "\u0417\u0430\u0442\u0432\u043e\u0440\u0438",
+"Font Family": "\u0424\u043e\u043d\u0442 \u0444\u0430\u043c\u0438\u043b\u0438\u0458\u0430",
+"Pre": "PRE",
+"Align right": "\u0414\u0435\u0441\u043d\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
+"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
+"Numbered list": "\u041b\u0438\u0441\u0442\u0430 \u0441\u043e \u0431\u0440\u043e\u0458\u043a\u0438",
+"Heading 1": "\u041d\u0430\u0441\u043b\u043e\u0432 1",
+"Headings": "\u041d\u0430\u0441\u043b\u043e\u0432\u0438",
+"Increase indent": "\u0417\u0433\u043e\u043b\u0435\u043c\u0438 \u0432\u043e\u0432\u043b\u0435\u043a\u0443\u0432\u0430\u045a\u0435",
+"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
+"Headers": "\u041d\u0430\u0441\u043b\u043e\u0432\u0438",
+"Select all": "\u041e\u0437\u043d\u0430\u0447\u0438 \u0433\u0438 \u0441\u0438\u0442\u0435",
+"Header 3": "\u041d\u0430\u0441\u043b\u043e\u0432 3",
+"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0438",
+"Undo": "\u0412\u0440\u0430\u0442\u0438",
+"Strikethrough": "\u041f\u0440\u0435\u0446\u0440\u0442\u0430\u043d\u043e",
+"Bullet list": "\u041b\u0438\u0441\u0442\u0430 \u0441\u043e \u0437\u043d\u0430\u0446\u0438",
+"Header 1": "\u041d\u0430\u0441\u043b\u043e\u0432 1",
+"Superscript": "\u041d\u0430\u0442\u0442\u0435\u043a\u0441\u0442",
+"Clear formatting": "\u0418\u0441\u0447\u0438\u0441\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u045a\u0435",
+"Font Sizes": "\u0424\u043e\u043d\u0442 \u0433\u043e\u043b\u0435\u043c\u0438\u043d\u0430",
+"Subscript": "\u041f\u043e\u0442\u0442\u0435\u043a\u0441\u0442",
+"Header 6": "\u041d\u0430\u0441\u043b\u043e\u0432 6",
+"Redo": "\u041f\u043e\u0432\u0442\u043e\u0440\u0438",
+"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
+"Ok": "\u041e\u041a",
+"Bold": "\u0417\u0434\u0435\u0431\u0435\u043b\u0435\u043d\u043e",
+"Code": "\u041a\u043e\u0434",
+"Italic": "\u041d\u0430\u043a\u043e\u0441\u0435\u043d\u043e",
+"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
+"Header 5": "\u041d\u0430\u0441\u043b\u043e\u0432 5",
+"Heading 6": "\u041d\u0430\u0441\u043b\u043e\u0432 6",
+"Heading 3": "\u041d\u0430\u0441\u043b\u043e\u0432 3",
+"Decrease indent": "\u0421\u043c\u0430\u043b\u0438 \u0432\u043e\u0432\u043b\u0435\u043a\u0443\u0432\u0430\u045a\u0435",
+"Header 4": "\u041d\u0430\u0441\u043b\u043e\u0432 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u043c\u0435\u0442\u043d\u0443\u0432\u0430\u045a\u0435\u0442\u043e \u0435 \u043a\u0430\u043a\u043e \u0447\u0438\u0441\u0442 \u0442\u0435\u043a\u0441\u0442. \u0421\u043e\u0434\u0440\u0436\u0438\u043d\u0430\u0442\u0430 \u045c\u0435 \u0431\u0438\u0434\u0435 \u0432\u043c\u0435\u0442\u043d\u0430\u0442\u0430 \u043a\u0430\u043a\u043e \u0447\u0438\u0441\u0442 \u0442\u0435\u043a\u0441\u0442 \u0441\u00e8 \u0434\u043e\u0434\u0435\u043a\u0430 \u043d\u0435 \u0458\u0430 \u0438\u0441\u043a\u043b\u0443\u0447\u0438\u0442\u0435 \u043e\u0432\u0430\u0430 \u043e\u043f\u0446\u0438\u0458\u0430.",
+"Underline": "\u041f\u043e\u0434\u0432\u043b\u0435\u0447\u0435\u043d\u043e",
+"Cancel": "\u041e\u0442\u043a\u0430\u0436\u0438",
+"Justify": "\u041f\u043e\u0440\u0430\u043c\u043d\u0435\u0442\u043e",
+"Inline": "\u041d\u0430\u0432\u043d\u0430\u0442\u0440\u0435",
+"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u0458",
+"Align left": "\u041b\u0435\u0432\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
+"Visual aids": "\u0412\u0438\u0437\u0443\u0435\u043b\u043d\u0430 \u043f\u043e\u043c\u043e\u0448",
+"Lower Greek": "\u041c\u0430\u043b\u0438 \u0433\u0440\u0447\u043a\u0438",
+"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442",
+"Default": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e",
+"Lower Alpha": "\u041c\u0430\u043b\u0438 \u0430\u043b\u0444\u0430",
+"Circle": "\u041a\u0440\u0443\u0433",
+"Disc": "\u0422\u043e\u0447\u043a\u0430",
+"Upper Alpha": "\u0413\u043e\u043b\u0435\u043c\u0438 \u0430\u043b\u0444\u0430",
+"Upper Roman": "\u0413\u043e\u043b\u0435\u043c\u0438 \u0440\u0438\u043c\u0441\u043a\u0438",
+"Lower Roman": "\u0413\u043e\u043b\u0435\u043c\u0438 \u0440\u0438\u043c\u0441\u043a\u0438",
+"Name": "\u0418\u043c\u0435",
+"Anchor": "\u0421\u0438\u0434\u0440\u043e",
+"You have unsaved changes are you sure you want to navigate away?": "\u0418\u043c\u0430\u0442\u0435 \u043d\u0435\u0437\u0430\u0447\u0443\u0432\u0430\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438, \u0441\u0438\u0433\u0443\u0440\u043d\u043e \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0458\u0430 \u043d\u0430\u043f\u0443\u0448\u0442\u0438\u0442\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u0442\u0430?",
+"Restore last draft": "\u0412\u0440\u0430\u0442\u0438 \u0433\u043e \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u043e\u0442 \u043d\u0430\u0446\u0440\u0442",
+"Special character": "\u0421\u043f\u0435\u0446\u0438\u0458\u0430\u043b\u0435\u043d \u043a\u0430\u0440\u0430\u043a\u0442\u0435\u0440",
+"Source code": "\u0418\u0437\u0432\u043e\u0440\u0435\u043d \u043a\u043e\u0434",
+"Color": "\u0411\u043e\u0458\u0430",
+"Right to left": "\u041e\u0434 \u0434\u0435\u0441\u043d\u043e \u043d\u0430 \u043b\u0435\u0432\u043e",
+"Left to right": "\u041e\u0434 \u043b\u0435\u0432\u043e \u043d\u0430 \u0434\u0435\u0441\u043d\u043e",
+"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
+"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
+"Document properties": "\u041f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u0437\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0442",
+"Title": "\u041d\u0430\u0441\u043b\u043e\u0432",
+"Keywords": "\u041a\u043b\u0443\u0447\u043d\u0438 \u0437\u0431\u043e\u0440\u043e\u0432\u0438",
+"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u045a\u0435",
+"Description": "\u041e\u043f\u0438\u0441",
+"Author": "\u0410\u0432\u0442\u043e\u0440",
+"Fullscreen": "\u0426\u0435\u043b \u0435\u043a\u0440\u0430\u043d",
+"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u043b\u0438\u043d\u0438\u0458\u0430",
+"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0435\u043d \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
+"Insert\/edit image": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0421\u043c\u0435\u043d\u0438 \u0441\u043b\u0438\u043a\u0430",
+"General": "\u041e\u043f\u0448\u0442\u043e",
+"Advanced": "\u041d\u0430\u043f\u0440\u0435\u0434\u043d\u043e",
+"Source": "\u0418\u0437\u0432\u043e\u0440",
+"Border": "\u0420\u0430\u043c\u043a\u0430",
+"Constrain proportions": "\u0412\u0440\u0437\u0430\u043d\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
+"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0435\u043d \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
+"Image description": "\u041e\u043f\u0438\u0441 \u043d\u0430 \u0441\u043b\u0438\u043a\u0430",
+"Style": "\u0421\u0442\u0438\u043b",
+"Dimensions": "\u0414\u0438\u043c\u0435\u043d\u0437\u0438\u0438",
+"Insert image": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0441\u043b\u0438\u043a\u0430",
+"Insert date\/time": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0434\u0430\u0442\u0443\u043c\/\u0432\u0440\u0435\u043c\u0435",
+"Remove link": "\u041e\u0442\u0441\u0442\u0440\u0430\u043d\u0438 \u043b\u0438\u043d\u043a",
+"Url": "URL",
+"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0437\u0430 \u043f\u0440\u0438\u043a\u0430\u0437",
+"Anchors": "\u0421\u0438\u0434\u0440\u0430",
+"Insert link": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043b\u0438\u043d\u043a",
+"New window": "\u041d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446",
+"None": "\u041d\u0438\u0448\u0442\u043e",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL-\u0442\u043e \u043a\u043e\u0435 \u0433\u043e \u0432\u043d\u0435\u0441\u043e\u0432\u0442\u0435 \u0441\u0435 \u0447\u0438\u043d\u0438 \u0434\u0435\u043a\u0430 \u0435 \u043d\u0430\u0434\u0432\u043e\u0440\u0435\u0448\u043d\u0430 \u0432\u0440\u0441\u043a\u0430. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0434\u043e\u0434\u0430\u0434\u0435 \u0437\u0430\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u043d\u0438\u043e\u0442 http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
+"Target": "\u0426\u0435\u043b",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "UR-\u0442\u043e \u043a\u043e\u0435 \u0433\u043e \u0432\u043d\u0435\u0441\u043e\u0432\u0442\u0435 \u0441\u0435 \u0447\u0438\u043d\u0438 \u0434\u0435\u043a\u0430 \u0435  \u0435-\u043f\u043e\u0448\u0442\u0430. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0434\u043e\u0434\u0430\u0434\u0435 \u0437\u0430\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u043d\u0438\u043e\u0442 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
+"Insert\/edit link": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0441\u043c\u0435\u043d\u0438 \u043b\u0438\u043d\u043a",
+"Insert\/edit video": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0441\u043c\u0435\u043d\u0438 \u0432\u0438\u0434\u0435\u043e",
+"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
+"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0438\u0437\u0432\u043e\u0440",
+"Paste your embed code below:": "\u0412\u0435\u043c\u0442\u043d\u0438 \u0433\u043e \u043a\u043e\u0434\u043e\u0442 \u0437\u0430 \u0432\u0433\u0440\u0430\u0434\u0435\u043d\u043e \u043f\u043e\u0434\u043e\u043b\u0443:",
+"Insert\/Edit code sample": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0441\u043c\u0435\u043d\u0438 \u043f\u0440\u0438\u043c\u0435\u0440 \u0437\u0430 \u043a\u043e\u0434",
+"Insert video": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0432\u0438\u0434\u0435\u043e",
+"Embed": "\u0412\u0433\u0440\u0430\u0434\u0435\u043d\u043e",
+"Nonbreaking space": "\u041c\u0435\u0441\u0442\u043e \u0431\u0435\u0437 \u043f\u0440\u0435\u043a\u0440\u0448\u0443\u0432\u0430\u045a\u0435",
+"Page break": "\u041f\u0440\u0435\u043a\u0440\u0448\u0443\u0432\u0430\u045a\u0435",
+"Paste as text": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043a\u0430\u043a\u043e \u0442\u0435\u043a\u0441\u0442",
+"Preview": "\u041f\u0440\u0435\u0433\u043b\u0435\u0434",
+"Print": "\u041f\u0435\u0447\u0430\u0442\u0438",
+"Save": "\u0417\u0430\u0447\u0443\u0432\u0430\u0458",
+"Could not find the specified string.": "\u041d\u0435\u043c\u043e\u0436\u043d\u043e \u0434\u0430 \u0441\u0435 \u043d\u0430\u0458\u0434\u0435 \u043f\u043e\u0441\u043e\u0447\u0435\u043d\u0438\u043e\u0442 \u043d\u0438\u0437.",
+"Replace": "\u0421\u043c\u0435\u043d\u0438",
+"Next": "\u041f\u043e",
+"Whole words": "\u0426\u0435\u043b\u0438 \u0437\u0431\u043e\u0440\u043e\u0432\u0438",
+"Find and replace": "\u041d\u0430\u0458\u0434\u0438 \u0438 \u0441\u043c\u0435\u043d\u0438",
+"Replace with": "\u0421\u043c\u0435\u043d\u0438 \u0441\u043e",
+"Find": "\u041d\u0430\u0458\u0434\u0438",
+"Replace all": "\u0421\u043c\u0435\u043d\u0438 \u0441\u00e8",
+"Match case": "\u0414\u0430 \u0441\u0435 \u0441\u043e\u0432\u043f\u0430\u0453\u0430",
+"Prev": "\u041f\u0440\u0435\u0434",
+"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441",
+"Finish": "\u041a\u0440\u0430\u0458",
+"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0458 \u0441\u00e8",
+"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0458",
+"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0434\u0438 \u0432\u043e \u0440\u0435\u0447\u043d\u0438\u043a",
+"Insert row before": "\u041d\u043e\u0432 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434",
+"Rows": "\u0420\u0435\u0434\u043e\u0432\u0438",
+"Height": "\u0412\u0438\u0441\u0438\u043d\u0430",
+"Paste row after": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043f\u043e\u0441\u043b\u0435",
+"Border color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430",
+"Alignment": "\u041f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
+"Column group": "\u0413\u0440\u0443\u043f\u0430 \u043a\u043e\u043b\u043e\u043d\u0438",
+"Row": "\u0420\u0435\u0434",
+"Insert column before": "\u041d\u043e\u0432\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434",
+"Split cell": "\u041f\u043e\u0434\u0435\u043b\u0438 \u045c\u0435\u043b\u0438\u0458\u0430",
+"Cell padding": "\u041f\u0440\u043e\u0441\u0442\u043e\u0440 \u0432\u043e \u045c\u0435\u043b\u0438\u0458\u0430",
+"Cell spacing": "\u041f\u0440\u043e\u0441\u0442\u043e\u0440 \u043c\u0435\u0453\u0443 \u045c\u0435\u043b\u0438\u0438",
+"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434",
+"Insert table": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0442\u0430\u0431\u0435\u043b\u0430",
+"Body": "\u0422\u0435\u043b\u043e",
+"Caption": "\u041d\u0430\u0442\u043f\u0438\u0441",
+"Footer": "\u041f\u043e\u0434\u043d\u043e\u0436\u0458\u0435",
+"Delete row": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0440\u0435\u0434",
+"Paste row before": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434",
+"Scope": "\u041e\u043f\u0441\u0435\u0433",
+"Delete table": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0442\u0430\u0431\u0435\u043b\u0430",
+"H Align": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
+"Top": "\u0413\u043e\u0440\u0435",
+"Header cell": "\u041d\u0430\u0441\u043b\u043e\u0432\u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
+"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
+"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0435\u0434\u043e\u0432\u0438",
+"Cell": "\u040c\u0435\u043b\u0438\u0458\u0430",
+"Middle": "\u0421\u0440\u0435\u0434\u0438\u043d\u0430",
+"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
+"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u0458 \u0440\u0435\u0434",
+"Row properties": "\u041a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043d\u0430 \u0440\u0435\u0434",
+"Table properties": "\u041a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043d\u0430 \u0442\u0430\u0431\u0435\u043b\u0430",
+"Bottom": "\u0414\u043e\u043b\u0443",
+"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
+"Header": "\u041d\u0430\u0441\u043b\u043e\u0432",
+"Right": "\u0414\u0435\u0441\u043d\u043e",
+"Insert column after": "\u041d\u043e\u0432\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u043e",
+"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
+"Insert row after": "\u041d\u043e\u0432 \u0440\u0435\u0434 \u043f\u043e",
+"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
+"Cell properties": "\u041a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430",
+"Left": "\u041b\u0435\u0432\u043e",
+"Cut row": "\u041e\u0442\u0441\u0435\u0447\u0438 \u0440\u0435\u0434",
+"Delete column": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u043a\u043e\u043b\u043e\u043d\u0430",
+"Center": "\u0426\u0435\u043d\u0442\u0430\u0440",
+"Merge cells": "\u0421\u043f\u043e\u0438 \u043a\u043e\u043b\u043e\u043d\u0438",
+"Insert template": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
+"Background color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u043f\u043e\u0437\u0430\u0434\u0438\u043d\u0430",
+"Custom...": "\u041f\u043e \u0436\u0435\u043b\u0431\u0430",
+"Custom color": "\u0411\u043e\u0458\u0430 \u043f\u043e \u0436\u0435\u043b\u0431\u0430",
+"No color": "\u0411\u0435\u0437 \u0431\u043e\u0458\u0430",
+"Text color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u0442\u0435\u043a\u0441\u0442",
+"Show blocks": "\u041f\u0440\u0438\u043a\u0430\u0436\u0438 \u0431\u043b\u043e\u043a\u043e\u0432\u0438",
+"Show invisible characters": "\u041f\u0440\u0438\u043a\u0430\u0436\u0438 \u043d\u0435\u0432\u0438\u0434\u043b\u0438\u0432\u0438 \u043a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438",
+"Words: {0}": "\u0417\u0431\u043e\u0440\u043e\u0432\u0438:{0}",
+"Insert": "\u0412\u043c\u0435\u0442\u043d\u0438",
+"File": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Edit": "\u0423\u0440\u0435\u0434\u0443\u0432\u0430\u045a\u0435",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0417\u0431\u043e\u0433\u0430\u0442\u0435\u043d\u043e \u043f\u043e\u043b\u0435 \u0437\u0430 \u0442\u0435\u043a\u0441\u0442. \u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT-F9 \u0437\u0430 \u043c\u0435\u043d\u0438.\u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT-F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441\u043e \u0430\u043b\u0430\u0442\u043a\u0438.\u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT-0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0448",
+"Preformatted": "\u041f\u0440\u0435\u0434\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u043e",
+"Tools": "\u0410\u043b\u0430\u0442\u043a\u0438",
+"View": "\u041f\u0440\u0438\u043a\u0430\u0437",
+"Table": "\u0422\u0430\u0431\u0435\u043b\u0430",
+"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
+"Color": "\u0411\u043e\u0458\u0430",
+"R": "R",
+"G": "G",
+"B": "B",
+"Rotate counterclockwise": "\u0417\u0430\u0432\u0440\u0442\u0438 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u043e\u0434 \u0441\u0442\u0440\u0435\u043b\u043a\u0438\u0442\u0435",
+"Rotate clockwise": "\u0417\u0430\u0432\u0440\u0442\u0438 \u0432\u043e \u043f\u0440\u0430\u0432\u0435\u0446 \u043d\u0430 \u0441\u0442\u0440\u0435\u043b\u043a\u0438\u0442\u0435",
+"Flip vertically": "\u041f\u0440\u0435\u0432\u0440\u0442\u0438 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e",
+"Flip horizontally": "\u041f\u0440\u0435\u0432\u0440\u0442\u0438 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e",
+"Edit image": "\u0423\u0440\u0435\u0434\u0438 \u0441\u043b\u0438\u043a\u0430",
+"Image options": "\u041e\u043f\u0446\u0438\u0438 \u0437\u0430 \u0441\u043b\u0438\u043a\u0430",
+"Zoom in": "\u0417\u0433\u043e\u043b\u0435\u043c\u0438",
+"Zoom out": "\u041d\u0430\u043c\u0430\u043b\u0438",
+"Crop": "\u041e\u0442\u0441\u0435\u0447\u0438 \u0434\u0435\u043b",
+"Resize": "\u0420\u0435\u0434\u0438\u043c\u0435\u043d\u0437\u0438\u043e\u043d\u0438\u0440\u0430\u0458",
+"Orientation": "\u041d\u0430\u0441\u043e\u0447\u0435\u043d\u043e\u0441\u0442",
+"Brightness": "\u041e\u0441\u0432\u0435\u0442\u043b\u0443\u0432\u0430\u045a\u0435",
+"Sharpen": "\u041e\u0441\u0442\u0440\u0438\u043d\u0430",
+"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
+"Color levels": "\u041d\u0438\u0432\u043e \u043d\u0430 \u0431\u043e\u0438",
+"Gamma": "\u0413\u0430\u043c\u0430",
+"Invert": "\u0418\u043d\u0432\u0435\u0440\u0437\u043d\u043e",
+"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438",
+"Back": "\u041d\u0430\u0437\u0430\u0434",
+"Id": "ID",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID \u0442\u0440\u0435\u0431\u0430 \u0434\u0430 \u043f\u043e\u0447\u043d\u0443\u0432\u0430 \u0441\u043e \u0431\u0443\u043a\u0432\u0430, \u0441\u043b\u0435\u0434\u0435\u043d\u0430 \u0441\u0430\u043c\u043e \u043e\u0434 \u0431\u0443\u043a\u0432\u0438, \u0431\u0440\u043e\u0458\u043a\u0438, \u0446\u0440\u0442\u0430, \u0442\u043e\u0447\u043a\u0430, \u0442\u043e\u0447\u043a\u0430-\u0437\u0430\u043f\u0438\u0440\u043a\u0430 \u0438\u043b\u0438 \u043f\u043e\u0434\u0432\u043b\u0435\u0447\u0435\u043d\u043e.",
+"Insert/Edit code sample": "\u0412\u043c\u0435\u0442\u043d\u0438/\u0423\u0440\u0435\u0434\u0438 \u0438\u0441\u0435\u0447\u043e\u043a \u043e\u0434 \u043a\u043e\u0434",
+"Language": "\u0408\u0430\u0437\u0438\u043a",
+"Image": "\u0421\u043b\u0438\u043a\u0430",
+"Date/time": "\u0414\u0430\u0442\u0443\u043c/\u0412\u0440\u0435\u043c\u0435",
+"Link": "\u0412\u0440\u0441\u043a\u0430",
+"Paste or type a link": "\u0412\u043c\u0435\u0442\u043d\u0435\u0442\u0435 \u0458\u0430 \u0438\u043b\u0438 \u0432\u043f\u0438\u0448\u0435\u0442\u0435 \u0458\u0430 \u0432\u0430\u0448\u0430\u0442\u0430 \u0432\u0440\u0441\u043a\u0430",
+"Insert/Edit Media": "\u0412\u043c\u0435\u0442\u043d\u0438/\u0423\u0440\u0435\u0434\u0438 \u043c\u0435\u0434\u0438\u0458",
+"Media": "\u041c\u0435\u0434\u0438\u0430",
+"Table of Contents": "\u0421\u043e\u0434\u0440\u0436\u0438\u043d\u0430"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ms.js b/core/media/editors/tinymce/langs/ms.js
new file mode 100644
index 00000000..700fb2ef
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ms.js
@@ -0,0 +1,176 @@
+tinymce.addI18n('ms',{
+"Cut": "Potong",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Pelayar internet anda tidak menyokong akses terus kepada papan klip. Sila gunakan pintasan papan kekunci Ctrl+X\/C\/V.",
+"Paste": "Tampal",
+"Close": "Tutup",
+"Align right": "Alih ke kanan",
+"New document": "Dokumen baru",
+"Numbered list": "Senarai bernombor",
+"Increase indent": "Tingkatkan inden",
+"Formats": "Format",
+"Select all": "Pilih semua",
+"Undo": "Kembali Ke asal",
+"Strikethrough": "Batal",
+"Bullet list": "Senarai bullet",
+"Superscript": "Superskrip",
+"Clear formatting": "Hilangkan format",
+"Subscript": "Subskrip",
+"Redo": "Buat semula",
+"Ok": "Ok",
+"Bold": "Tebalkan",
+"Italic": "Tulisan senget",
+"Align center": "Alih ke tengah",
+"Decrease indent": "Kurangkan inden",
+"Underline": "Garis bawah",
+"Cancel": "Batal",
+"Justify": "Sama ratakan",
+"Copy": "Salin",
+"Align left": "Alihkan ke kiri",
+"Visual aids": "Visual bantuan",
+"Lower Greek": "Greek Kecil",
+"Square": "Petak",
+"Default": "Asal",
+"Lower Alpha": "Alpha Kecil",
+"Circle": "Bulat",
+"Disc": "Cakera",
+"Upper Alpha": "Alpha Besar",
+"Upper Roman": "Roman Besar",
+"Lower Roman": "Roman Kecik",
+"Name": "Nama",
+"Anchor": "Pemberat",
+"You have unsaved changes are you sure you want to navigate away?": "Anda mempunyai perubahan yang belum disimpan, anda pasti mahu keluar?",
+"Restore last draft": "Kembalikan draf lepas",
+"Special character": "Karekter unik",
+"Source code": "Sumber Kod",
+"Right to left": "Kanan Ke kiri",
+"Left to right": "Kiri Ke kanan",
+"Emoticons": "Emotikon",
+"Robots": "Robot",
+"Document properties": "Sifat-sifat dokumen",
+"Title": "Tajuk",
+"Keywords": "Kata kunci",
+"Encoding": "Pengekodan",
+"Description": "Penerangan",
+"Author": "Pengarang",
+"Fullscreen": "Skrin penuh",
+"Horizontal line": "Garis mendatar",
+"Horizontal space": "Ruang mendatar",
+"Insert\/edit image": "Masukkan\/Ubah Gambar",
+"General": "Am",
+"Advanced": "Lanjutan",
+"Source": "Sumber",
+"Border": "Sempadan",
+"Constrain proportions": "Bentuk kekangan",
+"Vertical space": "Ruang menegak",
+"Image description": "Penerangan gambar",
+"Style": "Gaya",
+"Dimensions": "Dimensi",
+"Insert image": "Masukkan gambar",
+"Insert date\/time": "Masukkan tarikh\/masa",
+"Remove link": "Padam pautan",
+"Url": "Url",
+"Text to display": "Teks untuk dipaparkan",
+"Insert link": "Masukkan pautan",
+"New window": "Tetingkap baru",
+"None": "Tiada",
+"Target": "Target",
+"Insert\/edit link": "Masukkan\/Ubah pautan",
+"Insert\/edit video": "Masukkan\/Ubah video",
+"Poster": "Poster",
+"Alternative source": "Sumber alternatif",
+"Paste your embed code below:": "Tampalkan kod embed anda di bawah:",
+"Insert video": "Masukkan video",
+"Embed": "Embed",
+"Nonbreaking space": "Ruang tidak dipisahkan",
+"Preview": "Pratonton",
+"Print": "Cetak",
+"Save": "Simpan",
+"Could not find the specified string.": "Tidak dapat mencari untaian yang dinyatakan.",
+"Replace": "Ganti",
+"Next": "Seterusnya",
+"Whole words": "Keseluruhan perkataan",
+"Find and replace": "Cari dan gantikan",
+"Replace with": "Gantikan dengan",
+"Find": "Cari",
+"Replace all": "Ganti semua",
+"Match case": "Huruf sepadan",
+"Prev": "Kembali",
+"Spellcheck": "Semakan Ejaan",
+"Finish": "Tamat",
+"Ignore all": "Biarkan semua",
+"Ignore": "Biarkan",
+"Insert row before": "Masukkan baris sebelumnya",
+"Rows": "Baris-Baris",
+"Height": "Tinggi",
+"Paste row after": "Tampal baris selepasnya",
+"Alignment": "Penjajaran",
+"Column group": "Kumpulan lajur",
+"Row": "Baris",
+"Insert column before": "Masukkan lajur sebelumnya",
+"Split cell": "Asingkan sel",
+"Cell padding": "Penebalan sel",
+"Cell spacing": "Penjarakkan sel",
+"Row type": "Jenis baris",
+"Insert table": "Masukkan jadual",
+"Body": "Badan",
+"Caption": "Keterangan",
+"Footer": "Pengaki",
+"Delete row": "Padam Baris",
+"Paste row before": "Tampal baris sebelumnya",
+"Scope": "Skop",
+"Delete table": "Padam jadual",
+"Header cell": "Sel pengepala",
+"Column": "Lajur",
+"Cell": "Sel",
+"Header": "Pengepala",
+"Cell type": "Jenis sel",
+"Copy row": "Salin baris",
+"Row properties": "Sifat-sifat baris",
+"Table properties": "Sifat-sifat jadual",
+"Row group": "Kumpulan baris",
+"Right": "Kanan",
+"Insert column after": "Masukkan lajur selepasnya",
+"Cols": "Cols",
+"Insert row after": "Masukkan baris selepasnya",
+"Width": "Lebar",
+"Cell properties": "Sifat-sifat sel",
+"Left": "Kiri",
+"Cut row": "Potong baris",
+"Delete column": "Padam lajur",
+"Center": "Tengah",
+"Merge cells": "Gabung Sel",
+"Insert template": "Masukkan templat",
+"Templates": "Templat",
+"Background color": "Warna latar belakang",
+"Text color": "Warna teks",
+"Show blocks": "Papar blok",
+"Show invisible characters": "Papar karekter tersembunyi",
+"Words: {0}": "Perkataan: {0}",
+"Insert": "Masukkan",
+"File": "Fail",
+"Edit": "Ubah",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ruangan Teks Luas. Tekan ALT-F9 untuk menu. Tekan ALT-F10 untuk bar perkakasan. Tekan ALT-0 untuk bantuan",
+"Tools": "Peralatan",
+"View": "Pemandangan",
+"Table": "Jadual",
+"Format": "Format",
+"Inline": "Sebaris",
+"Blocks": "Blok-blok",
+"Edit image": "Ubah gambar",
+"Font Family": "Kumpulan fon",
+"Font Sizes": "Saiz fon",
+"Paragraph": "Perenggan",
+"Address": "Alamat",
+"Pre": "Pra",
+"Code": "Kod",
+"Headers": "Pengepala",
+"Header 1": "Pengepala 1",
+"Header 2": "Pengepala 2",
+"Header 3": "Pengepala 3",
+"Header 4": "Pengepala 4",
+"Header 5": "Pengepala 5",
+"Header 6": "Pengepala 6",
+"Insert Time": "Masukkan masa",
+"Insert nonbreaking space": "Masukkan ruang yang tidak dipisahkan",
+"Toggle blockquote": "Togol Ruang Petikan"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/nb.js b/core/media/editors/tinymce/langs/nb.js
new file mode 100644
index 00000000..76fbc4fc
--- /dev/null
+++ b/core/media/editors/tinymce/langs/nb.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('nb',{
+"Cut": "Klipp ut",
+"Heading 5": "Overskrift 5",
+"Header 2": "Overskrift 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nettleseren din st\u00f8tter ikke direkte tilgang til utklippsboken. Bruk istedet tastatur-snarveiene Ctrl+X\/C\/V, eller Cmd+X\/C\/V p\u00e5 Mac.",
+"Heading 4": "Overskrift 4",
+"Div": "Delblokk <div>",
+"Heading 2": "Overskrift 2",
+"Paste": "Lim inn",
+"Close": "Lukk",
+"Font Family": "Skriftsnitt",
+"Pre": "Definert <pre>",
+"Align right": "H\u00f8yrejustert",
+"New document": "Nytt dokument",
+"Blockquote": "Sitatblokk <blockquote>",
+"Numbered list": "Nummerliste",
+"Heading 1": "Overskrift 1",
+"Headings": "Overskrifter",
+"Increase indent": "\u00d8k innrykk",
+"Formats": "Stiler",
+"Headers": "Overskrifter",
+"Select all": "Marker alt",
+"Header 3": "Overskrift 3",
+"Blocks": "Blokker",
+"Undo": "Angre",
+"Strikethrough": "Gjennomstreket",
+"Bullet list": "Punktliste",
+"Header 1": "Overskrift 1",
+"Superscript": "Hevet skrift",
+"Clear formatting": "Fjern formateringer",
+"Font Sizes": "St\u00f8rrelse",
+"Subscript": "Senket skrift",
+"Header 6": "Overskrift 6",
+"Redo": "Utf\u00f8r likevel",
+"Paragraph": "Avsnitt <p>",
+"Ok": "OK",
+"Bold": "Halvfet",
+"Code": "Kode <code>",
+"Italic": "Kursiv",
+"Align center": "Midtstilt",
+"Header 5": "Overskrift 5",
+"Heading 6": "Overskrift 6",
+"Heading 3": "Overskrift 3",
+"Decrease indent": "Reduser innrykk",
+"Header 4": "Overskrift 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lim inn er n\u00e5 i ren-tekst modus. Kopiert innhold vil bli limt inn som ren tekst inntil du sl\u00e5r av dette valget.",
+"Underline": "Understreket",
+"Cancel": "Avbryt",
+"Justify": "Juster alle linjer",
+"Inline": "Innkapslet <span>",
+"Copy": "Kopier",
+"Align left": "Venstrejustert",
+"Visual aids": "Visuelle hjelpemidler",
+"Lower Greek": "Greske minuskler",
+"Square": "Fylt firkant",
+"Default": "Normal",
+"Lower Alpha": "Minuskler",
+"Circle": "\u00c5pen sirkel",
+"Disc": "Fylt sirkel",
+"Upper Alpha": "Versaler",
+"Upper Roman": "Romerske versaler",
+"Lower Roman": "Romerske minuskler",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id burde starte med en bokstav, bare fulgt av bokstaver, nummer, streker, punktum, koloner eller understreker.",
+"Name": "Navn",
+"Anchor": "Anker",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Du har ikke arkivert endringene. Vil du fortsette uten \u00e5 arkivere?",
+"Restore last draft": "Gjenopprett siste utkast",
+"Special character": "Spesialtegn",
+"Source code": "Kildekode",
+"Language": "Spr\u00e5k",
+"Insert\/Edit code sample": "Sett inn\/endre kodeeksempel",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Farge",
+"Right to left": "H\u00f8yre til venstre",
+"Left to right": "Venstre til h\u00f8yre",
+"Emoticons": "Hum\u00f8rfjes",
+"Robots": "Roboter",
+"Document properties": "Dokumentegenskaper",
+"Title": "Tittel",
+"Keywords": "N\u00f8kkelord",
+"Encoding": "Tegnkoding",
+"Description": "Beskrivelse",
+"Author": "Forfatter",
+"Fullscreen": "Fullskjerm",
+"Horizontal line": "Horisontal linje",
+"Horizontal space": "Horisontal marg",
+"Insert\/edit image": "Sett inn\/endre bilde",
+"General": "Generelt",
+"Advanced": "Avansert",
+"Source": "Bildelenke",
+"Border": "Ramme",
+"Constrain proportions": "Behold proporsjoner",
+"Vertical space": "Vertikal marg",
+"Image description": "Bildebeskrivelse",
+"Style": "Stil",
+"Dimensions": "Dimensjoner",
+"Insert image": "Sett inn bilde",
+"Image": "Bilde",
+"Zoom in": "Zoom inn",
+"Contrast": "Kontrast",
+"Back": "Tilbake",
+"Gamma": "Gamma",
+"Flip horizontally": "Speilvend horisontalt",
+"Resize": "Skaler",
+"Sharpen": "Skarphet",
+"Zoom out": "Zoom ut",
+"Image options": "Bilde innstillinger",
+"Apply": "Utf\u00f8r",
+"Brightness": "Lysstyrke",
+"Rotate clockwise": "Roter mot h\u00f8yre",
+"Rotate counterclockwise": "Roter mot venstre",
+"Edit image": "Rediger bilde",
+"Color levels": "Fargeniv\u00e5",
+"Crop": "Beskj\u00e6r",
+"Orientation": "Orientering",
+"Flip vertically": "Speilvend vertikalt",
+"Invert": "Inverter",
+"Date\/time": "Dato\/tid",
+"Insert date\/time": "Sett inn dato\/tid",
+"Remove link": "Fjern lenke",
+"Url": "Url",
+"Text to display": "Tekst som skal vises",
+"Anchors": "Anker",
+"Insert link": "Sett inn lenke",
+"Link": "Lenke",
+"New window": "Nytt vindu",
+"None": "Ingen",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Oppgitt URL ser ut til \u00e5 v\u00e6re en e-postadresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevd mailto:-prefiks foran e-postadressen?",
+"Paste or type a link": "Lim inn eller skriv en lenke",
+"Target": "M\u00e5l",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Oppgitte URL ser ut til \u00e5 v\u00e6re en epost-adresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevet mailto: prefiks forran epost-adressen?",
+"Insert\/edit link": "Sett inn\/endre lenke",
+"Insert\/edit video": "Sett inn\/rediger video",
+"Media": "Media",
+"Alternative source": "Alternativ kilde",
+"Paste your embed code below:": "Lim inn  inkluderings-koden nedenfor",
+"Insert video": "Sett inn video",
+"Poster": "Plakatbilde",
+"Insert\/edit media": "Sett inn\/endre media",
+"Embed": "Inkluder",
+"Nonbreaking space": "Hardt mellomrom",
+"Page break": "Sideskifte",
+"Paste as text": "Lim inn som tekst",
+"Preview": "Forh\u00e5ndsvisning",
+"Print": "Skriv ut",
+"Save": "Arkiver",
+"Could not find the specified string.": "Kunne ikke finne den spesifiserte teksten",
+"Replace": "Erstatt",
+"Next": "Neste",
+"Whole words": "Hele ord",
+"Find and replace": "Finn og erstatt",
+"Replace with": "Erstatt med",
+"Find": "Finn",
+"Replace all": "Erstatt alle",
+"Match case": "Match store og sm\u00e5 bokstaver",
+"Prev": "Forrige",
+"Spellcheck": "Stavekontroll",
+"Finish": "Avslutt",
+"Ignore all": "Ignorer alle",
+"Ignore": "Ignorer",
+"Add to Dictionary": "Legg til i ordliste",
+"Insert row before": "Sett inn rad f\u00f8r",
+"Rows": "Rader",
+"Height": "H\u00f8yde",
+"Paste row after": "Lim inn rad etter",
+"Alignment": "Justering",
+"Border color": "Rammefarge",
+"Column group": "Kolonnegruppe",
+"Row": "Rad",
+"Insert column before": "Sett inn kolonne f\u00f8r",
+"Split cell": "Splitt celle",
+"Cell padding": "Cellemarg",
+"Cell spacing": "Celleavstand",
+"Row type": "Rad-type",
+"Insert table": "Sett inn tabell",
+"Body": "Br\u00f8dtekst",
+"Caption": "Tittel",
+"Footer": "Bunntekst",
+"Delete row": "Slett rad",
+"Paste row before": "Lim inn rad f\u00f8r",
+"Scope": "Omfang",
+"Delete table": "Slett tabell",
+"H Align": "H Justering",
+"Top": "Topp",
+"Header cell": "Topptekst-celle",
+"Column": "Kolonne",
+"Row group": "Radgruppe",
+"Cell": "Celle",
+"Middle": "Midten",
+"Cell type": "Celletype",
+"Copy row": "Kopier rad",
+"Row properties": "Rad egenskaper",
+"Table properties": "Tabell egenskaper",
+"Bottom": "Bunn",
+"V Align": "V Justering",
+"Header": "Topptekst",
+"Right": "H\u00f8yre",
+"Insert column after": "Sett inn kolonne etter",
+"Cols": "Kolonner",
+"Insert row after": "Sett in rad etter",
+"Width": "Bredde",
+"Cell properties": "Celle egenskaper",
+"Left": "Venstre",
+"Cut row": "Klipp ut rad",
+"Delete column": "Slett kolonne",
+"Center": "Midtstilt",
+"Merge cells": "Sl\u00e5 sammen celler",
+"Insert template": "Sett inn mal",
+"Templates": "Maler",
+"Background color": "Bakgrunnsfarge",
+"Custom...": "Tilpass...",
+"Custom color": "Tilpasset farge",
+"No color": "Ingen farge",
+"Text color": "Tekstfarge",
+"Table of Contents": "Innholdsfortegnelse",
+"Show blocks": "Vis blokker",
+"Show invisible characters": "Vis skjulte tegn",
+"Words: {0}": "Antall ord: {0}",
+"Insert": "Sett inn",
+"File": "Arkiv",
+"Edit": "Rediger",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Tekstredigering. Tast ALT-F9 for meny. Tast ALT-F10 for verkt\u00f8ys-rader. Tast ALT-0 for hjelp.",
+"Tools": "Verkt\u00f8y",
+"View": "Vis",
+"Table": "Tabell",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/nl.js b/core/media/editors/tinymce/langs/nl.js
new file mode 100644
index 00000000..239b32da
--- /dev/null
+++ b/core/media/editors/tinymce/langs/nl.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('nl',{
+"Add to Dictionary": "Toevoegen aan woordenlijst",
+"Advanced": "Geavanceerd",
+"Align center": "Centreren",
+"Align left": "Links uitlijnen",
+"Align right": "Rechts uitlijnen",
+"Alignment": "Uitlijning",
+"Alternative source": "Alternatieve bron",
+"Anchor": "Anker",
+"Anchors": "Anker",
+"Apply": "Toepassen",
+"Author": "Auteur",
+"B": "Blauw",
+"Back": "Terug",
+"Background color": "Achtergrondkleur",
+"Blockquote": "Citaat",
+"Blocks": "Blokken",
+"Body": "Inhoud",
+"Bold": "Vet",
+"Border color": "Randkleur",
+"Border": "Rand",
+"Bottom": "Onder",
+"Brightness": "Helderheid",
+"Bullet list": "Opsommingsteken",
+"Cancel": "Annuleren",
+"Caption": "Onderschrift",
+"Cell padding": "Celpadding",
+"Cell properties": "Celeigenschappen",
+"Cell spacing": "Celruimte",
+"Cell type": "Celtype",
+"Cell": "Cel",
+"Center": "Centreren",
+"Circle": "Cirkel",
+"Clear formatting": "Opmaak wissen",
+"Close": "Sluiten",
+"Code": "Codering",
+"Color levels": "Kleurniveau's",
+"Color": "Kleur",
+"Cols": "Kolommen",
+"Column group": "Kolomgroep",
+"Column": "Kolom",
+"Constrain proportions": "Verhoudingen behouden",
+"Contrast": "Contrast",
+"Copy row": "Kopieer rij",
+"Copy": "Kopi\u00ebren",
+"Could not find the specified string.": "Geen resultaten gevonden",
+"Crop": "Uitsnijden",
+"Custom color": "Aangepaste kleur",
+"Custom...": "Aangepaste...",
+"Cut row": "Rij knippen",
+"Cut": "Knippen",
+"Date\/time": "Datum\/tijd",
+"Decrease indent": "Inspringen verkleinen",
+"Default": "Standaard",
+"Delete column": "Verwijder kolom",
+"Delete row": "Verwijder rij",
+"Delete table": "Verwijder tabel",
+"Description": "Omschrijving",
+"Dimensions": "Afmetingen",
+"Disc": "Bolletje",
+"Div": "Div",
+"Document properties": "Documenteigenschappen",
+"Edit image": "Bewerk afbeelding",
+"Edit": "Bewerken",
+"Embed": "Insluiten",
+"Emoticons": "Emoticons",
+"Encoding": "Codering",
+"File": "Bestand",
+"Find and replace": "Zoek en vervang",
+"Find": "Zoeken",
+"Finish": "Einde",
+"Flip horizontally": "Horizontaal spiegelen",
+"Flip vertically": "Verticaal spiegelen",
+"Font Family": "Lettertype",
+"Font Sizes": "Tekengrootte",
+"Footer": "Voettekst",
+"Format": "Opmaak",
+"Formats": "Opmaak",
+"Fullscreen": "Volledig scherm",
+"G": "Groen",
+"Gamma": "Gamma",
+"General": "Algemeen",
+"H Align": "Horizontaal uitlijnen",
+"Header 1": "Kop 1",
+"Header 2": "Kop 2",
+"Header 3": "Kop 3",
+"Header 4": "Kop 4",
+"Header 5": "Kop 5",
+"Header 6": "Kop 6",
+"Header cell": "Kopcel",
+"Header": "Koptekst",
+"Headers": "Kopteksten",
+"Heading 1": "Kop 1",
+"Heading 2": "Kop 2",
+"Heading 3": "Kop 3",
+"Heading 4": "Kop 4",
+"Heading 5": "Kop 5",
+"Heading 6": "Kop 6",
+"Headings": "Koppen",
+"Height": "Hoogte",
+"Horizontal line": "Horizontale lijn",
+"Horizontal space": "Horizontale ruimte",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID moet beginnen met een letter, alleen gevolgd door letters, nummers, streepjes, punten, dubbele punten of underscores.",
+"Id": "ID",
+"Ignore all": "Alles negeren",
+"Ignore": "Negeren",
+"Image description": "Afbeeldingsomschrijving",
+"Image options": "Afbeeldingsopties",
+"Image": "Afbeelding",
+"Increase indent": "Inspringen vergroten",
+"Inline": "Inlijn",
+"Insert column after": "Voeg kolom in na",
+"Insert column before": "Voeg kolom in voor",
+"Insert date\/time": "Voeg datum\/tijd in",
+"Insert image": "Afbeelding invoegen",
+"Insert link": "Hyperlink invoegen",
+"Insert row after": "Voeg rij toe na",
+"Insert row before": "Voeg rij toe voor",
+"Insert table": "Tabel invoegen",
+"Insert template": "Template invoegen",
+"Insert video": "Video invoegen",
+"Insert": "Invoegen",
+"Insert\/Edit code sample": "Codevoorbeeld invoegen\/bewerken",
+"Insert\/edit image": "Afbeelding invoegen\/bewerken",
+"Insert\/edit link": "Hyperlink invoegen\/bewerken",
+"Insert\/edit media": "Media invoegen\/bewerken",
+"Insert\/edit video": "Video invoegen\/bewerken",
+"Invert": "Omkeren",
+"Italic": "Cursief",
+"Justify": "Uitvullen",
+"Keywords": "Trefwoorden",
+"Language": "Taal",
+"Left to right": "Links naar rechts",
+"Left": "Links",
+"Link": "Link",
+"Lower Alpha": "Kleine letters",
+"Lower Greek": "Griekse letters (klein)",
+"Lower Roman": "Romeinse cijfers (klein)",
+"Match case": "Identieke hoofd\/kleine letters",
+"Media": "Media",
+"Merge cells": "Cellen samenvoegen",
+"Middle": "Centreren",
+"Name": "Naam",
+"New document": "Nieuw document",
+"New window": "Nieuw venster",
+"Next": "Volgende",
+"No color": "Geen kleur",
+"Nonbreaking space": "Vaste spatie invoegen",
+"None": "Geen",
+"Numbered list": "Nummering",
+"Ok": "Ok",
+"Orientation": "Ori\u00ebntatie",
+"Page break": "Nieuwe pagina",
+"Paragraph": "Paragraaf",
+"Paste as text": "Plakken als tekst",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Plakken gebeurt nu als platte tekst. Tekst wordt nu ingevoegd zonder opmaak tot deze optie uitgeschakeld wordt.",
+"Paste or type a link": "Plak of typ een link",
+"Paste row after": "Plak rij na",
+"Paste row before": "Plak rij voor",
+"Paste your embed code below:": "Plak uw in te sluiten code hieronder:",
+"Paste": "Plakken",
+"Poster": "Poster",
+"Pre": "Pre",
+"Prev": "Vorige",
+"Preview": "Voorbeeld",
+"Print": "Afdrukken",
+"R": "Rood",
+"Redo": "Opnieuw",
+"Remove link": "Link verwijderen",
+"Replace all": "Alles vervangen",
+"Replace with": "Vervangen door",
+"Replace": "Vervangen",
+"Resize": "Formaat aanpassen",
+"Restore last draft": "Herstellen naar vorig concept",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Opgemaakte tekstgebied. Druk op ALT-F9 voor het menu. Druk op ALT-F10 voor de werkbalk. Druk op ALT-0 voor de help.",
+"Right to left": "Rechts naar links",
+"Right": "Rechts",
+"Robots": "Robots",
+"Rotate clockwise": "Rechtsom draaien",
+"Rotate counterclockwise": "Linksom draaien",
+"Row group": "Rijgroep",
+"Row properties": "Rij-eigenschappen",
+"Row type": "Rijtype",
+"Row": "Rij",
+"Rows": "Rijen",
+"Save": "Opslaan",
+"Scope": "Bereik",
+"Select all": "Alles selecteren",
+"Sharpen": "Scherper",
+"Show blocks": "Blokken tonen",
+"Show invisible characters": "Verborgen tekens tonen",
+"Source code": "Broncode",
+"Source": "Bron",
+"Special character": "Speciale tekens",
+"Spellcheck": "Spellingscontrole",
+"Split cell": "Cel splitsen",
+"Square": "Vierkant",
+"Strikethrough": "Doorhalen",
+"Style": "Stijl",
+"Subscript": "Subscript",
+"Superscript": "Superscript",
+"Table of Contents": "Inhoudsopgave",
+"Table properties": "Tabeleigenschappen",
+"Table": "Tabel",
+"Target": "Doel",
+"Templates": "Templates",
+"Text color": "Tekstkleur",
+"Text to display": "Tekst om weer te geven",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "De ingegeven URL lijkt op een e-mailadres. Wilt u er \"mailto:\" aan toevoegen?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "De ingegeven URL lijkt op een externe link. Wilt u er \"http:\/\/\" aan toevoegen?",
+"Title": "Titel",
+"Tools": "Gereedschap",
+"Top": "Bovenaan",
+"Underline": "Onderstreept",
+"Undo": "Ongedaan maken",
+"Upper Alpha": "Hoofdletters alfabetisch",
+"Upper Roman": "Hoofdletters Romeinse cijfers",
+"Url": "URL",
+"V Align": "Verticaal uitlijnen",
+"Vertical space": "Verticale ruimte",
+"View": "Weergave",
+"Visual aids": "Hulpmiddelen",
+"Whole words": "Hele woorden",
+"Width": "Breedte",
+"Words: {0}": "Woorden: {0}",
+"You have unsaved changes are you sure you want to navigate away?": "U heeft niet alles opgeslagen weet u zeker dat u de pagina wil verlaten?",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Uw browser ondersteunt geen toegang tot het klemboord. Gelieve de ctrl+X\/C\/V sneltoetsen gebruiken.",
+"Zoom in": "Inzoomen",
+"Zoom out": "Uitzoomen"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/pl.js b/core/media/editors/tinymce/langs/pl.js
new file mode 100644
index 00000000..2e1f0d2d
--- /dev/null
+++ b/core/media/editors/tinymce/langs/pl.js
@@ -0,0 +1,219 @@
+tinymce.addI18n('pl',{
+"Cut": "Wytnij",
+"Heading 5": "Nag\u0142\u00f3wek 5",
+"Header 2": "Nag\u0142\u00f3wek 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Twoja przegl\u0105darka nie obs\u0142uguje bezpo\u015bredniego dost\u0119pu do schowka. U\u017cyj zamiast tego kombinacji klawiszy Ctrl+X\/C\/V.",
+"Heading 4": "Nag\u0142\u00f3wek 4",
+"Div": "Div",
+"Heading 2": "Nag\u0142\u00f3wek 2",
+"Paste": "Wklej",
+"Close": "Zamknij",
+"Font Family": "Kr\u00f3j czcionki",
+"Pre": "Sformatowany tekst",
+"Align right": "Wyr\u00f3wnaj do prawej",
+"New document": "Nowy dokument",
+"Blockquote": "Blok cytatu",
+"Numbered list": "Lista numerowana",
+"Heading 1": "Nag\u0142\u00f3wek 1",
+"Headings": "Nag\u0142\u00f3wki",
+"Increase indent": "Zwi\u0119ksz wci\u0119cie",
+"Formats": "Formaty",
+"Headers": "Nag\u0142\u00f3wki",
+"Select all": "Zaznacz wszystko",
+"Header 3": "Nag\u0142\u00f3wek 3",
+"Blocks": "Bloki",
+"Undo": "Cofnij",
+"Strikethrough": "Przekre\u015blenie",
+"Bullet list": "Lista wypunktowana",
+"Header 1": "Nag\u0142\u00f3wek 1",
+"Superscript": "Indeks g\u00f3rny",
+"Clear formatting": "Wyczy\u015b\u0107 formatowanie",
+"Font Sizes": "Rozmiar czcionki",
+"Subscript": "Indeks dolny",
+"Header 6": "Nag\u0142\u00f3wek 6",
+"Redo": "Pon\u00f3w",
+"Paragraph": "Akapit",
+"Ok": "Ok",
+"Bold": "Pogrubienie",
+"Code": "Kod \u017ar\u00f3d\u0142owy",
+"Italic": "Kursywa",
+"Align center": "Wyr\u00f3wnaj do \u015brodka",
+"Header 5": "Nag\u0142\u00f3wek 5",
+"Heading 6": "Nag\u0142\u00f3wek 6",
+"Heading 3": "Nag\u0142\u00f3wek 3",
+"Decrease indent": "Zmniejsz wci\u0119cie",
+"Header 4": "Nag\u0142\u00f3wek 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Wklejanie jest w trybie tekstowym. Zawarto\u015b\u0107 zostanie wklejona jako zwyk\u0142y tekst dop\u00f3ki nie wy\u0142\u0105czysz tej opcji.",
+"Underline": "Podkre\u015blenie",
+"Cancel": "Anuluj",
+"Justify": "Do lewej i prawej",
+"Inline": "W tek\u015bcie",
+"Copy": "Kopiuj",
+"Align left": "Wyr\u00f3wnaj do lewej",
+"Visual aids": "Pomoce wizualne",
+"Lower Greek": "Ma\u0142e greckie",
+"Square": "Kwadrat",
+"Default": "Domy\u015blne",
+"Lower Alpha": "Ma\u0142e litery",
+"Circle": "K\u00f3\u0142ko",
+"Disc": "Dysk",
+"Upper Alpha": "Wielkie litery",
+"Upper Roman": "Wielkie rzymskie",
+"Lower Roman": "Ma\u0142e rzymskie",
+"Name": "Nazwa",
+"Anchor": "Kotwica",
+"You have unsaved changes are you sure you want to navigate away?": "Masz niezapisane zmiany. Czy na pewno chcesz opu\u015bci\u0107 stron\u0119?",
+"Restore last draft": "Przywr\u00f3\u0107 ostatni szkic",
+"Special character": "Znak specjalny",
+"Source code": "Kod \u017ar\u00f3d\u0142owy",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Kolor",
+"Right to left": "Od prawej do lewej",
+"Left to right": "Od lewej do prawej",
+"Emoticons": "Emotikony",
+"Robots": "Roboty",
+"Document properties": "W\u0142a\u015bciwo\u015bci dokumentu",
+"Title": "Tytu\u0142",
+"Keywords": "S\u0142owa kluczowe",
+"Encoding": "Kodowanie",
+"Description": "Opis",
+"Author": "Autor",
+"Fullscreen": "Pe\u0142ny ekran",
+"Horizontal line": "Pozioma linia",
+"Horizontal space": "Odst\u0119p poziomy",
+"Insert\/edit image": "Wstaw\/edytuj obrazek",
+"General": "Og\u00f3lne",
+"Advanced": "Zaawansowane",
+"Source": "\u0179r\u00f3d\u0142o",
+"Border": "Ramka",
+"Constrain proportions": "Zachowaj proporcje",
+"Vertical space": "Odst\u0119p pionowy",
+"Image description": "Opis obrazka",
+"Style": "Styl",
+"Dimensions": "Wymiary",
+"Insert image": "Wstaw obrazek",
+"Zoom in": "Powi\u0119ksz",
+"Contrast": "Kontrast",
+"Back": "Cofnij",
+"Gamma": "Gamma",
+"Flip horizontally": "Przerzu\u0107 w poziomie",
+"Resize": "Zmiana rozmiaru",
+"Sharpen": "Wyostrz",
+"Zoom out": "Pomniejsz",
+"Image options": "Opcje obrazu",
+"Apply": "Zaakceptuj",
+"Brightness": "Jasno\u015b\u0107",
+"Rotate clockwise": "Obr\u00f3\u0107 w prawo",
+"Rotate counterclockwise": "Obr\u00f3\u0107 w lewo",
+"Edit image": "Edytuj obrazek",
+"Color levels": "Poziom koloru",
+"Crop": "Przytnij",
+"Orientation": "Orientacja",
+"Flip vertically": "Przerzu\u0107 w pionie",
+"Invert": "Odwr\u00f3\u0107",
+"Insert date\/time": "Wstaw dat\u0119\/czas",
+"Remove link": "Usu\u0144 link",
+"Url": "Url",
+"Text to display": "Tekst do wy\u015bwietlenia",
+"Anchors": "Kotwice",
+"Insert link": "Wstaw link",
+"New window": "Nowe okno",
+"None": "\u017baden",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na link zewn\u0119trzny. Czy chcesz doda\u0107 http:\/\/ jako prefiks?",
+"Target": "Cel",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na adres e-mail. Czy chcesz doda\u0107 mailto: jako prefiks?",
+"Insert\/edit link": "Wstaw\/edytuj link",
+"Insert\/edit video": "Wstaw\/edytuj wideo",
+"Poster": "Plakat",
+"Alternative source": "Alternatywne \u017ar\u00f3d\u0142o",
+"Paste your embed code below:": "Wklej tutaj kod do osadzenia:",
+"Insert video": "Wstaw wideo",
+"Embed": "Osad\u017a",
+"Nonbreaking space": "Nie\u0142amliwa spacja",
+"Page break": "Podzia\u0142 strony",
+"Paste as text": "Wklej jako zwyk\u0142y tekst",
+"Preview": "Podgl\u0105d",
+"Print": "Drukuj",
+"Save": "Zapisz",
+"Could not find the specified string.": "Nie znaleziono szukanego tekstu.",
+"Replace": "Zamie\u0144",
+"Next": "Nast.",
+"Whole words": "Ca\u0142e s\u0142owa",
+"Find and replace": "Znajd\u017a i zamie\u0144",
+"Replace with": "Zamie\u0144 na",
+"Find": "Znajd\u017a",
+"Replace all": "Zamie\u0144 wszystko",
+"Match case": "Dopasuj wielko\u015b\u0107 liter",
+"Prev": "Poprz.",
+"Spellcheck": "Sprawdzanie pisowni",
+"Finish": "Zako\u0144cz",
+"Ignore all": "Ignoruj wszystko",
+"Ignore": "Ignoruj",
+"Add to Dictionary": "Dodaj do s\u0142ownika",
+"Insert row before": "Wstaw wiersz przed",
+"Rows": "Wiersz.",
+"Height": "Wysoko\u015b\u0107",
+"Paste row after": "Wklej wiersz po",
+"Alignment": "Wyr\u00f3wnanie",
+"Border color": "Kolor ramki",
+"Column group": "Grupa kolumn",
+"Row": "Wiersz",
+"Insert column before": "Wstaw kolumn\u0119 przed",
+"Split cell": "Podziel kom\u00f3rk\u0119",
+"Cell padding": "Dope\u0142nienie kom\u00f3rki",
+"Cell spacing": "Odst\u0119py kom\u00f3rek",
+"Row type": "Typ wiersza",
+"Insert table": "Wstaw tabel\u0119",
+"Body": "Tre\u015b\u0107",
+"Caption": "Tytu\u0142",
+"Footer": "Stopka",
+"Delete row": "Usu\u0144 wiersz",
+"Paste row before": "Wklej wiersz przed",
+"Scope": "Kontekst",
+"Delete table": "Usu\u0144 tabel\u0119",
+"H Align": "Wyr\u00f3wnanie w pionie",
+"Top": "G\u00f3ra",
+"Header cell": "Kom\u00f3rka nag\u0142\u00f3wka",
+"Column": "Kolumna",
+"Row group": "Grupa wierszy",
+"Cell": "Kom\u00f3rka",
+"Middle": "\u015arodek",
+"Cell type": "Typ kom\u00f3rki",
+"Copy row": "Kopiuj wiersz",
+"Row properties": "W\u0142a\u015bciwo\u015bci wiersza",
+"Table properties": "W\u0142a\u015bciwo\u015bci tabeli",
+"Bottom": "D\u00f3\u0142",
+"V Align": "Wyr\u00f3wnanie w poziomie",
+"Header": "Nag\u0142\u00f3wek",
+"Right": "Prawo",
+"Insert column after": "Wstaw kolumn\u0119 po",
+"Cols": "Kol.",
+"Insert row after": "Wstaw wiersz po",
+"Width": "Szeroko\u015b\u0107",
+"Cell properties": "W\u0142a\u015bciwo\u015bci kom\u00f3rki",
+"Left": "Lewo",
+"Cut row": "Wytnij wiersz",
+"Delete column": "Usu\u0144 kolumn\u0119",
+"Center": "\u015arodek",
+"Merge cells": "\u0141\u0105cz kom\u00f3rki",
+"Insert template": "Wstaw szablon",
+"Templates": "Szablony",
+"Background color": "Kolor t\u0142a",
+"Custom...": "Niestandardowy...",
+"Custom color": "Kolor niestandardowy",
+"No color": "Bez koloru",
+"Text color": "Kolor tekstu",
+"Show blocks": "Poka\u017c bloki",
+"Show invisible characters": "Poka\u017c niewidoczne znaki",
+"Words: {0}": "S\u0142\u00f3w: {0}",
+"Insert": "Wstaw",
+"File": "Plik",
+"Edit": "Edycja",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Obszar Edycji. ALT-F9 - menu. ALT-F10 - pasek narz\u0119dzi. ALT-0 - pomoc",
+"Tools": "Narz\u0119dzia",
+"View": "Widok",
+"Table": "Tabela",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/pt-BR.js b/core/media/editors/tinymce/langs/pt-BR.js
new file mode 100644
index 00000000..f8c21680
--- /dev/null
+++ b/core/media/editors/tinymce/langs/pt-BR.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('pt-BR',{
+"Cut": "Recortar",
+"Heading 5": "Cabe\u00e7alho 5",
+"Header 2": "Cabe\u00e7alho 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor use os atalhos Ctrl+X - C - V do teclado",
+"Heading 4": "Cabe\u00e7alho 4",
+"Div": "Div",
+"Heading 2": "Cabe\u00e7alho 2",
+"Paste": "Colar",
+"Close": "Fechar",
+"Font Family": "Fonte",
+"Pre": "Pre",
+"Align right": "Alinhar \u00e0 direita",
+"New document": "Novo documento",
+"Blockquote": "Aspas",
+"Numbered list": "Lista ordenada",
+"Heading 1": "Cabe\u00e7alho 1",
+"Headings": "Cabe\u00e7alhos",
+"Increase indent": "Aumentar recuo",
+"Formats": "Formatos",
+"Headers": "Cabe\u00e7alhos",
+"Select all": "Selecionar tudo",
+"Header 3": "Cabe\u00e7alho 3",
+"Blocks": "Blocos",
+"Undo": "Desfazer",
+"Strikethrough": "Riscar",
+"Bullet list": "Lista n\u00e3o ordenada",
+"Header 1": "Cabe\u00e7alho 1",
+"Superscript": "Sobrescrito",
+"Clear formatting": "Limpar formata\u00e7\u00e3o",
+"Font Sizes": "Tamanho",
+"Subscript": "Subscrever",
+"Header 6": "Cabe\u00e7alho 6",
+"Redo": "Refazer",
+"Paragraph": "Par\u00e1grafo",
+"Ok": "Ok",
+"Bold": "Negrito",
+"Code": "C\u00f3digo",
+"Italic": "It\u00e1lico",
+"Align center": "Centralizar",
+"Header 5": "Cabe\u00e7alho 5",
+"Heading 6": "Cabe\u00e7alho 6",
+"Heading 3": "Cabe\u00e7alho 3",
+"Decrease indent": "Diminuir recuo",
+"Header 4": "Cabe\u00e7alho 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 agora em modo texto plano. O conte\u00fado ser\u00e1 colado como texto plano at\u00e9 voc\u00ea desligar esta op\u00e7\u00e3o.",
+"Underline": "Sublinhar",
+"Cancel": "Cancelar",
+"Justify": "Justificar",
+"Inline": "Em linha",
+"Copy": "Copiar",
+"Align left": "Alinhar \u00e0 esquerda",
+"Visual aids": "Ajuda visual",
+"Lower Greek": "\u03b1. \u03b2. \u03b3. ...",
+"Square": "Quadrado",
+"Default": "Padr\u00e3o",
+"Lower Alpha": "a. b. c. ...",
+"Circle": "C\u00edrculo",
+"Disc": "Disco",
+"Upper Alpha": "A. B. C. ...",
+"Upper Roman": "I. II. III. ...",
+"Lower Roman": "i. ii. iii. ...",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id deve come\u00e7ar com uma letra, seguido apenas por letras, n\u00fameros, tra\u00e7os, pontos, dois pontos ou sublinhados.",
+"Name": "Nome",
+"Anchor": "\u00c2ncora",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "Voc\u00ea tem mudan\u00e7as n\u00e3o salvas. Voc\u00ea tem certeza que deseja sair?",
+"Restore last draft": "Restaurar \u00faltimo rascunho",
+"Special character": "Caracteres especiais",
+"Source code": "C\u00f3digo fonte",
+"Language": "Idioma",
+"Insert\/Edit code sample": "Inserir\/Editar c\u00f3digo de exemplo",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Cor",
+"Right to left": "Da direita para a esquerda",
+"Left to right": "Da esquerda para a direita",
+"Emoticons": "Emoticons",
+"Robots": "Rob\u00f4s",
+"Document properties": "Propriedades do documento",
+"Title": "T\u00edtulo",
+"Keywords": "Palavras-chave",
+"Encoding": "Codifica\u00e7\u00e3o",
+"Description": "Descri\u00e7\u00e3o",
+"Author": "Autor",
+"Fullscreen": "Tela cheia",
+"Horizontal line": "Linha horizontal",
+"Horizontal space": "Espa\u00e7amento horizontal",
+"Insert\/edit image": "Inserir\/editar imagem",
+"General": "Geral",
+"Advanced": "Avan\u00e7ado",
+"Source": "Endere\u00e7o da imagem",
+"Border": "Borda",
+"Constrain proportions": "Manter propor\u00e7\u00f5es",
+"Vertical space": "Espa\u00e7amento vertical",
+"Image description": "Inserir descri\u00e7\u00e3o",
+"Style": "Estilo",
+"Dimensions": "Dimens\u00f5es",
+"Insert image": "Inserir imagem",
+"Image": "Imagem",
+"Zoom in": "Aumentar zoom",
+"Contrast": "Contraste",
+"Back": "Voltar",
+"Gamma": "Gama",
+"Flip horizontally": "Virar horizontalmente",
+"Resize": "Redimensionar",
+"Sharpen": "Aumentar nitidez",
+"Zoom out": "Diminuir zoom",
+"Image options": "Op\u00e7\u00f5es de Imagem",
+"Apply": "Aplicar",
+"Brightness": "Brilho",
+"Rotate clockwise": "Girar em sentido anti-hor\u00e1rio",
+"Rotate counterclockwise": "Girar em sentido hor\u00e1rio",
+"Edit image": "Editar imagem",
+"Color levels": "N\u00edveis de cor",
+"Crop": "Cortar",
+"Orientation": "Orienta\u00e7\u00e3o",
+"Flip vertically": "Virar verticalmente",
+"Invert": "Inverter",
+"Date\/time": "data\/hora",
+"Insert date\/time": "Inserir data\/hora",
+"Remove link": "Remover link",
+"Url": "Url",
+"Text to display": "Texto para mostrar",
+"Anchors": "\u00c2ncoras",
+"Insert link": "Inserir link",
+"Link": "Link",
+"New window": "Nova janela",
+"None": "Nenhum",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A URL que voc\u00ea informou parece ser um link externo. Deseja incluir o prefixo http:\/\/?",
+"Paste or type a link": "Cole ou digite um Link",
+"Target": "Alvo",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Inserir\/editar link",
+"Insert\/edit video": "Inserir\/editar v\u00eddeo",
+"Media": "imagem",
+"Alternative source": "Fonte alternativa",
+"Paste your embed code below:": "Insira o c\u00f3digo de incorpora\u00e7\u00e3o abaixo:",
+"Insert video": "Inserir v\u00eddeo",
+"Poster": "Autor",
+"Insert\/edit media": "Inserir\/editar imagem",
+"Embed": "Incorporar",
+"Nonbreaking space": "Espa\u00e7o n\u00e3o separ\u00e1vel",
+"Page break": "Quebra de p\u00e1gina",
+"Paste as text": "Colar como texto",
+"Preview": "Pr\u00e9-visualizar",
+"Print": "Imprimir",
+"Save": "Salvar",
+"Could not find the specified string.": "N\u00e3o foi poss\u00edvel encontrar o termo especificado",
+"Replace": "Substituir",
+"Next": "Pr\u00f3ximo",
+"Whole words": "Palavras inteiras",
+"Find and replace": "Localizar e substituir",
+"Replace with": "Substituir por",
+"Find": "Localizar",
+"Replace all": "Substituir tudo",
+"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
+"Prev": "Anterior",
+"Spellcheck": "Corretor ortogr\u00e1fico",
+"Finish": "Finalizar",
+"Ignore all": "Ignorar tudo",
+"Ignore": "Ignorar",
+"Add to Dictionary": "Adicionar ao Dicion\u00e1rio",
+"Insert row before": "Inserir linha antes",
+"Rows": "Linhas",
+"Height": "Altura",
+"Paste row after": "Colar linha depois",
+"Alignment": "Alinhamento",
+"Border color": "Cor da borda",
+"Column group": "Agrupar coluna",
+"Row": "Linha",
+"Insert column before": "Inserir coluna antes",
+"Split cell": "Dividir c\u00e9lula",
+"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
+"Cell spacing": "Espa\u00e7amento da c\u00e9lula",
+"Row type": "Tipo de linha",
+"Insert table": "Inserir tabela",
+"Body": "Corpo",
+"Caption": "Legenda",
+"Footer": "Rodap\u00e9",
+"Delete row": "Excluir linha",
+"Paste row before": "Colar linha antes",
+"Scope": "Escopo",
+"Delete table": "Excluir tabela",
+"H Align": "Alinhamento H",
+"Top": "Superior",
+"Header cell": "C\u00e9lula cabe\u00e7alho",
+"Column": "Coluna",
+"Row group": "Agrupar linha",
+"Cell": "C\u00e9lula",
+"Middle": "Meio",
+"Cell type": "Tipo de c\u00e9lula",
+"Copy row": "Copiar linha",
+"Row properties": "Propriedades da linha",
+"Table properties": "Propriedades da tabela",
+"Bottom": "Inferior",
+"V Align": "Alinhamento V",
+"Header": "Cabe\u00e7alho",
+"Right": "Direita",
+"Insert column after": "Inserir coluna depois",
+"Cols": "Colunas",
+"Insert row after": "Inserir linha depois",
+"Width": "Largura",
+"Cell properties": "Propriedades da c\u00e9lula",
+"Left": "Esquerdo",
+"Cut row": "Recortar linha",
+"Delete column": "Excluir coluna",
+"Center": "Centro",
+"Merge cells": "Agrupar c\u00e9lulas",
+"Insert template": "Inserir modelo",
+"Templates": "Modelos",
+"Background color": "Cor do fundo",
+"Custom...": "Personalizado...",
+"Custom color": "Cor personalizada",
+"No color": "Nenhuma cor",
+"Text color": "Cor do texto",
+"Table of Contents": "\u00edndice de Conte\u00fado",
+"Show blocks": "Mostrar blocos",
+"Show invisible characters": "Exibir caracteres invis\u00edveis",
+"Words: {0}": "Palavras: {0}",
+"Insert": "Inserir",
+"File": "Arquivo",
+"Edit": "Editar",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto formatado. Pressione ALT-F9 para exibir o menu, ALT-F10 para exibir a barra de ferramentas ou ALT-0 para exibir a ajuda",
+"Tools": "Ferramentas",
+"View": "Visualizar",
+"Table": "Tabela",
+"Format": "Formatar"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/pt-PT.js b/core/media/editors/tinymce/langs/pt-PT.js
new file mode 100644
index 00000000..6f73db03
--- /dev/null
+++ b/core/media/editors/tinymce/langs/pt-PT.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('pt-PT',{
+"Cut": "Cortar",
+"Heading 5": "T\u00edtulo 5",
+"Header 2": "Cabe\u00e7alho 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor use os atalhos Ctrl+X\/C\/V do seu teclado.",
+"Heading 4": "T\u00edtulo 4",
+"Div": "Div",
+"Heading 2": "T\u00edtulo 2",
+"Paste": "Colar",
+"Close": "Fechar",
+"Font Family": "Fonte",
+"Pre": "Pre",
+"Align right": "Alinhar \u00e0 direita",
+"New document": "Novo documento",
+"Blockquote": "Cita\u00e7\u00e3o em bloco",
+"Numbered list": "Lista numerada",
+"Heading 1": "T\u00edtulo 1",
+"Headings": "T\u00edtulos",
+"Increase indent": "Aumentar avan\u00e7o",
+"Formats": "Formatos",
+"Headers": "Cabe\u00e7alhos",
+"Select all": "Selecionar tudo",
+"Header 3": "Cabe\u00e7alho 3",
+"Blocks": "Blocos",
+"Undo": "Desfazer",
+"Strikethrough": "Rasurado",
+"Bullet list": "Lista com marcadores",
+"Header 1": "Cabe\u00e7alho 1",
+"Superscript": "Superior \u00e0 linha",
+"Clear formatting": "Limpar formata\u00e7\u00e3o",
+"Font Sizes": "Tamanhos",
+"Subscript": "Inferior \u00e0 linha",
+"Header 6": "Cabe\u00e7alho 6",
+"Redo": "Refazer",
+"Paragraph": "Par\u00e1grafo",
+"Ok": "Ok",
+"Bold": "Negrito",
+"Code": "C\u00f3digo",
+"Italic": "It\u00e1lico",
+"Align center": "Alinhar ao centro",
+"Header 5": "Cabe\u00e7alho 5",
+"Heading 6": "T\u00edtulo 6",
+"Heading 3": "T\u00edtulo 3",
+"Decrease indent": "Diminuir avan\u00e7o",
+"Header 4": "Cabe\u00e7alho 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 em modo de texto simples. O conte\u00fado ser\u00e1 colado como texto simples at\u00e9 desativar esta op\u00e7\u00e3o.",
+"Underline": "Sublinhado",
+"Cancel": "Cancelar",
+"Justify": "Justificado",
+"Inline": "Na linha",
+"Copy": "Copiar",
+"Align left": "Alinhar \u00e0 esquerda",
+"Visual aids": "Ajuda visual",
+"Lower Greek": "\\u03b1. \\u03b2. \\u03b3. ...",
+"Square": "Quadrado",
+"Default": "Padr\u00e3o",
+"Lower Alpha": "a. b. c. ...",
+"Circle": "C\u00edrculo",
+"Disc": "Disco",
+"Upper Alpha": "A. B. C. ...",
+"Upper Roman": "I. II. III. ...",
+"Lower Roman": "i. ii. iii. ...",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "O ID deve come\u00e7ar com uma letra, seguido por letras, n\u00fameros, tra\u00e7os, pontos, dois pontos ou sobtra\u00e7os.",
+"Name": "Nome",
+"Anchor": "\u00c2ncora",
+"Id": "ID",
+"You have unsaved changes are you sure you want to navigate away?": "Existem altera\u00e7\u00f5es que ainda n\u00e3o foram guardadas. Tem a certeza que pretende sair?",
+"Restore last draft": "Restaurar o \u00faltimo rascunho",
+"Special character": "Car\u00e1cter especial",
+"Source code": "C\u00f3digo fonte",
+"Language": "Idioma",
+"Insert\/Edit code sample": "Inserir\/editar amostra de c\u00f3digo",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Cor",
+"Right to left": "Da direita para a esquerda",
+"Left to right": "Da esquerda para a direita",
+"Emoticons": "Emo\u00e7\u00f5es",
+"Robots": "Rob\u00f4s",
+"Document properties": "Propriedades do documento",
+"Title": "T\u00edtulo",
+"Keywords": "Palavras-chave",
+"Encoding": "Codifica\u00e7\u00e3o",
+"Description": "Descri\u00e7\u00e3o",
+"Author": "Autor",
+"Fullscreen": "Ecr\u00e3 completo",
+"Horizontal line": "Linha horizontal",
+"Horizontal space": "Espa\u00e7amento horizontal",
+"Insert\/edit image": "Inserir\/editar imagem",
+"General": "Geral",
+"Advanced": "Avan\u00e7ado",
+"Source": "Localiza\u00e7\u00e3o",
+"Border": "Contorno",
+"Constrain proportions": "Manter propor\u00e7\u00f5es",
+"Vertical space": "Espa\u00e7amento vertical",
+"Image description": "Descri\u00e7\u00e3o da imagem",
+"Style": "Estilo",
+"Dimensions": "Dimens\u00f5es",
+"Insert image": "Inserir imagem",
+"Image": "Imagem",
+"Zoom in": "Mais zoom",
+"Contrast": "Contraste",
+"Back": "Voltar",
+"Gamma": "Gama",
+"Flip horizontally": "Inverter horizontalmente",
+"Resize": "Redimensionar",
+"Sharpen": "Mais nitidez",
+"Zoom out": "Menos zoom",
+"Image options": "Op\u00e7\u00f5es de imagem",
+"Apply": "Aplicar",
+"Brightness": "Brilho",
+"Rotate clockwise": "Rota\u00e7\u00e3o hor\u00e1ria",
+"Rotate counterclockwise": "Rota\u00e7\u00e3o anti-hor\u00e1ria",
+"Edit image": "Editar imagem",
+"Color levels": "N\u00edveis de cor",
+"Crop": "Recortar",
+"Orientation": "Orienta\u00e7\u00e3o",
+"Flip vertically": "Inverter verticalmente",
+"Invert": "Inverter",
+"Date\/time": "Data\/hora",
+"Insert date\/time": "Inserir data\/hora",
+"Remove link": "Remover liga\u00e7\u00e3o",
+"Url": "URL",
+"Text to display": "Texto a exibir",
+"Anchors": "\u00c2ncora",
+"Insert link": "Inserir liga\u00e7\u00e3o",
+"Link": "Liga\u00e7\u00e3o",
+"New window": "Nova janela",
+"None": "Nenhum",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "O URL que indicou parece ser um endere\u00e7o web. Quer adicionar o prefixo http:\/\/ tal como necess\u00e1rio?",
+"Paste or type a link": "Copiar ou escrever uma hiperliga\u00e7\u00e3o",
+"Target": "Alvo",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "O URL que indicou parece ser um endere\u00e7o de email. Quer adicionar o prefixo mailto: tal como necess\u00e1rio?",
+"Insert\/edit link": "Inserir\/editar liga\u00e7\u00e3o",
+"Insert\/edit video": "Inserir\/editar v\u00eddeo",
+"Media": "Media",
+"Alternative source": "Localiza\u00e7\u00e3o alternativa",
+"Paste your embed code below:": "Colar c\u00f3digo para embeber:",
+"Insert video": "Inserir v\u00eddeo",
+"Poster": "Autor",
+"Insert\/edit media": "Inserir\/editar media",
+"Embed": "Embeber",
+"Nonbreaking space": "Espa\u00e7o n\u00e3o quebr\u00e1vel",
+"Page break": "Quebra de p\u00e1gina",
+"Paste as text": "Colar como texto",
+"Preview": "Pr\u00e9-visualizar",
+"Print": "Imprimir",
+"Save": "Guardar",
+"Could not find the specified string.": "N\u00e3o foi poss\u00edvel localizar o termo especificado.",
+"Replace": "Substituir",
+"Next": "Pr\u00f3ximo",
+"Whole words": "Palavras completas",
+"Find and replace": "Pesquisar e substituir",
+"Replace with": "Substituir por",
+"Find": "Pesquisar",
+"Replace all": "Substituir tudo",
+"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
+"Prev": "Anterior",
+"Spellcheck": "Corretor ortogr\u00e1fico",
+"Finish": "Concluir",
+"Ignore all": "Ignorar tudo",
+"Ignore": "Ignorar",
+"Add to Dictionary": "Adicionar ao dicion\u00e1rio",
+"Insert row before": "Inserir linha antes",
+"Rows": "Linhas",
+"Height": "Altura",
+"Paste row after": "Colar linha depois",
+"Alignment": "Alinhamento",
+"Border color": "Cor de contorno",
+"Column group": "Agrupar coluna",
+"Row": "Linha",
+"Insert column before": "Inserir coluna antes",
+"Split cell": "Dividir c\u00e9lula",
+"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
+"Cell spacing": "Espa\u00e7amento entre c\u00e9lulas",
+"Row type": "Tipo de linha",
+"Insert table": "Inserir tabela",
+"Body": "Corpo",
+"Caption": "Legenda",
+"Footer": "Rodap\u00e9",
+"Delete row": "Eliminar linha",
+"Paste row before": "Colar linha antes",
+"Scope": "Escopo",
+"Delete table": "Eliminar tabela",
+"H Align": "Alinhamento H",
+"Top": "Superior",
+"Header cell": "C\u00e9lula de cabe\u00e7alho",
+"Column": "Coluna",
+"Row group": "Agrupar linha",
+"Cell": "C\u00e9lula",
+"Middle": "Meio",
+"Cell type": "Tipo de c\u00e9lula",
+"Copy row": "Copiar linha",
+"Row properties": "Propriedades da linha",
+"Table properties": "Propriedades da tabela",
+"Bottom": "Inferior",
+"V Align": "Alinhamento V",
+"Header": "Cabe\u00e7alho",
+"Right": "Direita",
+"Insert column after": "Inserir coluna depois",
+"Cols": "Colunas",
+"Insert row after": "Inserir linha depois",
+"Width": "Largura",
+"Cell properties": "Propriedades da c\u00e9lula",
+"Left": "Esquerda",
+"Cut row": "Cortar linha",
+"Delete column": "Eliminar coluna",
+"Center": "Centro",
+"Merge cells": "Unir c\u00e9lulas",
+"Insert template": "Inserir modelo",
+"Templates": "Modelos",
+"Background color": "Cor de fundo",
+"Custom...": "Personalizada...",
+"Custom color": "Cor personalizada",
+"No color": "Sem cor",
+"Text color": "Cor do texto",
+"Table of Contents": "\u00cdndice",
+"Show blocks": "Mostrar blocos",
+"Show invisible characters": "Mostrar caracteres invis\u00edveis",
+"Words: {0}": "Palavras: {0}",
+"Insert": "Inserir",
+"File": "Ficheiro",
+"Edit": "Editar",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Caixa de texto formatado. Pressione ALT-F9 para exibir o menu. Pressione ALT-F10 para exibir a barra de ferramentas. Pressione ALT-0 para exibir a ajuda",
+"Tools": "Ferramentas",
+"View": "Ver",
+"Table": "Tabela",
+"Format": "Formatar"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/readme.md b/core/media/editors/tinymce/langs/readme.md
new file mode 100644
index 00000000..a52bf03f
--- /dev/null
+++ b/core/media/editors/tinymce/langs/readme.md
@@ -0,0 +1,3 @@
+This is where language files should be placed.
+
+Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/
diff --git a/core/media/editors/tinymce/langs/ro.js b/core/media/editors/tinymce/langs/ro.js
new file mode 100644
index 00000000..367b3e25
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ro.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('ro',{
+"Cut": "Decupeaz\u0103",
+"Header 2": "Antet 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browserul dumneavoastr\u0103 nu support\u0103 acces direct la clipboard. Folosi\u0163i combina\u0163ile de tastatur\u0103 Ctrl+X\/C\/V.",
+"Div": "Div",
+"Paste": "Lipe\u015fte",
+"Close": "\u00cenchide",
+"Font Family": "Font",
+"Pre": "Pre",
+"Align right": "Aliniere la dreapta",
+"New document": "Document nou",
+"Blockquote": "Men\u0163iune bloc",
+"Numbered list": "List\u0103 ordonat\u0103",
+"Increase indent": "Indenteaz\u0103",
+"Formats": "Formate",
+"Headers": "Antete",
+"Select all": "Selecteaz\u0103 tot",
+"Header 3": "Antet 3",
+"Blocks": "Blocuri",
+"Undo": "Reexecut\u0103",
+"Strikethrough": "T\u0103iat",
+"Bullet list": "List\u0103 neordonat\u0103",
+"Header 1": "Antet 1",
+"Superscript": "Superscript",
+"Clear formatting": "\u015eterge format\u0103rile",
+"Font Sizes": "Dimensiune font",
+"Subscript": "Subscript",
+"Header 6": "Antet 6",
+"Redo": "Dezexecut\u0103",
+"Paragraph": "Paragraf",
+"Ok": "Ok",
+"Bold": "\u00cengro\u015fat",
+"Code": "Cod",
+"Italic": "Italic",
+"Align center": "Centrare",
+"Header 5": "Antet 5",
+"Decrease indent": "De-indenteaz\u0103",
+"Header 4": "Antet 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Functia \"lipe\u015fte\" este acum \u00een modul text simplu. Continutul va fi acum inserat ca text simplu p\u00e2n\u0103 c\u00e2nd aceast\u0103 op\u021biune va fi dezactivat.",
+"Underline": "Subliniat",
+"Cancel": "Anuleaz\u0103",
+"Justify": "Aliniere pe toat\u0103 l\u0103\u021bimea",
+"Inline": "Inline",
+"Copy": "Copiaz\u0103",
+"Align left": "Aliniere la st\u00e2nga",
+"Visual aids": "Ajutor vizual",
+"Lower Greek": "Minuscule Grecesti",
+"Square": "P\u0103trat",
+"Default": "Implicit",
+"Lower Alpha": "Minuscule Alfanumerice",
+"Circle": "Cerc",
+"Disc": "Disc",
+"Upper Alpha": "Majuscule Alfanumerice",
+"Upper Roman": "Majuscule Romane",
+"Lower Roman": "Minuscule Romane",
+"Name": "Nume",
+"Anchor": "Ancor\u0103",
+"You have unsaved changes are you sure you want to navigate away?": "Ave\u021bi modific\u0103ri nesalvate! Sunte\u0163i sigur c\u0103 dori\u0163i s\u0103 ie\u015fiti?",
+"Restore last draft": "Restaurare la ultima salvare",
+"Special character": "Caractere speciale",
+"Source code": "Codul surs\u0103",
+"Right to left": "Dreapta la st\u00e2nga",
+"Left to right": "St\u00e2nga la dreapta",
+"Emoticons": "Emoticoane",
+"Robots": "Robo\u021bi",
+"Document properties": "Propriet\u0103\u021bi document",
+"Title": "Titlu",
+"Keywords": "Cuvinte cheie",
+"Encoding": "Codare",
+"Description": "Descriere",
+"Author": "Autor",
+"Fullscreen": "Pe tot ecranul",
+"Horizontal line": "Linie orizontal\u0103",
+"Horizontal space": "Spa\u021biul orizontal",
+"Insert\/edit image": "Inserare\/editarea imaginilor",
+"General": "General",
+"Advanced": "Avansat",
+"Source": "Surs\u0103",
+"Border": "Bordur\u0103",
+"Constrain proportions": "Constr\u00e2nge propor\u021biile",
+"Vertical space": "Spa\u021biul vertical",
+"Image description": "Descrierea imaginii",
+"Style": "Stil",
+"Dimensions": "Dimensiuni",
+"Insert image": "Inserare imagine",
+"Insert date\/time": "Insereaz\u0103 data\/ora",
+"Remove link": "\u0218terge link-ul",
+"Url": "Url",
+"Text to display": "Text de afi\u0219at",
+"Anchors": "Ancor\u0103",
+"Insert link": "Inserare link",
+"New window": "Fereastr\u0103 nou\u0103",
+"None": "Nici unul",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u021aint\u0103",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Inserare\/editare link",
+"Insert\/edit video": "Inserare\/editare video",
+"Poster": "Poster",
+"Alternative source": "Surs\u0103 alternativ\u0103",
+"Paste your embed code below:": "Insera\u021bi codul:",
+"Insert video": "Inserare video",
+"Embed": "Embed",
+"Nonbreaking space": "Spa\u021biu neseparator",
+"Page break": "\u00centrerupere de pagin\u0103",
+"Paste as text": "Lipe\u015fte ca text",
+"Preview": "Previzualizare",
+"Print": "Tip\u0103re\u0219te",
+"Save": "Salveaz\u0103",
+"Could not find the specified string.": "Nu am putut g\u0103si \u0219irul specificat.",
+"Replace": "\u00cenlocuie\u015fte",
+"Next": "Precedent",
+"Whole words": "Doar cuv\u00eentul \u00eentreg",
+"Find and replace": "Caut\u0103 \u015fi \u00eenlocuie\u015fte",
+"Replace with": "\u00cenlocuie\u015fte cu",
+"Find": "Caut\u0103",
+"Replace all": "\u00cenlocuie\u015fte toate",
+"Match case": "Distinge majuscule\/minuscule",
+"Prev": "Anterior",
+"Spellcheck": "Verificarea ortografic\u0103",
+"Finish": "Finalizeaz\u0103",
+"Ignore all": "Ignor\u0103 toate",
+"Ignore": "Ignor\u0103",
+"Insert row before": "Insereaz\u0103 \u00eenainte de linie",
+"Rows": "Linii",
+"Height": "\u00cen\u0103l\u0163ime",
+"Paste row after": "Lipe\u015fte linie dup\u0103",
+"Alignment": "Aliniament",
+"Column group": "Grup de coloane",
+"Row": "Linie",
+"Insert column before": "Insereaza \u00eenainte de coloan\u0103",
+"Split cell": "\u00cemp\u0103r\u021birea celulelor",
+"Cell padding": "Spa\u021biere",
+"Cell spacing": "Spa\u021biere celule",
+"Row type": "Tip de linie",
+"Insert table": "Insereaz\u0103 tabel\u0103",
+"Body": "Corp",
+"Caption": "Titlu",
+"Footer": "Subsol",
+"Delete row": "\u0218terge linia",
+"Paste row before": "Lipe\u015fte \u00eenainte de linie",
+"Scope": "Domeniu",
+"Delete table": "\u0218terge tabel\u0103",
+"Header cell": "Antet celul\u0103",
+"Column": "Coloan\u0103",
+"Cell": "Celul\u0103",
+"Header": "Antet",
+"Cell type": "Tip celul\u0103",
+"Copy row": "Copiaz\u0103 linie",
+"Row properties": "Propriet\u0103\u021bi linie",
+"Table properties": "Propriet\u0103\u021bi tabel\u0103",
+"Row group": "Grup de linii",
+"Right": "Dreapta",
+"Insert column after": "Insereaza dup\u0103 coloan\u0103",
+"Cols": "Coloane",
+"Insert row after": "Insereaz\u0103 dup\u0103 linie",
+"Width": "L\u0103\u0163ime",
+"Cell properties": "Propriet\u0103\u021bi celul\u0103",
+"Left": "St\u00e2nga",
+"Cut row": "Taie linie",
+"Delete column": "\u0218terge coloana",
+"Center": "Centru",
+"Merge cells": "\u00cembinarea celulelor",
+"Insert template": "Insereaz\u0103 \u0219ablon",
+"Templates": "\u015eabloane",
+"Background color": "Culoare fundal",
+"Text color": "Culoare text",
+"Show blocks": "Afi\u0219are blocuri",
+"Show invisible characters": "Afi\u0219are caractere invizibile",
+"Words: {0}": "Cuvinte: {0}",
+"Insert": "Insereaz\u0103",
+"File": "Fil\u0103",
+"Edit": "Editeaz\u0103",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zon\u0103 cu Rich Text. Apas\u0103 ALT-F9 pentru meniu. Apas\u0103 ALT-F10 pentru bara de unelte. Apas\u0103 ALT-0 pentru ajutor",
+"Tools": "Unelte",
+"View": "Vezi",
+"Table": "Tabel\u0103",
+"Format": "Formateaz\u0103"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ru.js b/core/media/editors/tinymce/langs/ru.js
new file mode 100644
index 00000000..39751879
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ru.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('ru',{
+"Cut": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c",
+"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
+"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043f\u0440\u044f\u043c\u043e\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0435\u043d\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f \u043a\u043b\u0430\u0432\u0438\u0448: Ctrl+X\/C\/V.",
+"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
+"Div": "\u0411\u043b\u043e\u043a",
+"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
+"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
+"Close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
+"Font Family": "\u0428\u0440\u0438\u0444\u0442",
+"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
+"Align right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"New document": "\u041d\u043e\u0432\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
+"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
+"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
+"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
+"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
+"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442",
+"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
+"Select all": "\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435",
+"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
+"Blocks": "\u0411\u043b\u043e\u043a\u0438",
+"Undo": "\u0412\u0435\u0440\u043d\u0443\u0442\u044c",
+"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
+"Bullet list": "\u041c\u0430\u0440\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
+"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
+"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0438\u0439 \u0438\u043d\u0434\u0435\u043a\u0441",
+"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442",
+"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u0448\u0440\u0438\u0444\u0442\u0430",
+"Subscript": "\u041d\u0438\u0436\u043d\u0438\u0439 \u0438\u043d\u0434\u0435\u043a\u0441",
+"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
+"Redo": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
+"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
+"Ok": "\u041e\u043a",
+"Bold": "\u041f\u043e\u043b\u0443\u0436\u0438\u0440\u043d\u044b\u0439",
+"Code": "\u041a\u043e\u0434",
+"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
+"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
+"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
+"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
+"Decrease indent": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
+"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u043e\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432 \u0432\u0438\u0434\u0435 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0430, \u043f\u043e\u043a\u0430 \u043d\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u043e\u043f\u0446\u0438\u044e.",
+"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
+"Cancel": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
+"Justify": "\u041f\u043e \u0448\u0438\u0440\u0438\u043d\u0435",
+"Inline": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435",
+"Copy": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+"Align left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Visual aids": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
+"Lower Greek": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u0433\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
+"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
+"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439",
+"Lower Alpha": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
+"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0438",
+"Disc": "\u041a\u0440\u0443\u0433\u0438",
+"Upper Alpha": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
+"Upper Roman": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u0440\u0438\u043c\u0441\u043a\u0438\u0435 \u0446\u0438\u0444\u0440\u044b",
+"Lower Roman": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u0440\u0438\u043c\u0441\u043a\u0438\u0435 \u0446\u0438\u0444\u0440\u044b",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0434\u043e\u043b\u0436\u0435\u043d \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 \u0431\u0443\u043a\u0432\u044b, \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u0431\u0443\u043a\u0432\u044b, \u0446\u0438\u0444\u0440\u044b, \u0442\u0438\u0440\u0435, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u044f \u0438\u043b\u0438 \u043f\u043e\u0434\u0447\u0435\u0440\u043a\u0438\u0432\u0430\u043d\u0438\u044f.",
+"Name": "\u0418\u043c\u044f",
+"Anchor": "\u042f\u043a\u043e\u0440\u044c",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043d\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f. \u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0439\u0442\u0438?",
+"Restore last draft": "\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430",
+"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
+"Source code": "\u0418\u0441\u0445\u043e\u0434\u043d\u044b\u0439 \u043a\u043e\u0434",
+"Language": "\u042f\u0437\u044b\u043a",
+"Insert\/Edit code sample": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c\/\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u0440 \u043a\u043e\u0434\u0430",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u0426\u0432\u0435\u0442",
+"Right to left": "\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e",
+"Left to right": "\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
+"Emoticons": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u043c\u0430\u0439\u043b",
+"Robots": "\u0420\u043e\u0431\u043e\u0442\u044b",
+"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Keywords": "\u041a\u043b\u044e\u0447\u0438\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430",
+"Encoding": "\u041a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430",
+"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Author": "\u0410\u0432\u0442\u043e\u0440",
+"Fullscreen": "\u041f\u043e\u043b\u043d\u043e\u044d\u043a\u0440\u0430\u043d\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c",
+"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0438\u043d\u0438\u044f",
+"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
+"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"General": "\u041e\u0431\u0449\u0435\u0435",
+"Advanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435",
+"Source": "\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
+"Border": "\u0420\u0430\u043c\u043a\u0430",
+"Constrain proportions": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
+"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
+"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
+"Style": "\u0421\u0442\u0438\u043b\u044c",
+"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
+"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Image": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
+"Zoom in": "\u041f\u0440\u0438\u0431\u043b\u0438\u0437\u0438\u0442\u044c",
+"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
+"Back": "\u041d\u0430\u0437\u0430\u0434",
+"Gamma": "\u0413\u0430\u043c\u043c\u0430",
+"Flip horizontally": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0438",
+"Resize": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0440",
+"Sharpen": "\u0427\u0435\u0442\u043a\u043e\u0441\u0442\u044c",
+"Zoom out": "\u041e\u0442\u0434\u0430\u043b\u0438\u0442\u044c",
+"Image options": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
+"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c",
+"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c",
+"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0435",
+"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u0440\u043e\u0442\u0438\u0432 \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0438",
+"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Color levels": "\u0426\u0432\u0435\u0442\u043e\u0432\u044b\u0435 \u0443\u0440\u043e\u0432\u043d\u0438",
+"Crop": "\u041e\u0431\u0440\u0435\u0437\u0430\u0442\u044c",
+"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
+"Flip vertically": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0438",
+"Invert": "\u0418\u043d\u0432\u0435\u0440\u0441\u0438\u044f",
+"Date\/time": "\u0414\u0430\u0442\u0430\/\u0432\u0440\u0435\u043c\u044f",
+"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0434\u0430\u0442\u0443\/\u0432\u0440\u0435\u043c\u044f",
+"Remove link": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"Url": "\u0410\u0434\u0440\u0435\u0441 \u0441\u0441\u044b\u043b\u043a\u0438",
+"Text to display": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0439 \u0442\u0435\u043a\u0441\u0442",
+"Anchors": "\u042f\u043a\u043e\u0440\u044f",
+"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"Link": "\u0421\u0441\u044b\u043b\u043a\u0430",
+"New window": "\u0412 \u043d\u043e\u0432\u043e\u043c \u043e\u043a\u043d\u0435",
+"None": "\u041d\u0435\u0442",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abhttp:\/\/\u00bb?",
+"Paste or type a link": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043b\u0438 \u0432\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0441\u0441\u044b\u043b\u043a\u0443",
+"Target": "\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abmailto:\u00bb?",
+"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
+"Media": "\u0412\u0438\u0434\u0435\u043e",
+"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
+"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0435:",
+"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
+"Poster": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
+"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
+"Nonbreaking space": "\u041d\u0435\u0440\u0430\u0437\u0440\u044b\u0432\u043d\u044b\u0439 \u043f\u0440\u043e\u0431\u0435\u043b",
+"Page break": "\u0420\u0430\u0437\u0440\u044b\u0432 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b",
+"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043a\u0430\u043a \u0442\u0435\u043a\u0441\u0442",
+"Preview": "\u041f\u0440\u0435\u0434\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",
+"Print": "\u041f\u0435\u0447\u0430\u0442\u044c",
+"Save": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c",
+"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u043d\u043d\u0430\u044f \u0441\u0442\u0440\u043e\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430",
+"Replace": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c",
+"Next": "\u0412\u043d\u0438\u0437",
+"Whole words": "\u0421\u043b\u043e\u0432\u043e \u0446\u0435\u043b\u0438\u043a\u043e\u043c",
+"Find and replace": "\u041f\u043e\u0438\u0441\u043a \u0438 \u0437\u0430\u043c\u0435\u043d\u0430",
+"Replace with": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430",
+"Find": "\u041d\u0430\u0439\u0442\u0438",
+"Replace all": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435",
+"Match case": "\u0423\u0447\u0438\u0442\u044b\u0432\u0430\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
+"Prev": "\u0412\u0432\u0435\u0440\u0445",
+"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Finish": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u0442\u044c",
+"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435",
+"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u044c",
+"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
+"Rows": "\u0421\u0442\u0440\u043e\u043a\u0438",
+"Height": "\u0412\u044b\u0441\u043e\u0442\u0430",
+"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
+"Alignment": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"Border color": "\u0426\u0432\u0435\u0442 \u0440\u0430\u043c\u043a\u0438",
+"Column group": "\u0413\u0440\u0443\u043f\u043f\u0430 \u043a\u043e\u043b\u043e\u043d\u043e\u043a",
+"Row": "\u0421\u0442\u0440\u043e\u043a\u0430",
+"Insert column before": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0441\u043b\u0435\u0432\u0430",
+"Split cell": "\u0420\u0430\u0437\u0431\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0443",
+"Cell padding": "\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0439 \u043e\u0442\u0441\u0442\u0443\u043f",
+"Cell spacing": "\u0412\u043d\u0435\u0448\u043d\u0438\u0439 \u043e\u0442\u0441\u0442\u0443\u043f",
+"Row type": "\u0422\u0438\u043f \u0441\u0442\u0440\u043e\u043a\u0438",
+"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
+"Body": "\u0422\u0435\u043b\u043e",
+"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Footer": "\u041d\u0438\u0437",
+"Delete row": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
+"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
+"Scope": "Scope",
+"Delete table": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
+"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u0443",
+"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Column": "\u0421\u0442\u043e\u043b\u0431\u0435\u0446",
+"Row group": "\u0413\u0440\u0443\u043f\u043f\u0430 \u0441\u0442\u0440\u043e\u043a",
+"Cell": "\u042f\u0447\u0435\u0439\u043a\u0430",
+"Middle": "\u041f\u043e \u0441\u0435\u0440\u0435\u0434\u0438\u043d\u0435",
+"Cell type": "\u0422\u0438\u043f \u044f\u0447\u0435\u0439\u043a\u0438",
+"Copy row": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
+"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u0442\u0440\u043e\u043a\u0438",
+"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u044b",
+"Bottom": "\u041f\u043e \u043d\u0438\u0437\u0443",
+"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"Header": "\u0428\u0430\u043f\u043a\u0430",
+"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Insert column after": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0441\u043f\u0440\u0430\u0432\u0430",
+"Cols": "\u0421\u0442\u043e\u043b\u0431\u0446\u044b",
+"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
+"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
+"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u0435\u0439\u043a\u0438",
+"Left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Cut row": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
+"Delete column": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446",
+"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Merge cells": "\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
+"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
+"Background color": "\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430",
+"Custom...": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u2026",
+"Custom color": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0446\u0432\u0435\u0442",
+"No color": "\u0411\u0435\u0437 \u0446\u0432\u0435\u0442\u0430",
+"Text color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430",
+"Table of Contents": "\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435",
+"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0431\u043b\u043e\u043a\u0438",
+"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
+"Words: {0}": "\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0441\u043b\u043e\u0432: {0}",
+"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
+"File": "\u0424\u0430\u0439\u043b",
+"Edit": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-F9 \u0447\u0442\u043e\u0431\u044b \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432, ALT-0 \u0434\u043b\u044f \u0432\u044b\u0437\u043e\u0432\u0430 \u043f\u043e\u043c\u043e\u0449\u0438.",
+"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b",
+"View": "\u0412\u0438\u0434",
+"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
+"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
+});
diff --git a/core/media/editors/tinymce/langs/si-LK.js b/core/media/editors/tinymce/langs/si-LK.js
new file mode 100644
index 00000000..3f37cb8b
--- /dev/null
+++ b/core/media/editors/tinymce/langs/si-LK.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('si-LK',{
+"Cut": "\u0d9a\u0db4\u0db1\u0dca\u0db1",
+"Header 2": "Header 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0d9c\u0dca\u200d\u0dbb\u0dcf\u0dc4\u0d9a \u0db4\u0dd4\u0dc0\u0dbb\u0dd4\u0dc0\u0da7 \u0d8d\u0da2\u0dd4 \u0db4\u0dca\u200d\u0dbb\u0dc0\u0dda\u0dc1\u0dba\u0d9a\u0dca \u0dbd\u0db6\u0dcf\u0daf\u0dd3\u0db8\u0da7 \u0d94\u0db6\u0d9c\u0dda \u0db6\u0dca\u200d\u0dbb\u0dc0\u0dd4\u0dc3\u0dbb\u0dba \u0dc3\u0dc4\u0dba\u0d9a\u0dca \u0db1\u0ddc\u0daf\u0d9a\u0dca\u0dc0\u0dba\u0dd3. \u0d9a\u0dbb\u0dd4\u0dab\u0dcf\u0d9a\u0dbb \u0d92\u0dc0\u0dd9\u0db1\u0dd4\u0dc0\u0da7 Ctrl+X\/C\/V \u0dba\u0db1 \u0dba\u0dad\u0dd4\u0dbb\u0dd4\u0db4\u0dd4\u0dc0\u0dbb\u0dd4 \u0d9a\u0dd9\u0da7\u0dd2\u0db8\u0d9f \u0db7\u0dcf\u0dc0\u0dd2\u0dad\u0dcf \u0d9a\u0dbb\u0db1\u0dca\u0db1.",
+"Div": "Div",
+"Paste": "\u0d85\u0dbd\u0dc0\u0db1\u0dca\u0db1",
+"Close": "\u0dc0\u0dc3\u0db1\u0dca\u0db1",
+"Font Family": "Font Family",
+"Pre": "Pre",
+"Align right": "\u0daf\u0d9a\u0dd4\u0dab\u0dd4\u0db4\u0dc3\u0da7 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"New document": "\u0db1\u0dc0 \u0dbd\u0dda\u0d9b\u0db1\u0dba\u0d9a\u0dca",
+"Blockquote": "Blockquote",
+"Numbered list": "\u0d85\u0d82\u0d9a\u0db1\u0dba \u0d9a\u0dbd \u0dbd\u0dd0\u0dba\u0dd2\u0dc3\u0dca\u0dad\u0dd4\u0dc0",
+"Increase indent": "\u0dc0\u0dd0\u0da9\u0dd2\u0dc0\u0db1 \u0d91\u0db6\u0dd4\u0db8",
+"Formats": "\u0d86\u0d9a\u0dd8\u0dad\u0dd2",
+"Headers": "Headers",
+"Select all": "\u0dc3\u0dd2\u0dba\u0dbd\u0dca\u0dbd \u0dad\u0ddd\u0dbb\u0db1\u0dca\u0db1",
+"Header 3": "Header 3",
+"Blocks": "Blocks",
+"Undo": "\u0db1\u0dd2\u0dc2\u0dca\u0db4\u0dca\u200d\u0dbb\u0db7\u0dcf \u0d9a\u0dbb\u0db1\u0dc0\u0dcf",
+"Strikethrough": "\u0db8\u0dd0\u0daf\u0dd2 \u0d89\u0dbb\u0dd0\u0dad\u0dd2",
+"Bullet list": "\u0dbd\u0dd0\u0dba\u0dd2\u0dc3\u0dca\u0dad\u0dd4\u0dc0",
+"Header 1": "Header 1",
+"Superscript": "\u0d8b\u0da9\u0dd4\u0dbd\u0d9a\u0dd4\u0dab\u0dd4",
+"Clear formatting": "\u0db4\u0dd0\u0dc4\u0dd0\u0daf\u0dd2\u0dbd\u0dd2 \u0d86\u0d9a\u0dd8\u0dad\u0dd2\u0d9a\u0dbb\u0dab\u0dba",
+"Font Sizes": "Font Sizes",
+"Subscript": "\u0dba\u0da7\u0dd2\u0dbd\u0d9a\u0dd4\u0dab\u0dd4",
+"Header 6": "Header 6",
+"Redo": "\t\u0db1\u0dd0\u0dc0\u0dad \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Paragraph": "Paragraph",
+"Ok": "\u0d85\u0db1\u0dd4\u0db8\u0dad \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Bold": "\u0db4\u0dd0\u0dc4\u0dd0\u0daf\u0dd2\u0dbd\u0dd2 \u0dc3\u0dda \u0db4\u0dd9\u0db1\u0dd9\u0db1",
+"Code": "Code",
+"Italic": "\u0d87\u0dbd\u0d9a\u0dd4\u0dbb\u0dd4",
+"Align center": "\u0db8\u0dd0\u0daf\u0dd2 \u0d9a\u0ddc\u0da7 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"Header 5": "Header 5",
+"Decrease indent": "\u0d85\u0da9\u0dd4\u0dc0\u0db1 \u0d91\u0db6\u0dd4\u0db8",
+"Header 4": "Header 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
+"Underline": "\u0dba\u0da7\u0dd2\u0db1\u0dca \u0d89\u0dbb\u0d9a\u0dca \u0d85\u0db3\u0dd2\u0db1\u0dca\u0db1",
+"Cancel": "\u0d85\u0dc4\u0ddd\u0dc3\u0dd2 \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Justify": "\u0dc3\u0db8\u0dc0 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"Inline": "Inline",
+"Copy": "\u0db4\u0dd2\u0da7\u0db4\u0dad\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Align left": "\u0dc0\u0db8\u0dca\u0db4\u0dc3\u0da7 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"Visual aids": "\u0daf\u0dd8\u0dc1\u0dca\u200d\u0dba\u0dcf\u0db0\u0dcf\u0dbb",
+"Lower Greek": "\u0d9a\u0dd4\u0da9\u0dcf \u0d9c\u0dca\u200d\u0dbb\u0dd3\u0d9a ",
+"Square": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0",
+"Default": "\u0db4\u0dd9\u0dbb\u0db1\u0dd2\u0db8\u0dd2\u0dba ",
+"Lower Alpha": "\u0d9a\u0dd4\u0da9\u0dcf \u0d87\u0dbd\u0dca\u0dc6\u0dcf ",
+"Circle": "\u0dc0\u0d9a\u0dca\u200d\u0dbb\u0dba",
+"Disc": "\u0dad\u0dd0\u0da7\u0dd2\u0dba ",
+"Upper Alpha": "\u0dc0\u0dd2\u0dc1\u0dcf\u0dbd \u0d87\u0dbd\u0dca\u0dc6\u0dcf ",
+"Upper Roman": "\u0dc0\u0dd2\u0dc1\u0dcf\u0dbd \u0dbb\u0ddd\u0db8\u0dcf\u0db1\u0dd4 ",
+"Lower Roman": "\u0d9a\u0dd4\u0da9\u0dcf \u0dbb\u0ddd\u0db8\u0dcf\u0db1\u0dd4 ",
+"Name": "\u0db1\u0dcf\u0db8\u0dba ",
+"Anchor": "\u0d87\u0db1\u0dca\u0d9a\u0dbb\u0dba",
+"You have unsaved changes are you sure you want to navigate away?": "\u0d94\u0db6\u0d9c\u0dda \u0dc3\u0dd4\u0dbb\u0d9a\u0dd2\u0db1 \u0db1\u0ddc\u0dbd\u0daf \u0dc0\u0dd9\u0db1\u0dc3\u0dca\u0d9a\u0dd2\u0dbb\u0dd3\u0db8\u0dca \u0d87\u0dad,\u0d94\u0db6\u0da7 \u0dc0\u0dd2\u0dc1\u0dca\u0dc0\u0dcf\u0dc3\u0daf \u0d89\u0dc0\u0dad\u0da7 \u0dba\u0dcf\u0dba\u0dd4\u0dad\u0dd4\u0dba\u0dd2 \u0d9a\u0dd2\u0dba\u0dcf?",
+"Restore last draft": "\u0d85\u0dc0\u0dc3\u0dcf\u0db1\u0dba\u0da7 \u0db7\u0dcf\u0dc0\u0dd2\u0dad\u0dcf\u0d9a\u0dc5 \u0d9a\u0dd9\u0da7\u0dd4\u0db8\u0dca\u0db4\u0dad \u0db4\u0dd2\u0dc5\u0dd2\u0db1\u0d9c\u0db1\u0dca\u0db1 ",
+"Special character": "\u0dc0\u0dd2\u0dc1\u0dda\u0dc2 \u0d85\u0db1\u0dd4\u0dbd\u0d9a\u0dd4\u0dab ",
+"Source code": "\u0db8\u0dd6\u0dbd \u0d9a\u0dda\u0dad\u0dba ",
+"Right to left": "\u0daf\u0d9a\u0dd4\u0dab\u0dd4\u0db4\u0dc3 \u0dc3\u0dd2\u0da7 \u0dc0\u0db8\u0dca\u0db4\u0dc3\u0da7 ",
+"Left to right": "\u0dc0\u0db8\u0dca\u0db4\u0dc3 \u0dc3\u0dd2\u0da7 \u0daf\u0d9a\u0dd4\u0db1\u0dd4\u0db4\u0dc3\u0da7 ",
+"Emoticons": "\u0db7\u0dcf\u0dc0 \u0db1\u0dd2\u0dbb\u0dd4\u0db4\u0d9a",
+"Robots": "\u0dbb\u0ddc\u0db6\u0ddd",
+"Document properties": "\u0dbd\u0dda\u0d9b\u0db1\u0dba\u0dda \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
+"Title": "\u0db8\u0dcf\u0dad\u0dd8\u0d9a\u0dcf\u0dc0",
+"Keywords": "\u0db8\u0dd6\u0dbd \u0db4\u0daf\u0dba ",
+"Encoding": "\u0d9a\u0dda\u0dad\u0db1\u0dba",
+"Description": "\u0dc0\u0dd2\u0dc3\u0dca\u0dad\u0dbb\u0dba ",
+"Author": "\u0d9a\u0dad\u0dd8 ",
+"Fullscreen": "\u0db4\u0dd6\u0dbb\u0dca\u0dab \u0dad\u0dd2\u0dbb\u0dba ",
+"Horizontal line": "\u0dad\u0dd2\u0dbb\u0dc3\u0dca \u0d89\u0dbb  ",
+"Horizontal space": "\u0dad\u0dd2\u0dbb\u0dc3\u0dca \u0dc4\u0dd2\u0dc3\u0dca \u0d89\u0da9",
+"Insert\/edit image": "\u0db4\u0dd2\u0db1\u0dca\u0dad\u0dd4\u0dbb\u0dba \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 \/ \u0dc3\u0d9a\u0dc3\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
+"General": "\u0db4\u0ddc\u0daf\u0dd4",
+"Advanced": "\u0db4\u0dca\u200d\u0dbb\u0d9c\u0dad",
+"Source": "\u0db8\u0dd6\u0dbd\u0dba  ",
+"Border": "\u0dc3\u0dd3\u0db8\u0dcf\u0dc0 ",
+"Constrain proportions": "\u0dc3\u0d82\u0dbb\u0ddd\u0daf\u0d9a \u0db4\u0dca\u200d\u0dbb\u0db8\u0dcf\u0dab\u0db1",
+"Vertical space": "\u0dc3\u0dd2\u0dbb\u0dc3\u0dca \u0dc4\u0dd2\u0dc3\u0dca \u0d89\u0da9",
+"Image description": "\u0db4\u0dd2\u0db1\u0dca\u0dad\u0dd4\u0dbb\u0dba\u0dda \u0dc0\u0dd2\u0dc3\u0dca\u0dad\u0dbb\u0dba ",
+"Style": "\u0dc0\u0dd2\u0dbd\u0dcf\u0dc3\u0dba",
+"Dimensions": "\u0db8\u0dcf\u0db1",
+"Insert image": "Insert image",
+"Insert date\/time": "\u0daf\u0dd2\u0db1\u0dba \/ \u0dc0\u0dda\u0dbd\u0dcf\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Remove link": "Remove link",
+"Url": "Url",
+"Text to display": "\u0db4\u0dd9\u0dc5 - \u0dc3\u0d82\u0daf\u0dbb\u0dca\u0dc1\u0d9a\u0dba",
+"Anchors": "Anchors",
+"Insert link": "\u0dc3\u0db6\u0dd0\u0db3\u0dd2\u0dba \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"New window": "\u0db1\u0dc0 \u0d9a\u0dc0\u0dd4\u0dc5\u0dd4\u0dc0\u0d9a\u0dca",
+"None": "\u0d9a\u0dd2\u0dc3\u0dd2\u0dc0\u0d9a\u0dca \u0db1\u0dd0\u0dad",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u0d89\u0dbd\u0d9a\u0dca\u0d9a\u0dba",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\u0dc3\u0db6\u0dd0\u0db3\u0dd2\u0dba \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 \/ \u0dc0\u0dd9\u0db1\u0dc3\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Insert\/edit video": "\u0dc0\u0dd3\u0da9\u0dd2\u0dba\u0ddd\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 \/ \u0dc0\u0dd9\u0db1\u0dc3\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Poster": "\u0db4\u0ddd\u0dc3\u0dca\u0da7\u0dbb\u0dba",
+"Alternative source": "\u0dc0\u0dd2\u0d9a\u0dbd\u0dca\u0db4 \u0db8\u0dd6\u0dbd\u0dba",
+"Paste your embed code below:": "\u0d94\u0db6\u0d9c\u0dda \u0d9a\u0dcf\u0dc0\u0dd0\u0daf\u0dca\u0daf\u0dd6 \u0d9a\u0dda\u0dad\u0dba \u0db4\u0dc4\u0dad\u0dd2\u0db1\u0dca \u0daf\u0db8\u0db1\u0dca\u0db1",
+"Insert video": "\u0dc0\u0dd3\u0da9\u0dd2\u0dba\u0ddd\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Embed": "\u0d9a\u0dcf\u0dc0\u0daf\u0dca\u0daf\u0db1\u0dca\u0db1",
+"Nonbreaking space": "\u0db1\u0ddc\u0d9a\u0dd0\u0da9\u0dd4\u0dab\u0dd4 \u0dc4\u0dd2\u0dc3\u0dca \u0d89\u0dbb",
+"Page break": "\u0db4\u0dd2\u0da7\u0dd4 \u0d9a\u0da9\u0db1\u0dba",
+"Paste as text": "Paste as text",
+"Preview": "\u0db4\u0dd9\u0dbb\u0daf\u0dc3\u0dd4\u0db1",
+"Print": "\u0db8\u0dd4\u0daf\u0dca\u200d\u0dbb\u0dab\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Save": "\u0dc3\u0dd4\u0dbb\u0d9a\u0dd2\u0db1\u0dca\u0db1",
+"Could not find the specified string.": "\u0db1\u0dd2\u0dbb\u0dd6\u0db4\u0dd2\u0dad \u0d85\u0db1\u0dd4\u0dbd\u0d9a\u0dd4\u0dab\u0dd4 \u0dc0\u0dd0\u0dbd \u0dc3\u0ddc\u0dba\u0dcf \u0d9c\u0dad \u0db1\u0ddc\u0dc4\u0dd0\u0d9a\u0dd2 \u0dc0\u0dd2\u0dba",
+"Replace": "\u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Next": "\u0db4\u0dc3\u0dd4",
+"Whole words": "\u0dc3\u0db8\u0dc3\u0dca\u0dad \u0db4\u0daf",
+"Find and replace": "\u0dc3\u0ddc\u0dba\u0dcf \u0db4\u0dc3\u0dd4\u0dc0 \u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Replace with": "\u0db8\u0dd9\u0dba \u0dc3\u0db8\u0d9f \u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Find": "\u0dc3\u0ddc\u0dba\u0db1\u0dca\u0db1",
+"Replace all": "\u0dc3\u0dd2\u0dba\u0dbd\u0dca\u0dbd\u0db8 \u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Match case": "\u0d9a\u0dcf\u0dbb\u0dab\u0dba \u0d9c\u0dbd\u0db4\u0db1\u0dca\u0db1",
+"Prev": "\u0db4\u0dd9\u0dbb",
+"Spellcheck": "\u0d85\u0d9a\u0dca\u0dc2\u0dbb \u0dc0\u0dd2\u0db1\u0dca\u200d\u0dba\u0dcf\u0dc3\u0dba \u0db4\u0dbb\u0dd3\u0d9a\u0dca\u0dc2\u0dcf \u0d9a\u0dbb \u0db6\u0dd0\u0dbd\u0dd3\u0db8",
+"Finish": "\u0d85\u0dc0\u0dc3\u0db1\u0dca",
+"Ignore all": "\u0dc3\u0dd2\u0dba\u0dbd\u0dca\u0dbd\u0db8 \u0db1\u0ddc\u0dc3\u0dbd\u0d9a\u0dcf \u0dc4\u0dbb\u0dd2\u0db1\u0dca\u0db1",
+"Ignore": "\u0db1\u0ddc\u0dc3\u0dbd\u0d9a\u0dcf \u0dc4\u0dd0\u0dbb\u0dd3\u0db8",
+"Insert row before": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dd9\u0dbb \u0db4\u0dda\u0dc5\u0dd2\u0dba\u0d9a\u0dca \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Rows": "\u0db4\u0dda\u0dc5\u0dd2",
+"Height": "\u0d8b\u0dc3 ",
+"Paste row after": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dc3\u0dd4 \u0db4\u0dda\u0dc5\u0dd2\u0dba \u0d85\u0db8\u0dd4\u0dab\u0db1\u0dca\u0db1 ",
+"Alignment": "\u0db4\u0dd9\u0dc5 \u0d9c\u0dd0\u0dc3\u0dd4\u0db8",
+"Column group": "\u0dad\u0dd3\u0dbb\u0dd4 \u0d9a\u0dcf\u0dab\u0dca\u0da9\u0dba",
+"Row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba ",
+"Insert column before": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dd9\u0dbb \u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Split cell": "\u0d9a\u0ddc\u0da7\u0dd4 \u0dc0\u0dd9\u0db1\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
+"Cell padding": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0db4\u0dd2\u0dbb\u0dc0\u0dd4\u0db8",
+"Cell spacing": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0d89\u0da9 \u0dc3\u0dd3\u0db8\u0dcf\u0dc0 ",
+"Row type": "\u0db4\u0dda\u0dc5\u0dd2\u0dba\u0dd9\u0dc4\u0dd2 \u0dc0\u0dbb\u0dca\u0d9c\u0dba",
+"Insert table": "\u0dc0\u0d9c\u0dd4\u0dc0\u0da7 \u0d87\u0dad\u0dd4\u0dbd\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
+"Body": "\u0db4\u0dca\u200d\u0dbb\u0db0\u0dcf\u0db1 \u0d9a\u0ddc\u0da7\u0dc3",
+"Caption": "\u0dba\u0da7\u0dd2 \u0dbd\u0dd2\u0dba\u0db8\u0db1 ",
+"Footer": "\u0db4\u0dcf\u0daf\u0d9a\u0dba",
+"Delete row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba \u0db8\u0d9a\u0db1\u0dca\u0db1 ",
+"Paste row before": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dd9\u0dbb \u0db4\u0dda\u0dc5\u0dd2\u0dba \u0d85\u0db8\u0dd4\u0dab\u0db1\u0dca\u0db1 ",
+"Scope": "\u0dc0\u0dd2\u0dc2\u0dba\u0db4\u0dae\u0dba",
+"Delete table": "\u0dc0\u0d9c\u0dd4\u0dc0 \u0db8\u0d9a\u0db1\u0dca\u0db1 ",
+"Header cell": "\u0dc1\u0dd3\u0dbb\u0dca\u0dc2 \u0d9a\u0ddc\u0da7\u0dd4\u0dc0",
+"Column": "\u0dad\u0dd3\u0dbb\u0dd4\u0dc0",
+"Cell": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0 ",
+"Header": "\u0dc1\u0dd3\u0dbb\u0dca\u0dc2\u0d9a\u0dba",
+"Cell type": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0dc0\u0dbb\u0dca\u0d9c\u0dba",
+"Copy row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba \u0db4\u0dd2\u0da7\u0db4\u0dad\u0dca \u0d9a\u0dbb\u0d9c\u0db1\u0dca\u0db1 ",
+"Row properties": "\u0db4\u0dda\u0dc5\u0dd2\u0dba\u0dd9\u0dc4\u0dd2 \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
+"Table properties": "\u0dc0\u0d9c\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
+"Row group": "\u0db4\u0dda\u0dc5\u0dd2 \u0d9a\u0dcf\u0dab\u0dca\u0da9\u0dba",
+"Right": "\u0daf\u0d9a\u0dd4\u0dab",
+"Insert column after": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dc3\u0dd4 \u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
+"Cols": "\u0dad\u0dd3\u0dbb\u0dd4 ",
+"Insert row after": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dc3\u0dd4 \u0db4\u0dda\u0dc5\u0dd2\u0dba\u0d9a\u0dca \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
+"Width": "\u0db4\u0dc5\u0dbd",
+"Cell properties": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
+"Left": "\u0dc0\u0db8",
+"Cut row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba \u0d9a\u0db4\u0dcf\u0d9c\u0db1\u0dca\u0db1 ",
+"Delete column": "\u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0db8\u0d9a\u0db1\u0dca\u0db1 ",
+"Center": "\u0db8\u0dd0\u0daf",
+"Merge cells": "\u0d9a\u0ddc\u0da7\u0dd4 \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
+"Insert template": "\u0d85\u0da0\u0dca\u0da0\u0dd4\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"Templates": "\u0d85\u0da0\u0dca\u0da0\u0dd4",
+"Background color": "\u0db4\u0dc3\u0dd4\u0db6\u0dd2\u0db8\u0dd9\u0dc4\u0dd2 \u0dc0\u0dbb\u0dca\u0dab\u0dba",
+"Text color": "\u0db4\u0dd9\u0dc5 \u0dc3\u0da7\u0dc4\u0db1\u0dda \u0dc0\u0dbb\u0dca\u0dab\u0dba",
+"Show blocks": "\u0d9a\u0ddc\u0da7\u0dc3\u0dca \u0db4\u0dd9\u0db1\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"Show invisible characters": "\u0db1\u0ddc\u0db4\u0dd9\u0db1\u0dd9\u0db1 \u0d85\u0db1\u0dd4\u0dbd\u0d9a\u0dd4\u0dab\u0dd4 \u0db4\u0dd9\u0db1\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"Words: {0}": "\u0dc0\u0da0\u0db1: {0}",
+"Insert": "\u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
+"File": "\u0d9c\u0ddc\u0db1\u0dd4\u0dc0",
+"Edit": "\u0dc3\u0d9a\u0dc3\u0db1\u0dca\u0db1",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0db4\u0dd9\u0dc5 \u0dc3\u0da7\u0dc4\u0db1\u0dca \u0db6\u0dc4\u0dd4\u0dbd \u0db4\u0dca\u200d\u0dbb\u0daf\u0dda\u0dc1\u0dba. \u0db8\u0dd9\u0db1\u0dd4\u0dc0 \u0dc3\u0db3\u0dc4\u0dcf ALT-F9  \u0d94\u0db6\u0db1\u0dca\u0db1. \u0db8\u0dd9\u0dc0\u0dbd\u0db8\u0dca \u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0dc3\u0db3\u0dc4\u0dcf ALT-F10  \u0d94\u0db6\u0db1\u0dca\u0db1. \u0dc3\u0dc4\u0dba \u0dbd\u0db6\u0dcf\u0d9c\u0dd0\u0db1\u0dd3\u0db8 \u0dc3\u0db3\u0dc4\u0dcf ALT-0  \u0d94\u0db6\u0db1\u0dca\u0db1.",
+"Tools": "\u0db8\u0dd9\u0dc0\u0dbd\u0db8\u0dca",
+"View": "\u0db4\u0dd9\u0db1\u0dca\u0dc0\u0db1\u0dca\u0db1",
+"Table": "\u0dc0\u0d9c\u0dd4\u0dc0",
+"Format": "\u0dc4\u0dd0\u0da9\u0dad\u0dbd\u0dba"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/sk.js b/core/media/editors/tinymce/langs/sk.js
new file mode 100644
index 00000000..148e7383
--- /dev/null
+++ b/core/media/editors/tinymce/langs/sk.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('sk',{
+"Cut": "Vystrihn\u00fa\u0165",
+"Heading 5": "Nadpis 5",
+"Header 2": "Nadpis 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prehliada\u010d nepodporuje priamy pr\u00edstup do schr\u00e1nky. Pou\u017eite kl\u00e1vesov\u00e9 skratky Ctrl+X\/C\/V.",
+"Heading 4": "Nadpis 4",
+"Div": "Blok",
+"Heading 2": "Nadpis 2",
+"Paste": "Vlo\u017ei\u0165",
+"Close": "Zatvori\u0165",
+"Font Family": "P\u00edsmo",
+"Pre": "Preform\u00e1tovan\u00fd",
+"Align right": "Zarovna\u0165 vpravo",
+"New document": "Nov\u00fd dokument",
+"Blockquote": "Cit\u00e1cia",
+"Numbered list": "\u010c\u00edslovan\u00fd zoznam",
+"Heading 1": "Nadpis 1",
+"Headings": "Nadpisy",
+"Increase indent": "Zv\u00e4\u010d\u0161i\u0165 odsadenie",
+"Formats": "Form\u00e1ty",
+"Headers": "Nadpisy",
+"Select all": "Ozna\u010di\u0165 v\u0161etko",
+"Header 3": "Nadpis 3",
+"Blocks": "Bloky",
+"Undo": "Vr\u00e1ti\u0165",
+"Strikethrough": "Pre\u010diarknut\u00e9",
+"Bullet list": "Odr\u00e1\u017eky",
+"Header 1": "Nadpis 1",
+"Superscript": "Horn\u00fd index",
+"Clear formatting": "Vymaza\u0165 form\u00e1tovanie",
+"Font Sizes": "Ve\u013ekos\u0165 p\u00edsma",
+"Subscript": "Spodn\u00fd index",
+"Header 6": "Nadpis 6",
+"Redo": "Znova",
+"Paragraph": "Odsek",
+"Ok": "Ok",
+"Bold": "Tu\u010dn\u00e9",
+"Code": "K\u00f3d",
+"Italic": "Kurz\u00edva",
+"Align center": "Zarovna\u0165 na stred",
+"Header 5": "Nadpis 5",
+"Heading 6": "Nadpis 6",
+"Heading 3": "Nadpis 3",
+"Decrease indent": "Zmen\u0161i\u0165 odsadenie",
+"Header 4": "Nadpis 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Vkladanie je v m\u00f3de neform\u00e1tovan\u00e9ho textu. Vkladan\u00fd obsah bude vlo\u017een\u00fd ako neform\u00e1tovan\u00fd, a\u017e pok\u00fdm t\u00fato mo\u017enos\u0165 nevypnete.",
+"Underline": "Pod\u010diarknut\u00e9",
+"Cancel": "Zru\u0161i\u0165",
+"Justify": "Zarovna\u0165",
+"Inline": "\u0160t\u00fdly",
+"Copy": "Kop\u00edrova\u0165",
+"Align left": "Zarovna\u0165 v\u013eavo",
+"Visual aids": "Vizu\u00e1lne pom\u00f4cky",
+"Lower Greek": "Mal\u00e9 gr\u00e9cke p\u00edsmen\u00e1",
+"Square": "\u0160tvorec",
+"Default": "V\u00fdchodzie",
+"Lower Alpha": "Mal\u00e9 p\u00edsmen\u00e1",
+"Circle": "Kruh",
+"Disc": "Disk",
+"Upper Alpha": "Ve\u013ek\u00e9 p\u00edsmen\u00e1",
+"Upper Roman": "Ve\u013ek\u00e9 r\u00edmske \u010d\u00edslice",
+"Lower Roman": "Mal\u00e9 r\u00edmske \u010d\u00edslice",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id by malo za\u010d\u00edna\u0165 p\u00edsmenom, nasledovan\u00e9 p\u00edsmenami, \u010d\u00edslami, pom\u013a\u010dkami, bodkami, dvojbodkami alebo podtr\u017en\u00edkmi.",
+"Name": "N\u00e1zov",
+"Anchor": "Odkaz",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zmeny, naozaj chcete opusti\u0165 str\u00e1nku?",
+"Restore last draft": "Obnovi\u0165 posledn\u00fd koncept",
+"Special character": "\u0160peci\u00e1lny znak",
+"Source code": "Zdrojov\u00fd k\u00f3d",
+"Language": "Jazyk",
+"Insert\/Edit code sample": "Vlo\u017ei\u0165\/upravi\u0165 vzorku k\u00f3du",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Farba",
+"Right to left": "Sprava do\u013eava",
+"Left to right": "Z\u013eava doprava",
+"Emoticons": "Smajl\u00edci",
+"Robots": "Preh\u013ead\u00e1vacie roboty",
+"Document properties": "Vlastnosti dokumentu",
+"Title": "Nadpis",
+"Keywords": "K\u013e\u00fa\u010dov\u00e9 slov\u00e1",
+"Encoding": "K\u00f3dovanie",
+"Description": "Popis",
+"Author": "Autor",
+"Fullscreen": "Na cel\u00fa obrazovku",
+"Horizontal line": "Horizont\u00e1lna \u010diara",
+"Horizontal space": "Horizont\u00e1lny priestor",
+"Insert\/edit image": "Vlo\u017ei\u0165\/upravi\u0165 obr\u00e1zok",
+"General": "Hlavn\u00e9",
+"Advanced": "Pokro\u010dil\u00e9",
+"Source": "Zdroj",
+"Border": "Or\u00e1movanie",
+"Constrain proportions": "Vymedzen\u00e9 proporcie",
+"Vertical space": "Vertik\u00e1lny priestor",
+"Image description": "Popis obr\u00e1zku",
+"Style": "\u0160t\u00fdl",
+"Dimensions": "Rozmery",
+"Insert image": "Vlo\u017ei\u0165 obr\u00e1zok",
+"Image": "Obr\u00e1zok",
+"Zoom in": "Pribl\u00ed\u017ei\u0165",
+"Contrast": "Kontrast",
+"Back": "Sp\u00e4\u0165",
+"Gamma": "Gama",
+"Flip horizontally": "Preklopi\u0165 horizont\u00e1lne",
+"Resize": "Zmeni\u0165 ve\u013ekos\u0165",
+"Sharpen": "Zaostri\u0165",
+"Zoom out": "Oddiali\u0165",
+"Image options": "Mo\u017enosti obr\u00e1zku",
+"Apply": "Pou\u017ei\u0165",
+"Brightness": "Jas",
+"Rotate clockwise": "Oto\u010di\u0165 v smere hodinov\u00fdch ru\u010di\u010diek",
+"Rotate counterclockwise": "Oto\u010di\u0165 proti smeru hodinov\u00fdch ru\u010di\u010diek",
+"Edit image": "Upravi\u0165 obr\u00e1zok",
+"Color levels": "\u00darovne farieb",
+"Crop": "Vyreza\u0165",
+"Orientation": "Orient\u00e1cia",
+"Flip vertically": "Preklopi\u0165 vertik\u00e1lne",
+"Invert": "Invertova\u0165",
+"Date\/time": "D\u00e1tum\/\u010das",
+"Insert date\/time": "Vlo\u017ei\u0165 d\u00e1tum\/\u010das",
+"Remove link": "Odstr\u00e1ni\u0165 odkaz",
+"Url": "Url",
+"Text to display": "Zobrazen\u00fd text",
+"Anchors": "Kotvy",
+"Insert link": "Vlo\u017ei\u0165 odkaz",
+"Link": "Odkaz",
+"New window": "Nov\u00e9 okno",
+"None": "\u017diadne",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL adresa ktor\u00fa ste zadali vyzer\u00e1 ako extern\u00fd odkaz. Chcete prida\u0165 vy\u017eadovan\u00fa http:\/\/ predponu?",
+"Paste or type a link": "Prilepte alebo nap\u00ed\u0161te odkaz",
+"Target": "Cie\u013e",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, ktor\u00fa ste vlo\u017eili je pravdepodobne emailov\u00e1 adresa. \u017del\u00e1te si prida\u0165 vy\u017eadovan\u00fa mailto: predponu?",
+"Insert\/edit link": "Vlo\u017ei\u0165\/upravi\u0165 odkaz",
+"Insert\/edit video": "Vlo\u017ei\u0165\/upravi\u0165 video",
+"Media": "M\u00e9di\u00e1",
+"Alternative source": "Alternat\u00edvny zdroj",
+"Paste your embed code below:": "Vlo\u017ete k\u00f3d pre vlo\u017eenie na str\u00e1nku:",
+"Insert video": "Vlo\u017ei\u0165 video",
+"Poster": "Uk\u00e1\u017eka",
+"Insert\/edit media": "Vlo\u017ei\u0165\/upravi\u0165 m\u00e9di\u00e1",
+"Embed": "Vlo\u017een\u00e9",
+"Nonbreaking space": "Nedelite\u013en\u00e1 medzera",
+"Page break": "Zalomenie str\u00e1nky",
+"Paste as text": "Vlo\u017ei\u0165 ako text",
+"Preview": "N\u00e1h\u013ead",
+"Print": "Tla\u010di\u0165",
+"Save": "Ulo\u017ei\u0165",
+"Could not find the specified string.": "Zadan\u00fd re\u0165azec sa nena\u0161iel.",
+"Replace": "Nahradi\u0165",
+"Next": "Nasleduj\u00face",
+"Whole words": "Cel\u00e9 slov\u00e1",
+"Find and replace": "Vyh\u013eada\u0165 a nahradi\u0165",
+"Replace with": "Nahradi\u0165 za",
+"Find": "H\u013eada\u0165",
+"Replace all": "Nahradi\u0165 v\u0161etko",
+"Match case": "Rozli\u0161ova\u0165 ve\u013ek\u00e9\/mal\u00e9",
+"Prev": "Predch\u00e1dzaj\u00face",
+"Spellcheck": "Kontrola pravopisu",
+"Finish": "Dokon\u010di\u0165",
+"Ignore all": "Ignorova\u0165 v\u0161etko",
+"Ignore": "Ignorova\u0165",
+"Add to Dictionary": "Prida\u0165 do slovn\u00edka",
+"Insert row before": "Vlo\u017ei\u0165 nov\u00fd riadok pred",
+"Rows": "Riadky",
+"Height": "V\u00fd\u0161ka",
+"Paste row after": "Vlo\u017ei\u0165 riadok za",
+"Alignment": "Zarovnanie",
+"Border color": "Farba or\u00e1movania",
+"Column group": "Skupina st\u013apcov",
+"Row": "Riadok",
+"Insert column before": "Prida\u0165 nov\u00fd st\u013apec pred",
+"Split cell": "Rozdeli\u0165 bunku",
+"Cell padding": "Odsadenie v bunk\u00e1ch",
+"Cell spacing": "Priestor medzi bunkami",
+"Row type": "Typ riadku",
+"Insert table": "Vlo\u017ei\u0165 tabu\u013eku",
+"Body": "Telo",
+"Caption": "Popisok",
+"Footer": "P\u00e4ti\u010dka",
+"Delete row": "Zmaza\u0165 riadok",
+"Paste row before": "Vlo\u017ei\u0165 riadok pred",
+"Scope": "Oblas\u0165",
+"Delete table": "Zmaza\u0165 tabu\u013eku",
+"H Align": "Horizont\u00e1lne zarovnanie",
+"Top": "Vrch",
+"Header cell": "Bunka z\u00e1hlavia",
+"Column": "St\u013apec",
+"Row group": "Skupina riadkov",
+"Cell": "Bunka",
+"Middle": "Stred",
+"Cell type": "Typ bunky",
+"Copy row": "Kop\u00edrova\u0165 riadok",
+"Row properties": "Vlastnosti riadku",
+"Table properties": "Nastavenia tabu\u013eky",
+"Bottom": "Spodok",
+"V Align": "Vertik\u00e1lne zarovnanie",
+"Header": "Z\u00e1hlavie",
+"Right": "Vpravo",
+"Insert column after": "Prida\u0165 nov\u00fd st\u013apec za",
+"Cols": "St\u013apce",
+"Insert row after": "Vlo\u017ei\u0165 nov\u00fd riadok za",
+"Width": "\u0160\u00edrka",
+"Cell properties": "Vlastnosti bunky",
+"Left": "V\u013eavo",
+"Cut row": "Vystrihn\u00fa\u0165 riadok",
+"Delete column": "Vymaza\u0165 st\u013apec",
+"Center": "Na stred",
+"Merge cells": "Spoji\u0165 bunky",
+"Insert template": "Vlo\u017ei\u0165 \u0161abl\u00f3nu",
+"Templates": "\u0160abl\u00f3ny",
+"Background color": "Farba pozadia",
+"Custom...": "Vlastn\u00e1...",
+"Custom color": "Vlastn\u00e1 farba",
+"No color": "Bez farby",
+"Text color": "Farba textu",
+"Table of Contents": "Obsah",
+"Show blocks": "Zobrazi\u0165 bloky",
+"Show invisible characters": "Zobrazi\u0165 skryt\u00e9 znaky",
+"Words: {0}": "Slov: {0}",
+"Insert": "Vlo\u017ei\u0165",
+"File": "S\u00fabor",
+"Edit": "Upravi\u0165",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textov\u00e9 pole. Stla\u010dte ALT-F9 pre zobrazenie menu, ALT-F10 pre zobrazenie panela n\u00e1strojov, ALT-0 pre n\u00e1povedu.",
+"Tools": "N\u00e1stroje",
+"View": "Zobrazi\u0165",
+"Table": "Tabu\u013eka",
+"Format": "Form\u00e1t"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/sl.js b/core/media/editors/tinymce/langs/sl.js
new file mode 100644
index 00000000..f0bf53cd
--- /dev/null
+++ b/core/media/editors/tinymce/langs/sl.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('sl',{
+"Cut": "Izre\u017ei",
+"Heading 5": "Podnaslov 5",
+"Header 2": "Naslov 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Varnostne nastavitve brskalnika ne dopu\u0161\u010dajo direktnega dostopa do odlo\u017ei\u0161\u010da. Uporabite kombinacijo tipk Ctrl+X\/C\/V na tipkovnici.",
+"Heading 4": "Podnaslov 4",
+"Div": "Div",
+"Heading 2": "Podnaslov 2",
+"Paste": "Prilepi",
+"Close": "Zapri",
+"Font Family": "Dru\u017eina pisave",
+"Pre": "Predformat",
+"Align right": "Desna poravnava",
+"New document": "Nov dokument",
+"Blockquote": "Navedek",
+"Numbered list": "O\u0161tevil\u010den seznam",
+"Heading 1": "Podnaslov 1",
+"Headings": "Podnaslovi",
+"Increase indent": "Pove\u010daj zamik",
+"Formats": "Oblika",
+"Headers": "Naslovi",
+"Select all": "Izberi vse",
+"Header 3": "Naslov 3",
+"Blocks": "Grupe",
+"Undo": "Razveljavi",
+"Strikethrough": "Pre\u010drtano",
+"Bullet list": "Ozna\u010den seznam",
+"Header 1": "Naslov 1",
+"Superscript": "Nadpisano",
+"Clear formatting": "Po\u010disti oblikovanje",
+"Font Sizes": "Velikosti pisave",
+"Subscript": "Podpisano",
+"Header 6": "Naslov 6",
+"Redo": "Ponovi",
+"Paragraph": "Odstavek",
+"Ok": "V redu",
+"Bold": "Krepko",
+"Code": "Koda",
+"Italic": "Le\u017ee\u010de",
+"Align center": "Sredinska poravnava",
+"Header 5": "Naslov 5",
+"Heading 6": "Podnaslov 6",
+"Heading 3": "Podnaslov 3",
+"Decrease indent": "Zmanj\u0161aj zamik",
+"Header 4": "Naslov 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Odlagali\u0161\u010de je zdaj v tekstovnem na\u010dinu. Vsebina bo preslikana kot golo besedilo brez oblike, dokler te mo\u017enosti ne izklju\u010dite.",
+"Underline": "Pod\u010drtano",
+"Cancel": "Prekli\u010di",
+"Justify": "Obojestranska poravnava",
+"Inline": "Med besedilom",
+"Copy": "Kopiraj",
+"Align left": "Leva poravnava",
+"Visual aids": "Vizualni pripomo\u010dki",
+"Lower Greek": "Male gr\u0161ke \u010drke",
+"Square": "Kvadratek",
+"Default": "Privzeto",
+"Lower Alpha": "Male tiskane \u010drke",
+"Circle": "Pikica",
+"Disc": "Kroglica",
+"Upper Alpha": "Velike tiskane \u010drke",
+"Upper Roman": "Velike rimske \u0161tevilke",
+"Lower Roman": "Male rimske \u0161tevilke",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id se mora za\u010deti s \u010drko, sledijo samo \u010drke, \u0161tevilke, pomi\u0161ljaji, pike, dvopi\u010dja ali pod\u010drtaj.",
+"Name": "Ime",
+"Anchor": "Sidro",
+"Id": "ID",
+"You have unsaved changes are you sure you want to navigate away?": "Imate neshranjene spremembe. Ste prepri\u010dati, da \u017eelite zapustiti stran?",
+"Restore last draft": "Obnovi zadnji osnutek",
+"Special character": "Posebni znaki",
+"Source code": "Izvorna koda",
+"Language": "Jezik",
+"Insert\/Edit code sample": "Vstavi\/uredi vzor\u010dno kodo",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Barva",
+"Right to left": "Od desne proti levi",
+"Left to right": "Od leve proti desni",
+"Emoticons": "Sme\u0161koti",
+"Robots": "Robotki",
+"Document properties": "Lastnosti dokumenta",
+"Title": "Naslov",
+"Keywords": "Klju\u010dne besede",
+"Encoding": "Kodiranje",
+"Description": "Opis",
+"Author": "Avtor",
+"Fullscreen": "\u010cez cel zaslon",
+"Horizontal line": "Vodoravna \u010drta",
+"Horizontal space": "Vodoravni prostor",
+"Insert\/edit image": "Vstavi\/uredi sliko",
+"General": "Splo\u0161no",
+"Advanced": "Napredno",
+"Source": "Vir",
+"Border": "Obroba",
+"Constrain proportions": "Obdr\u017ei razmerje",
+"Vertical space": "Navpi\u010dni prostor",
+"Image description": "Opis slike",
+"Style": "Slog",
+"Dimensions": "Dimenzije",
+"Insert image": "Vstavi sliko",
+"Image": "Slika",
+"Zoom in": "Pove\u010daj",
+"Contrast": "Kontrast",
+"Back": "Nazaj",
+"Gamma": "Gama",
+"Flip horizontally": "Zasukaj vodoravno",
+"Resize": "Spremeni velikost",
+"Sharpen": "Izostri",
+"Zoom out": "Pomanj\u0161aj",
+"Image options": "Mo\u017enosti slike",
+"Apply": "Uporabi",
+"Brightness": "Svetlost",
+"Rotate clockwise": "Zavrti v smeri urinega kazalca",
+"Rotate counterclockwise": "Zavrti v nasprotni smeri urnega kazalca",
+"Edit image": "Uredi sliko",
+"Color levels": "Barvni nivoji",
+"Crop": "Obre\u017ei",
+"Orientation": "Usmerjenost",
+"Flip vertically": "Zasukaj navpi\u010dno",
+"Invert": "Obrni",
+"Date\/time": "Datum/\u010das",
+"Insert date\/time": "Vstavi datum\/\u010das",
+"Remove link": "Odstrani povezavo",
+"Url": "URL",
+"Text to display": "Prikazno besedilo",
+"Anchors": "Sidra",
+"Insert link": "Vstavi povezavo",
+"Link": "Povezava",
+"New window": "Novo okno",
+"None": "Brez",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vneseni URL je zunanja povezava. Ali \u017eelite dodati zahtevano http:\/\/ predpono?",
+"Paste or type a link": "Prilepi ali vnesi povezavo",
+"Target": "Cilj",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vneseni URL je e-po\u0161tni naslov. Ali \u017eeliteelite dodati zahtevano mailto: predpono?",
+"Insert\/edit link": "Vstavi\/uredi povezavo",
+"Insert\/edit video": "Vstavi\/uredi video",
+"Media": "Mediji",
+"Alternative source": "Nadomestni vir",
+"Paste your embed code below:": "Prilepite kodo za vdelavo:",
+"Insert video": "Vstavi video",
+"Poster": "Poster",
+"Insert\/edit media": "Vstavi\/uredi medij",
+"Embed": "Vdelaj",
+"Nonbreaking space": "Nedeljivi presledek",
+"Page break": "Prelom strani",
+"Paste as text": "Prilepi kot besedilo",
+"Preview": "Predogled",
+"Print": "Natisni",
+"Save": "Shrani",
+"Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
+"Replace": "Zamenjaj",
+"Next": "Naprej",
+"Whole words": "Cele besede",
+"Find and replace": "Poi\u0161\u010di in zamenjaj",
+"Replace with": "Zamenjaj z",
+"Find": "Poi\u0161\u010di",
+"Replace all": "Zamenjaj vse",
+"Match case": "Ujemanje malih in velikih \u010drk",
+"Prev": "Nazaj",
+"Spellcheck": "Preverjanje \u010drkovanja",
+"Finish": "Zaklju\u010di",
+"Ignore all": "Prezri vse",
+"Ignore": "Prezri",
+"Add to Dictionary": "Dodaj v slovar",
+"Insert row before": "Vstavi vrstico pred",
+"Rows": "Vrstice",
+"Height": "Vi\u0161ina",
+"Paste row after": "Prilepi vrstico za",
+"Alignment": "Poravnava",
+"Border color": "Barva obrobe",
+"Column group": "Grupiranje stolpcev",
+"Row": "Vrstica",
+"Insert column before": "Vstavi stolpec pred",
+"Split cell": "Razdeli celico",
+"Cell padding": "Polnilo med celicami",
+"Cell spacing": "Razmik med celicami",
+"Row type": "Tip vrstice",
+"Insert table": "Vstavi tabelo",
+"Body": "Vsebina",
+"Caption": "Naslov",
+"Footer": "Noga",
+"Delete row": "Izbri\u0161i vrstico",
+"Paste row before": "Prilepi vrstico pred",
+"Scope": "Obseg",
+"Delete table": "Izbri\u0161i tabelo",
+"H Align": "Vodoravna poravnava",
+"Top": "Zgoraj",
+"Header cell": "Celica glave",
+"Column": "Stolpec",
+"Row group": "Grupiranje vrstic",
+"Cell": "Celica",
+"Middle": "Sredina",
+"Cell type": "Tip celice",
+"Copy row": "Kopiraj vrstico",
+"Row properties": "Lastnosti vrstice",
+"Table properties": "Lastnosti tabele",
+"Bottom": "Spodaj",
+"V Align": "Navpi\u010dna poravnava",
+"Header": "Glava",
+"Right": "Desno",
+"Insert column after": "Vstavi stolpec za",
+"Cols": "Stolpci",
+"Insert row after": "Vstavi vrstico za",
+"Width": "\u0160irina",
+"Cell properties": "Lastnosti celice",
+"Left": "Levo",
+"Cut row": "Izre\u017ei vrstico",
+"Delete column": "Izbri\u0161i stolpec",
+"Center": "Sredinsko",
+"Merge cells": "Zdru\u017ei celice",
+"Insert template": "Vstavi predlogo",
+"Templates": "Predloge",
+"Background color": "Barva ozadja",
+"Custom...": "Po meri...",
+"Custom color": "Barva po meri",
+"No color": "Brez barve",
+"Text color": "Barva besedila",
+"Table of Contents": "Vsebina tabele",
+"Show blocks": "Prika\u017ei grupe",
+"Show invisible characters": "Prika\u017ei skrite znake",
+"Words: {0}": "Besed: {0}",
+"Insert": "Vstavi",
+"File": "Datoteka",
+"Edit": "Uredi",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Bogato besedilo. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za orodno vrstico. Pritisnite ALT-0 za pomo\u010d",
+"Tools": "Orodja",
+"View": "Pogled",
+"Table": "Tabela",
+"Format": "Oblika"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/sr.js b/core/media/editors/tinymce/langs/sr.js
new file mode 100644
index 00000000..ef724045
--- /dev/null
+++ b/core/media/editors/tinymce/langs/sr.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('sr',{
+"Cut": "Iseci",
+"Header 2": "Zaglavlje 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 pretra\u017eiva\u010d nepodr\u017eava direktan pristup prenosu.Koristite Ctrl+X\/C\/V pre\u010dice na tastaturi",
+"Div": "Div",
+"Paste": "Nalepi",
+"Close": "Zatvori",
+"Font Family": "Vrsta fonta",
+"Pre": "Pre",
+"Align right": "Poravnano  desno",
+"New document": "Novi dokument",
+"Blockquote": "Navodnici",
+"Numbered list": "Numerisana lista",
+"Increase indent": "Pove\u0107aj uvla\u010denje",
+"Formats": "Formatiraj",
+"Headers": "Zaglavlje",
+"Select all": "Obele\u017ei sve",
+"Header 3": "Zaglavlje 3",
+"Blocks": "Blokovi",
+"Undo": "Nazad",
+"Strikethrough": "Precrtan",
+"Bullet list": "Lista nabrajanja",
+"Header 1": "Zaglavlje 1",
+"Superscript": "Natpis",
+"Clear formatting": "Brisanje formatiranja",
+"Font Sizes": "Veli\u010dine fontova",
+"Subscript": "Potpisan",
+"Header 6": "Zaglavlje 6",
+"Redo": "Napred",
+"Paragraph": "Paragraf",
+"Ok": "Ok",
+"Bold": "Podebljan",
+"Code": "Kod",
+"Italic": "isko\u0161en",
+"Align center": "Poravnano centar",
+"Header 5": "Zaglavlje 5",
+"Decrease indent": "Smanji uvla\u010denje",
+"Header 4": "Zaglavlje 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Nalepiti je sada u obi\u010dnom text modu.Sadr\u017eaj \u0107e biti nalepljen kao obi\u010dan tekst dok ne ugasite ovu opciju.",
+"Underline": "Podvu\u010den",
+"Cancel": "Opozovi",
+"Justify": "Poravnanje",
+"Inline": "U liniji",
+"Copy": "Kopiraj",
+"Align left": "Poravnano levo",
+"Visual aids": "Vizuelna pomagala",
+"Lower Greek": "Ni\u017ei gr\u010dki",
+"Square": "Kvadrat",
+"Default": "Podrazumevano",
+"Lower Alpha": "Donja Alpha",
+"Circle": "Krug",
+"Disc": "Disk",
+"Upper Alpha": "Gornji Alpha",
+"Upper Roman": "Gornji Roman",
+"Lower Roman": "Donji Roman",
+"Name": "Ime",
+"Anchor": "Sidro",
+"You have unsaved changes are you sure you want to navigate away?": "Imate nesa\u010duvane promene dali ste sigurni da \u017eelite da iza\u0111ete?",
+"Restore last draft": "Vrati  poslednji nacrt",
+"Special character": "Specijalni karakter",
+"Source code": "Izvorni kod",
+"Right to left": "Sa desne na levu",
+"Left to right": "Sa leve na desnu",
+"Emoticons": "Smajliji",
+"Robots": "Roboti",
+"Document properties": "Postavke dokumenta",
+"Title": "Naslov",
+"Keywords": "Klju\u010dne re\u010di",
+"Encoding": "Kodiranje",
+"Description": "Opis",
+"Author": "Autor",
+"Fullscreen": "Pun ekran",
+"Horizontal line": "Horizontalna linija",
+"Horizontal space": "Horizontalni razmak",
+"Insert\/edit image": "Ubaci\/Promeni sliku",
+"General": "Op\u0161te",
+"Advanced": "Napredno",
+"Source": "Izvor",
+"Border": "Okvir",
+"Constrain proportions": "Ograni\u010dene proporcije",
+"Vertical space": "Vertikalni razmak",
+"Image description": "Opis slike",
+"Style": "Stil",
+"Dimensions": "Dimenzije",
+"Insert image": "Ubaci sliku",
+"Insert date\/time": "Ubaci datum\/vreme",
+"Remove link": "Ukloni link",
+"Url": "Url",
+"Text to display": "Tekst za prikaz",
+"Anchors": "sidro",
+"Insert link": "Ubaci vezu",
+"New window": "Novi prozor",
+"None": "Ni\u0161ta",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Meta",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Ubaci\/promeni vezu",
+"Insert\/edit video": "Ubaci\/promeni video",
+"Poster": "Poster",
+"Alternative source": "Alternativni izvor",
+"Paste your embed code below:": "Nalepite ugra\u0111eni kod ispod:",
+"Insert video": "Ubaci video",
+"Embed": "Ugra\u0111eno",
+"Nonbreaking space": "bez ramaka",
+"Page break": "Lomljenje stranice",
+"Paste as text": "Nalepi kao tekst",
+"Preview": "Pregled",
+"Print": "\u0160tampanje",
+"Save": "Sa\u010duvati",
+"Could not find the specified string.": "Nije mogu\u0107e prona\u0107i navedeni niz.",
+"Replace": "Zameni",
+"Next": "Slede\u0107i",
+"Whole words": "Cele re\u010di",
+"Find and replace": "Na\u0111i i zameni",
+"Replace with": "Zameni sa",
+"Find": "Na\u0111i",
+"Replace all": "Zameni sve",
+"Match case": "Predmet za upore\u0111ivanje",
+"Prev": "Prethodni",
+"Spellcheck": "Provera pravopisa",
+"Finish": "Kraj",
+"Ignore all": "Ignori\u0161i sve",
+"Ignore": "ignori\u0161i",
+"Insert row before": "Ubaci red pre",
+"Rows": "Redovi",
+"Height": "Visina",
+"Paste row after": "Nalepi red posle",
+"Alignment": "Svrstavanje",
+"Column group": "Grupa kolone",
+"Row": "Red",
+"Insert column before": "Ubaci kolonu pre",
+"Split cell": "Razdvoji \u0107elije",
+"Cell padding": "Razmak \u0107elije",
+"Cell spacing": "Prostor \u0107elije",
+"Row type": "Tip reda",
+"Insert table": "ubaci tabelu",
+"Body": "Telo",
+"Caption": "Natpis",
+"Footer": "Podno\u017eje",
+"Delete row": "Obri\u0161i red",
+"Paste row before": "Nalepi red pre",
+"Scope": "Obim",
+"Delete table": "Obri\u0161i tabelu",
+"Header cell": "Visina \u0107elije",
+"Column": "Kolona",
+"Cell": "\u0106elija",
+"Header": "Zaglavlje",
+"Cell type": "Tip \u0107elije",
+"Copy row": "Kopiraj red",
+"Row properties": "Postavke reda",
+"Table properties": "Postavke tabele",
+"Row group": "Grupa reda",
+"Right": "Desno",
+"Insert column after": "Ubaci kolonu posle",
+"Cols": "Kolone",
+"Insert row after": "Ubaci red posle",
+"Width": "\u0160irina",
+"Cell properties": "Postavke \u0107elije",
+"Left": "Levo",
+"Cut row": "Iseci red",
+"Delete column": "Obri\u0161i kolonu",
+"Center": "Centar",
+"Merge cells": "Spoji \u0107elije",
+"Insert template": "Ubaci \u0161ablon",
+"Templates": "\u0160abloni",
+"Background color": "Boja pozadine",
+"Text color": "Boja tekst",
+"Show blocks": "Prikaz blokova",
+"Show invisible characters": "Prika\u017ei nevidljive karaktere",
+"Words: {0}": "Re\u010di:{0}",
+"Insert": "Umetni",
+"File": "Datoteka",
+"Edit": "Ure\u0111ivanje",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Oboga\u0107en tekst. Pritisni te ALT-F9 za meni.Pritisnite ALT-F10 za traku sa alatkama.Pritisnite ALT-0 za pomo\u0107",
+"Tools": "Alatke",
+"View": "Prikaz",
+"Table": "Tabela",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/sv.js b/core/media/editors/tinymce/langs/sv.js
new file mode 100644
index 00000000..68531d53
--- /dev/null
+++ b/core/media/editors/tinymce/langs/sv.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('sv',{
+"Cut": "Klipp ut",
+"Heading 5": "Rubrik 5",
+"Header 2": "Rubrik 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din webbl\u00e4sare st\u00f6djer inte direkt \u00e5tkomst till urklipp. V\u00e4nligen anv\u00e4nd kortkommandona Ctrl+X\/C\/V i st\u00e4llet.",
+"Heading 4": "Rubrik 4",
+"Div": "Div",
+"Heading 2": "Rubrik 2",
+"Paste": "Klistra in",
+"Close": "St\u00e4ng",
+"Font Family": "Teckensnitt",
+"Pre": "F\u00f6rformaterad",
+"Align right": "H\u00f6gerst\u00e4ll",
+"New document": "Nytt dokument",
+"Blockquote": "Blockcitat",
+"Numbered list": "Nummerlista",
+"Heading 1": "Rubrik 1",
+"Headings": "Rubriker",
+"Increase indent": "\u00d6ka indrag",
+"Formats": "Format",
+"Headers": "Rubriker",
+"Select all": "Markera allt",
+"Header 3": "Rubrik 3",
+"Blocks": "Block",
+"Undo": "\u00c5ngra",
+"Strikethrough": "Genomstruken",
+"Bullet list": "Punktlista",
+"Header 1": "Rubrik 1",
+"Superscript": "Upph\u00f6jd text",
+"Clear formatting": "Ta bort format",
+"Font Sizes": "Storlek",
+"Subscript": "Neds\u00e4nkt text",
+"Header 6": "Rubrik 6",
+"Redo": "G\u00f6r om",
+"Paragraph": "Br\u00f6dtext",
+"Ok": "OK",
+"Bold": "Fetstil",
+"Code": "Kod",
+"Italic": "Kursiv stil",
+"Align center": "Centrera",
+"Header 5": "Rubrik 5",
+"Heading 6": "Rubrik 6",
+"Heading 3": "Rubrik 3",
+"Decrease indent": "Minska indrag",
+"Header 4": "Rubrik 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Klistra in \u00e4r nu i textl\u00e4ge. Inneh\u00e5ll kommer att konverteras till text tills du sl\u00e5r av detta l\u00e4ge.",
+"Underline": "Understruken",
+"Cancel": "Avbryt",
+"Justify": "Justera",
+"Inline": "P\u00e5 rad",
+"Copy": "Kopiera",
+"Align left": "V\u00e4nsterst\u00e4ll",
+"Visual aids": "Visuella hj\u00e4lpmedel",
+"Lower Greek": "Grekiska gemener",
+"Square": "Fyrkant",
+"Default": "Original",
+"Lower Alpha": "Gemener",
+"Circle": "Cirkel",
+"Disc": "Disk",
+"Upper Alpha": "Versaler",
+"Upper Roman": "Romerska versaler",
+"Lower Roman": "Romerska gemener",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID skall b\u00f6rja med en boktav och endast f\u00f6ljas av bokst\u00c4ver a-z, siffror, bindestreck, punkt, kolon eller understreck.",
+"Name": "Namn",
+"Anchor": "Ankare",
+"Id": "ID",
+"You have unsaved changes are you sure you want to navigate away?": "Du har f\u00f6r\u00e4ndringar som du inte har sparat. \u00c4r du s\u00e4ker p\u00e5 att du vill navigera vidare?",
+"Restore last draft": "\u00c5terst\u00e4ll senaste utkast",
+"Special character": "Specialtecken",
+"Source code": "K\u00e4llkod",
+"Language": "Spr\u00e5k",
+"Insert\/Edit code sample": "Infoga\/\u00e4ndra kodexempel",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "F\u00e4rg",
+"Right to left": "H\u00f6ger till v\u00e4nster",
+"Left to right": "V\u00e4nster till h\u00f6ger",
+"Emoticons": "Emoticons",
+"Robots": "Robotar",
+"Document properties": "Dokumentegenskaper",
+"Title": "Titel",
+"Keywords": "Nyckelord",
+"Encoding": "Kodning",
+"Description": "Beskrivning",
+"Author": "F\u00f6rfattare",
+"Fullscreen": "Fullsk\u00e4rm",
+"Horizontal line": "Horisontell linje",
+"Horizontal space": "Horisontellt utrymme",
+"Insert\/edit image": "Infoga\/redigera bild",
+"General": "Generella",
+"Advanced": "Avancerat",
+"Source": "K\u00e4lla",
+"Border": "Ram",
+"Constrain proportions": "Begr\u00e4nsa proportioner",
+"Vertical space": "Vertikaltutrymme",
+"Image description": "Bildbeskrivning",
+"Style": "Stil",
+"Dimensions": "Dimensioner",
+"Insert image": "Infoga bild",
+"Image": "Bild",
+"Zoom in": "Zooma in",
+"Contrast": "Kontrast",
+"Back": "Tillbaka",
+"Gamma": "Gamma",
+"Flip horizontally": "V\u00e4nd horsontellt",
+"Resize": "Skala om",
+"Sharpen": "Sk\u00e4rpa",
+"Zoom out": "Zooma ut",
+"Image options": "Bildalternativ",
+"Apply": "Verst\u00e4ll",
+"Brightness": "Ljusstyrka",
+"Rotate clockwise": "Rotera medurs",
+"Rotate counterclockwise": "Rotera moturs",
+"Edit image": "\u00c4ndra bild",
+"Color levels": "F\u00e4rgniv\u00e5er",
+"Crop": "Besk\u00e4r",
+"Orientation": "Riktning",
+"Flip vertically": "V\u00e4nd vertikalt",
+"Invert": "Invertera",
+"Date\/time": "Datum\/tid",
+"Insert date\/time": "Infoga datum\/tid",
+"Remove link": "Ta bort l\u00e4nk",
+"Url": "Url",
+"Text to display": "Text att visa",
+"Anchors": "Bokm\u00e4rken",
+"Insert link": "Infoga l\u00e4nk",
+"Link": "L\u00e4nk",
+"New window": "Nytt f\u00f6nster",
+"None": "Ingen",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Urlen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?",
+"Paste or type a link": "Klistra in eller ange en l\u00e4nk",
+"Target": "M\u00e5l",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Urlen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?",
+"Insert\/edit link": "Infoga\/redigera l\u00e4nk",
+"Insert\/edit video": "Infoga\/redigera video",
+"Poster": "Affish",
+"Alternative source": "Alternativ k\u00e4lla",
+"Paste your embed code below:": "Klistra in din inb\u00e4ddningskod nedan:",
+"Insert video": "Infoga video",
+"Poster": "Affish",
+"Insert\/edit media": "Infoga\/\u00e4ndra media",
+"Embed": "Inb\u00e4ddning",
+"Nonbreaking space": "Avbrottsfritt mellanrum",
+"Page break": "Sydbrytning",
+"Paste as text": "Klistra in som text",
+"Preview": "F\u00f6rhandsgranska",
+"Print": "Skriv ut",
+"Save": "Spara",
+"Could not find the specified string.": "Kunde inte hitta den specifierade st\u00e4ngen.",
+"Replace": "Ers\u00e4tt",
+"Next": "N\u00e4sta",
+"Whole words": "Hela ord",
+"Find and replace": "S\u00f6k och ers\u00e4tt",
+"Replace with": "Ers\u00e4tt med",
+"Find": "S\u00f6k",
+"Replace all": "Ers\u00e4tt alla",
+"Match case": "Matcha gemener\/versaler",
+"Prev": "F\u00f6reg\u00e5ende",
+"Spellcheck": "R\u00e4ttstava",
+"Finish": "Avsluta",
+"Ignore all": "Ignorera alla",
+"Ignore": "Ignorera",
+"Add to Dictionary": "L\u00e4gg till i ordlista",
+"Insert row before": "Infoga rad f\u00f6re",
+"Rows": "Rader",
+"Height": "H\u00f6jd",
+"Paste row after": "Klistra in rad efter",
+"Alignment": "Justering",
+"Border color": "Ramf\u00e4rg",
+"Column group": "Kolumngrupp",
+"Row": "Rad",
+"Insert column before": "Infoga kollumn f\u00f6re",
+"Split cell": "Bryt is\u00e4r celler",
+"Cell padding": "Cellpaddning",
+"Cell spacing": "Cellmellanrum",
+"Row type": "Radtyp",
+"Insert table": "Infoga tabell",
+"Body": "Kropp",
+"Caption": "Rubrik",
+"Footer": "Fot",
+"Delete row": "Radera rad",
+"Paste row before": "Klista in rad f\u00f6re",
+"Scope": "Omf\u00e5ng",
+"Delete table": "Radera tabell",
+"H Align": "H-justering",
+"Top": "Toppen",
+"Header cell": "Huvudcell",
+"Column": "Kolumn",
+"Row group": "Radgrupp",
+"Cell": "Cell",
+"Middle": "Mitten",
+"Cell type": "Celltyp",
+"Copy row": "Kopiera rad",
+"Row properties": "Radegenskaper",
+"Table properties": "Tabellegenskaper",
+"Bottom": "Botten",
+"V Align": "V-justering",
+"Header": "Huvud",
+"Right": "H\u00f6ger",
+"Insert column after": "Infoga kolumn efter",
+"Cols": "Kolumner",
+"Insert row after": "Infoga rad efter",
+"Width": "Bredd",
+"Cell properties": "Cellegenskaper",
+"Left": "V\u00e4nster",
+"Cut row": "Klipp ut rad",
+"Delete column": "Radera kolumn",
+"Center": "Centrum",
+"Merge cells": "Sammanfoga celler",
+"Insert template": "Infoga mall",
+"Templates": "Mallar",
+"Background color": "Bakgrundsf\u00e4rg",
+"Custom...": "Anpassad...",
+"Custom color": "Anpassad f\u00e4rg",
+"No color": "Ingen f\u00e4rg",
+"Text color": "Textf\u00e4rg",
+"Table of Contents": "Inneh\u00e5llsf\u00f6rteckning",
+"Show blocks": "Visa block",
+"Show invisible characters": "Visa onsynliga tecken",
+"Words: {0}": "Ord: {0}",
+"Insert": "Infoga",
+"File": "Fil",
+"Edit": "Redigera",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textredigerare. Tryck ALT-F9 f\u00f6r menyn. Tryck ALT-F10 f\u00f6r verktygsrader. Tryck ALT-0 f\u00f6r hj\u00e4lp.",
+"Tools": "Verktyg",
+"View": "Visa",
+"Table": "Tabell",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/sw.js b/core/media/editors/tinymce/langs/sw.js
new file mode 100644
index 00000000..f3e959ce
--- /dev/null
+++ b/core/media/editors/tinymce/langs/sw.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('sw',{
+"Cut": "Kata",
+"Heading 5": "Kichwa 5",
+"Header 2": "Kijajuu 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Kisakuzi chako hakiauniwi kufika kwa clipboard moja kwa moja. Tafadhali tumia njia fupi ya kinanda taipu, kama Ctrl+X\/C\/V.",
+"Heading 4": "Kichwa 4",
+"Div": "Div",
+"Heading 2": "Kichwa 2",
+"Paste": "Bandika",
+"Close": "Funga",
+"Font Family": "Jamii ya fonti",
+"Pre": "Iliofomatiwa",
+"Align right": "Panga kulia",
+"New document": "Waraka mpya",
+"Blockquote": "Nukuu",
+"Numbered list": "Orodha ya nambari",
+"Heading 1": "Kichwa 1",
+"Headings": "Vichwa",
+"Increase indent": "Ongeza jongezo",
+"Formats": "Fomati",
+"Headers": "Vijajuu",
+"Select all": "Chagua zote",
+"Header 3": "Kijajuu 3",
+"Blocks": "Matofali",
+"Undo": "Tengua",
+"Strikethrough": "Mkato ulalo",
+"Bullet list": "Orodha ya tobo",
+"Header 1": "Kijajuu 1",
+"Superscript": "Hati juu",
+"Clear formatting": "Safisha fomati",
+"Font Sizes": "Ukubwa wa fonti",
+"Subscript": "Hati chini",
+"Header 6": "Kijajuu 6",
+"Redo": "Rudia",
+"Paragraph": "Aya",
+"Ok": "Ok",
+"Bold": "Nene",
+"Code": "Kodi",
+"Italic": "Italiki",
+"Align center": "Panga katikati",
+"Header 5": "Kijajuu 5",
+"Heading 6": "Kichwa 6",
+"Heading 3": "Kichwa 3",
+"Decrease indent": "Punguza jongezo",
+"Header 4": "Kijajuu 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Bandika sasa iko katika modi ya matini ghafi. Yaliyomo yatabandikwa kama matini ghafi mpaka utakapo zima chaguo hili.",
+"Underline": "Pigia mstari",
+"Cancel": "Ghairi",
+"Justify": "Sawazisha",
+"Inline": "Inline",
+"Copy": "Nakili",
+"Align left": "Panga kushoto",
+"Visual aids": "Misaada ya kuona",
+"Lower Greek": "Herufi ndogo za kigiriki",
+"Square": "Mraba",
+"Default": "Difoti",
+"Lower Alpha": "Herufi ndogo",
+"Circle": "Duara",
+"Disc": "Nukta",
+"Upper Alpha": "Herufi kubwa",
+"Upper Roman": "Herufi kubwa za kirumi",
+"Lower Roman": "Herufi ndogo za kirumi",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Kitambulisho kinapaswa kuanza na herufi kufwatiwa na maherufi, manambari, madeshi, vitone, minukta pacha au vistari chini pekee.",
+"Name": "Jina",
+"Anchor": "Nanga",
+"Id": "Kitambulisho",
+"You have unsaved changes are you sure you want to navigate away?": "Uko na mabadilisho ambayo hujayahifadhi. Una hakika unataka kuwacha?",
+"Restore last draft": "Rejesha mswadajaribio wa mwisho",
+"Special character": "Kikambo maalum",
+"Source code": "Chanzo",
+"Language": "Lugha",
+"Insert\/Edit code sample": "Ingiza\/hariri mfano wa kodi",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "Rangi",
+"Right to left": "Kulia-kushoto",
+"Left to right": "Kushoto-kulia",
+"Emoticons": "Emoticons",
+"Robots": "Roboti",
+"Document properties": "Sifa za waraka",
+"Title": "Kichwa",
+"Keywords": "Maneno misingi",
+"Encoding": "Usimbaji",
+"Description": "Fafanuo",
+"Author": "Mwandishi",
+"Fullscreen": "Skrini kamili",
+"Horizontal line": "Mstari mlalo",
+"Horizontal space": "Nafasi mlalo",
+"Insert\/edit image": "Ingiza\/hariri picha",
+"General": "Ujumla",
+"Advanced": "Hali ya juu",
+"Source": "Kodi ya chanzo",
+"Border": "Mkingo",
+"Constrain proportions": "Lazimisha uwiano",
+"Vertical space": "Nafasi wima",
+"Image description": "Fafanuo la picha",
+"Style": "Mtindo",
+"Dimensions": "Kipimo",
+"Insert image": "Ingiza picha",
+"Image": "Picha",
+"Zoom in": "Kuza zaidi",
+"Contrast": "Ulinganuzi",
+"Back": "Nyuma",
+"Gamma": "Gamma",
+"Flip horizontally": "Geuza mlalo",
+"Resize": "Badilisha ukubwa",
+"Sharpen": "Chonga",
+"Zoom out": "Fifiza",
+"Image options": "Machaguo ya picha",
+"Apply": "Omba",
+"Brightness": "Mwangaza",
+"Rotate clockwise": "Zungusha mwelekeo saa",
+"Rotate counterclockwise": "Zungusha mwelekeo kinyume cha saa",
+"Edit image": "Hariri",
+"Color levels": "Viwango vya rangi",
+"Crop": "Puna",
+"Orientation": "Uelekeo",
+"Flip vertically": "Geuza wima",
+"Invert": "Pindua",
+"Date\/time": "Tarehe\/saa",
+"Insert date\/time": "Ingiza tarehe\/saa",
+"Remove link": "Ondoa kiungo",
+"Url": "URL",
+"Text to display": "Matini ya kuonyesha",
+"Anchors": "Mananga",
+"Insert link": "Ingiza kiungo",
+"Link": "Kiungo",
+"New window": "Dirisha jipya",
+"None": "Hakuna",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL ulioingiza unaonekana ni kama kiungo cha nje. Unataka kuongeza prefix inayohitajika, ambayo ni http:\/\/ ?",
+"Paste or type a link": "Bandika au kuchapa kiungo",
+"Target": "Lengo",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL ulioingiza unaonekana ni kama anwani ya barua pepe. Unataka kuongeza prefix inayohitajika, ambayo ni mailto: ?",
+"Insert\/edit link": "Ingiza\/hariri kiungo",
+"Insert\/edit video": "Ingiza\/hariri video",
+"Media": "Midia",
+"Alternative source": "Chanzo cha mbadala",
+"Paste your embed code below:": "Bandika kodi yako ya kupachika hapo chini:",
+"Insert video": "Ingiza video",
+"Poster": "Bando",
+"Insert\/edit media": "Ingiza\/hariri midia",
+"Embed": "Pachika",
+"Nonbreaking space": "Nafasi fungamanishi",
+"Page break": "Kigawa kurasa",
+"Paste as text": "Bandika kama matini",
+"Preview": "Hakikisho",
+"Print": "Chapisha",
+"Save": "Hifadhi",
+"Could not find the specified string.": "Haikuweza kupata tungo lililoelezwa.",
+"Replace": "Badilisha",
+"Next": "Ifuatayo",
+"Whole words": "Maneno kamili",
+"Find and replace": "Tafuta na badilisha",
+"Replace with": "Badilisha na",
+"Find": "Tafuta",
+"Replace all": "Badilisha zote",
+"Match case": "Tahadhari herufi ndogo\/kubwa",
+"Prev": "Iliopita",
+"Spellcheck": "Ukaguzi tahajia",
+"Finish": "Maliza",
+"Ignore all": "Puuza zote",
+"Ignore": "Puuza",
+"Add to Dictionary": "Ongeza kwa kamusi",
+"Insert row before": "Ingiza safumlalo kabla",
+"Rows": "Masafumlalo",
+"Height": "Urefu",
+"Paste row after": "Bandika safumlalo baada",
+"Alignment": "Mpangilio",
+"Border color": "Rangi ya mkingo",
+"Column group": "Kikundi cha safuwima",
+"Row": "Safumlalo",
+"Insert column before": "Ingiza safuwima kabla",
+"Split cell": "Bainisha seli",
+"Cell padding": "Pedi ya seli",
+"Cell spacing": "Nafasi ya seli",
+"Row type": "Aina ya safumlalo",
+"Insert table": "Ingiza jedwali",
+"Body": "Mwili",
+"Caption": "Manukuu",
+"Footer": "Kijachini",
+"Delete row": "Futa safumlalo",
+"Paste row before": "Bandika safumlalo kabla",
+"Scope": "Wigo",
+"Delete table": "Futa jedwali",
+"H Align": "Pangilia mlalo",
+"Top": "Juu",
+"Header cell": "Seli ya kijajuu",
+"Column": "Safuwima",
+"Row group": "Kikundi cha safumlalo",
+"Cell": "Seli",
+"Middle": "Katikati",
+"Cell type": "Aina ya seli",
+"Copy row": "Nakili safumlalo",
+"Row properties": "Mali ya safumlalo",
+"Table properties": "Masifa ya jedwali",
+"Bottom": "Chini",
+"V Align": "Pangilia wima",
+"Header": "Kijajuu",
+"Right": "Kulia",
+"Insert column after": "Ingiza safuwima baada",
+"Cols": "Masafuwima",
+"Insert row after": "Ingiza safumlalo baada",
+"Width": "Upana",
+"Cell properties": "Mali ya seli",
+"Left": "Kushoto",
+"Cut row": "Kata safumlalo",
+"Delete column": "Futa safuwima",
+"Center": "Katikati",
+"Merge cells": "Unganisha maseli",
+"Insert template": "Ingiza templeti",
+"Templates": "Templeti",
+"Background color": "Rangi ya usuli",
+"Custom...": "Desturi...",
+"Custom color": "Rangi ya desturi",
+"No color": "Hakuna rangi",
+"Text color": "Rangi ya matini",
+"Table of Contents": "Jedwali la yaliyomo",
+"Show blocks": "Onyesha matofali",
+"Show invisible characters": "Onyesha vibambo visivyoonekana",
+"Words: {0}": "Maneno: {0}",
+"Insert": "Ingiza",
+"File": "Faili",
+"Edit": "Hariri picha",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Eneo la matini tondoti. Bofya ALT-F9 kwa menyu. Bofya ALT-F10 kwa upauzana. Bofya ALT-0 kwa usaidizi",
+"Tools": "Zana",
+"View": "Mtazamo",
+"Table": "Jedwali",
+"Format": "Fomati",
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/sy.js b/core/media/editors/tinymce/langs/sy.js
new file mode 100644
index 00000000..70520dd4
--- /dev/null
+++ b/core/media/editors/tinymce/langs/sy.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('sy',{
+"Cut": "\u0729\u0718\u0728",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0721\u0713\u0712\u0717 Ctrl+X\/C\/V \u0712\u072a\u0718\u0723\u072a \u0715\u071d\u0718\u071f\u0742 \u0720\u0710 \u071d\u0720\u0717 \u0721\u072c\u0725\u0715\u072a\u0722\u0710 \u071a\u0715\u072a\u072b\u0710 \u0720\u0725\u0712\u0742\u072a\u0710 \u0720\u071b\u0712\u0742\u0720\u071d\u072c \u0729\u071d\u0728\u072c\u0710. \u0710\u0722 \u0712\u0723\u0721\u0710 \u0720\u0718\u071f\u0742 \u0721\u0726\u0720\u071a \u0713\u0715\u071d\u0721\u0718\u072c \u0729\u0726\u0720\u0710",
+"Paste": "\u0715\u0712\u072b",
+"Close": "\u0715\u0712\u0742\u0718\u072a",
+"Align right": "\u0721\u0723\u0715\u072a\u072c\u0710 \u0720\u071d\u0721\u071d\u0722\u0710",
+"New document": "\u0722\u0718\u0717\u072a\u0710 \u071a\u0715\u072c\u0710",
+"Numbered list": "\u0729\u071d\u0721\u072c\u0710 \u0721\u072a\u0718\u0729\u0721\u072c\u0710",
+"Increase indent": "\u0721\u0719\u071d\u0715 \u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0715\u072b\u0718\u072a\u071d\u0710 \u0715\u0723\u072a\u071b\u0710",
+"Formats": "\u0710\u0723\u071f\u071d\u0721\u0308\u0710",
+"Select all": "\u0726\u072a\u0718\u072b \u0720\u071f\u0720",
+"Undo": "\u0720\u0710 \u0725\u0712\u0742\u0718\u0715",
+"Strikethrough": "\u0723\u072a\u071b\u0710 \u0721\u0713\u0718",
+"Bullet list": "\u0729\u071d\u0721\u072c\u0710 \u0715\u071f\u0726\u071d\u072c\u0308\u0710",
+"Superscript": "\u072a\u0712 \u0723\u072a\u071b\u0710",
+"Clear formatting": "\u072b\u071d\u0718\u0726 \u0720\u0710\u0723\u071f\u071d\u0721\u0308\u0710",
+"Subscript": "\u0726\u0725\u0718\u072c \u0723\u072a\u071b\u0710",
+"Redo": "\u0721\u071b\u071d\u0712\u0742\u0710",
+"Ok": "\u071b\u0712\u0742\u0710",
+"Bold": "\u071a\u0720\u071d\u0721\u0710",
+"Italic": "\u0713\u0722\u071d\u0710",
+"Align center": "\u0721\u0723\u0715\u072a\u072c\u0710 \u0712\u0726\u0720\u0713\u0710",
+"Decrease indent": "\u0721\u0712\u0728\u072a \u0723\u0726\u071d\u0729\u0718\u072c \u0715\u072b\u0718\u072a\u071d\u0710 \u0715\u0723\u072a\u071b\u0710",
+"Underline": "\u072c\u071a\u0718\u072c \u0713\u0330\u072a\u0713\u0710",
+"Cancel": "\u0721\u0712\u071b\u0720",
+"Justify": "\u0721\u0719\u0715\u0715\u0729\u0722\u0718\u072c\u0710",
+"Copy": "\u0722\u0723\u0718\u071f\u073c",
+"Align left": "\u0721\u0723\u0715\u072a\u072c\u0710 \u0720\u0723\u0721\u0720\u0710",
+"Visual aids": "\u0725\u0718\u0715\u072a\u0308\u0722\u0710 \u0721\u072c\u071a\u0719\u071d\u0722\u0308\u0710",
+"Lower Greek": "\u071d\u0718\u0722\u0722\u071d\u0710 \u072c\u071a\u072c\u071d\u0710",
+"Square": "\u0721\u072a\u0712\u0725\u0710",
+"Default": "\u0726\u072a\u071d\u072b\u0710",
+"Lower Alpha": "\u0710\u0720\u0726\u0712\u071d\u072c \u072c\u071a\u072c\u071d\u0308\u0710",
+"Circle": "\u071a\u0718\u0715\u072a\u0710",
+"Disc": "\u0729\u0712\u0742\u0722\u0710",
+"Upper Alpha": "\u0710\u0720\u0726\u0712\u071d\u072c \u0725\u0720\u071d\u072c\u0710",
+"Upper Roman": "\u072a\u0718\u0721\u0722 \u0725\u0720\u071d\u072c\u0710",
+"Lower Roman": "\u072a\u0718\u0721\u0722 \u072c\u071a\u072c\u071d\u072c\u0710",
+"Name": "\u072b\u0721\u0710",
+"Anchor": "\u0721\u072a\u0723\u0710",
+"You have unsaved changes are you sure you want to navigate away?": "\u0720\u0710 \u071d\u0718\u072c \u071a\u0718\u0721\u071d\u0710 \u0720\u072b\u0718\u071a\u0720\u0726\u0308\u0710\u060c \u071d\u0718\u072c \u071a\u072c\u071d\u072c\u0710 \u0715\u0712\u0725\u072c \u0726\u0720\u071b\u072c\u061f",
+"Restore last draft": "\u071a\u0721\u071d \u0720\u0721\u0718\u071f\u0721\u072c\u0710 \u071a\u072a\u071d\u072c\u0710",
+"Special character": "\u0710\u072c\u0718\u072c\u0710 \u0715\u071d\u0720\u0722\u071d\u072c\u0710",
+"Source code": "\u071f\u0718\u0715\u0710 \u0715\u0721\u0712\u0718\u0725\u0710",
+"Right to left": "\u071d\u0721\u071d\u0722\u0710 \u0720\u0723\u0721\u0720\u0710",
+"Left to right": "\u0723\u0721\u0720\u0710 \u0720\u071d\u0721\u071d\u0722\u0710",
+"Emoticons": "\u072a\u0308\u0721\u0719\u0710 \u0722\u0712\u0742\u0717\u071d\u0308\u0710",
+"Robots": "\u072a\u0718\u0712\u0718\u072c\u0308\u0710",
+"Document properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u0710\u072b\u071b\u072a\u0308\u0710",
+"Title": "\u0721\u0718\u0722\u0725\u0710",
+"Keywords": "\u071a\u0712\u072a\u0308\u0710 \u0715\u0729\u0715\u071d\u0720\u0710",
+"Encoding": "\u0721\u072c\u072a\u0721\u0719\u0718\u072c\u0710",
+"Description": "\u0710\u072a\u071d\u071f\u0742\u0718\u072c\u0710",
+"Author": "\u0723\u071d\u0718\u0721\u0710",
+"Fullscreen": "\u072b\u072b\u072c\u0710 \u0721\u0720\u071d\u072c\u0710",
+"Horizontal line": "\u0723\u072a\u071b\u0710 \u0710\u0718\u0726\u0729\u071d\u0710",
+"Horizontal space": "\u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0710\u0718\u0726\u0729\u071d\u072c\u0710",
+"Insert\/edit image": "\u0721\u0725\u0712\u0742\u072a\/\u072b\u071a\u0720\u0726 \u0720\u0728\u0718\u072a\u072c\u0710",
+"General": "\u0713\u0718\u0722\u071d\u0710",
+"Advanced": "\u0721\u072b\u0718\u072b\u071b\u0710",
+"Source": "URL",
+"Border": "\u072c\u071a\u0718\u0721\u0308\u0710",
+"Constrain proportions": "\u0712\u071d\u072c\u071d\u0718\u072c\u0710 \u0715\u0721\u0729\u0718\u0715\u0722\u0718\u072c\u0710",
+"Vertical space": "\u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0725\u0721\u0718\u0715\u071d\u072c\u0710",
+"Image description": "\u0710\u072a\u071d\u071f\u0742\u0718\u072c\u0710 \u0715\u0728\u0718\u072a\u072c\u0710",
+"Style": "\u0710\u0723\u071f\u071d\u0721\u0710",
+"Dimensions": "\u072a\u071a\u0729\u0718\u072c\u0710",
+"Insert image": "\u0721\u0725\u0712\u0742\u072a \u0728\u0718\u072a\u072c\u0710",
+"Insert date\/time": "\u0721\u0725\u0712\u0742\u072a \u0723\u071d\u0729\u0718\u0721\u0710\/\u0725\u0715\u0722\u0710",
+"Remove link": "\u072b\u071d\u0718\u0726 \u0720\u0710\u0723\u072a\u0710",
+"Url": "Url",
+"Text to display": "\u0728\u071a\u071a\u0710 \u0720\u0721\u071a\u0719\u0718\u071d\u0710",
+"Insert link": "\u0721\u0725\u0712\u0742\u072a \u0710\u0723\u072a\u0710",
+"New window": "\u0718\u071d\u0722\u0715\u0718\u0719 \u071a\u0715\u072c\u072c\u0710",
+"None": "\u0717\u071d\u071f\u0330 \u071a\u0715",
+"Target": "\u0722\u071d\u072b\u0710",
+"Insert\/edit link": "\u0721\u0725\u0712\u0742\u072a\/\u0723\u071d\u0721\u072c\u0710 \u0715\u0710\u0723\u072a\u0710",
+"Insert\/edit video": "\u0721\u0725\u0712\u0742\u072a\/\u0723\u071d\u0721\u072c\u0710 \u0715\u0712\u0742\u071d\u0715\u071d\u0718",
+"Poster": "\u072b\u0718\u072c\u0726\u071d\u072c\u0308\u0710",
+"Alternative source": "\u0721\u0712\u0718\u0725\u0710 \u072c\u071a\u0720\u0718\u0726\u0710",
+"Paste your embed code below:": "\u0715\u0712\u072b \u071f\u0718\u0715\u0710 \u071a\u0712\u0742\u071d\u072b\u0710 \u0712\u0710\u0720\u072c\u071a\u072c:",
+"Insert video": "\u0721\u0725\u0712\u0742\u072a \u0712\u0742\u071d\u0715\u071d\u0718",
+"Embed": "\u071a\u0712\u0742\u0718\u072b",
+"Nonbreaking space": "\u0720\u071d\u072c \u0729\u071b\u0725\u072c\u0710 \u0715\u0723\u0726\u071d\u0729\u0718\u072c\u0710",
+"Preview": "\u071a\u071d\u072a\u072c\u0710",
+"Print": "\u071b\u0712\u0742\u0725\u072c\u0710",
+"Save": "\u071a\u0721\u071d\u072c\u0710",
+"Could not find the specified string.": "\u0720\u0710 \u0721\u0728\u0710 \u0720\u0717 \u0721\u072b\u071f\u0330\u0718\u071a\u0710 \u072b\u072b\u0720\u072c\u0710 \u072c\u0718\u071a\u0721\u072c\u0710",
+"Replace": "\u072b\u071a\u0720\u0726",
+"Next": "\u0712\u072c\u0742\u072a\u0717",
+"Whole words": "\u071f\u0720\u071d\u0717\u071d \u071a\u0712\u072a\u0308\u0710",
+"Find and replace": "\u0721\u072b\u071f\u0330\u071a \u0718\u072b\u071a\u0720\u0726",
+"Replace with": "\u072b\u071a\u0720\u0726 \u0712\u071d\u0715",
+"Find": "\u0721\u072b\u071f\u0330\u071a",
+"Replace all": "\u072b\u071a\u0720\u0726 \u071f\u0720\u071d\u0717\u071d",
+"Match case": "\u0713\u0718\u072a\u072c\u0710\/\u0719\u0725\u072a\u072c\u0710 ",
+"Prev": "\u0715\u0725\u0712\u0742\u072a",
+"Spellcheck": "\u0728\u071a\u0728\u071d\u072c\u0710 \u0715\u0717\u0718\u0713\u071d\u0710",
+"Finish": "\u0726\u072a\u0729\u0710",
+"Ignore all": "\u0710\u0717\u0721\u071d \u071f\u0720\u071d\u0717\u071d",
+"Ignore": "Ign\u0725\u0715\u0722\u0710",
+"Insert row before": "\u0721\u0725\u0712\u0742\u072a \u0713\u0330\u072a\u0713\u0710 \u0721\u0729\u0715\u0747\u0721",
+"Rows": "Righe",
+"Height": "\u071d\u0721\u071d\u0722\u0710",
+"Paste row after": "\u0715\u0712\u072b \u0713\u0330\u072a\u0713\u0710 \u0712\u072c\u072a",
+"Alignment": "\u0721\u0713\u0330\u072a\u0713\u0722\u072c\u0710",
+"Column group": "\u071f\u0718\u0722\u072b\u0710 \u0715\u0725\u0721\u0718\u0715\u0710",
+"Row": "\u0713\u0330\u072a\u0713\u0710",
+"Insert column before": "\u0721\u0725\u0712\u0742\u072a \u0725\u0721\u0718\u0715\u0710 \u0721\u0729\u0715\u0721",
+"Split cell": "\u0712\u072a\u0712\u0719 \u0720\u0729\u0720\u071d\u072c\u0710",
+"Cell padding": "\u0721\u0720\u071d\u072c\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
+"Cell spacing": "\u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
+"Row type": "\u0710\u0715\u072b\u0710 \u0715\u0713\u0330\u072a\u0713\u0710",
+"Insert table": "\u0721\u0725\u0712\u0742\u072a \u0720\u071b\u0712\u0720\u0710",
+"Body": "\u0726\u0713\u073c\u072a\u0735\u0710",
+"Caption": "\u0712\u072a\u072b\u0721\u0710",
+"Footer": "\u0710\u0729\u0726\u072c\u0742\u0710",
+"Delete row": "\u072b\u0718\u0726 \u0720\u0713\u0330\u072a\u0713\u0710",
+"Paste row before": "\u0715\u0712\u072b \u0713\u0330\u072a\u0713\u0710 \u0721\u0729\u0715\u0721",
+"Scope": "\u071a\u0729\u0720\u0710",
+"Delete table": "\u072b\u0718\u0726 \u0720\u071b\u0712\u0720\u0710",
+"Header cell": "\u0729\u0720\u071d\u072c\u0710 \u0715\u072a\u072b\u0710",
+"Column": "\u0725\u0721\u0718\u0715\u0710",
+"Cell": "\u0729\u0720\u071d\u072c\u0710",
+"Header": "\u072a\u072b\u0710",
+"Cell type": "\u0710\u0715\u072b\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
+"Copy row": "\u0722\u0723\u0718\u071f\u0742 \u0713\u0330\u072a\u0713\u0710",
+"Row properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u0713\u072a\u0713\u0710",
+"Table properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u071b\u0712\u0720\u0710",
+"Row group": "\u071f\u0718\u0722\u072b\u0710 \u0715\u0713\u0330\u072a\u0713\u0710",
+"Right": "\u071d\u0721\u071d\u0722\u0710",
+"Insert column after": "\u0721\u0725\u0712\u0742\u072a \u0725\u0721\u0718\u0715\u0710 \u0712\u072c\u072a",
+"Cols": "\u0725\u0721\u0718\u0715\u0308\u0710",
+"Insert row after": "\u0721\u0725\u0712\u0742\u072a \u0713\u0330\u072a\u0713\u0710 \u0712\u072c\u072a",
+"Width": "\u0726\u072c\u0742\u071d\u0718\u072c\u0742\u0710",
+"Cell properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
+"Left": "\u0723\u0721\u0720\u0710",
+"Cut row": "\u0729\u0718\u0728 \u0713\u0330\u072a\u0713\u0710",
+"Delete column": "\u072b\u0718\u0726 \u0725\u0721\u0718\u0715\u0710",
+"Center": "\u0726\u0720\u0713\u0710",
+"Merge cells": "\u071a\u071d\u0715 \u0729\u0720\u071d\u072c\u0308\u0710",
+"Insert template": "\u0721\u0725\u0712\u0742\u072a \u0729\u0720\u0712\u0742\u0710",
+"Templates": "\u0729\u0720\u0712\u0742\u0710",
+"Background color": "\u0713\u0718\u0722\u0710 \u0715\u0712\u072c\u072a\u071d\u0718\u072c\u0710",
+"Text color": "\u0713\u0718\u0722\u0710 \u0715\u0728\u071a\u071a\u0710",
+"Show blocks": "\u0721\u071a\u0719\u071d \u0720\u0713\u0718\u072b\u0721\u0710",
+"Show invisible characters": "\u0721\u071a\u0719\u071d \u0720\u0710\u072c\u0718\u072c\u0308\u0710 \u0720\u0710 \u0721\u072c\u071a\u0719\u071d\u0722\u0308\u0710",
+"Words: {0}": "{0} :\u071a\u0712\u072a\u0308\u0710",
+"Insert": "\u0721\u0725\u0712\u0742\u072a",
+"File": "\u071f\u0722\u0726\u072a\u0710",
+"Edit": "\u0723\u071d\u0721\u072c\u0710",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help":"\u0729\u0710 \u0719\u0718\u0720\u0721\u0710\u0722\u0710 \u0729\u0710 \u0725\u0718\u0715\u072a\u0722\u0710 ALT-F10 \u0729\u0710 \u0720\u0718\u071a\u071d\u072c\u0710. \u0715\u0718\u072b ALT-F9 \u0715\u0718\u072b  .Rich Text Area \u0726\u0722\u071d\u072c\u0710 \u0715",
+"Tools": "\u0719\u0718\u0720\u0721\u0710\u0722\u0710",
+"View": "\u071a\u0719\u071d\u072c\u0710",
+"Table": "\u071b\u0712\u0720\u0710",
+"Format": "\u0710\u0723\u071f\u071d\u0721\u0710",
+"Inline": "\u0725\u0720 \u0713\u0330\u072a\u0713\u0710",
+"Blocks": "\u0713\u0718\u072b\u0721\u0710",
+"Edit image": "\u0723\u071d\u0721\u072c\u0710 \u0715\u0728\u0718\u072a\u072c\u0710",
+"Font Family": "\u071f\u0720\u0726\u072c \u0715\u0726\u032e\u0718\u0722\u072c",
+"Font Sizes": "\u072a\u0308\u0712\u0718\u072c\u0710 \u0715\u0726\u032e\u0718\u0722\u072c",
+"Paragraph": "\u0726\u072c\u0742\u0713\u073c\u0721\u0710",
+"Address": "\u0721\u0718\u0722\u0725\u0710",
+"Pre": "\u0721\u072c\u0729\u0720\u0712\u0742\u0722\u0718\u072c\u0710 \u0729\u0715\u0747\u0721\u072c\u0710",
+"Code": "\u071f\u0718\u0715\u0710",
+"Headers": "\u072a\u0308\u072b\u0722\u0710",
+"Header 1": "\u072a\u072b\u0710 1",
+"Header 2": "\u072a\u072b\u0710 2",
+"Header 3": "\u072a\u072b\u0710 3",
+"Header 4": "\u072a\u072b\u0710 4",
+"Header 5": "\u072a\u072b\u0710 5",
+"Header 6": "\u072a\u072b\u0710 6",
+"Insert Time": "\u0721\u0725\u0712\u0742\u072a \u0725\u0715\u0722\u0710",
+"Insert nonbreaking space": "\u0721\u0725\u0712\u0742\u072a \u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0720\u0710 \u072c\u0712\u0742\u071d\u072a\u072c\u0710",
+"Toggle blockquote": "\u072b\u071a\u0720\u0726 \u0720\u0713\u0718\u072b\u0721\u072c\u0742 \u072b\u0729\u0720\u072c\u0710",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "http:\/\/ prefix? \u0715\u0721\u0718\u0725\u0712\u0742\u072a\u0718\u071f\u0742 \u0721\u0712\u071d\u0718\u0722\u0710 \u071d\u0720\u0717 \u0715\u0717\u0307\u0718 \u071a\u0715 \u0710\u0723\u072a\u0710 \u0712\u072a\u071d\u0710 \u071d\u0720\u0717. \u0712\u0725\u072c \u072c\u0718\u0723\u0726\u072c URL",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "mailto: prefix? \u0715\u0721\u0718\u0725\u0712\u0742\u072a\u0718\u071f\u073c \u0721\u0712\u071d\u0718\u0722\u0710 \u071d\u0720\u0717 \u0715\u0717\u0307\u0718 \u071d\u0720\u0717 \u0721\u0718\u0722\u0725\u0710 \u0715\u0712\u071d\u0720\u0715\u072a\u0710 \u0710\u0720\u071f\u072c\u072a\u0718\u0722\u071d\u0710. \u0712\u0725\u072c \u072c\u0718\u0723\u0726\u072c \u0720\u071b\u0720\u0712\u072c\u0710  URL",
+"_dir": "rtl"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ta.js b/core/media/editors/tinymce/langs/ta.js
new file mode 100644
index 00000000..4467ee67
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ta.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('ta',{
+"Cut": "\u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Heading 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
+"Header 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0ba8\u0b95\u0bb2\u0b95\u0ba4\u0bcd\u0ba4\u0bbf\u0bb1\u0bcd\u0b95\u0bc1 \u0ba8\u0bc7\u0bb0\u0b9f\u0bbf \u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bc8 \u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb2\u0bbe\u0bb5\u0bbf \u0b86\u0ba4\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8. \u0b86\u0b95\u0bb5\u0bc7 \u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bbe\u0ba9 Ctrl+X\/C\/V \u0b87\u0bb5\u0bb1\u0bcd\u0bb1\u0bc8 \u0ba4\u0baf\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0ba4\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95.",
+"Heading 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
+"Div": "\u0baa\u0bbf\u0bb0\u0bbf\u0bb5\u0bc1 (Div)",
+"Heading 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
+"Paste": "\u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Close": "\u0bae\u0bc2\u0b9f\u0bc1\u0b95",
+"Font Family": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b95\u0bc1\u0b9f\u0bc1\u0bae\u0bcd\u0baa\u0bae\u0bcd",
+"Pre": "\u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1 (Pre)",
+"Align right": "\u0bb5\u0bb2\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
+"New document": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b86\u0bb5\u0ba3\u0bae\u0bcd",
+"Blockquote": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bcb\u0bb3\u0bcd",
+"Numbered list": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
+"Heading 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
+"Headings": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Increase indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b85\u0ba4\u0bbf\u0b95\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
+"Formats": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Headers": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Select all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
+"Header 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
+"Blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bcd",
+"Undo": "\u0bae\u0bc1\u0ba9\u0bcd\u0b9a\u0bc6\u0baf\u0bb2\u0bcd \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"Strikethrough": "\u0ba8\u0b9f\u0bc1\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
+"Bullet list": "\u0baa\u0bca\u0b9f\u0bcd\u0b9f\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f  \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
+"Header 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
+"Superscript": "\u0bae\u0bc7\u0bb2\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
+"Clear formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b85\u0bb4\u0bbf\u0b95\u0bcd\u0b95",
+"Font Sizes": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1\u0b95\u0bb3\u0bcd",
+"Subscript": "\u0b95\u0bc0\u0bb4\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
+"Header 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
+"Redo": "\u0bae\u0bc0\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
+"Paragraph": "\u0baa\u0ba4\u0bcd\u0ba4\u0bbf",
+"Ok": "\u0b9a\u0bb0\u0bbf",
+"Bold": "\u0ba4\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
+"Code": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
+"Italic": "\u0b9a\u0bbe\u0baf\u0bcd\u0bb5\u0bc1",
+"Align center": "\u0bae\u0bc8\u0baf \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
+"Header 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
+"Heading 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
+"Heading 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
+"Decrease indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b95\u0bc1\u0bb1\u0bc8\u0b95\u0bcd\u0b95",
+"Header 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1. \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc8 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bb0\u0bc8 \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd.",
+"Underline": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
+"Cancel": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
+"Justify": "\u0ba8\u0bc7\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
+"Inline": "\u0b89\u0bb3\u0bcd\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
+"Copy": "\u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
+"Align left": "\u0b87\u0b9f\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
+"Visual aids": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0ba4\u0bcd \u0ba4\u0bc1\u0ba3\u0bc8\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd",
+"Lower Greek": "\u0b95\u0bc0\u0bb4\u0bcd \u0b95\u0bbf\u0bb0\u0bc7\u0b95\u0bcd\u0b95\u0bae\u0bcd",
+"Square": "\u0b9a\u0ba4\u0bc1\u0bb0\u0bae\u0bcd",
+"Default": "\u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
+"Lower Alpha": "\u0b95\u0bc0\u0bb4\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
+"Circle": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bae\u0bcd",
+"Disc": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bc1",
+"Upper Alpha": "\u0bae\u0bc7\u0bb2\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
+"Upper Roman": "\u0bae\u0bc7\u0bb2\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
+"Lower Roman": "\u0b95\u0bc0\u0bb4\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0b86\u0ba9\u0ba4\u0bc1 \u0b92\u0bb0\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd; \u0b87\u0ba4\u0ba9\u0bc8\u0ba4\u0bcd \u0ba4\u0bca\u0b9f\u0bb0\u0bcd\u0ba8\u0bcd\u0ba4\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd, \u0b8e\u0ba3\u0bcd\u0b95\u0bb3\u0bcd, \u0b87\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (-), \u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (.), \u0bae\u0bc1\u0b95\u0bcd\u0b95\u0bbe\u0bb1\u0bcd\u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (:) \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (_) \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bc7 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd.",
+"Name": "\u0baa\u0bc6\u0baf\u0bb0\u0bcd",
+"Anchor": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bbe\u0ba4 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba9; \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb1\u0bc1\u0ba4\u0bbf\u0baf\u0bbe\u0b95 \u0bb5\u0bc6\u0bb3\u0bbf\u0baf\u0bc7\u0bb1 \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bbe\u0bb3\u0bbe?",
+"Restore last draft": "\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bb0\u0bc8\u0bb5\u0bc8 \u0bae\u0bc0\u0b9f\u0bcd\u0b9f\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
+"Special character": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
+"Source code": "\u0bae\u0bc2\u0bb2 \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
+"Language": "\u0bae\u0bca\u0bb4\u0bbf",
+"Insert\/Edit code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
+"Right to left": "\u0bb5\u0bb2\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0b87\u0b9f\u0bae\u0bcd",
+"Left to right": "\u0b87\u0b9f\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bb5\u0bb2\u0bae\u0bcd",
+"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
+"Robots": "\u0baa\u0bca\u0bb1\u0bbf\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd (Robots)",
+"Document properties": "\u0b86\u0bb5\u0ba3\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Title": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
+"Keywords": "\u0bae\u0bc1\u0ba4\u0ba9\u0bcd\u0bae\u0bc8\u0b9a\u0bcd\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
+"Encoding": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
+"Description": "\u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
+"Author": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0bb3\u0bb0\u0bcd",
+"Fullscreen": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8",
+"Horizontal line": "\u0b95\u0bbf\u0b9f\u0bc8 \u0b95\u0bcb\u0b9f\u0bc1",
+"Horizontal space": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
+"Insert\/edit image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
+"General": "\u0baa\u0bca\u0ba4\u0bc1",
+"Advanced": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
+"Source": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd",
+"Border": "\u0b95\u0bb0\u0bc8",
+"Constrain proportions": "\u0bb5\u0bbf\u0b95\u0bbf\u0ba4\u0bbe\u0b9a\u0bcd\u0b9a\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
+"Vertical space": "\u0ba8\u0bc6\u0b9f\u0bc1\u0ba4\u0bb3 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
+"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
+"Style": "\u0baa\u0bbe\u0ba3\u0bbf",
+"Dimensions": "\u0baa\u0bb0\u0bbf\u0bae\u0bbe\u0ba3\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
+"Insert image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Image": "\u0baa\u0b9f\u0bae\u0bcd",
+"Zoom in": "\u0baa\u0bc6\u0bb0\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
+"Contrast": "\u0ba8\u0bbf\u0bb1\u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
+"Back": "\u0baa\u0bbf\u0ba9\u0bcd",
+"Gamma": "Gamma",
+"Flip horizontally": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f\u0bae\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
+"Resize": "\u0bae\u0bb1\u0bc1\u0b85\u0bb3\u0bb5\u0bbf\u0b9f\u0bc1",
+"Sharpen": "\u0b95\u0bc2\u0bb0\u0bcd\u0bae\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
+"Zoom out": "\u0b9a\u0bbf\u0bb1\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
+"Image options": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Apply": "\u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
+"Brightness": "\u0b92\u0bb3\u0bbf\u0bb0\u0bcd\u0bb5\u0bc1",
+"Rotate clockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
+"Rotate counterclockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0 \u0b8e\u0ba4\u0bbf\u0bb0\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
+"Edit image": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bca\u0b95\u0bc1",
+"Color levels": "\u0bb5\u0ba3\u0bcd\u0ba3 \u0ba8\u0bbf\u0bb2\u0bc8\u0b95\u0bb3\u0bcd",
+"Crop": "\u0b9a\u0bc6\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1",
+"Orientation": "\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bae\u0bc8\u0bb5\u0bc1",
+"Flip vertically": "\u0b9a\u0bc6\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
+"Invert": "\u0ba8\u0bc7\u0bb0\u0bcd\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1",
+"Date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd",
+"Insert date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Remove link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Url": "\u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
+"Text to display": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0b89\u0bb0\u0bc8",
+"Anchors": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
+"Insert link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
+"New window": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
+"None": "\u0b8f\u0ba4\u0bc1\u0bae\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 http:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
+"Paste or type a link": "\u0b92\u0bb0\u0bc1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0ba4\u0b9f\u0bcd\u0b9f\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
+"Target": "\u0b87\u0bb2\u0b95\u0bcd\u0b95\u0bc1",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bae\u0bbf\u0ba9\u0bcd-\u0b85\u0b9e\u0bcd\u0b9a\u0bb2\u0bcd \u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 mailto: \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
+"Insert\/edit link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
+"Insert\/edit video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
+"Media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd",
+"Alternative source": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2\u0bae\u0bcd",
+"Paste your embed code below:": "\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bc6\u0bbe\u0ba4\u0bbf \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bcd\u0b9f\u0bc8 \u0b95\u0bc0\u0bb4\u0bc7 \u0b92\u0b9f\u0bcd\u0b9f\u0bb5\u0bc1\u0bae\u0bcd:",
+"Insert video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Poster": "\u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf",
+"Insert\/edit media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
+"Embed": "\u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf",
+"Nonbreaking space": "\u0baa\u0bbf\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
+"Page break": "\u0baa\u0b95\u0bcd\u0b95 \u0baa\u0bbf\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
+"Paste as text": "\u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Preview": "\u0bae\u0bc1\u0ba9\u0bcd\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
+"Print": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
+"Save": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95",
+"Could not find the specified string.": "\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bbf\u0b9f\u0bcd\u0b9f \u0b9a\u0bb0\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
+"Replace": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Next": "\u0b85\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4",
+"Whole words": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
+"Find and replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Replace with": "\u0b87\u0ba4\u0ba9\u0bc1\u0b9f\u0ba9\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Find": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
+"Replace all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
+"Match case": "\u0bb5\u0b9f\u0bbf\u0bb5\u0ba4\u0bcd\u0ba4\u0bc8 \u0baa\u0bca\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
+"Prev": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
+"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
+"Finish": "\u0bae\u0bc1\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
+"Ignore all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
+"Ignore": "\u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
+"Add to Dictionary": "\u0b85\u0b95\u0bb0\u0bbe\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
+"Insert row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Rows": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
+"Height": "\u0b89\u0baf\u0bb0\u0bae\u0bcd",
+"Paste row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
+"Border color": "\u0b95\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
+"Column group": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
+"Row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
+"Insert column before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Split cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0bbf\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
+"Cell padding": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0ba8\u0bbf\u0bb0\u0baa\u0bcd\u0baa\u0bb2\u0bcd",
+"Cell spacing": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
+"Row type": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0b95\u0bc8",
+"Insert table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Body": "\u0b89\u0b9f\u0bb2\u0bcd",
+"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
+"Footer": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
+"Delete row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"Paste row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Scope": "\u0bb5\u0bb0\u0bc8\u0baf\u0bc6\u0bb2\u0bcd\u0bb2\u0bc8",
+"Delete table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"H Align": "\u0b95\u0bbf (H) \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
+"Top": "\u0bae\u0bc7\u0bb2\u0bcd",
+"Header cell": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
+"Column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
+"Row group": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
+"Cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
+"Middle": "\u0ba8\u0b9f\u0bc1",
+"Cell type": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0bb5\u0b95\u0bc8",
+"Copy row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
+"Row properties": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Table properties": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Bottom": "\u0b95\u0bc0\u0bb4\u0bcd",
+"V Align": "\u0b9a\u0bc6 (V) \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
+"Header": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
+"Right": "\u0bb5\u0bb2\u0bae\u0bcd",
+"Insert column after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Cols": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
+"Insert row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Width": "\u0b85\u0b95\u0bb2\u0bae\u0bcd",
+"Cell properties": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
+"Left": "\u0b87\u0b9f\u0bae\u0bcd",
+"Cut row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Delete column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"Center": "\u0bae\u0bc8\u0baf\u0bae\u0bcd",
+"Merge cells": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
+"Insert template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"Templates": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
+"Background color": "\u0baa\u0bbf\u0ba9\u0bcd\u0ba9\u0ba3\u0bbf \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
+"Custom...": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd...",
+"Custom color": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
+"No color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
+"Text color": "\u0b89\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
+"Table of Contents": "\u0baa\u0bca\u0bb0\u0bc1\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd",
+"Show blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Show invisible characters": "\u0b95\u0ba3\u0bcd\u0ba3\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
+"Words: {0}": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd: {0}",
+"Insert": "\u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
+"File": "\u0b95\u0bcb\u0baa\u0bcd\u0baa\u0bc1",
+"Edit": "\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-F9 , \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1 ALT-F10 , \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0",
+"Tools": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0b95\u0bb3\u0bcd",
+"View": "\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1\u0b95",
+"Table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8",
+"Format": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/th.js b/core/media/editors/tinymce/langs/th.js
new file mode 100644
index 00000000..15bfa201
--- /dev/null
+++ b/core/media/editors/tinymce/langs/th.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('th',{
+"Cut": "\u0e15\u0e31\u0e14",
+"Heading 5": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 5",
+"Header 2": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0e40\u0e1a\u0e23\u0e32\u0e27\u0e4c\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e44\u0e21\u0e48\u0e2a\u0e19\u0e31\u0e1a\u0e2a\u0e19\u0e38\u0e19\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e16\u0e36\u0e07\u0e42\u0e14\u0e22\u0e15\u0e23\u0e07\u0e44\u0e1b\u0e22\u0e31\u0e07\u0e04\u0e25\u0e34\u0e1b\u0e1a\u0e2d\u0e23\u0e4c\u0e14 \u0e01\u0e23\u0e38\u0e13\u0e32\u0e43\u0e0a\u0e49\u0e41\u0e1b\u0e49\u0e19\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e25\u0e31\u0e14 Ctrl+X\/C\/V \u0e41\u0e17\u0e19",
+"Heading 4": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 4",
+"Div": "Div",
+"Heading 2": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 2",
+"Paste": "\u0e27\u0e32\u0e07",
+"Close": "\u0e1b\u0e34\u0e14",
+"Font Family": "\u0e15\u0e23\u0e30\u0e01\u0e39\u0e25\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
+"Pre": "\u0e01\u0e48\u0e2d\u0e19",
+"Align right": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e02\u0e27\u0e32",
+"New document": "\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23\u0e43\u0e2b\u0e21\u0e48",
+"Blockquote": "\u0e22\u0e01\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e31\u0e49\u0e07\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
+"Numbered list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e25\u0e33\u0e14\u0e31\u0e1a\u0e40\u0e25\u0e02",
+"Heading 1": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 1",
+"Headings": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
+"Increase indent": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
+"Formats": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
+"Headers": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
+"Select all": "\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
+"Header 3": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 3",
+"Blocks": "\u0e1a\u0e25\u0e47\u0e2d\u0e01",
+"Undo": "\u0e40\u0e25\u0e34\u0e01\u0e17\u0e33",
+"Strikethrough": "\u0e02\u0e35\u0e14\u0e17\u0e31\u0e1a",
+"Bullet list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2b\u0e31\u0e27\u0e02\u0e49\u0e2d\u0e22\u0e48\u0e2d\u0e22",
+"Header 1": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 1",
+"Superscript": "\u0e15\u0e31\u0e27\u0e22\u0e01",
+"Clear formatting": "\u0e25\u0e49\u0e32\u0e07\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
+"Font Sizes": "\u0e02\u0e19\u0e32\u0e14\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
+"Subscript": "\u0e15\u0e31\u0e27\u0e2b\u0e49\u0e2d\u0e22",
+"Header 6": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 6",
+"Redo": "\u0e17\u0e4d\u0e32\u0e0b\u0e49\u0e33",
+"Paragraph": "\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
+"Ok": "\u0e15\u0e01\u0e25\u0e07",
+"Bold": "\u0e15\u0e31\u0e27\u0e2b\u0e19\u0e32",
+"Code": "\u0e42\u0e04\u0e49\u0e14",
+"Italic": "\u0e15\u0e31\u0e27\u0e40\u0e2d\u0e35\u0e22\u0e07",
+"Align center": "\u0e08\u0e31\u0e14\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
+"Header 5": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 5",
+"Heading 6": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 6",
+"Heading 3": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 3",
+"Decrease indent": "\u0e25\u0e14\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
+"Header 4": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0e01\u0e32\u0e23\u0e27\u0e32\u0e07\u0e15\u0e2d\u0e19\u0e19\u0e35\u0e49\u0e2d\u0e22\u0e39\u0e48\u0e43\u0e19\u0e42\u0e2b\u0e21\u0e14\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32 \u0e40\u0e19\u0e37\u0e49\u0e2d\u0e2b\u0e32\u0e08\u0e30\u0e16\u0e39\u0e01\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32\u0e08\u0e19\u0e01\u0e27\u0e48\u0e32\u0e04\u0e38\u0e13\u0e08\u0e30\u0e1b\u0e34\u0e14\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e19\u0e35\u0e49",
+"Underline": "\u0e02\u0e35\u0e14\u0e40\u0e2a\u0e49\u0e19\u0e43\u0e15\u0e49",
+"Cancel": "\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01",
+"Justify": "\u0e40\u0e15\u0e47\u0e21\u0e41\u0e19\u0e27",
+"Inline": "\u0e41\u0e1a\u0e1a\u0e2d\u0e34\u0e19\u0e44\u0e25\u0e19\u0e4c",
+"Copy": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01",
+"Align left": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e0b\u0e49\u0e32\u0e22",
+"Visual aids": "\u0e17\u0e31\u0e28\u0e19\u0e39\u0e1b\u0e01\u0e23\u0e13\u0e4c",
+"Lower Greek": "\u0e01\u0e23\u0e35\u0e01\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
+"Square": "\u0e08\u0e31\u0e15\u0e38\u0e23\u0e31\u0e2a",
+"Default": "\u0e04\u0e48\u0e32\u0e40\u0e23\u0e34\u0e48\u0e21\u0e15\u0e49\u0e19",
+"Lower Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
+"Circle": "\u0e27\u0e07\u0e01\u0e25\u0e21",
+"Disc": "\u0e14\u0e34\u0e2a\u0e01\u0e4c",
+"Upper Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
+"Upper Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
+"Lower Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0e04\u0e27\u0e23\u0e08\u0e30\u0e02\u0e36\u0e49\u0e19\u0e15\u0e49\u0e19\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e32\u0e21\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e31\u0e27\u0e40\u0e25\u0e02 \u0e02\u0e35\u0e14\u0e01\u0e25\u0e32\u0e07 \u0e08\u0e38\u0e14 \u0e2d\u0e31\u0e12\u0e20\u0e32\u0e04 \u0e2b\u0e23\u0e37\u0e2d \u0e02\u0e35\u0e14\u0e25\u0e48\u0e32\u0e07",
+"Name": "\u0e0a\u0e37\u0e48\u0e2d",
+"Anchor": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
+"Id": "Id",
+"You have unsaved changes are you sure you want to navigate away?": "\u0e04\u0e38\u0e13\u0e21\u0e35\u0e01\u0e32\u0e23\u0e40\u0e1b\u0e25\u0e35\u0e48\u0e22\u0e19\u0e41\u0e1b\u0e25\u0e07\u0e17\u0e35\u0e48\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e17\u0e35\u0e48\u0e08\u0e30\u0e2d\u0e2d\u0e01\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48?",
+"Restore last draft": "\u0e04\u0e37\u0e19\u0e04\u0e48\u0e32\u0e41\u0e1a\u0e1a\u0e23\u0e48\u0e32\u0e07\u0e25\u0e48\u0e32\u0e2a\u0e38\u0e14",
+"Special character": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e1e\u0e34\u0e40\u0e28\u0e29",
+"Source code": "\u0e42\u0e04\u0e49\u0e14\u0e15\u0e49\u0e19\u0e09\u0e1a\u0e31\u0e1a",
+"Language": "\u0e20\u0e32\u0e29\u0e32",
+"Insert\/Edit code sample": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14",
+"B": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19",
+"R": "\u0e41\u0e14\u0e07",
+"G": "\u0e40\u0e02\u0e35\u0e22\u0e27",
+"Color": "\u0e2a\u0e35",
+"Right to left": "\u0e02\u0e27\u0e32\u0e44\u0e1b\u0e0b\u0e49\u0e32\u0e22",
+"Left to right": "\u0e0b\u0e49\u0e32\u0e22\u0e44\u0e1b\u0e02\u0e27\u0e32",
+"Emoticons": "\u0e2d\u0e34\u0e42\u0e21\u0e15\u0e34\u0e04\u0e2d\u0e19",
+"Robots": "\u0e2b\u0e38\u0e48\u0e19\u0e22\u0e19\u0e15\u0e4c",
+"Document properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23",
+"Title": "\u0e0a\u0e37\u0e48\u0e2d\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
+"Keywords": "\u0e04\u0e33\u0e2a\u0e33\u0e04\u0e31\u0e0d",
+"Encoding": "\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e23\u0e2b\u0e31\u0e2a",
+"Description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
+"Author": "\u0e1c\u0e39\u0e49\u0e40\u0e02\u0e35\u0e22\u0e19",
+"Fullscreen": "\u0e40\u0e15\u0e47\u0e21\u0e08\u0e2d",
+"Horizontal line": "\u0e40\u0e2a\u0e49\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
+"Horizontal space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
+"Insert\/edit image": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
+"General": "\u0e17\u0e31\u0e48\u0e27\u0e44\u0e1b",
+"Advanced": "\u0e02\u0e31\u0e49\u0e19\u0e2a\u0e39\u0e07",
+"Source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32",
+"Border": "\u0e40\u0e2a\u0e49\u0e19\u0e02\u0e2d\u0e1a",
+"Constrain proportions": "\u0e08\u0e33\u0e01\u0e31\u0e14\u0e2a\u0e31\u0e14\u0e2a\u0e48\u0e27\u0e19",
+"Vertical space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
+"Image description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22\u0e23\u0e39\u0e1b",
+"Style": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
+"Dimensions": "\u0e02\u0e19\u0e32\u0e14",
+"Insert image": "\u0e41\u0e17\u0e23\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
+"Image": "\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
+"Zoom in": "\u0e02\u0e22\u0e32\u0e22\u0e40\u0e02\u0e49\u0e32",
+"Contrast": "\u0e04\u0e27\u0e32\u0e21\u0e40\u0e1b\u0e23\u0e35\u0e22\u0e1a\u0e15\u0e48\u0e32\u0e07",
+"Back": "\u0e01\u0e25\u0e31\u0e1a",
+"Gamma": "\u0e41\u0e01\u0e21\u0e21\u0e32",
+"Flip horizontally": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
+"Resize": "\u0e1b\u0e23\u0e31\u0e1a\u0e02\u0e19\u0e32\u0e14",
+"Sharpen": "\u0e04\u0e27\u0e32\u0e21\u0e04\u0e21",
+"Zoom out": "\u0e22\u0e48\u0e2d\u0e2d\u0e2d\u0e01",
+"Image options": "\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
+"Apply": "\u0e19\u0e33\u0e44\u0e1b\u0e43\u0e0a\u0e49",
+"Brightness": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e27\u0e48\u0e32\u0e07",
+"Rotate clockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e15\u0e32\u0e21\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
+"Rotate counterclockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e17\u0e27\u0e19\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
+"Edit image": "\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
+"Color levels": "\u0e23\u0e30\u0e14\u0e31\u0e1a\u0e2a\u0e35",
+"Crop": "\u0e04\u0e23\u0e2d\u0e1b\u0e15\u0e31\u0e14",
+"Orientation": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e27\u0e32\u0e07",
+"Flip vertically": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
+"Invert": "\u0e22\u0e49\u0e2d\u0e19\u0e01\u0e25\u0e31\u0e1a",
+"Date\/time": "\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
+"Insert date\/time": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
+"Remove link": "\u0e40\u0e2d\u0e32\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e2d\u0e2d\u0e01",
+"Url": "URL",
+"Text to display": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e41\u0e2a\u0e14\u0e07",
+"Anchors": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
+"Insert link": "\u0e41\u0e17\u0e23\u0e01\u0e25\u0e34\u0e07\u0e01\u0e4c",
+"Link": "\u0e25\u0e34\u0e07\u0e01\u0e4c",
+"New window": "\u0e40\u0e1b\u0e34\u0e14\u0e2b\u0e19\u0e49\u0e32\u0e15\u0e48\u0e32\u0e07\u0e43\u0e2b\u0e21\u0e48",
+"None": "\u0e44\u0e21\u0e48\u0e21\u0e35",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e20\u0e32\u0e22\u0e19\u0e2d\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 http:\/\/ \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
+"Paste or type a link": "\u0e27\u0e32\u0e07\u0e2b\u0e23\u0e37\u0e2d\u0e1b\u0e49\u0e2d\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c",
+"Target": "\u0e40\u0e1b\u0e49\u0e32\u0e2b\u0e21\u0e32\u0e22",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e2d\u0e35\u0e40\u0e21\u0e25\u0e41\u0e2d\u0e14\u0e40\u0e14\u0e23\u0e2a \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 mailto: \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
+"Insert\/edit link": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e25\u0e34\u0e07\u0e01\u0e4c",
+"Insert\/edit video": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
+"Media": "\u0e2a\u0e37\u0e48\u0e2d",
+"Alternative source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32\u0e2a\u0e33\u0e23\u0e2d\u0e07",
+"Paste your embed code below:": "\u0e27\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14\u0e1d\u0e31\u0e07\u0e15\u0e31\u0e27\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07:",
+"Insert video": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
+"Poster": "\u0e42\u0e1b\u0e2a\u0e40\u0e15\u0e2d\u0e23\u0e4c",
+"Insert\/edit media": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e2a\u0e37\u0e48\u0e2d",
+"Embed": "\u0e1d\u0e31\u0e07",
+"Nonbreaking space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e44\u0e21\u0e48\u0e41\u0e22\u0e01",
+"Page break": "\u0e15\u0e31\u0e27\u0e41\u0e1a\u0e48\u0e07\u0e2b\u0e19\u0e49\u0e32",
+"Paste as text": "\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
+"Preview": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07",
+"Print": "\u0e1e\u0e34\u0e21\u0e1e\u0e4c",
+"Save": "\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01",
+"Could not find the specified string.": "\u0e44\u0e21\u0e48\u0e1e\u0e1a\u0e2a\u0e15\u0e23\u0e34\u0e07\u0e17\u0e35\u0e48\u0e23\u0e30\u0e1a\u0e38",
+"Replace": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
+"Next": "\u0e16\u0e31\u0e14\u0e44\u0e1b",
+"Whole words": "\u0e17\u0e31\u0e49\u0e07\u0e04\u0e33",
+"Find and replace": "\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e41\u0e25\u0e30\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
+"Replace with": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e14\u0e49\u0e27\u0e22",
+"Find": "\u0e04\u0e49\u0e19\u0e2b\u0e32",
+"Replace all": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
+"Match case": "\u0e15\u0e23\u0e07\u0e15\u0e32\u0e21\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e43\u0e2b\u0e0d\u0e48-\u0e40\u0e25\u0e47\u0e01",
+"Prev": "\u0e01\u0e48\u0e2d\u0e19\u0e2b\u0e19\u0e49\u0e32",
+"Spellcheck": "\u0e15\u0e23\u0e27\u0e08\u0e01\u0e32\u0e23\u0e2a\u0e30\u0e01\u0e14",
+"Finish": "\u0e40\u0e2a\u0e23\u0e47\u0e08\u0e2a\u0e34\u0e49\u0e19",
+"Ignore all": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
+"Ignore": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19",
+"Add to Dictionary": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e43\u0e19\u0e1e\u0e08\u0e19\u0e32\u0e19\u0e38\u0e01\u0e23\u0e21",
+"Insert row before": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
+"Rows": "\u0e41\u0e16\u0e27",
+"Height": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e39\u0e07",
+"Paste row after": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
+"Alignment": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e41\u0e19\u0e27",
+"Border color": "\u0e2a\u0e35\u0e02\u0e2d\u0e1a",
+"Column group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
+"Row": "\u0e41\u0e16\u0e27",
+"Insert column before": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e19\u0e49\u0e32",
+"Split cell": "\u0e41\u0e22\u0e01\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Cell padding": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e20\u0e32\u0e22\u0e43\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Cell spacing": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e23\u0e30\u0e2b\u0e27\u0e48\u0e32\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Row type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
+"Insert table": "\u0e41\u0e17\u0e23\u0e01\u0e15\u0e32\u0e23\u0e32\u0e07",
+"Body": "\u0e40\u0e19\u0e37\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
+"Caption": "\u0e1b\u0e49\u0e32\u0e22\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
+"Footer": "\u0e2a\u0e48\u0e27\u0e19\u0e17\u0e49\u0e32\u0e22",
+"Delete row": "\u0e25\u0e1a\u0e41\u0e16\u0e27",
+"Paste row before": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
+"Scope": "\u0e02\u0e2d\u0e1a\u0e40\u0e02\u0e15",
+"Delete table": "\u0e25\u0e1a\u0e15\u0e32\u0e23\u0e32\u0e07",
+"H Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
+"Top": "\u0e1a\u0e19",
+"Header cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
+"Column": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
+"Row group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e41\u0e16\u0e27",
+"Cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Middle": "\u0e01\u0e25\u0e32\u0e07",
+"Cell type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Copy row": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01\u0e41\u0e16\u0e27",
+"Row properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
+"Table properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e15\u0e32\u0e23\u0e32\u0e07",
+"Bottom": "\u0e25\u0e48\u0e32\u0e07",
+"V Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
+"Header": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
+"Right": "\u0e02\u0e27\u0e32",
+"Insert column after": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e25\u0e31\u0e07",
+"Cols": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
+"Insert row after": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
+"Width": "\u0e04\u0e27\u0e32\u0e21\u0e01\u0e27\u0e49\u0e32\u0e07",
+"Cell properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Left": "\u0e0b\u0e49\u0e32\u0e22",
+"Cut row": "\u0e15\u0e31\u0e14\u0e41\u0e16\u0e27",
+"Delete column": "\u0e25\u0e1a\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
+"Center": "\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
+"Merge cells": "\u0e1c\u0e2a\u0e32\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
+"Insert template": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
+"Templates": "\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
+"Background color": "\u0e2a\u0e35\u0e1e\u0e37\u0e49\u0e19\u0e2b\u0e25\u0e31\u0e07",
+"Custom...": "\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
+"Custom color": "\u0e2a\u0e35\u0e17\u0e35\u0e48\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
+"No color": "\u0e44\u0e21\u0e48\u0e21\u0e35\u0e2a\u0e35",
+"Text color": "\u0e2a\u0e35\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
+"Table of Contents": "\u0e2a\u0e32\u0e23\u0e1a\u0e31\u0e0d",
+"Show blocks": "\u0e41\u0e2a\u0e14\u0e07\u0e1a\u0e25\u0e47\u0e2d\u0e01",
+"Show invisible characters": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23\u0e17\u0e35\u0e48\u0e21\u0e2d\u0e07\u0e44\u0e21\u0e48\u0e40\u0e2b\u0e47\u0e19",
+"Words: {0}": "\u0e04\u0e33: {0}",
+"Insert": "\u0e41\u0e17\u0e23\u0e01",
+"File": "\u0e44\u0e1f\u0e25\u0e4c",
+"Edit": "\u0e41\u0e01\u0e49\u0e44\u0e02",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0e1e\u0e37\u0e49\u0e19\u0e17\u0e35\u0e48 Rich Text \u0e01\u0e14 ALT-F9 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e40\u0e21\u0e19\u0e39 \u0e01\u0e14 ALT-F10 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d \u0e01\u0e14 ALT-0 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
+"Tools": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d",
+"View": "\u0e21\u0e38\u0e21\u0e21\u0e2d\u0e07",
+"Table": "\u0e15\u0e32\u0e23\u0e32\u0e07",
+"Format": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/tr.js b/core/media/editors/tinymce/langs/tr.js
new file mode 100644
index 00000000..c5124104
--- /dev/null
+++ b/core/media/editors/tinymce/langs/tr.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('tr',{
+"Cut": "Kes",
+"Header 2": "Ba\u015fl\u0131k 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Taray\u0131c\u0131n\u0131z panoya direk eri\u015fimi desteklemiyor. L\u00fctfen Ctrl+X\/C\/V klavye k\u0131sayollar\u0131n\u0131 kullan\u0131n.",
+"Div": "Div",
+"Paste": "Yap\u0131\u015ft\u0131r",
+"Close": "Kapat",
+"Font Family": "Yaz\u0131tipi Ailesi",
+"Pre": "\u00d6n",
+"Align right": "Sa\u011fa hizala",
+"New document": "Yeni dok\u00fcman",
+"Blockquote": "Al\u0131nt\u0131",
+"Numbered list": "S\u0131ral\u0131 liste",
+"Increase indent": "Girintiyi art\u0131r",
+"Formats": "Bi\u00e7imler",
+"Headers": "Ba\u015fl\u0131klar",
+"Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
+"Header 3": "Ba\u015fl\u0131k 3",
+"Blocks": "Bloklar",
+"Undo": "Geri Al",
+"Strikethrough": "\u00dcst\u00fc \u00e7izili",
+"Bullet list": "S\u0131ras\u0131z liste",
+"Header 1": "Ba\u015fl\u0131k 1",
+"Superscript": "\u00dcst simge",
+"Clear formatting": "Bi\u00e7imi temizle",
+"Font Sizes": "Yaz\u0131tipi B\u00fcy\u00fckl\u00fc\u011f\u00fc",
+"Subscript": "Alt simge",
+"Header 6": "Ba\u015fl\u0131k 6",
+"Redo": "Yinele",
+"Paragraph": "Paragraf",
+"Ok": "Tamam",
+"Bold": "Kal\u0131n",
+"Code": "Kod",
+"Italic": "\u0130talik",
+"Align center": "Ortala",
+"Header 5": "Ba\u015fl\u0131k 5",
+"Decrease indent": "Girintiyi azalt",
+"Header 4": "Ba\u015fl\u0131k 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00fcz metin modunda yap\u0131\u015ft\u0131r. Bu se\u00e7ene\u011fi kapatana kadar i\u00e7erikler d\u00fcz metin olarak yap\u0131\u015ft\u0131r\u0131l\u0131r.",
+"Underline": "Alt\u0131 \u00e7izili",
+"Cancel": "\u0130ptal",
+"Justify": "\u0130ki yana yasla",
+"Inline": "Sat\u0131r i\u00e7i",
+"Copy": "Kopyala",
+"Align left": "Sola hizala",
+"Visual aids": "G\u00f6rsel ara\u00e7lar",
+"Lower Greek": "K\u00fc\u00e7\u00fck Yunan alfabesi",
+"Square": "Kare",
+"Default": "Varsay\u0131lan",
+"Lower Alpha": "K\u00fc\u00e7\u00fck ABC",
+"Circle": "Daire",
+"Disc": "Disk",
+"Upper Alpha": "B\u00fcy\u00fck ABC",
+"Upper Roman": "B\u00fcy\u00fck Roman alfabesi",
+"Lower Roman": "K\u00fc\u00e7\u00fck Roman alfabesi",
+"Name": "\u0130sim",
+"Anchor": "\u00c7apa",
+"You have unsaved changes are you sure you want to navigate away?": "Kaydedilmemi\u015f de\u011fi\u015fiklikler var, sayfadan ayr\u0131lmak istedi\u011finize emin misiniz?",
+"Restore last draft": "Son tasla\u011f\u0131 kurtar",
+"Special character": "\u00d6zel karakter",
+"Source code": "Kaynak kodu",
+"Right to left": "Sa\u011fdan sola",
+"Left to right": "Soldan sa\u011fa",
+"Emoticons": "G\u00fcl\u00fcc\u00fckler",
+"Robots": "Robotlar",
+"Document properties": "Dok\u00fcman \u00f6zellikleri",
+"Title": "Ba\u015fl\u0131k",
+"Keywords": "Anahtar kelimeler",
+"Encoding": "Kodlama",
+"Description": "A\u00e7\u0131klama",
+"Author": "Yazar",
+"Fullscreen": "Tam ekran",
+"Horizontal line": "Yatay \u00e7izgi",
+"Horizontal space": "Yatay bo\u015fluk",
+"Insert\/edit image": "Resim ekle\/d\u00fczenle",
+"General": "Genel",
+"Advanced": "Geli\u015fmi\u015f",
+"Source": "Kaynak",
+"Border": "\u00c7er\u00e7eve",
+"Constrain proportions": "En - Boy oran\u0131n\u0131 koru",
+"Vertical space": "Dikey bo\u015fluk",
+"Image description": "Resim a\u00e7\u0131klamas\u0131",
+"Style": "Stil",
+"Dimensions": "Boyutlar",
+"Insert image": "Resim ekle",
+"Insert date\/time": "Tarih \/ Zaman ekle",
+"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
+"Url": "Url",
+"Text to display": "G\u00f6r\u00fcnen yaz\u0131",
+"Anchors": "\u00c7apalar",
+"Insert link": "Ba\u011flant\u0131 ekle",
+"New window": "Yeni pencere",
+"None": "Hi\u00e7biri",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Hedef",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
+"Insert\/edit video": "Video ekle\/d\u00fczenle",
+"Poster": "Poster",
+"Alternative source": "Alternatif kaynak",
+"Paste your embed code below:": "Medya g\u00f6mme kodunu buraya yap\u0131\u015ft\u0131r:",
+"Insert video": "Video ekle",
+"Embed": "G\u00f6mme",
+"Nonbreaking space": "B\u00f6l\u00fcnemez bo\u015fluk",
+"Page break": "Sayfa sonu",
+"Paste as text": "Metin olarak yap\u0131\u015ft\u0131r",
+"Preview": "\u00d6nizleme",
+"Print": "Yazd\u0131r",
+"Save": "Kaydet",
+"Could not find the specified string.": "Herhangi bir sonu\u00e7 bulunamad\u0131.",
+"Replace": "De\u011fi\u015ftir",
+"Next": "Sonraki",
+"Whole words": "Tam s\u00f6zc\u00fckler",
+"Find and replace": "Bul ve de\u011fi\u015ftir",
+"Replace with": "Bununla de\u011fi\u015ftir",
+"Find": "Bul",
+"Replace all": "T\u00fcm\u00fcn\u00fc de\u011fi\u015ftir",
+"Match case": "B\u00fcy\u00fck \/ K\u00fc\u00e7\u00fck harfe duyarl\u0131",
+"Prev": "\u00d6nceki",
+"Spellcheck": "Yaz\u0131m denetimi",
+"Finish": "Bitir",
+"Ignore all": "T\u00fcm\u00fcn\u00fc yoksay",
+"Ignore": "Yoksay",
+"Insert row before": "\u00d6ncesine yeni sat\u0131r ekle",
+"Rows": "Sat\u0131rlar",
+"Height": "Y\u00fckseklik",
+"Paste row after": "Sonras\u0131na sat\u0131r  yap\u0131\u015ft\u0131r",
+"Alignment": "Hizalama",
+"Column group": "S\u00fctun grubu",
+"Row": "Sat\u0131r",
+"Insert column before": "\u00d6ncesine yeni s\u00fctun ekle",
+"Split cell": "H\u00fccreleri ay\u0131r",
+"Cell padding": "H\u00fccre i\u00e7 bo\u015flu\u011fu",
+"Cell spacing": "H\u00fccre aral\u0131\u011f\u0131",
+"Row type": "Sat\u0131r tipi",
+"Insert table": "Tablo ekle",
+"Body": "G\u00f6vde",
+"Caption": "Ba\u015fl\u0131k",
+"Footer": "Alt",
+"Delete row": "Sat\u0131r\u0131 sil",
+"Paste row before": "\u00d6ncesine sat\u0131r yap\u0131\u015ft\u0131r",
+"Scope": "Kapsam",
+"Delete table": "Tabloyu sil",
+"Header cell": "Ba\u015fl\u0131k h\u00fccresi",
+"Column": "S\u00fctun",
+"Cell": "H\u00fccre",
+"Header": "Ba\u015fl\u0131k",
+"Cell type": "H\u00fccre tipi",
+"Copy row": "Sat\u0131r\u0131 kopyala",
+"Row properties": "Sat\u0131r \u00f6zellikleri",
+"Table properties": "Tablo \u00f6zellikleri",
+"Row group": "Sat\u0131r grubu",
+"Right": "Sa\u011f",
+"Insert column after": "Sonras\u0131na yeni s\u00fctun ekle",
+"Cols": "S\u00fctunlar",
+"Insert row after": "Sonras\u0131na yeni sat\u0131r ekle",
+"Width": "Geni\u015flik",
+"Cell properties": "H\u00fccre \u00f6zellikleri",
+"Left": "Sol",
+"Cut row": "Sat\u0131r\u0131 kes",
+"Delete column": "S\u00fctunu sil",
+"Center": "Orta",
+"Merge cells": "H\u00fccreleri birle\u015ftir",
+"Insert template": "\u015eablon ekle",
+"Templates": "\u015eablonlar",
+"Background color": "Arkaplan rengi",
+"Text color": "Yaz\u0131 rengi",
+"Show blocks": "Bloklar\u0131 g\u00f6r\u00fcnt\u00fcle",
+"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
+"Words: {0}": "Kelime: {0}",
+"Insert": "Ekle",
+"File": "Dosya",
+"Edit": "D\u00fczenle",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 k\u0131sayolunu kullan\u0131n. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 k\u0131sayolunu kullan\u0131n. Yard\u0131m i\u00e7in ALT-0 k\u0131sayolunu kullan\u0131n.",
+"Tools": "Ara\u00e7lar",
+"View": "G\u00f6r\u00fcnt\u00fcle",
+"Table": "Tablo",
+"Format": "Bi\u00e7im"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/ug.js b/core/media/editors/tinymce/langs/ug.js
new file mode 100644
index 00000000..8cd3cbee
--- /dev/null
+++ b/core/media/editors/tinymce/langs/ug.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('ug',{
+"Cut": "\u0643\u06d0\u0633\u0649\u0634",
+"Header 2": "\u062a\u06d0\u0645\u0627 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0633\u0649\u0632\u0646\u0649\u06ad \u062a\u0648\u0631 \u0643\u06c6\u0631\u06af\u06c8\u0686\u0649\u06ad\u0649\u0632 \u0642\u0649\u064a\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u0627\u062e\u062a\u0649\u0633\u0649 \u0632\u0649\u064a\u0627\u0631\u06d5\u062a \u0642\u0649\u0644\u0649\u0634\u0646\u0649 \u0642\u0648\u0644\u0644\u0649\u0645\u0627\u064a\u062f\u06c7.  Ctrl+X\/C\/V \u062a\u06d0\u0632\u0644\u06d5\u062a\u0645\u06d5 \u0643\u0648\u0646\u06c7\u067e\u0643\u0649\u0633\u0649 \u0626\u0627\u0631\u0642\u0649\u0644\u0649\u0642 \u0643\u06d0\u0633\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u0645\u06d5\u0634\u063a\u06c7\u0644\u0627\u062a\u0649 \u0642\u0649\u0644\u0649\u06ad.",
+"Div": "Div",
+"Paste": "\u0686\u0627\u067e\u0644\u0627\u0634",
+"Close": "\u062a\u0627\u0642\u0627\u0634",
+"Font Family": "Font Family",
+"Pre": "Pre",
+"Align right": "\u0626\u0648\u06ad\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
+"New document": "\u064a\u06d0\u06ad\u0649 \u06be\u06c6\u062c\u062c\u06d5\u062a \u0642\u06c7\u0631\u06c7\u0634",
+"Blockquote": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
+"Numbered list": "\u0633\u0627\u0646\u0644\u0649\u0642 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
+"Increase indent": "\u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0633\u06c8\u0631\u06c8\u0634",
+"Formats": "\u0641\u0648\u0631\u0645\u0627\u062a",
+"Headers": "Headers",
+"Select all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u062a\u0627\u0644\u0644\u0627\u0634",
+"Header 3": "\u062a\u06d0\u0645\u0627 3",
+"Blocks": "Blocks",
+"Undo": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u064a\u06d0\u0646\u0649\u0634",
+"Strikethrough": "\u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634 \u0633\u0649\u0632\u0649\u0642\u0649",
+"Bullet list": "\u0628\u06d5\u0644\u06af\u06d5 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
+"Header 1": "\u062a\u06d0\u0645\u0627 1",
+"Superscript": "\u0626\u06c8\u0633\u062a\u06c8\u0646\u0643\u0649 \u0628\u06d5\u0644\u06af\u06d5",
+"Clear formatting": "\u0641\u0648\u0631\u0645\u0627\u062a\u0646\u0649 \u062a\u0627\u0632\u0644\u0627\u0634",
+"Font Sizes": "Font Sizes",
+"Subscript": "\u0626\u0627\u0633\u062a\u0649\u0646\u0642\u0649 \u0628\u06d5\u0644\u06af\u06d5",
+"Header 6": "\u062a\u06d0\u0645\u0627 6",
+"Redo": "\u0642\u0627\u064a\u062a\u0627 \u0642\u0649\u0644\u0649\u0634",
+"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0649\u0631\u0627 \u0641",
+"Ok": "\u062c\u06d5\u0632\u0649\u0645\u0644\u06d5\u0634",
+"Bold": "\u062a\u0648\u0645",
+"Code": "Code",
+"Italic": "\u064a\u0627\u0646\u062a\u06c7",
+"Align center": "\u0645\u06d5\u0631\u0643\u06d5\u0632\u06af\u06d5 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
+"Header 5": "\u062a\u06d0\u0645\u0627 5",
+"Decrease indent": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0633\u06c8\u0631\u06c8\u0634",
+"Header 4": "\u062a\u06d0\u0645\u0627 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u06be\u0627\u0632\u0649\u0631 \u0686\u0627\u067e\u0644\u0649\u0633\u0649\u06ad\u0649\u0632 \u0633\u0627\u067e \u062a\u06d0\u0643\u0649\u0634 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649 \u0686\u0627\u067e\u0644\u0649\u0646\u0649\u062f\u06c7. \u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u06d5\u06ad\u0634\u0649\u0643\u0649\u0646\u0649 \u062a\u0627\u0642\u0649\u06cb\u06d5\u062a\u0643\u06d5\u0646\u06af\u06d5 \u0642\u06d5\u062f\u06d5\u0631.",
+"Underline": "\u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642",
+"Cancel": "\u0642\u0627\u0644\u062f\u06c7\u0631\u06c7\u0634",
+"Justify": "\u0626\u0649\u0643\u0643\u0649 \u064a\u0627\u0646\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
+"Inline": "Inline",
+"Copy": "\u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Align left": "\u0633\u0648\u0644\u063a\u0627 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
+"Visual aids": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
+"Lower Greek": "\u06af\u0631\u06d0\u062a\u0633\u0649\u064a\u0649\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Square": "\u0643\u06cb\u0627\u062f\u0631\u0627\u062a",
+"Default": "\u0633\u06c8\u0643\u06c8\u062a",
+"Lower Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Circle": "\u0686\u06d5\u0645\u0628\u06d5\u0631",
+"Disc": "\u062f\u06d0\u0633\u0643\u0627",
+"Upper Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Upper Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Lower Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
+"Name": "\u0646\u0627\u0645\u0649",
+"Anchor": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
+"You have unsaved changes are you sure you want to navigate away?": "\u0633\u0649\u0632 \u062a\u06d0\u062e\u0649 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u0633\u0627\u0642\u0644\u0649\u0645\u0649\u062f\u0649\u06ad\u0649\u0632\u060c \u0626\u0627\u064a\u0631\u0649\u0644\u0627\u0645\u0633\u0649\u0632\u061f",
+"Restore last draft": "\u0626\u0627\u062e\u0649\u0631\u0642\u0649 \u0643\u06c7\u067e\u0649\u064a\u0649\u06af\u06d5 \u0642\u0627\u064a\u062a\u0649\u0634",
+"Special character": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Source code": "\u0626\u06d5\u0633\u0644\u0649 \u0643\u0648\u062f\u0649",
+"Right to left": "\u0626\u0648\u06ad\u062f\u0649\u0646 \u0633\u0648\u0644\u063a\u0627",
+"Left to right": "\u0633\u0648\u0644\u062f\u0649\u0646 \u0626\u0648\u06ad\u063a\u0627 ",
+"Emoticons": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u06d5",
+"Robots": "\u0645\u0627\u0634\u0649\u0646\u0627 \u0626\u0627\u062f\u06d5\u0645",
+"Document properties": "\u06be\u06c6\u062c\u062c\u06d5\u062a \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Title": "\u062a\u06d0\u0645\u0627",
+"Keywords": "\u06be\u0627\u0644\u0642\u0649\u0644\u0649\u0642 \u0633\u06c6\u0632",
+"Encoding": "\u0643\u0648\u062f\u0644\u0627\u0634",
+"Description": "\u062a\u06d5\u0633\u0649\u06cb\u0649\u0631",
+"Author": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
+"Fullscreen": "\u067e\u06c8\u062a\u06c8\u0646 \u0626\u06d0\u0643\u0631\u0627\u0646",
+"Horizontal line": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0642\u06c7\u0631",
+"Horizontal space": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
+"Insert\/edit image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u064a\u0627\u0643\u0649 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"General": "\u0626\u0627\u062f\u06d5\u062a\u062a\u0649\u0643\u0649",
+"Advanced": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5",
+"Source": "\u0645\u06d5\u0646\u0628\u06d5",
+"Border": "\u064a\u0627\u0642\u0627",
+"Constrain proportions": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643-\u0643\u06d5\u06ad\u0644\u0649\u0643 \u0646\u0649\u0633\u067e\u0649\u062a\u0649\u0646\u0649 \u0633\u0627\u0642\u0644\u0627\u0634",
+"Vertical space": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
+"Image description": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
+"Style": "\u0626\u06c7\u0633\u0644\u06c7\u067e",
+"Dimensions": "\u0686\u0648\u06ad-\u0643\u0649\u0686\u0649\u0643",
+"Insert image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Insert date\/time": "\u0686\u0649\u0633\u0644\u0627\/\u06cb\u0627\u0642\u0649\u062a \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u0634",
+"Remove link": "Remove link",
+"Url": "\u0626\u0627\u062f\u0631\u0649\u0633",
+"Text to display": "\u0643\u06c6\u0631\u06c8\u0646\u0649\u062f\u0649\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646",
+"Anchors": "Anchors",
+"Insert link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"New window": "\u064a\u06d0\u06ad\u0649 \u0643\u06c6\u0632\u0646\u06d5\u0643",
+"None": "\u064a\u0648\u0642",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u0646\u0649\u0634\u0627\u0646",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u06c7\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Insert\/edit video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Poster": "\u064a\u0648\u0644\u0644\u0649\u063a\u06c7\u0686\u0649",
+"Alternative source": "\u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
+"Paste your embed code below:": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0627\u0642\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0643\u0648\u062f\u0646\u0649 \u0686\u0627\u067e\u0644\u0627\u06ad",
+"Insert video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Embed": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Nonbreaking space": "\u0628\u0648\u0634\u0644\u06c7\u0642",
+"Page break": "\u0628\u06d5\u062a \u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Paste as text": "\u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
+"Preview": "\u0643\u06c6\u0631\u06c8\u0634",
+"Print": "\u0628\u0627\u0633\u0645\u0627\u0642 ",
+"Save": "\u0633\u0627\u0642\u0644\u0627\u0634",
+"Could not find the specified string.": "\u0626\u0649\u0632\u062f\u0649\u0645\u06d5\u0643\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u062a\u0627\u067e\u0627\u0644\u0645\u0649\u062f\u0649.",
+"Replace": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Next": "\u0643\u06d0\u064a\u0649\u0646\u0643\u0649\u0633\u0649",
+"Whole words": "\u062a\u0648\u0644\u06c7\u0642  \u0645\u0627\u0633\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Find and replace": "\u0626\u0649\u0632\u062f\u06d5\u0634 \u06cb\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Replace with": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Find": "\u0626\u0649\u0632\u062f\u06d5\u0634",
+"Replace all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Match case": "\u0686\u0648\u06ad \u0643\u0649\u0686\u0649\u0643 \u06be\u06d5\u0631\u0649\u067e\u0646\u0649 \u067e\u06d5\u0631\u0649\u0642\u0644\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
+"Prev": "\u0626\u0627\u0644\u062f\u0649\u0646\u0642\u0649\u0633\u0649",
+"Spellcheck": "\u0626\u0649\u0645\u0644\u0627 \u062a\u06d5\u0643\u0634\u06c8\u0631\u06c8\u0634",
+"Finish": "\u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
+"Ignore all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
+"Ignore": "\u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
+"Insert row before": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Rows": "\u0642\u06c7\u0631",
+"Height": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643\u0649",
+"Paste row after": "\u0642\u06c7\u0631 \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
+"Alignment": "\u064a\u06c6\u0644\u0649\u0646\u0649\u0634\u0649",
+"Column group": "\u0631\u06d5\u062a \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
+"Row": "\u0642\u06c7\u0631",
+"Insert column before": "\u0631\u06d5\u062a \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Split cell": "\u0643\u0627\u062a\u06d5\u0643 \u067e\u0627\u0631\u0686\u0649\u0644\u0627\u0634",
+"Cell padding": "\u0643\u0627\u062a\u06d5\u0643 \u0626\u0649\u0686\u0643\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
+"Cell spacing": "\u0643\u0627\u062a\u06d5\u0643 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
+"Row type": "\u0642\u06c7\u0631 \u062a\u0649\u067e\u0649",
+"Insert table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Body": "\u0628\u06d5\u062f\u0649\u0646\u0649",
+"Caption": "\u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
+"Footer": "\u067e\u06c7\u062a\u0649",
+"Delete row": "\u0642\u06c7\u0631 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Paste row before": "\u0642\u06c7\u0631 \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0686\u0627\u067e\u0644\u0627\u0634",
+"Scope": "\u062f\u0627\u0626\u0649\u0631\u06d5",
+"Delete table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0626\u06c6\u0686\u06c8\u0631\u0634",
+"Header cell": "\u0628\u0627\u0634 \u0643\u0627\u062a\u06d5\u0643",
+"Column": "\u0631\u06d5\u062a",
+"Cell": "\u0643\u0627\u062a\u06d5\u0643",
+"Header": "\u0628\u06d0\u0634\u0649",
+"Cell type": "\u0643\u0627\u062a\u06d5\u0643 \u062a\u0649\u067e\u0649",
+"Copy row": "\u0642\u06c7\u0631 \u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Row properties": "\u0642\u06c7\u0631 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Table properties": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Row group": "\u0642\u06c7\u0631 \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
+"Right": "\u0626\u0648\u06ad",
+"Insert column after": "\u0631\u06d5\u062a \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Cols": "\u0631\u06d5\u062a",
+"Insert row after": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Width": "\u0643\u06d5\u06ad\u0644\u0649\u0643\u0649",
+"Cell properties": "\u0643\u0627\u062a\u06d5\u0643 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
+"Left": "\u0633\u0648\u0644",
+"Cut row": "\u0642\u06c7\u0631 \u0643\u06d0\u0633\u0649\u0634",
+"Delete column": "\u0631\u06d5\u062a \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
+"Center": "\u0645\u06d5\u0631\u0643\u06d5\u0632",
+"Merge cells": "\u0643\u0627\u062a\u06d5\u0643 \u0628\u0649\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
+"Insert template": "\u0626\u06c8\u0644\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"Templates": "\u0626\u06c8\u0644\u06af\u0649\u0644\u06d5\u0631",
+"Background color": "\u0626\u0627\u0631\u0642\u0627 \u0631\u06d5\u06ad\u06af\u0649",
+"Text color": "\u062e\u06d5\u062a \u0631\u06d5\u06ad\u06af\u0649",
+"Show blocks": "\u0631\u0627\u064a\u0648\u0646 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
+"Show invisible characters": "\u0643\u06c6\u0631\u06c8\u0646\u0645\u06d5\u064a\u062f\u0649\u063a\u0627\u0646 \u06be\u06d5\u0631\u0649\u067e\u0644\u06d5\u0631\u0646\u0649 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
+"Words: {0}": "\u0633\u06c6\u0632: {0}",
+"Insert": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
+"File": "\u06be\u06c6\u062c\u062c\u06d5\u062a",
+"Edit": "\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
+"Tools": "\u0642\u06c7\u0631\u0627\u0644",
+"View": "\u0643\u06c6\u0631\u06c8\u0634",
+"Table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644",
+"Format": "\u0641\u0648\u0631\u0645\u0627\u062a"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/uk.js b/core/media/editors/tinymce/langs/uk.js
new file mode 100644
index 00000000..fce3eb38
--- /dev/null
+++ b/core/media/editors/tinymce/langs/uk.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('uk',{
+"Cut": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438",
+"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
+"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454 \u043f\u0440\u044f\u043c\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0456\u043d\u0443. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 Ctrl+X\/C\/V \u0437\u0430\u043c\u0456\u0441\u0442\u044c \u0441\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448.",
+"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
+"Div": "\u0411\u043b\u043e\u043a",
+"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
+"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
+"Close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
+"Font Family": "\u0428\u0440\u0438\u0444\u0442 \u0437\u043c\u0456\u0441\u0442\u0443",
+"Pre": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0454 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
+"Align right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"New document": "\u041d\u043e\u0432\u0438\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
+"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
+"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
+"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Increase indent": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438  \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
+"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
+"Headers": "Headers",
+"Select all": "\u0412\u0438\u0434\u0456\u043b\u0438\u0442\u0438 \u0432\u0441\u0435",
+"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
+"Blocks": "\u0411\u043b\u043e\u043a\u0438",
+"Undo": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
+"Strikethrough": "\u0417\u0430\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
+"Bullet list": "\u041d\u0435\u043d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
+"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
+"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
+"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
+"Font Sizes": "\u0420\u043e\u0437\u043c\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0443",
+"Subscript": "\u041d\u0438\u0436\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
+"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
+"Redo": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438",
+"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
+"Ok": "\u0413\u0430\u0440\u0430\u0437\u0434",
+"Bold": "\u0416\u0438\u0440\u043d\u0438\u0439",
+"Code": "\u041a\u043e\u0434",
+"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
+"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
+"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
+"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
+"Decrease indent": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
+"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0437\u0434\u0456\u0439\u0441\u043d\u044e\u0454\u0442\u044c\u0441\u044f \u0443 \u0432\u0438\u0433\u043b\u044f\u0434\u0456 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443, \u043f\u043e\u043a\u0438 \u043d\u0435 \u0432\u0456\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0438 \u0434\u0430\u043d\u0443 \u043e\u043f\u0446\u0456\u044e.",
+"Underline": "\u041f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
+"Cancel": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
+"Justify": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
+"Inline": "\u0412\u0431\u0443\u0434\u043e\u0432\u0430\u043d\u0456",
+"Copy": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438",
+"Align left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Visual aids": "\u041d\u0430\u043e\u0447\u043d\u0456 \u043f\u0440\u0438\u043b\u0430\u0434\u0434\u044f",
+"Lower Greek": "\u041c\u0430\u043b\u0456 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
+"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
+"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0438\u0439",
+"Lower Alpha": "\u041c\u0430\u043b\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
+"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0456",
+"Disc": "\u041a\u0440\u0443\u0433\u0438",
+"Upper Alpha": "\u0412\u0435\u043b\u0438\u043a\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
+"Upper Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
+"Lower Roman": "\u041c\u0430\u043b\u0456 \u0440\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u041a\u043e\u0434 \u043c\u0430\u0454 \u043f\u043e\u0447\u0438\u043d\u0430\u0442\u0438\u0441\u044f \u0437 \u043b\u0456\u0442\u0435\u0440\u0438 \u0456 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043b\u0438\u0448\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u043b\u0456\u0442\u0435\u0440, \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0456\u0441\u0443, \u043a\u0440\u0430\u043f\u043a\u0438, \u043a\u043e\u043c\u0438 \u0430\u0431\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u0433\u043e \u043f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f.",
+"Name": "\u041d\u0430\u0437\u0432\u0430",
+"Anchor": "\u042f\u043a\u0456\u0440",
+"Id": "\u041a\u043e\u0434",
+"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0412\u0430\u0441 \u0454 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456 \u0437\u043c\u0456\u043d\u0438. \u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0456\u0442\u0438?",
+"Restore last draft": "\u0412\u0456\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u043e\u0441\u0442\u0430\u043d\u043d\u044c\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0443",
+"Special character": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
+"Source code": "\u0412\u0438\u0445\u0456\u0434\u043d\u0438\u0439 \u043a\u043e\u0434",
+"Language": "\u041c\u043e\u0432\u0430",
+"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u043d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u043f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u043a\u043e\u043b\u0456\u0440",
+"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0456\u0432\u043e",
+"Left to right": "\u0417\u043b\u0456\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
+"Emoticons": "\u0415\u043c\u043e\u0446\u0456\u0457",
+"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
+"Document properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0456 \u0441\u043b\u043e\u0432\u0430",
+"Encoding": "\u041a\u043e\u0434\u0443\u0432\u0430\u043d\u043d\u044f",
+"Description": "\u041e\u043f\u0438\u0441",
+"Author": "\u0410\u0432\u0442\u043e\u0440",
+"Fullscreen": "\u041f\u043e\u0432\u043d\u043e\u0435\u043a\u0440\u0430\u043d\u043d\u0438\u0439 \u0440\u0435\u0436\u0438\u043c",
+"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430 \u043b\u0456\u043d\u0456\u044f",
+"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
+"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0437\u043c\u0456\u043d\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"General": "\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456",
+"Advanced": "\u0420\u043e\u0437\u0448\u0438\u0440\u0435\u043d\u0456",
+"Source": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
+"Border": "\u041c\u0435\u0436\u0430",
+"Constrain proportions": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0456\u0457",
+"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
+"Image description": "\u041e\u043f\u0438\u0441 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Style": "\u0421\u0442\u0438\u043b\u044c",
+"Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440",
+"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Image": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Zoom in": "\u041d\u0430\u0431\u043b\u0438\u0437\u0438\u0442\u0438",
+"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
+"Back": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f",
+"Gamma": "\u0413\u0430\u043c\u043c\u0430",
+"Flip horizontally": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0456",
+"Resize": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0440",
+"Sharpen": "\u0427\u0456\u0442\u043a\u0456\u0441\u0442\u044c",
+"Zoom out": "\u0412\u0456\u0434\u0434\u0430\u043b\u0438\u0442\u0438",
+"Image options": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Apply": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438",
+"Brightness": "\u042f\u0441\u043a\u0440\u0430\u0432\u0456\u0441\u0442\u044c",
+"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u0437\u0430 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u044e \u0441\u0442\u0440\u0456\u043b\u043a\u043e\u044e",
+"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u043f\u0440\u043e\u0442\u0438 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u0457 \u0441\u0442\u0440\u0456\u043b\u043a\u0438",
+"Edit image": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Color levels": "\u0420\u0456\u0432\u043d\u0456 \u043a\u043e\u043b\u044c\u043e\u0440\u0456\u0432",
+"Crop": "\u041e\u0431\u0440\u0456\u0437\u0430\u0442\u0438",
+"Orientation": "\u041e\u0440\u0456\u0454\u043d\u0442\u0430\u0446\u0456\u044f",
+"Flip vertically": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0456",
+"Invert": "\u0406\u043d\u0432\u0435\u0440\u0441\u0456\u044f",
+"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
+"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
+"Remove link": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"Url": "\u0410\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043b\u044f \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Anchors": "\u042f\u043a\u043e\u0440\u0456",
+"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"Link": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"New window": "\u0423 \u043d\u043e\u0432\u043e\u043c\u0443 \u0432\u0456\u043a\u043d\u0456",
+"None": "\u041d\u0456",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 http:\/\/ \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
+"Paste or type a link": "\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u0430\u0431\u043e \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"Target": "\u0412\u0456\u0434\u043a\u0440\u0438\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 mailto: \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
+"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
+"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
+"Media": "\u041c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
+"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
+"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0447\u0435:",
+"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
+"Poster": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
+"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0430\u0443\u0434\u0456\u043e",
+"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
+"Nonbreaking space": "\u041d\u0435\u0440\u043e\u0437\u0440\u0438\u0432\u043d\u0438\u0439 \u043f\u0440\u043e\u0431\u0456\u043b",
+"Page break": "\u0420\u043e\u0437\u0440\u0438\u0432 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0438",
+"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044f\u043a \u0442\u0435\u043a\u0441\u0442",
+"Preview": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434",
+"Print": "\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438",
+"Save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438",
+"Could not find the specified string.": "\u0412\u043a\u0430\u0437\u0430\u043d\u0438\u0439 \u0440\u044f\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e",
+"Replace": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
+"Next": "\u0412\u043d\u0438\u0437",
+"Whole words": "\u0426\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
+"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0456\u043d\u0430",
+"Replace with": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430",
+"Find": "\u0417\u043d\u0430\u0439\u0442\u0438",
+"Replace all": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u0432\u0441\u0435",
+"Match case": "\u0412\u0440\u0430\u0445\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
+"Prev": "\u0412\u0433\u043e\u0440\u0443",
+"Spellcheck": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
+"Finish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0438",
+"Ignore all": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0435",
+"Ignore": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438",
+"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0434\u043e \u0421\u043b\u043e\u0432\u043d\u0438\u043a\u0430",
+"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
+"Rows": "\u0420\u044f\u0434\u043a\u0438",
+"Height": "\u0412\u0438\u0441\u043e\u0442\u0430",
+"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
+"Alignment": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
+"Border color": "\u043a\u043e\u043b\u0456\u0440 \u0440\u0430\u043c\u043a\u0438",
+"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u0442\u043e\u0432\u043f\u0446\u0456\u0432",
+"Row": "\u0420\u044f\u0434\u043e\u043a",
+"Insert column before": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043b\u0456\u0432\u043e\u0440\u0443\u0447",
+"Split cell": "\u0420\u043e\u0437\u0431\u0438\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0443",
+"Cell padding": "\u041f\u043e\u043b\u044f \u043a\u043e\u043c\u0456\u0440\u043e\u043a",
+"Cell spacing": "\u0412\u0456\u0434\u0441\u0442\u0430\u043d\u044c \u043c\u0456\u0436 \u043a\u043e\u043c\u0456\u0440\u043a\u0430\u043c\u0438",
+"Row type": "\u0422\u0438\u043f \u0440\u044f\u0434\u043a\u0430",
+"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
+"Body": "\u0422\u0456\u043b\u043e",
+"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Footer": "\u041d\u0438\u0436\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
+"Delete row": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
+"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
+"Scope": "\u0421\u0444\u0435\u0440\u0430",
+"Delete table": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
+"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0435  \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
+"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Column": "\u0421\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
+"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u044f\u0434\u043a\u0456\u0432",
+"Cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430",
+"Middle": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Cell type": "\u0422\u0438\u043f \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
+"Copy row": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
+"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0440\u044f\u0434\u043a\u0430",
+"Table properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0442\u0430\u0431\u043b\u0438\u0446\u0456",
+"Bottom": "\u041f\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
+"Header": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
+"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Insert column after": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
+"Cols": "\u0421\u0442\u043e\u0432\u043f\u0446\u0456",
+"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
+"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
+"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
+"Left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Cut row": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
+"Delete column": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
+"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Merge cells": "\u041e\u0431'\u0454\u0434\u043d\u0430\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
+"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
+"Background color": "\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443",
+"Custom...": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439",
+"Custom color": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439 \u043a\u043e\u043b\u0456\u0440",
+"No color": "\u0431\u0435\u0437 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
+"Text color": "\u041a\u043e\u043b\u0456\u0440 \u0442\u0435\u043a\u0441\u0442\u0443",
+"Table of Contents": "\u0417\u043c\u0456\u0441\u0442",
+"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u0438",
+"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
+"Words: {0}": "\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0441\u043b\u0456\u0432: {0}",
+"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
+"File": "\u0424\u0430\u0439\u043b",
+"Edit": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F9 \u0449\u043e\u0431 \u0432\u0438\u043a\u043b\u0438\u043a\u0430\u0442\u0438 \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0456\u0432, ALT-0 \u0434\u043b\u044f \u0432\u0438\u043a\u043b\u0438\u043a\u0443 \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0438.",
+"Tools": "\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
+"View": "\u0412\u0438\u0433\u043b\u044f\u0434",
+"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
+"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
+});
diff --git a/core/media/editors/tinymce/langs/vi.js b/core/media/editors/tinymce/langs/vi.js
new file mode 100644
index 00000000..fb7668bd
--- /dev/null
+++ b/core/media/editors/tinymce/langs/vi.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('vi',{
+"Cut": "C\u1eaft",
+"Header 2": "Ti\u00eau \u0111\u1ec1 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n kh\u00f4ng h\u1ed7 tr\u1ee3 truy c\u1eadp truy c\u1eadp b\u1ed9 nh\u1edb \u1ea3o, vui l\u00f2ng s\u1eed d\u1ee5ng c\u00e1c t\u1ed5 h\u1ee3p ph\u00edm Ctrl + X, C, V.",
+"Div": "Khung",
+"Paste": "D\u00e1n",
+"Close": "\u0110\u00f3ng L\u1ea1i",
+"Font Family": "Font Family",
+"Pre": "\u0110\u1ecbnh d\u1ea1ng",
+"Align right": "Canh ph\u1ea3i",
+"New document": "T\u1ea1o t\u00e0i li\u1ec7u m\u1edbi",
+"Blockquote": "\u0110o\u1ea1n Tr\u00edch D\u1eabn",
+"Numbered list": "Danh s\u00e1ch d\u1ea1ng s\u1ed1",
+"Increase indent": "T\u0103ng kho\u1ea3ng c\u00e1ch d\u00f2ng",
+"Formats": "\u0110\u1ecbnh d\u1ea1ng",
+"Headers": "\u0110\u1ea7u trang",
+"Select all": "Ch\u1ecdn t\u1ea5t c\u1ea3",
+"Header 3": "Ti\u00eau \u0111\u1ec1 3",
+"Blocks": "Bao",
+"Undo": "H\u1ee7y thao t\u00e1c",
+"Strikethrough": "G\u1ea1ch ngang",
+"Bullet list": "Danh s\u00e1ch d\u1ea1ng bi\u1ec3u t\u01b0\u1ee3ng",
+"Header 1": "Ti\u00eau \u0111\u1ec1 1",
+"Superscript": "K\u00fd t\u1ef1 m\u0169",
+"Clear formatting": "L\u01b0\u1ee3c b\u1ecf ph\u1ea7n hi\u1ec7u \u1ee9ng",
+"Font Sizes": "Font Sizes",
+"Subscript": "K\u00fd t\u1ef1 th\u1ea5p",
+"Header 6": "Ti\u00eau \u0111\u1ec1 6",
+"Redo": "L\u00e0m l\u1ea1i",
+"Paragraph": "\u0110o\u1ea1n v\u0103n",
+"Ok": "\u0110\u1ed3ng \u00dd",
+"Bold": "In \u0111\u1eadm",
+"Code": "M\u00e3",
+"Italic": "In nghi\u00eang",
+"Align center": "Canh gi\u1eefa",
+"Header 5": "Ti\u00eau \u0111\u1ec1 5",
+"Decrease indent": "Th\u1ee5t l\u00f9i d\u00f2ng",
+"Header 4": "Ti\u00eau \u0111\u1ec1 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Ch\u1ee9c n\u0103ng D\u00e1n \u0111ang trong tr\u1ea1ng th\u00e1i v\u0103n b\u1ea3n \u0111\u01a1n gi\u1ea3n. N\u1ed9i dung s\u1ebd \u0111\u01b0\u1ee3c d\u00e1n d\u01b0\u1edbi d\u1ea1ng v\u0103n b\u1ea3n thu\u1ea7n, kh\u00f4ng c\u00f3 \u0111\u1ecbnh d\u1ea1ng.",
+"Underline": "G\u1ea1ch d\u01b0\u1edbi",
+"Cancel": "Hu\u1ef7 B\u1ecf",
+"Justify": "Canh \u0111\u1ec1u hai b\u00ean",
+"Inline": "C\u00f9ng d\u00f2ng",
+"Copy": "Sao ch\u00e9p",
+"Align left": "Canh tr\u00e1i",
+"Visual aids": "M\u1edf khung so\u1ea1n th\u1ea3o",
+"Lower Greek": "S\u1ed1 hy l\u1ea1p th\u01b0\u1eddng",
+"Square": "\u00d4 vu\u00f4ng",
+"Default": "M\u1eb7c \u0111\u1ecbnh",
+"Lower Alpha": "K\u00fd t\u1ef1 th\u01b0\u1eddng",
+"Circle": "H\u00ecnh tr\u00f2n",
+"Disc": "H\u00ecnh tr\u00f2n  d\u1ea1ng m\u1ecfng",
+"Upper Alpha": "K\u00fd t\u1ef1 hoa",
+"Upper Roman": "S\u1ed1 la m\u00e3 hoa",
+"Lower Roman": "S\u1ed1 la m\u00e3 th\u01b0\u1eddng",
+"Name": "Name",
+"Anchor": "Anchor",
+"You have unsaved changes are you sure you want to navigate away?": "B\u1ea1n ch\u01b0a l\u01b0u thay \u0111\u1ed5i b\u1ea1n c\u00f3 ch\u1eafc b\u1ea1n mu\u1ed1n di chuy\u1ec3n \u0111i?",
+"Restore last draft": "Kh\u00f4i ph\u1ee5c b\u1ea3n g\u1ea7n nh\u1ea5t",
+"Special character": "Special character",
+"Source code": "M\u00e3 ngu\u1ed3n",
+"Right to left": "Right to left",
+"Left to right": "Left to right",
+"Emoticons": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
+"Robots": "Robots",
+"Document properties": "Thu\u1ed9c t\u00ednh t\u00e0i li\u1ec7u",
+"Title": "Ti\u00eau \u0111\u1ec1",
+"Keywords": "T\u1eeb kh\u00f3a",
+"Encoding": "M\u00e3 h\u00f3a",
+"Description": "Description",
+"Author": "T\u00e1c gi\u1ea3",
+"Fullscreen": "Fullscreen",
+"Horizontal line": "K\u1ebb ngang",
+"Horizontal space": "N\u1eb1m ngang",
+"Insert\/edit image": "Ch\u00e8n\/s\u1eeda \u1ea3nh",
+"General": "Chung",
+"Advanced": "N\u00e2ng cao",
+"Source": "Ngu\u1ed3n",
+"Border": "\u0110\u01b0\u1eddng vi\u1ec1n",
+"Constrain proportions": "T\u1ef7 l\u1ec7 h\u1ea1n ch\u1ebf",
+"Vertical space": "N\u1eb1m d\u1ecdc",
+"Image description": "M\u00f4 t\u1ea3 \u1ea3nh",
+"Style": "Ki\u1ec3u",
+"Dimensions": "K\u00edch th\u01b0\u1edbc",
+"Insert image": "Ch\u00e8n \u1ea3nh",
+"Insert date\/time": "Insert date\/time",
+"Remove link": "B\u1ecf li\u00ean k\u1ebft",
+"Url": "Url",
+"Text to display": "N\u1ed9i dung hi\u1ec3n th\u1ecb",
+"Anchors": "Anchors",
+"Insert link": "Ch\u00e8n li\u00ean k\u1ebft",
+"New window": "C\u1eeda s\u1ed5 m\u1edbi",
+"None": "Kh\u00f4ng",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u0110\u00edch",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Ch\u00e8n\/s\u1eeda li\u00ean k\u1ebft",
+"Insert\/edit video": "Ch\u00e8n\/s\u1eeda video",
+"Poster": "Ng\u01b0\u1eddi g\u1eedi",
+"Alternative source": "Ngu\u1ed3n thay th\u1ebf",
+"Paste your embed code below:": "D\u00e1n m\u00e3 nh\u00fang c\u1ee7a b\u1ea1n d\u01b0\u1edbi \u0111\u00e2y:",
+"Insert video": "Ch\u00e8n video",
+"Embed": "Nh\u00fang",
+"Nonbreaking space": "Nonbreaking space",
+"Page break": "Ng\u1eaft trang",
+"Paste as text": "D\u00e1n \u0111o\u1ea1n v\u0103n b\u1ea3n",
+"Preview": "Xem th\u1eed",
+"Print": "In",
+"Save": "L\u01b0u",
+"Could not find the specified string.": "Could not find the specified string.",
+"Replace": "Replace",
+"Next": "Next",
+"Whole words": "To\u00e0n b\u1ed9 t\u1eeb",
+"Find and replace": "Find and replace",
+"Replace with": "Replace with",
+"Find": "Find",
+"Replace all": "Thay t\u1ea5t c\u1ea3",
+"Match case": "Match case",
+"Prev": "Tr\u01b0\u1edbc",
+"Spellcheck": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
+"Finish": "Ho\u00e0n t\u1ea5t",
+"Ignore all": "B\u1ecf qua t\u1ea5t",
+"Ignore": "B\u1ecf qua",
+"Insert row before": "Th\u00eam d\u00f2ng ph\u00eda tr\u00ean",
+"Rows": "D\u00f2ng",
+"Height": "\u0110\u1ed9 Cao",
+"Paste row after": "D\u00e1n v\u00e0o ph\u00eda sau, d\u01b0\u1edbi",
+"Alignment": "Canh ch\u1ec9nh",
+"Column group": "Gom nh\u00f3m c\u1ed9t",
+"Row": "D\u00f2ng",
+"Insert column before": "Th\u00eam c\u1ed9t b\u00ean tr\u00e1i",
+"Split cell": "Chia c\u1eaft \u00f4",
+"Cell padding": "Kho\u1ea3ng c\u00e1ch trong \u00f4",
+"Cell spacing": "Kho\u1ea3ng c\u00e1ch \u00f4",
+"Row type": "Th\u1ec3 lo\u1ea1i d\u00f2ng",
+"Insert table": "Th\u00eam b\u1ea3ng",
+"Body": "N\u1ed9i dung",
+"Caption": "Ti\u00eau \u0111\u1ec1",
+"Footer": "Ch\u00e2n",
+"Delete row": "Xo\u00e1 d\u00f2ng",
+"Paste row before": "D\u00e1n v\u00e0o ph\u00eda tr\u01b0\u1edbc, tr\u00ean",
+"Scope": "Quy\u1ec1n",
+"Delete table": "Xo\u00e1 b\u1ea3ng",
+"Header cell": "Ti\u00eau \u0111\u1ec1 \u00f4",
+"Column": "C\u1ed9t",
+"Cell": "\u00d4",
+"Header": "Ti\u00eau \u0111\u1ec1",
+"Cell type": "Lo\u1ea1i \u00f4",
+"Copy row": "Sao ch\u00e9p d\u00f2ng",
+"Row properties": "Thu\u1ed9c t\u00ednh d\u00f2ng",
+"Table properties": "Thu\u1ed9c t\u00ednh b\u1ea3ng",
+"Row group": "Gom nh\u00f3m d\u00f2ng",
+"Right": "Ph\u1ea3i",
+"Insert column after": "Th\u00eam c\u1ed9t b\u00ean ph\u1ea3i",
+"Cols": "C\u1ed9t",
+"Insert row after": "Th\u00eam d\u00f2ng ph\u00eda d\u01b0\u1edbi",
+"Width": "\u0110\u1ed9 R\u1ed9ng",
+"Cell properties": "Thu\u1ed9c t\u00ednh \u00f4",
+"Left": "Tr\u00e1i",
+"Cut row": "C\u1eaft d\u00f2ng",
+"Delete column": "Xo\u00e1 c\u1ed9t",
+"Center": "Gi\u1eefa",
+"Merge cells": "Tr\u1ed9n \u00f4",
+"Insert template": "Insert template",
+"Templates": "Templates",
+"Background color": "M\u00e0u n\u1ec1n",
+"Text color": "M\u00e0u v\u0103n b\u1ea3n",
+"Show blocks": "Show blocks",
+"Show invisible characters": "Hi\u1ec3n th\u1ecb k\u00fd t\u1ef1 \u1ea9n",
+"Words: {0}": "Words: {0}",
+"Insert": "Insert",
+"File": "File",
+"Edit": "Edit",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
+"Tools": "Tools",
+"View": "View",
+"Table": "Table",
+"Format": "Format"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/zh-CN.js b/core/media/editors/tinymce/langs/zh-CN.js
new file mode 100644
index 00000000..130e3d10
--- /dev/null
+++ b/core/media/editors/tinymce/langs/zh-CN.js
@@ -0,0 +1,230 @@
+tinymce.addI18n('zh-CN',{
+"Cut": "\u526a\u5207",
+"Heading 5": "\u6807\u98985",
+"Header 2": "\u6807\u98982",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u4f60\u7684\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u5bf9\u526a\u8d34\u677f\u7684\u8bbf\u95ee\uff0c\u8bf7\u4f7f\u7528Ctrl+X\/C\/V\u952e\u8fdb\u884c\u590d\u5236\u7c98\u8d34\u3002",
+"Heading 4": "\u6807\u98984",
+"Div": "Div\u533a\u5757",
+"Heading 2": "\u6807\u98982",
+"Paste": "\u7c98\u8d34",
+"Close": "\u5173\u95ed",
+"Font Family": "\u5b57\u4f53",
+"Pre": "\u9884\u683c\u5f0f\u6587\u672c",
+"Align right": "\u53f3\u5bf9\u9f50",
+"New document": "\u65b0\u6587\u6863",
+"Blockquote": "\u5f15\u7528",
+"Numbered list": "\u7f16\u53f7\u5217\u8868",
+"Heading 1": "\u6807\u98981",
+"Headings": "\u6807\u9898",
+"Increase indent": "\u589e\u52a0\u7f29\u8fdb",
+"Formats": "\u683c\u5f0f",
+"Headers": "\u6807\u9898",
+"Select all": "\u5168\u9009",
+"Header 3": "\u6807\u98983",
+"Blocks": "\u533a\u5757",
+"Undo": "\u64a4\u6d88",
+"Strikethrough": "\u5220\u9664\u7ebf",
+"Bullet list": "\u9879\u76ee\u7b26\u53f7",
+"Header 1": "\u6807\u98981",
+"Superscript": "\u4e0a\u6807",
+"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
+"Font Sizes": "\u5b57\u53f7",
+"Subscript": "\u4e0b\u6807",
+"Header 6": "\u6807\u98986",
+"Redo": "\u91cd\u590d",
+"Paragraph": "\u6bb5\u843d",
+"Ok": "\u786e\u5b9a",
+"Bold": "\u7c97\u4f53",
+"Code": "\u4ee3\u7801",
+"Italic": "\u659c\u4f53",
+"Align center": "\u5c45\u4e2d",
+"Header 5": "\u6807\u98985",
+"Heading 6": "\u6807\u98986",
+"Heading 3": "\u6807\u98983",
+"Decrease indent": "\u51cf\u5c11\u7f29\u8fdb",
+"Header 4": "\u6807\u98984",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u5f53\u524d\u4e3a\u7eaf\u6587\u672c\u7c98\u8d34\u6a21\u5f0f\uff0c\u518d\u6b21\u70b9\u51fb\u53ef\u4ee5\u56de\u5230\u666e\u901a\u7c98\u8d34\u6a21\u5f0f\u3002",
+"Underline": "\u4e0b\u5212\u7ebf",
+"Cancel": "\u53d6\u6d88",
+"Justify": "\u4e24\u7aef\u5bf9\u9f50",
+"Inline": "\u6587\u672c",
+"Copy": "\u590d\u5236",
+"Align left": "\u5de6\u5bf9\u9f50",
+"Visual aids": "\u7f51\u683c\u7ebf",
+"Lower Greek": "\u5c0f\u5199\u5e0c\u814a\u5b57\u6bcd",
+"Square": "\u65b9\u5757",
+"Default": "\u9ed8\u8ba4",
+"Lower Alpha": "\u5c0f\u5199\u82f1\u6587\u5b57\u6bcd",
+"Circle": "\u7a7a\u5fc3\u5706",
+"Disc": "\u5b9e\u5fc3\u5706",
+"Upper Alpha": "\u5927\u5199\u82f1\u6587\u5b57\u6bcd",
+"Upper Roman": "\u5927\u5199\u7f57\u9a6c\u5b57\u6bcd",
+"Lower Roman": "\u5c0f\u5199\u7f57\u9a6c\u5b57\u6bcd",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
+"Name": "\u540d\u79f0",
+"Anchor": "\u951a\u70b9",
+"Id": "\u6807\u8bc6\u7b26",
+"You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
+"Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
+"Special character": "\u7279\u6b8a\u7b26\u53f7",
+"Source code": "\u6e90\u4ee3\u7801",
+"Language": "\u8bed\u8a00",
+"Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
+"B": "B",
+"R": "R",
+"G": "G",
+"Color": "\u989c\u8272",
+"Right to left": "\u4ece\u53f3\u5230\u5de6",
+"Left to right": "\u4ece\u5de6\u5230\u53f3",
+"Emoticons": "\u8868\u60c5",
+"Robots": "\u673a\u5668\u4eba",
+"Document properties": "\u6587\u6863\u5c5e\u6027",
+"Title": "\u6807\u9898",
+"Keywords": "\u5173\u952e\u8bcd",
+"Encoding": "\u7f16\u7801",
+"Description": "\u63cf\u8ff0",
+"Author": "\u4f5c\u8005",
+"Fullscreen": "\u5168\u5c4f",
+"Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
+"Horizontal space": "\u6c34\u5e73\u8fb9\u8ddd",
+"Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
+"General": "\u666e\u901a",
+"Advanced": "\u9ad8\u7ea7",
+"Source": "\u5730\u5740",
+"Border": "\u8fb9\u6846",
+"Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
+"Vertical space": "\u5782\u76f4\u8fb9\u8ddd",
+"Image description": "\u56fe\u7247\u63cf\u8ff0",
+"Style": "\u6837\u5f0f",
+"Dimensions": "\u5927\u5c0f",
+"Insert image": "\u63d2\u5165\u56fe\u7247",
+"Image": "\u56fe\u7247",
+"Zoom in": "\u653e\u5927",
+"Contrast": "\u5bf9\u6bd4\u5ea6",
+"Back": "\u540e\u9000",
+"Gamma": "\u4f3d\u9a6c\u503c",
+"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f6c",
+"Resize": "\u8c03\u6574\u5927\u5c0f",
+"Sharpen": "\u9510\u5316",
+"Zoom out": "\u7f29\u5c0f",
+"Image options": "\u56fe\u7247\u9009\u9879",
+"Apply": "\u5e94\u7528",
+"Brightness": "\u4eae\u5ea6",
+"Rotate clockwise": "\u987a\u65f6\u9488\u65cb\u8f6c",
+"Rotate counterclockwise": "\u9006\u65f6\u9488\u65cb\u8f6c",
+"Edit image": "\u7f16\u8f91\u56fe\u7247",
+"Color levels": "\u989c\u8272\u5c42\u6b21",
+"Crop": "\u88c1\u526a",
+"Orientation": "\u65b9\u5411",
+"Flip vertically": "\u5782\u76f4\u7ffb\u8f6c",
+"Invert": "\u53cd\u8f6c",
+"Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
+"Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
+"Remove link": "\u5220\u9664\u94fe\u63a5",
+"Url": "\u5730\u5740",
+"Text to display": "\u663e\u793a\u6587\u5b57",
+"Anchors": "\u951a\u70b9",
+"Insert link": "\u63d2\u5165\u94fe\u63a5",
+"Link": "\u94fe\u63a5",
+"New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
+"None": "\u65e0",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
+"Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
+"Target": "\u6253\u5f00\u65b9\u5f0f",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
+"Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
+"Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
+"Media": "\u5a92\u4f53",
+"Alternative source": "\u955c\u50cf",
+"Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
+"Insert video": "\u63d2\u5165\u89c6\u9891",
+"Poster": "\u5c01\u9762",
+"Insert\/edit media": "\u63d2\u5165\/\u7f16\u8f91\u5a92\u4f53",
+"Embed": "\u5185\u5d4c",
+"Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
+"Page break": "\u5206\u9875\u7b26",
+"Paste as text": "\u7c98\u8d34\u4e3a\u6587\u672c",
+"Preview": "\u9884\u89c8",
+"Print": "\u6253\u5370",
+"Save": "\u4fdd\u5b58",
+"Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
+"Replace": "\u66ff\u6362",
+"Next": "\u4e0b\u4e00\u4e2a",
+"Whole words": "\u5168\u5b57\u5339\u914d",
+"Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
+"Replace with": "\u66ff\u6362\u4e3a",
+"Find": "\u67e5\u627e",
+"Replace all": "\u5168\u90e8\u66ff\u6362",
+"Match case": "\u533a\u5206\u5927\u5c0f\u5199",
+"Prev": "\u4e0a\u4e00\u4e2a",
+"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
+"Finish": "\u5b8c\u6210",
+"Ignore all": "\u5168\u90e8\u5ffd\u7565",
+"Ignore": "\u5ffd\u7565",
+"Add to Dictionary": "\u6dfb\u52a0\u5230\u5b57\u5178",
+"Insert row before": "\u5728\u4e0a\u65b9\u63d2\u5165",
+"Rows": "\u884c",
+"Height": "\u9ad8",
+"Paste row after": "\u7c98\u8d34\u5230\u4e0b\u65b9",
+"Alignment": "\u5bf9\u9f50\u65b9\u5f0f",
+"Border color": "\u8fb9\u6846\u989c\u8272",
+"Column group": "\u5217\u7ec4",
+"Row": "\u884c",
+"Insert column before": "\u5728\u5de6\u4fa7\u63d2\u5165",
+"Split cell": "\u62c6\u5206\u5355\u5143\u683c",
+"Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
+"Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
+"Row type": "\u884c\u7c7b\u578b",
+"Insert table": "\u63d2\u5165\u8868\u683c",
+"Body": "\u8868\u4f53",
+"Caption": "\u6807\u9898",
+"Footer": "\u8868\u5c3e",
+"Delete row": "\u5220\u9664\u884c",
+"Paste row before": "\u7c98\u8d34\u5230\u4e0a\u65b9",
+"Scope": "\u8303\u56f4",
+"Delete table": "\u5220\u9664\u8868\u683c",
+"H Align": "\u6c34\u5e73\u5bf9\u9f50",
+"Top": "\u9876\u90e8\u5bf9\u9f50",
+"Header cell": "\u8868\u5934\u5355\u5143\u683c",
+"Column": "\u5217",
+"Row group": "\u884c\u7ec4",
+"Cell": "\u5355\u5143\u683c",
+"Middle": "\u5782\u76f4\u5c45\u4e2d",
+"Cell type": "\u5355\u5143\u683c\u7c7b\u578b",
+"Copy row": "\u590d\u5236\u884c",
+"Row properties": "\u884c\u5c5e\u6027",
+"Table properties": "\u8868\u683c\u5c5e\u6027",
+"Bottom": "\u5e95\u90e8\u5bf9\u9f50",
+"V Align": "\u5782\u76f4\u5bf9\u9f50",
+"Header": "\u8868\u5934",
+"Right": "\u53f3\u5bf9\u9f50",
+"Insert column after": "\u5728\u53f3\u4fa7\u63d2\u5165",
+"Cols": "\u5217",
+"Insert row after": "\u5728\u4e0b\u65b9\u63d2\u5165",
+"Width": "\u5bbd",
+"Cell properties": "\u5355\u5143\u683c\u5c5e\u6027",
+"Left": "\u5de6\u5bf9\u9f50",
+"Cut row": "\u526a\u5207\u884c",
+"Delete column": "\u5220\u9664\u5217",
+"Center": "\u5c45\u4e2d",
+"Merge cells": "\u5408\u5e76\u5355\u5143\u683c",
+"Insert template": "\u63d2\u5165\u6a21\u677f",
+"Templates": "\u6a21\u677f",
+"Background color": "\u80cc\u666f\u8272",
+"Custom...": "\u81ea\u5b9a\u4e49...",
+"Custom color": "\u81ea\u5b9a\u4e49\u989c\u8272",
+"No color": "\u65e0",
+"Text color": "\u6587\u5b57\u989c\u8272",
+"Table of Contents": "\u5185\u5bb9\u5217\u8868",
+"Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
+"Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
+"Words: {0}": "\u5b57\u6570\uff1a{0}",
+"Insert": "\u63d2\u5165",
+"File": "\u6587\u4ef6",
+"Edit": "\u7f16\u8f91",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u5728\u7f16\u8f91\u533a\u6309ALT-F9\u6253\u5f00\u83dc\u5355\uff0c\u6309ALT-F10\u6253\u5f00\u5de5\u5177\u680f\uff0c\u6309ALT-0\u67e5\u770b\u5e2e\u52a9",
+"Tools": "\u5de5\u5177",
+"View": "\u89c6\u56fe",
+"Table": "\u8868\u683c",
+"Format": "\u683c\u5f0f"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/langs/zh-TW.js b/core/media/editors/tinymce/langs/zh-TW.js
new file mode 100644
index 00000000..2468e571
--- /dev/null
+++ b/core/media/editors/tinymce/langs/zh-TW.js
@@ -0,0 +1,179 @@
+tinymce.addI18n('zh-TW',{
+"Cut": "\u526a\u4e0b",
+"Header 2": "\u6a19\u984c 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u60a8\u7684\u700f\u89bd\u5668\u4e0d\u652f\u63f4\u5b58\u53d6\u526a\u8cbc\u7c3f\uff0c\u53ef\u4ee5\u4f7f\u7528\u5feb\u901f\u9375 Ctrl + X\/C\/V \u4ee3\u66ff\u526a\u4e0b\u3001\u8907\u88fd\u8207\u8cbc\u4e0a\u3002",
+"Div": "Div",
+"Paste": "\u8cbc\u4e0a",
+"Close": "\u95dc\u9589",
+"Font Family": "\u5b57\u9ad4",
+"Pre": "Pre",
+"Align right": "\u7f6e\u53f3\u5c0d\u9f4a",
+"New document": "\u65b0\u6587\u4ef6",
+"Blockquote": "\u5f15\u7528",
+"Numbered list": "\u6578\u5b57\u6e05\u55ae",
+"Increase indent": "\u589e\u52a0\u7e2e\u6392",
+"Formats": "\u683c\u5f0f",
+"Headers": "\u6a19\u984c",
+"Select all": "\u5168\u9078",
+"Header 3": "\u6a19\u984c 3",
+"Blocks": "\u5340\u584a",
+"Undo": "\u5fa9\u539f",
+"Strikethrough": "\u522a\u9664\u7dda",
+"Bullet list": "\u9805\u76ee\u6e05\u55ae",
+"Header 1": "\u6a19\u984c 1",
+"Superscript": "\u4e0a\u6a19",
+"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
+"Font Sizes": "\u5b57\u578b\u5927\u5c0f",
+"Subscript": "\u4e0b\u6a19",
+"Header 6": "\u6a19\u984c 6",
+"Redo": "\u53d6\u6d88\u5fa9\u539f",
+"Paragraph": "\u6bb5\u843d",
+"Ok": "\u78ba\u5b9a",
+"Bold": "\u7c97\u9ad4",
+"Code": "\u7a0b\u5f0f\u78bc",
+"Italic": "\u659c\u9ad4",
+"Align center": "\u7f6e\u4e2d\u5c0d\u9f4a",
+"Header 5": "\u6a19\u984c 5",
+"Decrease indent": "\u6e1b\u5c11\u7e2e\u6392",
+"Header 4": "\u6a19\u984c 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u76ee\u524d\u5c07\u4ee5\u7d14\u6587\u5b57\u7684\u6a21\u5f0f\u8cbc\u4e0a\uff0c\u60a8\u53ef\u4ee5\u518d\u9ede\u9078\u4e00\u6b21\u53d6\u6d88\u3002",
+"Underline": "\u5e95\u7dda",
+"Cancel": "\u53d6\u6d88",
+"Justify": "\u5de6\u53f3\u5c0d\u9f4a",
+"Inline": "Inline",
+"Copy": "\u8907\u88fd",
+"Align left": "\u7f6e\u5de6\u5c0d\u9f4a",
+"Visual aids": "\u5c0f\u5e6b\u624b",
+"Lower Greek": "\u5e0c\u81d8\u5b57\u6bcd",
+"Square": "\u6b63\u65b9\u5f62",
+"Default": "\u9810\u8a2d",
+"Lower Alpha": "\u5c0f\u5beb\u82f1\u6587\u5b57\u6bcd",
+"Circle": "\u7a7a\u5fc3\u5713",
+"Disc": "\u5be6\u5fc3\u5713",
+"Upper Alpha": "\u5927\u5beb\u82f1\u6587\u5b57\u6bcd",
+"Upper Roman": "\u5927\u5beb\u7f85\u99ac\u6578\u5b57",
+"Lower Roman": "\u5c0f\u5beb\u7f85\u99ac\u6578\u5b57",
+"Name": "\u540d\u7a31",
+"Anchor": "\u52a0\u5165\u9328\u9ede",
+"You have unsaved changes are you sure you want to navigate away?": "\u7de8\u8f2f\u5c1a\u672a\u88ab\u5132\u5b58\uff0c\u4f60\u78ba\u5b9a\u8981\u96e2\u958b\uff1f",
+"Restore last draft": "\u8f09\u5165\u4e0a\u4e00\u6b21\u7de8\u8f2f\u7684\u8349\u7a3f",
+"Special character": "\u7279\u6b8a\u5b57\u5143",
+"Source code": "\u539f\u59cb\u78bc",
+"Right to left": "\u5f9e\u53f3\u5230\u5de6",
+"Left to right": "\u5f9e\u5de6\u5230\u53f3",
+"Emoticons": "\u8868\u60c5",
+"Robots": "\u6a5f\u5668\u4eba",
+"Document properties": "\u6587\u4ef6\u7684\u5c6c\u6027",
+"Title": "\u6a19\u984c",
+"Keywords": "\u95dc\u9375\u5b57",
+"Encoding": "\u7de8\u78bc",
+"Description": "\u63cf\u8ff0",
+"Author": "\u4f5c\u8005",
+"Fullscreen": "\u5168\u87a2\u5e55",
+"Horizontal line": "\u6c34\u5e73\u7dda",
+"Horizontal space": "\u5bec\u5ea6",
+"Insert\/edit image": "\u63d2\u5165\/\u7de8\u8f2f \u5716\u7247",
+"General": "\u4e00\u822c",
+"Advanced": "\u9032\u968e",
+"Source": "\u5716\u7247\u7db2\u5740",
+"Border": "\u908a\u6846",
+"Constrain proportions": "\u7b49\u6bd4\u4f8b\u7e2e\u653e",
+"Vertical space": "\u9ad8\u5ea6",
+"Image description": "\u5716\u7247\u63cf\u8ff0",
+"Style": "\u6a23\u5f0f",
+"Dimensions": "\u5c3a\u5bf8",
+"Insert image": "\u63d2\u5165\u5716\u7247",
+"Insert date\/time": "\u63d2\u5165 \u65e5\u671f\/\u6642\u9593",
+"Remove link": "\u79fb\u9664\u9023\u7d50",
+"Url": "\u7db2\u5740",
+"Text to display": "\u986f\u793a\u6587\u5b57",
+"Anchors": "\u52a0\u5165\u9328\u9ede",
+"Insert link": "\u63d2\u5165\u9023\u7d50",
+"New window": "\u53e6\u958b\u8996\u7a97",
+"None": "\u7121",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "\u958b\u555f\u65b9\u5f0f",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "\u63d2\u5165\/\u7de8\u8f2f\u9023\u7d50",
+"Insert\/edit video": "\u63d2\u4ef6\/\u7de8\u8f2f \u5f71\u97f3",
+"Poster": "\u9810\u89bd\u5716\u7247",
+"Alternative source": "\u66ff\u4ee3\u5f71\u97f3",
+"Paste your embed code below:": "\u8acb\u5c07\u60a8\u7684\u5d4c\u5165\u5f0f\u7a0b\u5f0f\u78bc\u8cbc\u5728\u4e0b\u9762:",
+"Insert video": "\u63d2\u5165\u5f71\u97f3",
+"Embed": "\u5d4c\u5165\u78bc",
+"Nonbreaking space": "\u4e0d\u5206\u884c\u7684\u7a7a\u683c",
+"Page break": "\u5206\u9801",
+"Paste as text": "\u4ee5\u7d14\u6587\u5b57\u8cbc\u4e0a",
+"Preview": "\u9810\u89bd",
+"Print": "\u5217\u5370",
+"Save": "\u5132\u5b58",
+"Could not find the specified string.": "\u7121\u6cd5\u67e5\u8a62\u5230\u6b64\u7279\u5b9a\u5b57\u4e32",
+"Replace": "\u66ff\u63db",
+"Next": "\u4e0b\u4e00\u500b",
+"Whole words": "\u6574\u500b\u55ae\u5b57",
+"Find and replace": "\u5c0b\u627e\u53ca\u53d6\u4ee3",
+"Replace with": "\u66f4\u63db",
+"Find": "\u641c\u5c0b",
+"Replace all": "\u66ff\u63db\u5168\u90e8",
+"Match case": "\u76f8\u5339\u914d\u6848\u4ef6",
+"Prev": "\u4e0a\u4e00\u500b",
+"Spellcheck": "\u62fc\u5b57\u6aa2\u67e5",
+"Finish": "\u5b8c\u6210",
+"Ignore all": "\u5ffd\u7565\u6240\u6709",
+"Ignore": "\u5ffd\u7565",
+"Insert row before": "\u63d2\u5165\u5217\u5728...\u4e4b\u524d",
+"Rows": "\u5217",
+"Height": "\u9ad8\u5ea6",
+"Paste row after": "\u8cbc\u4e0a\u5217\u5728...\u4e4b\u5f8c",
+"Alignment": "\u5c0d\u9f4a",
+"Column group": "\u6b04\u4f4d\u7fa4\u7d44",
+"Row": "\u5217",
+"Insert column before": "\u63d2\u5165\u6b04\u4f4d\u5728...\u4e4b\u524d",
+"Split cell": "\u5206\u5272\u5132\u5b58\u683c",
+"Cell padding": "\u5132\u5b58\u683c\u7684\u908a\u8ddd",
+"Cell spacing": "\u5132\u5b58\u683c\u5f97\u9593\u8ddd",
+"Row type": "\u884c\u7684\u985e\u578b",
+"Insert table": "\u63d2\u5165\u8868\u683c",
+"Body": "\u4e3b\u9ad4",
+"Caption": "\u8868\u683c\u6a19\u984c",
+"Footer": "\u9801\u5c3e",
+"Delete row": "\u522a\u9664\u5217",
+"Paste row before": "\u8cbc\u4e0a\u5217\u5728...\u4e4b\u524d",
+"Scope": "\u7bc4\u570d",
+"Delete table": "\u522a\u9664\u8868\u683c",
+"Header cell": "\u6a19\u982d\u5132\u5b58\u683c",
+"Column": "\u884c",
+"Cell": "\u5132\u5b58\u683c",
+"Header": "\u6a19\u982d",
+"Cell type": "\u5132\u5b58\u683c\u7684\u985e\u578b",
+"Copy row": "\u8907\u88fd\u5217",
+"Row properties": "\u5217\u5c6c\u6027",
+"Table properties": "\u8868\u683c\u5c6c\u6027",
+"Row group": "\u5217\u7fa4\u7d44",
+"Right": "\u53f3\u908a",
+"Insert column after": "\u63d2\u5165\u6b04\u4f4d\u5728...\u4e4b\u5f8c",
+"Cols": "\u6b04\u4f4d\u6bb5",
+"Insert row after": "\u63d2\u5165\u5217\u5728...\u4e4b\u5f8c",
+"Width": "\u5bec\u5ea6",
+"Cell properties": "\u5132\u5b58\u683c\u5c6c\u6027",
+"Left": "\u5de6\u908a",
+"Cut row": "\u526a\u4e0b\u5217",
+"Delete column": "\u522a\u9664\u884c",
+"Center": "\u4e2d\u9593",
+"Merge cells": "\u5408\u4f75\u5132\u5b58\u683c",
+"Insert template": "\u63d2\u5165\u6a23\u7248",
+"Templates": "\u6a23\u7248",
+"Background color": "\u80cc\u666f\u984f\u8272",
+"Text color": "\u6587\u5b57\u984f\u8272",
+"Show blocks": "\u986f\u793a\u5340\u584a\u8cc7\u8a0a",
+"Show invisible characters": "\u986f\u793a\u96b1\u85cf\u5b57\u5143",
+"Words: {0}": "\u5b57\u6578\uff1a{0}",
+"Insert": "\u63d2\u5165",
+"File": "\u6a94\u6848",
+"Edit": "\u7de8\u8f2f",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u8c50\u5bcc\u7684\u6587\u672c\u5340\u57df\u3002\u6309ALT-F9\u524d\u5f80\u4e3b\u9078\u55ae\u3002\u6309ALT-F10\u547c\u53eb\u5de5\u5177\u6b04\u3002\u6309ALT-0\u5c0b\u6c42\u5e6b\u52a9",
+"Tools": "\u5de5\u5177",
+"View": "\u6aa2\u8996",
+"Table": "\u8868\u683c",
+"Format": "\u683c\u5f0f"
+});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/license.txt b/core/media/editors/tinymce/license.txt
new file mode 100644
index 00000000..1837b0ac
--- /dev/null
+++ b/core/media/editors/tinymce/license.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/core/media/editors/tinymce/plugins/advlist/plugin.min.js b/core/media/editors/tinymce/plugins/advlist/plugin.min.js
new file mode 100644
index 00000000..bdf67cc3
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/advlist/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("advlist",function(e){function t(t){return e.$.contains(e.getBody(),t)}function n(e){return e&&/^(OL|UL|DL)$/.test(e.nodeName)&&t(e)}function r(e,t){var n=[];return t&&tinymce.each(t.split(/[ ,]/),function(e){n.push({text:e.replace(/\-/g," ").replace(/\b\w/g,function(e){return e.toUpperCase()}),data:"default"==e?"":e})}),n}function i(t,n){e.undoManager.transact(function(){var r,i=e.dom,o=e.selection;if(r=i.getParent(o.getNode(),"ol,ul"),!r||r.nodeName!=t||n===!1){var a={"list-style-type":n?n:""};e.execCommand("UL"==t?"InsertUnorderedList":"InsertOrderedList",!1,a)}r=i.getParent(o.getNode(),"ol,ul"),r&&tinymce.util.Tools.each(i.select("ol,ul",r).concat([r]),function(e){e.nodeName!==t&&n!==!1&&(e=i.rename(e,t)),i.setStyle(e,"listStyleType",n?n:null),e.removeAttribute("data-mce-style")}),e.focus()})}function o(t){var n=e.dom.getStyle(e.dom.getParent(e.selection.getNode(),"ol,ul"),"listStyleType")||"";t.control.items().each(function(e){e.active(e.settings.data===n)})}var a,s,l=function(e,t){var n=e.settings.plugins?e.settings.plugins:"";return tinymce.util.Tools.inArray(n.split(/[ ,]/),t)!==-1};a=r("OL",e.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),s=r("UL",e.getParam("advlist_bullet_styles","default,circle,disc,square"));var c=function(t){return function(){var r=this;e.on("NodeChange",function(e){var i=tinymce.util.Tools.grep(e.parents,n);r.active(i.length>0&&i[0].nodeName===t)})}};l(e,"lists")&&(e.addCommand("ApplyUnorderedListStyle",function(e,t){i("UL",t["list-style-type"])}),e.addCommand("ApplyOrderedListStyle",function(e,t){i("OL",t["list-style-type"])}),e.addButton("numlist",{type:a.length>0?"splitbutton":"button",tooltip:"Numbered list",menu:a,onPostRender:c("OL"),onshow:o,onselect:function(e){i("OL",e.control.settings.data)},onclick:function(){i("OL",!1)}}),e.addButton("bullist",{type:s.length>0?"splitbutton":"button",tooltip:"Bullet list",onPostRender:c("UL"),menu:s,onshow:o,onselect:function(e){i("UL",e.control.settings.data)},onclick:function(){i("UL",!1)}}))});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/anchor/plugin.min.js b/core/media/editors/tinymce/plugins/anchor/plugin.min.js
new file mode 100644
index 00000000..1b9a15d9
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/anchor/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("anchor",function(e){var t=function(e){return!e.attr("href")&&(e.attr("id")||e.attr("name"))&&!e.firstChild},n=function(e){return function(n){for(var r=0;r<n.length;r++)t(n[r])&&n[r].attr("contenteditable",e)}},r=function(e){return/^[A-Za-z][A-Za-z0-9\-:._]*$/.test(e)},i=function(){var t=e.selection.getNode(),n="A"==t.tagName&&""===e.dom.getAttrib(t,"href"),i="";n&&(i=t.id||t.name||""),e.windowManager.open({title:"Anchor",body:{type:"textbox",name:"id",size:40,label:"Id",value:i},onsubmit:function(i){var o=i.data.id;return r(o)?void(n?(t.removeAttribute("name"),t.id=o):(e.selection.collapse(!0),e.execCommand("mceInsertContent",!1,e.dom.createHTML("a",{id:o})))):(i.preventDefault(),void e.windowManager.alert("Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores."))}})};tinymce.Env.ceFalse&&e.on("PreInit",function(){e.parser.addNodeFilter("a",n("false")),e.serializer.addNodeFilter("a",n(null))}),e.addCommand("mceAnchor",i),e.addButton("anchor",{icon:"anchor",tooltip:"Anchor",onclick:i,stateSelector:"a:not([href])"}),e.addMenuItem("anchor",{icon:"anchor",text:"Anchor",context:"insert",onclick:i})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/autolink/plugin.min.js b/core/media/editors/tinymce/plugins/autolink/plugin.min.js
new file mode 100644
index 00000000..1aa80c1b
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/autolink/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("autolink",function(e){function t(e){i(e,-1,"(",!0)}function n(e){i(e,0,"",!0)}function r(e){i(e,-1,"",!1)}function i(e,t,n){function r(e,t){if(t<0&&(t=0),3==e.nodeType){var n=e.data.length;t>n&&(t=n)}return t}function i(e,t){1!=e.nodeType||e.hasChildNodes()?s.setStart(e,r(e,t)):s.setStartBefore(e)}function o(e,t){1!=e.nodeType||e.hasChildNodes()?s.setEnd(e,r(e,t)):s.setEndAfter(e)}var s,l,c,u,d,f,p,m,g,h;if("A"!=e.selection.getNode().tagName){if(s=e.selection.getRng(!0).cloneRange(),s.startOffset<5){if(m=s.endContainer.previousSibling,!m){if(!s.endContainer.firstChild||!s.endContainer.firstChild.nextSibling)return;m=s.endContainer.firstChild.nextSibling}if(g=m.length,i(m,g),o(m,g),s.endOffset<5)return;l=s.endOffset,u=m}else{if(u=s.endContainer,3!=u.nodeType&&u.firstChild){for(;3!=u.nodeType&&u.firstChild;)u=u.firstChild;3==u.nodeType&&(i(u,0),o(u,u.nodeValue.length))}l=1==s.endOffset?2:s.endOffset-1-t}c=l;do i(u,l>=2?l-2:0),o(u,l>=1?l-1:0),l-=1,h=s.toString();while(" "!=h&&""!==h&&160!=h.charCodeAt(0)&&l-2>=0&&h!=n);s.toString()==n||160==s.toString().charCodeAt(0)?(i(u,l),o(u,c),l+=1):0===s.startOffset?(i(u,0),o(u,c)):(i(u,l),o(u,c)),f=s.toString(),"."==f.charAt(f.length-1)&&o(u,c-1),f=s.toString(),p=f.match(a),p&&("www."==p[1]?p[1]="http://www.":/@$/.test(p[1])&&!/^mailto:/.test(p[1])&&(p[1]="mailto:"+p[1]),d=e.selection.getBookmark(),e.selection.setRng(s),e.execCommand("createlink",!1,p[1]+p[2]),e.settings.default_link_target&&e.dom.setAttrib(e.selection.getNode(),"target",e.settings.default_link_target),e.selection.moveToBookmark(d),e.nodeChanged())}}var o,a=/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i;return e.settings.autolink_pattern&&(a=e.settings.autolink_pattern),e.on("keydown",function(t){if(13==t.keyCode)return r(e)}),tinymce.Env.ie?void e.on("focus",function(){if(!o){o=!0;try{e.execCommand("AutoUrlDetect",!1,!0)}catch(e){}}}):(e.on("keypress",function(n){if(41==n.keyCode)return t(e)}),void e.on("keyup",function(t){if(32==t.keyCode)return n(e)}))});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/autoresize/plugin.min.js b/core/media/editors/tinymce/plugins/autoresize/plugin.min.js
new file mode 100644
index 00000000..461b81a7
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/autoresize/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("autoresize",function(e){function t(){return e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()}function n(r){var a,s,l,c,u,d,f,p,m,g,h,v,b=tinymce.DOM;if(s=e.getDoc()){if(l=s.body,c=s.documentElement,u=i.autoresize_min_height,!l||r&&"setcontent"===r.type&&r.initial||t())return void(l&&c&&(l.style.overflowY="auto",c.style.overflowY="auto"));f=e.dom.getStyle(l,"margin-top",!0),p=e.dom.getStyle(l,"margin-bottom",!0),m=e.dom.getStyle(l,"padding-top",!0),g=e.dom.getStyle(l,"padding-bottom",!0),h=e.dom.getStyle(l,"border-top-width",!0),v=e.dom.getStyle(l,"border-bottom-width",!0),d=l.offsetHeight+parseInt(f,10)+parseInt(p,10)+parseInt(m,10)+parseInt(g,10)+parseInt(h,10)+parseInt(v,10),(isNaN(d)||d<=0)&&(d=tinymce.Env.ie?l.scrollHeight:tinymce.Env.webkit&&0===l.clientHeight?0:l.offsetHeight),d>i.autoresize_min_height&&(u=d),i.autoresize_max_height&&d>i.autoresize_max_height?(u=i.autoresize_max_height,l.style.overflowY="auto",c.style.overflowY="auto"):(l.style.overflowY="hidden",c.style.overflowY="hidden",l.scrollTop=0),u!==o&&(a=u-o,b.setStyle(e.iframeElement,"height",u+"px"),o=u,tinymce.isWebKit&&a<0&&n(r))}}function r(t,i,o){tinymce.util.Delay.setEditorTimeout(e,function(){n({}),t--?r(t,i,o):o&&o()},i)}var i=e.settings,o=0;e.settings.inline||(i.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),i.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){var t,n;t=e.getParam("autoresize_overflow_padding",1),n=e.getParam("autoresize_bottom_margin",50),t!==!1&&e.dom.setStyles(e.getBody(),{paddingLeft:t,paddingRight:t}),n!==!1&&e.dom.setStyles(e.getBody(),{paddingBottom:n})}),e.on("nodechange setcontent keyup FullscreenStateChanged",n),e.getParam("autoresize_on_init",!0)&&e.on("init",function(){r(20,100,function(){r(5,1e3)})}),e.addCommand("mceAutoResize",n))});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/autosave/plugin.min.js b/core/media/editors/tinymce/plugins/autosave/plugin.min.js
new file mode 100644
index 00000000..0641cdb9
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/autosave/plugin.min.js
@@ -0,0 +1 @@
+tinymce._beforeUnloadHandler=function(){var e;return tinymce.each(tinymce.editors,function(t){t.plugins.autosave&&t.plugins.autosave.storeDraft(),!e&&t.isDirty()&&t.getParam("autosave_ask_before_unload",!0)&&(e=t.translate("You have unsaved changes are you sure you want to navigate away?"))}),e},tinymce.PluginManager.add("autosave",function(e){function t(e,t){var n={s:1e3,m:6e4};return e=/^(\d+)([ms]?)$/.exec(""+(e||t)),(e[2]?n[e[2]]:1)*parseInt(e,10)}function n(){var e=parseInt(p.getItem(u+"time"),10)||0;return!((new Date).getTime()-e>f.autosave_retention)||(r(!1),!1)}function r(t){p.removeItem(u+"draft"),p.removeItem(u+"time"),t!==!1&&e.fire("RemoveDraft")}function i(){!c()&&e.isDirty()&&(p.setItem(u+"draft",e.getContent({format:"raw",no_events:!0})),p.setItem(u+"time",(new Date).getTime()),e.fire("StoreDraft"))}function o(){n()&&(e.setContent(p.getItem(u+"draft"),{format:"raw"}),e.fire("RestoreDraft"))}function a(){d||(setInterval(function(){e.removed||i()},f.autosave_interval),d=!0)}function s(){var t=this;t.disabled(!n()),e.on("StoreDraft RestoreDraft RemoveDraft",function(){t.disabled(!n())}),a()}function l(){e.undoManager.beforeChange(),o(),r(),e.undoManager.add()}function c(t){var n=e.settings.forced_root_block;return t=tinymce.trim("undefined"==typeof t?e.getBody().innerHTML:t),""===t||new RegExp("^<"+n+"[^>]*>((\xa0|&nbsp;|[ \t]|<br[^>]*>)+?|)</"+n+">|<br>$","i").test(t)}var u,d,f=e.settings,p=tinymce.util.LocalStorage;u=f.autosave_prefix||"tinymce-autosave-{path}{query}-{id}-",u=u.replace(/\{path\}/g,document.location.pathname),u=u.replace(/\{query\}/g,document.location.search),u=u.replace(/\{id\}/g,e.id),f.autosave_interval=t(f.autosave_interval,"30s"),f.autosave_retention=t(f.autosave_retention,"20m"),e.addButton("restoredraft",{title:"Restore last draft",onclick:l,onPostRender:s}),e.addMenuItem("restoredraft",{text:"Restore last draft",onclick:l,onPostRender:s,context:"file"}),e.settings.autosave_restore_when_empty!==!1&&(e.on("init",function(){n()&&c()&&o()}),e.on("saveContent",function(){r()})),window.onbeforeunload=tinymce._beforeUnloadHandler,this.hasDraft=n,this.storeDraft=i,this.restoreDraft=o,this.removeDraft=r,this.isEmpty=c});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/bbcode/plugin.min.js b/core/media/editors/tinymce/plugins/bbcode/plugin.min.js
new file mode 100644
index 00000000..5e193fcc
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/bbcode/plugin.min.js
@@ -0,0 +1 @@
+!function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e){var t=this,n=e.getParam("bbcode_dialect","punbb").toLowerCase();e.on("beforeSetContent",function(e){e.content=t["_"+n+"_bbcode2html"](e.content)}),e.on("postProcess",function(e){e.set&&(e.content=t["_"+n+"_bbcode2html"](e.content)),e.get&&(e.content=t["_"+n+"_html2bbcode"](e.content))})},getInfo:function(){return{longname:"BBCode Plugin",author:"Ephox Corp",authorurl:"http://www.tinymce.com",infourl:"http://www.tinymce.com/wiki.php/Plugin:bbcode"}},_punbb_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}return e=tinymce.trim(e),t(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]"),t(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),t(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),t(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"),t(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"),t(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]"),t(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]"),t(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]"),t(/<font>(.*?)<\/font>/gi,"$1"),t(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]"),t(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]"),t(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]"),t(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]"),t(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]"),t(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]"),t(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]"),t(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]"),t(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]"),t(/<\/(strong|b)>/gi,"[/b]"),t(/<(strong|b)>/gi,"[b]"),t(/<\/(em|i)>/gi,"[/i]"),t(/<(em|i)>/gi,"[i]"),t(/<\/u>/gi,"[/u]"),t(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]"),t(/<u>/gi,"[u]"),t(/<blockquote[^>]*>/gi,"[quote]"),t(/<\/blockquote>/gi,"[/quote]"),t(/<br \/>/gi,"\n"),t(/<br\/>/gi,"\n"),t(/<br>/gi,"\n"),t(/<p>/gi,""),t(/<\/p>/gi,"\n"),t(/&nbsp;|\u00a0/gi," "),t(/&quot;/gi,'"'),t(/&lt;/gi,"<"),t(/&gt;/gi,">"),t(/&amp;/gi,"&"),e},_punbb_bbcode2html:function(e){function t(t,n){e=e.replace(t,n)}return e=tinymce.trim(e),t(/\n/gi,"<br />"),t(/\[b\]/gi,"<strong>"),t(/\[\/b\]/gi,"</strong>"),t(/\[i\]/gi,"<em>"),t(/\[\/i\]/gi,"</em>"),t(/\[u\]/gi,"<u>"),t(/\[\/u\]/gi,"</u>"),t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>'),t(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>'),t(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />'),t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>'),t(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;'),t(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;'),e}}),tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/charmap/plugin.min.js b/core/media/editors/tinymce/plugins/charmap/plugin.min.js
new file mode 100644
index 00000000..00c42bf2
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/charmap/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("charmap",function(e){function t(){return[["160","no-break space"],["173","soft hyphen"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["256","A - macron"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["274","E - macron"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["298","I - macron"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["332","O - macron"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["362","U - macron"],["221","Y - acute"],["376","Y - diaeresis"],["562","Y - macron"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["257","a - macron"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["275","e - macron"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["299","i - macron"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["333","o macron"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["363","u - macron"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["563","y - macron"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"]]}function n(e){return tinymce.util.Tools.grep(e,function(e){return l(e)&&2==e.length})}function r(e){return l(e)?[].concat(n(e)):"function"==typeof e?e():[]}function i(t){var n=e.settings;return n.charmap&&(t=r(n.charmap)),n.charmap_append?[].concat(t).concat(r(n.charmap_append)):t}function o(){return i(t())}function a(t){e.fire("insertCustomChar",{chr:t}).chr,e.execCommand("mceInsertContent",!1,t)}function s(){function t(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var n,r,i,s;n='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var l=o(),c=Math.min(l.length,25),u=Math.ceil(l.length/c);for(i=0;i<u;i++){for(n+="<tr>",r=0;r<c;r++){var d=i*c+r;if(d<l.length){var f=l[d],p=f?String.fromCharCode(parseInt(f[0],10)):"&nbsp;";n+='<td title="'+f[1]+'"><div tabindex="-1" title="'+f[1]+'" role="button" data-chr="'+p+'">'+p+"</div></td>"}else n+="<td />"}n+="</tr>"}n+="</tbody></table>";var m={type:"container",html:n,onclick:function(e){var n=e.target;/^(TD|DIV)$/.test(n.nodeName)&&t(n).firstChild&&(a(n.getAttribute("data-chr")),e.ctrlKey||s.close())},onmouseover:function(e){var n=t(e.target);n&&n.firstChild?(s.find("#preview").text(n.firstChild.firstChild.data),s.find("#previewTitle").text(n.title)):(s.find("#preview").text(" "),s.find("#previewTitle").text(" "))}};s=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[m,{type:"container",layout:"flex",direction:"column",align:"center",spacing:5,minWidth:160,minHeight:160,items:[{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:140,minHeight:80},{type:"label",name:"previewTitle",text:" ",style:"text-align: center",border:1,minWidth:140,minHeight:80}]}],buttons:[{text:"Close",onclick:function(){s.close()}}]})}var l=tinymce.util.Tools.isArray;return e.addCommand("mceShowCharmap",s),e.addButton("charmap",{icon:"charmap",tooltip:"Special character",cmd:"mceShowCharmap"}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",cmd:"mceShowCharmap",context:"insert"}),{getCharMap:o,insertChar:a}});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/code/plugin.min.js b/core/media/editors/tinymce/plugins/code/plugin.min.js
new file mode 100644
index 00000000..d9e43860
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/code/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("code",function(e){function t(){var t=e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:e.getParam("code_dialog_width",600),minHeight:e.getParam("code_dialog_height",Math.min(tinymce.DOM.getViewPort().h-200,500)),spellcheck:!1,style:"direction: ltr; text-align: left"},onSubmit:function(t){e.focus(),e.undoManager.transact(function(){e.setContent(t.data.code)}),e.selection.setCursorLocation(),e.nodeChanged()}});t.find("#code").value(e.getContent({source_view:!0}))}e.addCommand("mceCodeEditor",t),e.addButton("code",{icon:"code",tooltip:"Source code",onclick:t}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:t})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/codesample/css/prism.css b/core/media/editors/tinymce/plugins/codesample/css/prism.css
new file mode 100644
index 00000000..28622b52
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/codesample/css/prism.css
@@ -0,0 +1,138 @@
+/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+
+code[class*="language-"],
+pre[class*="language-"] {
+	color: black;
+	text-shadow: 0 1px white;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	direction: ltr;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	word-break: normal;
+	word-wrap: normal;
+	line-height: 1.5;
+
+	-moz-tab-size: 4;
+	-o-tab-size: 4;
+	tab-size: 4;
+
+	-webkit-hyphens: none;
+	-moz-hyphens: none;
+	-ms-hyphens: none;
+	hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
+	text-shadow: none;
+	background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
+code[class*="language-"]::selection, code[class*="language-"] ::selection {
+	text-shadow: none;
+	background: #b3d4fc;
+}
+
+@media print {
+	code[class*="language-"],
+	pre[class*="language-"] {
+		text-shadow: none;
+	}
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+	padding: 1em;
+	margin: .5em 0;
+	overflow: auto;
+}
+
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+	background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+	padding: .1em;
+	border-radius: .3em;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+	color: slategray;
+}
+
+.token.punctuation {
+	color: #999;
+}
+
+.namespace {
+	opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+	color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+	color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+	color: #a67f59;
+	background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+	color: #07a;
+}
+
+.token.function {
+	color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+	color: #e90;
+}
+
+.token.important,
+.token.bold {
+	font-weight: bold;
+}
+.token.italic {
+	font-style: italic;
+}
+
+.token.entity {
+	cursor: help;
+}
+
diff --git a/core/media/editors/tinymce/plugins/codesample/plugin.min.js b/core/media/editors/tinymce/plugins/codesample/plugin.min.js
new file mode 100644
index 00000000..d172f9c5
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/codesample/plugin.min.js
@@ -0,0 +1 @@
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],o=0;o<e.length;++o){if(n=a[e[o]]||i(e[o]),!n)throw"module definition dependecy not found: "+e[o];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){a[e]=i.apply(null,arguments)})}function i(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function o(n){var r,i,o,s,l;for(r=0;r<n.length;r++){i=e,o=n[r],s=o.split(/[.\/]/);for(var c=0;c<s.length-1;++c)i[s[c]]===t&&(i[s[c]]={}),i=i[s[c]];i[s[s.length-1]]=a[o]}if(e.AMDLC_TESTS){l=e.privateModules||{};for(o in a)l[o]=a[o];for(r=0;r<n.length;r++)delete l[n[r]];e.privateModules=l}}var a={};r("tinymce/codesampleplugin/Prism",[],function(){var e={},t="undefined"!=typeof e?e:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},n=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,n=t.Prism={util:{encode:function(e){return e instanceof r?new r(e.type,n.util.encode(e.content),e.alias):"Array"===n.util.type(e)?e.map(n.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var t=n.util.type(e);switch(t){case"Object":var r={};for(var i in e)e.hasOwnProperty(i)&&(r[i]=n.util.clone(e[i]));return r;case"Array":return e.map&&e.map(function(e){return n.util.clone(e)})}return e}},languages:{extend:function(e,t){var r=n.util.clone(n.languages[e]);for(var i in t)r[i]=t[i];return r},insertBefore:function(e,t,r,i){i=i||n.languages;var o=i[e];if(2==arguments.length){r=arguments[1];for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);return o}var s={};for(var l in o)if(o.hasOwnProperty(l)){if(l==t)for(var a in r)r.hasOwnProperty(a)&&(s[a]=r[a]);s[l]=o[l]}return n.languages.DFS(n.languages,function(t,n){n===i[e]&&t!=e&&(this[t]=s)}),i[e]=s},DFS:function(e,t,r){for(var i in e)e.hasOwnProperty(i)&&(t.call(e,i,e[i],r||i),"Object"===n.util.type(e[i])?n.languages.DFS(e[i],t):"Array"===n.util.type(e[i])&&n.languages.DFS(e[i],t,i))}},plugins:{},highlightAll:function(e,t){for(var r,i=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),o=0;r=i[o++];)n.highlightElement(r,e===!0,t)},highlightElement:function(r,i,o){for(var a,s,l=r;l&&!e.test(l.className);)l=l.parentNode;l&&(a=(l.className.match(e)||[,""])[1],s=n.languages[a]),r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+a,l=r.parentNode,/pre/i.test(l.nodeName)&&(l.className=l.className.replace(e,"").replace(/\s+/g," ")+" language-"+a);var c=r.textContent,u={element:r,language:a,grammar:s,code:c};if(!c||!s)return void n.hooks.run("complete",u);if(n.hooks.run("before-highlight",u),i&&t.Worker){var d=new Worker(n.filename);d.onmessage=function(e){u.highlightedCode=e.data,n.hooks.run("before-insert",u),u.element.innerHTML=u.highlightedCode,o&&o.call(u.element),n.hooks.run("after-highlight",u),n.hooks.run("complete",u)},d.postMessage(JSON.stringify({language:u.language,code:u.code,immediateClose:!0}))}else u.highlightedCode=n.highlight(u.code,u.grammar,u.language),n.hooks.run("before-insert",u),u.element.innerHTML=u.highlightedCode,o&&o.call(r),n.hooks.run("after-highlight",u),n.hooks.run("complete",u)},highlight:function(e,t,i){var o=n.tokenize(e,t);return r.stringify(n.util.encode(o),i)},tokenize:function(e,t,r){var i=n.Token,o=[e],a=t.rest;if(a){for(var s in a)t[s]=a[s];delete t.rest}e:for(var s in t)if(t.hasOwnProperty(s)&&t[s]){var l=t[s];l="Array"===n.util.type(l)?l:[l];for(var c=0;c<l.length;++c){var u=l[c],d=u.inside,f=!!u.lookbehind,p=0,m=u.alias;u=u.pattern||u;for(var g=0;g<o.length;g++){var h=o[g];if(o.length>e.length)break e;if(!(h instanceof i)){u.lastIndex=0;var v=u.exec(h);if(v){f&&(p=v[1].length);var b=v.index-1+p,v=v[0].slice(p),y=v.length,x=b+y,C=h.slice(0,b+1),w=h.slice(x+1),N=[g,1];C&&N.push(C);var k=new i(s,d?n.tokenize(v,d):v,m);N.push(k),w&&N.push(w),Array.prototype.splice.apply(o,N)}}}}}return o},hooks:{all:{},add:function(e,t){var r=n.hooks.all;r[e]=r[e]||[],r[e].push(t)},run:function(e,t){var r=n.hooks.all[e];if(r&&r.length)for(var i,o=0;i=r[o++];)i(t)}}},r=n.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(r.stringify=function(e,t,i){if("string"==typeof e)return e;if("Array"===n.util.type(e))return e.map(function(n){return r.stringify(n,t,e)}).join("");var o={type:e.type,content:r.stringify(e.content,t,i),tag:"span",classes:["token",e.type],attributes:{},language:t,parent:i};if("comment"==o.type&&(o.attributes.spellcheck="true"),e.alias){var a="Array"===n.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(o.classes,a)}n.hooks.run("wrap",o);var s="";for(var l in o.attributes)s+=(s?" ":"")+l+'="'+(o.attributes[l]||"")+'"';return"<"+o.tag+' class="'+o.classes.join(" ")+'" '+s+">"+o.content+"</"+o.tag+">"},!t.document)return t.addEventListener?(t.addEventListener("message",function(e){var r=JSON.parse(e.data),i=r.language,o=r.code,a=r.immediateClose;t.postMessage(n.highlight(o,n.languages[i],i)),a&&t.close()},!1),t.Prism):t.Prism}();return"undefined"!=typeof module&&module.exports&&(module.exports=n),"undefined"!=typeof global&&(global.Prism=n),n.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[^\s>\/=.]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},n.hooks.add("wrap",function(e){"entity"===e.type&&(e.attributes.title=e.content.replace(/&amp;/,"&"))}),n.languages.xml=n.languages.markup,n.languages.html=n.languages.markup,n.languages.mathml=n.languages.markup,n.languages.svg=n.languages.markup,n.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},n.languages.css.atrule.inside.rest=n.util.clone(n.languages.css),n.languages.markup&&(n.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/i,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/i,inside:n.languages.markup.tag.inside},rest:n.languages.css},alias:"language-css"}}),n.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:n.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:n.languages.css}},alias:"language-css"}},n.languages.markup.tag)),n.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/(["'])(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/},n.languages.javascript=n.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|true|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),n.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^\/])\/(?!\/)(\[.+?]|\\.|[^\/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),n.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:n.languages.javascript}},string:/[\s\S]+/}}}),n.languages.markup&&n.languages.insertBefore("markup","tag",{script:{pattern:/<script[\w\W]*?>[\w\W]*?<\/script>/i,inside:{tag:{pattern:/<script[\w\W]*?>|<\/script>/i,inside:n.languages.markup.tag.inside},rest:n.languages.javascript},alias:"language-javascript"}}),n.languages.js=n.languages.javascript,n.languages.c=n.languages.extend("clike",{keyword:/\b(asm|typeof|inline|auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto|if|int|long|register|return|short|signed|sizeof|static|struct|switch|typedef|union|unsigned|void|volatile|while)\b/,operator:/\-[>-]?|\+\+?|!=?|<<?=?|>>?=?|==?|&&?|\|?\||[~^%?*\/]/,number:/\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)[ful]*\b/i}),n.languages.insertBefore("c","string",{macro:{pattern:/(^\s*)#\s*[a-z]+([^\r\n\\]|\\.|\\(?:\r\n?|\n))*/im,lookbehind:!0,alias:"property",inside:{string:{pattern:/(#\s*include\s*)(<.+?>|("|')(\\?.)+?\3)/,lookbehind:!0}}}}),delete n.languages.c["class-name"],delete n.languages.c["boolean"],n.languages.csharp=n.languages.extend("clike",{keyword:/\b(abstract|as|async|await|base|bool|break|byte|case|catch|char|checked|class|const|continue|decimal|default|delegate|do|double|else|enum|event|explicit|extern|false|finally|fixed|float|for|foreach|goto|if|implicit|in|int|interface|internal|is|lock|long|namespace|new|null|object|operator|out|override|params|private|protected|public|readonly|ref|return|sbyte|sealed|short|sizeof|stackalloc|static|string|struct|switch|this|throw|true|try|typeof|uint|ulong|unchecked|unsafe|ushort|using|virtual|void|volatile|while|add|alias|ascending|async|await|descending|dynamic|from|get|global|group|into|join|let|orderby|partial|remove|select|set|value|var|where|yield)\b/,string:[/@("|')(\1\1|\\\1|\\?(?!\1)[\s\S])*\1/,/("|')(\\?.)*?\1/],number:/\b-?(0x[\da-f]+|\d*\.?\d+)\b/i}),n.languages.insertBefore("csharp","keyword",{preprocessor:{pattern:/(^\s*)#.*/m,lookbehind:!0}}),n.languages.cpp=n.languages.extend("c",{keyword:/\b(alignas|alignof|asm|auto|bool|break|case|catch|char|char16_t|char32_t|class|compl|const|constexpr|const_cast|continue|decltype|default|delete|do|double|dynamic_cast|else|enum|explicit|export|extern|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|noexcept|nullptr|operator|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_assert|static_cast|struct|switch|template|this|thread_local|throw|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\b/,"boolean":/\b(true|false)\b/,operator:/[-+]{1,2}|!=?|<{1,2}=?|>{1,2}=?|\->|:{1,2}|={1,2}|\^|~|%|&{1,2}|\|?\||\?|\*|\/|\b(and|and_eq|bitand|bitor|not|not_eq|or|or_eq|xor|xor_eq)\b/}),n.languages.insertBefore("cpp","keyword",{"class-name":{pattern:/(class\s+)[a-z0-9_]+/i,lookbehind:!0}}),n.languages.java=n.languages.extend("clike",{keyword:/\b(abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while)\b/,number:/\b0b[01]+\b|\b0x[\da-f]*\.?[\da-fp\-]+\b|\b\d*\.?\d+(?:e[+-]?\d+)?[df]?\b/i,operator:{pattern:/(^|[^.])(?:\+[+=]?|-[-=]?|!=?|<<?=?|>>?>?=?|==?|&[&=]?|\|[|=]?|\*=?|\/=?|%=?|\^=?|[?:~])/m,lookbehind:!0}}),n.languages.php=n.languages.extend("clike",{keyword:/\b(and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|private|protected|parent|throw|null|echo|print|trait|namespace|final|yield|goto|instanceof|finally|try|catch)\b/i,constant:/\b[A-Z0-9_]{2,}\b/,comment:{pattern:/(^|[^\\])(?:\/\*[\w\W]*?\*\/|\/\/.*)/,lookbehind:!0}}),n.languages.insertBefore("php","class-name",{"shell-comment":{pattern:/(^|[^\\])#.*/,lookbehind:!0,alias:"comment"}}),n.languages.insertBefore("php","keyword",{delimiter:/\?>|<\?(?:php)?/i,variable:/\$\w+\b/i,"package":{pattern:/(\\|namespace\s+|use\s+)[\w\\]+/,lookbehind:!0,inside:{punctuation:/\\/}}}),n.languages.insertBefore("php","operator",{property:{pattern:/(->)[\w]+/,lookbehind:!0}}),n.languages.markup&&(n.hooks.add("before-highlight",function(e){"php"===e.language&&(e.tokenStack=[],e.backupCode=e.code,e.code=e.code.replace(/(?:<\?php|<\?)[\w\W]*?(?:\?>)/gi,function(t){return e.tokenStack.push(t),"{{{PHP"+e.tokenStack.length+"}}}"}))}),n.hooks.add("before-insert",function(e){"php"===e.language&&(e.code=e.backupCode,delete e.backupCode)}),n.hooks.add("after-highlight",function(e){if("php"===e.language){for(var t,r=0;t=e.tokenStack[r];r++)e.highlightedCode=e.highlightedCode.replace("{{{PHP"+(r+1)+"}}}",n.highlight(t,e.grammar,"php").replace(/\$/g,"$$$$"));e.element.innerHTML=e.highlightedCode}}),n.hooks.add("wrap",function(e){"php"===e.language&&"markup"===e.type&&(e.content=e.content.replace(/(\{\{\{PHP[0-9]+\}\}\})/g,'<span class="token php">$1</span>'))}),n.languages.insertBefore("php","comment",{markup:{pattern:/<[^?]\/?(.*?)>/,inside:n.languages.markup},php:/\{\{\{PHP[0-9]+\}\}\}/})),n.languages.python={comment:{pattern:/(^|[^\\])#.*/,lookbehind:!0},string:/"""[\s\S]+?"""|'''[\s\S]+?'''|("|')(?:\\?.)*?\1/,"function":{pattern:/((?:^|\s)def[ \t]+)[a-zA-Z_][a-zA-Z0-9_]*(?=\()/g,lookbehind:!0},"class-name":{pattern:/(\bclass\s+)[a-z0-9_]+/i,lookbehind:!0},keyword:/\b(?:as|assert|async|await|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|pass|print|raise|return|try|while|with|yield)\b/,"boolean":/\b(?:True|False)\b/,number:/\b-?(?:0[bo])?(?:(?:\d|0x[\da-f])[\da-f]*\.?\d*|\.\d+)(?:e[+-]?\d+)?j?\b/i,operator:/[-+%=]=?|!=|\*\*?=?|\/\/?=?|<[<=>]?|>[=>]?|[&|^~]|\b(?:or|and|not)\b/,punctuation:/[{}[\];(),.:]/},function(e){e.languages.ruby=e.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\}).*/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/});var t={pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:e.util.clone(e.languages.ruby)}};e.languages.insertBefore("ruby","keyword",{regex:[{pattern:/%r([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1[gim]{0,3}/,inside:{interpolation:t}},{pattern:/%r\((?:[^()\\]|\\[\s\S])*\)[gim]{0,3}/,inside:{interpolation:t}},{pattern:/%r\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}[gim]{0,3}/,inside:{interpolation:t}},{pattern:/%r\[(?:[^\[\]\\]|\\[\s\S])*\][gim]{0,3}/,inside:{interpolation:t}},{pattern:/%r<(?:[^<>\\]|\\[\s\S])*>[gim]{0,3}/,inside:{interpolation:t}},{pattern:/(^|[^\/])\/(?!\/)(\[.+?]|\\.|[^\/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}],variable:/[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,symbol:/:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/}),e.languages.insertBefore("ruby","number",{builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/}),e.languages.ruby.string=[{pattern:/%[qQiIwWxs]?([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,inside:{interpolation:t}},{pattern:/%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,inside:{interpolation:t}},{pattern:/%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,inside:{interpolation:t}},{pattern:/%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,inside:{interpolation:t}},{pattern:/%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,inside:{interpolation:t}},{pattern:/("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,inside:{interpolation:t}}]}(n),n}),r("tinymce/codesampleplugin/Utils",[],function(){function e(e){return e&&"PRE"==e.nodeName&&e.className.indexOf("language-")!==-1}function t(e){return function(t,n){return e(n)}}return{isCodeSample:e,trimArg:t}}),r("tinymce/codesampleplugin/Dialog",["tinymce/dom/DOMUtils","tinymce/codesampleplugin/Utils","tinymce/codesampleplugin/Prism"],function(e,t,n){function r(e){var t=[{text:"HTML/XML",value:"markup"},{text:"JavaScript",value:"javascript"},{text:"CSS",value:"css"},{text:"PHP",value:"php"},{text:"Ruby",value:"ruby"},{text:"Python",value:"python"},{text:"Java",value:"java"},{text:"C",value:"c"},{text:"C#",value:"csharp"},{text:"C++",value:"cpp"}],n=e.settings.codesample_languages;return n?n:t}function i(e,t,r){e.undoManager.transact(function(){var i=o(e);r=l.encode(r),i?(e.dom.setAttrib(i,"class","language-"+t),i.innerHTML=r,n.highlightElement(i),e.selection.select(i)):(e.insertContent('<pre id="__new" class="language-'+t+'">'+r+"</pre>"),e.selection.select(e.$("#__new").removeAttr("id")[0]))})}function o(e){var n=e.selection.getNode();return t.isCodeSample(n)?n:null}function a(e){var t=o(e);return t?t.textContent:""}function s(e){var t,n=o(e);return n?(t=n.className.match(/language-(\w+)/),t?t[1]:""):""}var l=e.DOM;return{open:function(e){e.windowManager.open({title:"Insert/Edit code sample",minWidth:Math.min(l.getViewPort().w,e.getParam("codesample_dialog_width",800)),minHeight:Math.min(l.getViewPort().h,e.getParam("codesample_dialog_height",650)),layout:"flex",direction:"column",align:"stretch",body:[{type:"listbox",name:"language",label:"Language",maxWidth:200,value:s(e),values:r(e)},{type:"textbox",name:"code",multiline:!0,spellcheck:!1,ariaLabel:"Code view",flex:1,style:"direction: ltr; text-align: left",classes:"monospace",value:a(e),autofocus:!0}],onSubmit:function(t){i(e,t.data.language,t.data.code)}})}}}),r("tinymce/codesampleplugin/Plugin",["tinymce/Env","tinymce/PluginManager","tinymce/codesampleplugin/Prism","tinymce/codesampleplugin/Dialog","tinymce/codesampleplugin/Utils"],function(e,t,n,r,i){var o,a=i.trimArg;t.add("codesample",function(t,s){function l(){var e,n=t.settings.codesample_content_css;t.inline&&o||!t.inline&&c||(t.inline?o=!0:c=!0,n!==!1&&(e=t.dom.create("link",{rel:"stylesheet",href:n?n:s+"/css/prism.css"}),t.getDoc().getElementsByTagName("head")[0].appendChild(e)))}var c,u=t.$;e.ceFalse&&(t.on("PreProcess",function(e){u("pre[contenteditable=false]",e.node).filter(a(i.isCodeSample)).each(function(e,t){var n=u(t),r=t.textContent;n.attr("class",u.trim(n.attr("class"))),n.removeAttr("contentEditable"),n.empty().append(u("<code></code>").each(function(){this.textContent=r}))})}),t.on("SetContent",function(){var e=u("pre").filter(a(i.isCodeSample)).filter(function(e,t){return"false"!==t.contentEditable});e.length&&t.undoManager.transact(function(){e.each(function(e,r){u(r).find("br").each(function(e,n){n.parentNode.replaceChild(t.getDoc().createTextNode("\n"),n)}),r.contentEditable=!1,r.innerHTML=t.dom.encode(r.textContent),n.highlightElement(r),r.className=u.trim(r.className)})})}),t.addCommand("codesample",function(){var e=t.selection.getNode();t.selection.isCollapsed()||i.isCodeSample(e)?r.open(t):t.formatter.toggle("code")}),t.addButton("codesample",{cmd:"codesample",title:"Insert/Edit code sample"}),t.on("init",l))})}),o(["tinymce/codesampleplugin/Prism","tinymce/codesampleplugin/Utils","tinymce/codesampleplugin/Dialog","tinymce/codesampleplugin/Plugin"])}(window);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/colorpicker/plugin.min.js b/core/media/editors/tinymce/plugins/colorpicker/plugin.min.js
new file mode 100644
index 00000000..b56b88f4
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/colorpicker/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("colorpicker",function(e){function t(t,n){function r(e){var t=new tinymce.util.Color(e),n=t.toRgb();o.fromJSON({r:n.r,g:n.g,b:n.b,hex:t.toHex().substr(1)}),i(t.toHex())}function i(e){o.find("#preview")[0].getEl().style.background=e}var o=e.windowManager.open({title:"Color",items:{type:"container",layout:"flex",direction:"row",align:"stretch",padding:5,spacing:10,items:[{type:"colorpicker",value:n,onchange:function(){var e=this.rgb();o&&(o.find("#r").value(e.r),o.find("#g").value(e.g),o.find("#b").value(e.b),o.find("#hex").value(this.value().substr(1)),i(this.value()))}},{type:"form",padding:0,labelGap:5,defaults:{type:"textbox",size:7,value:"0",flex:1,spellcheck:!1,onchange:function(){var e,t,n=o.find("colorpicker")[0];return e=this.name(),t=this.value(),"hex"==e?(t="#"+t,r(t),void n.value(t)):(t={r:o.find("#r").value(),g:o.find("#g").value(),b:o.find("#b").value()},n.value(t),void r(t))}},items:[{name:"r",label:"R",autofocus:1},{name:"g",label:"G"},{name:"b",label:"B"},{name:"hex",label:"#",value:"000000"},{name:"preview",type:"container",border:1}]}]},onSubmit:function(){t("#"+this.toJSON().hex)}});r(n)}e.settings.color_picker_callback||(e.settings.color_picker_callback=t)});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/contextmenu/plugin.min.js b/core/media/editors/tinymce/plugins/contextmenu/plugin.min.js
new file mode 100644
index 00000000..33c3efa6
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/contextmenu/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("contextmenu",function(e){var t,n,r=e.settings.contextmenu_never_use_native,i=function(e){return e.ctrlKey&&!r},o=function(){return tinymce.Env.mac&&tinymce.Env.webkit},a=function(){return n===!0};return e.on("mousedown",function(t){o()&&2===t.button&&!i(t)&&e.selection.isCollapsed()&&e.once("contextmenu",function(t){e.selection.placeCaretAt(t.clientX,t.clientY)})}),e.on("contextmenu",function(r){var o;if(!i(r)){if(r.preventDefault(),o=e.settings.contextmenu||"link openlink image inserttable | cell row column deletetable",t)t.show();else{var a=[];tinymce.each(o.split(/[ ,]/),function(t){var n=e.menuItems[t];"|"==t&&(n={text:t}),n&&(n.shortcut="",a.push(n))});for(var s=0;s<a.length;s++)"|"==a[s].text&&(0!==s&&s!=a.length-1||a.splice(s,1));t=new tinymce.ui.Menu({items:a,context:"contextmenu",classes:"contextmenu"}).renderTo(),t.on("hide",function(e){e.control===this&&(n=!1)}),e.on("remove",function(){t.remove(),t=null})}var l={x:r.pageX,y:r.pageY};e.inline||(l=tinymce.DOM.getPos(e.getContentAreaContainer()),l.x+=r.clientX,l.y+=r.clientY),t.moveTo(l.x,l.y),n=!0}}),{isContextMenuVisible:a}});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/directionality/plugin.min.js b/core/media/editors/tinymce/plugins/directionality/plugin.min.js
new file mode 100644
index 00000000..c472a90a
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/directionality/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("directionality",function(e){function t(t){var n,r=e.dom,i=e.selection.getSelectedBlocks();i.length&&(n=r.getAttrib(i[0],"dir"),tinymce.each(i,function(e){r.getParent(e.parentNode,"*[dir='"+t+"']",r.getRoot())||(n!=t?r.setAttrib(e,"dir",t):r.setAttrib(e,"dir",null))}),e.nodeChanged())}function n(e){var t=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(n){t.push(n+"[dir="+e+"]")}),t.join(",")}e.addCommand("mceDirectionLTR",function(){t("ltr")}),e.addCommand("mceDirectionRTL",function(){t("rtl")}),e.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:n("ltr")}),e.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:n("rtl")})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-cool.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-cool.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba90cc36fb0415d0273d1cd206bff63fd9c91fde
GIT binary patch
literal 354
zcmV-o0iFIwNk%w1VG;lm0Mr!#3ke00dJfFY%i+lrhK7V(RutUQJhPY;?(XfrsZKgL
z7WLQ^zPO&zzav{)SL^9nBOw~z(=orMEH5uC-P_gr`uhCnASMa|$-iRw?m_(dUwU8)
zq>Kx}s1_F$4FCWDA^8LW0018VEC2ui01^Na000Hw;3tYzX_jM3Qpv$_M?zI9i5=0S
zX-{-uv=l<p*=3HIT}Of#RazKBq;Z@YZV4Iz0#Fnb06?MO>3%&P0s%m9Ox_a(m_c|u
z01g3U0`Wll5)poVdma=N8y<3f0Sf~hXmTC}2oxMW4FdxUj+z4<0}lrX2nP=qkDRIt
z9Ge*(qzMrj3jrIOjvI{`5eWzt3`G_T8yChG8w(a19SkK12@M(+799Zr9n=~PzBCmA
z5)BU-)YKUd4H5!D9|!^o9kWIe9SH(WDHRk92}DZ?3})2$P@$55g90f0N)ZA8JID5J
Aw*UYD

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-cry.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-cry.gif
new file mode 100644
index 0000000000000000000000000000000000000000..74d897a4f6d22e814e2b054e98b8a75fb464b4be
GIT binary patch
literal 329
zcmV-P0k-}}Nk%w1VG;lm0Mr-&E)xPSit@9T3%;vR+|V+?t0A(pllJjXrMl7n=_A_a
za^B+Su$LjvyC3@TIQZNZa##w=!k(SO^P#bO*w(eU#;{U83XFCU_V)J5wrb+;g2vkN
z#>U24qVoOvY5)KLA^8LW0018VEC2ui01^Na000HX;3tY$X_jM3QUfCh%s^o(nF++<
zc?Th6v=oL>*by8K!mhvwelUXuuW&&U9iGO3hM@>Njw{l^#0q9mWpcefdI;O$;efnY
zkd~@r-o$*74FCWI1%d((4+jDz0va0>69^fI6%`W{8w!gU1pyL>prH>E0R<%k6Aq%H
z4ij+^9TEwM5P}eh2@)L<B?|!!2MHGf4Gk9;2?q@U3tR{Vzzzx13409%2tlM00|hxd
bJp}{XBh3p2-Gt%><~6+>@EpxfA0YrcPNsSu

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-embarassed.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-embarassed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..963a96b8a7593b1d8bcbab073abe5ee4e539dbf6
GIT binary patch
literal 331
zcmV-R0kr-{Nk%w1VG;lm0MrryDh>j~yq&6%75dW~z^P39(NxsGDE{UkxtkIEq(S-a
zRKlwv+S=Lr?>hbYY~sQ?c3T&ZcN_Nh_E<O%#>U3s(>Io6B&>WW`@bsw**)Ocy1bht
z{*G6|uwwqUQ2+n{A^8LW0018VEC2ui01^Na000HZ;3tYwX_jM3YQ!c88=*-m*&&bO
zILd=`w3KAC;8hxpif*w9ek6oqV-Z0L77fROK$B<?js^^gTnMs=8C02!K#=aEqQaFR
z6pBm+GC@uzdU#EC4h0?_7ZwKt5f%vv7zzj_2!<RSkOKo436}{4lS7u67@C}(1%m_+
z1&^hgn~wz#bpZ=`7y=Uj023D&843#lB@6@x3J1!|$_fSq3|$Nh$PLU5&I{2a5)2&+
dN;`849os?-0Z|L<1OetM#T4=s(M}&B06V4ic~SrX

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c7cf1011dad0e7500e29a278b0d395b253871109
GIT binary patch
literal 342
zcmV-c0jd5+Nk%w1VG;lm0Q4UKxtkou#>SR@5BAv-%C>6y>>#+D4e#&nz^qMDItlpp
zTG728+|V&?R13PIEBW(C`uh6d*t-1sZ^XQv;oDD}iYLOV7uVO;{`xl4#4tJ{0;h@!
z>)kdc3IhA?Hvj+tA^8La0018VEC2ui01^Na06+!P;3tYuX_ljS7!u|-O)<bjtr*7$
zT@&J176)Q-futaag{0!(c%F`mWPvb3CKkn_!{urOiG{*4F_H*|3`HWLWDErJ2gy*p
z5_gw^Q9S?@9yNjn4F(zs0}lW>I}TzP1q%xT4HOFwMJaO;2ml)!00<FsBL_bU2o)S0
z6$oPvIh!mG92pr;wj2)<2BUro4=xFK7{e|P3X3Z(kb=%N4>$)141pU08x3594IX?4
o5YuAA8yXz~76K1c;3^jg77WP185Rf^u}23N0sR5^q(T4yJ1sVN5dZ)H

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-frown.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-frown.gif
new file mode 100644
index 0000000000000000000000000000000000000000..716f55e161bfebb1c3d34f0b0f40c177fc82c30b
GIT binary patch
literal 340
zcmV-a0jvH;Nk%w1VG;lm0MroxK_>;q#>Sw62=mns-On=0wransPVevT^YK{Dy(0YY
zH)vE6x0?;Wqb>gZas1^OT0si>`ugD5y87}*#H$s=yq(wA*8cf7{`y+(+9J7|9QfT7
z`ROHiU=Y&6FaQ7mA^8LW0018VEC2ui01^Na000Hi;3tYvX_jM3N`@u~nju9hSuh^r
zIEcp-wA7(NL0~2d#RP+(G!CPPA>o*KJjv_CkucCA5=K?AfF#RG2V*8BU@jL304|4P
z2;PGRF@bj$et;Jf2pR_mVsIA<85|n}kQ*Bq42Ovqj*yy>6P0=h3X&9Z01y<C4-<w5
z1_YrDr5zn|3>yk~2N4w%7#RW^55W%`0vQ+-6(y_*2pqz~90*;x9}yM}%$UI(7t#$D
mK_3Se1{4HKM+6iG7EmeH6$V631{L5n)#CyC0qx-*Apkoyg?w!Q

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-innocent.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-innocent.gif
new file mode 100644
index 0000000000000000000000000000000000000000..334d49e0e60f2997c9ba24071764f95d9e08a5cc
GIT binary patch
literal 336
zcmV-W0k8f?Nk%w1VG;lm0MrryI4TI-%dP0m5~*<p%dw5l&RW5fRqyTWvyTq>+Y`T~
z7Rth){q{I_X%*S48uRZ|(b3V&wIKTX`u+WJzo<^$#wuY;3W|Cf{O29IkTAcaE&lpe
z+P*^H)-tknA^-pYA^8LW0018VEC2ui01^Na000He;3tYwX_n)75QgVvNQ`6#5gcMm
zEEG~blgXokptKAJgCU?%JT?yo<M~i%4gt?6Fz6~Am9UtD7-RyH0HP3SJKk^yXMmPa
zIvd6X(CBm;d>s!R6cPtcQWh2siHlNI2L}ifQhgX02^InZ2?-ktkqVRyZJY^Trk|lv
zovp437?1~d46O)?2(1i+2NDYk8<+_Kil!K!3njA^!I#dL8x<729}*B65mC=m5gHH@
iDi9P3f*VjB3KS4HDb_qqRul{0DI<mu`1#Z$Apkp|ihYg%

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-kiss.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-kiss.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4efd549ed31c44b1faac17ed34bb67abeb42baf8
GIT binary patch
literal 338
zcmV-Y0j>T=Nk%w1VG;lm0Mrx!QauaC#>Vb6G=_5=^YB^9wrc376Sb5I-qJGf@9vZ#
z5WlKU(!eVB+7tfnDXp0zyB`?BZ5IChalob*`uh6d*t+@dKGHcU+L|83yq*5~IoH?L
zy`?Gp<{bX|SpWb4A^8LW0018VEC2ui01^Na000Hg;3tYyX_jM3R?Bl7&r(q;SsVx<
zNd$5fv{ZsKA$SlL3&KN~a1tZRf*~1Ltk<iAv7k{Z2Z`pvc_hgXjpQ(sE;$1LK%<cl
zILB_HNUzT|aeYk*31NL24jm1Pj2;JshKLOYi<FIzdjt-Z3NH$l9TpRW3rGzS3J|Ig
z3K0!T3keh%6CNEM5fB0b7ZJA}6B#85Qy!Zb7Z(@}4jx>x9~2uL3<QX`4jKdu92-F&
k2^$L&NFE+a6AK$qDbg7WL{1AC-ZjzT0r>&z-yb0WJDRY082|tP

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-laughing.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-laughing.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82c5b182e61d32bd394acae551eff180f1eebd26
GIT binary patch
literal 343
zcmV-d0jT~*Nk%w1VG;lm0Q4UK!lp8=s;1-69HWK?p_PpF=Pd8<?!T%|a$ZRD@LAHn
zAH%B}$j8NMQxe3yo%Yxe`tnEM*t)ly6Z-o4{{3<N_BV)iTG-Xox}Pq}wrbweGI?VY
z)x$ATJq`Z*S^xk5A^8La0018VEC2ui01^Na06+!Q;3tYxX_ljCNL1w(@FNIM?McQs
zUCse43&6o~nWQEM1qH(4xS9}(;$WOO79K(4!YDB=4TWdnFp@G7PJ%*7a3mS?2dVM6
zI-PsI;?Yo72@41ogoT6%7!Wvf7XS(g6$={!3l#|p07WTt5eE_j0}=-jaw7&93ke<&
ztPmc77&)9Q5ETu3w-r$mq=2;*8x1bOE)WSgD-;DBG&Rl-3j&G;1_v6p1PlQe7Xb_e
p!hQx5)nWo01l-^P9#i8g7Y7R(uB#dg2N$wO23!pP`bvcW06U9bekA|^

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-money-mouth.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca2451e102722e12e131ae53ea76989acbf191e2
GIT binary patch
literal 321
zcmV-H0lxl6Nk%w1VG;lm0Mrx!DHsO6wwjoX9Kxs~!mLsE+7oVAHu>~Ygtcnp*fHAL
z**;z>w3iC}`fmL6IkKB1N;3zEa}&zKpsu1;_V)HocR5-{J~BcYvE`YXhBnc@CfU=!
za(E<?eig#P!T<mOA^8LW0018VEC2ui01^Na000HP;3tYyX_jM3Zp6bd53x}yNif>c
zG>66zv=rqr;2j)}gKqE$ekcSD?}0=<bQ<7u!)Q1n00<H+ZZKxh#32EQBphsaG65Va
zkpjTmkyjs@6kSLVZ3P8{5rzj0C4zW{h8>WLB?AWp85)qAL<a*U1aAfwq@|<=aCH)v
z4*(Si6|WTl0-h2j3Q-&j3$U*X6&G0wG!zO07rYn<2p9_&0t3V&#uK|3*v<n4(?SXX
Tyx|K0-72^q=pMvQA0YrcF~)Li

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-sealed.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-sealed.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fe66220c24b4da4526818a5d68f75a06d9985a29
GIT binary patch
literal 323
zcmV-J0lfZ4Nk%w1VG;lm0Q4UKz^WI%xS#gj6sL~~h=_>d+P=4)6X4oXy{bw2>K^d$
z@6ERvva+(4ib~41YUkTEn1&#?rzrOHT>1I=Y*h`+%*@WtPUPg|!@EEI_d5LgZ>^Og
z-qyBKJqy*wF8}}lA^8La0018VEC2ui01^Na06+!6;3tYxX_lj?7+U61R3gAaEg8x<
zT>%mSfCwURnWQF&g=Q0ZxH1ulW`QtH0>O!5%iT_X0VBy_@EkOngU8?ye~=H!t21{=
z9@Uj3a_UbE88~kh5Eq7rh!7QSBn1c?0|Off1&k^`5*QE<4-gm<K{;<6EEx|T9xkX(
z8U`F%268SPbQ!cyH(M+Z5eAXJzYDnv2)q*nU0VcScnUiRg#;DT)C3n02t_Ik4G<9+
V78V#$4Gf}33K!HB7tSdm06S^%c-8;_

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-smile.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-smile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fd27edfaaa29a70a8c4563c0eab9f18c74d374fd
GIT binary patch
literal 344
zcmV-e0jK^)Nk%w1VG;lm0Q4UKd0-C4#>SR<4C>Dj%C>6W(lWoQPVevT^YB^Fy&h6M
z4YZgH{O~qtR1(Ci8T;lQ`uh6d*t-7xar*K{#Jrulo-Wtd*44u?{`oh#n;gQXGXDEo
z_}UUC3IeK%0ssI2A^8La0018VEC2ui01^Na06+!R;3tYuX_ljSEE482&%+G^XK%|f
zLKbCc4u{4-u|QG~LqamSTo?@JM3OKZAr!|Z2IzP@fY`=CIg$vA3qm46TowfLCt29I
z6pDKuvnf~)83+sm9yW#?9s>^(89F=~2?!W44-6Ox2^vNza}fp^9v&G65pp936%Gg+
z6HpTy2o4oGoh+>l3Q)KVQwybl2oo*<4a3D469|nfEii|MH4`}p1_cZp0ssj%2>=2d
q41Na?)CpS;4gvxWVpZcR76uLludD?Q1{SnP2NnVU0rZ&)0RTIit8@_n

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-surprised.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-surprised.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0cc9bb71cca4cdeafbb248ce7e07c3708c1cbd64
GIT binary patch
literal 338
zcmV-Y0j>T=Nk%w1VG;lm0Q4UK`{WwN#>SnDDC*4*{OcpiwransPVevTQacIr@mkQp
zCf(06s)_=>r7UYx48o@u`uh6d*t-7rH~ji<`P&oj;5Wp)o!8ga`SV6TA_BIW5#ZWV
z{`*)c3<AWsL;wH)A^8La0018VEC2ui01^Na06+!L;3tYuX_ljSXp`hR4gtVa&1uI7
zU6#>2kA}f=futY?#YE7kxGD|7L}4&OEDw$hkm+~<00QS>F_H?J#bz?uEHnl42f5(9
z5O)`6Q9V2o5;YVLUK)Y`7!Nr+4GMq?85s%^2?`BGDRU798Vn2?1`%>22R{iO0u>bk
z9tlA?nk*O<3zHJH6&Mp5qALj)E(mxM!Y&vII4dm@1Ov{`f*8pL3xPEVUI>D>1_uxa
kNm?`6VH{N6Di;P13m6<67z+;u7qCYM7XkVK^`jvGJD~P?KL7v#

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-tongue-out.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2075dc16058f1f17912167675ce5cfb9986fc71d
GIT binary patch
literal 328
zcmV-O0k{4~Nk%w1VG;lm0Mrx!CJF+^#>SU@3-{U*rx+Q^wrc$ABfqLn@9*x?z8(4X
zSW-O=@){bmmI~g|GQXoP);c<FSP}d3M*jVA`uh6d*t))=8CnMdwl62dyq*2^H`mwJ
z)x$CM;3E1`Q~&?~A^8LW0018VEC2ui01^Na000HW;3tYyX_jM3R)^Iz)=^O^Su~t7
zO$yf(v=riDQ79xxiP7>vj3|f1M8e@{G*!tYaiCEujj1NGxRN#6#tiCETo+{x{Hkzt
z5k-kPvcD=V2nb<UR~-feh=~dffrA={iID>mjCgL6k{uF&2nP-t0s;w<385Nx2oxDb
z9T5Pp7qJl?3Kkh9oe2sCr5F$p7zPSlsUH*@54w*83=9Or4;w)r2pcU95(FL|1Th;<
aDaRQH4;Tal7#Y$v#?=Au0pHUfApkpvZg^t=

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-undecided.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-undecided.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bef7e257303f8243c89787e7a7f9955dd1f112e2
GIT binary patch
literal 337
zcmV-X0j~Z>Nk%w1VG;lm0MroxDi#99#>R?y8~4}{%C>6#>?OadPVevTr-=vi@LATn
z4rERY-qJF+n+?CCE&B3D{{3<K`ugD5x<W4p!>Shh?>WT0o%`b%*Voqm`dL;(4F35y
zc485^n;g!+Bme*aA^8LW0018VEC2ui01^Na000Hf;3tYvX_jM3N=AnuogqakNi<9X
zK?&0kwA8^tNn{?C$|IAYI1ZzT!2>}iuMddFK#NEkRl!7%6brJAnUs;)XcnA}TNBSP
zxQ9;SvEfwYeSaGd2^|LqU~(QF1qBxr3Ii7x84ZVt8wCTKoSYAqc?p`G2onnpk`IOl
z1`HLGj}riN2p1K12N4z&8IBDc6tEWs859;JtRB6>lf+xO9}yT19toMv8wnl`7(pKg
j7zPv!OGgY81{hE&(iR3pP6ig;HPPS!_yOwPA0Yrc)=Yf3

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-wink.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-wink.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0631c7616ec8624ddeee02b633326f697ee72f80
GIT binary patch
literal 350
zcmV-k0ipg!Nk%w1VG;lm0Q4UK(ZVUl#>Sn03F^-g-qAA3wransPV?|t@9*x%vmQ`7
z4E*pcw3rOOq%3t@4*K#({N^40{c-yG`rz2Q!KfI-yq*61HrBop*VoqW<}&{JS@_x#
zwwfF$4Fdh~IsgCwA^8La0018VEC2ui01^Na06+!X;3tYwX_ljiFp=e23$zWxW@`*G
zN?2ty6iUNT!AMdPLn89<I6VNsBa$#2B^8PW0&#S{9S2uKsT@fK2H_Bi90-iU`I97Q
z0E%zIqENUr1Xc(f2MYrXHi;Vy0}u}!Iy?;k2OcpH3myjm4Mr(+69yat0vrYtb0Y{q
z2O3Qt4;lwTI-o2K1Rfax9u5ky5e%q<2M-n*2^lU94lWM|kSi@QiitH3IS2;18v+g&
wHWv;88y<lO650S7F$tszn0E%~Di{V71hK9J6b2ZzNDyEMKrq0+R3QKWI|*@ij{pDw

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/img/smiley-yell.gif b/core/media/editors/tinymce/plugins/emoticons/img/smiley-yell.gif
new file mode 100644
index 0000000000000000000000000000000000000000..648e6e879123fe49beebbc1f3635141864a79a9c
GIT binary patch
literal 336
zcmV-W0k8f?Nk%w1VG;lm0MrryG8O{K#>IbS7WCB_mWF$+hzY-{PWkp(?(Xf;zbH~P
z3jOdj?W+^YwrakfE8fyG&5jTBz!3WS`fgM_;MltQ+c}4GO8)(E`S3`@yq&d~5!ct&
z)v79NObo)O7XSbNA^8LW0018VEC2ui01^Na000He;3tYwX_jM3QifI(nn6h_*=Wyk
zUB{y}v=qYOIUF#R3dZPhAVv~H;(|<CF_(maCZTAu39B_R)y$%~g`mSpayo)VZ;Q|z
z7ZnA-;Q%Nq3riXZbr%Z>a2yN_5FH&J0|$eJ3kw4gj1Y?v5d#>LMV12^6BYy$1)ZKA
zga!|m2?POz0R)f>4+aPl8KD{gz`+G_9vLMFQU?RU!8uyH9}*i52|cC+7S0YEK_3Vk
i1|APfM-Ltb8&4_H83sg61{vHn(cc000qNZzApkp<uzFPh

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/plugins/emoticons/plugin.min.js b/core/media/editors/tinymce/plugins/emoticons/plugin.min.js
new file mode 100644
index 00000000..c942a9e0
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/emoticons/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("emoticons",function(e,t){function n(){var e;return e='<table role="list" class="mce-grid">',tinymce.each(r,function(n){e+="<tr>",tinymce.each(n,function(n){var r=t+"/img/smiley-"+n+".gif";e+='<td><a href="#" data-mce-url="'+r+'" data-mce-alt="'+n+'" tabindex="-1" role="option" aria-label="'+n+'"><img src="'+r+'" style="width: 18px; height: 18px" role="presentation" /></a></td>'}),e+="</tr>"}),e+="</table>"}var r=[["cool","cry","embarassed","foot-in-mouth"],["frown","innocent","kiss","laughing"],["money-mouth","sealed","smile","surprised"],["tongue-out","undecided","wink","yell"]];e.addButton("emoticons",{type:"panelbutton",panel:{role:"application",autohide:!0,html:n,onclick:function(t){var n=e.dom.getParent(t.target,"a");n&&(e.insertContent('<img src="'+n.getAttribute("data-mce-url")+'" alt="'+n.getAttribute("data-mce-alt")+'" />'),this.hide())}},tooltip:"Emoticons"})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/example/dialog.html b/core/media/editors/tinymce/plugins/example/dialog.html
new file mode 100644
index 00000000..565f06f5
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/example/dialog.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<body>
+	<h3>Custom dialog</h3>
+	Input some text: <input id="content">
+	<button onclick="top.tinymce.activeEditor.windowManager.getWindows()[0].close();">Close window</button>
+</body>
+</html>
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/example/plugin.min.js b/core/media/editors/tinymce/plugins/example/plugin.min.js
new file mode 100644
index 00000000..b47d90f6
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/example/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("example",function(e,t){e.addButton("example",{text:"My button",icon:!1,onclick:function(){e.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(t){e.insertContent("Title: "+t.data.title)}})}}),e.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){e.windowManager.open({title:"TinyMCE site",url:t+"/dialog.html",width:600,height:400,buttons:[{text:"Insert",onclick:function(){var t=e.windowManager.getWindows()[0];e.insertContent(t.getContentWindow().document.getElementById("content").value),t.close()}},{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/example_dependency/plugin.min.js b/core/media/editors/tinymce/plugins/example_dependency/plugin.min.js
new file mode 100644
index 00000000..e61bf473
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/example_dependency/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("example_dependency",function(){},["example"]);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/fullpage/plugin.min.js b/core/media/editors/tinymce/plugins/fullpage/plugin.min.js
new file mode 100644
index 00000000..1e2c8456
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/fullpage/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("fullpage",function(e){function t(){var t=n();e.windowManager.open({title:"Document properties",data:t,defaults:{type:"textbox",size:40},body:[{name:"title",label:"Title"},{name:"keywords",label:"Keywords"},{name:"description",label:"Description"},{name:"robots",label:"Robots"},{name:"author",label:"Author"},{name:"docencoding",label:"Encoding"}],onSubmit:function(e){r(tinymce.extend(t,e.data))}})}function n(){function t(e,t){var n=e.attr(t);return n||""}var n,r,o=i(),a={};return a.fontface=e.getParam("fullpage_default_fontface",""),a.fontsize=e.getParam("fullpage_default_fontsize",""),n=o.firstChild,7==n.type&&(a.xml_pi=!0,r=/encoding="([^"]+)"/.exec(n.value),r&&(a.docencoding=r[1])),n=o.getAll("#doctype")[0],n&&(a.doctype="<!DOCTYPE"+n.value+">"),n=o.getAll("title")[0],n&&n.firstChild&&(a.title=n.firstChild.value),u(o.getAll("meta"),function(e){var t,n=e.attr("name"),r=e.attr("http-equiv");n?a[n.toLowerCase()]=e.attr("content"):"Content-Type"==r&&(t=/charset\s*=\s*(.*)\s*/gi.exec(e.attr("content")),t&&(a.docencoding=t[1]))}),n=o.getAll("html")[0],n&&(a.langcode=t(n,"lang")||t(n,"xml:lang")),a.stylesheets=[],tinymce.each(o.getAll("link"),function(e){"stylesheet"==e.attr("rel")&&a.stylesheets.push(e.attr("href"))}),n=o.getAll("body")[0],n&&(a.langdir=t(n,"dir"),a.style=t(n,"style"),a.visited_color=t(n,"vlink"),a.link_color=t(n,"link"),a.active_color=t(n,"alink")),a}function r(t){function n(e,t,n){e.attr(t,n?n:void 0)}function r(e){a.firstChild?a.insert(e,a.firstChild):a.append(e)}var o,a,s,c,f,p=e.dom;o=i(),a=o.getAll("head")[0],a||(c=o.getAll("html")[0],a=new d("head",1),c.firstChild?c.insert(a,c.firstChild,!0):c.append(a)),c=o.firstChild,t.xml_pi?(f='version="1.0"',t.docencoding&&(f+=' encoding="'+t.docencoding+'"'),7!=c.type&&(c=new d("xml",7),o.insert(c,o.firstChild,!0)),c.value=f):c&&7==c.type&&c.remove(),c=o.getAll("#doctype")[0],t.doctype?(c||(c=new d("#doctype",10),t.xml_pi?o.insert(c,o.firstChild):r(c)),c.value=t.doctype.substring(9,t.doctype.length-1)):c&&c.remove(),c=null,u(o.getAll("meta"),function(e){"Content-Type"==e.attr("http-equiv")&&(c=e)}),t.docencoding?(c||(c=new d("meta",1),c.attr("http-equiv","Content-Type"),c.shortEnded=!0,r(c)),c.attr("content","text/html; charset="+t.docencoding)):c&&c.remove(),c=o.getAll("title")[0],t.title?(c?c.empty():(c=new d("title",1),r(c)),c.append(new d("#text",3)).value=t.title):c&&c.remove(),u("keywords,description,author,copyright,robots".split(","),function(e){var n,i,a=o.getAll("meta"),s=t[e];for(n=0;n<a.length;n++)if(i=a[n],i.attr("name")==e)return void(s?i.attr("content",s):i.remove());s&&(c=new d("meta",1),c.attr("name",e),c.attr("content",s),c.shortEnded=!0,r(c))});var m={};tinymce.each(o.getAll("link"),function(e){"stylesheet"==e.attr("rel")&&(m[e.attr("href")]=e)}),tinymce.each(t.stylesheets,function(e){m[e]||(c=new d("link",1),c.attr({rel:"stylesheet",text:"text/css",href:e}),c.shortEnded=!0,r(c)),delete m[e]}),tinymce.each(m,function(e){e.remove()}),c=o.getAll("body")[0],c&&(n(c,"dir",t.langdir),n(c,"style",t.style),n(c,"vlink",t.visited_color),n(c,"link",t.link_color),n(c,"alink",t.active_color),p.setAttribs(e.getBody(),{style:t.style,dir:t.dir,vLink:t.visited_color,link:t.link_color,aLink:t.active_color})),c=o.getAll("html")[0],c&&(n(c,"lang",t.langcode),n(c,"xml:lang",t.langcode)),a.firstChild||a.remove(),s=new tinymce.html.Serializer({validate:!1,indent:!0,apply_source_formatting:!0,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(o),l=s.substring(0,s.indexOf("</body>"))}function i(){return new tinymce.html.DomParser({validate:!1,root_name:"#document"}).parse(l)}function o(t){function n(e){return e.replace(/<\/?[A-Z]+/g,function(e){return e.toLowerCase()})}var r,o,s,d,f=t.content,p="",m=e.dom;if(!t.selection&&!("raw"==t.format&&l||t.source_view&&e.getParam("fullpage_hide_in_source_view"))){0!==f.length||t.source_view||(f=tinymce.trim(l)+"\n"+tinymce.trim(f)+"\n"+tinymce.trim(c)),f=f.replace(/<(\/?)BODY/gi,"<$1body"),r=f.indexOf("<body"),r!=-1?(r=f.indexOf(">",r),l=n(f.substring(0,r+1)),o=f.indexOf("</body",r),o==-1&&(o=f.length),t.content=f.substring(r+1,o),c=n(f.substring(o))):(l=a(),c="\n</body>\n</html>"),s=i(),u(s.getAll("style"),function(e){e.firstChild&&(p+=e.firstChild.value)}),d=s.getAll("body")[0],d&&m.setAttribs(e.getBody(),{style:d.attr("style")||"",dir:d.attr("dir")||"",vLink:d.attr("vlink")||"",link:d.attr("link")||"",aLink:d.attr("alink")||""}),m.remove("fullpage_styles");var g=e.getDoc().getElementsByTagName("head")[0];p&&(m.add(g,"style",{id:"fullpage_styles"},p),d=m.get("fullpage_styles"),d.styleSheet&&(d.styleSheet.cssText=p));var h={};tinymce.each(g.getElementsByTagName("link"),function(e){"stylesheet"==e.rel&&e.getAttribute("data-mce-fullpage")&&(h[e.href]=e)}),tinymce.each(s.getAll("link"),function(e){var t=e.attr("href");return!t||(h[t]||"stylesheet"!=e.attr("rel")||m.add(g,"link",{rel:"stylesheet",text:"text/css",href:t,"data-mce-fullpage":"1"}),void delete h[t])}),tinymce.each(h,function(e){e.parentNode.removeChild(e)})}}function a(){var t,n="",r="";return e.getParam("fullpage_default_xml_pi")&&(n+='<?xml version="1.0" encoding="'+e.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'),n+=e.getParam("fullpage_default_doctype","<!DOCTYPE html>"),n+="\n<html>\n<head>\n",(t=e.getParam("fullpage_default_title"))&&(n+="<title>"+t+"</title>\n"),(t=e.getParam("fullpage_default_encoding"))&&(n+='<meta http-equiv="Content-Type" content="text/html; charset='+t+'" />\n'),(t=e.getParam("fullpage_default_font_family"))&&(r+="font-family: "+t+";"),(t=e.getParam("fullpage_default_font_size"))&&(r+="font-size: "+t+";"),(t=e.getParam("fullpage_default_text_color"))&&(r+="color: "+t+";"),n+="</head>\n<body"+(r?' style="'+r+'"':"")+">\n"}function s(t){t.selection||t.source_view&&e.getParam("fullpage_hide_in_source_view")||(t.content=tinymce.trim(l)+"\n"+tinymce.trim(t.content)+"\n"+tinymce.trim(c))}var l,c,u=tinymce.each,d=tinymce.html.Node;e.addCommand("mceFullPageProperties",t),e.addButton("fullpage",{title:"Document properties",cmd:"mceFullPageProperties"}),e.addMenuItem("fullpage",{text:"Document properties",cmd:"mceFullPageProperties",context:"file"}),e.on("BeforeSetContent",o),e.on("GetContent",s)});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/fullscreen/plugin.min.js b/core/media/editors/tinymce/plugins/fullscreen/plugin.min.js
new file mode 100644
index 00000000..c29a2a7a
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/fullscreen/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("fullscreen",function(e){function t(){var e,t,n=window,r=document,i=r.body;return i.offsetWidth&&(e=i.offsetWidth,t=i.offsetHeight),n.innerWidth&&n.innerHeight&&(e=n.innerWidth,t=n.innerHeight),{w:e,h:t}}function n(){var e=tinymce.DOM.getViewPort();return{x:e.x,y:e.y}}function r(e){scrollTo(e.x,e.y)}function i(){function i(){f.setStyle(g,"height",t().h-(m.clientHeight-g.clientHeight))}var p,m,g,h,v=document.body,b=document.documentElement;d=!d,m=e.getContainer(),p=m.style,g=e.getContentAreaContainer().firstChild,h=g.style,d?(u=n(),o=h.width,a=h.height,h.width=h.height="100%",l=p.width,c=p.height,p.width=p.height="",f.addClass(v,"mce-fullscreen"),f.addClass(b,"mce-fullscreen"),f.addClass(m,"mce-fullscreen"),f.bind(window,"resize",i),i(),s=i):(h.width=o,h.height=a,l&&(p.width=l),c&&(p.height=c),f.removeClass(v,"mce-fullscreen"),f.removeClass(b,"mce-fullscreen"),f.removeClass(m,"mce-fullscreen"),f.unbind(window,"resize",s),r(u)),e.fire("FullscreenStateChanged",{state:d})}var o,a,s,l,c,u,d=!1,f=tinymce.DOM;if(!e.settings.inline)return e.on("init",function(){e.addShortcut("Ctrl+Shift+F","",i)}),e.on("remove",function(){s&&f.unbind(window,"resize",s)}),e.addCommand("mceFullScreen",i),e.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Ctrl+Shift+F",selectable:!0,onClick:function(){i(),e.focus()},onPostRender:function(){var t=this;e.on("FullscreenStateChanged",function(e){t.active(e.state)})},context:"view"}),e.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Ctrl+Shift+F",onClick:i,onPostRender:function(){var t=this;e.on("FullscreenStateChanged",function(e){t.active(e.state)})}}),{isFullscreen:function(){return d}}});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/hr/plugin.min.js b/core/media/editors/tinymce/plugins/hr/plugin.min.js
new file mode 100644
index 00000000..ca36c927
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/hr/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("hr",function(e){e.addCommand("InsertHorizontalRule",function(){e.execCommand("mceInsertContent",!1,"<hr />")}),e.addButton("hr",{icon:"hr",tooltip:"Horizontal line",cmd:"InsertHorizontalRule"}),e.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/image/plugin.min.js b/core/media/editors/tinymce/plugins/image/plugin.min.js
new file mode 100644
index 00000000..146aab8a
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/image/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("image",function(e){function t(e,t){function n(e,n){r.parentNode&&r.parentNode.removeChild(r),t({width:e,height:n})}var r=document.createElement("img");r.onload=function(){n(Math.max(r.width,r.clientWidth),Math.max(r.height,r.clientHeight))},r.onerror=function(){n()};var i=r.style;i.visibility="hidden",i.position="fixed",i.bottom=i.left=0,i.width=i.height="auto",document.body.appendChild(r),r.src=e}function n(e,t,n){function r(e,n){return n=n||[],tinymce.each(e,function(e){var i={text:e.text||e.title};e.menu?i.menu=r(e.menu):(i.value=e.value,t(i)),n.push(i)}),n}return r(e,n||[])}function r(t){return function(){var n=e.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):"function"==typeof n?n(t):t(n)}}function i(r){function i(){var e,t,n,r;e=f.find("#width")[0],t=f.find("#height")[0],e&&t&&(n=e.value(),r=t.value(),f.find("#constrain")[0].checked()&&g&&h&&n&&r&&(g!=n?(r=Math.round(n/g*r),isNaN(r)||t.value(r)):(n=Math.round(r/h*n),isNaN(n)||e.value(n))),g=n,h=r)}function o(){function t(t){function n(){t.onload=t.onerror=null,e.selection&&(e.selection.select(t),e.nodeChanged())}t.onload=function(){y.width||y.height||!C||x.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),n()},t.onerror=n}var n,r;u(),i(),y=tinymce.extend(y,f.toJSON()),y.alt||(y.alt=""),y.title||(y.title=""),""===y.width&&(y.width=null),""===y.height&&(y.height=null),y.style||(y.style=null),y={src:y.src,alt:y.alt,title:y.title,width:y.width,height:y.height,style:y.style,caption:y.caption,"class":y["class"]},e.undoManager.transact(function(){function i(t){return e.schema.getTextBlockElements()[t.nodeName]}if(!y.src)return void(p&&(x.remove(p),e.focus(),e.nodeChanged()));if(""===y.title&&(y.title=null),p?x.setAttribs(p,y):(y.id="__mcenew",e.focus(),e.selection.setContent(x.createHTML("img",y)),p=x.get("__mcenew"),x.setAttrib(p,"id",null)),e.editorUpload.uploadImagesAuto(),y.caption===!1&&x.is(p.parentNode,"figure.image")&&(n=p.parentNode,x.insertAfter(p,n),x.remove(n)),y.caption!==!0)t(p);else if(!x.is(p.parentNode,"figure.image")){r=p,p=p.cloneNode(!0),n=x.create("figure",{"class":"image"}),n.appendChild(p),n.appendChild(x.create("figcaption",{contentEditable:!0},"Caption")),n.contentEditable=!1;var o=x.getParent(r,i);o?x.split(o,r,n):x.replace(n,r),e.selection.select(n)}})}function a(e){return e&&(e=e.replace(/px$/,"")),e}function s(n){var r,i,o,a=n.meta||{};v&&v.value(e.convertURL(this.value(),"src")),tinymce.each(a,function(e,t){f.find("#"+t).value(e)}),a.width||a.height||(r=e.convertURL(this.value(),"src"),i=e.settings.image_prepend_url,o=new RegExp("^(?:[a-z]+:)?//","i"),i&&!o.test(r)&&r.substring(0,i.length)!==i&&(r=i+r),this.value(r),t(e.documentBaseURI.toAbsolute(this.value()),function(e){e.width&&e.height&&C&&(g=e.width,h=e.height,f.find("#width").value(g),f.find("#height").value(h))}))}function l(e){e.meta=f.toJSON()}function c(e){if(e.margin){var t=e.margin.split(" ");switch(t.length){case 1:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[0],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[0];break;case 2:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[1];break;case 3:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[1];break;case 4:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[3]}delete e.margin}return e}function u(){function t(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}if(e.settings.image_advtab){var n=f.toJSON(),r=x.parseStyle(n.style);r=c(r),n.vspace&&(r["margin-top"]=r["margin-bottom"]=t(n.vspace)),n.hspace&&(r["margin-left"]=r["margin-right"]=t(n.hspace)),n.border&&(r["border-width"]=t(n.border)),f.find("#style").value(x.serializeStyle(x.parseStyle(x.serializeStyle(r))))}}function d(){if(e.settings.image_advtab){var t=f.toJSON(),n=x.parseStyle(t.style);f.find("#vspace").value(""),f.find("#hspace").value(""),n=c(n),(n["margin-top"]&&n["margin-bottom"]||n["margin-right"]&&n["margin-left"])&&(n["margin-top"]===n["margin-bottom"]?f.find("#vspace").value(a(n["margin-top"])):f.find("#vspace").value(""),n["margin-right"]===n["margin-left"]?f.find("#hspace").value(a(n["margin-right"])):f.find("#hspace").value("")),n["border-width"]&&f.find("#border").value(a(n["border-width"])),f.find("#style").value(x.serializeStyle(x.parseStyle(x.serializeStyle(n))))}}var f,p,m,g,h,v,b,y={},x=e.dom,C=e.settings.image_dimensions!==!1;p=e.selection.getNode(),m=x.getParent(p,"figure.image"),m&&(p=x.select("img",m)[0]),p&&("IMG"!=p.nodeName||p.getAttribute("data-mce-object")||p.getAttribute("data-mce-placeholder"))&&(p=null),p&&(g=x.getAttrib(p,"width"),h=x.getAttrib(p,"height"),y={src:x.getAttrib(p,"src"),alt:x.getAttrib(p,"alt"),title:x.getAttrib(p,"title"),"class":x.getAttrib(p,"class"),width:g,height:h,caption:!!m}),r&&(v={type:"listbox",label:"Image list",values:n(r,function(t){t.value=e.convertURL(t.value||t.url,"src")},[{text:"None",value:""}]),value:y.src&&e.convertURL(y.src,"src"),onselect:function(e){var t=f.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),f.find("#src").value(e.control.value()).fire("change")},onPostRender:function(){v=this}}),e.settings.image_class_list&&(b={name:"class",type:"listbox",label:"Class",values:n(e.settings.image_class_list,function(t){t.value&&(t.textStyle=function(){return e.formatter.getCssText({inline:"img",classes:[t.value]})})})});var w=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:s,onbeforecall:l},v];e.settings.image_description!==!1&&w.push({name:"alt",type:"textbox",label:"Image description"}),e.settings.image_title&&w.push({name:"title",type:"textbox",label:"Image Title"}),C&&w.push({type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:i,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:i,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),w.push(b),e.settings.image_caption&&tinymce.Env.ceFalse&&w.push({name:"caption",type:"checkbox",label:"Caption"}),e.settings.image_advtab?(p&&(p.style.marginLeft&&p.style.marginRight&&p.style.marginLeft===p.style.marginRight&&(y.hspace=a(p.style.marginLeft)),p.style.marginTop&&p.style.marginBottom&&p.style.marginTop===p.style.marginBottom&&(y.vspace=a(p.style.marginTop)),p.style.borderWidth&&(y.border=a(p.style.borderWidth)),y.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(p,"style")))),f=e.windowManager.open({title:"Insert/edit image",data:y,bodyType:"tabpanel",body:[{title:"General",type:"form",items:w},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox",onchange:d},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:u},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):f=e.windowManager.open({title:"Insert/edit image",data:y,body:w,onSubmit:o})}e.on("preInit",function(){function t(e){var t=e.attr("class");return t&&/\bimage\b/.test(t)}function n(e){return function(n){function r(t){t.attr("contenteditable",e?"true":null)}for(var i,o=n.length;o--;)i=n[o],t(i)&&(i.attr("contenteditable",e?"false":null),tinymce.each(i.getAll("figcaption"),r))}}e.parser.addNodeFilter("figure",n(!0)),e.serializer.addNodeFilter("figure",n(!1))}),e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:r(i),stateSelector:"img:not([data-mce-object],[data-mce-placeholder]),figure.image"}),e.addMenuItem("image",{icon:"image",text:"Image",onclick:r(i),context:"insert",prependToContext:!0}),e.addCommand("mceImage",r(i))});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/imagetools/plugin.min.js b/core/media/editors/tinymce/plugins/imagetools/plugin.min.js
new file mode 100644
index 00000000..79137dac
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/imagetools/plugin.min.js
@@ -0,0 +1 @@
+!function(){var e={},t=function(t){for(var n=e[t],i=n.deps,o=n.defn,a=i.length,s=new Array(a),l=0;l<a;++l)s[l]=r(i[l]);var c=o.apply(null,s);if(void 0===c)throw"module ["+t+"] returned undefined";n.instance=c},n=function(t,n,r){if("string"!=typeof t)throw"module id must be a string";if(void 0===n)throw"no dependencies for "+t;if(void 0===r)throw"no definition function for "+t;e[t]={deps:n,defn:r,instance:void 0}},r=function(n){var r=e[n];if(void 0===r)throw"module ["+n+"] was undefined";return void 0===r.instance&&t(n),r.instance},i=function(e,t){for(var n=e.length,i=new Array(n),o=0;o<n;++o)i[o]=r(e[o]);t.apply(null,i)},o={};o.bolt={module:{api:{define:n,require:i,demand:r}}};var a=n,s=function(e,t){a(e,[],function(){return t})};s("1",tinymce.PluginManager),s("2",tinymce.Env),s("3",tinymce.util.Promise),s("4",tinymce.util.URI),s("5",tinymce.util.Tools),s("6",tinymce.util.Delay),a("m",[],function(){function e(e,t){return r(document.createElement("canvas"),e,t)}function t(e){return e.getContext("2d")}function n(e){var t=null;try{t=e.getContext("webgl")||e.getContext("experimental-webgl")}catch(e){}return t||(t=null),t}function r(e,t,n){return e.width=t,e.height=n,e}return{create:e,resize:r,get2dContext:t,get3dContext:n}}),a("n",[],function(){function e(e){return e.naturalWidth||e.width}function t(e){return e.naturalHeight||e.height}return{getWidth:e,getHeight:t}}),a("o",[],function(){function e(e,t){return function(){e.apply(t,arguments)}}function t(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],s(t,e(r,this),e(i,this))}function n(e){var t=this;return null===this._state?void this._deferreds.push(e):void l(function(){var n=t._state?e.onFulfilled:e.onRejected;if(null===n)return void(t._state?e.resolve:e.reject)(t._value);var r;try{r=n(t._value)}catch(t){return void e.reject(t)}e.resolve(r)})}function r(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void s(e(n,t),e(r,this),e(i,this))}this._state=!0,this._value=t,o.call(this)}catch(e){i.call(this,e)}}function i(e){this._state=!1,this._value=e,o.call(this)}function o(){for(var e=0,t=this._deferreds.length;e<t;e++)n.call(this,this._deferreds[e]);this._deferreds=null}function a(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}function s(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(e){if(r)return;r=!0,n(e)}}if(window.Promise)return window.Promise;var l=t.immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){setTimeout(e,1)},c=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return t.prototype["catch"]=function(e){return this.then(null,e)},t.prototype.then=function(e,r){var i=this;return new t(function(t,o){n.call(i,new a(e,r,t,o))})},t.all=function(){var e=Array.prototype.slice.call(1===arguments.length&&c(arguments[0])?arguments[0]:arguments);return new t(function(t,n){function r(o,a){try{if(a&&("object"==typeof a||"function"==typeof a)){var s=a.then;if("function"==typeof s)return void s.call(a,function(e){r(o,e)},n)}e[o]=a,0===--i&&t(e)}catch(e){n(e)}}if(0===e.length)return t([]);for(var i=e.length,o=0;o<e.length;o++)r(o,e[o])})},t.resolve=function(e){return e&&"object"==typeof e&&e.constructor===t?e:new t(function(t){t(e)})},t.reject=function(e){return new t(function(t,n){n(e)})},t.race=function(e){return new t(function(t,n){for(var r=0,i=e.length;r<i;r++)e[r].then(t,n)})},t}),a("p",[],function(){function e(e){var t=document.createElement("a");return t.href=e,t.pathname}function t(t){var n=e(t).split("."),r=n[n.length-1],i={jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png"};return r&&(r=r.toLowerCase()),i[r]}return{guessMimeType:t}}),a("e",["o","m","p","n"],function(e,t,n,r){function i(t){return new e(function(e){function n(){t.removeEventListener("load",n),e(t)}t.complete?e(t):t.addEventListener("load",n)})}function o(e){return i(e).then(function(e){var n,i;return i=t.create(r.getWidth(e),r.getHeight(e)),n=t.get2dContext(i),n.drawImage(e,0,0),i})}function a(e){return i(e).then(function(e){var t=e.src;return 0===t.indexOf("blob:")?l(t):0===t.indexOf("data:")?c(t):o(e).then(function(e){return c(e.toDataURL(n.guessMimeType(t)))})})}function s(t){return new e(function(e){function n(){r.removeEventListener("load",n),e(r)}var r=new Image;r.addEventListener("load",n),r.src=URL.createObjectURL(t),r.complete&&n()})}function l(t){return new e(function(e){var n=new XMLHttpRequest;n.open("GET",t,!0),n.responseType="blob",n.onload=function(){200==this.status&&e(this.response)},n.send()})}function c(t){return new e(function(e){var n,r,i,o,a,s;if(t=t.split(","),o=/data:([^;]+)/.exec(t[0]),o&&(a=o[1]),n=atob(t[1]),window.WebKitBlobBuilder){for(s=new WebKitBlobBuilder,r=new ArrayBuffer(n.length),i=0;i<r.length;i++)r[i]=n.charCodeAt(i);return s.append(r),void e(s.getBlob(a))}for(r=new Uint8Array(n.length),i=0;i<r.length;i++)r[i]=n.charCodeAt(i);e(new Blob([r],{type:a}))})}function u(e){return 0===e.indexOf("blob:")?l(e):0===e.indexOf("data:")?c(e):null}function d(e,t){return c(e.toDataURL(t))}function f(t){return new e(function(e){var n=new FileReader;n.onloadend=function(){e(n.result)},n.readAsDataURL(t)})}function p(e){return f(e).then(function(e){return e.split(",")[1]})}function m(e){URL.revokeObjectURL(e.src)}return{blobToImage:s,imageToBlob:a,blobToDataUri:f,blobToBase64:p,imageToCanvas:o,canvasToBlob:d,revokeImageUrl:m,uriToBlob:u}}),a("q",[],function(){function e(e,t,n){return e=parseFloat(e),e>n?e=n:e<t&&(e=t),e}function t(){return[1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1]}function n(e,t){var n,r,i,o,a=[],s=new Array(10);for(n=0;n<5;n++){for(r=0;r<5;r++)a[r]=t[r+5*n];for(r=0;r<5;r++){for(o=0,i=0;i<5;i++)o+=e[r+5*i]*a[i];s[r+5*n]=o}}return s}function r(t,n){return n=e(n,0,1),t.map(function(t,r){return r%6===0?t=1-(1-t)*n:t*=n,e(t,0,1)})}function i(t,r){var i;return r=e(r,-1,1),r*=100,r<0?i=127+r/100*127:(i=r%1,i=0===i?d[r]:d[Math.floor(r)]*(1-i)+d[Math.floor(r)+1]*i,i=127*i+127),n(t,[i/127,0,0,0,.5*(127-i),0,i/127,0,0,.5*(127-i),0,0,i/127,0,.5*(127-i),0,0,0,1,0,0,0,0,0,1])}function o(t,r){var i,o,a,s;return r=e(r,-1,1),i=1+(r>0?3*r:r),o=.3086,a=.6094,s=.082,n(t,[o*(1-i)+i,a*(1-i),s*(1-i),0,0,o*(1-i),a*(1-i)+i,s*(1-i),0,0,o*(1-i),a*(1-i),s*(1-i)+i,0,0,0,0,0,1,0,0,0,0,0,1])}function a(t,r){var i,o,a,s,l;return r=e(r,-180,180)/180*Math.PI,i=Math.cos(r),o=Math.sin(r),a=.213,s=.715,l=.072,n(t,[a+i*(1-a)+o*-a,s+i*-s+o*-s,l+i*-l+o*(1-l),0,0,a+i*-a+.143*o,s+i*(1-s)+.14*o,l+i*-l+o*-.283,0,0,a+i*-a+o*-(1-a),s+i*-s+o*s,l+i*(1-l)+o*l,0,0,0,0,0,1,0,0,0,0,0,1])}function s(t,r){return r=e(255*r,-255,255),n(t,[1,0,0,0,r,0,1,0,0,r,0,0,1,0,r,0,0,0,1,0,0,0,0,0,1])}function l(t,r,i,o){return r=e(r,0,2),i=e(i,0,2),o=e(o,0,2),n(t,[r,0,0,0,0,0,i,0,0,0,0,0,o,0,0,0,0,0,1,0,0,0,0,0,1])}function c(t,i){return i=e(i,0,1),n(t,r([.393,.769,.189,0,0,.349,.686,.168,0,0,.272,.534,.131,0,0,0,0,0,1,0,0,0,0,0,1],i))}function u(t,i){return i=e(i,0,1),n(t,r([.33,.34,.33,0,0,.33,.34,.33,0,0,.33,.34,.33,0,0,0,0,0,1,0,0,0,0,0,1],i))}var d=[0,.01,.02,.04,.05,.06,.07,.08,.1,.11,.12,.14,.15,.16,.17,.18,.2,.21,.22,.24,.25,.27,.28,.3,.32,.34,.36,.38,.4,.42,.44,.46,.48,.5,.53,.56,.59,.62,.65,.68,.71,.74,.77,.8,.83,.86,.89,.92,.95,.98,1,1.06,1.12,1.18,1.24,1.3,1.36,1.42,1.48,1.54,1.6,1.66,1.72,1.78,1.84,1.9,1.96,2,2.12,2.25,2.37,2.5,2.62,2.75,2.87,3,3.2,3.4,3.6,3.8,4,4.3,4.7,4.9,5,5.5,6,6.5,6.8,7,7.3,7.5,7.8,8,8.4,8.7,9,9.4,9.6,9.8,10];return{identity:t,adjust:r,multiply:n,adjustContrast:i,adjustBrightness:s,adjustSaturation:o,adjustHue:a,adjustColors:l,adjustSepia:c,adjustGrayscale:u}}),a("c",["m","n","e","q"],function(e,t,n,r){function i(r,i){return n.blobToImage(r).then(function(r){function o(e,t){var n,r,i,o,a,s=e.data,l=t[0],c=t[1],u=t[2],d=t[3],f=t[4],p=t[5],m=t[6],g=t[7],h=t[8],v=t[9],b=t[10],y=t[11],x=t[12],C=t[13],w=t[14],N=t[15],k=t[16],S=t[17],_=t[18],E=t[19];for(a=0;a<s.length;a+=4)n=s[a],r=s[a+1],i=s[a+2],o=s[a+3],s[a]=n*l+r*c+i*u+o*d+f,s[a+1]=n*p+r*m+i*g+o*h+v,s[a+2]=n*b+r*y+i*x+o*C+w,s[a+3]=n*N+r*k+i*S+o*_+E;return e}var a,s=e.create(t.getWidth(r),t.getHeight(r)),l=e.get2dContext(s);return l.drawImage(r,0,0),u(r),a=o(l.getImageData(0,0,s.width,s.height),i),l.putImageData(a,0,0),n.canvasToBlob(s)})}function o(r,i){return n.blobToImage(r).then(function(r){function o(e,t,n){function r(e,t,n){return e>n?e=n:e<t&&(e=t),e}var i,o,a,s,l,c,u,d,f,p,m,g,h,v,b,y,x;for(a=Math.round(Math.sqrt(n.length)),s=Math.floor(a/2),i=e.data,o=t.data,y=e.width,x=e.height,c=0;c<x;c++)for(l=0;l<y;l++){for(u=d=f=0,m=0;m<a;m++)for(p=0;p<a;p++)g=r(l+p-s,0,y-1),h=r(c+m-s,0,x-1),v=4*(h*y+g),b=n[m*a+p],u+=i[v]*b,d+=i[v+1]*b,f+=i[v+2]*b;v=4*(c*y+l),o[v]=r(u,0,255),o[v+1]=r(d,0,255),o[v+2]=r(f,0,255)}return t}var a,s,l=e.create(t.getWidth(r),t.getHeight(r)),c=e.get2dContext(l);return c.drawImage(r,0,0),u(r),a=c.getImageData(0,0,l.width,l.height),s=c.getImageData(0,0,l.width,l.height),s=o(a,s,i),c.putImageData(s,0,0),n.canvasToBlob(l)})}function a(r){return function(i,o){return n.blobToImage(i).then(function(i){function a(e,t){var n,r=e.data;for(n=0;n<r.length;n+=4)r[n]=t[r[n]],r[n+1]=t[r[n+1]],r[n+2]=t[r[n+2]];return e}var s,l,c=e.create(t.getWidth(i),t.getHeight(i)),d=e.get2dContext(c),f=new Array(256);for(l=0;l<f.length;l++)f[l]=r(l,o);return d.drawImage(i,0,0),u(i),s=a(d.getImageData(0,0,c.width,c.height),f),d.putImageData(s,0,0),n.canvasToBlob(c)})}}function s(e){return function(t,n){return i(t,e(r.identity(),n))}}function l(e){return function(t){return i(t,e)}}function c(e){return function(t){return o(t,e)}}var u=n.revokeImageUrl;return{invert:l([-1,0,0,0,255,0,-1,0,0,255,0,0,-1,0,255,0,0,0,1,0]),brightness:s(r.adjustBrightness),hue:s(r.adjustHue),saturate:s(r.adjustSaturation),contrast:s(r.adjustContrast),grayscale:s(r.adjustGrayscale),sepia:s(r.adjustSepia),colorize:function(e,t,n,o){return i(e,r.adjustColors(r.identity(),t,n,o))},sharpen:c([0,-1,0,-1,5,-1,0,-1,0]),emboss:c([-2,-1,0,-1,1,1,0,1,2]),gamma:a(function(e,t){return 255*Math.pow(e/255,1-t)}),exposure:a(function(e,t){return 255*(1-Math.exp(-(e/255)*t))}),colorFilter:i,convoluteFilter:o}}),a("r",["o","e","m","n"],function(e,t,n,r){function i(e,t,n){var a=r.getWidth(e),s=r.getHeight(e),l=t/a,c=n/s,u=!1;(l<.5||l>2)&&(l=l<.5?.5:2,u=!0),(c<.5||c>2)&&(c=c<.5?.5:2,u=!0);var d=o(e,l,c);return u?d.then(function(e){return i(e,t,n)}):d}function o(t,i,o){return new e(function(e){var a=r.getWidth(t),s=r.getHeight(t),l=Math.floor(a*i),c=Math.floor(s*o),u=n.create(l,c),d=n.get2dContext(u);d.drawImage(t,0,0,a,s,0,0,l,c),e(u)})}return{scale:i}}),a("d",["e","m","n","r"],function(e,t,n,r){function i(r,i){return e.blobToImage(r).then(function(o){var a=t.create(n.getWidth(o),n.getHeight(o)),s=t.get2dContext(a),c=0,u=0;return i=i<0?360+i:i,90!=i&&270!=i||t.resize(a,a.height,a.width),90!=i&&180!=i||(c=a.width),270!=i&&180!=i||(u=a.height),s.translate(c,u),s.rotate(i*Math.PI/180),s.drawImage(o,0,0),l(o),e.canvasToBlob(a,r.type)})}function o(r,i){return e.blobToImage(r).then(function(r){var o=t.create(n.getWidth(r),n.getHeight(r)),a=t.get2dContext(o);return"v"==i?(a.scale(1,-1),a.drawImage(r,0,-o.height)):(a.scale(-1,1),a.drawImage(r,-o.width,0)),l(r),e.canvasToBlob(o)})}function a(n,r,i,o,a){return e.blobToImage(n).then(function(n){var s=t.create(o,a),c=t.get2dContext(s);return c.drawImage(n,-r,-i),l(n),e.canvasToBlob(s)})}function s(t,n,i){return e.blobToImage(t).then(function(o){var a;return a=r.scale(o,n,i).then(function(n){return e.canvasToBlob(n,t.type)}).then(c(o))["catch"](c(o))})}var l=e.revokeImageUrl,c=function(e){return function(t){return l(e),t}};return{rotate:i,flip:o,crop:a,resize:s}}),a("7",["c","d"],function(e,t){var n=function(t){return e.invert(t)},r=function(t){return e.sharpen(t)},i=function(t){return e.emboss(t)},o=function(t,n){return e.gamma(t,n)},a=function(t,n){return e.exposure(t,n)},s=function(t,n,r,i){return e.colorize(t,n,r,i)},l=function(t,n){return e.brightness(t,n)},c=function(t,n){return e.hue(t,n)},u=function(t,n){return e.saturate(t,n)},d=function(t,n){return e.contrast(t,n)},f=function(t,n){return e.grayscale(t,n)},p=function(t,n){return e.sepia(t,n)},m=function(e,n){return t.flip(e,n)},g=function(e,n,r,i,o){return t.crop(e,n,r,i,o)},h=function(e,n,r){return t.resize(e,n,r)},v=function(e,n){return t.rotate(e,n)};return{invert:n,sharpen:r,emboss:i,brightness:l,hue:c,saturate:u,contrast:d,grayscale:f,sepia:p,colorize:s,gamma:o,exposure:a,flip:m,crop:g,resize:h,rotate:v}}),a("8",["e"],function(e){var t=function(t){return e.blobToImage(t)},n=function(t){return e.imageToBlob(t)},r=function(t){return e.blobToDataUri(t)},i=function(t){return e.blobToBase64(t)};return{blobToImage:t,imageToBlob:n,blobToDataUri:r,blobToBase64:i}}),s("f",tinymce.dom.DOMUtils),s("g",tinymce.ui.Factory),s("h",tinymce.ui.Form),s("i",tinymce.ui.Container),s("s",tinymce.ui.Control),s("t",tinymce.ui.DragHelper),s("u",tinymce.geom.Rect),s("w",tinymce.dom.DomQuery),s("x",tinymce.util.Observable),s("y",tinymce.util.VK),a("v",["w","t","u","5","x","y"],function(e,t,n,r,i,o){var a=0;return function(s,l,c,u,d){function f(e,t){return{x:t.x+e.x,y:t.y+e.y,w:t.w,h:t.h}}function p(e,t){return{x:t.x-e.x,y:t.y-e.y,w:t.w,h:t.h}}function m(){return p(c,s)}function g(e,t,r,i){var o,a,l,u,d;o=t.x,a=t.y,l=t.w,u=t.h,o+=r*e.deltaX,a+=i*e.deltaY,l+=r*e.deltaW,u+=i*e.deltaH,l<20&&(l=20),u<20&&(u=20),d=s=n.clamp({x:o,y:a,w:l,h:u},c,"move"==e.name),d=p(c,d),k.fire("updateRect",{rect:d}),C(d)}function h(){function n(e){var n;return new t(R,{document:u.ownerDocument,handle:R+"-"+e.name,start:function(){n=s},drag:function(t){g(e,n,t.deltaX,t.deltaY)}})}e('<div id="'+R+'" class="'+T+'croprect-container" role="grid" aria-dropeffect="execute">').appendTo(u),r.each(E,function(t){e("#"+R,u).append('<div id="'+R+"-"+t+'"class="'+T+'croprect-block" style="display: none" data-mce-bogus="all">')}),r.each(S,function(t){e("#"+R,u).append('<div id="'+R+"-"+t.name+'" class="'+T+"croprect-handle "+T+"croprect-handle-"+t.name+'"style="display: none" data-mce-bogus="all" role="gridcell" tabindex="-1" aria-label="'+t.label+'" aria-grabbed="false">')}),_=r.map(S,n),b(s),e(u).on("focusin focusout",function(t){e(t.target).attr("aria-grabbed","focus"===t.type)}),e(u).on("keydown",function(e){function t(e,t,r,i,o){e.stopPropagation(),e.preventDefault(),g(n,r,i,o)}var n;switch(r.each(S,function(t){if(e.target.id==R+"-"+t.name)return n=t,!1}),e.keyCode){case o.LEFT:t(e,n,s,-10,0);break;case o.RIGHT:t(e,n,s,10,0);break;case o.UP:t(e,n,s,0,-10);break;case o.DOWN:t(e,n,s,0,10);break;case o.ENTER:case o.SPACEBAR:e.preventDefault(),d()}})}function v(t){var n;n=r.map(S,function(e){return"#"+R+"-"+e.name}).concat(r.map(E,function(e){return"#"+R+"-"+e})).join(","),t?e(n,u).show():e(n,u).hide()}function b(t){function n(t,n){n.h<0&&(n.h=0),n.w<0&&(n.w=0),e("#"+R+"-"+t,u).css({left:n.x,top:n.y,width:n.w,height:n.h})}r.each(S,function(n){e("#"+R+"-"+n.name,u).css({left:t.w*n.xMul+t.x,top:t.h*n.yMul+t.y})}),n("top",{x:l.x,y:l.y,w:l.w,h:t.y-l.y}),n("right",{x:t.x+t.w,y:t.y,w:l.w-t.x-t.w+l.x,h:t.h}),n("bottom",{x:l.x,y:t.y+t.h,w:l.w,h:l.h-t.y-t.h+l.y}),n("left",{x:l.x,y:t.y,w:t.x-l.x,h:t.h}),n("move",t)}function y(e){s=e,b(s)}function x(e){l=e,b(s)}function C(e){y(f(c,e))}function w(e){c=e,b(s)}function N(){r.each(_,function(e){e.destroy()}),_=[]}var k,S,_,E,T="mce-",R=T+"crid-"+a++;return S=[{name:"move",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:0,deltaH:0,label:"Crop Mask"},{name:"nw",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:-1,deltaH:-1,label:"Top Left Crop Handle"},{name:"ne",xMul:1,yMul:0,deltaX:0,deltaY:1,deltaW:1,deltaH:-1,label:"Top Right Crop Handle"},{name:"sw",xMul:0,yMul:1,deltaX:1,deltaY:0,deltaW:-1,deltaH:1,label:"Bottom Left Crop Handle"},{name:"se",xMul:1,yMul:1,deltaX:0,deltaY:0,deltaW:1,deltaH:1,label:"Bottom Right Crop Handle"}],E=["top","right","bottom","left"],h(u),k=r.extend({toggleVisibility:v,setClampRect:w,setRect:y,getInnerRect:m,setInnerRect:C,setViewPortRect:x,destroy:N},i)}}),a("j",["s","t","u","5","3","v"],function(e,t,n,r,i,o){function a(e){return new i(function(t){function n(){e.removeEventListener("load",n),t(e)}e.complete?t(e):e.addEventListener("load",n)})}return e.extend({Defaults:{classes:"imagepanel"},selection:function(e){return arguments.length?(this.state.set("rect",e),this):this.state.get("rect")},imageSize:function(){var e=this.state.get("viewRect");return{w:e.w,h:e.h}},toggleCropRect:function(e){this.state.set("cropEnabled",e)},imageSrc:function(e){var t=this,r=new Image;r.src=e,a(r).then(function(){var e,i,o=t.state.get("viewRect");if(i=t.$el.find("img"),i[0])i.replaceWith(r);else{var a=document.createElement("div");a.className="mce-imagepanel-bg",t.getEl().appendChild(a),t.getEl().appendChild(r)}e={x:0,y:0,w:r.naturalWidth,h:r.naturalHeight},t.state.set("viewRect",e),t.state.set("rect",n.inflate(e,-20,-20)),o&&o.w==e.w&&o.h==e.h||t.zoomFit(),t.repaintImage(),t.fire("load")})},zoom:function(e){return arguments.length?(this.state.set("zoom",e),this):this.state.get("zoom")},postRender:function(){return this.imageSrc(this.settings.imageSrc),this._super()},zoomFit:function(){var e,t,n,r,i,o,a,s=this;a=10,e=s.$el.find("img"),t=s.getEl().clientWidth,n=s.getEl().clientHeight,r=e[0].naturalWidth,i=e[0].naturalHeight,o=Math.min((t-a)/r,(n-a)/i),o>=1&&(o=1),s.zoom(o)},repaintImage:function(){var e,t,n,r,i,o,a,s,l,c,u;u=this.getEl(),l=this.zoom(),c=this.state.get("rect"),a=this.$el.find("img"),s=this.$el.find(".mce-imagepanel-bg"),i=u.offsetWidth,o=u.offsetHeight,n=a[0].naturalWidth*l,r=a[0].naturalHeight*l,e=Math.max(0,i/2-n/2),t=Math.max(0,o/2-r/2),a.css({left:e,top:t,width:n,height:r}),s.css({left:e,top:t,width:n,height:r}),this.cropRect&&(this.cropRect.setRect({x:c.x*l+e,y:c.y*l+t,w:c.w*l,h:c.h*l}),this.cropRect.setClampRect({x:e,y:t,w:n,h:r}),this.cropRect.setViewPortRect({x:0,y:0,w:i,h:o}))},bindStates:function(){function e(e){t.cropRect=new o(e,t.state.get("viewRect"),t.state.get("viewRect"),t.getEl(),function(){t.fire("crop")}),t.cropRect.on("updateRect",function(e){var n=e.rect,r=t.zoom();n={x:Math.round(n.x/r),y:Math.round(n.y/r),w:Math.round(n.w/r),h:Math.round(n.h/r)},t.state.set("rect",n)}),t.on("remove",t.cropRect.destroy)}var t=this;t.state.on("change:cropEnabled",function(e){t.cropRect.toggleVisibility(e.value),t.repaintImage()}),t.state.on("change:zoom",function(){t.repaintImage()}),t.state.on("change:rect",function(n){var r=n.value;t.cropRect||e(r),t.cropRect.setRect(r)})}})}),a("k",[],function(){return function(){function e(e){var t;return t=o.splice(++a),o.push(e),{state:e,removed:t}}function t(){if(r())return o[--a]}function n(){if(i())return o[++a]}function r(){return a>0}function i(){return a!=-1&&a<o.length-1}var o=[],a=-1;return{data:o,add:e,undo:t,redo:n,canUndo:r,canRedo:i}}}),a("9",["f","5","3","g","h","i","j","7","8","k"],function(e,t,n,r,i,o,a,s,l,c){function u(e){return{blob:e,url:URL.createObjectURL(e)}}function d(e){e&&URL.revokeObjectURL(e.url)}function f(e){t.each(e,d)}function p(n,l,p){function m(e){var t,n,r,i;t=O.find("#w")[0],n=O.find("#h")[0],r=parseInt(t.value(),10),i=parseInt(n.value(),10),O.find("#constrain")[0].checked()&&ae&&se&&r&&i&&("w"==e.control.settings.name?(i=Math.round(r*le),n.value(i)):(r=Math.round(i*ce),t.value(r))),ae=r,se=i}function g(e){return Math.round(100*e)+"%"}function h(){O.find("#undo").disabled(!ue.canUndo()),O.find("#redo").disabled(!ue.canRedo()),O.statusbar.find("#save").disabled(!ue.canUndo())}function v(){O.find("#undo").disabled(!0),O.find("#redo").disabled(!0)}function b(e){e&&$.imageSrc(e.url)}function y(e){return function(){var n=t.grep(oe,function(t){return t.settings.name!=e});t.each(n,function(e){e.hide()}),e.show(),e.focus()}}function x(e){z=u(e),b(z)}function C(e){n=u(e),b(n),f(ue.add(n).removed),h()}function w(){var e=$.selection();s.crop(n.blob,e.x,e.y,e.w,e.h).then(function(e){C(e),S()})}function N(e){var t=[].slice.call(arguments,1);return function(){var r=z||n;e.apply(this,[r.blob].concat(t)).then(x)}}function k(e){var t=[].slice.call(arguments,1);return function(){e.apply(this,[n.blob].concat(t)).then(C)}}function S(){b(n),d(z),y(H)(),h()}function _(){z&&(C(z.blob),S())}function E(){var e=$.zoom();e<2&&(e+=.1),$.zoom(e)}function T(){var e=$.zoom();e>.1&&(e-=.1),$.zoom(e)}function R(){n=ue.undo(),b(n),h()}function A(){n=ue.redo(),b(n),h()}function B(){l(n.blob),O.close()}function P(e){return new i({layout:"flex",direction:"row",labelGap:5,border:"0 0 1 0",align:"center",pack:"center",padding:"0 10 0 10",spacing:5,flex:0,minHeight:60,defaults:{classes:"imagetool",type:"button"},items:e})}function D(e,t){return P([{text:"Back",onclick:S},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:_}]).hide().on("show",function(){v(),t(n.blob).then(function(e){var t=u(e);b(t),d(z),z=t})})}function M(e,t,r,i,o){function a(e){t(n.blob,e).then(function(e){var t=u(e);b(t),d(z),z=t})}return P([{text:"Back",onclick:S},{type:"spacer",flex:1},{type:"slider",flex:1,ondragend:function(e){a(e.value)},minValue:i,maxValue:o,value:r,previewFilter:g},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:_}]).hide().on("show",function(){this.find("slider").value(r),v()})}function L(e,t){function r(){var e,r,i;e=O.find("#r")[0].value(),r=O.find("#g")[0].value(),i=O.find("#b")[0].value(),t(n.blob,e,r,i).then(function(e){var t=u(e);b(t),d(z),z=t})}return P([{text:"Back",onclick:S},{type:"spacer",flex:1},{type:"slider",label:"R",name:"r",minValue:0,value:1,maxValue:2,ondragend:r,previewFilter:g},{type:"slider",label:"G",name:"g",minValue:0,value:1,maxValue:2,ondragend:r,previewFilter:g},{type:"slider",label:"B",name:"b",minValue:0,value:1,maxValue:2,ondragend:r,previewFilter:g},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:_}]).hide().on("show",function(){O.find("#r,#g,#b").value(1),v()})}function I(e){e.control.value()===!0&&(le=se/ae,ce=ae/se)}var O,H,F,z,W,U,V,$,j,q,Y,X,K,G,J,Z,Q,ee,te,ne,re,ie,oe,ae,se,le,ce,ue=new c;W=P([{text:"Back",onclick:S},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:w}]).hide().on("show hide",function(e){$.toggleCropRect("show"==e.type)}).on("show",v),U=P([{text:"Back",onclick:S},{type:"spacer",flex:1},{type:"textbox",name:"w",label:"Width",size:4,onkeyup:m},{type:"textbox",name:"h",label:"Height",size:4,onkeyup:m},{type:"checkbox",name:"constrain",text:"Constrain proportions",checked:!0,onchange:I},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:"submit"}]).hide().on("submit",function(e){var t=parseInt(O.find("#w").value(),10),n=parseInt(O.find("#h").value(),10);e.preventDefault(),k(s.resize,t,n)(),S()}).on("show",v),V=P([{text:"Back",onclick:S},{type:"spacer",flex:1},{icon:"fliph",tooltip:"Flip horizontally",onclick:N(s.flip,"h")},{icon:"flipv",tooltip:"Flip vertically",onclick:N(s.flip,"v")},{icon:"rotateleft",tooltip:"Rotate counterclockwise",onclick:N(s.rotate,-90)},{icon:"rotateright",tooltip:"Rotate clockwise",onclick:N(s.rotate,90)},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:_}]).hide().on("show",v),Y=D("Invert",s.invert),te=D("Sharpen",s.sharpen),ne=D("Emboss",s.emboss),X=M("Brightness",s.brightness,0,-1,1),K=M("Hue",s.hue,180,0,360),G=M("Saturate",s.saturate,0,-1,1),J=M("Contrast",s.contrast,0,-1,1),Z=M("Grayscale",s.grayscale,0,0,1),Q=M("Sepia",s.sepia,0,0,1),ee=L("Colorize",s.colorize),re=M("Gamma",s.gamma,0,-1,1),ie=M("Exposure",s.exposure,1,0,2),F=P([{text:"Back",onclick:S},{type:"spacer",flex:1},{text:"hue",icon:"hue",onclick:y(K)},{text:"saturate",icon:"saturate",onclick:y(G)},{text:"sepia",icon:"sepia",onclick:y(Q)},{text:"emboss",icon:"emboss",onclick:y(ne)},{text:"exposure",icon:"exposure",onclick:y(ie)},{type:"spacer",flex:1}]).hide(),H=P([{tooltip:"Crop",icon:"crop",onclick:y(W)},{tooltip:"Resize",icon:"resize2",onclick:y(U)},{tooltip:"Orientation",icon:"orientation",onclick:y(V)},{tooltip:"Brightness",icon:"sun",onclick:y(X)},{tooltip:"Sharpen",icon:"sharpen",onclick:y(te)},{tooltip:"Contrast",icon:"contrast",onclick:y(J)},{tooltip:"Color levels",icon:"drop",onclick:y(ee)},{tooltip:"Gamma",icon:"gamma",onclick:y(re)},{tooltip:"Invert",icon:"invert",onclick:y(Y)}]),$=new a({flex:1,imageSrc:n.url}),j=new o({layout:"flex",direction:"column",border:"0 1 0 0",padding:5,spacing:5,items:[{type:"button",icon:"undo",tooltip:"Undo",name:"undo",onclick:R},{type:"button",icon:"redo",tooltip:"Redo",name:"redo",onclick:A},{type:"button",icon:"zoomin",tooltip:"Zoom in",onclick:E},{type:"button",icon:"zoomout",tooltip:"Zoom out",onclick:T}]}),q=new o({type:"container",layout:"flex",direction:"row",align:"stretch",flex:1,items:[j,$]}),oe=[H,W,U,V,F,Y,X,K,G,J,Z,Q,ee,te,ne,re,ie],O=r.create("window",{layout:"flex",direction:"column",align:"stretch",minWidth:Math.min(e.DOM.getViewPort().w,800),minHeight:Math.min(e.DOM.getViewPort().h,650),title:"Edit image",items:oe.concat([q]),buttons:[{text:"Save",name:"save",subtype:"primary",onclick:B},{text:"Cancel",onclick:"close"}]}),O.renderTo(document.body).reflow(),O.on("close",function(){p(),f(ue.data),ue=null,z=null}),ue.add(n),h(),$.on("load",function(){ae=$.imageSize().w,se=$.imageSize().h,le=se/ae,ce=ae/se,O.find("#w").value(ae),O.find("#h").value(se)}),$.on("crop",w)}function m(e){return new n(function(t,n){p(u(e),t,n)})}return{edit:m}}),a("a",[],function(){function e(e){function t(e){return/^[0-9\.]+px$/.test(e)}var n,r;return n=e.style.width,r=e.style.height,n||r?t(n)&&t(r)?{w:parseInt(n,10),h:parseInt(r,10)}:null:(n=e.width,r=e.height,n&&r?{w:parseInt(n,10),h:parseInt(r,10)}:null)}function t(e,t){var n,r;t&&(n=e.style.width,r=e.style.height,(n||r)&&(e.style.width=t.w+"px",e.style.height=t.h+"px",e.removeAttribute("data-mce-style")),n=e.width,r=e.height,(n||r)&&(e.setAttribute("width",t.w),e.setAttribute("height",t.h)))}function n(e){return{w:e.naturalWidth,h:e.naturalHeight}}return{getImageSize:e,setImageSize:t,getNaturalImageSize:n}}),a("l",["3","5"],function(e,t){var n=function(e){return null!==e&&void 0!==e},r=function(e,t){var r;return r=t.reduce(function(e,t){return n(e)?e[t]:void 0},e),n(r)?r:null},i=function(n,r){return new e(function(e){var i;i=new XMLHttpRequest,i.onreadystatechange=function(){4===i.readyState&&e({status:i.status,blob:this.response})},i.open("GET",n,!0),t.each(r,function(e,t){i.setRequestHeader(t,e)}),i.responseType="blob",i.send()})},o=function(t){return new e(function(e){var n=new FileReader;n.onload=function(t){var n=t.target;e(n.result)},n.readAsText(t)})},a=function(e){var t;try{t=JSON.parse(e)}catch(e){}return t};return{traverse:r,readBlob:o,requestUrlAsBlob:i,parseJson:a}}),a("b",["3","5","l"],function(e,t,n){function r(t){return n.requestUrlAsBlob(t,{}).then(function(t){return t.status>=400?o(t.status):e.resolve(t.blob)})}var i=function(e){return 400===e||403===e||500===e},o=function(t){return e.reject("ImageProxy HTTP error: "+t)},a=function(t){e.reject("ImageProxy Service error: "+t)},s=function(e,t){return n.readBlob(t).then(function(e){var t=n.parseJson(e),r=n.traverse(t,["error","type"]);return a(r?r:"Invalid JSON")})},l=function(e,t){return i(e)?s(e,t):o(e)},c=function(t,r){return n.requestUrlAsBlob(t,{"Content-Type":"application/json;charset=UTF-8","tiny-api-key":r}).then(function(t){return t.status>=400?l(t.status,t.blob):e.resolve(t.blob)})},u=function(e,t){return t?c(e,t):r(e)};return{getUrl:u}}),a("0",["1","2","3","4","5","6","7","8","9","a","b"],function(e,t,n,r,i,o,a,s,l,c,u){var d=function(e){function d(t){e.notificationManager.open({text:t,type:"error"})}function f(){return e.selection.getNode()}function p(t){var n=t.match(/\/([^\/\?]+)?\.(?:jpeg|jpg|png|gif)(?:\?|$)/i);return n?e.dom.encode(n[1]):null}function m(){return"imagetools"+D++}function g(t){var n=t.src;return 0===n.indexOf("data:")||0===n.indexOf("blob:")||new r(n).host===e.documentBaseURI.host}function h(t){return i.inArray(e.settings.imagetools_cors_hosts,new r(t.src).host)!==-1}function v(){return e.settings.api_key||e.settings.imagetools_api_key}function b(t){var n,r=t.src;return h(t)?u.getUrl(t.src,null):g(t)?s.imageToBlob(t):(r=e.settings.imagetools_proxy,r+=(r.indexOf("?")===-1?"?":"&")+"url="+encodeURIComponent(t.src),n=v(),u.getUrl(r,n))}function y(){var t;return t=e.editorUpload.blobCache.getByUri(f().src),t?t.blob():b(f())}function x(){B=o.setEditorTimeout(e,function(){e.editorUpload.uploadImagesAuto()},e.settings.images_upload_timeout||3e4)}function C(){clearTimeout(B)}function w(t,n){return s.blobToDataUri(t).then(function(i){var o,a,s,l,c,u;return u=f(),l=e.editorUpload.blobCache,c=l.getByUri(u.src),s=r.parseDataUri(i).data,o=m(),e.settings.images_reuse_filename&&(a=c?c.filename():p(u.src)),c=l.create(o,t,s,a),l.add(c),e.undoManager.transact(function(){function t(){e.$(u).off("load",t),e.nodeChanged(),n?e.editorUpload.uploadImagesAuto():(C(),x())}e.$(u).on("load",t),e.$(u).attr({src:c.blobUri()}).removeAttr("data-mce-src")}),c})}function N(t){return function(){return e._scanForImages().then(y).then(t).then(w,d)}}function k(e){return function(){return N(function(t){var n=c.getImageSize(f());return n&&c.setImageSize(f(),{w:n.h,h:n.w}),a.rotate(t,e)})()}}function S(e){return function(){return N(function(t){return a.flip(t,e)})()}}function _(){var e=f(),t=c.getNaturalImageSize(e),r=function(r){return new n(function(n){s.blobToImage(r).then(function(i){var o=c.getNaturalImageSize(i);t.w==o.w&&t.h==o.h||c.getImageSize(e)&&c.setImageSize(e,o),URL.revokeObjectURL(i.src),n(r)})})},i=function(e){return l.edit(e).then(r).then(function(e){w(e,!0)},function(){})};e&&b(e).then(i,d)}function E(){e.addButton("rotateleft",{title:"Rotate counterclockwise",cmd:"mceImageRotateLeft"}),e.addButton("rotateright",{title:"Rotate clockwise",cmd:"mceImageRotateRight"}),e.addButton("flipv",{title:"Flip vertically",cmd:"mceImageFlipVertical"}),e.addButton("fliph",{title:"Flip horizontally",cmd:"mceImageFlipHorizontal"}),e.addButton("editimage",{title:"Edit image",cmd:"mceEditImage"}),e.addButton("imageoptions",{title:"Image options",icon:"options",cmd:"mceImage"})}function T(){e.on("NodeChange",function(t){P&&P.src!=t.element.src&&(C(),e.editorUpload.uploadImagesAuto(),P=void 0),R(t.element)&&(P=t.element)})}function R(t){var n=e.dom.is(t,"img:not([data-mce-object],[data-mce-placeholder])");return n&&(g(t)||h(t)||e.settings.imagetools_proxy)}function A(){var t=e.settings.imagetools_toolbar;t||(t="rotateleft rotateright | flipv fliph | crop editimage imageoptions"),e.addContextToolbar(R,t)}var B,P,D=0;t.fileApi&&(i.each({mceImageRotateLeft:k(-90),mceImageRotateRight:k(90),mceImageFlipVertical:S("v"),mceImageFlipHorizontal:S("h"),mceEditImage:_},function(t,n){e.addCommand(n,t)}),E(),A(),T())};return e.add("imagetools",d),function(){}}),r("0")()}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/importcss/plugin.min.js b/core/media/editors/tinymce/plugins/importcss/plugin.min.js
new file mode 100644
index 00000000..19a05031
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/importcss/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("importcss",function(e){function t(e){var t=tinymce.Env.cacheSuffix;return"string"==typeof e&&(e=e.replace("?"+t,"").replace("&"+t,"")),e}function n(t){var n=e.settings,r=n.skin!==!1&&(n.skin||"lightgray");if(r){var i=n.skin_url;return i=i?e.documentBaseURI.toAbsolute(i):tinymce.baseURL+"/skins/"+r,t===i+"/content"+(e.inline?".inline":"")+".min.css"}return!1}function r(e){return"string"==typeof e?function(t){return t.indexOf(e)!==-1}:e instanceof RegExp?function(t){return e.test(t)}:e}function i(r,i){function o(e,r){var s,l=e.href;if(l=t(l),l&&i(l,r)&&!n(l)){p(e.imports,function(e){o(e,!0)});try{s=e.cssRules||e.rules}catch(e){}p(s,function(e){e.styleSheet?o(e.styleSheet,!0):e.selectorText&&p(e.selectorText.split(","),function(e){a.push(tinymce.trim(e))})})}}var a=[],s={};p(e.contentCSS,function(e){s[e]=!0}),i||(i=function(e,t){return t||s[e]});try{p(r.styleSheets,function(e){o(e)})}finally{}return a}function o(t){var n,r=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(t);if(r){var i=r[1],o=r[2].substr(1).split(".").join(" "),a=tinymce.makeMap("a,img");return r[1]?(n={title:t},e.schema.getTextBlockElements()[i]?n.block=i:e.schema.getBlockElements()[i]||a[i.toLowerCase()]?n.selector=i:n.inline=i):r[2]&&(n={inline:"span",title:t.substr(1),classes:o}),e.settings.importcss_merge_classes!==!1?n.classes=o:n.attributes={"class":o},n}}function a(e,t){return tinymce.util.Tools.grep(e,function(e){return!e.filter||e.filter(t)})}function s(e){return tinymce.util.Tools.map(e,function(e){return tinymce.util.Tools.extend({},e,{original:e,selectors:{},filter:r(e.filter),item:{text:e.title,menu:[]}})})}function l(e,t){return null===t||e.settings.importcss_exclusive!==!1}function c(t,n,r){return!(l(e,n)?t in r:t in n.selectors)}function u(t,n,r){l(e,n)?r[t]=!0:n.selectors[t]=!0}function d(t,n,r){var i,a=e.settings;return i=r&&r.selector_converter?r.selector_converter:a.importcss_selector_converter?a.importcss_selector_converter:o,i.call(t,n,r)}var f=this,p=tinymce.each;e.on("renderFormatsMenu",function(t){var n=e.settings,o={},l=r(n.importcss_selector_filter),m=t.control,g=s(n.importcss_groups),h=function(t,n){if(c(t,n,o)){u(t,n,o);var r=d(f,t,n);if(r){var i=r.name||tinymce.DOM.uniqueId();return e.formatter.register(i,r),tinymce.extend({},m.settings.itemDefaults,{text:r.title,format:i})}}return null};e.settings.importcss_append||m.items().remove(),p(i(t.doc||e.getDoc(),r(n.importcss_file_filter)),function(e){if(e.indexOf(".mce-")===-1&&(!l||l(e))){var t=a(g,e);if(t.length>0)tinymce.util.Tools.each(t,function(t){var n=h(e,t);n&&t.item.menu.push(n)});else{var n=h(e,null);n&&m.add(n)}}}),p(g,function(e){e.item.menu.length>0&&m.add(e.item)}),t.control.renderNew()}),f.convertSelectorToFormat=o});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/insertdatetime/plugin.min.js b/core/media/editors/tinymce/plugins/insertdatetime/plugin.min.js
new file mode 100644
index 00000000..fc3f2961
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/insertdatetime/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("insertdatetime",function(e){function t(t,n){function r(e,t){if(e=""+e,e.length<t)for(var n=0;n<t-e.length;n++)e="0"+e;return e}return n=n||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+n.getFullYear()),t=t.replace("%y",""+n.getYear()),t=t.replace("%m",r(n.getMonth()+1,2)),t=t.replace("%d",r(n.getDate(),2)),t=t.replace("%H",""+r(n.getHours(),2)),t=t.replace("%M",""+r(n.getMinutes(),2)),t=t.replace("%S",""+r(n.getSeconds(),2)),t=t.replace("%I",""+((n.getHours()+11)%12+1)),t=t.replace("%p",""+(n.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(l[n.getMonth()])),t=t.replace("%b",""+e.translate(s[n.getMonth()])),t=t.replace("%A",""+e.translate(a[n.getDay()])),t=t.replace("%a",""+e.translate(o[n.getDay()])),t=t.replace("%%","%")}function n(n){var r=t(n);if(e.settings.insertdatetime_element){var i;i=t(/%[HMSIp]/.test(n)?"%Y-%m-%dT%H:%M":"%Y-%m-%d"),r='<time datetime="'+i+'">'+r+"</time>";var o=e.dom.getParent(e.selection.getStart(),"time");if(o)return void e.dom.setOuterHTML(o,r)}e.insertContent(r)}var r,i,o="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),a="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),s="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),l="January February March April May June July August September October November December".split(" "),c=[];e.addCommand("mceInsertDate",function(){n(e.getParam("insertdatetime_dateformat",e.translate("%Y-%m-%d")))}),e.addCommand("mceInsertTime",function(){n(e.getParam("insertdatetime_timeformat",e.translate("%H:%M:%S")))}),e.addButton("insertdatetime",{type:"splitbutton",title:"Insert date/time",onclick:function(){n(r||i)},menu:c}),tinymce.each(e.settings.insertdatetime_formats||["%H:%M:%S","%Y-%m-%d","%I:%M:%S %p","%D"],function(e){i||(i=e),c.push({text:t(e),onclick:function(){r=e,n(e)}})}),e.addMenuItem("insertdatetime",{icon:"date",text:"Date/time",menu:c,context:"insert"})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/layer/plugin.min.js b/core/media/editors/tinymce/plugins/layer/plugin.min.js
new file mode 100644
index 00000000..24310125
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/layer/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("layer",function(a){function b(a){do if(a.className&&a.className.indexOf("mceItemLayer")!=-1)return a;while(a=a.parentNode)}function c(b){var c=a.dom;tinymce.each(c.select("div,p",b),function(a){/^(absolute|relative|fixed)$/i.test(a.style.position)&&(a.hasVisual?c.addClass(a,"mceItemVisualAid"):c.removeClass(a,"mceItemVisualAid"),c.addClass(a,"mceItemLayer"))})}function d(c){var d,e,f=[],g=b(a.selection.getNode()),h=-1,i=-1;for(e=[],tinymce.walk(a.getBody(),function(a){1==a.nodeType&&/^(absolute|relative|static)$/i.test(a.style.position)&&e.push(a)},"childNodes"),d=0;d<e.length;d++)f[d]=e[d].style.zIndex?parseInt(e[d].style.zIndex,10):0,h<0&&e[d]==g&&(h=d);if(c<0){for(d=0;d<f.length;d++)if(f[d]<f[h]){i=d;break}i>-1?(e[h].style.zIndex=f[i],e[i].style.zIndex=f[h]):f[h]>0&&(e[h].style.zIndex=f[h]-1)}else{for(d=0;d<f.length;d++)if(f[d]>f[h]){i=d;break}i>-1?(e[h].style.zIndex=f[i],e[i].style.zIndex=f[h]):e[h].style.zIndex=f[h]+1}a.execCommand("mceRepaint")}function e(){var b=a.dom,c=b.getPos(b.getParent(a.selection.getNode(),"*")),d=a.getBody();a.dom.add(d,"div",{style:{position:"absolute",left:c.x,top:c.y>20?c.y:20,width:100,height:100},class:"mceItemVisualAid mceItemLayer"},a.selection.getContent()||a.getLang("layer.content")),tinymce.Env.ie&&b.setHTML(d,d.innerHTML)}function f(){var c=b(a.selection.getNode());c||(c=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")),c&&("absolute"==c.style.position.toLowerCase()?(a.dom.setStyles(c,{position:"",left:"",top:"",width:"",height:""}),a.dom.removeClass(c,"mceItemVisualAid"),a.dom.removeClass(c,"mceItemLayer")):(c.style.left||(c.style.left="20px"),c.style.top||(c.style.top="20px"),c.style.width||(c.style.width=c.width?c.width+"px":"100px"),c.style.height||(c.style.height=c.height?c.height+"px":"100px"),c.style.position="absolute",a.dom.setAttrib(c,"data-mce-style",""),a.addVisual(a.getBody())),a.execCommand("mceRepaint"),a.nodeChanged())}a.addCommand("mceInsertLayer",e),a.addCommand("mceMoveForward",function(){d(1)}),a.addCommand("mceMoveBackward",function(){d(-1)}),a.addCommand("mceMakeAbsolute",function(){f()}),a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"}),a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"}),a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"}),a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"}),a.on("init",function(){tinymce.Env.ie&&a.getDoc().execCommand("2D-Position",!1,!0)}),a.on("mouseup",function(c){var d=b(c.target);d&&a.dom.setAttrib(d,"data-mce-style","")}),a.on("mousedown",function(c){var d,e=c.target,f=a.getDoc();tinymce.Env.gecko&&(b(e)?"on"!==f.designMode&&(f.designMode="on",e=f.body,d=e.parentNode,d.removeChild(e),d.appendChild(e)):"on"==f.designMode&&(f.designMode="off"))}),a.on("NodeChange",c)});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/legacyoutput/plugin.min.js b/core/media/editors/tinymce/plugins/legacyoutput/plugin.min.js
new file mode 100644
index 00000000..96b060b9
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/legacyoutput/plugin.min.js
@@ -0,0 +1 @@
+!function(e){e.PluginManager.add("legacyoutput",function(t,n,r){t.settings.inline_styles=!1,t.on("init",function(){var n="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",r=e.explode(t.settings.font_size_style_values),i=t.schema;t.formatter.register({alignleft:{selector:n,attributes:{align:"left"}},aligncenter:{selector:n,attributes:{align:"center"}},alignright:{selector:n,attributes:{align:"right"}},alignjustify:{selector:n,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:!0}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:!0}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(t){return e.inArray(r,t.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}}),e.each("b,i,u,strike".split(","),function(e){i.addValidElements(e+"[*]")}),i.getElementRule("font")||i.addValidElements("font[face|size|color|style]"),e.each(n.split(","),function(e){var t=i.getElementRule(e);t&&(t.attributes.align||(t.attributes.align={},t.attributesOrder.push("align")))})}),t.addButton("fontsizeselect",function(){var e=[],n="8pt=1 10pt=2 12pt=3 14pt=4 18pt=5 24pt=6 36pt=7",r=t.settings.fontsize_formats||n;return t.$.each(r.split(" "),function(t,n){var r=n,i=n,o=n.split("=");o.length>1&&(r=o[0],i=o[1]),e.push({text:r,value:i})}),{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:e,fixedWidth:!0,onPostRender:function(){var e=this;t.on("NodeChange",function(){var n;n=t.dom.getParent(t.selection.getNode(),"font"),n?e.value(n.size):e.value("")})},onclick:function(e){e.control.settings.value&&t.execCommand("FontSize",!1,e.control.settings.value)}}}),t.addButton("fontselect",function(){function e(e){e=e.replace(/;$/,"").split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}var n="Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats",i=[],o=e(t.settings.font_formats||n);return r.each(o,function(e,t){i.push({text:{raw:t[0]},value:t[1],textStyle:t[1].indexOf("dings")==-1?"font-family:"+t[1]:""})}),{type:"listbox",text:"Font Family",tooltip:"Font Family",values:i,fixedWidth:!0,onPostRender:function(){var e=this;t.on("NodeChange",function(){var n;n=t.dom.getParent(t.selection.getNode(),"font"),n?e.value(n.face):e.value("")})},onselect:function(e){e.control.settings.value&&t.execCommand("FontName",!1,e.control.settings.value)}}})})}(tinymce);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/link/plugin.min.js b/core/media/editors/tinymce/plugins/link/plugin.min.js
new file mode 100644
index 00000000..fd138d75
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/link/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("link",function(e){function t(e){return e&&"A"===e.nodeName&&e.href}function n(e){return tinymce.util.Tools.grep(e,t).length>0}function r(t){return e.dom.getParent(t,"a[href]")}function i(){return r(e.selection.getStart())}function o(e){var t=e.getAttribute("data-mce-href");return t?t:e.getAttribute("href")}function a(){var t=e.plugins.contextmenu;return!!t&&t.isContextMenuVisible()}function s(n){var r,i,o;return!!(e.settings.link_context_toolbar&&!a()&&t(n)&&(r=e.selection,i=r.getRng(),o=i.startContainer,3==o.nodeType&&r.isCollapsed()&&i.startOffset>0&&i.startOffset<o.data.length))}function l(e,t){document.body.appendChild(e),e.dispatchEvent(t),document.body.removeChild(e)}function c(e){if(!tinymce.Env.ie||tinymce.Env.ie>10){var t=document.createElement("a");t.target="_blank",t.href=e,t.rel="noreferrer noopener";var n=document.createEvent("MouseEvents");n.initMouseEvent("click",!0,!0,window,0,0,0,0,0,!1,!1,!1,!1,0,null),l(t,n)}else{var r=window.open("","_blank");if(r){r.opener=null;var i=r.document;i.open(),i.write('<meta http-equiv="refresh" content="0; url='+tinymce.DOM.encode(e)+'">'),i.close()}}}function u(t){if(t){var n=o(t);if(/^#/.test(n)){var r=e.$(n);r.length&&e.selection.scrollIntoView(r[0],!0)}else c(t.href)}}function d(){u(i())}function f(){var t=this,r=function(e){n(e.parents)?t.show():t.hide()};n(e.dom.getParents(e.selection.getStart()))||t.hide(),e.on("nodechange",r),t.on("remove",function(){e.off("nodechange",r)})}function p(t){return function(){var n=e.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):"function"==typeof n?n(t):t(n)}}function m(e,t,n){function r(e,n){return n=n||[],tinymce.each(e,function(e){var i={text:e.text||e.title};e.menu?i.menu=r(e.menu):(i.value=e.value,t&&t(i)),n.push(i)}),n}return r(e,n||[])}function g(t){function n(e){var t=d.find("#text");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),d.find("#href").value(e.control.value())}function r(t){var r=[];if(tinymce.each(e.dom.select("a:not([href])"),function(e){var n=e.name||e.id;n&&r.push({text:n,value:"#"+n,selected:t.indexOf("#"+n)!=-1})}),r.length)return r.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:r,onselect:n}}function i(){!u&&0===w.text.length&&f&&this.parent().parent().find("#text")[0].value(this.value())}function o(t){var n=t.meta||{};g&&g.value(e.convertURL(this.value(),"href")),tinymce.each(t.meta,function(e,t){var n=d.find("#"+t);"text"===t?0===u.length&&(n.value(e),w.text=e):n.value(e)}),n.attach&&(h={href:this.value(),attach:n.attach}),n.text||i.call(this)}function a(e){var t=N.getContent();if(/</.test(t)&&(!/^<a [^>]+>[^<]+<\/a>$/.test(t)||t.indexOf("href=")==-1))return!1;if(e){var n,r=e.childNodes;if(0===r.length)return!1;for(n=r.length-1;n>=0;n--)if(3!=r[n].nodeType)return!1}return!0}function s(e){e.meta=d.toJSON()}var l,c,u,d,f,p,g,v,b,y,x,C,w={},N=e.selection,k=e.dom;l=N.getNode(),c=k.getParent(l,"a[href]"),f=a(),w.text=u=c?c.innerText||c.textContent:N.getContent({format:"text"}),w.href=c?k.getAttrib(c,"href"):"",c?w.target=k.getAttrib(c,"target"):e.settings.default_link_target&&(w.target=e.settings.default_link_target),(C=k.getAttrib(c,"rel"))&&(w.rel=C),(C=k.getAttrib(c,"class"))&&(w["class"]=C),(C=k.getAttrib(c,"title"))&&(w.title=C),f&&(p={name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){w.text=this.value()}}),t&&(g={type:"listbox",label:"Link list",values:m(t,function(t){t.value=e.convertURL(t.value||t.url,"href")},[{text:"None",value:""}]),onselect:n,value:e.convertURL(w.href,"href"),onPostRender:function(){g=this}}),e.settings.target_list!==!1&&(e.settings.target_list||(e.settings.target_list=[{text:"None",value:""},{text:"New window",value:"_blank"}]),b={name:"target",type:"listbox",label:"Target",values:m(e.settings.target_list)}),e.settings.rel_list&&(v={name:"rel",type:"listbox",label:"Rel",values:m(e.settings.rel_list)}),e.settings.link_class_list&&(y={name:"class",type:"listbox",label:"Class",values:m(e.settings.link_class_list,function(t){t.value&&(t.textStyle=function(){return e.formatter.getCssText({inline:"a",classes:[t.value]})})})}),e.settings.link_title!==!1&&(x={name:"title",type:"textbox",label:"Title",value:w.title}),d=e.windowManager.open({title:"Insert link",data:w,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:o,onkeyup:i,onbeforecall:s},p,x,r(w.href),g,v,b,y],onSubmit:function(t){function n(t,n){var r=e.selection.getRng();tinymce.util.Delay.setEditorTimeout(e,function(){e.windowManager.confirm(t,function(t){e.selection.setRng(r),n(t)})})}function r(e,t){function n(e){return e=r(e),e?[e,i].join(" "):i}function r(e){var t=new RegExp("("+i.replace(" ","|")+")","g");return e&&(e=tinymce.trim(e.replace(t,""))),e?e:null}var i="noopener noreferrer";return t?n(e):r(e)}function i(){var t={href:a,target:w.target?w.target:null,rel:w.rel?w.rel:null,"class":w["class"]?w["class"]:null,title:w.title?w.title:null};e.settings.allow_unsafe_link_target||(t.rel=r(t.rel,"_blank"==t.target)),a===h.href&&(h.attach(),h={}),c?(e.focus(),f&&w.text!=u&&("innerText"in c?c.innerText=w.text:c.textContent=w.text),k.setAttribs(c,t),N.select(c),e.undoManager.add()):f?e.insertContent(k.createHTML("a",t,k.encode(w.text))):e.execCommand("mceInsertLink",!1,t)}function o(){e.undoManager.transact(i)}var a;return w=tinymce.extend(w,t.data),(a=w.href)?a.indexOf("@")>0&&a.indexOf("//")==-1&&a.indexOf("mailto:")==-1?void n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(e){e&&(a="mailto:"+a),o()}):e.settings.link_assume_external_targets&&!/^\w+:/i.test(a)||!e.settings.link_assume_external_targets&&/^\s*www[\.|\d\.]/i.test(a)?void n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(e){e&&(a="http://"+a),o()}):void o():void e.execCommand("unlink")}})}var h={},v=function(e){return e.altKey===!0&&e.shiftKey===!1&&e.ctrlKey===!1&&e.metaKey===!1};e.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Meta+K",onclick:p(g),stateSelector:"a[href]"}),e.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),e.addContextToolbar&&(e.addButton("openlink",{icon:"newtab",tooltip:"Open link",onclick:d}),e.addContextToolbar(s,"openlink | link unlink")),e.addShortcut("Meta+K","",p(g)),e.addCommand("mceLink",p(g)),e.on("click",function(e){var t=r(e.target);t&&tinymce.util.VK.metaKeyPressed(e)&&(e.preventDefault(),u(t))}),e.on("keydown",function(e){var t=i();t&&13===e.keyCode&&v(e)&&(e.preventDefault(),u(t))}),this.showDialog=g,e.addMenuItem("openlink",{text:"Open link",icon:"newtab",onclick:d,onPostRender:f,prependToContext:!0}),e.addMenuItem("link",{icon:"link",text:"Link",shortcut:"Meta+K",onclick:p(g),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/lists/plugin.min.js b/core/media/editors/tinymce/plugins/lists/plugin.min.js
new file mode 100644
index 00000000..9bcc320b
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/lists/plugin.min.js
@@ -0,0 +1 @@
+!function(){var e={},t=function(t){for(var n=e[t],i=n.deps,o=n.defn,a=i.length,s=new Array(a),l=0;l<a;++l)s[l]=r(i[l]);var c=o.apply(null,s);if(void 0===c)throw"module ["+t+"] returned undefined";n.instance=c},n=function(t,n,r){if("string"!=typeof t)throw"module id must be a string";if(void 0===n)throw"no dependencies for "+t;if(void 0===r)throw"no definition function for "+t;e[t]={deps:n,defn:r,instance:void 0}},r=function(n){var r=e[n];if(void 0===r)throw"module ["+n+"] was undefined";return void 0===r.instance&&t(n),r.instance},i=function(e,t){for(var n=e.length,i=new Array(n),o=0;o<n;++o)i[o]=r(e[o]);t.apply(null,i)},o={};o.bolt={module:{api:{define:n,require:i,demand:r}}};var a=n,s=function(e,t){a(e,[],function(){return t})};s("1",tinymce.PluginManager),s("2",tinymce.util.Tools),s("3",tinymce.util.VK),a("4",[],function(){var e=function(e){return e&&3===e.nodeType},t=function(e){return e&&/^(OL|UL|DL)$/.test(e.nodeName)},n=function(e){return e&&/^(LI|DT|DD)$/.test(e.nodeName)},r=function(e){return e&&"BR"===e.nodeName},i=function(e){return e.parentNode.firstChild===e},o=function(e){return e.parentNode.lastChild===e},a=function(e,t){return t&&!!e.schema.getTextBlockElements()[t.nodeName]},s=function(e,t){return!!r(t)&&!(!e.isBlock(t.nextSibling)||r(t.previousSibling))},l=function(e,t,n){var r=e.isEmpty(t);return!(n&&e.select("span[data-mce-type=bookmark]",t).length>0)&&r},c=function(e,t){return e.isChildOf(t,e.getRoot())};return{isTextNode:e,isListNode:t,isListItemNode:n,isBr:r,isFirstChild:i,isLastChild:o,isTextBlock:a,isBogusBr:s,isEmpty:l,isChildOfBody:c}}),s("9",tinymce.dom.TreeWalker),s("a",tinymce.dom.RangeUtils),a("b",["2","4"],function(e,t){var n=function(n){return e.grep(n.selection.getSelectedBlocks(),function(e){return t.isListItemNode(e)})};return{getSelectedListItems:n}}),s("h",tinymce.dom.DOMUtils.DOM),a("d",["a","4"],function(e,t){var n=function(n,r){var i=e.getNode(n,r);if(t.isListItemNode(n)&&t.isTextNode(i)){var o=r>=n.childNodes.length?i.data.length:0;return{container:i,offset:o}}return{container:n,offset:r}},r=function(e){var t=e.cloneRange(),r=n(e.startContainer,e.startOffset);t.setStart(r.container,r.offset);var i=n(e.endContainer,e.endOffset);return t.setEnd(i.container,i.offset),t};return{getNormalizedEndPoint:n,normalizeRange:r}}),a("c",["h","4","d"],function(e,t,n){var r=function(t){var n={},r=function(r){var i,o,a;o=t[r?"startContainer":"endContainer"],a=t[r?"startOffset":"endOffset"],1===o.nodeType&&(i=e.create("span",{"data-mce-type":"bookmark"}),o.hasChildNodes()?(a=Math.min(a,o.childNodes.length-1),r?o.insertBefore(i,o.childNodes[a]):e.insertAfter(i,o.childNodes[a])):o.appendChild(i),o=i,a=0),n[r?"startContainer":"endContainer"]=o,n[r?"startOffset":"endOffset"]=a};return r(!0),t.collapsed||r(),n},i=function(t){function r(n){var r,i,o,a=function(e){for(var t=e.parentNode.firstChild,n=0;t;){if(t===e)return n;1===t.nodeType&&"bookmark"===t.getAttribute("data-mce-type")||n++,t=t.nextSibling}return-1};r=o=t[n?"startContainer":"endContainer"],i=t[n?"startOffset":"endOffset"],r&&(1===r.nodeType&&(i=a(r),r=r.parentNode,e.remove(o)),t[n?"startContainer":"endContainer"]=r,t[n?"startOffset":"endOffset"]=i)}r(!0),r();var i=e.createRng();return i.setStart(t.startContainer,t.startOffset),t.endContainer&&i.setEnd(t.endContainer,t.endOffset),n.normalizeRange(i)};return{createBookmark:r,resolveBookmark:i}}),a("e",["h","2","4"],function(e,t,n){var r=function(t,r){var i,o=r.parentNode;"LI"===o.nodeName&&o.firstChild===r&&(i=o.previousSibling,i&&"LI"===i.nodeName?(i.appendChild(r),n.isEmpty(t,o)&&e.remove(o)):e.setStyle(o,"listStyleType","none")),n.isListNode(o)&&(i=o.previousSibling,i&&"LI"===i.nodeName&&i.appendChild(r))},i=function(e,n){t.each(t.grep(e.select("ol,ul",n)),function(t){r(e,t)})};return{normalizeList:r,normalizeLists:i}}),s("f",tinymce.dom.BookmarkManager),s("j",tinymce.Env),a("i",["h","j"],function(e,t){var n=function(n,r,i){var o,a,s,l=e.createFragment(),c=n.schema.getBlockElements();if(n.settings.forced_root_block&&(i=i||n.settings.forced_root_block),i&&(a=e.create(i),a.tagName===n.settings.forced_root_block&&e.setAttribs(a,n.settings.forced_root_block_attrs),l.appendChild(a)),r)for(;o=r.firstChild;){var u=o.nodeName;s||"SPAN"===u&&"bookmark"===o.getAttribute("data-mce-type")||(s=!0),c[u]?(l.appendChild(o),a=null):i?(a||(a=e.create(i),l.appendChild(a)),a.appendChild(o)):l.appendChild(o)}return n.settings.forced_root_block?s||t.ie&&!(t.ie>10)||a.appendChild(e.create("br",{"data-mce-bogus":"1"})):l.appendChild(e.create("br")),l};return{createNewTextBlock:n}}),a("g",["h","2","i","4"],function(e,t,n,r){var i=function(i,o,a,s){var l,c,u,d,f=function(n){t.each(u,function(e){n.parentNode.insertBefore(e,a.parentNode)}),e.remove(n)};for(u=e.select('span[data-mce-type="bookmark"]',o),s=s||n.createNewTextBlock(i,a),l=e.createRng(),l.setStartAfter(a),l.setEndAfter(o),c=l.extractContents(),d=c.firstChild;d;d=d.firstChild)if("LI"===d.nodeName&&i.dom.isEmpty(d)){e.remove(d);break}i.dom.isEmpty(c)||e.insertAfter(c,o),e.insertAfter(s,o),r.isEmpty(i.dom,a.parentNode)&&f(a.parentNode),e.remove(a),r.isEmpty(i.dom,o)&&e.remove(o)};return{splitList:i}}),a("7",["h","4","c","b","g","e","i"],function(e,t,n,r,i,o,a){var s=function(n,r){t.isEmpty(n,r)&&e.remove(r)},l=function(n,r){var l,c=r.parentNode,u=c.parentNode;return c===n.getBody()||("DD"===r.nodeName?(e.rename(r,"DT"),!0):t.isFirstChild(r)&&t.isLastChild(r)?("LI"===u.nodeName?(e.insertAfter(r,u),s(n.dom,u),e.remove(c)):t.isListNode(u)?e.remove(c,!0):(u.insertBefore(a.createNewTextBlock(n,r),c),e.remove(c)),!0):t.isFirstChild(r)?("LI"===u.nodeName?(e.insertAfter(r,u),r.appendChild(c),s(n.dom,u)):t.isListNode(u)?u.insertBefore(r,c):(u.insertBefore(a.createNewTextBlock(n,r),c),e.remove(r)),!0):t.isLastChild(r)?("LI"===u.nodeName?e.insertAfter(r,u):t.isListNode(u)?e.insertAfter(r,c):(e.insertAfter(a.createNewTextBlock(n,r),c),e.remove(r)),!0):("LI"===u.nodeName?(c=u,l=a.createNewTextBlock(n,r,"LI")):l=t.isListNode(u)?a.createNewTextBlock(n,r,"LI"):a.createNewTextBlock(n,r),i.splitList(n,c,r,l),o.normalizeLists(n.dom,c.parentNode),!0))},c=function(e){var t=r.getSelectedListItems(e);if(t.length){var i,o,a=n.createBookmark(e.selection.getRng(!0)),s=e.getBody();for(i=t.length;i--;)for(var c=t[i].parentNode;c&&c!==s;){for(o=t.length;o--;)if(t[o]===c){t.splice(i,1);break}c=c.parentNode}for(i=0;i<t.length&&(l(e,t[i])||0!==i);i++);return e.selection.setRng(n.resolveBookmark(a)),e.nodeChanged(),!0}};return{outdent:l,outdentSelection:c}}),a("8",["2","f","b","4","c","g","e","7"],function(e,t,n,r,i,o,a,s){var l=function(e,t,n){var r=n["list-style-type"]?n["list-style-type"]:null;e.setStyle(t,"list-style-type",r)},c=function(t,n){e.each(n,function(e,n){t.setAttribute(n,e)})},u=function(t,n,r){c(n,r["list-attributes"]),e.each(t.select("li",n),function(e){c(e,r["list-item-attributes"])})},d=function(e,t,n){l(e,t,n),u(e,t,n)},f=function(e,t,n){var i,o,a=e.getBody();for(i=t[n?"startContainer":"endContainer"],o=t[n?"startOffset":"endOffset"],1===i.nodeType&&(i=i.childNodes[Math.min(o,i.childNodes.length-1)]||i);i.parentNode!==a;){if(r.isTextBlock(e,i))return i;if(/^(TD|TH)$/.test(i.parentNode.nodeName))return i;i=i.parentNode}return i},p=function(n,i){for(var o,a=[],s=n.getBody(),l=n.dom,c=f(n,i,!0),u=f(n,i,!1),d=[],p=c;p&&(d.push(p),p!==u);p=p.nextSibling);return e.each(d,function(e){if(r.isTextBlock(n,e))return a.push(e),void(o=null);if(l.isBlock(e)||r.isBr(e))return r.isBr(e)&&l.remove(e),void(o=null);var i=e.nextSibling;return t.isBookmarkNode(e)&&(r.isTextBlock(n,i)||!i&&e.parentNode===s)?void(o=null):(o||(o=l.create("p"),e.parentNode.insertBefore(o,e),a.push(o)),void o.appendChild(e))}),a},m=function(t,n,o){var a,s=t.selection.getRng(!0),l="LI",c=t.dom;o=o?o:{},"false"!==c.getContentEditable(t.selection.getNode())&&(n=n.toUpperCase(),"DL"===n&&(l="DT"),a=i.createBookmark(s),e.each(p(t,s),function(e){var i,a,s=function(e){var t=c.getStyle(e,"list-style-type"),n=o?o["list-style-type"]:"";return n=null===n?"":n,t===n};a=e.previousSibling,a&&r.isListNode(a)&&a.nodeName===n&&s(a)?(i=a,e=c.rename(e,l),a.appendChild(e)):(i=c.create(n),e.parentNode.insertBefore(i,e),i.appendChild(e),e=c.rename(e,l)),d(c,i,o),x(t.dom,i)}),t.selection.setRng(i.resolveBookmark(a)))},g=function(t){var l=i.createBookmark(t.selection.getRng(!0)),c=t.getBody(),u=n.getSelectedListItems(t),d=e.grep(u,function(e){return t.dom.isEmpty(e)});u=e.grep(u,function(e){return!t.dom.isEmpty(e)}),e.each(d,function(e){if(r.isEmpty(t.dom,e))return void s.outdent(t,e)}),e.each(u,function(e){var n,i;if(e.parentNode!==t.getBody()){for(n=e;n&&n!==c;n=n.parentNode)r.isListNode(n)&&(i=n);o.splitList(t,i,e),a.normalizeLists(t.dom,i.parentNode)}}),t.selection.setRng(i.resolveBookmark(l))},h=function(e,t){return e&&t&&r.isListNode(e)&&e.nodeName===t.nodeName},v=function(e,t,n){var r=e.getStyle(t,"list-style-type",!0),i=e.getStyle(n,"list-style-type",!0);return r===i},b=function(e,t){return e.className===t.className},y=function(e,t,n){return h(t,n)&&v(e,t,n)&&b(t,n)},x=function(e,t){var n,r;if(n=t.nextSibling,y(e,t,n)){for(;r=n.firstChild;)t.appendChild(r);e.remove(n)}if(n=t.previousSibling,y(e,t,n)){for(;r=n.lastChild;)t.insertBefore(r,t.firstChild);e.remove(n)}},C=function(e,t,n){var r=e.dom.getParent(e.selection.getStart(),"OL,UL,DL");if(n=n?n:{},r!==e.getBody())if(r)if(r.nodeName===t)g(e,t);else{var o=i.createBookmark(e.selection.getRng(!0));d(e.dom,r,n),x(e.dom,e.dom.rename(r,t)),e.selection.setRng(i.resolveBookmark(o))}else m(e,t,n)};return{toggleList:C,removeList:g,mergeWithAdjacentLists:x}}),a("5",["9","a","3","b","4","c","d","e","8"],function(e,t,n,r,i,o,a,s,l){var c=function(n,r,o){var a,s,l=r.startContainer,c=r.startOffset;if(3===l.nodeType&&(o?c<l.data.length:c>0))return l;for(a=n.schema.getNonEmptyElements(),1===l.nodeType&&(l=t.getNode(l,c)),s=new e(l,n.getBody()),o&&i.isBogusBr(n.dom,l)&&s.next();l=s[o?"next":"prev2"]();){if("LI"===l.nodeName&&!l.hasChildNodes())return l;if(a[l.nodeName])return l;if(3===l.nodeType&&l.data.length>0)return l}},u=function(e,t,n){var r,o,a=t.parentNode;if(i.isChildOfBody(e,t)&&i.isChildOfBody(e,n)){if(i.isListNode(n.lastChild)&&(o=n.lastChild),a===n.lastChild&&i.isBr(a.previousSibling)&&e.remove(a.previousSibling),r=n.lastChild,r&&i.isBr(r)&&t.hasChildNodes()&&e.remove(r),i.isEmpty(e,n,!0)&&e.$(n).empty(),!i.isEmpty(e,t,!0))for(;r=t.firstChild;)n.appendChild(r);o&&n.appendChild(o),e.remove(t),i.isEmpty(e,a)&&a!==e.getRoot()&&e.remove(a)}},d=function(e,t){var n,r,s,d=e.dom,f=e.selection,p=d.getParent(f.getStart(),"LI");if(p){if(n=p.parentNode,n===e.getBody()&&i.isEmpty(d,n))return!0;if(r=a.normalizeRange(f.getRng(!0)),s=d.getParent(c(e,r,t),"LI"),s&&s!==p){var m=o.createBookmark(r);return t?u(d,s,p):u(d,p,s),e.selection.setRng(o.resolveBookmark(m)),!0}if(!s&&!t&&l.removeList(e,n.nodeName))return!0}return!1},f=function(e,t){var n=e.dom,r=n.getParent(e.selection.getStart(),n.isBlock);if(r&&n.isEmpty(r)){var i=a.normalizeRange(e.selection.getRng(!0)),o=n.getParent(c(e,i,t),"LI");if(o)return e.undoManager.transact(function(){n.remove(r),l.mergeWithAdjacentLists(n,o.parentNode),e.selection.select(o,!0),e.selection.collapse(t)}),!0}return!1},p=function(e,t){return d(e,t)||f(e,t)},m=function(e){var t=e.dom.getParent(e.selection.getStart(),"LI,DT,DD");return!!(t||r.getSelectedListItems(e).length>0)&&(e.undoManager.transact(function(){e.execCommand("Delete"),s.normalizeLists(e.dom,e.getBody())}),!0)},g=function(e,t){return e.selection.isCollapsed()?p(e,t):m(e)},h=function(e){e.on("keydown",function(t){t.keyCode===n.BACKSPACE?g(e,!1)&&t.preventDefault():t.keyCode===n.DELETE&&g(e,!0)&&t.preventDefault()})};return{setup:h,backspaceDelete:g}}),a("6",["h","4","c","b"],function(e,t,n,r){var i=function(n,r){var i;if(t.isListNode(n)){for(;i=n.firstChild;)r.appendChild(i);e.remove(n)}},o=function(n){var r,o,a;return"DT"===n.nodeName?(e.rename(n,"DD"),!0):(r=n.previousSibling,r&&t.isListNode(r)?(r.appendChild(n),!0):r&&"LI"===r.nodeName&&t.isListNode(r.lastChild)?(r.lastChild.appendChild(n),i(n.lastChild,r.lastChild),!0):(r=n.nextSibling,r&&t.isListNode(r)?(r.insertBefore(n,r.firstChild),!0):(r=n.previousSibling,!(!r||"LI"!==r.nodeName)&&(o=e.create(n.parentNode.nodeName),a=e.getStyle(n.parentNode,"listStyleType"),a&&e.setStyle(o,"listStyleType",a),r.appendChild(o),o.appendChild(n),i(n.lastChild,o),!0))))},a=function(e){var t=r.getSelectedListItems(e);if(t.length){for(var i=n.createBookmark(e.selection.getRng(!0)),a=0;a<t.length&&(o(t[a])||0!==a);a++);return e.selection.setRng(n.resolveBookmark(i)),e.nodeChanged(),!0}};return{indentSelection:a}}),a("0",["1","2","3","4","5","6","7","8"],function(e,t,n,r,i,o,a,s){var l=function(e,t){return function(){var n=e.dom.getParent(e.selection.getStart(),"UL,OL,DL");return n&&n.nodeName===t}},c=function(e){e.on("BeforeExecCommand",function(t){var n,r=t.command.toLowerCase();if("indent"===r?o.indentSelection(e)&&(n=!0):"outdent"===r&&a.outdentSelection(e)&&(n=!0),n)return e.fire("ExecCommand",{command:t.command}),t.preventDefault(),!0}),e.addCommand("InsertUnorderedList",function(t,n){s.toggleList(e,"UL",n)}),e.addCommand("InsertOrderedList",function(t,n){s.toggleList(e,"OL",n)}),e.addCommand("InsertDefinitionList",function(t,n){s.toggleList(e,"DL",n)})},u=function(e){e.addQueryStateHandler("InsertUnorderedList",l(e,"UL")),e.addQueryStateHandler("InsertOrderedList",l(e,"OL")),e.addQueryStateHandler("InsertDefinitionList",l(e,"DL"))},d=function(e){e.on("keydown",function(t){9!==t.keyCode||n.metaKeyPressed(t)||e.dom.getParent(e.selection.getStart(),"LI,DT,DD")&&(t.preventDefault(),t.shiftKey?a.outdentSelection(e):o.indentSelection(e))})},f=function(e){var n=function(n){return function(){var i=this;e.on("NodeChange",function(e){var o=t.grep(e.parents,r.isListNode);i.active(o.length>0&&o[0].nodeName===n)})}},i=function(e,n){var r=e.settings.plugins?e.settings.plugins:"";return t.inArray(r.split(/[ ,]/),n)!==-1};i(e,"advlist")||(e.addButton("numlist",{title:"Numbered list",cmd:"InsertOrderedList",onPostRender:n("OL")}),e.addButton("bullist",{title:"Bullet list",cmd:"InsertUnorderedList",onPostRender:n("UL")})),e.addButton("indent",{icon:"indent",title:"Increase indent",cmd:"Indent",onPostRender:function(t){var n=t.control;e.on("nodechange",function(){for(var t=e.selection.getSelectedBlocks(),i=!1,o=0,a=t.length;!i&&o<a;o++){var s=t[o].nodeName;i="LI"===s&&r.isFirstChild(t[o])||"UL"===s||"OL"===s||"DD"===s}n.disabled(i)})}})};return e.add("lists",function(e){return f(e),i.setup(e),e.on("init",function(){c(e),u(e),d(e)}),{backspaceDelete:function(t){i.backspaceDelete(e,t)}}}),function(){}}),r("0")()}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/media/plugin.min.js b/core/media/editors/tinymce/plugins/media/plugin.min.js
new file mode 100644
index 00000000..510380e9
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/media/plugin.min.js
@@ -0,0 +1 @@
+!function(){var e={},t=function(t){for(var n=e[t],i=n.deps,o=n.defn,a=i.length,s=new Array(a),l=0;l<a;++l)s[l]=r(i[l]);var c=o.apply(null,s);if(void 0===c)throw"module ["+t+"] returned undefined";n.instance=c},n=function(t,n,r){if("string"!=typeof t)throw"module id must be a string";if(void 0===n)throw"no dependencies for "+t;if(void 0===r)throw"no definition function for "+t;e[t]={deps:n,defn:r,instance:void 0}},r=function(n){var r=e[n];if(void 0===r)throw"module ["+n+"] was undefined";return void 0===r.instance&&t(n),r.instance},i=function(e,t){for(var n=e.length,i=new Array(n),o=0;o<n;++o)i[o]=r(e[o]);t.apply(null,i)},o={};o.bolt={module:{api:{define:n,require:i,demand:r}}};var a=n,s=function(e,t){a(e,[],function(){return t})};s("1",tinymce.PluginManager),s("6",tinymce.util.Delay),s("e",tinymce.util.Tools),s("9",tinymce.html.SaxParser),s("a",tinymce.html.Schema),s("b",tinymce.dom.DOMUtils.DOM),a("h",[],function(){var e=function(e,t){if(e)for(var n=0;n<e.length;n++)if(t.indexOf(e[n].filter)!==-1)return e[n]};return{getVideoScriptMatch:e}}),a("c",[],function(){var e=function(e){return e.replace(/px$/,"")},t=function(e){return/^[0-9.]+$/.test(e)?e+"px":e},n=function(t){return function(n){return n?e(n.style[t]):""}},r=function(e){return function(n,r){n&&(n.style[e]=t(r))}};return{getMaxWidth:n("maxWidth"),getMaxHeight:n("maxHeight"),setMaxWidth:r("maxWidth"),setMaxHeight:r("maxHeight")}}),a("7",["e","9","a","b","h","c"],function(e,t,n,r,i,o){var a=function(e){return r.getAttrib(e,"data-ephox-embed-iri")},s=function(e){var t=r.createFragment(e);return""!==a(t.firstChild)},l=function(n,r){var o={};return new t({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(t,r){if(o.source1||"param"!==t||(o.source1=r.map.movie),"iframe"!==t&&"object"!==t&&"embed"!==t&&"video"!==t&&"audio"!==t||(o.type||(o.type=t),o=e.extend(r.map,o)),"script"===t){var a=i.getVideoScriptMatch(n,r.map.src);if(!a)return;o={type:"script",source1:r.map.src,width:a.width,height:a.height}}"source"===t&&(o.source1?o.source2||(o.source2=r.map.src):o.source1=r.map.src),"img"!==t||o.poster||(o.poster=r.map.src)}}).parse(r),o.source1=o.source1||o.src||o.data,o.source2=o.source2||"",o.poster=o.poster||"",o},c=function(e){var t=r.createFragment(e),n=t.firstChild;return{type:"ephox-embed-iri",source1:a(n),source2:"",poster:"",width:o.getMaxWidth(n),height:o.getMaxHeight(n)}},u=function(e,t){return s(t)?c(t):l(e,t)};return{htmlToData:u}}),s("8",tinymce.html.Writer),a("4",["8","9","a","b","c"],function(e,t,n,r,i){var o=function(e,t){var n,r,i,o;for(n in t)if(i=""+t[n],e.map[n])for(r=e.length;r--;)o=e[r],o.name===n&&(i?(e.map[n]=i,o.value=i):(delete e.map[n],e.splice(r,1)));else i&&(e.push({name:n,value:i}),e.map[n]=i)},a=function(n){var r=new e,i=new t(r);return i.parse(n),r.getContent()},s=function(r,i,a){var s,l=new e,c=0;return new t({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(e){l.comment(e)},cdata:function(e){l.cdata(e)},text:function(e,t){l.text(e,t)},start:function(e,t,n){switch(e){case"video":case"object":case"embed":case"img":case"iframe":o(t,{width:i.width,height:i.height})}if(a)switch(e){case"video":o(t,{poster:i.poster,src:""}),i.source2&&o(t,{src:""});break;case"iframe":o(t,{src:i.source1});break;case"source":if(c++,c<=2&&(o(t,{src:i["source"+c],type:i["source"+c+"mime"]}),!i["source"+c]))return;break;case"img":if(!i.poster)return;s=!0}l.start(e,t,n)},end:function(e){if("video"===e&&a)for(var t=1;t<=2;t++)if(i["source"+t]){var n=[];n.map={},c<t&&(o(n,{src:i["source"+t],type:i["source"+t+"mime"]}),l.start("source",n,!0))}if(i.poster&&"object"===e&&a&&!s){var r=[];r.map={},o(r,{src:i.poster,width:i.width,height:i.height}),l.start("img",r,!0)}l.end(e)}},new n({})).parse(r),l.getContent()},l=function(e){var t=r.createFragment(e);return""!==r.getAttrib(t.firstChild,"data-ephox-embed-iri")},c=function(e,t){var n=r.createFragment(e),o=n.firstChild;return i.setMaxWidth(o,t.width),i.setMaxHeight(o,t.height),a(o.outerHTML)},u=function(e,t,n){return l(e)?c(e,t):s(e,t,n)};return{updateHtml:u}}),a("l",[],function(){var e=function(e){var t={mp3:"audio/mpeg",wav:"audio/wav",mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg",swf:"application/x-shockwave-flash"},n=e.toLowerCase().split(".").pop(),r=t[n];return r?r:""};return{guess:e}}),a("m",[],function(){var e=[{regex:/youtu\.be\/([\w\-.]+)/,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$2",allowFullscreen:!0},{regex:/youtube.com\/embed\/([a-z0-9\-_]+(?:\?.+)?)/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc",allowfullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$2?title=0&amp;byline=0",allowfullscreen:!0},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'//maps.google.com/maps/ms?msid=$2&output=embed"',allowFullscreen:!1},{regex:/dailymotion\.com\/video\/([^_]+)/,type:"iframe",w:480,h:270,url:"//www.dailymotion.com/embed/video/$1",allowFullscreen:!0}];return{urlPatterns:e}}),a("j",["l","7","m","h","4","e"],function(e,t,n,r,i,o){var a=function(a,s){var l="",c=o.extend({},s);if(!c.source1&&(o.extend(c,t.htmlToData(a.settings.media_scripts,c.embed)),!c.source1))return"";if(c.source2||(c.source2=""),c.poster||(c.poster=""),c.source1=a.convertURL(c.source1,"source"),c.source2=a.convertURL(c.source2,"source"),c.source1mime=e.guess(c.source1),c.source2mime=e.guess(c.source2),c.poster=a.convertURL(c.poster,"poster"),o.each(n.urlPatterns,function(e){var t,n,r=e.regex.exec(c.source1);if(r){for(n=e.url,t=0;r[t];t++)n=n.replace("$"+t,function(){return r[t]});c.source1=n,c.type=e.type,c.allowFullscreen=e.allowFullscreen,c.width=c.width||e.w,c.height=c.height||e.h}}),c.embed)l=i.updateHtml(c.embed,c,!0);else{var u=r.getVideoScriptMatch(a.settings.media_scripts,c.source1);if(u&&(c.type="script",c.width=u.width,c.height=u.height),c.width=c.width||300,c.height=c.height||150,o.each(c,function(e,t){c[t]=a.dom.encode(e)}),"iframe"===c.type){var d=c.allowFullscreen?' allowFullscreen="1"':"";l+='<iframe src="'+c.source1+'" width="'+c.width+'" height="'+c.height+'"'+d+"></iframe>"}else"application/x-shockwave-flash"===c.source1mime?(l+='<object data="'+c.source1+'" width="'+c.width+'" height="'+c.height+'" type="application/x-shockwave-flash">',c.poster&&(l+='<img src="'+c.poster+'" width="'+c.width+'" height="'+c.height+'" />'),l+="</object>"):c.source1mime.indexOf("audio")!==-1?a.settings.audio_template_callback?l=a.settings.audio_template_callback(c):l+='<audio controls="controls" src="'+c.source1+'">'+(c.source2?'\n<source src="'+c.source2+'"'+(c.source2mime?' type="'+c.source2mime+'"':"")+" />\n":"")+"</audio>":"script"===c.type?l+='<script src="'+c.source1+'"></script>':l=a.settings.video_template_callback?a.settings.video_template_callback(c):'<video width="'+c.width+'" height="'+c.height+'"'+(c.poster?' poster="'+c.poster+'"':"")+' controls="controls">\n<source src="'+c.source1+'"'+(c.source1mime?' type="'+c.source1mime+'"':"")+" />\n"+(c.source2?'<source src="'+c.source2+'"'+(c.source2mime?' type="'+c.source2mime+'"':"")+" />\n":"")+"</video>"}return l};return{dataToHtml:a}}),s("k",tinymce.util.Promise),a("d",["j","k"],function(e,t){var n=function(e,n,r){var i={};return new t(function(t,o){var a=function(r){return r.html&&(i[e.source1]=r),t({url:e.source1,html:r.html?r.html:n(e)})};i[e.source1]?a(i[e.source1]):r({url:e.source1},a,o)})},r=function(e,n){return new t(function(t){t({html:n(e),url:e.source1})})},i=function(t){return function(n){return e.dataToHtml(t,n)}},o=function(e,t){var o=e.settings.media_url_resolver;return o?n(t,i(e),o):r(t,i(e))};return{getEmbedHtml:o}}),s("f",tinymce.Env),a("g",[],function(){var e=function(e,t){e.state.set("oldVal",e.value()),t.state.set("oldVal",t.value())},t=function(e,t){var n=e.find("#width")[0],r=e.find("#height")[0],i=e.find("#constrain")[0];n&&r&&i&&t(n,r,i.checked())},n=function(t,n,r){var i=t.state.get("oldVal"),o=n.state.get("oldVal"),a=t.value(),s=n.value();r&&i&&o&&a&&s&&(a!==i?(s=Math.round(a/i*s),isNaN(s)||n.value(s)):(a=Math.round(s/o*a),isNaN(a)||t.value(a))),e(t,n)},r=function(n){t(n,e)},i=function(e){t(e,n)},o=function(e){var t=function(){e(function(e){i(e)})};return{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:5,onchange:t,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:5,onchange:t,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}};return{createUi:o,syncSize:r,updateSize:i}}),a("2",["6","7","4","d","c","e","f","g"],function(e,t,n,r,i,o,a,s){var l=a.ie&&a.ie<=8?"onChange":"onInput",c=function(e){return function(t){var n=t&&t.msg?"Media embed handler error: "+t.msg:"Media embed handler threw unknown error.";e.notificationManager.open({type:"error",text:n})}},u=function(e){var n=e.selection.getNode(),r=n.getAttribute("data-ephox-embed-iri");return r?{source1:r,"data-ephox-embed-iri":r,width:i.getMaxWidth(n),height:i.getMaxHeight(n)}:n.getAttribute("data-mce-object")?t.htmlToData(e.settings.media_scripts,e.serializer.serialize(n,{selection:!0})):{}},d=function(e){var t=e.selection.getNode();if(t.getAttribute("data-mce-object")||t.getAttribute("data-ephox-embed-iri"))return e.selection.getContent()},f=function(e,n){return function(r){var i=r.html,a=e.find("#embed")[0],l=o.extend(t.htmlToData(n.settings.media_scripts,i),{source1:r.url});e.fromJSON(l),a&&(a.value(i),s.updateSize(e))}},p=function(e,t){var n,r,i=e.dom.select("img[data-mce-object]");for(n=0;n<t.length;n++)for(r=i.length-1;r>=0;r--)t[n]===i[r]&&i.splice(r,1);e.selection.select(i[0])},m=function(e,t){var n=e.dom.select("img[data-mce-object]");e.insertContent(t),p(e,n),e.nodeChanged()},g=function(e,t){var i=e.toJSON();i.embed=n.updateHtml(i.embed,i),i.embed?m(t,i.embed):r.getEmbedHtml(t,i).then(function(e){m(t,e.html)})["catch"](c(t))},h=function(e,t){o.each(t,function(t,n){e.find("#"+n).value(t)})},v=function(e){var i,a,p=[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source",onpaste:function(){setTimeout(function(){r.getEmbedHtml(e,i.toJSON()).then(f(i,e))["catch"](c(e))},1)},onchange:function(t){r.getEmbedHtml(e,i.toJSON()).then(f(i,e))["catch"](c(e)),h(i,t.meta)},onbeforecall:function(e){e.meta=i.toJSON()}}],m=[],v=function(e){e(i),a=i.toJSON(),i.find("#embed").value(n.updateHtml(a.embed,a))};if(e.settings.media_alt_source!==!1&&m.push({name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"}),e.settings.media_poster!==!1&&m.push({name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"}),e.settings.media_dimensions!==!1){var b=s.createUi(v);p.push(b)}a=u(e);var y={id:"mcemediasource",type:"textbox",flex:1,name:"embed",value:d(e),multiline:!0,rows:5,label:"Source"},x=function(){a=o.extend({},t.htmlToData(e.settings.media_scripts,this.value())),this.parent().parent().fromJSON(a)};y[l]=x,i=e.windowManager.open({title:"Insert/edit media",data:a,bodyType:"tabpanel",body:[{title:"General",type:"form",items:p},{title:"Embed",type:"container",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,items:[{type:"label",text:"Paste your embed code below:",forId:"mcemediasource"},y]},{title:"Advanced",type:"form",items:m}],onSubmit:function(){s.updateSize(i),g(i,e)}}),s.syncSize(i)};return{showDialog:v}}),a("3",["e","8","9","a"],function(e,t,n,r){var i=function(e,i){if(e.settings.media_filter_html===!1)return i;var o,a=new t;return new n({validate:!1,allow_conditional_comments:!1,special:"script,noscript",comment:function(e){a.comment(e)},cdata:function(e){a.cdata(e)},text:function(e,t){a.text(e,t)},start:function(t,n,r){if(o=!0,"script"!==t&&"noscript"!==t){for(var i=0;i<n.length;i++){if(0===n[i].name.indexOf("on"))return;"style"===n[i].name&&(n[i].value=e.dom.serializeStyle(e.dom.parseStyle(n[i].value),t))}a.start(t,n,r),o=!1}},end:function(e){o||a.end(e)}},new r({})).parse(i),a.getContent()};return{sanitize:i}}),s("i",tinymce.html.Node),a("5",["3","h","i","f"],function(e,t,n,r){var i=function(e,t){var i,o=t.name;return i=new n("img",1),i.shortEnded=!0,a(e,t,i),i.attr({width:t.attr("width")||"300",height:t.attr("height")||("audio"===o?"30":"150"),style:t.attr("style"),src:r.transparentSrc,"data-mce-object":o,"class":"mce-object mce-object-"+o}),i},o=function(e,t){var r,i,o,s=t.name;return r=new n("span",1),r.attr({contentEditable:"false",style:t.attr("style"),"data-mce-object":s,"class":"mce-preview-object mce-object-"+s}),a(e,t,r),i=new n(s,1),i.attr({src:t.attr("src"),allowfullscreen:t.attr("allowfullscreen"),width:t.attr("width")||"300",height:t.attr("height")||("audio"===s?"30":"150"),frameborder:"0"}),o=new n("span",1),o.attr("class","mce-shim"),r.append(i),r.append(o),r},a=function(t,n,r){var i,o,a,s,l;for(a=n.attributes,s=a.length;s--;)i=a[s].name,o=a[s].value,"width"!==i&&"height"!==i&&"style"!==i&&("data"!==i&&"src"!==i||(o=t.convertURL(o,i)),r.attr("data-mce-p-"+i,o));l=n.firstChild&&n.firstChild.value,l&&(r.attr("data-mce-html",escape(e.sanitize(t,l))),r.firstChild=null)},s=function(e){for(;e=e.parent;)if(e.attr("data-ephox-embed-iri"))return!0;return!1},l=function(e){return function(n){for(var a,l,c=n.length;c--;)a=n[c],a.parent&&(a.parent.attr("data-mce-object")||("script"!==a.name||(l=t.getVideoScriptMatch(e.settings.media_scripts,a.attr("src"))))&&(l&&(l.width&&a.attr("width",l.width.toString()),l.height&&a.attr("height",l.height.toString())),"iframe"===a.name&&e.settings.media_live_embeds!==!1&&r.ceFalse?s(a)||a.replace(o(e,a)):s(a)||a.replace(i(e,a))))}};return{createPreviewIframeNode:o,createPlaceholderNode:i,placeHolderConverter:l}}),a("0",["1","2","3","4","5"],function(e,t,n,r,i){var o=function(e){e.on("ResolveName",function(e){var t;1===e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}),e.on("preInit",function(){var t=e.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")});var r=e.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){r[e]={}}),e.parser.addNodeFilter("iframe,video,audio,object,embed,script",i.placeHolderConverter(e)),e.serializer.addAttributeFilter("data-mce-object",function(t,r){for(var i,o,a,s,l,c,u,d,f=t.length;f--;)if(i=t[f],i.parent){for(u=i.attr(r),o=new tinymce.html.Node(u,1),"audio"!==u&&"script"!==u&&(d=i.attr("class"),d&&d.indexOf("mce-preview-object")!==-1?o.attr({width:i.firstChild.attr("width"),height:i.firstChild.attr("height")}):o.attr({width:i.attr("width"),height:i.attr("height")})),o.attr({style:i.attr("style")}),s=i.attributes,a=s.length;a--;){var p=s[a].name;0===p.indexOf("data-mce-p-")&&o.attr(p.substr(11),s[a].value)}"script"===u&&o.attr("type","text/javascript"),l=i.attr("data-mce-html"),l&&(c=new tinymce.html.Node("#text",3),c.raw=!0,c.value=n.sanitize(e,unescape(l)),o.append(c)),i.replace(o)}})}),e.on("click keyup",function(){var t=e.selection.getNode();t&&e.dom.hasClass(t,"mce-preview-object")&&e.dom.getAttrib(t,"data-mce-selected")&&t.setAttribute("data-mce-selected","2")}),e.on("ObjectSelected",function(e){var t=e.target.getAttribute("data-mce-object");"audio"!==t&&"script"!==t||e.preventDefault()}),e.on("objectResized",function(e){var t,n=e.target;n.getAttribute("data-mce-object")&&(t=n.getAttribute("data-mce-html"),t&&(t=unescape(t),n.setAttribute("data-mce-html",escape(r.updateHtml(t,{width:e.width,height:e.height})))))}),this.showDialog=function(){t.showDialog(e)},e.addButton("media",{tooltip:"Insert/edit media",onclick:this.showDialog,stateSelector:["img[data-mce-object]","span[data-mce-object]","div[data-ephox-embed-iri]"]}),e.addMenuItem("media",{icon:"media",text:"Media",onclick:this.showDialog,context:"insert",prependToContext:!0}),e.on("setContent",function(){e.$("span.mce-preview-object").each(function(t,n){var r=e.$(n);0===r.find("span.mce-shim",n).length&&r.append('<span class="mce-shim"></span>')})}),e.addCommand("mceMedia",this.showDialog)};return e.add("media",o),function(){}}),r("0")()}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/nonbreaking/plugin.min.js b/core/media/editors/tinymce/plugins/nonbreaking/plugin.min.js
new file mode 100644
index 00000000..cae1aca4
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/nonbreaking/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("nonbreaking",function(e){var t=e.getParam("nonbreaking_force_tab");if(e.addCommand("mceNonBreaking",function(){e.insertContent(e.plugins.visualchars&&e.plugins.visualchars.state?'<span class="mce-nbsp">&nbsp;</span>':"&nbsp;"),e.dom.setAttrib(e.dom.select("span.mce-nbsp"),"data-mce-bogus","1")}),e.addButton("nonbreaking",{title:"Nonbreaking space",cmd:"mceNonBreaking"}),e.addMenuItem("nonbreaking",{text:"Nonbreaking space",cmd:"mceNonBreaking",context:"insert"}),t){var n=+t>1?+t:3;e.on("keydown",function(t){if(9==t.keyCode){if(t.shiftKey)return;t.preventDefault();for(var r=0;r<n;r++)e.execCommand("mceNonBreaking")}})}});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/noneditable/plugin.min.js b/core/media/editors/tinymce/plugins/noneditable/plugin.min.js
new file mode 100644
index 00000000..143f5c35
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/noneditable/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("noneditable",function(e){function t(e){return function(t){return(" "+t.attr("class")+" ").indexOf(e)!==-1}}function n(t){function n(t){var n=arguments,r=n[n.length-2],i=r>0?a.charAt(r-1):"";if('"'===i)return t;if(">"===i){var o=a.lastIndexOf("<",r);if(o!==-1){var l=a.substring(o,r);if(l.indexOf('contenteditable="false"')!==-1)return t}}return'<span class="'+s+'" data-mce-content="'+e.dom.encode(n[0])+'">'+e.dom.encode("string"==typeof n[1]?n[1]:n[0])+"</span>"}var r=o.length,a=t.content,s=tinymce.trim(i);if("raw"!=t.format){for(;r--;)a=a.replace(o[r],n);t.content=a}}var r,i,o,a="contenteditable";r=" "+tinymce.trim(e.getParam("noneditable_editable_class","mceEditable"))+" ",i=" "+tinymce.trim(e.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";var s=t(r),l=t(i);o=e.getParam("noneditable_regexp"),o&&!o.length&&(o=[o]),e.on("PreInit",function(){o&&e.on("BeforeSetContent",n),e.parser.addAttributeFilter("class",function(e){for(var t,n=e.length;n--;)t=e[n],s(t)?t.attr(a,"true"):l(t)&&t.attr(a,"false")}),e.serializer.addAttributeFilter(a,function(e){for(var t,n=e.length;n--;)t=e[n],(s(t)||l(t))&&(o&&t.attr("data-mce-content")?(t.name="#text",t.type=3,t.raw=!0,t.value=t.attr("data-mce-content")):t.attr(a,null))})})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/pagebreak/plugin.min.js b/core/media/editors/tinymce/plugins/pagebreak/plugin.min.js
new file mode 100644
index 00000000..78fea042
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/pagebreak/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("pagebreak",function(e){var t="mce-pagebreak",n=e.getParam("pagebreak_separator","<!-- pagebreak -->"),r=new RegExp(n.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(e){return"\\"+e}),"gi"),i='<img src="'+tinymce.Env.transparentSrc+'" class="'+t+'" data-mce-resize="false" data-mce-placeholder />';e.addCommand("mcePageBreak",function(){e.settings.pagebreak_split_block?e.insertContent("<p>"+i+"</p>"):e.insertContent(i)}),e.addButton("pagebreak",{title:"Page break",cmd:"mcePageBreak"}),e.addMenuItem("pagebreak",{text:"Page break",icon:"pagebreak",cmd:"mcePageBreak",context:"insert"}),e.on("ResolveName",function(n){"IMG"==n.target.nodeName&&e.dom.hasClass(n.target,t)&&(n.name="pagebreak")}),e.on("click",function(n){n=n.target,"IMG"===n.nodeName&&e.dom.hasClass(n,t)&&e.selection.select(n)}),e.on("BeforeSetContent",function(e){e.content=e.content.replace(r,i)}),e.on("PreInit",function(){e.serializer.addNodeFilter("img",function(t){for(var r,i,o=t.length;o--;)if(r=t[o],i=r.attr("class"),i&&i.indexOf("mce-pagebreak")!==-1){var a=r.parent;if(e.schema.getBlockElements()[a.name]&&e.settings.pagebreak_split_block){a.type=3,a.value=n,a.raw=!0,r.remove();continue}r.type=3,r.value=n,r.raw=!0}})})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/paste/plugin.min.js b/core/media/editors/tinymce/plugins/paste/plugin.min.js
new file mode 100644
index 00000000..fa4aa3b7
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/paste/plugin.min.js
@@ -0,0 +1 @@
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],o=0;o<e.length;++o){if(n=a[e[o]]||i(e[o]),!n)throw"module definition dependecy not found: "+e[o];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){a[e]=i.apply(null,arguments)})}function i(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function o(n){var r,i,o,s,l;for(r=0;r<n.length;r++){i=e,o=n[r],s=o.split(/[.\/]/);for(var c=0;c<s.length-1;++c)i[s[c]]===t&&(i[s[c]]={}),i=i[s[c]];i[s[s.length-1]]=a[o]}if(e.AMDLC_TESTS){l=e.privateModules||{};for(o in a)l[o]=a[o];for(r=0;r<n.length;r++)delete l[n[r]];e.privateModules=l}}var a={};r("tinymce/pasteplugin/Utils",["tinymce/util/Tools","tinymce/html/DomParser","tinymce/html/Schema"],function(e,t,n){function r(t,n){return e.each(n,function(e){t=e.constructor==RegExp?t.replace(e,""):t.replace(e[0],e[1])}),t}function i(i){function o(e){var t=e.name,n=e;if("br"===t)return void(l+="\n");if(c[t]&&(l+=" "),u[t])return void(l+=" ");if(3==e.type&&(l+=e.value),!e.shortEnded&&(e=e.firstChild))do o(e);while(e=e.next);d[t]&&n.next&&(l+="\n","p"==t&&(l+="\n"))}var a=new n,s=new t({},a),l="",c=a.getShortEndedElements(),u=e.makeMap("script noscript style textarea video audio iframe object"," "),d=a.getBlockElements();return i=r(i,[/<!\[[^\]]+\]>/g]),o(s.parse(i)),l}function o(e){function t(e,t,n){return t||n?"\xa0":" "}return e=r(s(e),[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,t],/<br class="Apple-interchange-newline">/g,/<br>$/i])}function a(e){var t=0;return function(){return e+t++}}var s=function(e){var t="<!--StartFragment-->",n="<!--EndFragment-->",r=e.indexOf(t);if(r!==-1){var i=e.substr(r+t.length),o=i.indexOf(n);if(o!==-1&&/^<\/(p|h[1-6]|li)>/i.test(i.substr(o+n.length,5)))return i.substr(0,o)}return e},l=function(){return navigator.userAgent.indexOf(" Edge/")!==-1};return{filter:r,innerText:i,trimHtml:o,createIdGenerator:a,isMsEdge:l}}),r("tinymce/pasteplugin/SmartPaste",["tinymce/util/Tools"],function(e){var t=function(e){return/^https?:\/\/[\w\?\-\/+=.&%@~#]+$/i.test(e)},n=function(e){return t(e)&&/.(gif|jpe?g|png)$/.test(e)},r=function(e,t,n){return e.undoManager.extra(function(){n(e,t)},function(){e.insertContent('<img src="'+t+'">')}),!0},i=function(e,t,n){return e.undoManager.extra(function(){n(e,t)},function(){e.execCommand("mceInsertLink",!1,t)}),!0},o=function(e,n,r){return!(e.selection.isCollapsed()!==!1||!t(n))&&i(e,n,r)},a=function(e,t,i){return!!n(t)&&r(e,t,i)},s=function(e,t){return e.insertContent(t,{merge:e.settings.paste_merge_formats!==!1,paste:!0}),!0},l=function(t,n){e.each([o,a,s],function(e){return e(t,n,s)!==!0})},c=function(e,t){e.settings.smart_paste===!1?s(e,t):l(e,t)};return{isImageUrl:n,isAbsoluteUrl:t,insertContent:c}}),r("tinymce/pasteplugin/Clipboard",["tinymce/Env","tinymce/dom/RangeUtils","tinymce/util/VK","tinymce/util/Tools","tinymce/pasteplugin/Utils","tinymce/pasteplugin/SmartPaste","tinymce/util/Delay"],function(e,t,n,r,i,o,a){return function(s){function l(e){var t,n=s.dom;if(t=s.fire("BeforePastePreProcess",{content:e}),t=s.fire("PastePreProcess",t),e=t.content,!t.isDefaultPrevented()){if(s.hasEventListeners("PastePostProcess")&&!t.isDefaultPrevented()){var r=n.add(s.getBody(),"div",{style:"display:none"},e);t=s.fire("PastePostProcess",{node:r}),n.remove(r),e=t.node.innerHTML}t.isDefaultPrevented()||o.insertContent(s,e)}}function c(e){e=s.dom.encode(e).replace(/\r\n/g,"\n");var t,n=s.dom.getParent(s.selection.getStart(),s.dom.isBlock),r=s.settings.forced_root_block;r&&(t=s.dom.createHTML(r,s.settings.forced_root_block_attrs),t=t.substr(0,t.length-3)+">"),n&&/^(PRE|DIV)$/.test(n.nodeName)||!r?e=i.filter(e,[[/\n/g,"<br>"]]):(e=i.filter(e,[[/\n\n/g,"</p>"+t],[/^(.*<\/p>)(<p>)$/,t+"$1"],[/\n/g,"<br />"]]),e.indexOf("<p>")!=-1&&(e=t+e)),l(e)}function u(){function t(e){var t,n,i,o=e.startContainer;if(t=e.getClientRects(),t.length)return t[0];if(e.collapsed&&1==o.nodeType){for(i=o.childNodes[_.startOffset];i&&3==i.nodeType&&!i.data.length;)i=i.nextSibling;if(i)return"BR"==i.tagName&&(n=r.doc.createTextNode("\ufeff"),i.parentNode.insertBefore(n,i),e=r.createRng(),e.setStartBefore(n),e.setEndAfter(n),t=e.getClientRects(),r.remove(n)),t.length?t[0]:void 0}}var n,r=s.dom,i=s.getBody(),o=s.dom.getViewPort(s.getWin()),a=o.y,l=20;if(_=s.selection.getRng(),s.inline&&(n=s.selection.getScrollContainer(),n&&n.scrollTop>0&&(a=n.scrollTop)),_.getClientRects){var c=t(_);if(c)l=a+(c.top-r.getPos(i).y);else{l=a;var u=_.startContainer;u&&(3==u.nodeType&&u.parentNode!=i&&(u=u.parentNode),1==u.nodeType&&(l=r.getPos(u,n||i).y))}}S=r.add(s.getBody(),"div",{id:"mcepastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: absolute; top: "+l+"px;width: 10px; height: 10px; overflow: hidden; opacity: 0"},B),(e.ie||e.gecko)&&r.setStyle(S,"left","rtl"==r.getStyle(i,"direction",!0)?65535:-65535),r.bind(S,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),S.focus(),s.selection.select(S,!0)}function d(){if(S){for(var e;e=s.dom.get("mcepastebin");)s.dom.remove(e),s.dom.unbind(e);_&&s.selection.setRng(_)}S=_=null}function f(){var e,t,n,r,i="";for(e=s.dom.select("div[id=mcepastebin]"),t=0;t<e.length;t++)n=e[t],n.firstChild&&"mcepastebin"==n.firstChild.id&&(n=n.firstChild),r=n.innerHTML,i!=B&&(i+=r);return i}function p(e){var t={};if(e){if(e.getData){var n=e.getData("Text");n&&n.length>0&&n.indexOf(P)==-1&&(t["text/plain"]=n)}if(e.types)for(var r=0;r<e.types.length;r++){var i=e.types[r];t[i]=e.getData(i)}}return t}function m(e){var t=p(e.clipboardData||s.getDoc().dataTransfer);return i.isMsEdge()?r.extend(t,{"text/html":""}):t}function g(e){return w(e,"text/html")||w(e,"text/plain")}function h(e){var t;return t=e.indexOf(","),t!==-1?e.substr(t+1):null}function v(e,t){return!e.images_dataimg_filter||e.images_dataimg_filter(t)}function b(e,t,n){e&&(s.selection.setRng(e),e=null);var r=t.result,i=h(r),o=new Image;if(o.src=r,v(s.settings,o)){var a,c,u=s.editorUpload.blobCache;c=u.findFirst(function(e){return e.base64()===i}),c?a=c:(a=u.create(D(),n,i),u.add(a)),l('<img src="'+a.blobUri()+'">')}else l('<img src="'+r+'">')}function y(e,t){function n(n){var r,i,o,a=!1;if(n)for(r=0;r<n.length;r++)if(i=n[r],/^image\/(jpeg|png|gif|bmp)$/.test(i.type)){var s=i.getAsFile?i.getAsFile():i;o=new FileReader,o.onload=b.bind(null,t,o,s),o.readAsDataURL(s),e.preventDefault(),a=!0}return a}var r=e.clipboardData||e.dataTransfer;if(s.settings.paste_data_images&&r)return n(r.items)||n(r.files)}function x(e){var t=e.clipboardData;return navigator.userAgent.indexOf("Android")!=-1&&t&&t.items&&0===t.items.length}function C(e){return t.getCaretRangeFromPoint(e.clientX,e.clientY,s.getDoc())}function w(e,t){return t in e&&e[t].length>0}function N(e){return n.metaKeyPressed(e)&&86==e.keyCode||e.shiftKey&&45==e.keyCode}function k(){function t(e,t,n){var r;return w(e,"text/html")?r=e["text/html"]:(r=f(),r==B&&(n=!0)),r=i.trimHtml(r),S&&S.firstChild&&"mcepastebin"===S.firstChild.id&&(n=!0),d(),r.length||(n=!0),n&&(r=w(e,"text/plain")&&r.indexOf("</p>")==-1?e["text/plain"]:i.innerText(r)),r==B?void(t||s.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents.")):void(n?c(r):l(r))}function n(e){var t=e["text/plain"];return!!t&&0===t.indexOf("file://")}s.on("keydown",function(t){function n(e){N(e)&&!e.isDefaultPrevented()&&d()}if(N(t)&&!t.isDefaultPrevented()){if(E=t.shiftKey&&86==t.keyCode,E&&e.webkit&&navigator.userAgent.indexOf("Version/")!=-1)return;if(t.stopImmediatePropagation(),R=(new Date).getTime(),e.ie&&E)return t.preventDefault(),void s.fire("paste",{ieFake:!0});d(),u(),s.once("keyup",n),s.once("paste",function(){s.off("keyup",n)})}});var r=function(){return _||s.selection.getRng()};s.on("paste",function(n){var i=(new Date).getTime(),o=m(n),l=(new Date).getTime()-i,c=(new Date).getTime()-R-l<1e3,p="text"==T.pasteFormat||E;return E=!1,n.isDefaultPrevented()||x(n)?void d():!g(o)&&y(n,r())?void d():(c||n.preventDefault(),!e.ie||c&&!n.ieFake||(u(),s.dom.bind(S,"paste",function(e){e.stopPropagation()}),s.getDoc().execCommand("Paste",!1,null),o["text/html"]=f()),void(w(o,"text/html")?(n.preventDefault(),t(o,c,p)):a.setEditorTimeout(s,function(){t(o,c,p)},0)))}),s.on("dragstart dragend",function(e){A="dragstart"==e.type}),s.on("drop",function(e){var t,r;if(r=C(e),!e.isDefaultPrevented()&&!A&&(t=p(e.dataTransfer),(g(t)&&!n(t)||!y(e,r))&&r&&s.settings.paste_filter_drop!==!1)){var o=t["mce-internal"]||t["text/html"]||t["text/plain"];o&&(e.preventDefault(),a.setEditorTimeout(s,function(){s.undoManager.transact(function(){t["mce-internal"]&&s.execCommand("Delete"),s.selection.setRng(r),o=i.trimHtml(o),t["text/html"]?l(o):c(o)})}))}}),s.on("dragover dragend",function(e){s.settings.paste_data_images&&e.preventDefault()})}var S,_,E,T=this,R=0,A=!1,B="%MCEPASTEBIN%",P="data:text/mce-internal,",D=i.createIdGenerator("mceclip");T.pasteHtml=l,T.pasteText=c,T.pasteImageData=y,s.on("preInit",function(){k(),s.parser.addNodeFilter("img",function(t,n,r){function i(e){return e.data&&e.data.paste===!0}function o(t){t.attr("data-mce-object")||u===e.transparentSrc||t.remove()}function a(e){return 0===e.indexOf("webkit-fake-url")}function l(e){return 0===e.indexOf("data:")}if(!s.settings.paste_data_images&&i(r))for(var c=t.length;c--;){var u=t[c].attributes.map.src;u&&(a(u)?o(t[c]):!s.settings.allow_html_data_urls&&l(u)&&o(t[c]))}})})}}),r("tinymce/pasteplugin/WordFilter",["tinymce/util/Tools","tinymce/html/DomParser","tinymce/html/Schema","tinymce/html/Serializer","tinymce/html/Node","tinymce/pasteplugin/Utils"],function(e,t,n,r,i,o){function a(e){return/<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(e)||/class="OutlineElement/.test(e)||/id="?docs\-internal\-guid\-/.test(e)}function s(t){var n,r;return r=[/^[IVXLMCD]{1,2}\.[ \u00a0]/,/^[ivxlmcd]{1,2}\.[ \u00a0]/,/^[a-z]{1,2}[\.\)][ \u00a0]/,/^[A-Z]{1,2}[\.\)][ \u00a0]/,/^[0-9]+\.[ \u00a0]/,/^[\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d]+\.[ \u00a0]/,/^[\u58f1\u5f10\u53c2\u56db\u4f0d\u516d\u4e03\u516b\u4e5d\u62fe]+\.[ \u00a0]/],t=t.replace(/^[\u00a0 ]+/,""),e.each(r,function(e){if(e.test(t))return n=!0,!1}),n}function l(e){return/^[\s\u00a0]*[\u2022\u00b7\u00a7\u25CF]\s*/.test(e)}function c(c){var u=c.settings;c.on("BeforePastePreProcess",function(d){function f(e){function t(e){var n="";if(3===e.type)return e.value;if(e=e.firstChild)do n+=t(e);while(e=e.next);return n}function n(e,t){if(3===e.type&&t.test(e.value))return e.value=e.value.replace(t,""),!1;if(e=e.firstChild)do if(!n(e,t))return!1;while(e=e.next);return!0}function r(e){if(e._listIgnore)return void e.remove();if(e=e.firstChild)do r(e);while(e=e.next)}function o(e,t,o){var s=e._listLevel||u;s!=u&&(s<u?a&&(a=a.parent.parent):(c=a,a=null)),a&&a.name==t?a.append(e):(c=c||a,a=new i(t,1),o>1&&a.attr("start",""+o),e.wrap(a)),e.name="li",s>u&&c&&c.lastChild.append(a),u=s,r(e),n(e,/^\u00a0+/),n(e,/^\s*([\u2022\u00b7\u00a7\u25CF]|\w+\.)/),n(e,/^\u00a0+/)}for(var a,c,u=1,d=[],f=e.firstChild;"undefined"!=typeof f&&null!==f;)if(d.push(f),f=f.walk(),null!==f)for(;"undefined"!=typeof f&&f.parent!==e;)f=f.walk();for(var p=0;p<d.length;p++)if(e=d[p],"p"==e.name&&e.firstChild){var m=t(e);if(l(m)){o(e,"ul");continue}if(s(m)){var g=/([0-9]+)\./.exec(m),h=1;g&&(h=parseInt(g[1],10)),o(e,"ol",h);continue}if(e._listLevel){o(e,"ul",1);continue}a=null}else c=a,a=null}function p(t,n){var r,o={},a=c.dom.parseStyle(n);return e.each(a,function(e,i){switch(i){case"mso-list":r=/\w+ \w+([0-9]+)/i.exec(n),r&&(t._listLevel=parseInt(r[1],10)),/Ignore/i.test(e)&&t.firstChild&&(t._listIgnore=!0,t.firstChild._listIgnore=!0);break;case"horiz-align":i="text-align";break;case"vert-align":i="vertical-align";break;case"font-color":case"mso-foreground":i="color";break;case"mso-background":case"mso-highlight":i="background";break;case"font-weight":case"font-style":return void("normal"!=e&&(o[i]=e));case"mso-element":if(/^(comment|comment-list)$/i.test(e))return void t.remove()}return 0===i.indexOf("mso-comment")?void t.remove():void(0!==i.indexOf("mso-")&&("all"==m||g&&g[i])&&(o[i]=e))}),/(bold)/i.test(o["font-weight"])&&(delete o["font-weight"],t.wrap(new i("b",1))),/(italic)/i.test(o["font-style"])&&(delete o["font-style"],t.wrap(new i("i",1))),o=c.dom.serializeStyle(o,t.name),o?o:null}var m,g,h=d.content;if(h=h.replace(/<b[^>]+id="?docs-internal-[^>]*>/gi,""),h=h.replace(/<br class="?Apple-interchange-newline"?>/gi,""),m=u.paste_retain_style_properties,m&&(g=e.makeMap(m.split(/[, ]/))),u.paste_enable_default_filters!==!1&&a(d.content)){d.wordContent=!0,h=o.filter(h,[/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(e,t){return t.length>0?t.replace(/./," ").slice(Math.floor(t.length/2)).split("").join("\xa0"):""}]]);var v=u.paste_word_valid_elements;v||(v="-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody");var b=new n({valid_elements:v,valid_children:"-li[p]"});e.each(b.elements,function(e){e.attributes["class"]||(e.attributes["class"]={},e.attributesOrder.push("class")),e.attributes.style||(e.attributes.style={},e.attributesOrder.push("style"))});var y=new t({},b);y.addAttributeFilter("style",function(e){for(var t,n=e.length;n--;)t=e[n],t.attr("style",p(t,t.attr("style"))),"span"==t.name&&t.parent&&!t.attributes.length&&t.unwrap()}),y.addAttributeFilter("class",function(e){for(var t,n,r=e.length;r--;)t=e[r],n=t.attr("class"),/^(MsoCommentReference|MsoCommentText|msoDel)$/i.test(n)&&t.remove(),t.attr("class",null)}),y.addNodeFilter("del",function(e){for(var t=e.length;t--;)e[t].remove()}),y.addNodeFilter("a",function(e){for(var t,n,r,i=e.length;i--;)if(t=e[i],n=t.attr("href"),r=t.attr("name"),n&&n.indexOf("#_msocom_")!=-1)t.remove();else if(n&&0===n.indexOf("file://")&&(n=n.split("#")[1],n&&(n="#"+n)),n||r){if(r&&!/^_?(?:toc|edn|ftn)/i.test(r)){t.unwrap();continue}t.attr({href:n,name:r})}else t.unwrap()});var x=y.parse(h);u.paste_convert_word_fake_lists!==!1&&f(x),d.content=new r({validate:u.validate},b).serialize(x)}})}return c.isWordContent=a,c}),r("tinymce/pasteplugin/Quirks",["tinymce/Env","tinymce/util/Tools","tinymce/pasteplugin/WordFilter","tinymce/pasteplugin/Utils"],function(e,t,n,r){return function(i){function o(e){i.on("BeforePastePreProcess",function(t){t.content=e(t.content)})}function a(e){i.on("PastePostProcess",function(t){e(t.node)})}function s(e){if(!n.isWordContent(e))return e;var o=[];t.each(i.schema.getBlockElements(),function(e,t){o.push(t)});var a=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+o.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g");return e=r.filter(e,[[a,"$1"]]),e=r.filter(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}function l(e){if(n.isWordContent(e))return e;var t=i.settings.paste_webkit_styles;if(i.settings.paste_remove_styles_if_webkit===!1||"all"==t)return e;if(t&&(t=t.split(/[, ]/)),t){var r=i.dom,o=i.selection.getNode();e=e.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,function(e,n,i,a){var s=r.parseStyle(i,"span"),l={};if("none"===t)return n+a;for(var c=0;c<t.length;c++){var u=s[t[c]],d=r.getStyle(o,t[c],!0);/color/.test(t[c])&&(u=r.toHex(u),d=r.toHex(d)),d!=u&&(l[t[c]]=u)}return l=r.serializeStyle(l,"span"),l?n+' style="'+l+'"'+a:n+a})}else e=e.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return e=e.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,function(e,t,n,r){return t+' style="'+n+'"'+r})}function c(e){i.$("a",e).find("font,u").each(function(e,t){i.dom.remove(t,!0)})}e.webkit&&o(l),e.ie&&(o(s),a(c))}}),r("tinymce/pasteplugin/Plugin",["tinymce/PluginManager","tinymce/pasteplugin/Clipboard","tinymce/pasteplugin/WordFilter","tinymce/pasteplugin/Quirks"],function(e,t,n,r){var i;e.add("paste",function(o){function a(){return i||o.settings.paste_plaintext_inform===!1}function s(){if("text"==c.pasteFormat)c.pasteFormat="html",o.fire("PastePlainTextToggle",{state:!1});else if(c.pasteFormat="text",o.fire("PastePlainTextToggle",{state:!0}),!a()){var e=o.translate("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.");o.notificationManager.open({text:e,type:"info"}),i=!0}o.focus()}function l(){var e=this;e.active("text"===c.pasteFormat),o.on("PastePlainTextToggle",function(t){e.active(t.state)})}var c,u=this,d=o.settings;return/(^|[ ,])powerpaste([, ]|$)/.test(d.plugins)&&e.get("powerpaste")?void("undefined"!=typeof console&&console.log&&console.log("PowerPaste is incompatible with Paste plugin! Remove 'paste' from the 'plugins' option.")):(u.clipboard=c=new t(o),u.quirks=new r(o),u.wordFilter=new n(o),o.settings.paste_as_text&&(u.clipboard.pasteFormat="text"),d.paste_preprocess&&o.on("PastePreProcess",function(e){d.paste_preprocess.call(u,u,e)}),d.paste_postprocess&&o.on("PastePostProcess",function(e){d.paste_postprocess.call(u,u,e)}),o.addCommand("mceInsertClipboardContent",function(e,t){t.content&&u.clipboard.pasteHtml(t.content),t.text&&u.clipboard.pasteText(t.text)}),o.settings.paste_block_drop&&o.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),o.settings.paste_data_images||o.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()}),o.addCommand("mceTogglePlainTextPaste",s),o.addButton("pastetext",{icon:"pastetext",tooltip:"Paste as text",onclick:s,onPostRender:l}),void o.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:c.pasteFormat,onclick:s,onPostRender:l}))})}),o(["tinymce/pasteplugin/Utils"])}(window);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/preview/plugin.min.js b/core/media/editors/tinymce/plugins/preview/plugin.min.js
new file mode 100644
index 00000000..e02103b4
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/preview/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("preview",function(e){var t=e.settings,n=!tinymce.Env.ie;e.addCommand("mcePreview",function(){e.windowManager.open({title:"Preview",width:parseInt(e.getParam("plugin_preview_width","650"),10),height:parseInt(e.getParam("plugin_preview_height","500"),10),html:'<iframe src="javascript:\'\'" frameborder="0"'+(n?' sandbox="allow-scripts"':"")+"></iframe>",buttons:{text:"Close",onclick:function(){this.parent().parent().close()}},onPostRender:function(){var r,i="";i+='<base href="'+e.documentBaseURI.getURI()+'">',tinymce.each(e.contentCSS,function(t){i+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'});var o=t.body_id||"tinymce";o.indexOf("=")!=-1&&(o=e.getParam("body_id","","hash"),o=o[e.id]||o);var a=t.body_class||"";a.indexOf("=")!=-1&&(a=e.getParam("body_class","","hash"),a=a[e.id]||"");var s='<script>document.addEventListener && document.addEventListener("click", function(e) {for (var elm = e.target; elm; elm = elm.parentNode) {if (elm.nodeName === "A") {e.preventDefault();}}}, false);</script> ',l=e.settings.directionality?' dir="'+e.settings.directionality+'"':"";if(r="<!DOCTYPE html><html><head>"+i+'</head><body id="'+o+'" class="mce-content-body '+a+'"'+l+">"+e.getContent()+s+"</body></html>",n)this.getEl("body").firstChild.src="data:text/html;charset=utf-8,"+encodeURIComponent(r);else{var c=this.getEl("body").firstChild.contentWindow.document;c.open(),c.write(r),c.close()}}})}),e.addButton("preview",{title:"Preview",cmd:"mcePreview"}),e.addMenuItem("preview",{text:"Preview",cmd:"mcePreview",context:"view"})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/print/plugin.min.js b/core/media/editors/tinymce/plugins/print/plugin.min.js
new file mode 100644
index 00000000..9f58535b
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/print/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("print",function(e){e.addCommand("mcePrint",function(){e.getWin().print()}),e.addButton("print",{title:"Print",cmd:"mcePrint"}),e.addShortcut("Meta+P","","mcePrint"),e.addMenuItem("print",{text:"Print",cmd:"mcePrint",icon:"print",shortcut:"Meta+P",context:"file"})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/save/plugin.min.js b/core/media/editors/tinymce/plugins/save/plugin.min.js
new file mode 100644
index 00000000..7893bbc2
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/save/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("save",function(e){function t(){var t;if(t=tinymce.DOM.getParent(e.id,"form"),!e.getParam("save_enablewhendirty",!0)||e.isDirty())return tinymce.triggerSave(),e.getParam("save_onsavecallback")?(e.execCallback("save_onsavecallback",e),void e.nodeChanged()):void(t?(e.setDirty(!1),t.onsubmit&&!t.onsubmit()||("function"==typeof t.submit?t.submit():n(e.translate("Error: Form submit field collision."))),e.nodeChanged()):n(e.translate("Error: No form element found.")))}function n(t){e.notificationManager.open({text:t,type:"error"})}function r(){var t=tinymce.trim(e.startContent);return e.getParam("save_oncancelcallback")?void e.execCallback("save_oncancelcallback",e):(e.setContent(t),e.undoManager.clear(),void e.nodeChanged())}function i(){var t=this;e.on("nodeChange dirty",function(){t.disabled(e.getParam("save_enablewhendirty",!0)&&!e.isDirty())})}e.addCommand("mceSave",t),e.addCommand("mceCancel",r),e.addButton("save",{icon:"save",text:"Save",cmd:"mceSave",disabled:!0,onPostRender:i}),e.addButton("cancel",{text:"Cancel",icon:!1,cmd:"mceCancel",disabled:!0,onPostRender:i}),e.addShortcut("Meta+S","","mceSave")});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/searchreplace/plugin.min.js b/core/media/editors/tinymce/plugins/searchreplace/plugin.min.js
new file mode 100644
index 00000000..7ec3f86e
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/searchreplace/plugin.min.js
@@ -0,0 +1 @@
+!function(){function e(e){return e&&1==e.nodeType&&"false"===e.contentEditable}function t(t,n,r,i,o){function a(e,t){if(t=t||0,!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var n=e.index;if(t>0){var r=e[t];if(!r)throw"Invalid capture group";n+=e[0].indexOf(r),e[0]=r}return[n,n+e[0].length,[e[0]]]}function s(t){var n;if(3===t.nodeType)return t.data;if(m[t.nodeName]&&!p[t.nodeName])return"";if(n="",e(t))return"\n";if((p[t.nodeName]||g[t.nodeName])&&(n+="\n"),t=t.firstChild)do n+=s(t);while(t=t.nextSibling);return n}function l(t,n,r){var i,o,a,s,l=[],c=0,u=t,d=n.shift(),f=0;e:for(;;){if((p[u.nodeName]||g[u.nodeName]||e(u))&&c++,3===u.nodeType&&(!o&&u.length+c>=d[1]?(o=u,s=d[1]-c):i&&l.push(u),!i&&u.length+c>d[0]&&(i=u,a=d[0]-c),c+=u.length),i&&o){if(u=r({startNode:i,startNodeIndex:a,endNode:o,endNodeIndex:s,innerNodes:l,match:d[2],matchIndex:f}),c-=o.length-s,i=null,o=null,l=[],d=n.shift(),f++,!d)break}else if(m[u.nodeName]&&!p[u.nodeName]||!u.firstChild){if(u.nextSibling){u=u.nextSibling;continue}}else if(!e(u)){u=u.firstChild;continue}for(;;){if(u.nextSibling){u=u.nextSibling;break}if(u.parentNode===t)break e;u=u.parentNode}}}function c(e){var t;if("function"!=typeof e){var n=e.nodeType?e:f.createElement(e);t=function(e,t){var r=n.cloneNode(!1);return r.setAttribute("data-mce-index",t),e&&r.appendChild(f.createTextNode(e)),r}}else t=e;return function(e){var n,r,i,o=e.startNode,a=e.endNode,s=e.matchIndex;if(o===a){var l=o;i=l.parentNode,e.startNodeIndex>0&&(n=f.createTextNode(l.data.substring(0,e.startNodeIndex)),i.insertBefore(n,l));var c=t(e.match[0],s);return i.insertBefore(c,l),e.endNodeIndex<l.length&&(r=f.createTextNode(l.data.substring(e.endNodeIndex)),i.insertBefore(r,l)),l.parentNode.removeChild(l),c}n=f.createTextNode(o.data.substring(0,e.startNodeIndex)),r=f.createTextNode(a.data.substring(e.endNodeIndex));for(var u=t(o.data.substring(e.startNodeIndex),s),d=[],p=0,m=e.innerNodes.length;p<m;++p){var g=e.innerNodes[p],h=t(g.data,s);g.parentNode.replaceChild(h,g),d.push(h)}var v=t(a.data.substring(0,e.endNodeIndex),s);return i=o.parentNode,i.insertBefore(n,o),i.insertBefore(u,o),i.removeChild(o),i=a.parentNode,i.insertBefore(v,a),i.insertBefore(r,a),i.removeChild(a),v}}var u,d,f,p,m,g,h=[],v=0;if(f=n.ownerDocument,p=o.getBlockElements(),m=o.getWhiteSpaceElements(),g=o.getShortEndedElements(),d=s(n)){if(t.global)for(;u=t.exec(d);)h.push(a(u,i));else u=d.match(t),h.push(a(u,i));return h.length&&(v=h.length,l(n,h,c(r))),v}}function n(e){function n(){function t(){o.statusbar.find("#next").disabled(!a(d+1).length),o.statusbar.find("#prev").disabled(!a(d-1).length)}function n(){e.windowManager.alert("Could not find the specified string.",function(){o.find("#find")[0].focus()})}var r,i={};r=tinymce.trim(e.selection.getContent({format:"text"}));var o=e.windowManager.open({layout:"flex",pack:"center",align:"center",onClose:function(){e.focus(),u.done()},onSubmit:function(e){var r,s,l,c;return e.preventDefault(),s=o.find("#case").checked(),c=o.find("#words").checked(),l=o.find("#find").value(),l.length?i.text==l&&i.caseState==s&&i.wholeWord==c?0===a(d+1).length?void n():(u.next(),void t()):(r=u.find(l,s,c),r||n(),o.statusbar.items().slice(1).disabled(0===r),t(),void(i={text:l,caseState:s,wholeWord:c})):(u.done(!1),void o.statusbar.items().slice(1).disabled(!0))},buttons:[{text:"Find",subtype:"primary",onclick:function(){o.submit()}},{text:"Replace",disabled:!0,onclick:function(){u.replace(o.find("#replace").value())||(o.statusbar.items().slice(1).disabled(!0),d=-1,i={})}},{text:"Replace all",disabled:!0,onclick:function(){u.replace(o.find("#replace").value(),!0,!0),o.statusbar.items().slice(1).disabled(!0),i={}}},{type:"spacer",flex:1},{text:"Prev",name:"prev",disabled:!0,onclick:function(){u.prev(),t()}},{text:"Next",name:"next",disabled:!0,onclick:function(){u.next(),t()}}],title:"Find and replace",items:{type:"form",padding:20,labelGap:30,spacing:10,items:[{type:"textbox",name:"find",size:40,label:"Find",value:r},{type:"textbox",name:"replace",size:40,label:"Replace with"},{type:"checkbox",name:"case",text:"Match case",label:" "},{type:"checkbox",name:"words",text:"Whole words",label:" "}]}})}function r(e){var t=e.getAttribute("data-mce-index");return"number"==typeof t?""+t:t}function i(n){var r,i;return i=e.dom.create("span",{"data-mce-bogus":1}),i.className="mce-match-marker",r=e.getBody(),u.done(!1),t(n,r,i,!1,e.schema)}function o(e){var t=e.parentNode;e.firstChild&&t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function a(t){var n,i=[];if(n=tinymce.toArray(e.getBody().getElementsByTagName("span")),n.length)for(var o=0;o<n.length;o++){var a=r(n[o]);null!==a&&a.length&&a===t.toString()&&i.push(n[o])}return i}function s(t){var n=d,r=e.dom;t=t!==!1,t?n++:n--,r.removeClass(a(d),"mce-match-marker-selected");var i=a(n);return i.length?(r.addClass(a(n),"mce-match-marker-selected"),e.selection.scrollIntoView(i[0]),n):-1}function l(t){var n=e.dom,r=t.parentNode;n.remove(t),n.isEmpty(r)&&n.remove(r)}function c(e){var t=r(e);return null!==t&&t.length>0}var u=this,d=-1;u.init=function(e){e.addMenuItem("searchreplace",{text:"Find and replace",shortcut:"Meta+F",onclick:n,separator:"before",context:"edit"}),e.addButton("searchreplace",{tooltip:"Find and replace",shortcut:"Meta+F",onclick:n}),e.addCommand("SearchReplace",n),e.shortcuts.add("Meta+F","",n)},u.find=function(e,t,n){e=e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),e=n?"\\b"+e+"\\b":e;var r=i(new RegExp(e,t?"g":"gi"));return r&&(d=-1,d=s(!0)),r},u.next=function(){var e=s(!0);e!==-1&&(d=e)},u.prev=function(){var e=s(!1);e!==-1&&(d=e)},u.replace=function(t,n,i){var s,f,p,m,g,h,v=d;for(n=n!==!1,p=e.getBody(),f=tinymce.grep(tinymce.toArray(p.getElementsByTagName("span")),c),s=0;s<f.length;s++){var b=r(f[s]);if(m=g=parseInt(b,10),i||m===d){for(t.length?(f[s].firstChild.nodeValue=t,o(f[s])):l(f[s]);f[++s];){if(m=parseInt(r(f[s]),10),m!==g){s--;break}l(f[s])}n&&v--}else g>d&&f[s].setAttribute("data-mce-index",g-1)}return e.undoManager.add(),d=v,n?(h=a(v+1).length>0,u.next()):(h=a(v-1).length>0,u.prev()),!i&&h},u.done=function(t){var n,i,a,s;for(i=tinymce.toArray(e.getBody().getElementsByTagName("span")),n=0;n<i.length;n++){var l=r(i[n]);null!==l&&l.length&&(l===d.toString()&&(a||(a=i[n].firstChild),s=i[n].firstChild),o(i[n]))}if(a&&s){var c=e.dom.createRng();return c.setStart(a,0),c.setEnd(s,s.data.length),t!==!1&&e.selection.setRng(c),c}}}tinymce.PluginManager.add("searchreplace",n)}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/spellchecker/plugin.min.js b/core/media/editors/tinymce/plugins/spellchecker/plugin.min.js
new file mode 100644
index 00000000..98ae40e5
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/spellchecker/plugin.min.js
@@ -0,0 +1 @@
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],o=0;o<e.length;++o){if(n=a[e[o]]||i(e[o]),!n)throw"module definition dependecy not found: "+e[o];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){a[e]=i.apply(null,arguments)})}function i(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function o(n){var r,i,o,s,l;for(r=0;r<n.length;r++){i=e,o=n[r],s=o.split(/[.\/]/);for(var c=0;c<s.length-1;++c)i[s[c]]===t&&(i[s[c]]={}),i=i[s[c]];i[s[s.length-1]]=a[o]}if(e.AMDLC_TESTS){l=e.privateModules||{};for(o in a)l[o]=a[o];for(r=0;r<n.length;r++)delete l[n[r]];e.privateModules=l}}var a={};r("tinymce/spellcheckerplugin/DomTextMatcher",[],function(){function e(e){return e&&1==e.nodeType&&"false"===e.contentEditable}return function(t,n){function r(e,t){if(!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";return{start:e.index,end:e.index+e[0].length,text:e[0],data:t}}function i(t){var n;if(3===t.nodeType)return t.data;if(k[t.nodeName]&&!N[t.nodeName])return"";if(e(t))return"\n";if(n="",(N[t.nodeName]||S[t.nodeName])&&(n+="\n"),t=t.firstChild)do n+=i(t);while(t=t.nextSibling);return n}function o(t,n,r){var i,o,a,s,l,c=[],u=0,d=t,f=0;n=n.slice(0),n.sort(function(e,t){return e.start-t.start}),l=n.shift();e:for(;;){if((N[d.nodeName]||S[d.nodeName]||e(d))&&u++,3===d.nodeType&&(!o&&d.length+u>=l.end?(o=d,s=l.end-u):i&&c.push(d),!i&&d.length+u>l.start&&(i=d,a=l.start-u),u+=d.length),i&&o){if(d=r({startNode:i,startNodeIndex:a,endNode:o,endNodeIndex:s,innerNodes:c,match:l.text,matchIndex:f}),u-=o.length-s,i=null,o=null,c=[],l=n.shift(),f++,!l)break}else if(k[d.nodeName]&&!N[d.nodeName]||!d.firstChild){if(d.nextSibling){d=d.nextSibling;continue}}else if(!e(d)){d=d.firstChild;continue}for(;;){if(d.nextSibling){d=d.nextSibling;break}if(d.parentNode===t)break e;d=d.parentNode}}}function a(e){function t(t,n){var r=_[n];r.stencil||(r.stencil=e(r));var i=r.stencil.cloneNode(!1);return i.setAttribute("data-mce-index",n),t&&i.appendChild(E.doc.createTextNode(t)),i}return function(e){var n,r,i,o=e.startNode,a=e.endNode,s=e.matchIndex,l=E.doc;if(o===a){var c=o;i=c.parentNode,e.startNodeIndex>0&&(n=l.createTextNode(c.data.substring(0,e.startNodeIndex)),i.insertBefore(n,c));var u=t(e.match,s);return i.insertBefore(u,c),e.endNodeIndex<c.length&&(r=l.createTextNode(c.data.substring(e.endNodeIndex)),i.insertBefore(r,c)),c.parentNode.removeChild(c),u}n=l.createTextNode(o.data.substring(0,e.startNodeIndex)),r=l.createTextNode(a.data.substring(e.endNodeIndex));for(var d=t(o.data.substring(e.startNodeIndex),s),f=[],p=0,m=e.innerNodes.length;p<m;++p){var g=e.innerNodes[p],h=t(g.data,s);g.parentNode.replaceChild(h,g),f.push(h)}var v=t(a.data.substring(0,e.endNodeIndex),s);return i=o.parentNode,i.insertBefore(n,o),i.insertBefore(d,o),i.removeChild(o),i=a.parentNode,i.insertBefore(v,a),i.insertBefore(r,a),i.removeChild(a),v}}function s(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function l(e){var n=t.getElementsByTagName("*"),r=[];e="number"==typeof e?""+e:null;for(var i=0;i<n.length;i++){var o=n[i],a=o.getAttribute("data-mce-index");null!==a&&a.length&&(a!==e&&null!==e||r.push(o))}return r}function c(e){for(var t=_.length;t--;)if(_[t]===e)return t;return-1}function u(e){var t=[];return d(function(n,r){e(n,r)&&t.push(n)}),_=t,this}function d(e){for(var t=0,n=_.length;t<n&&e(_[t],t)!==!1;t++);return this}function f(e){return _.length&&o(t,_,a(e)),this}function p(e,t){if(w&&e.global)for(;C=e.exec(w);)_.push(r(C,t));return this}function m(e){var t,n=l(e?c(e):null);for(t=n.length;t--;)s(n[t]);return this}function g(e){return _[e.getAttribute("data-mce-index")]}function h(e){return l(c(e))[0]}function v(e,t,n){return _.push({start:e,end:e+t,text:w.substr(e,t),data:n}),this}function b(e){var t=l(c(e)),r=n.dom.createRng();return r.setStartBefore(t[0]),r.setEndAfter(t[t.length-1]),r}function y(e,t){var r=b(e);return r.deleteContents(),t.length>0&&r.insertNode(n.dom.doc.createTextNode(t)),r}function x(){return _.splice(0,_.length),m(),this}var C,w,N,k,S,_=[],E=n.dom;return N=n.schema.getBlockElements(),k=n.schema.getWhiteSpaceElements(),S=n.schema.getShortEndedElements(),w=i(t),{text:w,matches:_,each:d,filter:u,reset:x,matchFromElement:g,elementFromMatch:h,find:p,add:v,wrap:f,unwrap:m,replace:y,rangeFromMatch:b,indexOf:c}}}),r("tinymce/spellcheckerplugin/Plugin",["tinymce/spellcheckerplugin/DomTextMatcher","tinymce/PluginManager","tinymce/util/Tools","tinymce/ui/Menu","tinymce/dom/DOMUtils","tinymce/util/XHR","tinymce/util/URI","tinymce/util/JSON"],function(e,t,n,r,i,o,a,s){t.add("spellchecker",function(l,c){function u(){return B.textMatcher||(B.textMatcher=new e(l.getBody(),l)),B.textMatcher}function d(e,t){var r=[];return n.each(t,function(e){r.push({selectable:!0,text:e.name,data:e.value})}),r}function f(e){for(var t in e)return!1;return!0}function p(e,t){var o=[],a=E[e];n.each(a,function(e){o.push({text:e,onclick:function(){l.insertContent(l.dom.encode(e)),l.dom.remove(t),b()}})}),o.push({text:"-"}),A&&o.push({text:"Add to Dictionary",onclick:function(){y(e,t)}}),o.push.apply(o,[{text:"Ignore",onclick:function(){x(e,t)}},{text:"Ignore all",onclick:function(){x(e,t,!0)}}]),R=new r({items:o,context:"contextmenu",onautohide:function(e){e.target.className.indexOf("spellchecker")!=-1&&e.preventDefault()},onhide:function(){R.remove(),R=null}}),R.renderTo(document.body);var s=i.DOM.getPos(l.getContentAreaContainer()),c=l.dom.getPos(t[0]),u=l.dom.getRoot();"BODY"==u.nodeName?(c.x-=u.ownerDocument.documentElement.scrollLeft||u.scrollLeft,c.y-=u.ownerDocument.documentElement.scrollTop||u.scrollTop):(c.x-=u.scrollLeft,c.y-=u.scrollTop),s.x+=c.x,s.y+=c.y,R.moveTo(s.x,s.y+t[0].offsetHeight)}function m(){return l.getParam("spellchecker_wordchar_pattern")||new RegExp('[^\\s!"#$%&()*+,-./:;<=>?@[\\]^_{|}`\xa7\xa9\xab\xae\xb1\xb6\xb7\xb8\xbb\xbc\xbd\xbe\xbf\xd7\xf7\xa4\u201d\u201c\u201e\xa0\u2002\u2003\u2009]+',"g")}function g(e,t,r,i){var u={method:e,lang:P.spellchecker_language},d="";u["addToDictionary"==e?"word":"text"]=t,n.each(u,function(e,t){d&&(d+="&"),d+=t+"="+encodeURIComponent(e)}),o.send({url:new a(c).toAbsolute(P.spellchecker_rpc_url),type:"post",content_type:"application/x-www-form-urlencoded",data:d,success:function(e){if(e=s.parse(e))e.error?i(e.error):r(e);else{var t=l.translate("Server response wasn't proper JSON.");i(t)}},error:function(){var e=l.translate("The spelling service was not found: (")+P.spellchecker_rpc_url+l.translate(")");i(e)}})}function h(e,t,n,r){var i=P.spellchecker_callback||g;i.call(B,e,t,n,r)}function v(){function e(e){l.notificationManager.open({text:e,type:"error"}),l.setProgressState(!1),C()}C()||(l.setProgressState(!0),h("spellcheck",u().text,S,e),l.focus())}function b(){l.dom.select("span.mce-spellchecker-word").length||C()}function y(e,t){l.setProgressState(!0),h("addToDictionary",e,function(){l.setProgressState(!1),l.dom.remove(t,!0),b()},function(e){l.notificationManager.open({text:e,type:"error"}),l.setProgressState(!1)})}function x(e,t,r){l.selection.collapse(),r?n.each(l.dom.select("span.mce-spellchecker-word"),function(t){t.getAttribute("data-mce-word")==e&&l.dom.remove(t,!0)}):l.dom.remove(t,!0),b()}function C(){if(u().reset(),B.textMatcher=null,T)return T=!1,l.fire("SpellcheckEnd"),!0}function w(e){var t=e.getAttribute("data-mce-index");return"number"==typeof t?""+t:t}function N(e){var t,r=[];if(t=n.toArray(l.getBody().getElementsByTagName("span")),t.length)for(var i=0;i<t.length;i++){var o=w(t[i]);null!==o&&o.length&&o===e.toString()&&r.push(t[i])}return r}function k(e){var t=P.spellchecker_language;e.control.items().each(function(e){e.active(e.settings.data===t)})}function S(e){var t;if(e.words?(A=!!e.dictionary,t=e.words):t=e,l.setProgressState(!1),f(t)){var n=l.translate("No misspellings found.");return l.notificationManager.open({text:n,type:"info"}),void(T=!1)}E=t,u().find(m()).filter(function(e){return!!t[e.text]}).wrap(function(e){return l.dom.create("span",{"class":"mce-spellchecker-word","data-mce-bogus":1,"data-mce-word":e.text})}),T=!0,l.fire("SpellcheckStart")}var _,E,T,R,A,B=this,P=l.settings;if(/(^|[ ,])tinymcespellchecker([, ]|$)/.test(P.plugins)&&t.get("tinymcespellchecker"))return void("undefined"!=typeof console&&console.log&&console.log("Spell Checker Pro is incompatible with Spell Checker plugin! Remove 'spellchecker' from the 'plugins' option."));var D=P.spellchecker_languages||"English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr_FR,German=de,Italian=it,Polish=pl,Portuguese=pt_BR,Spanish=es,Swedish=sv";_=d("Language",n.map(D.split(","),function(e){return e=e.split("="),{name:e[0],value:e[1]}})),l.on("click",function(e){var t=e.target;if("mce-spellchecker-word"==t.className){e.preventDefault();var n=N(w(t));if(n.length>0){var r=l.dom.createRng();r.setStartBefore(n[0]),r.setEndAfter(n[n.length-1]),l.selection.setRng(r),p(t.getAttribute("data-mce-word"),n)}}}),l.addMenuItem("spellchecker",{text:"Spellcheck",context:"tools",onclick:v,selectable:!0,onPostRender:function(){var e=this;e.active(T),l.on("SpellcheckStart SpellcheckEnd",function(){e.active(T)})}});var M={tooltip:"Spellcheck",onclick:v,onPostRender:function(){var e=this;l.on("SpellcheckStart SpellcheckEnd",function(){e.active(T)})}};_.length>1&&(M.type="splitbutton",M.menu=_,M.onshow=k,M.onselect=function(e){P.spellchecker_language=e.control.settings.data}),l.addButton("spellchecker",M),l.addCommand("mceSpellCheck",v),l.on("remove",function(){R&&(R.remove(),R=null)}),l.on("change",b),this.getTextMatcher=u,this.getWordCharPattern=m,this.markErrors=S,this.getLanguage=function(){return P.spellchecker_language},P.spellchecker_language=P.spellchecker_language||P.language||"en"})}),o(["tinymce/spellcheckerplugin/DomTextMatcher"])}(window);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/tabfocus/plugin.min.js b/core/media/editors/tinymce/plugins/tabfocus/plugin.min.js
new file mode 100644
index 00000000..d310d0b8
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/tabfocus/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("tabfocus",function(e){function t(e){9!==e.keyCode||e.ctrlKey||e.altKey||e.metaKey||e.preventDefault()}function n(t){function n(n){function o(e){return"BODY"===e.nodeName||"hidden"!=e.type&&"none"!=e.style.display&&"hidden"!=e.style.visibility&&o(e.parentNode)}function l(e){return/INPUT|TEXTAREA|BUTTON/.test(e.tagName)&&tinymce.get(t.id)&&e.tabIndex!=-1&&o(e)}if(s=r.select(":input:enabled,*[tabindex]:not(iframe)"),i(s,function(t,n){if(t.id==e.id)return a=n,!1}),n>0){for(c=a+1;c<s.length;c++)if(l(s[c]))return s[c]}else for(c=a-1;c>=0;c--)if(l(s[c]))return s[c];return null}var a,s,l,c;if(!(9!==t.keyCode||t.ctrlKey||t.altKey||t.metaKey||t.isDefaultPrevented())&&(l=o(e.getParam("tab_focus",e.getParam("tabfocus_elements",":prev,:next"))),1==l.length&&(l[1]=l[0],l[0]=":prev"),s=t.shiftKey?":prev"==l[0]?n(-1):r.get(l[0]):":next"==l[1]?n(1):r.get(l[1]))){var u=tinymce.get(s.id||s.name);s.id&&u?u.focus():tinymce.util.Delay.setTimeout(function(){tinymce.Env.webkit||window.focus(),s.focus()},10),t.preventDefault()}}var r=tinymce.DOM,i=tinymce.each,o=tinymce.explode;e.on("init",function(){e.inline&&tinymce.DOM.setAttrib(e.getBody(),"tabIndex",null),e.on("keyup",t),tinymce.Env.gecko?e.on("keypress keydown",n):e.on("keydown",n)})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/table/plugin.min.js b/core/media/editors/tinymce/plugins/table/plugin.min.js
new file mode 100644
index 00000000..f839dc1b
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/table/plugin.min.js
@@ -0,0 +1,2 @@
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],a=0;a<e.length;++a){if(n=o[e[a]]||i(e[a]),!n)throw"module definition dependecy not found: "+e[a];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){o[e]=i.apply(null,arguments)})}function i(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}var o={};r("tinymce/tableplugin/Utils",["tinymce/Env"],function(e){function t(t){(!e.ie||e.ie>9)&&(t.hasChildNodes()||(t.innerHTML='<br data-mce-bogus="1" />'))}var n=function(e){return function(t,n){t&&(n=parseInt(n,10),1===n||0===n?t.removeAttribute(e,1):t.setAttribute(e,n,1))}},r=function(e){return function(t){return parseInt(t.getAttribute(e)||1,10)}};return{setColSpan:n("colSpan"),setRowSpan:n("rowspan"),getColSpan:r("colSpan"),getRowSpan:r("rowSpan"),setSpanVal:function(e,t,r){n(t)(e,r)},getSpanVal:function(e,t){return r(t)(e)},paddCell:t}}),r("tinymce/tableplugin/SplitCols",["tinymce/util/Tools","tinymce/tableplugin/Utils"],function(e,t){var n=function(e,t,n){return e[n]?e[n][t]:null},r=function(e,t,r){var i=n(e,t,r);return i?i.elm:null},i=function(e,t,i,o){var a,s,l=0,c=r(e,t,i);for(a=i;(o>0?a<e.length:a>=0)&&(s=n(e,t,a),c===s.elm);a+=o)l++;return l},o=function(e,t,n){for(var r,i=e[n],o=t;o<i.length;o++)if(r=i[o],r.real)return r.elm;return null},a=function(e,n){for(var r,o=[],a=e[n],s=0;s<a.length;s++)r=a[s],o.push({elm:r.elm,above:i(e,s,n,-1)-1,below:i(e,s,n,1)-1}),s+=t.getColSpan(r.elm)-1;return o},s=function(e,n){var r=e.elm.ownerDocument,i=r.createElement("td");return t.setColSpan(i,t.getColSpan(e.elm)),t.setRowSpan(i,n),t.paddCell(i),i},l=function(e,t,n,r){var i=o(e,n+1,r);i?i.parentNode.insertBefore(t,i):(i=o(e,0,r),i.parentNode.appendChild(t))},c=function(e,n,r,i){if(0!==n.above){t.setRowSpan(n.elm,n.above);var o=s(n,n.below+1);return l(e,o,r,i),o}return null},u=function(e,n,r,i){if(0!==n.below){t.setRowSpan(n.elm,n.above+1);var o=s(n,n.below);return l(e,o,r,i+1),o}return null},d=function(t,n,i,o){var s=a(t,i),l=r(t,n,i).parentNode,d=[];return e.each(s,function(e,n){var r=o?c(t,e,n,i):u(t,e,n,i);null!==r&&d.push(d)}),{cells:d,row:l}};return{splitAt:d}}),r("tinymce/tableplugin/TableGrid",["tinymce/util/Tools","tinymce/Env","tinymce/tableplugin/Utils","tinymce/tableplugin/SplitCols"],function(e,n,r,i){var o=e.each,a=r.getSpanVal,s=r.setSpanVal;return function(l,c,u){function d(){l.$("td[data-mce-selected],th[data-mce-selected]").removeAttr("data-mce-selected")}function f(e){return e===l.getBody()}function p(t,n){return t?(n=e.map(n.split(","),function(e){return e.toLowerCase()}),e.grep(t.childNodes,function(t){return e.inArray(n,t.nodeName.toLowerCase())!==-1})):[]}function m(){var e=0;Z=[],Q=0,o(["thead","tbody","tfoot"],function(t){var n=p(c,t)[0],r=p(n,"tr");o(r,function(n,r){r+=e,o(p(n,"td,th"),function(e,n){var i,o,s,l;if(Z[r])for(;Z[r][n];)n++;for(s=a(e,"rowspan"),l=a(e,"colspan"),o=r;o<r+s;o++)for(Z[o]||(Z[o]=[]),i=n;i<n+l;i++)Z[o][i]={part:t,real:o==r&&i==n,elm:e,rowspan:s,colspan:l};Q=Math.max(Q,n+1)})}),e+=r.length})}function g(e){return l.fire("newrow",{node:e}),e}function h(e){return l.fire("newcell",{node:e}),e}function v(e,t){return e=e.cloneNode(t),e.removeAttribute("id"),e}function b(e,t){var n;if(n=Z[t])return n[e]}function y(e,t){return e[t]?e[t]:null}function x(e,t){for(var n=[],r=0;r<e.length;r++)n.push(b(t,r));return n}function C(e){return e&&(!!re.getAttrib(e.elm,"data-mce-selected")||e==u)}function w(){var e=[];return o(c.rows,function(t){o(t.cells,function(n){if(re.getAttrib(n,"data-mce-selected")||u&&n==u.elm)return e.push(t),!1})}),e}function N(){var e=0;return o(Z,function(t){if(o(t,function(t){C(t)&&e++}),e)return!1}),e}function k(){var e=re.createRng();f(c)||(e.setStartAfter(c),e.setEndAfter(c),ne.setRng(e),re.remove(c))}function S(t){var i,a={};return l.settings.table_clone_elements!==!1&&(a=e.makeMap((l.settings.table_clone_elements||"strong em b i span font h1 h2 h3 h4 h5 h6 p div").toUpperCase(),/[ ,]/)),e.walk(t,function(e){var r;if(3==e.nodeType)return o(re.getParents(e.parentNode,null,t).reverse(),function(e){a[e.nodeName]&&(e=v(e,!1),i?r&&r.appendChild(e):i=r=e,r=e)}),r&&(r.innerHTML=n.ie&&n.ie<10?"&nbsp;":'<br data-mce-bogus="1" />'),!1},"childNodes"),t=v(t,!1),h(t),s(t,"rowSpan",1),s(t,"colSpan",1),i?t.appendChild(i):r.paddCell(t),t}function _(){var e,t=re.createRng();return o(re.select("tr",c),function(e){0===e.cells.length&&re.remove(e)}),0===re.select("tr",c).length?(t.setStartBefore(c),t.setEndBefore(c),ne.setRng(t),void re.remove(c)):(o(re.select("thead,tbody,tfoot",c),function(e){0===e.rows.length&&re.remove(e)}),m(),void(ee&&(e=Z[Math.min(Z.length-1,ee.y)],e&&(ne.select(e[Math.min(e.length-1,ee.x)].elm,!0),ne.collapse(!0)))))}function E(e,t,n,r){var i,o,a,s,l;for(i=Z[t][e].elm.parentNode,a=1;a<=n;a++)if(i=re.getNext(i,"tr")){for(o=e;o>=0;o--)if(l=Z[t+a][o].elm,l.parentNode==i){for(s=1;s<=r;s++)re.insertAfter(S(l),l);break}if(o==-1)for(s=1;s<=r;s++)i.insertBefore(S(i.cells[0]),i.cells[0])}}function T(){o(Z,function(e,t){o(e,function(e,n){var r,i,o;if(C(e)&&(e=e.elm,r=a(e,"colspan"),i=a(e,"rowspan"),r>1||i>1)){for(s(e,"rowSpan",1),s(e,"colSpan",1),o=0;o<r-1;o++)re.insertAfter(S(e),e);E(n,t,i-1,r)}})})}function R(e,t,n){for(var r=[],i=0;i<e.length;i++)(i<t||i>n)&&r.push(e[i]);return r}function A(t){return e.grep(t,function(e){return e.real===!1})}function B(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].elm;t[t.length-1]!==r&&t.push(r)}return t}function P(t,n,i,o,a){var s=0;if(a-i<1)return 0;for(var l=i+1;l<=a;l++){var c=R(y(t,l),n,o),u=A(c);c.length===u.length&&(e.each(B(u),function(e){r.setRowSpan(e,r.getRowSpan(e)-1)}),s++)}return s}function D(t,n,i,o,a){var s=0;if(o-n<1)return 0;for(var l=n+1;l<=o;l++){var c=R(x(t,l),i,a),u=A(c);c.length===u.length&&(e.each(B(u),function(e){r.setColSpan(e,r.getColSpan(e)-1)}),s++)}return s}function M(t,n,r){var i,a,l,c,u,d,f,p,g,h,v,y,x;if(t?(i=q(t),a=i.x,l=i.y,c=a+(n-1),u=l+(r-1)):(ee=te=null,o(Z,function(e,t){o(e,function(e,n){C(e)&&(ee||(ee={x:n,y:t}),te={x:n,y:t})})}),ee&&(a=ee.x,l=ee.y,c=te.x,u=te.y)),p=b(a,l),g=b(c,u),p&&g&&p.part==g.part){T(),m(),y=P(Z,a,l,c,u),x=D(Z,a,l,c,u),p=b(a,l).elm;var w=c-a-x+1,N=u-l-y+1;for(w===Q&&N===Z.length&&(w=1,N=1),w===Q&&N>1&&(N=1),s(p,"colSpan",w),s(p,"rowSpan",N),f=l;f<=u;f++)for(d=a;d<=c;d++)Z[f]&&Z[f][d]&&(t=Z[f][d].elm,t!=p&&(h=e.grep(t.childNodes),o(h,function(e){p.appendChild(e)}),h.length&&(h=e.grep(p.childNodes),v=0,o(h,function(e){"BR"==e.nodeName&&v++<h.length-1&&p.removeChild(e)})),re.remove(t)));_()}}function L(e){var n,r,i,l,c,u,d,f,p,m;if(o(Z,function(r,i){if(o(r,function(t){if(C(t)&&(t=t.elm,c=t.parentNode,u=g(v(c,!1)),n=i,e))return!1}),e)return n===t}),n!==t){for(l=0,m=0;l<Z[0].length;l+=m)if(Z[n][l]&&(r=Z[n][l].elm,m=a(r,"colspan"),r!=i)){if(e){if(n>0&&Z[n-1][l]&&(f=Z[n-1][l].elm,p=a(f,"rowSpan"),p>1)){s(f,"rowSpan",p+1);continue}}else if(p=a(r,"rowspan"),p>1){s(r,"rowSpan",p+1);continue}d=S(r),s(d,"colSpan",r.colSpan),u.appendChild(d),i=r}u.hasChildNodes()&&(e?c.parentNode.insertBefore(u,c):re.insertAfter(u,c))}}function I(e,t){t=t||w().length||1;for(var n=0;n<t;n++)L(e)}function O(e){var n,r;o(Z,function(r){if(o(r,function(t,r){if(C(t)&&(n=r,e))return!1}),e)return n===t}),o(Z,function(t,i){var o,l,c;t[n]&&(o=t[n].elm,o!=r&&(c=a(o,"colspan"),l=a(o,"rowspan"),1==c?e?(o.parentNode.insertBefore(S(o),o),E(n,i,l-1,c)):(re.insertAfter(S(o),o),E(n,i,l-1,c)):s(o,"colSpan",o.colSpan+1),r=o))})}function H(e,t){t=t||N()||1;for(var n=0;n<t;n++)O(e)}function F(t){return e.grep(z(t),C)}function z(e){var t=[];return o(e,function(e){o(e,function(e){t.push(e)})}),t}function W(){var t=[];if(f(c)){if(1==Z[0].length)return;if(F(Z).length==z(Z).length)return}o(Z,function(n){o(n,function(n,r){C(n)&&e.inArray(t,r)===-1&&(o(Z,function(e){var t,n=e[r].elm;t=a(n,"colSpan"),t>1?s(n,"colSpan",t-1):re.remove(n)}),t.push(r))})}),_()}function U(){function e(e){var t,n;o(e.cells,function(e){var n=a(e,"rowSpan");n>1&&(s(e,"rowSpan",n-1),t=q(e),E(t.x,t.y,1,1))}),t=q(e.cells[0]),o(Z[t.y],function(e){var t;e=e.elm,e!=n&&(t=a(e,"rowSpan"),t<=1?re.remove(e):s(e,"rowSpan",t-1),n=e)})}var t;t=w(),f(c)&&t.length==c.rows.length||(o(t.reverse(),function(t){e(t)}),_())}function V(){var e=w();if(!f(c)||e.length!=c.rows.length)return re.remove(e),_(),e}function $(){var e=w();return o(e,function(t,n){e[n]=v(t,!0)}),e}function j(t,n){var r,a,l;t&&(r=i.splitAt(Z,ee.x,ee.y,n),a=r.row,e.each(r.cells,h),l=e.map(t,function(e){return e.cloneNode(!0)}),n||l.reverse(),o(l,function(e){var t,r,i=e.cells.length;for(g(e),t=0;t<i;t++)r=e.cells[t],h(r),s(r,"colSpan",1),s(r,"rowSpan",1);for(t=i;t<Q;t++)e.appendChild(h(S(e.cells[i-1])));for(t=Q;t<i;t++)re.remove(e.cells[t]);n?a.parentNode.insertBefore(e,a):re.insertAfter(e,a)}),d())}function q(e){var t;return o(Z,function(n,r){return o(n,function(n,i){if(n.elm==e)return t={x:i,y:r},!1}),!t}),t}function Y(e){ee=q(e)}function X(){var e,t;return e=t=0,o(Z,function(n,r){o(n,function(n,i){var o,a;C(n)&&(n=Z[r][i],i>e&&(e=i),r>t&&(t=r),n.real&&(o=n.colspan-1,a=n.rowspan-1,o&&i+o>e&&(e=i+o),a&&r+a>t&&(t=r+a)))})}),{x:e,y:t}}function K(e){var t,n,r,i,o,a,s,l,c,u;if(te=q(e),ee&&te){for(t=Math.min(ee.x,te.x),n=Math.min(ee.y,te.y),r=Math.max(ee.x,te.x),i=Math.max(ee.y,te.y),o=r,a=i,u=n;u<=i;u++)for(c=t;c<=r;c++)e=Z[u][c],e.real&&(s=e.colspan-1,l=e.rowspan-1,s&&c+s>o&&(o=c+s),l&&u+l>a&&(a=u+l));for(d(),u=n;u<=a;u++)for(c=t;c<=o;c++)Z[u][c]&&re.setAttrib(Z[u][c].elm,"data-mce-selected","1")}}function G(e,t){var n,r,i;n=q(e),r=n.y*Q+n.x;do{if(r+=t,i=b(r%Q,Math.floor(r/Q)),!i)break;if(i.elm!=e)return ne.select(i.elm,!0),re.isEmpty(i.elm)&&ne.collapse(!0),!0}while(i.elm==e);return!1}function J(t){if(ee){var n=i.splitAt(Z,ee.x,ee.y,t);e.each(n.cells,h)}}var Z,Q,ee,te,ne=l.selection,re=ne.dom;c=c||re.getParent(ne.getStart(!0),"table"),m(),u=u||re.getParent(ne.getStart(!0),"th,td"),u&&(ee=q(u),te=X(),u=b(ee.x,ee.y)),e.extend(this,{deleteTable:k,split:T,merge:M,insertRow:L,insertRows:I,insertCol:O,insertCols:H,splitCols:J,deleteCols:W,deleteRows:U,cutRows:V,copyRows:$,pasteRows:j,getPos:q,setStartCell:Y,setEndCell:K,moveRelIdx:G,refresh:m})}}),r("tinymce/tableplugin/Quirks",["tinymce/util/VK","tinymce/util/Delay","tinymce/Env","tinymce/util/Tools","tinymce/tableplugin/Utils"],function(e,t,n,r,i){var o=r.each,a=i.getSpanVal;return function(s){function l(){function n(n){function r(e,t){var r=e?"previousSibling":"nextSibling",o=s.dom.getParent(t,"tr"),a=o[r];if(a)return v(s,t,a,e),n.preventDefault(),!0;var l=s.dom.getParent(o,"table"),d=o.parentNode,f=d.nodeName.toLowerCase();if("tbody"===f||f===(e?"tfoot":"thead")){var p=i(e,l,d,"tbody");if(null!==p)return c(e,p,t)}return u(e,o,r,l)}function i(e,t,n,r){var i=s.dom.select(">"+r,t),o=i.indexOf(n);if(e&&0===o||!e&&o===i.length-1)return l(e,t);if(o===-1){var a="thead"===n.tagName.toLowerCase()?0:i.length-1;return i[a]}return i[o+(e?-1:1)]}function l(e,t){var n=e?"thead":"tfoot",r=s.dom.select(">"+n,t);return 0!==r.length?r[0]:null}function c(e,t,r){var i=d(t,e);return i&&v(s,r,i,e),n.preventDefault(),!0}function u(e,t,i,o){var a=o[i];if(a)return f(a),!0;var l=s.dom.getParent(o,"td,th");if(l)return r(e,l,n);var c=d(t,!e);return f(c),n.preventDefault(),!1}function d(e,t){var n=e&&e[t?"lastChild":"firstChild"];return n&&"BR"===n.nodeName?s.dom.getParent(n,"td,th"):n}function f(e){s.selection.setCursorLocation(e,0)}function p(){return x==e.UP||x==e.DOWN}function m(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"tr");return null!==n}function g(e){for(var t=0,n=e;n.previousSibling;)n=n.previousSibling,t+=a(n,"colspan");return t}function h(e,t){var n=0,r=0;return o(e.children,function(e,i){if(n+=a(e,"colspan"),r=i,n>t)return!1}),r}function v(e,t,n,r){var i=g(s.dom.getParent(t,"td,th")),o=h(n,i),a=n.childNodes[o],l=d(a,r);f(l||a)}function b(e){var t=s.selection.getNode(),n=s.dom.getParent(t,"td,th"),r=s.dom.getParent(e,"td,th");return n&&n!==r&&y(n,r)}function y(e,t){return s.dom.getParent(e,"TABLE")===s.dom.getParent(t,"TABLE")}var x=n.keyCode;if(p()&&m(s)){var C=s.selection.getNode();t.setEditorTimeout(s,function(){b(C)&&r(!n.shiftKey&&x===e.UP,C,n)},0)}}s.on("KeyDown",function(e){n(e)})}function c(){function e(e,t){var n,r=t.ownerDocument,i=r.createRange();return i.setStartBefore(t),i.setEnd(e.endContainer,e.endOffset),n=r.createElement("body"),n.appendChild(i.cloneContents()),0===n.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length}s.on("KeyDown",function(t){var n,r,i=s.dom;37!=t.keyCode&&38!=t.keyCode||(n=s.selection.getRng(),r=i.getParent(n.startContainer,"table"),r&&s.getBody().firstChild==r&&e(n,r)&&(n=i.createRng(),n.setStartBefore(r),n.setEndBefore(r),s.selection.setRng(n),t.preventDefault()))})}function u(){s.on("KeyDown SetContent VisualAid",function(){var e;for(e=s.getBody().lastChild;e;e=e.previousSibling)if(3==e.nodeType){if(e.nodeValue.length>0)break}else if(1==e.nodeType&&("BR"==e.tagName||!e.getAttribute("data-mce-bogus")))break;e&&"TABLE"==e.nodeName&&(s.settings.forced_root_block?s.dom.add(s.getBody(),s.settings.forced_root_block,s.settings.forced_root_block_attrs,n.ie&&n.ie<10?"&nbsp;":'<br data-mce-bogus="1" />'):s.dom.add(s.getBody(),"br",{"data-mce-bogus":"1"}))}),s.on("PreProcess",function(e){var t=e.node.lastChild;t&&("BR"==t.nodeName||1==t.childNodes.length&&("BR"==t.firstChild.nodeName||"\xa0"==t.firstChild.nodeValue))&&t.previousSibling&&"TABLE"==t.previousSibling.nodeName&&s.dom.remove(t)})}function d(){function e(e,t,n,r){var i,o,a,s=3,l=e.dom.getParent(t.startContainer,"TABLE");return l&&(i=l.parentNode),o=t.startContainer.nodeType==s&&0===t.startOffset&&0===t.endOffset&&r&&("TR"==n.nodeName||n==i),a=("TD"==n.nodeName||"TH"==n.nodeName)&&!r,o||a}function t(){var t=s.selection.getRng(),n=s.selection.getNode(),r=s.dom.getParent(t.startContainer,"TD,TH");if(e(s,t,n,r)){r||(r=n);for(var i=r.lastChild;i.lastChild;)i=i.lastChild;3==i.nodeType&&(t.setEnd(i,i.data.length),s.selection.setRng(t))}}s.on("KeyDown",function(){t()}),s.on("MouseDown",function(e){2!=e.button&&t()})}function f(){function t(e){s.selection.select(e,!0),s.selection.collapse(!0)}function n(e){s.$(e).empty(),i.paddCell(e)}s.on("keydown",function(i){if((i.keyCode==e.DELETE||i.keyCode==e.BACKSPACE)&&!i.isDefaultPrevented()){var o,a,l,c;if(o=s.dom.getParent(s.selection.getStart(),"table")){if(a=s.dom.select("td,th",o),l=r.grep(a,function(e){return!!s.dom.getAttrib(e,"data-mce-selected")}),0===l.length)return c=s.dom.getParent(s.selection.getStart(),"td,th"),void(s.selection.isCollapsed()&&c&&s.dom.isEmpty(c)&&(i.preventDefault(),n(c),t(c)));i.preventDefault(),s.undoManager.transact(function(){a.length==l.length?s.execCommand("mceTableDelete"):(r.each(l,n),t(l[0]))})}}})}function p(){var t=function(e){return e&&"CAPTION"==e.nodeName&&"TABLE"==e.parentNode.nodeName},r=function(e,t){var n=s.selection.getRng(),r=e.ownerDocument.createTextNode("\xa0");n.startOffset?e.insertBefore(r,e.firstChild):e.appendChild(r),t&&(s.selection.select(r,!0),s.selection.collapse(!0))},i=function(t){return(t.keyCode==e.DELETE||t.keyCode==e.BACKSPACE)&&!t.isDefaultPrevented()},o=function(e){return e.firstChild===e.lastChild&&e.firstChild},a=function(e){return e&&3===e.nodeType},l=function(e){var t=o(e);return a(t)&&1===t.data.length?t.data:null},c=function(e){var t=o(e),n=l(e);return t&&!a(t)||n&&!d(n)},u=function(e){return s.dom.isEmpty(e)||d(l(e))},d=function(e){return"\xa0"===e};s.on("keydown",function(e){if(i(e)){var o=s.dom.getParent(s.selection.getStart(),"caption");t(o)&&(n.ie&&(s.selection.isCollapsed()?c(o)&&r(o):(s.undoManager.transact(function(){s.execCommand("Delete"),u(o)&&r(o,!0)}),e.preventDefault())),u(o)&&e.preventDefault())}})}f(),p(),n.webkit&&(l(),d()),n.gecko&&(c(),u()),n.ie>9&&(c(),u())}}),r("tinymce/tableplugin/CellSelection",["tinymce/tableplugin/TableGrid","tinymce/dom/TreeWalker","tinymce/util/Tools"],function(e,t,n){return function(r,i){function o(e){r.getBody().style.webkitUserSelect="",(e||g)&&(r.$("td[data-mce-selected],th[data-mce-selected]").removeAttr("data-mce-selected"),g=!1)}function a(e,t){return!(!e||!t)&&e===m.getParent(t,"table")}function s(t){var n,o,s=t.target;if(!f&&!p&&s!==d&&(d=s,u&&c)){if(o=m.getParent(s,"td,th"),a(u,o)||(o=m.getParent(u,"td,th")),c===o&&!g)return;if(i(!0),a(u,o)){t.preventDefault(),l||(l=new e(r,u,c),r.getBody().style.webkitUserSelect="none"),l.setEndCell(o),g=!0,n=r.selection.getSel();try{n.removeAllRanges?n.removeAllRanges():n.empty()}catch(e){}}}}var l,c,u,d,f,p,m=r.dom,g=!0,h=function(){c=l=u=d=null,i(!1)};return r.on("SelectionChange",function(e){g&&e.stopImmediatePropagation()},!0),r.on("MouseDown",function(e){2==e.button||f||p||(o(),c=m.getParent(e.target,"td,th"),u=m.getParent(c,"table"))}),r.on("mouseover",s),r.on("remove",function(){m.unbind(r.getDoc(),"mouseover",s),o()}),r.on("MouseUp",function(){function e(e,r){var o=new t(e,e);do{if(3==e.nodeType&&0!==n.trim(e.nodeValue).length)return void(r?i.setStart(e,0):i.setEnd(e,e.nodeValue.length));if("BR"==e.nodeName)return void(r?i.setStartBefore(e):i.setEndBefore(e))}while(e=r?o.next():o.prev())}var i,o,a,s,u,d=r.selection;if(c){if(l&&(r.getBody().style.webkitUserSelect=""),o=m.select("td[data-mce-selected],th[data-mce-selected]"),o.length>0){i=m.createRng(),s=o[0],i.setStartBefore(s),i.setEndAfter(s),e(s,1),a=new t(s,m.getParent(o[0],"table"));do if("TD"==s.nodeName||"TH"==s.nodeName){if(!m.getAttrib(s,"data-mce-selected"))break;u=s}while(s=a.next());e(u),d.setRng(i)}r.nodeChanged(),h()}}),r.on("KeyUp Drop SetContent",function(e){o("setcontent"==e.type),h(),f=!1}),r.on("ObjectResizeStart ObjectResized",function(e){f="objectresized"!=e.type}),r.on("dragstart",function(){p=!0}),r.on("drop dragend",function(){p=!1}),{clear:o}}}),r("tinymce/tableplugin/Dialogs",["tinymce/util/Tools","tinymce/Env"],function(e,t){var n=e.each;return function(r){function i(){var e=r.settings.color_picker_callback;if(e)return function(){var t=this;e.call(r,function(e){t.value(e).fire("change")},t.value())}}function o(e){return{title:"Advanced",type:"form",defaults:{onchange:function(){d(e,this.parents().reverse()[0],"style"==this.name())}},items:[{label:"Style",name:"style",type:"textbox"},{type:"form",padding:0,formItemDefaults:{layout:"grid",alignH:["start","right"]},defaults:{size:7},items:[{label:"Border color",type:"colorbox",name:"borderColor",onaction:i()},{label:"Background color",type:"colorbox",name:"backgroundColor",onaction:i()}]}]}}function a(e){return e?e.replace(/px$/,""):""}function s(e){return/^[0-9]+$/.test(e)&&(e+="px"),e}function l(e){n("left center right".split(" "),function(t){r.formatter.remove("align"+t,{},e)})}function c(e){n("top middle bottom".split(" "),function(t){r.formatter.remove("valign"+t,{},e)})}function u(t,n,r){function i(t,r){return r=r||[],e.each(t,function(e){var t={text:e.text||e.title};e.menu?t.menu=i(e.menu):(t.value=e.value,n&&n(t)),r.push(t)}),r}return i(t,r||[])}function d(e,t,n){var r=t.toJSON(),i=e.parseStyle(r.style);n?(t.find("#borderColor").value(i["border-color"]||"")[0].fire("change"),t.find("#backgroundColor").value(i["background-color"]||"")[0].fire("change")):(i["border-color"]=r.borderColor,i["background-color"]=r.backgroundColor),t.find("#style").value(e.serializeStyle(e.parseStyle(e.serializeStyle(i))))}function f(e,t,n){var r=e.parseStyle(e.getAttrib(n,"style"));r["border-color"]&&(t.borderColor=r["border-color"]),r["background-color"]&&(t.backgroundColor=r["background-color"]),t.style=e.serializeStyle(r)}function p(e,t,r){var i=e.parseStyle(e.getAttrib(t,"style"));n(r,function(e){i[e.name]=e.value}),e.setAttrib(t,"style",e.serializeStyle(e.parseStyle(e.serializeStyle(i))))}var m=this;m.tableProps=function(){m.table(!0)},m.table=function(i){function c(){function n(e,t,r){if("TD"===e.tagName||"TH"===e.tagName)C.setStyle(e,t,r);else if(e.children)for(var i=0;i<e.children.length;i++)n(e.children[i],t,r)}var i;d(C,this),w=e.extend(w,this.toJSON()),w["class"]===!1&&delete w["class"],r.undoManager.transact(function(){if(g||(g=r.plugins.table.insertTable(w.cols||1,w.rows||1)),r.dom.setAttribs(g,{style:w.style,"class":w["class"]}),r.settings.table_style_by_css){if(x=[],x.push({name:"border",value:w.border}),x.push({name:"border-spacing",value:s(w.cellspacing)}),p(C,g,x),C.setAttribs(g,{"data-mce-border-color":w.borderColor,"data-mce-cell-padding":w.cellpadding,"data-mce-border":w.border}),g.children)for(var e=0;e<g.children.length;e++)n(g.children[e],"border",w.border),n(g.children[e],"padding",s(w.cellpadding))}else r.dom.setAttribs(g,{border:w.border,cellpadding:w.cellpadding,cellspacing:w.cellspacing});C.getAttrib(g,"width")&&!r.settings.table_style_by_css?C.setAttrib(g,"width",a(w.width)):C.setStyle(g,"width",s(w.width)),C.setStyle(g,"height",s(w.height)),i=C.select("caption",g)[0],i&&!w.caption&&C.remove(i),!i&&w.caption&&(i=C.create("caption"),i.innerHTML=t.ie?"\xa0":'<br data-mce-bogus="1"/>',g.insertBefore(i,g.firstChild)),l(g),w.align&&r.formatter.apply("align"+w.align,{},g),r.focus(),r.addVisual()})}function m(e,t){function n(e,n){for(var r=0;r<n.length;r++){var i=C.getStyle(n[r],t);if("undefined"==typeof e&&(e=i),e!=i)return""}return e}var i,o=r.dom.select("td,th",e);return i=n(i,o)}var g,h,v,b,y,x,C=r.dom,w={};i===!0?(g=C.getParent(r.selection.getStart(),"table"),g&&(w={width:a(C.getStyle(g,"width")||C.getAttrib(g,"width")),height:a(C.getStyle(g,"height")||C.getAttrib(g,"height")),cellspacing:a(C.getStyle(g,"border-spacing")||C.getAttrib(g,"cellspacing")),cellpadding:C.getAttrib(g,"data-mce-cell-padding")||C.getAttrib(g,"cellpadding")||m(g,"padding"),border:C.getAttrib(g,"data-mce-border")||C.getAttrib(g,"border")||m(g,"border"),borderColor:C.getAttrib(g,"data-mce-border-color"),caption:!!C.select("caption",g)[0],"class":C.getAttrib(g,"class")},n("left center right".split(" "),function(e){r.formatter.matchNode(g,"align"+e)&&(w.align=e)}))):(h={label:"Cols",name:"cols"},v={label:"Rows",name:"rows"}),r.settings.table_class_list&&(w["class"]&&(w["class"]=w["class"].replace(/\s*mce\-item\-table\s*/g,"")),b={name:"class",type:"listbox",label:"Class",values:u(r.settings.table_class_list,function(e){e.value&&(e.textStyle=function(){return r.formatter.getCssText({block:"table",classes:[e.value]})})})}),y={type:"form",layout:"flex",direction:"column",labelGapCalc:"children",padding:0,items:[{type:"form",labelGapCalc:!1,padding:0,layout:"grid",columns:2,defaults:{type:"textbox",maxWidth:50},items:r.settings.table_appearance_options!==!1?[h,v,{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell spacing",name:"cellspacing"},{label:"Cell padding",name:"cellpadding"},{label:"Border",name:"border"},{label:"Caption",name:"caption",type:"checkbox"}]:[h,v,{label:"Width",name:"width"},{label:"Height",name:"height"}]},{label:"Alignment",name:"align",type:"listbox",text:"None",values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},b]},r.settings.table_advtab!==!1?(f(C,w,g),r.windowManager.open({title:"Table properties",data:w,bodyType:"tabpanel",body:[{title:"General",type:"form",items:y},o(C)],onsubmit:c})):r.windowManager.open({title:"Table properties",data:w,body:y,onsubmit:c})},m.merge=function(e,t){r.windowManager.open({title:"Merge cells",body:[{label:"Cols",name:"cols",type:"textbox",value:"1",size:10},{label:"Rows",name:"rows",type:"textbox",value:"1",size:10}],onsubmit:function(){var n=this.toJSON();r.undoManager.transact(function(){e.merge(t,n.cols,n.rows)})}})},m.cell=function(){function t(e,t,n){(1===b.length||n)&&v.setAttrib(e,t,n)}function i(e,t,n){(1===b.length||n)&&v.setStyle(e,t,n)}function p(){d(v,this),g=e.extend(g,this.toJSON()),r.undoManager.transact(function(){n(b,function(e){t(e,"scope",g.scope),t(e,"style",g.style),t(e,"class",g["class"]),i(e,"width",s(g.width)),i(e,"height",s(g.height)),g.type&&e.nodeName.toLowerCase()!==g.type&&(e=v.rename(e,g.type)),1===b.length&&(l(e),c(e)),g.align&&r.formatter.apply("align"+g.align,{},e),g.valign&&r.formatter.apply("valign"+g.valign,{},e)}),r.focus()})}var m,g,h,v=r.dom,b=[];if(b=r.dom.select("td[data-mce-selected],th[data-mce-selected]"),m=r.dom.getParent(r.selection.getStart(),"td,th"),!b.length&&m&&b.push(m),m=m||b[0]){b.length>1?g={width:"",height:"",scope:"","class":"",align:"",style:"",type:m.nodeName.toLowerCase()}:(g={width:a(v.getStyle(m,"width")||v.getAttrib(m,"width")),height:a(v.getStyle(m,"height")||v.getAttrib(m,"height")),scope:v.getAttrib(m,"scope"),"class":v.getAttrib(m,"class")},g.type=m.nodeName.toLowerCase(),n("left center right".split(" "),function(e){r.formatter.matchNode(m,"align"+e)&&(g.align=e)}),n("top middle bottom".split(" "),function(e){r.formatter.matchNode(m,"valign"+e)&&(g.valign=e)}),f(v,g,m)),r.settings.table_cell_class_list&&(h={name:"class",type:"listbox",label:"Class",values:u(r.settings.table_cell_class_list,function(e){e.value&&(e.textStyle=function(){return r.formatter.getCssText({block:"td",classes:[e.value]})})})});var y={type:"form",layout:"flex",direction:"column",labelGapCalc:"children",padding:0,items:[{type:"form",layout:"grid",columns:2,labelGapCalc:!1,padding:0,defaults:{type:"textbox",maxWidth:50},items:[{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell type",name:"type",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{label:"Scope",name:"scope",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{label:"H Align",name:"align",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"V Align",name:"valign",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Top",value:"top"},{text:"Middle",value:"middle"},{text:"Bottom",value:"bottom"}]}]},h]};r.settings.table_cell_advtab!==!1?r.windowManager.open({title:"Cell properties",bodyType:"tabpanel",data:g,body:[{title:"General",type:"form",items:y},o(v)],onsubmit:p}):r.windowManager.open({title:"Cell properties",data:g,body:y,onsubmit:p})}},m.row=function(){function t(e,t,n){(1===x.length||n)&&y.setAttrib(e,t,n)}function i(e,t,n){(1===x.length||n)&&y.setStyle(e,t,n)}function c(){var o,a,c;d(y,this),v=e.extend(v,this.toJSON()),r.undoManager.transact(function(){var e=v.type;n(x,function(n){t(n,"scope",v.scope),t(n,"style",v.style),t(n,"class",v["class"]),i(n,"height",s(v.height)),e!==n.parentNode.nodeName.toLowerCase()&&(o=y.getParent(n,"table"),a=n.parentNode,c=y.select(e,o)[0],c||(c=y.create(e),o.firstChild?o.insertBefore(c,o.firstChild):o.appendChild(c)),c.appendChild(n),a.hasChildNodes()||y.remove(a)),1===x.length&&l(n),v.align&&r.formatter.apply("align"+v.align,{},n)}),r.focus()})}var p,m,g,h,v,b,y=r.dom,x=[];p=r.dom.getParent(r.selection.getStart(),"table"),m=r.dom.getParent(r.selection.getStart(),"td,th"),n(p.rows,function(e){n(e.cells,function(t){if(y.getAttrib(t,"data-mce-selected")||t==m)return x.push(e),!1})}),g=x[0],g&&(x.length>1?v={height:"",scope:"","class":"",align:"",type:g.parentNode.nodeName.toLowerCase()}:(v={height:a(y.getStyle(g,"height")||y.getAttrib(g,"height")),scope:y.getAttrib(g,"scope"),"class":y.getAttrib(g,"class")},v.type=g.parentNode.nodeName.toLowerCase(),n("left center right".split(" "),function(e){r.formatter.matchNode(g,"align"+e)&&(v.align=e)}),f(y,v,g)),r.settings.table_row_class_list&&(h={name:"class",type:"listbox",label:"Class",values:u(r.settings.table_row_class_list,function(e){e.value&&(e.textStyle=function(){return r.formatter.getCssText({block:"tr",classes:[e.value]})})})}),b={type:"form",columns:2,padding:0,defaults:{type:"textbox"},items:[{type:"listbox",name:"type",label:"Row type",text:"Header",maxWidth:null,values:[{text:"Header",value:"thead"},{text:"Body",value:"tbody"},{text:"Footer",value:"tfoot"}]},{type:"listbox",name:"align",label:"Alignment",text:"None",maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height"},h]},r.settings.table_row_advtab!==!1?r.windowManager.open({title:"Row properties",data:v,bodyType:"tabpanel",body:[{title:"General",type:"form",items:b},o(y)],onsubmit:c}):r.windowManager.open({title:"Row properties",data:v,body:b,onsubmit:c}))}}}),r("tinymce/tableplugin/ResizeBars",["tinymce/util/Tools","tinymce/util/VK"],function(e,n){var r;return function(i){function o(e,t){return{index:e,y:i.dom.getPos(t).y}}function a(e,t){return{index:e,y:i.dom.getPos(t).y+t.offsetHeight}}function s(e,t){return{index:e,x:i.dom.getPos(t).x}}function l(e,t){return{index:e,x:i.dom.getPos(t).x+t.offsetWidth}}function c(){var e=i.getBody().dir;return"rtl"===e}function u(){return i.inline}function d(){return u?i.getBody().ownerDocument.body:i.getBody()}function f(e,t){return c()?l(e,t):s(e,t)}function p(e,t){return c()?s(e,t):l(e,t)}function m(e,t){return g(e,"width")/g(t,"width")*100}function g(e,t){var n=i.dom.getStyle(e,t,!0),r=parseInt(n,10);return r}function h(e){var t=g(e,"width"),n=g(e.parentElement,"width");return t/n*100}function v(e,t){var n=g(e,"width");return t/n*100}function b(e,t){var n=g(e.parentElement,"width");return t/n*100}function y(e,t,n){for(var r=[],i=1;i<n.length;i++){var o=n[i].element;r.push(e(i-1,o))}var a=n[n.length-1];return r.push(t(n.length-1,a.element)),r}function x(){var t=i.dom.select("."+fe,d());e.each(t,function(e){i.dom.remove(e)})}function C(e){x(),B(e)}function w(e,t,n,r,i,o,a,s){var l={"data-mce-bogus":"all","class":fe+" "+e,unselectable:"on","data-mce-resize":!1,style:"cursor: "+t+"; margin: 0; padding: 0; position: absolute; left: "+n+"px; top: "+r+"px; height: "+i+"px; width: "+o+"px; "};return l[a]=s,l}function N(t,n,r){e.each(t,function(e){var t=r.x,o=e.y-Ce/2,a=Ce,s=n;i.dom.add(d(),"div",w(pe,me,t,o,a,s,ge,e.index))})}function k(t,n,r){e.each(t,function(e){var t=e.x-Ce/2,o=r.y,a=n,s=Ce;i.dom.add(d(),"div",w(ve,be,t,o,a,s,ye,e.index))})}function S(t){return e.map(t.rows,function(t){var n=e.map(t.cells,function(e){var t=e.hasAttribute("rowspan")?parseInt(e.getAttribute("rowspan"),10):1,n=e.hasAttribute("colspan")?parseInt(e.getAttribute("colspan"),10):1;return{element:e,rowspan:t,colspan:n}});return{element:t,cells:n}})}function _(n){function r(e,t){return e+","+t}function i(e,t){return s[r(e,t)]}function o(){var t=[];return e.each(l,function(e){t=t.concat(e.cells)}),t}function a(){return l}var s={},l=[],c=0,u=0;return e.each(n,function(n,i){var o=[];e.each(n.cells,function(e){for(var n=0;s[r(i,n)]!==t;)n++;for(var a={element:e.element,colspan:e.colspan,rowspan:e.rowspan,rowIndex:i,colIndex:n},l=0;l<e.colspan;l++)for(var d=0;d<e.rowspan;d++){var f=i+d,p=n+l;s[r(f,p)]=a,c=Math.max(c,f+1),u=Math.max(u,p+1)}o.push(a)}),l.push({element:n.element,cells:o})}),{grid:{maxRows:c,maxCols:u},getAt:i,getAllCells:o,getAllRows:a}}function E(e,t){for(var n=[],r=e;r<t;r++)n.push(r);return n}function T(e,t,n){for(var r,i=e(),o=0;o<i.length;o++)t(i[o])&&(r=i[o]);return r?r:n()}function R(t){var n=E(0,t.grid.maxCols),r=E(0,t.grid.maxRows);return e.map(n,function(e){function n(){for(var n=[],i=0;i<r.length;i++){var o=t.getAt(i,e);o&&o.colIndex===e&&n.push(o)}return n}function i(e){return 1===e.colspan}function o(){for(var n,i=0;i<r.length;i++)if(n=t.getAt(i,e))return n;return null}return T(n,i,o)})}function A(t){var n=E(0,t.grid.maxCols),r=E(0,t.grid.maxRows);return e.map(r,function(e){function r(){for(var r=[],i=0;i<n.length;i++){var o=t.getAt(e,i);o&&o.rowIndex===e&&r.push(o)}return r}function i(e){return 1===e.rowspan}function o(){return t.getAt(e,0)}return T(r,i,o);
+})}function B(e){var t=S(e),n=_(t),r=A(n),s=R(n),l=i.dom.getPos(e),c=r.length>0?y(o,a,r):[],u=s.length>0?y(f,p,s):[];N(c,e.offsetWidth,l),k(u,e.offsetHeight,l)}function P(e,t,n,r){if(t<0||t>=e.length-1)return"";var i=e[t];if(i)i={value:i,delta:0};else for(var o=e.slice(0,t).reverse(),a=0;a<o.length;a++)o[a]&&(i={value:o[a],delta:a+1});var s=e[t+1];if(s)s={value:s,delta:1};else for(var l=e.slice(t+1),c=0;c<l.length;c++)l[c]&&(s={value:l[c],delta:c+1});var u=s.delta-i.delta,d=Math.abs(s.value-i.value)/u;return n?d/g(r,"width")*100:d}function D(e,t){var n=i.dom.getStyle(e,t);return n||(n=i.dom.getAttrib(e,t)),n||(n=i.dom.getStyle(e,t,!0)),n}function M(e,t,n){var r=D(e,"width"),i=parseInt(r,10),o=t?m(e,n):g(e,"width");return(t&&!V(r)||!t&&!$(r))&&(i=0),!isNaN(i)&&i>0?i:o}function L(t,n,r){for(var i=R(t),o=e.map(i,function(e){return f(e.colIndex,e.element).x}),a=[],s=0;s<i.length;s++){var l=i[s].element.hasAttribute("colspan")?parseInt(i[s].element.getAttribute("colspan"),10):1,c=l>1?P(o,s):M(i[s].element,n,r);c=c?c:we,a.push(c)}return a}function I(e){var t=D(e,"height"),n=parseInt(t,10);return V(t)&&(n=0),!isNaN(n)&&n>0?n:g(e,"height")}function O(t){for(var n=A(t),r=e.map(n,function(e){return o(e.rowIndex,e.element).y}),i=[],a=0;a<n.length;a++){var s=n[a].element.hasAttribute("rowspan")?parseInt(n[a].element.getAttribute("rowspan"),10):1,l=s>1?P(r,a):I(n[a].element);l=l?l:Ne,i.push(l)}return i}function H(t,n,r,i,o){function a(t){return e.map(t,function(){return 0})}function s(){var e;if(o)e=[100-d[0]];else{var t=Math.max(i,d[0]+r);e=[t-d[0]]}return e}function l(e,t){var n,o=a(d.slice(0,e)),s=a(d.slice(t+1));if(r>=0){var l=Math.max(i,d[t]-r);n=o.concat([r,l-d[t]]).concat(s)}else{var c=Math.max(i,d[e]+r),u=d[e]-c;n=o.concat([c-d[e],u]).concat(s)}return n}function c(e,t){var n,o=a(d.slice(0,t));if(r>=0)n=o.concat([r]);else{var s=Math.max(i,d[t]+r);n=o.concat([s-d[t]])}return n}var u,d=t.slice(0);return u=0===t.length?[]:1===t.length?s():0===n?l(0,1):n>0&&n<t.length-1?l(n,n+1):n===t.length-1?c(n-1,n):[]}function F(e,t,n){for(var r=0,i=e;i<t;i++)r+=n[i];return r}function z(t,n){var r=t.getAllCells();return e.map(r,function(e){var t=F(e.colIndex,e.colIndex+e.colspan,n);return{element:e.element,width:t,colspan:e.colspan}})}function W(t,n){var r=t.getAllCells();return e.map(r,function(e){var t=F(e.rowIndex,e.rowIndex+e.rowspan,n);return{element:e.element,height:t,rowspan:e.rowspan}})}function U(t,n){var r=t.getAllRows();return e.map(r,function(e,t){return{element:e.element,height:n[t]}})}function V(e){return Se.test(e)}function $(e){return _e.test(e)}function j(t,n,r){function o(t,n){e.each(t,function(e){i.dom.setStyle(e.element,"width",e.width+n),i.dom.setAttrib(e.element,"width",null)})}function a(){return r<u.grid.maxCols-1?h(t):h(t)+b(t,n)}function s(){return r<u.grid.maxCols-1?g(t,"width"):g(t,"width")+n}function l(e,n,o){r!=u.grid.maxCols-1&&o||(i.dom.setStyle(t,"width",e+n),i.dom.setAttrib(t,"width",null))}for(var c=S(t),u=_(c),d=V(t.width)||V(t.style.width),f=L(u,d,t),p=d?v(t,n):n,m=H(f,r,p,we,d,t),y=[],x=0;x<m.length;x++)y.push(m[x]+f[x]);var C=z(u,y),w=d?"%":"px",N=d?a():s();i.undoManager.transact(function(){o(C,w),l(N,w,d)})}function q(t,n,r){for(var o=S(t),a=_(o),s=O(a),l=[],c=0,u=0;u<s.length;u++)l.push(u===r?n+s[u]:s[u]),c+=c[u];var d=W(a,l),f=U(a,l);i.undoManager.transact(function(){e.each(f,function(e){i.dom.setStyle(e.element,"height",e.height+"px"),i.dom.setAttrib(e.element,"height",null)}),e.each(d,function(e){i.dom.setStyle(e.element,"height",e.height+"px"),i.dom.setAttrib(e.element,"height",null)}),i.dom.setStyle(t,"height",c+"px"),i.dom.setAttrib(t,"height",null)})}function Y(){ae=setTimeout(function(){J()},200)}function X(){clearTimeout(ae)}function K(){var e=document.createElement("div");return e.setAttribute("style","margin: 0; padding: 0; position: fixed; left: 0px; top: 0px; height: 100%; width: 100%;"),e.setAttribute("data-mce-bogus","all"),e}function G(e,t){i.dom.bind(e,"mouseup",function(){J()}),i.dom.bind(e,"mousemove",function(e){X(),se&&t(e)}),i.dom.bind(e,"mouseout",function(){Y()})}function J(){if(i.dom.remove(le),se){i.dom.removeClass(ce,ke),se=!1;var e,t;if(Q(ce)){var n=parseInt(i.dom.getAttrib(ce,xe),10),o=i.dom.getPos(ce).x;e=parseInt(i.dom.getAttrib(ce,ye),10),t=c()?n-o:o-n,Math.abs(t)>=1&&j(r,t,e)}else if(ee(ce)){var a=parseInt(i.dom.getAttrib(ce,he),10),s=i.dom.getPos(ce).y;e=parseInt(i.dom.getAttrib(ce,ge),10),t=s-a,Math.abs(t)>=1&&q(r,t,e)}C(r),i.nodeChanged()}}function Z(e,t){le=le?le:K(),se=!0,i.dom.addClass(e,ke),ce=e,G(le,t),i.dom.add(d(),le)}function Q(e){return i.dom.hasClass(e,ve)}function ee(e){return i.dom.hasClass(e,pe)}function te(e){ue=ue!==t?ue:e.clientX;var n=e.clientX-ue;ue=e.clientX;var r=i.dom.getPos(ce).x;i.dom.setStyle(ce,"left",r+n+"px")}function ne(e){de=de!==t?de:e.clientY;var n=e.clientY-de;de=e.clientY;var r=i.dom.getPos(ce).y;i.dom.setStyle(ce,"top",r+n+"px")}function re(e){ue=t,Z(e,te)}function ie(e){de=t,Z(e,ne)}function oe(e){var t=e.target,n=i.getBody();if(i.$.contains(n,r)||r===n)if(Q(t)){e.preventDefault();var o=i.dom.getPos(t).x;i.dom.setAttrib(t,xe,o),re(t)}else if(ee(t)){e.preventDefault();var a=i.dom.getPos(t).y;i.dom.setAttrib(t,he,a),ie(t)}else x()}var ae,se,le,ce,ue,de,fe="mce-resize-bar",pe="mce-resize-bar-row",me="row-resize",ge="data-row",he="data-initial-top",ve="mce-resize-bar-col",be="col-resize",ye="data-col",xe="data-initial-left",Ce=4,we=10,Ne=10,ke="mce-resize-bar-dragging",Se=new RegExp(/(\d+(\.\d+)?%)/),_e=new RegExp(/px|em/);return i.on("init",function(){i.dom.bind(d(),"mousedown",oe)}),i.on("ObjectResized",function(t){var n=t.target;if("TABLE"===n.nodeName){var r=[];e.each(n.rows,function(t){e.each(t.cells,function(e){var t=i.dom.getStyle(e,"width",!0);r.push({cell:e,width:t})})}),e.each(r,function(e){i.dom.setStyle(e.cell,"width",e.width),i.dom.setAttrib(e.cell,"width",null)})}}),i.on("mouseover",function(e){if(!se){var t=i.dom.getParent(e.target,"table");("TABLE"===e.target.nodeName||t)&&(r=t,C(t))}}),i.on("keydown",function(e){switch(e.keyCode){case n.LEFT:case n.RIGHT:case n.UP:case n.DOWN:x()}}),i.on("remove",function(){x(),i.dom.unbind(d(),"mousedown",oe)}),{adjustWidth:j,adjustHeight:q,clearBars:x,drawBars:B,determineDeltas:H,getTableGrid:_,getTableDetails:S,getWidths:L,getPixelHeights:O,isPercentageBasedSize:V,isPixelBasedSize:$,recalculateWidths:z,recalculateCellHeights:W,recalculateRowHeights:U}}}),r("tinymce/tableplugin/Plugin",["tinymce/tableplugin/TableGrid","tinymce/tableplugin/Quirks","tinymce/tableplugin/CellSelection","tinymce/tableplugin/Dialogs","tinymce/tableplugin/ResizeBars","tinymce/util/Tools","tinymce/dom/TreeWalker","tinymce/Env","tinymce/PluginManager"],function(e,t,n,r,i,o,a,s,l){function c(o){function a(e){return function(){o.execCommand(e)}}function l(e,t){var n,r,i,a;for(i='<table id="__mce"><tbody>',n=0;n<t;n++){for(i+="<tr>",r=0;r<e;r++)i+="<td>"+(s.ie&&s.ie<10?"&nbsp;":"<br>")+"</td>";i+="</tr>"}return i+="</tbody></table>",o.undoManager.transact(function(){o.insertContent(i),a=o.dom.get("__mce"),o.dom.setAttrib(a,"id",null),o.$("tr",a).each(function(e,t){o.fire("newrow",{node:t}),o.$("th,td",t).each(function(e,t){o.fire("newcell",{node:t})})}),o.dom.setAttribs(a,o.settings.table_default_attributes||{}),o.dom.setStyles(a,o.settings.table_default_styles||{})}),a}function c(e,t,n){function r(){var r,i,a,s={},l=0;i=o.dom.select("td[data-mce-selected],th[data-mce-selected]"),r=i[0],r||(r=o.selection.getStart()),n&&i.length>0?(u(i,function(e){return s[e.parentNode.parentNode.nodeName]=1}),u(s,function(e){l+=e}),a=1!==l):a=!o.dom.getParent(r,t),e.disabled(a),o.selection.selectorChanged(t,function(t){e.disabled(!t)})}o.initialized?r():o.on("init",r)}function d(){c(this,"table")}function f(){c(this,"td,th")}function p(){c(this,"td,th",!0)}function m(){var e="";e='<table role="grid" class="mce-grid mce-grid-border" aria-readonly="true">';for(var t=0;t<10;t++){e+="<tr>";for(var n=0;n<10;n++)e+='<td role="gridcell" tabindex="-1"><a id="mcegrid'+(10*t+n)+'" href="#" data-mce-x="'+n+'" data-mce-y="'+t+'"></a></td>';e+="</tr>"}return e+="</table>",e+='<div class="mce-text-center" role="presentation">1 x 1</div>'}function g(e,t,n){var r,i,a,s,l,c=n.getEl().getElementsByTagName("table")[0],u=n.isRtl()||"tl-tr"==n.parent().rel;for(c.nextSibling.innerHTML=e+1+" x "+(t+1),u&&(e=9-e),i=0;i<10;i++)for(r=0;r<10;r++)s=c.rows[i].childNodes[r].firstChild,l=(u?r>=e:r<=e)&&i<=t,o.dom.toggleClass(s,"mce-active",l),l&&(a=s);return a.parentNode}function h(){o.addButton("tableprops",{title:"Table properties",onclick:k.tableProps,icon:"table"}),o.addButton("tabledelete",{title:"Delete table",onclick:a("mceTableDelete")}),o.addButton("tablecellprops",{title:"Cell properties",onclick:a("mceTableCellProps")}),o.addButton("tablemergecells",{title:"Merge cells",onclick:a("mceTableMergeCells")}),o.addButton("tablesplitcells",{title:"Split cell",onclick:a("mceTableSplitCells")}),o.addButton("tableinsertrowbefore",{title:"Insert row before",onclick:a("mceTableInsertRowBefore")}),o.addButton("tableinsertrowafter",{title:"Insert row after",onclick:a("mceTableInsertRowAfter")}),o.addButton("tabledeleterow",{title:"Delete row",onclick:a("mceTableDeleteRow")}),o.addButton("tablerowprops",{title:"Row properties",onclick:a("mceTableRowProps")}),o.addButton("tablecutrow",{title:"Cut row",onclick:a("mceTableCutRow")}),o.addButton("tablecopyrow",{title:"Copy row",onclick:a("mceTableCopyRow")}),o.addButton("tablepasterowbefore",{title:"Paste row before",onclick:a("mceTablePasteRowBefore")}),o.addButton("tablepasterowafter",{title:"Paste row after",onclick:a("mceTablePasteRowAfter")}),o.addButton("tableinsertcolbefore",{title:"Insert column before",onclick:a("mceTableInsertColBefore")}),o.addButton("tableinsertcolafter",{title:"Insert column after",onclick:a("mceTableInsertColAfter")}),o.addButton("tabledeletecol",{title:"Delete column",onclick:a("mceTableDeleteCol")})}function v(e){var t=o.dom.is(e,"table")&&o.getBody().contains(e);return t}function b(){var e=o.settings.table_toolbar;""!==e&&e!==!1&&(e||(e="tableprops tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol"),o.addContextToolbar(v,e))}function y(){return C}function x(e){C=e}var C,w,N=this,k=new r(o);!o.settings.object_resizing||o.settings.table_resize_bars===!1||o.settings.object_resizing!==!0&&"table"!==o.settings.object_resizing||(w=i(o)),o.settings.table_grid===!1?o.addMenuItem("inserttable",{text:"Table",icon:"table",context:"table",onclick:k.table}):o.addMenuItem("inserttable",{text:"Table",icon:"table",context:"table",ariaHideMenu:!0,onclick:function(e){e.aria&&(this.parent().hideAll(),e.stopImmediatePropagation(),k.table())},onshow:function(){g(0,0,this.menu.items()[0])},onhide:function(){var e=this.menu.items()[0].getEl().getElementsByTagName("a");o.dom.removeClass(e,"mce-active"),o.dom.addClass(e[0],"mce-active")},menu:[{type:"container",html:m(),onPostRender:function(){this.lastX=this.lastY=0},onmousemove:function(e){var t,n,r=e.target;"A"==r.tagName.toUpperCase()&&(t=parseInt(r.getAttribute("data-mce-x"),10),n=parseInt(r.getAttribute("data-mce-y"),10),(this.isRtl()||"tl-tr"==this.parent().rel)&&(t=9-t),t===this.lastX&&n===this.lastY||(g(t,n,e.control),this.lastX=t,this.lastY=n))},onclick:function(e){var t=this;"A"==e.target.tagName.toUpperCase()&&(e.preventDefault(),e.stopPropagation(),t.parent().cancel(),o.undoManager.transact(function(){l(t.lastX+1,t.lastY+1)}),o.addVisual())}}]}),o.addMenuItem("tableprops",{text:"Table properties",context:"table",onPostRender:d,onclick:k.tableProps}),o.addMenuItem("deletetable",{text:"Delete table",context:"table",onPostRender:d,cmd:"mceTableDelete"}),o.addMenuItem("cell",{separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:a("mceTableCellProps"),onPostRender:f},{text:"Merge cells",onclick:a("mceTableMergeCells"),onPostRender:p},{text:"Split cell",onclick:a("mceTableSplitCells"),onPostRender:f}]}),o.addMenuItem("row",{text:"Row",context:"table",menu:[{text:"Insert row before",onclick:a("mceTableInsertRowBefore"),onPostRender:f},{text:"Insert row after",onclick:a("mceTableInsertRowAfter"),onPostRender:f},{text:"Delete row",onclick:a("mceTableDeleteRow"),onPostRender:f},{text:"Row properties",onclick:a("mceTableRowProps"),onPostRender:f},{text:"-"},{text:"Cut row",onclick:a("mceTableCutRow"),onPostRender:f},{text:"Copy row",onclick:a("mceTableCopyRow"),onPostRender:f},{text:"Paste row before",onclick:a("mceTablePasteRowBefore"),onPostRender:f},{text:"Paste row after",onclick:a("mceTablePasteRowAfter"),onPostRender:f}]}),o.addMenuItem("column",{text:"Column",context:"table",menu:[{text:"Insert column before",onclick:a("mceTableInsertColBefore"),onPostRender:f},{text:"Insert column after",onclick:a("mceTableInsertColAfter"),onPostRender:f},{text:"Delete column",onclick:a("mceTableDeleteCol"),onPostRender:f}]});var S=[];u("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"==e?S.push({text:"-"}):S.push(o.menuItems[e])}),o.addButton("table",{type:"menubutton",title:"Table",menu:S}),s.isIE||o.on("click",function(e){e=e.target,"TABLE"===e.nodeName&&(o.selection.select(e),o.nodeChanged())}),N.quirks=new t(o),o.on("Init",function(){N.cellSelection=new n(o,function(e){e&&w&&w.clearBars()}),N.resizeBars=w}),o.on("PreInit",function(){o.serializer.addAttributeFilter("data-mce-cell-padding,data-mce-border,data-mce-border-color",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)})}),u({mceTableSplitCells:function(e){e.split()},mceTableMergeCells:function(e){var t;t=o.dom.getParent(o.selection.getStart(),"th,td"),o.dom.select("td[data-mce-selected],th[data-mce-selected]").length?e.merge():k.merge(e,t)},mceTableInsertRowBefore:function(e){e.insertRows(!0)},mceTableInsertRowAfter:function(e){e.insertRows()},mceTableInsertColBefore:function(e){e.insertCols(!0)},mceTableInsertColAfter:function(e){e.insertCols()},mceTableDeleteCol:function(e){e.deleteCols()},mceTableDeleteRow:function(e){e.deleteRows()},mceTableCutRow:function(e){C=e.cutRows()},mceTableCopyRow:function(e){C=e.copyRows()},mceTablePasteRowBefore:function(e){e.pasteRows(C,!0)},mceTablePasteRowAfter:function(e){e.pasteRows(C)},mceSplitColsBefore:function(e){e.splitCols(!0)},mceSplitColsAfter:function(e){e.splitCols(!1)},mceTableDelete:function(e){w&&w.clearBars(),e.deleteTable()}},function(t,n){o.addCommand(n,function(){var n=new e(o);n&&(t(n),o.execCommand("mceRepaint"),N.cellSelection.clear())})}),u({mceInsertTable:k.table,mceTableProps:function(){k.table(!0)},mceTableRowProps:k.row,mceTableCellProps:k.cell},function(e,t){o.addCommand(t,function(t,n){e(n)})}),h(),b(),o.settings.table_tab_navigation!==!1&&o.on("keydown",function(t){var n,r,i;9==t.keyCode&&(n=o.dom.getParent(o.selection.getStart(),"th,td"),n&&(t.preventDefault(),r=new e(o),i=t.shiftKey?-1:1,o.undoManager.transact(function(){!r.moveRelIdx(n,i)&&i>0&&(r.insertRow(),r.refresh(),r.moveRelIdx(n,i))})))}),N.insertTable=l,N.setClipboardRows=x,N.getClipboardRows=y}var u=o.each;l.add("table",c)})}(window);
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/template/plugin.min.js b/core/media/editors/tinymce/plugins/template/plugin.min.js
new file mode 100644
index 00000000..4f5c62cb
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/template/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("template",function(e){function t(t){return function(){var n=e.settings.templates;return"function"==typeof n?void n(t):void("string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n))}}function n(t){function n(t){function n(t){if(t.indexOf("<html>")==-1){var n="";tinymce.each(e.contentCSS,function(t){n+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'});var i=e.settings.body_class||"";i.indexOf("=")!=-1&&(i=e.getParam("body_class","","hash"),i=i[e.id]||""),t="<!DOCTYPE html><html><head>"+n+'</head><body class="'+i+'">'+t+"</body></html>"}t=o(t,"template_preview_replace_values");var a=r.find("iframe")[0].getEl().contentWindow.document;a.open(),a.write(t),a.close()}var a=t.control.value();a.url?tinymce.util.XHR.send({url:a.url,success:function(e){i=e,n(i)}}):(i=a.content,n(i)),r.find("#description")[0].text(t.control.value().description)}var r,i,s=[];if(!t||0===t.length){var l=e.translate("No templates defined.");return void e.notificationManager.open({text:l,type:"info"})}tinymce.each(t,function(e){s.push({selected:!s.length,text:e.title,value:{url:e.url,content:e.content,description:e.description}})}),r=e.windowManager.open({title:"Insert template",layout:"flex",direction:"column",align:"stretch",padding:15,spacing:10,items:[{type:"form",flex:0,padding:0,items:[{type:"container",label:"Templates",items:{type:"listbox",label:"Templates",name:"template",values:s,onselect:n}}]},{type:"label",name:"description",label:"Description",text:"\xa0"},{type:"iframe",flex:1,border:1}],onsubmit:function(){a(!1,i)},minWidth:Math.min(tinymce.DOM.getViewPort().w,e.getParam("template_popup_width",600)),minHeight:Math.min(tinymce.DOM.getViewPort().h,e.getParam("template_popup_height",500))}),r.find("listbox")[0].fire("select")}function r(t,n){function r(e,t){if(e=""+e,e.length<t)for(var n=0;n<t-e.length;n++)e="0"+e;return e}var i="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),o="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),a="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),s="January February March April May June July August September October November December".split(" ");return n=n||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+n.getFullYear()),t=t.replace("%y",""+n.getYear()),t=t.replace("%m",r(n.getMonth()+1,2)),t=t.replace("%d",r(n.getDate(),2)),t=t.replace("%H",""+r(n.getHours(),2)),t=t.replace("%M",""+r(n.getMinutes(),2)),t=t.replace("%S",""+r(n.getSeconds(),2)),t=t.replace("%I",""+((n.getHours()+11)%12+1)),t=t.replace("%p",""+(n.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(s[n.getMonth()])),t=t.replace("%b",""+e.translate(a[n.getMonth()])),t=t.replace("%A",""+e.translate(o[n.getDay()])),t=t.replace("%a",""+e.translate(i[n.getDay()])),t=t.replace("%%","%")}function i(t){var n=e.dom,r=e.getParam("template_replace_values");s(n.select("*",t),function(e){s(r,function(t,i){n.hasClass(e,i)&&"function"==typeof r[i]&&r[i](e)})})}function o(t,n){return s(e.getParam(n),function(e,n){"function"==typeof e&&(e=e(n)),t=t.replace(new RegExp("\\{\\$"+n+"\\}","g"),e)}),t}function a(t,n){function a(e,t){return new RegExp("\\b"+t+"\\b","g").test(e.className)}var l,c,u=e.dom,d=e.selection.getContent();n=o(n,"template_replace_values"),l=u.create("div",null,n),c=u.select(".mceTmpl",l),c&&c.length>0&&(l=u.create("div",null),l.appendChild(c[0].cloneNode(!0))),s(u.select("*",l),function(t){a(t,e.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))&&(t.innerHTML=r(e.getParam("template_cdate_format",e.getLang("template.cdate_format")))),a(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=r(e.getParam("template_mdate_format",e.getLang("template.mdate_format")))),a(t,e.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))&&(t.innerHTML=d)}),i(l),e.execCommand("mceInsertContent",!1,l.innerHTML),e.addVisual()}var s=tinymce.each;e.addCommand("mceInsertTemplate",a),e.addButton("template",{title:"Insert template",onclick:t(n)}),e.addMenuItem("template",{text:"Template",onclick:t(n),context:"insert"}),e.on("PreProcess",function(t){var n=e.dom;s(n.select("div",t.node),function(t){n.hasClass(t,"mceTmpl")&&(s(n.select("*",t),function(t){n.hasClass(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=r(e.getParam("template_mdate_format",e.getLang("template.mdate_format"))))}),i(t))})})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/textcolor/plugin.min.js b/core/media/editors/tinymce/plugins/textcolor/plugin.min.js
new file mode 100644
index 00000000..dfa614b5
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/textcolor/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("textcolor",function(e){function t(t){var n;return e.dom.getParents(e.selection.getStart(),function(e){var r;(r=e.style["forecolor"==t?"color":"background-color"])&&(n=r)}),n}function n(t){var n,r,i=[];for(r=["000000","Black","993300","Burnt orange","333300","Dark olive","003300","Dark green","003366","Dark azure","000080","Navy Blue","333399","Indigo","333333","Very dark gray","800000","Maroon","FF6600","Orange","808000","Olive","008000","Green","008080","Teal","0000FF","Blue","666699","Grayish blue","808080","Gray","FF0000","Red","FF9900","Amber","99CC00","Yellow green","339966","Sea green","33CCCC","Turquoise","3366FF","Royal blue","800080","Purple","999999","Medium gray","FF00FF","Magenta","FFCC00","Gold","FFFF00","Yellow","00FF00","Lime","00FFFF","Aqua","00CCFF","Sky blue","993366","Red violet","FFFFFF","White","FF99CC","Pink","FFCC99","Peach","FFFF99","Light yellow","CCFFCC","Pale green","CCFFFF","Pale cyan","99CCFF","Light sky blue","CC99FF","Plum"],r=e.settings.textcolor_map||r,r=e.settings[t+"_map"]||r,n=0;n<r.length;n+=2)i.push({text:r[n+1],color:"#"+r[n]});return i}function r(){function t(e,t){var n="transparent"==e;return'<td class="mce-grid-cell'+(n?" mce-colorbtn-trans":"")+'"><div id="'+m+"-"+g++ +'" data-mce-color="'+(e?e:"")+'" role="option" tabIndex="-1" style="'+(e?"background-color: "+e:"")+'" title="'+tinymce.translate(t)+'">'+(n?"&#215;":"")+"</div></td>"}var r,i,o,a,s,u,d,f,p=this,m=p._id,g=0;for(f=p.settings.origin,r=n(f),r.push({text:tinymce.translate("No color"),color:"transparent"}),o='<table class="mce-grid mce-grid-border mce-colorbutton-grid" role="list" cellspacing="0"><tbody>',a=r.length-1,u=0;u<c[f];u++){for(o+="<tr>",s=0;s<l[f];s++)d=u*l[f]+s,d>a?o+="<td></td>":(i=r[d],o+=t(i.color,i.text));o+="</tr>"}if(e.settings.color_picker_callback){for(o+='<tr><td colspan="'+l[f]+'" class="mce-custom-color-btn"><div id="'+m+'-c" class="mce-widget mce-btn mce-btn-small mce-btn-flat" role="button" tabindex="-1" aria-labelledby="'+m+'-c" style="width: 100%"><button type="button" role="presentation" tabindex="-1">'+tinymce.translate("Custom...")+"</button></div></td></tr>",o+="<tr>",s=0;s<l[f];s++)o+=t("","Custom color");o+="</tr>"}return o+="</tbody></table>"}function i(t,n){e.undoManager.transact(function(){e.focus(),e.formatter.apply(t,{value:n}),e.nodeChanged()})}function o(t){e.undoManager.transact(function(){e.focus(),e.formatter.remove(t,{value:null},null,!0),e.nodeChanged()})}function a(n){function r(e){d.hidePanel(),d.color(e),i(d.settings.format,e)}function a(){d.hidePanel(),d.resetColor(),o(d.settings.format)}function s(e,t){e.style.background=t,e.setAttribute("data-mce-color",t)}var c,u,d=this.parent();u=d.settings.origin,tinymce.DOM.getParent(n.target,".mce-custom-color-btn")&&(d.hidePanel(),e.settings.color_picker_callback.call(e,function(e){var t,n,i,o=d.panel.getEl().getElementsByTagName("table")[0];for(t=tinymce.map(o.rows[o.rows.length-1].childNodes,function(e){return e.firstChild}),i=0;i<t.length&&(n=t[i],n.getAttribute("data-mce-color"));i++);if(i==l[u])for(i=0;i<l[u]-1;i++)s(t[i],t[i+1].getAttribute("data-mce-color"));s(n,e),r(e)},t(d.settings.format))),c=n.target.getAttribute("data-mce-color"),c?(this.lastId&&document.getElementById(this.lastId).setAttribute("aria-selected",!1),n.target.setAttribute("aria-selected",!0),this.lastId=n.target.id,"transparent"==c?a():r(c)):null!==c&&d.hidePanel()}function s(){var e=this;e._color?i(e.settings.format,e._color):o(e.settings.format)}var l,c;c={forecolor:e.settings.forecolor_rows||e.settings.textcolor_rows||5,backcolor:e.settings.backcolor_rows||e.settings.textcolor_rows||5},l={forecolor:e.settings.forecolor_cols||e.settings.textcolor_cols||8,backcolor:e.settings.backcolor_cols||e.settings.textcolor_cols||8},e.addButton("forecolor",{type:"colorbutton",tooltip:"Text color",format:"forecolor",panel:{origin:"forecolor",role:"application",ariaRemember:!0,html:r,onclick:a},onclick:s}),e.addButton("backcolor",{type:"colorbutton",tooltip:"Background color",format:"hilitecolor",panel:{origin:"backcolor",role:"application",ariaRemember:!0,html:r,onclick:a},onclick:s})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/textpattern/plugin.min.js b/core/media/editors/tinymce/plugins/textpattern/plugin.min.js
new file mode 100644
index 00000000..f2fc5b97
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/textpattern/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("textpattern",function(e){function t(){return c&&(l.sort(function(e,t){return e.start.length>t.start.length?-1:e.start.length<t.start.length?1:0}),c=!1),l}function n(e){for(var n=t(),r=0;r<n.length;r++)if(0===e.indexOf(n[r].start)&&(!n[r].end||e.lastIndexOf(n[r].end)==e.length-n[r].end.length))return n[r]}function r(e,n,r){var i,o,a;for(i=t(),a=0;a<i.length;a++)if(o=i[a],o.end&&e.substr(n-o.end.length-r,o.end.length)==o.end)return o}function i(t){function i(){l=l.splitText(u),l.splitText(c-u-m),l.deleteData(0,p.start.length),l.deleteData(l.data.length-p.end.length,p.end.length)}var o,a,s,l,c,u,d,f,p,m,g;if(o=e.selection,a=e.dom,o.isCollapsed()&&(s=o.getRng(!0),l=s.startContainer,c=s.startOffset,d=l.data,m=t?1:0,3==l.nodeType&&(p=r(d,c,m),p&&(u=Math.max(0,c-m),u=d.lastIndexOf(p.start,u-p.end.length-1),u!==-1&&(f=a.createRng(),f.setStart(l,u),f.setEnd(l,c-m),p=n(f.toString()),p&&p.end&&!(l.data.length<=p.start.length+p.end.length))))))return g=e.formatter.get(p.format),g&&g[0].inline?(i(),e.formatter.apply(p.format,{},l),l):void 0}function o(){var t,r,i,o,a,s,l,c,u,d,f;if(t=e.selection,r=e.dom,t.isCollapsed()&&(l=r.getParent(t.getStart(),"p"))){for(u=new tinymce.dom.TreeWalker(l,l);a=u.next();)if(3==a.nodeType){o=a;break}if(o){if(c=n(o.data),!c)return;if(d=t.getRng(!0),i=d.startContainer,f=d.startOffset,o==i&&(f=Math.max(0,f-c.start.length)),tinymce.trim(o.data).length==c.start.length)return;c.format&&(s=e.formatter.get(c.format),s&&s[0].block&&(o.deleteData(0,c.start.length),e.formatter.apply(c.format,{},o),d.setStart(i,f),d.collapse(!0),t.setRng(d))),c.cmd&&e.undoManager.transact(function(){o.deleteData(0,c.start.length),e.execCommand(c.cmd)})}}}function a(){var t,n;n=i(),n&&(t=e.dom.createRng(),t.setStart(n,n.data.length),t.setEnd(n,n.data.length),e.selection.setRng(t)),o()}function s(){var t,n,r,o,a;t=i(!0),t&&(a=e.dom,n=t.data.slice(-1),/[\u00a0 ]/.test(n)&&(t.deleteData(t.data.length-1,1),r=a.doc.createTextNode(n),t.nextSibling?a.insertAfter(r,t.nextSibling):t.parentNode.appendChild(r),o=a.createRng(),o.setStart(r,1),o.setEnd(r,1),e.selection.setRng(o)))}var l,c=!0;l=e.settings.textpattern_patterns||[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}],e.on("keydown",function(e){13!=e.keyCode||tinymce.util.VK.modifierPressed(e)||a()},!0),e.on("keyup",function(e){32!=e.keyCode||tinymce.util.VK.modifierPressed(e)||s()}),this.getPatterns=t,this.setPatterns=function(e){l=e,c=!0}});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/toc/plugin.min.js b/core/media/editors/tinymce/plugins/toc/plugin.min.js
new file mode 100644
index 00000000..0bb1bbac
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/toc/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("toc",function(e){function t(t){return e.schema.isValidChild("div",t)}function n(t){return t&&e.dom.is(t,"."+d.className)&&e.getBody().contains(t)}function r(){var t=this;t.disabled(e.readonly||!o()),e.on("LoadContent SetContent change",function(){t.disabled(e.readonly||!o())})}function i(e){var t,n=[];for(t=1;t<=e;t++)n.push("h"+t);return n.join(",")}function o(){return!(!d||!a(d).length)}function a(t){var n=i(t.depth),r=f(n);return r.length&&/^h[1-9]$/i.test(t.headerTag)&&(r=r.filter(function(n,r){return!e.dom.hasClass(r.parentNode,t.className)})),tinymce.map(r,function(e){return e.id||(e.id=g()),{id:e.id,level:parseInt(e.nodeName.replace(/^H/i,""),10),title:f.text(e)}})}function s(e){var t,n=9;for(t=0;t<e.length;t++)if(e[t].level<n&&(n=e[t].level),1==n)return n;return n}function l(t,n){var r="<"+t+' contenteditable="true">',i="</"+t+">";return r+e.dom.encode(n)+i}function c(e){var t=u(e);return'<div class="'+e.className+'" contenteditable="false">'+t+"</div>"}function u(e){var t,n,r,i,o="",c=a(e),u=s(c)-1;if(!c.length)return"";for(o+=l(e.headerTag,tinymce.translate("Table of Contents")),t=0;t<c.length;t++){if(r=c[t],i=c[t+1]&&c[t+1].level,u===r.level)o+="<li>";else for(n=u;n<r.level;n++)o+="<ul><li>";if(o+='<a href="#'+r.id+'">'+r.title+"</a>",i!==r.level&&i)for(n=r.level;n>i;n--)o+="</li></ul><li>";else o+="</li>",i||(o+="</ul>");u=r.level}return o}var d,f=e.$,p={depth:3,headerTag:"h2",className:"mce-toc"},m=function(e){var t=0;return function(){var n=(new Date).getTime().toString(32);return e+n+(t++).toString(32)}},g=m("mcetoc_");e.on("PreInit",function(){var n=e.settings,r=parseInt(n.toc_depth,10)||0;d={depth:r>=1&&r<=9?r:p.depth,headerTag:t(n.toc_header)?n.toc_header:p.headerTag,className:n.toc_class?e.dom.encode(n.toc_class):p.className}}),e.on("PreProcess",function(e){var t=f("."+d.className,e.node);t.length&&(t.removeAttr("contentEditable"),t.find("[contenteditable]").removeAttr("contentEditable"))}),e.on("SetContent",function(){var e=f("."+d.className);e.length&&(e.attr("contentEditable",!1),e.children(":first-child").attr("contentEditable",!0))});var h=function(t){return!t.length||e.dom.getParents(t[0],".mce-offscreen-selection").length>0};e.addCommand("mceInsertToc",function(){var t=f("."+d.className);h(t)?e.insertContent(c(d)):e.execCommand("mceUpdateToc")}),e.addCommand("mceUpdateToc",function(){var t=f("."+d.className);t.length&&e.undoManager.transact(function(){t.html(u(d))})}),e.addButton("toc",{tooltip:"Table of Contents",cmd:"mceInsertToc",icon:"toc",onPostRender:r}),e.addButton("tocupdate",{tooltip:"Update",cmd:"mceUpdateToc",icon:"reload"}),e.addContextToolbar(n,"tocupdate"),e.addMenuItem("toc",{text:"Table of Contents",context:"insert",cmd:"mceInsertToc",onPostRender:r})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/visualblocks/css/visualblocks.css b/core/media/editors/tinymce/plugins/visualblocks/css/visualblocks.css
new file mode 100644
index 00000000..1a270892
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/visualblocks/css/visualblocks.css
@@ -0,0 +1,135 @@
+.mce-visualblocks p {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
+}
+
+.mce-visualblocks h1 {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
+}
+
+.mce-visualblocks h2 {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
+}
+
+.mce-visualblocks h3 {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
+}
+
+.mce-visualblocks h4 {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
+}
+
+.mce-visualblocks h5 {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
+}
+
+.mce-visualblocks h6 {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
+}
+
+.mce-visualblocks div:not([data-mce-bogus]) {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
+}
+
+.mce-visualblocks section {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
+}
+
+.mce-visualblocks article {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
+}
+
+.mce-visualblocks blockquote {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
+}
+
+.mce-visualblocks address {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
+}
+
+.mce-visualblocks pre {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin-left: 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
+}
+
+.mce-visualblocks figure {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
+}
+
+.mce-visualblocks hgroup {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
+}
+
+.mce-visualblocks aside {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
+}
+
+.mce-visualblocks figcaption {
+	border: 1px dashed #BBB;
+}
+
+.mce-visualblocks ul {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==)
+}
+
+.mce-visualblocks ol {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
+}
+
+.mce-visualblocks dl {
+	padding-top: 10px;
+	border: 1px dashed #BBB;
+	margin: 0 0 1em 3px;
+	background: transparent no-repeat url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
+}
diff --git a/core/media/editors/tinymce/plugins/visualblocks/plugin.min.js b/core/media/editors/tinymce/plugins/visualblocks/plugin.min.js
new file mode 100644
index 00000000..e5810f45
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/visualblocks/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("visualblocks",function(e,t){function n(){var t=this;t.active(o),e.on("VisualBlocks",function(){t.active(e.dom.hasClass(e.getBody(),"mce-visualblocks"))})}var r,i,o;window.NodeList&&(e.addCommand("mceVisualBlocks",function(){var n,a=e.dom;r||(r=a.uniqueId(),n=a.create("link",{id:r,rel:"stylesheet",href:t+"/css/visualblocks.css"}),e.getDoc().getElementsByTagName("head")[0].appendChild(n)),e.on("PreviewFormats AfterPreviewFormats",function(t){o&&a.toggleClass(e.getBody(),"mce-visualblocks","afterpreviewformats"==t.type)}),a.toggleClass(e.getBody(),"mce-visualblocks"),o=e.dom.hasClass(e.getBody(),"mce-visualblocks"),i&&i.active(a.hasClass(e.getBody(),"mce-visualblocks")),e.fire("VisualBlocks")}),e.addButton("visualblocks",{title:"Show blocks",cmd:"mceVisualBlocks",onPostRender:n}),e.addMenuItem("visualblocks",{text:"Show blocks",cmd:"mceVisualBlocks",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("init",function(){e.settings.visualblocks_default_state&&e.execCommand("mceVisualBlocks",!1,null,{skip_focus:!0})}),e.on("remove",function(){e.dom.removeClass(e.getBody(),"mce-visualblocks")}))});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/visualchars/plugin.min.js b/core/media/editors/tinymce/plugins/visualchars/plugin.min.js
new file mode 100644
index 00000000..2df083c7
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/visualchars/plugin.min.js
@@ -0,0 +1 @@
+tinymce.PluginManager.add("visualchars",function(e){function t(t){function n(e){return'<span data-mce-bogus="1" class="mce-'+p[e]+'">'+e+"</span>"}function o(){var e,t="";for(e in p)t+=e;return new RegExp("["+t+"]","g")}function a(){var e,t="";for(e in p)t&&(t+=","),t+="span.mce-"+p[e];return t}var s,l,c,u,d,f,p,m,g=e.getBody(),h=e.selection;if(p={"\xa0":"nbsp","\xad":"shy"},r=!r,i.state=r,e.fire("VisualChars",{state:r}),m=o(),t&&(f=h.getBookmark()),r)for(l=[],tinymce.walk(g,function(e){3==e.nodeType&&e.nodeValue&&m.test(e.nodeValue)&&l.push(e)},"childNodes"),c=0;c<l.length;c++){for(u=l[c].nodeValue,u=u.replace(m,n),d=e.dom.create("div",null,u);s=d.lastChild;)e.dom.insertAfter(s,l[c]);e.dom.remove(l[c])}else for(l=e.dom.select(a(),g),c=l.length-1;c>=0;c--)e.dom.remove(l[c],1);h.moveToBookmark(f)}function n(){var t=this;e.on("VisualChars",function(e){t.active(e.state)})}var r,i=this;e.addCommand("mceVisualChars",t),e.addButton("visualchars",{title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n,selectable:!0,context:"view",prependToContext:!0})});
\ No newline at end of file
diff --git a/core/media/editors/tinymce/plugins/wordcount/plugin.min.js b/core/media/editors/tinymce/plugins/wordcount/plugin.min.js
new file mode 100644
index 00000000..4c378c0a
--- /dev/null
+++ b/core/media/editors/tinymce/plugins/wordcount/plugin.min.js
@@ -0,0 +1 @@
+!function(){var e={},t=function(t){for(var n=e[t],i=n.deps,o=n.defn,a=i.length,s=new Array(a),l=0;l<a;++l)s[l]=r(i[l]);var c=o.apply(null,s);if(void 0===c)throw"module ["+t+"] returned undefined";n.instance=c},n=function(t,n,r){if("string"!=typeof t)throw"module id must be a string";if(void 0===n)throw"no dependencies for "+t;if(void 0===r)throw"no definition function for "+t;e[t]={deps:n,defn:r,instance:void 0}},r=function(n){var r=e[n];if(void 0===r)throw"module ["+n+"] was undefined";return void 0===r.instance&&t(n),r.instance},i=function(e,t){for(var n=e.length,i=new Array(n),o=0;o<n;++o)i[o]=r(e[o]);t.apply(null,i)},o={};o.bolt={module:{api:{define:n,require:i,demand:r}}};var a=n,s=function(e,t){a(e,[],function(){return t})};s("1",tinymce.PluginManager),s("2",tinymce.util.Delay),a("4",[],function(){var e={aletter:"[A-Za-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f3\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bc0-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u24b6-\u24e9\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005\u303b\u303c\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790\ua791\ua7a0-\ua7a9\ua7fa-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]",midnumlet:"['\\.\u2018\u2019\u2024\ufe52\uff07\uff0e]",midletter:"[:\xb7\xb7\u05f4\u2027\ufe13\ufe55\uff1a]",midnum:"[,;;\u0589\u060c\u060d\u066c\u07f8\u2044\ufe10\ufe14\ufe50\ufe54\uff0c\uff1b]",numeric:"[0-9\u0660-\u0669\u066b\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u1090-\u1099\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1a80-\u1a89\u1a90-\u1a99\u1b50-\u1b59\u1bb0-\u1bb9\u1c40-\u1c49\u1c50-\u1c59\ua620-\ua629\ua8d0-\ua8d9\ua900-\ua909\ua9d0-\ua9d9\uaa50-\uaa59\uabf0-\uabf9]",cr:"\\r",lf:"\\n",newline:"[\x0B\f\x85\u2028\u2029]",extend:"[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f\u109a-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b6-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u192b\u1930-\u193b\u19b0-\u19c0\u19c8\u19c9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f\u1b00-\u1b04\u1b34-\u1b44\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1baa\u1be6-\u1bf3\u1c24-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe3-\uabea\uabec\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]",format:"[\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200e\u200f\u202a-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb]",katakana:"[\u3031-\u3035\u309b\u309c\u30a0-\u30fa\u30fc-\u30ff\u31f0-\u31ff\u32d0-\u32fe\u3300-\u3357\uff66-\uff9d]",extendnumlet:"[_\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f]",punctuation:"[!-#%-*,-\\/:;?@\\[-\\]_{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]"},t={ALETTER:0,MIDNUMLET:1,MIDLETTER:2,MIDNUM:3,NUMERIC:4,CR:5,LF:6,NEWLINE:7,EXTEND:8,FORMAT:9,KATAKANA:10,EXTENDNUMLET:11,AT:12,OTHER:13},n=[new RegExp(e.aletter),new RegExp(e.midnumlet),new RegExp(e.midletter),new RegExp(e.midnum),new RegExp(e.numeric),new RegExp(e.cr),new RegExp(e.lf),new RegExp(e.newline),new RegExp(e.extend),new RegExp(e.format),new RegExp(e.katakana),new RegExp(e.extendnumlet),new RegExp("@")],r="",i=new RegExp("^"+e.punctuation+"$"),o=/\s/;return{characterIndices:t,SETS:n,EMPTY_STRING:r,PUNCTUATION:i,WHITESPACE:o}}),a("7",[],function(){var e=function(e,t,n){var r,i;if(!e)return 0;if(n=n||e,void 0!==e.length){for(r=0,i=e.length;r<i;r++)if(t.call(n,e[r],r,e)===!1)return 0}else for(r in e)if(e.hasOwnProperty(r)&&t.call(n,e[r],r,e)===!1)return 0;return 1},t=function(t,n){var r=[];return e(t,function(e,i){r.push(n(e,i,t))}),r};return{each:e,map:t}}),a("5",["4","7"],function(e,t){var n=e.SETS,r=e.characterIndices.OTHER,i=function(e){var t,i,o=r,a=n.length;for(t=0;t<a;++t)if(i=n[t],i&&i.test(e)){o=t;break}return o},o=function(e){var t={};return function(n){if(t[n])return t[n];var r=e(n);return t[n]=r,r}},a=function(e){var n=o(i);return t.map(e.split(""),n)};return{classify:a}}),a("6",["4"],function(e){var t=e.characterIndices,n=function(e,n){var r,i,o=e[n],a=e[n+1];return!(n<0||n>e.length-1&&0!==n)&&((o!==t.ALETTER||a!==t.ALETTER)&&(i=e[n+2],(o!==t.ALETTER||a!==t.MIDLETTER&&a!==t.MIDNUMLET&&a!==t.AT||i!==t.ALETTER)&&(r=e[n-1],(o!==t.MIDLETTER&&o!==t.MIDNUMLET&&a!==t.AT||a!==t.ALETTER||r!==t.ALETTER)&&((o!==t.NUMERIC&&o!==t.ALETTER||a!==t.NUMERIC&&a!==t.ALETTER)&&((o!==t.MIDNUM&&o!==t.MIDNUMLET||a!==t.NUMERIC||r!==t.NUMERIC)&&((o!==t.NUMERIC||a!==t.MIDNUM&&a!==t.MIDNUMLET||i!==t.NUMERIC)&&(o!==t.EXTEND&&o!==t.FORMAT&&r!==t.EXTEND&&r!==t.FORMAT&&a!==t.EXTEND&&a!==t.FORMAT&&((o!==t.CR||a!==t.LF)&&(o===t.NEWLINE||o===t.CR||o===t.LF||(a===t.NEWLINE||a===t.CR||a===t.LF||(o!==t.KATAKANA||a!==t.KATAKANA)&&((a!==t.EXTENDNUMLET||o!==t.ALETTER&&o!==t.NUMERIC&&o!==t.KATAKANA&&o!==t.EXTENDNUMLET)&&((o!==t.EXTENDNUMLET||a!==t.ALETTER&&a!==t.NUMERIC&&a!==t.KATAKANA)&&o!==t.AT))))))))))))};return{isWordBoundary:n}}),a("3",["4","5","6"],function(e,t,n){var r=e.EMPTY_STRING,i=e.WHITESPACE,o=e.PUNCTUATION,a=function(e){return"http"===e||"https"===e},s=function(e,t){var n;for(n=t;n<e.length;++n){var r=e.charAt(n);if(i.test(r))break}return n},l=function(e,t,n){var r=s(t,n+1),i=t.substring(n+1,r);return"://"===i.substr(0,3)?{word:e+i,index:r}:{word:e,index:n}},c=function(e,s){var c,u,d,f=0,p=t.classify(e),m=p.length,g=[],h=[];for(s||(s={}),s.ignoreCase&&(e=e.toLowerCase()),u=s.includePunctuation,d=s.includeWhitespace;f<m;++f)if(c=e.charAt(f),g.push(c),n.isWordBoundary(p,f)){if(g=g.join(r),g&&(d||!i.test(g))&&(u||!o.test(g)))if(a(g)){var v=l(g,e,f);h.push(v.word),f=v.index}else h.push(g);g=[]}return h};return{getWords:c}}),a("0",["1","2","3"],function(e,t,n){return e.add("wordcount",function(e){var r=function(e){return e.removed?"":e.getBody().innerText},i=function(){return n.getWords(r(e)).length},o=function(){e.theme.panel.find("#wordcount").text(["Words: {0}",i()])};return e.on("init",function(){var n=e.theme.panel&&e.theme.panel.find("#statusbar")[0],r=t.debounce(o,300);n&&t.setEditorTimeout(e,function(){n.insert({type:"label",name:"wordcount",text:["Words: {0}",i()],classes:"wordcount",disabled:e.settings.readonly},0),e.on("setcontent beforeaddundo undo redo keyup",r)},0)}),{getCount:i}}),function(){}}),r("0")()}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/skins/lightgray/content.inline.min.css b/core/media/editors/tinymce/skins/lightgray/content.inline.min.css
new file mode 100644
index 00000000..4030546c
--- /dev/null
+++ b/core/media/editors/tinymce/skins/lightgray/content.inline.min.css
@@ -0,0 +1 @@
+.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}
\ No newline at end of file
diff --git a/core/media/editors/tinymce/skins/lightgray/content.min.css b/core/media/editors/tinymce/skins/lightgray/content.min.css
new file mode 100644
index 00000000..e6fbd1e2
--- /dev/null
+++ b/core/media/editors/tinymce/skins/lightgray/content.min.css
@@ -0,0 +1 @@
+html{height:100%;cursor:text}body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}
\ No newline at end of file
diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b144ba0bd949de3c0f87abdd78b517067169884f
GIT binary patch
literal 9492
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
a@gt-tewA|!qxK@v&x`Qu4XoB(um1(SgK0(p

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg
new file mode 100644
index 00000000..b4ee6f40
--- /dev/null
+++ b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="tinymce-small" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe000;" glyph-name="save" d="M960 80v591.938l-223.938 224.062h-592.062c-44.182 0-80-35.816-80-80v-736c0-44.184 35.818-80 80-80h736c44.184 0 80 35.816 80 80zM576 768h64v-192h-64v192zM704 128h-384v255.882c0.034 0.042 0.076 0.082 0.116 0.118h383.77c0.040-0.036 0.082-0.076 0.116-0.118l-0.002-255.882zM832 128h-64v256c0 35.2-28.8 64-64 64h-384c-35.2 0-64-28.8-64-64v-256h-64v640h64v-192c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v171.010l128-128.072v-490.938z" />
+<glyph unicode="&#xe001;" glyph-name="newdocument" d="M850.746 717.254l-133.492 133.49c-24.888 24.892-74.054 45.256-109.254 45.256h-416c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v544c0 35.2-20.366 84.364-45.254 109.254zM805.49 672.002c6.792-6.796 13.792-19.162 18.894-32.002h-184.384v184.386c12.84-5.1 25.204-12.1 32-18.896l133.49-133.488zM831.884 64h-639.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.77c0.034 0.040 0.076 0.082 0.114 0.114h383.886v-256h256v-511.884c-0.034-0.040-0.076-0.082-0.116-0.116z" />
+<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
+<glyph unicode="&#xe003;" glyph-name="alignleft" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h576v-128h-576zM64 192h576v-128h-576z" />
+<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM256 576h512v-128h-512zM256 192h512v-128h-512z" />
+<glyph unicode="&#xe005;" glyph-name="alignright" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM384 576h576v-128h-576zM384 192h576v-128h-576z" />
+<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M64 768h896v-128h-896zM64 384h896v-128h-896zM64 576h896v-128h-896zM64 192h896v-128h-896z" />
+<glyph unicode="&#xe007;" glyph-name="cut" d="M864.408 289.868c-46.47 46.47-106.938 68.004-161.082 62.806l-63.326 63.326 192 192c0 0 128 128 0 256l-320-320-320 320c-128-128 0-256 0-256l192-192-63.326-63.326c-54.144 5.198-114.61-16.338-161.080-62.806-74.98-74.98-85.112-186.418-22.626-248.9 62.482-62.482 173.92-52.354 248.9 22.626 46.47 46.468 68.002 106.938 62.806 161.080l63.326 63.326 63.328-63.328c-5.196-54.144 16.336-114.61 62.806-161.078 74.978-74.98 186.418-85.112 248.898-22.626 62.488 62.482 52.356 173.918-22.624 248.9zM353.124 201.422c-2.212-24.332-15.020-49.826-35.14-69.946-22.212-22.214-51.080-35.476-77.218-35.476-10.524 0-25.298 2.228-35.916 12.848-21.406 21.404-17.376 73.132 22.626 113.136 22.212 22.214 51.080 35.476 77.218 35.476 10.524 0 25.298-2.228 35.916-12.848 13.112-13.11 13.47-32.688 12.514-43.19zM512 352c-35.346 0-64 28.654-64 64s28.654 64 64 64 64-28.654 64-64-28.654-64-64-64zM819.152 108.848c-10.62-10.62-25.392-12.848-35.916-12.848-26.138 0-55.006 13.262-77.218 35.476-20.122 20.12-32.928 45.614-35.138 69.946-0.958 10.502-0.6 30.080 12.514 43.192 10.618 10.622 25.39 12.848 35.916 12.848 26.136 0 55.006-13.262 77.216-35.474 40.004-40.008 44.032-91.736 22.626-113.14z" />
+<glyph unicode="&#xe008;" glyph-name="paste" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h384l192 192v384h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM704 90.51v101.49h101.49l-101.49-101.49zM832 256h-192v-192h-256v448h448v-256z" />
+<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M888 576h-56v256h64v64h-320v-64h64v-256h-256v256h64v64h-320v-64h64v-256h-56c-39.6 0-72-32.4-72-72v-432c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v312h128v-312c0-39.6 32.4-72 72-72h240c39.6 0 72 32.4 72 72v432c0 39.6-32.4 72-72 72zM348 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM860 64h-184c-19.8 0-36 14.4-36 32s16.2 32 36 32h184c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
+<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM128 768c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 448c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM128 128c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64z" />
+<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 832h576v-128h-576zM384 512h576v-128h-576zM384 192h576v-128h-576zM320 430v146h-64v320h-128v-64h64v-256h-64v-64h128v-50l-128-60v-146h128v-64h-128v-64h128v-64h-128v-64h192v320h-128v50z" />
+<glyph unicode="&#xe00c;" glyph-name="indent" d="M64 768h896v-128h-896zM384 384h576v-128h-576zM384 576h576v-128h-576zM64 192h896v-128h-896zM64 576l224-160-224-160z" />
+<glyph unicode="&#xe00d;" glyph-name="outdent" d="M64 768h896v-128h-896zM64 384h576v-128h-576zM64 576h576v-128h-576zM64 192h896v-128h-896zM960 576l-224-160 224-160z" />
+<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M256.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.954-10.578-19.034-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498zM768.428 535.274c105.8 0 191.572-91.17 191.572-203.638 0-112.464-85.772-203.636-191.572-203.636-105.802 0-191.572 91.17-191.572 203.636l-0.856 29.092c0 224.93 171.54 407.272 383.144 407.272v-116.364c-73.1 0-141.826-30.26-193.516-85.204-9.956-10.578-19.036-21.834-27.224-33.656 9.784 1.64 19.806 2.498 30.024 2.498z" />
+<glyph unicode="&#xe00f;" glyph-name="undo" d="M704 0c59 199 134.906 455.266-256 446.096v-222.096l-336.002 336 336.002 336v-217.326c468.092 12.2 544-358.674 256-678.674z" />
+<glyph unicode="&#xe010;" glyph-name="redo" d="M576 678.674v217.326l336.002-336-336.002-336v222.096c-390.906 9.17-315-247.096-256-446.096-288 320-212.092 690.874 256 678.674z" />
+<glyph unicode="&#xe011;" glyph-name="unlink" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM352 250c-9.724 0-19.45 3.71-26.87 11.128-14.84 14.84-14.84 38.898 0 53.738l320 320c14.84 14.84 38.896 14.84 53.736 0 14.844-14.84 14.844-38.9 0-53.74l-320-320c-7.416-7.416-17.142-11.126-26.866-11.126z" />
+<glyph unicode="&#xe012;" glyph-name="link" d="M927.274 729.784l-133.49 133.488c-21.104 21.104-49.232 32.728-79.198 32.728s-58.094-11.624-79.196-32.726l-165.492-165.49c-43.668-43.668-43.668-114.724 0-158.392l2.746-2.746 67.882 67.882-2.746 2.746c-6.132 6.132-6.132 16.494 0 22.626l165.492 165.492c4.010 4.008 8.808 4.608 11.312 4.608s7.302-0.598 11.312-4.61l133.49-133.488c6.132-6.134 6.132-16.498 0.002-22.628l-165.494-165.494c-4.008-4.008-8.806-4.608-11.31-4.608s-7.302 0.6-11.312 4.612l-2.746 2.746-67.88-67.884 2.742-2.742c21.106-21.108 49.23-32.728 79.2-32.728s58.094 11.624 79.196 32.726l165.494 165.492c43.662 43.666 43.662 114.72-0.004 158.39zM551.356 359.356l-67.882-67.882 2.746-2.746c4.008-4.008 4.61-8.806 4.61-11.31 0-2.506-0.598-7.302-4.606-11.314l-165.494-165.49c-4.010-4.010-8.81-4.61-11.314-4.61s-7.304 0.6-11.314 4.61l-133.492 133.486c-4.010 4.010-4.61 8.81-4.61 11.314s0.598 7.3 4.61 11.312l165.49 165.488c4.010 4.012 8.81 4.612 11.314 4.612s7.304-0.6 11.314-4.612l2.746-2.742 67.882 67.88-2.746 2.746c-21.104 21.104-49.23 32.726-79.196 32.726s-58.092-11.624-79.196-32.726l-165.488-165.486c-21.106-21.104-32.73-49.234-32.73-79.198s11.624-58.094 32.726-79.198l133.49-133.49c21.106-21.102 49.232-32.726 79.198-32.726s58.092 11.624 79.196 32.726l165.494 165.492c21.104 21.104 32.722 49.23 32.722 79.196s-11.624 58.094-32.726 79.196l-2.744 2.746zM800 122c-9.724 0-19.45 3.708-26.87 11.13l-128 127.998c-14.844 14.84-14.844 38.898 0 53.738 14.84 14.844 38.896 14.844 53.736 0l128-128c14.844-14.84 14.844-38.896 0-53.736-7.416-7.422-17.142-11.13-26.866-11.13zM608 0c-17.674 0-32 14.326-32 32v128c0 17.674 14.326 32 32 32s32-14.326 32-32v-128c0-17.674-14.326-32-32-32zM928 320h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32h128c17.674 0 32-14.326 32-32s-14.326-32-32-32zM224 774c9.724 0 19.45-3.708 26.87-11.13l128-128c14.842-14.84 14.842-38.898 0-53.738-14.84-14.844-38.898-14.844-53.738 0l-128 128c-14.842 14.84-14.842 38.898 0 53.738 7.418 7.422 17.144 11.13 26.868 11.13zM416 896c17.674 0 32-14.326 32-32v-128c0-17.674-14.326-32-32-32s-32 14.326-32 32v128c0 17.674 14.326 32 32 32zM96 576h128c17.674 0 32-14.326 32-32s-14.326-32-32-32h-128c-17.674 0-32 14.326-32 32s14.326 32 32 32z" />
+<glyph unicode="&#xe013;" glyph-name="bookmark" d="M256 896v-896l256 256 256-256v896h-512zM704 170.51l-192 192-192-192v661.49h384v-661.49z" />
+<glyph unicode="&#xe014;" glyph-name="image" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM896 128.116c-0.012-0.014-0.030-0.028-0.042-0.042l-191.958 319.926-160-128-224 288-191.968-479.916c-0.010 0.010-0.022 0.022-0.032 0.032v639.77c0.034 0.040 0.076 0.082 0.114 0.114h767.77c0.040-0.034 0.082-0.076 0.116-0.116v-639.768zM640 608c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96z" />
+<glyph unicode="&#xe015;" glyph-name="media" d="M896 832h-768c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64v640c0 35.2-28.8 64-64 64zM256 128h-128v128h128v-128zM256 384h-128v128h128v-128zM256 640h-128v128h128v-128zM704 128h-384v640h384v-640zM896 128h-128v128h128v-128zM896 384h-128v128h128v-128zM896 640h-128v128h128v-128zM384 640v-384l288 192z" />
+<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128v128zM704 704c35.346 0 64-28.654 64-64v-166l-228-154h-92v64l192 128v64h-320v128h384zM512 896c-119.666 0-232.166-46.6-316.784-131.216-84.614-84.618-131.216-197.118-131.216-316.784 0-119.664 46.602-232.168 131.216-316.784 84.618-84.616 197.118-131.216 316.784-131.216 119.664 0 232.168 46.6 316.784 131.216s131.216 197.12 131.216 316.784c0 119.666-46.6 232.166-131.216 316.784-84.616 84.616-197.12 131.216-316.784 131.216z" />
+<glyph unicode="&#xe017;" glyph-name="code" d="M416 256l-192 192 192 192-64 64-256-256 256-256zM672 704l-64-64 192-192-192-192 64-64 256 256z" />
+<glyph unicode="&#xe018;" glyph-name="insertdatetime" d="M77.798 655.376l81.414-50.882c50.802 81.114 128.788 143.454 221.208 174.246l-30.366 91.094c-113.748-37.898-209.728-114.626-272.256-214.458zM673.946 869.834l-30.366-91.094c92.422-30.792 170.404-93.132 221.208-174.248l81.412 50.882c-62.526 99.834-158.506 176.562-272.254 214.46zM607.974 255.992c-4.808 0-9.692 1.090-14.286 3.386l-145.688 72.844v211.778c0 17.672 14.328 32 32 32s32-14.328 32-32v-172.222l110.31-55.156c15.806-7.902 22.214-27.124 14.31-42.932-5.604-11.214-16.908-17.696-28.646-17.698zM512 768c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384zM512 96c-159.058 0-288 128.942-288 288s128.942 288 288 288c159.058 0 288-128.942 288-288s-128.942-288-288-288z" />
+<glyph unicode="&#xe019;" glyph-name="preview" d="M64 504.254c45.318 49.92 97.162 92.36 153.272 125.124 90.332 52.744 192.246 80.622 294.728 80.622 102.48 0 204.396-27.878 294.726-80.624 56.112-32.764 107.956-75.204 153.274-125.124v117.432c-33.010 28.118-68.124 53.14-104.868 74.594-105.006 61.314-223.658 93.722-343.132 93.722s-238.128-32.408-343.134-93.72c-36.742-21.454-71.856-46.478-104.866-74.596v-117.43zM512 640c-183.196 0-345.838-100.556-448-256 102.162-155.448 264.804-256 448-256s345.838 100.552 448 256c-102.162 155.444-264.804 256-448 256zM512 448c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.348 28.654 64 64 64s64-28.652 64-64zM728.066 263.338c-67.434-39.374-140.128-59.338-216.066-59.338s-148.632 19.964-216.066 59.338c-51.554 30.104-98.616 71.31-138.114 120.662 39.498 49.35 86.56 90.558 138.116 120.66 13.276 7.752 26.758 14.74 40.426 20.982-10.512-23.742-16.362-50.008-16.362-77.642 0-106.040 85.962-192 192-192 106.040 0 192 85.96 192 192 0 27.634-5.85 53.9-16.36 77.642 13.668-6.244 27.15-13.23 40.426-20.982 51.554-30.102 98.616-71.31 138.116-120.66-39.498-49.352-86.56-90.558-138.116-120.662z" />
+<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M651.168 676.166c-24.612 81.962-28.876 91.834-107.168 91.834h-64c-79.618 0-82.664-10.152-108.418-96 0-0.002 0-0.002-0.002-0.004l-143.998-479.996h113.636l57.6 192h226.366l57.6-192h113.63l-145.246 484.166zM437.218 512l38.4 136c10.086 33.618 36.38 30 36.38 30s26.294 3.618 36.38-30h0.004l38.4-136h-149.564z" />
+<glyph unicode="&#xe01b;" glyph-name="table" d="M64 768v-704h896v704h-896zM384 320v128h256v-128h-256zM640 256v-128h-256v128h256zM640 640v-128h-256v128h256zM320 640v-128h-192v128h192zM128 448h192v-128h-192v128zM704 448h192v-128h-192v128zM704 512v128h192v-128h-192zM128 256h192v-128h-192v128zM704 128v128h192v-128h-192z" />
+<glyph unicode="&#xe01c;" glyph-name="hr" d="M64 512h896v-128h-896z" />
+<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M64 192h512v-128h-512v128zM768 768h-220.558l-183.766-512h-132.288l183.762 512h-223.15v128h576v-128zM929.774 64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774-62.226-62.226z" />
+<glyph unicode="&#xe01e;" glyph-name="subscript" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe01f;" glyph-name="superscript" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 128v37.004c151.348 61.628 256 193.82 256 346.996 0 212.078-200.576 384-448 384s-448-171.922-448-384c0-153.176 104.654-285.368 256-346.996v-37.004h-192l-64 96v-224h320v222.812c-100.9 51.362-170.666 161.54-170.666 289.188 0 176.732 133.718 320 298.666 320s298.666-143.268 298.666-320c0-127.648-69.766-237.826-170.666-289.188v-222.812h320v224l-64-96h-192z" />
+<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 820c99.366 0 192.782-38.694 263.042-108.956s108.958-163.678 108.958-263.044-38.696-192.782-108.958-263.042-163.676-108.958-263.042-108.958-192.782 38.696-263.044 108.958-108.956 163.676-108.956 263.042 38.694 192.782 108.956 263.044 163.678 108.956 263.044 108.956zM512 896c-247.424 0-448-200.576-448-448s200.576-448 448-448 448 200.576 448 448-200.576 448-448 448v0zM320 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM576 576c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM512 304c-101.84 0-192.56 36.874-251.166 94.328 23.126-117.608 126.778-206.328 251.166-206.328s228.040 88.72 251.168 206.328c-58.608-57.454-149.328-94.328-251.168-94.328z" />
+<glyph unicode="&#xe022;" glyph-name="print" d="M256 832h512v-128h-512v128zM896 640h-768c-35.2 0-64-28.8-64-64v-256c0-35.2 28.796-64 64-64h128v-192h512v192h128c35.2 0 64 28.8 64 64v256c0 35.2-28.8 64-64 64zM704 128h-384v256h384v-256zM910.4 544c0-25.626-20.774-46.4-46.398-46.4s-46.402 20.774-46.402 46.4 20.778 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
+<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M480 576l-192 192 128 128h-352v-352l128 128 192-192zM640 480l192 192 128-128v352h-352l128-128-192-192zM544 320l192-192-128-128h352v352l-128-128-192 192zM384 416l-192-192-128 128v-352h352l-128 128 192 192z" />
+<glyph unicode="&#xe024;" glyph-name="spellcheck" d="M960 832v64h-192c-35.202 0-64-28.8-64-64v-320c0-15.856 5.858-30.402 15.496-41.614l-303.496-260.386-142 148-82-70 224-288 416 448h128v64h-192v320h192zM256 448h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192h128v-192zM128 704v128h128v-128h-128zM640 512v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64zM448 832h128v-128h-128v128zM448 640h128v-128h-128v128z" />
+<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 448h-128v128h128v128h128v-128h128v-128h-128v-128h-128v128zM960 384v-320h-896v320h128v-192h640v192h128z" />
+<glyph unicode="&#xe026;" glyph-name="template" d="M512 576h128v-64h-128zM512 192h128v-64h-128zM576 384h128v-64h-128zM768 384v-192h-64v-64h128v256zM384 384h128v-64h-128zM320 192h128v-64h-128zM320 576h128v-64h-128zM192 768v-256h64v192h64v64zM704 512h128v256h-64v-192h-64zM64 896v-896h896v896h-896zM896 64h-768v768h768v-768zM192 384v-256h64v192h64v64zM576 768h128v-64h-128zM384 768h128v-64h-128z" />
+<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M816 896l16-384h-640l16 384h32l16-320h512l16 320h32zM208 0l-16 320h640l-16-320h-32l-16 256h-512l-16-256h-32zM64 448h128v-64h-128zM256 448h128v-64h-128zM448 448h128v-64h-128zM640 448h128v-64h-128zM832 448h128v-64h-128z" />
+<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
+<glyph unicode="&#xe02a;" glyph-name="bold" d="M625.442 465.818c48.074 38.15 78.558 94.856 78.558 158.182 0 114.876-100.29 208-224 208h-224v-768h288c123.712 0 224 93.124 224 208 0 88.196-59.118 163.562-142.558 193.818zM384 656c0 26.51 21.49 48 48 48h67.204c42.414 0 76.796-42.98 76.796-96s-34.382-96-76.796-96h-115.204v144zM547.2 192h-115.2c-26.51 0-48 21.49-48 48v144h163.2c42.418 0 76.8-42.98 76.8-96s-34.382-96-76.8-96z" />
+<glyph unicode="&#xe02b;" glyph-name="italic" d="M832 832v-64h-144l-256-640h144v-64h-448v64h144l256 640h-144v64h448z" />
+<glyph unicode="&#xe02c;" glyph-name="underline" d="M192 128h576v-64h-576v64zM640 832v-384c0-31.312-14.7-61.624-41.39-85.352-30.942-27.502-73.068-42.648-118.61-42.648-45.544 0-87.668 15.146-118.608 42.648-26.692 23.728-41.392 54.040-41.392 85.352v384h-128v-384c0-141.382 128.942-256 288-256s288 114.618 288 256v384h-128z" />
+<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M960 448h-265.876c-50.078 35.42-114.43 54.86-182.124 54.86-89.206 0-164.572 50.242-164.572 109.712s75.366 109.714 164.572 109.714c75.058 0 140.308-35.576 159.12-82.286h113.016c-7.93 50.644-37.58 97.968-84.058 132.826-50.88 38.16-117.676 59.174-188.078 59.174-70.404 0-137.196-21.014-188.074-59.174-54.788-41.090-86.212-99.502-86.212-160.254s31.424-119.164 86.212-160.254c1.956-1.466 3.942-2.898 5.946-4.316h-265.872v-64h512.532c58.208-17.106 100.042-56.27 100.042-100.572 0-59.468-75.368-109.71-164.572-109.71-75.060 0-140.308 35.574-159.118 82.286h-113.016c7.93-50.64 37.582-97.968 84.060-132.826 50.876-38.164 117.668-59.18 188.072-59.18 70.402 0 137.198 21.016 188.074 59.174 54.79 41.090 86.208 99.502 86.208 160.254 0 35.298-10.654 69.792-30.294 100.572h204.012v64z" />
+<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448z" />
+<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM64 64l224 192-224 192z" />
+<glyph unicode="&#xe030;" glyph-name="rtl" d="M320 832c-123.712 0-224-100.288-224-224s100.288-224 224-224v-320h128v640h64v-640h128v640h128v128h-448zM960 448l-224-192 224-192z" />
+<glyph unicode="&#xe031;" glyph-name="copy" d="M832 640h-192v64l-192 192h-384v-704h384v-192h576v448l-192 192zM832 549.49l101.49-101.49h-101.49v101.49zM448 805.49l101.49-101.49h-101.49v101.49zM128 832h256v-192h192v-384h-448v576zM960 64h-448v128h128v384h128v-192h192v-320z" />
+<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
+<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM840.34 256h87.66l32 448h-896l64-640h356.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM874.996 110.25l-134.496 110.692c17.454 28.922 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l110.692-134.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM576 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
+<glyph unicode="&#xe035;" glyph-name="pastetext" d="M704 576v160c0 17.6-14.4 32-32 32h-160v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-160c-17.602 0-32-14.4-32-32v-512c0-17.6 14.398-32 32-32h224v-192h576v576h-192zM320 831.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 640v64h384v-64h-384zM832 64h-448v448h448v-448zM448 448v-128h32l32 64h64v-192h-48v-64h160v64h-48v192h64l32-64h32v128z" />
+<glyph unicode="&#xe603;" glyph-name="codesample" d="M200.015 577.994v103.994c0 43.077 34.919 77.997 77.997 77.997h26v103.994h-26c-100.51 0-181.991-81.481-181.991-181.991v-103.994c0-43.077-34.919-77.997-77.997-77.997h-26v-103.994h26c43.077 0 77.997-34.919 77.997-77.997v-103.994c0-100.509 81.481-181.991 181.991-181.991h26v103.994h-26c-43.077 0-77.997 34.919-77.997 77.997v103.994c0 50.927-20.928 96.961-54.642 129.994 33.714 33.032 54.642 79.065 54.642 129.994zM823.985 577.994v103.994c0 43.077-34.919 77.997-77.997 77.997h-26v103.994h26c100.509 0 181.991-81.481 181.991-181.991v-103.994c0-43.077 34.919-77.997 77.997-77.997h26v-103.994h-26c-43.077 0-77.997-34.919-77.997-77.997v-103.994c0-100.509-81.482-181.991-181.991-181.991h-26v103.994h26c43.077 0 77.997 34.919 77.997 77.997v103.994c0 50.927 20.928 96.961 54.642 129.994-33.714 33.032-54.642 79.065-54.642 129.994zM615.997 603.277c0-57.435-46.56-103.994-103.994-103.994s-103.994 46.56-103.994 103.994c0 57.435 46.56 103.994 103.994 103.994s103.994-46.56 103.994-103.994zM512 448.717c-57.435 0-103.994-46.56-103.994-103.994 0-55.841 26-100.107 105.747-103.875-23.715-33.413-59.437-46.608-105.747-50.94v-61.747c0 0 207.991-18.144 207.991 216.561-0.202 57.437-46.56 103.996-103.994 103.996z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a983e2dc4cb30880fffe00e1f0879be4d95eb4cc
GIT binary patch
literal 9304
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
V|H?UnQG1YRcKGiNtkxZ`{{_U;RE_`u

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff
new file mode 100644
index 0000000000000000000000000000000000000000..d8962df76e50488c6520c0dadf3220080aaae9fb
GIT binary patch
literal 9380
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

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot
new file mode 100644
index 0000000000000000000000000000000000000000..f99c13f32f5c968849f08a3d8a399157bfb0cccb
GIT binary patch
literal 17572
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
S4xrR19F>Jx9kYDL=l=i@ywbP;

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg
new file mode 100644
index 00000000..5727cea4
--- /dev/null
+++ b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="tinymce" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe000;" glyph-name="save" d="M896 960h-896v-1024h1024v896l-128 128zM512 832h128v-256h-128v256zM896 64h-768v768h64v-320h576v320h74.978l53.022-53.018v-714.982z" />
+<glyph unicode="&#xe001;" glyph-name="newdocument" d="M903.432 760.57l-142.864 142.862c-31.112 31.112-92.568 56.568-136.568 56.568h-480c-44 0-80-36-80-80v-864c0-44 36-80 80-80h736c44 0 80 36 80 80v608c0 44-25.456 105.458-56.568 136.57zM858.178 715.314c3.13-3.13 6.25-6.974 9.28-11.314h-163.458v163.456c4.34-3.030 8.184-6.15 11.314-9.28l142.864-142.862zM896 16c0-8.672-7.328-16-16-16h-736c-8.672 0-16 7.328-16 16v864c0 8.672 7.328 16 16 16h480c4.832 0 10.254-0.61 16-1.704v-254.296h254.296c1.094-5.746 1.704-11.166 1.704-16v-608z" />
+<glyph unicode="&#xe002;" glyph-name="fullpage" d="M1024 367.542v160.916l-159.144 15.914c-8.186 30.042-20.088 58.548-35.21 84.98l104.596 127.838-113.052 113.050-127.836-104.596c-26.434 15.124-54.942 27.026-84.982 35.208l-15.914 159.148h-160.916l-15.914-159.146c-30.042-8.186-58.548-20.086-84.98-35.208l-127.838 104.594-113.050-113.050 104.596-127.836c-15.124-26.432-27.026-54.94-35.21-84.98l-159.146-15.916v-160.916l159.146-15.914c8.186-30.042 20.086-58.548 35.21-84.982l-104.596-127.836 113.048-113.048 127.838 104.596c26.432-15.124 54.94-27.028 84.98-35.21l15.916-159.148h160.916l15.914 159.144c30.042 8.186 58.548 20.088 84.982 35.21l127.836-104.596 113.048 113.048-104.596 127.836c15.124 26.434 27.028 54.942 35.21 84.98l159.148 15.92zM704 384l-128-128h-128l-128 128v128l128 128h128l128-128v-128z" />
+<glyph unicode="&#xe003;" glyph-name="alignleft" d="M0 896h1024v-128h-1024zM0 704h640v-128h-640zM0 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe004;" glyph-name="aligncenter" d="M0 896h1024v-128h-1024zM192 704h640v-128h-640zM192 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe005;" glyph-name="alignright" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 320h640v-128h-640zM0 512h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe006;" glyph-name="alignjustify" d="M0 896h1024v-128h-1024zM0 704h1024v-128h-1024zM0 512h1024v-128h-1024zM0 320h1024v-128h-1024zM0 128h1024v-128h-1024z" />
+<glyph unicode="&#xe007;" glyph-name="cut" d="M890.774 250.846c-45.654 45.556-103.728 69.072-157.946 69.072h-29.112l-63.904 64.008 255.62 256.038c63.904 64.010 63.904 192.028 0 256.038l-383.43-384.056-383.432 384.054c-63.904-64.008-63.904-192.028 0-256.038l255.622-256.034-63.906-64.008h-29.114c-54.22 0-112.292-23.518-157.948-69.076-81.622-81.442-92.65-202.484-24.63-270.35 29.97-29.902 70.288-44.494 112.996-44.494 54.216 0 112.29 23.514 157.946 69.072 53.584 53.464 76.742 124 67.084 185.348l65.384 65.488 65.376-65.488c-9.656-61.348 13.506-131.882 67.084-185.348 45.662-45.558 103.732-69.072 157.948-69.072 42.708 0 83.024 14.592 112.994 44.496 68.020 67.866 56.988 188.908-24.632 270.35zM353.024 114.462c-7.698-17.882-19.010-34.346-33.626-48.926-14.636-14.604-31.172-25.918-49.148-33.624-16.132-6.916-32.96-10.568-48.662-10.568-15.146 0-36.612 3.402-52.862 19.612-16.136 16.104-19.52 37.318-19.52 52.288 0 15.542 3.642 32.21 10.526 48.212 7.7 17.884 19.014 34.346 33.626 48.926 14.634 14.606 31.172 25.914 49.15 33.624 16.134 6.914 32.96 10.568 48.664 10.568 15.146 0 36.612-3.4 52.858-19.614 16.134-16.098 19.522-37.316 19.522-52.284 0.002-15.542-3.638-32.216-10.528-48.214zM512.004 293.404c-49.914 0-90.376 40.532-90.376 90.526 0 49.992 40.462 90.52 90.376 90.52s90.372-40.528 90.372-90.52c0-49.998-40.46-90.526-90.372-90.526zM855.272 40.958c-16.248-16.208-37.712-19.612-52.86-19.612-15.704 0-32.53 3.652-48.666 10.568-17.972 7.706-34.508 19.020-49.142 33.624-14.614 14.58-25.926 31.042-33.626 48.926-6.886 15.998-10.526 32.672-10.526 48.212 0 14.966 3.384 36.188 19.52 52.286 16.246 16.208 37.712 19.614 52.86 19.614 15.7 0 32.53-3.654 48.66-10.568 17.978-7.708 34.516-19.018 49.15-33.624 14.61-14.58 25.924-31.042 33.626-48.926 6.884-15.998 10.526-32.67 10.526-48.212-0.002-14.97-3.39-36.186-19.522-52.288z" />
+<glyph unicode="&#xe008;" glyph-name="paste" d="M832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h448l192 192v512h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM832 26.51v101.49h101.49l-101.49-101.49zM960 192h-192v-192h-320v576h512v-384z" />
+<glyph unicode="&#xe009;" glyph-name="searchreplace" d="M64 960h384v-64h-384zM576 960h384v-64h-384zM952 640h-56v256h-256v-256h-256v256h-256v-256h-56c-39.6 0-72-32.4-72-72v-560c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v376h128v-376c0-39.6 32.4-72 72-72h304c39.6 0 72 32.4 72 72v560c0 39.6-32.4 72-72 72zM348 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32zM544 448h-64c-17.6 0-32 14.4-32 32s14.4 32 32 32h64c17.6 0 32-14.4 32-32s-14.4-32-32-32zM924 0h-248c-19.8 0-36 14.4-36 32s16.2 32 36 32h248c19.8 0 36-14.4 36-32s-16.2-32-36-32z" />
+<glyph unicode="&#xe00a;" glyph-name="bullist" d="M384 896h640v-128h-640v128zM384 512h640v-128h-640v128zM384 128h640v-128h-640v128zM0 832c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 448c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM0 64c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128z" />
+<glyph unicode="&#xe00b;" glyph-name="numlist" d="M384 128h640v-128h-640zM384 512h640v-128h-640zM384 896h640v-128h-640zM192 960v-256h-64v192h-64v64zM128 434v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM256 256v-320h-192v64h128v64h-128v64h128v64h-128v64z" />
+<glyph unicode="&#xe00c;" glyph-name="indent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM0 256v384l256-192z" />
+<glyph unicode="&#xe00d;" glyph-name="outdent" d="M0 896h1024v-128h-1024zM384 704h640v-128h-640zM384 512h640v-128h-640zM384 320h640v-128h-640zM0 128h1024v-128h-1024zM256 640v-384l-256 192z" />
+<glyph unicode="&#xe00e;" glyph-name="blockquote" d="M225 512c123.712 0 224-100.29 224-224 0-123.712-100.288-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.634-11.636-22.252-24.016-31.83-37.020 11.438 1.8 23.16 2.746 35.104 2.746zM801 512c123.71 0 224-100.29 224-224 0-123.712-100.29-224-224-224s-224 100.288-224 224l-1 32c0 247.424 200.576 448 448 448v-128c-85.474 0-165.834-33.286-226.274-93.726-11.636-11.636-22.254-24.016-31.832-37.020 11.44 1.8 23.16 2.746 35.106 2.746z" />
+<glyph unicode="&#xe00f;" glyph-name="undo" d="M761.862-64c113.726 206.032 132.888 520.306-313.862 509.824v-253.824l-384 384 384 384v-248.372c534.962 13.942 594.57-472.214 313.862-775.628z" />
+<glyph unicode="&#xe010;" glyph-name="redo" d="M576 711.628v248.372l384-384-384-384v253.824c-446.75 10.482-427.588-303.792-313.86-509.824-280.712 303.414-221.1 789.57 313.86 775.628z" />
+<glyph unicode="&#xe011;" glyph-name="link" d="M320 256c17.6-17.6 47.274-16.726 65.942 1.942l316.118 316.116c18.668 18.668 19.54 48.342 1.94 65.942s-47.274 16.726-65.942-1.942l-316.116-316.116c-18.668-18.668-19.542-48.342-1.942-65.942zM476.888 284.888c4.56-9.050 6.99-19.16 6.99-29.696 0-17.616-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.382 99.382c-12.248 12.248-18.992 28.694-18.992 46.308s6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994 10.536 0 20.644-2.43 29.696-6.99l65.338 65.338c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-60.67-60.67-60.67-159.948 0-220.618l99.382-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c55.82 55.82 60.238 144.298 13.344 205.344l-65.34-65.34zM978.498 815.116l-99.382 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.972-15.166-110.308-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.248 12.248 28.694 18.994 46.308 18.994s34.060-6.746 46.308-18.994l99.382-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.382-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.502l163.382 163.382c60.67 60.666 60.67 159.944 0 220.614z" />
+<glyph unicode="&#xe012;" glyph-name="unlink" d="M476.888 284.886c4.56-9.048 6.99-19.158 6.99-29.696 0-17.616-6.744-34.058-18.992-46.308l-163.38-163.38c-12.248-12.248-28.696-18.992-46.308-18.992s-34.060 6.744-46.308 18.992l-99.38 99.38c-12.248 12.25-18.992 28.696-18.992 46.308s6.744 34.060 18.992 46.308l163.38 163.382c12.248 12.246 28.696 18.992 46.308 18.992 10.538 0 20.644-2.43 29.696-6.988l65.338 65.336c-27.87 21.41-61.44 32.16-95.034 32.16-39.986 0-79.972-15.166-110.308-45.502l-163.38-163.382c-60.67-60.67-60.67-159.95 0-220.618l99.38-99.382c30.334-30.332 70.32-45.5 110.306-45.5 39.988 0 79.974 15.168 110.308 45.502l163.38 163.38c55.82 55.82 60.238 144.298 13.344 205.346l-65.34-65.338zM978.496 815.116l-99.38 99.382c-30.334 30.336-70.32 45.502-110.308 45.502-39.986 0-79.97-15.166-110.306-45.502l-163.382-163.382c-55.82-55.82-60.238-144.298-13.342-205.342l65.338 65.34c-4.558 9.050-6.988 19.16-6.988 29.694 0 17.616 6.744 34.060 18.992 46.308l163.382 163.382c12.246 12.248 28.694 18.994 46.306 18.994 17.616 0 34.060-6.746 46.308-18.994l99.38-99.382c12.248-12.248 18.992-28.694 18.992-46.308s-6.744-34.060-18.992-46.308l-163.38-163.382c-12.248-12.248-28.694-18.992-46.308-18.992-10.536 0-20.644 2.43-29.696 6.99l-65.338-65.338c27.872-21.41 61.44-32.16 95.034-32.16 39.988 0 79.974 15.168 110.308 45.504l163.38 163.38c60.672 60.666 60.672 159.944 0 220.614zM233.368 681.376l-191.994 191.994 45.256 45.256 191.994-191.994zM384 960h64v-192h-64zM0 576h192v-64h-192zM790.632 214.624l191.996-191.996-45.256-45.256-191.996 191.996zM576 128h64v-192h-64zM832 384h192v-64h-192z" />
+<glyph unicode="&#xe013;" glyph-name="anchor" d="M192 960v-1024l320 320 320-320v1024h-640zM768 90.51l-256 256-256-256v805.49h512v-805.49z" />
+<glyph unicode="&#xe014;" glyph-name="image" d="M0 832v-832h1024v832h-1024zM960 64h-896v704h896v-704zM704 608c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96zM896 128h-768l192 512 256-320 128 96z" />
+<glyph unicode="&#xe015;" glyph-name="media" d="M0 832v-768h1024v768h-1024zM192 128h-128v128h128v-128zM192 384h-128v128h128v-128zM192 640h-128v128h128v-128zM768 128h-512v640h512v-640zM960 128h-128v128h128v-128zM960 384h-128v128h128v-128zM960 640h-128v128h128v-128zM384 640v-384l256 192z" />
+<glyph unicode="&#xe016;" glyph-name="help" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
+<glyph unicode="&#xe017;" glyph-name="code" d="M320 704l-256-256 256-256h128l-256 256 256 256zM704 704h-128l256-256-256-256h128l256 256z" />
+<glyph unicode="&#xe018;" glyph-name="inserttime" d="M512 768c-212.076 0-384-171.922-384-384s171.922-384 384-384c212.074 0 384 171.922 384 384s-171.926 384-384 384zM715.644 180.354c-54.392-54.396-126.716-84.354-203.644-84.354s-149.25 29.958-203.646 84.354c-54.396 54.394-84.354 126.718-84.354 203.646s29.958 149.25 84.354 203.646c54.396 54.396 126.718 84.354 203.646 84.354s149.252-29.958 203.642-84.354c54.402-54.396 84.358-126.718 84.358-203.646s-29.958-149.252-84.356-203.646zM325.93 756.138l-42.94 85.878c-98.874-49.536-179.47-130.132-229.006-229.008l85.876-42.94c40.248 80.336 105.732 145.822 186.070 186.070zM884.134 570.070l85.878 42.938c-49.532 98.876-130.126 179.472-229.004 229.008l-42.944-85.878c80.338-40.248 145.824-105.732 186.070-186.068zM512 576h-64v-192c0-10.11 4.7-19.11 12.022-24.972l-0.012-0.016 160-128 39.976 49.976-147.986 118.39v176.622z" />
+<glyph unicode="&#xe019;" glyph-name="preview" d="M512 640c-209.368 0-395.244-100.556-512-256 116.756-155.446 302.632-256 512-256s395.244 100.554 512 256c-116.756 155.444-302.632 256-512 256zM448 512c35.346 0 64-28.654 64-64s-28.654-64-64-64-64 28.654-64 64 28.654 64 64 64zM773.616 254.704c-39.648-20.258-81.652-35.862-124.846-46.376-44.488-10.836-90.502-16.328-136.77-16.328-46.266 0-92.282 5.492-136.768 16.324-43.194 10.518-85.198 26.122-124.846 46.376-63.020 32.202-120.222 76.41-167.64 129.298 47.418 52.888 104.62 97.1 167.64 129.298 32.336 16.522 66.242 29.946 101.082 40.040-19.888-30.242-31.468-66.434-31.468-105.336 0-106.040 85.962-192 192-192s192 85.96 192 192c0 38.902-11.582 75.094-31.466 105.34 34.838-10.096 68.744-23.52 101.082-40.042 63.022-32.198 120.218-76.408 167.638-129.298-47.42-52.886-104.618-97.1-167.638-129.296zM860.918 716.278c-108.72 55.554-226.112 83.722-348.918 83.722s-240.198-28.168-348.918-83.722c-58.772-30.032-113.732-67.904-163.082-112.076v-109.206c55.338 58.566 120.694 107.754 192.194 144.29 99.62 50.904 207.218 76.714 319.806 76.714s220.186-25.81 319.804-76.716c71.502-36.536 136.858-85.724 192.196-144.29v109.206c-49.35 44.174-104.308 82.046-163.082 112.078z" />
+<glyph unicode="&#xe01a;" glyph-name="forecolor" d="M322.018 128l57.6 192h264.764l57.6-192h113.632l-191.996 640h-223.236l-192-640h113.636zM475.618 640h72.764l57.6-192h-187.964l57.6 192z" />
+<glyph unicode="&#xe01b;" glyph-name="table" d="M0 896v-896h1024v896h-1024zM384 320v192h256v-192h-256zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
+<glyph unicode="&#xe01c;" glyph-name="hr" d="M0 512h1024v-128h-1024z" />
+<glyph unicode="&#xe01d;" glyph-name="removeformat" d="M0 64h576v-128h-576zM192 960h704v-128h-704zM277.388 128l204.688 784.164 123.85-32.328-196.25-751.836zM929.774-64l-129.774 129.774-129.774-129.774-62.226 62.226 129.774 129.774-129.774 129.774 62.226 62.226 129.774-129.774 129.774 129.774 62.226-62.226-129.774-129.774 129.774-129.774z" />
+<glyph unicode="&#xe01e;" glyph-name="sub" d="M768 50v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe01f;" glyph-name="sup" d="M768 754v-50h128v-64h-192v146l128 60v50h-128v64h192v-146zM676 704h-136l-188-188-188 188h-136l256-256-256-256h136l188 188 188-188h136l-256 256z" />
+<glyph unicode="&#xe020;" glyph-name="charmap" d="M704 64h256l64 128v-256h-384v214.214c131.112 56.484 224 197.162 224 361.786 0 214.432-157.598 382.266-352 382.266-194.406 0-352-167.832-352-382.266 0-164.624 92.886-305.302 224-361.786v-214.214h-384v256l64-128h256v32.59c-187.63 66.46-320 227.402-320 415.41 0 247.424 229.23 448 512 448s512-200.576 512-448c0-188.008-132.37-348.95-320-415.41v-32.59z" />
+<glyph unicode="&#xe021;" glyph-name="emoticons" d="M512 960c-282.77 0-512-229.228-512-512 0-282.77 229.228-512 512-512 282.77 0 512 229.23 512 512 0 282.772-229.23 512-512 512zM512 16c-238.586 0-432 193.412-432 432 0 238.586 193.414 432 432 432 238.59 0 432-193.414 432-432 0-238.588-193.41-432-432-432zM384 640c0-35.346-28.654-64-64-64s-64 28.654-64 64 28.654 64 64 64 64-28.654 64-64zM768 640c0-35.346-28.652-64-64-64s-64 28.654-64 64 28.652 64 64 64 64-28.654 64-64zM512 308c141.074 0 262.688 57.532 318.462 123.192-20.872-171.22-156.288-303.192-318.462-303.192-162.118 0-297.498 132.026-318.444 303.168 55.786-65.646 177.386-123.168 318.444-123.168z" />
+<glyph unicode="&#xe022;" glyph-name="print" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
+<glyph unicode="&#xe023;" glyph-name="fullscreen" d="M1024 960v-384l-138.26 138.26-212-212-107.48 107.48 212 212-138.26 138.26zM245.74 821.74l212-212-107.48-107.48-212 212-138.26-138.26v384h384zM885.74 181.74l138.26 138.26v-384h-384l138.26 138.26-212 212 107.48 107.48zM457.74 286.26l-212-212 138.26-138.26h-384v384l138.26-138.26 212 212z" />
+<glyph unicode="&#xe024;" glyph-name="spellchecker" d="M128 704h128v-192h64v384c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-384h64v192zM128 896h128v-128h-128v128zM960 896v64h-192c-35.202 0-64-28.8-64-64v-320c0-35.2 28.798-64 64-64h192v64h-192v320h192zM640 800v96c0 35.2-28.8 64-64 64h-192v-448h192c35.2 0 64 28.8 64 64v96c0 35.2-8.8 64-44 64 35.2 0 44 28.8 44 64zM576 576h-128v128h128v-128zM576 768h-128v128h128v-128zM832 384l-416-448-224 288 82 70 142-148 352 302z" />
+<glyph unicode="&#xe025;" glyph-name="nonbreaking" d="M448 384h-192v128h192v192h128v-192h192v-128h-192v-192h-128zM1024 320v-384h-1024v384h128v-256h768v256z" />
+<glyph unicode="&#xe026;" glyph-name="template" d="M384 768h128v-64h-128zM576 768h128v-64h-128zM896 768v-256h-192v64h128v128h-64v64zM320 576h128v-64h-128zM512 576h128v-64h-128zM192 704v-128h64v-64h-128v256h192v-64zM384 384h128v-64h-128zM576 384h128v-64h-128zM896 384v-256h-192v64h128v128h-64v64zM320 192h128v-64h-128zM512 192h128v-64h-128zM192 320v-128h64v-64h-128v256h192v-64zM960 896h-896v-896h896v896zM1024 960v0-1024h-1024v1024h1024z" />
+<glyph unicode="&#xe027;" glyph-name="pagebreak" d="M0 448h128v-64h-128zM192 448h192v-64h-192zM448 448h128v-64h-128zM640 448h192v-64h-192zM896 448h128v-64h-128zM880 960l16-448h-768l16 448h32l16-384h640l16 384zM144-64l-16 384h768l-16-384h-32l-16 320h-640l-16-320z" />
+<glyph unicode="&#xe028;" glyph-name="restoredraft" d="M576 896c247.424 0 448-200.576 448-448s-200.576-448-448-448v96c94.024 0 182.418 36.614 248.902 103.098s103.098 154.878 103.098 248.902c0 94.022-36.614 182.418-103.098 248.902s-154.878 103.098-248.902 103.098c-94.022 0-182.418-36.614-248.902-103.098-51.14-51.138-84.582-115.246-97.306-184.902h186.208l-224-256-224 256h164.57c31.060 217.102 217.738 384 443.43 384zM768 512v-128h-256v320h128v-192z" />
+<glyph unicode="&#xe02a;" glyph-name="bold" d="M707.88 475.348c37.498 44.542 60.12 102.008 60.12 164.652 0 141.16-114.842 256-256 256h-320v-896h384c141.158 0 256 114.842 256 256 0 92.956-49.798 174.496-124.12 219.348zM384 768h101.5c55.968 0 101.5-57.42 101.5-128s-45.532-128-101.5-128h-101.5v256zM543 128h-159v256h159c58.45 0 106-57.42 106-128s-47.55-128-106-128z" />
+<glyph unicode="&#xe02b;" glyph-name="italic" d="M896 896v-64h-128l-320-768h128v-64h-448v64h128l320 768h-128v64z" />
+<glyph unicode="&#xe02c;" glyph-name="underline" d="M704 896h128v-416c0-159.058-143.268-288-320-288-176.73 0-320 128.942-320 288v416h128v-416c0-40.166 18.238-78.704 51.354-108.506 36.896-33.204 86.846-51.494 140.646-51.494s103.75 18.29 140.646 51.494c33.116 29.802 51.354 68.34 51.354 108.506v416zM192 128h640v-128h-640z" />
+<glyph unicode="&#xe02d;" glyph-name="strikethrough" d="M731.42 442.964c63.92-47.938 100.58-116.086 100.58-186.964s-36.66-139.026-100.58-186.964c-59.358-44.518-137.284-69.036-219.42-69.036-82.138 0-160.062 24.518-219.42 69.036-63.92 47.938-100.58 116.086-100.58 186.964h128c0-69.382 87.926-128 192-128s192 58.618 192 128c0 69.382-87.926 128-192 128-82.138 0-160.062 24.518-219.42 69.036-63.92 47.94-100.58 116.086-100.58 186.964s36.66 139.024 100.58 186.964c59.358 44.518 137.282 69.036 219.42 69.036 82.136 0 160.062-24.518 219.42-69.036 63.92-47.94 100.58-116.086 100.58-186.964h-128c0 69.382-87.926 128-192 128s-192-58.618-192-128c0-69.382 87.926-128 192-128 82.136 0 160.062-24.518 219.42-69.036zM0 448h1024v-64h-1024z" />
+<glyph unicode="&#xe02e;" glyph-name="visualchars" d="M384 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224z" />
+<glyph unicode="&#xe02f;" glyph-name="ltr" d="M448 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM64 512l256-224-256-224z" />
+<glyph unicode="&#xe030;" glyph-name="rtl" d="M256 896h512v-128h-128v-768h-128v768h-128v-768h-128v448c-123.712 0-224 100.288-224 224s100.288 224 224 224zM960 64l-256 224 256 224z" />
+<glyph unicode="&#xe031;" glyph-name="copy" d="M832 704h-192v64l-192 192h-448v-768h384v-256h640v576l-192 192zM832 613.49l101.49-101.49h-101.49v101.49zM448 869.49l101.49-101.49h-101.49v101.49zM64 896h320v-192h192v-448h-512v640zM960 0h-512v192h192v448h128v-192h192v-448z" />
+<glyph unicode="&#xe032;" glyph-name="resize" d="M768 704h64v-64h-64zM640 576h64v-64h-64zM640 448h64v-64h-64zM640 320h64v-64h-64zM512 448h64v-64h-64zM512 320h64v-64h-64zM384 320h64v-64h-64zM768 576h64v-64h-64zM768 448h64v-64h-64zM768 320h64v-64h-64zM768 192h64v-64h-64zM640 192h64v-64h-64zM512 192h64v-64h-64zM384 192h64v-64h-64zM256 192h64v-64h-64z" />
+<glyph unicode="&#xe033;" glyph-name="checkbox" d="M128 416l288-288 480 480-128 128-352-352-160 160z" />
+<glyph unicode="&#xe034;" glyph-name="browse" d="M928 832h-416l-32 64h-352l-64-128h896zM904.34 256h74.86l44.8 448h-1024l64-640h484.080c-104.882 37.776-180.080 138.266-180.080 256 0 149.982 122.018 272 272 272 149.98 0 272-122.018 272-272 0-21.678-2.622-43.15-7.66-64zM1002.996 46.25l-198.496 174.692c17.454 28.92 27.5 62.814 27.5 99.058 0 106.040-85.96 192-192 192s-192-85.96-192-192 85.96-192 192-192c36.244 0 70.138 10.046 99.058 27.5l174.692-198.496c22.962-26.678 62.118-28.14 87.006-3.252l5.492 5.492c24.888 24.888 23.426 64.044-3.252 87.006zM640 196c-68.484 0-124 55.516-124 124s55.516 124 124 124 124-55.516 124-124-55.516-124-124-124z" />
+<glyph unicode="&#xe035;" glyph-name="pastetext" d="M512 448v-128h32l32 64h64v-256h-48v-64h224v64h-48v256h64l32-64h32v128zM832 640v160c0 17.6-14.4 32-32 32h-224v64c0 35.2-28.8 64-64 64h-128c-35.204 0-64-28.8-64-64v-64h-224c-17.602 0-32-14.4-32-32v-640c0-17.6 14.398-32 32-32h288v-192h640v704h-192zM384 895.886c0.034 0.038 0.072 0.078 0.114 0.114h127.768c0.042-0.036 0.082-0.076 0.118-0.114v-63.886h-128v63.886zM192 704v64h512v-64h-512zM960 0h-512v576h512v-576z" />
+<glyph unicode="&#xe600;" glyph-name="gamma" d="M483.2 320l-147.2 336c-9.6 25.6-19.2 44.8-25.6 54.4s-16 12.8-25.6 12.8c-16 0-25.6-3.2-28.8-3.2v70.4c9.6 6.4 25.6 6.4 38.4 9.6 32 0 57.6-6.4 73.6-22.4 6.4-6.4 12.8-16 19.2-25.6 6.4-12.8 12.8-25.6 16-41.6l121.6-291.2 150.4 371.2h92.8l-198.4-470.4v-224h-86.4v224zM0 960v-1024h1024v1024h-1024zM960 0h-896v896h896v-896z" />
+<glyph unicode="&#xe601;" glyph-name="orientation" d="M627.2 80h-579.2v396.8h579.2v-396.8zM553.6 406.4h-435.2v-256h435.2v256zM259.2 732.8c176 176 457.6 176 633.6 0s176-457.6 0-633.6c-121.6-121.6-297.6-160-454.4-108.8 121.6-28.8 262.4 9.6 361.6 108.8 150.4 150.4 160 384 22.4 521.6-121.6 121.6-320 128-470.4 19.2l86.4-86.4-294.4-22.4 22.4 294.4 92.8-92.8z" />
+<glyph unicode="&#xe602;" glyph-name="invert" d="M892.8-22.4l-89.6 89.6c-70.4-80-172.8-131.2-288-131.2-208 0-380.8 166.4-384 377.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4v0c0 0 0 0 0 3.2 0 0 0 3.2 0 3.2 3.2 105.6 48 211.2 105.6 304l-192 192 44.8 44.8 182.4-182.4c0 0 0 0 0 0l569.6-569.6c0 0 0 0 0 0l99.2-99.2-48-44.8zM896 326.4c0 0 0 0 0 0 0 3.2 0 6.4 0 6.4-9.6 316.8-384 627.2-384 627.2s-108.8-89.6-208-220.8l70.4-70.4c6.4 9.6 16 22.4 22.4 32 41.6 51.2 83.2 96 115.2 128v0c32-32 73.6-76.8 115.2-128 108.8-137.6 169.6-265.6 172.8-371.2 0 0 0-3.2 0-3.2v0 0c0-3.2 0-3.2 0-6.4s0-3.2 0-3.2v0 0c0-22.4-3.2-41.6-9.6-64l76.8-76.8c16 41.6 28.8 89.6 28.8 137.6 0 0 0 0 0 0 0 3.2 0 3.2 0 6.4s0 3.2 0 6.4z" />
+<glyph unicode="&#xe603;" glyph-name="codesample" d="M199.995 578.002v104.002c0 43.078 34.923 78.001 78.001 78.001h26v104.002h-26c-100.518 0-182.003-81.485-182.003-182.003v-104.002c0-43.078-34.923-78.001-78.001-78.001h-26v-104.002h26c43.078 0 78.001-34.923 78.001-78.001v-104.002c0-100.515 81.485-182.003 182.003-182.003h26v104.002h-26c-43.078 0-78.001 34.923-78.001 78.001v104.002c0 50.931-20.928 96.966-54.646 130.002 33.716 33.036 54.646 79.072 54.646 130.002zM824.005 578.002v104.002c0 43.078-34.923 78.001-78.001 78.001h-26v104.002h26c100.515 0 182.003-81.485 182.003-182.003v-104.002c0-43.078 34.923-78.001 78.001-78.001h26v-104.002h-26c-43.078 0-78.001-34.923-78.001-78.001v-104.002c0-100.515-81.488-182.003-182.003-182.003h-26v104.002h26c43.078 0 78.001 34.923 78.001 78.001v104.002c0 50.931 20.928 96.966 54.646 130.002-33.716 33.036-54.646 79.072-54.646 130.002zM616.002 603.285c0-57.439-46.562-104.002-104.002-104.002s-104.002 46.562-104.002 104.002c0 57.439 46.562 104.002 104.002 104.002s104.002-46.562 104.002-104.002zM512 448.717c-57.439 0-104.002-46.562-104.002-104.002 0-55.845 26-100.115 105.752-103.88-23.719-33.417-59.441-46.612-105.752-50.944v-61.751c0 0 208.003-18.144 208.003 216.577-0.202 57.441-46.56 104.004-104.002 104.004z" />
+<glyph unicode="&#xe604;" glyph-name="tablerowprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
+<glyph unicode="&#xe605;" glyph-name="tablecellprops" d="M0 896v-896h1024v896h-1024zM640 256v-192h-256v192h256zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192zM704 64v192h256v-192h-256z" />
+<glyph unicode="&#xe606;" glyph-name="table2" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-896v192h896v-192z" />
+<glyph unicode="&#xe607;" glyph-name="tablemergecells" d="M0 896v-896h1024v896h-1024zM384 64v448h576v-448h-576zM640 768v-192h-256v192h256zM320 768v-192h-256v192h256zM64 512h256v-192h-256v192zM704 576v192h256v-192h-256zM64 256h256v-192h-256v192z" />
+<glyph unicode="&#xe608;" glyph-name="tableinsertcolbefore" d="M320 188.8v182.4h-182.4v89.6h182.4v182.4h86.4v-182.4h185.6v-89.6h-185.6v-182.4zM0 896v-896h1024v896h-1024zM640 64h-576v704h576v-704zM960 64h-256v192h256v-192zM960 320h-256v192h256v-192zM960 576h-256v192h256v-192z" />
+<glyph unicode="&#xe609;" glyph-name="tableinsertcolafter" d="M704 643.2v-182.4h182.4v-89.6h-182.4v-182.4h-86.4v182.4h-185.6v89.6h185.6v182.4zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v704h576v-704z" />
+<glyph unicode="&#xe60a;" glyph-name="tableinsertrowbefore" d="M691.2 508.8h-144v-144h-70.4v144h-144v67.2h144v144h70.4v-144h144zM0 896v-896h1024v896h-1024zM320 64h-256v192h256v-192zM640 64h-256v192h256v-192zM960 64h-256v192h256v-192zM960 316.8h-896v451.2h896v-451.2z" />
+<glyph unicode="&#xe60b;" glyph-name="tableinsertrowafter" d="M332.8 323.2h144v144h70.4v-144h144v-67.2h-144v-144h-70.4v144h-144zM0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM64 768h256v-192h-256v192zM960 64h-896v451.2h896v-451.2zM960 576h-256v192h256v-192z" />
+<glyph unicode="&#xe60d;" glyph-name="tablesplitcells" d="M0 896v-896h1024v896h-1024zM384 768h256v-192h-256v192zM320 64h-256v192h256v-192zM320 320h-256v192h256v-192zM320 576h-256v192h256v-192zM960 64h-576v448h576v-448zM960 576h-256v192h256v-192zM864 156.8l-60.8-60.8-131.2 131.2-131.2-131.2-60.8 60.8 131.2 131.2-131.2 131.2 60.8 60.8 131.2-131.2 131.2 131.2 60.8-60.8-131.2-131.2z" />
+<glyph unicode="&#xe60e;" glyph-name="tabledelete" d="M0 896h1024v-896h-1024v896zM60.8 768v-704h899.2v704h-899.2zM809.6 211.2l-96-96-204.8 204.8-204.8-204.8-96 96 204.8 204.8-204.8 204.8 96 96 204.8-204.8 204.8 204.8 96-96-204.8-204.8z" />
+<glyph unicode="&#xe62a;" glyph-name="tableleftheader" d="M0 896v-832h1024v832h-1024zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM640 640h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192zM960 640h-256v192h256v-192z" />
+<glyph unicode="&#xe62b;" glyph-name="tabletopheader" d="M0 896v-832h1024v832h-1024zM320 128h-256v192h256v-192zM320 384h-256v192h256v-192zM640 128h-256v192h256v-192zM640 384h-256v192h256v-192zM960 128h-256v192h256v-192zM960 384h-256v192h256v-192z" />
+<glyph unicode="&#xe800;" glyph-name="tabledeleterow" d="M886.4 572.8l-156.8-156.8 160-160-76.8-76.8-160 160-156.8-156.8-76.8 73.6 160 160-163.2 163.2 76.8 76.8 163.2-163.2 156.8 156.8 73.6-76.8zM0 896v-896h1024v896h-1024zM960 576h-22.4l-64-64h86.4v-192h-89.6l64-64h25.6v-192h-896v192h310.4l64 64h-374.4v192h371.2l-64 64h-307.2v192h896v-192z" />
+<glyph unicode="&#xe801;" glyph-name="tabledeletecol" d="M320 499.2l64-64v-12.8l-64-64v140.8zM640 422.4l64-64v137.6l-64-64v-9.6zM1024 896v-896h-1024v896h1024zM960 768h-256v-51.2l-12.8 12.8-51.2-51.2v89.6h-256v-89.6l-51.2 51.2-12.8-12.8v51.2h-256v-704h256v118.4l35.2-35.2 28.8 28.8v-115.2h256v115.2l48-48 16 16v-83.2h256v707.2zM672 662.4l-156.8-156.8-163.2 163.2-76.8-76.8 163.2-163.2-156.8-156.8 76.8-76.8 156.8 156.8 160-160 76.8 76.8-160 160 156.8 156.8-76.8 76.8z" />
+<glyph unicode="&#xe900;" glyph-name="a11y" d="M960 704v64l-448-128-448 128v-64l320-128v-256l-128-448h64l192 448 192-448h64l-128 448v256zM416 800q0 40 28 68t68 28 68-28 28-68-28-68-68-28-68 28-28 68z" />
+<glyph unicode="&#xe901;" glyph-name="toc" d="M0 896h128v-128h-128v128zM192 896h832v-128h-832v128zM192 704h128v-128h-128v128zM384 704h640v-128h-640v128zM384 512h128v-128h-128v128zM576 512h448v-128h-448v128zM0 320h128v-128h-128v128zM192 320h832v-128h-832v128zM192 128h128v-128h-128v128zM384 128h640v-128h-640v128z" />
+<glyph unicode="&#xe902;" glyph-name="fill" d="M521.6 915.2l-67.2-67.2-86.4 86.4-86.4-86.4 86.4-86.4-368-368 432-432 518.4 518.4-428.8 435.2zM435.2 134.4l-262.4 262.4 35.2 35.2 576 51.2-348.8-348.8zM953.6 409.6c-6.4-6.4-16-16-28.8-32-28.8-32-41.6-64-41.6-89.6v0 0 0 0 0 0 0c0-16 6.4-35.2 22.4-48 12.8-12.8 32-22.4 48-22.4s35.2 6.4 48 22.4 22.4 32 22.4 48v0 0 0 0 0 0 0c0 25.6-12.8 54.4-41.6 89.6-9.6 16-22.4 25.6-28.8 32v0z" />
+<glyph unicode="&#xe903;" glyph-name="borderwidth" d="M0 265.6h1024v-128h-1024v128zM0 32h1024v-64h-1024v64zM0 566.4h1024v-192h-1024v192zM0 928h1024v-256h-1024v256z" />
+<glyph unicode="&#xe904;" glyph-name="line" d="M739.2 627.2l-502.4-502.4h-185.6v185.6l502.4 502.4 185.6-185.6zM803.2 688l-185.6 185.6 67.2 67.2c22.4 22.4 54.4 22.4 76.8 0l108.8-108.8c22.4-22.4 22.4-54.4 0-76.8l-67.2-67.2zM41.6 48h940.8v-112h-940.8v112z" />
+<glyph unicode="&#xe905;" glyph-name="count" d="M0 480h1024v-64h-1024v64zM304 912v-339.2h-67.2v272h-67.2v67.2zM444.8 694.4v-54.4h134.4v-67.2h-201.6v153.6l134.4 64v54.4h-134.4v67.2h201.6v-153.6zM854.4 912v-339.2h-204.8v67.2h137.6v67.2h-137.6v70.4h137.6v67.2h-137.6v67.2zM115.2 166.4c3.2 57.6 38.4 83.2 108.8 83.2 38.4 0 67.2-9.6 86.4-25.6s25.6-35.2 25.6-70.4v-112c0-25.6 0-28.8 9.6-41.6h-73.6c-3.2 9.6-3.2 9.6-6.4 19.2-22.4-19.2-41.6-25.6-70.4-25.6-54.4 0-89.6 32-89.6 76.8s28.8 70.4 99.2 80l38.4 6.4c16 3.2 22.4 6.4 22.4 16 0 12.8-12.8 22.4-38.4 22.4s-41.6-9.6-44.8-28.8h-67.2zM262.4 115.2c-6.4-3.2-12.8-6.4-25.6-6.4l-25.6-6.4c-25.6-6.4-38.4-16-38.4-28.8 0-16 12.8-25.6 35.2-25.6s41.6 9.6 54.4 32v35.2zM390.4 336h73.6v-112c22.4 16 41.6 22.4 67.2 22.4 64 0 105.6-51.2 105.6-124.8 0-76.8-44.8-134.4-108.8-134.4-32 0-48 9.6-67.2 35.2v-28.8h-70.4v342.4zM460.8 121.6c0-41.6 22.4-70.4 51.2-70.4s51.2 28.8 51.2 70.4c0 44.8-19.2 70.4-51.2 70.4-28.8 0-51.2-28.8-51.2-70.4zM851.2 153.6c-3.2 22.4-19.2 35.2-44.8 35.2-32 0-51.2-25.6-51.2-70.4 0-48 19.2-73.6 51.2-73.6 25.6 0 41.6 12.8 44.8 41.6l70.4-3.2c-9.6-60.8-54.4-96-118.4-96-73.6 0-121.6 51.2-121.6 128 0 80 48 131.2 124.8 131.2 64 0 108.8-35.2 112-96h-67.2z" />
+<glyph unicode="&#xe906;" glyph-name="reload" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" />
+<glyph unicode="&#xe907;" glyph-name="translate" d="M553.6 304l-118.4 118.4c80 89.6 137.6 195.2 172.8 304h137.6v92.8h-326.4v92.8h-92.8v-92.8h-326.4v-92.8h518.4c-32-89.6-80-176-147.2-249.6-44.8 48-80 99.2-108.8 156.8h-92.8c35.2-76.8 80-147.2 137.6-211.2l-236.8-233.6 67.2-67.2 233.6 233.6 144-144c3.2 0 38.4 92.8 38.4 92.8zM816 540.8h-92.8l-208-560h92.8l51.2 140.8h220.8l51.2-140.8h92.8l-208 560zM691.2 214.4l76.8 201.6 76.8-201.6h-153.6z" />
+<glyph unicode="&#xe908;" glyph-name="drag" d="M576 896h128v-128h-128v128zM576 640h128v-128h-128v128zM320 640h128v-128h-128v128zM576 384h128v-128h-128v128zM320 384h128v-128h-128v128zM320 128h128v-128h-128v128zM576 128h128v-128h-128v128zM320 896h128v-128h-128v128z" />
+<glyph unicode="&#xe90b;" glyph-name="home" d="M1024 369.556l-512 397.426-512-397.428v162.038l512 397.426 512-397.428zM896 384v-384h-256v256h-256v-256h-256v384l384 288z" />
+<glyph unicode="&#xe911;" glyph-name="books" d="M576.234 670.73l242.712 81.432 203.584-606.784-242.712-81.432zM0 64h256v704h-256v-704zM64 640h128v-64h-128v64zM320 64h256v704h-256v-704zM384 640h128v-64h-128v64z" />
+<glyph unicode="&#xe914;" glyph-name="upload" d="M839.432 760.57c27.492-27.492 50.554-78.672 55.552-120.57h-318.984v318.984c41.898-4.998 93.076-28.060 120.568-55.552l142.864-142.862zM512 576v384h-368c-44 0-80-36-80-80v-864c0-44 36-80 80-80h672c44 0 80 36 80 80v560h-384zM576 192v-192h-192v192h-160l256 256 256-256h-160z" />
+<glyph unicode="&#xe915;" glyph-name="editimage" d="M768 416v-352h-640v640h352l128 128h-512c-52.8 0-96-43.2-96-96v-704c0-52.8 43.2-96 96-96h704c52.798 0 96 43.2 96 96v512l-128-128zM864 960l-608-608v-160h160l608 608c0 96-64 160-160 160zM416 320l-48 48 480 480 48-48-480-480z" />
+<glyph unicode="&#xe91c;" glyph-name="bubble" d="M928 896h-832c-52.8 0-96-43.2-96-96v-512c0-52.8 43.2-96 96-96h160v-256l307.2 256h364.8c52.8 0 96 43.2 96 96v512c0 52.8-43.2 96-96 96zM896 320h-379.142l-196.858-174.714v174.714h-192v448h768v-448z" />
+<glyph unicode="&#xe91d;" glyph-name="user" d="M622.826 257.264c-22.11 3.518-22.614 64.314-22.614 64.314s64.968 64.316 79.128 150.802c38.090 0 61.618 91.946 23.522 124.296 1.59 34.054 48.96 267.324-190.862 267.324s-192.45-233.27-190.864-267.324c-38.094-32.35-14.57-124.296 23.522-124.296 14.158-86.486 79.128-150.802 79.128-150.802s-0.504-60.796-22.614-64.314c-71.22-11.332-337.172-128.634-337.172-257.264h896c0 128.63-265.952 245.932-337.174 257.264z" />
+<glyph unicode="&#xe926;" glyph-name="lock" d="M592 512h-16v192c0 105.87-86.13 192-192 192h-128c-105.87 0-192-86.13-192-192v-192h-16c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h544c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48zM192 704c0 35.29 28.71 64 64 64h128c35.29 0 64-28.71 64-64v-192h-256v192z" />
+<glyph unicode="&#xe927;" glyph-name="unlock" d="M768 896c105.87 0 192-86.13 192-192v-192h-128v192c0 35.29-28.71 64-64 64h-128c-35.29 0-64-28.71-64-64v-192h16c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48h-544c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h400v192c0 105.87 86.13 192 192 192h128z" />
+<glyph unicode="&#xe928;" glyph-name="settings" d="M448 832v16c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576zM256 704v128h128v-128h-128zM832 528c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-576v-128h576v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h192v128h-192v16zM640 384v128h128v-128h-128zM448 208c0 26.4-21.6 48-48 48h-160c-26.4 0-48-21.6-48-48v-16h-192v-128h192v-16c0-26.4 21.6-48 48-48h160c26.4 0 48 21.6 48 48v16h576v128h-576v16zM256 64v128h128v-128h-128z" />
+<glyph unicode="&#xe92a;" glyph-name="remove2" d="M192-64h640l64 704h-768zM640 832v128h-256v-128h-320v-192l64 64h768l64-64v192h-320zM576 832h-128v64h128v-64z" />
+<glyph unicode="&#xe92d;" glyph-name="menu" d="M384 896h256v-256h-256zM384 576h256v-256h-256zM384 256h256v-256h-256z" />
+<glyph unicode="&#xe930;" glyph-name="warning" d="M1009.956 44.24l-437.074 871.112c-16.742 29.766-38.812 44.648-60.882 44.648s-44.14-14.882-60.884-44.648l-437.074-871.112c-33.486-59.532-5-108.24 63.304-108.24h869.308c68.302 0 96.792 48.708 63.302 108.24zM512 64c-35.346 0-64 28.654-64 64 0 35.348 28.654 64 64 64 35.348 0 64-28.652 64-64 0-35.346-28.652-64-64-64zM556 256h-88l-20 256c0 35.346 28.654 64 64 64s64-28.654 64-64l-20-256z" />
+<glyph unicode="&#xe931;" glyph-name="question" d="M448 256h128v-128h-128zM704 704c35.346 0 64-28.654 64-64v-192l-192-128h-128v64l192 128v64h-320v128h384zM512 864c-111.118 0-215.584-43.272-294.156-121.844s-121.844-183.038-121.844-294.156c0-111.118 43.272-215.584 121.844-294.156s183.038-121.844 294.156-121.844c111.118 0 215.584 43.272 294.156 121.844s121.844 183.038 121.844 294.156c0 111.118-43.272 215.584-121.844 294.156s-183.038 121.844-294.156 121.844zM512 960v0c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512z" />
+<glyph unicode="&#xe932;" glyph-name="pluscircle" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512 64c-212.078 0-384 171.922-384 384s171.922 384 384 384c212.078 0 384-171.922 384-384s-171.922-384-384-384zM768 384h-192v-192h-128v192h-192v128h192v192h128v-192h192z" />
+<glyph unicode="&#xe933;" glyph-name="info" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM448 768h128v-128h-128v128zM640 128h-256v64h64v256h-64v64h192v-320h64v-64z" />
+<glyph unicode="&#xe934;" glyph-name="notice" d="M1024 224l-288 736h-448l-288-288v-448l288-288h448l288 288v448l-288 288zM576 128h-128v128h128v-128zM576 384h-128v384h128v-384z" />
+<glyph unicode="&#xe935;" glyph-name="drop" d="M864.626 486.838c-65.754 183.44-205.11 348.15-352.626 473.162-147.516-125.012-286.87-289.722-352.626-473.162-40.664-113.436-44.682-236.562 12.584-345.4 65.846-125.14 198.632-205.438 340.042-205.438s274.196 80.298 340.040 205.44c57.27 108.838 53.25 231.962 12.586 345.398zM738.764 201.044c-43.802-83.252-132.812-137.044-226.764-137.044-55.12 0-108.524 18.536-152.112 50.652 13.242-1.724 26.632-2.652 40.112-2.652 117.426 0 228.668 67.214 283.402 171.242 44.878 85.292 40.978 173.848 23.882 244.338 14.558-28.15 26.906-56.198 36.848-83.932 22.606-63.062 40.024-156.34-5.368-242.604z" />
+<glyph unicode="&#xe939;" glyph-name="minus" d="M0 544v-192c0-17.672 14.328-32 32-32h960c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32h-960c-17.672 0-32-14.328-32-32z" />
+<glyph unicode="&#xe93a;" glyph-name="plus" d="M992 576h-352v352c0 17.672-14.328 32-32 32h-192c-17.672 0-32-14.328-32-32v-352h-352c-17.672 0-32-14.328-32-32v-192c0-17.672 14.328-32 32-32h352v-352c0-17.672 14.328-32 32-32h192c17.672 0 32 14.328 32 32v352h352c17.672 0 32 14.328 32 32v192c0 17.672-14.328 32-32 32z" />
+<glyph unicode="&#xe93b;" glyph-name="arrowup" d="M0 320l192-192 320 320 320-320 192 192-511.998 512z" />
+<glyph unicode="&#xe93c;" glyph-name="arrowright" d="M384 960l-192-192 320-320-320-320 192-192 512 512z" />
+<glyph unicode="&#xe93d;" glyph-name="arrowdown" d="M1024 576l-192 192-320-320-320 320-192-192 512-511.998z" />
+<glyph unicode="&#xe93f;" glyph-name="arrowup2" d="M768 320l-256 256-256-256z" />
+<glyph unicode="&#xe940;" glyph-name="arrowdown2" d="M256 576l256-256 256 256z" />
+<glyph unicode="&#xe941;" glyph-name="menu2" d="M256 704l256-256 256 256zM255.996 384.004l256-256 256 256z" />
+<glyph unicode="&#xe961;" glyph-name="newtab" d="M704 384l128 128v-512h-768v768h512l-128-128h-256v-512h512zM960 896v-352l-130.744 130.744-354.746-354.744h-90.51v90.512l354.744 354.744-130.744 130.744z" />
+<glyph unicode="&#xeaa8;" glyph-name="rotateleft" d="M607.998 831.986c-212.070 0-383.986-171.916-383.986-383.986h-191.994l246.848-246.848 246.848 246.848h-191.994c0 151.478 122.798 274.276 274.276 274.276 151.48 0 274.276-122.798 274.276-274.276 0-151.48-122.796-274.276-274.276-274.276v-109.71c212.070 0 383.986 171.916 383.986 383.986s-171.916 383.986-383.986 383.986z" />
+<glyph unicode="&#xeaa9;" glyph-name="rotateright" d="M416.002 831.986c212.070 0 383.986-171.916 383.986-383.986h191.994l-246.848-246.848-246.848 246.848h191.994c0 151.478-122.798 274.276-274.276 274.276-151.48 0-274.276-122.798-274.276-274.276 0-151.48 122.796-274.276 274.276-274.276v-109.71c-212.070 0-383.986 171.916-383.986 383.986s171.916 383.986 383.986 383.986z" />
+<glyph unicode="&#xeaaa;" glyph-name="flipv" d="M0 576h1024v384zM1024 0v384h-1024z" />
+<glyph unicode="&#xeaac;" glyph-name="fliph" d="M576 960v-1024h384zM0-64h384v1024z" />
+<glyph unicode="&#xeb35;" glyph-name="zoomin" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM448 768h-128v-128h-128v-128h128v-128h128v128h128v128h-128z" />
+<glyph unicode="&#xeb36;" glyph-name="zoomout" d="M992.262 88.604l-242.552 206.294c-25.074 22.566-51.89 32.926-73.552 31.926 57.256 67.068 91.842 154.078 91.842 249.176 0 212.078-171.922 384-384 384-212.076 0-384-171.922-384-384s171.922-384 384-384c95.098 0 182.108 34.586 249.176 91.844-1-21.662 9.36-48.478 31.926-73.552l206.294-242.552c35.322-39.246 93.022-42.554 128.22-7.356s31.892 92.898-7.354 128.22zM384 320c-141.384 0-256 114.616-256 256s114.616 256 256 256 256-114.616 256-256-114.614-256-256-256zM192 640h384v-128h-384z" />
+<glyph unicode="&#xeba7;" glyph-name="sharpen" d="M768 832h-512l-256-256 512-576 512 576-256 256zM512 181.334v2.666h-2.37l-14.222 16h16.592v16h-30.814l-14.222 16h45.036v16h-59.258l-14.222 16h73.48v16h-87.704l-14.222 16h101.926v16h-116.148l-14.222 16h130.37v16h-144.592l-14.222 16h158.814v16h-173.038l-14.222 16h187.26v16h-201.482l-14.222 16h215.704v16h-229.926l-14.222 16h244.148v16h-258.372l-14.222 16h272.594v16h-286.816l-14.222 16h301.038v16h-315.26l-14.222 16h329.482v16h-343.706l-7.344 8.262 139.072 139.072h211.978v-3.334h215.314l16-16h-231.314v-16h247.314l16-16h-263.314v-16h279.314l16-16h-295.314v-16h311.314l16-16h-327.314v-16h343.312l7.738-7.738-351.050-394.928z" />
+<glyph unicode="&#xec6a;" glyph-name="options" d="M64 768h896v-192h-896zM64 512h896v-192h-896zM64 256h896v-192h-896z" />
+<glyph unicode="&#xeccc;" glyph-name="sun" d="M512 128c35.346 0 64-28.654 64-64v-64c0-35.346-28.654-64-64-64s-64 28.654-64 64v64c0 35.346 28.654 64 64 64zM512 768c-35.346 0-64 28.654-64 64v64c0 35.346 28.654 64 64 64s64-28.654 64-64v-64c0-35.346-28.654-64-64-64zM960 512c35.346 0 64-28.654 64-64s-28.654-64-64-64h-64c-35.348 0-64 28.654-64 64s28.652 64 64 64h64zM192 448c0-35.346-28.654-64-64-64h-64c-35.346 0-64 28.654-64 64s28.654 64 64 64h64c35.346 0 64-28.654 64-64zM828.784 221.726l45.256-45.258c24.992-24.99 24.992-65.516 0-90.508-24.994-24.992-65.518-24.992-90.51 0l-45.256 45.256c-24.992 24.99-24.992 65.516 0 90.51 24.994 24.992 65.518 24.992 90.51 0zM195.216 674.274l-45.256 45.256c-24.994 24.994-24.994 65.516 0 90.51s65.516 24.994 90.51 0l45.256-45.256c24.994-24.994 24.994-65.516 0-90.51s-65.516-24.994-90.51 0zM828.784 674.274c-24.992-24.992-65.516-24.992-90.51 0-24.992 24.994-24.992 65.516 0 90.51l45.256 45.254c24.992 24.994 65.516 24.994 90.51 0 24.992-24.994 24.992-65.516 0-90.51l-45.256-45.254zM195.216 221.726c24.992 24.992 65.518 24.992 90.508 0 24.994-24.994 24.994-65.52 0-90.51l-45.254-45.256c-24.994-24.992-65.516-24.992-90.51 0s-24.994 65.518 0 90.508l45.256 45.258zM512 704c-141.384 0-256-114.616-256-256 0-141.382 114.616-256 256-256 141.382 0 256 114.618 256 256 0 141.384-114.616 256-256 256zM512 288c-88.366 0-160 71.634-160 160s71.634 160 160 160 160-71.634 160-160-71.634-160-160-160z" />
+<glyph unicode="&#xeccd;" glyph-name="moon" d="M715.812 895.52c-60.25 34.784-124.618 55.904-189.572 64.48 122.936-160.082 144.768-384.762 37.574-570.42-107.2-185.67-312.688-279.112-512.788-252.68 39.898-51.958 90.376-97.146 150.628-131.934 245.908-141.974 560.37-57.72 702.344 188.198 141.988 245.924 57.732 560.372-188.186 702.356z" />
+<glyph unicode="&#xecd4;" glyph-name="contrast" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM128 448c0 212.078 171.922 384 384 384v-768c-212.078 0-384 171.922-384 384z" />
+<glyph unicode="&#xed6a;" glyph-name="remove22" d="M893.254 738.746l-90.508 90.508-290.746-290.744-290.746 290.744-90.508-90.506 290.746-290.748-290.746-290.746 90.508-90.508 290.746 290.746 290.746-290.746 90.508 90.51-290.744 290.744z" />
+<glyph unicode="&#xedc0;" glyph-name="arrowleft" d="M672-64l192 192-320 320 320 320-192 192-512-512z" />
+<glyph unicode="&#xedf9;" glyph-name="resize2" d="M0 896v-384c0-35.346 28.654-64 64-64s64 28.654 64 64v229.488l677.488-677.488h-229.488c-35.346 0-64-28.652-64-64 0-35.346 28.654-64 64-64h384c35.346 0 64 28.654 64 64v384c0 35.348-28.654 64-64 64s-64-28.652-64-64v-229.488l-677.488 677.488h229.488c35.346 0 64 28.654 64 64s-28.652 64-64 64h-384c-35.346 0-64-28.654-64-64z" />
+<glyph unicode="&#xee78;" glyph-name="crop" d="M832 704l192 192-64 64-192-192h-448v192h-128v-192h-192v-128h192v-512h512v-192h128v192h192v128h-192v448zM320 640h320l-320-320v320zM384 256l320 320v-320h-320z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..16536bfd7a292e7090b9d4e0ae61061da9bc042f
GIT binary patch
literal 17408
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
N%EGLUS-#`*e*qFO!Ds*g

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff b/core/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff
new file mode 100644
index 0000000000000000000000000000000000000000..74b50f4c3001da7fdfffd8638213dcf1a396da78
GIT binary patch
literal 17484
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

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/img/anchor.gif b/core/media/editors/tinymce/skins/lightgray/img/anchor.gif
new file mode 100644
index 0000000000000000000000000000000000000000..606348c7f53dba169a9aca7279a2a973f4b07bdb
GIT binary patch
literal 53
zcmZ?wbhEHbWM^P!XkcUjg8%>jEB<5wG8q|kKzxu40~1eAV&{y5e`l1KFoiKNSOWkz
C+YCGa

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/img/loader.gif b/core/media/editors/tinymce/skins/lightgray/img/loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c69e937232b24ea30f01c68bbd2ebc798dcecfcb
GIT binary patch
literal 2608
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
T)6_**#cgp_+?JL9(ew3BlNF>u

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/img/object.gif b/core/media/editors/tinymce/skins/lightgray/img/object.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cccd7f023fb80908cb33bb7d9604236cd21b7ae7
GIT binary patch
literal 152
zcmV;J0B8S4Nk%w1VG#fg0J9GO<>lo+KR<78Z?v?uS65g4{r%Y3*xlXT%F4>`@9+2b
z_ww@cot>Tk|Nk>HGXMYpA^8LW000jFEC2ui01*HU000C<(8)=wd#<&tyXIMjHBV`d
zBSi|xsj3(;nD0kQ0aJq8eLH~x02P|t2!_J&Wqb%0io?#xD<upxn@Dup`7Ge3XH0HH
G0028|K14A9

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/img/trans.gif b/core/media/editors/tinymce/skins/lightgray/img/trans.gif
new file mode 100644
index 0000000000000000000000000000000000000000..388486517fa8da13ebd150e8f65d5096c3e10c3a
GIT binary patch
literal 43
ncmZ?wbhEHbWMp7un7{x9ia%KxMSyG_5FaGNz{KRj$Y2csb)f_x

literal 0
HcmV?d00001

diff --git a/core/media/editors/tinymce/skins/lightgray/skin.ie7.min.css b/core/media/editors/tinymce/skins/lightgray/skin.ie7.min.css
new file mode 100644
index 00000000..8ebe708f
--- /dev/null
+++ b/core/media/editors/tinymce/skins/lightgray/skin.ie7.min.css
@@ -0,0 +1 @@
+.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,0.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#D9D9D9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#707070}.mce-monospace{font-family:"Courier New",Courier,monospace}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:black}.mce-croprect-handle:focus{border-color:#3498db}.mce-croprect-handle-move:focus{outline:1px solid #3498db}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel-bg{position:absolute;background:url('data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==')}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-arrow-up{margin-top:12px}.mce-arrow-down{margin-top:-12px}.mce-arrow:before,.mce-arrow:after{position:absolute;left:50%;display:block;width:0;height:0;border-style:solid;border-color:transparent;content:""}.mce-arrow.mce-arrow-up:before{top:-9px;border-bottom-color:rgba(0,0,0,0.2);border-width:0 9px 9px;margin-left:-9px}.mce-arrow.mce-arrow-down:before{bottom:-9px;border-top-color:rgba(0,0,0,0.2);border-width:9px 9px 0;margin-left:-9px}.mce-arrow.mce-arrow-up:after{top:-8px;border-bottom-color:#f0f0f0;border-width:0 8px 8px;margin-left:-8px}.mce-arrow.mce-arrow-down:after{bottom:-8px;border-top-color:#f0f0f0;border-width:8px 8px 0;margin-left:-8px}.mce-arrow.mce-arrow-left:before,.mce-arrow.mce-arrow-left:after{margin:0}.mce-arrow.mce-arrow-left:before{left:8px}.mce-arrow.mce-arrow-left:after{left:9px}.mce-arrow.mce-arrow-right:before,.mce-arrow.mce-arrow-right:after{left:auto;margin:0}.mce-arrow.mce-arrow-right:before{right:8px}.mce-arrow.mce-arrow-right:after{right:9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:before{left:-9px;top:50%;border-right-color:rgba(0,0,0,0.2);border-width:9px 9px 9px 0;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:after{left:-8px;top:50%;border-right-color:#f0f0f0;border-width:8px 8px 8px 0;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left{margin-left:12px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:before{right:-9px;top:50%;border-left-color:rgba(0,0,0,0.2);border-width:9px 0 9px 9px;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:after{right:-8px;top:50%;border-left-color:#f0f0f0;border-width:8px 0 8px 8px;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right{margin-left:-14px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,0.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;top:0;left:0;background:#FFF;border:1px solid rgba(0,0,0,0.2);border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,0.2);border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#FFF}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;transform:scale(.1);transition:transform 100ms ease-in,opacity 150ms ease-in}.mce-window.mce-in{transform:scale(1);opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:0;top:0;height:38px;width:38px;text-align:center;cursor:pointer}.mce-window-head .mce-close i{color:#858585}.mce-close:hover i{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:20px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#FFF;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:white;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-ne,.mce-tooltip-se{margin-left:14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-progress{display:inline-block;position:relative;height:20px}.mce-progress .mce-bar-container{display:inline-block;width:100px;height:100%;margin-right:8px;border:1px solid #ccc;overflow:hidden}.mce-progress .mce-text{display:inline-block;margin-top:auto;margin-bottom:auto;font-size:14px;width:40px;color:#333}.mce-bar{display:block;width:0;height:100%;background-color:#d7d7d7;-webkit-transition:width .2s ease;transition:width .2s ease}.mce-notification{position:absolute;background-color:#F0F0F0;padding:5px;margin-top:5px;border-width:1px;border-style:solid;border-color:#CCCCCC;transition:transform 100ms ease-in,opacity 150ms ease-in;opacity:0}.mce-notification.mce-in{opacity:1}.mce-notification-success{background-color:#dff0d8;border-color:#d6e9c6}.mce-notification-info{background-color:#d9edf7;border-color:#779ECB}.mce-notification-warning{background-color:#fcf8e3;border-color:#faebcc}.mce-notification-error{background-color:#f2dede;border-color:#ebccd1}.mce-notification.mce-has-close{padding-right:15px}.mce-notification .mce-ico{margin-top:5px}.mce-notification-inner{display:inline-block;font-size:14px;margin:5px 8px 4px 8px;text-align:center;white-space:normal;color:#31708f}.mce-notification-inner a{text-decoration:underline;cursor:pointer}.mce-notification .mce-progress{margin-right:8px}.mce-notification .mce-progress .mce-text{margin-top:5px}.mce-notification *,.mce-notification .mce-progress .mce-text{color:#333333}.mce-notification .mce-progress .mce-bar-container{border-color:#CCCCCC}.mce-notification .mce-progress .mce-bar-container .mce-bar{background-color:#333333}.mce-notification-success *,.mce-notification-success .mce-progress .mce-text{color:#3c763d}.mce-notification-success .mce-progress .mce-bar-container{border-color:#d6e9c6}.mce-notification-success .mce-progress .mce-bar-container .mce-bar{background-color:#3c763d}.mce-notification-info *,.mce-notification-info .mce-progress .mce-text{color:#31708f}.mce-notification-info .mce-progress .mce-bar-container{border-color:#779ECB}.mce-notification-info .mce-progress .mce-bar-container .mce-bar{background-color:#31708f}.mce-notification-warning *,.mce-notification-warning .mce-progress .mce-text{color:#8a6d3b}.mce-notification-warning .mce-progress .mce-bar-container{border-color:#faebcc}.mce-notification-warning .mce-progress .mce-bar-container .mce-bar{background-color:#8a6d3b}.mce-notification-error *,.mce-notification-error .mce-progress .mce-text{color:#a94442}.mce-notification-error .mce-progress .mce-bar-container{border-color:#ebccd1}.mce-notification-error .mce-progress .mce-bar-container .mce-bar{background-color:#a94442}.mce-notification .mce-close{position:absolute;top:6px;right:8px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary.mce-btn-has-text{min-width:50px}.mce-primary{color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn .mce-txt{font-size:inherit;line-height:inherit;color:inherit}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:transparent;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{position:relative;display:inline-block;*display:inline;*zoom:1;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0;margin:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-combobox .mce-status{position:absolute;right:2px;top:50%;line-height:16px;margin-top:-8px;font-size:12px;width:15px;height:15px;text-align:center;cursor:pointer}.mce-combobox.mce-has-status input{padding-right:20px}.mce-combobox.mce-has-open .mce-status{right:37px}.mce-combobox .mce-status.mce-i-warning{color:#c09853}.mce-combobox .mce-status.mce-i-checkmark{color:#468847}.mce-menu.mce-combobox-menu{border-top:0;margin-top:0;max-height:200px}.mce-menu.mce-combobox-menu .mce-menu-item{padding:4px 6px 4px 4px;font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-sep{padding:0}.mce-menu.mce-combobox-menu .mce-text{font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-link,.mce-menu.mce-combobox-menu .mce-menu-item-link b{font-size:11px}.mce-menu.mce-combobox-menu .mce-text b{font-size:11px}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,0.2);width:100%;height:100%}.mce-infobox{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden;border:1px solid red}.mce-infobox div{display:block;margin:5px}.mce-infobox div button{position:absolute;top:50%;right:4px;cursor:pointer;margin-top:-8px;display:none}.mce-infobox div button:focus{outline:2px solid #ccc}.mce-infobox.mce-has-help div{margin-right:25px}.mce-infobox.mce-has-help button{display:block}.mce-infobox.mce-success{background:#dff0d8;border-color:#d6e9c6}.mce-infobox.mce-success div{color:#3c763d}.mce-infobox.mce-warning{background:#fcf8e3;border-color:#faebcc}.mce-infobox.mce-warning div{color:#8a6d3b}.mce-infobox.mce-error{background:#f2dede;border-color:#ebccd1}.mce-infobox.mce-error div{color:#a94442}.mce-rtl .mce-infobox div{text-align:right;direction:rtl}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-success{color:#468847}.mce-label.mce-warning{color:#c09853}.mce-label.mce-error{color:#b94a48}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,0.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:white}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#CCC}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:white}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:white}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:white}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:white}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:white}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:white;background-color:#2d8ac7}.mce-menu-item-link{color:#093;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mce-menu-item-link b{color:#093}.mce-menu-item-ellipsis{display:block;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.mce-menu-item:hover *,.mce-menu-item.mce-selected *,.mce-menu-item:focus *{color:white}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}div.mce-menu .mce-menu-item b{font-weight:bold}.mce-menu-item-indent-1{padding-left:20px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-3{padding-left:40px}.mce-menu-item-indent-4{padding-left:45px}.mce-menu-item-indent-5{padding-left:50px}.mce-menu-item-indent-6{padding-left:55px}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:white}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}.mce-menu .mce-throbber-inline{height:25px;background-size:contain}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-selectbox{background:#fff;border:1px solid #c5c5c5}.mce-slider{border:1px solid #AAA;background:#EEE;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #BBB;background:#DDD;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-slider-handle:focus{background:#BBB}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#FFF}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#ffffff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#FDFDFD}.mce-tab.mce-active{background:#FDFDFD;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px;height:auto}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-btn-small .mce-ico{font-family:'tinymce-small'}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = this.currentStyle['-ie7-icon'].substr(1, 1) + '&nbsp;')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-alignnone{-ie7-icon:"\e003"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-insertdatetime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-pastetext{-ie7-icon:"\e035"}.mce-i-rotateleft{-ie7-icon:"\eaa8"}.mce-i-rotateright{-ie7-icon:"\eaa9"}.mce-i-crop{-ie7-icon:"\ee78"}.mce-i-editimage{-ie7-icon:"\e914"}.mce-i-options{-ie7-icon:"\ec6a"}.mce-i-flipv{-ie7-icon:"\eaaa"}.mce-i-fliph{-ie7-icon:"\eaac"}.mce-i-zoomin{-ie7-icon:"\eb35"}.mce-i-zoomout{-ie7-icon:"\eb36"}.mce-i-sun{-ie7-icon:"\eccc"}.mce-i-moon{-ie7-icon:"\eccd"}.mce-i-arrowleft{-ie7-icon:"\edc0"}.mce-i-arrowright{-ie7-icon:"\edb8"}.mce-i-drop{-ie7-icon:"\e934"}.mce-i-contrast{-ie7-icon:"\ecd4"}.mce-i-sharpen{-ie7-icon:"\eba7"}.mce-i-palette{-ie7-icon:"\e92a"}.mce-i-resize2{-ie7-icon:"\edf9"}.mce-i-orientation{-ie7-icon:"\e601"}.mce-i-invert{-ie7-icon:"\e602"}.mce-i-gamma{-ie7-icon:"\e600"}.mce-i-remove{-ie7-icon:"\ed6a"}.mce-i-codesample{-ie7-icon:"\e603"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB}
\ No newline at end of file
diff --git a/core/media/editors/tinymce/skins/lightgray/skin.min.css b/core/media/editors/tinymce/skins/lightgray/skin.min.css
new file mode 100644
index 00000000..05f23f9f
--- /dev/null
+++ b/core/media/editors/tinymce/skins/lightgray/skin.min.css
@@ -0,0 +1 @@
+.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,0.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#D9D9D9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#707070}.mce-monospace{font-family:"Courier New",Courier,monospace}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:black}.mce-croprect-handle:focus{border-color:#3498db}.mce-croprect-handle-move:focus{outline:1px solid #3498db}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel-bg{position:absolute;background:url('data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==')}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-arrow-up{margin-top:12px}.mce-arrow-down{margin-top:-12px}.mce-arrow:before,.mce-arrow:after{position:absolute;left:50%;display:block;width:0;height:0;border-style:solid;border-color:transparent;content:""}.mce-arrow.mce-arrow-up:before{top:-9px;border-bottom-color:rgba(0,0,0,0.2);border-width:0 9px 9px;margin-left:-9px}.mce-arrow.mce-arrow-down:before{bottom:-9px;border-top-color:rgba(0,0,0,0.2);border-width:9px 9px 0;margin-left:-9px}.mce-arrow.mce-arrow-up:after{top:-8px;border-bottom-color:#f0f0f0;border-width:0 8px 8px;margin-left:-8px}.mce-arrow.mce-arrow-down:after{bottom:-8px;border-top-color:#f0f0f0;border-width:8px 8px 0;margin-left:-8px}.mce-arrow.mce-arrow-left:before,.mce-arrow.mce-arrow-left:after{margin:0}.mce-arrow.mce-arrow-left:before{left:8px}.mce-arrow.mce-arrow-left:after{left:9px}.mce-arrow.mce-arrow-right:before,.mce-arrow.mce-arrow-right:after{left:auto;margin:0}.mce-arrow.mce-arrow-right:before{right:8px}.mce-arrow.mce-arrow-right:after{right:9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:before{left:-9px;top:50%;border-right-color:rgba(0,0,0,0.2);border-width:9px 9px 9px 0;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left:after{left:-8px;top:50%;border-right-color:#f0f0f0;border-width:8px 8px 8px 0;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-left{margin-left:12px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:before{right:-9px;top:50%;border-left-color:rgba(0,0,0,0.2);border-width:9px 0 9px 9px;margin-top:-9px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right:after{right:-8px;top:50%;border-left-color:#f0f0f0;border-width:8px 0 8px 8px;margin-top:-8px}.mce-arrow.mce-arrow-center.mce-arrow.mce-arrow-right{margin-left:-14px}.mce-edit-aria-container>.mce-container-body{display:flex}.mce-edit-aria-container>.mce-container-body .mce-edit-area{flex:1}.mce-edit-aria-container>.mce-container-body .mce-sidebar>.mce-container-body{display:flex;align-items:stretch;height:100%}.mce-edit-aria-container>.mce-container-body .mce-sidebar-panel{min-width:250px;max-width:250px;position:relative}.mce-edit-aria-container>.mce-container-body .mce-sidebar-panel>.mce-container-body{position:absolute;width:100%;height:100%;overflow:auto;top:0;left:0}.mce-sidebar-toolbar{border:0 solid rgba(0,0,0,0.2);border-left-width:1px}.mce-sidebar-toolbar .mce-btn.mce-active,.mce-sidebar-toolbar .mce-btn.mce-active:hover{border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-sidebar-toolbar .mce-btn.mce-active button,.mce-sidebar-toolbar .mce-btn.mce-active:hover button,.mce-sidebar-toolbar .mce-btn.mce-active button i,.mce-sidebar-toolbar .mce-btn.mce-active:hover button i{color:#fff;text-shadow:1px 1px none}.mce-sidebar-panel{border:0 solid rgba(0,0,0,0.2);border-left-width:1px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,0.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;top:0;left:0;background:#FFF;border:1px solid rgba(0,0,0,0.2);border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,0.2);border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#FFF}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#FFF;position:fixed;top:0;left:0;opacity:0;transform:scale(.1);transition:transform 100ms ease-in,opacity 150ms ease-in}.mce-window.mce-in{transform:scale(1);opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:0;top:0;height:38px;width:38px;text-align:center;cursor:pointer}.mce-window-head .mce-close i{color:#858585}.mce-close:hover i{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:20px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#FFF;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:white;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-ne,.mce-tooltip-se{margin-left:14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-progress{display:inline-block;position:relative;height:20px}.mce-progress .mce-bar-container{display:inline-block;width:100px;height:100%;margin-right:8px;border:1px solid #ccc;overflow:hidden}.mce-progress .mce-text{display:inline-block;margin-top:auto;margin-bottom:auto;font-size:14px;width:40px;color:#333}.mce-bar{display:block;width:0;height:100%;background-color:#d7d7d7;-webkit-transition:width .2s ease;transition:width .2s ease}.mce-notification{position:absolute;background-color:#F0F0F0;padding:5px;margin-top:5px;border-width:1px;border-style:solid;border-color:#CCCCCC;transition:transform 100ms ease-in,opacity 150ms ease-in;opacity:0}.mce-notification.mce-in{opacity:1}.mce-notification-success{background-color:#dff0d8;border-color:#d6e9c6}.mce-notification-info{background-color:#d9edf7;border-color:#779ECB}.mce-notification-warning{background-color:#fcf8e3;border-color:#faebcc}.mce-notification-error{background-color:#f2dede;border-color:#ebccd1}.mce-notification.mce-has-close{padding-right:15px}.mce-notification .mce-ico{margin-top:5px}.mce-notification-inner{display:inline-block;font-size:14px;margin:5px 8px 4px 8px;text-align:center;white-space:normal;color:#31708f}.mce-notification-inner a{text-decoration:underline;cursor:pointer}.mce-notification .mce-progress{margin-right:8px}.mce-notification .mce-progress .mce-text{margin-top:5px}.mce-notification *,.mce-notification .mce-progress .mce-text{color:#333333}.mce-notification .mce-progress .mce-bar-container{border-color:#CCCCCC}.mce-notification .mce-progress .mce-bar-container .mce-bar{background-color:#333333}.mce-notification-success *,.mce-notification-success .mce-progress .mce-text{color:#3c763d}.mce-notification-success .mce-progress .mce-bar-container{border-color:#d6e9c6}.mce-notification-success .mce-progress .mce-bar-container .mce-bar{background-color:#3c763d}.mce-notification-info *,.mce-notification-info .mce-progress .mce-text{color:#31708f}.mce-notification-info .mce-progress .mce-bar-container{border-color:#779ECB}.mce-notification-info .mce-progress .mce-bar-container .mce-bar{background-color:#31708f}.mce-notification-warning *,.mce-notification-warning .mce-progress .mce-text{color:#8a6d3b}.mce-notification-warning .mce-progress .mce-bar-container{border-color:#faebcc}.mce-notification-warning .mce-progress .mce-bar-container .mce-bar{background-color:#8a6d3b}.mce-notification-error *,.mce-notification-error .mce-progress .mce-text{color:#a94442}.mce-notification-error .mce-progress .mce-bar-container{border-color:#ebccd1}.mce-notification-error .mce-progress .mce-bar-container .mce-bar{background-color:#a94442}.mce-notification .mce-close{position:absolute;top:6px;right:8px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary.mce-btn-has-text{min-width:50px}.mce-primary{color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn .mce-txt{font-size:inherit;line-height:inherit;color:inherit}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:transparent;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{position:relative;display:inline-block;*display:inline;*zoom:1;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0;margin:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-combobox .mce-status{position:absolute;right:2px;top:50%;line-height:16px;margin-top:-8px;font-size:12px;width:15px;height:15px;text-align:center;cursor:pointer}.mce-combobox.mce-has-status input{padding-right:20px}.mce-combobox.mce-has-open .mce-status{right:37px}.mce-combobox .mce-status.mce-i-warning{color:#c09853}.mce-combobox .mce-status.mce-i-checkmark{color:#468847}.mce-menu.mce-combobox-menu{border-top:0;margin-top:0;max-height:200px}.mce-menu.mce-combobox-menu .mce-menu-item{padding:4px 6px 4px 4px;font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-sep{padding:0}.mce-menu.mce-combobox-menu .mce-text{font-size:11px}.mce-menu.mce-combobox-menu .mce-menu-item-link,.mce-menu.mce-combobox-menu .mce-menu-item-link b{font-size:11px}.mce-menu.mce-combobox-menu .mce-text b{font-size:11px}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,0.2);width:100%;height:100%}.mce-infobox{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden;border:1px solid red}.mce-infobox div{display:block;margin:5px}.mce-infobox div button{position:absolute;top:50%;right:4px;cursor:pointer;margin-top:-8px;display:none}.mce-infobox div button:focus{outline:2px solid #ccc}.mce-infobox.mce-has-help div{margin-right:25px}.mce-infobox.mce-has-help button{display:block}.mce-infobox.mce-success{background:#dff0d8;border-color:#d6e9c6}.mce-infobox.mce-success div{color:#3c763d}.mce-infobox.mce-warning{background:#fcf8e3;border-color:#faebcc}.mce-infobox.mce-warning div{color:#8a6d3b}.mce-infobox.mce-error{background:#f2dede;border-color:#ebccd1}.mce-infobox.mce-error div{color:#a94442}.mce-rtl .mce-infobox div{text-align:right;direction:rtl}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-success{color:#468847}.mce-label.mce-warning{color:#c09853}.mce-label.mce-error{color:#b94a48}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,0.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:white}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#CCC}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:white}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:white}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:white}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:white}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:white}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:white;background-color:#2d8ac7}.mce-menu-item-link{color:#093;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.mce-menu-item-link b{color:#093}.mce-menu-item-ellipsis{display:block;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.mce-menu-item:hover *,.mce-menu-item.mce-selected *,.mce-menu-item:focus *{color:white}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}div.mce-menu .mce-menu-item b{font-weight:bold}.mce-menu-item-indent-1{padding-left:20px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-2{padding-left:35px}.mce-menu-item-indent-3{padding-left:40px}.mce-menu-item-indent-4{padding-left:45px}.mce-menu-item-indent-5{padding-left:50px}.mce-menu-item-indent-6{padding-left:55px}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:white}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}.mce-menu .mce-throbber-inline{height:25px;background-size:contain}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-selectbox{background:#fff;border:1px solid #c5c5c5}.mce-slider{border:1px solid #AAA;background:#EEE;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #BBB;background:#DDD;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-slider-handle:focus{background:#BBB}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#FFF}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#ffffff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#FDFDFD}.mce-tab.mce-active{background:#FDFDFD;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px;height:auto}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-variant:normal;font-size:16px;line-height:16px;speak:none;vertical-align:text-top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;background:transparent center center;background-size:cover;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-alignnone:before{content:"\e003"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-insertdatetime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-rotateleft:before{content:"\eaa8"}.mce-i-rotateright:before{content:"\eaa9"}.mce-i-crop:before{content:"\ee78"}.mce-i-editimage:before{content:"\e915"}.mce-i-options:before{content:"\ec6a"}.mce-i-flipv:before{content:"\eaaa"}.mce-i-fliph:before{content:"\eaac"}.mce-i-zoomin:before{content:"\eb35"}.mce-i-zoomout:before{content:"\eb36"}.mce-i-sun:before{content:"\eccc"}.mce-i-moon:before{content:"\eccd"}.mce-i-arrowleft:before{content:"\edc0"}.mce-i-arrowright:before{content:"\e93c"}.mce-i-drop:before{content:"\e935"}.mce-i-contrast:before{content:"\ecd4"}.mce-i-sharpen:before{content:"\eba7"}.mce-i-resize2:before{content:"\edf9"}.mce-i-orientation:before{content:"\e601"}.mce-i-invert:before{content:"\e602"}.mce-i-gamma:before{content:"\e600"}.mce-i-remove:before{content:"\ed6a"}.mce-i-tablerowprops:before{content:"\e604"}.mce-i-tablecellprops:before{content:"\e605"}.mce-i-table2:before{content:"\e606"}.mce-i-tablemergecells:before{content:"\e607"}.mce-i-tableinsertcolbefore:before{content:"\e608"}.mce-i-tableinsertcolafter:before{content:"\e609"}.mce-i-tableinsertrowbefore:before{content:"\e60a"}.mce-i-tableinsertrowafter:before{content:"\e60b"}.mce-i-tablesplitcells:before{content:"\e60d"}.mce-i-tabledelete:before{content:"\e60e"}.mce-i-tableleftheader:before{content:"\e62a"}.mce-i-tabletopheader:before{content:"\e62b"}.mce-i-tabledeleterow:before{content:"\e800"}.mce-i-tabledeletecol:before{content:"\e801"}.mce-i-codesample:before{content:"\e603"}.mce-i-fill:before{content:"\e902"}.mce-i-borderwidth:before{content:"\e903"}.mce-i-line:before{content:"\e904"}.mce-i-count:before{content:"\e905"}.mce-i-translate:before{content:"\e907"}.mce-i-drag:before{content:"\e908"}.mce-i-home:before{content:"\e90b"}.mce-i-upload:before{content:"\e914"}.mce-i-bubble:before{content:"\e91c"}.mce-i-user:before{content:"\e91d"}.mce-i-lock:before{content:"\e926"}.mce-i-unlock:before{content:"\e927"}.mce-i-settings:before{content:"\e928"}.mce-i-remove2:before{content:"\e92a"}.mce-i-menu:before{content:"\e92d"}.mce-i-warning:before{content:"\e930"}.mce-i-question:before{content:"\e931"}.mce-i-pluscircle:before{content:"\e932"}.mce-i-info:before{content:"\e933"}.mce-i-notice:before{content:"\e934"}.mce-i-arrowup:before{content:"\e93b"}.mce-i-arrowdown:before{content:"\e93d"}.mce-i-arrowup2:before{content:"\e93f"}.mce-i-arrowdown2:before{content:"\e940"}.mce-i-menu2:before{content:"\e941"}.mce-i-newtab:before{content:"\e961"}.mce-i-a11y:before{content:"\e900"}.mce-i-plus:before{content:"\e93a"}.mce-i-insert:before{content:"\e93a"}.mce-i-minus:before{content:"\e939"}.mce-i-books:before{content:"\e911"}.mce-i-reload:before{content:"\e906"}.mce-i-toc:before{content:"\e901"}.mce-i-checkmark:before{content:"\e033"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-insert{font-size:14px}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#BBB}
\ No newline at end of file
diff --git a/core/media/editors/tinymce/templates/layout1.html b/core/media/editors/tinymce/templates/layout1.html
new file mode 100644
index 00000000..7248c237
--- /dev/null
+++ b/core/media/editors/tinymce/templates/layout1.html
@@ -0,0 +1,15 @@
+<table border="1">
+	<thead>
+		<tr>
+			<td>Column 1</td>
+			<td>Column 2</td>
+		</tr>
+	</thead>
+
+	<tbody>
+		<tr>
+			<td>Username: {$username}</td>
+			<td>Staffid: {$staffid}</td>
+		</tr>
+	</tbody>
+</table>
diff --git a/core/media/editors/tinymce/templates/snippet1.html b/core/media/editors/tinymce/templates/snippet1.html
new file mode 100644
index 00000000..d6e7a33f
--- /dev/null
+++ b/core/media/editors/tinymce/templates/snippet1.html
@@ -0,0 +1 @@
+This is just some <strong>code</strong>.
\ No newline at end of file
diff --git a/core/media/editors/tinymce/themes/modern/theme.min.js b/core/media/editors/tinymce/themes/modern/theme.min.js
new file mode 100644
index 00000000..f0ea658c
--- /dev/null
+++ b/core/media/editors/tinymce/themes/modern/theme.min.js
@@ -0,0 +1 @@
+!function(){var e={},t=function(t){for(var n=e[t],i=n.deps,o=n.defn,a=i.length,s=new Array(a),l=0;l<a;++l)s[l]=r(i[l]);var c=o.apply(null,s);if(void 0===c)throw"module ["+t+"] returned undefined";n.instance=c},n=function(t,n,r){if("string"!=typeof t)throw"module id must be a string";if(void 0===n)throw"no dependencies for "+t;if(void 0===r)throw"no definition function for "+t;e[t]={deps:n,defn:r,instance:void 0}},r=function(n){var r=e[n];if(void 0===r)throw"module ["+n+"] was undefined";return void 0===r.instance&&t(n),r.instance},i=function(e,t){for(var n=e.length,i=new Array(n),o=0;o<n;++o)i[o]=r(e[o]);t.apply(null,i)},o={};o.bolt={module:{api:{define:n,require:i,demand:r}}};var a=n,s=function(e,t){a(e,[],function(){return t})};s("1",tinymce.Env),s("2",tinymce.EditorManager),s("3",tinymce.ThemeManager),s("8",tinymce.util.Tools),s("9",tinymce.ui.Factory),s("a",tinymce.DOM),a("b",["8","9"],function(e,t){var n="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",r=function(n,r,i){var o,a=[];if(r)return e.each(r.split(/[ ,]/),function(e){var r,s=function(){var t=n.selection;e.settings.stateSelector&&t.selectorChanged(e.settings.stateSelector,function(t){e.active(t)},!0),e.settings.disabledStateSelector&&t.selectorChanged(e.settings.disabledStateSelector,function(t){e.disabled(t)})};"|"==e?o=null:t.has(e)?(e={type:e,size:i},a.push(e),o=null):(o||(o={type:"buttongroup",items:[]},a.push(o)),n.buttons[e]&&(r=e,e=n.buttons[r],"function"==typeof e&&(e=e()),e.type=e.type||"button",e.size=i,e=t.create(e),o.items.push(e),n.initialized?s():n.on("init",s)))}),{type:"toolbar",layout:"flow",items:a}},i=function(t,i){var o=[],a=t.settings,s=function(e){if(e)return o.push(r(t,e,i)),!0};if(e.isArray(a.toolbar)){if(0===a.toolbar.length)return;e.each(a.toolbar,function(e,t){a["toolbar"+(t+1)]=e}),delete a.toolbar}for(var l=1;l<10&&s(a["toolbar"+l]);l++);if(o.length||a.toolbar===!1||s(a.toolbar||n),o.length)return{type:"panel",layout:"stack",classes:"toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:o}};return{createToolbar:r,createToolbars:i}}),a("c",["8"],function(e){var t={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},n=function(e,t){var n;return"|"==t?{text:"|"}:n=e[t]},r=function(r,i,o){var a,s,l,c,u;if(u=e.makeMap((i.removed_menuitems||"").split(/[ ,]/)),i.menu?(s=i.menu[o],c=!0):s=t[o],s){a={text:s.title},l=[],e.each((s.items||"").split(/[ ,]/),function(e){var t=n(r,e);t&&!u[e]&&l.push(n(r,e))}),c||e.each(r,function(e){e.context==o&&("before"==e.separator&&l.push({text:"|"}),e.prependToContext?l.unshift(e):l.push(e),"after"==e.separator&&l.push({text:"|"}))});for(var d=0;d<l.length;d++)"|"==l[d].text&&(0!==d&&d!=l.length-1||l.splice(d,1));if(a.menu=l,!a.menu.length)return null}return a},i=function(e){var n,i=[],o=e.settings,a=[];if(o.menu)for(n in o.menu)a.push(n);else for(n in t)a.push(n);for(var s="string"==typeof o.menubar?o.menubar.split(/[ ,]/):a,l=0;l<s.length;l++){var c=s[l];c=r(e.menuItems,e.settings,c),c&&i.push(c)}return i};return{createMenuButtons:i}}),s("j",tinymce.util.Delay),s("k",tinymce.geom.Rect),a("d",["a","8","j","b","9","k"],function(e,t,n,r,i,o){var a=function(e){return{left:e.x,top:e.y,width:e.w,height:e.h,right:e.x+e.w,bottom:e.y+e.h}},s=function(e){t.each(e.contextToolbars,function(e){e.panel&&e.panel.hide()})},l=function(e,t){e.moveTo(t.left,t.top)},c=function(e,n,r){n=n?n.substr(0,2):"",t.each({t:"down",b:"up"},function(t,i){e.classes.toggle("arrow-"+t,r(i,n.substr(0,1)))}),t.each({l:"left",r:"right"},function(t,i){e.classes.toggle("arrow-"+t,r(i,n.substr(1,1)))})},u=function(e,t,n,r,i,o){return o=a({x:t,y:n,w:o.w,h:o.h}),e&&(o=e({elementRect:a(r),contentAreaRect:a(i),panelRect:o})),o},d=function(a){var d,f=a.settings,p=function(){return a.contextToolbars||[]},m=function(t){var n,r,i;return n=e.getPos(a.getContentAreaContainer()),r=a.dom.getRect(t),i=a.dom.getRoot(),"BODY"===i.nodeName&&(r.x-=i.ownerDocument.documentElement.scrollLeft||i.scrollLeft,r.y-=i.ownerDocument.documentElement.scrollTop||i.scrollTop),r.x+=n.x,r.y+=n.y,r},g=function(t,n){var r,i,d,p,g,h,v,b,y=f.inline_toolbar_position_handler;if(!a.removed){if(!t||!t.toolbar.panel)return void s(a);v=["bc-tc","tc-bc","tl-bl","bl-tl","tr-br","br-tr"],g=t.toolbar.panel,n&&g.show(),d=m(t.element),i=e.getRect(g.getEl()),p=e.getRect(a.getContentAreaContainer()||a.getBody()),b=25,"inline"!==e.getStyle(t.element,"display",!0)&&(d.w=t.element.clientWidth,d.h=t.element.clientHeight),a.inline||(p.w=a.getDoc().documentElement.offsetWidth),a.selection.controlSelection.isResizable(t.element)&&d.w<b&&(d=o.inflate(d,0,8)),r=o.findBestRelativePosition(i,d,p,v),d=o.clamp(d,p),r?(h=o.relativePosition(i,d,r),l(g,u(y,h.x,h.y,d,p,i))):(p.h+=i.h,d=o.intersect(p,d),d?(r=o.findBestRelativePosition(i,d,p,["bc-tc","bl-tl","br-tr"]),r?(h=o.relativePosition(i,d,r),l(g,u(y,h.x,h.y,d,p,i))):l(g,u(y,d.x,d.y,d,p,i))):g.hide()),c(g,r,function(e,t){return e===t})}},h=function(e){return function(){var t=function(){a.selection&&g(x(a.selection.getNode()),e)};n.requestAnimationFrame(t)}},v=function(){d||(d=a.selection.getScrollContainer()||a.getWin(),e.bind(d,"scroll",h(!0)),a.on("remove",function(){e.unbind(d,"scroll")}))},b=function(e){var t;return e.toolbar.panel?(e.toolbar.panel.show(),void g(e)):(v(),t=i.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:r.createToolbar(a,e.toolbar.items),oncancel:function(){a.focus()}}),e.toolbar.panel=t,t.renderTo(document.body).reflow(),void g(e))},y=function(){t.each(p(),function(e){e.panel&&e.panel.hide()})},x=function(e){var t,n,r,i=p();for(r=a.$(e).parents().add(e),t=r.length-1;t>=0;t--)for(n=i.length-1;n>=0;n--)if(i[n].predicate(r[t]))return{toolbar:i[n],element:r[t]};return null};a.on("click keyup setContent ObjectResized",function(e){("setcontent"!==e.type||e.selection)&&n.setEditorTimeout(a,function(){var e;e=x(a.selection.getNode()),e?(y(),b(e)):y()})}),a.on("blur hide contextmenu",y),a.on("ObjectResizeStart",function(){var e=x(a.selection.getNode());e&&e.toolbar.panel&&e.toolbar.panel.hide()}),a.on("ResizeEditor ResizeWindow",h(!0)),a.on("nodeChange",h(!1)),a.on("remove",function(){t.each(p(),function(e){e.panel&&e.panel.remove()}),a.contextToolbars={}}),a.shortcuts.add("ctrl+shift+e > ctrl+shift+p","",function(){var e=x(a.selection.getNode());e&&e.toolbar.panel&&e.toolbar.panel.items()[0].focus()})};return{addContextualToolbars:d}}),a("e",[],function(){var e=function(e,t){return function(){var n=e.find(t)[0];n&&n.focus(!0)}},t=function(t,n){t.shortcuts.add("Alt+F9","",e(n,"menubar")),t.shortcuts.add("Alt+F10,F10","",e(n,"toolbar")),t.shortcuts.add("Alt+F11","",e(n,"elementpath")),n.on("cancel",function(){t.focus()})};return{addKeys:t}}),a("f",["8","9","1"],function(e,t,n){var r=function(e){return{element:function(){return e}}},i=function(e,t,n){var i=e.settings[n];i&&i(r(t.getEl("body")))},o=function(t,n,r){e.each(r,function(e){var r=n.items().filter("#"+e.name)[0];r&&r.visible()&&e.name!==t&&(i(e,r,"onhide"),r.visible(!1))})},a=function(e){e.items().each(function(e){e.active(!1)})},s=function(t,n){return e.grep(t,function(e){return e.name===n})[0]},l=function(e,n,r){return function(l){var c=l.control,u=c.parents().filter("panel")[0],d=u.find("#"+n)[0],f=s(r,n);o(n,u,r),a(c.parent()),d&&d.visible()?(i(f,d,"onhide"),d.hide(),c.active(!1)):(d?(d.show(),i(f,d,"onshow")):(d=t.create({type:"container",name:n,layout:"stack",classes:"sidebar-panel",html:""}),u.prepend(d),i(f,d,"onrender"),i(f,d,"onshow")),c.active(!0)),e.fire("ResizeEditor")}},c=function(){return!n.ie||n.ie>=11},u=function(e){return!(!c()||!e.sidebars)&&e.sidebars.length>0},d=function(t){var n=e.map(t.sidebars,function(e){var n=e.settings;return{type:"button",icon:n.icon,image:n.image,tooltip:n.tooltip,onclick:l(t,e.name,t.sidebars)}});return{type:"panel",name:"sidebar",layout:"stack",classes:"sidebar",items:[{type:"toolbar",layout:"stack",classes:"sidebar-toolbar",items:n}]}};return{hasSidebar:u,createSidebar:d}}),a("g",[],function(){var e=function(e){var t=function(){e._skinLoaded=!0,e.fire("SkinLoaded")};return function(){e.initialized?t():e.on("init",t)}};return{fireSkinLoaded:e}}),a("6",["a"],function(e){var t=function(e){return{width:e.clientWidth,height:e.clientHeight}},n=function(n,r,i){var o,a,s,l,c=n.settings;o=n.getContainer(),a=n.getContentAreaContainer().firstChild,s=t(o),l=t(a),null!==r&&(r=Math.max(c.min_width||100,r),r=Math.min(c.max_width||65535,r),e.setStyle(o,"width",r+(s.width-l.width)),e.setStyle(a,"width",r)),i=Math.max(c.min_height||100,i),i=Math.min(c.max_height||65535,i),e.setStyle(a,"height",i),n.fire("ResizeEditor")},r=function(e,t,r){var i=e.getContentAreaContainer();n(e,i.clientWidth+t,i.clientHeight+r)};return{resizeTo:n,resizeBy:r}}),a("4",["8","9","a","b","c","d","e","f","g","6"],function(e,t,n,r,i,o,a,s,l,c){var u=function(e){return function(t){e.find("*").disabled("readonly"===t.mode)}},d=function(e){return{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",border:e,html:""}},f=function(e){return{type:"panel",layout:"stack",classes:"edit-aria-container",border:"1 0 0 0",items:[d("0"),s.createSidebar(e)]}},p=function(e,p,m){var g,h,v,b=e.settings;return m.skinUiCss&&n.styleSheetLoader.load(m.skinUiCss,l.fireSkinLoaded(e)),g=p.panel=t.create({type:"panel",role:"application",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[b.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:i.createMenuButtons(e)},r.createToolbars(e,b.toolbar_items_size),s.hasSidebar(e)?f(e):d("1 0 0 0")]}),b.resize!==!1&&(h={type:"resizehandle",direction:b.resize,onResizeStart:function(){var t=e.getContentAreaContainer().firstChild;v={width:t.clientWidth,height:t.clientHeight}},onResize:function(t){"both"===b.resize?c.resizeTo(e,v.width+t.deltaX,v.height+t.deltaY):c.resizeTo(e,null,v.height+t.deltaY)}}),b.statusbar!==!1&&g.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",ariaRoot:!0,items:[{type:"elementpath",editor:e},h]}),e.fire("BeforeRenderUI"),e.on("SwitchMode",u(g)),g.renderBefore(m.targetNode).reflow(),b.readonly&&e.setMode("readonly"),b.width&&n.setStyle(g.getEl(),"width",b.width),e.on("remove",function(){g.remove(),g=null}),a.addKeys(e,g),o.addContextualToolbars(e),{iframeContainer:g.find("#iframe")[0].getEl(),editorContainer:g.getEl()}};return{render:p}}),s("h",tinymce.ui.FloatPanel),a("5",["8","9","a","h","b","c","d","e","g"],function(e,t,n,r,i,o,a,s,l){var c=function(e,c,u){var d,f,p=e.settings;p.fixed_toolbar_container&&(f=n.select(p.fixed_toolbar_container)[0]);var m=function(){if(d&&d.moveRel&&d.visible()&&!d._fixed){var t=e.selection.getScrollContainer(),r=e.getBody(),i=0,o=0;if(t){var a=n.getPos(r),s=n.getPos(t);i=Math.max(0,s.x-a.x),o=Math.max(0,s.y-a.y)}d.fixed(!1).moveRel(r,e.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl","tr-br"]).moveBy(i,o)}},g=function(){d&&(d.show(),m(),n.addClass(e.getBody(),"mce-edit-focus"))},h=function(){d&&(d.hide(),r.hideAll(),n.removeClass(e.getBody(),"mce-edit-focus"))},v=function(){return d?void(d.visible()||g()):(d=c.panel=t.create({type:f?"panel":"floatpanel",role:"application",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!!f,border:1,items:[p.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:o.createMenuButtons(e)},i.createToolbars(e,p.toolbar_items_size)]}),e.fire("BeforeRenderUI"),d.renderTo(f||document.body).reflow(),s.addKeys(e,d),g(),a.addContextualToolbars(e),e.on("nodeChange",m),e.on("activate",g),e.on("deactivate",h),void e.nodeChanged())};return p.content_editable=!0,e.on("focus",function(){u.skinUiCss?n.styleSheetLoader.load(u.skinUiCss,v,v):v()}),e.on("blur hide",h),e.on("remove",function(){d&&(d.remove(),d=null)}),u.skinUiCss&&n.styleSheetLoader.load(u.skinUiCss,l.fireSkinLoaded(e)),{}};return{render:c}}),s("i",tinymce.ui.Throbber),a("7",["i"],function(e){var t=function(t,n){var r;t.on("ProgressState",function(t){r=r||new e(n.panel.getEl("body")),t.state?r.show(t.time):r.hide()})};return{setup:t}}),a("0",["1","2","3","4","5","6","7"],function(e,t,n,r,i,o,a){var s=function(n,o,s){var l=n.settings,c=l.skin!==!1&&(l.skin||"lightgray");if(c){var u=l.skin_url;u=u?n.documentBaseURI.toAbsolute(u):t.baseURL+"/skins/"+c,e.documentMode<=7?s.skinUiCss=u+"/skin.ie7.min.css":s.skinUiCss=u+"/skin.min.css",n.contentCSS.push(u+"/content"+(n.inline?".inline":"")+".min.css")}return a.setup(n,o),l.inline?i.render(n,o,s):r.render(n,o,s)};return n.add("modern",function(e){return{renderUI:function(t){return s(e,this,t)},resizeTo:function(t,n){return o.resizeTo(e,t,n)},resizeBy:function(t,n){return o.resizeBy(e,t,n)}}}),function(){}}),r("0")()}();
\ No newline at end of file
diff --git a/core/media/editors/tinymce/tinymce.min.js b/core/media/editors/tinymce/tinymce.min.js
new file mode 100644
index 00000000..871bf650
--- /dev/null
+++ b/core/media/editors/tinymce/tinymce.min.js
@@ -0,0 +1,14 @@
+// 4.5.8 (2017-10-05)
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){var r,i,o,a,l;for(r=0;r<n.length;r++){i=e,o=n[r],a=o.split(/[.\/]/);for(var u=0;u<a.length-1;++u)i[a[u]]===t&&(i[a[u]]={}),i=i[a[u]];i[a[a.length-1]]=s[o]}if(e.AMDLC_TESTS){l=e.privateModules||{};for(o in s)l[o]=s[o];for(r=0;r<n.length;r++)delete l[n[r]];e.privateModules=l}}var s={},l="tinymce/geom/Rect",u="tinymce/util/Promise",c="tinymce/util/Delay",d="tinymce/Env",f="tinymce/dom/EventUtils",p="tinymce/dom/Sizzle",h="tinymce/util/Arr",m="tinymce/util/Tools",g="tinymce/dom/DomQuery",v="tinymce/html/Styles",y="tinymce/dom/TreeWalker",b="tinymce/dom/Range",C="tinymce/html/Entities",x="tinymce/dom/StyleSheetLoader",w="tinymce/dom/DOMUtils",E="tinymce/dom/ScriptLoader",N="tinymce/AddOnManager",_="tinymce/dom/NodeType",S="tinymce/text/Zwsp",k="tinymce/caret/CaretContainer",T="tinymce/dom/RangeUtils",R="tinymce/NodeChange",A="tinymce/html/Node",B="tinymce/html/Schema",D="tinymce/html/SaxParser",L="tinymce/html/DomParser",M="tinymce/html/Writer",P="tinymce/html/Serializer",O="tinymce/dom/Serializer",H="tinymce/dom/TridentSelection",I="tinymce/util/VK",F="tinymce/dom/ControlSelection",z="tinymce/util/Fun",U="tinymce/caret/CaretCandidate",W="tinymce/geom/ClientRect",V="tinymce/text/ExtendingChar",$="tinymce/caret/CaretPosition",q="tinymce/caret/CaretBookmark",j="tinymce/dom/BookmarkManager",Y="tinymce/dom/Selection",X="tinymce/dom/ElementUtils",K="tinymce/fmt/Preview",G="tinymce/fmt/Hooks",J="tinymce/Formatter",Q="tinymce/undo/Diff",Z="tinymce/undo/Fragments",ee="tinymce/undo/Levels",te="tinymce/UndoManager",ne="tinymce/EnterKey",re="tinymce/ForceBlocks",ie="tinymce/caret/CaretUtils",oe="tinymce/caret/CaretWalker",ae="tinymce/InsertList",se="tinymce/InsertContent",le="tinymce/EditorCommands",ue="tinymce/util/URI",ce="tinymce/util/Class",de="tinymce/util/EventDispatcher",fe="tinymce/data/Binding",pe="tinymce/util/Observable",he="tinymce/data/ObservableObject",me="tinymce/ui/Selector",ge="tinymce/ui/Collection",ve="tinymce/ui/DomUtils",ye="tinymce/ui/BoxUtils",be="tinymce/ui/ClassList",Ce="tinymce/ui/ReflowQueue",xe="tinymce/ui/Control",we="tinymce/ui/Factory",Ee="tinymce/ui/KeyboardNavigation",Ne="tinymce/ui/Container",_e="tinymce/ui/DragHelper",Se="tinymce/ui/Scrollable",ke="tinymce/ui/Panel",Te="tinymce/ui/Movable",Re="tinymce/ui/Resizable",Ae="tinymce/ui/FloatPanel",Be="tinymce/ui/Window",De="tinymce/ui/MessageBox",Le="tinymce/WindowManager",Me="tinymce/ui/Tooltip",Pe="tinymce/ui/Widget",Oe="tinymce/ui/Progress",He="tinymce/ui/Notification",Ie="tinymce/NotificationManager",Fe="tinymce/dom/NodePath",ze="tinymce/util/Quirks",Ue="tinymce/EditorObservable",We="tinymce/Mode",Ve="tinymce/Shortcuts",$e="tinymce/file/Uploader",qe="tinymce/file/Conversions",je="tinymce/file/ImageScanner",Ye="tinymce/file/BlobCache",Xe="tinymce/file/UploadStatus",Ke="tinymce/ErrorReporter",Ge="tinymce/EditorUpload",Je="tinymce/caret/FakeCaret",Qe="tinymce/dom/Dimensions",Ze="tinymce/caret/LineWalker",et="tinymce/caret/LineUtils",tt="tinymce/dom/MousePosition",nt="tinymce/DragDropOverrides",rt="tinymce/SelectionOverrides",it="tinymce/util/Uuid",ot="tinymce/ui/Sidebar",at="tinymce/Editor",st="tinymce/util/I18n",lt="tinymce/FocusManager",ut="tinymce/EditorManager",ct="tinymce/LegacyInput",dt="tinymce/util/XHR",ft="tinymce/util/JSON",pt="tinymce/util/JSONRequest",ht="tinymce/util/JSONP",mt="tinymce/util/LocalStorage",gt="tinymce/Compat",vt="tinymce/ui/Layout",yt="tinymce/ui/AbsoluteLayout",bt="tinymce/ui/Button",Ct="tinymce/ui/ButtonGroup",xt="tinymce/ui/Checkbox",wt="tinymce/ui/ComboBox",Et="tinymce/ui/ColorBox",Nt="tinymce/ui/PanelButton",_t="tinymce/ui/ColorButton",St="tinymce/util/Color",kt="tinymce/ui/ColorPicker",Tt="tinymce/ui/Path",Rt="tinymce/ui/ElementPath",At="tinymce/ui/FormItem",Bt="tinymce/ui/Form",Dt="tinymce/ui/FieldSet",Lt="tinymce/content/LinkTargets",Mt="tinymce/ui/FilePicker",Pt="tinymce/ui/FitLayout",Ot="tinymce/ui/FlexLayout",Ht="tinymce/ui/FlowLayout",It="tinymce/fmt/FontInfo",Ft="tinymce/ui/FormatControls",zt="tinymce/ui/GridLayout",Ut="tinymce/ui/Iframe",Wt="tinymce/ui/InfoBox",Vt="tinymce/ui/Label",$t="tinymce/ui/Toolbar",qt="tinymce/ui/MenuBar",jt="tinymce/ui/MenuButton",Yt="tinymce/ui/MenuItem",Xt="tinymce/ui/Throbber",Kt="tinymce/ui/Menu",Gt="tinymce/ui/ListBox",Jt="tinymce/ui/Radio",Qt="tinymce/ui/ResizeHandle",Zt="tinymce/ui/SelectBox",en="tinymce/ui/Slider",tn="tinymce/ui/Spacer",nn="tinymce/ui/SplitButton",rn="tinymce/ui/StackLayout",on="tinymce/ui/TabPanel",an="tinymce/ui/TextBox",sn="tinymce/Register";r(l,[],function(){function e(e,t,n){var r,i,a,s,l,c;return r=t.x,i=t.y,a=e.w,s=e.h,l=t.w,c=t.h,n=(n||"").split(""),"b"===n[0]&&(i+=c),"r"===n[1]&&(r+=l),"c"===n[0]&&(i+=u(c/2)),"c"===n[1]&&(r+=u(l/2)),"b"===n[3]&&(i-=s),"r"===n[4]&&(r-=a),"c"===n[3]&&(i-=u(s/2)),"c"===n[4]&&(r-=u(a/2)),o(r,i,a,s)}function t(t,n,r,i){var o,a;for(a=0;a<i.length;a++)if(o=e(t,n,i[a]),o.x>=r.x&&o.x+o.w<=r.w+r.x&&o.y>=r.y&&o.y+o.h<=r.h+r.y)return i[a];return null}function n(e,t,n){return o(e.x-t,e.y-n,e.w+2*t,e.h+2*n)}function r(e,t){var n,r,i,a;return n=l(e.x,t.x),r=l(e.y,t.y),i=s(e.x+e.w,t.x+t.w),a=s(e.y+e.h,t.y+t.h),i-n<0||a-r<0?null:o(n,r,i-n,a-r)}function i(e,t,n){var r,i,a,s,u,c,d,f,p,h;return u=e.x,c=e.y,d=e.x+e.w,f=e.y+e.h,p=t.x+t.w,h=t.y+t.h,r=l(0,t.x-u),i=l(0,t.y-c),a=l(0,d-p),s=l(0,f-h),u+=r,c+=i,n&&(d+=r,f+=i,u-=a,c-=s),d-=a,f-=s,o(u,c,d-u,f-c)}function o(e,t,n,r){return{x:e,y:t,w:n,h:r}}function a(e){return o(e.left,e.top,e.width,e.height)}var s=Math.min,l=Math.max,u=Math.round;return{inflate:n,relativePosition:e,findBestRelativePosition:t,intersect:r,clamp:i,create:o,fromClientRect:a}}),r(u,[],function(){function e(e,t){return function(){e.apply(t,arguments)}}function t(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],s(t,e(r,this),e(i,this))}function n(e){var t=this;return null===this._state?void this._deferreds.push(e):void l(function(){var n=t._state?e.onFulfilled:e.onRejected;if(null===n)return void(t._state?e.resolve:e.reject)(t._value);var r;try{r=n(t._value)}catch(i){return void e.reject(i)}e.resolve(r)})}function r(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void s(e(n,t),e(r,this),e(i,this))}this._state=!0,this._value=t,o.call(this)}catch(a){i.call(this,a)}}function i(e){this._state=!1,this._value=e,o.call(this)}function o(){for(var e=0,t=this._deferreds.length;e<t;e++)n.call(this,this._deferreds[e]);this._deferreds=null}function a(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}function s(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(i){if(r)return;r=!0,n(i)}}if(window.Promise)return window.Promise;var l=t.immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){setTimeout(e,1)},u=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return t.prototype["catch"]=function(e){return this.then(null,e)},t.prototype.then=function(e,r){var i=this;return new t(function(t,o){n.call(i,new a(e,r,t,o))})},t.all=function(){var e=Array.prototype.slice.call(1===arguments.length&&u(arguments[0])?arguments[0]:arguments);return new t(function(t,n){function r(o,a){try{if(a&&("object"==typeof a||"function"==typeof a)){var s=a.then;if("function"==typeof s)return void s.call(a,function(e){r(o,e)},n)}e[o]=a,0===--i&&t(e)}catch(l){n(l)}}if(0===e.length)return t([]);for(var i=e.length,o=0;o<e.length;o++)r(o,e[o])})},t.resolve=function(e){return e&&"object"==typeof e&&e.constructor===t?e:new t(function(t){t(e)})},t.reject=function(e){return new t(function(t,n){n(e)})},t.race=function(e){return new t(function(t,n){for(var r=0,i=e.length;r<i;r++)e[r].then(t,n)})},t}),r(c,[u],function(e){function t(e,t){function n(e){window.setTimeout(e,0)}var r,i=window.requestAnimationFrame,o=["ms","moz","webkit"];for(r=0;r<o.length&&!i;r++)i=window[o[r]+"RequestAnimationFrame"];i||(i=n),i(e,t)}function n(e,t){return"number"!=typeof t&&(t=0),setTimeout(e,t)}function r(e,t){return"number"!=typeof t&&(t=1),setInterval(e,t)}function i(e){return clearTimeout(e)}function o(e){return clearInterval(e)}function a(e,t){var r,i;return i=function(){var i=arguments;clearTimeout(r),r=n(function(){e.apply(this,i)},t)},i.stop=function(){clearTimeout(r)},i}var s;return{requestAnimationFrame:function(n,r){return s?void s.then(n):void(s=new e(function(e){r||(r=document.body),t(e,r)}).then(n))},setTimeout:n,setInterval:r,setEditorTimeout:function(e,t,r){return n(function(){e.removed||t()},r)},setEditorInterval:function(e,t,n){var i;return i=r(function(){e.removed?clearInterval(i):t()},n)},debounce:a,throttle:a,clearInterval:o,clearTimeout:i}}),r(d,[],function(){function e(e){return"matchMedia"in window&&matchMedia(e).matches}var t=navigator,n=t.userAgent,r,i,o,a,s,l,u,c,d,f,p,h,m;r=window.opera&&window.opera.buildNumber,d=/Android/.test(n),i=/WebKit/.test(n),o=!i&&!r&&/MSIE/gi.test(n)&&/Explorer/gi.test(t.appName),o=o&&/MSIE (\w+)\./.exec(n)[1],a=n.indexOf("Trident/")!=-1&&(n.indexOf("rv:")!=-1||t.appName.indexOf("Netscape")!=-1)&&11,s=n.indexOf("Edge/")!=-1&&!o&&!a&&12,o=o||a||s,l=!i&&!a&&/Gecko/.test(n),u=n.indexOf("Mac")!=-1,c=/(iPad|iPhone)/.test(n),f="FormData"in window&&"FileReader"in window&&"URL"in window&&!!URL.createObjectURL,p=e("only screen and (max-device-width: 480px)")&&(d||c),h=e("only screen and (min-width: 800px)")&&(d||c),m=n.indexOf("Windows Phone")!=-1,s&&(i=!1);var g=!c||f||n.match(/AppleWebKit\/(\d*)/)[1]>=534;return{opera:r,webkit:i,ie:o,gecko:l,mac:u,iOS:c,android:d,contentEditable:g,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!=o,range:window.getSelection&&"Range"in window,documentMode:o&&!s?document.documentMode||7:10,fileApi:f,ceFalse:o===!1||o>8,canHaveCSP:o===!1||o>11,desktop:!p&&!h,windowsPhone:m}}),r(f,[c,d],function(e,t){function n(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)}function r(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)}function i(e,t){var n,r=t;return n=e.path,n&&n.length>0&&(r=n[0]),e.deepPath&&(n=e.deepPath(),n&&n.length>0&&(r=n[0])),r}function o(e,n){function r(){return!1}function o(){return!0}var a,s=n||{},l;for(a in e)c[a]||(s[a]=e[a]);if(s.target||(s.target=s.srcElement||document),t.experimentalShadowDom&&(s.target=i(e,s.target)),e&&u.test(e.type)&&e.pageX===l&&e.clientX!==l){var d=s.target.ownerDocument||document,f=d.documentElement,p=d.body;s.pageX=e.clientX+(f&&f.scrollLeft||p&&p.scrollLeft||0)-(f&&f.clientLeft||p&&p.clientLeft||0),s.pageY=e.clientY+(f&&f.scrollTop||p&&p.scrollTop||0)-(f&&f.clientTop||p&&p.clientTop||0)}return s.preventDefault=function(){s.isDefaultPrevented=o,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},s.stopPropagation=function(){s.isPropagationStopped=o,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},s.stopImmediatePropagation=function(){s.isImmediatePropagationStopped=o,s.stopPropagation()},s.isDefaultPrevented||(s.isDefaultPrevented=r,s.isPropagationStopped=r,s.isImmediatePropagationStopped=r),"undefined"==typeof s.metaKey&&(s.metaKey=!1),s}function a(t,i,o){function a(){o.domLoaded||(o.domLoaded=!0,i(c))}function s(){("complete"===u.readyState||"interactive"===u.readyState&&u.body)&&(r(u,"readystatechange",s),a())}function l(){try{u.documentElement.doScroll("left")}catch(t){return void e.setTimeout(l)}a()}var u=t.document,c={type:"ready"};return o.domLoaded?void i(c):(u.addEventListener?"complete"===u.readyState?a():n(t,"DOMContentLoaded",a):(n(u,"readystatechange",s),u.documentElement.doScroll&&t.self===t.top&&l()),void n(t,"load",a))}function s(){function e(e,t){var n,r,o,a,s=i[t];if(n=s&&s[e.type])for(r=0,o=n.length;r<o;r++)if(a=n[r],a&&a.func.call(a.scope,e)===!1&&e.preventDefault(),e.isImmediatePropagationStopped())return}var t=this,i={},s,u,c,d,f;u=l+(+new Date).toString(32),d="onmouseenter"in document.documentElement,c="onfocusin"in document.documentElement,f={mouseenter:"mouseover",mouseleave:"mouseout"},s=1,t.domLoaded=!1,t.events=i,t.bind=function(r,l,p,h){function m(t){e(o(t||E.event),g)}var g,v,y,b,C,x,w,E=window;if(r&&3!==r.nodeType&&8!==r.nodeType){for(r[u]?g=r[u]:(g=s++,r[u]=g,i[g]={}),h=h||r,l=l.split(" "),y=l.length;y--;)b=l[y],x=m,C=w=!1,"DOMContentLoaded"===b&&(b="ready"),t.domLoaded&&"ready"===b&&"complete"==r.readyState?p.call(h,o({type:b})):(d||(C=f[b],C&&(x=function(t){var n,r;if(n=t.currentTarget,r=t.relatedTarget,r&&n.contains)r=n.contains(r);else for(;r&&r!==n;)r=r.parentNode;r||(t=o(t||E.event),t.type="mouseout"===t.type?"mouseleave":"mouseenter",t.target=n,e(t,g))})),c||"focusin"!==b&&"focusout"!==b||(w=!0,C="focusin"===b?"focus":"blur",x=function(t){t=o(t||E.event),t.type="focus"===t.type?"focusin":"focusout",e(t,g)}),v=i[g][b],v?"ready"===b&&t.domLoaded?p({type:b}):v.push({func:p,scope:h}):(i[g][b]=v=[{func:p,scope:h}],v.fakeName=C,v.capture=w,v.nativeHandler=x,"ready"===b?a(r,x,t):n(r,C||b,x,w)));return r=v=0,p}},t.unbind=function(e,n,o){var a,s,l,c,d,f;if(!e||3===e.nodeType||8===e.nodeType)return t;if(a=e[u]){if(f=i[a],n){for(n=n.split(" "),l=n.length;l--;)if(d=n[l],s=f[d]){if(o)for(c=s.length;c--;)if(s[c].func===o){var p=s.nativeHandler,h=s.fakeName,m=s.capture;s=s.slice(0,c).concat(s.slice(c+1)),s.nativeHandler=p,s.fakeName=h,s.capture=m,f[d]=s}o&&0!==s.length||(delete f[d],r(e,s.fakeName||d,s.nativeHandler,s.capture))}}else{for(d in f)s=f[d],r(e,s.fakeName||d,s.nativeHandler,s.capture);f={}}for(d in f)return t;delete i[a];try{delete e[u]}catch(g){e[u]=null}}return t},t.fire=function(n,r,i){var a;if(!n||3===n.nodeType||8===n.nodeType)return t;i=o(null,i),i.type=r,i.target=n;do a=n[u],a&&e(i,a),n=n.parentNode||n.ownerDocument||n.defaultView||n.parentWindow;while(n&&!i.isPropagationStopped());return t},t.clean=function(e){var n,r,i=t.unbind;if(!e||3===e.nodeType||8===e.nodeType)return t;if(e[u]&&i(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(i(e),r=e.getElementsByTagName("*"),n=r.length;n--;)e=r[n],e[u]&&i(e);return t},t.destroy=function(){i={}},t.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}}var l="mce-data-",u=/^(?:mouse|contextmenu)|click/,c={keyLocation:1,layerX:1,layerY:1,returnValue:1,webkitMovementX:1,webkitMovementY:1,keyIdentifier:1};return s.Event=new s,s.Event.bind(window,"ready",function(){}),s}),r(p,[],function(){function e(e,t,n,r){var i,o,a,s,l,u,d,p,h,m;if((t?t.ownerDocument||t:z)!==D&&B(t),t=t||D,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(M&&!r){if(i=ve.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&I(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Z.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&x.getElementsByClassName)return Z.apply(n,t.getElementsByClassName(a)),n}if(x.qsa&&(!P||!P.test(e))){if(p=d=F,h=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(u=_(e),(d=t.getAttribute("id"))?p=d.replace(be,"\\$&"):t.setAttribute("id",p),p="[id='"+p+"'] ",l=u.length;l--;)u[l]=p+f(u[l]);h=ye.test(e)&&c(t.parentNode)||t,m=u.join(",")}if(m)try{return Z.apply(n,h.querySelectorAll(m)),n}catch(g){}finally{d||t.removeAttribute("id")}}}return k(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>w.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[F]=!0,e}function i(e){var t=D.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=e.length;r--;)w.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||X)-(~e.sourceIndex||X);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function u(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&typeof e.getElementsByTagName!==Y&&e}function d(){}function f(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=W++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,u=[U,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[F]||(t[F]={}),(s=l[r])&&s[0]===U&&s[1]===o)return u[2]=s[2];if(l[r]=u,u[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function m(t,n,r){for(var i=0,o=n.length;i<o;i++)e(t,n[i],r);return r}function g(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,u=null!=t;s<l;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),u&&t.push(s)));return a}function v(e,t,n,i,o,a){return i&&!i[F]&&(i=v(i)),o&&!o[F]&&(o=v(o,a)),r(function(r,a,s,l){var u,c,d,f=[],p=[],h=a.length,v=r||m(t||"*",s.nodeType?[s]:s,[]),y=!e||!r&&t?v:g(v,f,e,s,l),b=n?o||(r?e:h||i)?[]:a:y;if(n&&n(y,b,s,l),i)for(u=g(b,p),i(u,[],s,l),c=u.length;c--;)(d=u[c])&&(b[p[c]]=!(y[p[c]]=d));if(r){if(o||e){if(o){for(u=[],c=b.length;c--;)(d=b[c])&&u.push(y[c]=d);o(null,b=[],u,l)}for(c=b.length;c--;)(d=b[c])&&(u=o?te.call(r,d):f[c])>-1&&(r[u]=!(a[u]=d))}}else b=g(b===a?b.splice(h,b.length):b),o?o(null,a,b,l):Z.apply(a,b)})}function y(e){for(var t,n,r,i=e.length,o=w.relative[e[0].type],a=o||w.relative[" "],s=o?1:0,l=p(function(e){return e===t},a,!0),u=p(function(e){return te.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r||n!==T)||((t=n).nodeType?l(e,n,r):u(e,n,r))}];s<i;s++)if(n=w.relative[e[s].type])c=[p(h(c),n)];else{if(n=w.filter[e[s].type].apply(null,e[s].matches),n[F]){for(r=++s;r<i&&!w.relative[e[r].type];r++);return v(s>1&&h(c),s>1&&f(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&y(e.slice(s,r)),r<i&&y(e=e.slice(r)),r<i&&f(e))}c.push(n)}return h(c)}function b(t,n){var i=n.length>0,o=t.length>0,a=function(r,a,s,l,u){var c,d,f,p=0,h="0",m=r&&[],v=[],y=T,b=r||o&&w.find.TAG("*",u),C=U+=null==y?1:Math.random()||.1,x=b.length;for(u&&(T=a!==D&&a);h!==x&&null!=(c=b[h]);h++){if(o&&c){for(d=0;f=t[d++];)if(f(c,a,s)){l.push(c);break}u&&(U=C)}i&&((c=!f&&c)&&p--,r&&m.push(c))}if(p+=h,i&&h!==p){for(d=0;f=n[d++];)f(m,v,a,s);if(r){if(p>0)for(;h--;)m[h]||v[h]||(v[h]=J.call(l));v=g(v)}Z.apply(l,v),u&&!r&&v.length>0&&p+n.length>1&&e.uniqueSort(l)}return u&&(U=C,T=y),m};return i?r(a):a}var C,x,w,E,N,_,S,k,T,R,A,B,D,L,M,P,O,H,I,F="sizzle"+-new Date,z=window.document,U=0,W=0,V=n(),$=n(),q=n(),j=function(e,t){return e===t&&(A=!0),0},Y=typeof t,X=1<<31,K={}.hasOwnProperty,G=[],J=G.pop,Q=G.push,Z=G.push,ee=G.slice,te=G.indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(this[t]===e)return t;return-1},ne="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",re="[\\x20\\t\\r\\n\\f]",ie="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",oe="\\["+re+"*("+ie+")(?:"+re+"*([*^$|!~]?=)"+re+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+ie+"))|)"+re+"*\\]",ae=":("+ie+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+oe+")*)|.*)\\)|)",se=new RegExp("^"+re+"+|((?:^|[^\\\\])(?:\\\\.)*)"+re+"+$","g"),le=new RegExp("^"+re+"*,"+re+"*"),ue=new RegExp("^"+re+"*([>+~]|"+re+")"+re+"*"),ce=new RegExp("="+re+"*([^\\]'\"]*?)"+re+"*\\]","g"),de=new RegExp(ae),fe=new RegExp("^"+ie+"$"),pe={ID:new RegExp("^#("+ie+")"),CLASS:new RegExp("^\\.("+ie+")"),TAG:new RegExp("^("+ie+"|[*])"),ATTR:new RegExp("^"+oe),PSEUDO:new RegExp("^"+ae),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+re+"*(even|odd|(([+-]|)(\\d*)n|)"+re+"*(?:([+-]|)"+re+"*(\\d+)|))"+re+"*\\)|)","i"),bool:new RegExp("^(?:"+ne+")$","i"),needsContext:new RegExp("^"+re+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+re+"*((?:-\\d)?\\d*)"+re+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,me=/^h\d$/i,ge=/^[^{]+\{\s*\[native \w/,ve=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ye=/[+~]/,be=/'|\\/g,Ce=new RegExp("\\\\([\\da-f]{1,6}"+re+"?|("+re+")|.)","ig"),xe=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)};try{Z.apply(G=ee.call(z.childNodes),z.childNodes),G[z.childNodes.length].nodeType}catch(we){Z={apply:G.length?function(e,t){Q.apply(e,ee.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}x=e.support={},N=e.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},B=e.setDocument=function(e){function t(e){try{return e.top}catch(t){}return null}var n,r=e?e.ownerDocument||e:z,o=r.defaultView;return r!==D&&9===r.nodeType&&r.documentElement?(D=r,L=r.documentElement,M=!N(r),o&&o!==t(o)&&(o.addEventListener?o.addEventListener("unload",function(){B()},!1):o.attachEvent&&o.attachEvent("onunload",function(){B()})),x.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),x.getElementsByTagName=i(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),x.getElementsByClassName=ge.test(r.getElementsByClassName),x.getById=i(function(e){return L.appendChild(e).id=F,!r.getElementsByName||!r.getElementsByName(F).length}),x.getById?(w.find.ID=function(e,t){if(typeof t.getElementById!==Y&&M){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},w.filter.ID=function(e){var t=e.replace(Ce,xe);return function(e){return e.getAttribute("id")===t}}):(delete w.find.ID,w.filter.ID=function(e){var t=e.replace(Ce,xe);return function(e){var n=typeof e.getAttributeNode!==Y&&e.getAttributeNode("id");return n&&n.value===t}}),w.find.TAG=x.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==Y)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},w.find.CLASS=x.getElementsByClassName&&function(e,t){if(M)return t.getElementsByClassName(e)},O=[],P=[],(x.qsa=ge.test(r.querySelectorAll))&&(i(function(e){e.innerHTML="<select msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&P.push("[*^$]="+re+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||P.push("\\["+re+"*(?:value|"+ne+")"),e.querySelectorAll(":checked").length||P.push(":checked")}),i(function(e){var t=r.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&P.push("name"+re+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||P.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),P.push(",.*:")})),(x.matchesSelector=ge.test(H=L.matches||L.webkitMatchesSelector||L.mozMatchesSelector||L.oMatchesSelector||L.msMatchesSelector))&&i(function(e){x.disconnectedMatch=H.call(e,"div"),H.call(e,"[s!='']:x"),O.push("!=",ae)}),P=P.length&&new RegExp(P.join("|")),O=O.length&&new RegExp(O.join("|")),n=ge.test(L.compareDocumentPosition),I=n||ge.test(L.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},j=n?function(e,t){if(e===t)return A=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!x.sortDetached&&t.compareDocumentPosition(e)===n?e===r||e.ownerDocument===z&&I(z,e)?-1:t===r||t.ownerDocument===z&&I(z,t)?1:R?te.call(R,e)-te.call(R,t):0:4&n?-1:1)}:function(e,t){if(e===t)return A=!0,0;var n,i=0,o=e.parentNode,s=t.parentNode,l=[e],u=[t];if(!o||!s)return e===r?-1:t===r?1:o?-1:s?1:R?te.call(R,e)-te.call(R,t):0;if(o===s)return a(e,t);for(n=e;n=n.parentNode;)l.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;l[i]===u[i];)i++;return i?a(l[i],u[i]):l[i]===z?-1:u[i]===z?1:0},r):D},e.matches=function(t,n){return e(t,null,null,n)},e.matchesSelector=function(t,n){if((t.ownerDocument||t)!==D&&B(t),n=n.replace(ce,"='$1']"),x.matchesSelector&&M&&(!O||!O.test(n))&&(!P||!P.test(n)))try{var r=H.call(t,n);if(r||x.disconnectedMatch||t.document&&11!==t.document.nodeType)return r}catch(i){}return e(n,D,null,[t]).length>0},e.contains=function(e,t){return(e.ownerDocument||e)!==D&&B(e),I(e,t)},e.attr=function(e,n){(e.ownerDocument||e)!==D&&B(e);var r=w.attrHandle[n.toLowerCase()],i=r&&K.call(w.attrHandle,n.toLowerCase())?r(e,n,!M):t;return i!==t?i:x.attributes||!M?e.getAttribute(n):(i=e.getAttributeNode(n))&&i.specified?i.value:null},e.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},e.uniqueSort=function(e){var t,n=[],r=0,i=0;if(A=!x.detectDuplicates,R=!x.sortStable&&e.slice(0),e.sort(j),A){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return R=null,e},E=e.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=E(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=E(t);return n},w=e.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Ce,xe),e[3]=(e[3]||e[4]||e[5]||"").replace(Ce,xe),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(t){return t[1]=t[1].toLowerCase(),"nth"===t[1].slice(0,3)?(t[3]||e.error(t[0]),t[4]=+(t[4]?t[5]+(t[6]||1):2*("even"===t[3]||"odd"===t[3])),t[5]=+(t[7]+t[8]||"odd"===t[3])):t[3]&&e.error(t[0]),t},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&de.test(n)&&(t=_(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Ce,xe).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=V[e+" "];return t||(t=new RegExp("(^|"+re+")"+e+"("+re+"|$)"))&&V(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==Y&&e.getAttribute("class")||"")})},ATTR:function(t,n,r){return function(i){var o=e.attr(i,t);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,d,f,p,h,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;h=m="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(c=g[F]||(g[F]={}),u=c[e]||[],p=u[0]===U&&u[1],f=u[0]===U&&u[2],d=p&&g.childNodes[p];d=++p&&d&&d[m]||(f=p=0)||h.pop();)if(1===d.nodeType&&++f&&d===t){c[e]=[U,p,f];break}}else if(y&&(u=(t[F]||(t[F]={}))[e])&&u[0]===U)f=u[1];else for(;(d=++p&&d&&d[m]||(f=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[F]||(d[F]={}))[e]=[U,f]),d!==t)););return f-=i,f===r||f%r===0&&f/r>=0}}},PSEUDO:function(t,n){var i,o=w.pseudos[t]||w.setFilters[t.toLowerCase()]||e.error("unsupported pseudo: "+t);return o[F]?o(n):o.length>1?(i=[t,t,"",n],w.setFilters.hasOwnProperty(t.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=te.call(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=S(e.replace(se,"$1"));return i[F]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),!n.pop()}}),has:r(function(t){return function(n){return e(t,n).length>0}}),contains:r(function(e){return e=e.replace(Ce,xe),function(t){return(t.textContent||t.innerText||E(t)).indexOf(e)>-1}}),lang:r(function(t){return fe.test(t||"")||e.error("unsupported lang: "+t),t=t.replace(Ce,xe).toLowerCase(),function(e){var n;do if(n=M?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return n=n.toLowerCase(),n===t||0===n.indexOf(t+"-");while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===L},focus:function(e){return e===D.activeElement&&(!D.hasFocus||D.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!w.pseudos.empty(e)},header:function(e){return me.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:u(function(){return[0]}),last:u(function(e,t){return[t-1]}),eq:u(function(e,t,n){return[n<0?n+t:n]}),even:u(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:u(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:u(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:u(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},w.pseudos.nth=w.pseudos.eq;for(C in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})w.pseudos[C]=s(C);for(C in{submit:!0,reset:!0})w.pseudos[C]=l(C);return d.prototype=w.filters=w.pseudos,w.setFilters=new d,_=e.tokenize=function(t,n){var r,i,o,a,s,l,u,c=$[t+" "];if(c)return n?0:c.slice(0);for(s=t,l=[],u=w.preFilter;s;){r&&!(i=le.exec(s))||(i&&(s=s.slice(i[0].length)||s),l.push(o=[])),r=!1,(i=ue.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in w.filter)!(i=pe[a].exec(s))||u[a]&&!(i=u[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?e.error(t):$(t,l).slice(0)},S=e.compile=function(e,t){var n,r=[],i=[],o=q[e+" "];if(!o){for(t||(t=_(e)),n=t.length;n--;)o=y(t[n]),o[F]?r.push(o):i.push(o);o=q(e,b(i,r)),o.selector=e}return o},k=e.select=function(e,t,n,r){var i,o,a,s,l,u="function"==typeof e&&e,d=!r&&_(e=u.selector||e);
+if(n=n||[],1===d.length){if(o=d[0]=d[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&x.getById&&9===t.nodeType&&M&&w.relative[o[1].type]){if(t=(w.find.ID(a.matches[0].replace(Ce,xe),t)||[])[0],!t)return n;u&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!w.relative[s=a.type]);)if((l=w.find[s])&&(r=l(a.matches[0].replace(Ce,xe),ye.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&f(o),!e)return Z.apply(n,r),n;break}}return(u||S(e,d))(r,t,!M,n,ye.test(e)&&c(t.parentNode)||t),n},x.sortStable=F.split("").sort(j).join("")===F,x.detectDuplicates=!!A,B(),x.sortDetached=i(function(e){return 1&e.compareDocumentPosition(D.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),x.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(ne,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),e}),r(h,[],function(){function e(e){var t=e,n,r;if(!c(e))for(t=[],n=0,r=e.length;n<r;n++)t[n]=e[n];return t}function n(e,n,r){var i,o;if(!e)return 0;if(r=r||e,e.length!==t){for(i=0,o=e.length;i<o;i++)if(n.call(r,e[i],i,e)===!1)return 0}else for(i in e)if(e.hasOwnProperty(i)&&n.call(r,e[i],i,e)===!1)return 0;return 1}function r(e,t){var r=[];return n(e,function(n,i){r.push(t(n,i,e))}),r}function i(e,t){var r=[];return n(e,function(n,i){t&&!t(n,i,e)||r.push(n)}),r}function o(e,t){var n,r;if(e)for(n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1}function a(e,t,n,r){var i=0;for(arguments.length<3&&(n=e[0]);i<e.length;i++)n=t.call(r,n,e[i],i);return n}function s(e,t,n){var r,i;for(r=0,i=e.length;r<i;r++)if(t.call(n,e[r],r,e))return r;return-1}function l(e,n,r){var i=s(e,n,r);return i!==-1?e[i]:t}function u(e){return e[e.length-1]}var c=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return{isArray:c,toArray:e,each:n,map:r,filter:i,indexOf:o,reduce:a,findIndex:s,find:l,last:u}}),r(m,[d,h],function(e,n){function r(e){return null===e||e===t?"":(""+e).replace(h,"")}function i(e,r){return r?!("array"!=r||!n.isArray(e))||typeof e==r:e!==t}function o(e,t,n){var r;for(e=e||[],t=t||",","string"==typeof e&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n}function a(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function s(e,t,n){var r=this,i,o,a,s,l,u=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),a=e[3].match(/(^|\.)(\w+)$/i)[2],o=r.createNS(e[3].replace(/\.\w+$/,""),n),!o[a]){if("static"==e[2])return o[a]=t,void(this.onCreate&&this.onCreate(e[2],e[3],o[a]));t[a]||(t[a]=function(){},u=1),o[a]=t[a],r.extend(o[a].prototype,t),e[5]&&(i=r.resolve(e[5]).prototype,s=e[5].match(/\.(\w+)$/i)[1],l=o[a],u?o[a]=function(){return i[s].apply(this,arguments)}:o[a]=function(){return this.parent=i[s],l.apply(this,arguments)},o[a].prototype[a]=o[a],r.each(i,function(e,t){o[a].prototype[t]=i[t]}),r.each(t,function(e,t){i[t]?o[a].prototype[t]=function(){return this.parent=i[t],e.apply(this,arguments)}:t!=a&&(o[a].prototype[t]=e)})),r.each(t["static"],function(e,t){o[a][t]=e})}}function l(e,n){var r,i,o,a=arguments,s;for(r=1,i=a.length;r<i;r++){n=a[r];for(o in n)n.hasOwnProperty(o)&&(s=n[o],s!==t&&(e[o]=s))}return e}function u(e,t,r,i){i=i||this,e&&(r&&(e=e[r]),n.each(e,function(e,n){return t.call(i,e,n,r)!==!1&&void u(e,t,r,i)}))}function c(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;n<e.length;n++)r=e[n],t[r]||(t[r]={}),t=t[r];return t}function d(e,t){var n,r;for(t=t||window,e=e.split("."),n=0,r=e.length;n<r&&(t=t[e[n]],t);n++);return t}function f(e,t){return!e||i(e,"array")?e:n.map(e.split(t||","),r)}function p(t){var n=e.cacheSuffix;return n&&(t+=(t.indexOf("?")===-1?"?":"&")+n),t}var h=/^\s*|\s*$/g;return{trim:r,isArray:n.isArray,is:i,toArray:n.toArray,makeMap:o,each:n.each,map:n.map,grep:n.filter,inArray:n.indexOf,hasOwn:a,extend:l,create:s,walk:u,createNS:c,resolve:d,explode:f,_addCacheSuffix:p}}),r(g,[f,p,m,d],function(e,n,r,i){function o(e){return"undefined"!=typeof e}function a(e){return"string"==typeof e}function s(e){return e&&e==e.window}function l(e,t){var n,r,i;for(t=t||w,i=t.createElement("div"),n=t.createDocumentFragment(),i.innerHTML=e;r=i.firstChild;)n.appendChild(r);return n}function u(e,t,n,r){var i;if(a(t))t=l(t,v(e[0]));else if(t.length&&!t.nodeType){if(t=f.makeArray(t),r)for(i=t.length-1;i>=0;i--)u(e,t[i],n,r);else for(i=0;i<t.length;i++)u(e,t[i],n,r);return e}if(t.nodeType)for(i=e.length;i--;)n.call(e[i],t);return e}function c(e,t){return e&&t&&(" "+e.className+" ").indexOf(" "+t+" ")!==-1}function d(e,t,n){var r,i;return t=f(t)[0],e.each(function(){var e=this;n&&r==e.parentNode?i.appendChild(e):(r=e.parentNode,i=t.cloneNode(!1),e.parentNode.insertBefore(i,e),i.appendChild(e))}),e}function f(e,t){return new f.fn.init(e,t)}function p(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1}function h(e){return null===e||e===k?"":(""+e).replace(P,"")}function m(e,t){var n,r,i,o,a;if(e)if(n=e.length,n===o){for(r in e)if(e.hasOwnProperty(r)&&(a=e[r],t.call(a,r,a)===!1))break}else for(i=0;i<n&&(a=e[i],t.call(a,i,a)!==!1);i++);return e}function g(e,t){var n=[];return m(e,function(e,r){t(r,e)&&n.push(r)}),n}function v(e){return e?9==e.nodeType?e:e.ownerDocument:w}function y(e,n,r){var i=[],o=e[n];for("string"!=typeof r&&r instanceof f&&(r=r[0]);o&&9!==o.nodeType;){if(r!==t){if(o===r)break;if("string"==typeof r&&f(o).is(r))break}1===o.nodeType&&i.push(o),o=o[n]}return i}function b(e,n,r,i){var o=[];for(i instanceof f&&(i=i[0]);e;e=e[n])if(!r||e.nodeType===r){if(i!==t){if(e===i)break;if("string"==typeof i&&f(e).is(i))break}o.push(e)}return o}function C(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType==n)return e;return null}function x(e,t,n){m(n,function(n,r){e[n]=e[n]||{},e[n][t]=r})}var w=document,E=Array.prototype.push,N=Array.prototype.slice,_=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,S=e.Event,k,T=r.makeMap("children,contents,next,prev"),R=r.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),A=r.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),B={"for":"htmlFor","class":"className",readonly:"readOnly"},D={"float":"cssFloat"},L={},M={},P=/^\s*|\s*$/g;return f.fn=f.prototype={constructor:f,selector:"",context:null,length:0,init:function(e,t){var n=this,r,i;if(!e)return n;if(e.nodeType)return n.context=n[0]=e,n.length=1,n;if(t&&t.nodeType)n.context=t;else{if(t)return f(e).attr(t);n.context=t=document}if(a(e)){if(n.selector=e,r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:_.exec(e),!r)return f(t).find(e);if(r[1])for(i=l(e,v(t)).firstChild;i;)E.call(n,i),i=i.nextSibling;else{if(i=v(t).getElementById(r[2]),!i)return n;if(i.id!==r[2])return n.find(e);n.length=1,n[0]=i}}else this.add(e,!1);return n},toArray:function(){return r.toArray(this)},add:function(e,t){var n=this,r,i;if(a(e))return n.add(f(e));if(t!==!1)for(r=f.unique(n.toArray().concat(f.makeArray(e))),n.length=r.length,i=0;i<r.length;i++)n[i]=r[i];else E.apply(n,f.makeArray(e));return n},attr:function(e,t){var n=this,r;if("object"==typeof e)m(e,function(e,t){n.attr(e,t)});else{if(!o(t)){if(n[0]&&1===n[0].nodeType){if(r=L[e],r&&r.get)return r.get(n[0],e);if(A[e])return n.prop(e)?e:k;t=n[0].getAttribute(e,2),null===t&&(t=k)}return t}this.each(function(){var n;if(1===this.nodeType){if(n=L[e],n&&n.set)return void n.set(this,t);null===t?this.removeAttribute(e,2):this.setAttribute(e,t,2)}})}return n},removeAttr:function(e){return this.attr(e,null)},prop:function(e,t){var n=this;if(e=B[e]||e,"object"==typeof e)m(e,function(e,t){n.prop(e,t)});else{if(!o(t))return n[0]&&n[0].nodeType&&e in n[0]?n[0][e]:t;this.each(function(){1==this.nodeType&&(this[e]=t)})}return n},css:function(e,t){function n(e){return e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()})}function r(e){return e.replace(/[A-Z]/g,function(e){return"-"+e})}var i=this,a,s;if("object"==typeof e)m(e,function(e,t){i.css(e,t)});else if(o(t))e=n(e),"number"!=typeof t||R[e]||(t+="px"),i.each(function(){var n=this.style;if(s=M[e],s&&s.set)return void s.set(this,t);try{this.style[D[e]||e]=t}catch(i){}null!==t&&""!==t||(n.removeProperty?n.removeProperty(r(e)):n.removeAttribute(e))});else{if(a=i[0],s=M[e],s&&s.get)return s.get(a);if(a.ownerDocument.defaultView)try{return a.ownerDocument.defaultView.getComputedStyle(a,null).getPropertyValue(r(e))}catch(l){return k}else if(a.currentStyle)return a.currentStyle[n(e)]}return i},remove:function(){for(var e=this,t,n=this.length;n--;)t=e[n],S.clean(t),t.parentNode&&t.parentNode.removeChild(t);return this},empty:function(){for(var e=this,t,n=this.length;n--;)for(t=e[n];t.firstChild;)t.removeChild(t.firstChild);return this},html:function(e){var t=this,n;if(o(e)){n=t.length;try{for(;n--;)t[n].innerHTML=e}catch(r){f(t[n]).empty().append(e)}return t}return t[0]?t[0].innerHTML:""},text:function(e){var t=this,n;if(o(e)){for(n=t.length;n--;)"innerText"in t[n]?t[n].innerText=e:t[0].textContent=e;return t}return t[0]?t[0].innerText||t[0].textContent:""},append:function(){return u(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.appendChild(e)})},prepend:function(){return u(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.insertBefore(e,this.firstChild)},!0)},before:function(){var e=this;return e[0]&&e[0].parentNode?u(e,arguments,function(e){this.parentNode.insertBefore(e,this)}):e},after:function(){var e=this;return e[0]&&e[0].parentNode?u(e,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)},!0):e},appendTo:function(e){return f(e).append(this),this},prependTo:function(e){return f(e).prepend(this),this},replaceWith:function(e){return this.before(e).remove()},wrap:function(e){return d(this,e)},wrapAll:function(e){return d(this,e,!0)},wrapInner:function(e){return this.each(function(){f(this).contents().wrapAll(e)}),this},unwrap:function(){return this.parent().each(function(){f(this).replaceWith(this.childNodes)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),f(e)},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(e,t){var n=this;return"string"!=typeof e?n:(e.indexOf(" ")!==-1?m(e.split(" "),function(){n.toggleClass(this,t)}):n.each(function(n,r){var i,o;o=c(r,e),o!==t&&(i=r.className,o?r.className=h((" "+i+" ").replace(" "+e+" "," ")):r.className+=i?" "+e:e)}),n)},hasClass:function(e){return c(this[0],e)},each:function(e){return m(this,e)},on:function(e,t){return this.each(function(){S.bind(this,e,t)})},off:function(e,t){return this.each(function(){S.unbind(this,e,t)})},trigger:function(e){return this.each(function(){"object"==typeof e?S.fire(this,e.type,e):S.fire(this,e)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return new f(N.apply(this,arguments))},eq:function(e){return e===-1?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},find:function(e){var t,n,r=[];for(t=0,n=this.length;t<n;t++)f.find(e,this[t],r);return f(r)},filter:function(e){return f("function"==typeof e?g(this.toArray(),function(t,n){return e(n,t)}):f.filter(e,this.toArray()))},closest:function(e){var t=[];return e instanceof f&&(e=e[0]),this.each(function(n,r){for(;r;){if("string"==typeof e&&f(r).is(e)){t.push(r);break}if(r==e){t.push(r);break}r=r.parentNode}}),f(t)},offset:function(e){var t,n,r,i=0,o=0,a;return e?this.css(e):(t=this[0],t&&(n=t.ownerDocument,r=n.documentElement,t.getBoundingClientRect&&(a=t.getBoundingClientRect(),i=a.left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,o=a.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:o})},push:E,sort:[].sort,splice:[].splice},r.extend(f,{extend:r.extend,makeArray:function(e){return s(e)||e.nodeType?[e]:r.toArray(e)},inArray:p,isArray:r.isArray,each:m,trim:h,grep:g,find:n,expr:n.selectors,unique:n.uniqueSort,text:n.getText,contains:n.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!=t[r].nodeType&&t.splice(r,1);return t=1===t.length?f.find.matchesSelector(t[0],e)?[t[0]]:[]:f.find.matches(e,t)}}),m({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return y(e,"parentNode")},next:function(e){return C(e,"nextSibling",1)},prev:function(e){return C(e,"previousSibling",1)},children:function(e){return b(e.firstChild,"nextSibling",1)},contents:function(e){return r.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,t){f.fn[e]=function(n){var r=this,i=[];return r.each(function(){var e=t.call(i,this,n,i);e&&(f.isArray(e)?i.push.apply(i,e):i.push(e))}),this.length>1&&(T[e]||(i=f.unique(i)),0===e.indexOf("parents")&&(i=i.reverse())),i=f(i),n?i.filter(n):i}}),m({parentsUntil:function(e,t){return y(e,"parentNode",t)},nextUntil:function(e,t){return b(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return b(e,"previousSibling",1,t).slice(1)}},function(e,t){f.fn[e]=function(n,r){var i=this,o=[];return i.each(function(){var e=t.call(o,this,n,o);e&&(f.isArray(e)?o.push.apply(o,e):o.push(e))}),this.length>1&&(o=f.unique(o),0!==e.indexOf("parents")&&"prevUntil"!==e||(o=o.reverse())),o=f(o),r?o.filter(r):o}}),f.fn.is=function(e){return!!e&&this.filter(e).length>0},f.fn.init.prototype=f.fn,f.overrideDefaults=function(e){function t(r,i){return n=n||e(),0===arguments.length&&(r=n.element),i||(i=n.context),new t.fn.init(r,i)}var n;return f.extend(t,this),t},i.ie&&i.ie<8&&(x(L,"get",{maxlength:function(e){var t=e.maxLength;return 2147483647===t?k:t},size:function(e){var t=e.size;return 20===t?k:t},"class":function(e){return e.className},style:function(e){var t=e.style.cssText;return 0===t.length?k:t}}),x(L,"set",{"class":function(e,t){e.className=t},style:function(e,t){e.style.cssText=t}})),i.ie&&i.ie<9&&(D["float"]="styleFloat",x(M,"set",{opacity:function(e,t){var n=e.style;null===t||""===t?n.removeAttribute("filter"):(n.zoom=1,n.filter="alpha(opacity="+100*t+")")}})),f.attrHooks=L,f.cssHooks=M,f}),r(v,[],function(){return function(e,t){function n(e,t,n,r){function i(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+i(t)+i(n)+i(r)}var r=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,i=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,a=/\s+$/,s,l={},u,c,d,f="\ufeff";for(e=e||{},t&&(c=t.getValidStyles(),d=t.getInvalidStyles()),u=("\\\" \\' \\; \\: ; : "+f).split(" "),s=0;s<u.length;s++)l[u[s]]=f+s,l[f+s]=u[s];return{toHex:function(e){return e.replace(r,n)},parse:function(t){function u(e,t,n){var r,i,o,a;if(r=y[e+"-top"+t],r&&(i=y[e+"-right"+t],i&&(o=y[e+"-bottom"+t],o&&(a=y[e+"-left"+t])))){var l=[r,i,o,a];for(s=l.length-1;s--&&l[s]===l[s+1];);s>-1&&n||(y[e+t]=s==-1?l[0]:l.join(" "),delete y[e+"-top"+t],delete y[e+"-right"+t],delete y[e+"-bottom"+t],delete y[e+"-left"+t])}}function c(e){var t=y[e],n;if(t){for(t=t.split(" "),n=t.length;n--;)if(t[n]!==t[0])return!1;return y[e]=t[0],!0}}function d(e,t,n,r){c(t)&&c(n)&&c(r)&&(y[e]=y[t]+" "+y[n]+" "+y[r],delete y[t],delete y[n],delete y[r])}function p(e){return w=!0,l[e]}function h(e,t){return w&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return l[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e}function m(e){return String.fromCharCode(parseInt(e.slice(1),16))}function g(e){return e.replace(/\\[0-9a-f]+/gi,m)}function v(t,n,r,i,o,a){if(o=o||a)return o=h(o),"'"+o.replace(/\'/g,"\\'")+"'";if(n=h(n||r||i),!e.allow_script_urls){var s=n.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(s))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(s))return""}return E&&(n=E.call(N,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"}var y={},b,C,x,w,E=e.url_converter,N=e.url_converter_scope||this;if(t){for(t=t.replace(/[\u0000-\u001F]/g,""),t=t.replace(/\\[\"\';:\uFEFF]/g,p).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,p)});b=o.exec(t);)if(o.lastIndex=b.index+b[0].length,C=b[1].replace(a,"").toLowerCase(),x=b[2].replace(a,""),C&&x){if(C=g(C),x=g(x),C.indexOf(f)!==-1||C.indexOf('"')!==-1)continue;if(!e.allow_script_urls&&("behavior"==C||/expression\s*\(|\/\*|\*\//.test(x)))continue;"font-weight"===C&&"700"===x?x="bold":"color"!==C&&"background-color"!==C||(x=x.toLowerCase()),x=x.replace(r,n),x=x.replace(i,v),y[C]=w?h(x,!0):x}u("border","",!0),u("border","-width"),u("border","-color"),u("border","-style"),u("padding",""),u("margin",""),d("border","border-width","border-style","border-color"),"medium none"===y.border&&delete y.border,"none"===y["border-image"]&&delete y["border-image"]}return y},serialize:function(e,t){function n(t){var n,r,o,a;if(n=c[t])for(r=0,o=n.length;r<o;r++)t=n[r],a=e[t],a&&(i+=(i.length>0?" ":"")+t+": "+a+";")}function r(e,t){var n;return n=d["*"],(!n||!n[e])&&(n=d[t],!n||!n[e])}var i="",o,a;if(t&&c)n("*"),n(t);else for(o in e)a=e[o],!a||d&&!r(o,t)||(i+=(i.length>0?" ":"")+o+": "+a+";");return i}}}}),r(y,[],function(){return function(e,t){function n(e,n,r,i){var o,a;if(e){if(!i&&e[n])return e[n];if(e!=t){if(o=e[r])return o;for(a=e.parentNode;a&&a!=t;a=a.parentNode)if(o=a[r])return o}}}function r(e,n,r,i){var o,a,s;if(e){if(o=e[r],t&&o===t)return;if(o){if(!i)for(s=o[n];s;s=s[n])if(!s[n])return s;return o}if(a=e.parentNode,a&&a!==t)return a}}var i=e;this.current=function(){return i},this.next=function(e){return i=n(i,"firstChild","nextSibling",e)},this.prev=function(e){return i=n(i,"lastChild","previousSibling",e)},this.prev2=function(e){return i=r(i,"lastChild","previousSibling",e)}}}),r(b,[m],function(e){function t(n){function r(){return P.createDocumentFragment()}function i(e,t){E(F,e,t)}function o(e,t){E(z,e,t)}function a(e){i(e.parentNode,j(e))}function s(e){i(e.parentNode,j(e)+1)}function l(e){o(e.parentNode,j(e))}function u(e){o(e.parentNode,j(e)+1)}function c(e){e?(M[V]=M[W],M[$]=M[U]):(M[W]=M[V],M[U]=M[$]),M.collapsed=F}function d(e){a(e),u(e)}function f(e){i(e,0),o(e,1===e.nodeType?e.childNodes.length:e.nodeValue.length)}function p(e,t){var n=M[W],r=M[U],i=M[V],o=M[$],a=t.startContainer,s=t.startOffset,l=t.endContainer,u=t.endOffset;return 0===e?w(n,r,a,s):1===e?w(i,o,a,s):2===e?w(i,o,l,u):3===e?w(n,r,l,u):void 0}function h(){N(I)}function m(){return N(O)}function g(){return N(H)}function v(e){var t=this[W],r=this[U],i,o;3!==t.nodeType&&4!==t.nodeType||!t.nodeValue?(t.childNodes.length>0&&(o=t.childNodes[r]),o?t.insertBefore(e,o):3==t.nodeType?n.insertAfter(e,t):t.appendChild(e)):r?r>=t.nodeValue.length?n.insertAfter(e,t):(i=t.splitText(r),t.parentNode.insertBefore(e,i)):t.parentNode.insertBefore(e,t)}function y(e){var t=M.extractContents();M.insertNode(e),e.appendChild(t),M.selectNode(e)}function b(){return q(new t(n),{startContainer:M[W],startOffset:M[U],endContainer:M[V],endOffset:M[$],collapsed:M.collapsed,commonAncestorContainer:M.commonAncestorContainer})}function C(e,t){var n;if(3==e.nodeType)return e;if(t<0)return e;for(n=e.firstChild;n&&t>0;)--t,n=n.nextSibling;return n?n:e}function x(){return M[W]==M[V]&&M[U]==M[$]}function w(e,t,r,i){var o,a,s,l,u,c;if(e==r)return t==i?0:t<i?-1:1;for(o=r;o&&o.parentNode!=e;)o=o.parentNode;if(o){for(a=0,s=e.firstChild;s!=o&&a<t;)a++,s=s.nextSibling;return t<=a?-1:1}for(o=e;o&&o.parentNode!=r;)o=o.parentNode;if(o){for(a=0,s=r.firstChild;s!=o&&a<i;)a++,s=s.nextSibling;return a<i?-1:1}for(l=n.findCommonAncestor(e,r),u=e;u&&u.parentNode!=l;)u=u.parentNode;for(u||(u=l),c=r;c&&c.parentNode!=l;)c=c.parentNode;if(c||(c=l),u==c)return 0;for(s=l.firstChild;s;){if(s==u)return-1;if(s==c)return 1;s=s.nextSibling}}function E(e,t,r){var i,o;for(e?(M[W]=t,M[U]=r):(M[V]=t,M[$]=r),i=M[V];i.parentNode;)i=i.parentNode;for(o=M[W];o.parentNode;)o=o.parentNode;o==i?w(M[W],M[U],M[V],M[$])>0&&M.collapse(e):M.collapse(e),M.collapsed=x(),M.commonAncestorContainer=n.findCommonAncestor(M[W],M[V])}function N(e){var t,n=0,r=0,i,o,a,s,l,u;if(M[W]==M[V])return _(e);for(t=M[V],i=t.parentNode;i;t=i,i=i.parentNode){if(i==M[W])return S(t,e);++n}for(t=M[W],i=t.parentNode;i;t=i,i=i.parentNode){if(i==M[V])return k(t,e);++r}for(o=r-n,a=M[W];o>0;)a=a.parentNode,o--;for(s=M[V];o<0;)s=s.parentNode,o++;for(l=a.parentNode,u=s.parentNode;l!=u;l=l.parentNode,u=u.parentNode)a=l,s=u;return T(a,s,e)}function _(e){var t,n,i,o,a,s,l,u,c;if(e!=I&&(t=r()),M[U]==M[$])return t;if(3==M[W].nodeType){if(n=M[W].nodeValue,i=n.substring(M[U],M[$]),e!=H&&(o=M[W],u=M[U],c=M[$]-M[U],0===u&&c>=o.nodeValue.length-1?o.parentNode.removeChild(o):o.deleteData(u,c),M.collapse(F)),e==I)return;return i.length>0&&t.appendChild(P.createTextNode(i)),t}for(o=C(M[W],M[U]),a=M[$]-M[U];o&&a>0;)s=o.nextSibling,l=D(o,e),t&&t.appendChild(l),--a,o=s;return e!=H&&M.collapse(F),t}function S(e,t){var n,i,o,a,s,l;if(t!=I&&(n=r()),i=R(e,t),n&&n.appendChild(i),o=j(e),a=o-M[U],a<=0)return t!=H&&(M.setEndBefore(e),M.collapse(z)),n;for(i=e.previousSibling;a>0;)s=i.previousSibling,l=D(i,t),n&&n.insertBefore(l,n.firstChild),--a,i=s;return t!=H&&(M.setEndBefore(e),M.collapse(z)),n}function k(e,t){var n,i,o,a,s,l;for(t!=I&&(n=r()),o=A(e,t),n&&n.appendChild(o),i=j(e),++i,a=M[$]-i,o=e.nextSibling;o&&a>0;)s=o.nextSibling,l=D(o,t),n&&n.appendChild(l),--a,o=s;return t!=H&&(M.setStartAfter(e),M.collapse(F)),n}function T(e,t,n){var i,o,a,s,l,u,c;for(n!=I&&(o=r()),i=A(e,n),o&&o.appendChild(i),a=j(e),s=j(t),++a,l=s-a,u=e.nextSibling;l>0;)c=u.nextSibling,i=D(u,n),o&&o.appendChild(i),u=c,--l;return i=R(t,n),o&&o.appendChild(i),n!=H&&(M.setStartAfter(e),M.collapse(F)),o}function R(e,t){var n=C(M[V],M[$]-1),r,i,o,a,s,l=n!=M[V];if(n==e)return B(n,l,z,t);for(r=n.parentNode,i=B(r,z,z,t);r;){for(;n;)o=n.previousSibling,a=B(n,l,z,t),t!=I&&i.insertBefore(a,i.firstChild),l=F,n=o;if(r==e)return i;n=r.previousSibling,r=r.parentNode,s=B(r,z,z,t),t!=I&&s.appendChild(i),i=s}}function A(e,t){var n=C(M[W],M[U]),r=n!=M[W],i,o,a,s,l;if(n==e)return B(n,r,F,t);for(i=n.parentNode,o=B(i,z,F,t);i;){for(;n;)a=n.nextSibling,s=B(n,r,F,t),t!=I&&o.appendChild(s),r=F,n=a;if(i==e)return o;n=i.nextSibling,i=i.parentNode,l=B(i,z,F,t),t!=I&&l.appendChild(o),o=l}}function B(e,t,r,i){var o,a,s,l,u;if(t)return D(e,i);if(3==e.nodeType){if(o=e.nodeValue,r?(l=M[U],a=o.substring(l),s=o.substring(0,l)):(l=M[$],a=o.substring(0,l),s=o.substring(l)),i!=H&&(e.nodeValue=s),i==I)return;return u=n.clone(e,z),u.nodeValue=a,u}if(i!=I)return n.clone(e,z)}function D(e,t){return t!=I?t==H?n.clone(e,F):e:void e.parentNode.removeChild(e)}function L(){return n.create("body",null,g()).outerText}var M=this,P=n.doc,O=0,H=1,I=2,F=!0,z=!1,U="startOffset",W="startContainer",V="endContainer",$="endOffset",q=e.extend,j=n.nodeIndex;return q(M,{startContainer:P,startOffset:0,endContainer:P,endOffset:0,collapsed:F,commonAncestorContainer:P,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:i,setEnd:o,setStartBefore:a,setStartAfter:s,setEndBefore:l,setEndAfter:u,collapse:c,selectNode:d,selectNodeContents:f,compareBoundaryPoints:p,deleteContents:h,extractContents:m,cloneContents:g,insertNode:v,surroundContents:y,cloneRange:b,toStringIE:L}),M}return t.prototype.toString=function(){return this.toStringIE()},t}),r(C,[m],function(e){function t(e){var t;return t=document.createElement("div"),t.innerHTML=e,t.textContent||t.innerText||e}function n(e,t){var n,r,i,a={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),o[r]||(i="&"+e[n+1]+";",a[r]=i,a[i]=r);return a}}var r=e.makeMap,i,o,a,s=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,l=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,u=/[<>&\"\']/g,c=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,d={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};o={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},a={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},i=n("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var f={encodeRaw:function(e,t){return e.replace(t?s:l,function(e){return o[e]||e})},encodeAllRaw:function(e){return(""+e).replace(u,function(e){return o[e]||e})},encodeNumeric:function(e,t){return e.replace(t?s:l,function(e){return e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":o[e]||"&#"+e.charCodeAt(0)+";"})},encodeNamed:function(e,t,n){return n=n||i,e.replace(t?s:l,function(e){return o[e]||n[e]||e})},getEncodeFunc:function(e,t){function a(e,n){return e.replace(n?s:l,function(e){return o[e]||t[e]||"&#"+e.charCodeAt(0)+";"||e})}function u(e,n){return f.encodeNamed(e,n,t)}return t=n(t)||i,e=r(e.replace(/\+/g,",")),e.named&&e.numeric?a:e.named?t?u:f.encodeNamed:e.numeric?f.encodeNumeric:f.encodeRaw},decode:function(e){return e.replace(c,function(e,n){return n?(n="x"===n.charAt(0).toLowerCase()?parseInt(n.substr(1),16):parseInt(n,10),n>65535?(n-=65536,String.fromCharCode(55296+(n>>10),56320+(1023&n))):d[n]||String.fromCharCode(n)):a[e]||i[e]||t(e)})}};return f}),r(x,[m,c],function(e,t){return function(n,r){function i(e){n.getElementsByTagName("head")[0].appendChild(e)}function o(r,o,u){function c(){for(var e=b.passed,t=e.length;t--;)e[t]();b.status=2,b.passed=[],b.failed=[]}function d(){for(var e=b.failed,t=e.length;t--;)e[t]();b.status=3,b.passed=[],b.failed=[]}function f(){var e=navigator.userAgent.match(/WebKit\/(\d*)/);return!!(e&&e[1]<536)}function p(e,n){e()||((new Date).getTime()-y<l?t.setTimeout(n):d())}function h(){p(function(){for(var e=n.styleSheets,t,r=e.length,i;r--;)if(t=e[r],i=t.ownerNode?t.ownerNode:t.owningElement,i&&i.id===g.id)return c(),!0},h)}function m(){p(function(){try{var e=v.sheet.cssRules;return c(),!!e}catch(t){}},m)}var g,v,y,b;if(r=e._addCacheSuffix(r),s[r]?b=s[r]:(b={passed:[],failed:[]},s[r]=b),o&&b.passed.push(o),u&&b.failed.push(u),1!=b.status){if(2==b.status)return void c();if(3==b.status)return void d();if(b.status=1,g=n.createElement("link"),g.rel="stylesheet",g.type="text/css",g.id="u"+a++,g.async=!1,g.defer=!1,y=(new Date).getTime(),"onload"in g&&!f())g.onload=h,g.onerror=d;else{if(navigator.userAgent.indexOf("Firefox")>0)return v=n.createElement("style"),v.textContent='@import "'+r+'"',m(),void i(v);h()}i(g),g.href=r}}var a=0,s={},l;r=r||{},l=r.maxLoadTime||5e3,this.load=o}}),r(w,[p,g,v,f,y,b,C,d,m,x],function(e,n,r,i,o,a,s,l,u,c){function d(e,t){var n={},r=t.keep_values,i;return i={set:function(n,r,i){t.url_converter&&(r=t.url_converter.call(t.url_converter_scope||e,r,i,n[0])),n.attr("data-mce-"+i,r).attr(i,r)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}},n={style:{set:function(e,t){return null!==t&&"object"==typeof t?void e.css(t):(r&&e.attr("data-mce-style",t),void e.attr("style",t))},get:function(t){var n=t.attr("data-mce-style")||t.attr("style");return n=e.serializeStyle(e.parseStyle(n),t[0].nodeName)}}},r&&(n.href=n.src=i),n}function f(e,t){var n=t.attr("style");n=e.serializeStyle(e.parseStyle(n),t[0].nodeName),n||(n=null),t.attr("data-mce-style",n)}function p(e,t){var n=0,r,i;if(e)for(r=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)i=e.nodeType,(!t||3!=i||i!=r&&e.nodeValue.length)&&(n++,r=i);return n}function h(e,t){var o=this,a;o.doc=e,o.win=window,o.files={},o.counter=0,o.stdMode=!b||e.documentMode>=8,o.boxModel=!b||"CSS1Compat"==e.compatMode||o.stdMode,o.styleSheetLoader=new c(e),o.boundEvents=[],o.settings=t=t||{},o.schema=t.schema,o.styles=new r({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),o.fixDoc(e),o.events=t.ownEvents?new i(t.proxy):i.Event,o.attrHooks=d(o,t),a=t.schema?t.schema.getBlockElements():{},o.$=n.overrideDefaults(function(){return{context:e,element:o.getRoot()}}),o.isBlock=function(e){if(!e)return!1;var t=e.nodeType;return t?!(1!==t||!a[e.nodeName]):!!a[e]}}var m=u.each,g=u.is,v=u.grep,y=u.trim,b=l.ie,C=/^([a-z0-9],?)+$/i,x=/^[ \t\r\n]*$/;return h.prototype={$$:function(e){return"string"==typeof e&&(e=this.get(e)),this.$(e)},root:null,fixDoc:function(e){var t=this.settings,n;if(b&&t.schema){"abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video".replace(/\w+/g,function(t){e.createElement(t)});for(n in t.schema.getCustomElements())e.createElement(n)}},clone:function(e,t){var n=this,r,i;return!b||1!==e.nodeType||t?e.cloneNode(t):(i=n.doc,t?r.firstChild:(r=i.createElement(e.nodeName),m(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),r))},getRoot:function(){var e=this;return e.settings.root_element||e.doc.body},getViewPort:function(e){var t,n;return e=e?e:this.win,t=e.document,n=this.boxModel?t.documentElement:t.body,{x:e.pageXOffset||n.scrollLeft,y:e.pageYOffset||n.scrollTop,w:e.innerWidth||n.clientWidth,h:e.innerHeight||n.clientHeight}},getRect:function(e){var t=this,n,r;return e=t.get(e),n=t.getPos(e),r=t.getSize(e),{x:n.x,y:n.y,w:r.w,h:r.h}},getSize:function(e){var t=this,n,r;return e=t.get(e),n=t.getStyle(e,"width"),r=t.getStyle(e,"height"),n.indexOf("px")===-1&&(n=0),r.indexOf("px")===-1&&(r=0),
+{w:parseInt(n,10)||e.offsetWidth||e.clientWidth,h:parseInt(r,10)||e.offsetHeight||e.clientHeight}},getParent:function(e,t,n){return this.getParents(e,t,n,!1)},getParents:function(e,n,r,i){var o=this,a,s=[];for(e=o.get(e),i=i===t,r=r||("BODY"!=o.getRoot().nodeName?o.getRoot().parentNode:null),g(n,"string")&&(a=n,n="*"===n?function(e){return 1==e.nodeType}:function(e){return o.is(e,a)});e&&e!=r&&e.nodeType&&9!==e.nodeType;){if(!n||n(e)){if(!i)return e;s.push(e)}e=e.parentNode}return i?s:null},get:function(e){var t;return e&&this.doc&&"string"==typeof e&&(t=e,e=this.doc.getElementById(e),e&&e.id!==t)?this.doc.getElementsByName(t)[1]:e},getNext:function(e,t){return this._findSib(e,t,"nextSibling")},getPrev:function(e,t){return this._findSib(e,t,"previousSibling")},select:function(t,n){var r=this;return e(t,r.get(n)||r.settings.root_element||r.doc,[])},is:function(n,r){var i;if(n.length===t){if("*"===r)return 1==n.nodeType;if(C.test(r)){for(r=r.toLowerCase().split(/,/),n=n.nodeName.toLowerCase(),i=r.length-1;i>=0;i--)if(r[i]==n)return!0;return!1}}if(n.nodeType&&1!=n.nodeType)return!1;var o=n.nodeType?[n]:n;return e(r,o[0].ownerDocument||o[0],null,o).length>0},add:function(e,t,n,r,i){var o=this;return this.run(e,function(e){var a;return a=g(t,"string")?o.doc.createElement(t):t,o.setAttribs(a,n),r&&(r.nodeType?a.appendChild(r):o.setHTML(a,r)),i?a:e.appendChild(a)})},create:function(e,t,n){return this.add(this.doc.createElement(e),e,t,n,1)},createHTML:function(e,t,n){var r="",i;r+="<"+e;for(i in t)t.hasOwnProperty(i)&&null!==t[i]&&"undefined"!=typeof t[i]&&(r+=" "+i+'="'+this.encode(t[i])+'"');return"undefined"!=typeof n?r+">"+n+"</"+e+">":r+" />"},createFragment:function(e){var t,n,r=this.doc,i;for(i=r.createElement("div"),t=r.createDocumentFragment(),e&&(i.innerHTML=e);n=i.firstChild;)t.appendChild(n);return t},remove:function(e,t){return e=this.$$(e),t?e.each(function(){for(var e;e=this.firstChild;)3==e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}).remove():e.remove(),e.length>1?e.toArray():e[0]},setStyle:function(e,t,n){e=this.$$(e).css(t,n),this.settings.update_styles&&f(this,e)},getStyle:function(e,n,r){return e=this.$$(e),r?e.css(n):(n=n.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"float"==n&&(n=l.ie&&l.ie<12?"styleFloat":"cssFloat"),e[0]&&e[0].style?e[0].style[n]:t)},setStyles:function(e,t){e=this.$$(e).css(t),this.settings.update_styles&&f(this,e)},removeAllAttribs:function(e){return this.run(e,function(e){var t,n=e.attributes;for(t=n.length-1;t>=0;t--)e.removeAttributeNode(n.item(t))})},setAttrib:function(e,t,n){var r=this,i,o,a=r.settings;""===n&&(n=null),e=r.$$(e),i=e.attr(t),e.length&&(o=r.attrHooks[t],o&&o.set?o.set(e,n,t):e.attr(t,n),i!=n&&a.onSetAttrib&&a.onSetAttrib({attrElm:e,attrName:t,attrValue:n}))},setAttribs:function(e,t){var n=this;n.$$(e).each(function(e,r){m(t,function(e,t){n.setAttrib(r,t,e)})})},getAttrib:function(e,t,n){var r=this,i,o;return e=r.$$(e),e.length&&(i=r.attrHooks[t],o=i&&i.get?i.get(e,t):e.attr(t)),"undefined"==typeof o&&(o=n||""),o},getPos:function(e,t){var r=this,i=0,o=0,a,s=r.doc,l=s.body,u;if(e=r.get(e),t=t||l,e){if(t===l&&e.getBoundingClientRect&&"static"===n(l).css("position"))return u=e.getBoundingClientRect(),t=r.boxModel?s.documentElement:l,i=u.left+(s.documentElement.scrollLeft||l.scrollLeft)-t.clientLeft,o=u.top+(s.documentElement.scrollTop||l.scrollTop)-t.clientTop,{x:i,y:o};for(a=e;a&&a!=t&&a.nodeType;)i+=a.offsetLeft||0,o+=a.offsetTop||0,a=a.offsetParent;for(a=e.parentNode;a&&a!=t&&a.nodeType;)i-=a.scrollLeft||0,o-=a.scrollTop||0,a=a.parentNode}return{x:i,y:o}},parseStyle:function(e){return this.styles.parse(e)},serializeStyle:function(e,t){return this.styles.serialize(e,t)},addStyle:function(e){var t=this,n=t.doc,r,i;if(t!==h.DOM&&n===document){var o=h.DOM.addedStyles;if(o=o||[],o[e])return;o[e]=!0,h.DOM.addedStyles=o}i=n.getElementById("mceDefaultStyles"),i||(i=n.createElement("style"),i.id="mceDefaultStyles",i.type="text/css",r=n.getElementsByTagName("head")[0],r.firstChild?r.insertBefore(i,r.firstChild):r.appendChild(i)),i.styleSheet?i.styleSheet.cssText+=e:i.appendChild(n.createTextNode(e))},loadCSS:function(e){var t=this,n=t.doc,r;return t!==h.DOM&&n===document?void h.DOM.loadCSS(e):(e||(e=""),r=n.getElementsByTagName("head")[0],void m(e.split(","),function(e){var i;e=u._addCacheSuffix(e),t.files[e]||(t.files[e]=!0,i=t.create("link",{rel:"stylesheet",href:e}),b&&n.documentMode&&n.recalc&&(i.onload=function(){n.recalc&&n.recalc(),i.onload=null}),r.appendChild(i))}))},addClass:function(e,t){this.$$(e).addClass(t)},removeClass:function(e,t){this.toggleClass(e,t,!1)},hasClass:function(e,t){return this.$$(e).hasClass(t)},toggleClass:function(e,t,r){this.$$(e).toggleClass(t,r).each(function(){""===this.className&&n(this).attr("class",null)})},show:function(e){this.$$(e).show()},hide:function(e){this.$$(e).hide()},isHidden:function(e){return"none"==this.$$(e).css("display")},uniqueId:function(e){return(e?e:"mce_")+this.counter++},setHTML:function(e,t){e=this.$$(e),b?e.each(function(e,r){if(r.canHaveHTML!==!1){for(;r.firstChild;)r.removeChild(r.firstChild);try{r.innerHTML="<br>"+t,r.removeChild(r.firstChild)}catch(i){n("<div></div>").html("<br>"+t).contents().slice(1).appendTo(r)}return t}}):e.html(t)},getOuterHTML:function(e){return e=this.get(e),1==e.nodeType&&"outerHTML"in e?e.outerHTML:n("<div></div>").append(n(e).clone()).html()},setOuterHTML:function(e,t){var r=this;r.$$(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}r.remove(n(this).html(t),!0)})},decode:s.decode,encode:s.encodeAllRaw,insertAfter:function(e,t){return t=this.get(t),this.run(e,function(e){var n,r;return n=t.parentNode,r=t.nextSibling,r?n.insertBefore(e,r):n.appendChild(e),e})},replace:function(e,t,n){var r=this;return r.run(t,function(t){return g(t,"array")&&(e=e.cloneNode(!0)),n&&m(v(t.childNodes),function(t){e.appendChild(t)}),t.parentNode.replaceChild(e,t)})},rename:function(e,t){var n=this,r;return e.nodeName!=t.toUpperCase()&&(r=n.create(t),m(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),n.replace(r,e,1)),r||e},findCommonAncestor:function(e,t){for(var n=e,r;n;){for(r=t;r&&n!=r;)r=r.parentNode;if(n==r)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},toHex:function(e){return this.styles.toHex(u.trim(e))},run:function(e,t,n){var r=this,i;return"string"==typeof e&&(e=r.get(e)),!!e&&(n=n||this,e.nodeType||!e.length&&0!==e.length?t.call(n,e):(i=[],m(e,function(e,o){e&&("string"==typeof e&&(e=r.get(e)),i.push(t.call(n,e,o)))}),i))},getAttribs:function(e){var t;if(e=this.get(e),!e)return[];if(b){if(t=[],"OBJECT"==e.nodeName)return e.attributes;"OPTION"===e.nodeName&&this.getAttrib(e,"selected")&&t.push({specified:1,nodeName:"selected"});var n=/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi;return e.cloneNode(!1).outerHTML.replace(n,"").replace(/[\w:\-]+/gi,function(e){t.push({specified:1,nodeName:e})}),t}return e.attributes},isEmpty:function(e,t){var n=this,r,i,a,s,l,u,c=0;if(e=e.firstChild){l=new o(e,e.parentNode),t=t||(n.schema?n.schema.getNonEmptyElements():null),s=n.schema?n.schema.getWhiteSpaceElements():{};do{if(a=e.nodeType,1===a){var d=e.getAttribute("data-mce-bogus");if(d){e=l.next("all"===d);continue}if(u=e.nodeName.toLowerCase(),t&&t[u]){if("br"===u){c++,e=l.next();continue}return!1}for(i=n.getAttribs(e),r=i.length;r--;)if(u=i[r].nodeName,"name"===u||"data-mce-bookmark"===u)return!1}if(8==a)return!1;if(3===a&&!x.test(e.nodeValue))return!1;if(3===a&&e.parentNode&&s[e.parentNode.nodeName]&&x.test(e.nodeValue))return!1;e=l.next()}while(e)}return c<=1},createRng:function(){var e=this.doc;return e.createRange?e.createRange():new a(this)},nodeIndex:p,split:function(e,t,n){function r(e){function t(e){var t=e.previousSibling&&"SPAN"==e.previousSibling.nodeName,n=e.nextSibling&&"SPAN"==e.nextSibling.nodeName;return t&&n}var n,o=e.childNodes,a=e.nodeType;if(1!=a||"bookmark"!=e.getAttribute("data-mce-type")){for(n=o.length-1;n>=0;n--)r(o[n]);if(9!=a){if(3==a&&e.nodeValue.length>0){var s=y(e.nodeValue).length;if(!i.isBlock(e.parentNode)||s>0||0===s&&t(e))return}else if(1==a&&(o=e.childNodes,1==o.length&&o[0]&&1==o[0].nodeType&&"bookmark"==o[0].getAttribute("data-mce-type")&&e.parentNode.insertBefore(o[0],e),o.length||/^(br|hr|input|img)$/i.test(e.nodeName)))return;i.remove(e)}return e}}var i=this,o=i.createRng(),a,s,l;if(e&&t)return o.setStart(e.parentNode,i.nodeIndex(e)),o.setEnd(t.parentNode,i.nodeIndex(t)),a=o.extractContents(),o=i.createRng(),o.setStart(t.parentNode,i.nodeIndex(t)+1),o.setEnd(e.parentNode,i.nodeIndex(e)+1),s=o.extractContents(),l=e.parentNode,l.insertBefore(r(a),e),n?l.insertBefore(n,e):l.insertBefore(t,e),l.insertBefore(r(s),e),i.remove(e),n||t},bind:function(e,t,n,r){var i=this;if(u.isArray(e)){for(var o=e.length;o--;)e[o]=i.bind(e[o],t,n,r);return e}return!i.settings.collect||e!==i.doc&&e!==i.win||i.boundEvents.push([e,t,n,r]),i.events.bind(e,t,n,r||i)},unbind:function(e,t,n){var r=this,i;if(u.isArray(e)){for(i=e.length;i--;)e[i]=r.unbind(e[i],t,n);return e}if(r.boundEvents&&(e===r.doc||e===r.win))for(i=r.boundEvents.length;i--;){var o=r.boundEvents[i];e!=o[0]||t&&t!=o[1]||n&&n!=o[2]||this.events.unbind(o[0],o[1],o[2])}return this.events.unbind(e,t,n)},fire:function(e,t,n){return this.events.fire(e,t,n)},getContentEditable:function(e){var t;return e&&1==e.nodeType?(t=e.getAttribute("data-mce-contenteditable"),t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null):null},getContentEditableParent:function(e){for(var t=this.getRoot(),n=null;e&&e!==t&&(n=this.getContentEditable(e),null===n);e=e.parentNode);return n},destroy:function(){var t=this;if(t.boundEvents){for(var n=t.boundEvents.length;n--;){var r=t.boundEvents[n];this.events.unbind(r[0],r[1],r[2])}t.boundEvents=null}e.setDocument&&e.setDocument(),t.win=t.doc=t.root=t.events=t.frag=null},isChildOf:function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},_findSib:function(e,t,n){var r=this,i=t;if(e)for("string"==typeof i&&(i=function(e){return r.is(e,t)}),e=e[n];e;e=e[n])if(i(e))return e;return null}},h.DOM=new h(document),h.nodeIndex=p,h}),r(E,[w,m],function(e,t){function n(){function e(e,n,i){function o(){l.remove(c),u&&(u.onreadystatechange=u.onload=u=null),n()}function s(){a(i)?i():"undefined"!=typeof console&&console.log&&console.log("Failed to load script: "+e)}var l=r,u,c;c=l.uniqueId(),u=document.createElement("script"),u.id=c,u.type="text/javascript",u.src=t._addCacheSuffix(e),"onreadystatechange"in u?u.onreadystatechange=function(){/loaded|complete/.test(u.readyState)&&o()}:u.onload=o,u.onerror=s,(document.getElementsByTagName("head")[0]||document.body).appendChild(u)}var n=0,s=1,l=2,u=3,c={},d=[],f={},p=[],h=0,m;this.isDone=function(e){return c[e]==l},this.markDone=function(e){c[e]=l},this.add=this.load=function(e,t,r,i){var o=c[e];o==m&&(d.push(e),c[e]=n),t&&(f[e]||(f[e]=[]),f[e].push({success:t,failure:i,scope:r||this}))},this.remove=function(e){delete c[e],delete f[e]},this.loadQueue=function(e,t,n){this.loadScripts(d,e,t,n)},this.loadScripts=function(t,n,r,d){function g(e,t){i(f[t],function(t){a(t[e])&&t[e].call(t.scope)}),f[t]=m}var v,y=[];p.push({success:n,failure:d,scope:r||this}),(v=function(){var n=o(t);t.length=0,i(n,function(t){return c[t]===l?void g("success",t):c[t]===u?void g("failure",t):void(c[t]!==s&&(c[t]=s,h++,e(t,function(){c[t]=l,h--,g("success",t),v()},function(){c[t]=u,h--,y.push(t),g("failure",t),v()})))}),h||(i(p,function(e){0===y.length?a(e.success)&&e.success.call(e.scope):a(e.failure)&&e.failure.call(e.scope,y)}),p.length=0)})()}}var r=e.DOM,i=t.each,o=t.grep,a=function(e){return"function"==typeof e};return n.ScriptLoader=new n,n}),r(N,[E,m],function(e,n){function r(){var e=this;e.items=[],e.urls={},e.lookup={}}var i=n.each;return r.prototype={get:function(e){return this.lookup[e]?this.lookup[e].instance:t},dependencies:function(e){var t;return this.lookup[e]&&(t=this.lookup[e].dependencies),t||[]},requireLangPack:function(t,n){var i=r.language;if(i&&r.languageLoad!==!1){if(n)if(n=","+n+",",n.indexOf(","+i.substr(0,2)+",")!=-1)i=i.substr(0,2);else if(n.indexOf(","+i+",")==-1)return;e.ScriptLoader.add(this.urls[t]+"/langs/"+i+".js")}},add:function(e,t,n){return this.items.push(t),this.lookup[e]={instance:t,dependencies:n},t},remove:function(e){delete this.urls[e],delete this.lookup[e]},createUrl:function(e,t){return"object"==typeof t?t:{prefix:e.prefix,resource:t,suffix:e.suffix}},addComponents:function(t,n){var r=this.urls[t];i(n,function(t){e.ScriptLoader.add(r+"/"+t)})},load:function(n,o,a,s,l){function u(){var r=c.dependencies(n);i(r,function(e){var n=c.createUrl(o,e);c.load(n.resource,n,t,t)}),a&&(s?a.call(s):a.call(e))}var c=this,d=o;c.urls[n]||("object"==typeof o&&(d=o.prefix+o.resource+o.suffix),0!==d.indexOf("/")&&d.indexOf("://")==-1&&(d=r.baseURL+"/"+d),c.urls[n]=d.substring(0,d.lastIndexOf("/")),c.lookup[n]?u():e.ScriptLoader.add(d,u,s,l))}},r.PluginManager=new r,r.ThemeManager=new r,r}),r(_,[],function(){function e(e){return function(t){return!!t&&t.nodeType==e}}function t(e){return e=e.toLowerCase().split(" "),function(t){var n,r;if(t&&t.nodeType)for(r=t.nodeName.toLowerCase(),n=0;n<e.length;n++)if(r===e[n])return!0;return!1}}function n(e,t){return t=t.toLowerCase().split(" "),function(n){var r,i;if(s(n))for(r=0;r<t.length;r++)if(i=getComputedStyle(n,null).getPropertyValue(e),i===t[r])return!0;return!1}}function r(e,t){return function(n){return s(n)&&n[e]===t}}function i(e,t){return function(n){return s(n)&&n.getAttribute(e)===t}}function o(e){return s(e)&&e.hasAttribute("data-mce-bogus")}function a(e){return function(t){if(s(t)){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1}}var s=e(1);return{isText:e(3),isElement:s,isComment:e(8),isBr:t("br"),isContentEditableTrue:a("true"),isContentEditableFalse:a("false"),matchNodeNames:t,hasPropValue:r,hasAttributeValue:i,matchStyleValues:n,isBogus:o}}),r(S,[],function(){function e(e){return e==n}function t(e){return e.replace(new RegExp(n,"g"),"")}var n="\ufeff";return{isZwsp:e,ZWSP:n,trim:t}}),r(k,[_,S],function(e,t){function n(e){return y(e)&&(e=e.parentNode),v(e)&&e.hasAttribute("data-mce-caret")}function r(e){return y(e)&&t.isZwsp(e.data)}function i(e){return n(e)||r(e)}function o(e){var t=e.parentNode;t&&t.removeChild(e)}function a(e){try{return e.nodeValue}catch(t){return""}}function s(e,t){0===t.length?o(e):e.nodeValue=t}function l(e,n){var r,o,a,s;if(r=e.ownerDocument,a=r.createTextNode(t.ZWSP),s=e.parentNode,n){if(o=e.previousSibling,y(o)){if(i(o))return o;if(h(o))return o.splitText(o.data.length-1)}s.insertBefore(a,e)}else{if(o=e.nextSibling,y(o)){if(i(o))return o;if(p(o))return o.splitText(1),o}e.nextSibling?s.insertBefore(a,e.nextSibling):s.appendChild(a)}return a}function u(){var e=document.createElement("br");return e.setAttribute("data-mce-bogus","1"),e}function c(e,t,n){var r,i,o;return r=t.ownerDocument,i=r.createElement(e),i.setAttribute("data-mce-caret",n?"before":"after"),i.setAttribute("data-mce-bogus","all"),i.appendChild(u()),o=t.parentNode,n?o.insertBefore(i,t):t.nextSibling?o.insertBefore(i,t.nextSibling):o.appendChild(i),i}function d(t){return t.firstChild!==t.lastChild||!e.isBr(t.firstChild)}function f(e){if(v(e)&&i(e)&&(d(e)?e.removeAttribute("data-mce-caret"):o(e)),y(e)){var n=t.trim(a(e));s(e,n)}}function p(e){return y(e)&&e.data[0]==t.ZWSP}function h(e){return y(e)&&e.data[e.data.length-1]==t.ZWSP}function m(t){var n=t.getElementsByTagName("br"),r=n[n.length-1];e.isBogus(r)&&r.parentNode.removeChild(r)}function g(e){return e&&e.hasAttribute("data-mce-caret")?(m(e),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("_moz_abspos"),e):null}var v=e.isElement,y=e.isText;return{isCaretContainer:i,isCaretContainerBlock:n,isCaretContainerInline:r,showCaretContainerBlock:g,insertInline:l,insertBlock:c,hasContent:d,remove:f,startsWithCaretContainer:p,endsWithCaretContainer:h}}),r(T,[m,y,_,b,k],function(e,t,n,r,i){function o(e){return m(e)||g(e)}function a(e,t){var n=e.childNodes;return t--,t>n.length-1?t=n.length-1:t<0&&(t=0),n[t]||e}function s(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}function l(e,t,n){return null!==s(e,t,n)}function u(e){return"_mce_caret"===e.id}function c(e,t){return v(e)&&l(e,t,u)===!1}function d(e){this.walk=function(t,n){function r(e){var t;return t=e[0],3===t.nodeType&&t===l&&u>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===d&&e.length>0&&t===c&&3===t.nodeType&&e.splice(e.length-1,1),e}function i(e,t,n){for(var r=[];e&&e!=n;e=e[t])r.push(e);return r}function o(e,t){do{if(e.parentNode==t)return e;e=e.parentNode}while(e)}function s(e,t,o){var a=o?"nextSibling":"previousSibling";for(g=e,v=g.parentNode;g&&g!=t;g=v)v=g.parentNode,y=i(g==e?g:g[a],a),y.length&&(o||y.reverse(),n(r(y)))}var l=t.startContainer,u=t.startOffset,c=t.endContainer,d=t.endOffset,f,p,m,g,v,y,b;if(b=e.select("td[data-mce-selected],th[data-mce-selected]"),b.length>0)return void h(b,function(e){n([e])});if(1==l.nodeType&&l.hasChildNodes()&&(l=l.childNodes[u]),1==c.nodeType&&c.hasChildNodes()&&(c=a(c,d)),l==c)return n(r([l]));for(f=e.findCommonAncestor(l,c),g=l;g;g=g.parentNode){if(g===c)return s(l,f,!0);if(g===f)break}for(g=c;g;g=g.parentNode){if(g===l)return s(c,f);if(g===f)break}p=o(l,f)||l,m=o(c,f)||c,s(l,p,!0),y=i(p==l?p:p.nextSibling,"nextSibling",m==c?m.nextSibling:m),y.length&&n(r(y)),s(c,m)},this.split=function(e){function t(e,t){return e.splitText(t)}var n=e.startContainer,r=e.startOffset,i=e.endContainer,o=e.endOffset;return n==i&&3==n.nodeType?r>0&&r<n.nodeValue.length&&(i=t(n,r),n=i.previousSibling,o>r?(o-=r,n=i=t(i,o).previousSibling,o=i.nodeValue.length,r=0):o=0):(3==n.nodeType&&r>0&&r<n.nodeValue.length&&(n=t(n,r),r=0),3==i.nodeType&&o>0&&o<i.nodeValue.length&&(i=t(i,o).previousSibling,o=i.nodeValue.length)),{startContainer:n,startOffset:r,endContainer:i,endOffset:o}},this.normalize=function(n){function r(r){function a(e){return e&&/^(TD|TH|CAPTION)$/.test(e.nodeName)}function s(n,r){for(var i=new t(n,e.getParent(n.parentNode,e.isBlock)||m);n=i[r?"prev":"next"]();)if("BR"===n.nodeName)return!0}function l(e){for(;e&&e!=m;){if(g(e))return!0;e=e.parentNode}return!1}function u(e,t){return e.previousSibling&&e.previousSibling.nodeName==t}function d(n,r){var a,s,l;if(r=r||f,l=e.getParent(r.parentNode,e.isBlock)||m,n&&"BR"==r.nodeName&&x&&e.isEmpty(l))return f=r.parentNode,p=e.nodeIndex(r),void(i=!0);for(a=new t(r,l);y=a[n?"prev":"next"]();){if("false"===e.getContentEditableParent(y)||c(y,e.getRoot()))return;if(3===y.nodeType&&y.nodeValue.length>0)return f=y,p=n?y.nodeValue.length:0,void(i=!0);if(e.isBlock(y)||b[y.nodeName.toLowerCase()])return;s=y}o&&s&&(f=s,i=!0,p=0)}var f,p,h,m=e.getRoot(),y,b,C,x;if(f=n[(r?"start":"end")+"Container"],p=n[(r?"start":"end")+"Offset"],x=1==f.nodeType&&p===f.childNodes.length,b=e.schema.getNonEmptyElements(),C=r,!v(f)){if(1==f.nodeType&&p>f.childNodes.length-1&&(C=!1),9===f.nodeType&&(f=e.getRoot(),p=0),f===m){if(C&&(y=f.childNodes[p>0?p-1:0])){if(v(y))return;if(b[y.nodeName]||"TABLE"==y.nodeName)return}if(f.hasChildNodes()){if(p=Math.min(!C&&p>0?p-1:p,f.childNodes.length-1),f=f.childNodes[p],p=0,!o&&f===m.lastChild&&"TABLE"===f.nodeName)return;if(l(f)||v(f))return;if(f.hasChildNodes()&&!/TABLE/.test(f.nodeName)){y=f,h=new t(f,m);do{if(g(y)||v(y)){i=!1;break}if(3===y.nodeType&&y.nodeValue.length>0){p=C?0:y.nodeValue.length,f=y,i=!0;break}if(b[y.nodeName.toLowerCase()]&&!a(y)){p=e.nodeIndex(y),f=y.parentNode,"IMG"!=y.nodeName||C||p++,i=!0;break}}while(y=C?h.next():h.prev())}}}o&&(3===f.nodeType&&0===p&&d(!0),1===f.nodeType&&(y=f.childNodes[p],y||(y=f.childNodes[p-1]),!y||"BR"!==y.nodeName||u(y,"A")||s(y)||s(y,!0)||d(!0,y))),C&&!o&&3===f.nodeType&&p===f.nodeValue.length&&d(!1),i&&n["set"+(r?"Start":"End")](f,p)}}var i,o;return o=n.collapsed,r(!0),o||r(),i&&o&&n.collapse(!0),i}}function f(t,n,r){var i,o,a;if(i=r.elementFromPoint(t,n),o=r.body.createTextRange(),i&&"HTML"!=i.tagName||(i=r.body),o.moveToElementText(i),a=e.toArray(o.getClientRects()),a=a.sort(function(e,t){return e=Math.abs(Math.max(e.top-n,e.bottom-n)),t=Math.abs(Math.max(t.top-n,t.bottom-n)),e-t}),a.length>0){n=(a[0].bottom+a[0].top)/2;try{return o.moveToPoint(t,n),o.collapse(!0),o}catch(s){}}return null}function p(e,t){var n=e&&e.parentElement?e.parentElement():null;return g(s(n,t,o))?null:e}var h=e.each,m=n.isContentEditableTrue,g=n.isContentEditableFalse,v=i.isCaretContainer;return d.compareRanges=function(e,t){if(e&&t){if(!e.item&&!e.duplicate)return e.startContainer==t.startContainer&&e.startOffset==t.startOffset;if(e.item&&t.item&&e.item(0)===t.item(0))return!0;if(e.isEqual&&t.isEqual&&t.isEqual(e))return!0}return!1},d.getCaretRangeFromPoint=function(e,t,n){var r,i;if(n.caretPositionFromPoint)i=n.caretPositionFromPoint(e,t),r=n.createRange(),r.setStart(i.offsetNode,i.offset),r.collapse(!0);else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(n.body.createTextRange){r=n.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(o){r=f(e,t,n)}return p(r,n.body)}return r},d.getSelectedNode=function(e){var t=e.startContainer,n=e.startOffset;return t.hasChildNodes()&&e.endOffset==n+1?t.childNodes[n]:null},d.getNode=function(e,t){return 1==e.nodeType&&e.hasChildNodes()&&(t>=e.childNodes.length&&(t=e.childNodes.length-1),e=e.childNodes[t]),e},d}),r(R,[T,d,c],function(e,t,n){return function(r){function i(e){var t,n;if(n=r.$(e).parentsUntil(r.getBody()).add(e),n.length===a.length){for(t=n.length;t>=0&&n[t]===a[t];t--);if(t===-1)return a=n,!0}return a=n,!1}var o,a=[];"onselectionchange"in r.getDoc()||r.on("NodeChange Click MouseUp KeyUp Focus",function(t){var n,i;n=r.selection.getRng(),i={startContainer:n.startContainer,startOffset:n.startOffset,endContainer:n.endContainer,endOffset:n.endOffset},"nodechange"!=t.type&&e.compareRanges(i,o)||r.fire("SelectionChange"),o=i}),r.on("contextmenu",function(){r.fire("SelectionChange")}),r.on("SelectionChange",function(){var e=r.selection.getStart(!0);!t.range&&r.selection.isCollapsed()||!i(e)&&r.dom.isChildOf(e,r.getBody())&&r.nodeChanged({selectionChange:!0})}),r.on("MouseUp",function(e){e.isDefaultPrevented()||("IMG"==r.selection.getNode().nodeName?n.setEditorTimeout(r,function(){r.nodeChanged()}):r.nodeChanged())}),this.nodeChanged=function(e){var t=r.selection,n,i,o;r.initialized&&t&&!r.settings.disable_nodechange&&!r.readonly&&(o=r.getBody(),n=t.getStart()||o,n.ownerDocument==r.getDoc()&&r.dom.isChildOf(n,o)||(n=o),"IMG"==n.nodeName&&t.isCollapsed()&&(n=n.parentNode),i=[],r.dom.getParent(n,function(e){return e===o||void i.push(e)}),e=e||{},e.element=n,e.parents=i,r.fire("NodeChange",e))}}}),r(A,[],function(){function e(e,t,n){var r,i,o=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[o])return e[o];if(e!==t){if(r=e[a])return r;for(i=e.parent;i&&i!==t;i=i.parent)if(r=i[a])return r}}function t(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}var n=/^[ \t\r\n]*$/,r={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};return t.prototype={replace:function(e){var t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t},attr:function(e,t){var n=this,r,i,o;if("string"!=typeof e){for(i in e)n.attr(i,e[i]);return n}if(r=n.attributes){if(t!==o){if(null===t){if(e in r.map)for(delete r.map[e],i=r.length;i--;)if(r[i].name===e)return r=r.splice(i,1),n;return n}if(e in r.map){for(i=r.length;i--;)if(r[i].name===e){r[i].value=t;break}}else r.push({name:e,value:t});return r.map[e]=t,n}return r.map[e]}},clone:function(){var e=this,n=new t(e.name,e.type),r,i,o,a,s;if(o=e.attributes){for(s=[],s.map={},r=0,i=o.length;r<i;r++)a=o[r],"id"!==a.name&&(s[s.length]={name:a.name,value:a.value},s.map[a.name]=a.value);n.attributes=s}return n.value=e.value,n.shortEnded=e.shortEnded,n},wrap:function(e){var t=this;return t.parent.insert(e,t),e.append(t),t},unwrap:function(){var e=this,t,n;for(t=e.firstChild;t;)n=t.next,e.insert(t,e,!0),t=n;e.remove()},remove:function(){var e=this,t=e.parent,n=e.next,r=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):r.next=n,t.lastChild===e?(t.lastChild=r,r&&(r.next=null)):n.prev=r,e.parent=e.next=e.prev=null),e},append:function(e){var t=this,n;return e.parent&&e.remove(),n=t.lastChild,n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e},insert:function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,e.next=t,t.prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,e.prev=t,t.next=e),e.parent=r,e},getAll:function(t){var n=this,r,i=[];for(r=n.firstChild;r;r=e(r,n))r.name===t&&i.push(r);return i},empty:function(){var t=this,n,r,i;if(t.firstChild){for(n=[],i=t.firstChild;i;i=e(i,t))n.push(i);for(r=n.length;r--;)i=n[r],i.parent=i.firstChild=i.lastChild=i.next=i.prev=null}return t.firstChild=t.lastChild=null,t},isEmpty:function(t,r){var i=this,o=i.firstChild,a,s;if(r=r||{},o)do{if(1===o.type){if(o.attributes.map["data-mce-bogus"])continue;if(t[o.name])return!1;for(a=o.attributes.length;a--;)if(s=o.attributes[a].name,"name"===s||0===s.indexOf("data-mce-bookmark"))return!1}if(8===o.type)return!1;if(3===o.type&&!n.test(o.value))return!1;if(3===o.type&&o.parent&&r[o.parent.name]&&n.test(o.value))return!1}while(o=e(o,i));return!0},walk:function(t){return e(this,null,t)}},t.create=function(e,n){var i,o;if(i=new t(e,r[e]||1),n)for(o in n)i.attr(o,n[o]);return i},t}),r(B,[m],function(e){function t(t,n){return t=e.trim(t),t?t.split(n||" "):[]}function n(e){function n(e,n,r){function i(e,t){var n={},r,i;for(r=0,i=e.length;r<i;r++)n[e[r]]=t||{};return n}var s,u,c;for(r=r||[],n=n||"","string"==typeof r&&(r=t(r)),e=t(e),s=e.length;s--;)u=t([l,n].join(" ")),c={attributes:i(u),attributesOrder:u,children:i(r,o)},a[e[s]]=c}function r(e,n){var r,i,o,s;for(e=t(e),r=e.length,n=t(n);r--;)for(i=a[e[r]],o=0,s=n.length;o<s;o++)i.attributes[n[o]]={},i.attributesOrder.push(n[o])}var a={},l,u,c,d,f,p;return i[e]?i[e]:(l="id accesskey class dir lang style tabindex title",u="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",c="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!=e&&(l+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",u+=" article aside details dialog figure header footer hgroup section nav",c+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"),"html5-strict"!=e&&(l+=" xml:lang",p="acronym applet basefont big font strike tt",c=[c,p].join(" "),s(t(p),function(e){n(e,"",c)}),f="center dir isindex noframes",u=[u,f].join(" "),d=[u,c].join(" "),s(t(f),function(e){n(e,"",d)})),d=d||[u,c].join(" "),n("html","manifest","head body"),n("head","","base command link meta noscript script style title"),n("title hr noscript br"),n("base","href target"),n("link","href rel media hreflang type sizes hreflang"),n("meta","name http-equiv content charset"),n("style","media type scoped"),n("script","src async defer type charset"),n("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",d),n("address dt dd div caption","",d),n("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",c),n("blockquote","cite",d),n("ol","reversed start type","li"),n("ul","","li"),n("li","value",d),n("dl","","dt dd"),n("a","href target rel media hreflang type",c),n("q","cite",c),n("ins del","cite datetime",d),n("img","src sizes srcset alt usemap ismap width height"),n("iframe","src name width height",d),n("embed","src type width height"),n("object","data type typemustmatch name usemap form width height",[d,"param"].join(" ")),n("param","name value"),n("map","name",[d,"area"].join(" ")),n("area","alt coords shape href target rel media hreflang type"),n("table","border","caption colgroup thead tfoot tbody tr"+("html4"==e?" col":"")),n("colgroup","span","col"),n("col","span"),n("tbody thead tfoot","","tr"),n("tr","","td th"),n("td","colspan rowspan headers",d),n("th","colspan rowspan headers scope abbr",d),n("form","accept-charset action autocomplete enctype method name novalidate target",d),n("fieldset","disabled form name",[d,"legend"].join(" ")),n("label","form for",c),n("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),n("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"==e?d:c),n("select","disabled form multiple name required size","option optgroup"),n("optgroup","disabled label","option"),n("option","disabled label selected value"),n("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),n("menu","type label",[d,"li"].join(" ")),n("noscript","",d),"html4"!=e&&(n("wbr"),n("ruby","",[c,"rt rp"].join(" ")),n("figcaption","",d),n("mark rt rp summary bdi","",c),n("canvas","width height",d),n("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[d,"track source"].join(" ")),n("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[d,"track source"].join(" ")),n("picture","","img source"),n("source","src srcset type media sizes"),n("track","kind src srclang label default"),n("datalist","",[c,"option"].join(" ")),n("article section nav aside header footer","",d),n("hgroup","","h1 h2 h3 h4 h5 h6"),n("figure","",[d,"figcaption"].join(" ")),n("time","datetime",c),n("dialog","open",d),n("command","type label icon disabled checked radiogroup command"),n("output","for form name",c),n("progress","value max",c),n("meter","value min max low high optimum",c),n("details","open",[d,"summary"].join(" ")),n("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!=e&&(r("script","language xml:space"),r("style","xml:space"),r("object","declare classid code codebase codetype archive standby align border hspace vspace"),r("embed","align name hspace vspace"),r("param","valuetype type"),r("a","charset name rev shape coords"),r("br","clear"),r("applet","codebase archive code object alt name width height align hspace vspace"),r("img","name longdesc align border hspace vspace"),r("iframe","longdesc frameborder marginwidth marginheight scrolling align"),r("font basefont","size color face"),r("input","usemap align"),r("select","onchange"),r("textarea"),r("h1 h2 h3 h4 h5 h6 div p legend caption","align"),r("ul","type compact"),r("li","type"),r("ol dl menu dir","compact"),r("pre","width xml:space"),r("hr","align noshade size width"),r("isindex","prompt"),r("table","summary width frame rules cellspacing cellpadding align bgcolor"),r("col","width align char charoff valign"),r("colgroup","width align char charoff valign"),r("thead","align char charoff valign"),r("tr","align char charoff valign bgcolor"),r("th","axis align char charoff valign nowrap bgcolor width height"),r("form","accept"),r("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),r("tfoot","align char charoff valign"),r("tbody","align char charoff valign"),r("area","nohref"),r("body","background bgcolor text link vlink alink")),"html4"!=e&&(r("input button select textarea","autofocus"),r("input textarea","placeholder"),r("a","download"),
+r("link script img","crossorigin"),r("iframe","sandbox seamless allowfullscreen")),s(t("a form meter progress dfn"),function(e){a[e]&&delete a[e].children[e]}),delete a.caption.children.table,delete a.script,i[e]=a,a)}function r(e,t){var n;return e&&(n={},"string"==typeof e&&(e={"*":e}),s(e,function(e,r){n[r]=n[r.toUpperCase()]="map"==t?a(e,/[, ]/):u(e,/[, ]/)})),n}var i={},o={},a=e.makeMap,s=e.each,l=e.extend,u=e.explode,c=e.inArray;return function(e){function o(t,n,r){var o=e[t];return o?o=a(o,/[, ]/,a(o.toUpperCase(),/[, ]/)):(o=i[t],o||(o=a(n," ",a(n.toUpperCase()," ")),o=l(o,r),i[t]=o)),o}function d(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function f(e){var n,r,i,o,s,l,u,f,p,h,m,g,v,b,x,w,E,N,_,S=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,k=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,T=/[*?+]/;if(e)for(e=t(e,","),y["@"]&&(w=y["@"].attributes,E=y["@"].attributesOrder),n=0,r=e.length;n<r;n++)if(s=S.exec(e[n])){if(b=s[1],p=s[2],x=s[3],f=s[5],g={},v=[],l={attributes:g,attributesOrder:v},"#"===b&&(l.paddEmpty=!0),"-"===b&&(l.removeEmpty=!0),"!"===s[4]&&(l.removeEmptyAttrs=!0),w){for(N in w)g[N]=w[N];v.push.apply(v,E)}if(f)for(f=t(f,"|"),i=0,o=f.length;i<o;i++)if(s=k.exec(f[i])){if(u={},m=s[1],h=s[2].replace(/::/g,":"),b=s[3],_=s[4],"!"===m&&(l.attributesRequired=l.attributesRequired||[],l.attributesRequired.push(h),u.required=!0),"-"===m){delete g[h],v.splice(c(v,h),1);continue}b&&("="===b&&(l.attributesDefault=l.attributesDefault||[],l.attributesDefault.push({name:h,value:_}),u.defaultValue=_),":"===b&&(l.attributesForced=l.attributesForced||[],l.attributesForced.push({name:h,value:_}),u.forcedValue=_),"<"===b&&(u.validValues=a(_,"?"))),T.test(h)?(l.attributePatterns=l.attributePatterns||[],u.pattern=d(h),l.attributePatterns.push(u)):(g[h]||v.push(h),g[h]=u)}w||"@"!=p||(w=g,E=v),x&&(l.outputName=p,y[x]=l),T.test(p)?(l.pattern=d(p),C.push(l)):y[p]=l}}function p(e){y={},C=[],f(e),s(E,function(e,t){b[t]=e.children})}function h(e){var n=/^(~)?(.+)$/;e&&(i.text_block_elements=i.block_elements=null,s(t(e,","),function(e){var t=n.exec(e),r="~"===t[1],i=r?"span":"div",o=t[2];if(b[o]=b[i],M[o]=i,r||(R[o.toUpperCase()]={},R[o]={}),!y[o]){var a=y[i];a=l({},a),delete a.removeEmptyAttrs,delete a.removeEmpty,y[o]=a}s(b,function(e,t){e[i]&&(b[t]=e=l({},b[t]),e[o]=e[i])})}))}function m(n){var r=/^([+\-]?)(\w+)\[([^\]]+)\]$/;i[e.schema]=null,n&&s(t(n,","),function(e){var n=r.exec(e),i,o;n&&(o=n[1],i=o?b[n[2]]:b[n[2]]={"#comment":{}},i=b[n[2]],s(t(n[3],"|"),function(e){"-"===o?delete i[e]:i[e]={}}))})}function g(e){var t=y[e],n;if(t)return t;for(n=C.length;n--;)if(t=C[n],t.pattern.test(e))return t}var v=this,y={},b={},C=[],x,w,E,N,_,S,k,T,R,A,B,D,L,M={},P={};e=e||{},E=n(e.schema),e.verify_html===!1&&(e.valid_elements="*[*]"),x=r(e.valid_styles),w=r(e.invalid_styles,"map"),T=r(e.valid_classes,"map"),N=o("whitespace_elements","pre script noscript style textarea video audio iframe object code"),_=o("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),S=o("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),k=o("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),A=o("non_empty_elements","td th iframe video audio object script pre code",S),B=o("move_caret_before_on_enter_elements","table",A),D=o("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure"),R=o("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption",D),L=o("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp"),s((e.special||"script noscript style textarea").split(" "),function(e){P[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.valid_elements?p(e.valid_elements):(s(E,function(e,t){y[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},b[t]=e.children}),"html5"!=e.schema&&s(t("strong/b em/i"),function(e){e=t(e,"/"),y[e[1]].outputName=e[0]}),s(t("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){y[e]&&(y[e].removeEmpty=!0)}),s(t("p h1 h2 h3 h4 h5 h6 th td pre div address caption"),function(e){y[e].paddEmpty=!0}),s(t("span"),function(e){y[e].removeEmptyAttrs=!0})),h(e.custom_elements),m(e.valid_children),f(e.extended_valid_elements),m("+ol[ul|ol],+ul[ul|ol]"),s({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},function(e,n){y[n]&&(y[n].parentsRequired=t(e))}),e.invalid_elements&&s(u(e.invalid_elements),function(e){y[e]&&delete y[e]}),g("span")||f("span[!data-mce-type|*]"),v.children=b,v.getValidStyles=function(){return x},v.getInvalidStyles=function(){return w},v.getValidClasses=function(){return T},v.getBoolAttrs=function(){return k},v.getBlockElements=function(){return R},v.getTextBlockElements=function(){return D},v.getTextInlineElements=function(){return L},v.getShortEndedElements=function(){return S},v.getSelfClosingElements=function(){return _},v.getNonEmptyElements=function(){return A},v.getMoveCaretBeforeOnEnterElements=function(){return B},v.getWhiteSpaceElements=function(){return N},v.getSpecialElements=function(){return P},v.isValidChild=function(e,t){var n=b[e];return!(!n||!n[t])},v.isValid=function(e,t){var n,r,i=g(e);if(i){if(!t)return!0;if(i.attributes[t])return!0;if(n=i.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},v.getElementRule=g,v.getCustomElements=function(){return M},v.addValidElements=f,v.setValidElements=p,v.addCustomElements=h,v.addValidChildren=m,v.elements=y}}),r(D,[B,C,m],function(e,t,n){function r(e,t,n){var r=1,i,o,a,s;for(s=e.getShortEndedElements(),a=/<([!?\/])?([A-Za-z0-9\-_\:\.]+)((?:\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\/|\s+)>/g,a.lastIndex=i=n;o=a.exec(t);){if(i=a.lastIndex,"/"===o[1])r--;else if(!o[1]){if(o[2]in s)continue;r++}if(0===r)break}return i}function i(i,a){function s(){}var l=this;i=i||{},l.schema=a=a||new e,i.fix_self_closing!==!1&&(i.fix_self_closing=!0),o("comment cdata text start end pi doctype".split(" "),function(e){e&&(l[e]=i[e]||s)}),l.parse=function(e){function o(e){var t,n;for(t=p.length;t--&&p[t].name!==e;);if(t>=0){for(n=p.length-1;n>=t;n--)e=p[n],e.valid&&l.end(e.name);p.length=t}}function s(e,t,n,r,o){var a,s,l=/[\s\u0000-\u001F]+/g;if(t=t.toLowerCase(),n=t in x?t:z(n||r||o||""),E&&!y&&0!==t.indexOf("data-")){if(a=T[t],!a&&R){for(s=R.length;s--&&(a=R[s],!a.pattern.test(t)););s===-1&&(a=null)}if(!a)return;if(a.validValues&&!(n in a.validValues))return}if(W[t]&&!i.allow_script_urls){var u=n.replace(l,"");try{u=decodeURIComponent(u)}catch(c){u=unescape(u)}if(V.test(u))return;if(!i.allow_html_data_urls&&$.test(u)&&!/^data:image\//i.test(u))return}h.map[t]=n,h.push({name:t,value:n})}var l=this,u,c=0,d,f,p=[],h,m,g,v,y,b,C,x,w,E,N,_,S,k,T,R,A,B,D,L,M,P,O,H,I,F=0,z=t.decode,U,W=n.makeMap("src,href,data,background,formaction,poster"),V=/((java|vb)script|mhtml):/i,$=/^data:/i;for(P=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-_\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),O=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,C=a.getShortEndedElements(),M=i.self_closing_elements||a.getSelfClosingElements(),x=a.getBoolAttrs(),E=i.validate,b=i.remove_internals,U=i.fix_self_closing,H=a.getSpecialElements();u=P.exec(e);){if(c<u.index&&l.text(z(e.substr(c,u.index-c))),d=u[6])d=d.toLowerCase(),":"===d.charAt(0)&&(d=d.substr(1)),o(d);else if(d=u[7]){if(d=d.toLowerCase(),":"===d.charAt(0)&&(d=d.substr(1)),w=d in C,U&&M[d]&&p.length>0&&p[p.length-1].name===d&&o(d),!E||(N=a.getElementRule(d))){if(_=!0,E&&(T=N.attributes,R=N.attributePatterns),(k=u[8])?(y=k.indexOf("data-mce-type")!==-1,y&&b&&(_=!1),h=[],h.map={},k.replace(O,s)):(h=[],h.map={}),E&&!y){if(A=N.attributesRequired,B=N.attributesDefault,D=N.attributesForced,L=N.removeEmptyAttrs,L&&!h.length&&(_=!1),D)for(m=D.length;m--;)S=D[m],v=S.name,I=S.value,"{$uid}"===I&&(I="mce_"+F++),h.map[v]=I,h.push({name:v,value:I});if(B)for(m=B.length;m--;)S=B[m],v=S.name,v in h.map||(I=S.value,"{$uid}"===I&&(I="mce_"+F++),h.map[v]=I,h.push({name:v,value:I}));if(A){for(m=A.length;m--&&!(A[m]in h.map););m===-1&&(_=!1)}if(S=h.map["data-mce-bogus"]){if("all"===S){c=r(a,e,P.lastIndex),P.lastIndex=c;continue}_=!1}}_&&l.start(d,h,w)}else _=!1;if(f=H[d]){f.lastIndex=c=u.index+u[0].length,(u=f.exec(e))?(_&&(g=e.substr(c,u.index-c)),c=u.index+u[0].length):(g=e.substr(c),c=e.length),_&&(g.length>0&&l.text(g,!0),l.end(d)),P.lastIndex=c;continue}w||(k&&k.indexOf("/")==k.length-1?_&&l.end(d):p.push({name:d,valid:_}))}else(d=u[1])?(">"===d.charAt(0)&&(d=" "+d),i.allow_conditional_comments||"[if"!==d.substr(0,3).toLowerCase()||(d=" "+d),l.comment(d)):(d=u[2])?l.cdata(d):(d=u[3])?l.doctype(d):(d=u[4])&&l.pi(d,u[5]);c=u.index+u[0].length}for(c<e.length&&l.text(z(e.substr(c))),m=p.length-1;m>=0;m--)d=p[m],d.valid&&l.end(d.name)}}var o=n.each;return i.findEndTag=r,i}),r(L,[A,B,D,m],function(e,t,n,r){var i=r.makeMap,o=r.each,a=r.explode,s=r.extend,l=function(t,n){t.padd_empty_with_br?n.empty().append(new e("br","1")).shortEnded=!0:n.empty().append(new e("#text","3")).value="\xa0"},u=function(e,t){return e&&e.firstChild===e.lastChild&&e.firstChild.name===t};return function(c,d){function f(t){var n,r,o,a,s,l,c,f,h,m,g,v,y,b,C,x;for(v=i("tr,td,th,tbody,thead,tfoot,table"),m=d.getNonEmptyElements(),g=d.getWhiteSpaceElements(),y=d.getTextBlockElements(),b=d.getSpecialElements(),n=0;n<t.length;n++)if(r=t[n],r.parent&&!r.fixed)if(y[r.name]&&"li"==r.parent.name){for(C=r.next;C&&y[C.name];)C.name="li",C.fixed=!0,r.parent.insert(C,r.parent),C=C.next;r.unwrap(r)}else{for(a=[r],o=r.parent;o&&!d.isValidChild(o.name,r.name)&&!v[o.name];o=o.parent)a.push(o);if(o&&a.length>1){for(a.reverse(),s=l=p.filterNode(a[0].clone()),h=0;h<a.length-1;h++){for(d.isValidChild(l.name,a[h].name)?(c=p.filterNode(a[h].clone()),l.append(c)):c=l,f=a[h].firstChild;f&&f!=a[h+1];)x=f.next,c.append(f),f=x;l=c}s.isEmpty(m,g)?o.insert(r,a[0],!0):(o.insert(s,a[0],!0),o.insert(r,s)),o=a[0],(o.isEmpty(m,g)||u(o,"br"))&&o.empty().remove()}else if(r.parent){if("li"===r.name){if(C=r.prev,C&&("ul"===C.name||"ul"===C.name)){C.append(r);continue}if(C=r.next,C&&("ul"===C.name||"ul"===C.name)){C.insert(r,C.firstChild,!0);continue}r.wrap(p.filterNode(new e("ul",1)));continue}d.isValidChild(r.parent.name,"div")&&d.isValidChild("div",r.name)?r.wrap(p.filterNode(new e("div",1))):b[r.name]?r.empty().remove():r.unwrap()}}}var p=this,h={},m=[],g={},v={};c=c||{},c.validate=!("validate"in c)||c.validate,c.root_name=c.root_name||"body",p.schema=d=d||new t,p.filterNode=function(e){var t,n,r;n in h&&(r=g[n],r?r.push(e):g[n]=[e]),t=m.length;for(;t--;)n=m[t].name,n in e.attributes.map&&(r=v[n],r?r.push(e):v[n]=[e]);return e},p.addNodeFilter=function(e,t){o(a(e),function(e){var n=h[e];n||(h[e]=n=[]),n.push(t)})},p.addAttributeFilter=function(e,t){o(a(e),function(e){var n;for(n=0;n<m.length;n++)if(m[n].name===e)return void m[n].callbacks.push(t);m.push({name:e,callbacks:[t]})})},p.parse=function(t,r){function o(){function e(e){e&&(t=e.firstChild,t&&3==t.type&&(t.value=t.value.replace(A,"")),t=e.lastChild,t&&3==t.type&&(t.value=t.value.replace(L,"")))}var t=b.firstChild,n,r;if(d.isValidChild(b.name,F.toLowerCase())){for(;t;)n=t.next,3==t.type||1==t.type&&"p"!==t.name&&!R[t.name]&&!t.attr("data-mce-type")?r?r.append(t):(r=a(F,1),r.attr(c.forced_root_block_attrs),b.insert(r,t),r.append(t)):(e(r),r=null),t=n;e(r)}}function a(t,n){var r=new e(t,n),i;return t in h&&(i=g[t],i?i.push(r):g[t]=[r]),r}function u(e){var t,n,r,i,o=d.getBlockElements();for(t=e.prev;t&&3===t.type;){if(r=t.value.replace(L,""),r.length>0)return void(t.value=r);if(n=t.next){if(3==n.type&&n.value.length){t=t.prev;continue}if(!o[n.name]&&"script"!=n.name&&"style"!=n.name){t=t.prev;continue}}i=t.prev,t.remove(),t=i}}function p(e){var t,n={};for(t in e)"li"!==t&&"p"!=t&&(n[t]=e[t]);return n}var y,b,C,x,w,E,N,_,S,k,T,R,A,B=[],D,L,M,P,O,H,I,F;if(r=r||{},g={},v={},R=s(i("script,style,head,html,body,title,meta,param"),d.getBlockElements()),I=d.getNonEmptyElements(),H=d.children,T=c.validate,F="forced_root_block"in r?r.forced_root_block:c.forced_root_block,O=d.getWhiteSpaceElements(),A=/^[ \t\r\n]+/,L=/[ \t\r\n]+$/,M=/[ \t\r\n]+/g,P=/^[ \t\r\n]+$/,y=new n({validate:T,allow_script_urls:c.allow_script_urls,allow_conditional_comments:c.allow_conditional_comments,self_closing_elements:p(d.getSelfClosingElements()),cdata:function(e){C.append(a("#cdata",4)).value=e},text:function(e,t){var n;D||(e=e.replace(M," "),C.lastChild&&R[C.lastChild.name]&&(e=e.replace(A,""))),0!==e.length&&(n=a("#text",3),n.raw=!!t,C.append(n).value=e)},comment:function(e){C.append(a("#comment",8)).value=e},pi:function(e,t){C.append(a(e,7)).value=t,u(C)},doctype:function(e){var t;t=C.append(a("#doctype",10)),t.value=e,u(C)},start:function(e,t,n){var r,i,o,s,l;if(o=T?d.getElementRule(e):{}){for(r=a(o.outputName||e,1),r.attributes=t,r.shortEnded=n,C.append(r),l=H[C.name],l&&H[r.name]&&!l[r.name]&&B.push(r),i=m.length;i--;)s=m[i].name,s in t.map&&(S=v[s],S?S.push(r):v[s]=[r]);R[e]&&u(r),n||(C=r),!D&&O[e]&&(D=!0)}},end:function(e){var t,n,r,i,o;if(n=T?d.getElementRule(e):{}){if(R[e]&&!D){if(t=C.firstChild,t&&3===t.type)if(r=t.value.replace(A,""),r.length>0)t.value=r,t=t.next;else for(i=t.next,t.remove(),t=i;t&&3===t.type;)r=t.value,i=t.next,(0===r.length||P.test(r))&&(t.remove(),t=i),t=i;if(t=C.lastChild,t&&3===t.type)if(r=t.value.replace(L,""),r.length>0)t.value=r,t=t.prev;else for(i=t.prev,t.remove(),t=i;t&&3===t.type;)r=t.value,i=t.prev,(0===r.length||P.test(r))&&(t.remove(),t=i),t=i}if(D&&O[e]&&(D=!1),(n.removeEmpty||n.paddEmpty)&&C.isEmpty(I,O))if(n.paddEmpty)l(c,C);else if(!C.attributes.map.name&&!C.attributes.map.id)return o=C.parent,R[C.name]?C.empty().remove():C.unwrap(),void(C=o);C=C.parent}}},d),b=C=new e(r.context||c.root_name,11),y.parse(t),T&&B.length&&(r.context?r.invalid=!0:f(B)),F&&("body"==b.name||r.isRootContent)&&o(),!r.invalid){for(k in g){for(S=h[k],x=g[k],N=x.length;N--;)x[N].parent||x.splice(N,1);for(w=0,E=S.length;w<E;w++)S[w](x,k,r)}for(w=0,E=m.length;w<E;w++)if(S=m[w],S.name in v){for(x=v[S.name],N=x.length;N--;)x[N].parent||x.splice(N,1);for(N=0,_=S.callbacks.length;N<_;N++)S.callbacks[N](x,S.name,r)}}return b},c.remove_trailing_brs&&p.addNodeFilter("br",function(t){var n,r=t.length,i,o=s({},d.getBlockElements()),a=d.getNonEmptyElements(),u,f,p,h,m=d.getNonEmptyElements(),g,v;for(o.body=1,n=0;n<r;n++)if(i=t[n],u=i.parent,o[i.parent.name]&&i===u.lastChild){for(p=i.prev;p;){if(h=p.name,"span"!==h||"bookmark"!==p.attr("data-mce-type")){if("br"!==h)break;if("br"===h){i=null;break}}p=p.prev}i&&(i.remove(),u.isEmpty(a,m)&&(g=d.getElementRule(u.name),g&&(g.removeEmpty?u.remove():g.paddEmpty&&l(c,u))))}else{for(f=i;u&&u.firstChild===f&&u.lastChild===f&&(f=u,!o[u.name]);)u=u.parent;f===u&&c.padd_empty_with_br!==!0&&(v=new e("#text",3),v.value="\xa0",i.replace(v))}}),c.allow_unsafe_link_target||p.addAttributeFilter("href",function(e){function t(e){return e=n(e),e?[e,l].join(" "):l}function n(e){var t=new RegExp("("+l.replace(" ","|")+")","g");return e&&(e=r.trim(e.replace(t,""))),e?e:null}function i(e,r){return r?t(e):n(e)}for(var o=e.length,a,s,l="noopener noreferrer";o--;)a=e[o],s=a.attr("rel"),"a"===a.name&&a.attr("rel",i(s,"_blank"==a.attr("target")))}),c.allow_html_in_named_anchor||p.addAttributeFilter("id,name",function(e){for(var t=e.length,n,r,i,o;t--;)if(o=e[t],"a"===o.name&&o.firstChild&&!o.attr("href")){i=o.parent,n=o.lastChild;do r=n.prev,i.insert(n,o),n=r;while(n)}}),c.fix_list_elements&&p.addNodeFilter("ul,ol",function(t){for(var n=t.length,r,i;n--;)if(r=t[n],i=r.parent,"ul"===i.name||"ol"===i.name)if(r.prev&&"li"===r.prev.name)r.prev.append(r);else{var o=new e("li",1);o.attr("style","list-style-type: none"),r.wrap(o)}}),c.validate&&d.getValidClasses()&&p.addAttributeFilter("class",function(e){for(var t=e.length,n,r,i,o,a,s=d.getValidClasses(),l,u;t--;){for(n=e[t],r=n.attr("class").split(" "),a="",i=0;i<r.length;i++)o=r[i],u=!1,l=s["*"],l&&l[o]&&(u=!0),l=s[n.name],!u&&l&&l[o]&&(u=!0),u&&(a&&(a+=" "),a+=o);a.length||(a=null),n.attr("class",a)}})}}),r(M,[C,m],function(e,t){var n=t.makeMap;return function(t){var r=[],i,o,a,s,l;return t=t||{},i=t.indent,o=n(t.indent_before||""),a=n(t.indent_after||""),s=e.getEncodeFunc(t.entity_encoding||"raw",t.entities),l="html"==t.element_format,{start:function(e,t,n){var u,c,d,f;if(i&&o[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n")),r.push("<",e),t)for(u=0,c=t.length;u<c;u++)d=t[u],r.push(" ",d.name,'="',s(d.value,!0),'"');!n||l?r[r.length]=">":r[r.length]=" />",n&&i&&a[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n"))},end:function(e){var t;r.push("</",e,">"),i&&a[e]&&r.length>0&&(t=r[r.length-1],t.length>0&&"\n"!==t&&r.push("\n"))},text:function(e,t){e.length>0&&(r[r.length]=t?e:s(e))},cdata:function(e){r.push("<![CDATA[",e,"]]>")},comment:function(e){r.push("<!--",e,"-->")},pi:function(e,t){t?r.push("<?",e," ",s(t),"?>"):r.push("<?",e,"?>"),i&&r.push("\n")},doctype:function(e){r.push("<!DOCTYPE",e,">",i?"\n":"")},reset:function(){r.length=0},getContent:function(){return r.join("").replace(/\n$/,"")}}}}),r(P,[M,B],function(e,t){return function(n,r){var i=this,o=new e(n);n=n||{},n.validate=!("validate"in n)||n.validate,i.schema=r=r||new t,i.writer=o,i.serialize=function(e){function t(e){var n=i[e.type],s,l,u,c,d,f,p,h,m;if(n)n(e);else{if(s=e.name,l=e.shortEnded,u=e.attributes,a&&u&&u.length>1&&(f=[],f.map={},m=r.getElementRule(e.name))){for(p=0,h=m.attributesOrder.length;p<h;p++)c=m.attributesOrder[p],c in u.map&&(d=u.map[c],f.map[c]=d,f.push({name:c,value:d}));for(p=0,h=u.length;p<h;p++)c=u[p].name,c in f.map||(d=u.map[c],f.map[c]=d,f.push({name:c,value:d}));u=f}if(o.start(e.name,u,l),!l){if(e=e.firstChild)do t(e);while(e=e.next);o.end(s)}}}var i,a;return a=n.validate,i={3:function(e){o.text(e.value,e.raw)},8:function(e){o.comment(e.value)},7:function(e){o.pi(e.name,e.value)},10:function(e){o.doctype(e.value)},4:function(e){o.cdata(e.value)},11:function(e){if(e=e.firstChild)do t(e);while(e=e.next)}},o.reset(),1!=e.type||n.inner?i[11](e):t(e),o.getContent()}}}),r(O,[w,L,D,C,P,A,B,d,m,S],function(e,t,n,r,i,o,a,s,l,u){function c(e){function t(e){return e&&"br"===e.name}var n,r;n=e.lastChild,t(n)&&(r=n.prev,t(r)&&(n.remove(),r.remove()))}var d=l.each,f=l.trim,p=e.DOM;return function(e,o){function h(e){var t=new RegExp(["<span[^>]+data-mce-bogus[^>]+>[\u200b\ufeff]+<\\/span>","\\s?("+x.join("|")+')="[^"]+"'].join("|"),"gi");return e=u.trim(e.replace(t,""))}function m(e){var t=e,r=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,i,a,s,l,u,c=o.schema;for(t=h(t),u=c.getShortEndedElements();l=r.exec(t);)a=r.lastIndex,s=l[0].length,i=u[l[1]]?a:n.findEndTag(c,t,a),t=t.substring(0,a-s)+t.substring(i),r.lastIndex=a-s;return t}function g(){return m(o.getBody().innerHTML)}function v(e){l.inArray(x,e)===-1&&(C.addAttributeFilter(e,function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),x.push(e))}var y,b,C,x=["data-mce-selected"];return o&&(y=o.dom,b=o.schema),y=y||p,b=b||new a(e),e.entity_encoding=e.entity_encoding||"named",e.remove_trailing_brs=!("remove_trailing_brs"in e)||e.remove_trailing_brs,C=new t(e,b),C.addAttributeFilter("data-mce-tabindex",function(e,t){for(var n=e.length,r;n--;)r=e[n],r.attr("tabindex",r.attributes.map["data-mce-tabindex"]),r.attr(t,null)}),C.addAttributeFilter("src,href,style",function(t,n){for(var r=t.length,i,o,a="data-mce-"+n,s=e.url_converter,l=e.url_converter_scope,u;r--;)i=t[r],o=i.attributes.map[a],o!==u?(i.attr(n,o.length>0?o:null),i.attr(a,null)):(o=i.attributes.map[n],"style"===n?o=y.serializeStyle(y.parseStyle(o),i.name):s&&(o=s.call(l,o,n,i.name)),i.attr(n,o.length>0?o:null))}),C.addAttributeFilter("class",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("class"),r&&(r=n.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",r.length>0?r:null))}),C.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length,i;r--;)i=e[r],"bookmark"!==i.attributes.map["data-mce-type"]||n.cleanup||i.remove()}),C.addNodeFilter("noscript",function(e){for(var t=e.length,n;t--;)n=e[t].firstChild,n&&(n.value=r.decode(n.value))}),C.addNodeFilter("script,style",function(e,t){function n(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}for(var r=e.length,i,o,a;r--;)i=e[r],o=i.firstChild?i.firstChild.value:"","script"===t?(a=i.attr("type"),a&&i.attr("type","mce-no/type"==a?null:a.replace(/^mce\-/,"")),o.length>0&&(i.firstChild.value="// <![CDATA[\n"+n(o)+"\n// ]]>")):o.length>0&&(i.firstChild.value="<!--\n"+n(o)+"\n-->")}),C.addNodeFilter("#comment",function(e){for(var t=e.length,n;t--;)n=e[t],0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=n.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}),C.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length,r;n--;)r=e[n],7===r.type?r.remove():1===r.type&&("input"!==t||"type"in r.attributes.map||r.attr("type","text"))}),C.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:b,addNodeFilter:C.addNodeFilter,addAttributeFilter:C.addAttributeFilter,serialize:function(t,n){var r=this,o,a,l,p,h,m;return s.ie&&y.select("script,style,select,map").length>0?(h=t.innerHTML,t=t.cloneNode(!1),y.setHTML(t,h)):t=t.cloneNode(!0),o=document.implementation,o.createHTMLDocument&&(a=o.createHTMLDocument(""),d("BODY"==t.nodeName?t.childNodes:[t],function(e){a.body.appendChild(a.importNode(e,!0))}),t="BODY"!=t.nodeName?a.body.firstChild:a.body,l=y.doc,y.doc=a),n=n||{},n.format=n.format||"html",n.selection&&(n.forced_root_block=""),n.no_events||(n.node=t,r.onPreProcess(n)),m=C.parse(f(n.getInner?t.innerHTML:y.getOuterHTML(t)),n),c(m),p=new i(e,b),n.content=p.serialize(m),n.cleanup||(n.content=u.trim(n.content),n.content=n.content.replace(/\uFEFF/g,"")),n.no_events||r.onPostProcess(n),l&&(y.doc=l),n.node=null,n.content},addRules:function(e){b.addValidElements(e)},setRules:function(e){b.setValidElements(e)},onPreProcess:function(e){o&&o.fire("PreProcess",e)},onPostProcess:function(e){o&&o.fire("PostProcess",e)},addTempAttr:v,trimHtml:h,getTrimmedContent:g,trimContent:m}}}),r(H,[],function(){function e(e){function t(t,n){var r,i=0,o,a,s,l,u,c,d=-1,f;if(r=t.duplicate(),r.collapse(n),f=r.parentElement(),f.ownerDocument===e.dom.doc){for(;"false"===f.contentEditable;)f=f.parentNode;if(!f.hasChildNodes())return{node:f,inside:1};for(s=f.children,o=s.length-1;i<=o;)if(c=Math.floor((i+o)/2),l=s[c],r.moveToElementText(l),d=r.compareEndPoints(n?"StartToStart":"EndToEnd",t),d>0)o=c-1;else{if(!(d<0))return{node:l};i=c+1}if(d<0)for(l?r.collapse(!1):(r.moveToElementText(f),r.collapse(!0),l=f,a=!0),u=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",1)&&f==r.parentElement();)u++;else for(r.collapse(!0),u=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",-1)&&f==r.parentElement();)u++;return{node:l,position:d,offset:u,inside:a}}}function n(){function n(e){var n=t(o,e),r,i,s=0,l,u,c;if(r=n.node,i=n.offset,n.inside&&!r.hasChildNodes())return void a[e?"setStart":"setEnd"](r,0);if(i===u)return void a[e?"setStartBefore":"setEndAfter"](r);if(n.position<0){if(l=n.inside?r.firstChild:r.nextSibling,!l)return void a[e?"setStartAfter":"setEndAfter"](r);if(!i)return void(3==l.nodeType?a[e?"setStart":"setEnd"](l,0):a[e?"setStartBefore":"setEndBefore"](l));for(;l;){if(3==l.nodeType&&(c=l.nodeValue,s+=c.length,s>=i)){r=l,s-=i,s=c.length-s;break}l=l.nextSibling}}else{if(l=r.previousSibling,!l)return a[e?"setStartBefore":"setEndBefore"](r);if(!i)return void(3==r.nodeType?a[e?"setStart":"setEnd"](l,r.nodeValue.length):a[e?"setStartAfter":"setEndAfter"](l));for(;l;){if(3==l.nodeType&&(s+=l.nodeValue.length,s>=i)){r=l,s-=i;break}l=l.previousSibling}}a[e?"setStart":"setEnd"](r,s)}var o=e.getRng(),a=i.createRng(),s,l,u,c,d;if(s=o.item?o.item(0):o.parentElement(),s.ownerDocument!=i.doc)return a;if(l=e.isCollapsed(),o.item)return a.setStart(s.parentNode,i.nodeIndex(s)),a.setEnd(a.startContainer,a.startOffset+1),a;try{n(!0),l||n()}catch(f){if(f.number!=-2147024809)throw f;d=r.getBookmark(2),u=o.duplicate(),u.collapse(!0),s=u.parentElement(),l||(u=o.duplicate(),u.collapse(!1),c=u.parentElement(),c.innerHTML=c.innerHTML),s.innerHTML=s.innerHTML,r.moveToBookmark(d),o=e.getRng(),n(!0),l||n()}return a}var r=this,i=e.dom,o=!1;this.getBookmark=function(n){function r(e){var t,n,r,o,a=[];for(t=e.parentNode,n=i.getRoot().parentNode;t!=n&&9!==t.nodeType;){for(r=t.children,o=r.length;o--;)if(e===r[o]){a.push(o);break}e=t,t=t.parentNode}return a}function o(e){var n;if(n=t(a,e))return{position:n.position,offset:n.offset,indexes:r(n.node),inside:n.inside}}var a=e.getRng(),s={};return 2===n&&(a.item?s.start={ctrl:!0,indexes:r(a.item(0))}:(s.start=o(!0),e.isCollapsed()||(s.end=o()))),s},this.moveToBookmark=function(e){function t(e){var t,n,r,o;for(t=i.getRoot(),n=e.length-1;n>=0;n--)o=t.children,r=e[n],r<=o.length-1&&(t=o[r]);return t}function n(n){var i=e[n?"start":"end"],a,s,l,u;i&&(a=i.position>0,s=o.createTextRange(),s.moveToElementText(t(i.indexes)),u=i.offset,u!==l?(s.collapse(i.inside||a),s.moveStart("character",a?-u:u)):s.collapse(n),r.setEndPoint(n?"StartToStart":"EndToStart",s),n&&r.collapse(!0))}var r,o=i.doc.body;e.start&&(e.start.ctrl?(r=o.createControlRange(),r.addElement(t(e.start.indexes)),r.select()):(r=o.createTextRange(),n(!0),n(),r.select()))},this.addRange=function(t){function n(e){var t,n,a,d,h;a=i.create("a"),t=e?s:u,n=e?l:c,d=r.duplicate(),t!=f&&t!=f.documentElement||(t=p,n=0),3==t.nodeType?(t.parentNode.insertBefore(a,t),d.moveToElementText(a),d.moveStart("character",n),i.remove(a),r.setEndPoint(e?"StartToStart":"EndToEnd",d)):(h=t.childNodes,h.length?(n>=h.length?i.insertAfter(a,h[h.length-1]):t.insertBefore(a,h[n]),d.moveToElementText(a)):t.canHaveHTML&&(t.innerHTML="<span>&#xFEFF;</span>",a=t.firstChild,d.moveToElementText(a),d.collapse(o)),r.setEndPoint(e?"StartToStart":"EndToEnd",d),i.remove(a))}var r,a,s,l,u,c,d,f=e.dom.doc,p=f.body,h,m;if(s=t.startContainer,l=t.startOffset,u=t.endContainer,c=t.endOffset,r=p.createTextRange(),s==u&&1==s.nodeType){if(l==c&&!s.hasChildNodes()){if(s.canHaveHTML)return d=s.previousSibling,d&&!d.hasChildNodes()&&i.isBlock(d)?d.innerHTML="&#xFEFF;":d=null,s.innerHTML="<span>&#xFEFF;</span><span>&#xFEFF;</span>",r.moveToElementText(s.lastChild),r.select(),i.doc.selection.clear(),s.innerHTML="",void(d&&(d.innerHTML=""));l=i.nodeIndex(s),s=s.parentNode}if(l==c-1)try{if(m=s.childNodes[l],a=p.createControlRange(),a.addElement(m),a.select(),h=e.getRng(),h.item&&m===h.item(0))return}catch(g){}}n(!0),n(),r.select()},this.getRangeAt=n}return e}),r(I,[d],function(e){return{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||this.metaKeyPressed(e)},metaKeyPressed:function(t){return e.mac?t.metaKey:t.ctrlKey&&!t.altKey}}}),r(F,[I,m,c,d,_],function(e,t,n,r,i){function o(e,t){for(;t&&t!=e;){if(s(t)||a(t))return t;t=t.parentNode}return null}var a=i.isContentEditableFalse,s=i.isContentEditableTrue;return function(i,s){function l(e){var t=s.settings.object_resizing;return t!==!1&&!r.iOS&&("string"!=typeof t&&(t="table,img,div"),"false"!==e.getAttribute("data-mce-resize")&&(e!=s.getBody()&&s.dom.is(e,t)))}function u(t){var n,r,i,o,a;n=t.screenX-L,r=t.screenY-M,U=n*B[2]+H,W=r*B[3]+I,U=U<5?5:U,W=W<5?5:W,i="IMG"==k.nodeName&&s.settings.resize_img_proportional!==!1?!e.modifierPressed(t):e.modifierPressed(t)||"IMG"==k.nodeName&&B[2]*B[3]!==0,i&&(j(n)>j(r)?(W=Y(U*F),U=Y(W/F)):(U=Y(W/F),W=Y(U*F))),_.setStyles(T,{width:U,height:W}),o=B.startPos.x+n,a=B.startPos.y+r,o=o>0?o:0,a=a>0?a:0,_.setStyles(R,{left:o,top:a,display:"block"}),R.innerHTML=U+" &times; "+W,B[2]<0&&T.clientWidth<=U&&_.setStyle(T,"left",P+(H-U)),B[3]<0&&T.clientHeight<=W&&_.setStyle(T,"top",O+(I-W)),n=X.scrollWidth-K,r=X.scrollHeight-G,n+r!==0&&_.setStyles(R,{left:o-n,top:a-r}),z||(s.fire("ObjectResizeStart",{target:k,width:H,height:I}),z=!0)}function c(){function e(e,t){t&&(k.style[e]||!s.schema.isValid(k.nodeName.toLowerCase(),e)?_.setStyle(k,e,t):_.setAttrib(k,e,t))}z=!1,e("width",U),e("height",W),_.unbind(V,"mousemove",u),_.unbind(V,"mouseup",c),$!=V&&(_.unbind($,"mousemove",u),_.unbind($,"mouseup",c)),_.remove(T),_.remove(R),q&&"TABLE"!=k.nodeName||d(k),s.fire("ObjectResized",{target:k,width:U,height:W}),_.setAttrib(k,"style",_.getAttrib(k,"style")),s.nodeChanged()}function d(e,t,n){var i,o,a,d,p;f(),x(),i=_.getPos(e,X),P=i.x,O=i.y,p=e.getBoundingClientRect(),o=p.width||p.right-p.left,a=p.height||p.bottom-p.top,k!=e&&(C(),k=e,U=W=0),d=s.fire("ObjectSelected",{target:e}),l(e)&&!d.isDefaultPrevented()?S(A,function(e,i){function s(t){L=t.screenX,M=t.screenY,H=k.clientWidth,I=k.clientHeight,F=I/H,B=e,e.startPos={x:o*e[0]+P,y:a*e[1]+O},K=X.scrollWidth,G=X.scrollHeight,T=k.cloneNode(!0),_.addClass(T,"mce-clonedresizable"),_.setAttrib(T,"data-mce-bogus","all"),T.contentEditable=!1,T.unSelectabe=!0,_.setStyles(T,{left:P,top:O,margin:0}),T.removeAttribute("data-mce-selected"),X.appendChild(T),_.bind(V,"mousemove",u),_.bind(V,"mouseup",c),$!=V&&(_.bind($,"mousemove",u),_.bind($,"mouseup",c)),R=_.add(X,"div",{"class":"mce-resize-helper","data-mce-bogus":"all"},H+" &times; "+I)}var l;return t?void(i==t&&s(n)):(l=_.get("mceResizeHandle"+i),l&&_.remove(l),l=_.add(X,"div",{id:"mceResizeHandle"+i,"data-mce-bogus":"all","class":"mce-resizehandle",unselectable:!0,style:"cursor:"+i+"-resize; margin:0; padding:0"}),r.ie&&(l.contentEditable=!1),_.bind(l,"mousedown",function(e){e.stopImmediatePropagation(),e.preventDefault(),s(e)}),e.elm=l,void _.setStyles(l,{left:o*e[0]+P-l.offsetWidth/2,top:a*e[1]+O-l.offsetHeight/2}))}):f(),k.setAttribute("data-mce-selected","1")}function f(){var e,t;x(),k&&k.removeAttribute("data-mce-selected");for(e in A)t=_.get("mceResizeHandle"+e),t&&(_.unbind(t),_.remove(t))}function p(e){function t(e,t){if(e)do if(e===t)return!0;while(e=e.parentNode)}var n,r;if(!z&&!s.removed)return S(_.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),r="mousedown"==e.type?e.target:i.getNode(),r=_.$(r).closest(q?"table":"table,img,hr")[0],t(r,X)&&(w(),n=i.getStart(!0),t(n,r)&&t(i.getEnd(!0),r)&&(!q||r!=n&&"IMG"!==n.nodeName))?void d(r):void f()}function h(e,t,n){e&&e.attachEvent&&e.attachEvent("on"+t,n)}function m(e,t,n){e&&e.detachEvent&&e.detachEvent("on"+t,n)}function g(e){var t=e.srcElement,n,r,i,o,a,l,u;n=t.getBoundingClientRect(),l=D.clientX-n.left,u=D.clientY-n.top;for(r in A)if(i=A[r],o=t.offsetWidth*i[0],a=t.offsetHeight*i[1],j(o-l)<8&&j(a-u)<8){B=i;break}z=!0,s.fire("ObjectResizeStart",{target:k,width:k.clientWidth,height:k.clientHeight}),s.getDoc().selection.empty(),d(t,r,D)}function v(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function y(e){return a(o(s.getBody(),e))}function b(e){var t=e.srcElement;if(y(t))return void v(e);if(t!=k){if(s.fire("ObjectSelected",{target:t}),C(),0===t.id.indexOf("mceResizeHandle"))return void(e.returnValue=!1);
+"IMG"!=t.nodeName&&"TABLE"!=t.nodeName||(f(),k=t,h(t,"resizestart",g))}}function C(){m(k,"resizestart",g)}function x(){for(var e in A){var t=A[e];t.elm&&(_.unbind(t.elm),delete t.elm)}}function w(){try{s.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}}function E(e){var t;if(q){t=V.body.createControlRange();try{return t.addElement(e),t.select(),!0}catch(n){}}}function N(){k=T=null,q&&(C(),m(X,"controlselect",b))}var _=s.dom,S=t.each,k,T,R,A,B,D,L,M,P,O,H,I,F,z,U,W,V=s.getDoc(),$=document,q=r.ie&&r.ie<11,j=Math.abs,Y=Math.round,X=s.getBody(),K,G;A={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var J=".mce-content-body";return s.contentStyles.push(J+" div.mce-resizehandle {position: absolute;border: 1px solid black;box-sizing: box-sizing;background: #FFF;width: 7px;height: 7px;z-index: 10000}"+J+" .mce-resizehandle:hover {background: #000}"+J+" img[data-mce-selected],"+J+" hr[data-mce-selected] {outline: 1px solid black;resize: none}"+J+" .mce-clonedresizable {position: absolute;"+(r.gecko?"":"outline: 1px dashed black;")+"opacity: .5;filter: alpha(opacity=50);z-index: 10000}"+J+" .mce-resize-helper {background: #555;background: rgba(0,0,0,0.75);border-radius: 3px;border: 1px;color: white;display: none;font-family: sans-serif;font-size: 12px;white-space: nowrap;line-height: 14px;margin: 5px 10px;padding: 5px;position: absolute;z-index: 10001}"),s.on("init",function(){q?(s.on("ObjectResized",function(e){"TABLE"!=e.target.nodeName&&(f(),E(e.target))}),h(X,"controlselect",b),s.on("mousedown",function(e){D=e})):(w(),r.ie>=11&&(s.on("mousedown click",function(e){var t=e.target,n=t.nodeName;z||!/^(TABLE|IMG|HR)$/.test(n)||y(t)||(s.selection.select(t,"TABLE"==n),"mousedown"==e.type&&s.nodeChanged())}),s.dom.bind(X,"mscontrolselect",function(e){function t(e){n.setEditorTimeout(s,function(){s.selection.select(e)})}return y(e.target)?(e.preventDefault(),void t(e.target)):void(/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"==e.target.tagName&&t(e.target)))})));var e=n.throttle(function(e){s.composing||p(e)});s.on("nodechange ResizeEditor ResizeWindow drop",e),s.on("keyup compositionend",function(t){k&&"TABLE"==k.nodeName&&e(t)}),s.on("hide blur",f)}),s.on("remove",x),{isResizable:l,showResizeRect:d,hideResizeRect:f,updateResizeRect:p,controlSelect:E,destroy:N}}}),r(z,[],function(){function e(e){return function(){return e}}function t(e){return function(t){return!e(t)}}function n(e,t){return function(n){return e(t(n))}}function r(){var e=s.call(arguments);return function(t){for(var n=0;n<e.length;n++)if(e[n](t))return!0;return!1}}function i(){var e=s.call(arguments);return function(t){for(var n=0;n<e.length;n++)if(!e[n](t))return!1;return!0}}function o(e){var t=s.call(arguments);return t.length-1>=e.length?e.apply(this,t.slice(1)):function(){var e=t.concat([].slice.call(arguments));return o.apply(this,e)}}function a(){}var s=[].slice;return{constant:e,negate:t,and:i,or:r,curry:o,compose:n,noop:a}}),r(U,[_,h,k],function(e,t,n){function r(e){return!m(e)&&(d(e)?!f(e.parentNode):p(e)||c(e)||h(e)||u(e))}function i(e,t){for(e=e.parentNode;e&&e!=t;e=e.parentNode){if(u(e))return!1;if(l(e))return!0}return!0}function o(e){return!!u(e)&&t.reduce(e.getElementsByTagName("*"),function(e,t){return e||l(t)},!1)!==!0}function a(e){return p(e)||o(e)}function s(e,t){return r(e)&&i(e,t)}var l=e.isContentEditableTrue,u=e.isContentEditableFalse,c=e.isBr,d=e.isText,f=e.matchNodeNames("script style textarea"),p=e.matchNodeNames("img input textarea hr iframe video audio object"),h=e.matchNodeNames("table"),m=n.isCaretContainer;return{isCaretCandidate:r,isInEditable:i,isAtomic:a,isEditableCaretCandidate:s}}),r(W,[],function(){function e(e){return e?{left:c(e.left),top:c(e.top),bottom:c(e.bottom),right:c(e.right),width:c(e.width),height:c(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0}}function t(t,n){return t=e(t),n?t.right=t.left:(t.left=t.left+t.width,t.right=t.left),t.width=0,t}function n(e,t){return e.left===t.left&&e.top===t.top&&e.bottom===t.bottom&&e.right===t.right}function r(e,t,n){return e>=0&&e<=Math.min(t.height,n.height)/2}function i(e,t){return e.bottom<t.top||!(e.top>t.bottom)&&r(t.top-e.bottom,e,t)}function o(e,t){return e.top>t.bottom||!(e.bottom<t.top)&&r(t.bottom-e.top,e,t)}function a(e,t){return e.left<t.left}function s(e,t){return e.right>t.right}function l(e,t){return i(e,t)?-1:o(e,t)?1:a(e,t)?-1:s(e,t)?1:0}function u(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom}var c=Math.round;return{clone:e,collapse:t,isEqual:n,isAbove:i,isBelow:o,isLeft:a,isRight:s,compare:l,containsXY:u}}),r(V,[],function(){function e(e){return"string"==typeof e&&e.charCodeAt(0)>=768&&t.test(e)}var t=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]");return{isExtendingChar:e}}),r($,[z,_,w,T,U,W,V],function(e,t,n,r,i,o,a){function s(e){return"createRange"in e?e.createRange():n.DOM.createRng()}function l(e){return e&&/[\r\n\t ]/.test(e)}function u(e){var t=e.startContainer,n=e.startOffset,r;return!!(l(e.toString())&&v(t.parentNode)&&(r=t.data,l(r[n-1])||l(r[n+1])))}function c(e){function t(e){var t=e.ownerDocument,n=s(t),r=t.createTextNode("\xa0"),i=e.parentNode,a;return i.insertBefore(r,e),n.setStart(r,0),n.setEnd(r,1),a=o.clone(n.getBoundingClientRect()),i.removeChild(r),a}function n(e){var n,r;return r=e.getClientRects(),n=r.length>0?o.clone(r[0]):o.clone(e.getBoundingClientRect()),b(e)&&0===n.left?t(e):n}function r(e,t){return e=o.collapse(e,t),e.width=1,e.right=e.left+1,e}function i(e){0!==e.height&&(c.length>0&&o.isEqual(e,c[c.length-1])||c.push(e))}function l(e,t){var o=s(e.ownerDocument);if(t<e.data.length){if(a.isExtendingChar(e.data[t]))return c;if(a.isExtendingChar(e.data[t-1])&&(o.setStart(e,t),o.setEnd(e,t+1),!u(o)))return i(r(n(o),!1)),c}t>0&&(o.setStart(e,t-1),o.setEnd(e,t),u(o)||i(r(n(o),!1))),t<e.data.length&&(o.setStart(e,t),o.setEnd(e,t+1),u(o)||i(r(n(o),!0)))}var c=[],d,p;if(y(e.container()))return l(e.container(),e.offset()),c;if(f(e.container()))if(e.isAtEnd())p=x(e.container(),e.offset()),y(p)&&l(p,p.data.length),g(p)&&!b(p)&&i(r(n(p),!1));else{if(p=x(e.container(),e.offset()),y(p)&&l(p,0),g(p)&&e.isAtEnd())return i(r(n(p),!1)),c;d=x(e.container(),e.offset()-1),g(d)&&!b(d)&&(h(d)||h(p)||!g(p))&&i(r(n(d),!1)),g(p)&&i(r(n(p),!0))}return c}function d(t,n,r){function i(){return y(t)?0===n:0===n}function o(){return y(t)?n>=t.data.length:n>=t.childNodes.length}function a(){var e;return e=s(t.ownerDocument),e.setStart(t,n),e.setEnd(t,n),e}function l(){return r||(r=c(new d(t,n))),r}function u(){return l().length>0}function f(e){return e&&t===e.container()&&n===e.offset()}function p(e){return x(t,e?n-1:n)}return{container:e.constant(t),offset:e.constant(n),toRange:a,getClientRects:l,isVisible:u,isAtStart:i,isAtEnd:o,isEqual:f,getNode:p}}var f=t.isElement,p=i.isCaretCandidate,h=t.matchStyleValues("display","block table"),m=t.matchStyleValues("float","left right"),g=e.and(f,p,e.negate(m)),v=e.negate(t.matchStyleValues("white-space","pre pre-line pre-wrap")),y=t.isText,b=t.isBr,C=n.nodeIndex,x=r.getNode;return d.fromRangeStart=function(e){return new d(e.startContainer,e.startOffset)},d.fromRangeEnd=function(e){return new d(e.endContainer,e.endOffset)},d.after=function(e){return new d(e.parentNode,C(e)+1)},d.before=function(e){return new d(e.parentNode,C(e))},d}),r(q,[_,w,z,h,$],function(e,t,n,r,i){function o(e){var t=e.parentNode;return v(t)?o(t):t}function a(e){return e?r.reduce(e.childNodes,function(e,t){return v(t)&&"BR"!=t.nodeName?e=e.concat(a(t)):e.push(t),e},[]):[]}function s(e,t){for(;(e=e.previousSibling)&&g(e);)t+=e.data.length;return t}function l(e){return function(t){return e===t}}function u(t){var n,i,s;return n=a(o(t)),i=r.findIndex(n,l(t),t),n=n.slice(0,i+1),s=r.reduce(n,function(e,t,r){return g(t)&&g(n[r-1])&&e++,e},0),n=r.filter(n,e.matchNodeNames(t.nodeName)),i=r.findIndex(n,l(t),t),i-s}function c(e){var t;return t=g(e)?"text()":e.nodeName.toLowerCase(),t+"["+u(e)+"]"}function d(e,t,n){var r=[];for(t=t.parentNode;t!=e&&(!n||!n(t));t=t.parentNode)r.push(t);return r}function f(t,i){var o,a,l=[],u,f,p;return o=i.container(),a=i.offset(),g(o)?u=s(o,a):(f=o.childNodes,a>=f.length?(u="after",a=f.length-1):u="before",o=f[a]),l.push(c(o)),p=d(t,o),p=r.filter(p,n.negate(e.isBogus)),l=l.concat(r.map(p,function(e){return c(e)})),l.reverse().join("/")+","+u}function p(t,n,i){var o=a(t);return o=r.filter(o,function(e,t){return!g(e)||!g(o[t-1])}),o=r.filter(o,e.matchNodeNames(n)),o[i]}function h(e,t){for(var n=e,r=0,o;g(n);){if(o=n.data.length,t>=r&&t<=r+o){e=n,t-=r;break}if(!g(n.nextSibling)){e=n,t=o;break}r+=o,n=n.nextSibling}return t>e.data.length&&(t=e.data.length),new i(e,t)}function m(e,t){var n,o,a;return t?(n=t.split(","),t=n[0].split("/"),a=n.length>1?n[1]:"before",o=r.reduce(t,function(e,t){return(t=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t))?("text()"===t[1]&&(t[1]="#text"),p(e,t[1],parseInt(t[2],10))):null},e),o?g(o)?h(o,parseInt(a,10)):(a="after"===a?y(o)+1:y(o),new i(o.parentNode,a)):null):null}var g=e.isText,v=e.isBogus,y=t.nodeIndex;return{create:f,resolve:m}}),r(j,[d,m,k,q,$,_,T],function(e,t,n,r,i,o,a){function s(s){var u=s.dom;this.getBookmark=function(e,c){function d(e,n){var r=0;return t.each(u.select(e),function(e){if("all"!==e.getAttribute("data-mce-bogus"))return e!=n&&void r++}),r}function f(e){function t(t){var n,r,i,o=t?"start":"end";n=e[o+"Container"],r=e[o+"Offset"],1==n.nodeType&&"TR"==n.nodeName&&(i=n.childNodes,n=i[Math.min(t?r:r-1,i.length-1)],n&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r)))}return t(!0),t(),e}function p(e){function t(e,t){var r=e[t?"startContainer":"endContainer"],i=e[t?"startOffset":"endOffset"],o=[],a,s,l=0;if(3==r.nodeType){if(c)for(a=r.previousSibling;a&&3==a.nodeType;a=a.previousSibling)i+=a.nodeValue.length;o.push(i)}else s=r.childNodes,i>=s.length&&s.length&&(l=1,i=Math.max(0,s.length-1)),o.push(u.nodeIndex(s[i],c)+l);for(;r&&r!=n;r=r.parentNode)o.push(u.nodeIndex(r,c));return o}var n=u.getRoot(),r={};return r.start=t(e,!0),s.isCollapsed()||(r.end=t(e)),r}function h(e){function t(e,t){var r;if(o.isElement(e)&&(e=a.getNode(e,t),l(e)))return e;if(n.isCaretContainer(e)){if(o.isText(e)&&n.isCaretContainerBlock(e)&&(e=e.parentNode),r=e.previousSibling,l(r))return r;if(r=e.nextSibling,l(r))return r}}return t(e.startContainer,e.startOffset)||t(e.endContainer,e.endOffset)}var m,g,v,y,b,C,x="&#xFEFF;",w;if(2==e)return C=s.getNode(),b=C?C.nodeName:null,m=s.getRng(),l(C)||"IMG"==b?{name:b,index:d(b,C)}:s.tridentSel?s.tridentSel.getBookmark(e):(C=h(m),C?(b=C.tagName,{name:b,index:d(b,C)}):p(m));if(3==e)return m=s.getRng(),{start:r.create(u.getRoot(),i.fromRangeStart(m)),end:r.create(u.getRoot(),i.fromRangeEnd(m))};if(e)return{rng:s.getRng()};if(m=s.getRng(),v=u.uniqueId(),y=s.isCollapsed(),w="overflow:hidden;line-height:0px",m.duplicate||m.item){if(m.item)return C=m.item(0),b=C.nodeName,{name:b,index:d(b,C)};g=m.duplicate();try{m.collapse(),m.pasteHTML('<span data-mce-type="bookmark" id="'+v+'_start" style="'+w+'">'+x+"</span>"),y||(g.collapse(!1),m.moveToElementText(g.parentElement()),0===m.compareEndPoints("StartToEnd",g)&&g.move("character",-1),g.pasteHTML('<span data-mce-type="bookmark" id="'+v+'_end" style="'+w+'">'+x+"</span>"))}catch(E){return null}}else{if(C=s.getNode(),b=C.nodeName,"IMG"==b)return{name:b,index:d(b,C)};g=f(m.cloneRange()),y||(g.collapse(!1),g.insertNode(u.create("span",{"data-mce-type":"bookmark",id:v+"_end",style:w},x))),m=f(m),m.collapse(!0),m.insertNode(u.create("span",{"data-mce-type":"bookmark",id:v+"_start",style:w},x))}return s.moveToBookmark({id:v,keep:1}),{id:v}},this.moveToBookmark=function(n){function i(e){var t=n[e?"start":"end"],r,i,o,a;if(t){for(o=t[0],i=d,r=t.length-1;r>=1;r--){if(a=i.childNodes,t[r]>a.length-1)return;i=a[t[r]]}3===i.nodeType&&(o=Math.min(t[0],i.nodeValue.length)),1===i.nodeType&&(o=Math.min(t[0],i.childNodes.length)),e?c.setStart(i,o):c.setEnd(i,o)}return!0}function o(r){var i=u.get(n.id+"_"+r),o,a,s,l,c=n.keep;if(i&&(o=i.parentNode,"start"==r?(c?(o=i.firstChild,a=1):a=u.nodeIndex(i),f=p=o,h=m=a):(c?(o=i.firstChild,a=1):a=u.nodeIndex(i),p=o,m=a),!c)){for(l=i.previousSibling,s=i.nextSibling,t.each(t.grep(i.childNodes),function(e){3==e.nodeType&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});i=u.get(n.id+"_"+r);)u.remove(i,1);l&&s&&l.nodeType==s.nodeType&&3==l.nodeType&&!e.opera&&(a=l.nodeValue.length,l.appendData(s.nodeValue),u.remove(s),"start"==r?(f=p=l,h=m=a):(p=l,m=a))}}function a(t){return!u.isBlock(t)||t.innerHTML||e.ie||(t.innerHTML='<br data-mce-bogus="1" />'),t}function l(){var e,t;return e=u.createRng(),t=r.resolve(u.getRoot(),n.start),e.setStart(t.container(),t.offset()),t=r.resolve(u.getRoot(),n.end),e.setEnd(t.container(),t.offset()),e}var c,d,f,p,h,m;if(n)if(t.isArray(n.start)){if(c=u.createRng(),d=u.getRoot(),s.tridentSel)return s.tridentSel.moveToBookmark(n);i(!0)&&i()&&s.setRng(c)}else"string"==typeof n.start?s.setRng(l(n)):n.id?(o("start"),o("end"),f&&(c=u.createRng(),c.setStart(a(f),h),c.setEnd(a(p),m),s.setRng(c))):n.name?s.select(u.select(n.name)[n.index]):n.rng&&s.setRng(n.rng)}}var l=o.isContentEditableFalse;return s.isBookmarkNode=function(e){return e&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},s}),r(Y,[y,H,F,T,j,_,d,m,$],function(e,n,r,i,o,a,s,l,u){function c(e,t,i,a){var s=this;s.dom=e,s.win=t,s.serializer=i,s.editor=a,s.bookmarkManager=new o(s),s.controlSelection=new r(s,a),s.win.getSelection||(s.tridentSel=new n(s))}var d=l.each,f=l.trim,p=s.ie;return c.prototype={setCursorLocation:function(e,t){var n=this,r=n.dom.createRng();e?(r.setStart(e,t),r.setEnd(e,t),n.setRng(r),n.collapse(!1)):(n._moveEndPoint(r,n.editor.getBody(),!0),n.setRng(r))},getContent:function(e){var n=this,r=n.getRng(),i=n.dom.create("body"),o=n.getSel(),a,s,l;return e=e||{},a=s="",e.get=!0,e.format=e.format||"html",e.selection=!0,n.editor.fire("BeforeGetContent",e),"text"==e.format?n.isCollapsed()?"":r.text||(o.toString?o.toString():""):(r.cloneContents?(l=r.cloneContents(),l&&i.appendChild(l)):r.item!==t||r.htmlText!==t?(i.innerHTML="<br>"+(r.item?r.item(0).outerHTML:r.htmlText),i.removeChild(i.firstChild)):i.innerHTML=r.toString(),/^\s/.test(i.innerHTML)&&(a=" "),/\s+$/.test(i.innerHTML)&&(s=" "),e.getInner=!0,e.content=n.isCollapsed()?"":a+n.serializer.serialize(i,e)+s,n.editor.fire("GetContent",e),e.content)},setContent:function(e,t){var n=this,r=n.getRng(),i,o=n.win.document,a,s;if(t=t||{format:"html"},t.set=!0,t.selection=!0,t.content=e,t.no_events||n.editor.fire("BeforeSetContent",t),e=t.content,r.insertNode){e+='<span id="__caret">_</span>',r.startContainer==o&&r.endContainer==o?o.body.innerHTML=e:(r.deleteContents(),0===o.body.childNodes.length?o.body.innerHTML=e:r.createContextualFragment?r.insertNode(r.createContextualFragment(e)):(a=o.createDocumentFragment(),s=o.createElement("div"),a.appendChild(s),s.outerHTML=e,r.insertNode(a))),i=n.dom.get("__caret"),r=o.createRange(),r.setStartBefore(i),r.setEndBefore(i),n.setRng(r),n.dom.remove("__caret");try{n.setRng(r)}catch(l){}}else r.item&&(o.execCommand("Delete",!1,null),r=n.getRng()),/^\s+/.test(e)?(r.pasteHTML('<span id="__mce_tmp">_</span>'+e),n.dom.remove("__mce_tmp")):r.pasteHTML(e);t.no_events||n.editor.fire("SetContent",t)},getStart:function(e){var t=this,n=t.getRng(),r,i,o,a;if(n.duplicate||n.item){if(n.item)return n.item(0);for(o=n.duplicate(),o.collapse(1),r=o.parentElement(),r.ownerDocument!==t.dom.doc&&(r=t.dom.getRoot()),i=a=n.parentElement();a=a.parentNode;)if(a==r){r=i;break}return r}return r=n.startContainer,1==r.nodeType&&r.hasChildNodes()&&(e&&n.collapsed||(r=r.childNodes[Math.min(r.childNodes.length-1,n.startOffset)])),r&&3==r.nodeType?r.parentNode:r},getEnd:function(e){var t=this,n=t.getRng(),r,i;return n.duplicate||n.item?n.item?n.item(0):(n=n.duplicate(),n.collapse(0),r=n.parentElement(),r.ownerDocument!==t.dom.doc&&(r=t.dom.getRoot()),r&&"BODY"==r.nodeName?r.lastChild||r:r):(r=n.endContainer,i=n.endOffset,1==r.nodeType&&r.hasChildNodes()&&(e&&n.collapsed||(r=r.childNodes[i>0?i-1:i])),r&&3==r.nodeType?r.parentNode:r)},getBookmark:function(e,t){return this.bookmarkManager.getBookmark(e,t)},moveToBookmark:function(e){return this.bookmarkManager.moveToBookmark(e)},select:function(e,t){var n=this,r=n.dom,i=r.createRng(),o;if(n.lastFocusBookmark=null,e){if(!t&&n.controlSelection.controlSelect(e))return;o=r.nodeIndex(e),i.setStart(e.parentNode,o),i.setEnd(e.parentNode,o+1),t&&(n._moveEndPoint(i,e,!0),n._moveEndPoint(i,e)),n.setRng(i)}return e},isCollapsed:function(){var e=this,t=e.getRng(),n=e.getSel();return!(!t||t.item)&&(t.compareEndPoints?0===t.compareEndPoints("StartToEnd",t):!n||t.collapsed)},collapse:function(e){var t=this,n=t.getRng(),r;n.item&&(r=n.item(0),n=t.win.document.body.createTextRange(),n.moveToElementText(r)),n.collapse(!!e),t.setRng(n)},getSel:function(){var e=this.win;return e.getSelection?e.getSelection():e.document.selection},getRng:function(e){function t(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(r){return-1}}var n=this,r,i,o,a,s,l;if(!n.win)return null;if(a=n.win.document,"undefined"==typeof a||null===a)return null;if(!e&&n.lastFocusBookmark){var u=n.lastFocusBookmark;return u.startContainer?(i=a.createRange(),i.setStart(u.startContainer,u.startOffset),i.setEnd(u.endContainer,u.endOffset)):i=u,i}if(e&&n.tridentSel)return n.tridentSel.getRangeAt(0);try{(r=n.getSel())&&(i=r.rangeCount>0?r.getRangeAt(0):r.createRange?r.createRange():a.createRange())}catch(c){}if(l=n.editor.fire("GetSelectionRange",{range:i}),l.range!==i)return l.range;if(p&&i&&i.setStart&&a.selection){try{s=a.selection.createRange()}catch(c){}s&&s.item&&(o=s.item(0),i=a.createRange(),i.setStartBefore(o),i.setEndAfter(o))}return i||(i=a.createRange?a.createRange():a.body.createTextRange()),i.setStart&&9===i.startContainer.nodeType&&i.collapsed&&(o=n.dom.getRoot(),i.setStart(o,0),i.setEnd(o,0)),n.selectedRange&&n.explicitRange&&(0===t(i.START_TO_START,i,n.selectedRange)&&0===t(i.END_TO_END,i,n.selectedRange)?i=n.explicitRange:(n.selectedRange=null,n.explicitRange=null)),i},setRng:function(e,t){var n=this,r,i,o;if(e)if(e.select){n.explicitRange=null;try{e.select()}catch(a){}}else if(n.tridentSel){if(e.cloneRange)try{n.tridentSel.addRange(e)}catch(a){}}else{if(r=n.getSel(),o=n.editor.fire("SetSelectionRange",{range:e}),e=o.range,r){n.explicitRange=e;try{r.removeAllRanges(),r.addRange(e)}catch(a){}t===!1&&r.extend&&(r.collapse(e.endContainer,e.endOffset),r.extend(e.startContainer,e.startOffset)),n.selectedRange=r.rangeCount>0?r.getRangeAt(0):null}e.collapsed||e.startContainer!=e.endContainer||!r.setBaseAndExtent||s.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(i=e.startContainer.childNodes[e.startOffset],i&&"IMG"==i.tagName&&(r.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),r.anchorNode===e.startContainer&&r.focusNode===e.endContainer||r.setBaseAndExtent(i,0,i,1))),n.editor.fire("AfterSetSelectionRange",{range:e})}},setNode:function(e){var t=this;return t.setContent(t.dom.getOuterHTML(e)),e},getNode:function(){function e(e,t){for(var n=e;e&&3===e.nodeType&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}var t=this,n=t.getRng(),r,i,o,a,s,l=t.dom.getRoot();return n?(i=n.startContainer,o=n.endContainer,a=n.startOffset,s=n.endOffset,n.setStart?(r=n.commonAncestorContainer,!n.collapsed&&(i==o&&s-a<2&&i.hasChildNodes()&&(r=i.childNodes[a]),3===i.nodeType&&3===o.nodeType&&(i=i.length===a?e(i.nextSibling,!0):i.parentNode,o=0===s?e(o.previousSibling,!1):o.parentNode,i&&i===o))?i:r&&3==r.nodeType?r.parentNode:r):(r=n.item?n.item(0):n.parentElement(),r.ownerDocument!==t.win.document&&(r=l),r)):l},getSelectedBlocks:function(t,n){var r=this,i=r.dom,o,a,s=[];if(a=i.getRoot(),t=i.getParent(t||r.getStart(),i.isBlock),n=i.getParent(n||r.getEnd(),i.isBlock),t&&t!=a&&s.push(t),t&&n&&t!=n){o=t;for(var l=new e(t,a);(o=l.next())&&o!=n;)i.isBlock(o)&&s.push(o)}return n&&t!=n&&n!=a&&s.push(n),s},isForward:function(){var e=this.dom,t=this.getSel(),n,r;return!(t&&t.anchorNode&&t.focusNode)||(n=e.createRng(),n.setStart(t.anchorNode,t.anchorOffset),n.collapse(!0),r=e.createRng(),r.setStart(t.focusNode,t.focusOffset),r.collapse(!0),n.compareBoundaryPoints(n.START_TO_START,r)<=0)},normalize:function(){var e=this,t=e.getRng();return s.range&&new i(e.dom).normalize(t)&&e.setRng(t,e.isForward()),t},selectorChanged:function(e,t){var n=this,r;return n.selectorChangedData||(n.selectorChangedData={},r={},n.editor.on("NodeChange",function(e){var t=e.element,i=n.dom,o=i.getParents(t,null,i.getRoot()),a={};d(n.selectorChangedData,function(e,t){d(o,function(n){if(i.is(n,t))return r[t]||(d(e,function(e){e(!0,{node:n,selector:t,parents:o})}),r[t]=e),a[t]=e,!1})}),d(r,function(e,n){a[n]||(delete r[n],d(e,function(e){e(!1,{node:t,selector:n,parents:o})}))})})),n.selectorChangedData[e]||(n.selectorChangedData[e]=[]),n.selectorChangedData[e].push(t),n},getScrollContainer:function(){for(var e,t=this.dom.getRoot();t&&"BODY"!=t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e,t){function n(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}}var r,i,o=this,s=o.dom,l=s.getRoot(),u,c,d=0;if(a.isElement(e)){if(t===!1&&(d=e.offsetHeight),"BODY"!=l.nodeName){var f=o.getScrollContainer();if(f)return r=n(e).y-n(f).y+d,c=f.clientHeight,u=f.scrollTop,void((r<u||r+25>u+c)&&(f.scrollTop=r<u?r:r-c+25))}i=s.getViewPort(o.editor.getWin()),r=s.getPos(e).y+d,u=i.y,c=i.h,(r<i.y||r+25>u+c)&&o.editor.getWin().scrollTo(0,r<u?r:r-c+25)}},placeCaretAt:function(e,t){this.setRng(i.getCaretRangeFromPoint(e,t,this.editor.getDoc()))},_moveEndPoint:function(t,n,r){var i=n,o=new e(n,i),a=this.dom.schema.getNonEmptyElements();do{if(3==n.nodeType&&0!==f(n.nodeValue).length)return void(r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length));if(a[n.nodeName]&&!/^(TD|TH)$/.test(n.nodeName))return void(r?t.setStartBefore(n):"BR"==n.nodeName?t.setEndBefore(n):t.setEndAfter(n));if(s.ie&&s.ie<11&&this.dom.isBlock(n)&&this.dom.isEmpty(n))return void(r?t.setStart(n,0):t.setEnd(n,0))}while(n=r?o.next():o.prev());"BODY"==i.nodeName&&(r?t.setStart(i,0):t.setEnd(i,i.childNodes.length))},getBoundingClientRect:function(){var e=this.getRng();return e.collapsed?u.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:function(){this.win=null,this.controlSelection.destroy()}},c}),r(X,[j,m],function(e,t){function n(t){this.compare=function(n,i){function o(e){var n={};return r(t.getAttribs(e),function(r){var i=r.nodeName.toLowerCase();0!==i.indexOf("_")&&"style"!==i&&0!==i.indexOf("data-")&&(n[i]=t.getAttrib(e,i))}),n}function a(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(n=t[r],"undefined"==typeof n)return!1;if(e[r]!=n)return!1;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return!1;return!0}return n.nodeName==i.nodeName&&(!!a(o(n),o(i))&&(!!a(t.parseStyle(t.getAttrib(n,"style")),t.parseStyle(t.getAttrib(i,"style")))&&(!e.isBookmarkNode(n)&&!e.isBookmarkNode(i))))}}var r=t.each;return n}),r(K,[w,m,B],function(e,t,n){function r(e,r){function i(e,t){t.classes.length&&u.addClass(e,t.classes.join(" ")),u.setAttribs(e,t.attrs)}function o(e){var t;return c="string"==typeof e?{name:e,classes:[],attrs:{}}:e,t=u.create(c.name),i(t,c),t}function a(e,n){var r="string"!=typeof e?e.nodeName.toLowerCase():e,i=f.getElementRule(r),o=i.parentsRequired;return!(!o||!o.length)&&(n&&t.inArray(o,n)!==-1?n:o[0])}function s(e,n,r){var i,l,c,d=n.length&&n[0],f=d&&d.name;if(c=a(e,f))f==c?(l=n[0],n=n.slice(1)):l=c;else if(d)l=n[0],n=n.slice(1);else if(!r)return e;return l&&(i=o(l),i.appendChild(e)),r&&(i||(i=u.create("div"),i.appendChild(e)),t.each(r,function(t){var n=o(t);i.insertBefore(n,e)})),s(i,n,l&&l.siblings)}var l,c,d,f=r&&r.schema||new n({});return e&&e.length?(c=e[0],l=o(c),d=u.create("div"),d.appendChild(s(l,e.slice(1),c.siblings)),d):""}function i(e,t){return r(a(e),t)}function o(e){var n,r={classes:[],attrs:{}};return e=r.selector=t.trim(e),"*"!==e&&(n=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,function(e,n,i,o,a){switch(n){case"#":r.attrs.id=i;break;case".":r.classes.push(i);break;case":":t.inArray("checked disabled enabled read-only required".split(" "),i)!==-1&&(r.attrs[i]=i)}if("["==o){var s=a.match(/([\w\-]+)(?:\=\"([^\"]+))?/);s&&(r.attrs[s[1]]=s[2])}return""})),r.name=n||"div",r}function a(e){return e&&"string"==typeof e?(e=e.split(/\s*,\s*/)[0],e=e.replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),t.map(e.split(/(?:>|\s+(?![^\[\]]+\]))/),function(e){var n=t.map(e.split(/(?:~\+|~|\+)/),o),r=n.pop();return n.length&&(r.siblings=n),r}).reverse()):[]}function s(e,t){function n(e){return e.replace(/%(\w+)/g,"")}var i,o,s,c,d="",f,p;if(p=e.settings.preview_styles,p===!1)return"";if("string"!=typeof p&&(p="font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"),"string"==typeof t){if(t=e.formatter.get(t),!t)return;t=t[0]}return"preview"in t&&(p=t.preview,p===!1)?"":(i=t.block||t.inline||"span",c=a(t.selector),c.length?(c[0].name||(c[0].name=i),i=t.selector,o=r(c,e)):o=r([i],e),s=u.select(i,o)[0]||o.firstChild,l(t.styles,function(e,t){e=n(e),e&&u.setStyle(s,t,e)}),l(t.attributes,function(e,t){e=n(e),e&&u.setAttrib(s,t,e)}),l(t.classes,function(e){e=n(e),u.hasClass(s,e)||u.addClass(s,e)}),e.fire("PreviewFormats"),u.setStyles(o,{position:"absolute",left:-65535}),e.getBody().appendChild(o),f=u.getStyle(e.getBody(),"fontSize",!0),f=/px$/.test(f)?parseInt(f,10):0,l(p.split(" "),function(t){var n=u.getStyle(s,t,!0);if(!("background-color"==t&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(n)&&(n=u.getStyle(e.getBody(),t,!0),"#ffffff"==u.toHex(n).toLowerCase())||"color"==t&&"#000000"==u.toHex(n).toLowerCase())){if("font-size"==t&&/em|%$/.test(n)){if(0===f)return;n=parseFloat(n,10)/(/%$/.test(n)?100:1),n=n*f+"px"}"border"==t&&n&&(d+="padding:0 2px;"),d+=t+":"+n+";"}}),e.fire("AfterPreviewFormats"),u.remove(o),d)}var l=t.each,u=e.DOM;return{getCssText:s,parseSelector:a,selectorToHtml:i}}),r(G,[h,_,g],function(e,t,n){function r(e,t){var n=o[e];n||(o[e]=n=[]),o[e].push(t)}function i(e,t){s(o[e],function(e){e(t)})}var o={},a=e.filter,s=e.each;return r("pre",function(r){function i(t){return u(t.previousSibling)&&e.indexOf(c,t.previousSibling)!=-1}function o(e,t){n(t).remove(),n(e).append("<br><br>").append(t.childNodes)}var l=r.selection.getRng(),u,c;u=t.matchNodeNames("pre"),l.collapsed||(c=r.selection.getSelectedBlocks(),s(a(a(c,u),i),function(e){o(e.previousSibling,e)}))}),{postProcess:i}}),r(J,[y,T,j,X,z,m,K,G],function(e,t,n,r,i,o,a,s){return function(l){function u(e){return e.nodeType&&(e=e.nodeName),!!l.schema.getTextBlockElements()[e.toLowerCase()]}function c(e){return/^(TH|TD)$/.test(e.nodeName)}function d(e){return e&&/^(IMG)$/.test(e.nodeName)}function f(e,t){return Q.getParents(e,t,Q.getRoot())}function p(e){return 1===e.nodeType&&"_mce_caret"===e.id}function h(){v({valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},inherit:!1,preview:!1,defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"},preview:"font-family font-size"}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},inherit:!1,preview:!1,defaultBlock:"div"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"},preview:"font-family font-size"}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},inherit:!1,defaultBlock:"div",preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(e,t,n){me(n,function(t,n){Q.setAttrib(e,n,t)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,
+deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]}),me("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){v(e,{block:e,remove:"all"})}),v(l.settings.formats)}function m(){l.addShortcut("meta+b","bold_desc","Bold"),l.addShortcut("meta+i","italic_desc","Italic"),l.addShortcut("meta+u","underline_desc","Underline");for(var e=1;e<=6;e++)l.addShortcut("access+"+e,"",["FormatBlock",!1,"h"+e]);l.addShortcut("access+7","",["FormatBlock",!1,"p"]),l.addShortcut("access+8","",["FormatBlock",!1,"div"]),l.addShortcut("access+9","",["FormatBlock",!1,"address"])}function g(e){return e?J[e]:J}function v(e,t){e&&("string"!=typeof e?me(e,function(e,t){v(t,e)}):(t=t.length?t:[t],me(t,function(e){e.deep===ce&&(e.deep=!e.selector),e.split===ce&&(e.split=!e.selector||e.inline),e.remove===ce&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),J[e]=t))}function y(e){return e&&J[e]&&delete J[e],J}function b(e,t){var n=g(t);if(n)for(var r=0;r<n.length;r++)if(n[r].inherit===!1&&Q.is(e,n[r].selector))return!0;return!1}function C(e){var t;return l.dom.getParent(e,function(e){return t=l.dom.getStyle(e,"text-decoration"),t&&"none"!==t}),t}function x(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=C(e.parentNode),l.dom.getStyle(e,"color")&&t?l.dom.setStyle(e,"text-decoration",t):l.dom.getStyle(e,"text-decoration")===t&&l.dom.setStyle(e,"text-decoration",null))}function w(t,n,r){function i(e,t){if(t=t||f,e){if(t.onformat&&t.onformat(e,t,n,r),me(t.styles,function(t,r){Q.setStyle(e,r,F(t,n))}),t.styles){var i=Q.getAttrib(e,"style");i&&e.setAttribute("data-mce-style",i)}me(t.attributes,function(t,r){Q.setAttrib(e,r,F(t,n))}),me(t.classes,function(t){t=F(t,n),Q.hasClass(e,t)||Q.addClass(e,t)})}}function o(e,t){var n=!1;return!!f.selector&&(me(e,function(e){if(!("collapsed"in e&&e.collapsed!==v))return Q.is(t,e.selector)&&!p(t)?(i(t,e),n=!0,!1):void 0}),n)}function a(){function t(t,n){var i=new e(n);for(r=i.prev2();r;r=i.prev2()){if(3==r.nodeType&&r.data.length>0)return r;if(r.childNodes.length>1||r==t||"BR"==r.tagName)return r}}var n=l.selection.getRng(),i=n.startContainer,o=n.endContainer;if(i!=o&&0===n.endOffset){var a=t(i,o),s=3==a.nodeType?a.data.length:a.childNodes.length;n.setEnd(a,s)}return n}function c(e,r,a){var s=[],l,c,h=!0;l=f.inline||f.block,c=Q.create(l),i(c),ee.walk(e,function(e){function r(e){var g,v,y,b;if(b=h,g=e.nodeName.toLowerCase(),v=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&de(e)&&(b=h,h="true"===de(e),y=!0),D(g,"br"))return m=0,void(f.block&&Q.remove(e));if(f.wrapper&&_(e,t,n))return void(m=0);if(h&&!y&&f.block&&!f.wrapper&&u(g)&&te(v,l))return e=Q.rename(e,l),i(e),s.push(e),void(m=0);if(f.selector){var C=o(d,e);if(!f.inline||C)return void(m=0)}!h||y||!te(l,g)||!te(v,l)||!a&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||p(e)||f.inline&&ne(e)?(m=0,me(ge(e.childNodes),r),y&&(h=b),m=0):(m||(m=Q.clone(c,se),e.parentNode.insertBefore(m,e),s.push(m)),m.appendChild(e))}var m;me(e,r)}),f.links===!0&&me(s,function(e){function t(e){"A"===e.nodeName&&i(e,f),me(ge(e.childNodes),t)}t(e)}),me(s,function(e){function r(e){var t=0;return me(e.childNodes,function(e){z(e)||he(e)||t++}),t}function o(e){var t=!1;return me(e.childNodes,function(e){if(M(e))return t=e,!1}),t}function a(e,t){do{if(1!==r(e))break;if(e=o(e),!e)break;if(t(e))return e}while(e);return null}function l(e){var t,n;return t=o(e),t&&!he(t)&&B(t,f)&&(n=Q.clone(t,se),i(n),Q.replace(n,e,le),Q.remove(t,1)),n||e}var u;if(u=r(e),(s.length>1||!ne(e))&&0===u)return void Q.remove(e,1);if(f.inline||f.wrapper){if(f.exact||1!==u||(e=l(e)),me(d,function(t){me(Q.select(t.inline,e),function(e){he(e)||$(t,n,e,t.exact?e:null)})}),_(e.parentNode,t,n)&&$(f,n,e)&&(e=0),f.merge_with_parents&&Q.getParent(e.parentNode,function(r){if(_(r,t,n))return $(f,n,e)&&(e=0),le}),!ne(e)&&!H(e,"fontSize")){var c=a(e,P("fontSize"));c&&w("fontsize",{value:H(c,"fontSize")},e)}e&&f.merge_siblings!==!1&&(e=Y(j(e),e),e=Y(e,j(e,le)))}})}var d=g(t),f=d[0],h,m,v=!r&&Z.isCollapsed();if("false"!==de(Z.getNode())){if(f){if(r)r.nodeType?o(d,r)||(m=Q.createRng(),m.setStartBefore(r),m.setEndAfter(r),c(W(m,d),null,!0)):c(r,null,!0);else if(v&&f.inline&&!Q.select("td[data-mce-selected],th[data-mce-selected]").length)K("apply",t,n);else{var y=l.selection.getNode();re||!d[0].defaultBlock||Q.getParent(y,Q.isBlock)||w(d[0].defaultBlock),l.selection.setRng(a()),h=Z.getBookmark(),c(W(Z.getRng(le),d),h),f.styles&&((f.styles.color||f.styles.textDecoration)&&(ve(y,x,"childNodes"),x(y)),f.styles.backgroundColor&&L(y,P("fontSize"),O("backgroundColor",F(f.styles.backgroundColor,n)))),Z.moveToBookmark(h),G(Z.getRng(le)),l.nodeChanged()}s.postProcess(t,l)}}else{r=Z.getNode();for(var b=0,C=d.length;b<C;b++)if(d[b].ceFalseOverride&&Q.is(r,d[b].selector))return void i(r,d[b])}}function E(e,t,n,r){function i(e){var n,r,o,a,s;if(1===e.nodeType&&de(e)&&(a=y,y="true"===de(e),s=!0),n=ge(e.childNodes),y&&!s)for(r=0,o=p.length;r<o&&!$(p[r],t,e,e);r++);if(h.deep&&n.length){for(r=0,o=n.length;r<o;r++)i(n[r]);s&&(y=a)}}function o(n){var i;return me(f(n.parentNode).reverse(),function(n){var o;i||"_start"==n.id||"_end"==n.id||(o=_(n,e,t,r),o&&o.split!==!1&&(i=n))}),i}function a(e,n,r,i){var o,a,s,l,u,c;if(e){for(c=e.parentNode,o=n.parentNode;o&&o!=c;o=o.parentNode){for(a=Q.clone(o,se),u=0;u<p.length;u++)if($(p[u],t,a,a)){a=0;break}a&&(s&&a.appendChild(s),l||(l=a),s=a)}!i||h.mixed&&ne(e)||(n=Q.split(e,n)),s&&(r.parentNode.insertBefore(s,r),l.appendChild(r))}return n}function s(e){return a(o(e),e,e,!0)}function u(e){var t=Q.get(e?"_start":"_end"),n=t[e?"firstChild":"lastChild"];return he(n)&&(n=n[e?"firstChild":"lastChild"]),3==n.nodeType&&0===n.data.length&&(n=e?t.previousSibling||t.nextSibling:t.nextSibling||t.previousSibling),Q.remove(t,!0),n}function d(e){var t,n,r=e.commonAncestorContainer;if(e=W(e,p,le),h.split){if(t=X(e,le),n=X(e),t!=n){if(/^(TR|TH|TD)$/.test(t.nodeName)&&t.firstChild&&(t="TR"==t.nodeName?t.firstChild.firstChild||t:t.firstChild||t),r&&/^T(HEAD|BODY|FOOT|R)$/.test(r.nodeName)&&c(n)&&n.firstChild&&(n=n.firstChild||n),Q.isChildOf(t,n)&&!ne(n)&&!c(t)&&!c(n))return t=U(t,"span",{id:"_start","data-mce-type":"bookmark"}),s(t),void(t=u(le));t=U(t,"span",{id:"_start","data-mce-type":"bookmark"}),n=U(n,"span",{id:"_end","data-mce-type":"bookmark"}),s(t),s(n),t=u(le),n=u()}else t=n=s(t);e.startContainer=t.parentNode?t.parentNode:t,e.startOffset=ie(t),e.endContainer=n.parentNode?n.parentNode:n,e.endOffset=ie(n)+1}ee.walk(e,function(e){me(e,function(e){i(e),1===e.nodeType&&"underline"===l.dom.getStyle(e,"text-decoration")&&e.parentNode&&"underline"===C(e.parentNode)&&$({deep:!1,exact:!0,inline:"span",styles:{textDecoration:"underline"}},null,e)})})}var p=g(e),h=p[0],m,v,y=!0;if(n)return void(n.nodeType?(v=Q.createRng(),v.setStartBefore(n),v.setEndAfter(n),d(v)):d(n));if("false"!==de(Z.getNode()))Z.isCollapsed()&&h.inline&&!Q.select("td[data-mce-selected],th[data-mce-selected]").length?K("remove",e,t,r):(m=Z.getBookmark(),d(Z.getRng(le)),Z.moveToBookmark(m),h.inline&&S(e,t,Z.getStart())&&G(Z.getRng(!0)),l.nodeChanged());else{n=Z.getNode();for(var b=0,x=p.length;b<x&&(!p[b].ceFalseOverride||!$(p[b],t,n,n));b++);}}function N(e,t,n){var r=g(e);!S(e,t,n)||"toggle"in r[0]&&!r[0].toggle?w(e,t,n):E(e,t,n)}function _(e,t,n,r){function i(e,t,i){var o,a,s=t[i],l;if(t.onmatch)return t.onmatch(e,t,i);if(s)if(s.length===ce){for(o in s)if(s.hasOwnProperty(o)){if(a="attributes"===i?Q.getAttrib(e,o):H(e,o),r&&!a&&!t.exact)return;if((!r||t.exact)&&!D(a,I(F(s[o],n),o)))return}}else for(l=0;l<s.length;l++)if("attributes"===i?Q.getAttrib(e,s[l]):H(e,s[l]))return t;return t}var o=g(t),a,s,l;if(o&&e)for(s=0;s<o.length;s++)if(a=o[s],B(e,a)&&i(e,a,"attributes")&&i(e,a,"styles")){if(l=a.classes)for(s=0;s<l.length;s++)if(!Q.hasClass(e,l[s]))return;return a}}function S(e,t,n){function r(n){var r=Q.getRoot();return n!==r&&(n=Q.getParent(n,function(n){return!!b(n,e)||(n.parentNode===r||!!_(n,e,t,!0))}),_(n,e,t))}var i;return n?r(n):(n=Z.getNode(),r(n)?le:(i=Z.getStart(),i!=n&&r(i)?le:se))}function k(e,t){var n,r=[],i={};return n=Z.getStart(),Q.getParent(n,function(n){var o,a;for(o=0;o<e.length;o++)a=e[o],!i[a]&&_(n,a,t)&&(i[a]=!0,r.push(a))},Q.getRoot()),r}function T(e){var t=g(e),n,r,i,o,a;if(t)for(n=Z.getStart(),r=f(n),o=t.length-1;o>=0;o--){if(a=t[o].selector,!a||t[o].defaultBlock)return le;for(i=r.length-1;i>=0;i--)if(Q.is(r[i],a))return le}return se}function R(e,t,n){var r;return ue||(ue={},r={},l.on("NodeChange",function(e){var t=f(e.element),n={};t=o.grep(t,function(e){return 1==e.nodeType&&!e.getAttribute("data-mce-bogus")}),me(ue,function(e,i){me(t,function(o){return _(o,i,{},e.similar)?(r[i]||(me(e,function(e){e(!0,{node:o,format:i,parents:t})}),r[i]=e),n[i]=e,!1):!b(o,i)&&void 0})}),me(r,function(i,o){n[o]||(delete r[o],me(i,function(n){n(!1,{node:e.element,format:o,parents:t})}))})})),me(e.split(","),function(e){ue[e]||(ue[e]=[],ue[e].similar=n),ue[e].push(t)}),this}function A(e){return a.getCssText(l,e)}function B(e,t){return D(e,t.inline)?le:D(e,t.block)?le:t.selector?1==e.nodeType&&Q.is(e,t.selector):void 0}function D(e,t){return e=e||"",t=t||"",e=""+(e.nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()==t.toLowerCase()}function L(e,t,n){me(e.childNodes,function(e){M(e)&&(t(e)&&n(e),e.hasChildNodes()&&L(e,t,n))})}function M(e){return 1==e.nodeType&&!he(e)&&!z(e)&&!p(e)}function P(e){return i.curry(function(e,t){return!(!t||!H(t,e))},e)}function O(e,t){return i.curry(function(e,t,n){Q.setStyle(n,e,t)},e,t)}function H(e,t){return I(Q.getStyle(e,t),t)}function I(e,t){return"color"!=t&&"backgroundColor"!=t||(e=Q.toHex(e)),"fontWeight"==t&&700==e&&(e="bold"),"fontFamily"==t&&(e=e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+e}function F(e,t){return"string"!=typeof e?e=e(t):t&&(e=e.replace(/%(\w+)/g,function(e,n){return t[n]||e})),e}function z(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)}function U(e,t,n){var r=Q.create(t,n);return e.parentNode.insertBefore(r,e),r.appendChild(e),r}function W(t,n,r){function i(e){function t(e){return"BR"==e.nodeName&&e.getAttribute("data-mce-bogus")&&!e.nextSibling}var r,i,o,a,s;if(r=i=e?g:y,a=e?"previousSibling":"nextSibling",s=Q.getRoot(),3==r.nodeType&&!z(r)&&(e?v>0:b<r.nodeValue.length))return r;for(;;){if(!n[0].block_expand&&ne(i))return i;for(o=i[a];o;o=o[a])if(!he(o)&&!z(o)&&!t(o))return i;if(i==s||i.parentNode==s){r=i;break}i=i.parentNode}return r}function o(e,t){for(t===ce&&(t=3===e.nodeType?e.length:e.childNodes.length);e&&e.hasChildNodes();)e=e.childNodes[t],e&&(t=3===e.nodeType?e.length:e.childNodes.length);return{node:e,offset:t}}function a(e){for(var t=e;t;){if(1===t.nodeType&&de(t))return"false"===de(t)?t:e;t=t.parentNode}return e}function s(t,n,i){function o(e,t){var n,o,a=e.nodeValue;return"undefined"==typeof t&&(t=i?a.length:0),i?(n=a.lastIndexOf(" ",t),o=a.lastIndexOf("\xa0",t),n=n>o?n:o,n===-1||r||n++):(n=a.indexOf(" ",t),o=a.indexOf("\xa0",t),n=n!==-1&&(o===-1||n<o)?n:o),n}var a,s,u,c;if(3===t.nodeType){if(u=o(t,n),u!==-1)return{container:t,offset:u};c=t}for(a=new e(t,Q.getParent(t,ne)||l.getBody());s=a[i?"prev":"next"]();)if(3===s.nodeType){if(c=s,u=o(s),u!==-1)return{container:s,offset:u}}else if(ne(s))break;if(c)return n=i?0:c.length,{container:c,offset:n}}function c(e,r){var i,o,a,s;for(3==e.nodeType&&0===e.nodeValue.length&&e[r]&&(e=e[r]),i=f(e),o=0;o<i.length;o++)for(a=0;a<n.length;a++)if(s=n[a],!("collapsed"in s&&s.collapsed!==t.collapsed)&&Q.is(i[o],s.selector))return i[o];return e}function d(e,t){var r,i=Q.getRoot();if(n[0].wrapper||(r=Q.getParent(e,n[0].block,i)),r||(r=Q.getParent(3==e.nodeType?e.parentNode:e,function(e){return e!=i&&u(e)})),r&&n[0].wrapper&&(r=f(r,"ul,ol").reverse()[0]||r),!r)for(r=e;r[t]&&!ne(r[t])&&(r=r[t],!D(r,"br")););return r||e}var p,h,m,g=t.startContainer,v=t.startOffset,y=t.endContainer,b=t.endOffset;if(1==g.nodeType&&g.hasChildNodes()&&(p=g.childNodes.length-1,g=g.childNodes[v>p?p:v],3==g.nodeType&&(v=0)),1==y.nodeType&&y.hasChildNodes()&&(p=y.childNodes.length-1,y=y.childNodes[b>p?p:b-1],3==y.nodeType&&(b=y.nodeValue.length)),g=a(g),y=a(y),(he(g.parentNode)||he(g))&&(g=he(g)?g:g.parentNode,g=g.nextSibling||g,3==g.nodeType&&(v=0)),(he(y.parentNode)||he(y))&&(y=he(y)?y:y.parentNode,y=y.previousSibling||y,3==y.nodeType&&(b=y.length)),n[0].inline&&(t.collapsed&&(m=s(g,v,!0),m&&(g=m.container,v=m.offset),m=s(y,b),m&&(y=m.container,b=m.offset)),h=o(y,b),h.node)){for(;h.node&&0===h.offset&&h.node.previousSibling;)h=o(h.node.previousSibling);h.node&&h.offset>0&&3===h.node.nodeType&&" "===h.node.nodeValue.charAt(h.offset-1)&&h.offset>1&&(y=h.node,y.splitText(h.offset-1))}return(n[0].inline||n[0].block_expand)&&(n[0].inline&&3==g.nodeType&&0!==v||(g=i(!0)),n[0].inline&&3==y.nodeType&&b!==y.nodeValue.length||(y=i())),n[0].selector&&n[0].expand!==se&&!n[0].inline&&(g=c(g,"previousSibling"),y=c(y,"nextSibling")),(n[0].block||n[0].selector)&&(g=d(g,"previousSibling"),y=d(y,"nextSibling"),n[0].block&&(ne(g)||(g=i(!0)),ne(y)||(y=i()))),1==g.nodeType&&(v=ie(g),g=g.parentNode),1==y.nodeType&&(b=ie(y)+1,y=y.parentNode),{startContainer:g,startOffset:v,endContainer:y,endOffset:b}}function V(e,t){return t.links&&"A"==e.tagName}function $(e,t,n,r){var i,o,a;if(!B(n,e)&&!V(n,e))return se;if("all"!=e.remove)for(me(e.styles,function(i,o){i=I(F(i,t),o),"number"==typeof o&&(o=i,r=0),(e.remove_similar||!r||D(H(r,o),i))&&Q.setStyle(n,o,""),a=1}),a&&""===Q.getAttrib(n,"style")&&(n.removeAttribute("style"),n.removeAttribute("data-mce-style")),me(e.attributes,function(e,i){var o;if(e=F(e,t),"number"==typeof i&&(i=e,r=0),!r||D(Q.getAttrib(r,i),e)){if("class"==i&&(e=Q.getAttrib(n,i),e&&(o="",me(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(o+=(o?" ":"")+e)}),o)))return void Q.setAttrib(n,i,o);"class"==i&&n.removeAttribute("className"),ae.test(i)&&n.removeAttribute("data-mce-"+i),n.removeAttribute(i)}}),me(e.classes,function(e){e=F(e,t),r&&!Q.hasClass(r,e)||Q.removeClass(n,e)}),o=Q.getAttribs(n),i=0;i<o.length;i++){var s=o[i].nodeName;if(0!==s.indexOf("_")&&0!==s.indexOf("data-"))return se}return"none"!=e.remove?(q(n,e),le):void 0}function q(e,t){function n(e,t,n){return e=j(e,t,n),!e||"BR"==e.nodeName||ne(e)}var r=e.parentNode,i;t.block&&(re?r==Q.getRoot()&&(t.list_block&&D(e,t.list_block)||me(ge(e.childNodes),function(e){te(re,e.nodeName.toLowerCase())?i?i.appendChild(e):(i=U(e,re),Q.setAttribs(i,l.settings.forced_root_block_attrs)):i=0})):ne(e)&&!ne(r)&&(n(e,se)||n(e.firstChild,le,1)||e.insertBefore(Q.create("br"),e.firstChild),n(e,le)||n(e.lastChild,se,1)||e.appendChild(Q.create("br")))),t.selector&&t.inline&&!D(t.inline,e)||Q.remove(e,1)}function j(e,t,n){if(e)for(t=t?"nextSibling":"previousSibling",e=n?e:e[t];e;e=e[t])if(1==e.nodeType||!z(e))return e}function Y(e,t){function n(e,t){for(i=e;i;i=i[t]){if(3==i.nodeType&&0!==i.nodeValue.length)return e;if(1==i.nodeType&&!he(i))return i}return e}var i,o,a=new r(Q);if(e&&t&&(e=n(e,"previousSibling"),t=n(t,"nextSibling"),a.compare(e,t))){for(i=e.nextSibling;i&&i!=t;)o=i,i=i.nextSibling,e.appendChild(o);return Q.remove(t),me(ge(t.childNodes),function(t){e.appendChild(t)}),e}return t}function X(t,n){var r,i,o;return r=t[n?"startContainer":"endContainer"],i=t[n?"startOffset":"endOffset"],1==r.nodeType&&(o=r.childNodes.length-1,!n&&i&&i--,r=r.childNodes[i>o?o:i]),3===r.nodeType&&n&&i>=r.nodeValue.length&&(r=new e(r,l.getBody()).next()||r),3!==r.nodeType||n||0!==i||(r=new e(r,l.getBody()).prev()||r),r}function K(t,n,r,i){function o(e){var t=Q.create("span",{id:m,"data-mce-bogus":!0,style:v?"color:red":""});return e&&t.appendChild(l.getDoc().createTextNode(oe)),t}function a(e,t){for(;e;){if(3===e.nodeType&&e.nodeValue!==oe||e.childNodes.length>1)return!1;t&&1===e.nodeType&&t.push(e),e=e.firstChild}return!0}function s(e){for(;e;){if(e.id===m)return e;e=e.parentNode}}function c(t){var n;if(t)for(n=new e(t,t),t=n.current();t;t=n.next())if(3===t.nodeType)return t}function d(e,t){var n,r;if(e)r=Z.getRng(!0),a(e)?(t!==!1&&(r.setStartBefore(e),r.setEndBefore(e)),Q.remove(e)):(n=c(e),n.nodeValue.charAt(0)===oe&&(n.deleteData(0,1),r.startContainer==n&&r.startOffset>0&&r.setStart(n,r.startOffset-1),r.endContainer==n&&r.endOffset>0&&r.setEnd(n,r.endOffset-1)),Q.remove(e,1)),Z.setRng(r);else if(e=s(Z.getStart()),!e)for(;e=Q.get(m);)d(e,!1)}function f(){var e,t,i,a,l,u,d;e=Z.getRng(!0),a=e.startOffset,u=e.startContainer,d=u.nodeValue,t=s(Z.getStart()),t&&(i=c(t));var f=/[^\s\u00a0\u00ad\u200b\ufeff]/;d&&a>0&&a<d.length&&f.test(d.charAt(a))&&f.test(d.charAt(a-1))?(l=Z.getBookmark(),e.collapse(!0),e=W(e,g(n)),e=ee.split(e),w(n,r,e),Z.moveToBookmark(l)):(t&&i.nodeValue===oe?w(n,r,t):(t=o(!0),i=t.firstChild,e.insertNode(t),a=1,w(n,r,t)),Z.setCursorLocation(i,a))}function p(){var e=Z.getRng(!0),t,a,s,l,c,d,f=[],p,h;for(t=e.startContainer,a=e.startOffset,c=t,3==t.nodeType&&(a!=t.nodeValue.length&&(l=!0),c=c.parentNode);c;){if(_(c,n,r,i)){d=c;break}c.nextSibling&&(l=!0),f.push(c),c=c.parentNode}if(d)if(l)s=Z.getBookmark(),e.collapse(!0),e=W(e,g(n),!0),e=ee.split(e),E(n,r,e),Z.moveToBookmark(s);else{for(h=o(),c=h,p=f.length-1;p>=0;p--)c.appendChild(Q.clone(f[p],!1)),c=c.firstChild;c.appendChild(Q.doc.createTextNode(oe)),c=c.firstChild;var m=Q.getParent(d,u);m&&Q.isEmpty(m)?d.parentNode.replaceChild(h,d):Q.insertAfter(h,d),Z.setCursorLocation(c,1),Q.isEmpty(d)&&Q.remove(d)}}function h(){var e;e=s(Z.getStart()),e&&!Q.isEmpty(e)&&ve(e,function(e){1!=e.nodeType||e.id===m||Q.isEmpty(e)||Q.setAttrib(e,"data-mce-bogus",null)},"childNodes")}var m="_mce_caret",v=l.settings.caret_debug;l._hasCaretEvents||(pe=function(){var e=[],t;if(a(s(Z.getStart()),e))for(t=e.length;t--;)Q.setAttrib(e[t],"data-mce-bogus","1")},fe=function(e){var t=e.keyCode;d(),8==t&&Z.isCollapsed()&&Z.getStart().innerHTML==oe&&d(s(Z.getStart())),37!=t&&39!=t||d(s(Z.getStart())),h()},l.on("SetContent",function(e){e.selection&&h()}),l._hasCaretEvents=!0),"apply"==t?f():p()}function G(t){var n=t.startContainer,r=t.startOffset,i,o,a,s,l;if((t.startContainer!=t.endContainer||!d(t.startContainer.childNodes[t.startOffset]))&&(3==n.nodeType&&r>=n.nodeValue.length&&(r=ie(n),n=n.parentNode,i=!0),1==n.nodeType))for(s=n.childNodes,n=s[Math.min(r,s.length-1)],o=new e(n,Q.getParent(n,Q.isBlock)),(r>s.length-1||i)&&o.next(),a=o.current();a;a=o.next())if(3==a.nodeType&&!z(a))return l=Q.create("a",{"data-mce-bogus":"all"},oe),a.parentNode.insertBefore(l,a),t.setStart(a,0),Z.setRng(t),void Q.remove(l)}var J={},Q=l.dom,Z=l.selection,ee=new t(Q),te=l.schema.isValidChild,ne=Q.isBlock,re=l.settings.forced_root_block,ie=Q.nodeIndex,oe="\ufeff",ae=/^(src|href|style)$/,se=!1,le=!0,ue,ce,de=Q.getContentEditable,fe,pe,he=n.isBookmarkNode,me=o.each,ge=o.grep,ve=o.walk,ye=o.extend;ye(this,{get:g,register:v,unregister:y,apply:w,remove:E,toggle:N,match:S,matchAll:k,matchNode:_,canApply:T,formatChanged:R,getCssText:A}),h(),m(),l.on("BeforeGetContent",function(e){pe&&"raw"!=e.format&&pe()}),l.on("mouseup keydown",function(e){fe&&fe(e)})}}),r(Q,[],function(){var e=0,t=1,n=2,r=function(r,i){var o=r.length+i.length+2,a=new Array(o),s=new Array(o),l=function(e,t,n){return{start:e,end:t,diag:n}},u=function(o,a,s,l,c){var f=d(o,a,s,l);if(null===f||f.start===a&&f.diag===a-l||f.end===o&&f.diag===o-s)for(var p=o,h=s;p<a||h<l;)p<a&&h<l&&r[p]===i[h]?(c.push([e,r[p]]),++p,++h):a-o>l-s?(c.push([n,r[p]]),++p):(c.push([t,i[h]]),++h);else{u(o,f.start,s,f.start-f.diag,c);for(var m=f.start;m<f.end;++m)c.push([e,r[m]]);u(f.end,a,f.end-f.diag,l,c)}},c=function(e,t,n,o){for(var a=e;a-t<o&&a<n&&r[a]===i[a-t];)++a;return l(e,a,t)},d=function(e,t,n,o){var l=t-e,u=o-n;if(0===l||0===u)return null;var d=l-u,f=u+l,p=(f%2===0?f:f+1)/2;a[1+p]=e,s[1+p]=t+1;for(var h=0;h<=p;++h){for(var m=-h;m<=h;m+=2){var g=m+p;m===-h||m!=h&&a[g-1]<a[g+1]?a[g]=a[g+1]:a[g]=a[g-1]+1;for(var v=a[g],y=v-e+n-m;v<t&&y<o&&r[v]===i[y];)a[g]=++v,++y;if(d%2!=0&&d-h<=m&&m<=d+h&&s[g-d]<=a[g])return c(s[g-d],m+e-n,t,o)}for(m=d-h;m<=d+h;m+=2){for(g=m+p-d,m===d-h||m!=d+h&&s[g+1]<=s[g-1]?s[g]=s[g+1]-1:s[g]=s[g-1],v=s[g]-1,y=v-e+n-m;v>=e&&y>=n&&r[v]===i[y];)s[g]=v--,y--;if(d%2===0&&-h<=m&&m<=h&&s[g]<=a[g+d])return c(s[g],m+e-n,t,o)}}},f=[];return u(0,r.length,0,i.length,f),f};return{KEEP:e,DELETE:n,INSERT:t,diff:r}}),r(Z,[h,C,Q],function(e,t,n){var r=function(e){return 1===e.nodeType?e.outerHTML:3===e.nodeType?t.encodeRaw(e.data,!1):8===e.nodeType?"<!--"+e.data+"-->":""},i=function(e){var t,n,r;for(r=document.createElement("div"),t=document.createDocumentFragment(),e&&(r.innerHTML=e);n=r.firstChild;)t.appendChild(n);return t},o=function(e,t,n){var r=i(t);if(e.hasChildNodes()&&n<e.childNodes.length){var o=e.childNodes[n];o.parentNode.insertBefore(r,o)}else e.appendChild(r)},a=function(e,t){if(e.hasChildNodes()&&t<e.childNodes.length){var n=e.childNodes[t];n.parentNode.removeChild(n)}},s=function(t,r){var i=0;e.each(t,function(e){e[0]===n.KEEP?i++:e[0]===n.INSERT?(o(r,e[1],i),i++):e[0]===n.DELETE&&a(r,i)})},l=function(t){return e.map(t.childNodes,r)},u=function(t,i){var o=e.map(i.childNodes,r);return s(n.diff(o,t),i),i};return{read:l,write:u}}),r(ee,[h,Z],function(e,t){var n=function(e){return e.indexOf("</iframe>")!==-1},r=function(e){return{type:"fragmented",fragments:e,content:"",bookmark:null,beforeBookmark:null}},i=function(e){return{type:"complete",fragments:null,content:e,bookmark:null,beforeBookmark:null}},o=function(o){var a,s,l;return a=t.read(o.getBody()),l=e.map(a,function(e){return o.serializer.trimContent(e)}),s=l.join(""),n(s)?r(l):i(s)},a=function(e,n,r){"fragmented"===n.type?t.write(n.fragments,e.getBody()):e.setContent(n.content,{format:"raw"}),e.selection.moveToBookmark(r?n.beforeBookmark:n.bookmark)},s=function(e){return"fragmented"===e.type?e.fragments.join(""):e.content},l=function(e,t){return s(e)===s(t)};return{createFragmentedLevel:r,createCompleteLevel:i,createFromEditor:o,applyToEditor:a,isEq:l}}),r(te,[I,m,ee],function(e,t,n){return function(e){function r(t){e.setDirty(t)}function i(e){a.typing=!1,a.add({},e)}function o(){a.typing&&(a.typing=!1,a.add())}var a=this,s=0,l=[],u,c,d=0;return e.on("init",function(){a.add()}),e.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!==t&&"Redo"!==t&&"mceRepaint"!==t&&(o(),a.beforeChange())}),e.on("ExecCommand",function(e){var t=e.command;"Undo"!==t&&"Redo"!==t&&"mceRepaint"!==t&&i(e)}),e.on("ObjectResizeStart Cut",function(){a.beforeChange()}),e.on("SaveContent ObjectResized blur",i),e.on("DragEnd",i),e.on("KeyUp",function(t){var o=t.keyCode;t.isDefaultPrevented()||((o>=33&&o<=36||o>=37&&o<=40||45===o||t.ctrlKey)&&(i(),e.nodeChanged()),46!==o&&8!==o||e.nodeChanged(),c&&a.typing&&(e.isDirty()||(r(l[0]&&!n.isEq(n.createFromEditor(e),l[0])),e.isDirty()&&e.fire("change",{level:l[0],lastLevel:null})),e.fire("TypingUndo"),c=!1,e.nodeChanged()))}),e.on("KeyDown",function(e){var t=e.keyCode;if(!e.isDefaultPrevented()){if(t>=33&&t<=36||t>=37&&t<=40||45===t)return void(a.typing&&i(e));var n=e.ctrlKey&&!e.altKey||e.metaKey;!(t<16||t>20)||224===t||91===t||a.typing||n||(a.beforeChange(),a.typing=!0,a.add({},e),c=!0)}}),e.on("MouseDown",function(e){a.typing&&i(e)}),e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo"),e.on("AddUndo Undo Redo ClearUndos",function(t){t.isDefaultPrevented()||e.nodeChanged()}),a={data:l,typing:!1,beforeChange:function(){d||(u=e.selection.getBookmark(2,!0))},add:function(i,o){var a,c=e.settings,f,p;if(p=n.createFromEditor(e),i=i||{},i=t.extend(i,p),d||e.removed)return null;if(f=l[s],e.fire("BeforeAddUndo",{level:i,lastLevel:f,originalEvent:o}).isDefaultPrevented())return null;if(f&&n.isEq(f,i))return null;if(l[s]&&(l[s].beforeBookmark=u),c.custom_undo_redo_levels&&l.length>c.custom_undo_redo_levels){for(a=0;a<l.length-1;a++)l[a]=l[a+1];l.length--,s=l.length}i.bookmark=e.selection.getBookmark(2,!0),s<l.length-1&&(l.length=s+1),l.push(i),s=l.length-1;var h={level:i,lastLevel:f,originalEvent:o};return e.fire("AddUndo",h),s>0&&(r(!0),e.fire("change",h)),i},undo:function(){var t;return a.typing&&(a.add(),a.typing=!1),s>0&&(t=l[--s],n.applyToEditor(e,t,!0),r(!0),e.fire("undo",{level:t})),t},redo:function(){var t;return s<l.length-1&&(t=l[++s],n.applyToEditor(e,t,!1),r(!0),e.fire("redo",{level:t})),t},clear:function(){l=[],s=0,a.typing=!1,a.data=l,e.fire("ClearUndos")},hasUndo:function(){return s>0||a.typing&&l[0]&&!n.isEq(n.createFromEditor(e),l[0])},hasRedo:function(){return s<l.length-1&&!a.typing},transact:function(e){o(),a.beforeChange();try{d++,e()}finally{d--}return a.add()},extra:function(t,r){var i,o;a.transact(t)&&(o=l[s].bookmark,i=l[s-1],n.applyToEditor(e,i,!0),a.transact(r)&&(l[s-1].beforeBookmark=o))}}}}),r(ne,[y,T,k,d],function(e,t,n,r){var i=r.ie&&r.ie<11;return function(o){function a(a){function h(e){return e&&s.isBlock(e)&&!/^(TD|TH|CAPTION|FORM)$/.test(e.nodeName)&&!/^(fixed|absolute)/i.test(e.style.position)&&"true"!==s.getContentEditable(e)}function m(e){return e&&/^(TD|TH|CAPTION)$/.test(e.nodeName)}function g(e){var t;s.isBlock(e)&&(t=l.getRng(),e.appendChild(s.create("span",null,"\xa0")),l.select(e),e.lastChild.outerHTML="",l.setRng(t))}function v(e){var t=e,n=[],r;if(t){for(;t=t.firstChild;){if(s.isBlock(t))return;1!=t.nodeType||f[t.nodeName.toLowerCase()]||n.push(t)}for(r=n.length;r--;)t=n[r],!t.hasChildNodes()||t.firstChild==t.lastChild&&""===t.firstChild.nodeValue?s.remove(t):"A"==t.nodeName&&" "===(t.innerText||t.textContent)&&s.remove(t)}}function y(t){function n(e){for(;e;){if(1==e.nodeType||3==e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}var i,o,a,u=t,c;if(t){if(r.ie&&r.ie<9&&P&&P.firstChild&&P.firstChild==P.lastChild&&"BR"==P.firstChild.tagName&&s.remove(P.firstChild),/^(LI|DT|DD)$/.test(t.nodeName)){var d=n(t.firstChild);d&&/^(UL|OL|DL)$/.test(d.nodeName)&&t.insertBefore(s.doc.createTextNode("\xa0"),t.firstChild)}if(a=s.createRng(),r.ie||t.normalize(),t.hasChildNodes()){for(i=new e(t,t);o=i.current();){if(3==o.nodeType){a.setStart(o,0),a.setEnd(o,0);break}if(p[o.nodeName.toLowerCase()]){a.setStartBefore(o),a.setEndBefore(o);break}u=o,o=i.next()}o||(a.setStart(u,0),a.setEnd(u,0))}else"BR"==t.nodeName?t.nextSibling&&s.isBlock(t.nextSibling)?((!O||O<9)&&(c=s.create("br"),t.parentNode.insertBefore(c,t)),a.setStartBefore(t),a.setEndBefore(t)):(a.setStartAfter(t),a.setEndAfter(t)):(a.setStart(t,0),a.setEnd(t,0));l.setRng(a),s.remove(c),l.scrollIntoView(t)}}function b(e){var t=u.forced_root_block;t&&t.toLowerCase()===e.tagName.toLowerCase()&&s.setAttribs(e,u.forced_root_block_attrs)}function C(e){e.innerHTML=i?"":'<br data-mce-bogus="1">'}function x(e){var t=L,n,r,o,a=d.getTextInlineElements();if(e||"TABLE"==U?(n=s.create(e||V),b(n)):n=P.cloneNode(!1),o=n,u.keep_styles!==!1)do if(a[t.nodeName]){if("_mce_caret"==t.id)continue;r=t.cloneNode(!1),s.setAttrib(r,"id",""),n.hasChildNodes()?(r.appendChild(n.firstChild),n.appendChild(r)):(o=r,n.appendChild(r))}while((t=t.parentNode)&&t!=D);return i||(o.innerHTML='<br data-mce-bogus="1">'),n}function w(t){var n,r,i;if(3==L.nodeType&&(t?M>0:M<L.nodeValue.length))return!1;if(L.parentNode==P&&$&&!t)return!0;if(t&&1==L.nodeType&&L==P.firstChild)return!0;if("TABLE"===L.nodeName||L.previousSibling&&"TABLE"==L.previousSibling.nodeName)return $&&!t||!$&&t;for(n=new e(L,P),3==L.nodeType&&(t&&0===M?n.prev():t||M!=L.nodeValue.length||n.next());r=n.current();){if(1===r.nodeType){if(!r.getAttribute("data-mce-bogus")&&(i=r.nodeName.toLowerCase(),f[i]&&"br"!==i))return!1}else if(3===r.nodeType&&!/^[ \t\r\n]*$/.test(r.nodeValue))return!1;t?n.prev():n.next()}return!0}function E(e,t){var n,r,i,a,l,u,c=V||"P";if(r=s.getParent(e,s.isBlock),!r||!h(r)){if(r=r||D,u=r==o.getBody()||m(r)?r.nodeName.toLowerCase():r.parentNode.nodeName.toLowerCase(),!r.hasChildNodes())return n=s.create(c),b(n),r.appendChild(n),A.setStart(n,0),A.setEnd(n,0),n;for(a=e;a.parentNode!=r;)a=a.parentNode;for(;a&&!s.isBlock(a);)i=a,a=a.previousSibling;if(i&&d.isValidChild(u,c.toLowerCase())){for(n=s.create(c),b(n),i.parentNode.insertBefore(n,i),a=i;a&&!s.isBlock(a);)l=a.nextSibling,n.appendChild(a),a=l;A.setStart(e,t),A.setEnd(e,t)}}return e}function N(){function e(e){for(var t=z[e?"firstChild":"lastChild"];t&&1!=t.nodeType;)t=t[e?"nextSibling":"previousSibling"];return t===P}function t(){var e=z.parentNode;return/^(LI|DT|DD)$/.test(e.nodeName)?e:z}if(z!=o.getBody()){var n=z.parentNode.nodeName;/^(OL|UL|LI)$/.test(n)&&(V="LI"),I=V?x(V):s.create("BR"),e(!0)&&e()?"LI"==n?s.insertAfter(I,t()):s.replace(I,z):e(!0)?"LI"==n?(s.insertAfter(I,t()),I.appendChild(s.doc.createTextNode(" ")),I.appendChild(z)):z.parentNode.insertBefore(I,z):e()?(s.insertAfter(I,t()),g(I)):(z=t(),B=A.cloneRange(),B.setStartAfter(P),B.setEndAfter(z),F=B.extractContents(),"LI"==V&&"LI"==F.firstChild.nodeName?(I=F.firstChild,s.insertAfter(F,z)):(s.insertAfter(F,z),s.insertAfter(I,z))),s.remove(P),y(I),c.add()}}function _(){o.execCommand("InsertLineBreak",!1,a)}function S(e){do 3===e.nodeType&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;while(e)}function k(e){var t=s.getRoot(),n,r;for(n=e;n!==t&&"false"!==s.getContentEditable(n);)"true"===s.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==t?r:t}function T(e){var t;i||(e.normalize(),t=e.lastChild,t&&!/^(left|right)$/gi.test(s.getStyle(t,"float",!0))||s.add(e,"br"))}function R(){I=/^(H[1-6]|PRE|FIGURE)$/.test(U)&&"HGROUP"!=W?x(V):x(),u.end_container_on_empty_block&&h(z)&&s.isEmpty(P)?I=s.split(z,P):s.insertAfter(I,P),y(I)}var A,B,D,L,M,P,O,H,I,F,z,U,W,V,$;if(A=l.getRng(!0),!a.isDefaultPrevented()){if(!A.collapsed)return void o.execCommand("Delete");if(new t(s).normalize(A),L=A.startContainer,M=A.startOffset,V=(u.force_p_newlines?"p":"")||u.forced_root_block,V=V?V.toUpperCase():"",O=s.doc.documentMode,H=a.shiftKey,1==L.nodeType&&L.hasChildNodes()&&($=M>L.childNodes.length-1,L=L.childNodes[Math.min(M,L.childNodes.length-1)]||L,M=$&&3==L.nodeType?L.nodeValue.length:0),D=k(L)){if(c.beforeChange(),!s.isBlock(D)&&D!=s.getRoot())return void(V&&!H||_());if((V&&!H||!V&&H)&&(L=E(L,M)),P=s.getParent(L,s.isBlock),z=P?s.getParent(P.parentNode,s.isBlock):null,U=P?P.nodeName.toUpperCase():"",W=z?z.nodeName.toUpperCase():"","LI"!=W||a.ctrlKey||(P=z,U=W),o.undoManager.typing&&(o.undoManager.typing=!1,o.undoManager.add()),/^(LI|DT|DD)$/.test(U)){if(!V&&H)return void _();if(s.isEmpty(P))return void N()}if("PRE"==U&&u.br_in_pre!==!1){if(!H)return void _()}else if(!V&&!H&&"LI"!=U||V&&H)return void _();V&&P===o.getBody()||(V=V||"P",n.isCaretContainerBlock(P)?(I=n.showCaretContainerBlock(P),s.isEmpty(P)&&C(P),y(I)):w()?R():w(!0)?(I=P.parentNode.insertBefore(x(),P),g(I),y(P)):(B=A.cloneRange(),B.setEndAfter(P),F=B.extractContents(),S(F),I=F.firstChild,s.insertAfter(F,P),v(I),T(P),s.isEmpty(P)&&C(P),I.normalize(),s.isEmpty(I)?(s.remove(I),R()):y(I)),s.setAttrib(I,"id",""),o.fire("NewBlock",{newBlock:I}),c.typing=!1,c.add())}}}var s=o.dom,l=o.selection,u=o.settings,c=o.undoManager,d=o.schema,f=d.getNonEmptyElements(),p=d.getMoveCaretBeforeOnEnterElements();o.on("keydown",function(e){13==e.keyCode&&a(e)!==!1&&e.preventDefault()})}}),r(re,[],function(){return function(e){function t(){var t=i.getStart(),s=e.getBody(),l,u,c,d,f,p,h,m=-16777215,g,v,y,b,C;if(C=n.forced_root_block,t&&1===t.nodeType&&C){for(;t&&t!=s;){if(a[t.nodeName])return;t=t.parentNode}if(l=i.getRng(),l.setStart){u=l.startContainer,c=l.startOffset,d=l.endContainer,f=l.endOffset;try{v=e.getDoc().activeElement===s}catch(x){}}else l.item&&(t=l.item(0),l=e.getDoc().body.createTextRange(),l.moveToElementText(t)),v=l.parentElement().ownerDocument===e.getDoc(),y=l.duplicate(),y.collapse(!0),c=y.move("character",m)*-1,y.collapsed||(y=l.duplicate(),y.collapse(!1),f=y.move("character",m)*-1-c);for(t=s.firstChild,b=s.nodeName.toLowerCase();t;)if((3===t.nodeType||1==t.nodeType&&!a[t.nodeName])&&o.isValidChild(b,C.toLowerCase())){if(3===t.nodeType&&0===t.nodeValue.length){h=t,t=t.nextSibling,r.remove(h);continue}p||(p=r.create(C,e.settings.forced_root_block_attrs),
+t.parentNode.insertBefore(p,t),g=!0),h=t,t=t.nextSibling,p.appendChild(h)}else p=null,t=t.nextSibling;if(g&&v){if(l.setStart)l.setStart(u,c),l.setEnd(d,f),i.setRng(l);else try{l=e.getDoc().body.createTextRange(),l.moveToElementText(s),l.collapse(!0),l.moveStart("character",c),f>0&&l.moveEnd("character",f),l.select()}catch(x){}e.nodeChanged()}}}var n=e.settings,r=e.dom,i=e.selection,o=e.schema,a=o.getBlockElements();n.forced_root_block&&e.on("NodeChange",t)}}),r(ie,[z,y,_,$,k,U],function(e,t,n,r,i,o){function a(e){return e>0}function s(e){return e<0}function l(e,t){for(var n;n=e(t);)if(!N(n))return n;return null}function u(e,n,r,i,o){var u=new t(e,i);if(s(n)){if((x(e)||N(e))&&(e=l(u.prev,!0),r(e)))return e;for(;e=l(u.prev,o);)if(r(e))return e}if(a(n)){if((x(e)||N(e))&&(e=l(u.next,!0),r(e)))return e;for(;e=l(u.next,o);)if(r(e))return e}return null}function c(e,t){for(e=e.parentNode;e&&e!=t;e=e.parentNode)if(C(e))return e;return t}function d(e,t){for(;e&&e!=t;){if(w(e))return e;e=e.parentNode}return null}function f(e,t,n){return d(e.container(),n)==d(t.container(),n)}function p(e,t,n){return c(e.container(),n)==c(t.container(),n)}function h(e,t){var n,r;return t?(n=t.container(),r=t.offset(),S(n)?n.childNodes[r+e]:null):null}function m(e,t){var n=t.ownerDocument.createRange();return e?(n.setStartBefore(t),n.setEndBefore(t)):(n.setStartAfter(t),n.setEndAfter(t)),n}function g(e,t,n){return d(t,e)==d(n,e)}function v(e,t,n){var r,i;for(i=e?"previousSibling":"nextSibling";n&&n!=t;){if(r=n[i],E(r)&&(r=r[i]),x(r)){if(g(t,r,n))return r;break}if(k(r))break;n=n.parentNode}return null}function y(e,t,r){var o,a,s,l,u=_(v,!0,t),c=_(v,!1,t);if(a=r.startContainer,s=r.startOffset,i.isCaretContainerBlock(a)){if(S(a)||(a=a.parentNode),l=a.getAttribute("data-mce-caret"),"before"==l&&(o=a.nextSibling,x(o)))return T(o);if("after"==l&&(o=a.previousSibling,x(o)))return R(o)}if(!r.collapsed)return r;if(n.isText(a)){if(E(a)){if(1===e){if(o=c(a))return T(o);if(o=u(a))return R(o)}if(e===-1){if(o=u(a))return R(o);if(o=c(a))return T(o)}return r}if(i.endsWithCaretContainer(a)&&s>=a.data.length-1)return 1===e&&(o=c(a))?T(o):r;if(i.startsWithCaretContainer(a)&&s<=1)return e===-1&&(o=u(a))?R(o):r;if(s===a.data.length)return o=c(a),o?T(o):r;if(0===s)return o=u(a),o?R(o):r}return r}function b(e,t){return x(h(e,t))}var C=n.isContentEditableTrue,x=n.isContentEditableFalse,w=n.matchStyleValues("display","block table table-cell table-caption"),E=i.isCaretContainer,N=i.isCaretContainerBlock,_=e.curry,S=n.isElement,k=o.isCaretCandidate,T=_(m,!0),R=_(m,!1);return{isForwards:a,isBackwards:s,findNode:u,getEditingHost:c,getParentBlock:d,isInSameBlock:f,isInSameEditingHost:p,isBeforeContentEditableFalse:_(b,0),isAfterContentEditableFalse:_(b,-1),normalizeRange:y}}),r(oe,[_,U,$,ie,h,z],function(e,t,n,r,i,o){function a(e,t){for(var n=[];e&&e!=t;)n.push(e),e=e.parentNode;return n}function s(e,t){return e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null}function l(e,t){if(m(e)){if(v(t.previousSibling)&&!f(t.previousSibling))return n.before(t);if(f(t))return n(t,0)}if(g(e)){if(v(t.nextSibling)&&!f(t.nextSibling))return n.after(t);if(f(t))return n(t,t.data.length)}return g(e)?h(t)?n.before(t):n.after(t):n.before(t)}function u(t,i){var o;return!!e.isBr(t)&&(o=c(1,n.after(t),i),!!o&&!r.isInSameBlock(n.before(t),n.before(o),i))}function c(e,t,h){var C,x,w,E,N,_,S;if(!p(h)||!t)return null;if(S=t,C=S.container(),x=S.offset(),f(C)){if(g(e)&&x>0)return n(C,--x);if(m(e)&&x<C.length)return n(C,++x);w=C}else{if(g(e)&&x>0&&(E=s(C,x-1),v(E)))return!y(E)&&(N=r.findNode(E,e,b,E))?f(N)?n(N,N.data.length):n.after(N):f(E)?n(E,E.data.length):n.before(E);if(m(e)&&x<C.childNodes.length&&(E=s(C,x),v(E)))return u(E,h)?c(e,n.after(E),h):!y(E)&&(N=r.findNode(E,e,b,E))?f(N)?n(N,0):n.before(N):f(E)?n(E,0):n.after(E);w=S.getNode()}return(m(e)&&S.isAtEnd()||g(e)&&S.isAtStart())&&(w=r.findNode(w,e,o.constant(!0),h,!0),b(w))?l(e,w):(E=r.findNode(w,e,b,h),_=i.last(i.filter(a(C,h),d)),!_||E&&_.contains(E)?E?l(e,E):null:S=m(e)?n.after(_):n.before(_))}var d=e.isContentEditableFalse,f=e.isText,p=e.isElement,h=e.isBr,m=r.isForwards,g=r.isBackwards,v=t.isCaretCandidate,y=t.isAtomic,b=t.isEditableCaretCandidate;return function(e){return{next:function(t){return c(1,t,e)},prev:function(t){return c(-1,t,e)}}}}),r(ae,[m,oe,$],function(e,t,n){var r=function(e){var t=e.firstChild,n=e.lastChild;return t&&"meta"===t.name&&(t=t.next),n&&"mce_marker"===n.attr("id")&&(n=n.prev),!(!t||t!==n)&&("ul"===t.name||"ol"===t.name)},i=function(e){var t=e.firstChild,n=e.lastChild;return t&&"META"===t.nodeName&&t.parentNode.removeChild(t),n&&"mce_marker"===n.id&&n.parentNode.removeChild(n),e},o=function(e,t,n){var r=t.serialize(n),o=e.createFragment(r);return i(o)},a=function(t){return e.grep(t.childNodes,function(e){return"LI"===e.nodeName})},s=function(e){return!e.firstChild},l=function(e){return e.length>0&&s(e[e.length-1])?e.slice(0,-1):e},u=function(e,t){var n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},c=function(e,t){return!!u(e,t)},d=function(e,t){var n=t.cloneRange(),r=t.cloneRange();return n.setStartBefore(e),r.setEndAfter(e),[n.cloneContents(),r.cloneContents()]},f=function(e,r){var i=n.before(e),o=new t(r),a=o.next(i);return a?a.toRange():null},p=function(e,r){var i=n.after(e),o=new t(r),a=o.prev(i);return a?a.toRange():null},h=function(t,n,r,i){var o=d(t,i),a=t.parentNode;return a.insertBefore(o[0],t),e.each(n,function(e){a.insertBefore(e,t)}),a.insertBefore(o[1],t),a.removeChild(t),p(n[n.length-1],r)},m=function(t,n,r){var i=t.parentNode;return e.each(n,function(e){i.insertBefore(e,t)}),f(t,r)},g=function(e,t,n,r){return r.insertAfter(t.reverse(),e),p(t[0],n)},v=function(e,r,i,s){var c=o(r,e,s),d=u(r,i.startContainer),f=l(a(c.firstChild)),p=1,v=2,y=r.getRoot(),b=function(e){var o=n.fromRangeStart(i),a=new t(r.getRoot()),s=e===p?a.prev(o):a.next(o);return!s||u(r,s.getNode())!==d};return b(p)?m(d,f,y):b(v)?g(d,f,y,r):h(d,f,y,i)};return{isListFragment:r,insertAtCaret:v,isParentBlockLi:c,trimListItems:l,listItems:a}}),r(se,[d,m,P,oe,$,X,_,ae],function(e,t,n,r,i,o,a,s){var l=a.matchNodeNames("td th"),u=function(e,t,n){if("all"===n.getAttribute("data-mce-bogus"))n.parentNode.insertBefore(e.dom.createFragment(t),n);else{var r=n.firstChild,i=n.lastChild;!r||r===i&&"BR"===r.nodeName?e.dom.setHTML(n,t):e.selection.setContent(t)}},c=function(a,c,d){function f(e){function t(e){return r[e]&&3==r[e].nodeType}var n,r,i;return n=L.getRng(!0),r=n.startContainer,i=n.startOffset,3==r.nodeType&&(i>0?e=e.replace(/^&nbsp;/," "):t("previousSibling")||(e=e.replace(/^ /,"&nbsp;")),i<r.length?e=e.replace(/&nbsp;(<br>|)$/," "):t("nextSibling")||(e=e.replace(/(&nbsp;| )(<br>|)$/,"&nbsp;"))),e}function p(){var e,t,n;e=L.getRng(!0),t=e.startContainer,n=e.startOffset,3==t.nodeType&&e.collapsed&&("\xa0"===t.data[n]?(t.deleteData(n,1),/[\u00a0| ]$/.test(c)||(c+=" ")):"\xa0"===t.data[n-1]&&(t.deleteData(n-1,1),/[\u00a0| ]$/.test(c)||(c=" "+c)))}function h(){if(B){var e=a.getBody(),n=new o(M);t.each(M.select("*[data-mce-fragment]"),function(t){for(var r=t.parentNode;r&&r!=e;r=r.parentNode)D[t.nodeName.toLowerCase()]&&n.compare(r,t)&&M.remove(t,!0)})}}function m(e){for(var t=e;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")}function g(e){t.each(e.getElementsByTagName("*"),function(e){e.removeAttribute("data-mce-fragment")})}function v(e){return!!e.getAttribute("data-mce-fragment")}function y(e){return e&&!a.schema.getShortEndedElements()[e.nodeName]}function b(t){function n(e){for(var t=a.getBody();e&&e!==t;e=e.parentNode)if("false"===a.dom.getContentEditable(e))return e;return null}function o(e){var t=i.fromRangeStart(e),n=new r(a.getBody());if(t=n.next(t))return t.toRange()}var s,u,c;if(t){if(L.scrollIntoView(t),s=n(t))return M.remove(t),void L.select(s);k=M.createRng(),T=t.previousSibling,T&&3==T.nodeType?(k.setStart(T,T.nodeValue.length),e.ie||(R=t.nextSibling,R&&3==R.nodeType&&(T.appendData(R.data),R.parentNode.removeChild(R)))):(k.setStartBefore(t),k.setEndBefore(t)),u=M.getParent(t,M.isBlock),M.remove(t),u&&M.isEmpty(u)&&(a.$(u).empty(),k.setStart(u,0),k.setEnd(u,0),l(u)||v(u)||!(c=o(k))?M.add(u,M.create("br",{"data-mce-bogus":"1"})):(k=c,M.remove(u))),L.setRng(k)}}var C,x,w,E,N,_,S,k,T,R,A,B,D=a.schema.getTextInlineElements(),L=a.selection,M=a.dom;/^ | $/.test(c)&&(c=f(c)),C=a.parser,B=d.merge,x=new n({validate:a.settings.validate},a.schema),A='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;&#x200B;</span>',_={content:c,format:"html",selection:!0},a.fire("BeforeSetContent",_),c=_.content,c.indexOf("{$caret}")==-1&&(c+="{$caret}"),c=c.replace(/\{\$caret\}/,A),k=L.getRng();var P=k.startContainer||(k.parentElement?k.parentElement():null),O=a.getBody();P===O&&L.isCollapsed()&&M.isBlock(O.firstChild)&&y(O.firstChild)&&M.isEmpty(O.firstChild)&&(k=M.createRng(),k.setStart(O.firstChild,0),k.setEnd(O.firstChild,0),L.setRng(k)),L.isCollapsed()||(a.selection.setRng(a.selection.getRng()),a.getDoc().execCommand("Delete",!1,null),p()),w=L.getNode();var H={context:w.nodeName.toLowerCase(),data:d.data};if(N=C.parse(c,H),d.paste===!0&&s.isListFragment(N)&&s.isParentBlockLi(M,w))return k=s.insertAtCaret(x,M,a.selection.getRng(!0),N),a.selection.setRng(k),void a.fire("SetContent",_);if(m(N),T=N.lastChild,"mce_marker"==T.attr("id"))for(S=T,T=T.prev;T;T=T.walk(!0))if(3==T.type||!M.isBlock(T.name)){a.schema.isValidChild(T.parent.name,"span")&&T.parent.insert(S,T,"br"===T.name);break}if(a._selectionOverrides.showBlockCaretContainer(w),H.invalid){for(L.setContent(A),w=L.getNode(),E=a.getBody(),9==w.nodeType?w=T=E:T=w;T!==E;)w=T,T=T.parentNode;c=w==E?E.innerHTML:M.getOuterHTML(w),c=x.serialize(C.parse(c.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return x.serialize(N)}))),w==E?M.setHTML(E,c):M.setOuterHTML(w,c)}else c=x.serialize(N),u(a,c,w);h(),b(M.get("mce_marker")),g(a.getBody()),a.fire("SetContent",_),a.addVisual()},d=function(e){var n;return"string"!=typeof e?(n=t.extend({paste:e.paste,data:{paste:e.paste}},e),{content:e.content,details:n}):{content:e,details:{}}},f=function(e,t){var n=d(t);c(e,n.content,n.details)};return{insertAtCaret:f}}),r(le,[d,m,T,y,se,_],function(e,n,r,i,o,a){var s=n.each,l=n.extend,u=n.map,c=n.inArray,d=n.explode,f=e.ie&&e.ie<11,p=!0,h=!1;return function(n){function m(e,t,r,i){var o,a,l=0;if(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(e)||i&&i.skip_focus||n.focus(),i=n.fire("BeforeExecCommand",{command:e,ui:t,value:r}),i.isDefaultPrevented())return!1;if(a=e.toLowerCase(),o=D.exec[a])return o(a,t,r),n.fire("ExecCommand",{command:e,ui:t,value:r}),!0;if(s(n.plugins,function(i){if(i.execCommand&&i.execCommand(e,t,r))return n.fire("ExecCommand",{command:e,ui:t,value:r}),l=!0,!1}),l)return l;if(n.theme&&n.theme.execCommand&&n.theme.execCommand(e,t,r))return n.fire("ExecCommand",{command:e,ui:t,value:r}),!0;try{l=n.getDoc().execCommand(e,t,r)}catch(u){}return!!l&&(n.fire("ExecCommand",{command:e,ui:t,value:r}),!0)}function g(e){var t;if(!n.quirks.isHidden()){if(e=e.toLowerCase(),t=D.state[e])return t(e);try{return n.getDoc().queryCommandState(e)}catch(r){}return!1}}function v(e){var t;if(!n.quirks.isHidden()){if(e=e.toLowerCase(),t=D.value[e])return t(e);try{return n.getDoc().queryCommandValue(e)}catch(r){}}}function y(e,t){t=t||"exec",s(e,function(e,n){s(n.toLowerCase().split(","),function(n){D[t][n]=e})})}function b(e,t,r){e=e.toLowerCase(),D.exec[e]=function(e,i,o,a){return t.call(r||n,i,o,a)}}function C(e){if(e=e.toLowerCase(),D.exec[e])return!0;try{return n.getDoc().queryCommandSupported(e)}catch(t){}return!1}function x(e,t,r){e=e.toLowerCase(),D.state[e]=function(){return t.call(r||n)}}function w(e,t,r){e=e.toLowerCase(),D.value[e]=function(){return t.call(r||n)}}function E(e){return e=e.toLowerCase(),!!D.exec[e]}function N(e,r,i){return r===t&&(r=h),i===t&&(i=null),n.getDoc().execCommand(e,r,i)}function _(e){return B.match(e)}function S(e,r){B.toggle(e,r?{value:r}:t),n.nodeChanged()}function k(e){M=A.getBookmark(e)}function T(){A.moveToBookmark(M)}var R,A,B,D={state:{},exec:{},value:{}},L=n.settings,M;n.on("PreInit",function(){R=n.dom,A=n.selection,L=n.settings,B=n.formatter}),l(this,{execCommand:m,queryCommandState:g,queryCommandValue:v,queryCommandSupported:C,addCommands:y,addCommand:b,addQueryStateHandler:x,addQueryValueHandler:w,hasCustomCommand:E}),y({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(t){var r=n.getDoc(),i;try{N(t)}catch(o){i=p}if("paste"!==t||r.queryCommandEnabled(t)||(i=!0),i||!r.queryCommandSupported(t)){var a=n.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");e.mac&&(a=a.replace(/Ctrl\+/g,"\u2318+")),n.notificationManager.open({text:a,type:"error"})}},unlink:function(){if(A.isCollapsed()){var e=n.dom.getParent(n.selection.getStart(),"a");return void(e&&n.dom.remove(e,!0))}B.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"==t&&(t="justify"),s("left,center,right,justify".split(","),function(e){t!=e&&B.remove("align"+e)}),"none"!=t&&S("align"+t)},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;N(e),t=R.getParent(A.getNode(),"ol,ul"),t&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(k(),R.split(n,t),T()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){S(e)},"ForeColor,HiliteColor,FontName":function(e,t,n){S(e,n)},FontSize:function(e,t,n){var r,i;n>=1&&n<=7&&(i=d(L.font_size_style_values),r=d(L.font_size_classes),n=r?r[n-1]||n:i[n-1]||n),S(e,n)},RemoveFormat:function(e){B.remove(e)},mceBlockQuote:function(){S("blockquote")},FormatBlock:function(e,t,n){return S(n||"p")},mceCleanup:function(){var e=A.getBookmark();n.setContent(n.getContent({cleanup:p}),{cleanup:p}),A.moveToBookmark(e)},mceRemoveNode:function(e,t,r){var i=r||A.getNode();i!=n.getBody()&&(k(),n.dom.remove(i,p),T())},mceSelectNodeDepth:function(e,t,r){var i=0;R.getParent(A.getNode(),function(e){if(1==e.nodeType&&i++==r)return A.select(e),h},n.getBody())},mceSelectNode:function(e,t,n){A.select(n)},mceInsertContent:function(e,t,r){o.insertAtCaret(n,r)},mceInsertRawHTML:function(e,t,r){A.setContent("tiny_mce_marker"),n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return r}))},mceToggleFormat:function(e,t,n){S(n)},mceSetContent:function(e,t,r){n.setContent(r)},"Indent,Outdent":function(e){var t,r,i;t=L.indentation,r=/[a-z%]+$/i.exec(t),t=parseInt(t,10),g("InsertUnorderedList")||g("InsertOrderedList")?N(e):(L.forced_root_block||R.getParent(A.getNode(),R.isBlock)||B.apply("div"),s(A.getSelectedBlocks(),function(o){if("false"!==R.getContentEditable(o)&&"LI"!==o.nodeName){var a=n.getParam("indent_use_margin",!1)?"margin":"padding";a="TABLE"===o.nodeName?"margin":a,a+="rtl"==R.getStyle(o,"direction",!0)?"Right":"Left","outdent"==e?(i=Math.max(0,parseInt(o.style[a]||0,10)-t),R.setStyle(o,a,i?i+r:"")):(i=parseInt(o.style[a]||0,10)+t+r,R.setStyle(o,a,i))}}))},mceRepaint:function(){},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual,n.addVisual()},mceReplaceContent:function(e,t,r){n.execCommand("mceInsertContent",!1,r.replace(/\{\$selection\}/g,A.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=R.getParent(A.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||B.remove("link"),n.href&&B.apply("link",n,r)},selectAll:function(){var e=R.getRoot(),t;if(A.getRng().setStart){var n=R.getParent(A.getStart(),a.isContentEditableTrue);n&&(t=R.createRng(),t.selectNodeContents(n),A.setRng(t))}else t=A.getRng(),t.item||(t.moveToElementText(e),t.select())},"delete":function(){N("Delete");var e=n.getBody();R.isEmpty(e)&&(n.setContent(""),e.firstChild&&R.isBlock(e.firstChild)?n.selection.setCursorLocation(e.firstChild,0):n.selection.setCursorLocation(e,0))},mceNewDocument:function(){n.setContent("")},InsertLineBreak:function(e,t,o){function a(){for(var e=new i(m,v),t,r=n.schema.getNonEmptyElements();t=e.next();)if(r[t.nodeName.toLowerCase()]||t.length>0)return!0}var s=o,l,u,c,d=A.getRng(!0);new r(R).normalize(d);var h=d.startOffset,m=d.startContainer;if(1==m.nodeType&&m.hasChildNodes()){var g=h>m.childNodes.length-1;m=m.childNodes[Math.min(h,m.childNodes.length-1)]||m,h=g&&3==m.nodeType?m.nodeValue.length:0}var v=R.getParent(m,R.isBlock),y=v?v.nodeName.toUpperCase():"",b=v?R.getParent(v.parentNode,R.isBlock):null,C=b?b.nodeName.toUpperCase():"",x=s&&s.ctrlKey;"LI"!=C||x||(v=b,y=C),m&&3==m.nodeType&&h>=m.nodeValue.length&&(f||a()||(l=R.create("br"),d.insertNode(l),d.setStartAfter(l),d.setEndAfter(l),u=!0)),l=R.create("br"),d.insertNode(l);var w=R.doc.documentMode;return f&&"PRE"==y&&(!w||w<8)&&l.parentNode.insertBefore(R.doc.createTextNode("\r"),l),c=R.create("span",{},"&nbsp;"),l.parentNode.insertBefore(c,l),A.scrollIntoView(c),R.remove(c),u?(d.setStartBefore(l),d.setEndBefore(l)):(d.setStartAfter(l),d.setEndAfter(l)),A.setRng(d),n.undoManager.add(),p}}),y({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t="align"+e.substring(7),n=A.isCollapsed()?[R.getParent(A.getNode(),R.isBlock)]:A.getSelectedBlocks(),r=u(n,function(e){return!!B.matchNode(e,t)});return c(r,p)!==-1},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return _(e)},mceBlockQuote:function(){return _("blockquote")},Outdent:function(){var e;if(L.inline_styles){if((e=R.getParent(A.getStart(),R.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return p;if((e=R.getParent(A.getEnd(),R.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return p}return g("InsertUnorderedList")||g("InsertOrderedList")||!L.inline_styles&&!!R.getParent(A.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=R.getParent(A.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),y({"FontSize,FontName":function(e){var t=0,n;return(n=R.getParent(A.getNode(),"span"))&&(t="fontsize"==e?n.style.fontSize:n.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()),t}},"value"),y({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}),r(ue,[m],function(e){function t(e,o){var a=this,s,l;if(e=r(e),o=a.settings=o||{},s=o.base_uri,/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(a.source=e);var u=0===e.indexOf("//");0!==e.indexOf("/")||u||(e=(s?s.protocol||"http":"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(l=o.base_uri?o.base_uri.path:new t(location.href).directory,""===o.base_uri.protocol?e="//mce_host"+a.toAbsPath(l,e):(e=/([^#?]*)([#?]?.*)/.exec(e),e=(s&&s.protocol||"http")+"://mce_host"+a.toAbsPath(l,e[1])+e[2])),e=e.replace(/@@/g,"(mce_at)"),e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),n(i,function(t,n){var r=e[n];r&&(r=r.replace(/\(mce_at\)/g,"@@")),a[t]=r}),s&&(a.protocol||(a.protocol=s.protocol),a.userInfo||(a.userInfo=s.userInfo),a.port||"mce_host"!==a.host||(a.port=s.port),a.host&&"mce_host"!==a.host||(a.host=s.host),a.source=""),u&&(a.protocol="")}var n=e.each,r=e.trim,i="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),o={ftp:21,http:80,https:443,mailto:25};return t.prototype={setPath:function(e){var t=this;e=/^(.*?)\/?(\w+)?$/.exec(e),t.path=e[0],t.directory=e[1],t.file=e[2],t.source="",t.getURI()},toRelative:function(e){var n=this,r;if("./"===e)return e;if(e=new t(e,{base_uri:n}),"mce_host"!=e.host&&n.host!=e.host&&e.host||n.port!=e.port||n.protocol!=e.protocol&&""!==e.protocol)return e.getURI();var i=n.getURI(),o=e.getURI();return i==o||"/"==i.charAt(i.length-1)&&i.substr(0,i.length-1)==o?i:(r=n.toRelPath(n.path,e.path),e.query&&(r+="?"+e.query),e.anchor&&(r+="#"+e.anchor),r)},toAbsolute:function(e,n){return e=new t(e,{base_uri:this}),e.getURI(n&&this.isSameOrigin(e))},isSameOrigin:function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=o[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},toRelPath:function(e,t){var n,r=0,i="",o,a;if(e=e.substring(0,e.lastIndexOf("/")),e=e.split("/"),n=t.split("/"),e.length>=n.length)for(o=0,a=e.length;o<a;o++)if(o>=n.length||e[o]!=n[o]){r=o+1;break}if(e.length<n.length)for(o=0,a=n.length;o<a;o++)if(o>=e.length||e[o]!=n[o]){r=o+1;break}if(1===r)return t;for(o=0,a=e.length-(r-1);o<a;o++)i+="../";for(o=r-1,a=n.length;o<a;o++)i+=o!=r-1?"/"+n[o]:n[o];return i},toAbsPath:function(e,t){var r,i=0,o=[],a,s;for(a=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),n(e,function(e){e&&o.push(e)}),e=o,r=t.length-1,o=[];r>=0;r--)0!==t[r].length&&"."!==t[r]&&(".."!==t[r]?i>0?i--:o.push(t[r]):i++);return r=e.length-i,s=r<=0?o.reverse().join("/"):e.slice(0,r).join("/")+"/"+o.reverse().join("/"),0!==s.indexOf("/")&&(s="/"+s),a&&s.lastIndexOf("/")!==s.length-1&&(s+=a),s},getURI:function(e){var t,n=this;return n.source&&!e||(t="",e||(t+=n.protocol?n.protocol+"://":"//",n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},t.parseDataUri=function(e){var t,n;return e=decodeURIComponent(e).split(","),n=/data:([^;]+)/.exec(e[0]),n&&(t=n[1]),{type:t,data:e[1]}},t.getDocumentBaseUrl=function(e){var t;return t=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?e.href:e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/")),t},t}),r(ce,[m],function(e){function t(){}var n=e.each,r=e.extend,i,o;return t.extend=i=function(e){function t(){var e,t,n,r=this;if(!o&&(r.init&&r.init.apply(r,arguments),t=r.Mixins))for(e=t.length;e--;)n=t[e],n.init&&n.init.apply(r,arguments)}function a(){return this}function s(e,t){return function(){var n=this,r=n._super,i;return n._super=u[e],i=t.apply(n,arguments),n._super=r,i}}var l=this,u=l.prototype,c,d,f;o=!0,c=new l,o=!1,e.Mixins&&(n(e.Mixins,function(t){for(var n in t)"init"!==n&&(e[n]=t[n])}),u.Mixins&&(e.Mixins=u.Mixins.concat(e.Mixins))),e.Methods&&n(e.Methods.split(","),function(t){e[t]=a}),e.Properties&&n(e.Properties.split(","),function(t){var n="_"+t;e[t]=function(e){var t=this,r;return e!==r?(t[n]=e,t):t[n]}}),e.Statics&&n(e.Statics,function(e,n){t[n]=e}),e.Defaults&&u.Defaults&&(e.Defaults=r({},u.Defaults,e.Defaults));for(d in e)f=e[d],"function"==typeof f&&u[d]?c[d]=s(d,f):c[d]=f;return t.prototype=c,t.constructor=t,t.extend=i,t},t}),r(de,[m],function(e){function t(t){function n(){return!1}function r(){return!0}function i(e,i){var o,s,l,u;if(e=e.toLowerCase(),i=i||{},i.type=e,i.target||(i.target=c),i.preventDefault||(i.preventDefault=function(){i.isDefaultPrevented=r},i.stopPropagation=function(){i.isPropagationStopped=r},i.stopImmediatePropagation=function(){i.isImmediatePropagationStopped=r},i.isDefaultPrevented=n,i.isPropagationStopped=n,i.isImmediatePropagationStopped=n),t.beforeFire&&t.beforeFire(i),o=d[e])for(s=0,l=o.length;s<l;s++){if(u=o[s],u.once&&a(e,u.func),i.isImmediatePropagationStopped())return i.stopPropagation(),i;if(u.func.call(c,i)===!1)return i.preventDefault(),i}return i}function o(t,r,i,o){var a,s,l;if(r===!1&&(r=n),r)for(r={func:r},o&&e.extend(r,o),s=t.toLowerCase().split(" "),l=s.length;l--;)t=s[l],a=d[t],a||(a=d[t]=[],f(t,!0)),i?a.unshift(r):a.push(r);return u}function a(e,t){var n,r,i,o,a;if(e)for(o=e.toLowerCase().split(" "),n=o.length;n--;){if(e=o[n],r=d[e],!e){for(i in d)f(i,!1),delete d[i];return u}if(r){if(t)for(a=r.length;a--;)r[a].func===t&&(r=r.slice(0,a).concat(r.slice(a+1)),d[e]=r);else r.length=0;r.length||(f(e,!1),delete d[e])}}else{for(e in d)f(e,!1);d={}}return u}function s(e,t,n){return o(e,t,n,{once:!0})}function l(e){return e=e.toLowerCase(),!(!d[e]||0===d[e].length)}var u=this,c,d={},f;t=t||{},c=t.scope||u,f=t.toggleEvent||n,u.fire=i,u.on=o,u.off=a,u.once=s,u.has=l}var n=e.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend"," ");return t.isNative=function(e){return!!n[e.toLowerCase()]},t}),r(fe,[],function(){function e(e){this.create=e.create}return e.create=function(t,n){return new e({create:function(e,r){function i(t){e.set(r,t.value)}function o(e){t.set(n,e.value)}var a;return e.on("change:"+r,o),t.on("change:"+n,i),a=e._bindings,a||(a=e._bindings=[],e.on("destroy",function(){for(var e=a.length;e--;)a[e]()})),a.push(function(){t.off("change:"+n,i)}),t.get(n)}})},e}),r(pe,[de],function(e){function t(t){return t._eventDispatcher||(t._eventDispatcher=new e({scope:t,toggleEvent:function(n,r){e.isNative(n)&&t.toggleNativeEvent&&t.toggleNativeEvent(n,r)}})),t._eventDispatcher}return{fire:function(e,n,r){var i=this;if(i.removed&&"remove"!==e)return n;if(n=t(i).fire(e,n,r),r!==!1&&i.parent)for(var o=i.parent();o&&!n.isPropagationStopped();)o.fire(e,n,!1),o=o.parent();return n},on:function(e,n,r){return t(this).on(e,n,r)},off:function(e,n){return t(this).off(e,n)},once:function(e,n){return t(this).once(e,n)},hasEventListeners:function(e){return t(this).has(e)}}}),r(he,[fe,pe,ce,m],function(e,t,n,r){function i(e){return e.nodeType>0}function o(e,t){var n,a;if(e===t)return!0;if(null===e||null===t)return e===t;if("object"!=typeof e||"object"!=typeof t)return e===t;if(r.isArray(t)){if(e.length!==t.length)return!1;for(n=e.length;n--;)if(!o(e[n],t[n]))return!1}if(i(e)||i(t))return e===t;a={};for(n in t){if(!o(e[n],t[n]))return!1;a[n]=!0}for(n in e)if(!a[n]&&!o(e[n],t[n]))return!1;return!0}return n.extend({Mixins:[t],init:function(t){var n,r;t=t||{};for(n in t)r=t[n],r instanceof e&&(t[n]=r.create(this,n));this.data=t},set:function(t,n){var r,i,a=this.data[t];if(n instanceof e&&(n=n.create(this,t)),"object"==typeof t){for(r in t)this.set(r,t[r]);return this}return o(a,n)||(this.data[t]=n,i={target:this,name:t,value:n,oldValue:a},this.fire("change:"+t,i),this.fire("change",i)),this},get:function(e){return this.data[e]},has:function(e){return e in this.data},bind:function(t){return e.create(this,t)},destroy:function(){this.fire("destroy")}})}),r(me,[ce],function(e){function t(e){for(var t=[],n=e.length,r;n--;)r=e[n],r.__checked||(t.push(r),r.__checked=1);for(n=t.length;n--;)delete t[n].__checked;return t}var n=/^([\w\\*]+)?(?:#([\w\-\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,r=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,i=/^\s*|\s*$/g,o,a=e.extend({init:function(e){function t(e){if(e)return e=e.toLowerCase(),function(t){return"*"===e||t.type===e}}function o(e){if(e)return function(t){return t._name===e}}function a(e){if(e)return e=e.split("."),function(t){for(var n=e.length;n--;)if(!t.classes.contains(e[n]))return!1;return!0}}function s(e,t,n){if(e)return function(r){var i=r[e]?r[e]():"";return t?"="===t?i===n:"*="===t?i.indexOf(n)>=0:"~="===t?(" "+i+" ").indexOf(" "+n+" ")>=0:"!="===t?i!=n:"^="===t?0===i.indexOf(n):"$="===t&&i.substr(i.length-n.length)===n:!!n}}function l(e){var t;if(e)return e=/(?:not\((.+)\))|(.+)/i.exec(e),e[1]?(t=c(e[1],[]),function(e){return!d(e,t)}):(e=e[2],function(t,n,r){return"first"===e?0===n:"last"===e?n===r-1:"even"===e?n%2===0:"odd"===e?n%2===1:!!t[e]&&t[e]()})}function u(e,r,u){function c(e){e&&r.push(e)}var d;return d=n.exec(e.replace(i,"")),c(t(d[1])),c(o(d[2])),c(a(d[3])),c(s(d[4],d[5],d[6])),c(l(d[7])),r.pseudo=!!d[7],r.direct=u,r}function c(e,t){var n=[],i,o,a;do if(r.exec(""),o=r.exec(e),o&&(e=o[3],n.push(o[1]),o[2])){i=o[3];break}while(o);for(i&&c(i,t),e=[],a=0;a<n.length;a++)">"!=n[a]&&e.push(u(n[a],[],">"===n[a-1]));return t.push(e),t}var d=this.match;this._selectors=c(e,[])},match:function(e,t){var n,r,i,o,a,s,l,u,c,d,f,p,h;for(t=t||this._selectors,n=0,r=t.length;n<r;n++){for(a=t[n],o=a.length,h=e,p=0,i=o-1;i>=0;i--)for(u=a[i];h;){if(u.pseudo)for(f=h.parent().items(),c=d=f.length;c--&&f[c]!==h;);for(s=0,l=u.length;s<l;s++)if(!u[s](h,c,d)){s=l+1;break}if(s===l){p++;break}if(i===o-1)break;h=h.parent()}if(p===o)return!0}return!1},find:function(e){function n(e,t,i){var o,a,s,l,u,c=t[i];for(o=0,a=e.length;o<a;o++){for(u=e[o],s=0,l=c.length;s<l;s++)if(!c[s](u,o,a)){s=l+1;break}if(s===l)i==t.length-1?r.push(u):u.items&&n(u.items(),t,i+1);else if(c.direct)return;u.items&&n(u.items(),t,i)}}var r=[],i,s,l=this._selectors;if(e.items){for(i=0,s=l.length;i<s;i++)n(e.items(),l[i],0);s>1&&(r=t(r))}return o||(o=a.Collection),new o(r)}});return a}),r(ge,[m,me,ce],function(e,t,n){var r,i,o=Array.prototype.push,a=Array.prototype.slice;return i={length:0,init:function(e){e&&this.add(e)},add:function(t){var n=this;return e.isArray(t)?o.apply(n,t):t instanceof r?n.add(t.toArray()):o.call(n,t),n},set:function(e){var t=this,n=t.length,r;for(t.length=0,t.add(e),r=t.length;r<n;r++)delete t[r];return t},filter:function(e){var n=this,i,o,a=[],s,l;for("string"==typeof e?(e=new t(e),l=function(t){return e.match(t)}):l=e,i=0,o=n.length;i<o;i++)s=n[i],l(s)&&a.push(s);return new r(a)},slice:function(){return new r(a.apply(this,arguments))},eq:function(e){return e===-1?this.slice(e):this.slice(e,+e+1)},each:function(t){return e.each(this,t),this},toArray:function(){return e.toArray(this)},indexOf:function(e){for(var t=this,n=t.length;n--&&t[n]!==e;);return n},reverse:function(){return new r(e.toArray(this).reverse())},hasClass:function(e){return!!this[0]&&this[0].classes.contains(e)},prop:function(e,t){var n=this,r,i;return t!==r?(n.each(function(n){n[e]&&n[e](t)}),n):(i=n[0],i&&i[e]?i[e]():void 0)},exec:function(t){var n=this,r=e.toArray(arguments).slice(1);return n.each(function(e){e[t]&&e[t].apply(e,r)}),n},remove:function(){for(var e=this.length;e--;)this[e].remove();return this},addClass:function(e){return this.each(function(t){t.classes.add(e)})},removeClass:function(e){return this.each(function(t){t.classes.remove(e)})}},e.each("fire on off show hide append prepend before after reflow".split(" "),function(t){i[t]=function(){var n=e.toArray(arguments);return this.each(function(e){t in e&&e[t].apply(e,n)}),this}}),e.each("text name disabled active selected checked visible parent value data".split(" "),function(e){i[e]=function(t){return this.prop(e,t)}}),r=n.extend(i),t.Collection=r,r}),r(ve,[d,m,w],function(e,t,n){var r=0,i={id:function(){return"mceu_"+r++},create:function(e,r,i){var o=document.createElement(e);return n.DOM.setAttribs(o,r),"string"==typeof i?o.innerHTML=i:t.each(i,function(e){e.nodeType&&o.appendChild(e)}),o},createFragment:function(e){return n.DOM.createFragment(e)},getWindowSize:function(){return n.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var r=e.getBoundingClientRect();t=Math.max(r.width||r.right-r.left,e.offsetWidth),n=Math.max(r.height||r.bottom-r.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,t){return n.DOM.getPos(e,t||i.getContainer())},getContainer:function(){return e.container?e.container:document.body},getViewPort:function(e){return n.DOM.getViewPort(e)},get:function(e){return document.getElementById(e)},addClass:function(e,t){return n.DOM.addClass(e,t)},removeClass:function(e,t){return n.DOM.removeClass(e,t)},hasClass:function(e,t){return n.DOM.hasClass(e,t)},toggleClass:function(e,t,r){return n.DOM.toggleClass(e,t,r)},css:function(e,t,r){return n.DOM.setStyle(e,t,r)},getRuntimeStyle:function(e,t){return n.DOM.getStyle(e,t,!0)},on:function(e,t,r,i){
+return n.DOM.bind(e,t,r,i)},off:function(e,t,r){return n.DOM.unbind(e,t,r)},fire:function(e,t,r){return n.DOM.fire(e,t,r)},innerHtml:function(e,t){n.DOM.setHTML(e,t)}};return i}),r(ye,[],function(){return{parseBox:function(e){var t,n=10;if(e)return"number"==typeof e?(e=e||0,{top:e,left:e,bottom:e,right:e}):(e=e.split(" "),t=e.length,1===t?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],n)||0,right:parseInt(e[1],n)||0,bottom:parseInt(e[2],n)||0,left:parseInt(e[3],n)||0})},measureBox:function(e,t){function n(t){var n=document.defaultView;return n?(t=t.replace(/[A-Z]/g,function(e){return"-"+e}),n.getComputedStyle(e,null).getPropertyValue(t)):e.currentStyle[t]}function r(e){var t=parseFloat(n(e),10);return isNaN(t)?0:t}return{top:r(t+"TopWidth"),right:r(t+"RightWidth"),bottom:r(t+"BottomWidth"),left:r(t+"LeftWidth")}}}}),r(be,[m],function(e){function t(){}function n(e){this.cls=[],this.cls._map={},this.onchange=e||t,this.prefix=""}return e.extend(n.prototype,{add:function(e){return e&&!this.contains(e)&&(this.cls._map[e]=!0,this.cls.push(e),this._change()),this},remove:function(e){if(this.contains(e)){for(var t=0;t<this.cls.length&&this.cls[t]!==e;t++);this.cls.splice(t,1),delete this.cls._map[e],this._change()}return this},toggle:function(e,t){var n=this.contains(e);return n!==t&&(n?this.remove(e):this.add(e),this._change()),this},contains:function(e){return!!this.cls._map[e]},_change:function(){delete this.clsValue,this.onchange.call(this)}}),n.prototype.toString=function(){var e;if(this.clsValue)return this.clsValue;e="";for(var t=0;t<this.cls.length;t++)t>0&&(e+=" "),e+=this.prefix+this.cls[t];return e},n}),r(Ce,[c],function(e){var t={},n;return{add:function(r){var i=r.parent();if(i){if(!i._layout||i._layout.isNative())return;t[i._id]||(t[i._id]=i),n||(n=!0,e.requestAnimationFrame(function(){var e,r;n=!1;for(e in t)r=t[e],r.state.get("rendered")&&r.reflow();t={}},document.body))}},remove:function(e){t[e._id]&&delete t[e._id]}}}),r(xe,[ce,m,de,he,ge,ve,g,ye,be,Ce],function(e,t,n,r,i,o,a,s,l,u){function c(e){return e._eventDispatcher||(e._eventDispatcher=new n({scope:e,toggleEvent:function(t,r){r&&n.isNative(t)&&(e._nativeEvents||(e._nativeEvents={}),e._nativeEvents[t]=!0,e.state.get("rendered")&&d(e))}})),e._eventDispatcher}function d(e){function t(t){var n=e.getParentCtrl(t.target);n&&n.fire(t.type,t)}function n(){var e=u._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),u._lastHoverCtrl=null)}function r(t){var n=e.getParentCtrl(t.target),r=u._lastHoverCtrl,i=0,o,a,s;if(n!==r){if(u._lastHoverCtrl=n,a=n.parents().toArray().reverse(),a.push(n),r){for(s=r.parents().toArray().reverse(),s.push(r),i=0;i<s.length&&a[i]===s[i];i++);for(o=s.length-1;o>=i;o--)r=s[o],r.fire("mouseleave",{target:r.getEl()})}for(o=i;o<a.length;o++)n=a[o],n.fire("mouseenter",{target:n.getEl()})}}function i(t){t.preventDefault(),"mousewheel"==t.type?(t.deltaY=-.025*t.wheelDelta,t.wheelDeltaX&&(t.deltaX=-.025*t.wheelDeltaX)):(t.deltaX=0,t.deltaY=t.detail),t=e.fire("wheel",t)}var o,s,l,u,c,d;if(c=e._nativeEvents){for(l=e.parents().toArray(),l.unshift(e),o=0,s=l.length;!u&&o<s;o++)u=l[o]._eventsRoot;for(u||(u=l[l.length-1]||e),e._eventsRoot=u,s=o,o=0;o<s;o++)l[o]._eventsRoot=u;var h=u._delegates;h||(h=u._delegates={});for(d in c){if(!c)return!1;"wheel"!==d||p?("mouseenter"===d||"mouseleave"===d?u._hasMouseEnter||(a(u.getEl()).on("mouseleave",n).on("mouseover",r),u._hasMouseEnter=1):h[d]||(a(u.getEl()).on(d,t),h[d]=!0),c[d]=!1):f?a(e.getEl()).on("mousewheel",i):a(e.getEl()).on("DOMMouseScroll",i)}}}var f="onmousewheel"in document,p=!1,h="mce-",m,g=0,v={Statics:{classPrefix:h},isRtl:function(){return m.rtl},classPrefix:h,init:function(e){function n(e){var t;for(e=e.split(" "),t=0;t<e.length;t++)i.classes.add(e[t])}var i=this,o,u;i.settings=e=t.extend({},i.Defaults,e),i._id=e.id||"mceu_"+g++,i._aria={role:e.role},i._elmCache={},i.$=a,i.state=new r({visible:!0,active:!1,disabled:!1,value:""}),i.data=new r(e.data),i.classes=new l(function(){i.state.get("rendered")&&(i.getEl().className=this.toString())}),i.classes.prefix=i.classPrefix,o=e.classes,o&&(i.Defaults&&(u=i.Defaults.classes,u&&o!=u&&n(u)),n(o)),t.each("title text name visible disabled active value".split(" "),function(t){t in e&&i[t](e[t])}),i.on("click",function(){if(i.disabled())return!1}),i.settings=e,i.borderBox=s.parseBox(e.border),i.paddingBox=s.parseBox(e.padding),i.marginBox=s.parseBox(e.margin),e.hidden&&i.hide()},Properties:"parent,name",getContainerElm:function(){return o.getContainer()},getParentCtrl:function(e){for(var t,n=this.getRoot().controlIdLookup;e&&n&&!(t=n[e.id]);)e=e.parentNode;return t},initLayoutRect:function(){var e=this,t=e.settings,n,r,i=e.getEl(),a,l,u,c,d,f,p,h;n=e.borderBox=e.borderBox||s.measureBox(i,"border"),e.paddingBox=e.paddingBox||s.measureBox(i,"padding"),e.marginBox=e.marginBox||s.measureBox(i,"margin"),h=o.getSize(i),f=t.minWidth,p=t.minHeight,u=f||h.width,c=p||h.height,a=t.width,l=t.height,d=t.autoResize,d="undefined"!=typeof d?d:!a&&!l,a=a||u,l=l||c;var m=n.left+n.right,g=n.top+n.bottom,v=t.maxWidth||65535,y=t.maxHeight||65535;return e._layoutRect=r={x:t.x||0,y:t.y||0,w:a,h:l,deltaW:m,deltaH:g,contentW:a-m,contentH:l-g,innerW:a-m,innerH:l-g,startMinWidth:f||0,startMinHeight:p||0,minW:Math.min(u,v),minH:Math.min(c,y),maxW:v,maxH:y,autoResize:d,scrollW:0},e._lastLayoutRect={},r},layoutRect:function(e){var t=this,n=t._layoutRect,r,i,o,a,s,l;return n||(n=t.initLayoutRect()),e?(o=n.deltaW,a=n.deltaH,e.x!==s&&(n.x=e.x),e.y!==s&&(n.y=e.y),e.minW!==s&&(n.minW=e.minW),e.minH!==s&&(n.minH=e.minH),i=e.w,i!==s&&(i=i<n.minW?n.minW:i,i=i>n.maxW?n.maxW:i,n.w=i,n.innerW=i-o),i=e.h,i!==s&&(i=i<n.minH?n.minH:i,i=i>n.maxH?n.maxH:i,n.h=i,n.innerH=i-a),i=e.innerW,i!==s&&(i=i<n.minW-o?n.minW-o:i,i=i>n.maxW-o?n.maxW-o:i,n.innerW=i,n.w=i+o),i=e.innerH,i!==s&&(i=i<n.minH-a?n.minH-a:i,i=i>n.maxH-a?n.maxH-a:i,n.innerH=i,n.h=i+a),e.contentW!==s&&(n.contentW=e.contentW),e.contentH!==s&&(n.contentH=e.contentH),r=t._lastLayoutRect,r.x===n.x&&r.y===n.y&&r.w===n.w&&r.h===n.h||(l=m.repaintControls,l&&l.map&&!l.map[t._id]&&(l.push(t),l.map[t._id]=!0),r.x=n.x,r.y=n.y,r.w=n.w,r.h=n.h),t):n},repaint:function(){var e=this,t,n,r,i,o,a,s,l,u,c;u=document.createRange?function(e){return e}:Math.round,t=e.getEl().style,i=e._layoutRect,l=e._lastRepaintRect||{},o=e.borderBox,a=o.left+o.right,s=o.top+o.bottom,i.x!==l.x&&(t.left=u(i.x)+"px",l.x=i.x),i.y!==l.y&&(t.top=u(i.y)+"px",l.y=i.y),i.w!==l.w&&(c=u(i.w-a),t.width=(c>=0?c:0)+"px",l.w=i.w),i.h!==l.h&&(c=u(i.h-s),t.height=(c>=0?c:0)+"px",l.h=i.h),e._hasBody&&i.innerW!==l.innerW&&(c=u(i.innerW),r=e.getEl("body"),r&&(n=r.style,n.width=(c>=0?c:0)+"px"),l.innerW=i.innerW),e._hasBody&&i.innerH!==l.innerH&&(c=u(i.innerH),r=r||e.getEl("body"),r&&(n=n||r.style,n.height=(c>=0?c:0)+"px"),l.innerH=i.innerH),e._lastRepaintRect=l,e.fire("repaint",{},!1)},updateLayoutRect:function(){var e=this;e.parent()._lastRect=null,o.css(e.getEl(),{width:"",height:""}),e._layoutRect=e._lastRepaintRect=e._lastLayoutRect=null,e.initLayoutRect()},on:function(e,t){function n(e){var t,n;return"string"!=typeof e?e:function(i){return t||r.parentsAndSelf().each(function(r){var i=r.settings.callbacks;if(i&&(t=i[e]))return n=r,!1}),t?t.call(n,i):(i.action=e,void this.fire("execute",i))}}var r=this;return c(r).on(e,n(t)),r},off:function(e,t){return c(this).off(e,t),this},fire:function(e,t,n){var r=this;if(t=t||{},t.control||(t.control=r),t=c(r).fire(e,t),n!==!1&&r.parent)for(var i=r.parent();i&&!t.isPropagationStopped();)i.fire(e,t,!1),i=i.parent();return t},hasEventListeners:function(e){return c(this).has(e)},parents:function(e){var t=this,n,r=new i;for(n=t.parent();n;n=n.parent())r.add(n);return e&&(r=r.filter(e)),r},parentsAndSelf:function(e){return new i(this).add(this.parents(e))},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},innerHtml:function(e){return this.$el.html(e),this},getEl:function(e){var t=e?this._id+"-"+e:this._id;return this._elmCache[t]||(this._elmCache[t]=a("#"+t)[0]),this._elmCache[t]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,r=n.getEl(n.ariaTarget);return"undefined"==typeof t?n._aria[e]:(n._aria[e]=t,n.state.get("rendered")&&r.setAttribute("role"==e?e:"aria-"+e,t),n)},encode:function(e,t){return t!==!1&&(e=this.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},translate:function(e){return m.translate?m.translate(e):e},before:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t),!0),t},after:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t)),t},remove:function(){var e=this,t=e.getEl(),n=e.parent(),r,i;if(e.items){var o=e.items().toArray();for(i=o.length;i--;)o[i].remove()}n&&n.items&&(r=[],n.items().each(function(t){t!==e&&r.push(t)}),n.items().set(r),n._lastRect=null),e._eventsRoot&&e._eventsRoot==e&&a(t).off();var s=e.getRoot().controlIdLookup;return s&&delete s[e._id],t&&t.parentNode&&t.parentNode.removeChild(t),e.state.set("rendered",!1),e.state.destroy(),e.fire("remove"),e},renderBefore:function(e){return a(e).before(this.renderHtml()),this.postRender(),this},renderTo:function(e){return a(e||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'"></div>'},postRender:function(){var e=this,t=e.settings,n,r,i,o,s;e.$el=a(e.getEl()),e.state.set("rendered",!0);for(o in t)0===o.indexOf("on")&&e.on(o.substr(2),t[o]);if(e._eventsRoot){for(i=e.parent();!s&&i;i=i.parent())s=i._eventsRoot;if(s)for(o in s._nativeEvents)e._nativeEvents[o]=!0}d(e),t.style&&(n=e.getEl(),n&&(n.setAttribute("style",t.style),n.style.cssText=t.style)),e.settings.border&&(r=e.borderBox,e.$el.css({"border-top-width":r.top,"border-right-width":r.right,"border-bottom-width":r.bottom,"border-left-width":r.left}));var l=e.getRoot();l.controlIdLookup||(l.controlIdLookup={}),l.controlIdLookup[e._id]=e;for(var c in e._aria)e.aria(c,e._aria[c]);e.state.get("visible")===!1&&(e.getEl().style.display="none"),e.bindStates(),e.state.on("change:visible",function(t){var n=t.value,r;e.state.get("rendered")&&(e.getEl().style.display=n===!1?"none":"",e.getEl().getBoundingClientRect()),r=e.parent(),r&&(r._lastRect=null),e.fire(n?"show":"hide"),u.add(e)}),e.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(e){function t(e,t){var n,r,i=e;for(n=r=0;i&&i!=t&&i.nodeType;)n+=i.offsetLeft||0,r+=i.offsetTop||0,i=i.offsetParent;return{x:n,y:r}}var n=this.getEl(),r=n.parentNode,i,o,a,s,l,u,c=t(n,r);return i=c.x,o=c.y,a=n.offsetWidth,s=n.offsetHeight,l=r.clientWidth,u=r.clientHeight,"end"==e?(i-=l-a,o-=u-s):"center"==e&&(i-=l/2-a/2,o-=u/2-s/2),r.scrollLeft=i,r.scrollTop=o,this},getRoot:function(){for(var e=this,t,n=[];e;){if(e.rootControl){t=e.rootControl;break}n.push(e),t=e,e=e.parent()}t||(t=this);for(var r=n.length;r--;)n[r].rootControl=t;return t},reflow:function(){u.remove(this);var e=this.parent();return e._layout&&!e._layout.isNative()&&e.reflow(),this}};return t.each("text title visible disabled active value".split(" "),function(e){v[e]=function(t){return 0===arguments.length?this.state.get(e):("undefined"!=typeof t&&this.state.set(e,t),this)}}),m=e.extend(v)}),r(we,[],function(){var e={},t;return{add:function(t,n){e[t.toLowerCase()]=n},has:function(t){return!!e[t.toLowerCase()]},create:function(n,r){var i,o,a;if(!t){a=tinymce.ui;for(o in a)e[o.toLowerCase()]=a[o];t=!0}if("string"==typeof n?(r=r||{},r.type=n):(r=n,n=r.type),n=n.toLowerCase(),i=e[n],!i)throw new Error("Could not find control by type: "+n);return i=new i(r),i.type=n,i}}}),r(Ee,[],function(){return function(e){function t(e){return e&&1===e.nodeType}function n(e){return e=e||C,t(e)?e.getAttribute("role"):null}function r(e){for(var t,r=e||C;r=r.parentNode;)if(t=n(r))return t}function i(e){var n=C;if(t(n))return n.getAttribute("aria-"+e)}function o(e){var t=e.tagName.toUpperCase();return"INPUT"==t||"TEXTAREA"==t||"SELECT"==t}function a(e){return!(!o(e)||e.hidden)||!!/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell|slider)$/.test(n(e))}function s(e){function t(e){if(1==e.nodeType&&"none"!=e.style.display&&!e.disabled){a(e)&&n.push(e);for(var r=0;r<e.childNodes.length;r++)t(e.childNodes[r])}}var n=[];return t(e||b.getEl()),n}function l(e){var t,n;e=e||x,n=e.parents().toArray(),n.unshift(e);for(var r=0;r<n.length&&(t=n[r],!t.settings.ariaRoot);r++);return t}function u(e){var t=l(e),n=s(t.getEl());t.settings.ariaRemember&&"lastAriaIndex"in t?c(t.lastAriaIndex,n):c(0,n)}function c(e,t){return e<0?e=t.length-1:e>=t.length&&(e=0),t[e]&&t[e].focus(),e}function d(e,t){var n=-1,r=l();t=t||s(r.getEl());for(var i=0;i<t.length;i++)t[i]===C&&(n=i);n+=e,r.lastAriaIndex=c(n,t)}function f(){var e=r();"tablist"==e?d(-1,s(C.parentNode)):x.parent().submenu?v():d(-1)}function p(){var e=n(),t=r();"tablist"==t?d(1,s(C.parentNode)):"menuitem"==e&&"menu"==t&&i("haspopup")?y():d(1)}function h(){d(-1)}function m(){var e=n(),t=r();"menuitem"==e&&"menubar"==t?y():"button"==e&&i("haspopup")?y({key:"down"}):d(1)}function g(e){var t=r();if("tablist"==t){var n=s(x.getEl("body"))[0];n&&n.focus()}else d(e.shiftKey?-1:1)}function v(){x.fire("cancel")}function y(e){e=e||{},x.fire("click",{target:C,aria:e})}var b=e.root,C,x;try{C=document.activeElement}catch(w){C=document.body}return x=b.getParentCtrl(C),b.on("keydown",function(e){function t(e,t){o(C)||"slider"!==n(C)&&t(e)!==!1&&e.preventDefault()}if(!e.isDefaultPrevented())switch(e.keyCode){case 37:t(e,f);break;case 39:t(e,p);break;case 38:t(e,h);break;case 40:t(e,m);break;case 27:v();break;case 14:case 13:case 32:t(e,y);break;case 9:g(e)!==!1&&e.preventDefault()}}),b.on("focusin",function(e){C=e.target,x=e.control}),{focusFirst:u}}}),r(Ne,[xe,ge,me,we,Ee,m,g,be,Ce],function(e,t,n,r,i,o,a,s,l){var u={};return e.extend({init:function(e){var n=this;n._super(e),e=n.settings,e.fixed&&n.state.set("fixed",!0),n._items=new t,n.isRtl()&&n.classes.add("rtl"),n.bodyClasses=new s(function(){n.state.get("rendered")&&(n.getEl("body").className=this.toString())}),n.bodyClasses.prefix=n.classPrefix,n.classes.add("container"),n.bodyClasses.add("container-body"),e.containerCls&&n.classes.add(e.containerCls),n._layout=r.create((e.layout||"")+"layout"),n.settings.items?n.add(n.settings.items):n.add(n.render()),n._hasBody=!0},items:function(){return this._items},find:function(e){return e=u[e]=u[e]||new n(e),e.find(this)},add:function(e){var t=this;return t.items().add(t.create(e)).parent(t),t},focus:function(e){var t=this,n,r,i;return e&&(r=t.keyboardNav||t.parents().eq(-1)[0].keyboardNav)?void r.focusFirst(t):(i=t.find("*"),t.statusbar&&i.add(t.statusbar.items()),i.each(function(e){return e.settings.autofocus?(n=null,!1):void(e.canFocus&&(n=n||e))}),n&&n.focus(),t)},replace:function(e,t){for(var n,r=this.items(),i=r.length;i--;)if(r[i]===e){r[i]=t;break}i>=0&&(n=t.getEl(),n&&n.parentNode.removeChild(n),n=e.getEl(),n&&n.parentNode.removeChild(n)),t.parent(this)},create:function(t){var n=this,i,a=[];return o.isArray(t)||(t=[t]),o.each(t,function(t){t&&(t instanceof e||("string"==typeof t&&(t={type:t}),i=o.extend({},n.settings.defaults,t),t.type=i.type=i.type||t.type||n.settings.defaultType||(i.defaults?i.defaults.type:null),t=r.create(i)),a.push(t))}),a},renderNew:function(){var e=this;return e.items().each(function(t,n){var r;t.parent(e),t.state.get("rendered")||(r=e.getEl("body"),r.hasChildNodes()&&n<=r.childNodes.length-1?a(r.childNodes[n]).before(t.renderHtml()):a(r).append(t.renderHtml()),t.postRender(),l.add(t))}),e._layout.applyClasses(e.items().filter(":visible")),e._lastRect=null,e},append:function(e){return this.add(e).renderNew()},prepend:function(e){var t=this;return t.items().set(t.create(e).concat(t.items().toArray())),t.renderNew()},insert:function(e,t,n){var r=this,i,o,a;return e=r.create(e),i=r.items(),!n&&t<i.length-1&&(t+=1),t>=0&&t<i.length&&(o=i.slice(0,t).toArray(),a=i.slice(t).toArray(),i.set(o.concat(e,a))),r.renderNew()},fromJSON:function(e){var t=this;for(var n in e)t.find("#"+n).value(e[n]);return t},toJSON:function(){var e=this,t={};return e.find("*").each(function(e){var n=e.name(),r=e.value();n&&"undefined"!=typeof r&&(t[n]=r)}),t},renderHtml:function(){var e=this,t=e._layout,n=this.settings.role;return e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'"'+(n?' role="'+this.settings.role+'"':"")+'><div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"},postRender:function(){var e=this,t;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e.state.set("rendered",!0),e.settings.style&&e.$el.css(e.settings.style),e.settings.border&&(t=e.borderBox,e.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e.parent()||(e.keyboardNav=new i({root:e})),e},initLayoutRect:function(){var e=this,t=e._super();return e._layout.recalc(e),t},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;if(!n||n.w!=t.w||n.h!=t.h)return e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0},reflow:function(){var t;if(l.remove(this),this.visible()){for(e.repaintControls=[],e.repaintControls.map={},this.recalc(),t=e.repaintControls.length;t--;)e.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),e.repaintControls=[]}return this}})}),r(_e,[g],function(e){function t(e){var t,n,r,i,o,a,s,l,u=Math.max;return t=e.documentElement,n=e.body,r=u(t.scrollWidth,n.scrollWidth),i=u(t.clientWidth,n.clientWidth),o=u(t.offsetWidth,n.offsetWidth),a=u(t.scrollHeight,n.scrollHeight),s=u(t.clientHeight,n.clientHeight),l=u(t.offsetHeight,n.offsetHeight),{width:r<o?i:r,height:a<l?s:a}}function n(e){var t,n;if(e.changedTouches)for(t="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n<t.length;n++)e[t[n]]=e.changedTouches[0][t[n]]}return function(r,i){function o(){return s.getElementById(i.handle||r)}var a,s=i.document||document,l,u,c,d,f,p;i=i||{},u=function(r){var u=t(s),h,m;n(r),r.preventDefault(),l=r.button,h=o(),f=r.screenX,p=r.screenY,m=window.getComputedStyle?window.getComputedStyle(h,null).getPropertyValue("cursor"):h.runtimeStyle.cursor,a=e("<div></div>").css({position:"absolute",top:0,left:0,width:u.width,height:u.height,zIndex:2147483647,opacity:1e-4,cursor:m}).appendTo(s.body),e(s).on("mousemove touchmove",d).on("mouseup touchend",c),i.start(r)},d=function(e){return n(e),e.button!==l?c(e):(e.deltaX=e.screenX-f,e.deltaY=e.screenY-p,e.preventDefault(),void i.drag(e))},c=function(t){n(t),e(s).off("mousemove touchmove",d).off("mouseup touchend",c),a.remove(),i.stop&&i.stop(t)},this.destroy=function(){e(o()).off()},e(o()).on("mousedown touchstart",u)}}),r(Se,[g,_e],function(e,t){return{init:function(){var e=this;e.on("repaint",e.renderScroll)},renderScroll:function(){function n(){function t(t,a,s,l,u,c){var d,f,p,h,m,g,v,y,b;if(f=i.getEl("scroll"+t)){if(y=a.toLowerCase(),b=s.toLowerCase(),e(i.getEl("absend")).css(y,i.layoutRect()[l]-1),!u)return void e(f).css("display","none");e(f).css("display","block"),d=i.getEl("body"),p=i.getEl("scroll"+t+"t"),h=d["client"+s]-2*o,h-=n&&r?f["client"+c]:0,m=d["scroll"+s],g=h/m,v={},v[y]=d["offset"+a]+o,v[b]=h,e(f).css(v),v={},v[y]=d["scroll"+a]*g,v[b]=h*g,e(p).css(v)}}var n,r,a;a=i.getEl("body"),n=a.scrollWidth>a.clientWidth,r=a.scrollHeight>a.clientHeight,t("h","Left","Width","contentW",n,"Height"),t("v","Top","Height","contentH",r,"Width")}function r(){function n(n,r,a,s,l){var u,c=i._id+"-scroll"+n,d=i.classPrefix;e(i.getEl()).append('<div id="'+c+'" class="'+d+"scrollbar "+d+"scrollbar-"+n+'"><div id="'+c+'t" class="'+d+'scrollbar-thumb"></div></div>'),i.draghelper=new t(c+"t",{start:function(){u=i.getEl("body")["scroll"+r],e("#"+c).addClass(d+"active")},drag:function(e){var t,c,d,f,p=i.layoutRect();c=p.contentW>p.innerW,d=p.contentH>p.innerH,f=i.getEl("body")["client"+a]-2*o,f-=c&&d?i.getEl("scroll"+n)["client"+l]:0,t=f/i.getEl("body")["scroll"+a],i.getEl("body")["scroll"+r]=u+e["delta"+s]/t},stop:function(){e("#"+c).removeClass(d+"active")}})}i.classes.add("scroll"),n("v","Top","Height","Y","Width"),n("h","Left","Width","X","Height")}var i=this,o=2;i.settings.autoScroll&&(i._hasScroll||(i._hasScroll=!0,r(),i.on("wheel",function(e){var t=i.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),e(i.getEl("body")).on("scroll",n)),n())}}}),r(ke,[Ne,Se],function(e,t){return e.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[t],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),"undefined"==typeof n?n='<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+t.renderHtml(e)+"</div>":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1" role="group">'+(e._preBodyHtml||"")+n+"</div>"}})}),r(Te,[ve],function(e){function t(t,n,r){var i,o,a,s,l,u,c,d,f,p;return f=e.getViewPort(),o=e.getPos(n),a=o.x,s=o.y,t.state.get("fixed")&&"static"==e.getRuntimeStyle(document.body,"position")&&(a-=f.x,s-=f.y),i=t.getEl(),p=e.getSize(i),l=p.width,u=p.height,p=e.getSize(n),c=p.width,d=p.height,r=(r||"").split(""),"b"===r[0]&&(s+=d),"r"===r[1]&&(a+=c),"c"===r[0]&&(s+=Math.round(d/2)),"c"===r[1]&&(a+=Math.round(c/2)),"b"===r[3]&&(s-=u),"r"===r[4]&&(a-=l),"c"===r[3]&&(s-=Math.round(u/2)),"c"===r[4]&&(a-=Math.round(l/2)),{x:a,y:s,w:l,h:u}}return{testMoveRel:function(n,r){for(var i=e.getViewPort(),o=0;o<r.length;o++){var a=t(this,n,r[o]);if(this.state.get("fixed")){if(a.x>0&&a.x+a.w<i.w&&a.y>0&&a.y+a.h<i.h)return r[o]}else if(a.x>i.x&&a.x+a.w<i.w+i.x&&a.y>i.y&&a.y+a.h<i.h+i.y)return r[o]}return r[0]},moveRel:function(e,n){"string"!=typeof n&&(n=this.testMoveRel(e,n));var r=t(this,e,n);return this.moveTo(r.x,r.y)},moveBy:function(e,t){var n=this,r=n.layoutRect();return n.moveTo(r.x+e,r.y+t),n},moveTo:function(t,n){function r(e,t,n){return e<0?0:e+n>t?(e=t-n,e<0?0:e):e}var i=this;if(i.settings.constrainToViewport){var o=e.getViewPort(window),a=i.layoutRect();t=r(t,o.w+o.x,a.w),n=r(n,o.h+o.y,a.h)}return i.state.get("rendered")?i.layoutRect({x:t,y:n}).repaint():(i.settings.x=t,i.settings.y=n),i.fire("move",{x:t,y:n}),i}}}),r(Re,[ve],function(e){return{resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,n){if(t<=1||n<=1){var r=e.getWindowSize();t=t<=1?t*r.w:t,n=n<=1?n*r.h:n}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:n,w:t,h:n}).reflow()},resizeBy:function(e,t){var n=this,r=n.layoutRect();return n.resizeTo(r.w+e,r.h+t)}}}),r(Ae,[ke,Te,Re,ve,g,c],function(e,t,n,r,i,o){function a(e,t){for(;e;){if(e==t)return!0;e=e.parent()}}function s(e){for(var t=v.length;t--;){var n=v[t],r=n.getParentCtrl(e.target);if(n.settings.autohide){if(r&&(a(r,n)||n.parent()===r))continue;e=n.fire("autohide",{target:e.target}),e.isDefaultPrevented()||n.hide()}}}function l(){h||(h=function(e){2!=e.button&&s(e)},i(document).on("click touchstart",h))}function u(){m||(m=function(){var e;for(e=v.length;e--;)d(v[e])},i(window).on("scroll",m))}function c(){if(!g){var e=document.documentElement,t=e.clientWidth,n=e.clientHeight;g=function(){document.all&&t==e.clientWidth&&n==e.clientHeight||(t=e.clientWidth,n=e.clientHeight,C.hideAll())},i(window).on("resize",g)}}function d(e){function t(t,n){for(var r,i=0;i<v.length;i++)if(v[i]!=e)for(r=v[i].parent();r&&(r=r.parent());)r==e&&v[i].fixed(t).moveBy(0,n).repaint()}var n=r.getViewPort().y;e.settings.autofix&&(e.state.get("fixed")?e._autoFixY>n&&(e.fixed(!1).layoutRect({y:e._autoFixY}).repaint(),t(!1,e._autoFixY-n)):(e._autoFixY=e.layoutRect().y,e._autoFixY<n&&(e.fixed(!0).layoutRect({y:0}).repaint(),t(!0,n-e._autoFixY))))}function f(e,t){var n,r=C.zIndex||65535,o;if(e)y.push(t);else for(n=y.length;n--;)y[n]===t&&y.splice(n,1);if(y.length)for(n=0;n<y.length;n++)y[n].modal&&(r++,o=y[n]),y[n].getEl().style.zIndex=r,y[n].zIndex=r,r++;var a=i("#"+t.classPrefix+"modal-block",t.getContainerElm())[0];o?i(a).css("z-index",o.zIndex-1):a&&(a.parentNode.removeChild(a),b=!1),C.currentZIndex=r}function p(e){var t;for(t=v.length;t--;)v[t]===e&&v.splice(t,1);for(t=y.length;t--;)y[t]===e&&y.splice(t,1)}var h,m,g,v=[],y=[],b,C=e.extend({Mixins:[t,n],init:function(e){var t=this;t._super(e),t._eventsRoot=t,t.classes.add("floatpanel"),e.autohide&&(l(),c(),v.push(t)),e.autofix&&(u(),t.on("move",function(){d(this)})),t.on("postrender show",function(e){if(e.control==t){var n,r=t.classPrefix;t.modal&&!b&&(n=i("#"+r+"modal-block",t.getContainerElm()),n[0]||(n=i('<div id="'+r+'modal-block" class="'+r+"reset "+r+'fade"></div>').appendTo(t.getContainerElm())),o.setTimeout(function(){n.addClass(r+"in"),i(t.getEl()).addClass(r+"in")}),b=!0),f(!0,t)}}),t.on("show",function(){t.parents().each(function(e){if(e.state.get("fixed"))return t.fixed(!0),!1})}),e.popover&&(t._preBodyHtml='<div class="'+t.classPrefix+'arrow"></div>',t.classes.add("popover").add("bottom").add(t.isRtl()?"end":"start")),t.aria("label",e.ariaLabel),t.aria("labelledby",t._id),t.aria("describedby",t.describedBy||t._id+"-none")},fixed:function(e){var t=this;if(t.state.get("fixed")!=e){if(t.state.get("rendered")){var n=r.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.classes.toggle("fixed",e),t.state.set("fixed",e)}return t},show:function(){var e=this,t,n=e._super();for(t=v.length;t--&&v[t]!==e;);return t===-1&&v.push(e),n},hide:function(){return p(this),f(!1,this),this._super()},hideAll:function(){C.hideAll()},close:function(){var e=this;return e.fire("close").isDefaultPrevented()||(e.remove(),f(!1,e)),e},remove:function(){p(this),this._super()},postRender:function(){var e=this;return e.settings.bodyRole&&this.getEl("body").setAttribute("role",e.settings.bodyRole),e._super()}});return C.hideAll=function(){for(var e=v.length;e--;){var t=v[e];t&&t.settings.autohide&&(t.hide(),v.splice(e,1))}},C}),r(Be,[Ae,ke,ve,g,_e,ye,d,c],function(e,t,n,r,i,o,a,s){function l(e){var t="width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0",n=r("meta[name=viewport]")[0],i;a.overrideViewPort!==!1&&(n||(n=document.createElement("meta"),n.setAttribute("name","viewport"),document.getElementsByTagName("head")[0].appendChild(n)),i=n.getAttribute("content"),i&&"undefined"!=typeof p&&(p=i),n.setAttribute("content",e?t:p))}function u(e,t){c()&&t===!1&&r([document.documentElement,document.body]).removeClass(e+"fullscreen")}function c(){for(var e=0;e<f.length;e++)if(f[e]._fullscreen)return!0;return!1}function d(){function e(){var e,t=n.getWindowSize(),r;for(e=0;e<f.length;e++)r=f[e].layoutRect(),f[e].moveTo(f[e].settings.x||Math.max(0,t.w/2-r.w/2),f[e].settings.y||Math.max(0,t.h/2-r.h/2))}if(!a.desktop){var t={w:window.innerWidth,h:window.innerHeight};s.setInterval(function(){var e=window.innerWidth,n=window.innerHeight;t.w==e&&t.h==n||(t={w:e,h:n},r(window).trigger("resize"))},100)}r(window).on("resize",e)}var f=[],p="",h=e.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(e){var r=this;r._super(e),r.isRtl()&&r.classes.add("rtl"),r.classes.add("window"),r.bodyClasses.add("window-body"),r.state.set("fixed",!0),e.buttons&&(r.statusbar=new t({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:r.isRtl()?"start":"end",defaults:{type:"button"},items:e.buttons}),r.statusbar.classes.add("foot"),r.statusbar.parent(r)),r.on("click",function(e){var t=r.classPrefix+"close";(n.hasClass(e.target,t)||n.hasClass(e.target.parentNode,t))&&r.close()}),r.on("cancel",function(){r.close()}),r.aria("describedby",r.describedBy||r._id+"-none"),r.aria("label",e.title),r._fullscreen=!1},recalc:function(){var e=this,t=e.statusbar,r,i,o,a;e._fullscreen&&(e.layoutRect(n.getWindowSize()),e.layoutRect().contentH=e.layoutRect().innerH),e._super(),r=e.layoutRect(),e.settings.title&&!e._fullscreen&&(i=r.headerW,i>r.w&&(o=r.x-Math.max(0,i/2),e.layoutRect({w:i,x:o}),a=!0)),t&&(t.layoutRect({w:e.layoutRect().innerW}).recalc(),i=t.layoutRect().minW+r.deltaW,i>r.w&&(o=r.x-Math.max(0,i-r.w),e.layoutRect({w:i,x:o}),a=!0)),a&&e.recalc()},initLayoutRect:function(){var e=this,t=e._super(),r=0,i;if(e.settings.title&&!e._fullscreen){i=e.getEl("head");var o=n.getSize(i);t.headerW=o.width,t.headerH=o.height,r+=t.headerH}e.statusbar&&(r+=e.statusbar.layoutRect().h),t.deltaH+=r,t.minH+=r,t.h+=r;var a=n.getWindowSize();return t.x=e.settings.x||Math.max(0,a.w/2-t.w/2),t.y=e.settings.y||Math.max(0,a.h/2-t.h/2),t},renderHtml:function(){var e=this,t=e._layout,n=e._id,r=e.classPrefix,i=e.settings,o="",a="",s=i.html;return e.preRender(),t.preRender(e),i.title&&(o='<div id="'+n+'-head" class="'+r+'window-head"><div id="'+n+'-title" class="'+r+'title">'+e.encode(i.title)+'</div><div id="'+n+'-dragh" class="'+r+'dragh"></div><button type="button" class="'+r+'close" aria-hidden="true"><i class="mce-ico mce-i-remove"></i></button></div>'),i.url&&(s='<iframe src="'+i.url+'" tabindex="-1"></iframe>'),"undefined"==typeof s&&(s=t.renderHtml(e)),e.statusbar&&(a=e.statusbar.renderHtml()),'<div id="'+n+'" class="'+e.classes+'" hidefocus="1"><div class="'+e.classPrefix+'reset" role="application">'+o+'<div id="'+n+'-body" class="'+e.bodyClasses+'">'+s+"</div>"+a+"</div></div>"},fullscreen:function(e){var t=this,i=document.documentElement,a,l=t.classPrefix,u;if(e!=t._fullscreen)if(r(window).on("resize",function(){var e;if(t._fullscreen)if(a)t._timer||(t._timer=s.setTimeout(function(){var e=n.getWindowSize();t.moveTo(0,0).resizeTo(e.w,e.h),t._timer=0},50));else{e=(new Date).getTime();var r=n.getWindowSize();t.moveTo(0,0).resizeTo(r.w,r.h),(new Date).getTime()-e>50&&(a=!0)}}),u=t.layoutRect(),t._fullscreen=e,e){t._initial={x:u.x,y:u.y,w:u.w,h:u.h},t.borderBox=o.parseBox("0"),t.getEl("head").style.display="none",u.deltaH-=u.headerH+2,r([i,document.body]).addClass(l+"fullscreen"),t.classes.add("fullscreen");var c=n.getWindowSize();t.moveTo(0,0).resizeTo(c.w,c.h)}else t.borderBox=o.parseBox(t.settings.border),t.getEl("head").style.display="",u.deltaH+=u.headerH,r([i,document.body]).removeClass(l+"fullscreen"),t.classes.remove("fullscreen"),t.moveTo(t._initial.x,t._initial.y).resizeTo(t._initial.w,t._initial.h);return t.reflow()},postRender:function(){var e=this,t;setTimeout(function(){e.classes.add("in"),e.fire("open")},0),e._super(),e.statusbar&&e.statusbar.postRender(),e.focus(),this.dragHelper=new i(e._id+"-dragh",{start:function(){t={x:e.layoutRect().x,y:e.layoutRect().y}},drag:function(n){e.moveTo(t.x+n.deltaX,t.y+n.deltaY)}}),e.on("submit",function(t){t.isDefaultPrevented()||e.close()}),f.push(e),l(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e=this,t;for(e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove(),u(e.classPrefix,!1),t=f.length;t--;)f[t]===e&&f.splice(t,1);l(f.length>0)},getContentWindow:function(){var e=this.getEl().getElementsByTagName("iframe")[0];return e?e.contentWindow:null}});return d(),h}),r(De,[Be],function(e){var t=e.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(n){function r(e,t,n){return{type:"button",text:e,subtype:n?"primary":"",onClick:function(e){e.control.parents()[1].close(),o(t)}}}var i,o=n.callback||function(){};
+switch(n.buttons){case t.OK_CANCEL:i=[r("Ok",!0,!0),r("Cancel",!1)];break;case t.YES_NO:case t.YES_NO_CANCEL:i=[r("Yes",1,!0),r("No",0)],n.buttons==t.YES_NO_CANCEL&&i.push(r("Cancel",-1));break;default:i=[r("Ok",!0,!0)]}return new e({padding:20,x:n.x,y:n.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:i,title:n.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:n.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:n.onClose,onCancel:function(){o(!1)}}).renderTo(document.body).reflow()},alert:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,t.msgBox(e)},confirm:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,e.buttons=t.OK_CANCEL,t.msgBox(e)}}});return t}),r(Le,[Be,De],function(e,t){return function(n){function r(){if(s.length)return s[s.length-1]}function i(e){n.fire("OpenWindow",{win:e})}function o(e){n.fire("CloseWindow",{win:e})}var a=this,s=[];a.windows=s,n.on("remove",function(){for(var e=s.length;e--;)s[e].close()}),a.open=function(t,r){var a;return n.editorManager.setActive(n),t.title=t.title||" ",t.url=t.url||t.file,t.url&&(t.width=parseInt(t.width||320,10),t.height=parseInt(t.height||240,10)),t.body&&(t.items={defaults:t.defaults,type:t.bodyType||"form",items:t.body,data:t.data,callbacks:t.commands}),t.url||t.buttons||(t.buttons=[{text:"Ok",subtype:"primary",onclick:function(){a.find("form")[0].submit()}},{text:"Cancel",onclick:function(){a.close()}}]),a=new e(t),s.push(a),a.on("close",function(){for(var e=s.length;e--;)s[e]===a&&s.splice(e,1);s.length||n.focus(),o(a)}),t.data&&a.on("postRender",function(){this.find("*").each(function(e){var n=e.name();n in t.data&&e.value(t.data[n])})}),a.features=t||{},a.params=r||{},1===s.length&&n.nodeChanged(),a=a.renderTo().reflow(),i(a),a},a.alert=function(e,r,a){var s;s=t.alert(e,function(){r?r.call(a||this):n.focus()}),s.on("close",function(){o(s)}),i(s)},a.confirm=function(e,n,r){var a;a=t.confirm(e,function(e){n.call(r||this,e)}),a.on("close",function(){o(a)}),i(a)},a.close=function(){r()&&r().close()},a.getParams=function(){return r()?r().params:null},a.setParams=function(e){r()&&(r().params=e)},a.getWindows=function(){return s}}}),r(Me,[xe,Te],function(e,t){return e.extend({Mixins:[t],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes+'" role="presentation"><div class="'+t+'tooltip-arrow"></div><div class="'+t+'tooltip-inner">'+e.encode(e.state.get("text"))+"</div></div>"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().lastChild.innerHTML=e.encode(t.value)}),e._super()},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(Pe,[xe,Me],function(e,t){var n,r=e.extend({init:function(e){var t=this;t._super(e),e=t.settings,t.canFocus=!0,e.tooltip&&r.tooltips!==!1&&(t.on("mouseenter",function(n){var r=t.tooltip().moveTo(-65535);if(n.control==t){var i=r.text(e.tooltip).show().testMoveRel(t.getEl(),["bc-tc","bc-tl","bc-tr"]);r.classes.toggle("tooltip-n","bc-tc"==i),r.classes.toggle("tooltip-nw","bc-tl"==i),r.classes.toggle("tooltip-ne","bc-tr"==i),r.moveRel(t.getEl(),i)}else r.hide()}),t.on("mouseleave mousedown click",function(){t.tooltip().hide()})),t.aria("label",e.ariaLabel||e.tooltip)},tooltip:function(){return n||(n=new t({type:"tooltip"}),n.renderTo()),n},postRender:function(){var e=this,t=e.settings;e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&e.focus()},bindStates:function(){function e(e){n.aria("disabled",e),n.classes.toggle("disabled",e)}function t(e){n.aria("pressed",e),n.classes.toggle("active",e)}var n=this;return n.state.on("change:disabled",function(t){e(t.value)}),n.state.on("change:active",function(e){t(e.value)}),n.state.get("disabled")&&e(!0),n.state.get("active")&&t(!0),n._super()},remove:function(){this._super(),n&&(n.remove(),n=null)}});return r}),r(Oe,[Pe],function(e){return e.extend({Defaults:{value:0},init:function(e){var t=this;t._super(e),t.classes.add("progress"),t.settings.filter||(t.settings.filter=function(e){return Math.round(e)})},renderHtml:function(){var e=this,t=e._id,n=this.classPrefix;return'<div id="'+t+'" class="'+e.classes+'"><div class="'+n+'bar-container"><div class="'+n+'bar"></div></div><div class="'+n+'text">0%</div></div>'},postRender:function(){var e=this;return e._super(),e.value(e.settings.value),e},bindStates:function(){function e(e){e=t.settings.filter(e),t.getEl().lastChild.innerHTML=e+"%",t.getEl().firstChild.firstChild.style.width=e+"%"}var t=this;return t.state.on("change:value",function(t){e(t.value)}),e(t.state.get("value")),t._super()}})}),r(He,[xe,Te,Oe,c],function(e,t,n,r){return e.extend({Mixins:[t],Defaults:{classes:"widget notification"},init:function(e){var t=this;t._super(e),e.text&&t.text(e.text),e.icon&&(t.icon=e.icon),e.color&&(t.color=e.color),e.type&&t.classes.add("notification-"+e.type),e.timeout&&(e.timeout<0||e.timeout>0)&&!e.closeButton?t.closeButton=!1:(t.classes.add("has-close"),t.closeButton=!0),e.progressBar&&(t.progressBar=new n),t.on("click",function(e){e.target.className.indexOf(t.classPrefix+"close")!=-1&&t.close()})},renderHtml:function(){var e=this,t=e.classPrefix,n="",r="",i="",o="";return e.icon&&(n='<i class="'+t+"ico "+t+"i-"+e.icon+'"></i>'),e.color&&(o=' style="background-color: '+e.color+'"'),e.closeButton&&(r='<button type="button" class="'+t+'close" aria-hidden="true">\xd7</button>'),e.progressBar&&(i=e.progressBar.renderHtml()),'<div id="'+e._id+'" class="'+e.classes+'"'+o+' role="presentation">'+n+'<div class="'+t+'notification-inner">'+e.state.get("text")+"</div>"+i+r+"</div>"},postRender:function(){var e=this;return r.setTimeout(function(){e.$el.addClass(e.classPrefix+"in")}),e._super()},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().childNodes[1].innerHTML=t.value}),e.progressBar&&e.progressBar.bindStates(),e._super()},close:function(){var e=this;return e.fire("close").isDefaultPrevented()||e.remove(),e},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=65534}})}),r(Ie,[He,c,m],function(e,t,n){return function(r){function i(){if(f.length)return f[f.length-1]}function o(){t.requestAnimationFrame(function(){a(),s()})}function a(){for(var e=0;e<f.length;e++)f[e].moveTo(0,0)}function s(){if(f.length>0){var e=f.slice(0,1)[0],t=r.inline?r.getElement():r.getContentAreaContainer();if(e.moveRel(t,"tc-tc"),f.length>1)for(var n=1;n<f.length;n++)f[n].moveRel(f[n-1].getEl(),"bc-tc")}}function l(e,t){if(!c(t))return null;var r=n.grep(e,function(e){return u(t,e)});return 0===r.length?null:r[0]}function u(e,t){return e.type===t.settings.type&&e.text===t.settings.text}function c(e){return!e.progressBar&&!e.timeout}var d=this,f=[];d.notifications=f,r.on("remove",function(){for(var e=f.length;e--;)f[e].close()}),r.on("ResizeEditor",s),r.on("ResizeWindow",o),d.open=function(t){if(!r.removed){var n;r.editorManager.setActive(r);var i=l(f,t);return null===i?(n=new e(t),f.push(n),t.timeout>0&&(n.timer=setTimeout(function(){n.close()},t.timeout)),n.on("close",function(){var e=f.length;for(n.timer&&r.getWin().clearTimeout(n.timer);e--;)f[e]===n&&f.splice(e,1);s()}),n.renderTo(),s()):n=i,n}},d.close=function(){i()&&i().close()},d.getNotifications=function(){return f},r.on("SkinLoaded",function(){var e=r.settings.service_message;e&&r.notificationManager.open({text:e,type:"warning",timeout:0,icon:""})})}}),r(Fe,[w],function(e){function t(t,n,r){for(var i=[];n&&n!=t;n=n.parentNode)i.push(e.nodeIndex(n,r));return i}function n(e,t){var n,r,i;for(r=e,n=t.length-1;n>=0;n--){if(i=r.childNodes,t[n]>i.length-1)return null;r=i[t[n]]}return r}return{create:t,resolve:n}}),r(ze,[I,T,y,Fe,A,C,d,m,c,k,$,oe],function(e,t,n,r,i,o,a,s,l,u,c,d){return function(f){function p(e,t){try{f.getDoc().execCommand(e,!1,t)}catch(n){}}function h(){var e=f.getDoc().documentMode;return e?e:6}function m(e){return e.isDefaultPrevented()}function g(e){var t,n;e.dataTransfer&&(f.selection.isCollapsed()&&"IMG"==e.target.tagName&&re.select(e.target),t=f.selection.getContent(),t.length>0&&(n=ce+escape(f.id)+","+escape(t),e.dataTransfer.setData(de,n)))}function v(e){var t;return e.dataTransfer&&(t=e.dataTransfer.getData(de),t&&t.indexOf(ce)>=0)?(t=t.substr(ce.length).split(","),{id:unescape(t[0]),html:unescape(t[1])}):null}function y(e){f.queryCommandSupported("mceInsertClipboardContent")?f.execCommand("mceInsertClipboardContent",!1,{content:e}):f.execCommand("mceInsertContent",!1,e)}function b(){function i(e){var t=x.schema.getBlockElements(),n=f.getBody();if("BR"!=e.nodeName)return!1;for(;e!=n&&!t[e.nodeName];e=e.parentNode)if(e.nextSibling)return!1;return!0}function o(e,t){var n;for(n=e.nextSibling;n&&n!=t;n=n.nextSibling)if((3!=n.nodeType||0!==Z.trim(n.data).length)&&n!==t)return!1;return n===t}function a(e,t,r){var o,a,s;if(x.isChildOf(e,f.getBody()))for(s=x.schema.getNonEmptyElements(),o=new n(r||e,e);a=o[t?"next":"prev"]();){if(s[a.nodeName]&&!i(a))return a;if(3==a.nodeType&&a.data.length>0)return a}}function u(e){var n,r,i,o,s;if(!e.collapsed&&(n=x.getParent(t.getNode(e.startContainer,e.startOffset),x.isBlock),r=x.getParent(t.getNode(e.endContainer,e.endOffset),x.isBlock),s=f.schema.getTextBlockElements(),n!=r&&s[n.nodeName]&&s[r.nodeName]&&"false"!==x.getContentEditable(n)&&"false"!==x.getContentEditable(r)))return e.deleteContents(),i=a(n,!1),o=a(r,!0),x.isEmpty(r)||Z(n).append(r.childNodes),Z(r).remove(),i?1==i.nodeType?"BR"==i.nodeName?(e.setStartBefore(i),e.setEndBefore(i)):(e.setStartAfter(i),e.setEndAfter(i)):(e.setStart(i,i.data.length),e.setEnd(i,i.data.length)):o&&(1==o.nodeType?(e.setStartBefore(o),e.setEndBefore(o)):(e.setStart(o,0),e.setEnd(o,0))),w.setRng(e),!0}function c(e,n){var r,i,s,l,u,c;if(!e.collapsed)return e;if(u=e.startContainer,c=e.startOffset,3==u.nodeType)if(n){if(c<u.data.length)return e}else if(c>0)return e;r=t.getNode(u,c),s=x.getParent(r,x.isBlock),i=a(f.getBody(),n,r),l=x.getParent(i,x.isBlock);var d=1===u.nodeType&&c>u.childNodes.length-1;if(!r||!i)return e;if(l&&s!=l)if(n){if(!o(s,l))return e;1==r.nodeType?"BR"==r.nodeName?e.setStartBefore(r):e.setStartAfter(r):e.setStart(r,r.data.length),1==i.nodeType?e.setEnd(i,0):e.setEndBefore(i)}else{if(!o(l,s))return e;1==i.nodeType?"BR"==i.nodeName?e.setStartBefore(i):e.setStartAfter(i):e.setStart(i,i.data.length),1==r.nodeType&&d?e.setEndAfter(r):e.setEndBefore(r)}return e}function d(e){var t=w.getRng();if(t=c(t,e),u(t))return!0}function p(e,t){function n(e,n){return m=Z(n).parents().filter(function(e,t){return!!f.schema.getTextInlineElements()[t.nodeName]}),l=e.cloneNode(!1),m=s.map(m,function(e){return e=e.cloneNode(!1),l.hasChildNodes()?(e.appendChild(l.firstChild),l.appendChild(e)):l.appendChild(e),l.appendChild(e),e}),m.length?(h=x.create("br"),m[0].appendChild(h),x.replace(l,e),t.setStartBefore(h),t.setEndBefore(h),f.selection.setRng(t),h):null}function i(e){return e&&f.schema.getTextBlockElements()[e.tagName]}var o,a,l,u,c,d,p,h,m;if(t.collapsed&&(d=t.startContainer,p=t.startOffset,a=x.getParent(d,x.isBlock),i(a)))if(1==d.nodeType){if(d=d.childNodes[p],d&&"BR"!=d.tagName)return;if(c=e?a.nextSibling:a.previousSibling,x.isEmpty(a)&&i(c)&&x.isEmpty(c)&&n(a,d))return x.remove(c),!0}else if(3==d.nodeType){if(o=r.create(a,d),u=a.cloneNode(!0),d=r.resolve(u,o),e){if(p>=d.data.length)return;d.deleteData(p,1)}else{if(p<=0)return;d.deleteData(p-1,1)}if(x.isEmpty(u))return n(a,d)}}function h(e){var t,n,r;d(e)||(s.each(f.getBody().getElementsByTagName("*"),function(e){"SPAN"==e.tagName&&e.setAttribute("mce-data-marked",1),!e.hasAttribute("data-mce-style")&&e.hasAttribute("style")&&f.dom.setAttrib(e,"style",f.dom.getAttrib(e,"style"))}),t=new E(function(){}),t.observe(f.getDoc(),{childList:!0,attributes:!0,subtree:!0,attributeFilter:["style"]}),f.getDoc().execCommand(e?"ForwardDelete":"Delete",!1,null),n=f.selection.getRng(),r=n.startContainer.parentNode,s.each(t.takeRecords(),function(e){if(x.isChildOf(e.target,f.getBody())){if("style"==e.attributeName){var t=e.target.getAttribute("data-mce-style");t?e.target.setAttribute("style",t):e.target.removeAttribute("style")}s.each(e.addedNodes,function(e){if("SPAN"==e.nodeName&&!e.getAttribute("mce-data-marked")){var t,i;e==r&&(t=n.startOffset,i=e.firstChild),x.remove(e,!0),i&&(n.setStart(i,t),n.setEnd(i,t),f.selection.setRng(n))}})}}),t.disconnect(),s.each(f.dom.select("span[mce-data-marked]"),function(e){e.removeAttribute("mce-data-marked")}))}function b(e){f.undoManager.transact(function(){h(e)})}var C=f.getDoc(),x=f.dom,w=f.selection,E=window.MutationObserver,N,_;E||(N=!0,E=function(){function e(e){var t=e.relatedNode||e.target;n.push({target:t,addedNodes:[t]})}function t(e){var t=e.relatedNode||e.target;n.push({target:t,attributeName:e.attrName})}var n=[],r;this.observe=function(n){r=n,r.addEventListener("DOMSubtreeModified",e,!1),r.addEventListener("DOMNodeInsertedIntoDocument",e,!1),r.addEventListener("DOMNodeInserted",e,!1),r.addEventListener("DOMAttrModified",t,!1)},this.disconnect=function(){r.removeEventListener("DOMSubtreeModified",e,!1),r.removeEventListener("DOMNodeInsertedIntoDocument",e,!1),r.removeEventListener("DOMNodeInserted",e,!1),r.removeEventListener("DOMAttrModified",t,!1)},this.takeRecords=function(){return n}}),f.on("keydown",function(e){var t=e.keyCode==te,n=e.ctrlKey||e.metaKey;if(!m(e)&&(t||e.keyCode==ee)){var r=f.selection.getRng(),i=r.startContainer,o=r.startOffset;if(t&&e.shiftKey)return;if(p(t,r))return void e.preventDefault();if(!n&&r.collapsed&&3==i.nodeType&&(t?o<i.data.length:o>0))return;e.preventDefault(),n&&f.selection.getSel().modify("extend",t?"forward":"backward",e.metaKey?"lineboundary":"word"),h(t)}}),f.on("keypress",function(t){if(!m(t)&&!w.isCollapsed()&&t.charCode>31&&!e.metaKeyPressed(t)){var n,r,i,o,a,s;n=f.selection.getRng(),s=String.fromCharCode(t.charCode),t.preventDefault(),r=Z(n.startContainer).parents().filter(function(e,t){return!!f.schema.getTextInlineElements()[t.nodeName]}),h(!0),r=r.filter(function(e,t){return!Z.contains(f.getBody(),t)}),r.length?(i=x.createFragment(),r.each(function(e,t){t=t.cloneNode(!1),i.hasChildNodes()?(t.appendChild(i.firstChild),i.appendChild(t)):(a=t,i.appendChild(t)),i.appendChild(t)}),a.appendChild(f.getDoc().createTextNode(s)),o=x.getParent(n.startContainer,x.isBlock),x.isEmpty(o)?Z(o).empty().append(i):n.insertNode(i),n.setStart(a.firstChild,1),n.setEnd(a.firstChild,1),f.selection.setRng(n)):f.selection.setContent(s)}}),f.addCommand("Delete",function(){h()}),f.addCommand("ForwardDelete",function(){h(!0)}),N||(f.on("dragstart",function(e){_=w.getRng(),g(e)}),f.on("drop",function(e){if(!m(e)){var n=v(e);n&&(e.preventDefault(),l.setEditorTimeout(f,function(){var r=t.getCaretRangeFromPoint(e.x,e.y,C);_&&(w.setRng(_),_=null,b()),w.setRng(r),y(n.html)}))}}),f.on("cut",function(e){m(e)||!e.clipboardData||f.selection.isCollapsed()||(e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/html",f.selection.getContent()),e.clipboardData.setData("text/plain",f.selection.getContent({format:"text"})),l.setEditorTimeout(f,function(){b(!0)}))}))}function C(){function e(e){var t=ne.create("body"),n=e.cloneContents();return t.appendChild(n),re.serializer.serialize(t,{format:"html"})}function n(n){if(!n.setStart){if(n.item)return!1;var r=n.duplicate();return r.moveToElementText(f.getBody()),t.compareRanges(n,r)}var i=e(n),o=ne.createRng();o.selectNode(f.getBody());var a=e(o);return i===a}f.on("keydown",function(e){var t=e.keyCode,r,i;if(!m(e)&&(t==te||t==ee)){if(r=f.selection.isCollapsed(),i=f.getBody(),r&&!ne.isEmpty(i))return;if(!r&&!n(f.selection.getRng()))return;e.preventDefault(),f.setContent(""),i.firstChild&&ne.isBlock(i.firstChild)?f.selection.setCursorLocation(i.firstChild,0):f.selection.setCursorLocation(i,0),f.nodeChanged()}})}function x(){f.shortcuts.add("meta+a",null,"SelectAll")}function w(){f.settings.content_editable||ne.bind(f.getDoc(),"mousedown mouseup",function(e){var t;if(e.target==f.getDoc().documentElement)if(t=re.getRng(),f.getBody().focus(),"mousedown"==e.type){if(u.isCaretContainer(t.startContainer))return;re.placeCaretAt(e.clientX,e.clientY)}else re.setRng(t)})}function E(){f.on("keydown",function(e){if(!m(e)&&e.keyCode===ee){if(!f.getBody().getElementsByTagName("hr").length)return;if(re.isCollapsed()&&0===re.getRng(!0).startOffset){var t=re.getNode(),n=t.previousSibling;if("HR"==t.nodeName)return ne.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(ne.remove(n),e.preventDefault())}}})}function N(){window.Range.prototype.getClientRects||f.on("mousedown",function(e){if(!m(e)&&"HTML"===e.target.nodeName){var t=f.getBody();t.blur(),l.setEditorTimeout(f,function(){t.focus()})}})}function _(){f.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&"false"!==ne.getContentEditableParent(t)&&(e.preventDefault(),re.select(t),f.nodeChanged()),"A"==t.nodeName&&ne.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),re.select(t))})}function S(){function e(){var e=ne.getAttribs(re.getStart().cloneNode(!1));return function(){var t=re.getStart();t!==f.getBody()&&(ne.setAttrib(t,"style",null),Q(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function t(){return!re.isCollapsed()&&ne.getParent(re.getStart(),ne.isBlock)!=ne.getParent(re.getEnd(),ne.isBlock)}f.on("keypress",function(n){var r;if(!m(n)&&(8==n.keyCode||46==n.keyCode)&&t())return r=e(),f.getDoc().execCommand("delete",!1,null),r(),n.preventDefault(),!1}),ne.bind(f.getDoc(),"cut",function(n){var r;!m(n)&&t()&&(r=e(),l.setEditorTimeout(f,function(){r()}))})}function k(){document.body.setAttribute("role","application")}function T(){f.on("keydown",function(e){if(!m(e)&&e.keyCode===ee&&re.isCollapsed()&&0===re.getRng(!0).startOffset){var t=re.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function R(){h()>7||(p("RespectVisibilityInDesign",!0),f.contentStyles.push(".mceHideBrInPre pre br {display: none}"),ne.addClass(f.getBody(),"mceHideBrInPre"),oe.addNodeFilter("pre",function(e){for(var t=e.length,n,r,o,a;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)o=n[r],a=o.prev,a&&3===a.type&&"\n"!=a.value.charAt(a.value-1)?a.value+="\n":o.parent.insert(new i("#text",3),o,!0).value="\n"}),ae.addNodeFilter("pre",function(e){for(var t=e.length,n,r,i,o;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)i=n[r],o=i.prev,o&&3==o.type&&(o.value=o.value.replace(/\r?\n$/,""))}))}function A(){ne.bind(f.getBody(),"mouseup",function(){var e,t=re.getNode();"IMG"==t.nodeName&&((e=ne.getStyle(t,"width"))&&(ne.setAttrib(t,"width",e.replace(/[^0-9%]+/g,"")),ne.setStyle(t,"width","")),(e=ne.getStyle(t,"height"))&&(ne.setAttrib(t,"height",e.replace(/[^0-9%]+/g,"")),ne.setStyle(t,"height","")))})}function B(){f.on("keydown",function(t){var n,r,i,o,a;if(!m(t)&&t.keyCode==e.BACKSPACE&&(n=re.getRng(),r=n.startContainer,i=n.startOffset,o=ne.getRoot(),a=r,n.collapsed&&0===i)){for(;a&&a.parentNode&&a.parentNode.firstChild==a&&a.parentNode!=o;)a=a.parentNode;"BLOCKQUOTE"===a.tagName&&(f.formatter.toggle("blockquote",null,a),n=ne.createRng(),n.setStart(r,0),n.setEnd(r,0),re.setRng(n))}})}function D(){function e(){K(),p("StyleWithCSS",!1),p("enableInlineTableEditing",!1),ie.object_resizing||p("enableObjectResizing",!1)}ie.readonly||f.on("BeforeExecCommand MouseDown",e)}function L(){function e(){Q(ne.select("a"),function(e){var t=e.parentNode,n=ne.getRoot();if(t.lastChild===e){for(;t&&!ne.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}ne.add(t,"br",{"data-mce-bogus":1})}})}f.on("SetContent ExecCommand",function(t){"setcontent"!=t.type&&"mceInsertLink"!==t.command||e()})}function M(){ie.forced_root_block&&f.on("init",function(){p("DefaultParagraphSeparator",ie.forced_root_block)})}function P(){f.on("keydown",function(e){var t;m(e)||e.keyCode!=ee||(t=f.getDoc().selection.createRange(),t&&t.item&&(e.preventDefault(),f.undoManager.beforeChange(),ne.remove(t.item(0)),f.undoManager.add()))})}function O(){var e;h()>=10&&(e="",Q("p div h1 h2 h3 h4 h5 h6".split(" "),function(t,n){e+=(n>0?",":"")+t+":empty"}),f.contentStyles.push(e+"{padding-right: 1px !important}"))}function H(){h()<9&&(oe.addNodeFilter("noscript",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.firstChild,r&&n.attr("data-mce-innertext",r.value)}),ae.addNodeFilter("noscript",function(e){for(var t=e.length,n,r,a;t--;)n=e[t],r=e[t].firstChild,r?r.value=o.decode(r.value):(a=n.attributes.map["data-mce-innertext"],a&&(n.attr("data-mce-innertext",null),r=new i("#text",3),r.value=a,r.raw=!0,n.append(r)))}))}function I(){function e(e,t){var n=i.createTextRange();try{n.moveToPoint(e,t)}catch(r){n=null}return n}function t(t){var r;t.button?(r=e(t.x,t.y),r&&(r.compareEndPoints("StartToStart",a)>0?r.setEndPoint("StartToStart",a):r.setEndPoint("EndToEnd",a),r.select())):n()}function n(){var e=r.selection.createRange();a&&!e.item&&0===e.compareEndPoints("StartToEnd",e)&&a.select(),ne.unbind(r,"mouseup",n),ne.unbind(r,"mousemove",t),a=o=0}var r=ne.doc,i=r.body,o,a,s;r.documentElement.unselectable=!0,ne.bind(r,"mousedown contextmenu",function(i){if("HTML"===i.target.nodeName){if(o&&n(),s=r.documentElement,s.scrollHeight>s.clientHeight)return;o=1,a=e(i.x,i.y),a&&(ne.bind(r,"mouseup",n),ne.bind(r,"mousemove",t),ne.getRoot().focus(),a.select())}})}function F(){f.on("keyup focusin mouseup",function(t){65==t.keyCode&&e.metaKeyPressed(t)||re.normalize()},!0)}function z(){f.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}function U(){f.inline||f.on("keydown",function(){document.activeElement==document.body&&f.getWin().focus()})}function W(){f.inline||(f.contentStyles.push("body {min-height: 150px}"),f.on("click",function(e){var t;if("HTML"==e.target.nodeName){if(a.ie>11)return void f.getBody().focus();t=f.selection.getRng(),f.getBody().focus(),f.selection.setRng(t),f.selection.normalize(),f.nodeChanged()}}))}function V(){a.mac&&f.on("keydown",function(t){!e.metaKeyPressed(t)||t.shiftKey||37!=t.keyCode&&39!=t.keyCode||(t.preventDefault(),f.selection.getSel().modify("move",37==t.keyCode?"backward":"forward","lineboundary"))})}function $(){p("AutoUrlDetect",!1)}function q(){f.on("click",function(e){var t=e.target;do if("A"===t.tagName)return void e.preventDefault();while(t=t.parentNode)}),f.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")}function j(){f.on("init",function(){f.dom.bind(f.getBody(),"submit",function(e){e.preventDefault()})})}function Y(){oe.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"==e[t].attr("class")&&e[t].remove()})}function X(){f.on("dragstart",function(e){g(e)}),f.on("drop",function(e){if(!m(e)){var n=v(e);if(n&&n.id!=f.id){e.preventDefault();var r=t.getCaretRangeFromPoint(e.x,e.y,f.getDoc());re.setRng(r),y(n.html)}}})}function K(){}function G(){var e;return se?(e=f.selection.getSel(),!e||!e.rangeCount||0===e.rangeCount):0}function J(){function t(e){var t=new d(e.getBody()),n=e.selection.getRng(),r=c.fromRangeStart(n),i=c.fromRangeEnd(n),o=t.prev(r),a=t.next(i);return!e.selection.isCollapsed()&&(!o||o.isAtStart()&&r.isEqual(o))&&(!a||a.isAtEnd()&&r.isEqual(a))}f.on("keypress",function(n){!m(n)&&!re.isCollapsed()&&n.charCode>31&&!e.metaKeyPressed(n)&&t(f)&&(n.preventDefault(),f.setContent(String.fromCharCode(n.charCode)),f.selection.select(f.getBody(),!0),f.selection.collapse(!1),f.nodeChanged())}),f.on("keydown",function(e){var n=e.keyCode;m(e)||n!=te&&n!=ee||t(f)&&(e.preventDefault(),f.setContent(""),f.nodeChanged())})}var Q=s.each,Z=f.$,ee=e.BACKSPACE,te=e.DELETE,ne=f.dom,re=f.selection,ie=f.settings,oe=f.parser,ae=f.serializer,se=a.gecko,le=a.ie,ue=a.webkit,ce="data:text/mce-internal,",de=le?"Text":"URL";return B(),C(),a.windowsPhone||F(),ue&&(J(),b(),w(),_(),M(),j(),T(),Y(),a.iOS?(U(),W(),q()):x()),le&&a.ie<11&&(E(),k(),R(),A(),P(),O(),H(),I()),a.ie>=11&&T(),a.ie&&(W(),x(),$(),X()),se&&(J(),E(),N(),S(),D(),L(),z(),V(),T()),{refreshContentEditable:K,isHidden:G}}}),r(Ue,[pe,w,m],function(e,t,n){function r(e,t){return"selectionchange"==t?e.getDoc():!e.inline&&/^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(t)?e.getDoc().documentElement:e.settings.event_root?(e.eventRoot||(e.eventRoot=o.select(e.settings.event_root)[0]),e.eventRoot):e.getBody()}function i(e,t){function n(e){return!e.hidden&&!e.readonly}var i=r(e,t),s;if(e.delegates||(e.delegates={}),!e.delegates[t])if(e.settings.event_root){if(a||(a={},e.editorManager.on("removeEditor",function(){var t;if(!e.editorManager.activeEditor&&a){for(t in a)e.dom.unbind(r(e,t));a=null}})),a[t])return;s=function(r){for(var i=r.target,a=e.editorManager.editors,s=a.length;s--;){var l=a[s].getBody();(l===i||o.isChildOf(i,l))&&n(a[s])&&a[s].fire(t,r)}},a[t]=s,o.bind(i,t,s)}else s=function(r){n(e)&&e.fire(t,r)},o.bind(i,t,s),e.delegates[t]=s}var o=t.DOM,a,s={bindPendingEventDelegates:function(){var e=this;n.each(e._pendingNativeEvents,function(t){i(e,t)})},toggleNativeEvent:function(e,t){var n=this;"focus"!=e&&"blur"!=e&&(t?n.initialized?i(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(r(n,e),e,n.delegates[e]),delete n.delegates[e]))},unbindAllNativeEvents:function(){var e=this,t;if(e.delegates){for(t in e.delegates)e.dom.unbind(r(e,t),t,e.delegates[t]);delete e.delegates}e.inline||(e.getBody().onload=null,e.dom.unbind(e.getWin()),e.dom.unbind(e.getDoc())),e.dom.unbind(e.getBody()),e.dom.unbind(e.getContainer())}};return s=n.extend({},e,s)}),r(We,[],function(){function e(e,t,n){try{e.getDoc().execCommand(t,!1,n)}catch(r){}}function t(e){var t,n;return t=e.getBody(),n=function(t){e.dom.getParents(t.target,"a").length>0&&t.preventDefault()},e.dom.bind(t,"click",n),{unbind:function(){e.dom.unbind(t,"click",n)}}}function n(n,r){n._clickBlocker&&(n._clickBlocker.unbind(),n._clickBlocker=null),r?(n._clickBlocker=t(n),n.selection.controlSelection.hideResizeRect(),n.readonly=!0,n.getBody().contentEditable=!1):(n.readonly=!1,n.getBody().contentEditable=!0,e(n,"StyleWithCSS",!1),e(n,"enableInlineTableEditing",!1),e(n,"enableObjectResizing",!1),n.focus(),n.nodeChanged())}function r(e,t){var r=e.readonly?"readonly":"design";t!=r&&(e.initialized?n(e,"readonly"==t):e.on("init",function(){n(e,"readonly"==t)}),e.fire("SwitchMode",{mode:t}))}return{setMode:r}}),r(Ve,[m,d],function(e,t){var n=e.each,r=e.explode,i={f9:120,f10:121,f11:122},o=e.makeMap("alt,ctrl,shift,meta,access");return function(a){function s(e){var a,s,l={};n(r(e,"+"),function(e){e in o?l[e]=!0:/^[0-9]{2,}$/.test(e)?l.keyCode=parseInt(e,10):(l.charCode=e.charCodeAt(0),l.keyCode=i[e]||e.toUpperCase().charCodeAt(0))}),a=[l.keyCode];for(s in o)l[s]?a.push(s):l[s]=!1;return l.id=a.join(","),l.access&&(l.alt=!0,t.mac?l.ctrl=!0:l.shift=!0),l.meta&&(t.mac?l.meta=!0:(l.ctrl=!0,l.meta=!1)),l}function l(t,n,i,o){var l;return l=e.map(r(t,">"),s),l[l.length-1]=e.extend(l[l.length-1],{func:i,scope:o||a}),e.extend(l[0],{desc:a.translate(n),subpatterns:l.slice(1)})}function u(e){return e.altKey||e.ctrlKey||e.metaKey}function c(e){return"keydown"===e.type&&e.keyCode>=112&&e.keyCode<=123}function d(e,t){return!!t&&(t.ctrl==e.ctrlKey&&t.meta==e.metaKey&&(t.alt==e.altKey&&t.shift==e.shiftKey&&(!!(e.keyCode==t.keyCode||e.charCode&&e.charCode==t.charCode)&&(e.preventDefault(),!0))))}function f(e){return e.func?e.func.call(e.scope):null}var p=this,h={},m=[];a.on("keyup keypress keydown",function(e){!u(e)&&!c(e)||e.isDefaultPrevented()||(n(h,function(t){if(d(e,t))return m=t.subpatterns.slice(0),"keydown"==e.type&&f(t),!0}),d(e,m[0])&&(1===m.length&&"keydown"==e.type&&f(m[0]),m.shift()))}),p.add=function(t,i,o,s){var u;return u=o,"string"==typeof o?o=function(){a.execCommand(u,!1,null)}:e.isArray(u)&&(o=function(){a.execCommand(u[0],u[1],u[2])}),n(r(e.trim(t.toLowerCase())),function(e){var t=l(e,i,o,s);h[t.id]=t}),!0},p.remove=function(e){var t=l(e);return!!h[t.id]&&(delete h[t.id],!0)}}}),r($e,[u,m,z],function(e,t,n){return function(r,i){function o(e){var t,n;return n={"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png"},t=n[e.blob().type.toLowerCase()]||"dat",e.filename()+"."+t}function a(e,t){return e?e.replace(/\/$/,"")+"/"+t.replace(/^\//,""):t}function s(e){return{id:e.id,blob:e.blob,base64:e.base64,filename:n.constant(o(e))}}function l(e,t,n,r){var o,s;o=new XMLHttpRequest,o.open("POST",i.url),o.withCredentials=i.credentials,o.upload.onprogress=function(e){r(e.loaded/e.total*100)},o.onerror=function(){n("Image upload failed due to a XHR Transport error. Code: "+o.status)},o.onload=function(){var e;return 200!=o.status?void n("HTTP Error: "+o.status):(e=JSON.parse(o.responseText),e&&"string"==typeof e.location?void t(a(i.basePath,e.location)):void n("Invalid JSON: "+o.responseText))},s=new FormData,s.append("file",e.blob(),e.filename()),o.send(s)}function u(){return new e(function(e){e([])})}function c(e,t){return{url:t,blobInfo:e,status:!0}}function d(e,t){return{url:"",blobInfo:e,status:!1,error:t}}function f(e,n){t.each(y[e],function(e){e(n)}),delete y[e]}function p(t,n,i){return r.markPending(t.blobUri()),new e(function(e){var o,a,l=function(){};try{var u=function(){o&&(o.close(),a=l)},p=function(n){u(),r.markUploaded(t.blobUri(),n),f(t.blobUri(),c(t,n)),e(c(t,n))},h=function(n){u(),r.removeFailed(t.blobUri()),f(t.blobUri(),d(t,n)),e(d(t,n))};a=function(e){e<0||e>100||(o||(o=i()),o.progressBar.value(e))},n(s(t),p,h,a)}catch(m){e(d(t,m.message))}})}function h(e){return e===l}function m(t){var n=t.blobUri();return new e(function(e){y[n]=y[n]||[],y[n].push(e)})}function g(n,o){return n=t.grep(n,function(e){return!r.isUploaded(e.blobUri())}),e.all(t.map(n,function(e){return r.isPending(e.blobUri())?m(e):p(e,i.handler,o)}))}function v(e,t){return!i.url&&h(i.handler)?u():g(e,t)}var y={};return i=t.extend({credentials:!1,handler:l},i),{upload:v}}}),r(qe,[u],function(e){function t(t){return new e(function(e,n){var r=function(){n("Cannot convert "+t+" to Blob. Resource might not exist or is inaccessible.")};try{var i=new XMLHttpRequest;i.open("GET",t,!0),i.responseType="blob",i.onload=function(){200==this.status?e(this.response):r()},i.onerror=r,i.send()}catch(o){r()}})}function n(e){var t,n;return e=decodeURIComponent(e).split(","),n=/data:([^;]+)/.exec(e[0]),n&&(t=n[1]),{type:t,data:e[1]}}function r(t){return new e(function(e){var r,i,o;t=n(t);try{r=atob(t.data)}catch(a){return void e(new Blob([]))}for(i=new Uint8Array(r.length),o=0;o<i.length;o++)i[o]=r.charCodeAt(o);e(new Blob([i],{type:t.type}))})}function i(e){return 0===e.indexOf("blob:")?t(e):0===e.indexOf("data:")?r(e):null}function o(t){return new e(function(e){var n=new FileReader;n.onloadend=function(){e(n.result)},n.readAsDataURL(t)})}return{uriToBlob:i,blobToDataUri:o,parseDataUri:n}}),r(je,[u,h,z,qe,d],function(e,t,n,r,i){var o=0,a=function(e){return(e||"blobid")+o++};return function(o,s){function l(l,c){function d(e,t,n){var i,o;return 0===e.src.indexOf("blob:")?(o=s.getByUri(e.src),void(o?t({image:e,blobInfo:o}):r.uriToBlob(e.src).then(function(n){r.blobToDataUri(n).then(function(l){i=r.parseDataUri(l).data,o=s.create(a(),n,i),s.add(o),t({image:e,blobInfo:o})})},function(e){n(e)}))):(i=r.parseDataUri(e.src).data,o=s.findFirst(function(e){return e.base64()===i}),void(o?t({image:e,blobInfo:o}):r.uriToBlob(e.src).then(function(n){o=s.create(a(),n,i),s.add(o),t({image:e,blobInfo:o})},function(e){n(e)})))}var f,p;return c||(c=n.constant(!0)),f=t.filter(l.getElementsByTagName("img"),function(e){var t=e.src;return!!i.fileApi&&(!e.hasAttribute("data-mce-bogus")&&(!e.hasAttribute("data-mce-placeholder")&&(!(!t||t==i.transparentSrc)&&(0===t.indexOf("blob:")?!o.isUploaded(t):0===t.indexOf("data:")&&c(e)))))}),p=t.map(f,function(t){var n;return u[t.src]?new e(function(e){u[t.src].then(function(n){
+return"string"==typeof n?n:void e({image:t,blobInfo:n.blobInfo})})}):(n=new e(function(e,n){d(t,e,n)}).then(function(e){return delete u[e.image.src],e})["catch"](function(e){return delete u[t.src],e}),u[t.src]=n,n)}),e.all(p)}var u={};return{findAll:l}}}),r(Ye,[h,z],function(e,t){return function(){function n(e,t,n,r){return{id:c(e),filename:c(r||e),blob:c(t),base64:c(n),blobUri:c(URL.createObjectURL(t))}}function r(e){i(e.id())||u.push(e)}function i(e){return o(function(t){return t.id()===e})}function o(t){return e.filter(u,t)[0]}function a(e){return o(function(t){return t.blobUri()==e})}function s(t){u=e.filter(u,function(e){return e.blobUri()!==t||(URL.revokeObjectURL(e.blobUri()),!1)})}function l(){e.each(u,function(e){URL.revokeObjectURL(e.blobUri())}),u=[]}var u=[],c=t.constant;return{create:n,add:r,get:i,getByUri:a,findFirst:o,removeByUri:s,destroy:l}}}),r(Xe,[],function(){return function(){function e(e,t){return{status:e,resultUri:t}}function t(e){return e in d}function n(e){var t=d[e];return t?t.resultUri:null}function r(e){return!!t(e)&&d[e].status===u}function i(e){return!!t(e)&&d[e].status===c}function o(t){d[t]=e(u,null)}function a(t,n){d[t]=e(c,n)}function s(e){delete d[e]}function l(){d={}}var u=1,c=2,d={};return{hasBlobUri:t,getResultUri:n,isPending:r,isUploaded:i,markPending:o,markUploaded:a,removeFailed:s,destroy:l}}}),r(Ke,[N],function(e){var t=e.PluginManager,n=function(e,n){for(var r in t.urls){var i=t.urls[r]+"/plugin"+n+".js";if(i===e)return r}return null},r=function(e,t){var r=n(t,e.suffix);return r?"Failed to load plugin: "+r+" from url "+t:"Failed to load plugin url: "+t},i=function(e,t){e.notificationManager.open({type:"error",text:t})},o=function(e,t){e._skinLoaded?i(e,t):e.on("SkinLoaded",function(){i(e,t)})},a=function(e,t){o(e,"Failed to upload image: "+t)},s=function(e,t){o(e,r(e,t))};return{pluginLoadError:s,uploadError:a,displayError:o}}),r(Ge,[h,$e,je,Ye,Xe,Ke],function(e,t,n,r,i,o){return function(a){function s(e){return function(t){return a.selection?e(t):[]}}function l(){return"?"+(new Date).getTime()}function u(e,t,n){var r=0;do r=e.indexOf(t,r),r!==-1&&(e=e.substring(0,r)+n+e.substr(r+t.length),r+=n.length-t.length+1);while(r!==-1);return e}function c(e,t,n){return e=u(e,'src="'+t+'"','src="'+n+'"'),e=u(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')}function d(t,n){e.each(a.undoManager.data,function(r){"fragmented"===r.type?r.fragments=e.map(r.fragments,function(e){return c(e,t,n)}):r.content=c(r.content,t,n)})}function f(){return a.notificationManager.open({text:a.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0})}function p(e,t){C.removeByUri(e.src),d(e.src,t),a.$(e).attr({src:E.images_reuse_filename?t+l():t,"data-mce-src":a.convertURL(t,"src")})}function h(n){return x||(x=new t(N,{url:E.images_upload_url,basePath:E.images_upload_base_path,credentials:E.images_upload_credentials,handler:E.images_upload_handler})),v().then(s(function(t){var r;return r=e.map(t,function(e){return e.blobInfo}),x.upload(r,f).then(s(function(r){return r=e.map(r,function(e,n){var r=t[n].image;return e.status&&a.settings.images_replace_blob_uris!==!1?p(r,e.url):e.error&&o.uploadError(a,e.error),{element:r,status:e.status}}),n&&n(r),r}))}))}function m(e){if(E.automatic_uploads!==!1)return h(e)}function g(e){return!E.images_dataimg_filter||E.images_dataimg_filter(e)}function v(){return w||(w=new n(N,C)),w.findAll(a.getBody(),g).then(s(function(t){return t=e.filter(t,function(e){return"string"!=typeof e||(o.displayError(a,e),!1)}),e.each(t,function(e){d(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")}),t}))}function y(){C.destroy(),N.destroy(),w=x=null}function b(t){return t.replace(/src="(blob:[^"]+)"/g,function(t,n){var r=N.getResultUri(n);if(r)return'src="'+r+'"';var i=C.getByUri(n);return i||(i=e.reduce(a.editorManager.editors,function(e,t){return e||t.editorUpload&&t.editorUpload.blobCache.getByUri(n)},null)),i?'src="data:'+i.blob().type+";base64,"+i.base64()+'"':t})}var C=new r,x,w,E=a.settings,N=new i;return a.on("setContent",function(){a.settings.automatic_uploads!==!1?m():v()}),a.on("RawSaveContent",function(e){e.content=b(e.content)}),a.on("getContent",function(e){e.source_view||"raw"==e.format||(e.content=b(e.content))}),a.on("PostRender",function(){a.parser.addNodeFilter("img",function(t){e.each(t,function(e){var t=e.attr("src");if(!C.getByUri(t)){var n=N.getResultUri(t);n&&e.attr("src",n)}})})}),{blobCache:C,uploadImages:h,uploadImagesAuto:m,scanForImages:v,destroy:y}}}),r(Je,[k,$,_,T,g,W,c],function(e,t,n,r,i,o,a){var s=n.isContentEditableFalse;return function(t,n){function r(e,n){var r=o.collapse(e.getBoundingClientRect(),n),i,a,s,l,u;return"BODY"==t.tagName?(i=t.ownerDocument.documentElement,a=t.scrollLeft||i.scrollLeft,s=t.scrollTop||i.scrollTop):(u=t.getBoundingClientRect(),a=t.scrollLeft-u.left,s=t.scrollTop-u.top),r.left+=a,r.right+=a,r.top+=s,r.bottom+=s,r.width=1,l=e.offsetWidth-e.clientWidth,l>0&&(n&&(l*=-1),r.left+=l,r.right+=l),r}function l(){var n,r,o,a,s;for(n=i("*[contentEditable=false]",t),a=0;a<n.length;a++)r=n[a],o=r.previousSibling,e.endsWithCaretContainer(o)&&(s=o.data,1==s.length?o.parentNode.removeChild(o):o.deleteData(s.length-1,1)),o=r.nextSibling,e.startsWithCaretContainer(o)&&(s=o.data,1==s.length?o.parentNode.removeChild(o):o.deleteData(0,1));return null}function u(o,a){var l,u;return c(),n(a)?(g=e.insertBlock("p",a,o),l=r(a,o),i(g).css("top",l.top),m=i('<div class="mce-visual-caret" data-mce-bogus="all"></div>').css(l).appendTo(t),o&&m.addClass("mce-visual-caret-before"),d(),u=a.ownerDocument.createRange(),u.setStart(g,0),u.setEnd(g,0),u):(g=e.insertInline(a,o),u=a.ownerDocument.createRange(),s(g.nextSibling)?(u.setStart(g,0),u.setEnd(g,0)):(u.setStart(g,1),u.setEnd(g,1)),u)}function c(){l(),g&&(e.remove(g),g=null),m&&(m.remove(),m=null),clearInterval(h)}function d(){h=a.setInterval(function(){i("div.mce-visual-caret",t).toggleClass("mce-visual-caret-hidden")},500)}function f(){a.clearInterval(h)}function p(){return".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}"}var h,m,g;return{show:u,hide:c,getCss:p,destroy:f}}}),r(Qe,[h,_,W],function(e,t,n){function r(i){function o(t){return e.map(t,function(e){return e=n.clone(e),e.node=i,e})}if(e.isArray(i))return e.reduce(i,function(e,t){return e.concat(r(t))},[]);if(t.isElement(i))return o(i.getClientRects());if(t.isText(i)){var a=i.ownerDocument.createRange();return a.setStart(i,0),a.setEnd(i,i.data.length),o(a.getClientRects())}}return{getClientRects:r}}),r(Ze,[z,h,Qe,U,ie,oe,$,W],function(e,t,n,r,i,o,a,s){function l(e,t,n,o){for(;o=i.findNode(o,e,r.isEditableCaretCandidate,t);)if(n(o))return}function u(e,r,i,o,a,s){function u(o){var s,l,u;for(u=n.getClientRects(o),e==-1&&(u=u.reverse()),s=0;s<u.length;s++)if(l=u[s],!i(l,p)){if(f.length>0&&r(l,t.last(f))&&c++,l.line=c,a(l))return!0;f.push(l)}}var c=0,d,f=[],p;return(p=t.last(s.getClientRects()))?(d=s.getNode(),u(d),l(e,o,u,d),f):f}function c(e,t){return t.line>e}function d(e,t){return t.line===e}function f(e,n,r,i){function l(n){return 1==e?t.last(n.getClientRects()):t.last(n.getClientRects())}var u=new o(n),c,d,f,p,h=[],m=0,g,v;1==e?(c=u.next,d=s.isBelow,f=s.isAbove,p=a.after(i)):(c=u.prev,d=s.isAbove,f=s.isBelow,p=a.before(i)),v=l(p);do if(p.isVisible()&&(g=l(p),!f(g,v))){if(h.length>0&&d(g,t.last(h))&&m++,g=s.clone(g),g.position=p,g.line=m,r(g))return h;h.push(g)}while(p=c(p));return h}var p=e.curry,h=p(u,-1,s.isAbove,s.isBelow),m=p(u,1,s.isBelow,s.isAbove);return{upUntil:h,downUntil:m,positionsUntil:f,isAboveLine:p(c),isLine:p(d)}}),r(et,[z,h,_,Qe,W,ie,U],function(e,t,n,r,i,o,a){function s(e,t){return Math.abs(e.left-t)}function l(e,t){return Math.abs(e.right-t)}function u(e,n){function r(e,t){return e>=t.left&&e<=t.right}return t.reduce(e,function(e,t){var i,o;return i=Math.min(s(e,n),l(e,n)),o=Math.min(s(t,n),l(t,n)),r(n,t)?t:r(n,e)?e:o==i&&m(t.node)?t:o<i?t:e})}function c(e,t,n,r){for(;r=g(r,e,a.isEditableCaretCandidate,t);)if(n(r))return}function d(e,n){function o(e,i){var o;return o=t.filter(r.getClientRects(i),function(t){return!e(t,n)}),a=a.concat(o),0===o.length}var a=[];return a.push(n),c(-1,e,v(o,i.isAbove),n.node),c(1,e,v(o,i.isBelow),n.node),a}function f(e){return t.filter(t.toArray(e.getElementsByTagName("*")),m)}function p(e,t){return{node:e.node,before:s(e,t)<l(e,t)}}function h(e,n,i){var o,a;return o=r.getClientRects(f(e)),o=t.filter(o,function(e){return i>=e.top&&i<=e.bottom}),a=u(o,n),a&&(a=u(d(e,a),n),a&&m(a.node))?p(a,n):null}var m=n.isContentEditableFalse,g=o.findNode,v=e.curry;return{findClosestClientRect:u,findLineNodeRects:d,closestCaret:h}}),r(tt,[],function(){var e=function(e){var t,n,r,i;return i=e.getBoundingClientRect(),t=e.ownerDocument,n=t.documentElement,r=t.defaultView,{top:i.top+r.pageYOffset-n.clientTop,left:i.left+r.pageXOffset-n.clientLeft}},t=function(t){return t.inline?e(t.getBody()):{left:0,top:0}},n=function(e){var t=e.getBody();return e.inline?{left:t.scrollLeft,top:t.scrollTop}:{left:0,top:0}},r=function(e){var t=e.getBody(),n=e.getDoc().documentElement,r={left:t.scrollLeft,top:t.scrollTop},i={left:t.scrollLeft||n.scrollLeft,top:t.scrollTop||n.scrollTop};return e.inline?r:i},i=function(t,n){if(n.target.ownerDocument!==t.getDoc()){var i=e(t.getContentAreaContainer()),o=r(t);return{left:n.pageX-i.left+o.left,top:n.pageY-i.top+o.top}}return{left:n.pageX,top:n.pageY}},o=function(e,t,n){return{pageX:n.left-e.left+t.left,pageY:n.top-e.top+t.top}},a=function(e,r){return o(t(e),n(e),i(e,r))};return{calc:a}}),r(nt,[_,h,z,c,w,tt],function(e,t,n,r,i,o){var a=e.isContentEditableFalse,s=e.isContentEditableTrue,l=function(e,t){return a(t)&&t!==e},u=function(e,t,n){return t!==n&&!e.dom.isChildOf(t,n)&&!a(t)},c=function(e){var t=e.cloneNode(!0);return t.removeAttribute("data-mce-selected"),t},d=function(e,t,n,r){var i=t.cloneNode(!0);e.dom.setStyles(i,{width:n,height:r}),e.dom.setAttrib(i,"data-mce-selected",null);var o=e.dom.create("div",{"class":"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return e.dom.setStyles(o,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:r}),e.dom.setStyles(i,{margin:0,boxSizing:"border-box"}),o.appendChild(i),o},f=function(e,t){e.parentNode!==t&&t.appendChild(e)},p=function(e,t,n,r,i,o){var a=0,s=0;e.style.left=t.pageX+"px",e.style.top=t.pageY+"px",t.pageX+n>i&&(a=t.pageX+n-i),t.pageY+r>o&&(s=t.pageY+r-o),e.style.width=n-a+"px",e.style.height=r-s+"px"},h=function(e){e&&e.parentNode&&e.parentNode.removeChild(e)},m=function(e){return 0===e.button},g=function(e){return e.element},v=function(e,t){return{pageX:t.pageX-e.relX,pageY:t.pageY+5}},y=function(e,r){return function(i){if(m(i)){var o=t.find(r.dom.getParents(i.target),n.or(a,s));if(l(r.getBody(),o)){var u=r.dom.getPos(o),c=r.getBody(),f=r.getDoc().documentElement;e.element=o,e.screenX=i.screenX,e.screenY=i.screenY,e.maxX=(r.inline?c.scrollWidth:f.offsetWidth)-2,e.maxY=(r.inline?c.scrollHeight:f.offsetHeight)-2,e.relX=i.pageX-u.x,e.relY=i.pageY-u.y,e.width=o.offsetWidth,e.height=o.offsetHeight,e.ghost=d(r,o,e.width,e.height)}}}},b=function(e,t){var n=r.throttle(function(e,n){t._selectionOverrides.hideFakeCaret(),t.selection.placeCaretAt(e,n)},0);return function(r){var i=Math.max(Math.abs(r.screenX-e.screenX),Math.abs(r.screenY-e.screenY));if(g(e)&&!e.dragging&&i>10){var a=t.fire("dragstart",{target:e.element});if(a.isDefaultPrevented())return;e.dragging=!0,t.focus()}if(e.dragging){var s=v(e,o.calc(t,r));f(e.ghost,t.getBody()),p(e.ghost,s,e.width,e.height,e.maxX,e.maxY),n(r.clientX,r.clientY)}}},C=function(e){var t=e.getSel().getRangeAt(0),n=t.startContainer;return 3===n.nodeType?n.parentNode:n},x=function(e,t){return function(n){if(e.dragging&&u(t,C(t.selection),e.element)){var r=c(e.element),i=t.fire("drop",{targetClone:r,clientX:n.clientX,clientY:n.clientY});i.isDefaultPrevented()||(r=i.targetClone,t.undoManager.transact(function(){h(e.element),t.insertContent(t.dom.getOuterHTML(r)),t._selectionOverrides.hideFakeCaret()}))}E(e)}},w=function(e,t){return function(){E(e),e.dragging&&t.fire("dragend")}},E=function(e){e.dragging=!1,e.element=null,h(e.ghost)},N=function(e){var t={},n,r,o,a,s,l;n=i.DOM,l=document,r=y(t,e),o=b(t,e),a=x(t,e),s=w(t,e),e.on("mousedown",r),e.on("mousemove",o),e.on("mouseup",a),n.bind(l,"mousemove",o),n.bind(l,"mouseup",s),e.on("remove",function(){n.unbind(l,"mousemove",o),n.unbind(l,"mouseup",s)})},_=function(e){e.on("drop",function(t){var n="undefined"!=typeof t.clientX?e.getDoc().elementFromPoint(t.clientX,t.clientY):null;(a(n)||a(e.dom.getContentEditableParent(n)))&&t.preventDefault()})},S=function(e){N(e),_(e)};return{init:S}}),r(rt,[d,oe,$,k,ie,Je,Ze,et,_,T,W,I,z,h,c,nt],function(e,t,n,r,i,o,a,s,l,u,c,d,f,p,h,m){function g(e,t){for(;t=e(t);)if(t.isVisible())return t;return t}function v(u){function v(e){return u.dom.hasClass(e,"mce-offscreen-selection")}function _(){var e=u.dom.get(ue);return e?e.getElementsByTagName("*")[0]:e}function S(e){return u.dom.isBlock(e)}function k(e){e&&u.selection.setRng(e)}function T(){return u.selection.getRng()}function R(e,t){u.selection.scrollIntoView(e,t)}function A(e,t,n){var r;return r=u.fire("ShowCaret",{target:t,direction:e,before:n}),r.isDefaultPrevented()?null:(R(t,e===-1),le.show(n,t))}function B(e){var t;return t=u.fire("BeforeObjectSelected",{target:e}),t.isDefaultPrevented()?null:D(e)}function D(e){var t=e.ownerDocument.createRange();return t.selectNode(e),t}function L(e,t){var n=i.isInSameBlock(e,t);return!(n||!l.isBr(e.getNode()))||n}function M(e,t){return t=i.normalizeRange(e,ie,t),e==-1?n.fromRangeStart(t):n.fromRangeEnd(t)}function P(e){return r.isCaretContainerBlock(e.startContainer)}function O(e,t,n,r){var i,o,a,s;return!r.collapsed&&(i=N(r),C(i))?A(e,i,e==-1):(s=P(r),o=M(e,r),n(o)?B(o.getNode(e==-1)):(o=t(o))?n(o)?A(e,o.getNode(e==-1),1==e):(a=t(o),n(a)&&L(o,a)?A(e,a.getNode(e==-1),1==e):s?$(o.toRange()):null):s?r:null)}function H(e,t,n){var r,i,o,l,u,c,d,f,h;if(h=N(n),r=M(e,n),i=t(ie,a.isAboveLine(1),r),o=p.filter(i,a.isLine(1)),u=p.last(r.getClientRects()),E(r)&&(h=r.getNode()),w(r)&&(h=r.getNode(!0)),!u)return null;if(c=u.left,l=s.findClosestClientRect(o,c),l&&C(l.node))return d=Math.abs(c-l.left),f=Math.abs(c-l.right),A(e,l.node,d<f);if(h){var m=a.positionsUntil(e,ie,a.isAboveLine(1),h);if(l=s.findClosestClientRect(p.filter(m,a.isLine(1)),c))return $(l.position.toRange());if(l=p.last(p.filter(m,a.isLine(0))))return $(l.position.toRange())}}function I(t,r){function i(){var t=u.dom.create(u.settings.forced_root_block);return(!e.ie||e.ie>=11)&&(t.innerHTML='<br data-mce-bogus="1">'),t}var o,a,s;if(r.collapsed&&u.settings.forced_root_block){if(o=u.dom.getParent(r.startContainer,"PRE"),!o)return;a=1==t?ae(n.fromRangeStart(r)):se(n.fromRangeStart(r)),a||(s=i(),1==t?u.$(o).after(s):u.$(o).before(s),u.selection.select(s,!0),u.selection.collapse())}}function F(e,t,n,r){var i;return(i=O(e,t,n,r))?i:(i=I(e,r),i?i:null)}function z(e,t,n){var r;return(r=H(e,t,n))?r:(r=I(e,n),r?r:null)}function U(){return de("*[data-mce-caret]")[0]}function W(e){e.hasAttribute("data-mce-caret")&&(r.showCaretContainerBlock(e),k(T()),R(e[0]))}function V(e){var t,r;return e=i.normalizeRange(1,ie,e),t=n.fromRangeStart(e),C(t.getNode())?A(1,t.getNode(),!t.isAtEnd()):C(t.getNode(!0))?A(1,t.getNode(!0),!1):(r=u.dom.getParent(t.getNode(),f.or(C,b)),C(r)?A(1,r,!1):null)}function $(e){var t;return e&&e.collapsed?(t=V(e),t?t:e):e}function q(e){var t,i,o,a;return C(e)?(C(e.previousSibling)&&(o=e.previousSibling),i=se(n.before(e)),i||(t=ae(n.after(e))),t&&x(t.getNode())&&(a=t.getNode()),r.remove(e.previousSibling),r.remove(e.nextSibling),u.dom.remove(e),u.dom.isEmpty(u.getBody())?(u.setContent(""),void u.focus()):o?n.after(o).toRange():a?n.before(a).toRange():i?i.toRange():t?t.toRange():null):null}function j(e){var t=u.schema.getTextBlockElements();return e.nodeName in t}function Y(e){return u.dom.isEmpty(e)}function X(e,t,r){var i=u.dom,o,a,s,l;if(o=i.getParent(t.getNode(),i.isBlock),a=i.getParent(r.getNode(),i.isBlock),e===-1){if(l=r.getNode(!0),w(r)&&S(l))return j(o)?(Y(o)&&i.remove(o),n.after(l).toRange()):q(r.getNode(!0))}else if(l=t.getNode(),E(t)&&S(l))return j(a)?(Y(a)&&i.remove(a),n.before(l).toRange()):q(t.getNode());if(o===a||!j(o)||!j(a))return null;for(;s=o.firstChild;)a.appendChild(s);return u.dom.remove(o),r.toRange()}function K(e,t,n,i){var o,a,s,l;return!i.collapsed&&(o=N(i),C(o))?$(q(o)):(a=M(e,i),n(a)&&r.isCaretContainerBlock(i.startContainer)?(l=e==-1?oe.prev(a):oe.next(a),l?$(l.toRange()):i):t(a)?$(q(a.getNode(e==-1))):(s=e==-1?oe.prev(a):oe.next(a),t(s)?e===-1?X(e,a,s):X(e,s,a):void 0))}function G(){function i(e,t){if(e.isDefaultPrevented()===!1){var n=t(T());n&&(e.preventDefault(),k(n))}}function o(e){for(var t=u.getBody();e&&e!=t;){if(b(e)||C(e))return e;e=e.parentNode}return null}function l(e,t,n){return!n.collapsed&&p.reduce(n.getClientRects(),function(n,r){return n||c.containsXY(r,e,t)},!1)}function f(e){var t=!1;e.on("touchstart",function(){t=!1}),e.on("touchmove",function(){t=!0}),e.on("touchend",function(e){var n=o(e.target);C(n)&&(t||(e.preventDefault(),ee(B(n))))})}function g(){var e,t=o(u.selection.getNode());b(t)&&S(t)&&u.dom.isEmpty(t)&&(e=u.dom.create("br",{"data-mce-bogus":"1"}),u.$(t).empty().append(e),u.selection.setRng(n.before(e).toRange()))}function x(e){var t=U();if(t)return"compositionstart"==e.type?(e.preventDefault(),e.stopPropagation(),void W(t)):void(r.hasContent(t)&&W(t))}function N(e){var t;switch(e.keyCode){case d.DELETE:t=g();break;case d.BACKSPACE:t=g()}t&&e.preventDefault()}var R=y(F,1,ae,E),D=y(F,-1,se,w),L=y(K,1,E,w),M=y(K,-1,w,E),P=y(z,-1,a.upUntil),O=y(z,1,a.downUntil);u.on("mouseup",function(){var e=T();e.collapsed&&k(V(e))}),u.on("click",function(e){var t;t=o(e.target),t&&(C(t)&&(e.preventDefault(),u.focus()),b(t)&&u.dom.isChildOf(t,u.selection.getNode())&&te())}),u.on("blur NewBlock",function(){te(),re()});var H=function(e){var r=new t(e);if(!e.firstChild)return!1;var i=n.before(e.firstChild),o=r.next(i);return o&&!E(o)&&!w(o)},I=function(e,t){var n=u.dom.getParent(e,u.dom.isBlock),r=u.dom.getParent(t,u.dom.isBlock);return n===r},j=function(e){return!(e.keyCode>=112&&e.keyCode<=123)},Y=function(e,t){var n=u.dom.getParent(e,u.dom.isBlock),r=u.dom.getParent(t,u.dom.isBlock);return n&&!I(n,r)&&H(n)};f(u),u.on("mousedown",function(e){var t;if(t=o(e.target))C(t)?(e.preventDefault(),ee(B(t))):l(e.clientX,e.clientY,u.selection.getRng())||u.selection.placeCaretAt(e.clientX,e.clientY);else{te(),re();var n=s.closestCaret(ie,e.clientX,e.clientY);n&&(Y(e.target,n.node)||(e.preventDefault(),u.getBody().focus(),k(A(1,n.node,n.before))))}}),u.on("keydown",function(e){if(!d.modifierPressed(e))switch(e.keyCode){case d.RIGHT:i(e,R);break;case d.DOWN:i(e,O);break;case d.LEFT:i(e,D);break;case d.UP:i(e,P);break;case d.DELETE:i(e,L);break;case d.BACKSPACE:i(e,M);break;default:C(u.selection.getNode())&&j(e)&&e.preventDefault()}}),u.on("keyup compositionstart",function(e){x(e),N(e)},!0),u.on("cut",function(){var e=u.selection.getNode();C(e)&&h.setEditorTimeout(u,function(){k($(q(e)))})}),u.on("getSelectionRange",function(e){var t=e.range;if(ce){if(!ce.parentNode)return void(ce=null);t=t.cloneRange(),t.selectNode(ce),e.range=t}}),u.on("setSelectionRange",function(e){var t;t=ee(e.range),t&&(e.range=t)}),u.on("AfterSetSelectionRange",function(e){var t=e.range;Z(t)||re(),v(t.startContainer.parentNode)||te()}),u.on("focus",function(){h.setEditorTimeout(u,function(){u.selection.setRng($(u.selection.getRng()))},0)}),u.on("copy",function(t){var n=t.clipboardData;if(!t.isDefaultPrevented()&&t.clipboardData&&!e.ie){var r=_();r&&(t.preventDefault(),n.clearData(),n.setData("text/html",r.outerHTML),n.setData("text/plain",r.outerText))}}),m.init(u)}function J(){var e=u.contentStyles,t=".mce-content-body";e.push(le.getCss()),e.push(t+" .mce-offscreen-selection {position: absolute;left: -9999999999px;max-width: 1000000px;}"+t+" *[contentEditable=false] {cursor: default;}"+t+" *[contentEditable=true] {cursor: text;}")}function Q(e){return r.isCaretContainer(e)||r.startsWithCaretContainer(e)||r.endsWithCaretContainer(e)}function Z(e){return Q(e.startContainer)||Q(e.endContainer)}function ee(t){var n,r=u.$,i=u.dom,o,a,s,l,c,d,f,p,h;if(!t)return null;if(t.collapsed){if(!Z(t)){if(f=M(1,t),C(f.getNode()))return A(1,f.getNode(),!f.isAtEnd());if(C(f.getNode(!0)))return A(1,f.getNode(!0),!1)}return null}return s=t.startContainer,l=t.startOffset,c=t.endOffset,3==s.nodeType&&0==l&&C(s.parentNode)&&(s=s.parentNode,l=i.nodeIndex(s),s=s.parentNode),1!=s.nodeType?null:(c==l+1&&(n=s.childNodes[l]),C(n)?(p=h=n.cloneNode(!0),d=u.fire("ObjectSelected",{target:n,targetClone:p}),d.isDefaultPrevented()?null:(p=d.targetClone,o=r("#"+ue),0===o.length&&(o=r('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>').attr("id",ue),o.appendTo(u.getBody())),t=u.dom.createRng(),p===h&&e.ie?(o.empty().append('<p style="font-size: 0" data-mce-bogus="all">\xa0</p>').append(p),t.setStartAfter(o[0].firstChild.firstChild),t.setEndAfter(p)):(o.empty().append("\xa0").append(p).append("\xa0"),t.setStart(o[0].firstChild,1),t.setEnd(o[0].lastChild,0)),o.css({top:i.getPos(n,u.getBody()).y}),o[0].focus(),a=u.selection.getSel(),a.removeAllRanges(),a.addRange(t),u.$("*[data-mce-selected]").removeAttr("data-mce-selected"),n.setAttribute("data-mce-selected",1),ce=n,re(),t)):null)}function te(){ce&&(ce.removeAttribute("data-mce-selected"),u.$("#"+ue).remove(),ce=null)}function ne(){le.destroy(),ce=null}function re(){le.hide()}var ie=u.getBody(),oe=new t(ie),ae=y(g,oe.next),se=y(g,oe.prev),le=new o(u.getBody(),S),ue="sel-"+u.dom.uniqueId(),ce,de=u.$;return e.ceFalse&&(G(),J()),{showBlockCaretContainer:W,hideFakeCaret:re,destroy:ne}}var y=f.curry,b=l.isContentEditableTrue,C=l.isContentEditableFalse,x=l.isElement,w=i.isAfterContentEditableFalse,E=i.isBeforeContentEditableFalse,N=u.getSelectedNode;return v}),r(it,[],function(){var e=0,t=function(){var e=function(){return Math.round(4294967295*Math.random()).toString(36)},t=(new Date).getTime();return"s"+t.toString(36)+e()+e()+e()},n=function(n){return n+e++ +t()};return{uuid:n}}),r(ot,[],function(){var e=function(e,t,n){var r=e.sidebars?e.sidebars:[];r.push({name:t,settings:n}),e.sidebars=r};return{add:e}}),r(at,[w,g,N,R,A,O,P,Y,J,te,ne,re,le,ue,E,f,Le,Ie,B,L,ze,d,m,c,Ue,We,Ve,Ge,rt,it,ot,Ke],function(e,n,r,i,o,a,s,l,u,c,d,f,p,h,m,g,v,y,b,C,x,w,E,N,_,S,k,T,R,A,B,D){function L(e,t,i){var o=this,a,s,l;a=o.documentBaseUrl=i.documentBaseURL,s=i.baseURI,l=i.defaultSettings,t=H({id:e,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:a,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,padd_empty_editor:!0,render_ui:!0,indentation:"30px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",validate:!0,entity_encoding:"named",url_converter:o.convertURL,url_converter_scope:o,ie7_compat:!0},l,t),l&&l.external_plugins&&t.external_plugins&&(t.external_plugins=H({},l.external_plugins,t.external_plugins)),o.settings=t,r.language=t.language||"en",r.languageLoad=t.language_load,r.baseURL=i.baseURL,o.id=t.id=e,o.setDirty(!1),o.plugins={},o.documentBaseURI=new h(t.document_base_url||a,{base_uri:s}),o.baseURI=s,o.contentCSS=[],o.contentStyles=[],o.shortcuts=new k(o),o.loadedCSS={},o.editorCommands=new p(o),o.suffix=i.suffix,o.editorManager=i,o.inline=t.inline,o.settings.content_editable=o.inline,t.cache_suffix&&(w.cacheSuffix=t.cache_suffix.replace(/^[\?\&]+/,"")),t.override_viewport===!1&&(w.overrideViewPort=!1),i.fire("SetupEditor",o),o.execCallback("setup",o),o.$=n.overrideDefaults(function(){return{context:o.inline?o.getBody():o.getDoc(),element:o.getBody()}})}var M=e.DOM,P=r.ThemeManager,O=r.PluginManager,H=E.extend,I=E.each,F=E.explode,z=E.inArray,U=E.trim,W=E.resolve,V=g.Event,$=w.gecko,q=w.ie;return L.prototype={render:function(){function e(){M.unbind(window,"ready",e),n.render()}function t(){var e=m.ScriptLoader;if(r.language&&"en"!=r.language&&!r.language_url&&(r.language_url=n.editorManager.baseURL+"/langs/"+r.language+".js"),r.language_url&&e.add(r.language_url),r.theme&&"function"!=typeof r.theme&&"-"!=r.theme.charAt(0)&&!P.urls[r.theme]){var t=r.theme_url;t=t?n.documentBaseURI.toAbsolute(t):"themes/"+r.theme+"/theme"+o+".js",P.load(r.theme,t)}E.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),I(r.external_plugins,function(e,t){O.load(t,e),r.plugins+=" "+t}),I(r.plugins.split(/[ ,]/),function(e){if(e=U(e),e&&!O.urls[e])if("-"==e.charAt(0)){e=e.substr(1,e.length);var t=O.dependencies(e);I(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=O.createUrl(t,e),O.load(e.resource,e)})}else O.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),e.loadQueue(function(){n.removed||n.init()},n,function(e){D.pluginLoadError(n,e[0]),n.removed||n.init()})}var n=this,r=n.settings,i=n.id,o=n.suffix;if(!V.domLoaded)return void M.bind(window,"ready",e);if(n.getElement()&&w.contentEditable){r.inline?n.inline=!0:(n.orgVisibility=n.getElement().style.visibility,n.getElement().style.visibility="hidden");var a=n.getElement().form||M.getParent(i,"form");a&&(n.formElement=a,r.hidden_input&&!/TEXTAREA|INPUT/i.test(n.getElement().nodeName)&&(M.insertAfter(M.create("input",{type:"hidden",name:i}),i),n.hasHiddenInput=!0),n.formEventDelegate=function(e){n.fire(e.type,e)},M.bind(a,"submit reset",n.formEventDelegate),n.on("reset",function(){n.setContent(n.startContent,{format:"raw"})}),!r.submit_patch||a.submit.nodeType||a.submit.length||a._mceOldSubmit||(a._mceOldSubmit=a.submit,a.submit=function(){return n.editorManager.triggerSave(),n.setDirty(!1),a._mceOldSubmit(a)})),n.windowManager=new v(n),n.notificationManager=new y(n),"xml"==r.encoding&&n.on("GetContent",function(e){e.save&&(e.content=M.encode(e.content))}),r.add_form_submit_trigger&&n.on("submit",function(){n.initialized&&n.save()}),r.add_unload_trigger&&(n._beforeUnload=function(){!n.initialized||n.destroyed||n.isHidden()||n.save({format:"raw",no_events:!0,set_dirty:!1})},n.editorManager.on("BeforeUnload",n._beforeUnload)),n.editorManager.add(n),t()}},init:function(){function e(n){var r=O.get(n),i,o;if(i=O.urls[n]||t.documentBaseUrl.replace(/\/$/,""),n=U(n),r&&z(m,n)===-1){if(I(O.dependencies(n),function(t){e(t)}),t.plugins[n])return;o=new r(t,i,t.$),t.plugins[n]=o,o.init&&(o.init(t,i),m.push(n))}}var t=this,n=t.settings,r=t.getElement(),i,o,a,s,l,u,c,d,f,p,h,m=[];if(t.rtl=n.rtl_ui||t.editorManager.i18n.rtl,t.editorManager.i18n.setCode(n.language),n.aria_label=n.aria_label||M.getAttrib(r,"aria-label",t.getLang("aria.rich_text_area")),t.fire("ScriptsLoaded"),n.theme&&("function"!=typeof n.theme?(n.theme=n.theme.replace(/-/,""),u=P.get(n.theme),t.theme=new u(t,P.urls[n.theme]),t.theme.init&&t.theme.init(t,P.urls[n.theme]||t.documentBaseUrl.replace(/\/$/,""),t.$)):t.theme=n.theme),I(n.plugins.replace(/\-/g,"").split(/[ ,]/),e),n.render_ui&&t.theme&&(t.orgDisplay=r.style.display,"function"!=typeof n.theme?(i=n.width||r.style.width||r.offsetWidth,o=n.height||r.style.height||r.offsetHeight,a=n.min_height||100,p=/^[0-9\.]+(|px)$/i,p.test(""+i)&&(i=Math.max(parseInt(i,10),100)),p.test(""+o)&&(o=Math.max(parseInt(o,10),a)),l=t.theme.renderUI({targetNode:r,width:i,height:o,deltaWidth:n.delta_width,deltaHeight:n.delta_height}),n.content_editable||(o=(l.iframeHeight||o)+("number"==typeof o?l.deltaHeight||0:""),o<a&&(o=a))):(l=n.theme(t,r),l.editorContainer.nodeType&&(l.editorContainer.id=l.editorContainer.id||t.id+"_parent"),l.iframeContainer.nodeType&&(l.iframeContainer.id=l.iframeContainer.id||t.id+"_iframecontainer"),o=l.iframeHeight||r.offsetHeight),t.editorContainer=l.editorContainer),n.content_css&&I(F(n.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),n.content_style&&t.contentStyles.push(n.content_style),n.content_editable)return r=s=l=null,t.initContentBody();if(t.iframeHTML=n.doctype+"<html><head>",n.document_base_url!=t.documentBaseUrl&&(t.iframeHTML+='<base href="'+t.documentBaseURI.getURI()+'" />'),!w.caretAfter&&n.ie7_compat&&(t.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'),t.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />',!/#$/.test(document.location.href))for(h=0;h<t.contentCSS.length;h++){var g=t.contentCSS[h];t.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+E._addCacheSuffix(g)+'" />',t.loadedCSS[g]=!0}d=n.body_id||"tinymce",d.indexOf("=")!=-1&&(d=t.getParam("body_id","","hash"),d=d[t.id]||d),f=n.body_class||"",f.indexOf("=")!=-1&&(f=t.getParam("body_class","","hash"),f=f[t.id]||""),n.content_security_policy&&(t.iframeHTML+='<meta http-equiv="Content-Security-Policy" content="'+n.content_security_policy+'" />'),t.iframeHTML+='</head><body id="'+d+'" class="mce-content-body '+f+'" data-id="'+t.id+'"><br></body></html>';var v='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinymce.get("'+t.id+'");document.write(ed.iframeHTML);document.close();ed.initContentBody(true);})()';document.domain!=location.hostname&&w.ie&&w.ie<12&&(c=v);var y=M.create("iframe",{id:t.id+"_ifr",frameBorder:"0",allowTransparency:"true",title:t.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),style:{width:"100%",height:o,display:"block"}});if(y.onload=function(){y.onload=null,t.fire("load")},M.setAttrib(y,"src",c||'javascript:""'),t.contentAreaContainer=l.iframeContainer,t.iframeElement=y,s=M.add(l.iframeContainer,y),q)try{t.getDoc()}catch(b){s.src=c=v}l.editorContainer&&(M.get(l.editorContainer).style.display=t.orgDisplay,t.hidden=M.isHidden(l.editorContainer)),t.getElement().style.display="none",M.setAttrib(t.id,"aria-hidden",!0),c||t.initContentBody(),r=s=l=null},initContentBody:function(t){var n=this,r=n.settings,s=n.getElement(),p=n.getDoc(),h,m;r.inline||(n.getElement().style.visibility=n.orgVisibility),t||r.content_editable||(p.open(),p.write(n.iframeHTML),p.close()),r.content_editable&&(n.on("remove",function(){var e=this.getBody();M.removeClass(e,"mce-content-body"),M.removeClass(e,"mce-edit-focus"),M.setAttrib(e,"contentEditable",null)}),M.addClass(s,"mce-content-body"),n.contentDocument=p=r.content_document||document,n.contentWindow=r.content_window||window,n.bodyElement=s,r.content_document=r.content_window=null,r.root_name=s.nodeName.toLowerCase()),h=n.getBody(),h.disabled=!0,n.readonly=r.readonly,n.readonly||(n.inline&&"static"==M.getStyle(h,"position",!0)&&(h.style.position="relative"),h.contentEditable=n.getParam("content_editable_state",!0)),h.disabled=!1,n.editorUpload=new T(n),n.schema=new b(r),n.dom=new e(p,{keep_values:!0,url_converter:n.convertURL,url_converter_scope:n,hex_colors:r.force_hex_style_colors,class_filter:r.class_filter,update_styles:!0,root_element:n.inline?n.getBody():null,collect:r.content_editable,schema:n.schema,onSetAttrib:function(e){n.fire("SetAttrib",e)}}),n.parser=new C(r,n.schema),n.parser.addAttributeFilter("src,href,style,tabindex",function(e,t){for(var r=e.length,i,o=n.dom,a,s;r--;)if(i=e[r],
+a=i.attr(t),s="data-mce-"+t,!i.attributes.map[s]){if(0===a.indexOf("data:")||0===a.indexOf("blob:"))continue;"style"===t?(a=o.serializeStyle(o.parseStyle(a),i.name),a.length||(a=null),i.attr(s,a),i.attr(t,a)):"tabindex"===t?(i.attr(s,a),i.attr(t,null)):i.attr(s,n.convertURL(a,t,i.name))}}),n.parser.addNodeFilter("script",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("type")||"no/type",0!==r.indexOf("mce-")&&n.attr("type","mce-"+r)}),n.parser.addNodeFilter("#cdata",function(e){for(var t=e.length,n;t--;)n=e[t],n.type=8,n.name="#comment",n.value="[CDATA["+n.value+"]]"}),n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,r,i=n.schema.getNonEmptyElements();t--;)r=e[t],r.isEmpty(i)&&0===r.getAll("br").length&&(r.append(new o("br",1)).shortEnded=!0)}),n.serializer=new a(r,n),n.selection=new l(n.dom,n.getWin(),n.serializer,n),n.formatter=new u(n),n.undoManager=new c(n),n.forceBlocks=new f(n),n.enterKey=new d(n),n._nodeChangeDispatcher=new i(n),n._selectionOverrides=new R(n),n.fire("PreInit"),r.browser_spellcheck||r.gecko_spellcheck||(p.body.spellcheck=!1,M.setAttrib(h,"spellcheck","false")),n.quirks=new x(n),n.fire("PostRender"),r.directionality&&(h.dir=r.directionality),r.nowrap&&(h.style.whiteSpace="nowrap"),r.protect&&n.on("BeforeSetContent",function(e){I(r.protect,function(t){e.content=e.content.replace(t,function(e){return"<!--mce:protected "+escape(e)+"-->"})})}),n.on("SetContent",function(){n.addVisual(n.getBody())}),r.padd_empty_editor&&n.on("PostProcess",function(e){e.content=e.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|<br \/>|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")}),n.load({initial:!0,format:"html"}),n.startContent=n.getContent({format:"raw"}),n.initialized=!0,n.bindPendingEventDelegates(),n.fire("init"),n.focus(!0),n.nodeChanged({initial:!0}),n.execCallback("init_instance_callback",n),n.on("compositionstart compositionend",function(e){n.composing="compositionstart"===e.type}),n.contentStyles.length>0&&(m="",I(n.contentStyles,function(e){m+=e+"\r\n"}),n.dom.addStyle(m)),I(n.contentCSS,function(e){n.loadedCSS[e]||(n.dom.loadCSS(e),n.loadedCSS[e]=!0)}),r.auto_focus&&N.setEditorTimeout(n,function(){var e;e=r.auto_focus===!0?n:n.editorManager.get(r.auto_focus),e.destroyed||e.focus()},100),s=p=h=null},focus:function(e){function t(e){return n.dom.getParent(e,function(e){return"true"===n.dom.getContentEditable(e)})}var n=this,r=n.selection,i=n.settings.content_editable,o,a,s=n.getDoc(),l=n.getBody(),u;if(!e){if(o=r.getRng(),o.item&&(a=o.item(0)),n.quirks.refreshContentEditable(),u=t(r.getNode()),n.$.contains(l,u))return u.focus(),r.normalize(),void n.editorManager.setActive(n);if(i||(w.opera||n.getBody().focus(),n.getWin().focus()),$||i){if(l.setActive)try{l.setActive()}catch(c){l.focus()}else l.focus();i&&r.normalize()}a&&a.ownerDocument==s&&(o=s.body.createControlRange(),o.addElement(a),o.select())}n.editorManager.setActive(n)},execCallback:function(e){var t=this,n=t.settings[e],r;if(n)return t.callbackLookup&&(r=t.callbackLookup[e])&&(n=r.func,r=r.scope),"string"==typeof n&&(r=n.replace(/\.\w+$/,""),r=r?W(r):0,n=W(n),t.callbackLookup=t.callbackLookup||{},t.callbackLookup[e]={func:n,scope:r}),n.apply(r||t,Array.prototype.slice.call(arguments,1))},translate:function(e){var t=this.settings.language||"en",n=this.editorManager.i18n;return e?(e=n.data[t+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,r){return n.data[t+"."+r]||"{#"+r+"}"}),this.editorManager.translate(e)):""},getLang:function(e,n){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(n!==t?n:"{#"+e+"}")},getParam:function(e,t,n){var r=e in this.settings?this.settings[e]:t,i;return"hash"===n?(i={},"string"==typeof r?I(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(e){e=e.split("="),e.length>1?i[U(e[0])]=U(e[1]):i[U(e[0])]=U(e)}):i=r,i):r},nodeChanged:function(e){this._nodeChangeDispatcher.nodeChanged(e)},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.text||t.icon||(t.icon=e),n.buttons=n.buttons||{},t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addSidebar:function(e,t){return B.add(this,e,t)},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems=n.menuItems||{},n.menuItems[e]=t},addContextToolbar:function(e,t){var n=this,r;n.contextToolbars=n.contextToolbars||[],"string"==typeof e&&(r=e,e=function(e){return n.dom.is(e,r)}),n.contextToolbars.push({id:A.uuid("mcet"),predicate:e,items:t})},addCommand:function(e,t,n){this.editorCommands.addCommand(e,t,n)},addQueryStateHandler:function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},addQueryValueHandler:function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},queryCommandState:function(e){return this.editorCommands.queryCommandState(e)},queryCommandValue:function(e){return this.editorCommands.queryCommandValue(e)},queryCommandSupported:function(e){return this.editorCommands.queryCommandSupported(e)},show:function(){var e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable=!0:(M.show(e.getContainer()),M.hide(e.id)),e.load(),e.fire("show"))},hide:function(){var e=this,t=e.getDoc();e.hidden||(q&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable=!1,e==e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(M.hide(e.getContainer()),M.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},isHidden:function(){return!!this.hidden},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var n=this,r=n.getElement(),i;if(r)return e=e||{},e.load=!0,i=n.setContent(r.value!==t?r.value:r.innerHTML,e),e.element=r,e.no_events||n.fire("LoadContent",e),e.element=r=null,i},save:function(e){var t=this,n=t.getElement(),r,i;if(n&&t.initialized)return e=e||{},e.save=!0,e.element=n,r=e.content=t.getContent(e),e.no_events||t.fire("SaveContent",e),"raw"==e.format&&t.fire("RawSaveContent",e),r=e.content,/TEXTAREA|INPUT/i.test(n.nodeName)?n.value=r:(t.inline||(n.innerHTML=r),(i=M.getParent(t.id,"form"))&&I(i.elements,function(e){if(e.name==t.id)return e.value=r,!1})),e.element=n=null,e.set_dirty!==!1&&t.setDirty(!1),r},setContent:function(e,t){var n=this,r=n.getBody(),i,o;return t=t||{},t.format=t.format||"html",t.set=!0,t.content=e,t.no_events||n.fire("BeforeSetContent",t),e=t.content,0===e.length||/^\s+$/.test(e)?(o=q&&q<11?"":'<br data-mce-bogus="1">',"TABLE"==r.nodeName?e="<tr><td>"+o+"</td></tr>":/^(UL|OL)$/.test(r.nodeName)&&(e="<li>"+o+"</li>"),i=n.settings.forced_root_block,i&&n.schema.isValidChild(r.nodeName.toLowerCase(),i.toLowerCase())?(e=o,e=n.dom.createHTML(i,n.settings.forced_root_block_attrs,e)):q||e||(e='<br data-mce-bogus="1">'),n.dom.setHTML(r,e),n.fire("SetContent",t)):("raw"!==t.format&&(e=new s({validate:n.validate},n.schema).serialize(n.parser.parse(e,{isRootContent:!0}))),t.content=U(e),n.dom.setHTML(r,t.content),t.no_events||n.fire("SetContent",t)),t.content},getContent:function(e){var t=this,n,r=t.getBody();return e=e||{},e.format=e.format||"html",e.get=!0,e.getInner=!0,e.no_events||t.fire("BeforeGetContent",e),n="raw"==e.format?E.trim(t.serializer.getTrimmedContent()):"text"==e.format?r.innerText||r.textContent:t.serializer.serialize(r,e),"text"!=e.format?e.content=U(n):e.content=n,e.no_events||t.fire("GetContent",e),e.content},insertContent:function(e,t){t&&(e=H({content:e},t)),this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},setDirty:function(e){var t=!this.isNotDirty;this.isNotDirty=!e,e&&e!=t&&this.fire("dirty")},setMode:function(e){S.setMode(this,e)},getContainer:function(){var e=this;return e.container||(e.container=M.get(e.editorContainer||e.id+"_parent")),e.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return this.targetElm||(this.targetElm=M.get(this.id)),this.targetElm},getWin:function(){var e=this,t;return e.contentWindow||(t=e.iframeElement,t&&(e.contentWindow=t.contentWindow)),e.contentWindow},getDoc:function(){var e=this,t;return e.contentDocument||(t=e.getWin(),t&&(e.contentDocument=t.document)),e.contentDocument},getBody:function(){var e=this.getDoc();return this.bodyElement||(e?e.body:null)},convertURL:function(e,t,n){var r=this,i=r.settings;return i.urlconverter_callback?r.execCallback("urlconverter_callback",e,n,!0,t):!i.convert_urls||n&&"LINK"==n.nodeName||0===e.indexOf("file:")||0===e.length?e:i.relative_urls?r.documentBaseURI.toRelative(e):e=r.documentBaseURI.toAbsolute(e,i.remove_script_host)},addVisual:function(e){var n=this,r=n.settings,i=n.dom,o;e=e||n.getBody(),n.hasVisual===t&&(n.hasVisual=r.visual),I(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return o=r.visual_table_class||"mce-item-table",t=i.getAttrib(e,"border"),void(t&&"0"!=t||!n.hasVisual?i.removeClass(e,o):i.addClass(e,o));case"A":return void(i.getAttrib(e,"href",!1)||(t=i.getAttrib(e,"name")||e.id,o=r.visual_anchor_class||"mce-item-anchor",t&&n.hasVisual?i.addClass(e,o):i.removeClass(e,o)))}}),n.fire("VisualAid",{element:e,hasVisual:n.hasVisual})},remove:function(){var e=this;e.removed||(e.save(),e.removed=1,e.unbindAllNativeEvents(),e.hasHiddenInput&&M.remove(e.getElement().nextSibling),e.inline||(q&&q<10&&e.getDoc().execCommand("SelectAll",!1,null),M.setStyle(e.id,"display",e.orgDisplay),e.getBody().onload=null),e.fire("remove"),e.editorManager.remove(e),M.remove(e.getContainer()),e._selectionOverrides.destroy(),e.editorUpload.destroy(),e.destroy())},destroy:function(e){var t=this,n;if(!t.destroyed){if(!e&&!t.removed)return void t.remove();e||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),t.selection.destroy(),t.dom.destroy()),n=t.formElement,n&&(n._mceOldSubmit&&(n.submit=n._mceOldSubmit,n._mceOldSubmit=null),M.unbind(n,"submit reset",t.formEventDelegate)),t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null,t.selection&&(t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null),t.destroyed=1}},uploadImages:function(e){return this.editorUpload.uploadImages(e)},_scanForImages:function(){return this.editorUpload.scanForImages()}},H(L.prototype,_),L}),r(st,[m],function(e){var t={},n="en";return{setCode:function(e){e&&(n=e,this.rtl=!!this.data[e]&&"rtl"===this.data[e]._dir)},getCode:function(){return n},rtl:!1,add:function(e,n){var r=t[e];r||(t[e]=r={});for(var i in n)r[i]=n[i];this.setCode(e)},translate:function(r){function i(t){return e.is(t,"function")?Object.prototype.toString.call(t):o(t)?"":""+t}function o(t){return""===t||null===t||e.is(t,"undefined")}function a(t){return t=i(t),e.hasOwn(s,t)?i(s[t]):t}var s=t[n]||{};if(o(r))return"";if(e.is(r,"object")&&e.hasOwn(r,"raw"))return i(r.raw);if(e.is(r,"array")){var l=r.slice(1);r=a(r[0]).replace(/\{([0-9]+)\}/g,function(t,n){return e.hasOwn(l,n)?i(l[n]):t})}return a(r).replace(/{context:\w+}$/,"")},data:t}}),r(lt,[w,c,d],function(e,t,n){function r(e){function r(){try{return document.activeElement}catch(e){return document.body}}function u(e,t){if(t&&t.startContainer){if(!e.isChildOf(t.startContainer,e.getRoot())||!e.isChildOf(t.endContainer,e.getRoot()))return;return{startContainer:t.startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset}}return t}function c(e,t){var n;return t.startContainer?(n=e.getDoc().createRange(),n.setStart(t.startContainer,t.startOffset),n.setEnd(t.endContainer,t.endOffset)):n=t,n}function d(d){var f=d.editor;f.on("init",function(){(f.inline||n.ie)&&("onbeforedeactivate"in document&&n.ie<9?f.dom.bind(f.getBody(),"beforedeactivate",function(e){if(e.target==f.getBody())try{f.lastRng=f.selection.getRng()}catch(t){}}):f.on("nodechange mouseup keyup",function(e){var t=r();"nodechange"==e.type&&e.selectionChange||(t&&t.id==f.id+"_ifr"&&(t=f.getBody()),f.dom.isChildOf(t,f.getBody())&&(f.lastRng=f.selection.getRng()))}),n.webkit&&!i&&(i=function(){var t=e.activeEditor;if(t&&t.selection){var n=t.selection.getRng();n&&!n.collapsed&&(f.lastRng=n)}},s.bind(document,"selectionchange",i)))}),f.on("setcontent",function(){f.lastRng=null}),f.on("mousedown",function(){f.selection.lastFocusBookmark=null}),f.on("focusin",function(){var t=e.focusedEditor,n;f.selection.lastFocusBookmark&&(n=c(f,f.selection.lastFocusBookmark),f.selection.lastFocusBookmark=null,f.selection.setRng(n)),t!=f&&(t&&t.fire("blur",{focusedEditor:f}),e.setActive(f),e.focusedEditor=f,f.fire("focus",{blurredEditor:t}),f.focus(!0)),f.lastRng=null}),f.on("focusout",function(){t.setEditorTimeout(f,function(){var t=e.focusedEditor;l(f,r())||t!=f||(f.fire("blur",{focusedEditor:null}),e.focusedEditor=null,f.selection&&(f.selection.lastFocusBookmark=null))})}),o||(o=function(t){var n=e.activeEditor,r;r=t.target,n&&r.ownerDocument==document&&(n.selection&&r!=n.getBody()&&(n.selection.lastFocusBookmark=u(n.dom,n.lastRng)),r==document.body||l(n,r)||e.focusedEditor!=n||(n.fire("blur",{focusedEditor:null}),e.focusedEditor=null))},s.bind(document,"focusin",o)),f.inline&&!a&&(a=function(t){var n=e.activeEditor,r=n.dom;if(n.inline&&r&&!r.isChildOf(t.target,n.getBody())){var i=n.selection.getRng();i.collapsed||(n.lastRng=i)}},s.bind(document,"mouseup",a))}function f(t){e.focusedEditor==t.editor&&(e.focusedEditor=null),e.activeEditor||(s.unbind(document,"selectionchange",i),s.unbind(document,"focusin",o),s.unbind(document,"mouseup",a),i=o=a=null)}e.on("AddEditor",d),e.on("RemoveEditor",f)}var i,o,a,s=e.DOM,l=function(e,t){var n=e?e.settings.custom_ui_selector:"",i=s.getParent(t,function(t){return r.isEditorUIElement(t)||!!n&&e.dom.is(t,n)});return null!==i};return r.isEditorUIElement=function(e){return e.className.toString().indexOf("mce-")!==-1},r._isUIElement=l,r}),r(ut,[at,g,w,ue,d,m,u,pe,st,lt,N],function(e,t,n,r,i,o,a,s,l,u,c){function d(e){v(x.editors,function(t){"scroll"===e.type?t.fire("ScrollWindow",e):t.fire("ResizeWindow",e)})}function f(e,n){n!==w&&(n?t(window).on("resize scroll",d):t(window).off("resize scroll",d),w=n)}function p(e){var t=x.editors,n;delete t[e.id];for(var r=0;r<t.length;r++)if(t[r]==e){t.splice(r,1),n=!0;break}return x.activeEditor==e&&(x.activeEditor=t[0]),x.focusedEditor==e&&(x.focusedEditor=null),n}function h(e){return e&&e.initialized&&!(e.getContainer()||e.getBody()).parentNode&&(p(e),e.unbindAllNativeEvents(),e.destroy(!0),e.removed=!0,e=null),e}var m=n.DOM,g=o.explode,v=o.each,y=o.extend,b=0,C,x,w=!1;return x={$:t,majorVersion:"4",minorVersion:"5.8",releaseDate:"2017-10-05",editors:[],i18n:l,activeEditor:null,setup:function(){var e=this,t,n,i="",o,a;if(n=r.getDocumentBaseUrl(document.location),/^[^:]+:\/\/\/?[^\/]+\//.test(n)&&(n=n.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/")),o=window.tinymce||window.tinyMCEPreInit)t=o.base||o.baseURL,i=o.suffix;else{for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){a=s[l].src;var c=a.substring(a.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(a)){c.indexOf(".min")!=-1&&(i=".min"),t=a.substring(0,a.lastIndexOf("/"));break}}!t&&document.currentScript&&(a=document.currentScript.src,a.indexOf(".min")!=-1&&(i=".min"),t=a.substring(0,a.lastIndexOf("/")))}e.baseURL=new r(n).toAbsolute(t),e.documentBaseURL=n,e.baseURI=new r(e.baseURL),e.suffix=i,e.focusManager=new u(e)},overrideDefaults:function(e){var t,n;t=e.base_url,t&&(this.baseURL=new r(this.documentBaseURL).toAbsolute(t.replace(/\/+$/,"")),this.baseURI=new r(this.baseURL)),n=e.suffix,e.suffix&&(this.suffix=n),this.defaultSettings=e;var i=e.plugin_base_urls;for(var o in i)c.PluginManager.urls[o]=i[o]},init:function(n){function r(e,t){return e.inline&&t.tagName.toLowerCase()in C}function i(e,t){window.console&&!window.test&&window.console.log(e,t)}function s(e){var t=e.id;return t||(t=e.name,t=t&&!m.get(t)?e.name:m.uniqueId(),e.setAttribute("id",t)),t}function l(e){var t=n[e];if(t)return t.apply(f,Array.prototype.slice.call(arguments,2))}function u(e,t){return t.constructor===RegExp?t.test(e.className):m.hasClass(e,t)}function c(e){var t,n=[];if(e.types)return v(e.types,function(e){n=n.concat(m.select(e.selector))}),n;if(e.selector)return m.select(e.selector);if(e.target)return[e.target];switch(e.mode){case"exact":t=e.elements||"",t.length>0&&v(g(t),function(e){var t;(t=m.get(e))?n.push(t):v(document.forms,function(t){v(t.elements,function(t){t.name===e&&(e="mce_editor_"+b++,m.setAttrib(t,"id",e),n.push(t))})})});break;case"textareas":case"specific_textareas":v(m.select("textarea"),function(t){e.editor_deselector&&u(t,e.editor_deselector)||e.editor_selector&&!u(t,e.editor_selector)||n.push(t)})}return n}function d(){function a(t,n,r){var i=new e(t,n,f);p.push(i),i.on("init",function(){++u===g.length&&x(p)}),i.targetElm=i.targetElm||r,i.render()}var u=0,p=[],g;return m.unbind(window,"ready",d),l("onpageload"),g=t.unique(c(n)),n.types?void v(n.types,function(e){o.each(g,function(t){return!m.is(t,e.selector)||(a(s(t),y({},n,e),t),!1)})}):(o.each(g,function(e){h(f.get(e.id))}),g=o.grep(g,function(e){return!f.get(e.id)}),void v(g,function(e){r(n,e)?i("Could not initialize inline editor on invalid inline target element",e):a(s(e),n,e)}))}var f=this,p,C;C=o.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option tbody tfoot thead tr script noscript style textarea video audio iframe object menu"," ");var x=function(e){p=e};return f.settings=n,m.bind(window,"ready",d),new a(function(e){p?e(p):x=function(t){e(t)}})},get:function(e){return arguments.length?e in this.editors?this.editors[e]:null:this.editors},add:function(e){var t=this,n=t.editors;return n[e.id]=e,n.push(e),f(n,!0),t.activeEditor=e,t.fire("AddEditor",{editor:e}),C||(C=function(){t.fire("BeforeUnload")},m.bind(window,"beforeunload",C)),e},createEditor:function(t,n){return this.add(new e(t,n,this))},remove:function(e){var t=this,n,r=t.editors,i;{if(e)return"string"==typeof e?(e=e.selector||e,void v(m.select(e),function(e){i=r[e.id],i&&t.remove(i)})):(i=e,r[i.id]?(p(i)&&t.fire("RemoveEditor",{editor:i}),r.length||m.unbind(window,"beforeunload",C),i.remove(),f(r,r.length>0),i):null);for(n=r.length-1;n>=0;n--)t.remove(r[n])}},execCommand:function(t,n,r){var i=this,o=i.get(r);switch(t){case"mceAddEditor":return i.get(r)||new e(r,i.settings,i).render(),!0;case"mceRemoveEditor":return o&&o.remove(),!0;case"mceToggleEditor":return o?(o.isHidden()?o.show():o.hide(),!0):(i.execCommand("mceAddEditor",0,r),!0)}return!!i.activeEditor&&i.activeEditor.execCommand(t,n,r)},triggerSave:function(){v(this.editors,function(e){e.save()})},addI18n:function(e,t){l.add(e,t)},translate:function(e){return l.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!=e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e}},y(x,s),x.setup(),window.tinymce=window.tinyMCE=x,x}),r(ct,[ut,m],function(e,t){var n=t.each,r=t.explode;e.on("AddEditor",function(e){var t=e.editor;t.on("preInit",function(){function e(e,t){n(t,function(t,n){t&&s.setStyle(e,n,t)}),s.rename(e,"span")}function i(e){s=t.dom,l.convert_fonts_to_spans&&n(s.select("font,u,strike",e.node),function(e){o[e.nodeName.toLowerCase()](s,e)})}var o,a,s,l=t.settings;l.inline_styles&&(a=r(l.font_size_legacy_values),o={font:function(t,n){e(n,{backgroundColor:n.style.backgroundColor,color:n.color,fontFamily:n.face,fontSize:a[parseInt(n.size,10)-1]})},u:function(n,r){"html4"===t.settings.schema&&e(r,{textDecoration:"underline"})},strike:function(t,n){e(n,{textDecoration:"line-through"})}},t.on("PreProcess SetContent",i))})})}),r(dt,[pe,m],function(e,t){var n={send:function(e){function r(){!e.async||4==i.readyState||o++>1e4?(e.success&&o<1e4&&200==i.status?e.success.call(e.success_scope,""+i.responseText,i,e):e.error&&e.error.call(e.error_scope,o>1e4?"TIMED_OUT":"GENERAL",i,e),i=null):setTimeout(r,10)}var i,o=0;if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=e.async!==!1,e.data=e.data||"",n.fire("beforeInitialize",{settings:e}),i=new XMLHttpRequest){if(i.overrideMimeType&&i.overrideMimeType(e.content_type),i.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(i.withCredentials=!0),e.content_type&&i.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&t.each(e.requestheaders,function(e){i.setRequestHeader(e.key,e.value)}),i.setRequestHeader("X-Requested-With","XMLHttpRequest"),i=n.fire("beforeSend",{xhr:i,settings:e}).xhr,i.send(e.data),!e.async)return r();setTimeout(r,10)}}};return t.extend(n,e),n}),r(ft,[],function(){function e(t,n){var r,i,o,a;if(n=n||'"',null===t)return"null";if(o=typeof t,"string"==o)return i="\bb\tt\nn\ff\rr\"\"''\\\\",n+t.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=i.indexOf(t),r+1?"\\"+i.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e))})+n;if("object"==o){if(t.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(t)){for(r=0,i="[";r<t.length;r++)i+=(r>0?",":"")+e(t[r],n);return i+"]"}i="{";for(a in t)t.hasOwnProperty(a)&&(i+="function"!=typeof t[a]?(i.length>1?","+n:n)+a+n+":"+e(t[a],n):"");return i+"}"}return""+t}return{serialize:e,parse:function(e){try{return window[String.fromCharCode(101)+"val"]("("+e+")")}catch(t){}}}}),r(pt,[ft,dt,m],function(e,t,n){function r(e){this.settings=i({},e),this.count=0}var i=n.extend;return r.sendRPC=function(e){return(new r).send(e)},r.prototype={send:function(n){var r=n.error,o=n.success;n=i(this.settings,n),n.success=function(t,i){t=e.parse(t),"undefined"==typeof t&&(t={error:"JSON Parse error."}),t.error?r.call(n.error_scope||n.scope,t.error,i):o.call(n.success_scope||n.scope,t.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=e.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",t.send(n)}},r}),r(ht,[w],function(e){return{callbacks:{},count:0,send:function(n){var r=this,i=e.DOM,o=n.count!==t?n.count:r.count,a="tinymce_jsonp_"+o;r.callbacks[o]=function(e){i.remove(a),delete r.callbacks[o],n.callback(e)},i.add(i.doc.body,"script",{id:a,src:n.url,type:"text/javascript"}),r.count++}}}),r(mt,[],function(){function e(){s=[];for(var e in a)s.push(e);i.length=s.length}function n(){function n(e){var n,r;return r=e!==t?c+e:i.indexOf(",",c),r===-1||r>i.length?null:(n=i.substring(c,r),c=r+1,n)}var r,i,s,c=0;if(a={},u){o.load(l),i=o.getAttribute(l)||"";do{var d=n();if(null===d)break;if(r=n(parseInt(d,32)||0),null!==r){if(d=n(),null===d)break;s=n(parseInt(d,32)||0),r&&(a[r]=s)}}while(null!==r);e()}}function r(){var t,n="";if(u){for(var r in a)t=a[r],n+=(n?",":"")+r.length.toString(32)+","+r+","+t.length.toString(32)+","+t;o.setAttribute(l,n);try{o.save(l)}catch(i){}e()}}var i,o,a,s,l,u;try{if(window.localStorage)return localStorage}catch(c){}return l="tinymce",o=document.documentElement,u=!!o.addBehavior,u&&o.addBehavior("#default#userData"),i={key:function(e){return s[e]},getItem:function(e){return e in a?a[e]:null},setItem:function(e,t){a[e]=""+t,r()},removeItem:function(e){delete a[e],r()},clear:function(){a={},r()}},n(),i}),r(gt,[w,f,E,N,m,d],function(e,t,n,r,i,o){var a=window.tinymce;return a.DOM=e.DOM,a.ScriptLoader=n.ScriptLoader,a.PluginManager=r.PluginManager,a.ThemeManager=r.ThemeManager,a.dom=a.dom||{},a.dom.Event=t.Event,i.each("trim isArray is toArray makeMap each map grep inArray extend create walk createNS resolve explode _addCacheSuffix".split(" "),function(e){a[e]=i[e]}),i.each("isOpera isWebKit isIE isGecko isMac".split(" "),function(e){a[e]=o[e.substr(2).toLowerCase()]}),{}}),r(vt,[ce,m],function(e,t){return e.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=t.extend({},this.Defaults,e)},preRender:function(e){e.bodyClasses.add(this.settings.containerClass)},applyClasses:function(e){var t=this,n=t.settings,r,i,o,a;r=n.firstControlClass,i=n.lastControlClass,e.each(function(e){e.classes.remove(r).remove(i).add(n.controlClass),e.visible()&&(o||(o=e),a=e)}),o&&o.classes.add(r),a&&a.classes.add(i)},renderHtml:function(e){var t=this,n="";return t.applyClasses(e.items()),e.items().each(function(e){n+=e.renderHtml()}),n},recalc:function(){},postRender:function(){},isNative:function(){return!1}})}),r(yt,[vt],function(e){return e.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'<div id="'+e._id+'-absend" class="'+e.classPrefix+'abs-end"></div>'+this._super(e)}})}),r(bt,[Pe],function(e){return e.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t=this,n;t._super(e),e=t.settings,n=t.settings.size,t.on("click mousedown",function(e){e.preventDefault()}),t.on("touchstart",function(e){t.fire("click",e),e.preventDefault()}),e.subtype&&t.classes.add(e.subtype),n&&t.classes.add("btn-"+n),e.icon&&t.icon(e.icon)},icon:function(e){return arguments.length?(this.state.set("icon",e),this):this.state.get("icon")},repaint:function(){var e=this.getEl().firstChild,t;e&&(t=e.style,t.width=t.height="100%"),this._super()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.state.get("icon"),i,o=e.state.get("text"),a="";return i=e.settings.image,i?(r="none","string"!=typeof i&&(i=window.getSelection?i[0]:i[1]),i=" style=\"background-image: url('"+i+"')\""):i="",o&&(e.classes.add("btn-has-text"),a='<span class="'+n+'txt">'+e.encode(o)+"</span>"),r=r?n+"ico "+n+"i-"+r:"",'<div id="'+t+'" class="'+e.classes+'" tabindex="-1" aria-labelledby="'+t+'"><button role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+a+"</button></div>"},bindStates:function(){function e(e){var i=n("span."+r,t.getEl());e?(i[0]||(n("button:first",t.getEl()).append('<span class="'+r+'"></span>'),i=n("span."+r,t.getEl())),i.html(t.encode(e))):i.remove(),t.classes.toggle("btn-has-text",!!e)}var t=this,n=t.$,r=t.classPrefix+"txt";return t.state.on("change:text",function(t){e(t.value)}),t.state.on("change:icon",function(n){var r=n.value,i=t.classPrefix;t.settings.icon=r,r=r?i+"ico "+i+"i-"+t.settings.icon:"";var o=t.getEl().firstChild,a=o.getElementsByTagName("i")[0];r?(a&&a==o.firstChild||(a=document.createElement("i"),o.insertBefore(a,o.firstChild)),a.className=r):a&&o.removeChild(a),e(t.state.get("text"))}),t._super()}})}),r(Ct,[Ne],function(e){return e.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var e=this,t=e._layout;return e.classes.add("btn-group"),e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'"><div id="'+e._id+'-body">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}})}),r(xt,[Pe],function(e){return e.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){return arguments.length?(this.state.set("checked",e),this):this.state.get("checked")},value:function(e){return arguments.length?this.checked(e):this.checked()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes+'" unselectable="on" aria-labelledby="'+t+'-al" tabindex="-1"><i class="'+n+"ico "+n+'i-checkbox"></i><span id="'+t+'-al" class="'+n+'label">'+e.encode(e.state.get("text"))+"</span></div>"},bindStates:function(){function e(e){t.classes.toggle("checked",e),t.aria("checked",e)}var t=this;return t.state.on("change:text",function(e){t.getEl("al").firstChild.data=t.translate(e.value)}),t.state.on("change:checked change:value",function(n){t.fire("change"),e(n.value)}),t.state.on("change:icon",function(e){var n=e.value,r=t.classPrefix;if("undefined"==typeof n)return t.settings.icon;t.settings.icon=n,n=n?r+"ico "+r+"i-"+t.settings.icon:"";var i=t.getEl().firstChild,o=i.getElementsByTagName("i")[0];n?(o&&o==i.firstChild||(o=document.createElement("i"),i.insertBefore(o,i.firstChild)),o.className=n):o&&i.removeChild(o)}),t.state.get("checked")&&e(!0),t._super()}})}),r(wt,[Pe,we,ve,g,I,m],function(e,t,n,r,i,o){return e.extend({init:function(e){var t=this;t._super(e),e=t.settings,t.classes.add("combobox"),t.subinput=!0,t.ariaTarget="inp",e.menu=e.menu||e.values,e.menu&&(e.icon="caret"),t.on("click",function(n){var i=n.target,o=t.getEl();if(r.contains(o,i)||i==o)for(;i&&i!=o;)i.id&&i.id.indexOf("-open")!=-1&&(t.fire("action"),e.menu&&(t.showMenu(),n.aria&&t.menu.items()[0].focus())),i=i.parentNode}),t.on("keydown",function(e){var n;13==e.keyCode&&"INPUT"===e.target.nodeName&&(e.preventDefault(),t.parents().reverse().each(function(e){if(e.toJSON)return n=e,!1}),t.fire("submit",{data:n.toJSON()}))}),t.on("keyup",function(e){if("INPUT"==e.target.nodeName){var n=t.state.get("value"),r=e.target.value;r!==n&&(t.state.set("value",r),t.fire("autocomplete",e))}}),t.on("mouseover",function(e){var n=t.tooltip().moveTo(-65535);if(t.statusLevel()&&e.target.className.indexOf(t.classPrefix+"status")!==-1){var r=t.statusMessage()||"Ok",i=n.text(r).show().testMoveRel(e.target,["bc-tc","bc-tl","bc-tr"]);n.classes.toggle("tooltip-n","bc-tc"==i),n.classes.toggle("tooltip-nw","bc-tl"==i),n.classes.toggle("tooltip-ne","bc-tr"==i),n.moveRel(e.target,i)}})},statusLevel:function(e){return arguments.length>0&&this.state.set("statusLevel",e),this.state.get("statusLevel")},statusMessage:function(e){return arguments.length>0&&this.state.set("statusMessage",e),this.state.get("statusMessage")},showMenu:function(){var e=this,n=e.settings,r;e.menu||(r=n.menu||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control.items().each(function(t){t.active(t.value()==e.value())})}).fire("show"),e.menu.on("select",function(t){e.value(t.control.value())}),e.on("focusin",function(t){"INPUT"==t.target.tagName.toUpperCase()&&e.menu.hide()}),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var e=this,t=e.getEl(),i=e.getEl("open"),o=e.layoutRect(),a,s,l=0,u=t.firstChild;e.statusLevel()&&"none"!==e.statusLevel()&&(l=parseInt(n.getRuntimeStyle(u,"padding-right"),10)-parseInt(n.getRuntimeStyle(u,"padding-left"),10)),a=i?o.w-n.getSize(i).width-10:o.w-10;var c=document;return c.all&&(!c.documentMode||c.documentMode<=8)&&(s=e.layoutRect().h-2+"px"),r(u).css({width:a-l,lineHeight:s}),e._super(),e},postRender:function(){var e=this;return r(this.getEl("inp")).on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)}),e._super()},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=e.state.get("value")||"",o,a,s="",l="",u="";return"spellcheck"in n&&(l+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(l+=' maxlength="'+n.maxLength+'"'),n.size&&(l+=' size="'+n.size+'"'),n.subtype&&(l+=' type="'+n.subtype+'"'),u='<i id="'+t+'-status" class="mce-status mce-ico" style="display: none"></i>',e.disabled()&&(l+=' disabled="disabled"'),o=n.icon,o&&"caret"!=o&&(o=r+"ico "+r+"i-"+n.icon),a=e.state.get("text"),(o||a)&&(s='<div id="'+t+'-open" class="'+r+"btn "+r+'open" tabIndex="-1" role="button"><button id="'+t+'-action" type="button" hidefocus="1" tabindex="-1">'+("caret"!=o?'<i class="'+o+'"></i>':'<i class="'+r+'caret"></i>')+(a?(o?" ":"")+a:"")+"</button></div>",
+e.classes.add("has-open")),'<div id="'+t+'" class="'+e.classes+'"><input id="'+t+'-inp" class="'+r+'textbox" value="'+e.encode(i,!1)+'" hidefocus="1"'+l+' placeholder="'+e.encode(n.placeholder)+'" />'+u+s+"</div>"},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},showAutoComplete:function(e,n){var r=this;if(0===e.length)return void r.hideMenu();var i=function(e,t){return function(){r.fire("selectitem",{title:t,value:e})}};r.menu?r.menu.items().remove():r.menu=t.create({type:"menu",classes:"combobox-menu",layout:"flow"}).parent(r).renderTo(),o.each(e,function(e){r.menu.add({text:e.title,url:e.previewUrl,match:n,classes:"menu-item-ellipsis",onclick:i(e.value,e.title)})}),r.menu.renderNew(),r.hideMenu(),r.menu.on("cancel",function(e){e.control.parent()===r.menu&&(e.stopPropagation(),r.focus(),r.hideMenu())}),r.menu.on("select",function(){r.focus()});var a=r.layoutRect().w;r.menu.layoutRect({w:a,minW:0,maxW:a}),r.menu.reflow(),r.menu.show(),r.menu.moveRel(r.getEl(),r.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},hideMenu:function(){this.menu&&this.menu.hide()},bindStates:function(){var e=this;e.state.on("change:value",function(t){e.getEl("inp").value!=t.value&&(e.getEl("inp").value=t.value)}),e.state.on("change:disabled",function(t){e.getEl("inp").disabled=t.value}),e.state.on("change:statusLevel",function(t){var r=e.getEl("status"),i=e.classPrefix,o=t.value;n.css(r,"display","none"===o?"none":""),n.toggleClass(r,i+"i-checkmark","ok"===o),n.toggleClass(r,i+"i-warning","warn"===o),n.toggleClass(r,i+"i-error","error"===o),e.classes.toggle("has-status","none"!==o),e.repaint()}),n.on(e.getEl("status"),"mouseleave",function(){e.tooltip().hide()}),e.on("cancel",function(t){e.menu&&e.menu.visible()&&(t.stopPropagation(),e.hideMenu())});var t=function(e,t){t&&t.items().length>0&&t.items().eq(e)[0].focus()};return e.on("keydown",function(n){var r=n.keyCode;"INPUT"===n.target.nodeName&&(r===i.DOWN?(n.preventDefault(),e.fire("autocomplete"),t(0,e.menu)):r===i.UP&&(n.preventDefault(),t(-1,e.menu)))}),e._super()},remove:function(){r(this.getEl("inp")).off(),this.menu&&this.menu.remove(),this._super()}})}),r(Et,[wt],function(e){return e.extend({init:function(e){var t=this;e.spellcheck=!1,e.onaction&&(e.icon="none"),t._super(e),t.classes.add("colorbox"),t.on("change keyup postrender",function(){t.repaintColor(t.value())})},repaintColor:function(e){var t=this.getEl("open"),n=t?t.getElementsByTagName("i")[0]:null;if(n)try{n.style.background=e}catch(r){}},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.state.get("rendered")&&e.repaintColor(t.value)}),e._super()}})}),r(Nt,[bt,Ae],function(e,t){return e.extend({showPanel:function(){var e=this,n=e.settings;if(e.active(!0),e.panel)e.panel.show();else{var r=n.panel;r.type&&(r={layout:"grid",items:r}),r.role=r.role||"dialog",r.popover=!0,r.autohide=!0,r.ariaRoot=!0,e.panel=new t(r).on("hide",function(){e.active(!1)}).on("cancel",function(t){t.stopPropagation(),e.focus(),e.hidePanel()}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}e.panel.moveRel(e.getEl(),n.popoverAlign||(e.isRtl()?["bc-tr","bc-tc"]:["bc-tl","bc-tc"]))},hidePanel:function(){var e=this;e.panel&&e.panel.hide()},postRender:function(){var e=this;return e.aria("haspopup",!0),e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():(e.showPanel(),e.panel.focus(!!t.aria)))}),e._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}})}),r(_t,[Nt,w],function(e,t){var n=t.DOM;return e.extend({init:function(e){this._super(e),this.classes.add("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.state.get("text"),i=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",o=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"",a="";return r&&(e.classes.add("btn-has-text"),a='<span class="'+n+'txt">'+e.encode(r)+"</span>"),'<div id="'+t+'" class="'+e.classes+'" role="button" tabindex="-1" aria-haspopup="true"><button role="presentation" hidefocus="1" type="button" tabindex="-1">'+(i?'<i class="'+i+'"'+o+"></i>":"")+'<span id="'+t+'-preview" class="'+n+'preview"></span>'+a+'</button><button type="button" class="'+n+'open" hidefocus="1" tabindex="-1"> <i class="'+n+'caret"></i></button></div>'},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(r){r.aria&&"down"==r.aria.key||r.control!=e||n.getParent(r.target,"."+e.classPrefix+"open")||(r.stopImmediatePropagation(),t.call(e,r))}),delete e.settings.onclick,e._super()}})}),r(St,[],function(){function e(e){function i(e,i,o){var a,s,l,u,c,d;return a=0,s=0,l=0,e/=255,i/=255,o/=255,c=t(e,t(i,o)),d=n(e,n(i,o)),c==d?(l=c,{h:0,s:0,v:100*l}):(u=e==c?i-o:o==c?e-i:o-e,a=e==c?3:o==c?1:5,a=60*(a-u/(d-c)),s=(d-c)/d,l=d,{h:r(a),s:r(100*s),v:r(100*l)})}function o(e,i,o){var a,s,l,u;if(e=(parseInt(e,10)||0)%360,i=parseInt(i,10)/100,o=parseInt(o,10)/100,i=n(0,t(i,1)),o=n(0,t(o,1)),0===i)return void(d=f=p=r(255*o));switch(a=e/60,s=o*i,l=s*(1-Math.abs(a%2-1)),u=o-s,Math.floor(a)){case 0:d=s,f=l,p=0;break;case 1:d=l,f=s,p=0;break;case 2:d=0,f=s,p=l;break;case 3:d=0,f=l,p=s;break;case 4:d=l,f=0,p=s;break;case 5:d=s,f=0,p=l;break;default:d=f=p=0}d=r(255*(d+u)),f=r(255*(f+u)),p=r(255*(p+u))}function a(){function e(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+e(d)+e(f)+e(p)}function s(){return{r:d,g:f,b:p}}function l(){return i(d,f,p)}function u(e){var t;return"object"==typeof e?"r"in e?(d=e.r,f=e.g,p=e.b):"v"in e&&o(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(d=parseInt(t[1],10),f=parseInt(t[2],10),p=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(d=parseInt(t[1],16),f=parseInt(t[2],16),p=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(d=parseInt(t[1]+t[1],16),f=parseInt(t[2]+t[2],16),p=parseInt(t[3]+t[3],16)),d=d<0?0:d>255?255:d,f=f<0?0:f>255?255:f,p=p<0?0:p>255?255:p,c}var c=this,d=0,f=0,p=0;e&&u(e),c.toRgb=s,c.toHsv=l,c.toHex=a,c.parse=u}var t=Math.min,n=Math.max,r=Math.round;return e}),r(kt,[Pe,_e,ve,St],function(e,t,n,r){return e.extend({Defaults:{classes:"widget colorpicker"},init:function(e){this._super(e)},postRender:function(){function e(e,t){var r=n.getPos(e),i,o;return i=t.pageX-r.x,o=t.pageY-r.y,i=Math.max(0,Math.min(i/e.clientWidth,1)),o=Math.max(0,Math.min(o/e.clientHeight,1)),{x:i,y:o}}function i(e,t){var i=(360-e.h)/360;n.css(d,{top:100*i+"%"}),t||n.css(p,{left:e.s+"%",top:100-e.v+"%"}),f.style.background=new r({s:100,v:100,h:e.h}).toHex(),s.color().parse({s:e.s,v:e.v,h:e.h})}function o(t){var n;n=e(f,t),u.s=100*n.x,u.v=100*(1-n.y),i(u),s.fire("change")}function a(t){var n;n=e(c,t),u=l.toHsv(),u.h=360*(1-n.y),i(u,!0),s.fire("change")}var s=this,l=s.color(),u,c,d,f,p;c=s.getEl("h"),d=s.getEl("hp"),f=s.getEl("sv"),p=s.getEl("svp"),s._repaint=function(){u=l.toHsv(),i(u)},s._super(),s._svdraghelper=new t(s._id+"-sv",{start:o,drag:o}),s._hdraghelper=new t(s._id+"-h",{start:a,drag:a}),s._repaint()},rgb:function(){return this.color().toRgb()},value:function(e){var t=this;return arguments.length?(t.color().parse(e),void(t._rendered&&t._repaint())):t.color().toHex()},color:function(){return this._color||(this._color=new r),this._color},renderHtml:function(){function e(){var e,t,n="",i,a;for(i="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",a=o.split(","),e=0,t=a.length-1;e<t;e++)n+='<div class="'+r+'colorpicker-h-chunk" style="height:'+100/t+"%;"+i+a[e]+",endColorstr="+a[e+1]+");-ms-"+i+a[e]+",endColorstr="+a[e+1]+')"></div>';return n}var t=this,n=t._id,r=t.classPrefix,i,o="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000",a="background: -ms-linear-gradient(top,"+o+");background: linear-gradient(to bottom,"+o+");";return i='<div id="'+n+'-h" class="'+r+'colorpicker-h" style="'+a+'">'+e()+'<div id="'+n+'-hp" class="'+r+'colorpicker-h-marker"></div></div>','<div id="'+n+'" class="'+t.classes+'"><div id="'+n+'-sv" class="'+r+'colorpicker-sv"><div class="'+r+'colorpicker-overlay1"><div class="'+r+'colorpicker-overlay2"><div id="'+n+'-svp" class="'+r+'colorpicker-selector1"><div class="'+r+'colorpicker-selector2"></div></div></div></div></div>'+i+"</div>"}})}),r(Tt,[Pe],function(e){return e.extend({init:function(e){var t=this;e.delimiter||(e.delimiter="\xbb"),t._super(e),t.classes.add("path"),t.canFocus=!0,t.on("click",function(e){var n,r=e.target;(n=r.getAttribute("data-index"))&&t.fire("select",{value:t.row()[n],index:n})}),t.row(t.settings.row)},focus:function(){var e=this;return e.getEl().firstChild.focus(),e},row:function(e){return arguments.length?(this.state.set("row",e),this):this.state.get("row")},renderHtml:function(){var e=this;return'<div id="'+e._id+'" class="'+e.classes+'">'+e._getDataPathHtml(e.state.get("row"))+"</div>"},bindStates:function(){var e=this;return e.state.on("change:row",function(t){e.innerHtml(e._getDataPathHtml(t.value))}),e._super()},_getDataPathHtml:function(e){var t=this,n=e||[],r,i,o="",a=t.classPrefix;for(r=0,i=n.length;r<i;r++)o+=(r>0?'<div class="'+a+'divider" aria-hidden="true"> '+t.settings.delimiter+" </div>":"")+'<div role="button" class="'+a+"path-item"+(r==i-1?" "+a+"last":"")+'" data-index="'+r+'" tabindex="-1" id="'+t._id+"-"+r+'" aria-level="'+(r+1)+'">'+n[r].name+"</div>";return o||(o='<div class="'+a+'path-item">\xa0</div>'),o}})}),r(Rt,[Tt],function(e){return e.extend({postRender:function(){function e(e){if(1===e.nodeType){if("BR"==e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}var t=this,n=t.settings.editor;return n.settings.elementpath!==!1&&(t.on("select",function(e){n.focus(),n.selection.select(this.row()[e.index].element),n.nodeChanged()}),n.on("nodeChange",function(r){for(var i=[],o=r.parents,a=o.length;a--;)if(1==o[a].nodeType&&!e(o[a])){var s=n.fire("ResolveName",{name:o[a].nodeName.toLowerCase(),target:o[a]});if(s.isDefaultPrevented()||i.push({name:s.name,element:o[a]}),s.isPropagationStopped())break}t.row(i)})),t._super()}})}),r(At,[Ne],function(e){return e.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.classes.add("formitem"),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1">'+(e.settings.title?'<div id="'+e._id+'-title" class="'+n+'title">'+e.settings.title+"</div>":"")+'<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}})}),r(Bt,[Ne,At,m],function(e,t,n){return e.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:20,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var e=this,r=e.items();e.settings.formItemDefaults||(e.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),r.each(function(r){var i,o=r.settings.label;o&&(i=new t(n.extend({items:{type:"label",id:r._id+"-l",text:o,flex:0,forId:r._id,disabled:r.disabled()}},e.settings.formItemDefaults)),i.type="formitem",r.aria("labelledby",r._id+"-l"),"undefined"==typeof r.settings.flex&&(r.settings.flex=1),e.replace(r,i),i.add(r))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){var e=this;e._super(),e.fromJSON(e.settings.data)},bindStates:function(){function e(){var e=0,n=[],r,i,o;if(t.settings.labelGapCalc!==!1)for(o="children"==t.settings.labelGapCalc?t.find("formitem"):t.items(),o.filter("formitem").each(function(t){var r=t.items()[0],i=r.getEl().clientWidth;e=i>e?i:e,n.push(r)}),i=t.settings.labelGap||0,r=n.length;r--;)n[r].settings.minWidth=e+i}var t=this;t._super(),t.on("show",e),e()}})}),r(Dt,[Bt],function(e){return e.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'<fieldset id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1">'+(e.settings.title?'<legend id="'+e._id+'-title" class="'+n+'fieldset-title">'+e.settings.title+"</legend>":"")+'<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></fieldset>"}})}),r(Lt,[w,z,h,it,m,_],function(e,t,n,r,i,o){var a=i.trim,s=function(e,t,n,r,i){return{type:e,title:t,url:n,level:r,attach:i}},l=function(e){for(;e=e.parentNode;){var t=e.contentEditable;if(t&&"inherit"!==t)return o.isContentEditableTrue(e)}return!1},u=function(t,n){return e.DOM.select(t,n)},c=function(e){return e.innerText||e.textContent},d=function(e){return e.id?e.id:r.uuid("h")},f=function(e){return e&&"A"===e.nodeName&&(e.id||e.name)},p=function(e){return f(e)&&m(e)},h=function(e){return e&&/^(H[1-6])$/.test(e.nodeName)},m=function(e){return l(e)&&!o.isContentEditableFalse(e)},g=function(e){return h(e)&&m(e)},v=function(e){return h(e)?parseInt(e.nodeName.substr(1),10):0},y=function(e){var t=d(e),n=function(){e.id=t};return s("header",c(e),"#"+t,v(e),n)},b=function(e){var n=e.id||e.name,r=c(e);return s("anchor",r?r:"#"+n,"#"+n,0,t.noop)},C=function(e){return n.map(n.filter(e,g),y)},x=function(e){return n.map(n.filter(e,p),b)},w=function(e){var t=u("h1,h2,h3,h4,h5,h6,a:not([href])",e);return t},E=function(e){return a(e.title).length>0},N=function(e){var t=w(e);return n.filter(C(t).concat(x(t)),E)};return{find:N}}),r(Mt,[wt,m,h,z,I,Lt],function(e,t,n,r,i,o){var a={},s=5,l=function(e){return{title:e.title,value:{title:{raw:e.title},url:e.url,attach:e.attach}}},u=function(e){return t.map(e,l)},c=function(e,t){return{title:e,value:{title:e,url:t,attach:r.noop}}},d=function(e,t){var r=n.find(t,function(t){return t.url===e});return!r},f=function(e,t,n){var r=t in e?e[t]:n;return r===!1?null:r},p=function(e,i,o,s){var l={title:"-"},p=function(e){var a=n.filter(e[o],function(e){return d(e,i)});return t.map(a,function(e){return{title:e,value:{title:e,url:e,attach:r.noop}}})},h=function(e){var t=n.filter(i,function(t){return t.type==e});return u(t)},g=function(){var e=h("anchor"),t=f(s,"anchor_top","#top"),n=f(s,"anchor_bottom","#bottom");return null!==t&&e.unshift(c("<top>",t)),null!==n&&e.push(c("<bottom>",n)),e},v=function(e){return n.reduce(e,function(e,t){var n=0===e.length||0===t.length;return n?e.concat(t):e.concat(l,t)},[])};return s.typeahead_urls===!1?[]:"file"===o?v([m(e,p(a)),m(e,h("header")),m(e,g())]):m(e,p(a))},h=function(e,t){var r=a[t];/^https?/.test(e)&&(r?n.indexOf(r,e)===-1&&(a[t]=r.slice(0,s).concat(e)):a[t]=[e])},m=function(e,n){var r=e.toLowerCase(),i=t.grep(n,function(e){return e.title.toLowerCase().indexOf(r)!==-1});return 1===i.length&&i[0].title===e?[]:i},g=function(e){var t=e.title;return t.raw?t.raw:t},v=function(e,t,n,r){var i=function(i){var a=o.find(n),s=p(i,a,r,t);e.showAutoComplete(s,i)};e.on("autocomplete",function(){i(e.value())}),e.on("selectitem",function(t){var n=t.value;e.value(n.url);var i=g(n);"image"===r?e.fire("change",{meta:{alt:i,attach:n.attach}}):e.fire("change",{meta:{text:i,attach:n.attach}}),e.focus()}),e.on("click",function(t){0===e.value().length&&"INPUT"===t.target.nodeName&&i("")}),e.on("PostRender",function(){e.getRoot().on("submit",function(t){t.isDefaultPrevented()||h(e.value(),r)})})},y=function(e){var t=e.status,n=e.message;return"valid"===t?{status:"ok",message:n}:"unknown"===t?{status:"warn",message:n}:"invalid"===t?{status:"warn",message:n}:{status:"none",message:""}},b=function(e,t,n){var r=t.filepicker_validator_handler;if(r){var i=function(t){return 0===t.length?void e.statusLevel("none"):void r({url:t,type:n},function(t){var n=y(t);e.statusMessage(n.message),e.statusLevel(n.status)})};e.state.on("change:value",function(e){i(e.value)})}};return e.extend({init:function(e){var n=this,r=tinymce.activeEditor,i=r.settings,o,a,s,l=e.filetype;e.spellcheck=!1,s=i.file_picker_types||i.file_browser_callback_types,s&&(s=t.makeMap(s,/[, ]/)),s&&!s[l]||(a=i.file_picker_callback,!a||s&&!s[l]?(a=i.file_browser_callback,!a||s&&!s[l]||(o=function(){a(n.getEl("inp").id,n.value(),l,window)})):o=function(){var e=n.fire("beforecall").meta;e=t.extend({filetype:l},e),a.call(r,function(e,t){n.value(e).fire("change",{meta:t})},n.value(),e)}),o&&(e.icon="browse",e.onaction=o),n._super(e),v(n,i,r.getBody(),l),b(n,i,l)}})}),r(Pt,[yt],function(e){return e.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox;e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}})}),r(Ot,[yt],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,u,c,d,f,p,h,m,g,v=[],y,b,C,x,w,E,N,_,S,k,T,R,A,B,D,L,M,P,O,H,I,F,z=Math.max,U=Math.min;for(r=e.items().filter(":visible"),i=e.layoutRect(),o=e.paddingBox,a=e.settings,f=e.isRtl()?a.direction||"row-reversed":a.direction,s=a.align,l=e.isRtl()?a.pack||"end":a.pack,u=a.spacing||0,"row-reversed"!=f&&"column-reverse"!=f||(r=r.set(r.toArray().reverse()),f=f.split("-")[0]),"column"==f?(S="y",N="h",_="minH",k="maxH",R="innerH",T="top",A="deltaH",B="contentH",O="left",M="w",D="x",L="innerW",P="minW",H="right",I="deltaW",F="contentW"):(S="x",N="w",_="minW",k="maxW",R="innerW",T="left",A="deltaW",B="contentW",O="top",M="h",D="y",L="innerH",P="minH",H="bottom",I="deltaH",F="contentH"),d=i[R]-o[T]-o[T],E=c=0,t=0,n=r.length;t<n;t++)p=r[t],h=p.layoutRect(),m=p.settings,g=m.flex,d-=t<n-1?u:0,g>0&&(c+=g,h[k]&&v.push(p),h.flex=g),d-=h[_],y=o[O]+h[P]+o[H],y>E&&(E=y);if(x={},d<0?x[_]=i[_]-d+i[A]:x[_]=i[R]-d+i[A],x[P]=E+i[I],x[B]=i[R]-d,x[F]=E,x.minW=U(x.minW,i.maxW),x.minH=U(x.minH,i.maxH),x.minW=z(x.minW,i.startMinWidth),x.minH=z(x.minH,i.startMinHeight),!i.autoResize||x.minW==i.minW&&x.minH==i.minH){for(C=d/c,t=0,n=v.length;t<n;t++)p=v[t],h=p.layoutRect(),b=h[k],y=h[_]+h.flex*C,y>b?(d-=h[k]-h[_],c-=h.flex,h.flex=0,h.maxFlexSize=b):h.maxFlexSize=0;for(C=d/c,w=o[T],x={},0===c&&("end"==l?w=d+o[T]:"center"==l?(w=Math.round(i[R]/2-(i[R]-d)/2)+o[T],w<0&&(w=o[T])):"justify"==l&&(w=o[T],u=Math.floor(d/(r.length-1)))),x[D]=o[O],t=0,n=r.length;t<n;t++)p=r[t],h=p.layoutRect(),y=h.maxFlexSize||h[_],"center"===s?x[D]=Math.round(i[L]/2-h[M]/2):"stretch"===s?(x[M]=z(h[P]||0,i[L]-o[O]-o[H]),x[D]=o[O]):"end"===s&&(x[D]=i[L]-h[M]-o.top),h.flex>0&&(y+=h.flex*C),x[N]=y,x[S]=w,p.layoutRect(x),p.recalc&&p.recalc(),w+=y+u}else if(x.w=x.minW,x.h=x.minH,e.layoutRect(x),this.recalc(e),null===e._lastRect){var W=e.parent();W&&(W._lastRect=null,W.recalc())}}})}),r(Ht,[vt],function(e){return e.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})},isNative:function(){return!0}})}),r(It,[w],function(e){var n=function(e,t,n){for(;n!==t;){if(n.style[e])return n.style[e];n=n.parentNode}return""},r=function(e){return/[0-9.]+px$/.test(e)?Math.round(72*parseInt(e,10)/96)+"pt":e},i=function(e){return e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")},o=function(t,n){return e.DOM.getStyle(n,t,!0)},a=function(e,t){var r=n("fontSize",e,t);return""!==r?r:o("fontSize",t)},s=function(e,r){var a=n("fontFamily",e,r),s=""!==a?a:o("fontFamily",r);return s!==t?i(s):""};return{getFontSize:a,getFontFamily:s,toPt:r}}),r(Ft,[xe,Pe,Ae,m,h,w,ut,d,It],function(e,t,n,r,i,o,a,s,l){function u(e){e.settings.ui_container&&(s.container=o.DOM.select(e.settings.ui_container)[0])}function c(t){t.on("ScriptsLoaded",function(){t.rtl&&(e.rtl=!0)})}function d(e){function t(t,n){return function(){var r=this;e.on("nodeChange",function(i){var o=e.formatter,a=null;f(i.parents,function(e){if(f(t,function(t){if(n?o.matchNode(e,n,{value:t.value})&&(a=t.value):o.matchNode(e,t.value)&&(a=t.value),a)return!1}),a)return!1}),r.value(a)})}}function i(t){return function(){var n=this,r=function(e){return e?e.split(",")[0]:""};e.on("nodeChange",function(i){var o,a=null;o=l.getFontFamily(e.getBody(),i.element),f(t,function(e){e.value.toLowerCase()===o.toLowerCase()&&(a=e.value)}),f(t,function(e){a||r(e.value).toLowerCase()!==r(o).toLowerCase()||(a=e.value)}),n.value(a),!a&&o&&n.text(r(o))})}}function o(t){return function(){var n=this;e.on("nodeChange",function(r){var i,o,a=null;i=l.getFontSize(e.getBody(),r.element),o=l.toPt(i),f(t,function(e){e.value===i?a=i:e.value===o&&(a=o)}),n.value(a),a||n.text(o)})}}function a(e){e=e.replace(/;$/,"").split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}function s(){function t(e){var n=[];if(e)return f(e,function(e){var o={text:e.title,icon:e.icon};if(e.items)o.menu=t(e.items);else{var a=e.format||"custom"+r++;e.format||(e.name=a,i.push(e)),o.format=a,o.cmd=e.cmd}n.push(o)}),n}function n(){var n;return n=t(e.settings.style_formats_merge?e.settings.style_formats?o.concat(e.settings.style_formats):o:e.settings.style_formats||o)}var r=0,i=[],o=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}];return e.on("init",function(){f(i,function(t){e.formatter.register(t.name,t)})}),{type:"menu",items:n(),onPostRender:function(t){e.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){if(this.settings.format)return e.formatter.getCssText(this.settings.format)},onPostRender:function(){var t=this;t.parent().on("show",function(){var n,r;n=t.settings.format,n&&(t.disabled(!e.formatter.canApply(n)),t.active(e.formatter.match(n))),r=t.settings.cmd,r&&t.active(e.queryCommandState(r))})},onclick:function(){this.settings.format&&h(this.settings.format),this.settings.cmd&&e.execCommand(this.settings.cmd)}}}}function u(t){return function(){var n=this;e.formatter?e.formatter.formatChanged(t,function(e){n.active(e)}):e.on("init",function(){e.formatter.formatChanged(t,function(e){n.active(e)})})}}function c(t){return function(){function n(){var n="redo"==t?"hasRedo":"hasUndo";return!!e.undoManager&&e.undoManager[n]()}var r=this;r.disabled(!n()),e.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(){r.disabled(e.readonly||!n())})}}function d(){var t=this;e.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(e.hasVisual)}function h(t){t.control&&(t=t.control.value()),t&&e.execCommand("mceToggleFormat",!1,t)}function m(t){var n=t.length;return r.each(t,function(t){t.menu&&(t.hidden=0===m(t.menu));var r=t.format;r&&(t.hidden=!e.formatter.canApply(r)),t.hidden&&n--}),n}function g(t){var n=t.items().length;return t.items().each(function(t){t.menu&&t.visible(g(t.menu)>0),!t.menu&&t.settings.menu&&t.visible(m(t.settings.menu)>0);var r=t.settings.format;r&&t.visible(e.formatter.canApply(r)),t.visible()||n--}),n}var v;v=s(),f({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,n){e.addButton(n,{tooltip:t,onPostRender:u(n),onclick:function(){h(n)}})}),f({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],removeformat:["Clear formatting","RemoveFormat"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1]})}),f({blockquote:["Blockquote","mceBlockQuote"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1],onPostRender:u(n)})});var y=function(e){var t=e;return t.length>0&&"-"===t[0].text&&(t=t.slice(1)),t.length>0&&"-"===t[t.length-1].text&&(t=t.slice(0,t.length-1)),t},b=function(t){var n,i;if("string"==typeof t)i=t.split(" ");else if(r.isArray(t))return p(r.map(t,b));return n=r.grep(i,function(t){return"|"===t||t in e.menuItems}),r.map(n,function(t){return"|"===t?{text:"-"}:e.menuItems[t]})},C=function(t){var n=[{text:"-"}],i=r.grep(e.menuItems,function(e){return e.context===t});return r.each(i,function(e){"before"==e.separator&&n.push({text:"|"}),e.prependToContext?n.unshift(e):n.push(e),"after"==e.separator&&n.push({text:"|"})}),n},x=function(e){return y(e.insert_button_items?b(e.insert_button_items):C("insert"))};e.addButton("undo",{tooltip:"Undo",onPostRender:c("undo"),cmd:"undo"}),e.addButton("redo",{tooltip:"Redo",onPostRender:c("redo"),cmd:"redo"}),e.addMenuItem("newdocument",{text:"New document",icon:"newdocument",cmd:"mceNewDocument"}),e.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:c("undo"),cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:c("redo"),cmd:"redo"}),e.addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:d,cmd:"mceToggleVisualAid"}),e.addButton("remove",{tooltip:"Remove",icon:"remove",cmd:"Delete"}),e.addButton("insert",{type:"menubutton",icon:"insert",menu:[],oncreatemenu:function(){this.menu.add(x(e.settings)),this.menu.renderNew()}}),f({cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"],bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline","Meta+U"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"]},function(t,n){e.addMenuItem(n,{text:t[0],icon:n,shortcut:t[2],cmd:t[1]})}),e.on("mousedown",function(){n.hideAll()}),e.addButton("styleselect",{type:"menubutton",text:"Formats",menu:v,onShowMenu:function(){e.settings.style_formats_autohide&&g(this.menu)}}),e.addButton("formatselect",function(){var n=[],r=a(e.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");return f(r,function(t){n.push({text:t[0],value:t[1],textStyle:function(){return e.formatter.getCssText(t[1])}})}),{type:"listbox",text:r[0][0],values:n,fixedWidth:!0,onselect:h,onPostRender:t(n)}}),e.addButton("fontselect",function(){var t="Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats",n=[],r=a(e.settings.font_formats||t);return f(r,function(e){n.push({text:{raw:e[0]},value:e[1],textStyle:e[1].indexOf("dings")==-1?"font-family:"+e[1]:""})}),{type:"listbox",text:"Font Family",tooltip:"Font Family",values:n,fixedWidth:!0,onPostRender:i(n),onselect:function(t){t.control.settings.value&&e.execCommand("FontName",!1,t.control.settings.value)}}}),e.addButton("fontsizeselect",function(){var t=[],n="8pt 10pt 12pt 14pt 18pt 24pt 36pt",r=e.settings.fontsize_formats||n;return f(r.split(" "),function(e){var n=e,r=e,i=e.split("=");i.length>1&&(n=i[0],r=i[1]),t.push({text:n,value:r})}),{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:t,fixedWidth:!0,onPostRender:o(t),onclick:function(t){t.control.settings.value&&e.execCommand("FontSize",!1,t.control.settings.value)}}}),e.addMenuItem("formats",{text:"Formats",menu:v})}var f=r.each,p=function(e){return i.reduce(e,function(e,t){return e.concat(t)},[])};a.on("AddEditor",function(e){var t=e.editor;c(t),d(t),u(t)}),e.translate=function(e){return a.translate(e)},t.tooltips=!s.iOS}),r(zt,[yt],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,u,c,d,f,p,h,m,g,v,y,b,C,x,w,E,N=[],_=[],S,k,T,R,A,B;t=e.settings,i=e.items().filter(":visible"),o=e.layoutRect(),r=t.columns||Math.ceil(Math.sqrt(i.length)),n=Math.ceil(i.length/r),y=t.spacingH||t.spacing||0,b=t.spacingV||t.spacing||0,C=t.alignH||t.align,x=t.alignV||t.align,g=e.paddingBox,A="reverseRows"in t?t.reverseRows:e.isRtl(),C&&"string"==typeof C&&(C=[C]),x&&"string"==typeof x&&(x=[x]);for(d=0;d<r;d++)N.push(0);for(f=0;f<n;f++)_.push(0);for(f=0;f<n;f++)for(d=0;d<r&&(c=i[f*r+d],c);d++)u=c.layoutRect(),S=u.minW,k=u.minH,N[d]=S>N[d]?S:N[d],_[f]=k>_[f]?k:_[f];for(T=o.innerW-g.left-g.right,w=0,d=0;d<r;d++)w+=N[d]+(d>0?y:0),T-=(d>0?y:0)+N[d];for(R=o.innerH-g.top-g.bottom,E=0,f=0;f<n;f++)E+=_[f]+(f>0?b:0),R-=(f>0?b:0)+_[f];if(w+=g.left+g.right,E+=g.top+g.bottom,l={},l.minW=w+(o.w-o.innerW),l.minH=E+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW==o.minW&&l.minH==o.minH){o.autoResize&&(l=e.layoutRect(l),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH);var D;D="start"==t.packV?0:R>0?Math.floor(R/n):0;var L=0,M=t.flexWidths;if(M)for(d=0;d<M.length;d++)L+=M[d];else L=r;var P=T/L;for(d=0;d<r;d++)N[d]+=M?M[d]*P:P;for(h=g.top,f=0;f<n;f++){for(p=g.left,s=_[f]+D,d=0;d<r&&(B=A?f*r+r-1-d:f*r+d,c=i[B],c);d++)m=c.settings,u=c.layoutRect(),a=Math.max(N[d],u.startMinWidth),u.x=p,u.y=h,v=m.alignH||(C?C[d]||C[0]:null),"center"==v?u.x=p+a/2-u.w/2:"right"==v?u.x=p+a-u.w:"stretch"==v&&(u.w=a),v=m.alignV||(x?x[d]||x[0]:null),"center"==v?u.y=h+s/2-u.h/2:"bottom"==v?u.y=h+s-u.h:"stretch"==v&&(u.h=s),c.layoutRect(u),p+=a+y,c.recalc&&c.recalc();h+=s+b}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var O=e.parent();O&&(O._lastRect=null,O.recalc())}}})}),r(Ut,[Pe,c],function(e,t){return e.extend({renderHtml:function(){var e=this;return e.classes.add("iframe"),e.canFocus=!1,'<iframe id="'+e._id+'" class="'+e.classes+'" tabindex="-1" src="'+(e.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(e){this.getEl().src=e},html:function(e,n){var r=this,i=this.getEl().contentWindow.document.body;return i?(i.innerHTML=e,n&&n()):t.setTimeout(function(){r.html(e)}),this}})}),r(Wt,[Pe],function(e){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("widget").add("infobox"),t.canFocus=!1},severity:function(e){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(e)},help:function(e){this.state.set("help",e)},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes+'"><div id="'+e._id+'-body">'+e.encode(e.state.get("text"))+'<button role="button" tabindex="-1"><i class="'+t+"ico "+t+'i-help"></i></button></div></div>';
+},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl("body").firstChild.data=e.encode(t.value),e.state.get("rendered")&&e.updateLayoutRect()}),e.state.on("change:help",function(t){e.classes.toggle("has-help",t.value),e.state.get("rendered")&&e.updateLayoutRect()}),e._super()}})}),r(Vt,[Pe,ve],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("widget").add("label"),t.canFocus=!1,e.multiline&&t.classes.add("autoscroll"),e.strong&&t.classes.add("strong")},initLayoutRect:function(){var e=this,n=e._super();if(e.settings.multiline){var r=t.getSize(e.getEl());r.width>n.maxW&&(n.minW=n.maxW,e.classes.add("multiline")),e.getEl().style.width=n.minW+"px",n.startMinH=n.h=n.minH=Math.min(n.maxH,t.getSize(e.getEl()).height)}return n},repaint:function(){var e=this;return e.settings.multiline||(e.getEl().style.lineHeight=e.layoutRect().h+"px"),e._super()},severity:function(e){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(e)},renderHtml:function(){var e=this,t,n,r=e.settings.forId;return!r&&(n=e.settings.forName)&&(t=e.getRoot().find("#"+n)[0],t&&(r=t._id)),r?'<label id="'+e._id+'" class="'+e.classes+'"'+(r?' for="'+r+'"':"")+">"+e.encode(e.state.get("text"))+"</label>":'<span id="'+e._id+'" class="'+e.classes+'">'+e.encode(e.state.get("text"))+"</span>"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.innerHtml(e.encode(t.value)),e.state.get("rendered")&&e.updateLayoutRect()}),e._super()}})}),r($t,[Ne],function(e){return e.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){var t=this;t._super(e),t.classes.add("toolbar")},postRender:function(){var e=this;return e.items().each(function(e){e.classes.add("toolbar-item")}),e._super()}})}),r(qt,[$t],function(e){return e.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}})}),r(jt,[bt,we,qt],function(e,t,n){function r(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}var i=e.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),e=t.settings,t.classes.add("menubtn"),e.fixedWidth&&t.classes.add("fixed-width"),t.aria("haspopup",!0),t.state.set("menu",e.menu||t.render())},showMenu:function(e){var n=this,r;return n.menu&&n.menu.visible()&&e!==!1?n.hideMenu():(n.menu||(r=n.state.get("menu")||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",r.renderTo?n.menu=r.parent(n).show().renderTo():n.menu=t.create(r).parent(n).renderTo(),n.fire("createmenu"),n.menu.reflow(),n.menu.on("cancel",function(e){e.control.parent()===n.menu&&(e.stopPropagation(),n.focus(),n.hideMenu())}),n.menu.on("select",function(){n.focus()}),n.menu.on("show hide",function(e){e.control==n.menu&&n.activeMenu("show"==e.type),n.aria("expanded","show"==e.type)}).fire("show")),n.menu.show(),n.menu.layoutRect({w:n.layoutRect().w}),n.menu.moveRel(n.getEl(),n.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]),void n.fire("showmenu"))},hideMenu:function(){var e=this;e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide())},activeMenu:function(e){this.classes.toggle("active",e)},renderHtml:function(){var e=this,t=e._id,r=e.classPrefix,i=e.settings.icon,o,a=e.state.get("text"),s="";return o=e.settings.image,o?(i="none","string"!=typeof o&&(o=window.getSelection?o[0]:o[1]),o=" style=\"background-image: url('"+o+"')\""):o="",a&&(e.classes.add("btn-has-text"),s='<span class="'+r+'txt">'+e.encode(a)+"</span>"),i=e.settings.icon?r+"ico "+r+"i-"+i:"",e.aria("role",e.parent()instanceof n?"menuitem":"button"),'<div id="'+t+'" class="'+e.classes+'" tabindex="-1" aria-labelledby="'+t+'"><button id="'+t+'-open" role="presentation" type="button" tabindex="-1">'+(i?'<i class="'+i+'"'+o+"></i>":"")+s+' <i class="'+r+'caret"></i></button></div>'},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&r(t.target,e.getEl())&&(e.focus(),e.showMenu(!t.aria),t.aria&&e.menu.items().filter(":visible")[0].focus())}),e.on("mouseenter",function(t){var n=t.control,r=e.parent(),o;n&&r&&n instanceof i&&n.parent()==r&&(r.items().filter("MenuButton").each(function(e){e.hideMenu&&e!=n&&(e.menu&&e.menu.visible()&&(o=!0),e.hideMenu())}),o&&(n.focus(),n.showMenu()))}),e._super()},bindStates:function(){var e=this;return e.state.on("change:menu",function(){e.menu&&e.menu.remove(),e.menu=null}),e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}});return i}),r(Yt,[Pe,we,d,c],function(e,t,n,r){return e.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t=this,n;t._super(e),e=t.settings,t.classes.add("menu-item"),e.menu&&t.classes.add("menu-item-expand"),e.preview&&t.classes.add("menu-item-preview"),n=t.state.get("text"),"-"!==n&&"|"!==n||(t.classes.add("menu-item-sep"),t.aria("role","separator"),t.state.set("text","-")),e.selectable&&(t.aria("role","menuitemcheckbox"),t.classes.add("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||t.classes.add("menu-item-normal"),t.on("mousedown",function(e){e.preventDefault()}),e.menu&&!e.ariaHideMenu&&t.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e=this,n=e.settings,r,i=e.parent();if(i.items().each(function(t){t!==e&&t.hideMenu()}),n.menu){r=e.menu,r?r.show():(r=n.menu,r.length?r={type:"menu",items:r}:r.type=r.type||"menu",i.settings.itemDefaults&&(r.itemDefaults=i.settings.itemDefaults),r=e.menu=t.create(r).parent(e).renderTo(),r.reflow(),r.on("cancel",function(t){t.stopPropagation(),e.focus(),r.hide()}),r.on("show hide",function(e){e.control.items&&e.control.items().each(function(e){e.active(e.settings.selected)})}).fire("show"),r.on("hide",function(t){t.control===r&&e.classes.remove("selected")}),r.submenu=!0),r._parentMenu=i,r.classes.add("menu-sub");var o=r.testMoveRel(e.getEl(),e.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);r.moveRel(e.getEl(),o),r.rel=o,o="menu-sub-"+o,r.classes.remove(r._lastRel).add(o),r._lastRel=o,e.classes.add("selected"),e.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){function e(e){var t,r,i={};for(i=n.mac?{alt:"&#x2325;",ctrl:"&#x2318;",shift:"&#x21E7;",meta:"&#x2318;"}:{meta:"Ctrl"},e=e.split("+"),t=0;t<e.length;t++)r=i[e[t].toLowerCase()],r&&(e[t]=r);return e.join("+")}function t(e){return e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function r(e){var n=s.match||"";return n?e.replace(new RegExp(t(n),"gi"),function(e){return"!mce~match["+e+"]mce~match!"}):e}function i(e){return e.replace(new RegExp(t("!mce~match["),"g"),"<b>").replace(new RegExp(t("]mce~match!"),"g"),"</b>")}var o=this,a=o._id,s=o.settings,l=o.classPrefix,u=o.state.get("text"),c=o.settings.icon,d="",f=s.shortcut,p=o.encode(s.url),h="";return c&&o.parent().classes.add("menu-has-icons"),s.image&&(d=" style=\"background-image: url('"+s.image+"')\""),f&&(f=e(f)),c=l+"ico "+l+"i-"+(o.settings.icon||"none"),h="-"!==u?'<i class="'+c+'"'+d+"></i>\xa0":"",u=i(o.encode(r(u))),p=i(o.encode(r(p))),'<div id="'+a+'" class="'+o.classes+'" tabindex="-1">'+h+("-"!==u?'<span id="'+a+'-text" class="'+l+'text">'+u+"</span>":"")+(f?'<div id="'+a+'-shortcut" class="'+l+'menu-shortcut">'+f+"</div>":"")+(s.menu?'<div class="'+l+'caret"></div>':"")+(p?'<div class="'+l+'menu-item-link">'+p+"</div>":"")+"</div>"},postRender:function(){var e=this,t=e.settings,n=t.textStyle;if("function"==typeof n&&(n=n.call(this)),n){var i=e.getEl("text");i&&i.setAttribute("style",n)}return e.on("mouseenter click",function(n){n.control===e&&(t.menu||"click"!==n.type?(e.showMenu(),n.aria&&e.menu.focus(!0)):(e.fire("select"),r.requestAnimationFrame(function(){e.parent().hideAll()})))}),e._super(),e},hover:function(){var e=this;return e.parent().items().each(function(e){e.classes.remove("selected")}),e.classes.toggle("selected",!0),e},active:function(e){return"undefined"!=typeof e&&this.aria("checked",e),this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}})}),r(Xt,[g,xe,c],function(e,t,n){return function(r,i){var o=this,a,s=t.classPrefix,l;o.show=function(t,u){function c(){a&&(e(r).append('<div class="'+s+"throbber"+(i?" "+s+"throbber-inline":"")+'"></div>'),u&&u())}return o.hide(),a=!0,t?l=n.setTimeout(c,t):c(),o},o.hide=function(){var e=r.lastChild;return n.clearTimeout(l),e&&e.className.indexOf("throbber")!=-1&&e.parentNode.removeChild(e),a=!1,o}}}),r(Kt,[Ae,Yt,Xt,m],function(e,t,n,r){return e.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(e){var t=this;if(e.autohide=!0,e.constrainToViewport=!0,"function"==typeof e.items&&(e.itemsFactory=e.items,e.items=[]),e.itemDefaults)for(var n=e.items,i=n.length;i--;)n[i]=r.extend({},e.itemDefaults,n[i]);t._super(e),t.classes.add("menu")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){var e=this;e.hideAll(),e.fire("select")},load:function(){function e(){t.throbber&&(t.throbber.hide(),t.throbber=null)}var t=this,r,i;i=t.settings.itemsFactory,i&&(t.throbber||(t.throbber=new n(t.getEl("body"),!0),0===t.items().length?(t.throbber.show(),t.fire("loading")):t.throbber.show(100,function(){t.items().remove(),t.fire("loading")}),t.on("hide close",e)),t.requestTime=r=(new Date).getTime(),t.settings.itemsFactory(function(n){return 0===n.length?void t.hide():void(t.requestTime===r&&(t.getEl().style.width="",t.getEl("body").style.width="",e(),t.items().remove(),t.getEl("body").innerHTML="",t.add(n),t.renderNew(),t.fire("loaded")))}))},hideAll:function(){var e=this;return this.find("menuitem").exec("hideMenu"),e._super()},preRender:function(){var e=this;return e.items().each(function(t){var n=t.settings;if(n.icon||n.image||n.selectable)return e._hasIcons=!0,!1}),e.settings.itemsFactory&&e.on("postrender",function(){e.settings.itemsFactory&&e.load()}),e._super()}})}),r(Gt,[jt,Kt],function(e,t){return e.extend({init:function(e){function t(r){for(var a=0;a<r.length;a++){if(i=r[a].selected||e.value===r[a].value)return o=o||r[a].text,n.state.set("value",r[a].value),!0;if(r[a].menu&&t(r[a].menu))return!0}}var n=this,r,i,o,a;n._super(e),e=n.settings,n._values=r=e.values,r&&("undefined"!=typeof e.value&&t(r),!i&&r.length>0&&(o=r[0].text,n.state.set("value",r[0].value)),n.state.set("menu",r)),n.state.set("text",e.text||o),n.classes.add("listbox"),n.on("select",function(t){var r=t.control;a&&(t.lastControl=a),e.multiple?r.active(!r.active()):n.value(t.control.value()),a=r})},bindStates:function(){function e(e,n){e instanceof t&&e.items().each(function(e){e.hasMenus()||e.active(e.value()===n)})}function n(e,t){var r;if(e)for(var i=0;i<e.length;i++){if(e[i].value===t)return e[i];if(e[i].menu&&(r=n(e[i].menu,t)))return r}}var r=this;return r.on("show",function(t){e(t.control,r.value())}),r.state.on("change:value",function(e){var t=n(r.state.get("menu"),e.value);t?r.text(t.text):r.text(r.settings.text)}),r._super()}})}),r(Jt,[xt],function(e){return e.extend({Defaults:{classes:"radio",role:"radio"}})}),r(Qt,[Pe,_e],function(e,t){return e.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.classes.add("resizehandle"),"both"==e.settings.direction&&e.classes.add("resizehandle-both"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes+'"><i class="'+t+"ico "+t+'i-resize"></i></div>'},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new t(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!=e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},stop:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}})}),r(Zt,[Pe],function(e){function t(e){var t="";if(e)for(var n=0;n<e.length;n++)t+='<option value="'+e[n]+'">'+e[n]+"</option>";return t}return e.extend({Defaults:{classes:"selectbox",role:"selectbox",options:[]},init:function(e){var t=this;t._super(e),t.settings.size&&(t.size=t.settings.size),t.settings.options&&(t._options=t.settings.options),t.on("keydown",function(e){var n;13==e.keyCode&&(e.preventDefault(),t.parents().reverse().each(function(e){if(e.toJSON)return n=e,!1}),t.fire("submit",{data:n.toJSON()}))})},options:function(e){return arguments.length?(this.state.set("options",e),this):this.state.get("options")},renderHtml:function(){var e=this,n,r="";return n=t(e._options),e.size&&(r=' size = "'+e.size+'"'),'<select id="'+e._id+'" class="'+e.classes+'"'+r+">"+n+"</select>"},bindStates:function(){var e=this;return e.state.on("change:options",function(n){e.getEl().innerHTML=t(n.value)}),e._super()}})}),r(en,[Pe,_e,ve],function(e,t,n){function r(e,t,n){return e<t&&(e=t),e>n&&(e=n),e}function i(e,t,n){e.setAttribute("aria-"+t,n)}function o(e,t){var r,o,a,s,l,u;"v"==e.settings.orientation?(s="top",a="height",o="h"):(s="left",a="width",o="w"),u=e.getEl("handle"),r=(e.layoutRect()[o]||100)-n.getSize(u)[a],l=r*((t-e._minValue)/(e._maxValue-e._minValue))+"px",u.style[s]=l,u.style.height=e.layoutRect().h+"px",i(u,"valuenow",t),i(u,"valuetext",""+e.settings.previewFilter(t)),i(u,"valuemin",e._minValue),i(u,"valuemax",e._maxValue)}return e.extend({init:function(e){var t=this;e.previewFilter||(e.previewFilter=function(e){return Math.round(100*e)/100}),t._super(e),t.classes.add("slider"),"v"==e.orientation&&t.classes.add("vertical"),t._minValue=e.minValue||0,t._maxValue=e.maxValue||100,t._initValue=t.state.get("value")},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes+'"><div id="'+t+'-handle" class="'+n+'slider-handle" role="slider" tabindex="-1"></div></div>'},reset:function(){this.value(this._initValue).repaint()},postRender:function(){function e(e,t,n){return(n+e)/(t-e)}function i(e,t,n){return n*(t-e)-e}function o(t,n){function o(o){var a;a=s.value(),a=i(t,n,e(t,n,a)+.05*o),a=r(a,t,n),s.value(a),s.fire("dragstart",{value:a}),s.fire("drag",{value:a}),s.fire("dragend",{value:a})}s.on("keydown",function(e){switch(e.keyCode){case 37:case 38:o(-1);break;case 39:case 40:o(1)}})}function a(e,i,o){var a,l,u,h,m;s._dragHelper=new t(s._id,{handle:s._id+"-handle",start:function(e){a=e[c],l=parseInt(s.getEl("handle").style[d],10),u=(s.layoutRect()[p]||100)-n.getSize(o)[f],s.fire("dragstart",{value:m})},drag:function(t){var n=t[c]-a;h=r(l+n,0,u),o.style[d]=h+"px",m=e+h/u*(i-e),s.value(m),s.tooltip().text(""+s.settings.previewFilter(m)).show().moveRel(o,"bc tc"),s.fire("drag",{value:m})},stop:function(){s.tooltip().hide(),s.fire("dragend",{value:m})}})}var s=this,l,u,c,d,f,p;l=s._minValue,u=s._maxValue,"v"==s.settings.orientation?(c="screenY",d="top",f="height",p="h"):(c="screenX",d="left",f="width",p="w"),s._super(),o(l,u,s.getEl("handle")),a(l,u,s.getEl("handle"))},repaint:function(){this._super(),o(this,this.value())},bindStates:function(){var e=this;return e.state.on("change:value",function(t){o(e,t.value)}),e._super()}})}),r(tn,[Pe],function(e){return e.extend({renderHtml:function(){var e=this;return e.classes.add("spacer"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes+'"></div>'}})}),r(nn,[jt,ve,g],function(e,t,n){return e.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var e=this,r=e.getEl(),i=e.layoutRect(),o,a;return e._super(),o=r.firstChild,a=r.lastChild,n(o).css({width:i.w-t.getSize(a).width,height:i.h-2}),n(a).css({height:i.h-2}),e},activeMenu:function(e){var t=this;n(t.getEl().lastChild).toggleClass(t.classPrefix+"active",e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r,i=e.state.get("icon"),o=e.state.get("text"),a="";return r=e.settings.image,r?(i="none","string"!=typeof r&&(r=window.getSelection?r[0]:r[1]),r=" style=\"background-image: url('"+r+"')\""):r="",i=e.settings.icon?n+"ico "+n+"i-"+i:"",o&&(e.classes.add("btn-has-text"),a='<span class="'+n+'txt">'+e.encode(o)+"</span>"),'<div id="'+t+'" class="'+e.classes+'" role="button" tabindex="-1"><button type="button" hidefocus="1" tabindex="-1">'+(i?'<i class="'+i+'"'+r+"></i>":"")+a+'</button><button type="button" class="'+n+'open" hidefocus="1" tabindex="-1">'+(e._menuBtnText?(i?"\xa0":"")+e._menuBtnText:"")+' <i class="'+n+'caret"></i></button></div>'},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(e){var n=e.target;if(e.control==this)for(;n;){if(e.aria&&"down"!=e.aria.key||"BUTTON"==n.nodeName&&n.className.indexOf("open")==-1)return e.stopImmediatePropagation(),void(t&&t.call(this,e));n=n.parentNode}}),delete e.settings.onclick,e._super()}})}),r(rn,[Ht],function(e){return e.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}})}),r(on,[ke,g,ve],function(e,t,n){return e.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(e){var n;this.activeTabId&&(n=this.getEl(this.activeTabId),t(n).removeClass(this.classPrefix+"active"),n.setAttribute("aria-selected","false")),this.activeTabId="t"+e,n=this.getEl("t"+e),n.setAttribute("aria-selected","true"),t(n).addClass(this.classPrefix+"active"),this.items()[e].show().fire("showtab"),this.reflow(),this.items().each(function(t,n){e!=n&&t.hide()})},renderHtml:function(){var e=this,t=e._layout,n="",r=e.classPrefix;return e.preRender(),t.preRender(e),e.items().each(function(t,i){var o=e._id+"-t"+i;t.aria("role","tabpanel"),t.aria("labelledby",o),n+='<div id="'+o+'" class="'+r+'tab" unselectable="on" role="tab" aria-controls="'+t._id+'" aria-selected="false" tabIndex="-1">'+e.encode(t.settings.title)+"</div>"}),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1"><div id="'+e._id+'-head" class="'+r+'tabs" role="tablist">'+n+'</div><div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+t.renderHtml(e)+"</div></div>"},postRender:function(){var e=this;e._super(),e.settings.activeTab=e.settings.activeTab||0,e.activateTab(e.settings.activeTab),this.on("click",function(t){var n=t.target.parentNode;if(n&&n.id==e._id+"-head")for(var r=n.childNodes.length;r--;)n.childNodes[r]==t.target&&e.activateTab(r)})},initLayoutRect:function(){var e=this,t,r,i;r=n.getSize(e.getEl("head")).width,r=r<0?0:r,i=0,e.items().each(function(e){r=Math.max(r,e.layoutRect().minW),i=Math.max(i,e.layoutRect().minH)}),e.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=r,e.settings.h=i,e.layoutRect({x:0,y:0,w:r,h:i})});var o=n.getSize(e.getEl("head")).height;return e.settings.minWidth=r,e.settings.minHeight=i+o,t=e._super(),t.deltaH+=o,t.innerH=t.h-t.deltaH,t}})}),r(an,[Pe,m,ve],function(e,t,n){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("textbox"),e.multiline?t.classes.add("multiline"):(t.on("keydown",function(e){var n;13==e.keyCode&&(e.preventDefault(),t.parents().reverse().each(function(e){if(e.toJSON)return n=e,!1}),t.fire("submit",{data:n.toJSON()}))}),t.on("keyup",function(e){t.state.set("value",e.target.value)}))},repaint:function(){var e=this,t,n,r,i,o=0,a;t=e.getEl().style,n=e._layoutRect,a=e._lastRepaintRect||{};var s=document;return!e.settings.multiline&&s.all&&(!s.documentMode||s.documentMode<=8)&&(t.lineHeight=n.h-o+"px"),r=e.borderBox,i=r.left+r.right+8,o=r.top+r.bottom+(e.settings.multiline?8:0),n.x!==a.x&&(t.left=n.x+"px",a.x=n.x),n.y!==a.y&&(t.top=n.y+"px",a.y=n.y),n.w!==a.w&&(t.width=n.w-i+"px",a.w=n.w),n.h!==a.h&&(t.height=n.h-o+"px",a.h=n.h),e._lastRepaintRect=a,e.fire("repaint",{},!1),e},renderHtml:function(){var e=this,r=e.settings,i,o;return i={id:e._id,hidefocus:"1"},t.each(["rows","spellcheck","maxLength","size","readonly","min","max","step","list","pattern","placeholder","required","multiple"],function(e){i[e]=r[e]}),e.disabled()&&(i.disabled="disabled"),r.subtype&&(i.type=r.subtype),o=n.create(r.multiline?"textarea":"input",i),o.value=e.state.get("value"),o.className=e.classes,o.outerHTML},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var e=this;e.getEl().value=e.state.get("value"),e._super(),e.$el.on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)})},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl().value!=t.value&&(e.getEl().value=t.value)}),e.state.on("change:disabled",function(t){e.getEl().disabled=t.value}),e._super()},remove:function(){this.$el.off(),this._super()}})}),r(sn,[],function(){var e=this||window,t=function(){return e.tinymce};return"function"==typeof e.define&&(e.define.amd||e.define("ephox/tinymce",[],t)),"object"==typeof module&&(module.exports=window.tinymce),{}}),a([l,u,c,d,f,p,m,g,v,y,C,w,E,N,T,A,B,D,L,M,P,O,I,F,j,Y,J,te,le,ue,ce,de,pe,me,ge,Ce,xe,we,Ee,Ne,_e,Se,ke,Te,Re,Ae,Be,De,Le,Me,Pe,Oe,He,Ie,Ue,Ve,at,st,lt,ut,dt,ft,pt,ht,mt,gt,vt,yt,bt,Ct,xt,wt,Et,Nt,_t,St,kt,Tt,Rt,At,Bt,Dt,Mt,Pt,Ot,Ht,Ft,zt,Ut,Wt,Vt,$t,qt,jt,Yt,Xt,Kt,Gt,Jt,Qt,Zt,en,tn,nn,rn,on,an])}(window);
\ No newline at end of file
diff --git a/core/media/index.html b/core/media/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/media/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/media/jui/css/bootstrap-extended.css b/core/media/jui/css/bootstrap-extended.css
new file mode 100644
index 00000000..a24649bb
--- /dev/null
+++ b/core/media/jui/css/bootstrap-extended.css
@@ -0,0 +1,498 @@
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 30px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.small {
+	font-size: 11px;
+}
+iframe,
+svg {
+	max-width: 100%;
+}
+.nowrap {
+	white-space: nowrap;
+}
+.center,
+.table td.center,
+.table th.center {
+	text-align: center;
+}
+a.disabled,
+a.disabled:hover {
+	color: #999999;
+	background-color: transparent;
+	cursor: default;
+	text-decoration: none;
+}
+.hero-unit {
+	text-align: center;
+}
+.hero-unit .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+.btn .caret {
+	margin-bottom: 7px;
+}
+.btn.btn-micro .caret {
+	margin: 5px 0;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+body.modal {
+	padding-top: 0;
+}
+.row-even,
+.row-odd {
+	padding: 5px;
+	width: 99%;
+	border-bottom: 1px solid #ddd;
+}
+.row-odd {
+	background-color: transparent;
+}
+.row-even {
+	background-color: #f9f9f9;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .row-reveal {
+	visibility: hidden;
+}
+.row-fluid:hover .row-reveal {
+	visibility: visible;
+}
+.btn-wide {
+	width: 80%;
+}
+.nav-list > li.offset > a {
+	padding-left: 30px;
+	font-size: 12px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .offset1 {
+	margin-left: 8.382978723%;
+}
+.row-fluid .offset2 {
+	margin-left: 16.89361702%;
+}
+.row-fluid .offset3 {
+	margin-left: 25.404255317%;
+}
+.row-fluid .offset4 {
+	margin-left: 33.914893614%;
+}
+.row-fluid .offset5 {
+	margin-left: 42.425531911%;
+}
+.row-fluid .offset6 {
+	margin-left: 50.93617020799999%;
+}
+.row-fluid .offset7 {
+	margin-left: 59.446808505%;
+}
+.row-fluid .offset8 {
+	margin-left: 67.95744680199999%;
+}
+.row-fluid .offset9 {
+	margin-left: 76.468085099%;
+}
+.row-fluid .offset10 {
+	margin-left: 84.97872339599999%;
+}
+.row-fluid .offset11 {
+	margin-left: 91.489361693%;
+}
+.navbar .nav > li > a.btn {
+	padding: 4px 10px;
+	line-height: 18px;
+}
+.nav-tabs.nav-dark {
+	border-bottom: 1px solid #333;
+	text-shadow: 1px 1px 1px #000;
+}
+.nav-tabs.nav-dark > li > a {
+	color: #F8F8F8;
+}
+.nav-tabs.nav-dark > li > a:hover {
+	border-color: #333 #333 #111;
+	background-color: #777777;
+}
+.nav-tabs.nav-dark > .active > a,
+.nav-tabs.nav-dark > .active > a:hover {
+	color: #ffffff;
+	background-color: #555555;
+	border: 1px solid #222;
+	border-bottom-color: transparent;
+}
+.thumbnail.pull-left {
+	margin: 0 10px 10px 0;
+}
+.thumbnail.pull-right {
+	margin: 0 0 10px 10px;
+}
+.width-10 {
+	width: 10px;
+}
+.width-20 {
+	width: 20px;
+}
+.width-30 {
+	width: 30px;
+}
+.width-40 {
+	width: 40px;
+}
+.width-50 {
+	width: 50px;
+}
+.width-60 {
+	width: 60px;
+}
+.width-70 {
+	width: 70px;
+}
+.width-80 {
+	width: 80px;
+}
+.width-90 {
+	width: 90px;
+}
+.width-100 {
+	width: 100px;
+}
+.height-10 {
+	height: 10px;
+}
+.height-20 {
+	height: 20px;
+}
+.height-30 {
+	height: 30px;
+}
+.height-40 {
+	height: 40px;
+}
+.height-50 {
+	height: 50px;
+}
+.height-60 {
+	height: 60px;
+}
+.height-70 {
+	height: 70px;
+}
+.height-80 {
+	height: 80px;
+}
+.height-90 {
+	height: 90px;
+}
+.height-100 {
+	height: 100px;
+}
+hr.hr-condensed {
+	margin: 10px 0;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #ddd;
+	margin-left: 0;
+}
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #ddd;
+	padding: 8px;
+}
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #f5f5f5;
+}
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box;
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.row-striped .row-fluid [class*="span"] {
+	margin-left: 8px;
+}
+.row-striped .row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.list-condensed li {
+	padding: 4px 5px;
+}
+.row-condensed .row,
+.row-condensed .row-fluid {
+	padding: 4px 5px;
+}
+.list-bordered,
+.row-bordered {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	margin-left: 0;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.radio.btn-group input[type=radio] {
+	display: none;
+}
+.radio.btn-group > label {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.radio.btn-group {
+	padding-left: 0;
+}
+.iframe-bordered {
+	border: 1px solid #ddd;
+}
+.tab-content {
+	overflow: visible;
+}
+.tabs-left .tab-content {
+	overflow: auto;
+}
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+.btn-group > .btn-micro {
+	font-size: 10px;
+}
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+.page-header {
+	margin: 2px 0px 10px 0px;
+	padding-bottom: 5px;
+}
+.input-prepend > .add-on,
+.input-append > .add-on {
+	vertical-align: top;
+}
+.input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0 3px 0 0;
+	-moz-border-radius: 0 3px 0 0;
+	border-radius: 0 3px 0 0;
+}
+.input-append .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 3px 0 0 0;
+	-moz-border-radius: 3px 0 0 0;
+	border-radius: 3px 0 0 0;
+}
+.input-prepend.input-append .chzn-container-single .chzn-single,
+.input-prepend.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
+.form-vertical .control-label {
+	float: none;
+	width: auto;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: left;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+.width-auto {
+	width: auto;
+}
+.btn-group .chzn-results {
+	white-space: normal;
+}
+.accordion-body.in:hover {
+	overflow: visible;
+}
+.invalid {
+	color: #9d261d;
+	font-weight: bold;
+}
+input.invalid {
+	border: 1px solid #9d261d;
+	background: #f2dede;
+}
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: #9d261d;
+	color: #9d261d;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+.tip-text {
+	text-align: left;
+}
+.btn-group > .btn + .dropdown-backdrop + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-backdrop + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.dropdown-menu {
+	text-align: left;
+}
+.alert-link {
+	font-weight: bold;
+}
+.alert .alert-link {
+	color: #a47e3c;
+}
+.alert-success .alert-link {
+	color: #356635;
+}
+.alert-danger .alert-link,
+.alert-error .alert-link {
+	color: #953b39;
+}
+.alert-info .alert-link {
+	color: #2d6987;
+}
diff --git a/core/media/jui/css/bootstrap-responsive.css b/core/media/jui/css/bootstrap-responsive.css
new file mode 100644
index 00000000..d68d3a7d
--- /dev/null
+++ b/core/media/jui/css/bootstrap-responsive.css
@@ -0,0 +1,1090 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/core/media/jui/css/bootstrap-responsive.min.css b/core/media/jui/css/bootstrap-responsive.min.css
new file mode 100644
index 00000000..b11347d9
--- /dev/null
+++ b/core/media/jui/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/core/media/jui/css/bootstrap-rtl.css b/core/media/jui/css/bootstrap-rtl.css
new file mode 100644
index 00000000..d2d15599
--- /dev/null
+++ b/core/media/jui/css/bootstrap-rtl.css
@@ -0,0 +1,619 @@
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 30px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.pull-right {
+	float: left;
+}
+.pull-left {
+	float: right;
+}
+.table th,
+.table td {
+	text-align: right;
+}
+.navbar .brand {
+	float: right;
+	padding: 8px 20px 8px 12px;
+	margin-right: -20px;
+	margin-left: 0;
+}
+.navbar .nav,
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav.pull-right {
+	margin-right: 10px;
+	margin-left: 0px;
+}
+.pull-right > .dropdown-menu {
+	left: 0;
+	right: auto;
+}
+[class*="span"] {
+	float: right;
+	margin-right: 20px;
+	margin-left: 0px;
+}
+.row-fluid [class*="span"] {
+	float: right;
+	margin-right: 2.127659574%;
+	*margin-right: 2.0744680846382977%;
+	margin-left: 0px !important;
+	*margin-left: 0px !important;
+}
+.row-fluid [class*="span"]:first-child {
+	margin-right: 0;
+}
+.form-horizontal .control-label {
+	float: right;
+	width: auto;
+	padding-left: 5px;
+	padding-right: 0;
+	text-align: right;
+}
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-right: 20px;
+	margin-right: 160px;
+	*margin-right: 0;
+	margin-left: 0;
+	text-align: right;
+	margin-top: 6px;
+}
+.form-horizontal .controls:first-child {
+	*padding-right: 160px;
+}
+.form-vertical .controls {
+	*display: inline-block;
+	*padding-right: 20px;
+	margin-right: 0;
+	*margin-right: 0;
+	margin-left: 0;
+	text-align: right;
+	margin-top: 6px;
+}
+.form-vertical .control-label {
+	float: none;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: right;
+	width: auto;
+}
+.chzn-container-single-nosearch .chzn-search input {
+	position: absolute;
+	left: -9000px;
+	display: none;
+}
+.nav-tabs > li,
+.nav-pills > li {
+	float: right;
+}
+.nav-stacked > li {
+	float: none;
+}
+.btn-group > .btn {
+	float: right;
+	margin-right: -1px;
+	margin-left: 0;
+}
+.btn-group > .btn:first-child {
+	margin-right: 0;
+}
+.btn-group > .btn:first-child,
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-topright: 4px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+}
+.btn-group > .btn.large:first-child {
+	-webkit-border-bottom-left-radius: 0px;
+	border-bottom-left-radius: 0px;
+	-webkit-border-top-left-radius: 0px;
+	border-top-left-radius: 0px;
+	-moz-border-radius-bottomleft: 0px;
+	-moz-border-radius-topleft: 0px;
+	margin-right: 0;
+	-webkit-border-bottom-right-radius: 6px;
+	border-bottom-right-radius: 6px;
+	-webkit-border-top-right-radius: 6px;
+	border-top-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	-moz-border-radius-topright: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-top-left-radius: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	border-bottom-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	-moz-border-radius-bottomleft: 6px;
+}
+.btn-group > .btn:first-child:last-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-topright: 4px;
+}
+.input-prepend .add-on {
+	float: right;
+}
+.input-append .add-on {
+	float: none;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	margin-right: 0;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append .uneditable-input {
+	border-left-color: #ccc;
+	border-right-color: #eee;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-left: -1px;
+	margin-right: 0px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+	float: right;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-right: -1px;
+	margin-left: 0px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+body {
+	direction: rtl;
+}
+.pager .next a {
+	float: left;
+}
+.pager .previous a {
+	float: right;
+}
+.icon-arrow-right {
+	background-position: -241px -94px;
+	float: left;
+	padding-right: 3px;
+}
+.icon-arrow-left {
+	background-position: -264px -95px;
+}
+.icon-refresh {
+	background-position: -240px -23px;
+}
+#refresh-status {
+	background-position: right center;
+	padding-left: 0;
+	padding-right: 25px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+	float: right;
+	margin-right: 2px;
+	margin-left: 5px;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: right;
+}
+.btn-group + .btn-group {
+	margin-right: 5px;
+	margin-left: 0px;
+}
+.tabs-left > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #DDD;
+	margin-right: 0px;
+	border-right: 0px;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover {
+	border-color: #DDD #DDD #DDD transparent;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+	margin-right: 0px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0px;
+}
+.btn-toolbar {
+	margin-top: 14px;
+	margin-bottom: 3px;
+}
+.navbar .nav > li {
+	float: right;
+}
+.icon-folder-2 {
+	line-height: 25px;
+	padding-left: 5px;
+}
+.navbar .nav > li > a {
+	padding: 8px 10px;
+	color: #FFFFFF;
+}
+.navigation .nav li li .nav-child {
+	left: auto;
+	right: 100%;
+}
+.navigation .nav li li .nav-child:before {
+	left: auto;
+	right: -7px;
+	border-left: 7px solid rgba(0,0,0,0.2);
+	border-right-width: 0;
+}
+.navigation .nav li li .nav-child:after {
+	left: auto;
+	right: -6px;
+	border-left: 6px solid #ffffff;
+	border-right-width: 0;
+}
+.container-logo {
+	padding-top: 6px;
+	float: left;
+	text-align: left;
+}
+.modal-header .close {
+	float: left;
+}
+.pagination a {
+	float: right;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-right: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination a {
+	float: right;
+	padding: 0 14px;
+	line-height: 34px;
+	text-decoration: none;
+	border: 1px solid #ddd;
+	border-right-width: 0;
+}
+.pagination li:first-child a {
+	border-right-width: 1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.pagination li:last-child a {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.icon-first:before {
+	content: "\e000";
+}
+.icon-previous:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\7b";
+}
+.icon-next:before {
+	content: "\7c";
+}
+.dl-horizontal dt {
+	float: right;
+	text-align: left;
+	clear: right;
+}
+.dl-horizontal dd {
+	margin-left: 0;
+	margin-right: 180px;
+}
+.dl-horizontal dt,
+.profile> ul {
+	margin: 9px 25px 0 0;
+}
+.dropdown-submenu > a:after {
+	float: left;
+	border-width: 5px 5px 5px 0;
+	margin-left: -10px;
+	border-left-color: transparent;
+	border-right-color: #CCC;
+}
+.badge {
+	margin-left: 10px;
+}
+.tip-text {
+	text-align: right;
+}
+.icon-file-add:before {
+	content: "(";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: ">";
+}
+.icon-checkin:before,
+.icon-checkbox:before {
+	content: "<";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "[";
+}
+.btn-toolbar .btn + .btn,
+.btn-toolbar .btn-group + .btn,
+.btn-toolbar .btn + .btn-group {
+	margin-left: 0;
+	margin-right: 5px;
+}
+.btn-toolbar .btn-wrapper {
+	display: inline-block;
+	margin: 0 5px 5px 0;
+}
+.btn-group > .btn + .btn {
+	margin-left: 0;
+	margin-right: -1px;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: 0;
+	margin-right: -1px;
+}
+.table-bordered {
+	border-right-width: 0;
+	border-left-width: 1px;
+	border-right-style: none;
+	border-left-style: solid;
+	border-right-color: -moz-use-text-color;
+	border-left-color: #DDDDDD;
+}
+.chzn-container-single .chzn-single {
+	padding-right: 8px;
+	padding-left: 0;
+}
+.chzn-container-single .chzn-single span {
+	margin-left: 26px;
+	margin-right: 0;
+}
+.chzn-container-single .chzn-single abbr {
+	left: 26px;
+	right: auto;
+}
+.chzn-container-single .chzn-single div {
+	left: 0;
+	right: auto;
+}
+.chzn-container-multi .chzn-choices li {
+	float: right;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+	margin-right: 5px;
+	margin-left: 0;
+	padding-right: 5px;
+	padding-left: 20px;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+	left: 3px;
+	right: auto;
+}
+.chzn-container.chzn-with-drop .chzn-drop {
+	right: 0;
+	left: auto;
+}
+.chzn-container-single.chzn-container-single-nosearch .chzn-search {
+	position: absolute;
+	right: -9999px;
+	left: auto;
+}
+.chzn-container .chzn-drop {
+	right: -9999px;
+	left: auto;
+}
+.alert {
+	padding-right: 14px;
+	padding-left: 35px;
+}
+.alert .close {
+	left: -21px;
+	right: auto;
+}
+.close {
+	float: left;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+	margin-bottom: 9px;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+	float: right;
+	margin-left: 3px;
+	margin-right: 0;
+}
+.com_media .container-main .media {
+	display: inline-block;
+}
+.thumbnails > li {
+	float: right;
+	margin-bottom: 18px;
+	margin-right: 20px;
+}
+#mediamanager-form .description,
+#mediamanager-form .filesize,
+#mediamanager-form .dimensions {
+	direction: ltr;
+}
+.popover,
+.tooltip-inner {
+	text-align: right;
+}
+.popover.top .arrow,
+.popover.bottom .arrow {
+	margin-right: -11px;
+}
+.popover.top .arrow:after,
+.popover.bottom .arrow:after {
+	margin-right: -10px;
+}
+@media (max-width: 480px) {
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0 0 5px 0;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		margin-left: 0px;
+		margin-right: 10px;
+	}
+}
+#pop-print {
+	float: left;
+	margin: 10px;
+}
+#install_url,
+#install_directory,
+#jform_customurl,
+#jform_link,
+#jform_params_url,
+input[type="url"] {
+	text-align: left;
+	direction: ltr;
+}
+#aside .nav .nav-child {
+	border-left: 0;
+	border-right: 2px solid #ddd;
+	padding-left: 0;
+	padding-right: 5px;
+}
+.dropdown-menu {
+	text-align: right;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	margin-left: .25em;
+}
diff --git a/core/media/jui/css/bootstrap-tooltip-extended.css b/core/media/jui/css/bootstrap-tooltip-extended.css
new file mode 100644
index 00000000..09931de5
--- /dev/null
+++ b/core/media/jui/css/bootstrap-tooltip-extended.css
@@ -0,0 +1,37 @@
+/* Base class */
+.tooltip.top-left,
+.tooltip.top-right {
+  margin-top: -3px;
+  padding: 5px 0;
+}
+.tooltip.bottom-left,
+.tooltip.bottom-right {
+  margin-top: 3px;
+  padding: 5px 0;
+}
+
+/* Arrows */
+.tooltip.top-left .tooltip-arrow {
+  bottom: 0;
+  left: 5px;
+  border-width: 5px 5px 0;
+  border-top-color: black;
+}
+.tooltip.top-right .tooltip-arrow {
+  bottom: 0;
+  right: 5px;
+  border-width: 5px 5px 0;
+  border-top-color: black;
+}
+.tooltip.bottom-left .tooltip-arrow {
+  top: 0;
+  left: 5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: black;
+}
+.tooltip.bottom-right .tooltip-arrow {
+  top: 0;
+  right: 5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: black;
+}
diff --git a/core/media/jui/css/bootstrap.css b/core/media/jui/css/bootstrap.css
new file mode 100644
index 00000000..5043f0f8
--- /dev/null
+++ b/core/media/jui/css/bootstrap.css
@@ -0,0 +1,6192 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  width: auto\9;
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 2.127659574468085%;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+
+h1 {
+  font-size: 38.5px;
+}
+
+h2 {
+  font-size: 31.5px;
+}
+
+h3 {
+  font-size: 24.5px;
+}
+
+h4 {
+  font-size: 17.5px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 11.9px;
+}
+
+h1 small {
+  font-size: 24.5px;
+}
+
+h2 small {
+  font-size: 17.5px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  padding-right: 5px;
+  padding-left: 5px;
+  *zoom: 1;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal {
+  *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.dl-horizontal:after {
+  clear: both;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  vertical-align: middle;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  *margin-top: 0;
+  line-height: normal;
+}
+
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.radio,
+.checkbox {
+  min-height: 20px;
+  padding-left: 20px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 20px;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 926px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 846px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 766px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 686px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 606px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 526px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 446px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 366px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 286px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 206px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 126px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+
+.controls-row {
+  *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.controls-row:after {
+  clear: both;
+}
+
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #3a87ad;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #2d6987;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #3a87ad;
+}
+
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.help-block,
+.help-inline {
+  color: #595959;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: 10px;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu,
+.input-append .popover,
+.input-prepend .popover {
+  font-size: 14px;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: top;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .btn-group > .dropdown-toggle {
+  vertical-align: top;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+  margin-left: -1px;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 10px;
+}
+
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 180px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 180px;
+}
+
+.form-horizontal .help-block {
+  margin-bottom: 0;
+}
+
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+  margin-top: 10px;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 180px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table .table {
+  background-color: #ffffff;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+          border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+          border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+}
+
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+  background-color: #f5f5f5;
+}
+
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+
+.table td.span1,
+.table th.span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+.table td.span2,
+.table th.span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+.table td.span3,
+.table th.span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+.table td.span4,
+.table th.span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+.table td.span5,
+.table th.span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+.table td.span6,
+.table th.span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+.table td.span7,
+.table th.span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+.table td.span8,
+.table th.span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+.table td.span9,
+.table th.span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+.table td.span10,
+.table th.span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+.table td.span11,
+.table th.span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+.table td.span12,
+.table th.span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+.table tbody tr.success > td {
+  background-color: #dff0d8;
+}
+
+.table tbody tr.error > td {
+  background-color: #f2dede;
+}
+
+.table tbody tr.warning > td {
+  background-color: #fcf8e3;
+}
+
+.table tbody tr.info > td {
+  background-color: #d9edf7;
+}
+
+.table-hover tbody tr.success:hover > td {
+  background-color: #d0e9c6;
+}
+
+.table-hover tbody tr.error:hover > td {
+  background-color: #ebcccc;
+}
+
+.table-hover tbody tr.warning:hover > td {
+  background-color: #faf2cc;
+}
+
+.table-hover tbody tr.info:hover > td {
+  background-color: #c4e3f3;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  width: 16px;
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  width: 16px;
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  width: 16px;
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  outline: 0;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
+}
+
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  float: right;
+  width: 0;
+  height: 0;
+  margin-top: 5px;
+  margin-right: -10px;
+  border-color: transparent;
+  border-left-color: #cccccc;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+  float: none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.dropdown .dropdown-menu .nav-header {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  *background-color: #e6e6e6;
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #cccccc;
+  *border: 0;
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 11px 19px;
+  font-size: 17.5px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+.btn-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+.btn-mini {
+  padding: 0 6px;
+  font-size: 10.5px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn-primary {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #006dcc;
+  *background-color: #0044cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #0044cc;
+  *background-color: #003bb3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #003399 \9;
+}
+
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  *background-color: #222222;
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-link {
+  color: #0088cc;
+  cursor: pointer;
+  border-color: transparent;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-link:hover,
+.btn-link:focus {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: #333333;
+  text-decoration: none;
+}
+
+.btn-group {
+  position: relative;
+  display: inline-block;
+  *display: inline;
+  *margin-left: .3em;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-size: 0;
+}
+
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+  font-size: 10.5px;
+}
+
+.btn-group > .btn-small {
+  font-size: 11.9px;
+}
+
+.btn-group > .btn-large {
+  font-size: 17.5px;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .btn + .dropdown-toggle {
+  *padding-top: 5px;
+  padding-right: 8px;
+  *padding-bottom: 5px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini + .dropdown-toggle {
+  *padding-top: 2px;
+  padding-right: 5px;
+  *padding-bottom: 2px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large + .dropdown-toggle {
+  *padding-top: 7px;
+  padding-right: 12px;
+  *padding-bottom: 7px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+
+.btn-large .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group-vertical > .btn + .btn {
+  margin-top: -1px;
+  margin-left: 0;
+}
+
+.btn-group-vertical > .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical > .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical > .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical > .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+
+.alert h4 {
+  margin: 0;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-success h4 {
+  color: #468847;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-danger h4,
+.alert-error h4 {
+  color: #b94a48;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-info h4 {
+  color: #3a87ad;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 20px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > li > a > img {
+  max-width: none;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.nav .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.nav > .disabled > a {
+  color: #999999;
+}
+
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 20px;
+  overflow: visible;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+}
+
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-inner:after {
+  clear: both;
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover,
+.navbar .brand:focus {
+  text-decoration: none;
+}
+
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #777777;
+}
+
+.navbar-link {
+  color: #777777;
+}
+
+.navbar-link:hover,
+.navbar-link:focus {
+  color: #333333;
+}
+
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 5px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 14px;
+  margin-bottom: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0;
+}
+
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+  margin-right: 0;
+}
+
+.navbar .nav > li {
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #777777;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  *background-color: #e5e5e5;
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .nav > li > .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .nav > li > .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #555555;
+  background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #777777;
+  border-bottom-color: #777777;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  border-color: #252525;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .brand {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-text {
+  color: #999999;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  *background-color: #040404;
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-repeat: repeat-x;
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.breadcrumb > li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb > li > .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+
+.breadcrumb > .active {
+  color: #999999;
+}
+
+.pagination {
+  margin: 20px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination ul > li {
+  display: inline;
+}
+
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #f5f5f5;
+}
+
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+  padding: 11px 19px;
+  font-size: 17.5px;
+}
+
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 3px;
+          border-bottom-left-radius: 3px;
+  -webkit-border-top-left-radius: 3px;
+          border-top-left-radius: 3px;
+  -moz-border-radius-bottomleft: 3px;
+  -moz-border-radius-topleft: 3px;
+}
+
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+  -webkit-border-top-right-radius: 3px;
+          border-top-right-radius: 3px;
+  -webkit-border-bottom-right-radius: 3px;
+          border-bottom-right-radius: 3px;
+  -moz-border-radius-topright: 3px;
+  -moz-border-radius-bottomright: 3px;
+}
+
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+  padding: 0 6px;
+  font-size: 10.5px;
+}
+
+.pager {
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
+.modal-body {
+  position: relative;
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  font-size: 11px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  padding: 5px 0;
+  margin-top: -3px;
+}
+
+.tooltip.right {
+  padding: 0 5px;
+  margin-left: 3px;
+}
+
+.tooltip.bottom {
+  padding: 5px 0;
+  margin-top: 3px;
+}
+
+.tooltip.left {
+  padding: 0 5px;
+  margin-left: -3px;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-right-color: #000000;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-left-color: #000000;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left;
+  white-space: normal;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.popover.top {
+  margin-top: -10px;
+}
+
+.popover.right {
+  margin-left: 10px;
+}
+
+.popover.bottom {
+  margin-top: 10px;
+}
+
+.popover.left {
+  margin-left: -10px;
+}
+
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+
+.popover-title:empty {
+  display: none;
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.popover .arrow {
+  border-width: 11px;
+}
+
+.popover .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+
+.popover.top .arrow {
+  bottom: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  border-bottom-width: 0;
+}
+
+.popover.top .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  border-top-color: #ffffff;
+  border-bottom-width: 0;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+  border-left-width: 0;
+}
+
+.popover.right .arrow:after {
+  bottom: -10px;
+  left: 1px;
+  border-right-color: #ffffff;
+  border-left-width: 0;
+}
+
+.popover.bottom .arrow {
+  top: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-top-width: 0;
+}
+
+.popover.bottom .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  border-bottom-color: #ffffff;
+  border-top-width: 0;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+  border-right-width: 0;
+}
+
+.popover.left .arrow:after {
+  right: 1px;
+  bottom: -10px;
+  border-left-color: #ffffff;
+  border-right-width: 0;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+     -moz-transition: all 0.2s ease-in-out;
+       -o-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+.media,
+.media .media {
+  margin-top: 15px;
+}
+
+.media:first-child {
+  margin-top: 0;
+}
+
+.media-object {
+  display: block;
+}
+
+.media-heading {
+  margin: 0 0 5px;
+}
+
+.media > .pull-left {
+  margin-right: 10px;
+}
+
+.media > .pull-right {
+  margin-left: 10px;
+}
+
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
+
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding-right: 9px;
+  padding-left: 9px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+.label:empty,
+.badge:empty {
+  display: none;
+}
+
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 20px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+
+.carousel-inner > .active {
+  left: 0;
+}
+
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel-inner > .next {
+  left: 100%;
+}
+
+.carousel-inner > .prev {
+  left: -100%;
+}
+
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+
+.carousel-inner > .active.left {
+  left: -100%;
+}
+
+.carousel-inner > .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+}
+
+.carousel-indicators li {
+  display: block;
+  float: left;
+  width: 10px;
+  height: 10px;
+  margin-left: 5px;
+  text-indent: -999px;
+  background-color: #ccc;
+  background-color: rgba(255, 255, 255, 0.25);
+  border-radius: 5px;
+}
+
+.carousel-indicators .active {
+  background-color: #fff;
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  line-height: 20px;
+  color: #ffffff;
+}
+
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit li {
+  line-height: 30px;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.affix {
+  position: fixed;
+}
+
+/* Joomla JUI NOTE: Original .modal definition has to be commented in modals.less and responsive-767px-max.less */
+
+/* Joomla JUI NOTE: Original .modal definition has to be commented */
+
+div.modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  outline: none;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+div.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+div.modal.fade.in {
+  top: 10%;
+}
+
+/* Joomla JUI NOTE: Original .modal definition has to be commented */
+
+@media (max-width: 767px) {
+  div.modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  div.modal.fade {
+    top: -100px;
+  }
+  div.modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  div.modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+}
diff --git a/core/media/jui/css/bootstrap.min.css b/core/media/jui/css/bootstrap.min.css
new file mode 100644
index 00000000..505f1038
--- /dev/null
+++ b/core/media/jui/css/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}div.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}div.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}div.modal.fade.in{top:10%}@media(max-width:767px){div.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}div.modal.fade{top:-100px}div.modal.fade.in{top:20px}}@media(max-width:480px){div.modal{top:10px;right:10px;left:10px}}
diff --git a/core/media/jui/css/chosen-sprite.png b/core/media/jui/css/chosen-sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..c57da70b4b5b1e08a6977ddde182677af0e5e1b8
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq001-q001Qj1ONa4r~3k40005uNkl<ZNXPA$
zv1?ON6vnR#E-eHD!GgujJ@O<F=wgL$$s{N!RG~<ByQl~%h{^q}#UgHXa1aDRmp~v;
zh<`zFaTJP5Byb^69P}LrAK^_gwVW>cz2)-WJLkv8J@4bb5L`rsE?Kc|FrXHkKz)ov
z76MHYM&Apx%05P7orE!>9=yZ~6O0^V?1%{=1UASqa<2Pgnk7fs!OIs9gh{NCN+@=)
z>Gfttd5uq;oeR{%NHjtqV~jEQeY?tDff=(jqx>~SZ_e+iN26HR*`0Q!Re)~HD85p>
zbL()Mw}bI^#`7wp0+cv&7*LhrtOmR)?PK>(-BeLm#jL5Jfogv-QS(TBnUb;))Krqm
zD}uDDeVLNhm1G*pFB`O?iA=dnWBEpqHk8Yh%Qu45EIG=&F-dDmt|;|nN@|3lOk<e_
zUZ9G4Dk4aA?P@9f*T1Cp0?RBvJnoF)E?+T>VZ7>z*~a1?_t?U)c+&|JFJke1`&0-a
z#PjhRlg?=$KTo4|rU@NyV_fzDy@>h!lVyKShsO8>V>$xyIXRbHK%H~^Aaz=s$Jz^V
zlb?KfaKdZqu3^#m$mintvgJ15@j`sb2Zr%69Sn=xN01Tm5r)NQanT=jhwm7zqj2>O
cEB}D~0$b-QdD7|v=>Px#07*qoM6N<$g6AXnUH||9

literal 0
HcmV?d00001

diff --git a/core/media/jui/css/chosen-sprite@2x.png b/core/media/jui/css/chosen-sprite@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b50545202cb4770039362c55025b0b9824663ad
GIT binary patch
literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq003wJ002q|1ONa4{c+hB00081Nkl<ZXx{Cb
zzi-n(6vrdMPzi=0x`M*U=070=Wa!j|-4k;LW_03*zb64wr%EujBU}E2{0GU11c;~u
zE0(Md=?{nJv+Lx}_E6XD<(=+(QifM0_NVXN_uh-s>oJoIWh{eAG@xkM<0ryd(K3(}
zP8JV&;uuIJ4nL%g8!wSG9E$P+3QVMGgj><+00}M5I5kMzaT<~M;uJ`UhLf<yaSq6_
zl5@-ytlBmNghK}_2H7Pru-5uuQCFE*v<8~0_fM@grx?}(4clEh+Q0gQXy4lSfJp^s
z((baNzs@%nqHk%yqpH^pF>bp9Ahdsrux5(g+(>Q*+9wU{AuYPH0}W_u4`|q(9c->{
zt>Jn|lbhH<_x5jU6prFi#S}&XMZ=~Y5VyC3+ZN%hXc<TfCyR%7)UtGpV<43{%}Cp-
zjT<kKG#rZZ0t!r|YJ}PNU;revIOEhHamQ&y;)_!tB^pk`8pk;x$4bsIQ*g|-ojX|F
zYkgd6PFs!-TaR?T0nf|J%gf8l%WIn@`q3D3`bIoeYZi^WePnjWqNf*EkKNK@t>iz8
zPcLpJgbIK#a49e31-%wf2zh2F&&(Nq<F$PH;fZ`Je_@$Jvdfa_t71!WiUYAzLOzz?
zaH_HtGuuniSe4pRe$nHv?#V-(XIYBItbpV!+d268=0PQQJ2+AMXwC~r?VtKA;9YJH
z?0|6j{#o7MKE5Q+V+!=#DWJxZlMG9)Xm@^yhZR%U#fbu%akK6GQ2i?I8y<Je(zeyX
znyQ2KSnQU0dnCWBgLQ=^yC#)dAJydG9Dn2|yomPj8GrNaD9bqF*qj!vsn(pXe`3QA
zsTd#9jp2ccjWtp>;AL%4zA(=QJRGq`sx3y3#0_cg9Fim739XTOu1NKKjlWs`52Q+3
Uja*K~(*OVf07*qoM6N<$g3mu-GXMYp

literal 0
HcmV?d00001

diff --git a/core/media/jui/css/chosen.css b/core/media/jui/css/chosen.css
new file mode 100644
index 00000000..0ad85713
--- /dev/null
+++ b/core/media/jui/css/chosen.css
@@ -0,0 +1,433 @@
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.6.2
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011-2016 Harvest http://getharvest.com
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
+
+/* @group Base */
+.chzn-container {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 13px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+.chzn-container * {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.chzn-container .chzn-drop {
+  position: absolute;
+  top: 100%;
+  left: -9999px;
+  z-index: 1010;
+  width: 100%;
+  border: 1px solid #aaa;
+  border-top: 0;
+  background: #fff;
+  box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+}
+.chzn-container.chzn-with-drop .chzn-drop {
+  left: 0;
+}
+.chzn-container a {
+  cursor: pointer;
+}
+.chzn-container .search-choice .group-name, .chzn-container .chzn-single .group-name {
+  margin-right: 4px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-weight: normal;
+  color: #999999;
+}
+.chzn-container .search-choice .group-name:after, .chzn-container .chzn-single .group-name:after {
+  content: ":";
+  padding-left: 2px;
+  vertical-align: top;
+}
+
+/* @end */
+/* @group Single Chosen */
+.chzn-container-single .chzn-single {
+  position: relative;
+  display: block;
+  overflow: hidden;
+  padding: 0 0 0 8px;
+  height: 25px;
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  background-color: #fff;
+  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
+  background: -webkit-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background: -moz-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background: -o-linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background: linear-gradient(#ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+  background-clip: padding-box;
+  box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+  color: #444;
+  text-decoration: none;
+  white-space: nowrap;
+  line-height: 24px;
+}
+.chzn-container-single .chzn-default {
+  color: #999;
+}
+.chzn-container-single .chzn-single span {
+  display: block;
+  overflow: hidden;
+  margin-right: 26px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.chzn-container-single .chzn-single-with-deselect span {
+  margin-right: 38px;
+}
+.chzn-container-single .chzn-single abbr {
+  position: absolute;
+  top: 6px;
+  right: 26px;
+  display: block;
+  width: 12px;
+  height: 12px;
+  background: url('chosen-sprite.png') -42px 1px no-repeat;
+  font-size: 1px;
+}
+.chzn-container-single .chzn-single abbr:hover {
+  background-position: -42px -10px;
+}
+.chzn-container-single.chzn-disabled .chzn-single abbr:hover {
+  background-position: -42px -10px;
+}
+.chzn-container-single .chzn-single div {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: block;
+  width: 18px;
+  height: 100%;
+}
+.chzn-container-single .chzn-single div b {
+  display: block;
+  width: 100%;
+  height: 100%;
+  background: url('chosen-sprite.png') no-repeat 0px 2px;
+}
+.chzn-container-single .chzn-search {
+  position: relative;
+  z-index: 1010;
+  margin: 0;
+  padding: 3px 4px;
+  white-space: nowrap;
+}
+.chzn-container-single .chzn-search input[type="text"] {
+  margin: 1px 0;
+  padding: 4px 20px 4px 5px;
+  width: 100%;
+  height: auto;
+  outline: 0;
+  border: 1px solid #aaa;
+  background: white url('chosen-sprite.png') no-repeat 100% -20px;
+  background: url('chosen-sprite.png') no-repeat 100% -20px;
+  font-size: 1em;
+  font-family: sans-serif;
+  line-height: normal;
+  border-radius: 0;
+}
+.chzn-container-single .chzn-drop {
+  margin-top: -1px;
+  border-radius: 0 0 4px 4px;
+  background-clip: padding-box;
+}
+.chzn-container-single.chzn-container-single-nosearch .chzn-search {
+  position: absolute;
+  left: -9999px;
+}
+
+/* @end */
+/* @group Results */
+.chzn-container .chzn-results {
+  color: #444;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  margin: 0 4px 4px 0;
+  padding: 0 0 0 4px;
+  max-height: 240px;
+  -webkit-overflow-scrolling: touch;
+}
+.chzn-container .chzn-results li {
+  display: none;
+  margin: 0;
+  padding: 5px 6px;
+  list-style: none;
+  line-height: 15px;
+  word-wrap: break-word;
+  -webkit-touch-callout: none;
+}
+.chzn-container .chzn-results li.active-result {
+  display: list-item;
+  cursor: pointer;
+}
+.chzn-container .chzn-results li.disabled-result {
+  display: list-item;
+  color: #ccc;
+  cursor: default;
+}
+.chzn-container .chzn-results li.highlighted {
+  background-color: #3875d7;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+  background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
+  background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
+  background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
+  background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+  color: #fff;
+}
+.chzn-container .chzn-results li.no-results {
+  color: #777;
+  display: list-item;
+  background: #f4f4f4;
+}
+.chzn-container .chzn-results li.group-result {
+  display: list-item;
+  font-weight: bold;
+  cursor: default;
+}
+.chzn-container .chzn-results li.group-option {
+  padding-left: 15px;
+}
+.chzn-container .chzn-results li em {
+  font-style: normal;
+  text-decoration: underline;
+}
+
+/* @end */
+/* @group Multi Chosen */
+.chzn-container-multi .chzn-choices {
+  position: relative;
+  overflow: hidden;
+  margin: 0;
+  padding: 0 5px;
+  width: 100%;
+  height: auto;
+  border: 1px solid #aaa;
+  background-color: #fff;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+  background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
+  background-image: -moz-linear-gradient(#eeeeee 1%, #ffffff 15%);
+  background-image: -o-linear-gradient(#eeeeee 1%, #ffffff 15%);
+  background-image: linear-gradient(#eeeeee 1%, #ffffff 15%);
+  cursor: text;
+}
+.chzn-container-multi .chzn-choices li {
+  float: left;
+  list-style: none;
+}
+.chzn-container-multi .chzn-choices li.search-field {
+  margin: 0;
+  padding: 0;
+  white-space: nowrap;
+}
+.chzn-container-multi .chzn-choices li.search-field input[type="text"] {
+  margin: 1px 0;
+  padding: 0;
+  height: 25px;
+  outline: 0;
+  border: 0 !important;
+  background: transparent !important;
+  box-shadow: none;
+  color: #999;
+  font-size: 100%;
+  font-family: sans-serif;
+  line-height: normal;
+  border-radius: 0;
+}
+.chzn-container-multi .chzn-choices li.search-choice {
+  position: relative;
+  margin: 3px 5px 3px 0;
+  padding: 3px 20px 3px 5px;
+  border: 1px solid #aaa;
+  max-width: 100%;
+  border-radius: 3px;
+  background-color: #eeeeee;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-size: 100% 19px;
+  background-repeat: repeat-x;
+  background-clip: padding-box;
+  box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+  color: #333;
+  line-height: 13px;
+  cursor: default;
+}
+.chzn-container-multi .chzn-choices li.search-choice span {
+  word-wrap: break-word;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close {
+  position: absolute;
+  top: 4px;
+  right: 3px;
+  display: block;
+  width: 12px;
+  height: 12px;
+  background: url('chosen-sprite.png') -42px 1px no-repeat;
+  font-size: 1px;
+}
+.chzn-container-multi .chzn-choices li.search-choice .search-choice-close:hover {
+  background-position: -42px -10px;
+}
+.chzn-container-multi .chzn-choices li.search-choice-disabled {
+  padding-right: 5px;
+  border: 1px solid #ccc;
+  background-color: #e4e4e4;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  color: #666;
+}
+.chzn-container-multi .chzn-choices li.search-choice-focus {
+  background: #d4d4d4;
+}
+.chzn-container-multi .chzn-choices li.search-choice-focus .search-choice-close {
+  background-position: -42px -10px;
+}
+.chzn-container-multi .chzn-results {
+  margin: 0;
+  padding: 0;
+}
+.chzn-container-multi .chzn-drop .result-selected {
+  display: list-item;
+  color: #ccc;
+  cursor: default;
+}
+
+/* @end */
+/* @group Active  */
+.chzn-container-active .chzn-single {
+  border: 1px solid #5897fb;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chzn-container-active.chzn-with-drop .chzn-single {
+  border: 1px solid #aaa;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+  border-bottom-left-radius: 0;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #eeeeee), color-stop(80%, #ffffff));
+  background-image: -webkit-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  background-image: -moz-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  background-image: -o-linear-gradient(#eeeeee 20%, #ffffff 80%);
+  background-image: linear-gradient(#eeeeee 20%, #ffffff 80%);
+  /* JUI remove next line */
+  /* box-shadow: 0 1px 0 #fff inset; */
+}
+.chzn-container-active.chzn-with-drop .chzn-single div {
+  border-left: none;
+  background: transparent;
+}
+.chzn-container-active.chzn-with-drop .chzn-single div b {
+  background-position: -18px 2px;
+}
+.chzn-container-active .chzn-choices {
+  border: 1px solid #5897fb;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chzn-container-active .chzn-choices li.search-field input[type="text"] {
+  color: #222 !important;
+}
+
+/* @end */
+/* @group Disabled Support */
+.chzn-disabled {
+  opacity: 0.5 !important;
+  cursor: default;
+}
+.chzn-disabled .chzn-single {
+  cursor: default;
+}
+.chzn-disabled .chzn-choices .search-choice .search-choice-close {
+  cursor: default;
+}
+
+/* @end */
+/* @group Right to Left */
+.chzn-rtl {
+  text-align: right;
+}
+.chzn-rtl .chzn-single {
+  overflow: visible;
+  padding: 0 8px 0 0;
+}
+.chzn-rtl .chzn-single span {
+  margin-right: 0;
+  margin-left: 26px;
+  direction: rtl;
+}
+.chzn-rtl .chzn-single-with-deselect span {
+  margin-left: 38px;
+}
+.chzn-rtl .chzn-single div {
+  right: auto;
+  left: 3px;
+}
+.chzn-rtl .chzn-single abbr {
+  right: auto;
+  left: 26px;
+}
+.chzn-rtl .chzn-choices li {
+  float: right;
+}
+.chzn-rtl .chzn-choices li.search-field input[type="text"] {
+  direction: rtl;
+}
+.chzn-rtl .chzn-choices li.search-choice {
+  margin: 3px 5px 3px 0;
+  padding: 3px 5px 3px 19px;
+}
+.chzn-rtl .chzn-choices li.search-choice .search-choice-close {
+  right: auto;
+  left: 4px;
+}
+.chzn-rtl.chzn-container-single-nosearch .chzn-search,
+.chzn-rtl .chzn-drop {
+  left: 9999px;
+}
+.chzn-rtl.chzn-container-single .chzn-results {
+  margin: 0 0 4px 4px;
+  padding: 0 4px 0 0;
+}
+.chzn-rtl .chzn-results li.group-option {
+  padding-right: 15px;
+  padding-left: 0;
+}
+.chzn-rtl.chzn-container-active.chzn-with-drop .chzn-single div {
+  border-right: none;
+}
+.chzn-rtl .chzn-search input[type="text"] {
+  padding: 4px 5px 4px 20px;
+  background: white url('chosen-sprite.png') no-repeat -30px -20px;
+  background: url('chosen-sprite.png') no-repeat -30px -20px;
+  direction: rtl;
+}
+.chzn-rtl.chzn-container-single .chzn-single div b {
+  background-position: 6px 2px;
+}
+.chzn-rtl.chzn-container-single.chzn-with-drop .chzn-single div b {
+  background-position: -12px 2px;
+}
+
+/* @end */
diff --git a/core/media/jui/css/icomoon.css b/core/media/jui/css/icomoon.css
new file mode 100644
index 00000000..f3efdb8a
--- /dev/null
+++ b/core/media/jui/css/icomoon.css
@@ -0,0 +1,742 @@
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../fonts/IcoMoon.eot');
+	src: url('../fonts/IcoMoon.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/IcoMoon.svg#IcoMoon') format('svg'),
+		url('../fonts/IcoMoon.woff') format('woff'),
+		url('../fonts/IcoMoon.ttf') format('truetype');
+	font-weight: normal;
+	font-style: normal;
+}
+
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	*margin-right: .3em;
+	line-height: 14px;
+}
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+[class^="icon-"].disabled,
+[class*=" icon-"].disabled {
+	font-weight: normal;
+}
+.icon-joomla:before {
+	content: "\e200";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-rightarrow:before,
+.icon-arrow-right:before{
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-leftarrow:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-4:before {
+	content: "\e201";
+}
+.icon-arrow-right-4:before {
+	content: "\e202";
+}
+.icon-arrow-down-4:before {
+	content: "\e203";
+}
+.icon-arrow-left-4:before {
+	content: "\e204";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-forward-2:before {
+	content: "\e205";
+}
+.icon-backward-2:before,
+.icon-reply:before {
+	content: "\e206";
+}
+.icon-unblock:before,
+.icon-refresh:before,
+.icon-redo-2:before {
+	content: "\6c";
+}
+.icon-undo-2:before {
+	content: "\e207";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-play:before {
+	content: "\e208";
+}
+.icon-pause:before {
+	content: "\e209";
+}
+.icon-stop:before {
+	content: "\e210";
+}
+.icon-previous:before,
+.icon-backward:before {
+	content: "\7c";
+}
+.icon-next:before,
+.icon-forward:before {
+	content: "\7b";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-play-circle:before {
+	content: "\e00d";
+}
+.icon-pause-circle:before {
+	content: "\e211";
+}
+.icon-stop-circle:before {
+	content: "\e212";
+}
+.icon-backward-circle:before {
+	content: "\e213";
+}
+.icon-forward-circle:before {
+	content: "\e214";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-save-new:before,
+.icon-plus-2:before  {
+	content: "\5d";
+}
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-plus-circle:before {
+	content: "\e215";
+}
+.icon-minus:before,
+.icon-not-ok:before {
+	content: "\4b";
+}
+.icon-ban-circle:before,
+.icon-minus-circle:before {
+	content: "\e216";
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+}
+.icon-cancel-circle:before {
+	content: "\e217";
+}
+.icon-checkmark-2:before {
+	content: "\e218";
+}
+.icon-checkmark-circle:before {
+	content: "\e219";
+}
+.icon-info:before {
+	content: "\e220";
+}
+.icon-info-2:before,
+.icon-info-circle:before {
+	content: "\e221";
+}
+.icon-question:before,
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-question-2:before,
+.icon-question-circle:before {
+	content: "\e222";
+}
+.icon-notification:before {
+	content: "\e223";
+}
+.icon-notification-2:before,
+.icon-notification-circle:before {
+	content: "\e224";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+}
+.icon-warning-2:before,
+.icon-warning-circle:before {
+	content: "\e225";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before,
+.icon-checkbox-checked:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-square:before {
+	content: "\e226";
+}
+.icon-radio-unchecked:before {
+	content: "\e227";
+}
+.icon-radio-checked:before {
+	content: "\e228";
+}
+.icon-circle:before {
+	content: "\e229";
+}
+.icon-signup:before {
+	content: "\e230";
+}
+.icon-grid:before,
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-2:before,
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-list-2:before {
+	content: "\e231";
+}
+.icon-menu-3:before {
+	content: "\e232";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-folder-plus:before {
+	content: "\e234";
+}
+.icon-folder-minus:before {
+	content: "\e235";
+}
+.icon-folder-3:before {
+	content: "\e236";
+}
+.icon-folder-plus-2:before {
+	content: "\e237";
+}
+.icon-folder-remove:before {
+	content: "\e238";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-2:before {
+	content: "\e239";
+}
+.icon-file-add:before,
+.icon-file-plus:before {
+	content: "\29";
+}
+.icon-file-minus:before {
+	content: "\e017";
+}
+.icon-file-check:before {
+	content: "\e240";
+}
+.icon-file-remove:before {
+	content: "\e241";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+}
+.icon-stack:before {
+	content: "\e242";
+}
+.icon-tree:before {
+	content: "\e243";
+}
+.icon-tree-2:before {
+	content: "\e244";
+}
+.icon-paragraph-left:before {
+	content: "\e246";
+}
+.icon-paragraph-center:before {
+	content: "\e247";
+}
+.icon-paragraph-right:before {
+	content: "\e248";
+}
+.icon-paragraph-justify:before {
+	content: "\e249";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-home:before {
+	content: "\21";
+}
+.icon-home-2:before {
+	content: "\e250";
+}
+.icon-out-2:before,
+.icon-new-tab:before {
+	content: "\e024";
+}
+.icon-out-3:before,
+.icon-new-tab-2:before {
+	content: "\e251";
+}
+.icon-link:before {
+	content: "\e252";
+}
+.icon-picture:before,
+.icon-image:before {
+	content: "\2f";
+}
+.icon-pictures:before,
+.icon-images:before {
+	content: "\30";
+}
+.icon-palette:before,
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-camera-2:before,
+.icon-video:before {
+	content: "\e015";
+}
+.icon-play-2:before,
+.icon-video-2:before,
+.icon-youtube:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-enter:before {
+	content: "\e257";
+}
+.icon-exit:before {
+	content: "\e258";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-quote:before,
+.icon-quotes-left:before {
+	content: "\60";
+}
+.icon-quote-2:before,
+.icon-quotes-right:before {
+	content: "\61";
+}
+.icon-quote-3:before,
+.icon-bubble-quote:before {
+	content: "\e259";
+}
+.icon-phone:before {
+	content: "\e260";
+}
+.icon-phone-2:before {
+	content: "\e261";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-envelope-opened:before,
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-tag:before {
+	content: "\e262";
+}
+.icon-tag-2:before {
+	content: "\e263";
+}
+.icon-tags:before {
+	content: "\e264";
+}
+.icon-tags-2:before {
+	content: "\e265";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-screwdriver:before,
+.icon-tools:before {
+	content: "\36";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-switch:before {
+	content: "\e266";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-unlock:before {
+	content: "\e267";
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-scissors:before {
+	content: "\e268";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-eye-close:before,
+.icon-eye-blocked:before,
+.icon-eye-2:before {
+	content: "\e269";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-broadcast:before,
+.icon-connection:before,
+.icon-wifi:before {
+	content: "\e01b";
+}
+.icon-book:before {
+	content: "\e271";
+}
+.icon-lightning:before,
+.icon-flash:before {
+	content: "\79";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-calendar-3:before {
+	content: "\e273";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-attachment:before,
+.icon-paperclip:before,
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-pin:before,
+.icon-pushpin:before {
+	content: "\73";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-shield:before {
+	content: "\e274";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-flag-3:before {
+	content: "\e275";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-bookmark-2:before {
+	content: "\e276";
+}
+.icon-heart:before {
+	content: "\e277";
+}
+.icon-heart-2:before {
+	content: "\e278";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before{
+	content: "\5c";
+}
+.icon-unfeatured:before,
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-star:before{
+	content: "\42";
+}
+.icon-smiley:before,
+.icon-smiley-happy:before {
+	content: "\e279";
+}
+.icon-smiley-2:before,
+.icon-smiley-happy-2:before {
+	content: "\e280";
+}
+.icon-smiley-sad:before {
+	content: "\e281";
+}
+.icon-smiley-sad-2:before {
+	content: "\e282";
+}
+.icon-smiley-neutral:before {
+	content: "\e283";
+}
+.icon-smiley-neutral-2:before {
+	content: "\e284";
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-credit:before {
+	content: "\e286";
+}
+.icon-credit-2:before {
+	content: "\e287";
+}
diff --git a/core/media/jui/css/jquery.minicolors.css b/core/media/jui/css/jquery.minicolors.css
new file mode 100644
index 00000000..93cbdef6
--- /dev/null
+++ b/core/media/jui/css/jquery.minicolors.css
@@ -0,0 +1,335 @@
+/**
+ * BASED ON:
+ *
+ * jQuery MiniColors: A tiny color picker built on jQuery
+ *
+ * Copyright Cory LaViska for A Beautiful Site, LLC. (http://www.abeautifulsite.net/)
+ *
+ * Dual-licensed under the MIT and GPL Version 2 licenses
+ *
+*/
+.minicolors {
+	position: relative;
+	display: inline-block;
+	z-index: 11;
+}
+
+.minicolors-focus {
+	z-index: 12;
+}
+
+.minicolors.minicolors-theme-default .minicolors-input {
+	margin: 0px;
+	margin-right: 3px;
+	border: solid 1px #CCC;
+	font: 14px sans-serif;
+	width: 65px;
+	height: 16px;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, .04);
+	-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, .04);
+	box-shadow: inset 0 2px 4px rgba(0, 0, 0, .04);
+	padding: 2px;
+	margin-right: -1px;
+}
+
+.minicolors-theme-default.minicolors .minicolors-input {
+	vertical-align: middle;
+	outline: none;
+}
+
+.minicolors-theme-default.minicolors-swatch-left .minicolors-input {
+	margin-left: -1px;
+	margin-right: auto;
+}
+
+.minicolors-theme-default.minicolors-focus .minicolors-input,
+.minicolors-theme-default.minicolors-focus .minicolors-swatch {
+	border-color: #999;
+}
+
+.minicolors-hidden {
+	position: absolute;
+	left: -9999em;
+}
+
+.minicolors-swatch {
+	position: relative;
+	width: 20px;
+	height: 20px;
+	background: url(../img/jquery.minicolors.png) -80px 0;
+	border: solid 1px #CCC;
+	vertical-align: middle;
+	display: inline-block;
+}
+
+.minicolors-swatch span {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	background: none;
+	-webkit-box-shadow: inset 0 9px 0 rgba(255, 255, 255, .1);
+	-moz-box-shadow: inset 0 9px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 9px 0 rgba(255, 255, 255, .1);
+	display: inline-block;
+}
+
+/* Panel */
+.minicolors-panel {
+	position: absolute;
+	top: 26px;
+	left: 0;
+	width: 173px;
+	height: 152px;
+	background: white;
+	border: solid 1px #CCC;
+	-webkit-box-shadow: 0 0 20px rgba(0, 0, 0, .2);
+	-moz-box-shadow: 0 0 20px rgba(0, 0, 0, .2);
+	box-shadow: 0 0 20px rgba(0, 0, 0, .2);
+	display: none;
+}
+
+.minicolors-position-top .minicolors-panel {
+	top: -156px;
+}
+
+.minicolors-position-left .minicolors-panel {
+	left: -83px;
+}
+
+.minicolors-position-left.minicolors-with-opacity .minicolors-panel {
+	left: -104px;
+}
+
+.minicolors-with-opacity .minicolors-panel {
+	width: 194px;
+}
+
+.minicolors .minicolors-grid {
+	position: absolute;
+	top: 1px;
+	left: 1px;
+	width: 150px;
+	height: 150px;
+	background: url(../img/jquery.minicolors.png) -120px 0;
+	cursor: crosshair;
+}
+
+.minicolors .minicolors-grid-inner {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 150px;
+	height: 150px;
+	background: none;
+}
+
+.minicolors-slider-saturation .minicolors-grid {
+	background-position: -420px 0;
+}
+
+.minicolors-slider-saturation .minicolors-grid-inner {
+	background: url(../img/jquery.minicolors.png) -270px 0;
+}
+
+.minicolors-slider-brightness .minicolors-grid {
+	background-position: -570px 0;
+}
+
+.minicolors-slider-brightness .minicolors-grid-inner {
+	background: black;
+}
+
+.minicolors-slider-wheel .minicolors-grid {
+	background-position: -720px 0;
+}
+
+.minicolors-slider,
+.minicolors-opacity-slider {
+	position: absolute;
+	top: 1px;
+	left: 152px;
+	width: 20px;
+	height: 150px;
+	background: #ffffff url(../img/jquery.minicolors.png) 0 0;
+	cursor: crosshair;
+}
+
+.minicolors-slider-saturation .minicolors-slider {
+	background-position: -60px 0;
+}
+
+.minicolors-slider-brightness .minicolors-slider {
+	background-position: -20px 0;
+}
+
+.minicolors-slider-wheel .minicolors-slider {
+	background-position: -20px 0;
+}
+
+.minicolors-opacity-slider {
+	left: 173px;
+	background-position: -40px 0;
+	display: none;
+}
+
+.minicolors-with-opacity .minicolors-opacity-slider {
+	display: block;
+}
+
+/* Pickers */
+.minicolors-grid .minicolors-picker {
+	position: absolute;
+	top: 70px;
+	left: 70px;
+	width: 10px;
+	height: 10px;
+	border: solid 1px black;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+	margin-top: -6px;
+	margin-left: -6px;
+	background: none;
+}
+
+.minicolors-grid .minicolors-picker span {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 6px;
+	height: 6px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	border: solid 2px white;
+}
+
+.minicolors-picker {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 18px;
+	height: 2px;
+	background: white;
+	border: solid 1px black;
+	margin-top: -2px;
+}
+
+/* Inline controls */
+.minicolors-inline .minicolors-input,
+.minicolors-inline .minicolors-swatch {
+	display: none;
+}
+
+.minicolors-inline .minicolors-panel {
+	position: relative;
+	top: auto;
+	left: auto;
+	display: inline-block;
+}
+
+/*
+ * Bootstrap Theme (theme: 'bootstrap')
+ *
+ */
+
+/* Input styles */
+.minicolors-theme-bootstrap .minicolors-input {
+	padding: 4px 6px;
+	padding-left: 30px;
+	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-size: 14px;
+	height: 19px;
+	width: 65px;
+	margin: 0px;
+}
+
+/* Input width depending on format */
+.minicolors-theme-bootstrap .hex {
+	width: 65px;
+}
+.minicolors-theme-bootstrap .keywords {
+	width: 100px;
+}
+.minicolors-theme-bootstrap .rgb {
+	width: 160px;
+}
+.minicolors-theme-bootstrap .rgba {
+	width: 220px;
+}
+
+/* When the input is disabled */
+.minicolors-theme-bootstrap .minicolors-input[disabled] {
+	background-color: #eee;
+}
+
+/* Swatch styles */
+.minicolors-theme-bootstrap .minicolors-swatch {
+	cursor: pointer;
+	position: absolute;
+	left: 4px;
+	top: 4px;
+	z-index: 12;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	overflow: hidden;
+}
+
+/* Handle swatch position (left = default / right) */
+.minicolors-theme-bootstrap.minicolors-swatch-position-right .minicolors-input {
+	padding-left: 6px;
+	padding-right: 30px;
+}
+
+.minicolors-theme-bootstrap.minicolors-swatch-position-right .minicolors-swatch {
+	left: auto;
+	right: 4px;
+}
+
+/* Panel styles */
+.minicolors-theme-bootstrap .minicolors-panel {
+	top: -68px;
+	left: 100%;
+	z-index: 13;
+	padding: 5px;
+	border: 1px solid #dddddd;
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+}
+
+.minicolors-theme-bootstrap .minicolors-slider,
+.minicolors-theme-bootstrap .minicolors-opacity-slider {
+	top: 6px;
+	margin-left: 5px;
+}
+
+.minicolors-theme-bootstrap .minicolors-grid {
+	top: 6px;
+	left: 6px;
+}
+
+.minicolors-theme-bootstrap.minicolors-position-left .minicolors-panel {
+	right: 100%;
+	left: auto;
+}
+.minicolors-theme-bootstrap.minicolors-position-top .minicolors-panel {
+	top: -164px;
+	left: -6px;
+}
+.minicolors-theme-bootstrap.minicolors-position-bottom .minicolors-panel {
+	left: -6px;
+	top: 30px;
+}
diff --git a/core/media/jui/css/jquery.searchtools.css b/core/media/jui/css/jquery.searchtools.css
new file mode 100644
index 00000000..0e67b402
--- /dev/null
+++ b/core/media/jui/css/jquery.searchtools.css
@@ -0,0 +1,93 @@
+.js-stools {
+	width: 100%;
+}
+.js-stools-container-filters {
+	display: none;
+	margin: 10px 0;
+}
+.js-stools-container-bar .input-append {
+	margin-bottom: 0;
+}
+/* Use up caret to hide the search filters */
+.js-stools-container-bar .btn-primary .caret {
+	border-top: 0;
+	border-bottom: 4px solid #FFF;
+	margin-top: 7px;
+	margin-bottom: 8px;
+}
+.js-stools .btn-wrapper {
+	display: inline-block;
+	margin: 0 5px 0 0;
+}
+/* Fixed filter fields (selector) */
+.js-stools .js-stools-container-selector {
+	float: left;
+	margin-right: 10px;
+	min-width: 220px;
+}
+html[dir=rtl] .js-stools .js-stools-container-selector {
+	float: right;
+	margin-left: 10px;
+	margin-right: 0;
+}
+.js-stools .js-stools-container-bar {
+	float: left;
+}
+html[dir=rtl] .js-stools .js-stools-container-bar {
+	float: right;
+}
+.js-stools .js-stools-container-list {
+	float: right;
+	text-align: right;
+}
+html[dir=rtl] .js-stools .js-stools-container-list {
+	float: left;
+	text-align: left;
+}
+.js-stools .chzn-container {
+	text-align: left;
+}
+html[dir=rtl] .js-stools .chzn-container {
+	text-align: right;
+}
+.js-stools .js-stools-container-filters select.active,
+.js-stools .js-stools-container-filters .chzn-container.active .chzn-single{
+	border: 2px solid #2384D3;
+}
+.js-stools .js-stools-container-filters-visible {
+	display: inline-block;
+}
+.js-stools .chzn-container-single .chzn-single span {
+	overflow: visible;
+}
+.js-stools .js-stools-field-list,
+.js-stools .js-stools-field-filter {
+	display: inline-block;
+	margin: 0 5px 5px 0;
+}
+.js-stools .js-stools-container-list .js-stools-field-list:last-child {
+	margin-right: 0;
+}
+
+/* Media queries */
+@media (max-width: 480px) {
+	.js-stools-container-filters {
+		display: block;
+	}
+	.js-stools-container-filters .btn-group {
+		display: block;
+	}
+	.js-stools-container-filters .btn-wrapper {
+		width: 100%
+	}
+	.js-stools-container-bar {
+		margin-top: 20px;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.js-stools .js-stools-container-bar,
+	.js-stools .js-stools-container-list {
+		float: none;
+		display: block;
+	}
+}
diff --git a/core/media/jui/css/jquery.simplecolors.css b/core/media/jui/css/jquery.simplecolors.css
new file mode 100644
index 00000000..dd4b2921
--- /dev/null
+++ b/core/media/jui/css/jquery.simplecolors.css
@@ -0,0 +1,80 @@
+/**
+ * LOOSELY BASED ON:
+ * Very simple jQuery Color Picker
+ * Copyright (C) 2012 Tanguy Krotoff
+ * Licensed under the MIT license
+ *
+ * ADAPTED BY:
+ * Copyright (C) 2013 Peter van Westen
+ */
+
+.simplecolors-swatch {
+	cursor: pointer;
+	position: relative;
+	width: 20px;
+	height: 20px;
+	background: url(../img/jquery.minicolors.png) -80px 0;
+	border: solid 1px #CCC;
+	vertical-align: middle;
+	display: inline-block;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	overflow: hidden;
+}
+
+.simplecolors-swatch span {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	background: none;
+	-webkit-box-shadow: inset 0 9px 0 rgba(255, 255, 255, .1);
+	-moz-box-shadow: inset 0 9px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 9px 0 rgba(255, 255, 255, .1);
+	display: inline-block;
+}
+
+.simplecolors-panel .simplecolors-swatch {
+	margin: 0 4px 4px 0;
+}
+
+.simplecolors-swatch.active,
+.simplecolors-swatch:hover,
+.simplecolors-swatch:focus,
+.simplecolors-swatch span:focus {
+	outline: 0;
+	outline: thin dotted \9; /* IE6-9 */
+}
+
+.simplecolors-swatch:hover,
+.simplecolors-swatch.active {
+	border-color: rgba(82, 168, 236, 0.8);
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+
+.simplecolors-panel {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 12;
+	display: none;
+	float: left;
+	padding: 6px 2px 2px 6px;
+	margin: 1px 0 0;
+	list-style: none;
+	background-color: #ffffff;
+	border: 1px solid #dddddd;
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+}
diff --git a/core/media/jui/css/sortablelist.css b/core/media/jui/css/sortablelist.css
new file mode 100644
index 00000000..6794a317
--- /dev/null
+++ b/core/media/jui/css/sortablelist.css
@@ -0,0 +1,78 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+.dnd-list-highlight {
+  position: relative;
+  margin-bottom: 18px;
+  color: #404040;
+  background-color: #eedc94;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+  background-image: linear-gradient(top, #fceec1, #eedc94);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #eedc94 #eedc94 #e4c652;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+
+.dndlist-place-holder {
+	height: 51px;
+	border-left: none;
+	border-right:none;
+}
+
+.dndlist-dragged-row {
+	background-color: #5bb75b !important;
+	*background-color: #51a351 !important;
+	background-image: -ms-linear-gradient(top, #62c462, #51a351) !important;
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)) !important;
+	background-image: -webkit-linear-gradient(top, #62c462, #51a351) !important;
+	background-image: -o-linear-gradient(top, #62c462, #51a351) !important;
+	background-image: -moz-linear-gradient(top, #62c462, #51a351) !important;
+	background-image: linear-gradient(top, #62c462, #51a351) !important;
+	background-repeat: repeat-x !important;
+	border-color: #51a351 #51a351 #387038 !important;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25) !important;
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0) !important;
+	filter: progid:dximagetransform.microsoft.gradient(enabled=false) !important;
+	height: 54px;
+	opacity: 0.7;
+	filter: alpha(opacity=70);
+}
+
+.dndlist-group-disabled {
+	opacity: 0.3;
+	filter: alpha(opacity=30);
+}
+
+.dndlist-group-disabled td {
+	background-image: url("../img/bg-overlay.png");
+}
+
+.sortable .sortable-handler {
+	cursor: auto;
+}
+
+.sortable .sortable-handler.sortable-inactive{
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+
+.middle, .table td.middle, .table th.middle {
+    vertical-align: middle;
+}
diff --git a/core/media/jui/fonts/IcoMoon.dev.commented.svg b/core/media/jui/fonts/IcoMoon.dev.commented.svg
new file mode 100644
index 00000000..85060ea0
--- /dev/null
+++ b/core/media/jui/fonts/IcoMoon.dev.commented.svg
@@ -0,0 +1,283 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+	IcoMoon icon set for Joomla 3.2
+	<iconset grid="16"></iconset>
+</metadata>
+<defs>
+<font id="IcoMoon" horiz-adv-x="512" >
+<font-face units-per-em="512" ascent="480" descent="-32" />
+	<missing-glyph horiz-adv-x="512" />
+	<glyph unicode="&#xf000;" class="hidden" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
+
+<!-- Joomla -->
+	<glyph unicode="&#xe200;" data-tags="joomla, cms" d="M 133.002,341.661c 16.416,16.422, 43.001,16.422, 59.402,0.016l 3.913-3.934l 50.552,50.578l-3.937,3.94 c-28.812,28.85-69.257,38.939-106.21,30.261C 131.425,455.113, 103.178,479.984, 69.135,480C 31.31,480, 0.658,449.279, 0.65,411.421 c0-32.668, 22.795-60, 53.331-66.915c-11.569-38.725-2.121-82.417, 28.423-112.992l 113.913-113.95l 50.498,50.607L 132.91,282.114 C 116.569,298.475, 116.539,325.177, 133.002,341.661zM 511.356,411.421C 511.364,449.302, 480.697,480, 442.864,480c-34.617,0-63.239-25.722-67.841-59.119 c-38.537,11.332-81.892,1.748-112.32-28.704l-113.92-113.95l 50.551-50.586l 113.883,113.928c 16.47,16.483, 42.994,16.453, 59.342,0.092 c 16.4-16.415, 16.4-43.057-0.016-59.478l-3.897-3.918l 50.505-50.624l 3.929,3.964c 30.229,30.283, 39.839,73.378, 28.806,111.819 C 485.461,347.841, 511.356,376.606, 511.356,411.421zM 453.133,104.468c 9.051,37.229-0.988,78.162-30.054,107.25L 309.334,325.714l-50.551-50.561l 113.76-114.006 c 16.47-16.498, 16.432-43.048, 0.092-59.424c-16.401-16.407-43.002-16.407-59.418,0.015l-3.883,3.895l-50.497-50.623l 3.866-3.864 c 30.758-30.797, 74.809-40.219, 113.684-28.244C 382.703-8.439, 410.354-32, 443.516-32C 481.318-32, 512-1.325, 512,36.563 C 512,71.163, 486.41,99.791, 453.133,104.468zM 306.172,215.658L 192.404,101.662c-16.355-16.384-43.017-16.414-59.472,0.062c-16.409,16.452-16.416,43.049-0.022,59.485 l 3.904,3.887l-50.543,50.562l-3.867-3.856c-29.38-29.401-39.28-70.917-29.725-108.491C 22.48,96.181,0,68.994,0,36.563 C-0.008-1.31, 30.666-32, 68.491-32c 32.55,0.016, 59.794,22.709, 66.77,53.191c 37.351-9.276, 78.499,0.652, 107.672,29.878 l 113.745,113.98L 306.172,215.658z" />
+
+<!-- Arrows -->
+	<glyph unicode="&#xe005;" data-tags="arrow-up, upload, top" d="M0,160L 96,64L 256,224L 416,64L 512,160L 256.001,416 z" />
+	<glyph unicode="&#xe006;" data-tags="arrow-right, right, next" d="M 192,480L 96,384L 256,224L 96,64L 192-32L 448,224 z" />
+	<glyph unicode="&#xe007;" data-tags="arrow-down, download, bottom" d="M 512,288L 416,384L 256,224L 96,384L0,288L 256,32.001 z" />
+	<glyph unicode="&#xe008;" data-tags="arrow-left, previous, left" d="M 320-32L 416,64L 256,224L 416,384L 320,480L 64,224 z" />
+	<glyph unicode="&#xe003;" data-tags="arrow-first, first, left" d="M 416,384L 320,480L 64,224L 320-32L 416,64L 256,224 zM0,480L0-32L 64-32L 64,224L 64,480 z" />
+	<glyph unicode="&#xe004;" data-tags="arrow-last, last, right" d="M 96,64L 192-32L 448,224L 192,480L 96,384L 256,224 zM 512-32L 512,480L 448,480L 448,224L 448-32 z" />
+	<glyph unicode="&#xe009;" data-tags="arrow-up, upload, top" d="M 512,224C 512,82.615, 397.385-32, 256-32s -256,114.615, -256,256s 114.615,256, 256,256S 512,365.385, 512,224z M 48,224 c 0-114.875 93.125-208 208-208S 464,109.125, 464,224s -93.125,208, -208,208S 48,338.875, 48,224zM 278.627,374.628l 128-128.001c 12.497-12.496 12.497-32.757 0-45.254c -12.497-12.497 -32.758-12.497,-45.255,0L 288,274.745 L 288,96 c 0-17.673 -14.327-32 -32-32c-17.673,0, -32,14.327, -32,32l0,178.745 l -73.372-73.373c -12.497-12.497 -32.759-12.497,-45.256,0 C 99.124,207.621, 96,215.811, 96,224s 3.124,16.379, 9.372,22.627l 128,128.001C 245.869,387.124, 266.131,387.124, 278.627,374.628z" />
+	<glyph unicode="&#xe00a;" data-tags="arrow-right, right, next" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 406.628,246.627l-128.001,128c-12.496,12.497-32.757,12.497-45.254,0c-12.497-12.497-12.497-32.758,0-45.255L 306.745,256 L 128,256 c-17.673,0-32-14.327-32-32c0-17.673, 14.327-32, 32-32l 178.745,0 l-73.373-73.372c-12.497-12.497-12.497-32.759,0-45.256 C 239.621,67.124, 247.811,64, 256,64s 16.379,3.124, 22.627,9.372l 128.001,128C 419.124,213.869, 419.124,234.131, 406.628,246.627z" />
+	<glyph unicode="&#xe00b;" data-tags="arrow-down, download, bottom" d="M 512,224C 512,365.385, 397.385,480, 256,480s -256-114.615, -256-256s 114.615-256, 256-256S 512,82.615, 512,224z M 48,224 c 0,114.875 93.125,208 208,208S 464,338.875, 464,224s -93.125-208, -208-208S 48,109.125, 48,224zM 278.627,73.372l 128,128.001c 12.497,12.496 12.497,32.757 0,45.254c -12.497,12.497 -32.758,12.497,-45.255,0L 288,173.255 L 288,352 c 0,17.673 -14.327,32 -32,32c-17.673,0, -32-14.327, -32-32l0-178.745 l -73.372,73.373c -12.497,12.497 -32.759,12.497,-45.256,0 C 99.124,240.379, 96,232.189, 96,224s 3.124-16.379, 9.372-22.627l 128-128.001C 245.869,60.876, 266.131,60.876, 278.627,73.372z" />
+	<glyph unicode="&#xe00c;" data-tags="arrow-left, left, previous" d="M 256,480C 397.385,480, 512,365.385, 512,224s -114.615-256, -256-256s -256,114.615, -256,256S 114.615,480, 256,480z M 256,16 c 114.875,0 208,93.125 208,208S 370.875,432, 256,432s -208-93.125, -208-208S 141.125,16, 256,16zM 105.372,246.627l 128.001,128c 12.496,12.497 32.757,12.497 45.254,0c 12.497-12.497 12.497-32.758,0-45.255L 205.255,256 L 384,256 c 17.673,0 32-14.327 32-32c0-17.673, -14.327-32, -32-32l-178.745,0 l 73.373-73.372c 12.497-12.497 12.497-32.759,0-45.256 C 272.379,67.124, 264.189,64, 256,64s -16.379,3.124, -22.627,9.372l -128.001,128C 92.876,213.869, 92.876,234.131, 105.372,246.627z" />
+	<glyph unicode="&#xe00f;" data-tags="arrow-up, upload, top" d="M 384,160L 256,288L 128,160 z" />
+	<glyph unicode="&#xe010;" data-tags="arrow-right, right, next" d="M 192.001,96L 320.001,224L 192.001,352 z" />
+	<glyph unicode="&#xe011;" data-tags="arrow-down, download, bottom" d="M 128,288L 256,160L 384,288 z" />
+	<glyph unicode="&#xe012;" data-tags="arrow-left, left, previous" d="M 320.001,352L 192.001,224L 320.001,95.999 z" />
+	<glyph unicode="&#xe00e;" data-tags="menu, arrow, options, select" d="M 384,256L 256,384L 128,256 zM 128,160L 256,32L 384,160 z" />
+	<glyph unicode="&#xe201;" data-tags="arrow-up, upload, top" d="M 160,0L 352,0L 352-32L 160-32zM 160,64L 352,64L 352,32L 160,32zM 160,128L 352,128L 352,96L 160,96zM 256,480L 480,256L 352,256L 352,160L 160,160L 160,256L 32,256 z" />
+	<glyph unicode="&#xe202;" data-tags="arrow-right, right, next" d="M0,320L 32,320L 32,128L0,128zM 64,320L 96,320L 96,128L 64,128zM 128,320L 160,320L 160,128L 128,128zM 512,224L 288,448L 288,320L 192,320L 192,128L 288,128L 288,0 z" />
+	<glyph unicode="&#xe203;" data-tags="arrow-down, download, bottom" d="M 160,480L 352,480L 352,448L 160,448zM 160,416L 352,416L 352,384L 160,384zM 160,352L 352,352L 352,320L 160,320zM 256-32L 480,192L 352,192L 352,288L 160,288L 160,192L 32,192 z" />
+	<glyph unicode="&#xe204;" data-tags="arrow-left, left, previous" d="M 480,320L 512,320L 512,128L 480,128zM 416,320L 448,320L 448,128L 416,128zM 352,320L 384,320L 384,128L 352,128zM0,224L 224,448L 224,320L 320,320L 320,128L 224,128L 224,0 z" />
+	<glyph unicode="&#x27;" data-tags="redo, arrow, right" d="M 288,355.814L 288,480 l 192-192L 288,96L 288,222.912 C 64.625,228.153, 74.206,71.016, 131.070-32 C-9.286,119.707, 20.52,362.785, 288,355.814z" />
+	<glyph unicode="&#x28;" data-tags="undo, arrow, left" d="M 380.931-32C 437.794,71.016, 447.375,228.153, 224,222.912L 224,96 L 32,288L 224,480l0-124.186 C 491.481,362.785, 521.285,119.707, 380.931-32z" />
+	<glyph unicode="&#xe205;" data-tags="forward, arrow, right" d="M 131.070,480C 74.206,376.984, 64.625,219.848, 288,225.088L 288,352 l 192-192L 288-32L 288,92.186 C 20.52,85.215-9.286,328.293, 131.070,480z" />
+	<glyph unicode="&#xe206;" data-tags="reply, arrow, left" d="M 224,92.186L 224-32 L 32,160l 192,192l0-126.912 C 447.375,219.848, 437.794,376.984, 380.931,480 C 521.286,328.293, 491.481,85.215, 224,92.186z" /> 
+	<glyph unicode="&#x6c;" data-tags="redo, arrow, right" d="M0,192c0-76.462, 33.524-145.092, 86.675-192l 42.333,48C 89.145,83.182, 64,134.652, 64,192c0,106.038, 85.965,192, 192,192 c 53.021,0, 101.019-21.493, 135.765-56.239L 320,256l 192,0 L 512,448 l-74.985-74.989C 390.688,419.34, 326.693,448, 256,448 C 114.615,448,0,333.385,0,192z" />
+	<glyph unicode="&#xe207;" data-tags="undo, arrow, left" d="M 256,448c-70.692,0-134.688-28.66-181.016-74.989L0,448l0-192 l 192,0 l-71.766,71.761C 154.982,362.507, 202.98,384, 256,384 c 106.034,0, 192-85.962, 192-192c0-57.348-25.146-108.818-65.009-144l 42.333-48C 478.475,46.908, 512,115.538, 512,192 C 512,333.385, 397.385,448, 256,448z" />
+	<glyph unicode="&#x7a;" data-tags="move, drag, arrows" d="M 512,224L 384,320L 384,256L 288,256L 288,352L 352,352L 256,480L 160,352L 224,352L 224,256L 128,256L 128,320L0,224L 128,128L 128,192L 224,192L 224,96L 160,96L 256-32L 352,96L 288,96L 288,192L 384,192L 384,128 z" />
+	<glyph unicode="&#x66;" data-tags="expand, enlarge, maximize, fullscreen" d="M 512,480 L 512,272 L 432,352 L 336,256 L 288,304 L 384,400 L 304,480 ZM 224,144 L 128,48 L 208-32 L 0-32 L 0,176 L 80,96 L 176,192 Z" />
+	<glyph unicode="&#x67;" data-tags="contract, minimize, shrink, collapse" d="M 224,192 L 224-16 L 144,64 L 48-32 L 0,16 L 96,112 L 16,192 ZM 512,432 L 416,336 L 496,256 L 288,256 L 288,464 L 368,384 L 464,480 Z" /> 
+	<glyph unicode="&#x68;" data-tags="expand, enlarge, maximize, fullscreen" d="M 512,480 L 512,288 L 442.87,357.13 L 336.87,251.13 L 283.13,304.87 L 389.13,410.87 L 320,480 ZM 122.87,410.87 L 228.87,304.87 L 175.13,251.13 L 69.13,357.13 L 0,288 L 0,480 L 192,480 ZM 442.87,90.87 L 512,160 L 512-32 L 320-32 L 389.13,37.13 L 283.13,143.13 L 336.87,196.87 ZM 228.87,143.13 L 122.87,37.13 L 192-32 L 0-32 L 0,160 L 69.13,90.87 L 175.13,196.87 Z" />
+	<glyph unicode="&#x69;" data-tags="contract, minimize, shrink, collapse" d="M 32,192 L 224,192 L 224,0 L 154.87,69.13 L 53.87-31.87 L 0.13,21.87 L 101.13,122.87 ZM 410.87,122.87 L 511.87,21.87 L 458.13-31.87 L 357.13,69.13 L 288,0 L 288,192 L 480,192 ZM 480,256 L 288,256 L 288,448 L 357.13,378.87 L 458.13,479.87 L 511.87,426.13 L 410.87,325.13 ZM 154.87,378.87 L 224,448 L 224,256 L 32,256 L 101.13,325.13 L 0.13,426.13 L 53.87,479.87 Z" />
+	<glyph unicode="&#xe208;" data-tags="play, media control, audio" d="M 96,416L 416,224L 96,32 z" />
+	<glyph unicode="&#xe209;" data-tags="pause, media control, audio" d="M 64,416L 224,416L 224,32L 64,32zM 288,416L 448,416L 448,32L 288,32z" />
+	<glyph unicode="&#xe210;" data-tags="stop, media control, audio, square" d="M 64,416L 448,416L 448,32L 64,32z" />
+	<glyph unicode="&#x7c;" data-tags="backward, media control, audio" d="M 288,400 L 288,240 L 448,400 L 448,48 L 288,208 L 288,48 L 112,224 Z" />
+	<glyph unicode="&#x7b;" data-tags="forward, media control, audio" d="M 256,48 L 256,208 L 96,48 L 96,400 L 256,240 L 256,400 L 432,224 Z" />
+	<glyph unicode="&#x7d;" data-tags="first, media control, audio" d="M 64,32 L 64,416 L 128,416 L 128,240 L 288,400 L 288,240 L 448,400 L 448,48 L 288,208 L 288,48 L 128,208 L 128,32 Z" />
+	<glyph unicode="&#xe000;" data-tags="last, media control, audio" d="M 448,416 L 448,32 L 384,32 L 384,208 L 224,48 L 224,208 L 64,48 L 64,400 L 224,240 L 224,400 L 384,240 L 384,416 Z" />
+	<glyph unicode="&#xe00d;" data-tags="play, media control, audio" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 192,336L 384,224L 192,112 z" />
+	<glyph unicode="&#xe211;" data-tags="pause, media control, audio" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,320L 224,320L 224,128L 160,128zM 288,320L 352,320L 352,128L 288,128z" />
+	<glyph unicode="&#xe212;" data-tags="stop, media control, audio" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,320L 352,320L 352,128L 160,128z" />
+	<glyph unicode="&#xe213;" data-tags="backward, media control, audio" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 352,144L 240,224L 352,304 zM 224,144L 112,224L 224,304 z" />
+	<glyph unicode="&#xe214;" data-tags="forward, media control, audio" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,304L 272,224L 160,144 zM 288,304L 400,224L 288,144 z" />
+	<glyph unicode="&#xe001;" data-tags="loop, repeat, reload, refresh, update, upgrade, synchronize, media control, arrows" d="M 437.011,405.010C 390.685,451.338, 326.693,480, 256,480C 146.256,480, 52.655,410.936, 16.251,313.906l 59.938-22.477 C 103.491,364.202, 173.692,416, 256,416c 53.020,0, 101.010-21.5, 135.753-56.247L 320,288l 192,0 L 512,480 L 437.011,405.010zM 256,32c-53.020,0-101.013,21.496-135.756,56.244L 192,160L0,160 l0-192 l 74.997,74.997C 121.32-3.334, 185.306-32, 256-32 c 109.745,0, 203.346,69.064, 239.75,166.094l-59.938,22.477C 408.51,83.798, 338.309,32, 256,32z" />
+	<glyph unicode="&#xe002;" data-tags="shuffle, media control, random" d="M 512,352L 384,480l0-96 c-65.386,0-115.376-15.604-152.825-47.704c-2.625-2.25-5.142-4.55-7.581-6.887 c 13.76-19.082, 24.358-38.758, 33.886-57.545C 281.641,301.065, 316.507,320, 384,320l0-96 l0,0 l0-96 c-108.223,0-132.563,48.68-163.378,110.311 c-17.153,34.306-34.89,69.78-67.796,97.985C 115.376,368.396, 65.386,384,0,384l0-64 c 108.223,0, 132.563-48.68, 163.378-110.311 c 17.153-34.306, 34.89-69.78, 67.796-97.985C 268.624,79.604, 318.615,64, 384,64l0-96 l 128,128L 384,224L 512,352zM0,128l0-64 c 65.386,0, 115.375,15.604, 152.825,47.704c 2.625,2.249, 5.142,4.55, 7.581,6.888 c-13.76,19.081-24.359,38.758-33.886,57.545C 102.36,146.936, 67.494,128,0,128z" />
+
+<!-- Search -->
+	<glyph unicode="&#x53;" data-tags="search, magnifier, lookup, find" d="M 496.131,44.302L 374.855,147.449c-12.537,11.283-25.945,16.463-36.776,15.963C 366.707,196.946, 384,240.451, 384,288 C 384,394.039, 298.039,480, 192,480C 85.962,480,0,394.039,0,288c0-106.039, 85.961-192, 192-192c 47.549,0, 91.054,17.293, 124.588,45.922 c-0.5-10.831, 4.68-24.239, 15.963-36.776l 103.147-121.276c 17.661-19.623, 46.511-21.277, 64.11-3.678S 515.754,26.641, 496.131,44.302z M 192,160c-70.692,0-128,57.308-128,128S 121.308,416, 192,416s 128-57.308, 128-128S 262.693,160, 192,160z" /> 
+	<glyph unicode="&#x64;" data-tags="zoom in, enlarge, scale" d="M 192,384L 160,384L 160,320L 96,320L 96,288L 160,288L 160,224L 192,224L 192,288L 256,288L 256,320L 192,320 zM 318.771,201.076C 339.674,230.021, 352,265.568, 352,304C 352,401.202, 273.202,480, 176,480S0,401.202,0,304s 78.798-176, 176-176 c 38.432,0, 73.979,12.326, 102.924,33.229L 448-32l 64,64L 318.771,201.076z M 176,176c-70.692,0-128,57.308-128,128S 105.308,432, 176,432 s 128-57.308, 128-128S 246.693,176, 176,176z" />
+	<glyph unicode="&#x65;" data-tags="zoom out, smaller, scale, reduce" d="M 96,320L 256,320L 256,288L 96,288zM 318.771,201.076C 339.674,230.021, 352,265.568, 352,304C 352,401.202, 273.202,480, 176,480S0,401.202,0,304s 78.798-176, 176-176 c 38.432,0, 73.979,12.326, 102.924,33.229L 448-32l 64,64L 318.771,201.076z M 176,176c-70.692,0-128,57.308-128,128S 105.308,432, 176,432 s 128-57.308, 128-128S 246.693,176, 176,176z" />  
+
+<!-- Edit -->
+	<glyph unicode="&#x2b;" data-tags="pencil, write, edit, blog, note" d="M 424,312 L 208,96 L 128,96 L 128,176 L 344,392 ZM 451,339 L 371,419 L 399.029,447.029 C 408.363,456.363 423.636,456.363 432.97,447.029 L 479.029,400.97 C 488.363,391.636 488.363,376.363 479.029,367.029 L 451,339 ZM 384,198.209L 384,32 L 64,32 L 64,352 l 176,0 l 64,64L 48,416 C 21.6,416,0,394.4,0,368l0-352 c0-26.4, 21.6-48, 48-48l 352,0 c 26.4,0, 48,21.6, 48,48L 448,255.681 L 384,198.209z" />
+	<glyph unicode="&#x2c;" data-tags="pencil, write, edit, blog, note" d="M 432,480 C 476.182,480 512,444.183 512,400 C 512,381.99 506.045,365.371 496,352 L 464,320 L 352,432 L 384,464 C 397.371,474.045 413.989,480 432,480 ZM 32,112L0-32l 144,32l 296,296L 328,408L 32,112z M 357.789,298.211l-224-224l-27.578,27.578l 224,224L 357.789,298.211z" />
+	<glyph unicode="&#x3b;" data-tags="brush, art, paint" d="M 160.061,160C 96.036,160, 117.88,46.86,0,21.363c 32.011-21.324, 125.898-39.027, 192.072,10.668 C 249.298,75.006, 224.085,160, 160.061,160zM 505.965,441.965c-32.009,32.007-110.472-72.027-171.617-107.603c-60.98-37.464-144.033-112.027-96.021-160.037 c 48.010-48.013, 122.571,35.040, 160.036,96.022C 433.938,331.495, 537.973,409.958, 505.965,441.965z" /> 
+
+<!-- Actions -->
+	<glyph unicode="&#x5d;" data-tags="plus, add, sum" d="M 496,288L 320,288 L 320,464 c0,8.836-7.164,16-16,16l-96,0 c-8.836,0-16-7.164-16-16l0-176 L 16,288 c-8.836,0-16-7.164-16-16l0-96 c0-8.836, 7.164-16, 16-16l 176,0 l0-176 c0-8.836, 7.164-16, 16-16l 96,0 c 8.836,0, 16,7.164, 16,16L 320,160 l 176,0 c 8.836,0, 16,7.164, 16,16l0,96 C 512,280.836, 504.836,288, 496,288z" /> 
+	<glyph unicode="&#x5e;" data-tags="minus, minimize, subtract" d="M0,272l0-96 c0-8.836, 7.164-16, 16-16l 480,0 c 8.836,0, 16,7.164, 16,16l0,96 c0,8.836-7.164,16-16,16L 16,288 C 7.164,288,0,280.836,0,272z" />
+	<glyph unicode="&#x49;" data-tags="close, cancel, quit, remove, cross" d="M 507.331,68.67c-0.002,0.002-0.004,0.004-0.006,0.005L 352.003,224l 155.322,155.325c 0.002,0.002, 0.004,0.003, 0.006,0.005 c 1.672,1.673, 2.881,3.627, 3.656,5.708c 2.123,5.688, 0.912,12.341-3.662,16.915L 433.952,475.326c-4.574,4.573-11.225,5.783-16.914,3.66 c-2.080-0.775-4.035-1.984-5.709-3.655c0-0.002-0.002-0.003-0.004-0.005L 256.001,320L 100.677,475.325 c-0.002,0.002-0.003,0.003-0.005,0.005c-1.673,1.671-3.627,2.88-5.707,3.655c-5.69,2.124-12.341,0.913-16.915-3.66L 4.676,401.951 c-4.574-4.574-5.784-11.226-3.661-16.914c 0.776-2.080, 1.985-4.036, 3.656-5.708c 0.002-0.001, 0.003-0.003, 0.005-0.005L 160.001,224 L 4.676,68.674c-0.001-0.002-0.003-0.003-0.004-0.005c-1.671-1.673-2.88-3.627-3.657-5.707c-2.124-5.688-0.913-12.341, 3.661-16.915 l 73.374-73.373c 4.575-4.574, 11.226-5.784, 16.915-3.661c 2.080,0.776, 4.035,1.985, 5.708,3.656c 0.001,0.002, 0.003,0.003, 0.005,0.005 l 155.324,155.325l 155.324-155.325c 0.002-0.001, 0.004-0.003, 0.006-0.004c 1.674-1.672, 3.627-2.881, 5.707-3.657 c 5.689-2.123, 12.342-0.913, 16.914,3.661l 73.373,73.374c 4.574,4.574, 5.785,11.227, 3.662,16.915 C 510.212,65.043, 509.003,66.997, 507.331,68.67z" />
+	<glyph unicode="&#x47;" data-tags="checkmark, tick, correct, accept, ok" d="M 432,416L 192,176L 80,288L0,208L 192,16L 512,336 z" />
+	<glyph unicode="&#x2a;" data-tags="plus-circle, plus, add, sum" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 288,192l0-128 l-64,0 L 224,192 L 96,192 l0,64 l 128,0 L 224,384 l 64,0 l0-128 l 128,0 l0-64 L 288,192 z" />
+	<glyph unicode="&#xe215;" data-tags="plus-circle, plus, add, sum" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 384,192 L 288,192 L 288,96 L 224,96 L 224,192 L 128,192 L 128,256 L 224,256 L 224,352 L 288,352 L 288,256 L 384,256 Z" />
+	<glyph unicode="&#x4b;" data-tags="minus-circle, minus, remove, delete, subtract" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 416,192L 96,192 l0,64 l 320,0 L 416,192 z" />
+	<glyph unicode="&#xe216;" data-tags="minus-circle, minus, remove, delete, subtract" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 128,256L 384,256L 384,192L 128,192z" />
+	<glyph unicode="&#x4a;" data-tags="cancel-circle, close, remove, delete" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 384,306.745L 301.256,224 L 384,141.256L 384,96 l-45.256,0 L 256,178.744L 173.255,96L 128,96 l0,45.256 L 210.745,224L 128,306.745L 128,352 l 45.255,0 L 256,269.255L 338.744,352L 384,352 L 384,306.745 z" />
+	<glyph unicode="&#xe217;" data-tags="cancel-circle, close, remove, delete" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 352,173.256 L 352,128 L 306.744,128 L 256,178.744 L 205.255,128 L 160,128 L 160,173.256 L 210.745,224 L 160,274.745 L 160,320 L 205.255,320 L 256,269.255 L 306.744,320 L 352,320 L 352,274.745 L 301.256,224 Z" />
+	<glyph unicode="&#xe218;" data-tags="checkmark-circle, tick, correct" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 208,64L 102,202l 47,49l 59-75 l 185,151l 23-23L 208,64z" />
+	<glyph unicode="&#xe219;" data-tags="checkmark-circle, tick, correct" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 208,64L 102,202L 149,251L 208,176L 393,327L 416,304 z" />
+	<glyph unicode="&#xe220;" data-tags="info, information" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 224,384l 64,0 l0-64 l-64,0 L 224,384 z M 320,64L 192,64 l0,32 l 32,0 L 224,224 l-32,0 l0,32 l 96,0 l0-160 l 32,0 L 320,64 z" />
+	<glyph unicode="&#xe221;" data-tags="info, information" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 224,352L 288,352L 288,288L 224,288zM 320,96L 192,96L 192,128L 224,128L 224,224L 192,224L 192,256L 288,256L 288,128L 320,128 z" />
+	<glyph unicode="&#x45;" data-tags="question, help, support" d="M 256,480C 114.615,480,0,365.385,0,224s 114.613-256, 256-256c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480z M 288,64l-64,0 l0,64 l 64,0 L 288,64 z M 384,256c0-35.29-28.71-64-64-64l-31.942,0 c-0.020-0.017-0.041-0.038-0.058-0.058L 288,160 l-64,0 l0,32 c0,35.29, 28.71,64, 64,64l 31.942,0 c 0.020,0.017, 0.041,0.038, 0.058,0.057l0,63.885 c-0.017,0.020-0.037,0.041-0.058,0.058L 160,320 L 160,384 l 160,0 c 35.29,0, 64-28.71, 64-64L 384,256 z" />
+	<glyph unicode="&#xe222;" data-tags="question, help, support" d="M 320,384 C 355.29,384 384,355.29 384,320 L 384,256 C 384,220.71 355.29,192 320,192 L 288.059,192 C 288.038,191.982 288.018,191.962 288,191.941 L 288,160 L 224,160 L 224,192 C 224,227.29 252.71,256 288,256 L 319.942,256 C 319.962,256.016 319.983,256.037 320,256.057 L 320,319.942 C 319.983,319.962 319.963,319.983 319.942,320 L 160,320 L 160,384 L 320,384 ZM 224,128L 288,128L 288,64L 224,64zM 256,432 C 200.441,432 148.208,410.364 108.922,371.078 C 69.636,331.792 48,279.559 48,224 C 48,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16 256,16 C 311.559,16 363.792,37.636 403.078,76.922 C 442.364,116.208 464,168.441 464,224 C 464,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432 256,432 Z M 256,480 L 256,480 C 397.385,480 512,365.385 512,224 C 512,82.615 397.385-32 256-32 C 114.615-32 0,82.615 0,224 C 0,365.385 114.615,480 256,480 Z" />
+	<glyph unicode="&#xe223;" data-tags="notification, warning, notice, note, exclamation" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 288,64l-64,0 l0,64 l 64,0 L 288,64 z M 288,192l-64,0 L 224,384 l 64,0 L 288,192 z" />
+	<glyph unicode="&#xe224;" data-tags="notification, warning, notice, note, exclamation" d="M 256,432 C 200.441,432 148.208,410.364 108.922,371.078 C 69.636,331.792 48,279.559 48,224 C 48,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16 256,16 C 311.559,16 363.792,37.636 403.078,76.922 C 442.364,116.208 464,168.441 464,224 C 464,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432 256,432 Z M 256,480 L 256,480 C 397.385,480 512,365.385 512,224 C 512,82.615 397.385-32 256-32 C 114.615-32 0,82.615 0,224 C 0,365.385 114.615,480 256,480 ZM 224,128L 288,128L 288,64L 224,64zM 224,384L 288,384L 288,192L 224,192z" />
+	<glyph unicode="&#x48;" data-tags="warning, sign" d="M 504.978,22.12L 286.441,457.676C 278.070,472.559, 267.035,480, 256,480s-22.070-7.441-30.442-22.324L 7.021,22.12 C-9.722-7.646, 4.521-32, 38.673-32l 434.654,0 C 507.478-32, 521.723-7.646, 504.978,22.12z M 256,32c-17.673,0-32,14.327-32,32 c0,17.674, 14.327,32, 32,32c 17.674,0, 32-14.326, 32-32C 288,46.327, 273.674,32, 256,32z M 278,128l-44,0 l-10,128 c0,17.673, 14.327,32, 32,32s 32-14.327, 32-32L 278,128z" />
+	<glyph unicode="&#xe225;" data-tags="warning, sign" d="M 256,400.638 L 83.583,32 L 428.417,32 L 256,400.638 Z M 256,480 L 256,480 C 267.035,480 278.070,472.559 286.442,457.676 L 504.978,22.12 C 521.723-7.646 507.478-32 473.327-32 L 38.673-32 C 4.521-32 -9.722-7.646 7.021,22.12 L 225.558,457.676 C 233.93,472.559 244.965,480 256,480 ZM 224,96A32,32 2700 1 0 288,96A32,32 2700 1 0 224,96zM 256,288 C 273.673,288 288,273.673 288,256 L 278,160 L 234,160 L 224,256 C 224,273.673 238.327,288 256,288 Z" />
+
+<!-- Checkboxes -->
+	<glyph unicode="&#x3d;" data-tags="checkbox-unchecked, unchecked, square" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 z" />
+	<glyph unicode="&#x3e;" data-tags="checkbox-checked, tick, checked, selected" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 z M 384,368L 224,208l-96,96l-64-64l 160-160l 224,224L 384,368z" />
+	<glyph unicode="&#x3f;" data-tags="checkbox-partial, partial" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 zM 128,352L 384,352L 384,96L 128,96z" />
+	<glyph unicode="&#xe226;" data-tags="square" d="M0,480L 512,480L 512-32L0-32z" />
+	<glyph unicode="&#xe227;" data-tags="radio-unchecked, circle" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32z" />
+	<glyph unicode="&#xe228;" data-tags="radio-checked" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 160,224A96,96 12780 1 0 352,224A96,96 12780 1 0 160,224z" />
+	<glyph unicode="&#xe229;" data-tags="circle" d="M0,224A256,256 4860 1 0 512,224A256,256 4860 1 0 0,224z" />
+	<glyph unicode="&#xe230;" data-tags="signup, checkmark, board, agreement, register" d="M 224,82.745L 121.373,201.372L 150.627,230.627L 224,173.255L 361.372,294.627L 390.628,265.373 zM 415.886,416c 0.039-0.033, 0.081-0.075, 0.114-0.115l0-383.771 c-0.033-0.039-0.075-0.081-0.114-0.114L 96.114,32 c-0.040,0.033-0.081,0.075-0.114,0.114L 96,415.886 c 0.033,0.040, 0.075,0.081, 0.115,0.114L 32,416 l0-384 c0-35.2, 28.8-64, 64-64l 320,0 c 35.2,0, 64,28.8, 64,64L 480,416 L 415.886,416 z M 320,416L 320,448 c0,17.673-14.327,32-32,32l-64,0 c-17.673,0-32-14.327-32-32l0-32 l-64,0 l0-64 l 256,0 L 384,416 L 320,416 z M 288,416l-64,0 L 224,448 l 64,0 L 288,416 z" />
+
+<!-- Grid -->
+	<glyph unicode="&#x58;" data-tags="grid, icons, apps, squares" d="M0,480L 224,480L 224,256L0,256zM 288,480L 512,480L 512,256L 288,256zM0,192L 224,192L 224-32L0-32zM 288,192L 512,192L 512-32L 288-32z" />
+	<glyph unicode="&#x59;" data-tags="grid, icons, apps" d="M0,480L 128,480L 128,352L0,352zM 192,480L 320,480L 320,352L 192,352zM 384,480L 512,480L 512,352L 384,352zM0,288L 128,288L 128,160L0,160zM 192,288L 320,288L 320,160L 192,160zM 384,288L 512,288L 512,160L 384,160zM0,96L 128,96L 128-32L0-32zM 192,96L 320,96L 320-32L 192-32zM 384,96L 512,96L 512-32L 384-32z" />
+	<glyph unicode="&#x5a;" data-tags="menu, dots, more" d="M 192,448L 320,448L 320,320L 192,320zM 192,288L 320,288L 320,160L 192,160zM 192,128L 320,128L 320,0L 192,0z" />
+	<glyph unicode="&#x31;" data-tags="list, bullet, ul, menu" d="M0,480L 128,480L 128,352L0,352zM 192,480L 512,480L 512,352L 192,352zM0,288L 128,288L 128,160L0,160zM 192,288L 512,288L 512,160L 192,160zM0,96L 128,96L 128-32L0-32zM 192,96L 512,96L 512-32L 192-32z" />
+	<glyph unicode="&#xe231;" data-tags="list, bullet, ul, todo, menu" d="M0,480L 128,480L 128,352L0,352zM 192,448L 512,448L 512,384L 192,384zM0,288L 128,288L 128,160L0,160zM 192,256L 512,256L 512,192L 192,192zM0,96L 128,96L 128-32L0-32zM 192,64L 512,64L 512,0L 192,0z" />
+	<glyph unicode="&#xe232;" data-tags="menu, list, items, lines, options" d="M 448,96L 64,96 c-35.2,0-64-28.8-64-64s 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,96, 448,96zM 448,288L 64,288 c-35.2,0-64-28.8-64-64s 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,288, 448,288zM 64,352l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,480, 448,480L 64,480 C 28.8,480,0,451.2,0,416S 28.8,352, 64,352z" />
+
+<!-- Folders -->
+	<glyph unicode="&#x2d;" data-tags="folder-open, directory, category, browse" d="M 416,0L 512,256L 96,256L0,0 zM 64,288 L 0,0 L 0,416 L 144,416 L 208,352 L 416,352 L 416,288 Z" /> 
+	<glyph unicode="&#x2e;" data-tags="folder, directory, category, browse" d="M 224,416L 288,352L 512,352L 512,0L0,0L0,416 z" />
+	<glyph unicode="&#xe234;" data-tags="folder-plus, plus, add, directory, category, browse" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 352,128l-64,0 l0-64 l-64,0 l0,64 l-64,0 l0,64 l 64,0 l0,64 l 64,0 l0-64 l 64,0 L 352,128 z" />
+	<glyph unicode="&#xe235;" data-tags="folder-minus, minus, remove, delete, directory, category, browse" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 352,128L 160,128 l0,64 l 192,0 L 352,128 z" />
+	<glyph unicode="&#xe236;" data-tags="folder, directory, category, browse" d="M 210.745,384l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 l0-288 L 32,32 L 32,384 L 210.745,384  M 224,416L0,416 l0-416 l 512,0 L 512,352 L 288,352 L 224,416L 224,416z" />
+	<glyph unicode="&#xe237;" data-tags="folder-plus, plus, add, directory, category, browse" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 480,32L 32,32 L 32,384 l 178.745,0 l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 L 480,32 zM 288,256L 224,256L 224,192L 160,192L 160,128L 224,128L 224,64L 288,64L 288,128L 352,128L 352,192L 288,192 z" />
+	<glyph unicode="&#xe238;" data-tags="folder-remove, remove, directory, category" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 480,32L 32,32 L 32,384 l 178.745,0 l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 L 480,32 zM 160,192L 352,192L 352,128L 160,128z" /> 
+
+<!-- Files -->
+	<glyph unicode="&#xe016;" data-tags="file, paper, page, new, empty, blank, document" d="M 352,480L 32,480 l0-512 l 448,0 L 480,352 L 352,480z M 448,0L 64,0 L 64,448 l 288,0 l0-96 l 96,0 L 448,0 z" />
+	<glyph unicode="&#xe239;" data-tags="file, list, paper, page, document" d="M 352,480L 32,480 l0-512 l 448,0 L 480,352 L 352,480z M 448,0L 64,0 L 64,448 l 288,0 l0-96 l 96,0 L 448,0 zM 128,96L 384,96L 384,64L 128,64zM 128,160L 384,160L 384,128L 128,128zM 128,224L 384,224L 384,192L 128,192z" />
+	<glyph unicode="&#x29;" data-tags="file-plus, plus, new, page, document, paper" d="M 448,96L 448,160L 384,160L 384,96L 320,96L 320,32L 384,32L 384-32L 448-32L 448,32L 512,32L 512,96 zM 32,448L 320,448L 320,352L 416,352L 416,192L 448,192L 448,352L 320,480L0,480L0-32L 288-32L 288,0L 32,0 z" />
+	<glyph unicode="&#xe017;" data-tags="file-minus, minus, remove, delete, page, document, paper" d="M 320,96L 512,96L 512,32L 320,32zM 32,448L 320,448L 320,352L 416,352L 416,192L 448,192L 448,352L 320,480L0,480L0-32L 288-32L 288,0L 32,0 z" />
+	<glyph unicode="&#xe240;" data-tags="file-check, checkmark, correct, tick, page, document, paper" d="M 352-32L 256,80L 296.75,120.75L 352,65.125L 480,192L 512,160 zM 32,448l 288,0 l0-96 l 96,0 l0-160 l 32,0 L 448,352 L 320,480L0,480 l0-512 l 288,0 l0,32 L 32,0 L 32,448 z" />
+	<glyph unicode="&#xe241;" data-tags="file-remove, delete, remove, cancel, close, document, page, paper" d="M 32,448l 288,0 l0-96 l 96,0 l0-160 l 32,0 L 448,352 L 320,480L0,480 l0-512 l 288,0 l0,32 L 32,0 L 32,448 zM 461.256,64L 512,114.744L 512,160L 466.744,160L 416,109.256L 365.256,160L 320,160L 320,114.744L 370.744,64L 320,13.256L 320-32L 365.256-32L 416,18.744L 466.744-32L 512-32L 512,13.256 z" />
+	<glyph unicode="&#xe018;" data-tags="copy, duplicate, files, pages, papers, documents" d="M 416,352l-96,0 L 320,384 L 224,480L0,480 l0-384 l 192,0 l0-128 l 320,0 L 512,256 L 416,352z M 416,306.745L 466.745,256L 416,256 L 416,306.745 z M 224,434.745L 274.745,384L 224,384 L 224,434.745 z M 32,448l 160,0 l0-96 l 96,0 l0-224 L 32,128 L 32,448 z M 480,0L 224,0 l0,96 l 96,0 L 320,320 l 64,0 l0-96 l 96,0 L 480,0 z" />
+	<glyph unicode="&#xe242;" data-tags="stack, files, archive, category, papers, documents, layers" d="M 440,352l-24,0 l0,24 c0,22.056-17.944,40-40,40l-24,0 L 352,440 c0,22.056-17.943,40-40,40l-240,0 c-22.056,0-40-17.944-40-40l0-304 c0-22.057, 17.944-40, 40-40l 24,0 l0-24 c0-22.057, 17.944-40, 40-40l 24,0 l0-24 c0-22.056, 17.944-40, 40-40l 240,0 c 22.056,0, 40,17.944, 40,40L 480,312 C 480,334.056, 462.056,352, 440,352z M 72.001,128c-4.4,0-8,3.6-8,8L 64.001,440 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8l0-24 L 136,416 c-22.056,0-40-17.944-40-40l0-248 L 72.001,128 z M 136,64c-4.4,0-8,3.6-8,8L 128,376 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8l0-24 L 200,352 c-22.056,0-40-17.944-40-40l0-248 L 136,64 z M 448,8c0-4.4-3.6-8-8-8L 200,0 c-4.4,0-8,3.6-8,8L 192,312 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8L 448,8 z" />
+
+<!-- Tree -->
+	<glyph unicode="&#xe243;" data-tags="tree, branches, binary tree" d="M 488,128l-50.411,0 L 320,323.98L 320,424 c0,13.2-10.8,24-24,24l-80,0 c-13.2,0-24-10.8-24-24l0-100.019 L 74.412,128L 24,128 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24L 128,124.020 L 245.588,320l 20.823,0 L 384,124.020L 384,24 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 C 512,117.2, 501.2,128, 488,128z" />
+	<glyph unicode="&#xe244;" data-tags="tree, branches, descendants" d="M 488,96l-8,0 L 480,200 c0,30.878-25.121,56-56,56L 288,256 l0,64 l 8,0 c 13.2,0, 24,10.8, 24,24L 320,424 c0,13.2-10.8,24-24,24l-80,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 8,0 l0-64 L 88,256 c-30.878,0-56-25.122-56-56l0-104 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 c0,13.2-10.8,24-24,24l-8,0 l0,96 l 128,0 l0-96 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 c0,13.2-10.8,24-24,24l-8,0 l0,96 l 128,0 l0-96 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 C 512,85.2, 501.2,96, 488,96z M 96,0L 32,0 l0,64 l 64,0 L 96,0 z M 288,0l-64,0 l0,64 l 64,0 L 288,0 z M 224,352L 224,416 l 64,0 l0-64 L 224,352 z M 480,0l-64,0 l0,64 l 64,0 L 480,0 z" />
+
+<!-- Alignment -->
+	<glyph unicode="&#xe246;" data-tags="paragraph-left, align left, left, wysiwyg" d="M0,448L 512,448L 512,384L0,384zM0,352L 320,352L 320,288L0,288zM0,160L 320,160L 320,96L0,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z" />
+	<glyph unicode="&#xe247;" data-tags="paragraph-center, align center, center, wysiwyg" d="M0,448L 512,448L 512,384L0,384zM 96,352L 416,352L 416,288L 96,288zM 96,160L 416,160L 416,96L 96,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z" />
+	<glyph unicode="&#xe248;" data-tags="paragraph-right, align right, right, wysiwyg" d="M0,448L 512,448L 512,384L0,384zM 192,352L 512,352L 512,288L 192,288zM 192,160L 512,160L 512,96L 192,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z" />
+	<glyph unicode="&#xe249;" data-tags="paragraph-justify, wysiwyg, justify" d="M0,448L 512,448L 512,384L0,384zM0,352L 512,352L 512,288L0,288zM0,256L 512,256L 512,192L0,192zM0,160L 512,160L 512,96L0,96zM0,64L 512,64L 512,0L0,0z" />
+
+<!-- Screens -->
+	<glyph unicode="&#xe01c;" data-tags="screen, monitor, computer, pc, desktop" d="M 512,64L 512,448 L0,448 l0-384 l 224,0 l0-32 l-96,0 l0-32 l 256,0 l0,32 l-96,0 l0,32 L 512,64 z M 64,384l 384,0 l0-256 L 64,128 L 64,384 z" />
+	<glyph unicode="&#xe01d;" data-tags="tablet, mobile" d="M 400,480L 80,480 C 53.6,480, 32,458.4, 32,432l0-416 c0-26.4, 21.6-48, 48-48l 320,0 c 26.4,0, 48,21.6, 48,48L 448,432 C 448,458.4, 426.4,480, 400,480z M 240-16 c-8.836,0-16,7.163-16,16s 7.164,16, 16,16s 16-7.163, 16-16S 248.836-16, 240-16z M 384,32L 96,32 L 96,416 l 288,0 L 384,32 z" />
+	<glyph unicode="&#xe01e;" data-tags="mobile, phone, handheld" d="M 384,480L 96,480 C 78.4,480, 64,465.601, 64,448l0-448 c0-17.6, 14.399-32, 32-32l 288,0 c 17.6,0, 32,14.4, 32,32L 416,448 C 416,465.601, 401.6,480, 384,480z M 240-8.891c-13.746,0-24.891,11.145-24.891,24.891s 11.145,24.891, 24.891,24.891s 24.891-11.145, 24.891-24.891 S 253.746-8.891, 240-8.891z M 384,64L 96,64 L 96,416 l 288,0 L 384,64 z" />
+
+<!-- Downloads -->
+	<glyph unicode="&#x51;" data-tags="box-add, storage, inbox, archive, download" d="M 416,448L 96,448 L0,352l0-336 c0-8.837, 7.163-16, 16-16l 480,0 c 8.836,0, 16,7.163, 16,16L 512,352 L 416,448z M 256,64L 96,192l 96,0 l0,96 l 128,0 l0-96 l 96,0 L 256,64z M 77.255,384l 32,32l 293.489,0 l 32-32L 77.255,384 z" />
+	<glyph unicode="&#x52;" data-tags="box-remove, storage, inbox, archive, upload" d="M 416,448L 96,448 L0,352l0-336 c0-8.837, 7.163-16, 16-16l 480,0 c 8.836,0, 16,7.163, 16,16L 512,352 L 416,448z M 320,160l0-96 L 192,64 l0,96 L 96,160 l 160,128 l 160-128L 320,160 z M 77.255,384l 32,32l 293.488,0 l 32-32L 77.255,384 z" />
+	<glyph unicode="&#xe021;" data-tags="download, arrow, store, save, inbox" d="M 448,128L 448,64L 64,64L 64,128L0,128L0,0L 512,0L 512,128 zM 384,288L 288,288L 288,448L 224,448L 224,288L 128,288L 256,96 z" />
+	<glyph unicode="&#xe022;" data-tags="upload, arrow, load, outbox" d="M 448,128L 448,64L 64,64L 64,128L0,128L0,0L 512,0L 512,128 zM 128,256L 224,256L 224,96L 288,96L 288,256L 384,256L 256,448 z" />
+
+<!-- Home -->
+	<glyph unicode="&#x21;" data-tags="home, house, building" d="M 512,184.777 L 256,383.491 L 0,184.777 L 0,265.796 L 256,464.509 L 512,265.795 ZM 448,192 L 448,0 L 64,0 L 64,192 L 256,336 Z" />
+	<glyph unicode="&#xe250;" data-tags="home, house, building" d="M 448,192 L 448,0 L 64,0 L 64,192 L 128,192 L 128,64 L 384,64 L 384,192 ZM 512,184.777 L 256,383.491 L 0,184.777 L 0,265.796 L 256,464.509 L 512,265.795 Z" /> 
+
+<!-- Links -->
+	<glyph unicode="&#xe024;" data-tags="new tab, external, outside, popout, link, blank" d="M 352,192 L 416,256 L 416,0 L 32,0 L 32,384 L 288,384 L 224,320 L 96,320 L 96,64 L 352,64 ZM 480,448 L 480,272 L 414.628,337.372 L 237.255,160 L 192,160 L 192,205.256 L 369.372,382.628 L 304,448 Z" />
+	<glyph unicode="&#xe251;" data-tags="new tab, external, outside, popout, link, blank" d="M 96,448l0-384 l 384,0 L 480,448 L 96,448 z M 448,96L 128,96 L 128,416 l 320,0 L 448,96 zM 64,32L 64,352L 32,384L 32,0L 416,0L 384,32 zM 214.627,137.373L 310.627,233.373L 384,160L 384,352L 192,352L 265.373,278.627L 169.373,182.627 z" />
+	<glyph unicode="&#xe252;" data-tags="link, chain, url, uri, anchor" d="M 476.698,442.679l-2.014,2.021c-47.074,47.067-124.097,47.067-171.163,0L 194.468,335.632 c-47.067-47.066-47.067-124.088,0-171.155l 2.013-2.013c 3.916-3.924, 8.073-7.462, 12.368-10.729l 39.924,39.925 c-4.651,2.747-9.063,6.036-13.058,10.030l-2.021,2.021c-25.557,25.549-25.557,67.136,0,92.695L 342.758,405.462 c 25.558,25.559, 67.137,25.559, 92.693,0l 2.021-2.012c 25.55-25.558, 25.55-67.146,0-92.695l-49.343-49.343 c 8.566-21.154, 12.624-43.7, 12.269-66.193l 76.302,76.302C 523.767,318.589, 523.767,395.61, 476.698,442.679zM 315.521,285.533c-3.916,3.916-8.073,7.461-12.368,10.72l-39.924-39.916c 4.652-2.748, 9.063-6.037, 13.058-10.031l 2.021-2.020 c 25.558-25.558, 25.558-67.136,0-92.694L 169.243,42.525c-25.559-25.551-67.138-25.551-92.694,0l-2.021,2.021 c-25.549,25.56-25.549,67.138,0,92.694l 49.344,49.343c-8.567,21.153-12.623,43.701-12.269,66.193l-76.301-76.299 c-47.068-47.066-47.068-124.089,0-171.162l 2.013-2.016c 47.076-47.064, 124.096-47.064, 171.164,0l 109.055,109.059 c 47.067,47.066, 47.067,124.097,0,171.163L 315.521,285.533z" />
+
+<!-- Media -->
+	<glyph unicode="&#x2f;" data-tags="image, picture, photo, graphic" d="M0,416l0-384 l 512,0 L 512,416 L0,416 z M 480,64l-32,0 l-96,144l-64-48L 160,320L 64,64L 32,64 L 32,384 l 448,0 L 480,64 zM 352,304A48,48 12780 1 0 448,304A48,48 12780 1 0 352,304z" />
+	<glyph unicode="&#x30;" data-tags="images, pictures, photos, graphics" d="M 64,352l0-320 l 448,0 L 512,352 L 64,352 z M 480,85.333L 416,192l-72.533-60.444L 288,224L 96,64L 96,320 l 384,0 L 480,85.333 zM 128,240A48,48 7740 1 0 224,240A48,48 7740 1 0 128,240zM 448,416L0,416L0,96L 32,96L 32,384L 448,384 z" />
+	<glyph unicode="&#xe014;" data-tags="palette, color, paint, art" d="M 257.54,416C 92.994,416,0,306.648,0,226.653c0-121.887, 109.354-190.477, 200.308-212.956 C 291.27-8.791, 325.48,32.462, 324.022,80c-1.771,57.75, 27.073,58.496, 47.52,56.459C 391.973,134.408, 512,106.695, 512,198.674 C 512,312.5, 422.072,416, 257.54,416z M 224,384c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 206.327,384, 224,384z M 80,191.754c-8.973,0-16.246,7.273-16.246,16.246S 71.027,224.246, 80,224.246S 96.246,216.973, 96.246,208S 88.973,191.754, 80,191.754z M 128,256c-17.673,0-32,14.327-32,32s 14.327,32, 32,32s 32-14.327, 32-32S 145.673,256, 128,256z M 256,128c-35.346,0-64,21.49-64,48 s 28.654,48, 64,48c 35.347,0, 64-21.49, 64-48S 291.347,128, 256,128z M 368,256c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48 S 394.51,256, 368,256z" /> 
+	<glyph unicode="&#x55;" data-tags="camera, photo, picture, image" d="M 152,176c0-57.438, 46.562-104, 104-104s 104,46.562, 104,104s-46.562,104-104,104S 152,233.438, 152,176z M 480,352L 368,352 c-8,32-16,64-48,64L 192,416 c-32,0-40-32-48-64L 32,352 c-17.6,0-32-14.4-32-32l0-288 c0-17.6, 14.4-32, 32-32l 448,0 c 17.6,0, 32,14.4, 32,32L 512,320 C 512,337.6, 497.6,352, 480,352z M 256,34c-78.425,0-142,63.574-142,142c0,78.425, 63.575,142, 142,142c 78.426,0, 142-63.575, 142-142 C 398,97.574, 334.427,34, 256,34z M 480,256l-64,0 l0,32 l 64,0 L 480,256 z" />
+	<glyph unicode="&#xe015;" data-tags="camera, video, media, film, movie" d="M 489.42,351.874c-5.294,0-10.729-1.861-15.718-5.383L 384,283.184L 384,336 c0,26.4-21.6,48-48,48L 48,384 c-26.4,0-48-21.6-48-48l0-224 c0-26.4, 21.6-48, 48-48l 288,0 c 26.4,0, 48,21.6, 48,48l0,52.815 l 89.701-63.307c 4.989-3.521, 10.424-5.382, 15.717-5.383 c 0.001,0, 0.001,0, 0.003,0c 7.044,0, 13.477,3.248, 17.646,8.911c 3.228,4.385, 4.934,10.027, 4.934,16.318L 512.001,326.645 C 512,343.208, 500.641,351.874, 489.42,351.874z" />
+	<glyph unicode="&#x56;" data-tags="play, video, movie" d="M 490.594,399.946C 418.778,410.271, 339.428,416, 256.001,416c-83.43,0-162.778-5.729-234.597-16.054 C 7.639,346.083,0,286.571,0,224c0-62.57, 7.639-122.083, 21.404-175.945C 93.223,37.729, 172.572,32, 256.001,32 c 83.427,0, 162.776,5.729, 234.593,16.055C 504.36,101.917, 512,161.43, 512,224C 512,286.571, 504.36,346.083, 490.594,399.946z M 192.001,128L 192.001,320 l 160-96L 192.001,128z" />
+	<glyph unicode="&#x57;" data-tags="music, song, audio, sound" d="M 480,480 L 512,480 L 512,112 C 512,67.817 461.855,32 400,32 C 338.145,32 288,67.817 288,112 C 288,156.184 338.145,192 400,192 C 431.342,192 459.671,182.8 480,167.98 L 480,352 L 224,295.111 L 224,48 C 224,3.817 173.856-32 112-32 C 50.144-32 0,3.817 0,48 C 0,92.184 50.144,128 112,128 C 143.342,128 171.671,118.8 192,103.98 L 192,416 L 480,480 Z" />
+ 
+<!-- Users -->
+	<glyph unicode="&#x22;" data-tags="user, profile, avatar, person, talk, member" d="M 311.413,128.632c-11.055,1.759-11.307,32.157-11.307,32.157s 32.484,32.158, 39.564,75.401 c 19.045,0, 30.809,45.973, 11.761,62.148C 352.226,315.365, 375.911,432, 256,432c-119.911,0-96.225-116.635-95.432-133.662 c-19.047-16.175-7.285-62.148, 11.761-62.148c 7.079-43.243, 39.564-75.401, 39.564-75.401s-0.252-30.398-11.307-32.157 C 164.976,122.966, 32,64.315, 32,0l 224,0 l 224,0 C 480,64.315, 347.024,122.966, 311.413,128.632z" />
+	<glyph unicode="&#xe01f;" data-tags="users, people, group, team, members, community" d="M 367.497,77.313c-9.476,1.494-9.692,27.327-9.692,27.327s 27.844,27.328, 33.912,64.076 c 16.326,0, 26.407,39.069, 10.082,52.814c 0.681,14.47, 20.984,113.588-81.799,113.588c-102.782,0-82.479-99.118-81.799-113.588 c-16.327-13.745-6.244-52.814, 10.081-52.814c 6.067-36.748, 33.913-64.076, 33.913-64.076s-0.216-25.833-9.692-27.327 C 241.979,72.497, 128,22.655, 128-32l 192,0 l 192,0 C 512,22.655, 398.021,72.497, 367.497,77.313zM 172.027,68.595c 22.047,13.575, 48.813,26.154, 70.769,33.712c-7.876,11.216-16.647,26.468-22.165,44.531 c-7.703,6.283-13.972,15.266-17.999,26.301c-4.033,11.052-5.561,23.426-4.304,34.842c 0.902,8.196, 3.239,15.833, 6.825,22.544 c-2.175,23.293-3.707,69.017, 26.224,102.366c 11.607,12.933, 26.278,22.23, 43.85,27.843C 272.090,393.114, 255.647,431.119, 192,431.119 c-102.782,0-82.479-99.118-81.799-113.588c-16.327-13.745-6.244-52.814, 10.081-52.814c 6.067-36.748, 33.913-64.076, 33.913-64.076 s-0.216-25.833-9.692-27.327C 113.979,168.497,0,118.655,0,64l 164.798,0 C 167.153,65.537, 169.551,67.070, 172.027,68.595z" />
+	<glyph unicode="&#x6d;" data-tags="vcard, card, contact" d="M 448,384L 64,384 c-35.2,0-64-28.8-64-64l0-224 c0-35.2, 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64L 512,320 C 512,355.2, 483.2,384, 448,384z M 64,96c0,70.692, 35.817,128, 80,128c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48s-21.49-48-48-48 c 44.183,0, 80-57.308, 80-128L 64,96 z M 448,96L 288,96 l0,32 l 160,0 L 448,96 z M 448,192L 288,192 l0,32 l 160,0 L 448,192 z M 448,288L 288,288 l0,32 l 160,0 L 448,288 z" />
+	<glyph unicode="&#x70;" data-tags="address-book, book, contacts" d="M 32,256L 80,256L 80,176L 32,176zM 32,352L 80,352L 80,272L 32,272zM 32,160L 80,160L 80,80L 32,80zM 32,64L 80,64L 80-16L 32-16zM 96,480l0-512 l 384,0 L 480,480 L 96,480 z M 288,351.835c 35.255,0, 63.835-28.58, 63.835-63.835s-28.58-63.835-63.835-63.835 c-35.255,0-63.835,28.58-63.835,63.835S 252.745,351.835, 288,351.835z M 384,96L 192,96 l0,32 c0,35.347, 28.654,64, 64,64l0,0 l 64,0  c 35.348,0, 64-28.653, 64-64L 384,96 zM 32,448L 80,448L 80,368L 32,368z" />
+	<glyph unicode="&#x26;" data-tags="share, out, external, outside" d="M 128,160c0,0, 29.412,96, 192,96l0-96 l 192,128L 320,416l0-96 C 192,320, 128,240.164, 128,160zM 352,96L 64,96 L 64,288 l 62.938,0 c 5.047,5.959, 10.456,11.667, 16.244,17.090c 21.982,20.595, 48.281,36.326, 78.057,46.91L0,352 l0-320 l 416,0 L 416,166.312 l-64-42.667L 352,96 z" />
+	<glyph unicode="&#xe257;" data-tags="enter, sign in, log in, login" d="M 192,224 L 32,224 L 32,288 L 192,288 L 192,352 L 288,256 L 192,160 ZM 512,480 L 512,64 L 320-32 L 320,64 L 128,64 L 128,192 L 160,192 L 160,96 L 320,96 L 320,384 L 448,448 L 160,448 L 160,320 L 128,320 L 128,480 Z" />
+	<glyph unicode="&#xe258;" data-tags="exit, sign out, log out, quit, close, logout" d="M 384,160 L 384,224 L 224,224 L 224,288 L 384,288 L 384,352 L 480,256 ZM 352,192 L 352,64 L 192,64 L 192-32 L 0,64 L 0,480 L 352,480 L 352,320 L 320,320 L 320,448 L 64,448 L 192,384 L 192,96 L 320,96 L 320,192 Z" />
+
+<!-- Messages -->
+	<glyph unicode="&#x24;" data-tags="bubble, comment, chat, talk" d="M 464,448 C 490.4,448 512,426.4 512,400 L 512,144 C 512,117.6 490.4,96 464,96 L 281.6,96 L 128-32 L 128,96 L 48,96 C 21.6,96 0,117.6 0,144 L 0,400 C 0,426.4 21.6,448 48,448 L 464,448 Z" />
+	<glyph unicode="&#x25;" data-tags="bubbles, comments, chat, talk" d="M 400,480 C 426.4,480 448,458.4 448,432 L 448,272 C 448,245.6 426.4,224 400,224 L 217.6,224 L 64,96 L 64,224 L 48,224 C 21.6,224 0,245.6 0,272 L 0,432 C 0,458.4 21.6,480 48,480 L 400,480 ZM 528,384 C 554.4,384 576,362.4 576,336 L 576,144 C 576,117.6 554.4,96 528,96 L 448,96 L 448-32 L 294.4,96 L 192,96 L 192,160 L 317.57,160 L 416,72.643 L 416,160 L 512,160 L 512,320 L 480,320 L 480,384 L 528,384 Z" horiz-adv-x="576" />
+	<glyph unicode="&#x60;" data-tags="quotes-left, ldquo" d="M 112.5,256 C 174.356,256 224.5,205.855 224.5,144 C 224.5,82.144 174.356,32 112.5,32 C 50.644,32 0.5,82.144 0.5,144 L 0,160 C 0,283.712 100.288,384 224,384 L 224,320 C 181.263,320 141.083,303.357 110.863,273.137 C 105.046,267.319 99.737,261.129 94.948,254.627 C 100.667,255.527 106.528,256 112.5,256 ZM 400.5,256 C 462.355,256 512.5,205.855 512.5,144 C 512.5,82.144 462.355,32 400.5,32 C 338.645,32 288.5,82.144 288.5,144 L 288,160 C 288,283.712 388.288,384 512,384 L 512,320 C 469.263,320 429.083,303.357 398.863,273.137 C 393.045,267.319 387.736,261.129 382.947,254.627 C 388.667,255.527 394.527,256 400.5,256 Z" />
+	<glyph unicode="&#x61;" data-tags="quotes-right, rdquo" d="M 400,160 C 338.144,160 288,210.145 288,272 C 288,333.856 338.144,384 400,384 C 461.856,384 512,333.856 512,272 L 512.5,256 C 512.5,132.288 412.212,32 288.5,32 L 288.5,96 C 331.237,96 371.417,112.643 401.637,142.863 C 407.454,148.681 412.763,154.871 417.552,161.373 C 411.833,160.473 405.972,160 400,160 ZM 112,160 C 50.145,160 0,210.145 0,272 C 0,333.856 50.145,384 112,384 C 173.855,384 224,333.856 224,272 L 224.5,256 C 224.5,132.288 124.212,32 0.5,32 L 0.5,96 C 43.237,96 83.417,112.643 113.637,142.863 C 119.455,148.681 124.764,154.871 129.553,161.373 C 123.833,160.473 117.973,160 112,160 Z" />
+	<glyph unicode="&#xe259;" data-tags="bubble-quote, comment, chat, talk, quote" d="M 464,480L 48,480 C 21.6,480,0,458.4,0,432l0-288 c0-26.4, 21.6-48, 48-48l 80,0 l0-128 l 153.6,128L 464,96 c 26.4,0, 48,21.6, 48,48L 512,432 C 512,458.4, 490.4,480, 464,480z M 224,344.615c-29.821-6.85-55.189-28.007-70.488-56.941C 155.646,287.889, 157.81,288, 160,288 c 35.346,0, 64-28.654, 64-64c0-35.346-28.654-64-64-64s-64,28.654-64,64c0,43.612, 15.198,84.729, 42.795,115.775 C 162.042,365.927, 191.74,382.388, 224,387.379L 224,344.615 z M 416,344.615c-29.82-6.85-55.189-28.007-70.488-56.941 C 347.646,287.889, 349.81,288, 352,288c 35.346,0, 64-28.654, 64-64c0-35.346-28.654-64-64-64s-64,28.654-64,64 c0,43.612, 15.198,84.729, 42.795,115.775C 354.041,365.927, 383.74,382.388, 416,387.379L 416,344.615 z" />
+
+<!-- Contact -->
+	<glyph unicode="&#xe260;" data-tags="phone, contact, telephone, support, call" d="M 457.153,376.352 C 510.42,346.068 512,313.643 512.002,291.003 L 512.002,287.606 C 512.002,282.424 507.533,278.188 502.074,278.188 L 381.928,278.188 C 376.469,278.188 372,282.424 372,287.606 L 372,299.059 C 372,327.664 344.645,332.234 329.551,334.664 C 314.455,337.090 276.934,339.441 256.071,339.441 C 256.045,339.441 256.025,339.441 256.005,339.441 C 255.976,339.441 255.956,339.441 255.928,339.441 C 235.066,339.441 197.541,337.091 182.448,334.664 C 167.355,332.237 139.999,327.666 139.999,299.059 L 139.999,287.606 C 139.999,282.424 135.53,278.188 130.073,278.188 L 9.927,278.188 C 4.47,278.188 0.001,282.424 0.001,287.606 L 0.001,291.003 C 0.001,313.643 1.581,346.068 54.848,376.352 C 118.198,412.362 208.777,416 255.928,416 C 255.956,415.975 255.976,415.945 256.005,415.922 C 256.023,415.944 256.044,415.976 256.071,416 C 303.223,416 393.803,412.366 457.153,376.352 ZM 256.001,288c-28.374,0-87.443-2.126-117.456-38.519C 108.523,213.098, 33.455,32, 100.398,32c 66.956,0, 125.458,0, 155.606,0 c 30.137,0, 88.648,0, 155.595,0c 66.945,0-8.125,181.098-38.137,217.481C 343.444,285.874, 284.362,288, 256.001,288z M 256,96 c-35.346,0-64,28.653-64,64s 28.654,64, 64,64c 35.347,0, 64-28.653, 64-64S 291.347,96, 256,96z" />
+	<glyph unicode="&#xe261;" data-tags="phone, contact, telephone, support, call" d="M 352,160c-32-32-32-64-64-64s-64,32-96,64s-64,64-64,96s 32,32, 64,64S 128,448, 96,448S0,352,0,352c0-64, 65.75-193.75, 128-256 s 192-128, 256-128c0,0, 96,64, 96,96S 384,192, 352,160z" />
+	<glyph unicode="&#x4d;" data-tags="envelop, mail, email, contact, letter" d="M 325.608,214.818L 512,86.264L 512,382.211 zM0,382.211L0,86.264L 186.388,214.836 zM 256,152.309L 211.499,192.264L0,64L 512,64L 300.495,192.264 zM 496.64,384L 15.36,384L 256,203.074 z" />
+	<glyph unicode="&#x4e;" data-tags="envelop-opened, mail, email, contact, letter" d="M 325.607,118.95L 512-9.605L 512,286.343 zM0,286.343L0-9.605L 186.388,118.968 zM 256,56.44L 211.499,96.395L0-31.868L 512-31.868L 300.494,96.395 zM 15.359,288L 496.64,288L 255.999,468.926 z" /> 
+	<glyph unicode="&#x4f;" data-tags="drawer, inbox, box, archive, storage, category" d="M 352,384L 160,384 L0,192l0-80 l0-48 c0-17.673, 14.327-32, 32-32l 448,0 c 17.674,0, 32,14.327, 32,32l0,48 l0,80 L 352,384z M 384,192l-64-64L 192,128 l-64,64L 41.655,192 l 133.333,160l 162.024,0 l 133.333-160L 384,192 z" />
+	<glyph unicode="&#x50;" data-tags="drawer, inbox, box, archive, storage, category" d="M 352,384L 160,384 L0,192l0-128 c0-17.673, 14.327-32, 32-32l 448,0 c 17.674,0, 32,14.327, 32,32L 512,192 L 352,384z M 320,128L 192,128 l-32,32l 192,0  L 320,128z M 41.655,192l 133.333,160l 162.024,0 l 133.333-160L 41.655,192 zM 142.482,288L 369.518,288L 342.851,320L 169.148,320 zM 89.149,224L 422.852,224L 396.185,256L 115.815,256 z" />
+	<glyph unicode="&#xe020;" data-tags="briefcase, portfolio, suitcase, work, job, employee" d="M 480,352L 352,352 L 352,384 c0,17.6-14.4,32-32,32L 192,416 c-17.602,0-32-14.4-32-32l0-32 L 32,352 c-17.6,0-32-14.4-32-32l0-288 c0-17.601, 14.398-32, 32-32l 448,0 c 17.6,0, 32,14.399, 32,32L 512,320 C 512,337.6, 497.6,352, 480,352z M 192,383.942 c 0.017,0.020, 0.037,0.041, 0.057,0.058l 127.886,0 c 0.021-0.017, 0.041-0.038, 0.059-0.058L 320.002,352 L 192,352 L 192,383.942 z M 480,224l-64,0 l0-48 c0-8.801-7.2-16-16-16l-32,0 c-8.802,0-16,7.199-16,16l0,48 L 160,224 l0-48 c0-8.801-7.2-16-16-16l-32,0 c-8.801,0-16,7.199-16,16l0,48 L 32,224 l0,32 l 448,0 L 480,224 z" />
+
+<!-- Tag -->
+	<glyph unicode="&#xe262;" data-tags="tag, price" d="M 272,480L0,208l 240-240l 272,272L 512,480 L 272,480 z M 400,320c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 426.51,320, 400,320z" />
+	<glyph unicode="&#xe263;" data-tags="tag, price" d="M 448,416 L 298.51,416 L 90.51,208 L 240,58.51 L 448,266.51 L 448,416 Z M 512,480 L 512,480 L 512,240 L 240-32 L 0,208 L 272,480 L 512,480 ZM 320,336A48,48 2700 1 0 416,336A48,48 2700 1 0 320,336z" />
+	<glyph unicode="&#xe264;" data-tags="tags, prices" d="M 496,448L 384,448 c-26.4,0-63.273-15.273-81.941-33.941L 113.941,225.941c-18.667-18.667-18.667-49.214,0-67.882l 140.118-140.117 c 18.667-18.668, 49.214-18.668, 67.882,0l 188.117,188.117C 528.727,224.727, 544,261.6, 544,288L 544,400 C 544,426.4, 522.4,448, 496,448z M 432,288 c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 458.51,288, 432,288zM 43.313,180.687 L 214.502,9.498 C 196.37-0.082 173.271,2.729 158.059,17.942 L 17.941,158.059 C -0.726,176.727 -0.726,207.274 17.941,225.941 L 206.059,414.059 C 224.727,432.727 261.6,448 288,448 L 43.313,203.314 C 37.091,197.091 37.091,186.91 43.313,180.687 Z" horiz-adv-x="544" />
+	<glyph unicode="&#xe265;" data-tags="tags, prices" d="M 480,384 L 384,384 C 381.158,384 373.652,382.643 364.621,378.902 C 355.59,375.161 349.322,370.813 347.312,368.804 L 170.509,192 L 288,74.51 L 464.803,251.314 C 466.813,253.323 471.161,259.591 474.901,268.622 C 478.643,277.652 480,285.158 480,288 L 480,384 Z M 496,448 L 496,448 C 522.4,448 544,426.4 544,400 L 544,288 C 544,261.6 528.727,224.727 510.058,206.059 L 321.941,17.942 C 312.607,8.608 300.304,3.941 288,3.941 C 275.696,3.941 263.392,8.608 254.059,17.942 L 113.941,158.059 C 95.274,176.727 95.274,207.274 113.941,225.941 L 302.059,414.059 C 320.727,432.727 357.6,448 384,448 L 496,448 ZM 43.313,180.687 L 214.502,9.498 C 196.37-0.082 173.271,2.729 158.059,17.942 L 17.941,158.059 C -0.726,176.727 -0.726,207.274 17.941,225.941 L 206.059,414.059 C 224.727,432.727 261.6,448 288,448 L 43.313,203.314 C 37.091,197.091 37.091,186.91 43.313,180.687 ZM 384,320A32,32 2700 1 0 448,320A32,32 2700 1 0 384,320z" horiz-adv-x="544" />
+
+<!-- Tools -->
+ 	<glyph unicode="&#x38;" data-tags="cog, preferences, settings, gear, generate, control, options" d="M 466.895,174.875c-26.863,46.527-10.708,106.152, 36.076,133.244l-50.313,87.146c-14.375-8.427-31.088-13.259-48.923-13.259 c-53.768,0-97.354,43.873-97.354,97.995L 205.752,480.001 c 0.133-16.705-4.037-33.641-12.979-49.126 c-26.862-46.528-86.578-62.351-133.431-35.379L 9.030,308.35c 14.485-8.236, 27.025-20.294, 35.943-35.739 c 26.819-46.454, 10.756-105.96-35.854-133.112l 50.313-87.146c 14.325,8.348, 30.958,13.127, 48.7,13.127 c 53.598,0, 97.072-43.596, 97.35-97.479l 100.627,0 c-0.043,16.537, 4.136,33.285, 12.983,48.609 c 26.818,46.453, 86.388,62.297, 133.207,35.506l 50.313,87.145C 488.222,147.494, 475.766,159.51, 466.895,174.875z M 256,120.334 c-57.254,0-103.668,46.412-103.668,103.667c0,57.254, 46.413,103.667, 103.668,103.667c 57.254,0, 103.666-46.413, 103.666-103.667 C 359.665,166.746, 313.254,120.334, 256,120.334z" />
+	<glyph unicode="&#x37;" data-tags="cogs, settings, gears, generate, control, options" d="M 181.861,118.974l 20.649,28.908l-22.627,22.628l-28.909-20.648c-5.361,2.997-11.102,5.387-17.133,7.096L 128,192L 96,192 l-5.84-35.043c-6.031-1.709-11.772-4.099-17.133-7.096L 44.118,170.51L 21.49,147.882l 20.649-28.908 c-2.997-5.36-5.387-11.103-7.096-17.133L0,96l0-32 l 35.043-5.841c 1.709-6.030, 4.099-11.772, 7.096-17.133L 21.49,12.118l 22.627-22.628 l 28.909,20.648c 5.361-2.997, 11.102-5.387, 17.133-7.096L 96-32l 32,0 l 5.84,35.043c 6.031,1.709, 11.772,4.099, 17.133,7.096l 28.909-20.648 l 22.627,22.628l-20.649,28.908c 2.997,5.36, 5.387,11.103, 7.096,17.133L 224,64l0,32 l-35.043,5.841 C 187.248,107.871, 184.858,113.613, 181.861,118.974z M 112,48c-17.674,0-32,14.327-32,32s 14.326,32, 32,32s 32-14.327, 32-32 S 129.674,48, 112,48zM 512,288l0,32 l-33.691,6.125c-0.621,4.023-1.416,7.989-2.362,11.895l 28.779,18.55L 492.48,386.134l-33.472-7.234 c-2.107,3.455-4.363,6.81-6.746,10.065l 19.503,28.171l-22.628,22.627l-28.171-19.503c-3.256,2.383-6.61,4.638-10.065,6.747 l 7.234,33.472L 388.571,472.726l-18.55-28.779c-3.906,0.946-7.872,1.741-11.895,2.362L 352,480l-32,0 l-6.126-33.691 c-4.023-0.621-7.988-1.416-11.895-2.362L 283.43,472.726L 253.866,460.48l 7.234-33.472c-3.455-2.108-6.81-4.364-10.065-6.747 l-28.171,19.503l-22.627-22.627l 19.503-28.171c-2.383-3.255-4.639-6.61-6.747-10.065l-33.472,7.234l-12.246-29.564l 28.779-18.55 c-0.946-3.906-1.741-7.871-2.362-11.895L 160,320l0-32 l 33.691-6.125c 0.621-4.023, 1.416-7.989, 2.362-11.895l-28.779-18.55 l 12.246-29.564l 33.472,7.234c 2.108-3.455, 4.364-6.809, 6.747-10.065l-19.503-28.171l 22.627-22.628l 28.171,19.503 c 3.255-2.383, 6.61-4.638, 10.065-6.746l-7.234-33.472l 29.564-12.246l 18.551,28.779c 3.905-0.946, 7.871-1.741, 11.894-2.362L 320,128l 32,0 l 6.126,33.691c 4.022,0.621, 7.988,1.416, 11.895,2.362l 18.55-28.779l 29.564,12.246l-7.234,33.472 c 3.455,2.108, 6.81,4.363, 10.065,6.746l 28.171-19.503l 22.628,22.628l-19.503,28.171c 2.383,3.256, 4.638,6.61, 6.746,10.065 l 33.472-7.234l 12.246,29.565l-28.779,18.55c 0.946,3.906, 1.741,7.871, 2.362,11.895L 512,288z M 336,234.4 c-38.439,0-69.6,31.161-69.6,69.6c0,38.439, 31.16,69.6, 69.6,69.6s 69.6-31.161, 69.6-69.6C 405.6,265.561, 374.44,234.4, 336,234.4z" />
+	<glyph unicode="&#x36;" data-tags="screwdriver, fix, tool, make, build" d="M 507.256,84.744L 308.744,283.256c-11.030,11.031-38.41,2.154-65.372-19.758L 96,410.87L 80,448L 28.768,480L0,451.232L 32,400 l 37.13-16l 147.373-147.372c-21.913-26.963-30.79-54.342-19.76-65.372c 0.003-0.003, 0.006-0.005, 0.009-0.008l 198.503-198.504 c 12.976-12.975, 48.565,1.579, 79.494,32.508C 505.677,36.18, 520.23,71.771, 507.256,84.744z M 445.435,34.565 c-3.71-3.71-8.572-5.565-13.435-5.565s-9.725,1.855-13.435,5.565l-160,160c-7.421,7.42-7.421,19.449,0,26.869 c 7.42,7.42, 19.449,7.42, 26.869,0l 160-160C 452.855,54.015, 452.855,41.985, 445.435,34.565z" />
+	<glyph unicode="&#x3a;" data-tags="wrench, settings, control, tool, options, preferences, fix" d="M 507.882,411.883L 448,352l-64,64l 59.882,59.883C 435.057,478.557, 425.698,480, 416,480c-53.021,0-96-42.98-96-96 c0-9.697, 1.442-19.057, 4.116-27.882L 123.882,155.883C 115.057,158.557, 105.698,160, 96,160c-53.021,0-96-42.98-96-96 c0-9.697, 1.442-19.058, 4.117-27.882L 64,96l 64-64l-59.883-59.882C 76.943-30.556, 86.302-32, 96-32c 53.020,0, 96,42.981, 96,96 c0,9.698-1.444,19.059-4.118,27.883l 200.234,200.235C 396.943,289.444, 406.302,288, 416,288c 53.020,0, 96,42.981, 96,96 C 512,393.698, 510.556,403.058, 507.882,411.883z" />
+	<glyph unicode="&#x39;" data-tags="equalizer, control, options, settings, dashboard" d="M 144,320L 80,320 c-8.8,0-16-7.2-16-16l0-32 c0-8.8, 7.2-16, 16-16l 64,0 c 8.8,0, 16,7.2, 16,16l0,32 C 160,312.8, 152.8,320, 144,320zM 96,416L 128,416L 128,336L 96,336zM 96,240L 128,240L 128,32L 96,32zM 272,192l-64,0 c-8.8,0-16-7.2-16-16l0-32 c0-8.8, 7.2-16, 16-16l 64,0 c 8.801,0, 16,7.2, 16,16l0,32 C 288,184.8, 280.801,192, 272,192zM 224.001,416L 256.001,416L 256.001,208L 224.001,208zM 224.001,112L 256.001,112L 256.001,32L 224.001,32zM 400,288l-64,0 c-8.799,0-16-7.2-16-16l0-32 c0-8.8, 7.201-16, 16-16l 64,0 c 8.801,0, 16,7.2, 16,16l0,32 C 416,280.8, 408.801,288, 400,288zM 352,416L 384,416L 384,304L 352,304zM 352,208L 384,208L 384,32L 352,32zM 440,480L 40,480 C 17.944,480,0,462.056,0,440l0-432 c0-22.056, 17.944-40, 40-40l 400,0 c 22.056,0, 40,17.944, 40,40L 480,440  C 480,462.056, 462.056,480, 440,480z M 448,8c0-4.4-3.6-8-8-8L 40,0 c-4.4,0-8,3.6-8,8L 32,440 c0,4.4, 3.6,8, 8,8l 400,0 c 4.4,0, 8-3.6, 8-8L 448,8 z" />
+	<glyph unicode="&#x78;" data-tags="dashboard, control panel" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 224,352A32,32 10980 1 0 288,352A32,32 10980 1 0 224,352zM 320,320A32,32 10980 1 0 384,320A32,32 10980 1 0 320,320zM 128,320A32,32 10980 1 0 192,320A32,32 10980 1 0 128,320zM 224,128L 224,96L 288,96L 288,128L 256,288 z" />
+	<glyph unicode="&#xe266;" data-tags="switch, power, turn off, off, shutdown" d="M 320,406.706l0-67.979 c 18.103-7.902, 34.75-19.204, 49.137-33.59C 399.358,274.917, 416,234.737, 416,192 s-16.643-82.917-46.863-113.137C 338.917,48.643, 298.738,32, 256,32s-82.917,16.643-113.137,46.863 C 112.643,109.083, 96,149.263, 96,192s 16.643,82.917, 46.863,113.137c 14.387,14.387, 31.034,25.689, 49.137,33.591L 192,406.706  C 99.476,379.166, 32,293.47, 32,192c0-123.712, 100.289-224, 224-224c 123.712,0, 224,100.288, 224,224 C 480,293.47, 412.525,379.166, 320,406.706zM 224,480L 288,480L 288,224L 224,224z" />
+	<glyph unicode="&#x54;" data-tags="filter, funnel" d="M 256,480C 114.615,480,0,444.183,0,400l0-48 l 192-192l0-160 c0-17.673, 28.653-32, 64-32c 35.346,0, 64,14.327, 64,32L 320,160 l 192,192L 512,400 C 512,444.183, 397.385,480, 256,480z M 47.192,410.588c 11.972,6.829, 28.791,13.31, 48.639,18.744C 139.803,441.37, 196.685,448, 256,448 c 59.314,0, 116.197-6.63, 160.169-18.668c 19.848-5.434, 36.667-11.915, 48.64-18.744c 7.896-4.503, 12.162-8.312, 14.148-10.588 c-1.986-2.276-6.253-6.084-14.148-10.588c-11.973-6.829-28.792-13.31-48.64-18.744C 372.198,358.63, 315.315,352, 256,352 c-59.315,0-116.197,6.63-160.169,18.668c-19.848,5.434-36.667,11.915-48.639,18.744C 39.296,393.916, 35.030,397.724, 33.043,400 C 35.030,402.276, 39.296,406.084, 47.192,410.588z" />
+	<glyph unicode="&#x4c;" data-tags="remove, delete, trashcan, recycle bin, bin, dispose" d="M 64,0c0-17.673, 14.327-32, 32-32l 320,0 c 17.674,0, 32,14.327, 32,32L 448,352 L 64,352 L 64,0 z M 320,288l 64,0 l0-256 l-64,0 L 320,288 z M 224,288l 64,0 l0-256 l-64,0  L 224,288 z M 128,288l 64,0 l0-256 l-64,0 L 128,288 zM 448,448L 320,448 L 320,480 L 192,480 l0-32 L 64,448 C 28.654,448,0,419.346,0,384l 512,0 C 512,419.346, 483.347,448, 448,448z" />
+ 	<glyph unicode="&#x23;" data-tags="lock, secure, private, encrypted" d="M 416,256l-32,0 l0,96 C 384,422.692, 326.692,480, 256,480c-70.692,0-128-57.308-128-128l0-96 L 96,256 c-17.6,0-32-14.4-32-32l0-224 c0-17.6, 14.4-32, 32-32l 320,0 c 17.6,0, 32,14.4, 32,32L 448,224 C 448,241.6, 433.6,256, 416,256z M 256,64c-17.673,0-32,14.327-32,32 s 14.327,32, 32,32s 32-14.327, 32-32S 273.673,64, 256,64z M 320,256L 192,256 l0,96 c0,35.29, 28.71,64, 64,64s 64-28.71, 64-64L 320,256 z" />
+	<glyph unicode="&#xe267;" data-tags="unlock, secure, private, encrypted" d="M 256,64c-17.673,0-32,14.326-32,32c0,17.673, 14.327,32, 32,32s 32-14.327, 32-32C 288,78.326, 273.673,64, 256,64z M 192,256 l0,96 c0,35.29, 28.71,64, 64,64s 64-28.71, 64-64l0-32 l 64,0 l0,32 C 384,422.692, 326.692,480, 256,480c-70.692,0-128-57.309-128-128l0-96 L 96,256 c-17.601,0-32-14.4-32-32l0-224 c0-17.601, 14.399-32, 32-32l 320,0 c 17.6,0, 32,14.399, 32,32L 448,224 c0,17.6-14.4,32-32,32L 192,256 z" />
+	<glyph unicode="&#x5f;" data-tags="key, password, login, log in, signin, sign in" d="M 352,480c-88.365,0-160-71.634-160-160c0-10.013, 0.929-19.808, 2.688-29.312L0,96l0-96 c0-17.673, 14.327-32, 32-32 l 32,0 l0,32 l 64,0 l0,64 l 64,0 l0,64 l 64,0 l 41.521,41.521C 314.526,163.363, 332.869,160, 352,160c 88.365,0, 160,71.634, 160,160S 440.365,480, 352,480z M 399.937,319.937c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 426.447,319.937, 399.937,319.937z" />
+	<glyph unicode="&#x46;" data-tags="support, help, life, lifebuoy" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 160,224 c0,53.020, 42.98,96, 96,96s 96-42.98, 96-96s-42.98-96-96-96S 160,170.98, 160,224z M 462.99,138.262L 462.99,138.262l-88.71,36.745 C 380.539,190.099, 384,206.645, 384,224s-3.461,33.901-9.72,48.993l 61.063,25.293l 27.647,11.452C 473.944,283.327, 480,254.373, 480,224 C 480,193.627, 473.943,164.673, 462.99,138.262L 462.99,138.262z M 341.739,430.99L 341.739,430.99L 341.739,430.99l-36.745-88.71 C 289.902,348.539, 273.356,352, 256,352s-33.901-3.461-48.993-9.72l-17.23,41.599l-19.515,47.112C 196.673,441.943, 225.628,448, 256,448 C 286.373,448, 315.327,441.943, 341.739,430.99z M 49.010,309.738l 47.112-19.515l 41.599-17.23C 131.462,257.901, 128,241.355, 128,224 s 3.461-33.901, 9.72-48.993l-88.71-36.745C 38.057,164.673, 32,193.627, 32,224C 32,254.373, 38.057,283.327, 49.010,309.738z  M 170.262,17.010l 11.452,27.647l 25.293,61.063C 222.099,99.461, 238.645,96, 256,96s 33.901,3.461, 48.993,9.72l 36.745-88.71l0,0l0,0 C 315.327,6.058, 286.373,0, 256,0C 225.628,0, 196.673,6.057, 170.262,17.010z" />
+	<glyph unicode="&#x62;" data-tags="database, server, host, storage, save, datecenter" d="M 256,480C 114.614,480,0,444.184,0,400l0-64 c0-44.183, 114.611-80, 256-80c 141.385,0, 256,35.817, 256,80L 512,400 C 512,444.184, 397.385,480, 256,480 zM 255.193,224C 140.566,224, 43.94,247.543, 11.32,280C 3.705,272.423,0,264.361,0,256l0-64 c0-44.184, 114.611-80, 256-80 c 141.385,0, 256,35.816, 256,80l0,64 c0,8.361-4.516,16.423-12.131,24C 467.25,247.543, 369.82,224, 255.193,224zM 255.193,80C 140.566,80, 43.94,103.544, 11.32,136C 3.705,128.424,0,120.361,0,112l0-64 c0-44.183, 114.611-80, 256-80 c 141.385,0, 256,35.817, 256,80l0,64 c0,8.361-4.516,16.424-12.131,24C 467.25,103.544, 369.82,80, 255.193,80z" />
+	<glyph unicode="&#xe268;" data-tags="scissors, cut" d="M 390.979-32c-27.208,0.001-61.186,16.608-75.809,53.702c-2.034,4.84-4.271,10.714-6.859,17.509 c-8.285,21.749-20.806,54.616-33.892,68.23c-4.79,4.984-8.495,8.599-11.473,11.504c-2.673,2.607-4.921,4.801-6.946,7.019 c-2.025-2.219-4.273-4.412-6.948-7.022c-2.976-2.904-6.68-6.519-11.468-11.5c-13.086-13.616-25.608-46.488-33.895-68.239 c-2.586-6.791-4.823-12.661-6.856-17.499C 182.208-15.391, 148.231-32, 121.025-32c-5.303,0-10.138,0.646-14.373,1.918 c-26.772,8.046-43.012,37.939-40.411,74.386l 0.372,4.206c 3.287,29.404, 21.199,58.458, 50.435,81.806 c 25.344,20.238, 55.31,32.812, 78.204,32.812c 4.53,0, 8.712-0.494, 12.519-1.472l 15.711,32.209 c-16.148,40.414-39.152,100.774-57.123,153.646c-10.015,29.463-17.448,53.594-22.094,71.721 c-7.352,28.691-6.883,38.393-3.916,44.132L 148.95,480l 107.053-219.465L 363.049,479.999l 8.602-16.635 c 2.967-5.739, 3.438-15.441-3.915-44.132c-4.646-18.126-12.079-42.257-22.093-71.72c-17.97-52.868-40.974-113.229-57.123-153.646 l 15.711-32.209c 3.806,0.978, 7.987,1.472, 12.518,1.472c 22.895,0, 52.861-12.574, 78.206-32.814 c 24.995-19.962, 41.713-44.097, 48.090-69.052l 1.179,0.564l 1.535-17.522c 2.603-36.445-13.635-66.338-40.404-74.386 c-4.235-1.272-9.071-1.918-14.373-1.918C 390.98-32, 390.979-32, 390.979-32z M 346.841,39.052 c 18.936-34.353, 35.854-39.491, 44.263-39.491c 11.447,0, 20.018,9.238, 21.691,18.169c 1.097,5.871, 1.296,11.914, 0.592,17.961 c-2.837,24.156-19.338,44.898-32.678,58.044c-18.334,18.065-38.889,30.062-52.085,35.3c-1.313,0.457-2.121,0.526-2.489,0.526 c-0.255,0-0.354-0.031-0.355-0.031C 321.937,127.034, 317.342,98.010, 346.841,39.052z M 183.13,129.035 c-13.115-5.24-33.545-17.236-51.764-35.301c-13.26-13.145-29.656-33.888-32.475-58.052c-0.704-6.030-0.506-12.069, 0.589-17.953 c 1.661-8.93, 10.179-18.169, 21.556-18.169c 8.356,0, 25.17,5.139, 43.991,39.49c 29.312,58.938, 24.764,87.944, 20.903,90.493 c0-0.001-0.001-0.001-0.004-0.001c-0.020,0-0.125,0.018-0.32,0.018C 185.239,129.561, 184.438,129.492, 183.13,129.035z" />
+	<glyph unicode="&#x6a;" data-tags="health, medicine, medical, pulse" d="M 416,160L 384,128L 320,288L 256,96L 160,448L 96,128L0,128L0,96L 122.235,96L 164.794,308.803L 225.128,87.58L 252.937-14.385L 322.734,195.005L 354.288,116.115L 372.313,71.057L 429.256,128L 512,128L 512,160 z" />
+	<glyph unicode="&#x6b;" data-tags="wand, magic, wizard" d="M 258.181,254.091l 94.386,29.34L 256,351.723L 256,480 L 152.532,405.466L 32,448l 42.533-120.533L0,224l 128,0 l 68.567-96.568l 29.341,94.387 L 448-32l 64,64L 258.181,254.091z M 202.327,277.672l-19.579-62.986l-38.084,53.010L 78.712,267.696 l 39.447,52.861L 96.979,383.021l 62.464-21.182 l 52.862,39.447l0-65.952 l 53.008-38.084L 202.327,277.672z" />
+	<glyph unicode="&#x3c;" data-tags="eye, views, vision, visit" d="M 256,384C 144.341,384, 47.559,318.979,0,224c 47.559-94.979, 144.341-160, 256-160c 111.657,0, 208.439,65.021, 256,160 C 464.442,318.979, 367.657,384, 256,384z M 382.225,299.148c 30.081-19.187, 55.571-44.887, 74.717-75.148 c-19.146-30.261-44.637-55.961-74.718-75.149C 344.427,124.743, 300.779,112, 256,112c-44.78,0-88.428,12.743-126.225,36.852 C 99.695,168.038, 74.205,193.738, 55.058,224c 19.146,30.262, 44.637,55.962, 74.717,75.148c 1.959,1.25, 3.938,2.461, 5.929,3.65 C 130.725,289.134, 128,274.387, 128,259c0-70.692, 57.308-128, 128-128s 128,57.308, 128,128c0,15.387-2.725,30.134-7.704,43.799 C 378.286,301.61, 380.265,300.398, 382.225,299.148z M 256,275c0-26.51-21.49-48-48-48s-48,21.49-48,48s 21.49,48, 48,48 S 256,301.51, 256,275z" />
+	<glyph unicode="&#xe269;" data-tags="eye-blocked, views, vision, visit, banned, blocked, forbidden, private" d="M 419.661,331.792 C 458.483,304.277 490.346,267.246 512,224 C 464.439,129.021 367.657,64 256,64 C 224.717,64 194.604,69.106 166.411,78.542 L 205.389,117.52 C 221.918,113.87 238.875,112 256,112 C 300.779,112 344.427,124.743 382.223,148.852 C 412.304,168.040 437.795,193.74 456.941,224.001 C 438.415,253.284 413.934,278.276 385.116,297.248 L 419.661,331.792 ZM 256,131 C 244.638,131 233.624,132.488 223.136,135.267 L 379.729,291.859 C 382.51,281.373 384,270.362 384,259 C 384,188.308 326.692,131 256,131 ZM 480,480l-26.869,0 L 343.325,370.194C 315.787,379.156, 286.448,384, 256,384C 144.341,384, 47.559,318.979,0,224 c 21.329-42.596, 52.564-79.154, 90.597-106.534L0,26.869L0,0 l 26.869,0 L 480,453.131L 480,480 z M 208,323c 24.022,0, 43.923-17.647, 47.446-40.685 l-54.762-54.762C 177.647,231.077, 160,250.978, 160,275C 160,301.51, 181.49,323, 208,323z M 55.058,224 c 19.146,30.262, 44.637,55.962, 74.717,75.148c 1.959,1.25, 3.938,2.461, 5.929,3.65C 130.725,289.134, 128,274.387, 128,259 c0-29.262, 9.825-56.224, 26.349-77.781l-29.275-29.275C 97.038,170.765, 73.197,195.33, 55.058,224z" />
+	<glyph unicode="&#x6e;" data-tags="clock, time, schedule" d="M 329.372,105.372L 224,210.745L 224,352L 288,352L 288,237.255L 374.628,150.628 zM 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32z" />
+	<glyph unicode="&#x6f;" data-tags="compass, direction, map, locate" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 304,272l-144,80l-32,0 l0-32 l 80-144l 144-80l 32,0 l0,32 L 304,272z M 256,192c-17.673,0-32,14.327-32,32c0,17.673, 14.327,32, 32,32 c 17.673,0, 32-14.327, 32-32C 288,206.327, 273.673,192, 256,192z" />
+	<glyph unicode="&#xe01b;" data-tags="connection, broadcast, wifi, wave, feed" d="M 224,96A32,32 12780 1 0 288,96A32,32 12780 1 0 224,96zM 256,416c-96.026,0-182.161-42.307-240.815-109.286l 24.081-21.071C 92.055,345.923, 169.577,384, 256,384 c 86.423,0, 163.945-38.077, 216.734-98.357l 24.081,21.071C 438.161,373.693, 352.027,416, 256,416zM 256,320c-67.218,0-127.513-29.615-168.571-76.5l 24.082-21.071C 146.703,262.616, 198.385,288, 256,288 c 57.616,0, 109.297-25.384, 144.489-65.571l 24.082,21.071C 383.513,290.385, 323.219,320, 256,320zM 256,224c-38.41,0-72.865-16.923-96.326-43.715l 24.082-21.071C 201.352,179.308, 227.192,192, 256,192 c 28.808,0, 54.648-12.692, 72.245-32.786l 24.081,21.071C 328.865,207.077, 294.41,224, 256,224z" />
+	<glyph unicode="&#xe271;" data-tags="book, reading" d="M 448,416l0-416 L 112,0 c-26.511,0-48,21.49-48,48c0,26.509, 21.489,48, 48,48l 304,0 L 416,480 L 96,480 C 60.801,480, 32,451.2, 32,416l0-384  c0-35.2, 28.801-64, 64-64l 384,0 L 480,416 L 448,416 zM 128,64L 416,64L 416,32L 128,32z" />
+	<glyph unicode="&#x79;" data-tags="lightning, power" d="M 192,480L0,224L 192,224L 64-32L 512,288L 256,288L 448,480 z" /> 
+	<glyph unicode="&#xe013;" data-tags="print, printer" d="M 128,448L 384,448L 384,384L 128,384zM 480,352L 32,352 C 14.4,352,0,337.6,0,320l0-160 c0-17.6, 14.398-32, 32-32l 96,0 l0-128 l 256,0 L 384,128 l 96,0 c 17.6,0, 32,14.4, 32,32L 512,320  C 512,337.6, 497.6,352, 480,352z M 352,32L 160,32 L 160,192 l 192,0 L 352,32 z M 487.2,304c0-12.813-10.387-23.2-23.199-23.2 c-12.813,0-23.201,10.387-23.201,23.2s 10.388,23.2, 23.201,23.2C 476.814,327.2, 487.2,316.813, 487.2,304z" />
+
+<!-- Social -->
+	<glyph unicode="&#x71;" data-tags="feed, rss, social" d="M 426.67,480L 85.343,480 C 38.405,480,0,441.594,0,394.656l0-341.314 C0,6.375, 38.406-32, 85.344-32L 426.67-32 c 46.938,0, 85.33,38.374, 85.33,85.342L 512,394.656 C 512,441.594, 473.608,480, 426.67,480z M 139.472,64.376C 115.487,64.376, 96,83.722, 96,107.69 c0,23.842, 19.486,43.406, 43.472,43.406c 24.079,0, 43.53-19.564, 43.53-43.406C 183.001,83.722, 163.55,64.376, 139.472,64.376z  M 248.734,64.002c0,40.905-15.904,79.409-44.73,108.222c-28.857,28.875-67.188,44.813-107.952,44.813L 96.052,279.63 c 118.826,0, 215.563-96.721, 215.563-215.627L 248.734,64.002L 248.734,64.002z M 359.814,64.002 c0,145.531-118.329,263.97-263.688,263.97L 96.126,390.596 c 180.001,0, 326.473-146.562, 326.473-326.596L 359.814,64.002L 359.814,64.002z" />
+
+<!-- Calendar -->
+	<glyph unicode="&#x43;" data-tags="calendar, schedule, date, time, day" d="M 160,288L 224,288L 224,224L 160,224zM 256,288L 320,288L 320,224L 256,224zM 352,288L 416,288L 416,224L 352,224zM 64,96L 128,96L 128,32L 64,32zM 160,96L 224,96L 224,32L 160,32zM 256,96L 320,96L 320,32L 256,32zM 160,192L 224,192L 224,128L 160,128zM 256,192L 320,192L 320,128L 256,128zM 352,192L 416,192L 416,128L 352,128zM 64,192L 128,192L 128,128L 64,128zM 416,480l0-32 l-64,0 L 352,480 L 128,480 l0-32 L 64,448 L 64,480 L0,480 l0-512 l 480,0 L 480,480 L 416,480 z M 448,0L 32,0 L 32,352 l 416,0 L 448,0 z" />
+	<glyph unicode="&#x44;" data-tags="calendar, schedule, date, time, day" d="M 64,320L 96,320L 96,288L 64,288zM 128,320L 160,320L 160,288L 128,288zM 192,320L 224,320L 224,288L 192,288zM 256,320L 288,320L 288,288L 256,288zM 320,320L 352,320L 352,288L 320,288zM 384,320L 416,320L 416,288L 384,288zM 64,256L 96,256L 96,224L 64,224zM 128,256L 160,256L 160,224L 128,224zM 192,256L 224,256L 224,224L 192,224zM 256,256L 288,256L 288,224L 256,224zM 320,256L 352,256L 352,224L 320,224zM 384,256L 416,256L 416,224L 384,224zM 64,192L 96,192L 96,160L 64,160zM 128,192L 160,192L 160,160L 128,160zM 192,192L 224,192L 224,160L 192,160zM 256,192L 288,192L 288,160L 256,160zM 320,192L 352,192L 352,160L 320,160zM 384,192L 416,192L 416,160L 384,160zM 64,128L 96,128L 96,96L 64,96zM 128,128L 160,128L 160,96L 128,96zM 192,128L 224,128L 224,96L 192,96zM 256,128L 288,128L 288,96L 256,96zM 320,128L 352,128L 352,96L 320,96zM 384,128L 416,128L 416,96L 384,96zM 64,64L 96,64L 96,32L 64,32zM 128,64L 160,64L 160,32L 128,32zM 192,64L 224,64L 224,32L 192,32zM 256,64L 288,64L 288,32L 256,32zM 320,64L 352,64L 352,32L 320,32zM 384,64L 416,64L 416,32L 384,32zM 416,448L 416,480 l-64,0 l0-64 l-32,0 L 320,448 L 160,448 l0-32 l-32,0 L 128,480 L 64,480 l0-32 L0,448 l0-480 l 480,0 L 480,448 L 416,448 z M 448,0L 32,0 L 32,352 l 416,0 L 448,0 z" />
+	<glyph unicode="&#xe273;" data-tags="calendar, schedule, date, time, day" d="M 448,416l-48,0 l0-16 c0-17.645-14.355-32-32-32s-32,14.355-32,32L 336,416 L 176,416 l0-16 c0-17.645-14.355-32-32-32s-32,14.355-32,32L 112,416 L 64,416  c-17.6,0-32-14.4-32-32l0-352 c0-17.6, 14.4-32, 32-32l 384,0 c 17.6,0, 32,14.4, 32,32L 480,384 C 480,401.6, 465.6,416, 448,416z M 448,32.058 c-0.017-0.020-0.038-0.041-0.058-0.058L 64.057,32 c-0.020,0.017-0.041,0.038-0.057,0.058L 64,320 l 384,0 L 448,32.058 zM 144,384c 8.836,0, 16,7.164, 16,16L 160,464 c0,8.836-7.164,16-16,16s-16-7.164-16-16l0-64 C 128,391.164, 135.164,384, 144,384zM 368,384c 8.836,0, 16,7.164, 16,16L 384,464 c0,8.836-7.164,16-16,16s-16-7.164-16-16l0-64 C 352,391.164, 359.164,384, 368,384zM 288,288L 128,288L 128,256L 256,256L 256,192L 128,192L 128,160L 256,160L 256,96L 128,96L 128,64L 288,64 zM 352,64L 384,64L 384,288L 320,288L 320,256L 352,256 zM 436-12L 76-12 c-17.6,0-32,10.4-32,28l0-16 c0-17.6, 14.4-32, 32-32l 360,0 c 17.6,0, 32,14.4, 32,32l0,16 C 468-1.6, 453.6-12, 436-12z" />
+
+<!-- Stats -->
+	<glyph unicode="&#x77;" data-tags="pie, statistics, stats, chart, graph" d="M 224,192L 224,416 C 100.288,416,0,315.712,0,192s 100.288-224, 224-224s 224,100.288, 224,224c0,36.017-8.514,70.042-23.618,100.191 L 224,192zM 456.382,356.191C 419.606,429.599, 343.695,480, 256,480l0-224 L 456.382,356.191z" />
+	<glyph unicode="&#x76;" data-tags="bars, statistics, stats, chart, graph" d="M0,64L 512,64L 512,0L0,0zM 64,192L 128,192L 128,96L 64,96zM 160,320L 224,320L 224,96L 160,96zM 256,224L 320,224L 320,96L 256,96zM 352,416L 416,416L 416,96L 352,96z" />
+	<glyph unicode="&#x75;" data-tags="chart, stats, statistics, dualtone, plot, graph" d="M 496,0L 384,0L 384,16L 368,16L 368,0L 208,0L 208,16L 192,16L 192,0L 80,0L 80,16L 64,16L 64,0L 32,0L 32,144L 48,144L 48,160L 32,160L 32,272L 48,272L 48,288L 32,288L 32,400L 48,400L 48,416L 32,416L 32,480L0,480L0-32L 512-32L 512,16L 496,16 zM 220,284L 212,276L 212,149.941L 220,157.941 zM 204,268L 196,260L 196,133.941L 204,141.941 zM 188,125.941L 188,258L 180,262L 180,128.833L 187.261,125.202 zM 268,332L 260,324L 260,197.941L 268,205.941 zM 236,300L 228,292L 228,165.941L 236,173.941 zM 172,266L 164,270L 164,136.833L 172,132.833 zM 252,316L 244,308L 244,181.941L 252,189.941 zM 124,290L 116,294L 116,160.833L 124,156.833 zM 92,306L 84,310L 84,176.833L 92,172.833 zM 156,274L 148,278L 148,144.833L 156,140.833 zM 108,298L 100,302L 100,168.833L 108,164.833 zM 76,314L 68,318L 68,184.833L 76,180.833 zM 284,348L 276,340L 276,213.941L 284,221.941 zM 140,282L 132,286L 132,152.833L 140,148.833 zM 412,316L 404,308L 404,137.267L 412,149.267 zM 428,332L 420,324L 420,161.267L 428,173.267 zM 444,348L 436,340L 436,185.267L 444,197.267 zM 476,380L 468,372L 468,233.267L 476,245.267 zM 460,364L 452,356L 452,209.267L 460,221.267 zM 508,412L 500,404L 500,281.267L 508,293.267 zM 492,396L 484,388L 484,257.267L 492,269.267 zM 348,312L 340,317.333L 340,162.666L 348,152 zM 332,322.667L 324,328L 324,184L 332,173.333 zM 300,344L 292,349.333L 292,226.667L 300,216 zM 316,333.333L 308,338.667L 308,205.333L 316,194.666 zM 364,301.333L 356,306.667L 356,141.333L 364,130.666 zM 396,300L 388,292L 388,113.268L 396,125.267 zM 380,290.667L 372,296L 372,119.999L 380,109.333 zM 384,64L 288,192L 192,96L 64,160L 64,32L 512,32L 512,256 z" />
+
+<!-- Extensions -->
+	<glyph unicode="&#x32;" data-tags="power cord, cord, plugin, extension" d="M 512,338.75L 466.747,384L 377.374,294.624L 326.624,345.375L 415.999,434.75L 370.749,480L 281.374,390.625L 224,448L 180.687,404.688L 436.688,148.687L 480,191.999L 422.624,249.375 zM 137.374,105.373c 82.884-82.881, 192.597-18.181, 259.646,37.732L 175.108,365.017 C 119.196,297.969, 54.494,188.256, 137.374,105.373zM 95.999,127.998L 159.996,64L 64-31.996L 0.002,32.001z" />
+	<glyph unicode="&#x33;" data-tags="cube, box, 3d, miscellaneous" d="M 256,448L 32,352L 256,256L 480,352 zM 32,64L 224-16L 224,208L 32,288 zM 288-16L 480,64L 480,288L 288,208 z" />
+	<glyph unicode="&#x34;" data-tags="puzzle, piece, app, addon, extension" d="M 479.165,351.875L 394.94,351.875 c-21.715,0.033-43.348,1.503-22.252,38.729c 21.138,37.3, 36.059,89.521-48.802,89.521 c-84.857,0-69.935-52.221-48.797-89.521c 21.096-37.226-0.538-38.694-22.255-38.729l-91.938,0 c-18.060,0-32.835-14.778-32.835-32.834 l0-102.189 c0-21.756, 5.904-43.513-31.393-22.378C 59.372,215.611,0,230.531,0,145.672c0-84.854, 59.37-69.935, 96.67-48.798 c 37.297,21.137, 31.393-0.62, 31.393-22.38l0-73.783 c0-18.062, 14.777-32.835, 32.835-32.835l 91.811,0 c 21.76,0, 43.517,8.706, 22.382,46.004 c-21.137,37.295-36.061,89.519, 48.797,89.519c 84.858,0, 69.938-52.221, 48.8-89.519c-21.135-37.299, 0.623-46.005, 22.381-46.005l 84.096,0 c 18.062,0, 32.837,14.777, 32.837,32.835L 512.002,319.042 C 512.002,337.099, 497.227,351.875, 479.165,351.875z" />
+
+<!-- Marked -->
+	<glyph unicode="&#x72;" data-tags="attachment, paperclip" d="M 348.916,316.476l-32.476,32.461L 154.035,186.566c-26.907-26.896-26.907-70.524,0-97.422 c 26.902-26.896, 70.53-26.896, 97.437,0l 194.886,194.854c 44.857,44.831, 44.857,117.531,0,162.363 c-44.833,44.852-117.556,44.852-162.391,0L 79.335,241.788l 0.017-0.016c-0.145-0.152-0.306-0.288-0.438-0.423 c-62.551-62.548-62.551-163.928,0-226.453c 62.527-62.528, 163.934-62.528, 226.494,0c 0.137,0.137, 0.258,0.284, 0.41,0.438l 0.016-0.017 l 139.666,139.646l-32.493,32.46L 273.35,47.792l-0.008,0 c-0.148-0.134-0.282-0.285-0.423-0.422 c-44.537-44.529-116.99-44.529-161.538,0c-44.531,44.521-44.531,116.961,0,161.489c 0.152,0.152, 0.302,0.291, 0.444,0.423l-0.023,0.030 l 204.64,204.583c 26.856,26.869, 70.572,26.869, 97.443,0c 26.856-26.867, 26.856-70.574,0-97.42L 218.999,121.625 c-8.968-8.961-23.527-8.961-32.486,0c-8.947,8.943-8.947,23.516,0,32.46L 348.916,316.476z" />
+	<glyph unicode="&#x74;" data-tags="lamp, idea, tip, light, bulb" d="M 256.003,480c-85.374,0-154.661-68.339-154.661-152.54c0-42.102, 25.089-86.239, 53.788-133.976 c 28.7-47.737, 6.022-100.49, 103.695-99.073c 93.617,1.376, 69.35,44.274, 96.629,92.011c 27.289,47.736, 55.205,98.938, 55.205,141.039 C 410.66,411.662, 341.371,480, 256.003,480zM 191.076,80.777l0-40.615 c 19.95-6.488, 41.896-10.088, 64.927-10.088c 23.029,0, 44.97,3.6, 64.921,10.086l0,37.525  c-11.158-10.273-29.447-13.1-62.1-13.645C 222.605,63.443, 202.953,67.848, 191.076,80.777zM 191.753,14.944c 2.507-13.705, 13.3-46.944, 64.25-46.944c 50.949,0, 61.742,33.239, 64.25,46.944 c-28.826-8.815-41.977-9.291-64.25-9.291C 233.728,5.653, 220.577,6.129, 191.753,14.944z" />
+	<glyph unicode="&#x73;" data-tags="pushpin, pin" d="M 272,480l-48-48l 48-48L 160,256L 48,256 l 88-88L0-12.308L0-32 l 19.692,0 L 200,104l 88-88L 288,128 l 128,112l 48-48l 48,48L 272,480z M 224,208l-32,32 l 112,112l 32-32L 224,208z" /> 
+	<glyph unicode="&#x63;" data-tags="location, map, marker, pin" d="M 256,480C 167.634,480, 96,408.366, 96,320c0-160, 160-352, 160-352s 160,192, 160,352C 416,408.366, 344.365,480, 256,480z M 256,224 c-53.020,0-96,42.98-96,96s 42.98,96, 96,96s 96-42.98, 96-96S 309.020,224, 256,224z" />
+	<glyph unicode="&#xe274;" data-tags="shield, security, defense, protection, anti virus" d="M 131.851,338.143c 2.709-85.392, 23.232-156.27, 61.189-211.080c 17.343-25.043, 38.449-46.778, 62.96-64.873 c 24.511,18.095, 45.618,39.83, 62.959,64.873c 37.957,54.811, 58.48,125.688, 61.189,211.080c-40.225,9.645-79.752,25.45-124.149,49.495 C 211.596,363.589, 172.078,347.788, 131.851,338.143zM 458.873,406.909C 387.436,411.877, 329.919,434.868, 256.002,480C 182.080,434.868, 124.563,411.877, 53.127,406.909 C 33.451,95.568, 202.896-3.16, 256.002-32C 309.105-3.16, 478.55,95.568, 458.873,406.909z M 358.422,99.735 c-35.469-51.219-77.048-80.031-102.421-95.026c-25.374,14.995-66.952,43.807-102.422,95.026 c-49.507,71.489-72.928,164.977-69.753,278.177c 56.394,7.775, 107.891,27.271, 172.175,64.812 c 64.281-37.541, 115.777-57.037, 172.173-64.812C 431.35,264.712, 407.929,171.225, 358.422,99.735z" />
+	<glyph unicode="&#x35;" data-tags="flag, report, mark" d="M 254.059,418.977C 205.881,476.227, 169.369,480, 96,480l0-256 c 128.267,64, 142.636-8.335, 223.506-1.023 C 399.234,230.197, 467.031,291.564, 512,352C 384.644,322.547, 320.54,339.977, 254.059,418.977zM0,480L 64,480L 64-32L0-32z" />
+	<glyph unicode="&#xe275;" data-tags="flag, report, mark" d="M 128,447.5c 19.393-0.786, 33.686-2.681, 46.365-6.903c 19.163-6.381, 35.674-19.009, 55.209-42.224 c 54.165-64.364, 108.925-91.826, 183.107-91.826c 7.729,0, 15.767,0.307, 24.147,0.925c-10.090-11.872-20.705-23.466-31.729-34.059 c-15.453-14.849-30.499-26.521-44.72-34.692c-14.99-8.612-29.547-13.609-43.263-14.851c-1.81-0.164-3.533-0.243-5.271-0.243 c-16.82,0-29.746,7.817-49.442,20.573c-22.574,14.618-50.668,32.812-91.546,32.812c-13.692,0-27.906-2.034-42.859-6.161L 127.998,447.5  M 96,480l0-256 c 30.587,15.262, 54.737,21.011, 74.859,21.011c 61.341,0, 85.367-53.384, 140.988-53.384c 2.648,0, 5.354,0.12, 8.152,0.373 c 79.729,7.221, 147.031,99.564, 192,160c-38.205-8.835-70.726-13.453-99.318-13.453c-66.72,0-112.085,25.129-158.623,80.43 C 205.881,476.227, 169.369,480, 96,480L 96,480zM0,480L 64,480L 64-32L0-32z" />
+	<glyph unicode="&#xe023;" data-tags="bookmark, ribbon" d="M 96,480L 96-32L 256,128L 416-32L 416,480 z" />
+	<glyph unicode="&#xe276;" data-tags="bookmark, ribbon" d="M 96,480l0-512 l 160,160l 160-160L 416,480 L 96,480 z M 384,45.255l-128,128l-128-128L 128,448 l 256,0 L 384,45.255 z" />
+	<glyph unicode="&#xe277;" data-tags="heart, like, love, favorite" d="M 376,448c-51.956,0-97.1-29.138-120-71.96C 233.099,418.862, 187.955,448, 136,448C 60.889,448,0,387.11,0,312c0-184, 256-312, 256-312 s 256,128, 256,312C 512,387.11, 451.111,448, 376,448z" />
+	<glyph unicode="&#xe278;" data-tags="heart, like, love, favorite" d="M 256,0l-13.97,6.779C 232.147,11.574,0,126.229,0,300.513C0,381.838, 67.738,448, 151,448c 39.83,0, 77.258-15.237, 105-41.462 C 283.742,432.763, 321.17,448, 361,448c 83.262,0, 151-66.162, 151-147.487c0-174.284-232.147-288.938-242.030-293.733L 256,0z M 151,384 c-47.972,0-87-37.452-87-83.487c0-67.976, 54.123-127.616, 99.526-165.68c 36.25-30.39, 73.062-52.351, 92.474-63.081 c 19.412,10.73, 56.224,32.691, 92.474,63.081C 393.877,172.896, 448,232.537, 448,300.513C 448,346.548, 408.972,384, 361,384 c-32.336,0-61.831-17.070-76.974-44.55L 256,288.59l-28.026,50.86C 212.831,366.93, 183.336,384, 151,384z" />
+
+<!-- Rating -->
+	<glyph unicode="&#x5b;" data-tags="thumbs-up, up, like, rate, vote up" d="M 464,192 C 500.5,192 480,96 448,96 C 464,96 448,16 416,16 C 416-16 384-32 352-32 C 216.824-32 264.368,1.825 128,16 L 128,272 C 248.461,308.134 368,398.712 368,480 C 394.5,480 464,448 368,288 C 368,288 448,288 464,288 C 512,288 496,192 464,192 ZM 96,272 L 96,16 L 128,16 L 128,0 L 64,0 C 46.4,0 32,21.6 32,48 L 32,240 C 32,266.4 46.4,288 64,288 L 128,288 L 128,272 L 96,272 Z" />
+	<glyph unicode="&#x5c;" data-tags="thumbs-up, up, like, rate, vote down" d="M 48,256 C 11.5,256 32,352 64,352 C 48,352 64,432 96,432 C 96,464 128,480 160,480 C 295.176,480 247.632,446.175 384,432 L 384,176 C 263.539,139.866 144,49.288 144-32 C 117.5-32 48,0 144,160 C 144,160 64,160 48,160 C 0,160 16,256 48,256 ZM 416,176 L 416,432 L 384,432 L 384,448 L 448,448 C 465.6,448 480,426.4 480,400 L 480,208 C 480,181.6 465.6,160 448,160 L 384,160 L 384,176 L 416,176 Z" />
+	<glyph unicode="&#x40;" data-tags="star, rate, favorite, bookmark" d="M 512,281.475l-176.89,25.704L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z M 256,103.251l-111.731-58.74l 21.338,124.415l-90.393,88.111l 124.92,18.152L 256,388.387l 55.868-113.198 l 124.918-18.152l-90.394-88.111l 21.339-124.415L 256,103.251z" />
+	<glyph unicode="&#x41;" data-tags="star, rate, half" d="M 512,281.475l-176.89,25.704L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z M 256,103.251l-0.471-0.248L 256,388.387l 55.868-113.198l 124.918-18.152l-90.394-88.111l 21.339-124.415 L 256,103.251z" />
+	<glyph unicode="&#x42;" data-tags="star, rate, favorite, bookmark" d="M 512,281.475L 335.11,307.179L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z" />
+	<glyph unicode="&#xe279;" data-tags="smiley, emoticon, face" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 352,352 c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 334.327,352, 352,352z M 160,352c 17.673,0, 32-14.327, 32-32 s-14.327-32-32-32s-32,14.327-32,32S 142.327,352, 160,352z M 256,64c-58.255,0-109.232,31.137-137.213,77.672l 41.164,24.698 C 179.538,133.796, 215.222,112, 256,112s 76.462,21.796, 96.049,54.37l 41.164-24.698C 365.232,95.137, 314.255,64, 256,64z" />
+	<glyph unicode="&#xe280;" data-tags="smiley, emoticon, face" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320 C 128,337.673 142.327,352 160,352 C 177.673,352 192,337.673 192,320 C 192,302.327 177.673,288 160,288 C 142.327,288 128,302.327 128,320 Z M 320,320 C 320,337.673 334.327,352 352,352 C 369.673,352 384,337.673 384,320 C 384,302.327 369.673,288 352,288 C 334.327,288 320,302.327 320,320 ZM 352.049,166.37 L 393.213,141.672 C 365.232,95.137 314.255,64 256,64 C 197.745,64 146.768,95.137 118.787,141.672 L 159.951,166.37 C 179.538,133.796 215.222,112 256,112 C 296.778,112 332.462,133.796 352.049,166.37 Z" />
+	<glyph unicode="&#xe281;" data-tags="sad, emoticon, smiley, face" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 352,352 c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 334.327,352, 352,352z M 160,352c 17.673,0, 32-14.327, 32-32 s-14.327-32-32-32s-32,14.327-32,32S 142.327,352, 160,352z M 352.049,89.63C 332.462,122.204, 296.777,144, 256,144 c-40.778,0-76.462-21.796-96.049-54.37l-41.164,24.698C 146.767,160.863, 197.745,192, 256,192c 58.254,0, 109.232-31.137, 137.213-77.672 L 352.049,89.63z" />
+	<glyph unicode="&#xe282;" data-tags="sad, emoticon, smiley, face" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320 C 128,337.673 142.327,352 160,352 C 177.673,352 192,337.673 192,320 C 192,302.327 177.673,288 160,288 C 142.327,288 128,302.327 128,320 Z M 320,320 C 320,337.673 334.327,352 352,352 C 369.673,352 384,337.673 384,320 C 384,302.327 369.673,288 352,288 C 334.327,288 320,302.327 320,320 ZM 159.951,89.63 L 118.787,114.328 C 146.768,160.863 197.745,192 256,192 C 314.254,192 365.231,160.863 393.213,114.328 L 352.049,89.63 C 332.462,122.204 296.778,144 256,144 C 215.221,144 179.538,122.204 159.951,89.63 Z" />
+	<glyph unicode="&#xe283;" data-tags="neutral, emoticon, smiley, face" d="M 256,480C 114.615,480,0,365.385,0,224s 114.613-256, 256-256c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480z M 320,96L 192,96 l0,32 l 128,0 L 320,96 z M 352,352c 17.673,0, 32-14.327, 32-32c0-17.673-14.327-32-32-32s-32,14.327-32,32C 320,337.673, 334.327,352, 352,352z M 160,352 c 17.673,0, 32-14.327, 32-32c0-17.673-14.327-32-32-32s-32,14.327-32,32C 128,337.673, 142.327,352, 160,352z" />
+	<glyph unicode="&#xe284;" data-tags="neutral, emoticon, smiley, face" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320c0-17.673, 14.327-32, 32-32s 32,14.327, 32,32s-14.327,32-32,32S 128,337.673, 128,320z M 320,320 c0-17.673, 14.327-32, 32-32s 32,14.327, 32,32s-14.327,32-32,32S 320,337.673, 320,320z M 192,128l 128,0 l0-32 L 192,96 L 192,128 z" />
+
+<!-- Cart -->
+	<glyph unicode="&#xe019;" data-tags="cart, ecommerce, shopping, products, purchase, buy, store" d="M 64,16A48,48 10980 1 0 160,16A48,48 10980 1 0 64,16zM 384,16A48,48 10980 1 0 480,16A48,48 10980 1 0 384,16zM 480,224L 480,416 L 64,416 C 64,451.346, 35.347,480,0,480l0-32 c 17.645,0, 32-14.355, 32-32l 24.037-206.027C 41.39,198.244, 32,180.223, 32,160 c0-35.347, 28.654-64, 64-64l 384,0 l0,32 L 96,128 c-17.673,0-32,14.327-32,32c0,0.11, 0.007,0.218, 0.008,0.328L 480,224z" />
+	<glyph unicode="&#xe01a;" data-tags="basket, cart, ecommerce, shopping, products, purchase, buy, store" d="M 406.494,288L 317.573,403.765C 319.134,407.535, 320,411.666, 320,416c0,17.673-14.326,32-32,32c-17.673,0-32-14.327-32-32 s 14.327-32, 32-32c 1.421,0, 2.816,0.102, 4.188,0.282L 366.144,288L 145.857,288 l 73.956,96.282C 221.184,384.102, 222.58,384, 224,384 c 17.673,0, 32,14.327, 32,32s-14.327,32-32,32s-32-14.327-32-32c0-4.334, 0.866-8.465, 2.427-12.234L 105.506,288L0,288 l0-64 l 32,0 l 32-256l 384,0 l 32,256l 32,0 l0,64 L 406.494,288 z M 160,32L 96,32 l0,64 l 64,0 L 160,32 z M 160,160L 96,160 l0,64 l 64,0 L 160,160 z M 288,32l-64,0 l0,64 l 64,0 L 288,32 z M 288,160l-64,0 l0,64 l 64,0 L 288,160 z M 416,32l-64,0 l0,64 l 64,0 L 416,32 z M 416,160l-64,0 l0,64 l 64,0 L 416,160 z" />
+
+<!-- Creditcard -->
+	<glyph unicode="&#xe286;" data-tags="credit, card, purchase, payment, ecommerce" d="M 464,416L 48,416 C 21.6,416,0,394.4,0,368l0-288 c0-26.4, 21.6-48, 48-48l 416,0 c 26.4,0, 48,21.6, 48,48L 512,368 C 512,394.4, 490.4,416, 464,416z M 48,384 l 416,0 c 8.673,0, 16-7.327, 16-16l0-48 L 32,320 l0,48 C 32,376.673, 39.327,384, 48,384z M 464,64L 48,64 c-8.673,0-16,7.327-16,16L 32,224 l 448,0 l0-144  C 480,71.327, 472.673,64, 464,64zM 64,160L 96,160L 96,96L 64,96zM 128,160L 160,160L 160,96L 128,96zM 192,160L 224,160L 224,96L 192,96z" />
+	<glyph unicode="&#xe287;" data-tags="credit, card, purchase, payment, ecommerce" d="M 464,416L 48,416 C 21.6,416,0,394.4,0,368l0-288 c0-26.4, 21.6-48, 48-48l 416,0 c 26.4,0, 48,21.6, 48,48L 512,368 C 512,394.4, 490.4,416, 464,416z M 96,96 L 64,96 l0,64 l 32,0 L 96,96 z M 160,96l-32,0 l0,64 l 32,0 L 160,96 z M 224,96l-32,0 l0,64 l 32,0 L 224,96 z M 496,224L 16,224 l0,96 l 480,0 L 496,224 z" />
+
+	<glyph unicode="&#x20;" horiz-adv-x="256" />
+
+</font></defs></svg>
diff --git a/core/media/jui/fonts/IcoMoon.dev.svg b/core/media/jui/fonts/IcoMoon.dev.svg
new file mode 100644
index 00000000..10e73ee6
--- /dev/null
+++ b/core/media/jui/fonts/IcoMoon.dev.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG font generated by IcoMoon.
+<iconset grid="16"></iconset>
+</metadata>
+<defs>
+<font id="IcoMoon" horiz-adv-x="512" >
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
+<glyph unicode="&#xe200;" d="M 133.002,341.661c 16.416,16.422, 43.001,16.422, 59.402,0.016l 3.913-3.934l 50.552,50.578l-3.937,3.94 c-28.812,28.85-69.257,38.939-106.21,30.261C 131.425,455.113, 103.178,479.984, 69.135,480C 31.31,480, 0.658,449.279, 0.65,411.421 c0-32.668, 22.795-60, 53.331-66.915c-11.569-38.725-2.121-82.417, 28.423-112.992l 113.913-113.95l 50.498,50.607L 132.91,282.114 C 116.569,298.475, 116.539,325.177, 133.002,341.661zM 511.356,411.421C 511.364,449.302, 480.697,480, 442.864,480c-34.617,0-63.239-25.722-67.841-59.119 c-38.537,11.332-81.892,1.748-112.32-28.704l-113.92-113.95l 50.551-50.586l 113.883,113.928c 16.47,16.483, 42.994,16.453, 59.342,0.092 c 16.4-16.415, 16.4-43.057-0.016-59.478l-3.897-3.918l 50.505-50.624l 3.929,3.964c 30.229,30.283, 39.839,73.378, 28.806,111.819 C 485.461,347.841, 511.356,376.606, 511.356,411.421zM 453.133,104.468c 9.051,37.229-0.988,78.162-30.054,107.25L 309.334,325.714l-50.551-50.561l 113.76-114.006 c 16.47-16.498, 16.432-43.048, 0.092-59.424c-16.401-16.407-43.002-16.407-59.418,0.015l-3.883,3.895l-50.497-50.623l 3.866-3.864 c 30.758-30.797, 74.809-40.219, 113.684-28.244C 382.703-8.439, 410.354-32, 443.516-32C 481.318-32, 512-1.325, 512,36.563 C 512,71.163, 486.41,99.791, 453.133,104.468zM 306.172,215.658L 192.404,101.662c-16.355-16.384-43.017-16.414-59.472,0.062c-16.409,16.452-16.416,43.049-0.022,59.485 l 3.904,3.887l-50.543,50.562l-3.867-3.856c-29.38-29.401-39.28-70.917-29.725-108.491C 22.48,96.181,0,68.994,0,36.563 C-0.008-1.31, 30.666-32, 68.491-32c 32.55,0.016, 59.794,22.709, 66.77,53.191c 37.351-9.276, 78.499,0.652, 107.672,29.878 l 113.745,113.98L 306.172,215.658z" data-tags="joomla, cms" />
+<glyph unicode="&#xe005;" d="M0,160L 96,64L 256,224L 416,64L 512,160L 256.001,416 z" data-tags="arrow-up, upload, top" />
+<glyph unicode="&#xe006;" d="M 192,480L 96,384L 256,224L 96,64L 192-32L 448,224 z" data-tags="arrow-right, right, next" />
+<glyph unicode="&#xe007;" d="M 512,288L 416,384L 256,224L 96,384L0,288L 256,32.001 z" data-tags="arrow-down, download, bottom" />
+<glyph unicode="&#xe008;" d="M 320-32L 416,64L 256,224L 416,384L 320,480L 64,224 z" data-tags="arrow-left, previous, left" />
+<glyph unicode="&#xe003;" d="M 416,384L 320,480L 64,224L 320-32L 416,64L 256,224 zM0,480L0-32L 64-32L 64,224L 64,480 z" data-tags="arrow-first, first, left" />
+<glyph unicode="&#xe004;" d="M 96,64L 192-32L 448,224L 192,480L 96,384L 256,224 zM 512-32L 512,480L 448,480L 448,224L 448-32 z" data-tags="arrow-last, last, right" />
+<glyph unicode="&#xe009;" d="M 512,224C 512,82.615, 397.385-32, 256-32s -256,114.615, -256,256s 114.615,256, 256,256S 512,365.385, 512,224z M 48,224 c 0-114.875 93.125-208 208-208S 464,109.125, 464,224s -93.125,208, -208,208S 48,338.875, 48,224zM 278.627,374.628l 128-128.001c 12.497-12.496 12.497-32.757 0-45.254c -12.497-12.497 -32.758-12.497,-45.255,0L 288,274.745 L 288,96 c 0-17.673 -14.327-32 -32-32c-17.673,0, -32,14.327, -32,32l0,178.745 l -73.372-73.373c -12.497-12.497 -32.759-12.497,-45.256,0 C 99.124,207.621, 96,215.811, 96,224s 3.124,16.379, 9.372,22.627l 128,128.001C 245.869,387.124, 266.131,387.124, 278.627,374.628z" data-tags="arrow-up, upload, top" />
+<glyph unicode="&#xe00a;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 406.628,246.627l-128.001,128c-12.496,12.497-32.757,12.497-45.254,0c-12.497-12.497-12.497-32.758,0-45.255L 306.745,256 L 128,256 c-17.673,0-32-14.327-32-32c0-17.673, 14.327-32, 32-32l 178.745,0 l-73.373-73.372c-12.497-12.497-12.497-32.759,0-45.256 C 239.621,67.124, 247.811,64, 256,64s 16.379,3.124, 22.627,9.372l 128.001,128C 419.124,213.869, 419.124,234.131, 406.628,246.627z" data-tags="arrow-right, right, next" />
+<glyph unicode="&#xe00b;" d="M 512,224C 512,365.385, 397.385,480, 256,480s -256-114.615, -256-256s 114.615-256, 256-256S 512,82.615, 512,224z M 48,224 c 0,114.875 93.125,208 208,208S 464,338.875, 464,224s -93.125-208, -208-208S 48,109.125, 48,224zM 278.627,73.372l 128,128.001c 12.497,12.496 12.497,32.757 0,45.254c -12.497,12.497 -32.758,12.497,-45.255,0L 288,173.255 L 288,352 c 0,17.673 -14.327,32 -32,32c-17.673,0, -32-14.327, -32-32l0-178.745 l -73.372,73.373c -12.497,12.497 -32.759,12.497,-45.256,0 C 99.124,240.379, 96,232.189, 96,224s 3.124-16.379, 9.372-22.627l 128-128.001C 245.869,60.876, 266.131,60.876, 278.627,73.372z" data-tags="arrow-down, download, bottom" />
+<glyph unicode="&#xe00c;" d="M 256,480C 397.385,480, 512,365.385, 512,224s -114.615-256, -256-256s -256,114.615, -256,256S 114.615,480, 256,480z M 256,16 c 114.875,0 208,93.125 208,208S 370.875,432, 256,432s -208-93.125, -208-208S 141.125,16, 256,16zM 105.372,246.627l 128.001,128c 12.496,12.497 32.757,12.497 45.254,0c 12.497-12.497 12.497-32.758,0-45.255L 205.255,256 L 384,256 c 17.673,0 32-14.327 32-32c0-17.673, -14.327-32, -32-32l-178.745,0 l 73.373-73.372c 12.497-12.497 12.497-32.759,0-45.256 C 272.379,67.124, 264.189,64, 256,64s -16.379,3.124, -22.627,9.372l -128.001,128C 92.876,213.869, 92.876,234.131, 105.372,246.627z" data-tags="arrow-left, left, previous" />
+<glyph unicode="&#xe00f;" d="M 384,160L 256,288L 128,160 z" data-tags="arrow-up, upload, top" />
+<glyph unicode="&#xe010;" d="M 192.001,96L 320.001,224L 192.001,352 z" data-tags="arrow-right, right, next" />
+<glyph unicode="&#xe011;" d="M 128,288L 256,160L 384,288 z" data-tags="arrow-down, download, bottom" />
+<glyph unicode="&#xe012;" d="M 320.001,352L 192.001,224L 320.001,95.999 z" data-tags="arrow-left, left, previous" />
+<glyph unicode="&#xe00e;" d="M 384,256L 256,384L 128,256 zM 128,160L 256,32L 384,160 z" data-tags="menu, arrow, options, select" />
+<glyph unicode="&#xe201;" d="M 160,0L 352,0L 352-32L 160-32zM 160,64L 352,64L 352,32L 160,32zM 160,128L 352,128L 352,96L 160,96zM 256,480L 480,256L 352,256L 352,160L 160,160L 160,256L 32,256 z" data-tags="arrow-up, upload, top" />
+<glyph unicode="&#xe202;" d="M0,320L 32,320L 32,128L0,128zM 64,320L 96,320L 96,128L 64,128zM 128,320L 160,320L 160,128L 128,128zM 512,224L 288,448L 288,320L 192,320L 192,128L 288,128L 288,0 z" data-tags="arrow-right, right, next" />
+<glyph unicode="&#xe203;" d="M 160,480L 352,480L 352,448L 160,448zM 160,416L 352,416L 352,384L 160,384zM 160,352L 352,352L 352,320L 160,320zM 256-32L 480,192L 352,192L 352,288L 160,288L 160,192L 32,192 z" data-tags="arrow-down, download, bottom" />
+<glyph unicode="&#xe204;" d="M 480,320L 512,320L 512,128L 480,128zM 416,320L 448,320L 448,128L 416,128zM 352,320L 384,320L 384,128L 352,128zM0,224L 224,448L 224,320L 320,320L 320,128L 224,128L 224,0 z" data-tags="arrow-left, left, previous" />
+<glyph unicode="&#x27;" d="M 288,355.814L 288,480 l 192-192L 288,96L 288,222.912 C 64.625,228.153, 74.206,71.016, 131.070-32 C-9.286,119.707, 20.52,362.785, 288,355.814z" data-tags="redo, arrow, right" />
+<glyph unicode="&#x28;" d="M 380.931-32C 437.794,71.016, 447.375,228.153, 224,222.912L 224,96 L 32,288L 224,480l0-124.186 C 491.481,362.785, 521.285,119.707, 380.931-32z" data-tags="undo, arrow, left" />
+<glyph unicode="&#xe205;" d="M 131.070,480C 74.206,376.984, 64.625,219.848, 288,225.088L 288,352 l 192-192L 288-32L 288,92.186 C 20.52,85.215-9.286,328.293, 131.070,480z" data-tags="forward, arrow, right" />
+<glyph unicode="&#xe206;" d="M 224,92.186L 224-32 L 32,160l 192,192l0-126.912 C 447.375,219.848, 437.794,376.984, 380.931,480 C 521.286,328.293, 491.481,85.215, 224,92.186z" data-tags="reply, arrow, left" />
+<glyph unicode="&#x6c;" d="M0,192c0-76.462, 33.524-145.092, 86.675-192l 42.333,48C 89.145,83.182, 64,134.652, 64,192c0,106.038, 85.965,192, 192,192 c 53.021,0, 101.019-21.493, 135.765-56.239L 320,256l 192,0 L 512,448 l-74.985-74.989C 390.688,419.34, 326.693,448, 256,448 C 114.615,448,0,333.385,0,192z" data-tags="redo, arrow, right" />
+<glyph unicode="&#xe207;" d="M 256,448c-70.692,0-134.688-28.66-181.016-74.989L0,448l0-192 l 192,0 l-71.766,71.761C 154.982,362.507, 202.98,384, 256,384 c 106.034,0, 192-85.962, 192-192c0-57.348-25.146-108.818-65.009-144l 42.333-48C 478.475,46.908, 512,115.538, 512,192 C 512,333.385, 397.385,448, 256,448z" data-tags="undo, arrow, left" />
+<glyph unicode="&#x7a;" d="M 512,224L 384,320L 384,256L 288,256L 288,352L 352,352L 256,480L 160,352L 224,352L 224,256L 128,256L 128,320L0,224L 128,128L 128,192L 224,192L 224,96L 160,96L 256-32L 352,96L 288,96L 288,192L 384,192L 384,128 z" data-tags="move, drag, arrows" />
+<glyph unicode="&#x66;" d="M 512,480 L 512,272 L 432,352 L 336,256 L 288,304 L 384,400 L 304,480 ZM 224,144 L 128,48 L 208-32 L 0-32 L 0,176 L 80,96 L 176,192 Z" data-tags="expand, enlarge, maximize, fullscreen" />
+<glyph unicode="&#x67;" d="M 224,192 L 224-16 L 144,64 L 48-32 L 0,16 L 96,112 L 16,192 ZM 512,432 L 416,336 L 496,256 L 288,256 L 288,464 L 368,384 L 464,480 Z" data-tags="contract, minimize, shrink, collapse" />
+<glyph unicode="&#x68;" d="M 512,480 L 512,288 L 442.87,357.13 L 336.87,251.13 L 283.13,304.87 L 389.13,410.87 L 320,480 ZM 122.87,410.87 L 228.87,304.87 L 175.13,251.13 L 69.13,357.13 L 0,288 L 0,480 L 192,480 ZM 442.87,90.87 L 512,160 L 512-32 L 320-32 L 389.13,37.13 L 283.13,143.13 L 336.87,196.87 ZM 228.87,143.13 L 122.87,37.13 L 192-32 L 0-32 L 0,160 L 69.13,90.87 L 175.13,196.87 Z" data-tags="expand, enlarge, maximize, fullscreen" />
+<glyph unicode="&#x69;" d="M 32,192 L 224,192 L 224,0 L 154.87,69.13 L 53.87-31.87 L 0.13,21.87 L 101.13,122.87 ZM 410.87,122.87 L 511.87,21.87 L 458.13-31.87 L 357.13,69.13 L 288,0 L 288,192 L 480,192 ZM 480,256 L 288,256 L 288,448 L 357.13,378.87 L 458.13,479.87 L 511.87,426.13 L 410.87,325.13 ZM 154.87,378.87 L 224,448 L 224,256 L 32,256 L 101.13,325.13 L 0.13,426.13 L 53.87,479.87 Z" data-tags="contract, minimize, shrink, collapse" />
+<glyph unicode="&#xe208;" d="M 96,416L 416,224L 96,32 z" data-tags="play, media control, audio" />
+<glyph unicode="&#xe209;" d="M 64,416L 224,416L 224,32L 64,32zM 288,416L 448,416L 448,32L 288,32z" data-tags="pause, media control, audio" />
+<glyph unicode="&#xe210;" d="M 64,416L 448,416L 448,32L 64,32z" data-tags="stop, media control, audio, square" />
+<glyph unicode="&#x7c;" d="M 288,400 L 288,240 L 448,400 L 448,48 L 288,208 L 288,48 L 112,224 Z" data-tags="backward, media control, audio" />
+<glyph unicode="&#x7b;" d="M 256,48 L 256,208 L 96,48 L 96,400 L 256,240 L 256,400 L 432,224 Z" data-tags="forward, media control, audio" />
+<glyph unicode="&#x7d;" d="M 64,32 L 64,416 L 128,416 L 128,240 L 288,400 L 288,240 L 448,400 L 448,48 L 288,208 L 288,48 L 128,208 L 128,32 Z" data-tags="first, media control, audio" />
+<glyph unicode="&#xe000;" d="M 448,416 L 448,32 L 384,32 L 384,208 L 224,48 L 224,208 L 64,48 L 64,400 L 224,240 L 224,400 L 384,240 L 384,416 Z" data-tags="last, media control, audio" />
+<glyph unicode="&#xe00d;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 192,336L 384,224L 192,112 z" data-tags="play, media control, audio" />
+<glyph unicode="&#xe211;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,320L 224,320L 224,128L 160,128zM 288,320L 352,320L 352,128L 288,128z" data-tags="pause, media control, audio" />
+<glyph unicode="&#xe212;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,320L 352,320L 352,128L 160,128z" data-tags="stop, media control, audio" />
+<glyph unicode="&#xe213;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 352,144L 240,224L 352,304 zM 224,144L 112,224L 224,304 z" data-tags="backward, media control, audio" />
+<glyph unicode="&#xe214;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,304L 272,224L 160,144 zM 288,304L 400,224L 288,144 z" data-tags="forward, media control, audio" />
+<glyph unicode="&#xe001;" d="M 437.011,405.010C 390.685,451.338, 326.693,480, 256,480C 146.256,480, 52.655,410.936, 16.251,313.906l 59.938-22.477 C 103.491,364.202, 173.692,416, 256,416c 53.020,0, 101.010-21.5, 135.753-56.247L 320,288l 192,0 L 512,480 L 437.011,405.010zM 256,32c-53.020,0-101.013,21.496-135.756,56.244L 192,160L0,160 l0-192 l 74.997,74.997C 121.32-3.334, 185.306-32, 256-32 c 109.745,0, 203.346,69.064, 239.75,166.094l-59.938,22.477C 408.51,83.798, 338.309,32, 256,32z" data-tags="loop, repeat, reload, refresh, update, upgrade, synchronize, media control, arrows" />
+<glyph unicode="&#xe002;" d="M 512,352L 384,480l0-96 c-65.386,0-115.376-15.604-152.825-47.704c-2.625-2.25-5.142-4.55-7.581-6.887 c 13.76-19.082, 24.358-38.758, 33.886-57.545C 281.641,301.065, 316.507,320, 384,320l0-96 l0,0 l0-96 c-108.223,0-132.563,48.68-163.378,110.311 c-17.153,34.306-34.89,69.78-67.796,97.985C 115.376,368.396, 65.386,384,0,384l0-64 c 108.223,0, 132.563-48.68, 163.378-110.311 c 17.153-34.306, 34.89-69.78, 67.796-97.985C 268.624,79.604, 318.615,64, 384,64l0-96 l 128,128L 384,224L 512,352zM0,128l0-64 c 65.386,0, 115.375,15.604, 152.825,47.704c 2.625,2.249, 5.142,4.55, 7.581,6.888 c-13.76,19.081-24.359,38.758-33.886,57.545C 102.36,146.936, 67.494,128,0,128z" data-tags="shuffle, media control, random" />
+<glyph unicode="&#x53;" d="M 496.131,44.302L 374.855,147.449c-12.537,11.283-25.945,16.463-36.776,15.963C 366.707,196.946, 384,240.451, 384,288 C 384,394.039, 298.039,480, 192,480C 85.962,480,0,394.039,0,288c0-106.039, 85.961-192, 192-192c 47.549,0, 91.054,17.293, 124.588,45.922 c-0.5-10.831, 4.68-24.239, 15.963-36.776l 103.147-121.276c 17.661-19.623, 46.511-21.277, 64.11-3.678S 515.754,26.641, 496.131,44.302z M 192,160c-70.692,0-128,57.308-128,128S 121.308,416, 192,416s 128-57.308, 128-128S 262.693,160, 192,160z" data-tags="search, magnifier, lookup, find" />
+<glyph unicode="&#x64;" d="M 192,384L 160,384L 160,320L 96,320L 96,288L 160,288L 160,224L 192,224L 192,288L 256,288L 256,320L 192,320 zM 318.771,201.076C 339.674,230.021, 352,265.568, 352,304C 352,401.202, 273.202,480, 176,480S0,401.202,0,304s 78.798-176, 176-176 c 38.432,0, 73.979,12.326, 102.924,33.229L 448-32l 64,64L 318.771,201.076z M 176,176c-70.692,0-128,57.308-128,128S 105.308,432, 176,432 s 128-57.308, 128-128S 246.693,176, 176,176z" data-tags="zoom in, enlarge, scale" />
+<glyph unicode="&#x65;" d="M 96,320L 256,320L 256,288L 96,288zM 318.771,201.076C 339.674,230.021, 352,265.568, 352,304C 352,401.202, 273.202,480, 176,480S0,401.202,0,304s 78.798-176, 176-176 c 38.432,0, 73.979,12.326, 102.924,33.229L 448-32l 64,64L 318.771,201.076z M 176,176c-70.692,0-128,57.308-128,128S 105.308,432, 176,432 s 128-57.308, 128-128S 246.693,176, 176,176z" data-tags="zoom out, smaller, scale, reduce" />
+<glyph unicode="&#x2b;" d="M 424,312 L 208,96 L 128,96 L 128,176 L 344,392 ZM 451,339 L 371,419 L 399.029,447.029 C 408.363,456.363 423.636,456.363 432.97,447.029 L 479.029,400.97 C 488.363,391.636 488.363,376.363 479.029,367.029 L 451,339 ZM 384,198.209L 384,32 L 64,32 L 64,352 l 176,0 l 64,64L 48,416 C 21.6,416,0,394.4,0,368l0-352 c0-26.4, 21.6-48, 48-48l 352,0 c 26.4,0, 48,21.6, 48,48L 448,255.681 L 384,198.209z" data-tags="pencil, write, edit, blog, note" />
+<glyph unicode="&#x2c;" d="M 432,480 C 476.182,480 512,444.183 512,400 C 512,381.99 506.045,365.371 496,352 L 464,320 L 352,432 L 384,464 C 397.371,474.045 413.989,480 432,480 ZM 32,112L0-32l 144,32l 296,296L 328,408L 32,112z M 357.789,298.211l-224-224l-27.578,27.578l 224,224L 357.789,298.211z" data-tags="pencil, write, edit, blog, note" />
+<glyph unicode="&#x3b;" d="M 160.061,160C 96.036,160, 117.88,46.86,0,21.363c 32.011-21.324, 125.898-39.027, 192.072,10.668 C 249.298,75.006, 224.085,160, 160.061,160zM 505.965,441.965c-32.009,32.007-110.472-72.027-171.617-107.603c-60.98-37.464-144.033-112.027-96.021-160.037 c 48.010-48.013, 122.571,35.040, 160.036,96.022C 433.938,331.495, 537.973,409.958, 505.965,441.965z" data-tags="brush, art, paint" />
+<glyph unicode="&#x5d;" d="M 496,288L 320,288 L 320,464 c0,8.836-7.164,16-16,16l-96,0 c-8.836,0-16-7.164-16-16l0-176 L 16,288 c-8.836,0-16-7.164-16-16l0-96 c0-8.836, 7.164-16, 16-16l 176,0 l0-176 c0-8.836, 7.164-16, 16-16l 96,0 c 8.836,0, 16,7.164, 16,16L 320,160 l 176,0 c 8.836,0, 16,7.164, 16,16l0,96 C 512,280.836, 504.836,288, 496,288z" data-tags="plus, add, sum" />
+<glyph unicode="&#x5e;" d="M0,272l0-96 c0-8.836, 7.164-16, 16-16l 480,0 c 8.836,0, 16,7.164, 16,16l0,96 c0,8.836-7.164,16-16,16L 16,288 C 7.164,288,0,280.836,0,272z" data-tags="minus, minimize, subtract" />
+<glyph unicode="&#x49;" d="M 507.331,68.67c-0.002,0.002-0.004,0.004-0.006,0.005L 352.003,224l 155.322,155.325c 0.002,0.002, 0.004,0.003, 0.006,0.005 c 1.672,1.673, 2.881,3.627, 3.656,5.708c 2.123,5.688, 0.912,12.341-3.662,16.915L 433.952,475.326c-4.574,4.573-11.225,5.783-16.914,3.66 c-2.080-0.775-4.035-1.984-5.709-3.655c0-0.002-0.002-0.003-0.004-0.005L 256.001,320L 100.677,475.325 c-0.002,0.002-0.003,0.003-0.005,0.005c-1.673,1.671-3.627,2.88-5.707,3.655c-5.69,2.124-12.341,0.913-16.915-3.66L 4.676,401.951 c-4.574-4.574-5.784-11.226-3.661-16.914c 0.776-2.080, 1.985-4.036, 3.656-5.708c 0.002-0.001, 0.003-0.003, 0.005-0.005L 160.001,224 L 4.676,68.674c-0.001-0.002-0.003-0.003-0.004-0.005c-1.671-1.673-2.88-3.627-3.657-5.707c-2.124-5.688-0.913-12.341, 3.661-16.915 l 73.374-73.373c 4.575-4.574, 11.226-5.784, 16.915-3.661c 2.080,0.776, 4.035,1.985, 5.708,3.656c 0.001,0.002, 0.003,0.003, 0.005,0.005 l 155.324,155.325l 155.324-155.325c 0.002-0.001, 0.004-0.003, 0.006-0.004c 1.674-1.672, 3.627-2.881, 5.707-3.657 c 5.689-2.123, 12.342-0.913, 16.914,3.661l 73.373,73.374c 4.574,4.574, 5.785,11.227, 3.662,16.915 C 510.212,65.043, 509.003,66.997, 507.331,68.67z" data-tags="close, cancel, quit, remove, cross" />
+<glyph unicode="&#x47;" d="M 432,416L 192,176L 80,288L0,208L 192,16L 512,336 z" data-tags="checkmark, tick, correct, accept, ok" />
+<glyph unicode="&#x2a;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 288,192l0-128 l-64,0 L 224,192 L 96,192 l0,64 l 128,0 L 224,384 l 64,0 l0-128 l 128,0 l0-64 L 288,192 z" data-tags="plus-circle, plus, add, sum" />
+<glyph unicode="&#xe215;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 384,192 L 288,192 L 288,96 L 224,96 L 224,192 L 128,192 L 128,256 L 224,256 L 224,352 L 288,352 L 288,256 L 384,256 Z" data-tags="plus-circle, plus, add, sum" />
+<glyph unicode="&#x4b;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 416,192L 96,192 l0,64 l 320,0 L 416,192 z" data-tags="minus-circle, minus, remove, delete, subtract" />
+<glyph unicode="&#xe216;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 128,256L 384,256L 384,192L 128,192z" data-tags="minus-circle, minus, remove, delete, subtract" />
+<glyph unicode="&#x4a;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 384,306.745L 301.256,224 L 384,141.256L 384,96 l-45.256,0 L 256,178.744L 173.255,96L 128,96 l0,45.256 L 210.745,224L 128,306.745L 128,352 l 45.255,0 L 256,269.255L 338.744,352L 384,352 L 384,306.745 z" data-tags="cancel-circle, close, remove, delete" />
+<glyph unicode="&#xe217;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 352,173.256 L 352,128 L 306.744,128 L 256,178.744 L 205.255,128 L 160,128 L 160,173.256 L 210.745,224 L 160,274.745 L 160,320 L 205.255,320 L 256,269.255 L 306.744,320 L 352,320 L 352,274.745 L 301.256,224 Z" data-tags="cancel-circle, close, remove, delete" />
+<glyph unicode="&#xe218;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 208,64L 102,202l 47,49l 59-75 l 185,151l 23-23L 208,64z" data-tags="checkmark-circle, tick, correct" />
+<glyph unicode="&#xe219;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 208,64L 102,202L 149,251L 208,176L 393,327L 416,304 z" data-tags="checkmark-circle, tick, correct" />
+<glyph unicode="&#xe220;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 224,384l 64,0 l0-64 l-64,0 L 224,384 z M 320,64L 192,64 l0,32 l 32,0 L 224,224 l-32,0 l0,32 l 96,0 l0-160 l 32,0 L 320,64 z" data-tags="info, information" />
+<glyph unicode="&#xe221;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 224,352L 288,352L 288,288L 224,288zM 320,96L 192,96L 192,128L 224,128L 224,224L 192,224L 192,256L 288,256L 288,128L 320,128 z" data-tags="info, information" />
+<glyph unicode="&#x45;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.613-256, 256-256c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480z M 288,64l-64,0 l0,64 l 64,0 L 288,64 z M 384,256c0-35.29-28.71-64-64-64l-31.942,0 c-0.020-0.017-0.041-0.038-0.058-0.058L 288,160 l-64,0 l0,32 c0,35.29, 28.71,64, 64,64l 31.942,0 c 0.020,0.017, 0.041,0.038, 0.058,0.057l0,63.885 c-0.017,0.020-0.037,0.041-0.058,0.058L 160,320 L 160,384 l 160,0 c 35.29,0, 64-28.71, 64-64L 384,256 z" data-tags="question, help, support" />
+<glyph unicode="&#xe222;" d="M 320,384 C 355.29,384 384,355.29 384,320 L 384,256 C 384,220.71 355.29,192 320,192 L 288.059,192 C 288.038,191.982 288.018,191.962 288,191.941 L 288,160 L 224,160 L 224,192 C 224,227.29 252.71,256 288,256 L 319.942,256 C 319.962,256.016 319.983,256.037 320,256.057 L 320,319.942 C 319.983,319.962 319.963,319.983 319.942,320 L 160,320 L 160,384 L 320,384 ZM 224,128L 288,128L 288,64L 224,64zM 256,432 C 200.441,432 148.208,410.364 108.922,371.078 C 69.636,331.792 48,279.559 48,224 C 48,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16 256,16 C 311.559,16 363.792,37.636 403.078,76.922 C 442.364,116.208 464,168.441 464,224 C 464,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432 256,432 Z M 256,480 L 256,480 C 397.385,480 512,365.385 512,224 C 512,82.615 397.385-32 256-32 C 114.615-32 0,82.615 0,224 C 0,365.385 114.615,480 256,480 Z" data-tags="question, help, support" />
+<glyph unicode="&#xe223;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 288,64l-64,0 l0,64 l 64,0 L 288,64 z M 288,192l-64,0 L 224,384 l 64,0 L 288,192 z" data-tags="notification, warning, notice, note, exclamation" />
+<glyph unicode="&#xe224;" d="M 256,432 C 200.441,432 148.208,410.364 108.922,371.078 C 69.636,331.792 48,279.559 48,224 C 48,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16 256,16 C 311.559,16 363.792,37.636 403.078,76.922 C 442.364,116.208 464,168.441 464,224 C 464,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432 256,432 Z M 256,480 L 256,480 C 397.385,480 512,365.385 512,224 C 512,82.615 397.385-32 256-32 C 114.615-32 0,82.615 0,224 C 0,365.385 114.615,480 256,480 ZM 224,128L 288,128L 288,64L 224,64zM 224,384L 288,384L 288,192L 224,192z" data-tags="notification, warning, notice, note, exclamation" />
+<glyph unicode="&#x48;" d="M 504.978,22.12L 286.441,457.676C 278.070,472.559, 267.035,480, 256,480s-22.070-7.441-30.442-22.324L 7.021,22.12 C-9.722-7.646, 4.521-32, 38.673-32l 434.654,0 C 507.478-32, 521.723-7.646, 504.978,22.12z M 256,32c-17.673,0-32,14.327-32,32 c0,17.674, 14.327,32, 32,32c 17.674,0, 32-14.326, 32-32C 288,46.327, 273.674,32, 256,32z M 278,128l-44,0 l-10,128 c0,17.673, 14.327,32, 32,32s 32-14.327, 32-32L 278,128z" data-tags="warning, sign" />
+<glyph unicode="&#xe225;" d="M 256,400.638 L 83.583,32 L 428.417,32 L 256,400.638 Z M 256,480 L 256,480 C 267.035,480 278.070,472.559 286.442,457.676 L 504.978,22.12 C 521.723-7.646 507.478-32 473.327-32 L 38.673-32 C 4.521-32 -9.722-7.646 7.021,22.12 L 225.558,457.676 C 233.93,472.559 244.965,480 256,480 ZM 224,96A32,32 3060 1 0 288,96A32,32 3060 1 0 224,96zM 256,288 C 273.673,288 288,273.673 288,256 L 278,160 L 234,160 L 224,256 C 224,273.673 238.327,288 256,288 Z" data-tags="warning, sign" />
+<glyph unicode="&#x3d;" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 z" data-tags="checkbox-unchecked, unchecked, square" />
+<glyph unicode="&#x3e;" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 z M 384,368L 224,208l-96,96l-64-64l 160-160l 224,224L 384,368z" data-tags="checkbox-checked, tick, checked, selected" />
+<glyph unicode="&#x3f;" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 zM 128,352L 384,352L 384,96L 128,96z" data-tags="checkbox-partial, partial" />
+<glyph unicode="&#xe226;" d="M0,480L 512,480L 512-32L0-32z" data-tags="square" />
+<glyph unicode="&#xe227;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32z" data-tags="radio-unchecked, circle" />
+<glyph unicode="&#xe228;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 160,224A96,96 13140 1 0 352,224A96,96 13140 1 0 160,224z" data-tags="radio-checked" />
+<glyph unicode="&#xe229;" d="M0,224A256,256 5220 1 0 512,224A256,256 5220 1 0 0,224z" data-tags="circle" />
+<glyph unicode="&#xe230;" d="M 224,82.745L 121.373,201.372L 150.627,230.627L 224,173.255L 361.372,294.627L 390.628,265.373 zM 415.886,416c 0.039-0.033, 0.081-0.075, 0.114-0.115l0-383.771 c-0.033-0.039-0.075-0.081-0.114-0.114L 96.114,32 c-0.040,0.033-0.081,0.075-0.114,0.114L 96,415.886 c 0.033,0.040, 0.075,0.081, 0.115,0.114L 32,416 l0-384 c0-35.2, 28.8-64, 64-64l 320,0 c 35.2,0, 64,28.8, 64,64L 480,416 L 415.886,416 z M 320,416L 320,448 c0,17.673-14.327,32-32,32l-64,0 c-17.673,0-32-14.327-32-32l0-32 l-64,0 l0-64 l 256,0 L 384,416 L 320,416 z M 288,416l-64,0 L 224,448 l 64,0 L 288,416 z" data-tags="signup, checkmark, board, agreement, register" />
+<glyph unicode="&#x58;" d="M0,480L 224,480L 224,256L0,256zM 288,480L 512,480L 512,256L 288,256zM0,192L 224,192L 224-32L0-32zM 288,192L 512,192L 512-32L 288-32z" data-tags="grid, icons, apps, squares" />
+<glyph unicode="&#x59;" d="M0,480L 128,480L 128,352L0,352zM 192,480L 320,480L 320,352L 192,352zM 384,480L 512,480L 512,352L 384,352zM0,288L 128,288L 128,160L0,160zM 192,288L 320,288L 320,160L 192,160zM 384,288L 512,288L 512,160L 384,160zM0,96L 128,96L 128-32L0-32zM 192,96L 320,96L 320-32L 192-32zM 384,96L 512,96L 512-32L 384-32z" data-tags="grid, icons, apps" />
+<glyph unicode="&#x5a;" d="M 192,448L 320,448L 320,320L 192,320zM 192,288L 320,288L 320,160L 192,160zM 192,128L 320,128L 320,0L 192,0z" data-tags="menu, dots, more" />
+<glyph unicode="&#x31;" d="M0,480L 128,480L 128,352L0,352zM 192,480L 512,480L 512,352L 192,352zM0,288L 128,288L 128,160L0,160zM 192,288L 512,288L 512,160L 192,160zM0,96L 128,96L 128-32L0-32zM 192,96L 512,96L 512-32L 192-32z" data-tags="list, bullet, ul, menu" />
+<glyph unicode="&#xe231;" d="M0,480L 128,480L 128,352L0,352zM 192,448L 512,448L 512,384L 192,384zM0,288L 128,288L 128,160L0,160zM 192,256L 512,256L 512,192L 192,192zM0,96L 128,96L 128-32L0-32zM 192,64L 512,64L 512,0L 192,0z" data-tags="list, bullet, ul, todo, menu" />
+<glyph unicode="&#xe232;" d="M 448,96L 64,96 c-35.2,0-64-28.8-64-64s 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,96, 448,96zM 448,288L 64,288 c-35.2,0-64-28.8-64-64s 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,288, 448,288zM 64,352l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,480, 448,480L 64,480 C 28.8,480,0,451.2,0,416S 28.8,352, 64,352z" data-tags="menu, list, items, lines, options" />
+<glyph unicode="&#x2d;" d="M 416,0L 512,256L 96,256L0,0 zM 64,288 L 0,0 L 0,416 L 144,416 L 208,352 L 416,352 L 416,288 Z" data-tags="folder-open, directory, category, browse" />
+<glyph unicode="&#x2e;" d="M 224,416L 288,352L 512,352L 512,0L0,0L0,416 z" data-tags="folder, directory, category, browse" />
+<glyph unicode="&#xe234;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 352,128l-64,0 l0-64 l-64,0 l0,64 l-64,0 l0,64 l 64,0 l0,64 l 64,0 l0-64 l 64,0 L 352,128 z" data-tags="folder-plus, plus, add, directory, category, browse" />
+<glyph unicode="&#xe235;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 352,128L 160,128 l0,64 l 192,0 L 352,128 z" data-tags="folder-minus, minus, remove, delete, directory, category, browse" />
+<glyph unicode="&#xe236;" d="M 210.745,384l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 l0-288 L 32,32 L 32,384 L 210.745,384  M 224,416L0,416 l0-416 l 512,0 L 512,352 L 288,352 L 224,416L 224,416z" data-tags="folder, directory, category, browse" />
+<glyph unicode="&#xe237;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 480,32L 32,32 L 32,384 l 178.745,0 l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 L 480,32 zM 288,256L 224,256L 224,192L 160,192L 160,128L 224,128L 224,64L 288,64L 288,128L 352,128L 352,192L 288,192 z" data-tags="folder-plus, plus, add, directory, category, browse" />
+<glyph unicode="&#xe238;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 480,32L 32,32 L 32,384 l 178.745,0 l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 L 480,32 zM 160,192L 352,192L 352,128L 160,128z" data-tags="folder-remove, remove, directory, category" />
+<glyph unicode="&#xe016;" d="M 352,480L 32,480 l0-512 l 448,0 L 480,352 L 352,480z M 448,0L 64,0 L 64,448 l 288,0 l0-96 l 96,0 L 448,0 z" data-tags="file, paper, page, new, empty, blank, document" />
+<glyph unicode="&#xe239;" d="M 352,480L 32,480 l0-512 l 448,0 L 480,352 L 352,480z M 448,0L 64,0 L 64,448 l 288,0 l0-96 l 96,0 L 448,0 zM 128,96L 384,96L 384,64L 128,64zM 128,160L 384,160L 384,128L 128,128zM 128,224L 384,224L 384,192L 128,192z" data-tags="file, list, paper, page, document" />
+<glyph unicode="&#x29;" d="M 448,96L 448,160L 384,160L 384,96L 320,96L 320,32L 384,32L 384-32L 448-32L 448,32L 512,32L 512,96 zM 32,448L 320,448L 320,352L 416,352L 416,192L 448,192L 448,352L 320,480L0,480L0-32L 288-32L 288,0L 32,0 z" data-tags="file-plus, plus, new, page, document, paper" />
+<glyph unicode="&#xe017;" d="M 320,96L 512,96L 512,32L 320,32zM 32,448L 320,448L 320,352L 416,352L 416,192L 448,192L 448,352L 320,480L0,480L0-32L 288-32L 288,0L 32,0 z" data-tags="file-minus, minus, remove, delete, page, document, paper" />
+<glyph unicode="&#xe240;" d="M 352-32L 256,80L 296.75,120.75L 352,65.125L 480,192L 512,160 zM 32,448l 288,0 l0-96 l 96,0 l0-160 l 32,0 L 448,352 L 320,480L0,480 l0-512 l 288,0 l0,32 L 32,0 L 32,448 z" data-tags="file-check, checkmark, correct, tick, page, document, paper" />
+<glyph unicode="&#xe241;" d="M 32,448l 288,0 l0-96 l 96,0 l0-160 l 32,0 L 448,352 L 320,480L0,480 l0-512 l 288,0 l0,32 L 32,0 L 32,448 zM 461.256,64L 512,114.744L 512,160L 466.744,160L 416,109.256L 365.256,160L 320,160L 320,114.744L 370.744,64L 320,13.256L 320-32L 365.256-32L 416,18.744L 466.744-32L 512-32L 512,13.256 z" data-tags="file-remove, delete, remove, cancel, close, document, page, paper" />
+<glyph unicode="&#xe018;" d="M 416,352l-96,0 L 320,384 L 224,480L0,480 l0-384 l 192,0 l0-128 l 320,0 L 512,256 L 416,352z M 416,306.745L 466.745,256L 416,256 L 416,306.745 z M 224,434.745L 274.745,384L 224,384 L 224,434.745 z M 32,448l 160,0 l0-96 l 96,0 l0-224 L 32,128 L 32,448 z M 480,0L 224,0 l0,96 l 96,0 L 320,320 l 64,0 l0-96 l 96,0 L 480,0 z" data-tags="copy, duplicate, files, pages, papers, documents" />
+<glyph unicode="&#xe242;" d="M 440,352l-24,0 l0,24 c0,22.056-17.944,40-40,40l-24,0 L 352,440 c0,22.056-17.943,40-40,40l-240,0 c-22.056,0-40-17.944-40-40l0-304 c0-22.057, 17.944-40, 40-40l 24,0 l0-24 c0-22.057, 17.944-40, 40-40l 24,0 l0-24 c0-22.056, 17.944-40, 40-40l 240,0 c 22.056,0, 40,17.944, 40,40L 480,312 C 480,334.056, 462.056,352, 440,352z M 72.001,128c-4.4,0-8,3.6-8,8L 64.001,440 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8l0-24 L 136,416 c-22.056,0-40-17.944-40-40l0-248 L 72.001,128 z M 136,64c-4.4,0-8,3.6-8,8L 128,376 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8l0-24 L 200,352 c-22.056,0-40-17.944-40-40l0-248 L 136,64 z M 448,8c0-4.4-3.6-8-8-8L 200,0 c-4.4,0-8,3.6-8,8L 192,312 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8L 448,8 z" data-tags="stack, files, archive, category, papers, documents, layers" />
+<glyph unicode="&#xe243;" d="M 488,128l-50.411,0 L 320,323.98L 320,424 c0,13.2-10.8,24-24,24l-80,0 c-13.2,0-24-10.8-24-24l0-100.019 L 74.412,128L 24,128 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24L 128,124.020 L 245.588,320l 20.823,0 L 384,124.020L 384,24 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 C 512,117.2, 501.2,128, 488,128z" data-tags="tree, branches, binary tree" />
+<glyph unicode="&#xe244;" d="M 488,96l-8,0 L 480,200 c0,30.878-25.121,56-56,56L 288,256 l0,64 l 8,0 c 13.2,0, 24,10.8, 24,24L 320,424 c0,13.2-10.8,24-24,24l-80,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 8,0 l0-64 L 88,256 c-30.878,0-56-25.122-56-56l0-104 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 c0,13.2-10.8,24-24,24l-8,0 l0,96 l 128,0 l0-96 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 c0,13.2-10.8,24-24,24l-8,0 l0,96 l 128,0 l0-96 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 C 512,85.2, 501.2,96, 488,96z M 96,0L 32,0 l0,64 l 64,0 L 96,0 z M 288,0l-64,0 l0,64 l 64,0 L 288,0 z M 224,352L 224,416 l 64,0 l0-64 L 224,352 z M 480,0l-64,0 l0,64 l 64,0 L 480,0 z" data-tags="tree, branches, descendants" />
+<glyph unicode="&#xe246;" d="M0,448L 512,448L 512,384L0,384zM0,352L 320,352L 320,288L0,288zM0,160L 320,160L 320,96L0,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z" data-tags="paragraph-left, align left, left, wysiwyg" />
+<glyph unicode="&#xe247;" d="M0,448L 512,448L 512,384L0,384zM 96,352L 416,352L 416,288L 96,288zM 96,160L 416,160L 416,96L 96,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z" data-tags="paragraph-center, align center, center, wysiwyg" />
+<glyph unicode="&#xe248;" d="M0,448L 512,448L 512,384L0,384zM 192,352L 512,352L 512,288L 192,288zM 192,160L 512,160L 512,96L 192,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z" data-tags="paragraph-right, align right, right, wysiwyg" />
+<glyph unicode="&#xe249;" d="M0,448L 512,448L 512,384L0,384zM0,352L 512,352L 512,288L0,288zM0,256L 512,256L 512,192L0,192zM0,160L 512,160L 512,96L0,96zM0,64L 512,64L 512,0L0,0z" data-tags="paragraph-justify, wysiwyg, justify" />
+<glyph unicode="&#xe01c;" d="M 512,64L 512,448 L0,448 l0-384 l 224,0 l0-32 l-96,0 l0-32 l 256,0 l0,32 l-96,0 l0,32 L 512,64 z M 64,384l 384,0 l0-256 L 64,128 L 64,384 z" data-tags="screen, monitor, computer, pc, desktop" />
+<glyph unicode="&#xe01d;" d="M 400,480L 80,480 C 53.6,480, 32,458.4, 32,432l0-416 c0-26.4, 21.6-48, 48-48l 320,0 c 26.4,0, 48,21.6, 48,48L 448,432 C 448,458.4, 426.4,480, 400,480z M 240-16 c-8.836,0-16,7.163-16,16s 7.164,16, 16,16s 16-7.163, 16-16S 248.836-16, 240-16z M 384,32L 96,32 L 96,416 l 288,0 L 384,32 z" data-tags="tablet, mobile" />
+<glyph unicode="&#xe01e;" d="M 384,480L 96,480 C 78.4,480, 64,465.601, 64,448l0-448 c0-17.6, 14.399-32, 32-32l 288,0 c 17.6,0, 32,14.4, 32,32L 416,448 C 416,465.601, 401.6,480, 384,480z M 240-8.891c-13.746,0-24.891,11.145-24.891,24.891s 11.145,24.891, 24.891,24.891s 24.891-11.145, 24.891-24.891 S 253.746-8.891, 240-8.891z M 384,64L 96,64 L 96,416 l 288,0 L 384,64 z" data-tags="mobile, phone, handheld" />
+<glyph unicode="&#x51;" d="M 416,448L 96,448 L0,352l0-336 c0-8.837, 7.163-16, 16-16l 480,0 c 8.836,0, 16,7.163, 16,16L 512,352 L 416,448z M 256,64L 96,192l 96,0 l0,96 l 128,0 l0-96 l 96,0 L 256,64z M 77.255,384l 32,32l 293.489,0 l 32-32L 77.255,384 z" data-tags="box-add, storage, inbox, archive, download" />
+<glyph unicode="&#x52;" d="M 416,448L 96,448 L0,352l0-336 c0-8.837, 7.163-16, 16-16l 480,0 c 8.836,0, 16,7.163, 16,16L 512,352 L 416,448z M 320,160l0-96 L 192,64 l0,96 L 96,160 l 160,128 l 160-128L 320,160 z M 77.255,384l 32,32l 293.488,0 l 32-32L 77.255,384 z" data-tags="box-remove, storage, inbox, archive, upload" />
+<glyph unicode="&#xe021;" d="M 448,128L 448,64L 64,64L 64,128L0,128L0,0L 512,0L 512,128 zM 384,288L 288,288L 288,448L 224,448L 224,288L 128,288L 256,96 z" data-tags="download, arrow, store, save, inbox" />
+<glyph unicode="&#xe022;" d="M 448,128L 448,64L 64,64L 64,128L0,128L0,0L 512,0L 512,128 zM 128,256L 224,256L 224,96L 288,96L 288,256L 384,256L 256,448 z" data-tags="upload, arrow, load, outbox" />
+<glyph unicode="&#x21;" d="M 512,184.777 L 256,383.491 L 0,184.777 L 0,265.796 L 256,464.509 L 512,265.795 ZM 448,192 L 448,0 L 64,0 L 64,192 L 256,336 Z" data-tags="home, house, building" />
+<glyph unicode="&#xe250;" d="M 448,192 L 448,0 L 64,0 L 64,192 L 128,192 L 128,64 L 384,64 L 384,192 ZM 512,184.777 L 256,383.491 L 0,184.777 L 0,265.796 L 256,464.509 L 512,265.795 Z" data-tags="home, house, building" />
+<glyph unicode="&#xe024;" d="M 352,192 L 416,256 L 416,0 L 32,0 L 32,384 L 288,384 L 224,320 L 96,320 L 96,64 L 352,64 ZM 480,448 L 480,272 L 414.628,337.372 L 237.255,160 L 192,160 L 192,205.256 L 369.372,382.628 L 304,448 Z" data-tags="new tab, external, outside, popout, link, blank" />
+<glyph unicode="&#xe251;" d="M 96,448l0-384 l 384,0 L 480,448 L 96,448 z M 448,96L 128,96 L 128,416 l 320,0 L 448,96 zM 64,32L 64,352L 32,384L 32,0L 416,0L 384,32 zM 214.627,137.373L 310.627,233.373L 384,160L 384,352L 192,352L 265.373,278.627L 169.373,182.627 z" data-tags="new tab, external, outside, popout, link, blank" />
+<glyph unicode="&#xe252;" d="M 476.698,442.679l-2.014,2.021c-47.074,47.067-124.097,47.067-171.163,0L 194.468,335.632 c-47.067-47.066-47.067-124.088,0-171.155l 2.013-2.013c 3.916-3.924, 8.073-7.462, 12.368-10.729l 39.924,39.925 c-4.651,2.747-9.063,6.036-13.058,10.030l-2.021,2.021c-25.557,25.549-25.557,67.136,0,92.695L 342.758,405.462 c 25.558,25.559, 67.137,25.559, 92.693,0l 2.021-2.012c 25.55-25.558, 25.55-67.146,0-92.695l-49.343-49.343 c 8.566-21.154, 12.624-43.7, 12.269-66.193l 76.302,76.302C 523.767,318.589, 523.767,395.61, 476.698,442.679zM 315.521,285.533c-3.916,3.916-8.073,7.461-12.368,10.72l-39.924-39.916c 4.652-2.748, 9.063-6.037, 13.058-10.031l 2.021-2.020 c 25.558-25.558, 25.558-67.136,0-92.694L 169.243,42.525c-25.559-25.551-67.138-25.551-92.694,0l-2.021,2.021 c-25.549,25.56-25.549,67.138,0,92.694l 49.344,49.343c-8.567,21.153-12.623,43.701-12.269,66.193l-76.301-76.299 c-47.068-47.066-47.068-124.089,0-171.162l 2.013-2.016c 47.076-47.064, 124.096-47.064, 171.164,0l 109.055,109.059 c 47.067,47.066, 47.067,124.097,0,171.163L 315.521,285.533z" data-tags="link, chain, url, uri, anchor" />
+<glyph unicode="&#x2f;" d="M0,416l0-384 l 512,0 L 512,416 L0,416 z M 480,64l-32,0 l-96,144l-64-48L 160,320L 64,64L 32,64 L 32,384 l 448,0 L 480,64 zM 352,304A48,48 13140 1 0 448,304A48,48 13140 1 0 352,304z" data-tags="image, picture, photo, graphic" />
+<glyph unicode="&#x30;" d="M 64,352l0-320 l 448,0 L 512,352 L 64,352 z M 480,85.333L 416,192l-72.533-60.444L 288,224L 96,64L 96,320 l 384,0 L 480,85.333 zM 128,240A48,48 8100 1 0 224,240A48,48 8100 1 0 128,240zM 448,416L0,416L0,96L 32,96L 32,384L 448,384 z" data-tags="images, pictures, photos, graphics" />
+<glyph unicode="&#xe014;" d="M 257.54,416C 92.994,416,0,306.648,0,226.653c0-121.887, 109.354-190.477, 200.308-212.956 C 291.27-8.791, 325.48,32.462, 324.022,80c-1.771,57.75, 27.073,58.496, 47.52,56.459C 391.973,134.408, 512,106.695, 512,198.674 C 512,312.5, 422.072,416, 257.54,416z M 224,384c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 206.327,384, 224,384z M 80,191.754c-8.973,0-16.246,7.273-16.246,16.246S 71.027,224.246, 80,224.246S 96.246,216.973, 96.246,208S 88.973,191.754, 80,191.754z M 128,256c-17.673,0-32,14.327-32,32s 14.327,32, 32,32s 32-14.327, 32-32S 145.673,256, 128,256z M 256,128c-35.346,0-64,21.49-64,48 s 28.654,48, 64,48c 35.347,0, 64-21.49, 64-48S 291.347,128, 256,128z M 368,256c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48 S 394.51,256, 368,256z" data-tags="palette, color, paint, art" />
+<glyph unicode="&#x55;" d="M 152,176c0-57.438, 46.562-104, 104-104s 104,46.562, 104,104s-46.562,104-104,104S 152,233.438, 152,176z M 480,352L 368,352 c-8,32-16,64-48,64L 192,416 c-32,0-40-32-48-64L 32,352 c-17.6,0-32-14.4-32-32l0-288 c0-17.6, 14.4-32, 32-32l 448,0 c 17.6,0, 32,14.4, 32,32L 512,320 C 512,337.6, 497.6,352, 480,352z M 256,34c-78.425,0-142,63.574-142,142c0,78.425, 63.575,142, 142,142c 78.426,0, 142-63.575, 142-142 C 398,97.574, 334.427,34, 256,34z M 480,256l-64,0 l0,32 l 64,0 L 480,256 z" data-tags="camera, photo, picture, image" />
+<glyph unicode="&#xe015;" d="M 489.42,351.874c-5.294,0-10.729-1.861-15.718-5.383L 384,283.184L 384,336 c0,26.4-21.6,48-48,48L 48,384 c-26.4,0-48-21.6-48-48l0-224 c0-26.4, 21.6-48, 48-48l 288,0 c 26.4,0, 48,21.6, 48,48l0,52.815 l 89.701-63.307c 4.989-3.521, 10.424-5.382, 15.717-5.383 c 0.001,0, 0.001,0, 0.003,0c 7.044,0, 13.477,3.248, 17.646,8.911c 3.228,4.385, 4.934,10.027, 4.934,16.318L 512.001,326.645 C 512,343.208, 500.641,351.874, 489.42,351.874z" data-tags="camera, video, media, film, movie" />
+<glyph unicode="&#x56;" d="M 490.594,399.946C 418.778,410.271, 339.428,416, 256.001,416c-83.43,0-162.778-5.729-234.597-16.054 C 7.639,346.083,0,286.571,0,224c0-62.57, 7.639-122.083, 21.404-175.945C 93.223,37.729, 172.572,32, 256.001,32 c 83.427,0, 162.776,5.729, 234.593,16.055C 504.36,101.917, 512,161.43, 512,224C 512,286.571, 504.36,346.083, 490.594,399.946z M 192.001,128L 192.001,320 l 160-96L 192.001,128z" data-tags="play, video, movie" />
+<glyph unicode="&#x57;" d="M 480,480 L 512,480 L 512,112 C 512,67.817 461.855,32 400,32 C 338.145,32 288,67.817 288,112 C 288,156.184 338.145,192 400,192 C 431.342,192 459.671,182.8 480,167.98 L 480,352 L 224,295.111 L 224,48 C 224,3.817 173.856-32 112-32 C 50.144-32 0,3.817 0,48 C 0,92.184 50.144,128 112,128 C 143.342,128 171.671,118.8 192,103.98 L 192,416 L 480,480 Z" data-tags="music, song, audio, sound" />
+<glyph unicode="&#x22;" d="M 311.413,128.632c-11.055,1.759-11.307,32.157-11.307,32.157s 32.484,32.158, 39.564,75.401 c 19.045,0, 30.809,45.973, 11.761,62.148C 352.226,315.365, 375.911,432, 256,432c-119.911,0-96.225-116.635-95.432-133.662 c-19.047-16.175-7.285-62.148, 11.761-62.148c 7.079-43.243, 39.564-75.401, 39.564-75.401s-0.252-30.398-11.307-32.157 C 164.976,122.966, 32,64.315, 32,0l 224,0 l 224,0 C 480,64.315, 347.024,122.966, 311.413,128.632z" data-tags="user, profile, avatar, person, talk, member" />
+<glyph unicode="&#xe01f;" d="M 367.497,77.313c-9.476,1.494-9.692,27.327-9.692,27.327s 27.844,27.328, 33.912,64.076 c 16.326,0, 26.407,39.069, 10.082,52.814c 0.681,14.47, 20.984,113.588-81.799,113.588c-102.782,0-82.479-99.118-81.799-113.588 c-16.327-13.745-6.244-52.814, 10.081-52.814c 6.067-36.748, 33.913-64.076, 33.913-64.076s-0.216-25.833-9.692-27.327 C 241.979,72.497, 128,22.655, 128-32l 192,0 l 192,0 C 512,22.655, 398.021,72.497, 367.497,77.313zM 172.027,68.595c 22.047,13.575, 48.813,26.154, 70.769,33.712c-7.876,11.216-16.647,26.468-22.165,44.531 c-7.703,6.283-13.972,15.266-17.999,26.301c-4.033,11.052-5.561,23.426-4.304,34.842c 0.902,8.196, 3.239,15.833, 6.825,22.544 c-2.175,23.293-3.707,69.017, 26.224,102.366c 11.607,12.933, 26.278,22.23, 43.85,27.843C 272.090,393.114, 255.647,431.119, 192,431.119 c-102.782,0-82.479-99.118-81.799-113.588c-16.327-13.745-6.244-52.814, 10.081-52.814c 6.067-36.748, 33.913-64.076, 33.913-64.076 s-0.216-25.833-9.692-27.327C 113.979,168.497,0,118.655,0,64l 164.798,0 C 167.153,65.537, 169.551,67.070, 172.027,68.595z" data-tags="users, people, group, team, members, community" />
+<glyph unicode="&#x6d;" d="M 448,384L 64,384 c-35.2,0-64-28.8-64-64l0-224 c0-35.2, 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64L 512,320 C 512,355.2, 483.2,384, 448,384z M 64,96c0,70.692, 35.817,128, 80,128c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48s-21.49-48-48-48 c 44.183,0, 80-57.308, 80-128L 64,96 z M 448,96L 288,96 l0,32 l 160,0 L 448,96 z M 448,192L 288,192 l0,32 l 160,0 L 448,192 z M 448,288L 288,288 l0,32 l 160,0 L 448,288 z" data-tags="vcard, card, contact" />
+<glyph unicode="&#x70;" d="M 32,256L 80,256L 80,176L 32,176zM 32,352L 80,352L 80,272L 32,272zM 32,160L 80,160L 80,80L 32,80zM 32,64L 80,64L 80-16L 32-16zM 96,480l0-512 l 384,0 L 480,480 L 96,480 z M 288,351.835c 35.255,0, 63.835-28.58, 63.835-63.835s-28.58-63.835-63.835-63.835 c-35.255,0-63.835,28.58-63.835,63.835S 252.745,351.835, 288,351.835z M 384,96L 192,96 l0,32 c0,35.347, 28.654,64, 64,64l0,0 l 64,0  c 35.348,0, 64-28.653, 64-64L 384,96 zM 32,448L 80,448L 80,368L 32,368z" data-tags="address-book, book, contacts" />
+<glyph unicode="&#x26;" d="M 128,160c0,0, 29.412,96, 192,96l0-96 l 192,128L 320,416l0-96 C 192,320, 128,240.164, 128,160zM 352,96L 64,96 L 64,288 l 62.938,0 c 5.047,5.959, 10.456,11.667, 16.244,17.090c 21.982,20.595, 48.281,36.326, 78.057,46.91L0,352 l0-320 l 416,0 L 416,166.312 l-64-42.667L 352,96 z" data-tags="share, out, external, outside" />
+<glyph unicode="&#xe257;" d="M 192,224 L 32,224 L 32,288 L 192,288 L 192,352 L 288,256 L 192,160 ZM 512,480 L 512,64 L 320-32 L 320,64 L 128,64 L 128,192 L 160,192 L 160,96 L 320,96 L 320,384 L 448,448 L 160,448 L 160,320 L 128,320 L 128,480 Z" data-tags="enter, sign in, log in, login" />
+<glyph unicode="&#xe258;" d="M 384,160 L 384,224 L 224,224 L 224,288 L 384,288 L 384,352 L 480,256 ZM 352,192 L 352,64 L 192,64 L 192-32 L 0,64 L 0,480 L 352,480 L 352,320 L 320,320 L 320,448 L 64,448 L 192,384 L 192,96 L 320,96 L 320,192 Z" data-tags="exit, sign out, log out, quit, close, logout" />
+<glyph unicode="&#x24;" d="M 464,448 C 490.4,448 512,426.4 512,400 L 512,144 C 512,117.6 490.4,96 464,96 L 281.6,96 L 128-32 L 128,96 L 48,96 C 21.6,96 0,117.6 0,144 L 0,400 C 0,426.4 21.6,448 48,448 L 464,448 Z" data-tags="bubble, comment, chat, talk" />
+<glyph unicode="&#x25;" d="M 400,480 C 426.4,480 448,458.4 448,432 L 448,272 C 448,245.6 426.4,224 400,224 L 217.6,224 L 64,96 L 64,224 L 48,224 C 21.6,224 0,245.6 0,272 L 0,432 C 0,458.4 21.6,480 48,480 L 400,480 ZM 528,384 C 554.4,384 576,362.4 576,336 L 576,144 C 576,117.6 554.4,96 528,96 L 448,96 L 448-32 L 294.4,96 L 192,96 L 192,160 L 317.57,160 L 416,72.643 L 416,160 L 512,160 L 512,320 L 480,320 L 480,384 L 528,384 Z" horiz-adv-x="576" data-tags="bubbles, comments, chat, talk" />
+<glyph unicode="&#x60;" d="M 112.5,256 C 174.356,256 224.5,205.855 224.5,144 C 224.5,82.144 174.356,32 112.5,32 C 50.644,32 0.5,82.144 0.5,144 L 0,160 C 0,283.712 100.288,384 224,384 L 224,320 C 181.263,320 141.083,303.357 110.863,273.137 C 105.046,267.319 99.737,261.129 94.948,254.627 C 100.667,255.527 106.528,256 112.5,256 ZM 400.5,256 C 462.355,256 512.5,205.855 512.5,144 C 512.5,82.144 462.355,32 400.5,32 C 338.645,32 288.5,82.144 288.5,144 L 288,160 C 288,283.712 388.288,384 512,384 L 512,320 C 469.263,320 429.083,303.357 398.863,273.137 C 393.045,267.319 387.736,261.129 382.947,254.627 C 388.667,255.527 394.527,256 400.5,256 Z" data-tags="quotes-left, ldquo" />
+<glyph unicode="&#x61;" d="M 400,160 C 338.144,160 288,210.145 288,272 C 288,333.856 338.144,384 400,384 C 461.856,384 512,333.856 512,272 L 512.5,256 C 512.5,132.288 412.212,32 288.5,32 L 288.5,96 C 331.237,96 371.417,112.643 401.637,142.863 C 407.454,148.681 412.763,154.871 417.552,161.373 C 411.833,160.473 405.972,160 400,160 ZM 112,160 C 50.145,160 0,210.145 0,272 C 0,333.856 50.145,384 112,384 C 173.855,384 224,333.856 224,272 L 224.5,256 C 224.5,132.288 124.212,32 0.5,32 L 0.5,96 C 43.237,96 83.417,112.643 113.637,142.863 C 119.455,148.681 124.764,154.871 129.553,161.373 C 123.833,160.473 117.973,160 112,160 Z" data-tags="quotes-right, rdquo" />
+<glyph unicode="&#xe259;" d="M 464,480L 48,480 C 21.6,480,0,458.4,0,432l0-288 c0-26.4, 21.6-48, 48-48l 80,0 l0-128 l 153.6,128L 464,96 c 26.4,0, 48,21.6, 48,48L 512,432 C 512,458.4, 490.4,480, 464,480z M 224,344.615c-29.821-6.85-55.189-28.007-70.488-56.941C 155.646,287.889, 157.81,288, 160,288 c 35.346,0, 64-28.654, 64-64c0-35.346-28.654-64-64-64s-64,28.654-64,64c0,43.612, 15.198,84.729, 42.795,115.775 C 162.042,365.927, 191.74,382.388, 224,387.379L 224,344.615 z M 416,344.615c-29.82-6.85-55.189-28.007-70.488-56.941 C 347.646,287.889, 349.81,288, 352,288c 35.346,0, 64-28.654, 64-64c0-35.346-28.654-64-64-64s-64,28.654-64,64 c0,43.612, 15.198,84.729, 42.795,115.775C 354.041,365.927, 383.74,382.388, 416,387.379L 416,344.615 z" data-tags="bubble-quote, comment, chat, talk, quote" />
+<glyph unicode="&#xe260;" d="M 457.153,376.352 C 510.42,346.068 512,313.643 512.002,291.003 L 512.002,287.606 C 512.002,282.424 507.533,278.188 502.074,278.188 L 381.928,278.188 C 376.469,278.188 372,282.424 372,287.606 L 372,299.059 C 372,327.664 344.645,332.234 329.551,334.664 C 314.455,337.090 276.934,339.441 256.071,339.441 C 256.045,339.441 256.025,339.441 256.005,339.441 C 255.976,339.441 255.956,339.441 255.928,339.441 C 235.066,339.441 197.541,337.091 182.448,334.664 C 167.355,332.237 139.999,327.666 139.999,299.059 L 139.999,287.606 C 139.999,282.424 135.53,278.188 130.073,278.188 L 9.927,278.188 C 4.47,278.188 0.001,282.424 0.001,287.606 L 0.001,291.003 C 0.001,313.643 1.581,346.068 54.848,376.352 C 118.198,412.362 208.777,416 255.928,416 C 255.956,415.975 255.976,415.945 256.005,415.922 C 256.023,415.944 256.044,415.976 256.071,416 C 303.223,416 393.803,412.366 457.153,376.352 ZM 256.001,288c-28.374,0-87.443-2.126-117.456-38.519C 108.523,213.098, 33.455,32, 100.398,32c 66.956,0, 125.458,0, 155.606,0 c 30.137,0, 88.648,0, 155.595,0c 66.945,0-8.125,181.098-38.137,217.481C 343.444,285.874, 284.362,288, 256.001,288z M 256,96 c-35.346,0-64,28.653-64,64s 28.654,64, 64,64c 35.347,0, 64-28.653, 64-64S 291.347,96, 256,96z" data-tags="phone, contact, telephone, support, call" />
+<glyph unicode="&#xe261;" d="M 352,160c-32-32-32-64-64-64s-64,32-96,64s-64,64-64,96s 32,32, 64,64S 128,448, 96,448S0,352,0,352c0-64, 65.75-193.75, 128-256 s 192-128, 256-128c0,0, 96,64, 96,96S 384,192, 352,160z" data-tags="phone, contact, telephone, support, call" />
+<glyph unicode="&#x4d;" d="M 325.608,214.818L 512,86.264L 512,382.211 zM0,382.211L0,86.264L 186.388,214.836 zM 256,152.309L 211.499,192.264L0,64L 512,64L 300.495,192.264 zM 496.64,384L 15.36,384L 256,203.074 z" data-tags="envelop, mail, email, contact, letter" />
+<glyph unicode="&#x4e;" d="M 325.607,118.95L 512-9.605L 512,286.343 zM0,286.343L0-9.605L 186.388,118.968 zM 256,56.44L 211.499,96.395L0-31.868L 512-31.868L 300.494,96.395 zM 15.359,288L 496.64,288L 255.999,468.926 z" data-tags="envelop-opened, mail, email, contact, letter" />
+<glyph unicode="&#x4f;" d="M 352,384L 160,384 L0,192l0-80 l0-48 c0-17.673, 14.327-32, 32-32l 448,0 c 17.674,0, 32,14.327, 32,32l0,48 l0,80 L 352,384z M 384,192l-64-64L 192,128 l-64,64L 41.655,192 l 133.333,160l 162.024,0 l 133.333-160L 384,192 z" data-tags="drawer, inbox, box, archive, storage, category" />
+<glyph unicode="&#x50;" d="M 352,384L 160,384 L0,192l0-128 c0-17.673, 14.327-32, 32-32l 448,0 c 17.674,0, 32,14.327, 32,32L 512,192 L 352,384z M 320,128L 192,128 l-32,32l 192,0  L 320,128z M 41.655,192l 133.333,160l 162.024,0 l 133.333-160L 41.655,192 zM 142.482,288L 369.518,288L 342.851,320L 169.148,320 zM 89.149,224L 422.852,224L 396.185,256L 115.815,256 z" data-tags="drawer, inbox, box, archive, storage, category" />
+<glyph unicode="&#xe020;" d="M 480,352L 352,352 L 352,384 c0,17.6-14.4,32-32,32L 192,416 c-17.602,0-32-14.4-32-32l0-32 L 32,352 c-17.6,0-32-14.4-32-32l0-288 c0-17.601, 14.398-32, 32-32l 448,0 c 17.6,0, 32,14.399, 32,32L 512,320 C 512,337.6, 497.6,352, 480,352z M 192,383.942 c 0.017,0.020, 0.037,0.041, 0.057,0.058l 127.886,0 c 0.021-0.017, 0.041-0.038, 0.059-0.058L 320.002,352 L 192,352 L 192,383.942 z M 480,224l-64,0 l0-48 c0-8.801-7.2-16-16-16l-32,0 c-8.802,0-16,7.199-16,16l0,48 L 160,224 l0-48 c0-8.801-7.2-16-16-16l-32,0 c-8.801,0-16,7.199-16,16l0,48 L 32,224 l0,32 l 448,0 L 480,224 z" data-tags="briefcase, portfolio, suitcase, work, job, employee" />
+<glyph unicode="&#xe262;" d="M 272,480L0,208l 240-240l 272,272L 512,480 L 272,480 z M 400,320c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 426.51,320, 400,320z" data-tags="tag, price" />
+<glyph unicode="&#xe263;" d="M 448,416 L 298.51,416 L 90.51,208 L 240,58.51 L 448,266.51 L 448,416 Z M 512,480 L 512,480 L 512,240 L 240-32 L 0,208 L 272,480 L 512,480 ZM 320,336A48,48 3060 1 0 416,336A48,48 3060 1 0 320,336z" data-tags="tag, price" />
+<glyph unicode="&#xe264;" d="M 496,448L 384,448 c-26.4,0-63.273-15.273-81.941-33.941L 113.941,225.941c-18.667-18.667-18.667-49.214,0-67.882l 140.118-140.117 c 18.667-18.668, 49.214-18.668, 67.882,0l 188.117,188.117C 528.727,224.727, 544,261.6, 544,288L 544,400 C 544,426.4, 522.4,448, 496,448z M 432,288 c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 458.51,288, 432,288zM 43.313,180.687 L 214.502,9.498 C 196.37-0.082 173.271,2.729 158.059,17.942 L 17.941,158.059 C -0.726,176.727 -0.726,207.274 17.941,225.941 L 206.059,414.059 C 224.727,432.727 261.6,448 288,448 L 43.313,203.314 C 37.091,197.091 37.091,186.91 43.313,180.687 Z" horiz-adv-x="544" data-tags="tags, prices" />
+<glyph unicode="&#xe265;" d="M 480,384 L 384,384 C 381.158,384 373.652,382.643 364.621,378.902 C 355.59,375.161 349.322,370.813 347.312,368.804 L 170.509,192 L 288,74.51 L 464.803,251.314 C 466.813,253.323 471.161,259.591 474.901,268.622 C 478.643,277.652 480,285.158 480,288 L 480,384 Z M 496,448 L 496,448 C 522.4,448 544,426.4 544,400 L 544,288 C 544,261.6 528.727,224.727 510.058,206.059 L 321.941,17.942 C 312.607,8.608 300.304,3.941 288,3.941 C 275.696,3.941 263.392,8.608 254.059,17.942 L 113.941,158.059 C 95.274,176.727 95.274,207.274 113.941,225.941 L 302.059,414.059 C 320.727,432.727 357.6,448 384,448 L 496,448 ZM 43.313,180.687 L 214.502,9.498 C 196.37-0.082 173.271,2.729 158.059,17.942 L 17.941,158.059 C -0.726,176.727 -0.726,207.274 17.941,225.941 L 206.059,414.059 C 224.727,432.727 261.6,448 288,448 L 43.313,203.314 C 37.091,197.091 37.091,186.91 43.313,180.687 ZM 384,320A32,32 3060 1 0 448,320A32,32 3060 1 0 384,320z" horiz-adv-x="544" data-tags="tags, prices" />
+<glyph unicode="&#x38;" d="M 466.895,174.875c-26.863,46.527-10.708,106.152, 36.076,133.244l-50.313,87.146c-14.375-8.427-31.088-13.259-48.923-13.259 c-53.768,0-97.354,43.873-97.354,97.995L 205.752,480.001 c 0.133-16.705-4.037-33.641-12.979-49.126 c-26.862-46.528-86.578-62.351-133.431-35.379L 9.030,308.35c 14.485-8.236, 27.025-20.294, 35.943-35.739 c 26.819-46.454, 10.756-105.96-35.854-133.112l 50.313-87.146c 14.325,8.348, 30.958,13.127, 48.7,13.127 c 53.598,0, 97.072-43.596, 97.35-97.479l 100.627,0 c-0.043,16.537, 4.136,33.285, 12.983,48.609 c 26.818,46.453, 86.388,62.297, 133.207,35.506l 50.313,87.145C 488.222,147.494, 475.766,159.51, 466.895,174.875z M 256,120.334 c-57.254,0-103.668,46.412-103.668,103.667c0,57.254, 46.413,103.667, 103.668,103.667c 57.254,0, 103.666-46.413, 103.666-103.667 C 359.665,166.746, 313.254,120.334, 256,120.334z" data-tags="cog, preferences, settings, gear, generate, control, options" />
+<glyph unicode="&#x37;" d="M 181.861,118.974l 20.649,28.908l-22.627,22.628l-28.909-20.648c-5.361,2.997-11.102,5.387-17.133,7.096L 128,192L 96,192 l-5.84-35.043c-6.031-1.709-11.772-4.099-17.133-7.096L 44.118,170.51L 21.49,147.882l 20.649-28.908 c-2.997-5.36-5.387-11.103-7.096-17.133L0,96l0-32 l 35.043-5.841c 1.709-6.030, 4.099-11.772, 7.096-17.133L 21.49,12.118l 22.627-22.628 l 28.909,20.648c 5.361-2.997, 11.102-5.387, 17.133-7.096L 96-32l 32,0 l 5.84,35.043c 6.031,1.709, 11.772,4.099, 17.133,7.096l 28.909-20.648 l 22.627,22.628l-20.649,28.908c 2.997,5.36, 5.387,11.103, 7.096,17.133L 224,64l0,32 l-35.043,5.841 C 187.248,107.871, 184.858,113.613, 181.861,118.974z M 112,48c-17.674,0-32,14.327-32,32s 14.326,32, 32,32s 32-14.327, 32-32 S 129.674,48, 112,48zM 512,288l0,32 l-33.691,6.125c-0.621,4.023-1.416,7.989-2.362,11.895l 28.779,18.55L 492.48,386.134l-33.472-7.234 c-2.107,3.455-4.363,6.81-6.746,10.065l 19.503,28.171l-22.628,22.627l-28.171-19.503c-3.256,2.383-6.61,4.638-10.065,6.747 l 7.234,33.472L 388.571,472.726l-18.55-28.779c-3.906,0.946-7.872,1.741-11.895,2.362L 352,480l-32,0 l-6.126-33.691 c-4.023-0.621-7.988-1.416-11.895-2.362L 283.43,472.726L 253.866,460.48l 7.234-33.472c-3.455-2.108-6.81-4.364-10.065-6.747 l-28.171,19.503l-22.627-22.627l 19.503-28.171c-2.383-3.255-4.639-6.61-6.747-10.065l-33.472,7.234l-12.246-29.564l 28.779-18.55 c-0.946-3.906-1.741-7.871-2.362-11.895L 160,320l0-32 l 33.691-6.125c 0.621-4.023, 1.416-7.989, 2.362-11.895l-28.779-18.55 l 12.246-29.564l 33.472,7.234c 2.108-3.455, 4.364-6.809, 6.747-10.065l-19.503-28.171l 22.627-22.628l 28.171,19.503 c 3.255-2.383, 6.61-4.638, 10.065-6.746l-7.234-33.472l 29.564-12.246l 18.551,28.779c 3.905-0.946, 7.871-1.741, 11.894-2.362L 320,128l 32,0 l 6.126,33.691c 4.022,0.621, 7.988,1.416, 11.895,2.362l 18.55-28.779l 29.564,12.246l-7.234,33.472 c 3.455,2.108, 6.81,4.363, 10.065,6.746l 28.171-19.503l 22.628,22.628l-19.503,28.171c 2.383,3.256, 4.638,6.61, 6.746,10.065 l 33.472-7.234l 12.246,29.565l-28.779,18.55c 0.946,3.906, 1.741,7.871, 2.362,11.895L 512,288z M 336,234.4 c-38.439,0-69.6,31.161-69.6,69.6c0,38.439, 31.16,69.6, 69.6,69.6s 69.6-31.161, 69.6-69.6C 405.6,265.561, 374.44,234.4, 336,234.4z" data-tags="cogs, settings, gears, generate, control, options" />
+<glyph unicode="&#x36;" d="M 507.256,84.744L 308.744,283.256c-11.030,11.031-38.41,2.154-65.372-19.758L 96,410.87L 80,448L 28.768,480L0,451.232L 32,400 l 37.13-16l 147.373-147.372c-21.913-26.963-30.79-54.342-19.76-65.372c 0.003-0.003, 0.006-0.005, 0.009-0.008l 198.503-198.504 c 12.976-12.975, 48.565,1.579, 79.494,32.508C 505.677,36.18, 520.23,71.771, 507.256,84.744z M 445.435,34.565 c-3.71-3.71-8.572-5.565-13.435-5.565s-9.725,1.855-13.435,5.565l-160,160c-7.421,7.42-7.421,19.449,0,26.869 c 7.42,7.42, 19.449,7.42, 26.869,0l 160-160C 452.855,54.015, 452.855,41.985, 445.435,34.565z" data-tags="screwdriver, fix, tool, make, build" />
+<glyph unicode="&#x3a;" d="M 507.882,411.883L 448,352l-64,64l 59.882,59.883C 435.057,478.557, 425.698,480, 416,480c-53.021,0-96-42.98-96-96 c0-9.697, 1.442-19.057, 4.116-27.882L 123.882,155.883C 115.057,158.557, 105.698,160, 96,160c-53.021,0-96-42.98-96-96 c0-9.697, 1.442-19.058, 4.117-27.882L 64,96l 64-64l-59.883-59.882C 76.943-30.556, 86.302-32, 96-32c 53.020,0, 96,42.981, 96,96 c0,9.698-1.444,19.059-4.118,27.883l 200.234,200.235C 396.943,289.444, 406.302,288, 416,288c 53.020,0, 96,42.981, 96,96 C 512,393.698, 510.556,403.058, 507.882,411.883z" data-tags="wrench, settings, control, tool, options, preferences, fix" />
+<glyph unicode="&#x39;" d="M 144,320L 80,320 c-8.8,0-16-7.2-16-16l0-32 c0-8.8, 7.2-16, 16-16l 64,0 c 8.8,0, 16,7.2, 16,16l0,32 C 160,312.8, 152.8,320, 144,320zM 96,416L 128,416L 128,336L 96,336zM 96,240L 128,240L 128,32L 96,32zM 272,192l-64,0 c-8.8,0-16-7.2-16-16l0-32 c0-8.8, 7.2-16, 16-16l 64,0 c 8.801,0, 16,7.2, 16,16l0,32 C 288,184.8, 280.801,192, 272,192zM 224.001,416L 256.001,416L 256.001,208L 224.001,208zM 224.001,112L 256.001,112L 256.001,32L 224.001,32zM 400,288l-64,0 c-8.799,0-16-7.2-16-16l0-32 c0-8.8, 7.201-16, 16-16l 64,0 c 8.801,0, 16,7.2, 16,16l0,32 C 416,280.8, 408.801,288, 400,288zM 352,416L 384,416L 384,304L 352,304zM 352,208L 384,208L 384,32L 352,32zM 440,480L 40,480 C 17.944,480,0,462.056,0,440l0-432 c0-22.056, 17.944-40, 40-40l 400,0 c 22.056,0, 40,17.944, 40,40L 480,440  C 480,462.056, 462.056,480, 440,480z M 448,8c0-4.4-3.6-8-8-8L 40,0 c-4.4,0-8,3.6-8,8L 32,440 c0,4.4, 3.6,8, 8,8l 400,0 c 4.4,0, 8-3.6, 8-8L 448,8 z" data-tags="equalizer, control, options, settings, dashboard" />
+<glyph unicode="&#x78;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 224,352A32,32 11340 1 0 288,352A32,32 11340 1 0 224,352zM 320,320A32,32 11340 1 0 384,320A32,32 11340 1 0 320,320zM 128,320A32,32 11340 1 0 192,320A32,32 11340 1 0 128,320zM 224,128L 224,96L 288,96L 288,128L 256,288 z" data-tags="dashboard, control panel" />
+<glyph unicode="&#xe266;" d="M 320,406.706l0-67.979 c 18.103-7.902, 34.75-19.204, 49.137-33.59C 399.358,274.917, 416,234.737, 416,192 s-16.643-82.917-46.863-113.137C 338.917,48.643, 298.738,32, 256,32s-82.917,16.643-113.137,46.863 C 112.643,109.083, 96,149.263, 96,192s 16.643,82.917, 46.863,113.137c 14.387,14.387, 31.034,25.689, 49.137,33.591L 192,406.706  C 99.476,379.166, 32,293.47, 32,192c0-123.712, 100.289-224, 224-224c 123.712,0, 224,100.288, 224,224 C 480,293.47, 412.525,379.166, 320,406.706zM 224,480L 288,480L 288,224L 224,224z" data-tags="switch, power, turn off, off, shutdown" />
+<glyph unicode="&#x54;" d="M 256,480C 114.615,480,0,444.183,0,400l0-48 l 192-192l0-160 c0-17.673, 28.653-32, 64-32c 35.346,0, 64,14.327, 64,32L 320,160 l 192,192L 512,400 C 512,444.183, 397.385,480, 256,480z M 47.192,410.588c 11.972,6.829, 28.791,13.31, 48.639,18.744C 139.803,441.37, 196.685,448, 256,448 c 59.314,0, 116.197-6.63, 160.169-18.668c 19.848-5.434, 36.667-11.915, 48.64-18.744c 7.896-4.503, 12.162-8.312, 14.148-10.588 c-1.986-2.276-6.253-6.084-14.148-10.588c-11.973-6.829-28.792-13.31-48.64-18.744C 372.198,358.63, 315.315,352, 256,352 c-59.315,0-116.197,6.63-160.169,18.668c-19.848,5.434-36.667,11.915-48.639,18.744C 39.296,393.916, 35.030,397.724, 33.043,400 C 35.030,402.276, 39.296,406.084, 47.192,410.588z" data-tags="filter, funnel" />
+<glyph unicode="&#x4c;" d="M 64,0c0-17.673, 14.327-32, 32-32l 320,0 c 17.674,0, 32,14.327, 32,32L 448,352 L 64,352 L 64,0 z M 320,288l 64,0 l0-256 l-64,0 L 320,288 z M 224,288l 64,0 l0-256 l-64,0  L 224,288 z M 128,288l 64,0 l0-256 l-64,0 L 128,288 zM 448,448L 320,448 L 320,480 L 192,480 l0-32 L 64,448 C 28.654,448,0,419.346,0,384l 512,0 C 512,419.346, 483.347,448, 448,448z" data-tags="remove, delete, trashcan, recycle bin, bin, dispose" />
+<glyph unicode="&#x23;" d="M 416,256l-32,0 l0,96 C 384,422.692, 326.692,480, 256,480c-70.692,0-128-57.308-128-128l0-96 L 96,256 c-17.6,0-32-14.4-32-32l0-224 c0-17.6, 14.4-32, 32-32l 320,0 c 17.6,0, 32,14.4, 32,32L 448,224 C 448,241.6, 433.6,256, 416,256z M 256,64c-17.673,0-32,14.327-32,32 s 14.327,32, 32,32s 32-14.327, 32-32S 273.673,64, 256,64z M 320,256L 192,256 l0,96 c0,35.29, 28.71,64, 64,64s 64-28.71, 64-64L 320,256 z" data-tags="lock, secure, private, encrypted" />
+<glyph unicode="&#xe267;" d="M 256,64c-17.673,0-32,14.326-32,32c0,17.673, 14.327,32, 32,32s 32-14.327, 32-32C 288,78.326, 273.673,64, 256,64z M 192,256 l0,96 c0,35.29, 28.71,64, 64,64s 64-28.71, 64-64l0-32 l 64,0 l0,32 C 384,422.692, 326.692,480, 256,480c-70.692,0-128-57.309-128-128l0-96 L 96,256 c-17.601,0-32-14.4-32-32l0-224 c0-17.601, 14.399-32, 32-32l 320,0 c 17.6,0, 32,14.399, 32,32L 448,224 c0,17.6-14.4,32-32,32L 192,256 z" data-tags="unlock, secure, private, encrypted" />
+<glyph unicode="&#x5f;" d="M 352,480c-88.365,0-160-71.634-160-160c0-10.013, 0.929-19.808, 2.688-29.312L0,96l0-96 c0-17.673, 14.327-32, 32-32 l 32,0 l0,32 l 64,0 l0,64 l 64,0 l0,64 l 64,0 l 41.521,41.521C 314.526,163.363, 332.869,160, 352,160c 88.365,0, 160,71.634, 160,160S 440.365,480, 352,480z M 399.937,319.937c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 426.447,319.937, 399.937,319.937z" data-tags="key, password, login, log in, signin, sign in" />
+<glyph unicode="&#x46;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 160,224 c0,53.020, 42.98,96, 96,96s 96-42.98, 96-96s-42.98-96-96-96S 160,170.98, 160,224z M 462.99,138.262L 462.99,138.262l-88.71,36.745 C 380.539,190.099, 384,206.645, 384,224s-3.461,33.901-9.72,48.993l 61.063,25.293l 27.647,11.452C 473.944,283.327, 480,254.373, 480,224 C 480,193.627, 473.943,164.673, 462.99,138.262L 462.99,138.262z M 341.739,430.99L 341.739,430.99L 341.739,430.99l-36.745-88.71 C 289.902,348.539, 273.356,352, 256,352s-33.901-3.461-48.993-9.72l-17.23,41.599l-19.515,47.112C 196.673,441.943, 225.628,448, 256,448 C 286.373,448, 315.327,441.943, 341.739,430.99z M 49.010,309.738l 47.112-19.515l 41.599-17.23C 131.462,257.901, 128,241.355, 128,224 s 3.461-33.901, 9.72-48.993l-88.71-36.745C 38.057,164.673, 32,193.627, 32,224C 32,254.373, 38.057,283.327, 49.010,309.738z  M 170.262,17.010l 11.452,27.647l 25.293,61.063C 222.099,99.461, 238.645,96, 256,96s 33.901,3.461, 48.993,9.72l 36.745-88.71l0,0l0,0 C 315.327,6.058, 286.373,0, 256,0C 225.628,0, 196.673,6.057, 170.262,17.010z" data-tags="support, help, life, lifebuoy" />
+<glyph unicode="&#x62;" d="M 256,480C 114.614,480,0,444.184,0,400l0-64 c0-44.183, 114.611-80, 256-80c 141.385,0, 256,35.817, 256,80L 512,400 C 512,444.184, 397.385,480, 256,480 zM 255.193,224C 140.566,224, 43.94,247.543, 11.32,280C 3.705,272.423,0,264.361,0,256l0-64 c0-44.184, 114.611-80, 256-80 c 141.385,0, 256,35.816, 256,80l0,64 c0,8.361-4.516,16.423-12.131,24C 467.25,247.543, 369.82,224, 255.193,224zM 255.193,80C 140.566,80, 43.94,103.544, 11.32,136C 3.705,128.424,0,120.361,0,112l0-64 c0-44.183, 114.611-80, 256-80 c 141.385,0, 256,35.817, 256,80l0,64 c0,8.361-4.516,16.424-12.131,24C 467.25,103.544, 369.82,80, 255.193,80z" data-tags="database, server, host, storage, save, datecenter" />
+<glyph unicode="&#xe268;" d="M 390.979-32c-27.208,0.001-61.186,16.608-75.809,53.702c-2.034,4.84-4.271,10.714-6.859,17.509 c-8.285,21.749-20.806,54.616-33.892,68.23c-4.79,4.984-8.495,8.599-11.473,11.504c-2.673,2.607-4.921,4.801-6.946,7.019 c-2.025-2.219-4.273-4.412-6.948-7.022c-2.976-2.904-6.68-6.519-11.468-11.5c-13.086-13.616-25.608-46.488-33.895-68.239 c-2.586-6.791-4.823-12.661-6.856-17.499C 182.208-15.391, 148.231-32, 121.025-32c-5.303,0-10.138,0.646-14.373,1.918 c-26.772,8.046-43.012,37.939-40.411,74.386l 0.372,4.206c 3.287,29.404, 21.199,58.458, 50.435,81.806 c 25.344,20.238, 55.31,32.812, 78.204,32.812c 4.53,0, 8.712-0.494, 12.519-1.472l 15.711,32.209 c-16.148,40.414-39.152,100.774-57.123,153.646c-10.015,29.463-17.448,53.594-22.094,71.721 c-7.352,28.691-6.883,38.393-3.916,44.132L 148.95,480l 107.053-219.465L 363.049,479.999l 8.602-16.635 c 2.967-5.739, 3.438-15.441-3.915-44.132c-4.646-18.126-12.079-42.257-22.093-71.72c-17.97-52.868-40.974-113.229-57.123-153.646 l 15.711-32.209c 3.806,0.978, 7.987,1.472, 12.518,1.472c 22.895,0, 52.861-12.574, 78.206-32.814 c 24.995-19.962, 41.713-44.097, 48.090-69.052l 1.179,0.564l 1.535-17.522c 2.603-36.445-13.635-66.338-40.404-74.386 c-4.235-1.272-9.071-1.918-14.373-1.918C 390.98-32, 390.979-32, 390.979-32z M 346.841,39.052 c 18.936-34.353, 35.854-39.491, 44.263-39.491c 11.447,0, 20.018,9.238, 21.691,18.169c 1.097,5.871, 1.296,11.914, 0.592,17.961 c-2.837,24.156-19.338,44.898-32.678,58.044c-18.334,18.065-38.889,30.062-52.085,35.3c-1.313,0.457-2.121,0.526-2.489,0.526 c-0.255,0-0.354-0.031-0.355-0.031C 321.937,127.034, 317.342,98.010, 346.841,39.052z M 183.13,129.035 c-13.115-5.24-33.545-17.236-51.764-35.301c-13.26-13.145-29.656-33.888-32.475-58.052c-0.704-6.030-0.506-12.069, 0.589-17.953 c 1.661-8.93, 10.179-18.169, 21.556-18.169c 8.356,0, 25.17,5.139, 43.991,39.49c 29.312,58.938, 24.764,87.944, 20.903,90.493 c0-0.001-0.001-0.001-0.004-0.001c-0.020,0-0.125,0.018-0.32,0.018C 185.239,129.561, 184.438,129.492, 183.13,129.035z" data-tags="scissors, cut" />
+<glyph unicode="&#x6a;" d="M 416,160L 384,128L 320,288L 256,96L 160,448L 96,128L0,128L0,96L 122.235,96L 164.794,308.803L 225.128,87.58L 252.937-14.385L 322.734,195.005L 354.288,116.115L 372.313,71.057L 429.256,128L 512,128L 512,160 z" data-tags="health, medicine, medical, pulse" />
+<glyph unicode="&#x6b;" d="M 258.181,254.091l 94.386,29.34L 256,351.723L 256,480 L 152.532,405.466L 32,448l 42.533-120.533L0,224l 128,0 l 68.567-96.568l 29.341,94.387 L 448-32l 64,64L 258.181,254.091z M 202.327,277.672l-19.579-62.986l-38.084,53.010L 78.712,267.696 l 39.447,52.861L 96.979,383.021l 62.464-21.182 l 52.862,39.447l0-65.952 l 53.008-38.084L 202.327,277.672z" data-tags="wand, magic, wizard" />
+<glyph unicode="&#x3c;" d="M 256,384C 144.341,384, 47.559,318.979,0,224c 47.559-94.979, 144.341-160, 256-160c 111.657,0, 208.439,65.021, 256,160 C 464.442,318.979, 367.657,384, 256,384z M 382.225,299.148c 30.081-19.187, 55.571-44.887, 74.717-75.148 c-19.146-30.261-44.637-55.961-74.718-75.149C 344.427,124.743, 300.779,112, 256,112c-44.78,0-88.428,12.743-126.225,36.852 C 99.695,168.038, 74.205,193.738, 55.058,224c 19.146,30.262, 44.637,55.962, 74.717,75.148c 1.959,1.25, 3.938,2.461, 5.929,3.65 C 130.725,289.134, 128,274.387, 128,259c0-70.692, 57.308-128, 128-128s 128,57.308, 128,128c0,15.387-2.725,30.134-7.704,43.799 C 378.286,301.61, 380.265,300.398, 382.225,299.148z M 256,275c0-26.51-21.49-48-48-48s-48,21.49-48,48s 21.49,48, 48,48 S 256,301.51, 256,275z" data-tags="eye, views, vision, visit" />
+<glyph unicode="&#xe269;" d="M 419.661,331.792 C 458.483,304.277 490.346,267.246 512,224 C 464.439,129.021 367.657,64 256,64 C 224.717,64 194.604,69.106 166.411,78.542 L 205.389,117.52 C 221.918,113.87 238.875,112 256,112 C 300.779,112 344.427,124.743 382.223,148.852 C 412.304,168.040 437.795,193.74 456.941,224.001 C 438.415,253.284 413.934,278.276 385.116,297.248 L 419.661,331.792 ZM 256,131 C 244.638,131 233.624,132.488 223.136,135.267 L 379.729,291.859 C 382.51,281.373 384,270.362 384,259 C 384,188.308 326.692,131 256,131 ZM 480,480l-26.869,0 L 343.325,370.194C 315.787,379.156, 286.448,384, 256,384C 144.341,384, 47.559,318.979,0,224 c 21.329-42.596, 52.564-79.154, 90.597-106.534L0,26.869L0,0 l 26.869,0 L 480,453.131L 480,480 z M 208,323c 24.022,0, 43.923-17.647, 47.446-40.685 l-54.762-54.762C 177.647,231.077, 160,250.978, 160,275C 160,301.51, 181.49,323, 208,323z M 55.058,224 c 19.146,30.262, 44.637,55.962, 74.717,75.148c 1.959,1.25, 3.938,2.461, 5.929,3.65C 130.725,289.134, 128,274.387, 128,259 c0-29.262, 9.825-56.224, 26.349-77.781l-29.275-29.275C 97.038,170.765, 73.197,195.33, 55.058,224z" data-tags="eye-blocked, views, vision, visit, banned, blocked, forbidden, private" />
+<glyph unicode="&#x6e;" d="M 329.372,105.372L 224,210.745L 224,352L 288,352L 288,237.255L 374.628,150.628 zM 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32z" data-tags="clock, time, schedule" />
+<glyph unicode="&#x6f;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 304,272l-144,80l-32,0 l0-32 l 80-144l 144-80l 32,0 l0,32 L 304,272z M 256,192c-17.673,0-32,14.327-32,32c0,17.673, 14.327,32, 32,32 c 17.673,0, 32-14.327, 32-32C 288,206.327, 273.673,192, 256,192z" data-tags="compass, direction, map, locate" />
+<glyph unicode="&#xe01b;" d="M 224,96A32,32 13140 1 0 288,96A32,32 13140 1 0 224,96zM 256,416c-96.026,0-182.161-42.307-240.815-109.286l 24.081-21.071C 92.055,345.923, 169.577,384, 256,384 c 86.423,0, 163.945-38.077, 216.734-98.357l 24.081,21.071C 438.161,373.693, 352.027,416, 256,416zM 256,320c-67.218,0-127.513-29.615-168.571-76.5l 24.082-21.071C 146.703,262.616, 198.385,288, 256,288 c 57.616,0, 109.297-25.384, 144.489-65.571l 24.082,21.071C 383.513,290.385, 323.219,320, 256,320zM 256,224c-38.41,0-72.865-16.923-96.326-43.715l 24.082-21.071C 201.352,179.308, 227.192,192, 256,192 c 28.808,0, 54.648-12.692, 72.245-32.786l 24.081,21.071C 328.865,207.077, 294.41,224, 256,224z" data-tags="connection, broadcast, wifi, wave, feed" />
+<glyph unicode="&#xe271;" d="M 448,416l0-416 L 112,0 c-26.511,0-48,21.49-48,48c0,26.509, 21.489,48, 48,48l 304,0 L 416,480 L 96,480 C 60.801,480, 32,451.2, 32,416l0-384  c0-35.2, 28.801-64, 64-64l 384,0 L 480,416 L 448,416 zM 128,64L 416,64L 416,32L 128,32z" data-tags="book, reading" />
+<glyph unicode="&#x79;" d="M 192,480L0,224L 192,224L 64-32L 512,288L 256,288L 448,480 z" data-tags="lightning, power" />
+<glyph unicode="&#xe013;" d="M 128,448L 384,448L 384,384L 128,384zM 480,352L 32,352 C 14.4,352,0,337.6,0,320l0-160 c0-17.6, 14.398-32, 32-32l 96,0 l0-128 l 256,0 L 384,128 l 96,0 c 17.6,0, 32,14.4, 32,32L 512,320  C 512,337.6, 497.6,352, 480,352z M 352,32L 160,32 L 160,192 l 192,0 L 352,32 z M 487.2,304c0-12.813-10.387-23.2-23.199-23.2 c-12.813,0-23.201,10.387-23.201,23.2s 10.388,23.2, 23.201,23.2C 476.814,327.2, 487.2,316.813, 487.2,304z" data-tags="print, printer" />
+<glyph unicode="&#x71;" d="M 426.67,480L 85.343,480 C 38.405,480,0,441.594,0,394.656l0-341.314 C0,6.375, 38.406-32, 85.344-32L 426.67-32 c 46.938,0, 85.33,38.374, 85.33,85.342L 512,394.656 C 512,441.594, 473.608,480, 426.67,480z M 139.472,64.376C 115.487,64.376, 96,83.722, 96,107.69 c0,23.842, 19.486,43.406, 43.472,43.406c 24.079,0, 43.53-19.564, 43.53-43.406C 183.001,83.722, 163.55,64.376, 139.472,64.376z  M 248.734,64.002c0,40.905-15.904,79.409-44.73,108.222c-28.857,28.875-67.188,44.813-107.952,44.813L 96.052,279.63 c 118.826,0, 215.563-96.721, 215.563-215.627L 248.734,64.002L 248.734,64.002z M 359.814,64.002 c0,145.531-118.329,263.97-263.688,263.97L 96.126,390.596 c 180.001,0, 326.473-146.562, 326.473-326.596L 359.814,64.002L 359.814,64.002z" data-tags="feed, rss, social" />
+<glyph unicode="&#x43;" d="M 160,288L 224,288L 224,224L 160,224zM 256,288L 320,288L 320,224L 256,224zM 352,288L 416,288L 416,224L 352,224zM 64,96L 128,96L 128,32L 64,32zM 160,96L 224,96L 224,32L 160,32zM 256,96L 320,96L 320,32L 256,32zM 160,192L 224,192L 224,128L 160,128zM 256,192L 320,192L 320,128L 256,128zM 352,192L 416,192L 416,128L 352,128zM 64,192L 128,192L 128,128L 64,128zM 416,480l0-32 l-64,0 L 352,480 L 128,480 l0-32 L 64,448 L 64,480 L0,480 l0-512 l 480,0 L 480,480 L 416,480 z M 448,0L 32,0 L 32,352 l 416,0 L 448,0 z" data-tags="calendar, schedule, date, time, day" />
+<glyph unicode="&#x44;" d="M 64,320L 96,320L 96,288L 64,288zM 128,320L 160,320L 160,288L 128,288zM 192,320L 224,320L 224,288L 192,288zM 256,320L 288,320L 288,288L 256,288zM 320,320L 352,320L 352,288L 320,288zM 384,320L 416,320L 416,288L 384,288zM 64,256L 96,256L 96,224L 64,224zM 128,256L 160,256L 160,224L 128,224zM 192,256L 224,256L 224,224L 192,224zM 256,256L 288,256L 288,224L 256,224zM 320,256L 352,256L 352,224L 320,224zM 384,256L 416,256L 416,224L 384,224zM 64,192L 96,192L 96,160L 64,160zM 128,192L 160,192L 160,160L 128,160zM 192,192L 224,192L 224,160L 192,160zM 256,192L 288,192L 288,160L 256,160zM 320,192L 352,192L 352,160L 320,160zM 384,192L 416,192L 416,160L 384,160zM 64,128L 96,128L 96,96L 64,96zM 128,128L 160,128L 160,96L 128,96zM 192,128L 224,128L 224,96L 192,96zM 256,128L 288,128L 288,96L 256,96zM 320,128L 352,128L 352,96L 320,96zM 384,128L 416,128L 416,96L 384,96zM 64,64L 96,64L 96,32L 64,32zM 128,64L 160,64L 160,32L 128,32zM 192,64L 224,64L 224,32L 192,32zM 256,64L 288,64L 288,32L 256,32zM 320,64L 352,64L 352,32L 320,32zM 384,64L 416,64L 416,32L 384,32zM 416,448L 416,480 l-64,0 l0-64 l-32,0 L 320,448 L 160,448 l0-32 l-32,0 L 128,480 L 64,480 l0-32 L0,448 l0-480 l 480,0 L 480,448 L 416,448 z M 448,0L 32,0 L 32,352 l 416,0 L 448,0 z" data-tags="calendar, schedule, date, time, day" />
+<glyph unicode="&#xe273;" d="M 448,416l-48,0 l0-16 c0-17.645-14.355-32-32-32s-32,14.355-32,32L 336,416 L 176,416 l0-16 c0-17.645-14.355-32-32-32s-32,14.355-32,32L 112,416 L 64,416  c-17.6,0-32-14.4-32-32l0-352 c0-17.6, 14.4-32, 32-32l 384,0 c 17.6,0, 32,14.4, 32,32L 480,384 C 480,401.6, 465.6,416, 448,416z M 448,32.058 c-0.017-0.020-0.038-0.041-0.058-0.058L 64.057,32 c-0.020,0.017-0.041,0.038-0.057,0.058L 64,320 l 384,0 L 448,32.058 zM 144,384c 8.836,0, 16,7.164, 16,16L 160,464 c0,8.836-7.164,16-16,16s-16-7.164-16-16l0-64 C 128,391.164, 135.164,384, 144,384zM 368,384c 8.836,0, 16,7.164, 16,16L 384,464 c0,8.836-7.164,16-16,16s-16-7.164-16-16l0-64 C 352,391.164, 359.164,384, 368,384zM 288,288L 128,288L 128,256L 256,256L 256,192L 128,192L 128,160L 256,160L 256,96L 128,96L 128,64L 288,64 zM 352,64L 384,64L 384,288L 320,288L 320,256L 352,256 zM 436-12L 76-12 c-17.6,0-32,10.4-32,28l0-16 c0-17.6, 14.4-32, 32-32l 360,0 c 17.6,0, 32,14.4, 32,32l0,16 C 468-1.6, 453.6-12, 436-12z" data-tags="calendar, schedule, date, time, day" />
+<glyph unicode="&#x77;" d="M 224,192L 224,416 C 100.288,416,0,315.712,0,192s 100.288-224, 224-224s 224,100.288, 224,224c0,36.017-8.514,70.042-23.618,100.191 L 224,192zM 456.382,356.191C 419.606,429.599, 343.695,480, 256,480l0-224 L 456.382,356.191z" data-tags="pie, statistics, stats, chart, graph" />
+<glyph unicode="&#x76;" d="M0,64L 512,64L 512,0L0,0zM 64,192L 128,192L 128,96L 64,96zM 160,320L 224,320L 224,96L 160,96zM 256,224L 320,224L 320,96L 256,96zM 352,416L 416,416L 416,96L 352,96z" data-tags="bars, statistics, stats, chart, graph" />
+<glyph unicode="&#x75;" d="M 496,0L 384,0L 384,16L 368,16L 368,0L 208,0L 208,16L 192,16L 192,0L 80,0L 80,16L 64,16L 64,0L 32,0L 32,144L 48,144L 48,160L 32,160L 32,272L 48,272L 48,288L 32,288L 32,400L 48,400L 48,416L 32,416L 32,480L0,480L0-32L 512-32L 512,16L 496,16 zM 220,284L 212,276L 212,149.941L 220,157.941 zM 204,268L 196,260L 196,133.941L 204,141.941 zM 188,125.941L 188,258L 180,262L 180,128.833L 187.261,125.202 zM 268,332L 260,324L 260,197.941L 268,205.941 zM 236,300L 228,292L 228,165.941L 236,173.941 zM 172,266L 164,270L 164,136.833L 172,132.833 zM 252,316L 244,308L 244,181.941L 252,189.941 zM 124,290L 116,294L 116,160.833L 124,156.833 zM 92,306L 84,310L 84,176.833L 92,172.833 zM 156,274L 148,278L 148,144.833L 156,140.833 zM 108,298L 100,302L 100,168.833L 108,164.833 zM 76,314L 68,318L 68,184.833L 76,180.833 zM 284,348L 276,340L 276,213.941L 284,221.941 zM 140,282L 132,286L 132,152.833L 140,148.833 zM 412,316L 404,308L 404,137.267L 412,149.267 zM 428,332L 420,324L 420,161.267L 428,173.267 zM 444,348L 436,340L 436,185.267L 444,197.267 zM 476,380L 468,372L 468,233.267L 476,245.267 zM 460,364L 452,356L 452,209.267L 460,221.267 zM 508,412L 500,404L 500,281.267L 508,293.267 zM 492,396L 484,388L 484,257.267L 492,269.267 zM 348,312L 340,317.333L 340,162.666L 348,152 zM 332,322.667L 324,328L 324,184L 332,173.333 zM 300,344L 292,349.333L 292,226.667L 300,216 zM 316,333.333L 308,338.667L 308,205.333L 316,194.666 zM 364,301.333L 356,306.667L 356,141.333L 364,130.666 zM 396,300L 388,292L 388,113.268L 396,125.267 zM 380,290.667L 372,296L 372,119.999L 380,109.333 zM 384,64L 288,192L 192,96L 64,160L 64,32L 512,32L 512,256 z" data-tags="chart, stats, statistics, dualtone, plot, graph" />
+<glyph unicode="&#x32;" d="M 512,338.75L 466.747,384L 377.374,294.624L 326.624,345.375L 415.999,434.75L 370.749,480L 281.374,390.625L 224,448L 180.687,404.688L 436.688,148.687L 480,191.999L 422.624,249.375 zM 137.374,105.373c 82.884-82.881, 192.597-18.181, 259.646,37.732L 175.108,365.017 C 119.196,297.969, 54.494,188.256, 137.374,105.373zM 95.999,127.998L 159.996,64L 64-31.996L 0.002,32.001z" data-tags="power cord, cord, plugin, extension" />
+<glyph unicode="&#x33;" d="M 256,448L 32,352L 256,256L 480,352 zM 32,64L 224-16L 224,208L 32,288 zM 288-16L 480,64L 480,288L 288,208 z" data-tags="cube, box, 3d, miscellaneous" />
+<glyph unicode="&#x34;" d="M 479.165,351.875L 394.94,351.875 c-21.715,0.033-43.348,1.503-22.252,38.729c 21.138,37.3, 36.059,89.521-48.802,89.521 c-84.857,0-69.935-52.221-48.797-89.521c 21.096-37.226-0.538-38.694-22.255-38.729l-91.938,0 c-18.060,0-32.835-14.778-32.835-32.834 l0-102.189 c0-21.756, 5.904-43.513-31.393-22.378C 59.372,215.611,0,230.531,0,145.672c0-84.854, 59.37-69.935, 96.67-48.798 c 37.297,21.137, 31.393-0.62, 31.393-22.38l0-73.783 c0-18.062, 14.777-32.835, 32.835-32.835l 91.811,0 c 21.76,0, 43.517,8.706, 22.382,46.004 c-21.137,37.295-36.061,89.519, 48.797,89.519c 84.858,0, 69.938-52.221, 48.8-89.519c-21.135-37.299, 0.623-46.005, 22.381-46.005l 84.096,0 c 18.062,0, 32.837,14.777, 32.837,32.835L 512.002,319.042 C 512.002,337.099, 497.227,351.875, 479.165,351.875z" data-tags="puzzle, piece, app, addon, extension" />
+<glyph unicode="&#x72;" d="M 348.916,316.476l-32.476,32.461L 154.035,186.566c-26.907-26.896-26.907-70.524,0-97.422 c 26.902-26.896, 70.53-26.896, 97.437,0l 194.886,194.854c 44.857,44.831, 44.857,117.531,0,162.363 c-44.833,44.852-117.556,44.852-162.391,0L 79.335,241.788l 0.017-0.016c-0.145-0.152-0.306-0.288-0.438-0.423 c-62.551-62.548-62.551-163.928,0-226.453c 62.527-62.528, 163.934-62.528, 226.494,0c 0.137,0.137, 0.258,0.284, 0.41,0.438l 0.016-0.017 l 139.666,139.646l-32.493,32.46L 273.35,47.792l-0.008,0 c-0.148-0.134-0.282-0.285-0.423-0.422 c-44.537-44.529-116.99-44.529-161.538,0c-44.531,44.521-44.531,116.961,0,161.489c 0.152,0.152, 0.302,0.291, 0.444,0.423l-0.023,0.030 l 204.64,204.583c 26.856,26.869, 70.572,26.869, 97.443,0c 26.856-26.867, 26.856-70.574,0-97.42L 218.999,121.625 c-8.968-8.961-23.527-8.961-32.486,0c-8.947,8.943-8.947,23.516,0,32.46L 348.916,316.476z" data-tags="attachment, paperclip" />
+<glyph unicode="&#x74;" d="M 256.003,480c-85.374,0-154.661-68.339-154.661-152.54c0-42.102, 25.089-86.239, 53.788-133.976 c 28.7-47.737, 6.022-100.49, 103.695-99.073c 93.617,1.376, 69.35,44.274, 96.629,92.011c 27.289,47.736, 55.205,98.938, 55.205,141.039 C 410.66,411.662, 341.371,480, 256.003,480zM 191.076,80.777l0-40.615 c 19.95-6.488, 41.896-10.088, 64.927-10.088c 23.029,0, 44.97,3.6, 64.921,10.086l0,37.525  c-11.158-10.273-29.447-13.1-62.1-13.645C 222.605,63.443, 202.953,67.848, 191.076,80.777zM 191.753,14.944c 2.507-13.705, 13.3-46.944, 64.25-46.944c 50.949,0, 61.742,33.239, 64.25,46.944 c-28.826-8.815-41.977-9.291-64.25-9.291C 233.728,5.653, 220.577,6.129, 191.753,14.944z" data-tags="lamp, idea, tip, light, bulb" />
+<glyph unicode="&#x73;" d="M 272,480l-48-48l 48-48L 160,256L 48,256 l 88-88L0-12.308L0-32 l 19.692,0 L 200,104l 88-88L 288,128 l 128,112l 48-48l 48,48L 272,480z M 224,208l-32,32 l 112,112l 32-32L 224,208z" data-tags="pushpin, pin" />
+<glyph unicode="&#x63;" d="M 256,480C 167.634,480, 96,408.366, 96,320c0-160, 160-352, 160-352s 160,192, 160,352C 416,408.366, 344.365,480, 256,480z M 256,224 c-53.020,0-96,42.98-96,96s 42.98,96, 96,96s 96-42.98, 96-96S 309.020,224, 256,224z" data-tags="location, map, marker, pin" />
+<glyph unicode="&#xe274;" d="M 131.851,338.143c 2.709-85.392, 23.232-156.27, 61.189-211.080c 17.343-25.043, 38.449-46.778, 62.96-64.873 c 24.511,18.095, 45.618,39.83, 62.959,64.873c 37.957,54.811, 58.48,125.688, 61.189,211.080c-40.225,9.645-79.752,25.45-124.149,49.495 C 211.596,363.589, 172.078,347.788, 131.851,338.143zM 458.873,406.909C 387.436,411.877, 329.919,434.868, 256.002,480C 182.080,434.868, 124.563,411.877, 53.127,406.909 C 33.451,95.568, 202.896-3.16, 256.002-32C 309.105-3.16, 478.55,95.568, 458.873,406.909z M 358.422,99.735 c-35.469-51.219-77.048-80.031-102.421-95.026c-25.374,14.995-66.952,43.807-102.422,95.026 c-49.507,71.489-72.928,164.977-69.753,278.177c 56.394,7.775, 107.891,27.271, 172.175,64.812 c 64.281-37.541, 115.777-57.037, 172.173-64.812C 431.35,264.712, 407.929,171.225, 358.422,99.735z" data-tags="shield, security, defense, protection, anti virus" />
+<glyph unicode="&#x35;" d="M 254.059,418.977C 205.881,476.227, 169.369,480, 96,480l0-256 c 128.267,64, 142.636-8.335, 223.506-1.023 C 399.234,230.197, 467.031,291.564, 512,352C 384.644,322.547, 320.54,339.977, 254.059,418.977zM0,480L 64,480L 64-32L0-32z" data-tags="flag, report, mark" />
+<glyph unicode="&#xe275;" d="M 128,447.5c 19.393-0.786, 33.686-2.681, 46.365-6.903c 19.163-6.381, 35.674-19.009, 55.209-42.224 c 54.165-64.364, 108.925-91.826, 183.107-91.826c 7.729,0, 15.767,0.307, 24.147,0.925c-10.090-11.872-20.705-23.466-31.729-34.059 c-15.453-14.849-30.499-26.521-44.72-34.692c-14.99-8.612-29.547-13.609-43.263-14.851c-1.81-0.164-3.533-0.243-5.271-0.243 c-16.82,0-29.746,7.817-49.442,20.573c-22.574,14.618-50.668,32.812-91.546,32.812c-13.692,0-27.906-2.034-42.859-6.161L 127.998,447.5  M 96,480l0-256 c 30.587,15.262, 54.737,21.011, 74.859,21.011c 61.341,0, 85.367-53.384, 140.988-53.384c 2.648,0, 5.354,0.12, 8.152,0.373 c 79.729,7.221, 147.031,99.564, 192,160c-38.205-8.835-70.726-13.453-99.318-13.453c-66.72,0-112.085,25.129-158.623,80.43 C 205.881,476.227, 169.369,480, 96,480L 96,480zM0,480L 64,480L 64-32L0-32z" data-tags="flag, report, mark" />
+<glyph unicode="&#xe023;" d="M 96,480L 96-32L 256,128L 416-32L 416,480 z" data-tags="bookmark, ribbon" />
+<glyph unicode="&#xe276;" d="M 96,480l0-512 l 160,160l 160-160L 416,480 L 96,480 z M 384,45.255l-128,128l-128-128L 128,448 l 256,0 L 384,45.255 z" data-tags="bookmark, ribbon" />
+<glyph unicode="&#xe277;" d="M 376,448c-51.956,0-97.1-29.138-120-71.96C 233.099,418.862, 187.955,448, 136,448C 60.889,448,0,387.11,0,312c0-184, 256-312, 256-312 s 256,128, 256,312C 512,387.11, 451.111,448, 376,448z" data-tags="heart, like, love, favorite" />
+<glyph unicode="&#xe278;" d="M 256,0l-13.97,6.779C 232.147,11.574,0,126.229,0,300.513C0,381.838, 67.738,448, 151,448c 39.83,0, 77.258-15.237, 105-41.462 C 283.742,432.763, 321.17,448, 361,448c 83.262,0, 151-66.162, 151-147.487c0-174.284-232.147-288.938-242.030-293.733L 256,0z M 151,384 c-47.972,0-87-37.452-87-83.487c0-67.976, 54.123-127.616, 99.526-165.68c 36.25-30.39, 73.062-52.351, 92.474-63.081 c 19.412,10.73, 56.224,32.691, 92.474,63.081C 393.877,172.896, 448,232.537, 448,300.513C 448,346.548, 408.972,384, 361,384 c-32.336,0-61.831-17.070-76.974-44.55L 256,288.59l-28.026,50.86C 212.831,366.93, 183.336,384, 151,384z" data-tags="heart, like, love, favorite" />
+<glyph unicode="&#x5b;" d="M 464,192 C 500.5,192 480,96 448,96 C 464,96 448,16 416,16 C 416-16 384-32 352-32 C 216.824-32 264.368,1.825 128,16 L 128,272 C 248.461,308.134 368,398.712 368,480 C 394.5,480 464,448 368,288 C 368,288 448,288 464,288 C 512,288 496,192 464,192 ZM 96,272 L 96,16 L 128,16 L 128,0 L 64,0 C 46.4,0 32,21.6 32,48 L 32,240 C 32,266.4 46.4,288 64,288 L 128,288 L 128,272 L 96,272 Z" data-tags="thumbs-up, up, like, rate, vote up" />
+<glyph unicode="&#x5c;" d="M 48,256 C 11.5,256 32,352 64,352 C 48,352 64,432 96,432 C 96,464 128,480 160,480 C 295.176,480 247.632,446.175 384,432 L 384,176 C 263.539,139.866 144,49.288 144-32 C 117.5-32 48,0 144,160 C 144,160 64,160 48,160 C 0,160 16,256 48,256 ZM 416,176 L 416,432 L 384,432 L 384,448 L 448,448 C 465.6,448 480,426.4 480,400 L 480,208 C 480,181.6 465.6,160 448,160 L 384,160 L 384,176 L 416,176 Z" data-tags="thumbs-up, up, like, rate, vote down" />
+<glyph unicode="&#x40;" d="M 512,281.475l-176.89,25.704L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z M 256,103.251l-111.731-58.74l 21.338,124.415l-90.393,88.111l 124.92,18.152L 256,388.387l 55.868-113.198 l 124.918-18.152l-90.394-88.111l 21.339-124.415L 256,103.251z" data-tags="star, rate, favorite, bookmark" />
+<glyph unicode="&#x41;" d="M 512,281.475l-176.89,25.704L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z M 256,103.251l-0.471-0.248L 256,388.387l 55.868-113.198l 124.918-18.152l-90.394-88.111l 21.339-124.415 L 256,103.251z" data-tags="star, rate, half" />
+<glyph unicode="&#x42;" d="M 512,281.475L 335.11,307.179L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z" data-tags="star, rate, favorite, bookmark" />
+<glyph unicode="&#xe279;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 352,352 c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 334.327,352, 352,352z M 160,352c 17.673,0, 32-14.327, 32-32 s-14.327-32-32-32s-32,14.327-32,32S 142.327,352, 160,352z M 256,64c-58.255,0-109.232,31.137-137.213,77.672l 41.164,24.698 C 179.538,133.796, 215.222,112, 256,112s 76.462,21.796, 96.049,54.37l 41.164-24.698C 365.232,95.137, 314.255,64, 256,64z" data-tags="smiley, emoticon, face" />
+<glyph unicode="&#xe280;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320 C 128,337.673 142.327,352 160,352 C 177.673,352 192,337.673 192,320 C 192,302.327 177.673,288 160,288 C 142.327,288 128,302.327 128,320 Z M 320,320 C 320,337.673 334.327,352 352,352 C 369.673,352 384,337.673 384,320 C 384,302.327 369.673,288 352,288 C 334.327,288 320,302.327 320,320 ZM 352.049,166.37 L 393.213,141.672 C 365.232,95.137 314.255,64 256,64 C 197.745,64 146.768,95.137 118.787,141.672 L 159.951,166.37 C 179.538,133.796 215.222,112 256,112 C 296.778,112 332.462,133.796 352.049,166.37 Z" data-tags="smiley, emoticon, face" />
+<glyph unicode="&#xe281;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 352,352 c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 334.327,352, 352,352z M 160,352c 17.673,0, 32-14.327, 32-32 s-14.327-32-32-32s-32,14.327-32,32S 142.327,352, 160,352z M 352.049,89.63C 332.462,122.204, 296.777,144, 256,144 c-40.778,0-76.462-21.796-96.049-54.37l-41.164,24.698C 146.767,160.863, 197.745,192, 256,192c 58.254,0, 109.232-31.137, 137.213-77.672 L 352.049,89.63z" data-tags="sad, emoticon, smiley, face" />
+<glyph unicode="&#xe282;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320 C 128,337.673 142.327,352 160,352 C 177.673,352 192,337.673 192,320 C 192,302.327 177.673,288 160,288 C 142.327,288 128,302.327 128,320 Z M 320,320 C 320,337.673 334.327,352 352,352 C 369.673,352 384,337.673 384,320 C 384,302.327 369.673,288 352,288 C 334.327,288 320,302.327 320,320 ZM 159.951,89.63 L 118.787,114.328 C 146.768,160.863 197.745,192 256,192 C 314.254,192 365.231,160.863 393.213,114.328 L 352.049,89.63 C 332.462,122.204 296.778,144 256,144 C 215.221,144 179.538,122.204 159.951,89.63 Z" data-tags="sad, emoticon, smiley, face" />
+<glyph unicode="&#xe283;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.613-256, 256-256c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480z M 320,96L 192,96 l0,32 l 128,0 L 320,96 z M 352,352c 17.673,0, 32-14.327, 32-32c0-17.673-14.327-32-32-32s-32,14.327-32,32C 320,337.673, 334.327,352, 352,352z M 160,352 c 17.673,0, 32-14.327, 32-32c0-17.673-14.327-32-32-32s-32,14.327-32,32C 128,337.673, 142.327,352, 160,352z" data-tags="neutral, emoticon, smiley, face" />
+<glyph unicode="&#xe284;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320c0-17.673, 14.327-32, 32-32s 32,14.327, 32,32s-14.327,32-32,32S 128,337.673, 128,320z M 320,320 c0-17.673, 14.327-32, 32-32s 32,14.327, 32,32s-14.327,32-32,32S 320,337.673, 320,320z M 192,128l 128,0 l0-32 L 192,96 L 192,128 z" data-tags="neutral, emoticon, smiley, face" />
+<glyph unicode="&#xe019;" d="M 64,16A48,48 11340 1 0 160,16A48,48 11340 1 0 64,16zM 384,16A48,48 11340 1 0 480,16A48,48 11340 1 0 384,16zM 480,224L 480,416 L 64,416 C 64,451.346, 35.347,480,0,480l0-32 c 17.645,0, 32-14.355, 32-32l 24.037-206.027C 41.39,198.244, 32,180.223, 32,160 c0-35.347, 28.654-64, 64-64l 384,0 l0,32 L 96,128 c-17.673,0-32,14.327-32,32c0,0.11, 0.007,0.218, 0.008,0.328L 480,224z" data-tags="cart, ecommerce, shopping, products, purchase, buy, store" />
+<glyph unicode="&#xe01a;" d="M 406.494,288L 317.573,403.765C 319.134,407.535, 320,411.666, 320,416c0,17.673-14.326,32-32,32c-17.673,0-32-14.327-32-32 s 14.327-32, 32-32c 1.421,0, 2.816,0.102, 4.188,0.282L 366.144,288L 145.857,288 l 73.956,96.282C 221.184,384.102, 222.58,384, 224,384 c 17.673,0, 32,14.327, 32,32s-14.327,32-32,32s-32-14.327-32-32c0-4.334, 0.866-8.465, 2.427-12.234L 105.506,288L0,288 l0-64 l 32,0 l 32-256l 384,0 l 32,256l 32,0 l0,64 L 406.494,288 z M 160,32L 96,32 l0,64 l 64,0 L 160,32 z M 160,160L 96,160 l0,64 l 64,0 L 160,160 z M 288,32l-64,0 l0,64 l 64,0 L 288,32 z M 288,160l-64,0 l0,64 l 64,0 L 288,160 z M 416,32l-64,0 l0,64 l 64,0 L 416,32 z M 416,160l-64,0 l0,64 l 64,0 L 416,160 z" data-tags="basket, cart, ecommerce, shopping, products, purchase, buy, store" />
+<glyph unicode="&#xe286;" d="M 464,416L 48,416 C 21.6,416,0,394.4,0,368l0-288 c0-26.4, 21.6-48, 48-48l 416,0 c 26.4,0, 48,21.6, 48,48L 512,368 C 512,394.4, 490.4,416, 464,416z M 48,384 l 416,0 c 8.673,0, 16-7.327, 16-16l0-48 L 32,320 l0,48 C 32,376.673, 39.327,384, 48,384z M 464,64L 48,64 c-8.673,0-16,7.327-16,16L 32,224 l 448,0 l0-144  C 480,71.327, 472.673,64, 464,64zM 64,160L 96,160L 96,96L 64,96zM 128,160L 160,160L 160,96L 128,96zM 192,160L 224,160L 224,96L 192,96z" data-tags="credit, card, purchase, payment, ecommerce" />
+<glyph unicode="&#xe287;" d="M 464,416L 48,416 C 21.6,416,0,394.4,0,368l0-288 c0-26.4, 21.6-48, 48-48l 416,0 c 26.4,0, 48,21.6, 48,48L 512,368 C 512,394.4, 490.4,416, 464,416z M 96,96 L 64,96 l0,64 l 32,0 L 96,96 z M 160,96l-32,0 l0,64 l 32,0 L 160,96 z M 224,96l-32,0 l0,64 l 32,0 L 224,96 z M 496,224L 16,224 l0,96 l 480,0 L 496,224 z" data-tags="credit, card, purchase, payment, ecommerce" />
+<glyph unicode="&#x20;" horiz-adv-x="256" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/core/media/jui/fonts/IcoMoon.eot b/core/media/jui/fonts/IcoMoon.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b3e7676e4dfdc9dd245ab32054d20b29f65f41a7
GIT binary patch
literal 25208
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

literal 0
HcmV?d00001

diff --git a/core/media/jui/fonts/IcoMoon.svg b/core/media/jui/fonts/IcoMoon.svg
new file mode 100644
index 00000000..9e23de5d
--- /dev/null
+++ b/core/media/jui/fonts/IcoMoon.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG font generated by IcoMoon.
+<iconset grid="16"></iconset>
+</metadata>
+<defs>
+<font id="IcoMoon" horiz-adv-x="512" >
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
+<glyph unicode="&#xe200;" d="M 133.002,341.661c 16.416,16.422, 43.001,16.422, 59.402,0.016l 3.913-3.934l 50.552,50.578l-3.937,3.94 c-28.812,28.85-69.257,38.939-106.21,30.261C 131.425,455.113, 103.178,479.984, 69.135,480C 31.31,480, 0.658,449.279, 0.65,411.421 c0-32.668, 22.795-60, 53.331-66.915c-11.569-38.725-2.121-82.417, 28.423-112.992l 113.913-113.95l 50.498,50.607L 132.91,282.114 C 116.569,298.475, 116.539,325.177, 133.002,341.661zM 511.356,411.421C 511.364,449.302, 480.697,480, 442.864,480c-34.617,0-63.239-25.722-67.841-59.119 c-38.537,11.332-81.892,1.748-112.32-28.704l-113.92-113.95l 50.551-50.586l 113.883,113.928c 16.47,16.483, 42.994,16.453, 59.342,0.092 c 16.4-16.415, 16.4-43.057-0.016-59.478l-3.897-3.918l 50.505-50.624l 3.929,3.964c 30.229,30.283, 39.839,73.378, 28.806,111.819 C 485.461,347.841, 511.356,376.606, 511.356,411.421zM 453.133,104.468c 9.051,37.229-0.988,78.162-30.054,107.25L 309.334,325.714l-50.551-50.561l 113.76-114.006 c 16.47-16.498, 16.432-43.048, 0.092-59.424c-16.401-16.407-43.002-16.407-59.418,0.015l-3.883,3.895l-50.497-50.623l 3.866-3.864 c 30.758-30.797, 74.809-40.219, 113.684-28.244C 382.703-8.439, 410.354-32, 443.516-32C 481.318-32, 512-1.325, 512,36.563 C 512,71.163, 486.41,99.791, 453.133,104.468zM 306.172,215.658L 192.404,101.662c-16.355-16.384-43.017-16.414-59.472,0.062c-16.409,16.452-16.416,43.049-0.022,59.485 l 3.904,3.887l-50.543,50.562l-3.867-3.856c-29.38-29.401-39.28-70.917-29.725-108.491C 22.48,96.181,0,68.994,0,36.563 C-0.008-1.31, 30.666-32, 68.491-32c 32.55,0.016, 59.794,22.709, 66.77,53.191c 37.351-9.276, 78.499,0.652, 107.672,29.878 l 113.745,113.98L 306.172,215.658z"  />
+<glyph unicode="&#xe005;" d="M0,160L 96,64L 256,224L 416,64L 512,160L 256.001,416 z"  />
+<glyph unicode="&#xe006;" d="M 192,480L 96,384L 256,224L 96,64L 192-32L 448,224 z"  />
+<glyph unicode="&#xe007;" d="M 512,288L 416,384L 256,224L 96,384L0,288L 256,32.001 z"  />
+<glyph unicode="&#xe008;" d="M 320-32L 416,64L 256,224L 416,384L 320,480L 64,224 z"  />
+<glyph unicode="&#xe003;" d="M 416,384L 320,480L 64,224L 320-32L 416,64L 256,224 zM0,480L0-32L 64-32L 64,224L 64,480 z"  />
+<glyph unicode="&#xe004;" d="M 96,64L 192-32L 448,224L 192,480L 96,384L 256,224 zM 512-32L 512,480L 448,480L 448,224L 448-32 z"  />
+<glyph unicode="&#xe009;" d="M 512,224C 512,82.615, 397.385-32, 256-32s -256,114.615, -256,256s 114.615,256, 256,256S 512,365.385, 512,224z M 48,224 c 0-114.875 93.125-208 208-208S 464,109.125, 464,224s -93.125,208, -208,208S 48,338.875, 48,224zM 278.627,374.628l 128-128.001c 12.497-12.496 12.497-32.757 0-45.254c -12.497-12.497 -32.758-12.497,-45.255,0L 288,274.745 L 288,96 c 0-17.673 -14.327-32 -32-32c-17.673,0, -32,14.327, -32,32l0,178.745 l -73.372-73.373c -12.497-12.497 -32.759-12.497,-45.256,0 C 99.124,207.621, 96,215.811, 96,224s 3.124,16.379, 9.372,22.627l 128,128.001C 245.869,387.124, 266.131,387.124, 278.627,374.628z"  />
+<glyph unicode="&#xe00a;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 406.628,246.627l-128.001,128c-12.496,12.497-32.757,12.497-45.254,0c-12.497-12.497-12.497-32.758,0-45.255L 306.745,256 L 128,256 c-17.673,0-32-14.327-32-32c0-17.673, 14.327-32, 32-32l 178.745,0 l-73.373-73.372c-12.497-12.497-12.497-32.759,0-45.256 C 239.621,67.124, 247.811,64, 256,64s 16.379,3.124, 22.627,9.372l 128.001,128C 419.124,213.869, 419.124,234.131, 406.628,246.627z"  />
+<glyph unicode="&#xe00b;" d="M 512,224C 512,365.385, 397.385,480, 256,480s -256-114.615, -256-256s 114.615-256, 256-256S 512,82.615, 512,224z M 48,224 c 0,114.875 93.125,208 208,208S 464,338.875, 464,224s -93.125-208, -208-208S 48,109.125, 48,224zM 278.627,73.372l 128,128.001c 12.497,12.496 12.497,32.757 0,45.254c -12.497,12.497 -32.758,12.497,-45.255,0L 288,173.255 L 288,352 c 0,17.673 -14.327,32 -32,32c-17.673,0, -32-14.327, -32-32l0-178.745 l -73.372,73.373c -12.497,12.497 -32.759,12.497,-45.256,0 C 99.124,240.379, 96,232.189, 96,224s 3.124-16.379, 9.372-22.627l 128-128.001C 245.869,60.876, 266.131,60.876, 278.627,73.372z"  />
+<glyph unicode="&#xe00c;" d="M 256,480C 397.385,480, 512,365.385, 512,224s -114.615-256, -256-256s -256,114.615, -256,256S 114.615,480, 256,480z M 256,16 c 114.875,0 208,93.125 208,208S 370.875,432, 256,432s -208-93.125, -208-208S 141.125,16, 256,16zM 105.372,246.627l 128.001,128c 12.496,12.497 32.757,12.497 45.254,0c 12.497-12.497 12.497-32.758,0-45.255L 205.255,256 L 384,256 c 17.673,0 32-14.327 32-32c0-17.673, -14.327-32, -32-32l-178.745,0 l 73.373-73.372c 12.497-12.497 12.497-32.759,0-45.256 C 272.379,67.124, 264.189,64, 256,64s -16.379,3.124, -22.627,9.372l -128.001,128C 92.876,213.869, 92.876,234.131, 105.372,246.627z"  />
+<glyph unicode="&#xe00f;" d="M 384,160L 256,288L 128,160 z"  />
+<glyph unicode="&#xe010;" d="M 192.001,96L 320.001,224L 192.001,352 z"  />
+<glyph unicode="&#xe011;" d="M 128,288L 256,160L 384,288 z"  />
+<glyph unicode="&#xe012;" d="M 320.001,352L 192.001,224L 320.001,95.999 z"  />
+<glyph unicode="&#xe00e;" d="M 384,256L 256,384L 128,256 zM 128,160L 256,32L 384,160 z"  />
+<glyph unicode="&#xe201;" d="M 160,0L 352,0L 352-32L 160-32zM 160,64L 352,64L 352,32L 160,32zM 160,128L 352,128L 352,96L 160,96zM 256,480L 480,256L 352,256L 352,160L 160,160L 160,256L 32,256 z"  />
+<glyph unicode="&#xe202;" d="M0,320L 32,320L 32,128L0,128zM 64,320L 96,320L 96,128L 64,128zM 128,320L 160,320L 160,128L 128,128zM 512,224L 288,448L 288,320L 192,320L 192,128L 288,128L 288,0 z"  />
+<glyph unicode="&#xe203;" d="M 160,480L 352,480L 352,448L 160,448zM 160,416L 352,416L 352,384L 160,384zM 160,352L 352,352L 352,320L 160,320zM 256-32L 480,192L 352,192L 352,288L 160,288L 160,192L 32,192 z"  />
+<glyph unicode="&#xe204;" d="M 480,320L 512,320L 512,128L 480,128zM 416,320L 448,320L 448,128L 416,128zM 352,320L 384,320L 384,128L 352,128zM0,224L 224,448L 224,320L 320,320L 320,128L 224,128L 224,0 z"  />
+<glyph unicode="&#x27;" d="M 288,355.814L 288,480 l 192-192L 288,96L 288,222.912 C 64.625,228.153, 74.206,71.016, 131.070-32 C-9.286,119.707, 20.52,362.785, 288,355.814z"  />
+<glyph unicode="&#x28;" d="M 380.931-32C 437.794,71.016, 447.375,228.153, 224,222.912L 224,96 L 32,288L 224,480l0-124.186 C 491.481,362.785, 521.285,119.707, 380.931-32z"  />
+<glyph unicode="&#xe205;" d="M 131.070,480C 74.206,376.984, 64.625,219.848, 288,225.088L 288,352 l 192-192L 288-32L 288,92.186 C 20.52,85.215-9.286,328.293, 131.070,480z"  />
+<glyph unicode="&#xe206;" d="M 224,92.186L 224-32 L 32,160l 192,192l0-126.912 C 447.375,219.848, 437.794,376.984, 380.931,480 C 521.286,328.293, 491.481,85.215, 224,92.186z"  />
+<glyph unicode="&#x6c;" d="M0,192c0-76.462, 33.524-145.092, 86.675-192l 42.333,48C 89.145,83.182, 64,134.652, 64,192c0,106.038, 85.965,192, 192,192 c 53.021,0, 101.019-21.493, 135.765-56.239L 320,256l 192,0 L 512,448 l-74.985-74.989C 390.688,419.34, 326.693,448, 256,448 C 114.615,448,0,333.385,0,192z"  />
+<glyph unicode="&#xe207;" d="M 256,448c-70.692,0-134.688-28.66-181.016-74.989L0,448l0-192 l 192,0 l-71.766,71.761C 154.982,362.507, 202.98,384, 256,384 c 106.034,0, 192-85.962, 192-192c0-57.348-25.146-108.818-65.009-144l 42.333-48C 478.475,46.908, 512,115.538, 512,192 C 512,333.385, 397.385,448, 256,448z"  />
+<glyph unicode="&#x7a;" d="M 512,224L 384,320L 384,256L 288,256L 288,352L 352,352L 256,480L 160,352L 224,352L 224,256L 128,256L 128,320L0,224L 128,128L 128,192L 224,192L 224,96L 160,96L 256-32L 352,96L 288,96L 288,192L 384,192L 384,128 z"  />
+<glyph unicode="&#x66;" d="M 512,480 L 512,272 L 432,352 L 336,256 L 288,304 L 384,400 L 304,480 ZM 224,144 L 128,48 L 208-32 L 0-32 L 0,176 L 80,96 L 176,192 Z"  />
+<glyph unicode="&#x67;" d="M 224,192 L 224-16 L 144,64 L 48-32 L 0,16 L 96,112 L 16,192 ZM 512,432 L 416,336 L 496,256 L 288,256 L 288,464 L 368,384 L 464,480 Z"  />
+<glyph unicode="&#x68;" d="M 512,480 L 512,288 L 442.87,357.13 L 336.87,251.13 L 283.13,304.87 L 389.13,410.87 L 320,480 ZM 122.87,410.87 L 228.87,304.87 L 175.13,251.13 L 69.13,357.13 L 0,288 L 0,480 L 192,480 ZM 442.87,90.87 L 512,160 L 512-32 L 320-32 L 389.13,37.13 L 283.13,143.13 L 336.87,196.87 ZM 228.87,143.13 L 122.87,37.13 L 192-32 L 0-32 L 0,160 L 69.13,90.87 L 175.13,196.87 Z"  />
+<glyph unicode="&#x69;" d="M 32,192 L 224,192 L 224,0 L 154.87,69.13 L 53.87-31.87 L 0.13,21.87 L 101.13,122.87 ZM 410.87,122.87 L 511.87,21.87 L 458.13-31.87 L 357.13,69.13 L 288,0 L 288,192 L 480,192 ZM 480,256 L 288,256 L 288,448 L 357.13,378.87 L 458.13,479.87 L 511.87,426.13 L 410.87,325.13 ZM 154.87,378.87 L 224,448 L 224,256 L 32,256 L 101.13,325.13 L 0.13,426.13 L 53.87,479.87 Z"  />
+<glyph unicode="&#xe208;" d="M 96,416L 416,224L 96,32 z"  />
+<glyph unicode="&#xe209;" d="M 64,416L 224,416L 224,32L 64,32zM 288,416L 448,416L 448,32L 288,32z"  />
+<glyph unicode="&#xe210;" d="M 64,416L 448,416L 448,32L 64,32z"  />
+<glyph unicode="&#x7c;" d="M 288,400 L 288,240 L 448,400 L 448,48 L 288,208 L 288,48 L 112,224 Z"  />
+<glyph unicode="&#x7b;" d="M 256,48 L 256,208 L 96,48 L 96,400 L 256,240 L 256,400 L 432,224 Z"  />
+<glyph unicode="&#x7d;" d="M 64,32 L 64,416 L 128,416 L 128,240 L 288,400 L 288,240 L 448,400 L 448,48 L 288,208 L 288,48 L 128,208 L 128,32 Z"  />
+<glyph unicode="&#xe000;" d="M 448,416 L 448,32 L 384,32 L 384,208 L 224,48 L 224,208 L 64,48 L 64,400 L 224,240 L 224,400 L 384,240 L 384,416 Z"  />
+<glyph unicode="&#xe00d;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 192,336L 384,224L 192,112 z"  />
+<glyph unicode="&#xe211;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,320L 224,320L 224,128L 160,128zM 288,320L 352,320L 352,128L 288,128z"  />
+<glyph unicode="&#xe212;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,320L 352,320L 352,128L 160,128z"  />
+<glyph unicode="&#xe213;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 352,144L 240,224L 352,304 zM 224,144L 112,224L 224,304 z"  />
+<glyph unicode="&#xe214;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 160,304L 272,224L 160,144 zM 288,304L 400,224L 288,144 z"  />
+<glyph unicode="&#xe001;" d="M 437.011,405.010C 390.685,451.338, 326.693,480, 256,480C 146.256,480, 52.655,410.936, 16.251,313.906l 59.938-22.477 C 103.491,364.202, 173.692,416, 256,416c 53.020,0, 101.010-21.5, 135.753-56.247L 320,288l 192,0 L 512,480 L 437.011,405.010zM 256,32c-53.020,0-101.013,21.496-135.756,56.244L 192,160L0,160 l0-192 l 74.997,74.997C 121.32-3.334, 185.306-32, 256-32 c 109.745,0, 203.346,69.064, 239.75,166.094l-59.938,22.477C 408.51,83.798, 338.309,32, 256,32z"  />
+<glyph unicode="&#xe002;" d="M 512,352L 384,480l0-96 c-65.386,0-115.376-15.604-152.825-47.704c-2.625-2.25-5.142-4.55-7.581-6.887 c 13.76-19.082, 24.358-38.758, 33.886-57.545C 281.641,301.065, 316.507,320, 384,320l0-96 l0,0 l0-96 c-108.223,0-132.563,48.68-163.378,110.311 c-17.153,34.306-34.89,69.78-67.796,97.985C 115.376,368.396, 65.386,384,0,384l0-64 c 108.223,0, 132.563-48.68, 163.378-110.311 c 17.153-34.306, 34.89-69.78, 67.796-97.985C 268.624,79.604, 318.615,64, 384,64l0-96 l 128,128L 384,224L 512,352zM0,128l0-64 c 65.386,0, 115.375,15.604, 152.825,47.704c 2.625,2.249, 5.142,4.55, 7.581,6.888 c-13.76,19.081-24.359,38.758-33.886,57.545C 102.36,146.936, 67.494,128,0,128z"  />
+<glyph unicode="&#x53;" d="M 496.131,44.302L 374.855,147.449c-12.537,11.283-25.945,16.463-36.776,15.963C 366.707,196.946, 384,240.451, 384,288 C 384,394.039, 298.039,480, 192,480C 85.962,480,0,394.039,0,288c0-106.039, 85.961-192, 192-192c 47.549,0, 91.054,17.293, 124.588,45.922 c-0.5-10.831, 4.68-24.239, 15.963-36.776l 103.147-121.276c 17.661-19.623, 46.511-21.277, 64.11-3.678S 515.754,26.641, 496.131,44.302z M 192,160c-70.692,0-128,57.308-128,128S 121.308,416, 192,416s 128-57.308, 128-128S 262.693,160, 192,160z"  />
+<glyph unicode="&#x64;" d="M 192,384L 160,384L 160,320L 96,320L 96,288L 160,288L 160,224L 192,224L 192,288L 256,288L 256,320L 192,320 zM 318.771,201.076C 339.674,230.021, 352,265.568, 352,304C 352,401.202, 273.202,480, 176,480S0,401.202,0,304s 78.798-176, 176-176 c 38.432,0, 73.979,12.326, 102.924,33.229L 448-32l 64,64L 318.771,201.076z M 176,176c-70.692,0-128,57.308-128,128S 105.308,432, 176,432 s 128-57.308, 128-128S 246.693,176, 176,176z"  />
+<glyph unicode="&#x65;" d="M 96,320L 256,320L 256,288L 96,288zM 318.771,201.076C 339.674,230.021, 352,265.568, 352,304C 352,401.202, 273.202,480, 176,480S0,401.202,0,304s 78.798-176, 176-176 c 38.432,0, 73.979,12.326, 102.924,33.229L 448-32l 64,64L 318.771,201.076z M 176,176c-70.692,0-128,57.308-128,128S 105.308,432, 176,432 s 128-57.308, 128-128S 246.693,176, 176,176z"  />
+<glyph unicode="&#x2b;" d="M 424,312 L 208,96 L 128,96 L 128,176 L 344,392 ZM 451,339 L 371,419 L 399.029,447.029 C 408.363,456.363 423.636,456.363 432.97,447.029 L 479.029,400.97 C 488.363,391.636 488.363,376.363 479.029,367.029 L 451,339 ZM 384,198.209L 384,32 L 64,32 L 64,352 l 176,0 l 64,64L 48,416 C 21.6,416,0,394.4,0,368l0-352 c0-26.4, 21.6-48, 48-48l 352,0 c 26.4,0, 48,21.6, 48,48L 448,255.681 L 384,198.209z"  />
+<glyph unicode="&#x2c;" d="M 432,480 C 476.182,480 512,444.183 512,400 C 512,381.99 506.045,365.371 496,352 L 464,320 L 352,432 L 384,464 C 397.371,474.045 413.989,480 432,480 ZM 32,112L0-32l 144,32l 296,296L 328,408L 32,112z M 357.789,298.211l-224-224l-27.578,27.578l 224,224L 357.789,298.211z"  />
+<glyph unicode="&#x3b;" d="M 160.061,160C 96.036,160, 117.88,46.86,0,21.363c 32.011-21.324, 125.898-39.027, 192.072,10.668 C 249.298,75.006, 224.085,160, 160.061,160zM 505.965,441.965c-32.009,32.007-110.472-72.027-171.617-107.603c-60.98-37.464-144.033-112.027-96.021-160.037 c 48.010-48.013, 122.571,35.040, 160.036,96.022C 433.938,331.495, 537.973,409.958, 505.965,441.965z"  />
+<glyph unicode="&#x5d;" d="M 496,288L 320,288 L 320,464 c0,8.836-7.164,16-16,16l-96,0 c-8.836,0-16-7.164-16-16l0-176 L 16,288 c-8.836,0-16-7.164-16-16l0-96 c0-8.836, 7.164-16, 16-16l 176,0 l0-176 c0-8.836, 7.164-16, 16-16l 96,0 c 8.836,0, 16,7.164, 16,16L 320,160 l 176,0 c 8.836,0, 16,7.164, 16,16l0,96 C 512,280.836, 504.836,288, 496,288z"  />
+<glyph unicode="&#x5e;" d="M0,272l0-96 c0-8.836, 7.164-16, 16-16l 480,0 c 8.836,0, 16,7.164, 16,16l0,96 c0,8.836-7.164,16-16,16L 16,288 C 7.164,288,0,280.836,0,272z"  />
+<glyph unicode="&#x49;" d="M 507.331,68.67c-0.002,0.002-0.004,0.004-0.006,0.005L 352.003,224l 155.322,155.325c 0.002,0.002, 0.004,0.003, 0.006,0.005 c 1.672,1.673, 2.881,3.627, 3.656,5.708c 2.123,5.688, 0.912,12.341-3.662,16.915L 433.952,475.326c-4.574,4.573-11.225,5.783-16.914,3.66 c-2.080-0.775-4.035-1.984-5.709-3.655c0-0.002-0.002-0.003-0.004-0.005L 256.001,320L 100.677,475.325 c-0.002,0.002-0.003,0.003-0.005,0.005c-1.673,1.671-3.627,2.88-5.707,3.655c-5.69,2.124-12.341,0.913-16.915-3.66L 4.676,401.951 c-4.574-4.574-5.784-11.226-3.661-16.914c 0.776-2.080, 1.985-4.036, 3.656-5.708c 0.002-0.001, 0.003-0.003, 0.005-0.005L 160.001,224 L 4.676,68.674c-0.001-0.002-0.003-0.003-0.004-0.005c-1.671-1.673-2.88-3.627-3.657-5.707c-2.124-5.688-0.913-12.341, 3.661-16.915 l 73.374-73.373c 4.575-4.574, 11.226-5.784, 16.915-3.661c 2.080,0.776, 4.035,1.985, 5.708,3.656c 0.001,0.002, 0.003,0.003, 0.005,0.005 l 155.324,155.325l 155.324-155.325c 0.002-0.001, 0.004-0.003, 0.006-0.004c 1.674-1.672, 3.627-2.881, 5.707-3.657 c 5.689-2.123, 12.342-0.913, 16.914,3.661l 73.373,73.374c 4.574,4.574, 5.785,11.227, 3.662,16.915 C 510.212,65.043, 509.003,66.997, 507.331,68.67z"  />
+<glyph unicode="&#x47;" d="M 432,416L 192,176L 80,288L0,208L 192,16L 512,336 z"  />
+<glyph unicode="&#x2a;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 288,192l0-128 l-64,0 L 224,192 L 96,192 l0,64 l 128,0 L 224,384 l 64,0 l0-128 l 128,0 l0-64 L 288,192 z"  />
+<glyph unicode="&#xe215;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 384,192 L 288,192 L 288,96 L 224,96 L 224,192 L 128,192 L 128,256 L 224,256 L 224,352 L 288,352 L 288,256 L 384,256 Z"  />
+<glyph unicode="&#x4b;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 416,192L 96,192 l0,64 l 320,0 L 416,192 z"  />
+<glyph unicode="&#xe216;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 128,256L 384,256L 384,192L 128,192z"  />
+<glyph unicode="&#x4a;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 384,306.745L 301.256,224 L 384,141.256L 384,96 l-45.256,0 L 256,178.744L 173.255,96L 128,96 l0,45.256 L 210.745,224L 128,306.745L 128,352 l 45.255,0 L 256,269.255L 338.744,352L 384,352 L 384,306.745 z"  />
+<glyph unicode="&#xe217;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 352,173.256 L 352,128 L 306.744,128 L 256,178.744 L 205.255,128 L 160,128 L 160,173.256 L 210.745,224 L 160,274.745 L 160,320 L 205.255,320 L 256,269.255 L 306.744,320 L 352,320 L 352,274.745 L 301.256,224 Z"  />
+<glyph unicode="&#xe218;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 208,64L 102,202l 47,49l 59-75 l 185,151l 23-23L 208,64z"  />
+<glyph unicode="&#xe219;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 208,64L 102,202L 149,251L 208,176L 393,327L 416,304 z"  />
+<glyph unicode="&#xe220;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 224,384l 64,0 l0-64 l-64,0 L 224,384 z M 320,64L 192,64 l0,32 l 32,0 L 224,224 l-32,0 l0,32 l 96,0 l0-160 l 32,0 L 320,64 z"  />
+<glyph unicode="&#xe221;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 224,352L 288,352L 288,288L 224,288zM 320,96L 192,96L 192,128L 224,128L 224,224L 192,224L 192,256L 288,256L 288,128L 320,128 z"  />
+<glyph unicode="&#x45;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.613-256, 256-256c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480z M 288,64l-64,0 l0,64 l 64,0 L 288,64 z M 384,256c0-35.29-28.71-64-64-64l-31.942,0 c-0.020-0.017-0.041-0.038-0.058-0.058L 288,160 l-64,0 l0,32 c0,35.29, 28.71,64, 64,64l 31.942,0 c 0.020,0.017, 0.041,0.038, 0.058,0.057l0,63.885 c-0.017,0.020-0.037,0.041-0.058,0.058L 160,320 L 160,384 l 160,0 c 35.29,0, 64-28.71, 64-64L 384,256 z"  />
+<glyph unicode="&#xe222;" d="M 320,384 C 355.29,384 384,355.29 384,320 L 384,256 C 384,220.71 355.29,192 320,192 L 288.059,192 C 288.038,191.982 288.018,191.962 288,191.941 L 288,160 L 224,160 L 224,192 C 224,227.29 252.71,256 288,256 L 319.942,256 C 319.962,256.016 319.983,256.037 320,256.057 L 320,319.942 C 319.983,319.962 319.963,319.983 319.942,320 L 160,320 L 160,384 L 320,384 ZM 224,128L 288,128L 288,64L 224,64zM 256,432 C 200.441,432 148.208,410.364 108.922,371.078 C 69.636,331.792 48,279.559 48,224 C 48,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16 256,16 C 311.559,16 363.792,37.636 403.078,76.922 C 442.364,116.208 464,168.441 464,224 C 464,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432 256,432 Z M 256,480 L 256,480 C 397.385,480 512,365.385 512,224 C 512,82.615 397.385-32 256-32 C 114.615-32 0,82.615 0,224 C 0,365.385 114.615,480 256,480 Z"  />
+<glyph unicode="&#xe223;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 288,64l-64,0 l0,64 l 64,0 L 288,64 z M 288,192l-64,0 L 224,384 l 64,0 L 288,192 z"  />
+<glyph unicode="&#xe224;" d="M 256,432 C 200.441,432 148.208,410.364 108.922,371.078 C 69.636,331.792 48,279.559 48,224 C 48,168.441 69.636,116.208 108.922,76.922 C 148.208,37.636 200.441,16 256,16 C 311.559,16 363.792,37.636 403.078,76.922 C 442.364,116.208 464,168.441 464,224 C 464,279.559 442.364,331.792 403.078,371.078 C 363.792,410.364 311.559,432 256,432 Z M 256,480 L 256,480 C 397.385,480 512,365.385 512,224 C 512,82.615 397.385-32 256-32 C 114.615-32 0,82.615 0,224 C 0,365.385 114.615,480 256,480 ZM 224,128L 288,128L 288,64L 224,64zM 224,384L 288,384L 288,192L 224,192z"  />
+<glyph unicode="&#x48;" d="M 504.978,22.12L 286.441,457.676C 278.070,472.559, 267.035,480, 256,480s-22.070-7.441-30.442-22.324L 7.021,22.12 C-9.722-7.646, 4.521-32, 38.673-32l 434.654,0 C 507.478-32, 521.723-7.646, 504.978,22.12z M 256,32c-17.673,0-32,14.327-32,32 c0,17.674, 14.327,32, 32,32c 17.674,0, 32-14.326, 32-32C 288,46.327, 273.674,32, 256,32z M 278,128l-44,0 l-10,128 c0,17.673, 14.327,32, 32,32s 32-14.327, 32-32L 278,128z"  />
+<glyph unicode="&#xe225;" d="M 256,400.638 L 83.583,32 L 428.417,32 L 256,400.638 Z M 256,480 L 256,480 C 267.035,480 278.070,472.559 286.442,457.676 L 504.978,22.12 C 521.723-7.646 507.478-32 473.327-32 L 38.673-32 C 4.521-32 -9.722-7.646 7.021,22.12 L 225.558,457.676 C 233.93,472.559 244.965,480 256,480 ZM 224,96A32,32 3060 1 0 288,96A32,32 3060 1 0 224,96zM 256,288 C 273.673,288 288,273.673 288,256 L 278,160 L 234,160 L 224,256 C 224,273.673 238.327,288 256,288 Z"  />
+<glyph unicode="&#x3d;" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 z"  />
+<glyph unicode="&#x3e;" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 z M 384,368L 224,208l-96,96l-64-64l 160-160l 224,224L 384,368z"  />
+<glyph unicode="&#x3f;" d="M0,480l0-512 l 512,0 L 512,480 L0,480 z M 480,0L 32,0 L 32,448 l 448,0 L 480,0 zM 128,352L 384,352L 384,96L 128,96z"  />
+<glyph unicode="&#xe226;" d="M0,480L 512,480L 512-32L0-32z"  />
+<glyph unicode="&#xe227;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32z"  />
+<glyph unicode="&#xe228;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 160,224A96,96 13140 1 0 352,224A96,96 13140 1 0 160,224z"  />
+<glyph unicode="&#xe229;" d="M0,224A256,256 5220 1 0 512,224A256,256 5220 1 0 0,224z"  />
+<glyph unicode="&#xe230;" d="M 224,82.745L 121.373,201.372L 150.627,230.627L 224,173.255L 361.372,294.627L 390.628,265.373 zM 415.886,416c 0.039-0.033, 0.081-0.075, 0.114-0.115l0-383.771 c-0.033-0.039-0.075-0.081-0.114-0.114L 96.114,32 c-0.040,0.033-0.081,0.075-0.114,0.114L 96,415.886 c 0.033,0.040, 0.075,0.081, 0.115,0.114L 32,416 l0-384 c0-35.2, 28.8-64, 64-64l 320,0 c 35.2,0, 64,28.8, 64,64L 480,416 L 415.886,416 z M 320,416L 320,448 c0,17.673-14.327,32-32,32l-64,0 c-17.673,0-32-14.327-32-32l0-32 l-64,0 l0-64 l 256,0 L 384,416 L 320,416 z M 288,416l-64,0 L 224,448 l 64,0 L 288,416 z"  />
+<glyph unicode="&#x58;" d="M0,480L 224,480L 224,256L0,256zM 288,480L 512,480L 512,256L 288,256zM0,192L 224,192L 224-32L0-32zM 288,192L 512,192L 512-32L 288-32z"  />
+<glyph unicode="&#x59;" d="M0,480L 128,480L 128,352L0,352zM 192,480L 320,480L 320,352L 192,352zM 384,480L 512,480L 512,352L 384,352zM0,288L 128,288L 128,160L0,160zM 192,288L 320,288L 320,160L 192,160zM 384,288L 512,288L 512,160L 384,160zM0,96L 128,96L 128-32L0-32zM 192,96L 320,96L 320-32L 192-32zM 384,96L 512,96L 512-32L 384-32z"  />
+<glyph unicode="&#x5a;" d="M 192,448L 320,448L 320,320L 192,320zM 192,288L 320,288L 320,160L 192,160zM 192,128L 320,128L 320,0L 192,0z"  />
+<glyph unicode="&#x31;" d="M0,480L 128,480L 128,352L0,352zM 192,480L 512,480L 512,352L 192,352zM0,288L 128,288L 128,160L0,160zM 192,288L 512,288L 512,160L 192,160zM0,96L 128,96L 128-32L0-32zM 192,96L 512,96L 512-32L 192-32z"  />
+<glyph unicode="&#xe231;" d="M0,480L 128,480L 128,352L0,352zM 192,448L 512,448L 512,384L 192,384zM0,288L 128,288L 128,160L0,160zM 192,256L 512,256L 512,192L 192,192zM0,96L 128,96L 128-32L0-32zM 192,64L 512,64L 512,0L 192,0z"  />
+<glyph unicode="&#xe232;" d="M 448,96L 64,96 c-35.2,0-64-28.8-64-64s 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,96, 448,96zM 448,288L 64,288 c-35.2,0-64-28.8-64-64s 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,288, 448,288zM 64,352l 384,0 c 35.2,0, 64,28.8, 64,64S 483.2,480, 448,480L 64,480 C 28.8,480,0,451.2,0,416S 28.8,352, 64,352z"  />
+<glyph unicode="&#x2d;" d="M 416,0L 512,256L 96,256L0,0 zM 64,288 L 0,0 L 0,416 L 144,416 L 208,352 L 416,352 L 416,288 Z"  />
+<glyph unicode="&#x2e;" d="M 224,416L 288,352L 512,352L 512,0L0,0L0,416 z"  />
+<glyph unicode="&#xe234;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 352,128l-64,0 l0-64 l-64,0 l0,64 l-64,0 l0,64 l 64,0 l0,64 l 64,0 l0-64 l 64,0 L 352,128 z"  />
+<glyph unicode="&#xe235;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 352,128L 160,128 l0,64 l 192,0 L 352,128 z"  />
+<glyph unicode="&#xe236;" d="M 210.745,384l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 l0-288 L 32,32 L 32,384 L 210.745,384  M 224,416L0,416 l0-416 l 512,0 L 512,352 L 288,352 L 224,416L 224,416z"  />
+<glyph unicode="&#xe237;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 480,32L 32,32 L 32,384 l 178.745,0 l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 L 480,32 zM 288,256L 224,256L 224,192L 160,192L 160,128L 224,128L 224,64L 288,64L 288,128L 352,128L 352,192L 288,192 z"  />
+<glyph unicode="&#xe238;" d="M 288,352l-64,64L0,416 l0-416 l 512,0 L 512,352 L 288,352 z M 480,32L 32,32 L 32,384 l 178.745,0 l 54.628-54.627l 9.372-9.373L 288,320 l 192,0 L 480,32 zM 160,192L 352,192L 352,128L 160,128z"  />
+<glyph unicode="&#xe016;" d="M 352,480L 32,480 l0-512 l 448,0 L 480,352 L 352,480z M 448,0L 64,0 L 64,448 l 288,0 l0-96 l 96,0 L 448,0 z"  />
+<glyph unicode="&#xe239;" d="M 352,480L 32,480 l0-512 l 448,0 L 480,352 L 352,480z M 448,0L 64,0 L 64,448 l 288,0 l0-96 l 96,0 L 448,0 zM 128,96L 384,96L 384,64L 128,64zM 128,160L 384,160L 384,128L 128,128zM 128,224L 384,224L 384,192L 128,192z"  />
+<glyph unicode="&#x29;" d="M 448,96L 448,160L 384,160L 384,96L 320,96L 320,32L 384,32L 384-32L 448-32L 448,32L 512,32L 512,96 zM 32,448L 320,448L 320,352L 416,352L 416,192L 448,192L 448,352L 320,480L0,480L0-32L 288-32L 288,0L 32,0 z"  />
+<glyph unicode="&#xe017;" d="M 320,96L 512,96L 512,32L 320,32zM 32,448L 320,448L 320,352L 416,352L 416,192L 448,192L 448,352L 320,480L0,480L0-32L 288-32L 288,0L 32,0 z"  />
+<glyph unicode="&#xe240;" d="M 352-32L 256,80L 296.75,120.75L 352,65.125L 480,192L 512,160 zM 32,448l 288,0 l0-96 l 96,0 l0-160 l 32,0 L 448,352 L 320,480L0,480 l0-512 l 288,0 l0,32 L 32,0 L 32,448 z"  />
+<glyph unicode="&#xe241;" d="M 32,448l 288,0 l0-96 l 96,0 l0-160 l 32,0 L 448,352 L 320,480L0,480 l0-512 l 288,0 l0,32 L 32,0 L 32,448 zM 461.256,64L 512,114.744L 512,160L 466.744,160L 416,109.256L 365.256,160L 320,160L 320,114.744L 370.744,64L 320,13.256L 320-32L 365.256-32L 416,18.744L 466.744-32L 512-32L 512,13.256 z"  />
+<glyph unicode="&#xe018;" d="M 416,352l-96,0 L 320,384 L 224,480L0,480 l0-384 l 192,0 l0-128 l 320,0 L 512,256 L 416,352z M 416,306.745L 466.745,256L 416,256 L 416,306.745 z M 224,434.745L 274.745,384L 224,384 L 224,434.745 z M 32,448l 160,0 l0-96 l 96,0 l0-224 L 32,128 L 32,448 z M 480,0L 224,0 l0,96 l 96,0 L 320,320 l 64,0 l0-96 l 96,0 L 480,0 z"  />
+<glyph unicode="&#xe242;" d="M 440,352l-24,0 l0,24 c0,22.056-17.944,40-40,40l-24,0 L 352,440 c0,22.056-17.943,40-40,40l-240,0 c-22.056,0-40-17.944-40-40l0-304 c0-22.057, 17.944-40, 40-40l 24,0 l0-24 c0-22.057, 17.944-40, 40-40l 24,0 l0-24 c0-22.056, 17.944-40, 40-40l 240,0 c 22.056,0, 40,17.944, 40,40L 480,312 C 480,334.056, 462.056,352, 440,352z M 72.001,128c-4.4,0-8,3.6-8,8L 64.001,440 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8l0-24 L 136,416 c-22.056,0-40-17.944-40-40l0-248 L 72.001,128 z M 136,64c-4.4,0-8,3.6-8,8L 128,376 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8l0-24 L 200,352 c-22.056,0-40-17.944-40-40l0-248 L 136,64 z M 448,8c0-4.4-3.6-8-8-8L 200,0 c-4.4,0-8,3.6-8,8L 192,312 c0,4.4, 3.6,8, 8,8l 240,0 c 4.4,0, 8-3.6, 8-8L 448,8 z"  />
+<glyph unicode="&#xe243;" d="M 488,128l-50.411,0 L 320,323.98L 320,424 c0,13.2-10.8,24-24,24l-80,0 c-13.2,0-24-10.8-24-24l0-100.019 L 74.412,128L 24,128 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24L 128,124.020 L 245.588,320l 20.823,0 L 384,124.020L 384,24 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 C 512,117.2, 501.2,128, 488,128z"  />
+<glyph unicode="&#xe244;" d="M 488,96l-8,0 L 480,200 c0,30.878-25.121,56-56,56L 288,256 l0,64 l 8,0 c 13.2,0, 24,10.8, 24,24L 320,424 c0,13.2-10.8,24-24,24l-80,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 8,0 l0-64 L 88,256 c-30.878,0-56-25.122-56-56l0-104 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 c0,13.2-10.8,24-24,24l-8,0 l0,96 l 128,0 l0-96 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 c0,13.2-10.8,24-24,24l-8,0 l0,96 l 128,0 l0-96 l-8,0 c-13.2,0-24-10.8-24-24l0-80 c0-13.2, 10.8-24, 24-24l 80,0 c 13.2,0, 24,10.8, 24,24l0,80 C 512,85.2, 501.2,96, 488,96z M 96,0L 32,0 l0,64 l 64,0 L 96,0 z M 288,0l-64,0 l0,64 l 64,0 L 288,0 z M 224,352L 224,416 l 64,0 l0-64 L 224,352 z M 480,0l-64,0 l0,64 l 64,0 L 480,0 z"  />
+<glyph unicode="&#xe246;" d="M0,448L 512,448L 512,384L0,384zM0,352L 320,352L 320,288L0,288zM0,160L 320,160L 320,96L0,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z"  />
+<glyph unicode="&#xe247;" d="M0,448L 512,448L 512,384L0,384zM 96,352L 416,352L 416,288L 96,288zM 96,160L 416,160L 416,96L 96,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z"  />
+<glyph unicode="&#xe248;" d="M0,448L 512,448L 512,384L0,384zM 192,352L 512,352L 512,288L 192,288zM 192,160L 512,160L 512,96L 192,96zM0,256L 512,256L 512,192L0,192zM0,64L 512,64L 512,0L0,0z"  />
+<glyph unicode="&#xe249;" d="M0,448L 512,448L 512,384L0,384zM0,352L 512,352L 512,288L0,288zM0,256L 512,256L 512,192L0,192zM0,160L 512,160L 512,96L0,96zM0,64L 512,64L 512,0L0,0z"  />
+<glyph unicode="&#xe01c;" d="M 512,64L 512,448 L0,448 l0-384 l 224,0 l0-32 l-96,0 l0-32 l 256,0 l0,32 l-96,0 l0,32 L 512,64 z M 64,384l 384,0 l0-256 L 64,128 L 64,384 z"  />
+<glyph unicode="&#xe01d;" d="M 400,480L 80,480 C 53.6,480, 32,458.4, 32,432l0-416 c0-26.4, 21.6-48, 48-48l 320,0 c 26.4,0, 48,21.6, 48,48L 448,432 C 448,458.4, 426.4,480, 400,480z M 240-16 c-8.836,0-16,7.163-16,16s 7.164,16, 16,16s 16-7.163, 16-16S 248.836-16, 240-16z M 384,32L 96,32 L 96,416 l 288,0 L 384,32 z"  />
+<glyph unicode="&#xe01e;" d="M 384,480L 96,480 C 78.4,480, 64,465.601, 64,448l0-448 c0-17.6, 14.399-32, 32-32l 288,0 c 17.6,0, 32,14.4, 32,32L 416,448 C 416,465.601, 401.6,480, 384,480z M 240-8.891c-13.746,0-24.891,11.145-24.891,24.891s 11.145,24.891, 24.891,24.891s 24.891-11.145, 24.891-24.891 S 253.746-8.891, 240-8.891z M 384,64L 96,64 L 96,416 l 288,0 L 384,64 z"  />
+<glyph unicode="&#x51;" d="M 416,448L 96,448 L0,352l0-336 c0-8.837, 7.163-16, 16-16l 480,0 c 8.836,0, 16,7.163, 16,16L 512,352 L 416,448z M 256,64L 96,192l 96,0 l0,96 l 128,0 l0-96 l 96,0 L 256,64z M 77.255,384l 32,32l 293.489,0 l 32-32L 77.255,384 z"  />
+<glyph unicode="&#x52;" d="M 416,448L 96,448 L0,352l0-336 c0-8.837, 7.163-16, 16-16l 480,0 c 8.836,0, 16,7.163, 16,16L 512,352 L 416,448z M 320,160l0-96 L 192,64 l0,96 L 96,160 l 160,128 l 160-128L 320,160 z M 77.255,384l 32,32l 293.488,0 l 32-32L 77.255,384 z"  />
+<glyph unicode="&#xe021;" d="M 448,128L 448,64L 64,64L 64,128L0,128L0,0L 512,0L 512,128 zM 384,288L 288,288L 288,448L 224,448L 224,288L 128,288L 256,96 z"  />
+<glyph unicode="&#xe022;" d="M 448,128L 448,64L 64,64L 64,128L0,128L0,0L 512,0L 512,128 zM 128,256L 224,256L 224,96L 288,96L 288,256L 384,256L 256,448 z"  />
+<glyph unicode="&#x21;" d="M 512,184.777 L 256,383.491 L 0,184.777 L 0,265.796 L 256,464.509 L 512,265.795 ZM 448,192 L 448,0 L 64,0 L 64,192 L 256,336 Z"  />
+<glyph unicode="&#xe250;" d="M 448,192 L 448,0 L 64,0 L 64,192 L 128,192 L 128,64 L 384,64 L 384,192 ZM 512,184.777 L 256,383.491 L 0,184.777 L 0,265.796 L 256,464.509 L 512,265.795 Z"  />
+<glyph unicode="&#xe024;" d="M 352,192 L 416,256 L 416,0 L 32,0 L 32,384 L 288,384 L 224,320 L 96,320 L 96,64 L 352,64 ZM 480,448 L 480,272 L 414.628,337.372 L 237.255,160 L 192,160 L 192,205.256 L 369.372,382.628 L 304,448 Z"  />
+<glyph unicode="&#xe251;" d="M 96,448l0-384 l 384,0 L 480,448 L 96,448 z M 448,96L 128,96 L 128,416 l 320,0 L 448,96 zM 64,32L 64,352L 32,384L 32,0L 416,0L 384,32 zM 214.627,137.373L 310.627,233.373L 384,160L 384,352L 192,352L 265.373,278.627L 169.373,182.627 z"  />
+<glyph unicode="&#xe252;" d="M 476.698,442.679l-2.014,2.021c-47.074,47.067-124.097,47.067-171.163,0L 194.468,335.632 c-47.067-47.066-47.067-124.088,0-171.155l 2.013-2.013c 3.916-3.924, 8.073-7.462, 12.368-10.729l 39.924,39.925 c-4.651,2.747-9.063,6.036-13.058,10.030l-2.021,2.021c-25.557,25.549-25.557,67.136,0,92.695L 342.758,405.462 c 25.558,25.559, 67.137,25.559, 92.693,0l 2.021-2.012c 25.55-25.558, 25.55-67.146,0-92.695l-49.343-49.343 c 8.566-21.154, 12.624-43.7, 12.269-66.193l 76.302,76.302C 523.767,318.589, 523.767,395.61, 476.698,442.679zM 315.521,285.533c-3.916,3.916-8.073,7.461-12.368,10.72l-39.924-39.916c 4.652-2.748, 9.063-6.037, 13.058-10.031l 2.021-2.020 c 25.558-25.558, 25.558-67.136,0-92.694L 169.243,42.525c-25.559-25.551-67.138-25.551-92.694,0l-2.021,2.021 c-25.549,25.56-25.549,67.138,0,92.694l 49.344,49.343c-8.567,21.153-12.623,43.701-12.269,66.193l-76.301-76.299 c-47.068-47.066-47.068-124.089,0-171.162l 2.013-2.016c 47.076-47.064, 124.096-47.064, 171.164,0l 109.055,109.059 c 47.067,47.066, 47.067,124.097,0,171.163L 315.521,285.533z"  />
+<glyph unicode="&#x2f;" d="M0,416l0-384 l 512,0 L 512,416 L0,416 z M 480,64l-32,0 l-96,144l-64-48L 160,320L 64,64L 32,64 L 32,384 l 448,0 L 480,64 zM 352,304A48,48 13140 1 0 448,304A48,48 13140 1 0 352,304z"  />
+<glyph unicode="&#x30;" d="M 64,352l0-320 l 448,0 L 512,352 L 64,352 z M 480,85.333L 416,192l-72.533-60.444L 288,224L 96,64L 96,320 l 384,0 L 480,85.333 zM 128,240A48,48 8100 1 0 224,240A48,48 8100 1 0 128,240zM 448,416L0,416L0,96L 32,96L 32,384L 448,384 z"  />
+<glyph unicode="&#xe014;" d="M 257.54,416C 92.994,416,0,306.648,0,226.653c0-121.887, 109.354-190.477, 200.308-212.956 C 291.27-8.791, 325.48,32.462, 324.022,80c-1.771,57.75, 27.073,58.496, 47.52,56.459C 391.973,134.408, 512,106.695, 512,198.674 C 512,312.5, 422.072,416, 257.54,416z M 224,384c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 206.327,384, 224,384z M 80,191.754c-8.973,0-16.246,7.273-16.246,16.246S 71.027,224.246, 80,224.246S 96.246,216.973, 96.246,208S 88.973,191.754, 80,191.754z M 128,256c-17.673,0-32,14.327-32,32s 14.327,32, 32,32s 32-14.327, 32-32S 145.673,256, 128,256z M 256,128c-35.346,0-64,21.49-64,48 s 28.654,48, 64,48c 35.347,0, 64-21.49, 64-48S 291.347,128, 256,128z M 368,256c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48 S 394.51,256, 368,256z"  />
+<glyph unicode="&#x55;" d="M 152,176c0-57.438, 46.562-104, 104-104s 104,46.562, 104,104s-46.562,104-104,104S 152,233.438, 152,176z M 480,352L 368,352 c-8,32-16,64-48,64L 192,416 c-32,0-40-32-48-64L 32,352 c-17.6,0-32-14.4-32-32l0-288 c0-17.6, 14.4-32, 32-32l 448,0 c 17.6,0, 32,14.4, 32,32L 512,320 C 512,337.6, 497.6,352, 480,352z M 256,34c-78.425,0-142,63.574-142,142c0,78.425, 63.575,142, 142,142c 78.426,0, 142-63.575, 142-142 C 398,97.574, 334.427,34, 256,34z M 480,256l-64,0 l0,32 l 64,0 L 480,256 z"  />
+<glyph unicode="&#xe015;" d="M 489.42,351.874c-5.294,0-10.729-1.861-15.718-5.383L 384,283.184L 384,336 c0,26.4-21.6,48-48,48L 48,384 c-26.4,0-48-21.6-48-48l0-224 c0-26.4, 21.6-48, 48-48l 288,0 c 26.4,0, 48,21.6, 48,48l0,52.815 l 89.701-63.307c 4.989-3.521, 10.424-5.382, 15.717-5.383 c 0.001,0, 0.001,0, 0.003,0c 7.044,0, 13.477,3.248, 17.646,8.911c 3.228,4.385, 4.934,10.027, 4.934,16.318L 512.001,326.645 C 512,343.208, 500.641,351.874, 489.42,351.874z"  />
+<glyph unicode="&#x56;" d="M 490.594,399.946C 418.778,410.271, 339.428,416, 256.001,416c-83.43,0-162.778-5.729-234.597-16.054 C 7.639,346.083,0,286.571,0,224c0-62.57, 7.639-122.083, 21.404-175.945C 93.223,37.729, 172.572,32, 256.001,32 c 83.427,0, 162.776,5.729, 234.593,16.055C 504.36,101.917, 512,161.43, 512,224C 512,286.571, 504.36,346.083, 490.594,399.946z M 192.001,128L 192.001,320 l 160-96L 192.001,128z"  />
+<glyph unicode="&#x57;" d="M 480,480 L 512,480 L 512,112 C 512,67.817 461.855,32 400,32 C 338.145,32 288,67.817 288,112 C 288,156.184 338.145,192 400,192 C 431.342,192 459.671,182.8 480,167.98 L 480,352 L 224,295.111 L 224,48 C 224,3.817 173.856-32 112-32 C 50.144-32 0,3.817 0,48 C 0,92.184 50.144,128 112,128 C 143.342,128 171.671,118.8 192,103.98 L 192,416 L 480,480 Z"  />
+<glyph unicode="&#x22;" d="M 311.413,128.632c-11.055,1.759-11.307,32.157-11.307,32.157s 32.484,32.158, 39.564,75.401 c 19.045,0, 30.809,45.973, 11.761,62.148C 352.226,315.365, 375.911,432, 256,432c-119.911,0-96.225-116.635-95.432-133.662 c-19.047-16.175-7.285-62.148, 11.761-62.148c 7.079-43.243, 39.564-75.401, 39.564-75.401s-0.252-30.398-11.307-32.157 C 164.976,122.966, 32,64.315, 32,0l 224,0 l 224,0 C 480,64.315, 347.024,122.966, 311.413,128.632z"  />
+<glyph unicode="&#xe01f;" d="M 367.497,77.313c-9.476,1.494-9.692,27.327-9.692,27.327s 27.844,27.328, 33.912,64.076 c 16.326,0, 26.407,39.069, 10.082,52.814c 0.681,14.47, 20.984,113.588-81.799,113.588c-102.782,0-82.479-99.118-81.799-113.588 c-16.327-13.745-6.244-52.814, 10.081-52.814c 6.067-36.748, 33.913-64.076, 33.913-64.076s-0.216-25.833-9.692-27.327 C 241.979,72.497, 128,22.655, 128-32l 192,0 l 192,0 C 512,22.655, 398.021,72.497, 367.497,77.313zM 172.027,68.595c 22.047,13.575, 48.813,26.154, 70.769,33.712c-7.876,11.216-16.647,26.468-22.165,44.531 c-7.703,6.283-13.972,15.266-17.999,26.301c-4.033,11.052-5.561,23.426-4.304,34.842c 0.902,8.196, 3.239,15.833, 6.825,22.544 c-2.175,23.293-3.707,69.017, 26.224,102.366c 11.607,12.933, 26.278,22.23, 43.85,27.843C 272.090,393.114, 255.647,431.119, 192,431.119 c-102.782,0-82.479-99.118-81.799-113.588c-16.327-13.745-6.244-52.814, 10.081-52.814c 6.067-36.748, 33.913-64.076, 33.913-64.076 s-0.216-25.833-9.692-27.327C 113.979,168.497,0,118.655,0,64l 164.798,0 C 167.153,65.537, 169.551,67.070, 172.027,68.595z"  />
+<glyph unicode="&#x6d;" d="M 448,384L 64,384 c-35.2,0-64-28.8-64-64l0-224 c0-35.2, 28.8-64, 64-64l 384,0 c 35.2,0, 64,28.8, 64,64L 512,320 C 512,355.2, 483.2,384, 448,384z M 64,96c0,70.692, 35.817,128, 80,128c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48s-21.49-48-48-48 c 44.183,0, 80-57.308, 80-128L 64,96 z M 448,96L 288,96 l0,32 l 160,0 L 448,96 z M 448,192L 288,192 l0,32 l 160,0 L 448,192 z M 448,288L 288,288 l0,32 l 160,0 L 448,288 z"  />
+<glyph unicode="&#x70;" d="M 32,256L 80,256L 80,176L 32,176zM 32,352L 80,352L 80,272L 32,272zM 32,160L 80,160L 80,80L 32,80zM 32,64L 80,64L 80-16L 32-16zM 96,480l0-512 l 384,0 L 480,480 L 96,480 z M 288,351.835c 35.255,0, 63.835-28.58, 63.835-63.835s-28.58-63.835-63.835-63.835 c-35.255,0-63.835,28.58-63.835,63.835S 252.745,351.835, 288,351.835z M 384,96L 192,96 l0,32 c0,35.347, 28.654,64, 64,64l0,0 l 64,0  c 35.348,0, 64-28.653, 64-64L 384,96 zM 32,448L 80,448L 80,368L 32,368z"  />
+<glyph unicode="&#x26;" d="M 128,160c0,0, 29.412,96, 192,96l0-96 l 192,128L 320,416l0-96 C 192,320, 128,240.164, 128,160zM 352,96L 64,96 L 64,288 l 62.938,0 c 5.047,5.959, 10.456,11.667, 16.244,17.090c 21.982,20.595, 48.281,36.326, 78.057,46.91L0,352 l0-320 l 416,0 L 416,166.312 l-64-42.667L 352,96 z"  />
+<glyph unicode="&#xe257;" d="M 192,224 L 32,224 L 32,288 L 192,288 L 192,352 L 288,256 L 192,160 ZM 512,480 L 512,64 L 320-32 L 320,64 L 128,64 L 128,192 L 160,192 L 160,96 L 320,96 L 320,384 L 448,448 L 160,448 L 160,320 L 128,320 L 128,480 Z"  />
+<glyph unicode="&#xe258;" d="M 384,160 L 384,224 L 224,224 L 224,288 L 384,288 L 384,352 L 480,256 ZM 352,192 L 352,64 L 192,64 L 192-32 L 0,64 L 0,480 L 352,480 L 352,320 L 320,320 L 320,448 L 64,448 L 192,384 L 192,96 L 320,96 L 320,192 Z"  />
+<glyph unicode="&#x24;" d="M 464,448 C 490.4,448 512,426.4 512,400 L 512,144 C 512,117.6 490.4,96 464,96 L 281.6,96 L 128-32 L 128,96 L 48,96 C 21.6,96 0,117.6 0,144 L 0,400 C 0,426.4 21.6,448 48,448 L 464,448 Z"  />
+<glyph unicode="&#x25;" d="M 400,480 C 426.4,480 448,458.4 448,432 L 448,272 C 448,245.6 426.4,224 400,224 L 217.6,224 L 64,96 L 64,224 L 48,224 C 21.6,224 0,245.6 0,272 L 0,432 C 0,458.4 21.6,480 48,480 L 400,480 ZM 528,384 C 554.4,384 576,362.4 576,336 L 576,144 C 576,117.6 554.4,96 528,96 L 448,96 L 448-32 L 294.4,96 L 192,96 L 192,160 L 317.57,160 L 416,72.643 L 416,160 L 512,160 L 512,320 L 480,320 L 480,384 L 528,384 Z" horiz-adv-x="576"  />
+<glyph unicode="&#x60;" d="M 112.5,256 C 174.356,256 224.5,205.855 224.5,144 C 224.5,82.144 174.356,32 112.5,32 C 50.644,32 0.5,82.144 0.5,144 L 0,160 C 0,283.712 100.288,384 224,384 L 224,320 C 181.263,320 141.083,303.357 110.863,273.137 C 105.046,267.319 99.737,261.129 94.948,254.627 C 100.667,255.527 106.528,256 112.5,256 ZM 400.5,256 C 462.355,256 512.5,205.855 512.5,144 C 512.5,82.144 462.355,32 400.5,32 C 338.645,32 288.5,82.144 288.5,144 L 288,160 C 288,283.712 388.288,384 512,384 L 512,320 C 469.263,320 429.083,303.357 398.863,273.137 C 393.045,267.319 387.736,261.129 382.947,254.627 C 388.667,255.527 394.527,256 400.5,256 Z"  />
+<glyph unicode="&#x61;" d="M 400,160 C 338.144,160 288,210.145 288,272 C 288,333.856 338.144,384 400,384 C 461.856,384 512,333.856 512,272 L 512.5,256 C 512.5,132.288 412.212,32 288.5,32 L 288.5,96 C 331.237,96 371.417,112.643 401.637,142.863 C 407.454,148.681 412.763,154.871 417.552,161.373 C 411.833,160.473 405.972,160 400,160 ZM 112,160 C 50.145,160 0,210.145 0,272 C 0,333.856 50.145,384 112,384 C 173.855,384 224,333.856 224,272 L 224.5,256 C 224.5,132.288 124.212,32 0.5,32 L 0.5,96 C 43.237,96 83.417,112.643 113.637,142.863 C 119.455,148.681 124.764,154.871 129.553,161.373 C 123.833,160.473 117.973,160 112,160 Z"  />
+<glyph unicode="&#xe259;" d="M 464,480L 48,480 C 21.6,480,0,458.4,0,432l0-288 c0-26.4, 21.6-48, 48-48l 80,0 l0-128 l 153.6,128L 464,96 c 26.4,0, 48,21.6, 48,48L 512,432 C 512,458.4, 490.4,480, 464,480z M 224,344.615c-29.821-6.85-55.189-28.007-70.488-56.941C 155.646,287.889, 157.81,288, 160,288 c 35.346,0, 64-28.654, 64-64c0-35.346-28.654-64-64-64s-64,28.654-64,64c0,43.612, 15.198,84.729, 42.795,115.775 C 162.042,365.927, 191.74,382.388, 224,387.379L 224,344.615 z M 416,344.615c-29.82-6.85-55.189-28.007-70.488-56.941 C 347.646,287.889, 349.81,288, 352,288c 35.346,0, 64-28.654, 64-64c0-35.346-28.654-64-64-64s-64,28.654-64,64 c0,43.612, 15.198,84.729, 42.795,115.775C 354.041,365.927, 383.74,382.388, 416,387.379L 416,344.615 z"  />
+<glyph unicode="&#xe260;" d="M 457.153,376.352 C 510.42,346.068 512,313.643 512.002,291.003 L 512.002,287.606 C 512.002,282.424 507.533,278.188 502.074,278.188 L 381.928,278.188 C 376.469,278.188 372,282.424 372,287.606 L 372,299.059 C 372,327.664 344.645,332.234 329.551,334.664 C 314.455,337.090 276.934,339.441 256.071,339.441 C 256.045,339.441 256.025,339.441 256.005,339.441 C 255.976,339.441 255.956,339.441 255.928,339.441 C 235.066,339.441 197.541,337.091 182.448,334.664 C 167.355,332.237 139.999,327.666 139.999,299.059 L 139.999,287.606 C 139.999,282.424 135.53,278.188 130.073,278.188 L 9.927,278.188 C 4.47,278.188 0.001,282.424 0.001,287.606 L 0.001,291.003 C 0.001,313.643 1.581,346.068 54.848,376.352 C 118.198,412.362 208.777,416 255.928,416 C 255.956,415.975 255.976,415.945 256.005,415.922 C 256.023,415.944 256.044,415.976 256.071,416 C 303.223,416 393.803,412.366 457.153,376.352 ZM 256.001,288c-28.374,0-87.443-2.126-117.456-38.519C 108.523,213.098, 33.455,32, 100.398,32c 66.956,0, 125.458,0, 155.606,0 c 30.137,0, 88.648,0, 155.595,0c 66.945,0-8.125,181.098-38.137,217.481C 343.444,285.874, 284.362,288, 256.001,288z M 256,96 c-35.346,0-64,28.653-64,64s 28.654,64, 64,64c 35.347,0, 64-28.653, 64-64S 291.347,96, 256,96z"  />
+<glyph unicode="&#xe261;" d="M 352,160c-32-32-32-64-64-64s-64,32-96,64s-64,64-64,96s 32,32, 64,64S 128,448, 96,448S0,352,0,352c0-64, 65.75-193.75, 128-256 s 192-128, 256-128c0,0, 96,64, 96,96S 384,192, 352,160z"  />
+<glyph unicode="&#x4d;" d="M 325.608,214.818L 512,86.264L 512,382.211 zM0,382.211L0,86.264L 186.388,214.836 zM 256,152.309L 211.499,192.264L0,64L 512,64L 300.495,192.264 zM 496.64,384L 15.36,384L 256,203.074 z"  />
+<glyph unicode="&#x4e;" d="M 325.607,118.95L 512-9.605L 512,286.343 zM0,286.343L0-9.605L 186.388,118.968 zM 256,56.44L 211.499,96.395L0-31.868L 512-31.868L 300.494,96.395 zM 15.359,288L 496.64,288L 255.999,468.926 z"  />
+<glyph unicode="&#x4f;" d="M 352,384L 160,384 L0,192l0-80 l0-48 c0-17.673, 14.327-32, 32-32l 448,0 c 17.674,0, 32,14.327, 32,32l0,48 l0,80 L 352,384z M 384,192l-64-64L 192,128 l-64,64L 41.655,192 l 133.333,160l 162.024,0 l 133.333-160L 384,192 z"  />
+<glyph unicode="&#x50;" d="M 352,384L 160,384 L0,192l0-128 c0-17.673, 14.327-32, 32-32l 448,0 c 17.674,0, 32,14.327, 32,32L 512,192 L 352,384z M 320,128L 192,128 l-32,32l 192,0  L 320,128z M 41.655,192l 133.333,160l 162.024,0 l 133.333-160L 41.655,192 zM 142.482,288L 369.518,288L 342.851,320L 169.148,320 zM 89.149,224L 422.852,224L 396.185,256L 115.815,256 z"  />
+<glyph unicode="&#xe020;" d="M 480,352L 352,352 L 352,384 c0,17.6-14.4,32-32,32L 192,416 c-17.602,0-32-14.4-32-32l0-32 L 32,352 c-17.6,0-32-14.4-32-32l0-288 c0-17.601, 14.398-32, 32-32l 448,0 c 17.6,0, 32,14.399, 32,32L 512,320 C 512,337.6, 497.6,352, 480,352z M 192,383.942 c 0.017,0.020, 0.037,0.041, 0.057,0.058l 127.886,0 c 0.021-0.017, 0.041-0.038, 0.059-0.058L 320.002,352 L 192,352 L 192,383.942 z M 480,224l-64,0 l0-48 c0-8.801-7.2-16-16-16l-32,0 c-8.802,0-16,7.199-16,16l0,48 L 160,224 l0-48 c0-8.801-7.2-16-16-16l-32,0 c-8.801,0-16,7.199-16,16l0,48 L 32,224 l0,32 l 448,0 L 480,224 z"  />
+<glyph unicode="&#xe262;" d="M 272,480L0,208l 240-240l 272,272L 512,480 L 272,480 z M 400,320c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 426.51,320, 400,320z"  />
+<glyph unicode="&#xe263;" d="M 448,416 L 298.51,416 L 90.51,208 L 240,58.51 L 448,266.51 L 448,416 Z M 512,480 L 512,480 L 512,240 L 240-32 L 0,208 L 272,480 L 512,480 ZM 320,336A48,48 3060 1 0 416,336A48,48 3060 1 0 320,336z"  />
+<glyph unicode="&#xe264;" d="M 496,448L 384,448 c-26.4,0-63.273-15.273-81.941-33.941L 113.941,225.941c-18.667-18.667-18.667-49.214,0-67.882l 140.118-140.117 c 18.667-18.668, 49.214-18.668, 67.882,0l 188.117,188.117C 528.727,224.727, 544,261.6, 544,288L 544,400 C 544,426.4, 522.4,448, 496,448z M 432,288 c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 458.51,288, 432,288zM 43.313,180.687 L 214.502,9.498 C 196.37-0.082 173.271,2.729 158.059,17.942 L 17.941,158.059 C -0.726,176.727 -0.726,207.274 17.941,225.941 L 206.059,414.059 C 224.727,432.727 261.6,448 288,448 L 43.313,203.314 C 37.091,197.091 37.091,186.91 43.313,180.687 Z" horiz-adv-x="544"  />
+<glyph unicode="&#xe265;" d="M 480,384 L 384,384 C 381.158,384 373.652,382.643 364.621,378.902 C 355.59,375.161 349.322,370.813 347.312,368.804 L 170.509,192 L 288,74.51 L 464.803,251.314 C 466.813,253.323 471.161,259.591 474.901,268.622 C 478.643,277.652 480,285.158 480,288 L 480,384 Z M 496,448 L 496,448 C 522.4,448 544,426.4 544,400 L 544,288 C 544,261.6 528.727,224.727 510.058,206.059 L 321.941,17.942 C 312.607,8.608 300.304,3.941 288,3.941 C 275.696,3.941 263.392,8.608 254.059,17.942 L 113.941,158.059 C 95.274,176.727 95.274,207.274 113.941,225.941 L 302.059,414.059 C 320.727,432.727 357.6,448 384,448 L 496,448 ZM 43.313,180.687 L 214.502,9.498 C 196.37-0.082 173.271,2.729 158.059,17.942 L 17.941,158.059 C -0.726,176.727 -0.726,207.274 17.941,225.941 L 206.059,414.059 C 224.727,432.727 261.6,448 288,448 L 43.313,203.314 C 37.091,197.091 37.091,186.91 43.313,180.687 ZM 384,320A32,32 3060 1 0 448,320A32,32 3060 1 0 384,320z" horiz-adv-x="544"  />
+<glyph unicode="&#x38;" d="M 466.895,174.875c-26.863,46.527-10.708,106.152, 36.076,133.244l-50.313,87.146c-14.375-8.427-31.088-13.259-48.923-13.259 c-53.768,0-97.354,43.873-97.354,97.995L 205.752,480.001 c 0.133-16.705-4.037-33.641-12.979-49.126 c-26.862-46.528-86.578-62.351-133.431-35.379L 9.030,308.35c 14.485-8.236, 27.025-20.294, 35.943-35.739 c 26.819-46.454, 10.756-105.96-35.854-133.112l 50.313-87.146c 14.325,8.348, 30.958,13.127, 48.7,13.127 c 53.598,0, 97.072-43.596, 97.35-97.479l 100.627,0 c-0.043,16.537, 4.136,33.285, 12.983,48.609 c 26.818,46.453, 86.388,62.297, 133.207,35.506l 50.313,87.145C 488.222,147.494, 475.766,159.51, 466.895,174.875z M 256,120.334 c-57.254,0-103.668,46.412-103.668,103.667c0,57.254, 46.413,103.667, 103.668,103.667c 57.254,0, 103.666-46.413, 103.666-103.667 C 359.665,166.746, 313.254,120.334, 256,120.334z"  />
+<glyph unicode="&#x37;" d="M 181.861,118.974l 20.649,28.908l-22.627,22.628l-28.909-20.648c-5.361,2.997-11.102,5.387-17.133,7.096L 128,192L 96,192 l-5.84-35.043c-6.031-1.709-11.772-4.099-17.133-7.096L 44.118,170.51L 21.49,147.882l 20.649-28.908 c-2.997-5.36-5.387-11.103-7.096-17.133L0,96l0-32 l 35.043-5.841c 1.709-6.030, 4.099-11.772, 7.096-17.133L 21.49,12.118l 22.627-22.628 l 28.909,20.648c 5.361-2.997, 11.102-5.387, 17.133-7.096L 96-32l 32,0 l 5.84,35.043c 6.031,1.709, 11.772,4.099, 17.133,7.096l 28.909-20.648 l 22.627,22.628l-20.649,28.908c 2.997,5.36, 5.387,11.103, 7.096,17.133L 224,64l0,32 l-35.043,5.841 C 187.248,107.871, 184.858,113.613, 181.861,118.974z M 112,48c-17.674,0-32,14.327-32,32s 14.326,32, 32,32s 32-14.327, 32-32 S 129.674,48, 112,48zM 512,288l0,32 l-33.691,6.125c-0.621,4.023-1.416,7.989-2.362,11.895l 28.779,18.55L 492.48,386.134l-33.472-7.234 c-2.107,3.455-4.363,6.81-6.746,10.065l 19.503,28.171l-22.628,22.627l-28.171-19.503c-3.256,2.383-6.61,4.638-10.065,6.747 l 7.234,33.472L 388.571,472.726l-18.55-28.779c-3.906,0.946-7.872,1.741-11.895,2.362L 352,480l-32,0 l-6.126-33.691 c-4.023-0.621-7.988-1.416-11.895-2.362L 283.43,472.726L 253.866,460.48l 7.234-33.472c-3.455-2.108-6.81-4.364-10.065-6.747 l-28.171,19.503l-22.627-22.627l 19.503-28.171c-2.383-3.255-4.639-6.61-6.747-10.065l-33.472,7.234l-12.246-29.564l 28.779-18.55 c-0.946-3.906-1.741-7.871-2.362-11.895L 160,320l0-32 l 33.691-6.125c 0.621-4.023, 1.416-7.989, 2.362-11.895l-28.779-18.55 l 12.246-29.564l 33.472,7.234c 2.108-3.455, 4.364-6.809, 6.747-10.065l-19.503-28.171l 22.627-22.628l 28.171,19.503 c 3.255-2.383, 6.61-4.638, 10.065-6.746l-7.234-33.472l 29.564-12.246l 18.551,28.779c 3.905-0.946, 7.871-1.741, 11.894-2.362L 320,128l 32,0 l 6.126,33.691c 4.022,0.621, 7.988,1.416, 11.895,2.362l 18.55-28.779l 29.564,12.246l-7.234,33.472 c 3.455,2.108, 6.81,4.363, 10.065,6.746l 28.171-19.503l 22.628,22.628l-19.503,28.171c 2.383,3.256, 4.638,6.61, 6.746,10.065 l 33.472-7.234l 12.246,29.565l-28.779,18.55c 0.946,3.906, 1.741,7.871, 2.362,11.895L 512,288z M 336,234.4 c-38.439,0-69.6,31.161-69.6,69.6c0,38.439, 31.16,69.6, 69.6,69.6s 69.6-31.161, 69.6-69.6C 405.6,265.561, 374.44,234.4, 336,234.4z"  />
+<glyph unicode="&#x36;" d="M 507.256,84.744L 308.744,283.256c-11.030,11.031-38.41,2.154-65.372-19.758L 96,410.87L 80,448L 28.768,480L0,451.232L 32,400 l 37.13-16l 147.373-147.372c-21.913-26.963-30.79-54.342-19.76-65.372c 0.003-0.003, 0.006-0.005, 0.009-0.008l 198.503-198.504 c 12.976-12.975, 48.565,1.579, 79.494,32.508C 505.677,36.18, 520.23,71.771, 507.256,84.744z M 445.435,34.565 c-3.71-3.71-8.572-5.565-13.435-5.565s-9.725,1.855-13.435,5.565l-160,160c-7.421,7.42-7.421,19.449,0,26.869 c 7.42,7.42, 19.449,7.42, 26.869,0l 160-160C 452.855,54.015, 452.855,41.985, 445.435,34.565z"  />
+<glyph unicode="&#x3a;" d="M 507.882,411.883L 448,352l-64,64l 59.882,59.883C 435.057,478.557, 425.698,480, 416,480c-53.021,0-96-42.98-96-96 c0-9.697, 1.442-19.057, 4.116-27.882L 123.882,155.883C 115.057,158.557, 105.698,160, 96,160c-53.021,0-96-42.98-96-96 c0-9.697, 1.442-19.058, 4.117-27.882L 64,96l 64-64l-59.883-59.882C 76.943-30.556, 86.302-32, 96-32c 53.020,0, 96,42.981, 96,96 c0,9.698-1.444,19.059-4.118,27.883l 200.234,200.235C 396.943,289.444, 406.302,288, 416,288c 53.020,0, 96,42.981, 96,96 C 512,393.698, 510.556,403.058, 507.882,411.883z"  />
+<glyph unicode="&#x39;" d="M 144,320L 80,320 c-8.8,0-16-7.2-16-16l0-32 c0-8.8, 7.2-16, 16-16l 64,0 c 8.8,0, 16,7.2, 16,16l0,32 C 160,312.8, 152.8,320, 144,320zM 96,416L 128,416L 128,336L 96,336zM 96,240L 128,240L 128,32L 96,32zM 272,192l-64,0 c-8.8,0-16-7.2-16-16l0-32 c0-8.8, 7.2-16, 16-16l 64,0 c 8.801,0, 16,7.2, 16,16l0,32 C 288,184.8, 280.801,192, 272,192zM 224.001,416L 256.001,416L 256.001,208L 224.001,208zM 224.001,112L 256.001,112L 256.001,32L 224.001,32zM 400,288l-64,0 c-8.799,0-16-7.2-16-16l0-32 c0-8.8, 7.201-16, 16-16l 64,0 c 8.801,0, 16,7.2, 16,16l0,32 C 416,280.8, 408.801,288, 400,288zM 352,416L 384,416L 384,304L 352,304zM 352,208L 384,208L 384,32L 352,32zM 440,480L 40,480 C 17.944,480,0,462.056,0,440l0-432 c0-22.056, 17.944-40, 40-40l 400,0 c 22.056,0, 40,17.944, 40,40L 480,440  C 480,462.056, 462.056,480, 440,480z M 448,8c0-4.4-3.6-8-8-8L 40,0 c-4.4,0-8,3.6-8,8L 32,440 c0,4.4, 3.6,8, 8,8l 400,0 c 4.4,0, 8-3.6, 8-8L 448,8 z"  />
+<glyph unicode="&#x78;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32zM 224,352A32,32 11340 1 0 288,352A32,32 11340 1 0 224,352zM 320,320A32,32 11340 1 0 384,320A32,32 11340 1 0 320,320zM 128,320A32,32 11340 1 0 192,320A32,32 11340 1 0 128,320zM 224,128L 224,96L 288,96L 288,128L 256,288 z"  />
+<glyph unicode="&#xe266;" d="M 320,406.706l0-67.979 c 18.103-7.902, 34.75-19.204, 49.137-33.59C 399.358,274.917, 416,234.737, 416,192 s-16.643-82.917-46.863-113.137C 338.917,48.643, 298.738,32, 256,32s-82.917,16.643-113.137,46.863 C 112.643,109.083, 96,149.263, 96,192s 16.643,82.917, 46.863,113.137c 14.387,14.387, 31.034,25.689, 49.137,33.591L 192,406.706  C 99.476,379.166, 32,293.47, 32,192c0-123.712, 100.289-224, 224-224c 123.712,0, 224,100.288, 224,224 C 480,293.47, 412.525,379.166, 320,406.706zM 224,480L 288,480L 288,224L 224,224z"  />
+<glyph unicode="&#x54;" d="M 256,480C 114.615,480,0,444.183,0,400l0-48 l 192-192l0-160 c0-17.673, 28.653-32, 64-32c 35.346,0, 64,14.327, 64,32L 320,160 l 192,192L 512,400 C 512,444.183, 397.385,480, 256,480z M 47.192,410.588c 11.972,6.829, 28.791,13.31, 48.639,18.744C 139.803,441.37, 196.685,448, 256,448 c 59.314,0, 116.197-6.63, 160.169-18.668c 19.848-5.434, 36.667-11.915, 48.64-18.744c 7.896-4.503, 12.162-8.312, 14.148-10.588 c-1.986-2.276-6.253-6.084-14.148-10.588c-11.973-6.829-28.792-13.31-48.64-18.744C 372.198,358.63, 315.315,352, 256,352 c-59.315,0-116.197,6.63-160.169,18.668c-19.848,5.434-36.667,11.915-48.639,18.744C 39.296,393.916, 35.030,397.724, 33.043,400 C 35.030,402.276, 39.296,406.084, 47.192,410.588z"  />
+<glyph unicode="&#x4c;" d="M 64,0c0-17.673, 14.327-32, 32-32l 320,0 c 17.674,0, 32,14.327, 32,32L 448,352 L 64,352 L 64,0 z M 320,288l 64,0 l0-256 l-64,0 L 320,288 z M 224,288l 64,0 l0-256 l-64,0  L 224,288 z M 128,288l 64,0 l0-256 l-64,0 L 128,288 zM 448,448L 320,448 L 320,480 L 192,480 l0-32 L 64,448 C 28.654,448,0,419.346,0,384l 512,0 C 512,419.346, 483.347,448, 448,448z"  />
+<glyph unicode="&#x23;" d="M 416,256l-32,0 l0,96 C 384,422.692, 326.692,480, 256,480c-70.692,0-128-57.308-128-128l0-96 L 96,256 c-17.6,0-32-14.4-32-32l0-224 c0-17.6, 14.4-32, 32-32l 320,0 c 17.6,0, 32,14.4, 32,32L 448,224 C 448,241.6, 433.6,256, 416,256z M 256,64c-17.673,0-32,14.327-32,32 s 14.327,32, 32,32s 32-14.327, 32-32S 273.673,64, 256,64z M 320,256L 192,256 l0,96 c0,35.29, 28.71,64, 64,64s 64-28.71, 64-64L 320,256 z"  />
+<glyph unicode="&#xe267;" d="M 256,64c-17.673,0-32,14.326-32,32c0,17.673, 14.327,32, 32,32s 32-14.327, 32-32C 288,78.326, 273.673,64, 256,64z M 192,256 l0,96 c0,35.29, 28.71,64, 64,64s 64-28.71, 64-64l0-32 l 64,0 l0,32 C 384,422.692, 326.692,480, 256,480c-70.692,0-128-57.309-128-128l0-96 L 96,256 c-17.601,0-32-14.4-32-32l0-224 c0-17.601, 14.399-32, 32-32l 320,0 c 17.6,0, 32,14.399, 32,32L 448,224 c0,17.6-14.4,32-32,32L 192,256 z"  />
+<glyph unicode="&#x5f;" d="M 352,480c-88.365,0-160-71.634-160-160c0-10.013, 0.929-19.808, 2.688-29.312L0,96l0-96 c0-17.673, 14.327-32, 32-32 l 32,0 l0,32 l 64,0 l0,64 l 64,0 l0,64 l 64,0 l 41.521,41.521C 314.526,163.363, 332.869,160, 352,160c 88.365,0, 160,71.634, 160,160S 440.365,480, 352,480z M 399.937,319.937c-26.51,0-48,21.49-48,48s 21.49,48, 48,48s 48-21.49, 48-48S 426.447,319.937, 399.937,319.937z"  />
+<glyph unicode="&#x46;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 160,224 c0,53.020, 42.98,96, 96,96s 96-42.98, 96-96s-42.98-96-96-96S 160,170.98, 160,224z M 462.99,138.262L 462.99,138.262l-88.71,36.745 C 380.539,190.099, 384,206.645, 384,224s-3.461,33.901-9.72,48.993l 61.063,25.293l 27.647,11.452C 473.944,283.327, 480,254.373, 480,224 C 480,193.627, 473.943,164.673, 462.99,138.262L 462.99,138.262z M 341.739,430.99L 341.739,430.99L 341.739,430.99l-36.745-88.71 C 289.902,348.539, 273.356,352, 256,352s-33.901-3.461-48.993-9.72l-17.23,41.599l-19.515,47.112C 196.673,441.943, 225.628,448, 256,448 C 286.373,448, 315.327,441.943, 341.739,430.99z M 49.010,309.738l 47.112-19.515l 41.599-17.23C 131.462,257.901, 128,241.355, 128,224 s 3.461-33.901, 9.72-48.993l-88.71-36.745C 38.057,164.673, 32,193.627, 32,224C 32,254.373, 38.057,283.327, 49.010,309.738z  M 170.262,17.010l 11.452,27.647l 25.293,61.063C 222.099,99.461, 238.645,96, 256,96s 33.901,3.461, 48.993,9.72l 36.745-88.71l0,0l0,0 C 315.327,6.058, 286.373,0, 256,0C 225.628,0, 196.673,6.057, 170.262,17.010z"  />
+<glyph unicode="&#x62;" d="M 256,480C 114.614,480,0,444.184,0,400l0-64 c0-44.183, 114.611-80, 256-80c 141.385,0, 256,35.817, 256,80L 512,400 C 512,444.184, 397.385,480, 256,480 zM 255.193,224C 140.566,224, 43.94,247.543, 11.32,280C 3.705,272.423,0,264.361,0,256l0-64 c0-44.184, 114.611-80, 256-80 c 141.385,0, 256,35.816, 256,80l0,64 c0,8.361-4.516,16.423-12.131,24C 467.25,247.543, 369.82,224, 255.193,224zM 255.193,80C 140.566,80, 43.94,103.544, 11.32,136C 3.705,128.424,0,120.361,0,112l0-64 c0-44.183, 114.611-80, 256-80 c 141.385,0, 256,35.817, 256,80l0,64 c0,8.361-4.516,16.424-12.131,24C 467.25,103.544, 369.82,80, 255.193,80z"  />
+<glyph unicode="&#xe268;" d="M 390.979-32c-27.208,0.001-61.186,16.608-75.809,53.702c-2.034,4.84-4.271,10.714-6.859,17.509 c-8.285,21.749-20.806,54.616-33.892,68.23c-4.79,4.984-8.495,8.599-11.473,11.504c-2.673,2.607-4.921,4.801-6.946,7.019 c-2.025-2.219-4.273-4.412-6.948-7.022c-2.976-2.904-6.68-6.519-11.468-11.5c-13.086-13.616-25.608-46.488-33.895-68.239 c-2.586-6.791-4.823-12.661-6.856-17.499C 182.208-15.391, 148.231-32, 121.025-32c-5.303,0-10.138,0.646-14.373,1.918 c-26.772,8.046-43.012,37.939-40.411,74.386l 0.372,4.206c 3.287,29.404, 21.199,58.458, 50.435,81.806 c 25.344,20.238, 55.31,32.812, 78.204,32.812c 4.53,0, 8.712-0.494, 12.519-1.472l 15.711,32.209 c-16.148,40.414-39.152,100.774-57.123,153.646c-10.015,29.463-17.448,53.594-22.094,71.721 c-7.352,28.691-6.883,38.393-3.916,44.132L 148.95,480l 107.053-219.465L 363.049,479.999l 8.602-16.635 c 2.967-5.739, 3.438-15.441-3.915-44.132c-4.646-18.126-12.079-42.257-22.093-71.72c-17.97-52.868-40.974-113.229-57.123-153.646 l 15.711-32.209c 3.806,0.978, 7.987,1.472, 12.518,1.472c 22.895,0, 52.861-12.574, 78.206-32.814 c 24.995-19.962, 41.713-44.097, 48.090-69.052l 1.179,0.564l 1.535-17.522c 2.603-36.445-13.635-66.338-40.404-74.386 c-4.235-1.272-9.071-1.918-14.373-1.918C 390.98-32, 390.979-32, 390.979-32z M 346.841,39.052 c 18.936-34.353, 35.854-39.491, 44.263-39.491c 11.447,0, 20.018,9.238, 21.691,18.169c 1.097,5.871, 1.296,11.914, 0.592,17.961 c-2.837,24.156-19.338,44.898-32.678,58.044c-18.334,18.065-38.889,30.062-52.085,35.3c-1.313,0.457-2.121,0.526-2.489,0.526 c-0.255,0-0.354-0.031-0.355-0.031C 321.937,127.034, 317.342,98.010, 346.841,39.052z M 183.13,129.035 c-13.115-5.24-33.545-17.236-51.764-35.301c-13.26-13.145-29.656-33.888-32.475-58.052c-0.704-6.030-0.506-12.069, 0.589-17.953 c 1.661-8.93, 10.179-18.169, 21.556-18.169c 8.356,0, 25.17,5.139, 43.991,39.49c 29.312,58.938, 24.764,87.944, 20.903,90.493 c0-0.001-0.001-0.001-0.004-0.001c-0.020,0-0.125,0.018-0.32,0.018C 185.239,129.561, 184.438,129.492, 183.13,129.035z"  />
+<glyph unicode="&#x6a;" d="M 416,160L 384,128L 320,288L 256,96L 160,448L 96,128L0,128L0,96L 122.235,96L 164.794,308.803L 225.128,87.58L 252.937-14.385L 322.734,195.005L 354.288,116.115L 372.313,71.057L 429.256,128L 512,128L 512,160 z"  />
+<glyph unicode="&#x6b;" d="M 258.181,254.091l 94.386,29.34L 256,351.723L 256,480 L 152.532,405.466L 32,448l 42.533-120.533L0,224l 128,0 l 68.567-96.568l 29.341,94.387 L 448-32l 64,64L 258.181,254.091z M 202.327,277.672l-19.579-62.986l-38.084,53.010L 78.712,267.696 l 39.447,52.861L 96.979,383.021l 62.464-21.182 l 52.862,39.447l0-65.952 l 53.008-38.084L 202.327,277.672z"  />
+<glyph unicode="&#x3c;" d="M 256,384C 144.341,384, 47.559,318.979,0,224c 47.559-94.979, 144.341-160, 256-160c 111.657,0, 208.439,65.021, 256,160 C 464.442,318.979, 367.657,384, 256,384z M 382.225,299.148c 30.081-19.187, 55.571-44.887, 74.717-75.148 c-19.146-30.261-44.637-55.961-74.718-75.149C 344.427,124.743, 300.779,112, 256,112c-44.78,0-88.428,12.743-126.225,36.852 C 99.695,168.038, 74.205,193.738, 55.058,224c 19.146,30.262, 44.637,55.962, 74.717,75.148c 1.959,1.25, 3.938,2.461, 5.929,3.65 C 130.725,289.134, 128,274.387, 128,259c0-70.692, 57.308-128, 128-128s 128,57.308, 128,128c0,15.387-2.725,30.134-7.704,43.799 C 378.286,301.61, 380.265,300.398, 382.225,299.148z M 256,275c0-26.51-21.49-48-48-48s-48,21.49-48,48s 21.49,48, 48,48 S 256,301.51, 256,275z"  />
+<glyph unicode="&#xe269;" d="M 419.661,331.792 C 458.483,304.277 490.346,267.246 512,224 C 464.439,129.021 367.657,64 256,64 C 224.717,64 194.604,69.106 166.411,78.542 L 205.389,117.52 C 221.918,113.87 238.875,112 256,112 C 300.779,112 344.427,124.743 382.223,148.852 C 412.304,168.040 437.795,193.74 456.941,224.001 C 438.415,253.284 413.934,278.276 385.116,297.248 L 419.661,331.792 ZM 256,131 C 244.638,131 233.624,132.488 223.136,135.267 L 379.729,291.859 C 382.51,281.373 384,270.362 384,259 C 384,188.308 326.692,131 256,131 ZM 480,480l-26.869,0 L 343.325,370.194C 315.787,379.156, 286.448,384, 256,384C 144.341,384, 47.559,318.979,0,224 c 21.329-42.596, 52.564-79.154, 90.597-106.534L0,26.869L0,0 l 26.869,0 L 480,453.131L 480,480 z M 208,323c 24.022,0, 43.923-17.647, 47.446-40.685 l-54.762-54.762C 177.647,231.077, 160,250.978, 160,275C 160,301.51, 181.49,323, 208,323z M 55.058,224 c 19.146,30.262, 44.637,55.962, 74.717,75.148c 1.959,1.25, 3.938,2.461, 5.929,3.65C 130.725,289.134, 128,274.387, 128,259 c0-29.262, 9.825-56.224, 26.349-77.781l-29.275-29.275C 97.038,170.765, 73.197,195.33, 55.058,224z"  />
+<glyph unicode="&#x6e;" d="M 329.372,105.372L 224,210.745L 224,352L 288,352L 288,237.255L 374.628,150.628 zM 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,32 c-106.039,0-192,85.961-192,192c0,106.039, 85.961,192, 192,192c 106.039,0, 192-85.961, 192-192C 448,117.961, 362.039,32, 256,32z"  />
+<glyph unicode="&#x6f;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,16 c-114.875,0-208,93.125-208,208S 141.125,432, 256,432s 208-93.125, 208-208S 370.875,16, 256,16zM 304,272l-144,80l-32,0 l0-32 l 80-144l 144-80l 32,0 l0,32 L 304,272z M 256,192c-17.673,0-32,14.327-32,32c0,17.673, 14.327,32, 32,32 c 17.673,0, 32-14.327, 32-32C 288,206.327, 273.673,192, 256,192z"  />
+<glyph unicode="&#xe01b;" d="M 224,96A32,32 13140 1 0 288,96A32,32 13140 1 0 224,96zM 256,416c-96.026,0-182.161-42.307-240.815-109.286l 24.081-21.071C 92.055,345.923, 169.577,384, 256,384 c 86.423,0, 163.945-38.077, 216.734-98.357l 24.081,21.071C 438.161,373.693, 352.027,416, 256,416zM 256,320c-67.218,0-127.513-29.615-168.571-76.5l 24.082-21.071C 146.703,262.616, 198.385,288, 256,288 c 57.616,0, 109.297-25.384, 144.489-65.571l 24.082,21.071C 383.513,290.385, 323.219,320, 256,320zM 256,224c-38.41,0-72.865-16.923-96.326-43.715l 24.082-21.071C 201.352,179.308, 227.192,192, 256,192 c 28.808,0, 54.648-12.692, 72.245-32.786l 24.081,21.071C 328.865,207.077, 294.41,224, 256,224z"  />
+<glyph unicode="&#xe271;" d="M 448,416l0-416 L 112,0 c-26.511,0-48,21.49-48,48c0,26.509, 21.489,48, 48,48l 304,0 L 416,480 L 96,480 C 60.801,480, 32,451.2, 32,416l0-384  c0-35.2, 28.801-64, 64-64l 384,0 L 480,416 L 448,416 zM 128,64L 416,64L 416,32L 128,32z"  />
+<glyph unicode="&#x79;" d="M 192,480L0,224L 192,224L 64-32L 512,288L 256,288L 448,480 z"  />
+<glyph unicode="&#xe013;" d="M 128,448L 384,448L 384,384L 128,384zM 480,352L 32,352 C 14.4,352,0,337.6,0,320l0-160 c0-17.6, 14.398-32, 32-32l 96,0 l0-128 l 256,0 L 384,128 l 96,0 c 17.6,0, 32,14.4, 32,32L 512,320  C 512,337.6, 497.6,352, 480,352z M 352,32L 160,32 L 160,192 l 192,0 L 352,32 z M 487.2,304c0-12.813-10.387-23.2-23.199-23.2 c-12.813,0-23.201,10.387-23.201,23.2s 10.388,23.2, 23.201,23.2C 476.814,327.2, 487.2,316.813, 487.2,304z"  />
+<glyph unicode="&#x71;" d="M 426.67,480L 85.343,480 C 38.405,480,0,441.594,0,394.656l0-341.314 C0,6.375, 38.406-32, 85.344-32L 426.67-32 c 46.938,0, 85.33,38.374, 85.33,85.342L 512,394.656 C 512,441.594, 473.608,480, 426.67,480z M 139.472,64.376C 115.487,64.376, 96,83.722, 96,107.69 c0,23.842, 19.486,43.406, 43.472,43.406c 24.079,0, 43.53-19.564, 43.53-43.406C 183.001,83.722, 163.55,64.376, 139.472,64.376z  M 248.734,64.002c0,40.905-15.904,79.409-44.73,108.222c-28.857,28.875-67.188,44.813-107.952,44.813L 96.052,279.63 c 118.826,0, 215.563-96.721, 215.563-215.627L 248.734,64.002L 248.734,64.002z M 359.814,64.002 c0,145.531-118.329,263.97-263.688,263.97L 96.126,390.596 c 180.001,0, 326.473-146.562, 326.473-326.596L 359.814,64.002L 359.814,64.002z"  />
+<glyph unicode="&#x43;" d="M 160,288L 224,288L 224,224L 160,224zM 256,288L 320,288L 320,224L 256,224zM 352,288L 416,288L 416,224L 352,224zM 64,96L 128,96L 128,32L 64,32zM 160,96L 224,96L 224,32L 160,32zM 256,96L 320,96L 320,32L 256,32zM 160,192L 224,192L 224,128L 160,128zM 256,192L 320,192L 320,128L 256,128zM 352,192L 416,192L 416,128L 352,128zM 64,192L 128,192L 128,128L 64,128zM 416,480l0-32 l-64,0 L 352,480 L 128,480 l0-32 L 64,448 L 64,480 L0,480 l0-512 l 480,0 L 480,480 L 416,480 z M 448,0L 32,0 L 32,352 l 416,0 L 448,0 z"  />
+<glyph unicode="&#x44;" d="M 64,320L 96,320L 96,288L 64,288zM 128,320L 160,320L 160,288L 128,288zM 192,320L 224,320L 224,288L 192,288zM 256,320L 288,320L 288,288L 256,288zM 320,320L 352,320L 352,288L 320,288zM 384,320L 416,320L 416,288L 384,288zM 64,256L 96,256L 96,224L 64,224zM 128,256L 160,256L 160,224L 128,224zM 192,256L 224,256L 224,224L 192,224zM 256,256L 288,256L 288,224L 256,224zM 320,256L 352,256L 352,224L 320,224zM 384,256L 416,256L 416,224L 384,224zM 64,192L 96,192L 96,160L 64,160zM 128,192L 160,192L 160,160L 128,160zM 192,192L 224,192L 224,160L 192,160zM 256,192L 288,192L 288,160L 256,160zM 320,192L 352,192L 352,160L 320,160zM 384,192L 416,192L 416,160L 384,160zM 64,128L 96,128L 96,96L 64,96zM 128,128L 160,128L 160,96L 128,96zM 192,128L 224,128L 224,96L 192,96zM 256,128L 288,128L 288,96L 256,96zM 320,128L 352,128L 352,96L 320,96zM 384,128L 416,128L 416,96L 384,96zM 64,64L 96,64L 96,32L 64,32zM 128,64L 160,64L 160,32L 128,32zM 192,64L 224,64L 224,32L 192,32zM 256,64L 288,64L 288,32L 256,32zM 320,64L 352,64L 352,32L 320,32zM 384,64L 416,64L 416,32L 384,32zM 416,448L 416,480 l-64,0 l0-64 l-32,0 L 320,448 L 160,448 l0-32 l-32,0 L 128,480 L 64,480 l0-32 L0,448 l0-480 l 480,0 L 480,448 L 416,448 z M 448,0L 32,0 L 32,352 l 416,0 L 448,0 z"  />
+<glyph unicode="&#xe273;" d="M 448,416l-48,0 l0-16 c0-17.645-14.355-32-32-32s-32,14.355-32,32L 336,416 L 176,416 l0-16 c0-17.645-14.355-32-32-32s-32,14.355-32,32L 112,416 L 64,416  c-17.6,0-32-14.4-32-32l0-352 c0-17.6, 14.4-32, 32-32l 384,0 c 17.6,0, 32,14.4, 32,32L 480,384 C 480,401.6, 465.6,416, 448,416z M 448,32.058 c-0.017-0.020-0.038-0.041-0.058-0.058L 64.057,32 c-0.020,0.017-0.041,0.038-0.057,0.058L 64,320 l 384,0 L 448,32.058 zM 144,384c 8.836,0, 16,7.164, 16,16L 160,464 c0,8.836-7.164,16-16,16s-16-7.164-16-16l0-64 C 128,391.164, 135.164,384, 144,384zM 368,384c 8.836,0, 16,7.164, 16,16L 384,464 c0,8.836-7.164,16-16,16s-16-7.164-16-16l0-64 C 352,391.164, 359.164,384, 368,384zM 288,288L 128,288L 128,256L 256,256L 256,192L 128,192L 128,160L 256,160L 256,96L 128,96L 128,64L 288,64 zM 352,64L 384,64L 384,288L 320,288L 320,256L 352,256 zM 436-12L 76-12 c-17.6,0-32,10.4-32,28l0-16 c0-17.6, 14.4-32, 32-32l 360,0 c 17.6,0, 32,14.4, 32,32l0,16 C 468-1.6, 453.6-12, 436-12z"  />
+<glyph unicode="&#x77;" d="M 224,192L 224,416 C 100.288,416,0,315.712,0,192s 100.288-224, 224-224s 224,100.288, 224,224c0,36.017-8.514,70.042-23.618,100.191 L 224,192zM 456.382,356.191C 419.606,429.599, 343.695,480, 256,480l0-224 L 456.382,356.191z"  />
+<glyph unicode="&#x76;" d="M0,64L 512,64L 512,0L0,0zM 64,192L 128,192L 128,96L 64,96zM 160,320L 224,320L 224,96L 160,96zM 256,224L 320,224L 320,96L 256,96zM 352,416L 416,416L 416,96L 352,96z"  />
+<glyph unicode="&#x75;" d="M 496,0L 384,0L 384,16L 368,16L 368,0L 208,0L 208,16L 192,16L 192,0L 80,0L 80,16L 64,16L 64,0L 32,0L 32,144L 48,144L 48,160L 32,160L 32,272L 48,272L 48,288L 32,288L 32,400L 48,400L 48,416L 32,416L 32,480L0,480L0-32L 512-32L 512,16L 496,16 zM 220,284L 212,276L 212,149.941L 220,157.941 zM 204,268L 196,260L 196,133.941L 204,141.941 zM 188,125.941L 188,258L 180,262L 180,128.833L 187.261,125.202 zM 268,332L 260,324L 260,197.941L 268,205.941 zM 236,300L 228,292L 228,165.941L 236,173.941 zM 172,266L 164,270L 164,136.833L 172,132.833 zM 252,316L 244,308L 244,181.941L 252,189.941 zM 124,290L 116,294L 116,160.833L 124,156.833 zM 92,306L 84,310L 84,176.833L 92,172.833 zM 156,274L 148,278L 148,144.833L 156,140.833 zM 108,298L 100,302L 100,168.833L 108,164.833 zM 76,314L 68,318L 68,184.833L 76,180.833 zM 284,348L 276,340L 276,213.941L 284,221.941 zM 140,282L 132,286L 132,152.833L 140,148.833 zM 412,316L 404,308L 404,137.267L 412,149.267 zM 428,332L 420,324L 420,161.267L 428,173.267 zM 444,348L 436,340L 436,185.267L 444,197.267 zM 476,380L 468,372L 468,233.267L 476,245.267 zM 460,364L 452,356L 452,209.267L 460,221.267 zM 508,412L 500,404L 500,281.267L 508,293.267 zM 492,396L 484,388L 484,257.267L 492,269.267 zM 348,312L 340,317.333L 340,162.666L 348,152 zM 332,322.667L 324,328L 324,184L 332,173.333 zM 300,344L 292,349.333L 292,226.667L 300,216 zM 316,333.333L 308,338.667L 308,205.333L 316,194.666 zM 364,301.333L 356,306.667L 356,141.333L 364,130.666 zM 396,300L 388,292L 388,113.268L 396,125.267 zM 380,290.667L 372,296L 372,119.999L 380,109.333 zM 384,64L 288,192L 192,96L 64,160L 64,32L 512,32L 512,256 z"  />
+<glyph unicode="&#x32;" d="M 512,338.75L 466.747,384L 377.374,294.624L 326.624,345.375L 415.999,434.75L 370.749,480L 281.374,390.625L 224,448L 180.687,404.688L 436.688,148.687L 480,191.999L 422.624,249.375 zM 137.374,105.373c 82.884-82.881, 192.597-18.181, 259.646,37.732L 175.108,365.017 C 119.196,297.969, 54.494,188.256, 137.374,105.373zM 95.999,127.998L 159.996,64L 64-31.996L 0.002,32.001z"  />
+<glyph unicode="&#x33;" d="M 256,448L 32,352L 256,256L 480,352 zM 32,64L 224-16L 224,208L 32,288 zM 288-16L 480,64L 480,288L 288,208 z"  />
+<glyph unicode="&#x34;" d="M 479.165,351.875L 394.94,351.875 c-21.715,0.033-43.348,1.503-22.252,38.729c 21.138,37.3, 36.059,89.521-48.802,89.521 c-84.857,0-69.935-52.221-48.797-89.521c 21.096-37.226-0.538-38.694-22.255-38.729l-91.938,0 c-18.060,0-32.835-14.778-32.835-32.834 l0-102.189 c0-21.756, 5.904-43.513-31.393-22.378C 59.372,215.611,0,230.531,0,145.672c0-84.854, 59.37-69.935, 96.67-48.798 c 37.297,21.137, 31.393-0.62, 31.393-22.38l0-73.783 c0-18.062, 14.777-32.835, 32.835-32.835l 91.811,0 c 21.76,0, 43.517,8.706, 22.382,46.004 c-21.137,37.295-36.061,89.519, 48.797,89.519c 84.858,0, 69.938-52.221, 48.8-89.519c-21.135-37.299, 0.623-46.005, 22.381-46.005l 84.096,0 c 18.062,0, 32.837,14.777, 32.837,32.835L 512.002,319.042 C 512.002,337.099, 497.227,351.875, 479.165,351.875z"  />
+<glyph unicode="&#x72;" d="M 348.916,316.476l-32.476,32.461L 154.035,186.566c-26.907-26.896-26.907-70.524,0-97.422 c 26.902-26.896, 70.53-26.896, 97.437,0l 194.886,194.854c 44.857,44.831, 44.857,117.531,0,162.363 c-44.833,44.852-117.556,44.852-162.391,0L 79.335,241.788l 0.017-0.016c-0.145-0.152-0.306-0.288-0.438-0.423 c-62.551-62.548-62.551-163.928,0-226.453c 62.527-62.528, 163.934-62.528, 226.494,0c 0.137,0.137, 0.258,0.284, 0.41,0.438l 0.016-0.017 l 139.666,139.646l-32.493,32.46L 273.35,47.792l-0.008,0 c-0.148-0.134-0.282-0.285-0.423-0.422 c-44.537-44.529-116.99-44.529-161.538,0c-44.531,44.521-44.531,116.961,0,161.489c 0.152,0.152, 0.302,0.291, 0.444,0.423l-0.023,0.030 l 204.64,204.583c 26.856,26.869, 70.572,26.869, 97.443,0c 26.856-26.867, 26.856-70.574,0-97.42L 218.999,121.625 c-8.968-8.961-23.527-8.961-32.486,0c-8.947,8.943-8.947,23.516,0,32.46L 348.916,316.476z"  />
+<glyph unicode="&#x74;" d="M 256.003,480c-85.374,0-154.661-68.339-154.661-152.54c0-42.102, 25.089-86.239, 53.788-133.976 c 28.7-47.737, 6.022-100.49, 103.695-99.073c 93.617,1.376, 69.35,44.274, 96.629,92.011c 27.289,47.736, 55.205,98.938, 55.205,141.039 C 410.66,411.662, 341.371,480, 256.003,480zM 191.076,80.777l0-40.615 c 19.95-6.488, 41.896-10.088, 64.927-10.088c 23.029,0, 44.97,3.6, 64.921,10.086l0,37.525  c-11.158-10.273-29.447-13.1-62.1-13.645C 222.605,63.443, 202.953,67.848, 191.076,80.777zM 191.753,14.944c 2.507-13.705, 13.3-46.944, 64.25-46.944c 50.949,0, 61.742,33.239, 64.25,46.944 c-28.826-8.815-41.977-9.291-64.25-9.291C 233.728,5.653, 220.577,6.129, 191.753,14.944z"  />
+<glyph unicode="&#x73;" d="M 272,480l-48-48l 48-48L 160,256L 48,256 l 88-88L0-12.308L0-32 l 19.692,0 L 200,104l 88-88L 288,128 l 128,112l 48-48l 48,48L 272,480z M 224,208l-32,32 l 112,112l 32-32L 224,208z"  />
+<glyph unicode="&#x63;" d="M 256,480C 167.634,480, 96,408.366, 96,320c0-160, 160-352, 160-352s 160,192, 160,352C 416,408.366, 344.365,480, 256,480z M 256,224 c-53.020,0-96,42.98-96,96s 42.98,96, 96,96s 96-42.98, 96-96S 309.020,224, 256,224z"  />
+<glyph unicode="&#xe274;" d="M 131.851,338.143c 2.709-85.392, 23.232-156.27, 61.189-211.080c 17.343-25.043, 38.449-46.778, 62.96-64.873 c 24.511,18.095, 45.618,39.83, 62.959,64.873c 37.957,54.811, 58.48,125.688, 61.189,211.080c-40.225,9.645-79.752,25.45-124.149,49.495 C 211.596,363.589, 172.078,347.788, 131.851,338.143zM 458.873,406.909C 387.436,411.877, 329.919,434.868, 256.002,480C 182.080,434.868, 124.563,411.877, 53.127,406.909 C 33.451,95.568, 202.896-3.16, 256.002-32C 309.105-3.16, 478.55,95.568, 458.873,406.909z M 358.422,99.735 c-35.469-51.219-77.048-80.031-102.421-95.026c-25.374,14.995-66.952,43.807-102.422,95.026 c-49.507,71.489-72.928,164.977-69.753,278.177c 56.394,7.775, 107.891,27.271, 172.175,64.812 c 64.281-37.541, 115.777-57.037, 172.173-64.812C 431.35,264.712, 407.929,171.225, 358.422,99.735z"  />
+<glyph unicode="&#x35;" d="M 254.059,418.977C 205.881,476.227, 169.369,480, 96,480l0-256 c 128.267,64, 142.636-8.335, 223.506-1.023 C 399.234,230.197, 467.031,291.564, 512,352C 384.644,322.547, 320.54,339.977, 254.059,418.977zM0,480L 64,480L 64-32L0-32z"  />
+<glyph unicode="&#xe275;" d="M 128,447.5c 19.393-0.786, 33.686-2.681, 46.365-6.903c 19.163-6.381, 35.674-19.009, 55.209-42.224 c 54.165-64.364, 108.925-91.826, 183.107-91.826c 7.729,0, 15.767,0.307, 24.147,0.925c-10.090-11.872-20.705-23.466-31.729-34.059 c-15.453-14.849-30.499-26.521-44.72-34.692c-14.99-8.612-29.547-13.609-43.263-14.851c-1.81-0.164-3.533-0.243-5.271-0.243 c-16.82,0-29.746,7.817-49.442,20.573c-22.574,14.618-50.668,32.812-91.546,32.812c-13.692,0-27.906-2.034-42.859-6.161L 127.998,447.5  M 96,480l0-256 c 30.587,15.262, 54.737,21.011, 74.859,21.011c 61.341,0, 85.367-53.384, 140.988-53.384c 2.648,0, 5.354,0.12, 8.152,0.373 c 79.729,7.221, 147.031,99.564, 192,160c-38.205-8.835-70.726-13.453-99.318-13.453c-66.72,0-112.085,25.129-158.623,80.43 C 205.881,476.227, 169.369,480, 96,480L 96,480zM0,480L 64,480L 64-32L0-32z"  />
+<glyph unicode="&#xe023;" d="M 96,480L 96-32L 256,128L 416-32L 416,480 z"  />
+<glyph unicode="&#xe276;" d="M 96,480l0-512 l 160,160l 160-160L 416,480 L 96,480 z M 384,45.255l-128,128l-128-128L 128,448 l 256,0 L 384,45.255 z"  />
+<glyph unicode="&#xe277;" d="M 376,448c-51.956,0-97.1-29.138-120-71.96C 233.099,418.862, 187.955,448, 136,448C 60.889,448,0,387.11,0,312c0-184, 256-312, 256-312 s 256,128, 256,312C 512,387.11, 451.111,448, 376,448z"  />
+<glyph unicode="&#xe278;" d="M 256,0l-13.97,6.779C 232.147,11.574,0,126.229,0,300.513C0,381.838, 67.738,448, 151,448c 39.83,0, 77.258-15.237, 105-41.462 C 283.742,432.763, 321.17,448, 361,448c 83.262,0, 151-66.162, 151-147.487c0-174.284-232.147-288.938-242.030-293.733L 256,0z M 151,384 c-47.972,0-87-37.452-87-83.487c0-67.976, 54.123-127.616, 99.526-165.68c 36.25-30.39, 73.062-52.351, 92.474-63.081 c 19.412,10.73, 56.224,32.691, 92.474,63.081C 393.877,172.896, 448,232.537, 448,300.513C 448,346.548, 408.972,384, 361,384 c-32.336,0-61.831-17.070-76.974-44.55L 256,288.59l-28.026,50.86C 212.831,366.93, 183.336,384, 151,384z"  />
+<glyph unicode="&#x5b;" d="M 464,192 C 500.5,192 480,96 448,96 C 464,96 448,16 416,16 C 416-16 384-32 352-32 C 216.824-32 264.368,1.825 128,16 L 128,272 C 248.461,308.134 368,398.712 368,480 C 394.5,480 464,448 368,288 C 368,288 448,288 464,288 C 512,288 496,192 464,192 ZM 96,272 L 96,16 L 128,16 L 128,0 L 64,0 C 46.4,0 32,21.6 32,48 L 32,240 C 32,266.4 46.4,288 64,288 L 128,288 L 128,272 L 96,272 Z"  />
+<glyph unicode="&#x5c;" d="M 48,256 C 11.5,256 32,352 64,352 C 48,352 64,432 96,432 C 96,464 128,480 160,480 C 295.176,480 247.632,446.175 384,432 L 384,176 C 263.539,139.866 144,49.288 144-32 C 117.5-32 48,0 144,160 C 144,160 64,160 48,160 C 0,160 16,256 48,256 ZM 416,176 L 416,432 L 384,432 L 384,448 L 448,448 C 465.6,448 480,426.4 480,400 L 480,208 C 480,181.6 465.6,160 448,160 L 384,160 L 384,176 L 416,176 Z"  />
+<glyph unicode="&#x40;" d="M 512,281.475l-176.89,25.704L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z M 256,103.251l-111.731-58.74l 21.338,124.415l-90.393,88.111l 124.92,18.152L 256,388.387l 55.868-113.198 l 124.918-18.152l-90.394-88.111l 21.339-124.415L 256,103.251z"  />
+<glyph unicode="&#x41;" d="M 512,281.475l-176.89,25.704L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z M 256,103.251l-0.471-0.248L 256,388.387l 55.868-113.198l 124.918-18.152l-90.394-88.111l 21.339-124.415 L 256,103.251z"  />
+<glyph unicode="&#x42;" d="M 512,281.475L 335.11,307.179L 256,467.47l-79.108-160.291L0,281.475l 128-124.769L 97.784-19.47L 256,63.709l 158.216-83.179 l-30.217,176.176L 512,281.475z"  />
+<glyph unicode="&#xe279;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 352,352 c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 334.327,352, 352,352z M 160,352c 17.673,0, 32-14.327, 32-32 s-14.327-32-32-32s-32,14.327-32,32S 142.327,352, 160,352z M 256,64c-58.255,0-109.232,31.137-137.213,77.672l 41.164,24.698 C 179.538,133.796, 215.222,112, 256,112s 76.462,21.796, 96.049,54.37l 41.164-24.698C 365.232,95.137, 314.255,64, 256,64z"  />
+<glyph unicode="&#xe280;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320 C 128,337.673 142.327,352 160,352 C 177.673,352 192,337.673 192,320 C 192,302.327 177.673,288 160,288 C 142.327,288 128,302.327 128,320 Z M 320,320 C 320,337.673 334.327,352 352,352 C 369.673,352 384,337.673 384,320 C 384,302.327 369.673,288 352,288 C 334.327,288 320,302.327 320,320 ZM 352.049,166.37 L 393.213,141.672 C 365.232,95.137 314.255,64 256,64 C 197.745,64 146.768,95.137 118.787,141.672 L 159.951,166.37 C 179.538,133.796 215.222,112 256,112 C 296.778,112 332.462,133.796 352.049,166.37 Z"  />
+<glyph unicode="&#xe281;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 352,352 c 17.673,0, 32-14.327, 32-32s-14.327-32-32-32s-32,14.327-32,32S 334.327,352, 352,352z M 160,352c 17.673,0, 32-14.327, 32-32 s-14.327-32-32-32s-32,14.327-32,32S 142.327,352, 160,352z M 352.049,89.63C 332.462,122.204, 296.777,144, 256,144 c-40.778,0-76.462-21.796-96.049-54.37l-41.164,24.698C 146.767,160.863, 197.745,192, 256,192c 58.254,0, 109.232-31.137, 137.213-77.672 L 352.049,89.63z"  />
+<glyph unicode="&#xe282;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320 C 128,337.673 142.327,352 160,352 C 177.673,352 192,337.673 192,320 C 192,302.327 177.673,288 160,288 C 142.327,288 128,302.327 128,320 Z M 320,320 C 320,337.673 334.327,352 352,352 C 369.673,352 384,337.673 384,320 C 384,302.327 369.673,288 352,288 C 334.327,288 320,302.327 320,320 ZM 159.951,89.63 L 118.787,114.328 C 146.768,160.863 197.745,192 256,192 C 314.254,192 365.231,160.863 393.213,114.328 L 352.049,89.63 C 332.462,122.204 296.778,144 256,144 C 215.221,144 179.538,122.204 159.951,89.63 Z"  />
+<glyph unicode="&#xe283;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.613-256, 256-256c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480z M 320,96L 192,96 l0,32 l 128,0 L 320,96 z M 352,352c 17.673,0, 32-14.327, 32-32c0-17.673-14.327-32-32-32s-32,14.327-32,32C 320,337.673, 334.327,352, 352,352z M 160,352 c 17.673,0, 32-14.327, 32-32c0-17.673-14.327-32-32-32s-32,14.327-32,32C 128,337.673, 142.327,352, 160,352z"  />
+<glyph unicode="&#xe284;" d="M 256-32c 141.385,0, 256,114.615, 256,256S 397.385,480, 256,480S0,365.385,0,224S 114.615-32, 256-32z M 256,432 c 114.875,0, 208-93.125, 208-208s-93.125-208-208-208S 48,109.125, 48,224S 141.125,432, 256,432zM 128,320c0-17.673, 14.327-32, 32-32s 32,14.327, 32,32s-14.327,32-32,32S 128,337.673, 128,320z M 320,320 c0-17.673, 14.327-32, 32-32s 32,14.327, 32,32s-14.327,32-32,32S 320,337.673, 320,320z M 192,128l 128,0 l0-32 L 192,96 L 192,128 z"  />
+<glyph unicode="&#xe019;" d="M 64,16A48,48 11340 1 0 160,16A48,48 11340 1 0 64,16zM 384,16A48,48 11340 1 0 480,16A48,48 11340 1 0 384,16zM 480,224L 480,416 L 64,416 C 64,451.346, 35.347,480,0,480l0-32 c 17.645,0, 32-14.355, 32-32l 24.037-206.027C 41.39,198.244, 32,180.223, 32,160 c0-35.347, 28.654-64, 64-64l 384,0 l0,32 L 96,128 c-17.673,0-32,14.327-32,32c0,0.11, 0.007,0.218, 0.008,0.328L 480,224z"  />
+<glyph unicode="&#xe01a;" d="M 406.494,288L 317.573,403.765C 319.134,407.535, 320,411.666, 320,416c0,17.673-14.326,32-32,32c-17.673,0-32-14.327-32-32 s 14.327-32, 32-32c 1.421,0, 2.816,0.102, 4.188,0.282L 366.144,288L 145.857,288 l 73.956,96.282C 221.184,384.102, 222.58,384, 224,384 c 17.673,0, 32,14.327, 32,32s-14.327,32-32,32s-32-14.327-32-32c0-4.334, 0.866-8.465, 2.427-12.234L 105.506,288L0,288 l0-64 l 32,0 l 32-256l 384,0 l 32,256l 32,0 l0,64 L 406.494,288 z M 160,32L 96,32 l0,64 l 64,0 L 160,32 z M 160,160L 96,160 l0,64 l 64,0 L 160,160 z M 288,32l-64,0 l0,64 l 64,0 L 288,32 z M 288,160l-64,0 l0,64 l 64,0 L 288,160 z M 416,32l-64,0 l0,64 l 64,0 L 416,32 z M 416,160l-64,0 l0,64 l 64,0 L 416,160 z"  />
+<glyph unicode="&#xe286;" d="M 464,416L 48,416 C 21.6,416,0,394.4,0,368l0-288 c0-26.4, 21.6-48, 48-48l 416,0 c 26.4,0, 48,21.6, 48,48L 512,368 C 512,394.4, 490.4,416, 464,416z M 48,384 l 416,0 c 8.673,0, 16-7.327, 16-16l0-48 L 32,320 l0,48 C 32,376.673, 39.327,384, 48,384z M 464,64L 48,64 c-8.673,0-16,7.327-16,16L 32,224 l 448,0 l0-144  C 480,71.327, 472.673,64, 464,64zM 64,160L 96,160L 96,96L 64,96zM 128,160L 160,160L 160,96L 128,96zM 192,160L 224,160L 224,96L 192,96z"  />
+<glyph unicode="&#xe287;" d="M 464,416L 48,416 C 21.6,416,0,394.4,0,368l0-288 c0-26.4, 21.6-48, 48-48l 416,0 c 26.4,0, 48,21.6, 48,48L 512,368 C 512,394.4, 490.4,416, 464,416z M 96,96 L 64,96 l0,64 l 32,0 L 96,96 z M 160,96l-32,0 l0,64 l 32,0 L 160,96 z M 224,96l-32,0 l0,64 l 32,0 L 224,96 z M 496,224L 16,224 l0,96 l 480,0 L 496,224 z"  />
+<glyph unicode="&#x20;" horiz-adv-x="256" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/core/media/jui/fonts/IcoMoon.ttf b/core/media/jui/fonts/IcoMoon.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9616e8e617324fba19c4ccf9cae72faed0010ac0
GIT binary patch
literal 25044
zcmc(I378yLb?&{rRqxY1z0@o{Gu8XdNHf#ZJ>5McX{3^@)$-Dkj5f=1$(Afj-UfL$
z2Dg#1jd5VWU<?M*fHB|&WXxg+aVjjv5JE&S315J?(aR%*$M-(*g)IrM_5O3Ks;6fp
z8ImvWd!w$pOWk|!x%ZxX?m6e4DlyI&3$Qw~v)aaumtA~K`5v9I11}&qv1$E=joiju
zNI!<Oa_NqV;-x?Sk-`|?jr7i|Z#Xdb&g<AR#vBhbX20z4ft%;foB<?uU>?uihp)f$
zn(W=b{W4=7Jm2QN_RxWYE#J1Sc=jV)m1~jV*v`HPcu}M?*WPf;9phK|-huQ9#%w>j
z{-&!B6#jfef-$Lyyk~AWaK{|4vd0mhMtSAN12-JH<dvJ}7~A`9<lR4a)6KW++#g4e
z_MwjR7Dj!;^|ezQr?2c<^=sy{A%n5+>~wEh2+zD~Q~6Jjb~EF#sKbA9=2bRsQyFV9
z+zC?W-}^+)_t|4i5!qCei#%1Nk+Ly9&z#K7FXGoAZ<87Rn)R~#&^zYDI9X*wRt#b7
znhgh;%95uUZ=Pwgap0D$3!JEsg(7>3QbwBcaA{_!E=h|zW?mhkj;k|N%x6|Oi8RHn
zkeScV6>4~<n%5k{&NO?CdVlB{MsHEy{!sa)&+VvB*V6pXw9@fh?}&GnIai$O(RIFO
z=gPP8sGfSBx>Saq(?#*ux;o2PaVumt^)>6B8?J)!q6>=^O<RA8h^S08GuD}*5p<c<
zZ={s=Gm0tf5bhc)i(Cyc`coLK^z;AGnxHGeI2E#8f)vFP%wa1c%mIRfI1+nfGjqyw
zs`u2$sp6@bQ|nJ{Iko-No>NCoz5djlr|vuTz-b0fM1RR9JH<|gPAR7fr>0J+r#7Cd
zo!WIuL%Ewz)lc2uE+-0Gx511N8=Pfq@S?$sLk1QZ_9LF*6~3A8<@@=ySd=&NWBfLR
z_ggjDt?XX*VfG+<D|-v;!CJqHtz=Ueg*|L9yNkVn?PM>2<9&(g?EUP0;2$3VKdZ1$
zvaReQb}@UIeUp8QeTF^HHn1ny3buvKur+L!HP}1YJbNd57kfQB#wOXHvNy7Oz_oX<
z%h>DKOY9r0%BI;z*+cAY>|^XjR%9hMgt1Dp6#F>)1jg?;dzw81&hs4mGxq1~%j^s6
z^Xzl%gY466kmWJ1!)%02umWb^3$Ep268NEy`LQ<y*(i&!E*4^8*3C|^yV;vCn^&`I
z*mv3AvS-<i>?StH-pn3hH?v#VSJ>^Cp(u;7IFnf)>t_Qj%`z;DePTHqW8-WUTMc?z
z%hs_A*m|~+ZDO0*h3pb`DXXz<Y&+Y<cC*XbK6VA$&#q(#*g;UzVRkJ$!fs=CushlP
z>;d*L`xEwd_HOnb_9%NV`w;sGdlDS+v+OU}U$U>Vud%PQzrw75P6QcYa@q`~JyDd2
z>(+Ze{NP*P($jm@%Bk|6y?4D~=L=u_lK%epJ@$deE1%qY(Zw%+^IM;Je!~+hw#=-V
zZM<Xto$q@6vB^Ju<305qm%Z+#Z&as0`q0}x_F}O#q$E=x|3u>W)6d-Z+@JmVm%s4&
z&wcRIgZbQWXJh}L<3Y^+i|iy8!>@RVFXu=3C-_fo8C$`&%C_0I({`=xLE9&6FWY`@
z_u5D87uv72KWP7i{oD4RJ6w)w$F+{z91l4jb3Envvf~xUFPtIg3g>?3{mv84Q?7BB
z=6bhFcl}OMq@B`((i77Eb~Cr)zQ}!z`(gKI-9PiVJma42o;Q0=cz*76dyC$yypMT5
z<^7KL=icA>;y%^4-S@EXDc?W&{@tJPU*dnz{}KOZ{3rcC4cG$91GT`>z+(YD&<r|)
z#o)o<%fVLHo4TIp`c~KJP&_mhIv9F)=*7^_!nW{Wcsjf@d`I|+Zf|$7`>O7jBmT&W
z$nHoz^0nyd=$oQ?^yjf)tQgxKdocE5>{oF${;v2-@t?{rc~ssfKPi7j{%Ozho;UZr
z)ca`fxBF~;5A~hwYxS?{zoq|E{Xb2_6W1r68CXAX&A|M?D}z&mdk5b>_?^Mu4f%)G
z58XHP56TnCRC0Cls?;T^dg?>z?)2{TeEPHLA7zF!7iAvJJeheh^V95T_GtF0?B8a8
zmGkE|=iZ)sIUmfg%HNXz)UadtlHvP^9?vu(H#CVwhk4Ql;e$6@f^r;q_NsW+i?w|*
zRs`#=6o+^<KhC9bo=&-9(YWl2Q%){Bl|zP<b9HgKS}De(6t3p^)!bgmO>jw$M_nlj
z2YGdnmx`70R4y;MQn{%$JTC>g9OQt8{A#?ihTqwf_B%?B*i6Ea?@bI3%AT(HvC=U=
zzkfK<m$whh#*Y<`1ya3!N6`@vd3sYTBortf^Y^9#l(i<|%%NWDnPdKRkAM_%%Y(y-
z-mG(ACVq@>F=}?XdXmEfJ;+=wYTr6Aoa*&-$pR8E0HoQ3BiH(8s)Xj#y#Zh)2R%JQ
z!vnqfn~w#01)lL01I}#E0PvJTv12rNw9ZwGT?3qrmF22j<yxbmonZ|M3>LwecBaX7
zj6KRkBw3QVZan2ps}z+~0H;o6Fi?33Y{e|3P>3yuGZk<e1{`NKU(Iu_8qcgEG`sCG
zUV`Mor15a6mve#vR2pZP%Ik=qL7WpA;2-J%M?nKlaA{VRJ(xlsPWN(6<7QD+Mbv;`
zLzdVCv7?&xB=GS(dV%TBO;w7HXuMdN%B6<5K@c&@pXDYcREjqC=qryt`bz7iyPmo0
zu4itjdm??_Es?&+7H?m~Q}_1q3+eHrPtnu6W{?r_T=;w-5(zwiAr-AdlsLQXluNW~
z6Bxv!6Fi5UA)?@Dd?nh((>1&@#gG00*u44L$ep9@4Ejp&Gw3_@nA*vux;V%`<r?65
z1C#h4?DuVd05y#8S^e%7E#{`W#fZD2Xj?4I66G)B=90`!iB7%7kpAIrWBTi?!RuTh
zO3Q*u>-Bo0UPr#pG`^N=l#i9J*XtUx7nhI7RTSrnS^i3^Jdv7;2cibiVx1{yqmG!d
z8e&*hsEH!XgzI1m=p6qr8WN<5ZpK#fSh`#?u85pQB;C-(pVqAFbw$HJUT<m|!=Hn0
zpm%+tei(JD=9SII(y>xZQB?60)wsF<4E4`yKZ3fbBd$mlt;f<0Q9~E)^QJ<7t%kth
z9PM+|&6`)YDj-oERs2M?MHtZ7PM&#Hi~*E9UY4bDE@+F(<F?f{uIReDGb=^9(<8p#
z>8tp`yLJ5@u9P>fPiFV*+O{f<?sL(Hzrh%yzH>Dnw@I;lHC7q41v!6XcSOqWRCRsr
zRnxt`5hb~PV_D(%==$9}y=vR8J)-`kIR~g83GzW(m5^`&0e*aOb>2K@eHufv{VFvb
zUv10f(Y&p>82x=`VJ|qVm_N*X8QW7eSDvbrin3HHOIT~;Bcp5QYPIRj`qr(lJgQG0
z%oJvJ)#gO{QGvTP|ESMWQa)D7qk23RmE_e}v|tfix9XdxYqhzxqa))SV33-t?V2fM
z4o)A%*jao}rgcD6mzOYkWl1I)lrjIM7zkNYHT*!dB5ZcVDUV3dg5!cb%y<l}znZs8
zavGb7jn%Y*R;y{XlQoSuaYL$gLL>$Hi|S$osczP&+Z2WQX;D}=su~HReUoQXn^DNo
zR=e1n@>01JsbVGMtJv8MEH)gi9NqABy6OM1K}YI(#5Nq|O^P4gAZ~i=4dM|M+Hmw-
zZD4H?f=Q!|GJ%#Q5IQxb=o=1I4)F?Z8*~vr!vN<{#Yl*3RpeJhHpX8Ak7)1)jbJ3e
zHLkXF-q3Y1E-IcOCDt~Jl)`Dc)JCJ(K#dkSORJ7@oGp}Nkz_cj(gP|$&*oSGFy@(y
zMyDFi$MRfhG*0mOMx)h0gvw|rgB&W8ElXj!EOUlO1vI0HA{}k`u&aW_R1H`$RRxd+
z7}5y@1dt$h;)L?pf6I~qx6E~w3K4cxgWyvQdwVWv{}r^ncn{3V(xUCIbz0XK^ZA$N
z<^(_N*vBK#udphXKmuJ8e_Raiq^j0cbuq-x>tY@j;}$tL#3j&{BKLWHDQ?}+|Ck|L
zxT4n1=ge0@TAlkFFU-x==jIfV$5#j`<H=gBQLC{9`ZvZ5@XqS1EP*(e;3fbr?x_i}
za~%hvl`<}bWN;FLBk@$envPY4*qaA){oK~0+m0tz#jctq4t0hZe9Fw@@7cQVLV0=v
zp0rfKutc)6jbZ5NknLhA$tA_*N@;+n#_joWTRxYL6$kC|piPd0)bh?)v0AC-@-A?q
z1Je$BSNHI)p~=BS!0!+CcTFGYjMqW?W*M&4wSwIdPZu=JA4<zTa&I<JP#2<tp&2DG
zb_+Z#Mt#rba}r7YL_Vcr)iuNic_o)IWio#H&Pez8Tw`vowyDCyhXc7jTkAJRw{AVU
zb@|~iuWYK#;o*39<jyWzU+!LHZ#{}O7HG)_%SRGx9@{JS$WpmfPRkw5$yKW*T~Ss1
z?nxeg*WtrkX2w6Mw*IGRhu0}zxqW<Q%V9iA{-ru^HPg|K9X5$xv_stdoba&%Up*VP
zs_Z&1T>j7e8=$@*;m@UXxhm(OLXm{r#be2EshWhU6~?F~i<Mc<Kk<Xw53Z{vq^LA5
zNmsV?6Y3cjO(ddRizfIq9+vSC&!W;NpX92Vh_)K^_%w#AqaPl$2fn~*Z|mY{kV{pb
z2NSOH6Um8?GN;5^Z&T*^@Z4ZC(d5mEWPc2qq1ODog3KF{33!-eX5;_Pzl0rQ2%Ibx
zv`d&)Xnr}C3vwxFAB5O}WFy=YiH{|_S8p5Y_hk8&#B?nl$)+Q`Ka<KN{DCcvo=h$!
z`Tc%5HapJ!iOiM&ZmCQ^kEFAacnzqwd0HBYG)QR~Cm9-I`~W9G9tz}2PD2DWa+Xi!
z_~{cKNs~M$B#%d0h;n5~hWQL#p*C0p@`D1d$-<<OiZO?Bi#hN}yh)&1isa!T02a`N
z@scxs<|q6Nf0fQAvKY;31zLs#Z8)FH=eoE{hMJ633964*q2S7KISz3=pX2}W_~Ul&
zaBq>kb~~bWue8PO;1oSOcf%hl&{56kO9*`tIw;2uE^~h3^juBnDsLEJ#~PJjaclEC
ziKJvKAuObr$?ckIy{^_xHun(4>uM)G5zmCgu#{uwg}`lqG9jJ7B5%y8hUjDQ&A+3i
z-vDEQKm;fYyo03pHdHBDPMT0O?CaM4@{o!m9kfljbo9p3`?ATHRolP;AfT=;Mqy6C
z>TJJb&x7a#VVss|zFd;4B@>tWjvZs|p9xNGXYAOq6gRAtv&Lx=+?ch;7<g)9rIPhq
zjO~DxjpsB5op?iTv|7RXhE!!@+d6r4V&xZQ3(#*Kn%w$c>f-`0rSUt*?g!qm0L8%U
z^deBkB-TuTo$!2}@Uq~Y5h5=VhOIGdHB|`23MpfTmR$i`Q|d}%$-W$+y~OI5HM682
zK`31e(XbJmUINy%Ec~6Sqp3PTE$X)qw&^x>J0Mm`Q^snTs;uOMFW99yjD&BlPf>9-
z8hyF;aH{pboTBvQR6Oaxy&Kl)L0G+s<APl+f=Zi7w<%U-Or@QxeK`xfs;ajMgGcKn
zVFuv!Tpu1At&rVjPRKD&387|5f56AA(W3rP9~L^WAff$6RdtkHECVf)_bkL@AWJ$i
z-`R;0Mgzc3bl~wV6?!Q^0v|i{x&OnPSjiFM5m`Gpz1<~vYtG#N^XWWUNMiioeh8E7
z4+D`t{+YhWzx736`|&RK;vVOpjmKLT#T7+CD$;jxoy<N0XA8a!dm4>0<MyPjC`aNh
zu<cwmVl#~|Q)oa!L!3RscfV*f)4HTD68ND_fD}#fcedWab)zM;*?OzMp&1EiTA*Wn
zk$r*n@?_W!4Z+5gmP)2P9Nn@OlnkTamOe#gfvHs*n}S4IoT#HUG_}!Os96)~v+IKk
zTJ@a^Ew&m42eaDMV0~NIC$R#<qHNo!+sPj~D8pJuCS@3F+oEV=RWDvAUFXsSEF0G%
zD6QsnZF;)47}zjn(TVy3t{BZ#!an6n2{OJ-P&$pnf=$H<`bpwkhe0(2C#s@zX;UsL
zLnmqr1hHg!884TbhX=R3b+EUkV<pmZYD5BRAfiG)Q`H@}4X(Ir@V$o8M=Ooj6{05v
z5};_abMAaX8UW1`=W?21v&ofav(+?0j<BiX5~rD_&Sco2XfKjM_d_g=`9N*UnnaM!
z6|ciAMZZ@4>=<t%Q|!L&JJ7`%(=nJJLBzz4*=cpssRoQ>dL8_<&RlIdsuMp0GwhIL
zuBdi|z=4!#eMu+~Q2~~&|2~-5|Lewuo>+6>!}wwBvXH?Hi41249q}w=G($p*#<||A
z8`DYmj(F=DE*^+1EjN|JPd5V92xuI!KIq09XdU+MWF%>i*uy38Jl@b+8VF}zJt>x)
z(rWUCs-if_j7A+;B_nbPR0&GJl540~o{bKePUsHM&(bI%b;?DG+O#nMqd%^xEsbkU
zimQw2LeRA8f`=P*pch-^JIV@f6B*(wIa;bxbLsC@yaDKqdeg?5yk7MHdrhH+#JX<d
zA0XYvXa#(&L?8%LOQYhVRq(Cn37k$SwlRh<rByvf7R_A;%yzFWm_+%DVS&I<Uv%97
zR96iU3ib~CV-A`Ruv>%SLTu1bPFJvi6^*zjY%~q7YpCQD_Dib{X*u!5H9_2E^Xh~G
zcq9#4*8)t)AsYSxG_!TkWDh8kthwgk@T7?3fg*%dT?_=a0+KQSS;4W2$Wplm4YA&0
z3cz*1vy-)z_{(BAs;*<II)Q)?&sE<^+8pd1B%v+BMAJs9b!8DI%G}8GJqn<<0WI{)
zkCS^?y*m1mt(Mag<ak+%m8x<H=H3N#__J-nv^0j{Hvp;~nKU2PI`-gnpCn7Ngrv(@
z2PLStc{xo#QZ<s!q^T)1G_9#~RV$Tr{KOHJP9vy+YBlghu9Qm8msD8LwWh{8_lPt+
z5!T|gl3Jh*!Q2%{e>OElQ%x*~r*h5|?$8-cB~o6TbVi|I8U<qfg&sMK-|4U{LNnUB
z$L&7tejzLmn;}<_#*b?~VHrO;+&U>DBF+n8x#{Kww;T0;r?z9$ZV?62=nIGfd^`_o
zNax#on$*^ENw=+*<hHU4J@;qD+k)PjH+Wmo8#E$OBO_S<+Cj=X_%)GD5hDYI+w-Es
zpJNYv9}ciX)TS|NrV4Fn*kb4e0*kN^!wZVF^lwA!rk!_bo)c0h$>(-FBFUfs%$<}U
zbeq@)z3vC)WJjug&Uoua$f&f2aMP}pld9P#^hHg|*Dj<q?L2YR<%$ZftkN)pF3quC
z*asmm#oGUfNzgwV1A9@ih;dO|q;(jJ>S_ZQfjKWM*@ThrfTdZ$v~xoHPr(vM5xjF_
zc3xNuy<F&{g^d-0i7Dnk>LYlBIbK2@%7PVRqQOhkWkUvTv8KkE)+BSeN;in=3RfYL
zGP~f(I`}wAj&!ns{oAr>(Mq%=&??v`pKs~HprzveY|!Hgdg{akc@wrQ7`b5Tf<>zp
zLcS-M=XC*JJ%j!DkAx3sB<pdK_#TONbw#^wH{eGCEl7xXq6Z=^8Tnn&6<ibWaTDv3
z&J@LdBDEz?o)?yqEY2`^qor$xoruo*>ssqsh36D-#+EQT@mdQkOVbr)Vc*roIpq?V
z!U9v3m%!BP;IL<b)HSVMZxYCkIg+3Yu`JCFuDm#Qgnt1h#>RwzRaYUnH5v{5e08uF
zp<8*gPHUkOYUyaIUGKY~e(cR-+*!^#CA0?BhTH&P6Ju(tu7B~Rm$rT58yD*Od}kdY
zqY!>z`(-&xbwyL0)vd}93F>u8)Hd2vKsQbBMi0qRSrY$~5~Q054v@$s!!<OAHgVP0
zerD{swK`}IR$aQCSo_@AXVyZBuwc-dr&BH#F+~a<&WDo|yeh+RENM^&#DcFYh<#Gq
zqHoa%Jt1XKE2;wWJ|glB+?bI0e**YxfhErMVf2HK0i8g?5(qCB%c2{Xs+B1T&M&YC
zl7*MtV(59U3P%KF30H(X|FJD|Fnwb>ZF5P(Zl^60xgk=C*rL(N0KYi>wR2^r%^LjA
zZ0Yn3nS&Xd(>d&L*--C>Xq1BDQ2OHZ!8^~LoiS@+tuo<r(m>2lBh*V;F3eteI|kcj
z>e4o*D4JS_xkj%ih7*ZlkiHn6`9cE&t{$X3h!Vo4(1z#5>Ve!O#vA~paMEGI%YvKG
zQJb!)TdF#ZvjH{JQWY$0P0YrxuUoaR!I=TOi7W;1UAO{Rn+-@V8F>6n!QXE^<{%Zc
z#iDfN0W<4rn_L*=#nm?KZZ6ZpVmPG4qZQKx5jR6C&21|Wtx0EQFUY8{x_i39?*6FK
zD+eC@n6L;O5sYa}#NSZKW-HnCqRYIInOQfud}}G?35^a%`#g4=gS&(Mk-hgAhKpwf
z->M3W!y}@T2gM!T0Da<5^hIJx_(zVxY2Eag$)?9`*p6XT$A)`O)`^YvvDuxovpczO
z&gqVJ)w`l@=bXjQBA>Z!$Bx@}Y**DEQkmJ!v3LwWu)H=iY<&d<cHH(hg>j&v+BkSC
zSyK#u6*7U7q1`Zv<0J`(NW#qiFK%fsICE2QW+j@~E4lqHCk|g-Ys!=-9+cO>e(w2>
zFDUqiBKqhf9tCF{5WXA-v?(V}O8?i~Z{}h#y0!EMpAUsDd*L#=eVK%N;AQI8pdwxh
z8(u{?O)EQvCy_Yo55qrV-M)3}#wU_zm>GeJFrS>5SU1u0!pv`t2)XogtXJYGCupRz
zsa(EXsTM2wDR@0NQbETcj|F+WG{}c|R027z<Wu9ESDj9tl!CsXjoVzoSaNwX7IY!*
zu?0N#sK@P#U$m*&+;q{sA-7vuR`l~|s4vzN@_Iu(vA$50OG7=8oX0c79qHMDf!VZ}
za-&}-K)<g8CgXe-rzpUr(8gpE2D8P8NOXpWe^rEZr3J=|%9SeoCWkZO@_YT9+noOH
zL@v?ocVcFdV-HJ`C$e@{*Js!MT`Jop`CXFD=5#6DebPmdv&((VaWN0Nr2g!vFC37&
zqXCa65bc%&Vc%$2aZ7zR`@mFh@6>=Z=8wzXP`KOgTbGG=HlCvt@fea#hz{zI3CK2*
zr?V5jh{zz@Vn)q%=}N<VR|1if4O7@L!I0a!e(RcvB!~@5Fq)ibVq?P}*-4vJ0=HJP
zyj3i-#MZKqYT#|GKxV){@Hw)Xke#L<)};~fCkQqq#m3Bw_?5*rAjgt1m~54JsuavW
zmDm447!?|NwqNbfwi<;3XSEZxxmu{kPm|PG7j}k!Q2Mjkey-v~i<Y`E1`TjpXx`P;
z4mzKWrCc&LMjRrM@?Mte+?B{}8Q1m84>eoOHEwru?8mS!G#r6sZw!0CcICag$2}Bk
z>GzKkO!N!m+GH-Wx>sqmaA+NtXv|`zFpN9tvfhA-1p}?FKo@N)O^DP;!os1|HLj@j
zhQQ4n9{~rtt^kBl!A1!XNjY39^Ev?48#>pNGYkTS3P9KuG!9KrZ8bIY&swuOX{a=A
zShdSIuu0`0`Bh5%Br%E4zrQB<hn|Siab~>^DGwp)V~o%r75(X6WIq=Wz<??xXWOI>
zL8k;y8=%VP4X7ajRj{Di`>%P^RoJi~MmCHV5NHXw>7qGx*RF<2ZGk3<?}b5;EMjaG
zq7iYbUP+#nGdHnz?G@{eU$Jfi{EZJUN*UZIbj5LX!sFqB6<G<<ug<o>eP}DBvw?J(
z&gWgQT`$Su^W*CP<@gmBOt{^i*57xg8jHX$N(fogq={~pf`-hvDStyJu97z{DZ?(Q
zC|m<EFH>k=UXtb~4dJ`?{?B7fTfZOgvD-n)mF%)~QSVF$IUOS|=1_?y9`KE$RJMP8
zVOSdNh-0jY572lwu<mHzW_-|&5x_o&F^Aj2B=&}O8VAXh(qz#^?hP)vxYAYx_p^3!
z{>?~_$L_tuJ36?0`QRubc27@a<MHET&kXhVrk30I2R<-9)H|?OY}Nb@Z%<FiXZL!2
z1Cqlb4fwoXyD!w!;~lQ&m5Yuz4qu#oA0b@<N<@D`?o5I+2W{!pxTB06qFNzujxG)v
zqa*|iuK8o(U{|JR6f~ap$1m>>7Q*3e`#)UpDdnRLe>xnCkM?A`f?+VoqlKQH!iV>7
zljNyj|K%74vG=QjACiBgmre|_G8hls0i+~3Nb!wdYOybE9Q&S)z4G<e;4lCFUOwFV
z!M$sSVVeD%s4wRD`=H{p>t~bs&ibwY!B742_C)|JUQ|cR;2S(GwRd}48pkHERm)t{
zVMQnPs1D6{=UYDV7GBqD1(GoeHC1gi&<`grMfAhqsfNCnmfEN3fK|!@Shkc;qi4wl
zps-Nut#1Kp>xF;n|5S}%(%<?S8mJTex~eGPHHxMHKG6-j3A*WpHK|P4woN5V#3Qn)
zIn$61KveKF?ufxm*Q^6DI@1=CTHmYJxuSaTW`Rc+cZj55Zd5?&l$8{vULX&Ef^k>G
zdN$XX1KgZ>xXjCK>I}6`pXQ-`hJ@G@iPMIJOMPkA6PgW1US7jvJkR5%aLo1hoP5to
zRa7g8U5q!7@%_^x=Ltj9#yK0kQ3d^o_AzV(<QZXVAy6t-L!^N4Yi_1a*=6b_a7L0`
z{PbM35d3m5_;7F-K{TNXn60hP1Qp-IL1Y!8zxHuGir6p;iHx~u!sx;S&qz*`5;cEK
z$Mv9P3l}dW$T4Gv2pf7Spj<WB+=A`{9Qa~{+Gj~kP3m=?xb-=w7o2=i^R1^BBc}<8
zn%BL~=WadW?3Egc=;BVbe!U3Kn}z63^X9?&{w@CrI6fqhY_3wxyJ&MtL*~O#9b7eB
z61=HM`j`Ux(CDmD<ll?N(nYy%WaeNXdMRQ7BRxEGC=k6QU6Ma1MD0(fFNy97%#8HG
z{TPvW`jQxu!+mm!l8TVo7uIhRlF$U+wR%8!OiP%iG#DO^3^9B$Iga-Ps!$zE#G$Ks
z_>z?KZG5tb!`D;lxGmHcAeO)pz?MK1V2zvA&(Fu?0k_AcxIFFwIp(mZ({{(%S+in5
z`CN+gfk4vkh{_44QyPf4T&U@CMFu3NGa*ME_GDmy^VA<#?DZ=~Mplg6{u<3LV6sL~
zz>ojyjhzFh0$LwgK{QQr$UpJlLk@|MuM_;)T+)P18iHFi)b`Z~geEWaeEuIVc`~s_
zLZtyE`|hyM{gQWLJhILgayDGz_PUqczVN%V%0MafNG#)d$r~A;Nc&t3XNYd*o+D&9
zNFnguA>kgc+sKj`!V8hS2Fp`<;XMe)<lnDSR|SK^(~g(LeNl>k07=L6a4`6?xGzeP
ze~l^U87Gw_hfm-gzzf(Wycu^jq#(3STY=$Rg|jzPDz2U<|9s^mOKg7jC{#*F9#AM_
z^C~e@x>XhYop{aU?$#Vx*7-c{9(QXF*7JEcH<-5I*;-9I*$^>tYo63<oGqm5bJ_{6
z!!%zLU`~YP7VP)@gxgK?>}vC4@`I5v*Li4VZ7&MTQYmCJ=${skw$gH}RL(Ct0&fbk
zyja}7XT)LCFyAFHPS?LGmQFz2MTtlQyB*P-V$O}Ri^jl=gwBiAUly-S8E;a-kD059
z*u?((_D{qT8}}an((%1dsw#i)dVhT4zWw{}n~3|@$8O(x#qr};Y`uLynPde$HwBG#
zLHeTp4ZyvLtPMC|C{H<|eiXrO@QN47TPbjsT)sjb(;*n?t%>fT^)IX+>h?Mu-i0VR
z3KsMRZI=zbkc@lXk%-&taynh@7_|)&H}^abq>V7-4aim{!?sWkC!Oez-Mp}~<B$#1
zpPb66kUdnGX6vx>LC>HchZ(cppS7{9*uyol_A&Fq7-swXsc&|sVjOj>U1L5Cd4YOt
z(y-;{XK_4eO|<vo*jIrQsM!9g<w!$JkwU5*XIgpd*0L4}G^uIabTM_$YNT?~_*!jB
zpde=XpW;kMi1{T5EayNV%?&Eh(1N<C>44e+UQw2`-8rAsN19J!7~-4=8WH{pRxxGu
zkbmU9{r0a4j|X+MFR^aFC7kSE*A@J#7KkXSI_lkj-#Q_00N&zt(E~kVnRwTl4&`wG
zZyEBiCr#zoz_gj4lwjJKfZ<abf-MxhYYJiw>^$<MD`hT_RzrA){C1DmJDUhUl$EFC
zaCBtv?<YpR-aX-m{JqG?j_frT%e#czh?h$B`cVqCMkm4#MZ-p^-zR3N7Er}}TlD3F
zEQDQMP`5$bGy-|S(8Pfi9IqFrT_$eNJavDs556e=-Ur$-B5xJuBiz0_)awfvalgO!
z(~DAQe;w%UMbMjyH;lnUooK`QC)N|zR1n06cPU{ShF(*ISV1M=8(Nj)wBm%!f#ruJ
zQhDO{RhTmAUm8}aya0puDPf0$yKR0l#UF?-_u8D%phI%Pjw3k&F{jPDJnqKe+qiRV
zBnyXBrMFA+I6c>0hnv*Zt8}@f>`2bbZ8kaTnu^EWeyC&if!=-_w{zd4{k;QrSdRSe
zcs$@oj*{qe`l|t_(SkEj^*j3#HrGhMb1akO%J$96`_rEA4}Tc;r2Cg|-mdWEV4ipP
zkGO1`@;-3)fq@<$w?&q%@%0Q0faCk}{mUX?LYS{#BG83pU&>292<oLOUM<BBR)z+M
zQB$?MmaR%`9O|Cg(NM_b(9)If|M;5kUOG0TV1{XbZVG<prxThid^9CEG{a9*u4Zw7
zUCqnYn9OZg9yomGvaR(E1OKSDz7@%>%g0ui%dLS8^{vb9Jbd8Fmin7D<?`xSeqBz`
z5$vFh*Ky`R_E@4LI5=Y_a(TfRi7k?yhTer0`*GYQ_;aPmw?FYvCi4*8_Kyz?jIVfb
z1qC*T8>`ywxZ4op>$^8^-i^yXFg`wz&C=awi^;UO<(SQ7NcM(Kg${zALa?9b@YeiF
z$OUn{H474=bqy47q(E_KI+3)H6Ck<b$ezPGBIA8supJl-1*TYv{E3yx%tPD9m*;!?
z)&sG`@_WOf4?4C!-GAfg*!G7q%F4_8`PW;gyZddGZaMK5fq37*D8FcQ-R9k0c^6P!
zKJcXDgQ0MFE5G8#;O@<9NB5%2o8|6`t-m{(xZ3E+vh)CqI1B61X=s;OIMBvqo5?$@
zJ(X`cqV5U^&o9FV?a0wTxp^nwB0R!crXw0`<mNnE`!mgo;6WA~2)!|g$mN`=?U*at
z@Ca?pE46v$W<ywA^hW3XHD$i07;Kj0@h+zFUqZ(u-{=9_BP*sp24_ur9}ELax&W<I
zTD~w$h={S@U-tGlj`fV-Ws{Mfv3DKZrS#5xYNl7Y^p;#tVt1lvhta&Yq7)mSni`Ll
zawF;Zx^?k%b$KkAg!)bNteAVh@WbR`VGk<d(95#_<ArT_H0!Ms!p2o->4r5FjxY+&
zGaD@pG)6X1GLxcMLlNuDSR>%(5qrtblT|uq<N6tf-BFypsk+cb2m!1|yEv~+qcqxb
zn$}rZjbNWN&il!$v|`dc_GN6nnsJD#VS~iR_$RvlKp+|jMCmvgQUSE>x(Hz2zl-u=
z=fGH7@0uGD7rtY_+ubzGQ_P%88LnPsp^H%n3q60j^;Ei8ghMLst&`c_zD)1By=(T|
zQ+WJ_J&*3@&0>0?Kug2Z-b|mmXU#o(Zg_mn?nmjBMbg*Jv0ktRTRwYvR>HR~giZKd
z-g+brTlvC&2c}Ws+-06CHY`a+csN@LO++Y*YbxEF<c-zfib{WVac_t_l~C|!x_D|#
zc}-kNb|-vSniBk0eC1*X<oL_+Ws9rXVRjw9opCe1nDGF<+p(xmRv##IcJ%50MSjE>
zA!DS>aZ(j!$q(%Pzby-ZXb-W587=*n|7bHJ#99gtl`uIVA8-h3t<p)x1V(=oe2}gH
z6_dTmvO9^;TD%5TljlUnSV)GF)e(p1ovCTXR@yLPB`8q2a@&j+b#c7_k+6YFSm1b_
z<WO-6`%Q5;`7h$GHXtFxG7pq5Ydse1h75geAkxhnAu1j+?x=^AiAPwnfIt?owhCs&
zjsSwHfKY$c6)<WA$cI?$yZoEjo4nwdtXejhG3loGN<^#)o#RW#dz8d=YxO2#$FC?)
zsMG74!cK_F;I9j7j+Mb>Iw_9c(6qtl21`M+e((U&noZd0)RvC+aYAYC2gWJVa_o*%
z_%_Wd$X@I5rI(BFm6yx#g_nIyV+Zk7m+SEk=PmfI%iXNb?!$L;9>#ZW-V0w(bJ?29
zw|&ZlvjjSXNplG&Gq|L3J|<Vq!~`rd6sJ(c@vI#;^RrTH4Jum~0in16W|g(-;_SzQ
zH$<O%0GowrF4PFkg_Mx^Q*12M`i0w#v&E2G+J+NGw_A0)Yi@VliWfxWq}x3Yr8Z<1
zrE-WD#2pV1Z|4{h2hM)DZnQFw2IoR*ixs%v{U-N~xI*_i-s1QhME2v_hxiu|9z^&a
zT!(Od(2Rc^`Ku8Bxch1U7u+B9f7<;x!ngTvcR%9)3-=rRhuz2h%bf4`J?)&wb(il}
z*Ztn3t|z^pbU*KZ(s{x+R>uiavr}fEw?~9uDhweQ6baw1z|kx$@cE!^2-XoB8{1pl
zGq!hT8E4C8T3=teY4eJKf9y&3I6yRf$Jn0Y-myJ1%g*58v6Ug@|Kq@l&6nUAC{H<a
zTG;jt8icI{-xQFcz*ox>XU!&7xUO@COV>25)vPsZt&_Nc?nq{R6~gjQz+th@Q{&>j
zw{be6k3%dEa?5!xXwN~+58|Lelo+&I))agnWgOkWCI(r45WcnsPvEa!=Jk7RZjalc
ztV-Gu+I&9mzF>rN?vVUaXlN)B85#;9>OfW`xX&MQ`aEuXa+Tt6d;G4D|FU2t!Zn)|
z3WgGia5#}bM6yMK*VqFN4-SGI9*+sz;p8^AGhp8mj7YKWP+}ky8c2k?V-nunUmc{k
zs5r*xRsIvKZ#p-^M_V9jL1%&X+QkdeNlI1=rAf>TrLap^i<2-N7``n?@hg%ai4M<1
zznZ$>%G6)OL@~kNraYXy@`5D)c5G%i`c)|skoc<PM?@lZ<prs4bJ#2<9#-DQlNany
z{WU7bz9I!864AsV?9-0}mk7K)QoxS1Tnx9pwAx;UJ<J{hHf2(c5JJsV>zDWUy8~Xl
zz?X6RrRg8x<2k{?RF`|sJ-D7X_o#{4vB0vP2#4AkIItWV!HCzJ3vgbTn1I8z;BDYh
zO?WEM=_THThj$S9!Qw5=D!JS8Pyw$L?|v})+1>R*0Y|BG*cJ+f`tHw0AKX1RS12gR
z0UQl@Hvos^cLVD|(C%uSB+-!3aPf8b?T2a^4uLm}rtc8CE^qE%H+E##g|VnRv18kH
zW9vR5^ks}g8SwrJ@O&&uz6%jD)R1@&)fV0ZP-;O@PI)zr1QbR*K!N)lGkw`?-;87B
z+O^z2wSQ)2|CA%pH<F#`4~6<CvLk(gBg3m#4{vqW_U)@V`S$vbTz`LVM?ILyR2`{w
zI^|H0ZQHbbIOOq!hL>;JcI;nQW-=?Ud)im2_?||$mX22h8$ft9Ui5{AT6N{JVCJpV
zn%U*+)1|)ZRe5c$brO5>M~7o)SX>H)Y|hP7@xeP<ooio4?<URuk*-@3YOj=n-UC~x
zln+C7hW=Ap?WmH`9t$dsR_X(w`QcsDzCgH3j>ltmTengiiN%%C<j{_OheIx;$D`2|
zBgHM5)S3?h2i@lMCJW0VU2%WF7EQXodxpizw%){4Uw<GsIvfK|5NFLfgtQvLv0PY#
zi$Sx+8V!&M^?l(vNJo^glZz9IDcG$*MMl}y#YjCu{DUe%#>U%s99jfWCu+9nBFFE@
ztqq6Q=B8^<2mAZH>D}wAHLmBA$$V{k>YB|nT|sA5U4M9Ly6sC~!2?Ak^K?v!(J_uL
zqIfgcPT&nXf$<5A;Y}p?v#_8)vu#ar&+6Ib%V$^bDX!U;@!y^)9ULi@Mh=#6oasv>
ze4~;pvQj-TIlFUYWasSU0d-}>#qXR<?bwk{B+@%}q$Yb}#bOM^Z4<K4FF>0KI)%y>
z@fub<$kRC2#{7UBAhp|E5~j_SB@a@PipZlP#!rSF@h%sScjfvv?On6~UEXN7y{BJ`
z`@7+6r;>Q0>V<+mGa~nnfIBDdT<Pf>-aJ+))XuPwIL8l(A&p|5@Xu&JlFC&|Ih-)j
zSj6Qptfr}P8$2tJ@5Ea}$b@klr-S9fd7Fn1pwT>M?e@=fw$B%}&(8b;^ZE*G2H>B3
zg5%gr!YOVSHmo%`E0AOxd+yRppQ{gk=tG0`x%lO8oSuH;<#FEIhZhO&KCxrRiOPz*
zcXz-3_1(Mg7X4X(2l;9No)lgRYbh8$V8Woi%EGAwLI)llt)orS$C~IvlNmZT^gm0-
z&KVvMQ&!lGNyR6<U=oon%h|I+xi#)j@7xj_=_;)%b&bSKGhQ45tMzOB>u9E@cVM8m
zCxa$B?826A58EAC7wNMB)>j=Yi@T+b4`FY$kPwyv^IJwW(a5vn9vF#ju`pTm@dx_?
zE|I%>GNT4Mgv)<o3}o#3IHD640n^sdIR;I$|AfIg#^7I#{-f#tTK~<4!9P;2^Y#Dv
zKc@dLowxtyo0}F5z}>b)TNZ6y79E)V)}h^ZOuyOPpDTt@#F+PU%`+%$={#GWk8xq!
zfh`%#;(Yykq+VY%t#Ze-HWlobpl87oh^}DCv1rITXO5I{ynwG{#A7lE6eYaF16@ls
zjC2_htZ!-A{y?Os2i{xtRy`1L2<x19mVk)ZpM`njJCPv~f_@;bh&7}`BQ(y`480sO
z)WU}&@LEI_UN?fk$y_hAya+6w7-480;;o6!kUzRxysH|p*)IIig*F?QVqe6z`>3LT
zM=5x-0e|)OjVrgfT%w4k(X0equ3J<(9Kj8Rbn_Cnec`jw!07b0@nw984aN!grvaYC
zwt^>M+es+5Wb?2zHp@kb{PPp7i+Drwv{VoOcuRw8l<sLAQJ_H5kK=HD!C_P}+$dVQ
zN1C6PJQ~naRiPg$;6a3w^#<ix7|}SvBTrmedhyD1QZg{OyWL)hwDrZU;=NGur_o}E
z1?W*@N5)-(lqPm(>}3+ZQ)<NR7?(TDxC8mmm~kg$uy31j7xI4wYU2(Ma^T%+#_7%E
z9y4xd8=;{ZW$3FPA28!iSgk*6#$Cw&0lvk0HLNuk<GKmoJY`$1zUktdZbD=`-qbma
z@4jBo4&d9YZ2O_Zw_bk$k&U9<Eh0RI5{H-qnSC6sDfqIhvIL%yHwo!#4BvbmL&*Z-
z_>92Dn{K>i<4wm7A5x0r1!aX|wu{*0<k-wuu`r23=fiC$T0I5}(-DD-0*KT;+j;2N
z%|~v!QJEY^;(T>Uc6jZ-@8dCN@U_KJgo8V|i%Z<iJ>1KE+|L8p2)cNPhj}-T@F*mT
zIBXI=IO6oMOL;HsF<bE6SA6%D_wjz7fJJOS)A#`7(;=?#Bv0`)&*0m*^nKVMsBVy{
zY%R`yM_GVp**MSPC5Jp8<|BNRFJr^_rs)_TXUq5m#uneb<pn;;i*RL`g8gR|zM&iC
zWnKX-g?W`v^BKMZD&8tS%luIK)^L@t<?Hwbd_CX5H}XyR#_tw>A>T^h?!}k8FJ=yY
z3BQ!r_%>)B5x$*G^BtI{70k&mgGFNp9E@JacY@yB3}3b7yZCOtN6a9;#EY*5U(WaO
zEBJn#e)S0-sRX;6UkSV51aonXt;1Qy27UmvbqO2dSJ78+`PKX&+s6;VR+3|Reht1J
zya!ej<Ey%_g9ULX+sF^I9)2x9f^WHA$FIj%b=P1`;7hyw27V*IiO=!Z<LksX^IQ0>
z{5I*<8;@*+b1a1$ie^|SltsEwsF-2Z45!VoWQJ2_IAexu&2XI=USNhBjd0Rvr!YBb
zri<qD4I%{1nxT<jEEw$+3r0Id6R)C)SFvE=RV)~I6$=I)MXQ~5f7Tmt&322ECj3bg
z{-o6p6R(2x+!%-Aq%jWAm`ylldy{5+MRWX$CjLdUe$j+qH1RK*@QNn9q6x2P!Yi8a
zN+!IL39n?rE17WcnLIIHB@<4`gi|u-$HKQ{&WnZjlnHmr?B}G}?vx3C%EWidYzK!?
zqMa!d{*+bTf@{w2q%ppQNn;)h<~S6raVVSfZjD3P>{r=nw_uI`q)B&^2E7!^X1isx
z-Lg486|)}|vme&@;}BcmTQU2AS9pxHIbIdBKNS;h#e`e2`eV>-v1*Nv38!j>COnv(
z2yVfe->M0>YQn9WaH}T1(<Z*tX1}LRJf}^#(+1pvNl%4IV;vQzO}NuI*}%7p&VciB
j#AwGN`vh@fj=ks=+#v^>e3?qHZ@%>==;Mq3PlNvp<^{c<

literal 0
HcmV?d00001

diff --git a/core/media/jui/fonts/IcoMoon.woff b/core/media/jui/fonts/IcoMoon.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0394bb55566fe94366498f26c817f2bf6e6b15fc
GIT binary patch
literal 25424
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

literal 0
HcmV?d00001

diff --git a/core/media/jui/fonts/icomoon-license.txt b/core/media/jui/fonts/icomoon-license.txt
new file mode 100644
index 00000000..98ed6cfb
--- /dev/null
+++ b/core/media/jui/fonts/icomoon-license.txt
@@ -0,0 +1,2 @@
+Icon Set:	IcoMoon Ultimate -- http://icomoon.io/
+License:	Royalty Free -- http://icomoon.io/#icons/license
diff --git a/core/media/jui/images/ajax-loader.gif b/core/media/jui/images/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c3c5a6b3af3573bbd90451e90cb485184b286fe4
GIT binary patch
literal 9933
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
Xx7>8y+I%k1GcfG)MKTHixc<KYE?XIt

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/ajax-loader.gif b/core/media/jui/img/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c3c5a6b3af3573bbd90451e90cb485184b286fe4
GIT binary patch
literal 9933
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
Xx7>8y+I%k1GcfG)MKTHixc<KYE?XIt

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/alpha.png b/core/media/jui/img/alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..833c856185f931e501b27fbcb6c13863e0bdf200
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000UA003kN1ONa46~$>B0004fNkl<Zcma)-
z3vvT73_{Vy$MOA7;`_MMFweup>WBUk7D=#HH$x4^E?zEyp;AfO0;N6ldJ|95R&MLT
zSoPLPdq&TPA~ht~?rGqmR92RDjvLeEkF+)y=}GzX{d3As6QRUVWlWbArp9_CcXJ|o
zCP;MMI?*!#Y1kNvtX(2(3?gLqbjZ^a5JJ7rb(B-!lruyXWV-Eoq68#5K39M4D#$@%
zWp;9)3uTmV5^dEy7hFz9aqfe+SPLaT43Y$O5;1x8*;^97VIB}OHcmbx$Vo*V^Vq)z
z;TY1o+fr_wdtQmSW&G_2Ig$QYZxT64&FhG-a^eL!{=aq1CDETgiOPOroxipuG$a~Q
zoY7Toec`k6@RCFa30TN6U$nor4$Ysd7%H|d2eEa$nW<Efq&tpHw!SBpP&yGx5>=y&
z|IIED8g{9F)*W)5d-b`WMa<?AR4R!}ewCj`6<bH?GU@W$l*^B%-@1YX6^T&H4UJFA
g)t94012WOU7v`I(f)&9K#sB~S07*qoM6N<$f{(|*WB>pF

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/bg-overlay.png b/core/media/jui/img/bg-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bdb1646174034d4127ca615f42869eb0ad9ffe2
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^8X(L8Bp6mseZCP$1$eqRhEy=Vy}VrXfCIzffVcbm
zXO?^OdtPNwfAM|g%cyfzWw$4+^9Wy}eM$6XSBc{;h1dyt9^y;5FR{LC0&<mNCxT^9
g^`4*8d%oxVnd;`|UT(G3w?KAyy85}Sb4q9e07}F(Y5)KL

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/glyphicons-halflings-white.png b/core/media/jui/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7507bf61f46fc431a0753837429760eac46a3e9d
GIT binary patch
literal 8743
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
F{|BHqQ2+n{

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/glyphicons-halflings.png b/core/media/jui/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f241c76f9adb78aba434bf3c7500fb894c12081a
GIT binary patch
literal 12600
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
ONUDmO3UzXpq5lK$2nJaI

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/hue.png b/core/media/jui/img/hue.png
new file mode 100644
index 0000000000000000000000000000000000000000..9548ef37d4302944727906319f4edd3f87ce1f95
GIT binary patch
literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!2~2v_?<NeQYD@)jv*4^t*3a|nH)vj9$r?Q
zbcX%v|Npg}b7fCNg&LUXs>Sqw-*N9;xc>Lh6HX#Q={Mf&tN$<mM)v`aeON(OUzO;6
z#!in{JRW&{RZe`}2HZ<Ga|IV)>9$^_K2Ob{iIXQG@84@ln{^(pUc0+|q}gjLTltr6
WvV16;RICiNpTX1B&t;ucLK6T>^*!YP

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/joomla.png b/core/media/jui/img/joomla.png
new file mode 100644
index 0000000000000000000000000000000000000000..21fe24d1ed0174326927ca07b38301b65e743574
GIT binary patch
literal 4762
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

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/jquery.minicolors.png b/core/media/jui/img/jquery.minicolors.png
new file mode 100644
index 0000000000000000000000000000000000000000..33e4a33ecba933a174401f37106a23abb0ca7b11
GIT binary patch
literal 68255
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
LNkvXXu0mjfQcWZJ

literal 0
HcmV?d00001

diff --git a/core/media/jui/img/saturation.png b/core/media/jui/img/saturation.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1598af6de47cd305a38bf0c2490ca2ac02e6e04
GIT binary patch
literal 4028
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

literal 0
HcmV?d00001

diff --git a/core/media/jui/js/ajax-chosen.js b/core/media/jui/js/ajax-chosen.js
new file mode 100644
index 00000000..567c70f5
--- /dev/null
+++ b/core/media/jui/js/ajax-chosen.js
@@ -0,0 +1,130 @@
+// Generated by CoffeeScript 1.4.0
+
+
+/* USING JOOMLA.JTEXT TO TRANSLATE LANGUAGE STRINGS
+* ================================================= */
+
+
+(function($) {
+  return $.fn.ajaxChosen = function(settings, callback, chosenOptions) {
+    var chosenXhr, defaultOptions, options, select;
+    if (settings == null) {
+      settings = {};
+    }
+    if (callback == null) {
+      callback = {};
+    }
+    if (chosenOptions == null) {
+      chosenOptions = function() {};
+    }
+    defaultOptions = {
+      minTermLength: 3,
+      afterTypeDelay: 500,
+      jsonTermKey: "term",
+      keepTypingMsg: Joomla.JText._('JGLOBAL_KEEP_TYPING'),
+      lookingForMsg: Joomla.JText._('JGLOBAL_LOOKING_FOR')
+    };
+    select = this;
+    chosenXhr = null;
+    options = $.extend({}, defaultOptions, $(select).data(), settings);
+    this.chosen(chosenOptions ? chosenOptions : {});
+    return this.each(function() {
+      return $(this).next('.chzn-container').find(".search-field > input, .chzn-search > input").bind('keyup', function() {
+        var field, msg, success, untrimmed_val, val;
+        untrimmed_val = $(this).val();
+        val = $.trim($(this).val());
+        msg = val.length < options.minTermLength ? options.keepTypingMsg : options.lookingForMsg + (" '" + val + "'");
+        select.next('.chzn-container').find('.no-results').text(msg);
+        if (val === $(this).data('prevVal')) {
+          return false;
+        }
+        $(this).data('prevVal', val);
+        if (this.timer) {
+          clearTimeout(this.timer);
+        }
+        if (val.length < options.minTermLength) {
+          return false;
+        }
+        field = $(this);
+        if (!(options.data != null)) {
+          options.data = {};
+        }
+        options.data[options.jsonTermKey] = val;
+        if (options.dataCallback != null) {
+          options.data = options.dataCallback(options.data);
+        }
+        success = options.success;
+        options.success = function(data) {
+          var items, nbItems, selected_values;
+          if (!(data != null)) {
+            return;
+          }
+          selected_values = [];
+          select.find('option').each(function() {
+            if (!$(this).is(":selected")) {
+              return $(this).remove();
+            } else {
+              return selected_values.push($(this).val() + "-" + $(this).text());
+            }
+          });
+          select.find('optgroup:empty').each(function() {
+            return $(this).remove();
+          });
+          items = callback(data);
+          nbItems = 0;
+          $.each(items, function(i, element) {
+            var group, text, value;
+            nbItems++;
+            if (element.group) {
+              group = select.find("optgroup[label='" + element.text + "']");
+              if (!group.size()) {
+                group = $("<optgroup />");
+              }
+              group.attr('label', element.text).appendTo(select);
+              return $.each(element.items, function(i, element) {
+                var text, value;
+                if (typeof element === "string") {
+                  value = i;
+                  text = element;
+                } else {
+                  value = element.value;
+                  text = element.text;
+                }
+                if ($.inArray(value + "-" + text, selected_values) === -1) {
+                  return $("<option />").attr('value', value).html(text).appendTo(group);
+                }
+              });
+            } else {
+              if (typeof element === "string") {
+                value = i;
+                text = element;
+              } else {
+                value = element.value;
+                text = element.text;
+              }
+              if ($.inArray(value + "-" + text, selected_values) === -1) {
+                return $("<option />").attr('value', value).html(text).appendTo(select);
+              }
+            }
+          });
+          if (nbItems) {
+            select.trigger("liszt:updated");
+          } else {
+            select.data().chosen.no_results_clear();
+            select.data().chosen.no_results(field.val());
+          }
+          if (success != null) {
+            success(data);
+          }
+          return field.val(untrimmed_val);
+        };
+        return this.timer = setTimeout(function() {
+          if (chosenXhr) {
+            chosenXhr.abort();
+          }
+          return chosenXhr = $.ajax(options);
+        }, options.afterTypeDelay);
+      });
+    });
+  };
+})(jQuery);
diff --git a/core/media/jui/js/ajax-chosen.min.js b/core/media/jui/js/ajax-chosen.min.js
new file mode 100644
index 00000000..806dc2de
--- /dev/null
+++ b/core/media/jui/js/ajax-chosen.min.js
@@ -0,0 +1,17 @@
+
+(function($){return $.fn.ajaxChosen=function(settings,callback,chosenOptions){var chosenXhr,defaultOptions,options,select;if(settings==null){settings={};}
+if(callback==null){callback={};}
+if(chosenOptions==null){chosenOptions=function(){};}
+defaultOptions={minTermLength:3,afterTypeDelay:500,jsonTermKey:"term",keepTypingMsg:Joomla.JText._('JGLOBAL_KEEP_TYPING'),lookingForMsg:Joomla.JText._('JGLOBAL_LOOKING_FOR')};select=this;chosenXhr=null;options=$.extend({},defaultOptions,$(select).data(),settings);this.chosen(chosenOptions?chosenOptions:{});return this.each(function(){return $(this).next('.chzn-container').find(".search-field > input, .chzn-search > input").bind('keyup',function(){var field,msg,success,untrimmed_val,val;untrimmed_val=$(this).attr('value');val=$.trim($(this).attr('value'));msg=val.length<options.minTermLength?options.keepTypingMsg:options.lookingForMsg+(" '"+val+"'");select.next('.chzn-container').find('.no-results').text(msg);if(val===$(this).data('prevVal')){return false;}
+$(this).data('prevVal',val);if(this.timer){clearTimeout(this.timer);}
+if(val.length<options.minTermLength){return false;}
+field=$(this);if(!(options.data!=null)){options.data={};}
+options.data[options.jsonTermKey]=val;if(options.dataCallback!=null){options.data=options.dataCallback(options.data);}
+success=options.success;options.success=function(data){var items,selected_values;if(!(data!=null)){return;}
+selected_values=[];select.find('option').each(function(){if(!$(this).is(":selected")){return $(this).remove();}else{return selected_values.push($(this).val()+"-"+$(this).text());}});select.find('optgroup:empty').each(function(){return $(this).remove();});items=callback(data);$.each(items,function(i,element){var group,text,value;if(element.group){group=select.find("optgroup[label='"+element.text+"']");if(!group.size()){group=$("<optgroup />");}
+group.attr('label',element.text).appendTo(select);return $.each(element.items,function(i,element){var text,value;if(typeof element==="string"){value=i;text=element;}else{value=element.value;text=element.text;}
+if($.inArray(value+"-"+text,selected_values)===-1){return $("<option />").attr('value',value).html(text).appendTo(group);}});}else{if(typeof element==="string"){value=i;text=element;}else{value=element.value;text=element.text;}
+if($.inArray(value+"-"+text,selected_values)===-1){return $("<option />").attr('value',value).html(text).appendTo(select);}}});if(Object.keys(items).length){select.trigger("liszt:updated");}else{select.data().chosen.no_results_clear();select.data().chosen.no_results(field.attr('value'));}
+if(success!=null){success(data);}
+return field.attr('value',untrimmed_val);};return this.timer=setTimeout(function(){if(chosenXhr){chosenXhr.abort();}
+return chosenXhr=$.ajax(options);},options.afterTypeDelay);});});};})(jQuery);
\ No newline at end of file
diff --git a/core/media/jui/js/bootstrap-tooltip-extended.js b/core/media/jui/js/bootstrap-tooltip-extended.js
new file mode 100644
index 00000000..889507ba
--- /dev/null
+++ b/core/media/jui/js/bootstrap-tooltip-extended.js
@@ -0,0 +1,170 @@
+/* ===========================================================================
+ * bootstrap-tooltip-extended.js v1.0.0
+ * https://github.com/cyrilreze/bootstrap-tooltip-extended
+ * ===========================================================================
+ * Copyright 2016 Cyril Rezé
+ * Licensed under MIT
+ * https://github.com/cyrilreze/bootstrap-tooltip-extended/blob/master/LICENSE
+ * =========================================================================== */
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+  var bootstrapVersion = $.fn.tooltip.Constructor.VERSION ? $.fn.tooltip.Constructor.VERSION.split('.')[0] : '2'
+
+
+ /* TOOLTIP-EXTENDED PUBLIC CLASS DEFINITION
+  * ======================================== */
+
+  // Save the original function object
+  var _old = $.fn.tooltip;
+
+  // Create a new constructor
+  var TooltipExtended = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  TooltipExtended.prototype = $.extend({}, _old.Constructor.prototype, {
+
+    constructor: TooltipExtended
+
+  , show: function () {
+      var $tip
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+        , e = $.Event('show')
+
+      if (this.hasContent() && this.enabled) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        // Detect if auto direction placement
+        var autoDirToken = /\s?auto-dir?\s?/i
+        var autoDirPlace = autoDirToken.test(placement)
+        if (autoDirPlace) placement = placement.replace(autoDirToken, '') || 'top'
+
+        $tip
+          .detach()
+          .css({ top: 0, left: 0, display: 'block' })
+          .addClass(placement)
+
+        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+        pos = this.getPosition()
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        // Get the overall document direction
+        var isRTL = jQuery(document.querySelector("html")).attr('dir') === 'rtl' ? true : false
+
+        // If auto-dir and the direction is RTL, the horizontal placement is reversed
+        if (autoDirPlace) {
+          var orgPlacement = placement
+          var xPlace = placement.replace(/bottom-|top-/g, '') || ''
+          var yPlace = placement.replace(/left|right/g, '') || ''
+
+          placement = xPlace == 'left'  && isRTL ? yPlace + 'right' :
+                      xPlace == 'right' && isRTL ? yPlace + 'left'  :
+                      placement
+
+          $tip
+            .removeClass(orgPlacement)
+            .addClass(placement)
+        }
+
+        switch (placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+          // Additional positions
+          case 'bottom-left':
+            tp = {top: pos.top + pos.height, left: pos.left}
+            break
+          case 'bottom-right':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width - actualWidth}
+            break
+          case 'top-left':
+            tp = {top: pos.top - actualHeight, left: pos.left }
+            break
+          case 'top-right':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width - actualWidth}
+            break
+        }
+
+        this.applyPlacement(tp, placement)
+
+        // Arrow position adjustment for Bootstrap 3
+        if ( bootstrapVersion === '3' ) {
+          this.newArrow(placement, actualWidth, isRTL)
+        }
+
+        this.$element.trigger('shown')
+      }
+    }
+  , newArrow: function (placement, actualWidth, isRTL) {
+      var $arrow = this.tip().find('.tooltip-arrow')
+        , arrow_width = parseInt($arrow.css('width'), 10)
+        , arrow_height = parseInt($arrow.css('height'), 10)
+  
+      var xPlace = placement.replace(/bottom-|top-/g, '') || ''
+      var yPlace = placement.replace(/left|right/g, '') || ''
+
+      if ( yPlace && xPlace == 'left' && !isRTL ) $arrow.css("left", arrow_width / 2)
+      if ( yPlace && xPlace == 'left' && isRTL )  $arrow.css("right", actualWidth - arrow_width - arrow_width / 2)
+      if ( yPlace && xPlace == 'right' )          $arrow.css("left", actualWidth - arrow_width - arrow_width / 2)
+      if ( yPlace == 'bottom-' )                  $arrow.css("top", arrow_height)
+      if ( yPlace == 'top-' )                     $arrow.css("bottom", arrow_height)
+    }
+  });
+
+
+ /* TOOLTIP-EXTENDED PLUGIN DEFINITION
+  * ================================== */
+
+  var old = $.fn.tooltip
+
+  // Override the old initialization with the new constructor
+  $.fn.tooltip = $.extend(function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = $.extend({}, TooltipExtended.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('tooltip', (data = new TooltipExtended(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }, $.fn.tooltip )
+
+
+ /* TOOLTIP-EXTENDED NO CONFLICT
+  * ============================ */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  };
+
+}(window.jQuery);
diff --git a/core/media/jui/js/bootstrap-tooltip-extended.min.js b/core/media/jui/js/bootstrap-tooltip-extended.min.js
new file mode 100644
index 00000000..4cd69b3b
--- /dev/null
+++ b/core/media/jui/js/bootstrap-tooltip-extended.min.js
@@ -0,0 +1,6 @@
+/*!
+ * bootstrap-tooltip-extended.js v1.0.0
+ * Copyright 2016 Cyril Rezé
+ * Licensed under the MIT license
+ */
+!function(t){"use strict";var e=t.fn.tooltip.Constructor.VERSION?t.fn.tooltip.Constructor.VERSION.split(".")[0]:"2",o=t.fn.tooltip,i=function(t,e){this.init("tooltip",t,e)};i.prototype=t.extend({},o.Constructor.prototype,{constructor:i,show:function(){var o,i,s,n,r,l,p=t.Event("show");if(this.hasContent()&&this.enabled){if(this.$element.trigger(p),p.isDefaultPrevented())return;o=this.tip(),this.setContent(),this.options.animation&&o.addClass("fade"),r="function"==typeof this.options.placement?this.options.placement.call(this,o[0],this.$element[0]):this.options.placement;var a=/\s?auto-dir?\s?/i,h=a.test(r);h&&(r=r.replace(a,"")||"top"),o.detach().css({top:0,left:0,display:"block"}).addClass(r),this.options.container?o.appendTo(this.options.container):o.insertAfter(this.$element),i=this.getPosition(),s=o[0].offsetWidth,n=o[0].offsetHeight;var f="rtl"===jQuery(document.querySelector("html")).attr("dir")?!0:!1;if(h){var c=r,d=r.replace(/bottom-|top-/g,"")||"",g=r.replace(/left|right/g,"")||"";r="left"==d&&f?g+"right":"right"==d&&f?g+"left":r,o.removeClass(c).addClass(r)}switch(r){case"bottom":l={top:i.top+i.height,left:i.left+i.width/2-s/2};break;case"top":l={top:i.top-n,left:i.left+i.width/2-s/2};break;case"left":l={top:i.top+i.height/2-n/2,left:i.left-s};break;case"right":l={top:i.top+i.height/2-n/2,left:i.left+i.width};break;case"bottom-left":l={top:i.top+i.height,left:i.left};break;case"bottom-right":l={top:i.top+i.height,left:i.left+i.width-s};break;case"top-left":l={top:i.top-n,left:i.left};break;case"top-right":l={top:i.top-n,left:i.left+i.width-s}}this.applyPlacement(l,r),"3"===e&&this.newArrow(r,s,f),this.$element.trigger("shown")}},newArrow:function(t,e,o){var i=this.tip().find(".tooltip-arrow"),s=parseInt(i.css("width"),10),n=parseInt(i.css("height"),10),r=t.replace(/bottom-|top-/g,"")||"",l=t.replace(/left|right/g,"")||"";l&&"left"==r&&!o&&i.css("left",s/2),l&&"left"==r&&o&&i.css("right",e-s-s/2),l&&"right"==r&&i.css("left",e-s-s/2),"bottom-"==l&&i.css("top",n),"top-"==l&&i.css("bottom",n)}});var s=t.fn.tooltip;t.fn.tooltip=t.extend(function(e){return this.each(function(){var o=t(this),s=o.data("tooltip"),n=t.extend({},i.defaults,o.data(),"object"==typeof e&&e);s||o.data("tooltip",s=new i(this,n)),"string"==typeof e&&s[e]()})},t.fn.tooltip),t.fn.tooltip.noConflict=function(){return t.fn.tooltip=s,this}}(window.jQuery);
diff --git a/core/media/jui/js/bootstrap.js b/core/media/jui/js/bootstrap.js
new file mode 100644
index 00000000..9f06b79f
--- /dev/null
+++ b/core/media/jui/js/bootstrap.js
@@ -0,0 +1,2338 @@
+/* ===================================================
+ * bootstrap-transition.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+ /**
+  * Custom version for Joomla!
+  */
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+   * ======================================================= */
+
+  $(function () {
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd otransitionend'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.alert
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT NO CONFLICT
+  * ================= */
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  var old = $.fn.button
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON NO CONFLICT
+  * ================== */
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options = options
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      if (this.interval) clearInterval(this.interval);
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , getActiveIndex: function () {
+      this.$active = this.$element.find('.item.active')
+      this.$items = this.$active.parent().children()
+      return this.$items.index(this.$active)
+    }
+
+  , to: function (pos) {
+      var activeIndex = this.getActiveIndex()
+        , that = this
+
+      if (pos > (this.$items.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activeIndex == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle(true)
+      }
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.item.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      e = $.Event('slide', {
+        relatedTarget: $next[0]
+      , direction: direction
+      })
+
+      if ($next.hasClass('active')) return
+
+      if (this.$indicators.length) {
+        this.$indicators.find('.active').removeClass('active')
+        this.$element.one('slid', function () {
+          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+          $nextIndicator && $nextIndicator.addClass('active')
+        })
+      }
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.carousel
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , action = typeof option == 'string' ? option : options.slide
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL NO CONFLICT
+  * ==================== */
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this = $(this), href
+      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      , options = $.extend({}, $target.data(), $this.data())
+      , slideIndex
+
+    $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('carousel').pause().to(slideIndex).cycle()
+    }
+
+    e.preventDefault()
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning || this.$element.hasClass('in')) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning || !this.$element.hasClass('in')) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+	  // JOOMLA JUI >>>
+	  /* ORIGINAL:
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      */
+      this.transition('removeClass', $.Event('hideme'), 'hidden')
+      // < Joomla JUI
+
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSE PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.collapse
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSE NO CONFLICT
+  * ==================== */
+
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+ /* COLLAPSE DATA-API
+  * ================= */
+
+  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this = $(this), href
+      , target = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+      , option = $(target).data('collapse') ? 'toggle' : $this.data()
+    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    $(target).collapse(option)
+  })
+
+}(window.jQuery);
+/* ============================================================
+ * bootstrap-dropdown.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle=dropdown]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        // JOOMLA JUI >>>
+          .on('mouseover.dropdown.data-api', this.toggle)
+        // < Joomla JUI
+        $('html').on('click.dropdown.data-api', function () {
+          // JOOMLA JUI >>>
+          $el.parent().parent().removeClass('nav-hover')
+          // < Joomla JUI
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      // JOOMLA JUI >>>
+      /* ORIGINAL
+      var $this = $(this)
+        , $parent
+        , isActive
+      */
+      var $this = $(this)
+        , $parent
+        , isActive
+        , url
+        , isHover
+      // < Joomla JUI
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+      // JOOMLA JUI >>>
+      isHover = $parent.parent().hasClass('nav-hover')
+      if(!isHover && e.type == 'mouseover') return
+      // < Joomla JUI
+
+      url = $this.attr('href')
+      if (e.type == 'click' && (url) && (url !== '#')) {
+         window.location = url
+         return
+      }
+
+      clearMenus()
+
+      // JOOMLA JUI >>>
+      if ((!isActive && e.type != 'mouseover') || (isHover && e.type == 'mouseover')) {
+        if ('ontouchstart' in document.documentElement) {
+          // if mobile we we use a backdrop because click events don't delegate
+          $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
+          $this.on('hover', function () {
+            $('.dropdown-backdrop').remove()
+          });
+        }
+        $parent.parent().toggleClass('nav-hover');
+        $parent.toggleClass('open')
+      }
+      // < Joomla JUI
+
+      $this.focus()
+
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      if (!isActive || (isActive && e.keyCode == 27)) {
+        if (e.which == 27) $parent.find(toggle).focus()
+        return $this.click()
+      }
+
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
+    }
+
+  }
+
+  function clearMenus() {
+    // JOOMLA JUI >>>
+    $(toggle).parent().parent().removeClass('nav-hover')
+    // < Joomla JUI
+    $('.dropdown-backdrop').remove()
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
+
+    return $parent
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(document)
+    .on('click.dropdown.data-api', clearMenus)
+    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+    // JOOMLA JUI >>>
+    .on('mouseover.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+    // < Joomla JUI
+}(window.jQuery);
+/* =========================================================
+ * bootstrap-modal.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (element, options) {
+    this.options = options
+    this.$element = $(element)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = true
+
+        this.escape()
+
+        this.backdrop(function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element.show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element
+            .addClass('in')
+            .attr('aria-hidden', false)
+
+          that.enforceFocus()
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
+            that.$element.focus().trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        this.escape()
+
+        $(document).off('focusin.modal')
+
+        this.$element
+          .removeClass('in')
+          .attr('aria-hidden', true)
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          this.hideWithTransition() :
+          this.hideModal()
+      }
+
+    , enforceFocus: function () {
+        var that = this
+        $(document).on('focusin.modal', function (e) {
+          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+            that.$element.focus()
+          }
+        })
+      }
+
+    , escape: function () {
+        var that = this
+        if (this.isShown && this.options.keyboard) {
+          this.$element.on('keyup.dismiss.modal', function ( e ) {
+            e.which == 27 && that.hide()
+          })
+        } else if (!this.isShown) {
+          this.$element.off('keyup.dismiss.modal')
+        }
+      }
+
+    , hideWithTransition: function () {
+        var that = this
+          , timeout = setTimeout(function () {
+              that.$element.off($.support.transition.end)
+              that.hideModal()
+            }, 500)
+
+        this.$element.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          that.hideModal()
+        })
+      }
+
+    , hideModal: function () {
+        var that = this
+        this.$element.hide()
+        this.backdrop(function () {
+          that.removeBackdrop()
+          that.$element.trigger('hidden')
+        })
+      }
+
+    , removeBackdrop: function () {
+        this.$backdrop && this.$backdrop.remove()
+        this.$backdrop = null
+      }
+
+    , backdrop: function (callback) {
+        var that = this
+          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+        if (this.isShown && this.options.backdrop) {
+          var doAnimate = $.support.transition && animate
+
+          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+            .appendTo(document.body)
+
+          this.$backdrop.click(
+            this.options.backdrop == 'static' ?
+              $.proxy(this.$element[0].focus, this.$element[0])
+            : $.proxy(this.hide, this)
+          )
+
+          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+          this.$backdrop.addClass('in')
+
+          if (!callback) return
+
+          doAnimate ?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (!this.isShown && this.$backdrop) {
+          this.$backdrop.removeClass('in')
+
+          $.support.transition && this.$element.hasClass('fade')?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (callback) {
+          callback()
+        }
+      }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.modal
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this = $(this)
+      , href = $this.attr('href')
+      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+
+    e.preventDefault()
+
+    $target
+      .modal(option)
+      .one('hide', function () {
+        $this.focus()
+      })
+  })
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-tooltip.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+        , triggers
+        , trigger
+        , i
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      triggers = this.options.trigger.split(' ')
+
+      for (i = triggers.length; i--;) {
+        trigger = triggers[i]
+        if (trigger == 'click') {
+          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+        } else if (trigger != 'manual') {
+          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
+          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+        }
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+        , e = $.Event('show')
+
+      if (this.hasContent() && this.enabled) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        $tip
+          .detach()
+          .css({ top: 0, left: 0, display: 'block' })
+
+        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+        pos = this.getPosition()
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        this.applyPlacement(tp, placement)
+        this.$element.trigger('shown')
+      }
+    }
+
+  , applyPlacement: function(offset, placement){
+      var $tip = this.tip()
+        , width = $tip[0].offsetWidth
+        , height = $tip[0].offsetHeight
+        , actualWidth
+        , actualHeight
+        , delta
+        , replace
+
+      $tip
+        .offset(offset)
+        .addClass(placement)
+        .addClass('in')
+
+      actualWidth = $tip[0].offsetWidth
+      actualHeight = $tip[0].offsetHeight
+
+      if (placement == 'top' && actualHeight != height) {
+        offset.top = offset.top + height - actualHeight
+        replace = true
+      }
+
+      if (placement == 'bottom' || placement == 'top') {
+        delta = 0
+
+        if (offset.left < 0){
+          delta = offset.left * -2
+          offset.left = 0
+          $tip.offset(offset)
+          actualWidth = $tip[0].offsetWidth
+          actualHeight = $tip[0].offsetHeight
+        }
+
+        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+      } else {
+        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+      }
+
+      if (replace) $tip.offset(offset)
+    }
+
+  , replaceArrow: function(delta, dimension, position){
+      this
+        .arrow()
+        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+	  // JOOMLA JUI >>>
+	  /* ORIGINAL:
+      var that = this
+        , $tip = this.tip()
+        , e = $.Event('hide')
+      */
+      var that = this
+        , $tip = this.tip()
+        , e = $.Event('hideme')
+      // < Joomla JUI
+
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).detach()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.detach()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.detach()
+
+      this.$element.trigger('hidden')
+
+      return this
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function () {
+      var el = this.$element[0]
+      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+        width: el.offsetWidth
+      , height: el.offsetHeight
+      }, this.$element.offset())
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , arrow: function(){
+      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function (e) {
+      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+      self.tip().hasClass('in') ? self.hide() : self.show()
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  // JOOMLA JUI >>>
+  /* ORIGINAL:
+  , html: false
+  */
+  , html: true
+  // < Joomla JUI
+  , container: false
+  }
+
+
+ /* TOOLTIP NO CONFLICT
+  * =================== */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-popover.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+        || $e.attr('data-content')
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.popover
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+ /* POPOVER NO CONFLICT
+  * =================== */
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(window.jQuery);
+/* =============================================================
+ * bootstrap-scrollspy.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* SCROLLSPY CLASS DEFINITION
+  * ========================== */
+
+  function ScrollSpy(element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && $href.length
+              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu').length)  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  var old = $.fn.scrollspy
+
+  $.fn.scrollspy = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY NO CONFLICT
+  * ===================== */
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(window).on('load', function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);/* ========================================================
+ * bootstrap-tab.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function (element) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active:last a')[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  var old = $.fn.tab
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB NO CONFLICT
+  * =============== */
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault()
+    $(this).tab('show')
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-typeahead.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.source = this.options.source
+    this.$menu = $(this.options.menu)
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
+
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var items
+
+      this.query = this.$element.val()
+
+      if (!this.query || this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
+
+      return items ? this.process(items) : this
+    }
+
+  , process: function (items) {
+      var that = this
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+    }
+
+  , eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;')
+        isSupported = typeof this.$element[eventName] === 'function'
+      }
+      return isSupported
+    }
+
+  , move: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.move(e)
+    }
+
+  , keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return
+      this.move(e)
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , focus: function (e) {
+      this.focused = true
+    }
+
+  , blur: function (e) {
+      this.focused = false
+      if (!this.mousedover && this.shown) this.hide()
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+      this.$element.focus()
+    }
+
+  , mouseenter: function (e) {
+      this.mousedover = true
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  , mouseleave: function (e) {
+      this.mousedover = false
+      if (!this.focused && this.shown) this.hide()
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , minLength: 1
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this)
+    if ($this.data('typeahead')) return
+    $this.typeahead($this.data())
+  })
+
+}(window.jQuery);
+/* ==========================================================
+ * bootstrap-affix.js v2.3.2
+ * http://twitter.github.com/bootstrap/javascript.html#affix
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* AFFIX CLASS DEFINITION
+  * ====================== */
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, $.fn.affix.defaults, options)
+    this.$window = $(window)
+      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
+    this.$element = $(element)
+    this.checkPosition()
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+      , scrollTop = this.$window.scrollTop()
+      , position = this.$element.offset()
+      , offset = this.options.offset
+      , offsetBottom = offset.bottom
+      , offsetTop = offset.top
+      , reset = 'affix affix-top affix-bottom'
+      , affix
+
+    if (typeof offset != 'object') offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+
+    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
+      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
+      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
+      'top'    : false
+
+    if (this.affixed === affix) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+  }
+
+
+ /* AFFIX PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.affix
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('affix')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+  $.fn.affix.defaults = {
+    offset: 0
+  }
+
+
+ /* AFFIX NO CONFLICT
+  * ================= */
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
+ /* AFFIX DATA-API
+  * ============== */
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+        , data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
+      data.offsetTop && (data.offset.top = data.offsetTop)
+
+      $spy.affix(data)
+    })
+  })
+
+
+}(window.jQuery);
diff --git a/core/media/jui/js/bootstrap.min.js b/core/media/jui/js/bootstrap.min.js
new file mode 100644
index 00000000..4e068c66
--- /dev/null
+++ b/core/media/jui/js/bootstrap.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap.js by @fat & @mdo
+ * Copyright 2012 Twitter, Inc.
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ * Custom version for Joomla!
+ */
+!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hideme"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).parent().parent().removeClass("nav-hover"),e(".dropdown-backdrop").remove(),e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle).on("mouseover.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().parent().removeClass("nav-hover"),n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o,u,a;if(n.is(".disabled, :disabled"))return;s=i(n),o=s.hasClass("open"),a=s.parent().hasClass("nav-hover");if(!a&&t.type=="mouseover")return;u=n.attr("href");if(t.type=="click"&&u&&u!=="#"){window.location=u;return}r();if(!o&&t.type!="mouseover"||a&&t.type=="mouseover")"ontouchstart"in document.documentElement&&(e('<div class="dropdown-backdrop"/>').insertBefore(e(this)).on("click",r),n.on("hover",function(){e(".dropdown-backdrop").remove()})),s.parent().toggleClass("nav-hover"),s.toggleClass("open");return n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown).on("mouseover.dropdown.data-api",t,n.prototype.toggle)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hideme");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!0,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/core/media/jui/js/chosen.jquery.js b/core/media/jui/js/chosen.jquery.js
new file mode 100644
index 00000000..8ce577aa
--- /dev/null
+++ b/core/media/jui/js/chosen.jquery.js
@@ -0,0 +1,1349 @@
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.6.2
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011-2016 Harvest http://getharvest.com
+
+ Modified for Joomla! UI:
+ - revert the check for instance type of data-chosen, to allow to disable Chosen for field with data-chosen="true", @see https://github.com/joomla/joomla-cms/pull/12877
+ - rename the css and javascript classes and functions to revert back to using chzn and liszt
+ - fix zero width, based on https://github.com/harvesthq/chosen/pull/1439
+ - allow to add a custom value on fly, based on https://github.com/harvesthq/chosen/pull/749
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
+
+(function() {
+  var $, AbstractChosen, Chosen, SelectParser, _ref,
+    __hasProp = {}.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+
+  SelectParser = (function() {
+    function SelectParser() {
+      this.options_index = 0;
+      this.parsed = [];
+    }
+
+    SelectParser.prototype.add_node = function(child) {
+      if (child.nodeName.toUpperCase() === "OPTGROUP") {
+        return this.add_group(child);
+      } else {
+        return this.add_option(child);
+      }
+    };
+
+    SelectParser.prototype.add_group = function(group) {
+      var group_position, option, _i, _len, _ref, _results;
+      group_position = this.parsed.length;
+      this.parsed.push({
+        array_index: group_position,
+        group: true,
+        label: this.escapeExpression(group.label),
+        title: group.title ? group.title : void 0,
+        children: 0,
+        disabled: group.disabled,
+        classes: group.className
+      });
+      _ref = group.childNodes;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        option = _ref[_i];
+        _results.push(this.add_option(option, group_position, group.disabled));
+      }
+      return _results;
+    };
+
+    SelectParser.prototype.add_option = function(option, group_position, group_disabled) {
+      if (option.nodeName.toUpperCase() === "OPTION") {
+        if (option.text !== "") {
+          if (group_position != null) {
+            this.parsed[group_position].children += 1;
+          }
+          this.parsed.push({
+            array_index: this.parsed.length,
+            options_index: this.options_index,
+            value: option.value,
+            text: option.text,
+            html: option.innerHTML,
+            title: option.title ? option.title : void 0,
+            selected: option.selected,
+            disabled: group_disabled === true ? group_disabled : option.disabled,
+            group_array_index: group_position,
+            group_label: group_position != null ? this.parsed[group_position].label : null,
+            classes: option.className,
+            style: option.style.cssText
+          });
+        } else {
+          this.parsed.push({
+            array_index: this.parsed.length,
+            options_index: this.options_index,
+            empty: true
+          });
+        }
+        return this.options_index += 1;
+      }
+    };
+
+    SelectParser.prototype.escapeExpression = function(text) {
+      var map, unsafe_chars;
+      if ((text == null) || text === false) {
+        return "";
+      }
+      if (!/[\&\<\>\"\'\`]/.test(text)) {
+        return text;
+      }
+      map = {
+        "<": "&lt;",
+        ">": "&gt;",
+        '"': "&quot;",
+        "'": "&#x27;",
+        "`": "&#x60;"
+      };
+      unsafe_chars = /&(?!\w+;)|[\<\>\"\'\`]/g;
+      return text.replace(unsafe_chars, function(chr) {
+        return map[chr] || "&amp;";
+      });
+    };
+
+    return SelectParser;
+
+  })();
+
+  SelectParser.select_to_array = function(select) {
+    var child, parser, _i, _len, _ref;
+    parser = new SelectParser();
+    _ref = select.childNodes;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      child = _ref[_i];
+      parser.add_node(child);
+    }
+    return parser.parsed;
+  };
+
+  AbstractChosen = (function() {
+    function AbstractChosen(form_field, options) {
+      this.form_field = form_field;
+      this.options = options != null ? options : {};
+      if (!AbstractChosen.browser_is_supported()) {
+        return;
+      }
+      this.is_multiple = this.form_field.multiple;
+      this.set_default_text();
+      this.set_default_values();
+      this.setup();
+      this.set_up_html();
+      this.register_observers();
+      this.on_ready();
+    }
+
+    AbstractChosen.prototype.set_default_values = function() {
+      var _this = this;
+      this.click_test_action = function(evt) {
+        return _this.test_active_click(evt);
+      };
+      this.activate_action = function(evt) {
+        return _this.activate_field(evt);
+      };
+      this.active_field = false;
+      this.mouse_on_container = false;
+      this.results_showing = false;
+      this.result_highlighted = null;
+      /*<JUI>*/
+      /* Original: not exist */
+      this.allow_custom_value = false;
+      /*</JUI>*/
+      this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
+      this.disable_search_threshold = this.options.disable_search_threshold || 0;
+      this.disable_search = this.options.disable_search || false;
+      this.enable_split_word_search = this.options.enable_split_word_search != null ? this.options.enable_split_word_search : true;
+      this.group_search = this.options.group_search != null ? this.options.group_search : true;
+      this.search_contains = this.options.search_contains || false;
+      this.single_backstroke_delete = this.options.single_backstroke_delete != null ? this.options.single_backstroke_delete : true;
+      this.max_selected_options = this.options.max_selected_options || Infinity;
+      this.inherit_select_classes = this.options.inherit_select_classes || false;
+      this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true;
+      this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true;
+      this.include_group_label_in_selected = this.options.include_group_label_in_selected || false;
+      this.max_shown_results = this.options.max_shown_results || Number.POSITIVE_INFINITY;
+      return this.case_sensitive_search = this.options.case_sensitive_search || false;
+    };
+
+    AbstractChosen.prototype.set_default_text = function() {
+      if (this.form_field.getAttribute("data-placeholder")) {
+        this.default_text = this.form_field.getAttribute("data-placeholder");
+      } else if (this.is_multiple) {
+        this.default_text = this.options.placeholder_text_multiple || this.options.placeholder_text || AbstractChosen.default_multiple_text;
+      } else {
+        this.default_text = this.options.placeholder_text_single || this.options.placeholder_text || AbstractChosen.default_single_text;
+      }
+      /*<JUI>*/
+      /* Original: not exist */
+      this.custom_group_text = this.form_field.getAttribute("data-custom_group_text") || this.options.custom_group_text || "Custom Value";
+      /*</JUI>*/
+      return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text;
+    };
+
+    AbstractChosen.prototype.choice_label = function(item) {
+      if (this.include_group_label_in_selected && (item.group_label != null)) {
+        return "<b class='group-name'>" + item.group_label + "</b>" + item.html;
+      } else {
+        return item.html;
+      }
+    };
+
+    AbstractChosen.prototype.mouse_enter = function() {
+      return this.mouse_on_container = true;
+    };
+
+    AbstractChosen.prototype.mouse_leave = function() {
+      return this.mouse_on_container = false;
+    };
+
+    AbstractChosen.prototype.input_focus = function(evt) {
+      var _this = this;
+      if (this.is_multiple) {
+        if (!this.active_field) {
+          return setTimeout((function() {
+            return _this.container_mousedown();
+          }), 50);
+        }
+      } else {
+        if (!this.active_field) {
+          return this.activate_field();
+        }
+      }
+    };
+
+    AbstractChosen.prototype.input_blur = function(evt) {
+      var _this = this;
+      if (!this.mouse_on_container) {
+        this.active_field = false;
+        return setTimeout((function() {
+          return _this.blur_test();
+        }), 100);
+      }
+    };
+
+    AbstractChosen.prototype.results_option_build = function(options) {
+      var content, data, data_content, shown_results, _i, _len, _ref;
+      content = '';
+      shown_results = 0;
+      _ref = this.results_data;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        data = _ref[_i];
+        data_content = '';
+        if (data.group) {
+          data_content = this.result_add_group(data);
+        } else {
+          data_content = this.result_add_option(data);
+        }
+        if (data_content !== '') {
+          shown_results++;
+          content += data_content;
+        }
+        if (options != null ? options.first : void 0) {
+          if (data.selected && this.is_multiple) {
+            this.choice_build(data);
+          } else if (data.selected && !this.is_multiple) {
+            this.single_set_selected_text(this.choice_label(data));
+          }
+        }
+        if (shown_results >= this.max_shown_results) {
+          break;
+        }
+      }
+      return content;
+    };
+
+    AbstractChosen.prototype.result_add_option = function(option) {
+      var classes, option_el;
+      if (!option.search_match) {
+        return '';
+      }
+      if (!this.include_option_in_results(option)) {
+        return '';
+      }
+      classes = [];
+      if (!option.disabled && !(option.selected && this.is_multiple)) {
+        classes.push("active-result");
+      }
+      if (option.disabled && !(option.selected && this.is_multiple)) {
+        classes.push("disabled-result");
+      }
+      if (option.selected) {
+        classes.push("result-selected");
+      }
+      if (option.group_array_index != null) {
+        classes.push("group-option");
+      }
+      if (option.classes !== "") {
+        classes.push(option.classes);
+      }
+      option_el = document.createElement("li");
+      option_el.className = classes.join(" ");
+      option_el.style.cssText = option.style;
+      option_el.setAttribute("data-option-array-index", option.array_index);
+      option_el.innerHTML = option.search_text;
+      if (option.title) {
+        option_el.title = option.title;
+      }
+      return this.outerHTML(option_el);
+    };
+
+    AbstractChosen.prototype.result_add_group = function(group) {
+      var classes, group_el;
+      if (!(group.search_match || group.group_match)) {
+        return '';
+      }
+      if (!(group.active_options > 0)) {
+        return '';
+      }
+      classes = [];
+      classes.push("group-result");
+      if (group.classes) {
+        classes.push(group.classes);
+      }
+      group_el = document.createElement("li");
+      group_el.className = classes.join(" ");
+      group_el.innerHTML = group.search_text;
+      if (group.title) {
+        group_el.title = group.title;
+      }
+      return this.outerHTML(group_el);
+    };
+
+    AbstractChosen.prototype.results_update_field = function() {
+      this.set_default_text();
+      if (!this.is_multiple) {
+        this.results_reset_cleanup();
+      }
+      this.result_clear_highlight();
+      this.results_build();
+      if (this.results_showing) {
+        return this.winnow_results();
+      }
+    };
+
+    AbstractChosen.prototype.reset_single_select_options = function() {
+      var result, _i, _len, _ref, _results;
+      _ref = this.results_data;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        result = _ref[_i];
+        if (result.selected) {
+          _results.push(result.selected = false);
+        } else {
+          _results.push(void 0);
+        }
+      }
+      return _results;
+    };
+
+    AbstractChosen.prototype.results_toggle = function() {
+      if (this.results_showing) {
+        return this.results_hide();
+      } else {
+        return this.results_show();
+      }
+    };
+
+    AbstractChosen.prototype.results_search = function(evt) {
+      if (this.results_showing) {
+        return this.winnow_results();
+      } else {
+        return this.results_show();
+      }
+    };
+
+    AbstractChosen.prototype.winnow_results = function() {
+      var escapedSearchText, option, regex, results, results_group, searchText, startpos, text, zregex, _i, _len, _ref;
+      this.no_results_clear();
+      results = 0;
+      searchText = this.get_search_text();
+      escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+      zregex = new RegExp(escapedSearchText, 'i');
+      regex = this.get_search_regex(escapedSearchText);
+      _ref = this.results_data;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        option = _ref[_i];
+        option.search_match = false;
+        results_group = null;
+        if (this.include_option_in_results(option)) {
+          if (option.group) {
+            option.group_match = false;
+            option.active_options = 0;
+          }
+          if ((option.group_array_index != null) && this.results_data[option.group_array_index]) {
+            results_group = this.results_data[option.group_array_index];
+            if (results_group.active_options === 0 && results_group.search_match) {
+              results += 1;
+            }
+            results_group.active_options += 1;
+          }
+          option.search_text = option.group ? option.label : option.html;
+          if (!(option.group && !this.group_search)) {
+            option.search_match = this.search_string_match(option.search_text, regex);
+            if (option.search_match && !option.group) {
+              results += 1;
+            }
+            if (option.search_match) {
+              if (searchText.length) {
+                startpos = option.search_text.search(zregex);
+                text = option.search_text.substr(0, startpos + searchText.length) + '</em>' + option.search_text.substr(startpos + searchText.length);
+                option.search_text = text.substr(0, startpos) + '<em>' + text.substr(startpos);
+              }
+              if (results_group != null) {
+                results_group.group_match = true;
+              }
+            } else if ((option.group_array_index != null) && this.results_data[option.group_array_index].search_match) {
+              option.search_match = true;
+            }
+          }
+        }
+      }
+      this.result_clear_highlight();
+      if (results < 1 && searchText.length) {
+        this.update_results_content("");
+        return this.no_results(searchText);
+      } else {
+        this.update_results_content(this.results_option_build());
+        return this.winnow_results_set_highlight();
+      }
+    };
+
+    AbstractChosen.prototype.get_search_regex = function(escaped_search_string) {
+      var regex_anchor, regex_flag;
+      regex_anchor = this.search_contains ? "" : "^";
+      regex_flag = this.case_sensitive_search ? "" : "i";
+      return new RegExp(regex_anchor + escaped_search_string, regex_flag);
+    };
+
+    AbstractChosen.prototype.search_string_match = function(search_string, regex) {
+      var part, parts, _i, _len;
+      if (regex.test(search_string)) {
+        return true;
+      } else if (this.enable_split_word_search && (search_string.indexOf(" ") >= 0 || search_string.indexOf("[") === 0)) {
+        parts = search_string.replace(/\[|\]/g, "").split(" ");
+        if (parts.length) {
+          for (_i = 0, _len = parts.length; _i < _len; _i++) {
+            part = parts[_i];
+            if (regex.test(part)) {
+              return true;
+            }
+          }
+        }
+      }
+    };
+
+    AbstractChosen.prototype.choices_count = function() {
+      var option, _i, _len, _ref;
+      if (this.selected_option_count != null) {
+        return this.selected_option_count;
+      }
+      this.selected_option_count = 0;
+      _ref = this.form_field.options;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        option = _ref[_i];
+        if (option.selected) {
+          this.selected_option_count += 1;
+        }
+      }
+      return this.selected_option_count;
+    };
+
+    AbstractChosen.prototype.choices_click = function(evt) {
+      evt.preventDefault();
+      if (!(this.results_showing || this.is_disabled)) {
+        return this.results_show();
+      }
+    };
+
+    AbstractChosen.prototype.keyup_checker = function(evt) {
+      var stroke, _ref;
+      stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
+      this.search_field_scale();
+      switch (stroke) {
+        case 8:
+          if (this.is_multiple && this.backstroke_length < 1 && this.choices_count() > 0) {
+            return this.keydown_backstroke();
+          } else if (!this.pending_backstroke) {
+            this.result_clear_highlight();
+            return this.results_search();
+          }
+          break;
+        case 13:
+          evt.preventDefault();
+          if (this.results_showing) {
+            return this.result_select(evt);
+          }
+          break;
+        case 27:
+          if (this.results_showing) {
+            this.results_hide();
+          }
+          return true;
+        case 9:
+        case 38:
+        case 40:
+        case 16:
+        case 91:
+        case 17:
+        case 18:
+          break;
+        default:
+          return this.results_search();
+      }
+    };
+
+    AbstractChosen.prototype.clipboard_event_checker = function(evt) {
+      var _this = this;
+      return setTimeout((function() {
+        return _this.results_search();
+      }), 50);
+    };
+
+    AbstractChosen.prototype.container_width = function() {
+      if (this.options.width != null) {
+        return this.options.width;
+      } else {
+        /*<JUI>*/
+        /* Original:
+        return "" + this.form_field.offsetWidth + "px";
+        */
+        return this.form_field_jq.css("width") || "" + this.form_field.offsetWidth + "px";
+        /*</JUI>*/
+      }
+    };
+
+    AbstractChosen.prototype.include_option_in_results = function(option) {
+      if (this.is_multiple && (!this.display_selected_options && option.selected)) {
+        return false;
+      }
+      if (!this.display_disabled_options && option.disabled) {
+        return false;
+      }
+      if (option.empty) {
+        return false;
+      }
+      return true;
+    };
+
+    AbstractChosen.prototype.search_results_touchstart = function(evt) {
+      this.touch_started = true;
+      return this.search_results_mouseover(evt);
+    };
+
+    AbstractChosen.prototype.search_results_touchmove = function(evt) {
+      this.touch_started = false;
+      return this.search_results_mouseout(evt);
+    };
+
+    AbstractChosen.prototype.search_results_touchend = function(evt) {
+      if (this.touch_started) {
+        return this.search_results_mouseup(evt);
+      }
+    };
+
+    AbstractChosen.prototype.outerHTML = function(element) {
+      var tmp;
+      if (element.outerHTML) {
+        return element.outerHTML;
+      }
+      tmp = document.createElement("div");
+      tmp.appendChild(element);
+      return tmp.innerHTML;
+    };
+
+    AbstractChosen.browser_is_supported = function() {
+      if ("Microsoft Internet Explorer" === window.navigator.appName) {
+        return document.documentMode >= 8;
+      }
+      if (/iP(od|hone)/i.test(window.navigator.userAgent) || /IEMobile/i.test(window.navigator.userAgent) || /Windows Phone/i.test(window.navigator.userAgent) || /BlackBerry/i.test(window.navigator.userAgent) || /BB10/i.test(window.navigator.userAgent) || /Android.*Mobile/i.test(window.navigator.userAgent)) {
+        return false;
+      }
+      return true;
+    };
+
+    AbstractChosen.default_multiple_text = "Select Some Options";
+
+    AbstractChosen.default_single_text = "Select an Option";
+
+    AbstractChosen.default_no_result_text = "No results match";
+
+    return AbstractChosen;
+
+  })();
+
+  $ = jQuery;
+
+  $.fn.extend({
+    chosen: function(options) {
+      if (!AbstractChosen.browser_is_supported()) {
+        return this;
+      }
+      return this.each(function(input_field) {
+        var $this, chosen;
+        $this = $(this);
+        chosen = $this.data('chosen');
+        if (options === 'destroy') {
+          if (chosen instanceof Chosen) {
+            chosen.destroy();
+          }
+          return;
+        }
+        /*<JUI>*/
+        /*
+          This changes allow to prevent Chosen.js initialization for <select> field by adding data-chosen="true" to this tag,
+          we need it because in a lot layouts Joomla! applies Chosen.js to all <select> on the page.
+          @see https://github.com/joomla/joomla-cms/pull/12877
+        */
+        /* Original:
+        if (!(chosen instanceof Chosen)) {
+          $this.data('chosen', new Chosen(this, options));
+        }
+        */
+        if (!chosen) {
+          $this.data('chosen', new Chosen(this, options));
+        }
+        /*</JUI>*/
+      });
+    }
+  });
+
+  Chosen = (function(_super) {
+    __extends(Chosen, _super);
+
+    function Chosen() {
+      _ref = Chosen.__super__.constructor.apply(this, arguments);
+      return _ref;
+    }
+
+    Chosen.prototype.setup = function() {
+      this.form_field_jq = $(this.form_field);
+      this.current_selectedIndex = this.form_field.selectedIndex;
+      /*<JUI>*/
+      /* Original: not exist */
+      this.allow_custom_value = this.form_field_jq.hasClass("chzn-custom-value") || this.options.allow_custom_value;
+      /*</JUI>*/
+      return this.is_rtl = this.form_field_jq.hasClass("chzn-rtl");
+    };
+
+    Chosen.prototype.set_up_html = function() {
+      var container_classes, container_props;
+      container_classes = ["chzn-container"];
+      container_classes.push("chzn-container-" + (this.is_multiple ? "multi" : "single"));
+      if (this.inherit_select_classes && this.form_field.className) {
+        container_classes.push(this.form_field.className);
+      }
+      if (this.is_rtl) {
+        container_classes.push("chzn-rtl");
+      }
+      container_props = {
+        'class': container_classes.join(' '),
+        'style': "width: " + (this.container_width()) + ";",
+        'title': this.form_field.title
+      };
+      if (this.form_field.id.length) {
+        container_props.id = this.form_field.id.replace(/[^\w]/g, '_') + "_chzn";
+      }
+      this.container = $("<div />", container_props);
+      if (this.is_multiple) {
+        this.container.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="' + this.default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop"><ul class="chzn-results"></ul></div>');
+      } else {
+        this.container.html('<a class="chzn-single chzn-default"><span>' + this.default_text + '</span><div><b></b></div></a><div class="chzn-drop"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>');
+      }
+      this.form_field_jq.hide().after(this.container);
+      this.dropdown = this.container.find('div.chzn-drop').first();
+      this.search_field = this.container.find('input').first();
+      this.search_results = this.container.find('ul.chzn-results').first();
+      this.search_field_scale();
+      this.search_no_results = this.container.find('li.no-results').first();
+      if (this.is_multiple) {
+        this.search_choices = this.container.find('ul.chzn-choices').first();
+        this.search_container = this.container.find('li.search-field').first();
+      } else {
+        this.search_container = this.container.find('div.chzn-search').first();
+        this.selected_item = this.container.find('.chzn-single').first();
+      }
+      this.results_build();
+      this.set_tab_index();
+      return this.set_label_behavior();
+    };
+
+    Chosen.prototype.on_ready = function() {
+      return this.form_field_jq.trigger("liszt:ready", {
+        chosen: this
+      });
+    };
+
+    Chosen.prototype.register_observers = function() {
+      var _this = this;
+      this.container.bind('touchstart.chosen', function(evt) {
+        _this.container_mousedown(evt);
+        return evt.preventDefault();
+      });
+      this.container.bind('touchend.chosen', function(evt) {
+        _this.container_mouseup(evt);
+        return evt.preventDefault();
+      });
+      this.container.bind('mousedown.chosen', function(evt) {
+        _this.container_mousedown(evt);
+      });
+      this.container.bind('mouseup.chosen', function(evt) {
+        _this.container_mouseup(evt);
+      });
+      this.container.bind('mouseenter.chosen', function(evt) {
+        _this.mouse_enter(evt);
+      });
+      this.container.bind('mouseleave.chosen', function(evt) {
+        _this.mouse_leave(evt);
+      });
+      this.search_results.bind('mouseup.chosen', function(evt) {
+        _this.search_results_mouseup(evt);
+      });
+      this.search_results.bind('mouseover.chosen', function(evt) {
+        _this.search_results_mouseover(evt);
+      });
+      this.search_results.bind('mouseout.chosen', function(evt) {
+        _this.search_results_mouseout(evt);
+      });
+      this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen', function(evt) {
+        _this.search_results_mousewheel(evt);
+      });
+      this.search_results.bind('touchstart.chosen', function(evt) {
+        _this.search_results_touchstart(evt);
+      });
+      this.search_results.bind('touchmove.chosen', function(evt) {
+        _this.search_results_touchmove(evt);
+      });
+      this.search_results.bind('touchend.chosen', function(evt) {
+        _this.search_results_touchend(evt);
+      });
+      this.form_field_jq.bind("liszt:updated.chosen", function(evt) {
+        _this.results_update_field(evt);
+      });
+      this.form_field_jq.bind("liszt:activate.chosen", function(evt) {
+        _this.activate_field(evt);
+      });
+      this.form_field_jq.bind("liszt:open.chosen", function(evt) {
+        _this.container_mousedown(evt);
+      });
+      this.form_field_jq.bind("liszt:close.chosen", function(evt) {
+        _this.input_blur(evt);
+      });
+      this.search_field.bind('blur.chosen', function(evt) {
+        _this.input_blur(evt);
+      });
+      this.search_field.bind('keyup.chosen', function(evt) {
+        _this.keyup_checker(evt);
+      });
+      this.search_field.bind('keydown.chosen', function(evt) {
+        _this.keydown_checker(evt);
+      });
+      this.search_field.bind('focus.chosen', function(evt) {
+        _this.input_focus(evt);
+      });
+      this.search_field.bind('cut.chosen', function(evt) {
+        _this.clipboard_event_checker(evt);
+      });
+      this.search_field.bind('paste.chosen', function(evt) {
+        _this.clipboard_event_checker(evt);
+      });
+      if (this.is_multiple) {
+        return this.search_choices.bind('click.chosen', function(evt) {
+          _this.choices_click(evt);
+        });
+      } else {
+        return this.container.bind('click.chosen', function(evt) {
+          evt.preventDefault();
+        });
+      }
+    };
+
+    Chosen.prototype.destroy = function() {
+      $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action);
+      if (this.search_field[0].tabIndex) {
+        this.form_field_jq[0].tabIndex = this.search_field[0].tabIndex;
+      }
+      this.container.remove();
+      this.form_field_jq.removeData('chosen');
+      return this.form_field_jq.show();
+    };
+
+    Chosen.prototype.search_field_disabled = function() {
+      this.is_disabled = this.form_field_jq[0].disabled;
+      if (this.is_disabled) {
+        this.container.addClass('chzn-disabled');
+        this.search_field[0].disabled = true;
+        if (!this.is_multiple) {
+          this.selected_item.unbind("focus.chosen", this.activate_action);
+        }
+        return this.close_field();
+      } else {
+        this.container.removeClass('chzn-disabled');
+        this.search_field[0].disabled = false;
+        if (!this.is_multiple) {
+          return this.selected_item.bind("focus.chosen", this.activate_action);
+        }
+      }
+    };
+
+    Chosen.prototype.container_mousedown = function(evt) {
+      if (!this.is_disabled) {
+        if (evt && evt.type === "mousedown" && !this.results_showing) {
+          evt.preventDefault();
+        }
+        if (!((evt != null) && ($(evt.target)).hasClass("search-choice-close"))) {
+          if (!this.active_field) {
+            if (this.is_multiple) {
+              this.search_field.val("");
+            }
+            $(this.container[0].ownerDocument).bind('click.chosen', this.click_test_action);
+            this.results_show();
+          } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chzn-single").length)) {
+            evt.preventDefault();
+            this.results_toggle();
+          }
+          return this.activate_field();
+        }
+      }
+    };
+
+    Chosen.prototype.container_mouseup = function(evt) {
+      if (evt.target.nodeName === "ABBR" && !this.is_disabled) {
+        return this.results_reset(evt);
+      }
+    };
+
+    Chosen.prototype.search_results_mousewheel = function(evt) {
+      var delta;
+      if (evt.originalEvent) {
+        delta = evt.originalEvent.deltaY || -evt.originalEvent.wheelDelta || evt.originalEvent.detail;
+      }
+      if (delta != null) {
+        evt.preventDefault();
+        if (evt.type === 'DOMMouseScroll') {
+          delta = delta * 40;
+        }
+        return this.search_results.scrollTop(delta + this.search_results.scrollTop());
+      }
+    };
+
+    Chosen.prototype.blur_test = function(evt) {
+      if (!this.active_field && this.container.hasClass("chzn-container-active")) {
+        return this.close_field();
+      }
+    };
+
+    Chosen.prototype.close_field = function() {
+      $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action);
+      this.active_field = false;
+      this.results_hide();
+      this.container.removeClass("chzn-container-active");
+      this.clear_backstroke();
+      this.show_search_field_default();
+      return this.search_field_scale();
+    };
+
+    Chosen.prototype.activate_field = function() {
+      this.container.addClass("chzn-container-active");
+      this.active_field = true;
+      this.search_field.val(this.search_field.val());
+      return this.search_field.focus();
+    };
+
+    Chosen.prototype.test_active_click = function(evt) {
+      var active_container;
+      active_container = $(evt.target).closest('.chzn-container');
+      if (active_container.length && this.container[0] === active_container[0]) {
+        return this.active_field = true;
+      } else {
+        return this.close_field();
+      }
+    };
+
+    Chosen.prototype.results_build = function() {
+      this.parsing = true;
+      this.selected_option_count = null;
+      this.results_data = SelectParser.select_to_array(this.form_field);
+      if (this.is_multiple) {
+        this.search_choices.find("li.search-choice").remove();
+      } else if (!this.is_multiple) {
+        this.single_set_selected_text();
+        if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) {
+          this.search_field[0].readOnly = true;
+          this.container.addClass("chzn-container-single-nosearch");
+        } else {
+          this.search_field[0].readOnly = false;
+          this.container.removeClass("chzn-container-single-nosearch");
+        }
+      }
+      this.update_results_content(this.results_option_build({
+        first: true
+      }));
+      this.search_field_disabled();
+      this.show_search_field_default();
+      this.search_field_scale();
+      return this.parsing = false;
+    };
+
+    Chosen.prototype.result_do_highlight = function(el) {
+      var high_bottom, high_top, maxHeight, visible_bottom, visible_top;
+      if (el.length) {
+        this.result_clear_highlight();
+        this.result_highlight = el;
+        this.result_highlight.addClass("highlighted");
+        maxHeight = parseInt(this.search_results.css("maxHeight"), 10);
+        visible_top = this.search_results.scrollTop();
+        visible_bottom = maxHeight + visible_top;
+        high_top = this.result_highlight.position().top + this.search_results.scrollTop();
+        high_bottom = high_top + this.result_highlight.outerHeight();
+        if (high_bottom >= visible_bottom) {
+          return this.search_results.scrollTop((high_bottom - maxHeight) > 0 ? high_bottom - maxHeight : 0);
+        } else if (high_top < visible_top) {
+          return this.search_results.scrollTop(high_top);
+        }
+      }
+    };
+
+    Chosen.prototype.result_clear_highlight = function() {
+      if (this.result_highlight) {
+        this.result_highlight.removeClass("highlighted");
+      }
+      return this.result_highlight = null;
+    };
+
+    Chosen.prototype.results_show = function() {
+      if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
+        this.form_field_jq.trigger("liszt:maxselected", {
+          chosen: this
+        });
+        return false;
+      }
+      this.container.addClass("chzn-with-drop");
+      this.results_showing = true;
+      this.search_field.focus();
+      this.search_field.val(this.search_field.val());
+      this.winnow_results();
+      return this.form_field_jq.trigger("liszt:showing_dropdown", {
+        chosen: this
+      });
+    };
+
+    Chosen.prototype.update_results_content = function(content) {
+      return this.search_results.html(content);
+    };
+
+    Chosen.prototype.results_hide = function() {
+      if (this.results_showing) {
+        this.result_clear_highlight();
+        this.container.removeClass("chzn-with-drop");
+        this.form_field_jq.trigger("liszt:hiding_dropdown", {
+          chosen: this
+        });
+      }
+      return this.results_showing = false;
+    };
+
+    Chosen.prototype.set_tab_index = function(el) {
+      var ti;
+      if (this.form_field.tabIndex) {
+        ti = this.form_field.tabIndex;
+        this.form_field.tabIndex = -1;
+        return this.search_field[0].tabIndex = ti;
+      }
+    };
+
+    Chosen.prototype.set_label_behavior = function() {
+      var _this = this;
+      this.form_field_label = this.form_field_jq.parents("label");
+      if (!this.form_field_label.length && this.form_field.id.length) {
+        this.form_field_label = $("label[for='" + this.form_field.id + "']");
+      }
+      if (this.form_field_label.length > 0) {
+        return this.form_field_label.bind('click.chosen', function(evt) {
+          if (_this.is_multiple) {
+            return _this.container_mousedown(evt);
+          } else {
+            return _this.activate_field();
+          }
+        });
+      }
+    };
+
+    Chosen.prototype.show_search_field_default = function() {
+      if (this.is_multiple && this.choices_count() < 1 && !this.active_field) {
+        this.search_field.val(this.default_text);
+        return this.search_field.addClass("default");
+      } else {
+        this.search_field.val("");
+        return this.search_field.removeClass("default");
+      }
+    };
+
+    Chosen.prototype.search_results_mouseup = function(evt) {
+      var target;
+      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
+      if (target.length) {
+        this.result_highlight = target;
+        this.result_select(evt);
+        return this.search_field.focus();
+      }
+    };
+
+    Chosen.prototype.search_results_mouseover = function(evt) {
+      var target;
+      target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
+      if (target) {
+        return this.result_do_highlight(target);
+      }
+    };
+
+    Chosen.prototype.search_results_mouseout = function(evt) {
+      if ($(evt.target).hasClass("active-result" || $(evt.target).parents('.active-result').first())) {
+        return this.result_clear_highlight();
+      }
+    };
+
+    Chosen.prototype.choice_build = function(item) {
+      var choice, close_link,
+        _this = this;
+      choice = $('<li />', {
+        "class": "search-choice"
+      }).html("<span>" + (this.choice_label(item)) + "</span>");
+      if (item.disabled) {
+        choice.addClass('search-choice-disabled');
+      } else {
+        close_link = $('<a />', {
+          "class": 'search-choice-close',
+          'data-option-array-index': item.array_index
+        });
+        close_link.bind('click.chosen', function(evt) {
+          return _this.choice_destroy_link_click(evt);
+        });
+        choice.append(close_link);
+      }
+      return this.search_container.before(choice);
+    };
+
+    Chosen.prototype.choice_destroy_link_click = function(evt) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      if (!this.is_disabled) {
+        return this.choice_destroy($(evt.target));
+      }
+    };
+
+    Chosen.prototype.choice_destroy = function(link) {
+      if (this.result_deselect(link[0].getAttribute("data-option-array-index"))) {
+        this.show_search_field_default();
+        if (this.is_multiple && this.choices_count() > 0 && this.search_field.val().length < 1) {
+          this.results_hide();
+        }
+        link.parents('li').first().remove();
+        return this.search_field_scale();
+      }
+    };
+
+    Chosen.prototype.results_reset = function() {
+      this.reset_single_select_options();
+      this.form_field.options[0].selected = true;
+      this.single_set_selected_text();
+      this.show_search_field_default();
+      this.results_reset_cleanup();
+      this.form_field_jq.trigger("change");
+      if (this.active_field) {
+        return this.results_hide();
+      }
+    };
+
+    Chosen.prototype.results_reset_cleanup = function() {
+      this.current_selectedIndex = this.form_field.selectedIndex;
+      return this.selected_item.find("abbr").remove();
+    };
+
+    Chosen.prototype.result_select = function(evt) {
+      /*<JUI>*/
+      /* Original:
+      var high, item, selected_index;
+      */
+      var group, high, high_id, item, option, position, value;
+      /*</JUI>*/
+
+      if (this.result_highlight) {
+        high = this.result_highlight;
+        this.result_clear_highlight();
+        if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
+          this.form_field_jq.trigger("liszt:maxselected", {
+            chosen: this
+          });
+          return false;
+        }
+        if (this.is_multiple) {
+          high.removeClass("active-result");
+        } else {
+          this.reset_single_select_options();
+        }
+        high.addClass("result-selected");
+        item = this.results_data[high[0].getAttribute("data-option-array-index")];
+        item.selected = true;
+        this.form_field.options[item.options_index].selected = true;
+        this.selected_option_count = null;
+        if (this.is_multiple) {
+          this.choice_build(item);
+        } else {
+          this.single_set_selected_text(this.choice_label(item));
+        }
+        if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) {
+          this.results_hide();
+        }
+        this.show_search_field_default();
+        if (this.is_multiple || this.form_field.selectedIndex !== this.current_selectedIndex) {
+          this.form_field_jq.trigger("change", {
+            'selected': this.form_field.options[item.options_index].value
+          });
+        }
+        this.current_selectedIndex = this.form_field.selectedIndex;
+        evt.preventDefault();
+        return this.search_field_scale();
+      }
+      /*<JUI>*/
+      /* Original: not exist */
+      else if ((!this.is_multiple) && this.allow_custom_value) {
+          value = this.search_field.val();
+          group = this.add_unique_custom_group();
+          option = $('<option value="' + value + '">' + value + '</option>');
+          group.append(option);
+          this.form_field_jq.append(group);
+          this.form_field.options[this.form_field.options.length - 1].selected = true;
+          if (!evt.metaKey) {
+            this.results_hide();
+          }
+          return this.results_build();
+      }
+      /*</JUI>*/
+    };
+
+    /*<JUI>*/
+    /* Original: not exist */
+    Chosen.prototype.find_custom_group = function() {
+        var found, group, _i, _len, _ref;
+        _ref = $('optgroup', this.form_field);
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          group = _ref[_i];
+          if (group.getAttribute('label') === this.custom_group_text) {
+            found = group;
+          }
+        }
+        return found;
+    };
+
+    Chosen.prototype.add_unique_custom_group = function() {
+        var group;
+        group = this.find_custom_group();
+        if (!group) {
+          group = $('<optgroup label="' + this.custom_group_text + '"></optgroup>');
+        }
+        return $(group);
+    };
+    /*</JUI>*/
+
+    Chosen.prototype.single_set_selected_text = function(text) {
+      if (text == null) {
+        text = this.default_text;
+      }
+      if (text === this.default_text) {
+        this.selected_item.addClass("chzn-default");
+      } else {
+        this.single_deselect_control_build();
+        this.selected_item.removeClass("chzn-default");
+      }
+      return this.selected_item.find("span").html(text);
+    };
+
+    Chosen.prototype.result_deselect = function(pos) {
+      var result_data;
+      result_data = this.results_data[pos];
+      if (!this.form_field.options[result_data.options_index].disabled) {
+        result_data.selected = false;
+        this.form_field.options[result_data.options_index].selected = false;
+        this.selected_option_count = null;
+        this.result_clear_highlight();
+        if (this.results_showing) {
+          this.winnow_results();
+        }
+        this.form_field_jq.trigger("change", {
+          deselected: this.form_field.options[result_data.options_index].value
+        });
+        this.search_field_scale();
+        return true;
+      } else {
+        return false;
+      }
+    };
+
+    Chosen.prototype.single_deselect_control_build = function() {
+      if (!this.allow_single_deselect) {
+        return;
+      }
+      if (!this.selected_item.find("abbr").length) {
+        this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+      }
+      return this.selected_item.addClass("chzn-single-with-deselect");
+    };
+
+    Chosen.prototype.get_search_text = function() {
+      return $('<div/>').text($.trim(this.search_field.val())).html();
+    };
+
+    Chosen.prototype.winnow_results_set_highlight = function() {
+      var do_high, selected_results;
+      selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
+      do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
+      if (do_high != null) {
+        return this.result_do_highlight(do_high);
+      }
+    };
+
+    Chosen.prototype.no_results = function(terms) {
+      var no_results_html;
+      no_results_html = $('<li class="no-results">' + this.results_none_found + ' "<span></span>"</li>');
+      no_results_html.find("span").first().html(terms);
+      this.search_results.append(no_results_html);
+      return this.form_field_jq.trigger("liszt:no_results", {
+        chosen: this
+      });
+    };
+
+    Chosen.prototype.no_results_clear = function() {
+      return this.search_results.find(".no-results").remove();
+    };
+
+    Chosen.prototype.keydown_arrow = function() {
+      var next_sib;
+      if (this.results_showing && this.result_highlight) {
+        next_sib = this.result_highlight.nextAll("li.active-result").first();
+        if (next_sib) {
+          return this.result_do_highlight(next_sib);
+        }
+      } else {
+        return this.results_show();
+      }
+    };
+
+    Chosen.prototype.keyup_arrow = function() {
+      var prev_sibs;
+      if (!this.results_showing && !this.is_multiple) {
+        return this.results_show();
+      } else if (this.result_highlight) {
+        prev_sibs = this.result_highlight.prevAll("li.active-result");
+        if (prev_sibs.length) {
+          return this.result_do_highlight(prev_sibs.first());
+        } else {
+          if (this.choices_count() > 0) {
+            this.results_hide();
+          }
+          return this.result_clear_highlight();
+        }
+      }
+    };
+
+    Chosen.prototype.keydown_backstroke = function() {
+      var next_available_destroy;
+      if (this.pending_backstroke) {
+        this.choice_destroy(this.pending_backstroke.find("a").first());
+        return this.clear_backstroke();
+      } else {
+        next_available_destroy = this.search_container.siblings("li.search-choice").last();
+        if (next_available_destroy.length && !next_available_destroy.hasClass("search-choice-disabled")) {
+          this.pending_backstroke = next_available_destroy;
+          if (this.single_backstroke_delete) {
+            return this.keydown_backstroke();
+          } else {
+            return this.pending_backstroke.addClass("search-choice-focus");
+          }
+        }
+      }
+    };
+
+    Chosen.prototype.clear_backstroke = function() {
+      if (this.pending_backstroke) {
+        this.pending_backstroke.removeClass("search-choice-focus");
+      }
+      return this.pending_backstroke = null;
+    };
+
+    Chosen.prototype.keydown_checker = function(evt) {
+      var stroke, _ref1;
+      stroke = (_ref1 = evt.which) != null ? _ref1 : evt.keyCode;
+      this.search_field_scale();
+      if (stroke !== 8 && this.pending_backstroke) {
+        this.clear_backstroke();
+      }
+      switch (stroke) {
+        case 8:
+          this.backstroke_length = this.search_field.val().length;
+          break;
+        case 9:
+          if (this.results_showing && !this.is_multiple) {
+            this.result_select(evt);
+          }
+          this.mouse_on_container = false;
+          break;
+        case 13:
+          if (this.results_showing) {
+            evt.preventDefault();
+          }
+          break;
+        case 32:
+          if (this.disable_search) {
+            evt.preventDefault();
+          }
+          break;
+        case 38:
+          evt.preventDefault();
+          this.keyup_arrow();
+          break;
+        case 40:
+          evt.preventDefault();
+          this.keydown_arrow();
+          break;
+      }
+    };
+
+    Chosen.prototype.search_field_scale = function() {
+      var div, f_width, h, style, style_block, styles, w, _i, _len;
+      if (this.is_multiple) {
+        h = 0;
+        w = 0;
+        style_block = "position:absolute; left: -1000px; top: -1000px; display:none;";
+        styles = ['font-size', 'font-style', 'font-weight', 'font-family', 'line-height', 'text-transform', 'letter-spacing'];
+        for (_i = 0, _len = styles.length; _i < _len; _i++) {
+          style = styles[_i];
+          style_block += style + ":" + this.search_field.css(style) + ";";
+        }
+        div = $('<div />', {
+          'style': style_block
+        });
+        div.text(this.search_field.val());
+        $('body').append(div);
+        w = div.width() + 25;
+        div.remove();
+        f_width = this.container.outerWidth();
+        if (w > f_width - 10) {
+          w = f_width - 10;
+        }
+        return this.search_field.css({
+          'width': w + 'px'
+        });
+      }
+    };
+
+    return Chosen;
+
+  })(AbstractChosen);
+
+}).call(this);
diff --git a/core/media/jui/js/chosen.jquery.min.js b/core/media/jui/js/chosen.jquery.min.js
new file mode 100644
index 00000000..e607076b
--- /dev/null
+++ b/core/media/jui/js/chosen.jquery.min.js
@@ -0,0 +1,2 @@
+(function(){var $,AbstractChosen,Chosen,SelectParser,_ref,__hasProp={}.hasOwnProperty,__extends=function(child,parent){for(var key in parent){if(__hasProp.call(parent,key))child[key]=parent[key]}function ctor(){this.constructor=child}ctor.prototype=parent.prototype;child.prototype=new ctor;child.__super__=parent.prototype;return child};SelectParser=function(){function SelectParser(){this.options_index=0;this.parsed=[]}SelectParser.prototype.add_node=function(child){if(child.nodeName.toUpperCase()==="OPTGROUP"){return this.add_group(child)}else{return this.add_option(child)}};SelectParser.prototype.add_group=function(group){var group_position,option,_i,_len,_ref,_results;group_position=this.parsed.length;this.parsed.push({array_index:group_position,group:true,label:this.escapeExpression(group.label),title:group.title?group.title:void 0,children:0,disabled:group.disabled,classes:group.className});_ref=group.childNodes;_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];_results.push(this.add_option(option,group_position,group.disabled))}return _results};SelectParser.prototype.add_option=function(option,group_position,group_disabled){if(option.nodeName.toUpperCase()==="OPTION"){if(option.text!==""){if(group_position!=null){this.parsed[group_position].children+=1}this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,value:option.value,text:option.text,html:option.innerHTML,title:option.title?option.title:void 0,selected:option.selected,disabled:group_disabled===true?group_disabled:option.disabled,group_array_index:group_position,group_label:group_position!=null?this.parsed[group_position].label:null,classes:option.className,style:option.style.cssText})}else{this.parsed.push({array_index:this.parsed.length,options_index:this.options_index,empty:true})}return this.options_index+=1}};SelectParser.prototype.escapeExpression=function(text){var map,unsafe_chars;if(text==null||text===false){return""}if(!/[\&\<\>\"\'\`]/.test(text)){return text}map={"<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"};unsafe_chars=/&(?!\w+;)|[\<\>\"\'\`]/g;return text.replace(unsafe_chars,function(chr){return map[chr]||"&amp;"})};return SelectParser}();SelectParser.select_to_array=function(select){var child,parser,_i,_len,_ref;parser=new SelectParser;_ref=select.childNodes;for(_i=0,_len=_ref.length;_i<_len;_i++){child=_ref[_i];parser.add_node(child)}return parser.parsed};AbstractChosen=function(){function AbstractChosen(form_field,options){this.form_field=form_field;this.options=options!=null?options:{};if(!AbstractChosen.browser_is_supported()){return}this.is_multiple=this.form_field.multiple;this.set_default_text();this.set_default_values();this.setup();this.set_up_html();this.register_observers();this.on_ready()}AbstractChosen.prototype.set_default_values=function(){var _this=this;this.click_test_action=function(evt){return _this.test_active_click(evt)};this.activate_action=function(evt){return _this.activate_field(evt)};this.active_field=false;this.mouse_on_container=false;this.results_showing=false;this.result_highlighted=null;this.allow_custom_value=false;this.allow_single_deselect=this.options.allow_single_deselect!=null&&this.form_field.options[0]!=null&&this.form_field.options[0].text===""?this.options.allow_single_deselect:false;this.disable_search_threshold=this.options.disable_search_threshold||0;this.disable_search=this.options.disable_search||false;this.enable_split_word_search=this.options.enable_split_word_search!=null?this.options.enable_split_word_search:true;this.group_search=this.options.group_search!=null?this.options.group_search:true;this.search_contains=this.options.search_contains||false;this.single_backstroke_delete=this.options.single_backstroke_delete!=null?this.options.single_backstroke_delete:true;this.max_selected_options=this.options.max_selected_options||Infinity;this.inherit_select_classes=this.options.inherit_select_classes||false;this.display_selected_options=this.options.display_selected_options!=null?this.options.display_selected_options:true;this.display_disabled_options=this.options.display_disabled_options!=null?this.options.display_disabled_options:true;this.include_group_label_in_selected=this.options.include_group_label_in_selected||false;this.max_shown_results=this.options.max_shown_results||Number.POSITIVE_INFINITY;return this.case_sensitive_search=this.options.case_sensitive_search||false};AbstractChosen.prototype.set_default_text=function(){if(this.form_field.getAttribute("data-placeholder")){this.default_text=this.form_field.getAttribute("data-placeholder")}else if(this.is_multiple){this.default_text=this.options.placeholder_text_multiple||this.options.placeholder_text||AbstractChosen.default_multiple_text}else{this.default_text=this.options.placeholder_text_single||this.options.placeholder_text||AbstractChosen.default_single_text}this.custom_group_text=this.form_field.getAttribute("data-custom_group_text")||this.options.custom_group_text||"Custom Value";return this.results_none_found=this.form_field.getAttribute("data-no_results_text")||this.options.no_results_text||AbstractChosen.default_no_result_text};AbstractChosen.prototype.choice_label=function(item){if(this.include_group_label_in_selected&&item.group_label!=null){return"<b class='group-name'>"+item.group_label+"</b>"+item.html}else{return item.html}};AbstractChosen.prototype.mouse_enter=function(){return this.mouse_on_container=true};AbstractChosen.prototype.mouse_leave=function(){return this.mouse_on_container=false};AbstractChosen.prototype.input_focus=function(evt){var _this=this;if(this.is_multiple){if(!this.active_field){return setTimeout(function(){return _this.container_mousedown()},50)}}else{if(!this.active_field){return this.activate_field()}}};AbstractChosen.prototype.input_blur=function(evt){var _this=this;if(!this.mouse_on_container){this.active_field=false;return setTimeout(function(){return _this.blur_test()},100)}};AbstractChosen.prototype.results_option_build=function(options){var content,data,data_content,shown_results,_i,_len,_ref;content="";shown_results=0;_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){data=_ref[_i];data_content="";if(data.group){data_content=this.result_add_group(data)}else{data_content=this.result_add_option(data)}if(data_content!==""){shown_results++;content+=data_content}if(options!=null?options.first:void 0){if(data.selected&&this.is_multiple){this.choice_build(data)}else if(data.selected&&!this.is_multiple){this.single_set_selected_text(this.choice_label(data))}}if(shown_results>=this.max_shown_results){break}}return content};AbstractChosen.prototype.result_add_option=function(option){var classes,option_el;if(!option.search_match){return""}if(!this.include_option_in_results(option)){return""}classes=[];if(!option.disabled&&!(option.selected&&this.is_multiple)){classes.push("active-result")}if(option.disabled&&!(option.selected&&this.is_multiple)){classes.push("disabled-result")}if(option.selected){classes.push("result-selected")}if(option.group_array_index!=null){classes.push("group-option")}if(option.classes!==""){classes.push(option.classes)}option_el=document.createElement("li");option_el.className=classes.join(" ");option_el.style.cssText=option.style;option_el.setAttribute("data-option-array-index",option.array_index);option_el.innerHTML=option.search_text;if(option.title){option_el.title=option.title}return this.outerHTML(option_el)};AbstractChosen.prototype.result_add_group=function(group){var classes,group_el;if(!(group.search_match||group.group_match)){return""}if(!(group.active_options>0)){return""}classes=[];classes.push("group-result");if(group.classes){classes.push(group.classes)}group_el=document.createElement("li");group_el.className=classes.join(" ");group_el.innerHTML=group.search_text;if(group.title){group_el.title=group.title}return this.outerHTML(group_el)};AbstractChosen.prototype.results_update_field=function(){this.set_default_text();if(!this.is_multiple){this.results_reset_cleanup()}this.result_clear_highlight();this.results_build();if(this.results_showing){return this.winnow_results()}};AbstractChosen.prototype.reset_single_select_options=function(){var result,_i,_len,_ref,_results;_ref=this.results_data;_results=[];for(_i=0,_len=_ref.length;_i<_len;_i++){result=_ref[_i];if(result.selected){_results.push(result.selected=false)}else{_results.push(void 0)}}return _results};AbstractChosen.prototype.results_toggle=function(){if(this.results_showing){return this.results_hide()}else{return this.results_show()}};AbstractChosen.prototype.results_search=function(evt){if(this.results_showing){return this.winnow_results()}else{return this.results_show()}};AbstractChosen.prototype.winnow_results=function(){var escapedSearchText,option,regex,results,results_group,searchText,startpos,text,zregex,_i,_len,_ref;this.no_results_clear();results=0;searchText=this.get_search_text();escapedSearchText=searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&");zregex=new RegExp(escapedSearchText,"i");regex=this.get_search_regex(escapedSearchText);_ref=this.results_data;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];option.search_match=false;results_group=null;if(this.include_option_in_results(option)){if(option.group){option.group_match=false;option.active_options=0}if(option.group_array_index!=null&&this.results_data[option.group_array_index]){results_group=this.results_data[option.group_array_index];if(results_group.active_options===0&&results_group.search_match){results+=1}results_group.active_options+=1}option.search_text=option.group?option.label:option.html;if(!(option.group&&!this.group_search)){option.search_match=this.search_string_match(option.search_text,regex);if(option.search_match&&!option.group){results+=1}if(option.search_match){if(searchText.length){startpos=option.search_text.search(zregex);text=option.search_text.substr(0,startpos+searchText.length)+"</em>"+option.search_text.substr(startpos+searchText.length);option.search_text=text.substr(0,startpos)+"<em>"+text.substr(startpos)}if(results_group!=null){results_group.group_match=true}}else if(option.group_array_index!=null&&this.results_data[option.group_array_index].search_match){option.search_match=true}}}}this.result_clear_highlight();if(results<1&&searchText.length){this.update_results_content("");return this.no_results(searchText)}else{this.update_results_content(this.results_option_build());return this.winnow_results_set_highlight()}};AbstractChosen.prototype.get_search_regex=function(escaped_search_string){var regex_anchor,regex_flag;regex_anchor=this.search_contains?"":"^";regex_flag=this.case_sensitive_search?"":"i";return new RegExp(regex_anchor+escaped_search_string,regex_flag)};AbstractChosen.prototype.search_string_match=function(search_string,regex){var part,parts,_i,_len;if(regex.test(search_string)){return true}else if(this.enable_split_word_search&&(search_string.indexOf(" ")>=0||search_string.indexOf("[")===0)){parts=search_string.replace(/\[|\]/g,"").split(" ");if(parts.length){for(_i=0,_len=parts.length;_i<_len;_i++){part=parts[_i];if(regex.test(part)){return true}}}}};AbstractChosen.prototype.choices_count=function(){var option,_i,_len,_ref;if(this.selected_option_count!=null){return this.selected_option_count}this.selected_option_count=0;_ref=this.form_field.options;for(_i=0,_len=_ref.length;_i<_len;_i++){option=_ref[_i];if(option.selected){this.selected_option_count+=1}}return this.selected_option_count};AbstractChosen.prototype.choices_click=function(evt){evt.preventDefault();if(!(this.results_showing||this.is_disabled)){return this.results_show()}};AbstractChosen.prototype.keyup_checker=function(evt){var stroke,_ref;stroke=(_ref=evt.which)!=null?_ref:evt.keyCode;this.search_field_scale();switch(stroke){case 8:if(this.is_multiple&&this.backstroke_length<1&&this.choices_count()>0){return this.keydown_backstroke()}else if(!this.pending_backstroke){this.result_clear_highlight();return this.results_search()}break;case 13:evt.preventDefault();if(this.results_showing){return this.result_select(evt)}break;case 27:if(this.results_showing){this.results_hide()}return true;case 9:case 38:case 40:case 16:case 91:case 17:case 18:break;default:return this.results_search()}};AbstractChosen.prototype.clipboard_event_checker=function(evt){var _this=this;return setTimeout(function(){return _this.results_search()},50)};AbstractChosen.prototype.container_width=function(){if(this.options.width!=null){return this.options.width}else{return this.form_field_jq.css("width")||""+this.form_field.offsetWidth+"px"}};AbstractChosen.prototype.include_option_in_results=function(option){if(this.is_multiple&&(!this.display_selected_options&&option.selected)){return false}if(!this.display_disabled_options&&option.disabled){return false}if(option.empty){return false}return true};AbstractChosen.prototype.search_results_touchstart=function(evt){this.touch_started=true;return this.search_results_mouseover(evt)};AbstractChosen.prototype.search_results_touchmove=function(evt){this.touch_started=false;return this.search_results_mouseout(evt)};AbstractChosen.prototype.search_results_touchend=function(evt){if(this.touch_started){return this.search_results_mouseup(evt)}};AbstractChosen.prototype.outerHTML=function(element){var tmp;if(element.outerHTML){return element.outerHTML}tmp=document.createElement("div");tmp.appendChild(element);return tmp.innerHTML};AbstractChosen.browser_is_supported=function(){if("Microsoft Internet Explorer"===window.navigator.appName){return document.documentMode>=8}if(/iP(od|hone)/i.test(window.navigator.userAgent)||/IEMobile/i.test(window.navigator.userAgent)||/Windows Phone/i.test(window.navigator.userAgent)||/BlackBerry/i.test(window.navigator.userAgent)||/BB10/i.test(window.navigator.userAgent)||/Android.*Mobile/i.test(window.navigator.userAgent)){return false}return true};AbstractChosen.default_multiple_text="Select Some Options";AbstractChosen.default_single_text="Select an Option";AbstractChosen.default_no_result_text="No results match";return AbstractChosen}();$=jQuery;$.fn.extend({chosen:function(options){if(!AbstractChosen.browser_is_supported()){return this}return this.each(function(input_field){var $this,chosen;$this=$(this);chosen=$this.data("chosen");if(options==="destroy"){if(chosen instanceof Chosen){chosen.destroy()}return}if(!chosen){$this.data("chosen",new Chosen(this,options))}})}});Chosen=function(_super){__extends(Chosen,_super);function Chosen(){_ref=Chosen.__super__.constructor.apply(this,arguments);return _ref}Chosen.prototype.setup=function(){this.form_field_jq=$(this.form_field);this.current_selectedIndex=this.form_field.selectedIndex;this.allow_custom_value=this.form_field_jq.hasClass("chzn-custom-value")||this.options.allow_custom_value;return this.is_rtl=this.form_field_jq.hasClass("chzn-rtl")};Chosen.prototype.set_up_html=function(){var container_classes,container_props;container_classes=["chzn-container"];container_classes.push("chzn-container-"+(this.is_multiple?"multi":"single"));if(this.inherit_select_classes&&this.form_field.className){container_classes.push(this.form_field.className)}if(this.is_rtl){container_classes.push("chzn-rtl")}container_props={"class":container_classes.join(" "),style:"width: "+this.container_width()+";",title:this.form_field.title};if(this.form_field.id.length){container_props.id=this.form_field.id.replace(/[^\w]/g,"_")+"_chzn"}this.container=$("<div />",container_props);if(this.is_multiple){this.container.html('<ul class="chzn-choices"><li class="search-field"><input type="text" value="'+this.default_text+'" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chzn-drop"><ul class="chzn-results"></ul></div>')}else{this.container.html('<a class="chzn-single chzn-default"><span>'+this.default_text+'</span><div><b></b></div></a><div class="chzn-drop"><div class="chzn-search"><input type="text" autocomplete="off" /></div><ul class="chzn-results"></ul></div>')}this.form_field_jq.hide().after(this.container);this.dropdown=this.container.find("div.chzn-drop").first();this.search_field=this.container.find("input").first();this.search_results=this.container.find("ul.chzn-results").first();this.search_field_scale();this.search_no_results=this.container.find("li.no-results").first();if(this.is_multiple){this.search_choices=this.container.find("ul.chzn-choices").first();this.search_container=this.container.find("li.search-field").first()}else{this.search_container=this.container.find("div.chzn-search").first();this.selected_item=this.container.find(".chzn-single").first()}this.results_build();this.set_tab_index();return this.set_label_behavior()};Chosen.prototype.on_ready=function(){return this.form_field_jq.trigger("liszt:ready",{chosen:this})};Chosen.prototype.register_observers=function(){var _this=this;this.container.bind("touchstart.chosen",function(evt){_this.container_mousedown(evt);return evt.preventDefault()});this.container.bind("touchend.chosen",function(evt){_this.container_mouseup(evt);return evt.preventDefault()});this.container.bind("mousedown.chosen",function(evt){_this.container_mousedown(evt)});this.container.bind("mouseup.chosen",function(evt){_this.container_mouseup(evt)});this.container.bind("mouseenter.chosen",function(evt){_this.mouse_enter(evt)});this.container.bind("mouseleave.chosen",function(evt){_this.mouse_leave(evt)});this.search_results.bind("mouseup.chosen",function(evt){_this.search_results_mouseup(evt)});this.search_results.bind("mouseover.chosen",function(evt){_this.search_results_mouseover(evt)});this.search_results.bind("mouseout.chosen",function(evt){_this.search_results_mouseout(evt)});this.search_results.bind("mousewheel.chosen DOMMouseScroll.chosen",function(evt){_this.search_results_mousewheel(evt)});this.search_results.bind("touchstart.chosen",function(evt){_this.search_results_touchstart(evt)});this.search_results.bind("touchmove.chosen",function(evt){_this.search_results_touchmove(evt)});this.search_results.bind("touchend.chosen",function(evt){_this.search_results_touchend(evt)});this.form_field_jq.bind("liszt:updated.chosen",function(evt){_this.results_update_field(evt)});this.form_field_jq.bind("liszt:activate.chosen",function(evt){_this.activate_field(evt)});this.form_field_jq.bind("liszt:open.chosen",function(evt){_this.container_mousedown(evt)});this.form_field_jq.bind("liszt:close.chosen",function(evt){_this.input_blur(evt)});this.search_field.bind("blur.chosen",function(evt){_this.input_blur(evt)});this.search_field.bind("keyup.chosen",function(evt){_this.keyup_checker(evt)});this.search_field.bind("keydown.chosen",function(evt){_this.keydown_checker(evt)});this.search_field.bind("focus.chosen",function(evt){_this.input_focus(evt)});this.search_field.bind("cut.chosen",function(evt){_this.clipboard_event_checker(evt)});this.search_field.bind("paste.chosen",function(evt){_this.clipboard_event_checker(evt)});if(this.is_multiple){return this.search_choices.bind("click.chosen",function(evt){_this.choices_click(evt)})}else{return this.container.bind("click.chosen",function(evt){evt.preventDefault()})}};Chosen.prototype.destroy=function(){$(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action);if(this.search_field[0].tabIndex){this.form_field_jq[0].tabIndex=this.search_field[0].tabIndex}this.container.remove();this.form_field_jq.removeData("chosen");return this.form_field_jq.show()};Chosen.prototype.search_field_disabled=function(){this.is_disabled=this.form_field_jq[0].disabled;if(this.is_disabled){this.container.addClass("chzn-disabled");this.search_field[0].disabled=true;if(!this.is_multiple){this.selected_item.unbind("focus.chosen",this.activate_action)}return this.close_field()}else{this.container.removeClass("chzn-disabled");this.search_field[0].disabled=false;if(!this.is_multiple){return this.selected_item.bind("focus.chosen",this.activate_action)}}};Chosen.prototype.container_mousedown=function(evt){if(!this.is_disabled){if(evt&&evt.type==="mousedown"&&!this.results_showing){evt.preventDefault()}if(!(evt!=null&&$(evt.target).hasClass("search-choice-close"))){if(!this.active_field){if(this.is_multiple){this.search_field.val("")}$(this.container[0].ownerDocument).bind("click.chosen",this.click_test_action);this.results_show()}else if(!this.is_multiple&&evt&&($(evt.target)[0]===this.selected_item[0]||$(evt.target).parents("a.chzn-single").length)){evt.preventDefault();this.results_toggle()}return this.activate_field()}}};Chosen.prototype.container_mouseup=function(evt){if(evt.target.nodeName==="ABBR"&&!this.is_disabled){return this.results_reset(evt)}};Chosen.prototype.search_results_mousewheel=function(evt){var delta;if(evt.originalEvent){delta=evt.originalEvent.deltaY||-evt.originalEvent.wheelDelta||evt.originalEvent.detail}if(delta!=null){evt.preventDefault();if(evt.type==="DOMMouseScroll"){delta=delta*40}return this.search_results.scrollTop(delta+this.search_results.scrollTop())}};Chosen.prototype.blur_test=function(evt){if(!this.active_field&&this.container.hasClass("chzn-container-active")){return this.close_field()}};Chosen.prototype.close_field=function(){$(this.container[0].ownerDocument).unbind("click.chosen",this.click_test_action);this.active_field=false;this.results_hide();this.container.removeClass("chzn-container-active");this.clear_backstroke();this.show_search_field_default();return this.search_field_scale()};Chosen.prototype.activate_field=function(){this.container.addClass("chzn-container-active");this.active_field=true;this.search_field.val(this.search_field.val());return this.search_field.focus()};Chosen.prototype.test_active_click=function(evt){var active_container;active_container=$(evt.target).closest(".chzn-container");if(active_container.length&&this.container[0]===active_container[0]){return this.active_field=true}else{return this.close_field()}};Chosen.prototype.results_build=function(){this.parsing=true;this.selected_option_count=null;this.results_data=SelectParser.select_to_array(this.form_field);if(this.is_multiple){this.search_choices.find("li.search-choice").remove()}else if(!this.is_multiple){this.single_set_selected_text();if(this.disable_search||this.form_field.options.length<=this.disable_search_threshold){this.search_field[0].readOnly=true;this.container.addClass("chzn-container-single-nosearch")}else{this.search_field[0].readOnly=false;this.container.removeClass("chzn-container-single-nosearch")}}this.update_results_content(this.results_option_build({first:true}));this.search_field_disabled();this.show_search_field_default();this.search_field_scale();return this.parsing=false};Chosen.prototype.result_do_highlight=function(el){var high_bottom,high_top,maxHeight,visible_bottom,visible_top;if(el.length){this.result_clear_highlight();this.result_highlight=el;this.result_highlight.addClass("highlighted");maxHeight=parseInt(this.search_results.css("maxHeight"),10);visible_top=this.search_results.scrollTop();visible_bottom=maxHeight+visible_top;high_top=this.result_highlight.position().top+this.search_results.scrollTop();high_bottom=high_top+this.result_highlight.outerHeight();if(high_bottom>=visible_bottom){return this.search_results.scrollTop(high_bottom-maxHeight>0?high_bottom-maxHeight:0)}else if(high_top<visible_top){return this.search_results.scrollTop(high_top)}}};Chosen.prototype.result_clear_highlight=function(){if(this.result_highlight){this.result_highlight.removeClass("highlighted")}return this.result_highlight=null};Chosen.prototype.results_show=function(){if(this.is_multiple&&this.max_selected_options<=this.choices_count()){this.form_field_jq.trigger("liszt:maxselected",{chosen:this});return false}this.container.addClass("chzn-with-drop");this.results_showing=true;this.search_field.focus();this.search_field.val(this.search_field.val());this.winnow_results();return this.form_field_jq.trigger("liszt:showing_dropdown",{chosen:this})};Chosen.prototype.update_results_content=function(content){return this.search_results.html(content)};Chosen.prototype.results_hide=function(){if(this.results_showing){this.result_clear_highlight();this.container.removeClass("chzn-with-drop");this.form_field_jq.trigger("liszt:hiding_dropdown",{chosen:this})}return this.results_showing=false};Chosen.prototype.set_tab_index=function(el){var ti;if(this.form_field.tabIndex){ti=this.form_field.tabIndex;this.form_field.tabIndex=-1;return this.search_field[0].tabIndex=ti}};Chosen.prototype.set_label_behavior=function(){var _this=this;this.form_field_label=this.form_field_jq.parents("label");if(!this.form_field_label.length&&this.form_field.id.length){this.form_field_label=$("label[for='"+this.form_field.id+"']")}if(this.form_field_label.length>0){return this.form_field_label.bind("click.chosen",function(evt){if(_this.is_multiple){return _this.container_mousedown(evt)}else{return _this.activate_field()}})}};Chosen.prototype.show_search_field_default=function(){if(this.is_multiple&&this.choices_count()<1&&!this.active_field){this.search_field.val(this.default_text);return this.search_field.addClass("default")}else{this.search_field.val("");return this.search_field.removeClass("default")}};Chosen.prototype.search_results_mouseup=function(evt){var target;target=$(evt.target).hasClass("active-result")?$(evt.target):$(evt.target).parents(".active-result").first();if(target.length){this.result_highlight=target;this.result_select(evt);return this.search_field.focus()}};Chosen.prototype.search_results_mouseover=function(evt){var target;target=$(evt.target).hasClass("active-result")?$(evt.target):$(evt.target).parents(".active-result").first();if(target){return this.result_do_highlight(target)}};Chosen.prototype.search_results_mouseout=function(evt){if($(evt.target).hasClass("active-result"||$(evt.target).parents(".active-result").first())){return this.result_clear_highlight()}};Chosen.prototype.choice_build=function(item){var choice,close_link,_this=this;choice=$("<li />",{"class":"search-choice"}).html("<span>"+this.choice_label(item)+"</span>");if(item.disabled){choice.addClass("search-choice-disabled")}else{close_link=$("<a />",{"class":"search-choice-close","data-option-array-index":item.array_index});close_link.bind("click.chosen",function(evt){return _this.choice_destroy_link_click(evt)});choice.append(close_link)}return this.search_container.before(choice)};Chosen.prototype.choice_destroy_link_click=function(evt){evt.preventDefault();evt.stopPropagation();if(!this.is_disabled){return this.choice_destroy($(evt.target))}};Chosen.prototype.choice_destroy=function(link){if(this.result_deselect(link[0].getAttribute("data-option-array-index"))){this.show_search_field_default();if(this.is_multiple&&this.choices_count()>0&&this.search_field.val().length<1){this.results_hide()}link.parents("li").first().remove();return this.search_field_scale()}};Chosen.prototype.results_reset=function(){this.reset_single_select_options();this.form_field.options[0].selected=true;this.single_set_selected_text();this.show_search_field_default();this.results_reset_cleanup();this.form_field_jq.trigger("change");if(this.active_field){return this.results_hide()}};Chosen.prototype.results_reset_cleanup=function(){this.current_selectedIndex=this.form_field.selectedIndex;return this.selected_item.find("abbr").remove()};Chosen.prototype.result_select=function(evt){var group,high,high_id,item,option,position,value;if(this.result_highlight){high=this.result_highlight;this.result_clear_highlight();if(this.is_multiple&&this.max_selected_options<=this.choices_count()){this.form_field_jq.trigger("liszt:maxselected",{chosen:this});return false}if(this.is_multiple){high.removeClass("active-result")}else{this.reset_single_select_options()}high.addClass("result-selected");item=this.results_data[high[0].getAttribute("data-option-array-index")];item.selected=true;this.form_field.options[item.options_index].selected=true;this.selected_option_count=null;if(this.is_multiple){this.choice_build(item)}else{this.single_set_selected_text(this.choice_label(item))}if(!((evt.metaKey||evt.ctrlKey)&&this.is_multiple)){this.results_hide()}this.show_search_field_default();if(this.is_multiple||this.form_field.selectedIndex!==this.current_selectedIndex){this.form_field_jq.trigger("change",{selected:this.form_field.options[item.options_index].value})}this.current_selectedIndex=this.form_field.selectedIndex;evt.preventDefault();return this.search_field_scale()}else if(!this.is_multiple&&this.allow_custom_value){value=this.search_field.val();group=this.add_unique_custom_group();option=$('<option value="'+value+'">'+value+"</option>");group.append(option);this.form_field_jq.append(group);this.form_field.options[this.form_field.options.length-1].selected=true;if(!evt.metaKey){this.results_hide()}return this.results_build()}};Chosen.prototype.find_custom_group=function(){var found,group,_i,_len,_ref;_ref=$("optgroup",this.form_field);for(_i=0,_len=_ref.length;_i<_len;_i++){group=_ref[_i];if(group.getAttribute("label")===this.custom_group_text){found=group}}return found};Chosen.prototype.add_unique_custom_group=function(){var group;group=this.find_custom_group();if(!group){group=$('<optgroup label="'+this.custom_group_text+'"></optgroup>')}return $(group)};Chosen.prototype.single_set_selected_text=function(text){if(text==null){text=this.default_text}if(text===this.default_text){this.selected_item.addClass("chzn-default")}else{this.single_deselect_control_build();this.selected_item.removeClass("chzn-default")}return this.selected_item.find("span").html(text)};Chosen.prototype.result_deselect=function(pos){var result_data;result_data=this.results_data[pos];if(!this.form_field.options[result_data.options_index].disabled){result_data.selected=false;this.form_field.options[result_data.options_index].selected=false;this.selected_option_count=null;this.result_clear_highlight();if(this.results_showing){this.winnow_results()}this.form_field_jq.trigger("change",{deselected:this.form_field.options[result_data.options_index].value});this.search_field_scale();return true}else{return false}};Chosen.prototype.single_deselect_control_build=function(){if(!this.allow_single_deselect){return}if(!this.selected_item.find("abbr").length){this.selected_item.find("span").first().after('<abbr class="search-choice-close"></abbr>')}return this.selected_item.addClass("chzn-single-with-deselect")};Chosen.prototype.get_search_text=function(){return $("<div/>").text($.trim(this.search_field.val())).html()};Chosen.prototype.winnow_results_set_highlight=function(){var do_high,selected_results;selected_results=!this.is_multiple?this.search_results.find(".result-selected.active-result"):[];do_high=selected_results.length?selected_results.first():this.search_results.find(".active-result").first();if(do_high!=null){return this.result_do_highlight(do_high)}};Chosen.prototype.no_results=function(terms){var no_results_html;no_results_html=$('<li class="no-results">'+this.results_none_found+' "<span></span>"</li>');no_results_html.find("span").first().html(terms);this.search_results.append(no_results_html);return this.form_field_jq.trigger("liszt:no_results",{chosen:this})};Chosen.prototype.no_results_clear=function(){return this.search_results.find(".no-results").remove()};Chosen.prototype.keydown_arrow=function(){var next_sib;if(this.results_showing&&this.result_highlight){next_sib=this.result_highlight.nextAll("li.active-result").first();if(next_sib){return this.result_do_highlight(next_sib)}}else{return this.results_show()}};Chosen.prototype.keyup_arrow=function(){var prev_sibs;if(!this.results_showing&&!this.is_multiple){return this.results_show()}else if(this.result_highlight){prev_sibs=this.result_highlight.prevAll("li.active-result");if(prev_sibs.length){return this.result_do_highlight(prev_sibs.first())}else{if(this.choices_count()>0){this.results_hide()}return this.result_clear_highlight()}}};Chosen.prototype.keydown_backstroke=function(){var next_available_destroy;
+if(this.pending_backstroke){this.choice_destroy(this.pending_backstroke.find("a").first());return this.clear_backstroke()}else{next_available_destroy=this.search_container.siblings("li.search-choice").last();if(next_available_destroy.length&&!next_available_destroy.hasClass("search-choice-disabled")){this.pending_backstroke=next_available_destroy;if(this.single_backstroke_delete){return this.keydown_backstroke()}else{return this.pending_backstroke.addClass("search-choice-focus")}}}};Chosen.prototype.clear_backstroke=function(){if(this.pending_backstroke){this.pending_backstroke.removeClass("search-choice-focus")}return this.pending_backstroke=null};Chosen.prototype.keydown_checker=function(evt){var stroke,_ref1;stroke=(_ref1=evt.which)!=null?_ref1:evt.keyCode;this.search_field_scale();if(stroke!==8&&this.pending_backstroke){this.clear_backstroke()}switch(stroke){case 8:this.backstroke_length=this.search_field.val().length;break;case 9:if(this.results_showing&&!this.is_multiple){this.result_select(evt)}this.mouse_on_container=false;break;case 13:if(this.results_showing){evt.preventDefault()}break;case 32:if(this.disable_search){evt.preventDefault()}break;case 38:evt.preventDefault();this.keyup_arrow();break;case 40:evt.preventDefault();this.keydown_arrow();break}};Chosen.prototype.search_field_scale=function(){var div,f_width,h,style,style_block,styles,w,_i,_len;if(this.is_multiple){h=0;w=0;style_block="position:absolute; left: -1000px; top: -1000px; display:none;";styles=["font-size","font-style","font-weight","font-family","line-height","text-transform","letter-spacing"];for(_i=0,_len=styles.length;_i<_len;_i++){style=styles[_i];style_block+=style+":"+this.search_field.css(style)+";"}div=$("<div />",{style:style_block});div.text(this.search_field.val());$("body").append(div);w=div.width()+25;div.remove();f_width=this.container.outerWidth();if(w>f_width-10){w=f_width-10}return this.search_field.css({width:w+"px"})}};return Chosen}(AbstractChosen)}).call(this);
\ No newline at end of file
diff --git a/core/media/jui/js/cms-uncompressed.js b/core/media/jui/js/cms-uncompressed.js
new file mode 100644
index 00000000..1719bd92
--- /dev/null
+++ b/core/media/jui/js/cms-uncompressed.js
@@ -0,0 +1,213 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Only define the Joomla namespace if not defined.
+if (typeof(Joomla) === 'undefined') {
+	var Joomla = {};
+}
+
+!(function(document, Joomla) {
+	"use strict";
+
+	/**
+	 * Sets the HTML of the container-collapse element
+	 */
+	Joomla.setcollapse = function(url, name, height) {
+		if (!document.getElementById('collapse-' + name)) {
+			document.getElementById('container-collapse').innerHTML = '<div class="collapse fade" id="collapse-' + name + '"><iframe class="iframe" src="' + url + '" height="' + height + '" width="100%"></iframe></div>';
+		}
+	};
+
+	/**
+	 * IE8 polyfill for indexOf()
+	 */
+	if (!Array.prototype.indexOf) {
+		Array.prototype.indexOf = function(elt) {
+			var len = this.length >>> 0;
+
+			var from = Number(arguments[1]) || 0;
+			from     = (from < 0) ? Math.ceil(from) : Math.floor(from);
+
+			if (from < 0) {
+				from += len;
+			}
+
+			for (; from < len; from++) {
+				if (from in this && this[from] === elt) {
+					return from;
+				}
+			}
+			return -1;
+		};
+	}
+	/**
+	 * JField 'showon' feature.
+	 */
+	window.jQuery && (function($) {
+
+		/**
+		 * Method to check condition and change the target visibility
+		 * @param {jQuery}  target
+		 * @param {Boolean} animate
+		 */
+		function linkedoptions(target, animate) {
+			var showfield = true,
+				jsondata  = target.data('showon') || [],
+				itemval, condition, fieldName, $fields;
+
+			// Check if target conditions are satisfied
+			for (var j = 0, lj = jsondata.length; j < lj; j++) {
+				condition = jsondata[j] || {};
+				fieldName = condition.field;
+				$fields   = $('[name="' + fieldName + '"], [name="' + fieldName + '[]"]');
+
+				condition['valid'] = 0;
+
+				// Test in each of the elements in the field array if condition is valid
+				$fields.each(function() {
+					var $field = $(this);
+
+					// If checkbox or radio box the value is read from properties
+					if (['checkbox', 'radio'].indexOf($field.attr('type')) !== -1) {
+						if (!$field.prop('checked')) {
+							// unchecked fields will return a blank and so always match a != condition so we skip them
+							return;
+						}
+						itemval = $field.val();
+					}
+					else {
+						// select lists, textarea etc. Note that multiple-select list returns an Array here 
+						// se we can always tream 'itemval' as an array
+						itemval = $field.val();
+						// a multi-select <select> $field  will return null when no elements are selected so we need to define itemval accordingly
+						if (itemval == null && $field.prop("tagName").toLowerCase() == "select") {
+							itemval = [];
+						}
+					}
+
+					// Convert to array to allow multiple values in the field (e.g. type=list multiple)
+					// and normalize as string
+					if (!(typeof itemval === 'object')) {
+						itemval = JSON.parse('["' + itemval + '"]');
+					}
+
+					// for (var i in itemval) loops over non-enumerable properties and prototypes which means that != will ALWAYS match 
+					// see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...in
+					// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyNames
+					// use native javascript Array forEach - see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach                                        
+					// We can't use forEach because its not supported in MSIE 8 - once that is dropped this code could use forEach instead and not have to use propertyIsEnumerable
+					// 
+					// Test if any of the values of the field exists in showon conditions
+					for (var i in itemval) {
+						// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/propertyIsEnumerable
+						// Needed otherwise we pick up unenumerable properties like length etc. and !: will always match one of these  !!
+						if (!itemval.propertyIsEnumerable(i)) {
+							continue;
+						}
+						// ":" Equal to one or more of the values condition
+						if (jsondata[j]['sign'] == '=' && jsondata[j]['values'].indexOf(itemval[i]) !== -1) {
+							jsondata[j]['valid'] = 1;
+						}
+						// "!:" Not equal to one or more of the values condition
+						if (jsondata[j]['sign'] == '!=' && jsondata[j]['values'].indexOf(itemval[i]) === -1) {
+							jsondata[j]['valid'] = 1;
+						}
+
+					}
+
+				});
+
+				// Verify conditions
+				// First condition (no operator): current condition must be valid
+				if (condition['op'] === '') {
+					if (condition['valid'] === 0) {
+						showfield = false;
+					}
+				}
+				// Other conditions (if exists)
+				else {
+					// AND operator: both the previous and current conditions must be valid
+					if (condition['op'] === 'AND' && condition['valid'] + jsondata[j - 1]['valid'] < 2) {
+						showfield = false;
+					}
+					// OR operator: one of the previous and current conditions must be valid
+					if (condition['op'] === 'OR' && condition['valid'] + jsondata[j - 1]['valid'] > 0) {
+						showfield = true;
+					}
+				}
+			}
+
+			// If conditions are satisfied show the target field(s), else hide
+			if (animate) {
+				(showfield) ? target.slideDown() : target.slideUp();
+			} else {
+				target.toggle(showfield);
+			}
+		}
+
+		/**
+		 * Method for setup the 'showon' feature, for the fields in given container
+		 * @param {HTMLElement} container
+		 */
+		function setUpShowon(container) {
+			container = container || document;
+
+			var $showonFields = $(container).find('[data-showon]');
+
+			// Setup each 'showon' field
+			for (var is = 0, ls = $showonFields.length; is < ls; is++) {
+				// Use anonymous function to capture arguments
+				(function() {
+					var $target = $($showonFields[is]), jsondata = $target.data('showon') || [],
+						field, $fields                           = $();
+
+					// Collect an all referenced elements
+					for (var ij = 0, lj = jsondata.length; ij < lj; ij++) {
+						field   = jsondata[ij]['field'];
+						$fields = $fields.add($('[name="' + field + '"], [name="' + field + '[]"]'));
+					}
+
+					// Check current condition for element
+					linkedoptions($target);
+
+					// Attach events to referenced element, to check condition on change
+					$fields.on('change', function() {
+						linkedoptions($target, true);
+					});
+				})();
+			}
+		}
+
+		/**
+		 * Initialize 'showon' feature
+		 */
+		$(document).ready(function() {
+			setUpShowon();
+
+			// Setup showon feature in the subform field
+			$(document).on('subform-row-add', function(event, row) {
+				var $row      = $(row),
+					$elements = $row.find('[data-showon]'),
+					baseName  = $row.data('baseName'),
+					group     = $row.data('group'),
+					search    = new RegExp('\\[' + baseName + '\\]\\[' + baseName + 'X\\]', 'g'),
+					replace   = '[' + baseName + '][' + group + ']',
+					$elm, showon;
+
+				// Fix showon field names in a current group
+				for (var i = 0, l = $elements.length; i < l; i++) {
+					$elm   = $($elements[i]);
+					showon = $elm.attr('data-showon').replace(search, replace);
+
+					$elm.attr('data-showon', showon);
+				}
+
+				setUpShowon(row);
+			});
+		});
+
+	})(jQuery);
+
+})(document, Joomla);
diff --git a/core/media/jui/js/cms.js b/core/media/jui/js/cms.js
new file mode 100644
index 00000000..ef201499
--- /dev/null
+++ b/core/media/jui/js/cms.js
@@ -0,0 +1 @@
+if("undefined"==typeof Joomla)var Joomla={};!function(e,a){"use strict";a.setcollapse=function(a,n,o){e.getElementById("collapse-"+n)||(e.getElementById("container-collapse").innerHTML='<div class="collapse fade" id="collapse-'+n+'"><iframe class="iframe" src="'+a+'" height="'+o+'" width="100%"></iframe></div>')},Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var a=this.length>>>0,n=Number(arguments[1])||0;for(n=0>n?Math.ceil(n):Math.floor(n),0>n&&(n+=a);a>n;n++)if(n in this&&this[n]===e)return n;return-1}),window.jQuery&&function(a){function n(e,n){for(var o,t,i,r,l=!0,d=e.data("showon")||[],f=0,s=d.length;s>f;f++)t=d[f]||{},i=t.field,r=a('[name="'+i+'"], [name="'+i+'[]"]'),t.valid=0,r.each(function(){var e=a(this);if(-1!==["checkbox","radio"].indexOf(e.attr("type"))){if(!e.prop("checked"))return;o=e.val()}else o=e.val(),null==o&&"select"==e.prop("tagName").toLowerCase()&&(o=[]);"object"!=typeof o&&(o=JSON.parse('["'+o+'"]'));for(var n in o)o.propertyIsEnumerable(n)&&("="==d[f].sign&&-1!==d[f].values.indexOf(o[n])&&(d[f].valid=1),"!="==d[f].sign&&-1===d[f].values.indexOf(o[n])&&(d[f].valid=1))}),""===t.op?0===t.valid&&(l=!1):("AND"===t.op&&t.valid+d[f-1].valid<2&&(l=!1),"OR"===t.op&&t.valid+d[f-1].valid>0&&(l=!0));n?l?e.slideDown():e.slideUp():e.toggle(l)}function o(o){o=o||e;for(var t=a(o).find("[data-showon]"),i=0,r=t.length;r>i;i++)!function(){for(var e,o=a(t[i]),r=o.data("showon")||[],l=a(),d=0,f=r.length;f>d;d++)e=r[d].field,l=l.add(a('[name="'+e+'"], [name="'+e+'[]"]'));n(o),l.on("change",function(){n(o,!0)})}()}a(e).ready(function(){o(),a(e).on("subform-row-add",function(e,n){for(var t,i,r=a(n),l=r.find("[data-showon]"),d=r.data("baseName"),f=r.data("group"),s=new RegExp("\\["+d+"\\]\\["+d+"X\\]","g"),c="["+d+"]["+f+"]",u=0,p=l.length;p>u;u++)t=a(l[u]),i=t.attr("data-showon").replace(s,c),t.attr("data-showon",i);o(n)})})}(jQuery)}(document,Joomla);
\ No newline at end of file
diff --git a/core/media/jui/js/fielduser.js b/core/media/jui/js/fielduser.js
new file mode 100644
index 00000000..ea43857f
--- /dev/null
+++ b/core/media/jui/js/fielduser.js
@@ -0,0 +1,144 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Field user
+ */
+;(function($){
+	'use strict';
+
+	$.fieldUser = function(container, options){
+		// Merge options with defaults
+		this.options = $.extend({}, $.fieldUser.defaults, options);
+
+		// Set up elements
+		this.$container = $(container);
+		this.$modal = this.$container.find(this.options.modal);
+		this.$modalBody = this.$modal.children('.modal-body');
+		this.$input = this.$container.find(this.options.input);
+		this.$inputName = this.$container.find(this.options.inputName);
+		this.$buttonSelect = this.$container.find(this.options.buttonSelect);
+
+		// Bind events
+		this.$buttonSelect.on('click', this.modalOpen.bind(this));
+		this.$modal.on('hide', this.removeIframe.bind(this));
+
+		// Check for onchange callback,
+		var onchangeStr =  this.$input.attr('data-onchange'), onchangeCallback;
+		if(onchangeStr) {
+			onchangeCallback = new Function(onchangeStr);
+			this.$input.on('change', onchangeCallback.bind(this.$input));
+		}
+
+	};
+
+	// display modal for select the file
+	$.fieldUser.prototype.modalOpen = function() {
+		var $iframe = $('<iframe>', {
+			name: 'field-user-modal',
+			src: this.options.url.replace('{field-user-id}', this.$input.attr('id')),
+			width: this.options.modalWidth,
+			height: this.options.modalHeight
+		});
+		this.$modalBody.append($iframe);
+		this.$modal.modal('show');
+		$('body').addClass('modal-open');
+
+		var self = this; // save context
+		$iframe.load(function(){
+			var content = $(this).contents();
+
+			// handle value select
+			content.on('click', '.button-select', function(){
+				self.setValue($(this).data('user-value'), $(this).data('user-name'));
+				self.modalClose();
+				$('body').removeClass('modal-open');
+			});
+		});
+	};
+
+	// close modal
+	$.fieldUser.prototype.modalClose = function() {
+		this.$modal.modal('hide');
+		this.$modalBody.empty();
+		$('body').removeClass('modal-open');
+	};
+
+	// close modal
+	$.fieldUser.prototype.removeIframe = function() {
+		this.$modalBody.empty();
+		$('body').removeClass('modal-open');
+	};
+
+	// set the value
+	$.fieldUser.prototype.setValue = function(value, name) {
+		this.$input.val(value).trigger('change');
+		this.$inputName.val(name || value).trigger('change');
+	};
+
+	// default options
+	$.fieldUser.defaults = {
+		buttonSelect: '.button-select', // selector for button to change the value
+		input: '.field-user-input', // selector for the input for the user id
+		inputName: '.field-user-input-name', // selector for the input for the user name
+		modal: '.modal', // modal selector
+		url : 'index.php?option=com_users&view=users&layout=modal&tmpl=component',
+		modalWidth: '100%', // modal width
+		modalHeight: '300px' // modal height
+	};
+
+	$.fn.fieldUser = function(options){
+		return this.each(function(){
+			var $el = $(this), instance = $el.data('fieldUser');
+			if(!instance){
+				var options = options || {},
+					data = $el.data();
+
+				// Check options in the element
+				for (var p in data) {
+					if (data.hasOwnProperty(p)) {
+						options[p] = data[p];
+					}
+				}
+
+				instance = new $.fieldUser(this, options);
+				$el.data('fieldUser', instance);
+			}
+		});
+	};
+
+	// Initialise all defaults
+	$(document).ready(function(){
+		$('.field-user-wrapper').fieldUser();
+	});
+
+})(jQuery);
+
+// Compatibility with mootools modal layout
+function jSelectUser(element) {
+	var $el = jQuery(element),
+		value = $el.data('user-value'),
+		name  = $el.data('user-name'),
+		fieldId = $el.data('user-field'),
+		$inputValue = jQuery('#' + fieldId + '_id'),
+		$inputName  = jQuery('#' + fieldId);
+
+	if (!$inputValue.length) {
+		// The input not found
+		return;
+	}
+
+	// Update the value
+	$inputValue.val(value).trigger('change');
+	$inputName.val(name || value).trigger('change');
+
+	// Check for onchange callback,
+	var onchangeStr = $inputValue.attr('data-onchange'), onchangeCallback;
+	if(onchangeStr) {
+		onchangeCallback = new Function(onchangeStr);
+		onchangeCallback.call($inputValue[0]);
+	}
+	jModalClose();
+}
diff --git a/core/media/jui/js/fielduser.min.js b/core/media/jui/js/fielduser.min.js
new file mode 100644
index 00000000..5bc9b3e6
--- /dev/null
+++ b/core/media/jui/js/fielduser.min.js
@@ -0,0 +1 @@
+function jSelectUser(t){var e=jQuery(t),i=e.data("user-value"),o=e.data("user-name"),n=e.data("user-field"),a=jQuery("#"+n+"_id"),s=jQuery("#"+n);if(a.length){a.val(i).trigger("change"),s.val(o||i).trigger("change");var d,l=a.attr("data-onchange");l&&(d=new Function(l),d.call(a[0])),jModalClose()}}!function(t){"use strict";t.fieldUser=function(e,i){this.options=t.extend({},t.fieldUser.defaults,i),this.$container=t(e),this.$modal=this.$container.find(this.options.modal),this.$modalBody=this.$modal.children(".modal-body"),this.$input=this.$container.find(this.options.input),this.$inputName=this.$container.find(this.options.inputName),this.$buttonSelect=this.$container.find(this.options.buttonSelect),this.$buttonSelect.on("click",this.modalOpen.bind(this)),this.$modal.on("hide",this.removeIframe.bind(this));var o,n=this.$input.attr("data-onchange");n&&(o=new Function(n),this.$input.on("change",o.bind(this.$input)))},t.fieldUser.prototype.modalOpen=function(){var e=t("<iframe>",{name:"field-user-modal",src:this.options.url.replace("{field-user-id}",this.$input.attr("id")),width:this.options.modalWidth,height:this.options.modalHeight});this.$modalBody.append(e),this.$modal.modal("show"),t("body").addClass("modal-open");var i=this;e.load(function(){var e=t(this).contents();e.on("click",".button-select",function(){i.setValue(t(this).data("user-value"),t(this).data("user-name")),i.modalClose(),t("body").removeClass("modal-open")})})},t.fieldUser.prototype.modalClose=function(){this.$modal.modal("hide"),this.$modalBody.empty(),t("body").removeClass("modal-open")},t.fieldUser.prototype.removeIframe=function(){this.$modalBody.empty(),t("body").removeClass("modal-open")},t.fieldUser.prototype.setValue=function(t,e){this.$input.val(t).trigger("change"),this.$inputName.val(e||t).trigger("change")},t.fieldUser.defaults={buttonSelect:".button-select",input:".field-user-input",inputName:".field-user-input-name",modal:".modal",url:"index.php?option=com_users&view=users&layout=modal&tmpl=component",modalWidth:"100%",modalHeight:"300px"},t.fn.fieldUser=function(){return this.each(function(){var e=t(this),i=e.data("fieldUser");if(!i){var o=o||{},n=e.data();for(var a in n)n.hasOwnProperty(a)&&(o[a]=n[a]);i=new t.fieldUser(this,o),e.data("fieldUser",i)}})},t(document).ready(function(){t(".field-user-wrapper").fieldUser()})}(jQuery);
\ No newline at end of file
diff --git a/core/media/jui/js/html5-uncompressed.js b/core/media/jui/js/html5-uncompressed.js
new file mode 100644
index 00000000..45ea723d
--- /dev/null
+++ b/core/media/jui/js/html5-uncompressed.js
@@ -0,0 +1,326 @@
+/**
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+;(function(window, document) {
+/*jshint evil:true */
+  /** version */
+  var version = '3.7.3';
+
+  /** Preset options */
+  var options = window.html5 || {};
+
+  /** Used to skip problem elements */
+  var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
+
+  /** Not all elements can be cloned in IE **/
+  var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
+
+  /** Detect whether the browser supports default html5 styles */
+  var supportsHtml5Styles;
+
+  /** Name of the expando, to work with multiple documents or to re-shiv one document */
+  var expando = '_html5shiv';
+
+  /** The id for the the documents expando */
+  var expanID = 0;
+
+  /** Cached data for each document */
+  var expandoData = {};
+
+  /** Detect whether the browser supports unknown elements */
+  var supportsUnknownElements;
+
+  (function() {
+    try {
+        var a = document.createElement('a');
+        a.innerHTML = '<xyz></xyz>';
+        //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles
+        supportsHtml5Styles = ('hidden' in a);
+
+        supportsUnknownElements = a.childNodes.length == 1 || (function() {
+          // assign a false positive if unable to shiv
+          (document.createElement)('a');
+          var frag = document.createDocumentFragment();
+          return (
+            typeof frag.cloneNode == 'undefined' ||
+            typeof frag.createDocumentFragment == 'undefined' ||
+            typeof frag.createElement == 'undefined'
+          );
+        }());
+    } catch(e) {
+      // assign a false positive if detection fails => unable to shiv
+      supportsHtml5Styles = true;
+      supportsUnknownElements = true;
+    }
+
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Creates a style sheet with the given CSS text and adds it to the document.
+   * @private
+   * @param {Document} ownerDocument The document.
+   * @param {String} cssText The CSS text.
+   * @returns {StyleSheet} The style element.
+   */
+  function addStyleSheet(ownerDocument, cssText) {
+    var p = ownerDocument.createElement('p'),
+        parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
+
+    p.innerHTML = 'x<style>' + cssText + '</style>';
+    return parent.insertBefore(p.lastChild, parent.firstChild);
+  }
+
+  /**
+   * Returns the value of `html5.elements` as an array.
+   * @private
+   * @returns {Array} An array of shived element node names.
+   */
+  function getElements() {
+    var elements = html5.elements;
+    return typeof elements == 'string' ? elements.split(' ') : elements;
+  }
+
+  /**
+   * Extends the built-in list of html5 elements
+   * @memberOf html5
+   * @param {String|Array} newElements whitespace separated list or array of new element names to shiv
+   * @param {Document} ownerDocument The context document.
+   */
+  function addElements(newElements, ownerDocument) {
+    var elements = html5.elements;
+    if(typeof elements != 'string'){
+      elements = elements.join(' ');
+    }
+    if(typeof newElements != 'string'){
+      newElements = newElements.join(' ');
+    }
+    html5.elements = elements +' '+ newElements;
+    shivDocument(ownerDocument);
+  }
+
+   /**
+   * Returns the data associated to the given document
+   * @private
+   * @param {Document} ownerDocument The document.
+   * @returns {Object} An object of data.
+   */
+  function getExpandoData(ownerDocument) {
+    var data = expandoData[ownerDocument[expando]];
+    if (!data) {
+        data = {};
+        expanID++;
+        ownerDocument[expando] = expanID;
+        expandoData[expanID] = data;
+    }
+    return data;
+  }
+
+  /**
+   * returns a shived element for the given nodeName and document
+   * @memberOf html5
+   * @param {String} nodeName name of the element
+   * @param {Document|DocumentFragment} ownerDocument The context document.
+   * @returns {Object} The shived element.
+   */
+  function createElement(nodeName, ownerDocument, data){
+    if (!ownerDocument) {
+        ownerDocument = document;
+    }
+    if(supportsUnknownElements){
+        return ownerDocument.createElement(nodeName);
+    }
+    if (!data) {
+        data = getExpandoData(ownerDocument);
+    }
+    var node;
+
+    if (data.cache[nodeName]) {
+        node = data.cache[nodeName].cloneNode();
+    } else if (saveClones.test(nodeName)) {
+        node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
+    } else {
+        node = data.createElem(nodeName);
+    }
+
+    // Avoid adding some elements to fragments in IE < 9 because
+    // * Attributes like `name` or `type` cannot be set/changed once an element
+    //   is inserted into a document/fragment
+    // * Link elements with `src` attributes that are inaccessible, as with
+    //   a 403 response, will cause the tab/window to crash
+    // * Script elements appended to fragments will execute when their `src`
+    //   or `text` property is set
+    return node.canHaveChildren && !reSkip.test(nodeName) && !node.tagUrn ? data.frag.appendChild(node) : node;
+  }
+
+  /**
+   * returns a shived DocumentFragment for the given document
+   * @memberOf html5
+   * @param {Document} ownerDocument The context document.
+   * @returns {Object} The shived DocumentFragment.
+   */
+  function createDocumentFragment(ownerDocument, data){
+    if (!ownerDocument) {
+        ownerDocument = document;
+    }
+    if(supportsUnknownElements){
+        return ownerDocument.createDocumentFragment();
+    }
+    data = data || getExpandoData(ownerDocument);
+    var clone = data.frag.cloneNode(),
+        i = 0,
+        elems = getElements(),
+        l = elems.length;
+    for(;i<l;i++){
+        clone.createElement(elems[i]);
+    }
+    return clone;
+  }
+
+  /**
+   * Shivs the `createElement` and `createDocumentFragment` methods of the document.
+   * @private
+   * @param {Document|DocumentFragment} ownerDocument The document.
+   * @param {Object} data of the document.
+   */
+  function shivMethods(ownerDocument, data) {
+    if (!data.cache) {
+        data.cache = {};
+        data.createElem = ownerDocument.createElement;
+        data.createFrag = ownerDocument.createDocumentFragment;
+        data.frag = data.createFrag();
+    }
+
+
+    ownerDocument.createElement = function(nodeName) {
+      //abort shiv
+      if (!html5.shivMethods) {
+          return data.createElem(nodeName);
+      }
+      return createElement(nodeName, ownerDocument, data);
+    };
+
+    ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
+      'var n=f.cloneNode(),c=n.createElement;' +
+      'h.shivMethods&&(' +
+        // unroll the `createElement` calls
+        getElements().join().replace(/[\w\-:]+/g, function(nodeName) {
+          data.createElem(nodeName);
+          data.frag.createElement(nodeName);
+          return 'c("' + nodeName + '")';
+        }) +
+      ');return n}'
+    )(html5, data.frag);
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * Shivs the given document.
+   * @memberOf html5
+   * @param {Document} ownerDocument The document to shiv.
+   * @returns {Document} The shived document.
+   */
+  function shivDocument(ownerDocument) {
+    if (!ownerDocument) {
+        ownerDocument = document;
+    }
+    var data = getExpandoData(ownerDocument);
+
+    if (html5.shivCSS && !supportsHtml5Styles && !data.hasCSS) {
+      data.hasCSS = !!addStyleSheet(ownerDocument,
+        // corrects block display not defined in IE6/7/8/9
+        'article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}' +
+        // adds styling not present in IE6/7/8/9
+        'mark{background:#FF0;color:#000}' +
+        // hides non-rendered elements
+        'template{display:none}'
+      );
+    }
+    if (!supportsUnknownElements) {
+      shivMethods(ownerDocument, data);
+    }
+    return ownerDocument;
+  }
+
+  /*--------------------------------------------------------------------------*/
+
+  /**
+   * The `html5` object is exposed so that more elements can be shived and
+   * existing shiving can be detected on iframes.
+   * @type Object
+   * @example
+   *
+   * // options can be changed before the script is included
+   * html5 = { 'elements': 'mark section', 'shivCSS': false, 'shivMethods': false };
+   */
+  var html5 = {
+
+    /**
+     * An array or space separated string of node names of the elements to shiv.
+     * @memberOf html5
+     * @type Array|String
+     */
+    'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video',
+
+    /**
+     * current version of html5shiv
+     */
+    'version': version,
+
+    /**
+     * A flag to indicate that the HTML5 style sheet should be inserted.
+     * @memberOf html5
+     * @type Boolean
+     */
+    'shivCSS': (options.shivCSS !== false),
+
+    /**
+     * Is equal to true if a browser supports creating unknown/HTML5 elements
+     * @memberOf html5
+     * @type boolean
+     */
+    'supportsUnknownElements': supportsUnknownElements,
+
+    /**
+     * A flag to indicate that the document's `createElement` and `createDocumentFragment`
+     * methods should be overwritten.
+     * @memberOf html5
+     * @type Boolean
+     */
+    'shivMethods': (options.shivMethods !== false),
+
+    /**
+     * A string to describe the type of `html5` object ("default" or "default print").
+     * @memberOf html5
+     * @type String
+     */
+    'type': 'default',
+
+    // shivs the document according to the specified `html5` object options
+    'shivDocument': shivDocument,
+
+    //creates a shived element
+    createElement: createElement,
+
+    //creates a shived documentFragment
+    createDocumentFragment: createDocumentFragment,
+
+    //extends list of elements
+    addElements: addElements
+  };
+
+  /*--------------------------------------------------------------------------*/
+
+  // expose html5
+  window.html5 = html5;
+
+  // shiv the document
+  shivDocument(document);
+
+  if(typeof module == 'object' && module.exports){
+    module.exports = html5;
+  }
+
+}(typeof window !== "undefined" ? window : this, document));
diff --git a/core/media/jui/js/html5.js b/core/media/jui/js/html5.js
new file mode 100644
index 00000000..355afd10
--- /dev/null
+++ b/core/media/jui/js/html5.js
@@ -0,0 +1,4 @@
+/**
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document);
\ No newline at end of file
diff --git a/core/media/jui/js/icomoon-lte-ie7.js b/core/media/jui/js/icomoon-lte-ie7.js
new file mode 100644
index 00000000..42f76128
--- /dev/null
+++ b/core/media/jui/js/icomoon-lte-ie7.js
@@ -0,0 +1,317 @@
+/* Load this script using conditional IE comments if you need to support IE 7 and IE 6. */
+
+window.onload = function() {
+	function addIcon(el, entity) {
+		var html = el.innerHTML;
+		el.innerHTML = '<span style="font-family: \'IcoMoon\'">' + entity + '</span>' + html;
+	}
+	var icons = {
+			'icon-joomla' : '&#xe200;',
+			'icon-chevron-up' : '&#xe005;',
+			'icon-uparrow' : '&#xe005;',
+			'icon-arrow-up' : '&#xe005;',
+			'icon-chevron-right' : '&#xe006;',
+			'icon-rightarrow' : '&#xe006;',
+			'icon-arrow-right' : '&#xe006;',
+			'icon-chevron-down' : '&#xe007;',
+			'icon-downarrow' : '&#xe007;',
+			'icon-arrow-down' : '&#xe007;',
+			'icon-chevron-left' : '&#xe008;',
+			'icon-leftarrow' : '&#xe008;',
+			'icon-arrow-left' : '&#xe008;',
+			'icon-arrow-first' : '&#xe003;',
+			'icon-arrow-last' : '&#xe004;',
+			'icon-arrow-up-2' : '&#xe009;',
+			'icon-arrow-right-2' : '&#xe00a;',
+			'icon-arrow-down-2' : '&#xe00b;',
+			'icon-arrow-left-2' : '&#xe00c;',
+			'icon-arrow-up-3' : '&#xe00f;',
+			'icon-arrow-right-3' : '&#xe010;',
+			'icon-arrow-down-3' : '&#xe011;',
+			'icon-arrow-left-3' : '&#xe012;',
+			'icon-menu-2' : '&#xe00e;',
+			'icon-arrow-up-4' : '&#xe201;',
+			'icon-arrow-right-4' : '&#xe202;',
+			'icon-arrow-down-4' : '&#xe203;',
+			'icon-arrow-left-4' : '&#xe204;',
+			'icon-share' : '&#x27;',
+			'icon-redo' : '&#x27;',
+			'icon-undo' : '&#x28;',
+			'icon-forward-2' : '&#xe205;',
+			'icon-backward-2' : '&#xe206;',
+			'icon-reply' : '&#xe206;',
+			'icon-unblock' : '&#x6c;',
+			'icon-refresh' : '&#x6c;',
+			'icon-redo-2' : '&#x6c;',
+			'icon-undo-2' : '&#xe207;',
+			'icon-move' : '&#x7a;',
+			'icon-expand' : '&#x66;',
+			'icon-contract' : '&#x67;',
+			'icon-expand-2' : '&#x68;',
+			'icon-contract-2' : '&#x69;',
+			'icon-play' : '&#xe208;',
+			'icon-pause' : '&#xe209;',
+			'icon-stop' : '&#xe210;',
+			'icon-previous' : '&#x7c;',
+			'icon-backward' : '&#x7c;',
+			'icon-next' : '&#x7b;',
+			'icon-forward' : '&#x7b;',
+			'icon-first' : '&#x7d;',
+			'icon-last' : '&#xe000;',
+			'icon-play-circle' : '&#xe00d;',
+			'icon-pause-circle' : '&#xe211;',
+			'icon-stop-circle' : '&#xe212;',
+			'icon-backward-circle' : '&#xe213;',
+			'icon-forward-circle' : '&#xe214;',
+			'icon-loop' : '&#xe001;',
+			'icon-shuffle' : '&#xe002;',
+			'icon-search' : '&#x53;',
+			'icon-zoom-in' : '&#x64;',
+			'icon-zoom-out' : '&#x65;',
+			'icon-apply' : '&#x2b;',
+			'icon-edit' : '&#x2b;',
+			'icon-pencil' : '&#x2b;',
+			'icon-pencil-2' : '&#x2c;',
+			'icon-brush' : '&#x3b;',
+			'icon-save-new' : '&#x5d;',
+			'icon-plus-2 ' : '&#x5d;',
+			'icon-minus-sign' : '&#x5e;',
+			'icon-minus-2' : '&#x5e;',
+			'icon-delete' : '&#x49;',
+			'icon-remove' : '&#x49;',
+			'icon-cancel-2' : '&#x49;',
+			'icon-publish' : '&#x47;',
+			'icon-save' : '&#x47;',
+			'icon-ok' : '&#x47;',
+			'icon-checkmark' : '&#x47;',
+			'icon-new' : '&#x2a;',
+			'icon-plus' : '&#x2a;',
+			'icon-plus-circle' : '&#xe215;',
+			'icon-minus' : '&#x4b;',
+			'icon-not-ok' : '&#x4b;',
+			'icon-ban-circle' : '&#xe216;',
+			'icon-minus-circle' : '&#xe216;',
+			'icon-unpublish' : '&#x4a;',
+			'icon-cancel' : '&#x4a;',
+			'icon-cancel-circle' : '&#xe217;',
+			'icon-checkmark-2' : '&#xe218;',
+			'icon-checkmark-circle' : '&#xe219;',
+			'icon-info' : '&#xe220;',
+			'icon-info-2' : '&#xe221;',
+			'icon-info-circle' : '&#xe221;',
+			'icon-question' : '&#x45;',
+			'icon-question-sign' : '&#x45;',
+			'icon-help' : '&#x45;',
+			'icon-question-2' : '&#xe222;',
+			'icon-question-circle' : '&#xe222;',
+			'icon-notification' : '&#xe223;',
+			'icon-notification-2' : '&#xe224;',
+			'icon-notification-circle' : '&#xe224;',
+			'icon-pending' : '&#x48;',
+			'icon-warning' : '&#x48;',
+			'icon-warning-2' : '&#xe225;',
+			'icon-warning-circle' : '&#xe225;',
+			'icon-checkbox-unchecked' : '&#x3d;',
+			'icon-checkin' : '&#x3e;',
+			'icon-checkbox' : '&#x3e;',
+			'icon-checkbox-checked' : '&#x3e;',
+			'icon-checkbox-partial' : '&#x3f;',
+			'icon-square' : '&#xe226;',
+			'icon-radio-unchecked' : '&#xe227;',
+			'icon-radio-checked' : '&#xe228;',
+			'icon-circle' : '&#xe229;',
+			'icon-signup' : '&#xe230;',
+			'icon-grid' : '&#x58;',
+			'icon-grid-view' : '&#x58;',
+			'icon-grid-2' : '&#x59;',
+			'icon-grid-view-2' : '&#x59;',
+			'icon-menu' : '&#x5a;',
+			'icon-list' : '&#x31;',
+			'icon-list-view' : '&#x31;',
+			'icon-list-2' : '&#xe231;',
+			'icon-menu-3' : '&#xe232;',
+			'icon-folder-open' : '&#x2d;',
+			'icon-folder' : '&#x2d;',
+			'icon-folder-close' : '&#x2e;',
+			'icon-folder-2' : '&#x2e;',
+			'icon-folder-plus' : '&#xe234;',
+			'icon-folder-minus' : '&#xe235;',
+			'icon-folder-3' : '&#xe236;',
+			'icon-folder-plus-2' : '&#xe237;',
+			'icon-folder-remove' : '&#xe238;',
+			'icon-file' : '&#xe016;',
+			'icon-file-2' : '&#xe239;',
+			'icon-file-add' : '&#x29;',
+			'icon-file-plus' : '&#x29;',
+			'icon-file-minus' : '&#xe017;',
+			'icon-file-check' : '&#xe240;',
+			'icon-file-remove' : '&#xe241;',
+			'icon-save-copy' : '&#xe018;',
+			'icon-copy' : '&#xe018;',
+			'icon-stack' : '&#xe242;',
+			'icon-tree' : '&#xe243;',
+			'icon-tree-2' : '&#xe244;',
+			'icon-paragraph-left' : '&#xe246;',
+			'icon-paragraph-center' : '&#xe247;',
+			'icon-paragraph-right' : '&#xe248;',
+			'icon-paragraph-justify' : '&#xe249;',
+			'icon-screen' : '&#xe01c;',
+			'icon-tablet' : '&#xe01d;',
+			'icon-mobile' : '&#xe01e;',
+			'icon-box-add' : '&#x51;',
+			'icon-box-remove' : '&#x52;',
+			'icon-download' : '&#xe021;',
+			'icon-upload' : '&#xe022;',
+			'icon-home' : '&#x21;',
+			'icon-home-2' : '&#xe250;',
+			'icon-out-2' : '&#xe024;',
+			'icon-new-tab' : '&#xe024;',
+			'icon-out-3' : '&#xe251;',
+			'icon-new-tab-2' : '&#xe251;',
+			'icon-link' : '&#xe252;',
+			'icon-picture' : '&#x2f;',
+			'icon-image' : '&#x2f;',
+			'icon-pictures' : '&#x30;',
+			'icon-images' : '&#x30;',
+			'icon-palette' : '&#xe014;',
+			'icon-color-palette' : '&#xe014;',
+			'icon-camera' : '&#x55;',
+			'icon-camera-2' : '&#xe015;',
+			'icon-video' : '&#xe015;',
+			'icon-play-2' : '&#x56;',
+			'icon-video-2' : '&#x56;',
+			'icon-youtube' : '&#x56;',
+			'icon-music' : '&#x57;',
+			'icon-user' : '&#x22;',
+			'icon-users' : '&#xe01f;',
+			'icon-vcard' : '&#x6d;',
+			'icon-address' : '&#x70;',
+			'icon-share-alt' : '&#x26;',
+			'icon-out' : '&#x26;',
+			'icon-enter' : '&#xe257;',
+			'icon-exit' : '&#xe258;',
+			'icon-comment' : '&#x24;',
+			'icon-comments' : '&#x24;',
+			'icon-comments-2' : '&#x25;',
+			'icon-quote' : '&#x60;',
+			'icon-quotes-left' : '&#x60;',
+			'icon-quote-2' : '&#x61;',
+			'icon-quotes-right' : '&#x61;',
+			'icon-quote-3' : '&#xe259;',
+			'icon-bubble-quote' : '&#xe259;',
+			'icon-phone' : '&#xe260;',
+			'icon-phone-2' : '&#xe261;',
+			'icon-envelope' : '&#x4d;',
+			'icon-mail' : '&#x4d;',
+			'icon-envelope-opened' : '&#x4e;',
+			'icon-mail-2' : '&#x4e;',
+			'icon-unarchive' : '&#x4f;',
+			'icon-drawer' : '&#x4f;',
+			'icon-archive' : '&#x50;',
+			'icon-drawer-2' : '&#x50;',
+			'icon-briefcase' : '&#xe020;',
+			'icon-tag' : '&#xe262;',
+			'icon-tag-2' : '&#xe263;',
+			'icon-tags' : '&#xe264;',
+			'icon-tags-2' : '&#xe265;',
+			'icon-options' : '&#x38;',
+			'icon-cog' : '&#x38;',
+			'icon-cogs' : '&#x37;',
+			'icon-screwdriver' : '&#x36;',
+			'icon-tools' : '&#x36;',
+			'icon-wrench' : '&#x3a;',
+			'icon-equalizer' : '&#x39;',
+			'icon-dashboard' : '&#x78;',
+			'icon-switch' : '&#xe266;',
+			'icon-filter' : '&#x54;',
+			'icon-purge' : '&#x4c;',
+			'icon-trash' : '&#x4c;',
+			'icon-checkedout' : '&#x23;',
+			'icon-lock' : '&#x23;',
+			'icon-locked' : '&#x23;',
+			'icon-unlock' : '&#xe267;',
+			'icon-key' : '&#x5f;',
+			'icon-support' : '&#x46;',
+			'icon-database' : '&#x62;',
+			'icon-scissors' : '&#xe268;',
+			'icon-health' : '&#x6a;',
+			'icon-wand' : '&#x6b;',
+			'icon-eye-open' : '&#x3c;',
+			'icon-eye' : '&#x3c;',
+			'icon-eye-close' : '&#xe269;',
+			'icon-eye-blocked' : '&#xe269;',
+			'icon-eye-2' : '&#xe269;',
+			'icon-clock' : '&#x6e;',
+			'icon-compass' : '&#x6f;',
+			'icon-broadcast' : '&#xe01b;',
+			'icon-connection' : '&#xe01b;',
+			'icon-wifi' : '&#xe01b;',
+			'icon-book' : '&#xe271;',
+			'icon-lightning' : '&#x79;',
+			'icon-flash' : '&#x79;',
+			'icon-print' : '&#xe013;',
+			'icon-printer' : '&#xe013;',
+			'icon-feed' : '&#x71;',
+			'icon-calendar' : '&#x43;',
+			'icon-calendar-2' : '&#x44;',
+			'icon-calendar-3' : '&#xe273;',
+			'icon-pie' : '&#x77;',
+			'icon-bars' : '&#x76;',
+			'icon-chart' : '&#x75;',
+			'icon-power-cord' : '&#x32;',
+			'icon-cube' : '&#x33;',
+			'icon-puzzle' : '&#x34;',
+			'icon-attachment' : '&#x72;',
+			'icon-paperclip' : '&#x72;',
+			'icon-flag-2' : '&#x72;',
+			'icon-lamp' : '&#x74;',
+			'icon-pin' : '&#x73;',
+			'icon-pushpin' : '&#x73;',
+			'icon-location' : '&#x63;',
+			'icon-shield' : '&#xe274;',
+			'icon-flag' : '&#x35;',
+			'icon-flag-3' : '&#xe275;',
+			'icon-bookmark' : '&#xe023;',
+			'icon-bookmark-2' : '&#xe276;',
+			'icon-heart' : '&#xe277;',
+			'icon-heart-2' : '&#xe278;',
+			'icon-thumbs-up' : '&#x5b;',
+			'icon-thumbs-down' : '&#x5c;',
+			'icon-unfeatured' : '&#x40;',
+			'icon-asterisk' : '&#x40;',
+			'icon-star-empty' : '&#x40;',
+			'icon-star-2' : '&#x41;',
+			'icon-featured' : '&#x42;',
+			'icon-default' : '&#x42;',
+			'icon-star' : '&#x42;',
+			'icon-smiley' : '&#xe279;',
+			'icon-smiley-happy' : '&#xe279;',
+			'icon-smiley-2' : '&#xe280;',
+			'icon-smiley-happy-2' : '&#xe280;',
+			'icon-smiley-sad' : '&#xe281;',
+			'icon-smiley-sad-2' : '&#xe282;',
+			'icon-smiley-neutral' : '&#xe283;',
+			'icon-smiley-neutral-2' : '&#xe284;',
+			'icon-cart' : '&#xe019;',
+			'icon-basket' : '&#xe01a;',
+			'icon-credit' : '&#xe286;',
+			'icon-credit-2' : '&#xe287;'
+		},
+		els = document.getElementsByTagName('*'),
+		i, attr, c, el;
+	for (i = 0; ; i += 1) {
+		el = els[i];
+		if(!el) {
+			break;
+		}
+		attr = el.getAttribute('data-icon');
+		if (attr) {
+			addIcon(el, attr);
+		}
+		c = el.className;
+		c = c.match(/icon-[^\s'"]+/);
+		if (c && icons[c[0]]) {
+			addIcon(el, icons[c[0]]);
+		}
+	}
+};
diff --git a/core/media/jui/js/jquery-migrate.js b/core/media/jui/js/jquery-migrate.js
new file mode 100644
index 00000000..89437ebe
--- /dev/null
+++ b/core/media/jui/js/jquery-migrate.js
@@ -0,0 +1,752 @@
+/*!
+ * jQuery Migrate - v1.4.1 - 2016-05-19
+ * Copyright jQuery Foundation and other contributors
+ */
+(function( jQuery, window, undefined ) {
+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
+
+
+jQuery.migrateVersion = "1.4.1";
+
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to true to prevent console output; migrateWarnings still maintained
+// jQuery.migrateMute = false;
+
+// Show a message on the console so devs know we're active
+if ( window.console && window.console.log ) {
+	window.console.log( "JQMIGRATE: Migrate is installed" +
+		( jQuery.migrateMute ? "" : " with logging active" ) +
+		", version " + jQuery.migrateVersion );
+}
+
+// Set to false to disable traces that appear with warnings
+if ( jQuery.migrateTrace === undefined ) {
+	jQuery.migrateTrace = true;
+}
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+	warnedAbout = {};
+	jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg) {
+	var console = window.console;
+	if ( !warnedAbout[ msg ] ) {
+		warnedAbout[ msg ] = true;
+		jQuery.migrateWarnings.push( msg );
+		if ( console && console.warn && !jQuery.migrateMute ) {
+			console.warn( "JQMIGRATE: " + msg );
+			if ( jQuery.migrateTrace && console.trace ) {
+				console.trace();
+			}
+		}
+	}
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+	if ( Object.defineProperty ) {
+		// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
+		// allow property to be overwritten in case some other plugin wants it
+		try {
+			Object.defineProperty( obj, prop, {
+				configurable: true,
+				enumerable: true,
+				get: function() {
+					migrateWarn( msg );
+					return value;
+				},
+				set: function( newValue ) {
+					migrateWarn( msg );
+					value = newValue;
+				}
+			});
+			return;
+		} catch( err ) {
+			// IE8 is a dope about Object.defineProperty, can't warn there
+		}
+	}
+
+	// Non-ES5 (or broken) browser; just set the property
+	jQuery._definePropertyBroken = true;
+	obj[ prop ] = value;
+}
+
+if ( document.compatMode === "BackCompat" ) {
+	// jQuery has never supported or tested Quirks Mode
+	migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
+	oldAttr = jQuery.attr,
+	valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
+		function() { return null; },
+	valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
+		function() { return undefined; },
+	rnoType = /^(?:input|button)$/i,
+	rnoAttrNodeType = /^[238]$/,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	ruseDefault = /^(?:checked|selected)$/i;
+
+// jQuery.attrFn
+migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
+
+jQuery.attr = function( elem, name, value, pass ) {
+	var lowerName = name.toLowerCase(),
+		nType = elem && elem.nodeType;
+
+	if ( pass ) {
+		// Since pass is used internally, we only warn for new jQuery
+		// versions where there isn't a pass arg in the formal params
+		if ( oldAttr.length < 4 ) {
+			migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
+		}
+		if ( elem && !rnoAttrNodeType.test( nType ) &&
+			(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
+			return jQuery( elem )[ name ]( value );
+		}
+	}
+
+	// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
+	// for disconnected elements we don't warn on $( "<button>", { type: "button" } ).
+	if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
+		migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
+	}
+
+	// Restore boolHook for boolean property/attribute synchronization
+	if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
+		jQuery.attrHooks[ lowerName ] = {
+			get: function( elem, name ) {
+				// Align boolean attributes with corresponding properties
+				// Fall back to attribute presence where some booleans are not supported
+				var attrNode,
+					property = jQuery.prop( elem, name );
+				return property === true || typeof property !== "boolean" &&
+					( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+
+					name.toLowerCase() :
+					undefined;
+			},
+			set: function( elem, value, name ) {
+				var propName;
+				if ( value === false ) {
+					// Remove boolean attributes when set to false
+					jQuery.removeAttr( elem, name );
+				} else {
+					// value is true since we know at this point it's type boolean and not false
+					// Set boolean attributes to the same name and set the DOM property
+					propName = jQuery.propFix[ name ] || name;
+					if ( propName in elem ) {
+						// Only set the IDL specifically if it already exists on the element
+						elem[ propName ] = true;
+					}
+
+					elem.setAttribute( name, name.toLowerCase() );
+				}
+				return name;
+			}
+		};
+
+		// Warn only for attributes that can remain distinct from their properties post-1.9
+		if ( ruseDefault.test( lowerName ) ) {
+			migrateWarn( "jQuery.fn.attr('" + lowerName + "') might use property instead of attribute" );
+		}
+	}
+
+	return oldAttr.call( jQuery, elem, name, value );
+};
+
+// attrHooks: value
+jQuery.attrHooks.value = {
+	get: function( elem, name ) {
+		var nodeName = ( elem.nodeName || "" ).toLowerCase();
+		if ( nodeName === "button" ) {
+			return valueAttrGet.apply( this, arguments );
+		}
+		if ( nodeName !== "input" && nodeName !== "option" ) {
+			migrateWarn("jQuery.fn.attr('value') no longer gets properties");
+		}
+		return name in elem ?
+			elem.value :
+			null;
+	},
+	set: function( elem, value ) {
+		var nodeName = ( elem.nodeName || "" ).toLowerCase();
+		if ( nodeName === "button" ) {
+			return valueAttrSet.apply( this, arguments );
+		}
+		if ( nodeName !== "input" && nodeName !== "option" ) {
+			migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
+		}
+		// Does not return so that setAttribute is also used
+		elem.value = value;
+	}
+};
+
+
+var matched, browser,
+	oldInit = jQuery.fn.init,
+	oldFind = jQuery.find,
+	oldParseJSON = jQuery.parseJSON,
+	rspaceAngle = /^\s*</,
+	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
+	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,
+	// Note: XSS check is done below after string is trimmed
+	rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
+
+// $(html) "looks like html" rule change
+jQuery.fn.init = function( selector, context, rootjQuery ) {
+	var match, ret;
+
+	if ( selector && typeof selector === "string" ) {
+		if ( !jQuery.isPlainObject( context ) &&
+				(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
+
+			// This is an HTML string according to the "old" rules; is it still?
+			if ( !rspaceAngle.test( selector ) ) {
+				migrateWarn("$(html) HTML strings must start with '<' character");
+			}
+			if ( match[ 3 ] ) {
+				migrateWarn("$(html) HTML text after last tag is ignored");
+			}
+
+			// Consistently reject any HTML-like string starting with a hash (gh-9521)
+			// Note that this may break jQuery 1.6.x code that otherwise would work.
+			if ( match[ 0 ].charAt( 0 ) === "#" ) {
+				migrateWarn("HTML string cannot start with a '#' character");
+				jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+			}
+
+			// Now process using loose rules; let pre-1.8 play too
+			// Is this a jQuery context? parseHTML expects a DOM element (#178)
+			if ( context && context.context && context.context.nodeType ) {
+				context = context.context;
+			}
+
+			if ( jQuery.parseHTML ) {
+				return oldInit.call( this,
+						jQuery.parseHTML( match[ 2 ], context && context.ownerDocument ||
+							context || document, true ), context, rootjQuery );
+			}
+		}
+	}
+
+	ret = oldInit.apply( this, arguments );
+
+	// Fill in selector and context properties so .live() works
+	if ( selector && selector.selector !== undefined ) {
+		// A jQuery object, copy its properties
+		ret.selector = selector.selector;
+		ret.context = selector.context;
+
+	} else {
+		ret.selector = typeof selector === "string" ? selector : "";
+		if ( selector ) {
+			ret.context = selector.nodeType? selector : context || document;
+		}
+	}
+
+	return ret;
+};
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.find = function( selector ) {
+	var args = Array.prototype.slice.call( arguments );
+
+	// Support: PhantomJS 1.x
+	// String#match fails to match when used with a //g RegExp, only on some strings
+	if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
+
+		// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
+		// First see if qS thinks it's a valid selector, if so avoid a false positive
+		try {
+			document.querySelector( selector );
+		} catch ( err1 ) {
+
+			// Didn't *look* valid to qSA, warn and try quoting what we think is the value
+			selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
+				return "[" + attr + op + "\"" + value + "\"]";
+			} );
+
+			// If the regexp *may* have created an invalid selector, don't update it
+			// Note that there may be false alarms if selector uses jQuery extensions
+			try {
+				document.querySelector( selector );
+				migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
+				args[ 0 ] = selector;
+			} catch ( err2 ) {
+				migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
+			}
+		}
+	}
+
+	return oldFind.apply( this, args );
+};
+
+// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
+var findProp;
+for ( findProp in oldFind ) {
+	if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
+		jQuery.find[ findProp ] = oldFind[ findProp ];
+	}
+}
+
+// Let $.parseJSON(falsy_value) return null
+jQuery.parseJSON = function( json ) {
+	if ( !json ) {
+		migrateWarn("jQuery.parseJSON requires a valid JSON string");
+		return null;
+	}
+	return oldParseJSON.apply( this, arguments );
+};
+
+jQuery.uaMatch = function( ua ) {
+	ua = ua.toLowerCase();
+
+	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+		/(msie) ([\w.]+)/.exec( ua ) ||
+		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+		[];
+
+	return {
+		browser: match[ 1 ] || "",
+		version: match[ 2 ] || "0"
+	};
+};
+
+// Don't clobber any existing jQuery.browser in case it's different
+if ( !jQuery.browser ) {
+	matched = jQuery.uaMatch( navigator.userAgent );
+	browser = {};
+
+	if ( matched.browser ) {
+		browser[ matched.browser ] = true;
+		browser.version = matched.version;
+	}
+
+	// Chrome is Webkit, but Webkit is also Safari.
+	if ( browser.chrome ) {
+		browser.webkit = true;
+	} else if ( browser.webkit ) {
+		browser.safari = true;
+	}
+
+	jQuery.browser = browser;
+}
+
+// Warn if the code tries to get jQuery.browser
+migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
+
+// jQuery.boxModel deprecated in 1.3, jQuery.support.boxModel deprecated in 1.7
+jQuery.boxModel = jQuery.support.boxModel = (document.compatMode === "CSS1Compat");
+migrateWarnProp( jQuery, "boxModel", jQuery.boxModel, "jQuery.boxModel is deprecated" );
+migrateWarnProp( jQuery.support, "boxModel", jQuery.support.boxModel, "jQuery.support.boxModel is deprecated" );
+
+jQuery.sub = function() {
+	function jQuerySub( selector, context ) {
+		return new jQuerySub.fn.init( selector, context );
+	}
+	jQuery.extend( true, jQuerySub, this );
+	jQuerySub.superclass = this;
+	jQuerySub.fn = jQuerySub.prototype = this();
+	jQuerySub.fn.constructor = jQuerySub;
+	jQuerySub.sub = this.sub;
+	jQuerySub.fn.init = function init( selector, context ) {
+		var instance = jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		return instance instanceof jQuerySub ?
+			instance :
+			jQuerySub( instance );
+	};
+	jQuerySub.fn.init.prototype = jQuerySub.fn;
+	var rootjQuerySub = jQuerySub(document);
+	migrateWarn( "jQuery.sub() is deprecated" );
+	return jQuerySub;
+};
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
+	return this.length;
+};
+
+
+var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+if ( jQuery.swap ) {
+	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+		if ( oldHook ) {
+			jQuery.cssHooks[ name ].get = function() {
+				var ret;
+
+				internalSwapCall = true;
+				ret = oldHook.apply( this, arguments );
+				internalSwapCall = false;
+				return ret;
+			};
+		}
+	});
+}
+
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	if ( !internalSwapCall ) {
+		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+	}
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+// Ensure that $.ajax gets the new parseJSON defined in core.js
+jQuery.ajaxSetup({
+	converters: {
+		"text json": jQuery.parseJSON
+	}
+});
+
+
+var oldFnData = jQuery.fn.data;
+
+jQuery.fn.data = function( name ) {
+	var ret, evt,
+		elem = this[0];
+
+	// Handles 1.7 which has this behavior and 1.8 which doesn't
+	if ( elem && name === "events" && arguments.length === 1 ) {
+		ret = jQuery.data( elem, name );
+		evt = jQuery._data( elem, name );
+		if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
+			migrateWarn("Use of jQuery.fn.data('events') is deprecated");
+			return evt;
+		}
+	}
+	return oldFnData.apply( this, arguments );
+};
+
+
+var rscriptType = /\/(java|ecma)script/i;
+
+// Since jQuery.clean is used internally on older versions, we only shim if it's missing
+if ( !jQuery.clean ) {
+	jQuery.clean = function( elems, context, fragment, scripts ) {
+		// Set context per 1.8 logic
+		context = context || document;
+		context = !context.nodeType && context[0] || context;
+		context = context.ownerDocument || context;
+
+		migrateWarn("jQuery.clean() is deprecated");
+
+		var i, elem, handleScript, jsTags,
+			ret = [];
+
+		jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
+
+		// Complex logic lifted directly from jQuery 1.8
+		if ( fragment ) {
+			// Special handling of each script element
+			handleScript = function( elem ) {
+				// Check if we consider it executable
+				if ( !elem.type || rscriptType.test( elem.type ) ) {
+					// Detach the script and store it in the scripts array (if provided) or the fragment
+					// Return truthy to indicate that it has been handled
+					return scripts ?
+						scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+						fragment.appendChild( elem );
+				}
+			};
+
+			for ( i = 0; (elem = ret[i]) != null; i++ ) {
+				// Check if we're done after handling an executable script
+				if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+					// Append to fragment and handle embedded scripts
+					fragment.appendChild( elem );
+					if ( typeof elem.getElementsByTagName !== "undefined" ) {
+						// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+						jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+						// Splice the scripts into ret after their former ancestor and advance our index beyond them
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+						i += jsTags.length;
+					}
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var eventAdd = jQuery.event.add,
+	eventRemove = jQuery.event.remove,
+	eventTrigger = jQuery.event.trigger,
+	oldToggle = jQuery.fn.toggle,
+	oldLive = jQuery.fn.live,
+	oldDie = jQuery.fn.die,
+	oldLoad = jQuery.fn.load,
+	ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
+	rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
+	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+	hoverHack = function( events ) {
+		if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
+			return events;
+		}
+		if ( rhoverHack.test( events ) ) {
+			migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
+		}
+		return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+	};
+
+// Event props removed in 1.9, put them back if needed; no practical way to warn them
+if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
+	jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
+}
+
+// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
+if ( jQuery.event.dispatch ) {
+	migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
+}
+
+// Support for 'hover' pseudo-event and ajax event warnings
+jQuery.event.add = function( elem, types, handler, data, selector ){
+	if ( elem !== document && rajaxEvent.test( types ) ) {
+		migrateWarn( "AJAX events should be attached to document: " + types );
+	}
+	eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
+};
+jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
+	eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
+};
+
+jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+	jQuery.fn[ name ] = function() {
+		var args = Array.prototype.slice.call( arguments, 0 );
+
+		// If this is an ajax load() the first arg should be the string URL;
+		// technically this could also be the "Anything" arg of the event .load()
+		// which just goes to show why this dumb signature has been deprecated!
+		// jQuery custom builds that exclude the Ajax module justifiably die here.
+		if ( name === "load" && typeof args[ 0 ] === "string" ) {
+			return oldLoad.apply( this, args );
+		}
+
+		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+		args.splice( 0, 0, name );
+		if ( arguments.length ) {
+			return this.bind.apply( this, args );
+		}
+
+		// Use .triggerHandler here because:
+		// - load and unload events don't need to bubble, only applied to window or image
+		// - error event should not bubble to window, although it does pre-1.7
+		// See http://bugs.jquery.com/ticket/11820
+		this.triggerHandler.apply( this, args );
+		return this;
+	};
+
+});
+
+jQuery.fn.toggle = function( fn, fn2 ) {
+
+	// Don't mess with animation or css toggles
+	if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
+		return oldToggle.apply( this, arguments );
+	}
+	migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
+
+	// Save reference to arguments for access in closure
+	var args = arguments,
+		guid = fn.guid || jQuery.guid++,
+		i = 0,
+		toggler = function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		};
+
+	// link all the functions, so any of them can unbind this click handler
+	toggler.guid = guid;
+	while ( i < args.length ) {
+		args[ i++ ].guid = guid;
+	}
+
+	return this.click( toggler );
+};
+
+jQuery.fn.live = function( types, data, fn ) {
+	migrateWarn("jQuery.fn.live() is deprecated");
+	if ( oldLive ) {
+		return oldLive.apply( this, arguments );
+	}
+	jQuery( this.context ).on( types, this.selector, data, fn );
+	return this;
+};
+
+jQuery.fn.die = function( types, fn ) {
+	migrateWarn("jQuery.fn.die() is deprecated");
+	if ( oldDie ) {
+		return oldDie.apply( this, arguments );
+	}
+	jQuery( this.context ).off( types, this.selector || "**", fn );
+	return this;
+};
+
+// Turn global events into document-triggered events
+jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
+	if ( !elem && !rajaxEvent.test( event ) ) {
+		migrateWarn( "Global events are undocumented and deprecated" );
+	}
+	return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
+};
+jQuery.each( ajaxEvents.split("|"),
+	function( _, name ) {
+		jQuery.event.special[ name ] = {
+			setup: function() {
+				var elem = this;
+
+				// The document needs no shimming; must be !== for oldIE
+				if ( elem !== document ) {
+					jQuery.event.add( document, name + "." + jQuery.guid, function() {
+						jQuery.event.trigger( name, Array.prototype.slice.call( arguments, 1 ), elem, true );
+					});
+					jQuery._data( this, name, jQuery.guid++ );
+				}
+				return false;
+			},
+			teardown: function() {
+				if ( this !== document ) {
+					jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
+				}
+				return false;
+			}
+		};
+	}
+);
+
+jQuery.event.special.ready = {
+	setup: function() {
+		if ( this === document ) {
+			migrateWarn( "'ready' event is deprecated" );
+		}
+	}
+};
+
+var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
+	oldFnFind = jQuery.fn.find;
+
+jQuery.fn.andSelf = function() {
+	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+	return oldSelf.apply( this, arguments );
+};
+
+jQuery.fn.find = function( selector ) {
+	var ret = oldFnFind.apply( this, arguments );
+	ret.context = this.context;
+	ret.selector = this.selector ? this.selector + " " + selector : selector;
+	return ret;
+};
+
+
+// jQuery 1.6 did not support Callbacks, do not warn there
+if ( jQuery.Callbacks ) {
+
+	var oldDeferred = jQuery.Deferred,
+		tuples = [
+			// action, add listener, callbacks, .then handlers, final state
+			[ "resolve", "done", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "resolved" ],
+			[ "reject", "fail", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "rejected" ],
+			[ "notify", "progress", jQuery.Callbacks("memory"),
+				jQuery.Callbacks("memory") ]
+		];
+
+	jQuery.Deferred = function( func ) {
+		var deferred = oldDeferred(),
+			promise = deferred.promise();
+
+		deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+			var fns = arguments;
+
+			migrateWarn( "deferred.pipe() is deprecated" );
+
+			return jQuery.Deferred(function( newDefer ) {
+				jQuery.each( tuples, function( i, tuple ) {
+					var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+					// deferred.done(function() { bind to newDefer or newDefer.resolve })
+					// deferred.fail(function() { bind to newDefer or newDefer.reject })
+					// deferred.progress(function() { bind to newDefer or newDefer.notify })
+					deferred[ tuple[1] ](function() {
+						var returned = fn && fn.apply( this, arguments );
+						if ( returned && jQuery.isFunction( returned.promise ) ) {
+							returned.promise()
+								.done( newDefer.resolve )
+								.fail( newDefer.reject )
+								.progress( newDefer.notify );
+						} else {
+							newDefer[ tuple[ 0 ] + "With" ](
+								this === promise ? newDefer.promise() : this,
+								fn ? [ returned ] : arguments
+							);
+						}
+					});
+				});
+				fns = null;
+			}).promise();
+
+		};
+
+		deferred.isResolved = function() {
+			migrateWarn( "deferred.isResolved is deprecated" );
+			return deferred.state() === "resolved";
+		};
+
+		deferred.isRejected = function() {
+			migrateWarn( "deferred.isRejected is deprecated" );
+			return deferred.state() === "rejected";
+		};
+
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		return deferred;
+	};
+
+}
+
+})( jQuery, window );
diff --git a/core/media/jui/js/jquery-migrate.min.js b/core/media/jui/js/jquery-migrate.min.js
new file mode 100644
index 00000000..2e84fcb9
--- /dev/null
+++ b/core/media/jui/js/jquery-migrate.min.js
@@ -0,0 +1,2 @@
+/*! jQuery Migrate v1.4.1 | (c) jQuery Foundation and other contributors | jquery.org/license */
+"undefined"==typeof jQuery.migrateMute&&(jQuery.migrateMute=!0),function(a,b,c){function d(c){var d=b.console;f[c]||(f[c]=!0,a.migrateWarnings.push(c),d&&d.warn&&!a.migrateMute&&(d.warn("JQMIGRATE: "+c),a.migrateTrace&&d.trace&&d.trace()))}function e(b,c,e,f){if(Object.defineProperty)try{return void Object.defineProperty(b,c,{configurable:!0,enumerable:!0,get:function(){return d(f),e},set:function(a){d(f),e=a}})}catch(g){}a._definePropertyBroken=!0,b[c]=e}a.migrateVersion="1.4.1";var f={};a.migrateWarnings=[],b.console&&b.console.log&&b.console.log("JQMIGRATE: Migrate is installed"+(a.migrateMute?"":" with logging active")+", version "+a.migrateVersion),a.migrateTrace===c&&(a.migrateTrace=!0),a.migrateReset=function(){f={},a.migrateWarnings.length=0},"BackCompat"===document.compatMode&&d("jQuery is not compatible with Quirks Mode");var g=a("<input/>",{size:1}).attr("size")&&a.attrFn,h=a.attr,i=a.attrHooks.value&&a.attrHooks.value.get||function(){return null},j=a.attrHooks.value&&a.attrHooks.value.set||function(){return c},k=/^(?:input|button)$/i,l=/^[238]$/,m=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,n=/^(?:checked|selected)$/i;e(a,"attrFn",g||{},"jQuery.attrFn is deprecated"),a.attr=function(b,e,f,i){var j=e.toLowerCase(),o=b&&b.nodeType;return i&&(h.length<4&&d("jQuery.fn.attr( props, pass ) is deprecated"),b&&!l.test(o)&&(g?e in g:a.isFunction(a.fn[e])))?a(b)[e](f):("type"===e&&f!==c&&k.test(b.nodeName)&&b.parentNode&&d("Can't change the 'type' of an input or button in IE 6/7/8"),!a.attrHooks[j]&&m.test(j)&&(a.attrHooks[j]={get:function(b,d){var e,f=a.prop(b,d);return f===!0||"boolean"!=typeof f&&(e=b.getAttributeNode(d))&&e.nodeValue!==!1?d.toLowerCase():c},set:function(b,c,d){var e;return c===!1?a.removeAttr(b,d):(e=a.propFix[d]||d,e in b&&(b[e]=!0),b.setAttribute(d,d.toLowerCase())),d}},n.test(j)&&d("jQuery.fn.attr('"+j+"') might use property instead of attribute")),h.call(a,b,e,f))},a.attrHooks.value={get:function(a,b){var c=(a.nodeName||"").toLowerCase();return"button"===c?i.apply(this,arguments):("input"!==c&&"option"!==c&&d("jQuery.fn.attr('value') no longer gets properties"),b in a?a.value:null)},set:function(a,b){var c=(a.nodeName||"").toLowerCase();return"button"===c?j.apply(this,arguments):("input"!==c&&"option"!==c&&d("jQuery.fn.attr('value', val) no longer sets properties"),void(a.value=b))}};var o,p,q=a.fn.init,r=a.find,s=a.parseJSON,t=/^\s*</,u=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,v=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,w=/^([^<]*)(<[\w\W]+>)([^>]*)$/;a.fn.init=function(b,e,f){var g,h;return b&&"string"==typeof b&&!a.isPlainObject(e)&&(g=w.exec(a.trim(b)))&&g[0]&&(t.test(b)||d("$(html) HTML strings must start with '<' character"),g[3]&&d("$(html) HTML text after last tag is ignored"),"#"===g[0].charAt(0)&&(d("HTML string cannot start with a '#' character"),a.error("JQMIGRATE: Invalid selector string (XSS)")),e&&e.context&&e.context.nodeType&&(e=e.context),a.parseHTML)?q.call(this,a.parseHTML(g[2],e&&e.ownerDocument||e||document,!0),e,f):(h=q.apply(this,arguments),b&&b.selector!==c?(h.selector=b.selector,h.context=b.context):(h.selector="string"==typeof b?b:"",b&&(h.context=b.nodeType?b:e||document)),h)},a.fn.init.prototype=a.fn,a.find=function(a){var b=Array.prototype.slice.call(arguments);if("string"==typeof a&&u.test(a))try{document.querySelector(a)}catch(c){a=a.replace(v,function(a,b,c,d){return"["+b+c+'"'+d+'"]'});try{document.querySelector(a),d("Attribute selector with '#' must be quoted: "+b[0]),b[0]=a}catch(e){d("Attribute selector with '#' was not fixed: "+b[0])}}return r.apply(this,b)};var x;for(x in r)Object.prototype.hasOwnProperty.call(r,x)&&(a.find[x]=r[x]);a.parseJSON=function(a){return a?s.apply(this,arguments):(d("jQuery.parseJSON requires a valid JSON string"),null)},a.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a.browser||(o=a.uaMatch(navigator.userAgent),p={},o.browser&&(p[o.browser]=!0,p.version=o.version),p.chrome?p.webkit=!0:p.webkit&&(p.safari=!0),a.browser=p),e(a,"browser",a.browser,"jQuery.browser is deprecated"),a.boxModel=a.support.boxModel="CSS1Compat"===document.compatMode,e(a,"boxModel",a.boxModel,"jQuery.boxModel is deprecated"),e(a.support,"boxModel",a.support.boxModel,"jQuery.support.boxModel is deprecated"),a.sub=function(){function b(a,c){return new b.fn.init(a,c)}a.extend(!0,b,this),b.superclass=this,b.fn=b.prototype=this(),b.fn.constructor=b,b.sub=this.sub,b.fn.init=function(d,e){var f=a.fn.init.call(this,d,e,c);return f instanceof b?f:b(f)},b.fn.init.prototype=b.fn;var c=b(document);return d("jQuery.sub() is deprecated"),b},a.fn.size=function(){return d("jQuery.fn.size() is deprecated; use the .length property"),this.length};var y=!1;a.swap&&a.each(["height","width","reliableMarginRight"],function(b,c){var d=a.cssHooks[c]&&a.cssHooks[c].get;d&&(a.cssHooks[c].get=function(){var a;return y=!0,a=d.apply(this,arguments),y=!1,a})}),a.swap=function(a,b,c,e){var f,g,h={};y||d("jQuery.swap() is undocumented and deprecated");for(g in b)h[g]=a.style[g],a.style[g]=b[g];f=c.apply(a,e||[]);for(g in b)a.style[g]=h[g];return f},a.ajaxSetup({converters:{"text json":a.parseJSON}});var z=a.fn.data;a.fn.data=function(b){var e,f,g=this[0];return!g||"events"!==b||1!==arguments.length||(e=a.data(g,b),f=a._data(g,b),e!==c&&e!==f||f===c)?z.apply(this,arguments):(d("Use of jQuery.fn.data('events') is deprecated"),f)};var A=/\/(java|ecma)script/i;a.clean||(a.clean=function(b,c,e,f){c=c||document,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,d("jQuery.clean() is deprecated");var g,h,i,j,k=[];if(a.merge(k,a.buildFragment(b,c).childNodes),e)for(i=function(a){return!a.type||A.test(a.type)?f?f.push(a.parentNode?a.parentNode.removeChild(a):a):e.appendChild(a):void 0},g=0;null!=(h=k[g]);g++)a.nodeName(h,"script")&&i(h)||(e.appendChild(h),"undefined"!=typeof h.getElementsByTagName&&(j=a.grep(a.merge([],h.getElementsByTagName("script")),i),k.splice.apply(k,[g+1,0].concat(j)),g+=j.length));return k});var B=a.event.add,C=a.event.remove,D=a.event.trigger,E=a.fn.toggle,F=a.fn.live,G=a.fn.die,H=a.fn.load,I="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",J=new RegExp("\\b(?:"+I+")\\b"),K=/(?:^|\s)hover(\.\S+|)\b/,L=function(b){return"string"!=typeof b||a.event.special.hover?b:(K.test(b)&&d("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),b&&b.replace(K,"mouseenter$1 mouseleave$1"))};a.event.props&&"attrChange"!==a.event.props[0]&&a.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),a.event.dispatch&&e(a.event,"handle",a.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),a.event.add=function(a,b,c,e,f){a!==document&&J.test(b)&&d("AJAX events should be attached to document: "+b),B.call(this,a,L(b||""),c,e,f)},a.event.remove=function(a,b,c,d,e){C.call(this,a,L(b)||"",c,d,e)},a.each(["load","unload","error"],function(b,c){a.fn[c]=function(){var a=Array.prototype.slice.call(arguments,0);return"load"===c&&"string"==typeof a[0]?H.apply(this,a):(d("jQuery.fn."+c+"() is deprecated"),a.splice(0,0,c),arguments.length?this.bind.apply(this,a):(this.triggerHandler.apply(this,a),this))}}),a.fn.toggle=function(b,c){if(!a.isFunction(b)||!a.isFunction(c))return E.apply(this,arguments);d("jQuery.fn.toggle(handler, handler...) is deprecated");var e=arguments,f=b.guid||a.guid++,g=0,h=function(c){var d=(a._data(this,"lastToggle"+b.guid)||0)%g;return a._data(this,"lastToggle"+b.guid,d+1),c.preventDefault(),e[d].apply(this,arguments)||!1};for(h.guid=f;g<e.length;)e[g++].guid=f;return this.click(h)},a.fn.live=function(b,c,e){return d("jQuery.fn.live() is deprecated"),F?F.apply(this,arguments):(a(this.context).on(b,this.selector,c,e),this)},a.fn.die=function(b,c){return d("jQuery.fn.die() is deprecated"),G?G.apply(this,arguments):(a(this.context).off(b,this.selector||"**",c),this)},a.event.trigger=function(a,b,c,e){return c||J.test(a)||d("Global events are undocumented and deprecated"),D.call(this,a,b,c||document,e)},a.each(I.split("|"),function(b,c){a.event.special[c]={setup:function(){var b=this;return b!==document&&(a.event.add(document,c+"."+a.guid,function(){a.event.trigger(c,Array.prototype.slice.call(arguments,1),b,!0)}),a._data(this,c,a.guid++)),!1},teardown:function(){return this!==document&&a.event.remove(document,c+"."+a._data(this,c)),!1}}}),a.event.special.ready={setup:function(){this===document&&d("'ready' event is deprecated")}};var M=a.fn.andSelf||a.fn.addBack,N=a.fn.find;if(a.fn.andSelf=function(){return d("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),M.apply(this,arguments)},a.fn.find=function(a){var b=N.apply(this,arguments);return b.context=this.context,b.selector=this.selector?this.selector+" "+a:a,b},a.Callbacks){var O=a.Deferred,P=[["resolve","done",a.Callbacks("once memory"),a.Callbacks("once memory"),"resolved"],["reject","fail",a.Callbacks("once memory"),a.Callbacks("once memory"),"rejected"],["notify","progress",a.Callbacks("memory"),a.Callbacks("memory")]];a.Deferred=function(b){var c=O(),e=c.promise();return c.pipe=e.pipe=function(){var b=arguments;return d("deferred.pipe() is deprecated"),a.Deferred(function(d){a.each(P,function(f,g){var h=a.isFunction(b[f])&&b[f];c[g[1]](function(){var b=h&&h.apply(this,arguments);b&&a.isFunction(b.promise)?b.promise().done(d.resolve).fail(d.reject).progress(d.notify):d[g[0]+"With"](this===e?d.promise():this,h?[b]:arguments)})}),b=null}).promise()},c.isResolved=function(){return d("deferred.isResolved is deprecated"),"resolved"===c.state()},c.isRejected=function(){return d("deferred.isRejected is deprecated"),"rejected"===c.state()},b&&b.call(c,c),c}}}(jQuery,window);
\ No newline at end of file
diff --git a/core/media/jui/js/jquery-noconflict.js b/core/media/jui/js/jquery-noconflict.js
new file mode 100644
index 00000000..f4b1f44e
--- /dev/null
+++ b/core/media/jui/js/jquery-noconflict.js
@@ -0,0 +1 @@
+jQuery.noConflict();
diff --git a/core/media/jui/js/jquery.autocomplete.js b/core/media/jui/js/jquery.autocomplete.js
new file mode 100644
index 00000000..9fc18b25
--- /dev/null
+++ b/core/media/jui/js/jquery.autocomplete.js
@@ -0,0 +1,998 @@
+/**
+*  Ajax Autocomplete for jQuery, version 1.4.7
+*  (c) 2017 Tomas Kirda
+*
+*  Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
+*  For details, see the web site: https://github.com/devbridge/jQuery-Autocomplete
+*/
+
+/*jslint  browser: true, white: true, single: true, this: true, multivar: true */
+/*global define, window, document, jQuery, exports, require */
+
+// Expose plugin as an AMD module if AMD loader is present:
+(function (factory) {
+    "use strict";
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object' && typeof require === 'function') {
+        // Browserify
+        factory(require('jquery'));
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+    'use strict';
+
+    var
+        utils = (function () {
+            return {
+                escapeRegExChars: function (value) {
+                    return value.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
+                },
+                createNode: function (containerClass) {
+                    var div = document.createElement('div');
+                    div.className = containerClass;
+                    div.style.position = 'absolute';
+                    div.style.display = 'none';
+                    return div;
+                }
+            };
+        }()),
+
+        keys = {
+            ESC: 27,
+            TAB: 9,
+            RETURN: 13,
+            LEFT: 37,
+            UP: 38,
+            RIGHT: 39,
+            DOWN: 40
+        },
+
+        noop = $.noop;
+
+    function Autocomplete(el, options) {
+        var that = this;
+
+        // Shared variables:
+        that.element = el;
+        that.el = $(el);
+        that.suggestions = [];
+        that.badQueries = [];
+        that.selectedIndex = -1;
+        that.currentValue = that.element.value;
+        that.timeoutId = null;
+        that.cachedResponse = {};
+        that.onChangeTimeout = null;
+        that.onChange = null;
+        that.isLocal = false;
+        that.suggestionsContainer = null;
+        that.noSuggestionsContainer = null;
+        that.options = $.extend({}, Autocomplete.defaults, options);
+        that.classes = {
+            selected: 'autocomplete-selected',
+            suggestion: 'autocomplete-suggestion'
+        };
+        that.hint = null;
+        that.hintValue = '';
+        that.selection = null;
+
+        // Initialize and set options:
+        that.initialize();
+        that.setOptions(options);
+    }
+
+    Autocomplete.utils = utils;
+
+    $.Autocomplete = Autocomplete;
+
+    Autocomplete.defaults = {
+            ajaxSettings: {},
+            autoSelectFirst: false,
+            appendTo: 'body',
+            serviceUrl: null,
+            lookup: null,
+            onSelect: null,
+            width: 'auto',
+            minChars: 1,
+            maxHeight: 300,
+            deferRequestBy: 0,
+            params: {},
+            formatResult: _formatResult,
+            formatGroup: _formatGroup,
+            delimiter: null,
+            zIndex: 9999,
+            type: 'GET',
+            noCache: false,
+            onSearchStart: noop,
+            onSearchComplete: noop,
+            onSearchError: noop,
+            preserveInput: false,
+            containerClass: 'autocomplete-suggestions',
+            tabDisabled: false,
+            dataType: 'text',
+            currentRequest: null,
+            triggerSelectOnValidInput: true,
+            preventBadQueries: true,
+            lookupFilter: _lookupFilter,
+            paramName: 'query',
+            transformResult: _transformResult,
+            showNoSuggestionNotice: false,
+            noSuggestionNotice: 'No results',
+            orientation: 'bottom',
+            forceFixPosition: false
+    };
+
+    function _lookupFilter(suggestion, originalQuery, queryLowerCase) {
+        return suggestion.value.toLowerCase().indexOf(queryLowerCase) !== -1;
+    };
+
+    function _transformResult(response) {
+        return typeof response === 'string' ? $.parseJSON(response) : response;
+    };
+
+    function _formatResult(suggestion, currentValue) {
+        // Do not replace anything if the current value is empty
+        if (!currentValue) {
+            return suggestion.value;
+        }
+
+        var pattern = '(' + utils.escapeRegExChars(currentValue) + ')';
+
+        return suggestion.value
+            .replace(new RegExp(pattern, 'gi'), '<strong>$1<\/strong>')
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/&lt;(\/?strong)&gt;/g, '<$1>');
+    };
+
+    function _formatGroup(suggestion, category) {
+        return '<div class="autocomplete-group">' + category + '</div>';
+    };
+
+    Autocomplete.prototype = {
+
+        initialize: function () {
+            var that = this,
+                suggestionSelector = '.' + that.classes.suggestion,
+                selected = that.classes.selected,
+                options = that.options,
+                container;
+
+            // Remove autocomplete attribute to prevent native suggestions:
+            that.element.setAttribute('autocomplete', 'off');
+
+            // html() deals with many types: htmlString or Element or Array or jQuery
+            that.noSuggestionsContainer = $('<div class="autocomplete-no-suggestion"></div>')
+                                          .html(this.options.noSuggestionNotice).get(0);
+
+            that.suggestionsContainer = Autocomplete.utils.createNode(options.containerClass);
+
+            container = $(that.suggestionsContainer);
+
+            container.appendTo(options.appendTo || 'body');
+
+            // Only set width if it was provided:
+            if (options.width !== 'auto') {
+                container.css('width', options.width);
+            }
+
+            // Listen for mouse over event on suggestions list:
+            container.on('mouseover.autocomplete', suggestionSelector, function () {
+                that.activate($(this).data('index'));
+            });
+
+            // Deselect active element when mouse leaves suggestions container:
+            container.on('mouseout.autocomplete', function () {
+                that.selectedIndex = -1;
+                container.children('.' + selected).removeClass(selected);
+            });
+
+            // Listen for click event on suggestions list:
+            container.on('click.autocomplete', suggestionSelector, function () {
+                that.select($(this).data('index'));
+            });
+
+            container.on('click.autocomplete', function () {
+                clearTimeout(that.blurTimeoutId);
+            })
+
+            that.fixPositionCapture = function () {
+                if (that.visible) {
+                    that.fixPosition();
+                }
+            };
+
+            $(window).on('resize.autocomplete', that.fixPositionCapture);
+
+            that.el.on('keydown.autocomplete', function (e) { that.onKeyPress(e); });
+            that.el.on('keyup.autocomplete', function (e) { that.onKeyUp(e); });
+            that.el.on('blur.autocomplete', function () { that.onBlur(); });
+            that.el.on('focus.autocomplete', function () { that.onFocus(); });
+            that.el.on('change.autocomplete', function (e) { that.onKeyUp(e); });
+            that.el.on('input.autocomplete', function (e) { that.onKeyUp(e); });
+        },
+
+        onFocus: function () {
+            var that = this;
+
+            that.fixPosition();
+
+            if (that.el.val().length >= that.options.minChars) {
+                that.onValueChange();
+            }
+        },
+
+        onBlur: function () {
+            var that = this;
+
+            // If user clicked on a suggestion, hide() will
+            // be canceled, otherwise close suggestions
+            that.blurTimeoutId = setTimeout(function () {
+                that.hide();
+            }, 200);
+        },
+
+        abortAjax: function () {
+            var that = this;
+            if (that.currentRequest) {
+                that.currentRequest.abort();
+                that.currentRequest = null;
+            }
+        },
+
+        setOptions: function (suppliedOptions) {
+            var that = this,
+                options = $.extend({}, that.options, suppliedOptions);
+
+            that.isLocal = Array.isArray(options.lookup);
+
+            if (that.isLocal) {
+                options.lookup = that.verifySuggestionsFormat(options.lookup);
+            }
+
+            options.orientation = that.validateOrientation(options.orientation, 'bottom');
+
+            // Adjust height, width and z-index:
+            $(that.suggestionsContainer).css({
+                'max-height': options.maxHeight + 'px',
+                'width': options.width + 'px',
+                'z-index': options.zIndex
+            });
+
+            this.options = options;            
+        },
+
+
+        clearCache: function () {
+            this.cachedResponse = {};
+            this.badQueries = [];
+        },
+
+        clear: function () {
+            this.clearCache();
+            this.currentValue = '';
+            this.suggestions = [];
+        },
+
+        disable: function () {
+            var that = this;
+            that.disabled = true;
+            clearTimeout(that.onChangeTimeout);
+            that.abortAjax();
+        },
+
+        enable: function () {
+            this.disabled = false;
+        },
+
+        fixPosition: function () {
+            // Use only when container has already its content
+
+            var that = this,
+                $container = $(that.suggestionsContainer),
+                containerParent = $container.parent().get(0);
+            // Fix position automatically when appended to body.
+            // In other cases force parameter must be given.
+            if (containerParent !== document.body && !that.options.forceFixPosition) {
+                return;
+            }
+
+            // Choose orientation
+            var orientation = that.options.orientation,
+                containerHeight = $container.outerHeight(),
+                height = that.el.outerHeight(),
+                offset = that.el.offset(),
+                styles = { 'top': offset.top, 'left': offset.left };
+
+            if (orientation === 'auto') {
+                var viewPortHeight = $(window).height(),
+                    scrollTop = $(window).scrollTop(),
+                    topOverflow = -scrollTop + offset.top - containerHeight,
+                    bottomOverflow = scrollTop + viewPortHeight - (offset.top + height + containerHeight);
+
+                orientation = (Math.max(topOverflow, bottomOverflow) === topOverflow) ? 'top' : 'bottom';
+            }
+
+            if (orientation === 'top') {
+                styles.top += -containerHeight;
+            } else {
+                styles.top += height;
+            }
+
+            // If container is not positioned to body,
+            // correct its position using offset parent offset
+            if(containerParent !== document.body) {
+                var opacity = $container.css('opacity'),
+                    parentOffsetDiff;
+
+                    if (!that.visible){
+                        $container.css('opacity', 0).show();
+                    }
+
+                parentOffsetDiff = $container.offsetParent().offset();
+                styles.top -= parentOffsetDiff.top;
+                styles.top += containerParent.scrollTop;
+                styles.left -= parentOffsetDiff.left;
+
+                if (!that.visible){
+                    $container.css('opacity', opacity).hide();
+                }
+            }
+
+            if (that.options.width === 'auto') {
+                styles.width = that.el.outerWidth() + 'px';
+            }
+
+            $container.css(styles);
+        },
+
+        isCursorAtEnd: function () {
+            var that = this,
+                valLength = that.el.val().length,
+                selectionStart = that.element.selectionStart,
+                range;
+
+            if (typeof selectionStart === 'number') {
+                return selectionStart === valLength;
+            }
+            if (document.selection) {
+                range = document.selection.createRange();
+                range.moveStart('character', -valLength);
+                return valLength === range.text.length;
+            }
+            return true;
+        },
+
+        onKeyPress: function (e) {
+            var that = this;
+
+            // If suggestions are hidden and user presses arrow down, display suggestions:
+            if (!that.disabled && !that.visible && e.which === keys.DOWN && that.currentValue) {
+                that.suggest();
+                return;
+            }
+
+            if (that.disabled || !that.visible) {
+                return;
+            }
+
+            switch (e.which) {
+                case keys.ESC:
+                    that.el.val(that.currentValue);
+                    that.hide();
+                    break;
+                case keys.RIGHT:
+                    if (that.hint && that.options.onHint && that.isCursorAtEnd()) {
+                        that.selectHint();
+                        break;
+                    }
+                    return;
+                case keys.TAB:
+                    if (that.hint && that.options.onHint) {
+                        that.selectHint();
+                        return;
+                    }
+                    if (that.selectedIndex === -1) {
+                        that.hide();
+                        return;
+                    }
+                    that.select(that.selectedIndex);
+                    if (that.options.tabDisabled === false) {
+                        return;
+                    }
+                    break;
+                case keys.RETURN:
+                    if (that.selectedIndex === -1) {
+                        that.hide();
+                        return;
+                    }
+                    that.select(that.selectedIndex);
+                    break;
+                case keys.UP:
+                    that.moveUp();
+                    break;
+                case keys.DOWN:
+                    that.moveDown();
+                    break;
+                default:
+                    return;
+            }
+
+            // Cancel event if function did not return:
+            e.stopImmediatePropagation();
+            e.preventDefault();
+        },
+
+        onKeyUp: function (e) {
+            var that = this;
+
+            if (that.disabled) {
+                return;
+            }
+
+            switch (e.which) {
+                case keys.UP:
+                case keys.DOWN:
+                    return;
+            }
+
+            clearTimeout(that.onChangeTimeout);
+
+            if (that.currentValue !== that.el.val()) {
+                that.findBestHint();
+                if (that.options.deferRequestBy > 0) {
+                    // Defer lookup in case when value changes very quickly:
+                    that.onChangeTimeout = setTimeout(function () {
+                        that.onValueChange();
+                    }, that.options.deferRequestBy);
+                } else {
+                    that.onValueChange();
+                }
+            }
+        },
+
+        onValueChange: function () {
+            if (this.ignoreValueChange) {
+                this.ignoreValueChange = false;
+                return;
+            }
+
+            var that = this,
+                options = that.options,
+                value = that.el.val(),
+                query = that.getQuery(value);
+
+            if (that.selection && that.currentValue !== query) {
+                that.selection = null;
+                (options.onInvalidateSelection || $.noop).call(that.element);
+            }
+
+            clearTimeout(that.onChangeTimeout);
+            that.currentValue = value;
+            that.selectedIndex = -1;
+
+            // Check existing suggestion for the match before proceeding:
+            if (options.triggerSelectOnValidInput && that.isExactMatch(query)) {
+                that.select(0);
+                return;
+            }
+
+            if (query.length < options.minChars) {
+                that.hide();
+            } else {
+                that.getSuggestions(query);
+            }
+        },
+
+        isExactMatch: function (query) {
+            var suggestions = this.suggestions;
+
+            return (suggestions.length === 1 && suggestions[0].value.toLowerCase() === query.toLowerCase());
+        },
+
+        getQuery: function (value) {
+            var delimiter = this.options.delimiter,
+                parts;
+
+            if (!delimiter) {
+                return value;
+            }
+            parts = value.split(delimiter);
+            return $.trim(parts[parts.length - 1]);
+        },
+
+        getSuggestionsLocal: function (query) {
+            var that = this,
+                options = that.options,
+                queryLowerCase = query.toLowerCase(),
+                filter = options.lookupFilter,
+                limit = parseInt(options.lookupLimit, 10),
+                data;
+
+            data = {
+                suggestions: $.grep(options.lookup, function (suggestion) {
+                    return filter(suggestion, query, queryLowerCase);
+                })
+            };
+
+            if (limit && data.suggestions.length > limit) {
+                data.suggestions = data.suggestions.slice(0, limit);
+            }
+
+            return data;
+        },
+
+        getSuggestions: function (q) {
+            var response,
+                that = this,
+                options = that.options,
+                serviceUrl = options.serviceUrl,
+                params,
+                cacheKey,
+                ajaxSettings;
+
+            options.params[options.paramName] = q;
+
+            if (options.onSearchStart.call(that.element, options.params) === false) {
+                return;
+            }
+
+            params = options.ignoreParams ? null : options.params;
+
+            if ($.isFunction(options.lookup)){
+                options.lookup(q, function (data) {
+                    that.suggestions = data.suggestions;
+                    that.suggest();
+                    options.onSearchComplete.call(that.element, q, data.suggestions);
+                });
+                return;
+            }
+
+            if (that.isLocal) {
+                response = that.getSuggestionsLocal(q);
+            } else {
+                if ($.isFunction(serviceUrl)) {
+                    serviceUrl = serviceUrl.call(that.element, q);
+                }
+                cacheKey = serviceUrl + '?' + $.param(params || {});
+                response = that.cachedResponse[cacheKey];
+            }
+
+            if (response && Array.isArray(response.suggestions)) {
+                that.suggestions = response.suggestions;
+                that.suggest();
+                options.onSearchComplete.call(that.element, q, response.suggestions);
+            } else if (!that.isBadQuery(q)) {
+                that.abortAjax();
+
+                ajaxSettings = {
+                    url: serviceUrl,
+                    data: params,
+                    type: options.type,
+                    dataType: options.dataType
+                };
+
+                $.extend(ajaxSettings, options.ajaxSettings);
+
+                that.currentRequest = $.ajax(ajaxSettings).done(function (data) {
+                    var result;
+                    that.currentRequest = null;
+                    result = options.transformResult(data, q);
+                    that.processResponse(result, q, cacheKey);
+                    options.onSearchComplete.call(that.element, q, result.suggestions);
+                }).fail(function (jqXHR, textStatus, errorThrown) {
+                    options.onSearchError.call(that.element, q, jqXHR, textStatus, errorThrown);
+                });
+            } else {
+                options.onSearchComplete.call(that.element, q, []);
+            }
+        },
+
+        isBadQuery: function (q) {
+            if (!this.options.preventBadQueries){
+                return false;
+            }
+
+            var badQueries = this.badQueries,
+                i = badQueries.length;
+
+            while (i--) {
+                if (q.indexOf(badQueries[i]) === 0) {
+                    return true;
+                }
+            }
+
+            return false;
+        },
+
+        hide: function () {
+            var that = this,
+                container = $(that.suggestionsContainer);
+
+            if ($.isFunction(that.options.onHide) && that.visible) {
+                that.options.onHide.call(that.element, container);
+            }
+
+            that.visible = false;
+            that.selectedIndex = -1;
+            clearTimeout(that.onChangeTimeout);
+            $(that.suggestionsContainer).hide();
+            that.signalHint(null);
+        },
+
+        suggest: function () {
+            if (!this.suggestions.length) {
+                if (this.options.showNoSuggestionNotice) {
+                    this.noSuggestions();
+                } else {
+                    this.hide();
+                }
+                return;
+            }
+
+            var that = this,
+                options = that.options,
+                groupBy = options.groupBy,
+                formatResult = options.formatResult,
+                value = that.getQuery(that.currentValue),
+                className = that.classes.suggestion,
+                classSelected = that.classes.selected,
+                container = $(that.suggestionsContainer),
+                noSuggestionsContainer = $(that.noSuggestionsContainer),
+                beforeRender = options.beforeRender,
+                html = '',
+                category,
+                formatGroup = function (suggestion, index) {
+                        var currentCategory = suggestion.data[groupBy];
+
+                        if (category === currentCategory){
+                            return '';
+                        }
+
+                        category = currentCategory;
+
+                        return options.formatGroup(suggestion, category);
+                    };
+
+            if (options.triggerSelectOnValidInput && that.isExactMatch(value)) {
+                that.select(0);
+                return;
+            }
+
+            // Build suggestions inner HTML:
+            $.each(that.suggestions, function (i, suggestion) {
+                if (groupBy){
+                    html += formatGroup(suggestion, value, i);
+                }
+
+                html += '<div class="' + className + '" data-index="' + i + '">' + formatResult(suggestion, value, i) + '</div>';
+            });
+
+            this.adjustContainerWidth();
+
+            noSuggestionsContainer.detach();
+            container.html(html);
+
+            if ($.isFunction(beforeRender)) {
+                beforeRender.call(that.element, container, that.suggestions);
+            }
+
+            that.fixPosition();
+            container.show();
+
+            // Select first value by default:
+            if (options.autoSelectFirst) {
+                that.selectedIndex = 0;
+                container.scrollTop(0);
+                container.children('.' + className).first().addClass(classSelected);
+            }
+
+            that.visible = true;
+            that.findBestHint();
+        },
+
+        noSuggestions: function() {
+             var that = this,
+                 beforeRender = that.options.beforeRender,
+                 container = $(that.suggestionsContainer),
+                 noSuggestionsContainer = $(that.noSuggestionsContainer);
+
+            this.adjustContainerWidth();
+
+            // Some explicit steps. Be careful here as it easy to get
+            // noSuggestionsContainer removed from DOM if not detached properly.
+            noSuggestionsContainer.detach();
+
+            // clean suggestions if any
+            container.empty();
+            container.append(noSuggestionsContainer);
+
+            if ($.isFunction(beforeRender)) {
+                beforeRender.call(that.element, container, that.suggestions);
+            }
+
+            that.fixPosition();
+
+            container.show();
+            that.visible = true;
+        },
+
+        adjustContainerWidth: function() {
+            var that = this,
+                options = that.options,
+                width,
+                container = $(that.suggestionsContainer);
+
+            // If width is auto, adjust width before displaying suggestions,
+            // because if instance was created before input had width, it will be zero.
+            // Also it adjusts if input width has changed.
+            if (options.width === 'auto') {
+                width = that.el.outerWidth();
+                container.css('width', width > 0 ? width : 300);
+            } else if(options.width === 'flex') {
+                // Trust the source! Unset the width property so it will be the max length
+                // the containing elements.
+                container.css('width', '');
+            }
+        },
+
+        findBestHint: function () {
+            var that = this,
+                value = that.el.val().toLowerCase(),
+                bestMatch = null;
+
+            if (!value) {
+                return;
+            }
+
+            $.each(that.suggestions, function (i, suggestion) {
+                var foundMatch = suggestion.value.toLowerCase().indexOf(value) === 0;
+                if (foundMatch) {
+                    bestMatch = suggestion;
+                }
+                return !foundMatch;
+            });
+
+            that.signalHint(bestMatch);
+        },
+
+        signalHint: function (suggestion) {
+            var hintValue = '',
+                that = this;
+            if (suggestion) {
+                hintValue = that.currentValue + suggestion.value.substr(that.currentValue.length);
+            }
+            if (that.hintValue !== hintValue) {
+                that.hintValue = hintValue;
+                that.hint = suggestion;
+                (this.options.onHint || $.noop)(hintValue);
+            }
+        },
+
+        verifySuggestionsFormat: function (suggestions) {
+            // If suggestions is string array, convert them to supported format:
+            if (suggestions.length && typeof suggestions[0] === 'string') {
+                return $.map(suggestions, function (value) {
+                    return { value: value, data: null };
+                });
+            }
+
+            return suggestions;
+        },
+
+        validateOrientation: function(orientation, fallback) {
+            orientation = $.trim(orientation || '').toLowerCase();
+
+            if($.inArray(orientation, ['auto', 'bottom', 'top']) === -1){
+                orientation = fallback;
+            }
+
+            return orientation;
+        },
+
+        processResponse: function (result, originalQuery, cacheKey) {
+            var that = this,
+                options = that.options;
+
+            result.suggestions = that.verifySuggestionsFormat(result.suggestions);
+
+            // Cache results if cache is not disabled:
+            if (!options.noCache) {
+                that.cachedResponse[cacheKey] = result;
+                if (options.preventBadQueries && !result.suggestions.length) {
+                    that.badQueries.push(originalQuery);
+                }
+            }
+
+            // Return if originalQuery is not matching current query:
+            if (originalQuery !== that.getQuery(that.currentValue)) {
+                return;
+            }
+
+            that.suggestions = result.suggestions;
+            that.suggest();
+        },
+
+        activate: function (index) {
+            var that = this,
+                activeItem,
+                selected = that.classes.selected,
+                container = $(that.suggestionsContainer),
+                children = container.find('.' + that.classes.suggestion);
+
+            container.find('.' + selected).removeClass(selected);
+
+            that.selectedIndex = index;
+
+            if (that.selectedIndex !== -1 && children.length > that.selectedIndex) {
+                activeItem = children.get(that.selectedIndex);
+                $(activeItem).addClass(selected);
+                return activeItem;
+            }
+
+            return null;
+        },
+
+        selectHint: function () {
+            var that = this,
+                i = $.inArray(that.hint, that.suggestions);
+
+            that.select(i);
+        },
+
+        select: function (i) {
+            var that = this;
+            that.hide();
+            that.onSelect(i);
+        },
+
+        moveUp: function () {
+            var that = this;
+
+            if (that.selectedIndex === -1) {
+                return;
+            }
+
+            if (that.selectedIndex === 0) {
+                $(that.suggestionsContainer).children('.' + that.classes.suggestion).first().removeClass(that.classes.selected);
+                that.selectedIndex = -1;
+                that.ignoreValueChange = false;
+                that.el.val(that.currentValue);
+                that.findBestHint();
+                return;
+            }
+
+            that.adjustScroll(that.selectedIndex - 1);
+        },
+
+        moveDown: function () {
+            var that = this;
+
+            if (that.selectedIndex === (that.suggestions.length - 1)) {
+                return;
+            }
+
+            that.adjustScroll(that.selectedIndex + 1);
+        },
+
+        adjustScroll: function (index) {
+            var that = this,
+                activeItem = that.activate(index);
+
+            if (!activeItem) {
+                return;
+            }
+
+            var offsetTop,
+                upperBound,
+                lowerBound,
+                heightDelta = $(activeItem).outerHeight();
+
+            offsetTop = activeItem.offsetTop;
+            upperBound = $(that.suggestionsContainer).scrollTop();
+            lowerBound = upperBound + that.options.maxHeight - heightDelta;
+
+            if (offsetTop < upperBound) {
+                $(that.suggestionsContainer).scrollTop(offsetTop);
+            } else if (offsetTop > lowerBound) {
+                $(that.suggestionsContainer).scrollTop(offsetTop - that.options.maxHeight + heightDelta);
+            }
+
+            if (!that.options.preserveInput) {
+                // During onBlur event, browser will trigger "change" event,
+                // because value has changed, to avoid side effect ignore,
+                // that event, so that correct suggestion can be selected
+                // when clicking on suggestion with a mouse
+                that.ignoreValueChange = true;
+                that.el.val(that.getValue(that.suggestions[index].value));
+            }
+
+            that.signalHint(null);
+        },
+
+        onSelect: function (index) {
+            var that = this,
+                onSelectCallback = that.options.onSelect,
+                suggestion = that.suggestions[index];
+
+            that.currentValue = that.getValue(suggestion.value);
+
+            if (that.currentValue !== that.el.val() && !that.options.preserveInput) {
+                that.el.val(that.currentValue);
+            }
+
+            that.signalHint(null);
+            that.suggestions = [];
+            that.selection = suggestion;
+
+            if ($.isFunction(onSelectCallback)) {
+                onSelectCallback.call(that.element, suggestion);
+            }
+        },
+
+        getValue: function (value) {
+            var that = this,
+                delimiter = that.options.delimiter,
+                currentValue,
+                parts;
+
+            if (!delimiter) {
+                return value;
+            }
+
+            currentValue = that.currentValue;
+            parts = currentValue.split(delimiter);
+
+            if (parts.length === 1) {
+                return value;
+            }
+
+            return currentValue.substr(0, currentValue.length - parts[parts.length - 1].length) + value;
+        },
+
+        dispose: function () {
+            var that = this;
+            that.el.off('.autocomplete').removeData('autocomplete');
+            $(window).off('resize.autocomplete', that.fixPositionCapture);
+            $(that.suggestionsContainer).remove();
+        }
+    };
+
+    // Create chainable jQuery plugin:
+    $.fn.devbridgeAutocomplete = function (options, args) {
+        var dataKey = 'autocomplete';
+        // If function invoked without argument return
+        // instance of the first matched element:
+        if (!arguments.length) {
+            return this.first().data(dataKey);
+        }
+
+        return this.each(function () {
+            var inputElement = $(this),
+                instance = inputElement.data(dataKey);
+
+            if (typeof options === 'string') {
+                if (instance && typeof instance[options] === 'function') {
+                    instance[options](args);
+                }
+            } else {
+                // If instance already exists, destroy it:
+                if (instance && instance.dispose) {
+                    instance.dispose();
+                }
+                instance = new Autocomplete(this, options);
+                inputElement.data(dataKey, instance);
+            }
+        });
+    };
+
+    // Don't overwrite if it already exists
+    if (!$.fn.autocomplete) {
+        $.fn.autocomplete = $.fn.devbridgeAutocomplete;
+    }
+}));
diff --git a/core/media/jui/js/jquery.autocomplete.min.js b/core/media/jui/js/jquery.autocomplete.min.js
new file mode 100644
index 00000000..d1687ec9
--- /dev/null
+++ b/core/media/jui/js/jquery.autocomplete.min.js
@@ -0,0 +1,8 @@
+/**
+*  Ajax Autocomplete for jQuery, version 1.4.7
+*  (c) 2017 Tomas Kirda
+*
+*  Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
+*  For details, see the web site: https://github.com/devbridge/jQuery-Autocomplete
+*/
+!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports&&"function"==typeof require?require("jquery"):jQuery)}(function(a){"use strict";function b(c,d){var e=this;e.element=c,e.el=a(c),e.suggestions=[],e.badQueries=[],e.selectedIndex=-1,e.currentValue=e.element.value,e.timeoutId=null,e.cachedResponse={},e.onChangeTimeout=null,e.onChange=null,e.isLocal=!1,e.suggestionsContainer=null,e.noSuggestionsContainer=null,e.options=a.extend({},b.defaults,d),e.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"},e.hint=null,e.hintValue="",e.selection=null,e.initialize(),e.setOptions(d)}function c(a,b,c){return a.value.toLowerCase().indexOf(c)!==-1}function d(b){return"string"==typeof b?a.parseJSON(b):b}function e(a,b){if(!b)return a.value;var c="("+g.escapeRegExChars(b)+")";return a.value.replace(new RegExp(c,"gi"),"<strong>$1</strong>").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/&lt;(\/?strong)&gt;/g,"<$1>")}function f(a,b){return'<div class="autocomplete-group">'+b+"</div>"}var g=function(){return{escapeRegExChars:function(a){return a.replace(/[|\\{}()[\]^$+*?.]/g,"\\$&")},createNode:function(a){var b=document.createElement("div");return b.className=a,b.style.position="absolute",b.style.display="none",b}}}(),h={ESC:27,TAB:9,RETURN:13,LEFT:37,UP:38,RIGHT:39,DOWN:40},i=a.noop;b.utils=g,a.Autocomplete=b,b.defaults={ajaxSettings:{},autoSelectFirst:!1,appendTo:"body",serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:e,formatGroup:f,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:i,onSearchComplete:i,onSearchError:i,preserveInput:!1,containerClass:"autocomplete-suggestions",tabDisabled:!1,dataType:"text",currentRequest:null,triggerSelectOnValidInput:!0,preventBadQueries:!0,lookupFilter:c,paramName:"query",transformResult:d,showNoSuggestionNotice:!1,noSuggestionNotice:"No results",orientation:"bottom",forceFixPosition:!1},b.prototype={initialize:function(){var c,d=this,e="."+d.classes.suggestion,f=d.classes.selected,g=d.options;d.element.setAttribute("autocomplete","off"),d.noSuggestionsContainer=a('<div class="autocomplete-no-suggestion"></div>').html(this.options.noSuggestionNotice).get(0),d.suggestionsContainer=b.utils.createNode(g.containerClass),c=a(d.suggestionsContainer),c.appendTo(g.appendTo||"body"),"auto"!==g.width&&c.css("width",g.width),c.on("mouseover.autocomplete",e,function(){d.activate(a(this).data("index"))}),c.on("mouseout.autocomplete",function(){d.selectedIndex=-1,c.children("."+f).removeClass(f)}),c.on("click.autocomplete",e,function(){d.select(a(this).data("index"))}),c.on("click.autocomplete",function(){clearTimeout(d.blurTimeoutId)}),d.fixPositionCapture=function(){d.visible&&d.fixPosition()},a(window).on("resize.autocomplete",d.fixPositionCapture),d.el.on("keydown.autocomplete",function(a){d.onKeyPress(a)}),d.el.on("keyup.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("blur.autocomplete",function(){d.onBlur()}),d.el.on("focus.autocomplete",function(){d.onFocus()}),d.el.on("change.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("input.autocomplete",function(a){d.onKeyUp(a)})},onFocus:function(){var a=this;a.fixPosition(),a.el.val().length>=a.options.minChars&&a.onValueChange()},onBlur:function(){var a=this;a.blurTimeoutId=setTimeout(function(){a.hide()},200)},abortAjax:function(){var a=this;a.currentRequest&&(a.currentRequest.abort(),a.currentRequest=null)},setOptions:function(b){var c=this,d=a.extend({},c.options,b);c.isLocal=Array.isArray(d.lookup),c.isLocal&&(d.lookup=c.verifySuggestionsFormat(d.lookup)),d.orientation=c.validateOrientation(d.orientation,"bottom"),a(c.suggestionsContainer).css({"max-height":d.maxHeight+"px",width:d.width+"px","z-index":d.zIndex}),this.options=d},clearCache:function(){this.cachedResponse={},this.badQueries=[]},clear:function(){this.clearCache(),this.currentValue="",this.suggestions=[]},disable:function(){var a=this;a.disabled=!0,clearTimeout(a.onChangeTimeout),a.abortAjax()},enable:function(){this.disabled=!1},fixPosition:function(){var b=this,c=a(b.suggestionsContainer),d=c.parent().get(0);if(d===document.body||b.options.forceFixPosition){var e=b.options.orientation,f=c.outerHeight(),g=b.el.outerHeight(),h=b.el.offset(),i={top:h.top,left:h.left};if("auto"===e){var j=a(window).height(),k=a(window).scrollTop(),l=-k+h.top-f,m=k+j-(h.top+g+f);e=Math.max(l,m)===l?"top":"bottom"}if("top"===e?i.top+=-f:i.top+=g,d!==document.body){var n,o=c.css("opacity");b.visible||c.css("opacity",0).show(),n=c.offsetParent().offset(),i.top-=n.top,i.top+=d.scrollTop,i.left-=n.left,b.visible||c.css("opacity",o).hide()}"auto"===b.options.width&&(i.width=b.el.outerWidth()+"px"),c.css(i)}},isCursorAtEnd:function(){var a,b=this,c=b.el.val().length,d=b.element.selectionStart;return"number"==typeof d?d===c:!document.selection||(a=document.selection.createRange(),a.moveStart("character",-c),c===a.text.length)},onKeyPress:function(a){var b=this;if(!b.disabled&&!b.visible&&a.which===h.DOWN&&b.currentValue)return void b.suggest();if(!b.disabled&&b.visible){switch(a.which){case h.ESC:b.el.val(b.currentValue),b.hide();break;case h.RIGHT:if(b.hint&&b.options.onHint&&b.isCursorAtEnd()){b.selectHint();break}return;case h.TAB:if(b.hint&&b.options.onHint)return void b.selectHint();if(b.selectedIndex===-1)return void b.hide();if(b.select(b.selectedIndex),b.options.tabDisabled===!1)return;break;case h.RETURN:if(b.selectedIndex===-1)return void b.hide();b.select(b.selectedIndex);break;case h.UP:b.moveUp();break;case h.DOWN:b.moveDown();break;default:return}a.stopImmediatePropagation(),a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.which){case h.UP:case h.DOWN:return}clearTimeout(b.onChangeTimeout),b.currentValue!==b.el.val()&&(b.findBestHint(),b.options.deferRequestBy>0?b.onChangeTimeout=setTimeout(function(){b.onValueChange()},b.options.deferRequestBy):b.onValueChange())}},onValueChange:function(){if(this.ignoreValueChange)return void(this.ignoreValueChange=!1);var b=this,c=b.options,d=b.el.val(),e=b.getQuery(d);return b.selection&&b.currentValue!==e&&(b.selection=null,(c.onInvalidateSelection||a.noop).call(b.element)),clearTimeout(b.onChangeTimeout),b.currentValue=d,b.selectedIndex=-1,c.triggerSelectOnValidInput&&b.isExactMatch(e)?void b.select(0):void(e.length<c.minChars?b.hide():b.getSuggestions(e))},isExactMatch:function(a){var b=this.suggestions;return 1===b.length&&b[0].value.toLowerCase()===a.toLowerCase()},getQuery:function(b){var c,d=this.options.delimiter;return d?(c=b.split(d),a.trim(c[c.length-1])):b},getSuggestionsLocal:function(b){var c,d=this,e=d.options,f=b.toLowerCase(),g=e.lookupFilter,h=parseInt(e.lookupLimit,10);return c={suggestions:a.grep(e.lookup,function(a){return g(a,b,f)})},h&&c.suggestions.length>h&&(c.suggestions=c.suggestions.slice(0,h)),c},getSuggestions:function(b){var c,d,e,f,g=this,h=g.options,i=h.serviceUrl;if(h.params[h.paramName]=b,h.onSearchStart.call(g.element,h.params)!==!1){if(d=h.ignoreParams?null:h.params,a.isFunction(h.lookup))return void h.lookup(b,function(a){g.suggestions=a.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,a.suggestions)});g.isLocal?c=g.getSuggestionsLocal(b):(a.isFunction(i)&&(i=i.call(g.element,b)),e=i+"?"+a.param(d||{}),c=g.cachedResponse[e]),c&&Array.isArray(c.suggestions)?(g.suggestions=c.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,c.suggestions)):g.isBadQuery(b)?h.onSearchComplete.call(g.element,b,[]):(g.abortAjax(),f={url:i,data:d,type:h.type,dataType:h.dataType},a.extend(f,h.ajaxSettings),g.currentRequest=a.ajax(f).done(function(a){var c;g.currentRequest=null,c=h.transformResult(a,b),g.processResponse(c,b,e),h.onSearchComplete.call(g.element,b,c.suggestions)}).fail(function(a,c,d){h.onSearchError.call(g.element,b,a,c,d)}))}},isBadQuery:function(a){if(!this.options.preventBadQueries)return!1;for(var b=this.badQueries,c=b.length;c--;)if(0===a.indexOf(b[c]))return!0;return!1},hide:function(){var b=this,c=a(b.suggestionsContainer);a.isFunction(b.options.onHide)&&b.visible&&b.options.onHide.call(b.element,c),b.visible=!1,b.selectedIndex=-1,clearTimeout(b.onChangeTimeout),a(b.suggestionsContainer).hide(),b.signalHint(null)},suggest:function(){if(!this.suggestions.length)return void(this.options.showNoSuggestionNotice?this.noSuggestions():this.hide());var b,c=this,d=c.options,e=d.groupBy,f=d.formatResult,g=c.getQuery(c.currentValue),h=c.classes.suggestion,i=c.classes.selected,j=a(c.suggestionsContainer),k=a(c.noSuggestionsContainer),l=d.beforeRender,m="",n=function(a,c){var f=a.data[e];return b===f?"":(b=f,d.formatGroup(a,b))};return d.triggerSelectOnValidInput&&c.isExactMatch(g)?void c.select(0):(a.each(c.suggestions,function(a,b){e&&(m+=n(b,g,a)),m+='<div class="'+h+'" data-index="'+a+'">'+f(b,g,a)+"</div>"}),this.adjustContainerWidth(),k.detach(),j.html(m),a.isFunction(l)&&l.call(c.element,j,c.suggestions),c.fixPosition(),j.show(),d.autoSelectFirst&&(c.selectedIndex=0,j.scrollTop(0),j.children("."+h).first().addClass(i)),c.visible=!0,void c.findBestHint())},noSuggestions:function(){var b=this,c=b.options.beforeRender,d=a(b.suggestionsContainer),e=a(b.noSuggestionsContainer);this.adjustContainerWidth(),e.detach(),d.empty(),d.append(e),a.isFunction(c)&&c.call(b.element,d,b.suggestions),b.fixPosition(),d.show(),b.visible=!0},adjustContainerWidth:function(){var b,c=this,d=c.options,e=a(c.suggestionsContainer);"auto"===d.width?(b=c.el.outerWidth(),e.css("width",b>0?b:300)):"flex"===d.width&&e.css("width","")},findBestHint:function(){var b=this,c=b.el.val().toLowerCase(),d=null;c&&(a.each(b.suggestions,function(a,b){var e=0===b.value.toLowerCase().indexOf(c);return e&&(d=b),!e}),b.signalHint(d))},signalHint:function(b){var c="",d=this;b&&(c=d.currentValue+b.value.substr(d.currentValue.length)),d.hintValue!==c&&(d.hintValue=c,d.hint=b,(this.options.onHint||a.noop)(c))},verifySuggestionsFormat:function(b){return b.length&&"string"==typeof b[0]?a.map(b,function(a){return{value:a,data:null}}):b},validateOrientation:function(b,c){return b=a.trim(b||"").toLowerCase(),a.inArray(b,["auto","bottom","top"])===-1&&(b=c),b},processResponse:function(a,b,c){var d=this,e=d.options;a.suggestions=d.verifySuggestionsFormat(a.suggestions),e.noCache||(d.cachedResponse[c]=a,e.preventBadQueries&&!a.suggestions.length&&d.badQueries.push(b)),b===d.getQuery(d.currentValue)&&(d.suggestions=a.suggestions,d.suggest())},activate:function(b){var c,d=this,e=d.classes.selected,f=a(d.suggestionsContainer),g=f.find("."+d.classes.suggestion);return f.find("."+e).removeClass(e),d.selectedIndex=b,d.selectedIndex!==-1&&g.length>d.selectedIndex?(c=g.get(d.selectedIndex),a(c).addClass(e),c):null},selectHint:function(){var b=this,c=a.inArray(b.hint,b.suggestions);b.select(c)},select:function(a){var b=this;b.hide(),b.onSelect(a)},moveUp:function(){var b=this;if(b.selectedIndex!==-1)return 0===b.selectedIndex?(a(b.suggestionsContainer).children("."+b.classes.suggestion).first().removeClass(b.classes.selected),b.selectedIndex=-1,b.ignoreValueChange=!1,b.el.val(b.currentValue),void b.findBestHint()):void b.adjustScroll(b.selectedIndex-1)},moveDown:function(){var a=this;a.selectedIndex!==a.suggestions.length-1&&a.adjustScroll(a.selectedIndex+1)},adjustScroll:function(b){var c=this,d=c.activate(b);if(d){var e,f,g,h=a(d).outerHeight();e=d.offsetTop,f=a(c.suggestionsContainer).scrollTop(),g=f+c.options.maxHeight-h,e<f?a(c.suggestionsContainer).scrollTop(e):e>g&&a(c.suggestionsContainer).scrollTop(e-c.options.maxHeight+h),c.options.preserveInput||(c.ignoreValueChange=!0,c.el.val(c.getValue(c.suggestions[b].value))),c.signalHint(null)}},onSelect:function(b){var c=this,d=c.options.onSelect,e=c.suggestions[b];c.currentValue=c.getValue(e.value),c.currentValue===c.el.val()||c.options.preserveInput||c.el.val(c.currentValue),c.signalHint(null),c.suggestions=[],c.selection=e,a.isFunction(d)&&d.call(c.element,e)},getValue:function(a){var b,c,d=this,e=d.options.delimiter;return e?(b=d.currentValue,c=b.split(e),1===c.length?a:b.substr(0,b.length-c[c.length-1].length)+a):a},dispose:function(){var b=this;b.el.off(".autocomplete").removeData("autocomplete"),a(window).off("resize.autocomplete",b.fixPositionCapture),a(b.suggestionsContainer).remove()}},a.fn.devbridgeAutocomplete=function(c,d){var e="autocomplete";return arguments.length?this.each(function(){var f=a(this),g=f.data(e);"string"==typeof c?g&&"function"==typeof g[c]&&g[c](d):(g&&g.dispose&&g.dispose(),g=new b(this,c),f.data(e,g))}):this.first().data(e)},a.fn.autocomplete||(a.fn.autocomplete=a.fn.devbridgeAutocomplete)});
\ No newline at end of file
diff --git a/core/media/jui/js/jquery.js b/core/media/jui/js/jquery.js
new file mode 100644
index 00000000..7fc60fca
--- /dev/null
+++ b/core/media/jui/js/jquery.js
@@ -0,0 +1,11008 @@
+/*!
+ * jQuery JavaScript Library v1.12.4
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2016-05-20T17:17Z
+ */
+
+(function( global, factory ) {
+
+	if ( typeof module === "object" && typeof module.exports === "object" ) {
+		// For CommonJS and CommonJS-like environments where a proper `window`
+		// is present, execute the factory and get jQuery.
+		// For environments that do not have a `window` with a `document`
+		// (such as Node.js), expose a factory as module.exports.
+		// This accentuates the need for the creation of a real `window`.
+		// e.g. var jQuery = require("jquery")(window);
+		// See ticket #14549 for more info.
+		module.exports = global.document ?
+			factory( global, true ) :
+			function( w ) {
+				if ( !w.document ) {
+					throw new Error( "jQuery requires a window with a document" );
+				}
+				return factory( w );
+			};
+	} else {
+		factory( global );
+	}
+
+// Pass this if window is not defined yet
+}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
+
+// Support: Firefox 18+
+// Can't be in strict mode, several libs including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+//"use strict";
+var deletedIds = [];
+
+var document = window.document;
+
+var slice = deletedIds.slice;
+
+var concat = deletedIds.concat;
+
+var push = deletedIds.push;
+
+var indexOf = deletedIds.indexOf;
+
+var class2type = {};
+
+var toString = class2type.toString;
+
+var hasOwn = class2type.hasOwnProperty;
+
+var support = {};
+
+
+
+var
+	version = "1.12.4",
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+
+		// The jQuery object is actually just the init constructor 'enhanced'
+		// Need init if jQuery is called (just allow error to be thrown if not included)
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Support: Android<4.1, IE<9
+	// Make sure we trim BOM and NBSP
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn = jQuery.prototype = {
+
+	// The current version of jQuery being used
+	jquery: version,
+
+	constructor: jQuery,
+
+	// Start with an empty selector
+	selector: "",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	toArray: function() {
+		return slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num != null ?
+
+			// Return just the one element from the set
+			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
+
+			// Return all the elements in a clean array
+			slice.call( this );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+		ret.context = this.context;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	each: function( callback ) {
+		return jQuery.each( this, callback );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map( this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		} ) );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor();
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: deletedIds.sort,
+	splice: deletedIds.splice
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var src, copyIsArray, copy, name, options, clone,
+		target = arguments[ 0 ] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+
+		// skip the boolean and the target
+		target = arguments[ i ] || {};
+		i++;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( i === length ) {
+		target = this;
+		i--;
+	}
+
+	for ( ; i < length; i++ ) {
+
+		// Only deal with non-null/undefined values
+		if ( ( options = arguments[ i ] ) != null ) {
+
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
+					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
+
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray( src ) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject( src ) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend( {
+
+	// Unique for each copy of jQuery on the page
+	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
+
+	// Assume jQuery is ready without the ready module
+	isReady: true,
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	noop: function() {},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type( obj ) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type( obj ) === "array";
+	},
+
+	isWindow: function( obj ) {
+		/* jshint eqeqeq: false */
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+
+		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
+		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
+		// subtraction forces infinities to NaN
+		// adding 1 corrects loss of precision from parseFloat (#15100)
+		var realStringObj = obj && obj.toString();
+		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	isPlainObject: function( obj ) {
+		var key;
+
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call( obj, "constructor" ) &&
+				!hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
+				return false;
+			}
+		} catch ( e ) {
+
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Support: IE<9
+		// Handle iteration over inherited properties before own properties.
+		if ( !support.ownFirst ) {
+			for ( key in obj ) {
+				return hasOwn.call( obj, key );
+			}
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return obj + "";
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ toString.call( obj ) ] || "object" :
+			typeof obj;
+	},
+
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && jQuery.trim( data ) ) {
+
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	each: function( obj, callback ) {
+		var length, i = 0;
+
+		if ( isArrayLike( obj ) ) {
+			length = obj.length;
+			for ( ; i < length; i++ ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
+				}
+			}
+		} else {
+			for ( i in obj ) {
+				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
+					break;
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Support: Android<4.1, IE<9
+	trim: function( text ) {
+		return text == null ?
+			"" :
+			( text + "" ).replace( rtrim, "" );
+	},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArrayLike( Object( arr ) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		var len;
+
+		if ( arr ) {
+			if ( indexOf ) {
+				return indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var len = +second.length,
+			j = 0,
+			i = first.length;
+
+		while ( j < len ) {
+			first[ i++ ] = second[ j++ ];
+		}
+
+		// Support: IE<9
+		// Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
+		if ( len !== len ) {
+			while ( second[ j ] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, invert ) {
+		var callbackInverse,
+			matches = [],
+			i = 0,
+			length = elems.length,
+			callbackExpect = !invert;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			callbackInverse = !callback( elems[ i ], i );
+			if ( callbackInverse !== callbackExpect ) {
+				matches.push( elems[ i ] );
+			}
+		}
+
+		return matches;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var length, value,
+			i = 0,
+			ret = [];
+
+		// Go through the array, translating each of the items to their new values
+		if ( isArrayLike( elems ) ) {
+			length = elems.length;
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret.push( value );
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var args, proxy, tmp;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	now: function() {
+		return +( new Date() );
+	},
+
+	// jQuery.support is not used in Core but other projects attach their
+	// properties to it so it needs to exist.
+	support: support
+} );
+
+// JSHint would error on this code due to the Symbol not being defined in ES5.
+// Defining this global in .jshintrc would create a danger of using the global
+// unguarded in another place, it seems safer to just disable JSHint for these
+// three lines.
+/* jshint ignore: start */
+if ( typeof Symbol === "function" ) {
+	jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ];
+}
+/* jshint ignore: end */
+
+// Populate the class2type map
+jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+function( i, name ) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+} );
+
+function isArrayLike( obj ) {
+
+	// Support: iOS 8.2 (not reproducible in simulator)
+	// `in` check used to prevent JIT error (gh-2145)
+	// hasOwn isn't used here due to false negatives
+	// regarding Nodelist length in IE
+	var length = !!obj && "length" in obj && obj.length,
+		type = jQuery.type( obj );
+
+	if ( type === "function" || jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	return type === "array" || length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
+}
+var Sizzle =
+/*!
+ * Sizzle CSS Selector Engine v2.2.1
+ * http://sizzlejs.com/
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2015-10-17
+ */
+(function( window ) {
+
+var i,
+	support,
+	Expr,
+	getText,
+	isXML,
+	tokenize,
+	compile,
+	select,
+	outermostContext,
+	sortInput,
+	hasDuplicate,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsHTML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+
+	// Instance-specific data
+	expando = "sizzle" + 1 * new Date(),
+	preferredDoc = window.document,
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+		}
+		return 0;
+	},
+
+	// General-purpose constants
+	MAX_NEGATIVE = 1 << 31,
+
+	// Instance methods
+	hasOwn = ({}).hasOwnProperty,
+	arr = [],
+	pop = arr.pop,
+	push_native = arr.push,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf as it's faster than native
+	// http://jsperf.com/thor-indexof-vs-for/5
+	indexOf = function( list, elem ) {
+		var i = 0,
+			len = list.length;
+		for ( ; i < len; i++ ) {
+			if ( list[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+	// Regular expressions
+
+	// http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+
+	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + whitespace +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
+		"*\\]",
+
+	pseudos = ":(" + identifier + ")(?:\\((" +
+		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
+		// 1. quoted (capture 3; capture 4 or capture 5)
+		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+		// 2. simple (capture 6)
+		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+		// 3. anything else (capture 2)
+		".*" +
+		")\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rwhitespace = new RegExp( whitespace + "+", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + identifier + ")" ),
+		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
+		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rnative = /^[^{]+\{\s*\[native \w/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rsibling = /[+~]/,
+	rescape = /'|\\/g,
+
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+	funescape = function( _, escaped, escapedWhitespace ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox<24
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high !== high || escapedWhitespace ?
+			escaped :
+			high < 0 ?
+				// BMP codepoint
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	},
+
+	// Used for iframes
+	// See setDocument()
+	// Removing the function wrapper causes a "Permission Denied"
+	// error in IE
+	unloadHandler = function() {
+		setDocument();
+	};
+
+// Optimize for push.apply( _, NodeList )
+try {
+	push.apply(
+		(arr = slice.call( preferredDoc.childNodes )),
+		preferredDoc.childNodes
+	);
+	// Support: Android<4.0
+	// Detect silently failing push.apply
+	arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+	push = { apply: arr.length ?
+
+		// Leverage slice if possible
+		function( target, els ) {
+			push_native.apply( target, slice.call(els) );
+		} :
+
+		// Support: IE<9
+		// Otherwise append directly
+		function( target, els ) {
+			var j = target.length,
+				i = 0;
+			// Can't trust NodeList.length
+			while ( (target[j++] = els[i++]) ) {}
+			target.length = j - 1;
+		}
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var m, i, elem, nid, nidselect, match, groups, newSelector,
+		newContext = context && context.ownerDocument,
+
+		// nodeType defaults to 9, since context defaults to document
+		nodeType = context ? context.nodeType : 9;
+
+	results = results || [];
+
+	// Return early from calls with invalid selector or context
+	if ( typeof selector !== "string" || !selector ||
+		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
+
+		return results;
+	}
+
+	// Try to shortcut find operations (as opposed to filters) in HTML documents
+	if ( !seed ) {
+
+		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+			setDocument( context );
+		}
+		context = context || document;
+
+		if ( documentIsHTML ) {
+
+			// If the selector is sufficiently simple, try using a "get*By*" DOM method
+			// (excepting DocumentFragment context, where the methods don't exist)
+			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+
+				// ID selector
+				if ( (m = match[1]) ) {
+
+					// Document context
+					if ( nodeType === 9 ) {
+						if ( (elem = context.getElementById( m )) ) {
+
+							// Support: IE, Opera, Webkit
+							// TODO: identify versions
+							// getElementById can match elements by name instead of ID
+							if ( elem.id === m ) {
+								results.push( elem );
+								return results;
+							}
+						} else {
+							return results;
+						}
+
+					// Element context
+					} else {
+
+						// Support: IE, Opera, Webkit
+						// TODO: identify versions
+						// getElementById can match elements by name instead of ID
+						if ( newContext && (elem = newContext.getElementById( m )) &&
+							contains( context, elem ) &&
+							elem.id === m ) {
+
+							results.push( elem );
+							return results;
+						}
+					}
+
+				// Type selector
+				} else if ( match[2] ) {
+					push.apply( results, context.getElementsByTagName( selector ) );
+					return results;
+
+				// Class selector
+				} else if ( (m = match[3]) && support.getElementsByClassName &&
+					context.getElementsByClassName ) {
+
+					push.apply( results, context.getElementsByClassName( m ) );
+					return results;
+				}
+			}
+
+			// Take advantage of querySelectorAll
+			if ( support.qsa &&
+				!compilerCache[ selector + " " ] &&
+				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+
+				if ( nodeType !== 1 ) {
+					newContext = context;
+					newSelector = selector;
+
+				// qSA looks outside Element context, which is not what we want
+				// Thanks to Andrew Dupont for this workaround technique
+				// Support: IE <=8
+				// Exclude object elements
+				} else if ( context.nodeName.toLowerCase() !== "object" ) {
+
+					// Capture the context ID, setting it first if necessary
+					if ( (nid = context.getAttribute( "id" )) ) {
+						nid = nid.replace( rescape, "\\$&" );
+					} else {
+						context.setAttribute( "id", (nid = expando) );
+					}
+
+					// Prefix every selector in the list
+					groups = tokenize( selector );
+					i = groups.length;
+					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
+					while ( i-- ) {
+						groups[i] = nidselect + " " + toSelector( groups[i] );
+					}
+					newSelector = groups.join( "," );
+
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+				}
+
+				if ( newSelector ) {
+					try {
+						push.apply( results,
+							newContext.querySelectorAll( newSelector )
+						);
+						return results;
+					} catch ( qsaError ) {
+					} finally {
+						if ( nid === expando ) {
+							context.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {function(string, object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var keys = [];
+
+	function cache( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key + " " ] = value);
+	}
+	return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
+
+	try {
+		return !!fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// Remove from its parent by default
+		if ( div.parentNode ) {
+			div.parentNode.removeChild( div );
+		}
+		// release memory in IE
+		div = null;
+	}
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied
+ */
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = arr.length;
+
+	while ( i-- ) {
+		Expr.attrHandle[ arr[i] ] = handler;
+	}
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+ */
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+			( ~b.sourceIndex || MAX_NEGATIVE ) -
+			( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Checks a node for validity as a Sizzle context
+ * @param {Element|Object=} context
+ * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
+ */
+function testContext( context ) {
+	return context && typeof context.getElementsByTagName !== "undefined" && context;
+}
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Detects XML nodes
+ * @param {Element|Object} elem An element or a document
+ * @returns {Boolean} True iff elem is a non-HTML XML node
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var hasCompare, parent,
+		doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// Return early if doc is invalid or already selected
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Update global variables
+	document = doc;
+	docElem = document.documentElement;
+	documentIsHTML = !isXML( document );
+
+	// Support: IE 9-11, Edge
+	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
+	if ( (parent = document.defaultView) && parent.top !== parent ) {
+		// Support: IE 11
+		if ( parent.addEventListener ) {
+			parent.addEventListener( "unload", unloadHandler, false );
+
+		// Support: IE 9 - 10 only
+		} else if ( parent.attachEvent ) {
+			parent.attachEvent( "onunload", unloadHandler );
+		}
+	}
+
+	/* Attributes
+	---------------------------------------------------------------------- */
+
+	// Support: IE<8
+	// Verify that getAttribute really returns attributes and not properties
+	// (excepting IE8 booleans)
+	support.attributes = assert(function( div ) {
+		div.className = "i";
+		return !div.getAttribute("className");
+	});
+
+	/* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.getElementsByTagName = assert(function( div ) {
+		div.appendChild( document.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Support: IE<9
+	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
+
+	// Support: IE<10
+	// Check if getElementById returns elements by name
+	// The broken getElementById methods don't pick up programatically-set names,
+	// so use a roundabout getElementsByName test
+	support.getById = assert(function( div ) {
+		docElem.appendChild( div ).id = expando;
+		return !document.getElementsByName || !document.getElementsByName( expando ).length;
+	});
+
+	// ID find and filter
+	if ( support.getById ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
+				var m = context.getElementById( id );
+				return m ? [ m ] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		// Support: IE6/7
+		// getElementById is not reliable as a find shortcut
+		delete Expr.find["ID"];
+
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== "undefined" &&
+					elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.getElementsByTagName ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( tag );
+
+			// DocumentFragment nodes don't have gEBTN
+			} else if ( support.qsa ) {
+				return context.querySelectorAll( tag );
+			}
+		} :
+
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Class
+	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	/* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21)
+	// We allow this because of a bug in IE8/9 that throws an error
+	// whenever `document.activeElement` is accessed on an iframe
+	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+	// See http://bugs.jquery.com/ticket/13378
+	rbuggyQSA = [];
+
+	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explicitly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
+				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
+				"<option selected=''></option></select>";
+
+			// Support: IE8, Opera 11-12.16
+			// Nothing should be selected when empty strings follow ^= or $= or *=
+			// The test attribute must be unknown in Opera but "safe" for WinRT
+			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
+			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
+
+			// Support: IE8
+			// Boolean attributes and "value" are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+			}
+
+			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
+			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
+				rbuggyQSA.push("~=");
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+
+			// Support: Safari 8+, iOS 8+
+			// https://bugs.webkit.org/show_bug.cgi?id=136851
+			// In-page `selector#id sibing-combinator selector` fails
+			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
+				rbuggyQSA.push(".#.+[+~]");
+			}
+		});
+
+		assert(function( div ) {
+			// Support: Windows 8 Native Apps
+			// The type and name attributes are restricted during .innerHTML assignment
+			var input = document.createElement("input");
+			input.setAttribute( "type", "hidden" );
+			div.appendChild( input ).setAttribute( "name", "D" );
+
+			// Support: IE8
+			// Enforce case-sensitivity of name attribute
+			if ( div.querySelectorAll("[name=d]").length ) {
+				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+		docElem.webkitMatchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+	/* Contains
+	---------------------------------------------------------------------- */
+	hasCompare = rnative.test( docElem.compareDocumentPosition );
+
+	// Element contains another
+	// Purposefully self-exclusive
+	// As in, an element does not contain itself
+	contains = hasCompare || rnative.test( docElem.contains ) ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	/* Sorting
+	---------------------------------------------------------------------- */
+
+	// Document order sorting
+	sortOrder = hasCompare ?
+	function( a, b ) {
+
+		// Flag for duplicate removal
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		// Sort on method existence if only one input has compareDocumentPosition
+		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
+		if ( compare ) {
+			return compare;
+		}
+
+		// Calculate position if both inputs belong to the same document
+		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+			a.compareDocumentPosition( b ) :
+
+			// Otherwise we know they are disconnected
+			1;
+
+		// Disconnected nodes
+		if ( compare & 1 ||
+			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+			// Choose the first element that is related to our preferred document
+			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+				return -1;
+			}
+			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+				return 1;
+			}
+
+			// Maintain original order
+			return sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+		}
+
+		return compare & 4 ? -1 : 1;
+	} :
+	function( a, b ) {
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Parentless nodes are either documents or disconnected
+		if ( !aup || !bup ) {
+			return a === document ? -1 :
+				b === document ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				sortInput ?
+				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	return document;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	if ( support.matchesSelector && documentIsHTML &&
+		!compilerCache[ expr + " " ] &&
+		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch (e) {}
+	}
+
+	return Sizzle( expr, document, null, [ elem ] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	var fn = Expr.attrHandle[ name.toLowerCase() ],
+		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+			fn( elem, name, !documentIsHTML ) :
+			undefined;
+
+	return val !== undefined ?
+		val :
+		support.attributes || !documentIsHTML ?
+			elem.getAttribute( name ) :
+			(val = elem.getAttributeNode(name)) && val.specified ?
+				val.value :
+				null;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		j = 0,
+		i = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	sortInput = !support.sortStable && results.slice( 0 );
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		while ( (elem = results[i++]) ) {
+			if ( elem === results[ i ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	// Clear input after sorting to release objects
+	// See https://github.com/jquery/sizzle/pull/225
+	sortInput = null;
+
+	return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		while ( (node = elem[i++]) ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (jQuery #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	attrHandle: {},
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[6] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[3] ) {
+				match[2] = match[4] || match[5] || "";
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeNameSelector ) {
+			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+			return nodeNameSelector === "*" ?
+				function() { return true; } :
+				function( elem ) {
+					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+				};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, uniqueCache, outerCache, node, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType,
+						diff = false;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) {
+
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+
+							// Seek `elem` from a previously-cached index
+
+							// ...in a gzip-friendly way
+							node = parent;
+							outerCache = node[ expando ] || (node[ expando ] = {});
+
+							// Support: IE <9 only
+							// Defend against cloned attroperties (jQuery gh-1709)
+							uniqueCache = outerCache[ node.uniqueID ] ||
+								(outerCache[ node.uniqueID ] = {});
+
+							cache = uniqueCache[ type ] || [];
+							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+							diff = nodeIndex && cache[ 2 ];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						} else {
+							// Use previously-cached element index if available
+							if ( useCache ) {
+								// ...in a gzip-friendly way
+								node = elem;
+								outerCache = node[ expando ] || (node[ expando ] = {});
+
+								// Support: IE <9 only
+								// Defend against cloned attroperties (jQuery gh-1709)
+								uniqueCache = outerCache[ node.uniqueID ] ||
+									(outerCache[ node.uniqueID ] = {});
+
+								cache = uniqueCache[ type ] || [];
+								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
+								diff = nodeIndex;
+							}
+
+							// xml :nth-child(...)
+							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
+							if ( diff === false ) {
+								// Use the same loop as above to seek `elem` from the start
+								while ( (node = ++nodeIndex && node && node[ dir ] ||
+									(diff = nodeIndex = 0) || start.pop()) ) {
+
+									if ( ( ofType ?
+										node.nodeName.toLowerCase() === name :
+										node.nodeType === 1 ) &&
+										++diff ) {
+
+										// Cache the index of each encountered element
+										if ( useCache ) {
+											outerCache = node[ expando ] || (node[ expando ] = {});
+
+											// Support: IE <9 only
+											// Defend against cloned attroperties (jQuery gh-1709)
+											uniqueCache = outerCache[ node.uniqueID ] ||
+												(outerCache[ node.uniqueID ] = {});
+
+											uniqueCache[ type ] = [ dirruns, diff ];
+										}
+
+										if ( node === elem ) {
+											break;
+										}
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					// Don't keep the element (issue #299)
+					input[0] = null;
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			text = text.replace( runescape, funescape );
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifier
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsHTML ?
+						elem.lang :
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
+			//   but not by others (comment: 8; processing instruction: 7; etc.)
+			// nodeType < 6 works because attributes (2) do not appear as children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeType < 6 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+
+				// Support: IE<8
+				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( (tokens = []) );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push({
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			});
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push({
+					value: matched,
+					type: type,
+					matches: match
+				});
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+};
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var oldCache, uniqueCache, outerCache,
+				newCache = [ dirruns, doneName ];
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+
+						// Support: IE <9 only
+						// Defend against cloned attroperties (jQuery gh-1709)
+						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+
+						if ( (oldCache = uniqueCache[ dir ]) &&
+							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
+
+							// Assign to newCache so results back-propagate to previous elements
+							return (newCache[ 2 ] = oldCache[ 2 ]);
+						} else {
+							// Reuse newcache so results back-propagate to previous elements
+							uniqueCache[ dir ] = newCache;
+
+							// A match means we're done; a fail means we have to keep checking
+							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+			// Avoid hanging onto element (issue #299)
+			checkContext = null;
+			return ret;
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector(
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+					).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	var bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, outermost ) {
+			var elem, j, matcher,
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				setMatched = [],
+				contextBackup = outermostContext,
+				// We must always have either seed elements or outermost context
+				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				len = elems.length;
+
+			if ( outermost ) {
+				outermostContext = context === document || context || outermost;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Support: IE<9, Safari
+			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
+			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					if ( !context && elem.ownerDocument !== document ) {
+						setDocument( elem );
+						xml = !documentIsHTML;
+					}
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context || document, xml) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// `i` is now the count of elements visited above, and adding it to `matchedCount`
+			// makes the latter nonnegative.
+			matchedCount += i;
+
+			// Apply set filters to unmatched elements
+			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
+			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
+			// no element matchers and no seed.
+			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
+			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
+			// numerically zero.
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !match ) {
+			match = tokenize( selector );
+		}
+		i = match.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( match[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+
+		// Save selector and tokenization
+		cached.selector = selector;
+	}
+	return cached;
+};
+
+/**
+ * A low-level selection function that works with Sizzle's compiled
+ *  selector functions
+ * @param {String|Function} selector A selector or a pre-compiled
+ *  selector function built with Sizzle.compile
+ * @param {Element} context
+ * @param {Array} [results]
+ * @param {Array} [seed] A set of elements to match against
+ */
+select = Sizzle.select = function( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		compiled = typeof selector === "function" && selector,
+		match = !seed && tokenize( (selector = compiled.selector || selector) );
+
+	results = results || [];
+
+	// Try to minimize operations if there is only one selector in the list and no seed
+	// (the latter of which guarantees us context)
+	if ( match.length === 1 ) {
+
+		// Reduce context if the leading compound selector is an ID
+		tokens = match[0] = match[0].slice( 0 );
+		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+				support.getById && context.nodeType === 9 && documentIsHTML &&
+				Expr.relative[ tokens[1].type ] ) {
+
+			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			if ( !context ) {
+				return results;
+
+			// Precompiled matchers will still verify ancestry, so step up a level
+			} else if ( compiled ) {
+				context = context.parentNode;
+			}
+
+			selector = selector.slice( tokens.shift().value.length );
+		}
+
+		// Fetch a seed set for right-to-left matching
+		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		while ( i-- ) {
+			token = tokens[i];
+
+			// Abort if we hit a combinator
+			if ( Expr.relative[ (type = token.type) ] ) {
+				break;
+			}
+			if ( (find = Expr.find[ type ]) ) {
+				// Search, expanding context for leading sibling combinators
+				if ( (seed = find(
+					token.matches[0].replace( runescape, funescape ),
+					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
+				)) ) {
+
+					// If seed is empty or no tokens remain, we can return early
+					tokens.splice( i, 1 );
+					selector = seed.length && toSelector( tokens );
+					if ( !selector ) {
+						push.apply( results, seed );
+						return results;
+					}
+
+					break;
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function if one is not provided
+	// Provide `match` to avoid retokenization if we modified the selector above
+	( compiled || compile( selector, match ) )(
+		seed,
+		context,
+		!documentIsHTML,
+		results,
+		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
+	);
+	return results;
+};
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Support: Chrome 14-35+
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = !!hasDuplicate;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+	// Should return 1, but returns 4 (following)
+	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+	div.innerHTML = "<a href='#'></a>";
+	return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+	div.innerHTML = "<input/>";
+	div.firstChild.setAttribute( "value", "" );
+	return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+	return div.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return elem[ name ] === true ? name.toLowerCase() :
+					(val = elem.getAttributeNode( name )) && val.specified ?
+					val.value :
+				null;
+		}
+	});
+}
+
+return Sizzle;
+
+})( window );
+
+
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[ ":" ] = jQuery.expr.pseudos;
+jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+
+var dir = function( elem, dir, until ) {
+	var matched = [],
+		truncate = until !== undefined;
+
+	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
+		if ( elem.nodeType === 1 ) {
+			if ( truncate && jQuery( elem ).is( until ) ) {
+				break;
+			}
+			matched.push( elem );
+		}
+	}
+	return matched;
+};
+
+
+var siblings = function( n, elem ) {
+	var matched = [];
+
+	for ( ; n; n = n.nextSibling ) {
+		if ( n.nodeType === 1 && n !== elem ) {
+			matched.push( n );
+		}
+	}
+
+	return matched;
+};
+
+
+var rneedsContext = jQuery.expr.match.needsContext;
+
+var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
+
+
+
+var risSimple = /^.[^:#\[\.,]*$/;
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		} );
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		} );
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( risSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
+	} );
+}
+
+jQuery.filter = function( expr, elems, not ) {
+	var elem = elems[ 0 ];
+
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return elems.length === 1 && elem.nodeType === 1 ?
+		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+			return elem.nodeType === 1;
+		} ) );
+};
+
+jQuery.fn.extend( {
+	find: function( selector ) {
+		var i,
+			ret = [],
+			self = this,
+			len = self.length;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter( function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			} ) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+	filter: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], false ) );
+	},
+	not: function( selector ) {
+		return this.pushStack( winnow( this, selector || [], true ) );
+	},
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	}
+} );
+
+
+// Initialize a jQuery object
+
+
+// A central reference to the root jQuery(document)
+var rootjQuery,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	init = jQuery.fn.init = function( selector, context, root ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// init accepts an alternate rootjQuery
+		// so migrate can support jQuery.sub (gh-2101)
+		root = root || rootjQuery;
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt( 0 ) === "<" &&
+				selector.charAt( selector.length - 1 ) === ">" &&
+				selector.length >= 3 ) {
+
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && ( match[ 1 ] || !context ) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[ 1 ] ) {
+					context = context instanceof jQuery ? context[ 0 ] : context;
+
+					// scripts is true for back-compat
+					// Intentionally let the error be thrown if parseHTML is not present
+					jQuery.merge( this, jQuery.parseHTML(
+						match[ 1 ],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[ 2 ] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[ 2 ] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[ 0 ] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || root ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[ 0 ] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return typeof root.ready !== "undefined" ?
+				root.ready( selector ) :
+
+				// Execute immediately if ready is not present
+				selector( jQuery );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	};
+
+// Give the init function the jQuery prototype for later instantiation
+init.prototype = jQuery.fn;
+
+// Initialize central reference
+rootjQuery = jQuery( document );
+
+
+var rparentsprev = /^(?:parents|prev(?:Until|All))/,
+
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend( {
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter( function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[ i ] ) ) {
+					return true;
+				}
+			}
+		} );
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			matched = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
+
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && ( pos ?
+					pos.index( cur ) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector( cur, selectors ) ) ) {
+
+					matched.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[ 0 ], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[ 0 ] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		return this.pushStack(
+			jQuery.uniqueSort(
+				jQuery.merge( this.get(), jQuery( selector, context ) )
+			)
+		);
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	}
+} );
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each( {
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return siblings( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return siblings( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		if ( this.length > 1 ) {
+
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				ret = jQuery.uniqueSort( ret );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				ret = ret.reverse();
+			}
+		}
+
+		return this.pushStack( ret );
+	};
+} );
+var rnotwhite = ( /\S+/g );
+
+
+
+// Convert String-formatted options into Object-formatted ones
+function createOptions( options ) {
+	var object = {};
+	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	} );
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		createOptions( options ) :
+		jQuery.extend( {}, options );
+
+	var // Flag to know if list is currently firing
+		firing,
+
+		// Last fire value for non-forgettable lists
+		memory,
+
+		// Flag to know if list was already fired
+		fired,
+
+		// Flag to prevent firing
+		locked,
+
+		// Actual callback list
+		list = [],
+
+		// Queue of execution data for repeatable lists
+		queue = [],
+
+		// Index of currently firing callback (modified by add/remove as needed)
+		firingIndex = -1,
+
+		// Fire callbacks
+		fire = function() {
+
+			// Enforce single-firing
+			locked = options.once;
+
+			// Execute callbacks for all pending executions,
+			// respecting firingIndex overrides and runtime changes
+			fired = firing = true;
+			for ( ; queue.length; firingIndex = -1 ) {
+				memory = queue.shift();
+				while ( ++firingIndex < list.length ) {
+
+					// Run callback and check for early termination
+					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
+						options.stopOnFalse ) {
+
+						// Jump to end and forget the data so .add doesn't re-fire
+						firingIndex = list.length;
+						memory = false;
+					}
+				}
+			}
+
+			// Forget the data if we're done with it
+			if ( !options.memory ) {
+				memory = false;
+			}
+
+			firing = false;
+
+			// Clean up if we're done firing for good
+			if ( locked ) {
+
+				// Keep an empty list if we have data for future add calls
+				if ( memory ) {
+					list = [];
+
+				// Otherwise, this object is spent
+				} else {
+					list = "";
+				}
+			}
+		},
+
+		// Actual Callbacks object
+		self = {
+
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+
+					// If we have memory from a past run, we should fire after adding
+					if ( memory && !firing ) {
+						firingIndex = list.length - 1;
+						queue.push( memory );
+					}
+
+					( function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							if ( jQuery.isFunction( arg ) ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
+
+								// Inspect recursively
+								add( arg );
+							}
+						} );
+					} )( arguments );
+
+					if ( memory && !firing ) {
+						fire();
+					}
+				}
+				return this;
+			},
+
+			// Remove a callback from the list
+			remove: function() {
+				jQuery.each( arguments, function( _, arg ) {
+					var index;
+					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+						list.splice( index, 1 );
+
+						// Handle firing indexes
+						if ( index <= firingIndex ) {
+							firingIndex--;
+						}
+					}
+				} );
+				return this;
+			},
+
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ?
+					jQuery.inArray( fn, list ) > -1 :
+					list.length > 0;
+			},
+
+			// Remove all callbacks from the list
+			empty: function() {
+				if ( list ) {
+					list = [];
+				}
+				return this;
+			},
+
+			// Disable .fire and .add
+			// Abort any current/pending executions
+			// Clear all callbacks and values
+			disable: function() {
+				locked = queue = [];
+				list = memory = "";
+				return this;
+			},
+			disabled: function() {
+				return !list;
+			},
+
+			// Disable .fire
+			// Also disable .add unless we have memory (since it would have no effect)
+			// Abort any pending executions
+			lock: function() {
+				locked = true;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			locked: function() {
+				return !!locked;
+			},
+
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				if ( !locked ) {
+					args = args || [];
+					args = [ context, args.slice ? args.slice() : args ];
+					queue.push( args );
+					if ( !firing ) {
+						fire();
+					}
+				}
+				return this;
+			},
+
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+
+
+jQuery.extend( {
+
+	Deferred: function( func ) {
+		var tuples = [
+
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred( function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[ 1 ] ]( function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.progress( newDefer.notify )
+										.done( newDefer.resolve )
+										.fail( newDefer.reject );
+								} else {
+									newDefer[ tuple[ 0 ] + "With" ](
+										this === promise ? newDefer.promise() : this,
+										fn ? [ returned ] : arguments
+									);
+								}
+							} );
+						} );
+						fns = null;
+					} ).promise();
+				},
+
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[ 1 ] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add( function() {
+
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[ 0 ] ] = function() {
+				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
+				return this;
+			};
+			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
+		} );
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 ||
+				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred.
+			// If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
+					if ( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+
+					} else if ( !( --remaining ) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.progress( updateFunc( i, progressContexts, progressValues ) )
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject );
+				} else {
+					--remaining;
+				}
+			}
+		}
+
+		// if we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
+	}
+} );
+
+
+// The deferred used on DOM ready
+var readyList;
+
+jQuery.fn.ready = function( fn ) {
+
+	// Add the callback
+	jQuery.ready.promise().done( fn );
+
+	return this;
+};
+
+jQuery.extend( {
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+
+		// Trigger any bound ready events
+		if ( jQuery.fn.triggerHandler ) {
+			jQuery( document ).triggerHandler( "ready" );
+			jQuery( document ).off( "ready" );
+		}
+	}
+} );
+
+/**
+ * Clean-up method for dom ready events
+ */
+function detach() {
+	if ( document.addEventListener ) {
+		document.removeEventListener( "DOMContentLoaded", completed );
+		window.removeEventListener( "load", completed );
+
+	} else {
+		document.detachEvent( "onreadystatechange", completed );
+		window.detachEvent( "onload", completed );
+	}
+}
+
+/**
+ * The ready event handler and self cleanup method
+ */
+function completed() {
+
+	// readyState === "complete" is good enough for us to call the dom ready in oldIE
+	if ( document.addEventListener ||
+		window.event.type === "load" ||
+		document.readyState === "complete" ) {
+
+		detach();
+		jQuery.ready();
+	}
+}
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called
+		// after the browser event has already occurred.
+		// Support: IE6-10
+		// Older IE sometimes signals "interactive" too soon
+		if ( document.readyState === "complete" ||
+			( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
+
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			window.setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed );
+
+		// If IE event model is used
+		} else {
+
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch ( e ) {}
+
+			if ( top && top.doScroll ) {
+				( function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll( "left" );
+						} catch ( e ) {
+							return window.setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				} )();
+			}
+		}
+	}
+	return readyList.promise( obj );
+};
+
+// Kick off the DOM ready check even if the user does not
+jQuery.ready.promise();
+
+
+
+
+// Support: IE<9
+// Iteration over object's inherited properties before its own
+var i;
+for ( i in jQuery( support ) ) {
+	break;
+}
+support.ownFirst = i === "0";
+
+// Note: most support tests are defined in their respective modules.
+// false until the test is run
+support.inlineBlockNeedsLayout = false;
+
+// Execute ASAP in case we need to set body.style.zoom
+jQuery( function() {
+
+	// Minified: var a,b,c,d
+	var val, div, body, container;
+
+	body = document.getElementsByTagName( "body" )[ 0 ];
+	if ( !body || !body.style ) {
+
+		// Return for frameset docs that don't have a body
+		return;
+	}
+
+	// Setup
+	div = document.createElement( "div" );
+	container = document.createElement( "div" );
+	container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+	body.appendChild( container ).appendChild( div );
+
+	if ( typeof div.style.zoom !== "undefined" ) {
+
+		// Support: IE<8
+		// Check if natively block-level elements act like inline-block
+		// elements when setting their display to 'inline' and giving
+		// them layout
+		div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
+
+		support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
+		if ( val ) {
+
+			// Prevent IE 6 from affecting layout for positioned elements #11048
+			// Prevent IE from shrinking the body in IE 7 mode #12869
+			// Support: IE<8
+			body.style.zoom = 1;
+		}
+	}
+
+	body.removeChild( container );
+} );
+
+
+( function() {
+	var div = document.createElement( "div" );
+
+	// Support: IE<9
+	support.deleteExpando = true;
+	try {
+		delete div.test;
+	} catch ( e ) {
+		support.deleteExpando = false;
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+} )();
+var acceptData = function( elem ) {
+	var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ],
+		nodeType = +elem.nodeType || 1;
+
+	// Do not set data on non-element DOM nodes because it will not be cleared (#8335).
+	return nodeType !== 1 && nodeType !== 9 ?
+		false :
+
+		// Nodes accept data unless otherwise specified; rejection can be conditional
+		!noData || noData !== true && elem.getAttribute( "classid" ) === noData;
+};
+
+
+
+
+var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+function dataAttr( elem, key, data ) {
+
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch ( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
+	if ( !acceptData( elem ) ) {
+		return;
+	}
+
+	var ret, thisCache,
+		internalKey = jQuery.expando,
+
+		// We have to handle DOM nodes and JS objects differently because IE6-7
+		// can't GC object references properly across the DOM-JS boundary
+		isNode = elem.nodeType,
+
+		// Only DOM nodes need the global jQuery cache; JS object data is
+		// attached directly to the object so GC can occur automatically
+		cache = isNode ? jQuery.cache : elem,
+
+		// Only defining an ID for JS objects if its cache already exists allows
+		// the code to shortcut on the same path as a DOM node with no cache
+		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+	// Avoid doing any more work than we need to when trying to get data on an
+	// object that has no data at all
+	if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
+		data === undefined && typeof name === "string" ) {
+		return;
+	}
+
+	if ( !id ) {
+
+		// Only DOM nodes need a new unique ID for each element since their data
+		// ends up in the global cache
+		if ( isNode ) {
+			id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
+		} else {
+			id = internalKey;
+		}
+	}
+
+	if ( !cache[ id ] ) {
+
+		// Avoid exposing jQuery metadata on plain JS objects when the object
+		// is serialized using JSON.stringify
+		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
+	}
+
+	// An object can be passed to jQuery.data instead of a key/value pair; this gets
+	// shallow copied over onto the existing cache
+	if ( typeof name === "object" || typeof name === "function" ) {
+		if ( pvt ) {
+			cache[ id ] = jQuery.extend( cache[ id ], name );
+		} else {
+			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+		}
+	}
+
+	thisCache = cache[ id ];
+
+	// jQuery data() is stored in a separate object inside the object's internal data
+	// cache in order to avoid key collisions between internal data and user-defined
+	// data.
+	if ( !pvt ) {
+		if ( !thisCache.data ) {
+			thisCache.data = {};
+		}
+
+		thisCache = thisCache.data;
+	}
+
+	if ( data !== undefined ) {
+		thisCache[ jQuery.camelCase( name ) ] = data;
+	}
+
+	// Check for both converted-to-camel and non-converted data property names
+	// If a data property was specified
+	if ( typeof name === "string" ) {
+
+		// First Try to find as-is property data
+		ret = thisCache[ name ];
+
+		// Test for null|undefined property data
+		if ( ret == null ) {
+
+			// Try to find the camelCased property
+			ret = thisCache[ jQuery.camelCase( name ) ];
+		}
+	} else {
+		ret = thisCache;
+	}
+
+	return ret;
+}
+
+function internalRemoveData( elem, name, pvt ) {
+	if ( !acceptData( elem ) ) {
+		return;
+	}
+
+	var thisCache, i,
+		isNode = elem.nodeType,
+
+		// See jQuery.data for more information
+		cache = isNode ? jQuery.cache : elem,
+		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+	// If there is already no cache entry for this object, there is no
+	// purpose in continuing
+	if ( !cache[ id ] ) {
+		return;
+	}
+
+	if ( name ) {
+
+		thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+		if ( thisCache ) {
+
+			// Support array or space separated string names for data keys
+			if ( !jQuery.isArray( name ) ) {
+
+				// try the string as a key before any manipulation
+				if ( name in thisCache ) {
+					name = [ name ];
+				} else {
+
+					// split the camel cased version by spaces unless a key with the spaces exists
+					name = jQuery.camelCase( name );
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+						name = name.split( " " );
+					}
+				}
+			} else {
+
+				// If "name" is an array of keys...
+				// When data is initially created, via ("key", "val") signature,
+				// keys will be converted to camelCase.
+				// Since there is no way to tell _how_ a key was added, remove
+				// both plain key and camelCase key. #12786
+				// This will only penalize the array argument path.
+				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+			}
+
+			i = name.length;
+			while ( i-- ) {
+				delete thisCache[ name[ i ] ];
+			}
+
+			// If there is no data left in the cache, we want to continue
+			// and let the cache object itself get destroyed
+			if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) {
+				return;
+			}
+		}
+	}
+
+	// See jQuery.data for more information
+	if ( !pvt ) {
+		delete cache[ id ].data;
+
+		// Don't destroy the parent cache unless the internal data object
+		// had been the only thing left in it
+		if ( !isEmptyDataObject( cache[ id ] ) ) {
+			return;
+		}
+	}
+
+	// Destroy the cache
+	if ( isNode ) {
+		jQuery.cleanData( [ elem ], true );
+
+	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+	/* jshint eqeqeq: false */
+	} else if ( support.deleteExpando || cache != cache.window ) {
+		/* jshint eqeqeq: true */
+		delete cache[ id ];
+
+	// When all else fails, undefined
+	} else {
+		cache[ id ] = undefined;
+	}
+}
+
+jQuery.extend( {
+	cache: {},
+
+	// The following elements (space-suffixed to avoid Object.prototype collisions)
+	// throw uncatchable exceptions if you attempt to set expando properties
+	noData: {
+		"applet ": true,
+		"embed ": true,
+
+		// ...but Flash objects (which have this classid) *can* handle expandos
+		"object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data ) {
+		return internalData( elem, name, data );
+	},
+
+	removeData: function( elem, name ) {
+		return internalRemoveData( elem, name );
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return internalData( elem, name, data, true );
+	},
+
+	_removeData: function( elem, name ) {
+		return internalRemoveData( elem, name, true );
+	}
+} );
+
+jQuery.fn.extend( {
+	data: function( key, value ) {
+		var i, name, data,
+			elem = this[ 0 ],
+			attrs = elem && elem.attributes;
+
+		// Special expections of .data basically thwart jQuery.access,
+		// so implement the relevant behavior ourselves
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					i = attrs.length;
+					while ( i-- ) {
+
+						// Support: IE11+
+						// The attrs elements can be null (#14894)
+						if ( attrs[ i ] ) {
+							name = attrs[ i ].name;
+							if ( name.indexOf( "data-" ) === 0 ) {
+								name = jQuery.camelCase( name.slice( 5 ) );
+								dataAttr( elem, name, data[ name ] );
+							}
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each( function() {
+				jQuery.data( this, key );
+			} );
+		}
+
+		return arguments.length > 1 ?
+
+			// Sets one value
+			this.each( function() {
+				jQuery.data( this, key, value );
+			} ) :
+
+			// Gets one value
+			// Try to fetch any internally stored data first
+			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
+	},
+
+	removeData: function( key ) {
+		return this.each( function() {
+			jQuery.removeData( this, key );
+		} );
+	}
+} );
+
+
+jQuery.extend( {
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray( data ) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray( data ) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// not intended for public consumption - generates a queueHooks object,
+	// or returns the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+			empty: jQuery.Callbacks( "once memory" ).add( function() {
+				jQuery._removeData( elem, type + "queue" );
+				jQuery._removeData( elem, key );
+			} )
+		} );
+	}
+} );
+
+jQuery.fn.extend( {
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[ 0 ], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each( function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			} );
+	},
+	dequeue: function( type ) {
+		return this.each( function() {
+			jQuery.dequeue( this, type );
+		} );
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while ( i-- ) {
+			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+} );
+
+
+( function() {
+	var shrinkWrapBlocksVal;
+
+	support.shrinkWrapBlocks = function() {
+		if ( shrinkWrapBlocksVal != null ) {
+			return shrinkWrapBlocksVal;
+		}
+
+		// Will be changed later if needed.
+		shrinkWrapBlocksVal = false;
+
+		// Minified: var b,c,d
+		var div, body, container;
+
+		body = document.getElementsByTagName( "body" )[ 0 ];
+		if ( !body || !body.style ) {
+
+			// Test fired too early or in an unsupported environment, exit.
+			return;
+		}
+
+		// Setup
+		div = document.createElement( "div" );
+		container = document.createElement( "div" );
+		container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
+		body.appendChild( container ).appendChild( div );
+
+		// Support: IE6
+		// Check if elements with layout shrink-wrap their children
+		if ( typeof div.style.zoom !== "undefined" ) {
+
+			// Reset CSS: box-sizing; display; margin; border
+			div.style.cssText =
+
+				// Support: Firefox<29, Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;" +
+				"padding:1px;width:1px;zoom:1";
+			div.appendChild( document.createElement( "div" ) ).style.width = "5px";
+			shrinkWrapBlocksVal = div.offsetWidth !== 3;
+		}
+
+		body.removeChild( container );
+
+		return shrinkWrapBlocksVal;
+	};
+
+} )();
+var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
+
+var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
+
+
+var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
+
+var isHidden = function( elem, el ) {
+
+		// isHidden might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+		return jQuery.css( elem, "display" ) === "none" ||
+			!jQuery.contains( elem.ownerDocument, elem );
+	};
+
+
+
+function adjustCSS( elem, prop, valueParts, tween ) {
+	var adjusted,
+		scale = 1,
+		maxIterations = 20,
+		currentValue = tween ?
+			function() { return tween.cur(); } :
+			function() { return jQuery.css( elem, prop, "" ); },
+		initial = currentValue(),
+		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+		// Starting value computation is required for potential unit mismatches
+		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+			rcssNum.exec( jQuery.css( elem, prop ) );
+
+	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
+
+		// Trust units reported by jQuery.css
+		unit = unit || initialInUnit[ 3 ];
+
+		// Make sure we update the tween properties later on
+		valueParts = valueParts || [];
+
+		// Iteratively approximate from a nonzero starting point
+		initialInUnit = +initial || 1;
+
+		do {
+
+			// If previous iteration zeroed out, double until we get *something*.
+			// Use string for doubling so we don't accidentally see scale as unchanged below
+			scale = scale || ".5";
+
+			// Adjust and apply
+			initialInUnit = initialInUnit / scale;
+			jQuery.style( elem, prop, initialInUnit + unit );
+
+		// Update scale, tolerating zero or NaN from tween.cur()
+		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
+		} while (
+			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
+		);
+	}
+
+	if ( valueParts ) {
+		initialInUnit = +initialInUnit || +initial || 0;
+
+		// Apply relative offset (+=/-=) if specified
+		adjusted = valueParts[ 1 ] ?
+			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
+			+valueParts[ 2 ];
+		if ( tween ) {
+			tween.unit = unit;
+			tween.start = initialInUnit;
+			tween.end = adjusted;
+		}
+	}
+	return adjusted;
+}
+
+
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+	var i = 0,
+		length = elems.length,
+		bulk = key == null;
+
+	// Sets many values
+	if ( jQuery.type( key ) === "object" ) {
+		chainable = true;
+		for ( i in key ) {
+			access( elems, fn, i, key[ i ], true, emptyGet, raw );
+		}
+
+	// Sets one value
+	} else if ( value !== undefined ) {
+		chainable = true;
+
+		if ( !jQuery.isFunction( value ) ) {
+			raw = true;
+		}
+
+		if ( bulk ) {
+
+			// Bulk operations run against the entire set
+			if ( raw ) {
+				fn.call( elems, value );
+				fn = null;
+
+			// ...except when executing function values
+			} else {
+				bulk = fn;
+				fn = function( elem, key, value ) {
+					return bulk.call( jQuery( elem ), value );
+				};
+			}
+		}
+
+		if ( fn ) {
+			for ( ; i < length; i++ ) {
+				fn(
+					elems[ i ],
+					key,
+					raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) )
+				);
+			}
+		}
+	}
+
+	return chainable ?
+		elems :
+
+		// Gets
+		bulk ?
+			fn.call( elems ) :
+			length ? fn( elems[ 0 ], key ) : emptyGet;
+};
+var rcheckableType = ( /^(?:checkbox|radio)$/i );
+
+var rtagName = ( /<([\w:-]+)/ );
+
+var rscriptType = ( /^$|\/(?:java|ecma)script/i );
+
+var rleadingWhitespace = ( /^\s+/ );
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" +
+		"details|dialog|figcaption|figure|footer|header|hgroup|main|" +
+		"mark|meter|nav|output|picture|progress|section|summary|template|time|video";
+
+
+
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+
+( function() {
+	var div = document.createElement( "div" ),
+		fragment = document.createDocumentFragment(),
+		input = document.createElement( "input" );
+
+	// Setup
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// IE strips leading whitespace when .innerHTML is used
+	support.leadingWhitespace = div.firstChild.nodeType === 3;
+
+	// Make sure that tbody elements aren't automatically inserted
+	// IE will insert them into empty tables
+	support.tbody = !div.getElementsByTagName( "tbody" ).length;
+
+	// Make sure that link elements get serialized correctly by innerHTML
+	// This requires a wrapper element in IE
+	support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
+
+	// Makes sure cloning an html5 element does not cause problems
+	// Where outerHTML is undefined, this still works
+	support.html5Clone =
+		document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav></:nav>";
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	input.type = "checkbox";
+	input.checked = true;
+	fragment.appendChild( input );
+	support.appendChecked = input.checked;
+
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	// Support: IE6-IE11+
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	fragment.appendChild( div );
+
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input = document.createElement( "input" );
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
+	// old WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<9
+	// Cloned elements keep attachEvent handlers, we use addEventListener on IE9+
+	support.noCloneEvent = !!div.addEventListener;
+
+	// Support: IE<9
+	// Since attributes and properties are the same in IE,
+	// cleanData must set properties to undefined rather than use removeAttribute
+	div[ jQuery.expando ] = 1;
+	support.attributes = !div.getAttribute( jQuery.expando );
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
+	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+	legend: [ 1, "<fieldset>", "</fieldset>" ],
+	area: [ 1, "<map>", "</map>" ],
+
+	// Support: IE8
+	param: [ 1, "<object>", "</object>" ],
+	thead: [ 1, "<table>", "</table>" ],
+	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+	col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+	// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+	// unless wrapped in a div with non-breaking characters in front of it.
+	_default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>" ]
+};
+
+// Support: IE8-IE9
+wrapMap.optgroup = wrapMap.option;
+
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== "undefined" ?
+				context.querySelectorAll( tag || "*" ) :
+				undefined;
+
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context;
+			( elem = elems[ i ] ) != null;
+			i++
+		) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; ( elem = elems[ i ] ) != null; i++ ) {
+		jQuery._data(
+			elem,
+			"globalEval",
+			!refElements || jQuery._data( refElements[ i ], "globalEval" )
+		);
+	}
+}
+
+
+var rhtml = /<|&#?\w+;/,
+	rtbody = /<tbody/i;
+
+function fixDefaultChecked( elem ) {
+	if ( rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+function buildFragment( elems, context, scripts, selection, ignored ) {
+	var j, elem, contains,
+		tmp, tag, tbody, wrap,
+		l = elems.length,
+
+		// Ensure a safe fragment
+		safe = createSafeFragment( context ),
+
+		nodes = [],
+		i = 0;
+
+	for ( ; i < l; i++ ) {
+		elem = elems[ i ];
+
+		if ( elem || elem === 0 ) {
+
+			// Add nodes directly
+			if ( jQuery.type( elem ) === "object" ) {
+				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+			// Convert non-html into a text node
+			} else if ( !rhtml.test( elem ) ) {
+				nodes.push( context.createTextNode( elem ) );
+
+			// Convert html into DOM nodes
+			} else {
+				tmp = tmp || safe.appendChild( context.createElement( "div" ) );
+
+				// Deserialize a standard representation
+				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
+				wrap = wrapMap[ tag ] || wrapMap._default;
+
+				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
+
+				// Descend through wrappers to the right content
+				j = wrap[ 0 ];
+				while ( j-- ) {
+					tmp = tmp.lastChild;
+				}
+
+				// Manually add leading whitespace removed by IE
+				if ( !support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[ 0 ] ) );
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					elem = tag === "table" && !rtbody.test( elem ) ?
+						tmp.firstChild :
+
+						// String was a bare <thead> or <tfoot>
+						wrap[ 1 ] === "<table>" && !rtbody.test( elem ) ?
+							tmp :
+							0;
+
+					j = elem && elem.childNodes.length;
+					while ( j-- ) {
+						if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) &&
+							!tbody.childNodes.length ) {
+
+							elem.removeChild( tbody );
+						}
+					}
+				}
+
+				jQuery.merge( nodes, tmp.childNodes );
+
+				// Fix #12392 for WebKit and IE > 9
+				tmp.textContent = "";
+
+				// Fix #12392 for oldIE
+				while ( tmp.firstChild ) {
+					tmp.removeChild( tmp.firstChild );
+				}
+
+				// Remember the top-level container for proper cleanup
+				tmp = safe.lastChild;
+			}
+		}
+	}
+
+	// Fix #11356: Clear elements from fragment
+	if ( tmp ) {
+		safe.removeChild( tmp );
+	}
+
+	// Reset defaultChecked for any radios and checkboxes
+	// about to be appended to the DOM in IE 6/7 (#8060)
+	if ( !support.appendChecked ) {
+		jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+	}
+
+	i = 0;
+	while ( ( elem = nodes[ i++ ] ) ) {
+
+		// Skip elements already in the context collection (trac-4087)
+		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
+			if ( ignored ) {
+				ignored.push( elem );
+			}
+
+			continue;
+		}
+
+		contains = jQuery.contains( elem.ownerDocument, elem );
+
+		// Append to fragment
+		tmp = getAll( safe.appendChild( elem ), "script" );
+
+		// Preserve script evaluation history
+		if ( contains ) {
+			setGlobalEval( tmp );
+		}
+
+		// Capture executables
+		if ( scripts ) {
+			j = 0;
+			while ( ( elem = tmp[ j++ ] ) ) {
+				if ( rscriptType.test( elem.type || "" ) ) {
+					scripts.push( elem );
+				}
+			}
+		}
+	}
+
+	tmp = null;
+
+	return safe;
+}
+
+
+( function() {
+	var i, eventName,
+		div = document.createElement( "div" );
+
+	// Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events)
+	for ( i in { submit: true, change: true, focusin: true } ) {
+		eventName = "on" + i;
+
+		if ( !( support[ i ] = eventName in window ) ) {
+
+			// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+			div.setAttribute( eventName, "t" );
+			support[ i ] = div.attributes[ eventName ].expando === false;
+		}
+	}
+
+	// Null elements to avoid leaks in IE.
+	div = null;
+} )();
+
+
+var rformElems = /^(?:input|select|textarea)$/i,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+// Support: IE9
+// See #13393 for more info
+function safeActiveElement() {
+	try {
+		return document.activeElement;
+	} catch ( err ) { }
+}
+
+function on( elem, types, selector, data, fn, one ) {
+	var origFn, type;
+
+	// Types can be a map of types/handlers
+	if ( typeof types === "object" ) {
+
+		// ( types-Object, selector, data )
+		if ( typeof selector !== "string" ) {
+
+			// ( types-Object, data )
+			data = data || selector;
+			selector = undefined;
+		}
+		for ( type in types ) {
+			on( elem, type, selector, data, types[ type ], one );
+		}
+		return elem;
+	}
+
+	if ( data == null && fn == null ) {
+
+		// ( types, fn )
+		fn = selector;
+		data = selector = undefined;
+	} else if ( fn == null ) {
+		if ( typeof selector === "string" ) {
+
+			// ( types, selector, fn )
+			fn = data;
+			data = undefined;
+		} else {
+
+			// ( types, data, fn )
+			fn = data;
+			data = selector;
+			selector = undefined;
+		}
+	}
+	if ( fn === false ) {
+		fn = returnFalse;
+	} else if ( !fn ) {
+		return elem;
+	}
+
+	if ( one === 1 ) {
+		origFn = fn;
+		fn = function( event ) {
+
+			// Can use an empty set, since event contains the info
+			jQuery().off( event );
+			return origFn.apply( this, arguments );
+		};
+
+		// Use same guid so caller can remove using origFn
+		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+	}
+	return elem.each( function() {
+		jQuery.event.add( this, types, fn, data, selector );
+	} );
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+		var tmp, events, t, handleObjIn,
+			special, eventHandle, handleObj,
+			handlers, type, namespaces, origType,
+			elemData = jQuery._data( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
+		if ( !elemData ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !( events = elemData.events ) ) {
+			events = elemData.events = {};
+		}
+		if ( !( eventHandle = elemData.handle ) ) {
+			eventHandle = elemData.handle = function( e ) {
+
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" &&
+					( !e || jQuery.event.triggered !== e.type ) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+
+			// Add elem as a property of the handle fn to prevent a memory leak
+			// with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+
+			// There *must* be a type, no attaching namespace-only handlers
+			if ( !type ) {
+				continue;
+			}
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend( {
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join( "." )
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			if ( !( handlers = events[ type ] ) ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup ||
+					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+		var j, handleObj, tmp,
+			origCount, t, events,
+			special, handlers, type,
+			namespaces, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		if ( !elemData || !( events = elemData.events ) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			type = origType = tmp[ 1 ];
+			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[ 2 ] &&
+				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
+
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector ||
+						selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
+
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown ||
+					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery._removeData( elem, "events" );
+		}
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		var handle, ontype, cur,
+			bubbleType, special, tmp, i,
+			eventPath = [ elem || document ],
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
+
+		cur = tmp = elem = elem || document;
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf( "." ) > -1 ) {
+
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split( "." );
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf( ":" ) < 0 && "on" + type;
+
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+
+		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+		event.isTrigger = onlyHandlers ? 2 : 3;
+		event.namespace = namespaces.join( "." );
+		event.rnamespace = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
+			null;
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === ( elem.ownerDocument || document ) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+
+		// Fire handlers on the event path
+		i = 0;
+		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
+
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+
+			// jQuery handler
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] &&
+				jQuery._data( cur, "handle" );
+
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && handle.apply && acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if (
+				( !special._default ||
+				 special._default.apply( eventPath.pop(), data ) === false
+				) && acceptData( elem )
+			) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					try {
+						elem[ type ]();
+					} catch ( e ) {
+
+						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
+						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
+					}
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
+
+		var i, j, ret, matched, handleObj,
+			handlerQueue = [],
+			args = slice.call( arguments ),
+			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[ 0 ] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+				!event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
+				// a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+						handleObj.handler ).apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( ( event.result = ret ) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var i, matches, sel, handleObj,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Support (at least): Chrome, IE9
+		// Find delegate handlers
+		// Black-hole SVG <use> instance trees (#13180)
+		//
+		// Support: Firefox<=42+
+		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
+		if ( delegateCount && cur.nodeType &&
+			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
+
+			/* jshint eqeqeq: false */
+			for ( ; cur != this; cur = cur.parentNode || this ) {
+				/* jshint eqeqeq: true */
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matches[ sel ] === undefined ) {
+							matches[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) > -1 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matches[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push( { elem: cur, handlers: matches } );
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
+		}
+
+		return handlerQueue;
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
+
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = new jQuery.Event( originalEvent );
+
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Support: IE<9
+		// Fix target property (#1925)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Support: Safari 6-8+
+		// Target should not be a text node (#504, #13143)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Support: IE<9
+		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+		event.metaKey = !!event.metaKey;
+
+		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
+		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split( " " ),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: ( "button buttons clientX clientY fromElement offsetX offsetY " +
+			"pageX pageY screenX screenY toElement" ).split( " " ),
+		filter: function( event, original ) {
+			var body, eventDoc, doc,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX +
+					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
+					( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY +
+					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
+					( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ?
+					original.toElement :
+					fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	special: {
+		load: {
+
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		focus: {
+
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== safeActiveElement() && this.focus ) {
+					try {
+						this.focus();
+						return false;
+					} catch ( e ) {
+
+						// Support: IE<9
+						// If we error on focus to hidden element (#1486, #12518),
+						// let .trigger() run the handlers
+					}
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === safeActiveElement() && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+		click: {
+
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+					this.click();
+					return false;
+				}
+			},
+
+			// For cross-browser consistency, don't fire native .click() on links
+			_default: function( event ) {
+				return jQuery.nodeName( event.target, "a" );
+			}
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Support: Firefox 20+
+				// Firefox doesn't alert if the returnValue field is not set.
+				if ( event.result !== undefined && event.originalEvent ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	},
+
+	// Piggyback on a donor event to simulate a different one
+	simulate: function( type, elem, event ) {
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{
+				type: type,
+				isSimulated: true
+
+				// Previously, `originalEvent: {}` was set here, so stopPropagation call
+				// would not be triggered on donor event, since in our own
+				// jQuery.event.stopPropagation function we had a check for existence of
+				// originalEvent.stopPropagation method, so, consequently it would be a noop.
+				//
+				// Guard for simulated events was moved to jQuery.event.stopPropagation function
+				// since `originalEvent` should point to the original event for the
+				// constancy with other events and for more focused logic
+			}
+		);
+
+		jQuery.event.trigger( e, null, elem );
+
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+
+		// This "if" is needed for plain objects
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle );
+		}
+	} :
+	function( elem, type, handle ) {
+		var name = "on" + type;
+
+		if ( elem.detachEvent ) {
+
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
+			// detachEvent needed property on element, by name of that event,
+			// to properly expose it to GC
+			if ( typeof elem[ name ] === "undefined" ) {
+				elem[ name ] = null;
+			}
+
+			elem.detachEvent( name, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+
+	// Allow instantiation without the 'new' keyword
+	if ( !( this instanceof jQuery.Event ) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = src.defaultPrevented ||
+				src.defaultPrevented === undefined &&
+
+				// Support: IE < 9, Android < 4.0
+				src.returnValue === false ?
+			returnTrue :
+			returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	constructor: jQuery.Event,
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+		if ( !e ) {
+			return;
+		}
+
+		// If preventDefault exists, run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// Support: IE
+		// Otherwise set the returnValue property of the original event to false
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+
+		if ( !e || this.isSimulated ) {
+			return;
+		}
+
+		// If stopPropagation exists, run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+
+		// Support: IE
+		// Set the cancelBubble property of the original event to true
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		var e = this.originalEvent;
+
+		this.isImmediatePropagationStopped = returnTrue;
+
+		if ( e && e.stopImmediatePropagation ) {
+			e.stopImmediatePropagation();
+		}
+
+		this.stopPropagation();
+	}
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+// so that event delegation works in jQuery.
+// Do the same for pointerenter/pointerleave and pointerover/pointerout
+//
+// Support: Safari 7 only
+// Safari sends mouseenter too often; see:
+// https://code.google.com/p/chromium/issues/detail?id=470258
+// for the description of the bug (it existed in older Chrome versions as well).
+jQuery.each( {
+	mouseenter: "mouseover",
+	mouseleave: "mouseout",
+	pointerenter: "pointerover",
+	pointerleave: "pointerout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mouseenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+} );
+
+// IE submit delegation
+if ( !support.submit ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ?
+
+						// Support: IE <=8
+						// We use jQuery.prop instead of elem.form
+						// to allow fixing the IE8 delegated submit issue (gh-2332)
+						// by 3rd party polyfills/workarounds.
+						jQuery.prop( elem, "form" ) :
+						undefined;
+
+				if ( form && !jQuery._data( form, "submit" ) ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submitBubble = true;
+					} );
+					jQuery._data( form, "submit", true );
+				}
+			} );
+
+			// return undefined since we don't need an event listener
+		},
+
+		postDispatch: function( event ) {
+
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submitBubble ) {
+				delete event._submitBubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event );
+				}
+			}
+		},
+
+		teardown: function() {
+
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !support.change ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._justChanged = true;
+						}
+					} );
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._justChanged && !event.isTrigger ) {
+							this._justChanged = false;
+						}
+
+						// Allow triggered, simulated change events (#11500)
+						jQuery.event.simulate( "change", this, event );
+					} );
+				}
+				return false;
+			}
+
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event );
+						}
+					} );
+					jQuery._data( elem, "change", true );
+				}
+			} );
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger ||
+				( elem.type !== "radio" && elem.type !== "checkbox" ) ) {
+
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return !rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Support: Firefox
+// Firefox doesn't have focus(in | out) events
+// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+//
+// Support: Chrome, Safari
+// focus(in | out) events fire after focus & blur events,
+// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
+// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
+if ( !support.focusin ) {
+	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
+		};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix );
+
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
+				}
+				jQuery._data( doc, fix, ( attaches || 0 ) + 1 );
+			},
+			teardown: function() {
+				var doc = this.ownerDocument || this,
+					attaches = jQuery._data( doc, fix ) - 1;
+
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					jQuery._removeData( doc, fix );
+				} else {
+					jQuery._data( doc, fix, attaches );
+				}
+			}
+		};
+	} );
+}
+
+jQuery.fn.extend( {
+
+	on: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn );
+	},
+	one: function( types, selector, data, fn ) {
+		return on( this, types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ?
+					handleObj.origType + "." + handleObj.namespace :
+					handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each( function() {
+			jQuery.event.remove( this, types, fn, selector );
+		} );
+	},
+
+	trigger: function( type, data ) {
+		return this.each( function() {
+			jQuery.event.trigger( type, data, this );
+		} );
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[ 0 ];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
+		}
+	}
+} );
+
+
+var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
+
+	// Support: IE 10-11, Edge 10240+
+	// In IE/Edge using regex groups here causes severe slowdowns.
+	// See https://connect.microsoft.com/IE/feedback/details/1736512/
+	rnoInnerhtml = /<script|<style|<link/i,
+
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+	safeFragment = createSafeFragment( document ),
+	fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) );
+
+// Support: IE<8
+// Manipulating tables requires a tbody
+function manipulationTarget( elem, content ) {
+	return jQuery.nodeName( elem, "table" ) &&
+		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
+
+		elem.getElementsByTagName( "tbody" )[ 0 ] ||
+			elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
+		elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+	if ( match ) {
+		elem.type = match[ 1 ];
+	} else {
+		elem.removeAttribute( "type" );
+	}
+	return elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function fixCloneNodeIssues( src, dest ) {
+	var nodeName, e, data;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 copies events bound via attachEvent when using cloneNode.
+	if ( !support.noCloneEvent && dest[ jQuery.expando ] ) {
+		data = jQuery._data( dest );
+
+		for ( e in data.events ) {
+			jQuery.removeEvent( dest, e, data.handle );
+		}
+
+		// Event data gets referenced instead of copied if the expando gets copied too
+		dest.removeAttribute( jQuery.expando );
+	}
+
+	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+	if ( nodeName === "script" && dest.text !== src.text ) {
+		disableScript( dest ).text = src.text;
+		restoreScript( dest );
+
+	// IE6-10 improperly clones children of object elements using classid.
+	// IE10 throws NoModificationAllowedError if parent is null, #12132.
+	} else if ( nodeName === "object" ) {
+		if ( dest.parentNode ) {
+			dest.outerHTML = src.outerHTML;
+		}
+
+		// This path appears unavoidable for IE9. When cloning an object
+		// element in IE9, the outerHTML strategy above is not sufficient.
+		// If the src has innerHTML and the destination does not,
+		// copy the src.innerHTML into the dest.innerHTML. #10324
+		if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) {
+			dest.innerHTML = src.innerHTML;
+		}
+
+	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
+
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+
+		dest.defaultChecked = dest.checked = src.checked;
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.defaultSelected = dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+function domManip( collection, args, callback, ignored ) {
+
+	// Flatten any nested arrays
+	args = concat.apply( [], args );
+
+	var first, node, hasScripts,
+		scripts, doc, fragment,
+		i = 0,
+		l = collection.length,
+		iNoClone = l - 1,
+		value = args[ 0 ],
+		isFunction = jQuery.isFunction( value );
+
+	// We can't cloneNode fragments that contain checked, in WebKit
+	if ( isFunction ||
+			( l > 1 && typeof value === "string" &&
+				!support.checkClone && rchecked.test( value ) ) ) {
+		return collection.each( function( index ) {
+			var self = collection.eq( index );
+			if ( isFunction ) {
+				args[ 0 ] = value.call( this, index, self.html() );
+			}
+			domManip( self, args, callback, ignored );
+		} );
+	}
+
+	if ( l ) {
+		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
+		first = fragment.firstChild;
+
+		if ( fragment.childNodes.length === 1 ) {
+			fragment = first;
+		}
+
+		// Require either new content or an interest in ignored elements to invoke the callback
+		if ( first || ignored ) {
+			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+			hasScripts = scripts.length;
+
+			// Use the original fragment for the last item
+			// instead of the first because it can end up
+			// being emptied incorrectly in certain situations (#8070).
+			for ( ; i < l; i++ ) {
+				node = fragment;
+
+				if ( i !== iNoClone ) {
+					node = jQuery.clone( node, true, true );
+
+					// Keep references to cloned scripts for later restoration
+					if ( hasScripts ) {
+
+						// Support: Android<4.1, PhantomJS<2
+						// push.apply(_, arraylike) throws on ancient WebKit
+						jQuery.merge( scripts, getAll( node, "script" ) );
+					}
+				}
+
+				callback.call( collection[ i ], node, i );
+			}
+
+			if ( hasScripts ) {
+				doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+				// Reenable scripts
+				jQuery.map( scripts, restoreScript );
+
+				// Evaluate executable scripts on first document insertion
+				for ( i = 0; i < hasScripts; i++ ) {
+					node = scripts[ i ];
+					if ( rscriptType.test( node.type || "" ) &&
+						!jQuery._data( node, "globalEval" ) &&
+						jQuery.contains( doc, node ) ) {
+
+						if ( node.src ) {
+
+							// Optional AJAX dependency, but won't run scripts if not present
+							if ( jQuery._evalUrl ) {
+								jQuery._evalUrl( node.src );
+							}
+						} else {
+							jQuery.globalEval(
+								( node.text || node.textContent || node.innerHTML || "" )
+									.replace( rcleanScript, "" )
+							);
+						}
+					}
+				}
+			}
+
+			// Fix #11809: Avoid leaking memory
+			fragment = first = null;
+		}
+	}
+
+	return collection;
+}
+
+function remove( elem, selector, keepData ) {
+	var node,
+		elems = selector ? jQuery.filter( selector, elem ) : elem,
+		i = 0;
+
+	for ( ; ( node = elems[ i ] ) != null; i++ ) {
+
+		if ( !keepData && node.nodeType === 1 ) {
+			jQuery.cleanData( getAll( node ) );
+		}
+
+		if ( node.parentNode ) {
+			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+				setGlobalEval( getAll( node, "script" ) );
+			}
+			node.parentNode.removeChild( node );
+		}
+	}
+
+	return elem;
+}
+
+jQuery.extend( {
+	htmlPrefilter: function( html ) {
+		return html.replace( rxhtmlTag, "<$1></$2>" );
+	},
+
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var destElements, node, clone, i, srcElements,
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		if ( support.html5Clone || jQuery.isXMLDoc( elem ) ||
+			!rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+
+			clone = elem.cloneNode( true );
+
+		// IE<=8 does not properly clone detached, unknown element nodes
+		} else {
+			fragmentDiv.innerHTML = elem.outerHTML;
+			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+		}
+
+		if ( ( !support.noCloneEvent || !support.noCloneChecked ) &&
+				( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) {
+
+			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			// Fix all IE cloning issues
+			for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) {
+
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[ i ] ) {
+					fixCloneNodeIssues( node, destElements[ i ] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) {
+					cloneCopyEvent( node, destElements[ i ] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		destElements = srcElements = node = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	cleanData: function( elems, /* internal */ forceAcceptData ) {
+		var elem, type, id, data,
+			i = 0,
+			internalKey = jQuery.expando,
+			cache = jQuery.cache,
+			attributes = support.attributes,
+			special = jQuery.event.special;
+
+		for ( ; ( elem = elems[ i ] ) != null; i++ ) {
+			if ( forceAcceptData || acceptData( elem ) ) {
+
+				id = elem[ internalKey ];
+				data = id && cache[ id ];
+
+				if ( data ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Remove cache only if it was not already removed by jQuery.event.remove
+					if ( cache[ id ] ) {
+
+						delete cache[ id ];
+
+						// Support: IE<9
+						// IE does not allow us to delete expando properties from nodes
+						// IE creates expando attributes along with the property
+						// IE does not have a removeAttribute function on Document nodes
+						if ( !attributes && typeof elem.removeAttribute !== "undefined" ) {
+							elem.removeAttribute( internalKey );
+
+						// Webkit & Blink performance suffers when deleting properties
+						// from DOM nodes, so set to undefined instead
+						// https://code.google.com/p/chromium/issues/detail?id=378607
+						} else {
+							elem[ internalKey ] = undefined;
+						}
+
+						deletedIds.push( id );
+					}
+				}
+			}
+		}
+	}
+} );
+
+jQuery.fn.extend( {
+
+	// Keep domManip exposed until 3.0 (gh-2225)
+	domManip: domManip,
+
+	detach: function( selector ) {
+		return remove( this, selector, true );
+	},
+
+	remove: function( selector ) {
+		return remove( this, selector );
+	},
+
+	text: function( value ) {
+		return access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append(
+					( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value )
+				);
+		}, null, value, arguments.length );
+	},
+
+	append: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		} );
+	},
+
+	prepend: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		} );
+	},
+
+	before: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		} );
+	},
+
+	after: function() {
+		return domManip( this, arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		} );
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; ( elem = this[ i ] ) != null; i++ ) {
+
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem, false ) );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function() {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		} );
+	},
+
+	html: function( value ) {
+		return access( this, function( value ) {
+			var elem = this[ 0 ] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
+
+				value = jQuery.htmlPrefilter( value );
+
+				try {
+					for ( ; i < l; i++ ) {
+
+						// Remove element nodes and prevent memory leaks
+						elem = this[ i ] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch ( e ) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var ignored = [];
+
+		// Make the changes, replacing each non-ignored context element with the new content
+		return domManip( this, arguments, function( elem ) {
+			var parent = this.parentNode;
+
+			if ( jQuery.inArray( this, ignored ) < 0 ) {
+				jQuery.cleanData( getAll( this ) );
+				if ( parent ) {
+					parent.replaceChild( elem, this );
+				}
+			}
+
+		// Force callback invocation
+		}, ignored );
+	}
+} );
+
+jQuery.each( {
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone( true );
+			jQuery( insert[ i ] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+} );
+
+
+var iframe,
+	elemdisplay = {
+
+		// Support: Firefox
+		// We have to pre-define these values for FF (#10227)
+		HTML: "block",
+		BODY: "block"
+	};
+
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
+
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+		display = jQuery.css( elem[ 0 ], "display" );
+
+	// We don't have any data stored on the element,
+	// so use "detach" method as fast way to get rid of the element
+	elem.detach();
+
+	return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+
+			// Use the already-created iframe if possible
+			iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
+				.appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[ 0 ].contentWindow || iframe[ 0 ].contentDocument ).document;
+
+			// Support: IE
+			doc.write();
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+var rmargin = ( /^margin/ );
+
+var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
+
+var swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
+var documentElement = document.documentElement;
+
+
+
+( function() {
+	var pixelPositionVal, pixelMarginRightVal, boxSizingReliableVal,
+		reliableHiddenOffsetsVal, reliableMarginRightVal, reliableMarginLeftVal,
+		container = document.createElement( "div" ),
+		div = document.createElement( "div" );
+
+	// Finish early in limited (non-browser) environments
+	if ( !div.style ) {
+		return;
+	}
+
+	div.style.cssText = "float:left;opacity:.5";
+
+	// Support: IE<9
+	// Make sure that element opacity exists (as opposed to filter)
+	support.opacity = div.style.opacity === "0.5";
+
+	// Verify style float existence
+	// (IE uses styleFloat instead of cssFloat)
+	support.cssFloat = !!div.style.cssFloat;
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	container = document.createElement( "div" );
+	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
+		"padding:0;margin-top:1px;position:absolute";
+	div.innerHTML = "";
+	container.appendChild( div );
+
+	// Support: Firefox<29, Android 2.3
+	// Vendor-prefix box-sizing
+	support.boxSizing = div.style.boxSizing === "" || div.style.MozBoxSizing === "" ||
+		div.style.WebkitBoxSizing === "";
+
+	jQuery.extend( support, {
+		reliableHiddenOffsets: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableHiddenOffsetsVal;
+		},
+
+		boxSizingReliable: function() {
+
+			// We're checking for pixelPositionVal here instead of boxSizingReliableVal
+			// since that compresses better and they're computed together anyway.
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return boxSizingReliableVal;
+		},
+
+		pixelMarginRight: function() {
+
+			// Support: Android 4.0-4.3
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelMarginRightVal;
+		},
+
+		pixelPosition: function() {
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return pixelPositionVal;
+		},
+
+		reliableMarginRight: function() {
+
+			// Support: Android 2.3
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginRightVal;
+		},
+
+		reliableMarginLeft: function() {
+
+			// Support: IE <=8 only, Android 4.0 - 4.3 only, Firefox <=3 - 37
+			if ( pixelPositionVal == null ) {
+				computeStyleTests();
+			}
+			return reliableMarginLeftVal;
+		}
+	} );
+
+	function computeStyleTests() {
+		var contents, divStyle,
+			documentElement = document.documentElement;
+
+		// Setup
+		documentElement.appendChild( container );
+
+		div.style.cssText =
+
+			// Support: Android 2.3
+			// Vendor-prefix box-sizing
+			"-webkit-box-sizing:border-box;box-sizing:border-box;" +
+			"position:relative;display:block;" +
+			"margin:auto;border:1px;padding:1px;" +
+			"top:1%;width:50%";
+
+		// Support: IE<9
+		// Assume reasonable values in the absence of getComputedStyle
+		pixelPositionVal = boxSizingReliableVal = reliableMarginLeftVal = false;
+		pixelMarginRightVal = reliableMarginRightVal = true;
+
+		// Check for getComputedStyle so that this code is not run in IE<9.
+		if ( window.getComputedStyle ) {
+			divStyle = window.getComputedStyle( div );
+			pixelPositionVal = ( divStyle || {} ).top !== "1%";
+			reliableMarginLeftVal = ( divStyle || {} ).marginLeft === "2px";
+			boxSizingReliableVal = ( divStyle || { width: "4px" } ).width === "4px";
+
+			// Support: Android 4.0 - 4.3 only
+			// Some styles come back with percentage values, even though they shouldn't
+			div.style.marginRight = "50%";
+			pixelMarginRightVal = ( divStyle || { marginRight: "4px" } ).marginRight === "4px";
+
+			// Support: Android 2.3 only
+			// Div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container (#3333)
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			contents = div.appendChild( document.createElement( "div" ) );
+
+			// Reset CSS: box-sizing; display; margin; border; padding
+			contents.style.cssText = div.style.cssText =
+
+				// Support: Android 2.3
+				// Vendor-prefix box-sizing
+				"-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
+				"box-sizing:content-box;display:block;margin:0;border:0;padding:0";
+			contents.style.marginRight = contents.style.width = "0";
+			div.style.width = "1px";
+
+			reliableMarginRightVal =
+				!parseFloat( ( window.getComputedStyle( contents ) || {} ).marginRight );
+
+			div.removeChild( contents );
+		}
+
+		// Support: IE6-8
+		// First check that getClientRects works as expected
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.style.display = "none";
+		reliableHiddenOffsetsVal = div.getClientRects().length === 0;
+		if ( reliableHiddenOffsetsVal ) {
+			div.style.display = "";
+			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+			div.childNodes[ 0 ].style.borderCollapse = "separate";
+			contents = div.getElementsByTagName( "td" );
+			contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
+			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+			if ( reliableHiddenOffsetsVal ) {
+				contents[ 0 ].style.display = "";
+				contents[ 1 ].style.display = "none";
+				reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
+			}
+		}
+
+		// Teardown
+		documentElement.removeChild( container );
+	}
+
+} )();
+
+
+var getStyles, curCSS,
+	rposition = /^(top|right|bottom|left)$/;
+
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+
+		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
+		// IE throws on elements created in popups
+		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
+		var view = elem.ownerDocument.defaultView;
+
+		if ( !view || !view.opener ) {
+			view = window;
+		}
+
+		return view.getComputedStyle( elem );
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var width, minWidth, maxWidth, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+
+		// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+		ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
+
+		// Support: Opera 12.1x only
+		// Fall back to style even without computed
+		// computed is undefined for elems on document fragments
+		if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) {
+			ret = jQuery.style( elem, name );
+		}
+
+		if ( computed ) {
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value"
+			// instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values,
+			// but width seems to be reliably pixels
+			// this is against the CSSOM draft spec:
+			// http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "";
+	};
+} else if ( documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, computed ) {
+		var left, rs, rsLeft, ret,
+			style = elem.style;
+
+		computed = computed || getStyles( elem );
+		ret = computed ? computed[ name ] : undefined;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are
+		// proportional to the parent element instead
+		// and we can't measure the parent instead because it
+		// might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		// Support: IE
+		// IE returns zIndex value as an integer.
+		return ret === undefined ?
+			ret :
+			ret + "" || "auto";
+	};
+}
+
+
+
+
+function addGetHookIf( conditionFn, hookFn ) {
+
+	// Define the hook, we'll check on the first run if it's really needed.
+	return {
+		get: function() {
+			if ( conditionFn() ) {
+
+				// Hook not needed (or it's not possible to use it due
+				// to missing dependency), remove it.
+				delete this.get;
+				return;
+			}
+
+			// Hook needed; redefine it so that the support test is not executed again.
+			return ( this.get = hookFn ).apply( this, arguments );
+		}
+	};
+}
+
+
+var
+
+		ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/i,
+
+	// swappable if display is none or starts with table except
+	// "table", "table-cell", or "table-caption"
+	// see here for display values:
+	// https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rnumsplit = new RegExp( "^(" + pnum + ")(.*)$", "i" ),
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: "0",
+		fontWeight: "400"
+	},
+
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
+	emptyStyle = document.createElement( "div" ).style;
+
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( name ) {
+
+	// shortcut for names that are not vendor prefixed
+	if ( name in emptyStyle ) {
+		return name;
+	}
+
+	// check for vendor prefixed names
+	var capName = name.charAt( 0 ).toUpperCase() + name.slice( 1 ),
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in emptyStyle ) {
+			return name;
+		}
+	}
+}
+
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] =
+					jQuery._data( elem, "olddisplay", defaultDisplay( elem.nodeName ) );
+			}
+		} else {
+			hidden = isHidden( elem );
+
+			if ( display && display !== "none" || !hidden ) {
+				jQuery._data(
+					elem,
+					"olddisplay",
+					hidden ? display : jQuery.css( elem, "display" )
+				);
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+
+		// If we already have the right measurement, avoid augmentation
+		4 :
+
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = support.boxSizing &&
+			jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test( val ) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox &&
+			( support.boxSizingReliable() || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+jQuery.extend( {
+
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"animationIterationCount": true,
+		"columnCount": true,
+		"fillOpacity": true,
+		"flexGrow": true,
+		"flexShrink": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"order": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+
+		// normalize float css property
+		"float": support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Convert "+=" or "-=" to relative numbers (#7345)
+			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
+				value = adjustCSS( elem, name, ret );
+
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that null and NaN values aren't set. See: #7116
+			if ( value == null || value !== value ) {
+				return;
+			}
+
+			// If a number was passed in, add the unit (except for certain CSS properties)
+			if ( type === "number" ) {
+				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight
+			// (for every problematic property) identical functions
+			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !( "set" in hooks ) ||
+				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
+
+				// Support: IE
+				// Swallow errors from 'invalid' CSS values (#5509)
+				try {
+					style[ name ] = value;
+				} catch ( e ) {}
+			}
+
+		} else {
+
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks &&
+				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
+
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] ||
+			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || isFinite( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+} );
+
+jQuery.each( [ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
+					elem.offsetWidth === 0 ?
+						swap( elem, cssShow, function() {
+							return getWidthOrHeight( elem, name, extra );
+						} ) :
+						getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					support.boxSizing &&
+						jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+} );
+
+if ( !support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+
+			// IE uses filters for opacity
+			return ropacity.test( ( computed && elem.currentStyle ?
+				elem.currentStyle.filter :
+				elem.style.filter ) || "" ) ?
+					( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+					computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist -
+			// attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule
+				// or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
+	function( elem, computed ) {
+		if ( computed ) {
+			return swap( elem, { "display": "inline-block" },
+				curCSS, [ elem, "marginRight" ] );
+		}
+	}
+);
+
+jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+	function( elem, computed ) {
+		if ( computed ) {
+			return (
+				parseFloat( curCSS( elem, "marginLeft" ) ) ||
+
+				// Support: IE<=11+
+				// Running getBoundingClientRect on a disconnected node in IE throws an error
+				// Support: IE8 only
+				// getClientRects() errors on disconnected elems
+				( jQuery.contains( elem.ownerDocument, elem ) ?
+					elem.getBoundingClientRect().left -
+						swap( elem, { marginLeft: 0 }, function() {
+							return elem.getBoundingClientRect().left;
+						} ) :
+					0
+				)
+			) + "px";
+		}
+	}
+);
+
+// These hooks are used by animate to expand properties
+jQuery.each( {
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split( " " ) : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+} );
+
+jQuery.fn.extend( {
+	css: function( name, value ) {
+		return access( this, function( elem, name, value ) {
+			var styles, len,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
+
+		return this.each( function() {
+			if ( isHidden( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		} );
+	}
+} );
+
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || jQuery.easing._default;
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			// Use a property on the element directly when it is not a DOM element,
+			// or when there is no matching style property that exists.
+			if ( tween.elem.nodeType !== 1 ||
+				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.nodeType === 1 &&
+				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
+					jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9
+// Panic based approach to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p * Math.PI ) / 2;
+	},
+	_default: "swing"
+};
+
+jQuery.fx = Tween.prototype.init;
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+
+
+
+var
+	fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rrun = /queueHooks$/;
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	window.setTimeout( function() {
+		fxNow = undefined;
+	} );
+	return ( fxNow = jQuery.now() );
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth ? 1 : 0;
+	for ( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
+
+			// we're done with this property
+			return tween;
+		}
+	}
+}
+
+function defaultPrefilter( elem, props, opts ) {
+	/* jshint validthis: true */
+	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHidden( elem ),
+		dataShow = jQuery._data( elem, "fxshow" );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always( function() {
+
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always( function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			} );
+		} );
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		display = jQuery.css( elem, "display" );
+
+		// Test default display if display is currently "none"
+		checkDisplay = display === "none" ?
+			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !support.inlineBlockNeedsLayout || defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !support.shrinkWrapBlocks() ) {
+			anim.always( function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			} );
+		}
+	}
+
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+
+				// If there is dataShow left over from a stopped hide or show
+				// and we are going to proceed with show, we should pretend to be hidden
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+				} else {
+					continue;
+				}
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+
+		// Any non-fx value stops us from restoring the original display value
+		} else {
+			display = undefined;
+		}
+	}
+
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
+			}
+		} else {
+			dataShow = jQuery._data( elem, "fxshow", {} );
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done( function() {
+				jQuery( elem ).hide();
+			} );
+		}
+		anim.done( function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		} );
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+
+	// If this is a noop like .hide().hide(), restore an overwritten display value
+	} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
+		style.display = display;
+	}
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = Animation.prefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		} ),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+
+				// Support: Android 2.3
+				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ] );
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise( {
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, {
+				specialEasing: {},
+				easing: jQuery.easing._default
+			}, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.notifyWith( elem, [ animation, 1, 0 ] );
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		} ),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			if ( jQuery.isFunction( result.stop ) ) {
+				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
+					jQuery.proxy( result.stop, result );
+			}
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		} )
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweeners: {
+		"*": [ function( prop, value ) {
+			var tween = this.createTween( prop, value );
+			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
+			return tween;
+		} ]
+	},
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.match( rnotwhite );
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
+			Animation.tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilters: [ defaultPrefilter ],
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			Animation.prefilters.unshift( callback );
+		} else {
+			Animation.prefilters.push( callback );
+		}
+	}
+} );
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ?
+			jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.fn.extend( {
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate( { opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each( function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this &&
+					( type == null || timers[ index ].queue === type ) ) {
+
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		} );
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each( function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		} );
+	}
+} );
+
+jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+} );
+
+// Generate shortcuts for custom animations
+jQuery.each( {
+	slideDown: genFx( "show" ),
+	slideUp: genFx( "hide" ),
+	slideToggle: genFx( "toggle" ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+} );
+
+jQuery.timers = [];
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	jQuery.timers.push( timer );
+	if ( timer() ) {
+		jQuery.fx.start();
+	} else {
+		jQuery.timers.pop();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	window.clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+
+	// Default speed
+	_default: 400
+};
+
+
+// Based off of the plugin by Clint Helfers, with permission.
+// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
+jQuery.fn.delay = function( time, type ) {
+	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+	type = type || "fx";
+
+	return this.queue( type, function( next, hooks ) {
+		var timeout = window.setTimeout( next, time );
+		hooks.stop = function() {
+			window.clearTimeout( timeout );
+		};
+	} );
+};
+
+
+( function() {
+	var a,
+		input = document.createElement( "input" ),
+		div = document.createElement( "div" ),
+		select = document.createElement( "select" ),
+		opt = select.appendChild( document.createElement( "option" ) );
+
+	// Setup
+	div = document.createElement( "div" );
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// Support: Windows Web Apps (WWA)
+	// `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "checkbox" );
+	div.appendChild( input );
+
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// First batch of tests.
+	a.style.cssText = "top:1px";
+
+	// Test setAttribute on camelCase class.
+	// If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+	support.getSetAttribute = div.className !== "t";
+
+	// Get the style information from getAttribute
+	// (IE uses .cssText instead)
+	support.style = /top/.test( a.getAttribute( "style" ) );
+
+	// Make sure that URLs aren't manipulated
+	// (IE normalizes it by default)
+	support.hrefNormalized = a.getAttribute( "href" ) === "/a";
+
+	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+	support.checkOn = !!input.value;
+
+	// Make sure that a selected-by-default option has a working selected property.
+	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+	support.optSelected = opt.selected;
+
+	// Tests for enctype support on a form (#6743)
+	support.enctype = !!document.createElement( "form" ).enctype;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE8 only
+	// Check if we can trust getAttribute("value")
+	input = document.createElement( "input" );
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
+
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+} )();
+
+
+var rreturn = /\r/g,
+	rspaces = /[\x20\t\r\n\f]+/g;
+
+jQuery.fn.extend( {
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[ 0 ];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] ||
+					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if (
+					hooks &&
+					"get" in hooks &&
+					( ret = hooks.get( elem, "value" ) ) !== undefined
+				) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+
+					// handle most common string cases
+					ret.replace( rreturn, "" ) :
+
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each( function( i ) {
+			var val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map( val, function( value ) {
+					return value == null ? "" : value + "";
+				} );
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+
+					// Support: IE10-11+
+					// option.text throws exceptions (#14686, #14858)
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+
+							// Don't return options that are disabled or in a disabled optgroup
+							( support.optDisabled ?
+								!option.disabled :
+								option.getAttribute( "disabled" ) === null ) &&
+							( !option.parentNode.disabled ||
+								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+
+					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {
+
+						// Support: IE6
+						// When new option element is added to select box we need to
+						// force reflow of newly added node in order to workaround delay
+						// of initialization properties
+						try {
+							option.selected = optionSet = true;
+
+						} catch ( _ ) {
+
+							// Will be executed only in IE6
+							option.scrollHeight;
+						}
+
+					} else {
+						option.selected = false;
+					}
+				}
+
+				// Force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+
+				return options;
+			}
+		}
+	}
+} );
+
+// Radios and checkboxes getter/setter
+jQuery.each( [ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
+			}
+		}
+	};
+	if ( !support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
+		};
+	}
+} );
+
+
+
+
+var nodeHook, boolHook,
+	attrHandle = jQuery.expr.attrHandle,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = support.getSetAttribute,
+	getSetInput = support.input;
+
+jQuery.fn.extend( {
+	attr: function( name, value ) {
+		return access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each( function() {
+			jQuery.removeAttr( this, name );
+		} );
+	}
+} );
+
+jQuery.extend( {
+	attr: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set attributes on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
+			}
+
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			elem.setAttribute( name, value + "" );
+			return value;
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		ret = jQuery.find.attr( elem, name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return ret == null ? undefined : ret;
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !support.radioValue && value === "radio" &&
+					jQuery.nodeName( elem, "input" ) ) {
+
+					// Setting the type on a radio button after the value resets the value in IE8-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( rnotwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( ( name = attrNames[ i++ ] ) ) {
+				propName = jQuery.propFix[ name ] || name;
+
+				// Boolean attributes get special treatment (#10870)
+				if ( jQuery.expr.match.bool.test( name ) ) {
+
+					// Set corresponding property to false
+					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+						elem[ propName ] = false;
+
+					// Support: IE<9
+					// Also clear defaultChecked/defaultSelected (if appropriate)
+					} else {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
+		}
+	}
+} );
+
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		} else {
+
+			// Support: IE<9
+			// Use defaultChecked and defaultSelected for oldIE
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+		return name;
+	}
+};
+
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = attrHandle[ name ] || jQuery.find.attr;
+
+	if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+		attrHandle[ name ] = function( elem, name, isXML ) {
+			var ret, handle;
+			if ( !isXML ) {
+
+				// Avoid an infinite loop by temporarily removing this function from the getter
+				handle = attrHandle[ name ];
+				attrHandle[ name ] = ret;
+				ret = getter( elem, name, isXML ) != null ?
+					name.toLowerCase() :
+					null;
+				attrHandle[ name ] = handle;
+			}
+			return ret;
+		};
+	} else {
+		attrHandle[ name ] = function( elem, name, isXML ) {
+			if ( !isXML ) {
+				return elem[ jQuery.camelCase( "default-" + name ) ] ?
+					name.toLowerCase() :
+					null;
+			}
+		};
+	}
+} );
+
+// fix oldIE attroperties
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = {
+		set: function( elem, value, name ) {
+
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					( ret = elem.ownerDocument.createAttribute( name ) )
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			if ( name === "value" || value === elem.getAttribute( name ) ) {
+				return value;
+			}
+		}
+	};
+
+	// Some attributes are constructed with empty-string values when not defined
+	attrHandle.id = attrHandle.name = attrHandle.coords =
+		function( elem, name, isXML ) {
+			var ret;
+			if ( !isXML ) {
+				return ( ret = elem.getAttributeNode( name ) ) && ret.value !== "" ?
+					ret.value :
+					null;
+			}
+		};
+
+	// Fixing value retrieval on a button requires this module
+	jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			if ( ret && ret.specified ) {
+				return ret.value;
+			}
+		},
+		set: nodeHook.set
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each( [ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		};
+	} );
+}
+
+if ( !support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case sensitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+
+
+
+var rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i;
+
+jQuery.fn.extend( {
+	prop: function( name, value ) {
+		return access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each( function() {
+
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch ( e ) {}
+		} );
+	}
+} );
+
+jQuery.extend( {
+	prop: function( elem, name, value ) {
+		var ret, hooks,
+			nType = elem.nodeType;
+
+		// Don't get/set properties on text, comment and attribute nodes
+		if ( nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks &&
+				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
+				return ret;
+			}
+
+			return ( elem[ name ] = value );
+		}
+
+		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
+			return ret;
+		}
+
+		return elem[ name ];
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+
+				// elem.tabIndex doesn't always return the
+				// correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				return tabindex ?
+					parseInt( tabindex, 10 ) :
+					rfocusable.test( elem.nodeName ) ||
+						rclickable.test( elem.nodeName ) && elem.href ?
+							0 :
+							-1;
+			}
+		}
+	},
+
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
+	}
+} );
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !support.hrefNormalized ) {
+
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each( [ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	} );
+}
+
+// Support: Safari, IE9+
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
+if ( !support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		},
+		set: function( elem ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	};
+}
+
+jQuery.each( [
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+} );
+
+// IE6/7 call enctype encoding
+if ( !support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+
+
+
+var rclass = /[\t\r\n\f]/g;
+
+function getClass( elem ) {
+	return jQuery.attr( elem, "class" ) || "";
+}
+
+jQuery.fn.extend( {
+	addClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnotwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+				cur = elem.nodeType === 1 &&
+					( " " + curValue + " " ).replace( rclass, " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+
+					// only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( curValue !== finalValue ) {
+						jQuery.attr( elem, "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, curValue, clazz, j, finalValue,
+			i = 0;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
+			} );
+		}
+
+		if ( !arguments.length ) {
+			return this.attr( "class", "" );
+		}
+
+		if ( typeof value === "string" && value ) {
+			classes = value.match( rnotwhite ) || [];
+
+			while ( ( elem = this[ i++ ] ) ) {
+				curValue = getClass( elem );
+
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 &&
+					( " " + curValue + " " ).replace( rclass, " " );
+
+				if ( cur ) {
+					j = 0;
+					while ( ( clazz = classes[ j++ ] ) ) {
+
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+
+					// Only assign if different to avoid unneeded rendering.
+					finalValue = jQuery.trim( cur );
+					if ( curValue !== finalValue ) {
+						jQuery.attr( elem, "class", finalValue );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).toggleClass(
+					value.call( this, i, getClass( this ), stateVal ),
+					stateVal
+				);
+			} );
+		}
+
+		return this.each( function() {
+			var className, i, self, classNames;
+
+			if ( type === "string" ) {
+
+				// Toggle individual class names
+				i = 0;
+				self = jQuery( this );
+				classNames = value.match( rnotwhite ) || [];
+
+				while ( ( className = classNames[ i++ ] ) ) {
+
+					// Check each className given, space separated list
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
+				}
+
+			// Toggle whole class name
+			} else if ( value === undefined || type === "boolean" ) {
+				className = getClass( this );
+				if ( className ) {
+
+					// store className if set
+					jQuery._data( this, "__className__", className );
+				}
+
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				jQuery.attr( this, "class",
+					className || value === false ?
+					"" :
+					jQuery._data( this, "__className__" ) || ""
+				);
+			}
+		} );
+	},
+
+	hasClass: function( selector ) {
+		var className, elem,
+			i = 0;
+
+		className = " " + selector + " ";
+		while ( ( elem = this[ i++ ] ) ) {
+			if ( elem.nodeType === 1 &&
+				( " " + getClass( elem ) + " " ).replace( rclass, " " )
+					.indexOf( className ) > -1
+			) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+} );
+
+
+
+
+// Return jQuery for attributes-only inclusion
+
+
+jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
+	function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+} );
+
+jQuery.fn.extend( {
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+} );
+
+
+var location = window.location;
+
+var nonce = jQuery.now();
+
+var rquery = ( /\?/ );
+
+
+
+var rvalidtokens = /(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;
+
+jQuery.parseJSON = function( data ) {
+
+	// Attempt to parse using the native JSON parser first
+	if ( window.JSON && window.JSON.parse ) {
+
+		// Support: Android 2.3
+		// Workaround failure to string-cast null input
+		return window.JSON.parse( data + "" );
+	}
+
+	var requireNonComma,
+		depth = null,
+		str = jQuery.trim( data + "" );
+
+	// Guard against invalid (and possibly dangerous) input by ensuring that nothing remains
+	// after removing valid tokens
+	return str && !jQuery.trim( str.replace( rvalidtokens, function( token, comma, open, close ) {
+
+		// Force termination if we see a misplaced comma
+		if ( requireNonComma && comma ) {
+			depth = 0;
+		}
+
+		// Perform no more replacements after returning to outermost depth
+		if ( depth === 0 ) {
+			return token;
+		}
+
+		// Commas must not follow "[", "{", or ","
+		requireNonComma = open || comma;
+
+		// Determine new depth
+		// array/object open ("[" or "{"): depth += true - false (increment)
+		// array/object close ("]" or "}"): depth += false - true (decrement)
+		// other cases ("," or primitive): depth += true - true (numeric cast)
+		depth += !close - !open;
+
+		// Remove this token
+		return "";
+	} ) ) ?
+		( Function( "return " + str ) )() :
+		jQuery.error( "Invalid JSON: " + data );
+};
+
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+	var xml, tmp;
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	try {
+		if ( window.DOMParser ) { // Standard
+			tmp = new window.DOMParser();
+			xml = tmp.parseFromString( data, "text/xml" );
+		} else { // IE
+			xml = new window.ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+	} catch ( e ) {
+		xml = undefined;
+	}
+	if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+		jQuery.error( "Invalid XML: " + data );
+	}
+	return xml;
+};
+
+
+var
+	rhash = /#.*$/,
+	rts = /([?&])_=[^&]*/,
+
+	// IE leaves an \r character at EOL
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg,
+
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rurl = /^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat( "*" ),
+
+	// Document location
+	ajaxLocation = location.href,
+
+	// Segment location into parts
+	ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
+
+		if ( jQuery.isFunction( func ) ) {
+
+			// For each dataType in the dataTypeExpression
+			while ( ( dataType = dataTypes[ i++ ] ) ) {
+
+				// Prepend if requested
+				if ( dataType.charAt( 0 ) === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
+
+				// Otherwise append
+				} else {
+					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if ( typeof dataTypeOrTransport === "string" &&
+				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		} );
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var deep, key,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while ( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
+
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	current = dataTypes.shift();
+
+	// Convert to each sequential dataType
+	while ( current ) {
+
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+			// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s[ "throws" ] ) { // jscs:ignore requireDotNotation
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return {
+								state: "parsererror",
+								error: conv ? e : "No conversion from " + prev + " to " + current
+							};
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+
+jQuery.extend( {
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		type: "GET",
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /\bxml\b/,
+			html: /\bhtml/,
+			json: /\bjson\b/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText",
+			json: "responseJSON"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var
+
+			// Cross-domain detection vars
+			parts,
+
+			// Loop variable
+			i,
+
+			// URL without anti-cache param
+			cacheURL,
+
+			// Response headers as string
+			responseHeadersString,
+
+			// timeout handle
+			timeoutTimer,
+
+			// To know if global events are to be dispatched
+			fireGlobals,
+
+			transport,
+
+			// Response headers
+			responseHeaders,
+
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+
+			// Callbacks context
+			callbackContext = s.context || s,
+
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context &&
+				( callbackContext.nodeType || callbackContext.jquery ) ?
+					jQuery( callbackContext ) :
+					jQuery.event,
+
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+
+			// The jqXHR state
+			state = 0,
+
+			// Default abort message
+			strAbort = "canceled",
+
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					var lname = name.toLowerCase();
+					if ( !state ) {
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( state < 2 ) {
+							for ( code in map ) {
+
+								// Lazy-add the new callback in a way that preserves old ones
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						} else {
+
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR ).complete = completeDeferred.add;
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || ajaxLocation ) + "" )
+			.replace( rhash, "" )
+			.replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
+		fireGlobals = jQuery.event && s.global;
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		cacheURL = s.url;
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+				s.url = rts.test( cacheURL ) ?
+
+					// If there is already a '_' parameter, set its value
+					cacheURL.replace( rts, "$1_=" + nonce++ ) :
+
+					// Otherwise add one to the end
+					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
+			}
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+				s.accepts[ s.dataTypes[ 0 ] ] +
+					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend &&
+			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+
+			// If request was aborted inside ajaxSend, stop there
+			if ( state === 2 ) {
+				return jqXHR;
+			}
+
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = window.setTimeout( function() {
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				window.clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Determine if successful
+			isSuccess = status >= 200 && status < 300 || status === 304;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// Convert no matter what (that way responseXXX fields are always set)
+			response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+			// If successful, handle type chaining
+			if ( isSuccess ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader( "Last-Modified" );
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader( "etag" );
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 || s.type === "HEAD" ) {
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					statusText = response.state;
+					success = response.data;
+					error = response.error;
+					isSuccess = !error;
+				}
+			} else {
+
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	}
+} );
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		// The url can be an options object (which then must have .url)
+		return jQuery.ajax( jQuery.extend( {
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		}, jQuery.isPlainObject( url ) && url ) );
+	};
+} );
+
+
+jQuery._evalUrl = function( url ) {
+	return jQuery.ajax( {
+		url: url,
+
+		// Make this explicit, since user can override this through ajaxSetup (#11264)
+		type: "GET",
+		dataType: "script",
+		cache: true,
+		async: false,
+		global: false,
+		"throws": true
+	} );
+};
+
+
+jQuery.fn.extend( {
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapAll( html.call( this, i ) );
+			} );
+		}
+
+		if ( this[ 0 ] ) {
+
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+
+			if ( this[ 0 ].parentNode ) {
+				wrap.insertBefore( this[ 0 ] );
+			}
+
+			wrap.map( function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			} ).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each( function( i ) {
+				jQuery( this ).wrapInner( html.call( this, i ) );
+			} );
+		}
+
+		return this.each( function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		} );
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each( function( i ) {
+			jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
+		} );
+	},
+
+	unwrap: function() {
+		return this.parent().each( function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		} ).end();
+	}
+} );
+
+
+function getDisplay( elem ) {
+	return elem.style && elem.style.display || jQuery.css( elem, "display" );
+}
+
+function filterHidden( elem ) {
+
+	// Disconnected elements are considered hidden
+	if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
+		return true;
+	}
+	while ( elem && elem.nodeType === 1 ) {
+		if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
+			return true;
+		}
+		elem = elem.parentNode;
+	}
+	return false;
+}
+
+jQuery.expr.filters.hidden = function( elem ) {
+
+	// Support: Opera <= 12.12
+	// Opera reports offsetWidths and offsetHeights less than zero on some elements
+	return support.reliableHiddenOffsets() ?
+		( elem.offsetWidth <= 0 && elem.offsetHeight <= 0 &&
+			!elem.getClientRects().length ) :
+			filterHidden( elem );
+};
+
+jQuery.expr.filters.visible = function( elem ) {
+	return !jQuery.expr.filters.hidden( elem );
+};
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams(
+					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
+					v,
+					traditional,
+					add
+				);
+			}
+		} );
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// Serialize an array of form elements or a set of
+// key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		} );
+
+	} else {
+
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+jQuery.fn.extend( {
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map( function() {
+
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		} )
+		.filter( function() {
+			var type = this.type;
+
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !rcheckableType.test( type ) );
+		} )
+		.map( function( i, elem ) {
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ) {
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					} ) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		} ).get();
+	}
+} );
+
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject !== undefined ?
+
+	// Support: IE6-IE8
+	function() {
+
+		// XHR cannot access local files, always use ActiveX for that case
+		if ( this.isLocal ) {
+			return createActiveXHR();
+		}
+
+		// Support: IE 9-11
+		// IE seems to error on cross-domain PATCH requests when ActiveX XHR
+		// is used. In IE 9+ always use the native XHR.
+		// Note: this condition won't catch Edge as it doesn't define
+		// document.documentMode but it also doesn't support ActiveX so it won't
+		// reach this code.
+		if ( document.documentMode > 8 ) {
+			return createStandardXHR();
+		}
+
+		// Support: IE<9
+		// oldIE XHR does not support non-RFC2616 methods (#13240)
+		// See http://msdn.microsoft.com/en-us/library/ie/ms536648(v=vs.85).aspx
+		// and http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9
+		// Although this check for six methods instead of eight
+		// since IE also does not support "trace" and "connect"
+		return /^(get|post|head|put|delete|options)$/i.test( this.type ) &&
+			createStandardXHR() || createActiveXHR();
+	} :
+
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+var xhrId = 0,
+	xhrCallbacks = {},
+	xhrSupported = jQuery.ajaxSettings.xhr();
+
+// Support: IE<10
+// Open requests must be manually aborted on unload (#5280)
+// See https://support.microsoft.com/kb/2856746 for more info
+if ( window.attachEvent ) {
+	window.attachEvent( "onunload", function() {
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
+	} );
+}
+
+// Determine support properties
+support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+	jQuery.ajaxTransport( function( options ) {
+
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !options.crossDomain || support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+					var i,
+						xhr = options.xhr(),
+						id = ++xhrId;
+
+					// Open the socket
+					xhr.open(
+						options.type,
+						options.url,
+						options.async,
+						options.username,
+						options.password
+					);
+
+					// Apply custom fields if provided
+					if ( options.xhrFields ) {
+						for ( i in options.xhrFields ) {
+							xhr[ i ] = options.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( options.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( options.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Set headers
+					for ( i in headers ) {
+
+						// Support: IE<9
+						// IE's ActiveXObject throws a 'Type Mismatch' exception when setting
+						// request header to a null-value.
+						//
+						// To keep consistent with other XHR implementations, cast the value
+						// to string and ignore `undefined`.
+						if ( headers[ i ] !== undefined ) {
+							xhr.setRequestHeader( i, headers[ i ] + "" );
+						}
+					}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( options.hasContent && options.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, statusText, responses;
+
+						// Was never called and is aborted or complete
+						if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+							// Clean up
+							delete xhrCallbacks[ id ];
+							callback = undefined;
+							xhr.onreadystatechange = jQuery.noop;
+
+							// Abort manually if needed
+							if ( isAbort ) {
+								if ( xhr.readyState !== 4 ) {
+									xhr.abort();
+								}
+							} else {
+								responses = {};
+								status = xhr.status;
+
+								// Support: IE<10
+								// Accessing binary-data responseText throws an exception
+								// (#11426)
+								if ( typeof xhr.responseText === "string" ) {
+									responses.text = xhr.responseText;
+								}
+
+								// Firefox throws an exception when accessing
+								// statusText for faulty cross-domain requests
+								try {
+									statusText = xhr.statusText;
+								} catch ( e ) {
+
+									// We normalize with Webkit giving an empty statusText
+									statusText = "";
+								}
+
+								// Filter status for non standard behaviors
+
+								// If the request is local and we have data: assume a success
+								// (success with no data won't get notified, that's the best we
+								// can do given current implementations)
+								if ( !status && options.isLocal && !options.crossDomain ) {
+									status = responses.text ? 200 : 404;
+
+								// IE - #1450: sometimes returns 1223 when it should be 204
+								} else if ( status === 1223 ) {
+									status = 204;
+								}
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, xhr.getAllResponseHeaders() );
+						}
+					};
+
+					// Do send the request
+					// `xhr.send` may raise an exception, but it will be
+					// handled in jQuery.ajax (so no try/catch here)
+					if ( !options.async ) {
+
+						// If we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						window.setTimeout( callback );
+					} else {
+
+						// Register the callback, but delay it in case `xhr.send` throws
+						// Add to the list of active xhr callbacks
+						xhr.onreadystatechange = xhrCallbacks[ id ] = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
+					}
+				}
+			};
+		}
+	} );
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch ( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch ( e ) {}
+}
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup( {
+	accepts: {
+		script: "text/javascript, application/javascript, " +
+			"application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /\b(?:java|ecma)script\b/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+} );
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+} );
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function( s ) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || jQuery( "head" )[ 0 ] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = true;
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( script.parentNode ) {
+							script.parentNode.removeChild( script );
+						}
+
+						// Dereference the script
+						script = null;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+
+				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+				// Use native DOM manipulation to avoid our domManip AJAX trickery
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( undefined, true );
+				}
+			}
+		};
+	}
+} );
+
+
+
+
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup( {
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+} );
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" &&
+				( s.contentType || "" )
+					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+				rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters[ "script json" ] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always( function() {
+
+			// If previous value didn't exist - remove it
+			if ( overwritten === undefined ) {
+				jQuery( window ).removeProp( callbackName );
+
+			// Otherwise restore preexisting value
+			} else {
+				window[ callbackName ] = overwritten;
+			}
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		} );
+
+		// Delegate to script
+		return "script";
+	}
+} );
+
+
+
+
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context,
+// defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+	if ( !data || typeof data !== "string" ) {
+		return null;
+	}
+	if ( typeof context === "boolean" ) {
+		keepScripts = context;
+		context = false;
+	}
+	context = context || document;
+
+	var parsed = rsingleTag.exec( data ),
+		scripts = !keepScripts && [];
+
+	// Single tag
+	if ( parsed ) {
+		return [ context.createElement( parsed[ 1 ] ) ];
+	}
+
+	parsed = buildFragment( [ data ], context, scripts );
+
+	if ( scripts && scripts.length ) {
+		jQuery( scripts ).remove();
+	}
+
+	return jQuery.merge( [], parsed.childNodes );
+};
+
+
+// Keep a copy of the old load method
+var _load = jQuery.fn.load;
+
+/**
+ * Load a url into a page
+ */
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, type, response,
+		self = this,
+		off = url.indexOf( " " );
+
+	if ( off > -1 ) {
+		selector = jQuery.trim( url.slice( off, url.length ) );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax( {
+			url: url,
+
+			// If "type" variable is undefined, then "GET" method will be used.
+			// Make value of this field explicit since
+			// user can override it through ajaxSetup method
+			type: type || "GET",
+			dataType: "html",
+			data: params
+		} ).done( function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		// If the request succeeds, this function gets "data", "status", "jqXHR"
+		// but they are ignored because response was set above.
+		// If it fails, this function gets "jqXHR", "status", "error"
+		} ).always( callback && function( jqXHR, status ) {
+			self.each( function() {
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
+			} );
+		} );
+	}
+
+	return this;
+};
+
+
+
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
+	};
+} );
+
+
+
+
+jQuery.expr.filters.animated = function( elem ) {
+	return jQuery.grep( jQuery.timers, function( fn ) {
+		return elem === fn.elem;
+	} ).length;
+};
+
+
+
+
+
+/**
+ * Gets a window from an element
+ */
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+jQuery.offset = {
+	setOffset: function( elem, options, i ) {
+		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
+			position = jQuery.css( elem, "position" ),
+			curElem = jQuery( elem ),
+			props = {};
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		curOffset = curElem.offset();
+		curCSSTop = jQuery.css( elem, "top" );
+		curCSSLeft = jQuery.css( elem, "left" );
+		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
+			jQuery.inArray( "auto", [ curCSSTop, curCSSLeft ] ) > -1;
+
+		// need to be able to calculate position if either top or left
+		// is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+
+			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
+			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+jQuery.fn.extend( {
+	offset: function( options ) {
+		if ( arguments.length ) {
+			return options === undefined ?
+				this :
+				this.each( function( i ) {
+					jQuery.offset.setOffset( this, options, i );
+				} );
+		}
+
+		var docElem, win,
+			box = { top: 0, left: 0 },
+			elem = this[ 0 ],
+			doc = elem && elem.ownerDocument;
+
+		if ( !doc ) {
+			return;
+		}
+
+		docElem = doc.documentElement;
+
+		// Make sure it's not a disconnected DOM node
+		if ( !jQuery.contains( docElem, elem ) ) {
+			return box;
+		}
+
+		// If we don't have gBCR, just use 0,0 rather than error
+		// BlackBerry 5, iOS 3 (original iPhone)
+		if ( typeof elem.getBoundingClientRect !== "undefined" ) {
+			box = elem.getBoundingClientRect();
+		}
+		win = getWindow( doc );
+		return {
+			top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+			left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+		};
+	},
+
+	position: function() {
+		if ( !this[ 0 ] ) {
+			return;
+		}
+
+		var offsetParent, offset,
+			parentOffset = { top: 0, left: 0 },
+			elem = this[ 0 ];
+
+		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
+		// because it is its only offset parent
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+
+			// we assume that getBoundingClientRect is available when computed position is fixed
+			offset = elem.getBoundingClientRect();
+		} else {
+
+			// Get *real* offsetParent
+			offsetParent = this.offsetParent();
+
+			// Get correct offsets
+			offset = this.offset();
+			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+				parentOffset = offsetParent.offset();
+			}
+
+			// Add offsetParent borders
+			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+		}
+
+		// Subtract parent offsets and element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		return {
+			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
+		};
+	},
+
+	offsetParent: function() {
+		return this.map( function() {
+			var offsetParent = this.offsetParent;
+
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) &&
+				jQuery.css( offsetParent, "position" ) === "static" ) ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent || documentElement;
+		} );
+	}
+} );
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
+	var top = /Y/.test( prop );
+
+	jQuery.fn[ method ] = function( val ) {
+		return access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? ( prop in win ) ? win[ prop ] :
+					win.document.documentElement[ method ] :
+					elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					top ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+} );
+
+// Support: Safari<7-8+, Chrome<37-44+
+// Add the top/left cssHooks using jQuery.fn.position
+// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+// getComputedStyle returns percent when specified for top/left/bottom/right
+// rather than make the css module depend on the offset module, we just check for it here
+jQuery.each( [ "top", "left" ], function( i, prop ) {
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
+		function( elem, computed ) {
+			if ( computed ) {
+				computed = curCSS( elem, prop );
+
+				// if curCSS returns percentage, fallback to offset
+				return rnumnonpx.test( computed ) ?
+					jQuery( elem ).position()[ prop ] + "px" :
+					computed;
+			}
+		}
+	);
+} );
+
+
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
+	function( defaultExtra, funcName ) {
+
+		// margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( jQuery.isWindow( elem ) ) {
+
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
+					// whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only,
+					// but there is currently no good, small way to fix it.
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	} );
+} );
+
+
+jQuery.fn.extend( {
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ?
+			this.off( selector, "**" ) :
+			this.off( types, selector || "**", fn );
+	}
+} );
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	return this.length;
+};
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+
+
+
+// Register as a named AMD module, since jQuery can be concatenated with other
+// files that may use define, but not via a proper concatenation script that
+// understands anonymous AMD modules. A named AMD is safest and most robust
+// way to register. Lowercase jquery is used because AMD module names are
+// derived from file names, and jQuery is normally delivered in a lowercase
+// file name. Do this after creating the global so that if an AMD module wants
+// to call noConflict to hide this version of jQuery, it will work.
+
+// Note that for maximum portability, libraries that are not jQuery should
+// declare themselves as anonymous modules, and avoid setting a global if an
+// AMD loader is present. jQuery is a special case. For more information, see
+// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
+
+if ( typeof define === "function" && define.amd ) {
+	define( "jquery", [], function() {
+		return jQuery;
+	} );
+}
+
+
+
+var
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$;
+
+jQuery.noConflict = function( deep ) {
+	if ( window.$ === jQuery ) {
+		window.$ = _$;
+	}
+
+	if ( deep && window.jQuery === jQuery ) {
+		window.jQuery = _jQuery;
+	}
+
+	return jQuery;
+};
+
+// Expose jQuery and $ identifiers, even in
+// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
+// and CommonJS for browser emulators (#13566)
+if ( !noGlobal ) {
+	window.jQuery = window.$ = jQuery;
+}
+
+return jQuery;
+}));
diff --git a/core/media/jui/js/jquery.min.js b/core/media/jui/js/jquery.min.js
new file mode 100644
index 00000000..e8364758
--- /dev/null
+++ b/core/media/jui/js/jquery.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0;
+}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}}),function(){var a;l.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,e;return c=d.getElementsByTagName("body")[0],c&&c.style?(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(d.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(e),a):void 0}}();var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),V=["Top","Right","Bottom","Left"],W=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function X(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&U.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var Y=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)Y(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/<tbody/i;function ia(a){Z.test(a.type)&&(a.defaultChecked=a.checked)}function ja(a,b,c,d,e){for(var f,g,h,i,j,k,m,o=a.length,p=ca(b),q=[],r=0;o>r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"<table>"!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ma.test(f)?this.mouseHooks:la.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=g.srcElement||d),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,h.filter?h.filter(a,g):a},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button,h=b.fromElement;return null==a.pageX&&null!=b.clientX&&(e=a.target.ownerDocument||d,f=e.documentElement,c=e.body,a.pageX=b.clientX+(f&&f.scrollLeft||c&&c.scrollLeft||0)-(f&&f.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(f&&f.scrollTop||c&&c.scrollTop||0)-(f&&f.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&h&&(a.relatedTarget=h===a.target?b.toElement:h),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ra()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ra()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=d.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)}:function(a,b,c){var d="on"+b;a.detachEvent&&("undefined"==typeof a[d]&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?pa:qa):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:qa,isPropagationStopped:qa,isImmediatePropagationStopped:qa,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=pa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=pa,a&&!this.isSimulated&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=pa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submit||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?n.prop(b,"form"):void 0;c&&!n._data(c,"submit")&&(n.event.add(c,"submit._submit",function(a){a._submitBubble=!0}),n._data(c,"submit",!0))})},postDispatch:function(a){a._submitBubble&&(delete a._submitBubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.change||(n.event.special.change={setup:function(){return ka.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._justChanged=!0)}),n.event.add(this,"click._change",function(a){this._justChanged&&!a.isTrigger&&(this._justChanged=!1),n.event.simulate("change",this,a)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;ka.test(b.nodeName)&&!n._data(b,"change")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a)}),n._data(b,"change",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!ka.test(this.nodeName)}}),l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d){return sa(this,a,b,c,d)},one:function(a,b,c,d){return sa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=qa),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ta=/ jQuery\d+="(?:null|\d+)"/g,ua=new RegExp("<(?:"+ba+")[\\s/>]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/<script|<style|<link/i,xa=/checked\s*(?:[^=]|=\s*.checked.)/i,ya=/^true\/(.*)/,za=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="<table><tr><td></td><td>t</td></tr></table>",j.childNodes[0].style.borderCollapse="separate",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ra(a),g=l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Sa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Oa.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+eb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{
+marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),hb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ib||(ib=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(ib),ib=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a,b=d.createElement("input"),c=d.createElement("div"),e=d.createElement("select"),f=e.appendChild(d.createElement("option"));c=d.createElement("div"),c.setAttribute("className","t"),c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],b.setAttribute("type","checkbox"),c.appendChild(b),a=c.getElementsByTagName("a")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==c.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=f.selected,l.enctype=!!d.createElement("form").enctype,e.disabled=!0,l.optDisabled=!f.disabled,b=d.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value}();var rb=/\r/g,sb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(sb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>-1)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var tb,ub,vb=n.expr.attrHandle,wb=/^(?:checked|selected)$/i,xb=l.getSetAttribute,yb=l.input;n.fn.extend({attr:function(a,b){return Y(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ub:tb)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?yb&&xb||!wb.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(xb?c:d)}}),ub={set:function(a,b,c){return b===!1?n.removeAttr(a,c):yb&&xb||!wb.test(c)?a.setAttribute(!xb&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=vb[b]||n.find.attr;yb&&xb||!wb.test(b)?vb[b]=function(a,b,d){var e,f;return d||(f=vb[b],vb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,vb[b]=f),e}:vb[b]=function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),yb&&xb||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):tb&&tb.set(a,b,c)}}),xb||(tb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},vb.id=vb.name=vb.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:tb.set},n.attrHooks.contenteditable={set:function(a,b,c){tb.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var zb=/^(?:input|select|textarea|button|object)$/i,Ab=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return Y(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):zb.test(a.nodeName)||Ab.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var Bb=/[\t\r\n\f]/g;function Cb(a){return n.attr(a,"class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,Cb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,Cb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,Cb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=Cb(this),b&&n._data(this,"__className__",b),n.attr(this,"class",b||a===!1?"":n._data(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+Cb(c)+" ").replace(Bb," ").indexOf(b)>-1)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Db=a.location,Eb=n.now(),Fb=/\?/,Gb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(Gb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new a.DOMParser,c=d.parseFromString(b,"text/xml")):(c=new a.ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var Hb=/#.*$/,Ib=/([?&])_=[^&]*/,Jb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Kb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Lb=/^(?:GET|HEAD)$/,Mb=/^\/\//,Nb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ob={},Pb={},Qb="*/".concat("*"),Rb=Db.href,Sb=Nb.exec(Rb.toLowerCase())||[];function Tb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Ub(a,b,c,d){var e={},f=a===Pb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Vb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Wb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Xb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Rb,type:"GET",isLocal:Kb.test(Sb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Qb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Vb(Vb(a,n.ajaxSettings),b):Vb(n.ajaxSettings,a)},ajaxPrefilter:Tb(Ob),ajaxTransport:Tb(Pb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var d,e,f,g,h,i,j,k,l=n.ajaxSetup({},c),m=l.context||l,o=l.context&&(m.nodeType||m.jquery)?n(m):n.event,p=n.Deferred(),q=n.Callbacks("once memory"),r=l.statusCode||{},s={},t={},u=0,v="canceled",w={readyState:0,getResponseHeader:function(a){var b;if(2===u){if(!k){k={};while(b=Jb.exec(g))k[b[1].toLowerCase()]=b[2]}b=k[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===u?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return u||(a=t[c]=t[c]||a,s[a]=b),this},overrideMimeType:function(a){return u||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>u)for(b in a)r[b]=[r[b],a[b]];else w.always(a[w.status]);return this},abort:function(a){var b=a||v;return j&&j.abort(b),y(0,b),this}};if(p.promise(w).complete=q.add,w.success=w.done,w.error=w.fail,l.url=((b||l.url||Rb)+"").replace(Hb,"").replace(Mb,Sb[1]+"//"),l.type=c.method||c.type||l.method||l.type,l.dataTypes=n.trim(l.dataType||"*").toLowerCase().match(G)||[""],null==l.crossDomain&&(d=Nb.exec(l.url.toLowerCase()),l.crossDomain=!(!d||d[1]===Sb[1]&&d[2]===Sb[2]&&(d[3]||("http:"===d[1]?"80":"443"))===(Sb[3]||("http:"===Sb[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=n.param(l.data,l.traditional)),Ub(Ob,l,c,w),2===u)return w;i=n.event&&l.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!Lb.test(l.type),f=l.url,l.hasContent||(l.data&&(f=l.url+=(Fb.test(f)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=Ib.test(f)?f.replace(Ib,"$1_="+Eb++):f+(Fb.test(f)?"&":"?")+"_="+Eb++)),l.ifModified&&(n.lastModified[f]&&w.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&w.setRequestHeader("If-None-Match",n.etag[f])),(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&w.setRequestHeader("Content-Type",l.contentType),w.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+Qb+"; q=0.01":""):l.accepts["*"]);for(e in l.headers)w.setRequestHeader(e,l.headers[e]);if(l.beforeSend&&(l.beforeSend.call(m,w,l)===!1||2===u))return w.abort();v="abort";for(e in{success:1,error:1,complete:1})w[e](l[e]);if(j=Ub(Pb,l,c,w)){if(w.readyState=1,i&&o.trigger("ajaxSend",[w,l]),2===u)return w;l.async&&l.timeout>0&&(h=a.setTimeout(function(){w.abort("timeout")},l.timeout));try{u=1,j.send(s,y)}catch(x){if(!(2>u))throw x;y(-1,x)}}else y(-1,"No Transport");function y(b,c,d,e){var k,s,t,v,x,y=c;2!==u&&(u=2,h&&a.clearTimeout(h),j=void 0,g=e||"",w.readyState=b>0?4:0,k=b>=200&&300>b||304===b,d&&(v=Wb(l,w,d)),v=Xb(l,v,w,k),k?(l.ifModified&&(x=w.getResponseHeader("Last-Modified"),x&&(n.lastModified[f]=x),x=w.getResponseHeader("etag"),x&&(n.etag[f]=x)),204===b||"HEAD"===l.type?y="nocontent":304===b?y="notmodified":(y=v.state,s=v.data,t=v.error,k=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),w.status=b,w.statusText=(c||y)+"",k?p.resolveWith(m,[s,y,w]):p.rejectWith(m,[w,y,t]),w.statusCode(r),r=void 0,i&&o.trigger(k?"ajaxSuccess":"ajaxError",[w,l,k?s:t]),q.fireWith(m,[w,y]),i&&(o.trigger("ajaxComplete",[w,l]),--n.active||n.event.trigger("ajaxStop")))}return w},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}});function Yb(a){return a.style&&a.style.display||n.css(a,"display")}function Zb(a){if(!n.contains(a.ownerDocument||d,a))return!0;while(a&&1===a.nodeType){if("none"===Yb(a)||"hidden"===a.type)return!0;a=a.parentNode}return!1}n.expr.filters.hidden=function(a){return l.reliableHiddenOffsets()?a.offsetWidth<=0&&a.offsetHeight<=0&&!a.getClientRects().length:Zb(a)},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var $b=/%20/g,_b=/\[\]$/,ac=/\r?\n/g,bc=/^(?:submit|button|image|reset|file)$/i,cc=/^(?:input|select|textarea|keygen)/i;function dc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||_b.test(a)?d(a,e):dc(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)dc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)dc(c,a[c],b,e);return d.join("&").replace($b,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&cc.test(this.nodeName)&&!bc.test(a)&&(this.checked||!Z.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(ac,"\r\n")}}):{name:b.name,value:c.replace(ac,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return this.isLocal?ic():d.documentMode>8?hc():/^(get|post|head|put|delete|options)$/i.test(this.type)&&hc()||ic()}:hc;var ec=0,fc={},gc=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in fc)fc[a](void 0,!0)}),l.cors=!!gc&&"withCredentials"in gc,gc=l.ajax=!!gc,gc&&n.ajaxTransport(function(b){if(!b.crossDomain||l.cors){var c;return{send:function(d,e){var f,g=b.xhr(),h=++ec;if(g.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(f in b.xhrFields)g[f]=b.xhrFields[f];b.mimeType&&g.overrideMimeType&&g.overrideMimeType(b.mimeType),b.crossDomain||d["X-Requested-With"]||(d["X-Requested-With"]="XMLHttpRequest");for(f in d)void 0!==d[f]&&g.setRequestHeader(f,d[f]+"");g.send(b.hasContent&&b.data||null),c=function(a,d){var f,i,j;if(c&&(d||4===g.readyState))if(delete fc[h],c=void 0,g.onreadystatechange=n.noop,d)4!==g.readyState&&g.abort();else{j={},f=g.status,"string"==typeof g.responseText&&(j.text=g.responseText);try{i=g.statusText}catch(k){i=""}f||!b.isLocal||b.crossDomain?1223===f&&(f=204):f=j.text?200:404}j&&e(f,i,j,g.getAllResponseHeaders())},b.async?4===g.readyState?a.setTimeout(c):g.onreadystatechange=fc[h]=c:c()},abort:function(){c&&c(void 0,!0)}}}});function hc(){try{return new a.XMLHttpRequest}catch(b){}}function ic(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=d.head||n("head")[0]||d.documentElement;return{send:function(e,f){b=d.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||f(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var jc=[],kc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=jc.pop()||n.expando+"_"+Eb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(kc.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&kc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(kc,"$1"+e):b.jsonp!==!1&&(b.url+=(Fb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,jc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ja([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var lc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&lc)return lc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h,a.length)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function mc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=mc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=mc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({
+padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var nc=a.jQuery,oc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=oc),b&&a.jQuery===n&&(a.jQuery=nc),n},b||(a.jQuery=a.$=n),n});
diff --git a/core/media/jui/js/jquery.minicolors.js b/core/media/jui/js/jquery.minicolors.js
new file mode 100644
index 00000000..f00d5ddf
--- /dev/null
+++ b/core/media/jui/js/jquery.minicolors.js
@@ -0,0 +1,1135 @@
+/*
+ * jQuery MiniColors: A tiny color picker built on jQuery
+ *
+ * Copyright: Cory LaViska for A Beautiful Site, LLC: http://www.abeautifulsite.net/
+ *
+ * Contribute: https://github.com/claviska/jquery-minicolors
+ *
+ * @license: http://opensource.org/licenses/MIT
+ *
+ */
+(function (factory) {
+    /* jshint ignore:start */
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS
+        module.exports = factory(require('jquery'));
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+    /* jshint ignore:end */
+}(function ($) {
+
+    'use strict';
+
+    // Defaults
+    $.minicolors = {
+        defaults: {
+            animationSpeed: 50,
+            animationEasing: 'swing',
+            change: null,
+            changeDelay: 0,
+            control: 'hue',
+            dataUris: true,
+            defaultValue: '',
+            format: 'hex',
+            hide: null,
+            hideSpeed: 100,
+            inline: false,
+            keywords: '',
+            letterCase: 'lowercase',
+            opacity: false,
+            position: 'bottom left',
+            show: null,
+            showSpeed: 100,
+            theme: 'default',
+            swatches: []
+        }
+    };
+
+    // Public methods
+    $.extend($.fn, {
+        minicolors: function(method, data) {
+
+            switch(method) {
+
+                // Destroy the control
+                case 'destroy':
+                    $(this).each( function() {
+                        destroy($(this));
+                    });
+                    return $(this);
+
+                // Hide the color picker
+                case 'hide':
+                    hide();
+                    return $(this);
+
+                // Get/set opacity
+                case 'opacity':
+                    // Getter
+                    if( data === undefined ) {
+                        // Getter
+                        return $(this).attr('data-opacity');
+                    } else {
+                        // Setter
+                        $(this).each( function() {
+                            updateFromInput($(this).attr('data-opacity', data));
+                        });
+                    }
+                    return $(this);
+
+                // Get an RGB(A) object based on the current color/opacity
+                case 'rgbObject':
+                    return rgbObject($(this), method === 'rgbaObject');
+
+                // Get an RGB(A) string based on the current color/opacity
+                case 'rgbString':
+                case 'rgbaString':
+                    return rgbString($(this), method === 'rgbaString');
+
+                // Get/set settings on the fly
+                case 'settings':
+                    if( data === undefined ) {
+                        return $(this).data('minicolors-settings');
+                    } else {
+                        // Setter
+                        $(this).each( function() {
+                            var settings = $(this).data('minicolors-settings') || {};
+                            destroy($(this));
+                            $(this).minicolors($.extend(true, settings, data));
+                        });
+                    }
+                    return $(this);
+
+                // Show the color picker
+                case 'show':
+                    show( $(this).eq(0) );
+                    return $(this);
+
+                // Get/set the hex color value
+                case 'value':
+                    if( data === undefined ) {
+                        // Getter
+                        return $(this).val();
+                    } else {
+                        // Setter
+                        $(this).each( function() {
+                            if( typeof(data) === 'object' ) {
+                                if( data.opacity ) {
+                                    $(this).attr('data-opacity', keepWithin(data.opacity, 0, 1));
+                                }
+                                if( data.color ) {
+                                    $(this).val(data.color);
+                                }
+                            } else {
+                                $(this).val(data);
+                            }
+                            updateFromInput($(this));
+                        });
+                    }
+                    return $(this);
+
+                // Initializes the control
+                default:
+                    if( method !== 'create' ) data = method;
+                    $(this).each( function() {
+                        init($(this), data);
+                    });
+                    return $(this);
+
+            }
+
+        }
+    });
+
+    // Initialize input elements
+    function init(input, settings) {
+
+        var minicolors = $('<div class="minicolors" />'),
+            defaults = $.minicolors.defaults,
+            size,
+            swatches,
+            swatch,
+            panel,
+            i;
+
+        // Do nothing if already initialized
+        if( input.data('minicolors-initialized') ) return;
+
+        // Handle settings
+        settings = $.extend(true, {}, defaults, settings);
+
+        // The wrapper
+        minicolors
+            .addClass('minicolors-theme-' + settings.theme)
+            .toggleClass('minicolors-with-opacity', settings.opacity)
+            .toggleClass('minicolors-no-data-uris', settings.dataUris !== true);
+
+        // Custom positioning
+        if( settings.position !== undefined ) {
+            $.each(settings.position.split(' '), function() {
+                minicolors.addClass('minicolors-position-' + this);
+            });
+        }
+
+        // Input size
+        if( settings.format === 'rgb' ) {
+            size = settings.opacity ? '25' : '20';
+        } else {
+            size = settings.keywords ? '11' : '7';
+        }
+
+        // The input
+        input
+            .addClass('minicolors-input')
+            .data('minicolors-initialized', false)
+            .data('minicolors-settings', settings)
+            .prop('size', size)
+            .wrap(minicolors)
+            .after(
+                '<div class="minicolors-panel minicolors-slider-' + settings.control + '">' +
+                    '<div class="minicolors-slider minicolors-sprite">' +
+                        '<div class="minicolors-picker"></div>' +
+                    '</div>' +
+                    '<div class="minicolors-opacity-slider minicolors-sprite">' +
+                        '<div class="minicolors-picker"></div>' +
+                    '</div>' +
+                    '<div class="minicolors-grid minicolors-sprite">' +
+                        '<div class="minicolors-grid-inner"></div>' +
+                        '<div class="minicolors-picker"><div></div></div>' +
+                    '</div>' +
+                '</div>'
+            );
+
+        // The swatch
+        if( !settings.inline ) {
+            input.after('<span class="minicolors-swatch minicolors-sprite minicolors-input-swatch"><span class="minicolors-swatch-color"></span></span>');
+            input.next('.minicolors-input-swatch').on('click', function(event) {
+                event.preventDefault();
+                input.focus();
+            });
+        }
+
+        // Prevent text selection in IE
+        panel = input.parent().find('.minicolors-panel');
+        panel.on('selectstart', function() { return false; }).end();
+
+        // Swatches
+        if (settings.swatches && settings.swatches.length !== 0) {
+            if (settings.swatches.length > 7) {
+                settings.swatches.length = 7;
+            }
+            panel.addClass('minicolors-with-swatches');
+            swatches = $('<ul class="minicolors-swatches"></ul>')
+                .appendTo(panel);
+            for(i = 0; i < settings.swatches.length; ++i) {
+                swatch = settings.swatches[i];
+                swatch = isRgb(swatch) ? parseRgb(swatch, true) : hex2rgb(parseHex(swatch, true));
+                $('<li class="minicolors-swatch minicolors-sprite"><span class="minicolors-swatch-color"></span></li>')
+                    .appendTo(swatches)
+                    .data('swatch-color', settings.swatches[i])
+                    .find('.minicolors-swatch-color')
+                    .css({
+                        backgroundColor: rgb2hex(swatch),
+                        opacity: swatch.a
+                    });
+                settings.swatches[i] = swatch;
+            }
+
+        }
+
+        // Inline controls
+        if( settings.inline ) input.parent().addClass('minicolors-inline');
+
+        updateFromInput(input, false);
+
+        input.data('minicolors-initialized', true);
+
+    }
+
+    // Returns the input back to its original state
+    function destroy(input) {
+
+        var minicolors = input.parent();
+
+        // Revert the input element
+        input
+            .removeData('minicolors-initialized')
+            .removeData('minicolors-settings')
+            .removeProp('size')
+            .removeClass('minicolors-input');
+
+        // Remove the wrap and destroy whatever remains
+        minicolors.before(input).remove();
+
+    }
+
+    // Shows the specified dropdown panel
+    function show(input) {
+
+        var minicolors = input.parent(),
+            panel = minicolors.find('.minicolors-panel'),
+            settings = input.data('minicolors-settings');
+
+        // Do nothing if uninitialized, disabled, inline, or already open
+        if( !input.data('minicolors-initialized') ||
+            input.prop('disabled') ||
+            minicolors.hasClass('minicolors-inline') ||
+            minicolors.hasClass('minicolors-focus')
+        ) return;
+
+        hide();
+
+        minicolors.addClass('minicolors-focus');
+        panel
+            .stop(true, true)
+            .fadeIn(settings.showSpeed, function() {
+                if( settings.show ) settings.show.call(input.get(0));
+            });
+
+    }
+
+    // Hides all dropdown panels
+    function hide() {
+
+        $('.minicolors-focus').each( function() {
+
+            var minicolors = $(this),
+                input = minicolors.find('.minicolors-input'),
+                panel = minicolors.find('.minicolors-panel'),
+                settings = input.data('minicolors-settings');
+
+            panel.fadeOut(settings.hideSpeed, function() {
+                if( settings.hide ) settings.hide.call(input.get(0));
+                minicolors.removeClass('minicolors-focus');
+            });
+
+        });
+    }
+
+    // Moves the selected picker
+    function move(target, event, animate) {
+
+        var input = target.parents('.minicolors').find('.minicolors-input'),
+            settings = input.data('minicolors-settings'),
+            picker = target.find('[class$=-picker]'),
+            offsetX = target.offset().left,
+            offsetY = target.offset().top,
+            x = Math.round(event.pageX - offsetX),
+            y = Math.round(event.pageY - offsetY),
+            duration = animate ? settings.animationSpeed : 0,
+            wx, wy, r, phi;
+
+        // Touch support
+        if( event.originalEvent.changedTouches ) {
+            x = event.originalEvent.changedTouches[0].pageX - offsetX;
+            y = event.originalEvent.changedTouches[0].pageY - offsetY;
+        }
+
+        // Constrain picker to its container
+        if( x < 0 ) x = 0;
+        if( y < 0 ) y = 0;
+        if( x > target.width() ) x = target.width();
+        if( y > target.height() ) y = target.height();
+
+        // Constrain color wheel values to the wheel
+        if( target.parent().is('.minicolors-slider-wheel') && picker.parent().is('.minicolors-grid') ) {
+            wx = 75 - x;
+            wy = 75 - y;
+            r = Math.sqrt(wx * wx + wy * wy);
+            phi = Math.atan2(wy, wx);
+            if( phi < 0 ) phi += Math.PI * 2;
+            if( r > 75 ) {
+                r = 75;
+                x = 75 - (75 * Math.cos(phi));
+                y = 75 - (75 * Math.sin(phi));
+            }
+            x = Math.round(x);
+            y = Math.round(y);
+        }
+
+        // Move the picker
+        if( target.is('.minicolors-grid') ) {
+            picker
+                .stop(true)
+                .animate({
+                    top: y + 'px',
+                    left: x + 'px'
+                }, duration, settings.animationEasing, function() {
+                    updateFromControl(input, target);
+                });
+        } else {
+            picker
+                .stop(true)
+                .animate({
+                    top: y + 'px'
+                }, duration, settings.animationEasing, function() {
+                    updateFromControl(input, target);
+                });
+        }
+
+    }
+
+    // Sets the input based on the color picker values
+    function updateFromControl(input, target) {
+
+        function getCoords(picker, container) {
+
+            var left, top;
+            if( !picker.length || !container ) return null;
+            left = picker.offset().left;
+            top = picker.offset().top;
+
+            return {
+                x: left - container.offset().left + (picker.outerWidth() / 2),
+                y: top - container.offset().top + (picker.outerHeight() / 2)
+            };
+
+        }
+
+        var hue, saturation, brightness, x, y, r, phi,
+
+            hex = input.val(),
+            opacity = input.attr('data-opacity'),
+
+            // Helpful references
+            minicolors = input.parent(),
+            settings = input.data('minicolors-settings'),
+            swatch = minicolors.find('.minicolors-input-swatch'),
+
+            // Panel objects
+            grid = minicolors.find('.minicolors-grid'),
+            slider = minicolors.find('.minicolors-slider'),
+            opacitySlider = minicolors.find('.minicolors-opacity-slider'),
+
+            // Picker objects
+            gridPicker = grid.find('[class$=-picker]'),
+            sliderPicker = slider.find('[class$=-picker]'),
+            opacityPicker = opacitySlider.find('[class$=-picker]'),
+
+            // Picker positions
+            gridPos = getCoords(gridPicker, grid),
+            sliderPos = getCoords(sliderPicker, slider),
+            opacityPos = getCoords(opacityPicker, opacitySlider);
+
+        // Handle colors
+        if( target.is('.minicolors-grid, .minicolors-slider, .minicolors-opacity-slider') ) {
+
+            // Determine HSB values
+            switch(settings.control) {
+
+                case 'wheel':
+                    // Calculate hue, saturation, and brightness
+                    x = (grid.width() / 2) - gridPos.x;
+                    y = (grid.height() / 2) - gridPos.y;
+                    r = Math.sqrt(x * x + y * y);
+                    phi = Math.atan2(y, x);
+                    if( phi < 0 ) phi += Math.PI * 2;
+                    if( r > 75 ) {
+                        r = 75;
+                        gridPos.x = 69 - (75 * Math.cos(phi));
+                        gridPos.y = 69 - (75 * Math.sin(phi));
+                    }
+                    saturation = keepWithin(r / 0.75, 0, 100);
+                    hue = keepWithin(phi * 180 / Math.PI, 0, 360);
+                    brightness = keepWithin(100 - Math.floor(sliderPos.y * (100 / slider.height())), 0, 100);
+                    hex = hsb2hex({
+                        h: hue,
+                        s: saturation,
+                        b: brightness
+                    });
+
+                    // Update UI
+                    slider.css('backgroundColor', hsb2hex({ h: hue, s: saturation, b: 100 }));
+                    break;
+
+                case 'saturation':
+                    // Calculate hue, saturation, and brightness
+                    hue = keepWithin(parseInt(gridPos.x * (360 / grid.width()), 10), 0, 360);
+                    saturation = keepWithin(100 - Math.floor(sliderPos.y * (100 / slider.height())), 0, 100);
+                    brightness = keepWithin(100 - Math.floor(gridPos.y * (100 / grid.height())), 0, 100);
+                    hex = hsb2hex({
+                        h: hue,
+                        s: saturation,
+                        b: brightness
+                    });
+
+                    // Update UI
+                    slider.css('backgroundColor', hsb2hex({ h: hue, s: 100, b: brightness }));
+                    minicolors.find('.minicolors-grid-inner').css('opacity', saturation / 100);
+                    break;
+
+                case 'brightness':
+                    // Calculate hue, saturation, and brightness
+                    hue = keepWithin(parseInt(gridPos.x * (360 / grid.width()), 10), 0, 360);
+                    saturation = keepWithin(100 - Math.floor(gridPos.y * (100 / grid.height())), 0, 100);
+                    brightness = keepWithin(100 - Math.floor(sliderPos.y * (100 / slider.height())), 0, 100);
+                    hex = hsb2hex({
+                        h: hue,
+                        s: saturation,
+                        b: brightness
+                    });
+
+                    // Update UI
+                    slider.css('backgroundColor', hsb2hex({ h: hue, s: saturation, b: 100 }));
+                    minicolors.find('.minicolors-grid-inner').css('opacity', 1 - (brightness / 100));
+                    break;
+
+                default:
+                    // Calculate hue, saturation, and brightness
+                    hue = keepWithin(360 - parseInt(sliderPos.y * (360 / slider.height()), 10), 0, 360);
+                    saturation = keepWithin(Math.floor(gridPos.x * (100 / grid.width())), 0, 100);
+                    brightness = keepWithin(100 - Math.floor(gridPos.y * (100 / grid.height())), 0, 100);
+                    hex = hsb2hex({
+                        h: hue,
+                        s: saturation,
+                        b: brightness
+                    });
+
+                    // Update UI
+                    grid.css('backgroundColor', hsb2hex({ h: hue, s: 100, b: 100 }));
+                    break;
+
+            }
+
+            // Handle opacity
+            if( settings.opacity ) {
+                opacity = parseFloat(1 - (opacityPos.y / opacitySlider.height())).toFixed(2);
+            } else {
+                opacity = 1;
+            }
+
+            updateInput(input, hex, opacity);
+        }
+        else {
+            // Set swatch color
+            swatch.find('span').css({
+                backgroundColor: hex,
+                opacity: opacity
+            });
+
+            // Handle change event
+            doChange(input, hex, opacity);
+        }
+    }
+
+    // Sets the value of the input and does the appropriate conversions
+    // to respect settings, also updates the swatch
+    function updateInput(input, value, opacity) {
+        var rgb,
+
+        // Helpful references
+        minicolors = input.parent(),
+        settings = input.data('minicolors-settings'),
+        swatch = minicolors.find('.minicolors-input-swatch');
+
+        if( settings.opacity ) input.attr('data-opacity', opacity);
+
+        // Set color string
+        if( settings.format === 'rgb' ) {
+            // Returns RGB(A) string
+
+            // Checks for input format and does the conversion
+            if ( isRgb(value) ) {
+                rgb = parseRgb(value, true);
+            }
+            else {
+                rgb = hex2rgb(parseHex(value, true));
+            }
+
+            opacity = input.attr('data-opacity') === '' ? 1 : keepWithin( parseFloat( input.attr('data-opacity') ).toFixed(2), 0, 1 );
+            if( isNaN( opacity ) || !settings.opacity ) opacity = 1;
+
+            if( input.minicolors('rgbObject').a <= 1 && rgb && settings.opacity) {
+                // Set RGBA string if alpha
+                value = 'rgba(' + rgb.r + ', ' + rgb.g + ', ' + rgb.b + ', ' + parseFloat( opacity ) + ')';
+            } else {
+                // Set RGB string (alpha = 1)
+                value = 'rgb(' + rgb.r + ', ' + rgb.g + ', ' + rgb.b + ')';
+            }
+        } else {
+            // Returns hex color
+
+            // Checks for input format and does the conversion
+            if ( isRgb(value) ) {
+                value = rgbString2hex(value);
+            }
+
+            value = convertCase( value, settings.letterCase );
+        }
+
+        // Update value from picker
+        input.val( value );
+
+        // Set swatch color
+        swatch.find('span').css({
+            backgroundColor: value,
+            opacity: opacity
+        });
+
+        // Handle change event
+        doChange(input, value, opacity);
+    }
+
+    // Sets the color picker values from the input
+    function updateFromInput(input, preserveInputValue) {
+
+        var hex,
+            hsb,
+            opacity,
+            keywords,
+            alpha,
+            value,
+            x, y, r, phi,
+
+            // Helpful references
+            minicolors = input.parent(),
+            settings = input.data('minicolors-settings'),
+            swatch = minicolors.find('.minicolors-input-swatch'),
+
+            // Panel objects
+            grid = minicolors.find('.minicolors-grid'),
+            slider = minicolors.find('.minicolors-slider'),
+            opacitySlider = minicolors.find('.minicolors-opacity-slider'),
+
+            // Picker objects
+            gridPicker = grid.find('[class$=-picker]'),
+            sliderPicker = slider.find('[class$=-picker]'),
+            opacityPicker = opacitySlider.find('[class$=-picker]');
+
+        // Determine hex/HSB values
+        if( isRgb(input.val()) ) {
+            // If input value is a rgb(a) string, convert it to hex color and update opacity
+            hex = rgbString2hex(input.val());
+            alpha = keepWithin(parseFloat(getAlpha(input.val())).toFixed(2), 0, 1);
+            if( alpha ) {
+                input.attr('data-opacity', alpha);
+            }
+        } else {
+            hex = convertCase(parseHex(input.val(), true), settings.letterCase);
+        }
+
+        if( !hex ){
+            hex = convertCase(parseInput(settings.defaultValue, true), settings.letterCase);
+        }
+        hsb = hex2hsb(hex);
+
+        // Get array of lowercase keywords
+        keywords = !settings.keywords ? [] : $.map(settings.keywords.split(','), function(a) {
+            return $.trim(a.toLowerCase());
+        });
+
+        // Set color string
+        if( input.val() !== '' && $.inArray(input.val().toLowerCase(), keywords) > -1 ) {
+            value = convertCase(input.val());
+        } else {
+            value = isRgb(input.val()) ? parseRgb(input.val()) : hex;
+        }
+
+        // Update input value
+        if( !preserveInputValue ) input.val(value);
+
+        // Determine opacity value
+        if( settings.opacity ) {
+            // Get from data-opacity attribute and keep within 0-1 range
+            opacity = input.attr('data-opacity') === '' ? 1 : keepWithin(parseFloat(input.attr('data-opacity')).toFixed(2), 0, 1);
+            if( isNaN(opacity) ) opacity = 1;
+            input.attr('data-opacity', opacity);
+            swatch.find('span').css('opacity', opacity);
+
+            // Set opacity picker position
+            y = keepWithin(opacitySlider.height() - (opacitySlider.height() * opacity), 0, opacitySlider.height());
+            opacityPicker.css('top', y + 'px');
+        }
+
+        // Set opacity to zero if input value is transparent
+        if( input.val().toLowerCase() === 'transparent' ) {
+            swatch.find('span').css('opacity', 0);
+        }
+
+        // Update swatch
+        swatch.find('span').css('backgroundColor', hex);
+
+        // Determine picker locations
+        switch(settings.control) {
+
+            case 'wheel':
+                // Set grid position
+                r = keepWithin(Math.ceil(hsb.s * 0.75), 0, grid.height() / 2);
+                phi = hsb.h * Math.PI / 180;
+                x = keepWithin(75 - Math.cos(phi) * r, 0, grid.width());
+                y = keepWithin(75 - Math.sin(phi) * r, 0, grid.height());
+                gridPicker.css({
+                    top: y + 'px',
+                    left: x + 'px'
+                });
+
+                // Set slider position
+                y = 150 - (hsb.b / (100 / grid.height()));
+                if( hex === '' ) y = 0;
+                sliderPicker.css('top', y + 'px');
+
+                // Update panel color
+                slider.css('backgroundColor', hsb2hex({ h: hsb.h, s: hsb.s, b: 100 }));
+                break;
+
+            case 'saturation':
+                // Set grid position
+                x = keepWithin((5 * hsb.h) / 12, 0, 150);
+                y = keepWithin(grid.height() - Math.ceil(hsb.b / (100 / grid.height())), 0, grid.height());
+                gridPicker.css({
+                    top: y + 'px',
+                    left: x + 'px'
+                });
+
+                // Set slider position
+                y = keepWithin(slider.height() - (hsb.s * (slider.height() / 100)), 0, slider.height());
+                sliderPicker.css('top', y + 'px');
+
+                // Update UI
+                slider.css('backgroundColor', hsb2hex({ h: hsb.h, s: 100, b: hsb.b }));
+                minicolors.find('.minicolors-grid-inner').css('opacity', hsb.s / 100);
+                break;
+
+            case 'brightness':
+                // Set grid position
+                x = keepWithin((5 * hsb.h) / 12, 0, 150);
+                y = keepWithin(grid.height() - Math.ceil(hsb.s / (100 / grid.height())), 0, grid.height());
+                gridPicker.css({
+                    top: y + 'px',
+                    left: x + 'px'
+                });
+
+                // Set slider position
+                y = keepWithin(slider.height() - (hsb.b * (slider.height() / 100)), 0, slider.height());
+                sliderPicker.css('top', y + 'px');
+
+                // Update UI
+                slider.css('backgroundColor', hsb2hex({ h: hsb.h, s: hsb.s, b: 100 }));
+                minicolors.find('.minicolors-grid-inner').css('opacity', 1 - (hsb.b / 100));
+                break;
+
+            default:
+                // Set grid position
+                x = keepWithin(Math.ceil(hsb.s / (100 / grid.width())), 0, grid.width());
+                y = keepWithin(grid.height() - Math.ceil(hsb.b / (100 / grid.height())), 0, grid.height());
+                gridPicker.css({
+                    top: y + 'px',
+                    left: x + 'px'
+                });
+
+                // Set slider position
+                y = keepWithin(slider.height() - (hsb.h / (360 / slider.height())), 0, slider.height());
+                sliderPicker.css('top', y + 'px');
+
+                // Update panel color
+                grid.css('backgroundColor', hsb2hex({ h: hsb.h, s: 100, b: 100 }));
+                break;
+
+        }
+
+        // Fire change event, but only if minicolors is fully initialized
+        if( input.data('minicolors-initialized') ) {
+            doChange(input, value, opacity);
+        }
+
+    }
+
+    // Runs the change and changeDelay callbacks
+    function doChange(input, value, opacity) {
+
+        var settings = input.data('minicolors-settings'),
+            lastChange = input.data('minicolors-lastChange'),
+            obj,
+            sel,
+            i;
+
+        // Only run if it actually changed
+        if( !lastChange || lastChange.value !== value || lastChange.opacity !== opacity ) {
+
+            // Remember last-changed value
+            input.data('minicolors-lastChange', {
+                value: value,
+                opacity: opacity
+            });
+
+            // Check and select applicable swatch
+            if (settings.swatches && settings.swatches.length !== 0) {
+                if(!isRgb(value)) {
+                    obj = hex2rgb(value);
+                }
+                else {
+                    obj = parseRgb(value, true);
+                }
+                sel = -1;
+                for(i = 0; i < settings.swatches.length; ++i) {
+                    if (obj.r === settings.swatches[i].r && obj.g === settings.swatches[i].g && obj.b === settings.swatches[i].b && obj.a === settings.swatches[i].a) {
+                        sel = i;
+                        break;
+                    }
+                }
+
+                input.parent().find('.minicolors-swatches .minicolors-swatch').removeClass('selected');
+                if (i !== -1) {
+                    input.parent().find('.minicolors-swatches .minicolors-swatch').eq(i).addClass('selected');
+                }
+            }
+
+            // Fire change event
+            if( settings.change ) {
+                if( settings.changeDelay ) {
+                    // Call after a delay
+                    clearTimeout(input.data('minicolors-changeTimeout'));
+                    input.data('minicolors-changeTimeout', setTimeout( function() {
+                        settings.change.call(input.get(0), value, opacity);
+                    }, settings.changeDelay));
+                } else {
+                    // Call immediately
+                    settings.change.call(input.get(0), value, opacity);
+                }
+            }
+            input.trigger('change').trigger('input');
+        }
+
+    }
+
+    // Generates an RGB(A) object based on the input's value
+    function rgbObject(input) {
+        var hex = parseHex($(input).val(), true),
+            rgb = hex2rgb(hex),
+            opacity = $(input).attr('data-opacity');
+        if( !rgb ) return null;
+        if( opacity !== undefined ) $.extend(rgb, { a: parseFloat(opacity) });
+        return rgb;
+    }
+
+    // Generates an RGB(A) string based on the input's value
+    function rgbString(input, alpha) {
+        var hex = parseHex($(input).val(), true),
+            rgb = hex2rgb(hex),
+            opacity = $(input).attr('data-opacity');
+        if( !rgb ) return null;
+        if( opacity === undefined ) opacity = 1;
+        if( alpha ) {
+            return 'rgba(' + rgb.r + ', ' + rgb.g + ', ' + rgb.b + ', ' + parseFloat(opacity) + ')';
+        } else {
+            return 'rgb(' + rgb.r + ', ' + rgb.g + ', ' + rgb.b + ')';
+        }
+    }
+
+    // Converts to the letter case specified in settings
+    function convertCase(string, letterCase) {
+        return letterCase === 'uppercase' ? string.toUpperCase() : string.toLowerCase();
+    }
+
+    // Parses a string and returns a valid hex string when possible
+    function parseHex(string, expand) {
+        string = string.replace(/^#/g, '');
+        if( !string.match(/^[A-F0-9]{3,6}/ig) ) return '';
+        if( string.length !== 3 && string.length !== 6 ) return '';
+        if( string.length === 3 && expand ) {
+            string = string[0] + string[0] + string[1] + string[1] + string[2] + string[2];
+        }
+        return '#' + string;
+    }
+
+    // Parses a string and returns a valid RGB(A) string when possible
+    function parseRgb(string, obj) {
+
+        var values = string.replace(/[^\d,.]/g, ''),
+            rgba = values.split(',');
+
+        rgba[0] = keepWithin(parseInt(rgba[0], 10), 0, 255);
+        rgba[1] = keepWithin(parseInt(rgba[1], 10), 0, 255);
+        rgba[2] = keepWithin(parseInt(rgba[2], 10), 0, 255);
+        if( rgba[3] ) {
+            rgba[3] = keepWithin(parseFloat(rgba[3], 10), 0, 1);
+        }
+
+        // Return RGBA object
+        if( obj ) {
+            return {
+                r: rgba[0],
+                g: rgba[1],
+                b: rgba[2],
+                a: rgba[3] ? rgba[3] : null
+            };
+        }
+
+        // Return RGBA string
+        if( typeof(rgba[3]) !== 'undefined' && rgba[3] <= 1 ) {
+            return 'rgba(' + rgba[0] + ', ' + rgba[1] + ', ' + rgba[2] + ', ' + rgba[3] + ')';
+        } else {
+            return 'rgb(' + rgba[0] + ', ' + rgba[1] + ', ' + rgba[2] + ')';
+        }
+
+    }
+
+    // Parses a string and returns a valid color string when possible
+    function parseInput(string, expand) {
+        if( isRgb(string) ) {
+            // Returns a valid rgb(a) string
+            return parseRgb(string);
+        } else {
+            return parseHex(string, expand);
+        }
+    }
+
+    // Keeps value within min and max
+    function keepWithin(value, min, max) {
+        if( value < min ) value = min;
+        if( value > max ) value = max;
+        return value;
+    }
+
+    // Checks if a string is a valid RGB(A) string
+    function isRgb(string) {
+        var rgb = string.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
+        return (rgb && rgb.length === 4) ? true : false;
+    }
+
+    // Function to get alpha from a RGB(A) string
+    function getAlpha(rgba) {
+        rgba = rgba.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+(\.\d{1,2})?|\.\d{1,2})[\s+]?/i);
+        return (rgba && rgba.length === 6) ? rgba[4] : '1';
+    }
+
+   // Converts an HSB object to an RGB object
+    function hsb2rgb(hsb) {
+        var rgb = {};
+        var h = Math.round(hsb.h);
+        var s = Math.round(hsb.s * 255 / 100);
+        var v = Math.round(hsb.b * 255 / 100);
+        if(s === 0) {
+            rgb.r = rgb.g = rgb.b = v;
+        } else {
+            var t1 = v;
+            var t2 = (255 - s) * v / 255;
+            var t3 = (t1 - t2) * (h % 60) / 60;
+            if( h === 360 ) h = 0;
+            if( h < 60 ) { rgb.r = t1; rgb.b = t2; rgb.g = t2 + t3; }
+            else if( h < 120 ) {rgb.g = t1; rgb.b = t2; rgb.r = t1 - t3; }
+            else if( h < 180 ) {rgb.g = t1; rgb.r = t2; rgb.b = t2 + t3; }
+            else if( h < 240 ) {rgb.b = t1; rgb.r = t2; rgb.g = t1 - t3; }
+            else if( h < 300 ) {rgb.b = t1; rgb.g = t2; rgb.r = t2 + t3; }
+            else if( h < 360 ) {rgb.r = t1; rgb.g = t2; rgb.b = t1 - t3; }
+            else { rgb.r = 0; rgb.g = 0; rgb.b = 0; }
+        }
+        return {
+            r: Math.round(rgb.r),
+            g: Math.round(rgb.g),
+            b: Math.round(rgb.b)
+        };
+    }
+
+    // Converts an RGB string to a hex string
+    function rgbString2hex(rgb){
+        rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
+        return (rgb && rgb.length === 4) ? '#' +
+        ('0' + parseInt(rgb[1],10).toString(16)).slice(-2) +
+        ('0' + parseInt(rgb[2],10).toString(16)).slice(-2) +
+        ('0' + parseInt(rgb[3],10).toString(16)).slice(-2) : '';
+    }
+
+    // Converts an RGB object to a hex string
+    function rgb2hex(rgb) {
+        var hex = [
+            rgb.r.toString(16),
+            rgb.g.toString(16),
+            rgb.b.toString(16)
+        ];
+        $.each(hex, function(nr, val) {
+            if (val.length === 1) hex[nr] = '0' + val;
+        });
+        return '#' + hex.join('');
+    }
+
+    // Converts an HSB object to a hex string
+    function hsb2hex(hsb) {
+        return rgb2hex(hsb2rgb(hsb));
+    }
+
+    // Converts a hex string to an HSB object
+    function hex2hsb(hex) {
+        var hsb = rgb2hsb(hex2rgb(hex));
+        if( hsb.s === 0 ) hsb.h = 360;
+        return hsb;
+    }
+
+    // Converts an RGB object to an HSB object
+    function rgb2hsb(rgb) {
+        var hsb = { h: 0, s: 0, b: 0 };
+        var min = Math.min(rgb.r, rgb.g, rgb.b);
+        var max = Math.max(rgb.r, rgb.g, rgb.b);
+        var delta = max - min;
+        hsb.b = max;
+        hsb.s = max !== 0 ? 255 * delta / max : 0;
+        if( hsb.s !== 0 ) {
+            if( rgb.r === max ) {
+                hsb.h = (rgb.g - rgb.b) / delta;
+            } else if( rgb.g === max ) {
+                hsb.h = 2 + (rgb.b - rgb.r) / delta;
+            } else {
+                hsb.h = 4 + (rgb.r - rgb.g) / delta;
+            }
+        } else {
+            hsb.h = -1;
+        }
+        hsb.h *= 60;
+        if( hsb.h < 0 ) {
+            hsb.h += 360;
+        }
+        hsb.s *= 100/255;
+        hsb.b *= 100/255;
+        return hsb;
+    }
+
+    // Converts a hex string to an RGB object
+    function hex2rgb(hex) {
+        hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
+        return {
+            /* jshint ignore:start */
+            r: hex >> 16,
+            g: (hex & 0x00FF00) >> 8,
+            b: (hex & 0x0000FF)
+            /* jshint ignore:end */
+        };
+    }
+
+    // Handle events
+    $(document)
+        // Hide on clicks outside of the control
+        .on('mousedown.minicolors touchstart.minicolors', function(event) {
+            if( !$(event.target).parents().add(event.target).hasClass('minicolors') ) {
+                hide();
+            }
+        })
+        // Start moving
+        .on('mousedown.minicolors touchstart.minicolors', '.minicolors-grid, .minicolors-slider, .minicolors-opacity-slider', function(event) {
+            var target = $(this);
+            event.preventDefault();
+            $(document).data('minicolors-target', target);
+            move(target, event, true);
+        })
+        // Move pickers
+        .on('mousemove.minicolors touchmove.minicolors', function(event) {
+            var target = $(document).data('minicolors-target');
+            if( target ) move(target, event);
+        })
+        // Stop moving
+        .on('mouseup.minicolors touchend.minicolors', function() {
+            $(this).removeData('minicolors-target');
+        })
+        // Selected a swatch
+        .on('click.minicolors', '.minicolors-swatches li', function(event) {
+            event.preventDefault();
+            var target = $(this), input = target.parents('.minicolors').find('.minicolors-input'), color = target.data('swatch-color');
+            updateInput(input, color, getAlpha(color));
+            updateFromInput(input);
+        })
+        // Show panel when swatch is clicked
+        .on('mousedown.minicolors touchstart.minicolors', '.minicolors-input-swatch', function(event) {
+            var input = $(this).parent().find('.minicolors-input');
+            event.preventDefault();
+            show(input);
+        })
+        // Show on focus
+        .on('focus.minicolors', '.minicolors-input', function() {
+            var input = $(this);
+            if( !input.data('minicolors-initialized') ) return;
+            show(input);
+        })
+        // Update value on blur
+        .on('blur.minicolors', '.minicolors-input', function() {
+            var input = $(this),
+                settings = input.data('minicolors-settings'),
+                keywords,
+                hex,
+                rgba,
+                swatchOpacity,
+                value;
+
+            if( !input.data('minicolors-initialized') ) return;
+
+            // Get array of lowercase keywords
+            keywords = !settings.keywords ? [] : $.map(settings.keywords.split(','), function(a) {
+                return $.trim(a.toLowerCase());
+            });
+
+            // Set color string
+            if( input.val() !== '' && $.inArray(input.val().toLowerCase(), keywords) > -1 ) {
+                value = input.val();
+            } else {
+                // Get RGBA values for easy conversion
+                if( isRgb(input.val()) ) {
+                    rgba = parseRgb(input.val(), true);
+                } else {
+                    hex = parseHex(input.val(), true);
+                    rgba = hex ? hex2rgb(hex) : null;
+                }
+
+                // Convert to format
+                if( rgba === null ) {
+                    value = settings.defaultValue;
+                } else if( settings.format === 'rgb' ) {
+                    value = settings.opacity ?
+                        parseRgb('rgba(' + rgba.r + ',' + rgba.g + ',' + rgba.b + ',' + input.attr('data-opacity') + ')') :
+                        parseRgb('rgb(' + rgba.r + ',' + rgba.g + ',' + rgba.b + ')');
+                } else {
+                    value = rgb2hex(rgba);
+                }
+            }
+
+            // Update swatch opacity
+            swatchOpacity = settings.opacity ? input.attr('data-opacity') : 1;
+            if( value.toLowerCase() === 'transparent' ) swatchOpacity = 0;
+            input
+                .closest('.minicolors')
+                .find('.minicolors-input-swatch > span')
+                .css('opacity', swatchOpacity);
+
+            // Set input value
+            input.val(value);
+
+            // Is it blank?
+            if( input.val() === '' ) input.val(parseInput(settings.defaultValue, true));
+
+            // Adjust case
+            input.val( convertCase(input.val(), settings.letterCase) );
+
+        })
+        // Handle keypresses
+        .on('keydown.minicolors', '.minicolors-input', function(event) {
+            var input = $(this);
+            if( !input.data('minicolors-initialized') ) return;
+            switch(event.keyCode) {
+                case 9: // tab
+                    hide();
+                    break;
+                case 13: // enter
+                case 27: // esc
+                    hide();
+                    input.blur();
+                    break;
+            }
+        })
+        // Update on keyup
+        .on('keyup.minicolors', '.minicolors-input', function() {
+            var input = $(this);
+            if( !input.data('minicolors-initialized') ) return;
+            updateFromInput(input, true);
+        })
+        // Update on paste
+        .on('paste.minicolors', '.minicolors-input', function() {
+            var input = $(this);
+            if( !input.data('minicolors-initialized') ) return;
+            setTimeout( function() {
+                updateFromInput(input, true);
+            }, 1);
+        });
+
+}));
diff --git a/core/media/jui/js/jquery.minicolors.min.js b/core/media/jui/js/jquery.minicolors.min.js
new file mode 100644
index 00000000..2a037913
--- /dev/null
+++ b/core/media/jui/js/jquery.minicolors.min.js
@@ -0,0 +1,11 @@
+/*
+ * jQuery MiniColors: A tiny color picker built on jQuery
+ *
+ * Copyright: Cory LaViska for A Beautiful Site, LLC: http://www.abeautifulsite.net/
+ *
+ * Contribute: https://github.com/claviska/jquery-minicolors
+ *
+ * @license: http://opensource.org/licenses/MIT
+ *
+ */
+!function(i){"function"==typeof define&&define.amd?define(["jquery"],i):"object"==typeof exports?module.exports=i(require("jquery")):i(jQuery)}(function($){"use strict";function i(i,t){var o=$('<div class="minicolors" />'),s=$.minicolors.defaults,a,n,r,c,l;if(!i.data("minicolors-initialized")){if(t=$.extend(!0,{},s,t),o.addClass("minicolors-theme-"+t.theme).toggleClass("minicolors-with-opacity",t.opacity).toggleClass("minicolors-no-data-uris",t.dataUris!==!0),void 0!==t.position&&$.each(t.position.split(" "),function(){o.addClass("minicolors-position-"+this)}),a="rgb"===t.format?t.opacity?"25":"20":t.keywords?"11":"7",i.addClass("minicolors-input").data("minicolors-initialized",!1).data("minicolors-settings",t).prop("size",a).wrap(o).after('<div class="minicolors-panel minicolors-slider-'+t.control+'"><div class="minicolors-slider minicolors-sprite"><div class="minicolors-picker"></div></div><div class="minicolors-opacity-slider minicolors-sprite"><div class="minicolors-picker"></div></div><div class="minicolors-grid minicolors-sprite"><div class="minicolors-grid-inner"></div><div class="minicolors-picker"><div></div></div></div></div>'),t.inline||(i.after('<span class="minicolors-swatch minicolors-sprite minicolors-input-swatch"><span class="minicolors-swatch-color"></span></span>'),i.next(".minicolors-input-swatch").on("click",function(t){t.preventDefault(),i.focus()})),c=i.parent().find(".minicolors-panel"),c.on("selectstart",function(){return!1}).end(),t.swatches&&0!==t.swatches.length)for(t.swatches.length>7&&(t.swatches.length=7),c.addClass("minicolors-with-swatches"),n=$('<ul class="minicolors-swatches"></ul>').appendTo(c),l=0;l<t.swatches.length;++l)r=t.swatches[l],r=f(r)?u(r,!0):x(p(r,!0)),$('<li class="minicolors-swatch minicolors-sprite"><span class="minicolors-swatch-color"></span></li>').appendTo(n).data("swatch-color",t.swatches[l]).find(".minicolors-swatch-color").css({backgroundColor:y(r),opacity:r.a}),t.swatches[l]=r;t.inline&&i.parent().addClass("minicolors-inline"),e(i,!1),i.data("minicolors-initialized",!0)}}function t(i){var t=i.parent();i.removeData("minicolors-initialized").removeData("minicolors-settings").removeProp("size").removeClass("minicolors-input"),t.before(i).remove()}function o(i){var t=i.parent(),o=t.find(".minicolors-panel"),a=i.data("minicolors-settings");!i.data("minicolors-initialized")||i.prop("disabled")||t.hasClass("minicolors-inline")||t.hasClass("minicolors-focus")||(s(),t.addClass("minicolors-focus"),o.stop(!0,!0).fadeIn(a.showSpeed,function(){a.show&&a.show.call(i.get(0))}))}function s(){$(".minicolors-focus").each(function(){var i=$(this),t=i.find(".minicolors-input"),o=i.find(".minicolors-panel"),s=t.data("minicolors-settings");o.fadeOut(s.hideSpeed,function(){s.hide&&s.hide.call(t.get(0)),i.removeClass("minicolors-focus")})})}function a(i,t,o){var s=i.parents(".minicolors").find(".minicolors-input"),a=s.data("minicolors-settings"),r=i.find("[class$=-picker]"),e=i.offset().left,c=i.offset().top,l=Math.round(t.pageX-e),h=Math.round(t.pageY-c),d=o?a.animationSpeed:0,p,u,g,m;t.originalEvent.changedTouches&&(l=t.originalEvent.changedTouches[0].pageX-e,h=t.originalEvent.changedTouches[0].pageY-c),0>l&&(l=0),0>h&&(h=0),l>i.width()&&(l=i.width()),h>i.height()&&(h=i.height()),i.parent().is(".minicolors-slider-wheel")&&r.parent().is(".minicolors-grid")&&(p=75-l,u=75-h,g=Math.sqrt(p*p+u*u),m=Math.atan2(u,p),0>m&&(m+=2*Math.PI),g>75&&(g=75,l=75-75*Math.cos(m),h=75-75*Math.sin(m)),l=Math.round(l),h=Math.round(h)),i.is(".minicolors-grid")?r.stop(!0).animate({top:h+"px",left:l+"px"},d,a.animationEasing,function(){n(s,i)}):r.stop(!0).animate({top:h+"px"},d,a.animationEasing,function(){n(s,i)})}function n(i,t){function o(i,t){var o,s;return i.length&&t?(o=i.offset().left,s=i.offset().top,{x:o-t.offset().left+i.outerWidth()/2,y:s-t.offset().top+i.outerHeight()/2}):null}var s,a,n,e,l,h,d,p=i.val(),u=i.attr("data-opacity"),g=i.parent(),f=i.data("minicolors-settings"),v=g.find(".minicolors-input-swatch"),b=g.find(".minicolors-grid"),w=g.find(".minicolors-slider"),y=g.find(".minicolors-opacity-slider"),k=b.find("[class$=-picker]"),M=w.find("[class$=-picker]"),x=y.find("[class$=-picker]"),I=o(k,b),S=o(M,w),z=o(x,y);if(t.is(".minicolors-grid, .minicolors-slider, .minicolors-opacity-slider")){switch(f.control){case"wheel":e=b.width()/2-I.x,l=b.height()/2-I.y,h=Math.sqrt(e*e+l*l),d=Math.atan2(l,e),0>d&&(d+=2*Math.PI),h>75&&(h=75,I.x=69-75*Math.cos(d),I.y=69-75*Math.sin(d)),a=m(h/.75,0,100),s=m(180*d/Math.PI,0,360),n=m(100-Math.floor(S.y*(100/w.height())),0,100),p=C({h:s,s:a,b:n}),w.css("backgroundColor",C({h:s,s:a,b:100}));break;case"saturation":s=m(parseInt(I.x*(360/b.width()),10),0,360),a=m(100-Math.floor(S.y*(100/w.height())),0,100),n=m(100-Math.floor(I.y*(100/b.height())),0,100),p=C({h:s,s:a,b:n}),w.css("backgroundColor",C({h:s,s:100,b:n})),g.find(".minicolors-grid-inner").css("opacity",a/100);break;case"brightness":s=m(parseInt(I.x*(360/b.width()),10),0,360),a=m(100-Math.floor(I.y*(100/b.height())),0,100),n=m(100-Math.floor(S.y*(100/w.height())),0,100),p=C({h:s,s:a,b:n}),w.css("backgroundColor",C({h:s,s:a,b:100})),g.find(".minicolors-grid-inner").css("opacity",1-n/100);break;default:s=m(360-parseInt(S.y*(360/w.height()),10),0,360),a=m(Math.floor(I.x*(100/b.width())),0,100),n=m(100-Math.floor(I.y*(100/b.height())),0,100),p=C({h:s,s:a,b:n}),b.css("backgroundColor",C({h:s,s:100,b:100}))}u=f.opacity?parseFloat(1-z.y/y.height()).toFixed(2):1,r(i,p,u)}else v.find("span").css({backgroundColor:p,opacity:u}),c(i,p,u)}function r(i,t,o){var s,a=i.parent(),n=i.data("minicolors-settings"),r=a.find(".minicolors-input-swatch");n.opacity&&i.attr("data-opacity",o),"rgb"===n.format?(s=f(t)?u(t,!0):x(p(t,!0)),o=""===i.attr("data-opacity")?1:m(parseFloat(i.attr("data-opacity")).toFixed(2),0,1),(isNaN(o)||!n.opacity)&&(o=1),t=i.minicolors("rgbObject").a<=1&&s&&n.opacity?"rgba("+s.r+", "+s.g+", "+s.b+", "+parseFloat(o)+")":"rgb("+s.r+", "+s.g+", "+s.b+")"):(f(t)&&(t=w(t)),t=d(t,n.letterCase)),i.val(t),r.find("span").css({backgroundColor:t,opacity:o}),c(i,t,o)}function e(i,t){var o,s,a,n,r,e,l,h,b,y,M=i.parent(),x=i.data("minicolors-settings"),I=M.find(".minicolors-input-swatch"),S=M.find(".minicolors-grid"),z=M.find(".minicolors-slider"),F=M.find(".minicolors-opacity-slider"),D=S.find("[class$=-picker]"),T=z.find("[class$=-picker]"),j=F.find("[class$=-picker]");switch(f(i.val())?(o=w(i.val()),r=m(parseFloat(v(i.val())).toFixed(2),0,1),r&&i.attr("data-opacity",r)):o=d(p(i.val(),!0),x.letterCase),o||(o=d(g(x.defaultValue,!0),x.letterCase)),s=k(o),n=x.keywords?$.map(x.keywords.split(","),function(i){return $.trim(i.toLowerCase())}):[],e=""!==i.val()&&$.inArray(i.val().toLowerCase(),n)>-1?d(i.val()):f(i.val())?u(i.val()):o,t||i.val(e),x.opacity&&(a=""===i.attr("data-opacity")?1:m(parseFloat(i.attr("data-opacity")).toFixed(2),0,1),isNaN(a)&&(a=1),i.attr("data-opacity",a),I.find("span").css("opacity",a),h=m(F.height()-F.height()*a,0,F.height()),j.css("top",h+"px")),"transparent"===i.val().toLowerCase()&&I.find("span").css("opacity",0),I.find("span").css("backgroundColor",o),x.control){case"wheel":b=m(Math.ceil(.75*s.s),0,S.height()/2),y=s.h*Math.PI/180,l=m(75-Math.cos(y)*b,0,S.width()),h=m(75-Math.sin(y)*b,0,S.height()),D.css({top:h+"px",left:l+"px"}),h=150-s.b/(100/S.height()),""===o&&(h=0),T.css("top",h+"px"),z.css("backgroundColor",C({h:s.h,s:s.s,b:100}));break;case"saturation":l=m(5*s.h/12,0,150),h=m(S.height()-Math.ceil(s.b/(100/S.height())),0,S.height()),D.css({top:h+"px",left:l+"px"}),h=m(z.height()-s.s*(z.height()/100),0,z.height()),T.css("top",h+"px"),z.css("backgroundColor",C({h:s.h,s:100,b:s.b})),M.find(".minicolors-grid-inner").css("opacity",s.s/100);break;case"brightness":l=m(5*s.h/12,0,150),h=m(S.height()-Math.ceil(s.s/(100/S.height())),0,S.height()),D.css({top:h+"px",left:l+"px"}),h=m(z.height()-s.b*(z.height()/100),0,z.height()),T.css("top",h+"px"),z.css("backgroundColor",C({h:s.h,s:s.s,b:100})),M.find(".minicolors-grid-inner").css("opacity",1-s.b/100);break;default:l=m(Math.ceil(s.s/(100/S.width())),0,S.width()),h=m(S.height()-Math.ceil(s.b/(100/S.height())),0,S.height()),D.css({top:h+"px",left:l+"px"}),h=m(z.height()-s.h/(360/z.height()),0,z.height()),T.css("top",h+"px"),S.css("backgroundColor",C({h:s.h,s:100,b:100}))}i.data("minicolors-initialized")&&c(i,e,a)}function c(i,t,o){var s=i.data("minicolors-settings"),a=i.data("minicolors-lastChange"),n,r,e;if(!a||a.value!==t||a.opacity!==o){if(i.data("minicolors-lastChange",{value:t,opacity:o}),s.swatches&&0!==s.swatches.length){for(n=f(t)?u(t,!0):x(t),r=-1,e=0;e<s.swatches.length;++e)if(n.r===s.swatches[e].r&&n.g===s.swatches[e].g&&n.b===s.swatches[e].b&&n.a===s.swatches[e].a){r=e;break}i.parent().find(".minicolors-swatches .minicolors-swatch").removeClass("selected"),-1!==e&&i.parent().find(".minicolors-swatches .minicolors-swatch").eq(e).addClass("selected")}s.change&&(s.changeDelay?(clearTimeout(i.data("minicolors-changeTimeout")),i.data("minicolors-changeTimeout",setTimeout(function(){s.change.call(i.get(0),t,o)},s.changeDelay))):s.change.call(i.get(0),t,o)),i.trigger("change").trigger("input")}}function l(i){var t=p($(i).val(),!0),o=x(t),s=$(i).attr("data-opacity");return o?(void 0!==s&&$.extend(o,{a:parseFloat(s)}),o):null}function h(i,t){var o=p($(i).val(),!0),s=x(o),a=$(i).attr("data-opacity");return s?(void 0===a&&(a=1),t?"rgba("+s.r+", "+s.g+", "+s.b+", "+parseFloat(a)+")":"rgb("+s.r+", "+s.g+", "+s.b+")"):null}function d(i,t){return"uppercase"===t?i.toUpperCase():i.toLowerCase()}function p(i,t){return i=i.replace(/^#/g,""),i.match(/^[A-F0-9]{3,6}/gi)?3!==i.length&&6!==i.length?"":(3===i.length&&t&&(i=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]),"#"+i):""}function u(i,t){var o=i.replace(/[^\d,.]/g,""),s=o.split(",");return s[0]=m(parseInt(s[0],10),0,255),s[1]=m(parseInt(s[1],10),0,255),s[2]=m(parseInt(s[2],10),0,255),s[3]&&(s[3]=m(parseFloat(s[3],10),0,1)),t?{r:s[0],g:s[1],b:s[2],a:s[3]?s[3]:null}:"undefined"!=typeof s[3]&&s[3]<=1?"rgba("+s[0]+", "+s[1]+", "+s[2]+", "+s[3]+")":"rgb("+s[0]+", "+s[1]+", "+s[2]+")"}function g(i,t){return f(i)?u(i):p(i,t)}function m(i,t,o){return t>i&&(i=t),i>o&&(i=o),i}function f(i){var t=i.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);return t&&4===t.length?!0:!1}function v(i){return i=i.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+(\.\d{1,2})?|\.\d{1,2})[\s+]?/i),i&&6===i.length?i[4]:"1"}function b(i){var t={},o=Math.round(i.h),s=Math.round(255*i.s/100),a=Math.round(255*i.b/100);if(0===s)t.r=t.g=t.b=a;else{var n=a,r=(255-s)*a/255,e=(n-r)*(o%60)/60;360===o&&(o=0),60>o?(t.r=n,t.b=r,t.g=r+e):120>o?(t.g=n,t.b=r,t.r=n-e):180>o?(t.g=n,t.r=r,t.b=r+e):240>o?(t.b=n,t.r=r,t.g=n-e):300>o?(t.b=n,t.g=r,t.r=r+e):360>o?(t.r=n,t.g=r,t.b=n-e):(t.r=0,t.g=0,t.b=0)}return{r:Math.round(t.r),g:Math.round(t.g),b:Math.round(t.b)}}function w(i){return i=i.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i),i&&4===i.length?"#"+("0"+parseInt(i[1],10).toString(16)).slice(-2)+("0"+parseInt(i[2],10).toString(16)).slice(-2)+("0"+parseInt(i[3],10).toString(16)).slice(-2):""}function y(i){var t=[i.r.toString(16),i.g.toString(16),i.b.toString(16)];return $.each(t,function(i,o){1===o.length&&(t[i]="0"+o)}),"#"+t.join("")}function C(i){return y(b(i))}function k(i){var t=M(x(i));return 0===t.s&&(t.h=360),t}function M(i){var t={h:0,s:0,b:0},o=Math.min(i.r,i.g,i.b),s=Math.max(i.r,i.g,i.b),a=s-o;return t.b=s,t.s=0!==s?255*a/s:0,0!==t.s?i.r===s?t.h=(i.g-i.b)/a:i.g===s?t.h=2+(i.b-i.r)/a:t.h=4+(i.r-i.g)/a:t.h=-1,t.h*=60,t.h<0&&(t.h+=360),t.s*=100/255,t.b*=100/255,t}function x(i){return i=parseInt(i.indexOf("#")>-1?i.substring(1):i,16),{r:i>>16,g:(65280&i)>>8,b:255&i}}$.minicolors={defaults:{animationSpeed:50,animationEasing:"swing",change:null,changeDelay:0,control:"hue",dataUris:!0,defaultValue:"",format:"hex",hide:null,hideSpeed:100,inline:!1,keywords:"",letterCase:"lowercase",opacity:!1,position:"bottom left",show:null,showSpeed:100,theme:"default",swatches:[]}},$.extend($.fn,{minicolors:function(a,n){switch(a){case"destroy":return $(this).each(function(){t($(this))}),$(this);case"hide":return s(),$(this);case"opacity":return void 0===n?$(this).attr("data-opacity"):($(this).each(function(){e($(this).attr("data-opacity",n))}),$(this));case"rgbObject":return l($(this),"rgbaObject"===a);case"rgbString":case"rgbaString":return h($(this),"rgbaString"===a);case"settings":return void 0===n?$(this).data("minicolors-settings"):($(this).each(function(){var i=$(this).data("minicolors-settings")||{};t($(this)),$(this).minicolors($.extend(!0,i,n))}),$(this));case"show":return o($(this).eq(0)),$(this);case"value":return void 0===n?$(this).val():($(this).each(function(){"object"==typeof n?(n.opacity&&$(this).attr("data-opacity",m(n.opacity,0,1)),n.color&&$(this).val(n.color)):$(this).val(n),e($(this))}),$(this));default:return"create"!==a&&(n=a),$(this).each(function(){i($(this),n)}),$(this)}}}),$(document).on("mousedown.minicolors touchstart.minicolors",function(i){$(i.target).parents().add(i.target).hasClass("minicolors")||s()}).on("mousedown.minicolors touchstart.minicolors",".minicolors-grid, .minicolors-slider, .minicolors-opacity-slider",function(i){var t=$(this);i.preventDefault(),$(document).data("minicolors-target",t),a(t,i,!0)}).on("mousemove.minicolors touchmove.minicolors",function(i){var t=$(document).data("minicolors-target");t&&a(t,i)}).on("mouseup.minicolors touchend.minicolors",function(){$(this).removeData("minicolors-target")}).on("click.minicolors",".minicolors-swatches li",function(i){i.preventDefault();var t=$(this),o=t.parents(".minicolors").find(".minicolors-input"),s=t.data("swatch-color");r(o,s,v(s)),e(o)}).on("mousedown.minicolors touchstart.minicolors",".minicolors-input-swatch",function(i){var t=$(this).parent().find(".minicolors-input");i.preventDefault(),o(t)}).on("focus.minicolors",".minicolors-input",function(){var i=$(this);i.data("minicolors-initialized")&&o(i)}).on("blur.minicolors",".minicolors-input",function(){var i=$(this),t=i.data("minicolors-settings"),o,s,a,n,r;i.data("minicolors-initialized")&&(o=t.keywords?$.map(t.keywords.split(","),function(i){return $.trim(i.toLowerCase())}):[],""!==i.val()&&$.inArray(i.val().toLowerCase(),o)>-1?r=i.val():(f(i.val())?a=u(i.val(),!0):(s=p(i.val(),!0),a=s?x(s):null),r=null===a?t.defaultValue:"rgb"===t.format?u(t.opacity?"rgba("+a.r+","+a.g+","+a.b+","+i.attr("data-opacity")+")":"rgb("+a.r+","+a.g+","+a.b+")"):y(a)),n=t.opacity?i.attr("data-opacity"):1,"transparent"===r.toLowerCase()&&(n=0),i.closest(".minicolors").find(".minicolors-input-swatch > span").css("opacity",n),i.val(r),""===i.val()&&i.val(g(t.defaultValue,!0)),i.val(d(i.val(),t.letterCase)))}).on("keydown.minicolors",".minicolors-input",function(i){var t=$(this);if(t.data("minicolors-initialized"))switch(i.keyCode){case 9:s();break;case 13:case 27:s(),t.blur()}}).on("keyup.minicolors",".minicolors-input",function(){var i=$(this);i.data("minicolors-initialized")&&e(i,!0)}).on("paste.minicolors",".minicolors-input",function(){var i=$(this);i.data("minicolors-initialized")&&setTimeout(function(){e(i,!0)},1)})});
diff --git a/core/media/jui/js/jquery.searchtools.js b/core/media/jui/js/jquery.searchtools.js
new file mode 100644
index 00000000..666f358e
--- /dev/null
+++ b/core/media/jui/js/jquery.searchtools.js
@@ -0,0 +1,410 @@
+(function ($, window, document, undefined) {
+
+	// Create the defaults once
+	var pluginName = "searchtools";
+
+	var defaults = {
+		// Form options
+		formSelector            : '.js-stools-form',
+
+		// Search
+		searchFieldSelector     : '.js-stools-field-search',
+		clearBtnSelector        : '.js-stools-btn-clear',
+
+		// Global container
+		mainContainerSelector   : '.js-stools',
+
+		// Filter fields
+		searchBtnSelector       : '.js-stools-btn-search',
+		filterBtnSelector       : '.js-stools-btn-filter',
+		filterContainerSelector : '.js-stools-container-filters',
+		filtersHidden           : true,
+
+		// List fields
+		listBtnSelector         : '.js-stools-btn-list',
+		listContainerSelector   : '.js-stools-container-list',
+		listHidden              : false,
+
+		// Ordering specific
+		orderColumnSelector     : '.js-stools-column-order',
+		orderBtnSelector        : '.js-stools-btn-order',
+		orderFieldSelector      : '.js-stools-field-order',
+		orderFieldName          : 'list[fullordering]',
+		limitFieldSelector      : '.js-stools-field-limit',
+		defaultLimit            : 20,
+
+		activeOrder             : null,
+		activeDirection         : 'ASC',
+
+		// Extra
+		chosenSupport           : true,
+		clearListOptions        : false
+	};
+
+	// The actual plugin constructor
+	function Plugin(element, options) {
+		this.element = element;
+		this.options = $.extend({}, defaults, options);
+		this._defaults = defaults;
+
+		// Initialise selectors
+		this.theForm        = $(this.options.formSelector);
+
+		// Filters
+		this.filterButton    = $(this.options.formSelector + ' ' + this.options.filterBtnSelector);
+		this.filterContainer = $(this.options.formSelector + ' ' + this.options.filterContainerSelector);
+		this.filtersHidden   = this.options.filtersHidden;
+
+		// List fields
+		this.listButton    = $(this.options.formSelector + ' ' + this.options.listBtnSelector);
+		this.listContainer = $(this.options.formSelector + ' ' + this.options.listContainerSelector);
+		this.listHidden    = this.options.listHidden;
+
+		// Main container
+		this.mainContainer = $(this.options.mainContainerSelector);
+
+		// Search
+		this.searchButton = $(this.options.formSelector + ' ' + this.options.searchBtnSelector);
+		this.searchField  = $(this.options.formSelector + ' ' + this.options.searchFieldSelector);
+		this.searchString = null;
+		this.clearButton  = $(this.options.clearBtnSelector);
+
+		// Ordering
+		this.orderCols  = $(this.options.formSelector + ' ' + this.options.orderColumnSelector);
+		this.orderField = $(this.options.formSelector + ' ' + this.options.orderFieldSelector);
+
+		// Limit
+		this.limitField = $(this.options.formSelector + ' ' + this.options.limitFieldSelector);
+
+		// Init trackers
+		this.activeColumn    = null;
+		this.activeDirection = this.options.activeDirection;
+		this.activeOrder     = this.options.activeOrder;
+		this.activeLimit     = null;
+
+		// Extra options
+		this.chosenSupport    = this.options.chosenSupport;
+		this.clearListOptions = this.options.clearListOptions;
+
+		// Selector values
+		this._name = pluginName;
+
+		this.init();
+	}
+
+	Plugin.prototype = {
+		init: function () {
+			var self = this;
+
+			// IE < 9 - Avoid to submit placeholder value
+			if(!document.addEventListener  ) {
+				if (this.searchField.val() === this.searchField.attr('placeholder')) {
+					this.searchField.val('');
+				}
+			}
+
+			// Get values
+			this.searchString = this.searchField.val();
+
+			if (this.filtersHidden) {
+				this.hideFilters();
+			} else {
+				this.showFilters();
+			}
+
+			if (this.listHidden) {
+				this.hideList();
+			} else {
+				this.showList();
+			}
+
+			self.filterButton.click(function(e) {
+				self.toggleFilters();
+				e.stopPropagation();
+				e.preventDefault();
+			});
+
+			self.listButton.click(function(e) {
+				self.toggleList();
+				e.stopPropagation();
+				e.preventDefault();
+			});
+
+			// Do we need to add to mark filter as enabled?
+			self.getFilterFields().each(function(i, element) {
+				self.checkFilter(element);
+				$(element).change(function () {
+					self.checkFilter(element);
+				});
+			});
+
+			self.clearButton.click(function(e) {
+				self.clear();
+			});
+
+			// Check/create ordering field
+			this.createOrderField();
+
+			this.orderCols.click(function() {
+
+				// Order to set
+				var newOrderCol  = $(this).attr('data-order');
+				var newDirection = $(this).attr('data-direction');
+				var newOrdering  = newOrderCol + ' ' + newDirection;
+
+				// The data-order attrib is required
+				if (newOrderCol.length)
+				{
+					self.activeColumn = newOrderCol;
+
+					if (newOrdering !== self.activeOrder)
+					{
+						self.activeDirection = newDirection;
+						self.activeOrder  = newOrdering;
+
+						// Update the order field
+						self.updateFieldValue(self.orderField, newOrdering);
+					}
+					else
+					{
+						self.toggleDirection();
+					}
+
+					self.theForm.submit();
+				}
+
+			});
+		},
+		checkFilter: function (element) {
+			var self = this;
+
+			var option = $(element).find('option:selected');
+			if (option.val() !== '') {
+				self.activeFilter(element);
+			} else {
+				self.deactiveFilter(element);
+			}
+		},
+		clear: function () {
+			var self = this;
+
+			self.getFilterFields().each(function(i, element) {
+				$(element).val('');
+				self.checkFilter(element);
+
+				if (self.chosenSupport) {
+					$(element).trigger('liszt:updated');
+				}
+			});
+
+			if (self.clearListOptions) {
+				self.getListFields().each(function(i, element) {
+					$(element).val('');
+					self.checkFilter(element);
+
+					if (self.chosenSupport) {
+						$(element).trigger('liszt:updated');
+					}
+				});
+
+				// Special case to limit box to the default config limit
+				$('#list_limit').val(self.options.defaultLimit);
+				if (self.chosenSupport) {
+					$('#list_limit').trigger('liszt:updated');
+				}
+			}
+
+			self.searchField.val('');
+			self.theForm.submit();
+		},
+		activeFilter: function (element) {
+			var self = this;
+
+			$(element).addClass('active');
+			var chosenId = '#' + $(element).attr('id') + '_chzn';
+			$(chosenId).addClass('active');
+		},
+		deactiveFilter: function (element) {
+			var self = this;
+
+			$(element).removeClass('active');
+			var chosenId = '#' + $(element).attr('id') + '_chzn';
+			$(chosenId).removeClass('active');
+		},
+		getFilterFields: function () {
+			return this.filterContainer.find('select,input');
+		},
+		getListFields: function () {
+			return this.listContainer.find('select');
+		},
+		// Common container functions
+		hideContainer: function (container) {
+			$(container).hide('fast');
+			$(container).removeClass('shown');
+		},
+		showContainer: function (container) {
+			$(container).show('fast');
+			$(container).addClass('shown');
+		},
+		toggleContainer: function (container) {
+			if ($(container).hasClass('shown')) {
+				this.hideContainer(container);
+			} else {
+				this.showContainer(container);
+			}
+		},
+		// List container management
+		hideList: function () {
+			this.hideContainer(this.listContainer);
+			this.listButton.removeClass('btn-primary');
+		},
+		showList: function () {
+			this.showContainer(this.listContainer);
+			this.listButton.addClass('btn-primary');
+		},
+		toggleList: function () {
+			this.toggleContainer(this.listContainer);
+
+			if (this.listContainer.hasClass('shown')) {
+				this.listButton.addClass('btn-primary');
+			} else {
+				this.listButton.removeClass('btn-primary');
+			}
+		},
+		// Filters container management
+		hideFilters: function () {
+			this.hideContainer(this.filterContainer);
+			this.filterButton.removeClass('btn-primary');
+		},
+		showFilters: function () {
+			this.showContainer(this.filterContainer);
+			this.filterButton.addClass('btn-primary');
+		},
+		toggleFilters: function () {
+			this.toggleContainer(this.filterContainer);
+
+			if (this.filterContainer.hasClass('shown')) {
+				this.filterButton.addClass('btn-primary');
+			} else {
+				this.filterButton.removeClass('btn-primary');
+			}
+		},
+		toggleDirection: function () {
+			var self = this;
+
+			var newDirection = 'ASC';
+
+			if (self.activeDirection.toUpperCase() == 'ASC')
+			{
+				newDirection = 'DESC';
+			}
+
+			self.activeDirection = newDirection;
+			self.activeOrder  = self.activeColumn + ' ' + newDirection;
+
+			self.updateFieldValue(self.orderField, self.activeOrder);
+		},
+		createOrderField: function () {
+
+			var self = this;
+
+			if (!this.orderField.length)
+			{
+				this.orderField = $('<input>').attr({
+				    type: 'hidden',
+				    id: 'js-stools-field-order',
+				    'class': 'js-stools-field-order',
+				    name: self.options.orderFieldName,
+				    value: self.activeOrder + ' ' + this.activeDirection
+				});
+
+				this.orderField.appendTo(this.theForm);
+			}
+
+			// Add missing columns to the order select
+			if (this.orderField.is('select'))
+			{
+				this.orderCols.each(function(){
+					var value     = $(this).attr('data-order');
+					var name      = $(this).attr('data-name');
+					var direction = $(this).attr('data-direction');
+
+					if (value.length)
+					{
+						value = value + ' ' + direction;
+
+						var option = self.findOption(self.orderField, value);
+
+						if (!option.length)
+						{
+							var option = $('<option>');
+							option.text(name).val(value);
+
+							// If it is the active option select it
+							if ($(this).hasClass('active'))
+							{
+								option.attr('selected', 'selected');
+							}
+
+							// Append the option an repopulate the chosen field
+							self.orderField.append(option);
+						}
+					}
+
+				});
+
+				this.orderField.trigger('liszt:updated');
+			}
+
+			this.activeOrder  = this.orderField.val();
+		},
+		updateFieldValue: function (field, newValue) {
+			var self = this;
+			var type = field.attr('type');
+
+			if (type === 'hidden' || type === 'text')
+			{
+				field.attr('value', newValue);
+			}
+			else if (field.is('select'))
+			{
+				// Select the option result
+				var desiredOption = field.find('option').filter(function () { return $(this).val() == newValue; });
+
+				if (desiredOption.length)
+				{
+					desiredOption.attr('selected', 'selected');
+				}
+				// If the option does not exist create it on the fly
+				else
+				{
+					var option = $('<option>');
+					option.text(newValue).val(newValue);
+					option.attr('selected','selected');
+
+					// Append the option an repopulate the chosen field
+					field.append(option);
+				}
+
+				// Trigger the chosen update
+				if (self.chosenSupport) {
+					field.trigger('liszt:updated');
+				}
+			}
+		},
+		findOption: function(select, value) {
+			return select.find('option').filter(function () { return $(this).val() == value; });
+		}
+	};
+
+	// A really lightweight plugin wrapper around the constructor,
+	// preventing against multiple instantiations
+	$.fn[pluginName] = function (options) {
+		return this.each(function () {
+			if (!$.data(this, "plugin_" + pluginName)) {
+				$.data(this, "plugin_" + pluginName, new Plugin(this, options));
+			}
+		});
+	};
+
+})(jQuery, window, document);
diff --git a/core/media/jui/js/jquery.searchtools.min.js b/core/media/jui/js/jquery.searchtools.min.js
new file mode 100644
index 00000000..1cc00205
--- /dev/null
+++ b/core/media/jui/js/jquery.searchtools.min.js
@@ -0,0 +1 @@
+(function($,window,document,undefined){var pluginName="searchtools";var defaults={formSelector:".js-stools-form",searchFieldSelector:".js-stools-field-search",clearBtnSelector:".js-stools-btn-clear",mainContainerSelector:".js-stools",searchBtnSelector:".js-stools-btn-search",filterBtnSelector:".js-stools-btn-filter",filterContainerSelector:".js-stools-container-filters",filtersHidden:true,listBtnSelector:".js-stools-btn-list",listContainerSelector:".js-stools-container-list",listHidden:false,orderColumnSelector:".js-stools-column-order",orderBtnSelector:".js-stools-btn-order",orderFieldSelector:".js-stools-field-order",orderFieldName:"list[fullordering]",limitFieldSelector:".js-stools-field-limit",defaultLimit:20,activeOrder:null,activeDirection:"ASC",chosenSupport:true,clearListOptions:false};function Plugin(element,options){this.element=element;this.options=$.extend({},defaults,options);this._defaults=defaults;this.theForm=$(this.options.formSelector);this.filterButton=$(this.options.formSelector+" "+this.options.filterBtnSelector);this.filterContainer=$(this.options.formSelector+" "+this.options.filterContainerSelector);this.filtersHidden=this.options.filtersHidden;this.listButton=$(this.options.formSelector+" "+this.options.listBtnSelector);this.listContainer=$(this.options.formSelector+" "+this.options.listContainerSelector);this.listHidden=this.options.listHidden;this.mainContainer=$(this.options.mainContainerSelector);this.searchButton=$(this.options.formSelector+" "+this.options.searchBtnSelector);this.searchField=$(this.options.formSelector+" "+this.options.searchFieldSelector);this.searchString=null;this.clearButton=$(this.options.clearBtnSelector);this.orderCols=$(this.options.formSelector+" "+this.options.orderColumnSelector);this.orderField=$(this.options.formSelector+" "+this.options.orderFieldSelector);this.limitField=$(this.options.formSelector+" "+this.options.limitFieldSelector);this.activeColumn=null;this.activeDirection=this.options.activeDirection;this.activeOrder=this.options.activeOrder;this.activeLimit=null;this.chosenSupport=this.options.chosenSupport;this.clearListOptions=this.options.clearListOptions;this._name=pluginName;this.init()}Plugin.prototype={init:function(){var self=this;if(!document.addEventListener){if(this.searchField.val()===this.searchField.attr("placeholder")){this.searchField.val("")}}this.searchString=this.searchField.val();if(this.filtersHidden){this.hideFilters()}else{this.showFilters()}if(this.listHidden){this.hideList()}else{this.showList()}self.filterButton.click(function(e){self.toggleFilters();e.stopPropagation();e.preventDefault()});self.listButton.click(function(e){self.toggleList();e.stopPropagation();e.preventDefault()});self.getFilterFields().each(function(i,element){self.checkFilter(element);$(element).change(function(){self.checkFilter(element)})});self.clearButton.click(function(e){self.clear()});this.createOrderField();this.orderCols.click(function(){var newOrderCol=$(this).attr("data-order");var newDirection=$(this).attr('data-direction');var newOrdering=newOrderCol+" "+newDirection;if(newOrderCol.length){self.activeColumn=newOrderCol;if(newOrdering!==self.activeOrder){self.activeDirection=newDirection;self.activeOrder=newOrdering;self.updateFieldValue(self.orderField,newOrdering)}else{self.toggleDirection()}self.theForm.submit()}})},checkFilter:function(element){var self=this;var option=$(element).find("option:selected");if(option.val()!==""){self.activeFilter(element)}else{self.deactiveFilter(element)}},clear:function(){var self=this;self.getFilterFields().each(function(i,element){$(element).val("");self.checkFilter(element);if(self.chosenSupport){$(element).trigger("liszt:updated")}});if(self.clearListOptions){self.getListFields().each(function(i,element){$(element).val("");self.checkFilter(element);if(self.chosenSupport){$(element).trigger("liszt:updated")}});$("#list_limit").val(self.options.defaultLimit);if(self.chosenSupport){$("#list_limit").trigger("liszt:updated")}}self.searchField.val("");self.theForm.submit()},activeFilter:function(element){var self=this;$(element).addClass("active");var chosenId="#"+$(element).attr("id")+"_chzn";$(chosenId).addClass("active")},deactiveFilter:function(element){var self=this;$(element).removeClass("active");var chosenId="#"+$(element).attr("id")+"_chzn";$(chosenId).removeClass("active")},getFilterFields:function(){return this.filterContainer.find("select,input")},getListFields:function(){return this.listContainer.find("select")},hideContainer:function(container){$(container).hide("fast");$(container).removeClass("shown")},showContainer:function(container){$(container).show("fast");$(container).addClass("shown")},toggleContainer:function(container){if($(container).hasClass("shown")){this.hideContainer(container)}else{this.showContainer(container)}},hideList:function(){this.hideContainer(this.listContainer);this.listButton.removeClass("btn-primary")},showList:function(){this.showContainer(this.listContainer);this.listButton.addClass("btn-primary")},toggleList:function(){this.toggleContainer(this.listContainer);if(this.listContainer.hasClass("shown")){this.listButton.addClass("btn-primary")}else{this.listButton.removeClass("btn-primary")}},hideFilters:function(){this.hideContainer(this.filterContainer);this.filterButton.removeClass("btn-primary")},showFilters:function(){this.showContainer(this.filterContainer);this.filterButton.addClass("btn-primary")},toggleFilters:function(){this.toggleContainer(this.filterContainer);if(this.filterContainer.hasClass("shown")){this.filterButton.addClass("btn-primary")}else{this.filterButton.removeClass("btn-primary")}},toggleDirection:function(){var self=this;var newDirection="ASC";if(self.activeDirection.toUpperCase()=="ASC"){newDirection="DESC"}self.activeDirection=newDirection;self.activeOrder=self.activeColumn+" "+newDirection;self.updateFieldValue(self.orderField,self.activeOrder)},createOrderField:function(){var self=this;if(!this.orderField.length){this.orderField=$("<input>").attr({type:"hidden",id:"js-stools-field-order","class":"js-stools-field-order",name:self.options.orderFieldName,value:self.activeOrder+" "+this.activeDirection});this.orderField.appendTo(this.theForm)}if(this.orderField.is("select")){this.orderCols.each(function(){var value=$(this).attr("data-order");var name=$(this).attr("data-name");var direction=$(this).attr("data-direction");if(value.length){value=value+" "+direction;var option=self.findOption(self.orderField,value);if(!option.length){var option=$("<option>");option.text(name).val(value);if($(this).hasClass("active")){option.attr("selected","selected")}self.orderField.append(option)}}});this.orderField.trigger("liszt:updated")}this.activeOrder=this.orderField.val()},updateFieldValue:function(field,newValue){var self=this;var type=field.attr("type");if(type==="hidden"||type==="text"){field.attr("value",newValue)}else if(field.is("select")){var desiredOption=field.find("option").filter(function(){return $(this).val()==newValue});if(desiredOption.length){desiredOption.attr("selected","selected")}else{var option=$("<option>");option.text(newValue).val(newValue);option.attr("selected","selected");field.append(option)}if(self.chosenSupport){field.trigger("liszt:updated")}}},findOption:function(select,value){return select.find("option").filter(function(){return $(this).val()==value})}};$.fn[pluginName]=function(options){return this.each(function(){if(!$.data(this,"plugin_"+pluginName)){$.data(this,"plugin_"+pluginName,new Plugin(this,options))}})}})(jQuery,window,document);
\ No newline at end of file
diff --git a/core/media/jui/js/jquery.simplecolors.js b/core/media/jui/js/jquery.simplecolors.js
new file mode 100644
index 00000000..0395f371
--- /dev/null
+++ b/core/media/jui/js/jquery.simplecolors.js
@@ -0,0 +1,193 @@
+/**
+ * LOOSELY BASED ON:
+ * Very simple jQuery Color Picker
+ * Copyright (C) 2012 Tanguy Krotoff
+ * Licensed under the MIT license
+ *
+ * ADAPTED BY:
+ * Copyright (C) 2013 Peter van Westen
+ */
+
+(function($) {
+	var SimpleColorPicker = function(element, options) {
+		this.select = $(element);
+		this.options = $.extend({}, $.fn.simplecolors.defaults, options);
+
+		this.select.hide();
+
+		// Build the list of colors
+		var list = '';
+		$('option', this.select).each(function() {
+			var option = $(this);
+			var color = option.val();
+			if (option.text() == '-') {
+				list += '<br />';
+			} else {
+				var clss = 'simplecolors-swatch';
+				if (color == 'none') {
+					clss += ' nocolor';
+					color = 'transparent';
+				}
+				if (option.attr('selected')) {
+					clss += ' active';
+				}
+				list += '<span class="' + clss + '"><span style="background-color: ' + color + ';" tabindex="0"></span></span>';
+			}
+		});
+
+		var color = this.select.val();
+		var clss = 'simplecolors-swatch';
+		if (color == 'none') {
+			clss += ' nocolor';
+			color = 'transparent';
+		}
+		this.icon = $('<span class="' + clss + '"><span style="background-color: ' + color + ';" tabindex="0"></span></span>').insertAfter(this.select);
+		this.icon.on('click', $.proxy(this.show, this));
+
+		this.panel = $('<span class="simplecolors-panel"></span>').appendTo(document.body);
+		this.panel.html(list);
+		this.panel.on('click', $.proxy(this.click, this));
+
+		// Hide panel when clicking outside
+		$(document).on('mousedown', $.proxy(this.hide, this));
+		this.panel.on('mousedown', $.proxy(this.mousedown, this));
+
+	};
+
+	/**
+	 * SimpleColorPicker class
+	 */
+	SimpleColorPicker.prototype = {
+		constructor: SimpleColorPicker,
+
+		show: function() {
+			var panelpadding = 7; // Empirical value
+			var pos = this.icon.offset();
+			switch (this.select.attr('data-position')) {
+				case 'top':
+					this.panel.css({
+						left: pos.left - panelpadding,
+						top: pos.top - this.panel.outerHeight() - 1
+					});
+					break;
+				case 'bottom':
+					this.panel.css({
+						left: pos.left - panelpadding,
+						top: pos.top + this.icon.outerHeight()
+					});
+					break;
+				case 'left':
+					this.panel.css({
+						left: pos.left - this.panel.outerWidth(),
+						top: pos.top - ( (this.panel.outerHeight() - this.icon.outerHeight() ) / 2 ) - 1
+					});
+					break;
+				case 'right':
+				default:
+					this.panel.css({
+						left: pos.left + this.icon.outerWidth(),
+						top: pos.top - ( (this.panel.outerHeight() - this.icon.outerHeight() ) / 2 ) - 1
+					});
+					break;
+			}
+
+			this.panel.show(this.options.delay);
+		},
+
+		hide: function() {
+			if (this.panel.css('display') != 'none') {
+				this.panel.hide(this.options.delay);
+			}
+		},
+
+		click: function(e) {
+			var target = $(e.target);
+			if (target.length === 1) {
+				if (target[0].nodeName.toLowerCase() === 'span') {
+					// When you click on a color
+
+					var color = '';
+					var bgcolor = '';
+					var clss = '';
+					if (target.parent().hasClass('nocolor')) {
+						color = 'none';
+						bgcolor = 'transparent';
+						clss = 'nocolor';
+					} else {
+						color = this.rgb2hex(target.css('background-color'));
+						bgcolor = color;
+					}
+
+					// Mark this div as the selected one
+					target.parent().siblings().removeClass('active');
+					target.parent().addClass('active');
+
+					this.icon.removeClass('nocolor').addClass(clss);
+					this.icon.find('span').css('background-color', bgcolor);
+
+					// Hide the panel
+					this.hide();
+
+					// Change select value
+					this.select.val(color).change();
+				}
+			}
+		},
+
+		/**
+		 * Prevents the mousedown event from "eating" the click event.
+		 */
+		mousedown: function(e) {
+			e.stopPropagation();
+			e.preventDefault();
+		},
+
+		/**
+		 * Converts a RGB color to its hexadecimal value.
+		 *
+		 * See http://stackoverflow.com/questions/1740700/get-hex-value-rather-than-rgb-value-using-$
+		 */
+		rgb2hex: function(rgb) {
+			function hex(x) {
+				return ("0" + parseInt(x, 10).toString(16)).slice(-2);
+			}
+
+			var matches = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+			if (matches === null) {
+				// Fix for Internet Explorer < 9
+				// Variable rgb is already a hexadecimal value
+				return rgb;
+			} else {
+				return '#' + hex(matches[1]) + hex(matches[2]) + hex(matches[3]);
+			}
+		}
+	};
+
+	/**
+	 * Plugin definition.
+	 */
+	$.fn.simplecolors = function(option) {
+		// For HTML element passed to the plugin
+		return this.each(function() {
+			var $this = $(this),
+				data = $this.data('simplecolors'),
+				options = typeof option === 'object' && option;
+			if (!data) {
+				$this.data('simplecolors', (data = new SimpleColorPicker(this, options)));
+			}
+			if (typeof option === 'string') {
+				data[option]();
+			}
+		});
+	};
+
+	$.fn.simplecolors.Constructor = SimpleColorPicker;
+
+	/**
+	 * Default options.
+	 */
+	$.fn.simplecolors.defaults = {
+		// Animation delay
+		delay: 0
+	};
+})(jQuery);
diff --git a/core/media/jui/js/jquery.simplecolors.min.js b/core/media/jui/js/jquery.simplecolors.min.js
new file mode 100644
index 00000000..748a98bd
--- /dev/null
+++ b/core/media/jui/js/jquery.simplecolors.min.js
@@ -0,0 +1,6 @@
+(function($){var SimpleColorPicker=function(element,options){this.select=$(element);this.options=$.extend({},$.fn.simplecolors.defaults,options);this.select.hide();var list="";$("option",this.select).each(function(){var option=$(this);var color=option.val();if(option.text()=="-")list+="<br />";else{var clss="simplecolors-swatch";if(color=="none"){clss+=" nocolor";color="transparent"}if(option.attr("selected"))clss+=" active";list+='<span class="'+clss+'"><span style="background-color: '+color+';" tabindex="0"></span></span>'}});
+var color=this.select.val();var clss="simplecolors-swatch";if(color=="none"){clss+=" nocolor";color="transparent"}this.icon=$('<span class="'+clss+'"><span style="background-color: '+color+';" tabindex="0"></span></span>').insertAfter(this.select);this.icon.on("click",$.proxy(this.show,this));this.panel=$('<span class="simplecolors-panel"></span>').appendTo(document.body);this.panel.html(list);this.panel.on("click",$.proxy(this.click,this));$(document).on("mousedown",$.proxy(this.hide,this));this.panel.on("mousedown",
+$.proxy(this.mousedown,this))};SimpleColorPicker.prototype={constructor:SimpleColorPicker,show:function(){var panelpadding=7;var pos=this.icon.offset();switch(this.select.attr("data-position")){case "top":this.panel.css({left:pos.left-panelpadding,top:pos.top-this.panel.outerHeight()-1});break;case "bottom":this.panel.css({left:pos.left-panelpadding,top:pos.top+this.icon.outerHeight()});break;case "left":this.panel.css({left:pos.left-this.panel.outerWidth(),top:pos.top-(this.panel.outerHeight()-this.icon.outerHeight())/
+2-1});break;case "right":default:this.panel.css({left:pos.left+this.icon.outerWidth(),top:pos.top-(this.panel.outerHeight()-this.icon.outerHeight())/2-1});break}this.panel.show(this.options.delay)},hide:function(){if(this.panel.css("display")!="none")this.panel.hide(this.options.delay)},click:function(e){var target=$(e.target);if(target.length===1)if(target[0].nodeName.toLowerCase()==="span"){var color="";var bgcolor="";var clss="";if(target.parent().hasClass("nocolor")){color="none";bgcolor="transparent";
+clss="nocolor"}else{color=this.rgb2hex(target.css("background-color"));bgcolor=color}target.parent().siblings().removeClass("active");target.parent().addClass("active");this.icon.removeClass("nocolor").addClass(clss);this.icon.find("span").css("background-color",bgcolor);this.hide();this.select.val(color).change()}},mousedown:function(e){e.stopPropagation();e.preventDefault()},rgb2hex:function(rgb){function hex(x){return("0"+parseInt(x,10).toString(16)).slice(-2)}var matches=rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+if(matches===null)return rgb;else return"#"+hex(matches[1])+hex(matches[2])+hex(matches[3])}};$.fn.simplecolors=function(option){return this.each(function(){var $this=$(this),data=$this.data("simplecolors"),options=typeof option==="object"&&option;if(!data)$this.data("simplecolors",data=new SimpleColorPicker(this,options));if(typeof option==="string")data[option]()})};$.fn.simplecolors.Constructor=SimpleColorPicker;$.fn.simplecolors.defaults={delay:0}})(jQuery);
diff --git a/core/media/jui/js/jquery.ui.core.js b/core/media/jui/js/jquery.ui.core.js
new file mode 100644
index 00000000..64fe6ccb
--- /dev/null
+++ b/core/media/jui/js/jquery.ui.core.js
@@ -0,0 +1,1531 @@
+/*! jQuery UI - v1.9.2 - 2013-07-14
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
+
+(function( $, undefined ) {
+
+var uuid = 0,
+	runiqueId = /^ui-id-\d+$/;
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+	return;
+}
+
+$.extend( $.ui, {
+	version: "1.9.2",
+
+	keyCode: {
+		BACKSPACE: 8,
+		COMMA: 188,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		LEFT: 37,
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38
+	}
+});
+
+// plugins
+$.fn.extend({
+	_focus: $.fn.focus,
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
+				var elem = this;
+				setTimeout(function() {
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
+	},
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.ui.ie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.css(this,'position')) && (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.css(this,'overflow')+$.css(this,'overflow-y')+$.css(this,'overflow-x'));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	uniqueId: function() {
+		return this.each(function() {
+			if ( !this.id ) {
+				this.id = "ui-id-" + (++uuid);
+			}
+		});
+	},
+
+	removeUniqueId: function() {
+		return this.each(function() {
+			if ( runiqueId.test( this.id ) ) {
+				$( this ).removeAttr( "id" );
+			}
+		});
+	}
+});
+
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+	var map, mapName, img,
+		nodeName = element.nodeName.toLowerCase();
+	if ( "area" === nodeName ) {
+		map = element.parentNode;
+		mapName = map.name;
+		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+			return false;
+		}
+		img = $( "img[usemap=#" + mapName + "]" )[0];
+		return !!img && visible( img );
+	}
+	return ( /input|select|textarea|button|object/.test( nodeName ) ?
+		!element.disabled :
+		"a" === nodeName ?
+			element.href || isTabIndexNotNaN :
+			isTabIndexNotNaN) &&
+		// the element and all of its ancestors must be visible
+		visible( element );
+}
+
+function visible( element ) {
+	return $.expr.filters.visible( element ) &&
+		!$( element ).parents().andSelf().filter(function() {
+			return $.css( this, "visibility" ) === "hidden";
+		}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: $.expr.createPseudo ?
+		$.expr.createPseudo(function( dataName ) {
+			return function( elem ) {
+				return !!$.data( elem, dataName );
+			};
+		}) :
+		// support: jQuery <1.8
+		function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
+		},
+
+	focusable: function( element ) {
+		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" ),
+			isTabIndexNaN = isNaN( tabIndex );
+		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
+	}
+});
+
+// support
+$(function() {
+	var body = document.body,
+		div = body.appendChild( div = document.createElement( "div" ) );
+
+	// access offsetHeight before setting the style to prevent a layout bug
+	// in IE 9 which causes the element to continue to take up space even
+	// after it is removed from the DOM (#8026)
+	div.offsetHeight;
+
+	$.extend( div.style, {
+		minHeight: "100px",
+		height: "auto",
+		padding: 0,
+		borderWidth: 0
+	});
+
+	$.support.minHeight = div.offsetHeight === 100;
+	$.support.selectstart = "onselectstart" in div;
+
+	// set display to none to avoid a layout bug in IE
+	// http://dev.jquery.com/ticket/4014
+	body.removeChild( div ).style.display = "none";
+});
+
+// support: jQuery <1.8
+if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
+	$.each( [ "Width", "Height" ], function( i, name ) {
+		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+			type = name.toLowerCase(),
+			orig = {
+				innerWidth: $.fn.innerWidth,
+				innerHeight: $.fn.innerHeight,
+				outerWidth: $.fn.outerWidth,
+				outerHeight: $.fn.outerHeight
+			};
+
+		function reduce( elem, size, border, margin ) {
+			$.each( side, function() {
+				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
+				if ( border ) {
+					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
+				}
+				if ( margin ) {
+					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
+				}
+			});
+			return size;
+		}
+
+		$.fn[ "inner" + name ] = function( size ) {
+			if ( size === undefined ) {
+				return orig[ "inner" + name ].call( this );
+			}
+
+			return this.each(function() {
+				$( this ).css( type, reduce( this, size ) + "px" );
+			});
+		};
+
+		$.fn[ "outer" + name] = function( size, margin ) {
+			if ( typeof size !== "number" ) {
+				return orig[ "outer" + name ].call( this, size );
+			}
+
+			return this.each(function() {
+				$( this).css( type, reduce( this, size, true, margin ) + "px" );
+			});
+		};
+	});
+}
+
+// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
+if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
+	$.fn.removeData = (function( removeData ) {
+		return function( key ) {
+			if ( arguments.length ) {
+				return removeData.call( this, $.camelCase( key ) );
+			} else {
+				return removeData.call( this );
+			}
+		};
+	})( $.fn.removeData );
+}
+
+
+
+
+
+// deprecated
+
+(function() {
+	var uaMatch = /msie ([\w.]+)/.exec( navigator.userAgent.toLowerCase() ) || [];
+	$.ui.ie = uaMatch.length ? true : false;
+	$.ui.ie6 = parseFloat( uaMatch[ 1 ], 10 ) === 6;
+})();
+
+$.fn.extend({
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var i,
+				proto = $.ui[ module ].prototype;
+			for ( i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var i,
+				set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
+				return;
+			}
+
+			for ( i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+
+	contains: $.contains,
+
+	// only used by resizable
+	hasScroll: function( el, a ) {
+
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	},
+
+	// these are odd functions, fix the API or move into individual plugins
+	isOverAxis: function( x, reference, size ) {
+		//Determines when x coordinate is over "b" element axis
+		return ( x > reference ) && ( x < ( reference + size ) );
+	},
+	isOver: function( y, x, top, left, height, width ) {
+		//Determines when x, y coordinates is over "b" element
+		return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width );
+	}
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+var uuid = 0,
+	slice = Array.prototype.slice,
+	_cleanData = $.cleanData;
+$.cleanData = function( elems ) {
+	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+		try {
+			$( elem ).triggerHandler( "remove" );
+		// http://bugs.jquery.com/ticket/8235
+		} catch( e ) {}
+	}
+	_cleanData( elems );
+};
+
+$.widget = function( name, base, prototype ) {
+	var fullName, existingConstructor, constructor, basePrototype,
+		namespace = name.split( "." )[ 0 ];
+
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+		return !!$.data( elem, fullName );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	existingConstructor = $[ namespace ][ name ];
+	constructor = $[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without "new" keyword
+		if ( !this._createWidget ) {
+			return new constructor( options, element );
+		}
+
+		// allow instantiation without initializing for simple inheritance
+		// must use "new" keyword (the code above always passes args)
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+	// extend with the existing constructor to carry over any static properties
+	$.extend( constructor, existingConstructor, {
+		version: prototype.version,
+		// copy the object used to create the prototype in case we need to
+		// redefine the widget later
+		_proto: $.extend( {}, prototype ),
+		// track widgets that inherit from this widget in case this widget is
+		// redefined after a widget inherits from it
+		_childConstructors: []
+	});
+
+	basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+	basePrototype.options = $.widget.extend( {}, basePrototype.options );
+	$.each( prototype, function( prop, value ) {
+		if ( $.isFunction( value ) ) {
+			prototype[ prop ] = (function() {
+				var _super = function() {
+						return base.prototype[ prop ].apply( this, arguments );
+					},
+					_superApply = function( args ) {
+						return base.prototype[ prop ].apply( this, args );
+					};
+				return function() {
+					var __super = this._super,
+						__superApply = this._superApply,
+						returnValue;
+
+					this._super = _super;
+					this._superApply = _superApply;
+
+					returnValue = value.apply( this, arguments );
+
+					this._super = __super;
+					this._superApply = __superApply;
+
+					return returnValue;
+				};
+			})();
+		}
+	});
+	constructor.prototype = $.widget.extend( basePrototype, {
+		// TODO: remove support for widgetEventPrefix
+		// always use the name + a colon as the prefix, e.g., draggable:start
+		// don't prefix for widgets that aren't DOM-based
+		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
+	}, prototype, {
+		constructor: constructor,
+		namespace: namespace,
+		widgetName: name,
+		// TODO remove widgetBaseClass, see #8155
+		widgetBaseClass: fullName,
+		widgetFullName: fullName
+	});
+
+	// If this widget is being redefined then we need to find all widgets that
+	// are inheriting from it and redefine all of them so that they inherit from
+	// the new version of this widget. We're essentially trying to replace one
+	// level in the prototype chain.
+	if ( existingConstructor ) {
+		$.each( existingConstructor._childConstructors, function( i, child ) {
+			var childPrototype = child.prototype;
+
+			// redefine the child widget using the same prototype that was
+			// originally used, but inherit from the new version of the base
+			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
+		});
+		// remove the list of existing child constructors from the old constructor
+		// so the old child constructors can be garbage collected
+		delete existingConstructor._childConstructors;
+	} else {
+		base._childConstructors.push( constructor );
+	}
+
+	$.widget.bridge( name, constructor );
+};
+
+$.widget.extend = function( target ) {
+	var input = slice.call( arguments, 1 ),
+		inputIndex = 0,
+		inputLength = input.length,
+		key,
+		value;
+	for ( ; inputIndex < inputLength; inputIndex++ ) {
+		for ( key in input[ inputIndex ] ) {
+			value = input[ inputIndex ][ key ];
+			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+				// Clone objects
+				if ( $.isPlainObject( value ) ) {
+					target[ key ] = $.isPlainObject( target[ key ] ) ?
+						$.widget.extend( {}, target[ key ], value ) :
+						// Don't extend strings, arrays, etc. with objects
+						$.widget.extend( {}, value );
+				// Copy everything else by reference
+				} else {
+					target[ key ] = value;
+				}
+			}
+		}
+	}
+	return target;
+};
+
+$.widget.bridge = function( name, object ) {
+	var fullName = object.prototype.widgetFullName || name;
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.widget.extend.apply( null, [ options ].concat(args) ) :
+			options;
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var methodValue,
+					instance = $.data( this, fullName );
+				if ( !instance ) {
+					return $.error( "cannot call methods on " + name + " prior to initialization; " +
+						"attempted to call method '" + options + "'" );
+				}
+				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
+					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
+				}
+				methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue && methodValue.jquery ?
+						returnValue.pushStack( methodValue.get() ) :
+						methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, fullName );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, fullName, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( /* options, element */ ) {};
+$.Widget._childConstructors = [];
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	defaultElement: "<div>",
+	options: {
+		disabled: false,
+
+		// callbacks
+		create: null
+	},
+	_createWidget: function( options, element ) {
+		element = $( element || this.defaultElement || this )[ 0 ];
+		this.element = $( element );
+		this.uuid = uuid++;
+		this.eventNamespace = "." + this.widgetName + this.uuid;
+		this.options = $.widget.extend( {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		this.bindings = $();
+		this.hoverable = $();
+		this.focusable = $();
+
+		if ( element !== this ) {
+			// 1.9 BC for #7810
+			// TODO remove dual storage
+			$.data( element, this.widgetName, this );
+			$.data( element, this.widgetFullName, this );
+			this._on( true, this.element, {
+				remove: function( event ) {
+					if ( event.target === element ) {
+						this.destroy();
+					}
+				}
+			});
+			this.document = $( element.style ?
+				// element within the document
+				element.ownerDocument :
+				// element is window or document
+				element.document || element );
+			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+		}
+
+		this._create();
+		this._trigger( "create", null, this._getCreateEventData() );
+		this._init();
+	},
+	_getCreateOptions: $.noop,
+	_getCreateEventData: $.noop,
+	_create: $.noop,
+	_init: $.noop,
+
+	destroy: function() {
+		this._destroy();
+		// we can probably remove the unbind calls in 2.0
+		// all event bindings should go through this._on()
+		this.element
+			.unbind( this.eventNamespace )
+			// 1.9 BC for #7810
+			// TODO remove dual storage
+			.removeData( this.widgetName )
+			.removeData( this.widgetFullName )
+			// support: jquery <1.6.3
+			// http://bugs.jquery.com/ticket/9413
+			.removeData( $.camelCase( this.widgetFullName ) );
+		this.widget()
+			.unbind( this.eventNamespace )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetFullName + "-disabled " +
+				"ui-state-disabled" );
+
+		// clean up events and states
+		this.bindings.unbind( this.eventNamespace );
+		this.hoverable.removeClass( "ui-state-hover" );
+		this.focusable.removeClass( "ui-state-focus" );
+	},
+	_destroy: $.noop,
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key,
+			parts,
+			curOption,
+			i;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.widget.extend( {}, this.options );
+		}
+
+		if ( typeof key === "string" ) {
+			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+			options = {};
+			parts = key.split( "." );
+			key = parts.shift();
+			if ( parts.length ) {
+				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+				for ( i = 0; i < parts.length - 1; i++ ) {
+					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+					curOption = curOption[ parts[ i ] ];
+				}
+				key = parts.pop();
+				if ( value === undefined ) {
+					return curOption[ key ] === undefined ? null : curOption[ key ];
+				}
+				curOption[ key ] = value;
+			} else {
+				if ( value === undefined ) {
+					return this.options[ key ] === undefined ? null : this.options[ key ];
+				}
+				options[ key ] = value;
+			}
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var key;
+
+		for ( key in options ) {
+			this._setOption( key, options[ key ] );
+		}
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				.toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
+				.attr( "aria-disabled", value );
+			this.hoverable.removeClass( "ui-state-hover" );
+			this.focusable.removeClass( "ui-state-focus" );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_on: function( suppressDisabledCheck, element, handlers ) {
+		var delegateElement,
+			instance = this;
+
+		// no suppressDisabledCheck flag, shuffle arguments
+		if ( typeof suppressDisabledCheck !== "boolean" ) {
+			handlers = element;
+			element = suppressDisabledCheck;
+			suppressDisabledCheck = false;
+		}
+
+		// no element argument, shuffle and use this.element
+		if ( !handlers ) {
+			handlers = element;
+			element = this.element;
+			delegateElement = this.widget();
+		} else {
+			// accept selectors, DOM elements
+			element = delegateElement = $( element );
+			this.bindings = this.bindings.add( element );
+		}
+
+		$.each( handlers, function( event, handler ) {
+			function handlerProxy() {
+				// allow widgets to customize the disabled handling
+				// - disabled as an array instead of boolean
+				// - disabled class as method for disabling individual parts
+				if ( !suppressDisabledCheck &&
+						( instance.options.disabled === true ||
+							$( this ).hasClass( "ui-state-disabled" ) ) ) {
+					return;
+				}
+				return ( typeof handler === "string" ? instance[ handler ] : handler )
+					.apply( instance, arguments );
+			}
+
+			// copy the guid so direct unbinding works
+			if ( typeof handler !== "string" ) {
+				handlerProxy.guid = handler.guid =
+					handler.guid || handlerProxy.guid || $.guid++;
+			}
+
+			var match = event.match( /^(\w+)\s*(.*)$/ ),
+				eventName = match[1] + instance.eventNamespace,
+				selector = match[2];
+			if ( selector ) {
+				delegateElement.delegate( selector, eventName, handlerProxy );
+			} else {
+				element.bind( eventName, handlerProxy );
+			}
+		});
+	},
+
+	_off: function( element, eventName ) {
+		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+		element.unbind( eventName ).undelegate( eventName );
+	},
+
+	_delay: function( handler, delay ) {
+		function handlerProxy() {
+			return ( typeof handler === "string" ? instance[ handler ] : handler )
+				.apply( instance, arguments );
+		}
+		var instance = this;
+		return setTimeout( handlerProxy, delay || 0 );
+	},
+
+	_hoverable: function( element ) {
+		this.hoverable = this.hoverable.add( element );
+		this._on( element, {
+			mouseenter: function( event ) {
+				$( event.currentTarget ).addClass( "ui-state-hover" );
+			},
+			mouseleave: function( event ) {
+				$( event.currentTarget ).removeClass( "ui-state-hover" );
+			}
+		});
+	},
+
+	_focusable: function( element ) {
+		this.focusable = this.focusable.add( element );
+		this._on( element, {
+			focusin: function( event ) {
+				$( event.currentTarget ).addClass( "ui-state-focus" );
+			},
+			focusout: function( event ) {
+				$( event.currentTarget ).removeClass( "ui-state-focus" );
+			}
+		});
+	},
+
+	_trigger: function( type, event, data ) {
+		var prop, orig,
+			callback = this.options[ type ];
+
+		data = data || {};
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		// the original event may come from any element
+		// so we need to reset the target on the new event
+		event.target = this.element[ 0 ];
+
+		// copy original event properties over to the new event
+		orig = event.originalEvent;
+		if ( orig ) {
+			for ( prop in orig ) {
+				if ( !( prop in event ) ) {
+					event[ prop ] = orig[ prop ];
+				}
+			}
+		}
+
+		this.element.trigger( event, data );
+		return !( $.isFunction( callback ) &&
+			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+		if ( typeof options === "string" ) {
+			options = { effect: options };
+		}
+		var hasOptions,
+			effectName = !options ?
+				method :
+				options === true || typeof options === "number" ?
+					defaultEffect :
+					options.effect || defaultEffect;
+		options = options || {};
+		if ( typeof options === "number" ) {
+			options = { duration: options };
+		}
+		hasOptions = !$.isEmptyObject( options );
+		options.complete = callback;
+		if ( options.delay ) {
+			element.delay( options.delay );
+		}
+		if ( hasOptions && $.effects && ( $.effects.effect[ effectName ] || $.uiBackCompat !== false && $.effects[ effectName ] ) ) {
+			element[ method ]( options );
+		} else if ( effectName !== method && element[ effectName ] ) {
+			element[ effectName ]( options.duration, options.easing, callback );
+		} else {
+			element.queue(function( next ) {
+				$( this )[ method ]();
+				if ( callback ) {
+					callback.call( element[ 0 ] );
+				}
+				next();
+			});
+		}
+	};
+});
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+	$.Widget.prototype._getCreateOptions = function() {
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
+	};
+}
+
+})( jQuery );
+(function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function( e ) {
+	mouseHandled = false;
+});
+
+$.widget("ui.mouse", {
+	version: "1.9.2",
+	options: {
+		cancel: 'input,textarea,button,select,option',
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var that = this;
+
+		this.element
+			.bind('mousedown.'+this.widgetName, function(event) {
+				return that._mouseDown(event);
+			})
+			.bind('click.'+this.widgetName, function(event) {
+				if (true === $.data(event.target, that.widgetName + '.preventClickEvent')) {
+					$.removeData(event.target, that.widgetName + '.preventClickEvent');
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind('.'+this.widgetName);
+		if ( this._mouseMoveDelegate ) {
+			$(document)
+				.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+				.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+		}
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		if( mouseHandled ) { return; }
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var that = this,
+			btnIsLeft = (event.which === 1),
+			// event.target.nodeName works around a bug in IE 8 with
+			// disabled inputs (#7620)
+			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				that.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// Click event may never have fired (Gecko & Opera)
+		if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
+			$.removeData(event.target, this.widgetName + '.preventClickEvent');
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return that._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return that._mouseUp(event);
+		};
+		$(document)
+			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+
+		mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.ui.ie && !(document.documentMode >= 9) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target === this._mouseDownEvent.target) {
+				$.data(event.target, this.widgetName + '.preventClickEvent', true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(event) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(event) {},
+	_mouseDrag: function(event) {},
+	_mouseStop: function(event) {},
+	_mouseCapture: function(event) { return true; }
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var cachedScrollbarWidth,
+	max = Math.max,
+	abs = Math.abs,
+	round = Math.round,
+	rhorizontal = /left|center|right/,
+	rvertical = /top|center|bottom/,
+	roffset = /[\+\-]\d+%?/,
+	rposition = /^\w+/,
+	rpercent = /%$/,
+	_position = $.fn.position;
+
+function getOffsets( offsets, width, height ) {
+	return [
+		parseInt( offsets[ 0 ], 10 ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+		parseInt( offsets[ 1 ], 10 ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+	];
+}
+function parseCss( element, property ) {
+	return parseInt( $.css( element, property ), 10 ) || 0;
+}
+
+$.position = {
+	scrollbarWidth: function() {
+		if ( cachedScrollbarWidth !== undefined ) {
+			return cachedScrollbarWidth;
+		}
+		var w1, w2,
+			div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+			innerDiv = div.children()[0];
+
+		$( "body" ).append( div );
+		w1 = innerDiv.offsetWidth;
+		div.css( "overflow", "scroll" );
+
+		w2 = innerDiv.offsetWidth;
+
+		if ( w1 === w2 ) {
+			w2 = div[0].clientWidth;
+		}
+
+		div.remove();
+
+		return (cachedScrollbarWidth = w1 - w2);
+	},
+	getScrollInfo: function( within ) {
+		var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
+			overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
+			hasOverflowX = overflowX === "scroll" ||
+				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+			hasOverflowY = overflowY === "scroll" ||
+				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
+		return {
+			width: hasOverflowX ? $.position.scrollbarWidth() : 0,
+			height: hasOverflowY ? $.position.scrollbarWidth() : 0
+		};
+	},
+	getWithinInfo: function( element ) {
+		var withinElement = $( element || window ),
+			isWindow = $.isWindow( withinElement[0] );
+		return {
+			element: withinElement,
+			isWindow: isWindow,
+			offset: withinElement.offset() || { left: 0, top: 0 },
+			scrollLeft: withinElement.scrollLeft(),
+			scrollTop: withinElement.scrollTop(),
+			width: isWindow ? withinElement.width() : withinElement.outerWidth(),
+			height: isWindow ? withinElement.height() : withinElement.outerHeight()
+		};
+	}
+};
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var atOffset, targetWidth, targetHeight, targetOffset, basePosition,
+		target = $( options.of ),
+		within = $.position.getWithinInfo( options.within ),
+		scrollInfo = $.position.getScrollInfo( within ),
+		targetElem = target[0],
+		collision = ( options.collision || "flip" ).split( " " ),
+		offsets = {};
+
+	if ( targetElem.nodeType === 9 ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		targetOffset = { top: 0, left: 0 };
+	} else if ( $.isWindow( targetElem ) ) {
+		targetWidth = target.width();
+		targetHeight = target.height();
+		targetOffset = { top: target.scrollTop(), left: target.scrollLeft() };
+	} else if ( targetElem.preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+		targetWidth = targetHeight = 0;
+		targetOffset = { top: targetElem.pageY, left: targetElem.pageX };
+	} else {
+		targetWidth = target.outerWidth();
+		targetHeight = target.outerHeight();
+		targetOffset = target.offset();
+	}
+	// clone to reuse original targetOffset later
+	basePosition = $.extend( {}, targetOffset );
+
+	// force my and at to have valid horizontal and vertical positions
+	// if a value is missing or invalid, it will be converted to center
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[ this ] || "" ).split( " " ),
+			horizontalOffset,
+			verticalOffset;
+
+		if ( pos.length === 1) {
+			pos = rhorizontal.test( pos[ 0 ] ) ?
+				pos.concat( [ "center" ] ) :
+				rvertical.test( pos[ 0 ] ) ?
+					[ "center" ].concat( pos ) :
+					[ "center", "center" ];
+		}
+		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+		// calculate offsets
+		horizontalOffset = roffset.exec( pos[ 0 ] );
+		verticalOffset = roffset.exec( pos[ 1 ] );
+		offsets[ this ] = [
+			horizontalOffset ? horizontalOffset[ 0 ] : 0,
+			verticalOffset ? verticalOffset[ 0 ] : 0
+		];
+
+		// reduce to just the positions without the offsets
+		options[ this ] = [
+			rposition.exec( pos[ 0 ] )[ 0 ],
+			rposition.exec( pos[ 1 ] )[ 0 ]
+		];
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	if ( options.at[ 0 ] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[ 0 ] === "center" ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[ 1 ] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[ 1 ] === "center" ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+	basePosition.left += atOffset[ 0 ];
+	basePosition.top += atOffset[ 1 ];
+
+	return this.each(function() {
+		var collisionPosition, using,
+			elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseCss( this, "marginLeft" ),
+			marginTop = parseCss( this, "marginTop" ),
+			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
+			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
+			position = $.extend( {}, basePosition ),
+			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+		if ( options.my[ 0 ] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[ 0 ] === "center" ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[ 1 ] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[ 1 ] === "center" ) {
+			position.top -= elemHeight / 2;
+		}
+
+		position.left += myOffset[ 0 ];
+		position.top += myOffset[ 1 ];
+
+		// if the browser doesn't support fractions, then round for consistent results
+		if ( !$.support.offsetFractions ) {
+			position.left = round( position.left );
+			position.top = round( position.top );
+		}
+
+		collisionPosition = {
+			marginLeft: marginLeft,
+			marginTop: marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[ i ] ] ) {
+				$.ui.position[ collision[ i ] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+					my: options.my,
+					at: options.at,
+					within: within,
+					elem : elem
+				});
+			}
+		});
+
+		if ( $.fn.bgiframe ) {
+			elem.bgiframe();
+		}
+
+		if ( options.using ) {
+			// adds feedback as second argument to using callback, if present
+			using = function( props ) {
+				var left = targetOffset.left - position.left,
+					right = left + targetWidth - elemWidth,
+					top = targetOffset.top - position.top,
+					bottom = top + targetHeight - elemHeight,
+					feedback = {
+						target: {
+							element: target,
+							left: targetOffset.left,
+							top: targetOffset.top,
+							width: targetWidth,
+							height: targetHeight
+						},
+						element: {
+							element: elem,
+							left: position.left,
+							top: position.top,
+							width: elemWidth,
+							height: elemHeight
+						},
+						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+					};
+				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+					feedback.horizontal = "center";
+				}
+				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+					feedback.vertical = "middle";
+				}
+				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+					feedback.important = "horizontal";
+				} else {
+					feedback.important = "vertical";
+				}
+				options.using.call( this, props, feedback );
+			};
+		}
+
+		elem.offset( $.extend( position, { using: using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+				outerWidth = within.width,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = withinOffset - collisionPosLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+				newOverRight;
+
+			// element is wider than within
+			if ( data.collisionWidth > outerWidth ) {
+				// element is initially over the left side of within
+				if ( overLeft > 0 && overRight <= 0 ) {
+					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
+					position.left += overLeft - newOverRight;
+				// element is initially over right side of within
+				} else if ( overRight > 0 && overLeft <= 0 ) {
+					position.left = withinOffset;
+				// element is initially over both left and right sides of within
+				} else {
+					if ( overLeft > overRight ) {
+						position.left = withinOffset + outerWidth - data.collisionWidth;
+					} else {
+						position.left = withinOffset;
+					}
+				}
+			// too far left -> align with left edge
+			} else if ( overLeft > 0 ) {
+				position.left += overLeft;
+			// too far right -> align with right edge
+			} else if ( overRight > 0 ) {
+				position.left -= overRight;
+			// adjust based on position and margin
+			} else {
+				position.left = max( position.left - collisionPosLeft, position.left );
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+				outerHeight = data.within.height,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = withinOffset - collisionPosTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+				newOverBottom;
+
+			// element is taller than within
+			if ( data.collisionHeight > outerHeight ) {
+				// element is initially over the top of within
+				if ( overTop > 0 && overBottom <= 0 ) {
+					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
+					position.top += overTop - newOverBottom;
+				// element is initially over bottom of within
+				} else if ( overBottom > 0 && overTop <= 0 ) {
+					position.top = withinOffset;
+				// element is initially over both top and bottom of within
+				} else {
+					if ( overTop > overBottom ) {
+						position.top = withinOffset + outerHeight - data.collisionHeight;
+					} else {
+						position.top = withinOffset;
+					}
+				}
+			// too far up -> align with top
+			} else if ( overTop > 0 ) {
+				position.top += overTop;
+			// too far down -> align with bottom edge
+			} else if ( overBottom > 0 ) {
+				position.top -= overBottom;
+			// adjust based on position and margin
+			} else {
+				position.top = max( position.top - collisionPosTop, position.top );
+			}
+		}
+	},
+	flip: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.left + within.scrollLeft,
+				outerWidth = within.width,
+				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = collisionPosLeft - offsetLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					data.at[ 0 ] === "right" ?
+						-data.targetWidth :
+						0,
+				offset = -2 * data.offset[ 0 ],
+				newOverRight,
+				newOverLeft;
+
+			if ( overLeft < 0 ) {
+				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
+				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overRight > 0 ) {
+				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
+				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.top + within.scrollTop,
+				outerHeight = within.height,
+				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = collisionPosTop - offsetTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+				top = data.my[ 1 ] === "top",
+				myOffset = top ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					data.at[ 1 ] === "bottom" ?
+						-data.targetHeight :
+						0,
+				offset = -2 * data.offset[ 1 ],
+				newOverTop,
+				newOverBottom;
+			if ( overTop < 0 ) {
+				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
+				if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overBottom > 0 ) {
+				newOverTop = position.top -  data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+				if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+		}
+	},
+	flipfit: {
+		left: function() {
+			$.ui.position.flip.left.apply( this, arguments );
+			$.ui.position.fit.left.apply( this, arguments );
+		},
+		top: function() {
+			$.ui.position.flip.top.apply( this, arguments );
+			$.ui.position.fit.top.apply( this, arguments );
+		}
+	}
+};
+
+// fraction support test
+(function () {
+	var testElement, testElementParent, testElementStyle, offsetLeft, i,
+		body = document.getElementsByTagName( "body" )[ 0 ],
+		div = document.createElement( "div" );
+
+	//Create a "fake body" for testing based on method used in jQuery.support
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0,
+		background: "none"
+	};
+	if ( body ) {
+		$.extend( testElementStyle, {
+			position: "absolute",
+			left: "-1000px",
+			top: "-1000px"
+		});
+	}
+	for ( i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || document.documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	div.style.cssText = "position: absolute; left: 10.7432222px;";
+
+	offsetLeft = $( div ).offset().left;
+	$.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11;
+
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
+})();
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+	// offset option
+	(function( $ ) {
+		var _position = $.fn.position;
+		$.fn.position = function( options ) {
+			if ( !options || !options.offset ) {
+				return _position.call( this, options );
+			}
+			var offset = options.offset.split( " " ),
+				at = options.at.split( " " );
+			if ( offset.length === 1 ) {
+				offset[ 1 ] = offset[ 0 ];
+			}
+			if ( /^\d/.test( offset[ 0 ] ) ) {
+				offset[ 0 ] = "+" + offset[ 0 ];
+			}
+			if ( /^\d/.test( offset[ 1 ] ) ) {
+				offset[ 1 ] = "+" + offset[ 1 ];
+			}
+			if ( at.length === 1 ) {
+				if ( /left|center|right/.test( at[ 0 ] ) ) {
+					at[ 1 ] = "center";
+				} else {
+					at[ 1 ] = at[ 0 ];
+					at[ 0 ] = "center";
+				}
+			}
+			return _position.call( this, $.extend( options, {
+				at: at[ 0 ] + offset[ 0 ] + " " + at[ 1 ] + offset[ 1 ],
+				offset: undefined
+			} ) );
+		};
+	}( jQuery ) );
+}
+}( jQuery ) );
\ No newline at end of file
diff --git a/core/media/jui/js/jquery.ui.core.min.js b/core/media/jui/js/jquery.ui.core.min.js
new file mode 100644
index 00000000..0ac3928f
--- /dev/null
+++ b/core/media/jui/js/jquery.ui.core.min.js
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.9.2 - 2013-07-14
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
+(function(b,f){var a=0,e=/^ui-id-\d+$/;b.ui=b.ui||{};if(b.ui.version){return}b.extend(b.ui,{version:"1.9.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}});b.fn.extend({_focus:b.fn.focus,focus:function(g,h){return typeof g==="number"?this.each(function(){var i=this;setTimeout(function(){b(i).focus();if(h){h.call(i)}},g)}):this._focus.apply(this,arguments)},scrollParent:function(){var g;if((b.ui.ie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){g=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(b.css(this,"position"))&&(/(auto|scroll)/).test(b.css(this,"overflow")+b.css(this,"overflow-y")+b.css(this,"overflow-x"))}).eq(0)}else{g=this.parents().filter(function(){return(/(auto|scroll)/).test(b.css(this,"overflow")+b.css(this,"overflow-y")+b.css(this,"overflow-x"))}).eq(0)}return(/fixed/).test(this.css("position"))||!g.length?b(document):g},zIndex:function(j){if(j!==f){return this.css("zIndex",j)}if(this.length){var h=b(this[0]),g,i;while(h.length&&h[0]!==document){g=h.css("position");if(g==="absolute"||g==="relative"||g==="fixed"){i=parseInt(h.css("zIndex"),10);if(!isNaN(i)&&i!==0){return i}}h=h.parent()}}return 0},uniqueId:function(){return this.each(function(){if(!this.id){this.id="ui-id-"+(++a)}})},removeUniqueId:function(){return this.each(function(){if(e.test(this.id)){b(this).removeAttr("id")}})}});function d(i,g){var k,j,h,l=i.nodeName.toLowerCase();if("area"===l){k=i.parentNode;j=k.name;if(!i.href||!j||k.nodeName.toLowerCase()!=="map"){return false}h=b("img[usemap=#"+j+"]")[0];return !!h&&c(h)}return(/input|select|textarea|button|object/.test(l)?!i.disabled:"a"===l?i.href||g:g)&&c(i)}function c(g){return b.expr.filters.visible(g)&&!b(g).parents().andSelf().filter(function(){return b.css(this,"visibility")==="hidden"}).length}b.extend(b.expr[":"],{data:b.expr.createPseudo?b.expr.createPseudo(function(g){return function(h){return !!b.data(h,g)}}):function(j,h,g){return !!b.data(j,g[3])},focusable:function(g){return d(g,!isNaN(b.attr(g,"tabindex")))},tabbable:function(i){var g=b.attr(i,"tabindex"),h=isNaN(g);return(h||g>=0)&&d(i,!h)}});b(function(){var g=document.body,h=g.appendChild(h=document.createElement("div"));h.offsetHeight;b.extend(h.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});b.support.minHeight=h.offsetHeight===100;b.support.selectstart="onselectstart" in h;g.removeChild(h).style.display="none"});if(!b("<a>").outerWidth(1).jquery){b.each(["Width","Height"],function(j,g){var h=g==="Width"?["Left","Right"]:["Top","Bottom"],k=g.toLowerCase(),m={innerWidth:b.fn.innerWidth,innerHeight:b.fn.innerHeight,outerWidth:b.fn.outerWidth,outerHeight:b.fn.outerHeight};function l(o,n,i,p){b.each(h,function(){n-=parseFloat(b.css(o,"padding"+this))||0;if(i){n-=parseFloat(b.css(o,"border"+this+"Width"))||0}if(p){n-=parseFloat(b.css(o,"margin"+this))||0}});return n}b.fn["inner"+g]=function(i){if(i===f){return m["inner"+g].call(this)}return this.each(function(){b(this).css(k,l(this,i)+"px")})};b.fn["outer"+g]=function(i,n){if(typeof i!=="number"){return m["outer"+g].call(this,i)}return this.each(function(){b(this).css(k,l(this,i,true,n)+"px")})}})}if(b("<a>").data("a-b","a").removeData("a-b").data("a-b")){b.fn.removeData=(function(g){return function(h){if(arguments.length){return g.call(this,b.camelCase(h))}else{return g.call(this)}}})(b.fn.removeData)}(function(){var g=/msie ([\w.]+)/.exec(navigator.userAgent.toLowerCase())||[];b.ui.ie=g.length?true:false;b.ui.ie6=parseFloat(g[1],10)===6})();b.fn.extend({disableSelection:function(){return this.bind((b.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(g){g.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});b.extend(b.ui,{plugin:{add:function(h,j,l){var g,k=b.ui[h].prototype;for(g in l){k.plugins[g]=k.plugins[g]||[];k.plugins[g].push([j,l[g]])}},call:function(g,j,h){var k,l=g.plugins[j];if(!l||!g.element[0].parentNode||g.element[0].parentNode.nodeType===11){return}for(k=0;k<l.length;k++){if(g.options[l[k][0]]){l[k][1].apply(g.element,h)}}}},contains:b.contains,hasScroll:function(j,h){if(b(j).css("overflow")==="hidden"){return false}var g=(h&&h==="left")?"scrollLeft":"scrollTop",i=false;if(j[g]>0){return true}j[g]=1;i=(j[g]>0);j[g]=0;return i},isOverAxis:function(h,g,i){return(h>g)&&(h<(g+i))},isOver:function(l,h,k,j,g,i){return b.ui.isOverAxis(l,k,g)&&b.ui.isOverAxis(h,j,i)}})})(jQuery);(function(b,e){var a=0,d=Array.prototype.slice,c=b.cleanData;b.cleanData=function(f){for(var g=0,h;(h=f[g])!=null;g++){try{b(h).triggerHandler("remove")}catch(j){}}c(f)};b.widget=function(g,j,f){var m,l,i,k,h=g.split(".")[0];g=g.split(".")[1];m=h+"-"+g;if(!f){f=j;j=b.Widget}b.expr[":"][m.toLowerCase()]=function(n){return !!b.data(n,m)};b[h]=b[h]||{};l=b[h][g];i=b[h][g]=function(n,o){if(!this._createWidget){return new i(n,o)}if(arguments.length){this._createWidget(n,o)}};b.extend(i,l,{version:f.version,_proto:b.extend({},f),_childConstructors:[]});k=new j();k.options=b.widget.extend({},k.options);b.each(f,function(o,n){if(b.isFunction(n)){f[o]=(function(){var p=function(){return j.prototype[o].apply(this,arguments)},q=function(r){return j.prototype[o].apply(this,r)};return function(){var t=this._super,r=this._superApply,s;this._super=p;this._superApply=q;s=n.apply(this,arguments);this._super=t;this._superApply=r;return s}})()}});i.prototype=b.widget.extend(k,{widgetEventPrefix:l?k.widgetEventPrefix:g},f,{constructor:i,namespace:h,widgetName:g,widgetBaseClass:m,widgetFullName:m});if(l){b.each(l._childConstructors,function(o,p){var n=p.prototype;b.widget(n.namespace+"."+n.widgetName,i,p._proto)});delete l._childConstructors}else{j._childConstructors.push(i)}b.widget.bridge(g,i)};b.widget.extend=function(k){var g=d.call(arguments,1),j=0,f=g.length,h,i;for(;j<f;j++){for(h in g[j]){i=g[j][h];if(g[j].hasOwnProperty(h)&&i!==e){if(b.isPlainObject(i)){k[h]=b.isPlainObject(k[h])?b.widget.extend({},k[h],i):b.widget.extend({},i)}else{k[h]=i}}}}return k};b.widget.bridge=function(g,f){var h=f.prototype.widgetFullName||g;b.fn[g]=function(k){var i=typeof k==="string",j=d.call(arguments,1),l=this;k=!i&&j.length?b.widget.extend.apply(null,[k].concat(j)):k;if(i){this.each(function(){var n,m=b.data(this,h);if(!m){return b.error("cannot call methods on "+g+" prior to initialization; attempted to call method '"+k+"'")}if(!b.isFunction(m[k])||k.charAt(0)==="_"){return b.error("no such method '"+k+"' for "+g+" widget instance")}n=m[k].apply(m,j);if(n!==m&&n!==e){l=n&&n.jquery?l.pushStack(n.get()):n;return false}})}else{this.each(function(){var m=b.data(this,h);if(m){m.option(k||{})._init()}else{b.data(this,h,new f(k,this))}})}return l}};b.Widget=function(){};b.Widget._childConstructors=[];b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:false,create:null},_createWidget:function(f,g){g=b(g||this.defaultElement||this)[0];this.element=b(g);this.uuid=a++;this.eventNamespace="."+this.widgetName+this.uuid;this.options=b.widget.extend({},this.options,this._getCreateOptions(),f);this.bindings=b();this.hoverable=b();this.focusable=b();if(g!==this){b.data(g,this.widgetName,this);b.data(g,this.widgetFullName,this);this._on(true,this.element,{remove:function(h){if(h.target===g){this.destroy()}}});this.document=b(g.style?g.ownerDocument:g.document||g);this.window=b(this.document[0].defaultView||this.document[0].parentWindow)}this._create();this._trigger("create",null,this._getCreateEventData());this._init()},_getCreateOptions:b.noop,_getCreateEventData:b.noop,_create:b.noop,_init:b.noop,destroy:function(){this._destroy();this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(b.camelCase(this.widgetFullName));this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled ui-state-disabled");this.bindings.unbind(this.eventNamespace);this.hoverable.removeClass("ui-state-hover");this.focusable.removeClass("ui-state-focus")},_destroy:b.noop,widget:function(){return this.element},option:function(j,k){var f=j,l,h,g;if(arguments.length===0){return b.widget.extend({},this.options)}if(typeof j==="string"){f={};l=j.split(".");j=l.shift();if(l.length){h=f[j]=b.widget.extend({},this.options[j]);for(g=0;g<l.length-1;g++){h[l[g]]=h[l[g]]||{};h=h[l[g]]}j=l.pop();if(k===e){return h[j]===e?null:h[j]}h[j]=k}else{if(k===e){return this.options[j]===e?null:this.options[j]}f[j]=k}}this._setOptions(f);return this},_setOptions:function(f){var g;for(g in f){this._setOption(g,f[g])}return this},_setOption:function(f,g){this.options[f]=g;if(f==="disabled"){this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!g).attr("aria-disabled",g);this.hoverable.removeClass("ui-state-hover");this.focusable.removeClass("ui-state-focus")}return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_on:function(i,h,g){var j,f=this;if(typeof i!=="boolean"){g=h;h=i;i=false}if(!g){g=h;h=this.element;j=this.widget()}else{h=j=b(h);this.bindings=this.bindings.add(h)}b.each(g,function(p,o){function m(){if(!i&&(f.options.disabled===true||b(this).hasClass("ui-state-disabled"))){return}return(typeof o==="string"?f[o]:o).apply(f,arguments)}if(typeof o!=="string"){m.guid=o.guid=o.guid||m.guid||b.guid++}var n=p.match(/^(\w+)\s*(.*)$/),l=n[1]+f.eventNamespace,k=n[2];if(k){j.delegate(k,l,m)}else{h.bind(l,m)}})},_off:function(g,f){f=(f||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace;g.unbind(f).undelegate(f)},_delay:function(i,h){function g(){return(typeof i==="string"?f[i]:i).apply(f,arguments)}var f=this;return setTimeout(g,h||0)},_hoverable:function(f){this.hoverable=this.hoverable.add(f);this._on(f,{mouseenter:function(g){b(g.currentTarget).addClass("ui-state-hover")},mouseleave:function(g){b(g.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(f){this.focusable=this.focusable.add(f);this._on(f,{focusin:function(g){b(g.currentTarget).addClass("ui-state-focus")},focusout:function(g){b(g.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(f,g,h){var k,j,i=this.options[f];h=h||{};g=b.Event(g);g.type=(f===this.widgetEventPrefix?f:this.widgetEventPrefix+f).toLowerCase();g.target=this.element[0];j=g.originalEvent;if(j){for(k in j){if(!(k in g)){g[k]=j[k]}}}this.element.trigger(g,h);return !(b.isFunction(i)&&i.apply(this.element[0],[g].concat(h))===false||g.isDefaultPrevented())}};b.each({show:"fadeIn",hide:"fadeOut"},function(g,f){b.Widget.prototype["_"+g]=function(j,i,l){if(typeof i==="string"){i={effect:i}}var k,h=!i?g:i===true||typeof i==="number"?f:i.effect||f;i=i||{};if(typeof i==="number"){i={duration:i}}k=!b.isEmptyObject(i);i.complete=l;if(i.delay){j.delay(i.delay)}if(k&&b.effects&&(b.effects.effect[h]||b.uiBackCompat!==false&&b.effects[h])){j[g](i)}else{if(h!==g&&j[h]){j[h](i.duration,i.easing,l)}else{j.queue(function(m){b(this)[g]();if(l){l.call(j[0])}m()})}}}});if(b.uiBackCompat!==false){b.Widget.prototype._getCreateOptions=function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]}}})(jQuery);(function(b,c){var a=false;b(document).mouseup(function(d){a=false});b.widget("ui.mouse",{version:"1.9.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var d=this;this.element.bind("mousedown."+this.widgetName,function(e){return d._mouseDown(e)}).bind("click."+this.widgetName,function(e){if(true===b.data(e.target,d.widgetName+".preventClickEvent")){b.removeData(e.target,d.widgetName+".preventClickEvent");e.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);if(this._mouseMoveDelegate){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)}},_mouseDown:function(f){if(a){return}(this._mouseStarted&&this._mouseUp(f));this._mouseDownEvent=f;var e=this,g=(f.which===1),d=(typeof this.options.cancel==="string"&&f.target.nodeName?b(f.target).closest(this.options.cancel).length:false);if(!g||d||!this._mouseCapture(f)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(f)&&this._mouseDelayMet(f)){this._mouseStarted=(this._mouseStart(f)!==false);if(!this._mouseStarted){f.preventDefault();return true}}if(true===b.data(f.target,this.widgetName+".preventClickEvent")){b.removeData(f.target,this.widgetName+".preventClickEvent")}this._mouseMoveDelegate=function(h){return e._mouseMove(h)};this._mouseUpDelegate=function(h){return e._mouseUp(h)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);f.preventDefault();a=true;return true},_mouseMove:function(d){if(b.ui.ie&&!(document.documentMode>=9)&&!d.button){return this._mouseUp(d)}if(this._mouseStarted){this._mouseDrag(d);return d.preventDefault()}if(this._mouseDistanceMet(d)&&this._mouseDelayMet(d)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,d)!==false);(this._mouseStarted?this._mouseDrag(d):this._mouseUp(d))}return !this._mouseStarted},_mouseUp:function(d){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;if(d.target===this._mouseDownEvent.target){b.data(d.target,this.widgetName+".preventClickEvent",true)}this._mouseStop(d)}return false},_mouseDistanceMet:function(d){return(Math.max(Math.abs(this._mouseDownEvent.pageX-d.pageX),Math.abs(this._mouseDownEvent.pageY-d.pageY))>=this.options.distance)},_mouseDelayMet:function(d){return this.mouseDelayMet},_mouseStart:function(d){},_mouseDrag:function(d){},_mouseStop:function(d){},_mouseCapture:function(d){return true}})})(jQuery);(function(e,c){e.ui=e.ui||{};var i,j=Math.max,n=Math.abs,l=Math.round,d=/left|center|right/,g=/top|center|bottom/,a=/[\+\-]\d+%?/,k=/^\w+/,b=/%$/,f=e.fn.position;function m(q,p,o){return[parseInt(q[0],10)*(b.test(q[0])?p/100:1),parseInt(q[1],10)*(b.test(q[1])?o/100:1)]}function h(o,p){return parseInt(e.css(o,p),10)||0}e.position={scrollbarWidth:function(){if(i!==c){return i}var p,o,r=e("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),q=r.children()[0];e("body").append(r);p=q.offsetWidth;r.css("overflow","scroll");o=q.offsetWidth;if(p===o){o=r[0].clientWidth}r.remove();return(i=p-o)},getScrollInfo:function(s){var r=s.isWindow?"":s.element.css("overflow-x"),q=s.isWindow?"":s.element.css("overflow-y"),p=r==="scroll"||(r==="auto"&&s.width<s.element[0].scrollWidth),o=q==="scroll"||(q==="auto"&&s.height<s.element[0].scrollHeight);return{width:p?e.position.scrollbarWidth():0,height:o?e.position.scrollbarWidth():0}},getWithinInfo:function(p){var q=e(p||window),o=e.isWindow(q[0]);return{element:q,isWindow:o,offset:q.offset()||{left:0,top:0},scrollLeft:q.scrollLeft(),scrollTop:q.scrollTop(),width:o?q.width():q.outerWidth(),height:o?q.height():q.outerHeight()}}};e.fn.position=function(y){if(!y||!y.of){return f.apply(this,arguments)}y=e.extend({},y);var z,v,s,x,r,u=e(y.of),q=e.position.getWithinInfo(y.within),o=e.position.getScrollInfo(q),t=u[0],w=(y.collision||"flip").split(" "),p={};if(t.nodeType===9){v=u.width();s=u.height();x={top:0,left:0}}else{if(e.isWindow(t)){v=u.width();s=u.height();x={top:u.scrollTop(),left:u.scrollLeft()}}else{if(t.preventDefault){y.at="left top";v=s=0;x={top:t.pageY,left:t.pageX}}else{v=u.outerWidth();s=u.outerHeight();x=u.offset()}}}r=e.extend({},x);e.each(["my","at"],function(){var C=(y[this]||"").split(" "),B,A;if(C.length===1){C=d.test(C[0])?C.concat(["center"]):g.test(C[0])?["center"].concat(C):["center","center"]}C[0]=d.test(C[0])?C[0]:"center";C[1]=g.test(C[1])?C[1]:"center";B=a.exec(C[0]);A=a.exec(C[1]);p[this]=[B?B[0]:0,A?A[0]:0];y[this]=[k.exec(C[0])[0],k.exec(C[1])[0]]});if(w.length===1){w[1]=w[0]}if(y.at[0]==="right"){r.left+=v}else{if(y.at[0]==="center"){r.left+=v/2}}if(y.at[1]==="bottom"){r.top+=s}else{if(y.at[1]==="center"){r.top+=s/2}}z=m(p.at,v,s);r.left+=z[0];r.top+=z[1];return this.each(function(){var B,K,D=e(this),F=D.outerWidth(),C=D.outerHeight(),E=h(this,"marginLeft"),A=h(this,"marginTop"),J=F+E+h(this,"marginRight")+o.width,I=C+A+h(this,"marginBottom")+o.height,G=e.extend({},r),H=m(p.my,D.outerWidth(),D.outerHeight());if(y.my[0]==="right"){G.left-=F}else{if(y.my[0]==="center"){G.left-=F/2}}if(y.my[1]==="bottom"){G.top-=C}else{if(y.my[1]==="center"){G.top-=C/2}}G.left+=H[0];G.top+=H[1];if(!e.support.offsetFractions){G.left=l(G.left);G.top=l(G.top)}B={marginLeft:E,marginTop:A};e.each(["left","top"],function(M,L){if(e.ui.position[w[M]]){e.ui.position[w[M]][L](G,{targetWidth:v,targetHeight:s,elemWidth:F,elemHeight:C,collisionPosition:B,collisionWidth:J,collisionHeight:I,offset:[z[0]+H[0],z[1]+H[1]],my:y.my,at:y.at,within:q,elem:D})}});if(e.fn.bgiframe){D.bgiframe()}if(y.using){K=function(O){var Q=x.left-G.left,N=Q+v-F,P=x.top-G.top,M=P+s-C,L={target:{element:u,left:x.left,top:x.top,width:v,height:s},element:{element:D,left:G.left,top:G.top,width:F,height:C},horizontal:N<0?"left":Q>0?"right":"center",vertical:M<0?"top":P>0?"bottom":"middle"};if(v<F&&n(Q+N)<v){L.horizontal="center"}if(s<C&&n(P+M)<s){L.vertical="middle"}if(j(n(Q),n(N))>j(n(P),n(M))){L.important="horizontal"}else{L.important="vertical"}y.using.call(this,O,L)}}D.offset(e.extend(G,{using:K}))})};e.ui.position={fit:{left:function(s,r){var q=r.within,u=q.isWindow?q.scrollLeft:q.offset.left,w=q.width,t=s.left-r.collisionPosition.marginLeft,v=u-t,p=t+r.collisionWidth-w-u,o;if(r.collisionWidth>w){if(v>0&&p<=0){o=s.left+v+r.collisionWidth-w-u;s.left+=v-o}else{if(p>0&&v<=0){s.left=u}else{if(v>p){s.left=u+w-r.collisionWidth}else{s.left=u}}}}else{if(v>0){s.left+=v}else{if(p>0){s.left-=p}else{s.left=j(s.left-t,s.left)}}}},top:function(r,q){var p=q.within,v=p.isWindow?p.scrollTop:p.offset.top,w=q.within.height,t=r.top-q.collisionPosition.marginTop,u=v-t,s=t+q.collisionHeight-w-v,o;if(q.collisionHeight>w){if(u>0&&s<=0){o=r.top+u+q.collisionHeight-w-v;r.top+=u-o}else{if(s>0&&u<=0){r.top=v}else{if(u>s){r.top=v+w-q.collisionHeight}else{r.top=v}}}}else{if(u>0){r.top+=u}else{if(s>0){r.top-=s}else{r.top=j(r.top-t,r.top)}}}}},flip:{left:function(u,t){var s=t.within,y=s.offset.left+s.scrollLeft,B=s.width,q=s.isWindow?s.scrollLeft:s.offset.left,v=u.left-t.collisionPosition.marginLeft,z=v-q,p=v+t.collisionWidth-B-q,x=t.my[0]==="left"?-t.elemWidth:t.my[0]==="right"?t.elemWidth:0,A=t.at[0]==="left"?t.targetWidth:t.at[0]==="right"?-t.targetWidth:0,r=-2*t.offset[0],o,w;if(z<0){o=u.left+x+A+r+t.collisionWidth-B-y;if(o<0||o<n(z)){u.left+=x+A+r}}else{if(p>0){w=u.left-t.collisionPosition.marginLeft+x+A+r-q;if(w>0||n(w)<p){u.left+=x+A+r}}}},top:function(t,s){var r=s.within,A=r.offset.top+r.scrollTop,B=r.height,o=r.isWindow?r.scrollTop:r.offset.top,v=t.top-s.collisionPosition.marginTop,x=v-o,u=v+s.collisionHeight-B-o,y=s.my[1]==="top",w=y?-s.elemHeight:s.my[1]==="bottom"?s.elemHeight:0,C=s.at[1]==="top"?s.targetHeight:s.at[1]==="bottom"?-s.targetHeight:0,q=-2*s.offset[1],z,p;if(x<0){p=t.top+w+C+q+s.collisionHeight-B-A;if((t.top+w+C+q)>x&&(p<0||p<n(x))){t.top+=w+C+q}}else{if(u>0){z=t.top-s.collisionPosition.marginTop+w+C+q-o;if((t.top+w+C+q)>u&&(z>0||n(z)<u)){t.top+=w+C+q}}}}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments);e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments);e.ui.position.fit.top.apply(this,arguments)}}};(function(){var s,u,p,r,q,o=document.getElementsByTagName("body")[0],t=document.createElement("div");s=document.createElement(o?"div":"body");p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"};if(o){e.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"})}for(q in p){s.style[q]=p[q]}s.appendChild(t);u=o||document.documentElement;u.insertBefore(s,u.firstChild);t.style.cssText="position: absolute; left: 10.7432222px;";r=e(t).offset().left;e.support.offsetFractions=r>10&&r<11;s.innerHTML="";u.removeChild(s)})();if(e.uiBackCompat!==false){(function(p){var o=p.fn.position;p.fn.position=function(r){if(!r||!r.offset){return o.call(this,r)}var s=r.offset.split(" "),q=r.at.split(" ");if(s.length===1){s[1]=s[0]}if(/^\d/.test(s[0])){s[0]="+"+s[0]}if(/^\d/.test(s[1])){s[1]="+"+s[1]}if(q.length===1){if(/left|center|right/.test(q[0])){q[1]="center"}else{q[1]=q[0];q[0]="center"}}return o.call(this,p.extend(r,{at:q[0]+s[0]+" "+q[1]+s[1],offset:c}))}}(jQuery))}}(jQuery));
\ No newline at end of file
diff --git a/core/media/jui/js/jquery.ui.sortable.js b/core/media/jui/js/jquery.ui.sortable.js
new file mode 100644
index 00000000..932b0a3c
--- /dev/null
+++ b/core/media/jui/js/jquery.ui.sortable.js
@@ -0,0 +1,1098 @@
+/*!
+ * jQuery UI Sortable v1.9.2 - 2013-07-14
+ *
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/sortable/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+
+(function( $, undefined ) {
+
+$.widget("ui.sortable", $.ui.mouse, {
+	version: "1.9.2",
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: 'auto',
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: '> *',
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+		//We're ready to go
+		this.ready = true
+
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- )
+			this.items[i].item.removeData(this.widgetName + "-item");
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+
+			this.widget().toggleClass( "ui-sortable-disabled", !!value );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+		var that = this;
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type == 'static') return false;
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		var currentItem = null, nodes = $(event.target).parents().each(function() {
+			if($.data(this, that.widgetName + '-item') == that) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, that.widgetName + '-item') == that) currentItem = $(event.target);
+
+		if(!currentItem) return false;
+		if(this.options.handle && !overrideHandle) {
+			var validHandle = false;
+
+			$(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
+			if(!validHandle) return false;
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var o = this.options;
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if 'cursorAt' is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] != this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment)
+			this._setContainment();
+
+		if(o.cursor) { // cursor option
+			if ($('body').css("cursor")) this._storedCursor = $('body').css("cursor");
+			$('body').css("cursor", o.cursor);
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) this._storedOpacity = this.helper.css("opacity");
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) this._storedZIndex = this.helper.css("zIndex");
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML')
+			this.overflowOffset = this.scrollParent.offset();
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions)
+			this._cacheHelperProportions();
+
+
+		//Post 'activate' events to possible containers
+		if(!noActivation) {
+			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i]._trigger("activate", event, this._uiHash(this)); }
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager)
+			$.ui.ddmanager.current = this;
+
+		if ($.ui.ddmanager && !o.dropBehaviour)
+			$.ui.ddmanager.prepareOffsets(this, event);
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			var o = this.options, scrolled = false;
+			if(this.scrollParent[0] != document && this.scrollParent[0].tagName != 'HTML') {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity)
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity)
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
+				$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis != "y") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis != "x") this.helper[0].style.top = this.position.top+'px';
+
+		//Rearrange
+		for (var i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
+			if (!intersection) continue;
+
+			// Only put the placeholder inside the current Container, skip all
+			// items form other containers. This works because when moving
+			// an item from one container to another the
+			// currentContainer is switched before the placeholder is moved.
+			//
+			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
+			// beetween the outer and inner container.
+			if (item.instance !== this.currentContainer) continue;
+
+			if (itemElement != this.currentItem[0] //cannot intersect with itself
+				&&	this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
+				&&	!$.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
+				&& (this.options.type == 'semi-dynamic' ? !$.contains(this.element[0], itemElement) : true)
+				//&& itemElement.parentNode == this.placeholder[0].parentNode // only rearrange items within the same container
+			) {
+
+				this.direction = intersection == 1 ? "down" : "up";
+
+				if (this.options.tolerance == "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, event);
+
+		//Call callbacks
+		this._trigger('sort', event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) return;
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			$.ui.ddmanager.drop(this, event);
+
+		if(this.options.revert) {
+			var that = this;
+			var cur = this.placeholder.offset();
+
+			this.reverting = true;
+
+			$(this.helper).animate({
+				left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
+				top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
+			}, parseInt(this.options.revert, 10) || 500, function() {
+				that._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper == "original")
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			else
+				this.currentItem.show();
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var str = []; o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+			if(res) str.push((o.key || res[1]+'[]')+'='+(o.key && o.expression ? res[1] : res[2]));
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + '=');
+		}
+
+		return str.join('&');
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected);
+		var ret = []; o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || 'id') || ''); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height;
+
+		var l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height;
+
+		var dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left;
+
+		var isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
+
+		if(	   this.options.tolerance == "pointer"
+			|| this.options.forcePointerForContainers
+			|| (this.options.tolerance != "pointer" && this.helperProportions[this.floating ? 'width' : 'height'] > item[this.floating ? 'width' : 'height'])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) // Right Half
+				&& x2 - (this.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
+				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = (this.options.axis === 'x') || $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = (this.options.axis === 'y') || $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement)
+			return false;
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection == "right") || verticalDirection == "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection == "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = $.ui.isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = $.ui.isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection == "right" && isOverRightHalf) || (horizontalDirection == "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection == "down" && isOverBottomHalf) || (verticalDirection == "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta != 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta != 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor == String
+			? [options.connectWith]
+			: options.connectWith;
+	},
+
+	_getItemsAsjQuery: function(connected) {
+
+		var items = [];
+		var queries = [];
+		var connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], this.widgetName);
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), inst]);
+					}
+				};
+			};
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not('.ui-sortable-placeholder'), this]);
+
+		for (var i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		};
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+
+		this.items = $.grep(this.items, function (item) {
+			for (var j=0; j < list.length; j++) {
+				if(list[j] == item.item[0])
+					return false;
+			};
+			return true;
+		});
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+		var items = this.items;
+		var queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]];
+		var connectWith = this._connectWith();
+
+		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
+			for (var i = connectWith.length - 1; i >= 0; i--){
+				var cur = $(connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], this.widgetName);
+					if(inst && inst != this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				};
+			};
+		}
+
+		for (var i = queries.length - 1; i >= 0; i--) {
+			var targetData = queries[i][1];
+			var _queries = queries[i][0];
+
+			for (var j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				var item = $(_queries[j]);
+
+				item.data(this.widgetName + '-item', targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			};
+		};
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		for (var i = this.items.length - 1; i >= 0; i--){
+			var item = this.items[i];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
+				continue;
+
+			var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			var p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		};
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				var p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left   = p.left;
+				this.containers[i].containerCache.top    = p.top;
+				this.containers[i].containerCache.width  = this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			};
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+		that = that || this;
+		var o = that.options;
+
+		if(!o.placeholder || o.placeholder.constructor == String) {
+			var className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var el = $(document.createElement(that.currentItem[0].nodeName))
+						.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
+						.removeClass("ui-sortable-helper")[0];
+
+					if(!className)
+						el.style.visibility = "hidden";
+
+					return el;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) return;
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css('paddingTop')||0, 10) - parseInt(that.currentItem.css('paddingBottom')||0, 10)); };
+					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css('paddingLeft')||0, 10) - parseInt(that.currentItem.css('paddingRight')||0, 10)); };
+				}
+			};
+		}
+
+		//Create the placeholder
+		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
+
+		//Append it after the actual current item
+		that.currentItem.after(that.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(that, that.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+
+		// get innermost container that intersects with item
+		var innermostContainer = null, innermostIndex = null;
+
+
+		for (var i = this.containers.length - 1; i >= 0; i--){
+
+			// never consider a container that's located within the item itself
+			if($.contains(this.currentItem[0], this.containers[i].element[0]))
+				continue;
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue
+				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0]))
+					continue;
+
+				innermostContainer = this.containers[i];
+				innermostIndex = i;
+
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		// if no intersecting containers found, return
+		if(!innermostContainer) return;
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		} else {
+
+			//When entering a new container, we will find the item with the least distance and append our item near it
+			var dist = 10000; var itemWithLeastDistance = null;
+			var posProperty = this.containers[innermostIndex].floating ? 'left' : 'top';
+			var sizeProperty = this.containers[innermostIndex].floating ? 'width' : 'height';
+			var base = this.positionAbs[posProperty] + this.offset.click[posProperty];
+			for (var j = this.items.length - 1; j >= 0; j--) {
+				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) continue;
+				if(this.items[j].item[0] == this.currentItem[0]) continue;
+				var cur = this.items[j].item.offset()[posProperty];
+				var nearBottom = false;
+				if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
+					nearBottom = true;
+					cur += this.items[j][sizeProperty];
+				}
+
+				if(Math.abs(cur - base) < dist) {
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+					this.direction = nearBottom ? "up": "down";
+				}
+			}
+
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
+				return;
+
+			this.currentContainer = this.containers[innermostIndex];
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
+			this._trigger("change", event, this._uiHash());
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+
+			//Update the placeholder
+			this.options.placeholder.update(this.currentContainer, this.placeholder);
+
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		}
+
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options;
+		var helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper == 'clone' ? this.currentItem.clone() : this.currentItem);
+
+		if(!helper.parents('body').length) //Add the helper to the DOM if that didn't happen already
+			$(o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+
+		if(helper[0] == this.currentItem[0])
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+
+		if(helper[0].style.width == '' || o.forceHelperSize) helper.width(this.currentItem.width());
+		if(helper[0].style.height == '' || o.forceHelperSize) helper.height(this.currentItem.height());
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj == 'string') {
+			obj = obj.split(' ');
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ('left' in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ('right' in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ('top' in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ('bottom' in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition == 'absolute' && this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		if((this.offsetParent[0] == document.body) //This needs to be actually done for all browsers, since pageX/pageY includes this information
+		|| (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() == 'html' && $.ui.ie)) //Ugly IE fix
+			po = { top: 0, left: 0 };
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition == "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var o = this.options;
+		if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+		if(o.containment == 'document' || o.containment == 'window') this.containment = [
+			0 - this.offset.relative.left - this.offset.parent.left,
+			0 - this.offset.relative.top - this.offset.parent.top,
+			$(o.containment == 'document' ? document : window).width() - this.helperProportions.width - this.margins.left,
+			($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+		];
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			var ce = $(o.containment)[0];
+			var co = $(o.containment).offset();
+			var over = ($(ce).css("overflow") != 'hidden');
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top																	// The absolute mouse position
+				+ this.offset.relative.top * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left																// The absolute mouse position
+				+ this.offset.relative.left * mod										// Only for relative positioned nodes: Relative offset from element to offset parent
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var o = this.options, scroll = this.cssPosition == 'absolute' && !(this.scrollParent[0] != document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition == 'relative' && !(this.scrollParent[0] != document && this.scrollParent[0] != this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		var pageX = event.pageX;
+		var pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) pageX = this.containment[0] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top < this.containment[1]) pageY = this.containment[1] + this.offset.click.top;
+				if(event.pageX - this.offset.click.left > this.containment[2]) pageX = this.containment[2] + this.offset.click.left;
+				if(event.pageY - this.offset.click.top > this.containment[3]) pageY = this.containment[3] + this.offset.click.top;
+			}
+
+			if(o.grid) {
+				var top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? (!(top - this.offset.click.top < this.containment[1] || top - this.offset.click.top > this.containment[3]) ? top : (!(top - this.offset.click.top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				var left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? (!(left - this.offset.click.left < this.containment[0] || left - this.offset.click.left > this.containment[2]) ? left : (!(left - this.offset.click.left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY																// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.relative.top												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX																// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.relative.left												// Only for relative positioned nodes: Relative offset from element to offset parent
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ ( ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction == 'down' ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var counter = this.counter;
+
+		this._delay(function() {
+			if(counter == this.counter) this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+		});
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var delayedTriggers = [];
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
+		this._noFinalSort = null;
+
+		if(this.helper[0] == this.currentItem[0]) {
+			for(var i in this._storedCSS) {
+				if(this._storedCSS[i] == 'auto' || this._storedCSS[i] == 'static') this._storedCSS[i] = '';
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+
+		// Check if the items Container has Changed and trigger appropriate
+		// events.
+		if (this !== this.currentContainer) {
+			if(!noPropagation) {
+				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
+			}
+		}
+
+
+		//Post events to containers
+		for (var i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if(this._storedCursor) $('body').css("cursor", this._storedCursor); //Reset cursor
+		if(this._storedOpacity) this.helper.css("opacity", this._storedOpacity); //Reset opacity
+		if(this._storedZIndex) this.helper.css("zIndex", this._storedZIndex == 'auto' ? '' : this._storedZIndex); //Reset z-index
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+
+			this.fromOutside = false;
+			return false;
+		}
+
+		if(!noPropagation) this._trigger("beforeStop", event, this._uiHash());
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] != this.currentItem[0]) this.helper.remove(); this.helper = null;
+
+		if(!noPropagation) {
+			for (var i=0; i < delayedTriggers.length; i++) { delayedTriggers[i].call(this, event); }; //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(_inst) {
+		var inst = _inst || this;
+		return {
+			helper: inst.helper,
+			placeholder: inst.placeholder || $([]),
+			position: inst.position,
+			originalPosition: inst.originalPosition,
+			offset: inst.positionAbs,
+			item: inst.currentItem,
+			sender: _inst ? _inst.element : null
+		};
+	}
+
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/core/media/jui/js/jquery.ui.sortable.min.js b/core/media/jui/js/jquery.ui.sortable.min.js
new file mode 100644
index 00000000..b03ebaca
--- /dev/null
+++ b/core/media/jui/js/jquery.ui.sortable.min.js
@@ -0,0 +1,17 @@
+/*!
+ * jQuery UI Sortable v1.9.2 - 2013-07-14
+ *
+ * http://jqueryui.com
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/sortable/
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(a,b){a.widget("ui.sortable",a.ui.mouse,{version:"1.9.2",widgetEventPrefix:"sort",ready:false,options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1000},_create:function(){var c=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?c.axis==="x"||(/left|right/).test(this.items[0].item.css("float"))||(/inline|table-cell/).test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit();this.ready=true},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled");this._mouseDestroy();for(var c=this.items.length-1;c>=0;c--){this.items[c].item.removeData(this.widgetName+"-item")}return this},_setOption:function(c,d){if(c==="disabled"){this.options[c]=d;this.widget().toggleClass("ui-sortable-disabled",!!d)}else{a.Widget.prototype._setOption.apply(this,arguments)}},_mouseCapture:function(f,g){var e=this;if(this.reverting){return false}if(this.options.disabled||this.options.type=="static"){return false}this._refreshItems(f);var d=null,c=a(f.target).parents().each(function(){if(a.data(this,e.widgetName+"-item")==e){d=a(this);return false}});if(a.data(f.target,e.widgetName+"-item")==e){d=a(f.target)}if(!d){return false}if(this.options.handle&&!g){var h=false;a(this.options.handle,d).find("*").andSelf().each(function(){if(this==f.target){h=true}});if(!h){return false}}this.currentItem=d;this._removeCurrentsFromItems();return true},_mouseStart:function(e,f,c){var g=this.options;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(e);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");this.originalPosition=this._generatePosition(e);this.originalPageX=e.pageX;this.originalPageY=e.pageY;(g.cursorAt&&this._adjustOffsetFromHelper(g.cursorAt));this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};if(this.helper[0]!=this.currentItem[0]){this.currentItem.hide()}this._createPlaceholder();if(g.containment){this._setContainment()}if(g.cursor){if(a("body").css("cursor")){this._storedCursor=a("body").css("cursor")}a("body").css("cursor",g.cursor)}if(g.opacity){if(this.helper.css("opacity")){this._storedOpacity=this.helper.css("opacity")}this.helper.css("opacity",g.opacity)}if(g.zIndex){if(this.helper.css("zIndex")){this._storedZIndex=this.helper.css("zIndex")}this.helper.css("zIndex",g.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){this.overflowOffset=this.scrollParent.offset()}this._trigger("start",e,this._uiHash());if(!this._preserveHelperProportions){this._cacheHelperProportions()}if(!c){for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("activate",e,this._uiHash(this))}}if(a.ui.ddmanager){a.ui.ddmanager.current=this}if(a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,e)}this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(e);return true},_mouseDrag:function(g){this.position=this._generatePosition(g);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs){this.lastPositionAbs=this.positionAbs}if(this.options.scroll){var h=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if((this.overflowOffset.top+this.scrollParent[0].offsetHeight)-g.pageY<h.scrollSensitivity){this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+h.scrollSpeed}else{if(g.pageY-this.overflowOffset.top<h.scrollSensitivity){this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-h.scrollSpeed}}if((this.overflowOffset.left+this.scrollParent[0].offsetWidth)-g.pageX<h.scrollSensitivity){this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+h.scrollSpeed}else{if(g.pageX-this.overflowOffset.left<h.scrollSensitivity){this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-h.scrollSpeed}}}else{if(g.pageY-a(document).scrollTop()<h.scrollSensitivity){c=a(document).scrollTop(a(document).scrollTop()-h.scrollSpeed)}else{if(a(window).height()-(g.pageY-a(document).scrollTop())<h.scrollSensitivity){c=a(document).scrollTop(a(document).scrollTop()+h.scrollSpeed)}}if(g.pageX-a(document).scrollLeft()<h.scrollSensitivity){c=a(document).scrollLeft(a(document).scrollLeft()-h.scrollSpeed)}else{if(a(window).width()-(g.pageX-a(document).scrollLeft())<h.scrollSensitivity){c=a(document).scrollLeft(a(document).scrollLeft()+h.scrollSpeed)}}}if(c!==false&&a.ui.ddmanager&&!h.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,g)}}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}for(var e=this.items.length-1;e>=0;e--){var f=this.items[e],d=f.item[0],j=this._intersectsWithPointer(f);if(!j){continue}if(f.instance!==this.currentContainer){continue}if(d!=this.currentItem[0]&&this.placeholder[j==1?"next":"prev"]()[0]!=d&&!a.contains(this.placeholder[0],d)&&(this.options.type=="semi-dynamic"?!a.contains(this.element[0],d):true)){this.direction=j==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(f)){this._rearrange(g,f)}else{break}this._trigger("change",g,this._uiHash());break}}this._contactContainers(g);if(a.ui.ddmanager){a.ui.ddmanager.drag(this,g)}this._trigger("sort",g,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(d,e){if(!d){return}if(a.ui.ddmanager&&!this.options.dropBehaviour){a.ui.ddmanager.drop(this,d)}if(this.options.revert){var c=this;var f=this.placeholder.offset();this.reverting=true;a(this.helper).animate({left:f.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:f.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(d)})}else{this._clear(d,e)}return false},cancel:function(){if(this.dragging){this._mouseUp({target:null});if(this.options.helper=="original"){this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,this._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,this._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder){if(this.placeholder[0].parentNode){this.placeholder[0].parentNode.removeChild(this.placeholder[0])}if(this.options.helper!="original"&&this.helper&&this.helper[0].parentNode){this.helper.remove()}a.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});if(this.domPosition.prev){a(this.domPosition.prev).after(this.currentItem)}else{a(this.domPosition.parent).prepend(this.currentItem)}}return this},serialize:function(e){var c=this._getItemsAsjQuery(e&&e.connected);var d=[];e=e||{};a(c).each(function(){var f=(a(e.item||this).attr(e.attribute||"id")||"").match(e.expression||(/(.+)[-=_](.+)/));if(f){d.push((e.key||f[1]+"[]")+"="+(e.key&&e.expression?f[1]:f[2]))}});if(!d.length&&e.key){d.push(e.key+"=")}return d.join("&")},toArray:function(e){var c=this._getItemsAsjQuery(e&&e.connected);var d=[];e=e||{};c.each(function(){d.push(a(e.item||this).attr(e.attribute||"id")||"")});return d},_intersectsWith:function(m){var e=this.positionAbs.left,d=e+this.helperProportions.width,k=this.positionAbs.top,j=k+this.helperProportions.height;var f=m.left,c=f+m.width,n=m.top,i=n+m.height;var o=this.offset.click.top,h=this.offset.click.left;var g=(k+o)>n&&(k+o)<i&&(e+h)>f&&(e+h)<c;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>m[this.floating?"width":"height"])){return g}else{return(f<e+(this.helperProportions.width/2)&&d-(this.helperProportions.width/2)<c&&n<k+(this.helperProportions.height/2)&&j-(this.helperProportions.height/2)<i)}},_intersectsWithPointer:function(e){var f=(this.options.axis==="x")||a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),d=(this.options.axis==="y")||a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),h=f&&d,c=this._getDragVerticalDirection(),g=this._getDragHorizontalDirection();if(!h){return false}return this.floating?(((g&&g=="right")||c=="down")?2:1):(c&&(c=="down"?2:1))},_intersectsWithSides:function(f){var d=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,f.top+(f.height/2),f.height),e=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,f.left+(f.width/2),f.width),c=this._getDragVerticalDirection(),g=this._getDragHorizontalDirection();if(this.floating&&g){return((g=="right"&&e)||(g=="left"&&!e))}else{return c&&((c=="down"&&d)||(c=="up"&&!d))}},_getDragVerticalDirection:function(){var c=this.positionAbs.top-this.lastPositionAbs.top;return c!=0&&(c>0?"down":"up")},_getDragHorizontalDirection:function(){var c=this.positionAbs.left-this.lastPositionAbs.left;return c!=0&&(c>0?"right":"left")},refresh:function(c){this._refreshItems(c);this.refreshPositions();return this},_connectWith:function(){var c=this.options;return c.connectWith.constructor==String?[c.connectWith]:c.connectWith},_getItemsAsjQuery:function(h){var c=[];var e=[];var g=this._connectWith();if(g&&h){for(var f=g.length-1;f>=0;f--){var l=a(g[f]);for(var d=l.length-1;d>=0;d--){var k=a.data(l[d],this.widgetName);if(k&&k!=this&&!k.options.disabled){e.push([a.isFunction(k.options.items)?k.options.items.call(k.element):a(k.options.items,k.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),k])}}}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var f=e.length-1;f>=0;f--){e[f][0].each(function(){c.push(this)})}return a(c)},_removeCurrentsFromItems:function(){var c=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=a.grep(this.items,function(e){for(var d=0;d<c.length;d++){if(c[d]==e.item[0]){return false}}return true})},_refreshItems:function(c){this.items=[];this.containers=[this];var k=this.items;var g=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],c,{item:this.currentItem}):a(this.options.items,this.element),this]];var m=this._connectWith();if(m&&this.ready){for(var f=m.length-1;f>=0;f--){var n=a(m[f]);for(var e=n.length-1;e>=0;e--){var h=a.data(n[e],this.widgetName);if(h&&h!=this&&!h.options.disabled){g.push([a.isFunction(h.options.items)?h.options.items.call(h.element[0],c,{item:this.currentItem}):a(h.options.items,h.element),h]);this.containers.push(h)}}}}for(var f=g.length-1;f>=0;f--){var l=g[f][1];var d=g[f][0];for(var e=0,o=d.length;e<o;e++){var p=a(d[e]);p.data(this.widgetName+"-item",l);k.push({item:p,instance:l,width:0,height:0,left:0,top:0})}}},refreshPositions:function(c){if(this.offsetParent&&this.helper){this.offset.parent=this._getParentOffset()}for(var e=this.items.length-1;e>=0;e--){var f=this.items[e];if(f.instance!=this.currentContainer&&this.currentContainer&&f.item[0]!=this.currentItem[0]){continue}var d=this.options.toleranceElement?a(this.options.toleranceElement,f.item):f.item;if(!c){f.width=d.outerWidth();f.height=d.outerHeight()}var g=d.offset();f.left=g.left;f.top=g.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var e=this.containers.length-1;e>=0;e--){var g=this.containers[e].element.offset();this.containers[e].containerCache.left=g.left;this.containers[e].containerCache.top=g.top;this.containers[e].containerCache.width=this.containers[e].element.outerWidth();this.containers[e].containerCache.height=this.containers[e].element.outerHeight()}}return this},_createPlaceholder:function(d){d=d||this;var e=d.options;if(!e.placeholder||e.placeholder.constructor==String){var c=e.placeholder;e.placeholder={element:function(){var f=a(document.createElement(d.currentItem[0].nodeName)).addClass(c||d.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!c){f.style.visibility="hidden"}return f},update:function(f,g){if(c&&!e.forcePlaceholderSize){return}if(!g.height()){g.height(d.currentItem.innerHeight()-parseInt(d.currentItem.css("paddingTop")||0,10)-parseInt(d.currentItem.css("paddingBottom")||0,10))}if(!g.width()){g.width(d.currentItem.innerWidth()-parseInt(d.currentItem.css("paddingLeft")||0,10)-parseInt(d.currentItem.css("paddingRight")||0,10))}}}}d.placeholder=a(e.placeholder.element.call(d.element,d.currentItem));d.currentItem.after(d.placeholder);e.placeholder.update(d,d.placeholder)},_contactContainers:function(c){var e=null,n=null;for(var h=this.containers.length-1;h>=0;h--){if(a.contains(this.currentItem[0],this.containers[h].element[0])){continue}if(this._intersectsWith(this.containers[h].containerCache)){if(e&&a.contains(this.containers[h].element[0],e.element[0])){continue}e=this.containers[h];n=h}else{if(this.containers[h].containerCache.over){this.containers[h]._trigger("out",c,this._uiHash(this));this.containers[h].containerCache.over=0}}}if(!e){return}if(this.containers.length===1){this.containers[n]._trigger("over",c,this._uiHash(this));this.containers[n].containerCache.over=1}else{var m=10000;var k=null;var l=this.containers[n].floating?"left":"top";var o=this.containers[n].floating?"width":"height";var d=this.positionAbs[l]+this.offset.click[l];for(var f=this.items.length-1;f>=0;f--){if(!a.contains(this.containers[n].element[0],this.items[f].item[0])){continue}if(this.items[f].item[0]==this.currentItem[0]){continue}var p=this.items[f].item.offset()[l];var g=false;if(Math.abs(p-d)>Math.abs(p+this.items[f][o]-d)){g=true;p+=this.items[f][o]}if(Math.abs(p-d)<m){m=Math.abs(p-d);k=this.items[f];this.direction=g?"up":"down"}}if(!k&&!this.options.dropOnEmpty){return}this.currentContainer=this.containers[n];k?this._rearrange(c,k,null,true):this._rearrange(c,null,this.containers[n].element,true);this._trigger("change",c,this._uiHash());this.containers[n]._trigger("change",c,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[n]._trigger("over",c,this._uiHash(this));this.containers[n].containerCache.over=1}},_createHelper:function(d){var e=this.options;var c=a.isFunction(e.helper)?a(e.helper.apply(this.element[0],[d,this.currentItem])):(e.helper=="clone"?this.currentItem.clone():this.currentItem);if(!c.parents("body").length){a(e.appendTo!="parent"?e.appendTo:this.currentItem[0].parentNode)[0].appendChild(c[0])}if(c[0]==this.currentItem[0]){this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}}if(c[0].style.width==""||e.forceHelperSize){c.width(this.currentItem.width())}if(c[0].style.height==""||e.forceHelperSize){c.height(this.currentItem.height())}return c},_adjustOffsetFromHelper:function(c){if(typeof c=="string"){c=c.split(" ")}if(a.isArray(c)){c={left:+c[0],top:+c[1]||0}}if("left" in c){this.offset.click.left=c.left+this.margins.left}if("right" in c){this.offset.click.left=this.helperProportions.width-c.right+this.margins.left}if("top" in c){this.offset.click.top=c.top+this.margins.top}if("bottom" in c){this.offset.click.top=this.helperProportions.height-c.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var c=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.contains(this.scrollParent[0],this.offsetParent[0])){c.left+=this.scrollParent.scrollLeft();c.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.ui.ie)){c={top:0,left:0}}return{top:c.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:c.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var c=this.currentItem.position();return{top:c.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:c.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var f=this.options;if(f.containment=="parent"){f.containment=this.helper[0].parentNode}if(f.containment=="document"||f.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(f.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(f.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(f.containment)){var d=a(f.containment)[0];var e=a(f.containment).offset();var c=(a(d).css("overflow")!="hidden");this.containment=[e.left+(parseInt(a(d).css("borderLeftWidth"),10)||0)+(parseInt(a(d).css("paddingLeft"),10)||0)-this.margins.left,e.top+(parseInt(a(d).css("borderTopWidth"),10)||0)+(parseInt(a(d).css("paddingTop"),10)||0)-this.margins.top,e.left+(c?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(a(d).css("borderLeftWidth"),10)||0)-(parseInt(a(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,e.top+(c?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(a(d).css("borderTopWidth"),10)||0)-(parseInt(a(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(g,i){if(!i){i=this.position}var e=g=="absolute"?1:-1;var f=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=(/(html|body)/i).test(c[0].tagName);return{top:(i.top+this.offset.relative.top*e+this.offset.parent.top*e-((this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(h?0:c.scrollTop()))*e)),left:(i.left+this.offset.relative.left*e+this.offset.parent.left*e-((this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:c.scrollLeft())*e))}},_generatePosition:function(f){var i=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,j=(/(html|body)/i).test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var e=f.pageX;var d=f.pageY;if(this.originalPosition){if(this.containment){if(f.pageX-this.offset.click.left<this.containment[0]){e=this.containment[0]+this.offset.click.left}if(f.pageY-this.offset.click.top<this.containment[1]){d=this.containment[1]+this.offset.click.top}if(f.pageX-this.offset.click.left>this.containment[2]){e=this.containment[2]+this.offset.click.left}if(f.pageY-this.offset.click.top>this.containment[3]){d=this.containment[3]+this.offset.click.top}}if(i.grid){var h=this.originalPageY+Math.round((d-this.originalPageY)/i.grid[1])*i.grid[1];d=this.containment?(!(h-this.offset.click.top<this.containment[1]||h-this.offset.click.top>this.containment[3])?h:(!(h-this.offset.click.top<this.containment[1])?h-i.grid[1]:h+i.grid[1])):h;var g=this.originalPageX+Math.round((e-this.originalPageX)/i.grid[0])*i.grid[0];e=this.containment?(!(g-this.offset.click.left<this.containment[0]||g-this.offset.click.left>this.containment[2])?g:(!(g-this.offset.click.left<this.containment[0])?g-i.grid[0]:g+i.grid[0])):g}}return{top:(d-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+((this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(j?0:c.scrollTop())))),left:(e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+((this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():j?0:c.scrollLeft())))}},_rearrange:function(g,f,d,e){d?d[0].appendChild(this.placeholder[0]):f.item[0].parentNode.insertBefore(this.placeholder[0],(this.direction=="down"?f.item[0]:f.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var c=this.counter;this._delay(function(){if(c==this.counter){this.refreshPositions(!e)}})},_clear:function(d,e){this.reverting=false;var f=[];if(!this._noFinalSort&&this.currentItem.parent().length){this.placeholder.before(this.currentItem)}this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var c in this._storedCSS){if(this._storedCSS[c]=="auto"||this._storedCSS[c]=="static"){this._storedCSS[c]=""}}this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}if(this.fromOutside&&!e){f.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))})}if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!e){f.push(function(g){this._trigger("update",g,this._uiHash())})}if(this!==this.currentContainer){if(!e){f.push(function(g){this._trigger("remove",g,this._uiHash())});f.push((function(g){return function(h){g._trigger("receive",h,this._uiHash(this))}}).call(this,this.currentContainer));f.push((function(g){return function(h){g._trigger("update",h,this._uiHash(this))}}).call(this,this.currentContainer))}}for(var c=this.containers.length-1;c>=0;c--){if(!e){f.push((function(g){return function(h){g._trigger("deactivate",h,this._uiHash(this))}}).call(this,this.containers[c]))}if(this.containers[c].containerCache.over){f.push((function(g){return function(h){g._trigger("out",h,this._uiHash(this))}}).call(this,this.containers[c]));this.containers[c].containerCache.over=0}}if(this._storedCursor){a("body").css("cursor",this._storedCursor)}if(this._storedOpacity){this.helper.css("opacity",this._storedOpacity)}if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex)}this.dragging=false;if(this.cancelHelperRemoval){if(!e){this._trigger("beforeStop",d,this._uiHash());for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return false}if(!e){this._trigger("beforeStop",d,this._uiHash())}this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(this.helper[0]!=this.currentItem[0]){this.helper.remove()}this.helper=null;if(!e){for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){if(a.Widget.prototype._trigger.apply(this,arguments)===false){this.cancel()}},_uiHash:function(c){var d=c||this;return{helper:d.helper,placeholder:d.placeholder||a([]),position:d.position,originalPosition:d.originalPosition,offset:d.positionAbs,item:d.currentItem,sender:c?c.element:null}}})})(jQuery);
\ No newline at end of file
diff --git a/core/media/jui/js/sortablelist.js b/core/media/jui/js/sortablelist.js
new file mode 100644
index 00000000..d4458b10
--- /dev/null
+++ b/core/media/jui/js/sortablelist.js
@@ -0,0 +1,283 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(function ($) {
+	$.JSortableList = function (tableWrapper, formId, sortDir, saveOrderingUrl, options, nestedList) {
+		var root = this;
+		var disabledOrderingElements = '';
+		var sortableGroupId = '';
+		var sortableRange;
+		var childrenNodes;
+		var sameLevelNodes;
+		if (sortDir != 'desc') {
+			sortDir = 'asc';
+		}
+
+		var ops = $.extend({
+			orderingIcon:'add-on', //class name of order icon
+			orderingWrapper:'input-prepend', //ordering control wrapper class name
+			orderingGroup:'sortable-group-id', //sortable-group-id
+			sortableClassName:'dndlist-sortable',
+			placeHolderClassName:'dnd-list-highlight dndlist-place-holder',
+			sortableHandle:'.sortable-handler'
+		}, options);
+
+		$('tr', tableWrapper).removeClass(ops.sortableClassName).addClass(ops.sortableClassName);
+		//make wrapper table position be relative, to fix y-axis drag problem on Safari
+		$(tableWrapper).parents('table').css('position', 'relative');
+		$(ops.sortableHandle, tableWrapper).css('cursor', 'move');
+		$('#' + formId).attr('autocomplete', 'off');
+
+		var _handle = $(ops.sortableHandle, $(tableWrapper)).length > 0 ? ops.sortableHandle : '';
+
+		$(tableWrapper).sortable({
+			axis:'y',
+			cursor:'move',
+			handle:_handle,
+			items:'tr.' + ops.sortableClassName,
+			placeholder:ops.placeHolderClassName,
+			helper:function (e, ui) {
+				//hard set left position to fix y-axis drag problem on Safari
+				$(ui).css({'left':'0px'})
+
+				ui.children().each(function () {
+					$(this).width($(this).width());
+				});
+				$(ui).children('td').addClass('dndlist-dragged-row');
+				return ui;
+			},
+
+			start:function (e, ui) {
+				root.sortableGroupId = ui.item.attr(ops.orderingGroup);
+				if (root.sortableGroupId) {
+					root.sortableRange = $('tr[' + ops.orderingGroup + '=' + root.sortableGroupId + ']');
+				} else {
+					root.sortableRange = $('.' + ops.sortableClassName);
+				}
+				//Disable sortable for other group's records
+				root.disableOtherGroupSort(e, ui);
+
+				//Proceed nested list
+				if (nestedList){
+					root.hideChildrenNodes(ui.item.attr('item-id'));
+					root.hideSameLevelChildrenNodes(ui.item.attr('level'));
+					$(tableWrapper).sortable('refresh');
+				}
+			},
+
+			stop:function (e, ui) {
+				$('td', $(this)).removeClass('dndlist-dragged-row');
+				$(ui.item).css({opacity:0});
+				$(ui.item).animate({
+					opacity:1,
+				}, 800, function (){
+					$(ui.item).css('opacity','');
+				});
+
+
+				root.enableOtherGroupSort(e, ui);
+
+				root.rearrangeOrderingValues(root.sortableGroupId, ui);
+				if (saveOrderingUrl) {
+					//clone and check all the checkboxes in sortable range to post
+					root.cloneMarkedCheckboxes();
+
+					// Detach task field if exists
+					var f  = $('#' + formId);
+					var ft = $('input[name|="task"]', f);
+
+					if (ft.length) ft.detach();
+
+					//serialize form then post to callback url
+					$.post(saveOrderingUrl, f.serialize());
+
+					// Re-Append original task field
+					if (ft.length) ft.appendTo(f);
+
+					//remove cloned checkboxes
+					root.removeClonedCheckboxes();
+				}
+				root.disabledOrderingElements = '';
+				//Proceed nested list
+				if (nestedList){
+					root.showChildrenNodes(ui.item);
+					root.showSameLevelChildrenNodes(ui.item);
+					$(tableWrapper).sortable('refresh');
+				}
+			}
+		});
+		
+		this.hideChildrenNodes = function (itemId) {
+			root.childrenNodes = root.getChildrenNodes(itemId);				
+			root.childrenNodes.hide();
+		}
+
+		this.showChildrenNodes = function (item) {
+			item.after(root.childrenNodes)
+			root.childrenNodes.show();
+			root.childrenNodes="";
+		}
+
+		this.hideSameLevelChildrenNodes = function (level) {
+			root.sameLevelNodes = root.getSameLevelNodes(level);
+			root.sameLevelNodes.each(function (){
+				_childrenNodes = root.getChildrenNodes($(this).attr('item-id'));
+				_childrenNodes.addClass('child-nodes-tmp-hide');
+				_childrenNodes.hide();
+			});
+		}
+
+		this.showSameLevelChildrenNodes = function (item) {
+			prevItem = item.prev();
+			prevItemChildrenNodes = root.getChildrenNodes(prevItem.attr('item-id'));
+			prevItem.after(prevItemChildrenNodes);
+			$('tr.child-nodes-tmp-hide').show().removeClass('child-nodes-tmp-hide');
+			root.sameLevelNodes = "";
+		}
+
+
+		this.disableOtherGroupSort = function (e, ui) {
+			if (root.sortableGroupId) {
+				var _tr = $('tr[' + ops.orderingGroup + '!=' + root.sortableGroupId + ']', $(tableWrapper));
+				_tr.removeClass(ops.sortableClassName).addClass('dndlist-group-disabled');
+
+				$(tableWrapper).sortable('refresh');
+			}
+		}
+
+		this.enableOtherGroupSort = function (e, ui) {
+			var _tr = $('tr', $(tableWrapper)).removeClass(ops.sortableClassName);
+			_tr.addClass(ops.sortableClassName)
+				.removeClass('dndlist-group-disabled');
+			$(tableWrapper).sortable('refresh');
+		}
+
+		this.disableOrderingControl = function () {
+			$('.' + ops.orderingWrapper + ' .add-on a', root.sortableRange).hide();
+		}
+
+		this.enableOrderingControl = function () {
+			$('.' + ops.orderingWrapper + ' .add-on a', root.disabledOrderingElements).show();
+		}
+
+		this.rearrangeOrderingControl = function (sortableGroupId, ui) {
+			var range;
+			if (sortableGroupId) {
+				root.sortableRange = $('tr[' + ops.orderingGroup + '=' + sortableGroupId + ']');
+			} else {
+				root.sortableRange = $('.' + ops.sortableClassName);
+			}
+			range = root.sortableRange;
+			var count = range.length;
+			var i = 0;
+			if (count > 1) {
+				range.each(function () {
+					//firstible, add both ordering icons for missing-icon item
+					var upIcon = $('.' + ops.orderingWrapper + ' .add-on:first a', $(this)); //get orderup icon of current dropped item
+					var downIcon = $('.' + ops.orderingWrapper + ' .add-on:last a', $(this)); //get orderup icon of current dropped item
+					if (upIcon.get(0) && downIcon.get(0)) {
+						//do nothing
+					} else if (upIcon.get(0)) {
+						upIcon.removeAttr('title');
+						upIcon = $('.' + ops.orderingWrapper + ' .add-on:first', $(this)).html();
+						downIcon = upIcon.replace('icon-uparrow', 'icon-downarrow');
+						downIcon = downIcon.replace('.orderup', '.orderdown');
+						$('.' + ops.orderingWrapper + ' .add-on:last', $(this)).html(downIcon);
+					} else if (downIcon.get(0)) {
+						downIcon.removeAttr('title');
+						downIcon = $('.' + ops.orderingWrapper + ' .add-on:last', $(this)).html();
+						upIcon = downIcon.replace('icon-downarrow', 'icon-uparrow');
+						upIcon = upIcon.replace('.orderdown', '.orderup');
+						$('.' + ops.orderingWrapper + ' .add-on:first', $(this)).html(upIcon);
+					}
+				});
+
+				//remove orderup icon for first record
+				$('.' + ops.orderingWrapper + ' .add-on:first a', range[0]).remove();
+				//remove order down icon for last record
+				$('.' + ops.orderingWrapper + ' .add-on:last a', range[(count - 1)]).remove();
+			}
+		}
+
+		this.rearrangeOrderingValues = function (sortableGroupId, ui) {
+			var range;
+			if (sortableGroupId) {
+				root.sortableRange = $('tr[' + ops.orderingGroup + '=' + sortableGroupId + ']');
+			} else {
+				root.sortableRange = $('.' + ops.sortableClassName);
+			}
+			range = root.sortableRange;
+			var count = range.length;
+			var i = 0;
+
+			if (count > 1) {
+				//recalculate order number
+				if (ui.originalPosition.top > ui.position.top) //if item moved up
+				{
+					if (ui.item.position().top != ui.originalPosition.top){
+						$('[name="order[]"]', ui.item).attr('value', parseInt($('[type=text]', ui.item.next()).attr('value')));
+					}
+					$(range).each(function () {
+						var _top = $(this).position().top;
+						if ( ui.item.get(0) !== $(this).get(0)){
+							if (_top > ui.item.position().top && _top < ui.originalPosition.top + ui.item.outerHeight()) {
+								if (sortDir == 'asc') {
+									var newValue = parseInt($('[name="order[]"]', $(this)).attr('value')) + 1;
+								} else {
+									var newValue = parseInt($('[name="order[]"]', $(this)).attr('value')) - 1;
+								}
+
+								$('[name="order[]"]', $(this)).attr('value', newValue);
+							}
+						}
+					});
+				} else if (ui.originalPosition.top < ui.position.top) {
+					if (ui.item.position().top != ui.originalPosition.top){
+						$('[name="order[]"]', ui.item).attr('value', parseInt($('[name="order[]"]', ui.item.prev()).attr('value')));
+					}
+					$(range).each(function () {
+						var _top = $(this).position().top;
+						if ( ui.item.get(0) !== $(this).get(0)){
+							if (_top < ui.item.position().top && _top >= ui.originalPosition.top) {
+								if (sortDir == 'asc') {
+									var newValue = parseInt($('[name="order[]"]', $(this)).attr('value')) - 1;
+								} else {
+									var newValue = parseInt($('[name="order[]"]', $(this)).attr('value')) + 1;
+								}
+								$('[name="order[]"]', $(this)).attr('value', newValue);
+							}
+						}
+
+					});
+				}
+			}
+		}
+
+		this.cloneMarkedCheckboxes = function () {
+			$('[name="order[]"]', $(tableWrapper)).attr('name', 'order-tmp');
+			$('[type=checkbox]', root.sortableRange).each(function () {
+				var _shadow = $(this).clone();
+				$(_shadow).attr({'checked':'checked', 'shadow':'shadow', 'id':''});
+				$('#' + formId).append($(_shadow));
+
+				$('[name="order-tmp"]', $(this).parents('tr')).attr('name', 'order[]');
+			});
+		}
+
+		this.removeClonedCheckboxes = function () {
+			$('[shadow=shadow]').remove();
+			$('[name="order-tmp"]', $(tableWrapper)).attr('name', 'order[]');
+		}
+
+		this.getChildrenNodes = function (parentId) {
+			return $('tr[parents~="'+parentId+'"]');
+		}
+
+		this.getSameLevelNodes = function (level) {
+			return $('tr[level='+level+']');
+		}
+
+	}
+})(jQuery);
diff --git a/core/media/jui/js/treeselectmenu.jquery.js b/core/media/jui/js/treeselectmenu.jquery.js
new file mode 100644
index 00000000..95f7bb67
--- /dev/null
+++ b/core/media/jui/js/treeselectmenu.jquery.js
@@ -0,0 +1,121 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+jQuery(function($)
+{
+	var treeselectmenu = $('div#treeselectmenu').html();
+
+	$('.treeselect li').each(function()
+	{
+		$li = $(this);
+		$div = $li.find('div.treeselect-item:first');
+
+		// Add icons
+		$li.prepend('<span class="pull-left icon-"></span>');
+
+		// Append clearfix
+		$div.after('<div class="clearfix"></div>');
+
+		if ($li.find('ul.treeselect-sub').length) {
+			// Add classes to Expand/Collapse icons
+			$li.find('span.icon-').addClass('treeselect-toggle icon-minus');
+
+			// Append drop down menu in nodes
+			$div.find('label:first').after(treeselectmenu);
+
+			if (!$li.find('ul.treeselect-sub ul.treeselect-sub').length) {
+				$li.find('div.treeselect-menu-expand').remove();
+			}
+		}
+	});
+
+	// Takes care of the Expand/Collapse of a node
+	$('span.treeselect-toggle').click(function()
+	{
+		$i = $(this);
+
+		// Take care of parent UL
+		if ($i.parent().find('ul.treeselect-sub').is(':visible')) {
+			$i.removeClass('icon-minus').addClass('icon-plus');
+			$i.parent().find('ul.treeselect-sub').hide();
+			$i.parent().find('ul.treeselect-sub i.treeselect-toggle').removeClass('icon-minus').addClass('icon-plus');
+		} else {
+			$i.removeClass('icon-plus').addClass('icon-minus');
+			$i.parent().find('ul.treeselect-sub').show();
+			$i.parent().find('ul.treeselect-sub i.treeselect-toggle').removeClass('icon-plus').addClass('icon-minus');
+		}
+	});
+
+	// Takes care of the filtering
+	$('#treeselectfilter').keyup(function()
+	{
+		var text = $(this).val().toLowerCase();
+		var hidden = 0;
+		$("#noresultsfound").hide();
+		var $list_elements = $('.treeselect li');
+		$list_elements.each(function()
+		{
+			if ($(this).text().toLowerCase().indexOf(text) == -1) {
+				$(this).hide();
+				hidden++;
+			}
+			else {
+				$(this).show();
+			}
+		});
+		if(hidden == $list_elements.length)
+		{
+			$("#noresultsfound").show();
+		}
+	});
+
+	// Checks all checkboxes the tree
+	$('#treeCheckAll').click(function()
+	{
+		$('.treeselect input').attr('checked', 'checked');
+	});
+
+	// Unchecks all checkboxes the tree
+	$('#treeUncheckAll').click(function()
+	{
+		$('.treeselect input').attr('checked', false);
+	});
+
+	// Checks all checkboxes the tree
+	$('#treeExpandAll').click(function()
+	{
+		$('ul.treeselect ul.treeselect-sub').show();
+		$('ul.treeselect i.treeselect-toggle').removeClass('icon-plus').addClass('icon-minus');
+	});
+
+	// Unchecks all checkboxes the tree
+	$('#treeCollapseAll').click(function()
+	{
+		$('ul.treeselect ul.treeselect-sub').hide();
+		$('ul.treeselect i.treeselect-toggle').removeClass('icon-minus').addClass('icon-plus');
+	});
+	// Take care of children check/uncheck all
+	$('a.checkall').click(function()
+	{
+		$(this).parents().eq(5).find('ul.treeselect-sub input').attr('checked', 'checked');
+	});
+	$('a.uncheckall').click(function()
+	{
+		$(this).parents().eq(5).find('ul.treeselect-sub input').attr('checked', false);
+	});
+
+	// Take care of children toggle all
+	$('a.expandall').click(function()
+	{
+		var $parent = $(this).parents().eq(6);
+		$parent.find('ul.treeselect-sub').show();
+		$parent.find('ul.treeselect-sub i.treeselect-toggle').removeClass('icon-plus').addClass('icon-minus');
+	});
+	$('a.collapseall').click(function()
+	{
+		var $parent = $(this).parents().eq(6);
+		$parent.find('li ul.treeselect-sub').hide();
+		$parent.find('li i.treeselect-toggle').removeClass('icon-minus').addClass('icon-plus');
+	});
+});
diff --git a/core/media/jui/js/treeselectmenu.jquery.min.js b/core/media/jui/js/treeselectmenu.jquery.min.js
new file mode 100644
index 00000000..06cb6f49
--- /dev/null
+++ b/core/media/jui/js/treeselectmenu.jquery.min.js
@@ -0,0 +1,5 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+jQuery(function(e){var t=e("div#treeselectmenu").html();e(".treeselect li").each(function(){$li=e(this);$div=$li.find("div.treeselect-item:first");$li.prepend('<span class="pull-left icon-"></span>');$div.after('<div class="clearfix"></div>');if($li.find("ul.treeselect-sub").length){$li.find("span.icon-").addClass("treeselect-toggle icon-minus");$div.find("label:first").after(t);if(!$li.find("ul.treeselect-sub ul.treeselect-sub").length){$li.find("div.treeselect-menu-expand").remove()}}});e("span.treeselect-toggle").click(function(){$i=e(this);if($i.parent().find("ul.treeselect-sub").is(":visible")){$i.removeClass("icon-minus").addClass("icon-plus");$i.parent().find("ul.treeselect-sub").hide();$i.parent().find("ul.treeselect-sub span.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")}else{$i.removeClass("icon-plus").addClass("icon-minus");$i.parent().find("ul.treeselect-sub").show();$i.parent().find("ul.treeselect-sub span.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")}});e("#treeselectfilter").keyup(function(){var t=e(this).val().toLowerCase();var n=0;e("#noresultsfound").hide();var r=e(".treeselect li");r.each(function(){if(e(this).text().toLowerCase().indexOf(t)==-1){e(this).hide();n++}else{e(this).show()}});if(n==r.length){e("#noresultsfound").show()}});e("#treeCheckAll").click(function(){e(".treeselect input").attr("checked","checked")});e("#treeUncheckAll").click(function(){e(".treeselect input").attr("checked",false)});e("#treeExpandAll").click(function(){e("ul.treeselect ul.treeselect-sub").show();e("ul.treeselect span.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")});e("#treeCollapseAll").click(function(){e("ul.treeselect ul.treeselect-sub").hide();e("ul.treeselect span.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")});e("a.checkall").click(function(){e(this).parents().eq(5).find("ul.treeselect-sub input").attr("checked","checked")});e("a.uncheckall").click(function(){e(this).parents().eq(5).find("ul.treeselect-sub input").attr("checked",false)});e("a.expandall").click(function(){var t=e(this).parents().eq(6);t.find("ul.treeselect-sub").show();t.find("ul.treeselect-sub span.treeselect-toggle").removeClass("icon-plus").addClass("icon-minus")});e("a.collapseall").click(function(){var t=e(this).parents().eq(6);t.find("li ul.treeselect-sub").hide();t.find("li span.treeselect-toggle").removeClass("icon-minus").addClass("icon-plus")})})
diff --git a/core/media/jui/less/accordion.less b/core/media/jui/less/accordion.less
new file mode 100644
index 00000000..d63523bc
--- /dev/null
+++ b/core/media/jui/less/accordion.less
@@ -0,0 +1,34 @@
+//
+// Accordion
+// --------------------------------------------------
+
+
+// Parent container
+.accordion {
+  margin-bottom: @baseLineHeight;
+}
+
+// Group == heading + body
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  .border-radius(@baseBorderRadius);
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+// General toggle styles
+.accordion-toggle {
+  cursor: pointer;
+}
+
+// Inner needs the styles because you can't animate properly with any styles on the element
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
diff --git a/core/media/jui/less/alerts.less b/core/media/jui/less/alerts.less
new file mode 100644
index 00000000..774fbe73
--- /dev/null
+++ b/core/media/jui/less/alerts.less
@@ -0,0 +1,80 @@
+//
+// Alerts
+// --------------------------------------------------
+
+
+// Base styles
+// -------------------------
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: @baseLineHeight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  background-color: @warningBackground;
+  border: 1px solid @warningBorder;
+  .border-radius(@baseBorderRadius);
+}
+.alert,
+.alert h4 {
+  // Specified for the h4 to prevent conflicts of changing @headingsColor
+  color: @warningText;
+}
+.alert h4 {
+  margin: 0 0 .5em;
+}
+
+// Adjust close link position
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: @baseLineHeight;
+  cursor:pointer;
+}
+
+
+// Alternate styles
+// -------------------------
+
+.alert-success {
+  background-color: @successBackground;
+  border-color: @successBorder;
+  color: @successText;
+}
+.alert-success h4 {
+  color: @successText;
+}
+.alert-danger,
+.alert-error {
+  background-color: @errorBackground;
+  border-color: @errorBorder;
+  color: @errorText;
+}
+.alert-danger h4,
+.alert-error h4 {
+  color: @errorText;
+}
+.alert-info {
+  background-color: @infoBackground;
+  border-color: @infoBorder;
+  color: @infoText;
+}
+.alert-info h4 {
+  color: @infoText;
+}
+
+
+// Block alerts
+// -------------------------
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
diff --git a/core/media/jui/less/bootstrap-extended.less b/core/media/jui/less/bootstrap-extended.less
new file mode 100644
index 00000000..6583190f
--- /dev/null
+++ b/core/media/jui/less/bootstrap-extended.less
@@ -0,0 +1,555 @@
+/* Extending Bootstrap */
+/* Typography */
+.small {
+	font-size: 11px;
+}
+/* Max Width */
+iframe,
+svg {
+	max-width: 100%;
+}
+/* Nowrap */
+.nowrap {
+	white-space: nowrap;
+}
+/* Center */
+.center,
+.table td.center,
+.table th.center {
+	text-align: center;
+}
+/* Disabled Link */
+a.disabled,
+a.disabled:hover {
+  color: #999999;
+  background-color: transparent;
+  cursor: default;
+  text-decoration: none;
+}
+/* Hero Banner */
+.hero-unit {
+	text-align: center;
+}
+.hero-unit .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+.btn .caret {
+	margin-bottom: 7px;
+}
+.btn.btn-micro .caret {
+	margin: 5px 0;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+
+/* Modal */
+body.modal {
+	padding-top: 0;
+}
+
+/* Alternating Rows */
+.row-even,.row-odd {
+	padding: 5px;
+	width: 99%;
+	border-bottom: 1px solid @tableBorder;
+}
+.row-odd {
+	background-color: @tableBackground;
+}
+.row-even {
+	background-color: @tableBackgroundAccent;
+}
+
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+
+/* Row reveal */
+.row-fluid .row-reveal {
+	visibility: hidden;
+}
+.row-fluid:hover .row-reveal {
+	visibility: visible;
+}
+
+/* Buttons */
+.btn-wide {
+	width: 80%;
+}
+
+/* Nav List Offset */
+.nav-list > li.offset > a {
+	padding-left: 30px;
+	font-size: 12px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+
+.row-fluid .offset1 {
+  margin-left: 8.382978723%;
+}
+.row-fluid .offset2 {
+  margin-left: 16.89361702%;
+}
+.row-fluid .offset3 {
+  margin-left: 25.404255317%;
+}
+.row-fluid .offset4 {
+  margin-left: 33.914893614%;
+}
+.row-fluid .offset5 {
+  margin-left: 42.425531911%;
+}
+.row-fluid .offset6 {
+  margin-left: 50.93617020799999%;
+}
+.row-fluid .offset7 {
+  margin-left: 59.446808505%;
+}
+.row-fluid .offset8 {
+  margin-left: 67.95744680199999%;
+}
+.row-fluid .offset9 {
+  margin-left: 76.468085099%;
+}
+.row-fluid .offset10 {
+  margin-left: 84.97872339599999%;
+}
+.row-fluid .offset11 {
+  margin-left: 91.489361693%;
+}
+
+/* Navbar Buttons */
+.navbar .nav > li > a.btn {
+	padding: 4px 10px;
+	line-height: 18px;
+}
+
+/* Nav Tabs Dark */
+.nav-tabs.nav-dark {
+	border-bottom: 1px solid #333;
+	text-shadow: 1px 1px 1px #000;
+}
+.nav-tabs.nav-dark > li > a {
+	color: #F8F8F8;
+}
+.nav-tabs.nav-dark > li > a:hover {
+  border-color: #333 #333 #111;
+  background-color: #777777;
+}
+.nav-tabs.nav-dark > .active > a, .nav-tabs.nav-dark > .active > a:hover {
+  color: #ffffff;
+  background-color: #555555;
+  border: 1px solid #222;
+  border-bottom-color: transparent;
+}
+
+/* Inline Thumbnails */
+.thumbnail.pull-left {
+	margin: 0 10px 10px 0;
+}
+.thumbnail.pull-right {
+	margin: 0 0 10px 10px;
+}
+
+/* Specific Widths */
+.width-10 {
+	width: 10px;
+}
+.width-20 {
+	width: 20px;
+}
+.width-30 {
+	width: 30px;
+}
+.width-40 {
+	width: 40px;
+}
+.width-50 {
+	width: 50px;
+}
+.width-60 {
+	width: 60px;
+}
+.width-70 {
+	width: 70px;
+}
+.width-80 {
+	width: 80px;
+}
+.width-90 {
+	width: 90px;
+}
+.width-100 {
+	width: 100px;
+}
+
+/* Specific Heights */
+.height-10 {
+	height: 10px;
+}
+.height-20 {
+	height: 20px;
+}
+.height-30 {
+	height: 30px;
+}
+.height-40 {
+	height: 40px;
+}
+.height-50 {
+	height: 50px;
+}
+.height-60 {
+	height: 60px;
+}
+.height-70 {
+	height: 70px;
+}
+.height-80 {
+	height: 80px;
+}
+.height-90 {
+	height: 90px;
+}
+.height-100 {
+	height: 100px;
+}
+
+/* Horizontal Row (hr) */
+hr.hr-condensed {
+	margin: 10px 0;
+}
+
+/* Striped */
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid @tableBorder;
+	margin-left: 0;
+}
+
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid @tableBorder;
+	padding: 8px;
+}
+
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: @tableBackgroundAccent;
+}
+
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: @tableBackgroundHover;
+}
+
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box; // box-sizing since we don't care about padding
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.row-striped .row-fluid [class*="span"] {
+	margin-left: 8px;
+}
+.row-striped .row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+
+/* Condensed */
+.list-condensed {
+  li {
+    padding: 4px 5px;
+  }
+}
+.row-condensed {
+  .row, .row-fluid {
+    padding: 4px 5px;
+  }
+}
+
+/* Bordered */
+.list-bordered,
+.row-bordered{
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	margin-left: 0;
+	border: 1px solid @tableBorder;
+	.border-radius(4px);
+}
+
+/* Radio Button Groups */
+.radio.btn-group input[type=radio] {
+    display: none;
+}
+.radio.btn-group > label {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.radio.btn-group {
+	padding-left: 0;
+}
+
+/* iFrames */
+.iframe-bordered {
+	border: 1px solid @tableBorder;
+}
+
+/* Tabbed Content */
+.tab-content{
+	overflow: visible;
+}
+.tabs-left .tab-content{
+	overflow: auto;
+}
+/* Non-linkable nav-tabs */
+.nav-tabs > li > span {
+    display: block;
+    margin-right: 2px;
+    padding-right: 12px;
+    padding-left: 12px;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    line-height: 18px;
+    border: 1px solid transparent;
+    -webkit-border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+    border-radius: 4px 4px 0 0;
+}
+
+/* Extended Joomla Button Classes */
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+.btn-group > .btn-micro {
+	font-size: 10px;
+}
+
+/* Joomla => Bootstrap Tooltip */
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: @white;
+	text-align: center;
+	text-decoration: none;
+	background-color: @black;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+
+/* Page Header */
+.page-header{
+	margin: 2px 0px 10px 0px;
+	padding-bottom: 5px;
+}
+/* Input Prepend Chosen Select Boxes */
+/* Common styling for Chosen Select Boxes with Input Prepend/Append */
+.input-prepend > .add-on,
+.input-append > .add-on {
+	vertical-align: top;
+}
+/* Styles specific to Input Prepend Chosen Select Boxes */
+.input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0 3px 0 0;
+	-moz-border-radius: 0 3px 0 0;
+	border-radius: 0 3px 0 0;
+}
+/* Styles specific to Input Append Chosen Select Boxes */
+.input-append .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 3px 0 0 0;
+	-moz-border-radius: 3px 0 0 0;
+	border-radius: 3px 0 0 0;
+}
+/* Styles specific to combined Input Prepend and Append Chosen Select Boxes */
+.input-prepend.input-append .chzn-container-single .chzn-single,
+.input-prepend.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+
+/* Accessible Hidden Elements (good for hidden labels and such) */
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+
+/* Make Accessible Hidden Elements visible on focus */
+.element-invisible:focus {
+	width:auto;
+	height:auto;
+	overflow:auto;
+	background:#eee;
+	color:#000;
+	padding:1em;
+}
+
+/* Form Vertical Overrides Form Horizontal */
+.form-vertical {
+	.control-label {
+		float: none;
+		width: auto;
+		padding-right: 0;
+		padding-top: 0;
+		text-align: left;
+	}
+	.controls{
+		margin-left: 0;
+	}
+}
+
+/* Auto Width */
+.width-auto {
+	width: auto;
+}
+
+/* Chosen proper wrapping in Bootstrap btn-group */
+.btn-group .chzn-results {
+	white-space: normal;
+}
+
+/* Accordion overflow fix */
+.accordion-body.in:hover {
+	overflow:visible;
+}
+
+/* Invalid indicators */
+.invalid {
+	color: @red;
+	font-weight: bold;
+}
+input.invalid {
+	border: 1px solid @red;
+	background: #f2dede;
+}
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: @red;
+	color: @red;
+}
+
+/* Tweaking of tooltips */
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+
+/* Align tip text to left (old mootools tip) */
+.tip-text {
+	text-align:left;
+}
+
+// Fix for bug when dropdown-backdrop element is created
+.btn-group > .btn + .dropdown-backdrop + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-backdrop + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.dropdown-menu {
+	text-align: left;
+}
+
+// Add Bootstrap 3 .alert-link
+.alert-link {
+  font-weight: bold;
+}
+
+.alert .alert-link {
+  color: darken(@warningText, 10%);
+}
+
+.alert-success .alert-link {
+  color: darken(@successText, 10%);
+}
+
+.alert-danger .alert-link,
+.alert-error .alert-link {
+  color: darken(@errorText, 10%);
+}
+
+.alert-info .alert-link {
+  color: darken(@infoText, 10%);
+}
diff --git a/core/media/jui/less/bootstrap-rtl.less b/core/media/jui/less/bootstrap-rtl.less
new file mode 100644
index 00000000..81863bd3
--- /dev/null
+++ b/core/media/jui/less/bootstrap-rtl.less
@@ -0,0 +1,634 @@
+/* Bootstrap RTL */
+/* Pull right or left */
+.pull-right {
+	float: left;
+}
+
+.pull-left {
+	float: right;
+}
+/* Tables */
+.table th,
+.table td {
+	text-align: right;
+}
+/* Navbar */
+.navbar .brand {
+	float: right;
+	padding: 8px 20px 8px 12px;
+	margin-right: -20px;
+	margin-left: 0;
+}
+.navbar .nav,
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav.pull-right {
+	margin-right: 10px;
+	margin-left: 0px;
+}
+.pull-right > .dropdown-menu {
+	left: 0;
+	right: auto;
+}
+/* Grid */
+[class*="span"] {
+	float: right;
+	margin-right: 20px;
+	margin-left: 0px;
+}
+.row-fluid [class*="span"] {
+	float: right;
+	margin-right: 2.127659574%;
+	*margin-right: 2.0744680846382977%;
+	margin-left: 0px!important;
+	*margin-left: 0px!important;
+}
+
+.row-fluid [class*="span"]:first-child {
+	margin-right: 0;
+}
+/* Forms */
+.form-horizontal .control-label {
+	float: right;
+	width: auto;
+	padding-left: 5px;
+	padding-right: 0;
+	text-align: right;
+}
+
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-right: 20px;
+	margin-right: 160px;
+	*margin-right: 0;
+	margin-left: 0;
+	text-align: right;
+	margin-top: 6px;
+}
+
+.form-horizontal .controls:first-child {
+	*padding-right: 160px;
+}
+.form-vertical .controls {
+	*display: inline-block;
+	*padding-right: 20px;
+	margin-right: 0;
+	*margin-right: 0;
+	margin-left: 0;
+	text-align: right;
+	margin-top: 6px;
+}
+.form-vertical .control-label {
+	float: none;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: right;
+	width: auto;
+}
+.chzn-container-single-nosearch .chzn-search input {
+	position: absolute;
+	left: -9000px;
+	display:none;
+}
+/* Nav */
+/* Tabs */
+.nav-tabs > li,
+.nav-pills > li {
+	float: right;
+}
+.nav-stacked > li {
+	float: none;
+}
+/* Buttons */
+/* Button Groups */
+.btn-group > .btn {
+	float: right;
+	margin-right: -1px;
+	margin-left: 0;
+}
+
+.btn-group > .btn:first-child {
+	margin-right: 0;
+}
+.btn-group > .btn:first-child,
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-topright: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+	-webkit-border-bottom-left-radius: 0px;
+	border-bottom-left-radius: 0px;
+	-webkit-border-top-left-radius: 0px;
+	border-top-left-radius: 0px;
+	-moz-border-radius-bottomleft: 0px;
+	-moz-border-radius-topleft: 0px;
+	margin-right: 0;
+	-webkit-border-bottom-right-radius: 6px;
+	border-bottom-right-radius: 6px;
+	-webkit-border-top-right-radius: 6px;
+	border-top-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	-moz-border-radius-topright: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-top-left-radius: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	border-bottom-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	-moz-border-radius-bottomleft: 6px;
+}
+
+.btn-group > .btn:first-child:last-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-moz-border-radius-topright: 4px;
+}
+/* Forms */
+/* Input Prepend and Append */
+.input-prepend .add-on{
+	float: right;
+}
+.input-append .add-on{
+	float: none;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-left: -1px;
+	margin-right: 0;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+
+.input-append .uneditable-input {
+	border-left-color: #ccc;
+	border-right-color: #eee;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-left: -1px;
+	margin-right: 0px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+	float: right;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-right: -1px;
+	margin-left: 0px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+
+
+/* start myrtl */
+body {
+direction:rtl;
+}
+
+.pager .next a {
+  float: left;
+}
+.pager .previous a {
+  float: right;
+}
+
+.icon-arrow-right {
+	background-position: -241px -94px;
+	float: left;
+	padding-right: 3px;
+}
+
+.icon-arrow-left {
+	background-position: -264px -95px;
+}
+.icon-refresh {
+	background-position: -240px -23px;
+}
+#refresh-status {
+	background-position: right center;
+	padding-left: 0;
+	padding-right: 25px;
+}
+.radio input[type="radio"], .checkbox input[type="checkbox"] {
+	float: right;
+	margin-right: 2px;
+	margin-left: 5px;
+}
+
+.list-striped, .row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: right;
+}
+.btn-group + .btn-group {
+	margin-right: 5px;
+	margin-left: 0px;
+}
+.tabs-left > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #DDD;
+	margin-right: 0px;
+	border-right: 0px;
+}
+.tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a:hover {
+	border-color: #DDD #DDD #DDD transparent;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+	margin-right: 0px;
+}
+.controls > .radio:first-child, .controls > .checkbox:first-child {
+	padding-top: 0px;
+}
+.btn-toolbar {
+	margin-top: 14px;
+	margin-bottom: 3px;
+}
+.navbar .nav > li {
+	float:right;
+}
+
+.icon-folder-2 {
+	line-height: 25px;
+	padding-left: 5px;
+}
+
+.navbar .nav > li > a {
+	padding: 8px 10px;
+	color: #FFFFFF;
+}
+.navigation .nav li li .nav-child {
+	left: auto;
+	right: 100%;
+
+	&:before {
+		left: auto;
+		right: -7px;
+		border-left: 7px solid rgba(0, 0, 0, 0.2);
+		border-right-width: 0;
+	}
+	&:after {
+		left: auto;
+		right: -6px;
+		border-left: 6px solid #ffffff;
+		border-right-width: 0;
+	}
+}
+.container-logo {
+	padding-top: 6px;
+	float: left;
+	text-align: left;
+}
+.modal-header .close {
+	float: left;
+}
+.pagination a {
+	float: right;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	/* IE7 inline-block hack */
+
+	*zoom: 1;
+	margin-right: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.pagination a {
+	float: right;
+	padding: 0 14px;
+	line-height: 34px;
+	text-decoration: none;
+	border: 1px solid #ddd;
+	border-right-width: 0;
+}
+
+.pagination li:first-child a {
+	border-right-width: 1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.pagination li:last-child a {
+	-webkit-border-radius: 3px 0 0 3px ;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.icon-first:before {
+	content: "\e000";
+}
+.icon-previous:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\7b";
+}
+.icon-next:before {
+	content: "\7c";
+}
+.dl-horizontal dt {
+	float: right;
+	text-align: left;
+	clear: right;
+}
+.dl-horizontal dd {
+	margin-left: 0;
+	margin-right: 180px;
+}
+.dl-horizontal dt,
+.profile> ul {
+	margin: 9px 25px 0 0;
+}
+/* end myrtl */
+.dropdown-submenu > a:after {
+	float: left;
+	border-width: 5px 5px 5px 0;
+	margin-left: -10px;
+	border-left-color: transparent;
+	border-right-color: #CCC;
+}
+/* Subcategories badge */
+.badge {
+	margin-left: 10px;
+}
+/* Align tip text to right */
+.tip-text {
+	text-align:right;
+}
+/* Other corrections */
+.icon-file-add:before {
+	content: "(";
+}
+.icon-eye-open:before, .icon-eye:before {
+	content: ">";
+}
+.icon-checkin:before, .icon-checkbox:before {
+	content: "<";
+}
+.icon-save-new:before, .icon-plus-2:before {
+	content: "[";
+}
+.btn-toolbar .btn + .btn, .btn-toolbar .btn-group + .btn, .btn-toolbar .btn + .btn-group {
+	margin-left: 0;
+	margin-right: 5px;
+}
+.btn-toolbar .btn-wrapper {
+  display: inline-block;
+  margin: 0 5px 5px 0;
+}
+.btn-group > .btn + .btn {
+	margin-left: 0;
+	margin-right: -1px;
+}
+.input-append .add-on, .input-append .btn, .input-prepend .add-on, .input-prepend .btn {
+	margin-left: 0;
+	margin-right: -1px;
+}
+.table-bordered {
+	border-right-width: 0;
+	border-left-width: 1px;
+	border-right-style: none;
+	border-left-style: solid;
+	border-right-color: -moz-use-text-color;
+	border-left-color: #DDDDDD;
+}
+.chzn-container-single .chzn-single {
+	padding-right: 8px;
+	padding-left: 0;
+}
+.chzn-container-single .chzn-single span {
+	margin-left: 26px;
+	margin-right: 0;
+}
+.chzn-container-single .chzn-single abbr {
+	left: 26px;
+	right: auto;
+}
+.chzn-container-single .chzn-single div {
+	left: 0;
+	right: auto;
+}
+.chzn-container-multi .chzn-choices li {
+	float: right;
+}
+.chzn-container-multi .chzn-choices .search-choice {
+	margin-right: 5px;
+	margin-left: 0;
+	padding-right: 5px;
+	padding-left: 20px;
+}
+.chzn-container-multi .chzn-choices .search-choice .search-choice-close {
+	left: 3px;
+	right: auto;
+}
+.chzn-container.chzn-with-drop .chzn-drop {
+	right: 0;
+	left: auto;
+}
+.chzn-container-single.chzn-container-single-nosearch .chzn-search {
+	position: absolute;
+	right: -9999px;
+	left: auto;
+}
+.chzn-container .chzn-drop {
+	right: -9999px;
+	left: auto;
+}
+.alert {
+	padding-right: 14px;
+	padding-left: 35px;
+}
+.alert .close {
+	left: -21px;
+	right: auto;
+}
+.close {
+	float: left;
+}
+.form-search .radio, .form-search .checkbox, .form-inline .radio, .form-inline .checkbox {
+	margin-bottom: 9px;
+}
+.form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"], .form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] {
+	float: right;
+	margin-left: 3px;
+	margin-right: 0;
+}
+/* Media Manager */
+.com_media .container-main .media {
+	display: inline-block;
+}
+.thumbnails > li {
+	float: right;
+	margin-bottom: 18px;
+	margin-right: 20px;
+}
+#mediamanager-form .description,
+#mediamanager-form .filesize,
+#mediamanager-form .dimensions {
+	direction: ltr;
+}
+/* Tooltip/Popover */
+.popover,
+.tooltip-inner {
+	text-align: right;
+}
+.popover.top .arrow,
+.popover.bottom .arrow {
+	margin-right: -11px;
+}
+.popover.top .arrow:after,
+.popover.bottom .arrow:after {
+	margin-right: -10px;
+}
+
+/* Media queries */
+@media (max-width: 480px) {
+	.btn-toolbar .btn-wrapper {
+		display: block;
+		margin: 0 0 5px 0;
+	}
+	.btn-toolbar .btn-wrapper .btn {
+		margin-left: 0px;
+		margin-right: 10px;
+	}
+}
+
+/*Print pop-up*/
+#pop-print {
+	float: left;
+	margin: 10px;
+}
+
+/*url fields*/
+#install_url,
+#install_directory,
+#jform_customurl,
+#jform_link,
+#jform_params_url,
+input[type="url"] {
+	text-align: left;
+	direction: ltr;
+}
+
+/* Menu Module front-end */
+#aside .nav .nav-child {
+	border-left: 0;
+	border-right: 2px solid #ddd;
+	padding-left: 0;
+	padding-right: 5px;
+}
+
+/* Dropdown frontend */
+.dropdown-menu {
+	text-align: right;
+}
+
+/* Icon whitespacing */
+[class^="icon-"],
+[class*=" icon-"] {
+	margin-left: .25em;
+}
diff --git a/core/media/jui/less/bootstrap.less b/core/media/jui/less/bootstrap.less
new file mode 100644
index 00000000..cf93ff98
--- /dev/null
+++ b/core/media/jui/less/bootstrap.less
@@ -0,0 +1,71 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+// Core variables and mixins
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+// CSS Reset
+@import "reset.less";
+
+// Grid system and page structure
+@import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
+
+// Base CSS
+@import "type.less";
+@import "code.less";
+@import "forms.less";
+@import "tables.less";
+
+// Components: common
+@import "sprites.less";
+@import "dropdowns.less";
+@import "wells.less";
+@import "component-animations.less";
+@import "close.less";
+
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "navs.less";
+@import "navbar.less";
+@import "breadcrumbs.less";
+@import "pagination.less";
+@import "pager.less";
+
+// Components: Popovers
+@import "modals.less";
+@import "tooltip.less";
+@import "popovers.less";
+
+// Components: Misc
+@import "thumbnails.less";
+@import "media.less";
+@import "labels-badges.less";
+@import "progress-bars.less";
+@import "accordion.less";
+@import "carousel.less";
+@import "hero-unit.less";
+
+// Utility classes
+@import "utilities.less"; // Has to be last to override when necessary
+
+// > Joomla JUI
+
+/* Joomla JUI NOTE: Original .modal definition has to be commented in modals.less and responsive-767px-max.less */
+
+@import "modals.joomla.less";
+@import "responsive-767px-max.joomla.less";
+// < Joomla JUI
diff --git a/core/media/jui/less/breadcrumbs.less b/core/media/jui/less/breadcrumbs.less
new file mode 100644
index 00000000..f753df6b
--- /dev/null
+++ b/core/media/jui/less/breadcrumbs.less
@@ -0,0 +1,24 @@
+//
+// Breadcrumbs
+// --------------------------------------------------
+
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 @baseLineHeight;
+  list-style: none;
+  background-color: #f5f5f5;
+  .border-radius(@baseBorderRadius);
+  > li {
+    display: inline-block;
+    .ie7-inline-block();
+    text-shadow: 0 1px 0 @white;
+    > .divider {
+      padding: 0 5px;
+      color: #ccc;
+    }
+  }
+  > .active {
+    color: @grayLight;
+  }
+}
diff --git a/core/media/jui/less/button-groups.less b/core/media/jui/less/button-groups.less
new file mode 100644
index 00000000..55cdc603
--- /dev/null
+++ b/core/media/jui/less/button-groups.less
@@ -0,0 +1,229 @@
+//
+// Button groups
+// --------------------------------------------------
+
+
+// Make the div behave like a button
+.btn-group {
+  position: relative;
+  display: inline-block;
+  .ie7-inline-block();
+  font-size: 0; // remove as part 1 of font-size inline-block hack
+  vertical-align: middle; // match .btn alignment given font-size hack above
+  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
+  .ie7-restore-left-whitespace();
+}
+
+// Space out series of button groups
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+  font-size: 0; // Hack to remove whitespace that results from using inline-block
+  margin-top: @baseLineHeight / 2;
+  margin-bottom: @baseLineHeight / 2;
+  > .btn + .btn,
+  > .btn-group + .btn,
+  > .btn + .btn-group {
+    margin-left: 5px;
+  }
+}
+
+// Float them, remove border radius, then re-add to first and last elements
+.btn-group > .btn {
+  position: relative;
+  .border-radius(0);
+}
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
+}
+
+// Reset fonts for other sizes
+.btn-group > .btn-mini {
+  font-size: @fontSizeMini;
+}
+.btn-group > .btn-small {
+  font-size: @fontSizeSmall;
+}
+.btn-group > .btn-large {
+  font-size: @fontSizeLarge;
+}
+
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  .border-top-left-radius(@baseBorderRadius);
+  .border-bottom-left-radius(@baseBorderRadius);
+}
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  .border-top-right-radius(@baseBorderRadius);
+  .border-bottom-right-radius(@baseBorderRadius);
+}
+// Reset corners for large buttons
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  .border-top-left-radius(@borderRadiusLarge);
+  .border-bottom-left-radius(@borderRadiusLarge);
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  .border-top-right-radius(@borderRadiusLarge);
+  .border-bottom-right-radius(@borderRadiusLarge);
+}
+
+// On hover/focus/active, bring the proper btn to front
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+
+
+// Split button dropdowns
+// ----------------------
+
+// Give the line between buttons some depth
+.btn-group > .btn + .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+.btn-group.open {
+
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
+  .dropdown-toggle {
+    background-image: none;
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle {
+    background-color: @btnBackgroundHighlight;
+  }
+  .btn-primary.dropdown-toggle {
+    background-color: @btnPrimaryBackgroundHighlight;
+  }
+  .btn-warning.dropdown-toggle {
+    background-color: @btnWarningBackgroundHighlight;
+  }
+  .btn-danger.dropdown-toggle {
+    background-color: @btnDangerBackgroundHighlight;
+  }
+  .btn-success.dropdown-toggle {
+    background-color: @btnSuccessBackgroundHighlight;
+  }
+  .btn-info.dropdown-toggle {
+    background-color: @btnInfoBackgroundHighlight;
+  }
+  .btn-inverse.dropdown-toggle {
+    background-color: @btnInverseBackgroundHighlight;
+  }
+}
+
+
+// Reposition the caret
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+// Carets in other button sizes
+.btn-large .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  border-left-width:  5px;
+  border-right-width: 5px;
+  border-top-width:   5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+// Upside down carets for .dropup
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+
+
+// Account for other colors
+.btn-primary,
+.btn-warning,
+.btn-danger,
+.btn-info,
+.btn-success,
+.btn-inverse {
+  .caret {
+    border-top-color: @white;
+    border-bottom-color: @white;
+  }
+}
+
+
+
+// Vertical button groups
+// ----------------------
+
+.btn-group-vertical {
+  display: inline-block; // makes buttons only take up the width they need
+  .ie7-inline-block();
+}
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  .border-radius(0);
+}
+.btn-group-vertical > .btn + .btn {
+  margin-left: 0;
+  margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
+}
+.btn-group-vertical > .btn:last-child {
+  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
+}
+.btn-group-vertical > .btn-large:first-child {
+  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
+}
+.btn-group-vertical > .btn-large:last-child {
+  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
+}
diff --git a/core/media/jui/less/buttons.less b/core/media/jui/less/buttons.less
new file mode 100644
index 00000000..4cd4d862
--- /dev/null
+++ b/core/media/jui/less/buttons.less
@@ -0,0 +1,228 @@
+//
+// Buttons
+// --------------------------------------------------
+
+
+// Base styles
+// --------------------------------------------------
+
+// Core
+.btn {
+  display: inline-block;
+  .ie7-inline-block();
+  padding: 4px 12px;
+  margin-bottom: 0; // For input.btn
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
+  border: 1px solid @btnBorder;
+  *border: 0; // Remove the border to prevent IE7's black border on input:focus
+  border-bottom-color: darken(@btnBorder, 10%);
+  .border-radius(@baseBorderRadius);
+  .ie7-restore-left-whitespace(); // Give IE7 some love
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+
+  // Hover/focus state
+  &:hover,
+  &:focus {
+    color: @grayDark;
+    text-decoration: none;
+    background-position: 0 -15px;
+
+    // transition is only when going to hover/focus, otherwise the background
+    // behind the gradient (there for IE<=9 fallback) gets mismatched
+    .transition(background-position .1s linear);
+  }
+
+  // Focus state for keyboard and accessibility
+  &:focus {
+    .tab-focus();
+  }
+
+  // Active state
+  &.active,
+  &:active {
+    background-image: none;
+    outline: 0;
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Disabled state
+  &.disabled,
+  &[disabled] {
+    cursor: default;
+    background-image: none;
+    .opacity(65);
+    .box-shadow(none);
+  }
+
+}
+
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+  padding: @paddingLarge;
+  font-size: @fontSizeLarge;
+  .border-radius(@borderRadiusLarge);
+}
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+// Small
+.btn-small {
+  padding: @paddingSmall;
+  font-size: @fontSizeSmall;
+  .border-radius(@borderRadiusSmall);
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+// Mini
+.btn-mini {
+  padding: @paddingMini;
+  font-size: @fontSizeMini;
+  .border-radius(@borderRadiusSmall);
+}
+
+
+// Block button
+// -------------------------
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-left: 0;
+  padding-right: 0;
+  .box-sizing(border-box);
+}
+
+// Vertically space out multiple block buttons
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+// Specificity overrides
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+  &.btn-block {
+    width: 100%;
+  }
+}
+
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+// Provide *some* extra contrast for those who can get it
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn-primary {
+  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
+}
+// Warning appears are orange
+.btn-warning {
+  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
+}
+// Danger and error appear as red
+.btn-danger {
+  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
+}
+// Success appears as green
+.btn-success {
+  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
+}
+// Info appears as a neutral blue
+.btn-info {
+  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
+}
+// Inverse appears as dark gray
+.btn-inverse {
+  .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
+
+button.btn,
+input[type="submit"].btn {
+
+  // Firefox 3.6 only I believe
+  &::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+  }
+
+  // IE7 has some default padding on button controls
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+
+  &.btn-large {
+    *padding-top: 7px;
+    *padding-bottom: 7px;
+  }
+  &.btn-small {
+    *padding-top: 3px;
+    *padding-bottom: 3px;
+  }
+  &.btn-mini {
+    *padding-top: 1px;
+    *padding-bottom: 1px;
+  }
+}
+
+
+// Link buttons
+// --------------------------------------------------
+
+// Make a button look and behave like a link
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  .box-shadow(none);
+}
+.btn-link {
+  border-color: transparent;
+  cursor: pointer;
+  color: @linkColor;
+  .border-radius(0);
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: @linkColorHover;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: @grayDark;
+  text-decoration: none;
+}
diff --git a/core/media/jui/less/carousel.less b/core/media/jui/less/carousel.less
new file mode 100644
index 00000000..55bc0501
--- /dev/null
+++ b/core/media/jui/less/carousel.less
@@ -0,0 +1,158 @@
+//
+// Carousel
+// --------------------------------------------------
+
+
+.carousel {
+  position: relative;
+  margin-bottom: @baseLineHeight;
+  line-height: 1;
+}
+
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+
+.carousel-inner {
+
+  > .item {
+    display: none;
+    position: relative;
+    .transition(.6s ease-in-out left);
+
+    // Account for jankitude on images
+    > img,
+    > a > img {
+      display: block;
+      line-height: 1;
+    }
+  }
+
+  > .active,
+  > .next,
+  > .prev { display: block; }
+
+  > .active {
+    left: 0;
+  }
+
+  > .next,
+  > .prev {
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
+
+  > .next {
+    left: 100%;
+  }
+  > .prev {
+    left: -100%;
+  }
+  > .next.left,
+  > .prev.right {
+    left: 0;
+  }
+
+  > .active.left {
+    left: -100%;
+  }
+  > .active.right {
+    left: 100%;
+  }
+
+}
+
+// Left/right controls for nav
+// ---------------------------
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: @white;
+  text-align: center;
+  background: @grayDarker;
+  border: 3px solid @white;
+  .border-radius(23px);
+  .opacity(50);
+
+  // we can't have this transition here
+  // because webkit cancels the carousel
+  // animation if you trip this while
+  // in the middle of another animation
+  // ;_;
+  // .transition(opacity .2s linear);
+
+  // Reposition the right one
+  &.right {
+    left: auto;
+    right: 15px;
+  }
+
+  // Hover/focus state
+  &:hover,
+  &:focus {
+    color: @white;
+    text-decoration: none;
+    .opacity(90);
+  }
+}
+
+// Carousel indicator pips
+// -----------------------------
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+
+  li {
+    display: block;
+    float: left;
+    width: 10px;
+    height: 10px;
+    margin-left: 5px;
+    text-indent: -999px;
+    background-color: #ccc;
+    background-color: rgba(255,255,255,.25);
+    border-radius: 5px;
+  }
+  .active {
+    background-color: #fff;
+  }
+}
+
+// Caption for text below images
+// -----------------------------
+
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 15px;
+  background: @grayDark;
+  background: rgba(0,0,0,.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+  color: @white;
+  line-height: @baseLineHeight;
+}
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+.carousel-caption p {
+  margin-bottom: 0;
+}
diff --git a/core/media/jui/less/close.less b/core/media/jui/less/close.less
new file mode 100644
index 00000000..0deffe47
--- /dev/null
+++ b/core/media/jui/less/close.less
@@ -0,0 +1,47 @@
+//
+// Close icons
+// --------------------------------------------------
+
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @black;
+  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  .opacity(20);
+  &:hover,
+  &:focus {
+    color: @black;
+    text-decoration: none;
+    cursor: pointer;
+    .opacity(40);
+  }
+}
+
+// Additional properties for button version
+// iOS requires the button element instead of an anchor tag.
+// If you want the anchor version, it requires `href="#"`.
+button.close {
+  padding: 3;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.alert-options {
+  float: right;
+  line-height: @baseLineHeight;
+  color: @black;
+  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  .opacity(20);
+  &:hover,
+  &:focus {
+    color: @black;
+    text-decoration: none;
+    cursor: pointer;
+    .opacity(40);
+  }
+}
\ No newline at end of file
diff --git a/core/media/jui/less/code.less b/core/media/jui/less/code.less
new file mode 100644
index 00000000..266a926e
--- /dev/null
+++ b/core/media/jui/less/code.less
@@ -0,0 +1,61 @@
+//
+// Code (inline and blocK)
+// --------------------------------------------------
+
+
+// Inline and block code styles
+code,
+pre {
+  padding: 0 3px 2px;
+  #font > #family > .monospace;
+  font-size: @baseFontSize - 2;
+  color: @grayDark;
+  .border-radius(3px);
+}
+
+// Inline code
+code {
+  padding: 2px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+  white-space: nowrap;
+}
+
+// Blocks of code
+pre {
+  display: block;
+  padding: (@baseLineHeight - 1) / 2;
+  margin: 0 0 @baseLineHeight / 2;
+  font-size: @baseFontSize - 1; // 14px to 13px
+  line-height: @baseLineHeight;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc; // fallback for IE7-8
+  border: 1px solid rgba(0,0,0,.15);
+  .border-radius(@baseBorderRadius);
+
+  // Make prettyprint styles more spaced out for readability
+  &.prettyprint {
+    margin-bottom: @baseLineHeight;
+  }
+
+  // Account for some code outputs that place code tags in pre tags
+  code {
+    padding: 0;
+    color: inherit;
+    white-space: pre;
+    white-space: pre-wrap;
+    background-color: transparent;
+    border: 0;
+  }
+}
+
+// Enable scrollable blocks of code
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
\ No newline at end of file
diff --git a/core/media/jui/less/component-animations.less b/core/media/jui/less/component-animations.less
new file mode 100644
index 00000000..d614263a
--- /dev/null
+++ b/core/media/jui/less/component-animations.less
@@ -0,0 +1,22 @@
+//
+// Component animations
+// --------------------------------------------------
+
+
+.fade {
+  opacity: 0;
+  .transition(opacity .15s linear);
+  &.in {
+    opacity: 1;
+  }
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  .transition(height .35s ease);
+  &.in {
+    height: auto;
+  }
+}
diff --git a/core/media/jui/less/dropdowns.less b/core/media/jui/less/dropdowns.less
new file mode 100644
index 00000000..2738af55
--- /dev/null
+++ b/core/media/jui/less/dropdowns.less
@@ -0,0 +1,261 @@
+//
+// Dropdown menus
+// --------------------------------------------------
+
+
+// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
+.dropup,
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle {
+  // The caret makes the toggle a bit too tall in IE7
+  *margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+// Dropdown arrow/caret
+// --------------------
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top:   4px solid @black;
+  border-right: 4px solid transparent;
+  border-left:  4px solid transparent;
+  content: "";
+}
+
+// Place the caret
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+// The dropdown menu (ul)
+// ----------------------
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: @zindexDropdown;
+  display: none; // none by default, but block on "open" of the menu
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0; // override default ul
+  list-style: none;
+  background-color: @dropdownBackground;
+  border: 1px solid #ccc; // Fallback for IE7-8
+  border: 1px solid @dropdownBorder;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  .border-radius(6px);
+  .box-shadow(0 5px 10px rgba(0,0,0,.2));
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+
+  // Aligns the dropdown menu to right
+  &.pull-right {
+    right: 0;
+    left: auto;
+  }
+
+  // Dividers (basically an hr) within the dropdown
+  .divider {
+    .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
+  }
+
+  // Labelled Separator (group label for menu items group) within the dropdown
+  .menuitem-group {
+    margin: 4px 1px;
+    overflow: hidden;
+    border-top: 1px solid @grayLighter;
+    border-bottom: 1px solid @grayLighter;
+    background-color: @grayLighter;
+    color: @gray;
+    text-transform: capitalize;
+    font-size: 95%;
+    padding: 3px 20px;
+  }
+
+  // Links within the dropdown menu
+  > li > a {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    color: @dropdownLinkColor;
+    white-space: nowrap;
+  }
+}
+
+// Hover/Focus state
+// -----------
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  text-decoration: none;
+  color: @dropdownLinkColorHover;
+  #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
+}
+
+// Active state
+// ------------
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: @dropdownLinkColorActive;
+  text-decoration: none;
+  outline: 0;
+  #gradient > .vertical(@dropdownLinkBackgroundActive, darken(@dropdownLinkBackgroundActive, 5%));
+}
+
+// Disabled state
+// --------------
+// Gray out text and ensure the hover/focus state remains gray
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: @grayLight;
+}
+// Nuke hover/focus effects
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  background-color: transparent;
+  background-image: none; // Remove CSS gradient
+  .reset-filter();
+  cursor: default;
+}
+
+// Open state for the dropdown
+// ---------------------------
+.open {
+  // IE7's z-index only goes to the nearest positioned ancestor, which would
+  // make the menu appear below buttons that appeared later on the page
+  *z-index: @zindexDropdown;
+
+  & > .dropdown-menu {
+    display: block;
+  }
+}
+
+// Backdrop to catch body clicks on mobile, etc.
+// ---------------------------
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: @zindexDropdown - 10;
+}
+
+// Right aligned dropdowns
+// ---------------------------
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+// Allow for dropdowns to go bottom up (aka, dropup-menu)
+// ------------------------------------------------------
+// Just add .dropup after the standard .dropdown class and you're set, bro.
+// TODO: abstract this so that the navbar fixed styles are not placed here?
+.dropup,
+.navbar-fixed-bottom .dropdown {
+  // Reverse the caret
+  .caret {
+    border-top: 0;
+    border-bottom: 4px solid @black;
+    content: "";
+  }
+  // Different positioning for bottom up menu
+  .dropdown-menu {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 1px;
+  }
+}
+
+// Sub menus
+// ---------------------------
+.dropdown-submenu {
+  position: relative;
+}
+// Default dropdowns
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  .border-radius(6px 6px 6px 6px);
+}
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+
+// Dropups
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  .border-radius(5px 5px 5px 0);
+}
+
+// Caret to indicate there is a submenu
+.dropdown-submenu > a:after {
+  display: block;
+  content: " ";
+  float: right;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  border-left-color: darken(@dropdownBackground, 20%);
+  margin-top: 5px;
+  margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+  border-left-color: @dropdownLinkColorHover;
+}
+
+// Left aligned submenus
+.dropdown-submenu.pull-left {
+  // Undo the float
+  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
+  float: none;
+
+  // Positioning the submenu
+  > .dropdown-menu {
+    left: -100%;
+    margin-left: 10px;
+    .border-radius(6px 0 6px 6px);
+  }
+}
+
+// Tweak nav headers
+// -----------------
+// Increase padding from 15px to 20px on sides
+.dropdown .dropdown-menu .nav-header {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+// Typeahead
+// ---------
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px; // give it some space to breathe
+  .border-radius(@baseBorderRadius);
+}
diff --git a/core/media/jui/less/forms.less b/core/media/jui/less/forms.less
new file mode 100644
index 00000000..22937ec2
--- /dev/null
+++ b/core/media/jui/less/forms.less
@@ -0,0 +1,728 @@
+//
+// Forms
+// --------------------------------------------------
+
+
+// GENERAL STYLES
+// --------------
+
+// Make all forms have space below them
+form {
+  margin: 0 0 @baseLineHeight;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+// Groups of fields with labels on top (legends)
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: @baseLineHeight;
+  font-size: @baseFontSize * 1.5;
+  line-height: @baseLineHeight * 2;
+  color: @grayDark;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+
+  // Small
+  small {
+    font-size: @baseLineHeight * .75;
+    color: @grayLight;
+  }
+}
+
+// Set font for forms
+label,
+input,
+button,
+select,
+textarea {
+  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
+}
+input,
+button,
+select,
+textarea {
+  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
+}
+
+// Identify controls by their labels
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+// Form controls
+// -------------------------
+
+// Shared size and type resets
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: @baseLineHeight;
+  padding: 4px 6px;
+  margin-bottom: @baseLineHeight / 2;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @gray;
+  .border-radius(@inputBorderRadius);
+  vertical-align: middle;
+}
+
+// Reset appearance properties for textual inputs and textarea
+// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
+input,
+textarea,
+.uneditable-input {
+  width: 206px; // plus 12px padding and 2px border
+}
+// Reset height since textareas have rows
+textarea {
+  height: auto;
+}
+// Everything else
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: @inputBackground;
+  border: 1px solid @inputBorder;
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  .transition(~"border linear .2s, box-shadow linear .2s");
+
+  // Focus state
+  &:focus {
+    border-color: rgba(82,168,236,.8);
+    outline: 0;
+    outline: thin dotted \9; /* IE6-9 */
+    .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
+  }
+}
+
+// Position radios and checkboxes better
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  *margin-top: 0; /* IE7 */
+  margin-top: 1px \9; /* IE8-9 */
+  line-height: normal;
+}
+
+// Reset width of input images, buttons, radios, checkboxes
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto; // Override of generic input selector
+}
+
+// Set the height of select and file controls to match text inputs
+select,
+input[type="file"] {
+  height: @inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
+  line-height: @inputHeight;
+}
+
+// Make select elements obey height by applying a border
+select {
+  width: 220px; // default input width + 10px of padding that doesn't get applied
+  border: 1px solid @inputBorder;
+  background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
+}
+
+// Make multiple select elements height not fixed
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+// Focus for select, file, radio, and checkbox
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  .tab-focus();
+}
+
+
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea {
+  color: @grayLight;
+  background-color: darken(@inputBackground, 1%);
+  border-color: @inputBorder;
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
+}
+
+// For text that needs to appear as an input but should not be an input
+.uneditable-input {
+  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
+  white-space: nowrap;
+}
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+
+// Placeholder
+// -------------------------
+
+// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
+input,
+textarea {
+  .placeholder();
+}
+
+
+// CHECKBOXES & RADIOS
+// -------------------
+
+// Indent the labels to position radios/checkboxes as hanging
+.radio,
+.checkbox {
+  min-height: @baseLineHeight; // clear the floating input if there is no label text
+  padding-left: 20px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+// Move the options list down to align with labels
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px; // has to be padding because margin collaspes
+}
+
+// Radios and checkboxes on same line
+// TODO v3: Convert .inline to .control-inline
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px; // space out consecutive inline controls
+}
+
+
+
+// INPUT SIZES
+// -----------
+
+// General classes for quick sizes
+.input-mini       { width: 60px; }
+.input-small      { width: 90px; }
+.input-medium     { width: 150px; }
+.input-large      { width: 210px; }
+.input-xlarge     { width: 270px; }
+.input-xxlarge    { width: 530px; }
+
+// Grid style input sizes
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+// Redeclare since the fluid row class is more specific
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+// Ensure input-prepend/append never wraps
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+
+
+// GRID SIZING FOR INPUTS
+// ----------------------
+
+// Grid sizes
+#grid > .input(@gridColumnWidth, @gridGutterWidth);
+
+// Control row for multiple inputs per line
+.controls-row {
+  .clearfix(); // Clear the float from controls
+}
+
+// Float to collapse white-space for proper grid alignment
+.controls-row [class*="span"],
+// Redeclare the fluid grid collapse since we undo the float for inputs
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+// Explicity set top padding on all checkboxes/radios, not just first-child
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
+
+
+
+// DISABLED STATE
+// --------------
+
+// Disabled and read-only inputs
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: @inputDisabledBackground;
+}
+// Explicitly reset the colors here
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+
+
+
+// FORM FIELD FEEDBACK STATES
+// --------------------------
+
+// Warning
+.control-group.warning {
+  .formFieldState(@warningText, @warningText, @warningBackground);
+}
+// Error
+.control-group.error {
+  .formFieldState(@errorText, @errorText, @errorBackground);
+}
+// Success
+.control-group.success {
+  .formFieldState(@successText, @successText, @successBackground);
+}
+// Success
+.control-group.info {
+  .formFieldState(@infoText, @infoText, @infoBackground);
+}
+
+// HTML5 invalid states
+// Shares styles with the .control-group.error above
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+  &:focus {
+    border-color: darken(#ee5f5b, 10%);
+    @shadow: 0 0 6px lighten(#ee5f5b, 20%);
+    .box-shadow(@shadow);
+  }
+}
+
+
+
+// FORM ACTIONS
+// ------------
+
+.form-actions {
+  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
+  margin-top: @baseLineHeight;
+  margin-bottom: @baseLineHeight;
+  background-color: @formActionsBackground;
+  border-top: 1px solid #e5e5e5;
+  .clearfix(); // Adding clearfix to allow for .pull-right button containers
+}
+
+
+
+// HELP TEXT
+// ---------
+
+.help-block,
+.help-inline {
+  color: lighten(@textColor, 15%); // lighten the text some for contrast
+}
+
+.help-block {
+  display: block; // account for any element using help-block
+  margin-bottom: @baseLineHeight / 2;
+}
+
+.help-inline {
+  display: inline-block;
+  .ie7-inline-block();
+  vertical-align: middle;
+  padding-left: 5px;
+}
+
+
+
+// INPUT GROUPS
+// ------------
+
+// Allow us to put symbols and text within the input field for a cleaner look
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: @baseLineHeight / 2;
+  vertical-align: middle;
+  font-size: 0; // white space collapse hack
+  white-space: nowrap; // Prevent span and input from separating
+
+  // Reset the white space collapse hack
+  input,
+  select,
+  .uneditable-input,
+  .dropdown-menu,
+  .popover {
+    font-size: @baseFontSize;
+  }
+
+  input,
+  select,
+  .uneditable-input {
+    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
+    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
+    *margin-left: 0;
+    vertical-align: top;
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+    // Make input on top when focused so blue border and shadow always show
+    &:focus {
+      z-index: 2;
+    }
+  }
+  .add-on {
+    display: inline-block;
+    width: auto;
+    height: @baseLineHeight;
+    min-width: 16px;
+    padding: 4px 5px;
+    font-size: @baseFontSize;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    text-align: center;
+    text-shadow: 0 1px 0 @white;
+    background-color: @grayLighter;
+    border: 1px solid #ccc;
+  }
+  .add-on,
+  .btn,
+  .btn-group > .dropdown-toggle {
+    vertical-align: top;
+    .border-radius(0);
+  }
+}
+
+.input-prepend {
+  .add-on,
+  .btn {
+    margin-right: -1px;
+  }
+  .add-on:first-child,
+  .btn:first-child {
+    // FYI, `.btn:first-child` accounts for a button group that's prepended
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+}
+
+.input-append {
+  input,
+  select,
+  .uneditable-input {
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+    + .btn-group .btn:last-child {
+      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+    }
+  }
+  .add-on,
+  .btn,
+  .btn-group {
+    margin-left: -1px;
+  }
+  .add-on:last-child,
+  .btn:last-child,
+  .btn-group:last-child > .dropdown-toggle {
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+  }
+}
+
+// Remove all border-radius for inputs with both prepend and append
+.input-prepend.input-append {
+  input,
+  select,
+  .uneditable-input {
+    .border-radius(0);
+    + .btn-group .btn {
+      .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+    }
+  }
+  .add-on:first-child,
+  .btn:first-child {
+    margin-right: -1px;
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+  .add-on:last-child,
+  .btn:last-child {
+    margin-left: -1px;
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+  }
+  .btn-group:first-child {
+    margin-left: 0;
+  }
+}
+
+
+
+
+// SEARCH FORM
+// -----------
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
+  margin-bottom: 0; // Remove the default margin on all inputs
+  .border-radius(15px);
+}
+
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  .border-radius(0); // Override due to specificity
+}
+.form-search .input-append .search-query {
+  .border-radius(14px 0 0 14px);
+}
+.form-search .input-append .btn {
+  .border-radius(0 14px 14px 0);
+}
+.form-search .input-prepend .search-query {
+  .border-radius(0 14px 14px 0);
+}
+.form-search .input-prepend .btn {
+  .border-radius(14px 0 0 14px);
+}
+
+.js-stools-field-filter {
+    .input-prepend,
+    .input-append {
+        margin-bottom: 0;
+    }
+}
+
+
+// HORIZONTAL & VERTICAL FORMS
+// ---------------------------
+
+// Common properties
+// -----------------
+
+.form-search,
+.form-inline,
+.form-horizontal {
+  input,
+  textarea,
+  select,
+  .help-inline,
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
+    display: inline-block;
+    .ie7-inline-block();
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  // Re-hide hidden elements due to specifity
+  .hide {
+    display: none;
+  }
+}
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+// Remove margin for input-prepend/-append
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+// Inline checkbox/radio labels (remove padding on left)
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+// Remove float and margin, set to inline-block
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+
+// Margin to space out fieldsets
+.control-group {
+  margin-bottom: @baseLineHeight / 2;
+}
+
+// Legend collapses margin, so next element is responsible for spacing
+legend + .control-group {
+  margin-top: @baseLineHeight;
+  -webkit-margin-top-collapse: separate;
+}
+
+// Horizontal-specific styles
+// --------------------------
+
+.form-horizontal {
+  // Increase spacing between groups
+  .control-group {
+    margin-bottom: @baseLineHeight;
+    .clearfix();
+  }
+  // Float the labels left
+  .control-label {
+    float: left;
+    width: @horizontalComponentOffset - 20;
+    padding-top: 5px;
+    text-align: right;
+  }
+  // Move over all input controls and content
+  .controls {
+    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
+    // don't inherit the margin of the parent, in this case .controls
+    *display: inline-block;
+    *padding-left: 20px;
+    margin-left: @horizontalComponentOffset;
+    *margin-left: 0;
+    &:first-child {
+      *padding-left: @horizontalComponentOffset;
+    }
+  }
+  // Remove bottom margin on block level help text since that's accounted for on .control-group
+  .help-block {
+    margin-bottom: 0;
+  }
+  // And apply it only to .help-block instances that follow a form control
+  input,
+  select,
+  textarea,
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
+    + .help-block {
+      margin-top: @baseLineHeight / 2;
+    }
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-actions {
+    padding-left: @horizontalComponentOffset;
+  }
+}
+
+/*Fix for tooltips wrong positioning*/
+.control-label .hasPopover,
+.control-label .hasTooltip {
+  display: inline-block;
+}
+
+/* Field subform repeatable */
+.subform-repeatable-wrapper{
+
+	.btn-group>.btn.button{
+		min-width: 0;
+	}
+
+	.ui-sortable-helper{
+		background: @white;
+	}
+
+	tr.ui-sortable-helper{
+		display: table;
+	}
+}
+
+/*Fix for floating 3 columns without overlapping */
+@media (min-width: 980px) and (max-width: 1215px) {
+
+  .float-cols {
+
+    .control-label {
+      float: none;
+    }
+
+    .controls {
+      margin-left: 0;
+    }
+  }
+}
diff --git a/core/media/jui/less/grid.less b/core/media/jui/less/grid.less
new file mode 100644
index 00000000..750d2035
--- /dev/null
+++ b/core/media/jui/less/grid.less
@@ -0,0 +1,21 @@
+//
+// Grid system
+// --------------------------------------------------
+
+
+// Fixed (940px)
+#grid > .core(@gridColumnWidth, @gridGutterWidth);
+
+// Fluid (940px)
+#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
+
+// Reset utility classes due to specificity
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
diff --git a/core/media/jui/less/hero-unit.less b/core/media/jui/less/hero-unit.less
new file mode 100644
index 00000000..763d86ae
--- /dev/null
+++ b/core/media/jui/less/hero-unit.less
@@ -0,0 +1,25 @@
+//
+// Hero unit
+// --------------------------------------------------
+
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: @baseLineHeight * 1.5;
+  color: @heroUnitLeadColor;
+  background-color: @heroUnitBackground;
+  .border-radius(6px);
+  h1 {
+    margin-bottom: 0;
+    font-size: 60px;
+    line-height: 1;
+    color: @heroUnitHeadingColor;
+    letter-spacing: -1px;
+  }
+  li {
+    line-height: @baseLineHeight * 1.5; // Reset since we specify in type.less
+  }
+}
diff --git a/core/media/jui/less/icomoon.less b/core/media/jui/less/icomoon.less
new file mode 100644
index 00000000..5aaf5924
--- /dev/null
+++ b/core/media/jui/less/icomoon.less
@@ -0,0 +1,754 @@
+/*
+ * Due to a bug in the compiler that doesn't handle the relative paths correctly, the @font-face stuff needs to go in the templates less files
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../fonts/IcoMoon.eot');
+	src: url('../fonts/IcoMoon.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/IcoMoon.woff') format('woff'),
+		url('../fonts/IcoMoon.ttf') format('truetype'),
+		url('../fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+*/
+
+/* Use the following CSS code if you want to use data attributes for inserting your icons */
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+
+/* From Bootstrap */
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	margin-right: .25em;
+	line-height: 14px;
+}
+
+/* Use the following CSS code if you want to have a class per icon */
+[class^="icon-"]:before, [class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+[class^="icon-"].disabled,
+[class*=" icon-"].disabled {
+	font-weight: normal;
+}
+
+.icon-joomla:before {
+	content: "\e200";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-rightarrow:before,
+.icon-arrow-right:before{
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-leftarrow:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-4:before {
+	content: "\e201";
+}
+.icon-arrow-right-4:before {
+	content: "\e202";
+}
+.icon-arrow-down-4:before {
+	content: "\e203";
+}
+.icon-arrow-left-4:before {
+	content: "\e204";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-forward-2:before {
+	content: "\e205";
+}
+.icon-backward-2:before,
+.icon-reply:before {
+	content: "\e206";
+}
+.icon-unblock:before,
+.icon-refresh:before,
+.icon-redo-2:before {
+	content: "\6c";
+}
+.icon-undo-2:before {
+	content: "\e207";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-play:before {
+	content: "\e208";
+}
+.icon-pause:before {
+	content: "\e209";
+}
+.icon-stop:before {
+	content: "\e210";
+}
+.icon-previous:before,
+.icon-backward:before {
+	content: "\7c";
+}
+.icon-next:before,
+.icon-forward:before {
+	content: "\7b";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-play-circle:before {
+	content: "\e00d";
+}
+.icon-pause-circle:before {
+	content: "\e211";
+}
+.icon-stop-circle:before {
+	content: "\e212";
+}
+.icon-backward-circle:before {
+	content: "\e213";
+}
+.icon-forward-circle:before {
+	content: "\e214";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-save-new:before,
+.icon-plus-2:before  {
+	content: "\5d";
+}
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-plus-circle:before {
+	content: "\e215";
+}
+.icon-minus:before,
+.icon-not-ok:before {
+	content: "\4b";
+}
+.icon-ban-circle:before,
+.icon-minus-circle:before {
+	content: "\e216";
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+}
+.icon-cancel-circle:before {
+	content: "\e217";
+}
+.icon-checkmark-2:before {
+	content: "\e218";
+}
+.icon-checkmark-circle:before {
+	content: "\e219";
+}
+.icon-info:before {
+	content: "\e220";
+}
+.icon-info-2:before,
+.icon-info-circle:before {
+	content: "\e221";
+}
+.icon-question:before,
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-question-2:before,
+.icon-question-circle:before {
+	content: "\e222";
+}
+.icon-notification:before {
+	content: "\e223";
+}
+.icon-notification-2:before,
+.icon-notification-circle:before {
+	content: "\e224";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+}
+.icon-warning-2:before,
+.icon-warning-circle:before {
+	content: "\e225";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before,
+.icon-checkbox-checked:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-square:before {
+	content: "\e226";
+}
+.icon-radio-unchecked:before {
+	content: "\e227";
+}
+.icon-radio-checked:before,
+.icon-generic:before {
+	content: "\e228";
+}
+.icon-circle:before {
+	content: "\e229";
+}
+.icon-signup:before {
+	content: "\e230";
+}
+.icon-grid:before,
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-2:before,
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-list-2:before {
+	content: "\e231";
+}
+.icon-menu-3:before {
+	content: "\e232";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-folder-plus:before {
+	content: "\e234";
+}
+.icon-folder-minus:before {
+	content: "\e235";
+}
+.icon-folder-3:before {
+	content: "\e236";
+}
+.icon-folder-plus-2:before {
+	content: "\e237";
+}
+.icon-folder-remove:before {
+	content: "\e238";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-2:before {
+	content: "\e239";
+}
+.icon-file-add:before,
+.icon-file-plus:before {
+	content: "\29";
+}
+.icon-file-minus:before {
+	content: "\e017";
+}
+.icon-file-check:before {
+	content: "\e240";
+}
+.icon-file-remove:before {
+	content: "\e241";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+}
+.icon-stack:before {
+	content: "\e242";
+}
+.icon-tree:before {
+	content: "\e243";
+}
+.icon-tree-2:before {
+	content: "\e244";
+}
+.icon-paragraph-left:before {
+	content: "\e246";
+}
+.icon-paragraph-center:before {
+	content: "\e247";
+}
+.icon-paragraph-right:before {
+	content: "\e248";
+}
+.icon-paragraph-justify:before {
+	content: "\e249";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-home:before {
+	content: "\21";
+}
+.icon-home-2:before {
+	content: "\e250";
+}
+.icon-out-2:before,
+.icon-new-tab:before {
+	content: "\e024";
+}
+.icon-out-3:before,
+.icon-new-tab-2:before {
+	content: "\e251";
+}
+.icon-link:before {
+	content: "\e252";
+}
+.icon-picture:before,
+.icon-image:before {
+	content: "\2f";
+}
+.icon-pictures:before,
+.icon-images:before {
+	content: "\30";
+}
+.icon-palette:before,
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-camera-2:before,
+.icon-video:before {
+	content: "\e015";
+}
+.icon-play-2:before,
+.icon-video-2:before,
+.icon-youtube:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-enter:before {
+	content: "\e257";
+}
+.icon-exit:before {
+	content: "\e258";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-quote:before,
+.icon-quotes-left:before {
+	content: "\60";
+}
+.icon-quote-2:before,
+.icon-quotes-right:before {
+	content: "\61";
+}
+.icon-quote-3:before,
+.icon-bubble-quote:before {
+	content: "\e259";
+}
+.icon-phone:before {
+	content: "\e260";
+}
+.icon-phone-2:before {
+	content: "\e261";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-envelope-opened:before,
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-tag:before {
+	content: "\e262";
+}
+.icon-tag-2:before {
+	content: "\e263";
+}
+.icon-tags:before {
+	content: "\e264";
+}
+.icon-tags-2:before {
+	content: "\e265";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-screwdriver:before,
+.icon-tools:before {
+	content: "\36";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-switch:before {
+	content: "\e266";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-unlock:before {
+	content: "\e267";
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-scissors:before {
+	content: "\e268";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-eye-close:before,
+.icon-eye-blocked:before,
+.icon-eye-2:before {
+	content: "\e269";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-broadcast:before,
+.icon-connection:before,
+.icon-wifi:before {
+	content: "\e01b";
+}
+.icon-book:before {
+	content: "\e271";
+}
+.icon-lightning:before,
+.icon-flash:before {
+	content: "\79";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-calendar-3:before {
+	content: "\e273";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-attachment:before,
+.icon-paperclip:before,
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-pin:before,
+.icon-pushpin:before {
+	content: "\73";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-shield:before {
+	content: "\e274";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-flag-3:before {
+	content: "\e275";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-bookmark-2:before {
+	content: "\e276";
+}
+.icon-heart:before {
+	content: "\e277";
+}
+.icon-heart-2:before {
+	content: "\e278";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before{
+	content: "\5c";
+}
+.icon-unfeatured:before,
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-star:before{
+	content: "\42";
+}
+.icon-smiley:before,
+.icon-smiley-happy:before {
+	content: "\e279";
+}
+.icon-smiley-2:before,
+.icon-smiley-happy-2:before {
+	content: "\e280";
+}
+.icon-smiley-sad:before {
+	content: "\e281";
+}
+.icon-smiley-sad-2:before {
+	content: "\e282";
+}
+.icon-smiley-neutral:before {
+	content: "\e283";
+}
+.icon-smiley-neutral-2:before {
+	content: "\e284";
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-credit:before {
+	content: "\e286";
+}
+.icon-credit-2:before {
+	content: "\e287";
+}
+.icon-expired:before {
+content: "\4b";
+}
diff --git a/core/media/jui/less/labels-badges.less b/core/media/jui/less/labels-badges.less
new file mode 100644
index 00000000..bc321fe5
--- /dev/null
+++ b/core/media/jui/less/labels-badges.less
@@ -0,0 +1,84 @@
+//
+// Labels and badges
+// --------------------------------------------------
+
+
+// Base classes
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: @baseFontSize * .846;
+  font-weight: bold;
+  line-height: 14px; // ensure proper line-height if floated
+  color: @white;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  background-color: @grayLight;
+}
+// Set unique padding and border-radii
+.label {
+  .border-radius(3px);
+}
+.badge {
+  padding-left: 9px;
+  padding-right: 9px;
+  .border-radius(9px);
+}
+
+// Empty labels/badges collapse
+.label,
+.badge {
+  &:empty {
+    display: none;
+  }
+}
+
+// Hover/focus state, but only for links
+a {
+  &.label:hover,
+  &.label:focus,
+  &.badge:hover,
+  &.badge:focus {
+    color: @white;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
+
+// Colors
+// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
+.label,
+.badge {
+  // Important (red)
+  &-important         { background-color: @errorText; }
+  &-important[href]   { background-color: darken(@errorText, 10%); }
+  // Warnings (orange)
+  &-warning           { background-color: @orange; }
+  &-warning[href]     { background-color: darken(@orange, 10%); }
+  // Success (green)
+  &-success           { background-color: @successText; }
+  &-success[href]     { background-color: darken(@successText, 10%); }
+  // Info (turquoise)
+  &-info              { background-color: @infoText; }
+  &-info[href]        { background-color: darken(@infoText, 10%); }
+  // Inverse (black)
+  &-inverse           { background-color: @grayDark; }
+  &-inverse[href]     { background-color: darken(@grayDark, 10%); }
+}
+
+// Quick fix for labels/badges in buttons
+.btn {
+  .label,
+  .badge {
+    position: relative;
+    top: -1px;
+  }
+}
+.btn-mini {
+  .label,
+  .badge {
+    top: 0;
+  }
+}
diff --git a/core/media/jui/less/layouts.less b/core/media/jui/less/layouts.less
new file mode 100644
index 00000000..24a20621
--- /dev/null
+++ b/core/media/jui/less/layouts.less
@@ -0,0 +1,16 @@
+//
+// Layouts
+// --------------------------------------------------
+
+
+// Container (centered, fixed-width layouts)
+.container {
+  .container-fixed();
+}
+
+// Fluid layouts (left aligned, with sidebar, min- & max-width content)
+.container-fluid {
+  padding-right: @gridGutterWidth;
+  padding-left: @gridGutterWidth;
+  .clearfix();
+}
\ No newline at end of file
diff --git a/core/media/jui/less/media.less b/core/media/jui/less/media.less
new file mode 100644
index 00000000..e461e446
--- /dev/null
+++ b/core/media/jui/less/media.less
@@ -0,0 +1,55 @@
+// Media objects
+// Source: http://stubbornella.org/content/?p=497
+// --------------------------------------------------
+
+
+// Common styles
+// -------------------------
+
+// Clear the floats
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+// Proper spacing between instances of .media
+.media,
+.media .media {
+  margin-top: 15px;
+}
+.media:first-child {
+  margin-top: 0;
+}
+
+// For images and videos, set to block
+.media-object {
+  display: block;
+}
+
+// Reset margins on headings for tighter default spacing
+.media-heading {
+  margin: 0 0 5px;
+}
+
+
+// Media image alignment
+// -------------------------
+
+.media > .pull-left {
+  margin-right: 10px;
+}
+.media > .pull-right {
+  margin-left: 10px;
+}
+
+
+// Media list variation
+// -------------------------
+
+// Undo default ul/ol styles
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
diff --git a/core/media/jui/less/mixins.less b/core/media/jui/less/mixins.less
new file mode 100644
index 00000000..602cb31a
--- /dev/null
+++ b/core/media/jui/less/mixins.less
@@ -0,0 +1,707 @@
+//
+// Mixins
+// --------------------------------------------------
+
+
+// UTILITY MIXINS
+// --------------------------------------------------
+
+// Clearfix
+// --------
+// For clearing floats like a boss h5bp.com/q
+.clearfix {
+  *zoom: 1;
+  &:before,
+  &:after {
+    display: table;
+    content: "";
+    // Fixes Opera/contenteditable bug:
+    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
+    line-height: 0;
+  }
+  &:after {
+    clear: both;
+  }
+}
+
+// Webkit-style focus
+// ------------------
+.tab-focus() {
+  // Default
+  outline: thin dotted #333;
+  // Webkit
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+// Center-align a block level element
+// ----------------------------------
+.center-block() {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+// IE7 inline-block
+// ----------------
+.ie7-inline-block() {
+  *display: inline; /* IE7 inline-block hack */
+  *zoom: 1;
+}
+
+// IE7 likes to collapse whitespace on either side of the inline-block elements.
+// Ems because we're attempting to match the width of a space character. Left
+// version is for form buttons, which typically come after other elements, and
+// right version is for icons, which come before. Applying both is ok, but it will
+// mean that space between those elements will be .6em (~2 space characters) in IE7,
+// instead of the 1 space in other browsers.
+.ie7-restore-left-whitespace() {
+  *margin-left: .3em;
+
+  &:first-child {
+    *margin-left: 0;
+  }
+}
+
+.ie7-restore-right-whitespace() {
+  *margin-right: .3em;
+}
+
+// Sizing shortcuts
+// -------------------------
+.size(@height, @width) {
+  width: @width;
+  height: @height;
+}
+.square(@size) {
+  .size(@size, @size);
+}
+
+// Placeholder text
+// -------------------------
+.placeholder(@color: @placeholderText) {
+  &:-moz-placeholder {
+    color: @color;
+  }
+  &:-ms-input-placeholder {
+    color: @color;
+  }
+  &::-webkit-input-placeholder {
+    color: @color;
+  }
+}
+
+// Text overflow
+// -------------------------
+// Requires inline-block or block for proper styling
+.text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+// CSS image replacement
+// -------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+
+// FONTS
+// --------------------------------------------------
+
+#font {
+  #family {
+    .serif() {
+      font-family: @serifFontFamily;
+    }
+    .sans-serif() {
+      font-family: @sansFontFamily;
+    }
+    .monospace() {
+      font-family: @monoFontFamily;
+    }
+  }
+  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .sans-serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .monospace;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+}
+
+
+// FORMS
+// --------------------------------------------------
+
+// Block level inputs
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: @inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
+  .box-sizing(border-box); // Makes inputs behave like true block-level elements
+}
+
+
+
+// Mixin for form field states
+.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+  // Set the text color
+  .control-label,
+  .help-block,
+  .help-inline {
+    color: @textColor;
+  }
+  // Style inputs accordingly
+  .checkbox,
+  .radio,
+  input,
+  select,
+  textarea {
+    color: @textColor;
+  }
+  input,
+  select,
+  textarea {
+    border-color: @borderColor;
+    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    &:focus {
+      border-color: darken(@borderColor, 10%);
+      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+      .box-shadow(@shadow);
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: @textColor;
+    background-color: @backgroundColor;
+    border-color: @textColor;
+  }
+}
+
+
+
+// CSS3 PROPERTIES
+// --------------------------------------------------
+
+// Border Radius
+.border-radius(@radius) {
+  -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
+}
+
+// Single Corner Border Radius
+.border-top-left-radius(@radius) {
+  -webkit-border-top-left-radius: @radius;
+      -moz-border-radius-topleft: @radius;
+          border-top-left-radius: @radius;
+}
+.border-top-right-radius(@radius) {
+  -webkit-border-top-right-radius: @radius;
+      -moz-border-radius-topright: @radius;
+          border-top-right-radius: @radius;
+}
+.border-bottom-right-radius(@radius) {
+  -webkit-border-bottom-right-radius: @radius;
+      -moz-border-radius-bottomright: @radius;
+          border-bottom-right-radius: @radius;
+}
+.border-bottom-left-radius(@radius) {
+  -webkit-border-bottom-left-radius: @radius;
+      -moz-border-radius-bottomleft: @radius;
+          border-bottom-left-radius: @radius;
+}
+
+// Single Side Border Radius
+.border-top-radius(@radius) {
+  .border-top-right-radius(@radius);
+  .border-top-left-radius(@radius);
+}
+.border-right-radius(@radius) {
+  .border-top-right-radius(@radius);
+  .border-bottom-right-radius(@radius);
+}
+.border-bottom-radius(@radius) {
+  .border-bottom-right-radius(@radius);
+  .border-bottom-left-radius(@radius);
+}
+.border-left-radius(@radius) {
+  .border-top-left-radius(@radius);
+  .border-bottom-left-radius(@radius);
+}
+
+// Drop shadows
+.box-shadow(@shadow) {
+  -webkit-box-shadow: @shadow;
+     -moz-box-shadow: @shadow;
+          box-shadow: @shadow;
+}
+
+// Transitions
+.transition(@transition) {
+  -webkit-transition: @transition;
+     -moz-transition: @transition;
+       -o-transition: @transition;
+          transition: @transition;
+}
+.transition-delay(@transition-delay) {
+  -webkit-transition-delay: @transition-delay;
+     -moz-transition-delay: @transition-delay;
+       -o-transition-delay: @transition-delay;
+          transition-delay: @transition-delay;
+}
+.transition-duration(@transition-duration) {
+  -webkit-transition-duration: @transition-duration;
+     -moz-transition-duration: @transition-duration;
+       -o-transition-duration: @transition-duration;
+          transition-duration: @transition-duration;
+}
+
+// Transformations
+.rotate(@degrees) {
+  -webkit-transform: rotate(@degrees);
+     -moz-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+       -o-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+.scale(@ratio) {
+  -webkit-transform: scale(@ratio);
+     -moz-transform: scale(@ratio);
+      -ms-transform: scale(@ratio);
+       -o-transform: scale(@ratio);
+          transform: scale(@ratio);
+}
+.translate(@x, @y) {
+  -webkit-transform: translate(@x, @y);
+     -moz-transform: translate(@x, @y);
+      -ms-transform: translate(@x, @y);
+       -o-transform: translate(@x, @y);
+          transform: translate(@x, @y);
+}
+.skew(@x, @y) {
+  -webkit-transform: skew(@x, @y);
+     -moz-transform: skew(@x, @y);
+      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
+       -o-transform: skew(@x, @y);
+          transform: skew(@x, @y);
+  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
+}
+.translate3d(@x, @y, @z) {
+  -webkit-transform: translate3d(@x, @y, @z);
+     -moz-transform: translate3d(@x, @y, @z);
+       -o-transform: translate3d(@x, @y, @z);
+          transform: translate3d(@x, @y, @z);
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden
+// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
+.backface-visibility(@visibility){
+	-webkit-backface-visibility: @visibility;
+	   -moz-backface-visibility: @visibility;
+	        backface-visibility: @visibility;
+}
+
+// Background clipping
+// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
+.background-clip(@clip) {
+  -webkit-background-clip: @clip;
+     -moz-background-clip: @clip;
+          background-clip: @clip;
+}
+
+// Background sizing
+.background-size(@size) {
+  -webkit-background-size: @size;
+     -moz-background-size: @size;
+       -o-background-size: @size;
+          background-size: @size;
+}
+
+
+// Box sizing
+.box-sizing(@boxmodel) {
+  -webkit-box-sizing: @boxmodel;
+     -moz-box-sizing: @boxmodel;
+          box-sizing: @boxmodel;
+}
+
+// User select
+// For selecting text on the page
+.user-select(@select) {
+  -webkit-user-select: @select;
+     -moz-user-select: @select;
+      -ms-user-select: @select;
+       -o-user-select: @select;
+          user-select: @select;
+}
+
+// Resize anything
+.resizable(@direction) {
+  resize: @direction; // Options: horizontal, vertical, both
+  overflow: auto; // Safari fix
+}
+
+// CSS3 Content Columns
+.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
+  -webkit-column-count: @columnCount;
+     -moz-column-count: @columnCount;
+          column-count: @columnCount;
+  -webkit-column-gap: @columnGap;
+     -moz-column-gap: @columnGap;
+          column-gap: @columnGap;
+}
+
+// Optional hyphenation
+.hyphens(@mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: @mode;
+     -moz-hyphens: @mode;
+      -ms-hyphens: @mode;
+       -o-hyphens: @mode;
+          hyphens: @mode;
+}
+
+// Opacity
+.opacity(@opacity) {
+  opacity: @opacity / 100;
+  filter: ~"alpha(opacity=@{opacity})";
+}
+
+
+
+// BACKGROUNDS
+// --------------------------------------------------
+
+// Add an alphatransparency value to any background or border color (via Elyse Holladay)
+#translucent {
+  .background(@color: @white, @alpha: 1) {
+    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+  }
+  .border(@color: @white, @alpha: 1) {
+    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+    .background-clip(padding-box);
+  }
+}
+
+// Gradient Bar Colors for buttons and alerts
+.gradientBar(@primaryColor, @secondaryColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
+  color: @textColor;
+  text-shadow: @textShadow;
+  #gradient > .vertical(@primaryColor, @secondaryColor);
+  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
+  // No idea why this is here, as it makes the border grey instead of the given colors
+  // border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+}
+
+// Gradients
+#gradient {
+  .horizontal(@startColor: #555, @endColor: #333) {
+    background-color: @endColor;
+    background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down
+  }
+  .vertical(@startColor: #555, @endColor: #333) {
+    background-color: mix(@startColor, @endColor, 60%);
+    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
+  }
+  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
+    background-color: @endColor;
+    background-repeat: repeat-x;
+    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
+    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
+  }
+  .horizontal-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
+    background-color: mix(@midColor, @endColor, 80%);
+    background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
+    background-image: -webkit-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
+    background-image: -o-linear-gradient(left, @startColor, @midColor @colorStop, @endColor);
+    background-image: linear-gradient(to right, @startColor, @midColor @colorStop, @endColor);
+    background-repeat: no-repeat;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
+  }
+
+  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
+    background-color: mix(@midColor, @endColor, 80%);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
+    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
+    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-repeat: no-repeat;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback
+  }
+  .radial(@innerColor: #555, @outerColor: #333) {
+    background-color: @outerColor;
+    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
+    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
+    // > Joomla JUI
+    /* Joomla JUI NOTE: makes radial gradient IE 10+, also confirmed in Bootstrap, https://github.com/twbs/bootstrap/issues/7462 */
+    background-image: radial-gradient(circle, @innerColor, @outerColor);
+    // < Joomla JUI
+    background-repeat: no-repeat;
+  }
+  .striped(@color: #555, @angle: 45deg) {
+    background-color: @color;
+    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
+    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+  }
+}
+// Reset filters for IE
+.reset-filter() {
+  filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
+}
+
+
+
+// COMPONENT MIXINS
+// --------------------------------------------------
+
+// Horizontal dividers
+// -------------------------
+// Dividers (basically an hr) within dropdowns and nav lists
+.nav-divider(@top: #e5e5e5, @bottom: @white) {
+  // IE7 needs a set width since we gave a height. Restricting just
+  // to IE7 to keep the 1px left/right space in other browsers.
+  // It is unclear where IE is getting the extra space that we need
+  // to negative-margin away, but so it goes.
+  *width: 100%;
+  height: 1px;
+  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: @top;
+  border-bottom: 1px solid @bottom;
+}
+
+// Button backgrounds
+// ------------------
+.buttonBackground(@startColor, @endColor, @textColor: #fff, @textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
+  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+  .gradientBar(@startColor, @endColor, @textColor, @textShadow);
+  *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+  .reset-filter();
+
+  // in these cases the gradient won't cover the background, so we override
+  &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
+    color: @textColor;
+    background-color: @endColor;
+    *background-color: darken(@endColor, 5%);
+  }
+
+  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+  &:active,
+  &.active {
+    background-color: darken(@endColor, 10%) e("\9");
+  }
+}
+
+// Navbar vertical align
+// -------------------------
+// Vertically center elements in the navbar.
+// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
+.navbarVerticalAlign(@elementHeight) {
+  margin-top: (@navbarHeight - @elementHeight) / 2;
+}
+
+
+
+// Grid System
+// -----------
+
+// Centered container element
+.container-fixed() {
+  margin-right: auto;
+  margin-left: auto;
+  .clearfix();
+}
+
+// Table columns
+.tableColumns(@columnSpan: 1) {
+  float: none; // undo default grid column styles
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
+  margin-left: 0; // undo default grid column styles
+}
+
+// Make a Grid
+// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
+.makeRow() {
+  margin-left: @gridGutterWidth * -1;
+  .clearfix();
+}
+.makeColumn(@columns: 1, @offset: 0) {
+  float: left;
+  margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2);
+  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+}
+
+// The Grid
+#grid {
+
+  .core (@gridColumnWidth, @gridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      .span@{index} { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .offsetX (@index) when (@index > 0) {
+      .offset@{index} { .offset(@index); }
+      .offsetX(@index - 1);
+    }
+    .offsetX (0) {}
+
+    .offset (@columns) {
+      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
+    }
+
+    .span (@columns) {
+      width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+    }
+
+    .row {
+      margin-left: @gridGutterWidth * -1;
+      .clearfix();
+    }
+
+    [class*="span"] {
+      float: left;
+      min-height: 1px; // prevent collapsing columns
+      margin-left: @gridGutterWidth;
+    }
+
+    // Set the container width, and override it for fixed navbars in media queries
+    .container,
+    .navbar-static-top .container,
+    .navbar-fixed-top .container,
+    .navbar-fixed-bottom .container { .span(@gridColumns); }
+
+    // generate .spanX and .offsetX
+    .spanX (@gridColumns);
+    .offsetX (@gridColumns);
+
+  }
+
+  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      .span@{index} { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .offsetX (@index) when (@index > 0) {
+      .offset@{index} { .offset(@index); }
+      .offset@{index}:first-child { .offsetFirstChild(@index); }
+      .offsetX(@index - 1);
+    }
+    .offsetX (0) {}
+
+    .offset (@columns) {
+      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
+  	  *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .offsetFirstChild (@columns) {
+      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth);
+      *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .span (@columns) {
+      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
+      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .row-fluid {
+      width: 100%;
+      .clearfix();
+      [class*="span"] {
+        .input-block-level();
+        float: left;
+        margin-left: @fluidGridGutterWidth;
+        *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+      }
+      [class*="span"]:first-child {
+        margin-left: 0;
+      }
+
+      // Space grid-sized controls properly if multiple per line
+      .controls-row [class*="span"] + [class*="span"] {
+        margin-left: @fluidGridGutterWidth;
+      }
+
+      // generate .spanX and .offsetX
+      .spanX (@gridColumns);
+      .offsetX (@gridColumns);
+    }
+
+  }
+
+  .input(@gridColumnWidth, @gridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .span(@columns) {
+      width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14;
+    }
+
+    input,
+    textarea,
+    .uneditable-input {
+      margin-left: 0; // override margin-left from core grid system
+    }
+
+    // Space grid-sized controls properly if multiple per line
+    .controls-row [class*="span"] + [class*="span"] {
+      margin-left: @gridGutterWidth;
+    }
+
+    // generate .spanX
+    .spanX (@gridColumns);
+
+  }
+}
diff --git a/core/media/jui/less/modals.joomla.less b/core/media/jui/less/modals.joomla.less
new file mode 100644
index 00000000..2bb5298c
--- /dev/null
+++ b/core/media/jui/less/modals.joomla.less
@@ -0,0 +1,65 @@
+//
+// Modals
+// --------------------------------------------------
+
+/* Joomla JUI NOTE: Original .modal definition has to be commented */
+
+// > Joomla JUI
+// Base modal
+div.modal {
+  position: fixed;
+  top: 5%;
+  left: 50%;
+  z-index: @zindexModal;
+  width: 80%;
+  margin-left: -40%;
+  background-color: @white;
+  border: 1px solid #999;
+  border: 1px solid rgba(0,0,0,.3);
+  *border: 1px solid #999; /* IE6-7 */
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  .background-clip(padding-box);
+  // Remove focus outline from opened modal
+  outline: none;
+
+  &.fade {
+    .transition(e('opacity .3s linear, top .3s ease-out'));
+    top: -25%;
+  }
+  &.fade.in { top: 5%; }
+}
+//Modal for Batch views
+.modal-batch {
+  overflow-y: visible;
+}
+// Modal viewport dimensions
+.modal-body[class^="jviewport-height"],
+.modal-body[class*="jviewport-height"] {
+  max-height: none;
+}
+.jviewport-height {
+  &10 { height: 10vh; }
+  &20 { height: 20vh; }
+  &30 { height: 30vh; }
+  &40 { height: 40vh; }
+  &50 { height: 50vh; }
+  &60 { height: 60vh; }
+  &70 { height: 70vh; }
+  &80 { height: 80vh; }
+  &90 { height: 90vh; }
+  &100 { height: 100vh; }
+}
+div.modal.jviewport-width {
+  &10 { width: 10vw; margin-left: -5vw; }
+  &20 { width: 20vw; margin-left: -10vw; }
+  &30 { width: 30vw; margin-left: -15vw; }
+  &40 { width: 40vw; margin-left: -20vw; }
+  &50 { width: 50vw; margin-left: -25vw; }
+  &60 { width: 60vw; margin-left: -30vw; }
+  &70 { width: 70vw; margin-left: -35vw; }
+  &80 { width: 80vw; margin-left: -40vw; }
+  &90 { width: 90vw; margin-left: -45vw; }
+  &100 { width: 100vw; margin-left: -50vw; }
+}
+// < Joomla JUI
diff --git a/core/media/jui/less/modals.less b/core/media/jui/less/modals.less
new file mode 100644
index 00000000..0932e0c8
--- /dev/null
+++ b/core/media/jui/less/modals.less
@@ -0,0 +1,82 @@
+//
+// Modals
+// --------------------------------------------------
+
+// Background
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: @zindexModalBackdrop;
+  background-color: @black;
+  // Fade for backdrop
+  &.fade { opacity: 0; }
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  .opacity(80);
+}
+
+// Base modal
+// > Joomla JUI
+// .modal REMOVED
+// < Joomla JUI
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+  // Close icon
+  .close { margin-top: 2px; }
+  // Heading
+  h3 {
+    margin: 0;
+    line-height: 30px;
+  }
+}
+
+// Body (where all modal content resides)
+.modal-body {
+  width: 98%;
+  position: relative;
+  max-height: 400px;
+  padding: 1%;
+}
+// Remove border and scrollbar from iframe modal
+.modal-body iframe {
+  width: 100%;
+  max-height: none;
+  border: 0 !important;
+}
+// Remove bottom margin if need be
+.modal-form {
+  margin-bottom: 0;
+}
+
+// Footer (for actions)
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right; // right align buttons
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  .border-radius(0 0 6px 6px);
+  .box-shadow(inset 0 1px 0 @white);
+  .clearfix(); // clear it in case folks use .pull-* classes on buttons
+
+  // Properly space out buttons
+  .btn + .btn {
+    margin-left: 5px;
+    margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
+  }
+  // but override that for button groups
+  .btn-group .btn + .btn {
+    margin-left: -1px;
+  }
+  // and override it for block buttons as well
+  .btn-block + .btn-block {
+    margin-left: 0;
+  }
+}
diff --git a/core/media/jui/less/navbar.less b/core/media/jui/less/navbar.less
new file mode 100644
index 00000000..e9800ad6
--- /dev/null
+++ b/core/media/jui/less/navbar.less
@@ -0,0 +1,502 @@
+//
+// Navbars (Redux)
+// --------------------------------------------------
+
+
+// COMMON STYLES
+// -------------
+
+// Base class and wrapper
+.navbar {
+  overflow: visible;
+  margin-bottom: @baseLineHeight;
+
+  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
+  *position: relative;
+  *z-index: 2;
+}
+
+// Inner for background effects
+// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
+.navbar-inner {
+  min-height: @navbarHeight;
+  padding-left:  20px;
+  padding-right: 20px;
+  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+  border: 1px solid @navbarBorder;
+  .border-radius(@baseBorderRadius);
+  .box-shadow(0 1px 4px rgba(0,0,0,.065));
+
+  // Prevent floats from breaking the navbar
+  .clearfix();
+}
+
+// Set width to auto for default container
+// We then reset it for fixed navbars in the #gridSystem mixin
+.navbar .container {
+  width: auto;
+}
+
+// Override the default collapsed state
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+
+
+// Brand: website or project name
+// -------------------------
+.navbar .brand {
+  float: left;
+  display: block;
+  // Vertically center the text given @navbarHeight
+  padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2);
+  margin-left: -20px; // negative indent to left-align the text down the page
+  font-size: 20px;
+  font-weight: 200;
+  color: @navbarBrandColor;
+  text-shadow: 0 1px 0 @navbarBackgroundHighlight;
+  &:hover,
+  &:focus {
+    text-decoration: none;
+  }
+}
+
+// Plain text in topbar
+// -------------------------
+.navbar-text {
+  margin-bottom: 0;
+  line-height: @navbarHeight;
+  color: @navbarText;
+}
+
+// Janky solution for now to account for links outside the .nav
+// -------------------------
+.navbar-link {
+  color: @navbarLinkColor;
+  &:hover,
+  &:focus {
+    color: @navbarLinkColorHover;
+  }
+}
+
+// Dividers in navbar
+// -------------------------
+.navbar .divider-vertical {
+  height: @navbarHeight;
+  margin: 0 9px;
+  border-left: 1px solid @navbarBackground;
+  border-right: 1px solid @navbarBackgroundHighlight;
+}
+
+// Buttons in navbar
+// -------------------------
+.navbar .btn,
+.navbar .btn-group {
+  .navbarVerticalAlign(30px); // Vertically center in navbar
+}
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0; // then undo the margin here so we don't accidentally double it
+}
+
+// Navbar forms
+// -------------------------
+.navbar-form {
+  margin-bottom: 0; // remove default bottom margin
+  .clearfix();
+  input,
+  select,
+  .radio,
+  .checkbox {
+    .navbarVerticalAlign(30px); // Vertically center in navbar
+  }
+  input,
+  select,
+  .btn {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+  input[type="image"],
+  input[type="checkbox"],
+  input[type="radio"] {
+    margin-top: 3px;
+  }
+  .input-append,
+  .input-prepend {
+    margin-top: 5px;
+    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0; // remove the margin on top since it's on the parent
+    }
+  }
+}
+
+// Navbar search
+// -------------------------
+.navbar-search {
+  position: relative;
+  float: left;
+  .navbarVerticalAlign(30px); // Vertically center in navbar
+  margin-bottom: 0;
+  .search-query {
+    margin-bottom: 0;
+    padding: 4px 14px;
+    #font > .sans-serif(13px, normal, 1);
+    .border-radius(15px); // redeclare because of specificity of the type attribute
+  }
+}
+
+
+
+// Static navbar
+// -------------------------
+
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0; // remove 18px margin for default navbar
+  .navbar-inner {
+    .border-radius(0);
+  }
+}
+
+
+
+// Fixed navbar
+// -------------------------
+
+// Shared (top/bottom) styles
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: @zindexFixedNavbar;
+  margin-bottom: 0; // remove 18px margin for default navbar
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-left:  0;
+  padding-right: 0;
+  .border-radius(0);
+}
+
+// Reset container width
+// Required here as we reset the width earlier on and the grid mixins don't override early enough
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  #grid > .core > .span(@gridColumns);
+}
+
+// Fixed to top
+.navbar-fixed-top {
+  top: 0;
+}
+.navbar-fixed-top,
+.navbar-static-top {
+  .navbar-inner {
+    .box-shadow(~"0 1px 10px rgba(0,0,0,.1)");
+  }
+}
+
+// Fixed to bottom
+.navbar-fixed-bottom {
+  bottom: 0;
+  .navbar-inner {
+    .box-shadow(~"0 -1px 10px rgba(0,0,0,.1)");
+  }
+}
+
+
+
+// NAVIGATION
+// ----------
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right; // redeclare due to specificity
+  margin-right: 0; // remove margin on float right nav
+}
+.navbar .nav > li {
+  float: left;
+}
+
+// Links
+.navbar .nav > li > a {
+  float: none;
+  // Vertically center the text given @navbarHeight
+  padding: ((@navbarHeight - @baseLineHeight) / 2) 15px ((@navbarHeight - @baseLineHeight) / 2);
+  color: @navbarLinkColor;
+  text-decoration: none;
+  text-shadow: 0 1px 0 @navbarBackgroundHighlight;
+}
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+// Hover/focus
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
+  color: @navbarLinkColorHover;
+  text-decoration: none;
+}
+
+// a11y improvement
+.navbar .nav > li > a:focus {
+    outline: 2px solid rgb(94, 158, 214);
+}
+
+// Active nav items
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: @navbarLinkColorActive;
+  text-decoration: none;
+  background-color: @navbarLinkBackgroundActive;
+  .box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
+}
+
+// Navbar button for toggling navbar items in responsive layouts
+// These definitions need to come after '.navbar .btn'
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  .buttonBackground(darken(@navbarBackgroundHighlight, 5%), darken(@navbarBackground, 5%));
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
+}
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  .border-radius(1px);
+  .box-shadow(0 1px 0 rgba(0,0,0,.25));
+}
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+
+
+// Dropdown menus
+// --------------
+
+// Menu position and menu carets
+.navbar .nav > li > .dropdown-menu {
+  &:before {
+    content: '';
+    display: inline-block;
+    border-left:   7px solid transparent;
+    border-right:  7px solid transparent;
+    border-bottom: 7px solid #ccc;
+    border-bottom-color: @dropdownBorder;
+    position: absolute;
+    top: -7px;
+    left: 9px;
+  }
+  &:after {
+    content: '';
+    display: inline-block;
+    border-left:   6px solid transparent;
+    border-right:  6px solid transparent;
+    border-bottom: 6px solid @dropdownBackground;
+    position: absolute;
+    top: -6px;
+    left: 10px;
+  }
+}
+// Menu position and menu caret support for dropups via extra dropup class
+.navbar-fixed-bottom .nav > li > .dropdown-menu {
+  &:before {
+    border-top: 7px solid #ccc;
+    border-top-color: @dropdownBorder;
+    border-bottom: 0;
+    bottom: -7px;
+    top: auto;
+  }
+  &:after {
+    border-top: 6px solid @dropdownBackground;
+    border-bottom: 0;
+    bottom: -6px;
+    top: auto;
+  }
+}
+
+// Caret should match text color on hover/focus
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: @navbarLinkColorHover;
+  border-bottom-color: @navbarLinkColorHover;
+}
+
+// Remove background color from open dropdown
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  background-color: @navbarLinkBackgroundActive;
+  color: @navbarLinkColorActive;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: @navbarLinkColor;
+  border-bottom-color: @navbarLinkColor;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: @navbarLinkColorActive;
+  border-bottom-color: @navbarLinkColorActive;
+}
+
+// Right aligned menus need alt position
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  left: auto;
+  right: 0;
+  &:before {
+    left: auto;
+    right: 12px;
+  }
+  &:after {
+    left: auto;
+    right: 13px;
+  }
+  .dropdown-menu {
+    left: auto;
+    right: 100%;
+    margin-left: 0;
+    margin-right: -1px;
+    .border-radius(6px 0 6px 6px);
+  }
+}
+
+
+// Inverted navbar
+// -------------------------
+
+.navbar-inverse {
+
+  .navbar-inner {
+    #gradient > .vertical(@navbarInverseBackgroundHighlight, @navbarInverseBackground);
+    border-color: @navbarInverseBorder;
+  }
+
+  .brand,
+  .nav > li > a {
+    color: @navbarInverseLinkColor;
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+    &:hover,
+    &:focus {
+      color: @navbarInverseLinkColorHover;
+    }
+  }
+
+  .brand {
+    color: @navbarInverseBrandColor;
+  }
+
+  .navbar-text {
+    color: @navbarInverseText;
+  }
+
+  .nav > li > a:focus,
+  .nav > li > a:hover {
+    background-color: @navbarInverseLinkBackgroundHover;
+    color: @navbarInverseLinkColorHover;
+  }
+
+  .nav .active > a,
+  .nav .active > a:hover,
+  .nav .active > a:focus {
+    color: @navbarInverseLinkColorActive;
+    background-color: @navbarInverseLinkBackgroundActive;
+  }
+
+  // Inline text links
+  .navbar-link {
+    color: @navbarInverseLinkColor;
+    &:hover,
+    &:focus {
+      color: @navbarInverseLinkColorHover;
+    }
+  }
+
+  // Dividers in navbar
+  .divider-vertical {
+    border-left-color: @navbarInverseBackground;
+    border-right-color: @navbarInverseBackgroundHighlight;
+  }
+
+  // Dropdowns
+  .nav li.dropdown.open > .dropdown-toggle,
+  .nav li.dropdown.active > .dropdown-toggle,
+  .nav li.dropdown.open.active > .dropdown-toggle {
+    background-color: @navbarInverseLinkBackgroundActive;
+    color: @navbarInverseLinkColorActive;
+  }
+  .nav li.dropdown > a:hover .caret,
+  .nav li.dropdown > a:focus .caret {
+    border-top-color: @navbarInverseLinkColorActive;
+    border-bottom-color: @navbarInverseLinkColorActive;
+  }
+  .nav li.dropdown > .dropdown-toggle .caret {
+    border-top-color: @navbarInverseLinkColor;
+    border-bottom-color: @navbarInverseLinkColor;
+  }
+  .nav li.dropdown.open > .dropdown-toggle .caret,
+  .nav li.dropdown.active > .dropdown-toggle .caret,
+  .nav li.dropdown.open.active > .dropdown-toggle .caret {
+    border-top-color: @navbarInverseLinkColorActive;
+    border-bottom-color: @navbarInverseLinkColorActive;
+  }
+
+  // Navbar search
+  .navbar-search {
+    .search-query {
+      color: @white;
+      background-color: @navbarInverseSearchBackground;
+      border-color: @navbarInverseSearchBorder;
+      .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
+      .transition(none);
+      .placeholder(@navbarInverseSearchPlaceholderColor);
+
+      // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
+      &:focus,
+      &.focused {
+        padding: 5px 15px;
+        color: @grayDark;
+        text-shadow: 0 1px 0 @white;
+        background-color: @navbarInverseSearchBackgroundFocus;
+        border: 0;
+        .box-shadow(0 0 3px rgba(0,0,0,.15));
+        outline: 0;
+      }
+    }
+  }
+
+  // Navbar collapse button
+  .btn-navbar {
+    .buttonBackground(darken(@navbarInverseBackgroundHighlight, 5%), darken(@navbarInverseBackground, 5%));
+  }
+
+}
diff --git a/core/media/jui/less/navs.less b/core/media/jui/less/navs.less
new file mode 100644
index 00000000..01cd805b
--- /dev/null
+++ b/core/media/jui/less/navs.less
@@ -0,0 +1,409 @@
+//
+// Navs
+// --------------------------------------------------
+
+
+// BASE CLASS
+// ----------
+
+.nav {
+  margin-left: 0;
+  margin-bottom: @baseLineHeight;
+  list-style: none;
+}
+
+// Make links block level
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: @grayLighter;
+}
+
+// Prevent IE8 from misplacing imgs
+// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
+.nav > li > a > img {
+  max-width: none;
+}
+
+// Redeclare pull classes because of specifity
+.nav > .pull-right {
+  float: right;
+}
+
+// Nav headers (for dropdowns and lists)
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @grayLight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  text-transform: uppercase;
+}
+// Space them out when they follow another list item (link)
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+
+
+// NAV LIST
+// --------
+
+.nav-list {
+  padding-left: 15px;
+  padding-right: 15px;
+  margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-left:  -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+}
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: @white;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+  background-color: @linkColor;
+}
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+// Dividers (basically an hr) within the dropdown
+.nav-list .divider {
+  .nav-divider();
+}
+
+
+
+// TABS AND PILLS
+// -------------
+
+// Common styles
+.nav-tabs,
+.nav-pills {
+  .clearfix();
+}
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px; // keeps the overall height an even number
+}
+
+// TABS
+// ----
+
+// Give the tabs something to sit on
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+// Make the list-items overlay the bottom border
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+// Actual tabs (as links)
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: @baseLineHeight;
+  border: 1px solid transparent;
+  .border-radius(4px 4px 0 0);
+  &:hover,
+  &:focus {
+    border-color: @grayLighter @grayLighter #ddd;
+  }
+}
+// Active state, and it's :hover/:focus to override normal :hover/:focus
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: @gray;
+  background-color: @bodyBackground;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+
+
+// PILLS
+// -----
+
+// Links rendered as pills
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  .border-radius(5px);
+}
+
+// Active state
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: @white;
+  background-color: @linkColor;
+}
+
+
+
+// STACKED NAV
+// -----------
+
+// Stacked tabs and pills
+.nav-stacked > li {
+  float: none;
+}
+.nav-stacked > li > a {
+  margin-right: 0; // no need for the gap between nav items
+}
+
+// Tabs
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  .border-radius(0);
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+  .border-top-radius(4px);
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+  .border-bottom-radius(4px);
+}
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  border-color: #ddd;
+  z-index: 2;
+}
+
+// Pills
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
+}
+
+
+
+// DROPDOWNS
+// ---------
+
+.nav-tabs .dropdown-menu {
+  .border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
+}
+.nav-pills .dropdown-menu {
+  .border-radius(6px); // make rounded corners match the pills
+}
+
+// Default dropdown links
+// -------------------------
+// Make carets use linkColor to start
+.nav .dropdown-toggle .caret {
+  border-top-color: @linkColor;
+  border-bottom-color: @linkColor;
+  margin-top: 6px;
+}
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: @linkColorHover;
+  border-bottom-color: @linkColorHover;
+}
+/* move down carets for tabs */
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+// Active dropdown links
+// -------------------------
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: @gray;
+  border-bottom-color: @gray;
+}
+
+// Active:hover/:focus dropdown links
+// -------------------------
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+
+// Open dropdowns
+// -------------------------
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: @white;
+  background-color: @grayLight;
+  border-color: @grayLight;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: @white;
+  border-bottom-color: @white;
+  .opacity(100);
+}
+
+// Dropdowns in stacked tabs
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: @grayLight;
+}
+
+
+
+// TABBABLE
+// --------
+
+
+// COMMON STYLES
+// -------------
+
+// Clear any floats
+.tabbable {
+  .clearfix();
+}
+.tab-content {
+  overflow: auto; // prevent content from running below tabs
+}
+
+// Remove border on bottom, left, right
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+// Show/hide tabbable areas
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+
+// BOTTOM
+// ------
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+  .border-radius(0 0 4px 4px);
+  &:hover,
+  &:focus {
+    border-bottom-color: transparent;
+    border-top-color: #ddd;
+  }
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+// LEFT & RIGHT
+// ------------
+
+// Common styles
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+// Tabs on the left
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  .border-radius(4px 0 0 4px);
+}
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: @grayLighter #ddd @grayLighter @grayLighter;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: @white;
+}
+
+// Tabs on the right
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  .border-radius(0 4px 4px 0);
+}
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: @grayLighter @grayLighter @grayLighter #ddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: @white;
+}
+
+
+
+// DISABLED STATES
+// ---------------
+
+// Gray out text
+.nav > .disabled > a {
+  color: @grayLight;
+}
+// Nuke hover/focus effects
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  background-color: transparent;
+  cursor: default;
+}
diff --git a/core/media/jui/less/pager.less b/core/media/jui/less/pager.less
new file mode 100644
index 00000000..14761882
--- /dev/null
+++ b/core/media/jui/less/pager.less
@@ -0,0 +1,43 @@
+//
+// Pager pagination
+// --------------------------------------------------
+
+
+.pager {
+  margin: @baseLineHeight 0;
+  list-style: none;
+  text-align: center;
+  .clearfix();
+}
+.pager li {
+  display: inline;
+}
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  .border-radius(15px);
+}
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: @grayLight;
+  background-color: #fff;
+  cursor: default;
+}
\ No newline at end of file
diff --git a/core/media/jui/less/pagination.less b/core/media/jui/less/pagination.less
new file mode 100644
index 00000000..a789db2d
--- /dev/null
+++ b/core/media/jui/less/pagination.less
@@ -0,0 +1,123 @@
+//
+// Pagination (multiple pages)
+// --------------------------------------------------
+
+// Space out pagination from surrounding content
+.pagination {
+  margin: @baseLineHeight 0;
+}
+
+.pagination ul {
+  // Allow for text-based alignment
+  display: inline-block;
+  .ie7-inline-block();
+  // Reset default ul styles
+  margin-left: 0;
+  margin-bottom: 0;
+  // Visuals
+  .border-radius(@baseBorderRadius);
+  .box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+.pagination ul > li {
+  display: inline; // Remove list-style and block-level defaults
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left; // Collapse white-space
+  padding: 4px 12px;
+  line-height: @baseLineHeight;
+  text-decoration: none;
+  background-color: @paginationBackground;
+  border: 1px solid @paginationBorder;
+  border-left-width: 0;
+}
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: @paginationActiveBackground;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: @grayLight;
+  cursor: default;
+}
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: @grayLight;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  .border-left-radius(@baseBorderRadius);
+}
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  .border-right-radius(@baseBorderRadius);
+}
+
+
+// Alignment
+// --------------------------------------------------
+
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+
+
+// Sizing
+// --------------------------------------------------
+
+// Large
+.pagination-large {
+  ul > li > a,
+  ul > li > span {
+    padding: @paddingLarge;
+    font-size: @fontSizeLarge;
+  }
+  ul > li:first-child > a,
+  ul > li:first-child > span {
+    .border-left-radius(@borderRadiusLarge);
+  }
+  ul > li:last-child > a,
+  ul > li:last-child > span {
+    .border-right-radius(@borderRadiusLarge);
+  }
+}
+
+// Small and mini
+.pagination-mini,
+.pagination-small {
+  ul > li:first-child > a,
+  ul > li:first-child > span {
+    .border-left-radius(@borderRadiusSmall);
+  }
+  ul > li:last-child > a,
+  ul > li:last-child > span {
+    .border-right-radius(@borderRadiusSmall);
+  }
+}
+
+// Small
+.pagination-small {
+  ul > li > a,
+  ul > li > span {
+    padding: @paddingSmall;
+    font-size: @fontSizeSmall;
+  }
+}
+// Mini
+.pagination-mini {
+  ul > li > a,
+  ul > li > span {
+    padding: @paddingMini;
+    font-size: @fontSizeMini;
+  }
+}
diff --git a/core/media/jui/less/popovers.less b/core/media/jui/less/popovers.less
new file mode 100644
index 00000000..aae35c8c
--- /dev/null
+++ b/core/media/jui/less/popovers.less
@@ -0,0 +1,133 @@
+//
+// Popovers
+// --------------------------------------------------
+
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: @zindexPopover;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left; // Reset given new insertion method
+  background-color: @popoverBackground;
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0,0,0,.2);
+  .border-radius(6px);
+  .box-shadow(0 5px 10px rgba(0,0,0,.2));
+
+  // Overrides for proper insertion
+  white-space: normal;
+
+  // Offset the popover to account for the popover arrow
+  &.top     { margin-top: -10px; }
+  &.right   { margin-left: 10px; }
+  &.bottom  { margin-top: 10px; }
+  &.left    { margin-left: -10px; }
+}
+
+.popover-title {
+  margin: 0; // reset heading margin
+  padding: 8px 14px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: @popoverTitleBackground;
+  border-bottom: 1px solid darken(@popoverTitleBackground, 5%);
+  .border-radius(5px 5px 0 0);
+
+  &:empty {
+    display: none;
+  }
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+// Arrows
+//
+// .arrow is outer, .arrow:after is inner
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.popover .arrow {
+  border-width: @popoverArrowOuterWidth;
+}
+.popover .arrow:after {
+  border-width: @popoverArrowWidth;
+  content: "";
+}
+
+.popover {
+  &.top .arrow {
+    left: 50%;
+    margin-left: -@popoverArrowOuterWidth;
+    border-bottom-width: 0;
+    border-top-color: #999; // IE8 fallback
+    border-top-color: @popoverArrowOuterColor;
+    bottom: -@popoverArrowOuterWidth;
+    &:after {
+      bottom: 1px;
+      margin-left: -@popoverArrowWidth;
+      border-bottom-width: 0;
+      border-top-color: @popoverArrowColor;
+    }
+  }
+  &.right .arrow {
+    top: 50%;
+    left: -@popoverArrowOuterWidth;
+    margin-top: -@popoverArrowOuterWidth;
+    border-left-width: 0;
+    border-right-color: #999; // IE8 fallback
+    border-right-color: @popoverArrowOuterColor;
+    &:after {
+      left: 1px;
+      bottom: -@popoverArrowWidth;
+      border-left-width: 0;
+      border-right-color: @popoverArrowColor;
+    }
+  }
+  &.bottom .arrow {
+    left: 50%;
+    margin-left: -@popoverArrowOuterWidth;
+    border-top-width: 0;
+    border-bottom-color: #999; // IE8 fallback
+    border-bottom-color: @popoverArrowOuterColor;
+    top: -@popoverArrowOuterWidth;
+    &:after {
+      top: 1px;
+      margin-left: -@popoverArrowWidth;
+      border-top-width: 0;
+      border-bottom-color: @popoverArrowColor;
+    }
+  }
+
+  &.left .arrow {
+    top: 50%;
+    right: -@popoverArrowOuterWidth;
+    margin-top: -@popoverArrowOuterWidth;
+    border-right-width: 0;
+    border-left-color: #999; // IE8 fallback
+    border-left-color: @popoverArrowOuterColor;
+    &:after {
+      right: 1px;
+      border-right-width: 0;
+      border-left-color: @popoverArrowColor;
+      bottom: -@popoverArrowWidth;
+    }
+  }
+
+}
diff --git a/core/media/jui/less/progress-bars.less b/core/media/jui/less/progress-bars.less
new file mode 100644
index 00000000..5e0c3dda
--- /dev/null
+++ b/core/media/jui/less/progress-bars.less
@@ -0,0 +1,122 @@
+//
+// Progress bars
+// --------------------------------------------------
+
+
+// ANIMATIONS
+// ----------
+
+// Webkit
+@-webkit-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// Firefox
+@-moz-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// IE9
+@-ms-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// Opera
+@-o-keyframes progress-bar-stripes {
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
+}
+
+// Spec
+@keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+
+
+// THE BARS
+// --------
+
+// Outer container
+.progress {
+  overflow: hidden;
+  height: @baseLineHeight;
+  margin-bottom: @baseLineHeight;
+  #gradient > .vertical(#f5f5f5, #f9f9f9);
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+  .border-radius(@baseBorderRadius);
+}
+
+// Bar of progress
+.progress .bar {
+  width: 0%;
+  height: 100%;
+  color: @white;
+  float: left;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  #gradient > .vertical(#149bdf, #0480be);
+  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
+  .box-sizing(border-box);
+  .transition(width .6s ease);
+}
+.progress .bar + .bar {
+  .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)");
+}
+
+// Striped bars
+.progress-striped .bar {
+  #gradient > .striped(#149bdf);
+  .background-size(40px 40px);
+}
+
+// Call animation for the active one
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+
+
+// COLORS
+// ------
+
+// Danger (red)
+.progress-danger .bar, .progress .bar-danger {
+  #gradient > .vertical(#ee5f5b, #c43c35);
+}
+.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
+  #gradient > .striped(#ee5f5b);
+}
+
+// Success (green)
+.progress-success .bar, .progress .bar-success {
+  #gradient > .vertical(#62c462, #57a957);
+}
+.progress-success.progress-striped .bar, .progress-striped .bar-success {
+  #gradient > .striped(#62c462);
+}
+
+// Info (teal)
+.progress-info .bar, .progress .bar-info {
+  #gradient > .vertical(#5bc0de, #339bb9);
+}
+.progress-info.progress-striped .bar, .progress-striped .bar-info {
+  #gradient > .striped(#5bc0de);
+}
+
+// Warning (orange)
+.progress-warning .bar, .progress .bar-warning {
+  #gradient > .vertical(lighten(@orange, 15%), @orange);
+}
+.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
+  #gradient > .striped(lighten(@orange, 15%));
+}
diff --git a/core/media/jui/less/reset.less b/core/media/jui/less/reset.less
new file mode 100644
index 00000000..a25cc38a
--- /dev/null
+++ b/core/media/jui/less/reset.less
@@ -0,0 +1,217 @@
+//
+// Reset CSS
+// Adapted from http://github.com/necolas/normalize.css
+// --------------------------------------------------
+
+
+// Display in IE6-9 and FF3
+// -------------------------
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+// Display block in IE6-9 and FF3
+// -------------------------
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+// Prevents modern browsers from displaying 'audio' without controls
+// -------------------------
+
+audio:not([controls]) {
+    display: none;
+}
+
+// Base settings
+// -------------------------
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  .tab-focus();
+}
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
+
+// Prevents sub and sup affecting line-height in all browsers
+// -------------------------
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+
+// Img border in a's and image quality
+// -------------------------
+
+img {
+  /* Responsive images (ensure images don't scale beyond their parents) */
+  max-width: 100%; /* Part 1: Set a maxium relative to the parent */
+  width: auto\9; /* IE7-8 need help adjusting responsive images */
+  height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
+
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+// Prevent max-width from affecting Google Maps
+#map_canvas img,
+.google-maps img,
+.gm-style img {
+  max-width: none;
+}
+
+// Forms
+// -------------------------
+
+// Font size in all browsers, margin changes, misc consistency
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+button,
+input {
+  *overflow: visible; // Inner spacing ie IE6/7
+  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
+  padding: 0;
+  border: 0;
+}
+button,
+html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
+    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
+}
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
+}
+input[type="search"] { // Appearance in Safari/Chrome
+  .box-sizing(content-box);
+  -webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
+}
+textarea {
+  overflow: auto; // Remove vertical scrollbar in IE6-9
+  vertical-align: top; // Readability and alignment cross-browser
+}
+
+
+// Printing
+// -------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
+
+@media print {
+
+  * {
+    text-shadow: none !important;
+    color: #000 !important; // Black prints faster: h5bp.com/s
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+
+  // Don't show links for images, or javascript/internal links
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+
+  thead {
+    display: table-header-group; // h5bp.com/t
+  }
+
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+
+  img {
+    max-width: 100% !important;
+  }
+
+  @page {
+    margin: 0.5cm;
+  }
+
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
diff --git a/core/media/jui/less/responsive-1200px-min.less b/core/media/jui/less/responsive-1200px-min.less
new file mode 100644
index 00000000..4f35ba6c
--- /dev/null
+++ b/core/media/jui/less/responsive-1200px-min.less
@@ -0,0 +1,28 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px) {
+
+  // Fixed grid
+  #grid > .core(@gridColumnWidth1200, @gridGutterWidth1200);
+
+  // Fluid grid
+  #grid > .fluid(@fluidGridColumnWidth1200, @fluidGridGutterWidth1200);
+
+  // Input grid
+  #grid > .input(@gridColumnWidth1200, @gridGutterWidth1200);
+
+  // Thumbnails
+  .thumbnails {
+    margin-left: -@gridGutterWidth1200;
+  }
+  .thumbnails > li {
+    margin-left: @gridGutterWidth1200;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+
+}
diff --git a/core/media/jui/less/responsive-767px-max.joomla.less b/core/media/jui/less/responsive-767px-max.joomla.less
new file mode 100644
index 00000000..31aab1c4
--- /dev/null
+++ b/core/media/jui/less/responsive-767px-max.joomla.less
@@ -0,0 +1,43 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+/* Joomla JUI NOTE: Original .modal definition has to be commented */
+
+// > Joomla JUI
+@media (max-width: 767px) {
+  
+  // Modals
+  div.modal {
+    position: fixed;
+    top:   20px;
+    left:  20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+    &.fade  { top: -100px; }
+    &.fade.in { top: 20px; }
+  }
+
+  // Modals viewport width
+  div.modal[class*="jviewport-width"] {
+    width: auto;
+    margin: 0;
+  }
+
+}
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+  // Modals
+  div.modal {
+    top:   10px;
+    left:  10px;
+    right: 10px;
+  }
+
+}
+// < Joomla JUI
diff --git a/core/media/jui/less/responsive-767px-max.less b/core/media/jui/less/responsive-767px-max.less
new file mode 100644
index 00000000..d011170d
--- /dev/null
+++ b/core/media/jui/less/responsive-767px-max.less
@@ -0,0 +1,202 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+
+@media (max-width: 767px) {
+
+  // Padding to set content in a bit
+  body {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  // Negative indent the now static "fixed" navbar
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-left: -20px;
+    margin-right: -20px;
+  }
+  // Remove padding on container given explicit padding set on body
+  .container-fluid {
+    padding: 0;
+  }
+
+  // TYPOGRAPHY
+  // ----------
+  // Reset horizontal dl
+  .dl-horizontal {
+    dt {
+      float: none;
+      clear: none;
+      width: auto;
+      text-align: left;
+    }
+    dd {
+      margin-left: 0;
+    }
+  }
+
+  // MENU SEPARATOR
+  // --------------
+  // Reset background
+  .dropdown-menu .menuitem-group {
+    background-color: #10223e;
+    color: #eee;
+  }
+ 
+  // GRID & CONTAINERS
+  // -----------------
+  // Remove width from containers
+  .container {
+    width: auto;
+  }
+  // Fluid rows
+  .row-fluid {
+    width: 100%;
+  }
+  // Undo negative margin on rows and thumbnails
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
+  }
+  // Make all grid-sized elements block level again
+  [class*="span"],
+  .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
+  .row-fluid [class*="span"] {
+    float: none;
+    display: block;
+    width: 100%;
+    margin-left: 0;
+    .box-sizing(border-box);
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    .box-sizing(border-box);
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+
+  // FORM FIELDS
+  // -----------
+  // Make span* classes full width
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    .input-block-level();
+  }
+  // But don't let it screw up prepend/append inputs
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block; // redeclare so they don't wrap to new lines
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+
+  // Modals
+// /* >>> JUI >>> */
+// .modal REMOVED
+// /* <<< JUI <<< */
+
+}
+
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+  // Smooth out the collapsing/expanding nav
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
+  }
+
+  // Block level the page header small tag for readability
+  .page-header h1 small {
+    display: block;
+    line-height: @baseLineHeight;
+  }
+
+  // Update checkboxes for iOS
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+
+  // Remove the horizontal form styles
+  .form-horizontal {
+    .control-label {
+      float: none;
+      width: auto;
+      padding-top: 0;
+      text-align: left;
+    }
+    // Move over all input controls and content
+    .controls {
+      margin-left: 0;
+    }
+    // Move the options list down to align with labels
+    .control-list {
+      padding-top: 0; // has to be padding because margin collaspes
+    }
+    // Move over buttons in .form-actions to align with .controls
+    .form-actions {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+  }
+
+  // Gracefully displays the filter-search fields and buttons
+  .tag-category input#filter-search,
+  .newsfeed-category input#filter-search {
+    width: auto;
+    margin-bottom: @baseLineHeight / 2;
+  }
+  .category-list input#filter-search {
+    width: auto;
+  }
+
+  // Medias
+  // Reset float and spacing to stack
+  .media .pull-left,
+  .media .pull-right  {
+    float: none;
+    display: block;
+    margin-bottom: 10px;
+  }
+  // Remove side margins since we stack instead of indent
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+
+  // Modals
+// > Joomla JUI
+// .modal REMOVED
+// < Joomla JUI
+
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+
+  // Carousel
+  .carousel-caption {
+    position: static;
+  }
+
+}
diff --git a/core/media/jui/less/responsive-768px-979px.less b/core/media/jui/less/responsive-768px-979px.less
new file mode 100644
index 00000000..8e8c486a
--- /dev/null
+++ b/core/media/jui/less/responsive-768px-979px.less
@@ -0,0 +1,19 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 979px) {
+
+  // Fixed grid
+  #grid > .core(@gridColumnWidth768, @gridGutterWidth768);
+
+  // Fluid grid
+  #grid > .fluid(@fluidGridColumnWidth768, @fluidGridGutterWidth768);
+
+  // Input grid
+  #grid > .input(@gridColumnWidth768, @gridGutterWidth768);
+
+  // No need to reset .thumbnails here since it's the same @gridGutterWidth
+
+}
diff --git a/core/media/jui/less/responsive-navbar.less b/core/media/jui/less/responsive-navbar.less
new file mode 100644
index 00000000..21cd3ba6
--- /dev/null
+++ b/core/media/jui/less/responsive-navbar.less
@@ -0,0 +1,189 @@
+//
+// Responsive: Navbar
+// --------------------------------------------------
+
+
+// TABLETS AND BELOW
+// -----------------
+@media (max-width: @navbarCollapseWidth) {
+
+  // UNFIX THE TOPBAR
+  // ----------------
+  // Remove any padding from the body
+  body {
+    padding-top: 0;
+  }
+  // Unfix the navbars
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: @baseLineHeight;
+  }
+  .navbar-fixed-bottom {
+    margin-top: @baseLineHeight;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  // Account for brand name
+  .navbar .brand {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0 0 0 -5px;
+  }
+
+  // COLLAPSIBLE NAVBAR
+  // ------------------
+  // Nav collapse clears brand
+  .nav-collapse {
+    clear: both;
+  }
+  // Block-level the nav
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 (@baseLineHeight / 2);
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: @navbarText;
+    text-shadow: none;
+  }
+  // Nav and dropdown links in navbar
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: @navbarLinkColor;
+    .border-radius(3px);
+  }
+  // Buttons
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    .border-radius(@baseBorderRadius);
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: @navbarBackground;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: @navbarInverseLinkColor;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: @navbarInverseBackground;
+  }
+  // Buttons in the navbar
+  .nav-collapse.in .btn-group {
+    margin-top: 5px;
+    padding: 0;
+  }
+  // Dropdowns in the navbar
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    float: none;
+    display: none;
+    max-width: none;
+    margin: 0 15px;
+    padding: 0;
+    background-color: transparent;
+    border: none;
+    .border-radius(0);
+    .box-shadow(none);
+  }
+  .nav-collapse .open > .dropdown-menu { 
+    display: block; 
+  }
+
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu {
+    &:before,
+    &:after {
+      display: none;
+    }
+  }
+  // Forms in navbar
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: (@baseLineHeight / 2) 15px;
+    margin: (@baseLineHeight / 2) 0;
+    border-top: 1px solid @navbarBackground;
+    border-bottom: 1px solid @navbarBackground;
+    .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: @navbarInverseBackground;
+    border-bottom-color: @navbarInverseBackground;
+  }
+  // Pull right (secondary) nav content
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  // Hide everything in the navbar save .brand and toggle button */
+  .nav-collapse,
+  .nav-collapse.collapse {
+    overflow: hidden;
+    height: 0;
+  }
+  // Navbar button
+  .navbar .btn-navbar {
+    display: block;
+  }
+
+  // STATIC NAVBAR
+  // -------------
+  .navbar-static .navbar-inner {
+    padding-left:  10px;
+    padding-right: 10px;
+  }
+
+
+}
+
+
+// DEFAULT DESKTOP
+// ---------------
+
+@media (min-width: @navbarCollapseDesktopWidth) {
+
+  // Required to make the collapsing navbar work on regular desktops
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+
+}
diff --git a/core/media/jui/less/responsive-utilities.less b/core/media/jui/less/responsive-utilities.less
new file mode 100644
index 00000000..bf43e8ef
--- /dev/null
+++ b/core/media/jui/less/responsive-utilities.less
@@ -0,0 +1,59 @@
+//
+// Responsive: Utility classes
+// --------------------------------------------------
+
+
+// IE10 Metro responsive
+// Required for Windows 8 Metro split-screen snapping with IE10
+// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
+@-ms-viewport{
+  width: device-width;
+}
+
+// Hide from screenreaders and browsers
+// Credit: HTML5 Boilerplate
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+// Visibility utilities
+
+// For desktops
+.visible-phone     { display: none !important; }
+.visible-tablet    { display: none !important; }
+.hidden-phone      { }
+.hidden-tablet     { }
+.hidden-desktop    { display: none !important; }
+.visible-desktop   { display: inherit !important; }
+
+// Tablets & small desktops only
+@media (min-width: 768px) and (max-width: 979px) {
+  // Hide everything else
+  .hidden-desktop    { display: inherit !important; }
+  .visible-desktop   { display: none !important ; }
+  // Show
+  .visible-tablet    { display: inherit !important; }
+  // Hide
+  .hidden-tablet     { display: none !important; }
+}
+
+// Phones only
+@media (max-width: 767px) {
+  // Hide everything else
+  .hidden-desktop    { display: inherit !important; }
+  .visible-desktop   { display: none !important; }
+  // Show
+  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
+  // Hide
+  .hidden-phone      { display: none !important; }
+}
+
+// Print utilities
+.visible-print    { display: none !important; }
+.hidden-print     { }
+
+@media print {
+  .visible-print  { display: inherit !important; }
+  .hidden-print   { display: none !important; }
+}
diff --git a/core/media/jui/less/responsive.less b/core/media/jui/less/responsive.less
new file mode 100644
index 00000000..9e5f9b1f
--- /dev/null
+++ b/core/media/jui/less/responsive.less
@@ -0,0 +1,48 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+
+// Responsive.less
+// For phone and tablet devices
+// -------------------------------------------------------------
+
+
+// REPEAT VARIABLES & MIXINS
+// -------------------------
+// Required since we compile the responsive stuff separately
+
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+
+// RESPONSIVE CLASSES
+// ------------------
+
+@import "responsive-utilities.less";
+
+
+// MEDIA QUERIES
+// ------------------
+
+// Large desktops
+@import "responsive-1200px-min.less";
+
+// Tablets to regular desktops
+@import "responsive-768px-979px.less";
+
+// Phones to portrait tablets and narrow desktops
+@import "responsive-767px-max.less";
+
+
+// RESPONSIVE NAVBAR
+// ------------------
+
+// From 979px and below, show a button to toggle navbar contents
+@import "responsive-navbar.less";
diff --git a/core/media/jui/less/scaffolding.less b/core/media/jui/less/scaffolding.less
new file mode 100644
index 00000000..f17e8cad
--- /dev/null
+++ b/core/media/jui/less/scaffolding.less
@@ -0,0 +1,53 @@
+//
+// Scaffolding
+// --------------------------------------------------
+
+
+// Body reset
+// -------------------------
+
+body {
+  margin: 0;
+  font-family: @baseFontFamily;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @textColor;
+  background-color: @bodyBackground;
+}
+
+
+// Links
+// -------------------------
+
+a {
+  color: @linkColor;
+  text-decoration: none;
+}
+a:hover,
+a:focus {
+  color: @linkColorHover;
+  text-decoration: underline;
+}
+
+
+// Images
+// -------------------------
+
+// Rounded corners
+.img-rounded {
+  .border-radius(6px);
+}
+
+// Add polaroid-esque trim
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0,0,0,.2);
+  .box-shadow(0 1px 3px rgba(0,0,0,.1));
+}
+
+// Perfect circle
+.img-circle {
+  .border-radius(500px); // crank the border-radius so it works with most reasonably sized images
+}
diff --git a/core/media/jui/less/sprites.less b/core/media/jui/less/sprites.less
new file mode 100644
index 00000000..1687c67a
--- /dev/null
+++ b/core/media/jui/less/sprites.less
@@ -0,0 +1,197 @@
+//
+// Sprites
+// --------------------------------------------------
+
+
+// ICONS
+// -----
+
+// All icons receive the styles of the <i> tag with a base class
+// of .i and are then given a unique class to add width, height,
+// and background-position. Your resulting HTML will look like
+// <span class="icon-inbox"></span>.
+
+// For the white version of the icons, just add the .icon-white class:
+// <span class="icon-inbox icon-white"></span>
+
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	margin-right: .25em;
+	line-height: 14px;
+	vertical-align: text-top;
+	background-image: url("@{iconSpritePath}");
+	background-position: 14px 14px;
+	background-repeat: no-repeat;
+	margin-top: 1px;
+}
+
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("@{iconWhiteSpritePath}");
+}
+
+.icon-glass              { background-position: 0      0; }
+.icon-music              { background-position: -24px  0; }
+.icon-search             { background-position: -48px  0; }
+.icon-envelope           { background-position: -72px  0; }
+.icon-heart              { background-position: -96px  0; }
+.icon-star               { background-position: -120px 0; }
+.icon-star-empty         { background-position: -144px 0; }
+.icon-user               { background-position: -168px 0; }
+.icon-film               { background-position: -192px 0; }
+.icon-th-large           { background-position: -216px 0; }
+.icon-th                 { background-position: -240px 0; }
+.icon-th-list            { background-position: -264px 0; }
+.icon-ok                 { background-position: -288px 0; }
+.icon-remove             { background-position: -312px 0; }
+.icon-zoom-in            { background-position: -336px 0; }
+.icon-zoom-out           { background-position: -360px 0; }
+.icon-off                { background-position: -384px 0; }
+.icon-signal             { background-position: -408px 0; }
+.icon-cog                { background-position: -432px 0; }
+.icon-trash              { background-position: -456px 0; }
+
+.icon-home               { background-position: 0      -24px; }
+.icon-file               { background-position: -24px  -24px; }
+.icon-time               { background-position: -48px  -24px; }
+.icon-road               { background-position: -72px  -24px; }
+.icon-download-alt       { background-position: -96px  -24px; }
+.icon-download           { background-position: -120px -24px; }
+.icon-upload             { background-position: -144px -24px; }
+.icon-inbox              { background-position: -168px -24px; }
+.icon-play-circle        { background-position: -192px -24px; }
+.icon-repeat             { background-position: -216px -24px; }
+.icon-refresh            { background-position: -240px -24px; }
+.icon-list-alt           { background-position: -264px -24px; }
+.icon-lock               { background-position: -287px -24px; } // 1px off
+.icon-flag               { background-position: -312px -24px; }
+.icon-headphones         { background-position: -336px -24px; }
+.icon-volume-off         { background-position: -360px -24px; }
+.icon-volume-down        { background-position: -384px -24px; }
+.icon-volume-up          { background-position: -408px -24px; }
+.icon-qrcode             { background-position: -432px -24px; }
+.icon-barcode            { background-position: -456px -24px; }
+
+.icon-tag                { background-position: 0      -48px; }
+.icon-tags               { background-position: -25px  -48px; } // 1px off
+.icon-book               { background-position: -48px  -48px; }
+.icon-bookmark           { background-position: -72px  -48px; }
+.icon-print              { background-position: -96px  -48px; }
+.icon-camera             { background-position: -120px -48px; }
+.icon-font               { background-position: -144px -48px; }
+.icon-bold               { background-position: -167px -48px; } // 1px off
+.icon-italic             { background-position: -192px -48px; }
+.icon-text-height        { background-position: -216px -48px; }
+.icon-text-width         { background-position: -240px -48px; }
+.icon-align-left         { background-position: -264px -48px; }
+.icon-align-center       { background-position: -288px -48px; }
+.icon-align-right        { background-position: -312px -48px; }
+.icon-align-justify      { background-position: -336px -48px; }
+.icon-list               { background-position: -360px -48px; }
+.icon-indent-left        { background-position: -384px -48px; }
+.icon-indent-right       { background-position: -408px -48px; }
+.icon-facetime-video     { background-position: -432px -48px; }
+.icon-picture            { background-position: -456px -48px; }
+
+.icon-pencil             { background-position: 0      -72px; }
+.icon-map-marker         { background-position: -24px  -72px; }
+.icon-adjust             { background-position: -48px  -72px; }
+.icon-tint               { background-position: -72px  -72px; }
+.icon-edit               { background-position: -96px  -72px; }
+.icon-share              { background-position: -120px -72px; }
+.icon-check              { background-position: -144px -72px; }
+.icon-move               { background-position: -168px -72px; }
+.icon-step-backward      { background-position: -192px -72px; }
+.icon-fast-backward      { background-position: -216px -72px; }
+.icon-backward           { background-position: -240px -72px; }
+.icon-play               { background-position: -264px -72px; }
+.icon-pause              { background-position: -288px -72px; }
+.icon-stop               { background-position: -312px -72px; }
+.icon-forward            { background-position: -336px -72px; }
+.icon-fast-forward       { background-position: -360px -72px; }
+.icon-step-forward       { background-position: -384px -72px; }
+.icon-eject              { background-position: -408px -72px; }
+.icon-chevron-left       { background-position: -432px -72px; }
+.icon-chevron-right      { background-position: -456px -72px; }
+
+.icon-plus-sign          { background-position: 0      -96px; }
+.icon-minus-sign         { background-position: -24px  -96px; }
+.icon-remove-sign        { background-position: -48px  -96px; }
+.icon-ok-sign            { background-position: -72px  -96px; }
+.icon-question-sign      { background-position: -96px  -96px; }
+.icon-info-sign          { background-position: -120px -96px; }
+.icon-screenshot         { background-position: -144px -96px; }
+.icon-remove-circle      { background-position: -168px -96px; }
+.icon-ok-circle          { background-position: -192px -96px; }
+.icon-ban-circle         { background-position: -216px -96px; }
+.icon-arrow-left         { background-position: -240px -96px; }
+.icon-arrow-right        { background-position: -264px -96px; }
+.icon-arrow-up           { background-position: -289px -96px; } // 1px off
+.icon-arrow-down         { background-position: -312px -96px; }
+.icon-share-alt          { background-position: -336px -96px; }
+.icon-resize-full        { background-position: -360px -96px; }
+.icon-resize-small       { background-position: -384px -96px; }
+.icon-plus               { background-position: -408px -96px; }
+.icon-minus              { background-position: -433px -96px; }
+.icon-asterisk           { background-position: -456px -96px; }
+
+.icon-exclamation-sign   { background-position: 0      -120px; }
+.icon-gift               { background-position: -24px  -120px; }
+.icon-leaf               { background-position: -48px  -120px; }
+.icon-fire               { background-position: -72px  -120px; }
+.icon-eye-open           { background-position: -96px  -120px; }
+.icon-eye-close          { background-position: -120px -120px; }
+.icon-warning-sign       { background-position: -144px -120px; }
+.icon-plane              { background-position: -168px -120px; }
+.icon-calendar           { background-position: -192px -120px; }
+.icon-random             { background-position: -216px -120px; width: 16px; }
+.icon-comment            { background-position: -240px -120px; }
+.icon-magnet             { background-position: -264px -120px; }
+.icon-chevron-up         { background-position: -288px -120px; }
+.icon-chevron-down       { background-position: -313px -119px; } // 1px, 1px off
+.icon-retweet            { background-position: -336px -120px; }
+.icon-shopping-cart      { background-position: -360px -120px; }
+.icon-folder-close       { background-position: -384px -120px; width: 16px; }
+.icon-folder-open        { background-position: -408px -120px; width: 16px; }
+.icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
+.icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
+
+.icon-hdd                     { background-position: 0      -144px; }
+.icon-bullhorn                { background-position: -24px  -144px; }
+.icon-bell                    { background-position: -48px  -144px; }
+.icon-certificate             { background-position: -72px  -144px; }
+.icon-thumbs-up               { background-position: -96px  -144px; }
+.icon-thumbs-down             { background-position: -120px -144px; }
+.icon-hand-right              { background-position: -144px -144px; }
+.icon-hand-left               { background-position: -168px -144px; }
+.icon-hand-up                 { background-position: -192px -144px; }
+.icon-hand-down               { background-position: -216px -144px; }
+.icon-circle-arrow-right      { background-position: -240px -144px; }
+.icon-circle-arrow-left       { background-position: -264px -144px; }
+.icon-circle-arrow-up         { background-position: -288px -144px; }
+.icon-circle-arrow-down       { background-position: -312px -144px; }
+.icon-globe                   { background-position: -336px -144px; }
+.icon-wrench                  { background-position: -360px -144px; }
+.icon-tasks                   { background-position: -384px -144px; }
+.icon-filter                  { background-position: -408px -144px; }
+.icon-briefcase               { background-position: -432px -144px; }
+.icon-fullscreen              { background-position: -456px -144px; }
diff --git a/core/media/jui/less/tables.less b/core/media/jui/less/tables.less
new file mode 100644
index 00000000..bdb32c60
--- /dev/null
+++ b/core/media/jui/less/tables.less
@@ -0,0 +1,255 @@
+//
+// Tables
+// --------------------------------------------------
+
+
+// BASE TABLES
+// -----------------
+
+table {
+  max-width: 100%;
+  background-color: @tableBackground;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+// BASELINE STYLES
+// ---------------
+
+.table {
+  width: 100%;
+  margin-bottom: @baseLineHeight;
+  // Cells
+  th,
+  td {
+    padding: 8px;
+    line-height: @baseLineHeight;
+    text-align: left;
+    vertical-align: top;
+    border-top: 1px solid @tableBorder;
+  }
+  th {
+    font-weight: bold;
+  }
+  // Bottom align for column headings
+  thead th {
+    vertical-align: bottom;
+  }
+  // Remove top border from thead by default
+  caption + thead tr:first-child th,
+  caption + thead tr:first-child td,
+  colgroup + thead tr:first-child th,
+  colgroup + thead tr:first-child td,
+  thead:first-child tr:first-child th,
+  thead:first-child tr:first-child td {
+    border-top: 0;
+  }
+  // Account for multiple tbody instances
+  tbody + tbody {
+    border-top: 2px solid @tableBorder;
+  }
+
+  // Nesting
+  .table {
+    background-color: @bodyBackground;
+  }
+}
+
+
+
+// CONDENSED TABLE W/ HALF PADDING
+// -------------------------------
+
+.table-condensed {
+  th,
+  td {
+    padding: 4px 5px;
+  }
+}
+
+
+// BORDERED VERSION
+// ----------------
+
+.table-bordered {
+  border: 1px solid @tableBorder;
+  border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapse; // IE7 can't round corners anyway
+  border-left: 0;
+  .border-radius(@baseBorderRadius);
+  th,
+  td {
+    border-left: 1px solid @tableBorder;
+  }
+  // Prevent a double border
+  caption + thead tr:first-child th,
+  caption + tbody tr:first-child th,
+  caption + tbody tr:first-child td,
+  colgroup + thead tr:first-child th,
+  colgroup + tbody tr:first-child th,
+  colgroup + tbody tr:first-child td,
+  thead:first-child tr:first-child th,
+  tbody:first-child tr:first-child th,
+  tbody:first-child tr:first-child td {
+    border-top: 0;
+  }
+  // For first th/td in the first row in the first thead or tbody
+  thead:first-child tr:first-child > th:first-child,
+  tbody:first-child tr:first-child > td:first-child,
+  tbody:first-child tr:first-child > th:first-child {
+    .border-top-left-radius(@baseBorderRadius);
+  }
+  // For last th/td in the first row in the first thead or tbody
+  thead:first-child tr:first-child > th:last-child,
+  tbody:first-child tr:first-child > td:last-child,
+  tbody:first-child tr:first-child > th:last-child {
+    .border-top-right-radius(@baseBorderRadius);
+  }
+  // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
+  thead:last-child tr:last-child > th:first-child,
+  tbody:last-child tr:last-child > td:first-child,
+  tbody:last-child tr:last-child > th:first-child,
+  tfoot:last-child tr:last-child > td:first-child,
+  tfoot:last-child tr:last-child > th:first-child {
+    .border-bottom-left-radius(@baseBorderRadius);
+  }
+  // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
+  thead:last-child tr:last-child > th:last-child,
+  tbody:last-child tr:last-child > td:last-child,
+  tbody:last-child tr:last-child > th:last-child,
+  tfoot:last-child tr:last-child > td:last-child,
+  tfoot:last-child tr:last-child > th:last-child {
+    .border-bottom-right-radius(@baseBorderRadius);
+  }
+
+  // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
+  tfoot + tbody:last-child tr:last-child td:first-child {
+    .border-bottom-left-radius(0);
+  }
+  tfoot + tbody:last-child tr:last-child td:last-child {
+    .border-bottom-right-radius(0);
+  }
+
+  // Special fixes to round the left border on the first td/th
+  caption + thead tr:first-child th:first-child,
+  caption + tbody tr:first-child td:first-child,
+  colgroup + thead tr:first-child th:first-child,
+  colgroup + tbody tr:first-child td:first-child {
+    .border-top-left-radius(@baseBorderRadius);
+  }
+  caption + thead tr:first-child th:last-child,
+  caption + tbody tr:first-child td:last-child,
+  colgroup + thead tr:first-child th:last-child,
+  colgroup + tbody tr:first-child td:last-child {
+    .border-top-right-radius(@baseBorderRadius);
+  }
+
+}
+
+
+
+
+// ZEBRA-STRIPING
+// --------------
+
+// Default zebra-stripe styles (alternating gray and transparent backgrounds)
+.table-striped {
+  tbody {
+    > tr:nth-child(odd) > td,
+    > tr:nth-child(odd) > th {
+      background-color: @tableBackgroundAccent;
+    }
+  }
+}
+
+
+// HOVER EFFECT
+// ------------
+// Placed here since it has to come after the potential zebra striping
+.table-hover {
+  tbody {
+    tr:hover > td,
+    tr:hover > th {
+      background-color: @tableBackgroundHover;
+    }
+  }
+}
+
+
+// TABLE CELL SIZING
+// -----------------
+
+// Reset default grid behavior
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none; // undo default grid column styles
+  margin-left: 0; // undo default grid column styles
+}
+
+// Change the column widths to account for td/th padding
+.table td,
+.table th {
+  &.span1     { .tableColumns(1); }
+  &.span2     { .tableColumns(2); }
+  &.span3     { .tableColumns(3); }
+  &.span4     { .tableColumns(4); }
+  &.span5     { .tableColumns(5); }
+  &.span6     { .tableColumns(6); }
+  &.span7     { .tableColumns(7); }
+  &.span8     { .tableColumns(8); }
+  &.span9     { .tableColumns(9); }
+  &.span10    { .tableColumns(10); }
+  &.span11    { .tableColumns(11); }
+  &.span12    { .tableColumns(12); }
+}
+
+
+
+// TABLE BACKGROUNDS
+// -----------------
+// Exact selectors below required to override .table-striped
+
+.table tbody tr {
+  &.success > td {
+    background-color: @successBackground;
+  }
+  &.error > td {
+    background-color: @errorBackground;
+  }
+  &.warning > td {
+    background-color: @warningBackground;
+  }
+  &.info > td {
+    background-color: @infoBackground;
+  }
+}
+
+// Hover states for .table-hover
+.table-hover tbody tr {
+  &.success:hover > td {
+    background-color: darken(@successBackground, 5%);
+  }
+  &.error:hover > td {
+    background-color: darken(@errorBackground, 5%);
+  }
+  &.warning:hover > td {
+    background-color: darken(@warningBackground, 5%);
+  }
+  &.info:hover > td {
+    background-color: darken(@infoBackground, 5%);
+  }
+}
+
+
+// TABLE WITHOUT HEADER
+// -----------------
+// Table with table header hidden
+.table-noheader {
+  border-collapse: collapse;
+  thead {
+	display: none;
+  }
+}
\ No newline at end of file
diff --git a/core/media/jui/less/thumbnails.less b/core/media/jui/less/thumbnails.less
new file mode 100644
index 00000000..4fd07d25
--- /dev/null
+++ b/core/media/jui/less/thumbnails.less
@@ -0,0 +1,53 @@
+//
+// Thumbnails
+// --------------------------------------------------
+
+
+// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
+
+// Make wrapper ul behave like the grid
+.thumbnails {
+  margin-left: -@gridGutterWidth;
+  list-style: none;
+  .clearfix();
+}
+// Fluid rows have no left margin
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+// Float li to make thumbnails appear in a row
+.thumbnails > li {
+  float: left; // Explicity set the float since we don't require .span* classes
+  margin-bottom: @baseLineHeight;
+  margin-left: @gridGutterWidth;
+}
+
+// The actual thumbnail (can be `a` or `div`)
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: @baseLineHeight;
+  border: 1px solid #ddd;
+  .border-radius(@baseBorderRadius);
+  .box-shadow(0 1px 3px rgba(0,0,0,.055));
+  .transition(all .2s ease-in-out);
+}
+// Add a hover/focus state for linked versions only
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: @linkColor;
+  .box-shadow(0 1px 4px rgba(0,105,214,.25));
+}
+
+// Images and captions
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+}
+.thumbnail .caption {
+  padding: 9px;
+  color: @gray;
+}
diff --git a/core/media/jui/less/tooltip.less b/core/media/jui/less/tooltip.less
new file mode 100644
index 00000000..83d5f2bd
--- /dev/null
+++ b/core/media/jui/less/tooltip.less
@@ -0,0 +1,70 @@
+//
+// Tooltips
+// --------------------------------------------------
+
+
+// Base class
+.tooltip {
+  position: absolute;
+  z-index: @zindexTooltip;
+  display: block;
+  visibility: visible;
+  font-size: 11px;
+  line-height: 1.4;
+  .opacity(0);
+  &.in     { .opacity(80); }
+  &.top    { margin-top:  -3px; padding: 5px 0; }
+  &.right  { margin-left:  3px; padding: 0 5px; }
+  &.bottom { margin-top:   3px; padding: 5px 0; }
+  &.left   { margin-left: -3px; padding: 0 5px; }
+}
+
+// Wrapper for the tooltip content
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: @tooltipColor;
+  text-align: center;
+  text-decoration: none;
+  background-color: @tooltipBackground;
+  .border-radius(@baseBorderRadius);
+}
+
+// Arrows
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.tooltip {
+  &.top .tooltip-arrow {
+    bottom: 0;
+    left: 50%;
+    margin-left: -@tooltipArrowWidth;
+    border-width: @tooltipArrowWidth @tooltipArrowWidth 0;
+    border-top-color: @tooltipArrowColor;
+  }
+  &.right .tooltip-arrow {
+    top: 50%;
+    left: 0;
+    margin-top: -@tooltipArrowWidth;
+    border-width: @tooltipArrowWidth @tooltipArrowWidth @tooltipArrowWidth 0;
+    border-right-color: @tooltipArrowColor;
+  }
+  &.left .tooltip-arrow {
+    top: 50%;
+    right: 0;
+    margin-top: -@tooltipArrowWidth;
+    border-width: @tooltipArrowWidth 0 @tooltipArrowWidth @tooltipArrowWidth;
+    border-left-color: @tooltipArrowColor;
+  }
+  &.bottom .tooltip-arrow {
+    top: 0;
+    left: 50%;
+    margin-left: -@tooltipArrowWidth;
+    border-width: 0 @tooltipArrowWidth @tooltipArrowWidth;
+    border-bottom-color: @tooltipArrowColor;
+  }
+}
diff --git a/core/media/jui/less/type.less b/core/media/jui/less/type.less
new file mode 100644
index 00000000..337138ac
--- /dev/null
+++ b/core/media/jui/less/type.less
@@ -0,0 +1,247 @@
+//
+// Typography
+// --------------------------------------------------
+
+
+// Body text
+// -------------------------
+
+p {
+  margin: 0 0 @baseLineHeight / 2;
+}
+.lead {
+  margin-bottom: @baseLineHeight;
+  font-size: @baseFontSize * 1.5;
+  font-weight: 200;
+  line-height: @baseLineHeight * 1.5;
+}
+
+
+// Emphasis & misc
+// -------------------------
+
+// Ex: 14px base font * 85% = about 12px
+small   { font-size: 85%; }
+
+strong  { font-weight: bold; }
+em      { font-style: italic; }
+cite    { font-style: normal; }
+
+// Utility classes
+.muted               { color: @grayLight; }
+a.muted:hover,
+a.muted:focus        { color: darken(@grayLight, 10%); }
+
+.text-warning        { color: @warningText; }
+a.text-warning:hover,
+a.text-warning:focus { color: darken(@warningText, 10%); }
+
+.text-error          { color: @errorText; }
+a.text-error:hover,
+a.text-error:focus   { color: darken(@errorText, 10%); }
+
+.text-info           { color: @infoText; }
+a.text-info:hover,
+a.text-info:focus    { color: darken(@infoText, 10%); }
+
+.text-success        { color: @successText; }
+a.text-success:hover,
+a.text-success:focus { color: darken(@successText, 10%); }
+
+.text-left           { text-align: left; }
+.text-right          { text-align: right; }
+.text-center         { text-align: center; }
+
+
+// Headings
+// -------------------------
+
+h1, h2, h3, h4, h5, h6 {
+  margin: (@baseLineHeight / 2) 0;
+  font-family: @headingsFontFamily;
+  font-weight: @headingsFontWeight;
+  line-height: @baseLineHeight;
+  color: @headingsColor;
+  text-rendering: optimizelegibility; // Fix the character spacing for headings
+  small {
+    font-weight: normal;
+    line-height: 1;
+    color: @grayLight;
+  }
+}
+
+h1,
+h2,
+h3 { line-height: @baseLineHeight * 2; }
+
+h1 { font-size: @baseFontSize * 2.75; } // ~38px
+h2 { font-size: @baseFontSize * 2.25; } // ~32px
+h3 { font-size: @baseFontSize * 1.75; } // ~24px
+h4 { font-size: @baseFontSize * 1.25; } // ~18px
+h5 { font-size: @baseFontSize; }
+h6 { font-size: @baseFontSize * 0.85; } // ~12px
+
+h1 small { font-size: @baseFontSize * 1.75; } // ~24px
+h2 small { font-size: @baseFontSize * 1.25; } // ~18px
+h3 small { font-size: @baseFontSize; }
+h4 small { font-size: @baseFontSize; }
+
+
+// Page header
+// -------------------------
+
+.page-header {
+  padding-bottom: (@baseLineHeight / 2) - 1;
+  margin: @baseLineHeight 0 (@baseLineHeight * 1.5);
+  border-bottom: 1px solid @grayLighter;
+}
+
+
+
+// Lists
+// --------------------------------------------------
+
+// Unordered and Ordered lists
+ul, ol {
+  padding: 0;
+  margin: 0 0 @baseLineHeight / 2 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+li {
+  line-height: @baseLineHeight;
+}
+
+// Remove default list styles
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+// Single-line list items
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+  > li {
+    display: inline-block;
+    .ie7-inline-block();
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
+
+// Description Lists
+dl {
+  margin-bottom: @baseLineHeight;
+}
+dt,
+dd {
+  line-height: @baseLineHeight;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: @baseLineHeight / 2;
+}
+// Horizontal layout (like forms)
+.dl-horizontal {
+  .clearfix(); // Ensure dl clears floats if empty dd elements present
+  dt {
+    float: left;
+    width: @horizontalComponentOffset - 20;
+    clear: left;
+    text-align: right;
+    .text-overflow();
+  }
+  dd {
+    margin-left: @horizontalComponentOffset;
+  }
+}
+
+// MISC
+// ----
+
+// Horizontal rules
+hr {
+  margin: @baseLineHeight 0;
+  border: 0;
+  border-top: 1px solid @hrBorder;
+  border-bottom: 1px solid @white;
+}
+
+// Abbreviations and acronyms
+abbr[title],
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted @grayLight;
+}
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+// Blockquotes
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 @baseLineHeight;
+  border-left: 5px solid @grayLighter;
+  p {
+    margin-bottom: 0;
+    font-size: @baseFontSize * 1.25;
+    font-weight: 300;
+    line-height: 1.25;
+  }
+  small {
+    display: block;
+    line-height: @baseLineHeight;
+    color: @grayLight;
+    &:before {
+      content: '\2014 \00A0';
+    }
+  }
+
+  // Float right with text-align: right
+  &.pull-right {
+    float: right;
+    padding-right: 15px;
+    padding-left: 0;
+    border-right: 5px solid @grayLighter;
+    border-left: 0;
+    p,
+    small {
+      text-align: right;
+    }
+    small {
+      &:before {
+        content: '';
+      }
+      &:after {
+        content: '\00A0 \2014';
+      }
+    }
+  }
+}
+
+// Quotes
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+// Addresses
+address {
+  display: block;
+  margin-bottom: @baseLineHeight;
+  font-style: normal;
+  line-height: @baseLineHeight;
+}
diff --git a/core/media/jui/less/utilities.less b/core/media/jui/less/utilities.less
new file mode 100644
index 00000000..314b4ffd
--- /dev/null
+++ b/core/media/jui/less/utilities.less
@@ -0,0 +1,30 @@
+//
+// Utility classes
+// --------------------------------------------------
+
+
+// Quick floats
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+
+// Toggling content
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+
+// Visibility
+.invisible {
+  visibility: hidden;
+}
+
+// For Affix plugin
+.affix {
+  position: fixed;
+}
diff --git a/core/media/jui/less/variables.less b/core/media/jui/less/variables.less
new file mode 100644
index 00000000..82955cb4
--- /dev/null
+++ b/core/media/jui/less/variables.less
@@ -0,0 +1,300 @@
+//
+// Variables
+// --------------------------------------------------
+
+
+// Global values
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black:                 #000;
+@grayDarker:            #222;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+
+// Accent colors
+// -------------------------
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor:             #08c;
+@linkColorHover:        darken(@linkColor, 15%);
+
+
+// Typography
+// -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
+
+@baseFontSize:          14px;
+@baseFontFamily:        @sansFontFamily;
+@baseLineHeight:        20px;
+@altFontFamily:         @serifFontFamily;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+@fontSizeSmall:         @baseFontSize * 0.85; // ~12px
+@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+@paddingLarge:          11px 19px; // 44px
+@paddingSmall:          2px 10px;  // 26px
+@paddingMini:           0 6px;   // 22px
+
+@baseBorderRadius:      4px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             #f9f9f9; // for striping
+@tableBackgroundHover:              #f5f5f5; // for hover
+@tableBorder:                       #ddd; // table and cell border
+
+// Buttons
+// -------------------------
+@btnBackground:                     @white;
+@btnBackgroundHighlight:            darken(@white, 10%);
+@btnBorder:                         #ccc;
+
+@btnPrimaryBackground:              @linkColor;
+@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
+
+@btnInfoBackground:                 #5bc0de;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              #62c462;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               #ee5f5b;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              #444;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground:               @white;
+@inputBorder:                   #ccc;
+@inputBorderRadius:             @baseBorderRadius;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         #f5f5f5;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @white;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownDividerTop:            #e5e5e5;
+@dropdownDividerBottom:         @white;
+
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkColorActive:       @white;
+
+@dropdownLinkBackgroundActive:  @linkColor;
+@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexTooltip:           1030;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+@zindexPopover:           1060;
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                @grayLighter;
+
+
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
+// Wells
+// -------------------------
+@wellBackground:                  #f5f5f5;
+
+
+// Navbar
+// -------------------------
+@navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
+
+@navbarHeight:                    40px;
+@navbarBackgroundHighlight:       #ffffff;
+@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
+@navbarBorder:                    darken(@navbarBackground, 12%);
+
+@navbarText:                      #777;
+@navbarLinkColor:                 #777;
+@navbarLinkColorHover:            @grayDark;
+@navbarLinkColorActive:           @gray;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      darken(@navbarBackground, 5%);
+
+@navbarBrandColor:                @navbarLinkColor;
+
+// Inverted navbar
+@navbarInverseBackground:                #111111;
+@navbarInverseBackgroundHighlight:       #222222;
+@navbarInverseBorder:                    #252525;
+
+@navbarInverseText:                      @grayLight;
+@navbarInverseLinkColor:                 @grayLight;
+@navbarInverseLinkColorHover:            @white;
+@navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
+@navbarInverseLinkBackgroundHover:       transparent;
+@navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
+
+@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus:     @white;
+@navbarInverseSearchBorder:              @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor:    #ccc;
+
+@navbarInverseBrandColor:                @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground:                #fff;
+@paginationBorder:                    #ddd;
+@paginationActiveBackground:          #f5f5f5;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              @grayLighter;
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
+
+// Form states and alerts
+// -------------------------
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+// Tooltips and popovers
+// -------------------------
+@tooltipColor:            #fff;
+@tooltipBackground:       #000;
+@tooltipArrowWidth:       5px;
+@tooltipArrowColor:       @tooltipBackground;
+
+@popoverBackground:       #fff;
+@popoverArrowWidth:       10px;
+@popoverArrowColor:       #fff;
+@popoverTitleBackground:  darken(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterColor:  rgba(0,0,0,.25);
+
+
+
+// GRID
+// --------------------------------------------------
+
+
+// Default 940px grid
+// -------------------------
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// 1200px min
+@gridColumnWidth1200:     70px;
+@gridGutterWidth1200:     30px;
+@gridRowWidth1200:        (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768:      42px;
+@gridGutterWidth768:      20px;
+@gridRowWidth768:         (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:    percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth:    percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200:     percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768:      percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);
diff --git a/core/media/jui/less/wells.less b/core/media/jui/less/wells.less
new file mode 100644
index 00000000..84a744b1
--- /dev/null
+++ b/core/media/jui/less/wells.less
@@ -0,0 +1,29 @@
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: @wellBackground;
+  border: 1px solid darken(@wellBackground, 7%);
+  .border-radius(@baseBorderRadius);
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-large {
+  padding: 24px;
+  .border-radius(@borderRadiusLarge);
+}
+.well-small {
+  padding: 9px;
+  .border-radius(@borderRadiusSmall);
+}
diff --git a/core/media/mailto/images/close-x.png b/core/media/mailto/images/close-x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7a88525cfb51ff0a93d9f420818bda716694ae
GIT binary patch
literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}`7rKgKyNCjhP-$6zO1{S8xI>v@N
z52jvsbmeMVzi`&KY=QIFbCuU|tj<3q^X%8z5{YMR=T9`O(VTKGv%yP=Q*({mYmi}{
Lu6{1-oD!M<O3Wj%

literal 0
HcmV?d00001

diff --git a/core/media/media/css/background.png b/core/media/media/css/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd428412ae26af13dab448ec833b1cb603e37ee9
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G9-c0aAr-gYoHrC?P~c(M$o@YsOF*1w?-55oQ{94SCl?~X
dlYaFB3@*Kl;yd0~_5jUf@O1TaS?83{1OV-(FBAX(

literal 0
HcmV?d00001

diff --git a/core/media/media/css/bigplay.fw.png b/core/media/media/css/bigplay.fw.png
new file mode 100644
index 0000000000000000000000000000000000000000..66d0e3cb73ceec0b1ffc7cdd4c1bc5edaf960556
GIT binary patch
literal 79426
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

literal 0
HcmV?d00001

diff --git a/core/media/media/css/bigplay.png b/core/media/media/css/bigplay.png
new file mode 100644
index 0000000000000000000000000000000000000000..694553e31c387188b6bde397a5200c212aff2dc5
GIT binary patch
literal 3001
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
J;~KO(@jp;uhBg2I

literal 0
HcmV?d00001

diff --git a/core/media/media/css/bigplay.svg b/core/media/media/css/bigplay.svg
new file mode 100644
index 00000000..2b781700
--- /dev/null
+++ b/core/media/media/css/bigplay.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<svg id="bigplay" viewBox="0 0 100 200" style="background-color:#ffffff00" version="1.1"
+	xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+	x="0px" y="0px" width="100px" height="200px"
+>
+	<g id="dark">
+		<path id="Polygon"  d="M 72.5 49.5 L 38.75 68.9856 L 38.75 30.0144 L 72.5 49.5 Z" fill="#ffffff" opacity="0.75" />
+		<path id="Ellipse" d="M 13 50.5 C 13 29.7891 29.7891 13 50.5 13 C 71.2109 13 88 29.7891 88 50.5 C 88 71.2109 71.2109 88 50.5 88 C 29.7891 88 13 71.2109 13 50.5 Z" stroke="#ffffff" stroke-width="5" fill="none" opacity="0.75"/>
+	</g>
+	<g id="light">
+		<path id="Polygon2"  d="M 72.5 149.5 L 38.75 168.9856 L 38.75 130.0144 L 72.5 149.5 Z" fill="#ffffff" opacity="1.0" />
+		<path id="Ellipse2" d="M 13 150.5 C 13 129.7891 29.7891 113 50.5 113 C 71.2109 113 88 129.7891 88 150.5 C 88 171.211 71.2109 188 50.5 188 C 29.7891 188 13 171.211 13 150.5 Z" stroke="#ffffff" stroke-width="5" fill="none" opacity="1.0"/>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/core/media/media/css/controls-ted.png b/core/media/media/css/controls-ted.png
new file mode 100644
index 0000000000000000000000000000000000000000..3aac05aa83cb7fed54831a19d85a8c267e939720
GIT binary patch
literal 1559
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
JPDHLkV1l~`FgySN

literal 0
HcmV?d00001

diff --git a/core/media/media/css/controls-wmp-bg.png b/core/media/media/css/controls-wmp-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..89bb9b95602ecfca6290f6006f817da365da7b90
GIT binary patch
literal 1960
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
A)c^nh

literal 0
HcmV?d00001

diff --git a/core/media/media/css/controls-wmp.png b/core/media/media/css/controls-wmp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4775ef5b02faf2b826d35dfc72511b6b27fea87b
GIT binary patch
literal 5511
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
JPDHLkV1kZU;|2f#

literal 0
HcmV?d00001

diff --git a/core/media/media/css/controls.fw.png b/core/media/media/css/controls.fw.png
new file mode 100644
index 0000000000000000000000000000000000000000..e27682ae107408748ac91805eee0e1554d618cd5
GIT binary patch
literal 80753
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
MQc9BL;$H&(KQ_Ao-2eap

literal 0
HcmV?d00001

diff --git a/core/media/media/css/controls.png b/core/media/media/css/controls.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6a857d800b64264443af4609e0ebf7175593d8f
GIT binary patch
literal 1892
zcmdUv_d6R37snIh7SSuz2t|V4+9fes_1q$f5VaGdb}NdiM3cByUnLZ^M^$TvYH6+3
zZt<dK>mo)edTp*6v8gC|<Ii|M&vVZAIp_KQaGvv==RC2tG&wIIB>(^b&SOo{wj536
z1dNZHlfT#k*&N}fAhCEpKEA0rt62a5cx-KsH)gZhr>CdK$Hy!d>*(m{=g*&qhld9T
z2mAZ`dwY93J3HIk+gn>(o12?VCUawBV|{&nZEbCJb@j)OA1f;>%gf7)i;D{j3-j~y
zb8~aEv$HcZGt<-4-@kvKnwpxNoSc}L7#|-W8yg!L85tfP9vT{AFc<>^1O5H|eSLl1
z-Q8VXU7eks9UUE?K7DF$Z*OaBYi(_9X=!O}Y;0&~sIRZDt*x!DuCA)8s;sQ6sHi9}
zFE1-AD=lp(DJgmN>Q!-ZaZynboleisFE1!4$ji&i&CSip$;r;ne(~Z(R#sMKX6Dl~
z3Ntb?($mvZQc{wWlM@pY6A}{Q<Kv&4kr^8s8xs=~9UUDN6-A@bA|oRsA|gUULV|;X
zgMxwr10%>}azH=;kx2CS5AyY;`1<;KdwUZI1W!*-4-XG_cXu~8H&<6z7Z(>NCnrZo
zM|*pFJ3BiZ4rgm?Yhz<$Wo2b)X=!0$VQy}I^X5%6Gczm}Yhq%8!C=s6Gzx`6B9VrM
zh6V-(H*Va}*Vot6)4O{0s;;iC&KY`IT3QGM0uG03YHF&fsi~@}s+@5}Sy@?0Nl8&r
zQBF<{c7{9@3YC?Wm64H=mX?;1l9H5^gg_u-ViICvVj?0U!otE}Fjz=P2m}HF0DxcW
zN>Glxq1syFIA`#G0pOSvCe9g}Kfv@B1pokvoCR?BpYUItra0Buk%}UF-KP4Ih%mgb
zzZU=w*MMtjz!Bwb*F!iC=`#n8be9@*o9qQJB9QKQ!7#pLuOJfHj{-yCbXS_I69E7o
zAQo+ecYOTSp5OU`gXsCo*>52)lh6vn8Kw*N@0iYb)3|u0uPUYjPIZ@+Fb|Aw;YTAb
z5*xWH@ll7~EM`~`)BMw-YTd3_=zldfr+26G^c6|<o>9ubO%Xt;J`06(dSSt}I(|Gi
z-t*F1?mb=zt7(_@kXPIV9`QVZ_h_=)jyh07AvR3;X^zG5ym@b#-hWSSIn=C%#4L8k
zRk&*G8xR<zT*l-z>FvgjcG~)1kFGlmk}OLyo{W4j`6Fzxc*HS|(D|o~1m@SscZF+L
z#~vvMstrBA_Ut3ef#^Ibr;l=euG~%w2lKfw#MAo4XLW1*>dM6xyEb>7=|IK#WHB8`
zjjHs6@{iuC^4}_Hl6MiQbsB1S)$V7}MEUE=$bbJUu(f>*Q_KVT`;GYz_5$C1(R%6r
zb#HJh?!lJ*kOI<%MLcD~mNhR`P@4Y99ItYSw=Vh1M^^5ka9jwFIa@j(%2fcPT#Oa;
z$P5qkI;b^~7@g$4e8@-<40LSip>WT}^x%Zd7+l@<cmCjd%#+zHlwk8atyh)q4iX)G
z12PND-mvCJZAZCnT14cyZ5oNx#=YA?fSuLadZ4siDx61_pr79deD{`M-{7>7|JWO%
z&1A^bwBo;5TXcQa-8&$H=Tb!$vr3zbzQ8pu%r5jL`%DPuszpuvua(L60t1TbgZCko
z$rV?gHL%rBURyr;Y=dm7eHvM=&>StyOr>#g`B7x!UbcIrVl{)GdZ$T&(wg@_sC2dr
z<K}keqRtgG*{biqcYV)#Rs&5<X^KS(R#+G!UprRcpZMq((iG}%r}yvD(h`3ne;Q0@
z47*c4s&2zdyn9Y#E^KAJqxtpZ?~f%XkxHYZ=pAcDcjYeypxfpw^@E|7p%$j-I-#qH
z`}An{<lJ-;Ny`ZD!4?qLK3ZA69nXiDWnU`QI9Y8SX@|vfhgyTfl}4J4!|uNg(KJHH
zM|>`|qxGJHtOJe;$JFDyUfJ1H_VOq`r4y*%<c$d7g0g%k)-zplTW0kR|Ec&Uv2<Ho
zg*S<rf>!^gAc|g&r7g!IlJsjXZlAOaE|G^qD{dtaisv}19gi`!-Cwlo2@;UsMHwBU
z>>3{ZsS_za)C)>Ab3+%Ak?h9s5*Wfjlxi?aW~MA$@F`^apbn~d)8K{l<HDIi=qbgP
zC++C0ut+HzFsB=9Bk1YCvMZ7=paR*@)dYuj4M{_ZPEc&WQ(O*96|+XXhcNg}C^~!v
zYb73E)2YeBmGoM@({l!P;6rb(?r}SkRyS2LppqNz@P7c`Q(<^Q+|gXmS|Fdte3%%n
z6UKId&e-2k%9sqKt+ww($xATvQSH1S8;lzWf5<%`IV6wfNuB3B4FJ~I5?zV(p#2XE
C_uXs&

literal 0
HcmV?d00001

diff --git a/core/media/media/css/controls.svg b/core/media/media/css/controls.svg
new file mode 100644
index 00000000..af3bd416
--- /dev/null
+++ b/core/media/media/css/controls.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?>
<!-- Generator: Adobe Fireworks CS6, Export SVG Extension by Aaron Beall (http://fireworks.abeall.com) . Version: 0.6.1  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg id="controls.fw-Page%201" viewBox="0 0 144 32" style="background-color:#ffffff00" version="1.1"
	xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
	x="0px" y="0px" width="144px" height="32px"
>
	<defs>
		<radialGradient id="gradient1" cx="50%" cy="50%" r="50%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#f2f2f2" stop-opacity="0.2" offset="100%"/>
		</radialGradient>
		<linearGradient id="gradient2" x1="50%" y1="-7.8652%" x2="50%" y2="249.6629%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient3" x1="50%" y1="0%" x2="50%" y2="238.75%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient4" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient5" x1="50%" y1="-33.3333%" x2="50%" y2="152.0833%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient6" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient7" x1="50%" y1="-33.3333%" x2="50%" y2="152.0833%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient8" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient9" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient10" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient11" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient12" x1="50%" y1="0%" x2="50%" y2="238.75%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient13" x1="40%" y1="-140%" x2="40%" y2="98.75%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient14" x1="50%" y1="0%" x2="50%" y2="238.75%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient15" x1="60%" y1="-140%" x2="60%" y2="98.75%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient16" x1="50%" y1="0%" x2="50%" y2="298.4375%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient17" x1="50%" y1="0%" x2="50%" y2="238.75%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient18" x1="50%" y1="-200%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient19" x1="50%" y1="-200%" x2="50%" y2="110.9375%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient20" x1="55%" y1="0%" x2="55%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="100%"/>
		</linearGradient>
		<linearGradient id="gradient21" x1="50%" y1="0%" x2="50%" y2="100%">
			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>
			<stop stop-color="#c8c8c8" stop-opacity="1" offset="99.4444%"/>
		</linearGradient>
	</defs>
	<g id="BG">
	</g>
	<g id="controls">
		<path id="Line" d="M 98.5 7.5 L 109.5 7.5 " stroke="#ffffff" stroke-width="1" fill="none"/>
		<path id="Line2" d="M 98.5 3.5 L 109.5 3.5 " stroke="#ffffff" stroke-width="1" fill="none"/>
		<path id="Line3" d="M 98.5 11.5 L 109.5 11.5 " stroke="#ffffff" stroke-width="1" fill="none"/>
		<path id="Ellipse" d="M 108 11.5 C 108 10.6716 108.4477 10 109 10 C 109.5523 10 110 10.6716 110 11.5 C 110 12.3284 109.5523 13 109 13 C 108.4477 13 108 12.3284 108 11.5 Z" fill="#ffffff"/>
		<path id="Ellipse2" d="M 104 7.5 C 104 6.6716 104.4477 6 105 6 C 105.5523 6 106 6.6716 106 7.5 C 106 8.3284 105.5523 9 105 9 C 104.4477 9 104 8.3284 104 7.5 Z" fill="#ffffff"/>
		<path id="Ellipse3" d="M 108 3.5 C 108 2.6716 108.4477 2 109 2 C 109.5523 2 110 2.6716 110 3.5 C 110 4.3284 109.5523 5 109 5 C 108.4477 5 108 4.3284 108 3.5 Z" fill="#ffffff"/>
	</g>
	<g id="backlight">
		<g id="off">
			<rect x="83" y="21" width="10" height="6" stroke="#ffffff" stroke-width="1" fill="#333333"/>
		</g>
		<g id="on">
			<path id="Ellipse4" d="M 81 8 C 81 5.2385 84.134 3 88 3 C 91.866 3 95 5.2385 95 8 C 95 10.7615 91.866 13 88 13 C 84.134 13 81 10.7615 81 8 Z" fill="url(#gradient1)"/>
			<rect x="83" y="5" width="10" height="6" stroke="#ffffff" stroke-width="1" fill="#333333"/>
		</g>
	</g>
	<g id="loop">
		<g id="on2">
			<path d="M 73.795 4.205 C 75.2155 4.8785 76.2 6.3234 76.2 8 C 76.2 10.3196 74.3196 12.2 72 12.2 C 69.6804 12.2 67.8 10.3196 67.8 8 C 67.8 6.3234 68.7845 4.8785 70.205 4.205 L 68.875 2.875 C 67.1501 3.9289 66 5.8306 66 8 C 66 11.3138 68.6862 14 72 14 C 75.3138 14 78 11.3138 78 8 C 78 5.8306 76.8499 3.9289 75.125 2.875 L 73.795 4.205 Z" fill="url(#gradient2)"/>
			<path d="M 71 2 L 66 2 L 71 7 L 71 2 Z" fill="url(#gradient3)"/>
		</g>
		<g id="off2">
			<path d="M 73.795 20.205 C 75.2155 20.8785 76.2 22.3234 76.2 24 C 76.2 26.3196 74.3196 28.2 72 28.2 C 69.6804 28.2 67.8 26.3196 67.8 24 C 67.8 22.3234 68.7845 20.8785 70.205 20.205 L 68.875 18.875 C 67.1501 19.9289 66 21.8306 66 24 C 66 27.3138 68.6862 30 72 30 C 75.3138 30 78 27.3138 78 24 C 78 21.8306 76.8499 19.9289 75.125 18.875 L 73.795 20.205 Z" fill="#a8a8b7"/>
			<path d="M 71 18 L 66 18 L 71 23 L 71 18 Z" fill="#a8a8b7"/>
		</g>
	</g>
	<g id="cc">
		<rect visibility="hidden" x="49" y="2" width="14" height="12" stroke="#b0b0b0" stroke-width="1" fill="none"/>
		<text visibility="hidden" x="49" y="17" width="14" fill="#ffffff" style="font-size: 10px; color: #ffffff; font-family: Arial; text-align: center; "><tspan><![CDATA[cc]]></tspan></text>
		<path d="M 55 7 C 50.2813 3.7813 50.063 12.9405 55 10 " stroke="#ffffff" stroke-width="1" fill="none"/>
		<path d="M 60 7 C 55.2813 3.7813 55.063 12.9405 60 10 " stroke="#ffffff" stroke-width="1" fill="none"/>
		<path d="M 50 3 L 62 3 L 62 13 L 50 13 L 50 3 ZM 49 2 L 49 14 L 63 14 L 63 2 L 49 2 Z" fill="url(#gradient4)"/>
		<rect x="49" y="2" width="14" height="12" fill="none"/>
	</g>
	<g id="volume">
		<g id="no%20sound">
			<rect x="17" y="5" width="5" height="6" fill="url(#gradient5)"/>
			<path d="M 21 5 L 25 2 L 25 14 L 21 11.0625 L 21 5 Z" fill="url(#gradient6)"/>
		</g>
		<g id="sound%20bars">
			<rect x="17" y="21" width="5" height="6" fill="url(#gradient7)"/>
			<path d="M 21 21 L 25 18 L 25 30 L 21 27.0625 L 21 21 Z" fill="url(#gradient8)"/>
			<path d="M 27 18 C 27 18 30.0625 17.375 30 24 C 29.9375 30.625 27 30 27 30 " stroke="#ffffff" stroke-width="1" fill="none"/>
			<path d="M 26 21.0079 C 26 21.0079 28.041 20.6962 27.9994 24 C 27.9577 27.3038 26 26.9921 26 26.9921 " stroke="#ffffff" stroke-width="1" fill="none"/>
		</g>
	</g>
	<g id="play/pause">
		<g id="play">
			<path id="Polygon" d="M 14 8.5 L 3 14 L 3 3 L 14 8.5 Z" fill="url(#gradient9)"/>
		</g>
		<g id="pause">
			<rect x="3" y="18" width="3" height="12" fill="url(#gradient10)"/>
			<rect x="10" y="18" width="3" height="12" fill="url(#gradient11)"/>
		</g>
	</g>
	<g id="fullscreen">
		<g id="enter%201">
			<path d="M 34 2 L 39 2 L 34 7 L 34 2 Z" fill="url(#gradient12)"/>
			<path d="M 34 14 L 39 14 L 34 9 L 34 14 Z" fill="url(#gradient13)"/>
			<path d="M 46 2 L 41 2 L 46 7 L 46 2 Z" fill="url(#gradient14)"/>
			<path d="M 46 14 L 41 14 L 46 9 L 46 14 Z" fill="url(#gradient15)"/>
		</g>
		<g id="exit">
			<path d="M 42 22 L 46 22 L 42 18 L 42 22 Z" fill="url(#gradient16)"/>
			<path d="M 38 22 L 38 18 L 34 22 L 38 22 Z" fill="url(#gradient17)"/>
			<path d="M 38 26 L 34 26 L 38 30 L 38 26 Z" fill="url(#gradient18)"/>
			<path d="M 42 26 L 42 30 L 46 26 L 42 26 Z" fill="url(#gradient19)"/>
		</g>
	</g>
	<g id="stop">
		<rect x="115" y="3" width="10" height="10" fill="url(#gradient20)"/>
	</g>
	<g id="chooser">
		<path d="M 135.2346 6.1522 C 136.2551 5.7295 137.4251 6.2141 137.8478 7.2346 C 138.2704 8.2551 137.7859 9.425 136.7654 9.8478 C 135.7449 10.2705 134.5749 9.7859 134.1522 8.7654 C 133.7295 7.7449 134.2141 6.5749 135.2346 6.1522 ZM 133.2735 1.4176 L 136 4.0054 L 138.7265 1.4176 L 138.8246 5.1754 L 142.5824 5.2735 L 139.9946 8 L 142.5824 10.7265 L 138.8246 10.8246 L 138.7265 14.5824 L 136 11.9946 L 133.2735 14.5824 L 133.1754 10.8246 L 129.4176 10.7265 L 132.0054 8 L 129.4176 5.2735 L 133.1754 5.1754 L 133.2735 1.4176 Z" fill="url(#gradient21)"/>
	</g>
</svg>
\ No newline at end of file
diff --git a/core/media/media/css/jumpforward.png b/core/media/media/css/jumpforward.png
new file mode 100644
index 0000000000000000000000000000000000000000..64d03841e251a7741eaaf3e90b21c49a2ddb97ec
GIT binary patch
literal 1563
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz0!3HD`IPL*ajKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z81_tIQnIRD+5xzcF$@#f@i7EL>sd^Q;1whpd3^o;3KxS@gNuokUZcbjY
zRfVk*ScMgk4HDK@QUEI{$+lIB@C{IK&M!(;Fx4~BGf=YQQczH^DN0GR3UYCSY6tRc
zl`=|73as??%gf94%8m8%i_-NCEiEne4UF`SjC6r2bc-wVN)jt{^NN)rhQQ2mNi9w;
z$}A|!%+FH*nVXoDUs__Tqy(}E4j}F<$xK7olvfP(7SMzGAQ^o_Jp+Ag+EObracBd{
z;MA6q4EI$*X;BW?PbtazsX3{+sd**EKz)W-tpkQFTqBAjD-sJJmVpBi;x`+R%dLV^
zi}Q0zK|v6jmsw(GXan{Tx-cR{AiA9Ma|?=6i;IEU>`b9rkj2o|M<A@RGdF^2Ko&&T
z;9ryp^l2i<U2r!ci=nHJ#AX4qAd&`9&|3v$R;1=cxMTtY6zmHl0~>v;66hM8^K<fx
zf(sIpQ$Y>`Ye5o1R}Ho%63H5%=MmN*Ng!!VNwz93P0C75E<uVdV4Q)|zEfhlK9aDF
zK33H>z?5L+T$Gwvl3x^(pPyp~c1JFVt6;1LbOX9P)Os6zP(DD)7m!Q`76s-yJ1(G3
zSPr)1ntJ-7G_XLp;OXKRVj;M6%5E>_K!LW+$2hK;bxC!$Hf=N%XATp4#2oQN^$5ql
z#)wXZ9|BPkH)gxJXm7pj=fk9RL*rh+he<#Fp0u2B*LPE-%nzgDb1`Mb=gzn(F$S%^
z`Yb{Amq^#W#+eOUzU57N?pVYrY0;K{qv4nHt#oPr#=sK?)nb~b%J+otc8EWibG(UV
zNuqe%0_jTSj8&<DGL<{BS1sCZofTD|WN)_Ce}lS}Xtmiv(Jxv@5)ZzayGY$J{Rbaw
z!7Wkmhg<TO9m$mLnA@7VLVa=RW6sy#Gv^pynCW?HLWsbwua|2@ZKPFRnUxlYYE;~L
zI9((#+aoW*q=vQJP5-p(=F+yhg5AyGds_O`_?SN|+`P$rx9FUA{R;8U3#<b!+kgGx
z?DRh5<d3Em0SApd+$x;bB)0tuU063cFzBH3<_kW2Qr10EN*2jNT~>$dxAOkfUNG&l
z&+`z2lH|$B%hft#*-pxt^zj_FuKJq!^2`2{frh;+U6N-P9o@W8zc+Uw*ET!8<OOkS
zyK^?H&rec0b@H~v^*vI@&CVqX2RO|?yf!j>(k6qvYu{g(9xwcM_SSlhTW8tB<m2Z?
z-iki>we6bcf-3K|8(5^yvUptC>}t`#eeaF<+e!9|{`uPd+dc<Wz%zKd`njxgN@xNA
D=i(#f

literal 0
HcmV?d00001

diff --git a/core/media/media/css/loading.gif b/core/media/media/css/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..612222be5e474c36c345042dd6f697fa1d16a6a0
GIT binary patch
literal 6224
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
a%CSF@A_b&47t_EYjD0%aV6(nOxBn04F1xn?

literal 0
HcmV?d00001

diff --git a/core/media/media/css/mediaelementplayer.css b/core/media/media/css/mediaelementplayer.css
new file mode 100644
index 00000000..233f072d
--- /dev/null
+++ b/core/media/media/css/mediaelementplayer.css
@@ -0,0 +1,1008 @@
+.mejs-offscreen{
+/* Accessibility: hide screen reader texts (and prefer "top" for RTL languages).  Reference: http://blog.rrwd.nl/2015/04/04/the-screen-reader-text-class-why-and-how/ */
+	clip: rect(1px 1px 1px 1px); /* IE6, IE7 - no likey commas */
+	clip: rect(1px, 1px, 1px, 1px); /* IE8-IE11 - we likey commas, no support for clip-path */
+	clip-path: polygon(0px 0px, 0px 0px,0px 0px, 0px 0px);
+	position: absolute !important;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+
+.mejs-container {
+	position: relative;
+	background: #000;
+	font-family: "Helvetica", Arial, serif;
+	text-align: left;
+	vertical-align: top;
+	text-indent: 0;
+}
+
+.mejs-fill-container,.mejs-fill-container .mejs-container{
+    	width: 100%;
+    	height: 100%;
+}
+
+.mejs-fill-container{
+    	overflow: hidden;
+}
+
+.mejs-container:focus {
+	outline: none;
+}
+
+.me-plugin {
+	position: absolute;
+}
+
+.mejs-embed, .mejs-embed body {
+	width: 100%;
+	height: 100%;
+	margin: 0;
+	padding: 0;
+	background: #000;
+	overflow: hidden;
+}
+
+.mejs-fullscreen {
+	/* set it to not show scroll bars so 100% will work */
+	overflow: hidden !important;
+}
+
+.mejs-container-fullscreen {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	overflow: hidden;
+	z-index: 1000;
+}
+.mejs-container-fullscreen .mejs-mediaelement,
+.mejs-container-fullscreen video {
+	width: 100%;
+	height: 100%;
+}
+
+.mejs-clear {
+	clear: both;
+}
+
+/* Start: LAYERS */
+.mejs-background {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.mejs-mediaelement {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+
+.mejs-poster {
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-size: contain ;
+	background-position: 50% 50% ;
+	background-repeat: no-repeat ;
+}
+:root .mejs-poster img {
+	display: none ;
+}
+
+.mejs-poster img {
+	border: 0;
+	padding: 0;
+}
+
+.mejs-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.mejs-overlay-play {
+	cursor: pointer;
+}
+
+.mejs-overlay-button {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 100px;
+	height: 100px;
+	margin: -50px 0 0 -50px;
+	background: url("bigplay.svg") no-repeat;
+}
+
+.no-svg .mejs-overlay-button {
+	background-image: url("bigplay.png");
+}
+
+.mejs-overlay:hover .mejs-overlay-button {
+	background-position: 0 -100px ;
+}
+
+.mejs-overlay-loading {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 80px;
+	height: 80px;
+	margin: -40px 0 0 -40px;
+	background: #333;
+	background: url("background.png");
+	background: rgba(0, 0, 0, 0.9);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.9)), to(rgba(0,0,0,0.9)));
+	background: -webkit-linear-gradient(top, rgba(50,50,50,0.9), rgba(0,0,0,0.9));
+	background: -moz-linear-gradient(top, rgba(50,50,50,0.9), rgba(0,0,0,0.9));
+	background: -o-linear-gradient(top, rgba(50,50,50,0.9), rgba(0,0,0,0.9));
+	background: -ms-linear-gradient(top, rgba(50,50,50,0.9), rgba(0,0,0,0.9));
+	background: linear-gradient(rgba(50,50,50,0.9), rgba(0,0,0,0.9));
+}
+
+.mejs-overlay-loading span {
+	display: block;
+	width: 80px;
+	height: 80px;
+	background: transparent url("loading.gif") 50% 50% no-repeat;
+}
+
+/* End: LAYERS */
+
+/* Start: CONTROL BAR */
+.mejs-container .mejs-controls {
+	position: absolute;
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	bottom: 0;
+	left: 0;
+	background: url("background.png");
+	background: rgba(0, 0, 0, 0.7);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.7)), to(rgba(0,0,0,0.7)));
+	background: -webkit-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: -moz-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: -o-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: -ms-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: linear-gradient(rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	height: 30px;
+	width: 100%;
+}
+.mejs-container .mejs-controls  div {
+	list-style-type: none;
+	background-image: none;
+	display: block;
+	float: left;
+	margin: 0;
+	padding: 0;
+	width: 26px;
+	height: 26px;
+	font-size: 11px;
+	line-height: 11px;
+	font-family: "Helvetica", Arial, serif;
+	border: 0;
+}
+
+.mejs-controls .mejs-button button {
+	cursor: pointer;
+	display: block;
+	font-size: 0;
+	line-height: 0;
+	text-decoration: none;
+	margin: 7px 5px;
+	padding: 0;
+	position: absolute;
+	height: 16px;
+	width: 16px;
+	border: 0;
+	background: transparent url("controls.svg") no-repeat;
+}
+
+.no-svg .mejs-controls .mejs-button button {
+	background-image: url("controls.png");
+}
+
+	/* :focus for accessibility */
+.mejs-controls .mejs-button button:focus {
+	outline: dotted 1px #999;
+}
+
+/* End: CONTROL BAR */
+
+/* Start: Time (Current / Duration) */
+.mejs-container .mejs-controls .mejs-time {
+	color: #fff;
+	display: block;
+	height: 17px;
+	width: auto;
+	padding: 10px 3px 0 3px ;
+	overflow: hidden;
+	text-align: center;
+	-moz-box-sizing: content-box;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+.mejs-container .mejs-controls .mejs-time a {
+	color: #fff;
+	font-size: 11px;
+	line-height: 12px;
+	display: block;
+	float: left;
+	margin: 1px 2px 0 0;
+	width: auto;
+}
+/* End: Time (Current / Duration) */
+
+/* Start: Play/Pause/Stop */
+.mejs-controls .mejs-play button {
+	background-position: 0 0;
+}
+
+.mejs-controls .mejs-pause button {
+	background-position: 0 -16px;
+}
+
+.mejs-controls .mejs-stop button {
+	background-position: -112px 0;
+}
+/* Start: Play/Pause/Stop */
+
+/* Start: Progress Bar */
+.mejs-controls div.mejs-time-rail {
+	direction: ltr;
+	width: 200px;
+	padding-top: 5px;
+}
+
+.mejs-controls .mejs-time-rail span, .mejs-controls .mejs-time-rail a {
+	display: block;
+	position: absolute;
+	width: 180px;
+	height: 10px;
+	-webkit-border-radius: 2px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	cursor: pointer;
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-total {
+	margin: 5px;
+	background: #333;
+	background: rgba(50,50,50,0.8);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(30,30,30,0.8)), to(rgba(60,60,60,0.8)));
+	background: -webkit-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: -moz-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: -o-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: -ms-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: linear-gradient(rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-buffering {
+	width: 100%;
+	background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+	background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+	-webkit-background-size: 15px 15px;
+	-moz-background-size: 15px 15px;
+	-o-background-size: 15px 15px;
+	background-size: 15px 15px;
+	-webkit-animation: buffering-stripes 2s linear infinite;
+	-moz-animation: buffering-stripes 2s linear infinite;
+	-ms-animation: buffering-stripes 2s linear infinite;
+	-o-animation: buffering-stripes 2s linear infinite;
+	animation: buffering-stripes 2s linear infinite;
+}
+
+@-webkit-keyframes buffering-stripes { from {background-position: 0 0;} to {background-position: 30px 0;} }
+@-moz-keyframes buffering-stripes { from {background-position: 0 0;} to {background-position: 30px 0;} }
+@-ms-keyframes buffering-stripes { from {background-position: 0 0;} to {background-position: 30px 0;} }
+@-o-keyframes buffering-stripes { from {background-position: 0 0;} to {background-position: 30px 0;} }
+@keyframes buffering-stripes { from {background-position: 0 0;} to {background-position: 30px 0;} }
+
+.mejs-controls .mejs-time-rail .mejs-time-loaded {
+	background: #3caac8;
+	background: rgba(60,170,200,0.8);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(44,124,145,0.8)), to(rgba(78,183,212,0.8)));
+	background: -webkit-linear-gradient(top, rgba(44,124,145,0.8), rgba(78,183,212,0.8));
+	background: -moz-linear-gradient(top, rgba(44,124,145,0.8), rgba(78,183,212,0.8));
+	background: -o-linear-gradient(top, rgba(44,124,145,0.8), rgba(78,183,212,0.8));
+	background: -ms-linear-gradient(top, rgba(44,124,145,0.8), rgba(78,183,212,0.8));
+	background: linear-gradient(rgba(44,124,145,0.8), rgba(78,183,212,0.8));
+	width: 0;
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-current {
+	background: #fff;
+	background: rgba(255,255,255,0.8);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255,255,255,0.9)), to(rgba(200,200,200,0.8)));
+	background: -webkit-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: -moz-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: -o-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: -ms-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: linear-gradient(rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	width: 0;
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-handle {
+	display: none;
+	position: absolute;
+	margin: 0;
+	width: 10px;
+	background: #fff;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	cursor: pointer;
+	border: solid 2px #333;
+	top: -2px;
+	text-align: center;
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-float {
+	position: absolute;
+	display: none;
+	background: #eee;
+	width: 36px;
+	height: 17px;
+	border: solid 1px #333;
+	top: -26px;
+	margin-left: -18px;
+	text-align: center;
+	color: #111;
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-float-current {
+	margin: 2px;
+	width: 30px;
+	display: block;
+	text-align: center;
+	left: 0;
+}
+
+.mejs-controls .mejs-time-rail .mejs-time-float-corner {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	line-height: 0;
+	border: solid 5px #eee;
+	border-color: #eee transparent transparent transparent;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+	top: 15px;
+	left: 13px;
+}
+
+.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float {
+	width: 48px;
+}
+
+.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float-current {
+	width: 44px;
+}
+
+.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float-corner {
+	left: 18px;
+}
+
+/*
+.mejs-controls .mejs-time-rail:hover .mejs-time-handle {
+	visibility:visible;
+}
+*/
+/* End: Progress Bar */
+
+/* Start: Fullscreen */
+.mejs-controls .mejs-fullscreen-button button {
+	background-position: -32px 0;
+}
+
+.mejs-controls .mejs-unfullscreen button {
+	background-position: -32px -16px;
+}
+/* End: Fullscreen */
+
+
+/* Start: Mute/Volume */
+.mejs-controls .mejs-volume-button {
+}
+
+.mejs-controls .mejs-mute button {
+	background-position: -16px -16px;
+}
+
+.mejs-controls .mejs-unmute button {
+	background-position: -16px 0;
+}
+
+.mejs-controls .mejs-volume-button {
+	position: relative;
+}
+
+.mejs-controls .mejs-volume-button .mejs-volume-slider {
+	display: none;
+	height: 115px;
+	width: 25px;
+	background: url("background.png");
+	background: rgba(50, 50, 50, 0.7);
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+	top: -115px;
+	left: 0;
+	z-index: 1;
+	position: absolute;
+	margin: 0;
+}
+
+.mejs-controls .mejs-volume-button:hover {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+
+/*
+.mejs-controls .mejs-volume-button:hover .mejs-volume-slider {
+	display: block;
+}
+*/
+
+.mejs-controls .mejs-volume-button .mejs-volume-slider .mejs-volume-total {
+	position: absolute;
+	left: 11px;
+	top: 8px;
+	width: 2px;
+	height: 100px;
+	background: #ddd;
+	background: rgba(255, 255, 255, 0.5);
+	margin: 0;
+}
+
+.mejs-controls .mejs-volume-button .mejs-volume-slider .mejs-volume-current {
+	position: absolute;
+	left: 11px;
+	top: 8px;
+	width: 2px;
+	height: 100px;
+	background: #ddd;
+	background: rgba(255, 255, 255, 0.9);
+	margin: 0;
+}
+
+.mejs-controls .mejs-volume-button .mejs-volume-slider .mejs-volume-handle {
+	position: absolute;
+	left: 4px;
+	top: -3px;
+	width: 16px;
+	height: 6px;
+	background: #ddd;
+	background: rgba(255, 255, 255, 0.9);
+	cursor: N-resize;
+	-webkit-border-radius: 1px;
+	-moz-border-radius: 1px;
+	border-radius: 1px;
+	margin: 0;
+}
+
+/* horizontal version */
+.mejs-controls a.mejs-horizontal-volume-slider {
+	height: 26px;
+	width: 56px;
+	position: relative;
+    display: block;
+    float: left;
+    vertical-align: middle;
+}
+
+.mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total {
+	position: absolute;
+	left: 0;
+	top: 11px;
+	width: 50px;
+	height: 8px;
+	margin: 0;
+	padding: 0;
+	font-size: 1px;
+	-webkit-border-radius: 2px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	background: #333;
+	background: rgba(50,50,50,0.8);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(30,30,30,0.8)), to(rgba(60,60,60,0.8)));
+	background: -webkit-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: -moz-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: -o-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: -ms-linear-gradient(top, rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+	background: linear-gradient(rgba(30,30,30,0.8), rgba(60,60,60,0.8));
+}
+
+.mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current {
+	position: absolute;
+	left: 0;
+	top: 11px;
+	width: 50px;
+	height: 8px;
+	margin: 0;
+	padding: 0;
+	font-size: 1px;
+	-webkit-border-radius: 2px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	background: #fff;
+	background: rgba(255,255,255,0.8);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255,255,255,0.9)), to(rgba(200,200,200,0.8)));
+	background: -webkit-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: -moz-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: -o-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: -ms-linear-gradient(top, rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+	background: linear-gradient(rgba(255,255,255,0.9), rgba(200,200,200,0.8));
+}
+
+.mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-handle {
+	display: none;
+}
+
+/* End: Mute/Volume */
+
+/* Start: Track (Captions and Chapters) */
+.mejs-controls .mejs-captions-button {
+	position: relative;
+}
+
+.mejs-controls .mejs-captions-button button {
+	background-position: -48px 0;
+}
+.mejs-controls .mejs-captions-button .mejs-captions-selector {
+	visibility: hidden;
+	position: absolute;
+	bottom: 26px;
+	right: -51px;
+	width: 85px;
+	height: 100px;
+	background: url("background.png");
+	background: rgba(50,50,50,0.7);
+	border: solid 1px transparent;
+	padding: 10px 10px 0 10px;
+	overflow: hidden;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+
+.mejs-controls .mejs-captions-button:hover  .mejs-captions-selector {
+	visibility: visible;
+}
+
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul {
+	margin: 0;
+	padding: 0;
+	display: block;
+	list-style-type: none !important;
+	overflow: hidden;
+}
+
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul li {
+	margin: 0 0 6px 0;
+	padding: 0;
+	list-style-type: none !important;
+	display: block;
+	color: #fff;
+	overflow: hidden;
+}
+
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul li input {
+	clear: both;
+	float: left;
+	margin: 3px 3px 0 5px;
+}
+
+.mejs-controls .mejs-captions-button .mejs-captions-selector ul li label {
+	width: 55px;
+	float: left;
+	padding: 4px 0 0 0;
+	line-height: 15px;
+	font-family: "Helvetica", Arial, serif;
+	font-size: 10px;
+}
+
+.mejs-controls .mejs-captions-button .mejs-captions-translations {
+	font-size: 10px;
+	margin: 0 0 5px 0;
+}
+
+.mejs-chapters {
+	position: absolute;
+	top: 0;
+	left: 0;
+	border-right: solid 1px #fff;
+	width: 10000px;
+	z-index: 1;
+}
+
+.mejs-chapters .mejs-chapter {
+	position: absolute;
+	float: left;
+	background: #222;
+	background: rgba(0, 0, 0, 0.7);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.7)), to(rgba(0,0,0,0.7)));
+	background: -webkit-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: -moz-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: -o-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: -ms-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	background: linear-gradient(rgba(50,50,50,0.7), rgba(0,0,0,0.7));
+	filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr=#323232,endColorstr=#000000);
+	overflow: hidden;
+	border: 0;
+}
+
+.mejs-chapters .mejs-chapter .mejs-chapter-block {
+	font-size: 11px;
+	color: #fff;
+	padding: 5px;
+	display: block;
+	border-right: solid 1px #333;
+	border-bottom: solid 1px #333;
+	cursor: pointer;
+}
+
+.mejs-chapters .mejs-chapter .mejs-chapter-block-last {
+	border-right: none;
+}
+
+.mejs-chapters .mejs-chapter .mejs-chapter-block:hover {
+	background: #666;
+	background: rgba(102,102,102, 0.7);
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(102,102,102,0.7)), to(rgba(50,50,50,0.6)));
+	background: -webkit-linear-gradient(top, rgba(102,102,102,0.7), rgba(50,50,50,0.6));
+	background: -moz-linear-gradient(top, rgba(102,102,102,0.7), rgba(50,50,50,0.6));
+	background: -o-linear-gradient(top, rgba(102,102,102,0.7), rgba(50,50,50,0.6));
+	background: -ms-linear-gradient(top, rgba(102,102,102,0.7), rgba(50,50,50,0.6));
+	background: linear-gradient(rgba(102,102,102,0.7), rgba(50,50,50,0.6));
+	filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr=#666666,endColorstr=#323232);
+}
+
+.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-title {
+	font-size: 12px;
+	font-weight: bold;
+	display: block;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	margin: 0 0 3px 0;
+	line-height: 12px;
+}
+
+.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-timespan {
+	font-size: 12px;
+	line-height: 12px;
+	margin: 3px 0 4px 0;
+	display: block;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.mejs-captions-layer {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	text-align:center;
+	line-height: 20px;
+	font-size: 16px;
+	color: #fff;
+}
+
+.mejs-captions-layer  a {
+	color: #fff;
+	text-decoration: underline;
+}
+
+.mejs-captions-layer[lang=ar] {
+	font-size: 20px;
+	font-weight: normal;
+}
+
+.mejs-captions-position {
+	position: absolute;
+	width: 100%;
+	bottom: 15px;
+	left: 0;
+}
+
+.mejs-captions-position-hover {
+	bottom: 35px;
+}
+
+.mejs-captions-text {
+	padding: 0;
+	background: url("background.png");
+	background: rgba(20, 20, 20, 0.5);
+	white-space: pre-wrap;
+	-webkit-box-shadow: 5px 0 0 rgba(20, 20, 20, 0.5), -5px 0 0 rgba(20, 20, 20, 0.5);
+	box-shadow: 5px 0 0 rgba(20, 20, 20, 0.5), -5px 0 0 rgba(20, 20, 20, 0.5);
+}
+/* End: Track (Captions and Chapters) */
+
+/* Start: Error */
+.me-cannotplay {
+}
+
+.me-cannotplay a {
+	color: #fff;
+	font-weight: bold;
+}
+
+.me-cannotplay span {
+	padding: 15px;
+	display: block;
+}
+/* End: Error */
+
+
+/* Start: Loop */
+.mejs-controls .mejs-loop-off button {
+	background-position: -64px -16px;
+}
+
+.mejs-controls .mejs-loop-on button {
+	background-position: -64px 0;
+}
+
+/* End: Loop */
+
+/* Start: backlight */
+.mejs-controls .mejs-backlight-off button {
+	background-position: -80px -16px;
+}
+
+.mejs-controls .mejs-backlight-on button {
+	background-position: -80px 0;
+}
+/* End: backlight */
+
+/* Start: Picture Controls */
+.mejs-controls .mejs-picturecontrols-button {
+	background-position: -96px 0;
+}
+/* End: Picture Controls */
+
+
+/* context menu */
+.mejs-contextmenu {
+	position: absolute;
+	width: 150px;
+	padding: 10px;
+	border-radius: 4px;
+	top: 0;
+	left: 0;
+	background: #fff;
+	border: solid 1px #999;
+	z-index: 1001; /* make sure it shows on fullscreen */
+}
+.mejs-contextmenu .mejs-contextmenu-separator {
+	height: 1px;
+	font-size: 0;
+	margin: 5px 6px;
+	background: #333;
+}
+
+.mejs-contextmenu .mejs-contextmenu-item {
+	font-family: "Helvetica", Arial, serif;
+	font-size: 12px;
+	padding: 4px 6px;
+	cursor: pointer;
+	color: #333;
+}
+.mejs-contextmenu .mejs-contextmenu-item:hover {
+	background: #2C7C91;
+	color: #fff;
+}
+
+/* Start: Source Chooser */
+.mejs-controls .mejs-sourcechooser-button {
+	position: relative;
+}
+
+.mejs-controls .mejs-sourcechooser-button button {
+	background-position: -128px 0;
+}
+
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector {
+	visibility: hidden;
+	position: absolute;
+	bottom: 26px;
+	right: -10px;
+	width: 130px;
+	height: 100px;
+	background: url("background.png");
+	background: rgba(50,50,50,0.7);
+	border: solid 1px transparent;
+	padding: 10px;
+	overflow: hidden;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul {
+	margin: 0;
+	padding: 0;
+	display: block;
+	list-style-type: none !important;
+	overflow: hidden;
+}
+
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li {
+	margin: 0 0 6px 0;
+	padding: 0;
+	list-style-type: none !important;
+	display: block;
+	color: #fff;
+	overflow: hidden;
+}
+
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li input {
+	clear: both;
+	float: left;
+	margin: 3px 3px 0 5px;
+}
+
+.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li label {
+	width: 100px;
+	float: left;
+	padding: 4px 0 0 0;
+	line-height: 15px;
+	font-family: "Helvetica", Arial, serif;
+	font-size: 10px;
+}
+/* End: Source Chooser */
+
+/* Start: Postroll */
+.mejs-postroll-layer {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: url("background.png");
+	background: rgba(50,50,50,0.7);
+	z-index: 1000;
+	overflow: hidden;
+}
+.mejs-postroll-layer-content {
+	width: 100%;
+	height: 100%;
+}
+.mejs-postroll-close {
+	position: absolute;
+	right: 0;
+	top: 0;
+	background: url("background.png");
+	background: rgba(50,50,50,0.7);
+	color: #fff;
+	padding: 4px;
+	z-index: 100;
+	cursor: pointer;
+}
+/* End: Postroll */
+
+
+/* Start: Speed */
+div.mejs-speed-button {
+	width: 46px !important;
+	position: relative;
+}
+
+.mejs-controls .mejs-button.mejs-speed-button button {
+	background: transparent;
+	width: 36px;
+	font-size: 11px;
+	line-height: normal;
+	color: #ffffff;
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector {
+	display: none;
+	position: absolute;
+	top: -100px;
+	left: -10px;
+	width: 60px;
+	height: 100px;
+	background: url("background.png");
+	background: rgba(50, 50, 50, 0.7);
+	border: solid 1px transparent;
+	padding: 0;
+	overflow: hidden;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+
+
+.mejs-controls .mejs-speed-button:hover > .mejs-speed-selector {
+	display: block;
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector ul li label.mejs-speed-selected {
+	color: rgba(33, 248, 248, 1);
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector ul {
+	margin: 0;
+	padding: 0;
+	display: block;
+	list-style-type: none !important;
+	overflow: hidden;
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector ul li {
+	margin: 0 0 6px 0;
+	padding: 0 10px;
+	list-style-type: none !important;
+	display: block;
+	color: #fff;
+	overflow: hidden;
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector ul li input {
+	clear: both;
+	float: left;
+	margin: 3px 3px 0 5px;
+	display: none;
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector ul li label {
+	width: 60px;
+	float: left;
+	padding: 4px 0 0 0;
+	line-height: 15px;
+	font-family: "Helvetica", Arial, serif;
+	font-size: 11px;
+	color: white;
+	margin-left: 5px;
+	cursor: pointer;
+}
+
+.mejs-controls .mejs-speed-button .mejs-speed-selector ul li:hover {
+	background-color: rgb(200, 200, 200) !important;
+	background-color: rgba(255,255,255,.4) !important;
+}
+/* End: Speed */
+
+/* Start: Jump Forward */
+
+.mejs-controls .mejs-button.mejs-jump-forward-button {
+	background: transparent url("jumpforward.png") no-repeat 3px 3px;
+}
+.mejs-controls .mejs-button.mejs-jump-forward-button button {
+	background: transparent;
+	font-size: 9px;
+	line-height: normal;
+	color: #ffffff;
+}
+
+/* End: Jump Forward */
+
+/* Start: Skip Back */
+
+.mejs-controls .mejs-button.mejs-skip-back-button {
+	background: transparent url("skipback.png") no-repeat 3px 3px;
+}
+.mejs-controls .mejs-button.mejs-skip-back-button button {
+	background: transparent;
+	font-size: 9px;
+	line-height: normal;
+	color: #ffffff;
+}
+
+/* End: Skip Back */
+
diff --git a/core/media/media/css/mediaelementplayer.min.css b/core/media/media/css/mediaelementplayer.min.css
new file mode 100644
index 00000000..ea3a4032
--- /dev/null
+++ b/core/media/media/css/mediaelementplayer.min.css
@@ -0,0 +1 @@
+.mejs-offscreen{clip:rect(1px 1px 1px 1px);clip:rect(1px,1px,1px,1px);clip-path:polygon(0px 0,0 0,0 0,0 0);position:absolute!important;height:1px;width:1px;overflow:hidden}.mejs-container{position:relative;background:#000;font-family:Helvetica,Arial,serif;text-align:left;vertical-align:top;text-indent:0}.mejs-fill-container,.mejs-fill-container .mejs-container{width:100%;height:100%}.mejs-fill-container{overflow:hidden}.mejs-container:focus{outline:0}.me-plugin{position:absolute}.mejs-embed,.mejs-embed body{width:100%;height:100%;margin:0;padding:0;background:#000;overflow:hidden}.mejs-fullscreen{overflow:hidden!important}.mejs-container-fullscreen{position:fixed;left:0;top:0;right:0;bottom:0;overflow:hidden;z-index:1000}.mejs-container-fullscreen .mejs-mediaelement,.mejs-container-fullscreen video{width:100%;height:100%}.mejs-clear{clear:both}.mejs-background{position:absolute;top:0;left:0}.mejs-mediaelement{position:absolute;top:0;left:0;width:100%;height:100%}.mejs-poster{position:absolute;top:0;left:0;background-size:contain;background-position:50% 50%;background-repeat:no-repeat}:root .mejs-poster img{display:none}.mejs-poster img{border:0;padding:0}.mejs-overlay{position:absolute;top:0;left:0}.mejs-overlay-play{cursor:pointer}.mejs-overlay-button{position:absolute;top:50%;left:50%;width:100px;height:100px;margin:-50px 0 0 -50px;background:url(bigplay.svg) no-repeat}.no-svg .mejs-overlay-button{background-image:url(bigplay.png)}.mejs-overlay:hover .mejs-overlay-button{background-position:0 -100px}.mejs-overlay-loading{position:absolute;top:50%;left:50%;width:80px;height:80px;margin:-40px 0 0 -40px;background:#333;background:url(background.png);background:rgba(0,0,0,.9);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(50,50,50,.9)),to(rgba(0,0,0,.9)));background:-webkit-linear-gradient(top,rgba(50,50,50,.9),rgba(0,0,0,.9));background:-moz-linear-gradient(top,rgba(50,50,50,.9),rgba(0,0,0,.9));background:-o-linear-gradient(top,rgba(50,50,50,.9),rgba(0,0,0,.9));background:-ms-linear-gradient(top,rgba(50,50,50,.9),rgba(0,0,0,.9));background:linear-gradient(rgba(50,50,50,.9),rgba(0,0,0,.9))}.mejs-overlay-loading span{display:block;width:80px;height:80px;background:transparent url(loading.gif) 50% 50% no-repeat}.mejs-container .mejs-controls{position:absolute;list-style-type:none;margin:0;padding:0;bottom:0;left:0;background:url(background.png);background:rgba(0,0,0,.7);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(50,50,50,.7)),to(rgba(0,0,0,.7)));background:-webkit-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:-moz-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:-o-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:-ms-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:linear-gradient(rgba(50,50,50,.7),rgba(0,0,0,.7));height:30px;width:100%}.mejs-container .mejs-controls div{list-style-type:none;background-image:none;display:block;float:left;margin:0;padding:0;width:26px;height:26px;font-size:11px;line-height:11px;font-family:Helvetica,Arial,serif;border:0}.mejs-controls .mejs-button button{cursor:pointer;display:block;font-size:0;line-height:0;text-decoration:none;margin:7px 5px;padding:0;position:absolute;height:16px;width:16px;border:0;background:transparent url(controls.svg) no-repeat}.no-svg .mejs-controls .mejs-button button{background-image:url(controls.png)}.mejs-controls .mejs-button button:focus{outline:dotted 1px #999}.mejs-container .mejs-controls .mejs-time{color:#fff;display:block;height:17px;width:auto;padding:10px 3px 0;overflow:hidden;text-align:center;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}.mejs-container .mejs-controls .mejs-time a{color:#fff;font-size:11px;line-height:12px;display:block;float:left;margin:1px 2px 0 0;width:auto}.mejs-controls .mejs-play button{background-position:0 0}.mejs-controls .mejs-pause button{background-position:0 -16px}.mejs-controls .mejs-stop button{background-position:-112px 0}.mejs-controls div.mejs-time-rail{direction:ltr;width:200px;padding-top:5px}.mejs-controls .mejs-time-rail span,.mejs-controls .mejs-time-rail a{display:block;position:absolute;width:180px;height:10px;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;cursor:pointer}.mejs-controls .mejs-time-rail .mejs-time-total{margin:5px;background:#333;background:rgba(50,50,50,.8);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(30,30,30,.8)),to(rgba(60,60,60,.8)));background:-webkit-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:-moz-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:-o-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:-ms-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:linear-gradient(rgba(30,30,30,.8),rgba(60,60,60,.8))}.mejs-controls .mejs-time-rail .mejs-time-buffering{width:100%;background-image:-o-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,.15)),color-stop(0.75,rgba(255,255,255,.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:15px 15px;-moz-background-size:15px 15px;-o-background-size:15px 15px;background-size:15px 15px;-webkit-animation:buffering-stripes 2s linear infinite;-moz-animation:buffering-stripes 2s linear infinite;-ms-animation:buffering-stripes 2s linear infinite;-o-animation:buffering-stripes 2s linear infinite;animation:buffering-stripes 2s linear infinite}@-webkit-keyframes buffering-stripes{from{background-position:0 0}to{background-position:30px 0}}@-moz-keyframes buffering-stripes{from{background-position:0 0}to{background-position:30px 0}}@-ms-keyframes buffering-stripes{from{background-position:0 0}to{background-position:30px 0}}@-o-keyframes buffering-stripes{from{background-position:0 0}to{background-position:30px 0}}@keyframes buffering-stripes{from{background-position:0 0}to{background-position:30px 0}}.mejs-controls .mejs-time-rail .mejs-time-loaded{background:#3caac8;background:rgba(60,170,200,.8);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(44,124,145,.8)),to(rgba(78,183,212,.8)));background:-webkit-linear-gradient(top,rgba(44,124,145,.8),rgba(78,183,212,.8));background:-moz-linear-gradient(top,rgba(44,124,145,.8),rgba(78,183,212,.8));background:-o-linear-gradient(top,rgba(44,124,145,.8),rgba(78,183,212,.8));background:-ms-linear-gradient(top,rgba(44,124,145,.8),rgba(78,183,212,.8));background:linear-gradient(rgba(44,124,145,.8),rgba(78,183,212,.8));width:0}.mejs-controls .mejs-time-rail .mejs-time-current{background:#fff;background:rgba(255,255,255,.8);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.9)),to(rgba(200,200,200,.8)));background:-webkit-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:-moz-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:-o-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:-ms-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:linear-gradient(rgba(255,255,255,.9),rgba(200,200,200,.8));width:0}.mejs-controls .mejs-time-rail .mejs-time-handle{display:none;position:absolute;margin:0;width:10px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;cursor:pointer;border:solid 2px #333;top:-2px;text-align:center}.mejs-controls .mejs-time-rail .mejs-time-float{position:absolute;display:none;background:#eee;width:36px;height:17px;border:solid 1px #333;top:-26px;margin-left:-18px;text-align:center;color:#111}.mejs-controls .mejs-time-rail .mejs-time-float-current{margin:2px;width:30px;display:block;text-align:center;left:0}.mejs-controls .mejs-time-rail .mejs-time-float-corner{position:absolute;display:block;width:0;height:0;line-height:0;border:solid 5px #eee;border-color:#eee transparent transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;top:15px;left:13px}.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float{width:48px}.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float-current{width:44px}.mejs-long-video .mejs-controls .mejs-time-rail .mejs-time-float-corner{left:18px}.mejs-controls .mejs-fullscreen-button button{background-position:-32px 0}.mejs-controls .mejs-unfullscreen button{background-position:-32px -16px}.mejs-controls .mejs-volume-button{}.mejs-controls .mejs-mute button{background-position:-16px -16px}.mejs-controls .mejs-unmute button{background-position:-16px 0}.mejs-controls .mejs-volume-button{position:relative}.mejs-controls .mejs-volume-button .mejs-volume-slider{display:none;height:115px;width:25px;background:url(background.png);background:rgba(50,50,50,.7);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;top:-115px;left:0;z-index:1;position:absolute;margin:0}.mejs-controls .mejs-volume-button:hover{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.mejs-controls .mejs-volume-button .mejs-volume-slider .mejs-volume-total{position:absolute;left:11px;top:8px;width:2px;height:100px;background:#ddd;background:rgba(255,255,255,.5);margin:0}.mejs-controls .mejs-volume-button .mejs-volume-slider .mejs-volume-current{position:absolute;left:11px;top:8px;width:2px;height:100px;background:#ddd;background:rgba(255,255,255,.9);margin:0}.mejs-controls .mejs-volume-button .mejs-volume-slider .mejs-volume-handle{position:absolute;left:4px;top:-3px;width:16px;height:6px;background:#ddd;background:rgba(255,255,255,.9);cursor:N-resize;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;margin:0}.mejs-controls a.mejs-horizontal-volume-slider{height:26px;width:56px;position:relative;display:block;float:left;vertical-align:middle}.mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-total{position:absolute;left:0;top:11px;width:50px;height:8px;margin:0;padding:0;font-size:1px;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;background:#333;background:rgba(50,50,50,.8);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(30,30,30,.8)),to(rgba(60,60,60,.8)));background:-webkit-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:-moz-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:-o-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:-ms-linear-gradient(top,rgba(30,30,30,.8),rgba(60,60,60,.8));background:linear-gradient(rgba(30,30,30,.8),rgba(60,60,60,.8))}.mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-current{position:absolute;left:0;top:11px;width:50px;height:8px;margin:0;padding:0;font-size:1px;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;background:#fff;background:rgba(255,255,255,.8);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.9)),to(rgba(200,200,200,.8)));background:-webkit-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:-moz-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:-o-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:-ms-linear-gradient(top,rgba(255,255,255,.9),rgba(200,200,200,.8));background:linear-gradient(rgba(255,255,255,.9),rgba(200,200,200,.8))}.mejs-controls .mejs-horizontal-volume-slider .mejs-horizontal-volume-handle{display:none}.mejs-controls .mejs-captions-button{position:relative}.mejs-controls .mejs-captions-button button{background-position:-48px 0}.mejs-controls .mejs-captions-button .mejs-captions-selector{visibility:hidden;position:absolute;bottom:26px;right:-51px;width:85px;height:100px;background:url(background.png);background:rgba(50,50,50,.7);border:solid 1px transparent;padding:10px 10px 0;overflow:hidden;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mejs-controls .mejs-captions-button:hover .mejs-captions-selector{visibility:visible}.mejs-controls .mejs-captions-button .mejs-captions-selector ul{margin:0;padding:0;display:block;list-style-type:none!important;overflow:hidden}.mejs-controls .mejs-captions-button .mejs-captions-selector ul li{margin:0 0 6px;padding:0;list-style-type:none!important;display:block;color:#fff;overflow:hidden}.mejs-controls .mejs-captions-button .mejs-captions-selector ul li input{clear:both;float:left;margin:3px 3px 0 5px}.mejs-controls .mejs-captions-button .mejs-captions-selector ul li label{width:55px;float:left;padding:4px 0 0;line-height:15px;font-family:Helvetica,Arial,serif;font-size:10px}.mejs-controls .mejs-captions-button .mejs-captions-translations{font-size:10px;margin:0 0 5px}.mejs-chapters{position:absolute;top:0;left:0;border-right:solid 1px #fff;width:10000px;z-index:1}.mejs-chapters .mejs-chapter{position:absolute;float:left;background:#222;background:rgba(0,0,0,.7);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(50,50,50,.7)),to(rgba(0,0,0,.7)));background:-webkit-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:-moz-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:-o-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:-ms-linear-gradient(top,rgba(50,50,50,.7),rgba(0,0,0,.7));background:linear-gradient(rgba(50,50,50,.7),rgba(0,0,0,.7));filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr=#323232, endColorstr=#000000);overflow:hidden;border:0}.mejs-chapters .mejs-chapter .mejs-chapter-block{font-size:11px;color:#fff;padding:5px;display:block;border-right:solid 1px #333;border-bottom:solid 1px #333;cursor:pointer}.mejs-chapters .mejs-chapter .mejs-chapter-block-last{border-right:0}.mejs-chapters .mejs-chapter .mejs-chapter-block:hover{background:#666;background:rgba(102,102,102,.7);background:-webkit-gradient(linear,0 0,0 100%,from(rgba(102,102,102,.7)),to(rgba(50,50,50,.6)));background:-webkit-linear-gradient(top,rgba(102,102,102,.7),rgba(50,50,50,.6));background:-moz-linear-gradient(top,rgba(102,102,102,.7),rgba(50,50,50,.6));background:-o-linear-gradient(top,rgba(102,102,102,.7),rgba(50,50,50,.6));background:-ms-linear-gradient(top,rgba(102,102,102,.7),rgba(50,50,50,.6));background:linear-gradient(rgba(102,102,102,.7),rgba(50,50,50,.6));filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr=#666666, endColorstr=#323232)}.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-title{font-size:12px;font-weight:700;display:block;white-space:nowrap;text-overflow:ellipsis;margin:0 0 3px;line-height:12px}.mejs-chapters .mejs-chapter .mejs-chapter-block .ch-timespan{font-size:12px;line-height:12px;margin:3px 0 4px;display:block;white-space:nowrap;text-overflow:ellipsis}.mejs-captions-layer{position:absolute;bottom:0;left:0;text-align:center;line-height:20px;font-size:16px;color:#fff}.mejs-captions-layer a{color:#fff;text-decoration:underline}.mejs-captions-layer[lang=ar]{font-size:20px;font-weight:400}.mejs-captions-position{position:absolute;width:100%;bottom:15px;left:0}.mejs-captions-position-hover{bottom:35px}.mejs-captions-text{padding:0;background:url(background.png);background:rgba(20,20,20,.5);white-space:pre-wrap;-webkit-box-shadow:5px 0 0 rgba(20,20,20,.5),-5px 0 0 rgba(20,20,20,.5);box-shadow:5px 0 0 rgba(20,20,20,.5),-5px 0 0 rgba(20,20,20,.5)}.me-cannotplay{}.me-cannotplay a{color:#fff;font-weight:700}.me-cannotplay span{padding:15px;display:block}.mejs-controls .mejs-loop-off button{background-position:-64px -16px}.mejs-controls .mejs-loop-on button{background-position:-64px 0}.mejs-controls .mejs-backlight-off button{background-position:-80px -16px}.mejs-controls .mejs-backlight-on button{background-position:-80px 0}.mejs-controls .mejs-picturecontrols-button{background-position:-96px 0}.mejs-contextmenu{position:absolute;width:150px;padding:10px;border-radius:4px;top:0;left:0;background:#fff;border:solid 1px #999;z-index:1001}.mejs-contextmenu .mejs-contextmenu-separator{height:1px;font-size:0;margin:5px 6px;background:#333}.mejs-contextmenu .mejs-contextmenu-item{font-family:Helvetica,Arial,serif;font-size:12px;padding:4px 6px;cursor:pointer;color:#333}.mejs-contextmenu .mejs-contextmenu-item:hover{background:#2C7C91;color:#fff}.mejs-controls .mejs-sourcechooser-button{position:relative}.mejs-controls .mejs-sourcechooser-button button{background-position:-128px 0}.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector{visibility:hidden;position:absolute;bottom:26px;right:-10px;width:130px;height:100px;background:url(background.png);background:rgba(50,50,50,.7);border:solid 1px transparent;padding:10px;overflow:hidden;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul{margin:0;padding:0;display:block;list-style-type:none!important;overflow:hidden}.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li{margin:0 0 6px;padding:0;list-style-type:none!important;display:block;color:#fff;overflow:hidden}.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li input{clear:both;float:left;margin:3px 3px 0 5px}.mejs-controls .mejs-sourcechooser-button .mejs-sourcechooser-selector ul li label{width:100px;float:left;padding:4px 0 0;line-height:15px;font-family:Helvetica,Arial,serif;font-size:10px}.mejs-postroll-layer{position:absolute;bottom:0;left:0;width:100%;height:100%;background:url(background.png);background:rgba(50,50,50,.7);z-index:1000;overflow:hidden}.mejs-postroll-layer-content{width:100%;height:100%}.mejs-postroll-close{position:absolute;right:0;top:0;background:url(background.png);background:rgba(50,50,50,.7);color:#fff;padding:4px;z-index:100;cursor:pointer}div.mejs-speed-button{width:46px!important;position:relative}.mejs-controls .mejs-button.mejs-speed-button button{background:transparent;width:36px;font-size:11px;line-height:normal;color:#fff}.mejs-controls .mejs-speed-button .mejs-speed-selector{display:none;position:absolute;top:-100px;left:-10px;width:60px;height:100px;background:url(background.png);background:rgba(50,50,50,.7);border:solid 1px transparent;padding:0;overflow:hidden;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mejs-controls .mejs-speed-button:hover>.mejs-speed-selector{display:block}.mejs-controls .mejs-speed-button .mejs-speed-selector ul li label.mejs-speed-selected{color:rgba(33,248,248,1)}.mejs-controls .mejs-speed-button .mejs-speed-selector ul{margin:0;padding:0;display:block;list-style-type:none!important;overflow:hidden}.mejs-controls .mejs-speed-button .mejs-speed-selector ul li{margin:0 0 6px;padding:0 10px;list-style-type:none!important;display:block;color:#fff;overflow:hidden}.mejs-controls .mejs-speed-button .mejs-speed-selector ul li input{clear:both;float:left;margin:3px 3px 0 5px;display:none}.mejs-controls .mejs-speed-button .mejs-speed-selector ul li label{width:60px;float:left;padding:4px 0 0;line-height:15px;font-family:Helvetica,Arial,serif;font-size:11px;color:#fff;margin-left:5px;cursor:pointer}.mejs-controls .mejs-speed-button .mejs-speed-selector ul li:hover{background-color:#c8c8c8!important;background-color:rgba(255,255,255,.4)!important}.mejs-controls .mejs-button.mejs-jump-forward-button{background:transparent url(jumpforward.png) no-repeat 3px 3px}.mejs-controls .mejs-button.mejs-jump-forward-button button{background:transparent;font-size:9px;line-height:normal;color:#fff}.mejs-controls .mejs-button.mejs-skip-back-button{background:transparent url(skipback.png) no-repeat 3px 3px}.mejs-controls .mejs-button.mejs-skip-back-button button{background:transparent;font-size:9px;line-height:normal;color:#fff}
\ No newline at end of file
diff --git a/core/media/media/css/medialist-details.css b/core/media/media/css/medialist-details.css
new file mode 100644
index 00000000..84834c88
--- /dev/null
+++ b/core/media/media/css/medialist-details.css
@@ -0,0 +1,37 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.outline {
+  border: 1px solid #cccccc;
+  background: #ffffff;
+  padding: 2px;
+}
+
+.manager table td,
+.manager table th {
+	font-family: Arial, helvetica, sans-serif;
+	font-size: 11px;
+	border-right: 1px dashed #E7E7E7;
+	border-bottom: 1px solid #E7E7E7;
+	border-left: 1px solid #fff;
+	text-align: center;
+}
+
+.manager table td.filesize {
+	text-align: right;
+}
+
+.manager table td.description {
+	text-align: left;
+}
+
+.manager table th {
+	border-top: 1px solid #E7E7E7;
+	border-right: 1px solid #E7E7E7;
+	border-bottom: 1px solid #999;
+	background: #F0F0F0;
+	padding: 4px;
+	color: #666;
+}
diff --git a/core/media/media/css/medialist-details_rtl.css b/core/media/media/css/medialist-details_rtl.css
new file mode 100644
index 00000000..bde4b638
--- /dev/null
+++ b/core/media/media/css/medialist-details_rtl.css
@@ -0,0 +1,23 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.manager table td,
+.manager table th {
+	border-left: 1px dashed #E7E7E7;
+	border-right: 1px solid #fff;
+}
+
+.manager table td.filesize {
+	text-align: left;
+}
+
+.manager table td.description {
+	text-align: right;
+}
+
+.manager table th {
+	border-right: 0 solid #E7E7E7;
+	border-left: 1px solid #E7E7E7;
+}
diff --git a/core/media/media/css/medialist-thumbs.css b/core/media/media/css/medialist-thumbs.css
new file mode 100644
index 00000000..bfc24581
--- /dev/null
+++ b/core/media/media/css/medialist-thumbs.css
@@ -0,0 +1,99 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+div.imgOutline {
+	float: left;
+	border: 1px;
+
+	border-right: 1px solid #f0f0f0;
+	border-bottom: 1px solid #ccc;
+	width:90px; }
+
+div.imgTotal { }
+
+div.imgBorder {
+	height: 72px;
+	vertical-align: middle;
+	width: 88px;
+	overflow: hidden;
+}
+
+div.imgBorder a {
+	height: 72px;
+	width: 88px;
+	display: block;
+}
+
+div.imgBorder a:hover {
+	height: 72px;
+	width: 88px;
+	background-color: #f0f0f0;
+	color : #FF6600;
+}
+
+.imgBorderHover {
+	background: #FFFFCC;
+	cursor: pointer;
+}
+
+div.controls {
+	text-align: center;
+	height: 20px;
+	line-height: 20px;
+	background: #f9fcf9;
+	border-top: 1px solid #ddd;
+}
+
+div.controls input {
+	vertical-align: middle;
+}
+
+div.controls img {
+	vertical-align: middle;
+}
+
+div.controls:hover {
+	display: block;
+}
+
+div.imginfoBorder {
+	background: #f9f9f9;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	width: 88px;
+	height: 15px;
+	vertical-align: middle;
+	text-align: center;
+	overflow: hidden;
+}
+
+div.imgBorder a {
+	cursor: pointer;
+}
+
+.buttonHover {
+	border: 1px solid;
+	border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+	cursor: pointer;
+	background: #FFFFCC;
+}
+
+.buttonOut {
+	border: 0px;
+}
+
+.imgCaption {
+	font-size: 9pt;
+	text-align: center;
+}
+
+.dirField {
+	font-size: 9pt;
+	width:110px;
+}
+
+div.image {
+	padding-top: 10px;
+}
diff --git a/core/media/media/css/medialist-thumbs_rtl.css b/core/media/media/css/medialist-thumbs_rtl.css
new file mode 100644
index 00000000..d760c11b
--- /dev/null
+++ b/core/media/media/css/medialist-thumbs_rtl.css
@@ -0,0 +1,10 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+div.imgOutline {
+	float: right;
+	border-left: 0 solid #f0f0f0;
+	border-right: 1px solid #f0f0f0;
+}
diff --git a/core/media/media/css/mediamanager.css b/core/media/media/css/mediamanager.css
new file mode 100644
index 00000000..96a1aa4e
--- /dev/null
+++ b/core/media/media/css/mediamanager.css
@@ -0,0 +1,180 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+#treeview {
+	padding: 10px;
+	width: 190px;
+	overflow: auto;
+	/*height: 390px;*/
+	border: 0;
+}
+
+#folderview {
+}
+
+#folderview .path {
+	margin-bottom: 10px;
+}
+
+#folderview .view {
+	display: block;
+	margin: 0;
+	padding: 0;
+	height: 360px;
+}
+
+#folderview input#folderpath {
+	width: 65%;
+	background-color: #f5f5f5;
+}
+
+#folderview input#foldername {
+	width: 20%;
+}
+
+#folderview iframe#folderframe {
+	height: 100%;
+}
+
+#uploads .upload {
+	padding: 4px;
+}
+
+/**
+ * Upload Widget CSS
+ */
+
+#upload-flash {
+	font-size: 12px;
+	margin-left: 5px;
+}
+#upload-flash ul {
+	margin-left: -15px;
+}
+
+#upload-queue {
+	list-style: none;
+	clear:both;
+	margin-left:25px;
+	padding:10px;
+}
+
+#upload-queue li.file {
+	border-bottom: 1px solid #eee;
+	background: url(../images/upload.png) no-repeat 4px 6px;
+	border:1px solid #ccc;
+	overflow: auto;
+}
+
+#upload-queue li.file.file-uploading {
+	background-image: url(../images/uploading.png);
+	background-color: #D9DDE9;
+}
+
+#upload-queue li.file.file-success {
+	background-image: url(../images/success.png);
+}
+
+#upload-queue li.file.file-failed {
+	background-image: url(../images/failed.png);
+}
+
+#upload-queue li.file .file-name {
+	font-size: 1.2em;
+	margin-left: 25px;
+	display: block;
+	clear: left;
+	line-height: 20px;
+	height: 20px;
+	font-weight: bold;
+}
+
+#upload-queue li.file .file-remove {
+	font-size: 0.9em;
+	float: right;
+	line-height: 18px;
+	margin-right: 6px;
+}
+
+
+#upload-queue li.file .file-size {
+	font-size: 0.9em;
+	line-height: 18px;
+	float: right;
+	margin-right: 6px;
+}
+
+#upload-queue li.file .file-info {
+	display: block;
+	margin-left: 44px;
+	font-size: 0.9em;
+	line-height: 18px;
+}
+
+p.overall-title,
+p.current-title,
+p.current-text {
+	margin: 0;
+	padding: 0;
+	font-weight:bold;
+}
+p.overall-title { margin-top: 15px;}
+
+div#upload-flash ul li {
+	float:left;
+	clear:right;
+	margin-left: 10px;
+}
+
+li a#upload-browse,
+li a#upload-clear,
+li a#upload-start {
+	display:block;
+	padding: 3px;
+	border: 1px solid #ccc;
+	background-color: #efefef;
+}
+
+div#media-noimages {
+	width: 100%;
+	text-align:center;
+	font-size:14px;
+	font-weight:bold;
+	color:#CCCCCC;
+}
+
+.overall-title, .current-title {
+	font-size:12px;
+}
+
+.spinner {
+	position: absolute;
+	left: 50%;
+	opacity: 0.9;
+	filter: alpha(opacity=90);
+	-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=90);
+	z-index: 999;
+	background: #fff;
+}
+.spinner-msg {
+	text-align: center;
+	font-weight: bold;
+}
+
+.spinner-img {
+	background: url(../../jui/images/ajax-loader.gif) center no-repeat;
+	width: 66px;
+	height: 66px;
+	margin: 0 auto;
+}
+
+p.nowarning {
+	float: left;
+	margin-right: 15px;
+}
+
+div#update-progress {
+	clear: both;
+}
diff --git a/core/media/media/css/mediamanager_rtl.css b/core/media/media/css/mediamanager_rtl.css
new file mode 100644
index 00000000..cb1ea514
--- /dev/null
+++ b/core/media/media/css/mediamanager_rtl.css
@@ -0,0 +1,82 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Upload Widget CSS
+ */
+
+#upload-flash {
+	margin-left: 0;
+	margin-right: 5px;
+}
+#upload-flash ul {
+	margin-left: 0;
+	margin-right: -15px;
+}
+
+#upload-flash .progress {
+	background: url(../images/progress.gif) no-repeat;
+	background-position: +50% 0;
+	margin-right: 0;
+	margin-left: 0.5em;
+}
+
+#upload-queue {
+	margin-left:0;
+	margin-right:25px;
+}
+
+#upload-queue li.file {
+	background: url(../images/upload.png) no-repeat right 6px;
+}
+
+#upload-queue li.file.file-uploading {
+	background-image: url(../images/uploading.png);
+}
+
+#upload-queue li.file.file-success {
+	background-image: url(../images/success.png);
+}
+
+#upload-queue li.file.file-failed {
+	background-image: url(../images/failed.png);
+}
+
+#upload-queue li.file .file-name {
+	margin-left: 0;
+	margin-right: 25px;
+	clear: none;
+	clear: right;
+}
+
+#upload-queue li.file .file-remove {
+	float: left;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+
+#upload-queue li.file .file-size {
+	float: left;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+#upload-queue li.file .file-info {
+	margin-left: 0;
+	margin-right: 44px;
+}
+
+div#upload-flash ul li {
+	float:right;
+	clear:none;
+	clear:left;
+	margin-left: 0;
+	margin-right: 10px;
+}
+.swiff-uploader-box {
+        right:auto!important;
+}
+
diff --git a/core/media/media/css/mejs-skins.css b/core/media/media/css/mejs-skins.css
new file mode 100644
index 00000000..5c27cf15
--- /dev/null
+++ b/core/media/media/css/mejs-skins.css
@@ -0,0 +1,289 @@
+/* TED player */
+.mejs-container.mejs-ted {
+
+}
+.mejs-ted .mejs-controls {
+	background: #eee;
+	height: 65px;
+}
+
+.mejs-ted .mejs-button,
+.mejs-ted .mejs-time {
+	position: absolute;
+	background: #ddd;
+}
+.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-total {
+	background-color: none;
+	background: url(controls-ted.png) repeat-x 0 -52px;
+	height: 6px;
+}
+.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-buffering {
+	height: 6px;
+}
+.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-loaded {
+	background-color: none;
+	background: url(controls-ted.png) repeat-x 0 -52px;
+	width: 0;
+	height: 6px;
+}
+.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-current {
+	width: 0;
+	height: 6px;
+	background-color: none;
+	background: url(controls-ted.png) repeat-x 0 -59px;
+}
+.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-handle  {
+	display: block;
+	margin: 0;
+	width: 14px;
+	height: 21px;
+	top: -7px;
+	border: 0;
+	background: url(controls-ted.png) no-repeat 0 0;	
+}
+.mejs-ted .mejs-controls .mejs-time-rail .mejs-time-float {	
+	display: none;
+}
+.mejs-ted .mejs-controls .mejs-playpause-button  {
+	top: 29px;
+	left: 9px;
+	width: 49px;
+	height: 28px;
+}
+.mejs-ted .mejs-controls .mejs-playpause-button  button {
+	width: 49px;
+	height: 28px;
+	background: url(controls-ted.png) no-repeat -50px -23px;
+	margin: 0;
+	padding: 0;
+}
+.mejs-ted .mejs-controls .mejs-pause button  {
+	background-position: 0 -23px;
+}
+
+.mejs-ted .mejs-controls .mejs-fullscreen-button  {
+	top: 34px;
+	right: 9px;
+	width: 17px;
+	height: 15px;
+	background : none;
+}
+.mejs-ted .mejs-controls .mejs-fullscreen-button  button {
+	width: 19px;
+	height: 17px;
+	background: transparent url(controls-ted.png) no-repeat 0 -66px;
+	margin: 0;
+	padding: 0;
+}
+.mejs-ted .mejs-controls .mejs-unfullscreen  button {
+	background: transparent url(controls-ted.png) no-repeat -21px -66px;
+	margin: 0;
+	padding: 0;
+}
+.mejs-ted .mejs-controls .mejs-volume-button  {
+	top: 30px;
+	right: 35px;
+	width: 24px;
+	height: 22px;
+}
+.mejs-ted .mejs-controls .mejs-mute button {
+	background: url(controls-ted.png) no-repeat -15px 0;
+	width: 24px;
+	height: 22px;
+	margin: 0;
+	padding: 0;
+}
+.mejs-ted .mejs-controls .mejs-unmute button {
+	background: url(controls-ted.png) no-repeat -40px 0;
+	width: 24px;
+	height: 22px;
+	margin: 0;
+	padding: 0;	
+}
+.mejs-ted  .mejs-controls .mejs-volume-button .mejs-volume-slider {
+	background: #fff;
+	border: solid 1px #aaa;
+	border-width: 1px 1px 0 1px;
+	width: 22px;
+	height: 65px;
+	top: -65px;
+}
+.mejs-ted  .mejs-controls .mejs-volume-button .mejs-volume-total {
+	background: url(controls-ted.png) repeat-y -41px -66px;
+	left: 8px;
+	width: 6px;
+	height: 50px;
+}
+.mejs-ted  .mejs-controls .mejs-volume-button .mejs-volume-current {
+	left: 8px;
+	width: 6px;	
+	background: url(controls-ted.png) repeat-y -48px -66px;
+	height: 50px;
+}
+
+.mejs-ted  .mejs-controls .mejs-volume-button .mejs-volume-handle {
+	display: none;
+}
+
+.mejs-ted .mejs-controls .mejs-time span {
+	color: #333;
+}
+.mejs-ted .mejs-controls .mejs-currenttime-container  {
+	position: absolute;
+	top: 32px;
+	right: 100px;
+	border: solid 1px #999;
+	background: #fff;
+	color: #333;
+	padding-top: 2px;
+	border-radius: 3px;
+	color: #333;
+}
+.mejs-ted .mejs-controls .mejs-duration-container  {
+
+	position: absolute;
+	top: 32px;
+	right: 65px;
+	border: solid 1px #999;
+	background: #fff;
+	color: #333;
+	padding-top: 2px;
+	border-radius: 3px;
+	color: #333;
+}
+
+.mejs-ted .mejs-controls .mejs-time  button{
+	color: #333;
+}
+.mejs-ted .mejs-controls .mejs-captions-button {
+	display: none;
+}
+/* END: TED player */
+
+
+/* WMP player */
+.mejs-container.mejs-wmp {
+
+}
+.mejs-wmp .mejs-controls {
+	background: transparent url(controls-wmp-bg.png) center 16px no-repeat;
+	height: 65px;
+}
+
+.mejs-wmp .mejs-button,
+.mejs-wmp .mejs-time {
+	position: absolute;
+	background: transparent;
+}
+.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-total {
+	background-color: transparent;
+	border: solid 1px #ccc;
+	height: 3px;
+}
+.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-buffering {
+	height: 3px;
+}
+.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-loaded {
+	background-color: rgba(255,255,255,0.3);
+	width: 0;
+	height: 3px;
+}
+.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-current {
+	width: 0;
+	height: 1px;
+	background-color: #014CB6;
+	border: solid 1px #7FC9FA;
+	border-width: 1px 0;
+	border-color: #7FC9FA #fff #619FF2 #fff;
+}
+.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-handle  {
+	display: block;
+	margin: 0;
+	width: 16px;
+	height: 9px;
+	top: -3px;
+	border: 0;
+	background: url(controls-wmp.png) no-repeat 0 -80px;	
+}
+.mejs-wmp .mejs-controls .mejs-time-rail .mejs-time-float {	
+	display: none;
+}
+.mejs-wmp .mejs-controls .mejs-playpause-button  {
+	top: 10px;
+	left: 50%;
+	margin: 10px 0 0 -20px;	
+	width: 40px;
+	height: 40px;
+	
+}
+.mejs-wmp .mejs-controls .mejs-playpause-button  button {
+	width: 40px;
+	height: 40px;
+	background: url(controls-wmp.png) no-repeat 0 0;	
+	margin: 0;
+	padding: 0;
+}
+.mejs-wmp .mejs-controls .mejs-pause button  {
+	background-position: 0 -40px;
+}
+
+.mejs-wmp .mejs-controls .mejs-currenttime-container  {
+	position: absolute;
+	top: 25px;
+	left: 50%;
+	margin-left: -93px;
+}
+.mejs-wmp .mejs-controls .mejs-duration-container  {
+	position: absolute;
+	top: 25px;
+	left: 50%;
+	margin-left: -58px;
+}
+
+
+.mejs-wmp .mejs-controls .mejs-volume-button  {
+	top: 32px;
+	right: 50%;
+	margin-right: -55px;
+	width: 20px;
+	height: 15px;
+}
+.mejs-wmp .mejs-controls .mejs-volume-button button {
+	margin: 0;
+	padding: 0;
+	background: url(controls-wmp.png) no-repeat -42px -17px;
+	width: 20px;
+	height: 15px;
+}
+.mejs-wmp .mejs-controls .mejs-unmute button {
+	margin: 0;
+	padding: 0;
+	background: url(controls-wmp.png) no-repeat -42px 0;
+	width: 20px;
+	height: 15px;
+}
+.mejs-wmp .mejs-controls .mejs-volume-button .mejs-volume-slider {
+	background: rgba(102,102,102,0.6);
+}
+
+.mejs-wmp .mejs-controls .mejs-fullscreen-button  {
+	top: 32px;
+	right: 50%;
+	margin-right: -82px;
+	width: 15px;
+	height: 14px;
+}
+.mejs-wmp .mejs-controls .mejs-fullscreen-button  button {
+	margin: 0;
+	padding: 0;
+	background: url(controls-wmp.png) no-repeat -63px 0;
+	width: 15px;
+	height: 14px;
+}
+.mejs-wmp .mejs-controls .mejs-captions-button {
+	display: none;
+}
+/* END: WMP player */
+
+
+
diff --git a/core/media/media/css/popup-imagelist.css b/core/media/media/css/popup-imagelist.css
new file mode 100644
index 00000000..7cc8255e
--- /dev/null
+++ b/core/media/media/css/popup-imagelist.css
@@ -0,0 +1,223 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.item {
+	float: left;
+	border: 1px solid #ccc !important;
+	margin: 3px;
+	position: relative;
+	padding: 0 !important;
+}
+
+.item a {
+	display: table-cell !important;
+	display: block;
+	width: 80px;
+	height: 90px;
+	overflow: hidden;
+	vertical-align: middle;
+	text-align: center;
+	text-decoration: none;
+	color: black;
+	line-height: 90px;
+	background: #fff !important;
+}
+
+.item img {
+	display: inline;
+	margin-top: expression(( 80 - this.height ) / 2);
+	border: 0;
+}
+
+html>body .item img {
+	margin: auto;
+}
+
+.item span {
+	line-height: 100%;
+	clear: both;
+	display: block;
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	padding: 2px 0;
+	background-color: #eee;
+	overflow: hidden;
+	font-family: Tahoma, Verdana, sans-serif !important;
+	font-size: 11px;
+}
+
+.item  a:link span,
+.item a:visited span {
+	background-color: #eee;
+	color: #333;
+}
+
+.item  a:hover span,
+.item a:active span,
+.item a:active focus {
+	background-color: #eee;
+	color: #095197;
+}
+
+.thumbnails.thumbnails-media {
+	margin-left: 0;
+}
+.thumbnails-media .thumbnail {
+	background-color: #f4f4f4;
+	border-radius: 3px;
+	border: 0;
+	box-shadow: 0 0 0 1px rgba(0,0,0,0.05) inset;
+	padding: 0px;
+	height: 100px;
+	width: 100px;
+	margin: 8px 16px;
+	margin-left: 0 !important;
+	position: relative;
+	text-align: center;
+	overflow: hidden;
+}
+.thumbnails-media .thumbnail .close {
+	background-color: #ccc;
+	border-left: 1px solid rgba(0,0,0,0.1);
+	height: 22px;
+	line-height: 22px;
+	opacity: 0.3;
+	text-align: center;
+	width: 22px;
+	top: 0;
+	right: 0;
+}
+.thumbnails-media .thumbnail .close:hover {
+	background-color: #bbb;
+}
+.thumbnails-media .thumbnail *,
+.thumbnails-media .thumbnail *:before {
+	-webkit-transition: all 0.2s ease;
+	transition: all 0.2s ease;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.thumbnails-media .thumbnail input[type="radio"],
+.thumbnails-media .thumbnail input[type="checkbox"] {
+	margin: 0;
+	opacity: 0.55;
+	position: absolute;
+	top: 5px;
+	left: 5px;
+}
+.thumbnails-media .thumbnail .controls,
+.thumbnails-media .thumbnail .imginfoBorder {
+	display: none;
+}
+.thumbnails-media .imgThumb {
+	position: relative;
+	z-index: 1;
+	width: 100%;
+	display: inline-block;
+}
+.thumbnails-media .imgThumb input {
+	display: none;
+}
+.thumbnails-media .imgThumb label,
+.thumbnails-media .imgThumb .imgThumbInside {
+	display: block;
+	line-height: 100px;
+	position: relative;
+	width: 100%;
+	border-radius: 3px;
+	overflow: hidden;
+}
+.thumbnails-media .imgThumb label:before,
+.thumbnails-media .imgThumb .imgThumbInside:before {
+	font-family: "IcoMoon";
+	font-style: normal;
+	content: 'G';
+	position: absolute;
+	top: 0;
+	right: 0;
+	background-color: #46a546;
+	color: #fff;
+	line-height: 26px;
+	width: 26px;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	opacity: 0;
+	border-color: rgba(0,0,0,0.2);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	border-radius: 0 3px;
+}
+.thumbnails-media .imgThumb img {
+	width: auto;
+}
+.thumbnails-media .selected :checked + label,
+.thumbnails-media .selected .imgThumbInside,
+.thumbnails-media .imgInput :checked + label,
+.thumbnails-media .imgInput .imgThumbInside {
+	background-color: #ddd;
+}
+.thumbnails-media .selected :checked + label:before,
+.thumbnails-media .selected .imgThumbInside:before,
+.thumbnails-media .imgInput :checked + label:before,
+.thumbnails-media .imgInput .imgThumbInside:before {
+	-webkit-transform: scale(1);
+	transform: scale(1);
+	opacity: 1;
+}
+.thumbnails-media .selected :checked + label:after,
+.thumbnails-media .selected .imgThumbInside:after,
+.thumbnails-media .imgInput :checked + label:after,
+.thumbnails-media .imgInput .imgThumbInside:after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	content: '';
+	border: 3px solid #46a546;
+	border-radius: 5px;
+}
+.thumbnails-media .imgPreview a {
+	padding: 0;
+	position: absolute;
+	left: 0;
+	z-index: 1;
+	height: 26px;
+	width: 26px;
+}
+.thumbnails-media .imgPreview a,
+.thumbnails-media .imgDetails {
+	position: absolute;
+	left: 0;
+	background-color: #fff;
+	border-color: rgba(0,0,0,0.2);
+	bottom: 0;
+	line-height: 26px;
+	border: 1px solid rgba(0,0,0,0.1);
+	border-width: 1px 1px 0 0;
+	border-radius: 0 3px 0 0;
+	z-index: 1;
+}
+.thumbnails-media .imgPreview a:hover,
+.thumbnails-media .imgDetails:hover {
+	background-color: #eee;
+}
+.thumbnails-media .imgDetails {
+	padding: 0 5px;
+	line-height: 20px;
+	color: #555;
+}
+.thumbnails-media .imgFolder span {
+	line-height: 90px;
+	font-size: 38px;
+	margin: 0;
+	width: auto;
+}
+.thumbnails-media .imgFolder + .imgDetails {
+	color: inherit;
+}
diff --git a/core/media/media/css/popup-imagelist_rtl.css b/core/media/media/css/popup-imagelist_rtl.css
new file mode 100644
index 00000000..f3ea5a8a
--- /dev/null
+++ b/core/media/media/css/popup-imagelist_rtl.css
@@ -0,0 +1,8 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.item {
+	float: right;
+}
diff --git a/core/media/media/css/popup-imagemanager.css b/core/media/media/css/popup-imagemanager.css
new file mode 100644
index 00000000..3a13067f
--- /dev/null
+++ b/core/media/media/css/popup-imagemanager.css
@@ -0,0 +1,199 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+img {
+	border: 0 none;
+}
+
+form {
+	padding: 0px;
+	margin: 0 auto;
+	width: 100%;
+}
+button {
+	padding: 3px;
+	border: 1px solid #CCCCCC;
+	font-weight: bold;
+	color: #0B55C4;
+	background-color: white;
+}
+button:hover {
+	border: 1px solid #0B55C4;
+}
+
+iframe {
+	width: 100%;
+	overflow-x: false;
+	border: 0 none;
+	margin: 0 0 0.5em 0;
+	padding: 0;
+}
+
+iframe#imageframe {
+	height: 200px;
+}
+
+a:hover {
+	border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.buttons {
+	width: 70px;
+	text-align: center;
+}
+
+#messages {
+	position: relative;
+	left: 175px;
+	top: 115px;
+	background-color: white;
+	width: 200px;
+	float: left;
+	margin-top: -52px;
+	border: 1px solid #ccc;
+	text-align: center;
+	padding: 15px;
+}
+
+#message {
+	font-size: 15px;
+	font-weight: bold;
+	color: #69c;
+}
+
+#uploads .upload {
+	padding: 4px;
+}
+
+/**
+ * Upload Widget CSS
+ */
+
+#upload-flash {
+	font-size: 11px;
+	margin-left: 5px;
+}
+
+#upload-flash p {
+	font-size:11px
+}
+
+#upload-flash ul {
+	margin-left: -15px;
+}
+
+#upload-flash .progress {
+	background: url(../images/progress.gif) no-repeat;
+	background-position: +50% 0;
+	margin-right: 0.5em;
+	vertical-align: middle;
+}
+
+#upload-queue {
+	list-style: none;
+	clear:both;
+	margin-left:25px;
+	padding:10px;
+}
+
+#upload-queue li.file {
+	border-bottom: 1px solid #eee;
+	background: url(../images/upload.png) no-repeat 4px 6px;
+	border:1px solid #ccc;
+	overflow: auto;
+}
+
+#upload-queue li.file.file-uploading {
+	background-image: url(../images/uploading.png);
+	background-color: #D9DDE9;
+}
+
+#upload-queue li.file.file-success {
+	background-image: url(../images/success.png);
+}
+
+#upload-queue li.file.file-failed {
+	background-image: url(../images/failed.png);
+}
+
+#upload-queue li.file .file-name {
+	font-size: 1.2em;
+	margin-left: 25px;
+	display: block;
+	clear: left;
+	line-height: 20px;
+	height: 20px;
+	font-weight: bold;
+}
+
+#upload-queue li.file .file-remove {
+	font-size: 0.9em;
+	float: right;
+	line-height: 18px;
+	margin-right: 6px;
+}
+
+
+#upload-queue li.file .file-size {
+	font-size: 0.9em;
+	line-height: 18px;
+	float: right;
+	margin-right: 6px;
+}
+
+#upload-queue li.file .file-info {
+	display: block;
+	margin-left: 44px;
+	font-size: 0.9em;
+	line-height: 18px;
+}
+
+div#upload-flash ul{
+	margin:5px 0 5px 0;
+	overflow:hidden;
+	padding:0
+}
+
+div#upload-flash ul li {
+	float:left;
+	clear:right;
+	margin-right: 10px;
+	list-style-type:none
+}
+
+li a#upload-browse:link,
+li a#upload-browse:visited,
+li a#upload-clear:link,
+li a#upload-clear:visited,
+li a#upload-start:link,
+li a#upload-start:visited {
+	display:block;
+	padding: 3px;
+	border: 1px solid #ccc;
+	background-color: #efefef;
+	color:#0B55C4
+}
+li a#upload-browse:hover,
+li a#upload-clear:hover,
+li a#upload-start:hover {
+	display:block;
+	padding: 3px;
+	border: 1px solid #ccc;
+	background: #E8F6FE;
+	color:#333
+}
+
+/* added Angie */
+
+#upload-noflash {
+		border:0
+}
+.hide {
+	display:none
+}
+
+label.hidelabeltxt {
+	text-indent: -9999em;
+}
diff --git a/core/media/media/css/popup-imagemanager_rtl.css b/core/media/media/css/popup-imagemanager_rtl.css
new file mode 100644
index 00000000..616179b6
--- /dev/null
+++ b/core/media/media/css/popup-imagemanager_rtl.css
@@ -0,0 +1,125 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+
+
+#messages {
+	right: 175px;
+	float: right;
+}
+
+/**
+ * Upload Widget CSS
+ */
+
+#upload-flash {
+	font-size: 11px;
+	margin-left: 0;
+}
+
+#upload-flash ul {
+	margin-left: 0;
+	margin-right: -15px;
+}
+
+#upload-flash .progress {
+	background: url(../images/progress.gif) no-repeat;
+	background-position: +50% 0;
+	margin-right: 0;
+	margin-left: 0.5em;
+}
+
+#upload-queue {
+	margin-left:0px;
+	margin-right:25px;
+}
+
+#upload-queue li.file {
+	background: url(../images/upload.png) no-repeat;
+	background-position: right 6px;
+}
+
+#upload-queue li.file.file-uploading {
+	background-image: url(../images/uploading.png);
+}
+
+#upload-queue li.file.file-success {
+	background-image: url(../images/success.png);
+}
+
+#upload-queue li.file.file-failed {
+	background-image: url(../images/failed.png);
+}
+
+#upload-queue li.file .file-name {
+	margin-left: 0;
+	margin-right: 25px;
+	clear: none;
+	clear: right;
+}
+
+#upload-queue li.file .file-remove {
+	float: left;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+
+#upload-queue li.file .file-size {
+	float: left;
+	margin-right: 0;
+	margin-left: 6px;
+}
+
+#upload-queue li.file .file-info {
+	margin-left: 0;
+	margin-right: 44px;
+}
+
+div#upload-flash ul li {
+	float: right;
+	clear: none;
+	clear: left;
+	margin-right: 0;
+	margin-left: 10px;
+}
+
+/* added Angie */
+
+#imageForm fieldset,
+#uploadform,
+#upload-noflash {
+	text-align: right;
+}
+
+.fltrt {
+	float: left;
+}
+
+.fltlft {
+	float: right;
+}
+
+fieldset input,
+fieldset textarea,
+fieldset select,
+fieldset img,
+fieldset button {
+	float: right;
+    margin: 5px 0 5px 5px;
+}
+
+label.hidelabeltxt {
+	text-indent: -9999em;
+}
+#imageForm fieldset label,
+#uploadform fieldset label {
+    float: right;
+    clear: none;
+    clear: right;
+}
+.swiff-uploader-box {
+        right:auto!important;
+}
diff --git a/core/media/media/css/skipback.png b/core/media/media/css/skipback.png
new file mode 100644
index 0000000000000000000000000000000000000000..04756f966d760e8e2728bb90fe8a420ecdc04ecb
GIT binary patch
literal 4245
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
T^}Pz;`K?Fkp4TbTwhjCb?aEk$

literal 0
HcmV?d00001

diff --git a/core/media/media/images/bar.gif b/core/media/media/images/bar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..abc513f888238bdd1b794e4ae36a95c5384d7596
GIT binary patch
literal 163
zcmZ?wbhEHb{Kde-u!sQ!l2Vh3E32DZoB#j+4;BCsia%KxL9`Bt0I6kQ&hQYr^UvUv
z=jy!{ug~uOe{%tgL*~4URqJwI?<>$bUy^%&hYU~3yZ;9k6nN+yk~p@c=wyyn^oivq
zUTdTLFRm^-{r23ZdmAcpSSO!<QF38T-tPN4W;K5P>|$T{#O;x8{MXRf)ZEhACaT2A
GU=09q07TjV

literal 0
HcmV?d00001

diff --git a/core/media/media/images/con_info.png b/core/media/media/images/con_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dc5cb6d71e642b39e1bb28e85f628dbd7829092
GIT binary patch
literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006nNkl<ZcmaKp
z18^Nt7)Ebw+qG@mwh`5~ZQHhOZc@ZaZQI>ZjMKL-%{JRN?U^~Nf4=YT-4%aRpx33q
z{N2t=c{`rQr}IU;+MUI_;XXWT@08rDZV43sqELvGr(odaTYjMt^xgK319#In_X54=
zAEz>M^D_dPAH})!+FOprR_4)$Lv`VxD{{3tF9>@BFMh)JBuLGGx8IWW_lgOhp!xV{
z><ccHZSySpQ=$vssyOonr=FoNP)troW#q~T<(X=WQ8%&nnR_cI9O&0KlEqQ5^RB9X
zwKpGR*6fO4#FmGe*}6DzEWHs6r)hzrK+lU(&BY&>c?|<+os(HD$(m=AB<Ohp3J$!5
zneAjr<m-BlhC9*-K8fn7`^n^{=J*IYAB7_8LCpQ_)MQL7#v%N=U!lw<sIyb+p@*nA
zbU&+v3^a0?gHZmp$1(_5sdZTtDyHoYs3DC`vk`vH4`Vt#4U;)!J3HGM;i#B2--MWj
z)`>|7F%sd^Xuo7V;00nj8mCLB7&lyIFc)oNlmbb3)!7~B+Vmt2bI`aZ1{KeaYYgVb
zo{N=&K%wAPdCM*Dpg0OFNAI|c5FT-t@EdW2U60logGb;=b?(&Uf)c(Za&RfPA&*nZ
zHFCbdNUCn)zk0XOhh?34L~b05uFPYXZ^<o>O4}$m><&#gC(~*VdYf!YqEz1)?EDvJ
zudEGgvG$r9Xz4mbGP9eEz3&2SJ?1DOMM>RrE`9-r@JZ2ZcSTG90000<MNUMnLSTaR
Ct|a~d

literal 0
HcmV?d00001

diff --git a/core/media/media/images/delete.png b/core/media/media/images/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1b7a10fc7789e13165de7ff4222f8964cfb44d5
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006xNkl<Zcmb`G
zgOXfZ7)I}_+}O5lv~A3^W9OWXZQHhO+in|`v>kk7qclH?d#&yN8a$kOePf44OIS22
zlUX5;|4>Nd-{nHn7dfB!B;z!$7k26Nbel%w{k3roG7s+{`|%aBFCQUs=>(h;^YC6o
z_r4KQ=yk$&wI&feeFA^Y-;ld;2DyXlk=wlzzmM<2pQkqvm@^Tt_+t_;I3ub`96DX2
zLf8{OdJun2pOD+J6p{5tMAytlW|I-w4J0zFrXzFZ7+eN9p0bB}9<v5EDi;*OWN;yY
zKc8L~&zRmwBD7)}Qj2s|IzCH|%-KVDH@+VpF#3_@0;?w9lstPFxs$sQSv3Pc#f(}z
zHbaiYn)wJAXW|~cm#JJ}QY%u~>t~VMXhdZ3MAQ`l?pTC0B1Cs@!JYBlQssgla&ans
zaz8RlCL*;!Rj(kJCqQ)97TltAst|mY2~43?^O0UpB0fb}Jh0a0k4I$T960Ap!;R7H
zDz@-R!XZtp(MX*<fQW*HP#&!Y?B$Gsmq$bL;9fkUbiuVzttt-jgP76it(5L@X{AV>
z+FyKNK>?)%<c@=vHKwpBNF3OMFA_!(?72L;Wuq!@;Wck8{Uvu~!mbn`d1ODrOGpId
zeE5W1gccD<?AwE{LMpC~YMm&AYk!T;IK${qn1j5pXno+HJq@7^Ym3`Ga}w^4?OX(V
z%i+4>A)|le2b5mK9eNMbZEDx}t<fFg*T%IoT^-Y!xIChH;|Bk|1)@LGrmij4f&c&j
M07*qoM6N<$g4%f<7XSbN

literal 0
HcmV?d00001

diff --git a/core/media/media/images/dots.gif b/core/media/media/images/dots.gif
new file mode 100644
index 0000000000000000000000000000000000000000..836d81519ac4616d5b5f0e69037916f9050c7947
GIT binary patch
literal 151
zcmZ?wbhEHb6l36F_{hSr_1v?bt=H0Kp85a(zv6#xKi808XU70nBRvCVMg|53#h)y!
zk_;>iIzTo9NQ(oL_?-Tgr{D4~&S6*}FhOARZ+^S0Q)Q!9h(OgcGw84|a5C^QFflMN
caZPDso*<lfD{DQ>C{$^mHswjo31De!0DC1T=l}o!

literal 0
HcmV?d00001

diff --git a/core/media/media/images/failed.png b/core/media/media/images/failed.png
new file mode 100644
index 0000000000000000000000000000000000000000..086ec5ec7cd56bfec9da648ad01bce952268e3cd
GIT binary patch
literal 1296
zcmV+r1@HQaP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EnNkl<ZcwX(5
zeP~lx7{-71+<TLoq&Bf><E*PKX{?_WLu?VPRc)Zv0@MkcsJ0ylXrVAIil12LHU^4x
z6A;8{9UBAxR1j7C1VIrI6{(6FifAo@lBTX{WA5ECEHxMkTH9^F9(Z`q$A#y4-}|0(
z_!#_;qoB5e#=n7|pydce+o4x-7yl&Mq4qbg_x1heX6t@all7b1-G3OCGX#jClwDDj
zw&^QY2<y%rc<_L!b#<D6JwJkd#0~U7y*C&v%2HJ&dj34ovuAPV<S5yJfHw=8M%2Jj
zaHy*KeMwD?)_wdqA~zQ#qo+<WDIB&5McH{6JR@e{PiP)nQ88NY>Y`7U-q^AQ$IhL^
zIyx}=`tX&O+7;M5A_jhi(W+r=4=h-qcb_<cI&B(yZ7sHN7;WZEqG!%fTv1^Yn)cNp
zC>VAF{jjZ|s>*K4#*24$Vr<-qA_M@AO`GU{@&xtiQ}RP0MZkB%YT!*qcDK8^sH{wn
zo<5B}Zyx&W*(i#Vq#g`nTeOJi#fuaMgSv1ymLG=FVKX4$yQ1o9rT@wm645Beh7Cz!
zU?4hWMdTjl-MbW)m6-ze4vT?<FwHS$%<}w_60PUL1#ES7Xp<+CNF?a)?j{n6V45as
zVIhuHt9W(wD*1tcrn%h<55dBZHlV@Y;@Vm(CeOTOSvc0M1E5p(K`<ChQjU|Aa5gt%
zsVeasH}IF2qd}Vm%8(7TLuHoVUzO|isxmX|4GoC={G^!6<st<+POb^B7gtjgy|-_Z
zo0B7KKHsEv_+m%~EKnqVn7DW`uVmvXSy>os)};P<hJjQ+I9IPm<mC~&ex2e_D0xL6
z1=|N3I0Bz}rcW=;GELEY>lXI4YY`sLfRMxCKvmTw4Z|2X5yI)j)zU)W@4w>~LUD~B
z?|TJnKgd8UXhK!@l!U{g=j6#`*^T=8l*rr8mtvC1c{-h+e~vzJBE7N-{?bxi72@k(
zAp5-y6vArXtXbpi&z~!OfBb=C{d$C9q_Q7~+1c4hW*8HiM)tOC#GgIG5sBdT`;7!_
zelG(*gG)7xZ~c{(x_o5NrcA-8tIH6VOs_!3o+BK_K4%Uw`TL3{Ot2}szWxY|%RFW8
zz=W29%F0nfUMTUdF0yy;1|c#80FE6yma&#z4bP4pbX8YllUH<JAV60~$2Y*2gI3@W
z<k{TrO@*P5F5h`{nSnlcZiaYj+}PMieSLk#ev0-PGjJ_gLf^f6jLXlr3B#ywhpB@a
zP+|M{sw&OAc8x?&4^H{WNTETg>pDV+bny(6o~>Jx7nt(s5n}@ZlXtFYB`tfu!{@tS
z-q4^%_U%KjsbN%G+o0KJ&Iez6Ase#$zyWNtW^wE0O*7upv!D?!rS||T>?)c+--=(p
zj2VkzEL{rS-B_vSlN=bQ6H<GFev`Fq8Ik?_F&{o8zo5W++|jWIC{H&aEU5Jr7i-aT
z=KzSvhh?~tc=-}fL4o=ZLaks(#!?2Hui;terAwneUAa;ST?fm;N+iHElTi{REjdrd
z^l|21=9-MMvOIhI*s|b7D=6tb;A(<}Avh?&#|XlN=eJ=^8ypAX3UA>7Mo)rIR4`1?
z7$yjK4JZkS-G!$>7tjltZ?y^-fE^ISn>cZx|8H9SSMV1yqMn<>NV)|80000<MNUMn
GLSTXy5^Q(?

literal 0
HcmV?d00001

diff --git a/core/media/media/images/folder.gif b/core/media/media/images/folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..180ea1cc66adc02fa6ae8b99ef428f63cb1acbe1
GIT binary patch
literal 1293
zcmV+o1@ihwNk%w1VNd{20OkMyfNeDY?1t>wVR3PB*{UD^^|RL2)@EZ_yu7^k_xH@1
z0N=k;^4FE`@9&wJnd!x7_3WSD-{083a{2P#s)Q1FY(?qPjrr}*^5%5Wt2zJ7X6)a&
z(5EZ^{-cR`N&oea^3{Ubvq6M}g#Y*FudlD_-M9blzTCWBvWN};>5|Qz4*%3||NqSY
z=7FJ+VwQO%*|9qR|GxkDlF_nLY-Uo-%*_AsuJ6E0|KNN7+I7~fG5_@5;>?Nv|K_8k
zqw?jv=H}+Zlm-9(_xb33_1~!G%y9D0UE|ZE|L=+a|C#2uIedJ4|Nq7R|J3QvRN1pD
z-nCNl-JXqeCyb1YwY9bX|E#jCnE&$E#Kgq^*K*RK5C8h_-q^*Sg*m&GBhsZG_2|Uh
zwnzW}?(*i3;>AR8XG+hV2&so1|L3Ov_|4Y2WahtG=FEP!pIzdzFxjgq@5of#!*>7w
z-ezWI^4)Cz|F!?)eu{H3^5(AQ$4LM1#?!4k-o<$T@}B?y{{R30A^8La6aanzEC2ui
z08ju>000O7fPR95goTEOh>41ejE#<ukdcy;l$Dm3n3<ZJoSmMZprN9pq@|{(sHv)}
ztgWuEu(7hUw6(UkxVgH!k3SncaVHrZ3SV3ayoV=WAt!7WKNo@)UNy+cgA*zvLP9+~
zEG%_QLQpOdhZ8?Xd|??13Nt|0t<GB=N%{IoO(PsuB}xF>!-3fYHbj015hF*14<N24
ze3`&xpG7%fV1#)VZOaxpX_(Zhk^~6`1zkAEqlfAQgAo=jRvAIFiO4!hWMB~B<jE6w
zA)v6qqoa)hmZlVph!N8wz9Bq)!qX9gO_U#71YHpn!UL5Csub)X*>s;06;+{4=+;e)
zTelkjx~Zt}HSE~3`p9fs==PhOzkvV76{27c7Nn&zT<IgDv17*=oTvaJritatm@#V*
zb0Nq81FIDG`9OLIojgwnC{O`~a+7edW6Rdi0}q8IpjBlcf`-md6)+xHz_Y{S7ADA(
zD__opwgn0z(CKD?#>|Ne9{*Zq5u>~J@8G>_kW)m;6o{%qFaWWQd!6_2<IA59Uqh1x
zcO0NkC1E{`5mf{z;D7`cNT7W%R6qh)s>A^T2rx9!!Gsi6XyJtxYQTaDG$4RjDRHdv
z01Rp1WnxnrFj1H_tAw~l7$u%4V?G){;8|{}9I?h4MWpfAk3a_bm<D6qCY>rJ>{vwq
z0YWy}qy|O25FINezyQONq-Ck)mRxeFffG{bN97xDuwg@&Xr@V;22TLs1A|DC8HEi<
z)M@9Pc;<;Gn+n32N&<4G5Wt{>7Ha6BhH9X|0UoyUh8a<$(88pYR%+>`mMS_&4X(gL
zgrt~;DryTipzv9z3h0r79jvzM>Z`E6dV`U!sE{fSxaO+suDs@I1ZrlyFvXFfDPTel
z$R?}ovdhAugla*&a7P&fEa*xGDjdt~wmE2UgBxEcfWiv^&@jgm4v>Ha5JFt5g9%y0
zEAPBn7@@=)S|~t)6crpWfCvsyfrSA;H1J_68R&q<3Jf>Ag0lpe5d;O(&hf8m4+zu{
zLBR*JqK3i@d+SEN<Cc5w6g~_bK?8o)5(fbf;HxjW{-Ucc!3HN2hYDx#Ycar7Xv{G-
zgET<J6euHLz{U-<OSB;kM6hzlPgiaA)mUe(_10W>?e*7Shb{KlWS4FB*=VPYb|3&d
DSVx&v

literal 0
HcmV?d00001

diff --git a/core/media/media/images/folder.png b/core/media/media/images/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..7798a3edf21785b409143eb1790938339f84a7bf
GIT binary patch
literal 1779
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
VJFV&oUV8ul002ovPDHLkV1mZ<tyKU3

literal 0
HcmV?d00001

diff --git a/core/media/media/images/folder_sm.png b/core/media/media/images/folder_sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..e847dc509fc88d2e157292c616f466cd2fa0458a
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI5@
z0QWbL!uJ3G0ia1lK~#7FZIT0zTmckD`=jch2x{AQP}^?Twrz}U+iTlK)P65_Je!<(
zK9{rU-|A{CD=RB&3nR<3{d1$9`C-F!uVSQ!v%WHmR}sQ!w|26<aonD})LuZ~nr>&D
z8S6_E(L$%LV9uQtq*op1md34g7J)Hq26Ap7;01xN6F;2SHh&>uSRaQ9HxTfGXcK>p
zdwZIM1z%o|{OiU-pXvwECVcn%<p~nd0B$jWXu+c??v#8atgWwqJUaq`8gQ{+Y%F+r
zuL(o_lkblXLcoYnp{f4S%&=nv!O{ARP***Ae}4}IYCuzQJ0#GidV71dt-lb7kd@ql
zz$<-04d51AVg!8Z^?LPsJ)d3U6#PacLR4`5?Y-Rq4IrU7_W~nO1_&Gur>-i$%T$N&
z5R6EDyZ`0Qozws~{p65O5)w*FOAB%mAs|u^2v4qT!3L4AHR*6jK=sMV$w_gaUFu3i
z3X=9}F9d9mNn83b;?F0S%YS`;%dbmBBwp493<ue|y}E+jbY{ejuj%WM07gd!M+Vwx
h|KSgN%$0Oa{0I6`R@=c((H8&!002ovPDHLkV1ggY+2a5J

literal 0
HcmV?d00001

diff --git a/core/media/media/images/folderup_16.png b/core/media/media/images/folderup_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e6febdd313195340f1332740d8793cc1b862b7c
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0h~!hK~#7Fl~Mz&n^6>Ati`rw2D5Djvu)e<f-#tF*LZ!lUv0a;XMIWS
z_T=h(xbF0?$jD%@es8X(o}yro$Iwa(_R5DH`ZVM6r!6Q)zsyDoFtb76yuSI(;J0-*
zzck;AmAADwH@zAND%GH&%GbQ^{i^XQ&wO3tyTLPEd1t(U0aAdVAV@MCE1P_)YP&FS
z3gxZi_|M-zXpVTPKN?0rK@c~9+rsb3Cyt=J@$4afxWk-}u|G5H4&x9&7BT2U4JT{I
z@W|b70-IdlG>Jzv6YckmOF^Bk9|Kv$0Q5}LFdn_>g?|+`;QwX~t38zUxo+FlhRKgZ
zlOTXBV!)2~mG^v0&i%wJL>nd$dSA;U->4U%@hFEX`#=^yG>!%CGdKM`GbPdRj+_Dz
z)a|MrNw<W9;#inT{4Hq(5jW>GIS~{DNd|<$)4rP5^OT|MC3C;q=3yx3RsE0x1eN(~
z;NtEoPHz0vfBxsrC>S6G7!$+~O%R0B=`<J&9UUDF4GrZLWhfXR1qccPmSvMxfDMIB
di!dIO{RbO@dWSaO@A?1$002ovPDHLkV1hqZ+y(#u

literal 0
HcmV?d00001

diff --git a/core/media/media/images/folderup_32.png b/core/media/media/images/folderup_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3c70f7614d3cd31023caf0fd8f2b05cd985e85e
GIT binary patch
literal 1670
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
QW&i*H07*qoM6N<$f^?HO!T<mO

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/avi.png b/core/media/media/images/mime-icon-16/avi.png
new file mode 100644
index 0000000000000000000000000000000000000000..c30ffb233cad779037dc54d7f92f8b01460220c7
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0jWtuK~#7FWB3mSe}4Zah#)GV8m?Zw`u_d<XQ*K1!Hd&&o}aVl0t8K2
ze-Nk*s^Q+l$KStye~$!!BFj(Q*?RpQ5be47ddsC}K<<@0j}RI@efa`W`uf#tAOecC
ztk_>VZ)f$qtq_zwapk>dFEBMAz`1Mpb{xB~=hS5gI)3pQ!Vf?f1Dyoab`=TSzkB=1
zgL^>q{mZAnzkUEsMAvZS$dNr5V9WOH7q47__z+#gv2*99w6)X(1yn@_G{gr35s(4o
z-adB@7(VD4faLs&im2GAtn6$ED#%LBEiR6>Fu%TR*^mGKv1nMHl<Z((nGzRPk{Xf~
z8&DAM3)Jtgrw7r1?gt>bGBZP2TGr3iEGNt&(#<d}(A3h_!dgP|&g#`r4VX3v@behB
zYCCvq14(NWH8CYcZ4M5g2JBASR!}Ixz@RL~2|<dy?85A<)(i|!ckKN1=P!x|VAKLb
z>A}@2o0{qu<Y&yvil3Ys(H$QGL@VlR;Ry$!0mK0Vpw+KFeg-B1pdttYvVpD#B49is
qGypkp6=-P|X!)DhuYfTKN#Ovib5_r@LX2nt0000<MNUMnLSTZOB;LCK

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/doc.png b/core/media/media/images/mime-icon-16/doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..001b84feaaee08343e53d61f7c4ae12691774849
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001%P)t-s|NsBY
z%*@{2-qzOE@9*!?)!6In>gVR><KW)+`1r)c#QgjF+~eoT(%943+l8mRy2#L-ywJ+X
z$Mo~^x76pPxyPfMeYv)wkFv(5!qm3K&;9!NnYYQp-S4`DMELsqy}P53t-`^3G|$=J
ztE!U9;qSA(u&}+g(X51ZnXrA5cg4ucwaC@Q-uKwAhOEWa;^yp#vCBSVQQ`mq00DGT
zPE!Ct=GbNc005XtL_t(|+C|M(4nr{vMA6s|KZY_h)BZQtklOosq|q?OvVSY)BLV@W
z?vv)#3_KwK*tYB+i~jK01+W&{+k9MYs!Q%cAxbHWX<gR^^MK?6B5h`!2dyclIOiS|
za?_<EX#CX$Kp_M`3jhgD*U`}l5Kx5uaJwwRQyF2co@Y05!!%Ktzab>U3pd7uOT{^Q
eK%J7@X6y@Hl?gG;!Kc&!0000<MNUMnLSTZ{(9FjG

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/mov.png b/core/media/media/images/mime-icon-16/mov.png
new file mode 100644
index 0000000000000000000000000000000000000000..744e2b8ac6f5e85717db3ee952580e296ced7c10
GIT binary patch
literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0kBC#K~#7FWB3mSe}4Zah#)GV8m?Zw`u_d<XQ*KFu`BcUU0ihF(yAlZ
zfQ;!I4*|77H9UE6@B8=f?~%am2agZjd~xN~_oMgU@3{H`$X<8$!Oi=R5E?#x`2tb;
z`qgV70&3{raHMYO-u4yyde<DNnY$T?fP$DB5a9U5Yuk@q*mLSK1Od4SKLA|}bP`b8
zRU~l#?roq5$hBWS{r&X=Xd=3XBS((x!2nyfZ@+lu3dD!#8jhViH>ItmCMcjPGN2(o
z7>IxjAoupUbHMOH*8n8vS5!pBMrCDZLr_6hYHo3Hw1xTgWy^m2|Bpq(@}y)33(J(a
zu#(h}tk{5pcweA?e?2{j26R6F$(5NI%F?oau4Xx57Ljg-X@RDewiebBl6O|GhHAjH
zL4cpfz*XD9TN_APo2ZE?DQa_Y05xED(zb#^2?hpbF-{0l<YgCTXSHTvc)DZfr$2vD
zGytO(7)lSWUfI-CzaT$jR#yDv)QIl*5FlDnUkgt-2n`?(7yzw)_3`t)XD@)M0D^#Q
xpzDDM7>@`IkVu6fv@{E}{LSlEz!-$2Z~#-@ST(&LBnAKg002ovPDHLkV1hmG<Vyem

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/mp3.png b/core/media/media/images/mime-icon-16/mp3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9ff97ac7f0952523d29533824067585a31db975
GIT binary patch
literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006|Nkl<Zcmbu8
z1FRiE7=^!?tH;{5Z8K)WDo(>X&O=nY4XZe*5vR6o+s5_X-P!5P!)Ej1^dvhz=jRHo
zHUEPsb*QSUnm%jRtQn5u_(oI!60i_L`{W7*Jmus2npiX{pS^gQDr?keO&~C8)Tl|l
zd-q;YFb{p-$9iVx;+W)9+M|$#E=`KL_4YSe&*wwSreuD885syjDYfT$n9mXe5hVn-
zUVZ284~;}&+(VeN<ln#i`Tl)KAP|W}Vl;qt*GEz&9KOGQ3(5t1A|#IE5_9tp1A(Xk
z4Il($3yP6F+tIQJTD5MC@)faYjNiZi{Lxy?3rMk8EJ{EW!Do;2`8?}aub{H3iUIxm
z<G9AU@GX)uBoMDBheb+CN_hMBE$1#=WYgv?AS1Qa&_v9akPUMXCQB(vBoZ7yew+aV
z2JratV@{twO>uFty_Xi@Dn#mub$csHGMVJWi4!bZw1~rp4|D9;F{VzPTKB{tWL4G^
z%gV|E_g}qw#m}EVY2Us**REZoUAuPm285*r0$OWnN!GoK7ca7W`EshOt68~nB}0b}
z<<Ox+*h0;nJJ<G#<q~dJ3mK2cdH?=BJ9qBn-Me=jJ$jV=`}Z??^k{4dHvUG98sRt|
zN@<~ia1IjIgTJQ3Y_c53;p^A0l$Vz?dGcgBbm)NVy5tKEzK{7lVLX!IPE07J=-<CT
z<Hn6++qP}k|6=LVr3@T6kX$ZjiAF@3w-Aw%R4T1(?AY(glP4#22qyE|WIWg#qE4o=
j+H_$3{kz?}cQ^V6)?7V>AT`!I00000NkvXXu0mjfrS~{)

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/mp4.png b/core/media/media/images/mime-icon-16/mp4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c30ffb233cad779037dc54d7f92f8b01460220c7
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0jWtuK~#7FWB3mSe}4Zah#)GV8m?Zw`u_d<XQ*K1!Hd&&o}aVl0t8K2
ze-Nk*s^Q+l$KStye~$!!BFj(Q*?RpQ5be47ddsC}K<<@0j}RI@efa`W`uf#tAOecC
ztk_>VZ)f$qtq_zwapk>dFEBMAz`1Mpb{xB~=hS5gI)3pQ!Vf?f1Dyoab`=TSzkB=1
zgL^>q{mZAnzkUEsMAvZS$dNr5V9WOH7q47__z+#gv2*99w6)X(1yn@_G{gr35s(4o
z-adB@7(VD4faLs&im2GAtn6$ED#%LBEiR6>Fu%TR*^mGKv1nMHl<Z((nGzRPk{Xf~
z8&DAM3)Jtgrw7r1?gt>bGBZP2TGr3iEGNt&(#<d}(A3h_!dgP|&g#`r4VX3v@behB
zYCCvq14(NWH8CYcZ4M5g2JBASR!}Ixz@RL~2|<dy?85A<)(i|!ckKN1=P!x|VAKLb
z>A}@2o0{qu<Y&yvil3Ys(H$QGL@VlR;Ry$!0mK0Vpw+KFeg-B1pdttYvVpD#B49is
qGypkp6=-P|X!)DhuYfTKN#Ovib5_r@LX2nt0000<MNUMnLSTZOB;LCK

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/odc.png b/core/media/media/images/mime-icon-16/odc.png
new file mode 100644
index 0000000000000000000000000000000000000000..6de4195091e8377d2a4e2c756932fba877e93938
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0k%m*K~#7Fby9<}8$cB8KUCum`yaJNwLPjiu5H`4-Ir&^wrx8vJjso5
zX1#mv*^3GJ5^||*r<O@2sL{(ZL7`9t0s(s+92WEYLD7po3AG0d!IM8Du~eo^u$T;q
zL?TcJwZZ&&Sl_D)q4lWTXs5rh1u8?05Q~QBsmJ9(gUFT7gLnV1F`}J)%h+}6lh)#B
zPrw!my-exzpTob0dDJ)(Wz7ftI8g#<*-T8KGJN~XxpL><kDo)aaDbe~RgFN7e)=);
z<UQ-eRmRbaUwZ~PexIu<OK2cal%V_O;|LasP@EdhL!l_O1_FHvYlGMFsQ2;tpXcB8
zzk@$G>_|YEtzy>4lQWmUT)Fzqy5-N79sP6+3S_GdA(+VUZ*H}2pZenZf_0xZZGFFX
z$<u{DnBS3aIMYl><?=8lI6hl<a5~z_SBJNMzq|F_@dy9kfY9bk2wYL&>RRK@N$iu0
zPW;xNWVrT!k$&yv;0n$(5U|H7M0C79{;p})p1wNRReXKqB?Gp|d_!1iLojGn5C5{S
z{^Go5aL6|T&T9m03>DxJN&_cIKN_~s@9*!2CwN%^VKbJo9r)h#00000NkvXXu0mjf
Du@d&m

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/odd.png b/core/media/media/images/mime-icon-16/odd.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbb2f75f982fdff85ff59fa79087016e42919436
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0nbT9K~#7FeNqFnTR|A@f2yrfN5!bNZF^kXeYS1ej+2Ynn;Sj9<g^>(
zeY4(kKCkfom$}8c<;Tq2JVgcwB9Vv?VlY_r5mMAKk={Cy)-sM2<7as%XaNGtsi&u>
zNrd1fcYteFI=UFrAU0u?46-8(6DA05H*nMrR#<pn-u1P*|3hi#yP{T%$0=1RjWGei
zYBA!9(cCwcQQ1}9HQdlUhS57N1~SSeh{r7~E_fs|wybvW?YG*hnjVipC<eb_LLkbD
z?v(ugm+zaNy)JET8=%%af*T_zD;0@}B2d3aCYZF`W`<#K1+I3gX;3np`t{q+Z5v_<
z)Fq^xS_fKZGk)tydGzeYuAN&73k#6bSOVf!4iAfJYBWj~yz<V9^H+{QH_*V~H;MoR
z(4*hK$$tJC&iD?m&YwNLY2&I}e;-*qcBoH4fNoVv3WjX({n+@#;RE~brQS)^6eE&<
zWp%j11QZJdjYtFw(u%T<j?ugK&(^hV)7vM<Ia!yeAAl$V(nsweA(zizy>NB=n0T#Y
zZVw^M;*1Ya4CF0Lz=hIYJbiNV#BrAI^Z9tIT}C~j2}D$30xl3(piKb>&^8!2;}MG5
c+S+Kw{aas=&@KgdX8-^I07*qoM6N<$g6nAVbpQYW

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/odt.png b/core/media/media/images/mime-icon-16/odt.png
new file mode 100644
index 0000000000000000000000000000000000000000..62873ab28edef0402c94eee3538b0ab138f2f876
GIT binary patch
literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0Z>UqK~#7Fby5XV13?hvQ9OZn@QajDhEsx;;O_2DJm+_~JHg#uJ2zp^
zyLx?mHszP__2I>@_g5kbCKXn7sH(cKvW^-1larIK$U<{ysotNM!P-&o_4PHWu)Djf
z{)6K<SrisGwwuKL!1f(Dy><>(&MawbyA}mb2R2aPB)OnFQZ_6U^@c%T)lhmt^G^KO
zPyi^f6CIZq=WsI4%`qz4ije~(5Fg7A$Eo0aSxun5CwO~%OQ}CSK3Ej+5R5H@qyDwx
zYJdMIhXT+&gGJ%|{2ERn?aS&Jnc&DL0K-JP0&sS6z_{yxJtSNq1|kYYwZcqrQ5cJa
zO4=&?6Ai=uex^fBq}i@8JXqb`lpD!Noyti=gH{>56g0j+(Td(|kOhXBh?dzEC=EQs
zPcBslE-x=ERl?!b4Y+5mfH^|}2Qu#@{s^Qwjzhm8`3KP~oiqF<xds3L002ovPDHLk
FV1iv3ugw4e

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/ogg.png b/core/media/media/images/mime-icon-16/ogg.png
new file mode 100644
index 0000000000000000000000000000000000000000..e328957d92f122a5dd3b8a4f26268356664b7a6a
GIT binary patch
literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006{Nkl<ZcmbtT
zHE<m<5Pi~-nb~f_%*@o!qzkp_!mXhSbJB(CFtlOjF3ezN{<e=KMQgaZaho?I-nT5K
zl*0eO#4su=E7xt@xN*Jj`%)`q062!gn35RqJcL3*N(IX_`S+i{debs84o3<WE?l^B
z(xge-JuN7u1bIelvc>VI!^PPA9K5gZ2Ga_<ybyKy+30I;S`aDVoU1Slp$8EoC4w>h
zXzIeP&s|6{0U;&HqNAe&U9GLNBL#+GSQrIzSBt|IE^2;N10n$EhH?0Q04s1mMG8y}
zi~?gozbCL@LJ9JdfP%t82q|<9EOd5ubtxsbMkLF!OhiN$4Z3z+7sn3mM@3~Nrcav&
zKhV~hB=qo@0(*oUSCW#Fg6isOJbnHGCr_OQxG_`>1w#*qkIq4yOv!Q_2lwvX!}RIX
z@#V`GJbLs9$;rv|&I$1<7$d~tGbu$+PY>?jzmJ_ecjDHqTey4oF4nABGc2MJv&u(^
zX=!PZ`@etxMtgfZN=r-e_U&7gl$4AZU_^@)D5W@&$h{XYUSQw8eW<Fc!hr(^FlWvj
z+`M@cRH!XmwotDS7x8u_aND*~TU(0@7cQWtrUrNJ+`+YL*RW{OB2Wkve?~?Id_RN`
ziYWl`9601bcXu}>OAGmEZf-_;dOB9ET7|N*G6X>Y*YhDI^az>uh{rq85kg>^uJh8R
zOL6w>S<t`Ovu6)x%$R|JfdL|FB|^&r2IuJQO$dq|G`@cQ`as2?Gp}^Uqq8Qep5A_?
iJ8<N^=F+808UFzPUOiE9B4OkJ0000<MNUMnLSTa3{v+%F

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/pdf.png b/core/media/media/images/mime-icon-16/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f33a5705479ea83515bf58974dcd2647f518158
GIT binary patch
literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0eDG7K~#7Fg_47gBtRI1@0BjPXyWVxEaE*on((5tZQIt`JGO1xwraM=
zthBqn#^1fGx}#FDI5rVy1JG)<(P-4uA*aJR&r$tgsY&`mSAJOL=5oabfaz>D8|{$J
z>ijKss{Gk)V|ZQbm%9^hX&SN4+6GdI1hEDJAtbZi`CyJqeYt$~2kqfM=JjuzGw0u6
zZ~y>#*fjsv5?5tdV2WBvpwPiN7;w%1w10Spk$fhJRLW<O&}{>_WgEz3>%ixiXy9zo
z4)p>^1i+DW7f+!<d}OM32NER$I9KKbQxo>p#ay*I3Lv8ZjL+_36ZYO2xWOQe0>V~{
z{`q}0IL8hw?%BP4V87w-Up(0W0K#InAD;y$56W&_(tda=fBNJvg`)iQaR5N}b^QM!
zq8_txnB*|6gm85Mfp8@4up*SQD`((_BikX&k^r^=Tr{DQo1fhe%EZ+U;Uw@8%xtl=
t0dz>RyX*h7(Y4nbI4#aYqtVC@uK_1ju7&o0(WC$X002ovPDHLkV1m7}(lP)5

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/ppt.png b/core/media/media/images/mime-icon-16/ppt.png
new file mode 100644
index 0000000000000000000000000000000000000000..180ee4a9b69768946aa83fa0ef4cd24f6fecd0fb
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0clA@K~#7Fg_48MoIw!A`)@X^+puA6w?VDXwr#v;+qP}rliM>V>z&{3
z=t`*~`CM*5%cO{A6;P>Ep-{-#D$7je?4=xSo|0ody2}7r1&l^xDwPT~iN<7|W}6h=
z6x$L(J5jm5Z1IIEQv-;{qD0l_b)y0Jw!wHjdHiAF?B4g4$78!!-%S{e&Yl1kLYex2
zDXKSY8$MVau4a?4#S;O)7rxdTUTgqx5!cXj1tY4O@cDe4G&|M;z#*R6O*`kEoiSqR
z0va@cbq8QH07_`z`7uQ8?gxWOt2Y)(rC>L%U<_IpV3lUs`!n<B)u&^M!w{R+Hh0i)
zOMn(1;J_tMb^q`A-FM5^U(DTmH}(A69JC)ldPq@JooV?2VZp;^Y!O2s!*4JK8u0DT
zoja$er-W$%5LPgV46ZT4U7|r4`~!s+0Cmz_PFSZZLKwW&;xyTG3Mo~xz@H7k*iDc%
el2A05M94B^fvWFJzHq((0000<MNUMnLSTY}D!}Ui

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/rar.png b/core/media/media/images/mime-icon-16/rar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5c2c986640b5ca9563cd35f7d48bb6c0ccaf2b2
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0i#JoK~#7Fm5~E?BtaB~_rI-eZ`QVLBerdGJh7dOt=P_Z=AP5;b)B!>
z->Z7JHU$22{7LB3TJjnOY06s_PPd06bhZjr{W75GED;oaD(f*B76Y~F>0ZYokPh2W
zf)N%M7uze}>YE~fQU1QO^j<_+Ls-pVY)yA`We0egQf(fYV1y}$!rbs0SX(}hb$p)b
z3+)nwimIbX1Uci=bDSP*$~vbxpN-E}5E#oNm{(=;n?^l()@3%*jH@()q|?szWscBZ
z^+_DNo1i*u8=H#no616WG6LG2nwpXoeH<ve)|z(_ltvuR`Leg*`+ix<aRNc&$@TSh
zMlhL75Om^42xp-3t~C98dGv8CgD!y;G6J?krBX>sz9Aot_*q-w?b?(}1o#g=Xe+vn
z-<TdSLuvY3L<y(A=0#n~75o7K6QTs@6MW#Lgz3_wAA8Mdqg`QBz2O?^dn5xB8-fzp
z98*^cKh~;((15d=30@rwpJrB*AHbk{0F82iOpqn0%o3C()s@79>cSX+8@$1LtOCE0
k0+9fHzeo*aPk$nWATbtci^-%nKmY&$07*qoM6N<$f-70r6#xJL

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/rtf.png b/core/media/media/images/mime-icon-16/rtf.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec1675716c8eed2a3b69e54f4c0668fca9ba575c
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001uP)t-s|NsBY
z%*@f%*w)t8-rnBt@9*pD>eboX=I7_*;NJK6_{7A-yU5YX$j9{a^8EYz+~encq`tv>
zG|1oWv(e?Fn|-UQl6IT4u)Vd4y4d0J{Eo22{rdR1wxLjdo3p*Jx`agd`unuR&du20
zy}P4-p|_m0#nG&Ut;W`nw$FW%cgM-g*sq4-=Ipf9>0&ekkpKVy0d!JMQvg8b*k%9#
z0GCNbK~#7FMa>10!yp(yVSd9QNqya|cK_oQo7ortkSL|5|K3!M2oT8r*1jt-0EA@j
z?ysBm-$#QGAf1+nW&ia&SFp@lYkZF}qN-r11Vqk1<_gYH&x%L|%i{B>gX5a1x7@%W
zB0vIw0f*z$OA#QT4!iB@6-xxB!>2v}AVMMTV0pekOG^duzWr9L2v=Y?(h??h1Ag!c
U4-jq3AOHXW07*qoM6N<$f~0K66aWAK

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/svg.png b/core/media/media/images/mime-icon-16/svg.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e5cf9cfa6a7c278f2753998e34f44bd721cdd56
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0fk9KK~#7Fg^~krEkF>3-_L!vZCf>h+ID+w+qP|;bgw!2k}T$ob}y9A
ztx(7hgm_j3YPC8X4tqU*SIz8p+ZJ0f%g{`oNC6g8yUa``Ulrgwolb|FOlP()@~vlv
z$fm+~to4Iwx<+I&H3ZRklDPVPK43PRzpXQec6r~I&cKJc<KL?kqut#_0C$j#B!mj>
zHeEnCVXCl&XBPoXW7cytLM)2uRGmaL(h#7_bTSSP1g5CjcUaG^aqj=%4r2_>jWq<Q
z7<myGf;XJ6w<Hgq$e&%}US}Fu<!k}505Y_cv~k2bWeSn{6Ym$o-=}}PcKUKtNH<&k
z=oQ{A0`!To(zp`8C!}$yo*j-pURA!>)&MNN9;o1rCR=*ITcYB*rB!4XYF#&%l}~mI
zgf0TO;uUc!mZ^Zr9sGNuu7hW8F9`ya1jAaQ(xVv^NqQxC1L5`_P!iE#e2Y6&247Y`
z=`vQbsT<;vicu%7hzvt-2(U3X8Kw-#8uJMFeH03X{O}609H~%24jg^}0000<MNUMn
GLSTZf)WjSB

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/sxd.png b/core/media/media/images/mime-icon-16/sxd.png
new file mode 100644
index 0000000000000000000000000000000000000000..3277e01a913382e0f9aba786305ea13c584b89f6
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0m(^3K~#7Fm5>9M8$c9=`=iQ(+P3ZXu(oa6w%um!-Dzywwv!thJ7@gv
z_cS2Z&yfbCQmIy})u@$4Qy>&!^7(x1ojrX%pDzvID;N&jJsw+TcwP2pru0sWI5i)3
zNMH0Q?*F6Z0MJ>rNw0Ug4Nn>wpBOsKcA?=5kr0{j>>El&!0)zG2=n;s28edu{c`y6
zcihjt`ke-lVi7=SoNmH>^`)z!osI%!TEl-<!f7#}H&~E8%zv6_&)&8@dqsgM5{zKN
ziaK*$Ld8G-_B?#mw)5n#&3j%ziY}SV8dwP-`}S@_mw@GfY)Z%kUZWvD8vT;?k@ENF
zx>buX!52jEB?saJBEi(XS<-p@`LPuXXDwT@5LLlc0N|mPNEjbK@V<XX9G%&4_{#pd
zQ^w6-FdKzI1E#nJ+S8|^dk@$*FY#MH{cEI*8ZvnD$|=Yy6%bef00*r5_mt1x2tHnw
zseU}V_kQ835f3?UZgZZ~Butc>0t#wCGJQ9%^E&&kTz_`z+#s1|tIlMHnj_<tX)AW5
zabo|W*|VqLx<Ab79IZC)_qt<{re;A6XjuwC`|jSo7K<5uKB>!Xz$ZkQxU{vk;SvV|
WDUE3esk__&0000<MNUMnLSTYEsQGXJ

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/tar.png b/core/media/media/images/mime-icon-16/tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f7ac39367146bf2312b6ba37f1eb6e59da3858d
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0jWtuK~#7Fm5~FtTR{|s``>EYOSNs=wr#g@@@y-%ZR<t5>-v^&))(C5
zd}rqD8CM<S`kT<Nvwmw=eri*_Z5qKl$QMUBLU+4VGguFF-JcYnE}Rw&b-8n(-5S;S
z)9*VCXu$}HM56P@8Dq;eU~V`$^nLq|hk_Fy`>uTJzAfkhJMVrqyL^lgbg8UOM}fWV
zw72VQxc_or{Z*;p28raQFBIj>;82V6*0*fRj(1h>8-keTIe+LL$>oL@YuVI2TTdf;
zv?iZRaRdw?zde&caAgXcZx<(gxjdZ_Fm5mytp9L&=*x!oH><(tYYShUoBi(M-1<jL
z2_*NI=W;nluvjb*4DvnQpLZaix~D6@-uziax4;P*0oS3?Xb?Q|(a8^Vyx)ow6QB-0
z==iV|Wy}oN;q%kuh!W1A@R0b?I#fWwhG+o>B&RqjVY{a{_m-?rJUv%}{a1B$Cy@+H
zTnJj=ax6WM__6+Yce$DuFu`kY!>5Vp-ZBCX2bvos^^zBo?=K`@9*95P1%mgt0KVWC
q{Ekzgj1-6j=<f+?A$$5SLZ|`0S!nP>JyoFq0000<MNUMnLSTX#$mRzC

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/tgz.png b/core/media/media/images/mime-icon-16/tgz.png
new file mode 100644
index 0000000000000000000000000000000000000000..41537dc6db09c50749a7222eb606842a7ded2fc7
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0jfzvK~#7Fm63y!BXJaj?|(bnE}d=Lwr!ge+gWdH+sS6lz8cT@SKnli
zr|vgu_&?8|5}JJR4|+SvJ8k=Si?gS%pO;`Uh@CA8;I_PzyghY6Y_leNRsPa<dm22~
zxtcv;HlbRrn!cRyX)l3*@@VUaHM<@XdtX|Pywu$lH3Pf`;%PP^7q^Gh2SG%CJY_yv
zXgc30zbN{01t^HC64A3vp~TY=br3zFms|#;uZB}ENXpK~LeW;ydF7LpT;z{dGkm|d
zqNlrqmjD6M>r+X-UYNk;)7dc}&QE3&AUBuGDc&51P{WJm;Qgh!&rVH$b#|uW-a-=5
z?Zw^Q-E2ZI7({|sy2J8*OY7&&@`p=5Ui}fol)!{+0@mSlI%V(9z#q4CkMZ?JOiY3}
z<OAcIjR<2kpu_uzhhZghTE6Wg?yW)u63`GOK(pu=&n2{bcy;GM=t0tYA=h-#Ek6op
zkcow$1eO!D-V@sT<<<G&p0BL&uItEWD7s%FhSdNxN|8eJMD+QI=))c2-A(ZI^)-M8
re8G22fiNn8bbxuT(g)r%e~}3z6BcN!$aXwF00000NkvXXu0mjfdRObp

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/wma.png b/core/media/media/images/mime-icon-16/wma.png
new file mode 100644
index 0000000000000000000000000000000000000000..1be5476a87d953dc8c19688bee8ca65a41648adc
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001@P)t-s|NsB*
z@9+2b_uu2>#Kgqr=H^>lTiV;(?Ca`$venGY%zJx#larIYyu9n`>E7PnDJdywldbae
z_S4eQ=;-T&wbU~+Ga4Ei0002k*w}G#aXC3TtgNgJ4Gn^Vf~&>WMn*=y+3J|N&erGh
zV~nQ<2M71_@X6opk-getVq$J?ZdFxPh@-VaLPFu~_3`rccc;hJ+1u9P=vY=&B_$=d
z#?Xrk;B){000DGTPE!Ct=GbNc005dvL_t(|0d33!b^t*TMbTgFu^HP=_P@1^{f=(|
z2WiQ>0<E>p8mJf}qWkZgtB3c;>kf#FF&CDVWuMUue^JxzYXiCmV@oc-*Z|~{{7Jxk
zGzBdfCW<GpbOOTp<%x%RBaYurl`{fkAFxC5>%t5m9Op&VAq{{)sl0S~IzB~`=fzoq
s=2G^6=ex27V?-%yfCKP605L(Ze+zF3fcIFzp#T5?07*qoM6N<$f*nb}*#H0l

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/wmv.png b/core/media/media/images/mime-icon-16/wmv.png
new file mode 100644
index 0000000000000000000000000000000000000000..26afeb36d33ea4dfd33dafb6df37bcd3cb16f1ff
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0kug)K~#7Fg^~l196=aHC$??dwr$(CZMzsdDa5vIow2rU>#Ov7_iq1s
zt?7Af%KJZDPG>^MpMD`TGgGV8N+RR#=hQQ=k}thWC7ihb37TKv@Pt;YRT~y`uHZqE
z@R!i^fvNe;*S*b_UH`#KW$;3R!DJ%8DiunAFGufw23s#ZC9FAhk0X&q3*qr2HS77e
z<ad8E!0Vr>XomKH6=O-zGQ)z)W{P+mU^N-s4jV>{7QTM{`s(#-k`qvW`r<`uMh4ko
zwD3JC>Eyxv+sBUHI%V|kS>pgIXfl(Ma6Zuj@++G+Pn|J!>9S>n)k_zwShsFk=T6zz
zuiL!dIKqv&^LlsgGJod8^$W%?oiTd#tP$`>wQNa*=sh66wPbO<YBfd<=(v1h=P3i*
zEF9CJOOMXoDpz6Mxf5T&45dpIZ#|${?_tf5cWd9UV%<8;3KxbDe@V|*uc=H?^(q!2
z)G1M@T%iKpC`$bDmBHnX5OB3PC0=I6<Gs7Cu3CJ4>8ukACLfzM9^BlugFKuFfiw`9
zTA?@M3E(XeP{-;4?lB~wfnf+yZx)lQlnUG+dEq`a&{u9ZX3+xx0000<MNUMnLSTZ~
Ct?j1(

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/xls.png b/core/media/media/images/mime-icon-16/xls.png
new file mode 100644
index 0000000000000000000000000000000000000000..4003856406e9fafd534a95cce8d96dd13d7d7d54
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0gXvSK~#7Fg_47golz8p`wER3HclU-k5JnUYTFHJ+qP}}a|hS9ZQEF#
zea)S9yuRZJ<?$%w^8-cBDxg-YT`rf?YC~=`nNWdVv81<tOCK?E$}hZS0jmNS{>!i+
zR9?J!FAxYsQu)5OBCaF(P3=GPQ}ajdJ@!E;)R?OPW*z1VheyX;wLs6Fhrcl^bn4|l
z<Qp!%(%W2(72sxA!>*<n=1boG9{a>_pdVvmu1o`G3xF-b=lA=dus58FM-!0{33aFe
zz(*^<s<GK0GcT@vzxH+PJHa$dBphxBp#P^ow{Y3r>9e0Mns;yR-Cy^xRBu2amw&!t
zSu^SDiK#1JELr+u-jWA%r79^H+F=(!`uL!3^JMFeDJP#^+4A-C>Zdmt-dI0CJ^V?#
zX5zoo%Mbkt?Em50_k@f4rIU04AWt|Ud3^Zj&Bq&GtMCqZ99$7bae(ds2Ed3^Dp++|
z4cwT!3xHk%XmuK<dL4io02=r_P`W7yLr%hi4WRx*QK34i{_uEH`r#EGKag_d<bd7)
O0000<MNUMnLSTYR<JLz2

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-16/zip.png b/core/media/media/images/mime-icon-16/zip.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4228ca952fe8fc69bc3e263865100d1c0e96938
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0k26!K~#7Fm63y!<Zu*(?|(bnwr$(CZJTkjws*(2u{OIZ&iPkgCYY!0
zH*D}f&z};Ct$}y>^`DDO;_sXM`mUZ{T|!wAWvStTwd_6n{_N&gWx2i%)}AW%Hu|%j
zr`{D;+k9$5b8~aa*OSit%fKxhtNpTN>)mhnI4k0=d?`Knj32r4rY96v6Otj5H}??m
z7oLcgo=R3-s^Tvb#0{Rf4ruCGBGahT5HJ&6-d9@s1FsbtEl-T1%gGDE(^Xoy$7>YG
zyNkLyTXhK#z}%Q9^6lanEuYVg_;_KwngF@UWRib-qW0t3qL(Ychs!gcpPu~s+*JPl
zToLll{Lao!HNoTYAi=@xEc>t({&0_$eY!RmV<;ssp_+hoSS%J84}WaT-r_f#e%xOv
zf;i-Z;<uX+rfNWk508#C)n7tR&G-Gp{ndy-0ve(Os3wo=Ttd4?*LL-JA4bYAVgokr
z7@R>S7J?F3j;H*-(bli8FAR2l8;rgbX|&!zzCy<K3Nfk%kSCBl`IP+fl>B&?cz+9g
wdvhJ&0blSPQy@%A5FJpSo8<%VmA}M<AwkAx^N7pW_y7O^07*qoM6N<$f^m%W;s5{u

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/avi.png b/core/media/media/images/mime-icon-32/avi.png
new file mode 100644
index 0000000000000000000000000000000000000000..53000c6d7cfe9f712a8d6063053c8131e213e614
GIT binary patch
literal 1217
zcmV;y1U~zTP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1a?V8K~#7Fw39=717R3N`y;a{_qDgRZQHhOGq!DKnciw*C+~BHncVX+
z$(i8t5WKv+h@^6Uc*SNhyr9$Rzh}8z?q7i498Ra%VsppfQ)tA%!E62YyF0D>Wa6fL
z=5+n~BY?o+@QPDwH16Qd?mfA7k6v}i?Y|MVp7F=-B><1JFS70ne)AD)gR0FLJ;9eD
z1w=XyHNpH9d6z6dVQH?p+B1fNfFjmST+$Ce1j~1f`HOe1Nai7M_y~wXs5>)<cXJOs
zzS@E_avyoh8>VdknI+Pg;Kt24nLoC7>tA5ES;7%u1S*zp3&)NDMjT}Itm9lXxCQDL
z&NAvJr7DfL0BZn(;Bx@pXiUVBDo0bQ#{j8($d}TtS!DVZgzf>rGW}$50E6`hlg}r>
zqn~Ap(RUYwTub;8IQ$h_5L$rE^4m1`J@wUTIlxF31Yvk>d$88LG1s<j^K9F;ZQHhO
zh8JCoV~oB3rm}CngUX*yqq@Gvysn{7sk>+t&Od+sCDGje0q|x4_^MBzK6B;D6{<Ye
z+M&aTQBwb{+qc;!grMw)sT%-4%s~kBP;{&v;Q&J?geDkRJL=Sly<#p&2Y^K3)~#EQ
z3hr(0ym^QS7<$mZV&zJd7}~RE4=Up(PX+)HXcKw?uqeb`J9W~6IMwV}`EZ7_sW5h;
zg10h5vM5D@=E|&?mJse#g#<dkbTLKO4M2&DLWwo5Ubk-Iv}wg9rBHQcMR(QI)>f94
zp@cG`qgI85{Kec(27X1l0399Ma<a2zQUK=8o!3iC7tUEScNz{2TD)xekRe0H+uHno
z`xdkG0>A^V=h9L$0t1G0+QgA9<60})8mfl3HO?5<KBlo~Xk!%(mE`2iaCR~rkd+BQ
zc~v#er>!z)WPQ=ZktK+WIyAaIx2+-*rv!)e)D!@IzW-<#;BszGGM9tNP)l(FB0}Sv
zbE<P<&_o4*|D)O2u~Csm0-~KARaz^{P!B7QB$cKqh7_wHR4}BDjFJk43tgQJ0Km{B
zK&V6_5C|hR!ul)*%1>ev6rtrQLMTNYrj`mY8Xgp=F96B5J0Q}|mKzwvXo3@qm03l~
z%zP;%PY6kgX0UvQ355KDf&#dlUI6+IbOY3umM%O_h=wnS@n;nh#b?A^aS+GV-4pWU
za5(PnEI`L&hXEFFx2Qm6Vq)s$ZR_P_<35;N9UN9UJO2Fi1=HwZA9M%W3d-*nFRt+C
zHQ1UAaW)_BZUK$vm~~gXrv(Iuv5wZyr%a~9L3C_F#}42DKV;OeckjH|x#iya71x%}
zzp!}5nfa4X%pHGt<|t^#xFOK)38M~An|OKsTKdO^yCn?jg8?W<!U>Pvvv==rJa~Ba
z>b1kC&qBKo9f7v)*+)Vho#(FIynXvIUQ>jo_2Dre7=TJQBN+NAbA9P)2#WtE5Urgq
z56<xH2f!u@V(4j<CMh%-(gtAt0LZ&Tmr-0cHGb0?RVcaA`ScH<bojVGd)3X@^FdJh
f*?`9$Q7`)k5rtcy@^#Ww00000NkvXXu0mjfXH7<`

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/doc.png b/core/media/media/images/mime-icon-32/doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4acd024de22739d56f40b3195bc642189514b98
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0003yP)t-s|NsBa
z&(hY`*5>Bs%*@Q*-rm~S*~P`h^7HlY@bmZg_wMTG>F@3D@9(_4yyWQX*xB99-s#=q
z=CsV*(bwDF+u6_4&erDfz|r2v-|xQ9)tQ=tlC{j7#o(>X-))z(dZWC|;_#Bd-&KO1
zzIG_Q*XXOl&(+-D*VN9WzRt$c&U2Qmm%i50$GT{gu)&>b&%(98VgSR`-=@psxWu@?
z&e6-RjYw=n+t0())5X==)rh&;wXB-O%fEf6!>-BOimbzRlcv9$dXkZK)#2%(jAGH=
z-D84c&db7Cf}Gse&T*i>wzjsy+Uc67l9;HMsGfO~k!HhY2h^>6i?z_4vcH|X&cWO4
z(RDMAu%@rCugHr`^ziP2rMr~9&cn;ev$C3}lVg*XYt4Hym8zxD=JRBYrk<*n%%^?B
zu)U@L0004WQchC<K<3zH0005fNkl<Zcma*kgM#Hi5QX8Xs?&(BIlg1AZQHi>{!g&o
z@p`{F`Qxeo0#S9^VP-v$B4EX27@Cc?R-Vj0a(3KwZmkG390N2Uuh!;1kC&Dvlev@Q
z@tHUav^JC`#!$4m`t;y%IKML-c5m+K{16zgzqxvQzTH0i=F)-g!k0W?#l|5wHSl=0
z-CbN9jb1NIkG7jxptIBA-$2p!^78fE`KgTVDArDrQoY`Krj;KLb!eR=iBhg{TcHz`
zfd&{Re^P=Wqx~6D1d0ue1Cz}gP!c#*5GkcIL~fP)NvaA0FZqeJ^;?+euR-|Jp-dH&
zf0<b+KWV?o5>){a97_MFAu`5q)dFEwnp%p1yksB<%Uej?8ywmi?4DkSAz%2AP+dW;
ze7bn_&Z&3Lr<vd}gGpPdg1a+UzaH6p?=UjtLyD{5#LR`u@1H$b*&--*h!laO44TJ3
z>^rvmasSF&VrGCnBuN!)+#kg8!<XMS03t(dT!>cf7RfbM>W0JuFcJBQl(JP|<2dd#
zn<8+C2+Zi)S|A_+gV-O+?g9h>mqBQ4ShCgzK{E(L(N*B2Yq=oso40Hc6f0R{6H!VO
pUU0du(J&bRMBG=gb@$8;eg~c$E_mF=x&#0K002ovPDHLkV1h$f-1h(g

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/mov.png b/core/media/media/images/mime-icon-32/mov.png
new file mode 100644
index 0000000000000000000000000000000000000000..22a9781278d3cd723931d0287233c0f7a512be3c
GIT binary patch
literal 1192
zcmV;Z1XufsP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1YJo)K~#7Fw37pmWI+^#_cyNj3)YU-!P>U%v2ELJ+a33OnLDYryKl~`
z+|v0<Z%eGokpvhW9kp028m&Q7K&&h+Da|JbCYb^BMPso*FpNThfXJI1v@riw>%`5v
z$wWPBnW4PbG=naD?x^b<&jN@>Qyd*mXQKRW$B*ubwt35!G0UTF-H6_It#!3|(Mdwf
z{~7De=EawTMpnSwya46S=MVw-*gn2&^{u%=B4A@{HkME0z>1}QLPN`w+JQBLB?%DC
z1dtGGB>)&HHBadP-1^f8fO5_1MhC8cDG|U9J~Z`n0_VT>oO;^|Ov;`a&AmU}_;P?$
zx1E1(w!2aRyobDZfX3$*58eB^<Km0GS6+$8MJhl0@H3uS0Qrsx@l2-{R?x!IrWQ3C
zC8`;oDb}fg?E8=x9L*A}AU}Y|P8G4(#2-rKiM<T=`9mU^n;F1p1>mp#_3L+ieZ3@o
z8}aeeCrW8=ZEI6igsJ?Y1pyex94u%Nch-&_Fd7k67_6OK8fEu#ba?=>Q?a{y_Z|uN
zcH!bh9D&h7`}G?)DCv6r`ZdY1)29mqXblR$qVQesv>ad@527%>wq30G@7i{`wvDrG
z+qP}nwi!0M7{?fQ-}dFYwO)RijKA@lwNoc8$Vr}^oiLnXZK}+kn8;Zvj9pX|i{wgi
zR!<mvYGN!nzjQJ6Zm0l4jB)k4brYvetFEa9&5aF;w6wN1*3}^d!pw|S5n+F%Qn`lK
zQ$zx&fjhCSL?VulgTUOm^Hf;6aL$ss)39h@@v`MZh71{RZ};o%TeLDl;2ghL7#uX@
zzfBz3Gp@IxucK*rU+0W*{bM?-hITelQB6t73|AN91;io<)HgL_efk<pMz&W?99e^Y
z5eK8&OZyr`SS3^t6c<6@$NP_RUt*BJ<<gQuHVchGPjw!81mn9)noF{fL<9l@r4mVY
zM!JatnXb;sGOH7&469EkYWayns*?dCC`w7sh~x1Vy1N=707H@l!ee8jqIl`4ymm1I
z$_tph#PIqe9w<tQNQsL=X=F&Si2~^k_UzygCN(s_I!RoWBr1;s33*{fnGA-{Fu@=o
zBqWH<QW2ngpkE-x+S-l73QOfiWd+I!%iuCG?3fUiyQeqsX0ceFo^k;_j~xo+0(Yw_
zlFiJ_eSGbGeC#}R;qK(L%GLSDr!Qzm54%nQSp?y?ix*b}aysnIhPYY|_p}0|Sr&@)
zds_ii80&2Ne9B~69C8(UW`Jp;9{76q&WoK}?yX;OZTb8Qi)WmfKl#Mm@rP%Q0z1YH
z0lO!RIy`OS<@Ian$A-Nn89f5zBN4}A_w3#K8xJ0yy?X8N>9b(>p(9}Ho_z%3$UJxL
z=Iz^$@tUG*8Xq2WJxe4vxfpq_FUp1-oC`o>r_Cc*s8wJf0t_~c7f{z^a2pWQEP(y_
ztIw!kxoecljK0j|TxoqY3y?c}tjS&}nBw}-u_0(4D)tXegJK9hA2YcC0000<MNUMn
GLSTXyEHrKa

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/mp3.png b/core/media/media/images/mime-icon-32/mp3.png
new file mode 100644
index 0000000000000000000000000000000000000000..669e47dfb7793b75909108e861b9b2393b7ba9de
GIT binary patch
literal 1611
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
JPDHLkV1lex19boZ

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/mp4.png b/core/media/media/images/mime-icon-32/mp4.png
new file mode 100644
index 0000000000000000000000000000000000000000..53000c6d7cfe9f712a8d6063053c8131e213e614
GIT binary patch
literal 1217
zcmV;y1U~zTP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1a?V8K~#7Fw39=717R3N`y;a{_qDgRZQHhOGq!DKnciw*C+~BHncVX+
z$(i8t5WKv+h@^6Uc*SNhyr9$Rzh}8z?q7i498Ra%VsppfQ)tA%!E62YyF0D>Wa6fL
z=5+n~BY?o+@QPDwH16Qd?mfA7k6v}i?Y|MVp7F=-B><1JFS70ne)AD)gR0FLJ;9eD
z1w=XyHNpH9d6z6dVQH?p+B1fNfFjmST+$Ce1j~1f`HOe1Nai7M_y~wXs5>)<cXJOs
zzS@E_avyoh8>VdknI+Pg;Kt24nLoC7>tA5ES;7%u1S*zp3&)NDMjT}Itm9lXxCQDL
z&NAvJr7DfL0BZn(;Bx@pXiUVBDo0bQ#{j8($d}TtS!DVZgzf>rGW}$50E6`hlg}r>
zqn~Ap(RUYwTub;8IQ$h_5L$rE^4m1`J@wUTIlxF31Yvk>d$88LG1s<j^K9F;ZQHhO
zh8JCoV~oB3rm}CngUX*yqq@Gvysn{7sk>+t&Od+sCDGje0q|x4_^MBzK6B;D6{<Ye
z+M&aTQBwb{+qc;!grMw)sT%-4%s~kBP;{&v;Q&J?geDkRJL=Sly<#p&2Y^K3)~#EQ
z3hr(0ym^QS7<$mZV&zJd7}~RE4=Up(PX+)HXcKw?uqeb`J9W~6IMwV}`EZ7_sW5h;
zg10h5vM5D@=E|&?mJse#g#<dkbTLKO4M2&DLWwo5Ubk-Iv}wg9rBHQcMR(QI)>f94
zp@cG`qgI85{Kec(27X1l0399Ma<a2zQUK=8o!3iC7tUEScNz{2TD)xekRe0H+uHno
z`xdkG0>A^V=h9L$0t1G0+QgA9<60})8mfl3HO?5<KBlo~Xk!%(mE`2iaCR~rkd+BQ
zc~v#er>!z)WPQ=ZktK+WIyAaIx2+-*rv!)e)D!@IzW-<#;BszGGM9tNP)l(FB0}Sv
zbE<P<&_o4*|D)O2u~Csm0-~KARaz^{P!B7QB$cKqh7_wHR4}BDjFJk43tgQJ0Km{B
zK&V6_5C|hR!ul)*%1>ev6rtrQLMTNYrj`mY8Xgp=F96B5J0Q}|mKzwvXo3@qm03l~
z%zP;%PY6kgX0UvQ355KDf&#dlUI6+IbOY3umM%O_h=wnS@n;nh#b?A^aS+GV-4pWU
za5(PnEI`L&hXEFFx2Qm6Vq)s$ZR_P_<35;N9UN9UJO2Fi1=HwZA9M%W3d-*nFRt+C
zHQ1UAaW)_BZUK$vm~~gXrv(Iuv5wZyr%a~9L3C_F#}42DKV;OeckjH|x#iya71x%}
zzp!}5nfa4X%pHGt<|t^#xFOK)38M~An|OKsTKdO^yCn?jg8?W<!U>Pvvv==rJa~Ba
z>b1kC&qBKo9f7v)*+)Vho#(FIynXvIUQ>jo_2Dre7=TJQBN+NAbA9P)2#WtE5Urgq
z56<xH2f!u@V(4j<CMh%-(gtAt0LZ&Tmr-0cHGb0?RVcaA`ScH<bojVGd)3X@^FdJh
f*?`9$Q7`)k5rtcy@^#Ww00000NkvXXu0mjfXH7<`

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/odc.png b/core/media/media/images/mime-icon-32/odc.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b5e4a95bf8c76e7a7fc0212e01ef195cf78af65
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1Pw_<K~#7FwUz^nG)WZ4FSdQY;B4E9KHIi!du`i0T#cF8UXIq*XWRZ?
zUhZ9Gr<ci9{@bbTu71C#sp=P={m<h+z>~)h-EQ~kzSG^q8y)Sftmc0Q&Ci}aD-Xak
zT<_kzBkEef=s9&d$>cq(^_(d6$!d3wUE}i01Mc0s*U#L=OP565x^@LGZ&r8}{_~YR
zSJSIc1>3sp-8Udi4(eO2trsv~m1@VkLju@3{w}hz?Y>xNSNp}=$x?6I*=w*^*LS(F
zy3^l%4l1qf*jFGejnX2}p#e15Gy`I6EdU%X@%;m6?k;aVooa6+0G`77!V}r@03>~I
z08*4?s8|%MS5>uDwDct#-3RjQm>At{yVCWLy{@yQx*32o=PwNn2&@6*ZE9T^oillV
zYM`baNFi;B&Xp-Lnr!e0?%uvmLL*YMcJ`fYY3qTSJ9}C9SEfxLKfKQXS@&x_O|dEJ
z<Q%81yra_HTUgSRQQ)riw1dZj5nSQQXaMjR470s<>*12`#s<$>b}S+`*KBpc-1Y0X
zMIk<U089YD5?w>Z-1Vm*Od$N`Ib(q-9Sndr#bd3mIyBz2E6A`f+=f)d=hn|$tC_GU
zW$x;@1IJPa>gJ&%AOK2~TWBcNSq$ciutd|Z(=%TBbl1XFK?+q7a>xb0Ht-laMd&E}
zO9BtDE0@mVrfiRmI7JjDucqFBD0XbOS1(>AKLV3OLVQC5M4_ri$sDW**^##sI+%Yb
z&yY{y(t?ozL<Z)#8I!qxR>r)A`Ex|APut+AaPnfY{p0~yitPzkX3!nyiMg)r@2$_C
zJy*GOap58s7)w%@me)vF2BRYY@Ve`F9y;?vTi3sFYRkLE!#}WT)~wvATeG&IF!a{Y
z07?-L>@$@I{_fcPR_C@4q0F$qI0zO}hw>o3qXGCTt)9&vb!>Z&08mi;_&JLCNY0}C
zxg-P;UmQQ&2+)G;%Y(<yJXV!=)B7U8yZh5E`TLe@f>tRHLMs$I7UZoBRz!-{shfud
z@VRsp0jX!>>$c-__Uk%D;c$-3Qu3As>%#@m@ldn-C$2%$j!(l2O12nIv-Lyf9vtqf
zGBf=QN!WJ>1HdlV0A1ur+=?!Ob+}&~v6ii~aJ0b>EN1Jt4i|tdVdHe}`2*G)c7Jt3
z?cAm75UnqZDTe#Bm<|uZz>YisWCV+e$Y}6LuAM)n25p4<0FaP+d^)7%t10!^ooIui
zT*0jY0UUwIK>NbhrdZYb#8L>8<H-e*BvG}<I{otTI^35BU?~CMML*Fe0iNPb4BF;!
zlaC!TO?GrT9iGYns8BQ)2i_!!cWAHXZws2>9Mxzv<i0$>Y&K(qgrtDs76yMvWACEE
eQm$Yj(7)$3ELva!=XbRL0000<MNUMnLSTYa6C<Ah

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/odd.png b/core/media/media/images/mime-icon-32/odd.png
new file mode 100644
index 0000000000000000000000000000000000000000..41d06fd0aca50a3d9bca3705bcb77449c4ae424c
GIT binary patch
literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1er-hK~#7FwU&c(q*)Zj_wQKSwrzWNY#Xs{W7s{h8$oyMbUL=pvF({(
z)!TiW?dk2HYHyuNeY)pdz1z9#*8gn(2;8`SwXW7UJTWpfGwbi~73li6HMh4MJb2K&
z0I&Ib=KT4oICY2Nzc;_pOZyiBbuGXryIEWS`?z9tWs7-%OP4O0&>cN?d@9bJI)SsT
zrmdjoxMA>QNa>KGdW?&ljw6oQU74*1xmLFyT^^l>@ALwa_t?>+67i+Y5Y-KzNNyPG
zoH)TnY1bquXdU4;uB^R%^jJVf#lYy~Gy>8jwG@C0#^~a17^`~^stiLs$!qLy8aNoK
zGqjH!^-Id1qW~p}%Qb9K78SRTKux6dqpD+AV`$$Hq0TgRa7_gB+!f?KmmYwo&K|ga
zb5mG=RYanhCNp!EGq`yEv;c!7=e4_c7<3JcNN{UrOfO%)E(OenU*Fgntx)ezEHA0*
zH#Ur<Wp~D=Ht<kL;wX(!<|06_&=r=}+jwQa^F!d`wZ37|NrlCg(3zYY@-r_01p@L@
z;*vn1zI7bn3}Zt>gRGd0MrOdrmIR>C>T82{7dQswxrUZdirq<V3$|!}Ua45JX_vdN
zQqBSzd@R{1!2Z3F!GT_UU`c=$C8g!%=!^0St3&n{d^|7qo|he0Yz$DTbWq5KlcJ%~
zm|K}IqGpdl?dR?M((_O1bUI4{7!xId9%3ht9pu_%x)O}(fQypid~bJq1ity=LoiJb
zOjt|`E$sZ+OKeR=TQZ1CQo7jhB=#S_{phW?-k?2vFin$B&A`<4IR^&P+z+_#*t&-B
zVSoLl=P49a(@&9ENMSB|hx+z4C%W!;*}QI<o1>LrHy8}?@Yeh}fSO+$6M-&cO|?n|
zn##&VV?})k-zsGL>ZSAStTs_}Q5nHL3xOKFzCJp-PpJeAd-hbNq~J-Sgul&o)1p6r
z+_rJ$mmk0P=qr!KXD15=%#wgC5r4azn_(YHNRVg_SJdf>coh{9MoreOT=4O`ufO>I
zOTm@9Q(83CeWn7!C<}p0b~30{t*_9zlVzq>P52c3jj!H{Fe=gx=_4Bth|@QHiKu|c
zfPzdFC=c`Q8eTbhyc8muIq$b0-}&YlcwtW*)G$ukN}UuSo9P8;K#xKp1zHo8!@~`*
z7Zw&e*n7`g^swHzj#hKfNMcue-2U1Gc<KLtE<3S>5D*yX>N5V_gF%&QqOYG-$_`kz
zbRFzH6Yq>1^f@$fnraYMZD%7HAWv{?I!hU_4`dsdQI)r6q@!)PUjQd)&+gbSzxdMH
z>9G@+ez<b$yPjdM)2A-WfJE%DqhTonDZmq!!Ja*P*!Tfn-ami+^$)*1o0j#=ty@2W
zbGJSg0<!Ls9T4dBC1RpDM8xi5W%b^huRQeN{n>?!j-J}tKfVRf@Yb%~2oN}s>^O2w
zt)|aF%=;%FzWdxWkFtSDMbvjHOxVR5hGZH62_E9fP)Y~!+@$W9pcdaS2#A>%5HHNy
zRAISs<^LAqf_0?PXk;{I1PZa@O2Zw-2m$;tIuBss*NtY%#sV=KCUzSbX+{h-&OCJh
O0000<MNUMnLSTYf3Se;n

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/odt.png b/core/media/media/images/mime-icon-32/odt.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7294defde7b66c8038c2c953032bc759391c0ac
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004xP)t-s|NsBf
z($dV#%;x6i-rnB#_xJDb@7mee*4EbJ;@|S}^u@)+*Vx?U>FmzW(%sn5Q-GbD#NO@e
z=lAvS?&|1UgPzvr@%;Pw^7Hk)yu8)i-<!J5uf)*E)6ePc^v2%r&fVsEpSQi!;%%P1
zuF~kN%HIF?_oKbe-Qwnxny=Etx4YQvjJ@2mvYPbp?#<uqo~e?Iwa~tHC|7Eu*W2gF
z*Wty>zh{kij;5E>taz!NdB9@<!JBEo$l#Eap@pfzm88#tkh<E<zG9EA(RDPfuBGGb
z@t(86lbx2x&fvh#(afiQa;wl^Y?imn*r&0Zca)~iy|1>mww{V!Xp*c|Y_pWP(UzRE
zp`Uh-uco1?!G*BRzngf!-SNkZNwlec!)FGyyw87*yTsAV*VN9ZsE~A<vwWn#qr%qC
z&fd+`)rXO=;Nj-bvyMGYfSaDDd4r>#t*Bjbv1W9hsFh{Y&&DrDjN#tYeukc#!P#_$
zx5LZHYm~LV(AA2SyUcnsudlCAUWss%s+^&&b%Lt@<YW8*0004WQchC<K<3zH00064
zNkl<Zcma*l1Dhj35P;!SwR;d->%Fzlwr$(C{ll+2ox$#-`{L9)p3HxRL{UZKgh@&%
zfMi@%NoD8(2=Ii~q<Lkb--A{kfIyRnSVuM6Iy%zLPj{!LN4nRBI}QlpL63MIl*aRw
zd}V5Gbng8A=ALyi2<_Y^#y?dSDnmmL2Zjd*a~8OLu(Qy->UiMm=t^_P%JIRot^2va
z0pS)$djvH6oh#>T<#PFCrVkXACc$~hM18;E@-q=&n%fFCJ~qagtCRrF-O`UHp4|St
z^k#x+6DJX%78HxT*R5mQk(Sm1t(Oli2f?<TyDpQWqeeu4QTFu0%fCyn&%OWk@ejED
z(W^lqRl)!M`~@vm-Fz)@6&Ta$3K3AsU1bWr3vIsIpOU0N7@`S!SJVUWJo_sFlt?K=
z=qrf`P6A+h6Wo7%rwx<q8|Z-*76OtOkjATn8|G(bE`5_B+CZWNp;KUf-^LTqwr)O*
zF0c@I0>r(mXWs6;x!7(a1&|VeLV72I?8V95r+#c%`~oIKX+zFQ3_jd=M>?CXAGvFH
z&I_dn2KWgevspoDmUM^(b`JoMDjfr*gCI}=AqvqFuuRlyDgtHz1Z98Zwt}d&i~-Y{
z#nnta(5y;C463U$fSLbK*CL=ZQD(|&oKQ+A{*;*r)a#xL5krtd*;|si;XkrhJdvvf
R6*d3>002ovPDHLkV1j<{B`5#@

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/ogg.png b/core/media/media/images/mime-icon-32/ogg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f7947b00c4d9689b632d178bbb13a2906ebf999
GIT binary patch
literal 1608
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
GLSTaR<?YV^

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/pdf.png b/core/media/media/images/mime-icon-32/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fa8a49ad0ca6a64f67beb90ed0d7698fa50874b
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004-P)t-s|NsB=
z^6>Wc^XcyI@9*#T_xI-J=Jx;p@caDn?dsRr+wk!8@%Q)M-rmg2%;?wE&eq!4cx%vU
zT;<>2-MqNz<KoZa?vuIF<*lXD<?-C2o6~@J=gr90*4FFb-{tA-@aX5#(b3+Wl&#6z
z*ouFy%-_awZlk`>-jj#VY+>TVznZ?*t1&UWTUpFzThr(Cox9H1pqt*u##)7;$k*c3
zaAeWr@9WFR=C!ZeudBsOK)pmewJ|8scy3jNqhXV@t;N-6n!3wyXS^^Y(1d>7;^wu^
z;KW{6pti)(j)<`=CcE11*4*HcuETVivycD)tHRH@L_XM!gr*S+z-MOOzrU}qucXW6
zyHrrNwzg}Ot;A16<IT*c3j*JNaORkcjk?&1tizMK)SboNztiC1nU2I=RDq<sz&|r&
zk+8eFyWy*)+NPq;+~tI<#=Fhh<-WOAf}X?J<#&{(sUaTX(9X5h>dkm?+jeHf#l^`>
zJmvBDinPz;#>VNwyyVl+od5uhyxWAY%i^}M$Y@~8T~NtpT(A@ft<UC96y~h}0004W
zQchC<K<3zH0005dNkl<ZcwUXsW6vZ(6o%nG<>uJdOWRo6wr$(|*;~CeHQjG!HrYGr
zPtTQ{O4|6ZJm!Y8EUV;KV;YnUgaCl}0h`EV-e=@@b@<AL29)^Wza73jo<8+5m;3TN
zw{Hv9AlS|RYwyPA=31@vQ{1?-BLIFCnK?1+?EIQ;G-j^P+?v(^bpXb@A2!z4Hy%7X
z*nePct)hS>ffA`=IePYqZu*%K0M*A!S>i^c`&CwZrwU-%LiPqD07zBs2HE-mla8pE
z2Ch2cgNp<5rKA^7J$_x+D*%Lm7Li!q!D{afQn6Ud?g1!(0+IOJywE#T!a#{{v+<>f
zBlj+#glIO4+g^z-kf5M4<9S~AmE`ab;1quh33GX+%4J<AWTHN13O;n<NZ;w>A1I|E
zKz-uCU|uBqR`wqI{QS@;M<{dx`SIe?_M6MQ?w8Mxj*OfTw#_yJUR}NYeX=YZS(!ND
zf5GGlZr&R_m&6Y7liap3-UQ~GlVf}Q8L8wB0Wj#o(NBw86E;GjJq+e&lZ!v69IBHC
zfI_JQ_*7xF@InMT#x^yW)dq+eb}B+R?L-Kb!x^McfDz=+%ypUToh%s|+<nu|^SoNE
fWF;^FP&NJm-rq$)&`jWD00000NkvXXu0mjfrKlUn

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/ppt.png b/core/media/media/images/mime-icon-32/ppt.png
new file mode 100644
index 0000000000000000000000000000000000000000..99d2db331d2184575ad5a14df53475840a1a8af3
GIT binary patch
literal 988
zcmV<210(#2P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004`P)t-s|NsBJ
zy}bPU`pnGC=H}-2_xJDb@8aU&-rnBy^6=~G>eklQ+u7O0#l_Om(f0N8%g4+7`uWq?
z++B*NuEo{N;qIir&su|>yuiiF*WupZ=f1_t#@_Dl^!T*3wBG3N*5>!F#M|ZR?9JWj
zsLkbFb&uun_K>*Ka&mGyIy%MH>vE5*+~DkOZEff4@bK{V#o6bq$LF1$o@|=8#GIzQ
z&gPn=vqN~R*xlyK*5<FTuh!P)*Wc{u;N^|B(7o2?&ehntu(QX~-hG<3*4*GwP*7oE
zVQ-wseV4MKx5SK%kC%CXpULBrnWMDU?6{k#gK~GJtFhSR>rix=x|X6obEb2HlURti
zm9xjnzRIk^&x^a-rNG~Jl%}@T>4B%ff~n7Uqrg>#rL)c6r-hYbm$;mSiH5Y%f`Wpo
ztHVf0NPB^cp103eS5}gOiJQ94VUMm;R%kObGve3W&Bn=mr^Lg%%Y|-%eX`W=_y0jb
zLGkVCside~kFQF4s*kG0%A2CL!_la~*0Zw5tgg9|u*0Up;h=<;!pO|LwaB%_-f)wu
z$2pza00001bW%=J06^y0W&i*I=1D|BRCoc6(F2<!F#v$!7~|Sr+t%5(ZQJ(UpT11f
zPTTeOsCZ+rsXWd_Q<ln9IRxmCiCkAo$^0aFw4m$kycDei%KQw!cV}N`v-{h!7u&M2
zgEv?+Ff@pt%N2{USV!sF(HD=?%YiC>>&?)@P$4=RPel@S;5N;$=gQ*fhv@06ksr}W
zqO5_Xfo|zvBIp8G4*bMYShZah2CD)lrK>Ym0@f0#1EDmlW<v<g)j)0aJXSZIw3maB
zpm=L4RjC{a=ln31j7e1hIQ`vIoSpri9MnM~<#MoCIrI7E^Z9{X#{i?)bgRH<fXsN$
z%dv;vvvi?QFb0zjT|PtR@A#jweedU|=H{l#<&kAePzBBpe>;BY@Rq*5>FM+cL>d@P
z;OFq2>%U$-xi>L!VDE$55-kIv%;jCDCQnR$Jl5WR((}5z7;0StC3pAsZu@lqYpGQF
z!U25RPmq3#I&iRQ3C9$|GBKwBcK35YDQPT084(!T(6KmELjio-C4d_M5@N!3EIi`~
z+pdYbI~~-t2bXc%@$wjB!W2*<zrzLrAc(3MA%s!ts?;}Rgk0VVmIV+qmx1MiSU~3z
zfOH{0qyr%D)@P8Q9#T=t3_>`bF+m+bXjk(*j2*|cIFnLR{pWw#_D3w%W@OX=0000<
KMNUMnLSTZ`OEDP$

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/rar.png b/core/media/media/images/mime-icon-32/rar.png
new file mode 100644
index 0000000000000000000000000000000000000000..86ae7f75bdafb8c35c184e2df2268c8abe442b82
GIT binary patch
literal 1059
zcmV+;1l;?HP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1K3GKK~#7F&6R_eBuNxN=j+zCZQC~5w%wiWva6<T+ofTSt$QYBqia)Z
z#JML+QSZhJyx4R3A8!9k!RgbdYklLN)Og^%3fG5~ZVBIfQRn4N*WRh$5S%!6SaA9T
z{OV1E!(ToaT~{y9Cr?z4BtCbpEgU!#-Z=Vx_u^>u7+>;yzQm)ds;OXkI%4lE@AKA=
z`73sDrU&X?j?}+gSX-n_9gL|bHx8Yw8`{hduB;@F!bdH`OL0~3LSEO}cHC4zIM49f
z{QP`;eN3=_XErwP8g6<Pa?8_O#*zpKTH>DzFGhC`96NaIbd_&%Y9lFlI<4MHz+mT{
zA5C<>Bbl?kEm-P(9YMBpt~NZM)-_}wU52!_aHVU6h3V*<{h-{&^ULbqX!3xuK;6GJ
z-t!5u7F-``Sn+)dd%M1RHNEWqZ)zX>x>9iW=Vg%k@%`Ke(?w=NHu};wBi}~*t`Q&n
zS;JE3r*Ut(WG<X5i1ef%JskgyZMr<xb!akIqRtfPIki|UIJ;J!%F+2!CcsL-9%mqz
zqxI)DYX1b66Uuy_VkKakk9)JD(@mS>b$^2RY|Eg#+)BU<cH}+SoBxm@{3J2#W-EQh
z)A*T{fU{~Zdc>A}tA_53n>2L%e7zof-d#cE+uxWXj;p`yA#fMoYXPzJgWz92<wpa-
z>0jE+)aZosyHNELAT*Mev^%Q4zDc6@0sjhi=NJg$R~u)qzrP;=^`Ni*84xBx&G)xM
z<4<=&(PuYl^nixHm<ra{*Ln6u0tm*HS8!-xRa-N!Ei5LK8gLA?z8bL=8VD$@lr|hf
zK%Ky$fgMu&^8;)FVUk%&aL|oyYP<#rXb3p^lpRsyBq%A=2z-@K6CIfpr>0BK;Xs}7
zE@JqjqoW8YrR%}3sHPH6)r$f`qY(l&o09tkb3#yQqVrg!%~-%JvBE+?fum|l2wL^y
zgM=e4?|Jf`Y<Q9x$V5rqR6s-E^LeR=iIH@wseo*N@sa`KMF2v>c=aqzg-ivkfy?FM
zq)<eu$>foWt>P6l1IpW=6uv+#^fF5UNm!L@jxib78^1ldP?#Le(m*&IMCZwk#0dCC
z16C^mjdeyqWhV(ei~esI`%ve{LWx5I9ezW=S?jF%n)`sO1N2u7m!0(KvqV6-v=Y#I
z8-KcdtcR-ujTsj<Y9yK)ExNU8Ea0rM20X*Qu0C&l*i{#>*MP65)ZJMku(jpsk-yS2
z;;f=vin_Tg5TA*zUTyM?C{Ut_bIzYr5nqZ9bXHTE7^^k|jY&4DY}};rlRmCC1B-V0
d_ce<MR{*Z5r%-UG@%R7$002ovPDHLkV1o6}1&IIv

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/rtf.png b/core/media/media/images/mime-icon-32/rtf.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f97009cb83625e0c2dd03014e8c271f9f63c0d6
GIT binary patch
literal 877
zcmV-z1CsoSP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0003;P)t-s|NsBe
z($vh%%;x6i^7Hl1&(h`T?AqAb-rnBD#l_av*6;7{?&|32@9p>Z_q@Ek&(qG)*W0Dd
z=HA=c-Qwo2#L(2{^4Qtk;O_L!-|VTy*p0Q&VvVVgu*RIa&Y7BmzIG^CgPqdHx_PL@
zmAllUzR=9$@LrR()!g6L)Xv7<?#9v1-RbXRl(U7Y!OW+9kFUhr&%;P;M5mKu(RDLt
zpvIV}m%z@^wXB-IVgSpojr8#D)YHXwown85)sL{IpR~fh&(&+E&cU5(Rf3+9k#)bD
zdbq^6ZkDiPf?~F|w$97K(cazM*3Or?(07!knx~Seo_Vsz)x%~7)UABK+wH;C;>F9q
z$cs#|)9Im%VqcD}udlC@k!I`g_Rqq#t-a3Y@AZnf*2Bxmla_0hs-?Tu=FNLDv$C3*
zzSeE3&~lWko~o8Z_JB120004WQchC<K<3zH0005hNkl<Zcma)(V}m3y5J0!8;xxvy
z_RjKb?b)_%{Qu8aX`k<P)TtMb{TE24iDn!FR0_^GX#q7@Ed<R@El({6KJV-o0%&9`
zVv2OEf9CPverGi3Y;1H^<6O|%LZ(;?QUA+meEiLaiKW+r8&7+cAVWOReRW`BYinup
z!49=@Vxd><!7`F_il<g5cdyLM%ue6AG`*m5LFdCUoWRJh=PGWF6++KA&G-z{Zm;DG
zi+G|F!FV5Ku)}`|6IBAQ0lWxgOG&g~br?aVz<Wf?pv}t^jq*$_M7+BkDY@yoo@omH
zcL>p3!bX1;lAl94suZeMhU}ra8Gao_wIC%jkiDqo%7(v&Ks-##p>aWCAXGl7mY}%Z
zy13a|e7J@df)PZ(dIq}o{`}rshd-S>?IZ@kp#v>cEgYP?{O#!3+lMd*f(UUfY|mYI
zvTy(0`Avxiz&QW|2viB`_`8>T7C#=De+vwv3t;1_)%x>R{NmoDUF%_URyqqT4C6{5
zf7Katoni_?*a4Tuh*}Uzsh%QYAt(^Eu4o8^K<J84z6zojt`ZU<k_y4ZF?W!z1tx11
zcprYRh*BsUxg$IoLk6F@sxM7#4kAi$T@wplGY@_T+A=Ur+)(`e00000NkvXXu0mjf
DLw(s?

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/svg.png b/core/media/media/images/mime-icon-32/svg.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fe583389d5bf758f3a8ede2c07667833434b37f
GIT binary patch
literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004cP)t-s|NsB@
z_xJYo^YHNW`}z3m>g(p_=I`(C|NZ;k-rnEj=l1gT)Y#nP;o;WY-^|R+*4Ea7x8UXH
z?6tnf(B9|X;pCRL&Cc7@g0$3m&VZG}pU~CYa?W^p&3|>Tvdq%gny0nJ)XnSa>3y}?
z&D7YVt+;oq%dEoBo~yWYzJciO@|L8sa>abK)aZ(?#&n#vzQ)d*zSg$3w$|3pt<dGw
z<?i$E?cL|^xWLM$zRrEWiFC(+#l^*ZtjuGJq@l^;&EoIC-S2Xgs-&>Jg~5<-#dovG
z!^qFp-s|*qlBI9Bd4;LLs>$A`&E&hgyLiQdevhGds>gw+zjm_MZ>Xnj%XFv4*>j@5
zm%Y{T?dn^Irk$Uml&`?O(Z%ZY`oq@Zox|IzwZNB}pM<&PS%RF(+0XIz`HP#YinY<l
z+vk_Vqj;;fr?S0-zmILZetey>udlC^z24~X_PyEcm9oWNhoObB&VHl3uDHUm%-?^j
z#-O*wUx%Ww#?x_hkQ@L200DGTPE!Ct=GbNc00GiTL_t(|UX9RW*Ca6zhT*OXTVq?V
zZDVcQw(bAE>GWi#cjn7pU+X^4$%*wpWZd`dh(y;CH$j48Kxj@bmwT>VKQ(3o&?gpH
z9s969v-j!J%-)&(1J@>_0n=`5EZ<!&9KXNvV=cEZm(>C71ubP`=k&*gt55IEu6<j%
zZ365stp1vPk-0cG`T6FbOy*r`IAEQFyI&q_yT4CZ8ud(|+2yk5c`?OP$KeI0S`1KR
z*5HC*wygq#o4`g9%9l1bOL;OJbic7VQBfwEu22Xe{eU`-DpH3lMWynF6D1n(V~r^f
zvAI<(29D(2fj97xSUrt+XSx^$PXI8`>IL=j^Bn;1T(vr_oXiXL<%E!4;8V8#8WCS!
z*}7b-)n4TSSpXA&4*(C=DdnZNqmPowWINzd{3j42Udt6nFQ}_lhz$e~f4D7ZYNy=~
zNF+eS_^n06>}cEYq5)L__tW#z`B~`t8Uw;3fz~KfCuT%G3V0Y$-Y93OK?sX1goTxU
zHZl*WsXK`*fM$K~z*PT^{$K#kq4By}cU@O7q$DvE01Ms_?t|neKrX2vWw0OwNGTW5
zERZmi8i3%o&Hea$Gho5l?XI}8l(2n95W&*^0?1ZF0~gL*^#A|>07*qoM6N<$f+BPc
A1ONa4

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/sxd.png b/core/media/media/images/mime-icon-32/sxd.png
new file mode 100644
index 0000000000000000000000000000000000000000..1321dad4d0bf30d1b12af37534cc1debaef13ed8
GIT binary patch
literal 1263
zcmV<L1Q7d)P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1f)qsK~#7FwN?XjtVtBzpRvWYZQHgL+qP}n$spF?MKkeuCdnwa{cN0U
zSA8!SF1k*2b^7Z*=k~d`J9Ed)|GC{3Sl`-OHP{xG4zM^s2dtv4%>x)ypgy73Auu~T
zyJuS4*<R<#G&G)~VNi7vEZJ-(oh{SM=nyz_?i_HE?l8`s*#o;LT^P;Q6!uS}PwW`?
zZydn@NbjBmVmqg;iujtj6*Eo%11TW(aF%xE%oWALPFC-1%jlYV^(@Af!?O$9=cLnX
z7)R6%)4BbI1$0nT0tmT%Yz0IO;@QAD3AV!-kb>R2qI+&*Ke=)6p9@rXirg#vKn(%#
z65o49X9_tY*fOM^!`LOaxw4(7BL_wWFvIGX{FPc4T*`{3by}n_!SzFQrE^Ln;9byy
zc}%|Nm8qIu{3ikgb)5q#G`2pZR<#U{XuxTn04{-At=3G;V|?w>1uWiJ-$#!zaQ)gP
z0z!q}Yytk@XmS=UF`E^Z+U*$B^0Q-+vwvkJqm%eXwTl-oA`ZO*$AGFo3<QY2g)4RT
zEub-)G$SL}MFg<;($#BVH%S0zSEyITBTJLBYuJyT#hXqml|-a*nT>or2A3`zh=Ge7
z8Us8JV$m>e;<d}y3|R!giim{j!00NMAjVHFwblXLk1gt+`y}CahZI;;&0rx7AX1E|
zDNk^e-0V~jXKPni2h11|Kr%r=-ZB(}l@Ig7??O17PW*|$36#_7oYq1d1@ZRx^5SE|
z(o$kR|M=}c|M(qxh6Hp1@nYNIOg0JHGX{zw!|Ut_3-Sj0*Pp-t+;h+2SVpP{*fZF$
z068p`(yM2h67pk%eccn|!hZVhQ?T>+eDIie0-cg<X=jO+5nUGP;o=B$zW?Uqr=ENq
z9)bjm%@A1qyP=9Ge=vz^LHMEh!LBw|FbC|2ox|Y}c9R6K0;IC`_Mx(}1JGzF66zC2
z+~Jw%YWvquex8oV>f?_;3TFtraRGcI>>wR0D43<ufT^;w!Mr?Z;2t4-k3gs2fBq5`
z`RV&_Jo?h3VHL5Y1WXkG%h>R+G%pX-6tqQ^yy6O2)ZAQ;YC-t#z3~#*Q+RphlXU`>
z*bD)zfH~TdlEVVM?Y{{6U9kXFh{V49?BmbB_ae%)Zi$6jq7OFg?cL5CLNp|RrLvY5
z*g~;GOf0w9*cXDG&+qs1_Ide@JF|wfnQI)d1NpK_vX?YmJtH|7>FS~q08BO3PmasM
zj#3E>jQQ@TN7(!?dPliU;!`F4)c^#z!cOp#6BrR7nM77e>>36G^HQm_xw+lK!tVQD
z?w(nGcX7)G&&Gwbmys2`D?_qjz>E_>V^*cEjE+bT3rdZNLf{4Y6(79&u7Ak=yBEH`
zar1la{9h2bbn)6@Py&XY3Tg#Hrq$F)1oG^pR8W8N`2)?|CqNBcy7|e(;x7<5Nlk6n
z{r>>7h@Du3Qo$|7T}8p%d(YhsZH_CO5!%^c0?Eih?VqHk1aN5G0<aIjB830d7oUI~
z$jZth)pZy;sYwF#3J~Ln26+@wIb@Q|8wFVjd*OjT0Uhly1r;gv{E=VXV5EvoAP^kh
ZehWEbI(eXqB{u*7002ovPDHLkV1ho^Vk!Ut

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/tar.png b/core/media/media/images/mime-icon-32/tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5b013e4c2b19e91a684fbf35c5d84ba57b351da
GIT binary patch
literal 1053
zcmV+&1mgRNP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1JX%EK~#7F&6R_aWJwf2_v_ZSZQE|!wtMi}C|6C_wry*-+8SFY=FaBy
zJgt#&A|s<J-#y8jw_N#$%l}ev=FFLL@4(k3?jOoM@I{e}HZ`bUYCFb$LvZr=u5jig
z+|;OY_~Ly_<LjrF_s+L19?R_vt)IL^Ek8oj_||h7j=jA-OTo-Yu%)h`-BZ!;E4+at
z!C(GXu;Q)!%G}QyXDj<cq21FFtrM>Cwb0IS>iCvn8j~x#-id{$6AsV+ylN>RoTGnc
zVq#)-p<meiWo%`_*;D-r<d!78T{WEHo0?zS`SM^F8XAPobq&xMTU_JYM}8=@6EN5b
z$CrZ*A1lV2KN6;!-pehDe?H3}p>+``R%@qb-C1-t20qGd^bO6u99JIN*fJOFZ7vTq
zeod@N=a)KWz2Cr3^<nQN7CatNCNNmx$*>}j_GjspmYd9iEVjol1tUW3*IDg~(=pu^
zJK#xFjJKr;!N!DRyQ>^CyJI@jU%xYyrq~<JG;(?>M>scMu%BZSc`Sh4JwVPtu7oPi
zFP8lYuB>Sj?V6o{V?N+X35`@Q4V3>0R>ux@xeDwAtYB^W6HOUUn!;ZS({9aqFT1P0
zwG(hxTe6>SPPs=%L*kt}YU6G*(vtpQK#TZ|CE~jJ@}C4()+06$%Qy(W@@g?Af-}FC
z(c!*9N92)`=Rq`zgYowlhux_#`hc$j4XGxA)oX>j*U`~|fPBzi@iK@>D2=)gs$w62
z>~HVX>1D=zVkuZySfFkX`VkChZ{yIxt{zIdzOk54>cG)`=$&A5mWhDWN@~L)0`de7
z9h{J|xW_pHVp6kI;Gi4F)O-&RP!MqSNjs9`6evm52)sov5gnNl@1HI`d;I0*r-<SA
z_4Oejl`aH+B%3PS#cv3NMk4|ao0j%GYeG<EqH}-nu(^O$VuwXQf+K4x2wEKT1mTEF
zo0>MWp_Ux3Cd$+;1r!8cuZN7d)|)^!6_^b$US_~}5rAl9embUyk5~%W1E<r;O(BVr
zlbOeUnhW1X)2V#~TGs2tLa$~iFbR^4rGRV93|gupPEBU5_a*Bf91fyW^CB?<e$j!|
zP9Up<fXvP$j7<5$8GCo#SE9tBgAR5Axp8%+VY~-C9bkNFc<hwVI7<YiOFIFjsVer$
z@kX8wG*(<(ELG@Uw9xXLWwK)rsN1~t?VgG@XSu(n6ugajuDV>I`Ea@s^)Eexj$+cK
zL{owr(f6(u)sO@wMeaEt??--=4s@2UR1gV!(+qSbRmifd7KOizarHB>DrbIou?cb&
XhQ*`dd&WUa00000NkvXXu0mjfe?j>a

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/tgz.png b/core/media/media/images/mime-icon-32/tgz.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8e5a4f7997f1d2075a85c5ba1c39a7b213b2d41
GIT binary patch
literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1Jy}HK~#7F&6NX}WH}Uo_t&j$+qT`dZB$ncUc1cc*S2jB8;dc%GwIFL
zKCO}Sos?4d%gsw}Zo2vpxBsQ!?Afz*;i0dp{ellmUGy=w;OCV-df;Po$LMbee%wDJ
zIQt{~>W$qKD(hOGKXU<^Cr-iSiL>pCyTx6rydU4(TiL(#K~;EXXU9}9JF2=G%Q^zK
zfl&DkJZa(DH&ojjC3VFgH_e4-PZKM_Grh6%b8XiGWOznDw6%|}oD2*vJ(I31tZteL
z2*;qw$;r*d0l|s2@r_Auuj3^ss>*n!X0T;=qi^vf5fPLGMu!%UJNsts>iER+HjDO1
zY>kzG$xeDcA8P(kGU5C{Fw^=@aYgD=c_D%-om0<cHRU#SbWE-QZ<rP)`nR$Vt#6++
z7VMl@8EpBISX185HOvLSg7&7Echbw4qu`-$%OsD*9Pn{Yo#{hnL6$mFm({rSjsrHk
zQ#8!9B@YJDG)$^FYD?PQna$tWrn3W0r-ySSJ7f8Jex5E8oL?x5W^b~D1+WsZ$C=30
zb=!rdnm@tSEoHJpu@bP&2LoB_qmJdl+CRbO_~C9}nU#PQY{-4AHScjl_(@_o%vtiH
z-~P3gfV1i<eA1b9mxku_+ch+#+@i;odw)cU`;8^yxQ0p}2VcQM77$B63H}vSk_-fA
ze`#YQ{X?GkV^z<B&`1ua-dh=SyF~8;{uOD?HV|xHZ=Ai(&Q1i>gAUt^AWVYlgnPiA
zd><5keY-{vX!wh%U~zGgzC#To7*yWGp@FA*B;(-0VnV3_N6(SBRA+&KfYM57!yyFJ
z2^<>OAvGzFvIT@mW+}nJFyn2?>LZ{b;LuZcWSJA7q);OWR=hxTWYKP!B_n&owZ^-M
z>G${dBcPNnM!u(-O8k|t2?&iw2-s{&&a<ouL8Xbo1L{#@0jtCl76J+!RZ~LH%B05#
zM_k_1^PX(z$qZzoq;4vpAqWNoRK%^mG^(k9Y=HTa0rN#5K*N0X%#0i}74QtaUN0ww
zB1%mrk7%6bZ=&f^J^-cQRbrtRDN0Dfs$6r7$-rfg`)R6RyFXI{;cyV0o*Ri7@Qntn
zRsyj~2&n8Np=UZ2%iMb!zYt0s8W`{!0?t}vbqx0bR|n{?8ZJBO(`Si*a%m-?wc3-f
z?zeDtpfTgpQnf^Lqph#Z8w)sVJOlc+U{goH*5<7ZyQ(4BQsQeY7C4XQ>XE-PQuS0)
zE=AqEArPO5zH`0FH=;m^CeAs3jz)Yb1~7Ohs)@O3Gtii1qsnfYG=9>@)ns7R&i=k;
a5#btva-)Xw_B;vz0000<MNUMnLSTZ$HTrn~

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/wma.png b/core/media/media/images/mime-icon-32/wma.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bd9198f91c689a801101d6652716d7c5843a5a1
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00033P)t-s|NsB@
z_xJw$`574**Voq}AtCVb^zZNQQc_at>+Ig%-VhKFDJdz;%*-=0Gv?;zJ3BjuhKBw6
z_)1Dja&mI4tgL2cW?5NTyu7@}$H(H}->1LMezVoL&)$=&x#{Zc^ziO`tjvzS+~)B2
zY;0@*005(-ql~)PwzjrgjH+|1&w6@#-Rtwd&DKIfLaMpLrNh<;2ndg-w`!KNs=?6K
z-{rm6=e5Jjr_1B-_WHut<<#8b@a*c2j*euV!N%O{cBjVA<ng%I>!Y;3uEo@aw%28l
zteKga&DPy;puL~R;*+ShmaV);b(4Fw-oVx3T8XE`&(^28#IMljX`R1$r^7xrCENf2
z00DGTPE!Ct=GbNc00EXsL_t(|0gcmxy5m3qhT*Ydqvo-(w(a}Bm7RH#6loUUssFb=
z1^<)uR+YN?OkXH#p!jC;<YnF9!`m7#R!yey$)rE+zuN0h5BEMlzS#xxdiwm{kN4p2
zv*~Q|^m_x=`@`$Q+3jp{e0=-lrgwF=3uN!-{a;_+oe$0jSH0ISI>4QSgRf1W9&`YC
zc4-<8haWG$ffg8<#$yOW6HuTHjNn8#keeU@pyO?_gwFp8U>wmT>;Sdko^WZzp#f?Q
z)*?(!Z5uCvzO4o7U_jF&+m~(72&OU|6fRCs8`J{kwq2Ai4!|aWYXJl5Gv#*z22Bx;
z!IE0ZE<l{*4s_g$yr2tvWbhV1PAnono?};u#YM9HHZ=xBq(}4Ar&byUZh~MNpg_c#
za4EIk0L>w51D=X3vMI%sAlB3Xq5;eNQ@v9wLa-BnN7(Fmu>|$XCENmDWSL#SD!ns6
z8W0*$rr5Gl57hgJL9pKd1dTu>CkR!$lnkOZ00^1?Q5~uT=XwUt>c?B3qiSZ-Q_54$
cegSm90VKaJAwhf-vH$=807*qoM6N<$f{YY`SpWb4

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/wmv.png b/core/media/media/images/mime-icon-32/wmv.png
new file mode 100644
index 0000000000000000000000000000000000000000..97cbbc15edd0a40c587e9cfa4df4225027a65c4a
GIT binary patch
literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1Z7D?K~#7Fv{OTKgi#R8kIX68oO6wB+qP}ncCxnZ-P5KkldO%Yu2;kE
z_kA@l#hGOD61cy=mrAAF$c)8cxbXRJ<bx!z0BSa;(`2-GLg#0g@7lhvT79ftfAUAe
z)@#AU(c;;25CNObhfbwbdIA{?_nZq_PxymZLO7#0!ucmz#SU}jO%A_)kI{0<YgoEa
zY7OB9!03<3<LARK`J+hxDL343HSqOT$2D7_H<&k{cmOiZOJ{6>#7n>yvB2oo<=ib#
zs4;^SGNUJ-cPuG*apK~)3=vPRODi1+EMT>mA`!?MJMP|ns+c=(S-r{`-mREEN^hF4
zojuCvSi*_xr<M#z6lz}q>_8*}k00M40!0X9wNHXGMgah8`trpBz8HV_=5k#?7+_8D
z_dNx|?h-lyTOdP2cmXUsLcsG)(Nl84RYfyah(NP}1<>shz^h(ZSlry)B<JGS#wR9l
zQhxv7z!d@@bv?}R0_ejGD3Bp`+#PffLlQs;4cr|*CF$#bIxPp-$f76=*R}_>=8aw3
zwym{o+qP}nwi#};F_tm9|MsM>?%?Fl&DA;I)x0w#9RL!ATeogKD!8|~^X4HUVCX^r
zij^x-Vrb8vJ*bSEJQ)B)piSrnz@iX$?bJyNVpX$a<ii=xrh=G>3f{_e$)aQlnkzG-
zn?tx$6%y$D(!~^AHvlCr3MJOKdfmE-)20;_mq1k&<=s_XQ&Uk|iV{kXid+>I@)y3H
z47?&;fcExn*;$z~DFAcl&g-S63+F7EI}L{hEnc>K$dDo9ZEb$PeG4zW0GNTP=TcMB
z0|SP1+QgB~<66pF>nn%1Hq02;Hm0F)XhS6p6=!G9aCR~rkeLBMS!ET@r?nz`WL@FJ
zk;RCMIyAa2r?or-r-TV<Daio*eE-ofz~!9mBrXTeP;*f{B0}Svva7PA(L@D+|D#!1
zF_95Q0-~H9RUKBEt{zqvK`KdA3@K7Us9;DP5h)c47rHtd0Dz%MfKZ7<AP`1qgmsw=
zl$XfFD?-bXg;26OOf3~)G(0F!UjR}>cR+-lEjKWT(F7+HDKiU|8F^Aj9v_k%#bEgi
z6A1YQ1qE<9y#V+f=mk()TDtH!AsW6Q+MiWOB%cv;#X%fbcTdQZ!{NBQvj9ACq~ZYq
z7+?W+3-eVbCZ=BAwq9N~?t{tI!C{rN<IhiD;6@+zK>-~Vl;1C2T;b2Fw>25!Y(CuG
z0vgRR>#jCW3kVa&I$A%UGMPPnY(mElFaz_TuXpdf*tzB2`W4rf&%dyE#+mt(Ps|;E
zc;+Z*$G9QT?g^s~Pn&po{aX6R1{cEU0I=J{$L`s?_ctCqJbU%p;nQcK-G`1qTlefE
zp^naT*KXdv{TN?Ugr@c3W3J<fSYu(7xxVx?^x$1Uw062YN`?IZ*hE1LJ&n>Ng(gGV
z0IVMX&2HCa6qikn-#Uyclw9e2`Ug-teB7VC>SpZuASgW>@Yo~jW&Z$lie3JJLmQv~
O0000<MNUMnLSTZ=v?^o(

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/xls.png b/core/media/media/images/mime-icon-32/xls.png
new file mode 100644
index 0000000000000000000000000000000000000000..c04b0efd61e5579e3f9a2271ba71afb47ae58d0d
GIT binary patch
literal 1093
zcmV-L1iJf)P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0005PP)t-s|NsBy
z=H~9~>eklQ^YZcD-rnTk-u3kI+}YRV;pNlM&CJZq?dk2`+}iK&@9pa7tgWuLxw^Z&
zz4!O`wzjr=wBD<+wSl+ay}`uA#l^+P%D=<K*4*Hgv&Y(bFP)~W;B_H&uh#JP`snTO
zg0s-&>Fn9%?v1t2ccQ=3+1-1(<;2zBd6lQQ)#%UF*?pL<%+b|}yWF+S-kQSPU8G!M
zm9}`Ywt=?Uaiqnm&gO!Rl!}#{mA={Ccq`rF=BB8sTZEo;maVPE)$Q{4YNlaqrOCz1
z&w8}jWT;)6v%$KZfsmP=jg?5mp@7JPNWQ+ZZkUgvt+mv9F;st>$8|A(ijk16laRR4
zUaV-tf;q{sn0B?osJN<_p{0_Wqr;bRWT0httj))_s-&y0g08dFa3XG^ae1IxjHI-L
zoUFRd+TC_3&AO<yy1vES>&SRDqo${vxyz!r#htRAo}rtt#L>WiNN}QW(0)6_o_n)@
zPt$ZKW2$0|tdC!YptQlZeWAIin1zv-ovYC3S%jgmh(Cg;gyHJ%bh4~dfSr@T-*}m>
z*VE0Kqo;qSzmKhvV2`esubE$=U!1$n=kN5r)#U>Uuc-h400DGTPE!Ct=GbNc00J>d
zL_t(|0gaLagX=&PMstU8YIlvUZSOwYwr$%s{_nflsrz*5^yK?S+J9jgyc`{&hzSLO
zYGH&a;Co9uvKwEYZWaWv5*8<BI&Fej+xYz5#L&d*fu5d$k!B_6`jwq?76hlBg@k#g
zaiZzcP}}(QkHOrRStU@9T2v64N>NN$Io<TLy)Bo!`a1izAb^=RIRPK<+Q?vbG23-6
zyV&()d#e&0ComZ>i9rYm=v{cBcr-uXttlM9NpZpv0MWauzoQ??WI8lO*n!kV%OOS{
z&vQLQO0OVrIyV`x2>t^l1aYA#cvxW&KwR6l0o2zr!AQoEIx$-N5A1q)J&7e%g3tp~
zF_X-0J~fOS`O5v_aKcK0?N=-v+p%HK17!HK?ZZlfVI*Q{&TlnrJH2dtdu%UPctyd%
zijE8S>+1Hd@QvYDhHV?=WAN9gc_RvSFW30orT|b;5vosQ?xJx1&WZh_qi?oQyxnD`
z3O%qs*1HddhNqqJcs$ytd%)e&N(vV%+z*#$W;V6Nk@2lAA*8&52S0}NrFAD8Zgh@~
zjWu>-Kt%%Z$iX0$nZx&vMx)X3?xX~Sg-Z#3g~wb7o_)X2S5FyJyIB-KL=FWh144vO
z9YVmZN&pe8521ia7wc;UhMPmAhcI<k2qL9X5Ii23ickp%1{4ycq(wmlkB4+6sB}QW
zP!Mpm;aW5;A`1yjD-lNg9$^M(@meU6PWq%Q%Q8*s7=$qvR)78is3%tv#pDo300000
LNkvXXu0mjf`Ibpo

literal 0
HcmV?d00001

diff --git a/core/media/media/images/mime-icon-32/zip.png b/core/media/media/images/mime-icon-32/zip.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b3f5ee20ac95fa0cca582fffc5cd84cdaf98e1f
GIT binary patch
literal 1063
zcmV+?1laqDP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00006bW%=J0RI60
z0RJ~w8+`x(1KdeOK~#7F&6We399a}V_t&lM*tTuk*4Q;_3>(SVuCZ;z&iQham)WZ7
zn)UAePP^)!$NT!D*Z*+*F9nYuKMwJfZM&0pAUtzNaE7owD4l1%;d^it=u-$DOpFMR
zAHZ+kM5p;SB-Y(7>dR>zZy$T+YaWBRiUB_AJ&#K|Cyr$_&b^#EIyxFq&`_D>PP~<q
z8D8SO{ejd|zOWTp;VW)NT;J+w+U2YZ%4_c#dvr2gFKiifmUZY|Be@N|V-KI4N-mml
zGOoF!C!m0I8HLTduJ^Q*2m_tf-FjMK)S~j}xz}%>qz4BbRWx5KXj*y4U)0pE<<}u7
zs_(q)%v*LbVcLP)b^;o!r*1Dx-l(W?Z4m06YY@!3<h_zsPR4A#gZTjRGVYsix_&+w
zy69{yg6{qyYr*J1d#Ph5xoXq48))?Gg6yONYfj&qb|_3BmzgaWA_7h_1JasvvMuXS
zSI#?n@=qA3zjwSe^VD0;DQfOr$a0(-AL*H5nKqOp4VPa~j8<JX^Qi8c@U;2XWXAOy
z41k@0HBLibcZEM|4gC|m?$z`h%}&5Fr?Xv^QEjDRe}bOsnEdoxb^=B);o>ysrRkRN
zlfv>c*Nuf4k-O~#>{a*GnXYqR8Av|;xq*ZepO|r9{NAq}nqr99uHKu|A^plvHjvBQ
z2=4M|$1DVo-$zwNaaro&yTNloG>Vv$-v%A{Tw(SBclndgTL^mI2750zHx~gVAt!tx
zh)D=J@(n~D{|>J1{@kDkG~5zU(9+Vvb552IL8-P9hXH0a_RPD9#e~uTj)K@#S*|M<
z0!k~T4TlJ*6F3a8LPAgc$`TNh>ZJk)msu}UMjruzfC50-ks7B!NufsIxwC-m$dq_;
zce%3A7iPVRXnt{VF#<|yi+?}WRFM(1OdvHH5wO^_3v(G0k}4Aymt@6R3uJ~xK!Kxb
zDo7f1Y#Qmv%X^-APj7gpXP`Pt*8>U&1RhT&6|uMI6xCFqH$Z#o0qsQqqM^NJ>MQOB
z6fg$}*eMiIYBK$pjO+GFG<n(v(5@^c7kcTUf=<|#Yql{0cjTdmwO9Iz&l(^d4zlyi
zi9`$d#sF43fs7IYDm$GpQ|CQM+Y1tRh!TeZE|@~VUP}x)z<I#Y0p_EI!%q3ky+lB{
zv=b1{$m6dk92^~J0`a0XL}575y4stp1?)BEfaiOjB>oX)r3U%jA>eV`NKd>jxZ*CF
zQNMB}cTp~-ZhjE(L9&m&4SB=1kOCzk`<$C6BVWn|QY%N_hqTq$1A|G0$jrg_lGKpb
h&;z@8{QJTt!y5@%psVh-&`kgU002ovPDHLkV1h+T^{xN_

literal 0
HcmV?d00001

diff --git a/core/media/media/images/progress.gif b/core/media/media/images/progress.gif
new file mode 100644
index 0000000000000000000000000000000000000000..69ad127590bc8e3b7925d254fed0d924726e0bdd
GIT binary patch
literal 1109
zcmV-b1giT-Nk%w1VITtx0Q3|9IAyf;_4Qzc!gG_#C|RyVZn)ao+Vb-9-QC^h=H_sa
z$YF)UKWn#ZjL0%zvMO1wc9hIxhQw!x#w}g2Vq#<f0000000000000000000000000
z000000000000000A^8La000yKEC2ui03ZVl06+!*;2=uTBAlq8h^z=nW_qrzTgr1i
z-Z)*qJejWrj0tsvB2I-=_K+lFYRGaPb=GM!x}@%;C~p$hZ3eYE?h~uN{@UpGIlP_c
z(sm|080h=|fPsR8goTEOh>41ejE#<ukdcy;l$Dl}1euu*1)ZJ+3=f*41e~9pp`@Co
zr>Ux?r>LT@u(7VMte>~4xt_bEy|T2yptHEK#k94p#=OYCtIy4&#L%14!`Ruj)709>
z+{)G6*Wud*3F+$V?CtLF@bU8V^!4`l`1$(#{Qds_00Rp2x8y_vED8z=IQS!BL54&e
zE`eA@;zWcB7h+UM(S=1E9g}=a5fZ{kk{ciYro7mY<4PGNPa1rQvZYI#Dsi%mm@(!}
zo)0ex9ZIyQ(W6L{DqXr%1Q<F<@`xD_q2Sb~cXZ^@qZKRH8e6A^MKZvvShHluMn#K+
zZPzkUt&(*MmTn8RZ{g-$qr)x>J4^!$9!$8f;lqd%?QEgIYsdkObJmEwm<8p^A})hO
zq8TP<uNrl9M)7zw>CZnIgD&kDHD<`IMaQ1J+VyMGGi9f?JX^Iw5s8BfA5Ofu@xsw;
zO;Gl1Ik;BNohcXBoci>0x}r;mj@_4bVAZ>$`tI%e_Uz2fgI8akyLeFKle>S8{yl^E
z%j(lFV4%PM{{RLk;D7`cXyAbeCaB>5f($n3;DZoGDB*+@R%oGwU+6^y8GI2T6%-%t
zft46pKqbeBb)blciYIDV1so=B7-9`DX0;)U9^%MCjbFVuql`Mbz$1x6f*9l&XB?;G
zl1w(~q>{La5v6Tz_~v3}ph=k}l~wYlkd|`k7A9?9av6t}9eQ~sY-6I?C6;B1xh8Hs
z!r7*pY1)aylYI8+=bwN+B3Tldr3OKvgB}W*p@=5h=wgb>l$#5WZdOI5HBq`KqnkR~
zDWsU5cIl^{jVdWck#Z_&Xqv8yYN(>N+7l75vPvkaC<UtPuDtfDq$&V>LrSpb04wY$
z#4@8yvbvCy3A4U9O8~UO&_Zp}GOt`~&9lcM+pQ+rIvcLF-%eZZxa1aVth&RNYc9Ls
zx=ZW<^ww+dz4+#<@4o!@>+in+2Q2Ww1Q%@Z!3Za;@WKo?oN#;1+UM*z5?iNi#Tf5b
z?Rn8!9C5}RZ@k{cA!A$ewiJUr^2ZvReDcKZ=7PY?G}mnN%{b?*^Ugf??DNk+2QBo_
zL>F!J(MTt)^wLZtUCw-}gm*H2)!>((cOGMHpVd`wo%MKM!x#2_UehA=%34o7HrHpP
b4R+aTi+ADNbk}Y7-FWA%_uhQ-9RdJ5vM4N?

literal 0
HcmV?d00001

diff --git a/core/media/media/images/remove.png b/core/media/media/images/remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..65334ae6fa7d3c6f79d686159733b99f179121f6
GIT binary patch
literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00027P)t-s|NsB`
z@9+EM<oDv@@spF?IXToSD(~;__PDtB)YSDB7V(XZ@1mmgdwca}X2-+B*GNdr%*^k@
z!{iMO@y^cVl9KIhZPO(s^B*743=H9KZ|zJ>>2!4E<>ljog3L2B?hOs)q@?S%w$?g2
z#0v}GLqpsnBkd_E^UTc7C@9p_)bAV|{}~zYdwc9SINaRa`Q+sFJ3I1YW8qCr^(iUv
za&q!AGU8HF?Oa^yHa7A<Kf`q!X#fBK0d!JMQvg8b*k%9#0I5ktK~xwS1;GP?1Tg>r
zu(Z?ltZiFo{r_Q?0002=*6SVsHrw~X;Cs6P=oeC+=Xomhfle`{R4%8KiXG6JrE;v*
zVmZxP5Q?>X6r*^r6$4KDdi^sJf8Of*6Doy9qY=rbUw?%P9A2j{vP|~-aR8I+D9;{`
zEFWDbAPlS3<L!2=R)+zooX6eOsyjYc0K#Iq+btIXP?|q4?PjxmdCp4#5JIUG0{925
WZ44G{%L^j_0000<MNUMnLSTZv56IL2

literal 0
HcmV?d00001

diff --git a/core/media/media/images/success.png b/core/media/media/images/success.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c89e36296d0a254a346588bde08fbb36eb3faca
GIT binary patch
literal 1775
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
Rd_DjG002ovPDHLkV1oQWYzhDX

literal 0
HcmV?d00001

diff --git a/core/media/media/images/upload.png b/core/media/media/images/upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f3dbcb51121e075e2634bea43b5d44fd9cdd9c7
GIT binary patch
literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007TNkl<Zcma))
z1I%7a5J1n~&%d8-+p29NsNKe8oCdXG)reCotj%ZJ{;a$A?(Y12=1C@=GgR9TzPipi
zHNFzKq&EB&;Sa>3kc_c)#)xO<0Ysgs2}3&HaYHhhR7yqoH+%=ygzP!?@f4t4P|+@t
zNF>#c6Ip!H6x9dZbJLHcVtI@>GKCcHeB4NlJVKP~SUC0`tW$~(qJaU=i{L2;yzjZ^
z`X5QezaX!R7;A_o65M;oEqwNAElu(3agIL_1#q-V6k2{F9?O!e=F!$CFa{%KT3V#6
zQ(Tww5Co9F5h#TihqfWU(NsfC;0)FQDny(m>M2Bo-{S#@v<s5lK(Snl5JNkQHWsDg
zl#6xL#cw4N@j%o+2s}ky<Tk$f{wDl%9W`<-_3Bzo<~qLr>K45E4SeB`CA9jF0{Oil
zb|bf@o+0~s7W2ku@cQS(-v5a^uY0j=wA-(Lghjhw!HQOY*ntRqke-Egt}PzaKk?3e
zNyG&N?h|x%4!2$VAdlSq5=Fnv;jc$F>{_eqPA$xoq9TF<2DCp`8<8h+yz%-<`aU)p
zE3HzCL-;oT6;IsWnNm>Y>X#?;PcHSYjjF%-SDR|WH$hwS7wL}(ox!+}(1sLrk*DwI
zN-3;(7e70bjwWL&j|&^0y6I(5szW6$0>AB%Zfdv_<7}JkyZo12TX!?Besz|!pPczA
zF!WQK_P)B>iFzfl^2F~?d@Mbt(GOa85VUo3-}R63^1c1I^5r?sd~&W*)TI}`T`un`
z5#j&v_)@R@{GGjOPJDRuo50b#CHVt@|1G$8u_{{^si``9?~lvnGdgGnat={;Y~l@Y
P00000NkvXXu0mjf7<x=A

literal 0
HcmV?d00001

diff --git a/core/media/media/images/uploading.png b/core/media/media/images/uploading.png
new file mode 100644
index 0000000000000000000000000000000000000000..a494fea906bd2ecca0158eee3e9315fc6d7e3f56
GIT binary patch
literal 1126
zcmV-s1eyDZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CnNkl<Zcmd^?
z1B~QJ6vlsJ-1KH_ExXSb%|vJ0wr!hhGdSC~-VM%L+q*rsZT3s<C6&tdHZtLT$@}9~
zO?}`0p{j@fJwmXsbm`J-!o$Nq0UTjrVT6W;GCVxY(9n<?gM)*57xT*pba?J}0Y701
zxa+RFFi}uY(DLAe55^;dA*v5XMn+KRd!WycKKf`Ykbr@3`AP$#SjZ_UDG>oGLhq)}
z^m~0*^3>E+`uqFiu@LTYVoz3*s;Vk<(VUzd^trOKQi;@Wk^7HuEJ(iXFSVcTcmD)v
zN-P25v;~OoScDeo*hWCAR-t5e*zKB7$Q(dZ6MO``eYwotwP!Eec5J7lw4AQ)ZpJwr
zIHyeFtTWCeCo9u?YWx+T5wOWyT3h+x<4?)T&f=cCZYMo0O<IT{kKo$6I==aSITaNZ
zJbeFsB*e$t=?GkaslK(XjrmKK^1?Gu;F{t@#hrKF`TY9pFXZRu@zS$Taq#d#rp}zl
zqPcVIba)jIDo)cxfZ2+IPrvwzS6+MuA(x#|_71TF2M%JspWr%yH(z^^X)|Y;DKt}H
z+tCG>dE0m3023zUGim%pgv>O7lB*EcWG8v~d2HCU2{VdXU$%wX4m$<^ZrsFGS6qTk
zt~;nnu6F%3SFmH(F0!+;$;-<NFalNz+{MMDrKDjCm^yVD0=X-(j%8(Jap;Jfo}M0E
z$L|Q}$%Ue`vkTAZh%Tfg%a$!egf3dN7!{x*A|fK_>go<ofLQ~%xw$wT4#cnIdcXJH
zdl4cb-LPQ;W@?6phKY%ZrmU<?T2uFs;A-G_r;~=JMtdt}=FAy%bhNQ@<#KMm`4;~D
zcY_L~zOjzXj0}w&3jYLHHE{6-=d)_fdasAlS!bQax8HulV~;(i0{HHS<(zWD3B<(2
z1m1>b4M_MhGt$|!XD`L2C3wS`XP)Vqvm3#|Lx<SDeHRy;e;zKEOS=GX2tC$eq<G-o
zdwBh=sT_76(cR4M9El!#_wVD`7hmPh+ioExC56byNR2>Xr=gN)sFRbDnELjcOr0@{
z<4<sM+f6r0WIO~>3=H&BT~o`aUw*}|ox6GHzI$*vo$?DviGx3mr3=jC_}M2P=dXYM
zW#*g(l$Mv#+115yv9V-lWpUccCv*4hw~?HjtQ(X@C@=w914mOI7Z=Ax7o5*cH(XC=
zXQ%we69OS4Ha1rJ-Yz^v@F}n%m7bWGNK#Ug&eIKu^73+<Jopr7E1E~DF0NxjY7%P2
z>m1VpOMxHIMU~w42Ni*}Yu7rizWVBR&m!aE<Kyk)G*H-oD{a}aeEITppatl&|21;}
zDTRfFH+Vw%1`xy8K!x<W-R@c2wryJh)B`oZuqhxCNCT39cpwT0V{Fh1gachbGf)9^
sY6NTuakL21@iD+KFd$+7&$Lh&1)@d!=h56sEdT%j07*qoM6N<$f=st9ZvX%Q

literal 0
HcmV?d00001

diff --git a/core/media/media/js/flashmediaelement-cdn.swf b/core/media/media/js/flashmediaelement-cdn.swf
new file mode 100644
index 0000000000000000000000000000000000000000..a40d7c988b37572bb193c2c476501d1e19003c88
GIT binary patch
literal 130167
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

literal 0
HcmV?d00001

diff --git a/core/media/media/js/flashmediaelement.swf b/core/media/media/js/flashmediaelement.swf
new file mode 100644
index 0000000000000000000000000000000000000000..ff25d19a50743d1afaac893f080d6c8bb839afe2
GIT binary patch
literal 130149
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
X)*{Ancnf^mdL2^gQTl%XrR|VdH=Uh;

literal 0
HcmV?d00001

diff --git a/core/media/media/js/mediaelement-and-player.js b/core/media/media/js/mediaelement-and-player.js
new file mode 100644
index 00000000..98a0d1ab
--- /dev/null
+++ b/core/media/media/js/mediaelement-and-player.js
@@ -0,0 +1,5988 @@
+/*!
+ *
+ * MediaElement.js
+ * HTML5 <video> and <audio> shim and player
+ * http://mediaelementjs.com/
+ *
+ * Creates a JavaScript object that mimics HTML5 MediaElement API
+ * for browsers that don't understand HTML5 or can't play the provided codec
+ * Can play MP4 (H.264), Ogg, WebM, FLV, WMV, WMA, ACC, and MP3
+ *
+ * Copyright 2010-2014, John Dyer (http://j.hn)
+ * License: MIT
+ *
+ */
+// Namespace
+var mejs = mejs || {};
+
+// version number
+mejs.version = '2.23.0';
+
+
+// player number (for missing, same id attr)
+mejs.meIndex = 0;
+
+// media types accepted by plugins
+mejs.plugins = {
+	silverlight: [
+		{version: [3,0], types: ['video/mp4','video/m4v','video/mov','video/wmv','audio/wma','audio/m4a','audio/mp3','audio/wav','audio/mpeg']}
+	],
+	flash: [
+		{version: [9,0,124], types: ['video/mp4','video/m4v','video/mov','video/flv','video/rtmp','video/x-flv','audio/flv','audio/x-flv','audio/mp3','audio/m4a','audio/mpeg', 'video/dailymotion', 'video/x-dailymotion', 'application/x-mpegURL']}
+		// 'video/youtube', 'video/x-youtube', 
+		// ,{version: [12,0], types: ['video/webm']} // for future reference (hopefully!)
+	],
+	youtube: [
+		{version: null, types: ['video/youtube', 'video/x-youtube', 'audio/youtube', 'audio/x-youtube']}
+	],
+	vimeo: [
+		{version: null, types: ['video/vimeo', 'video/x-vimeo']}
+	]
+};
+
+/*
+Utility methods
+*/
+mejs.Utility = {
+	encodeUrl: function(url) {
+		return encodeURIComponent(url); //.replace(/\?/gi,'%3F').replace(/=/gi,'%3D').replace(/&/gi,'%26');
+	},
+	escapeHTML: function(s) {
+		return s.toString().split('&').join('&amp;').split('<').join('&lt;').split('"').join('&quot;');
+	},
+	absolutizeUrl: function(url) {
+		var el = document.createElement('div');
+		el.innerHTML = '<a href="' + this.escapeHTML(url) + '">x</a>';
+		return el.firstChild.href;
+	},
+	getScriptPath: function(scriptNames) {
+		var
+			i = 0,
+			j,
+			codePath = '',
+			testname = '',
+			slashPos,
+			filenamePos,
+			scriptUrl,
+			scriptPath,			
+			scriptFilename,
+			scripts = document.getElementsByTagName('script'),
+			il = scripts.length,
+			jl = scriptNames.length;
+			
+		// go through all <script> tags
+		for (; i < il; i++) {
+			scriptUrl = scripts[i].src;
+			slashPos = scriptUrl.lastIndexOf('/');
+			if (slashPos > -1) {
+				scriptFilename = scriptUrl.substring(slashPos + 1);
+				scriptPath = scriptUrl.substring(0, slashPos + 1);
+			} else {
+				scriptFilename = scriptUrl;
+				scriptPath = '';			
+			}
+			
+			// see if any <script> tags have a file name that matches the 
+			for (j = 0; j < jl; j++) {
+				testname = scriptNames[j];
+				filenamePos = scriptFilename.indexOf(testname);
+				if (filenamePos > -1) {
+					codePath = scriptPath;
+					break;
+				}
+			}
+			
+			// if we found a path, then break and return it
+			if (codePath !== '') {
+				break;
+			}
+		}
+		
+		// send the best path back
+		return codePath;
+	},
+	/*
+	 * Calculate the time format to use. We have a default format set in the
+	 * options but it can be imcomplete. We ajust it according to the media
+	 * duration.
+	 *
+	 * We support format like 'hh:mm:ss:ff'.
+	 */
+	calculateTimeFormat: function(time, options, fps) {
+		if (time < 0) {
+			time = 0;
+		}
+
+		if(typeof fps == 'undefined') {
+		    fps = 25;
+		}
+
+		var format = options.timeFormat,
+			firstChar = format[0],
+			firstTwoPlaces = (format[1] == format[0]),
+			separatorIndex = firstTwoPlaces? 2: 1,
+			separator = ':',
+			hours = Math.floor(time / 3600) % 24,
+			minutes = Math.floor(time / 60) % 60,
+			seconds = Math.floor(time % 60),
+			frames = Math.floor(((time % 1)*fps).toFixed(3)),
+			lis = [
+				[frames, 'f'],
+				[seconds, 's'],
+				[minutes, 'm'],
+				[hours, 'h']
+			];
+
+		// Try to get the separator from the format
+		if (format.length < separatorIndex) {
+			separator = format[separatorIndex];
+		}
+
+		var required = false;
+
+		for (var i=0, len=lis.length; i < len; i++) {
+			if (format.indexOf(lis[i][1]) !== -1) {
+				required=true;
+			}
+			else if (required) {
+				var hasNextValue = false;
+				for (var j=i; j < len; j++) {
+					if (lis[j][0] > 0) {
+						hasNextValue = true;
+						break;
+					}
+				}
+
+				if (! hasNextValue) {
+					break;
+				}
+
+				if (!firstTwoPlaces) {
+					format = firstChar + format;
+				}
+				format = lis[i][1] + separator + format;
+				if (firstTwoPlaces) {
+					format = lis[i][1] + format;
+				}
+				firstChar = lis[i][1];
+			}
+		}
+		options.currentTimeFormat = format;
+	},
+	/*
+	 * Prefix the given number by zero if it is lower than 10.
+	 */
+	twoDigitsString: function(n) {
+		if (n < 10) {
+			return '0' + n;
+		}
+		return String(n);
+	},
+	secondsToTimeCode: function(time, options) {
+		if (time < 0) {
+			time = 0;
+		}
+
+		// Maintain backward compatibility with method signature before v2.18.
+		if (typeof options !== 'object') {
+			var format = 'm:ss';
+			format = arguments[1] ? 'hh:mm:ss' : format; // forceHours
+			format = arguments[2] ? format + ':ff' : format; // showFrameCount
+
+			options = {
+				currentTimeFormat: format,
+				framesPerSecond: arguments[3] || 25
+			};
+		}
+
+		var fps = options.framesPerSecond;
+		if(typeof fps === 'undefined') {
+			fps = 25;
+		}
+
+		var format = options.currentTimeFormat,
+			hours = Math.floor(time / 3600) % 24,
+			minutes = Math.floor(time / 60) % 60,
+			seconds = Math.floor(time % 60),
+			frames = Math.floor(((time % 1)*fps).toFixed(3));
+			lis = [
+				[frames, 'f'],
+				[seconds, 's'],
+				[minutes, 'm'],
+				[hours, 'h']
+			];
+
+		var res = format;
+		for (i=0,len=lis.length; i < len; i++) {
+			res = res.replace(lis[i][1]+lis[i][1], this.twoDigitsString(lis[i][0]));
+			res = res.replace(lis[i][1], lis[i][0]);
+		}
+		return res;
+	},
+	
+	timeCodeToSeconds: function(hh_mm_ss_ff, forceHours, showFrameCount, fps){
+		if (typeof showFrameCount == 'undefined') {
+		    showFrameCount=false;
+		} else if(typeof fps == 'undefined') {
+		    fps = 25;
+		}
+	
+		var tc_array = hh_mm_ss_ff.split(":"),
+			tc_hh = parseInt(tc_array[0], 10),
+			tc_mm = parseInt(tc_array[1], 10),
+			tc_ss = parseInt(tc_array[2], 10),
+			tc_ff = 0,
+			tc_in_seconds = 0;
+		
+		if (showFrameCount) {
+		    tc_ff = parseInt(tc_array[3])/fps;
+		}
+		
+		tc_in_seconds = ( tc_hh * 3600 ) + ( tc_mm * 60 ) + tc_ss + tc_ff;
+		
+		return tc_in_seconds;
+	},
+	
+
+	convertSMPTEtoSeconds: function (SMPTE) {
+		if (typeof SMPTE != 'string') 
+			return false;
+
+		SMPTE = SMPTE.replace(',', '.');
+		
+		var secs = 0,
+			decimalLen = (SMPTE.indexOf('.') != -1) ? SMPTE.split('.')[1].length : 0,
+			multiplier = 1;
+		
+		SMPTE = SMPTE.split(':').reverse();
+		
+		for (var i = 0; i < SMPTE.length; i++) {
+			multiplier = 1;
+			if (i > 0) {
+				multiplier = Math.pow(60, i); 
+			}
+			secs += Number(SMPTE[i]) * multiplier;
+		}
+		return Number(secs.toFixed(decimalLen));
+	},	
+	
+	/* borrowed from SWFObject: http://code.google.com/p/swfobject/source/browse/trunk/swfobject/src/swfobject.js#474 */
+	removeSwf: function(id) {
+		var obj = document.getElementById(id);
+		if (obj && /object|embed/i.test(obj.nodeName)) {
+			if (mejs.MediaFeatures.isIE) {
+				obj.style.display = "none";
+				(function(){
+					if (obj.readyState == 4) {
+						mejs.Utility.removeObjectInIE(id);
+					} else {
+						setTimeout(arguments.callee, 10);
+					}
+				})();
+			} else {
+				obj.parentNode.removeChild(obj);
+			}
+		}
+	},
+	removeObjectInIE: function(id) {
+		var obj = document.getElementById(id);
+		if (obj) {
+			for (var i in obj) {
+				if (typeof obj[i] == "function") {
+					obj[i] = null;
+				}
+			}
+			obj.parentNode.removeChild(obj);
+		}		
+	},
+    determineScheme: function(url) {
+        if (url && url.indexOf("://") != -1) {
+            return url.substr(0, url.indexOf("://")+3);
+        }
+        return "//"; // let user agent figure this out
+    }
+};
+
+
+// Core detector, plugins are added below
+mejs.PluginDetector = {
+
+	// main public function to test a plug version number PluginDetector.hasPluginVersion('flash',[9,0,125]);
+	hasPluginVersion: function(plugin, v) {
+		var pv = this.plugins[plugin];
+		v[1] = v[1] || 0;
+		v[2] = v[2] || 0;
+		return (pv[0] > v[0] || (pv[0] == v[0] && pv[1] > v[1]) || (pv[0] == v[0] && pv[1] == v[1] && pv[2] >= v[2])) ? true : false;
+	},
+
+	// cached values
+	nav: window.navigator,
+	ua: window.navigator.userAgent.toLowerCase(),
+
+	// stored version numbers
+	plugins: [],
+
+	// runs detectPlugin() and stores the version number
+	addPlugin: function(p, pluginName, mimeType, activeX, axDetect) {
+		this.plugins[p] = this.detectPlugin(pluginName, mimeType, activeX, axDetect);
+	},
+
+	// get the version number from the mimetype (all but IE) or ActiveX (IE)
+	detectPlugin: function(pluginName, mimeType, activeX, axDetect) {
+
+		var version = [0,0,0],
+			description,
+			i,
+			ax;
+
+		// Firefox, Webkit, Opera
+		if (typeof(this.nav.plugins) != 'undefined' && typeof this.nav.plugins[pluginName] == 'object') {
+			description = this.nav.plugins[pluginName].description;
+			if (description && !(typeof this.nav.mimeTypes != 'undefined' && this.nav.mimeTypes[mimeType] && !this.nav.mimeTypes[mimeType].enabledPlugin)) {
+				version = description.replace(pluginName, '').replace(/^\s+/,'').replace(/\sr/gi,'.').split('.');
+				for (i=0; i<version.length; i++) {
+					version[i] = parseInt(version[i].match(/\d+/), 10);
+				}
+			}
+		// Internet Explorer / ActiveX
+		} else if (typeof(window.ActiveXObject) != 'undefined') {
+			try {
+				ax = new ActiveXObject(activeX);
+				if (ax) {
+					version = axDetect(ax);
+				}
+			}
+			catch (e) { }
+		}
+		return version;
+	}
+};
+
+// Add Flash detection
+mejs.PluginDetector.addPlugin('flash','Shockwave Flash','application/x-shockwave-flash','ShockwaveFlash.ShockwaveFlash', function(ax) {
+	// adapted from SWFObject
+	var version = [],
+		d = ax.GetVariable("$version");
+	if (d) {
+		d = d.split(" ")[1].split(",");
+		version = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
+	}
+	return version;
+});
+
+// Add Silverlight detection
+mejs.PluginDetector.addPlugin('silverlight','Silverlight Plug-In','application/x-silverlight-2','AgControl.AgControl', function (ax) {
+	// Silverlight cannot report its version number to IE
+	// but it does have a isVersionSupported function, so we have to loop through it to get a version number.
+	// adapted from http://www.silverlightversion.com/
+	var v = [0,0,0,0],
+		loopMatch = function(ax, v, i, n) {
+			while(ax.isVersionSupported(v[0]+ "."+ v[1] + "." + v[2] + "." + v[3])){
+				v[i]+=n;
+			}
+			v[i] -= n;
+		};
+	loopMatch(ax, v, 0, 1);
+	loopMatch(ax, v, 1, 1);
+	loopMatch(ax, v, 2, 10000); // the third place in the version number is usually 5 digits (4.0.xxxxx)
+	loopMatch(ax, v, 2, 1000);
+	loopMatch(ax, v, 2, 100);
+	loopMatch(ax, v, 2, 10);
+	loopMatch(ax, v, 2, 1);
+	loopMatch(ax, v, 3, 1);
+
+	return v;
+});
+// add adobe acrobat
+/*
+PluginDetector.addPlugin('acrobat','Adobe Acrobat','application/pdf','AcroPDF.PDF', function (ax) {
+	var version = [],
+		d = ax.GetVersions().split(',')[0].split('=')[1].split('.');
+
+	if (d) {
+		version = [parseInt(d[0], 10), parseInt(d[1], 10), parseInt(d[2], 10)];
+	}
+	return version;
+});
+*/
+// necessary detection (fixes for <IE9)
+mejs.MediaFeatures = {
+	init: function() {
+		var
+			t = this,
+			d = document,
+			nav = mejs.PluginDetector.nav,
+			ua = mejs.PluginDetector.ua.toLowerCase(),
+			i,
+			v,
+			html5Elements = ['source','track','audio','video'];
+
+		// detect browsers (only the ones that have some kind of quirk we need to work around)
+		t.isiPad = (ua.match(/ipad/i) !== null);
+		t.isiPhone = (ua.match(/iphone/i) !== null);
+		t.isiOS = t.isiPhone || t.isiPad;
+		t.isAndroid = (ua.match(/android/i) !== null);
+		t.isBustedAndroid = (ua.match(/android 2\.[12]/) !== null);
+		t.isBustedNativeHTTPS = (location.protocol === 'https:' && (ua.match(/android [12]\./) !== null || ua.match(/macintosh.* version.* safari/) !== null));
+		t.isIE = (nav.appName.toLowerCase().indexOf("microsoft") != -1 || nav.appName.toLowerCase().match(/trident/gi) !== null);
+		t.isChrome = (ua.match(/chrome/gi) !== null);
+		t.isChromium = (ua.match(/chromium/gi) !== null);
+		t.isFirefox = (ua.match(/firefox/gi) !== null);
+		t.isWebkit = (ua.match(/webkit/gi) !== null);
+		t.isGecko = (ua.match(/gecko/gi) !== null) && !t.isWebkit && !t.isIE;
+		t.isOpera = (ua.match(/opera/gi) !== null);
+		t.hasTouch = ('ontouchstart' in window); //  && window.ontouchstart != null); // this breaks iOS 7
+
+		// Borrowed from `Modernizr.svgasimg`, sources:
+		// - https://github.com/Modernizr/Modernizr/issues/687
+		// - https://github.com/Modernizr/Modernizr/pull/1209/files
+		t.svgAsImg = !!document.implementation.hasFeature('http://www.w3.org/TR/SVG11/feature#Image', '1.1');
+
+		// create HTML5 media elements for IE before 9, get a <video> element for fullscreen detection
+		for (i=0; i<html5Elements.length; i++) {
+			v = document.createElement(html5Elements[i]);
+		}
+
+		t.supportsMediaTag = (typeof v.canPlayType !== 'undefined' || t.isBustedAndroid);
+
+		// Fix for IE9 on Windows 7N / Windows 7KN (Media Player not installer)
+		try{
+			v.canPlayType("video/mp4");
+		}catch(e){
+			t.supportsMediaTag = false;
+		}
+
+		t.supportsPointerEvents = (function() {
+			// TAKEN FROM MODERNIZR
+			var element = document.createElement('x'),
+				documentElement = document.documentElement,
+				getComputedStyle = window.getComputedStyle,
+				supports;
+			if(!('pointerEvents' in element.style)){
+				return false;
+			}
+			element.style.pointerEvents = 'auto';
+			element.style.pointerEvents = 'x';
+			documentElement.appendChild(element);
+			supports = getComputedStyle &&
+				getComputedStyle(element, '').pointerEvents === 'auto';
+			documentElement.removeChild(element);
+			return !!supports;
+		})();
+
+
+		 // Older versions of Firefox can't move plugins around without it resetting,
+		t.hasFirefoxPluginMovingProblem = false;
+
+		// detect native JavaScript fullscreen (Safari/Firefox only, Chrome still fails)
+
+		// iOS
+		t.hasiOSFullScreen = (typeof v.webkitEnterFullscreen !== 'undefined');
+
+		// W3C
+		t.hasNativeFullscreen = (typeof v.requestFullscreen !== 'undefined');
+
+		// webkit/firefox/IE11+
+		t.hasWebkitNativeFullScreen = (typeof v.webkitRequestFullScreen !== 'undefined');
+		t.hasMozNativeFullScreen = (typeof v.mozRequestFullScreen !== 'undefined');
+		t.hasMsNativeFullScreen = (typeof v.msRequestFullscreen !== 'undefined');
+
+		t.hasTrueNativeFullScreen = (t.hasWebkitNativeFullScreen || t.hasMozNativeFullScreen || t.hasMsNativeFullScreen);
+		t.nativeFullScreenEnabled = t.hasTrueNativeFullScreen;
+
+		// Enabled?
+		if (t.hasMozNativeFullScreen) {
+			t.nativeFullScreenEnabled = document.mozFullScreenEnabled;
+		} else if (t.hasMsNativeFullScreen) {
+			t.nativeFullScreenEnabled = document.msFullscreenEnabled;
+		}
+
+		if (t.isChrome) {
+			t.hasiOSFullScreen = false;
+		}
+
+		if (t.hasTrueNativeFullScreen) {
+
+			t.fullScreenEventName = '';
+			if (t.hasWebkitNativeFullScreen) {
+				t.fullScreenEventName = 'webkitfullscreenchange';
+
+			} else if (t.hasMozNativeFullScreen) {
+				t.fullScreenEventName = 'mozfullscreenchange';
+
+			} else if (t.hasMsNativeFullScreen) {
+				t.fullScreenEventName = 'MSFullscreenChange';
+			}
+
+			t.isFullScreen = function() {
+				if (t.hasMozNativeFullScreen) {
+					return d.mozFullScreen;
+
+				} else if (t.hasWebkitNativeFullScreen) {
+					return d.webkitIsFullScreen;
+
+				} else if (t.hasMsNativeFullScreen) {
+					return d.msFullscreenElement !== null;
+				}
+			}
+
+			t.requestFullScreen = function(el) {
+
+				if (t.hasWebkitNativeFullScreen) {
+					el.webkitRequestFullScreen();
+
+				} else if (t.hasMozNativeFullScreen) {
+					el.mozRequestFullScreen();
+
+				} else if (t.hasMsNativeFullScreen) {
+					el.msRequestFullscreen();
+
+				}
+			}
+
+			t.cancelFullScreen = function() {
+				if (t.hasWebkitNativeFullScreen) {
+					document.webkitCancelFullScreen();
+
+				} else if (t.hasMozNativeFullScreen) {
+					document.mozCancelFullScreen();
+
+				} else if (t.hasMsNativeFullScreen) {
+					document.msExitFullscreen();
+
+				}
+			}
+
+		}
+
+
+		// OS X 10.5 can't do this even if it says it can :(
+		if (t.hasiOSFullScreen && ua.match(/mac os x 10_5/i)) {
+			t.hasNativeFullScreen = false;
+			t.hasiOSFullScreen = false;
+		}
+
+	}
+};
+mejs.MediaFeatures.init();
+
+/*
+extension methods to <video> or <audio> object to bring it into parity with PluginMediaElement (see below)
+*/
+mejs.HtmlMediaElement = {
+	pluginType: 'native',
+	isFullScreen: false,
+
+	setCurrentTime: function (time) {
+		this.currentTime = time;
+	},
+
+	setMuted: function (muted) {
+		this.muted = muted;
+	},
+
+	setVolume: function (volume) {
+		this.volume = volume;
+	},
+
+	// for parity with the plugin versions
+	stop: function () {
+		this.pause();
+	},
+
+	// This can be a url string
+	// or an array [{src:'file.mp4',type:'video/mp4'},{src:'file.webm',type:'video/webm'}]
+	setSrc: function (url) {
+		
+		// Fix for IE9 which can't set .src when there are <source> elements. Awesome, right?
+		var 
+			existingSources = this.getElementsByTagName('source');
+		while (existingSources.length > 0){
+			this.removeChild(existingSources[0]);
+		}
+	
+		if (typeof url == 'string') {
+			this.src = url;
+		} else {
+			var i, media;
+
+			for (i=0; i<url.length; i++) {
+				media = url[i];
+				if (this.canPlayType(media.type)) {
+					this.src = media.src;
+					break;
+				}
+			}
+		}
+	},
+
+	setVideoSize: function (width, height) {
+		this.width = width;
+		this.height = height;
+	}
+};
+
+/*
+Mimics the <video/audio> element by calling Flash's External Interface or Silverlights [ScriptableMember]
+*/
+mejs.PluginMediaElement = function (pluginid, pluginType, mediaUrl) {
+	this.id = pluginid;
+	this.pluginType = pluginType;
+	this.src = mediaUrl;
+	this.events = {};
+	this.attributes = {};
+};
+
+// JavaScript values and ExternalInterface methods that match HTML5 video properties methods
+// http://www.adobe.com/livedocs/flash/9.0/ActionScriptLangRefV3/fl/video/FLVPlayback.html
+// http://www.whatwg.org/specs/web-apps/current-work/multipage/video.html
+mejs.PluginMediaElement.prototype = {
+
+	// special
+	pluginElement: null,
+	pluginType: '',
+	isFullScreen: false,
+
+	// not implemented :(
+	playbackRate: -1,
+	defaultPlaybackRate: -1,
+	seekable: [],
+	played: [],
+
+	// HTML5 read-only properties
+	paused: true,
+	ended: false,
+	seeking: false,
+	duration: 0,
+	error: null,
+	tagName: '',
+
+	// HTML5 get/set properties, but only set (updated by event handlers)
+	muted: false,
+	volume: 1,
+	currentTime: 0,
+
+	// HTML5 methods
+	play: function () {
+		if (this.pluginApi != null) {
+			if (this.pluginType == 'youtube' || this.pluginType == 'vimeo') {
+				this.pluginApi.playVideo();
+			} else {
+				this.pluginApi.playMedia();
+			}
+			this.paused = false;
+		}
+	},
+	load: function () {
+		if (this.pluginApi != null) {
+			if (this.pluginType == 'youtube' || this.pluginType == 'vimeo') {
+			} else {
+				this.pluginApi.loadMedia();
+			}
+			
+			this.paused = false;
+		}
+	},
+	pause: function () {
+		if (this.pluginApi != null) {
+			if (this.pluginType == 'youtube' || this.pluginType == 'vimeo') {
+		        if( this.pluginApi.getPlayerState() == 1 ) {
+				    this.pluginApi.pauseVideo();
+                }
+			} else {
+				this.pluginApi.pauseMedia();
+			}			
+			
+			
+			this.paused = true;
+		}
+	},
+	stop: function () {
+		if (this.pluginApi != null) {
+			if (this.pluginType == 'youtube' || this.pluginType == 'vimeo') {
+				this.pluginApi.stopVideo();
+			} else {
+				this.pluginApi.stopMedia();
+			}	
+			this.paused = true;
+		}
+	},
+	canPlayType: function(type) {
+		var i,
+			j,
+			pluginInfo,
+			pluginVersions = mejs.plugins[this.pluginType];
+
+		for (i=0; i<pluginVersions.length; i++) {
+			pluginInfo = pluginVersions[i];
+
+			// test if user has the correct plugin version
+			if (mejs.PluginDetector.hasPluginVersion(this.pluginType, pluginInfo.version)) {
+
+				// test for plugin playback types
+				for (j=0; j<pluginInfo.types.length; j++) {
+					// find plugin that can play the type
+					if (type == pluginInfo.types[j]) {
+						return 'probably';
+					}
+				}
+			}
+		}
+
+		return '';
+	},
+	
+	positionFullscreenButton: function(x,y,visibleAndAbove) {
+		if (this.pluginApi != null && this.pluginApi.positionFullscreenButton) {
+			this.pluginApi.positionFullscreenButton(Math.floor(x),Math.floor(y),visibleAndAbove);
+		}
+	},
+	
+	hideFullscreenButton: function() {
+		if (this.pluginApi != null && this.pluginApi.hideFullscreenButton) {
+			this.pluginApi.hideFullscreenButton();
+		}		
+	},	
+	
+
+	// custom methods since not all JavaScript implementations support get/set
+
+	// This can be a url string
+	// or an array [{src:'file.mp4',type:'video/mp4'},{src:'file.webm',type:'video/webm'}]
+	setSrc: function (url) {
+		if (typeof url == 'string') {
+			this.pluginApi.setSrc(mejs.Utility.absolutizeUrl(url));
+			this.src = mejs.Utility.absolutizeUrl(url);
+		} else {
+			var i, media;
+
+			for (i=0; i<url.length; i++) {
+				media = url[i];
+				if (this.canPlayType(media.type)) {
+					this.pluginApi.setSrc(mejs.Utility.absolutizeUrl(media.src));
+					this.src = mejs.Utility.absolutizeUrl(media.src);
+					break;
+				}
+			}
+		}
+
+	},
+	setCurrentTime: function (time) {
+		if (this.pluginApi != null) {
+			if (this.pluginType == 'youtube' || this.pluginType == 'vimeo') {
+				this.pluginApi.seekTo(time);
+			} else {
+				this.pluginApi.setCurrentTime(time);
+			}				
+			
+			
+			
+			this.currentTime = time;
+		}
+	},
+	setVolume: function (volume) {
+		if (this.pluginApi != null) {
+			// same on YouTube and MEjs
+			if (this.pluginType == 'youtube') {
+				this.pluginApi.setVolume(volume * 100);
+			} else {
+				this.pluginApi.setVolume(volume);
+			}
+			this.volume = volume;
+		}
+	},
+	setMuted: function (muted) {
+		if (this.pluginApi != null) {
+			if (this.pluginType == 'youtube') {
+				if (muted) {
+					this.pluginApi.mute();
+				} else {
+					this.pluginApi.unMute();
+				}
+				this.muted = muted;
+				this.dispatchEvent({type:'volumechange'});
+			} else {
+				this.pluginApi.setMuted(muted);
+			}
+			this.muted = muted;
+		}
+	},
+
+	// additional non-HTML5 methods
+	setVideoSize: function (width, height) {
+		
+		//if (this.pluginType == 'flash' || this.pluginType == 'silverlight') {
+			if (this.pluginElement && this.pluginElement.style) {
+				this.pluginElement.style.width = width + 'px';
+				this.pluginElement.style.height = height + 'px';
+			}
+			if (this.pluginApi != null && this.pluginApi.setVideoSize) {
+				this.pluginApi.setVideoSize(width, height);
+			}
+		//}
+	},
+
+	setFullscreen: function (fullscreen) {
+		if (this.pluginApi != null && this.pluginApi.setFullscreen) {
+			this.pluginApi.setFullscreen(fullscreen);
+		}
+	},
+	
+	enterFullScreen: function() {
+		if (this.pluginApi != null && this.pluginApi.setFullscreen) {
+			this.setFullscreen(true);
+		}		
+		
+	},
+	
+	exitFullScreen: function() {
+		if (this.pluginApi != null && this.pluginApi.setFullscreen) {
+			this.setFullscreen(false);
+		}
+	},	
+
+	// start: fake events
+	addEventListener: function (eventName, callback, bubble) {
+		this.events[eventName] = this.events[eventName] || [];
+		this.events[eventName].push(callback);
+	},
+	removeEventListener: function (eventName, callback) {
+		if (!eventName) { this.events = {}; return true; }
+		var callbacks = this.events[eventName];
+		if (!callbacks) return true;
+		if (!callback) { this.events[eventName] = []; return true; }
+		for (var i = 0; i < callbacks.length; i++) {
+			if (callbacks[i] === callback) {
+				this.events[eventName].splice(i, 1);
+				return true;
+			}
+		}
+		return false;
+	},	
+	dispatchEvent: function (event) {
+		var i,
+			args,
+			callbacks = this.events[event.type];
+
+		if (callbacks) {
+			for (i = 0; i < callbacks.length; i++) {
+				callbacks[i].apply(this, [event]);
+			}
+		}
+	},
+	// end: fake events
+	
+	// fake DOM attribute methods
+	hasAttribute: function(name){
+		return (name in this.attributes);  
+	},
+	removeAttribute: function(name){
+		delete this.attributes[name];
+	},
+	getAttribute: function(name){
+		if (this.hasAttribute(name)) {
+			return this.attributes[name];
+		}
+		return null;
+	},
+	setAttribute: function(name, value){
+		this.attributes[name] = value;
+	},
+
+	remove: function() {
+		mejs.Utility.removeSwf(this.pluginElement.id);
+	}
+};
+
+/*
+Default options
+*/
+mejs.MediaElementDefaults = {
+	// allows testing on HTML5, flash, silverlight
+	// auto: attempts to detect what the browser can do
+	// auto_plugin: prefer plugins and then attempt native HTML5
+	// native: forces HTML5 playback
+	// shim: disallows HTML5, will attempt either Flash or Silverlight
+	// none: forces fallback view
+	mode: 'auto',
+	// remove or reorder to change plugin priority and availability
+	plugins: ['flash','silverlight','youtube','vimeo'],
+	// shows debug errors on screen
+	enablePluginDebug: false,
+	// use plugin for browsers that have trouble with Basic Authentication on HTTPS sites
+	httpsBasicAuthSite: false,
+	// overrides the type specified, useful for dynamic instantiation
+	type: '',
+	// path to Flash and Silverlight plugins
+	pluginPath: mejs.Utility.getScriptPath(['mediaelement.js','mediaelement.min.js','mediaelement-and-player.js','mediaelement-and-player.min.js']),
+	// name of flash file
+	flashName: 'flashmediaelement.swf',
+	// streamer for RTMP streaming
+	flashStreamer: '',
+	// set to 'always' for CDN version
+	flashScriptAccess: 'sameDomain',	
+	// turns on the smoothing filter in Flash
+	enablePluginSmoothing: false,
+	// enabled pseudo-streaming (seek) on .mp4 files
+	enablePseudoStreaming: false,
+	// start query parameter sent to server for pseudo-streaming
+	pseudoStreamingStartQueryParam: 'start',
+	// name of silverlight file
+	silverlightName: 'silverlightmediaelement.xap',
+	// default if the <video width> is not specified
+	defaultVideoWidth: 480,
+	// default if the <video height> is not specified
+	defaultVideoHeight: 270,
+	// overrides <video width>
+	pluginWidth: -1,
+	// overrides <video height>
+	pluginHeight: -1,
+	// additional plugin variables in 'key=value' form
+	pluginVars: [],	
+	// rate in milliseconds for Flash and Silverlight to fire the timeupdate event
+	// larger number is less accurate, but less strain on plugin->JavaScript bridge
+	timerRate: 250,
+	// initial volume for player
+	startVolume: 0.8,
+	// custom error message in case media cannot be played; otherwise, Download File
+	// link will be displayed
+	customError: "",
+	success: function () { },
+	error: function () { }
+};
+
+/*
+Determines if a browser supports the <video> or <audio> element
+and returns either the native element or a Flash/Silverlight version that
+mimics HTML5 MediaElement
+*/
+mejs.MediaElement = function (el, o) {
+	return mejs.HtmlMediaElementShim.create(el,o);
+};
+
+mejs.HtmlMediaElementShim = {
+
+	create: function(el, o) {
+		var
+			options = {},
+			htmlMediaElement = (typeof(el) == 'string') ? document.getElementById(el) : el,
+			tagName = htmlMediaElement.tagName.toLowerCase(),
+			isMediaTag = (tagName === 'audio' || tagName === 'video'),
+			src = (isMediaTag) ? htmlMediaElement.getAttribute('src') : htmlMediaElement.getAttribute('href'),
+			poster = htmlMediaElement.getAttribute('poster'),
+			autoplay =  htmlMediaElement.getAttribute('autoplay'),
+			preload =  htmlMediaElement.getAttribute('preload'),
+			controls =  htmlMediaElement.getAttribute('controls'),
+			playback,
+			prop;
+
+		// extend options
+		for (prop in mejs.MediaElementDefaults) {
+			options[prop] = mejs.MediaElementDefaults[prop];
+		}
+		for (prop in o) {
+			options[prop] = o[prop];
+		}		
+		
+
+		// clean up attributes
+		src = 		(typeof src == 'undefined' 	|| src === null || src == '') ? null : src;		
+		poster =	(typeof poster == 'undefined' 	|| poster === null) ? '' : poster;
+		preload = 	(typeof preload == 'undefined' 	|| preload === null || preload === 'false') ? 'none' : preload;
+		autoplay = 	!(typeof autoplay == 'undefined' || autoplay === null || autoplay === 'false');
+		controls = 	!(typeof controls == 'undefined' || controls === null || controls === 'false');
+
+		// test for HTML5 and plugin capabilities
+		playback = this.determinePlayback(htmlMediaElement, options, mejs.MediaFeatures.supportsMediaTag, isMediaTag, src);
+		playback.url = (playback.url !== null) ? mejs.Utility.absolutizeUrl(playback.url) : '';
+        playback.scheme = mejs.Utility.determineScheme(playback.url);
+
+		if (playback.method == 'native') {
+			// second fix for android
+			if (mejs.MediaFeatures.isBustedAndroid) {
+				htmlMediaElement.src = playback.url;
+				htmlMediaElement.addEventListener('click', function() {
+					htmlMediaElement.play();
+				}, false);
+			}
+		
+			// add methods to native HTMLMediaElement
+			return this.updateNative(playback, options, autoplay, preload);
+		} else if (playback.method !== '') {
+			// create plugin to mimic HTMLMediaElement
+			
+			return this.createPlugin( playback,  options, poster, autoplay, preload, controls);
+		} else {
+			// boo, no HTML5, no Flash, no Silverlight.
+			this.createErrorMessage( playback, options, poster );
+			
+			return this;
+		}
+	},
+	
+	determinePlayback: function(htmlMediaElement, options, supportsMediaTag, isMediaTag, src) {
+		var
+			mediaFiles = [],
+			i,
+			j,
+			k,
+			l,
+			n,
+			type,
+			result = { method: '', url: '', htmlMediaElement: htmlMediaElement, isVideo: (htmlMediaElement.tagName.toLowerCase() != 'audio'), scheme: ''},
+			pluginName,
+			pluginVersions,
+			pluginInfo,
+			dummy,
+			media;
+			
+		// STEP 1: Get URL and type from <video src> or <source src>
+
+		// supplied type overrides <video type> and <source type>
+		if (typeof options.type != 'undefined' && options.type !== '') {
+			
+			// accept either string or array of types
+			if (typeof options.type == 'string') {
+				mediaFiles.push({type:options.type, url:src});
+			} else {
+				
+				for (i=0; i<options.type.length; i++) {
+					mediaFiles.push({type:options.type[i], url:src});
+				}
+			}
+
+		// test for src attribute first
+		} else if (src !== null) {
+			type = this.formatType(src, htmlMediaElement.getAttribute('type'));
+			mediaFiles.push({type:type, url:src});
+
+		// then test for <source> elements
+		} else {
+			// test <source> types to see if they are usable
+			for (i = 0; i < htmlMediaElement.childNodes.length; i++) {
+				n = htmlMediaElement.childNodes[i];
+				if (n.nodeType == 1 && n.tagName.toLowerCase() == 'source') {
+					src = n.getAttribute('src');
+					type = this.formatType(src, n.getAttribute('type'));
+					media = n.getAttribute('media');
+
+					if (!media || !window.matchMedia || (window.matchMedia && window.matchMedia(media).matches)) {
+						mediaFiles.push({type:type, url:src});
+					}
+				}
+			}
+		}
+		
+		// in the case of dynamicly created players
+		// check for audio types
+		if (!isMediaTag && mediaFiles.length > 0 && mediaFiles[0].url !== null && this.getTypeFromFile(mediaFiles[0].url).indexOf('audio') > -1) {
+			result.isVideo = false;
+		}
+		
+
+		// STEP 2: Test for playback method
+		
+		// special case for Android which sadly doesn't implement the canPlayType function (always returns '')
+		if (mejs.MediaFeatures.isBustedAndroid) {
+			htmlMediaElement.canPlayType = function(type) {
+				return (type.match(/video\/(mp4|m4v)/gi) !== null) ? 'maybe' : '';
+			};
+		}		
+		
+		// special case for Chromium to specify natively supported video codecs (i.e. WebM and Theora) 
+		if (mejs.MediaFeatures.isChromium) { 
+			htmlMediaElement.canPlayType = function(type) { 
+				return (type.match(/video\/(webm|ogv|ogg)/gi) !== null) ? 'maybe' : ''; 
+			}; 
+		}
+
+		// test for native playback first
+		if (supportsMediaTag && (options.mode === 'auto' || options.mode === 'auto_plugin' || options.mode === 'native')  && !(mejs.MediaFeatures.isBustedNativeHTTPS && options.httpsBasicAuthSite === true)) {
+						
+			if (!isMediaTag) {
+
+				// create a real HTML5 Media Element 
+				dummy = document.createElement( result.isVideo ? 'video' : 'audio');			
+				htmlMediaElement.parentNode.insertBefore(dummy, htmlMediaElement);
+				htmlMediaElement.style.display = 'none';
+				
+				// use this one from now on
+				result.htmlMediaElement = htmlMediaElement = dummy;
+			}
+				
+			for (i=0; i<mediaFiles.length; i++) {
+				// normal check
+				if (mediaFiles[i].type == "video/m3u8" || htmlMediaElement.canPlayType(mediaFiles[i].type).replace(/no/, '') !== ''
+					// special case for Mac/Safari 5.0.3 which answers '' to canPlayType('audio/mp3') but 'maybe' to canPlayType('audio/mpeg')
+					|| htmlMediaElement.canPlayType(mediaFiles[i].type.replace(/mp3/,'mpeg')).replace(/no/, '') !== ''
+					// special case for m4a supported by detecting mp4 support
+					|| htmlMediaElement.canPlayType(mediaFiles[i].type.replace(/m4a/,'mp4')).replace(/no/, '') !== '') {
+					result.method = 'native';
+					result.url = mediaFiles[i].url;
+					break;
+				}
+			}			
+			
+			if (result.method === 'native') {
+				if (result.url !== null) {
+					htmlMediaElement.src = result.url;
+				}
+			
+				// if `auto_plugin` mode, then cache the native result but try plugins.
+				if (options.mode !== 'auto_plugin') {
+					return result;
+				}
+			}
+		}
+
+		// if native playback didn't work, then test plugins
+		if (options.mode === 'auto' || options.mode === 'auto_plugin' || options.mode === 'shim') {
+			for (i=0; i<mediaFiles.length; i++) {
+				type = mediaFiles[i].type;
+
+				// test all plugins in order of preference [silverlight, flash]
+				for (j=0; j<options.plugins.length; j++) {
+
+					pluginName = options.plugins[j];
+			
+					// test version of plugin (for future features)
+					pluginVersions = mejs.plugins[pluginName];				
+					
+					for (k=0; k<pluginVersions.length; k++) {
+						pluginInfo = pluginVersions[k];
+					
+						// test if user has the correct plugin version
+						
+						// for youtube/vimeo
+						if (pluginInfo.version == null || 
+							
+							mejs.PluginDetector.hasPluginVersion(pluginName, pluginInfo.version)) {
+
+							// test for plugin playback types
+							for (l=0; l<pluginInfo.types.length; l++) {
+								// find plugin that can play the type
+								if (type.toLowerCase() == pluginInfo.types[l].toLowerCase()) {
+									result.method = pluginName;
+									result.url = mediaFiles[i].url;
+									return result;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		// at this point, being in 'auto_plugin' mode implies that we tried plugins but failed.
+		// if we have native support then return that.
+		if (options.mode === 'auto_plugin' && result.method === 'native') {
+			return result;
+		}
+
+		// what if there's nothing to play? just grab the first available
+		if (result.method === '' && mediaFiles.length > 0) {
+			result.url = mediaFiles[0].url;
+		}
+
+		return result;
+	},
+
+	formatType: function(url, type) {
+		// if no type is supplied, fake it with the extension
+		if (url && !type) {		
+			return this.getTypeFromFile(url);
+		} else {
+			// only return the mime part of the type in case the attribute contains the codec
+			// see http://www.whatwg.org/specs/web-apps/current-work/multipage/video.html#the-source-element
+			// `video/mp4; codecs="avc1.42E01E, mp4a.40.2"` becomes `video/mp4`
+			
+			if (type && ~type.indexOf(';')) {
+				return type.substr(0, type.indexOf(';')); 
+			} else {
+				return type;
+			}
+		}
+	},
+	
+	getTypeFromFile: function(url) {
+		url = url.split('?')[0];
+		var
+			ext = url.substring(url.lastIndexOf('.') + 1).toLowerCase(),
+			av = /(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(ext) ? 'video/' : 'audio/';
+		return this.getTypeFromExtension(ext, av);
+	},
+	
+	getTypeFromExtension: function(ext, av) {
+		av = av || '';
+		
+		switch (ext) {
+			case 'mp4':
+			case 'm4v':
+			case 'm4a':
+			case 'f4v':
+			case 'f4a':
+				return av + 'mp4';
+			case 'flv':
+				return av + 'x-flv';
+			case 'webm':
+			case 'webma':
+			case 'webmv':	
+				return av + 'webm';
+			case 'ogg':
+			case 'oga':
+			case 'ogv':	
+				return av + 'ogg';
+			case 'm3u8':
+				return 'application/x-mpegurl';
+			case 'ts':
+				return av + 'mp2t';
+			default:
+				return av + ext;
+		}
+	},
+
+	createErrorMessage: function(playback, options, poster) {
+		var 
+			htmlMediaElement = playback.htmlMediaElement,
+			errorContainer = document.createElement('div'),
+			errorContent = options.customError;
+			
+		errorContainer.className = 'me-cannotplay';
+
+		try {
+			errorContainer.style.width = htmlMediaElement.width + 'px';
+			errorContainer.style.height = htmlMediaElement.height + 'px';
+		} catch (e) {}
+
+		if (!errorContent) {
+			errorContent = '<a href="' + playback.url + '">';
+
+			if (poster !== '') {
+				errorContent += '<img src="' + poster + '" width="100%" height="100%" alt="" />';
+			}
+
+			errorContent += '<span>' + mejs.i18n.t('Download File') + '</span></a>';
+		}
+
+		errorContainer.innerHTML = errorContent;
+
+		htmlMediaElement.parentNode.insertBefore(errorContainer, htmlMediaElement);
+		htmlMediaElement.style.display = 'none';
+
+		options.error(htmlMediaElement);
+	},
+
+	createPlugin:function(playback, options, poster, autoplay, preload, controls) {
+		var 
+			htmlMediaElement = playback.htmlMediaElement,
+			width = 1,
+			height = 1,
+			pluginid = 'me_' + playback.method + '_' + (mejs.meIndex++),
+			pluginMediaElement = new mejs.PluginMediaElement(pluginid, playback.method, playback.url),
+			container = document.createElement('div'),
+			specialIEContainer,
+			node,
+			initVars;
+
+		// copy tagName from html media element
+		pluginMediaElement.tagName = htmlMediaElement.tagName;
+
+		// copy attributes from html media element to plugin media element
+		for (var i = 0; i < htmlMediaElement.attributes.length; i++) {
+			var attribute = htmlMediaElement.attributes[i];
+			if (attribute.specified) {
+				pluginMediaElement.setAttribute(attribute.name, attribute.value);
+			}
+		}
+
+		// check for placement inside a <p> tag (sometimes WYSIWYG editors do this)
+		node = htmlMediaElement.parentNode;
+
+		while (node !== null && node.tagName != null && node.tagName.toLowerCase() !== 'body' && 
+				node.parentNode != null && node.parentNode.tagName != null && node.parentNode.constructor != null && node.parentNode.constructor.name === "ShadowRoot") {
+			if (node.parentNode.tagName.toLowerCase() === 'p') {
+				node.parentNode.parentNode.insertBefore(node, node.parentNode);
+				break;
+			}
+			node = node.parentNode;
+		}
+
+		if (playback.isVideo) {
+			width = (options.pluginWidth > 0) ? options.pluginWidth : (options.videoWidth > 0) ? options.videoWidth : (htmlMediaElement.getAttribute('width') !== null) ? htmlMediaElement.getAttribute('width') : options.defaultVideoWidth;
+			height = (options.pluginHeight > 0) ? options.pluginHeight : (options.videoHeight > 0) ? options.videoHeight : (htmlMediaElement.getAttribute('height') !== null) ? htmlMediaElement.getAttribute('height') : options.defaultVideoHeight;
+		
+			// in case of '%' make sure it's encoded
+			width = mejs.Utility.encodeUrl(width);
+			height = mejs.Utility.encodeUrl(height);
+		
+		} else {
+			if (options.enablePluginDebug) {
+				width = 320;
+				height = 240;
+			}
+		}
+
+		// register plugin
+		pluginMediaElement.success = options.success;
+		
+		// add container (must be added to DOM before inserting HTML for IE)
+		container.className = 'me-plugin';
+		container.id = pluginid + '_container';
+		
+		if (playback.isVideo) {
+				htmlMediaElement.parentNode.insertBefore(container, htmlMediaElement);
+		} else {
+				document.body.insertBefore(container, document.body.childNodes[0]);
+		}
+		
+		if (playback.method === 'flash' || playback.method === 'silverlight') {
+
+			// flash/silverlight vars
+			initVars = [
+				'id=' + pluginid,
+				'isvideo=' + ((playback.isVideo) ? "true" : "false"),
+				'autoplay=' + ((autoplay) ? "true" : "false"),
+				'preload=' + preload,
+				'width=' + width,
+				'startvolume=' + options.startVolume,
+				'timerrate=' + options.timerRate,
+				'flashstreamer=' + options.flashStreamer,
+				'height=' + height,
+				'pseudostreamstart=' + options.pseudoStreamingStartQueryParam];
+	
+			if (playback.url !== null) {
+				if (playback.method == 'flash') {
+					initVars.push('file=' + mejs.Utility.encodeUrl(playback.url));
+				} else {
+					initVars.push('file=' + playback.url);
+				}
+			}
+			if (options.enablePluginDebug) {
+				initVars.push('debug=true');
+			}
+			if (options.enablePluginSmoothing) {
+				initVars.push('smoothing=true');
+			}
+			if (options.enablePseudoStreaming) {
+				initVars.push('pseudostreaming=true');
+			}
+			if (controls) {
+				initVars.push('controls=true'); // shows controls in the plugin if desired
+			}
+			if (options.pluginVars) {
+				initVars = initVars.concat(options.pluginVars);
+			}		
+			
+			// call from plugin
+			window[pluginid + '_init'] = function() {
+				switch (pluginMediaElement.pluginType) {
+					case 'flash':
+						pluginMediaElement.pluginElement = pluginMediaElement.pluginApi = document.getElementById(pluginid);
+						break;
+					case 'silverlight':
+						pluginMediaElement.pluginElement = document.getElementById(pluginMediaElement.id);
+						pluginMediaElement.pluginApi = pluginMediaElement.pluginElement.Content.MediaElementJS;
+						break;
+				}
+	
+				if (pluginMediaElement.pluginApi != null && pluginMediaElement.success) {
+					pluginMediaElement.success(pluginMediaElement, htmlMediaElement);
+				}
+			}
+			
+			// event call from plugin
+			window[pluginid + '_event'] = function(eventName, values) {
+		
+				var
+					e,
+					i,
+					bufferedTime;
+		        
+				// fake event object to mimic real HTML media event.
+				e = {
+					type: eventName,
+					target: pluginMediaElement
+				};
+		
+				// attach all values to element and event object
+				for (i in values) {
+					pluginMediaElement[i] = values[i];
+					e[i] = values[i];
+				}
+		
+				// fake the newer W3C buffered TimeRange (loaded and total have been removed)
+				bufferedTime = values.bufferedTime || 0;
+		
+				e.target.buffered = e.buffered = {
+					start: function(index) {
+						return 0;
+					},
+					end: function (index) {
+						return bufferedTime;
+					},
+					length: 1
+				};
+		
+				pluginMediaElement.dispatchEvent(e);
+			}			
+			
+			
+		}
+
+		switch (playback.method) {
+			case 'silverlight':
+				container.innerHTML =
+'<object data="data:application/x-silverlight-2," type="application/x-silverlight-2" id="' + pluginid + '" name="' + pluginid + '" width="' + width + '" height="' + height + '" class="mejs-shim">' +
+'<param name="initParams" value="' + initVars.join(',') + '" />' +
+'<param name="windowless" value="true" />' +
+'<param name="background" value="black" />' +
+'<param name="minRuntimeVersion" value="3.0.0.0" />' +
+'<param name="autoUpgrade" value="true" />' +
+'<param name="source" value="' + options.pluginPath + options.silverlightName + '" />' +
+'</object>';
+					break;
+
+			case 'flash':
+
+				if (mejs.MediaFeatures.isIE) {
+					specialIEContainer = document.createElement('div');
+					container.appendChild(specialIEContainer);
+					specialIEContainer.outerHTML =
+'<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="//download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" ' +
+'id="' + pluginid + '" width="' + width + '" height="' + height + '" class="mejs-shim">' +
+'<param name="movie" value="' + options.pluginPath + options.flashName + '?' + (new Date().getTime()) + '" />' +
+'<param name="flashvars" value="' + initVars.join('&amp;') + '" />' +
+'<param name="quality" value="high" />' +
+'<param name="bgcolor" value="#000000" />' +
+'<param name="wmode" value="transparent" />' +
+'<param name="allowScriptAccess" value="' + options.flashScriptAccess + '" />' +
+'<param name="allowFullScreen" value="true" />' +
+'<param name="scale" value="default" />' + 
+'</object>';
+
+				} else {
+
+					container.innerHTML =
+'<embed id="' + pluginid + '" name="' + pluginid + '" ' +
+'play="true" ' +
+'loop="false" ' +
+'quality="high" ' +
+'bgcolor="#000000" ' +
+'wmode="transparent" ' +
+'allowScriptAccess="' + options.flashScriptAccess + '" ' +
+'allowFullScreen="true" ' +
+'type="application/x-shockwave-flash" pluginspage="//www.macromedia.com/go/getflashplayer" ' +
+'src="' + options.pluginPath + options.flashName + '" ' +
+'flashvars="' + initVars.join('&') + '" ' +
+'width="' + width + '" ' +
+'height="' + height + '" ' +
+'scale="default"' + 
+'class="mejs-shim"></embed>';
+				}
+				break;
+			
+			case 'youtube':
+			
+				
+				var videoId;
+				// youtu.be url from share button
+				if (playback.url.lastIndexOf("youtu.be") != -1) {
+					videoId = playback.url.substr(playback.url.lastIndexOf('/')+1);
+					if (videoId.indexOf('?') != -1) {
+						videoId = videoId.substr(0, videoId.indexOf('?'));
+					}
+				}
+				else {
+					// https://www.youtube.com/watch?v=
+					var videoIdMatch = playback.url.match( /[?&]v=([^&#]+)|&|#|$/ );
+					if ( videoIdMatch ) {
+						videoId = videoIdMatch[1];
+					}
+				}
+				youtubeSettings = {
+						container: container,
+						containerId: container.id,
+						pluginMediaElement: pluginMediaElement,
+						pluginId: pluginid,
+						videoId: videoId,
+						height: height,
+						width: width,
+                        scheme: playback.scheme
+					};				
+				
+				// favor iframe version of YouTube
+				if (window.postMessage) {
+					mejs.YouTubeApi.enqueueIframe(youtubeSettings);		
+				} else if (mejs.PluginDetector.hasPluginVersion('flash', [10,0,0]) ) {
+					mejs.YouTubeApi.createFlash(youtubeSettings, options);
+				}
+				break;
+			
+			// DEMO Code. Does NOT work.
+			case 'vimeo':
+				var player_id = pluginid + "_player";
+				pluginMediaElement.vimeoid = playback.url.substr(playback.url.lastIndexOf('/')+1);
+				
+				container.innerHTML ='<iframe src="' + playback.scheme + 'player.vimeo.com/video/' + pluginMediaElement.vimeoid + '?api=1&portrait=0&byline=0&title=0&player_id=' + player_id + '" width="' + width +'" height="' + height +'" frameborder="0" class="mejs-shim" id="' + player_id + '" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>';
+				if (typeof($f) == 'function') { // froogaloop available
+					var player = $f(container.childNodes[0]),
+						playerState = -1;
+					
+					player.addEvent('ready', function() {
+		
+						player.playVideo = function() {
+							player.api( 'play' );
+						};
+						player.stopVideo = function() {
+							player.api( 'unload' );
+						};
+						player.pauseVideo = function() {
+							player.api( 'pause' );
+						};
+						player.seekTo = function( seconds ) {
+							player.api( 'seekTo', seconds );
+						};
+						player.setVolume = function( volume ) {
+							player.api( 'setVolume', volume );
+						};
+						player.setMuted = function( muted ) {
+							if( muted ) {
+								player.lastVolume = player.api( 'getVolume' );
+								player.api( 'setVolume', 0 );
+							} else {
+								player.api( 'setVolume', player.lastVolume );
+								delete player.lastVolume;
+							}
+						};
+						// parity with YT player
+						player.getPlayerState = function() {
+							return playerState;
+						};
+
+						function createEvent(player, pluginMediaElement, eventName, e) {
+							var event = {
+								type: eventName,
+								target: pluginMediaElement
+							};
+							if (eventName == 'timeupdate') {
+								pluginMediaElement.currentTime = event.currentTime = e.seconds;
+								pluginMediaElement.duration = event.duration = e.duration;
+							}
+							pluginMediaElement.dispatchEvent(event);
+						}
+
+						player.addEvent('play', function() {
+							playerState = 1;
+							createEvent(player, pluginMediaElement, 'play');
+							createEvent(player, pluginMediaElement, 'playing');
+						});
+
+						player.addEvent('pause', function() {
+							playerState = 2;							
+							createEvent(player, pluginMediaElement, 'pause');
+						});
+
+						player.addEvent('finish', function() {
+							playerState = 0;							
+							createEvent(player, pluginMediaElement, 'ended');
+						});
+
+						player.addEvent('playProgress', function(e) {
+							createEvent(player, pluginMediaElement, 'timeupdate', e);
+						});
+						
+						player.addEvent('seek', function(e) {
+							playerState = 3;
+							createEvent(player, pluginMediaElement, 'seeked', e);
+						});	
+						
+						player.addEvent('loadProgress', function(e) {
+							playerState = 3;
+							createEvent(player, pluginMediaElement, 'progress', e);
+						});												
+
+						pluginMediaElement.pluginElement = container;
+						pluginMediaElement.pluginApi = player;
+
+						pluginMediaElement.success(pluginMediaElement, pluginMediaElement.pluginElement);						
+					});
+				}
+				else {
+					console.warn("You need to include froogaloop for vimeo to work");
+				}
+				break;			
+		}
+		// hide original element
+		htmlMediaElement.style.display = 'none';
+		// prevent browser from autoplaying when using a plugin
+		htmlMediaElement.removeAttribute('autoplay');
+		
+		return pluginMediaElement;
+	},
+
+	updateNative: function(playback, options, autoplay, preload) {
+		
+		var htmlMediaElement = playback.htmlMediaElement,
+			m;
+		
+		
+		// add methods to video object to bring it into parity with Flash Object
+		for (m in mejs.HtmlMediaElement) {
+			htmlMediaElement[m] = mejs.HtmlMediaElement[m];
+		}
+
+		/*
+		Chrome now supports preload="none"
+		if (mejs.MediaFeatures.isChrome) {
+		
+			// special case to enforce preload attribute (Chrome doesn't respect this)
+			if (preload === 'none' && !autoplay) {
+			
+				// forces the browser to stop loading (note: fails in IE9)
+				htmlMediaElement.src = '';
+				htmlMediaElement.load();
+				htmlMediaElement.canceledPreload = true;
+
+				htmlMediaElement.addEventListener('play',function() {
+					if (htmlMediaElement.canceledPreload) {
+						htmlMediaElement.src = playback.url;
+						htmlMediaElement.load();
+						htmlMediaElement.play();
+						htmlMediaElement.canceledPreload = false;
+					}
+				}, false);
+			// for some reason Chrome forgets how to autoplay sometimes.
+			} else if (autoplay) {
+				htmlMediaElement.load();
+				htmlMediaElement.play();
+			}
+		}
+		*/
+
+		// fire success code
+		options.success(htmlMediaElement, htmlMediaElement);
+		
+		return htmlMediaElement;
+	}
+};
+
+/*
+ - test on IE (object vs. embed)
+ - determine when to use iframe (Firefox, Safari, Mobile) vs. Flash (Chrome, IE)
+ - fullscreen?
+*/
+
+// YouTube Flash and Iframe API
+mejs.YouTubeApi = {
+	isIframeStarted: false,
+	isIframeLoaded: false,
+	loadIframeApi: function(yt) {
+		if (!this.isIframeStarted) {
+			var tag = document.createElement('script');
+			tag.src = yt.scheme + "www.youtube.com/player_api";
+			var firstScriptTag = document.getElementsByTagName('script')[0];
+			firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
+			this.isIframeStarted = true;
+		}
+	},
+	iframeQueue: [],
+	enqueueIframe: function(yt) {
+		
+		if (this.isLoaded) {
+			this.createIframe(yt);
+		} else {
+			this.loadIframeApi(yt);
+			this.iframeQueue.push(yt);
+		}
+	},
+	createIframe: function(settings) {
+		
+		var
+		pluginMediaElement = settings.pluginMediaElement,	
+		player = new YT.Player(settings.containerId, {
+			height: settings.height,
+			width: settings.width,
+			videoId: settings.videoId,
+			playerVars: {controls:0, wmode:'transparent'},
+			events: {
+				'onReady': function(e) {
+					
+					// wrapper to match
+					player.setVideoSize = function(width, height) {
+						player.setSize(width, height);
+					};
+					
+					// hook up iframe object to MEjs
+					settings.pluginMediaElement.pluginApi = player;
+					settings.pluginMediaElement.pluginElement = document.getElementById(settings.containerId);
+					
+					// init mejs
+					pluginMediaElement.success(pluginMediaElement, pluginMediaElement.pluginElement);
+
+					mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'canplay');
+					
+					// create timer
+					setInterval(function() {
+						mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'timeupdate');
+					}, 250);
+
+					if (typeof pluginMediaElement.attributes.autoplay !== 'undefined') {
+						player.playVideo();
+					}
+				},
+				'onStateChange': function(e) {
+					
+					mejs.YouTubeApi.handleStateChange(e.data, player, pluginMediaElement);
+					
+				}
+			}
+		});
+	},
+	
+	createEvent: function (player, pluginMediaElement, eventName) {
+		var event = {
+			type: eventName,
+			target: pluginMediaElement
+		};
+
+		if (player && player.getDuration) {
+			
+			// time 
+			pluginMediaElement.currentTime = event.currentTime = player.getCurrentTime();
+			pluginMediaElement.duration = event.duration = player.getDuration();
+			
+			// state
+			event.paused = pluginMediaElement.paused;
+			event.ended = pluginMediaElement.ended;			
+			
+			// sound
+			event.muted = player.isMuted();
+			event.volume = player.getVolume() / 100;
+			
+			// progress
+			event.bytesTotal = player.getVideoBytesTotal();
+			event.bufferedBytes = player.getVideoBytesLoaded();
+			
+			// fake the W3C buffered TimeRange
+			var bufferedTime = event.bufferedBytes / event.bytesTotal * event.duration;
+			
+			event.target.buffered = event.buffered = {
+				start: function(index) {
+					return 0;
+				},
+				end: function (index) {
+					return bufferedTime;
+				},
+				length: 1
+			};
+
+		}
+		
+		// send event up the chain
+		pluginMediaElement.dispatchEvent(event);
+	},	
+	
+	iFrameReady: function() {
+		
+		this.isLoaded = true;
+		this.isIframeLoaded = true;
+		
+		while (this.iframeQueue.length > 0) {
+			var settings = this.iframeQueue.pop();
+			this.createIframe(settings);
+		}	
+	},
+	
+	// FLASH!
+	flashPlayers: {},
+	createFlash: function(settings) {
+		
+		this.flashPlayers[settings.pluginId] = settings;
+		
+		/*
+		settings.container.innerHTML =
+			'<object type="application/x-shockwave-flash" id="' + settings.pluginId + '" data="' + settings.scheme + 'www.youtube.com/apiplayer?enablejsapi=1&amp;playerapiid=' + settings.pluginId  + '&amp;version=3&amp;autoplay=0&amp;controls=0&amp;modestbranding=1&loop=0" ' +
+				'width="' + settings.width + '" height="' + settings.height + '" style="visibility: visible; " class="mejs-shim">' +
+				'<param name="allowScriptAccess" value="sameDomain">' +
+				'<param name="wmode" value="transparent">' +
+			'</object>';
+		*/
+
+		var specialIEContainer,
+			youtubeUrl = settings.scheme + 'www.youtube.com/apiplayer?enablejsapi=1&amp;playerapiid=' + settings.pluginId  + '&amp;version=3&amp;autoplay=0&amp;controls=0&amp;modestbranding=1&loop=0';
+			
+		if (mejs.MediaFeatures.isIE) {
+			
+			specialIEContainer = document.createElement('div');
+			settings.container.appendChild(specialIEContainer);
+			specialIEContainer.outerHTML = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="' + settings.scheme + 'download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" ' +
+'id="' + settings.pluginId + '" width="' + settings.width + '" height="' + settings.height + '" class="mejs-shim">' +
+	'<param name="movie" value="' + youtubeUrl + '" />' +
+	'<param name="wmode" value="transparent" />' +
+	'<param name="allowScriptAccess" value="' + options.flashScriptAccess + '" />' +
+	'<param name="allowFullScreen" value="true" />' +
+'</object>';
+		} else {
+		settings.container.innerHTML =
+			'<object type="application/x-shockwave-flash" id="' + settings.pluginId + '" data="' + youtubeUrl + '" ' +
+				'width="' + settings.width + '" height="' + settings.height + '" style="visibility: visible; " class="mejs-shim">' +
+				'<param name="allowScriptAccess" value="' + options.flashScriptAccess + '">' +
+				'<param name="wmode" value="transparent">' +
+			'</object>';
+		}		
+		
+	},
+	
+	flashReady: function(id) {
+		var
+			settings = this.flashPlayers[id],
+			player = document.getElementById(id),
+			pluginMediaElement = settings.pluginMediaElement;
+		
+		// hook up and return to MediaELementPlayer.success	
+		pluginMediaElement.pluginApi = 
+		pluginMediaElement.pluginElement = player;
+		
+		settings.success(pluginMediaElement, pluginMediaElement.pluginElement);
+		
+		// load the youtube video
+		player.cueVideoById(settings.videoId);
+		
+		var callbackName = settings.containerId + '_callback';
+		
+		window[callbackName] = function(e) {
+			mejs.YouTubeApi.handleStateChange(e, player, pluginMediaElement);
+		}
+		
+		player.addEventListener('onStateChange', callbackName);
+		
+		setInterval(function() {
+			mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'timeupdate');
+		}, 250);
+		
+		mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'canplay');
+	},
+	
+	handleStateChange: function(youTubeState, player, pluginMediaElement) {
+		switch (youTubeState) {
+			case -1: // not started
+				pluginMediaElement.paused = true;
+				pluginMediaElement.ended = true;
+				mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'loadedmetadata');
+				//createYouTubeEvent(player, pluginMediaElement, 'loadeddata');
+				break;
+			case 0:
+				pluginMediaElement.paused = false;
+				pluginMediaElement.ended = true;
+				mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'ended');
+				break;
+			case 1:
+				pluginMediaElement.paused = false;
+				pluginMediaElement.ended = false;				
+				mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'play');
+				mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'playing');
+				break;
+			case 2:
+				pluginMediaElement.paused = true;
+				pluginMediaElement.ended = false;				
+				mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'pause');
+				break;
+			case 3: // buffering
+				mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'progress');
+				break;
+			case 5:
+				// cued?
+				break;						
+			
+		}			
+		
+	}
+}
+// IFRAME
+window.onYouTubePlayerAPIReady = function() {
+	mejs.YouTubeApi.iFrameReady();
+};
+// FLASH
+window.onYouTubePlayerReady = function(id) {
+	mejs.YouTubeApi.flashReady(id);
+};
+
+window.mejs = mejs;
+window.MediaElement = mejs.MediaElement;
+
+/*
+ * Adds Internationalization and localization to mediaelement.
+ *
+ * This file does not contain translations, you have to add them manually.
+ * The schema is always the same: me-i18n-locale-[IETF-language-tag].js
+ *
+ * Examples are provided both for german and chinese translation.
+ *
+ *
+ * What is the concept beyond i18n?
+ *   http://en.wikipedia.org/wiki/Internationalization_and_localization
+ *
+ * What langcode should i use?
+ *   http://en.wikipedia.org/wiki/IETF_language_tag
+ *   https://tools.ietf.org/html/rfc5646
+ *
+ *
+ * License?
+ *
+ *   The i18n file uses methods from the Drupal project (drupal.js):
+ *     - i18n.methods.t() (modified)
+ *     - i18n.methods.checkPlain() (full copy)
+ *
+ *   The Drupal project is (like mediaelementjs) licensed under GPLv2.
+ *    - http://drupal.org/licensing/faq/#q1
+ *    - https://github.com/johndyer/mediaelement
+ *    - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ *
+ * @author
+ *   Tim Latz (latz.tim@gmail.com)
+ *
+ *
+ * @params
+ *  - context - document, iframe ..
+ *  - exports - CommonJS, window ..
+ *
+ */
+;(function(context, exports, undefined) {
+    "use strict";
+
+    var i18n = {
+        "locale": {
+            // Ensure previous values aren't overwritten.
+            "language" : (exports.i18n && exports.i18n.locale.language) || '',
+            "strings" : (exports.i18n && exports.i18n.locale.strings) || {}
+        },
+        "ietf_lang_regex" : /^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,
+        "methods" : {}
+    };
+// start i18n
+
+
+    /**
+     * Get language, fallback to browser's language if empty
+     *
+     * IETF: RFC 5646, https://tools.ietf.org/html/rfc5646
+     * Examples: en, zh-CN, cmn-Hans-CN, sr-Latn-RS, es-419, x-private
+     */
+    i18n.getLanguage = function () {
+        var language = i18n.locale.language || window.navigator.userLanguage || window.navigator.language;
+        return i18n.ietf_lang_regex.exec(language) ? language : null;
+
+        //(WAS: convert to iso 639-1 (2-letters, lower case))
+        //return language.substr(0, 2).toLowerCase();
+    };
+
+    // i18n fixes for compatibility with WordPress
+    if ( typeof mejsL10n != 'undefined' ) {
+        i18n.locale.language = mejsL10n.language;
+    }
+
+
+
+    /**
+     * Encode special characters in a plain-text string for display as HTML.
+     */
+    i18n.methods.checkPlain = function (str) {
+        var character, regex,
+        replace = {
+            '&': '&amp;',
+            '"': '&quot;',
+            '<': '&lt;',
+            '>': '&gt;'
+        };
+        str = String(str);
+        for (character in replace) {
+            if (replace.hasOwnProperty(character)) {
+                regex = new RegExp(character, 'g');
+                str = str.replace(regex, replace[character]);
+            }
+        }
+        return str;
+    };
+
+    /**
+     * Translate strings to the page language or a given language.
+     *
+     *
+     * @param str
+     *   A string containing the English string to translate.
+     *
+     * @param options
+     *   - 'context' (defaults to the default context): The context the source string
+     *     belongs to.
+     *
+     * @return
+     *   The translated string, escaped via i18n.methods.checkPlain()
+     */
+    i18n.methods.t = function (str, options) {
+
+        // Fetch the localized version of the string.
+        if (i18n.locale.strings && i18n.locale.strings[options.context] && i18n.locale.strings[options.context][str]) {
+            str = i18n.locale.strings[options.context][str];
+        }
+
+        return i18n.methods.checkPlain(str);
+    };
+
+
+    /**
+     * Wrapper for i18n.methods.t()
+     *
+     * @see i18n.methods.t()
+     * @throws InvalidArgumentException
+     */
+    i18n.t = function(str, options) {
+
+        if (typeof str === 'string' && str.length > 0) {
+
+            // check every time due language can change for
+            // different reasons (translation, lang switcher ..)
+            var language = i18n.getLanguage();
+
+            options = options || {
+                "context" : language
+            };
+
+            return i18n.methods.t(str, options);
+        }
+        else {
+            throw {
+                "name" : 'InvalidArgumentException',
+                "message" : 'First argument is either not a string or empty.'
+            };
+        }
+    };
+
+// end i18n
+    exports.i18n = i18n;
+}(document, mejs));
+
+// i18n fixes for compatibility with WordPress
+;(function(exports, undefined) {
+
+    "use strict";
+
+    if ( typeof mejsL10n != 'undefined' ) {
+        exports[mejsL10n.language] = mejsL10n.strings;
+    }
+
+}(mejs.i18n.locale.strings));
+
+/*!
+ *
+ * MediaElementPlayer
+ * http://mediaelementjs.com/
+ *
+ * Creates a controller bar for HTML5 <video> add <audio> tags
+ * using jQuery and MediaElement.js (HTML5 Flash/Silverlight wrapper)
+ *
+ * Copyright 2010-2013, John Dyer (http://j.hn/)
+ * License: MIT
+ *
+ */
+if (typeof jQuery != 'undefined') {
+	mejs.$ = jQuery;
+} else if (typeof Zepto != 'undefined') {
+	mejs.$ = Zepto;
+
+	// define `outerWidth` method which has not been realized in Zepto
+	Zepto.fn.outerWidth = function(includeMargin) {
+		var width = $(this).width();
+		if (includeMargin) {
+			width += parseInt($(this).css('margin-right'), 10);
+			width += parseInt($(this).css('margin-left'), 10);
+		}
+		return width
+	}
+
+} else if (typeof ender != 'undefined') {
+	mejs.$ = ender;
+}
+(function ($) {
+
+	// default player values
+	mejs.MepDefaults = {
+		// url to poster (to fix iOS 3.x)
+		poster: '',
+		// When the video is ended, we can show the poster.
+		showPosterWhenEnded: false,
+		// default if the <video width> is not specified
+		defaultVideoWidth: 480,
+		// default if the <video height> is not specified
+		defaultVideoHeight: 270,
+		// if set, overrides <video width>
+		videoWidth: -1,
+		// if set, overrides <video height>
+		videoHeight: -1,
+		// default if the user doesn't specify
+		defaultAudioWidth: 400,
+		// default if the user doesn't specify
+		defaultAudioHeight: 30,
+
+		// default amount to move back when back key is pressed
+		defaultSeekBackwardInterval: function(media) {
+			return (media.duration * 0.05);
+		},
+		// default amount to move forward when forward key is pressed
+		defaultSeekForwardInterval: function(media) {
+			return (media.duration * 0.05);
+		},
+
+		// set dimensions via JS instead of CSS
+		setDimensions: true,
+
+		// width of audio player
+		audioWidth: -1,
+		// height of audio player
+		audioHeight: -1,
+		// initial volume when the player starts (overrided by user cookie)
+		startVolume: 0.8,
+		// useful for <audio> player loops
+		loop: false,
+		// rewind to beginning when media ends
+		autoRewind: true,
+		// resize to media dimensions
+		enableAutosize: true,
+
+		/*
+		 * Time format to use. Default: 'mm:ss'
+		 * Supported units:
+		 *   h: hour
+		 *   m: minute
+		 *   s: second
+		 *   f: frame count
+		 * When using 'hh', 'mm', 'ss' or 'ff' we always display 2 digits.
+		 * If you use 'h', 'm', 's' or 'f' we display 1 digit if possible.
+		 *
+		 * Example to display 75 seconds:
+		 * Format 'mm:ss': 01:15
+		 * Format 'm:ss': 1:15
+		 * Format 'm:s': 1:15
+		 */
+		timeFormat: '',
+		// forces the hour marker (##:00:00)
+		alwaysShowHours: false,
+		// show framecount in timecode (##:00:00:00)
+		showTimecodeFrameCount: false,
+		// used when showTimecodeFrameCount is set to true
+		framesPerSecond: 25,
+
+		// automatically calculate the width of the progress bar based on the sizes of other elements
+		autosizeProgress : true,
+		// Hide controls when playing and mouse is not over the video
+		alwaysShowControls: false,
+		// Display the video control
+		hideVideoControlsOnLoad: false,
+		// Enable click video element to toggle play/pause
+		clickToPlayPause: true,
+		// Time in ms to hide controls
+		controlsTimeoutDefault: 1500,
+		// Time in ms to trigger the timer when mouse moves
+		controlsTimeoutMouseEnter: 2500,
+		// Time in ms to trigger the timer when mouse leaves
+		controlsTimeoutMouseLeave: 1000,
+		// force iPad's native controls
+		iPadUseNativeControls: false,
+		// force iPhone's native controls
+		iPhoneUseNativeControls: false,
+		// force Android's native controls
+		AndroidUseNativeControls: false,
+		// features to show
+		features: ['playpause','current','progress','duration','tracks','volume','fullscreen'],
+		// only for dynamic
+		isVideo: true,
+ 
+		// stretching modes (auto, fill, responsive, none)
+		stretching: 'auto',
+
+		// turns keyboard support on and off for this instance
+		enableKeyboard: true,
+
+		// whenthis player starts, it will pause other players
+		pauseOtherPlayers: true,
+
+		// array of keyboard actions such as play pause
+		keyActions: [
+				{
+						keys: [
+								32, // SPACE
+								179 // GOOGLE play/pause button
+								 ],
+						action: function(player, media) {
+								if (media.paused || media.ended) {
+										media.play();
+								} else {
+										media.pause();
+								}
+						}
+				},
+				{
+						keys: [38], // UP
+						action: function(player, media) {
+								player.container.find('.mejs-volume-slider').css('display','block');
+								if (player.isVideo) {
+										player.showControls();
+										player.startControlsTimer();
+								}
+
+								var newVolume = Math.min(media.volume + 0.1, 1);
+								media.setVolume(newVolume);
+						}
+				},
+				{
+						keys: [40], // DOWN
+						action: function(player, media) {
+								player.container.find('.mejs-volume-slider').css('display','block');
+								if (player.isVideo) {
+										player.showControls();
+										player.startControlsTimer();
+								}
+
+								var newVolume = Math.max(media.volume - 0.1, 0);
+								media.setVolume(newVolume);
+						}
+				},
+				{
+						keys: [
+								37, // LEFT
+								227 // Google TV rewind
+						],
+						action: function(player, media) {
+								if (!isNaN(media.duration) && media.duration > 0) {
+										if (player.isVideo) {
+												player.showControls();
+												player.startControlsTimer();
+										}
+
+										// 5%
+										var newTime = Math.max(media.currentTime - player.options.defaultSeekBackwardInterval(media), 0);
+										media.setCurrentTime(newTime);
+								}
+						}
+				},
+				{
+						keys: [
+								39, // RIGHT
+								228 // Google TV forward
+						],
+						action: function(player, media) {
+								if (!isNaN(media.duration) && media.duration > 0) {
+										if (player.isVideo) {
+												player.showControls();
+												player.startControlsTimer();
+										}
+
+										// 5%
+										var newTime = Math.min(media.currentTime + player.options.defaultSeekForwardInterval(media), media.duration);
+										media.setCurrentTime(newTime);
+								}
+						}
+				},
+				{
+						keys: [70], // F
+						action: function(player, media) {
+								if (typeof player.enterFullScreen != 'undefined') {
+										if (player.isFullScreen) {
+												player.exitFullScreen();
+										} else {
+												player.enterFullScreen();
+										}
+								}
+						}
+				},
+				{
+						keys: [77], // M
+						action: function(player, media) {
+								player.container.find('.mejs-volume-slider').css('display','block');
+								if (player.isVideo) {
+										player.showControls();
+										player.startControlsTimer();
+								}
+								if (player.media.muted) {
+										player.setMuted(false);
+								} else {
+										player.setMuted(true);
+								}
+						}
+				}
+		]
+	};
+
+	mejs.mepIndex = 0;
+
+	mejs.players = {};
+
+	// wraps a MediaElement object in player controls
+	mejs.MediaElementPlayer = function(node, o) {
+		// enforce object, even without "new" (via John Resig)
+		if ( !(this instanceof mejs.MediaElementPlayer) ) {
+			return new mejs.MediaElementPlayer(node, o);
+		}
+
+		var t = this;
+
+		// these will be reset after the MediaElement.success fires
+		t.$media = t.$node = $(node);
+		t.node = t.media = t.$media[0];
+
+		if(!t.node) {
+			return
+		}
+
+		// check for existing player
+		if (typeof t.node.player != 'undefined') {
+			return t.node.player;
+		}
+
+
+		// try to get options from data-mejsoptions
+		if (typeof o == 'undefined') {
+			o = t.$node.data('mejsoptions');
+		}
+
+		// extend default options
+		t.options = $.extend({},mejs.MepDefaults,o);
+
+		if (!t.options.timeFormat) {
+			// Generate the time format according to options
+			t.options.timeFormat = 'mm:ss';
+			if (t.options.alwaysShowHours) {
+				t.options.timeFormat = 'hh:mm:ss';
+			}
+			if (t.options.showTimecodeFrameCount) {
+				t.options.timeFormat += ':ff';
+			}
+		}
+
+		mejs.Utility.calculateTimeFormat(0, t.options, t.options.framesPerSecond || 25);
+
+		// unique ID
+		t.id = 'mep_' + mejs.mepIndex++;
+
+		// add to player array (for focus events)
+		mejs.players[t.id] = t;
+
+		// start up
+		t.init();
+
+		return t;
+	};
+
+	// actual player
+	mejs.MediaElementPlayer.prototype = {
+
+		hasFocus: false,
+
+		controlsAreVisible: true,
+
+		init: function() {
+
+			var
+				t = this,
+				mf = mejs.MediaFeatures,
+				// options for MediaElement (shim)
+				meOptions = $.extend(true, {}, t.options, {
+					success: function(media, domNode) { t.meReady(media, domNode); },
+					error: function(e) { t.handleError(e);}
+				}),
+				tagName = t.media.tagName.toLowerCase();
+
+			t.isDynamic = (tagName !== 'audio' && tagName !== 'video');
+
+			if (t.isDynamic) {
+				// get video from src or href?
+				t.isVideo = t.options.isVideo;
+			} else {
+				t.isVideo = (tagName !== 'audio' && t.options.isVideo);
+			}
+
+			// use native controls in iPad, iPhone, and Android
+			if ((mf.isiPad && t.options.iPadUseNativeControls) || (mf.isiPhone && t.options.iPhoneUseNativeControls)) {
+
+				// add controls and stop
+				t.$media.attr('controls', 'controls');
+
+				// attempt to fix iOS 3 bug
+				//t.$media.removeAttr('poster');
+								// no Issue found on iOS3 -ttroxell
+
+				// override Apple's autoplay override for iPads
+				if (mf.isiPad && t.media.getAttribute('autoplay') !== null) {
+					t.play();
+				}
+
+			} else if (mf.isAndroid && t.options.AndroidUseNativeControls) {
+
+				// leave default player
+
+			} else {
+
+				// DESKTOP: use MediaElementPlayer controls
+
+				// remove native controls
+				t.$media.removeAttr('controls');
+				var videoPlayerTitle = t.isVideo ?
+					mejs.i18n.t('Video Player') : mejs.i18n.t('Audio Player');
+				// insert description for screen readers
+				$('<span class="mejs-offscreen">' + videoPlayerTitle + '</span>').insertBefore(t.$media);
+				// build container
+				t.container =
+					$('<div id="' + t.id + '" class="mejs-container ' + (mejs.MediaFeatures.svgAsImg ? 'svg' : 'no-svg') +
+					  '" tabindex="0" role="application" aria-label="' + videoPlayerTitle + '">'+
+						'<div class="mejs-inner">'+
+							'<div class="mejs-mediaelement"></div>'+
+							'<div class="mejs-layers"></div>'+
+							'<div class="mejs-controls"></div>'+
+							'<div class="mejs-clear"></div>'+
+						'</div>' +
+					'</div>')
+					.addClass(t.$media[0].className)
+					.insertBefore(t.$media)
+					.focus(function ( e ) {
+						if( !t.controlsAreVisible && !t.hasFocus && t.controlsEnabled) {
+							t.showControls(true);
+							// In versions older than IE11, the focus causes the playbar to be displayed
+							// if user clicks on the Play/Pause button in the control bar once it attempts
+							// to hide it
+							if (!t.hasMsNativeFullScreen) {
+								var playButton = t.container.find('.mejs-playpause-button > button');
+								playButton.focus();
+							}
+						}
+					});
+ 
+				if (t.options.stretching === 'fill' && !t.container.parent('mejs-fill-container').length) {
+					// outer container
+					t.outerContainer = t.$media.parent();
+					t.container.wrap('<div class="mejs-fill-container"/>');
+				}
+
+				// add classes for user and content
+				t.container.addClass(
+					(mf.isAndroid ? 'mejs-android ' : '') +
+					(mf.isiOS ? 'mejs-ios ' : '') +
+					(mf.isiPad ? 'mejs-ipad ' : '') +
+					(mf.isiPhone ? 'mejs-iphone ' : '') +
+					(t.isVideo ? 'mejs-video ' : 'mejs-audio ')
+				);
+
+
+				// move the <video/video> tag into the right spot
+				t.container.find('.mejs-mediaelement').append(t.$media);
+
+				// needs to be assigned here, after iOS remap
+				t.node.player = t;
+
+				// find parts
+				t.controls = t.container.find('.mejs-controls');
+				t.layers = t.container.find('.mejs-layers');
+
+				// determine the size
+
+				/* size priority:
+					(1) videoWidth (forced),
+					(2) style="width;height;"
+					(3) width attribute,
+					(4) defaultVideoWidth (for unspecified cases)
+				*/
+
+				var tagType = (t.isVideo ? 'video' : 'audio'),
+					capsTagName = tagType.substring(0,1).toUpperCase() + tagType.substring(1);
+
+
+
+				if (t.options[tagType + 'Width'] > 0 || t.options[tagType + 'Width'].toString().indexOf('%') > -1) {
+					t.width = t.options[tagType + 'Width'];
+				} else if (t.media.style.width !== '' && t.media.style.width !== null) {
+					t.width = t.media.style.width;
+				} else if (t.media.getAttribute('width') !== null) {
+					t.width = t.$media.attr('width');
+				} else {
+					t.width = t.options['default' + capsTagName + 'Width'];
+				}
+
+				if (t.options[tagType + 'Height'] > 0 || t.options[tagType + 'Height'].toString().indexOf('%') > -1) {
+					t.height = t.options[tagType + 'Height'];
+				} else if (t.media.style.height !== '' && t.media.style.height !== null) {
+					t.height = t.media.style.height;
+				} else if (t.$media[0].getAttribute('height') !== null) {
+					t.height = t.$media.attr('height');
+				} else {
+					t.height = t.options['default' + capsTagName + 'Height'];
+				}
+
+				// set the size, while we wait for the plugins to load below
+				t.setPlayerSize(t.width, t.height);
+
+				// create MediaElementShim
+				meOptions.pluginWidth = t.width;
+				meOptions.pluginHeight = t.height;
+			}
+
+			// create MediaElement shim
+			mejs.MediaElement(t.$media[0], meOptions);
+
+			if (typeof(t.container) != 'undefined' && t.controlsAreVisible){
+				// controls are shown when loaded
+				t.container.trigger('controlsshown');
+			}
+		},
+
+		showControls: function(doAnimation) {
+			var t = this;
+
+			doAnimation = typeof doAnimation == 'undefined' || doAnimation;
+
+			if (t.controlsAreVisible)
+				return;
+
+			if (doAnimation) {
+				t.controls
+					.removeClass('mejs-offscreen')
+					.stop(true, true).fadeIn(200, function() {
+						t.controlsAreVisible = true;
+						t.container.trigger('controlsshown');
+					});
+
+				// any additional controls people might add and want to hide
+				t.container.find('.mejs-control')
+					.removeClass('mejs-offscreen')
+					.stop(true, true).fadeIn(200, function() {t.controlsAreVisible = true;});
+
+			} else {
+				t.controls
+					.removeClass('mejs-offscreen')
+					.css('display','block');
+
+				// any additional controls people might add and want to hide
+				t.container.find('.mejs-control')
+					.removeClass('mejs-offscreen')
+					.css('display','block');
+
+				t.controlsAreVisible = true;
+				t.container.trigger('controlsshown');
+			}
+
+			t.setControlsSize();
+
+		},
+
+		hideControls: function(doAnimation) {
+			var t = this;
+
+			doAnimation = typeof doAnimation == 'undefined' || doAnimation;
+
+			if (!t.controlsAreVisible || t.options.alwaysShowControls || t.keyboardAction || t.media.paused || t.media.ended)
+				return;
+
+			if (doAnimation) {
+				// fade out main controls
+				t.controls.stop(true, true).fadeOut(200, function() {
+					$(this)
+						.addClass('mejs-offscreen')
+						.css('display','block');
+
+					t.controlsAreVisible = false;
+					t.container.trigger('controlshidden');
+				});
+
+				// any additional controls people might add and want to hide
+				t.container.find('.mejs-control').stop(true, true).fadeOut(200, function() {
+					$(this)
+						.addClass('mejs-offscreen')
+						.css('display','block');
+				});
+			} else {
+
+				// hide main controls
+				t.controls
+					.addClass('mejs-offscreen')
+					.css('display','block');
+
+				// hide others
+				t.container.find('.mejs-control')
+					.addClass('mejs-offscreen')
+					.css('display','block');
+
+				t.controlsAreVisible = false;
+				t.container.trigger('controlshidden');
+			}
+		},
+
+		controlsTimer: null,
+
+		startControlsTimer: function(timeout) {
+
+			var t = this;
+
+			timeout = typeof timeout != 'undefined' ? timeout : t.options.controlsTimeoutDefault;
+
+			t.killControlsTimer('start');
+
+			t.controlsTimer = setTimeout(function() {
+				//
+				t.hideControls();
+				t.killControlsTimer('hide');
+			}, timeout);
+		},
+
+		killControlsTimer: function(src) {
+
+			var t = this;
+
+			if (t.controlsTimer !== null) {
+				clearTimeout(t.controlsTimer);
+				delete t.controlsTimer;
+				t.controlsTimer = null;
+			}
+		},
+
+		controlsEnabled: true,
+
+		disableControls: function() {
+			var t= this;
+
+			t.killControlsTimer();
+			t.hideControls(false);
+			this.controlsEnabled = false;
+		},
+
+		enableControls: function() {
+			var t= this;
+
+			t.showControls(false);
+
+			t.controlsEnabled = true;
+		},
+
+		// Sets up all controls and events
+		meReady: function(media, domNode) {
+
+
+			var t = this,
+				mf = mejs.MediaFeatures,
+				autoplayAttr = domNode.getAttribute('autoplay'),
+				autoplay = !(typeof autoplayAttr == 'undefined' || autoplayAttr === null || autoplayAttr === 'false'),
+				featureIndex,
+				feature;
+
+			// make sure it can't create itself again if a plugin reloads
+			if (t.created) {
+				return;
+			} else {
+				t.created = true;
+			}
+
+			t.media = media;
+			t.domNode = domNode;
+
+			if (!(mf.isAndroid && t.options.AndroidUseNativeControls) && !(mf.isiPad && t.options.iPadUseNativeControls) && !(mf.isiPhone && t.options.iPhoneUseNativeControls)) {
+
+				// two built in features
+				t.buildposter(t, t.controls, t.layers, t.media);
+				t.buildkeyboard(t, t.controls, t.layers, t.media);
+				t.buildoverlays(t, t.controls, t.layers, t.media);
+
+				// grab for use by features
+				t.findTracks();
+
+				// add user-defined features/controls
+				for (featureIndex in t.options.features) {
+					feature = t.options.features[featureIndex];
+					if (t['build' + feature]) {
+						try {
+							t['build' + feature](t, t.controls, t.layers, t.media);
+						} catch (e) {
+							// TODO: report control error
+							//throw e;
+							
+							
+						}
+					}
+				}
+
+				t.container.trigger('controlsready');
+
+				// reset all layers and controls
+				t.setPlayerSize(t.width, t.height);
+				t.setControlsSize();
+
+
+				// controls fade
+				if (t.isVideo) {
+
+					if (mejs.MediaFeatures.hasTouch && !t.options.alwaysShowControls) {
+
+						// for touch devices (iOS, Android)
+						// show/hide without animation on touch
+
+						t.$media.bind('touchstart', function() {
+
+							// toggle controls
+							if (t.controlsAreVisible) {
+								t.hideControls(false);
+							} else {
+								if (t.controlsEnabled) {
+									t.showControls(false);
+								}
+							}
+						});
+
+					} else {
+
+						// create callback here since it needs access to current
+						// MediaElement object
+						t.clickToPlayPauseCallback = function() {
+							//
+
+							if (t.options.clickToPlayPause) {
+								if (t.media.paused) {
+									t.play();
+								} else {
+									t.pause();
+								}
+
+								var button = t.$media.closest('.mejs-container').find('.mejs-overlay-button'),
+									pressed = button.attr('aria-pressed');
+								button.attr('aria-pressed', !pressed);
+							}
+						};
+
+						// click to play/pause
+						t.media.addEventListener('click', t.clickToPlayPauseCallback, false);
+
+						// show/hide controls
+						t.container
+							.bind('mouseenter', function () {
+								if (t.controlsEnabled) {
+									if (!t.options.alwaysShowControls ) {
+										t.killControlsTimer('enter');
+										t.showControls();
+										t.startControlsTimer(t.options.controlsTimeoutMouseEnter);
+									}
+								}
+							})
+							.bind('mousemove', function() {
+								if (t.controlsEnabled) {
+									if (!t.controlsAreVisible) {
+										t.showControls();
+									}
+									if (!t.options.alwaysShowControls) {
+										t.startControlsTimer(t.options.controlsTimeoutMouseEnter);
+									}
+								}
+							})
+							.bind('mouseleave', function () {
+								if (t.controlsEnabled) {
+									if (!t.media.paused && !t.options.alwaysShowControls) {
+										t.startControlsTimer(t.options.controlsTimeoutMouseLeave);
+									}
+								}
+							});
+					}
+
+					if(t.options.hideVideoControlsOnLoad) {
+						t.hideControls(false);
+					}
+
+					// check for autoplay
+					if (autoplay && !t.options.alwaysShowControls) {
+						t.hideControls();
+					}
+
+					// resizer
+					if (t.options.enableAutosize) {
+						t.media.addEventListener('loadedmetadata', function(e) {
+							// if the <video height> was not set and the options.videoHeight was not set
+							// then resize to the real dimensions
+							if (t.options.videoHeight <= 0 && t.domNode.getAttribute('height') === null && !isNaN(e.target.videoHeight)) {
+								t.setPlayerSize(e.target.videoWidth, e.target.videoHeight);
+								t.setControlsSize();
+								t.media.setVideoSize(e.target.videoWidth, e.target.videoHeight);
+							}
+						}, false);
+					}
+				}
+
+				// EVENTS
+
+				// FOCUS: when a video starts playing, it takes focus from other players (possibily pausing them)
+				t.media.addEventListener('play', function() {
+					var playerIndex;
+
+					// go through all other players
+					for (playerIndex in mejs.players) {
+						var p = mejs.players[playerIndex];
+						if (p.id != t.id && t.options.pauseOtherPlayers && !p.paused && !p.ended) {
+							p.pause();
+						}
+						p.hasFocus = false;
+					}
+
+					t.hasFocus = true;
+				},false);
+
+
+				// ended for all
+				t.media.addEventListener('ended', function (e) {
+					if(t.options.autoRewind) {
+						try{
+							t.media.setCurrentTime(0);
+							// Fixing an Android stock browser bug, where "seeked" isn't fired correctly after ending the video and jumping to the beginning
+							window.setTimeout(function(){
+								$(t.container).find('.mejs-overlay-loading').parent().hide();
+							}, 20);
+						} catch (exp) {
+
+						}
+					}
+					t.media.pause();
+
+					if (t.setProgressRail) {
+						t.setProgressRail();
+					}
+					if (t.setCurrentRail) {
+						t.setCurrentRail();
+					}
+
+					if (t.options.loop) {
+						t.play();
+					} else if (!t.options.alwaysShowControls && t.controlsEnabled) {
+						t.showControls();
+					}
+				}, false);
+
+				// resize on the first play
+				t.media.addEventListener('loadedmetadata', function() {
+
+					mejs.Utility.calculateTimeFormat(t.duration, t.options, t.options.framesPerSecond || 25);
+
+					if (t.updateDuration) {
+						t.updateDuration();
+					}
+					if (t.updateCurrent) {
+						t.updateCurrent();
+					}
+
+					if (!t.isFullScreen) {
+						t.setPlayerSize(t.width, t.height);
+						t.setControlsSize();
+					}
+				}, false);
+
+				// Only change the time format when necessary
+				var duration = null;
+				t.media.addEventListener('timeupdate',function() {
+					if (duration !== this.duration) {
+						duration = this.duration;
+						mejs.Utility.calculateTimeFormat(duration, t.options, t.options.framesPerSecond || 25);
+						
+						// make sure to fill in and resize the controls (e.g., 00:00 => 01:13:15
+						if (t.updateDuration) {
+							t.updateDuration();
+						}
+						if (t.updateCurrent) {
+							t.updateCurrent();
+						}
+						t.setControlsSize();
+						
+					}
+				}, false);
+
+				t.container.focusout(function (e) {
+					if( e.relatedTarget ) { //FF is working on supporting focusout https://bugzilla.mozilla.org/show_bug.cgi?id=687787
+						var $target = $(e.relatedTarget);
+						if (t.keyboardAction && $target.parents('.mejs-container').length === 0) {
+							t.keyboardAction = false;
+							if (t.isVideo && !t.options.alwaysShowControls) {
+								t.hideControls(true);
+							}
+
+						}
+					}
+				});
+
+				// webkit has trouble doing this without a delay
+				setTimeout(function () {
+					t.setPlayerSize(t.width, t.height);
+					t.setControlsSize();
+				}, 50);
+
+				// adjust controls whenever window sizes (used to be in fullscreen only)
+				t.globalBind('resize', function() {
+
+					// don't resize for fullscreen mode
+					if ( !(t.isFullScreen || (mejs.MediaFeatures.hasTrueNativeFullScreen && document.webkitIsFullScreen)) ) {
+						t.setPlayerSize(t.width, t.height);
+					}
+
+					// always adjust controls
+					t.setControlsSize();
+				});
+
+				// This is a work-around for a bug in the YouTube iFrame player, which means
+				//	we can't use the play() API for the initial playback on iOS or Android;
+				//	user has to start playback directly by tapping on the iFrame.
+				if (t.media.pluginType == 'youtube' && ( mf.isiOS || mf.isAndroid ) ) {
+					t.container.find('.mejs-overlay-play').hide();
+					t.container.find('.mejs-poster').hide();
+				}
+			}
+
+			// force autoplay for HTML5
+			if (autoplay && media.pluginType == 'native') {
+				t.play();
+			}
+
+
+			if (t.options.success) {
+
+				if (typeof t.options.success == 'string') {
+					window[t.options.success](t.media, t.domNode, t);
+				} else {
+					t.options.success(t.media, t.domNode, t);
+				}
+			}
+		},
+
+		handleError: function(e) {
+			var t = this;
+
+			if (t.controls) {
+				t.controls.hide();
+			}
+
+			// Tell user that the file cannot be played
+			if (t.options.error) {
+				t.options.error(e);
+			}
+		},
+
+		setPlayerSize: function(width,height) {
+			var t = this;
+
+			if( !t.options.setDimensions ) {
+				return false;
+			}
+
+			if (typeof width != 'undefined') {
+				t.width = width;
+			}
+
+			if (typeof height != 'undefined') {
+				t.height = height;
+			}
+ 
+			// check stretching modes
+			switch (t.options.stretching) {
+				case 'fill':
+					// The 'fill' effect only makes sense on video; for audio we will set the dimensions
+					if (t.isVideo) {
+						this.setFillMode();
+					} else {
+						this.setDimensions(t.width, t.height);
+					}
+					break;
+				case 'responsive':
+					this.setResponsiveMode();
+					break;
+				case 'none':
+					this.setDimensions(t.width, t.height);
+					break;
+				// This is the 'auto' mode
+				default:
+					if (this.hasFluidMode() === true) {
+						this.setResponsiveMode();
+					} else {
+						this.setDimensions(t.width, t.height);
+					}
+					break;
+			}
+		},
+ 
+		hasFluidMode: function() {
+			var t = this;
+	 
+			// detect 100% mode - use currentStyle for IE since css() doesn't return percentages
+			return (t.height.toString().indexOf('%') > 0 || (t.$node.css('max-width') !== 'none' && t.$node.css('max-width') !== 't.width') || (t.$node[0].currentStyle && t.$node[0].currentStyle.maxWidth === '100%'));
+		},
+ 
+		setResponsiveMode: function() {
+			var t = this;
+		
+			// do we have the native dimensions yet?
+			var nativeWidth = (function() {
+				if (t.isVideo) {
+					if (t.media.videoWidth && t.media.videoWidth > 0) {
+						return t.media.videoWidth;
+					} else if (t.media.getAttribute('width') !== null) {
+						return t.media.getAttribute('width');
+					} else {
+						return t.options.defaultVideoWidth;
+					}
+				} else {
+					return t.options.defaultAudioWidth;
+				}
+			})();
+		
+			var nativeHeight = (function() {
+				if (t.isVideo) {
+					if (t.media.videoHeight && t.media.videoHeight > 0) {
+						return t.media.videoHeight;
+					} else if (t.media.getAttribute('height') !== null) {
+						return t.media.getAttribute('height');
+					} else {
+						return t.options.defaultVideoHeight;
+					}
+				} else {
+					return t.options.defaultAudioHeight;
+				}
+			})();
+		
+			var parentWidth = t.container.parent().closest(':visible').width(),
+			parentHeight = t.container.parent().closest(':visible').height(),
+			newHeight = t.isVideo || !t.options.autosizeProgress ? parseInt(parentWidth * nativeHeight/nativeWidth, 10) : nativeHeight;
+			
+			// When we use percent, the newHeight can't be calculated so we get the container height
+			if (isNaN(newHeight) || ( parentHeight !== 0 && newHeight > parentHeight && parentHeight > nativeHeight)) {
+				newHeight = parentHeight;
+			}
+		
+			if (t.container.parent().length > 0 && t.container.parent()[0].tagName.toLowerCase() === 'body') { // && t.container.siblings().count == 0) {
+				parentWidth = $(window).width();
+				newHeight = $(window).height();
+			}
+		
+			if ( newHeight && parentWidth ) {
+			
+				// set outer container size
+				t.container
+					.width(parentWidth)
+					.height(newHeight);
+				
+				// set native <video> or <audio> and shims
+				t.$media.add(t.container.find('.mejs-shim'))
+					.width('100%')
+					.height('100%');
+				
+				// if shim is ready, send the size to the embeded plugin
+				if (t.isVideo) {
+					if (t.media.setVideoSize) {
+						t.media.setVideoSize(parentWidth, newHeight);
+					}
+				}
+		
+				// set the layers
+				t.layers.children('.mejs-layer')
+					.width('100%')
+					.height('100%');
+			}
+		},
+ 
+		setFillMode: function() {
+			var t = this,
+				parent = t.outerContainer;
+ 
+			if (!parent.width()) {
+				parent.height(t.$media.width());
+			}
+ 
+			if (!parent.height()) {
+				parent.height(t.$media.height());
+			}
+ 
+			var parentWidth = parent.width(),
+				parentHeight = parent.height();
+			
+			t.setDimensions('100%', '100%');
+			
+			// This prevents an issue when displaying poster
+			t.container.find('.mejs-poster img').css('display', 'block');
+			
+			targetElement = t.container.find('object, embed, iframe, video');
+			
+			// calculate new width and height
+			var initHeight = t.height,
+				initWidth = t.width,
+				// scale to the target width
+				scaleX1 = parentWidth,
+				scaleY1 = (initHeight * parentWidth) / initWidth,
+				// scale to the target height
+				scaleX2 = (initWidth * parentHeight) / initHeight,
+				scaleY2 = parentHeight,
+				// now figure out which one we should use
+				bScaleOnWidth = !(scaleX2 > parentWidth),
+				finalWidth = bScaleOnWidth ? Math.floor(scaleX1) : Math.floor(scaleX2),
+				finalHeight = bScaleOnWidth ? Math.floor(scaleY1) : Math.floor(scaleY2);
+			
+			if (bScaleOnWidth) {
+				targetElement.height(finalHeight).width(parentWidth);
+				if (t.media.setVideoSize) {
+					t.media.setVideoSize(parentWidth, finalHeight);
+				}
+			} else {
+				targetElement.height(parentHeight).width(finalWidth);
+				if (t.media.setVideoSize) {
+					t.media.setVideoSize(finalWidth, parentHeight);
+				}
+			}
+			
+			targetElement.css({
+				'margin-left': Math.floor((parentWidth - finalWidth) / 2),
+				'margin-top': 0
+			});
+		},
+	 
+		setDimensions: function(width, height) {
+			var t = this;
+			
+			t.container
+				.width(width)
+				.height(height);
+			
+			t.layers.children('.mejs-layer')
+				.width(width)
+				.height(height);
+		},
+
+		setControlsSize: function() {
+			var t = this,
+				usedWidth = 0,
+				railWidth = 0,
+				rail = t.controls.find('.mejs-time-rail'),
+				total = t.controls.find('.mejs-time-total'),
+				others = rail.siblings(),
+				lastControl = others.last(),
+				lastControlPosition = null;
+
+			// skip calculation if hidden
+			if (!t.container.is(':visible') || !rail.length || !rail.is(':visible')) {
+				return;
+			}
+
+			// allow the size to come from custom CSS
+			if (t.options && !t.options.autosizeProgress) {
+				// Also, frontends devs can be more flexible
+				// due the opportunity of absolute positioning.
+				railWidth = parseInt(rail.css('width'), 10);
+			}
+
+			// attempt to autosize
+			if (railWidth === 0 || !railWidth) {
+
+				// find the size of all the other controls besides the rail
+				others.each(function() {
+					var $this = $(this);
+					if ($this.css('position') != 'absolute' && $this.is(':visible')) {
+						usedWidth += $(this).outerWidth(true);
+					}
+				});
+
+				// fit the rail into the remaining space
+				railWidth = t.controls.width() - usedWidth - (rail.outerWidth(true) - rail.width());
+			}
+
+			// resize the rail,
+			// but then check if the last control (say, the fullscreen button) got pushed down
+			// this often happens when zoomed
+			do {
+				// outer area
+				rail.width(railWidth);
+				// dark space
+				total.width(railWidth - (total.outerWidth(true) - total.width()));
+
+				if (lastControl.css('position') != 'absolute') {
+					lastControlPosition = lastControl.length ? lastControl.position() : null;
+					railWidth--;
+				}
+			} while (lastControlPosition !== null && lastControlPosition.top.toFixed(2) > 0 && railWidth > 0);
+
+			t.container.trigger('controlsresize');
+		},
+
+
+		buildposter: function(player, controls, layers, media) {
+			var t = this,
+				poster =
+				$('<div class="mejs-poster mejs-layer">' +
+				'</div>')
+					.appendTo(layers),
+				posterUrl = player.$media.attr('poster');
+
+			// prioriy goes to option (this is useful if you need to support iOS 3.x (iOS completely fails with poster)
+			if (player.options.poster !== '') {
+				posterUrl = player.options.poster;
+			}
+
+			// second, try the real poster
+			if ( posterUrl ) {
+				t.setPoster(posterUrl);
+			} else {
+				poster.hide();
+			}
+
+			media.addEventListener('play',function() {
+				poster.hide();
+			}, false);
+
+			if(player.options.showPosterWhenEnded && player.options.autoRewind){
+				media.addEventListener('ended',function() {
+					poster.show();
+				}, false);
+			}
+		},
+
+		setPoster: function(url) {
+			var t = this,
+				posterDiv = t.container.find('.mejs-poster'),
+				posterImg = posterDiv.find('img');
+
+			if (posterImg.length === 0) {
+				posterImg = $('<img width="100%" height="100%" alt="" />').appendTo(posterDiv);
+			}
+
+			posterImg.attr('src', url);
+			posterDiv.css({'background-image' : 'url(' + url + ')'});
+		},
+
+		buildoverlays: function(player, controls, layers, media) {
+			var t = this;
+			if (!player.isVideo)
+				return;
+
+			var
+			loading =
+				$('<div class="mejs-overlay mejs-layer">'+
+					'<div class="mejs-overlay-loading"><span></span></div>'+
+				'</div>')
+				.hide() // start out hidden
+				.appendTo(layers),
+			error =
+				$('<div class="mejs-overlay mejs-layer">'+
+					'<div class="mejs-overlay-error"></div>'+
+				'</div>')
+				.hide() // start out hidden
+				.appendTo(layers),
+			// this needs to come last so it's on top
+			bigPlay =
+				$('<div class="mejs-overlay mejs-layer mejs-overlay-play">'+
+					'<div class="mejs-overlay-button" role="button" aria-label="' + mejs.i18n.t('Play') + '" aria-pressed="false"></div>'+
+				'</div>')
+				.appendTo(layers)
+				.bind('click', function() {	 // Removed 'touchstart' due issues on Samsung Android devices where a tap on bigPlay started and immediately stopped the video
+					if (t.options.clickToPlayPause) {
+						if (media.paused) {
+							media.play();
+						}
+
+						var button = $(this).find('.mejs-overlay-button'),
+							pressed = button.attr('aria-pressed');
+						button.attr('aria-pressed', !!pressed);
+					}
+				});
+
+			/*
+			if (mejs.MediaFeatures.isiOS || mejs.MediaFeatures.isAndroid) {
+				bigPlay.remove();
+				loading.remove();
+			}
+			*/
+
+
+			// show/hide big play button
+			media.addEventListener('play',function() {
+				bigPlay.hide();
+				loading.hide();
+				controls.find('.mejs-time-buffering').hide();
+				error.hide();
+			}, false);
+
+			media.addEventListener('playing', function() {
+				bigPlay.hide();
+				loading.hide();
+				controls.find('.mejs-time-buffering').hide();
+				error.hide();
+			}, false);
+
+			media.addEventListener('seeking', function() {
+				loading.show();
+				controls.find('.mejs-time-buffering').show();
+			}, false);
+
+			media.addEventListener('seeked', function() {
+				loading.hide();
+				controls.find('.mejs-time-buffering').hide();
+			}, false);
+
+			media.addEventListener('pause',function() {
+				if (!mejs.MediaFeatures.isiPhone) {
+					bigPlay.show();
+				}
+			}, false);
+
+			media.addEventListener('waiting', function() {
+				loading.show();
+				controls.find('.mejs-time-buffering').show();
+			}, false);
+
+
+			// show/hide loading
+			media.addEventListener('loadeddata',function() {
+				// for some reason Chrome is firing this event
+				//if (mejs.MediaFeatures.isChrome && media.getAttribute && media.getAttribute('preload') === 'none')
+				//	return;
+
+				loading.show();
+				controls.find('.mejs-time-buffering').show();
+				// Firing the 'canplay' event after a timeout which isn't getting fired on some Android 4.1 devices (https://github.com/johndyer/mediaelement/issues/1305)
+				if (mejs.MediaFeatures.isAndroid) {
+					media.canplayTimeout = window.setTimeout(
+						function() {
+							if (document.createEvent) {
+								var evt = document.createEvent('HTMLEvents');
+								evt.initEvent('canplay', true, true);
+								return media.dispatchEvent(evt);
+							}
+						}, 300
+					);
+				}
+			}, false);
+			media.addEventListener('canplay',function() {
+				loading.hide();
+				controls.find('.mejs-time-buffering').hide();
+				clearTimeout(media.canplayTimeout); // Clear timeout inside 'loadeddata' to prevent 'canplay' to fire twice
+			}, false);
+
+			// error handling
+			media.addEventListener('error',function(e) {
+				t.handleError(e);
+				loading.hide();
+				bigPlay.hide();
+				error.show();
+				error.find('.mejs-overlay-error').html("Error loading this resource");
+			}, false);
+
+			media.addEventListener('keydown', function(e) {
+				t.onkeydown(player, media, e);
+			}, false);
+		},
+
+		buildkeyboard: function(player, controls, layers, media) {
+
+				var t = this;
+
+				t.container.keydown(function () {
+					t.keyboardAction = true;
+				});
+
+				// listen for key presses
+				t.globalBind('keydown', function(event) {
+					player.hasFocus = $(event.target).closest('.mejs-container').length !== 0
+						&& $(event.target).closest('.mejs-container').attr('id') === player.$media.closest('.mejs-container').attr('id');
+					return t.onkeydown(player, media, event);
+				});
+
+
+				// check if someone clicked outside a player region, then kill its focus
+				t.globalBind('click', function(event) {
+					player.hasFocus = $(event.target).closest('.mejs-container').length !== 0;
+				});
+
+		},
+		onkeydown: function(player, media, e) {
+			if (player.hasFocus && player.options.enableKeyboard) {
+				// find a matching key
+				for (var i = 0, il = player.options.keyActions.length; i < il; i++) {
+					var keyAction = player.options.keyActions[i];
+
+					for (var j = 0, jl = keyAction.keys.length; j < jl; j++) {
+						if (e.keyCode == keyAction.keys[j]) {
+							if (typeof(e.preventDefault) == "function") e.preventDefault();
+							keyAction.action(player, media, e.keyCode, e);
+							return false;
+						}
+					}
+				}
+			}
+
+			return true;
+		},
+
+		findTracks: function() {
+			var t = this,
+				tracktags = t.$media.find('track');
+
+			// store for use by plugins
+			t.tracks = [];
+			tracktags.each(function(index, track) {
+
+				track = $(track);
+
+				t.tracks.push({
+					srclang: (track.attr('srclang')) ? track.attr('srclang').toLowerCase() : '',
+					src: track.attr('src'),
+					kind: track.attr('kind'),
+					label: track.attr('label') || '',
+					entries: [],
+					isLoaded: false
+				});
+			});
+		},
+		changeSkin: function(className) {
+			this.container[0].className = 'mejs-container ' + className;
+			this.setPlayerSize(this.width, this.height);
+			this.setControlsSize();
+		},
+		play: function() {
+			this.load();
+			this.media.play();
+		},
+		pause: function() {
+			try {
+				this.media.pause();
+			} catch (e) {}
+		},
+		load: function() {
+			if (!this.isLoaded) {
+				this.media.load();
+			}
+
+			this.isLoaded = true;
+		},
+		setMuted: function(muted) {
+			this.media.setMuted(muted);
+		},
+		setCurrentTime: function(time) {
+			this.media.setCurrentTime(time);
+		},
+		getCurrentTime: function() {
+			return this.media.currentTime;
+		},
+		setVolume: function(volume) {
+			this.media.setVolume(volume);
+		},
+		getVolume: function() {
+			return this.media.volume;
+		},
+		setSrc: function(src) {
+			var
+				t = this;
+
+			// If using YouTube, its API is different to load a specific source
+			if (t.media.pluginType === 'youtube') {
+				var videoId;
+
+				if (typeof src !== 'string') {
+					var i, media;
+
+					for (i=0; i<src.length; i++) {
+						media = src[i];
+						if (this.canPlayType(media.type)) {
+							src = media.src;
+							break;
+						}
+					}
+				}
+
+				// youtu.be url from share button
+				if (src.lastIndexOf('youtu.be') !== -1) {
+					videoId = src.substr(src.lastIndexOf('/') + 1);
+
+					if (videoId.indexOf('?') !== -1) {
+						videoId = videoId.substr(0, videoId.indexOf('?'));
+					}
+
+				} else {
+					// https://www.youtube.com/watch?v=
+					var videoIdMatch = src.match(/[?&]v=([^&#]+)|&|#|$/);
+
+					if (videoIdMatch) {
+						videoId = videoIdMatch[1];
+					}
+				}
+
+				if (t.media.getAttribute('autoplay') !== null) {
+					t.media.pluginApi.loadVideoById(videoId);
+				} else {
+					t.media.pluginApi.cueVideoById(videoId);
+				}
+
+			}
+			else {
+				t.media.setSrc(src);
+			}
+		},
+		remove: function() {
+			var t = this, featureIndex, feature;
+
+			t.container.prev('.mejs-offscreen').remove();
+
+			// invoke features cleanup
+			for (featureIndex in t.options.features) {
+				feature = t.options.features[featureIndex];
+				if (t['clean' + feature]) {
+					try {
+						t['clean' + feature](t);
+					} catch (e) {
+						// TODO: report control error
+						//throw e;
+						//
+						//
+					}
+				}
+			}
+
+			// grab video and put it back in place
+			if (!t.isDynamic) {
+				t.$media.prop('controls', true);
+				// detach events from the video
+				// TODO: detach event listeners better than this;
+				//		 also detach ONLY the events attached by this plugin!
+				t.$node.clone().insertBefore(t.container).show();
+				t.$node.remove();
+			} else {
+				t.$node.insertBefore(t.container);
+			}
+
+			if (t.media.pluginType !== 'native') {
+				t.media.remove();
+			}
+
+			// Remove the player from the mejs.players object so that pauseOtherPlayers doesn't blow up when trying to pause a non existance flash api.
+			delete mejs.players[t.id];
+
+			if (typeof t.container == 'object') {
+				t.container.remove();
+			}
+			t.globalUnbind();
+			delete t.node.player;
+		},
+		rebuildtracks: function(){
+			var t = this;
+			t.findTracks();
+			t.buildtracks(t, t.controls, t.layers, t.media);
+		},
+		resetSize: function(){
+			var t = this;
+			// webkit has trouble doing this without a delay
+			setTimeout(function () {
+				//
+				t.setPlayerSize(t.width, t.height);
+				t.setControlsSize();
+			}, 50);
+		}
+	};
+
+	(function(){
+		var rwindow = /^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;
+
+		function splitEvents(events, id) {
+			// add player ID as an event namespace so it's easier to unbind them all later
+			var ret = {d: [], w: []};
+			$.each((events || '').split(' '), function(k, v){
+				var eventname = v + '.' + id;
+				if (eventname.indexOf('.') === 0) {
+					ret.d.push(eventname);
+					ret.w.push(eventname);
+				}
+				else {
+					ret[rwindow.test(v) ? 'w' : 'd'].push(eventname);
+				}
+			});
+			ret.d = ret.d.join(' ');
+			ret.w = ret.w.join(' ');
+			return ret;
+		}
+
+		mejs.MediaElementPlayer.prototype.globalBind = function(events, data, callback) {
+			var t = this;
+			var doc = t.node ? t.node.ownerDocument : document;
+
+			events = splitEvents(events, t.id);
+			if (events.d) $(doc).bind(events.d, data, callback);
+			if (events.w) $(window).bind(events.w, data, callback);
+		};
+
+		mejs.MediaElementPlayer.prototype.globalUnbind = function(events, callback) {
+			var t = this;
+			var doc = t.node ? t.node.ownerDocument : document;
+
+			events = splitEvents(events, t.id);
+			if (events.d) $(doc).unbind(events.d, callback);
+			if (events.w) $(window).unbind(events.w, callback);
+		};
+	})();
+
+	// turn into jQuery plugin
+	if (typeof $ != 'undefined') {
+		$.fn.mediaelementplayer = function (options) {
+			if (options === false) {
+				this.each(function () {
+					var player = $(this).data('mediaelementplayer');
+					if (player) {
+						player.remove();
+					}
+					$(this).removeData('mediaelementplayer');
+				});
+			}
+			else {
+				this.each(function () {
+					$(this).data('mediaelementplayer', new mejs.MediaElementPlayer(this, options));
+				});
+			}
+			return this;
+		};
+
+
+		$(document).ready(function() {
+			// auto enable using JSON attribute
+			$('.mejs-player').mediaelementplayer();
+		});
+	}
+
+	// push out to window
+	window.MediaElementPlayer = mejs.MediaElementPlayer;
+
+})(mejs.$);
+
+(function($) {
+
+	$.extend(mejs.MepDefaults, {
+		playText: mejs.i18n.t('Play'),
+		pauseText: mejs.i18n.t('Pause')
+	});
+
+	// PLAY/pause BUTTON
+	$.extend(MediaElementPlayer.prototype, {
+		buildplaypause: function(player, controls, layers, media) {
+			var 
+				t = this,
+				op = t.options,
+				play = 
+				$('<div class="mejs-button mejs-playpause-button mejs-play" >' +
+					'<button type="button" aria-controls="' + t.id + '" title="' + op.playText + '" aria-label="' + op.playText + '"></button>' +
+				'</div>')
+				.appendTo(controls)
+				.click(function(e) {
+					e.preventDefault();
+				
+					if (media.paused) {
+						media.play();
+					} else {
+						media.pause();
+					}
+					
+					return false;
+				}),
+				play_btn = play.find('button');
+
+
+			function togglePlayPause(which) {
+				if ('play' === which) {
+					play.removeClass('mejs-play').addClass('mejs-pause');
+					play_btn.attr({
+						'title': op.pauseText,
+						'aria-label': op.pauseText
+					});
+				} else {
+					play.removeClass('mejs-pause').addClass('mejs-play');
+					play_btn.attr({
+						'title': op.playText,
+						'aria-label': op.playText
+					});
+				}
+			};
+			togglePlayPause('pse');
+
+
+			media.addEventListener('play',function() {
+				togglePlayPause('play');
+			}, false);
+			media.addEventListener('playing',function() {
+				togglePlayPause('play');
+			}, false);
+
+
+			media.addEventListener('pause',function() {
+				togglePlayPause('pse');
+			}, false);
+			media.addEventListener('paused',function() {
+				togglePlayPause('pse');
+			}, false);
+		}
+	});
+	
+})(mejs.$);
+
+(function($) {
+
+	$.extend(mejs.MepDefaults, {
+		stopText: 'Stop'
+	});
+
+	// STOP BUTTON
+	$.extend(MediaElementPlayer.prototype, {
+		buildstop: function(player, controls, layers, media) {
+			var t = this;
+
+			$('<div class="mejs-button mejs-stop-button mejs-stop">' +
+					'<button type="button" aria-controls="' + t.id + '" title="' + t.options.stopText + '" aria-label="' + t.options.stopText + '"></button>' +
+				'</div>')
+				.appendTo(controls)
+				.click(function() {
+					if (!media.paused) {
+						media.pause();
+					}
+					if (media.currentTime > 0) {
+						media.setCurrentTime(0);
+                        media.pause();
+						controls.find('.mejs-time-current').width('0px');
+						controls.find('.mejs-time-handle').css('left', '0px');
+						controls.find('.mejs-time-float-current').html( mejs.Utility.secondsToTimeCode(0, player.options));
+						controls.find('.mejs-currenttime').html( mejs.Utility.secondsToTimeCode(0, player.options));
+						layers.find('.mejs-poster').show();
+					}
+				});
+		}
+	});
+	
+})(mejs.$);
+
+(function($) {
+
+	$.extend(mejs.MepDefaults, {
+		// Enable tooltip that shows time in progress bar
+		enableProgressTooltip: true,
+		progressHelpText: mejs.i18n.t(
+		'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.')
+	});
+
+	// progress/loaded bar
+	$.extend(MediaElementPlayer.prototype, {
+		buildprogress: function(player, controls, layers, media) {
+
+			var
+				t = this,
+				mouseIsDown = false,
+				mouseIsOver = false,
+				lastKeyPressTime = 0,
+				startedPaused = false,
+				autoRewindInitial = player.options.autoRewind,
+				tooltip = player.options.enableProgressTooltip ? '<span class="mejs-time-float">' +
+					'<span class="mejs-time-float-current">00:00</span>' +
+					'<span class="mejs-time-float-corner"></span>' +
+				'</span>' : "";
+
+			$('<div class="mejs-time-rail">' +
+				'<span  class="mejs-time-total mejs-time-slider">' +
+				//'<span class="mejs-offscreen">' + this.options.progressHelpText + '</span>' +
+					'<span class="mejs-time-buffering"></span>' +
+					'<span class="mejs-time-loaded"></span>' +
+					'<span class="mejs-time-current"></span>' +
+					'<span class="mejs-time-handle"></span>' +
+					 tooltip +
+				'</span>' +
+			'</div>')
+				.appendTo(controls);
+			controls.find('.mejs-time-buffering').hide();
+
+			t.total = controls.find('.mejs-time-total');
+			t.loaded  = controls.find('.mejs-time-loaded');
+			t.current  = controls.find('.mejs-time-current');
+			t.handle  = controls.find('.mejs-time-handle');
+			t.timefloat  = controls.find('.mejs-time-float');
+			t.timefloatcurrent  = controls.find('.mejs-time-float-current');
+			t.slider = controls.find('.mejs-time-slider');
+
+			var handleMouseMove = function (e) {
+
+					var offset = t.total.offset(),
+						width = t.total.width(),
+						percentage = 0,
+						newTime = 0,
+						pos = 0,
+						x;
+
+					// mouse or touch position relative to the object
+					if (e.originalEvent && e.originalEvent.changedTouches) {
+						x = e.originalEvent.changedTouches[0].pageX;
+					} else if (e.changedTouches) { // for Zepto
+						x = e.changedTouches[0].pageX;
+					} else {
+						x = e.pageX;
+					}
+
+					if (media.duration) {
+						if (x < offset.left) {
+							x = offset.left;
+						} else if (x > width + offset.left) {
+							x = width + offset.left;
+						}
+
+						pos = x - offset.left;
+						percentage = (pos / width);
+						newTime = (percentage <= 0.02) ? 0 : percentage * media.duration;
+
+						// seek to where the mouse is
+						if (mouseIsDown && newTime !== media.currentTime) {
+							media.setCurrentTime(newTime);
+						}
+
+						// position floating time box
+						if (!mejs.MediaFeatures.hasTouch) {
+							t.timefloat.css('left', pos);
+							t.timefloatcurrent.html( mejs.Utility.secondsToTimeCode(newTime, player.options) );
+							t.timefloat.show();
+						}
+					}
+				},
+				// Accessibility for slider
+				updateSlider = function (e) {
+
+					var seconds = media.currentTime,
+						timeSliderText = mejs.i18n.t('Time Slider'),
+						time = mejs.Utility.secondsToTimeCode(seconds, player.options),
+						duration = media.duration;
+
+					t.slider.attr({
+						'aria-label': timeSliderText,
+						'aria-valuemin': 0,
+						'aria-valuemax': duration,
+						'aria-valuenow': seconds,
+						'aria-valuetext': time,
+						'role': 'slider',
+						'tabindex': 0
+					});
+
+				},
+				restartPlayer = function () {
+					var now = new Date();
+					if (now - lastKeyPressTime >= 1000) {
+						media.play();
+					}
+				};
+
+			t.slider.bind('focus', function (e) {
+				player.options.autoRewind = false;
+			});
+
+			t.slider.bind('blur', function (e) {
+				player.options.autoRewind = autoRewindInitial;
+			});
+
+			t.slider.bind('keydown', function (e) {
+
+				if ((new Date() - lastKeyPressTime) >= 1000) {
+					startedPaused = media.paused;
+				}
+
+				var keyCode = e.keyCode,
+					duration = media.duration,
+					seekTime = media.currentTime,
+					seekForward  = player.options.defaultSeekForwardInterval(media),
+					seekBackward = player.options.defaultSeekBackwardInterval(media);
+
+				switch (keyCode) {
+					case 37: // left
+					case 40: // Down
+						seekTime -= seekBackward;
+						break;
+					case 39: // Right
+					case 38: // Up
+						seekTime += seekForward;
+						break;
+					case 36: // Home
+						seekTime = 0;
+						break;
+					case 35: // end
+						seekTime = duration;
+						break;
+					case 32: // space
+					case 13: // enter
+						media.paused ? media.play() : media.pause();
+						return;
+					default:
+						return;
+				}
+
+				seekTime = seekTime < 0 ? 0 : (seekTime >= duration ? duration : Math.floor(seekTime));
+				lastKeyPressTime = new Date();
+				if (!startedPaused) {
+					media.pause();
+				}
+
+				if (seekTime < media.duration && !startedPaused) {
+					setTimeout(restartPlayer, 1100);
+				}
+
+				media.setCurrentTime(seekTime);
+
+				e.preventDefault();
+				e.stopPropagation();
+				return false;
+			});
+
+
+			// handle clicks
+			//controls.find('.mejs-time-rail').delegate('span', 'click', handleMouseMove);
+			t.total
+				.bind('mousedown touchstart', function (e) {
+					// only handle left clicks or touch
+					if (e.which === 1 || e.which === 0) {
+						mouseIsDown = true;
+						handleMouseMove(e);
+						t.globalBind('mousemove.dur touchmove.dur', function(e) {
+							handleMouseMove(e);
+						});
+						t.globalBind('mouseup.dur touchend.dur', function (e) {
+							mouseIsDown = false;
+							if (typeof t.timefloat !== 'undefined') {
+								t.timefloat.hide();
+							}
+							t.globalUnbind('.dur');
+						});
+					}
+				})
+				.bind('mouseenter', function(e) {
+					mouseIsOver = true;
+					t.globalBind('mousemove.dur', function(e) {
+						handleMouseMove(e);
+					});
+					if (typeof t.timefloat !== 'undefined' && !mejs.MediaFeatures.hasTouch) {
+						t.timefloat.show();
+					}
+				})
+				.bind('mouseleave',function(e) {
+					mouseIsOver = false;
+					if (!mouseIsDown) {
+						t.globalUnbind('.dur');
+						if (typeof t.timefloat !== 'undefined') {
+							t.timefloat.hide();
+						}
+					}
+				});
+
+			// loading
+			media.addEventListener('progress', function (e) {
+				player.setProgressRail(e);
+				player.setCurrentRail(e);
+			}, false);
+
+			// current time
+			media.addEventListener('timeupdate', function(e) {
+				player.setProgressRail(e);
+				player.setCurrentRail(e);
+				updateSlider(e);
+			}, false);
+
+			t.container.on('controlsresize', function(e) {
+				player.setProgressRail(e);
+				player.setCurrentRail(e);
+			});
+		},
+		setProgressRail: function(e) {
+
+			var
+				t = this,
+				target = (e !== undefined) ? e.target : t.media,
+				percent = null;
+
+			// newest HTML5 spec has buffered array (FF4, Webkit)
+			if (target && target.buffered && target.buffered.length > 0 && target.buffered.end && target.duration) {
+				// account for a real array with multiple values - always read the end of the last buffer
+				percent = target.buffered.end(target.buffered.length - 1) / target.duration;
+			} 
+			// Some browsers (e.g., FF3.6 and Safari 5) cannot calculate target.bufferered.end()
+			// to be anything other than 0. If the byte count is available we use this instead.
+			// Browsers that support the else if do not seem to have the bufferedBytes value and
+			// should skip to there. Tested in Safari 5, Webkit head, FF3.6, Chrome 6, IE 7/8.
+			else if (target && target.bytesTotal !== undefined && target.bytesTotal > 0 && target.bufferedBytes !== undefined) {
+				percent = target.bufferedBytes / target.bytesTotal;
+			}
+			// Firefox 3 with an Ogg file seems to go this way
+			else if (e && e.lengthComputable && e.total !== 0) {
+				percent = e.loaded / e.total;
+			}
+
+			// finally update the progress bar
+			if (percent !== null) {
+				percent = Math.min(1, Math.max(0, percent));
+				// update loaded bar
+				if (t.loaded && t.total) {
+					t.loaded.width(t.total.width() * percent);
+				}
+			}
+		},
+		setCurrentRail: function() {
+
+			var t = this;
+		
+			if (t.media.currentTime !== undefined && t.media.duration) {
+
+				// update bar and handle
+				if (t.total && t.handle) {
+					var 
+						newWidth = Math.round(t.total.width() * t.media.currentTime / t.media.duration),
+						handlePos = newWidth - Math.round(t.handle.outerWidth(true) / 2);
+
+					t.current.width(newWidth);
+					t.handle.css('left', handlePos);
+				}
+			}
+
+		}
+	});
+})(mejs.$);
+
+(function($) {
+	
+	// options
+	$.extend(mejs.MepDefaults, {
+		duration: -1,
+		timeAndDurationSeparator: '<span> | </span>'
+	});
+
+
+	// current and duration 00:00 / 00:00
+	$.extend(MediaElementPlayer.prototype, {
+		buildcurrent: function(player, controls, layers, media) {
+			var t = this;
+			
+			$('<div class="mejs-time" role="timer" aria-live="off">' +
+					'<span class="mejs-currenttime">' + 
+						mejs.Utility.secondsToTimeCode(0, player.options) +
+                    '</span>'+
+				'</div>')
+			.appendTo(controls);
+			
+			t.currenttime = t.controls.find('.mejs-currenttime');
+
+			media.addEventListener('timeupdate',function() {
+				if (t.controlsAreVisible) {
+					player.updateCurrent();
+				}
+
+			}, false);
+		},
+
+
+		buildduration: function(player, controls, layers, media) {
+			var t = this;
+			
+			if (controls.children().last().find('.mejs-currenttime').length > 0) {
+				$(t.options.timeAndDurationSeparator +
+					'<span class="mejs-duration">' + 
+						mejs.Utility.secondsToTimeCode(t.options.duration, t.options) +
+					'</span>')
+					.appendTo(controls.find('.mejs-time'));
+			} else {
+
+				// add class to current time
+				controls.find('.mejs-currenttime').parent().addClass('mejs-currenttime-container');
+				
+				$('<div class="mejs-time mejs-duration-container">'+
+					'<span class="mejs-duration">' + 
+						mejs.Utility.secondsToTimeCode(t.options.duration, t.options) +
+					'</span>' +
+				'</div>')
+				.appendTo(controls);
+			}
+			
+			t.durationD = t.controls.find('.mejs-duration');
+
+			media.addEventListener('timeupdate',function() {
+				if (t.controlsAreVisible) {
+					player.updateDuration();
+				}
+			}, false);
+		},
+		
+		updateCurrent:  function() {
+			var t = this;
+			
+			var currentTime = t.media.currentTime;
+			
+			if (isNaN(currentTime)) {
+				currentTime = 0;
+			}
+
+			if (t.currenttime) {
+				t.currenttime.html(mejs.Utility.secondsToTimeCode(currentTime, t.options));
+			}
+		},
+		
+		updateDuration: function() {
+			var t = this;
+			
+			var duration = t.media.duration;
+			if (t.options.duration > 0) {
+				duration = t.options.duration;
+			}
+			
+			if (isNaN(duration)) {
+				duration = 0;
+			}
+
+			//Toggle the long video class if the video is longer than an hour.
+			t.container.toggleClass("mejs-long-video", duration > 3600);
+			
+			if (t.durationD && duration > 0) {
+				t.durationD.html(mejs.Utility.secondsToTimeCode(duration, t.options));
+			}		
+		}
+	});
+
+})(mejs.$);
+
+(function($) {
+
+	$.extend(mejs.MepDefaults, {
+		muteText: mejs.i18n.t('Mute Toggle'),
+        allyVolumeControlText: mejs.i18n.t('Use Up/Down Arrow keys to increase or decrease volume.'),
+		hideVolumeOnTouchDevices: true,
+		
+		audioVolume: 'horizontal',
+		videoVolume: 'vertical'
+	});
+
+	$.extend(MediaElementPlayer.prototype, {
+		buildvolume: function(player, controls, layers, media) {
+				
+			// Android and iOS don't support volume controls
+			if ((mejs.MediaFeatures.isAndroid || mejs.MediaFeatures.isiOS) && this.options.hideVolumeOnTouchDevices)
+				return;
+			
+			var t = this,
+				mode = (t.isVideo) ? t.options.videoVolume : t.options.audioVolume,
+				mute = (mode == 'horizontal') ?
+				
+				// horizontal version
+				$('<div class="mejs-button mejs-volume-button mejs-mute">' +
+					'<button type="button" aria-controls="' + t.id + 
+						'" title="' + t.options.muteText + 
+						'" aria-label="' + t.options.muteText +
+					'"></button>'+
+				'</div>' +
+                  '<a href="javascript:void(0);" class="mejs-horizontal-volume-slider">' + // outer background
+					'<span class="mejs-offscreen">' + t.options.allyVolumeControlText + '</span>' +
+					'<div class="mejs-horizontal-volume-total"></div>'+ // line background
+					'<div class="mejs-horizontal-volume-current"></div>'+ // current volume
+					'<div class="mejs-horizontal-volume-handle"></div>'+ // handle
+				'</a>'
+				)
+					.appendTo(controls) :
+				
+				// vertical version
+				$('<div class="mejs-button mejs-volume-button mejs-mute">'+
+					'<button type="button" aria-controls="' + t.id + 
+						'" title="' + t.options.muteText + 
+						'" aria-label="' + t.options.muteText + 
+					'"></button>'+
+					'<a href="javascript:void(0);" class="mejs-volume-slider">'+ // outer background
+						'<span class="mejs-offscreen">' + t.options.allyVolumeControlText + '</span>' +                  
+						'<div class="mejs-volume-total"></div>'+ // line background
+						'<div class="mejs-volume-current"></div>'+ // current volume
+						'<div class="mejs-volume-handle"></div>'+ // handle
+					'</a>'+
+				'</div>')
+					.appendTo(controls),
+			volumeSlider = t.container.find('.mejs-volume-slider, .mejs-horizontal-volume-slider'),
+			volumeTotal = t.container.find('.mejs-volume-total, .mejs-horizontal-volume-total'),
+			volumeCurrent = t.container.find('.mejs-volume-current, .mejs-horizontal-volume-current'),
+			volumeHandle = t.container.find('.mejs-volume-handle, .mejs-horizontal-volume-handle'),
+
+			positionVolumeHandle = function(volume, secondTry) {
+
+				if (!volumeSlider.is(':visible') && typeof secondTry == 'undefined') {
+					volumeSlider.show();
+					positionVolumeHandle(volume, true);
+					volumeSlider.hide();
+					return;
+				}
+
+				// correct to 0-1
+				volume = Math.max(0,volume);
+				volume = Math.min(volume,1);
+
+				// ajust mute button style
+				if (volume === 0) {
+					mute.removeClass('mejs-mute').addClass('mejs-unmute');
+					mute.children('button').attr('title', mejs.i18n.t('Unmute')).attr('aria-label', mejs.i18n.t('Unmute'));
+				} else {
+					mute.removeClass('mejs-unmute').addClass('mejs-mute');
+					mute.children('button').attr('title', mejs.i18n.t('Mute')).attr('aria-label', mejs.i18n.t('Mute'));
+				}
+
+                // top/left of full size volume slider background
+                var totalPosition = volumeTotal.position();
+				// position slider 
+				if (mode == 'vertical') {
+					var
+                    // height of the full size volume slider background
+						totalHeight = volumeTotal.height(),
+
+                        // the new top position based on the current volume
+						// 70% volume on 100px height == top:30px
+						newTop = totalHeight - (totalHeight * volume);
+	
+					// handle
+					volumeHandle.css('top', Math.round(totalPosition.top + newTop - (volumeHandle.height() / 2)));
+	
+					// show the current visibility
+					volumeCurrent.height(totalHeight - newTop );
+					volumeCurrent.css('top', totalPosition.top + newTop);
+				} else {
+                    var
+						// height of the full size volume slider background
+						totalWidth = volumeTotal.width(),
+						
+						// the new left position based on the current volume
+						newLeft = totalWidth * volume;
+	
+					// handle
+					volumeHandle.css('left', Math.round(totalPosition.left + newLeft - (volumeHandle.width() / 2)));
+	
+					// rezize the current part of the volume bar
+					volumeCurrent.width( Math.round(newLeft) );
+				}
+			},
+			handleVolumeMove = function(e) {
+				
+				var volume = null,
+					totalOffset = volumeTotal.offset();
+				
+				// calculate the new volume based on the moust position
+				if (mode === 'vertical') {
+				
+					var
+						railHeight = volumeTotal.height(),
+						newY = e.pageY - totalOffset.top;
+						
+					volume = (railHeight - newY) / railHeight;
+						
+					// the controls just hide themselves (usually when mouse moves too far up)
+					if (totalOffset.top === 0 || totalOffset.left === 0) {
+						return;
+                    }
+					
+				} else {
+					var
+						railWidth = volumeTotal.width(),
+						newX = e.pageX - totalOffset.left;
+						
+					volume = newX / railWidth;
+				}
+				
+				// ensure the volume isn't outside 0-1
+				volume = Math.max(0,volume);
+				volume = Math.min(volume,1);
+				
+				// position the slider and handle
+				positionVolumeHandle(volume);
+				
+				// set the media object (this will trigger the volumechanged event)
+				if (volume === 0) {
+					media.setMuted(true);
+				} else {
+					media.setMuted(false);
+				}
+				media.setVolume(volume);
+			},
+			mouseIsDown = false,
+			mouseIsOver = false;
+
+			// SLIDER
+			
+			mute
+				.hover(function() {
+					volumeSlider.show();
+					mouseIsOver = true;
+				}, function() {
+					mouseIsOver = false;
+						
+					if (!mouseIsDown && mode == 'vertical')	{
+						volumeSlider.hide();
+					}
+				});
+            
+            var updateVolumeSlider = function (e) {
+
+                var volume = Math.floor(media.volume*100);
+
+				volumeSlider.attr({
+					'aria-label': mejs.i18n.t('Volume Slider'),
+					'aria-valuemin': 0,
+					'aria-valuemax': 100,
+					'aria-valuenow': volume,
+					'aria-valuetext': volume+'%',
+					'role': 'slider',
+					'tabindex': 0
+				});
+
+			};
+			
+			volumeSlider
+				.bind('mouseover', function() {
+					mouseIsOver = true;	
+				})
+				.bind('mousedown', function (e) {
+					handleVolumeMove(e);
+					t.globalBind('mousemove.vol', function(e) {
+						handleVolumeMove(e);
+					});
+					t.globalBind('mouseup.vol', function () {
+						mouseIsDown = false;
+						t.globalUnbind('.vol');
+
+						if (!mouseIsOver && mode == 'vertical') {
+							volumeSlider.hide();
+						}
+					});
+					mouseIsDown = true;
+						
+					return false;
+				})
+				.bind('keydown', function (e) {
+					var keyCode = e.keyCode;
+					var volume = media.volume;
+					switch (keyCode) {
+                        case 38: // Up
+                            volume = Math.min(volume + 0.1, 1);
+                            break;
+                        case 40: // Down
+                            volume = Math.max(0, volume - 0.1);
+                            break;
+                        default:
+                            return true;
+                    }
+
+					mouseIsDown = false;
+					positionVolumeHandle(volume);
+					media.setVolume(volume);
+					return false;
+				});
+
+			// MUTE button
+			mute.find('button').click(function() {
+				media.setMuted( !media.muted );
+			});
+            
+            //Keyboard input
+            mute.find('button').bind('focus', function () {
+				volumeSlider.show();
+			});
+
+			// listen for volume change events from other sources
+			media.addEventListener('volumechange', function(e) {
+				if (!mouseIsDown) {
+					if (media.muted) {
+						positionVolumeHandle(0);
+						mute.removeClass('mejs-mute').addClass('mejs-unmute');
+					} else {
+						positionVolumeHandle(media.volume);
+						mute.removeClass('mejs-unmute').addClass('mejs-mute');
+					}
+				}
+				updateVolumeSlider(e);
+			}, false);
+			
+			// mutes the media and sets the volume icon muted if the initial volume is set to 0
+			if (player.options.startVolume === 0) {
+				media.setMuted(true);
+			}
+			
+			// shim gets the startvolume as a parameter, but we have to set it on the native <video> and <audio> elements
+			if (media.pluginType === 'native') {
+				media.setVolume(player.options.startVolume);
+			}
+			
+			t.container.on('controlsresize', function() {
+				if (media.muted) {
+					positionVolumeHandle(0);
+					mute.removeClass('mejs-mute').addClass('mejs-unmute');
+				} else {
+					positionVolumeHandle(media.volume);
+					mute.removeClass('mejs-unmute').addClass('mejs-mute');
+				}
+			});
+		}
+	});
+	
+})(mejs.$);
+
+(function($) {
+
+	$.extend(mejs.MepDefaults, {
+		usePluginFullScreen: true,
+		newWindowCallback: function() { return '';},
+		fullscreenText: mejs.i18n.t('Fullscreen')
+	});
+
+	$.extend(MediaElementPlayer.prototype, {
+
+		isFullScreen: false,
+
+		isNativeFullScreen: false,
+
+		isInIframe: false,
+							
+		// Possible modes
+		// (1) 'native-native' 	HTML5 video  + browser fullscreen (IE10+, etc.)
+		// (2) 'plugin-native' 	plugin video + browser fullscreen (fails in some versions of Firefox)
+		// (3) 'fullwindow' 	Full window (retains all UI)
+		// usePluginFullScreen = true
+		// (4) 'plugin-click' 	Flash 1 - click through with pointer events
+		// (5) 'plugin-hover' 	Flash 2 - hover popup in flash (IE6-8)		
+		fullscreenMode: '',
+
+		buildfullscreen: function(player, controls, layers, media) {
+
+			if (!player.isVideo)
+				return;
+				
+			player.isInIframe = (window.location != window.parent.location);	
+		
+			// detect on start
+			media.addEventListener('loadstart', function() { player.detectFullscreenMode(); });
+				
+			// build button
+			var t = this,
+				hideTimeout = null,
+				fullscreenBtn =
+					$('<div class="mejs-button mejs-fullscreen-button">' +
+						'<button type="button" aria-controls="' + t.id + '" title="' + t.options.fullscreenText + '" aria-label="' + t.options.fullscreenText + '"></button>' +
+					'</div>')
+					.appendTo(controls)
+					.on('click', function() {
+						
+						// toggle fullscreen
+						var isFullScreen = (mejs.MediaFeatures.hasTrueNativeFullScreen && mejs.MediaFeatures.isFullScreen()) || player.isFullScreen;
+	
+						if (isFullScreen) {
+							player.exitFullScreen();
+						} else {
+							player.enterFullScreen();
+						}
+					})										
+					.on('mouseover', function() {
+						
+						// very old browsers with a plugin
+						if (t.fullscreenMode == 'plugin-hover') {						
+							if (hideTimeout !== null) {
+								clearTimeout(hideTimeout);
+								delete hideTimeout;
+							}
+	
+							var buttonPos = fullscreenBtn.offset(),
+								containerPos = player.container.offset();
+	
+							media.positionFullscreenButton(buttonPos.left - containerPos.left, buttonPos.top - containerPos.top, true);
+						}
+
+					})
+					.on('mouseout', function() {
+
+						if (t.fullscreenMode == 'plugin-hover') {						
+							if (hideTimeout !== null) {
+								clearTimeout(hideTimeout);
+								delete hideTimeout;
+							}
+	
+							hideTimeout = setTimeout(function() {
+								media.hideFullscreenButton();
+							}, 1500);
+						}
+
+					});
+
+					
+
+			player.fullscreenBtn = fullscreenBtn;
+
+			t.globalBind('keydown',function (e) {
+				if (e.keyCode == 27 && ((mejs.MediaFeatures.hasTrueNativeFullScreen && mejs.MediaFeatures.isFullScreen()) || t.isFullScreen)) {
+					player.exitFullScreen();
+				}
+			});
+			
+			t.normalHeight = 0;
+			t.normalWidth = 0;					
+					
+			// setup native fullscreen event
+			if (mejs.MediaFeatures.hasTrueNativeFullScreen) {
+
+				// chrome doesn't alays fire this in an iframe
+				var fullscreenChanged = function(e) {
+					if (player.isFullScreen) {
+						if (mejs.MediaFeatures.isFullScreen()) {
+							player.isNativeFullScreen = true;
+							// reset the controls once we are fully in full screen
+							player.setControlsSize();
+						} else {
+							player.isNativeFullScreen = false;
+							// when a user presses ESC
+							// make sure to put the player back into place
+							player.exitFullScreen();
+						}
+					}
+				};
+
+				player.globalBind(mejs.MediaFeatures.fullScreenEventName, fullscreenChanged);
+			}
+
+		},
+		
+		detectFullscreenMode: function() {
+			
+			var t = this,
+				mode = '',
+				features = mejs.MediaFeatures;
+			
+			if (features.hasTrueNativeFullScreen && t.media.pluginType === 'native') {
+				mode = 'native-native';
+			} else if (features.hasTrueNativeFullScreen && t.media.pluginType !== 'native' && !features.hasFirefoxPluginMovingProblem) {
+				mode = 'plugin-native';					
+			} else if (t.usePluginFullScreen) { 
+				if (mejs.MediaFeatures.supportsPointerEvents) {
+					mode = 'plugin-click';
+					// this needs some special setup
+					t.createPluginClickThrough();				
+				} else { 
+					mode = 'plugin-hover';
+				}
+				
+			} else {
+				mode = 'fullwindow';
+			}
+			
+			
+			t.fullscreenMode = mode;		
+			return mode;
+		},
+		
+		isPluginClickThroughCreated: false,
+		
+		createPluginClickThrough: function() {
+				
+			var t = this;
+			
+			// don't build twice
+			if (t.isPluginClickThroughCreated) {
+				return;
+			}	
+
+			// allows clicking through the fullscreen button and controls down directly to Flash
+
+			/*
+			 When a user puts his mouse over the fullscreen button, we disable the controls so that mouse events can go down to flash (pointer-events)
+			 We then put a divs over the video and on either side of the fullscreen button
+			 to capture mouse movement and restore the controls once the mouse moves outside of the fullscreen button
+			*/
+
+			var fullscreenIsDisabled = false,
+				restoreControls = function() {
+					if (fullscreenIsDisabled) {
+						// hide the hovers
+						for (var i in hoverDivs) {
+							hoverDivs[i].hide();
+						}
+
+						// restore the control bar
+						t.fullscreenBtn.css('pointer-events', '');
+						t.controls.css('pointer-events', '');
+
+						// prevent clicks from pausing video
+						t.media.removeEventListener('click', t.clickToPlayPauseCallback);
+
+						// store for later
+						fullscreenIsDisabled = false;
+					}
+				},
+				hoverDivs = {},
+				hoverDivNames = ['top', 'left', 'right', 'bottom'],
+				i, len,
+				positionHoverDivs = function() {
+					var fullScreenBtnOffsetLeft = fullscreenBtn.offset().left - t.container.offset().left,
+						fullScreenBtnOffsetTop = fullscreenBtn.offset().top - t.container.offset().top,
+						fullScreenBtnWidth = fullscreenBtn.outerWidth(true),
+						fullScreenBtnHeight = fullscreenBtn.outerHeight(true),
+						containerWidth = t.container.width(),
+						containerHeight = t.container.height();
+
+					for (i in hoverDivs) {
+						hoverDivs[i].css({position: 'absolute', top: 0, left: 0}); //, backgroundColor: '#f00'});
+					}
+
+					// over video, but not controls
+					hoverDivs['top']
+						.width( containerWidth )
+						.height( fullScreenBtnOffsetTop );
+
+					// over controls, but not the fullscreen button
+					hoverDivs['left']
+						.width( fullScreenBtnOffsetLeft )
+						.height( fullScreenBtnHeight )
+						.css({top: fullScreenBtnOffsetTop});
+
+					// after the fullscreen button
+					hoverDivs['right']
+						.width( containerWidth - fullScreenBtnOffsetLeft - fullScreenBtnWidth )
+						.height( fullScreenBtnHeight )
+						.css({top: fullScreenBtnOffsetTop,
+							 left: fullScreenBtnOffsetLeft + fullScreenBtnWidth});
+
+					// under the fullscreen button
+					hoverDivs['bottom']
+						.width( containerWidth )
+						.height( containerHeight - fullScreenBtnHeight - fullScreenBtnOffsetTop )
+						.css({top: fullScreenBtnOffsetTop + fullScreenBtnHeight});
+				};
+
+			t.globalBind('resize', function() {
+				positionHoverDivs();
+			});
+
+			for (i = 0, len = hoverDivNames.length; i < len; i++) {
+				hoverDivs[hoverDivNames[i]] = $('<div class="mejs-fullscreen-hover" />').appendTo(t.container).mouseover(restoreControls).hide();
+			}
+
+			// on hover, kill the fullscreen button's HTML handling, allowing clicks down to Flash
+			fullscreenBtn.on('mouseover',function() {
+
+				if (!t.isFullScreen) {
+
+					var buttonPos = fullscreenBtn.offset(),
+						containerPos = player.container.offset();
+
+					// move the button in Flash into place
+					media.positionFullscreenButton(buttonPos.left - containerPos.left, buttonPos.top - containerPos.top, false);
+
+					// allows click through
+					t.fullscreenBtn.css('pointer-events', 'none');
+					t.controls.css('pointer-events', 'none');
+
+					// restore click-to-play
+					t.media.addEventListener('click', t.clickToPlayPauseCallback);
+
+					// show the divs that will restore things
+					for (i in hoverDivs) {
+						hoverDivs[i].show();
+					}
+
+					positionHoverDivs();
+
+					fullscreenIsDisabled = true;
+				}
+
+			});
+
+			// restore controls anytime the user enters or leaves fullscreen
+			media.addEventListener('fullscreenchange', function(e) {
+				t.isFullScreen = !t.isFullScreen;
+				// don't allow plugin click to pause video - messes with
+				// plugin's controls
+				if (t.isFullScreen) {
+					t.media.removeEventListener('click', t.clickToPlayPauseCallback);
+				} else {
+					t.media.addEventListener('click', t.clickToPlayPauseCallback);
+				}
+				restoreControls();
+			});
+
+
+			// the mouseout event doesn't work on the fullscren button, because we already killed the pointer-events
+			// so we use the document.mousemove event to restore controls when the mouse moves outside the fullscreen button
+
+			t.globalBind('mousemove', function(e) {
+
+				// if the mouse is anywhere but the fullsceen button, then restore it all
+				if (fullscreenIsDisabled) {
+
+					var fullscreenBtnPos = fullscreenBtn.offset();
+
+
+					if (e.pageY < fullscreenBtnPos.top || e.pageY > fullscreenBtnPos.top + fullscreenBtn.outerHeight(true) ||
+						e.pageX < fullscreenBtnPos.left || e.pageX > fullscreenBtnPos.left + fullscreenBtn.outerWidth(true)
+						) {
+
+						fullscreenBtn.css('pointer-events', '');
+						t.controls.css('pointer-events', '');
+
+						fullscreenIsDisabled = false;
+					}
+				}
+			});
+
+
+			t.isPluginClickThroughCreated = true;
+		},		
+
+		cleanfullscreen: function(player) {
+			player.exitFullScreen();
+		},
+
+        containerSizeTimeout: null,
+
+		enterFullScreen: function() {
+
+			var t = this;
+
+			if (mejs.MediaFeatures.isiOS && mejs.MediaFeatures.hasiOSFullScreen && typeof t.media.webkitEnterFullscreen === 'function') {
+			    t.media.webkitEnterFullscreen();
+				return;
+			}
+
+			// set it to not show scroll bars so 100% will work
+            $(document.documentElement).addClass('mejs-fullscreen');
+
+			// store sizing
+			t.normalHeight = t.container.height();
+			t.normalWidth = t.container.width();
+
+
+
+			// attempt to do true fullscreen
+			if (t.fullscreenMode === 'native-native' || t.fullscreenMode === 'plugin-native') {
+
+				mejs.MediaFeatures.requestFullScreen(t.container[0]);
+				//return;
+
+				if (t.isInIframe) {
+					// sometimes exiting from fullscreen doesn't work
+					// notably in Chrome <iframe>. Fixed in version 17
+					setTimeout(function checkFullscreen() {
+
+						if (t.isNativeFullScreen) {
+							var percentErrorMargin = 0.002, // 0.2%
+								windowWidth = $(window).width(),
+								screenWidth = screen.width,
+								absDiff = Math.abs(screenWidth - windowWidth),
+								marginError = screenWidth * percentErrorMargin;
+
+							// check if the video is suddenly not really fullscreen
+							if (absDiff > marginError) {
+								// manually exit
+								t.exitFullScreen();
+							} else {
+								// test again
+								setTimeout(checkFullscreen, 500);
+							}
+						}
+						
+					}, 1000);
+				}
+				
+			} else if (t.fullscreeMode == 'fullwindow') {				
+				// move into position
+				
+			}			
+			
+			// make full size
+			t.container
+				.addClass('mejs-container-fullscreen')
+				.width('100%')
+				.height('100%');
+				//.css({position: 'fixed', left: 0, top: 0, right: 0, bottom: 0, overflow: 'hidden', width: '100%', height: '100%', 'z-index': 1000});
+
+			// Only needed for safari 5.1 native full screen, can cause display issues elsewhere
+			// Actually, it seems to be needed for IE8, too
+			//if (mejs.MediaFeatures.hasTrueNativeFullScreen) {
+				t.containerSizeTimeout = setTimeout(function() {
+					t.container.css({width: '100%', height: '100%'});
+					t.setControlsSize();
+				}, 500);
+			//}
+
+			if (t.media.pluginType === 'native') {
+				t.$media
+					.width('100%')
+					.height('100%');
+			} else {
+				t.container.find('.mejs-shim')
+					.width('100%')
+					.height('100%');	
+				
+				setTimeout(function() {
+					var win = $(window),
+						winW = win.width(),
+						winH = win.height();
+							
+					t.media.setVideoSize(winW,winH);			
+				}, 500);
+			}
+
+			t.layers.children('div')
+				.width('100%')
+				.height('100%');
+
+			if (t.fullscreenBtn) {
+				t.fullscreenBtn
+					.removeClass('mejs-fullscreen')
+					.addClass('mejs-unfullscreen');
+			}
+
+			t.setControlsSize();
+			t.isFullScreen = true;
+
+			t.container.find('.mejs-captions-text').css('font-size', screen.width / t.width * 1.00 * 100 + '%');
+			t.container.find('.mejs-captions-position').css('bottom', '45px');
+
+			t.container.trigger('enteredfullscreen');
+		},
+
+		exitFullScreen: function() {
+
+			var t = this;
+
+            // Prevent container from attempting to stretch a second time
+            clearTimeout(t.containerSizeTimeout);
+
+			// firefox can't adjust plugins
+			/*
+			if (t.media.pluginType !== 'native' && mejs.MediaFeatures.isFirefox) {
+				t.media.setFullscreen(false);
+				//player.isFullScreen = false;
+				return;
+			}
+			*/
+
+			// come out of native fullscreen
+			if (mejs.MediaFeatures.hasTrueNativeFullScreen && (mejs.MediaFeatures.isFullScreen() || t.isFullScreen)) {
+				mejs.MediaFeatures.cancelFullScreen();
+			}
+
+			// restore scroll bars to document
+            $(document.documentElement).removeClass('mejs-fullscreen');
+
+			t.container
+				.removeClass('mejs-container-fullscreen')
+				.width(t.normalWidth)
+				.height(t.normalHeight);
+
+			if (t.media.pluginType === 'native') {
+				t.$media
+					.width(t.normalWidth)
+					.height(t.normalHeight);
+			} else {
+				t.container.find('.mejs-shim')
+					.width(t.normalWidth)
+					.height(t.normalHeight);
+
+				t.media.setVideoSize(t.normalWidth, t.normalHeight);
+			}
+
+			t.layers.children('div')
+				.width(t.normalWidth)
+				.height(t.normalHeight);
+
+			t.fullscreenBtn
+				.removeClass('mejs-unfullscreen')
+				.addClass('mejs-fullscreen');
+
+			t.setControlsSize();
+			t.isFullScreen = false;
+
+			t.container.find('.mejs-captions-text').css('font-size','');
+			t.container.find('.mejs-captions-position').css('bottom', '');
+
+			t.container.trigger('exitedfullscreen');
+		}
+	});
+
+})(mejs.$);
+
+(function($) {
+
+	// Speed
+	$.extend(mejs.MepDefaults, {
+
+		// We also support to pass object like this:
+		// [{name: 'Slow', value: '0.75'}, {name: 'Normal', value: '1.00'}, ...]
+		speeds: ['2.00', '1.50', '1.25', '1.00', '0.75'],
+
+		defaultSpeed: '1.00',
+		
+		speedChar: 'x'
+
+	});
+
+	$.extend(MediaElementPlayer.prototype, {
+
+		buildspeed: function(player, controls, layers, media) {
+			var t = this;
+
+			if (t.media.pluginType == 'native') {
+				var 
+					speedButton = null,
+					speedSelector = null,
+					playbackSpeed = null,
+					inputId = null;
+
+				var speeds = [];
+				var defaultInArray = false;
+				for (var i=0, len=t.options.speeds.length; i < len; i++) {
+					var s = t.options.speeds[i];
+					if (typeof(s) === 'string'){
+						speeds.push({
+							name: s + t.options.speedChar,
+							value: s
+						});
+						if(s === t.options.defaultSpeed) {
+							defaultInArray = true;
+						}
+					}
+					else {
+						speeds.push(s);
+						if(s.value === t.options.defaultSpeed) {
+							defaultInArray = true;
+						}
+					}
+				}
+
+				if (!defaultInArray) {
+					speeds.push({
+						name: t.options.defaultSpeed + t.options.speedChar,
+						value: t.options.defaultSpeed
+					});
+				}
+
+				speeds.sort(function(a, b) {
+					return parseFloat(b.value) - parseFloat(a.value);
+				});
+
+				var getSpeedNameFromValue = function(value) {
+					for(i=0,len=speeds.length; i <len; i++) {
+						if (speeds[i].value === value) {
+							return speeds[i].name;
+						}
+					}
+				};
+
+				var html = '<div class="mejs-button mejs-speed-button">' +
+							'<button type="button">' + getSpeedNameFromValue(t.options.defaultSpeed) + '</button>' +
+							'<div class="mejs-speed-selector">' +
+							'<ul>';
+
+				for (i = 0, il = speeds.length; i<il; i++) {
+					inputId = t.id + '-speed-' + speeds[i].value;
+					html += '<li>' + 
+								'<input type="radio" name="speed" ' + 
+											'value="' + speeds[i].value + '" ' +
+											'id="' + inputId + '" ' +
+											(speeds[i].value === t.options.defaultSpeed ? ' checked' : '') +
+											' />' +
+								'<label for="' + inputId + '" ' +
+											(speeds[i].value === t.options.defaultSpeed ? ' class="mejs-speed-selected"' : '') +
+											'>' + speeds[i].name + '</label>' +
+							'</li>';
+				}
+				html += '</ul></div></div>';
+
+				speedButton = $(html).appendTo(controls);
+				speedSelector = speedButton.find('.mejs-speed-selector');
+
+				playbackSpeed = t.options.defaultSpeed;
+
+				media.addEventListener('loadedmetadata', function(e) {
+					if (playbackSpeed) {
+						media.playbackRate = parseFloat(playbackSpeed);
+					}
+				}, true);
+
+				speedSelector
+					.on('click', 'input[type="radio"]', function() {
+						var newSpeed = $(this).attr('value');
+						playbackSpeed = newSpeed;
+						media.playbackRate = parseFloat(newSpeed);
+						speedButton.find('button').html(getSpeedNameFromValue(newSpeed));
+						speedButton.find('.mejs-speed-selected').removeClass('mejs-speed-selected');
+						speedButton.find('input[type="radio"]:checked').next().addClass('mejs-speed-selected');
+					});
+				speedButton
+					.one( 'mouseenter focusin', function() {
+						speedSelector
+							.height(
+								speedButton.find('.mejs-speed-selector ul').outerHeight(true) +
+								speedButton.find('.mejs-speed-translations').outerHeight(true))
+							.css('top', (-1 * speedSelector.height()) + 'px');
+					});
+			}
+		}
+	});
+
+})(mejs.$);
+
+(function($) {
+
+	// add extra default options
+	$.extend(mejs.MepDefaults, {
+		// this will automatically turn on a <track>
+		startLanguage: '',
+
+		tracksText: mejs.i18n.t('Captions/Subtitles'),
+
+		// By default, no WAI-ARIA live region - don't make a
+		// screen reader speak captions over an audio track.
+		tracksAriaLive: false,
+
+		// option to remove the [cc] button when no <track kind="subtitles"> are present
+		hideCaptionsButtonWhenEmpty: true,
+
+		// If true and we only have one track, change captions to popup
+		toggleCaptionsButtonWhenOnlyOne: false,
+
+		// #id or .class
+		slidesSelector: ''
+	});
+
+	$.extend(MediaElementPlayer.prototype, {
+
+		hasChapters: false,
+
+		cleartracks: function(player, controls, layers, media){
+			if(player) {
+				if(player.captions) player.captions.remove();
+				if(player.chapters) player.chapters.remove();
+				if(player.captionsText) player.captionsText.remove();
+				if(player.captionsButton) player.captionsButton.remove();
+			}
+		},
+		buildtracks: function(player, controls, layers, media) {
+			if (player.tracks.length === 0)
+				return;
+
+			var t = this,
+				attr = t.options.tracksAriaLive ?
+					'role="log" aria-live="assertive" aria-atomic="false"' : '',
+				i,
+				kind;
+
+			if (t.domNode.textTracks) { // if browser will do native captions, prefer mejs captions, loop through tracks and hide
+				for (i = t.domNode.textTracks.length - 1; i >= 0; i--) {
+					t.domNode.textTracks[i].mode = "hidden";
+				}
+			}
+			t.cleartracks(player, controls, layers, media);
+			player.chapters =
+					$('<div class="mejs-chapters mejs-layer"></div>')
+						.prependTo(layers).hide();
+			player.captions =
+					$('<div class="mejs-captions-layer mejs-layer"><div class="mejs-captions-position mejs-captions-position-hover" ' +
+					attr + '><span class="mejs-captions-text"></span></div></div>')
+						.prependTo(layers).hide();
+			player.captionsText = player.captions.find('.mejs-captions-text');
+			player.captionsButton =
+					$('<div class="mejs-button mejs-captions-button">'+
+						'<button type="button" aria-controls="' + t.id + '" title="' + t.options.tracksText + '" aria-label="' + t.options.tracksText + '"></button>'+
+						'<div class="mejs-captions-selector">'+
+							'<ul>'+
+								'<li>'+
+									'<input type="radio" name="' + player.id + '_captions" id="' + player.id + '_captions_none" value="none" checked="checked" />' +
+									'<label for="' + player.id + '_captions_none">' + mejs.i18n.t('None') +'</label>'+
+								'</li>'	+
+							'</ul>'+
+						'</div>'+
+					'</div>')
+						.appendTo(controls);
+
+
+			var subtitleCount = 0;
+			for (i=0; i<player.tracks.length; i++) {
+				kind = player.tracks[i].kind;
+				if (kind === 'subtitles' || kind === 'captions') {
+					subtitleCount++;
+				}
+			}
+
+			// if only one language then just make the button a toggle
+			if (t.options.toggleCaptionsButtonWhenOnlyOne && subtitleCount == 1){
+				// click
+				player.captionsButton.on('click',function() {
+					if (player.selectedTrack === null) {
+						lang = player.tracks[0].srclang;
+					} else {
+						lang = 'none';
+					}
+					player.setTrack(lang);
+				});
+			} else {
+				// hover or keyboard focus
+				player.captionsButton.on( 'mouseenter focusin', function() {
+					$(this).find('.mejs-captions-selector').removeClass('mejs-offscreen');
+				})
+
+				// handle clicks to the language radio buttons
+				.on('click','input[type=radio]',function() {
+					lang = this.value;
+					player.setTrack(lang);
+				});
+
+				player.captionsButton.on( 'mouseleave focusout', function() {
+					$(this).find(".mejs-captions-selector").addClass("mejs-offscreen");
+				});
+
+			}
+
+			if (!player.options.alwaysShowControls) {
+				// move with controls
+				player.container
+					.bind('controlsshown', function () {
+						// push captions above controls
+						player.container.find('.mejs-captions-position').addClass('mejs-captions-position-hover');
+
+					})
+					.bind('controlshidden', function () {
+						if (!media.paused) {
+							// move back to normal place
+							player.container.find('.mejs-captions-position').removeClass('mejs-captions-position-hover');
+						}
+					});
+			} else {
+				player.container.find('.mejs-captions-position').addClass('mejs-captions-position-hover');
+			}
+
+			player.trackToLoad = -1;
+			player.selectedTrack = null;
+			player.isLoadingTrack = false;
+
+			// add to list
+			for (i=0; i<player.tracks.length; i++) {
+				kind = player.tracks[i].kind;
+				if (kind === 'subtitles' || kind === 'captions') {
+					player.addTrackButton(player.tracks[i].srclang, player.tracks[i].label);
+				}
+			}
+
+			// start loading tracks
+			player.loadNextTrack();
+
+			media.addEventListener('timeupdate',function() {
+				player.displayCaptions();
+			}, false);
+
+			if (player.options.slidesSelector !== '') {
+				player.slidesContainer = $(player.options.slidesSelector);
+
+				media.addEventListener('timeupdate',function() {
+					player.displaySlides();
+				}, false);
+
+			}
+
+			media.addEventListener('loadedmetadata', function() {
+				player.displayChapters();
+			}, false);
+
+			player.container.hover(
+				function () {
+					// chapters
+					if (player.hasChapters) {
+						player.chapters.removeClass('mejs-offscreen');
+						player.chapters.fadeIn(200).height(player.chapters.find('.mejs-chapter').outerHeight());
+					}
+				},
+				function () {
+					if (player.hasChapters && !media.paused) {
+						player.chapters.fadeOut(200, function() {
+							$(this).addClass('mejs-offscreen');
+							$(this).css('display','block');
+						});
+					}
+				});
+
+			t.container.on('controlsresize', function() {
+				t.adjustLanguageBox();
+			});
+
+			// check for autoplay
+			if (player.node.getAttribute('autoplay') !== null) {
+				player.chapters.addClass('mejs-offscreen');
+			}
+		},
+
+		setTrack: function(lang){
+
+			var t = this,
+				i;
+
+			if (lang == 'none') {
+				t.selectedTrack = null;
+				t.captionsButton.removeClass('mejs-captions-enabled');
+			} else {
+				for (i=0; i<t.tracks.length; i++) {
+					if (t.tracks[i].srclang == lang) {
+						if (t.selectedTrack === null)
+							t.captionsButton.addClass('mejs-captions-enabled');
+						t.selectedTrack = t.tracks[i];
+						t.captions.attr('lang', t.selectedTrack.srclang);
+						t.displayCaptions();
+						break;
+					}
+				}
+			}
+		},
+
+		loadNextTrack: function() {
+			var t = this;
+
+			t.trackToLoad++;
+			if (t.trackToLoad < t.tracks.length) {
+				t.isLoadingTrack = true;
+				t.loadTrack(t.trackToLoad);
+			} else {
+				// add done?
+				t.isLoadingTrack = false;
+
+				t.checkForTracks();
+			}
+		},
+
+		loadTrack: function(index){
+			var
+				t = this,
+				track = t.tracks[index],
+				after = function() {
+
+					track.isLoaded = true;
+
+					t.enableTrackButton(track.srclang, track.label);
+
+					t.loadNextTrack();
+
+				};
+
+
+			$.ajax({
+				url: track.src,
+				dataType: "text",
+				success: function(d) {
+
+					// parse the loaded file
+					if (typeof d == "string" && (/<tt\s+xml/ig).exec(d)) {
+						track.entries = mejs.TrackFormatParser.dfxp.parse(d);
+					} else {
+						track.entries = mejs.TrackFormatParser.webvtt.parse(d);
+					}
+
+					after();
+
+					if (track.kind == 'chapters') {
+						t.media.addEventListener('play', function() {
+							if (t.media.duration > 0) {
+								t.displayChapters(track);
+							}
+						}, false);
+					}
+
+					if (track.kind == 'slides') {
+						t.setupSlides(track);
+					}
+				},
+				error: function() {
+					t.removeTrackButton(track.srclang);
+					t.loadNextTrack();
+				}
+			});
+		},
+
+		enableTrackButton: function(lang, label) {
+			var t = this;
+
+			if (label === '') {
+				label = mejs.language.codes[lang] || lang;
+			}
+
+			t.captionsButton
+				.find('input[value=' + lang + ']')
+					.prop('disabled',false)
+				.siblings('label')
+					.html( label );
+
+			// auto select
+			if (t.options.startLanguage == lang) {
+				$('#' + t.id + '_captions_' + lang).prop('checked', true).trigger('click');
+			}
+
+			t.adjustLanguageBox();
+		},
+
+		removeTrackButton: function(lang) {
+			var t = this;
+
+			t.captionsButton.find('input[value=' + lang + ']').closest('li').remove();
+
+			t.adjustLanguageBox();
+		},
+
+		addTrackButton: function(lang, label) {
+			var t = this;
+			if (label === '') {
+				label = mejs.language.codes[lang] || lang;
+			}
+
+			t.captionsButton.find('ul').append(
+				$('<li>'+
+					'<input type="radio" name="' + t.id + '_captions" id="' + t.id + '_captions_' + lang + '" value="' + lang + '" disabled="disabled" />' +
+					'<label for="' + t.id + '_captions_' + lang + '">' + label + ' (loading)' + '</label>'+
+				'</li>')
+			);
+
+			t.adjustLanguageBox();
+
+			// remove this from the dropdownlist (if it exists)
+			t.container.find('.mejs-captions-translations option[value=' + lang + ']').remove();
+		},
+
+		adjustLanguageBox:function() {
+			var t = this;
+			// adjust the size of the outer box
+			t.captionsButton.find('.mejs-captions-selector').height(
+				t.captionsButton.find('.mejs-captions-selector ul').outerHeight(true) +
+				t.captionsButton.find('.mejs-captions-translations').outerHeight(true)
+			);
+		},
+
+		checkForTracks: function() {
+			var
+				t = this,
+				hasSubtitles = false;
+
+			// check if any subtitles
+			if (t.options.hideCaptionsButtonWhenEmpty) {
+				for (var i=0; i<t.tracks.length; i++) {
+					var kind = t.tracks[i].kind;
+					if ((kind === 'subtitles' || kind === 'captions') && t.tracks[i].isLoaded) {
+						hasSubtitles = true;
+						break;
+					}
+				}
+
+				if (!hasSubtitles) {
+					t.captionsButton.hide();
+					t.setControlsSize();
+				}
+			}
+		},
+
+		displayCaptions: function() {
+
+			if (typeof this.tracks == 'undefined')
+				return;
+
+			var
+				t = this,
+				i,
+				track = t.selectedTrack;
+
+			if (track !== null && track.isLoaded) {
+				for (i=0; i<track.entries.times.length; i++) {
+					if (t.media.currentTime >= track.entries.times[i].start && t.media.currentTime <= track.entries.times[i].stop) {
+						// Set the line before the timecode as a class so the cue can be targeted if needed
+						t.captionsText.html(track.entries.text[i]).attr('class', 'mejs-captions-text ' + (track.entries.times[i].identifier || ''));
+						t.captions.show().height(0);
+						return; // exit out if one is visible;
+					}
+				}
+				t.captions.hide();
+			} else {
+				t.captions.hide();
+			}
+		},
+
+		setupSlides: function(track) {
+			var t = this;
+
+			t.slides = track;
+			t.slides.entries.imgs = [t.slides.entries.text.length];
+			t.showSlide(0);
+
+		},
+
+		showSlide: function(index) {
+			if (typeof this.tracks == 'undefined' || typeof this.slidesContainer == 'undefined') {
+				return;
+			}
+
+			var t = this,
+				url = t.slides.entries.text[index],
+				img = t.slides.entries.imgs[index];
+
+			if (typeof img == 'undefined' || typeof img.fadeIn == 'undefined') {
+
+				t.slides.entries.imgs[index] = img = $('<img src="' + url + '">')
+						.on('load', function() {
+							img.appendTo(t.slidesContainer)
+								.hide()
+								.fadeIn()
+								.siblings(':visible')
+									.fadeOut();
+
+						});
+
+			} else {
+
+				if (!img.is(':visible') && !img.is(':animated')) {
+
+					//
+
+					img.fadeIn()
+						.siblings(':visible')
+							.fadeOut();
+				}
+			}
+
+		},
+
+		displaySlides: function() {
+
+			if (typeof this.slides == 'undefined')
+				return;
+
+			var
+				t = this,
+				slides = t.slides,
+				i;
+
+			for (i=0; i<slides.entries.times.length; i++) {
+				if (t.media.currentTime >= slides.entries.times[i].start && t.media.currentTime <= slides.entries.times[i].stop){
+
+					t.showSlide(i);
+
+					return; // exit out if one is visible;
+				}
+			}
+		},
+
+		displayChapters: function() {
+			var
+				t = this,
+				i;
+
+			for (i=0; i<t.tracks.length; i++) {
+				if (t.tracks[i].kind == 'chapters' && t.tracks[i].isLoaded) {
+					t.drawChapters(t.tracks[i]);
+					t.hasChapters = true;
+					break;
+				}
+			}
+		},
+
+		drawChapters: function(chapters) {
+			var
+				t = this,
+				i,
+				dur,
+				//width,
+				//left,
+				percent = 0,
+				usedPercent = 0;
+
+			t.chapters.empty();
+
+			for (i=0; i<chapters.entries.times.length; i++) {
+				dur = chapters.entries.times[i].stop - chapters.entries.times[i].start;
+				percent = Math.floor(dur / t.media.duration * 100);
+				if (percent + usedPercent > 100 || // too large
+					i == chapters.entries.times.length-1 && percent + usedPercent < 100) // not going to fill it in
+					{
+					percent = 100 - usedPercent;
+				}
+				//width = Math.floor(t.width * dur / t.media.duration);
+				//left = Math.floor(t.width * chapters.entries.times[i].start / t.media.duration);
+				//if (left + width > t.width) {
+				//	width = t.width - left;
+				//}
+
+				t.chapters.append( $(
+					'<div class="mejs-chapter" rel="' + chapters.entries.times[i].start + '" style="left: ' + usedPercent.toString() + '%;width: ' + percent.toString() + '%;">' +
+						'<div class="mejs-chapter-block' + ((i==chapters.entries.times.length-1) ? ' mejs-chapter-block-last' : '') + '">' +
+							'<span class="ch-title">' + chapters.entries.text[i] + '</span>' +
+							'<span class="ch-time">' + mejs.Utility.secondsToTimeCode(chapters.entries.times[i].start, t.options) + '&ndash;' + mejs.Utility.secondsToTimeCode(chapters.entries.times[i].stop, t.options) + '</span>' +
+						'</div>' +
+					'</div>'));
+				usedPercent += percent;
+			}
+
+			t.chapters.find('div.mejs-chapter').click(function() {
+				t.media.setCurrentTime( parseFloat( $(this).attr('rel') ) );
+				if (t.media.paused) {
+					t.media.play();
+				}
+			});
+
+			t.chapters.show();
+		}
+	});
+
+
+
+	mejs.language = {
+		codes:  {
+			af:'Afrikaans',
+			sq:'Albanian',
+			ar:'Arabic',
+			be:'Belarusian',
+			bg:'Bulgarian',
+			ca:'Catalan',
+			zh:'Chinese',
+			'zh-cn':'Chinese Simplified',
+			'zh-tw':'Chinese Traditional',
+			hr:'Croatian',
+			cs:'Czech',
+			da:'Danish',
+			nl:'Dutch',
+			en:'English',
+			et:'Estonian',
+			fl:'Filipino',
+			fi:'Finnish',
+			fr:'French',
+			gl:'Galician',
+			de:'German',
+			el:'Greek',
+			ht:'Haitian Creole',
+			iw:'Hebrew',
+			hi:'Hindi',
+			hu:'Hungarian',
+			is:'Icelandic',
+			id:'Indonesian',
+			ga:'Irish',
+			it:'Italian',
+			ja:'Japanese',
+			ko:'Korean',
+			lv:'Latvian',
+			lt:'Lithuanian',
+			mk:'Macedonian',
+			ms:'Malay',
+			mt:'Maltese',
+			no:'Norwegian',
+			fa:'Persian',
+			pl:'Polish',
+			pt:'Portuguese',
+			// 'pt-pt':'Portuguese (Portugal)',
+			ro:'Romanian',
+			ru:'Russian',
+			sr:'Serbian',
+			sk:'Slovak',
+			sl:'Slovenian',
+			es:'Spanish',
+			sw:'Swahili',
+			sv:'Swedish',
+			tl:'Tagalog',
+			th:'Thai',
+			tr:'Turkish',
+			uk:'Ukrainian',
+			vi:'Vietnamese',
+			cy:'Welsh',
+			yi:'Yiddish'
+		}
+	};
+
+	/*
+	Parses WebVTT format which should be formatted as
+	================================
+	WEBVTT
+
+	1
+	00:00:01,1 --> 00:00:05,000
+	A line of text
+
+	2
+	00:01:15,1 --> 00:02:05,000
+	A second line of text
+
+	===============================
+
+	Adapted from: http://www.delphiki.com/html5/playr
+	*/
+	mejs.TrackFormatParser = {
+		webvtt: {
+			pattern_timecode: /^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,
+
+			parse: function(trackText) {
+				var
+					i = 0,
+					lines = mejs.TrackFormatParser.split2(trackText, /\r?\n/),
+					entries = {text:[], times:[]},
+					timecode,
+					text,
+					identifier;
+				for(; i<lines.length; i++) {
+					timecode = this.pattern_timecode.exec(lines[i]);
+
+					if (timecode && i<lines.length) {
+						if ((i - 1) >= 0 && lines[i - 1] !== '') {
+							identifier = lines[i - 1];
+						}
+						i++;
+						// grab all the (possibly multi-line) text that follows
+						text = lines[i];
+						i++;
+						while(lines[i] !== '' && i<lines.length){
+							text = text + '\n' + lines[i];
+							i++;
+						}
+						text = $.trim(text).replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>");
+						// Text is in a different array so I can use .join
+						entries.text.push(text);
+						entries.times.push(
+						{
+							identifier: identifier,
+							start: (mejs.Utility.convertSMPTEtoSeconds(timecode[1]) === 0) ? 0.200 : mejs.Utility.convertSMPTEtoSeconds(timecode[1]),
+							stop: mejs.Utility.convertSMPTEtoSeconds(timecode[3]),
+							settings: timecode[5]
+						});
+					}
+					identifier = '';
+				}
+				return entries;
+			}
+		},
+		// Thanks to Justin Capella: https://github.com/johndyer/mediaelement/pull/420
+		dfxp: {
+			parse: function(trackText) {
+				trackText = $(trackText).filter("tt");
+				var
+					i = 0,
+					container = trackText.children("div").eq(0),
+					lines = container.find("p"),
+					styleNode = trackText.find("#" + container.attr("style")),
+					styles,
+					text,
+					entries = {text:[], times:[]};
+
+
+				if (styleNode.length) {
+					var attributes = styleNode.removeAttr("id").get(0).attributes;
+					if (attributes.length) {
+						styles = {};
+						for (i = 0; i < attributes.length; i++) {
+							styles[attributes[i].name.split(":")[1]] = attributes[i].value;
+						}
+					}
+				}
+
+				for(i = 0; i<lines.length; i++) {
+					var style;
+					var _temp_times = {
+						start: null,
+						stop: null,
+						style: null
+					};
+					if (lines.eq(i).attr("begin")) _temp_times.start = mejs.Utility.convertSMPTEtoSeconds(lines.eq(i).attr("begin"));
+					if (!_temp_times.start && lines.eq(i-1).attr("end")) _temp_times.start = mejs.Utility.convertSMPTEtoSeconds(lines.eq(i-1).attr("end"));
+					if (lines.eq(i).attr("end")) _temp_times.stop = mejs.Utility.convertSMPTEtoSeconds(lines.eq(i).attr("end"));
+					if (!_temp_times.stop && lines.eq(i+1).attr("begin")) _temp_times.stop = mejs.Utility.convertSMPTEtoSeconds(lines.eq(i+1).attr("begin"));
+					if (styles) {
+						style = "";
+						for (var _style in styles) {
+							style += _style + ":" + styles[_style] + ";";
+						}
+					}
+					if (style) _temp_times.style = style;
+					if (_temp_times.start === 0) _temp_times.start = 0.200;
+					entries.times.push(_temp_times);
+					text = $.trim(lines.eq(i).html()).replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig, "<a href='$1' target='_blank'>$1</a>");
+					entries.text.push(text);
+				}
+				return entries;
+			}
+		},
+		split2: function (text, regex) {
+			// normal version for compliant browsers
+			// see below for IE fix
+			return text.split(regex);
+		}
+	};
+
+	// test for browsers with bad String.split method.
+	if ('x\n\ny'.split(/\n/gi).length != 3) {
+		// add super slow IE8 and below version
+		mejs.TrackFormatParser.split2 = function(text, regex) {
+			var
+				parts = [],
+				chunk = '',
+				i;
+
+			for (i=0; i<text.length; i++) {
+				chunk += text.substring(i,i+1);
+				if (regex.test(chunk)) {
+					parts.push(chunk.replace(regex, ''));
+					chunk = '';
+				}
+			}
+			parts.push(chunk);
+			return parts;
+		};
+	}
+
+})(mejs.$);
+
+/*
+* ContextMenu Plugin
+* 
+*
+*/
+
+(function($) {
+
+$.extend(mejs.MepDefaults,
+	{ 'contextMenuItems': [
+		// demo of a fullscreen option
+		{ 
+			render: function(player) {
+				
+				// check for fullscreen plugin
+				if (typeof player.enterFullScreen == 'undefined')
+					return null;
+			
+				if (player.isFullScreen) {
+					return mejs.i18n.t('Turn off Fullscreen');
+				} else {
+					return mejs.i18n.t('Go Fullscreen');
+				}
+			},
+			click: function(player) {
+				if (player.isFullScreen) {
+					player.exitFullScreen();
+				} else {
+					player.enterFullScreen();
+				}
+			}
+		}
+		,
+		// demo of a mute/unmute button
+		{ 
+			render: function(player) {
+				if (player.media.muted) {
+					return mejs.i18n.t('Unmute');
+				} else {
+					return mejs.i18n.t('Mute');
+				}
+			},
+			click: function(player) {
+				if (player.media.muted) {
+					player.setMuted(false);
+				} else {
+					player.setMuted(true);
+				}
+			}
+		},
+		// separator
+		{
+			isSeparator: true
+		}
+		,
+		// demo of simple download video
+		{ 
+			render: function(player) {
+				return mejs.i18n.t('Download Video');
+			},
+			click: function(player) {
+				window.location.href = player.media.currentSrc;
+			}
+		}	
+	]}
+);
+
+
+	$.extend(MediaElementPlayer.prototype, {
+		buildcontextmenu: function(player, controls, layers, media) {
+			
+			// create context menu
+			player.contextMenu = $('<div class="mejs-contextmenu"></div>')
+								.appendTo($('body'))
+								.hide();
+			
+			// create events for showing context menu
+			player.container.bind('contextmenu', function(e) {
+				if (player.isContextMenuEnabled) {
+					e.preventDefault();
+					player.renderContextMenu(e.clientX-1, e.clientY-1);
+					return false;
+				}
+			});
+			player.container.bind('click', function() {
+				player.contextMenu.hide();
+			});	
+			player.contextMenu.bind('mouseleave', function() {
+
+				//
+				player.startContextMenuTimer();
+				
+			});		
+		},
+
+		cleancontextmenu: function(player) {
+			player.contextMenu.remove();
+		},
+		
+		isContextMenuEnabled: true,
+		enableContextMenu: function() {
+			this.isContextMenuEnabled = true;
+		},
+		disableContextMenu: function() {
+			this.isContextMenuEnabled = false;
+		},
+		
+		contextMenuTimeout: null,
+		startContextMenuTimer: function() {
+			//
+			
+			var t = this;
+			
+			t.killContextMenuTimer();
+			
+			t.contextMenuTimer = setTimeout(function() {
+				t.hideContextMenu();
+				t.killContextMenuTimer();
+			}, 750);
+		},
+		killContextMenuTimer: function() {
+			var timer = this.contextMenuTimer;
+			
+			//
+			
+			if (timer != null) {				
+				clearTimeout(timer);
+				delete timer;
+				timer = null;
+			}
+		},		
+		
+		hideContextMenu: function() {
+			this.contextMenu.hide();
+		},
+		
+		renderContextMenu: function(x,y) {
+			
+			// alway re-render the items so that things like "turn fullscreen on" and "turn fullscreen off" are always written correctly
+			var t = this,
+				html = '',
+				items = t.options.contextMenuItems;
+			
+			for (var i=0, il=items.length; i<il; i++) {
+				
+				if (items[i].isSeparator) {
+					html += '<div class="mejs-contextmenu-separator"></div>';
+				} else {
+				
+					var rendered = items[i].render(t);
+				
+					// render can return null if the item doesn't need to be used at the moment
+					if (rendered != null) {
+						html += '<div class="mejs-contextmenu-item" data-itemindex="' + i + '" id="element-' + (Math.random()*1000000) + '">' + rendered + '</div>';
+					}
+				}
+			}
+			
+			// position and show the context menu
+			t.contextMenu
+				.empty()
+				.append($(html))
+				.css({top:y, left:x})
+				.show();
+				
+			// bind events
+			t.contextMenu.find('.mejs-contextmenu-item').each(function() {
+							
+				// which one is this?
+				var $dom = $(this),
+					itemIndex = parseInt( $dom.data('itemindex'), 10 ),
+					item = t.options.contextMenuItems[itemIndex];
+				
+				// bind extra functionality?
+				if (typeof item.show != 'undefined')
+					item.show( $dom , t);
+				
+				// bind click action
+				$dom.click(function() {			
+					// perform click action
+					if (typeof item.click != 'undefined')
+						item.click(t);
+					
+					// close
+					t.contextMenu.hide();				
+				});				
+			});	
+			
+			// stop the controls from hiding
+			setTimeout(function() {
+				t.killControlsTimer('rev3');	
+			}, 100);
+						
+		}
+	});
+	
+})(mejs.$);
+(function($) {
+	// skip back button
+
+	$.extend(mejs.MepDefaults, {
+		skipBackInterval: 30,
+		// %1 will be replaced with skipBackInterval in this string
+		skipBackText: mejs.i18n.t('Skip back %1 seconds')
+	});
+
+	$.extend(MediaElementPlayer.prototype, {
+		buildskipback: function(player, controls, layers, media) {
+			var
+				t = this,
+				// Replace %1 with skip back interval
+				backText = t.options.skipBackText.replace('%1', t.options.skipBackInterval),
+				// create the loop button
+				loop =
+				$('<div class="mejs-button mejs-skip-back-button">' +
+					'<button type="button" aria-controls="' + t.id + '" title="' + backText + '" aria-label="' + backText + '">' + t.options.skipBackInterval + '</button>' +
+				'</div>')
+				// append it to the toolbar
+				.appendTo(controls)
+				// add a click toggle event
+				.click(function() {
+					media.setCurrentTime(Math.max(media.currentTime - t.options.skipBackInterval, 0));
+					$(this).find('button').blur();
+				});
+		}
+	});
+
+})(mejs.$);
+
+/**
+ * Postroll plugin
+ */
+(function($) {
+
+	$.extend(mejs.MepDefaults, {
+		postrollCloseText: mejs.i18n.t('Close')
+	});
+
+	// Postroll
+	$.extend(MediaElementPlayer.prototype, {
+		buildpostroll: function(player, controls, layers, media) {
+			var
+				t = this,
+				postrollLink = t.container.find('link[rel="postroll"]').attr('href');
+
+			if (typeof postrollLink !== 'undefined') {
+				player.postroll =
+					$('<div class="mejs-postroll-layer mejs-layer"><a class="mejs-postroll-close" onclick="$(this).parent().hide();return false;">' + t.options.postrollCloseText + '</a><div class="mejs-postroll-layer-content"></div></div>').prependTo(layers).hide();
+
+				t.media.addEventListener('ended', function (e) {
+					$.ajax({
+						dataType: 'html',
+						url: postrollLink,
+						success: function (data, textStatus) {
+							layers.find('.mejs-postroll-layer-content').html(data);
+						}
+					});
+					player.postroll.show();
+				}, false);
+			}
+		}
+	});
+
+})(mejs.$);
\ No newline at end of file
diff --git a/core/media/media/js/mediaelement-and-player.min.js b/core/media/media/js/mediaelement-and-player.min.js
new file mode 100644
index 00000000..ad51f080
--- /dev/null
+++ b/core/media/media/js/mediaelement-and-player.min.js
@@ -0,0 +1,28 @@
+/*!
+ *
+ * MediaElement.js
+ * HTML5 <video> and <audio> shim and player
+ * http://mediaelementjs.com/
+ *
+ * Creates a JavaScript object that mimics HTML5 MediaElement API
+ * for browsers that don't understand HTML5 or can't play the provided codec
+ * Can play MP4 (H.264), Ogg, WebM, FLV, WMV, WMA, ACC, and MP3
+ *
+ * Copyright 2010-2014, John Dyer (http://j.hn)
+ * License: MIT
+ *
+ */
+var mejs=mejs||{};mejs.version="2.23.0",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/dailymotion","video/x-dailymotion","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&amp;").split("<").join("&lt;").split('"').join("&quot;")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='<a href="'+this.escapeHTML(a)+'">x</a>',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},calculateTimeFormat:function(a,b,c){0>a&&(a=0),"undefined"==typeof c&&(c=25);var d=b.timeFormat,e=d[0],f=d[1]==d[0],g=f?2:1,h=":",i=Math.floor(a/3600)%24,j=Math.floor(a/60)%60,k=Math.floor(a%60),l=Math.floor((a%1*c).toFixed(3)),m=[[l,"f"],[k,"s"],[j,"m"],[i,"h"]];d.length<g&&(h=d[g]);for(var n=!1,o=0,p=m.length;p>o;o++)if(-1!==d.indexOf(m[o][1]))n=!0;else if(n){for(var q=!1,r=o;p>r;r++)if(m[r][0]>0){q=!0;break}if(!q)break;f||(d=e+d),d=m[o][1]+h+d,f&&(d=m[o][1]+d),e=m[o][1]}b.currentTimeFormat=d},twoDigitsString:function(a){return 10>a?"0"+a:String(a)},secondsToTimeCode:function(a,b){if(0>a&&(a=0),"object"!=typeof b){var c="m:ss";c=arguments[1]?"hh:mm:ss":c,c=arguments[2]?c+":ff":c,b={currentTimeFormat:c,framesPerSecond:arguments[3]||25}}var d=b.framesPerSecond;"undefined"==typeof d&&(d=25);var c=b.currentTimeFormat,e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3));lis=[[h,"f"],[g,"s"],[f,"m"],[e,"h"]];var j=c;for(i=0,len=lis.length;i<len;i++)j=j.replace(lis[i][1]+lis[i][1],this.twoDigitsString(lis[i][0])),j=j.replace(lis[i][1],lis[i][0]);return j},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e<a.length;e++)d=1,e>0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}},determineScheme:function(a){return a&&-1!=a.indexOf("://")?a.substr(0,a.indexOf("://")+3):"//"}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f<h.length;f++)h[f]=parseInt(h[f].match(/\d+/),10)}else if("undefined"!=typeof window.ActiveXObject)try{g=new ActiveXObject(c),g&&(h=d(g))}catch(i){}return h}},mejs.PluginDetector.addPlugin("flash","Shockwave Flash","application/x-shockwave-flash","ShockwaveFlash.ShockwaveFlash",function(a){var b=[],c=a.GetVariable("$version");return c&&(c=c.split(" ")[1].split(","),b=[parseInt(c[0],10),parseInt(c[1],10),parseInt(c[2],10)]),b}),mejs.PluginDetector.addPlugin("silverlight","Silverlight Plug-In","application/x-silverlight-2","AgControl.AgControl",function(a){var b=[0,0,0,0],c=function(a,b,c,d){for(;a.isVersionSupported(b[0]+"."+b[1]+"."+b[2]+"."+b[3]);)b[c]+=d;b[c]-=d};return c(a,b,0,1),c(a,b,1,1),c(a,b,2,1e4),c(a,b,2,1e3),c(a,b,2,100),c(a,b,2,10),c(a,b,2,1),c(a,b,3,1),b}),mejs.MediaFeatures={init:function(){var a,b,c=this,d=document,e=mejs.PluginDetector.nav,f=mejs.PluginDetector.ua.toLowerCase(),g=["source","track","audio","video"];c.isiPad=null!==f.match(/ipad/i),c.isiPhone=null!==f.match(/iphone/i),c.isiOS=c.isiPhone||c.isiPad,c.isAndroid=null!==f.match(/android/i),c.isBustedAndroid=null!==f.match(/android 2\.[12]/),c.isBustedNativeHTTPS="https:"===location.protocol&&(null!==f.match(/android [12]\./)||null!==f.match(/macintosh.* version.* safari/)),c.isIE=-1!=e.appName.toLowerCase().indexOf("microsoft")||null!==e.appName.toLowerCase().match(/trident/gi),c.isChrome=null!==f.match(/chrome/gi),c.isChromium=null!==f.match(/chromium/gi),c.isFirefox=null!==f.match(/firefox/gi),c.isWebkit=null!==f.match(/webkit/gi),c.isGecko=null!==f.match(/gecko/gi)&&!c.isWebkit&&!c.isIE,c.isOpera=null!==f.match(/opera/gi),c.hasTouch="ontouchstart"in window,c.svgAsImg=!!document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1");for(a=0;a<g.length;a++)b=document.createElement(g[a]);c.supportsMediaTag="undefined"!=typeof b.canPlayType||c.isBustedAndroid;try{b.canPlayType("video/mp4")}catch(h){c.supportsMediaTag=!1}c.supportsPointerEvents=function(){var a,b=document.createElement("x"),c=document.documentElement,d=window.getComputedStyle;return"pointerEvents"in b.style?(b.style.pointerEvents="auto",b.style.pointerEvents="x",c.appendChild(b),a=d&&"auto"===d(b,"").pointerEvents,c.removeChild(b),!!a):!1}(),c.hasFirefoxPluginMovingProblem=!1,c.hasiOSFullScreen="undefined"!=typeof b.webkitEnterFullscreen,c.hasNativeFullscreen="undefined"!=typeof b.requestFullscreen,c.hasWebkitNativeFullScreen="undefined"!=typeof b.webkitRequestFullScreen,c.hasMozNativeFullScreen="undefined"!=typeof b.mozRequestFullScreen,c.hasMsNativeFullScreen="undefined"!=typeof b.msRequestFullscreen,c.hasTrueNativeFullScreen=c.hasWebkitNativeFullScreen||c.hasMozNativeFullScreen||c.hasMsNativeFullScreen,c.nativeFullScreenEnabled=c.hasTrueNativeFullScreen,c.hasMozNativeFullScreen?c.nativeFullScreenEnabled=document.mozFullScreenEnabled:c.hasMsNativeFullScreen&&(c.nativeFullScreenEnabled=document.msFullscreenEnabled),c.isChrome&&(c.hasiOSFullScreen=!1),c.hasTrueNativeFullScreen&&(c.fullScreenEventName="",c.hasWebkitNativeFullScreen?c.fullScreenEventName="webkitfullscreenchange":c.hasMozNativeFullScreen?c.fullScreenEventName="mozfullscreenchange":c.hasMsNativeFullScreen&&(c.fullScreenEventName="MSFullscreenChange"),c.isFullScreen=function(){return c.hasMozNativeFullScreen?d.mozFullScreen:c.hasWebkitNativeFullScreen?d.webkitIsFullScreen:c.hasMsNativeFullScreen?null!==d.msFullscreenElement:void 0},c.requestFullScreen=function(a){c.hasWebkitNativeFullScreen?a.webkitRequestFullScreen():c.hasMozNativeFullScreen?a.mozRequestFullScreen():c.hasMsNativeFullScreen&&a.msRequestFullscreen()},c.cancelFullScreen=function(){c.hasWebkitNativeFullScreen?document.webkitCancelFullScreen():c.hasMozNativeFullScreen?document.mozCancelFullScreen():c.hasMsNativeFullScreen&&document.msExitFullscreen()}),c.hasiOSFullScreen&&f.match(/mac os x 10_5/i)&&(c.hasNativeFullScreen=!1,c.hasiOSFullScreen=!1)}},mejs.MediaFeatures.init(),mejs.HtmlMediaElement={pluginType:"native",isFullScreen:!1,setCurrentTime:function(a){this.currentTime=a},setMuted:function(a){this.muted=a},setVolume:function(a){this.volume=a},stop:function(){this.pause()},setSrc:function(a){for(var b=this.getElementsByTagName("source");b.length>0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c<a.length;c++)if(d=a[c],this.canPlayType(d.type)){this.src=d.src;break}}},setVideoSize:function(a,b){this.width=a,this.height=b}},mejs.PluginMediaElement=function(a,b,c){this.id=a,this.pluginType=b,this.src=c,this.events={},this.attributes={}},mejs.PluginMediaElement.prototype={pluginElement:null,pluginType:"",isFullScreen:!1,playbackRate:-1,defaultPlaybackRate:-1,seekable:[],played:[],paused:!0,ended:!1,seeking:!1,duration:0,error:null,tagName:"",muted:!1,volume:1,currentTime:0,play:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.playVideo():this.pluginApi.playMedia(),this.paused=!1)},load:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType||this.pluginApi.loadMedia(),this.paused=!1)},pause:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?1==this.pluginApi.getPlayerState()&&this.pluginApi.pauseVideo():this.pluginApi.pauseMedia(),this.paused=!0)},stop:function(){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.stopVideo():this.pluginApi.stopMedia(),this.paused=!0)},canPlayType:function(a){var b,c,d,e=mejs.plugins[this.pluginType];for(b=0;b<e.length;b++)if(d=e[b],mejs.PluginDetector.hasPluginVersion(this.pluginType,d.version))for(c=0;c<d.types.length;c++)if(a==d.types[c])return"probably";return""},positionFullscreenButton:function(a,b,c){null!=this.pluginApi&&this.pluginApi.positionFullscreenButton&&this.pluginApi.positionFullscreenButton(Math.floor(a),Math.floor(b),c)},hideFullscreenButton:function(){null!=this.pluginApi&&this.pluginApi.hideFullscreenButton&&this.pluginApi.hideFullscreenButton()},setSrc:function(a){if("string"==typeof a)this.pluginApi.setSrc(mejs.Utility.absolutizeUrl(a)),this.src=mejs.Utility.absolutizeUrl(a);else{var b,c;for(b=0;b<a.length;b++)if(c=a[b],this.canPlayType(c.type)){this.pluginApi.setSrc(mejs.Utility.absolutizeUrl(c.src)),this.src=mejs.Utility.absolutizeUrl(c.src);break}}},setCurrentTime:function(a){null!=this.pluginApi&&("youtube"==this.pluginType||"vimeo"==this.pluginType?this.pluginApi.seekTo(a):this.pluginApi.setCurrentTime(a),this.currentTime=a)},setVolume:function(a){null!=this.pluginApi&&("youtube"==this.pluginType?this.pluginApi.setVolume(100*a):this.pluginApi.setVolume(a),this.volume=a)},setMuted:function(a){null!=this.pluginApi&&("youtube"==this.pluginType?(a?this.pluginApi.mute():this.pluginApi.unMute(),this.muted=a,this.dispatchEvent({type:"volumechange"})):this.pluginApi.setMuted(a),this.muted=a)},setVideoSize:function(a,b){this.pluginElement&&this.pluginElement.style&&(this.pluginElement.style.width=a+"px",this.pluginElement.style.height=b+"px"),null!=this.pluginApi&&this.pluginApi.setVideoSize&&this.pluginApi.setVideoSize(a,b)},setFullscreen:function(a){null!=this.pluginApi&&this.pluginApi.setFullscreen&&this.pluginApi.setFullscreen(a)},enterFullScreen:function(){null!=this.pluginApi&&this.pluginApi.setFullscreen&&this.setFullscreen(!0)},exitFullScreen:function(){null!=this.pluginApi&&this.pluginApi.setFullscreen&&this.setFullscreen(!1)},addEventListener:function(a,b,c){this.events[a]=this.events[a]||[],this.events[a].push(b)},removeEventListener:function(a,b){if(!a)return this.events={},!0;var c=this.events[a];if(!c)return!0;if(!b)return this.events[a]=[],!0;for(var d=0;d<c.length;d++)if(c[d]===b)return this.events[a].splice(d,1),!0;return!1},dispatchEvent:function(a){var b,c=this.events[a.type];if(c)for(b=0;b<c.length;b++)c[b].apply(this,[a])},hasAttribute:function(a){return a in this.attributes},removeAttribute:function(a){delete this.attributes[a]},getAttribute:function(a){return this.hasAttribute(a)?this.attributes[a]:null},setAttribute:function(a,b){this.attributes[a]=b},remove:function(){mejs.Utility.removeSwf(this.pluginElement.id)}},mejs.MediaElementDefaults={mode:"auto",plugins:["flash","silverlight","youtube","vimeo"],enablePluginDebug:!1,httpsBasicAuthSite:!1,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",flashScriptAccess:"sameDomain",enablePluginSmoothing:!1,enablePseudoStreaming:!1,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480,defaultVideoHeight:270,pluginWidth:-1,pluginHeight:-1,pluginVars:[],timerRate:250,startVolume:.8,customError:"",success:function(){},error:function(){}},mejs.MediaElement=function(a,b){return mejs.HtmlMediaElementShim.create(a,b)},mejs.HtmlMediaElementShim={create:function(a,b){var c,d,e={},f="string"==typeof a?document.getElementById(a):a,g=f.tagName.toLowerCase(),h="audio"===g||"video"===g,i=h?f.getAttribute("src"):f.getAttribute("href"),j=f.getAttribute("poster"),k=f.getAttribute("autoplay"),l=f.getAttribute("preload"),m=f.getAttribute("controls");for(d in mejs.MediaElementDefaults)e[d]=mejs.MediaElementDefaults[d];for(d in b)e[d]=b[d];return i="undefined"==typeof i||null===i||""==i?null:i,j="undefined"==typeof j||null===j?"":j,l="undefined"==typeof l||null===l||"false"===l?"none":l,k=!("undefined"==typeof k||null===k||"false"===k),m=!("undefined"==typeof m||null===m||"false"===m),c=this.determinePlayback(f,e,mejs.MediaFeatures.supportsMediaTag,h,i),c.url=null!==c.url?mejs.Utility.absolutizeUrl(c.url):"",c.scheme=mejs.Utility.determineScheme(c.url),"native"==c.method?(mejs.MediaFeatures.isBustedAndroid&&(f.src=c.url,f.addEventListener("click",function(){f.play()},!1)),this.updateNative(c,e,k,l)):""!==c.method?this.createPlugin(c,e,j,k,l,m):(this.createErrorMessage(c,e,j),this)},determinePlayback:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=[],r={method:"",url:"",htmlMediaElement:a,isVideo:"audio"!=a.tagName.toLowerCase(),scheme:""};if("undefined"!=typeof b.type&&""!==b.type)if("string"==typeof b.type)q.push({type:b.type,url:e});else for(f=0;f<b.type.length;f++)q.push({type:b.type[f],url:e});else if(null!==e)k=this.formatType(e,a.getAttribute("type")),q.push({type:k,url:e});else for(f=0;f<a.childNodes.length;f++)j=a.childNodes[f],1==j.nodeType&&"source"==j.tagName.toLowerCase()&&(e=j.getAttribute("src"),k=this.formatType(e,j.getAttribute("type")),p=j.getAttribute("media"),(!p||!window.matchMedia||window.matchMedia&&window.matchMedia(p).matches)&&q.push({type:k,url:e}));if(!d&&q.length>0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),mejs.MediaFeatures.isChromium&&(a.canPlayType=function(a){return null!==a.match(/video\/(webm|ogv|ogg)/gi)?"maybe":""}),c&&("auto"===b.mode||"auto_plugin"===b.mode||"native"===b.mode)&&(!mejs.MediaFeatures.isBustedNativeHTTPS||b.httpsBasicAuthSite!==!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f<q.length;f++)if("video/m3u8"==q[f].type||""!==a.canPlayType(q[f].type).replace(/no/,"")||""!==a.canPlayType(q[f].type.replace(/mp3/,"mpeg")).replace(/no/,"")||""!==a.canPlayType(q[f].type.replace(/m4a/,"mp4")).replace(/no/,"")){r.method="native",r.url=q[f].url;break}if("native"===r.method&&(null!==r.url&&(a.src=r.url),"auto_plugin"!==b.mode))return r}if("auto"===b.mode||"auto_plugin"===b.mode||"shim"===b.mode)for(f=0;f<q.length;f++)for(k=q[f].type,g=0;g<b.plugins.length;g++)for(l=b.plugins[g],m=mejs.plugins[l],h=0;h<m.length;h++)if(n=m[h],null==n.version||mejs.PluginDetector.hasPluginVersion(l,n.version))for(i=0;i<n.types.length;i++)if(k.toLowerCase()==n.types[i].toLowerCase())return r.method=l,r.url=q[f].url,r;return"auto_plugin"===b.mode&&"native"===r.method?r:(""===r.method&&q.length>0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase(),c=/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video/":"audio/";return this.getTypeFromExtension(b,c)},getTypeFromExtension:function(a,b){switch(b=b||"",a){case"mp4":case"m4v":case"m4a":case"f4v":case"f4a":return b+"mp4";case"flv":return b+"x-flv";case"webm":case"webma":case"webmv":return b+"webm";case"ogg":case"oga":case"ogv":return b+"ogg";case"m3u8":return"application/x-mpegurl";case"ts":return b+"mp2t";default:return b+a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div"),f=b.customError;e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(g){}f||(f='<a href="'+a.url+'">',""!==c&&(f+='<img src="'+c+'" width="100%" height="100%" alt="" />'),f+="<span>"+mejs.i18n.t("Download File")+"</span></a>"),e.innerHTML=f,d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p<j.attributes.length;p++){var q=j.attributes[p];q.specified&&n.setAttribute(q.name,q.value)}for(h=j.parentNode;null!==h&&null!=h.tagName&&"body"!==h.tagName.toLowerCase()&&null!=h.parentNode&&null!=h.parentNode.tagName&&null!=h.parentNode.constructor&&"ShadowRoot"===h.parentNode.constructor.name;){if("p"===h.parentNode.tagName.toLowerCase()){h.parentNode.parentNode.insertBefore(h,h.parentNode);break}h=h.parentNode}switch(a.isVideo?(k=b.pluginWidth>0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),("flash"===a.method||"silverlight"===a.method)&&(i=["id="+m,"isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&("flash"==a.method?i.push("file="+mejs.Utility.encodeUrl(a.url)):i.push("file="+a.url)),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),window[m+"_init"]=function(){switch(n.pluginType){case"flash":n.pluginElement=n.pluginApi=document.getElementById(m);break;case"silverlight":n.pluginElement=document.getElementById(n.id),n.pluginApi=n.pluginElement.Content.MediaElementJS}null!=n.pluginApi&&n.success&&n.success(n,j)},window[m+"_event"]=function(a,b){var c,d,e;c={type:a,target:n};for(d in b)n[d]=b[d],c[d]=b[d];e=b.bufferedTime||0,c.target.buffered=c.buffered={start:function(a){return 0},end:function(a){return e},length:1},n.dispatchEvent(c)}),a.method){case"silverlight":o.innerHTML='<object data="data:application/x-silverlight-2," type="application/x-silverlight-2" id="'+m+'" name="'+m+'" width="'+k+'" height="'+l+'" class="mejs-shim"><param name="initParams" value="'+i.join(",")+'" /><param name="windowless" value="true" /><param name="background" value="black" /><param name="minRuntimeVersion" value="3.0.0.0" /><param name="autoUpgrade" value="true" /><param name="source" value="'+b.pluginPath+b.silverlightName+'" /></object>';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="//download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" id="'+m+'" width="'+k+'" height="'+l+'" class="mejs-shim"><param name="movie" value="'+b.pluginPath+b.flashName+"?"+(new Date).getTime()+'" /><param name="flashvars" value="'+i.join("&amp;")+'" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><param name="wmode" value="transparent" /><param name="allowScriptAccess" value="'+b.flashScriptAccess+'" /><param name="allowFullScreen" value="true" /><param name="scale" value="default" /></object>'):o.innerHTML='<embed id="'+m+'" name="'+m+'" play="true" loop="false" quality="high" bgcolor="#000000" wmode="transparent" allowScriptAccess="'+b.flashScriptAccess+'" allowFullScreen="true" type="application/x-shockwave-flash" pluginspage="//www.macromedia.com/go/getflashplayer" src="'+b.pluginPath+b.flashName+'" flashvars="'+i.join("&")+'" width="'+k+'" height="'+l+'" scale="default"class="mejs-shim"></embed>';break;case"youtube":var r;if(-1!=a.url.lastIndexOf("youtu.be"))r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")));else{var s=a.url.match(/[?&]v=([^&#]+)|&|#|$/);s&&(r=s[1])}youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k,scheme:a.scheme},window.postMessage?mejs.YouTubeApi.enqueueIframe(youtubeSettings):mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])&&mejs.YouTubeApi.createFlash(youtubeSettings,b);break;case"vimeo":var t=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='<iframe src="'+a.scheme+"player.vimeo.com/video/"+n.vimeoid+"?api=1&portrait=0&byline=0&title=0&player_id="+t+'" width="'+k+'" height="'+l+'" frameborder="0" class="mejs-shim" id="'+t+'" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>',"function"==typeof $f){var u=$f(o.childNodes[0]),v=-1;u.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e)}u.playVideo=function(){u.api("play")},u.stopVideo=function(){u.api("unload")},u.pauseVideo=function(){u.api("pause")},u.seekTo=function(a){u.api("seekTo",a)},u.setVolume=function(a){u.api("setVolume",a)},u.setMuted=function(a){a?(u.lastVolume=u.api("getVolume"),u.api("setVolume",0)):(u.api("setVolume",u.lastVolume),delete u.lastVolume)},u.getPlayerState=function(){return v},u.addEvent("play",function(){v=1,a(u,n,"play"),a(u,n,"playing")}),u.addEvent("pause",function(){v=2,a(u,n,"pause")}),u.addEvent("finish",function(){v=0,a(u,n,"ended")}),u.addEvent("playProgress",function(b){a(u,n,"timeupdate",b)}),u.addEvent("seek",function(b){v=3,a(u,n,"seeked",b)}),u.addEvent("loadProgress",function(b){v=3,a(u,n,"progress",b)}),n.pluginElement=o,n.pluginApi=u,n.success(n,n.pluginElement)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b,c,d){var e,f=a.htmlMediaElement;for(e in mejs.HtmlMediaElement)f[e]=mejs.HtmlMediaElement[e];return b.success(f,f),f}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(a){if(!this.isIframeStarted){var b=document.createElement("script");b.src=a.scheme+"www.youtube.com/player_api";var c=document.getElementsByTagName("script")[0];c.parentNode.insertBefore(b,c),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(a),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0,wmode:"transparent"},events:{onReady:function(d){c.setVideoSize=function(a,b){c.setSize(a,b)},a.pluginMediaElement.pluginApi=c,a.pluginMediaElement.pluginElement=document.getElementById(a.containerId),b.success(b,b.pluginElement),mejs.YouTubeApi.createEvent(c,b,"canplay"),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250),"undefined"!=typeof b.attributes.autoplay&&c.playVideo()},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(a){return 0},end:function(a){return e},length:1}}b.dispatchEvent(d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c=a.scheme+"www.youtube.com/apiplayer?enablejsapi=1&amp;playerapiid="+a.pluginId+"&amp;version=3&amp;autoplay=0&amp;controls=0&amp;modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="'+a.scheme+'download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab" id="'+a.pluginId+'" width="'+a.width+'" height="'+a.height+'" class="mejs-shim"><param name="movie" value="'+c+'" /><param name="wmode" value="transparent" /><param name="allowScriptAccess" value="'+options.flashScriptAccess+'" /><param name="allowFullScreen" value="true" /></object>'):a.container.innerHTML='<object type="application/x-shockwave-flash" id="'+a.pluginId+'" data="'+c+'" width="'+a.width+'" height="'+a.height+'" style="visibility: visible; " class="mejs-shim"><param name="allowScriptAccess" value="'+options.flashScriptAccess+'"><param name="wmode" value="transparent"></object>'},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,b.success(d,d.pluginElement),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.onYouTubePlayerAPIReady=function(){mejs.YouTubeApi.iFrameReady()},window.onYouTubePlayerReady=function(a){mejs.YouTubeApi.flashReady(a)},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b,c){"use strict";var d={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};d.getLanguage=function(){var a=d.locale.language||window.navigator.userLanguage||window.navigator.language;return d.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(d.locale.language=mejsL10n.language),d.methods.checkPlain=function(a){var b,c,d={"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},d.methods.t=function(a,b){return d.locale.strings&&d.locale.strings[b.context]&&d.locale.strings[b.context][a]&&(a=d.locale.strings[b.context][a]),d.methods.checkPlain(a)},d.t=function(a,b){if("string"==typeof a&&a.length>0){var c=d.getLanguage();return b=b||{context:c},d.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=d}(document,mejs),function(a,b){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*!
+ *
+ * MediaElementPlayer
+ * http://mediaelementjs.com/
+ *
+ * Creates a controller bar for HTML5 <video> add <audio> tags
+ * using jQuery and MediaElement.js (HTML5 Flash/Silverlight wrapper)
+ *
+ * Copyright 2010-2013, John Dyer (http://j.hn/)
+ * License: MIT
+ *
+ */
+"undefined"!=typeof jQuery?mejs.$=jQuery:"undefined"!=typeof Zepto?(mejs.$=Zepto,Zepto.fn.outerWidth=function(a){var b=$(this).width();return a&&(b+=parseInt($(this).css("margin-right"),10),b+=parseInt($(this).css("margin-left"),10)),b}):"undefined"!=typeof ender&&(mejs.$=ender),function(a){mejs.MepDefaults={poster:"",showPosterWhenEnded:!1,defaultVideoWidth:480,defaultVideoHeight:270,videoWidth:-1,videoHeight:-1,defaultAudioWidth:400,defaultAudioHeight:30,defaultSeekBackwardInterval:function(a){return.05*a.duration},defaultSeekForwardInterval:function(a){return.05*a.duration},setDimensions:!0,audioWidth:-1,audioHeight:-1,startVolume:.8,loop:!1,autoRewind:!0,enableAutosize:!0,timeFormat:"",alwaysShowHours:!1,showTimecodeFrameCount:!1,framesPerSecond:25,autosizeProgress:!0,alwaysShowControls:!1,hideVideoControlsOnLoad:!1,clickToPlayPause:!0,controlsTimeoutDefault:1500,controlsTimeoutMouseEnter:2500,controlsTimeoutMouseLeave:1e3,iPadUseNativeControls:!1,iPhoneUseNativeControls:!1,AndroidUseNativeControls:!1,features:["playpause","current","progress","duration","tracks","volume","fullscreen"],isVideo:!0,stretching:"auto",enableKeyboard:!0,pauseOtherPlayers:!0,keyActions:[{keys:[32,179],action:function(a,b){b.paused||b.ended?b.play():b.pause()}},{keys:[38],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.volume+.1,1);b.setVolume(c)}},{keys:[40],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.volume-.1,0);b.setVolume(c)}},{keys:[37,227],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.currentTime-a.options.defaultSeekBackwardInterval(b),0);b.setCurrentTime(c)}}},{keys:[39,228],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.currentTime+a.options.defaultSeekForwardInterval(b),b.duration);b.setCurrentTime(c)}}},{keys:[70],action:function(a,b){"undefined"!=typeof a.enterFullScreen&&(a.isFullScreen?a.exitFullScreen():a.enterFullScreen())}},{keys:[77],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer()),a.media.muted?a.setMuted(!1):a.setMuted(!0)}}]},mejs.mepIndex=0,mejs.players={},mejs.MediaElementPlayer=function(b,c){if(!(this instanceof mejs.MediaElementPlayer))return new mejs.MediaElementPlayer(b,c);var d=this;return d.$media=d.$node=a(b),d.node=d.media=d.$media[0],d.node?"undefined"!=typeof d.node.player?d.node.player:("undefined"==typeof c&&(c=d.$node.data("mejsoptions")),d.options=a.extend({},mejs.MepDefaults,c),d.options.timeFormat||(d.options.timeFormat="mm:ss",d.options.alwaysShowHours&&(d.options.timeFormat="hh:mm:ss"),d.options.showTimecodeFrameCount&&(d.options.timeFormat+=":ff")),mejs.Utility.calculateTimeFormat(0,d.options,d.options.framesPerSecond||25),d.id="mep_"+mejs.mepIndex++,mejs.players[d.id]=d,d.init(),d):void 0},mejs.MediaElementPlayer.prototype={hasFocus:!1,controlsAreVisible:!0,init:function(){var b=this,c=mejs.MediaFeatures,d=a.extend(!0,{},b.options,{success:function(a,c){b.meReady(a,c)},error:function(a){b.handleError(a)}}),e=b.media.tagName.toLowerCase();if(b.isDynamic="audio"!==e&&"video"!==e,b.isDynamic?b.isVideo=b.options.isVideo:b.isVideo="audio"!==e&&b.options.isVideo,c.isiPad&&b.options.iPadUseNativeControls||c.isiPhone&&b.options.iPhoneUseNativeControls)b.$media.attr("controls","controls"),c.isiPad&&null!==b.media.getAttribute("autoplay")&&b.play();else if(c.isAndroid&&b.options.AndroidUseNativeControls);else{b.$media.removeAttr("controls");var f=b.isVideo?mejs.i18n.t("Video Player"):mejs.i18n.t("Audio Player");a('<span class="mejs-offscreen">'+f+"</span>").insertBefore(b.$media),b.container=a('<div id="'+b.id+'" class="mejs-container '+(mejs.MediaFeatures.svgAsImg?"svg":"no-svg")+'" tabindex="0" role="application" aria-label="'+f+'"><div class="mejs-inner"><div class="mejs-mediaelement"></div><div class="mejs-layers"></div><div class="mejs-controls"></div><div class="mejs-clear"></div></div></div>').addClass(b.$media[0].className).insertBefore(b.$media).focus(function(a){if(!b.controlsAreVisible&&!b.hasFocus&&b.controlsEnabled&&(b.showControls(!0),!b.hasMsNativeFullScreen)){var c=b.container.find(".mejs-playpause-button > button");c.focus()}}),"fill"!==b.options.stretching||b.container.parent("mejs-fill-container").length||(b.outerContainer=b.$media.parent(),b.container.wrap('<div class="mejs-fill-container"/>')),b.container.addClass((c.isAndroid?"mejs-android ":"")+(c.isiOS?"mejs-ios ":"")+(c.isiPad?"mejs-ipad ":"")+(c.isiPhone?"mejs-iphone ":"")+(b.isVideo?"mejs-video ":"mejs-audio ")),b.container.find(".mejs-mediaelement").append(b.$media),b.node.player=b,b.controls=b.container.find(".mejs-controls"),b.layers=b.container.find(".mejs-layers");var g=b.isVideo?"video":"audio",h=g.substring(0,1).toUpperCase()+g.substring(1);b.options[g+"Width"]>0||b.options[g+"Width"].toString().indexOf("%")>-1?b.width=b.options[g+"Width"]:""!==b.media.style.width&&null!==b.media.style.width?b.width=b.media.style.width:null!==b.media.getAttribute("width")?b.width=b.$media.attr("width"):b.width=b.options["default"+h+"Width"],b.options[g+"Height"]>0||b.options[g+"Height"].toString().indexOf("%")>-1?b.height=b.options[g+"Height"]:""!==b.media.style.height&&null!==b.media.style.height?b.height=b.media.style.height:null!==b.$media[0].getAttribute("height")?b.height=b.$media.attr("height"):b.height=b.options["default"+h+"Height"],b.setPlayerSize(b.width,b.height),d.pluginWidth=b.width,d.pluginHeight=b.height}mejs.MediaElement(b.$media[0],d),"undefined"!=typeof b.container&&b.controlsAreVisible&&b.container.trigger("controlsshown")},showControls:function(a){var b=this;a="undefined"==typeof a||a,b.controlsAreVisible||(a?(b.controls.removeClass("mejs-offscreen").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0,b.container.trigger("controlsshown")}),b.container.find(".mejs-control").removeClass("mejs-offscreen").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0})):(b.controls.removeClass("mejs-offscreen").css("display","block"),b.container.find(".mejs-control").removeClass("mejs-offscreen").css("display","block"),b.controlsAreVisible=!0,b.container.trigger("controlsshown")),b.setControlsSize())},hideControls:function(b){var c=this;b="undefined"==typeof b||b,!c.controlsAreVisible||c.options.alwaysShowControls||c.keyboardAction||c.media.paused||c.media.ended||(b?(c.controls.stop(!0,!0).fadeOut(200,function(){a(this).addClass("mejs-offscreen").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")}),c.container.find(".mejs-control").stop(!0,!0).fadeOut(200,function(){a(this).addClass("mejs-offscreen").css("display","block")})):(c.controls.addClass("mejs-offscreen").css("display","block"),c.container.find(".mejs-control").addClass("mejs-offscreen").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")))},controlsTimer:null,startControlsTimer:function(a){var b=this;a="undefined"!=typeof a?a:b.options.controlsTimeoutDefault,b.killControlsTimer("start"),b.controlsTimer=setTimeout(function(){b.hideControls(),b.killControlsTimer("hide")},a)},killControlsTimer:function(a){var b=this;null!==b.controlsTimer&&(clearTimeout(b.controlsTimer),delete b.controlsTimer,b.controlsTimer=null)},controlsEnabled:!0,disableControls:function(){var a=this;a.killControlsTimer(),a.hideControls(!1),this.controlsEnabled=!1},enableControls:function(){var a=this;a.showControls(!1),a.controlsEnabled=!0},meReady:function(b,c){var d,e,f=this,g=mejs.MediaFeatures,h=c.getAttribute("autoplay"),i=!("undefined"==typeof h||null===h||"false"===h);if(!f.created){if(f.created=!0,f.media=b,f.domNode=c,!(g.isAndroid&&f.options.AndroidUseNativeControls||g.isiPad&&f.options.iPadUseNativeControls||g.isiPhone&&f.options.iPhoneUseNativeControls)){f.buildposter(f,f.controls,f.layers,f.media),f.buildkeyboard(f,f.controls,f.layers,f.media),f.buildoverlays(f,f.controls,f.layers,f.media),f.findTracks();for(d in f.options.features)if(e=f.options.features[d],f["build"+e])try{f["build"+e](f,f.controls,f.layers,f.media)}catch(j){}f.container.trigger("controlsready"),f.setPlayerSize(f.width,f.height),f.setControlsSize(),f.isVideo&&(mejs.MediaFeatures.hasTouch&&!f.options.alwaysShowControls?f.$media.bind("touchstart",function(){f.controlsAreVisible?f.hideControls(!1):f.controlsEnabled&&f.showControls(!1)}):(f.clickToPlayPauseCallback=function(){if(f.options.clickToPlayPause){f.media.paused?f.play():f.pause();var a=f.$media.closest(".mejs-container").find(".mejs-overlay-button"),b=a.attr("aria-pressed");a.attr("aria-pressed",!b)}},f.media.addEventListener("click",f.clickToPlayPauseCallback,!1),f.container.bind("mouseenter",function(){f.controlsEnabled&&(f.options.alwaysShowControls||(f.killControlsTimer("enter"),f.showControls(),f.startControlsTimer(f.options.controlsTimeoutMouseEnter)))}).bind("mousemove",function(){f.controlsEnabled&&(f.controlsAreVisible||f.showControls(),f.options.alwaysShowControls||f.startControlsTimer(f.options.controlsTimeoutMouseEnter))}).bind("mouseleave",function(){f.controlsEnabled&&(f.media.paused||f.options.alwaysShowControls||f.startControlsTimer(f.options.controlsTimeoutMouseLeave))})),f.options.hideVideoControlsOnLoad&&f.hideControls(!1),i&&!f.options.alwaysShowControls&&f.hideControls(),f.options.enableAutosize&&f.media.addEventListener("loadedmetadata",function(a){f.options.videoHeight<=0&&null===f.domNode.getAttribute("height")&&!isNaN(a.target.videoHeight)&&(f.setPlayerSize(a.target.videoWidth,a.target.videoHeight),f.setControlsSize(),f.media.setVideoSize(a.target.videoWidth,a.target.videoHeight))},!1)),f.media.addEventListener("play",function(){var a;for(a in mejs.players){var b=mejs.players[a];b.id==f.id||!f.options.pauseOtherPlayers||b.paused||b.ended||b.pause(),b.hasFocus=!1}f.hasFocus=!0},!1),f.media.addEventListener("ended",function(b){if(f.options.autoRewind)try{f.media.setCurrentTime(0),window.setTimeout(function(){a(f.container).find(".mejs-overlay-loading").parent().hide()},20)}catch(c){}f.media.pause(),f.setProgressRail&&f.setProgressRail(),f.setCurrentRail&&f.setCurrentRail(),f.options.loop?f.play():!f.options.alwaysShowControls&&f.controlsEnabled&&f.showControls()},!1),f.media.addEventListener("loadedmetadata",function(){mejs.Utility.calculateTimeFormat(f.duration,f.options,f.options.framesPerSecond||25),f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.isFullScreen||(f.setPlayerSize(f.width,f.height),f.setControlsSize())},!1);var k=null;f.media.addEventListener("timeupdate",function(){k!==this.duration&&(k=this.duration,mejs.Utility.calculateTimeFormat(k,f.options,f.options.framesPerSecond||25),f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.setControlsSize())},!1),f.container.focusout(function(b){if(b.relatedTarget){var c=a(b.relatedTarget);f.keyboardAction&&0===c.parents(".mejs-container").length&&(f.keyboardAction=!1,f.isVideo&&!f.options.alwaysShowControls&&f.hideControls(!0))}}),setTimeout(function(){f.setPlayerSize(f.width,f.height),f.setControlsSize()},50),f.globalBind("resize",function(){f.isFullScreen||mejs.MediaFeatures.hasTrueNativeFullScreen&&document.webkitIsFullScreen||f.setPlayerSize(f.width,f.height),f.setControlsSize()}),"youtube"==f.media.pluginType&&(g.isiOS||g.isAndroid)&&(f.container.find(".mejs-overlay-play").hide(),f.container.find(".mejs-poster").hide())}i&&"native"==b.pluginType&&f.play(),f.options.success&&("string"==typeof f.options.success?window[f.options.success](f.media,f.domNode,f):f.options.success(f.media,f.domNode,f))}},handleError:function(a){var b=this;b.controls&&b.controls.hide(),b.options.error&&b.options.error(a)},setPlayerSize:function(a,b){var c=this;if(!c.options.setDimensions)return!1;switch("undefined"!=typeof a&&(c.width=a),"undefined"!=typeof b&&(c.height=b),c.options.stretching){case"fill":c.isVideo?this.setFillMode():this.setDimensions(c.width,c.height);break;case"responsive":this.setResponsiveMode();break;case"none":this.setDimensions(c.width,c.height);break;default:this.hasFluidMode()===!0?this.setResponsiveMode():this.setDimensions(c.width,c.height)}},hasFluidMode:function(){var a=this;return a.height.toString().indexOf("%")>0||"none"!==a.$node.css("max-width")&&"t.width"!==a.$node.css("max-width")||a.$node[0].currentStyle&&"100%"===a.$node[0].currentStyle.maxWidth},setResponsiveMode:function(){var b=this,c=function(){return b.isVideo?b.media.videoWidth&&b.media.videoWidth>0?b.media.videoWidth:null!==b.media.getAttribute("width")?b.media.getAttribute("width"):b.options.defaultVideoWidth:b.options.defaultAudioWidth}(),d=function(){return b.isVideo?b.media.videoHeight&&b.media.videoHeight>0?b.media.videoHeight:null!==b.media.getAttribute("height")?b.media.getAttribute("height"):b.options.defaultVideoHeight:b.options.defaultAudioHeight}(),e=b.container.parent().closest(":visible").width(),f=b.container.parent().closest(":visible").height(),g=b.isVideo||!b.options.autosizeProgress?parseInt(e*d/c,10):d;(isNaN(g)||0!==f&&g>f&&f>d)&&(g=f),b.container.parent().length>0&&"body"===b.container.parent()[0].tagName.toLowerCase()&&(e=a(window).width(),g=a(window).height()),g&&e&&(b.container.width(e).height(g),b.$media.add(b.container.find(".mejs-shim")).width("100%").height("100%"),b.isVideo&&b.media.setVideoSize&&b.media.setVideoSize(e,g),b.layers.children(".mejs-layer").width("100%").height("100%"))},setFillMode:function(){var a=this,b=a.outerContainer;b.width()||b.height(a.$media.width()),b.height()||b.height(a.$media.height());var c=b.width(),d=b.height();a.setDimensions("100%","100%"),a.container.find(".mejs-poster img").css("display","block"),targetElement=a.container.find("object, embed, iframe, video");var e=a.height,f=a.width,g=c,h=e*c/f,i=f*d/e,j=d,k=!(i>c),l=k?Math.floor(g):Math.floor(i),m=k?Math.floor(h):Math.floor(j);k?(targetElement.height(m).width(c),a.media.setVideoSize&&a.media.setVideoSize(c,m)):(targetElement.height(d).width(l),a.media.setVideoSize&&a.media.setVideoSize(l,d)),targetElement.css({"margin-left":Math.floor((c-l)/2),"margin-top":0})},setDimensions:function(a,b){var c=this;c.container.width(a).height(b),c.layers.children(".mejs-layer").width(a).height(b)},setControlsSize:function(){var b=this,c=0,d=0,e=b.controls.find(".mejs-time-rail"),f=b.controls.find(".mejs-time-total"),g=e.siblings(),h=g.last(),i=null;if(b.container.is(":visible")&&e.length&&e.is(":visible")){b.options&&!b.options.autosizeProgress&&(d=parseInt(e.css("width"),10)),0!==d&&d||(g.each(function(){var b=a(this);"absolute"!=b.css("position")&&b.is(":visible")&&(c+=a(this).outerWidth(!0))}),d=b.controls.width()-c-(e.outerWidth(!0)-e.width()));do e.width(d),f.width(d-(f.outerWidth(!0)-f.width())),"absolute"!=h.css("position")&&(i=h.length?h.position():null,d--);while(null!==i&&i.top.toFixed(2)>0&&d>0);b.container.trigger("controlsresize")}},buildposter:function(b,c,d,e){var f=this,g=a('<div class="mejs-poster mejs-layer"></div>').appendTo(d),h=b.$media.attr("poster");""!==b.options.poster&&(h=b.options.poster),h?f.setPoster(h):g.hide(),e.addEventListener("play",function(){g.hide()},!1),b.options.showPosterWhenEnded&&b.options.autoRewind&&e.addEventListener("ended",function(){g.show()},!1)},setPoster:function(b){var c=this,d=c.container.find(".mejs-poster"),e=d.find("img");0===e.length&&(e=a('<img width="100%" height="100%" alt="" />').appendTo(d)),e.attr("src",b),d.css({"background-image":"url("+b+")"})},buildoverlays:function(b,c,d,e){var f=this;if(b.isVideo){var g=a('<div class="mejs-overlay mejs-layer"><div class="mejs-overlay-loading"><span></span></div></div>').hide().appendTo(d),h=a('<div class="mejs-overlay mejs-layer"><div class="mejs-overlay-error"></div></div>').hide().appendTo(d),i=a('<div class="mejs-overlay mejs-layer mejs-overlay-play"><div class="mejs-overlay-button" role="button" aria-label="'+mejs.i18n.t("Play")+'" aria-pressed="false"></div></div>').appendTo(d).bind("click",function(){if(f.options.clickToPlayPause){e.paused&&e.play();var b=a(this).find(".mejs-overlay-button"),c=b.attr("aria-pressed");b.attr("aria-pressed",!!c)}});e.addEventListener("play",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("playing",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("seeking",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("seeked",function(){g.hide(),c.find(".mejs-time-buffering").hide()},!1),e.addEventListener("pause",function(){mejs.MediaFeatures.isiPhone||i.show()},!1),e.addEventListener("waiting",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("loadeddata",function(){g.show(),c.find(".mejs-time-buffering").show(),mejs.MediaFeatures.isAndroid&&(e.canplayTimeout=window.setTimeout(function(){if(document.createEvent){var a=document.createEvent("HTMLEvents");return a.initEvent("canplay",!0,!0),e.dispatchEvent(a)}},300))},!1),e.addEventListener("canplay",function(){g.hide(),c.find(".mejs-time-buffering").hide(),clearTimeout(e.canplayTimeout)},!1),e.addEventListener("error",function(a){f.handleError(a),g.hide(),i.hide(),h.show(),h.find(".mejs-overlay-error").html("Error loading this resource")},!1),e.addEventListener("keydown",function(a){f.onkeydown(b,e,a)},!1)}},buildkeyboard:function(b,c,d,e){var f=this;f.container.keydown(function(){f.keyboardAction=!0}),f.globalBind("keydown",function(c){return b.hasFocus=0!==a(c.target).closest(".mejs-container").length&&a(c.target).closest(".mejs-container").attr("id")===b.$media.closest(".mejs-container").attr("id"),f.onkeydown(b,e,c)}),f.globalBind("click",function(c){b.hasFocus=0!==a(c.target).closest(".mejs-container").length})},onkeydown:function(a,b,c){if(a.hasFocus&&a.options.enableKeyboard)for(var d=0,e=a.options.keyActions.length;e>d;d++)for(var f=a.options.keyActions[d],g=0,h=f.keys.length;h>g;g++)if(c.keyCode==f.keys[g])return"function"==typeof c.preventDefault&&c.preventDefault(),f.action(a,b,c.keyCode,c),!1;return!0},findTracks:function(){var b=this,c=b.$media.find("track");b.tracks=[],c.each(function(c,d){d=a(d),b.tracks.push({srclang:d.attr("srclang")?d.attr("srclang").toLowerCase():"",src:d.attr("src"),kind:d.attr("kind"),label:d.attr("label")||"",entries:[],isLoaded:!1})})},changeSkin:function(a){this.container[0].className="mejs-container "+a,this.setPlayerSize(this.width,this.height),this.setControlsSize()},play:function(){this.load(),this.media.play()},pause:function(){try{this.media.pause()}catch(a){}},load:function(){this.isLoaded||this.media.load(),this.isLoaded=!0},setMuted:function(a){this.media.setMuted(a)},setCurrentTime:function(a){this.media.setCurrentTime(a)},getCurrentTime:function(){return this.media.currentTime},setVolume:function(a){this.media.setVolume(a)},getVolume:function(){return this.media.volume},setSrc:function(a){var b=this;if("youtube"===b.media.pluginType){var c;if("string"!=typeof a){var d,e;for(d=0;d<a.length;d++)if(e=a[d],this.canPlayType(e.type)){a=e.src;break}}if(-1!==a.lastIndexOf("youtu.be"))c=a.substr(a.lastIndexOf("/")+1),-1!==c.indexOf("?")&&(c=c.substr(0,c.indexOf("?")));else{var f=a.match(/[?&]v=([^&#]+)|&|#|$/);f&&(c=f[1])}null!==b.media.getAttribute("autoplay")?b.media.pluginApi.loadVideoById(c):b.media.pluginApi.cueVideoById(c)}else b.media.setSrc(a)},remove:function(){var a,b,c=this;c.container.prev(".mejs-offscreen").remove();for(a in c.options.features)if(b=c.options.features[a],c["clean"+b])try{c["clean"+b](c)}catch(d){}c.isDynamic?c.$node.insertBefore(c.container):(c.$media.prop("controls",!0),c.$node.clone().insertBefore(c.container).show(),c.$node.remove()),"native"!==c.media.pluginType&&c.media.remove(),delete mejs.players[c.id],"object"==typeof c.container&&c.container.remove(),c.globalUnbind(),delete c.node.player},rebuildtracks:function(){var a=this;a.findTracks(),a.buildtracks(a,a.controls,a.layers,a.media)},resetSize:function(){var a=this;setTimeout(function(){a.setPlayerSize(a.width,a.height),a.setControlsSize()},50)}},function(){function b(b,d){var e={d:[],w:[]};return a.each((b||"").split(" "),function(a,b){var f=b+"."+d;0===f.indexOf(".")?(e.d.push(f),e.w.push(f)):e[c.test(b)?"w":"d"].push(f)}),e.d=e.d.join(" "),e.w=e.w.join(" "),e}var c=/^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;mejs.MediaElementPlayer.prototype.globalBind=function(c,d,e){var f=this,g=f.node?f.node.ownerDocument:document;c=b(c,f.id),c.d&&a(g).bind(c.d,d,e),c.w&&a(window).bind(c.w,d,e)},mejs.MediaElementPlayer.prototype.globalUnbind=function(c,d){var e=this,f=e.node?e.node.ownerDocument:document;c=b(c,e.id),c.d&&a(f).unbind(c.d,d),c.w&&a(window).unbind(c.w,d)}}(),"undefined"!=typeof a&&(a.fn.mediaelementplayer=function(b){return b===!1?this.each(function(){var b=a(this).data("mediaelementplayer");b&&b.remove(),a(this).removeData("mediaelementplayer")}):this.each(function(){a(this).data("mediaelementplayer",new mejs.MediaElementPlayer(this,b))}),this},a(document).ready(function(){a(".mejs-player").mediaelementplayer()})),window.MediaElementPlayer=mejs.MediaElementPlayer}(mejs.$),function(a){a.extend(mejs.MepDefaults,{playText:mejs.i18n.t("Play"),pauseText:mejs.i18n.t("Pause")}),a.extend(MediaElementPlayer.prototype,{buildplaypause:function(b,c,d,e){function f(a){"play"===a?(i.removeClass("mejs-play").addClass("mejs-pause"),j.attr({title:h.pauseText,"aria-label":h.pauseText})):(i.removeClass("mejs-pause").addClass("mejs-play"),j.attr({title:h.playText,"aria-label":h.playText}))}var g=this,h=g.options,i=a('<div class="mejs-button mejs-playpause-button mejs-play" ><button type="button" aria-controls="'+g.id+'" title="'+h.playText+'" aria-label="'+h.playText+'"></button></div>').appendTo(c).click(function(a){return a.preventDefault(),e.paused?e.play():e.pause(),!1}),j=i.find("button");f("pse"),e.addEventListener("play",function(){f("play")},!1),e.addEventListener("playing",function(){f("play")},!1),e.addEventListener("pause",function(){f("pse")},!1),e.addEventListener("paused",function(){f("pse")},!1)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{stopText:"Stop"}),a.extend(MediaElementPlayer.prototype,{buildstop:function(b,c,d,e){var f=this;a('<div class="mejs-button mejs-stop-button mejs-stop"><button type="button" aria-controls="'+f.id+'" title="'+f.options.stopText+'" aria-label="'+f.options.stopText+'"></button></div>').appendTo(c).click(function(){e.paused||e.pause(),e.currentTime>0&&(e.setCurrentTime(0),e.pause(),c.find(".mejs-time-current").width("0px"),c.find(".mejs-time-handle").css("left","0px"),c.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0,b.options)),c.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0,b.options)),d.find(".mejs-poster").show())})}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{enableProgressTooltip:!0,progressHelpText:mejs.i18n.t("Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.")}),a.extend(MediaElementPlayer.prototype,{buildprogress:function(b,c,d,e){var f=this,g=!1,h=!1,i=0,j=!1,k=b.options.autoRewind,l=b.options.enableProgressTooltip?'<span class="mejs-time-float"><span class="mejs-time-float-current">00:00</span><span class="mejs-time-float-corner"></span></span>':"";a('<div class="mejs-time-rail"><span  class="mejs-time-total mejs-time-slider"><span class="mejs-time-buffering"></span><span class="mejs-time-loaded"></span><span class="mejs-time-current"></span><span class="mejs-time-handle"></span>'+l+"</span></div>").appendTo(c),c.find(".mejs-time-buffering").hide(),f.total=c.find(".mejs-time-total"),f.loaded=c.find(".mejs-time-loaded"),f.current=c.find(".mejs-time-current"),f.handle=c.find(".mejs-time-handle"),f.timefloat=c.find(".mejs-time-float"),f.timefloatcurrent=c.find(".mejs-time-float-current"),f.slider=c.find(".mejs-time-slider");var m=function(a){var c,d=f.total.offset(),h=f.total.width(),i=0,j=0,k=0;c=a.originalEvent&&a.originalEvent.changedTouches?a.originalEvent.changedTouches[0].pageX:a.changedTouches?a.changedTouches[0].pageX:a.pageX,e.duration&&(c<d.left?c=d.left:c>h+d.left&&(c=h+d.left),k=c-d.left,i=k/h,j=.02>=i?0:i*e.duration,g&&j!==e.currentTime&&e.setCurrentTime(j),mejs.MediaFeatures.hasTouch||(f.timefloat.css("left",k),f.timefloatcurrent.html(mejs.Utility.secondsToTimeCode(j,b.options)),f.timefloat.show()))},n=function(a){var c=e.currentTime,d=mejs.i18n.t("Time Slider"),g=mejs.Utility.secondsToTimeCode(c,b.options),h=e.duration;f.slider.attr({"aria-label":d,"aria-valuemin":0,"aria-valuemax":h,"aria-valuenow":c,"aria-valuetext":g,role:"slider",tabindex:0})},o=function(){var a=new Date;a-i>=1e3&&e.play()};f.slider.bind("focus",function(a){b.options.autoRewind=!1}),f.slider.bind("blur",function(a){b.options.autoRewind=k}),f.slider.bind("keydown",function(a){new Date-i>=1e3&&(j=e.paused);var c=a.keyCode,d=e.duration,f=e.currentTime,g=b.options.defaultSeekForwardInterval(e),h=b.options.defaultSeekBackwardInterval(e);switch(c){case 37:case 40:f-=h;break;case 39:case 38:f+=g;break;case 36:f=0;break;case 35:f=d;break;case 32:case 13:return void(e.paused?e.play():e.pause());default:return}return f=0>f?0:f>=d?d:Math.floor(f),i=new Date,j||e.pause(),f<e.duration&&!j&&setTimeout(o,1100),e.setCurrentTime(f),a.preventDefault(),a.stopPropagation(),!1}),f.total.bind("mousedown touchstart",function(a){(1===a.which||0===a.which)&&(g=!0,m(a),f.globalBind("mousemove.dur touchmove.dur",function(a){m(a)}),f.globalBind("mouseup.dur touchend.dur",function(a){g=!1,"undefined"!=typeof f.timefloat&&f.timefloat.hide(),f.globalUnbind(".dur")}))}).bind("mouseenter",function(a){h=!0,f.globalBind("mousemove.dur",function(a){m(a)}),"undefined"==typeof f.timefloat||mejs.MediaFeatures.hasTouch||f.timefloat.show()}).bind("mouseleave",function(a){h=!1,g||(f.globalUnbind(".dur"),"undefined"!=typeof f.timefloat&&f.timefloat.hide())}),e.addEventListener("progress",function(a){b.setProgressRail(a),b.setCurrentRail(a)},!1),e.addEventListener("timeupdate",function(a){b.setProgressRail(a),b.setCurrentRail(a),n(a)},!1),f.container.on("controlsresize",function(a){b.setProgressRail(a),b.setCurrentRail(a)})},setProgressRail:function(a){var b=this,c=void 0!==a?a.target:b.media,d=null;c&&c.buffered&&c.buffered.length>0&&c.buffered.end&&c.duration?d=c.buffered.end(c.buffered.length-1)/c.duration:c&&void 0!==c.bytesTotal&&c.bytesTotal>0&&void 0!==c.bufferedBytes?d=c.bufferedBytes/c.bytesTotal:a&&a.lengthComputable&&0!==a.total&&(d=a.loaded/a.total),null!==d&&(d=Math.min(1,Math.max(0,d)),b.loaded&&b.total&&b.loaded.width(b.total.width()*d))},setCurrentRail:function(){var a=this;if(void 0!==a.media.currentTime&&a.media.duration&&a.total&&a.handle){var b=Math.round(a.total.width()*a.media.currentTime/a.media.duration),c=b-Math.round(a.handle.outerWidth(!0)/2);a.current.width(b),a.handle.css("left",c)}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:"<span> | </span>"}),a.extend(MediaElementPlayer.prototype,{buildcurrent:function(b,c,d,e){var f=this;a('<div class="mejs-time" role="timer" aria-live="off"><span class="mejs-currenttime">'+mejs.Utility.secondsToTimeCode(0,b.options)+"</span></div>").appendTo(c),f.currenttime=f.controls.find(".mejs-currenttime"),e.addEventListener("timeupdate",function(){f.controlsAreVisible&&b.updateCurrent()},!1)},buildduration:function(b,c,d,e){var f=this;c.children().last().find(".mejs-currenttime").length>0?a(f.options.timeAndDurationSeparator+'<span class="mejs-duration">'+mejs.Utility.secondsToTimeCode(f.options.duration,f.options)+"</span>").appendTo(c.find(".mejs-time")):(c.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container"),a('<div class="mejs-time mejs-duration-container"><span class="mejs-duration">'+mejs.Utility.secondsToTimeCode(f.options.duration,f.options)+"</span></div>").appendTo(c)),f.durationD=f.controls.find(".mejs-duration"),e.addEventListener("timeupdate",function(){f.controlsAreVisible&&b.updateDuration()},!1)},updateCurrent:function(){var a=this,b=a.media.currentTime;isNaN(b)&&(b=0),a.currenttime&&a.currenttime.html(mejs.Utility.secondsToTimeCode(b,a.options))},updateDuration:function(){var a=this,b=a.media.duration;a.options.duration>0&&(b=a.options.duration),isNaN(b)&&(b=0),a.container.toggleClass("mejs-long-video",b>3600),a.durationD&&b>0&&a.durationD.html(mejs.Utility.secondsToTimeCode(b,a.options))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),allyVolumeControlText:mejs.i18n.t("Use Up/Down Arrow keys to increase or decrease volume."),hideVolumeOnTouchDevices:!0,audioVolume:"horizontal",videoVolume:"vertical"}),a.extend(MediaElementPlayer.prototype,{buildvolume:function(b,c,d,e){if(!mejs.MediaFeatures.isAndroid&&!mejs.MediaFeatures.isiOS||!this.options.hideVolumeOnTouchDevices){var f=this,g=f.isVideo?f.options.videoVolume:f.options.audioVolume,h="horizontal"==g?a('<div class="mejs-button mejs-volume-button mejs-mute"><button type="button" aria-controls="'+f.id+'" title="'+f.options.muteText+'" aria-label="'+f.options.muteText+'"></button></div><a href="javascript:void(0);" class="mejs-horizontal-volume-slider"><span class="mejs-offscreen">'+f.options.allyVolumeControlText+'</span><div class="mejs-horizontal-volume-total"></div><div class="mejs-horizontal-volume-current"></div><div class="mejs-horizontal-volume-handle"></div></a>').appendTo(c):a('<div class="mejs-button mejs-volume-button mejs-mute"><button type="button" aria-controls="'+f.id+'" title="'+f.options.muteText+'" aria-label="'+f.options.muteText+'"></button><a href="javascript:void(0);" class="mejs-volume-slider"><span class="mejs-offscreen">'+f.options.allyVolumeControlText+'</span><div class="mejs-volume-total"></div><div class="mejs-volume-current"></div><div class="mejs-volume-handle"></div></a></div>').appendTo(c),i=f.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),j=f.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),k=f.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),l=f.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),m=function(a,b){if(!i.is(":visible")&&"undefined"==typeof b)return i.show(),m(a,!0),void i.hide();a=Math.max(0,a),a=Math.min(a,1),0===a?(h.removeClass("mejs-mute").addClass("mejs-unmute"),h.children("button").attr("title",mejs.i18n.t("Unmute")).attr("aria-label",mejs.i18n.t("Unmute"))):(h.removeClass("mejs-unmute").addClass("mejs-mute"),h.children("button").attr("title",mejs.i18n.t("Mute")).attr("aria-label",mejs.i18n.t("Mute")));var c=j.position();if("vertical"==g){var d=j.height(),e=d-d*a;l.css("top",Math.round(c.top+e-l.height()/2)),k.height(d-e),k.css("top",c.top+e)}else{var f=j.width(),n=f*a;l.css("left",Math.round(c.left+n-l.width()/2)),k.width(Math.round(n))}},n=function(a){var b=null,c=j.offset();if("vertical"===g){var d=j.height(),f=a.pageY-c.top;if(b=(d-f)/d,0===c.top||0===c.left)return}else{var h=j.width(),i=a.pageX-c.left;b=i/h}b=Math.max(0,b),b=Math.min(b,1),m(b),0===b?e.setMuted(!0):e.setMuted(!1),e.setVolume(b)},o=!1,p=!1;h.hover(function(){i.show(),p=!0},function(){p=!1,o||"vertical"!=g||i.hide()});var q=function(a){var b=Math.floor(100*e.volume);i.attr({"aria-label":mejs.i18n.t("Volume Slider"),"aria-valuemin":0,"aria-valuemax":100,"aria-valuenow":b,"aria-valuetext":b+"%",role:"slider",tabindex:0})};i.bind("mouseover",function(){p=!0}).bind("mousedown",function(a){return n(a),f.globalBind("mousemove.vol",function(a){n(a)}),f.globalBind("mouseup.vol",function(){o=!1,f.globalUnbind(".vol"),p||"vertical"!=g||i.hide()}),o=!0,!1}).bind("keydown",function(a){var b=a.keyCode,c=e.volume;switch(b){case 38:c=Math.min(c+.1,1);break;case 40:c=Math.max(0,c-.1);
+break;default:return!0}return o=!1,m(c),e.setVolume(c),!1}),h.find("button").click(function(){e.setMuted(!e.muted)}),h.find("button").bind("focus",function(){i.show()}),e.addEventListener("volumechange",function(a){o||(e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))),q(a)},!1),0===b.options.startVolume&&e.setMuted(!0),"native"===e.pluginType&&e.setVolume(b.options.startVolume),f.container.on("controlsresize",function(){e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{usePluginFullScreen:!0,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")}),a.extend(MediaElementPlayer.prototype,{isFullScreen:!1,isNativeFullScreen:!1,isInIframe:!1,fullscreenMode:"",buildfullscreen:function(b,c,d,e){if(b.isVideo){b.isInIframe=window.location!=window.parent.location,e.addEventListener("loadstart",function(){b.detectFullscreenMode()});var f=this,g=null,h=a('<div class="mejs-button mejs-fullscreen-button"><button type="button" aria-controls="'+f.id+'" title="'+f.options.fullscreenText+'" aria-label="'+f.options.fullscreenText+'"></button></div>').appendTo(c).on("click",function(){var a=mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||b.isFullScreen;a?b.exitFullScreen():b.enterFullScreen()}).on("mouseover",function(){if("plugin-hover"==f.fullscreenMode){null!==g&&(clearTimeout(g),delete g);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}}).on("mouseout",function(){"plugin-hover"==f.fullscreenMode&&(null!==g&&(clearTimeout(g),delete g),g=setTimeout(function(){e.hideFullscreenButton()},1500))});if(b.fullscreenBtn=h,f.globalBind("keydown",function(a){27==a.keyCode&&(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||f.isFullScreen)&&b.exitFullScreen()}),f.normalHeight=0,f.normalWidth=0,mejs.MediaFeatures.hasTrueNativeFullScreen){var i=function(a){b.isFullScreen&&(mejs.MediaFeatures.isFullScreen()?(b.isNativeFullScreen=!0,b.setControlsSize()):(b.isNativeFullScreen=!1,b.exitFullScreen()))};b.globalBind(mejs.MediaFeatures.fullScreenEventName,i)}}},detectFullscreenMode:function(){var a=this,b="",c=mejs.MediaFeatures;return c.hasTrueNativeFullScreen&&"native"===a.media.pluginType?b="native-native":c.hasTrueNativeFullScreen&&"native"!==a.media.pluginType&&!c.hasFirefoxPluginMovingProblem?b="plugin-native":a.usePluginFullScreen?mejs.MediaFeatures.supportsPointerEvents?(b="plugin-click",a.createPluginClickThrough()):b="plugin-hover":b="fullwindow",a.fullscreenMode=b,b},isPluginClickThroughCreated:!1,createPluginClickThrough:function(){var b=this;if(!b.isPluginClickThroughCreated){var c,d,e=!1,f=function(){if(e){for(var a in g)g[a].hide();b.fullscreenBtn.css("pointer-events",""),b.controls.css("pointer-events",""),b.media.removeEventListener("click",b.clickToPlayPauseCallback),e=!1}},g={},h=["top","left","right","bottom"],i=function(){var a=fullscreenBtn.offset().left-b.container.offset().left,d=fullscreenBtn.offset().top-b.container.offset().top,e=fullscreenBtn.outerWidth(!0),f=fullscreenBtn.outerHeight(!0),h=b.container.width(),i=b.container.height();for(c in g)g[c].css({position:"absolute",top:0,left:0});g.top.width(h).height(d),g.left.width(a).height(f).css({top:d}),g.right.width(h-a-e).height(f).css({top:d,left:a+e}),g.bottom.width(h).height(i-f-d).css({top:d+f})};for(b.globalBind("resize",function(){i()}),c=0,d=h.length;d>c;c++)g[h[c]]=a('<div class="mejs-fullscreen-hover" />').appendTo(b.container).mouseover(f).hide();fullscreenBtn.on("mouseover",function(){if(!b.isFullScreen){var a=fullscreenBtn.offset(),d=player.container.offset();media.positionFullscreenButton(a.left-d.left,a.top-d.top,!1),b.fullscreenBtn.css("pointer-events","none"),b.controls.css("pointer-events","none"),b.media.addEventListener("click",b.clickToPlayPauseCallback);for(c in g)g[c].show();i(),e=!0}}),media.addEventListener("fullscreenchange",function(a){b.isFullScreen=!b.isFullScreen,b.isFullScreen?b.media.removeEventListener("click",b.clickToPlayPauseCallback):b.media.addEventListener("click",b.clickToPlayPauseCallback),f()}),b.globalBind("mousemove",function(a){if(e){var c=fullscreenBtn.offset();(a.pageY<c.top||a.pageY>c.top+fullscreenBtn.outerHeight(!0)||a.pageX<c.left||a.pageX>c.left+fullscreenBtn.outerWidth(!0))&&(fullscreenBtn.css("pointer-events",""),b.controls.css("pointer-events",""),e=!1)}}),b.isPluginClickThroughCreated=!0}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;return mejs.MediaFeatures.isiOS&&mejs.MediaFeatures.hasiOSFullScreen&&"function"==typeof b.media.webkitEnterFullscreen?void b.media.webkitEnterFullscreen():(a(document.documentElement).addClass("mejs-fullscreen"),b.normalHeight=b.container.height(),b.normalWidth=b.container.width(),"native-native"===b.fullscreenMode||"plugin-native"===b.fullscreenMode?(mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function c(){if(b.isNativeFullScreen){var d=.002,e=a(window).width(),f=screen.width,g=Math.abs(f-e),h=f*d;g>h?b.exitFullScreen():setTimeout(c,500)}},1e3)):"fullwindow"==b.fullscreeMode,b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),setTimeout(function(){var c=a(window),d=c.width(),e=c.height();b.media.setVideoSize(d,e)},500)),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px"),void b.container.trigger("enteredfullscreen"))},exitFullScreen:function(){var b=this;clearTimeout(b.containerSizeTimeout),mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(b.normalWidth).height(b.normalHeight),"native"===b.media.pluginType?b.$media.width(b.normalWidth).height(b.normalHeight):(b.container.find(".mejs-shim").width(b.normalWidth).height(b.normalHeight),b.media.setVideoSize(b.normalWidth,b.normalHeight)),b.layers.children("div").width(b.normalWidth).height(b.normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),b.container.find(".mejs-captions-position").css("bottom",""),b.container.trigger("exitedfullscreen")}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){for(var g=null,h=null,i=null,j=null,k=[],l=!1,m=0,n=f.options.speeds.length;n>m;m++){var o=f.options.speeds[m];"string"==typeof o?(k.push({name:o+f.options.speedChar,value:o}),o===f.options.defaultSpeed&&(l=!0)):(k.push(o),o.value===f.options.defaultSpeed&&(l=!0))}l||k.push({name:f.options.defaultSpeed+f.options.speedChar,value:f.options.defaultSpeed}),k.sort(function(a,b){return parseFloat(b.value)-parseFloat(a.value)});var p=function(a){for(m=0,n=k.length;n>m;m++)if(k[m].value===a)return k[m].name},q='<div class="mejs-button mejs-speed-button"><button type="button">'+p(f.options.defaultSpeed)+'</button><div class="mejs-speed-selector"><ul>';for(m=0,il=k.length;m<il;m++)j=f.id+"-speed-"+k[m].value,q+='<li><input type="radio" name="speed" value="'+k[m].value+'" id="'+j+'" '+(k[m].value===f.options.defaultSpeed?" checked":"")+' /><label for="'+j+'" '+(k[m].value===f.options.defaultSpeed?' class="mejs-speed-selected"':"")+">"+k[m].name+"</label></li>";q+="</ul></div></div>",g=a(q).appendTo(c),h=g.find(".mejs-speed-selector"),i=f.options.defaultSpeed,e.addEventListener("loadedmetadata",function(a){i&&(e.playbackRate=parseFloat(i))},!0),h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");i=b,e.playbackRate=parseFloat(b),g.find("button").html(p(b)),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),g.one("mouseenter focusin",function(){h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),tracksAriaLive:!1,hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a,b,c,d){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g,h=this,i=h.options.tracksAriaLive?'role="log" aria-live="assertive" aria-atomic="false"':"";if(h.domNode.textTracks)for(f=h.domNode.textTracks.length-1;f>=0;f--)h.domNode.textTracks[f].mode="hidden";h.cleartracks(b,c,d,e),b.chapters=a('<div class="mejs-chapters mejs-layer"></div>').prependTo(d).hide(),b.captions=a('<div class="mejs-captions-layer mejs-layer"><div class="mejs-captions-position mejs-captions-position-hover" '+i+'><span class="mejs-captions-text"></span></div></div>').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('<div class="mejs-button mejs-captions-button"><button type="button" aria-controls="'+h.id+'" title="'+h.options.tracksText+'" aria-label="'+h.options.tracksText+'"></button><div class="mejs-captions-selector"><ul><li><input type="radio" name="'+b.id+'_captions" id="'+b.id+'_captions_none" value="none" checked="checked" /><label for="'+b.id+'_captions_none">'+mejs.i18n.t("None")+"</label></li></ul></div></div>").appendTo(c);var j=0;for(f=0;f<b.tracks.length;f++)g=b.tracks[f].kind,("subtitles"===g||"captions"===g)&&j++;for(h.options.toggleCaptionsButtonWhenOnlyOne&&1==j?b.captionsButton.on("click",function(){null===b.selectedTrack?lang=b.tracks[0].srclang:lang="none",b.setTrack(lang)}):(b.captionsButton.on("mouseenter focusin",function(){a(this).find(".mejs-captions-selector").removeClass("mejs-offscreen")}).on("click","input[type=radio]",function(){lang=this.value,b.setTrack(lang)}),b.captionsButton.on("mouseleave focusout",function(){a(this).find(".mejs-captions-selector").addClass("mejs-offscreen")})),b.options.alwaysShowControls?b.container.find(".mejs-captions-position").addClass("mejs-captions-position-hover"):b.container.bind("controlsshown",function(){b.container.find(".mejs-captions-position").addClass("mejs-captions-position-hover")}).bind("controlshidden",function(){e.paused||b.container.find(".mejs-captions-position").removeClass("mejs-captions-position-hover")}),b.trackToLoad=-1,b.selectedTrack=null,b.isLoadingTrack=!1,f=0;f<b.tracks.length;f++)g=b.tracks[f].kind,("subtitles"===g||"captions"===g)&&b.addTrackButton(b.tracks[f].srclang,b.tracks[f].label);b.loadNextTrack(),e.addEventListener("timeupdate",function(){b.displayCaptions()},!1),""!==b.options.slidesSelector&&(b.slidesContainer=a(b.options.slidesSelector),e.addEventListener("timeupdate",function(){b.displaySlides()},!1)),e.addEventListener("loadedmetadata",function(){b.displayChapters()},!1),b.container.hover(function(){b.hasChapters&&(b.chapters.removeClass("mejs-offscreen"),b.chapters.fadeIn(200).height(b.chapters.find(".mejs-chapter").outerHeight()))},function(){b.hasChapters&&!e.paused&&b.chapters.fadeOut(200,function(){a(this).addClass("mejs-offscreen"),a(this).css("display","block")})}),h.container.on("controlsresize",function(){h.adjustLanguageBox()}),null!==b.node.getAttribute("autoplay")&&b.chapters.addClass("mejs-offscreen")}},setTrack:function(a){var b,c=this;if("none"==a)c.selectedTrack=null,c.captionsButton.removeClass("mejs-captions-enabled");else for(b=0;b<c.tracks.length;b++)if(c.tracks[b].srclang==a){null===c.selectedTrack&&c.captionsButton.addClass("mejs-captions-enabled"),c.selectedTrack=c.tracks[b],c.captions.attr("lang",c.selectedTrack.srclang),c.displayCaptions();break}},loadNextTrack:function(){var a=this;a.trackToLoad++,a.trackToLoad<a.tracks.length?(a.isLoadingTrack=!0,a.loadTrack(a.trackToLoad)):(a.isLoadingTrack=!1,a.checkForTracks())},loadTrack:function(b){var c=this,d=c.tracks[b],e=function(){d.isLoaded=!0,c.enableTrackButton(d.srclang,d.label),c.loadNextTrack()};a.ajax({url:d.src,dataType:"text",success:function(a){"string"==typeof a&&/<tt\s+xml/gi.exec(a)?d.entries=mejs.TrackFormatParser.dfxp.parse(a):d.entries=mejs.TrackFormatParser.webvtt.parse(a),e(),"chapters"==d.kind&&c.media.addEventListener("play",function(){c.media.duration>0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.removeTrackButton(d.srclang),c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},removeTrackButton:function(a){var b=this;b.captionsButton.find("input[value="+a+"]").closest("li").remove(),b.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('<li><input type="radio" name="'+d.id+'_captions" id="'+d.id+"_captions_"+b+'" value="'+b+'" disabled="disabled" /><label for="'+d.id+"_captions_"+b+'">'+c+" (loading)</label></li>")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(var c=0;c<a.tracks.length;c++){var d=a.tracks[c].kind;if(("subtitles"===d||"captions"===d)&&a.tracks[c].isLoaded){b=!0;break}}b||(a.captionsButton.hide(),a.setControlsSize())}},displayCaptions:function(){if("undefined"!=typeof this.tracks){var a,b=this,c=b.selectedTrack;if(null!==c&&c.isLoaded){for(a=0;a<c.entries.times.length;a++)if(b.media.currentTime>=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('<img src="'+d+'">').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a<c.entries.times.length;a++)if(b.media.currentTime>=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a<b.tracks.length;a++)if("chapters"==b.tracks[a].kind&&b.tracks[a].isLoaded){b.drawChapters(b.tracks[a]),b.hasChapters=!0;break}},drawChapters:function(b){var c,d,e=this,f=0,g=0;for(e.chapters.empty(),c=0;c<b.entries.times.length;c++)d=b.entries.times[c].stop-b.entries.times[c].start,f=Math.floor(d/e.media.duration*100),(f+g>100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('<div class="mejs-chapter" rel="'+b.entries.times[c].start+'" style="left: '+g.toString()+"%;width: "+f.toString()+'%;"><div class="mejs-chapter-block'+(c==b.entries.times.length-1?" mejs-chapter-block-last":"")+'"><span class="ch-title">'+b.entries.text[c]+'</span><span class="ch-time">'+mejs.Utility.secondsToTimeCode(b.entries.times[c].start,e.options)+"&ndash;"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop,e.options)+"</span></div></div>")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f<g.length;f++){if(c=this.pattern_timecode.exec(g[f]),c&&f<g.length){for(f-1>=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f<g.length;)d=d+"\n"+g[f],f++;d=a.trim(d).replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi,"<a href='$1' target='_blank'>$1</a>"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e<j.length;e++)c[j[e].name.split(":")[1]]=j[e].value}for(e=0;e<g.length;e++){var k,l={start:null,stop:null,style:null};if(g.eq(e).attr("begin")&&(l.start=mejs.Utility.convertSMPTEtoSeconds(g.eq(e).attr("begin"))),!l.start&&g.eq(e-1).attr("end")&&(l.start=mejs.Utility.convertSMPTEtoSeconds(g.eq(e-1).attr("end"))),g.eq(e).attr("end")&&(l.stop=mejs.Utility.convertSMPTEtoSeconds(g.eq(e).attr("end"))),!l.stop&&g.eq(e+1).attr("begin")&&(l.stop=mejs.Utility.convertSMPTEtoSeconds(g.eq(e+1).attr("begin"))),c){k="";for(var m in c)k+=m+":"+c[m]+";"}k&&(l.style=k),0===l.start&&(l.start=.2),i.times.push(l),d=a.trim(g.eq(e).html()).replace(/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi,"<a href='$1' target='_blank'>$1</a>"),i.text.push(d)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c<a.length;c++)e+=a.substring(c,c+1),b.test(e)&&(d.push(e.replace(b,"")),e="");return d.push(e),d})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{contextMenuItems:[{render:function(a){return"undefined"==typeof a.enterFullScreen?null:a.isFullScreen?mejs.i18n.t("Turn off Fullscreen"):mejs.i18n.t("Go Fullscreen")},click:function(a){a.isFullScreen?a.exitFullScreen():a.enterFullScreen()}},{render:function(a){return a.media.muted?mejs.i18n.t("Unmute"):mejs.i18n.t("Mute")},click:function(a){a.media.muted?a.setMuted(!1):a.setMuted(!0)}},{isSeparator:!0},{render:function(a){return mejs.i18n.t("Download Video")},click:function(a){window.location.href=a.media.currentSrc}}]}),a.extend(MediaElementPlayer.prototype,{buildcontextmenu:function(b,c,d,e){b.contextMenu=a('<div class="mejs-contextmenu"></div>').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='<div class="mejs-contextmenu-separator"></div>';else{var i=f[g].render(d);null!=i&&(e+='<div class="mejs-contextmenu-item" data-itemindex="'+g+'" id="element-'+1e6*Math.random()+'">'+i+"</div>")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{skipBackInterval:30,skipBackText:mejs.i18n.t("Skip back %1 seconds")}),a.extend(MediaElementPlayer.prototype,{buildskipback:function(b,c,d,e){var f=this,g=f.options.skipBackText.replace("%1",f.options.skipBackInterval);a('<div class="mejs-button mejs-skip-back-button"><button type="button" aria-controls="'+f.id+'" title="'+g+'" aria-label="'+g+'">'+f.options.skipBackInterval+"</button></div>").appendTo(c).click(function(){e.setCurrentTime(Math.max(e.currentTime-f.options.skipBackInterval,0)),a(this).find("button").blur()})}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d,e){var f=this,g=f.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof g&&(b.postroll=a('<div class="mejs-postroll-layer mejs-layer"><a class="mejs-postroll-close" onclick="$(this).parent().hide();return false;">'+f.options.postrollCloseText+'</a><div class="mejs-postroll-layer-content"></div></div>').prependTo(d).hide(),f.media.addEventListener("ended",function(c){a.ajax({dataType:"html",url:g,success:function(a,b){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$);
\ No newline at end of file
diff --git a/core/media/media/js/mediafield-mootools.js b/core/media/media/js/mediafield-mootools.js
new file mode 100644
index 00000000..26408f37
--- /dev/null
+++ b/core/media/media/js/mediafield-mootools.js
@@ -0,0 +1,63 @@
+function jInsertFieldValue(value, id) {
+	var $ = jQuery.noConflict();
+	var old_value = $("#" + id).val();
+	if (old_value != value) {
+		var $elem = $("#" + id);
+		$elem.val(value);
+		$elem.trigger("change");
+		if (typeof($elem.get(0).onchange) === "function") {
+			$elem.get(0).onchange();
+		}
+		jMediaRefreshPreview(id);
+	}
+}
+
+function jMediaRefreshPreview(id) {
+	var $ = jQuery.noConflict();
+	var value = $("#" + id).val();
+	var $img = $("#" + id + "_preview");
+	var basepath = $("#" + id).data("basepath");
+
+	if ($img.length) {
+		if (value) {
+			$img.attr("src", basepath + value);
+			$("#" + id + "_preview_empty").hide();
+			$("#" + id + "_preview_img").show()
+		} else {
+			$img.attr("src", "");
+			$("#" + id + "_preview_empty").show();
+			$("#" + id + "_preview_img").hide();
+		}
+	}
+}
+
+function jMediaRefreshPreviewTip(tip)
+{
+	var $ = jQuery.noConflict();
+	var $tip = $(tip);
+	var $img = $tip.find("img.media-preview");
+
+	$img.each(function(index, value) {
+		$tip.find("div.tip").css("max-width", "none");
+		var id = $(this).attr("id");
+		id = id.substring(0, id.length - "_preview".length);
+		jMediaRefreshPreview(id);
+		$tip.show(this);
+	});
+}
+
+// JQuery for tooltip for INPUT showing whole image path
+function jMediaRefreshImgpathTip(tip, els)
+{
+	var $ = jQuery.noConflict();
+	var $tip = $(tip);
+	$tip.css("max-width", "none");
+	var $imgpath = $(els).val();
+	$("#TipImgpath").html($imgpath);
+
+	if ($imgpath.length) {
+		$tip.show();
+	} else {
+		$tip.hide();
+	}
+}
\ No newline at end of file
diff --git a/core/media/media/js/mediafield-mootools.min.js b/core/media/media/js/mediafield-mootools.min.js
new file mode 100644
index 00000000..f688386c
--- /dev/null
+++ b/core/media/media/js/mediafield-mootools.min.js
@@ -0,0 +1 @@
+function jInsertFieldValue(e,i){var t=jQuery.noConflict(),n=t("#"+i).val();if(n!=e){var r=t("#"+i);r.val(e),r.trigger("change"),"function"==typeof r.get(0).onchange&&r.get(0).onchange(),jMediaRefreshPreview(i)}}function jMediaRefreshPreview(e){var i=jQuery.noConflict(),t=i("#"+e).val(),n=i("#"+e+"_preview"),r=i("#"+e).data("basepath");n.length&&(t?(n.attr("src",r+t),i("#"+e+"_preview_empty").hide(),i("#"+e+"_preview_img").show()):(n.attr("src",""),i("#"+e+"_preview_empty").show(),i("#"+e+"_preview_img").hide()))}function jMediaRefreshPreviewTip(e){var i=jQuery.noConflict(),t=i(e),n=t.find("img.media-preview");n.each(function(){t.find("div.tip").css("max-width","none");var e=i(this).attr("id");e=e.substring(0,e.length-"_preview".length),jMediaRefreshPreview(e),t.show(this)})}function jMediaRefreshImgpathTip(e,i){var t=jQuery.noConflict(),n=t(e);n.css("max-width","none");var r=t(i).val();t("#TipImgpath").html(r),r.length?n.show():n.hide()}
\ No newline at end of file
diff --git a/core/media/media/js/mediafield.js b/core/media/media/js/mediafield.js
new file mode 100644
index 00000000..fee40fec
--- /dev/null
+++ b/core/media/media/js/mediafield.js
@@ -0,0 +1,267 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license	    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Field media
+ */
+;(function($){
+	'use strict';
+
+	if (!Function.prototype.bind) {
+		Function.prototype.bind = function(oThis) {
+			if (typeof this !== 'function') {
+				// closest thing possible to the ECMAScript 5
+				// internal IsCallable function
+				throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
+			}
+
+			var aArgs   = Array.prototype.slice.call(arguments, 1),
+			    fToBind = this,
+			    fNOP    = function() {},
+			    fBound  = function() {
+				    return fToBind.apply(this instanceof fNOP && oThis
+						    ? this
+						    : oThis,
+					    aArgs.concat(Array.prototype.slice.call(arguments)));
+			    };
+
+			fNOP.prototype = this.prototype;
+			fBound.prototype = new fNOP();
+
+			return fBound;
+		};
+	}
+
+	$.fieldMedia = function(container, options){
+		// Merge options with defaults
+		this.options = $.extend({}, $.fieldMedia.defaults, options);
+
+		// Set up elements
+		this.$container = $(container);
+		this.$modal = this.$container.find(this.options.modal);
+		this.$modalBody = this.$modal.children('.modal-body');
+		this.$input = this.$container.find(this.options.input);
+		this.$containerPreview = this.$container.find(this.options.previewContainer);
+		this.$buttonSelect = this.$container.find(this.options.buttonSelect);
+		this.$buttonClear  = this.$container.find(this.options.buttonClear);
+
+		// Bind events
+		this.$buttonSelect.on('click', this.modalOpen.bind(this));
+		this.$buttonClear.on('click', this.clearValue.bind(this));
+		this.$modal.on('hide', this.removeIframe.bind(this));
+
+		// Update preview for existing value
+		this.updatePreview();
+	};
+
+	// display modal for select the file
+	$.fieldMedia.prototype.modalOpen = function() {
+		var $iframe = $('<iframe>', {
+			name: 'field-media-modal',
+			src: this.options.url.replace('{field-media-id}', this.$input.attr('id')),
+			width: this.options.modalWidth,
+			height: this.options.modalHeight
+		});
+		this.$modalBody.append($iframe);
+		this.$modal.modal('show');
+		$('body').addClass('modal-open');
+
+		var self = this; // save context
+		$iframe.load(function(){
+			var content = $(this).contents();
+
+			// bind insert
+			content.on('click', self.options.buttonSaveSelected, function(){
+				var value = content.find('#f_url').val();
+				if (value) {
+					self.setValue(value);
+				}
+				self.modalClose.call(self);
+			});
+
+			// bind cancel
+			content.on('click', '.button-cancel', function(){
+				$('body').removeClass('modal-open');
+				self.modalClose.bind(self);
+			});
+		});
+	};
+
+	// close modal
+	$.fieldMedia.prototype.modalClose = function() {
+		this.$modal.modal('hide');
+		$('body').removeClass('modal-open');
+		this.$modalBody.empty();
+	};
+
+	// Clear the iframe
+	$.fieldMedia.prototype.removeIframe = function() {
+		this.$modalBody.empty();
+		$('body').removeClass('modal-open');
+	};
+
+	// set the value
+	$.fieldMedia.prototype.setValue = function(value) {
+		this.$input.val(value).trigger('change');
+		this.updatePreview();
+	};
+
+	// clear the value
+	$.fieldMedia.prototype.clearValue = function() {
+		this.setValue('');
+	};
+
+	// update preview
+	$.fieldMedia.prototype.updatePreview = function() {
+		if (!this.options.preview) {
+			return;
+		}
+
+		if (this.options.preview && !this.options.previewAsTooltip) {
+			var value = this.$input.val();
+
+			if (!value) {
+				this.$containerPreview.append('');
+			} else {
+				var imgPreview = new Image();
+				imgPreview.src = this.options.basepath + value;
+				if (imgPreview.width > imgPreview.height) {
+					this.$containerPreview.html($('<img>',{src: imgPreview.src, style: 'width: ' + this.options.previewWidth + 'px'}));
+				} else {
+					this.$containerPreview.html($('<img>',{src: imgPreview.src, style: 'height: ' + this.options.previewHeight + 'px'}));
+				}
+			}
+		} else {
+			// Reset tooltip and preview
+			try {
+				this.$containerPreview.popover('destroy');
+				this.$input.tooltip('destroy');
+			} catch(err) {
+				// Doing this so that jQueryUI tooltips and popover can exist alongside Bootstrap.
+			}
+
+			var value = this.$input.val();
+
+			if (!value) {
+				this.$containerPreview.popover();
+			} else {
+				var imgPreview = new Image(this.options.previewWidth, this.options.previewHeight);
+				imgPreview.src = this.options.basepath + value;
+
+				this.$containerPreview.popover({content: imgPreview});
+				this.$input.tooltip({placement: 'top', title: value});
+			}
+		}
+	};
+
+	// default options
+	$.fieldMedia.defaults = {
+		basepath: '', // base path to file
+		buttonClear: '.button-clear', // selector for button to clear the value
+		buttonSelect: '.button-select', // selector for button to change the value
+		buttonSaveSelected: '.button-save-selected', // selector for button to save the selected value
+		input: '.field-media-input', // selector for the input
+		preview: true, // whether use the preview
+		previewAsTooltip: true, // whether use the preview
+		previewContainer: '.field-media-preview', // selector for the preview container
+		previewWidth: 200, // preview width
+		previewHeight: 200, // preview height
+		url: 'index.php?option=com_media&tmpl=component', // url for load the iframe
+		modal: '.modal', // modal selector
+		modalWidth: '100%', // modal width
+		modalHeight: '300px', // modal height
+	};
+
+	$.fn.fieldMedia = function(options){
+		return this.each(function(){
+			var $el = $(this), instance = $el.data('fieldMedia');
+			if(!instance){
+				var options = options || {},
+					data = $el.data();
+
+				// Check options in the element
+				for (var p in data) {
+					if (data.hasOwnProperty(p)) {
+						options[p] = data[p];
+					}
+				}
+
+				instance = new $.fieldMedia(this, options);
+				$el.data('fieldMedia', instance);
+			}
+		});
+	};
+
+	// Initialise all defaults
+	$(document).ready(function(){
+		$('.field-media-wrapper').fieldMedia();
+	});
+
+})(jQuery);
+
+// Compatibility with mootools modal layout
+function jInsertFieldValue(value, id) {
+	var $ = jQuery.noConflict();
+	var old_value = $("#" + id).val();
+	if (old_value != value) {
+		var $elem = $("#" + id);
+		$elem.val(value);
+		$elem.trigger("change");
+		if (typeof($elem.get(0).onchange) === "function") {
+			$elem.get(0).onchange();
+		}
+		jMediaRefreshPreview(id);
+	}
+}
+
+function jMediaRefreshPreview(id) {
+	var $ = jQuery.noConflict();
+	var value = $("#" + id).val();
+	var $img = $("#" + id + "_preview");
+	var basepath = $("#" + id).data("basepath");
+
+	if ($img.length) {
+		if (value) {
+			$img.attr("src", basepath + value);
+			$("#" + id + "_preview_empty").hide();
+			$("#" + id + "_preview_img").show()
+		} else {
+			$img.attr("src", "");
+			$("#" + id + "_preview_empty").show();
+			$("#" + id + "_preview_img").hide();
+		}
+	}
+}
+
+function jMediaRefreshPreviewTip(tip)
+{
+	var $ = jQuery.noConflict();
+	var $tip = $(tip);
+	var $img = $tip.find("img.media-preview");
+
+	$img.each(function(index, value) {
+		$tip.find("div.tip").css("max-width", "none");
+		var id = $(this).attr("id");
+		id = id.substring(0, id.length - "_preview".length);
+		jMediaRefreshPreview(id);
+		$tip.show(this);
+	});
+}
+
+// JQuery for tooltip for INPUT showing whole image path
+function jMediaRefreshImgpathTip(tip, els)
+{
+	var $ = jQuery.noConflict();
+	var $tip = $(tip);
+	$tip.css("max-width", "none");
+	var $imgpath = $(els).val();
+	$("#TipImgpath").html($imgpath);
+
+	if ($imgpath.length) {
+		$tip.show();
+	} else {
+		$tip.hide();
+	}
+}
diff --git a/core/media/media/js/mediafield.min.js b/core/media/media/js/mediafield.min.js
new file mode 100644
index 00000000..df655c04
--- /dev/null
+++ b/core/media/media/js/mediafield.min.js
@@ -0,0 +1 @@
+;(function($){'use strict';if(!Function.prototype.bind){Function.prototype.bind=function(a){if(typeof this!=='function'){throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');}var b=Array.prototype.slice.call(arguments,1),fToBind=this,fNOP=function(){},fBound=function(){return fToBind.apply(this instanceof fNOP&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};fNOP.prototype=this.prototype;fBound.prototype=new fNOP();return fBound}}$.fieldMedia=function(a,b){this.options=$.extend({},$.fieldMedia.defaults,b);this.$container=$(a);this.$modal=this.$container.find(this.options.modal);this.$modalBody=this.$modal.children('.modal-body');this.$input=this.$container.find(this.options.input);this.$containerPreview=this.$container.find(this.options.previewContainer);this.$buttonSelect=this.$container.find(this.options.buttonSelect);this.$buttonClear=this.$container.find(this.options.buttonClear);this.$buttonSelect.on('click',this.modalOpen.bind(this));this.$buttonClear.on('click',this.clearValue.bind(this));this.$modal.on('hide',this.removeIframe.bind(this));this.updatePreview()};$.fieldMedia.prototype.modalOpen=function(){var c=$('<iframe>',{name:'field-media-modal',src:this.options.url.replace('{field-media-id}',this.$input.attr('id')),width:this.options.modalWidth,height:this.options.modalHeight});this.$modalBody.append(c);this.$modal.modal('show');$('body').addClass('modal-open');var d=this;c.load(function(){var b=$(this).contents();b.on('click',d.options.buttonSaveSelected,function(){var a=b.find('#f_url').val();if(a){d.setValue(a)}d.modalClose.call(d)});b.on('click','.button-cancel',function(){$('body').removeClass('modal-open');d.modalClose.bind(d)})})};$.fieldMedia.prototype.modalClose=function(){this.$modal.modal('hide');$('body').removeClass('modal-open');this.$modalBody.empty()};$.fieldMedia.prototype.removeIframe=function(){this.$modalBody.empty();$('body').removeClass('modal-open')};$.fieldMedia.prototype.setValue=function(a){this.$input.val(a).trigger('change');this.updatePreview()};$.fieldMedia.prototype.clearValue=function(){this.setValue('')};$.fieldMedia.prototype.updatePreview=function(){if(!this.options.preview){return}if(this.options.preview&&!this.options.previewAsTooltip){var a=this.$input.val();if(!a){this.$containerPreview.append('')}else{var b=new Image();b.src=this.options.basepath+a;if(b.width>b.height){this.$containerPreview.html($('<img>',{src:b.src,style:'width: '+this.options.previewWidth+'px'}))}else{this.$containerPreview.html($('<img>',{src:b.src,style:'height: '+this.options.previewHeight+'px'}))}}}else{try{this.$containerPreview.popover('destroy');this.$input.tooltip('destroy')}catch(err){}var a=this.$input.val();if(!a){this.$containerPreview.popover()}else{var b=new Image(this.options.previewWidth,this.options.previewHeight);b.src=this.options.basepath+a;this.$containerPreview.popover({content:b});this.$input.tooltip({placement:'top',title:a})}}};$.fieldMedia.defaults={basepath:'',buttonClear:'.button-clear',buttonSelect:'.button-select',buttonSaveSelected:'.button-save-selected',input:'.field-media-input',preview:true,previewAsTooltip:true,previewContainer:'.field-media-preview',previewWidth:200,previewHeight:200,url:'index.php?option=com_media&tmpl=component',modal:'.modal',modalWidth:'100%',modalHeight:'300px',};$.fn.fieldMedia=function(c){return this.each(function(){var a=$(this),instance=a.data('fieldMedia');if(!instance){var b=b||{},data=a.data();for(var p in data){if(data.hasOwnProperty(p)){b[p]=data[p]}}instance=new $.fieldMedia(this,b);a.data('fieldMedia',instance)}})};$(document).ready(function(){$('.field-media-wrapper').fieldMedia()})})(jQuery);function jInsertFieldValue(a,b){var $=jQuery.noConflict();var c=$("#"+b).val();if(c!=a){var d=$("#"+b);d.val(a);d.trigger("change");if(typeof(d.get(0).onchange)==="function"){d.get(0).onchange()}jMediaRefreshPreview(b)}}function jMediaRefreshPreview(a){var $=jQuery.noConflict();var b=$("#"+a).val();var c=$("#"+a+"_preview");var d=$("#"+a).data("basepath");if(c.length){if(b){c.attr("src",d+b);$("#"+a+"_preview_empty").hide();$("#"+a+"_preview_img").show()}else{c.attr("src","");$("#"+a+"_preview_empty").show();$("#"+a+"_preview_img").hide()}}}function jMediaRefreshPreviewTip(d){var $=jQuery.noConflict();var e=$(d);var f=e.find("img.media-preview");f.each(function(a,b){e.find("div.tip").css("max-width","none");var c=$(this).attr("id");c=c.substring(0,c.length-"_preview".length);jMediaRefreshPreview(c);e.show(this)})}function jMediaRefreshImgpathTip(a,b){var $=jQuery.noConflict();var c=$(a);c.css("max-width","none");var d=$(b).val();$("#TipImgpath").html(d);if(d.length){c.show()}else{c.hide()}}
\ No newline at end of file
diff --git a/core/media/media/js/mediamanager.js b/core/media/media/js/mediamanager.js
new file mode 100644
index 00000000..640ff064
--- /dev/null
+++ b/core/media/media/js/mediamanager.js
@@ -0,0 +1,191 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * JMediaManager behavior for media component
+ *
+ * @package		Joomla.Extensions
+ * @subpackage  Media
+ * @since		1.5
+ */
+;(function( $, scope ) {
+	"use strict";
+
+	var MediaManager = scope.MediaManager = {
+
+		/**
+		 * Basic setup
+		 *
+		 * @return  void
+		 */
+		initialize: function() {
+			this.folderpath = $( '#folderpath' );
+
+			this.updatepaths = $( 'input.update-folder' );
+
+			this.frame = window.frames.folderframe;
+			this.frameurl = this.frame.location.href;
+		},
+
+		/**
+		 * Called from outside. Only ever called with task 'folder.delete'
+		 *
+		 * @param   string  task  [description]
+		 *
+		 * @return  void
+		 */
+		submit: function( task ) {
+			var form = this.frame.document.getElementById( 'mediamanager-form' );
+			form.task.value = task;
+
+			if ( $( '#username' ).length ) {
+				form.username.value = $( '#username' ).val();
+				form.password.value = $( '#password' ).val();
+			}
+
+			form.submit();
+		},
+
+		/**
+		 * [onloadframe description]
+		 *
+		 * @return  {[type]}
+		 */
+		onloadframe: function() {
+			// Update the frame url
+			this.frameurl = this.frame.location.href;
+
+			var folder = this.getFolder() || '',
+				query = [],
+				a = getUriObject( $( '#uploadForm' ).attr( 'action' ) ),
+				q = getQueryObject( a.query ),
+				k, v;
+
+			this.updatepaths.each( function( path, el ) {
+				el.value = folder;
+			} );
+
+			this.folderpath.value = basepath + (folder ? '/' + folder : '');
+
+			q.folder = folder;
+
+			for ( k in q ) {
+				if (!q.hasOwnProperty( k )) { continue; }
+
+				v = q[ k ];
+				query.push( k + (v === null ? '' : '=' + v) );
+			}
+
+			a.query = query.join( '&' );
+			a.fragment = null;
+
+			$( '#uploadForm' ).attr( 'action', buildUri(a) );
+			$( '#' + viewstyle ).addClass( 'active' );
+		},
+
+		/**
+		 * Switch the view type
+		 *
+		 * @param  string  type  'thumbs' || 'details'
+		 */
+		setViewType: function( type ) {
+			$( '#' + type ).addClass( 'active' );
+			$( '#' + viewstyle ).removeClass( 'active' );
+			viewstyle = type;
+			var folder = this.getFolder();
+
+			this.setFrameUrl( 'index.php?option=com_media&view=mediaList&tmpl=component&folder=' + folder + '&layout=' + type );
+		},
+
+		refreshFrame: function() {
+			this.setFrameUrl();
+		},
+
+		getFolder: function() {
+			var args = getQueryObject( this.frame.location.search.substring( 1 ) );
+
+			args.folder = args.folder === undefined ? '' : args.folder;
+
+			return args.folder;
+		},
+
+		setFrameUrl: function( url ) {
+			if ( url !== null ) {
+				this.frameurl = url;
+			}
+
+			this.frame.location.href = this.frameurl;
+		},
+	};
+
+	/**
+	 * Convert a query string to an object
+	 *
+	 * @param   string  q  A query string (no leading ?)
+	 *
+	 * @return  object
+	 */
+	function getQueryObject( q ) {
+		var rs = {};
+
+		q = q || '';
+
+		$.each( q.split( /[&;]/ ),
+			function( key, val ) {
+				var keys = val.split( '=' );
+
+				rs[ decodeURIComponent(keys[ 0 ]) ] = keys.length == 2 ? decodeURIComponent(keys[ 1 ]) : null;
+			});
+
+		return rs;
+	}
+
+	/**
+	 * Break a url into its component parts
+	 *
+	 * @param   string  u  URL
+	 *
+	 * @return  object
+	 */
+	function getUriObject( u ) {
+		var bitsAssociate = {},
+			bits = u.match( /^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/ );
+
+		$.each([ 'uri', 'scheme', 'authority', 'domain', 'port', 'path', 'directory', 'file', 'query', 'fragment' ],
+			function( key, index ) {
+				bitsAssociate[ index ] = ( !!bits && !!bits[ key ] ) ? bits[ key ] : '';
+			});
+
+		return bitsAssociate;
+	}
+
+	/**
+	 * Build a url from component parts
+	 *
+	 * @param   object  o  Such as the return value of `getUriObject()`
+	 *
+	 * @return  string
+	 */
+	function buildUri ( o ) {
+		return o.scheme + '://' + o.domain +
+			(o.port ? ':' + o.port : '') +
+			(o.path ? o.path : '/') +
+			(o.query ? '?' + o.query : '') +
+			(o.fragment ? '#' + o.fragment : '');
+	}
+
+	$(function() {
+		// Added to populate data on iframe load
+		MediaManager.initialize();
+
+		document.updateUploader = function() {
+			MediaManager.onloadframe();
+		};
+
+		MediaManager.onloadframe();
+	});
+
+}( jQuery, window ));
+
diff --git a/core/media/media/js/mediamanager.min.js b/core/media/media/js/mediamanager.min.js
new file mode 100644
index 00000000..a8460236
--- /dev/null
+++ b/core/media/media/js/mediamanager.min.js
@@ -0,0 +1 @@
+!function(e,t){"use strict";function a(t){var a={};return t=t||"",e.each(t.split(/[&;]/),function(e,t){var r=t.split("=");a[decodeURIComponent(r[0])]=2==r.length?decodeURIComponent(r[1]):null}),a}function r(t){var a={},r=t.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);return e.each(["uri","scheme","authority","domain","port","path","directory","file","query","fragment"],function(e,t){a[t]=r&&r[e]?r[e]:""}),a}function n(e){return e.scheme+"://"+e.domain+(e.port?":"+e.port:"")+(e.path?e.path:"/")+(e.query?"?"+e.query:"")+(e.fragment?"#"+e.fragment:"")}var o=t.MediaManager={initialize:function(){this.folderpath=e("#folderpath"),this.updatepaths=e("input.update-folder"),this.frame=window.frames.folderframe,this.frameurl=this.frame.location.href},submit:function(t){var a=this.frame.document.getElementById("mediamanager-form");a.task.value=t,e("#username").length&&(a.username.value=e("#username").val(),a.password.value=e("#password").val()),a.submit()},onloadframe:function(){this.frameurl=this.frame.location.href;var t,o,i=this.getFolder()||"",l=[],u=r(e("#uploadForm").attr("action")),s=a(u.query);this.updatepaths.each(function(e,t){t.value=i}),this.folderpath.value=basepath+(i?"/"+i:""),s.folder=i;for(t in s)s.hasOwnProperty(t)&&(o=s[t],l.push(t+(null===o?"":"="+o)));u.query=l.join("&"),u.fragment=null,e("#uploadForm").attr("action",n(u)),e("#"+viewstyle).addClass("active")},setViewType:function(t){e("#"+t).addClass("active"),e("#"+viewstyle).removeClass("active"),viewstyle=t;var a=this.getFolder();this.setFrameUrl("index.php?option=com_media&view=mediaList&tmpl=component&folder="+a+"&layout="+t)},refreshFrame:function(){this.setFrameUrl()},getFolder:function(){var e=a(this.frame.location.search.substring(1));return e.folder=void 0===e.folder?"":e.folder,e.folder},setFrameUrl:function(e){null!==e&&(this.frameurl=e),this.frame.location.href=this.frameurl}};e(function(){o.initialize(),document.updateUploader=function(){o.onloadframe()},o.onloadframe()})}(jQuery,window);
\ No newline at end of file
diff --git a/core/media/media/js/popup-imagemanager.js b/core/media/media/js/popup-imagemanager.js
new file mode 100644
index 00000000..f751f991
--- /dev/null
+++ b/core/media/media/js/popup-imagemanager.js
@@ -0,0 +1,335 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * JImageManager behavior for media component
+ *
+ * @package		Joomla.Extensions
+ * @subpackage	Media
+ * @since		1.5
+ */
+
+(function ($, doc)
+{
+	'use strict';
+
+	window.ImageManager = {
+
+		/**
+		 * Initialization
+		 *
+		 * @return  void
+		 */
+		initialize: function ()
+		{
+			var o = this.getUriObject(window.self.location.href),
+				q = this.getQueryObject(o.query);
+
+			var options = Joomla.getOptions('mediamanager');
+
+			this.author = options.author;
+			this.base   = options.base;
+			this.asset  = options.asset;
+			this.editor = decodeURIComponent(q.e_name);
+
+			// Setup image manager fields object
+			this.fields = {
+				'url': doc.getElementById("f_url"),
+				'alt': doc.getElementById("f_alt"),
+				'align': doc.getElementById("f_align"),
+				'title': doc.getElementById("f_title"),
+				'caption': doc.getElementById("f_caption"),
+				'c_class': doc.getElementById("f_caption_class")
+			};
+
+			// Setup image listing objects
+			this.folderlist = doc.getElementById('folderlist');
+			this.frame = window.frames.imageframe;
+			this.frameurl = this.frame.location.href;
+
+			// Setup image listing frame
+			$('#imageframe').on('load', function ()
+			{
+				ImageManager.onloadimageview();
+			});
+
+			// Setup folder up button
+			$('#upbutton').off('click').on('click', function ()
+			{
+				ImageManager.upFolder();
+			});
+		},
+
+		/**
+		 * Called when the iframe is reloaded.
+		 * Updates the form action with the correct folder.
+		 * This should really be a hidden input rather than part of the action, no?
+		 *
+		 * @return  void
+		 */
+		onloadimageview: function ()
+		{
+			var folder = this.getImageFolder(),
+				$form = $('#uploadForm'),
+				portString = '', a, q;
+
+			// Update the frame url
+			this.frameurl = this.frame.location.href;
+			this.setFolder(folder);
+
+			a = this.getUriObject($form.attr('action'));
+			q = this.getQueryObject(a.query);
+			q.folder = folder;
+			a.query = $.param(q);
+
+			if (typeof (a.port) !== 'undefined' && a.port != 80)
+			{
+				portString = ':' + a.port;
+			}
+
+			$form.attr('action', a.scheme + '://' + a.domain + portString + a.path + '?' + a.query);
+		},
+
+		/**
+		 * Get the current directory based on the query string of the iframe
+		 *
+		 * @return  string
+		 */
+		getImageFolder: function ()
+		{
+			return this.getQueryObject(this.frame.location.search.substring(1)).folder.replace(/%2F/gi, "/");
+		},
+
+		/**
+		 * Called from outside when the 'OK' button (maybe 'insert' or 'submit', whatever) is clicked.
+		 *
+		 * @return  boolean  Always true
+		 */
+		onok: function ()
+		{
+			var tag = '',
+				attr = [],
+				figclass = '',
+				captionclass = '',
+			// Get the image tag field information
+				url = this.fields.url.value,
+				alt = this.fields.alt.value,
+				align = this.fields.align.value,
+				title = this.fields.title.value,
+				caption = this.fields.caption.value,
+				c_class = this.fields.c_class.value;
+
+			if (url)
+			{
+				// Set alt attribute
+				attr.push('alt="' + alt + '"');
+
+				// Set align attribute
+				if (align && !caption)
+				{
+					attr.push('class="pull-' + align + '"');
+				}
+
+				// Set title attribute
+				if (title)
+				{
+					attr.push('title="' + title + '"');
+				}
+
+				tag = '<img src="' + url + '" ' + attr.join(' ') + '/>';
+
+				// Process caption
+				if (caption)
+				{
+					if (align)
+					{
+						figclass = ' class="pull-' + align + '"';
+					}
+
+					if (c_class)
+					{
+						captionclass = ' class="' + c_class + '"';
+					}
+
+					tag = '<figure' + figclass + '>' + tag + '<figcaption' + captionclass + '>' + caption + '</figcaption></figure>';
+				}
+			}
+
+			/** Use the API, if editor supports it **/
+			if (window.Joomla && Joomla.editors.instances.hasOwnProperty(this.editor)) {
+				Joomla.editors.instances[editor].replaceSelection(tag)
+			} else {
+				window.parent.jInsertEditorText(tag, this.editor);
+			}
+
+			return true;
+		},
+
+		/**
+		 * Called from outside when the directory selector is used.
+		 *
+		 * @param   string  folder  The folder to switch to
+		 * @param   mixed   asset   Probably an integer or undefined, optional
+		 * @param   mixed   author  Probably an integer or undefined, optional
+		 *
+		 * @return  void
+		 */
+		setFolder: function (folder, asset, author)
+		{
+                       folder = folder.replace(/%2F/gi, "/");
+			for (var i = 0, l = this.folderlist.length; i < l; i++)
+			{
+				if (folder == this.folderlist.options[i].value)
+				{
+					this.folderlist.selectedIndex = i;
+					$(this.folderlist)
+						.trigger('liszt:updated') // Mootools
+						.trigger('chosen:updated'); // jQuery
+
+					break;
+				}
+			}
+
+			if (!!asset || !!author)
+			{
+				this.setFrameUrl(folder, asset, author);
+			}
+		},
+
+		/**
+		 * Move up one directory
+		 *
+		 * @return  void
+		 */
+		upFolder: function ()
+		{
+			var path = this.folderlist.value.split('/'),
+				search;
+
+			path.pop();
+			search = path.join('/');
+
+			this.setFolder(search);
+			this.setFrameUrl(search, this.asset, this.author);
+		},
+
+		/**
+		 * Called from outside when a file is selected
+		 *
+		 * @param   string  file  Relative path to the file.
+		 *
+		 * @return  void
+		 */
+		populateFields: function (file)
+		{
+		    $.each($('a.img-preview', $('#imageframe').contents()), function(i, v) {
+			if (v.href == "javascript:ImageManager.populateFields('" + file + "')") {
+			    $(v, $('#imageframe').contents()).addClass('selected');
+			} else {
+			    $(v, $('#imageframe').contents()).removeClass('selected');
+			}
+		    });
+
+		    $("#f_url").val(this.base + file);
+		},
+
+		/**
+		 * Not used.
+		 * Should display messages. There are none.
+		 *
+		 * @param   string  text  The message text
+		 *
+		 * @return  void
+		 */
+		showMessage: function (text)
+		{
+			var $message = $('#message');
+
+			$message.find('>:first-child').remove();
+			$message.append(text);
+			$('#messages').css('display', 'block');
+		},
+
+		/**
+		 * Not used.
+		 * Refreshes the iframe
+		 *
+		 * @return  void
+		 */
+		refreshFrame: function ()
+		{
+			this.frame.location.href = this.frameurl;
+		},
+
+		/**
+		 * Sets the iframe url, loading a new page. Usually for changing directory.
+		 *
+		 * @param  string  folder  Relative path to directory
+		 * @param  mixed   asset   Probably an integer or undefined, optional
+		 * @param  mixed   author  Probably an integer or undefined, optional
+		 */
+		setFrameUrl: function (folder, asset, author)
+		{
+			var qs = {
+				option: 'com_media',
+				view: 'imagesList',
+				tmpl: 'component',
+				asset: asset,
+				author: author
+			};
+
+			// Don't run folder through params because / will end up double encoded.
+			this.frameurl = 'index.php?' + $.param(qs) + '&folder=' + folder;
+			this.frame.location.href = this.frameurl;
+		},
+
+		/**
+		 * Convert a query string to an object
+		 *
+		 * @param   string  q  A query string (no leading ?)
+		 *
+		 * @return  object
+		 */
+		getQueryObject: function (q)
+		{
+			var rs = {};
+
+			$.each((q || '').split(/[&;]/), function (key, val)
+			{
+				var keys = val.split('=');
+
+				rs[keys[0]] = keys.length == 2 ? keys[1] : null;
+			});
+
+			return rs;
+		},
+
+		/**
+		 * Break a url into its component parts
+		 *
+		 * @param   string  u  URL
+		 *
+		 * @return  object
+		 */
+		getUriObject: function (u)
+		{
+			var bitsAssociate = {},
+				bits = u.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);
+
+			$.each(['uri', 'scheme', 'authority', 'domain', 'port', 'path', 'directory', 'file', 'query', 'fragment'], function (key, index)
+			{
+				bitsAssociate[index] = (!!bits && !!bits[key]) ? bits[key] : '';
+			});
+
+			return bitsAssociate;
+		}
+	};
+
+	$(function ()
+	{
+		window.ImageManager.initialize();
+	});
+
+}(jQuery, document));
diff --git a/core/media/media/js/popup-imagemanager.min.js b/core/media/media/js/popup-imagemanager.min.js
new file mode 100644
index 00000000..464cacf0
--- /dev/null
+++ b/core/media/media/js/popup-imagemanager.min.js
@@ -0,0 +1 @@
+(function($,doc){'use strict';window.ImageManager={initialize:function(){var o=this.getUriObject(window.self.location.href),q=this.getQueryObject(o.query);var options=Joomla.getOptions('mediamanager');this.author=options.author;this.base=options.base;this.asset=options.asset;this.editor=decodeURIComponent(q.e_name);this.fields={'url':doc.getElementById("f_url"),'alt':doc.getElementById("f_alt"),'align':doc.getElementById("f_align"),'title':doc.getElementById("f_title"),'caption':doc.getElementById("f_caption"),'c_class':doc.getElementById("f_caption_class")};this.folderlist=doc.getElementById('folderlist');this.frame=window.frames.imageframe;this.frameurl=this.frame.location.href;$('#imageframe').on('load',function(){ImageManager.onloadimageview()});$('#upbutton').off('click').on('click',function(){ImageManager.upFolder()})},onloadimageview:function(){var folder=this.getImageFolder(),$form=$('#uploadForm'),portString='',a,q;this.frameurl=this.frame.location.href;this.setFolder(folder);a=this.getUriObject($form.attr('action'));q=this.getQueryObject(a.query);q.folder=folder;a.query=$.param(q);if(typeof(a.port)!=='undefined'&&a.port!=80){portString=':'+a.port}$form.attr('action',a.scheme+'://'+a.domain+portString+a.path+'?'+a.query)},getImageFolder:function(){return this.getQueryObject(this.frame.location.search.substring(1)).folder.replace(/%2F/gi,"/")},onok:function(){var tag='',attr=[],figclass='',captionclass='',url=this.fields.url.value,alt=this.fields.alt.value,align=this.fields.align.value,title=this.fields.title.value,caption=this.fields.caption.value,c_class=this.fields.c_class.value;if(url){attr.push('alt="'+alt+'"');if(align&&!caption){attr.push('class="pull-'+align+'"')}if(title){attr.push('title="'+title+'"')}tag='<img src="'+url+'" '+attr.join(' ')+'/>';if(caption){if(align){figclass=' class="pull-'+align+'"'}if(c_class){captionclass=' class="'+c_class+'"'}tag='<figure'+figclass+'>'+tag+'<figcaption'+captionclass+'>'+caption+'</figcaption></figure>'}}if(window.Joomla&&Joomla.editors.instances.hasOwnProperty(this.editor)){Joomla.editors.instances[editor].replaceSelection(tag)}else{window.parent.jInsertEditorText(tag,this.editor)}return true},setFolder:function(folder,asset,author){folder=folder.replace(/%2F/gi,"/");for(var i=0,l=this.folderlist.length;i<l;i++){if(folder==this.folderlist.options[i].value){this.folderlist.selectedIndex=i;$(this.folderlist).trigger('liszt:updated').trigger('chosen:updated');break}}if(!!asset||!!author){this.setFrameUrl(folder,asset,author)}},upFolder:function(){var path=this.folderlist.value.split('/'),search;path.pop();search=path.join('/');this.setFolder(search);this.setFrameUrl(search,this.asset,this.author)},populateFields:function(file){$.each($('a.img-preview',$('#imageframe').contents()),function(i,v){if(v.href=="javascript:ImageManager.populateFields('"+file+"')"){$(v,$('#imageframe').contents()).addClass('selected')}else{$(v,$('#imageframe').contents()).removeClass('selected')}});$("#f_url").val(this.base+file)},showMessage:function(text){var $message=$('#message');$message.find('>:first-child').remove();$message.append(text);$('#messages').css('display','block')},refreshFrame:function(){this.frame.location.href=this.frameurl},setFrameUrl:function(folder,asset,author){var qs={option:'com_media',view:'imagesList',tmpl:'component',asset:asset,author:author};this.frameurl='index.php?'+$.param(qs)+'&folder='+folder;this.frame.location.href=this.frameurl},getQueryObject:function(q){var rs={};$.each((q||'').split(/[&;]/),function(key,val){var keys=val.split('=');rs[keys[0]]=keys.length==2?keys[1]:null});return rs},getUriObject:function(u){var bitsAssociate={},bits=u.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);$.each(['uri','scheme','authority','domain','port','path','directory','file','query','fragment'],function(key,index){bitsAssociate[index]=(!!bits&&!!bits[key])?bits[key]:''});return bitsAssociate}};$(function(){window.ImageManager.initialize()})}(jQuery,document));
\ No newline at end of file
diff --git a/core/media/media/js/silverlightmediaelement.xap b/core/media/media/js/silverlightmediaelement.xap
new file mode 100644
index 0000000000000000000000000000000000000000..38a9cc490bf7e66037bd83e5c0ab7aad83e08942
GIT binary patch
literal 12459
zcmaKTQ*b3v(`_(uCYqQNYm%JUC$??d=ESyb+qP|-*vW(w+xh2v`tSX!?%n%g)vnt8
zu)DjetJhvFF9rDx9SjT>77X2?SUjnIL176D3@jcT3=HKT3fSAr7}#2vnm9SryBpY8
z2ggoJLNcNUKLuQ&+=7iq&CvuZQLUO3t2+=ex6TA-5+!I&^JF3rjjP$8<+<j&yg2}8
zIIn8$R@hOf5s`Qz_s5P^AE)Z)xi$#1#wYS+h(ifz@v>TijFk11mx?cYR5;sZUPgTc
zdTC)iY9bxTh9{hG*}!=joS>h?g=kyFXX9XVJ#~dbO+^4M??G3gu)fesOrq46k2&-G
zkVR4bt&Sx$thIk%B~=_9d?<$IothcL?<fggRuUl5i`!X|WTVzYyc;M-oLRO(N`;@r
zx7hSRF!}$>1ykCN91HaS-kt^qhW8JYEUaBk9IY+P%$;RSj4cdAtW9i8Y@O+it*tM-
z5uCL~U3R^Z$@l{xB;*T#m?i>oCJH2Q5JP&X1QJQc3KVpbMPwWGLV<lh;1GraiTEX0
ziiI`pfU*RXwrmzzEtK_(xj$N6TBdC`tvCO$*esuNSv=i4C2&<Y+GHfMtrg{3XR@h0
zZgbxe6803JbIWK24t1q-yIpR!I~~ttd)yIHTzRl_faO8;@;!t1QSy5|_BZpT-fXl#
zuygILZ0K!1!kO$3+b|=n71ZjV+=*Jwr^+7Qd5*J}zC;ywF=Rdw@UUHIftWS>4jgt!
zETjn_(&X{u-uwD25-%t7Z2!u0fe{W0XZmfuAVLG*eKHca@YSGpzz%8s2JBxs^mnvi
zlRqcb{*nO2pO8?Tf6%$$zA*LScD>KWg5CGKczI#|eYY6AN7dqzU!YIA=DI7hUNO?Y
zu_1Nv?W4lAi0e|=$bR;ABPV=Z>ha4zyl>h~b~n|$s_f^MpEkY5ao`;g(cJrCC-{Qc
zfG+Yi1cn(?)w33p2N^TbwtfX=f1uKRChVFuOep<WOOEZ2|4maYPxl8%Fz?~pdS9Lo
zCA<3*oV?b3G%QUA%3N<aliR`9wB?r!cIkVvmI53oIUD=2Rk3`l4$~tY6?aePm_7t$
zeb2I8n2P=ZZBOXS^jA-bjrliiZRfykv8K0H{j!}Xf2XoZmnBX?FPq__-(Xo>kCAv%
zSKIj3{%=8L_4!ENco?@vKMOa?iCg8Vk5#{xvtN;-aL1(k`&7~IwWv#dDZzQuTygCN
z>w0q~FZXdjn=lkU(P<0VoDsHw9`Ks+c){yzeOxgvm9*l`CLbzLYa-VaE`#I{Wh0$&
z`y=~cH;iLUfztw%f3!Th+?O6w@q=1E6(if4!lgRf+J=jTw3p{hI@hLCd6LIvwQjj<
zdqLzA&XJL+^mz0SVIWNh4NCg%{e~R+k3m75*Fcc($V$9NOd&~?HCa&Q4B=TAO1OCu
zM9*?SDDAE;0%5tIo7S~CR9ECKW56iwt}Oze0=ONid&2H-Y@em}jfJxnxGA7&Wp|Q2
zb~U`~JJpDYnTHBo$9I8Ld0I_;Q87Bn(BOp$s&0yjT^S~U^by&phhE(ze0jFG+Yb3l
z8*K_>h94cO>8|w5n&T6qDgk9hJ+aUI{cB8f`M8O&M?)oUhA>nFH4h_<-*^w#^*5(i
zqDM4(Drke2V$V4J(0TKi2(d(NeyOOo2?&+}A4pD(zQA#DkPalj?<X@EhJL@%VGWZ@
zL0wrz;nNLwZwx}&SJnH%K1kGjA|ms0F^R@@fanx@`1tW1l8|gzhzuur8a4Ru4e51c
zsDynhLbrS{v`gA+0TK1!g9ECY6M03MvAoV&pRmT0u&M26#%E#BMvGB2J;{DSjWY}F
z2Jz&!K?(+{gMyl^p|)ZG@n{IR2`}si2F~Aya7V+&r5%QdPgOPX=<>m@H1JGNvMThZ
zu~#<uM<QsI+h))_m_?b-G&HX0ff_u2|6_D53W?ky1H}*6fLd@OUpq&mTKxH=gsB#5
zLRty#NK>d~3%6m>`pk^VGa*0;G_IDtQANn<O&8R;s$c&d>w@hwL%pqdIV2Gki|ze!
zx!O!q3uZN>(yt?+k$%H|U#>TEqy6Smh-IfX^^W5aQ{Nj<Cvu@DSB;}yx=<7zALH-(
z1G@8R*ZvjDP@h1~PuN$Z4N*4%Pt6`Vy@Wk3#1%nB|D+oeWK|v><CNK1D0b>gdQ()R
z->8-KG1jJ(i_v&jcM?cvychALRH&3?&{T=}V`y<EqG;}#Gbi>@nd<$LU7~tjpeAag
zAD7frcsX^eHJ&JrSQn~!6wD?$OWxg+QM9@O<P&QTxr&S}9C={KiG2`enD|)8p^Gk%
z^jh7k#4@prhj$4C(R9G|{QM1-i~*FiT_aM$!YQrR{Lw4q_kbZi{?hFGU5RZbMS~?}
z0&2&C)?6lqhY!!rASQgQkP4<)ukmJ$<Xk?~s*IpWF-=A-8d>WPjG#)>-#q7vk<kh2
z1tJ(}SgfupJ~Q<dx)1v&u)i>;<2<@os5O2=>OZ3m)%r!#PjkdNE^5KHFm6fb{5L{m
zUg$FQdzEAC^z|TV)cN_!z5^?+uSKHG-srvS?S3wgxFNw-wmeX@*jcSFOLZ={^gn}>
z@GP~=-zaZT4F1h~mcib!MzrseYe*B(%prtf?rkZC5u1U;{#{`c=@4~e+rsK<V<ku1
z+M?@UeKDdzUyot-^Q_~u@#sFX4(Y%kzFl--Qo+G2wh>~|h=;h2YbnyIQo<Rhmxig6
zJbc&^scYo;n`o@({GckoX%%Y^In#1E7WV~CcSvh6^KvED_{{w=lvf}s+I94qNbUEY
z@ibEoIV6tADqm;5h!5)28a0oBx3?-4LNDyVT&1Bt{5arEDP8WWyO7icM=drNOKjco
zfYZpXXZZV1isc7944?vgc|7*;<7p7w!FlgKN};^r)56%ux`{|Zkw(!NMZ<z1C~a=5
zDTd3WW2NGza>ZQga1}F*+@OfpgtU8GH&DIOLX`k-Y8dSI(a4o<q3D5C6hBjy9goO1
zw66DwRD)!h<w|Rff>f~!R@iYy>t6)%<t6xF`r<Dy-X8pgT0n^A<dNSCm-5kHSAkt?
zZwRa)qy19h;Vv}+v||FwO}Y}hh0#WrbjL82#U8hd&QjlWO3i~(I+_AO$Di2)ZeHS`
zyLm_6)_}8J6L6Ur+RQb+4cek^%$3qM=>lHx$r&z3?#%%qXZTTt0WDacP`@2w?#TC0
zTPL1ocri3q4=~E}EvF@)d1&w9^MmGoRrUHMtw)~9i4!cwy619}Du;flf?Wbr0q)}k
zhBfb+9IJiv(;eMQA`JP8UDVH&l3PI;bkGhNWdVDlhxzE3NmQH>HKq0<oRb7rl*uwg
zViN;}`6GO%-w)-`8+=#I8+b+cG1J%a{ayuCp_Cm5xt76m7quHc4R71qNGtghlJyw0
zh8p=oq7g6V`k;=Is?IYMmro+I@C5?MU9>}jYt{O%!{U-pGu=db1qGwZA6VRW0$`L|
zXt*_gu1y>dtr?4x8|DW?hoGGpwbW18(5pOxjNG3&M9qaB>+3spEg~-WSNz1)HV-YH
zTK8`2&WN3%6b4DD{0eGbt3H_ZTmV~UWOk?yoAT+BZjA1Ea7Q9=XwPx`s@jI20itc~
zZDtL-i}b4c%%iQT#YZOH+Tc>8`?3Je4@S<2Y_u<-u${qYyrCS?1Ns(MnHm}^tu8tt
zoVs?zb9j^#VIQH;vN>`x(?Mf7e9j$7KR4pMY3)~lO6-`$j~=eEYRt#(fuo#c#+Z){
zsE?}>k<0DhfJcsz%l&q&AAAy+>H8m7@mhKX)htl8$wnJ?M3i5_s~zLFH}8gP`_*h1
zwxvqGwfZW!(OT64QuksqYihBtPbqF9e?}sjTmW+_?TZj4J+suRe3x~vsNEM5!KGaU
zJS!G66E;jLtiaGbpM`g{7|cU7Es~|@2&e}%<zFSycItD40k&v!s;O`~QgfN#oC7N%
z+#3BTbTFD9;7+_Toe2b5VNZ%BH#4E`Z7`cs^R%GujWCnW`^a<seCpBMGW~p78`ygP
z#YRPbl|GMqokr6E!6IeubP83Q%=>d=Hqkd^;#>Rap`nBpV%A*5YeM{Tgz9-v%7pny
zo?U&~a<sOq?VOt=bA$#jA1>UtQ@c6#mLys_oON?uEgGEi%{)6x3;I-<oqW346SL;`
z6K$THh?2s3c_#e%fbc($>k}!r#pea45GBnCmK$cd>%MWHzE7mc#=k#3wDQ#gzT&No
z;o+aL{1D;-M8+IOWFphX1PPfH0kJ(woWHU0x@_2?cRv5vU2f@7{md*!V;gZZU`%C*
zdBu_}9?03-GxQYDlE#3HTx-h5dSEW**VMxY=1%9f19;F7M?x5iFr5aWglH{a(0*KZ
zdOsp3ZaD3|!oGT|2tP(0DvJEE<jUkO&A&dzl1$X3$mB{|#H`;3W6P`9-r%sX)6ke`
z)hL6oXaiRj8L_#vfpfHY%=u+Gl9t1O<0+feOW~GSZte50rx-WwW<u*>>|c*Ctx-_!
z<WEirK%PBp@(L*<d%tv5@MP3c(q=ICnBpnKi!4W@h<@1{PI7Q92L%0rAA8kiOQoY@
zW_J~x!N3yxIL%^AlB2U67Nn`Zh(FkOX3L$Q#nKC1Si(GZoGeVX7cge*HuD13;!*!`
z1m&XkEv`vh7=VZ(zkT$O;y#R(@!=!97Hh7)*5zoPXVcRivz)8rw-@>d=}nlKVy0jo
zW1l}w7e#qgvovb=y<%VXRtvs7?$^;-gxF2+$77R|F&5HcI+iD>2Ac~ZWl0{UG_6~U
z##d!1*NpRv><P7Nx5$IM7RC2}VXpe9`@EyEG{(u~PFofAlltuJS<{b-$A9~H3B|i+
z(H>ULPWjGmn~`po_yUl6Vsi`BO`9>9e_uWYkH4v1gL2_4qw?;IpVk+;6ow*t$envg
z*m3)r4CJ1z2=2lu=b`EGC+&j6h*acFwo%W^aG;*~!9pQx4n?QJRi{jI`a*GAF7*_Y
zLSKA)w<>V-Ecxu6NR@2u1L8v`KwQY(8GVmAZ7&x2rdCplKphlZ8SQ;17d-(DsnB~R
zOp~ZXv(0;koPN{E(IaWnBRi~H9Yxv1T$>Xn(L;7bgok={+^Z%q^gFax?38wN9d&CA
z7?fP>xI+Bi%?3vZnlZl9$Z(CUJa0a8JkoCREibAS<*Eh7Z&m&+5>>RX6?B-C)T^aM
zZ1VnL%s+}L-`gChxjv^TGOb&sT3ss?JQ~SNomKTPQ1)d{qgDhb^!QokYm(7b)>JOj
zBN}+WP!Xg|SYXN=PRK6bvK!>H4U`QKaJnVXVv6YSca%6}=BRooE)X?=!h(6Y^T4ZK
z<65iSkL?bOXdfBzw@?wJ+T!XSiU}@f&R2Ql7pV;%8&;oLiuX*GbAd~*r`e7rbk4yy
zBlcTb`aLH;ZA2g{F$rQZTuwPPn__epchVHnrrqexs2EjzaXR_jX3m*4$10nzRLc5`
zOLFjHg%lsJW)sG8k74T^1rT`qS>L>;=QamhxiXY!mGD()ACBjatJDs1OpaA(7oR&;
z_*As1sHje3IA(O<?K#!e?z-SirlT)*EMi$Vrin$+vDU+J=0>AoN#m)EWUd*WGT`l2
zHg>O1chV6lY~YC5v%2R%f-v%smBUH5Dj%@~JRzyoJ3&U}PUW`iE{FP>$5_s_G1wMu
z%z4tEz2IH7a$7(WKNVX4R&rg9z~^3Z_J1;}5LasQzq3<~#%#J@!&@Pt|D1^S5e1ep
zOdmFVyquHR4Q2l_y}L8_MaFA#IONXT8?dI3N`?vi{Y=yyO&;hlS;r5+hKCMZIi6qE
zC`$K&3ChQ+7TxIO>F(kvJ=Qh2J&aEJOguOmIjR?=$)=;b(!2<8?TDK^VkH()vIVXa
z)S}_e#{9Xjwai{<Qv3A2w}h9O>&>+N-hH<9T9{R_$oJ`L%BuN5WZc(VkWs(hUITr_
z)n&YwlbPw0Kc}yLUdg6GpF3bXSwhP+0uY8N$+?KrnV6(gs=R0n)BcJLns|dECH?;D
zd!<~_q<?`eY|V|R(6g48ypSdk$+gjAkoAST-W*u22tOI*mDnTCf+9(A5J*buZ*FWn
zz@C6Oba1n(PlYB<MoIOXj4%p$1Y+En1U0j4;A!iivQ#%()tNPb2sNPfkI4p0IkrT@
z%bvW*9Ug2|7h6w?JFc5Mb8zbwCiB}-bbZK^i;sAWasJU_(zptu2YhhtuxdA9MaYuI
zZ#}1Zo_6I0pE41rLKDYB`eCccqZQ2QTDlB9EtcLE^G^pI-R#0Gvx{bvJFCByE6TUc
z<X^GQ25#PyZ8+WXYB*CEYF(!tRT4VMH9n9xOTWOZr5fYyf1-!)E7D?yK^L|?GJ)>_
zYNkn0zX?O$ka4}4@RP)0!->HR-tdzF118(;0Vv<a43quTe{qF11%%tHqf1a+_?iDi
zjij`yOa{}uV>ORX!dW)aTi;h?$`XI|ri@${w$#w0$^Q97xHQ)xbJnvgh+swdC(e0$
z>p4tv>vEU7@RP}@U%#zus)_~v5Lc+*)XDpxCpCFVfyD`9#ds|J4Z`1^X&xj9N0*M6
zpbnw1lZMkT;=z;^CHf<f)Zg8lj1lceo%k<I2}Hxi!hUgxPWvdod3$_TQuKj!!Fm17
z&~NfA&*29UOmX65^Vlm;Y$nx~!B*VF78UNp7L`AnlT|CfHyb^Ny!LA{XEsNFBcV#N
z4;Vygp+J!l&Ts{tasM34O<O`X<q8U<N0oveR5vpxiz%ce)6a)>M1dnKWW>D120y4b
zX9@B~4<8P^iKmhT;zx(>-&~LBqlKP`lcbfw+|>&1*Vb7Fd(*m+#@Ma9z>@x*hO%5&
zUgzo{{y>5XKt(6hq)ft|U?s$?i;w46=U`GQJ5xxY97qVa4|7K#PuRmAN4n4@LxWqi
zRRyGkQ3&OC^eu_AG>X9{r5KsJH|>|@;;lTJ+XWKTt6310tPxIqKkoq<WYLUNQ9Fd`
zGG}C$Xo*CAYa7RLbi3$>S1PTH{UjW_p-vk)UYd+r&84m*NGx}PXhLOm>mHOk(U&{J
zNpNXtN}~bvU6Ibul_w~C;V@o>oBl#WRv~E#pO`6-2~ru&I%>E(gruEDB2>v`t0;5*
zl`4}<USl(4igQw%gv4cZI}f>TI)11ayngth>kwAywN7WwN2q4!Q@#1OW`rF%IR3?e
z!q_teNgK*aw7N6D6(be_@}hPVmIzVy84Ww;C1I~moCJ*!@wHBu1@T6nh49FoimQJ`
z*g2{eZIQ+wP~eZXPE-0fO)llQ%Mq@CagQ{@sK=3j!Zz;3qN&>!ONk6yJP3`{L_uWV
zU*4TefxO0^3?(us(Ph{$^+22l#R#T+Ubfl8a%$_oMUW>Vv0vOAfD0dFSkLjAUGOO&
z(Tf-+261E0!J?p3B)c(h4JdULB5?*mr_a+TA)R1N+yOgU6zb&|L?tDD22Cg}Ipbc)
zT=GxUS+Q;~W+LNRb$OaINn{Y}aGX7TUy0GR5ElDz&D^&;)6mSEkZRXvv@zG*#=mn}
z<<2u&HXQ!=!8ueJnOV5$LtAndR>^5jGmEfJa4UJIy$>hMF1b*EmDylkZs#%_iaZ&y
zr9x>q4H@0T#k^)Io59Y9a*5XygVtG#%<JxbvN9V>#h5<5A&c8PaH!^y;(gVUPfWD+
zc8}o^eMn1xay$?DU=j&z|9*(~aO1^sl3DQEM+Q}DB!P`Zc{u!|L~-~-wZ!d$y8f}~
zxOm+{CnmF8vf-!>hhf4-*UGjQn|!Hqxxzm|2lUQb+Lg&*g}W1HTSwQhZpMInCS25m
zwAI&Uu1V$$xx}JhT_2%pw2XOZK~`EitJ$5T%QS{nvc*B$XgK<l|BiQ>`B0;9oaPwd
zda(yGWD9M<<YrEsD1ArFngJHUG0L+#9>|f&;*|^fr`n-giEhkUKQ3l9q<6Tx@^7zO
zvMsWZ$VP!=rBp6&uPu##<=j+aLpMRv5PdX;r^LV^2A?^xq<6&WXlq(O>IYpgj!Ll}
zRM9JJ8)C@8%}JI8)NA}UP27JNo|9graVb|#uBm34evQhC@{|PeYh;{WSSF3}5GtwZ
zY*u<Km=x7qX>kLjxOg|`t<{&qZdLG;Y8TS1J!woZgqSwXWwwoJs<S~A;+i^j<^*r%
zWgO9^JL}A(slV8pvnb8hp+T8hvki9aBmb&kMtZSAg}KF0?}W@qod?;Nw+><oo%&Ks
zQ&SKtr~>~Fhp(!|*Pkq$>d9h&HZ4p;m&{4x2GZ0IJ0-+dcRiz{E+4LDX(YS^uHi1E
zS6NJ^Rkua$<EZ%T+?6PWEEgrI_Jv|iPPKL`Gkabpo%*cu6Mu7!5x5K!(k1~ry-Den
z8k5aRwSL?Os|B4Et}wDk8Jj2I{yZMX%93%hv*4tW+wCKMH`YFOM8*R*01X$8GGWi1
ziBNXLC|@Ax+mCu<7R=(#iW~ic@d|Gybi^REd;q2t%4ARYocK@FaA84%4iOYY3ekUM
zL==KpTb2^?Mw|*2d6X{9yv&XSCv3RzCheOr+8&_b8|1kDFZ8H6x*&NLMl>;fL39LY
zl73+hbdxH0Xu?~W5Xf=$UnyatGC79YKc&@s!tH<J4^9|*nUSQCse1p2=l_K-Isq41
zsLvTP4I5(qo0k)9l#NU*OsNWo94m4Wlc|LTom@8D(`0K*mI+0|u@WXwwR0M~*%^Qq
zCY;c=Y_>-p2%75$pvjRX%(s~vB;j&nGjGH;3lG%WComr<pfSy;lZNZFphhOLOtO+d
z3RKKg8OyU#ri9IJWx`b!2vqWt0V)YL$!el1Qj>>Z=%^Elew`{nRNi;0IZQU(*tWMD
z$-mwI&OS7rmW{DlT#ZsYN7-@Je?0*g=_$_H_VA6-#YIO75t7(dYhFP3ozow6VF$5#
z(r<@65|7nnE#h<aq3TC!1Ix|%9m_Rh=i92!+xShOyEk{q&US!>Gu6?Q8UzGY>F=c$
zS5K@fz6;nzE&cMx#M@SwI@n$-J3gPC$Q`=d<ZilKo#g6UOP^C#rTw#@-@8bNJKxLz
zUhE@V*BjS7BYLLp3hiPJgL36qDwOXbuXorqNC7+Jdsv!fpz7)vRm!ZR>v`3J>t@vg
z`%Q^<Y9uLq;J{vKR?v$Xw%cHC8}Ps}u<_!GadTjg5b5e@Zugp!;~ff#Z*cEvy=U_X
zT8=w7a|7;Q#20<KK6LE!v)7*@FYK(`29E*G11sy{m8ws7*tV|!^4m5*+jz{^g-9%m
z&rvC|XLwJAz1h<U#=!O>@A)q`>>Wf%_Vpb>tc&x&zu%S+EUuW=r#?NBE||{<2mR@d
zb#8;Zj8U#EKz&Hr#~N<J23-z)><=W*%f6YnyklNMcCR5Pg<(vOGSCW7Zzzfx<uGqH
zdT)86B_Buvea1Cm^Rwd)nJas4L1ZtdhJJ|J6?F!tql_;1qM%{tf&}U6F9j0OIR&BZ
zjbgW0*U+E^gTf-tEwio|t@>-;wI2H>e5Zoe6bM|px$v>QFW*@R6Yps<40WKZtpQ;$
zG+6*~r~l^3@wo|Y=z4|Yoe1A2WlwMS8aWvd!r<_Xh3}&kZs49g$VwCZS2^H~17ERR
zIcv}xe|vlnkI}i0`uL4;irW`@5aT!$;I;YUgze*ZKy<h{%k2v{$l&yjH)96qI`hI5
zijCX{VjUv2!6w*yi?>X|A$NZHI}bg~0z`Ua!0oo4kq8-k`^ssr$tKkO<t9K_`B;;^
zWJ>hK$mDHqnc`a&)?%mL0ZMkkgJlvn*V#4{(_|&|mr2SX#-xWxribs+E`3r=hc5U~
z$VIOrmYs!I9eF>Mz(eu6u1(V=9nTokah>o-LA7I`t^;(-(>tc-D3+Cey)h6spqcR1
zH4-#yU`d)}eAWtZ`SD&T?Tuma*#Cu#PWNh6Wrxt^D_+zyS$;K%-Xvdvf<nz+`q?U7
zZPkvfWHU(O;xviBiTE@DlAYRs&y6ovpLDqHznTD18QKP>8lT0acw7tV$roK(Y6NNh
zL`C-kt~#P$>_<s=cNb&1_UDd)U>NPddKi>?L&}NM;KM-(>TduZQYGJ2#ekn)N+mtZ
zOd;#O9>PVsE3YU)dznnhcHIyP>R6cNdbZx&LwkAB-E-@a-X8?AyhvZI50rZ@C{bZu
zL`{Uj-S(-{F5IyLHrJ}@>!;_z-q*J2>sQVPVP4dV%f*n_T{3*geOF=VU5gh-L|O{^
zn<9;)NtGJfL6q8+!>yxNo%xE7&-kHt_(z;PqkEa0UTK4F%%5)@pN;rmd6C;y&wsuz
zJu@QQ4my0A99shTps)N6uJJ>2_pYIkd~*l?<&FwcZ~xwo{WCA(F~0)U_Dp{2pbYjW
z*ZIJ8B8p<!%7*^{*$7|s%~kUk(s}9);Zx*EcG$D+lT;ntV`p#7&F{?}|IT)6$(N!x
z7!G>iRZd{ltxBtqhrGp=xmpb%*o1s@KKRkT%P8}<%~5Yu7O@c<nBUcI1UA^}8pIJr
zD@QZy62;^t?V<T%J*seMB>lySc%`_$XUBc1rmH`8<#b|_ldC*n<v5YrRwJhG8lBGr
zfyL>?7dmU$h9rDxSJNI4$3XI@GRjx`C6qOmW=GyI=ZR`G*(e7&Z^^sxI2GX4cSk!W
zF@NW<Kia7Dl5-0;OPTEY;FN=fQTxiC!za&X@IEOS=Ak}v{TF*@>xBUEAe&+Td3)tF
zB+j$q4v2U)3Mj|qKK9dm`bwhQl{|L%b4&p1@y!R`DOWz{>>arLV0}CqpLonoH2mnZ
zR9$v)J)14-(%VsD70p#+d+v!kvIG_q+b6t2@qpS^YZdC*+Og1#aDZ&|j{0n`#xGO;
z)lFLfoNnF>=(<qK4PtO5P!+mPrf25?_uXz*YS(%(O+5+jtONBrTbwc7J6mDz%osFq
z7uYKHu06!P=1Hc-_U&EL!t(jIUm$9z5}o)&dWw+4@j&p+e>9#sQPm@p&b)QN-7ew-
z*FGj;i7l)XoO4cdAopKZP(Q;juc!{r>`0BZKS+ysYCg$B<OcYheMP&WG`n+0?E{}8
zUOE2KjlW2pky?V@)XsdCTjO3muM`d)9)MR*OO&80HKkbE)b8pS6eR@4X3Drh+0n!^
zInNc&997@`-$Xpsz{oVYM*NgL_Ac(ai`>KOCxDlr$9U(g0|HNEb8Mw=Of!r=)TJF<
z-(cKu9c(EhzF)7?x83i%gYGa{1J9c75QEd#JAh53oq_9L_`{okK|L6nkx^`5v;l7S
zzQv&dN910q0q!7jIWjk3W^WQdAW)Df^o^q{cW@HlCu~s8>6s~Xmy8Q9*=QnQq0m;P
z6vSSkao#JobPSR!*HhM0{gU0<hvgWE*&tAg;p?k^DN0b*qEGdumGW|xvg=)X<z@Qx
zuBTZY{o6<Qw=9@f59Z2-aKkRUf9Lnh;Vsn;7FD~O;_R=(rj5M$4QA$c{Bs6$+{3^Z
zSD7*|PO{bQEsbOhfZc6?O)#{-vjn@J-j60_4re5ZEA}JWv8f4ZfF3yQsi60{5LN>@
z_pY%Iaq{e+rm1`ci)#M3*F(#j-5}AY5@ehZ+o=<nSeXH9&CTfCIVBuA$OGqAs^m#v
z(R^j(J<oV?#WXWQNJ>F86Gs{yreYiHGU9p|n|=!!{Thh^DPq(mgMmR64<Fy)v7dg*
z6G#@9GmUP}uC<s6&?&DuWpb0DNplJ%I$`c4rT)otv0(tb`ZW$OTO^4)HA9!pS%{-~
z)aNKco02#LHx-dB+-1s~;iEaX`;00<rS<169VdcdLTS=$*0}yzon}_rG{wB1C(z0b
zlMY3xG;K8?1xqXP-lz12Bs-XyT-Yq2iDkzIVYB9tl{7QtCQu`!DC+P{tU`n{hv8TL
z_UUr=k|SS3+*!AKna|8PMAlrY<m%EAIu(y9zb#YWLT0fj+y#2K=#?#6{i0|~5rJ{P
z7Vcuu*`6|{%OnzN0=gfg!*N_}&E%UX(=nJEMuc004}$_NCT(MRd=bV{`=TaL=@PL9
z`PoAQwU~rNbqIPqO%?5}3B6F~0a0XR;)#Wt)28TD5r{W1TvmJf34?x5vcq2u<c4@a
zPQ1>`E6u4tch~J2NP*VPUNn(^YT;^88uU{^v=w{gU>g=g%Ri+p$Hgh_ON!SSV#^wI
zF#PSW(Jq(Sb%;o_ZMfVO7EGZs?*$Zg%~N^)L}6)fhqZPOni>Y5(WrltdJLMFucWFT
zi=uC7$$QO#1MLvOcs!f8WZ5j!y53F_$Yt8e18v|ioS-Uc#AV7jLSS!yVWx@ISfWE&
z&cOPAAfYQ0?C%;NEZYFf+@uI;>_~+!wgjklsv+LIG0S>j{MY3cpueB|0Xx&NtRJ%h
z_pEIA^-p|)Eo&;*kG6j2vBee^beIzI2Ek=;e3FI3o0Pc5SDHKMUyNg69a_#>@;HH&
z3iF41zI{dG`}1D*U55jv89FI<t1)dscDyUr<0KZ(tg)1Oa<F*-vgMdg%6BaripP=k
z^DZx*O5H~inoUO==ra#fYMlzTf;wyYH>*Z_6f+jja+hqy{jIC!>ZAaiQf?+s15M@`
zlSPiA_*x~!Ce`?j)P{7;3B{sjoY48W72^p@WK*R(k8bsel6lX$O+ao%nPgvG<_V!j
zeTD`aE*ks!CW)Vjm*8YEy?vEB1tmhvn%=$5!T6Cffx*s*pE8BfixMl&IoDdgxfiVN
zC@YB+v#zSg-*~nRB-3$-Ftd97E1T0b4U5AU?+a3U>q~GD-&FY2ObTX$$m+)C_f8vI
zS2im0&?v`gGDt4QX(dqA?mr?;b?kI<3ff@2JhG2P^6u0`!(|P_h)2t@7aQ9ImJ2c@
zEAixI=;odCqY66Nu}(38r=P-sp5iKPpX%yfBO|O#YV~t}xBn=?H{HnmP}#Y!4<(&5
zz=yDN6&*EQT22%>Tj(XjustzngS3{*Xt5<xG^NMwConEi<55vY#%L7bd%Mh6smD~}
z`a&ZZo6g`PX{IQr9^1;%{c3V~{()e6^d{y+<uL;4<`IjA#Hosg#c8Jscerbh>K+2D
zZ<(p(;r`)ivln_=@?1($I((|wFn5zleod3+JVIkA;SjL^Ec5F>D*O^2F9l87_zrm>
zpGOw&-O?MIVbp;oBgx@Z0Y0|xpZ+FSp$UE`XYtsamxM)iUDUDak2`NFQv-FDh%j^*
z4BwvYy~LksUox+>Zoqk(6VCxg`_D&i3p_Y}&mm9nD$Wt$<M6A$SaI6)R50O>fkVh<
zVMMJATTVmZ!_PneI+mOLYz|&RW~4nw^YkG0oE7PtrBhMoQ>zpN>z50JRZ{bG4K)1t
znP>n8lWdYzHo^Rr$h{L2M$GrhvMo>&xLb+*K>23*Z328HKTvY@so<)jzNl@AGUwt2
z129=h`Xb(p(vU3X5VVEWMrJVimpkt-Cmng2GBUrvY|LC!NaSV|7%0jhL^j<v3NSp-
zn$F;sU5B#3B_65Kf}4nIp|w_17yO4A^L!tY+i8;oj&9wOdc6`0=kU@{(Y#+lDrjud
zf_n1>o^#LB-}}@kgeQ>1nN-D?Dh$UOnwn_d5vsl?jy7_z%*dHa1UsXlkgwQ`G4=YK
zqyr%+eOd#CsV`#s#IfMlarVz*?zjX&l&&eYp_n{<VKr&fJE^7uGvbMuACT%TOBC6n
z+`M<-gI+Q4c}qfWqFPtMJbjLEn0;UbGl9s9xO&LMLHf}5fkd(-Uf_z@rawcm)8P?`
zzTjh!OKvg(ozm=fSrP8kOM<RH-VZpxNsvaP>AH--q!PLI{{@ppW~bsFcQL645!bk(
z_MW^MrL!!k3s-PCN!J-@#9oMbwy@CnqW=wC{&ghqhEt;fd0nCpcjtV>D$<+0p(|*c
zLRCu|xQ9P-4Bi3HPwS6wSP~Whap5rz<6a(uHmKwk?3zg9oCQ-6U-Uf(N>ge~H6Ycv
zVa%pfQQXW1$FQFbJ)MN!SYDQExpxSAPFDFTj;C`|za?Z5>6Ld;<1+hK${E(erTAnI
zM<g1PmVjf$UiZo$LpYNJ#+Q>hb>y;d?%(9dYfzUnKoePlo#fN>%%bmk_^oqS6m-Nj
zbCl7)b3M)C+@DsR`nB|RGR?-ZZje1Mvb6BsiZ!IFxqe4(mf)-*WxoX&E7nvKxdt>?
zP%d`_WaOA_%>zWy?gJaPX5XI`bfq@&3X&w^uk{=I#sH!kgPeAOV~wpLd)*K{WB4jU
zlV~lAbx&M_Zm=AuhdA$xX`P7peJQExvQf?5KvfZhmJC+oc3lElt&WM8jf%V2)%#RN
z?bIMw8#K)(KaQegQ#t)uibx(L#I-Nr&*@+LWps?KEE!TvcF;E^6Xfh_i!3ImmF2S_
z_y&3)_CTd#utJg%KBKGhvAK#-q}V(KHyPc<&yQ^^>sqy*%|dO@Ho_To9UU~IGyn^J
zrel)(6iY0mO_bHnxNEXAZ>X=a2NY7YeZ!vdWcg@{#(|q;l}F9SD0<K|&}a=hfqXoM
ztgtG(?;htU>OP%L<O;5`*Jf^-7Dc!x@YxNnmKLQ!G0xMZ>b2-Sxw$+;Pa|*}ZW)EK
zLJsi6(ZP*L_gd!>W5w!n3TBj&2Gr2`Zjp>qaljg+>4SYIp(^rcNI(6EcG8-`VPl@!
zfd2cXR5mB8y3`z#4XcaK#KIyx?nQ}8u+D?cMAR_WLs;FSX*&KS1OZ))iF!j_;Se3A
zjk#dq3TO)6mZqsQ;H-sN5qB}V2pqYY=WSp|&W+%GcgN=ptM>h12);?@{YdNc`9)9L
zXUZRP_EagkhcLFyeYm)Fsg#PhyF$r@<2PIRjO@}{2^a4L?8U`efvYQglg)lZA=DmP
zQ{+A&JV^ChQ!}SG5+Y;%J>mmgR$QC##_7UFqB2i)p0lS|ea*)+Z_tjzyX^iGhmYL8
z+gLbycPbI(fQ@jQ9jSmP{Z~~R&*|Ak`}^HkL#D<b^GsxEQ@DQ&=wir@E{xwg{G8Lv
zK{XJOZz-fo=kp?GGS|Y16L5a2it`BpU)qRK=S8WydTK8p=0NijDr>Lb^<(YyuX9_{
z3}#34v0x8ZcWUn$gyr^Otv<ABP#v(pzm+Vpb3*zOjnntwn{BZ9;Zs(CT~c}nCQ6H{
z27)-OK#r}5%J1JbR1?$o%$`V8t^sbXs9I|4EBuk`r``J(?F$<h7I)1Be{O`bPYK9z
z>`tx0MTWsVHOu4GS{&L2PaVs&xOmg9b=Q{86ahoat;9^pqWWb}g9>J~Pm)PossbVE
zI2;#_<=YBF#0C!!oQy6esS$^~Ne<+H2t@jCRfb!fN$k=>6`E_Er1V-RgT3rdHv&Gc
z1jvZrYMYEIuLHgW`SplZd8p>t-aX6A+D-q!<2aO)6vOLSS-CaqXDhql>8~AM=XN|!
zl;jX&aBuuJL2LH+{FrcvievNOfr$B<nxlAsa_8X{f;D$2ujm*#6#nE27eI$}@zK-E
zlxiV@3Sr{O>l4jX<1_zcI%+rnS=J|g%w-i!@3w0`y<eYvE%J)KI(LG}FoX`fRv#W@
z`fQ)PpU5XT#{HJj=bJairyusoymNXf{Pa}T6Zb?g#AIF;r)Cwo!j6Ur<=wKW1HZ|X
zz*9IJI6fv%fzHE>4kwl<6b{<ll&2zyB|pfQ=g5ixt5WF0K<j;nn+t)fK_s>Ds(dr$
zLgp;2DTT4Q1l=t!Z%#qjR504!LPC}vYUuPG4eEJ)>y3rTN&|9yfbe|3bY7Q`rMt}D
za=Yse=Xc)d_lll2xpV2ZI?H(F@o7?u9cp=NW_j%y?1r~C%#&5druuug<i3~>pKZ{e
zmPQdY-5ZTM8~~|>MiBcW-6c2a5U=n0Fez6dE5I*NK6tlnQNPJ0dtCi~F8f#f{wtka
zX!kXR8ILuAP%^oEO2)`N;`^l%1N@l&>@>pBYrx3qU3rR~UUO~)du?rMIp)UfLq=|3
zluN`)X6WIWTb8$0_MP3HB6G@4N@Mlh(D7P|H&OxPv~JdQrxo=BqwL&k<ZeU+Qk8BH
zYEW$bv889jy}Ur-7Rn+w$o=?F)TV%jer<){_8s6enOD7fK*$G-8m1^!TFjQz3*J-O
za~jlRl2oGJzi>=-^sBDbSAIFnJCL_R{epY!?+{CCr#x}$-@7ddqIGL$IfwRwXkA!N
zWKF&O!dO`oM~i{!#xKpI&(|~L>lx*kQ(M7~rhs&_2&1kNjU&v7j}$Hd(W4=X2cltB
z4hZbh%qMo7Nn^ZrZTlU0`U(AM61|qxoRT=Y{jsNO`!memS9ziGGWiTBVW0ldH7MA0
z6h~3rSF3W_JlmT%8#;8Sr1V?w$FT3v>=%r@6gUJJ*#CPT;GZ7;|5*P$9q`}Q|1G8e
fUsK3`^9BDOVZFQ*6!d>CL;TyJ{}2iApVR*U$|X&N

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/css/template.css b/core/media/mod_languages/css/template.css
new file mode 100644
index 00000000..1f2a1a3a
--- /dev/null
+++ b/core/media/mod_languages/css/template.css
@@ -0,0 +1,25 @@
+div.mod-languages ul {
+	margin: 0;
+	padding: 0;
+	list-style:none;
+}
+div.mod-languages li {
+	margin-left: 5px;
+	margin-right: 5px;
+}
+
+div.mod-languages ul.lang-inline li {
+	display:inline;
+}
+
+div.mod-languages ul.lang-block li {
+	display:block;
+}
+
+div.mod-languages img {
+	border:none;
+}
+
+div.mod-languages a {
+	text-decoration: none;
+}
\ No newline at end of file
diff --git a/core/media/mod_languages/images/af.gif b/core/media/mod_languages/images/af.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8b72382219386bdba6fdb087a0fb49bafe159d61
GIT binary patch
literal 532
zcmZ?wbh9u|6k_0E_~y*OU_5hvJwrl|gIP_$$!%iXxw)ll)-apS`gVfl{i8<{ckk!1
zomaDV?ejxiMbQio5AXy{pDr!Nz>}SL;O0%0faUh}zCwHqEpyK)RaJH6F?>GG8rbG`
z<?*x3_QQ3l3=f-|tEZdt=jXF#W|pm8J9Yp5lM5Nn@$f8Np|Wm`!rP@w?Nc{>IeGGa
zLPBpL!}E_HKmYi#Zr^?Fh6c{8B)16@5_}m{N+M3)zkgsBgG52hMF|NrZHDV+X7i68
zZJBL&;nth~|Nk>EFq{G6v^18C3?Mz^fDXvTptxXQuWWE~QsR+UbL{Bs>R@VeR_4^{
zp3KO?+@xruZ9Tcu!9-QvqRG%q({irEDmf_yqb318`^{VISFIA%<(F>SyU%I6gVogO
z`}eI9ljQAna%R)ty2XKy!&a!tSVo+i;qE;Ka}Cob31I_~`!7YCSXJz_UVePTCCmQt
IV<Uq#0L4R$ivR!s

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/af_za.gif b/core/media/mod_languages/images/af_za.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8b72382219386bdba6fdb087a0fb49bafe159d61
GIT binary patch
literal 532
zcmZ?wbh9u|6k_0E_~y*OU_5hvJwrl|gIP_$$!%iXxw)ll)-apS`gVfl{i8<{ckk!1
zomaDV?ejxiMbQio5AXy{pDr!Nz>}SL;O0%0faUh}zCwHqEpyK)RaJH6F?>GG8rbG`
z<?*x3_QQ3l3=f-|tEZdt=jXF#W|pm8J9Yp5lM5Nn@$f8Np|Wm`!rP@w?Nc{>IeGGa
zLPBpL!}E_HKmYi#Zr^?Fh6c{8B)16@5_}m{N+M3)zkgsBgG52hMF|NrZHDV+X7i68
zZJBL&;nth~|Nk>EFq{G6v^18C3?Mz^fDXvTptxXQuWWE~QsR+UbL{Bs>R@VeR_4^{
zp3KO?+@xruZ9Tcu!9-QvqRG%q({irEDmf_yqb318`^{VISFIA%<(F>SyU%I6gVogO
z`}eI9ljQAna%R)ty2XKy!&a!tSVo+i;qE;Ka}Cob31I_~`!7YCSXJz_UVePTCCmQt
IV<Uq#0L4R$ivR!s

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/al.gif b/core/media/mod_languages/images/al.gif
new file mode 100644
index 0000000000000000000000000000000000000000..966016652a712670cec5db025f24b9500e287261
GIT binary patch
literal 1164
zcmZ?wbhEHb6k_0ESj52apMfEb0R+x4FwA6NFb1=MgyMhh2;Tq&m&B4pAZ=q`QIMFN
zom!%hl$xHIXRGvn_kJaX%oJOta8q9c-vZ~<j7*QJqSW9jzmVjr>}1OnC3`ysn+mIn
z+=ATHl0=1y+?>2(s|s7C#FYG`R4X7GB&@Hb09I0xZL8!6l28EI>6~Abs$i;Tpqp%9
zW}skZsAp(wVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!
zB_#z``ugSN<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~h=P6yk;40=Thx#d=`x=q2ap>Q^Kd=o{)8fV>1#=<ADLX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%WDpv+sRbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tM$_
zQw86|<jgz}AFSTj*UB@mxFj(zIn~p}Rtac=US?*Bm8Fw`n}va^o1u}5xuKz}v4ydL
zrK6LflckBNlewXp5lpX3esXDUYF-IUZwg$mn*mO}prnvn0JPa9wJ5VJHN~wcKUV?l
zWvfiwZgIhB9#n4%PPe$a;?%1Tbc{YIVv!;mCIn19ASOK70y*%6pPC0u?M1+3&G`S{
z-#@>9{rvI$+t)9jKYjf0{@vR*uV1}<@%-7-CyyUJd~pBX-8;8$-Mn%A+SMzUFI~KF
z{@mF!r%#<cas1fPBZm(iJg|S?-aWf_?cA|_+tw|cH*MUoe%;zNt5>aDv3%LmC5sm=
zTrhv$+&Qyn&73iP+SDnNCrzBt-`CsI-PPIA-qzaE+|<}mUsqdGT~%38URGLCTvS+)
zpO>4Hot2r9o|c-DoRpXl9~T=F9Tgc79u^uB926Mf@8|2|?d9p=?&j*^?BwWRZ)a;`
zZDna;Zf0s?Yy`|wdb&E=TACW_YN{&AN{R~da<VegQj!wlVxl6#LV^PPe7ro|T$~*2
zY^*HIOpL&?;U^2Yn9u={pmKzP*_30~ops853eTAvTVl4<Itp?nez0^=T+>uxrW`Gz
fzj$SCm_D<5Mhkb!grc_z#*;TV+UUu1GFSruUzm{Z

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ar.gif b/core/media/mod_languages/images/ar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b019eff5530aab8c09b0c34885724d30876c23f6
GIT binary patch
literal 1001
zcmZ?wbh9u|6k_0E_&$+As+CcwkwL75LAa4Yppikmg+a8LL8660vV}2xijQ0?cjRPW
z=RVQwwXyt73@wXG3znz0EGiRgWmvv#p<D}R&?I@;R_@f<uFEzpUbb~X%JQ((6%mQc
z!ae$=dREmn?I?>{;+HZlLad2FvX!xXe({pcb30d*1x<G?SeczPBRpcdwnQsq@A8hu
zB`NvyTufS6A}9G}&-CW2XW(sMXj+z0w=84xfei(7{3q?6aNzi%iY0~VvwRBIrIu~V
zZrqSmv>`onfqTuevc|==A=A{YI<=Ks1>Gl_oA#(zEGjl^S1MeVwr1x_v1W$u6&<@T
z><XXhU9&cF$Hfg@%S-KhP0Qxx>vT#UJa!;@mSNmXqm0!t+b^sU0XdZ+aZYI5j9`gY
zhO9XbAyZX@CadaqC?-y~7j9-)dSrgZ=A76?f!!-RPToFIHZRYjjl;Z0Yxb(CVKcq6
z*2eblY+tf@k@qB7pFZi<Wfk2k+v}F4pSX1-a-om^Bv-vo*|5nzO3i%6{j%%#ud7;A
zCeXwn*2s`K$7{yk3E8V+k6$|$I7vyag-f8B!KTZgW^;M&QvZe>6;@MJR_|IZ*}@>$
z$S?}16#_aSgFtzKf#Vzlqk|MjXLqxqftU)XOTmM#HXkOLjgObP%rawS5fHHmaFJJ0
zi#e0X;KtRdB&ArW<FJsE*R0OOq~OaUR&E#85I&U;DonDrG7cXajF%p6)?+EDlVo_o
zCLof&>CcZ19f3TGO?*8KEeQ>MjsXQZFD|Z_ASs{Hlyi|&bCNi}=$s=bo7*NVbS@2Y
zNy=W(HAmKY%Y#5+*Q2aF)jS(=tCKu?4I<Wc?EL(~x1mvH=P8AxqsLl!>WegH8E)`d
Z)Fz~(vG9=kK`9O{J_n%$6&D8vYXH#w3cvsW

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ar_aa.gif b/core/media/mod_languages/images/ar_aa.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b019eff5530aab8c09b0c34885724d30876c23f6
GIT binary patch
literal 1001
zcmZ?wbh9u|6k_0E_&$+As+CcwkwL75LAa4Yppikmg+a8LL8660vV}2xijQ0?cjRPW
z=RVQwwXyt73@wXG3znz0EGiRgWmvv#p<D}R&?I@;R_@f<uFEzpUbb~X%JQ((6%mQc
z!ae$=dREmn?I?>{;+HZlLad2FvX!xXe({pcb30d*1x<G?SeczPBRpcdwnQsq@A8hu
zB`NvyTufS6A}9G}&-CW2XW(sMXj+z0w=84xfei(7{3q?6aNzi%iY0~VvwRBIrIu~V
zZrqSmv>`onfqTuevc|==A=A{YI<=Ks1>Gl_oA#(zEGjl^S1MeVwr1x_v1W$u6&<@T
z><XXhU9&cF$Hfg@%S-KhP0Qxx>vT#UJa!;@mSNmXqm0!t+b^sU0XdZ+aZYI5j9`gY
zhO9XbAyZX@CadaqC?-y~7j9-)dSrgZ=A76?f!!-RPToFIHZRYjjl;Z0Yxb(CVKcq6
z*2eblY+tf@k@qB7pFZi<Wfk2k+v}F4pSX1-a-om^Bv-vo*|5nzO3i%6{j%%#ud7;A
zCeXwn*2s`K$7{yk3E8V+k6$|$I7vyag-f8B!KTZgW^;M&QvZe>6;@MJR_|IZ*}@>$
z$S?}16#_aSgFtzKf#Vzlqk|MjXLqxqftU)XOTmM#HXkOLjgObP%rawS5fHHmaFJJ0
zi#e0X;KtRdB&ArW<FJsE*R0OOq~OaUR&E#85I&U;DonDrG7cXajF%p6)?+EDlVo_o
zCLof&>CcZ19f3TGO?*8KEeQ>MjsXQZFD|Z_ASs{Hlyi|&bCNi}=$s=bo7*NVbS@2Y
zNy=W(HAmKY%Y#5+*Q2aF)jS(=tCKu?4I<Wc?EL(~x1mvH=P8AxqsLl!>WegH8E)`d
Z)Fz~(vG9=kK`9O{J_n%$6&D8vYXH#w3cvsW

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/at.gif b/core/media/mod_languages/images/at.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b295f0b380b7cb3e67b93cf43038581d961b9055
GIT binary patch
literal 83
zcmZ?wbh9u|6k_0E_{6|)hJoS#|NjgO3^QlWJagvEOk-mp8whkj1V{}7vjWGiJO2z$
iy=>a+7}5Lt>Zt>ja~JfesI6iCDWdIow&br0gEatPgdM5?

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/az.gif b/core/media/mod_languages/images/az.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6c6e73dfc572c7a168e4787651452f178b32c1ba
GIT binary patch
literal 168
zcmZ?wbh9u|6k_0E_#(o<Ff;AjmL0E6U0$2JeXi^HP~ZAKDfbtj#YaKCPaXY#Sxi30
zWPK}X`NwGdb=j)lN*>?)=e+d@`_Ev^FzNVTR#OH-KnJ7%WETUg?gN#+l+1Y<tJW=h
rvhUI)9^RbW2a8?KytU@&Vtlk)kc+96|3Hq_{0l2eyw*B7Ggt!vZP7Y?

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/az_az.gif b/core/media/mod_languages/images/az_az.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6c6e73dfc572c7a168e4787651452f178b32c1ba
GIT binary patch
literal 168
zcmZ?wbh9u|6k_0E_#(o<Ff;AjmL0E6U0$2JeXi^HP~ZAKDfbtj#YaKCPaXY#Sxi30
zWPK}X`NwGdb=j)lN*>?)=e+d@`_Ev^FzNVTR#OH-KnJ7%WETUg?gN#+l+1Y<tJW=h
rvhUI)9^RbW2a8?KytU@&Vtlk)kc+96|3Hq_{0l2eyw*B7Ggt!vZP7Y?

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/be.gif b/core/media/mod_languages/images/be.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a96f3d982e8086f516ef369e72854115157aaae7
GIT binary patch
literal 592
zcmZ?wbh9u|6k_0E_?FACO-bo;L&Gu#2KHWdh6N0(7#KKuIXL<_9<E-^Fq`2*PtSS=
zhP8~03>z6P_Vip~U|7z;z%Y$rH3P#+28I<344W7j4z(@1sb$a6&vBZ8;Rpl6<?3qo
zF7_E598=lZkI$ZS3@A8t@r7lpFZT9s;^1JI%y7PA2g5Rk*M-f8lBaDqb~)S7aANuD
z^QEQRot@cduwMY0zlGsQT>O!Yxl0%rPOMrrhm-TciWSG_?Y>l9&9Iqai=5mZdyoCq
zbB<40v=HdpE{@ZS<{xWaaPR1;7kSyUI5_wl`Oj?F_^@r&q64!S<}uu<?^(pld#Shg
z*u33~Hcwx|&CSunF?032qaBm?SXwg7V3=`q_EtH$E6Y|cm6t!Yb~S4|>#4473~L!4
zu2`|hE#O#H{eyi68D=q@2YSDufdOdcR)z<wS6>A=lVJ@b;~JoYXELz&umfo_fDT9x
zC@vh>w>Fq6IV<yVC3kdk@%d`&McRpnS@EV#n?B8uH&$KWR?A5^YjGA2&yp-w0TWrB
zgb2%&O^jO@H>F622>VzVt8t5F9y)wTlslWr)zQU2DTni1&ZVRap@OQ>@<xf~9O?HT
z+~<hX6$wzZ3ASc<^Y&f%Dl<RL7$%|YA3uKxi7?sAiS1Kh{K(LIu$fK%z=;KoM+8MY
qPYGx^Pdwn#l{%%P^MK=NAx()}G7=Y#IY>`rW|Qb(I^v<gU=0Au)y;+g

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/be_by.gif b/core/media/mod_languages/images/be_by.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a96f3d982e8086f516ef369e72854115157aaae7
GIT binary patch
literal 592
zcmZ?wbh9u|6k_0E_?FACO-bo;L&Gu#2KHWdh6N0(7#KKuIXL<_9<E-^Fq`2*PtSS=
zhP8~03>z6P_Vip~U|7z;z%Y$rH3P#+28I<344W7j4z(@1sb$a6&vBZ8;Rpl6<?3qo
zF7_E598=lZkI$ZS3@A8t@r7lpFZT9s;^1JI%y7PA2g5Rk*M-f8lBaDqb~)S7aANuD
z^QEQRot@cduwMY0zlGsQT>O!Yxl0%rPOMrrhm-TciWSG_?Y>l9&9Iqai=5mZdyoCq
zbB<40v=HdpE{@ZS<{xWaaPR1;7kSyUI5_wl`Oj?F_^@r&q64!S<}uu<?^(pld#Shg
z*u33~Hcwx|&CSunF?032qaBm?SXwg7V3=`q_EtH$E6Y|cm6t!Yb~S4|>#4473~L!4
zu2`|hE#O#H{eyi68D=q@2YSDufdOdcR)z<wS6>A=lVJ@b;~JoYXELz&umfo_fDT9x
zC@vh>w>Fq6IV<yVC3kdk@%d`&McRpnS@EV#n?B8uH&$KWR?A5^YjGA2&yp-w0TWrB
zgb2%&O^jO@H>F622>VzVt8t5F9y)wTlslWr)zQU2DTni1&ZVRap@OQ>@<xf~9O?HT
z+~<hX6$wzZ3ASc<^Y&f%Dl<RL7$%|YA3uKxi7?sAiS1Kh{K(LIu$fK%z=;KoM+8MY
qPYGx^Pdwn#l{%%P^MK=NAx()}G7=Y#IY>`rW|Qb(I^v<gU=0Au)y;+g

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/belg.gif b/core/media/mod_languages/images/belg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0b64b768df22d8b31f429442493c28ec787d5056
GIT binary patch
literal 74
zcmZ?wbhEHb6k_0E_{hNUUsC1&H3kL-Mj+M!Vg``71C#O;`IQH1R|FONyI4AIHGf^j
adQYq`Vfw@uOWd9XFI%pCI6Ihu!5RS8Ef*^Q

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/bg.gif b/core/media/mod_languages/images/bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f31277387affaac8a2147d02756e8e6dd13680f
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hNU|NsAMYC;S%jTsmibby!vB+kGj-qOGF^xO3<bGF>--h9vO
P2Y=fmk7>^|#TcvsQ+pM_

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/bg_bg.gif b/core/media/mod_languages/images/bg_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f31277387affaac8a2147d02756e8e6dd13680f
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hNU|NsAMYC;S%jTsmibby!vB+kGj-qOGF^xO3<bGF>--h9vO
P2Y=fmk7>^|#TcvsQ+pM_

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/bn.gif b/core/media/mod_languages/images/bn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dfd1794531b7da71b101d1dde1d548207e406342
GIT binary patch
literal 89
zcmZ?wbh9u|6k_0E_{6|)Muh7D58F&l5eFZ&{|pQaX~sYT2y{RMNDTwCTEwn9|2FUn
nHc15XI#@AAs8r0Gz?vdHM{{G>TFG3M8KS|ZcWeHuFjxZsjye~3

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/bn_bd.gif b/core/media/mod_languages/images/bn_bd.gif
new file mode 100644
index 0000000000000000000000000000000000000000..dfd1794531b7da71b101d1dde1d548207e406342
GIT binary patch
literal 89
zcmZ?wbh9u|6k_0E_{6|)Muh7D58F&l5eFZ&{|pQaX~sYT2y{RMNDTwCTEwn9|2FUn
nHc15XI#@AAs8r0Gz?vdHM{{G>TFG3M8KS|ZcWeHuFjxZsjye~3

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/br.gif b/core/media/mod_languages/images/br.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3d004e59740559bca0dedc19be9be289e702e9ae
GIT binary patch
literal 94
zcmZ?wbh9u|6k_0E_{7X``SRuc`}ec5vfjLTbNck@|NsAI00SKm2~xwrtSzxL=9__(
tLH16I_{UX>2^w6inN~q2BH63=Ch4?i>h9fP_I}IT=MGcWPh()P1^@#UA<h5*

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/br_fr.gif b/core/media/mod_languages/images/br_fr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3d004e59740559bca0dedc19be9be289e702e9ae
GIT binary patch
literal 94
zcmZ?wbh9u|6k_0E_{7X``SRuc`}ec5vfjLTbNck@|NsAI00SKm2~xwrtSzxL=9__(
tLH16I_{UX>2^w6inN~q2BH63=Ch4?i>h9fP_I}IT=MGcWPh()P1^@#UA<h5*

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/bs.gif b/core/media/mod_languages/images/bs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbd23bc4fc5948de38f0b5e70d0150ce930a281b
GIT binary patch
literal 312
zcmZ?wbhEHb6k_0ExT?V*DmqnGc4m7?WN5@8F|ld9ypybLw+ahS2@TyG9=<s+WS_F~
zob23Fot>vs!cv=>PUOWWRp;gurQ`|;P2u62%fZo~m3vxHa7t|K_KNC@Majuc#o2jD
z#i0=g5`z*%M5c1{&TVPG8WXpVk8cte&)on2|9`(IE-pR|$Y7ubQ2fcl$iSe%paU`t
z<R=EUP=_f69y)yfEe=jc3@zvTU&!o|nJOZvF~wzRn4E0qwUclCxK+E8W6YQtI(po1
uo7FQd6-dc`=O-q?BjsOO%dW1<ES*xDC(g^pq$bka+sPE-Hp|tK!5RQnp;T!A

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/bs_ba.gif b/core/media/mod_languages/images/bs_ba.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bbd23bc4fc5948de38f0b5e70d0150ce930a281b
GIT binary patch
literal 312
zcmZ?wbhEHb6k_0ExT?V*DmqnGc4m7?WN5@8F|ld9ypybLw+ahS2@TyG9=<s+WS_F~
zob23Fot>vs!cv=>PUOWWRp;gurQ`|;P2u62%fZo~m3vxHa7t|K_KNC@Majuc#o2jD
z#i0=g5`z*%M5c1{&TVPG8WXpVk8cte&)on2|9`(IE-pR|$Y7ubQ2fcl$iSe%paU`t
z<R=EUP=_f69y)yfEe=jc3@zvTU&!o|nJOZvF~wzRn4E0qwUclCxK+E8W6YQtI(po1
uo7FQd6-dc`=O-q?BjsOO%dW1<ES*xDC(g^pq$bka+sPE-Hp|tK!5RQnp;T!A

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ca.gif b/core/media/mod_languages/images/ca.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5a06721276a5659975d3996cde7ee5206bd47ad
GIT binary patch
literal 66
zcmZ?wbh9u|6k_0E_{hL;hJoR3FvI`<3_zd*B0%B}Owv>OD-XWC-!Ny3U&s7gCx7ur
R-O)%%6R1-uPh(}U1^{@A6=(ne

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ca_es.gif b/core/media/mod_languages/images/ca_es.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c5a06721276a5659975d3996cde7ee5206bd47ad
GIT binary patch
literal 66
zcmZ?wbh9u|6k_0E_{hL;hJoR3FvI`<3_zd*B0%B}Owv>OD-XWC-!Ny3U&s7gCx7ur
R-O)%%6R1-uPh(}U1^{@A6=(ne

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cbk_iq.gif b/core/media/mod_languages/images/cbk_iq.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5c77762dadad187c7cedfc9fae8d52848a87a2e9
GIT binary patch
literal 285
zcmZ?wbh9u|6k_0E_^QJ2pMl~3yVd{St@wY#=Kr@#|IaY|H)r^NMg9L}#s9ZF{_8RP
zf4}bk^Y;Hz4F8{2|3Am`|4!il->?3EIc7VX;s5umxyu>;-*o!_=R?z4hX2<L{y)n9
zf7AZ|=flZM8UBCR@}G&}zdu9Y28RFt{~OO__<xp}f!aU^WFW{d3~Wvg4Fw)LQvD~M
zsAq<lIJ7O!@KWW_k#284_0~<H->L1gZnp}j5a-4nGj@s`d$53Wiu;d0D=u*+erae_
O7H(>7Yj1aCum%9t&}g^-

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ch.gif b/core/media/mod_languages/images/ch.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a3f1ae05aa1637da3785289a37a5358d498cd590
GIT binary patch
literal 373
zcmZ?wbh9u|6k_0E_-f4X|Nq}-3=Gd0n4U8*JZE5h!NBl>f$1d!!&644XN(Ll8JJ!%
z07>Ro42;hi8DB9lKWAiq2^0si85y24F+5{pex)GyQc>}Zf&N=VqxbfX@9mx5IoQ8*
zaD46P_}0<>t)t_6M~6=ZMPC{kzBDv`1Cot(zxM6>zJK4({ri3$*!TbM|9}7f{Qn1}
z{{Q(8B!2(<4+2jahypqwRUp4Ou+2Jf-0^~j2NP>@L!yU@%E={6Gv6FZ3CuD&C?R4b
zJ>i5ZccIO+!%CdF@)Gl>uXc#!P>QT!RPElHVqmDppjMJ2R23kutjfsF$6Cc|EW$3z
z$jl_6rOwCA%jV?C&Mr_P$RuM_%$Us@#V9PKscocV#E@d7vWS(1pOIIHn?s>Vkey>a
edyc28r<9Qq*BK#pwsVXtuALR|><e^cum%9F`F?Hy

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cs.gif b/core/media/mod_languages/images/cs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5df79bba7094c1c6ab619cc66ba9296fc9386de6
GIT binary patch
literal 177
zcmZ?wbh9u|6k_0E_#(t`hJis^`r?NVf1;x96*5FSGIZ}_;M>F?WzH~FkYRT%ga0-L
zF&>5k9t<s942Rkn+!z?n{Qv)d-MaS-!~q?UGLT&itY!}sTv9UU35s}Rcsp%)G0$Mn
txzyOxo8#{5$)9m#kmz?;eAJM`RKnAGIZ|6^*_9*A*0~ZpE(<VN0{|-wFiQXc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cs_cz.gif b/core/media/mod_languages/images/cs_cz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5df79bba7094c1c6ab619cc66ba9296fc9386de6
GIT binary patch
literal 177
zcmZ?wbh9u|6k_0E_#(t`hJis^`r?NVf1;x96*5FSGIZ}_;M>F?WzH~FkYRT%ga0-L
zF&>5k9t<s942Rkn+!z?n{Qv)d-MaS-!~q?UGLT&itY!}sTv9UU35s}Rcsp%)G0$Mn
txzyOxo8#{5$)9m#kmz?;eAJM`RKnAGIZ|6^*_9*A*0~ZpE(<VN0{|-wFiQXc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cy.gif b/core/media/mod_languages/images/cy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d58557ca13660267ebce4108bb1cb688eabc89a0
GIT binary patch
literal 999
zcmeH`+e?!H0L9Oj^D>&Zxt7+_EoVA4*-UFRXlsqB;U!Z@E4+e}kfQtwvm0uPs8DLF
zM4d}BddLtAiRfnK4UH5@9}Kann>yX5Zko=v*8k9B=jl8h4!^^RiIWSDWYa;zMlEn1
zbHD-s5(a=MCgvUfCTw=Q&1T!5gK5A(5M>#BZJuJ$!$VLPiDHP;pyZ)If@KCnehT5|
zu%Xi#fh9nc20=ye9G4rYz>-S!(jQjqcFO^TWa6wCeSi*_Rw#ODFl)8D3-H<-u7%LB
zSURydAsITMa7(X$=Z;6guqYpz8X7c>jZvx4J4y*L=H#?GIH>LKzi|i?o}L<KXUpWI
zv9~WK8ODx|@0pp4?d_MMuw}8_k+=<|q?k3DstC*ik@q6CK!yw#q|lJ0)nFt=NQ%QE
zlet<^xotKJ&S0F1`TF`zyS<mmWaYv%Ft9?Bi$Ossgv%`l8E7~hOLMbfbkvxh?sN@5
zmC8v#a9@Bj7;0)}fGv|LLkc|wG4UX-5*85p#Kbj&p_9Awy`QVTt7|zr+SJuG!C{<^
zhh=0$1FWyCToz-^{@V(|KOe^K?zKSP=J3}kAD_BV7=@x2Of1l72_)}nAf^Dj-HzLi
zh5qZ`5D5Pp^Y;sI8wQ8UitSYQgo)Pkd)OmMs)KnrE@kuOwLa&WWKo&gC6FJ{DhYic
zo%Y@vQ1|P(dUmMInc{CUmAX}aWXq(q(I@?hyP|jazT!E3E@8w{J$Q8TnXLM#xGA4q
z-&e)i6U&KuGlp+1h^IUrkSM$YxUBIgKQDPXjpg!#!k1)~wuOhuWxjk@;IRL+8l3Et
zEbqHt%tdsngn%pKZCXxAdDF4#D_P!=xhH1&YcFzJ)o`bVq<WA7`ur!~51qL~s(oG%
F{Q;6_2*UsX

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cy_gb.gif b/core/media/mod_languages/images/cy_gb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d58557ca13660267ebce4108bb1cb688eabc89a0
GIT binary patch
literal 999
zcmeH`+e?!H0L9Oj^D>&Zxt7+_EoVA4*-UFRXlsqB;U!Z@E4+e}kfQtwvm0uPs8DLF
zM4d}BddLtAiRfnK4UH5@9}Kann>yX5Zko=v*8k9B=jl8h4!^^RiIWSDWYa;zMlEn1
zbHD-s5(a=MCgvUfCTw=Q&1T!5gK5A(5M>#BZJuJ$!$VLPiDHP;pyZ)If@KCnehT5|
zu%Xi#fh9nc20=ye9G4rYz>-S!(jQjqcFO^TWa6wCeSi*_Rw#ODFl)8D3-H<-u7%LB
zSURydAsITMa7(X$=Z;6guqYpz8X7c>jZvx4J4y*L=H#?GIH>LKzi|i?o}L<KXUpWI
zv9~WK8ODx|@0pp4?d_MMuw}8_k+=<|q?k3DstC*ik@q6CK!yw#q|lJ0)nFt=NQ%QE
zlet<^xotKJ&S0F1`TF`zyS<mmWaYv%Ft9?Bi$Ossgv%`l8E7~hOLMbfbkvxh?sN@5
zmC8v#a9@Bj7;0)}fGv|LLkc|wG4UX-5*85p#Kbj&p_9Awy`QVTt7|zr+SJuG!C{<^
zhh=0$1FWyCToz-^{@V(|KOe^K?zKSP=J3}kAD_BV7=@x2Of1l72_)}nAf^Dj-HzLi
zh5qZ`5D5Pp^Y;sI8wQ8UitSYQgo)Pkd)OmMs)KnrE@kuOwLa&WWKo&gC6FJ{DhYic
zo%Y@vQ1|P(dUmMInc{CUmAX}aWXq(q(I@?hyP|jazT!E3E@8w{J$Q8TnXLM#xGA4q
z-&e)i6U&KuGlp+1h^IUrkSM$YxUBIgKQDPXjpg!#!k1)~wuOhuWxjk@;IRL+8l3Et
zEbqHt%tdsngn%pKZCXxAdDF4#D_P!=xhH1&YcFzJ)o`bVq<WA7`ur!~51qL~s(oG%
F{Q;6_2*UsX

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cz.gif b/core/media/mod_languages/images/cz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5df79bba7094c1c6ab619cc66ba9296fc9386de6
GIT binary patch
literal 177
zcmZ?wbh9u|6k_0E_#(t`hJis^`r?NVf1;x96*5FSGIZ}_;M>F?WzH~FkYRT%ga0-L
zF&>5k9t<s942Rkn+!z?n{Qv)d-MaS-!~q?UGLT&itY!}sTv9UU35s}Rcsp%)G0$Mn
txzyOxo8#{5$)9m#kmz?;eAJM`RKnAGIZ|6^*_9*A*0~ZpE(<VN0{|-wFiQXc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/cz_cz.gif b/core/media/mod_languages/images/cz_cz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5df79bba7094c1c6ab619cc66ba9296fc9386de6
GIT binary patch
literal 177
zcmZ?wbh9u|6k_0E_#(t`hJis^`r?NVf1;x96*5FSGIZ}_;M>F?WzH~FkYRT%ga0-L
zF&>5k9t<s942Rkn+!z?n{Qv)d-MaS-!~q?UGLT&itY!}sTv9UU35s}Rcsp%)G0$Mn
txzyOxo8#{5$)9m#kmz?;eAJM`RKnAGIZ|6^*_9*A*0~ZpE(<VN0{|-wFiQXc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/da.gif b/core/media/mod_languages/images/da.gif
new file mode 100644
index 0000000000000000000000000000000000000000..254395676daf4a40a653f04b1a32b98ee3c689b1
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tyM|Ns9BJjOZ<KmZbPV3O|PEjT@!_k4H3rIyX-&IB#5iLJ<0
NWA9o#tB#ey8UQ`K6uJNa

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/da_dk.gif b/core/media/mod_languages/images/da_dk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..254395676daf4a40a653f04b1a32b98ee3c689b1
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tyM|Ns9BJjOZ<KmZbPV3O|PEjT@!_k4H3rIyX-&IB#5iLJ<0
NWA9o#tB#ey8UQ`K6uJNa

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/de.gif b/core/media/mod_languages/images/de.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06f693e0e5eb8154cf0ec076228f5d62aed8aecc
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hNU{~QAl+yxN~Iv@fh&cGzz)4%fc+x0DTw%qF8d{68Lf7>IE
KY0osp7_0&AQxkgt

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/de_at.gif b/core/media/mod_languages/images/de_at.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fe117901e34ab35adc42021d749dd7d4b479efac
GIT binary patch
literal 97
zcmZ?wbhEHb6k_0E_{7TaR@LmSrsZ2Lt9KUe|2};D|NlP&7%2W^0n<7l5~P-aSxsWs
s9c_bCl8t*U?jPL!Uska%#ZoL|)w-P5vkExR%}+}Yv9qk1%)np`02QktGynhq

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/de_ch.gif b/core/media/mod_languages/images/de_ch.gif
new file mode 100644
index 0000000000000000000000000000000000000000..df7b40f6e57a428e9b810fb9c215db21a3e8244b
GIT binary patch
literal 377
zcmZ?wbhEHb6k_0ExXQrrf`Q@x|NpNTm|rq7K4V~b3FQ6*LZAr4D+Ztl(|@2KBTyOB
zTSv#|jEpZCnBO_rKV@Y4|NrlECWg0;_Rkra|NZ~{=l}ngii*#en7{Ae_r^f~y`#gI
zhK64U_PtV&dk!@7@Bfz!Oy3$B-rGApV`TWbf8Vct`~Lm=^UlHXwWH(ze}CT^8ht7#
zdT;N@Kq655$pY4)10q3wVqlwgfF;3!froQKo96)$o*pSDkApuK$aT0VAK(#TI_Ah2
zbWnmpq@_ulp;?llO-aZ?Sb(9dfq`v{7oQ#*qpYB|0%K>Fv$_(aCZljOBR97%s~dwf
zBfAcxI6Is0R9_J{PG$}vzJ)xjLJYZG39fEh?6nLvzLgA4Zu*_dGnjLjqG$R`%Birh
W@>gz7;7Uql5OZVkWt!>8U=08T)O4o+

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/de_de.gif b/core/media/mod_languages/images/de_de.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06f693e0e5eb8154cf0ec076228f5d62aed8aecc
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hNU{~QAl+yxN~Iv@fh&cGzz)4%fc+x0DTw%qF8d{68Lf7>IE
KY0osp7_0&AQxkgt

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/de_li.gif b/core/media/mod_languages/images/de_li.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e9b459ffb671a348c80ca9c0b7abcc2eb0b958e8
GIT binary patch
literal 1297
zcmZ?wbhEHb6k_0EIKsfdpb(!BD87H8u7P(^L1AD*T3A7xl!8SZgL0aKx8M2oh6;{l
z{XLNmfpPQO)EXLN@9(#nEn&@|U3X4U6{wpaQ2fsw;Txdfl30=mq;2dg3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(;w+TacSt
zlBiITo0C^;Rbi`?n3A8AY6WD2g!Ppaz)DK8ZIv8B5(*$Yo%4%Q6-@OEbdwFt3>3@^
z^$d+o%+1Yp6pRcE4fG9+^bL)44b82LjjRj|6rex}Xj@TAnpKdC8`Lf!&sHg;q@=(~
zU%$M(T(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}
zN%^HEwn{*kLcEY$;Oh%FIIma_>><76{9OHt!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&
zvLIDID784hv?w_hs9YJQ85nl>EdnV7y2i@CC=(bdi8(I$$)&lec_p4Mwn{)5y_C!p
zD@#XX0~d26V`Bp&12YRlLkl-EBTEZsV^<ef7iVW@SC|>t^g3Bs8o8O7TbP@g8W<Y7
z8dw^;xVSi38X346nK@cIxxw^$<`tJD<|U`X?9Bw)3)O3mSFe?GQEFmIeo;t%ehw@J
z1Z3ow<QHe;7brLfn=1GwCTHe>_@L;4_|_%0D6=dz#jPkmR{<QpR+(7rcQbW%Hgh&`
zGjN9Z+tSd$(%H?)+}YX5!pzOYLJ6ujg`6<c2RcR{lsJ$Q3rq-@0zpi8(g$+jnI|<5
zm}827S%dNazrTNe|N8mk`?s%OK7ac7;r+X}Z(hH8`QrJrr%xU~didb}y}NgA-@19@
z`n9W9E?>HM;rzL?XHK6wdE)r7qel)OI(T6JzP)>P@7lRz`?jrHHgDRvVg0(bYgVsX
zxnlXUrArnsTDV~Tyt#8`&zd=7`n0K2CQq6;p}()Ur@O1OqrI)QrMaoGp}wxRrn;)K
zqP(oMq`0WCAU`iRCp#-MBRwrOB{?ZEAwDiPCORrIB0MZKBseHAz~9f;$J@)(!`%&-
zY@8e&?CorAtgS39%*{+qjE#WVQcqV$TT4?zT}@R*SxHerUQSj<T1rwvTuf9%SV&NS
zpO2S^n~Rf!osE@+nTe5sLGdRGxD3((k)Se-fmLsTN?%H**V&bNJYRUSB02h;jyw^R
haBP~)!SF!6Q=<RGlfpweR`V~cDDhewwN{bA8UU#8xWWJc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/de_lu.gif b/core/media/mod_languages/images/de_lu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..244f94fd1e69ce85aac32854a8c0f4869e1e5653
GIT binary patch
literal 1141
zcmZ?wbhEHb6k_0ESj52a|NsBDnwAU;@3Akr|5o3Q0R|NRb4U0FD7Yk+Bm!w0`-+0Z
z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+8u%7Cr)Fe&R28KLSNVk`S7j$#rYPClDcDq4
zRpb`rrj{fsROII56<bx<DkY}mC#6~e*&tzkB?YjOl5ATgN05X9$WG_{qErP_JyYFe
z10zEPb4xu#Qxi)=LmdSp14CndLj!#yOI<@lD-&}oLo)>^Py*Ukl#*r@<l+Xk3&^uo
z$|xx*u+rBrFE7_CH`dE9O4m2Ew6xSWFw!?N(gmu}Ew0QfNvzP#D^`Y?;F4OLT$EW*
zl9`{U05UN#DZjMDRte}*h!=7T;Kt?^>w&$amz<xgUy)d#Z>VPg@)As;uP=V3xw&xF
z#U(+h2=`(&xHzP;AXPsowK%`DC^;3VTp46lft7PnYGO%#QAmD%4lEP{GV)9Ei!<^I
z6r7zEG{Q6UQu51-HNnb#eXTt6ic1pnl2bihY?Xip=w)W6SUDQHnOPc`S{S;RI~y9h
znm9T-npnCTn;RJ#nY&mz8pHIu<R_QrrskEv^rj&6TH@3TN(s3IK$~4si!#enQ{0O3
za}~fow#vlq7BigYLG`BKc8fVqz4}1M=!4=FDV||Mz{CS$!c#4f15fv<dBDV81WeV8
z|Ns5{^ZVD&AK$-y{qp(K#}Dt{y?yig)yo&ppFMr@_|d}$_wU`kbNklK8`rO0y>j`|
z#S7=pojr5<)X5Xaj~zX7_|U-v`}ghLvwPRh9ox5U-LiSp#trM&tzENv)yfsimn~hg
zc+tWI^XJW-Gkey|8PlgtoicgS#0mX<y*=GsogM9Mtu4(>jScm6wKdgMl@;Y>r6t8h
zg$4O}xjETcnHlM6sVT`xi3#y>u`$t6krClxp&`LRfdT%0zCPYwo*wRQt}f0_jt=&A
zwl>yQmKNq_rY6Ql!0e=_tD~)@siCf>s-mo<s30#VD<dr>DIqQ<Dk3Z-D8SFh%frpZ
z$-&OX%EHXV$iSfZlLcH#=zvI2F~Yzs@3HHSw81IQ)qBNXoZbCDL8EV8!n}-C>vC@M
M73iEVWMZ%e01Hu)xc~qF

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/dk.gif b/core/media/mod_languages/images/dk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..254395676daf4a40a653f04b1a32b98ee3c689b1
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tyM|Ns9BJjOZ<KmZbPV3O|PEjT@!_k4H3rIyX-&IB#5iLJ<0
NWA9o#tB#ey8UQ`K6uJNa

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/dz_bt.gif b/core/media/mod_languages/images/dz_bt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..515a3ac00774b17bdbc8f2eb3fa234a5a6083c8f
GIT binary patch
literal 925
zcmZ?wbhEHb6k_0E_|Cxa-%seDzwkeQk-vfBe}g3cgh>Ahllvbj{J&cKZ>{XF1npl5
zIzQ9RerA~eDsuf)7yf^R^v{OyH?!-%cBg;q&;8Y&@O@JL=ShX1rxt%+U-bW!{GZFJ
z|F0_iyQ28-s?y&ps=u%3{kfv?_p0WfD_Xy<+kL(2_5D`-$MfYMZx+8^Ir;UP>95w!
ze7Se_=OvvVmvz40vHZ){1@G=ndw+k{mrKnb?zDZl+xzz5#y5wzKEJ)}+3jtwuWkQ+
zc+=a58{RzL^Xl}0_oolMIe+x^^|Nm-o&0k5+RG>B-abF|^2wt&PanO0`S9h-7q4Eu
zVi*OZA%HssbU;#|yuiTG#9+xG<FP@3otJ}0=#GHX0}c*$1`Ux2CijUFYDNMK3V{#X
zr93CF?7Y~J?A~fJWkbb>q$ba1m5MJGg)SZaVuEo(Ulg3%yXD>VL<~-DT)?4ZrorQ(
z$asut5wqih6C0gcS^L=9LK;pjJj}zxC&G~Eu;tA`7N!mFI0B|=9NAXj%f`ZB4FE3Y
B%q9Q;

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/el.gif b/core/media/mod_languages/images/el.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8879c29809175b17a8f639da1d9eb4103dee14d
GIT binary patch
literal 56
zcmZ?wbh9u|6k_0E_`tyM|Nnmh`7Rv>AOMLtFp2vltUUepg~SZwTiwb__T)cqedICi
JnWY$mH2~@h6V(6!

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/el_gr.gif b/core/media/mod_languages/images/el_gr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b8879c29809175b17a8f639da1d9eb4103dee14d
GIT binary patch
literal 56
zcmZ?wbh9u|6k_0E_`tyM|Nnmh`7Rv>AOMLtFp2vltUUepg~SZwTiwb__T)cqedICi
JnWY$mH2~@h6V(6!

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/en.gif b/core/media/mod_languages/images/en.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3b9b213eacddf1bb4268168df9e03ef402238be4
GIT binary patch
literal 1027
zcmZ?wbh9u|6k_0E_`ZqZG=t>(<?CPc&tg<9yrSoHMc3)p{<G&rw9gA`y`41sfrZEG
zIm>D%?ibRjQ1G59q*-=JOovgW=z@s$|NHm&bempHUwF&d^$fGjwLPbgUw$U<Hs$~C
zpYmq4XE+o-H+4#w)w7$_{QvcXQKN-NtMU8Qn{0Zm-zLvw&}`BToyQ<qe$B+=<>a|*
z)||SeZ1H2`)@`W`Z$cAagd}`BfB9loZ9>uNuct2vsh7NM?R(eI`K+dsL8|h8Lcz;t
z@9yq7#Hd-)Ic0l7{f^gRNeB34{=ay3FDUWOoA0Lz%0Eq?|Ns5F8!x`56s;`Cox~`c
z^X=Wovpg#08M8iAG!!IEIm0HuIkPQq=IP6?UcH{b^2fs`R}Eaw3uy^ym0!2?xo+We
z)zDQ)xmZBI`C?|xhh@tY{QCaCetAqmOGrNd|D%UrCeOUN?~G>9oEJUQpNA)hBrRB%
z(kx-w@_FWh%bIo>^;>PCre(G6x_|7_bw%BqkKV5fEO^m3lR=^O;LUgce*Z42Sp06v
z+%Koj|NsBz_3EuHbB?duaMmJj$(h~z8RV*zyl1_fFzf%brwlR`cTL=q8&@%^7vFjP
z{bgA4t7!|anYi<tR6P$#Oe<Zj9Xa{+@(pZ;U9T#eUrd@?H|_A&r22~j@*nO$y>{o7
zkXG5<55NDvdU1wT_H*~77r*|$S-OrvwDkR~MVBw!f73JVyr|B#JFo9AUHoqO`rGai
z4EzOKPCP!#CinmU|0@!@3?l>RfV>IH3l1DF80rf&J}+pT#&7#7hfDdm8?%4hoezwQ
z)WdXw)hY@m32<Fl5g~m=CBW4+piO(tpOzoW%#9-29x+!swmui(b`KCRO)^m8mx|oL
zWFcVqvQ>p&m_Z|!>%pPM5ZM`ew#>|Dgq^MYBp9R=dbPO<Cp8F}F5zg_U&=N0hLniw
zB9UoRGP(|?aZU72ev`6@nK5jsL+-T)3Li83m|SDGIcPaBoNLt4-B1wdxS)ZRHJ^ne
zV&ej*CK--7Z(bC0oL|g3qi;`Elh%nI4JiW#RnrbPbz}3WyM~)wd|DXo90Zh<Q$&|C
O_RMgJ3Q<*Hum%8e&w|qc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/en_au.gif b/core/media/mod_languages/images/en_au.gif
new file mode 100644
index 0000000000000000000000000000000000000000..acb6c65fb347103c68b924d5cc71d084f3283801
GIT binary patch
literal 1282
zcmZ?wbhEHb6k_0EIKsg2-`JReVdl)VnKO;k7#Pxwjc5L!dB&I_?MxaF&728h&jd2h
z%mfMmIcaBR&ioJ51rj>*AIP4W_WwUn04GrV&mG|#px}~Nk_e=2>?;Zqle1Gx6p~WY
zGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%T$P<{nWAKGr(jcIRgqhen_7~n
zP?4LHS8P>btCX0MpOk6^WP^nDl@!2AO0sR096=HaAUmD&i&7O#^$c{A4a^J_%nbDm
zjZMtW&2<!v3=9qQ4UF^+jdTsot&EMV3=9;YKnZADQA(Oskc%7CE+EfVDWjyMz)D}g
zyu4hm+*mKaC|%#s($W%ShLMpjP=#)BWnM{Qg>GK4GRy>*)Z*l#%z~24{5%DaiHS-1
zr6smXK$k+ikXryZHm_I@>>a)2{9OHt!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=
zA(aKG`a!A1`K3k4sX*n*Agc<joQqNuOY)0C^7C_Gp%{>nUy@&(kzb(T9BiuKo0y!L
z2jYX(`}$gW<`tJD<|U_ky4WfKP0-8COtCU@b#pawc6Bo}c62f{bTxKzGB9&BvNSg~
zGcz?bHa3Fkb;(aI%}vcKf$2?w>vc20sTY(KatnYqyQCInmZhe+73JqDfW2&$iQ6qM
zIL(9VO~L6FS67^R^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5-H9|NHyr_phHn
zzJL4r<@2YHAKt%v`{wnlmoJ__d-~+@qlXXf-@AL~_N|*Yu3x))<?^MA7tWtMd*<}1
zlP8WJJ9^~sp@RqZ@7ud)_pY5gwr|_IW%H(u8`iH|yJq#Ol`EDnTe@WNqJ<0Q&zn1E
z_N<vRrcawXW%8tn6Z-pld%C+iJKEb?Tbi318|v$7YpSa%E6U4CONxsM3-a@FbF#BC
zGt$#iQ<9Ss6XN4yW1^!XBf`T%LxO_>1N{AbeZ0LqJ>1<~U7Vd99qjFFZLF;<EzHeK
zO^l6zSxQe=M_Wr%LtRZ(MOjHvL0(Q)Mp{ZzLR?H#L|8~rfS-?-hntI&gPo0)g_((w
zfkE*n3%K0S0g<5ch=Da(VW~)~i&}`_nm17@yv!B>!2*o$p1f}G5N&X2l6VldTiJo5
z!($r%oGqa<Bv=@ZhKfF56WQtcD1bqSYl6%4!Y6VO`E#z9rU<^<S(SbN>G}`4EUaSY
UHO2L;%2nDtb>-dlx{3_e0OUW#iU0rr

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/en_ca.gif b/core/media/mod_languages/images/en_ca.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d791dbb7e4039981d3ea49e30a04ff0fd15b1590
GIT binary patch
literal 341
zcmV-b0jmB-Nk%w1VG;lg0M!5h>jDh;#>w$lUH<a&^?HB!t+4JSEBxi=><$<7b9nWB
zgY6k2@@;bZ*4O|4|MZ88?H(rW7$NR2H}#E@`rY39>+J0zD*pQV^>=*#`T6<J(C#WS
z>=PXIm6`k7-R&kW@^E(h;o|EE5$zi!`LVS9?CtY`h3yz3^mu*lF*x*nf$t_P^mKXs
z<>&qH@Ba1m|NsB(93<@@DEr;r><$?3FgEQJ9rJQ``{U#N?eFz~h4pxT{paTZ00000
z00000A^8LV2LS&7EC2ui01^NU000JZz>n}l$T*J3%R`cCj-Dfy(c$qNGlT_nD|NU)
zpo#;l-98gWQY2CsXU$JcsPnK`OcRQtY)0Wk3lM?;4LW>V7zZC5Pc{&Ghfru58#FW@
n0c3Dd880dV0yhJia9s{1C08hsPo@V4R~W3ENJts7P(c7YSUsm<

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/en_gb.gif b/core/media/mod_languages/images/en_gb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3b9b213eacddf1bb4268168df9e03ef402238be4
GIT binary patch
literal 1027
zcmZ?wbh9u|6k_0E_`ZqZG=t>(<?CPc&tg<9yrSoHMc3)p{<G&rw9gA`y`41sfrZEG
zIm>D%?ibRjQ1G59q*-=JOovgW=z@s$|NHm&bempHUwF&d^$fGjwLPbgUw$U<Hs$~C
zpYmq4XE+o-H+4#w)w7$_{QvcXQKN-NtMU8Qn{0Zm-zLvw&}`BToyQ<qe$B+=<>a|*
z)||SeZ1H2`)@`W`Z$cAagd}`BfB9loZ9>uNuct2vsh7NM?R(eI`K+dsL8|h8Lcz;t
z@9yq7#Hd-)Ic0l7{f^gRNeB34{=ay3FDUWOoA0Lz%0Eq?|Ns5F8!x`56s;`Cox~`c
z^X=Wovpg#08M8iAG!!IEIm0HuIkPQq=IP6?UcH{b^2fs`R}Eaw3uy^ym0!2?xo+We
z)zDQ)xmZBI`C?|xhh@tY{QCaCetAqmOGrNd|D%UrCeOUN?~G>9oEJUQpNA)hBrRB%
z(kx-w@_FWh%bIo>^;>PCre(G6x_|7_bw%BqkKV5fEO^m3lR=^O;LUgce*Z42Sp06v
z+%Koj|NsBz_3EuHbB?duaMmJj$(h~z8RV*zyl1_fFzf%brwlR`cTL=q8&@%^7vFjP
z{bgA4t7!|anYi<tR6P$#Oe<Zj9Xa{+@(pZ;U9T#eUrd@?H|_A&r22~j@*nO$y>{o7
zkXG5<55NDvdU1wT_H*~77r*|$S-OrvwDkR~MVBw!f73JVyr|B#JFo9AUHoqO`rGai
z4EzOKPCP!#CinmU|0@!@3?l>RfV>IH3l1DF80rf&J}+pT#&7#7hfDdm8?%4hoezwQ
z)WdXw)hY@m32<Fl5g~m=CBW4+piO(tpOzoW%#9-29x+!swmui(b`KCRO)^m8mx|oL
zWFcVqvQ>p&m_Z|!>%pPM5ZM`ew#>|Dgq^MYBp9R=dbPO<Cp8F}F5zg_U&=N0hLniw
zB9UoRGP(|?aZU72ev`6@nK5jsL+-T)3Li83m|SDGIcPaBoNLt4-B1wdxS)ZRHJ^ne
zV&ej*CK--7Z(bC0oL|g3qi;`Elh%nI4JiW#RnrbPbz}3WyM~)wd|DXo90Zh<Q$&|C
O_RMgJ3Q<*Hum%8e&w|qc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/en_nz.gif b/core/media/mod_languages/images/en_nz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cd221ffe2f87d646be9533e5b2e010658fb03f7a
GIT binary patch
literal 539
zcmZ?wbhEHb6k_0Hc*elMpi;}AT+5(T!=O~lAYI9-QO}@Q%dB3nXW9HTIHA2~8-rqv
zu2l=KP9uYC)ux6y3ks)js8sXmH2S+V?J1wokTH!zujRR4)QMT^1Ckdo$k*hBb!}dH
z@SJx-WzwX>vo<8eO}C3(z@S#oq*_-~w$wFXvZz7R%UMepRq9`cB%IoCxW+E;Ra_>6
zavhsS{qwkN2BkV?wK@*1hHb@tfxg|c#%)g~%vsd4?wpdvIj?vY_4+HeffoMLtn6DE
z<g1VRr>EC!;?!zjP^i(fXv*?!=F)0VHEKFHd)=0fB{?w@7!>PXM5S@4*Y29VRYJSw
zY)B@9VtuGr8;54SuUi|?_X7?Tf3kqxpaUX7al*h}(IDWfXv3-M%x^Bn#K2&{*vlYo
ztS)aYVkY6~!^p@Q=*rzI>#whAq2q07@5jt$$m7V{>!9VKBF-h_uAmeYY-OirqRSvE
z%x9|Y<|Qd7$ZE?zLAjU3iIFLQiIGLBmyMBm!o;V~df7Sjo;-iXXyhXF=It|$r;QBO
E09D(8r~m)}

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/en_us.gif b/core/media/mod_languages/images/en_us.gif
new file mode 100644
index 0000000000000000000000000000000000000000..970411fcae65d12136b0e6e7584c185b973005de
GIT binary patch
literal 90
zcmZ?wbhEHb6k_0E_{0DNX)|XYI>W&5^~{<7|Nnyoz(5B?g48%Lt8*~!(J^pyTD@0P
lVA;+;T+bQix6IAxDwN*5G>OOjW5WINmG5ibyK^#F0|2{h9uEKj

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/eo.gif b/core/media/mod_languages/images/eo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..09024ecac42564a691e285efca25eeb332615f02
GIT binary patch
literal 177
zcmZ?wbh9u|6k_0E_#(;h|NsAQzrS61cjedLU%&tUe*OLR%?~%Tk7Rpp@cjGl?~gw}
z_B`2Rv%zNh?d5u_^}hf9e*44iJ0I_?zqh{XRMo8yw-~w^^w#M8`~Qz&Cd1d?Ul}lf
z4oC!KmjkPrf<hmE+PsWa>t<LevI}fbPw)s+*4Q#LwdH_9@C(Vv#jP3Fm>ncU+Y=I4
SVl)~&nhM@j?LQ{KU=0AA7E;>)

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/eo_xx.gif b/core/media/mod_languages/images/eo_xx.gif
new file mode 100644
index 0000000000000000000000000000000000000000..09024ecac42564a691e285efca25eeb332615f02
GIT binary patch
literal 177
zcmZ?wbh9u|6k_0E_#(;h|NsAQzrS61cjedLU%&tUe*OLR%?~%Tk7Rpp@cjGl?~gw}
z_B`2Rv%zNh?d5u_^}hf9e*44iJ0I_?zqh{XRMo8yw-~w^^w#M8`~Qz&Cd1d?Ul}lf
z4oC!KmjkPrf<hmE+PsWa>t<LevI}fbPw)s+*4Q#LwdH_9@C(Vv#jP3Fm>ncU+Y=I4
SVl)~&nhM@j?LQ{KU=0AA7E;>)

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/es.gif b/core/media/mod_languages/images/es.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e8d4fe2752ce13bf0172894b189b037f4b438e0
GIT binary patch
literal 169
zcmZ?wbh9u|6k_0E_#(;h{|LiMH_4~#*mnDg?sF1)x1RZIdB}!H=blinqn#RO=kTpe
zP`SF4^XCDk<6X{&r@5?)6h7iBv9(ilUwzB@EZ<}E%y*QE?Oing7`NOye>nyWpaT*C
z*~P%Br=ZrCk~uG97L(2a53kGTOadGZDqX2@l9|r6-c3?LtxfT5;z<{oQ!9d8*G2^@
HGFSrujuSd%

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/es_co.gif b/core/media/mod_languages/images/es_co.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4b7a5a8d708d10802074aa5396b7945d057d1c1
GIT binary patch
literal 851
zcmZ?wbhEHb6k_0E_|Cw<Y(9~}VluPUq_cu*-_J?@xhTdk3PwX<#Dstj$fuyZz`$X_
zz|A4!v0=f%W)5Mkm=hBe8`}kxy;?LDEIQgPq04sT#Ky($eGE=rGM+(C8YXK5uZlUj
MX{q;gMn(o}0MkPtr~m)}

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/es_es.gif b/core/media/mod_languages/images/es_es.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e8d4fe2752ce13bf0172894b189b037f4b438e0
GIT binary patch
literal 169
zcmZ?wbh9u|6k_0E_#(;h{|LiMH_4~#*mnDg?sF1)x1RZIdB}!H=blinqn#RO=kTpe
zP`SF4^XCDk<6X{&r@5?)6h7iBv9(ilUwzB@EZ<}E%y*QE?Oing7`NOye>nyWpaT*C
z*~P%Br=ZrCk~uG97L(2a53kGTOadGZDqX2@l9|r6-c3?LtxfT5;z<{oQ!9d8*G2^@
HGFSrujuSd%

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/et.gif b/core/media/mod_languages/images/et.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6764ec8bcac013d57d6977f32b2892a29eaf4bbe
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{abPR;5S&|NjqU=zw@2aRw&wp8l1m->z?%v*lLz=6hj3_}d<N
LOnas&#$XKqGPf0d

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/et_ee.gif b/core/media/mod_languages/images/et_ee.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6764ec8bcac013d57d6977f32b2892a29eaf4bbe
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{abPR;5S&|NjqU=zw@2aRw&wp8l1m->z?%v*lLz=6hj3_}d<N
LOnas&#$XKqGPf0d

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/eu_es.gif b/core/media/mod_languages/images/eu_es.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ddaee9d6ede48dec462ca65a225f4914f62bb1bd
GIT binary patch
literal 1290
zcmZ?wbhEHb6k_0FIKsg2ABfJJNlP<6!@w}p7|1oAX>9x-i2naKPBS*1nFbU+V{FWD
zCe1jFfgz0{&6r^(Q0~lspt>_a8YuH0s1+wr{LdZX8=&BlSds{&ZR{%w5|gu2OB9k)
z(=+pImEP~(ucVNfVyhHx>TBRz;GCL~=}}db8eHWUl3bOYY?-2DZ>L~WVO5b^kegbP
zs8ErclUHn2VXKswlAn}n1!RMS^_3LBN=mYAl^j753Lrb3^NUgyO!W+OlMT!a6wD0u
z42@09&CPWbj0_A7^bL&k4UKdS&8>`$tPBhkpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pF
zzr4I$uiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&
z`K2YcN<f!FypUS}H#V<W59}Si<osOyio^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz
z#UYgisro^w#rdU0$*Dl)${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;2dnK;G3A7
znFr#7)%*HddFB<DB<3Zjdb-#u0Zq`$%uKOzG;uSuFmf|CGc|QIG;}p~G;(!ubh31`
zG`Dngc64!s>2=9ZF3nBND}m`vLFhHXsTY(KatnYqyQCInmZhe+73JqDfW2&$iQ6rP
zIL(9VO~LIJBb<8mfsWA!MJ!T8!-RmT2gHOYTObFX@Kf`Esl5o8tQr6R`}^njub)4@
zfBX97^QVs=-oJbM=Jl(WFP=Yp`sDGWhY#-GyL;#Mt(!NlU%Ptc@}-Lx&YwGb=JctP
zCypOGdgSn-g9rBS+q-A?uAMu!Z`-<M^QMg()~{Q;X7#F-E0!-?x@7U9g$w4-n>%Or
zteG>WPn$Yr@}!9q`ulo&y1P0%+S^)NnwuIM>g#H2s;eq1%F9Yiii-*h^7C?Yva>QX
z($i8?l9Lh>;^SgtqN5@s!oxyCf`bAB{QZ1=yuCa<+}&JVoShsU?CorAtgS39%*{+q
zjE#U<N>5iuTT4?zT}@R*SxHerUQSj<T1rwvTuf9%SV&NSpO2S^n~Rf!osE@+nTe5s
zLGdRGxZKbIk)ZO3fi-)<CJy&P1LuYipGuDILn>#JL>#(!91?YUIhnt&mSoUsNKAUe
zTfuN5>0^N9G64rY(HCX9f-Fi&AFGZgb+R}LZom3Mbc(@RrFGm*WdVvtxgH!|4h^iv
arc4%AHmnA`oIFY@Y8qNPdInsI4AuY)X}<RW

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fa.gif b/core/media/mod_languages/images/fa.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4babb94d3b0e41a4952916dd8118a35d80c752b2
GIT binary patch
literal 318
zcmZ?wbh9u|6k_0E_^QM3|NsBL|Na#nY$-X^_97|i@83WFV`5$=C%?+gEjrZt|MKPk
zmoL0bNhvwpR(z=K|LN2J^YZ?0-S&Uip8w9y|BoO4f9%+cl$8G`PnI5T|L@{be6-^q
z(6pl+|MLq<4!6HdO)WXr^}oF0|HKI|l9OK~CjS5X_y50tfB*fxD<pK2f#DVdgYit`
z;zO+r<N_U#Mvz|^*pd%SE%4Bh>OYY(>8S)q1ZO|nk<1MSOwSuix#sL^Y;xM7QF4B^
zaKhPX4o-79s{Pn)cqEyZ?$cxRQmYde7G+RtZ)i|aR%YpAm*?P7RuSu-t~qno>^ZZv
U<}X;dXo1GkWy@DAb7Zgv0CS0hO#lD@

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fa_ir.gif b/core/media/mod_languages/images/fa_ir.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4babb94d3b0e41a4952916dd8118a35d80c752b2
GIT binary patch
literal 318
zcmZ?wbh9u|6k_0E_^QM3|NsBL|Na#nY$-X^_97|i@83WFV`5$=C%?+gEjrZt|MKPk
zmoL0bNhvwpR(z=K|LN2J^YZ?0-S&Uip8w9y|BoO4f9%+cl$8G`PnI5T|L@{be6-^q
z(6pl+|MLq<4!6HdO)WXr^}oF0|HKI|l9OK~CjS5X_y50tfB*fxD<pK2f#DVdgYit`
z;zO+r<N_U#Mvz|^*pd%SE%4Bh>OYY(>8S)q1ZO|nk<1MSOwSuix#sL^Y;xM7QF4B^
zaKhPX4o-79s{Pn)cqEyZ?$cxRQmYde7G+RtZ)i|aR%YpAm*?P7RuSu-t~qno>^ZZv
U<}X;dXo1GkWy@DAb7Zgv0CS0hO#lD@

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fi.gif b/core/media/mod_languages/images/fi.gif
new file mode 100644
index 0000000000000000000000000000000000000000..95e5c11fd2941b5939e312b6a9af670b2192da42
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tv*Am8=>|9>3@AOMLtFiH3D7Mz~Vd%nBiQp@IZXM&d3#8%|0
Nv3D(=RmaL;4FD%+6l4GZ

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fi_fi.gif b/core/media/mod_languages/images/fi_fi.gif
new file mode 100644
index 0000000000000000000000000000000000000000..95e5c11fd2941b5939e312b6a9af670b2192da42
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tv*Am8=>|9>3@AOMLtFiH3D7Mz~Vd%nBiQp@IZXM&d3#8%|0
Nv3D(=RmaL;4FD%+6l4GZ

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fr.gif b/core/media/mod_languages/images/fr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..13328761d3b132d3a7755b138355add9e823b2b5
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNUUsC1&|NjhX4GatnIzY?-5_e!yo+7{UK<$d4Vt*G)$F1hC
ct61-e^(9Q7_+p9Mv*2aRwGU?pGcZ^K066Fv_5c6?

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fr_ca.gif b/core/media/mod_languages/images/fr_ca.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a348a785f9ed833403212c0502cd0bc4c9fa6170
GIT binary patch
literal 145
zcmV;C0B-+BNk%w1VG;lg0P_w2VSu}-x!GTVx_X<*|NsAop3A7V*#J|aV1T@OoXf1a
z+=!mes<+j8o67)Gp8x;=A^8LZ2LS&7EC2ui01^NU000C&(8=i%A&F{7rX|DFX$x^2
zU&a+1^@W=N%(QX^bbjr8@BcsoVn{?7E{r0v^=TYhl8fXO9Z{?)5p;TiX(9kSHc33;

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/fr_fr.gif b/core/media/mod_languages/images/fr_fr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..13328761d3b132d3a7755b138355add9e823b2b5
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNUUsC1&|NjhX4GatnIzY?-5_e!yo+7{UK<$d4Vt*G)$F1hC
ct61-e^(9Q7_+p9Mv*2aRwGU?pGcZ^K066Fv_5c6?

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ga_ie.gif b/core/media/mod_languages/images/ga_ie.gif
new file mode 100644
index 0000000000000000000000000000000000000000..38a1fc0a892bd993b23510be99afecc2b1f5f261
GIT binary patch
literal 1380
zcmZ?wbhEHb6k_0ExXQrr9|(#W7^gV@Ph(){G5z%O^WVRJm?t|iOm*g;>HW8u>2IUV
zzhXwFDNg^2nHZ<IFidg&2NX$TV43X1I0dN8g?X~`??&0*#VpK|9T}%O{`vF!<IhhF
zJtj<3o%m<^@Xz%8^Y_p1MwvgwEPsm`8G6hFW_o@6@tJ{2K=D6!gl~X?OJYePkhZa}
zC`e4sPAySLN=?tqvsHS(d%u!GW{Ry+xT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aR
zO@&oOZb5EpNuokUZcbjYRfVlmVoH8esuhq864qBz04piUwpDTjNhpBqbj~kIRWQ{v
z&`mZlGf*%y)H5_TF*i5YQ7|$vG|)FN(l<2HH8i&}HnK7>P=Ep@plwAdX;wilZcw{`
zJX@uVl9B=|ef{$Ca=mh6z5JqdeM3u2OOP2xM!G;1y2X`wC5aWfdBw^w6I@b@lZ!G7
zN;32F6hI~>Cgqow*eU^C3h_d20o>TUVm+{T^pf*)^(zt!^bPe4Kwg3=^!3HBG&dKn
zy0|1L72#g21{a4^7NqJ2r55Lx7A2<wl`Dg+DzI`cN=+=uFAB-e&w+(vKt_H^esM;A
zfr4|ese*4}a%LWg4_5E%Yvq|&T#}fVoa*Ufs{}MbFEca6%GlV@)x^=v)ZEq8$k5Q$
z)WX!w(%I3~+1%LB*wDz(6{goEKe;qFHLnDwHwB^B45waDQpha;+U$~Alv$RV;#QQO
zs{r=0RVHq?7~?b#sy79<TTF23)dxC89~7}j5e*XprXCOzo@{{}c*0N31E%&OV6tZX
z{|}h)e*OIM{oB_spFe&4@c!M~H?Lp4eDVC*(<hG~J$!Kg-rYO5Z{56c{o2(lmoHts
zaQ@ucGpA3TJaPQk(IbZs9Xzmq-`+jDckSG<ecRS8n>TITuzuazHLF*xT(NxF(j|)*
zEnF~v-rPB}XU&{3ecIG1lP67_(BIeF)7{nC(caeD(%jV8P+wPDQ(aYAQC?PBQe0G6
zke`>Elbw~Bk)D>ClAM&75FZyC6CD*95gryA5*!p5;P2<_<L%|?;qK<@;_T$;U~gw@
zV{K(=VQyw>Vr&G=QhK^N+FF_#>T0Sg%1Vj~@^Z2=(o&KV;$osA!a{-q{CvDT++3U-
z>};$o%uI|742nNlz@>~1hy;~)3~Z?fdX_o9Y_MohQBav=Fi*n!=|_!PF0TefBaRA5
z_7(>RkA$ghuGd#{^q+p7QYD+wee&6xJJIEjA4g@?l;u}uH09J4RCUyrcej_c)b~tE
d6cCtD6jP%jEXT{sqNW}xEiS~jO4*UY8URLC-2eap

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/gd.gif b/core/media/mod_languages/images/gd.gif
new file mode 100644
index 0000000000000000000000000000000000000000..470ee74734b5fa9958d9fef462ecd956b49d562f
GIT binary patch
literal 179
zcmZ?wbhEHb6k_0E_{`66=Kp_&&@&7TGZ`Ar7>AxQ29m4Jq^&wL6Ns(?(f>17&z!mX
z9|#yiXEHD_DE?$&WnkcE&;ha;KxQzoBy2D>YvSG!cP3@JyFy1;smJ7EhDkvY5fc|A
z?zwQdz{|6+clu%X#t95rGtMk6a5k)2a`8k^zyhi6>r0y?-%4?0KjskTkqM1i@W3Qz
bALp5V1L=0V-U*A1cx&3F)4e=>1sSXX)tgEc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/gd_gb.gif b/core/media/mod_languages/images/gd_gb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..470ee74734b5fa9958d9fef462ecd956b49d562f
GIT binary patch
literal 179
zcmZ?wbhEHb6k_0E_{`66=Kp_&&@&7TGZ`Ar7>AxQ29m4Jq^&wL6Ns(?(f>17&z!mX
z9|#yiXEHD_DE?$&WnkcE&;ha;KxQzoBy2D>YvSG!cP3@JyFy1;smJ7EhDkvY5fc|A
z?zwQdz{|6+clu%X#t95rGtMk6a5k)2a`8k^zyhi6>r0y?-%4?0KjskTkqM1i@W3Qz
bALp5V1L=0V-U*A1cx&3F)4e=>1sSXX)tgEc

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/gl.gif b/core/media/mod_languages/images/gl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06a704b07fdeff903403505376652606912729aa
GIT binary patch
literal 1411
zcmZ?wbhEHb6k_0ExXQqA`|cfy?rmL%uYdph`{}n|Ow&%?c>XHx(DTZkmjB;BF-*P0
zJ@phr+u{FzzVS>uHuLH$hW=BNFTP-i-8%2)8-|&87$zTK=sD)M>E{3c|KGoV|LWDN
zH*elr&b(*QbSP}!W9!O`%F!1Xrr+Cp;@GcWzkdJukzC~W<md*g6w@LDak0=7pFVwJ
zNIL%f#Y?5sW}VEPm(QH;H5Odxz<$Vs<KdGB8J*P$`=7LIc=!Ly`?qi3NlrSzFzfQo
zFF!y0|Nr6rdj`k!-3Rt7{^ySH4N!1NEJ*~?Hue<-iOJciB??KY>6v-9O7C~?S5nAK
zu~iB;^)>J<a8Aw0^r$LI4X*MFNv_IHwoFm7w^OjGu&T%{$W1LtRH(?!$t$+1uvJP-
z$xlkP0<uBE`br95B_-LmN{%221(2Q2`9-M;rg{dt$p&Ty3TB3ShQ=o5=H@yIMh1ok
z`UXb&hDN%E=2pf=Rt5$NP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6WS8lAAUzDzI
zXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&IzC7??oUdSzg
z8=F_G2lkF$a(=FUMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRMRQ;gT;{4L0
z<W!(?Wsp?`R?bDKi6!|(A^G_^uuu%h$S=t+&d4uNa1J(A@J&q4%meYk>V18!JoAc6
z67!N%JzZ>-fF|f=W~Nv<x;Z&pI-8jqSQ@$-8oHV|8Jjy<x>~xKI9pmeyBe9m^t$9H
zm*%GCmB93-AoQBy)C)=qxdlL*T~doO%TiO^it=+6z+Se>#O)SioaRCGrr>sq2~NHG
zK*#8VA{Hs4VM4&v17gCHEsz6G_^Elo)LsNk){OuE{r&U%*Uul{zkU7k`P0V_@87+B
z^ZM1x7tfzPee(Fx!w2{8-Mw@B*3BE&uU)-z`O?J;=g*xzbNbZD6UUDoJ#zTa!2|pE
z?cK9`*UlZ=w{6|BdDF%X>({MavwGFa70Z_`U9x!5!Ugl^&7CuQ*322xr%jzQdD6rQ
z{e8VX-Cdm>?QN|s%}tFB^>wv1)m4=h<z=NM#YKe$`FXiH*;$zx>1nAc$w`R`@o}*+
z(NU2R;bEa6!9jrm{(inb-d>&_?ryFw&Q6XF_I9>5)>f7l=4PfQ#zw#_rKhW-t);1<
zuBNJ@tfZ(QFDEM_EhQ--E+#4>EF>tv&&SKd&Be*V&c@2Z%*4pRp!k!80R(hF1gN}Y
zU~4(hpse6=$7I%7wv#SQS|W2F9XK4ZKH|)Yf`kZ(ZqAqLQYnTrS=2Ut2ol&d<K>*h
zNKSFL6|ByCUr0sp^9d<v%34QCHb$`MnQ#cP@<(*1%d4wu3-E}ugjw`NnAz#du*P!>
oO7Jd<U@(>t&W)F2(@KxDF%{tA5@nD)bohuZCohwwvm=8w02Hbq2LJ#7

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/gl_es.gif b/core/media/mod_languages/images/gl_es.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06a704b07fdeff903403505376652606912729aa
GIT binary patch
literal 1411
zcmZ?wbhEHb6k_0ExXQqA`|cfy?rmL%uYdph`{}n|Ow&%?c>XHx(DTZkmjB;BF-*P0
zJ@phr+u{FzzVS>uHuLH$hW=BNFTP-i-8%2)8-|&87$zTK=sD)M>E{3c|KGoV|LWDN
zH*elr&b(*QbSP}!W9!O`%F!1Xrr+Cp;@GcWzkdJukzC~W<md*g6w@LDak0=7pFVwJ
zNIL%f#Y?5sW}VEPm(QH;H5Odxz<$Vs<KdGB8J*P$`=7LIc=!Ly`?qi3NlrSzFzfQo
zFF!y0|Nr6rdj`k!-3Rt7{^ySH4N!1NEJ*~?Hue<-iOJciB??KY>6v-9O7C~?S5nAK
zu~iB;^)>J<a8Aw0^r$LI4X*MFNv_IHwoFm7w^OjGu&T%{$W1LtRH(?!$t$+1uvJP-
z$xlkP0<uBE`br95B_-LmN{%221(2Q2`9-M;rg{dt$p&Ty3TB3ShQ=o5=H@yIMh1ok
z`UXb&hDN%E=2pf=Rt5$NP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6WS8lAAUzDzI
zXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&IzC7??oUdSzg
z8=F_G2lkF$a(=FUMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRMRQ;gT;{4L0
z<W!(?Wsp?`R?bDKi6!|(A^G_^uuu%h$S=t+&d4uNa1J(A@J&q4%meYk>V18!JoAc6
z67!N%JzZ>-fF|f=W~Nv<x;Z&pI-8jqSQ@$-8oHV|8Jjy<x>~xKI9pmeyBe9m^t$9H
zm*%GCmB93-AoQBy)C)=qxdlL*T~doO%TiO^it=+6z+Se>#O)SioaRCGrr>sq2~NHG
zK*#8VA{Hs4VM4&v17gCHEsz6G_^Elo)LsNk){OuE{r&U%*Uul{zkU7k`P0V_@87+B
z^ZM1x7tfzPee(Fx!w2{8-Mw@B*3BE&uU)-z`O?J;=g*xzbNbZD6UUDoJ#zTa!2|pE
z?cK9`*UlZ=w{6|BdDF%X>({MavwGFa70Z_`U9x!5!Ugl^&7CuQ*322xr%jzQdD6rQ
z{e8VX-Cdm>?QN|s%}tFB^>wv1)m4=h<z=NM#YKe$`FXiH*;$zx>1nAc$w`R`@o}*+
z(NU2R;bEa6!9jrm{(inb-d>&_?ryFw&Q6XF_I9>5)>f7l=4PfQ#zw#_rKhW-t);1<
zuBNJ@tfZ(QFDEM_EhQ--E+#4>EF>tv&&SKd&Be*V&c@2Z%*4pRp!k!80R(hF1gN}Y
zU~4(hpse6=$7I%7wv#SQS|W2F9XK4ZKH|)Yf`kZ(ZqAqLQYnTrS=2Ut2ol&d<K>*h
zNKSFL6|ByCUr0sp^9d<v%34QCHb$`MnQ#cP@<(*1%d4wu3-E}ugjw`NnAz#du*P!>
oO7Jd<U@(>t&W)F2(@KxDF%{tA5@nD)bohuZCohwwvm=8w02Hbq2LJ#7

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/he.gif b/core/media/mod_languages/images/he.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7170ce2a6fd1de550f65211269646165a4221485
GIT binary patch
literal 68
zcmZ?wbhEHb6k_0E_`t;Q|NnmmuXBn&Sy&kum>6^zfB+=pz$D$$zf$rw<HN2kw^UrR
VFaP2X>o+cXqNw$-+=`XK8UU(k6^;M^

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/he_il.gif b/core/media/mod_languages/images/he_il.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7170ce2a6fd1de550f65211269646165a4221485
GIT binary patch
literal 68
zcmZ?wbhEHb6k_0E_`t;Q|NnmmuXBn&Sy&kum>6^zfB+=pz$D$$zf$rw<HN2kw^UrR
VFaP2X>o+cXqNw$-+=`XK8UU(k6^;M^

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hi.gif b/core/media/mod_languages/images/hi.gif
new file mode 100644
index 0000000000000000000000000000000000000000..20b44757d308e7164c0bba5e07cc72081d6d0bf7
GIT binary patch
literal 115
zcmZ?wbh9u|6k_0E_{_)ff2Og4LGywI#|#Xb^z<6%%{y9HxT>UNO?mm+`SXwF<*m@y
zZ~p)Pzi<bKzJ3z}1A`6_Gl29muxJRJ@Lavu;&txK|2+aaoEfwDk}T3s3$!2Fwah{!
Tck%n0_x}$pD0tD$z+epk+@CF-

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hi_in.gif b/core/media/mod_languages/images/hi_in.gif
new file mode 100644
index 0000000000000000000000000000000000000000..20b44757d308e7164c0bba5e07cc72081d6d0bf7
GIT binary patch
literal 115
zcmZ?wbh9u|6k_0E_{_)ff2Og4LGywI#|#Xb^z<6%%{y9HxT>UNO?mm+`SXwF<*m@y
zZ~p)Pzi<bKzJ3z}1A`6_Gl29muxJRJ@Lavu;&txK|2+aaoEfwDk}T3s3$!2Fwah{!
Tck%n0_x}$pD0tD$z+epk+@CF-

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hk.gif b/core/media/mod_languages/images/hk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d6904f7e2e7add5138d443e49ae8fd68f27f430a
GIT binary patch
literal 332
zcmV-S0ki%`Nk%v~VG;lg0QEfp;5Z@UMls$f58f&f-6IM1#lPJm2>tZ)-YF5?A_?t^
zeBLGv=3PqOCl2g~dfzb_-!dBWuch534Ba6J;5i}PBns$gR^22E+Z6!kV^H_W!t8@}
z^RTDnO*#43((HwH`|0NO!Mgk6-`yh!`rq62!n)x(BIQ{|;Xy0iCJpL(Yu+pr>U3oA
zo|4@l2HYP6-603wCJghmtohp2+!_GpU`^Z~1@yeM`{(53P(0&DG2=)x-YF2^G#mf`
z00000EC2ui01^NU06+$DzyM%KEE)kqo|0!^XdI|QF0tedmzAB01(HQtrr7dY<q<lW
zOW6vj8Z4oYqCkNS#=W&bx!6~Gd1V6x6L)1jZA%R_4<Z~GFAE4`iDo(nBpV7d9w#G|
eRVgbaI5!71HdSOx0un9>5R<AxN3}x%K>$1Sg^bMr

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hk_hk.gif b/core/media/mod_languages/images/hk_hk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d6904f7e2e7add5138d443e49ae8fd68f27f430a
GIT binary patch
literal 332
zcmV-S0ki%`Nk%v~VG;lg0QEfp;5Z@UMls$f58f&f-6IM1#lPJm2>tZ)-YF5?A_?t^
zeBLGv=3PqOCl2g~dfzb_-!dBWuch534Ba6J;5i}PBns$gR^22E+Z6!kV^H_W!t8@}
z^RTDnO*#43((HwH`|0NO!Mgk6-`yh!`rq62!n)x(BIQ{|;Xy0iCJpL(Yu+pr>U3oA
zo|4@l2HYP6-603wCJghmtohp2+!_GpU`^Z~1@yeM`{(53P(0&DG2=)x-YF2^G#mf`
z00000EC2ui01^NU06+$DzyM%KEE)kqo|0!^XdI|QF0tedmzAB01(HQtrr7dY<q<lW
zOW6vj8Z4oYqCkNS#=W&bx!6~Gd1V6x6L)1jZA%R_4<Z~GFAE4`iDo(nBpV7d9w#G|
eRVgbaI5!71HdSOx0un9>5R<AxN3}x%K>$1Sg^bMr

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hr.gif b/core/media/mod_languages/images/hr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..85e9f55bff13683b04611af30e4961fe3c6bd456
GIT binary patch
literal 294
zcmZ?wbhEHb6k_0ESgOYGf64M^ax%}@xu1y&KNA$3rQ!a6`KJ2*p8wNlSR2;-U$D?b
zt*Fu|`2V5f&n(OmYD)XU!vA-zjWW-9CN2Jd<>sZKKK~D$R#Ghef8s=WbxuZV)H5}W
zXEO5tuU&g4DfNt%CuhUb|1;)3V_`qT00e3O|NjTk)B}n?Sr{1@>=|@GMuPmrz~+2l
zVu6Q_RKG{^(g}$UlUyb|S!gNaedCR~%7Ttf4+>U3W)v`Zw1xR#V9uo^Zw7;mC7wV2
Xs2Ulnd}?T{<ZfzhYwu`uWUvMRI}cp4

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hr_hr.gif b/core/media/mod_languages/images/hr_hr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..85e9f55bff13683b04611af30e4961fe3c6bd456
GIT binary patch
literal 294
zcmZ?wbhEHb6k_0ESgOYGf64M^ax%}@xu1y&KNA$3rQ!a6`KJ2*p8wNlSR2;-U$D?b
zt*Fu|`2V5f&n(OmYD)XU!vA-zjWW-9CN2Jd<>sZKKK~D$R#Ghef8s=WbxuZV)H5}W
zXEO5tuU&g4DfNt%CuhUb|1;)3V_`qT00e3O|NjTk)B}n?Sr{1@>=|@GMuPmrz~+2l
zVu6Q_RKG{^(g}$UlUyb|S!gNaedCR~%7Ttf4+>U3W)v`Zw1xR#V9uo^Zw7;mC7wV2
Xs2Ulnd}?T{<ZfzhYwu`uWUvMRI}cp4

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hu.gif b/core/media/mod_languages/images/hu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..da28a93e62b91cf2b244788427fbd86a50679141
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hM((Cha9|Nl$MIzT1}Gl0Yyn8c^_uRQ&BebbyRx4Jjq6Z^s6
N_Q+$}GfgoDYXDG5703Vp

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hu_hu.gif b/core/media/mod_languages/images/hu_hu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..da28a93e62b91cf2b244788427fbd86a50679141
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hM((Cha9|Nl$MIzT1}Gl0Yyn8c^_uRQ&BebbyRx4Jjq6Z^s6
N_Q+$}GfgoDYXDG5703Vp

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hy.gif b/core/media/mod_languages/images/hy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..92e71189f5d0f6a793ba2986abd830f71c694d9e
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hNUABbi$Fff3y4iGbd#2J{xTl!a?e!IS9&X!x<o9~(Z;BR~6
LG3}YA7=twc1d|jQ

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/hy_am.gif b/core/media/mod_languages/images/hy_am.gif
new file mode 100644
index 0000000000000000000000000000000000000000..92e71189f5d0f6a793ba2986abd830f71c694d9e
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hNUABbi$Fff3y4iGbd#2J{xTl!a?e!IS9&X!x<o9~(Z;BR~6
LG3}YA7=twc1d|jQ

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/icon-16-language.png b/core/media/mod_languages/images/icon-16-language.png
new file mode 100644
index 0000000000000000000000000000000000000000..76d3364004d78a0117e3224f67a74580234d36b1
GIT binary patch
literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007GNkl<Zcmbu8
z18igg6h+sL8m!Hz(b~3c+qP}gwr$%s$F^tc_TND=f9;!`kB1Y!ZUFv^?+Rx!R2y&S
zsmqV1DqD6YD6lt4L7YriX&)77(#~b7ru<Z}Ek@GoY??ggV4}3sqgD%tN)6(f&7dgT
zVO6e%p^w8!vW~|Es>?qVTuPTjAB-2`aDoW0ixha0FNa9i31glX$gwekZ(@JEkoZ)p
zJo}a4L?VCV>q2R3DoY3dIu#z|h_OAA1FI4lyla)%6voEtU>5FXi4jHB;8~tTb2&{o
zoD`glV^?LewJ@eu+5+1W37pHNSRX{gQeO&I`crW<mW9XJ0@NA$!F38e&lNh8f|WjX
z?Vkz+FsF+k@IIf9mEN_O=T>dvWeyLnWn$#8HE=P!A7yZANWntaa$>btCAjKVh;?mv
zpUc5C`;xDSX^`Po5*?T0sHhg}@GOHRAO(w@3cD;n=3rl7C2l1&!tnhSy8|j<PMuhb
z7wL4|OQP^d!Fu;X#iUoMFfzj`3nxM<;a<$aOzSLDZJ~WG9P(M<s+wVpRSpAJqH9V>
z!Nu?jztNB5VCG3uJ&a+<blBxpNY)=F)SBwoqpM(@O*>Btjs+B1EU-#x8*(=sMy9_@
zM00y5G_4(&Z<PXb{Xu*+{7PB49bG8|(32Dxc^qH0)$(~XVR1bWLvIHopDD#EyHptd
zNk-of!>Pc+=4_gH@(*v}V`}Zn&5o&R%cl`I?3Il{7rjZw-wVOb@Df%zS3cpF$JF<%
zd!G}&IZswtB@`OqFaH$J+3Av&{4}oO*e|Z}-_ZlPB=GdoLFJ+V0000<MNUMnLSTZJ
Ce=~Ie

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/id.gif b/core/media/mod_languages/images/id.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e4a11e296bca4c663b4f925bd32d2ee7da8690d
GIT binary patch
literal 60
zcmZ?wbhEHb6k_0E_`t+)PEhUt|Nn|VSy;Ikm>6^zfB+=Jz$Dz#zw-23{>3&6Z*_0J
Nx92y1TNopQH2?*+6CeNp

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/id_id.gif b/core/media/mod_languages/images/id_id.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e4a11e296bca4c663b4f925bd32d2ee7da8690d
GIT binary patch
literal 60
zcmZ?wbhEHb6k_0E_`t+)PEhUt|Nn|VSy;Ikm>6^zfB+=Jz$Dz#zw-23{>3&6Z*_0J
Nx92y1TNopQH2?*+6CeNp

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/is.gif b/core/media/mod_languages/images/is.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2a4ecfb9dca7e7361e146f9ce7ee524810f871bd
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNU|Ns9p3=9m$Gl7H-5Ho<p9hj7-unHEuopvpIL0D?>vI;rY
awxkoD^Mno4S5`gN&YH1o<LX*525SHwKo~3l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/is_is.gif b/core/media/mod_languages/images/is_is.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2a4ecfb9dca7e7361e146f9ce7ee524810f871bd
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNU|Ns9p3=9m$Gl7H-5Ho<p9hj7-unHEuopvpIL0D?>vI;rY
awxkoD^Mno4S5`gN&YH1o<LX*525SHwKo~3l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/it.gif b/core/media/mod_languages/images/it.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a5f6f81798d64af11621df996342bdffbc4b0d7
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hM((Cha9|Nl$MIzT1}Gl0Y$n3P-OS01We5me0YV(Gfo{B;%U
ZJ+Z!o=@VZpaeEfLY`ON~>|h24YXC7{7`^}i

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/it_it.gif b/core/media/mod_languages/images/it_it.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a5f6f81798d64af11621df996342bdffbc4b0d7
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hM((Cha9|Nl$MIzT1}Gl0Y$n3P-OS01We5me0YV(Gfo{B;%U
ZJ+Z!o=@VZpaeEfLY`ON~>|h24YXC7{7`^}i

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ja.gif b/core/media/mod_languages/images/ja.gif
new file mode 100644
index 0000000000000000000000000000000000000000..63e3b7aca072f7784c5a9d34406096f64da643c0
GIT binary patch
literal 89
zcmZ?wbh9u|6k_0E_{6|)+Bon=TJ8J&Cy&WH>|;>-|NlP&80dgVkQxSNwTNAJ{$1!a
na1#jRbg*KK5UGfpz?)(|M{{G>TFG3M8KS|ZcWd6OFjxZs1~nZ%

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ja_jp.gif b/core/media/mod_languages/images/ja_jp.gif
new file mode 100644
index 0000000000000000000000000000000000000000..63e3b7aca072f7784c5a9d34406096f64da643c0
GIT binary patch
literal 89
zcmZ?wbh9u|6k_0E_{6|)+Bon=TJ8J&Cy&WH>|;>-|NlP&80dgVkQxSNwTNAJ{$1!a
na1#jRbg*KK5UGfpz?)(|M{{G>TFG3M8KS|ZcWd6OFjxZs1~nZ%

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ka.gif b/core/media/mod_languages/images/ka.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fae96f1bbd4ceaaa31b8296e8cf555711c4e3f5a
GIT binary patch
literal 67
zcmZ?wbh9u|6k_0E_`tw$hJoS#|NlA+KmZb9U{dPIXE@PWB^GStP<?;()}#9ZA9+ku
U`%xM7%IBu5>D|?NS&R(U0KD55@c;k-

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ka_ge.gif b/core/media/mod_languages/images/ka_ge.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fae96f1bbd4ceaaa31b8296e8cf555711c4e3f5a
GIT binary patch
literal 67
zcmZ?wbh9u|6k_0E_`tw$hJoS#|NlA+KmZb9U{dPIXE@PWB^GStP<?;()}#9ZA9+ku
U`%xM7%IBu5>D|?NS&R(U0KD55@c;k-

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/km.gif b/core/media/mod_languages/images/km.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5114a28465f15dc5e5610be41dfb648191b5437d
GIT binary patch
literal 127
zcmV-_0D%8TNk%v~VG;lg0P_w2^2Ef;007Pl3(gP_(kUt3TU+68Z{l)t<b8eRfPn3<
zu<y0C@x8tD&dvY;m;e9(EC2ui01^NU06+vZ(8)>b3^){^09zbTWF#hx#-R<R<yPg<
hGypKG<g4#`nGpn^u&^K&i^5ET!E7R0yl6B606YFOGwA>T

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/km_kh.gif b/core/media/mod_languages/images/km_kh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5114a28465f15dc5e5610be41dfb648191b5437d
GIT binary patch
literal 127
zcmV-_0D%8TNk%v~VG;lg0P_w2^2Ef;007Pl3(gP_(kUt3TU+68Z{l)t<b8eRfPn3<
zu<y0C@x8tD&dvY;m;e9(EC2ui01^NU06+vZ(8)>b3^){^09zbTWF#hx#-R<R<yPg<
hGypKG<g4#`nGpn^u&^K&i^5ET!E7R0yl6B606YFOGwA>T

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ko.gif b/core/media/mod_languages/images/ko.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f81e4ae0bbf021beafd14ffa0a06b9279458f7e7
GIT binary patch
literal 522
zcmZ?wbh9u|6k_0E_~y-Uia}`O#*HN<C3SUm&d$!eckjL+saslF`sDG0hYufK;Z;b`
zirTbk(~>1i?%lh`VA{f9-MMtn)hA&omo8n}yLa!=D^ISoh(DV&CoV3I!KA_7Fzaqm
z;<01L-n@BZ;NSK8<?F!mRlU8v@7}$8T-NmA!-uzT-{$1x+`4<0!KvpOzj9z;U}9oo
z=du%jfB$k-jC%0sQBhHmx=HEM<;$b%*ZcbTu3EL~Jg-tpO3MFtZ%;D_M@B|6IQAqY
zB+QDg+IQi}&&N*#tJnN}{Wc;Z;=HKVjT<-q|M|mUTt8huu(`SU>eZ|N|NjpT4rUm{
zKnLVDP+T~$=QnsYHMg|3F<CL|iW(~jdYQ6IsI)P9i8GjSSqgdas7_@u(f5+KZ_?J{
zZEJSWlhP27ThlBfyGCS-B5Ruq^BNBpBUfcMXK6=uZ*!$BwqlyxhVB+yJk>bttobF~
Ybi54qv~oJx@U=2|3vYST(#T*900k1EE&u=k

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ko_kr.gif b/core/media/mod_languages/images/ko_kr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f81e4ae0bbf021beafd14ffa0a06b9279458f7e7
GIT binary patch
literal 522
zcmZ?wbh9u|6k_0E_~y-Uia}`O#*HN<C3SUm&d$!eckjL+saslF`sDG0hYufK;Z;b`
zirTbk(~>1i?%lh`VA{f9-MMtn)hA&omo8n}yLa!=D^ISoh(DV&CoV3I!KA_7Fzaqm
z;<01L-n@BZ;NSK8<?F!mRlU8v@7}$8T-NmA!-uzT-{$1x+`4<0!KvpOzj9z;U}9oo
z=du%jfB$k-jC%0sQBhHmx=HEM<;$b%*ZcbTu3EL~Jg-tpO3MFtZ%;D_M@B|6IQAqY
zB+QDg+IQi}&&N*#tJnN}{Wc;Z;=HKVjT<-q|M|mUTt8huu(`SU>eZ|N|NjpT4rUm{
zKnLVDP+T~$=QnsYHMg|3F<CL|iW(~jdYQ6IsI)P9i8GjSSqgdas7_@u(f5+KZ_?J{
zZEJSWlhP27ThlBfyGCS-B5Ruq^BNBpBUfcMXK6=uZ*!$BwqlyxhVB+yJk>bttobF~
Ybi54qv~oJx@U=2|3vYST(#T*900k1EE&u=k

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ku.gif b/core/media/mod_languages/images/ku.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5c77762dadad187c7cedfc9fae8d52848a87a2e9
GIT binary patch
literal 285
zcmZ?wbh9u|6k_0E_^QJ2pMl~3yVd{St@wY#=Kr@#|IaY|H)r^NMg9L}#s9ZF{_8RP
zf4}bk^Y;Hz4F8{2|3Am`|4!il->?3EIc7VX;s5umxyu>;-*o!_=R?z4hX2<L{y)n9
zf7AZ|=flZM8UBCR@}G&}zdu9Y28RFt{~OO__<xp}f!aU^WFW{d3~Wvg4Fw)LQvD~M
zsAq<lIJ7O!@KWW_k#284_0~<H->L1gZnp}j5a-4nGj@s`d$53Wiu;d0D=u*+erae_
O7H(>7Yj1aCum%9t&}g^-

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/lo.gif b/core/media/mod_languages/images/lo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e5cd3ec37c57102eec2b7eec392542683cf876d1
GIT binary patch
literal 1037
zcmdUu|5MX-9LHaH6R6angE}sb?m9RW*&$zwxupzJ*lHwSHu?5}eQE5oF~rHhak6wk
zd^+YDjc*}(1!#44P%inB1cGY}#+M2>KwM0SqeD+pmyW?U-r=9o^Vi2c?;dy0dnPdx
zDY5+5U=M7J0^;T%w2c5Z0k#0{11tb+0JvP6Y+mm@fE9pc01H5Tde0Mp!+f*T=@3-S
zZ!;Mbo*5JU@)+P~{&;4kMc*;a0^k!1U6{%lN6S=MTmV$w=*hB~X8<TAIa@i)Id2hN
zydRc3ft{agrwGqz{yeaQ3h-@a5@LOTicce<z*wRK$V0fWzk6PyTe?Qc*VIp+ZLoeF
z!;4SrwgWiGJEbq>jmrqj`Z=rocF#grZY4r4b*rT}<6Jup*Ic!hDvbu2b`juszEPnX
zTemyUHm|%V8jJgQ^v=xFk-N`g@jntXdI;?lJ@qC|+~b}y^x^6Wq7~Oz`GtchlYKK=
z<#unC=$0GbmHY#6`rHW0-~iMx#Uqju!#aQs-~m9cc;H%MvHnCcK=n@@)Aq2CXv~C(
z2jUAR>){<m#Y6|EC{HqgilhKi2<lf7<CiI77d7^=-F>8R+V)o9`g7N%IG((2ky$#A
z*r~Tq)ha(VBLSEF$sB|XOVw5~chWR#E32Li%^IhE_@n-$@=65O)Um>^yt_q<1yD~|
zo>L`L$=Ho3;qNFfXX9Y#8-d@Hz<vnm>r7FI<iqg#pqs_$%&Kg-zPz2x`~f2zkz_93
z%al%XM1y?=YExN5dG)v>=Fq<Y!-{&m)bzye{(EPdLP;~N(4Clokn<q`T{g1{;7&Ly
z*DgNVp{dE;9L25N3ua|g3})J-L<`l{y?dJ708ionk?<FqFTOzcwn6PnevXPEm50~9
zM?N~wfT&l*n%OhK2mP8jxK+6H7yUDT20O}}LNe9V2!fPY%j$Pio~#SsuBFXZX%CS*
z1;dQGRlfuK?x;YTZqyPd!aSLD-*z^Td}Y2Kk>S79hZK=mYf*;d7jycl?6>VN`@i~;
z46gg$c(D7c>~PT#owVe2DPfTH`NQ{H(;MF`$07sd`@Q!D7tgU7vQSRYkpUUjc1)0_
zitr`^Z$X72FgpJj`TL4CQX4s~g`}=qBVA2uY0b15$G-51(9!jJf1+0BcQ|;#r)yW!
ZuU-P>YJ0cTqiWaghL{xI5S<RR{{S*}l?ea<

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/lo_la.gif b/core/media/mod_languages/images/lo_la.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e5cd3ec37c57102eec2b7eec392542683cf876d1
GIT binary patch
literal 1037
zcmdUu|5MX-9LHaH6R6angE}sb?m9RW*&$zwxupzJ*lHwSHu?5}eQE5oF~rHhak6wk
zd^+YDjc*}(1!#44P%inB1cGY}#+M2>KwM0SqeD+pmyW?U-r=9o^Vi2c?;dy0dnPdx
zDY5+5U=M7J0^;T%w2c5Z0k#0{11tb+0JvP6Y+mm@fE9pc01H5Tde0Mp!+f*T=@3-S
zZ!;Mbo*5JU@)+P~{&;4kMc*;a0^k!1U6{%lN6S=MTmV$w=*hB~X8<TAIa@i)Id2hN
zydRc3ft{agrwGqz{yeaQ3h-@a5@LOTicce<z*wRK$V0fWzk6PyTe?Qc*VIp+ZLoeF
z!;4SrwgWiGJEbq>jmrqj`Z=rocF#grZY4r4b*rT}<6Jup*Ic!hDvbu2b`juszEPnX
zTemyUHm|%V8jJgQ^v=xFk-N`g@jntXdI;?lJ@qC|+~b}y^x^6Wq7~Oz`GtchlYKK=
z<#unC=$0GbmHY#6`rHW0-~iMx#Uqju!#aQs-~m9cc;H%MvHnCcK=n@@)Aq2CXv~C(
z2jUAR>){<m#Y6|EC{HqgilhKi2<lf7<CiI77d7^=-F>8R+V)o9`g7N%IG((2ky$#A
z*r~Tq)ha(VBLSEF$sB|XOVw5~chWR#E32Li%^IhE_@n-$@=65O)Um>^yt_q<1yD~|
zo>L`L$=Ho3;qNFfXX9Y#8-d@Hz<vnm>r7FI<iqg#pqs_$%&Kg-zPz2x`~f2zkz_93
z%al%XM1y?=YExN5dG)v>=Fq<Y!-{&m)bzye{(EPdLP;~N(4Clokn<q`T{g1{;7&Ly
z*DgNVp{dE;9L25N3ua|g3})J-L<`l{y?dJ708ionk?<FqFTOzcwn6PnevXPEm50~9
zM?N~wfT&l*n%OhK2mP8jxK+6H7yUDT20O}}LNe9V2!fPY%j$Pio~#SsuBFXZX%CS*
z1;dQGRlfuK?x;YTZqyPd!aSLD-*z^Td}Y2Kk>S79hZK=mYf*;d7jycl?6>VN`@i~;
z46gg$c(D7c>~PT#owVe2DPfTH`NQ{H(;MF`$07sd`@Q!D7tgU7vQSRYkpUUjc1)0_
zitr`^Z$X72FgpJj`TL4CQX4s~g`}=qBVA2uY0b15$G-51(9!jJf1+0BcQ|;#r)yW!
ZuU-P>YJ0cTqiWaghL{xI5S<RR{{S*}l?ea<

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/lt.gif b/core/media/mod_languages/images/lt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..184ba87d718197f3066704580d611fa0a71cb042
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hL8lY!ws5T_Y4Ffix<F#|}Pfl0ilf92`7>s#h*xz)Y-p4bom
OwnrY*o@t6PSOWm?tP`66

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/lt_lt.gif b/core/media/mod_languages/images/lt_lt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..184ba87d718197f3066704580d611fa0a71cb042
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hL8lY!ws5T_Y4Ffix<F#|}Pfl0ilf92`7>s#h*xz)Y-p4bom
OwnrY*o@t6PSOWm?tP`66

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/lv.gif b/core/media/mod_languages/images/lv.gif
new file mode 100644
index 0000000000000000000000000000000000000000..161b9b738d665709ed9e6ae6a164398c62a91f6e
GIT binary patch
literal 50
zcmZ?wbh9u|6k_0E_`tyM|NsA)3=BF9KmZb9U=r-<UwQg1zv7H7x4Mh(?5U1pV6X-N
DZOITM

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/lv_lv.gif b/core/media/mod_languages/images/lv_lv.gif
new file mode 100644
index 0000000000000000000000000000000000000000..161b9b738d665709ed9e6ae6a164398c62a91f6e
GIT binary patch
literal 50
zcmZ?wbh9u|6k_0E_`tyM|NsA)3=BF9KmZb9U=r-<UwQg1zv7H7x4Mh(?5U1pV6X-N
DZOITM

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/mk.gif b/core/media/mod_languages/images/mk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..278f00ee89e5934a7e956036609705070f248480
GIT binary patch
literal 402
zcmV;D0d4+ANk%v~VG;lg0QEfp&OiXY0092`0KNzS|Nj8TC;;Ao0KW?W$0Y#BD*(hB
z0KpLe(^LTFodDKh0Kyai)m;GJgaGr=0N7~&>$3pSPXPV*0Q%|x;*kLL+5qy+0Pn#7
z_S*pGp#Z)E0L35x)K>uLr~vG=0Qcem?YIE>=K#np0Mb$b<d^{Ny#U#20OzCt<COsX
z^8m~_0P)EH{q+FXW&rfn0QJ}a!43e!8UXCI0L?!D_~HP`F#yzB0P3y);fnyg00000
z00000EC2ui01^NU06+$}z>0>D$@O{_f#7sBWe5`Hu~%3%78uk56-rEd5CCG~@qkp3
z$OJU-ED$$Ppf}KENQ%Mcb$Ez45CZ`L0xcsNJ3I~sFct<55fm>YEd&8o0x1eq7Z+X%
zBmyBOg9r^48y{3So;?aF0v!c&J*5pD4;U;Dw+LSZ79|okEE5Jw5iuAd5+yJM3@#ru
w0Rs>!1_l!j2LT5kE(~)64jdFUdK!Hc95DyA3^D{WUPwv|M+FiDG7v!kJ7)od(*OVf

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/mk_mk.gif b/core/media/mod_languages/images/mk_mk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..278f00ee89e5934a7e956036609705070f248480
GIT binary patch
literal 402
zcmV;D0d4+ANk%v~VG;lg0QEfp&OiXY0092`0KNzS|Nj8TC;;Ao0KW?W$0Y#BD*(hB
z0KpLe(^LTFodDKh0Kyai)m;GJgaGr=0N7~&>$3pSPXPV*0Q%|x;*kLL+5qy+0Pn#7
z_S*pGp#Z)E0L35x)K>uLr~vG=0Qcem?YIE>=K#np0Mb$b<d^{Ny#U#20OzCt<COsX
z^8m~_0P)EH{q+FXW&rfn0QJ}a!43e!8UXCI0L?!D_~HP`F#yzB0P3y);fnyg00000
z00000EC2ui01^NU06+$}z>0>D$@O{_f#7sBWe5`Hu~%3%78uk56-rEd5CCG~@qkp3
z$OJU-ED$$Ppf}KENQ%Mcb$Ez45CZ`L0xcsNJ3I~sFct<55fm>YEd&8o0x1eq7Z+X%
zBmyBOg9r^48y{3So;?aF0v!c&J*5pD4;U;Dw+LSZ79|okEE5Jw5iuAd5+yJM3@#ru
w0Rs>!1_l!j2LT5kE(~)64jdFUdK!Hc95DyA3^D{WUPwv|M+FiDG7v!kJ7)od(*OVf

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/mn.gif b/core/media/mod_languages/images/mn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4213d4c55138d16543c929fdc76b569406b05366
GIT binary patch
literal 182
zcmZ?wbh9u|6k_0E_#(mJzV7^oZlTv9!XJ8to~a4H4i@^nMDR_K$j50yZ&HNcc8Y$Q
zA@nv^_}wJYH)X=lv_(El6ng0*{AI1+t2EJ9{=y&Hh2A6xKjjm8Dk8*y4d{RbL3TN?
zT0c<jbI9z=5DYw&I&VdXEZ?(z4mNfz9nW_;9%k6Nw`7;R(K44PAv>8(Mu{vv8zh_*
RBNM#6LyZ5hE^=b91_1hxKcN5s

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/mn_mn.gif b/core/media/mod_languages/images/mn_mn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4213d4c55138d16543c929fdc76b569406b05366
GIT binary patch
literal 182
zcmZ?wbh9u|6k_0E_#(mJzV7^oZlTv9!XJ8to~a4H4i@^nMDR_K$j50yZ&HNcc8Y$Q
zA@nv^_}wJYH)X=lv_(El6ng0*{AI1+t2EJ9{=y&Hh2A6xKjjm8Dk8*y4d{RbL3TN?
zT0c<jbI9z=5DYw&I&VdXEZ?(z4mNfz9nW_;9%k6Nw`7;R(K44PAv>8(Mu{vv8zh_*
RBNM#6LyZ5hE^=b91_1hxKcN5s

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ms_my.gif b/core/media/mod_languages/images/ms_my.gif
new file mode 100644
index 0000000000000000000000000000000000000000..62e1a61a71a0aaefa68b4f4035ab4a725eaadea3
GIT binary patch
literal 1266
zcmZ?wbhEHb6k_0EIKseSY@GH#ZRX6G#%I!ijI=W|8U7m^GZ?3(r5XPRiZZ1AKXc~H
zOrR=b1|WMTkOS0W{QnHYnY5W_jDhNbBv1+`Q2fsw;Txdfl30=mq;2dg3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(;w+TacSt
zlBiITo0C^;Rbi`?n3A8AY6WD2g!Ppaz)DK8ZIv8B5(*$Yo%4%Q6-@OEbdwFt3>3@^
z^$d+o%+1Yp6pRcE4fG9+^bL)44b82LjjRj|6rex}Xj@TAnpKdC8`Lf!&sHg;q@=(~
zU%$M(T(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}
zN%^HEwn{*kLcEY$05>+TSP$$Sz2y8{{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM
z!Nnn!1*!T$sm1xFMaii^<;ozd3ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*As^FWL
zoS6sWgVp=`T6yLbmn7yTr+T{BDgjN<%gju%GBYxCHa9bKGcvX?GBk8GwsbSIbTl(C
zay2kDadtDcgz0t3PcF?(%`1WFO@Zq*H^8YEloWCcfHu3N7G;*DrnnX5=PH1`Y?X=I
zEiO3CgX&Ge=@v6roO<<vj?o82EK)?ngn+3B#DphXAP1iCQ}ckSy$G1B8UO$L`{(zs
zpFh5T`}*bcr;i`rzkB=U^{baJo<Do~<ng125ANT)d*}A8n>VgsyL#pFrHdENpF4Zz
z^r@34jvqUE<nW<`2lnsVyJz>VojbN~+qz}*ri~lcuUorj^{SOCmM>enWbvYf3+B(8
zJ7@N+nKPzOn>uCkq=^&y`+9r2yE;4C+ge+in;IMH>uPJNt12tX%Sua%iwX<!^Kx^t
zvobT%(^6BClM)l+<6>i?qaq{1!$L!Xg8~Em{d|4Ay*xeK-CSLqog5wP?QCtVtt>6f
z%}h;<jeuE7Pgh4<OH)H#O;tr%Nl`&wPF6-*N>V~xOjJZzNKk;EkC%s=i<5($jg^I&
ziIIUp@h1zo+|U7$pz?@;HTc0ph69PSrX;Ri^Hjm9@<eFTeX{_DbBYGNhZ`Jpgrs}q
z7?d1k)EZZqRNeTRuvF@unGlP=)8atKz6s|$+pE^f@wGj&DD+-``#tB*eLG(K{@+li
H$Y2cswtvCh

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/nb_no.gif b/core/media/mod_languages/images/nb_no.gif
new file mode 100644
index 0000000000000000000000000000000000000000..51295cdf76540bca88ba4d5d778242e894598699
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNU|Nnmh`L6fcx(o~qIzY?-5_e!yp28|v@OIj@>;++|#mg$>
bSlg0Lc+L|xOkY{`SUYRRvW=^2#TcvsGz=J&

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/nl.gif b/core/media/mod_languages/images/nl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f125a7cb615e2013abe412a3ae23e50fa1bd909a
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hMZ=+^!J|NnI|8Vn2!IzY?-5@%o%pVGhb^xO4KbGF>--h5B&
P2Y=fmk7>^|#TcvsP9GJx

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/nl_be.gif b/core/media/mod_languages/images/nl_be.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3f150a14378a27cb266ef15aebdd11b3c7a69f4a
GIT binary patch
literal 74
zcmZ?wbhEHb6k_0E_{hNUUsC1&H3kL-Mj+M!Vg`^n1C#O;`IQH1R|FONyI4AIHGf^j
adQYq`Vfw@uOWd9XFI%pCI6Ihu!5RR}Ef(tl

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/nl_nl.gif b/core/media/mod_languages/images/nl_nl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f125a7cb615e2013abe412a3ae23e50fa1bd909a
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hMZ=+^!J|NnI|8Vn2!IzY?-5@%o%pVGhb^xO4KbGF>--h5B&
P2Y=fmk7>^|#TcvsP9GJx

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/nn_no.gif b/core/media/mod_languages/images/nn_no.gif
new file mode 100644
index 0000000000000000000000000000000000000000..51295cdf76540bca88ba4d5d778242e894598699
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNU|Nnmh`L6fcx(o~qIzY?-5_e!yp28|v@OIj@>;++|#mg$>
bSlg0Lc+L|xOkY{`SUYRRvW=^2#TcvsGz=J&

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/no.gif b/core/media/mod_languages/images/no.gif
new file mode 100644
index 0000000000000000000000000000000000000000..51295cdf76540bca88ba4d5d778242e894598699
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hNU|Nnmh`L6fcx(o~qIzY?-5_e!yp28|v@OIj@>;++|#mg$>
bSlg0Lc+L|xOkY{`SUYRRvW=^2#TcvsGz=J&

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/pl.gif b/core/media/mod_languages/images/pl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9b1a5717129fd53d72938d12c30631666b1c9ce0
GIT binary patch
literal 52
zcmZ?wbh9u|6k_0E_`tw$hJoS#|NlA+KmZb9U=r@>UwQg1|6-d3x4Jjq+w+^hEsT-D
F8UUCh5xW2Y

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/pl_pl.gif b/core/media/mod_languages/images/pl_pl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9b1a5717129fd53d72938d12c30631666b1c9ce0
GIT binary patch
literal 52
zcmZ?wbh9u|6k_0E_`tw$hJoS#|NlA+KmZb9U=r@>UwQg1|6-d3x4Jjq+w+^hEsT-D
F8UUCh5xW2Y

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/prs_af.gif b/core/media/mod_languages/images/prs_af.gif
new file mode 100644
index 0000000000000000000000000000000000000000..498e0c6fa7bd85379023f6137b2ddaa73bc4e875
GIT binary patch
literal 198
zcmZ?wbh9u|6k_0E_#(~#1h;Y%PVjKvDoH=d%X5l>;gYSzz2@4JYHAlVBX4&W->S}g
z&{fUKz;I(i%@J|o$J3`>i-|quX7;GBk)46z3{d|}1~!l}*ntj67-W|NtG9weS4ir-
zuvL92jtU%sE3~UU4;Hcr&E3>+>Ex5m4APv(k`8)^G#+|5S=9CC0w!mbBmp0H-s27n
bB`o$WI-Sha=p*;y!GwyX=d_OsFjxZs^jknC

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ps.gif b/core/media/mod_languages/images/ps.gif
new file mode 100644
index 0000000000000000000000000000000000000000..498e0c6fa7bd85379023f6137b2ddaa73bc4e875
GIT binary patch
literal 198
zcmZ?wbh9u|6k_0E_#(~#1h;Y%PVjKvDoH=d%X5l>;gYSzz2@4JYHAlVBX4&W->S}g
z&{fUKz;I(i%@J|o$J3`>i-|quX7;GBk)46z3{d|}1~!l}*ntj67-W|NtG9weS4ir-
zuvL92jtU%sE3~UU4;Hcr&E3>+>Ex5m4APv(k`8)^G#+|5S=9CC0w!mbBmp0H-s27n
bB`o$WI-Sha=p*;y!GwyX=d_OsFjxZs^jknC

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ps_af.gif b/core/media/mod_languages/images/ps_af.gif
new file mode 100644
index 0000000000000000000000000000000000000000..498e0c6fa7bd85379023f6137b2ddaa73bc4e875
GIT binary patch
literal 198
zcmZ?wbh9u|6k_0E_#(~#1h;Y%PVjKvDoH=d%X5l>;gYSzz2@4JYHAlVBX4&W->S}g
z&{fUKz;I(i%@J|o$J3`>i-|quX7;GBk)46z3{d|}1~!l}*ntj67-W|NtG9weS4ir-
zuvL92jtU%sE3~UU4;Hcr&E3>+>Ex5m4APv(k`8)^G#+|5S=9CC0w!mbBmp0H-s27n
bB`o$WI-Sha=p*;y!GwyX=d_OsFjxZs^jknC

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/pt.gif b/core/media/mod_languages/images/pt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..654365752509d92620f86d5982fb0928caa82aa8
GIT binary patch
literal 286
zcmZ?wbh9u|6k_0E_^QajkYs#2N7$lD>yD~?ShIXwi@be{YTitV)03nxt=@KQ&dS9Z
zN@q(Wj$VIzwoT<|y!*MVpgU^v_6;g$Yedgy`W?!3KUppA->G;u-C*104>j|}Ze-=%
zTf;qfw%FA^o^u8KcU0tWC5SW74CsJN2Kj}7&Do)$fP+D@-$S5qMvh+V*(X5`9IcDo
z7BPNYkf0W^=-8wT1G|YDA2$S~D9mfD(s&tS#^*PqLX(9l!ppxgvbn|IwZ)Oa8US%g
BOs4<<

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/pt_br.gif b/core/media/mod_languages/images/pt_br.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cae2ebf5223308530f5b510dfb849a72426e3ec3
GIT binary patch
literal 192
zcmZ?wbh9u|6k_0E_#(n^=05|2_J4*@28IR(hE)v4+GmWl{~L$?H*R1sUd50WIy0>S
zi2kRoVwl-5b7sStnXAssyvlIqD#L%EMg|bZ4|G7%AiEe?T^}g)rDRTWn#A#((?|G1
zpOdks$WouPJl5>adFF~6+=Onl2wB)Dh%9Xp34FGWCzF#=JEnBQ%-o5^ANn?j=Y)B!
Ly-^Uv!C(yld&oJx

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/pt_pt.gif b/core/media/mod_languages/images/pt_pt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..654365752509d92620f86d5982fb0928caa82aa8
GIT binary patch
literal 286
zcmZ?wbh9u|6k_0E_^QajkYs#2N7$lD>yD~?ShIXwi@be{YTitV)03nxt=@KQ&dS9Z
zN@q(Wj$VIzwoT<|y!*MVpgU^v_6;g$Yedgy`W?!3KUppA->G;u-C*104>j|}Ze-=%
zTf;qfw%FA^o^u8KcU0tWC5SW74CsJN2Kj}7&Do)$fP+D@-$S5qMvh+V*(X5`9IcDo
z7BPNYkf0W^=-8wT1G|YDA2$S~D9mfD(s&tS#^*PqLX(9l!ppxgvbn|IwZ)Oa8US%g
BOs4<<

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ro.gif b/core/media/mod_languages/images/ro.gif
new file mode 100644
index 0000000000000000000000000000000000000000..aa7240537b6002099cfc3e20f76bcc4f90add130
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hM(pk04XQ0>n}F(6Y1h#5fQ4ou1|`YR9Ct_UjTcd>NdYW}*4
a^PX5=!t{wRmbg6&UbbBOaCR^QgEau-RTppo

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ro_ro.gif b/core/media/mod_languages/images/ro_ro.gif
new file mode 100644
index 0000000000000000000000000000000000000000..aa7240537b6002099cfc3e20f76bcc4f90add130
GIT binary patch
literal 74
zcmZ?wbh9u|6k_0E_{hM(pk04XQ0>n}F(6Y1h#5fQ4ou1|`YR9Ct_UjTcd>NdYW}*4
a^PX5=!t{wRmbg6&UbbBOaCR^QgEau-RTppo

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ru.gif b/core/media/mod_languages/images/ru.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b27855dde148176d4a48b7e38c2ef6b4aa5268ff
GIT binary patch
literal 94
zcmZ?wbhEHb6k_0E_{0DN|Nn#V|FgQf8#iv$)!hmbV_?t$5g;`T%-SBi?&uht(iGWy
q@sT&zj|2^-R`YrBor_*si8(8rFOlWhxc2mqeUA?;2$;dZU=09+Wg#yB

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ru_ru.gif b/core/media/mod_languages/images/ru_ru.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b27855dde148176d4a48b7e38c2ef6b4aa5268ff
GIT binary patch
literal 94
zcmZ?wbhEHb6k_0E_{0DN|Nn#V|FgQf8#iv$)!hmbV_?t$5g;`T%-SBi?&uht(iGWy
q@sT&zj|2^-R`YrBor_*si8(8rFOlWhxc2mqeUA?;2$;dZU=09+Wg#yB

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/si.gif b/core/media/mod_languages/images/si.gif
new file mode 100644
index 0000000000000000000000000000000000000000..31d6da7169cc841812cf4bdd2139da2a2d2fbed8
GIT binary patch
literal 197
zcmZ?wbhEHb6k_0E_#(()Z*PD9{{8;`{`&g*{rmTyKYw0cUjF_2_YMvYrlzLJ$;tWo
z`SJ1b`uh6*{{Hjl&;S4b|N8ao8HfftAeA7y99X>+RQggf=OsU2ILoNYw5W%FGs6)@
z2L4yw{U;W0XkuV!Jo-SRLxgSriYZ%?IF_+AH(%^95#tGa5MA3N&EU?mp~50;EBk>9
Lvu_0|GFSru`3ybQ

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/si_lk.gif b/core/media/mod_languages/images/si_lk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..31d6da7169cc841812cf4bdd2139da2a2d2fbed8
GIT binary patch
literal 197
zcmZ?wbhEHb6k_0E_#(()Z*PD9{{8;`{`&g*{rmTyKYw0cUjF_2_YMvYrlzLJ$;tWo
z`SJ1b`uh6*{{Hjl&;S4b|N8ao8HfftAeA7y99X>+RQggf=OsU2ILoNYw5W%FGs6)@
z2L4yw{U;W0XkuV!Jo-SRLxgSriYZ%?IF_+AH(%^95#tGa5MA3N&EU?mp~50;EBk>9
Lvu_0|GFSru`3ybQ

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sk.gif b/core/media/mod_languages/images/sk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b1daeb206aeac1151193c07d03d3b55793a2951
GIT binary patch
literal 295
zcmZ?wbh9u|6k_0E_^QkBpMjyO>giEoowJsnng&yJ^(XzWto*N}^j}EmW#{DUYS#bN
z)c9;ypHg>lbG!9FEbL)k&Fcv>3kx5oIyb#8ue@&L_PDZjZ`JhUBDx_St^Xw?HY?ii
zlDGbI;-t5G*L7XT50zElE?@Wcz4NqV(*Nk_yu3%r_BAK1yf16npHQ^sG+xNSaOVI2
z{}mNa7{~%TAYCB8FtGVJOe^rvk?KFOB&gz7j~4UOEKvamCo!LdQ*ZsESGuTQ%BVcQ
wwD(cdBad@&$CoTnn&I+6lc9kjRYFcgs=B4Mg`J;Gg}be{uYbZs21f>K0IK|E)&Kwi

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sk_sk.gif b/core/media/mod_languages/images/sk_sk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b1daeb206aeac1151193c07d03d3b55793a2951
GIT binary patch
literal 295
zcmZ?wbh9u|6k_0E_^QkBpMjyO>giEoowJsnng&yJ^(XzWto*N}^j}EmW#{DUYS#bN
z)c9;ypHg>lbG!9FEbL)k&Fcv>3kx5oIyb#8ue@&L_PDZjZ`JhUBDx_St^Xw?HY?ii
zlDGbI;-t5G*L7XT50zElE?@Wcz4NqV(*Nk_yu3%r_BAK1yf16npHQ^sG+xNSaOVI2
z{}mNa7{~%TAYCB8FtGVJOe^rvk?KFOB&gz7j~4UOEKvamCo!LdQ*ZsESGuTQ%BVcQ
wwD(cdBad@&$CoTnn&I+6lc9kjRYFcgs=B4Mg`J;Gg}be{uYbZs21f>K0IK|E)&Kwi

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sl.gif b/core/media/mod_languages/images/sl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e153cc3d7c5e6bd8047c592c040e77794741b1b9
GIT binary patch
literal 170
zcmZ?wbh9u|6k_0E_#(pa|NnnJ<r@rQFFU9IdHU+VkHy-Zd%wGx?JW$Nvu@erH4E-=
zioW#?xw3l04^`vWI`-!aGxt7w`=5c~3=nJEUtu5wbU+F~b}_K(D=74(WX^lR5y(Gz
sTDyRbzQWz37c9!(|L@>%{HXm)h;4CE<Q$9n7gm&bt&LiLNr1r`0GAFtO#lD@

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sl_si.gif b/core/media/mod_languages/images/sl_si.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e153cc3d7c5e6bd8047c592c040e77794741b1b9
GIT binary patch
literal 170
zcmZ?wbh9u|6k_0E_#(pa|NnnJ<r@rQFFU9IdHU+VkHy-Zd%wGx?JW$Nvu@erH4E-=
zioW#?xw3l04^`vWI`-!aGxt7w`=5c~3=nJEUtu5wbU+F~b}_K(D=74(WX^lR5y(Gz
sTDyRbzQWz37c9!(|L@>%{HXm)h;4CE<Q$9n7gm&bt&LiLNr1r`0GAFtO#lD@

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sq_al.gif b/core/media/mod_languages/images/sq_al.gif
new file mode 100644
index 0000000000000000000000000000000000000000..966016652a712670cec5db025f24b9500e287261
GIT binary patch
literal 1164
zcmZ?wbhEHb6k_0ESj52apMfEb0R+x4FwA6NFb1=MgyMhh2;Tq&m&B4pAZ=q`QIMFN
zom!%hl$xHIXRGvn_kJaX%oJOta8q9c-vZ~<j7*QJqSW9jzmVjr>}1OnC3`ysn+mIn
z+=ATHl0=1y+?>2(s|s7C#FYG`R4X7GB&@Hb09I0xZL8!6l28EI>6~Abs$i;Tpqp%9
zW}skZsAp(wVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!
zB_#z``ugSN<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`T
zDS%8&Ov*1Uu~h=P6yk;40=Thx#d=`x=q2ap>Q^Kd=o{)8fV>1#=<ADLX>KlDb#X~h
zD#E>34K5C;EJ)Q4N-fSWElN%WDpv+sRbb^@l$uzQUlfv`p92fUfQ<Z-{NjxK0tM$_
zQw86|<jgz}AFSTj*UB@mxFj(zIn~p}Rtac=US?*Bm8Fw`n}va^o1u}5xuKz}v4ydL
zrK6LflckBNlewXp5lpX3esXDUYF-IUZwg$mn*mO}prnvn0JPa9wJ5VJHN~wcKUV?l
zWvfiwZgIhB9#n4%PPe$a;?%1Tbc{YIVv!;mCIn19ASOK70y*%6pPC0u?M1+3&G`S{
z-#@>9{rvI$+t)9jKYjf0{@vR*uV1}<@%-7-CyyUJd~pBX-8;8$-Mn%A+SMzUFI~KF
z{@mF!r%#<cas1fPBZm(iJg|S?-aWf_?cA|_+tw|cH*MUoe%;zNt5>aDv3%LmC5sm=
zTrhv$+&Qyn&73iP+SDnNCrzBt-`CsI-PPIA-qzaE+|<}mUsqdGT~%38URGLCTvS+)
zpO>4Hot2r9o|c-DoRpXl9~T=F9Tgc79u^uB926Mf@8|2|?d9p=?&j*^?BwWRZ)a;`
zZDna;Zf0s?Yy`|wdb&E=TACW_YN{&AN{R~da<VegQj!wlVxl6#LV^PPe7ro|T$~*2
zY^*HIOpL&?;U^2Yn9u={pmKzP*_30~ops853eTAvTVl4<Itp?nez0^=T+>uxrW`Gz
fzj$SCm_D<5Mhkb!grc_z#*;TV+UUu1GFSruUzm{Z

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sr.gif b/core/media/mod_languages/images/sr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4c6ed0e581b65712d238297d5a8b0bafd3579e47
GIT binary patch
literal 289
zcmZ?wbh9u|6k_0E_^Qb8|KXkg3_x(^WmV>@<*S}28JwAE{K(a1=FFLoJl&q@8a#_K
z*j88avAX2-=Dm+H&CVDb&slfu|IC?ZX3qTo`uXREiWe0b_a}(`KXc|`s{NU?wCB;v
ze;z&Bu<Oi==Juxv22V|l|NjTu0J4SpKnG+b$S(|RZU-6)JanX5+kGBYgh=SI32f$w
zw6UA8GC|uRM2(lF+(*pCK+b3R88?r6NoF%Q7K)e@IcCT&;^7cusA+Dgk!kJd?CS1t
HWUvMRnz&iT

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sr_rs.gif b/core/media/mod_languages/images/sr_rs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4c6ed0e581b65712d238297d5a8b0bafd3579e47
GIT binary patch
literal 289
zcmZ?wbh9u|6k_0E_^Qb8|KXkg3_x(^WmV>@<*S}28JwAE{K(a1=FFLoJl&q@8a#_K
z*j88avAX2-=Dm+H&CVDb&slfu|IC?ZX3qTo`uXREiWe0b_a}(`KXc|`s{NU?wCB;v
ze;z&Bu<Oi==Juxv22V|l|NjTu0J4SpKnG+b$S(|RZU-6)JanX5+kGBYgh=SI32f$w
zw6UA8GC|uRM2(lF+(*pCK+b3R88?r6NoF%Q7K)e@IcCT&;^7cusA+Dgk!kJd?CS1t
HWUvMRnz&iT

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sr_yu.gif b/core/media/mod_languages/images/sr_yu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4c6ed0e581b65712d238297d5a8b0bafd3579e47
GIT binary patch
literal 289
zcmZ?wbh9u|6k_0E_^Qb8|KXkg3_x(^WmV>@<*S}28JwAE{K(a1=FFLoJl&q@8a#_K
z*j88avAX2-=Dm+H&CVDb&slfu|IC?ZX3qTo`uXREiWe0b_a}(`KXc|`s{NU?wCB;v
ze;z&Bu<Oi==Juxv22V|l|NjTu0J4SpKnG+b$S(|RZU-6)JanX5+kGBYgh=SI32f$w
zw6UA8GC|uRM2(lF+(*pCK+b3R88?r6NoF%Q7K)e@IcCT&;^7cusA+Dgk!kJd?CS1t
HWUvMRnz&iT

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/srp_me.gif b/core/media/mod_languages/images/srp_me.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5f9e23ea600abe6e1258f485e52fc1861e67cf67
GIT binary patch
literal 304
zcmZ?wbhEHb6k_0E_-e>-VwS_<S$12*3=d4P*{W~6ufuv-pu^s7tHbl`cBGqck2Blf
zXS2D_X>YUjzCP=%2F6>IjQ00iZ=Yzhx6``5JYi;A@ZNf>Ez*WNXSr;*G1=E?y}RA=
z@I3o%RwjGeEVr2$?*@{3#(O)gw@k3vkz~GA)A-;_yF)YVw`v<7m~OkT&t`w0Rd;Q~
zt|E&a1?Kyw*=`XuJUGjafoPxuQVH^l16!y=LxG2mP@=~ZW-|$nNuG*VnohXzDf%&L
zwN6Wz$IHXoS~_uwXU`!cONAJR$~e2r&%bp)TO3s?#ZnlcpwB2Fs;;Tq6u_k<q|D93
Q)|1MqSK>Cy&5^+x0LFu5F8}}l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sv.gif b/core/media/mod_languages/images/sv.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca46f02f601654762639cf4d2921e25f84bf638e
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tyM=b{)x^h_NFAOMLtFiH3D7Mz~Vd%nBiQp@IZXM&d3#8%|0
Nv3D(=RmaL;4FCo=6NLZ(

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sv_se.gif b/core/media/mod_languages/images/sv_se.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca46f02f601654762639cf4d2921e25f84bf638e
GIT binary patch
literal 60
zcmZ?wbh9u|6k_0E_`tyM=b{)x^h_NFAOMLtFiH3D7Mz~Vd%nBiQp@IZXM&d3#8%|0
Nv3D(=RmaL;4FCo=6NLZ(

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sw.gif b/core/media/mod_languages/images/sw.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36ad8b4855cf9ef6ee1bec3600b54581e51acfe5
GIT binary patch
literal 1269
zcmZ?wbhEHb6k_0EIKsei=D+bwAV^DNn0bc5*m&j{<C(?`Aby(hnKLuboH@fV^MBgR
zv@<}VnLy$ULmCkM{|}NfK9dF%O9Scw!81TMnD`IWm-c_=%>QT77#J87|8qz91}L~B
zmLvjc8~cia#N_PM5{0DH^vpb4rT4q{D=B2A*eZpa`WpBaIHzW0dQ=sq23ProBv)l8
zTc#-4+bP&oSXJZ}<ffJ+Dpcg=<P}?0*eWHa<R_(C0ofp7eI*63l9Fs&B}b5i0?1D1
z{GwC^Q#}LSWCJq;1v5iELt_(jb8{U9BLhPNeFGzXLnB>7b1P#bD+2=sC{P00R+N%v
z73AUuwF}6zRmvzSDX`MlFE20GD>v55FG|-pw6wGYnPFt43sj+7T$xvrSfQI&tPC^3
zCAB!YD6^m>Ge1uOWMX1cerbuV640d(FXR@$jm<081A9j=IX_pwBC$Z<P|pD5C742A
zU;IjQbK$CsOM+4n?!{_waY$uBs(w&vaeir0aw<@{GRUd|E9aur#FG4?ko^1{SSSW$
z<d@_ZXXF<sI0u_5_$DT2=7IQN^}fDVo_WP3iFwJXo-VdZKoj&bGgGWAOxz3&49zSJ
zEzBJa4PA{K4NQz(otzyFoD2+&oGgrBdR_99OLJ56N?>|Z5PBVP>IEf*+ybD@E~!PC
zWvMA{Mftf3U@u!`;&zKUPV=C8Q*gV*0;gVmpkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;P
zYA*sNYsUZo{{H#>>*tT}-@bnN{ORL|_wU}mdHw3;i|5atK6(7;;e-44?%uh5>*kH?
z*REc<eCgta^XJZ<IeqHniQ~tP9yxsI;DP=7_U_reYv+#b+qQ1mylLZx_3PHIS-ooI
zisj3eE?K;2;ez?|=FXWtYvzpU)22?DJZa*D{=VLx?yk;`_O{lR=BCDm`nuYh>Z;0$
z^0LyB;-bQW{Jh+p?5xa;^t9BJ<fO!e__)}Z=%~nu@UYO3;Gn<&e?MOzZ!b>|cQ;oT
zXD3GodplbjYb#3&b2C#DV<TXe($m$^*3#5aS5s9{R#H@umy?x|mXeeZ7ZVi`77`TT
z=i}w!=HldFXJchyW?}@E4L@0cB?JS54u}AiM+~fC50v^+GUvUJ)IGdun!k?q&80E@
z%Ew*a%TH})>G<%K>qN?<hMPVTohm{OYxQjX*p_*jR_vd{oF1{TW^Zpvlybn1yG?z&
Y0*hGQ{b*1<+Vn$_S+}N{Tam#U0Quk7ga7~l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sw_ke.gif b/core/media/mod_languages/images/sw_ke.gif
new file mode 100644
index 0000000000000000000000000000000000000000..36ad8b4855cf9ef6ee1bec3600b54581e51acfe5
GIT binary patch
literal 1269
zcmZ?wbhEHb6k_0EIKsei=D+bwAV^DNn0bc5*m&j{<C(?`Aby(hnKLuboH@fV^MBgR
zv@<}VnLy$ULmCkM{|}NfK9dF%O9Scw!81TMnD`IWm-c_=%>QT77#J87|8qz91}L~B
zmLvjc8~cia#N_PM5{0DH^vpb4rT4q{D=B2A*eZpa`WpBaIHzW0dQ=sq23ProBv)l8
zTc#-4+bP&oSXJZ}<ffJ+Dpcg=<P}?0*eWHa<R_(C0ofp7eI*63l9Fs&B}b5i0?1D1
z{GwC^Q#}LSWCJq;1v5iELt_(jb8{U9BLhPNeFGzXLnB>7b1P#bD+2=sC{P00R+N%v
z73AUuwF}6zRmvzSDX`MlFE20GD>v55FG|-pw6wGYnPFt43sj+7T$xvrSfQI&tPC^3
zCAB!YD6^m>Ge1uOWMX1cerbuV640d(FXR@$jm<081A9j=IX_pwBC$Z<P|pD5C742A
zU;IjQbK$CsOM+4n?!{_waY$uBs(w&vaeir0aw<@{GRUd|E9aur#FG4?ko^1{SSSW$
z<d@_ZXXF<sI0u_5_$DT2=7IQN^}fDVo_WP3iFwJXo-VdZKoj&bGgGWAOxz3&49zSJ
zEzBJa4PA{K4NQz(otzyFoD2+&oGgrBdR_99OLJ56N?>|Z5PBVP>IEf*+ybD@E~!PC
zWvMA{Mftf3U@u!`;&zKUPV=C8Q*gV*0;gVmpkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;P
zYA*sNYsUZo{{H#>>*tT}-@bnN{ORL|_wU}mdHw3;i|5atK6(7;;e-44?%uh5>*kH?
z*REc<eCgta^XJZ<IeqHniQ~tP9yxsI;DP=7_U_reYv+#b+qQ1mylLZx_3PHIS-ooI
zisj3eE?K;2;ez?|=FXWtYvzpU)22?DJZa*D{=VLx?yk;`_O{lR=BCDm`nuYh>Z;0$
z^0LyB;-bQW{Jh+p?5xa;^t9BJ<fO!e__)}Z=%~nu@UYO3;Gn<&e?MOzZ!b>|cQ;oT
zXD3GodplbjYb#3&b2C#DV<TXe($m$^*3#5aS5s9{R#H@umy?x|mXeeZ7ZVi`77`TT
z=i}w!=HldFXJchyW?}@E4L@0cB?JS54u}AiM+~fC50v^+GUvUJ)IGdun!k?q&80E@
z%Ew*a%TH})>G<%K>qN?<hMPVTohm{OYxQjX*p_*jR_vd{oF1{TW^Zpvlybn1yG?z&
Y0*hGQ{b*1<+Vn$_S+}N{Tam#U0Quk7ga7~l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sy.gif b/core/media/mod_languages/images/sy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5c453a4f800ec07b7436c9d32a905613bf3ff852
GIT binary patch
literal 1058
zcmd6m?N5_e7{(vUFw7Cx8CJSY5^<WDWqeoy*%n#WMZ;jp5CX=RxJ?vN<Hm~t8Ec%j
z#Tn?za1pf*1`G?*@*;uKxdmfE=Bx}+$A(g<ytEpz(9zO9&vV}HJ^e3soe$?eAI{13
zyYBmZl$rkSJNfImIF29XlGBQSNeh4mLkuWoSgL_OGwK*DB_@_ILiy1r6d@o1faQOI
zg{1=vTRLy&9c%!^BZe0UEC4Gz)~rZ8f-wzZK4h_88}wMTH4q{s@+8xI(NnDX>8r21
zDvR5Bi~)&0KLBB{ih&m?j}V3#qah%&#lIf`TWYDYuM#-#7{A(P2g=Z*x9-FbSP-ro
z&Yds&R(+_WUwf{*e`vZwtJhkIh?odg>%@agKRa!{UmRo8rRqrv0$`CMdsE*@eG`(f
z+^+eA%_1;Fi9jH5e?*{kHe=_#mTTihMF4oR)n+zz5hh%1xbl5<bHE>5c0F1h9BH0<
z>gjNZK`aR#KPlc@#t`@rCX|FEHc9|V(Gf*LiHO-$Mha#)O!zZZy%=yL(djwD(64n}
z56ixka0%c>_3@egpTV6m_q_M19}n~nq@^1!_Y4yZE3Ici5GCnOb`V4m#p7dcN@2v<
zI9qXSq4T=mZ1X&R_OQz~efUUFcU1kkfd^{-LrOD@G4hGh4J5US|7)W0Q(Xu|$=uF7
z-EWn(Qrv_F-KXk0dz=@BrvA)5;F=ZqkdzX?Bm4AnghBKJ*}Lz|_77_*MR<OZA&ezd
z3iiP}O!AF|rHMHvF){IWNyCF(yU?-^cmQF=4*^WY;KJnH_HNgGcmKfej^WwJC=uZP
z$4Y`1_I#4PaYuf6zO+Yuz`YeQ8~Gfn*f3`y`e9XkO<~H$jQ7mG>NT&Qm?!sahim%c
z%aPJmUyx9@!B}5-(VKpuTb8_bMRub=W=($k%{1lRYVE5ESyp+aXKR%?I_j25nd6kN
zi_SS6@3^r=XMEqJH(HO*DSpiA)y!nut<PyUX>KYHq_+H%`0;K{oUA_6^h&P9)+i>a
zYUG91eIlp#W=6|%_v>V9oV%M+l(F9!@{BL)Qri~ghc3x-I%1vcQ-@-z>Z6}8wR+ax
z%r~uj>9w@u^3Cnv)vBVhPn9OAvo03iIyk0MjXK+2K3lOT5b$zuZ0d7w*dA!DjoEfZ
Ru{BVzB`zlBvP{Np`ww}+VR!%l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/sy_iq.gif b/core/media/mod_languages/images/sy_iq.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5c453a4f800ec07b7436c9d32a905613bf3ff852
GIT binary patch
literal 1058
zcmd6m?N5_e7{(vUFw7Cx8CJSY5^<WDWqeoy*%n#WMZ;jp5CX=RxJ?vN<Hm~t8Ec%j
z#Tn?za1pf*1`G?*@*;uKxdmfE=Bx}+$A(g<ytEpz(9zO9&vV}HJ^e3soe$?eAI{13
zyYBmZl$rkSJNfImIF29XlGBQSNeh4mLkuWoSgL_OGwK*DB_@_ILiy1r6d@o1faQOI
zg{1=vTRLy&9c%!^BZe0UEC4Gz)~rZ8f-wzZK4h_88}wMTH4q{s@+8xI(NnDX>8r21
zDvR5Bi~)&0KLBB{ih&m?j}V3#qah%&#lIf`TWYDYuM#-#7{A(P2g=Z*x9-FbSP-ro
z&Yds&R(+_WUwf{*e`vZwtJhkIh?odg>%@agKRa!{UmRo8rRqrv0$`CMdsE*@eG`(f
z+^+eA%_1;Fi9jH5e?*{kHe=_#mTTihMF4oR)n+zz5hh%1xbl5<bHE>5c0F1h9BH0<
z>gjNZK`aR#KPlc@#t`@rCX|FEHc9|V(Gf*LiHO-$Mha#)O!zZZy%=yL(djwD(64n}
z56ixka0%c>_3@egpTV6m_q_M19}n~nq@^1!_Y4yZE3Ici5GCnOb`V4m#p7dcN@2v<
zI9qXSq4T=mZ1X&R_OQz~efUUFcU1kkfd^{-LrOD@G4hGh4J5US|7)W0Q(Xu|$=uF7
z-EWn(Qrv_F-KXk0dz=@BrvA)5;F=ZqkdzX?Bm4AnghBKJ*}Lz|_77_*MR<OZA&ezd
z3iiP}O!AF|rHMHvF){IWNyCF(yU?-^cmQF=4*^WY;KJnH_HNgGcmKfej^WwJC=uZP
z$4Y`1_I#4PaYuf6zO+Yuz`YeQ8~Gfn*f3`y`e9XkO<~H$jQ7mG>NT&Qm?!sahim%c
z%aPJmUyx9@!B}5-(VKpuTb8_bMRub=W=($k%{1lRYVE5ESyp+aXKR%?I_j25nd6kN
zi_SS6@3^r=XMEqJH(HO*DSpiA)y!nut<PyUX>KYHq_+H%`0;K{oUA_6^h&P9)+i>a
zYUG91eIlp#W=6|%_v>V9oV%M+l(F9!@{BL)Qri~ghc3x-I%1vcQ-@-z>Z6}8wR+ax
z%r~uj>9w@u^3Cnv)vBVhPn9OAvo03iIyk0MjXK+2K3lOT5b$zuZ0d7w*dA!DjoEfZ
Ru{BVzB`zlBvP{Np`ww}+VR!%l

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ta.gif b/core/media/mod_languages/images/ta.gif
new file mode 100644
index 0000000000000000000000000000000000000000..43ab7af47440e735684b6783608989475d5cf976
GIT binary patch
literal 584
zcmZ?wbh9u|6k_0E_?F7>@83TI0|PTNGYbm~D=RBoTU&d3djo$nLw|D<e{;hCbE6=0
z(;#!>088UQE8{?GlR!(8Kr53#YttZ0lOQXzAZxQ=TeA>bCnqO2H#c{8cYlBX;Nak}
zu(0Up==k{f)YR1M?ChMJoPvUaqN1YW;^Ol1^5*8|?(Xj1-roNH{wY(YOr1J)#*7&=
zXU?28Yu4=9v**s8J8#~+`Sa&5Sg>H>!i9?$FJ7`_$<n1umn~biV#SJ;D_5>rvu6GJ
z^&2;C+_Y)a)~#E&ZQHhc_wGG=_8d5H;LxE%hYue<di3b2Q>V_HIdlH}`Ae5BUAc1Q
z=FOY8Zr!?n|Ng^=51%}F^7QG`=g*(NeEIU#t5<K{ym|Zf?YnpH-oJnU;lqbdpFVy0
z^5xsNZ{NRv|MBC;&!0bk|Ni~w&!4}4|Nj5~Ut3$7fvP|UWEv<g9N5=3aC33+aB;D7
zaBy<4cXV<HJ85VsIwXgNhJ+<2#Mp&O>BOhFm|FS8Ij1<QC!5DPCVQDhrfl23-BR9u
zTdeOk6KzHnH4lX(rdWNWMCJs^AcMdiSGEWHL|?si`&P6@fMQ&VuTs)BLpj%Ie;Ecg
zZ(EZj))*O2JyTt2Hwh<MQ>HALgN3aJ`izV#QVtwSow7|sHK^wT(}Si~4nd8O9R-Ys
SnAwH3910W`IyO5nSOWkv4ej6n

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ta_in.gif b/core/media/mod_languages/images/ta_in.gif
new file mode 100644
index 0000000000000000000000000000000000000000..43ab7af47440e735684b6783608989475d5cf976
GIT binary patch
literal 584
zcmZ?wbh9u|6k_0E_?F7>@83TI0|PTNGYbm~D=RBoTU&d3djo$nLw|D<e{;hCbE6=0
z(;#!>088UQE8{?GlR!(8Kr53#YttZ0lOQXzAZxQ=TeA>bCnqO2H#c{8cYlBX;Nak}
zu(0Up==k{f)YR1M?ChMJoPvUaqN1YW;^Ol1^5*8|?(Xj1-roNH{wY(YOr1J)#*7&=
zXU?28Yu4=9v**s8J8#~+`Sa&5Sg>H>!i9?$FJ7`_$<n1umn~biV#SJ;D_5>rvu6GJ
z^&2;C+_Y)a)~#E&ZQHhc_wGG=_8d5H;LxE%hYue<di3b2Q>V_HIdlH}`Ae5BUAc1Q
z=FOY8Zr!?n|Ng^=51%}F^7QG`=g*(NeEIU#t5<K{ym|Zf?YnpH-oJnU;lqbdpFVy0
z^5xsNZ{NRv|MBC;&!0bk|Ni~w&!4}4|Nj5~Ut3$7fvP|UWEv<g9N5=3aC33+aB;D7
zaBy<4cXV<HJ85VsIwXgNhJ+<2#Mp&O>BOhFm|FS8Ij1<QC!5DPCVQDhrfl23-BR9u
zTdeOk6KzHnH4lX(rdWNWMCJs^AcMdiSGEWHL|?si`&P6@fMQ&VuTs)BLpj%Ie;Ecg
zZ(EZj))*O2JyTt2Hwh<MQ>HALgN3aJ`izV#QVtwSow7|sHK^wT(}Si~4nd8O9R-Ys
SnAwH3910W`IyO5nSOWkv4ej6n

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/th.gif b/core/media/mod_languages/images/th.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2de99f69ca77022c521e55fb5f1adff4ce7d292
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hL;hJk^>IPL%c|3F#?h#5fQ3{2uJ{VPvD;$J++<VN@AdwYJb
O4}7Fy^ej`1!5RQ2a}@0W

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/th_th.gif b/core/media/mod_languages/images/th_th.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2de99f69ca77022c521e55fb5f1adff4ce7d292
GIT binary patch
literal 62
zcmZ?wbh9u|6k_0E_{hL;hJk^>IPL%c|3F#?h#5fQ3{2uJ{VPvD;$J++<VN@AdwYJb
O4}7Fy^ej`1!5RQ2a}@0W

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/tk_tm.gif b/core/media/mod_languages/images/tk_tm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ab842869a23f30ea057d65ff84007a8a56a861ac
GIT binary patch
literal 1608
zcmZ?wbhEHb6k_0Ec*ek>u`W$%V}{b^bft~y${W+w)}(7~NY~t$ro28)X+wtMngsss
z>17@MN}JM^RwT%+iWgZHanjaCcXjG9OIzucv3rvI<<}>hZq8ql=AyhNsqFMT)wL<P
zt^V?>6N2}(^6bf;5aC+d7I4tRjc0dO|JC(EyK|BnLdEvyEDf<=n`|$;IjcLz)oWMX
zv`Wv1xjAjo0h;U5HP@%#%m}|*oFjj<+F^US+S*j@^%)NhO-1)+D(y&9+L3OwF?Ugt
zb6R_d%9`Xk=^i<g;$|hgZ3uOo)td4~*LZ4xS7WIU&%WHa#z?_Exr@>Qn{$2D*QP0N
zNnKjtrMWIG;c%bY+LZ0)E?Vm|cIM`YFOM?blvi03n%3yOJ~iWPOKm}YXh*hx%8`ki
zO<hhnnB-25T3Qg}wzGz3dpgI#+|6MwS?vKFyEE&PycJd_Fi-{*|8qz91}L~BmLvjc
z8~cia#N_PM5{0DH^vpb4rT4q{D=B2A*eZpa`WpBaIHzW0dQ=sq23ProBv)l8Tc#-4
z+bP&oSXJZ}<ffJ+Dpcg=<P}?0*eWHa<R_(C0ofp7eI*63l9Fs&B}b5i0?1D1{GwC^
zQ#}LSWCJq;1v5iELt_(jb8{U9BLhPNeFGzXLnB>7b1P#bD+2=sC{P00R+N%v73AUu
zwF}6zRmvzSDX`MlFE20GD>v55FG|-pw6wGYnPFt43sj+7T$xvrSfQI&tPC^3CAB!Y
zD6^m>Ge1uOWMX1cerbuV640d(FXR@$jm<081A9j=IX_pwBC$Z<P|pD5C742AU;IjQ
zbK$CsOM+4n?!{_waY$uBs(w&vaeir0aw<@{GRUd|E9aur#FG4?ko^1{SSSW$<d@_Z
zXXF<sI0u_5_$DT2=7IQN^}fDVo_WP3iFwJXo-VdZKoj&bGgGY0oK1`j%w65g&D=~4
z4P8wgO&rZE%?vF~oE<IAjEqcRdR_99OLJ56N?>|Z;CkH*aOwpmh1>$5%`T}$nPsUd
zZbkXI3Sci=W#V>=3r_Q(dQ)(^#nlz3UVWfr^g$7e6wxptVCn%e;mH=rfhYXbJYZ@s
z0w!z5|Ns8}`TgtXkMG~Ue);_A<A?X}-oAPL>g9{)&z?Sc{OI9>`}gkNxqa*AjqBI0
zUb%ef;)V0)&Yn4a>g0*z$BrI3eCXhT{rmRr*}ZG$j_upFZrQwP<A(L?)~;E-YUPUM
z%a$%#ylCNq`Sa$^nLTUfjOo*+PMJJu;)MRb-k$ER&W`rB)|Td`#)kU3+M4RB%8K%`
z(vsq$!h-y~+??#J%#8H3)Rg3;#Dw^`*qG?3$cXT;(2(GuzyN<gUmtHTPY-uDR~Kg|
zM+bX5TN`UDOAB)|Qxjt&V3yL;)zQ|{)KFJbRZ&(_RFIdGm64W`ln@sa6%iH^6yWFM
z<>BVy<X~rGWnpGwWMEMI$pS81bU-Aiyk=nUY+&Zl^$vC94zkZO3t;H$XW?>*5=~4=
zHWl~npTp?qpp+14A{Qp5!#}5wi8WT!+0)V{PQ^fS6$7W0M6e)FMo3_|h~W-iwoH9D
zHFaqLS@RtXjMldC!ipZ3<}eGn`#9OD-tK2)*H+L-_j=ODDCTdhC!_q9fr&3E+9*c;
S8<W<V2O3RFd-ggoSOWm6PAi@O

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/tr.gif b/core/media/mod_languages/images/tr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9a73f85da992354085bea6257bbfe044e5b7a529
GIT binary patch
literal 280
zcmZ?wbh9u|6k_0E_^QhA|NsAI%K9(OoqilR{KClgg}Kv9N3Z|?{=JP$`+4N}Lk5=D
ze&H|eJzu#6yfCr<`{Bcvne#qPnEJ83@7wAPuN-~8%vtpN=ACD%2G8}a|9$=TW%h#a
zo43D9%X@BQ^Dd|OrIpJ|C!Y^xweR!G-xpP#VPJR@8pl9YpaU`u<QE4vTZc&n9y(Ia
z?Olyd24c)J&tCT2)8Qtsb&**^KzdqdnU5a7cR%BzD~iPoJd2bUE=*z&U=4I&b5-F^
KYf^D!um%9a$z3}D

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/tr_tr.gif b/core/media/mod_languages/images/tr_tr.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9a73f85da992354085bea6257bbfe044e5b7a529
GIT binary patch
literal 280
zcmZ?wbh9u|6k_0E_^QhA|NsAI%K9(OoqilR{KClgg}Kv9N3Z|?{=JP$`+4N}Lk5=D
ze&H|eJzu#6yfCr<`{Bcvne#qPnEJ83@7wAPuN-~8%vtpN=ACD%2G8}a|9$=TW%h#a
zo43D9%X@BQ^Dd|OrIpJ|C!Y^xweR!G-xpP#VPJR@8pl9YpaU`u<QE4vTZc&n9y(Ia
z?Olyd24c)J&tCT2)8Qtsb&**^KzdqdnU5a7cR%BzD~iPoJd2bUE=*z&U=4I&b5-F^
KYf^D!um%9a$z3}D

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/tw.gif b/core/media/mod_languages/images/tw.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a4fbb172e0c9829a5656e41f448cc141e914c704
GIT binary patch
literal 1026
zcmeH`?{5on9LH~EcWv+5yWX|8>vh*&d+pY3wJ^33A;wT;qnl;jM$|GA;(-KVA!0m`
z`IRM@#X7zHV$6>x5+TS;WC#%<@kIP6xk(le7;C5U`Ko9B2=7PlN3VDCO5Q71t(afF
znZ+n9If$ic5)1~QD3B!ZdckZ4hXV==lLR3MamdR{(sasV0h<j10bm$#I_v6&K~a#$
z^Dz_xy&h;9a&my@L6(8zfMr1xk==gp-lr+E8R>K&*bzyB(TH5G9KHu!F01tdWSDL@
z&#P$?M_%v#{bPvZw5lp??OG@(h{xYd+iYppgm_-7t<}QeRA!~9Xp$fxI~&pTB!(q1
z?02p-&9b~Sfb@Fg^CqgRY4iEdjg8Y53q|*S*|ed&d^qKEFIsdR6%;rey=glK9#1rS
zcVZ%$Qe@l|Ps$R?02L)Ai6{_An+**O*HTW$FC0&?tXUjN$<ma;P+xzWVR}FiwAHIQ
zwwt25e`j2oOj9J8CQ0OWgWr$*e#p;Hx}B0T_yfbno0=Ln-k|B2R#(^A`3mgz55Zts
zk~l8b(sDmHSB*rj+U3Ed>;!^vcrO0L@$u$nis}-@`1{IA$n&+fj-_o3LI`}mpE@1y
z=!fFsaQGJBILpSsYQ-5<bX~GqW22)QEA)+rLRx)&Y3Z=haIUoUip|zz;`?iAE^EOc
zA_xQ5_akGEB(eYb$3Wn3|NDg{`f*Gd>Nqn}dwA~F4$LpB>n~$jm0L<m9z5s|5btJt
z<gCy!ijk==>bB#j7dNxt=B!Vg?!(10bzih%<_Z0tvL}(<?S}kNqtGc@)Wc^>R$UCV
z%@{HY#gT);heJo7WmCmFa=*V^R^4B*`SpRw$Oze?P&==>b=#jggR}Y~g_T<#Jv6p?
zzG9ZAFWRg34(wZ3(_%eonnw;;<j>hXp^Ak5*O4bL&*i(Xmvs%ajhU8Ky_Ln$#M7B&
u_BE6cjczwBY`qic>Ls3M5eu4chSfvZN_LlDmY2uQoJu@yS5$_<7XAS?^dYqX

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ug_cn.gif b/core/media/mod_languages/images/ug_cn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a4834d53d5f13e219af342a7d260f90796ff2aee
GIT binary patch
literal 544
zcmZ?wbhEHb6k_0Ec*el+|NnnqU*E2-uD-s$^78T<H*Rd*y7kzxV`t8sIeYf(&!0cD
zv$Kneib_jMH*MOqapT6FJ9p~o>3#kB_1m{^+qZA$=H@OeEL^c-MO0MOuV26B&YgSm
z<jK6ey!!fjQ&ZDduU_riwQI?eB_19gT3T9eZf;kuTseLE^t^fVLPA37>gsZHbJwg{
z^Xb#4;^N|xl9IoF|IV2+XVt1zFJ8Q8Zf>46Yu5Sm=PzEoIC0{{1q&9qySq=AFyZ<0
z=S!C^{qyHfW@ct+Xy}tCPmUZpGHKGJ=;-L$+S+&T-nqKE+S%EOii*0pxG)TQp!kyo
z>_#0B35pX2_Sy!9rskH`w)Tz|Ci8ZFJqAwI7A=`3aqDI&6$T#07NI6dLv{uoF0LkN
zHU?HF23ZLPU3U!z8w&<Y4h9znS6%}<K}}ClWn*qr1rH@=o+fQI5pG6xBLOiJ1~X<i
m76*1YUIs_!7FH&CeHO(g&ea@@d~LQ?_QIV%e|0o6SOWk{U7}|I

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/uk.gif b/core/media/mod_languages/images/uk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..442af6c78d7d47583aa9bd42b7b4a46bc8c1a3df
GIT binary patch
literal 52
zcmZ?wbh9u|6k_0E_`twmoOb5_83r8&AOMLlFbTKxuRQ&hf3eNNTiu)Q?fK2$7RJb6
F4FH4!5gPyi

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/uk_ua.gif b/core/media/mod_languages/images/uk_ua.gif
new file mode 100644
index 0000000000000000000000000000000000000000..442af6c78d7d47583aa9bd42b7b4a46bc8c1a3df
GIT binary patch
literal 52
zcmZ?wbh9u|6k_0E_`twmoOb5_83r8&AOMLlFbTKxuRQ&hf3eNNTiu)Q?fK2$7RJb6
F4FH4!5gPyi

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ur.gif b/core/media/mod_languages/images/ur.gif
new file mode 100644
index 0000000000000000000000000000000000000000..40e2f6614bb0dc017d77b9c23d6cb5e13f589f86
GIT binary patch
literal 308
zcmZ?wbh9u|6k_0E_^Qe9|Nno!JU;s#`_P%89N8TEZtT1I?CPZ_m$-7cE<e3|?C!C@
z|Nfe{n;*J$=*rV80n-9z9-8^$<BK1^e+U%{88#b!`SC@zT=wbvrzwk4wqD-4=lUM8
zVzKq-*Nc~kYt(7{`txhk#Z3my20_z<K79KiUnzh7(RsEkw*5EvGo&#H6bLX-40J#y
zfc)aX7U|GX(4i&Oe^ha!hZTqW#LEmzMWn=Al^hQ*3|M`PlO_1h5{~$#f&qyNmrsA+
z$TdOvrQ3wV%}yFdiUnbwyl$F|YE7lCstn>xvSLcX6>dzN@<MF<j9q2!jttfS_%dla

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/ur_pk.gif b/core/media/mod_languages/images/ur_pk.gif
new file mode 100644
index 0000000000000000000000000000000000000000..40e2f6614bb0dc017d77b9c23d6cb5e13f589f86
GIT binary patch
literal 308
zcmZ?wbh9u|6k_0E_^Qe9|Nno!JU;s#`_P%89N8TEZtT1I?CPZ_m$-7cE<e3|?C!C@
z|Nfe{n;*J$=*rV80n-9z9-8^$<BK1^e+U%{88#b!`SC@zT=wbvrzwk4wqD-4=lUM8
zVzKq-*Nc~kYt(7{`txhk#Z3my20_z<K79KiUnzh7(RsEkw*5EvGo&#H6bLX-40J#y
zfc)aX7U|GX(4i&Oe^ha!hZTqW#LEmzMWn=Al^hQ*3|M`PlO_1h5{~$#f&qyNmrsA+
z$TdOvrQ3wV%}yFdiUnbwyl$F|YE7lCstn>xvSLcX6>dzN@<MF<j9q2!jttfS_%dla

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/us.gif b/core/media/mod_languages/images/us.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e2568acdd8d0cfd8886bd610f38204ceaa0ed53f
GIT binary patch
literal 89
zcmZ?wbh9u|6k_0E_{6~Q|Ns9p3_y@(Y&<h9Z6=5b209=Tq{e|+jbqcEj{;4etJivS
j%I=mpyj{RaJT_xhT<@|KzSEW_?OB?(?tKlvDuXouKf)WI

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/uz.gif b/core/media/mod_languages/images/uz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14630eed749fea952a8ea971dd73e88d74f09609
GIT binary patch
literal 321
zcmV-H0lxl6Nk%v~VG;lg0QEfp9IG+6v%I#myc~+96`;Bipt^9z)eWAxAdIF*w#pQR
zq9Bc@9izM<ji+V8(!8|26{o=%iKHW^zmV7DSHIFMl&mDDz!jjoE2_d7qP!2Exg(CK
z0GG7@l(GPpwZ!J_0GzoBqP_r@voV#ejl0Mfpt@qf(rm@mjM3ewt+xZ8y8xQE6oa5$
zzR&=ew58$eR=dp+q`;}Iw_3u~0GYJ_o46IByA+0^w6nV%wK*QOI;x<E|NsBCv%3HQ
z00000EC2ui01^NU000JNzyiaOAP_Q`lf`tgIiDTWrzC=D43gHtMeBMwuZaf)p~Pk(
z)vCsBvqq%KrZGS)1`)+=&&Q=?4*~%_f;~Mrh>18njE#<ukdcy;lRK7|n3<OVoSmMZ
TojIbTq@|-esHv)}sX+ic2z;48

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/uz_uz.gif b/core/media/mod_languages/images/uz_uz.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14630eed749fea952a8ea971dd73e88d74f09609
GIT binary patch
literal 321
zcmV-H0lxl6Nk%v~VG;lg0QEfp9IG+6v%I#myc~+96`;Bipt^9z)eWAxAdIF*w#pQR
zq9Bc@9izM<ji+V8(!8|26{o=%iKHW^zmV7DSHIFMl&mDDz!jjoE2_d7qP!2Exg(CK
z0GG7@l(GPpwZ!J_0GzoBqP_r@voV#ejl0Mfpt@qf(rm@mjM3ewt+xZ8y8xQE6oa5$
zzR&=ew58$eR=dp+q`;}Iw_3u~0GYJ_o46IByA+0^w6nV%wK*QOI;x<E|NsBCv%3HQ
z00000EC2ui01^NU000JNzyiaOAP_Q`lf`tgIiDTWrzC=D43gHtMeBMwuZaf)p~Pk(
z)vCsBvqq%KrZGS)1`)+=&&Q=?4*~%_f;~Mrh>18njE#<ukdcy;lRK7|n3<OVoSmMZ
TojIbTq@|-esHv)}sX+ic2z;48

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/vi.gif b/core/media/mod_languages/images/vi.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a881ea8dad99e619be81c98e019abe436f9497a
GIT binary patch
literal 286
zcmZ?wbh9u|6k_0E_^QJ2=c3q$*#f^#ik|0T{JvM@+g9Ok+k{^=^1W*1yClW@eV54R
zRYEr{*`B0vKh5KLlFofaiRE=C-(7ExhcR4#&Wl|)WPMr7dsUs~bqC+4rGn2Zcz+%h
zJ<H1Yx{dEuGv8SzhL`oczt4!CVPrVN!0;%Ei-Foe2V@|~FAQwX2PPJH=ty;Po-DLX
zYM61nozbeqMW<EZSn&)4ZEmiFJ&Lgl=A4mOAQ<S*)WD?hBfztTLB$~>Kv2b5MK+(=
Lxh+56k--`OQSnYH

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/vi_vn.gif b/core/media/mod_languages/images/vi_vn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a881ea8dad99e619be81c98e019abe436f9497a
GIT binary patch
literal 286
zcmZ?wbh9u|6k_0E_^QJ2=c3q$*#f^#ik|0T{JvM@+g9Ok+k{^=^1W*1yClW@eV54R
zRYEr{*`B0vKh5KLlFofaiRE=C-(7ExhcR4#&Wl|)WPMr7dsUs~bqC+4rGn2Zcz+%h
zJ<H1Yx{dEuGv8SzhL`oczt4!CVPrVN!0;%Ei-Foe2V@|~FAQwX2PPJH=ty;Po-DLX
zYM61nozbeqMW<EZSn&)4ZEmiFJ&Lgl=A4mOAQ<S*)WD?hBfztTLB$~>Kv2b5MK+(=
Lxh+56k--`OQSnYH

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/zh.gif b/core/media/mod_languages/images/zh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..384522b664c3ecb8124b2a095564c21bd4cc3f60
GIT binary patch
literal 161
zcmZ?wbh9u|6k_0E_#(papPk`<5ySsdhW}*@|4kVF^D_MBX88Y~;r|1M|4a=3*E0NX
zWcaVm@V}7ZzaPVYDTe>%4FBsH{wFc~XJGg*%0Lk4fK-6&a$r?^pwgF;Iq$_0iwh|%
iFEtbe1566ny?<;R*mU>N0uLXKJ@*w(=2$s1SOWk<WHHwO

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/zh_cn.gif b/core/media/mod_languages/images/zh_cn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..384522b664c3ecb8124b2a095564c21bd4cc3f60
GIT binary patch
literal 161
zcmZ?wbh9u|6k_0E_#(papPk`<5ySsdhW}*@|4kVF^D_MBX88Y~;r|1M|4a=3*E0NX
zWcaVm@V}7ZzaPVYDTe>%4FBsH{wFc~XJGg*%0Lk4fK-6&a$r?^pwgF;Iq$_0iwh|%
iFEtbe1566ny?<;R*mU>N0uLXKJ@*w(=2$s1SOWk<WHHwO

literal 0
HcmV?d00001

diff --git a/core/media/mod_languages/images/zh_tw.gif b/core/media/mod_languages/images/zh_tw.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a4fbb172e0c9829a5656e41f448cc141e914c704
GIT binary patch
literal 1026
zcmeH`?{5on9LH~EcWv+5yWX|8>vh*&d+pY3wJ^33A;wT;qnl;jM$|GA;(-KVA!0m`
z`IRM@#X7zHV$6>x5+TS;WC#%<@kIP6xk(le7;C5U`Ko9B2=7PlN3VDCO5Q71t(afF
znZ+n9If$ic5)1~QD3B!ZdckZ4hXV==lLR3MamdR{(sasV0h<j10bm$#I_v6&K~a#$
z^Dz_xy&h;9a&my@L6(8zfMr1xk==gp-lr+E8R>K&*bzyB(TH5G9KHu!F01tdWSDL@
z&#P$?M_%v#{bPvZw5lp??OG@(h{xYd+iYppgm_-7t<}QeRA!~9Xp$fxI~&pTB!(q1
z?02p-&9b~Sfb@Fg^CqgRY4iEdjg8Y53q|*S*|ed&d^qKEFIsdR6%;rey=glK9#1rS
zcVZ%$Qe@l|Ps$R?02L)Ai6{_An+**O*HTW$FC0&?tXUjN$<ma;P+xzWVR}FiwAHIQ
zwwt25e`j2oOj9J8CQ0OWgWr$*e#p;Hx}B0T_yfbno0=Ln-k|B2R#(^A`3mgz55Zts
zk~l8b(sDmHSB*rj+U3Ed>;!^vcrO0L@$u$nis}-@`1{IA$n&+fj-_o3LI`}mpE@1y
z=!fFsaQGJBILpSsYQ-5<bX~GqW22)QEA)+rLRx)&Y3Z=haIUoUip|zz;`?iAE^EOc
zA_xQ5_akGEB(eYb$3Wn3|NDg{`f*Gd>Nqn}dwA~F4$LpB>n~$jm0L<m9z5s|5btJt
z<gCy!ijk==>bB#j7dNxt=B!Vg?!(10bzih%<_Z0tvL}(<?S}kNqtGc@)Wc^>R$UCV
z%@{HY#gT);heJo7WmCmFa=*V^R^4B*`SpRw$Oze?P&==>b=#jggR}Y~g_T<#Jv6p?
zzG9ZAFWRg34(wZ3(_%eonnw;;<j>hXp^Ak5*O4bL&*i(Xmvs%ajhU8Ky_Ln$#M7B&
u_BE6cjczwBY`qic>Ls3M5eu4chSfvZN_LlDmY2uQoJu@yS5$_<7XAS?^dYqX

literal 0
HcmV?d00001

diff --git a/core/media/mod_sampledata/js/sampledata-process.js b/core/media/mod_sampledata/js/sampledata-process.js
new file mode 100644
index 00000000..972fd2c2
--- /dev/null
+++ b/core/media/mod_sampledata/js/sampledata-process.js
@@ -0,0 +1,96 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+!(function ($) {
+	"use strict";
+
+	var inProgress = false;
+
+	var sampledataAjax = function(type, steps, step) {
+		if (step > steps) {
+			$('.sampledata-' + type + ' .row-title').append('<span class="icon-publish"> </span>');
+			inProgress = false;
+			return;
+		}
+		var stepClass = 'sampledata-steps-' + type + '-' + step,
+			$stepLi = $('<li class="' + stepClass + '"><p class="loader-image text-center"><img src="' + window.modSampledataIconProgress + '" width="30" height="30" ></p></li>'),
+			$progress = $(".sampledata-progress-" + type + " progress");
+
+		$("div.sampledata-progress-" + type + " ul").append($stepLi);
+
+		var request = $.ajax({
+			url: window.modSampledataUrl,
+			type: 'POST',
+			dataType: 'json',
+			data: {
+				type: type,
+				plugin: 'SampledataApplyStep' + step,
+				step: step
+			}
+		});
+		request.done(function(response){
+			$stepLi.children('.loader-image').remove();
+
+			if (response.success && response.data && response.data.length > 0) {
+				var success, value, resultClass, $msg;
+
+				// Display all messages that we got
+				for(var i = 0, l = response.data.length; i < l; i++) {
+					value   = response.data[i];
+					success = value.success;
+					resultClass = success ? 'success' : 'error';
+					$stepLi.append($('<div>', {
+						html: value.message,
+						'class': 'alert alert-' + resultClass,
+					}));
+				}
+
+				// Update progress
+				$progress.val(step/steps);
+
+				// Move on next step
+				if (success) {
+					step++;
+					sampledataAjax(type, steps, step);
+				}
+
+			} else {
+				$stepLi.addClass('alert alert-error');
+				$stepLi.html(Joomla.JText._('MOD_SAMPLEDATA_INVALID_RESPONSE'));
+				inProgress = false;
+			}
+		});
+		request.fail(function(jqXHR, textStatus){
+			alert('Something went wrong! Please close and reopen the browser and try again!');
+		});
+	};
+
+	window.sampledataApply = function(el) {
+		var $el = $(el), type = $el.data('type'), steps = $el.data('steps');
+
+		// Check whether the work in progress or we alredy proccessed with current item
+		if (inProgress) {
+			return;
+		}
+		if ($el.data('processed')) {
+			alert(Joomla.JText._('MOD_SAMPLEDATA_ITEM_ALREADY_PROCESSED'));
+			return;
+		}
+
+		// Make sure that use run this not by random clicking on the page links
+		if (!confirm(Joomla.JText._('MOD_SAMPLEDATA_CONFIRM_START'))) {
+			return false;
+		}
+
+		// Turn on the progress container
+		$('.sampledata-progress-' + type).show();
+		$el.data('processed', true)
+
+		inProgress = true;
+		sampledataAjax(type, steps, 1);
+		return false;
+	};
+
+})(jQuery);
diff --git a/core/media/overrider/css/overrider.css b/core/media/overrider/css/overrider.css
new file mode 100644
index 00000000..5aceab18
--- /dev/null
+++ b/core/media/overrider/css/overrider.css
@@ -0,0 +1,52 @@
+/**
+ * @package		Joomla.Administrator
+ * @subpackage	com_languages
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.overrider-spinner {
+	background-image:url(../../system/images/modal/spinner.gif);
+	background-repeat:no-repeat;
+	background-position:center;
+}
+
+#refresh-status{
+	display:none;
+	height:16px;
+	padding-left:25px;
+	background-position:left;
+}
+
+#results-container{
+	display:none;
+	padding-bottom:10px;
+}
+#more-results{
+	display:none;
+	height:16px;
+	padding:10px 0;
+}
+.row0{
+	background-color:#f7f7f7;
+}
+.row1{
+	background-color:#f0f0f0;
+	border-top:1px solid #ffffff;
+}
+.result{
+	padding:5px 0px;
+	border:1px solid #ffffff;
+}
+.result:hover{
+	background-color:#e8f6fe;
+	cursor:pointer;
+}
+.result-key{
+	color:#666666;
+	padding-left:5px;
+}
+.result-string{
+	padding-left:25px;
+	margin-top:5px;
+}
\ No newline at end of file
diff --git a/core/media/overrider/js/overrider.js b/core/media/overrider/js/overrider.js
new file mode 100644
index 00000000..294417eb
--- /dev/null
+++ b/core/media/overrider/js/overrider.js
@@ -0,0 +1,236 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Some state variables for the overrider
+ */
+Joomla.overrider = {
+	states: {
+		refreshing  : false,
+		refreshed   : false,
+		counter     : 0,
+		searchstring: '',
+		searchtype  : 'value'
+	}
+};
+
+/**
+ * Method for refreshing the database cache of known language strings via Ajax
+ *
+ * @return  void
+ *
+ * @since   2.5
+ */
+Joomla.overrider.refreshCache = function()
+{
+	var $ = jQuery.noConflict(), self = this;
+	this.states.refreshing = true;
+
+	$('#refresh-status').slideDown().css('display', 'block');
+
+	$.ajax(
+	{
+		type: "POST",
+		url: 'index.php?option=com_languages&task=strings.refresh&format=json',
+		dataType: 'json'
+	}).done(function (r)
+	{
+		if (r.error && r.message)
+		{
+			alert(r.message);
+		}
+
+		if (r.messages)
+		{
+			Joomla.renderMessages(r.messages);
+		}
+
+		$('#refresh-status').slideUp().hide();
+		self.states.refreshing = false;
+	}).fail(function (xhr)
+	{
+		alert(Joomla.JText._('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'));
+		$('#refresh-status').slideUp().hide();
+	});
+};
+
+/**
+ * Method for searching known language strings via Ajax
+ *
+ * @param   more  Determines the limit start of the results
+ *
+ * @return  void
+ *
+ * @since   2.5
+ */
+Joomla.overrider.searchStrings = function(more)
+{
+	var $ = jQuery.noConflict(), self = this;
+
+	// Prevent searching if the cache is refreshed at the moment
+	if (this.states.refreshing)
+	{
+		return;
+	}
+
+	// Only update the used searchstring and searchtype if the search button
+	// was used to start the search (that will be the case if 'more' is null)
+	if (!more)
+	{
+		this.states.searchstring = $('#jform_searchstring').val();
+		this.states.searchtype   = $('#jform_searchtype') !== null ? $('#jform_searchtype').val() : 'value';
+	}
+
+	if (!this.states.searchstring)
+	{
+		$('#jform_searchstring').addClass('invalid');
+
+		return;
+	}
+
+
+	if (more)
+	{
+		// If 'more' is greater than 0 we have already displayed some results for
+		// the current searchstring, so display the spinner at the more link
+		$('#more-results').addClass('overrider-spinner');
+	}
+	else
+	{
+		// Otherwise it is a new searchstring and we have to remove all previous results first
+		$('#more-results').hide();
+		var $children = $('#results-container div.language-results');
+		$children.remove();
+		$('#results-container').addClass('overrider-spinner').slideDown().css('display', 'block');
+	}
+
+	$.ajax(
+	{
+		type: "POST",
+		url: 'index.php?option=com_languages&task=strings.search&format=json',
+		data: 'searchstring=' + self.states.searchstring + '&searchtype=' + self.states.searchtype + '&more=' + more,
+		dataType: 'json'
+	}).done(function (r)
+	{
+		if (r.error && r.message)
+		{
+			alert(r.message);
+		}
+
+		if (r.messages)
+		{
+			Joomla.renderMessages(r.messages);
+		}
+
+		if (r.data)
+		{
+			if (r.data.results)
+			{
+				self.insertResults(r.data.results);
+			}
+
+			if (r.data.more)
+			{
+				// If there are more results than the sent ones
+				// display the more link
+				self.states.more = r.data.more;
+				$('#more-results').slideDown().css('display', 'block');
+			}
+			else
+			{
+				$('#more-results').hide();
+			}
+		}
+
+		$('#results-container').removeClass('overrider-spinner');
+		$('#more-results').removeClass('overrider-spinner');
+	}).fail(function (xhr)
+	{
+		alert(Joomla.JText._('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR'));
+		$('#results-container').removeClass('overrider-spinner');
+		$('#more-results').removeClass('overrider-spinner');
+	});
+};
+
+/**
+ * Method inserting the received results into the results container
+ *
+ * @param   results  An array of search result objects
+ *
+ * @return  void
+ *
+ * @since   2.5
+ */
+Joomla.overrider.insertResults = function(results)
+{
+	var $ = jQuery.noConflict(), self = this;
+
+	// For creating an individual ID for each result we use a counter
+	this.states.counter = this.states.counter + 1;
+
+	// Create a container into which all the results will be inserted
+	var $results_div = $('<div>', {
+		id : 'language-results' + self.states.counter,
+		class : 'language-results',
+		style : 'display:none;'
+	});
+
+	// Create some elements for each result and insert it into the container
+	$.each(results, function(index, item) {
+
+		var $div = $('<div>', {
+			class: 'result row' + index % 2,
+			onclick: 'Joomla.overrider.selectString(' + self.states.counter + index + ');'
+		});
+
+		var $key = $('<div>', {
+			id:  'override_key' + self.states.counter + index,
+			class: 'result-key',
+			html: item.constant,
+			title: item.file
+		});
+
+		var $string = $('<div>',{
+			id: 'override_string' + self.states.counter + index,
+			class:	'result-string',
+			html: item.string
+		});
+
+		$key.appendTo($div);
+		$string.appendTo($div);
+		$div.appendTo($results_div);
+
+	});
+
+	// If there aren't any results display an appropriate message
+	if (!results.length)
+	{
+		var $noresult = $('<div>',{
+			html: Joomla.JText._('COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS')
+		});
+		$noresult.appendTo($results_div);
+	}
+
+	// Finally insert the container afore the more link and reveal it
+	$('#more-results').before($results_div);
+	$('#language-results' + this.states.counter).slideDown().css('display','block');
+};
+
+/**
+ * Inserts a specific constant/value pair into the form and scrolls the page back to the top
+ *
+ * @param   id  The ID of the element which was selected for insertion
+ *
+ * @return  void
+ *
+ * @since   2.5
+ */
+Joomla.overrider.selectString = function(id)
+{
+	var $ = jQuery.noConflict();
+	$('#jform_key').val($('#override_key' + id).html());
+	$('#jform_override').val($('#override_string' + id).html());
+	$(window).scrollTop(0);
+};
diff --git a/core/media/overrider/js/overrider.min.js b/core/media/overrider/js/overrider.min.js
new file mode 100644
index 00000000..cf4acc67
--- /dev/null
+++ b/core/media/overrider/js/overrider.min.js
@@ -0,0 +1 @@
+Joomla.overrider={states:{refreshing:!1,refreshed:!1,counter:0,searchstring:"",searchtype:"value"}},Joomla.overrider.refreshCache=function(){var a=jQuery.noConflict(),b=this;this.states.refreshing=!0,a("#refresh-status").slideDown().css("display","block"),a.ajax({type:"POST",url:"index.php?option=com_languages&task=strings.refresh&format=json",dataType:"json"}).done(function(c){c.error&&c.message&&alert(c.message),c.messages&&Joomla.renderMessages(c.messages),a("#refresh-status").slideUp().hide(),b.states.refreshing=!1}).fail(function(b){alert(Joomla.JText._("COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR")),a("#refresh-status").slideUp().hide()})},Joomla.overrider.searchStrings=function(a){var b=jQuery.noConflict(),c=this;if(!this.states.refreshing){if(a||(this.states.searchstring=b("#jform_searchstring").val(),this.states.searchtype=null!==b("#jform_searchtype")?b("#jform_searchtype").val():"value"),!this.states.searchstring)return void b("#jform_searchstring").addClass("invalid");if(a)b("#more-results").addClass("overrider-spinner");else{b("#more-results").hide();var d=b("#results-container div.language-results");d.remove(),b("#results-container").addClass("overrider-spinner").slideDown().css("display","block")}b.ajax({type:"POST",url:"index.php?option=com_languages&task=strings.search&format=json",data:"searchstring="+c.states.searchstring+"&searchtype="+c.states.searchtype+"&more="+a,dataType:"json"}).done(function(a){a.error&&a.message&&alert(a.message),a.messages&&Joomla.renderMessages(a.messages),a.data&&(a.data.results&&c.insertResults(a.data.results),a.data.more?(c.states.more=a.data.more,b("#more-results").slideDown().css("display","block")):b("#more-results").hide()),b("#results-container").removeClass("overrider-spinner"),b("#more-results").removeClass("overrider-spinner")}).fail(function(a){alert(Joomla.JText._("COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR")),b("#results-container").removeClass("overrider-spinner"),b("#more-results").removeClass("overrider-spinner")})}},Joomla.overrider.insertResults=function(a){var b=jQuery.noConflict(),c=this;this.states.counter=this.states.counter+1;var d=b("<div>",{id:"language-results"+c.states.counter,class:"language-results",style:"display:none;"});if(b.each(a,function(a,e){var f=b("<div>",{class:"result row"+a%2,onclick:"Joomla.overrider.selectString("+c.states.counter+a+");"}),g=b("<div>",{id:"override_key"+c.states.counter+a,class:"result-key",html:e.constant,title:e.file}),h=b("<div>",{id:"override_string"+c.states.counter+a,class:"result-string",html:e.string});g.appendTo(f),h.appendTo(f),f.appendTo(d)}),!a.length){var e=b("<div>",{html:Joomla.JText._("COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS")});e.appendTo(d)}b("#more-results").before(d),b("#language-results"+this.states.counter).slideDown().css("display","block")},Joomla.overrider.selectString=function(a){var b=jQuery.noConflict();b("#jform_key").val(b("#override_key"+a).html()),b("#jform_override").val(b("#override_string"+a).html()),b(window).scrollTop(0)};
diff --git a/core/media/plg_captcha_recaptcha/js/recaptcha.js b/core/media/plg_captcha_recaptcha/js/recaptcha.js
new file mode 100644
index 00000000..52396015
--- /dev/null
+++ b/core/media/plg_captcha_recaptcha/js/recaptcha.js
@@ -0,0 +1,20 @@
+/**
+ * @package		Joomla.JavaScript
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+window.JoomlaInitReCaptcha2 = function() {
+	'use strict';
+
+	var items = document.getElementsByClassName('g-recaptcha'), item, options;
+	for (var i = 0, l = items.length; i < l; i++) {
+		item = items[i];
+		options = item.dataset ? item.dataset : {
+			sitekey: item.getAttribute('data-sitekey'),
+			theme:   item.getAttribute('data-theme'),
+			size:    item.getAttribute('data-size')
+		};
+		grecaptcha.render(item, options);
+	}
+}
diff --git a/core/media/plg_captcha_recaptcha/js/recaptcha.min.js b/core/media/plg_captcha_recaptcha/js/recaptcha.min.js
new file mode 100644
index 00000000..d1357dcb
--- /dev/null
+++ b/core/media/plg_captcha_recaptcha/js/recaptcha.min.js
@@ -0,0 +1 @@
+window.JoomlaInitReCaptcha2=function(){"use strict";var e=document.getElementsByClassName("g-recaptcha"),t,n;for(var r=0,i=e.length;r<i;r++)t=e[r],n=t.dataset?t.dataset:{sitekey:t.getAttribute("data-sitekey"),theme:t.getAttribute("data-theme"),size:t.getAttribute("data-size")},grecaptcha.render(t,n)};
\ No newline at end of file
diff --git a/core/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js b/core/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js
new file mode 100644
index 00000000..5e1405a5
--- /dev/null
+++ b/core/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js
@@ -0,0 +1,46 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+jQuery(document).ready(function() {
+	var ajax_structure = {
+		success: function(data, textStatus, jqXHR) {
+			var link = jQuery('#plg_quickicon_extensionupdate').find('span.j-links-link');
+
+			try {
+				var updateInfoList = jQuery.parseJSON(data);
+			} catch (e) {
+				// An error occurred
+				link.html(plg_quickicon_extensionupdate_text.ERROR);
+			}
+
+			if (updateInfoList instanceof Array) {
+				if (updateInfoList.length == 0) {
+					// No updates
+					link.html(plg_quickicon_extensionupdate_text.UPTODATE);
+				} else {
+					var updateString = plg_quickicon_extensionupdate_text.UPDATEFOUND_MESSAGE.replace("%s", updateInfoList.length);
+					jQuery('#system-message-container').prepend(
+						'<div class="alert alert-error alert-joomlaupdate">'
+						+ updateString
+						+ ' <button class="btn btn-primary" onclick="document.location=\'' + plg_quickicon_extensionupdate_url + '\'">'
+						+ plg_quickicon_extensionupdate_text.UPDATEFOUND_BUTTON + '</button>'
+						+ '</div>'
+					);
+					var updateString = plg_quickicon_extensionupdate_text.UPDATEFOUND.replace("%s", updateInfoList.length);
+					link.html(updateString);
+				}
+			} else {
+				// An error occurred
+				link.html(plg_quickicon_extensionupdate_text.ERROR);
+			}
+		},
+		error: function(jqXHR, textStatus, errorThrown) {
+			// An error occurred
+			jQuery('#plg_quickicon_extensionupdate').find('span.j-links-link').html(plg_quickicon_extensionupdate_text.ERROR);
+		},
+		url: plg_quickicon_extensionupdate_ajax_url + '&eid=0&skip=700'
+	};
+	ajax_object = new jQuery.ajax(ajax_structure);
+});
diff --git a/core/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js b/core/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js
new file mode 100644
index 00000000..b2fa15be
--- /dev/null
+++ b/core/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js
@@ -0,0 +1,53 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+var plg_quickicon_jupdatecheck_ajax_structure = {};
+
+jQuery(document).ready(function() {
+	plg_quickicon_jupdatecheck_ajax_structure = {
+		success: function(data, textStatus, jqXHR) {
+			var link = jQuery('#plg_quickicon_joomlaupdate').find('span.j-links-link');
+
+			try {
+				var updateInfoList = jQuery.parseJSON(data);
+			} catch (e) {
+				// An error occurred
+				link.html(plg_quickicon_joomlaupdate_text.ERROR);
+			}
+
+			if (updateInfoList instanceof Array) {
+				if (updateInfoList.length < 1) {
+					// No updates
+					link.replaceWith(plg_quickicon_joomlaupdate_text.UPTODATE);
+				} else {
+					var updateInfo = updateInfoList.shift();
+					if (updateInfo.version != plg_quickicon_jupdatecheck_jversion) {
+						var updateString = plg_quickicon_joomlaupdate_text.UPDATEFOUND.replace("%s", updateInfo.version + "");
+						jQuery('#plg_quickicon_joomlaupdate').find('.j-links-link').html(updateString);
+						var updateString = plg_quickicon_joomlaupdate_text.UPDATEFOUND_MESSAGE.replace("%s", updateInfo.version + "");
+						jQuery('#system-message-container').prepend(
+							'<div class="alert alert-error alert-joomlaupdate">'
+							+ updateString
+							+ ' <button class="btn btn-primary" onclick="document.location=\'' + plg_quickicon_joomlaupdate_url + '\'">'
+							+ plg_quickicon_joomlaupdate_text.UPDATEFOUND_BUTTON + '</button>'
+							+ '</div>'
+						);
+					} else {
+						link.html(plg_quickicon_joomlaupdate_text.UPTODATE);
+					}
+				}
+			} else {
+				// An error occurred
+				link.html(plg_quickicon_joomlaupdate_text.ERROR);
+			}
+		},
+		error: function(jqXHR, textStatus, errorThrown) {
+			// An error occurred
+			jQuery('#plg_quickicon_joomlaupdate').find('span.j-links-link').html(plg_quickicon_joomlaupdate_text.ERROR);
+		},
+		url: plg_quickicon_joomlaupdate_ajax_url + '&eid=700&cache_timeout=3600'
+	};
+	setTimeout("ajax_object = new jQuery.ajax(plg_quickicon_jupdatecheck_ajax_structure);", 2000);
+});
diff --git a/core/media/plg_system_highlight/highlight.css b/core/media/plg_system_highlight/highlight.css
new file mode 100644
index 00000000..18cf7cf9
--- /dev/null
+++ b/core/media/plg_system_highlight/highlight.css
@@ -0,0 +1,5 @@
+span.highlight {
+	background-color:#FFFFCC;
+	font-weight:bold;
+	padding:1px 0;
+}
diff --git a/core/media/plg_system_stats/js/stats.js b/core/media/plg_system_stats/js/stats.js
new file mode 100644
index 00000000..2f7ab181
--- /dev/null
+++ b/core/media/plg_system_stats/js/stats.js
@@ -0,0 +1,93 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * stats javascript behavior
+ *
+ * To allow users to accept & configure stats sending
+ *
+ * @package     Joomla
+ * @since       3.5.0
+ * @version  1.0
+ */
+
+(function ($) {
+	$(document).ready(function () {
+		var ajaxData = {
+			'option' : 'com_ajax',
+			'group'  : 'system',
+			'plugin' : 'renderStatsMessage',
+			'format' : 'raw'
+			},
+			messageContainer = $('#system-message-container');
+
+		/**
+		 * Initialise events for the message container
+		 *
+		 * @return  void
+		 */
+		function initStatsEvents()
+		{
+			var globalContainer = messageContainer.find('.js-pstats-alert'),
+				detailsContainer = messageContainer.find('.js-pstats-data-details');
+
+			// Show details about the information being sent
+			messageContainer.on('click', '.js-pstats-btn-details', function(e){
+				detailsContainer.toggle(200);
+				e.preventDefault();
+			});
+
+			// Always allow
+			messageContainer.on('click', '.js-pstats-btn-allow-always', function(e){
+
+				// Remove message
+				globalContainer.hide(200);
+				detailsContainer.remove();
+				ajaxData.plugin = 'sendAlways';
+
+				$.getJSON('index.php', ajaxData, function(response){});
+				e.preventDefault();
+			});
+
+			// Allow once
+			messageContainer.on('click', '.js-pstats-btn-allow-once', function(e){
+
+				// Remove message
+				globalContainer.hide(200);
+				detailsContainer.remove();
+
+				ajaxData.plugin = 'sendOnce';
+
+				$.getJSON('index.php', ajaxData, function(response){});
+				e.preventDefault();
+			});
+
+			// Never allow
+			messageContainer.on('click', '.js-pstats-btn-allow-never', function(e){
+
+				// Remove message
+				globalContainer.hide(200);
+				detailsContainer.remove();
+
+				ajaxData.plugin = 'sendNever';
+
+				$.getJSON('index.php', ajaxData, function(response){});
+				e.preventDefault();
+			});
+		}
+
+		ajaxData.plugin = 'sendStats';
+
+		$.getJSON('index.php', ajaxData, function(response){
+			if (response && response.html) {
+				messageContainer
+					.append(response.html)
+					.find('.js-pstats-alert').show(200);
+
+				initStatsEvents();
+			}
+		});
+	});
+})(jQuery);
diff --git a/core/media/system/css/adminlist.css b/core/media/system/css/adminlist.css
new file mode 100644
index 00000000..8b7f3531
--- /dev/null
+++ b/core/media/system/css/adminlist.css
@@ -0,0 +1,272 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Common CSS for adminlist grids */
+
+html, body {
+	background-color: #F0F0F0;
+	color: ButtonText;
+	font-family: Tahoma, Verdana, sans-serif !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+table.adminlist {
+	width: 99%;
+	border-spacing: 1px;
+	background-color: #f3f3f3;
+	color: #666;
+	font-size: 11px;
+}
+
+table.adminlist td,
+table.adminlist th {
+	padding: 4px !important;
+	font-size: 11px;
+}
+
+table.adminlist thead th {
+	text-align: center;
+	background: #f7f7f7;
+	color: #666;
+	border-bottom: 1px solid #CCC;
+	border-left: 1px solid #fff;
+}
+
+table.adminlist thead th.left {
+	text-align: left;
+}
+
+table.adminlist thead a:hover {
+	text-decoration: none;
+}
+
+table.adminlist thead th img {
+	vertical-align: middle;
+	padding-left: 3px;
+}
+
+table.adminlist tbody th {
+	font-weight: bold;
+}
+
+table.adminlist th a img {
+	border: 0;
+}
+
+table.adminlist tbody tr {
+	background-color: #fff;
+	text-align: left;
+}
+
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td {
+	background-color: #e8f6fe;
+}
+
+table.adminlist tbody tr td {
+	background: #fff;
+	border: 1px solid #fff;
+}
+
+table.adminlist tbody tr.row1 td {
+	background: #f0f0f0;
+	border-top: 1px solid #FFF;
+}
+
+table.adminlist tfoot tr {
+	text-align: center;
+	color: #333;
+}
+
+table.adminlist tfoot td,table.adminlist tfoot th {
+	background-color: #f7f7f7;
+	border-top: 1px solid #999;
+	text-align: center;
+}
+
+table.adminlist td.order {
+	text-align: center;
+	white-space: nowrap;
+	width: 200px;
+}
+
+table.adminlist td.order span {
+	float: left;
+	width: 20px;
+	text-align: center;
+	background-repeat: no-repeat;
+	height: 13px;
+}
+
+table.adminlist .pagination {
+	display: inline-block;
+	padding: 0;
+	margin: 0 auto;
+}
+
+/* Tree indentation & nesting - Up to 10 levels deep so don't go crazy :) */
+table.adminlist td.indent-4		{ padding-left: 4px; }
+table.adminlist td.indent-19	{ padding-left: 19px; }
+table.adminlist td.indent-34	{ padding-left: 34px; }
+table.adminlist td.indent-49	{ padding-left: 49px; }
+table.adminlist td.indent-64	{ padding-left: 64px; }
+table.adminlist td.indent-79	{ padding-left: 79px; }
+table.adminlist td.indent-94	{ padding-left: 94px; }
+table.adminlist td.indent-109	{ padding-left: 109px; }
+table.adminlist td.indent-124	{ padding-left: 124px; }
+table.adminlist td.indent-139	{ padding-left: 139px; }
+
+table.adminlist tr td.btns a {
+	text-decoration: underline;
+}
+
+/* added Angie */
+
+/* Filter Form */
+fieldset ol,
+ol#property-values {
+	margin: 0;
+	padding: 0;
+}
+
+fieldset li,
+ol#property-values li {
+	list-style: none;
+	margin: 0;
+	padding: 5px;
+}
+
+fieldset.filter {
+	border: 0;
+	margin: 0;
+	padding: 0 0 5px;
+}
+
+fieldset.filter ol {
+	border: 0;
+	list-style: none;
+	margin: 0;
+	padding: 5px 0 0;
+}
+
+fieldset.filter ol li {
+	float: left;
+	padding: 0 5px 0 0;
+}
+
+fieldset.filter ol li fieldset {
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+fieldset.filter .left {
+	float: left;
+	width: auto;
+	margin: 0;
+	text-align: left;
+}
+
+fieldset.filter .left label {
+	float: left;
+	padding: 2px;
+}
+
+fieldset.filter .right {
+	float: right;
+}
+
+fieldset#buttonbar {
+	border: 0;
+	text-align: right;
+}
+
+fieldset#buttonbar ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+fieldset#buttonbar li {
+	margin: 0;
+	padding: 5px;
+}
+
+button {
+	margin-top: 4px;
+	background: #fff;
+	border: 1px solid #ccc;
+	text-decoration: none;
+}
+
+button:hover {
+	cursor: pointer;
+	background: #E8F6FE;
+	text-decoration: none;
+	border: 1px solid #aaa;
+}
+
+fieldset input,
+fieldset textarea,
+fieldset select,
+fieldset img {
+	float: left;
+	width: auto;
+	margin: 5px 5px 5px 0;
+	font-size: 11px !important;
+}
+
+.list-footer div.limit {
+	float: left;
+	line-height: 22px;
+	margin: 0 10px;
+}
+
+.list-footer div.limit select#limit {
+	width: 50px;
+}
+
+/* ++++++++++++++  pagination  ++++++++++++++ */
+
+.list-footer {
+	margin: 10px 0;
+	padding: 10px 0 10px 0;
+	text-align: center;
+}
+
+table .list-footer ul {
+	list-style-type: none;
+	margin: 0 !important;
+	padding: 0;
+	text-align: left;
+	border: solid 0 #ccc;
+	float: left;
+}
+
+.list-footer li {
+	display: inline;
+	padding: 2px 5px !important;
+	text-align: left;
+	border: solid 0 #eee;
+	margin: 0 2px;
+	font-size: 11px;
+}
+
+.list-footer li.pagination-start,
+.list-footer li.pagination-next,
+.list-footer li.pagination-end,
+.list-footer li.pagination-prev {
+	border: 0;
+}
+
+.list-footer li.pagination-start ,
+.list-footer li.pagination-start span {
+	padding: 4px;
+}
+
+p.counter {
+	font-weight: bold;
+}
diff --git a/core/media/system/css/calendar-jos.css b/core/media/system/css/calendar-jos.css
new file mode 100644
index 00000000..d85ca990
--- /dev/null
+++ b/core/media/system/css/calendar-jos.css
@@ -0,0 +1,183 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* The main calendar widget.  DIV containing a table. */
+div.calendar {
+	position: relative;
+	z-index: 10000;
+	width: 226px;
+}
+
+.calendar, .calendar table {
+	border: 1px solid #cccccc;
+	font-size: 11px;
+	color: #000;
+	cursor: default;
+	background: #efefef;
+	font-family: arial,verdana,sans-serif;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+	text-align: center;    /* They are the navigation buttons */
+	padding: 2px;          /* Make the buttons seem like they're pressing */
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+	font-weight: bold;      /* Pressing it will take you to the current date */
+	text-align: center;
+	background: #333333;
+	color: #ffffff;
+	padding: 2px;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+	background: #dedede;
+	color: #000;
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+	border-bottom: 1px solid #cccccc;
+	padding: 2px;
+	text-align: center;
+	color: #000;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+	color: #999;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+	background: #bbbbbb;
+	color: #000000;
+	border: 1px solid #cccccc;
+	padding: 1px;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+	background: #c77;
+	padding: 2px 0px 0px 2px;
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+	background: #dddddd;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+	width: 2em;
+	text-align: right;
+	padding: 2px 4px 2px 2px;
+}
+
+.calendar table .wn {
+	padding: 2px 3px 2px 2px;
+	border-right: 1px solid #cccccc;
+	background: #dddddd;
+}
+
+.calendar tbody .rowhilite td {
+	background: #666666;
+	color: #ffffff;
+}
+
+.calendar tbody .rowhilite td.wn {
+	background: #666666;
+	color: #ffffff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+	background: #000000;
+	color: #ffffff;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+	color: #999;
+}
+
+.calendar tbody td.selected { /* Cell showing today date */
+	font-weight: bold;
+	background: #000000;
+	color: #ffffff;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+	background: #999999;
+	color: #ffffff;
+}
+
+.calendar tbody td.today {
+	font-weight: bold;
+}
+
+.calendar tbody .disabled {
+	color: #999;
+}
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+	visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+	display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+	text-align: center;
+	background: #cccccc;
+	color: #000;
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+	border-top: 1px solid #cccccc;
+	background: #efefef;
+	color: #000000;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+	background: #666666;
+	border: 1px solid #f40;
+	padding: 1px;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+	background: #999999;
+	padding: 2px 0px 0px 2px;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.combo {
+	position: absolute;
+	display: none;
+	top: 0px;
+	left: 0px;
+	width: 4em;
+	cursor: default;
+	border: 1px solid #655;
+	background: #ffffff;
+	color: #000;
+	font-size: smaller;
+}
+
+.combo .label {
+	width: 100%;
+	text-align: center;
+}
+
+.combo .hilite {
+	background: #fc8;
+}
+
+.combo .active {
+	border-top: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+	background: #efefef;
+	font-weight: bold;
+}
diff --git a/core/media/system/css/fields/calendar-rtl.css b/core/media/system/css/fields/calendar-rtl.css
new file mode 100644
index 00000000..4537d12b
--- /dev/null
+++ b/core/media/system/css/fields/calendar-rtl.css
@@ -0,0 +1,157 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+ .js-calendar {
+	box-shadow: 0 0 15px 4px rgba(0,0,0,.15) !important;
+ }
+.calendar-container {
+	float: left;
+	min-width: 160px;
+	padding: 0;
+	list-style: none;
+	border-radius: 5px;
+	background-color: #ffffff !important;
+	z-index: 1100 !important;
+}
+.calendar-container table {
+	table-layout: fixed;
+	max-width: 262px;
+	border-radius: 5px;
+	background-color: #ffffff !important;
+	z-index: 1100 !important;
+}
+/* The main calendar widget.  DIV containing a table. */
+div.calendar-container table th, .calendar-container table td {
+	padding: 8px 0;
+	line-height: 1.1em;
+	text-align: center;
+}
+
+div.calendar-container table body td {
+	line-height: 2em;
+}
+
+div.calendar-container table td.title { /* This holds the current "month, year" */
+	vertical-align: middle;
+	text-align: center;
+}
+
+.calendar-container table thead td.headrow { /* Row <TR> containing navigation buttons */
+	background: #fff;
+	color: #000;
+}
+
+.calendar-container table thead td.name { /* Cells <TD> containing the day names */
+	border-bottom: 1px solid #fff;
+	text-align: center;
+	color: #000;
+}
+
+.calendar-container table thead td.weekend { /* How a weekend day name shows in header */
+	color: #999;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar-container table tbody td.day { /* Cells <TD> containing month days dates */
+	text-align: right;
+}
+
+.calendar-container table tbody td.wn {
+	background: #fff;
+}
+
+.calendar-container table tbody td.weekend { /* Cells showing weekend days */
+	color: #999;
+}
+
+.calendar-container table tbody td.hilite { /* Hovered cells <TD> */
+	background: #999999;
+	color: #ffffff;
+}
+
+.calendar-container table tbody td.day {
+	border: 0;
+	cursor : pointer;
+	font-size: 12px;
+	min-width: 38px;
+}
+
+.calendar-container table tbody td.day.wn {
+	text-align: center;
+	background-color: #f4f4f4;
+}
+
+.calendar-container table tbody td.day.selected { /* Cell showing today date */
+	background: #3071a9;
+	color: #fff;
+	border: 0;
+}
+
+.calendar-container table tbody td.today {
+	position: relative;
+	height: 100%;
+	width: auto;
+	font-weight: bold;
+}
+.calendar-container table tbody td.today:after {
+	position: absolute;
+	bottom: 3px;
+	left: 3px;
+	right: 3px;
+	content: "";
+	height: 3px;
+	border-radius: 1.5px;
+	background-color: #46a546;
+}
+.calendar-container table tbody td.today.selected:after {
+	background-color: #fff;
+}
+
+.calendar-container table tbody td.day:hover {
+	cursor: pointer;
+	background: #3d8fd7;
+	color: #fff;
+}
+.calendar-container table tbody td.day:hover:after {
+	background-color: #fff;
+}
+
+.calendar-container table tbody .disabled {
+	color: #999;
+	background-color: #fafafa;
+}
+
+.calendar-container table tbody .emptycell { /* Empty cells (the best is to hide them) */
+	visibility: hidden;
+}
+
+.calendar-container table tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+	display: none;
+}
+
+.buttons-wrapper {
+	padding: 5px 5px;
+}
+a.js-btn.btn.btn-exit, a.js-btn.btn.btn-today, a.js-btn.btn.btn-clear {
+	cursor: pointer;
+	text-decoration: none;
+	min-width: 60px;
+}
+.calendar-container .calendar-head-row td {
+	padding: 4px 0 !important;
+}
+.calendar-container .day-name {
+	font-size: 0.7rem;
+	font-weight: bold;
+}
+.calendar-container .time td {
+	padding: 8px 8px 8px 0;
+}
+.time .time-title {
+	background-image: url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdlJREFUeNqklUsohFEUx7/5kgWGjEcRJULJSmJhITQLr8UoFko2k2SDLGZD2SglJcXOxo6Fx0ayUt4jWXgNG2rIwsgMJZPn/+o/dRvfa8yp33zfPfecM+e795x7bYqxtIAaUA2KgA3cgn3gBcsgrMQg3eAAfJtwBYa0Atg0dAugg+/3YAUcgkvqCkAVcIIy6raBCwT0/mRdymYG5Bt8VQoYBe+0Pwdpik6mwuAVNMawbJXgmr7e6FVokzKt1XBOZnYuneB54Jn+w/LEMZXTOo65nN80yNxNmyBIF4o6Ku6AXccpmzbzJstyQbs+FT/1VC6CFyU+mePTqbIBhBwp8csGn8UqO0qIz8AhstNBk8BP4As4RGCVyk8LgUVVlFvIXFXZ+4qUuZY8gn6W1QmYBKkadklM9PfLJriTYxYyEYFXpZp3s8Yj0kv9mhi0cuCTlsVMuqRWbpL0Xuo8YpAotaQnhgoQSzEAMjhuZoywfMb0UCmyKP1HmSXzJBQxpqIn9zhxA0piCJoFdqXu/bOpmeCMBiF+ZoJJ0E7gp0/AKCF71M1xCkZ4NRWSCjAIdiQ7v9UlHAcPUdfQh1QJEd7ArOg0K1dTRHJAO2hg8zhoH2IVbYElvaPgR4ABAFM/gtHnpJfxAAAAAElFTkSuQmCC");
+	background-repeat: no-repeat;
+	background-position: center; 
+}
+
diff --git a/core/media/system/css/fields/calendar.css b/core/media/system/css/fields/calendar.css
new file mode 100644
index 00000000..b1a01abb
--- /dev/null
+++ b/core/media/system/css/fields/calendar.css
@@ -0,0 +1,156 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+ .js-calendar {
+	box-shadow: 0 0 15px 4px rgba(0,0,0,.15) !important;
+ }
+.calendar-container {
+	float: left;
+	min-width: 160px;
+	padding: 0;
+	list-style: none;
+	border-radius: 5px;
+	background-color: #ffffff !important;
+	z-index: 1100 !important;
+}
+.calendar-container table {
+	table-layout: fixed;
+	max-width: 262px;
+	border-radius: 5px;
+	background-color: #ffffff !important;
+	z-index: 1100 !important;
+}
+/* The main calendar widget.  DIV containing a table. */
+div.calendar-container table th, .calendar-container table td {
+	padding: 8px 0;
+	line-height: 1.1em;
+	text-align: center;
+}
+
+div.calendar-container table body td {
+	line-height: 2em;
+}
+
+div.calendar-container table td.title { /* This holds the current "month, year" */
+	vertical-align: middle;
+	text-align: center;
+}
+
+.calendar-container table thead td.headrow { /* Row <TR> containing navigation buttons */
+	background: #fff;
+	color: #000;
+}
+
+.calendar-container table thead td.name { /* Cells <TD> containing the day names */
+	border-bottom: 1px solid #fff;
+	text-align: center;
+	color: #000;
+}
+
+.calendar-container table thead td.weekend { /* How a weekend day name shows in header */
+	color: #999;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar-container table tbody td.day { /* Cells <TD> containing month days dates */
+	text-align: right;
+}
+
+.calendar-container table tbody td.wn {
+	background: #fff;
+}
+
+.calendar-container table tbody td.weekend { /* Cells showing weekend days */
+	color: #999;
+}
+
+.calendar-container table tbody td.hilite { /* Hovered cells <TD> */
+	background: #999999;
+	color: #ffffff;
+}
+
+.calendar-container table tbody td.day {
+	border: 0;
+	cursor : pointer;
+	font-size: 12px;
+	min-width: 38px;
+}
+
+.calendar-container table tbody td.day.wn {
+	text-align: center;
+	background-color: #f4f4f4;
+}
+
+.calendar-container table tbody td.day.selected { /* Cell showing today date */
+	background: #3071a9;
+	color: #fff;
+	border: 0;
+}
+
+.calendar-container table tbody td.today {
+	position: relative;
+	height: 100%;
+	width: auto;
+	font-weight: bold;
+}
+.calendar-container table tbody td.today:after {
+	position: absolute;
+	bottom: 3px;
+	left: 3px;
+	right: 3px;
+	content: "";
+	height: 3px;
+	border-radius: 1.5px;
+	background-color: #46a546;
+}
+.calendar-container table tbody td.today.selected:after {
+	background-color: #fff;
+}
+
+.calendar-container table tbody td.day:hover {
+	cursor: pointer;
+	background: #3d8fd7;
+	color: #fff;
+}
+.calendar-container table tbody td.day:hover:after {
+	background-color: #fff;
+}
+
+.calendar-container table tbody .disabled {
+	color: #999;
+	background-color: #fafafa;
+}
+
+.calendar-container table tbody .emptycell { /* Empty cells (the best is to hide them) */
+	visibility: hidden;
+}
+
+.calendar-container table tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+	display: none;
+}
+.buttons-wrapper {
+	padding: 5px 5px;
+}
+a.js-btn.btn.btn-exit, a.js-btn.btn.btn-today, a.js-btn.btn.btn-clear {
+	cursor: pointer;
+	text-decoration: none;
+	min-width: 60px;
+}
+.calendar-container .calendar-head-row td {
+    padding: 4px 0 !important;
+}
+.calendar-container .day-name {
+	font-size: 0.7rem;
+	font-weight: bold;
+}
+.calendar-container .time td {
+	padding: 8px 0 8px 8px;
+}
+.time .time-title {
+	background-image: url("data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdlJREFUeNqklUsohFEUx7/5kgWGjEcRJULJSmJhITQLr8UoFko2k2SDLGZD2SglJcXOxo6Fx0ayUt4jWXgNG2rIwsgMJZPn/+o/dRvfa8yp33zfPfecM+e795x7bYqxtIAaUA2KgA3cgn3gBcsgrMQg3eAAfJtwBYa0Atg0dAugg+/3YAUcgkvqCkAVcIIy6raBCwT0/mRdymYG5Bt8VQoYBe+0Pwdpik6mwuAVNMawbJXgmr7e6FVokzKt1XBOZnYuneB54Jn+w/LEMZXTOo65nN80yNxNmyBIF4o6Ku6AXccpmzbzJstyQbs+FT/1VC6CFyU+mePTqbIBhBwp8csGn8UqO0qIz8AhstNBk8BP4As4RGCVyk8LgUVVlFvIXFXZ+4qUuZY8gn6W1QmYBKkadklM9PfLJriTYxYyEYFXpZp3s8Yj0kv9mhi0cuCTlsVMuqRWbpL0Xuo8YpAotaQnhgoQSzEAMjhuZoywfMb0UCmyKP1HmSXzJBQxpqIn9zhxA0piCJoFdqXu/bOpmeCMBiF+ZoJJ0E7gp0/AKCF71M1xCkZ4NRWSCjAIdiQ7v9UlHAcPUdfQh1QJEd7ArOg0K1dTRHJAO2hg8zhoH2IVbYElvaPgR4ABAFM/gtHnpJfxAAAAAElFTkSuQmCC");
+	background-repeat: no-repeat;
+	background-position: center; 
+}
+
diff --git a/core/media/system/css/frontediting.css b/core/media/system/css/frontediting.css
new file mode 100644
index 00000000..adb5226f
--- /dev/null
+++ b/core/media/system/css/frontediting.css
@@ -0,0 +1,33 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Module edit in front-end */
+
+.jmoddiv.jmodinside {
+    position: relative;
+    top: 0;
+    left: 0;
+}
+.btn.jmodedit
+{
+    z-index: 1001;
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+html[dir=rtl] .btn.jmodedit
+{
+    right: auto;
+    left: 0;
+}
+
+/* Menu edit in front-end */
+
+.btn.jfedit-menu
+{
+    z-index: 1002;
+    display: block;
+}
diff --git a/core/media/system/css/jquery.Jcrop.min.css b/core/media/system/css/jquery.Jcrop.min.css
new file mode 100644
index 00000000..40c7966d
--- /dev/null
+++ b/core/media/system/css/jquery.Jcrop.min.css
@@ -0,0 +1,6 @@
+/*! Jcrop.min.css v2.0.4 - build: 20151117
+ *  Copyright 2008-2015 Tapmodo Interactive LLC
+ *  Free software under MIT License
+ **/
+
+.jcrop-active{direction:ltr;text-align:left;box-sizing:border-box;-ms-touch-action:none}.jcrop-dragging{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.jcrop-selection{z-index:2}.jcrop-selection.jcrop-current{z-index:4}.jcrop-border{background:#fff url(Jcrop.gif);line-height:1px!important;font-size:0!important;overflow:hidden;position:absolute;filter:alpha(opacity=50)!important;opacity:.5!important}.jcrop-border.ord-w,.jcrop-border.ord-e,.jcrop-border.ord-n{top:0}.jcrop-border.ord-n,.jcrop-border.ord-s{width:100%;height:1px!important}.jcrop-border.ord-w,.jcrop-border.ord-e{height:100%;width:1px!important}.jcrop-border.ord-e{right:-1px}.jcrop-border.ord-n{top:-1px}.jcrop-border.ord-w{left:-1px}.jcrop-border.ord-s{bottom:-1px}.jcrop-selection{position:absolute}.jcrop-box{z-index:2;display:block;background:0 0;border:0;padding:0;margin:0;font-size:0}.jcrop-box:hover{background:0 0}.jcrop-box:active{background:0 0}.jcrop-box:focus{outline:1px rgba(128,128,128,.65) dotted}.jcrop-active,.jcrop-box{position:relative}.jcrop-box{width:100%;height:100%;cursor:move}.jcrop-handle{z-index:4;background-color:rgba(49,28,28,.58);border:1px #eee solid;width:9px;height:9px;font-size:0;position:absolute;filter:alpha(opacity=80)!important;opacity:.8!important}.jcrop-handle.ord-n{left:50%;margin-left:-5px;margin-top:-5px;top:0;cursor:n-resize}.jcrop-handle.ord-s{bottom:0;left:50%;margin-bottom:-5px;margin-left:-5px;cursor:s-resize}.jcrop-handle.ord-e{margin-right:-5px;margin-top:-5px;right:0;top:50%;cursor:e-resize}.jcrop-handle.ord-w{left:0;margin-left:-5px;margin-top:-5px;top:50%;cursor:w-resize}.jcrop-handle.ord-nw{left:0;margin-left:-5px;margin-top:-5px;top:0;cursor:nw-resize}.jcrop-handle.ord-ne{margin-right:-5px;margin-top:-5px;right:0;top:0;cursor:ne-resize}.jcrop-handle.ord-se{bottom:0;margin-bottom:-5px;margin-right:-5px;right:0;cursor:se-resize}.jcrop-handle.ord-sw{bottom:0;left:0;margin-bottom:-5px;margin-left:-5px;cursor:sw-resize}.jcrop-touch .jcrop-handle{z-index:4;background-color:rgba(49,28,28,.58);border:1px #eee solid;width:18px;height:18px;font-size:0;position:absolute;filter:alpha(opacity=80)!important;opacity:.8!important}.jcrop-touch .jcrop-handle.ord-n{left:50%;margin-left:-10px;margin-top:-10px;top:0;cursor:n-resize}.jcrop-touch .jcrop-handle.ord-s{bottom:0;left:50%;margin-bottom:-10px;margin-left:-10px;cursor:s-resize}.jcrop-touch .jcrop-handle.ord-e{margin-right:-10px;margin-top:-10px;right:0;top:50%;cursor:e-resize}.jcrop-touch .jcrop-handle.ord-w{left:0;margin-left:-10px;margin-top:-10px;top:50%;cursor:w-resize}.jcrop-touch .jcrop-handle.ord-nw{left:0;margin-left:-10px;margin-top:-10px;top:0;cursor:nw-resize}.jcrop-touch .jcrop-handle.ord-ne{margin-right:-10px;margin-top:-10px;right:0;top:0;cursor:ne-resize}.jcrop-touch .jcrop-handle.ord-se{bottom:0;margin-bottom:-10px;margin-right:-10px;right:0;cursor:se-resize}.jcrop-touch .jcrop-handle.ord-sw{bottom:0;left:0;margin-bottom:-10px;margin-left:-10px;cursor:sw-resize}.jcrop-dragbar{font-size:0;position:absolute}.jcrop-dragbar.ord-n,.jcrop-dragbar.ord-s{height:9px!important;width:100%}.jcrop-dragbar.ord-e,.jcrop-dragbar.ord-w{top:0;height:100%;width:9px!important}.jcrop-dragbar.ord-n{margin-top:-5px;cursor:n-resize;top:0}.jcrop-dragbar.ord-s{bottom:0;margin-bottom:-5px;cursor:s-resize}.jcrop-dragbar.ord-e{margin-right:-5px;right:0;cursor:e-resize}.jcrop-dragbar.ord-w{margin-left:-5px;cursor:w-resize}.jcrop-shades{position:relative;top:0;left:0}.jcrop-shades div{cursor:crosshair}.jcrop-noresize .jcrop-dragbar,.jcrop-noresize .jcrop-handle{display:none}.jcrop-selection.jcrop-nodrag .jcrop-box,.jcrop-nodrag .jcrop-shades div{cursor:default}.jcrop-light .jcrop-border{background:#fff;filter:alpha(opacity=70)!important;opacity:.7!important}.jcrop-light .jcrop-handle{background-color:#000;border-color:#fff}.jcrop-dark .jcrop-border{background:#000;filter:alpha(opacity=70)!important;opacity:.7!important}.jcrop-dark .jcrop-handle{background-color:#fff;border-color:#000}.solid-line .jcrop-border{background:#fff}.jcrop-thumb{position:absolute;overflow:hidden;z-index:5}.jcrop-active img,.jcrop-thumb img,.jcrop-thumb canvas{min-width:none;min-height:none;max-width:none;max-height:none}.jcrop-hl-active .jcrop-border{filter:alpha(opacity=20)!important;opacity:.2!important}.jcrop-hl-active .jcrop-handle{filter:alpha(opacity=10)!important;opacity:.1!important}.jcrop-hl-active .jcrop-selection:hover{}.jcrop-hl-active .jcrop-selection:hover .jcrop-border{background-color:#ccc;filter:alpha(opacity=50)!important;opacity:.5!important}.jcrop-hl-active .jcrop-selection.jcrop-current .jcrop-border{background:gray url(Jcrop.gif);opacity:.35!important;filter:alpha(opacity=35)!important}.jcrop-hl-active .jcrop-selection.jcrop-current .jcrop-handle{filter:alpha(opacity=30)!important;opacity:.3!important}.jcrop-hl-active .jcrop-selection.jcrop-focus .jcrop-border{background:url(Jcrop.gif);opacity:.65!important;filter:alpha(opacity=65)!important}.jcrop-hl-active .jcrop-selection.jcrop-focus .jcrop-handle{filter:alpha(opacity=60)!important;opacity:.6!important}button.jcrop-box{background:0 0}
\ No newline at end of file
diff --git a/core/media/system/css/modal.css b/core/media/system/css/modal.css
new file mode 100644
index 00000000..6959040e
--- /dev/null
+++ b/core/media/system/css/modal.css
@@ -0,0 +1,166 @@
+/**
+ * SqueezeBox - Expandable Lightbox
+ *
+ * Allows to open various content as modal,
+ * centered and animated box.
+ *
+ * @version		1.3
+ *
+ * @license		MIT-style license
+ * @author		Harald Kirschner <mail [at] digitarald.de>
+ * @author		Rouven Weßling <me [at] rouvenwessling.de>
+ * @copyright	Author
+ */
+
+#sbox-overlay {
+	position: fixed;
+	background-color: #000;
+	left: 0px;
+	top: 0px;
+}
+
+#sbox-window {
+	position: absolute;
+	background-color: #fff;
+	text-align: left;
+	overflow: visible;
+	padding: 10px;
+	/* invalid values, but looks smoother! */
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+#sbox-window[aria-hidden=true],
+#sbox-overlay[aria-hidden=true] {
+	display: none;
+}
+
+#sbox-btn-close {
+	position: absolute;
+	width: 30px;
+	height: 30px;
+	right: -15px;
+	top: -15px;
+	background: url(../images/modal/closebox.png) no-repeat center;
+	border: none;
+}
+
+.sbox-loading #sbox-content {
+	background-image: url(../images/modal/spinner.gif);
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+#sbox-content {
+	clear: both;
+	overflow: auto;
+	background-color: #fff;
+	height: 100%;
+	width: 100%;
+}
+
+.sbox-content-image#sbox-content {
+	overflow: visible;
+}
+
+#sbox-image {
+	display: block;
+}
+
+.sbox-content-image img {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+
+.sbox-content-iframe#sbox-content {
+	overflow: visible;
+}
+
+/* Hides scrollbars */
+.body-overlayed {
+	overflow: hidden;
+}
+
+/* Hides flash (Firefox problem) and selects (IE) */
+.body-overlayed embed, .body-overlayed object, .body-overlayed select {
+	visibility: hidden;
+}
+
+#sbox-window embed, #sbox-window object, #sbox-window select {
+	visibility: visible;
+}
+
+/* Shadows */
+#sbox-window.shadow {
+	-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.7);
+	-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.7);
+	box-shadow: 0 0 10px rgba(0, 0, 0, 0.7);
+}
+
+.sbox-bg {
+	position: absolute;
+	width: 33px;
+	height: 40px;
+}
+
+.sbox-bg-n {
+	left: 0;
+	top: -40px;
+	width: 100%;
+	background: url(../images/modal/bg_n.png) repeat-x;
+}
+.sbox-bg-ne {
+	right: -33px;
+	top: -40px;
+	background: url(../images/modal/bg_ne.png) no-repeat;
+}
+.sbox-bg-e {
+	right: -33px;
+	top: 0;
+	height: 100%;
+	background: url(../images/modal/bg_e.png) repeat-y;
+}
+.sbox-bg-se {
+	right: -33px;
+	bottom: -40px;
+	background: url(../images/modal/bg_se.png) no-repeat;
+}
+.sbox-bg-s {
+	left: 0;
+	bottom: -40px;
+	width: 100%;
+	background: url(../images/modal/bg_s.png) repeat-x;
+}
+.sbox-bg-sw {
+	left: -33px;
+	bottom: -40px;
+	background: url(../images/modal/bg_sw.png) no-repeat;
+}
+.sbox-bg-w {
+	left: -33px;
+	top: 0;
+	height: 100%;
+	background: url(../images/modal/bg_w.png) repeat-y;
+}
+.sbox-bg-nw {
+	left: -33px;
+	top: -40px;
+	background: url(../images/modal/bg_nw.png) no-repeat;
+}
+@media (max-width: 979px) {
+	#sbox-btn-close {
+		right: -10px;
+		top: -10px;
+	}
+}
+@media (max-device-width: 979px) {
+	#sbox-content {
+		-webkit-overflow-scrolling: touch;
+	}
+	#sbox-content.sbox-content-iframe {
+		overflow: scroll;
+		-webkit-overflow-scrolling: touch;
+	}
+}
diff --git a/core/media/system/css/mootree.css b/core/media/system/css/mootree.css
new file mode 100644
index 00000000..b60f4185
--- /dev/null
+++ b/core/media/system/css/mootree.css
@@ -0,0 +1,28 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.mooTree_node {
+	font-family: Verdana, Arial, Helvetica;
+	font-size: 10px;
+	white-space: nowrap;
+}
+
+.mooTree_text {
+	padding-top: 3px;
+	height: 15px;
+	cursor: pointer;
+}
+
+.mooTree_img {
+	float: left;
+	width: 18px;
+	height: 18px;
+	overflow: hidden;
+}
+
+.mooTree_selected	 {
+	background-color: #ffc;
+	font-weight: bold;
+}
diff --git a/core/media/system/css/mootree_rtl.css b/core/media/system/css/mootree_rtl.css
new file mode 100644
index 00000000..abd28f98
--- /dev/null
+++ b/core/media/system/css/mootree_rtl.css
@@ -0,0 +1,8 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.mooTree_img {
+	float: right;
+}
\ No newline at end of file
diff --git a/core/media/system/css/system.css b/core/media/system/css/system.css
new file mode 100644
index 00000000..f12ec0ad
--- /dev/null
+++ b/core/media/system/css/system.css
@@ -0,0 +1,69 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* System Messages */
+#system-message {
+	margin-bottom: 10px;
+	padding: 0;
+}
+
+#system-message > dt {
+	font-weight: bold;
+	display: none;
+}
+
+#system-message > dd {
+	margin: 0;
+	font-weight: bold;
+	text-indent: 30px;
+}
+
+#system-message > dd > ul {
+	color: #0055BB;
+	background-position: 4px top;
+	background-repeat: no-repeat;
+	margin-bottom: 10px;
+	list-style: none;
+	padding: 10px;
+	border-top: 3px solid #84A7DB;
+	border-bottom: 3px solid #84A7DB;
+}
+
+#system-message > dd > ul > li {
+	line-height: 1.5em;
+}
+
+/* System Standard Messages */
+#system-message > .message > ul {
+	background-color: #C3D2E5;
+	background-image: url(../images/notice-info.png);
+}
+
+/* System Error Messages */
+#system-message > .error > ul,
+#system-message > .warning > ul,
+#system-message > .notice > ul {
+	color: #c00;
+}
+
+#system-message > .error > ul {
+	background-color: #E6C0C0;
+	background-image: url(../images/notice-alert.png);
+	border-color: #DE7A7B;
+}
+
+/* System Warning Messages */
+#system-message > .warning > ul {
+	background-color: #E6C8A6;
+	background-image: url(../images/notice-note.png);
+	border-color: #FFBB00;
+}
+
+/* System Notice Messages */
+#system-message > .notice > ul {
+	background-color: #EFE7B8;
+	background-image: url(../images/notice-note.png);
+	border-color: #F0DC7E;
+}
diff --git a/core/media/system/images/arrow.png b/core/media/system/images/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7bfcb0803b8ae4002bc59c4945ea920aca40b63
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1SIo6Pjm-TY$ZW{!3_UF&^$uA7AT_N>Eakt
z!I=D`Us^!(`k@AYzK()Zjsj(t7D}=58{e@osIIt`_rv39B2X=Zr>mdKI;Vst06c;n
A`~Uy|

literal 0
HcmV?d00001

diff --git a/core/media/system/images/arrow_rtl.png b/core/media/system/images/arrow_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..924ecc79bd0cff89673cbd7a12c8f222219f816a
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VN}eu`ArhC96BcOxxPR!w`~^&V
ox)Qhww4A~mW_r5p=A8bX!EUF9Vg=)t>p;~Ep00i_>zopr0M@q|(f|Me

literal 0
HcmV?d00001

diff --git a/core/media/system/images/blank.png b/core/media/system/images/blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1c6726e8f40fe7c702b2c06518122b7584b03d9
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^u0ZU|2qYM8ES>TaNHLWJ`2{mDGEVus4#*Snba4!+
nU`+mVo`KQcT`7Bt=_w|Lj+*Ju-UoeT2kG*3^>bP0l+XkKrE(ZY

literal 0
HcmV?d00001

diff --git a/core/media/system/images/calendar.png b/core/media/system/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..586bc28ed06b0a6af93f67c5649f1a58ac1a7ad1
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006PNkl<Zcmb`F
zgR>t=5P-kkeYRuUwo9?CVvKTZ>%WNYq!8P-eRr|-+nJs$>Q(IP#Y_*rCVwjyz=GXR
zCmKV4ZKR-xpaqmaYJYA}-uUs;Xl2kMM`rddT{{Xuj2Yg!c5)WKA(NL~tqc$VJX&x$
zan%qo2DAdv;JV>F@*dm>ymy1O*Q2+4gO2?KU<k!P{%jBxent^Oe1P|<2%P^H09R=~
z0<?Tg$v+RlNa%@3=!wo9fjoHth<plAA%G=Crqi=w4$Jr5r(1(OtT^z1uJv+Qb?`o&
z>*itIq5HJ2lZUr2-hJ+Ys|7KJC<j(~mmJ4t^}z>$zV7e?_T8V(?zMsuA^O;4$`wc;
z;)Vb_Hv|LT1&hv}#V8v()y*N=8{5~;!L}UAlqiX9JG82iCoHX!&pj|gaB<_Yha7%1
zk3*Xc#`o&PDDR@hjhnY{Jir<+i~^}PhED-Xg2T}cw5XQNfz437NKvlex*6z>HI}+%
z(h+UAa_>1ADX}ERMtuxHNl0^Si>;>~0dV8iEi5dypMHcZAY!=s&vVj}V#rE~3&Q?b
z1*I^AAvCL$MU*p=rWLc;b@mZWym9rxhg`e&g4DzqvQy&%m}B$N16PM3R4kmtzfay$
zB2PRw{(D7%^cXJPdG5swsh;JWwD{0d$MPZaNh6tkQ<hw*8qt#I*Vq5Fk^ro<;#>0U
e<+~01AMyb~u`?HDzjjFg0000<MNUMnLSTZiIv1k=

literal 0
HcmV?d00001

diff --git a/core/media/system/images/checked_out.png b/core/media/system/images/checked_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ad8f25ac9b91450d04d11ddc06e2ac946567beb
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003^Nkl<ZcmZRe
z2}sQ?445!=#{HeU_xxYBa`pf6x~BbZ0igy&YA#BcF?YfLvf4(Fri7T3%z|Yr*Sue{
zV%2*fUxA<j3zx2ZpO~4qA6e|;rOOH{)~tWOeD&J-cr}A;SiEA*e;^%zE>}_CGXMC=
z)B6b-;4pdSy#F8?U9P;Yxq+Yoc22JS{gbEtpE7O6{CV@{H_V(l3ykN_U(hgP_T2po
z7caf<;OH8FRkN19k;C?6mj6eynEs#2WBq@zg!BK6D&GGO8U+78Zxj9hu1Dhk=LypP
zCG~Cg<8=Ox6jp);=sE}DHegRW2SEcW8d`B1P+Z;c9~e;o@87@w|I)=v|4*Mf{r}AA
zGygANy8Qpag9rZ)9yvCw4Ny=~Gl)q_`@dt?p8pqtnvWhi`hVZP{r~p^@v)=F{$Bzb
kvT4iq|50(t`>C390S?GQXGt5v;s5{u07*qoM6N<$f>&I`RsaA1

literal 0
HcmV?d00001

diff --git a/core/media/system/images/edit.png b/core/media/system/images/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0a2e085ee5defb05b03b0af9a8794fd3ac15dd7
GIT binary patch
literal 424
zcmV;Z0ayNsP)<h;3K|Lk000e1NJLTq000sI000sQ0ssI2*{m4=00006bW%=J0RI30
z0RM@=FOUEL0bNN%K~#7FrP3L^^e_+r@ZjR&>W9U})y0R!>ce6&8Z0hGgM)*kgTcYk
zU@$mey6?WP{F*!eoOR~x7vJ9)vt-f7kFydBq@>{>VT9$DkltY;YR^J5tIZT9V`n(D
za6-Sl!}3dJot4sXZ^_y0^z1OkZ?Tqxp|jQ5<ltrqYeM3$Sgnoz-LZ0Z(Feb#OH5xe
zP2Jq>kf$TDULt(W8Xb+D#a*3t6oQoY4OYl_Z@9B{C-acAYN-i2U(FeD{($jld2euN
z{=mU&wNhGVi}&3CA~C;sx7I&p%O}hIJ_cQmDymvVON=ltopEP?^p=t3(d67N1BW?F
zVV3^&gFP@pdc&%aNwmDud?G*=rR#t9z;c)G{9HnqmWjeG0bGAhxnn7z_u<2TG9!fX
z%t)do=M6|N)s_JJf*-P0>-P0Rvz~8h+sXj+4g)0bS0C=a%a-~V-#q)6p4flb&c8%i
SH<HKz0000<MNUMnLSTaMfXy=i

literal 0
HcmV?d00001

diff --git a/core/media/system/images/edit_unpublished.png b/core/media/system/images/edit_unpublished.png
new file mode 100644
index 0000000000000000000000000000000000000000..ade6f889ba738a0196b9c4335099ecabb0bfdf35
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq000yK000&U0ssI2Pa`W)00006bW%=J02cuM
z0009#64?L%0nbT9K~#7F?b9`QTQLv-U@e6$qq~)9DU2Sy7pKBfT*}PM%*@PY_Gi6v
z7>sgFa+zuJWz+QxVNTZSd;Ii^?!<Je_eWpwe=MS9GFsPkgv&%Fzh^WK+9Ri##ezFV
z7k71trHo<o0`-{vJNu$!lhvpLsDB1)tj>;cv<_RAFMt1(%mubeF_U7p%oV4-2Y8Pg
z*et~kDdtdP&l&Gt+>?mZbqoJRHFRkM_I}xX<@nv>TV89vZsEHDBv}~q#K*5?h#PO6
z=`J3>4rr<RZ^40&fA8U5_#nEAwIr6zRQ(rY|1&t|wvg$%KOZHx-Sc=HR5SA?(ixt9
zSrOK4SGvcr`9&%IkdXaKc=MVyB%LNxA`)#c&QM?a0rcB($U>y>PIxS1GWO@U{E`;N
z$5%G5T2jh2!rWnMA8RR?eq0&0;Mi-h*j4%^RZGc7$KA_k3Ya8!xjMkfKUeDTNV(FV
z=hTI)&gCghs(@+OH0BP|(-{!6PTgH_o1~wNs3~Hn<KFJwTe`??V|lG%!)|A(pXMn<
z9WnX^zrQ-4+@sFBz<&Yg$ZZS-^hj6C=C0gt>JZa1967Z4$j;nx=0N`8P>W;prX_c;
cTy3oX54_*p_E1^Pp8x;=07*qoM6N<$f}sQjQ2+n{

literal 0
HcmV?d00001

diff --git a/core/media/system/images/emailButton.png b/core/media/system/images/emailButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..79add119b799f627977ff6621dd0df8e0170b725
GIT binary patch
literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0JTX(K~#7FWB5-ZppS;d!~s7)KZFJ}WB&a8_x0!Bw_pA|dH3titDhGh
zfA8J<0jGw4|Nj5{{qMuKKQBK1zW?Uer$qk`F8WwBq%3^ewD}c~grL`-|2%yA>)Nv)
zK-KTe70@+cb<C}oAjcfN^L6j_FZgVLFz&wkdGYc0llQ*uyYXe)<<ICE;7<Sa{qM_9
zK&OKobL#%LL$|)}y!v_Lg-_@jfPDN2U4tKSfaI7SoEiY~sgzX9rnAcc0000<MNUMn
GLSTZ~jDU>*

literal 0
HcmV?d00001

diff --git a/core/media/system/images/icon-16-logout.png b/core/media/system/images/icon-16-logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..db03e83803f6582700af2821e92483407201c69c
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004MNkl<ZcmbW0
z19B_@5QcMvwKukH+qRF8Bjg5qggC{h6kDaJ6g$th-~W0&PV%Pe8~ok<jXeMeQyUab
zWV;aQ<A;^L-Dn8AL`yW#77Mh;0WDELWB5A~^-*0WDxhK?>Vtu5f1tt(D05-Y?6pgj
znxlDwKP4s$3Gl1fC<zT)h3~!>8e}fP=K_87uM!i!6zEy}{rmye<!f~iEB{HNZ-s_F
zm*8W*zK_8BJRJ+C;6r5~ulAWlZ*sLVo8Wbh=JHjJ7F?Wy*X04c8qHX@**3w`EH&;j
zRXqMU1W!wRc{Rt3U2u^qhY){0*#%dHUJ&WA3yxCc%LLfC1t$ew+?t(aS+q^Co2=;B
zO;&=-Z-?L@--lPDnM>DO*iKT)Hj-5D){|6tDAeE0`jF-l)zveJYCHt$?GyZzrxLZ*
z;|bb#1jLv~&{!mYrqOt<Y&cHaI~1qg8;aM#!6jvVqw%_I@xSpu`3H4qaA|W4F<k%v
N002ovPDHLkV1mT6z6$^V

literal 0
HcmV?d00001

diff --git a/core/media/system/images/icon_error.gif b/core/media/system/images/icon_error.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f3dadeed1f95bdab88e316f0c4b45f16ce525137
GIT binary patch
literal 313
zcmV-90mlAENk%v~VH5xq0Q4UK#z-0eOau63Q0s<f|1$#1D=Yv1{`;bfp%Dt&0s!7R
zIoEJG{KvELIXCJ60R28B{}%)LDkrNT68~Njt~xaSj6eMJ>((X!=|w-pUMk=f0R7v|
z{N>J?9uNBJ;Qs;uEC2ui02BZe06+!4;3tZaVxDF*icK~JL1h_qZ46_gut)-}KnDUd
zickg>m@+_ULI@g(sx@g2Y_>ygM><v};1}%DQL!?~35Ujb5DqlU;{(xAVNHf@6ItmZ
z5*m3l2R~N^d>=w)A{admkdX;PKt&V_n3)Rz9YjDzNK1H4WM-gA6$}SVO$Q7D5D-xf
zcWO1NHF6?$E_eeoS$+z4tyl(yTMZIS4<0oKhcsq7AId%t&_5yq2XjK6JU*3*l;aHr
L=;`R-A|U`fgcNfo

literal 0
HcmV?d00001

diff --git a/core/media/system/images/indent.png b/core/media/system/images/indent.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7dc01a0635386662cb0285693b5909ad05db27c
GIT binary patch
literal 89
zcmeAS@N?(olHy`uVBq!ia0vp^oFL2rBp8nViaZ0Pm`Z~Df*JltPgL3p<OzAYIEGX(
kCja1PUa}#op<#j*!`n%IM@&!j?*!@bboFyt=akR{0DXlRVE_OC

literal 0
HcmV?d00001

diff --git a/core/media/system/images/indent1.png b/core/media/system/images/indent1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ad8acdd0d24b277aa6d8246b8e6fbdf073ccdcb
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^oFL2rBp8nViaZ0Pm`Z~Df*JltPgL3p<VkqCIEGX(
qCja1PUa@AH7?0SD-h_ui?92>aW?pX$C-uDq>GX8<b6Mw<&;$VRs2J@4

literal 0
HcmV?d00001

diff --git a/core/media/system/images/indent2.png b/core/media/system/images/indent2.png
new file mode 100644
index 0000000000000000000000000000000000000000..52dfc7baa503d8978196d8dbe8b7119327e79d51
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^oFL2rBp8nViaZ0Pm`Z~Df*JltPgL3p<VkqCIEGX(
pCja1PUa>|@p<z=)hXMCOW;O-}3r_~yX%a>tou00KF6*2UngGXO7GMAX

literal 0
HcmV?d00001

diff --git a/core/media/system/images/indent3.png b/core/media/system/images/indent3.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9250c844f63b995f566fa3269da1cfef41fd315
GIT binary patch
literal 97
zcmeAS@N?(olHy`uVBq!ia0vp^oFL2rBp8nViaZ0Pm`Z~Df*JltPgL3p<VktDIEGX(
sCja1PUa>}uWi=}|H-}+_LqiT1L*z8C!ke`Ve}nXTy85}Sb4q9e000RXvH$=8

literal 0
HcmV?d00001

diff --git a/core/media/system/images/indent4.png b/core/media/system/images/indent4.png
new file mode 100644
index 0000000000000000000000000000000000000000..be88c8797f627228aca07edd5aee7126f0ec9538
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^oFL2rBp8nViaZ0Pm`Z~Df*JltPgL3p<cWB?IEGX(
lCja1PUa>~(Qlvve4j04H2A^2#Qk52vE>BlKmvv4FO#q6d7X|<T

literal 0
HcmV?d00001

diff --git a/core/media/system/images/indent5.png b/core/media/system/images/indent5.png
new file mode 100644
index 0000000000000000000000000000000000000000..be88c8797f627228aca07edd5aee7126f0ec9538
GIT binary patch
literal 91
zcmeAS@N?(olHy`uVBq!ia0vp^oFL2rBp8nViaZ0Pm`Z~Df*JltPgL3p<cWB?IEGX(
lCja1PUa>~(Qlvve4j04H2A^2#Qk52vE>BlKmvv4FO#q6d7X|<T

literal 0
HcmV?d00001

diff --git a/core/media/system/images/livemarks-rtl.png b/core/media/system/images/livemarks-rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..0500d7d7d40bee2ddb35f227d1a2a76c88840f7b
GIT binary patch
literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006?Nkl<Zcmbu8
zQ-JkG6o9`;vUjt&xog|DpZZ$cdaG?e)wccHMs3@+eXS&uOl`McJelKj_`e8%{EESr
z^gExuocSnj$()2hfe!?~zLW$52$yNuFN#Y?`_GNOWdNk#`}}2H3#{guI&eI2B{-5G
zFG(joMEe#{HAp%eprhcfi>>Nd{5hcMdj+2)tmfHz@O%K2f=oU@jvkLadoV`06o3fd
z^TqAwl8FXIfNcQyZh#QtC*k)K7S(&)iCsU8n~w3`-8b?1qbpIV7`7hJ=6j?R0Gh!s
zP{3FDFxC#sDf&h@@%nw_SMEo3>TM!fNj?p>0P`188o$7C0*p;ArmB798;kSsmu!jd
zC2+R7p2%rY>aSCnN8N=|{DkpK>tC9aH1=(Y8+{M+@l$Z^X6(H;Vpg`2PsT_*e>eJ@
zcTvJ0DDb4BpkrqMGWVX0%)~MGT>G8yJ9phge&rD~8%YW!2=NCY#8Vz+y<6a<<7gk;
zN~&%%BF!Uw@#4K$8~3HBB!w#>;{p7Eg3qIpP`H%jN6!-~5M(2R0C<mHPE|xB(Y_63
zS13xZRd|D&{a%5v8v)RS00oXz0F)akqz{>nZTXR8_1Lc!=phX|_?UM#oWw`BoJfHo
zFrPk`SC26<K7IgQ1Mm6O{D|?<Q)uEBv+(5^Wf{%Vt&$oG;d%&9q8tg1|J^sP#LG(F
z{8$kRpj-oAk*k`|fC2D%N*k^8+~+=cKVIbL{68J0!T@wYY9e>xOKM9X5Wfhe46p%>
de?|bLzXot44E@w(?AZVS002ovPDHLkV1g0jEsg*H

literal 0
HcmV?d00001

diff --git a/core/media/system/images/livemarks.png b/core/media/system/images/livemarks.png
new file mode 100644
index 0000000000000000000000000000000000000000..e26426240a64943f7eb848ab99ab0c46f76516d5
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006>Nkl<Zcmbu8
z1F#-z5C!MOww*$3CxzIyZQHhO+qP}z#m;YDo7?#+dl7T0dO4?ODZoD=?oD~q*rum?
zVHolsZ~6!d-u?ii>ak8w`RefK?3qL)E+Ar?lKh3&++;WoHpF^)7Ov~F3A{a?fCHro
z-<<_*Z&vsWZ`Es<nEaiHWLCr#Lti0sYX;tIZ^hRYY`%)${z^n{%Lv<bv~3ws8AK$%
zB7wZ^CTQ!^;8>QOI}56Eb6yo5Y#W59;UUrGdAt{4Yf{68G@wu!M5M4T=pwKx1>wt6
zV4Il)`^=;SEl!SORuYT{hY;-V4S;2DHzHT00M)B9p9wk$EK<Qq35l*C>qC6^G$(LQ
zVqVQHL9m|}06uF=qp4n%`ApDGU`|5Z<KyD>`~r^G_lYj|$w~N6iHC95KwbRyBH^>*
zqcWcf+6YXIgEl1&K@<MNI7qlKsscg!R9x#D;ut1)zSYG(vvZ>|p9xwC+BhM2l;9XB
zgpXC*BZXVz$^qbSxKF@v!MeRK0KNzMqcWcfS_uAXYKTdn5Mg;hxSD9~DL7x=1Hjx}
zZO^L!fPMd1-n95!&`fwcAU&U#vzrjqNAP@f4uHE&gun%50kG~G#hWId2@FjHdpp7J
z&0PRO-rplg2_kw5=Dw-1O)80B7r|#}8lLT#iFI)k-hVEzwvty~tpu0iPEEmI$ut!}
zq3M7kva=A>UU0V*)Kwc}1c&QLrVmZzy`h0RQUB+B>S-*-N|~if%%`j>t|GI3Kv{o}
c{Lw$tM<G~J4Tq(AjsO4v07*qoM6N<$f<Vh8DF6Tf

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_e.png b/core/media/system/images/modal/bg_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..da14a34e892e7e790dc66bb7bad0cc95bdadfed4
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^ia^ZB!2%?IIr3iuQp%n#jv*C{$tecu2}wT=e-Q8Z
q&*&-ehyB?91z+kF+9qcR@G$HPl3`vtJ7gYEIfJLGpUXO@geCw2r5cm~

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_n.png b/core/media/system/images/modal/bg_n.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e2a38207213ceace6f92932dc5b569dd5ebd812
GIT binary patch
literal 97
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfx!2%?w?vMBb;&{3^hEy;nCncmLB{V3yad0LZ
uIPNew!ji5qS%BrS(c&(H#S;yV#WTqLXY8E(*|!a-hr!d;&t;ucLK6TiLK<KI

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_ne.png b/core/media/system/images/modal/bg_ne.png
new file mode 100644
index 0000000000000000000000000000000000000000..621176b2497180774637995c8badb29cd1e5ca23
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq001EX001Zm1ONa4+TvR*0003SNkl<Zcmbu=
zi*5o@2!!E*eg8LBdp%^5KV+)*(7WXegYMcY{qwY>LcKxoWGoQ@i|46bBnG>9k7>6L
zmY75c&=UyOX(%v2Fohv-0RgeZ;50-)hzvr-(`;oZBAkOkz(j<ED<ho4M6=mH1;oU8
zk+<3mT62(txH%wzio2Ld<|2Y118^3$<shDALE;<-FrgKRFR*FvnFq)m%z_|@VPp@p
zuX8FQU@(Q_7;z&4kud-SS53bCUMo^Aw)1E2f-m&q*o?&>Mi^*sED~5M^7Ew*5bges
zRq}GfIxmEnGP8$?LHfA}oPv|&_ZNRhvjIk6d!-jRkhBR9;qAc9q~u*(d}a_tpg`Pz
m>T&AhyUuq>^L>6==BQ8J^b_;9MzVGQ0000<MNUMnLSTX)tB{-k

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_nw.png b/core/media/system/images/modal/bg_nw.png
new file mode 100644
index 0000000000000000000000000000000000000000..d82692680d069eb0f9f4bc73f96f8bc18f0fdbbf
GIT binary patch
literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq001EX001Zm1ONa4+TvR*0003FNkl<Zcmbu*
z32wtc3`5bOCig#b_X-3%->?cNZM^D<lGf9Y{!i%k#<Xxw=#f55C_PW72ifGq91tBf
z1_THeXkN}KbQ3;{hlD6ao@)j~|D>2;z~_ccOo6;7CJ^BMeWp1O{|(i8zajw0{yv(R
z09n572n6CN8U!)`P)3~MIs*YlYN=B|hJ+5FAjM6Fx&R7@$l%{PfI=cO!0H+>Qn3r_
zetiD`P4F0AAOlUTlW+zepaO^#%|Qn44@8%HiS7^Gk;pMzoaKGo-)H-haA}0k1RDtV
zHxR{r+(<-!903y4dL_YQ)IsbiQT>m=&)H_8`ajCGb`aZyaG4cjnDGA(@*+Z}U<^Xu
ZKLDI@6nqELF4zD7002ovPDHLkV1izgg%bb(

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_s.png b/core/media/system/images/modal/bg_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..86f4a6dfb72f9ea4811715a774d8a04ae3d85d4c
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^j6kf&!2%>VZQwKkQtF;Ajv*Y;$q5E&NeO95Ke*lg
u2Y7NYZThcV_+PQ`|KS?~Y*I-L1`G=Y<eW>pi#G$cFnGH9xvX<aXaWEasu}?R

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_se.png b/core/media/system/images/modal/bg_se.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d3f832a3f76568c5351912d90eb9163ce845041
GIT binary patch
literal 336
zcmV-W0k8gvP)<h;3K|Lk000e1NJLTq001EX001Ef1ONa4{p||m0003ONkl<Zcmb7@
z3vPo@5Ci7{_v!ub7M?5dU0K#Df$+y;duccRSokp6k8MZC*}V!K_wsry8!LkaF|Ole
zlvTih`*nmbZ0wB3b1&Z0-JUby2$mq7Pz367Y)rW16~luAxxXW-_(pgQ8AgbTD6>$-
zpgMss$637tMi5{+Qh0`YvoeOVA~p$%dm5z@qWX&&KdUc}Fn~w*8Zv|fY>k7g2todP
z2y^L*I3UOO8jipK$2}LPQk%tgz-<0UV+yDMg&d0GEZ%-j66F*Qsemqn-W2=_@FG-s
z3+RiOlLP3!hzB><aL0gKifz7vwup($zX7PsA~<GPpCXQ}11NpeUf!l~?{DPtBENbo
irSK%ZJQwN3y}>^yQoOJSsZTrr0000<MNUMnLSTZaK9EHK

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_sw.png b/core/media/system/images/modal/bg_sw.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bf4ba690ff08b8369f584fab993f7165480f2ba
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq001EX001Ef1ONa4{p||m0002>Nkl<ZcwUXs
z0S<&93<c35-v7vUH!kZ0M}ZoQN__s-5+#0B9*^yNlylW~SI_Gj+qw2Q_HbpCi){6O
z0?Spsr3hB{-22h)4-){Ou%WXE;zEZw6TR(RB!Oab5JdJUJs<Y6BD!}4XO}u4{57Be
z5!0t&6G%MgApyjbG$LZ~EsxTTjB@m4_K^UbBli?!V3~3w&pFhLk$fXOyzEF71c+C*
zuR`Z_p98|6+E9u?Gah0$&MA^Guu$&=h+j?s5y}B#j-R@Mz=%r)ohAV(Xk!E>fMF(t
zUlhYQ7ZDh+IWcFfQfACS7+K3BVx57UcE3V>069-0i86>2=>Px#07*qoM6N<$f-)a?
ArT_o{

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/bg_w.png b/core/media/system/images/modal/bg_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..94c69d8016d2b97fc1008efda7dedfaed327de89
GIT binary patch
literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^ia^ZB!2%?IIr3iuQgWUyjv*Y;$tejb4GeB3Cs<lI
lCP|)Yx^Tv0LhD0&2DVR(R!7_?`v6rkc)I$ztaD0e0st{d7Rdkr

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/closebox.png b/core/media/system/images/modal/closebox.png
new file mode 100644
index 0000000000000000000000000000000000000000..279bd1a356e1d7440c2e70c6b0b149514e34f620
GIT binary patch
literal 1050
zcmV+#1m*jQP)<h;3K|Lk000e1NJLTq0015U0015c1ONa4kvV25000BwNkl<Zcmai!
z1C%6N42J*h>T2)S*!H}!XKmZIZQHiJd-QDEwrv}2ZC*}y-7%8xnF+qRm85RaK-xe9
zO*d_soTtmsA2gq~<mvKsWpXzy*w4}CghLW!7_!^Wi#nRJH)C=7k@E9Z6^YXmw<S!E
zjI_YOQHisfM77XITKYsC&wpyb@B2M3lPcb~|GMzx;1S6QVf+vD&^E?3>@=o?j83}T
z$$F>2e(`_f7k~eIOLl5WT&MygxP*qMni9e$W!yW&{|%An#(7U42dqJ@upjm~Z?N~B
zC&!m1DWNcl(*<g57uGl9w&CO^deoO}6QIx>`x`zYj!n!-Vcb}YOI(Rkn0la}?^~j)
z9?6O(RI=`N6U*7*afwivkQnEW3`<1Zf=+)uKzu5r&FUEsk@Y3qgcw+u(ttmPc41v|
zuT3Yi`xDd$F12@b2qelj(`5?$rL+F%C3<#iLMFmsfCPrkrnu3azP?U$(i2S2w-d{D
zH~8-~`;XkL^J-*{i|CK1QHWSRTMOnDC2c@I$2&yT>S@U~2L<s=Mv3L1I~WPK`Pd5S
zf>eY+2j;`0^M_6#`p;im-9SeW|1W^v<*n_+yWF<5i`(WP0tP^~MCDb?T0-=h57xT4
zi?IeM>wOHL-ES^JG>i<JV)HvpUqkevfYr(VaU%%taM$(U&G6}CC`BC13?nY8L+8ar
zfBNd8zXVVpiPi~y)k(B^r?C?8DlAu}&h-37BnG9}eo<>3tk%BBC0><(d02(>WdS2r
zuE?AE<#R+!)s$+7s8zJ?Hg7P}hmBv}$9R;9$BvSVv&J5|#BQ(2D(1P!CDmMv?QZc*
z&)JFYzaJx@HjGDwT>XHAH9x*B=GmN1<9e+>g|9_F<OWA2K|!jvbJ)yT=ZR&SvpKY*
z!|Ufx-;L?$EM5|RJrRpyX?XOyGl4a*rODGLJ6(*v_!`z=D2m1F$rl4*$UqlqYUr+$
z_Y%t|uCdNw^`cELbE6o23p+6dU63IzM&L>!2KneK%~AHvyZ49Bh{ff9*L~S_+4Z`M
zhr{yckB6SdKFmR1&J<TtECVE>1Oucwrk%KQ?1e8rp*r&ImsektuVN>o130U88HhE6
zP$Z!keK7@VjE8VVxvS^%8$a0i!GIUz@5L1y;##M0w3xH%tRaD$*qMlYbjC2uzzS^9
z?$sW|LG5167Pe-vw=?oNLoC3Cs}~Aala69e>yMF`fXS>A_^<x#DMmU+8?9b(I@b;}
zLOCTFS;*(~Qr2SRvz5%=P?&3LZG^M(6F}w^BTO)>YGO;zUOq99(~7idLYt8P0rfD8
U_!vD7<NyEw07*qoM6N<$f?Y2Tpa1{>

literal 0
HcmV?d00001

diff --git a/core/media/system/images/modal/spinner.gif b/core/media/system/images/modal/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..88fac73dca427cd918e7fe9fda891fa7517a0c72
GIT binary patch
literal 1569
zcmY+EeK6a19LIl&gya{AB*=qCo<s=|LPaR~l7xg(wkW|`YiE5rw{~4uyV^z7!@`E9
zE!Wyci*`1%;Z9Y{#6u08Q#Unbeb9O6`iOB<rS@yr-KGD1{(If~{dwJ69T_1D+)0MW
z&`kirFzo8;DwRrADphoJbbNe#N=iyvT3UK~`r*TeGcz-Da&ig^3W|z~j7DQwSy_2`
zc~w<aO-;?kix+EaYwPOj>g($p8XB6Knwp!NTUuILTU)PQz1r5+*52N3GMT!%x_Wwg
zdV6~Z1_lNP2Zx4+hKGkoMn*<QN5{s-#>dAeCMNFOxidLAIW;vkJv}`$GxOlVgU62_
zKY8-x>C>lkb8`y|3yX`3OG``3%gZY(E32!kYiny}v-#!Am+R~6ymi9X@OZ5<EH2zv
z>|=$3Ac*%IgT+Ds5+OGdk_<uCmrRv&f7pKnx1E0%r~F1wh7PnOd1XnmCuebMQIs=O
z+KUg-?1*Cmrum2@^}x=#d$uHP#G%ekUxz>-B4F{dAcdAsVTz+%sNqp=LM4kzb?{0I
z;Bz=G_C%7MC{enBL1!z)8|7O>CCWe^*>Uq0Hiat%awm$Q!Y#nx%ULG0cP#MSC7}pi
znBEk3;4eG{f*4FWj|O<uO^FgmZ@_hw%V@W@$d3a7t1&225%zWzB1Ax<=uDLdS8@bL
zRp&h$S9zEa=SjcQOoxu#d&`hP?>%l84+(L?P{oSw#38uvnG)ZZ+hDkFoWN&DomB1{
z<dF&i+llG(g@Qw;GbP0;KT#<Na<!+ITEJeFXb0gC*gFVJx6igjG4|Ke2Q0l*X_J%^
zsxR8(0y*`jcbvSB2|I`Wva)#TdR%-^Uw-%%TfLjrv4|Hc-ymgh01Tm-a)sDc6Jw|3
zaQJ>jl0?f$RtSX%!3ZVRRQYWApJ;=oN@V{ch5`Pp%I(?a3*b!(AJ-(x=?je>q56RP
z`&&@0ahx7+72}@1-1+BKf<tg*Hd&pWEw&}v(en1AQ7Ft;fbOiZNP<Ne1c-z%l1+Dq
z7U%IL9k=Y_=cl>fxy;hb*QAAxO|FHP9nNxoauxL_2-NktKHRL3+tnwy?RjN$+Zicb
zGBLx;8e@gaVDK}69D|}nX@oXnI|!S}2JYnGOe3(s;UE-Jn;n9SGu=fL!)KMH3elT)
zq@5g&on39$(Z3#Ol<^%)PSXVo@E&q6`cSTrjO&%y`>vBZRF7tVaM(pbqh&-VhzUFx
zAqs1hWVaY)*e%^*0kMXxkk*L*^>%P&;+jFh5-IyB8C89Gd22-x+jxV%#<UZ@hHgpN
zam}r}RX08}3%p8a=B_hHR|r*HI8^VY3$exkJaAWG^L(t>Di|LEwkj<cRuC2;ywWWJ
zF+lU%Wka79?r$rQS5mZ^x_EKLU22koLXf4Y!i;8VeRuaYSh%<Pnqmc?HdE6zP4_hK
zMd1P73XrfOB_HhxaOe<U8@@7RXFe_%1gR`g(Cfzjm+d&!DeDq(Mpw9449c$Sv=I6R
z#|_;ykAXDNy!>yu(vg~l-y8JRso0YmVQ5EkVH9_bWdmriPn;Xz0HU?r-}Ym*JU~Gu
z#H!z-Sig~NtEtil^EbXk5q|z4muDm>JIP0rwG7WD3S+9GBJ~;heG|L%tnJOt3;ODZ
z-=AxhB~Tm|@--{&wt!9Dq!z~jdjgQsj;d1ui)`r{g#3l@`Y+o|m4+ohb8%lK3Tosj
z`cr?TkjIV;SJxUp<&q1u2@<YDMAFp5Q@_N(Hn-0}XSd6nlOO3k%sQCQVR}c(NF>0f
zfjG4{K?pdGK(<f7l3QwqNc~1LEwXFBZXhM1Pt7M1Z1ZbJV=<TC(__Q1iE%Z0cMPos
z6PQnp=x%h9k`0*s&p#>syql%&93%2zra#Xu0BrOCKFA;`ks$&+<?9U!gEs#Q(Y_;Y

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mooRainbow/blank.gif b/core/media/system/images/mooRainbow/blank.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a7114b3bd6d5ea04df528ac757adc0baa1654871
GIT binary patch
literal 37
pcmZ?wbhEHbWMp7uC}3bv{K>*9!oa|w1H?cPMg|8aCKpBqYXD~R1VjJ;

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mooRainbow/moor_arrows.gif b/core/media/system/images/mooRainbow/moor_arrows.gif
new file mode 100644
index 0000000000000000000000000000000000000000..43c49b327fac41e2425456b7fd4001e10e5ea051
GIT binary patch
literal 92
zcmZ?wbhEHb)MVgf_{hZY|NsBI+<XQwQ2fcl%D}+HpabH8<Q<rFL-bajep}<zwf>eH
r^NpB$`2};YH9k|3dzm?D_ODILxu+LB-DmmW?zy<vKMUqEF<1itB5NY*

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mooRainbow/moor_boverlay.png b/core/media/system/images/mooRainbow/moor_boverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..b816711cae0e1fc904373903c42fa3bae0f321eb
GIT binary patch
literal 579
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K588}#g)VJz{w+swST%InDAr*{oZ!`)zIPfqW
zoc^ynjO9S?w$|DHGg2=ZXD>d({eblVcfuZqk_yHiaR&W{k4y>-+6N*S!CZHRu!fCH
z8-TD!v_Z6ip@3P!oFR;X=>TuS9fk--4hF^t9437ZYZzD>7zBXA=?gweb^z4@*$xaq
zSp^0b!kmW5K$RQ~TW)ZJtbk~BVEDlg=PdymtN^stfx&{QkR^!~XsUxEgG?jT0Y?NO
zR`xkSgv=T87(gzPW`MdC$kGP7l<fd7#1B9g7sz?;3J|9gt&pLB<q^jb6un47j0y}j
zY>$iufObLr-N5ic9%M67p@6I`U#;Pbgg)H=KX^>+m^U(k0$4Bu>c@sc<^*6s++jEd
z@|0-88lacgFeI}+U^R#X2hA}qaI}J=u|fP3(+t^vyBP#j%NEEm0D-5gpUXO@geCwH
C7=(rZ

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mooRainbow/moor_cursor.gif b/core/media/system/images/mooRainbow/moor_cursor.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9515a38e5f7ebe3c4d11ed9af8724cc2a443f62f
GIT binary patch
literal 80
zcmZ?wbhEHb<YC}pn8?KN=H(3r28RFt{{u<IpDc_F3``6<KsHd82gp{O(wr&%Kwct(
g`-t1hqc`8&<c!x)N-%Gmb|CZOM~BEo608i?0DUDGlmGw#

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mooRainbow/moor_slider.png b/core/media/system/images/mooRainbow/moor_slider.png
new file mode 100644
index 0000000000000000000000000000000000000000..55d24f5814c5553db915f8a0827b53752e3badaf
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^!VC<I3>-{A);;!HQa~!h)5S5Qg7NL?ot(@L49o__
z@Bcl1cAjq?YnEx9XS&Mr<YOkjmrZ;>mmO1I`q9T~S>`MtO0zA#WC#+zZ1UUEe(ppY
qYnZq{O#HQ_{mUMk%TQIff3nZKvZC~>de>y2oeZ9?elF{r5}E*(ggo;A

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mooRainbow/moor_woverlay.png b/core/media/system/images/mooRainbow/moor_woverlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..eedff1d7924e9435736ec3e57c97eb7631988ebf
GIT binary patch
literal 511
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K588}#g)VJz{w?NJ@PZ!6K3dW?L|K~rnXJ*!N
z+YsRCBX!W}gGSr`51;-|Ja%Y_XSnC8vn@5wdPl^c?MUV{cAIF(&AcGiN&;v~g2I#h
zz3*k#Nq9LkFbW`{3MK^x`XP=6hJi)&^D5S0HQ2%PhEemP)h1w+FnGH9xvX<aXaWGV
CyiRfe

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mootree.gif b/core/media/system/images/mootree.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b7150f613fd3cb9090bdc9a4529bcb9bb04a548c
GIT binary patch
literal 1492
zcmb`FYd8}M0EXAxIV4dhCt@v^bd}sf<B)jdFe=pvW4T7;5;AADVQgc$9Jg6ahA~O*
zp<#20WNx7~+pvh-np=;aozwH2^Y{EZ@1O7A_kKS<dxtBgX0Sbg3SbKX7~8DJu_1Ii
zy{+I@{(yi;Bn}P^MnptxuJGF1+qr|($=1giG|THRxvZ7qhK7ckw@>=%F)5fhA%AjX
zLsXQXUYFs7df<?OLyohGxm@nE0nFlbOCM)GzI%3MBxhML)I^CAO%=uYL&Re7SO<<m
zp{%a1jx@$kh-#DQo(n@cLZL9PC2He+;m3*I*X3T=XxH`m{>9+}+NxcCet!7fi!2ta
zs>~hp%9vdj(Ug0uxhlP588O+0+TB{6@55z1vYD8eSemN&^s(ndZ;^k?%xg-}%TI}g
z9S&=s#(U~grnkCy-AUWq+dCV=`r4b#^_2tF!81(U)`zE!+0eDI+*d{3xH$JwCe;^a
zkVmojGSgXAPFnoDg!vmLf1)X7?tS}ceH5z<{-Hggr#6w$<VIrr!DXPB<-yTD=9zI<
zcSVaO@8*&suB9V9a_DwD-#1qlIPn42ymz#fd3Jww_$+_MJJbL_VS{4L-3&Pc_!n)l
zg2y!%En8S5?C(ThjtPVL2H(^AACdpBF8P0iky`gc;g+CBpvzVO?OjPJ82|!s>c_?(
zH-X5Akq8tTA&p7FqLNebNd!DDBQq;I<w;I%c76`2i2Sq|U6?6dMlH_;%7Lrpypk#~
zv}$loZFyZ4{dq-YYeU-$Y<m~#<*O!YOMPQI`Us5u=&&CM0*y{__Vhf(ojK*Hs_Kj#
z9vPdM#P>2Xzcdz<d=+heEzQ^=d_#L4l*M@H{oFt(v<~IBksxyqhU6aTu8r-&o`YW7
z9ySQ#<b}_cf(&e&6Md8A)wBR|W^656*^{|^l|)sC5wK%MvAKZLpG6!Z+h|6*hLtU-
z83)%~KM;Wh4tS~?;SF^47KTl)=9#)YvDY6Z=UIGr2Oqj$@gm(k3Ty~Z#x`9La}okd
z2@JBOrussNw<Nw$DRr_n$so68${`?1$78TL8QeoS_Ny~*hYf!N)4yB83HaKpQ|!vr
z+l3{ngv8vY-FPct%F!@s$WTy0ec%=H>EDD-G=D<B4ETHU(LHup59=2VFH)OH*}PnV
zF6vB?GWi6w?pVn|iqR3!G`Yh_OR2GVX{v<BThZ8y<aO}}E;)(A1a$->RR*yvO?=XN
zlGm+f?_!H}JDpG2r!d=mrBmzMdXto*zKDoEB%ulOKoEJo{fMJ}TO}#krt6YG$3BLX
zjI@ei8h2JxgiY0>_4!~mXm)~lQ*#qadX_4TMZDqUigGZpIKUMLsfS6FI@unI1*<u1
znGU8CWM52504qSLf69d|&L8(q%V*@?iH_CD2uQB<EA&f{WRk4BT{9H|pBZ5f+HiRO
zzy#?afPzpC$|OO?V*S-4&OwERaH^S(kB8v~1bCMQMS^qXAt)-zhbE+EM1BhdK7%?s
zl$R!d)~_JIU3#j`+gwNFeMwYkP>qJ9ZwaE$v5M|4463ZCHTDUrvl768b?ZhO%T;Vc
zLwdn;3&Ss!Q#AAb23lnBX)4DmGf`=QX01quBbB*|WsJvf+=aze=vKelrBD#>#=zMY
zej0XE!b>%tv9IlfO>L)a#O<}iGP?M_E@hKJKXT=M`{i@pD%)&-)e}VR4YlL=T9lGR
zvkBIXnf(xGhK~Oo_>=#Ar1UYJ(!Fu!kvrA*-)Z>5=Z8heozhYrcOnbmw4afz=thKf
z4xzLbp!#R{2gV1^>lWFm0Q$7;6=H2IFS04cbYr5u0_iGHWzD-&$xm<1MoQ0iSnx*m
lDA*b8%nO(0JiMTc)Kuotx2FTouf(K>c<q@^CjtPM{sO59*)#wE

literal 0
HcmV?d00001

diff --git a/core/media/system/images/mootree_loader.gif b/core/media/system/images/mootree_loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e084187956748920cd18a029e0097b430cbec35d
GIT binary patch
literal 544
zcmZ?wbhEHb6k-r!_{7SvZ{NOY)26+6@#6pg{}(P?ShsFnO-)TtPmkh%Za>$MU}whw
zS0g<GW<~}E2F0H&EL;r#8FYYbpk^Tk2WA(GU3c=1X=<#NWjw~%zoNZRAh>)kk3yOc
zhlS)$5#~e|u@6O3ee)!Hoys`_vlce1v?boC>3N(yS;&=Juk%2}uD|>Cvw#d{<znDq
z&|zj^WZ+>CU|?XeEAU9{*i#`R>@uxEQR<#*PO_q+PPM=y@hxja7)tB}D&PNiXkq2x
zSd*dU^>l%>h+CU;CKGE7Ta&|=szzUBsFCbQMlxGi>{32hAmH4$_h3ft?z;`;CecrM
z8v=FI6*OEl&TU~8=wjem9wcFX(dDzyQj0CUY6?qSBpSn27*XBF3wEDn!3odRQ#D@8
zHt-x$lWP?0VlI?;v$J*$=Ymw7m}v`MSLBE=PgG~)=@Qt;d{E<;Y~O4p1%|5+)=lR?
zn8wJ!3^a=e=v!NXlb+8dOuY+#>)v|Ed#6H{&0&&TU{y=v0%wKgvWfRyYS>%&9+=NK
z*`(}v@W4YJ*JV?mFW_`xmEu+N?gU2+F#Ld?g`3E1X|b!|-vve^kDenLrSTV{E?PEE
uXgnmU)2zn8a9irlu|rL3S;F~*nhw4QV34d(KAK;#KtSq@v(GdJ25SIama_T)

literal 0
HcmV?d00001

diff --git a/core/media/system/images/new.png b/core/media/system/images/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..a174ae1df7b117edbe6ecbe5b04c567acd42f112
GIT binary patch
literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002pNkl<Zc-p;^
zArk^25JvBJS}z)nRHN~t)p&6umAH|(l}Oz9IlIctsW_a)op}QR9v=%+Oc|WzgTxsz
zF>Y%#d=6lGXR?L8QhmTI$WlPWpqQ{<U?@CIlUZ7djGY26k582B3eK{uxZVgOK`TFX
zrDP)Cyj%(MG3*nx=(Vc#!DWdB^L)b29w?+#<XoOFBR<Z@vA|C)r9#B91SYa^EU2m|
zE>K956qne%-viymu0}PQsBT31MW78ez6#3Eg2vwj{T_@3<IiN6RPidH$Oz$raPAQL
c95z4k4qyF$voWisQ2+n{07*qoM6N<$g5AP)5dZ)H

literal 0
HcmV?d00001

diff --git a/core/media/system/images/no_indent.png b/core/media/system/images/no_indent.png
new file mode 100644
index 0000000000000000000000000000000000000000..1797bf909a764805b5afdf1fa1dd2167af8af731
GIT binary patch
literal 81
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgbk|4iepwN`R>wr8iPZ!6K3dZCN
YAiIg7(MSCHeISd$)78&qol`;+05^UR%K!iX

literal 0
HcmV?d00001

diff --git a/core/media/system/images/notice-alert.png b/core/media/system/images/notice-alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..d21ae83486103cb372bdd994682dbe3da605614c
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB0009eNkl<ZcmdUx
zHMAR76h+fF8PR~46^@wE%+`09(^slet4yap%$%5+nVFdxMrQWOozefcm;-)m?e*}U
zE!KMmz`xG_Tsp<Y5LqH$MUHUySDLk_@%r=A@Xo8idp_X9Kqc>afwx`;UUMDAfFn=m
zneL?%O$;X6rpbZtdVn`yqTuI%0cQpDfPlAODV=%aMPQOeq}puf(s2eivd&{9Dg{q4
z1LIB2nP@3JD5++m6_inETY7(t&ir7KReU(bg@@yfcsN$y8T0@jlKde(5XvgFCA~Y|
zyzO4rfqP?g-9z$w15UZWGfJCnD!nyEpT9NPj$5O&JwsWzHA&7AZ;TX}y3%VS1m^k#
zOY!<>9j=cQ`olOAu8%QD<9uCdaX9~RajY5C%UmAD<6MTr=`@E^ZE~78Pc>Jlb|_~s
z^Jrb^r3^du(r^LP%bZSWaQnbcblQruf5sWArHm4z^re0n=dO{SPqX5MG>ajQCN$`_
zNwtr&h6w}@%FoqE&m`3-=Ri!=wN$FD$jk6jpRbXgOsG-L-e~tyskS07%~M}TdNig)
zIlIG(uBBA_BrC4M(IhL4Yo&+jKso!ON}T@uQxrF?gxDrU;_xT$V}G<Pi-d<se7K%;
zUzpjtKduJ#GJA-fAqLxm&$i8WVmH<7l`;m|pJ0c^*&6B2h_bLNC4l<=5mjMVlBco!
zb}=>5%^{_GbDYEGD2q)YWnb8m5U?qtmc~;X{`Rg7sg|xw8L%dz!J3e&C)UO|tV?L+
z@w$*I-B7wbsB$k0vsjrjLF$(U)m^bX!b=&0bJf(Ae{Bncn%u%Lk0lu^7Dfdu2x>ZF
zQCyG3X$uyFSWwo{ML{*w*3Ds7K=bwNuz-1KE9Rywm>tz(R*-E>h{K$i4)Zc}K53Tc
zv@XsLXxts$k){UN+|&Sv=`kZ_rfry&v14Y^D$O4=BW{w`XwQL}DI2Cobf6lEt<!^?
zxvSgYZvo!@i=SIc;J2_2zekPuBVjGWBCq`#)IvH#h`;)|d|&Rp-}^ZC_kO<couA)I
opbC-prqY>@3Fc|O;rE}v0XsaRa7gl4k^lez07*qoM6N<$g1R`U8~^|S

literal 0
HcmV?d00001

diff --git a/core/media/system/images/notice-download.png b/core/media/system/images/notice-download.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca095d5e4964073e750e03872c9d75d796b2defd
GIT binary patch
literal 966
zcmV;%13CPOP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB000AxNkl<ZcmeH{
z1CT679LBF>XT3Ai-NQv}+etB2DJ;e1*f`rZo^9VdJ|AM+F5^q@`EF)eDZj7kx9so#
z8)qHP!rXc&!p|8sA3uH6D7$FHs)-T%92(Q#u*UQ&|5w?02d#U~K4k7ZW7I$*P8%_P
z;3Ikg8KJI>WtZ-cNN4OfcAS2|Kss3a^}mA$v<K4`T6>Kv&)94HaN1rSnGg}2vX_;o
zEDQ~WqS0aFpXjiTX(GEdSZg`-ZVJ6!nWa;Kxr`yaO+|EYX8i<V!6`#LHF0FX{5aCD
zV=m@Oj_!k9aLU)eeTCbW-z3BuY`uO1$M><j6AF2+SrFc>V<B1_MWW>I$b~76gi|-r
ztNlfGNiIhr*(SNHo#x-6ojMl68<d37ye+vfmUB3D#Y`NtlfLOFWm_XpTHACu!D^F8
zH|IiM!V$0U*{XlzEZuBvGB)dQf>tM%=5ES`+QSjAFKsqJHU-bKpU(}}-}-tDPAC;}
zV(G>l@J@z!eYRdm*9V`o@97#7+8S*Fb%hGn&Y)B&kV|FwU+^cCX0OVIR3L%YQLq*U
zb(uOdD~7cu1hP8tx=l(~now726Yw4tuWWq<sphL6ze4YLFM2=Rjon}Lfwr=lSuw1Y
zVUQJ0(q$IZrP>6%TSc@Yijl8IkWT*m_fI^t{28&gd}dY*zAOZ?#6cQZYJe|MCt0k5
zwJ}7BBUrO<P0GUS%ddx0M<<Td%q#(2YJn{F+ois4bBuMVn4wcFZsrK)%IMhLnN)aP
z=?ze7ndr^Tn8Dj+fOPoput|^YR7&)&&_ro2v_**XY+}2xMhH7pTVLxkA!dWL`&>3D
zY4V*XwOX<BVS_d>1mBg=(c6K!8Tn!ap|`?NDk)eqckZ@@AZ9PmikGA7r5#$c3D(4H
z#BK-aJqbChb0&pfjv)L_7_>?V8<}HAYc_CfgACH>yDqMjRC~`mwN3@E*TCxdLWF=p
z&Q~D4B|*xTLCeMPTHCrAy!9qXjeRfe;tKC`t{Ne(5#kz_F><X1G3yIb>9w6pXK|^g
z$yF)DRR&lkOAAeOd;(JH{ezTw&dW+Cq{#E!am5mNg$2D_2P>rsQOnecwI`IwAcdX-
zq}ZcpWfD^0K9A(Pw;xw1&S9wmUS=Uw9-fPkSrh-AR7@e({z3BGwueAw@*K~3B->LY
oI3U0R{tzq|YaSNNJAa4sAF7d=IuZV-4gdfE07*qoM6N<$g4bEdoB#j-

literal 0
HcmV?d00001

diff --git a/core/media/system/images/notice-info.png b/core/media/system/images/notice-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb93e9ea5bb73356f6ce5fd1f858eb239c4ebb48
GIT binary patch
literal 1106
zcmV-Y1g-mtP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB000CTNkl<Zc-rlh
z>rzu^6oyw$Bs2%N|N4_l$R%(I%y<J_LKp-&1;RlTij4xwF$6gT!YM(p)<T=9${<Au
zM^R3J5D3~CW2a+h+COjCx1lK^I}sg!x@MkP-?!Gg);oLenN43KDSXEglSBSDj<ayh
z##q0s*~n40&KLE6Gky%qgJWEtc!SF#j~~gH$D`2ukD(rmhG;bEV7>JDX5NUT89wxz
zePVeOCeHfNBWQ=h(DrZR$}eGD`FS7Tj_krRb|7nvtWgae#&|a8(+xdgt9~f5cWLwx
znZpsN1`j}jfiUR)CW60zz-h>5X<!TL!7z*?5r`R$SJpZ&ZrHb%r61UjnZ04CJ^P^k
zGxUX!J+XuH!8Os7HCmpr3>`qjnRi{xSl1U?GJ5tvJ)vao@4z~|nPkc}(TnR;jCo*R
zWUlX~f7R;lZHK9M7v$bnrfUn-z7FT&QQXkI{#MjPFG0(@VC>xy=NR`SWyg-!QfBwo
zd$ns5)Ts<>K&@=h90WDagPImVEvsCArKrzvZ$aC&CC(0I)3#T+nVqk}S(%n~HVPv5
z$89)f_L(qp9`M4uY}&e!a_)3zNZIt>OP{9YB{(N@cMVyt6$Fp}O#YrdY}(AQPKk`R
zjnnhG!VjcrHAYQqP~^@sKUoBUy>|#k|41;kP4CG4RI{4qHK-ZhZ%a14y@HfDmq51`
zKy|ao8C*(yQr9Br`z55C*EX(-tngiL1@Tep=HOn8#0^95K7eXxKn;s&=d{ixkrhnq
z7m${^7oh5=i2e0X+|)S}V$<2Qb1FvLuqe(7rZ?x2mfGjY@tk|L_vX0Hq?yy!zkurG
ztYCWmc~Ey_4xE*#d;<4;IBpm`d=IJ!fNEw%KPCE`@tq2Prs`jvh8s`8Ihm>eq?##y
zwSUJ=Z4)aX$F%6DM8)W9|J(UY;jiSFvSw6ILt8b)%YI6v{1I}!^Eew>*C#=x6LOC#
z9t&L(hMH-pE9J9~Qbze?z*zkQ)D@GwY~p`PeQ-QpPB3)_R^fcIf!yKWK=$!OJ)?6>
z!cg__<X-VGJGE)qm{n~bg{jI9k*RFtgc2`o{yCfv@w%<I#S;$;T^wz>yyNsf>Z6ZF
ziN~fX^T1L$1f6|=4f~lsP@x-+NAn15M&MiCfo<#=BzrHYs7LgLPR39^2y>+uD*5gS
zQOTf07m6acTT|?Yxx5!9dk=Ia-E8UtU2O;Dw=!*@f{v5gwJxZb4Axj!Z)82+MLkAE
z-B$XfC~UJ)K`RW!9k7(SaLL{UQ>jbb<7Ad}$~B35X4dG6+QBn|AQiS}(PzcgMl0pt
z2{6zVHo<VM8K&ZUag2<pX$l&_8bOTm8y)mTBCo+pdEYrHuRh4&95L?sSd+_0^fk`J
YzkZJZ+4)U|Pyhe`07*qoM6N<$f&ynAH~;_u

literal 0
HcmV?d00001

diff --git a/core/media/system/images/notice-note.png b/core/media/system/images/notice-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa4d3aacd5db189629c3958fae6f4362e60ae352
GIT binary patch
literal 771
zcmV+e1N{7nP)<h;3K|Lk000e1NJLTq0012T0012b1^@s6R+DEB0008YNkl<Zcmd7U
z1(M=G7{&4L2sr{r$PwlU9DyTngq&dAZQLd6?(XjHzMF#JEWCYPq?&0u88@nac-Q~y
zpaNjUt?}qxad1b{y!3E~ZbxoPmfWR{-j*)%83HfSxFM)r6I8DV>eS?QT&Jt@jyzlu
zXW`MCTzpG>0<Tjm5?)Rre40i0!bA8VgW?$ua!G(Iq%JQ?fD4kIfApHT^o~H>MT-h_
zo+>}jp?pffP}_MrE9>VTy&@?J^yJFLmi#e6+$lVwB6Oz1X)~N0y(srcPpq9~^l(D-
zkN~F=oRIX)(X-;w^hw)JF?zs`mcO4vQQdz$Q9w?7^prRhMAJo##R#YDX!vYBDk^$3
z!7)+1_~>!T@Ige(g@;=T6N2jRdqy;WD~p;hz@Zq2wRiE+!{U><=%A@IPVapqnmg5n
ze=2$)axlRmaqZ{<3G_lg#uRrsCdl9Q%;=bd=48T}1I92}JIaNI30r+skUO2$!A2!O
zIM8~`SUWY1uX%QKj2ELbYm6|u-__CbXTEd$1sK!xfc5}!(P6=CnnQy8KGD&_1HN-r
zbi^3Wh!f*UQ68pQ4GJnfg7WijRMajnW>6o9h8meAJ{cG7lY4|2aaVOl!`*@$mALCh
zGz>A`Ie>B4({{95))TZITfLjXp%e-?JcP>G49dK(*`E+LckI~Fz2XwIeI2^Fvz-j*
z-kIM>m$Rt#7%u@?VL$o1cek7)XdOd@+hcy(KAl6EkD=cT8;5yJx{{+i#U)^uW(*K+
zv!kWgKFWLyeTiXz_Mf&Ll2ze|5ic`Z<<5-5do+!DJ4#0M9ivWi)C_lnhmw~R#i>Cm
z9BvWhw+ae;PHm5%sSa<C6%H76=k*_n(JX<CaI|al4cFa{M&WzhX=*|L1{rkeoE6?3
zv7-Tb3;#E0$JaA_uk&?gIAGXkIK!~B_W$9pr2k*@TX>DkiwFP!002ovPDHLkV1kn@
BZ^r-t

literal 0
HcmV?d00001

diff --git a/core/media/system/images/pdf_button.png b/core/media/system/images/pdf_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2fdd724d7a74ec801acde87b82d1bed252d4cbf
GIT binary patch
literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00006bW%=J0RI60
z0RJ~w8+`x(0XIoRK~#7FrINFLL{S*T?_-4ZZnygYak)+W4BN--!alZb+qP}{DAviu
z_FUut&CLB>MgCI%0II8N1_nkt+giIyOM5yy`|gB0SU&}}2)US<kw!*mrKPxYa&j^;
zF##C+PXRJME)_-i`kveY7{9o*1Y5X$4AAv;Zfd$87|5igjBVTrCuL=2p8`ay-3<?C
zaCj7$PXW={35U(#U`z$`6@Xit$Hz#&=;k(ER0I>a@uek{!JrR-`nERolPcA|z5Rh+
zf239mXJ?c-DJuE^fN#66@3BTB3=Nm;?56$whf-6gLPK|TI*eF;A8EtJMw*)9gZ4#7
z_be`s?e1b7pPwHrD440Oh4Z^e=H>uaU0s(5LEWbnVLtBAQdpSb=@lKHn3<cK`7B)J
gmObhpKi{u(1LB07RwYdh>;M1&07*qoM6N<$g6xK?KmY&$

literal 0
HcmV?d00001

diff --git a/core/media/system/images/printButton.png b/core/media/system/images/printButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d0c4750255c3b6477d7c3cd33faeb4bf938884b
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eSlAh>;M1%pWWSe`~0HCix>O(
z`AwQM>D$krfByc>&d&b%`_I|4XOAC0e(cz>g9i`x?)}iR)9>cZn-?!${PgM5HGS#-
zzaIOaS)C3vim@cfFPOpM*^M+HC)m@)F{C1{_l!H=0Rs+K$5q}{yZ=Wj*9PtR@}`1m
zML*kbW=CPZie@u|cwXlR8`h+=OygJXxP6$l{;ccw#5vtF1TC`HYKqDzyl|WHxrH@=
c`^r<c6HA%h7iJ%40UFQX>FVdQ&MBb@0F7K^7ytkO

literal 0
HcmV?d00001

diff --git a/core/media/system/images/rating_star.png b/core/media/system/images/rating_star.png
new file mode 100644
index 0000000000000000000000000000000000000000..28367c754018c4b2bac7b5d0bdc2739120109d9a
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRY!2~3gtPOmC6kAD<UogXe5HydFt_6ym^mK6y
zsbDPa-|EQbDA2mxBI<#agYX_EqdQOU{9VU4ho$|#s?wp_%I4SG_a*0h>?y9Ri_;L%
zntJN(+qD%B&u-hbYgJ~Hl*PVm?XFF`cmGanR_wnMywkO3lEkuSd!9r*`}fZ-Ha`CF
zL|&`TDHZLNUY~6G1DID@FtzdC`+3iIlg{Of7bm{I@!_wO`mOk!3D0-s74H*`?|86x
zI^R~snoZN*zRf*t0@PrT_#tL_-1^OLA3kJU)ua#*=P`*z$?i9Ee}DgW{SNbl-}BS2
X>)ijMxqGoZ&{GVau6{1-oD!M<i;;KZ

literal 0
HcmV?d00001

diff --git a/core/media/system/images/rating_star_blank.png b/core/media/system/images/rating_star_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d6c304297559ab3a586b2281c7ad10653833657
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRY0VEhYjD8#kQcNX5e!&d?qbDkD1@fXjT^vIy
z7)_6DWjt&k!g^r;f40Q58_vEnlDAox@;w%gFJ*b~=(xT^U+A&Bm%{pdozMBNwYBv!
z+9dnwc#QU?m9NV(=Z8$oJ+!BA(#w>V_xr-NdTRt4?!RVT5y|Az6y{;}#O@-<a!*%3
Jmvv4FO#mK2J9z*A

literal 0
HcmV?d00001

diff --git a/core/media/system/images/sort0.png b/core/media/system/images/sort0.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e61527dedf3b37b64e7b3d3b2c1c284b4c71831
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^+#t*WBp7;*Yy1LIOeH~n!3_VSCn{|P@&Y_v978G?
zlYjIx2z=YcUhwVpvAYFjmzM;eU+`wN>gx0HEt`VX-`m%}G@G$^RoUg0o2Tp5F>TDg
y7Qd(N@43n94&T1{K3^ZZzwYzN_V+8w6d4$zqH|Yz$vd9`+34x&=d#Wzp$PyQ9Xq4|

literal 0
HcmV?d00001

diff --git a/core/media/system/images/sort1.png b/core/media/system/images/sort1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0610fa12dad72683f690ee22eb5ee3a0e6bb61e
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^+#t*WBp7;*Yy1LIOeH~n!3_VSCn{|P@*+K5978G?
zlYjIx@cb7Ky<%=^y7jE>7cq@{+e%(<dwX1N&wu_D`5EOe&Kx~1|G(kJ|KDcwcKv<#
zy58XT!8OU}?V7$a9h~&{ecgc@^89<+XK*rY-|u`wpy3=FgM3f!di`aG-h!<5boFyt
I=akR{07;fW-2eap

literal 0
HcmV?d00001

diff --git a/core/media/system/images/sort_asc.png b/core/media/system/images/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed29d625aa8b24e75c802b11122f0cb41c634a82
GIT binary patch
literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^JRr;gBp8b2n5}^nQ%R6tFatx`<g*q)o|>nNV@L&K
zvIC>0=KqP7ni`Wdj5wxhCNwxpI;C>)Bm}nw%xq#|Sm-Tz_mo}g8jv}ju6{1-oD!M<
DVf-0Y

literal 0
HcmV?d00001

diff --git a/core/media/system/images/sort_desc.png b/core/media/system/images/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..a26df9717aba608af619113a84a8294b1f743e32
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&keNPw15RLQ69-f{*{khT<Tn#x4
zCh&9=v1v-3C}uM>o3Ny@DE+~vMit&GrEEeB41xDLBVCw}2mrM*c)I$ztaD0e0sy!(
B8ub7G

literal 0
HcmV?d00001

diff --git a/core/media/system/images/sort_none.png b/core/media/system/images/sort_none.png
new file mode 100644
index 0000000000000000000000000000000000000000..4924e85ca6db26f4bffed77da2a460d8932d023c
GIT binary patch
literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kJx>?M5RLQ62@0Z1mMr;myxp-u
zg;&96leWh;#-o)>G8E2Ny0r2b)-BLUc_CHEu&r%ztX#{-i9nqUp00i_>zopr05^Re
A>;M1&

literal 0
HcmV?d00001

diff --git a/core/media/system/images/tooltip.png b/core/media/system/images/tooltip.png
new file mode 100644
index 0000000000000000000000000000000000000000..133e888a8e17377c3d9fb18d0a2e7571a949fd9a
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004(Nkl<ZcmaKq
zE6l7g5QQs|l~`mYvKF~=C3YneSzC!jVv&`|+Dha~?8=qM@6zUG^1mnflIgVPOkWE4
zgj*8b5UFngecRAoK-&d-UvX39>v~B-+_9HX_mO@+Sa%2qh3yHC`H8kGrkh!}Bt{}`
z`VHd_;sM7S-X}oL&kG9s3+#~4jTe(*kUN|4AUr7snG+-)K1w}fACab=ia|NE?h`)2
zvJ0i#@p>~YF>n9V+?1edW=0oK`NCTNVvKylh07qmKh=hddw{y%F|9}C+qQEl3SmF_
z811FHtx!*(+<(Rsr3O@fs%D0E`ONx6qPhhU3gboPC<fY-$sHv32?^D$pM;VZ1G`G`
zBV$BD+4;M8$VYgfY#&hlktaX#*}zL(=n}>_RQ{fo4OEU#ObH2nn?B7I1ML~d6$L2M
zE$Dlq_7sK<V%#s1pzlHEwcV&|2lAD-gf<iPWnyOjB#WzRU=2wO3i)q0?Tj`v&11*T
zC*49J=S`oew9lPIECwGLeZbfWRgF~Ip)%@GE-at<>-v8y#lf*r(XrbA0000<MNUMn
GLSTZ9{nHNs

literal 0
HcmV?d00001

diff --git a/core/media/system/images/weblink.png b/core/media/system/images/weblink.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4973d3bd0b984723b97f08f3ef78e473ff623ff
GIT binary patch
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008nNkl<ZcmZ{i
z190tF9EbDjc2qsvwr#Dw`)u2`ZQHh4+qOHswXJW@JyYX9^CdY+eh8F`({{D1VaGKd
zyO!UK4nO=lp5yORIr2J@Ro6lzx-Yi9V?6OjJ8_$)Qq#0s<MR8QtE!aGzByQh<X|0=
zi*;z8AXl!x`sK6gYIs_MKVB^sx9bS%R1(j;8pk!;G%nkuNN(9>%6&zy*rc-YK@xQ*
zK3FbfdeWrbS~tTHhhkE8zlr0(`#3I|XL8@MkVme?a=q_eY$f)Kb3-@!qSJ9%Z`q{l
zM$cV8os4ALGj)R^?z+K4PdM^9g_U>0Yh==eXzKs)?3pkyR7M?&2=BkehhtxIxgo@N
zykPV5SSFqHtCijxT<NvK6JgLq8GAUKwu>E^d@hVrcDdZ~gM((NjN0l_BSSYi(|EQO
zz1MhBr_GwF%8$n*sQ2GD>QDMc?-ll(an9jUBx0Y*<~Ol)oM%}^w<R|8UF%Bw1@?59
zZ->%q#SCS{Zhs7ad0)o57b;%G!iRW49GLv}0b@14eqh<-SjO!1=FijNOurIaYTzAV
zFy<v{2CuQ_t*RKyBydaxCqb+KKFMpH=9qCKsF>DMzsvRLt@0goRC=tozteG+8ADdv
z^GXF)$>5m|Az2WX4TqnHG4+TWFT?YhcO{rfrvm7?$cAn+-<hd@Ud8n1TkXc}^+@YE
z&y065#WFcqh?DXmy#Qiz!8-%l>as^Bw?bjT?I@HMi{}V~rUFH?{j4{OcYROfQvx`r
zLZ~oE72=#Ch|LAx3}myHv9Q-H8N(rGFA80Ifr&tlPMgV(moK{$%2~5mW*l(l#Iq1i
zJrCi5O)RcyApF_*A`0W7QruC{Q2x#(Q%Akf>$0ME=V>pV^_~BnK6Ad(XZ9C*&-y|S
z!LTLo%t~svFA?htGz3aT6CHt}powPtbyMrKUO7YksY(*tmOQhGOfC`s5762_ZEG8U
Q6aWAK07*qoM6N<$f_?UfB>(^b

literal 0
HcmV?d00001

diff --git a/core/media/system/js/associations-edit-uncompressed.js b/core/media/system/js/associations-edit-uncompressed.js
new file mode 100644
index 00000000..08257989
--- /dev/null
+++ b/core/media/system/js/associations-edit-uncompressed.js
@@ -0,0 +1,97 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Edit Associations javascript behavior
+ *
+ * Used for editing associations in the backend.
+ *
+ * @package  Joomla
+ * @since    3.7.0
+ */
+
+window.hideAssociation = function(formControl, languageCode)
+{
+	jQuery('#associations .control-group').each(function()
+	{
+		// Current selected language. Hide it.
+		if (jQuery(this).find('.control-label label').attr('for').replace('_id', '') == formControl + '_associations_' + languageCode.replace('-', '_'))
+		{
+			jQuery(this).hide();
+		}
+	});
+}
+
+window.showAssociationMessage = function()
+{
+	jQuery('#associations .control-group').hide();
+	jQuery('#associations').prepend('<div id="associations-notice" class="alert alert-info">' + Joomla.JText._('JGLOBAL_ASSOC_NOT_POSSIBLE') + '</div>');
+}
+
+!(function()
+{
+	jQuery(document).ready(function($)
+	{	
+		var associationsEditOptions = Joomla.getOptions('system.associations.edit'), formControl = associationsEditOptions.formControl || 'jform';
+
+		// Hide the associations tab if needed.
+		if (associationsEditOptions.hidden == 1)
+		{
+			window.showAssociationMessage();
+		}
+		// Hide only the associations for the current language.
+		else
+		{
+			window.hideAssociation(formControl, $('#' + formControl + '_language').val());
+		}
+
+		// When changing the language.
+		$('#' + formControl + '_language').on('change', function(event)
+		{
+			// Remove message if any.
+			Joomla.removeMessages();
+			$('#associations-notice').remove();
+
+			var existsAssociations = false;
+
+			// For each language, remove the associations, ie, empty the associations fields and reset the buttons to Select/Create.
+			$('#associations .control-group').each(function()
+			{
+				var languageCode = $(this).find('.control-label label').attr('for').replace('_id', '').replace('jform_associations_', '');
+
+				// Show the association fields.
+				$(this).show();
+
+				// Check if there was an association selected for this language.
+				if (!existsAssociations && $('#' + formControl + '_associations_' + languageCode + '_id').val() !== '')
+				{
+					existsAssociations = true;
+				}
+
+				// Call the modal clear button.
+				$('#' + formControl + '_associations_' + languageCode + '_clear').click();
+			});
+
+			// If associations existed, send a warning to the user.
+			if (existsAssociations)
+			{
+				Joomla.renderMessages({warning: [Joomla.JText._('JGLOBAL_ASSOCIATIONS_RESET_WARNING')]});
+			}
+
+			var selectedLanguage = $(this).val();
+
+			// If the selected language is All hide the fields and add a message.
+			if (selectedLanguage == '*')
+			{
+				window.showAssociationMessage();
+			}
+			// Else show the associations fields/buttons and hide the current selected language.
+			else
+			{
+				window.hideAssociation(formControl, selectedLanguage);
+			}
+		});
+	});
+})(window, document, Joomla);
diff --git a/core/media/system/js/associations-edit.js b/core/media/system/js/associations-edit.js
new file mode 100644
index 00000000..ea17b047
--- /dev/null
+++ b/core/media/system/js/associations-edit.js
@@ -0,0 +1 @@
+window.hideAssociation=function(o,i){jQuery("#associations .control-group").each(function(){jQuery(this).find(".control-label label").attr("for").replace("_id","")==o+"_associations_"+i.replace("-","_")&&jQuery(this).hide()})},window.showAssociationMessage=function(){jQuery("#associations .control-group").hide(),jQuery("#associations").prepend('<div id="associations-notice" class="alert alert-info">'+Joomla.JText._("JGLOBAL_ASSOC_NOT_POSSIBLE")+"</div>")},!function(){jQuery(document).ready(function(o){var i=Joomla.getOptions("system.associations.edit"),s=i.formControl||"jform";1==i.hidden?window.showAssociationMessage():window.hideAssociation(s,o("#"+s+"_language").val()),o("#"+s+"_language").on("change",function(){Joomla.removeMessages(),o("#associations-notice").remove();var i=!1;o("#associations .control-group").each(function(){var a=o(this).find(".control-label label").attr("for").replace("_id","").replace("jform_associations_","");o(this).show(),i||""===o("#"+s+"_associations_"+a+"_id").val()||(i=!0),o("#"+s+"_associations_"+a+"_clear").click()}),i&&Joomla.renderMessages({warning:[Joomla.JText._("JGLOBAL_ASSOCIATIONS_RESET_WARNING")]});var a=o(this).val();"*"==a?window.showAssociationMessage():window.hideAssociation(s,a)})})}(window,document,Joomla);
diff --git a/core/media/system/js/calendar-setup-uncompressed.js b/core/media/system/js/calendar-setup-uncompressed.js
new file mode 100644
index 00000000..22f793ea
--- /dev/null
+++ b/core/media/system/js/calendar-setup-uncompressed.js
@@ -0,0 +1,201 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar
+ *
+ * Details and latest version at:
+ * http://dynarch.com/mishoo/calendar.epl
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ *
+ * This file defines helper functions for setting up the calendar.  They are
+ * intended to help non-programmers get a working calendar on their site
+ * quickly.  This script should not be seen as part of the calendar.  It just
+ * shows you what one can do with the calendar, while in the same time
+ * providing a quick and simple method for setting it up.  If you need
+ * exhaustive customization of the calendar creation process feel free to
+ * modify this code to suit your needs (this is recommended and much better
+ * than modifying calendar.js itself).
+ */
+
+/**
+ *  This function "patches" an input field (or other element) to use a calendar
+ *  widget for date selection.
+ *
+ *  The "params" is a single object that can have the following properties:
+ *
+ *    prop. name   | description
+ *  -------------------------------------------------------------------------------------------------
+ *   inputField    | the ID of an input field to store the date
+ *   displayArea   | the ID of a DIV or other element to show the date
+ *   button        | ID of a button or other element that will trigger the calendar
+ *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
+ *   ifFormat      | date format that will be stored in the input field
+ *   daFormat      | the date format that will be used to display the date in displayArea
+ *   singleClick   | (true/false) whether the calendar is in single click mode or not (default: true)
+ *   firstDay      | numeric: 0 to 6.  "0" means display Sunday first, "1" means display Monday first, etc.
+ *   align         | alignment (default: "Br"); if you don't know what's this see the calendar documentation
+ *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
+ *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
+ *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
+ *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
+ *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
+ *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
+ *   onClose       | function that gets called when the calendar is closed.  [default]
+ *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
+ *   date          | the date that the calendar will be initially displayed to
+ *   showsTime     | default: false; if true the calendar will include a time selector
+ *   timeFormat    | the time format; can be "12" or "24", default is "12"
+ *   electric      | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
+ *   step          | configures the step of the years in drop-down boxes; default: 2
+ *   position      | configures the calendar absolute position; default: null
+ *   cache         | if "true" (but default: "false") it will reuse the same calendar object, where possible
+ *   showOthers    | if "true" (but default: "false") it will show days from other months too
+ *
+ *  None of them is required, they all have default values.  However, if you
+ *  pass none of "inputField", "displayArea" or "button" you'll get a warning
+ *  saying "nothing to setup".
+ */
+Calendar.setup = function (params) {
+	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+
+	param_default("inputField",      null);
+	param_default("displayArea",     null);
+	param_default("button",          null);
+	param_default("eventName",       "click");
+	param_default("ifFormat",        "%Y/%m/%d");
+	param_default("daFormat",        "%Y/%m/%d");
+	param_default("singleClick",     true);
+	param_default("disableFunc",     null);
+	param_default("dateStatusFunc",  params["disableFunc"]);	// takes precedence if both are defined
+	param_default("dateTooltipFunc", null);
+	param_default("dateText",        null);
+	param_default("firstDay",        null);
+	param_default("align",           "Br");
+	param_default("range",           [1900, 2999]);
+	param_default("weekNumbers",     true);
+	param_default("flat",            null);
+	param_default("flatCallback",    null);
+	param_default("onSelect",        null);
+	param_default("onClose",         null);
+	param_default("onUpdate",        null);
+	param_default("date",            null);
+	param_default("showsTime",       false);
+	param_default("timeFormat",      "24");
+	param_default("electric",        true);
+	param_default("step",            2);
+	param_default("position",        null);
+	param_default("cache",           false);
+	param_default("showOthers",      false);
+	param_default("multiple",        null);
+
+	var tmp = ["inputField", "displayArea", "button"];
+	for (var i in tmp) {
+		if (typeof params[tmp[i]] == "string") {
+			params[tmp[i]] = document.getElementById(params[tmp[i]]);
+		}
+	}
+	if (!(params.flat || params.multiple || params.inputField || params.displayArea || params.button)) {
+		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+		return false;
+	}
+
+	function onSelect(cal) {
+		var p = cal.params;
+		var update = (cal.dateClicked || p.electric);
+		if (update && p.inputField) {
+			p.inputField.value = cal.date.print(p.ifFormat);
+			if (typeof p.inputField.onchange == "function")
+				p.inputField.onchange();
+		}
+		if (update && p.displayArea)
+			p.displayArea.innerHTML = cal.date.print(p.daFormat);
+		if (update && typeof p.onUpdate == "function")
+			p.onUpdate(cal);
+		if (update && p.flat) {
+			if (typeof p.flatCallback == "function")
+				p.flatCallback(cal);
+		}
+		if (update && p.singleClick && cal.dateClicked)
+			cal.callCloseHandler();
+	};
+
+	if (params.flat != null) {
+		if (typeof params.flat == "string")
+			params.flat = document.getElementById(params.flat);
+		if (!params.flat) {
+			alert("Calendar.setup:\n  Flat specified but can't find parent.");
+			return false;
+		}
+		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+		cal.setDateToolTipHandler(params.dateTooltipFunc);
+		cal.showsOtherMonths = params.showOthers;
+		cal.showsTime = params.showsTime;
+		cal.time24 = (params.timeFormat == "24");
+		cal.params = params;
+		cal.weekNumbers = params.weekNumbers;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		if (params.ifFormat) {
+			cal.setDateFormat(params.ifFormat);
+		}
+		if (params.inputField && typeof params.inputField.value == "string") {
+			cal.parseDate(params.inputField.value);
+		}
+		cal.create(params.flat);
+		cal.show();
+		return false;
+	}
+
+	var triggerEl = params.button || params.displayArea || params.inputField;
+	triggerEl["on" + params.eventName] = function() {
+		var dateEl = params.inputField || params.displayArea;
+		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+		var mustCreate = false;
+		var cal = window.calendar;
+		if (dateEl)
+			params.date = Date.parseDate(dateEl.value || dateEl.innerHTML, dateFmt);
+		if (!(cal && params.cache)) {
+			window.calendar = cal = new Calendar(params.firstDay,
+							     params.date,
+							     params.onSelect || onSelect,
+							     params.onClose || function(cal) { cal.hide(); });
+			cal.setDateToolTipHandler(params.dateTooltipFunc);
+			cal.showsTime = params.showsTime;
+			cal.time24 = (params.timeFormat == "24");
+			cal.weekNumbers = params.weekNumbers;
+			mustCreate = true;
+		} else {
+			if (params.date)
+				cal.setDate(params.date);
+			cal.hide();
+		}
+		if (params.multiple) {
+			cal.multiple = {};
+			for (var i = params.multiple.length; --i >= 0;) {
+				var d = params.multiple[i];
+				var ds = d.print("%Y%m%d");
+				cal.multiple[ds] = d;
+			}
+		}
+		cal.showsOtherMonths = params.showOthers;
+		cal.yearStep = params.step;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.params = params;
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.getDateText = params.dateText;
+		cal.setDateFormat(dateFmt);
+		if (mustCreate)
+			cal.create();
+		cal.refresh();
+		if (!params.position)
+			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+		else
+			cal.showAt(params.position[0], params.position[1]);
+		return false;
+	};
+
+	return cal;
+};
diff --git a/core/media/system/js/calendar-setup.js b/core/media/system/js/calendar-setup.js
new file mode 100644
index 00000000..4954c6bb
--- /dev/null
+++ b/core/media/system/js/calendar-setup.js
@@ -0,0 +1 @@
+Calendar.setup=function(g){function f(h,i){if(typeof g[h]=="undefined"){g[h]=i}}f("inputField",null);f("displayArea",null);f("button",null);f("eventName","click");f("ifFormat","%Y/%m/%d");f("daFormat","%Y/%m/%d");f("singleClick",true);f("disableFunc",null);f("dateStatusFunc",g.disableFunc);f("dateTooltipFunc",null);f("dateText",null);f("firstDay",null);f("align","Br");f("range",[1900,2999]);f("weekNumbers",true);f("flat",null);f("flatCallback",null);f("onSelect",null);f("onClose",null);f("onUpdate",null);f("date",null);f("showsTime",false);f("timeFormat","24");f("electric",true);f("step",2);f("position",null);f("cache",false);f("showOthers",false);f("multiple",null);var c=["inputField","displayArea","button"];for(var b in c){if(typeof g[c[b]]=="string"){g[c[b]]=document.getElementById(g[c[b]])}}if(!(g.flat||g.multiple||g.inputField||g.displayArea||g.button)){alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");return false}function a(i){var h=i.params;var j=(i.dateClicked||h.electric);if(j&&h.inputField){h.inputField.value=i.date.print(h.ifFormat);if(typeof h.inputField.onchange=="function"){h.inputField.onchange()}}if(j&&h.displayArea){h.displayArea.innerHTML=i.date.print(h.daFormat)}if(j&&typeof h.onUpdate=="function"){h.onUpdate(i)}if(j&&h.flat){if(typeof h.flatCallback=="function"){h.flatCallback(i)}}if(j&&h.singleClick&&i.dateClicked){i.callCloseHandler()}}if(g.flat!=null){if(typeof g.flat=="string"){g.flat=document.getElementById(g.flat)}if(!g.flat){alert("Calendar.setup:\n  Flat specified but can't find parent.");return false}var e=new Calendar(g.firstDay,g.date,g.onSelect||a);e.setDateToolTipHandler(g.dateTooltipFunc);e.showsOtherMonths=g.showOthers;e.showsTime=g.showsTime;e.time24=(g.timeFormat=="24");e.params=g;e.weekNumbers=g.weekNumbers;e.setRange(g.range[0],g.range[1]);e.setDateStatusHandler(g.dateStatusFunc);e.getDateText=g.dateText;if(g.ifFormat){e.setDateFormat(g.ifFormat)}if(g.inputField&&typeof g.inputField.value=="string"){e.parseDate(g.inputField.value)}e.create(g.flat);e.show();return false}var d=g.button||g.displayArea||g.inputField;d["on"+g.eventName]=function(){var h=g.inputField||g.displayArea;var k=g.inputField?g.ifFormat:g.daFormat;var o=false;var m=window.calendar;if(h){g.date=Date.parseDate(h.value||h.innerHTML,k)}if(!(m&&g.cache)){window.calendar=m=new Calendar(g.firstDay,g.date,g.onSelect||a,g.onClose||function(i){i.hide()});m.setDateToolTipHandler(g.dateTooltipFunc);m.showsTime=g.showsTime;m.time24=(g.timeFormat=="24");m.weekNumbers=g.weekNumbers;o=true}else{if(g.date){m.setDate(g.date)}m.hide()}if(g.multiple){m.multiple={};for(var j=g.multiple.length;--j>=0;){var n=g.multiple[j];var l=n.print("%Y%m%d");m.multiple[l]=n}}m.showsOtherMonths=g.showOthers;m.yearStep=g.step;m.setRange(g.range[0],g.range[1]);m.params=g;m.setDateStatusHandler(g.dateStatusFunc);m.getDateText=g.dateText;m.setDateFormat(k);if(o){m.create()}m.refresh();if(!g.position){m.showAtElement(g.button||g.displayArea||g.inputField,g.align)}else{m.showAt(g.position[0],g.position[1])}return false};return e};
\ No newline at end of file
diff --git a/core/media/system/js/calendar-uncompressed.js b/core/media/system/js/calendar-uncompressed.js
new file mode 100644
index 00000000..a9b9f74c
--- /dev/null
+++ b/core/media/system/js/calendar-uncompressed.js
@@ -0,0 +1,1798 @@
+/*  Copyright Mihai Bazon, 2002-2005  |  www.bazon.net/mishoo
+ * -----------------------------------------------------------
+ *
+ * The DHTML Calendar, version 1.0 "It is happening again"
+ *
+ * Details and latest version at:
+ * www.dynarch.com/projects/calendar
+ *
+ * This script is developed by Dynarch.com.  Visit us at www.dynarch.com.
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ */
+
+/** The Calendar object constructor. */
+Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
+	// member variables
+	this.activeDiv = null;
+	this.currentDateEl = null;
+	this.getDateStatus = null;
+	this.getDateToolTip = null;
+	this.getDateText = null;
+	this.timeout = null;
+	this.onSelected = onSelected || null;
+	this.onClose = onClose || null;
+	this.dragging = false;
+	this.hidden = false;
+	this.minYear = 1970;
+	this.maxYear = 2050;
+	this.dateFormat = Calendar._TT["DEF_DATE_FORMAT"];
+	this.ttDateFormat = Calendar._TT["TT_DATE_FORMAT"];
+	this.isPopup = true;
+	this.weekNumbers = true;
+	this.firstDayOfWeek = typeof firstDayOfWeek == "number" ? firstDayOfWeek : Calendar._FD; // 0 for Sunday, 1 for Monday, etc.
+	this.showsOtherMonths = false;
+	this.dateStr = dateStr;
+	this.ar_days = null;
+	this.showsTime = false;
+	this.time24 = true;
+	this.yearStep = 2;
+	this.hiliteToday = true;
+	this.multiple = null;
+	// HTML elements
+	this.table = null;
+	this.element = null;
+	this.tbody = null;
+	this.firstdayname = null;
+	// Combo boxes
+	this.monthsCombo = null;
+	this.yearsCombo = null;
+	this.hilitedMonth = null;
+	this.activeMonth = null;
+	this.hilitedYear = null;
+	this.activeYear = null;
+	// Information
+	this.dateClicked = false;
+
+	// one-time initializations
+	if (typeof Calendar._SDN == "undefined") {
+		// table of short day names
+		if (typeof Calendar._SDN_len == "undefined")
+			Calendar._SDN_len = 3;
+		var ar = new Array();
+		for (var i = 8; i > 0;) {
+			ar[--i] = Calendar._DN[i].substr(0, Calendar._SDN_len);
+		}
+		Calendar._SDN = ar;
+		// table of short month names
+		if (typeof Calendar._SMN_len == "undefined")
+			Calendar._SMN_len = 3;
+		ar = new Array();
+		for (var i = 12; i > 0;) {
+			ar[--i] = Calendar._MN[i].substr(0, Calendar._SMN_len);
+		}
+		Calendar._SMN = ar;
+	}
+};
+
+// ** constants
+
+/// "static", needed for event handlers.
+Calendar._C = null;
+
+/// detect a special case of "web browser"
+Calendar.is_ie = ( /msie/i.test(navigator.userAgent) &&
+		   !/opera/i.test(navigator.userAgent) );
+
+Calendar.is_ie5 = ( Calendar.is_ie && /msie 5\.0/i.test(navigator.userAgent) );
+
+/// detect Opera browser
+Calendar.is_opera = /opera/i.test(navigator.userAgent);
+
+/// detect KHTML-based browsers
+Calendar.is_khtml = /Konqueror|Safari|KHTML/i.test(navigator.userAgent);
+
+// BEGIN: UTILITY FUNCTIONS; beware that these might be moved into a separate
+//        library, at some point.
+
+Calendar.getAbsolutePos = function(el) {
+	var SL = 0, ST = 0;
+	var is_div = /^div$/i.test(el.tagName);
+	if (is_div && el.scrollLeft)
+		SL = el.scrollLeft;
+	if (is_div && el.scrollTop)
+		ST = el.scrollTop;
+	var r = { x: el.offsetLeft - SL, y: el.offsetTop - ST };
+	if (el.offsetParent) {
+		var tmp = this.getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
+	}
+	return r;
+};
+
+Calendar.isRelated = function (el, evt) {
+	var related = evt.relatedTarget;
+	if (!related) {
+		var type = evt.type;
+		if (type == "mouseover") {
+			related = evt.fromElement;
+		} else if (type == "mouseout") {
+			related = evt.toElement;
+		}
+	}
+	while (related) {
+		if (related == el) {
+			return true;
+		}
+		related = related.parentNode;
+	}
+	return false;
+};
+
+Calendar.removeClass = function(el, className) {
+	if (!(el && el.className)) {
+		return;
+	}
+	var cls = el.className.split(" ");
+	var ar = new Array();
+	for (var i = cls.length; i > 0;) {
+		if (cls[--i] != className) {
+			ar[ar.length] = cls[i];
+		}
+	}
+	el.className = ar.join(" ");
+};
+
+Calendar.addClass = function(el, className) {
+	Calendar.removeClass(el, className);
+	el.className += " " + className;
+};
+
+// FIXME: the following 2 functions totally suck, are useless and should be replaced immediately.
+Calendar.getElement = function(ev) {
+	var f = Calendar.is_ie ? window.event.srcElement : ev.currentTarget;
+	while (f.nodeType != 1 || /^div$/i.test(f.tagName))
+		f = f.parentNode;
+	return f;
+};
+
+Calendar.getTargetElement = function(ev) {
+	var f = Calendar.is_ie ? window.event.srcElement : ev.target;
+	while (f.nodeType != 1)
+		f = f.parentNode;
+	return f;
+};
+
+Calendar.stopEvent = function(ev) {
+	ev || (ev = window.event);
+	if (Calendar.is_ie) {
+		ev.cancelBubble = true;
+		ev.returnValue = false;
+	} else {
+		ev.preventDefault();
+		ev.stopPropagation();
+	}
+	return false;
+};
+
+Calendar.addEvent = function(el, evname, func) {
+	if (el.attachEvent) { // IE
+		el.attachEvent("on" + evname, func);
+	} else if (el.addEventListener) { // Gecko / W3C
+		el.addEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = func;
+	}
+};
+
+Calendar.removeEvent = function(el, evname, func) {
+	if (el.detachEvent) { // IE
+		el.detachEvent("on" + evname, func);
+	} else if (el.removeEventListener) { // Gecko / W3C
+		el.removeEventListener(evname, func, true);
+	} else {
+		el["on" + evname] = null;
+	}
+};
+
+Calendar.createElement = function(type, parent) {
+	var el = null;
+	if (document.createElementNS) {
+		// use the XHTML namespace; IE won't normally get here unless
+		// _they_ "fix" the DOM2 implementation.
+		el = document.createElementNS("http://www.w3.org/1999/xhtml", type);
+	} else {
+		el = document.createElement(type);
+	}
+	if (typeof parent != "undefined") {
+		parent.appendChild(el);
+	}
+	return el;
+};
+
+// END: UTILITY FUNCTIONS
+
+// BEGIN: CALENDAR STATIC FUNCTIONS
+
+/** Internal -- adds a set of events to make some element behave like a button. */
+Calendar._add_evs = function(el) {
+	with (Calendar) {
+		addEvent(el, "mouseover", dayMouseOver);
+		addEvent(el, "mousedown", dayMouseDown);
+		addEvent(el, "mouseout", dayMouseOut);
+		if (is_ie) {
+			addEvent(el, "dblclick", dayMouseDblClick);
+			el.setAttribute("unselectable", true);
+		}
+	}
+};
+
+Calendar.findMonth = function(el) {
+	if (typeof el.month != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.month != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.findYear = function(el) {
+	if (typeof el.year != "undefined") {
+		return el;
+	} else if (typeof el.parentNode.year != "undefined") {
+		return el.parentNode;
+	}
+	return null;
+};
+
+Calendar.showMonthsCombo = function () {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var mc = cal.monthsCombo;
+	if (cal.hilitedMonth) {
+		Calendar.removeClass(cal.hilitedMonth, "hilite");
+	}
+	if (cal.activeMonth) {
+		Calendar.removeClass(cal.activeMonth, "active");
+	}
+	var mon = cal.monthsCombo.getElementsByTagName("div")[cal.date.getMonth()];
+	Calendar.addClass(mon, "active");
+	cal.activeMonth = mon;
+	var s = mc.style;
+	s.display = "block";
+	if (cd.navtype < 0)
+		s.left = cd.offsetLeft + "px";
+	else {
+		var mcw = mc.offsetWidth;
+		if (typeof mcw == "undefined")
+			// Konqueror brain-dead techniques
+			mcw = 50;
+		s.left = (cd.offsetLeft + cd.offsetWidth - mcw) + "px";
+	}
+	s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+};
+
+Calendar.showYearsCombo = function (fwd) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	var cal = cal;
+	var cd = cal.activeDiv;
+	var yc = cal.yearsCombo;
+	if (cal.hilitedYear) {
+		Calendar.removeClass(cal.hilitedYear, "hilite");
+	}
+	if (cal.activeYear) {
+		Calendar.removeClass(cal.activeYear, "active");
+	}
+	cal.activeYear = null;
+	var Y = cal.date.getFullYear() + (fwd ? 1 : -1);
+	var yr = yc.firstChild;
+	var show = false;
+	for (var i = 12; i > 0; --i) {
+		if (Y >= cal.minYear && Y <= cal.maxYear) {
+			yr.innerHTML = Y;
+			yr.year = Y;
+			yr.style.display = "block";
+			show = true;
+		} else {
+			yr.style.display = "none";
+		}
+		yr = yr.nextSibling;
+		Y += fwd ? cal.yearStep : -cal.yearStep;
+	}
+	if (show) {
+		var s = yc.style;
+		s.display = "block";
+		if (cd.navtype < 0)
+			s.left = cd.offsetLeft + "px";
+		else {
+			var ycw = yc.offsetWidth;
+			if (typeof ycw == "undefined")
+				// Konqueror brain-dead techniques
+				ycw = 50;
+			s.left = (cd.offsetLeft + cd.offsetWidth - ycw) + "px";
+		}
+		s.top = (cd.offsetTop + cd.offsetHeight) + "px";
+	}
+};
+
+// event handlers
+
+Calendar.tableMouseUp = function(ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	if (cal.timeout) {
+		clearTimeout(cal.timeout);
+	}
+	var el = cal.activeDiv;
+	if (!el) {
+		return false;
+	}
+	var target = Calendar.getTargetElement(ev);
+	ev || (ev = window.event);
+	Calendar.removeClass(el, "active");
+	if (target == el || target.parentNode == el) {
+		Calendar.cellClick(el, ev);
+	}
+	var mon = Calendar.findMonth(target);
+	var date = null;
+	if (mon) {
+		date = new Date(cal.date);
+		if (mon.month != date.getMonth()) {
+			date.setMonth(mon.month);
+			cal.setDate(date);
+			cal.dateClicked = false;
+			cal.callHandler();
+		}
+	} else {
+		var year = Calendar.findYear(target);
+		if (year) {
+			date = new Date(cal.date);
+			if (year.year != date.getFullYear()) {
+				date.setFullYear(year.year);
+				cal.setDate(date);
+				cal.dateClicked = false;
+				cal.callHandler();
+			}
+		}
+	}
+	with (Calendar) {
+		removeEvent(document, "mouseup", tableMouseUp);
+		removeEvent(document, "mouseover", tableMouseOver);
+		removeEvent(document, "mousemove", tableMouseOver);
+		cal._hideCombos();
+		_C = null;
+		return stopEvent(ev);
+	}
+};
+
+Calendar.tableMouseOver = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return;
+	}
+	var el = cal.activeDiv;
+	var target = Calendar.getTargetElement(ev);
+	if (target == el || target.parentNode == el) {
+		Calendar.addClass(el, "hilite active");
+		Calendar.addClass(el.parentNode, "rowhilite");
+	} else {
+		if (typeof el.navtype == "undefined" || (el.navtype != 50 && (el.navtype == 0 || Math.abs(el.navtype) > 2)))
+			Calendar.removeClass(el, "active");
+		Calendar.removeClass(el, "hilite");
+		Calendar.removeClass(el.parentNode, "rowhilite");
+	}
+	ev || (ev = window.event);
+	if (el.navtype == 50 && target != el) {
+		var pos = Calendar.getAbsolutePos(el);
+		var w = el.offsetWidth;
+		var x = ev.clientX;
+		var dx;
+		var decrease = true;
+		if (x > pos.x + w) {
+			dx = x - pos.x - w;
+			decrease = false;
+		} else
+			dx = pos.x - x;
+
+		if (dx < 0) dx = 0;
+		var range = el._range;
+		var current = el._current;
+		var count = Math.floor(dx / 10) % range.length;
+		for (var i = range.length; --i >= 0;)
+			if (range[i] == current)
+				break;
+		while (count-- > 0)
+			if (decrease) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+		var newval = range[i];
+		el.innerHTML = newval;
+
+		cal.onUpdateTime();
+	}
+	var mon = Calendar.findMonth(target);
+	if (mon) {
+		if (mon.month != cal.date.getMonth()) {
+			if (cal.hilitedMonth) {
+				Calendar.removeClass(cal.hilitedMonth, "hilite");
+			}
+			Calendar.addClass(mon, "hilite");
+			cal.hilitedMonth = mon;
+		} else if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+	} else {
+		if (cal.hilitedMonth) {
+			Calendar.removeClass(cal.hilitedMonth, "hilite");
+		}
+		var year = Calendar.findYear(target);
+		if (year) {
+			if (year.year != cal.date.getFullYear()) {
+				if (cal.hilitedYear) {
+					Calendar.removeClass(cal.hilitedYear, "hilite");
+				}
+				Calendar.addClass(year, "hilite");
+				cal.hilitedYear = year;
+			} else if (cal.hilitedYear) {
+				Calendar.removeClass(cal.hilitedYear, "hilite");
+			}
+		} else if (cal.hilitedYear) {
+			Calendar.removeClass(cal.hilitedYear, "hilite");
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.tableMouseDown = function (ev) {
+	if (Calendar.getTargetElement(ev) == Calendar.getElement(ev)) {
+		return Calendar.stopEvent(ev);
+	}
+};
+
+Calendar.calDragIt = function (ev) {
+	var cal = Calendar._C;
+	if (!(cal && cal.dragging)) {
+		return false;
+	}
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posX = ev.pageX;
+		posY = ev.pageY;
+	}
+	cal.hideShowCovered();
+	var st = cal.element.style;
+	st.left = (posX - cal.xOffs) + "px";
+	st.top = (posY - cal.yOffs) + "px";
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.calDragEnd = function (ev) {
+	var cal = Calendar._C;
+	if (!cal) {
+		return false;
+	}
+	cal.dragging = false;
+	with (Calendar) {
+		removeEvent(document, "mousemove", calDragIt);
+		removeEvent(document, "mouseup", calDragEnd);
+		tableMouseUp(ev);
+	}
+	cal.hideShowCovered();
+};
+
+Calendar.dayMouseDown = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (el.disabled) {
+		return false;
+	}
+	var cal = el.calendar;
+	cal.activeDiv = el;
+	Calendar._C = cal;
+	if (el.navtype != 300) with (Calendar) {
+		if (el.navtype == 50) {
+			el._current = el.innerHTML;
+			addEvent(document, "mousemove", tableMouseOver);
+		} else
+			addEvent(document, Calendar.is_ie5 ? "mousemove" : "mouseover", tableMouseOver);
+		addClass(el, "hilite active");
+		addEvent(document, "mouseup", tableMouseUp);
+	} else if (cal.isPopup) {
+		cal._dragStart(ev);
+	}
+	if (el.navtype == -1 || el.navtype == 1) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout("Calendar.showMonthsCombo()", 250);
+	} else if (el.navtype == -2 || el.navtype == 2) {
+		if (cal.timeout) clearTimeout(cal.timeout);
+		cal.timeout = setTimeout((el.navtype > 0) ? "Calendar.showYearsCombo(true)" : "Calendar.showYearsCombo(false)", 250);
+	} else {
+		cal.timeout = null;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseDblClick = function(ev) {
+	Calendar.cellClick(Calendar.getElement(ev), ev || window.event);
+	if (Calendar.is_ie) {
+		document.selection.empty();
+	}
+};
+
+Calendar.dayMouseOver = function(ev) {
+	var el = Calendar.getElement(ev);
+	if (Calendar.isRelated(el, ev) || Calendar._C || el.disabled) {
+		return false;
+	}
+	if (el.ttip) {
+		if (el.ttip.substr(0, 1) == "_") {
+			el.ttip = el.caldate.print(el.calendar.ttDateFormat) + el.ttip.substr(1);
+		}
+		el.calendar.tooltips.innerHTML = el.ttip;
+	}
+	if (el.navtype != 300) {
+		Calendar.addClass(el, "hilite");
+		if (el.caldate) {
+			Calendar.addClass(el.parentNode, "rowhilite");
+			var cal = el.calendar;
+			if (cal && cal.getDateToolTip) {
+				var d = el.caldate;
+				window.status = d;
+				el.title = cal.getDateToolTip(d, d.getFullYear(), d.getMonth(), d.getDate());
+			}
+		}
+	}
+	return Calendar.stopEvent(ev);
+};
+
+Calendar.dayMouseOut = function(ev) {
+	with (Calendar) {
+		var el = getElement(ev);
+		if (isRelated(el, ev) || _C || el.disabled)
+			return false;
+		removeClass(el, "hilite");
+		if (el.caldate)
+			removeClass(el.parentNode, "rowhilite");
+		if (el.calendar)
+			el.calendar.tooltips.innerHTML = _TT["SEL_DATE"];
+		// return stopEvent(ev);
+	}
+};
+
+/**
+ *  A generic "click" handler :) handles all types of buttons defined in this
+ *  calendar.
+ */
+Calendar.cellClick = function(el, ev) {
+	var cal = el.calendar;
+	var closing = false;
+	var newdate = false;
+	var date = null;
+	if (typeof el.navtype == "undefined") {
+		if (cal.currentDateEl) {
+			Calendar.removeClass(cal.currentDateEl, "selected");
+			Calendar.addClass(el, "selected");
+			closing = (cal.currentDateEl == el);
+			if (!closing) {
+				cal.currentDateEl = el;
+			}
+		}
+		cal.date.setDateOnly(el.caldate);
+		date = cal.date;
+		var other_month = !(cal.dateClicked = !el.otherMonth);
+		if (!other_month && !cal.currentDateEl && cal.multiple)
+			cal._toggleMultipleDate(new Date(date));
+		else
+			newdate = !el.disabled;
+		// a date was clicked
+		if (other_month)
+			cal._init(cal.firstDayOfWeek, date);
+	} else {
+		if (el.navtype == 200) {
+			Calendar.removeClass(el, "hilite");
+			cal.callCloseHandler();
+			return;
+		}
+		date = new Date(cal.date);
+		if (el.navtype == 0)
+			date.setDateOnly(new Date()); // TODAY
+		// unless "today" was clicked, we assume no date was clicked so
+		// the selected handler will know not to close the calenar when
+		// in single-click mode.
+		// cal.dateClicked = (el.navtype == 0);
+		cal.dateClicked = false;
+		var year = date.getFullYear();
+		var mon = date.getMonth();
+		function setMonth(m) {
+			var day = date.getDate();
+			var max = date.getMonthDays(m);
+			if (day > max) {
+				date.setDate(max);
+			}
+			date.setMonth(m);
+		};
+		switch (el.navtype) {
+		    case 400:
+			Calendar.removeClass(el, "hilite");
+			var text = Calendar._TT["ABOUT"];
+			if (typeof text != "undefined") {
+				text += cal.showsTime ? Calendar._TT["ABOUT_TIME"] : "";
+			} else {
+				// FIXME: this should be removed as soon as lang files get updated!
+				text = "Help and about box text is not translated into this language.\n" +
+					"If you know this language and you feel generous please update\n" +
+					"the corresponding file in \"lang\" subdir to match calendar-en.js\n" +
+					"and send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\n" +
+					"Thank you!\n" +
+					"http://dynarch.com/mishoo/calendar.epl\n";
+			}
+			alert(text);
+			return;
+		    case -2:
+			if (year > cal.minYear) {
+				date.setFullYear(year - 1);
+			}
+			break;
+		    case -1:
+			if (mon > 0) {
+				setMonth(mon - 1);
+			} else if (year-- > cal.minYear) {
+				date.setFullYear(year);
+				setMonth(11);
+			}
+			break;
+		    case 1:
+			if (mon < 11) {
+				setMonth(mon + 1);
+			} else if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+				setMonth(0);
+			}
+			break;
+		    case 2:
+			if (year < cal.maxYear) {
+				date.setFullYear(year + 1);
+			}
+			break;
+		    case 100:
+			cal.setFirstDayOfWeek(el.fdow);
+			return;
+		    case 50:
+			var range = el._range;
+			var current = el.innerHTML;
+			for (var i = range.length; --i >= 0;)
+				if (range[i] == current)
+					break;
+			if (ev && ev.shiftKey) {
+				if (--i < 0)
+					i = range.length - 1;
+			} else if ( ++i >= range.length )
+				i = 0;
+			var newval = range[i];
+			el.innerHTML = newval;
+			cal.onUpdateTime();
+			return;
+		    case 0:
+			// TODAY will bring us here
+			if ((typeof cal.getDateStatus == "function") &&
+			    cal.getDateStatus(date, date.getFullYear(), date.getMonth(), date.getDate())) {
+				return false;
+			}
+			break;
+		}
+		if (!date.equalsTo(cal.date)) {
+			cal.setDate(date);
+			newdate = true;
+		} else if (el.navtype == 0)
+			newdate = closing = true;
+	}
+	if (newdate) {
+		ev && cal.callHandler();
+	}
+	if (closing) {
+		Calendar.removeClass(el, "hilite");
+		ev && cal.callCloseHandler();
+	}
+};
+
+// END: CALENDAR STATIC FUNCTIONS
+
+// BEGIN: CALENDAR OBJECT FUNCTIONS
+
+/**
+ *  This function creates the calendar inside the given parent.  If _par is
+ *  null than it creates a popup calendar inside the BODY element.  If _par is
+ *  an element, be it BODY, then it creates a non-popup calendar (still
+ *  hidden).  Some properties need to be set before calling this function.
+ */
+Calendar.prototype.create = function (_par) {
+	var parent = null;
+	if (! _par) {
+		// default parent is the document body, in which case we create
+		// a popup calendar.
+		parent = document.getElementsByTagName("body")[0];
+		this.isPopup = true;
+	} else {
+		parent = _par;
+		this.isPopup = false;
+	}
+	this.date = this.dateStr ? new Date(this.dateStr) : new Date();
+
+	var table = Calendar.createElement("table");
+	this.table = table;
+	table.cellSpacing = 0;
+	table.cellPadding = 0;
+	table.calendar = this;
+	Calendar.addEvent(table, "mousedown", Calendar.tableMouseDown);
+
+	var div = Calendar.createElement("div");
+	this.element = div;
+	div.className = "calendar";
+	if (this.isPopup) {
+		div.style.position = "absolute";
+		div.style.display = "none";
+	}
+	div.appendChild(table);
+
+	var thead = Calendar.createElement("thead", table);
+	var cell = null;
+	var row = null;
+
+	var cal = this;
+	var hh = function (text, cs, navtype) {
+		cell = Calendar.createElement("td", row);
+		cell.colSpan = cs;
+		cell.className = "button";
+		if (navtype != 0 && Math.abs(navtype) <= 2)
+			cell.className += " nav";
+		Calendar._add_evs(cell);
+		cell.calendar = cal;
+		cell.navtype = navtype;
+		cell.innerHTML = "<div unselectable='on'>" + text + "</div>";
+		return cell;
+	};
+
+	row = Calendar.createElement("tr", thead);
+	var title_length = 6;
+	(this.isPopup) && --title_length;
+	(this.weekNumbers) && ++title_length;
+
+	hh("?", 1, 400).ttip = Calendar._TT["INFO"];
+	this.title = hh("", title_length, 300);
+	this.title.className = "title";
+	if (this.isPopup) {
+		this.title.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		this.title.style.cursor = "move";
+		hh("&#x00d7;", 1, 200).ttip = Calendar._TT["CLOSE"];
+	}
+
+	row = Calendar.createElement("tr", thead);
+	row.className = "headrow";
+
+	this._nav_py = hh("&#x00ab;", 1, -2);
+	this._nav_py.ttip = Calendar._TT["PREV_YEAR"];
+
+	this._nav_pm = hh("&#x2039;", 1, -1);
+	this._nav_pm.ttip = Calendar._TT["PREV_MONTH"];
+
+	this._nav_now = hh(Calendar._TT["TODAY"], this.weekNumbers ? 4 : 3, 0);
+	this._nav_now.ttip = Calendar._TT["GO_TODAY"];
+
+	this._nav_nm = hh("&#x203a;", 1, 1);
+	this._nav_nm.ttip = Calendar._TT["NEXT_MONTH"];
+
+	this._nav_ny = hh("&#x00bb;", 1, 2);
+	this._nav_ny.ttip = Calendar._TT["NEXT_YEAR"];
+
+	// day names
+	row = Calendar.createElement("tr", thead);
+	row.className = "daynames";
+	if (this.weekNumbers) {
+		cell = Calendar.createElement("td", row);
+		cell.className = "name wn";
+		cell.innerHTML = Calendar._TT["WK"];
+	}
+	for (var i = 7; i > 0; --i) {
+		cell = Calendar.createElement("td", row);
+		if (!i) {
+			cell.navtype = 100;
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+	this.firstdayname = (this.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+	this._displayWeekdays();
+
+	var tbody = Calendar.createElement("tbody", table);
+	this.tbody = tbody;
+
+	for (i = 6; i > 0; --i) {
+		row = Calendar.createElement("tr", tbody);
+		if (this.weekNumbers) {
+			cell = Calendar.createElement("td", row);
+		}
+		for (var j = 7; j > 0; --j) {
+			cell = Calendar.createElement("td", row);
+			cell.calendar = this;
+			Calendar._add_evs(cell);
+		}
+	}
+
+	if (this.showsTime) {
+		row = Calendar.createElement("tr", tbody);
+		row.className = "time";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = 2;
+		cell.innerHTML = Calendar._TT["TIME"] || "&#160;";
+
+		cell = Calendar.createElement("td", row);
+		cell.className = "time";
+		cell.colSpan = this.weekNumbers ? 4 : 3;
+
+		(function(){
+			function makeTimePart(className, init, range_start, range_end) {
+				var part = Calendar.createElement("span", cell);
+				part.className = className;
+				part.innerHTML = init;
+				part.calendar = cal;
+				part.ttip = Calendar._TT["TIME_PART"];
+				part.navtype = 50;
+				part._range = [];
+				if (typeof range_start != "number")
+					part._range = range_start;
+				else {
+					for (var i = range_start; i <= range_end; ++i) {
+						var txt;
+						if (i < 10 && range_end >= 10) txt = '0' + i;
+						else txt = '' + i;
+						part._range[part._range.length] = txt;
+					}
+				}
+				Calendar._add_evs(part);
+				return part;
+			};
+			var hrs = cal.date.getHours();
+			var mins = cal.date.getMinutes();
+			var t12 = !cal.time24;
+			var pm = (hrs > 12);
+			if (t12 && pm) hrs -= 12;
+			var H = makeTimePart("hour", hrs, t12 ? 1 : 0, t12 ? 12 : 23);
+			var span = Calendar.createElement("span", cell);
+			span.innerHTML = ":";
+			span.className = "colon";
+			var M = makeTimePart("minute", mins, 0, 59);
+			var AP = null;
+			cell = Calendar.createElement("td", row);
+			cell.className = "time";
+			cell.colSpan = 2;
+			if (t12)
+				AP = makeTimePart("ampm", pm ? "pm" : "am", ["am", "pm"]);
+			else
+				cell.innerHTML = "&#160;";
+
+			cal.onSetTime = function() {
+				var pm, hrs = this.date.getHours(),
+					mins = this.date.getMinutes();
+				if (t12) {
+					pm = (hrs >= 12);
+					if (pm) hrs -= 12;
+					if (hrs == 0) hrs = 12;
+					AP.innerHTML = pm ? "pm" : "am";
+				}
+				H.innerHTML = (hrs < 10) ? ("0" + hrs) : hrs;
+				M.innerHTML = (mins < 10) ? ("0" + mins) : mins;
+			};
+
+			cal.onUpdateTime = function() {
+				var date = this.date;
+				var h = parseInt(H.innerHTML, 10);
+				if (t12) {
+					if (/pm/i.test(AP.innerHTML) && h < 12)
+						h += 12;
+					else if (/am/i.test(AP.innerHTML) && h == 12)
+						h = 0;
+				}
+				var d = date.getDate();
+				var m = date.getMonth();
+				var y = date.getFullYear();
+				date.setHours(h);
+				date.setMinutes(parseInt(M.innerHTML, 10));
+				date.setFullYear(y);
+				date.setMonth(m);
+				date.setDate(d);
+				this.dateClicked = false;
+				this.callHandler();
+			};
+		})();
+	} else {
+		this.onSetTime = this.onUpdateTime = function() {};
+	}
+
+	var tfoot = Calendar.createElement("tfoot", table);
+
+	row = Calendar.createElement("tr", tfoot);
+	row.className = "footrow";
+
+	cell = hh(Calendar._TT["SEL_DATE"], this.weekNumbers ? 8 : 7, 300);
+	cell.className = "ttip";
+	if (this.isPopup) {
+		cell.ttip = Calendar._TT["DRAG_TO_MOVE"];
+		cell.style.cursor = "move";
+	}
+	this.tooltips = cell;
+
+	div = Calendar.createElement("div", this.element);
+	this.monthsCombo = div;
+	div.className = "combo";
+	for (i = 0; i < Calendar._MN.length; ++i) {
+		var mn = Calendar.createElement("div");
+		mn.className = Calendar.is_ie ? "label-IEfix" : "label";
+		mn.month = i;
+		mn.innerHTML = Calendar._SMN[i];
+		div.appendChild(mn);
+	}
+
+	div = Calendar.createElement("div", this.element);
+	this.yearsCombo = div;
+	div.className = "combo";
+	for (i = 12; i > 0; --i) {
+		var yr = Calendar.createElement("div");
+		yr.className = Calendar.is_ie ? "label-IEfix" : "label";
+		div.appendChild(yr);
+	}
+
+	this._init(this.firstDayOfWeek, this.date);
+	parent.appendChild(this.element);
+};
+
+/** keyboard navigation, only for popup calendars */
+Calendar._keyEvent = function(ev) {
+	var cal = window._dynarch_popupCalendar;
+	if (!cal || cal.multiple)
+		return false;
+	(Calendar.is_ie) && (ev = window.event);
+	var act = (Calendar.is_ie || ev.type == "keypress"),
+		K = ev.keyCode;
+	if (ev.ctrlKey) {
+		switch (K) {
+		    case 37: // KEY left
+			act && Calendar.cellClick(cal._nav_pm);
+			break;
+		    case 38: // KEY up
+			act && Calendar.cellClick(cal._nav_py);
+			break;
+		    case 39: // KEY right
+			act && Calendar.cellClick(cal._nav_nm);
+			break;
+		    case 40: // KEY down
+			act && Calendar.cellClick(cal._nav_ny);
+			break;
+		    default:
+			return false;
+		}
+	} else switch (K) {
+	    case 32: // KEY space (now)
+		Calendar.cellClick(cal._nav_now);
+		break;
+	    case 27: // KEY esc
+		act && cal.callCloseHandler();
+		break;
+	    case 37: // KEY left
+	    case 38: // KEY up
+	    case 39: // KEY right
+	    case 40: // KEY down
+		if (act) {
+			var prev, x, y, ne, el, step;
+			prev = K == 37 || K == 38;
+			step = (K == 37 || K == 39) ? 1 : 7;
+			function setVars() {
+				el = cal.currentDateEl;
+				var p = el.pos;
+				x = p & 15;
+				y = p >> 4;
+				ne = cal.ar_days[y][x];
+			};setVars();
+			function prevMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() - step);
+				cal.setDate(date);
+			};
+			function nextMonth() {
+				var date = new Date(cal.date);
+				date.setDate(date.getDate() + step);
+				cal.setDate(date);
+			};
+			while (1) {
+				switch (K) {
+				    case 37: // KEY left
+					if (--x >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 6;
+						K = 38;
+						continue;
+					}
+					break;
+				    case 38: // KEY up
+					if (--y >= 0)
+						ne = cal.ar_days[y][x];
+					else {
+						prevMonth();
+						setVars();
+					}
+					break;
+				    case 39: // KEY right
+					if (++x < 7)
+						ne = cal.ar_days[y][x];
+					else {
+						x = 0;
+						K = 40;
+						continue;
+					}
+					break;
+				    case 40: // KEY down
+					if (++y < cal.ar_days.length)
+						ne = cal.ar_days[y][x];
+					else {
+						nextMonth();
+						setVars();
+					}
+					break;
+				}
+				break;
+			}
+			if (ne) {
+				if (!ne.disabled)
+					Calendar.cellClick(ne);
+				else if (prev)
+					prevMonth();
+				else
+					nextMonth();
+			}
+		}
+		break;
+	    case 13: // KEY enter
+		if (act)
+			Calendar.cellClick(cal.currentDateEl, ev);
+		break;
+	    default:
+		return false;
+	}
+	return Calendar.stopEvent(ev);
+};
+
+/**
+ *  (RE)Initializes the calendar to the given date and firstDayOfWeek
+ */
+Calendar.prototype._init = function (firstDayOfWeek, date) {
+	var today = new Date(),
+		TY = today.getFullYear(),
+		TM = today.getMonth(),
+		TD = today.getDate();
+	this.table.style.visibility = "hidden";
+	var year = date.getFullYear();
+	if (year < this.minYear) {
+		year = this.minYear;
+		date.setFullYear(year);
+	} else if (year > this.maxYear) {
+		year = this.maxYear;
+		date.setFullYear(year);
+	}
+	this.firstDayOfWeek = firstDayOfWeek;
+	this.date = new Date(date);
+	var month = date.getMonth();
+	var mday = date.getDate();
+	var no_days = date.getMonthDays();
+
+	// calendar voodoo for computing the first day that would actually be
+	// displayed in the calendar, even if it's from the previous month.
+	// WARNING: this is magic. ;-)
+	date.setDate(1);
+	var day1 = (date.getDay() - this.firstDayOfWeek) % 7;
+	if (day1 < 0)
+		day1 += 7;
+	date.setDate(-day1);
+	date.setDate(date.getDate() + 1);
+
+	var row = this.tbody.firstChild;
+	var MN = Calendar._SMN[month];
+	var ar_days = this.ar_days = new Array();
+	var weekend = Calendar._TT["WEEKEND"];
+	var dates = this.multiple ? (this.datesCells = {}) : null;
+	for (var i = 0; i < 6; ++i, row = row.nextSibling) {
+		var cell = row.firstChild;
+		if (this.weekNumbers) {
+			cell.className = "day wn";
+			cell.innerHTML = date.getWeekNumber();
+			cell = cell.nextSibling;
+		}
+		row.className = "daysrow";
+		var hasdays = false, iday, dpos = ar_days[i] = [];
+		for (var j = 0; j < 7; ++j, cell = cell.nextSibling, date.setDate(iday + 1)) {
+			iday = date.getDate();
+			var wday = date.getDay();
+			cell.className = "day";
+			cell.pos = i << 4 | j;
+			dpos[j] = cell;
+			var current_month = (date.getMonth() == month);
+			if (!current_month) {
+				if (this.showsOtherMonths) {
+					cell.className += " othermonth";
+					cell.otherMonth = true;
+				} else {
+					cell.className = "emptycell";
+					cell.innerHTML = "&#160;";
+					cell.disabled = true;
+					continue;
+				}
+			} else {
+				cell.otherMonth = false;
+				hasdays = true;
+			}
+			cell.disabled = false;
+			cell.innerHTML = this.getDateText ? this.getDateText(date, iday) : iday;
+			if (dates)
+				dates[date.print("%Y%m%d")] = cell;
+			if (this.getDateStatus) {
+				var status = this.getDateStatus(date, year, month, iday);
+				if (status === true) {
+					cell.className += " disabled";
+					cell.disabled = true;
+				} else {
+					if (/disabled/i.test(status))
+						cell.disabled = true;
+					cell.className += " " + status;
+				}
+			}
+			if (!cell.disabled) {
+				cell.caldate = new Date(date);
+				cell.ttip = "_";
+				if (!this.multiple && current_month
+				    && iday == mday && this.hiliteToday) {
+					cell.className += " selected";
+					this.currentDateEl = cell;
+				}
+				if (date.getFullYear() == TY &&
+				    date.getMonth() == TM &&
+				    iday == TD) {
+					cell.className += " today";
+					cell.ttip += Calendar._TT["PART_TODAY"];
+				}
+				if (weekend.indexOf(wday.toString()) != -1)
+					cell.className += cell.otherMonth ? " oweekend" : " weekend";
+			}
+		}
+		if (!(hasdays || this.showsOtherMonths))
+			row.className = "emptyrow";
+	}
+	this.title.innerHTML = Calendar._MN[month] + ", " + year;
+	this.onSetTime();
+	this.table.style.visibility = "visible";
+	this._initMultipleDates();
+	// PROFILE
+	// this.tooltips.innerHTML = "Generated in " + ((new Date()) - today) + " ms";
+};
+
+Calendar.prototype._initMultipleDates = function() {
+	if (this.multiple) {
+		for (var i in this.multiple) {
+			var cell = this.datesCells[i];
+			var d = this.multiple[i];
+			if (!d)
+				continue;
+			if (cell)
+				cell.className += " selected";
+		}
+	}
+};
+
+Calendar.prototype._toggleMultipleDate = function(date) {
+	if (this.multiple) {
+		var ds = date.print("%Y%m%d");
+		var cell = this.datesCells[ds];
+		if (cell) {
+			var d = this.multiple[ds];
+			if (!d) {
+				Calendar.addClass(cell, "selected");
+				this.multiple[ds] = date;
+			} else {
+				Calendar.removeClass(cell, "selected");
+				delete this.multiple[ds];
+			}
+		}
+	}
+};
+
+Calendar.prototype.setDateToolTipHandler = function (unaryFunction) {
+	this.getDateToolTip = unaryFunction;
+};
+
+/**
+ *  Calls _init function above for going to a certain date (but only if the
+ *  date is different than the currently selected one).
+ */
+Calendar.prototype.setDate = function (date) {
+	if (!date.equalsTo(this.date)) {
+		this._init(this.firstDayOfWeek, date);
+	}
+};
+
+/**
+ *  Refreshes the calendar.  Useful if the "disabledHandler" function is
+ *  dynamic, meaning that the list of disabled date can change at runtime.
+ *  Just * call this function if you think that the list of disabled dates
+ *  should * change.
+ */
+Calendar.prototype.refresh = function () {
+	this._init(this.firstDayOfWeek, this.date);
+};
+
+/** Modifies the "firstDayOfWeek" parameter (pass 0 for Synday, 1 for Monday, etc.). */
+Calendar.prototype.setFirstDayOfWeek = function (firstDayOfWeek) {
+	this._init(firstDayOfWeek, this.date);
+	this._displayWeekdays();
+};
+
+/**
+ *  Allows customization of what dates are enabled.  The "unaryFunction"
+ *  parameter must be a function object that receives the date (as a JS Date
+ *  object) and returns a boolean value.  If the returned value is true then
+ *  the passed date will be marked as disabled.
+ */
+Calendar.prototype.setDateStatusHandler = Calendar.prototype.setDisabledHandler = function (unaryFunction) {
+	this.getDateStatus = unaryFunction;
+};
+
+/** Customization of allowed year range for the calendar. */
+Calendar.prototype.setRange = function (a, z) {
+	this.minYear = a;
+	this.maxYear = z;
+};
+
+/** Calls the first user handler (selectedHandler). */
+Calendar.prototype.callHandler = function () {
+	if (this.onSelected) {
+		this.onSelected(this, this.date.print(this.dateFormat));
+	}
+};
+
+/** Calls the second user handler (closeHandler). */
+Calendar.prototype.callCloseHandler = function () {
+	if (this.onClose) {
+		this.onClose(this);
+	}
+	this.hideShowCovered();
+};
+
+/** Removes the calendar object from the DOM tree and destroys it. */
+Calendar.prototype.destroy = function () {
+	var el = this.element.parentNode;
+	el.removeChild(this.element);
+	Calendar._C = null;
+	window._dynarch_popupCalendar = null;
+};
+
+/**
+ *  Moves the calendar element to a different section in the DOM tree (changes
+ *  its parent).
+ */
+Calendar.prototype.reparent = function (new_parent) {
+	var el = this.element;
+	el.parentNode.removeChild(el);
+	new_parent.appendChild(el);
+};
+
+// This gets called when the user presses a mouse button anywhere in the
+// document, if the calendar is shown.  If the click was outside the open
+// calendar this function closes it.
+Calendar._checkCalendar = function(ev) {
+	var calendar = window._dynarch_popupCalendar;
+	if (!calendar) {
+		return false;
+	}
+	var el = Calendar.is_ie ? Calendar.getElement(ev) : Calendar.getTargetElement(ev);
+	for (; el != null && el != calendar.element; el = el.parentNode);
+	if (el == null) {
+		// calls closeHandler which should hide the calendar.
+		window._dynarch_popupCalendar.callCloseHandler();
+		return Calendar.stopEvent(ev);
+	}
+};
+
+/** Shows the calendar. */
+Calendar.prototype.show = function () {
+	var rows = this.table.getElementsByTagName("tr");
+	for (var i = rows.length; i > 0;) {
+		var row = rows[--i];
+		Calendar.removeClass(row, "rowhilite");
+		var cells = row.getElementsByTagName("td");
+		for (var j = cells.length; j > 0;) {
+			var cell = cells[--j];
+			Calendar.removeClass(cell, "hilite");
+			Calendar.removeClass(cell, "active");
+		}
+	}
+	this.element.style.display = "block";
+	this.hidden = false;
+	if (this.isPopup) {
+		window._dynarch_popupCalendar = this;
+		Calendar.addEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.addEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.hideShowCovered();
+};
+
+/**
+ *  Hides the calendar.  Also removes any "hilite" from the class of any TD
+ *  element.
+ */
+Calendar.prototype.hide = function () {
+	if (this.isPopup) {
+		Calendar.removeEvent(document, "keydown", Calendar._keyEvent);
+		Calendar.removeEvent(document, "keypress", Calendar._keyEvent);
+		Calendar.removeEvent(document, "mousedown", Calendar._checkCalendar);
+	}
+	this.element.style.display = "none";
+	this.hidden = true;
+	this.hideShowCovered();
+};
+
+/**
+ *  Shows the calendar at a given absolute position (beware that, depending on
+ *  the calendar element style -- position property -- this might be relative
+ *  to the parent's containing rectangle).
+ */
+Calendar.prototype.showAt = function (x, y) {
+	var s = this.element.style;
+	s.left = x + "px";
+	s.top = y + "px";
+	this.show();
+};
+
+/** Shows the calendar near a given element. */
+Calendar.prototype.showAtElement = function (el, opts) {
+	var self = this;
+	var p = Calendar.getAbsolutePos(el);
+	if (!opts || typeof opts != "string") {
+		this.showAt(p.x, p.y + el.offsetHeight);
+		return true;
+	}
+	function fixPosition(box) {
+		if (box.x < 0)
+			box.x = 0;
+		if (box.y < 0)
+			box.y = 0;
+		var cp = document.createElement("div");
+		var s = cp.style;
+		s.position = "absolute";
+		s.right = s.bottom = s.width = s.height = "0px";
+		document.body.appendChild(cp);
+		var br = Calendar.getAbsolutePos(cp);
+		document.body.removeChild(cp);
+		if (Calendar.is_ie) {
+			br.y += document.body.scrollTop;
+			br.x += document.body.scrollLeft;
+			br.y += (document.documentElement && document.documentElement.scrollTop) || document.body.scrollTop;
+			br.x += (document.documentElement && document.documentElement.scrollLeft) || document.body.scrollLeft;
+		} else {
+			br.y += window.scrollY;
+			br.x += window.scrollX;
+		}
+		var tmp = box.x + box.width - br.x;
+		if (tmp > 0) box.x -= tmp;
+		tmp = box.y + box.height - br.y;
+		if (tmp > 0) box.y -= tmp;
+	};
+	this.element.style.display = "block";
+	Calendar.continuation_for_the_khtml_browser = function() {
+		var w = self.element.offsetWidth;
+		var h = self.element.offsetHeight;
+		self.element.style.display = "none";
+		var valign = opts.substr(0, 1);
+		var halign = "l";
+		if (opts.length > 1) {
+			halign = opts.substr(1, 1);
+		}
+		// vertical alignment
+		switch (valign) {
+		    case "T": p.y -= h; break;
+		    case "B": p.y += el.offsetHeight; break;
+		    case "C": p.y += (el.offsetHeight - h) / 2; break;
+		    case "t": p.y += el.offsetHeight - h; break;
+		    case "b": break; // already there
+		}
+		// horizontal alignment
+		switch (halign) {
+		    case "L": p.x -= w; break;
+		    case "R": p.x += el.offsetWidth; break;
+		    case "C": p.x += (el.offsetWidth - w) / 2; break;
+		    case "l": p.x += el.offsetWidth - w; break;
+		    case "r": break; // already there
+		}
+		p.width = w;
+		p.height = h + 40;
+		self.monthsCombo.style.display = "none";
+		fixPosition(p);
+		self.showAt(p.x, p.y);
+	};
+	if (Calendar.is_khtml)
+		setTimeout("Calendar.continuation_for_the_khtml_browser()", 10);
+	else
+		Calendar.continuation_for_the_khtml_browser();
+};
+
+/** Customizes the date format. */
+Calendar.prototype.setDateFormat = function (str) {
+	this.dateFormat = str;
+};
+
+/** Customizes the tooltip date format. */
+Calendar.prototype.setTtDateFormat = function (str) {
+	this.ttDateFormat = str;
+};
+
+/**
+ *  Tries to identify the date represented in a string.  If successful it also
+ *  calls this.setDate which moves the calendar to the given date.
+ */
+Calendar.prototype.parseDate = function(str, fmt) {
+	if (!fmt)
+		fmt = this.dateFormat;
+	this.setDate(Date.parseDate(str, fmt));
+};
+
+Calendar.prototype.hideShowCovered = function () {
+	if (!Calendar.is_ie && !Calendar.is_opera)
+		return;
+	function getVisib(obj){
+		var value = obj.style.visibility;
+		if (!value) {
+			if (document.defaultView && typeof (document.defaultView.getComputedStyle) == "function") { // Gecko, W3C
+				if (!Calendar.is_khtml)
+					value = document.defaultView.
+						getComputedStyle(obj, "").getPropertyValue("visibility");
+				else
+					value = '';
+			} else if (obj.currentStyle) { // IE
+				value = obj.currentStyle.visibility;
+			} else
+				value = '';
+		}
+		return value;
+	};
+
+	var tags = new Array("applet", "iframe", "select");
+	var el = this.element;
+
+	var p = Calendar.getAbsolutePos(el);
+	var EX1 = p.x;
+	var EX2 = el.offsetWidth + EX1;
+	var EY1 = p.y;
+	var EY2 = el.offsetHeight + EY1;
+
+	for (var k = tags.length; k > 0; ) {
+		var ar = document.getElementsByTagName(tags[--k]);
+		var cc = null;
+
+		for (var i = ar.length; i > 0;) {
+			cc = ar[--i];
+
+			p = Calendar.getAbsolutePos(cc);
+			var CX1 = p.x;
+			var CX2 = cc.offsetWidth + CX1;
+			var CY1 = p.y;
+			var CY2 = cc.offsetHeight + CY1;
+
+			if (this.hidden || (CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = cc.__msh_save_visibility;
+			} else {
+				if (!cc.__msh_save_visibility) {
+					cc.__msh_save_visibility = getVisib(cc);
+				}
+				cc.style.visibility = "hidden";
+			}
+		}
+	}
+};
+
+/** Internal function; it displays the bar with the names of the weekday. */
+Calendar.prototype._displayWeekdays = function () {
+	var fdow = this.firstDayOfWeek;
+	var cell = this.firstdayname;
+	var weekend = Calendar._TT["WEEKEND"];
+	for (var i = 0; i < 7; ++i) {
+		cell.className = "day name";
+		var realday = (i + fdow) % 7;
+		if (i) {
+			cell.ttip = Calendar._TT["DAY_FIRST"].replace("%s", Calendar._DN[realday]);
+			cell.navtype = 100;
+			cell.calendar = this;
+			cell.fdow = realday;
+			Calendar._add_evs(cell);
+		}
+		if (weekend.indexOf(realday.toString()) != -1) {
+			Calendar.addClass(cell, "weekend");
+		}
+		cell.innerHTML = Calendar._SDN[(i + fdow) % 7];
+		cell = cell.nextSibling;
+	}
+};
+
+/** Internal function.  Hides all combo boxes that might be displayed. */
+Calendar.prototype._hideCombos = function () {
+	this.monthsCombo.style.display = "none";
+	this.yearsCombo.style.display = "none";
+};
+
+/** Internal function.  Starts dragging the element. */
+Calendar.prototype._dragStart = function (ev) {
+	if (this.dragging) {
+		return;
+	}
+	this.dragging = true;
+	var posX;
+	var posY;
+	if (Calendar.is_ie) {
+		posY = window.event.clientY + document.body.scrollTop;
+		posX = window.event.clientX + document.body.scrollLeft;
+	} else {
+		posY = ev.clientY + window.scrollY;
+		posX = ev.clientX + window.scrollX;
+	}
+	var st = this.element.style;
+	this.xOffs = posX - parseInt(st.left);
+	this.yOffs = posY - parseInt(st.top);
+	with (Calendar) {
+		addEvent(document, "mousemove", calDragIt);
+		addEvent(document, "mouseup", calDragEnd);
+	}
+};
+
+// BEGIN: DATE OBJECT PATCHES
+
+/** Adds the number of days array to the Date object. */
+Date._MD = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+Date.parseDate = function(str, fmt) {
+	var today = new Date();
+	var y = 0;
+	var m = -1;
+	var d = 0;
+	var a = str.split(/\W+/);
+	var b = fmt.match(/%./g);
+	var i = 0, j = 0;
+	var hr = 0;
+	var min = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (!a[i])
+			continue;
+		switch (b[i]) {
+		    case "%d":
+		    case "%e":
+			d = parseInt(a[i], 10);
+			break;
+
+		    case "%m":
+			m = parseInt(a[i], 10) - 1;
+			break;
+
+		    case "%Y":
+		    case "%y":
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+			break;
+
+		    case "%b":
+		    case "%B":
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+			}
+			break;
+
+		    case "%H":
+		    case "%I":
+		    case "%k":
+		    case "%l":
+			hr = parseInt(a[i], 10);
+			break;
+
+		    case "%P":
+		    case "%p":
+			if (/pm/i.test(a[i]) && hr < 12)
+				hr += 12;
+			else if (/am/i.test(a[i]) && hr >= 12)
+				hr -= 12;
+			break;
+
+		    case "%M":
+			min = parseInt(a[i], 10);
+			break;
+		}
+	}
+	if (isNaN(y)) y = today.getFullYear();
+	if (isNaN(m)) m = today.getMonth();
+	if (isNaN(d)) d = today.getDate();
+	if (isNaN(hr)) hr = today.getHours();
+	if (isNaN(min)) min = today.getMinutes();
+	if (y != 0 && m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	y = 0; m = -1; d = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (a[i].search(/[a-zA-Z]+/) != -1) {
+			var t = -1;
+			for (j = 0; j < 12; ++j) {
+				if (Calendar._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+			}
+			if (t != -1) {
+				if (m != -1) {
+					d = m+1;
+				}
+				m = t;
+			}
+		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+			m = a[i]-1;
+		} else if (parseInt(a[i], 10) > 31 && y == 0) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		} else if (d == 0) {
+			d = a[i];
+		}
+	}
+	if (y == 0)
+		y = today.getFullYear();
+	if (m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	return today;
+};
+
+/** Returns the number of days in the current month */
+Date.prototype.getMonthDays = function(month) {
+	var year = this.getFullYear();
+	if (typeof month == "undefined") {
+		month = this.getMonth();
+	}
+	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+		return 29;
+	} else {
+		return Date._MD[month];
+	}
+};
+
+/** Returns the number of day in the year. */
+Date.prototype.getDayOfYear = function() {
+	var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+	var time = now - then;
+	return Math.floor(time / Date.DAY);
+};
+
+/** Returns the number of the week in year, as defined in ISO 8601. */
+Date.prototype.getWeekNumber = function() {
+	var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+	var DoW = d.getDay();
+	d.setDate(d.getDate() - (DoW + 6) % 7 + 3); // Nearest Thu
+	var ms = d.valueOf(); // GMT
+	d.setMonth(0);
+	d.setDate(4); // Thu in Week 1
+	return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+};
+
+/** Checks date and time equality */
+Date.prototype.equalsTo = function(date) {
+	return ((this.getFullYear() == date.getFullYear()) &&
+		(this.getMonth() == date.getMonth()) &&
+		(this.getDate() == date.getDate()) &&
+		(this.getHours() == date.getHours()) &&
+		(this.getMinutes() == date.getMinutes()));
+};
+
+/** Set only the year, month, date parts (keep existing time) */
+Date.prototype.setDateOnly = function(date) {
+	var tmp = new Date(date);
+	this.setDate(1);
+	this.setFullYear(tmp.getFullYear());
+	this.setMonth(tmp.getMonth());
+	this.setDate(tmp.getDate());
+};
+
+/** Prints the date in a string according to the given format. */
+Date.prototype.print = function (str) {
+	var m = this.getMonth();
+	var d = this.getDate();
+	var y = this.getFullYear();
+	var wn = this.getWeekNumber();
+	var w = this.getDay();
+	var s = {};
+	var hr = this.getHours();
+	var pm = (hr >= 12);
+	var ir = (pm) ? (hr - 12) : hr;
+	var dy = this.getDayOfYear();
+	if (ir == 0)
+		ir = 12;
+	var min = this.getMinutes();
+	var sec = this.getSeconds();
+	s["%a"] = Calendar._SDN[w]; // abbreviated weekday name [FIXME: I18N]
+	s["%A"] = Calendar._DN[w]; // full weekday name
+	s["%b"] = Calendar._SMN[m]; // abbreviated month name [FIXME: I18N]
+	s["%B"] = Calendar._MN[m]; // full month name
+	// FIXME: %c : preferred date and time representation for the current locale
+	s["%C"] = 1 + Math.floor(y / 100); // the century number
+	s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
+	s["%e"] = d; // the day of the month (range 1 to 31)
+	// FIXME: %D : american date style: %m/%d/%y
+	// FIXME: %E, %F, %G, %g, %h (man strftime)
+	s["%H"] = (hr < 10) ? ("0" + hr) : hr; // hour, range 00 to 23 (24h format)
+	s["%I"] = (ir < 10) ? ("0" + ir) : ir; // hour, range 01 to 12 (12h format)
+	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy; // day of the year (range 001 to 366)
+	s["%k"] = hr;		// hour, range 0 to 23 (24h format)
+	s["%l"] = ir;		// hour, range 1 to 12 (12h format)
+	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m); // month, range 01 to 12
+	s["%M"] = (min < 10) ? ("0" + min) : min; // minute, range 00 to 59
+	s["%n"] = "\n";		// a newline character
+	s["%p"] = pm ? "PM" : "AM";
+	s["%P"] = pm ? "pm" : "am";
+	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+	// FIXME: %R : the time in 24-hour notation %H:%M
+	s["%s"] = Math.floor(this.getTime() / 1000);
+	s["%S"] = (sec < 10) ? ("0" + sec) : sec; // seconds, range 00 to 59
+	s["%t"] = "\t";		// a tab character
+	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+	s["%u"] = w + 1;	// the day of the week (range 1 to 7, 1 = MON)
+	s["%w"] = w;		// the day of the week (range 0 to 6, 0 = SUN)
+	// FIXME: %x : preferred date representation for the current locale without the time
+	// FIXME: %X : preferred time representation for the current locale without the date
+	s["%y"] = ('' + y).substr(2, 2); // year without the century (range 00 to 99)
+	s["%Y"] = y;		// year with the century
+	s["%%"] = "%";		// a literal '%' character
+
+	var re = /%./g;
+	if (!Calendar.is_ie5 && !Calendar.is_khtml)
+		return str.replace(re, function (par) { return s[par] || par; });
+
+	var a = str.match(re);
+	for (var i = 0; i < a.length; i++) {
+		var tmp = s[a[i]];
+		if (tmp) {
+			re = new RegExp(a[i], 'g');
+			str = str.replace(re, tmp);
+		}
+	}
+
+	return str;
+};
+
+// END: DATE OBJECT PATCHES
+
+
+// global object that remembers the calendar
+window._dynarch_popupCalendar = null;
diff --git a/core/media/system/js/calendar.js b/core/media/system/js/calendar.js
new file mode 100644
index 00000000..990c10ec
--- /dev/null
+++ b/core/media/system/js/calendar.js
@@ -0,0 +1 @@
+Calendar=function(d,c,f,a){this.activeDiv=null;this.currentDateEl=null;this.getDateStatus=null;this.getDateToolTip=null;this.getDateText=null;this.timeout=null;this.onSelected=f||null;this.onClose=a||null;this.dragging=false;this.hidden=false;this.minYear=1970;this.maxYear=2050;this.dateFormat=Calendar._TT.DEF_DATE_FORMAT;this.ttDateFormat=Calendar._TT.TT_DATE_FORMAT;this.isPopup=true;this.weekNumbers=true;this.firstDayOfWeek=typeof d=="number"?d:Calendar._FD;this.showsOtherMonths=false;this.dateStr=c;this.ar_days=null;this.showsTime=false;this.time24=true;this.yearStep=2;this.hiliteToday=true;this.multiple=null;this.table=null;this.element=null;this.tbody=null;this.firstdayname=null;this.monthsCombo=null;this.yearsCombo=null;this.hilitedMonth=null;this.activeMonth=null;this.hilitedYear=null;this.activeYear=null;this.dateClicked=false;if(typeof Calendar._SDN=="undefined"){if(typeof Calendar._SDN_len=="undefined"){Calendar._SDN_len=3}var b=new Array();for(var e=8;e>0;){b[--e]=Calendar._DN[e].substr(0,Calendar._SDN_len)}Calendar._SDN=b;if(typeof Calendar._SMN_len=="undefined"){Calendar._SMN_len=3}b=new Array();for(var e=12;e>0;){b[--e]=Calendar._MN[e].substr(0,Calendar._SMN_len)}Calendar._SMN=b}};Calendar._C=null;Calendar.is_ie=(/msie/i.test(navigator.userAgent)&&!/opera/i.test(navigator.userAgent));Calendar.is_ie5=(Calendar.is_ie&&/msie 5\.0/i.test(navigator.userAgent));Calendar.is_opera=/opera/i.test(navigator.userAgent);Calendar.is_khtml=/Konqueror|Safari|KHTML/i.test(navigator.userAgent);Calendar.getAbsolutePos=function(e){var a=0,d=0;var c=/^div$/i.test(e.tagName);if(c&&e.scrollLeft){a=e.scrollLeft}if(c&&e.scrollTop){d=e.scrollTop}var f={x:e.offsetLeft-a,y:e.offsetTop-d};if(e.offsetParent){var b=this.getAbsolutePos(e.offsetParent);f.x+=b.x;f.y+=b.y}return f};Calendar.isRelated=function(c,a){var d=a.relatedTarget;if(!d){var b=a.type;if(b=="mouseover"){d=a.fromElement}else{if(b=="mouseout"){d=a.toElement}}}while(d){if(d==c){return true}d=d.parentNode}return false};Calendar.removeClass=function(e,d){if(!(e&&e.className)){return}var a=e.className.split(" ");var b=new Array();for(var c=a.length;c>0;){if(a[--c]!=d){b[b.length]=a[c]}}e.className=b.join(" ")};Calendar.addClass=function(b,a){Calendar.removeClass(b,a);b.className+=" "+a};Calendar.getElement=function(a){var b=Calendar.is_ie?window.event.srcElement:a.currentTarget;while(b.nodeType!=1||/^div$/i.test(b.tagName)){b=b.parentNode}return b};Calendar.getTargetElement=function(a){var b=Calendar.is_ie?window.event.srcElement:a.target;while(b.nodeType!=1){b=b.parentNode}return b};Calendar.stopEvent=function(a){a||(a=window.event);if(Calendar.is_ie){a.cancelBubble=true;a.returnValue=false}else{a.preventDefault();a.stopPropagation()}return false};Calendar.addEvent=function(a,c,b){if(a.attachEvent){a.attachEvent("on"+c,b)}else{if(a.addEventListener){a.addEventListener(c,b,true)}else{a["on"+c]=b}}};Calendar.removeEvent=function(a,c,b){if(a.detachEvent){a.detachEvent("on"+c,b)}else{if(a.removeEventListener){a.removeEventListener(c,b,true)}else{a["on"+c]=null}}};Calendar.createElement=function(c,b){var a=null;if(document.createElementNS){a=document.createElementNS("http://www.w3.org/1999/xhtml",c)}else{a=document.createElement(c)}if(typeof b!="undefined"){b.appendChild(a)}return a};Calendar._add_evs=function(el){with(Calendar){addEvent(el,"mouseover",dayMouseOver);addEvent(el,"mousedown",dayMouseDown);addEvent(el,"mouseout",dayMouseOut);if(is_ie){addEvent(el,"dblclick",dayMouseDblClick);el.setAttribute("unselectable",true)}}};Calendar.findMonth=function(a){if(typeof a.month!="undefined"){return a}else{if(typeof a.parentNode.month!="undefined"){return a.parentNode}}return null};Calendar.findYear=function(a){if(typeof a.year!="undefined"){return a}else{if(typeof a.parentNode.year!="undefined"){return a.parentNode}}return null};Calendar.showMonthsCombo=function(){var e=Calendar._C;if(!e){return false}var e=e;var f=e.activeDiv;var d=e.monthsCombo;if(e.hilitedMonth){Calendar.removeClass(e.hilitedMonth,"hilite")}if(e.activeMonth){Calendar.removeClass(e.activeMonth,"active")}var c=e.monthsCombo.getElementsByTagName("div")[e.date.getMonth()];Calendar.addClass(c,"active");e.activeMonth=c;var b=d.style;b.display="block";if(f.navtype<0){b.left=f.offsetLeft+"px"}else{var a=d.offsetWidth;if(typeof a=="undefined"){a=50}b.left=(f.offsetLeft+f.offsetWidth-a)+"px"}b.top=(f.offsetTop+f.offsetHeight)+"px"};Calendar.showYearsCombo=function(d){var a=Calendar._C;if(!a){return false}var a=a;var c=a.activeDiv;var f=a.yearsCombo;if(a.hilitedYear){Calendar.removeClass(a.hilitedYear,"hilite")}if(a.activeYear){Calendar.removeClass(a.activeYear,"active")}a.activeYear=null;var b=a.date.getFullYear()+(d?1:-1);var j=f.firstChild;var h=false;for(var e=12;e>0;--e){if(b>=a.minYear&&b<=a.maxYear){j.innerHTML=b;j.year=b;j.style.display="block";h=true}else{j.style.display="none"}j=j.nextSibling;b+=d?a.yearStep:-a.yearStep}if(h){var k=f.style;k.display="block";if(c.navtype<0){k.left=c.offsetLeft+"px"}else{var g=f.offsetWidth;if(typeof g=="undefined"){g=50}k.left=(c.offsetLeft+c.offsetWidth-g)+"px"}k.top=(c.offsetTop+c.offsetHeight)+"px"}};Calendar.tableMouseUp=function(ev){var cal=Calendar._C;if(!cal){return false}if(cal.timeout){clearTimeout(cal.timeout)}var el=cal.activeDiv;if(!el){return false}var target=Calendar.getTargetElement(ev);ev||(ev=window.event);Calendar.removeClass(el,"active");if(target==el||target.parentNode==el){Calendar.cellClick(el,ev)}var mon=Calendar.findMonth(target);var date=null;if(mon){date=new Date(cal.date);if(mon.month!=date.getMonth()){date.setMonth(mon.month);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}else{var year=Calendar.findYear(target);if(year){date=new Date(cal.date);if(year.year!=date.getFullYear()){date.setFullYear(year.year);cal.setDate(date);cal.dateClicked=false;cal.callHandler()}}}with(Calendar){removeEvent(document,"mouseup",tableMouseUp);removeEvent(document,"mouseover",tableMouseOver);removeEvent(document,"mousemove",tableMouseOver);cal._hideCombos();_C=null;return stopEvent(ev)}};Calendar.tableMouseOver=function(n){var a=Calendar._C;if(!a){return}var c=a.activeDiv;var j=Calendar.getTargetElement(n);if(j==c||j.parentNode==c){Calendar.addClass(c,"hilite active");Calendar.addClass(c.parentNode,"rowhilite")}else{if(typeof c.navtype=="undefined"||(c.navtype!=50&&(c.navtype==0||Math.abs(c.navtype)>2))){Calendar.removeClass(c,"active")}Calendar.removeClass(c,"hilite");Calendar.removeClass(c.parentNode,"rowhilite")}n||(n=window.event);if(c.navtype==50&&j!=c){var m=Calendar.getAbsolutePos(c);var p=c.offsetWidth;var o=n.clientX;var q;var l=true;if(o>m.x+p){q=o-m.x-p;l=false}else{q=m.x-o}if(q<0){q=0}var f=c._range;var h=c._current;var g=Math.floor(q/10)%f.length;for(var e=f.length;--e>=0;){if(f[e]==h){break}}while(g-->0){if(l){if(--e<0){e=f.length-1}}else{if(++e>=f.length){e=0}}}var b=f[e];c.innerHTML=b;a.onUpdateTime()}var d=Calendar.findMonth(j);if(d){if(d.month!=a.date.getMonth()){if(a.hilitedMonth){Calendar.removeClass(a.hilitedMonth,"hilite")}Calendar.addClass(d,"hilite");a.hilitedMonth=d}else{if(a.hilitedMonth){Calendar.removeClass(a.hilitedMonth,"hilite")}}}else{if(a.hilitedMonth){Calendar.removeClass(a.hilitedMonth,"hilite")}var k=Calendar.findYear(j);if(k){if(k.year!=a.date.getFullYear()){if(a.hilitedYear){Calendar.removeClass(a.hilitedYear,"hilite")}Calendar.addClass(k,"hilite");a.hilitedYear=k}else{if(a.hilitedYear){Calendar.removeClass(a.hilitedYear,"hilite")}}}else{if(a.hilitedYear){Calendar.removeClass(a.hilitedYear,"hilite")}}}return Calendar.stopEvent(n)};Calendar.tableMouseDown=function(a){if(Calendar.getTargetElement(a)==Calendar.getElement(a)){return Calendar.stopEvent(a)}};Calendar.calDragIt=function(b){var c=Calendar._C;if(!(c&&c.dragging)){return false}var e;var d;if(Calendar.is_ie){d=window.event.clientY+document.body.scrollTop;e=window.event.clientX+document.body.scrollLeft}else{e=b.pageX;d=b.pageY}c.hideShowCovered();var a=c.element.style;a.left=(e-c.xOffs)+"px";a.top=(d-c.yOffs)+"px";return Calendar.stopEvent(b)};Calendar.calDragEnd=function(ev){var cal=Calendar._C;if(!cal){return false}cal.dragging=false;with(Calendar){removeEvent(document,"mousemove",calDragIt);removeEvent(document,"mouseup",calDragEnd);tableMouseUp(ev)}cal.hideShowCovered()};Calendar.dayMouseDown=function(ev){var el=Calendar.getElement(ev);if(el.disabled){return false}var cal=el.calendar;cal.activeDiv=el;Calendar._C=cal;if(el.navtype!=300){with(Calendar){if(el.navtype==50){el._current=el.innerHTML;addEvent(document,"mousemove",tableMouseOver)}else{addEvent(document,Calendar.is_ie5?"mousemove":"mouseover",tableMouseOver)}addClass(el,"hilite active");addEvent(document,"mouseup",tableMouseUp)}}else{if(cal.isPopup){cal._dragStart(ev)}}if(el.navtype==-1||el.navtype==1){if(cal.timeout){clearTimeout(cal.timeout)}cal.timeout=setTimeout("Calendar.showMonthsCombo()",250)}else{if(el.navtype==-2||el.navtype==2){if(cal.timeout){clearTimeout(cal.timeout)}cal.timeout=setTimeout((el.navtype>0)?"Calendar.showYearsCombo(true)":"Calendar.showYearsCombo(false)",250)}else{cal.timeout=null}}return Calendar.stopEvent(ev)};Calendar.dayMouseDblClick=function(a){Calendar.cellClick(Calendar.getElement(a),a||window.event);if(Calendar.is_ie){document.selection.empty()}};Calendar.dayMouseOver=function(b){var a=Calendar.getElement(b);if(Calendar.isRelated(a,b)||Calendar._C||a.disabled){return false}if(a.ttip){if(a.ttip.substr(0,1)=="_"){a.ttip=a.caldate.print(a.calendar.ttDateFormat)+a.ttip.substr(1)}a.calendar.tooltips.innerHTML=a.ttip}if(a.navtype!=300){Calendar.addClass(a,"hilite");if(a.caldate){Calendar.addClass(a.parentNode,"rowhilite");var c=a.calendar;if(c&&c.getDateToolTip){var e=a.caldate;window.status=e;a.title=c.getDateToolTip(e,e.getFullYear(),e.getMonth(),e.getDate())}}}return Calendar.stopEvent(b)};Calendar.dayMouseOut=function(ev){with(Calendar){var el=getElement(ev);if(isRelated(el,ev)||_C||el.disabled){return false}removeClass(el,"hilite");if(el.caldate){removeClass(el.parentNode,"rowhilite")}if(el.calendar){el.calendar.tooltips.innerHTML=_TT.SEL_DATE}}};Calendar.cellClick=function(e,o){var c=e.calendar;var h=false;var l=false;var f=null;if(typeof e.navtype=="undefined"){if(c.currentDateEl){Calendar.removeClass(c.currentDateEl,"selected");Calendar.addClass(e,"selected");h=(c.currentDateEl==e);if(!h){c.currentDateEl=e}}c.date.setDateOnly(e.caldate);f=c.date;var b=!(c.dateClicked=!e.otherMonth);if(!b&&!c.currentDateEl&&c.multiple){c._toggleMultipleDate(new Date(f))}else{l=!e.disabled}if(b){c._init(c.firstDayOfWeek,f)}}else{if(e.navtype==200){Calendar.removeClass(e,"hilite");c.callCloseHandler();return}f=new Date(c.date);if(e.navtype==0){f.setDateOnly(new Date())}c.dateClicked=false;var n=f.getFullYear();var g=f.getMonth();function a(q){var r=f.getDate();var i=f.getMonthDays(q);if(r>i){f.setDate(i)}f.setMonth(q)}switch(e.navtype){case 400:Calendar.removeClass(e,"hilite");var p=Calendar._TT.ABOUT;if(typeof p!="undefined"){p+=c.showsTime?Calendar._TT.ABOUT_TIME:""}else{p='Help and about box text is not translated into this language.\nIf you know this language and you feel generous please update\nthe corresponding file in "lang" subdir to match calendar-en.js\nand send it back to <mihai_bazon@yahoo.com> to get it into the distribution  ;-)\n\nThank you!\nhttp://dynarch.com/mishoo/calendar.epl\n'}alert(p);return;case -2:if(n>c.minYear){f.setFullYear(n-1)}break;case -1:if(g>0){a(g-1)}else{if(n-->c.minYear){f.setFullYear(n);a(11)}}break;case 1:if(g<11){a(g+1)}else{if(n<c.maxYear){f.setFullYear(n+1);a(0)}}break;case 2:if(n<c.maxYear){f.setFullYear(n+1)}break;case 100:c.setFirstDayOfWeek(e.fdow);return;case 50:var k=e._range;var m=e.innerHTML;for(var j=k.length;--j>=0;){if(k[j]==m){break}}if(o&&o.shiftKey){if(--j<0){j=k.length-1}}else{if(++j>=k.length){j=0}}var d=k[j];e.innerHTML=d;c.onUpdateTime();return;case 0:if((typeof c.getDateStatus=="function")&&c.getDateStatus(f,f.getFullYear(),f.getMonth(),f.getDate())){return false}break}if(!f.equalsTo(c.date)){c.setDate(f);l=true}else{if(e.navtype==0){l=h=true}}}if(l){o&&c.callHandler()}if(h){Calendar.removeClass(e,"hilite");o&&c.callCloseHandler()}};Calendar.prototype.create=function(n){var m=null;if(!n){m=document.getElementsByTagName("body")[0];this.isPopup=true}else{m=n;this.isPopup=false}this.date=this.dateStr?new Date(this.dateStr):new Date();var q=Calendar.createElement("table");this.table=q;q.cellSpacing=0;q.cellPadding=0;q.calendar=this;Calendar.addEvent(q,"mousedown",Calendar.tableMouseDown);var a=Calendar.createElement("div");this.element=a;a.className="calendar";if(this.isPopup){a.style.position="absolute";a.style.display="none"}a.appendChild(q);var k=Calendar.createElement("thead",q);var o=null;var r=null;var b=this;var e=function(s,j,i){o=Calendar.createElement("td",r);o.colSpan=j;o.className="button";if(i!=0&&Math.abs(i)<=2){o.className+=" nav"}Calendar._add_evs(o);o.calendar=b;o.navtype=i;o.innerHTML="<div unselectable='on'>"+s+"</div>";return o};r=Calendar.createElement("tr",k);var c=6;(this.isPopup)&&--c;(this.weekNumbers)&&++c;e("?",1,400).ttip=Calendar._TT.INFO;this.title=e("",c,300);this.title.className="title";if(this.isPopup){this.title.ttip=Calendar._TT.DRAG_TO_MOVE;this.title.style.cursor="move";e("&#x00d7;",1,200).ttip=Calendar._TT.CLOSE}r=Calendar.createElement("tr",k);r.className="headrow";this._nav_py=e("&#x00ab;",1,-2);this._nav_py.ttip=Calendar._TT.PREV_YEAR;this._nav_pm=e("&#x2039;",1,-1);this._nav_pm.ttip=Calendar._TT.PREV_MONTH;this._nav_now=e(Calendar._TT.TODAY,this.weekNumbers?4:3,0);this._nav_now.ttip=Calendar._TT.GO_TODAY;this._nav_nm=e("&#x203a;",1,1);this._nav_nm.ttip=Calendar._TT.NEXT_MONTH;this._nav_ny=e("&#x00bb;",1,2);this._nav_ny.ttip=Calendar._TT.NEXT_YEAR;r=Calendar.createElement("tr",k);r.className="daynames";if(this.weekNumbers){o=Calendar.createElement("td",r);o.className="name wn";o.innerHTML=Calendar._TT.WK}for(var h=7;h>0;--h){o=Calendar.createElement("td",r);if(!h){o.navtype=100;o.calendar=this;Calendar._add_evs(o)}}this.firstdayname=(this.weekNumbers)?r.firstChild.nextSibling:r.firstChild;this._displayWeekdays();var g=Calendar.createElement("tbody",q);this.tbody=g;for(h=6;h>0;--h){r=Calendar.createElement("tr",g);if(this.weekNumbers){o=Calendar.createElement("td",r)}for(var f=7;f>0;--f){o=Calendar.createElement("td",r);o.calendar=this;Calendar._add_evs(o)}}if(this.showsTime){r=Calendar.createElement("tr",g);r.className="time";o=Calendar.createElement("td",r);o.className="time";o.colSpan=2;o.innerHTML=Calendar._TT.TIME||"&#160;";o=Calendar.createElement("td",r);o.className="time";o.colSpan=this.weekNumbers?4:3;(function(){function t(C,E,D,F){var A=Calendar.createElement("span",o);A.className=C;A.innerHTML=E;A.calendar=b;A.ttip=Calendar._TT.TIME_PART;A.navtype=50;A._range=[];if(typeof D!="number"){A._range=D}else{for(var B=D;B<=F;++B){var z;if(B<10&&F>=10){z="0"+B}else{z=""+B}A._range[A._range.length]=z}}Calendar._add_evs(A);return A}var x=b.date.getHours();var i=b.date.getMinutes();var y=!b.time24;var j=(x>12);if(y&&j){x-=12}var v=t("hour",x,y?1:0,y?12:23);var u=Calendar.createElement("span",o);u.innerHTML=":";u.className="colon";var s=t("minute",i,0,59);var w=null;o=Calendar.createElement("td",r);o.className="time";o.colSpan=2;if(y){w=t("ampm",j?"pm":"am",["am","pm"])}else{o.innerHTML="&#160;"}b.onSetTime=function(){var A,z=this.date.getHours(),B=this.date.getMinutes();if(y){A=(z>=12);if(A){z-=12}if(z==0){z=12}w.innerHTML=A?"pm":"am"}v.innerHTML=(z<10)?("0"+z):z;s.innerHTML=(B<10)?("0"+B):B};b.onUpdateTime=function(){var A=this.date;var B=parseInt(v.innerHTML,10);if(y){if(/pm/i.test(w.innerHTML)&&B<12){B+=12}else{if(/am/i.test(w.innerHTML)&&B==12){B=0}}}var C=A.getDate();var z=A.getMonth();var D=A.getFullYear();A.setHours(B);A.setMinutes(parseInt(s.innerHTML,10));A.setFullYear(D);A.setMonth(z);A.setDate(C);this.dateClicked=false;this.callHandler()}})()}else{this.onSetTime=this.onUpdateTime=function(){}}var l=Calendar.createElement("tfoot",q);r=Calendar.createElement("tr",l);r.className="footrow";o=e(Calendar._TT.SEL_DATE,this.weekNumbers?8:7,300);o.className="ttip";if(this.isPopup){o.ttip=Calendar._TT.DRAG_TO_MOVE;o.style.cursor="move"}this.tooltips=o;a=Calendar.createElement("div",this.element);this.monthsCombo=a;a.className="combo";for(h=0;h<Calendar._MN.length;++h){var d=Calendar.createElement("div");d.className=Calendar.is_ie?"label-IEfix":"label";d.month=h;d.innerHTML=Calendar._SMN[h];a.appendChild(d)}a=Calendar.createElement("div",this.element);this.yearsCombo=a;a.className="combo";for(h=12;h>0;--h){var p=Calendar.createElement("div");p.className=Calendar.is_ie?"label-IEfix":"label";a.appendChild(p)}this._init(this.firstDayOfWeek,this.date);m.appendChild(this.element)};Calendar._keyEvent=function(k){var a=window._dynarch_popupCalendar;if(!a||a.multiple){return false}(Calendar.is_ie)&&(k=window.event);var i=(Calendar.is_ie||k.type=="keypress"),l=k.keyCode;if(k.ctrlKey){switch(l){case 37:i&&Calendar.cellClick(a._nav_pm);break;case 38:i&&Calendar.cellClick(a._nav_py);break;case 39:i&&Calendar.cellClick(a._nav_nm);break;case 40:i&&Calendar.cellClick(a._nav_ny);break;default:return false}}else{switch(l){case 32:Calendar.cellClick(a._nav_now);break;case 27:i&&a.callCloseHandler();break;case 37:case 38:case 39:case 40:if(i){var e,m,j,g,c,d;e=l==37||l==38;d=(l==37||l==39)?1:7;function b(){c=a.currentDateEl;var n=c.pos;m=n&15;j=n>>4;g=a.ar_days[j][m]}b();function f(){var n=new Date(a.date);n.setDate(n.getDate()-d);a.setDate(n)}function h(){var n=new Date(a.date);n.setDate(n.getDate()+d);a.setDate(n)}while(1){switch(l){case 37:if(--m>=0){g=a.ar_days[j][m]}else{m=6;l=38;continue}break;case 38:if(--j>=0){g=a.ar_days[j][m]}else{f();b()}break;case 39:if(++m<7){g=a.ar_days[j][m]}else{m=0;l=40;continue}break;case 40:if(++j<a.ar_days.length){g=a.ar_days[j][m]}else{h();b()}break}break}if(g){if(!g.disabled){Calendar.cellClick(g)}else{if(e){f()}else{h()}}}}break;case 13:if(i){Calendar.cellClick(a.currentDateEl,k)}break;default:return false}}return Calendar.stopEvent(k)};Calendar.prototype._init=function(m,w){var v=new Date(),q=v.getFullYear(),y=v.getMonth(),b=v.getDate();this.table.style.visibility="hidden";var h=w.getFullYear();if(h<this.minYear){h=this.minYear;w.setFullYear(h)}else{if(h>this.maxYear){h=this.maxYear;w.setFullYear(h)}}this.firstDayOfWeek=m;this.date=new Date(w);var x=w.getMonth();var A=w.getDate();var z=w.getMonthDays();w.setDate(1);var r=(w.getDay()-this.firstDayOfWeek)%7;if(r<0){r+=7}w.setDate(-r);w.setDate(w.getDate()+1);var e=this.tbody.firstChild;var k=Calendar._SMN[x];var o=this.ar_days=new Array();var n=Calendar._TT.WEEKEND;var d=this.multiple?(this.datesCells={}):null;for(var t=0;t<6;++t,e=e.nextSibling){var a=e.firstChild;if(this.weekNumbers){a.className="day wn";a.innerHTML=w.getWeekNumber();a=a.nextSibling}e.className="daysrow";var u=false,f,c=o[t]=[];for(var s=0;s<7;++s,a=a.nextSibling,w.setDate(f+1)){f=w.getDate();var g=w.getDay();a.className="day";a.pos=t<<4|s;c[s]=a;var l=(w.getMonth()==x);if(!l){if(this.showsOtherMonths){a.className+=" othermonth";a.otherMonth=true}else{a.className="emptycell";a.innerHTML="&#160;";a.disabled=true;continue}}else{a.otherMonth=false;u=true}a.disabled=false;a.innerHTML=this.getDateText?this.getDateText(w,f):f;if(d){d[w.print("%Y%m%d")]=a}if(this.getDateStatus){var p=this.getDateStatus(w,h,x,f);if(p===true){a.className+=" disabled";a.disabled=true}else{if(/disabled/i.test(p)){a.disabled=true}a.className+=" "+p}}if(!a.disabled){a.caldate=new Date(w);a.ttip="_";if(!this.multiple&&l&&f==A&&this.hiliteToday){a.className+=" selected";this.currentDateEl=a}if(w.getFullYear()==q&&w.getMonth()==y&&f==b){a.className+=" today";a.ttip+=Calendar._TT.PART_TODAY}if(n.indexOf(g.toString())!=-1){a.className+=a.otherMonth?" oweekend":" weekend"}}}if(!(u||this.showsOtherMonths)){e.className="emptyrow"}}this.title.innerHTML=Calendar._MN[x]+", "+h;this.onSetTime();this.table.style.visibility="visible";this._initMultipleDates()};Calendar.prototype._initMultipleDates=function(){if(this.multiple){for(var b in this.multiple){var a=this.datesCells[b];var c=this.multiple[b];if(!c){continue}if(a){a.className+=" selected"}}}};Calendar.prototype._toggleMultipleDate=function(b){if(this.multiple){var c=b.print("%Y%m%d");var a=this.datesCells[c];if(a){var e=this.multiple[c];if(!e){Calendar.addClass(a,"selected");this.multiple[c]=b}else{Calendar.removeClass(a,"selected");delete this.multiple[c]}}}};Calendar.prototype.setDateToolTipHandler=function(a){this.getDateToolTip=a};Calendar.prototype.setDate=function(a){if(!a.equalsTo(this.date)){this._init(this.firstDayOfWeek,a)}};Calendar.prototype.refresh=function(){this._init(this.firstDayOfWeek,this.date)};Calendar.prototype.setFirstDayOfWeek=function(a){this._init(a,this.date);this._displayWeekdays()};Calendar.prototype.setDateStatusHandler=Calendar.prototype.setDisabledHandler=function(a){this.getDateStatus=a};Calendar.prototype.setRange=function(b,c){this.minYear=b;this.maxYear=c};Calendar.prototype.callHandler=function(){if(this.onSelected){this.onSelected(this,this.date.print(this.dateFormat))}};Calendar.prototype.callCloseHandler=function(){if(this.onClose){this.onClose(this)}this.hideShowCovered()};Calendar.prototype.destroy=function(){var a=this.element.parentNode;a.removeChild(this.element);Calendar._C=null;window._dynarch_popupCalendar=null};Calendar.prototype.reparent=function(b){var a=this.element;a.parentNode.removeChild(a);b.appendChild(a)};Calendar._checkCalendar=function(b){var c=window._dynarch_popupCalendar;if(!c){return false}var a=Calendar.is_ie?Calendar.getElement(b):Calendar.getTargetElement(b);for(;a!=null&&a!=c.element;a=a.parentNode){}if(a==null){window._dynarch_popupCalendar.callCloseHandler();return Calendar.stopEvent(b)}};Calendar.prototype.show=function(){var e=this.table.getElementsByTagName("tr");for(var d=e.length;d>0;){var f=e[--d];Calendar.removeClass(f,"rowhilite");var c=f.getElementsByTagName("td");for(var b=c.length;b>0;){var a=c[--b];Calendar.removeClass(a,"hilite");Calendar.removeClass(a,"active")}}this.element.style.display="block";this.hidden=false;if(this.isPopup){window._dynarch_popupCalendar=this;Calendar.addEvent(document,"keydown",Calendar._keyEvent);Calendar.addEvent(document,"keypress",Calendar._keyEvent);Calendar.addEvent(document,"mousedown",Calendar._checkCalendar)}this.hideShowCovered()};Calendar.prototype.hide=function(){if(this.isPopup){Calendar.removeEvent(document,"keydown",Calendar._keyEvent);Calendar.removeEvent(document,"keypress",Calendar._keyEvent);Calendar.removeEvent(document,"mousedown",Calendar._checkCalendar)}this.element.style.display="none";this.hidden=true;this.hideShowCovered()};Calendar.prototype.showAt=function(a,c){var b=this.element.style;b.left=a+"px";b.top=c+"px";this.show()};Calendar.prototype.showAtElement=function(c,d){var a=this;var e=Calendar.getAbsolutePos(c);if(!d||typeof d!="string"){this.showAt(e.x,e.y+c.offsetHeight);return true}function b(i){if(i.x<0){i.x=0}if(i.y<0){i.y=0}var j=document.createElement("div");var h=j.style;h.position="absolute";h.right=h.bottom=h.width=h.height="0px";document.body.appendChild(j);var g=Calendar.getAbsolutePos(j);document.body.removeChild(j);if(Calendar.is_ie){g.y+=(document.documentElement&&document.documentElement.scrollTop)||document.body.scrollTop;g.x+=(document.documentElement&&document.documentElement.scrollLeft)||document.body.scrollLeft}else{g.y+=window.scrollY;g.x+=window.scrollX}var f=i.x+i.width-g.x;if(f>0){i.x-=f}f=i.y+i.height-g.y;if(f>0){i.y-=f}}this.element.style.display="block";Calendar.continuation_for_the_khtml_browser=function(){var f=a.element.offsetWidth;var i=a.element.offsetHeight;a.element.style.display="none";var g=d.substr(0,1);var j="l";if(d.length>1){j=d.substr(1,1)}switch(g){case"T":e.y-=i;break;case"B":e.y+=c.offsetHeight;break;case"C":e.y+=(c.offsetHeight-i)/2;break;case"t":e.y+=c.offsetHeight-i;break;case"b":break}switch(j){case"L":e.x-=f;break;case"R":e.x+=c.offsetWidth;break;case"C":e.x+=(c.offsetWidth-f)/2;break;case"l":e.x+=c.offsetWidth-f;break;case"r":break}e.width=f;e.height=i+40;a.monthsCombo.style.display="none";b(e);a.showAt(e.x,e.y)};if(Calendar.is_khtml){setTimeout("Calendar.continuation_for_the_khtml_browser()",10)}else{Calendar.continuation_for_the_khtml_browser()}};Calendar.prototype.setDateFormat=function(a){this.dateFormat=a};Calendar.prototype.setTtDateFormat=function(a){this.ttDateFormat=a};Calendar.prototype.parseDate=function(b,a){if(!a){a=this.dateFormat}this.setDate(Date.parseDate(b,a))};Calendar.prototype.hideShowCovered=function(){if(!Calendar.is_ie&&!Calendar.is_opera){return}function b(k){var i=k.style.visibility;if(!i){if(document.defaultView&&typeof(document.defaultView.getComputedStyle)=="function"){if(!Calendar.is_khtml){i=document.defaultView.getComputedStyle(k,"").getPropertyValue("visibility")}else{i=""}}else{if(k.currentStyle){i=k.currentStyle.visibility}else{i=""}}}return i}var s=new Array("applet","iframe","select");var c=this.element;var a=Calendar.getAbsolutePos(c);var f=a.x;var d=c.offsetWidth+f;var r=a.y;var q=c.offsetHeight+r;for(var h=s.length;h>0;){var g=document.getElementsByTagName(s[--h]);var e=null;for(var l=g.length;l>0;){e=g[--l];a=Calendar.getAbsolutePos(e);var o=a.x;var n=e.offsetWidth+o;var m=a.y;var j=e.offsetHeight+m;if(this.hidden||(o>d)||(n<f)||(m>q)||(j<r)){if(!e.__msh_save_visibility){e.__msh_save_visibility=b(e)}e.style.visibility=e.__msh_save_visibility}else{if(!e.__msh_save_visibility){e.__msh_save_visibility=b(e)}e.style.visibility="hidden"}}}};Calendar.prototype._displayWeekdays=function(){var b=this.firstDayOfWeek;var a=this.firstdayname;var d=Calendar._TT.WEEKEND;for(var c=0;c<7;++c){a.className="day name";var e=(c+b)%7;if(c){a.ttip=Calendar._TT.DAY_FIRST.replace("%s",Calendar._DN[e]);a.navtype=100;a.calendar=this;a.fdow=e;Calendar._add_evs(a)}if(d.indexOf(e.toString())!=-1){Calendar.addClass(a,"weekend")}a.innerHTML=Calendar._SDN[(c+b)%7];a=a.nextSibling}};Calendar.prototype._hideCombos=function(){this.monthsCombo.style.display="none";this.yearsCombo.style.display="none"};Calendar.prototype._dragStart=function(ev){if(this.dragging){return}this.dragging=true;var posX;var posY;if(Calendar.is_ie){posY=window.event.clientY+document.body.scrollTop;posX=window.event.clientX+document.body.scrollLeft}else{posY=ev.clientY+window.scrollY;posX=ev.clientX+window.scrollX}var st=this.element.style;this.xOffs=posX-parseInt(st.left);this.yOffs=posY-parseInt(st.top);with(Calendar){addEvent(document,"mousemove",calDragIt);addEvent(document,"mouseup",calDragEnd)}};Date._MD=new Array(31,28,31,30,31,30,31,31,30,31,30,31);Date.SECOND=1000;Date.MINUTE=60*Date.SECOND;Date.HOUR=60*Date.MINUTE;Date.DAY=24*Date.HOUR;Date.WEEK=7*Date.DAY;Date.parseDate=function(l,c){var n=new Date();var o=0;var e=-1;var k=0;var q=l.split(/\W+/);var p=c.match(/%./g);var h=0,g=0;var r=0;var f=0;for(h=0;h<q.length;++h){if(!q[h]){continue}switch(p[h]){case"%d":case"%e":k=parseInt(q[h],10);break;case"%m":e=parseInt(q[h],10)-1;break;case"%Y":case"%y":o=parseInt(q[h],10);(o<100)&&(o+=(o>29)?1900:2000);break;case"%b":case"%B":for(g=0;g<12;++g){if(Calendar._MN[g].substr(0,q[h].length).toLowerCase()==q[h].toLowerCase()){e=g;break}}break;case"%H":case"%I":case"%k":case"%l":r=parseInt(q[h],10);break;case"%P":case"%p":if(/pm/i.test(q[h])&&r<12){r+=12}else{if(/am/i.test(q[h])&&r>=12){r-=12}}break;case"%M":f=parseInt(q[h],10);break}}if(isNaN(o)){o=n.getFullYear()}if(isNaN(e)){e=n.getMonth()}if(isNaN(k)){k=n.getDate()}if(isNaN(r)){r=n.getHours()}if(isNaN(f)){f=n.getMinutes()}if(o!=0&&e!=-1&&k!=0){return new Date(o,e,k,r,f,0)}o=0;e=-1;k=0;for(h=0;h<q.length;++h){if(q[h].search(/[a-zA-Z]+/)!=-1){var s=-1;for(g=0;g<12;++g){if(Calendar._MN[g].substr(0,q[h].length).toLowerCase()==q[h].toLowerCase()){s=g;break}}if(s!=-1){if(e!=-1){k=e+1}e=s}}else{if(parseInt(q[h],10)<=12&&e==-1){e=q[h]-1}else{if(parseInt(q[h],10)>31&&o==0){o=parseInt(q[h],10);(o<100)&&(o+=(o>29)?1900:2000)}else{if(k==0){k=q[h]}}}}}if(o==0){o=n.getFullYear()}if(e!=-1&&k!=0){return new Date(o,e,k,r,f,0)}return n};Date.prototype.getMonthDays=function(b){var a=this.getFullYear();if(typeof b=="undefined"){b=this.getMonth()}if(((0==(a%4))&&((0!=(a%100))||(0==(a%400))))&&b==1){return 29}else{return Date._MD[b]}};Date.prototype.getDayOfYear=function(){var a=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var c=new Date(this.getFullYear(),0,0,0,0,0);var b=a-c;return Math.floor(b/Date.DAY)};Date.prototype.getWeekNumber=function(){var c=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0);var b=c.getDay();c.setDate(c.getDate()-(b+6)%7+3);var a=c.valueOf();c.setMonth(0);c.setDate(4);return Math.round((a-c.valueOf())/(7*86400000))+1};Date.prototype.equalsTo=function(a){return((this.getFullYear()==a.getFullYear())&&(this.getMonth()==a.getMonth())&&(this.getDate()==a.getDate())&&(this.getHours()==a.getHours())&&(this.getMinutes()==a.getMinutes()))};Date.prototype.setDateOnly=function(a){var b=new Date(a);this.setDate(1);this.setFullYear(b.getFullYear());this.setMonth(b.getMonth());this.setDate(b.getDate())};Date.prototype.print=function(l){var b=this.getMonth();var k=this.getDate();var n=this.getFullYear();var p=this.getWeekNumber();var q=this.getDay();var v={};var r=this.getHours();var c=(r>=12);var h=(c)?(r-12):r;var u=this.getDayOfYear();if(h==0){h=12}var e=this.getMinutes();var j=this.getSeconds();v["%a"]=Calendar._SDN[q];v["%A"]=Calendar._DN[q];v["%b"]=Calendar._SMN[b];v["%B"]=Calendar._MN[b];v["%C"]=1+Math.floor(n/100);v["%d"]=(k<10)?("0"+k):k;v["%e"]=k;v["%H"]=(r<10)?("0"+r):r;v["%I"]=(h<10)?("0"+h):h;v["%j"]=(u<100)?((u<10)?("00"+u):("0"+u)):u;v["%k"]=r;v["%l"]=h;v["%m"]=(b<9)?("0"+(1+b)):(1+b);v["%M"]=(e<10)?("0"+e):e;v["%n"]="\n";v["%p"]=c?"PM":"AM";v["%P"]=c?"pm":"am";v["%s"]=Math.floor(this.getTime()/1000);v["%S"]=(j<10)?("0"+j):j;v["%t"]="\t";v["%U"]=v["%W"]=v["%V"]=(p<10)?("0"+p):p;v["%u"]=q+1;v["%w"]=q;v["%y"]=(""+n).substr(2,2);v["%Y"]=n;v["%%"]="%";var t=/%./g;if(!Calendar.is_ie5&&!Calendar.is_khtml){return l.replace(t,function(a){return v[a]||a})}var o=l.match(t);for(var g=0;g<o.length;g++){var f=v[o[g]];if(f){t=new RegExp(o[g],"g");l=l.replace(t,f)}}return l};window._dynarch_popupCalendar=null;
\ No newline at end of file
diff --git a/core/media/system/js/caption-uncompressed.js b/core/media/system/js/caption-uncompressed.js
new file mode 100644
index 00000000..e0f3bdd9
--- /dev/null
+++ b/core/media/system/js/caption-uncompressed.js
@@ -0,0 +1,49 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * JCaption javascript behavior
+ *
+ * Used for displaying image captions
+ *
+ * @package     Joomla
+ * @since       1.5
+ * @version  1.0
+ */
+var JCaption = function(_selector) {
+    var $, selector,
+    
+    initialize = function(_selector) {
+        $ = jQuery.noConflict();
+        selector = _selector;
+        $(selector).each(function(index, el) {
+            createCaption(el);
+        })
+    },
+    
+    createCaption = function(element) {
+        var $el = $(element), 
+        caption = $el.attr('title'),
+        width = $el.attr("width") || element.width,
+        align = $el.attr("align") || $el.css("float") || element.style.styleFloat || "none",
+        $p = $('<p/>', {
+            "text" : caption,
+            "class" : selector.replace('.', '_')
+        }),
+        $container = $('<div/>', {
+            "class" : selector.replace('.', '_') + " " + align,
+            "css" : {
+                "float" : align,
+                "width" : width
+            }
+        });
+        $el.before($container);
+        $container.append($el);
+        if (caption !== "") {
+            $container.append($p);
+        }
+    }
+    initialize(_selector);
+}
diff --git a/core/media/system/js/caption.js b/core/media/system/js/caption.js
new file mode 100644
index 00000000..09e4dfc3
--- /dev/null
+++ b/core/media/system/js/caption.js
@@ -0,0 +1,4 @@
+/*
+        GNU General Public License version 2 or later; see LICENSE.txt
+*/
+var JCaption=function(c){var e,b,a=function(f){e=jQuery.noConflict();b=f;e(b).each(function(g,h){d(h)})},d=function(i){var h=e(i),f=h.attr("title"),j=h.attr("width")||i.width,l=h.attr("align")||h.css("float")||i.style.styleFloat||"none",g=e("<p/>",{text:f,"class":b.replace(".","_")}),k=e("<div/>",{"class":b.replace(".","_")+" "+l,css:{"float":l,width:j}});h.before(k);k.append(h);if(f!==""){k.append(g)}};a(c)};
diff --git a/core/media/system/js/color-field-adv-init.js b/core/media/system/js/color-field-adv-init.js
new file mode 100644
index 00000000..8bf87ac9
--- /dev/null
+++ b/core/media/system/js/color-field-adv-init.js
@@ -0,0 +1,23 @@
+jQuery(document).ready(function ($){
+
+	function initMinicolors(event, container) {
+		$(container || document).find('.minicolors').each(function() {
+			$(this).minicolors({
+				control: $(this).attr('data-control') || 'hue',
+				format: $(this).attr('data-validate') === 'color'
+					? 'hex'
+					: ($(this).attr('data-format') === 'rgba'
+						? 'rgb'
+						: $(this).attr('data-format'))
+					|| 'hex',
+				keywords: $(this).attr('data-keywords') || '',
+				opacity: $(this).attr('data-format') === 'rgba' ? true : false || false,
+				position: $(this).attr('data-position') || 'default',
+				theme: 'bootstrap'
+			});
+		});
+	}
+
+	initMinicolors();
+	$(document).on('subform-row-add', initMinicolors);
+});
diff --git a/core/media/system/js/color-field-adv-init.min.js b/core/media/system/js/color-field-adv-init.min.js
new file mode 100644
index 00000000..62b5fc62
--- /dev/null
+++ b/core/media/system/js/color-field-adv-init.min.js
@@ -0,0 +1 @@
+jQuery(document).ready(function($){function initMinicolors(event,container){$(container||document).find(".minicolors").each(function(){$(this).minicolors({control:$(this).attr("data-control")||"hue",format:$(this).attr("data-validate")==="color"?"hex":($(this).attr("data-format")==="rgba"?"rgb":$(this).attr("data-format"))||"hex",keywords:$(this).attr("data-keywords")||"",opacity:$(this).attr("data-format")==="rgba"?true:false||false,position:$(this).attr("data-position")||"default",theme:"bootstrap"})})}initMinicolors();$(document).on("subform-row-add",initMinicolors)});
\ No newline at end of file
diff --git a/core/media/system/js/color-field-init.js b/core/media/system/js/color-field-init.js
new file mode 100644
index 00000000..90de913c
--- /dev/null
+++ b/core/media/system/js/color-field-init.js
@@ -0,0 +1,7 @@
+jQuery(document).ready(function ($){
+	$('select.simplecolors').simplecolors();
+
+	$(document).on('subform-row-add', function(event, row){
+		$(row).find('select.simplecolors').simplecolors();
+	});
+});
diff --git a/core/media/system/js/color-field-init.min.js b/core/media/system/js/color-field-init.min.js
new file mode 100644
index 00000000..c81933a7
--- /dev/null
+++ b/core/media/system/js/color-field-init.min.js
@@ -0,0 +1 @@
+jQuery(document).ready(function($){$("select.simplecolors").simplecolors();$(document).on("subform-row-add",function(event,row){$(row).find("select.simplecolors").simplecolors()})});
\ No newline at end of file
diff --git a/core/media/system/js/combobox-uncompressed.js b/core/media/system/js/combobox-uncompressed.js
new file mode 100644
index 00000000..92770260
--- /dev/null
+++ b/core/media/system/js/combobox-uncompressed.js
@@ -0,0 +1,289 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Unobtrusive transformation for combobox
+ *
+ *
+ * @package		Joomla.Framework
+ * @subpackage	Forms
+ */
+
+(function($,document,undefined)
+{
+	var combobox = function(options, elem)
+	{
+		var self = {},
+
+		init = function(options, elem)
+		{
+			self.$elem = $(elem);
+			self.options = $.extend({}, $.fn.ComboTransform.options, options);
+			self.$input = $(elem).find('input[type="text"]');
+			self.$dropBtnDiv = $(elem).find('div.btn-group');
+			self.$dropBtn = self.$dropBtnDiv.find('[type="button"]');
+			self.$dropDown = $(elem).find('ul.dropdown-menu'),
+			self.$dropDownOptions = self.$dropDown.find('li a');
+			self.$dropDown.isEmpty = false;
+			self.$dropBtn.isClicked = false;
+			render();
+
+			addEventHandlers();
+		},
+
+		render = function()
+		{
+			// Align dropdown correctly
+			var inputWidth = self.$elem.width(),
+				btnWidth = self.$dropBtnDiv.width(),
+				totalWidth = inputWidth - 3,
+				dropDownLeft = -inputWidth + btnWidth,
+				dropDownWidth = self.$dropDown.width();
+
+			dropDownWidth < totalWidth ? self.$dropDown.width(totalWidth+'px') : null;
+			self.$dropDown.css('left',dropDownLeft+'px');
+			self.$dropDown.css('max-height','150px');
+			self.$dropDown.css('overflow-y','scroll');
+			self.$dropDown.css('left',dropDownLeft+'px');
+		},
+
+		addEventHandlers = function()
+		{
+			self.$input.bind('focus', drop);
+			self.$input.bind('blur', pick);
+
+			if(self.options.updateList)
+			{
+				self.$input.bind('keyup', updateList);
+			}
+
+			self.$dropDown.on('mouseenter',function() {
+				highlight('clear');
+				self.$input.unbind('blur', pick);
+			});
+			self.$dropDown.on('mouseleave',function(event) {
+				self.$input.bind('blur', pick);
+			});
+
+			self.$dropBtn.on('click', focusCombo);
+
+			self.$dropDown.find('li').on('click', updateCombo);
+			self.$dropDown.find('li a').on('mouseenter', function(){
+				$(this).addClass('hover');
+				self.$currHovered = $(this);
+			});
+			self.$dropDown.find('li a').on('mouseleave', function(){
+				$(this).removeClass('hover');
+			});
+		},
+
+		drop = function()
+		{
+			if(!self.$dropDown.isEmpty)
+			{
+				var dropDownHeight = self.$dropDown.height(),
+					inputClientHeight = self.$input[0].clientHeight,
+					inputHeight = self.$input.height(),
+					dropDownTop = -(inputHeight + dropDownHeight);
+
+				// Drop it in viewable area
+				self.$dropDown.css('top','100%');
+
+				self.$elem.addClass('nav-hover');
+				self.$dropBtnDiv.addClass('open');
+
+				if(!inViewport(self.$dropDown))
+				{
+					self.$dropDown.css('top',dropDownTop+'px');
+				}
+
+				// Prevent form submit on enter press
+				self.$input.bind('keypress keydown keyup', preventSubmit);
+			}
+		},
+
+		pick = function()
+		{
+			self.$elem.removeClass('nav-hover');
+			self.$dropBtnDiv.removeClass('open');
+
+			if(self.$dropBtn.isClicked)
+			{
+				self.$dropBtn.isClicked = false;
+				self.$dropDown.isEmpty = true;
+			}
+
+			highlight('clear');
+
+			self.$input.unbind('keypress keydown keyup', preventSubmit);
+		},
+
+		focusCombo = function()
+		{
+			var $options = self.$dropDownOptions;
+			$options.show();
+			self.$dropBtn.isClicked = self.$dropDown.isEmpty;
+			self.$dropDown.isEmpty = false;
+			self.$input.focus();
+		},
+
+		updateCombo = function(event)
+		{
+			var selectedOption = $(event.target).text();
+			self.$input.val(selectedOption);
+			pick();
+			return false;
+		},
+
+		updateList = function(event)
+		{
+			var keycode = event && (event.keycode || event.which);
+			keycode = event.ctrlKey || event.altKey ? -1 : keycode;
+
+			if ((keycode > 47 && keycode < 59) || (keycode > 62 && keycode < 127) || keycode == 32  || keycode == 8)
+			{
+				var text = self.$input.val().toLowerCase(),
+					$options = self.$dropDownOptions,
+					hiddenOptions = 0,
+					moveHilighter = false;
+				$options.each(function()
+				{
+					 if(this.innerHTML.toLowerCase().indexOf(text) == 0)
+					 {
+					 	$(this).show();
+					 }
+					 else
+					 {
+					 	$(this).hide();
+					 	if($(this).hasClass('hover'))
+					 	{
+					 		moveHilighter = true;
+					 	}
+
+					 	hiddenOptions++;
+					 }
+				});
+
+				if(hiddenOptions == $options.length)
+				{
+					self.$dropDown.isEmpty = true;
+					pick();
+				}
+				else
+				{
+					self.$dropDown.isEmpty = false;
+					if(moveHilighter)
+					{
+						highlight("clear");
+					}
+					drop();
+				}
+			}
+			else if(!self.$dropDown.isEmpty)
+			{
+				// Change selected option in list
+				if(keycode == 38)
+				{
+					highlight("prev");
+				}
+				else if(keycode == 40)
+				{
+					highlight("next");
+				}
+				else if(keycode == 13 && self.$currHovered != null)
+				{
+					self.$input.val(self.$currHovered.html());
+					pick();
+				}
+			}
+		},
+
+		highlight = function(newHighlight)
+		{
+			if(newHighlight == "next" || newHighlight == "prev")
+			{
+				var $visibleOptions = self.$dropDownOptions.filter(':visible'),
+					$currHovered = $visibleOptions.filter('.hover'),
+					index = $visibleOptions.index($currHovered),
+					$optionToHover;
+
+				// Change selected option in list
+				if(newHighlight == "prev")
+				{
+					index = index == -1 ? $visibleOptions.length -1 :  index - 1;
+				}
+				else
+				{
+					index = index == $visibleOptions.length - 1 ? 0 : index + 1;
+				}
+
+				if($currHovered.length != 0)
+				{
+					$currHovered.removeClass('hover');
+				}
+
+				$optionToHover = $visibleOptions.eq(index);
+				self.$currHovered = $optionToHover;
+				self.$currHovered.addClass('hover');
+
+				scrollTo(self.$dropDown, self.$currHovered);
+			}
+			else if(newHighlight == "clear")
+			{
+				self.$currHovered != null ? self.$currHovered.removeClass('hover') : null;
+				self.$currHovered = null;
+			}
+		},
+
+		// Helper functions
+		inViewport = function(el)
+		{
+		    var rect = el[0].getBoundingClientRect();
+		    return (
+		        rect.top >= 0 &&
+		        rect.left >= 0 &&
+		        rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /*or $(window).height() */
+		        rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */
+		        );
+		},
+
+		scrollTo = function(p, e)
+		{
+			z = p[0].getBoundingClientRect();
+			r = e[0].getBoundingClientRect();
+
+			if(!(r.top >= z.top && r.left >= z.left && (r.top+r.height) <= (z.top+z.height)))
+			{
+				var value = r.top - z.top + p.scrollTop();
+				p.scrollTop(value);
+			}
+		},
+
+		preventSubmit = function(event)
+		{
+			if(event.keyCode == 13)
+			{
+				event.preventDefault();
+			}
+		};
+
+		init(options, elem);
+	};
+	$.fn.ComboTransform = function(options)
+	{
+		return this.each(function(){
+			combobox(options, this);
+		});
+	};
+
+	$.fn.ComboTransform.options = {
+		updateList : true
+	};
+
+	$(function()
+	{
+		$('div.combobox').ComboTransform({updateList : true});
+	});
+})(jQuery,document);
diff --git a/core/media/system/js/combobox.js b/core/media/system/js/combobox.js
new file mode 100644
index 00000000..62e2c78e
--- /dev/null
+++ b/core/media/system/js/combobox.js
@@ -0,0 +1 @@
+(function(e,t,n){var i=function(n,i){var s={},o=function(t,n){s.$elem=e(n);s.options=e.extend({},e.fn.ComboTransform.options,t);s.$input=e(n).find('input[type="text"]');s.$dropBtnDiv=e(n).find("div.btn-group");s.$dropBtn=s.$dropBtnDiv.find('[type="button"]');s.$dropDown=e(n).find("ul.dropdown-menu"),s.$dropDownOptions=s.$dropDown.find("li a");s.$dropDown.isEmpty=false;s.$dropBtn.isClicked=false;u();a()},u=function(){var e=s.$elem.width(),t=s.$dropBtnDiv.width(),n=e-3,r=-e+t,i=s.$dropDown.width();i<n?s.$dropDown.width(n+"px"):null;s.$dropDown.css("left",r+"px");s.$dropDown.css("max-height","150px");s.$dropDown.css("overflow-y","scroll");s.$dropDown.css("left",r+"px")},a=function(){s.$input.bind("focus",f);s.$input.bind("blur",l);if(s.options.updateList){s.$input.bind("keyup",p)}s.$dropDown.on("mouseenter",function(){d("clear");s.$input.unbind("blur",l)});s.$dropDown.on("mouseleave",function(e){s.$input.bind("blur",l)});s.$dropBtn.on("click",c);s.$dropDown.find("li").on("click",h);s.$dropDown.find("li a").on("mouseenter",function(){e(this).addClass("hover");s.$currHovered=e(this)});s.$dropDown.find("li a").on("mouseleave",function(){e(this).removeClass("hover")})},f=function(){if(!s.$dropDown.isEmpty){var e=s.$dropDown.height(),t=s.$input[0].clientHeight,n=s.$input.height(),r=-(n+e);s.$dropDown.css("top","100%");s.$elem.addClass("nav-hover");s.$dropBtnDiv.addClass("open");if(!v(s.$dropDown)){s.$dropDown.css("top",r+"px")}s.$input.bind("keypress keydown keyup",g)}},l=function(){s.$elem.removeClass("nav-hover");s.$dropBtnDiv.removeClass("open");if(s.$dropBtn.isClicked){s.$dropBtn.isClicked=false;s.$dropDown.isEmpty=true}d("clear");s.$input.unbind("keypress keydown keyup",g)},c=function(){var e=s.$dropDownOptions;e.show();s.$dropBtn.isClicked=s.$dropDown.isEmpty;s.$dropDown.isEmpty=false;s.$input.focus()},h=function(t){var n=e(t.target).text();s.$input.val(n);l();return false},p=function(t){var n=t&&(t.keycode||t.which);n=t.ctrlKey||t.altKey?-1:n;if(n>47&&n<59||n>62&&n<127||n==32||n==8){var r=s.$input.val().toLowerCase(),i=s.$dropDownOptions,o=0,u=false;i.each(function(){if(this.innerHTML.toLowerCase().indexOf(r)==0){e(this).show()}else{e(this).hide();if(e(this).hasClass("hover")){u=true}o++}});if(o==i.length){s.$dropDown.isEmpty=true;l()}else{s.$dropDown.isEmpty=false;if(u){d("clear")}f()}}else if(!s.$dropDown.isEmpty){if(n==38){d("prev")}else if(n==40){d("next")}else if(n==13&&s.$currHovered!=null){s.$input.val(s.$currHovered.html());l()}}},d=function(e){if(e=="next"||e=="prev"){var t=s.$dropDownOptions.filter(":visible"),n=t.filter(".hover"),r=t.index(n),i;if(e=="prev"){r=r==-1?t.length-1:r-1}else{r=r==t.length-1?0:r+1}if(n.length!=0){n.removeClass("hover")}i=t.eq(r);s.$currHovered=i;s.$currHovered.addClass("hover");m(s.$dropDown,s.$currHovered)}else if(e=="clear"){s.$currHovered!=null?s.$currHovered.removeClass("hover"):null;s.$currHovered=null}},v=function(e){var n=e[0].getBoundingClientRect();return n.top>=0&&n.left>=0&&n.bottom<=(window.innerHeight||t.documentElement.clientHeight)&&n.right<=(window.innerWidth||t.documentElement.clientWidth)},m=function(e,t){z=e[0].getBoundingClientRect();r=t[0].getBoundingClientRect();if(!(r.top>=z.top&&r.left>=z.left&&r.top+r.height<=z.top+z.height)){var n=r.top-z.top+e.scrollTop();e.scrollTop(n)}},g=function(e){if(e.keyCode==13){e.preventDefault()}};o(n,i)};e.fn.ComboTransform=function(e){return this.each(function(){i(e,this)})};e.fn.ComboTransform.options={updateList:true};e(function(){e("div.combobox").ComboTransform({updateList:true})})})(jQuery,document)
diff --git a/core/media/system/js/core-uncompressed.js b/core/media/system/js/core-uncompressed.js
new file mode 100644
index 00000000..55b90d27
--- /dev/null
+++ b/core/media/system/js/core-uncompressed.js
@@ -0,0 +1,955 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Only define the Joomla namespace if not defined.
+Joomla = window.Joomla || {};
+
+// Only define editors if not defined
+Joomla.editors = Joomla.editors || {};
+
+// An object to hold each editor instance on page, only define if not defined.
+Joomla.editors.instances = Joomla.editors.instances || {
+	/**
+	 * *****************************************************************
+	 * All Editors MUST register, per instance, the following callbacks:
+	 * *****************************************************************
+	 *
+	 * getValue         Type  Function  Should return the complete data from the editor
+	 *                                  Example: function () { return this.element.value; }
+	 * setValue         Type  Function  Should replace the complete data of the editor
+	 *                                  Example: function (text) { return this.element.value = text; }
+	 * replaceSelection Type  Function  Should replace the selected text of the editor
+	 *                                  If nothing selected, will insert the data at the cursor
+	 *                                  Example: function (text) { return insertAtCursor(this.element, text); }
+	 *
+	 * USAGE (assuming that jform_articletext is the textarea id)
+	 * {
+	 *   To get the current editor value:
+	 *      Joomla.editors.instances['jform_articletext'].getValue();
+	 *   To set the current editor value:
+	 *      Joomla.editors.instances['jform_articletext'].setValue('Joomla! rocks');
+	 *   To replace(selection) or insert a value at  the current editor cursor:
+	 *      replaceSelection: Joomla.editors.instances['jform_articletext'].replaceSelection('Joomla! rocks')
+	 * }
+	 *
+	 * *********************************************************
+	 * ANY INTERACTION WITH THE EDITORS SHOULD USE THE ABOVE API
+	 * *********************************************************
+	 *
+	 * jInsertEditorText() @deprecated 4.0
+	 */
+	};
+
+(function( Joomla, document ) {
+	"use strict";
+
+	/**
+	 * Generic submit form
+	 *
+	 * @param  {String}  task      The given task
+	 * @param  {node}    form      The form element
+	 * @param  {bool}    validate  The form element
+	 *
+	 * @returns  {void}
+	 */
+	Joomla.submitform = function(task, form, validate) {
+
+		if (!form) {
+			form = document.getElementById('adminForm');
+		}
+
+		if (task) {
+			form.task.value = task;
+		}
+
+		// Toggle HTML5 validation
+		form.noValidate = !validate;
+
+		if (!validate) {
+			form.setAttribute('novalidate', '');
+		} else if ( form.hasAttribute('novalidate') ) {
+			form.removeAttribute('novalidate');
+		}
+
+		// Submit the form.
+		// Create the input type="submit"
+		var button = document.createElement('input');
+		button.style.display = 'none';
+		button.type = 'submit';
+
+		// Append it and click it
+		form.appendChild(button).click();
+
+		// If "submit" was prevented, make sure we don't get a build up of buttons
+		form.removeChild(button);
+	};
+
+	/**
+	 * Default function. Can be overriden by the component to add custom logic
+	 *
+	 * @param  {bool}  task  The given task
+	 *
+	 * @returns {void}
+	 */
+	Joomla.submitbutton = function( pressbutton ) {
+		Joomla.submitform( pressbutton );
+	};
+
+	/**
+	 * Custom behavior for JavaScript I18N in Joomla! 1.6
+	 *
+	 * @type {{}}
+	 *
+	 * Allows you to call Joomla.JText._() to get a translated JavaScript string pushed in with JText::script() in Joomla.
+	 */
+	Joomla.JText = {
+		strings:   {},
+
+		/**
+		 * Translates a string into the current language.
+		 *
+		 * @param {String} key   The string to translate
+		 * @param {String} def   Default string
+		 *
+		 * @returns {String}
+		 */
+		'_': function( key, def ) {
+
+			// Check for new strings in the optionsStorage, and load them
+			var newStrings = Joomla.getOptions('joomla.jtext');
+			if ( newStrings ) {
+				this.load(newStrings);
+
+				// Clean up the optionsStorage from useless data
+				Joomla.loadOptions({'joomla.jtext': null});
+			}
+
+			def = def === undefined ? '' : def;
+			key = key.toUpperCase();
+
+			return this.strings[ key ] !== undefined ? this.strings[ key ] : def;
+		},
+
+		/**
+		 * Load new strings in to Joomla.JText
+		 *
+		 * @param {Object} object  Object with new strings
+		 * @returns {Joomla.JText}
+		 */
+		load: function( object ) {
+			for ( var key in object ) {
+				if (!object.hasOwnProperty(key)) continue;
+				this.strings[ key.toUpperCase() ] = object[ key ];
+			}
+
+			return this;
+		}
+	};
+
+	/**
+	 * Joomla options storage
+	 *
+	 * @type {{}}
+	 *
+	 * @since 3.7.0
+	 */
+	Joomla.optionsStorage = Joomla.optionsStorage || null;
+
+	/**
+	 * Get script(s) options
+	 *
+	 * @param  {String}  key  Name in Storage
+	 * @param  {mixed}   def  Default value if nothing found
+	 *
+	 * @return {mixed}
+	 *
+	 * @since 3.7.0
+	 */
+	Joomla.getOptions = function( key, def ) {
+		// Load options if they not exists
+		if (!Joomla.optionsStorage) {
+			Joomla.loadOptions();
+		}
+
+		return Joomla.optionsStorage[key] !== undefined ? Joomla.optionsStorage[key] : def;
+	};
+
+	/**
+	 * Load new options from given options object or from Element
+	 *
+	 * @param  {Object|undefined}  options  The options object to load. Eg {"com_foobar" : {"option1": 1, "option2": 2}}
+	 *
+	 * @since 3.7.0
+	 */
+	Joomla.loadOptions = function( options ) {
+		// Load form the script container
+		if (!options) {
+			var elements = document.querySelectorAll('.joomla-script-options.new'),
+				str, element, option, counter = 0;
+
+			for (var i = 0, l = elements.length; i < l; i++) {
+				element = elements[i];
+				str     = element.text || element.textContent;
+				option  = JSON.parse(str);
+
+				if (option) {
+					Joomla.loadOptions(option);
+					counter++;
+				}
+
+				element.className = element.className.replace(' new', ' loaded');
+			}
+
+			if (counter) {
+				return;
+			}
+		}
+
+		// Initial loading
+		if (!Joomla.optionsStorage) {
+			Joomla.optionsStorage = options || {};
+		}
+		// Merge with existing
+		else if ( options ) {
+			for (var p in options) {
+				if (options.hasOwnProperty(p)) {
+					Joomla.optionsStorage[p] = options[p];
+				}
+			}
+		}
+	};
+
+	/**
+	 * Method to replace all request tokens on the page with a new one.
+	 *
+	 * @param {String}  newToken  The token
+	 *
+	 * Used in Joomla Installation
+	 */
+	Joomla.replaceTokens = function( newToken ) {
+		if (!/^[0-9A-F]{32}$/i.test(newToken)) { return; }
+
+		var els = document.getElementsByTagName( 'input' ),
+			i, el, n;
+
+		for ( i = 0, n = els.length; i < n; i++ ) {
+			el = els[i];
+
+			if ( el.type == 'hidden' && el.value == '1' && el.name.length == 32 ) {
+				el.name = newToken;
+			}
+		}
+	};
+
+	/**
+	 * USED IN: administrator/components/com_banners/views/client/tmpl/default.php
+	 * Actually, probably not used anywhere. Can we deprecate in favor of <input type="email">?
+	 *
+	 * Verifies if the string is in a valid email format
+	 *
+	 * @param  {string}  text  The text for validation
+	 *
+	 * @return {boolean}
+	 *
+	 * @deprecated  4.0 No replacement. Use formvalidator
+	 */
+	Joomla.isEmail = function( text ) {
+		var regex = /^[\w.!#$%&’*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i;
+		return regex.test( text );
+	};
+
+	/**
+	 * USED IN: all list forms.
+	 *
+	 * Toggles the check state of a group of boxes
+	 *
+	 * Checkboxes must have an id attribute in the form cb0, cb1...
+	 *
+	 * @param   {mixed}   checkbox  The number of box to 'check', for a checkbox element
+	 * @param   {string}  stub      An alternative field name
+	 *
+	 * @return  {boolean}
+	 */
+	Joomla.checkAll = function( checkbox, stub ) {
+		if (!checkbox.form) return false;
+
+		stub = stub ? stub : 'cb';
+
+		var c = 0,
+			i, e, n;
+
+		for ( i = 0, n = checkbox.form.elements.length; i < n; i++ ) {
+			e = checkbox.form.elements[ i ];
+
+			if ( e.type == checkbox.type && e.id.indexOf( stub ) === 0 ) {
+				e.checked = checkbox.checked;
+				c += e.checked ? 1 : 0;
+			}
+		}
+
+		if ( checkbox.form.boxchecked ) {
+			checkbox.form.boxchecked.value = c;
+		}
+
+		return true;
+	};
+
+	/**
+	 * Render messages send via JSON
+	 * Used by some javascripts such as validate.js
+	 *
+	 * @param   {object}  messages    JavaScript object containing the messages to render. Example:
+	 *                              var messages = {
+	 *                                  "message": ["Message one", "Message two"],
+	 *                                  "error": ["Error one", "Error two"]
+	 *                              };
+	 * @return  {void}
+	 */
+	Joomla.renderMessages = function( messages ) {
+		Joomla.removeMessages();
+
+		var messageContainer = document.getElementById( 'system-message-container' ),
+			type, typeMessages, messagesBox, title, titleWrapper, i, messageWrapper, alertClass;
+
+		for ( type in messages ) {
+			if ( !messages.hasOwnProperty( type ) ) { continue; }
+			// Array of messages of this type
+			typeMessages = messages[ type ];
+
+			// Create the alert box
+			messagesBox = document.createElement( 'div' );
+
+			// Message class
+			alertClass = (type === 'notice') ? 'alert-info' : 'alert-' + type;
+			alertClass = (type === 'message') ? 'alert-success' : alertClass;
+			alertClass = (type === 'error') ? 'alert-error alert-danger' : alertClass;
+
+			messagesBox.className = 'alert ' + alertClass;
+
+			// Close button
+			var buttonWrapper = document.createElement( 'button' );
+			buttonWrapper.setAttribute('type', 'button');
+			buttonWrapper.setAttribute('data-dismiss', 'alert');
+			buttonWrapper.className = 'close';
+			buttonWrapper.innerHTML = '×';
+			messagesBox.appendChild( buttonWrapper );
+
+			// Title
+			title = Joomla.JText._( type );
+
+			// Skip titles with untranslated strings
+			if ( typeof title != 'undefined' ) {
+				titleWrapper = document.createElement( 'h4' );
+				titleWrapper.className = 'alert-heading';
+				titleWrapper.innerHTML = Joomla.JText._( type );
+				messagesBox.appendChild( titleWrapper );
+			}
+
+			// Add messages to the message box
+			for ( i = typeMessages.length - 1; i >= 0; i-- ) {
+				messageWrapper = document.createElement( 'div' );
+				messageWrapper.innerHTML = typeMessages[ i ];
+				messagesBox.appendChild( messageWrapper );
+			}
+
+			messageContainer.appendChild( messagesBox );
+		}
+	};
+
+	/**
+	 * Remove messages
+	 *
+	 * @return  {void}
+	 */
+	Joomla.removeMessages = function() {
+		var messageContainer = document.getElementById( 'system-message-container' );
+
+		// Empty container with a while for Chrome performance issues
+		while ( messageContainer.firstChild ) messageContainer.removeChild( messageContainer.firstChild );
+
+		// Fix Chrome bug not updating element height
+		messageContainer.style.display = 'none';
+		messageContainer.offsetHeight;
+		messageContainer.style.display = '';
+	};
+
+	/**
+	 * Treat AJAX errors.
+	 * Used by some javascripts such as sendtestmail.js and permissions.js
+	 *
+	 * @param   {object}  xhr         XHR object.
+	 * @param   {string}  textStatus  Type of error that occurred.
+	 * @param   {string}  error       Textual portion of the HTTP status.
+	 *
+	 * @return  {object}  JavaScript object containing the system error message.
+	 *
+	 * @since  3.6.0
+	 */
+	Joomla.ajaxErrorsMessages = function( xhr, textStatus, error ) {
+		var msg = {};
+
+		// For jQuery jqXHR
+		if (textStatus === 'parsererror')
+		{
+			// Html entity encode.
+			var encodedJson = xhr.responseText.trim();
+
+			var buf = [];
+			for (var i = encodedJson.length-1; i >= 0; i--) {
+				buf.unshift( [ '&#', encodedJson[i].charCodeAt(), ';' ].join('') );
+			}
+
+			encodedJson = buf.join('');
+
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_PARSE').replace('%s', encodedJson) ];
+		}
+		else if (textStatus === 'nocontent')
+		{
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_NO_CONTENT') ];
+		}
+		else if (textStatus === 'timeout')
+		{
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_TIMEOUT') ];
+		}
+		else if (textStatus === 'abort')
+		{
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT') ];
+		}
+		// For vannila XHR
+		else if (xhr.responseJSON && xhr.responseJSON.message)
+		{
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status) + ' <em>' + xhr.responseJSON.message + '</em>' ];
+		}
+		else if (xhr.statusText)
+		{
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status) + ' <em>' + xhr.statusText + '</em>' ];
+		}
+		else
+		{
+			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status) ];
+		}
+
+		return msg;
+	};
+
+	/**
+	 * USED IN: administrator/components/com_cache/views/cache/tmpl/default.php
+	 * administrator/components/com_installer/views/discover/tmpl/default_item.php
+	 * administrator/components/com_installer/views/update/tmpl/default_item.php
+	 * administrator/components/com_languages/helpers/html/languages.php
+	 * libraries/joomla/html/html/grid.php
+	 *
+	 * @param  {boolean}  isitchecked  Flag for checked
+	 * @param  {node}     form         The form
+	 *
+	 * @return  {void}
+	 */
+	Joomla.isChecked = function( isitchecked, form ) {
+		if ( typeof form  === 'undefined' ) {
+			form = document.getElementById( 'adminForm' );
+		}
+
+		form.boxchecked.value = isitchecked ? parseInt(form.boxchecked.value) + 1 : parseInt(form.boxchecked.value) - 1;
+
+		// If we don't have a checkall-toggle, done.
+		if ( !form.elements[ 'checkall-toggle' ] ) return;
+
+		// Toggle main toggle checkbox depending on checkbox selection
+		var c = true,
+			i, e, n;
+
+		for ( i = 0, n = form.elements.length; i < n; i++ ) {
+			e = form.elements[ i ];
+
+			if ( e.type == 'checkbox' && e.name != 'checkall-toggle' && !e.checked ) {
+				c = false;
+				break;
+			}
+		}
+
+		form.elements[ 'checkall-toggle' ].checked = c;
+	};
+
+	/**
+	 * USED IN: libraries/joomla/html/toolbar/button/help.php
+	 *
+	 * Pops up a new window in the middle of the screen
+	 * @deprecated  4.0 No replacement
+	 */
+	Joomla.popupWindow = function( mypage, myname, w, h, scroll ) {
+		var winl = ( screen.width - w ) / 2,
+			wint = ( screen.height - h ) / 2,
+			winprops = 'height=' + h +
+				',width=' + w +
+				',top=' + wint +
+				',left=' + winl +
+				',scrollbars=' + scroll +
+				',resizable';
+
+		window.open( mypage, myname, winprops )
+			.window.focus();
+	};
+
+	/**
+	 * USED IN: libraries/joomla/html/html/grid.php
+	 * In other words, on any reorderable table
+	 *
+	 * @param  {string}  order  The order value
+	 * @param  {string}  dir    The direction
+	 * @param  {string}  task   The task
+	 * @param  {node}    form   The form
+	 *
+	 * return  {void}
+	 */
+	Joomla.tableOrdering = function( order, dir, task, form ) {
+		if ( typeof form  === 'undefined' ) {
+			form = document.getElementById( 'adminForm' );
+		}
+
+		form.filter_order.value = order;
+		form.filter_order_Dir.value = dir;
+		Joomla.submitform( task, form );
+	};
+
+	/**
+	 * USED IN: administrator/components/com_modules/views/module/tmpl/default.php
+	 *
+	 * Writes a dynamically generated list
+	 *
+	 * @param string
+	 *          The parameters to insert into the <select> tag
+	 * @param array
+	 *          A javascript array of list options in the form [key,value,text]
+	 * @param string
+	 *          The key to display for the initial state of the list
+	 * @param string
+	 *          The original key that was selected
+	 * @param string
+	 *          The original item value that was selected
+	 * @param string
+	 *          The elem where the list will be written
+	 *
+	 * @deprecated  4.0 No replacement
+	 */
+	window.writeDynaList = function ( selectParams, source, key, orig_key, orig_val, element ) {
+		var html = '<select ' + selectParams + '>',
+			hasSelection = key == orig_key, i, selected, item;
+
+		for (i = 0 ; i < source.length; i++) {
+			item = source[ i ];
+
+			if ( item[ 0 ] != key ) { continue; }
+
+			selected = hasSelection ? orig_val == item[ 1 ] : i === 0;
+
+			html += '<option value="' + item[ 1 ] + '"' + (selected ? ' selected="selected"' : '') + '>'
+				+ item[ 2 ] + '</option>';
+		}
+
+		html += '</select>';
+
+		if (element) {
+			element.innerHTML = html;
+		} else {
+			document.writeln( html );
+		}
+	};
+
+	/**
+	 * USED IN: administrator/components/com_content/views/article/view.html.php
+	 * actually, probably not used anywhere.
+	 *
+	 * Changes a dynamically generated list
+	 *
+	 * @param string
+	 *          The name of the list to change
+	 * @param array
+	 *          A javascript array of list options in the form [key,value,text]
+	 * @param string
+	 *          The key to display
+	 * @param string
+	 *          The original key that was selected
+	 * @param string
+	 *          The original item value that was selected
+	 *
+	 * @deprecated  4.0 No replacement
+	 */
+	window.changeDynaList = function ( listname, source, key, orig_key, orig_val ) {
+		var list = document.adminForm[ listname ],
+			hasSelection = key == orig_key,
+			i, x, item, opt;
+
+		// empty the list
+		while ( list.firstChild ) list.removeChild( list.firstChild );
+
+		i = 0;
+
+		for ( x in source ) {
+			if (!source.hasOwnProperty(x)) { continue; }
+
+			item = source[x];
+
+			if ( item[ 0 ] != key ) { continue; }
+
+			opt = new Option();
+			opt.value = item[ 1 ];
+			opt.text = item[ 2 ];
+
+			if ( ( hasSelection && orig_val == opt.value ) || (!hasSelection && i === 0) ) {
+				opt.selected = true;
+			}
+
+			list.options[ i++ ] = opt;
+		}
+
+		list.length = i;
+	};
+
+	/**
+	 * USED IN: administrator/components/com_menus/views/menus/tmpl/default.php
+	 * Probably not used at all
+	 *
+	 * @param radioObj
+	 * @return
+	 *
+	 * @deprecated  4.0 No replacement
+	 */
+	// return the value of the radio button that is checked
+	// return an empty string if none are checked, or
+	// there are no radio buttons
+	window.radioGetCheckedValue = function ( radioObj ) {
+		if ( !radioObj ) { return ''; }
+
+		var n = radioObj.length,
+			i;
+
+		if ( n === undefined ) {
+			return radioObj.checked ? radioObj.value : '';
+		}
+
+		for ( i = 0; i < n; i++ ) {
+			if ( radioObj[ i ].checked ) {
+				return radioObj[ i ].value;
+			}
+		}
+
+		return '';
+	};
+
+	/**
+	 * USED IN: administrator/components/com_users/views/mail/tmpl/default.php
+	 * Let's get rid of this and kill it
+	 *
+	 * @param frmName
+	 * @param srcListName
+	 * @return
+	 *
+	 * @deprecated  4.0 No replacement
+	 */
+	window.getSelectedValue = function ( frmName, srcListName ) {
+		var srcList = document[ frmName ][ srcListName ],
+			i = srcList.selectedIndex;
+
+		if ( i !== null && i > -1 ) {
+			return srcList.options[ i ].value;
+		} else {
+			return null;
+		}
+	};
+
+	/**
+	 * USED IN: all over :)
+	 *
+	 * @param id
+	 * @param task
+	 * @return
+	 *
+	 * @deprecated 4.0  Use Joomla.listItemTask() instead
+	 */
+	window.listItemTask = function ( id, task ) {
+		return Joomla.listItemTask( id, task );
+	};
+
+	/**
+	 * USED IN: all over :)
+	 *
+	 * @param  {string}  id    The id
+	 * @param  {string}  task  The task
+	 *
+	 * @return {boolean}
+	 */
+	Joomla.listItemTask = function ( id, task ) {
+		var f = document.adminForm,
+			i = 0, cbx,
+			cb = f[ id ];
+
+		if ( !cb ) return false;
+
+		while ( true ) {
+			cbx = f[ 'cb' + i ];
+
+			if ( !cbx ) break;
+
+			cbx.checked = false;
+
+			i++;
+		}
+
+		cb.checked = true;
+		f.boxchecked.value = 1;
+		window.submitform( task );
+
+		return false;
+	};
+
+	/**
+	 * Default function. Usually would be overriden by the component
+	 *
+	 * @deprecated 4.0  Use Joomla.submitbutton() instead.
+	 */
+	window.submitbutton = function ( pressbutton ) {
+		Joomla.submitbutton( pressbutton );
+	};
+
+	/**
+	 * Submit the admin form
+	 *
+	 * @deprecated 4.0  Use Joomla.submitform() instead.
+	 */
+	window.submitform = function ( pressbutton ) {
+		Joomla.submitform(pressbutton);
+	};
+
+	// needed for Table Column ordering
+	/**
+	 * USED IN: libraries/joomla/html/html/grid.php
+	 * There's a better way to do this now, can we try to kill it?
+	 *
+	 * @deprecated 4.0  No replacement
+	 */
+	window.saveorder = function ( n, task ) {
+		window.checkAll_button( n, task );
+	};
+
+	/**
+	 * Checks all the boxes unless one is missing then it assumes it's checked out.
+	 * Weird. Probably only used by ^saveorder
+	 *
+	 * @param   integer  n     The total number of checkboxes expected
+	 * @param   string   task  The task to perform
+	 *
+	 * @return  void
+	 *
+	 * @deprecated 4.0  No replacement
+	 */
+	window.checkAll_button = function ( n, task ) {
+		task = task ? task : 'saveorder';
+
+		var j, box;
+
+		for ( j = 0; j <= n; j++ ) {
+			box = document.adminForm[ 'cb' + j ];
+
+			if ( box ) {
+				box.checked = true;
+			} else {
+				alert( "You cannot change the order of items, as an item in the list is `Checked Out`" );
+				return;
+			}
+		}
+
+		Joomla.submitform( task );
+	};
+
+	/**
+	 * Add Joomla! loading image layer.
+	 *
+	 * Used in: /administrator/components/com_installer/views/languages/tmpl/default.php
+	 *          /installation/template/js/installation.js
+	 *
+	 * @param   {String}       task           The task to do [load, show, hide] (defaults to show).
+	 * @param   {HTMLElement}  parentElement  The HTML element where we are appending the layer (defaults to body).
+	 *
+	 * @return  {HTMLElement}  The HTML loading layer element.
+	 *
+	 * @since  3.6.0
+	 */
+	Joomla.loadingLayer = function(task, parentElement) {
+		// Set default values.
+		task          = task || 'show';
+		parentElement = parentElement || document.body;
+
+		// Create the loading layer (hidden by default).
+		if (task === 'load')
+		{
+			// Gets the site base path
+			var systemPaths = Joomla.getOptions('system.paths') || {},
+				basePath    = systemPaths.root || '';
+
+			var loadingDiv = document.createElement('div');
+
+			loadingDiv.id = 'loading-logo';
+
+			// The loading layer CSS styles are JS hardcoded so they can be used without adding CSS.
+
+			// Loading layer style and positioning.
+			loadingDiv.style['position']              = 'fixed';
+			loadingDiv.style['top']                   = '0';
+			loadingDiv.style['left']                  = '0';
+			loadingDiv.style['width']                 = '100%';
+			loadingDiv.style['height']                = '100%';
+			loadingDiv.style['opacity']               = '0.8';
+			loadingDiv.style['filter']                = 'alpha(opacity=80)';
+			loadingDiv.style['overflow']              = 'hidden';
+			loadingDiv.style['z-index']               = '10000';
+			loadingDiv.style['display']               = 'none';
+			loadingDiv.style['background-color']      = '#fff';
+
+			// Loading logo positioning.
+			loadingDiv.style['background-image']      = 'url("' + basePath + '/media/jui/images/ajax-loader.gif")';
+			loadingDiv.style['background-position']   = 'center';
+			loadingDiv.style['background-repeat']     = 'no-repeat';
+			loadingDiv.style['background-attachment'] = 'fixed';
+
+			parentElement.appendChild(loadingDiv);
+		}
+		// Show or hide the layer.
+		else
+		{
+			if (!document.getElementById('loading-logo'))
+			{
+				Joomla.loadingLayer('load', parentElement);
+			}
+
+			document.getElementById('loading-logo').style['display'] = (task == 'show') ? 'block' : 'none';
+		}
+
+		return document.getElementById('loading-logo');
+	};
+
+	/**
+	 * Method to Extend Objects
+	 *
+	 * @param  {Object}  destination
+	 * @param  {Object}  source
+	 *
+	 * @return Object
+	 */
+	Joomla.extend = function (destination, source) {
+		for (var p in source) {
+			if (source.hasOwnProperty(p)) {
+				destination[p] = source[p];
+			}
+		}
+
+		return destination;
+	};
+
+	/**
+	 * Method to perform AJAX request
+	 *
+	 * @param {Object} options   Request options:
+	 * {
+	 *    url:       'index.php',  // Request URL
+	 *    method:    'GET',        // Request method GET (default), POST
+	 *    data:      null,         // Data to be sent, see https://developer.mozilla.org/docs/Web/API/XMLHttpRequest/send
+	 *    perform:   true,         // Perform the request immediately, or return XMLHttpRequest instance and perform it later
+	 *    headers:   null,         // Object of custom headers, eg {'X-Foo': 'Bar', 'X-Bar': 'Foo'}
+	 *
+	 *    onBefore:  function(xhr){}            // Callback on before the request
+	 *    onSuccess: function(response, xhr){}, // Callback on the request success
+	 *    onError:   function(xhr){},           // Callback on the request error
+	 * }
+	 *
+	 * @return XMLHttpRequest|Boolean
+	 *
+	 * @example
+	 *
+	 * 	Joomla.request({
+	 *		url: 'index.php?option=com_example&view=example',
+	 *		onSuccess: function(response, xhr){
+	 *			console.log(response);
+	 *		}
+	 * 	})
+	 *
+	 * @see    https://developer.mozilla.org/docs/Web/API/XMLHttpRequest
+	 */
+	Joomla.request = function (options) {
+
+		// Prepare the options
+		options = Joomla.extend({
+			url:    '',
+			method: 'GET',
+			data:    null,
+			perform: true
+		}, options);
+
+		// Use POST for send the data
+		options.method = options.data ? 'POST' : options.method.toUpperCase();
+
+		// Set up XMLHttpRequest instance
+		try{
+			var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('MSXML2.XMLHTTP.3.0');
+
+			xhr.open(options.method, options.url, true);
+
+			// Set the headers
+			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+			xhr.setRequestHeader('X-Ajax-Engine', 'Joomla!');
+
+			if (options.method === 'POST') {
+				var token = Joomla.getOptions('csrf.token', '');
+
+				if (token) {
+					xhr.setRequestHeader('X-CSRF-Token', token);
+				}
+
+				if (!options.headers || !options.headers['Content-Type']) {
+					xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+				}
+			}
+
+			// Custom headers
+			if (options.headers){
+				for (var p in options.headers) {
+					if (options.headers.hasOwnProperty(p)) {
+						xhr.setRequestHeader(p, options.headers[p]);
+					}
+				}
+			}
+
+			xhr.onreadystatechange = function () {
+				// Request not finished
+				if (xhr.readyState !== 4) return;
+
+				// Request finished and response is ready
+				if (xhr.status === 200) {
+					if(options.onSuccess) {
+						options.onSuccess.call(window, xhr.responseText, xhr);
+					}
+				} else if(options.onError) {
+					options.onError.call(window, xhr);
+				}
+			};
+
+			// Do request
+			if (options.perform) {
+				if (options.onBefore && options.onBefore.call(window, xhr) === false) {
+					// Request interrupted
+					return xhr;
+				}
+
+				xhr.send(options.data);
+			}
+
+		} catch (error) {
+			window.console ? console.log(error) : null;
+			return false;
+		}
+
+		return xhr;
+	};
+
+}( Joomla, document ));
diff --git a/core/media/system/js/core.js b/core/media/system/js/core.js
new file mode 100644
index 00000000..ba21634a
--- /dev/null
+++ b/core/media/system/js/core.js
@@ -0,0 +1 @@
+Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},function(e,t){"use strict";e.submitform=function(e,o,n){o||(o=t.getElementById("adminForm")),e&&(o.task.value=e),o.noValidate=!n,n?o.hasAttribute("novalidate")&&o.removeAttribute("novalidate"):o.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",o.appendChild(r).click(),o.removeChild(r)},e.submitbutton=function(t){e.submitform(t)},e.JText={strings:{},_:function(t,o){var n=e.getOptions("joomla.jtext");return n&&(this.load(n),e.loadOptions({"joomla.jtext":null})),o=void 0===o?"":o,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:o},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,o){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:o},e.loadOptions=function(o){if(!o){for(var n,r,i,a=t.querySelectorAll(".joomla-script-options.new"),s=0,l=0,d=a.length;l<d;l++)n=(r=a[l]).text||r.textContent,(i=JSON.parse(n))&&(e.loadOptions(i),s++),r.className=r.className.replace(" new"," loaded");if(s)return}if(e.optionsStorage){if(o)for(var c in o)o.hasOwnProperty(c)&&(e.optionsStorage[c]=o[c])}else e.optionsStorage=o||{}},e.replaceTokens=function(e){if(/^[0-9A-F]{32}$/i.test(e)){var o,n,r,i=t.getElementsByTagName("input");for(o=0,r=i.length;o<r;o++)"hidden"==(n=i[o]).type&&"1"==n.value&&32==n.name.length&&(n.name=e)}},e.isEmail=function(e){return/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i.test(e)},e.checkAll=function(e,t){if(!e.form)return!1;t=t||"cb";var o,n,r,i=0;for(o=0,r=e.form.elements.length;o<r;o++)(n=e.form.elements[o]).type==e.type&&0===n.id.indexOf(t)&&(n.checked=e.checked,i+=n.checked?1:0);return e.form.boxchecked&&(e.form.boxchecked.value=i),!0},e.renderMessages=function(o){e.removeMessages();var n,r,i,a,s,l,d,c=t.getElementById("system-message-container");for(n in o)if(o.hasOwnProperty(n)){r=o[n],d="notice"===n?"alert-info":"alert-"+n,d="message"===n?"alert-success":d,d="error"===n?"alert-error alert-danger":d,(i=t.createElement("div")).className="alert "+d;var u=t.createElement("button");for(u.setAttribute("type","button"),u.setAttribute("data-dismiss","alert"),u.className="close",u.innerHTML="×",i.appendChild(u),void 0!==e.JText._(n)&&((a=t.createElement("h4")).className="alert-heading",a.innerHTML=e.JText._(n),i.appendChild(a)),s=r.length-1;s>=0;s--)(l=t.createElement("div")).innerHTML=r[s],i.appendChild(l);c.appendChild(i)}},e.removeMessages=function(){for(var e=t.getElementById("system-message-container");e.firstChild;)e.removeChild(e.firstChild);e.style.display="none",e.offsetHeight,e.style.display=""},e.ajaxErrorsMessages=function(t,o,n){var r={};if("parsererror"===o){for(var i=t.responseText.trim(),a=[],s=i.length-1;s>=0;s--)a.unshift(["&#",i[s].charCodeAt(),";"].join(""));i=a.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",i)]}else"nocontent"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.responseJSON.message+"</em>"]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.statusText+"</em>"]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(e,o){if(void 0===o&&(o=t.getElementById("adminForm")),o.boxchecked.value=e?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,o.elements["checkall-toggle"]){var n,r,i,a=!0;for(n=0,i=o.elements.length;n<i;n++)if("checkbox"==(r=o.elements[n]).type&&"checkall-toggle"!=r.name&&!r.checked){a=!1;break}o.elements["checkall-toggle"].checked=a}},e.popupWindow=function(e,t,o,n,r){var i=(screen.width-o)/2,a="height="+n+",width="+o+",top="+(screen.height-n)/2+",left="+i+",scrollbars="+r+",resizable";window.open(e,t,a).window.focus()},e.tableOrdering=function(o,n,r,i){void 0===i&&(i=t.getElementById("adminForm")),i.filter_order.value=o,i.filter_order_Dir.value=n,e.submitform(r,i)},window.writeDynaList=function(e,o,n,r,i,a){var s,l,d,c="<select "+e+">",u=n==r,m=0;for(l in o)o.hasOwnProperty(l)&&(d=o[l])[0]==n&&(s="",(u&&i==d[1]||!u&&0===m)&&(s='selected="selected"'),c+='<option value="'+d[1]+'" '+s+">"+d[2]+"</option>",m++);c+="</select>",a?a.innerHTML=c:t.writeln(c)},window.changeDynaList=function(e,o,n,r,i){for(var a,s,l,d,c=t.adminForm[e],u=n==r;c.firstChild;)c.removeChild(c.firstChild);for(s in a=0,o)o.hasOwnProperty(s)&&(l=o[s])[0]==n&&((d=new Option).value=l[1],d.text=l[2],(u&&i==d.value||!u&&0===a)&&(d.selected=!0),c.options[a++]=d);c.length=a},window.radioGetCheckedValue=function(e){if(!e)return"";var t,o=e.length;if(void 0===o)return e.checked?e.value:"";for(t=0;t<o;t++)if(e[t].checked)return e[t].value;return""},window.getSelectedValue=function(e,o){var n=t[e][o],r=n.selectedIndex;return null!==r&&r>-1?n.options[r].value:null},window.listItemTask=function(t,o){return e.listItemTask(t,o)},e.listItemTask=function(e,o){var n,r=t.adminForm,i=0,a=r[e];if(!a)return!1;for(;n=r["cb"+i];)n.checked=!1,i++;return a.checked=!0,r.boxchecked.value=1,window.submitform(o),!1},window.submitbutton=function(t){e.submitbutton(t)},window.submitform=function(t){e.submitform(t)},window.saveorder=function(e,t){window.checkAll_button(e,t)},window.checkAll_button=function(o,n){var r,i;for(n=n||"saveorder",r=0;r<=o;r++){if(!(i=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");i.checked=!0}e.submitform(n)},e.loadingLayer=function(o,n){if(o=o||"show",n=n||t.body,"load"===o){var r=(e.getOptions("system.paths")||{}).root||"",i=t.createElement("div");i.id="loading-logo",i.style.position="fixed",i.style.top="0",i.style.left="0",i.style.width="100%",i.style.height="100%",i.style.opacity="0.8",i.style.filter="alpha(opacity=80)",i.style.overflow="hidden",i.style["z-index"]="10000",i.style.display="none",i.style["background-color"]="#fff",i.style["background-image"]='url("'+r+'/media/jui/images/ajax-loader.gif")',i.style["background-position"]="center",i.style["background-repeat"]="no-repeat",i.style["background-attachment"]="fixed",n.appendChild(i)}else t.getElementById("loading-logo")||e.loadingLayer("load",n),t.getElementById("loading-logo").style.display="show"==o?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var o in t)t.hasOwnProperty(o)&&(e[o]=t[o]);return e},e.request=function(t){(t=e.extend({url:"",method:"GET",data:null,perform:!0},t)).method=t.data?"POST":t.method.toUpperCase();try{var o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(o.open(t.method,t.url,!0),o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.setRequestHeader("X-Ajax-Engine","Joomla!"),"POST"===t.method){var n=e.getOptions("csrf.token","");n&&o.setRequestHeader("X-CSRF-Token",n),t.headers&&t.headers["Content-Type"]||o.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&o.setRequestHeader(r,t.headers[r]);if(o.onreadystatechange=function(){4===o.readyState&&(200===o.status?t.onSuccess&&t.onSuccess.call(window,o.responseText,o):t.onError&&t.onError.call(window,o))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,o))return o;o.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return o}}(Joomla,document);
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/af.js b/core/media/system/js/fields/calendar-locales/af.js
new file mode 100644
index 00000000..7c4ec215
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/af.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Vandag",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Tyd:",
+	days : ["Sondag", "Maandag", "Dinsdag", "Woensdag", "Donnerdag", "Vrydag", "Saterdag"],
+	shortDays : ["So", "Ma", "Di", "Wo", "Do", "Vr", "Sa"],
+	months : ["Januarie", "Februarie", "Maart", "April", "Mei", "Junie", "Julie", "Augustus", "September", "Oktober", "November", "Desember"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"],
+	AM : "VM",
+	PM : "NM",
+	am : "vm",
+	pm : "nm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Sluit",
+	save: "Stoor"
+};
diff --git a/core/media/system/js/fields/calendar-locales/ar.js b/core/media/system/js/fields/calendar-locales/ar.js
new file mode 100644
index 00000000..1215f2fc
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ar.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "اليوم",
+	weekend : [6, 5],
+	wk : "الأسبوع",
+	time : "الساعة:",
+	days : ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
+	shortDays : ["الأحد", "الإثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
+	months : ["كانون الثّاني", "شباط", "آذار", "نيسان", "أيّار", "حزيران", "تمّوز", "آب", "أيلول", "تشرين الأوّل", "تشرين الثّاني", "كانون الأوّل"],
+	shortMonths : ["كانون الثّاني", "شباط", "آذار", "نيسان", "أيّار", "حزيران", "تمّوز", "آب", "أيلول", "تشرين الأوّل", "تشرين الثّاني", "كانون الأوّل"],
+	AM : "ق‌ظ",
+	PM :  "ب‌ظ",
+	am : "ق‌ظ",
+	pm : "ب‌ظ",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "إغلاق",
+	save: "الغاء"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/bg.js b/core/media/system/js/fields/calendar-locales/bg.js
new file mode 100644
index 00000000..a869be06
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/bg.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Днес",
+	weekend : [0, 6],
+	wk : "седм",
+	time : "Време:",
+	days : ["Неделя", "Понеделник", "Вторник", "Сряда", "Четвъртък", "Петък", "Събота"],
+	shortDays : ["Нед", "Пон", "Вт", "Ср", "Чет", "Пет", "Съб"],
+	months : ["Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември"],
+	shortMonths : ["Ян", "Фев", "Мар", "Апр", "Май", "Юни", "Юли", "Авг", "Сеп", "Окт", "Ное", "Дек"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Затвори",
+	save: "Изчисти"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/bn.js b/core/media/system/js/fields/calendar-locales/bn.js
new file mode 100644
index 00000000..0c8785b9
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/bn.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "আজ",
+	weekend : [0, 6],
+	wk : "সপ্তাহ",
+	time : "সময়:",
+	days : ["রবিবার", "সোমবার", "মঙ্গলবার", "বুধবার", "বৃহস্পতিবার", "শুক্রবার", "শনিবার"],
+	shortDays : ["রবি", "সোম", "মঙ্গল", "বুধ", "বৃহস্পতি", "শুক্র", "শনি"],
+	months : ["জানুয়ারি", "ফেব্রুয়ারি", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর"],
+	shortMonths : ["জানুয়ারি", "ফেব্রুয়ারি", "মার্চ", "এপ্রিল", "মে", "জুন", "জুলাই", "আগস্ট", "সেপ্টেম্বর", "অক্টোবর", "নভেম্বর", "ডিসেম্বর"],
+	AM : "পূর্বাহ্ণ",
+	PM : "অপরাহ্ন",
+	am : "পূর্বাহ্ণ",
+	pm : "অপরাহ্ন",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "প্রস্থান",
+	save: "সংরক্ষণ"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/bs.js b/core/media/system/js/fields/calendar-locales/bs.js
new file mode 100644
index 00000000..62e16144
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/bs.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Danas",
+	weekend : [0, 6],
+	wk : "se",
+	time : "Vrijeme:",
+	days : ["Nedjelja", "Ponedjeljak", "Utorak", "Srijeda", "Četvrtak", "Petak", "Subota"],
+	shortDays : ["Ned", "Pon", "Uto", "Sri", "Čet", "Pet", "Sub"],
+	months : ["Januar", "Februar", "Mart", "April", "Maj", "Juni", "Juli", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Zatvori",
+	save: "Snimi"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/ca.js b/core/media/system/js/fields/calendar-locales/ca.js
new file mode 100644
index 00000000..c873211d
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ca.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Avui",
+	weekend : [0, 6],
+	wk : "Setm",
+	time : "Hora:",
+	days : ["Diumenge", "Dilluns", "Dimarts", "Dimecres", "Dijous", "Divendres", "Dissabte"],
+	shortDays : ["Du", "Dl", "Dm", "Dx", "Dj", "Dv", "Ds"],
+	months : ["Gener", "Febrer", "Març", "Abril", "Maig", "Juny", "Juliol", "Agost", "Setembre", "Octubre", "Novembre", "Desembre"],
+	shortMonths : ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Des"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Tancar",
+	save: "Desar"
+};
diff --git a/core/media/system/js/fields/calendar-locales/cs.js b/core/media/system/js/fields/calendar-locales/cs.js
new file mode 100644
index 00000000..7ae280bc
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/cs.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "dnes",
+	weekend : [0, 6],
+	wk : "kt",
+	time : "čas:",
+	days : ["neděle", "pondělí", "úterý", "středa", "čtvrtek", "pátek", "sobota"],
+	shortDays : ["ne", "po", "út", "st", "čt", "pá", "so"],
+	months : ["leden", "únor", "březen", "duben", "květen", "červen", "červenec", "srpen", "září", "říjen", "listopad", "prosinec"],
+	shortMonths : ["led", "úno", "bře", "dub", "kvě", "čen", "čec", "srp", "zář", "říj", "lis", "pro"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "zavřít",
+	save: "vymazat"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/cy.js b/core/media/system/js/fields/calendar-locales/cy.js
new file mode 100644
index 00000000..9439441e
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/cy.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Heddiw",
+	weekend : [0, 6],
+	wk : "wy",
+	time : "Amser:",
+	days : ["Dydd Sul", "Dydd llun", "Dydd Mawrth", "Dydd Mercher", "Dydd Iau", "Dydd Gwener", "Dydd Sadwrn"],
+	shortDays : ["Sul", "Llun", "Maw", "Mer", "Iau", "Gwen", "Sad"],
+	months : ["Ionawr", "Chwefror", "Mawrth", "Ebrill", "Mai", "Mehefin", "Gorffennaf", "Awst", "Medi", "Hydref", "Tachwedd", "Rhagfyr"],
+	shortMonths : ["Ion", "Chw", "Maw", "Ebr", "Mai", "Meh", "Gor", "Awst", "Medi", "Hyd", "Tach", "Rhag"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Cau",
+	save: "Clirio"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/da.js b/core/media/system/js/fields/calendar-locales/da.js
new file mode 100644
index 00000000..6f8510b0
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/da.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "I dag",
+	weekend : [0, 6],
+	wk : "uge",
+	time : "Tid:",
+	days : ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"],
+	shortDays : ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"],
+	months : ["Januar", "Februar", "Marts", "April", "Maj", "Juni", "Juli", "August", "September", "Oktober", "November", "December"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Luk",
+	save: "Nulstil"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.js b/core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.js
new file mode 100644
index 00000000..281eb270
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.js
@@ -0,0 +1,383 @@
+!(function(Date){
+	'use strict';
+
+	/****************** Gregorian dates ********************/
+	/** Constants used for time computations */
+	Date.SECOND = 1000 /* milliseconds */;
+	Date.MINUTE = 60 * Date.SECOND;
+	Date.HOUR   = 60 * Date.MINUTE;
+	Date.DAY    = 24 * Date.HOUR;
+	Date.WEEK   =  7 * Date.DAY;
+
+	/** MODIFY ONLY THE MARKED PARTS OF THE METHODS **/
+	/************ START *************/
+	/** INTERFACE METHODS FOR THE CALENDAR PICKER **/
+
+	/********************** *************************/
+	/**************** SETTERS ***********************/
+	/********************** *************************/
+
+	/** Sets the date for the current date without h/m/s. */
+	Date.prototype.setLocalDateOnly = function (dateType, date) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			var tmp = new Date(date);
+			this.setDate(1);
+			this.setFullYear(tmp.getFullYear());
+			this.setMonth(tmp.getMonth());
+			this.setDate(tmp.getDate());
+		}
+	};
+
+	/** Sets the full date for the current date. */
+	Date.prototype.setLocalDate = function (dateType, d) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			return this.setDate(d);
+		}
+	};
+
+	/** Sets the month for the current date. */
+	Date.prototype.setLocalMonth = function (dateType, m, d) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			if (d == undefined) this.getDate();
+			return this.setMonth(m);
+		}
+	};
+
+	/** Sets the year for the current date. */
+	Date.prototype.setOtherFullYear = function(dateType, y) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			var date = new Date(this);
+			date.setFullYear(y);
+			if (date.getMonth() != this.getMonth()) this.setDate(28);
+			return this.setUTCFullYear(y);
+		}
+	};
+
+	/** Sets the year for the current date. */
+	Date.prototype.setLocalFullYear = function (dateType, y) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			var date = new Date(this);
+			date.setFullYear(y);
+			if (date.getMonth() != this.getMonth()) this.setDate(28);
+			return this.setFullYear(y);
+		}
+	};
+
+	/********************** *************************/
+	/**************** GETTERS ***********************/
+	/********************** *************************/
+
+	/** The number of days per week **/
+	Date.prototype.getLocalWeekDays = function (dateType, y) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return 6;
+		} else {
+			return 6; // 7 days per week
+		}
+	};
+
+	/** Returns the year for the current date. */
+	Date.prototype.getOtherFullYear = function (dateType) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			return this.getFullYear();
+		}
+	};
+
+	/** Returns the year for the current date. */
+	Date.prototype.getLocalFullYear = function (dateType) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			return this.getFullYear();
+		}
+	};
+
+	/** Returns the month the date. */
+	Date.prototype.getLocalMonth = function (dateType) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			return this.getMonth();
+		}
+	};
+
+	/** Returns the date. */
+	Date.prototype.getLocalDate = function (dateType) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			return this.getDate();
+		}
+	};
+
+	/** Returns the number of day in the year. */
+	Date.prototype.getLocalDay = function(dateType) {
+		if (dateType  != 'gregorian') {
+			return '';
+		} else {
+			return this.getDay();
+		}
+	};
+
+	/** Returns the number of days in the current month */
+	Date.prototype.getLocalMonthDays = function(dateType, month) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			var year = this.getFullYear();
+			if (typeof month == "undefined") {
+				month = this.getMonth();
+			}
+			if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+				return 29;
+			} else {
+				return [31,28,31,30,31,30,31,31,30,31,30,31][month];
+			}
+		}
+	};
+
+	/** Returns the week number for the current date. */
+	Date.prototype.getLocalWeekNumber = function(dateType) {
+		if (dateType != 'gregorian') {
+			/** Modify to match the current calendar when overriding **/
+			return '';
+		} else {
+			var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+			var DoW = d.getDay();
+			d.setDate(d.getDate() - (DoW + 6) % 7 + 3);                                     // Nearest Thu
+			var ms = d.valueOf();                                                           // GMT
+			d.setMonth(0);
+			d.setDate(4);                                                                   // Thu in Week 1
+			return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+		}
+	};
+
+	/** Returns the number of day in the year. */
+	Date.prototype.getLocalDayOfYear = function(dateType) {
+		if (dateType  != 'gregorian') {
+			return '';
+		} else {
+			var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+			var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+			var time = now - then;
+			return Math.floor(time / Date.DAY);
+		}
+	};
+
+	/** Checks date and time equality */
+	Date.prototype.equalsTo = function(date) {
+		return ((this.getFullYear() == date.getFullYear()) &&
+		(this.getMonth() == date.getMonth()) &&
+		(this.getDate() == date.getDate()) &&
+		(this.getHours() == date.getHours()) &&
+		(this.getMinutes() == date.getMinutes()));
+	};
+
+	/** Converts foreign date to gregorian date. */
+	Date.localCalToGregorian = function(y, m, d) {
+		/** Modify to match the current calendar when overriding **/
+		return'';
+	};
+
+	/** Converts gregorian date to foreign date. */
+	Date.gregorianToLocalCal = function(y, m, d) {
+		/** Modify to match the current calendar when overriding **/
+		return '';
+	};
+
+	/** INTERFACE METHODS FOR THE CALENDAR PICKER **/
+	/************* END **************/
+
+	/** Method to parse a string and return a date. **/
+	Date.parseFieldDate = function(str, fmt, dateType) {
+		if (dateType != 'gregorian')
+			str = Date.toEnglish(str);
+
+		var today = new Date();
+		var y = 0;
+		var m = -1;
+		var d = 0;
+		var a = str.split(/\W+/);
+		var b = fmt.match(/%./g);
+		var i = 0, j = 0;
+		var hr = 0;
+		var min = 0;
+		var sec = 0;
+		for (i = 0; i < a.length; ++i) {
+			if (!a[i])
+				continue;
+			switch (b[i]) {
+				case "%d":
+				case "%e":
+					d = parseInt(a[i], 10);
+					break;
+
+				case "%m":
+					m = parseInt(a[i], 10) - 1;
+					break;
+
+				case "%Y":
+				case "%y":
+					y = parseInt(a[i], 10);
+					(y < 100) && (y += (y > 29) ? 1900 : 2000);
+					break;
+
+				case "%b":
+				case "%B":
+					for (j = 0; j < 12; ++j) {
+						if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+					}
+					break;
+
+				case "%H":
+				case "%I":
+				case "%k":
+				case "%l":
+					hr = parseInt(a[i], 10);
+					break;
+
+				case "%P":
+				case "%p":
+					if (/pm/i.test(a[i]) && hr < 12)
+						hr += 12;
+					else if (/am/i.test(a[i]) && hr >= 12)
+						hr -= 12;
+					break;
+
+				case "%M":
+					min = parseInt(a[i], 10);
+					break;
+				case "%S":
+					sec = parseInt(a[i], 10);
+					break;
+			}
+		}
+		if (isNaN(y)) y = today.getFullYear();
+		if (isNaN(m)) m = today.getMonth();
+		if (isNaN(d)) d = today.getDate();
+		if (isNaN(hr)) hr = today.getHours();
+		if (isNaN(min)) min = today.getMinutes();
+		if (isNaN(sec)) sec = today.getSeconds();
+		if (y != 0 && m != -1 && d != 0)
+			return new Date(y, m, d, hr, min, sec);
+		y = 0; m = -1; d = 0;
+		for (i = 0; i < a.length; ++i) {
+			if (a[i].search(/[a-zA-Z]+/) != -1) {
+				var t = -1;
+				for (j = 0; j < 12; ++j) {
+					if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+				}
+				if (t != -1) {
+					if (m != -1) {
+						d = m+1;
+					}
+					m = t;
+				}
+			} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+				m = a[i]-1;
+			} else if (parseInt(a[i], 10) > 31 && y == 0) {
+				y = parseInt(a[i], 10);
+				(y < 100) && (y += (y > 29) ? 1900 : 2000);
+			} else if (d == 0) {
+				d = a[i];
+			}
+		}
+		if (y == 0)
+			y = today.getFullYear();
+		if (m != -1 && d != 0)
+			return new Date(y, m, d, hr, min, sec);
+		return today;
+	};
+
+	/** Prints the date in a string according to the given format. */
+	Date.prototype.print = function (str, dateType, translate) {
+		/** Handle calendar type **/
+		if (typeof dateType !== 'string') str = '';
+		if (!dateType) dateType = 'gregorian';
+
+		/** Handle wrong format **/
+		if (typeof str !== 'string') str = '';
+		if (!str) return '';
+
+		if (this.getLocalDate(dateType) == 'NaN' || !this.getLocalDate(dateType)) return '';
+		var m = this.getLocalMonth(dateType);
+		var d = this.getLocalDate(dateType);
+		var y = this.getLocalFullYear(dateType);
+		var wn = this.getLocalWeekNumber(dateType);
+		var w = this.getDay();
+		var s = {};
+		var hr = this.getHours();
+		var pm = (hr >= 12);
+		var ir = (pm) ? (hr - 12) : hr;
+		var dy = this.getLocalDayOfYear(dateType);
+		if (ir == 0)
+			ir = 12;
+		var min = this.getMinutes();
+		var sec = this.getSeconds();
+		s["%a"] = JoomlaCalLocale.shortDays[w];                                                     // abbreviated weekday name
+		s["%A"] = JoomlaCalLocale.days[w];                                                          // full weekday name
+		s["%b"] = JoomlaCalLocale.shortMonths[m];                                                   // abbreviated month name
+		s["%B"] = JoomlaCalLocale.months[m];                                                        // full month name
+		// FIXME: %c : preferred date and time representation for the current locale
+		s["%C"] = 1 + Math.floor(y / 100);                                                          // the century number
+		s["%d"] = (d < 10) ? ("0" + d) : d;                                                         // the day of the month (range 01 to 31)
+		s["%e"] = d;                                                                                // the day of the month (range 1 to 31)
+		// FIXME: %D : american date style: %m/%d/%y
+		// FIXME: %E, %F, %G, %g, %h (man strftime)
+		s["%H"] = (hr < 10) ? ("0" + hr) : hr;                                                      // hour, range 00 to 23 (24h format)
+		s["%I"] = (ir < 10) ? ("0" + ir) : ir;                                                      // hour, range 01 to 12 (12h format)
+		s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy;                         // day of the year (range 001 to 366)
+		s["%k"] = hr;                                                                               // hour, range 0 to 23 (24h format)
+		s["%l"] = ir;                                                                               // hour, range 1 to 12 (12h format)
+		s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m);                                                  // month, range 01 to 12
+		s["%M"] = (min < 10) ? ("0" + min) : min;                                                   // minute, range 00 to 59
+		s["%n"] = "\n";                                                                             // a newline character
+		s["%p"] = pm ? JoomlaCalLocale.PM : JoomlaCalLocale.AM;
+		s["%P"] = pm ? JoomlaCalLocale.pm : JoomlaCalLocale.am;
+		// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+		// FIXME: %R : the time in 24-hour notation %H:%M
+		s["%s"] = Math.floor(this.getTime() / 1000);
+		s["%S"] = (sec < 10) ? ("0" + sec) : sec;                                                   // seconds, range 00 to 59
+		s["%t"] = "\t";                                                                             // a tab character
+		// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+		s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+		s["%u"] = w + 1;                                                                            // the day of the week (range 1 to 7, 1 = MON)
+		s["%w"] = w;                                                                                // the day of the week (range 0 to 6, 0 = SUN)
+		// FIXME: %x : preferred date representation for the current locale without the time
+		// FIXME: %X : preferred time representation for the current locale without the date
+		s["%y"] = ('' + y).substr(2, 2);                                                            // year without the century (range 00 to 99)
+		s["%Y"] = y;                                                                                // year with the century
+		s["%%"] = "%";                                                                              // a literal '%' character
+
+		var re = /%./g;
+
+		var tmpDate = str.replace(re, function (par) { return s[par] || par; });
+		if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]' && dateType != 'gregorian' && translate)
+			tmpDate = Date.convertNumbers(tmpDate);
+
+		return tmpDate;
+	};
+})(Date);
diff --git a/core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.min.js b/core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.min.js
new file mode 100644
index 00000000..56417f55
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/date/gregorian/date-helper.min.js
@@ -0,0 +1 @@
+!function(t){"use strict";t.SECOND=1e3,t.MINUTE=60*t.SECOND,t.HOUR=60*t.MINUTE,t.DAY=24*t.HOUR,t.WEEK=7*t.DAY,t.prototype.setLocalDateOnly=function(e,a){if("gregorian"!=e)return"";var r=new t(a);this.setDate(1),this.setFullYear(r.getFullYear()),this.setMonth(r.getMonth()),this.setDate(r.getDate())},t.prototype.setLocalDate=function(t,e){return"gregorian"!=t?"":this.setDate(e)},t.prototype.setLocalMonth=function(t,e,a){return"gregorian"!=t?"":(void 0==a&&this.getDate(),this.setMonth(e))},t.prototype.setOtherFullYear=function(e,a){if("gregorian"!=e)return"";var r=new t(this);return r.setFullYear(a),r.getMonth()!=this.getMonth()&&this.setDate(28),this.setUTCFullYear(a)},t.prototype.setLocalFullYear=function(e,a){if("gregorian"!=e)return"";var r=new t(this);return r.setFullYear(a),r.getMonth()!=this.getMonth()&&this.setDate(28),this.setFullYear(a)},t.prototype.getLocalWeekDays=function(t,e){return 6},t.prototype.getOtherFullYear=function(t){return"gregorian"!=t?"":this.getFullYear()},t.prototype.getLocalFullYear=function(t){return"gregorian"!=t?"":this.getFullYear()},t.prototype.getLocalMonth=function(t){return"gregorian"!=t?"":this.getMonth()},t.prototype.getLocalDate=function(t){return"gregorian"!=t?"":this.getDate()},t.prototype.getLocalDay=function(t){return"gregorian"!=t?"":this.getDay()},t.prototype.getLocalMonthDays=function(t,e){if("gregorian"!=t)return"";var a=this.getFullYear();return void 0===e&&(e=this.getMonth()),0!=a%4||0==a%100&&0!=a%400||1!=e?[31,28,31,30,31,30,31,31,30,31,30,31][e]:29},t.prototype.getLocalWeekNumber=function(e){if("gregorian"!=e)return"";var a=new t(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),r=a.getDay();a.setDate(a.getDate()-(r+6)%7+3);var o=a.valueOf();return a.setMonth(0),a.setDate(4),Math.round((o-a.valueOf())/6048e5)+1},t.prototype.getLocalDayOfYear=function(e){if("gregorian"!=e)return"";var a=new t(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0)-new t(this.getFullYear(),0,0,0,0,0);return Math.floor(a/t.DAY)},t.prototype.equalsTo=function(t){return this.getFullYear()==t.getFullYear()&&this.getMonth()==t.getMonth()&&this.getDate()==t.getDate()&&this.getHours()==t.getHours()&&this.getMinutes()==t.getMinutes()},t.localCalToGregorian=function(t,e,a){return""},t.gregorianToLocalCal=function(t,e,a){return""},t.parseFieldDate=function(e,a,r){"gregorian"!=r&&(e=t.toEnglish(e));var o=new t,n=0,s=-1,i=0,l=e.split(/\W+/),g=a.match(/%./g),u=0,h=0,c=0,p=0,f=0;for(u=0;u<l.length;++u)if(l[u])switch(g[u]){case"%d":case"%e":i=parseInt(l[u],10);break;case"%m":s=parseInt(l[u],10)-1;break;case"%Y":case"%y":(n=parseInt(l[u],10))<100&&(n+=n>29?1900:2e3);break;case"%b":case"%B":for(h=0;h<12;++h)if(JoomlaCalLocale.months[h].substr(0,l[u].length).toLowerCase()==l[u].toLowerCase()){s=h;break}break;case"%H":case"%I":case"%k":case"%l":c=parseInt(l[u],10);break;case"%P":case"%p":/pm/i.test(l[u])&&c<12?c+=12:/am/i.test(l[u])&&c>=12&&(c-=12);break;case"%M":p=parseInt(l[u],10);break;case"%S":f=parseInt(l[u],10)}if(isNaN(n)&&(n=o.getFullYear()),isNaN(s)&&(s=o.getMonth()),isNaN(i)&&(i=o.getDate()),isNaN(c)&&(c=o.getHours()),isNaN(p)&&(p=o.getMinutes()),isNaN(f)&&(f=o.getSeconds()),0!=n&&-1!=s&&0!=i)return new t(n,s,i,c,p,f);for(n=0,s=-1,i=0,u=0;u<l.length;++u)if(-1!=l[u].search(/[a-zA-Z]+/)){var D=-1;for(h=0;h<12;++h)if(JoomlaCalLocale.months[h].substr(0,l[u].length).toLowerCase()==l[u].toLowerCase()){D=h;break}-1!=D&&(-1!=s&&(i=s+1),s=D)}else parseInt(l[u],10)<=12&&-1==s?s=l[u]-1:parseInt(l[u],10)>31&&0==n?(n=parseInt(l[u],10))<100&&(n+=n>29?1900:2e3):0==i&&(i=l[u]);return 0==n&&(n=o.getFullYear()),-1!=s&&0!=i?new t(n,s,i,c,p,f):o},t.prototype.print=function(e,a,r){if("string"!=typeof a&&(e=""),a||(a="gregorian"),"string"!=typeof e&&(e=""),!e)return"";if("NaN"==this.getLocalDate(a)||!this.getLocalDate(a))return"";var o=this.getLocalMonth(a),n=this.getLocalDate(a),s=this.getLocalFullYear(a),i=this.getLocalWeekNumber(a),l=this.getDay(),g={},u=this.getHours(),h=u>=12,c=h?u-12:u,p=this.getLocalDayOfYear(a);0==c&&(c=12);var f=this.getMinutes(),D=this.getSeconds();g["%a"]=JoomlaCalLocale.shortDays[l],g["%A"]=JoomlaCalLocale.days[l],g["%b"]=JoomlaCalLocale.shortMonths[o],g["%B"]=JoomlaCalLocale.months[o],g["%C"]=1+Math.floor(s/100),g["%d"]=n<10?"0"+n:n,g["%e"]=n,g["%H"]=u<10?"0"+u:u,g["%I"]=c<10?"0"+c:c,g["%j"]=p<100?p<10?"00"+p:"0"+p:p,g["%k"]=u,g["%l"]=c,g["%m"]=o<9?"0"+(1+o):1+o,g["%M"]=f<10?"0"+f:f,g["%n"]="\n",g["%p"]=h?JoomlaCalLocale.PM:JoomlaCalLocale.AM,g["%P"]=h?JoomlaCalLocale.pm:JoomlaCalLocale.am,g["%s"]=Math.floor(this.getTime()/1e3),g["%S"]=D<10?"0"+D:D,g["%t"]="\t",g["%U"]=g["%W"]=g["%V"]=i<10?"0"+i:i,g["%u"]=l+1,g["%w"]=l,g["%y"]=(""+s).substr(2,2),g["%Y"]=s,g["%%"]="%";var L=/%./g,M=e.replace(L,function(t){return g[t]||t});return"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers)&&"gregorian"!=a&&r&&(M=t.convertNumbers(M)),M}}(Date);
diff --git a/core/media/system/js/fields/calendar-locales/date/jalali/date-helper.js b/core/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
new file mode 100644
index 00000000..4fae6780
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
@@ -0,0 +1,623 @@
+/** BEGIN: DATE OBJECT PATCHES **/
+/** Adds the number of days array to the Date object. */
+Date.gregorian_MD = [31,28,31,30,31,30,31,31,30,31,30,31];
+Date.local_MD     = [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29];
+
+/** Constants used for time computations */
+Date.SECOND = 1000 /* milliseconds */;
+Date.MINUTE = 60 * Date.SECOND;
+Date.HOUR   = 60 * Date.MINUTE;
+Date.DAY    = 24 * Date.HOUR;
+Date.WEEK   =  7 * Date.DAY;
+
+/** MODIFY ONLY THE MARKED PARTS OF THE METHODS **/
+/************ START *************/
+/** INTERFACE METHODS FOR THE CALENDAR PICKER **/
+
+/********************** *************************/
+/**************** SETTERS ***********************/
+/********************** *************************/
+
+/** Sets the date for the current date without h/m/s. */
+Date.prototype.setLocalDateOnly = function (dateType, date) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return '';
+	} else {
+		var tmp = new Date(date);
+		this.setDate(1);
+		this.setFullYear(tmp.getFullYear());
+		this.setMonth(tmp.getMonth());
+		this.setDate(tmp.getDate());
+	}
+};
+
+/** Sets the full date for the current date. */
+Date.prototype.setLocalDate = function (dateType, d) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.setJalaliDate(d);
+	} else {
+		return this.setDate(d);
+	}
+};
+
+/** Sets the month for the current date. */
+Date.prototype.setLocalMonth = function (dateType, m, d) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.setJalaliMonth(m, d);
+	} else {
+		if (d == undefined) this.getDate();
+		return this.setMonth(m);
+	}
+};
+
+/** Sets the year for the current date. */
+Date.prototype.setOtherFullYear = function(dateType, y) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		var date = new Date(this);
+		date.setLocalFullYear(y);
+		if (date.getLocalMonth('jalali') != this.getLocalMonth('jalali')) this.setLocalDate('jalali', 29);
+		return this.setLocalFullYear('jalali', y);
+	} else {
+		var date = new Date(this);
+		date.setFullYear(y);
+		if (date.getMonth() != this.getMonth()) this.setDate(28);
+		return this.setUTCFullYear(y);
+	}
+};
+
+/** Sets the year for the current date. */
+Date.prototype.setLocalFullYear = function (dateType, y) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.setJalaliFullYear(y);
+	} else {
+		var date = new Date(this);
+		date.setFullYear(y);
+		if (date.getMonth() != this.getMonth()) this.setDate(28);
+		return this.setFullYear(y);
+	}
+};
+
+/********************** *************************/
+/**************** GETTERS ***********************/
+/********************** *************************/
+
+/** The number of days per week **/
+Date.prototype.getLocalWeekDays = function (dateType, y) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return 6;
+	} else {
+		return 6; // 7 days per week
+	}
+};
+
+/** Returns the year for the current date. */
+Date.prototype.getOtherFullYear = function (dateType) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.getJalaliFullYear();
+	} else {
+		return this.getFullYear();
+	}
+};
+
+/** Returns the year for the current date. */
+Date.prototype.getLocalFullYear = function (dateType) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.getJalaliFullYear();
+	} else {
+		return this.getFullYear();
+	}
+};
+
+/** Returns the month the date. */
+Date.prototype.getLocalMonth = function (dateType) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.getJalaliMonth();
+	} else {
+		return this.getMonth();
+	}
+};
+
+/** Returns the date. */
+Date.prototype.getLocalDate = function (dateType) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		return this.getJalaliDate();
+	} else {
+		return this.getDate();
+	}
+};
+
+/** Returns the number of day in the year. */
+Date.prototype.getLocalDay = function(dateType) {
+	if (dateType  != 'gregorian') {
+		return this.getJalaliDay();
+	} else {
+		return this.getDay();
+	}
+};
+
+/** Returns the number of days in the current month */
+Date.prototype.getLocalMonthDays = function(dateType, month) {
+	if (dateType != 'gregorian') {
+		/** Modify to match the current calendar when overriding **/
+		var year = this.getLocalFullYear('jalali');
+		if (typeof month == "undefined") {
+			month = this.getLocalMonth('jalali');
+		}
+		if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+			return 29;
+		} else {
+			Date.local_MD[month];
+		}
+	} else {
+		var year = this.getFullYear();
+		if (typeof month == "undefined") {
+			month = this.getMonth();
+		}
+		if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+			return 29;
+		} else {
+			return Date.gregorian_MD[month];
+		}
+	}
+};
+
+/** Returns the week number for the current date. */
+Date.prototype.getLocalWeekNumber = function(dateType) {
+	if (dateType != 'gregorian') {
+		var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+		var DoW = d.getDay();
+		d.setDate(d.getDate() - (DoW + 6) % 7 + 3);                                     // Nearest Thu
+		var ms = d.valueOf();                                                           // GMT
+		d.setMonth(0);
+		d.setDate(4);                                                                   // Thu in Week 1
+		return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+	} else {
+		var d = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+		var DoW = d.getDay();
+		d.setDate(d.getDate() - (DoW + 6) % 7 + 3);                                     // Nearest Thu
+		var ms = d.valueOf();                                                           // GMT
+		d.setMonth(0);
+		d.setDate(4);                                                                   // Thu in Week 1
+		return Math.round((ms - d.valueOf()) / (7 * 864e5)) + 1;
+	}
+};
+
+/** Returns the number of day in the year. */
+Date.prototype.getLocalDayOfYear = function(dateType) {
+	if (dateType  != 'gregorian') {
+		var now = new Date(this.getOtherFullYear(dateType), this.getLocalMonth(dateType), this.getLocalDate(dateType), 0, 0, 0);
+		var then = new Date(this.getOtherFullYear(dateType), 0, 0, 0, 0, 0);
+		var time = now - then;
+		return Math.floor(time / Date.DAY);
+	} else {
+		var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+		var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+		var time = now - then;
+		return Math.floor(time / Date.DAY);
+	}
+};
+
+/** Returns the number of days in the current month */
+Date.prototype.getMonthDays = function(month) {
+	var year = this.getFullYear();
+	if (typeof month == "undefined") {
+		month = this.getMonth();
+	}
+	if (((0 == (year%4)) && ( (0 != (year%100)) || (0 == (year%400)))) && month == 1) {
+		return 29;
+	} else {
+		if (Date.dateType != 'gregorian') {
+			Date.local_MD[month];
+		} else {
+			return Date.gregorian_MD[month];
+		}
+	}
+};
+
+/** Checks date and time equality */
+Date.prototype.equalsTo = function(date) {
+	return ((this.getFullYear() == date.getFullYear()) &&
+	(this.getMonth() == date.getMonth()) &&
+	(this.getDate() == date.getDate()) &&
+	(this.getHours() == date.getHours()) &&
+	(this.getMinutes() == date.getMinutes()));
+};
+
+/** Converts foreign date to gregorian date. */
+Date.localCalToGregorian = function(y, m, d) {
+	/** Modify to match the current calendar when overriding **/
+	return JalaliDate.jalaliToGregorian(y, m, d);
+};
+
+/** Converts gregorian date to foreign date. */
+Date.gregorianToLocalCal = function(y, m, d) {
+	/** Modify to match the current calendar when overriding **/
+	return JalaliDate.gregorianToJalali(y, m, d);
+};
+
+/** Method to convert numbers from local symbols to English numbers. */
+Date.numbersToIso = function(str) {
+	var i, nums =[0,1,2,3,4,5,6,7,8,9];
+	str = str.toString();
+
+	if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]') {
+		for (i = 0; i < nums.length; i++) {
+			str = str.replace(new RegExp(JoomlaCalLocale.localLangNumbers[i], 'g'), nums[i]);
+		}
+	}
+	return str;
+};
+/** INTERFACE METHODS FOR THE CALENDAR PICKER **/
+/************* END **************/
+
+/** Prints the date in a string according to the given format. */
+Date.prototype.print = function (str, dateType, translate) {
+	/** Handle calendar type **/
+	if (typeof dateType !== 'string') str = '';
+	if (!dateType) dateType = 'gregorian';
+
+	/** Handle wrong format **/
+	if (typeof str !== 'string') str = '';
+	if (!str) return '';
+
+
+	if (this.getLocalDate(dateType) == 'NaN' || !this.getLocalDate(dateType)) return '';
+	var m = this.getLocalMonth(dateType);
+	var d = this.getLocalDate(dateType);
+	var y = this.getLocalFullYear(dateType);
+	var wn = this.getLocalWeekNumber(dateType);
+	var w = this.getLocalDay(dateType);
+	var s = {};
+	var hr = this.getHours();
+	var pm = (hr >= 12);
+	var ir = (pm) ? (hr - 12) : hr;
+	var dy = this.getLocalDayOfYear(dateType);
+	if (ir == 0)
+		ir = 12;
+	var min = this.getMinutes();
+	var sec = this.getSeconds();
+	s["%a"] = JoomlaCalLocale.shortDays[w];                                                     // abbreviated weekday name
+	s["%A"] = JoomlaCalLocale.days[w];                                                          // full weekday name
+	s["%b"] = JoomlaCalLocale.shortMonths[m];                                                   // abbreviated month name
+	s["%B"] = JoomlaCalLocale.months[m];                                                        // full month name
+	// FIXME: %c : preferred date and time representation for the current locale
+	s["%C"] = 1 + Math.floor(y / 100);                                                          // the century number
+	s["%d"] = (d < 10) ? ("0" + d) : d;                                                         // the day of the month (range 01 to 31)
+	s["%e"] = d;                                                                                // the day of the month (range 1 to 31)
+	// FIXME: %D : american date style: %m/%d/%y
+	// FIXME: %E, %F, %G, %g, %h (man strftime)
+	s["%H"] = (hr < 10) ? ("0" + hr) : hr;                                                      // hour, range 00 to 23 (24h format)
+	s["%I"] = (ir < 10) ? ("0" + ir) : ir;                                                      // hour, range 01 to 12 (12h format)
+	s["%j"] = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy;                         // day of the year (range 001 to 366)
+	s["%k"] = hr;                                                                               // hour, range 0 to 23 (24h format)
+	s["%l"] = ir;                                                                               // hour, range 1 to 12 (12h format)
+	s["%m"] = (m < 9) ? ("0" + (1+m)) : (1+m);                                                  // month, range 01 to 12
+	s["%M"] = (min < 10) ? ("0" + min) : min;                                                   // minute, range 00 to 59
+	s["%n"] = "\n";                                                                             // a newline character
+	s["%p"] = pm ? JoomlaCalLocale.PM : JoomlaCalLocale.AM;
+	s["%P"] = pm ? JoomlaCalLocale.pm : JoomlaCalLocale.am;
+	// FIXME: %r : the time in am/pm notation %I:%M:%S %p
+	// FIXME: %R : the time in 24-hour notation %H:%M
+	s["%s"] = Math.floor(this.getTime() / 1000);
+	s["%S"] = (sec < 10) ? ("0" + sec) : sec;                                                   // seconds, range 00 to 59
+	s["%t"] = "\t";                                                                             // a tab character
+	// FIXME: %T : the time in 24-hour notation (%H:%M:%S)
+	s["%U"] = s["%W"] = s["%V"] = (wn < 10) ? ("0" + wn) : wn;
+	s["%u"] = w + 1;                                                                            // the day of the week (range 1 to 7, 1 = MON)
+	s["%w"] = w;                                                                                // the day of the week (range 0 to 6, 0 = SUN)
+	// FIXME: %x : preferred date representation for the current locale without the time
+	// FIXME: %X : preferred time representation for the current locale without the date
+	s["%y"] = ('' + y).substr(2, 2);                                                            // year without the century (range 00 to 99)
+	s["%Y"] = y;                                                                                // year with the century
+	s["%%"] = "%";                                                                              // a literal '%' character
+
+	var re = /%./g;
+
+	var tmpDate = str.replace(re, function (par) { return s[par] || par; });
+	if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]' && translate)
+		tmpDate = Date.convertNumbers(tmpDate);
+
+	return tmpDate;
+};
+
+Date.parseFieldDate = function(str, fmt, dateType) {
+	str = Date.numbersToIso(str);
+
+	var today = new Date();
+	var y = 0;
+	var m = -1;
+	var d = 0;
+	var a = str.split(/\W+/);
+	var b = fmt.match(/%./g);
+	var i = 0, j = 0;
+	var hr = 0;
+	var min = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (!a[i])
+			continue;
+		switch (b[i]) {
+			case "%d":
+			case "%e":
+				d = parseInt(a[i], 10);
+				break;
+
+			case "%m":
+				m = parseInt(a[i], 10) - 1;
+				break;
+
+			case "%Y":
+			case "%y":
+				y = parseInt(a[i], 10);
+				(y < 100) && (y += (y > 29) ? 1900 : 2000);
+				break;
+
+			case "%b":
+			case "%B":
+				for (j = 0; j < 12; ++j) {
+					if (dateType != 'gregorian') {
+						if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+					} else {
+						if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; }
+					}
+				}
+				break;
+
+			case "%H":
+			case "%I":
+			case "%k":
+			case "%l":
+				hr = parseInt(a[i], 10);
+				break;
+
+			case "%P":
+			case "%p":
+				if (/pm/i.test(a[i]) && hr < 12)
+					hr += 12;
+				else if (/am/i.test(a[i]) && hr >= 12)
+					hr -= 12;
+				break;
+
+			case "%M":
+				min = parseInt(a[i], 10);
+				break;
+			case "%S":
+				sec = parseInt(a[i], 10);
+				break;
+		}
+	}
+	if (isNaN(y)) y = today.getFullYear();
+	if (isNaN(m)) m = today.getMonth();
+	if (isNaN(d)) d = today.getDate();
+	if (isNaN(hr)) hr = today.getHours();
+	if (isNaN(min)) min = today.getMinutes();
+	if (y != 0 && m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	y = 0; m = -1; d = 0;
+	for (i = 0; i < a.length; ++i) {
+		if (a[i].search(/[a-zA-Z]+/) != -1) {
+			var t = -1;
+			for (j = 0; j < 12; ++j) {
+				if (dateType != 'gregorian') {
+					if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+				} else {
+					if (JoomlaCalLocale.months[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; }
+				}
+			}
+			if (t != -1) {
+				if (m != -1) {
+					d = m+1;
+				}
+				m = t;
+			}
+		} else if (parseInt(a[i], 10) <= 12 && m == -1) {
+			m = a[i]-1;
+		} else if (parseInt(a[i], 10) > 31 && y == 0) {
+			y = parseInt(a[i], 10);
+			(y < 100) && (y += (y > 29) ? 1900 : 2000);
+		} else if (d == 0) {
+			d = a[i];
+		}
+	}
+	if (y == 0)
+		y = today.getFullYear();
+	if (m != -1 && d != 0)
+		return new Date(y, m, d, hr, min, 0);
+	return today;
+};
+
+/*
+ * JalaliJSCalendar - Jalali Extension for Date Object
+ * Copyright (c) 2008 Ali Farhadi (http://farhadi.ir/)
+ * Released under the terms of the GNU General Public License.
+ * See the GPL for details (http://www.gnu.org/licenses/gpl.html).
+ *
+ * Based on code from http://farsiweb.info
+ */
+
+JalaliDate = {
+	g_days_in_month: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+	j_days_in_month: [31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29]
+};
+
+JalaliDate.jalaliToGregorian = function(j_y, j_m, j_d)
+{
+	j_y = parseInt(j_y);
+	j_m = parseInt(j_m);
+	j_d = parseInt(j_d);
+	var jy = j_y-979;
+	var jm = j_m-1;
+	var jd = j_d-1;
+
+	var j_day_no = 365*jy + parseInt(jy / 33)*8 + parseInt((jy%33+3) / 4);
+	for (var i=0; i < jm; ++i) j_day_no += JalaliDate.j_days_in_month[i];
+
+	j_day_no += jd;
+
+	var g_day_no = j_day_no+79;
+
+	var gy = 1600 + 400 * parseInt(g_day_no / 146097); /* 146097 = 365*400 + 400/4 - 400/100 + 400/400 */
+	g_day_no = g_day_no % 146097;
+
+	var leap = true;
+	if (g_day_no >= 36525) /* 36525 = 365*100 + 100/4 */
+	{
+		g_day_no--;
+		gy += 100*parseInt(g_day_no/  36524); /* 36524 = 365*100 + 100/4 - 100/100 */
+		g_day_no = g_day_no % 36524;
+
+		if (g_day_no >= 365)
+			g_day_no++;
+		else
+			leap = false;
+	}
+
+	gy += 4*parseInt(g_day_no/ 1461); /* 1461 = 365*4 + 4/4 */
+	g_day_no %= 1461;
+
+	if (g_day_no >= 366) {
+		leap = false;
+
+		g_day_no--;
+		gy += parseInt(g_day_no/ 365);
+		g_day_no = g_day_no % 365;
+	}
+
+	for (var i = 0; g_day_no >= JalaliDate.g_days_in_month[i] + (i == 1 && leap); i++)
+		g_day_no -= JalaliDate.g_days_in_month[i] + (i == 1 && leap);
+	var gm = i+1;
+	var gd = g_day_no+1;
+
+	return [gy, gm, gd];
+};
+
+JalaliDate.checkDate = function(j_y, j_m, j_d)
+{
+	return !(j_y < 0 || j_y > 32767 || j_m < 1 || j_m > 12 || j_d < 1 || j_d >
+	(JalaliDate.j_days_in_month[j_m-1] + (j_m == 12 && !((j_y-979)%33%4))));
+};
+
+JalaliDate.gregorianToJalali = function(g_y, g_m, g_d)
+{
+	g_y = parseInt(g_y);
+	g_m = parseInt(g_m);
+	g_d = parseInt(g_d);
+	var gy = g_y-1600;
+	var gm = g_m-1;
+	var gd = g_d-1;
+
+	var g_day_no = 365*gy+parseInt((gy+3) / 4)-parseInt((gy+99)/100)+parseInt((gy+399)/400);
+
+	for (var i=0; i < gm; ++i)
+		g_day_no += JalaliDate.g_days_in_month[i];
+	if (gm>1 && ((gy%4==0 && gy%100!=0) || (gy%400==0)))
+	/* leap and after Feb */
+		++g_day_no;
+	g_day_no += gd;
+
+	var j_day_no = g_day_no-79;
+
+	var j_np = parseInt(j_day_no/ 12053);
+	j_day_no %= 12053;
+
+	var jy = 979+33*j_np+4*parseInt(j_day_no/1461);
+
+	j_day_no %= 1461;
+
+	if (j_day_no >= 366) {
+		jy += parseInt((j_day_no-1)/ 365);
+		j_day_no = (j_day_no-1)%365;
+	}
+
+	for (var i = 0; i < 11 && j_day_no >= JalaliDate.j_days_in_month[i]; ++i) {
+		j_day_no -= JalaliDate.j_days_in_month[i];
+	}
+	var jm = i+1;
+	var jd = j_day_no+1;
+
+
+	return [jy, jm, jd];
+};
+
+Date.prototype.setJalaliFullYear = function(y, m, d) {
+	var gd = this.getDate();
+	var gm = this.getMonth();
+	var gy = this.getFullYear();
+	var j = JalaliDate.gregorianToJalali(gy, gm+1, gd);
+	if (y < 100) y += 1300;
+	j[0] = y;
+	if (m != undefined) {
+		if (m > 11) {
+			j[0] += Math.floor(m / 12);
+			m = m % 12;
+		}
+		j[1] = m + 1;
+	}
+	if (d != undefined) j[2] = d;
+	var g = JalaliDate.jalaliToGregorian(j[0], j[1], j[2]);
+	return this.setFullYear(g[0], g[1]-1, g[2]);
+};
+
+Date.prototype.setJalaliMonth = function(m, d) {
+	var gd = this.getDate();
+	var gm = this.getMonth();
+	var gy = this.getFullYear();
+	var j = JalaliDate.gregorianToJalali(gy, gm+1, gd);
+	if (m > 11) {
+		j[0] += Math.floor(m / 12);
+		m = m % 12;
+	}
+	j[1] = m+1;
+	if (d != undefined) j[2] = d;
+	var g = JalaliDate.jalaliToGregorian(j[0], j[1], j[2]);
+	return this.setFullYear(g[0], g[1]-1, g[2]);
+};
+
+Date.prototype.setJalaliDate = function(d) {
+	var gd = this.getDate();
+	var gm = this.getMonth();
+	var gy = this.getFullYear();
+	var j = JalaliDate.gregorianToJalali(gy, gm+1, gd);
+	j[2] = d;
+	var g = JalaliDate.jalaliToGregorian(j[0], j[1], j[2]);
+	return this.setFullYear(g[0], g[1]-1, g[2]);
+};
+
+Date.prototype.getJalaliFullYear = function() {
+	var gd = this.getDate();
+	var gm = this.getMonth();
+	var gy = this.getFullYear();
+	var j = JalaliDate.gregorianToJalali(gy, gm+1, gd);
+	return j[0];
+};
+
+Date.prototype.getJalaliMonth = function() {
+	var gd = this.getDate();
+	var gm = this.getMonth();
+	var gy = this.getFullYear();
+	var j = JalaliDate.gregorianToJalali(gy, gm+1, gd);
+	return j[1]-1;
+};
+
+Date.prototype.getJalaliDate = function() {
+	var gd = this.getDate();
+	var gm = this.getMonth();
+	var gy = this.getFullYear();
+	var j = JalaliDate.gregorianToJalali(gy, gm+1, gd);
+	return j[2];
+};
+
+Date.prototype.getJalaliDay = function() {
+	var day = this.getDay();
+	day = (day) % 7;
+	return day;
+};
diff --git a/core/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js b/core/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js
new file mode 100644
index 00000000..289732c4
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/date/jalali/date-helper.min.js
@@ -0,0 +1 @@
+Date.gregorian_MD=[31,28,31,30,31,30,31,31,30,31,30,31],Date.local_MD=[31,31,31,31,31,31,30,30,30,30,30,29],Date.SECOND=1e3,Date.MINUTE=60*Date.SECOND,Date.HOUR=60*Date.MINUTE,Date.DAY=24*Date.HOUR,Date.WEEK=7*Date.DAY,Date.prototype.setLocalDateOnly=function(t,e){if("gregorian"!=t)return"";var a=new Date(e);this.setDate(1),this.setFullYear(a.getFullYear()),this.setMonth(a.getMonth()),this.setDate(a.getDate())},Date.prototype.setLocalDate=function(t,e){return"gregorian"!=t?this.setJalaliDate(e):this.setDate(e)},Date.prototype.setLocalMonth=function(t,e,a){return"gregorian"!=t?this.setJalaliMonth(e,a):(void 0==a&&this.getDate(),this.setMonth(e))},Date.prototype.setOtherFullYear=function(t,e){if("gregorian"!=t)return(a=new Date(this)).setLocalFullYear(e),a.getLocalMonth("jalali")!=this.getLocalMonth("jalali")&&this.setLocalDate("jalali",29),this.setLocalFullYear("jalali",e);var a=new Date(this);return a.setFullYear(e),a.getMonth()!=this.getMonth()&&this.setDate(28),this.setUTCFullYear(e)},Date.prototype.setLocalFullYear=function(t,e){if("gregorian"!=t)return this.setJalaliFullYear(e);var a=new Date(this);return a.setFullYear(e),a.getMonth()!=this.getMonth()&&this.setDate(28),this.setFullYear(e)},Date.prototype.getLocalWeekDays=function(t,e){return 6},Date.prototype.getOtherFullYear=function(t){return"gregorian"!=t?this.getJalaliFullYear():this.getFullYear()},Date.prototype.getLocalFullYear=function(t){return"gregorian"!=t?this.getJalaliFullYear():this.getFullYear()},Date.prototype.getLocalMonth=function(t){return"gregorian"!=t?this.getJalaliMonth():this.getMonth()},Date.prototype.getLocalDate=function(t){return"gregorian"!=t?this.getJalaliDate():this.getDate()},Date.prototype.getLocalDay=function(t){return"gregorian"!=t?this.getJalaliDay():this.getDay()},Date.prototype.getLocalMonthDays=function(t,e){if("gregorian"==t){a=this.getFullYear();return void 0===e&&(e=this.getMonth()),0!=a%4||0==a%100&&0!=a%400||1!=e?Date.gregorian_MD[e]:29}var a=this.getLocalFullYear("jalali");if(void 0===e&&(e=this.getLocalMonth("jalali")),0==a%4&&(0!=a%100||0==a%400)&&1==e)return 29;Date.local_MD[e]},Date.prototype.getLocalWeekNumber=function(t){if("gregorian"!=t){a=(e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0)).getDay();e.setDate(e.getDate()-(a+6)%7+3);r=e.valueOf();return e.setMonth(0),e.setDate(4),Math.round((r-e.valueOf())/6048e5)+1}var e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),a=e.getDay();e.setDate(e.getDate()-(a+6)%7+3);var r=e.valueOf();return e.setMonth(0),e.setDate(4),Math.round((r-e.valueOf())/6048e5)+1},Date.prototype.getLocalDayOfYear=function(t){if("gregorian"!=t){r=(e=new Date(this.getOtherFullYear(t),this.getLocalMonth(t),this.getLocalDate(t),0,0,0))-(a=new Date(this.getOtherFullYear(t),0,0,0,0,0));return Math.floor(r/Date.DAY)}var e=new Date(this.getFullYear(),this.getMonth(),this.getDate(),0,0,0),a=new Date(this.getFullYear(),0,0,0,0,0),r=e-a;return Math.floor(r/Date.DAY)},Date.prototype.getMonthDays=function(t){var e=this.getFullYear();return void 0===t&&(t=this.getMonth()),0!=e%4||0==e%100&&0!=e%400||1!=t?"gregorian"==Date.dateType?Date.gregorian_MD[t]:void Date.local_MD[t]:29},Date.prototype.equalsTo=function(t){return this.getFullYear()==t.getFullYear()&&this.getMonth()==t.getMonth()&&this.getDate()==t.getDate()&&this.getHours()==t.getHours()&&this.getMinutes()==t.getMinutes()},Date.localCalToGregorian=function(t,e,a){return JalaliDate.jalaliToGregorian(t,e,a)},Date.gregorianToLocalCal=function(t,e,a){return JalaliDate.gregorianToJalali(t,e,a)},Date.numbersToIso=function(t){var e,a=[0,1,2,3,4,5,6,7,8,9];if(t=t.toString(),"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers))for(e=0;e<a.length;e++)t=t.replace(new RegExp(JoomlaCalLocale.localLangNumbers[e],"g"),a[e]);return t},Date.prototype.print=function(t,e,a){if("string"!=typeof e&&(t=""),e||(e="gregorian"),"string"!=typeof t&&(t=""),!t)return"";if("NaN"==this.getLocalDate(e)||!this.getLocalDate(e))return"";var r=this.getLocalMonth(e),o=this.getLocalDate(e),l=this.getLocalFullYear(e),i=this.getLocalWeekNumber(e),n=this.getLocalDay(e),s={},g=this.getHours(),h=g>=12,D=h?g-12:g,u=this.getLocalDayOfYear(e);0==D&&(D=12);var c=this.getMinutes(),p=this.getSeconds();s["%a"]=JoomlaCalLocale.shortDays[n],s["%A"]=JoomlaCalLocale.days[n],s["%b"]=JoomlaCalLocale.shortMonths[r],s["%B"]=JoomlaCalLocale.months[r],s["%C"]=1+Math.floor(l/100),s["%d"]=o<10?"0"+o:o,s["%e"]=o,s["%H"]=g<10?"0"+g:g,s["%I"]=D<10?"0"+D:D,s["%j"]=u<100?u<10?"00"+u:"0"+u:u,s["%k"]=g,s["%l"]=D,s["%m"]=r<9?"0"+(1+r):1+r,s["%M"]=c<10?"0"+c:c,s["%n"]="\n",s["%p"]=h?JoomlaCalLocale.PM:JoomlaCalLocale.AM,s["%P"]=h?JoomlaCalLocale.pm:JoomlaCalLocale.am,s["%s"]=Math.floor(this.getTime()/1e3),s["%S"]=p<10?"0"+p:p,s["%t"]="\t",s["%U"]=s["%W"]=s["%V"]=i<10?"0"+i:i,s["%u"]=n+1,s["%w"]=n,s["%y"]=(""+l).substr(2,2),s["%Y"]=l,s["%%"]="%";var f=/%./g,M=t.replace(f,function(t){return s[t]||t});return"[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers)&&a&&(M=Date.convertNumbers(M)),M},Date.parseFieldDate=function(t,e,a){t=Date.numbersToIso(t);var r=new Date,o=0,l=-1,i=0,n=t.split(/\W+/),s=e.match(/%./g),g=0,h=0,D=0,u=0;for(g=0;g<n.length;++g)if(n[g])switch(s[g]){case"%d":case"%e":i=parseInt(n[g],10);break;case"%m":l=parseInt(n[g],10)-1;break;case"%Y":case"%y":(o=parseInt(n[g],10))<100&&(o+=o>29?1900:2e3);break;case"%b":case"%B":for(h=0;h<12;++h)if("gregorian"!=a){if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){l=h;break}}else if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){l=h;break}break;case"%H":case"%I":case"%k":case"%l":D=parseInt(n[g],10);break;case"%P":case"%p":/pm/i.test(n[g])&&D<12?D+=12:/am/i.test(n[g])&&D>=12&&(D-=12);break;case"%M":u=parseInt(n[g],10);break;case"%S":sec=parseInt(n[g],10)}if(isNaN(o)&&(o=r.getFullYear()),isNaN(l)&&(l=r.getMonth()),isNaN(i)&&(i=r.getDate()),isNaN(D)&&(D=r.getHours()),isNaN(u)&&(u=r.getMinutes()),0!=o&&-1!=l&&0!=i)return new Date(o,l,i,D,u,0);for(o=0,l=-1,i=0,g=0;g<n.length;++g)if(-1!=n[g].search(/[a-zA-Z]+/)){var c=-1;for(h=0;h<12;++h)if("gregorian"!=a){if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){c=h;break}}else if(JoomlaCalLocale.months[h].substr(0,n[g].length).toLowerCase()==n[g].toLowerCase()){c=h;break}-1!=c&&(-1!=l&&(i=l+1),l=c)}else parseInt(n[g],10)<=12&&-1==l?l=n[g]-1:parseInt(n[g],10)>31&&0==o?(o=parseInt(n[g],10))<100&&(o+=o>29?1900:2e3):0==i&&(i=n[g]);return 0==o&&(o=r.getFullYear()),-1!=l&&0!=i?new Date(o,l,i,D,u,0):r},JalaliDate={g_days_in_month:[31,28,31,30,31,30,31,31,30,31,30,31],j_days_in_month:[31,31,31,31,31,31,30,30,30,30,30,29]},JalaliDate.jalaliToGregorian=function(t,e,a){for(var r=(t=parseInt(t))-979,o=(e=parseInt(e))-1,l=(a=parseInt(a))-1,i=365*r+8*parseInt(r/33)+parseInt((r%33+3)/4),n=0;n<o;++n)i+=JalaliDate.j_days_in_month[n];var s=(i+=l)+79,g=1600+400*parseInt(s/146097),h=!0;(s%=146097)>=36525&&(s--,g+=100*parseInt(s/36524),(s%=36524)>=365?s++:h=!1),g+=4*parseInt(s/1461),(s%=1461)>=366&&(h=!1,s--,g+=parseInt(s/365),s%=365);for(n=0;s>=JalaliDate.g_days_in_month[n]+(1==n&&h);n++)s-=JalaliDate.g_days_in_month[n]+(1==n&&h);return[g,n+1,s+1]},JalaliDate.checkDate=function(t,e,a){return!(t<0||t>32767||e<1||e>12||a<1||a>JalaliDate.j_days_in_month[e-1]+(12==e&&!((t-979)%33%4)))},JalaliDate.gregorianToJalali=function(t,e,a){for(var r=(t=parseInt(t))-1600,o=(e=parseInt(e))-1,l=(a=parseInt(a))-1,i=365*r+parseInt((r+3)/4)-parseInt((r+99)/100)+parseInt((r+399)/400),n=0;n<o;++n)i+=JalaliDate.g_days_in_month[n];o>1&&(r%4==0&&r%100!=0||r%400==0)&&++i;var s=(i+=l)-79,g=parseInt(s/12053);s%=12053;var h=979+33*g+4*parseInt(s/1461);(s%=1461)>=366&&(h+=parseInt((s-1)/365),s=(s-1)%365);for(n=0;n<11&&s>=JalaliDate.j_days_in_month[n];++n)s-=JalaliDate.j_days_in_month[n];return[h,n+1,s+1]},Date.prototype.setJalaliFullYear=function(t,e,a){var r=this.getDate(),o=this.getMonth(),l=this.getFullYear(),i=JalaliDate.gregorianToJalali(l,o+1,r);t<100&&(t+=1300),i[0]=t,void 0!=e&&(e>11&&(i[0]+=Math.floor(e/12),e%=12),i[1]=e+1),void 0!=a&&(i[2]=a);var n=JalaliDate.jalaliToGregorian(i[0],i[1],i[2]);return this.setFullYear(n[0],n[1]-1,n[2])},Date.prototype.setJalaliMonth=function(t,e){var a=this.getDate(),r=this.getMonth(),o=this.getFullYear(),l=JalaliDate.gregorianToJalali(o,r+1,a);t>11&&(l[0]+=Math.floor(t/12),t%=12),l[1]=t+1,void 0!=e&&(l[2]=e);var i=JalaliDate.jalaliToGregorian(l[0],l[1],l[2]);return this.setFullYear(i[0],i[1]-1,i[2])},Date.prototype.setJalaliDate=function(t){var e=this.getDate(),a=this.getMonth(),r=this.getFullYear(),o=JalaliDate.gregorianToJalali(r,a+1,e);o[2]=t;var l=JalaliDate.jalaliToGregorian(o[0],o[1],o[2]);return this.setFullYear(l[0],l[1]-1,l[2])},Date.prototype.getJalaliFullYear=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[0]},Date.prototype.getJalaliMonth=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[1]-1},Date.prototype.getJalaliDate=function(){var t=this.getDate(),e=this.getMonth(),a=this.getFullYear();return JalaliDate.gregorianToJalali(a,e+1,t)[2]},Date.prototype.getJalaliDay=function(){var t=this.getDay();return t%=7};
diff --git a/core/media/system/js/fields/calendar-locales/de.js b/core/media/system/js/fields/calendar-locales/de.js
new file mode 100644
index 00000000..b3b65f4a
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/de.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Heute",
+	weekend : [0, 6],
+	wk : "KW",
+	time : "Uhrzeit:",
+	days : ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"],
+	shortDays : ["Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam"],
+	months : ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
+	shortMonths : ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Schließen",
+	save: "Leeren"
+};
diff --git a/core/media/system/js/fields/calendar-locales/el.js b/core/media/system/js/fields/calendar-locales/el.js
new file mode 100644
index 00000000..2aee52a8
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/el.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Σήμερα",
+	weekend : [0, 6],
+	wk : "εβδ.",
+	time : "Ώρα:",
+	days : ["Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο"],
+	shortDays : ["Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ"],
+	months : ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"],
+	shortMonths : ["Ιαν", "Φεβ", "Μαρ", "Απρ", "Μαϊ", "Ιουν", "Ιουλ", "Αυγ", "Σεπ", "Οκτ", "Νοε", "Δεκ"],
+	AM : "ΠΜ",
+	PM :  "ΜΜ",
+	am : "πμ",
+	pm : "μμ",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Κλείσιμο",
+	save: "Καθαρισμός"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/en.js b/core/media/system/js/fields/calendar-locales/en.js
new file mode 100644
index 00000000..4280fefc
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/en.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Today",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Time:",
+	days : ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+	shortDays : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+	months : ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Close",
+	save: "Clear"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/es.js b/core/media/system/js/fields/calendar-locales/es.js
new file mode 100644
index 00000000..b89270b3
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/es.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Hoy",
+	weekend : [0, 6],
+	wk : "Sem",
+	time : "Hora:",
+	days : ["Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"],
+	shortDays : ["Do", "Lu", "Ma", "Mi", "Ju", "Vi", "Sá"],
+	months : ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"],
+	shortMonths : ["Ene", "Feb", "Mar", "Abr", "May", "Jun", "Jul", "Ago", "Sep", "Oct", "Nov", "Dic"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Cerrar",
+	save: "Limpiar"
+};
diff --git a/core/media/system/js/fields/calendar-locales/eu.js b/core/media/system/js/fields/calendar-locales/eu.js
new file mode 100644
index 00000000..0cf5d12b
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/eu.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Gaur",
+	weekend : [0, 6],
+	wk : "ast.",
+	time : "Ordua:",
+	days : ["Igandea", "Astelehena", "Asteartea", "Asteazkena", "Osteguna", "Ostirala", "Larunbata"],
+	shortDays : ["ig.", "al.", "as.", "az.", "og.", "or.", "lr."],
+	months : ["Urtarrila", "Otsaila", "Martxoa", "Apirila", "Maiatza", "Ekaina", "Uztaila", "Abuztua", "Iraila", "Urria", "Azaroa", "Abendua"],
+	shortMonths : ["urt.", "ots.", "mar.", "api.", "mai.", "eka.", "uzt.", "abu.", "ira.", "urr.", "aza.", "abe."],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Itxi",
+	save: "Garbitu"
+};
diff --git a/core/media/system/js/fields/calendar-locales/fa-ir.js b/core/media/system/js/fields/calendar-locales/fa-ir.js
new file mode 100644
index 00000000..c9fb524e
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/fa-ir.js
@@ -0,0 +1,20 @@
+window.JoomlaCalLocale = {
+	today : "امروز",
+	weekend : [5],
+	wk : "هفته",
+	time : "زمان",
+	days : ["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],
+	shortDays : ["یک","دو","سه","چهار","پنج","جمعه","شنبه"],
+	months : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"],
+	shortMonths : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"],
+	AM : "ق.ظ.",
+	PM :  "ب.ظ.",
+	am : "ق.ظ.",
+	pm : "ب.ظ.",
+	dateType : "jalali",
+	minYear : 1268,
+	maxYear : 1458,
+	exit: "بستن",
+	save: "پاک",
+	localLangNumbers: ["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"]
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/fi.js b/core/media/system/js/fields/calendar-locales/fi.js
new file mode 100644
index 00000000..ffe7fc38
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/fi.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Tänään",
+	weekend : [0, 6],
+	wk : "vk",
+	time : "Aika:",
+	days : ["Sunnuntai", "Maanantai", "Tiistai", "Keskiviikko", "Torstai", "Perjantai", "Lauantai"],
+	shortDays : ["Su", "Ma", "Ti", "Ke", "To", "Pe", "La"],
+	months : ["Tammikuu", "Helmikuu", "Maaliskuu", "Huhtikuu", "Toukokuu", "Kesäkuu", "Heinäkuu", "Elokuu", "Syyskuu", "Lokakuu", "Marraskuu", "Joulukuu"],
+	shortMonths : ["Tammi", "Helmi", "Maalis", "Huhti", "Touko", "Kesä", "Heinä", "Elo", "Syys", "Loka", "Marras", "Joulu"],
+	AM : "AP",
+	PM :  "IP",
+	am : "ap",
+	pm : "ip",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Sulje",
+	save: "Tyhjennä"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/fr.js b/core/media/system/js/fields/calendar-locales/fr.js
new file mode 100644
index 00000000..9fd1189b
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/fr.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Aujourd'hui",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Heure&nbsp;:",
+	days : ["Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"],
+	shortDays : ["Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"],
+	months : ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
+	shortMonths : ["Jan", "Fév", "Mar", "Avr", "Mai", "Jui", "Juol", "Aoû", "Sep", "Oct", "Nov", "Déc"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Fermer",
+	save: "Effacer"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/ga.js b/core/media/system/js/fields/calendar-locales/ga.js
new file mode 100644
index 00000000..fde45f1c
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ga.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Inniu",
+	weekend : [0, 6],
+	wk : "7n",
+	time : "Am:",
+	days : ["Dé Domhnaigh", "Dé Luain", "Dé Máirt", "Dé Céadaoin", "Déardaoin", "Dé hAoine", "Dé Sathairn"],
+	shortDays : ["Domh", "Luan", "Máirt", "Céad", "Déar", "Aoine", "Sath"],
+	months : ["Eanáir", "Feabhra", "Márta", "Aibreán", "Bealtaine", "Meitheamh", "Iúil", "Lúnasa", "Meán Fómhair", "Deireadh Fómhair", "Samhain", "Nollaig"],
+	shortMonths : ["Ean", "Feabh", "Márta", "Aib", "Beal", "Meith", "Iúil", "Lún", "MFómh", "DFómh", "Samh", "Noll"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Dún",
+	save: "Glan"
+};
diff --git a/core/media/system/js/fields/calendar-locales/hr.js b/core/media/system/js/fields/calendar-locales/hr.js
new file mode 100644
index 00000000..48d02db5
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/hr.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Danas",
+	weekend : [0, 6],
+	wk : "tj",
+	time : "Vrijeme:",
+	days : ["Nedjelja", "Ponedjeljak", "Utorak", "Srijeda", "Četvrtak", "Petak", "Subota"],
+	shortDays : ["Ned", "Pon", "Uto", "Sri", "Čet", "Pet", "Sub"],
+	months : ["Siječanj", "Veljača", "Ožujak", "Travanj", "Svibanj", "Lipanj", "Srpanj", "Kolovoz", "Rujan", "Listopad", "Studeni", "Prosinac"],
+	shortMonths : ["Sij", "Velj", "Ožu", "Tra", "Svi", "Lip", "Srp", "Kol", "Ruj", "Lis", "Stu", "Pro"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Zatvori",
+	save: "Otkaži"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/hu.js b/core/media/system/js/fields/calendar-locales/hu.js
new file mode 100644
index 00000000..fefea8e1
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/hu.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Ma",
+	weekend : [0, 6],
+	wk : "hét",
+	time : "Időpont:",
+	days : ["vasárnap", "hétfő", "kedd", "szerda", "csütörtök", "péntek", "szombat"],
+	shortDays : ["V", "H", "K", "Sze", "Cs", "P", "Szo"],
+	months : ["január", "február", "március", "április", "május", "június", "július", "augusztus", "szeptember", "október", "november", "december"],
+	shortMonths : ["jan", "febr", "márc", "ápr", "máj", "jún", "júl", "aug", "szept", "okt", "nov", "dec"],
+	AM : "de.",
+	PM :  "du.",
+	am : "de.",
+	pm : "du.",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Bezárás",
+	save: "Törlés"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/it.js b/core/media/system/js/fields/calendar-locales/it.js
new file mode 100644
index 00000000..c4c0dce7
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/it.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Oggi",
+	weekend : [0, 6],
+	wk : "set",
+	time : "Ora:",
+	days : ["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"],
+	shortDays : ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"],
+	months : ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
+	shortMonths : ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Chiudi",
+	save: "Annulla"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/ja.js b/core/media/system/js/fields/calendar-locales/ja.js
new file mode 100644
index 00000000..f9662a97
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ja.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "今日",
+	weekend : [0, 6],
+	wk : "週",
+	time : "時間:",
+	days : ["日曜日", "月曜日", "火曜日", "水曜日", "木曜日", "金曜日", "土曜日"],
+	shortDays : ["日", "月", "火", "水", "木", "金", "土"],
+	months : ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+	shortMonths : ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+	AM : "午前",
+	PM :  "午後",
+	am : "午前",
+	pm : "午後",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "閉じる",
+	save: "クリア"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/ka.js b/core/media/system/js/fields/calendar-locales/ka.js
new file mode 100644
index 00000000..0d08776a
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ka.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "დღეს",
+	weekend : [0, 6],
+	wk : "კვ",
+	time : "დრო:",
+	days : ["კვირა", "ორშაბათი", "სამშაბათი", "ოთხშაბათი", "ხუთშაბათი", "პარასკევი", "შაბათი"],
+	shortDays : ["კვ", "ორშ", "სამშ", "ოთხშ", "ხუთშ", "პარ", "შაბ"],
+	months : ["იანვარი", "თებერვალი", "მარტი", "აპრილი", "მაისი", "ივნისი", "ივლისი", "აგვისტო", "სექტემბერი", "ოქტომბერი", "ნოემბერი", "დეკემბერი"],
+	shortMonths : ["იან", "თებ", "მარ", "აპრ", "მაი", "ივნ", "ივლ", "აგვ", "სექ", "ოქტ", "ნოე", "დეკ"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "დახურვა",
+	save: "გასუფთავება"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/ko.js b/core/media/system/js/fields/calendar-locales/ko.js
new file mode 100644
index 00000000..e0fbf726
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ko.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "오늘",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "시간:",
+	days : ["일요일", "월요일", "화요일", "수요일", "목요일", "금요일", "토요일"],
+	shortDays : ["일", "월", "화", "수", "목", "금", "토"],
+	months : ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"],
+	shortMonths : ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"],
+	AM : "오전",
+	PM :  "오후",
+	am : "오전",
+	pm : "오후",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "닫기",
+	save: "Clear"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/lt.js b/core/media/system/js/fields/calendar-locales/lt.js
new file mode 100644
index 00000000..f1d45c20
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/lt.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Šiandien",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Laikas:",
+	days : ["Sekmadienis", "Pirmadienis", "Antradienis", "Trečiadienis", "Ketvirtadienis", "Penktadienis", "Šeštadienis"],
+	shortDays : ["Sek", "Pir", "Ant", "Tre", "Ket", "Pen", "Šeš"],
+	months : ["Sausis", "Vasaris", "Kovas", "Balandis", "Gegužė", "Birželis", "Liepa", "Rugpjūtis", "Rugsšjis", "Spalis", "Lapkritis", "Gruodis"],
+	shortMonths : ["Sau", "Vas", "Kov", "Bal", "Geg", "Bir", "Lie", "Rug", "Rgs", "Spa", "Lap", "Grd"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Uždaryti",
+	save: "Išvalyti"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/mk.js b/core/media/system/js/fields/calendar-locales/mk.js
new file mode 100644
index 00000000..2d952fc6
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/mk.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Денес",
+	weekend : [0, 6],
+	wk : "нед",
+	time : "Време:",
+	days : ["Недела", "Понеделник", "Вторник", "Среда", "Четврток", "Петок", "Сабота"],
+	shortDays : ["Нед", "Пон", "Вто", "Сре", "Чет", "Пет", "Саб"],
+	months : ["Јануари", "Февруари", "Март", "Април", "Мај", "Јуни", "Јули", "Август", "Септември", "Октомври", "Ноември", "Декември"],
+	shortMonths : ["Јан", "Фев", "Мар", "Апр", "Мај", "Јун", "Јул", "Авг", "Сеп", "Окт", "Ное", "Дек"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Затвори",
+	save: "Зачувај"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/nb.js b/core/media/system/js/fields/calendar-locales/nb.js
new file mode 100644
index 00000000..6ab348c9
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/nb.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Dagens dato",
+	weekend : [0, 6],
+	wk : "Uke",
+	time : "Tid:",
+	days : ["Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"],
+	shortDays : ["Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør"],
+	months : ["Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Lukk",
+	save: "Tøm"
+};
diff --git a/core/media/system/js/fields/calendar-locales/nl.js b/core/media/system/js/fields/calendar-locales/nl.js
new file mode 100644
index 00000000..2db39946
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/nl.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Vandaag",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Tijd:",
+	days : ["Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag"],
+	shortDays : ["Zon", "Maa", "Din", "Woe", "Don", "Vri", "Zat"],
+	months : ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"],
+	shortMonths : ["Jan", "Feb", "Maa", "Apr", "Mei", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Sluiten",
+	save: "Legen"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/pl.js b/core/media/system/js/fields/calendar-locales/pl.js
new file mode 100644
index 00000000..62ad8eb5
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/pl.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Dzisiaj",
+	weekend : [0, 6],
+	wk : "tydz",
+	time : "Godzina:",
+	days : ["Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota"],
+	shortDays : ["nie.", "pon.", "wt.", "śr.", "czw.", "pt.", "sob."],
+	months : ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"],
+	shortMonths : ["Sty", "Lut", "Mar", "Kwi", "Maj", "Cze", "Lip", "Sie", "Wrz", "Paź", "Lis", "Gru"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Zamknij",
+	save: "Wyczyść"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/prs-af.js b/core/media/system/js/fields/calendar-locales/prs-af.js
new file mode 100644
index 00000000..c9fb524e
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/prs-af.js
@@ -0,0 +1,20 @@
+window.JoomlaCalLocale = {
+	today : "امروز",
+	weekend : [5],
+	wk : "هفته",
+	time : "زمان",
+	days : ["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],
+	shortDays : ["یک","دو","سه","چهار","پنج","جمعه","شنبه"],
+	months : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"],
+	shortMonths : ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"],
+	AM : "ق.ظ.",
+	PM :  "ب.ظ.",
+	am : "ق.ظ.",
+	pm : "ب.ظ.",
+	dateType : "jalali",
+	minYear : 1268,
+	maxYear : 1458,
+	exit: "بستن",
+	save: "پاک",
+	localLangNumbers: ["۰","۱","۲","۳","۴","۵","۶","۷","۸","۹"]
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/pt.js b/core/media/system/js/fields/calendar-locales/pt.js
new file mode 100644
index 00000000..b48dfd01
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/pt.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Hoje",
+	weekend : [0, 6],
+	wk : "sem",
+	time : "Hora:",
+	days : ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"],
+	shortDays : ["Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab"],
+	months : ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"],
+	shortMonths : ["Jan", "Fev", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Out", "Nov", "Dez"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Fechar",
+	save: "Limpar"
+};
diff --git a/core/media/system/js/fields/calendar-locales/ru.js b/core/media/system/js/fields/calendar-locales/ru.js
new file mode 100644
index 00000000..38370e7d
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ru.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Сегодня",
+	weekend : [0, 6],
+	wk : "нед",
+	time : "Время:",
+	days : ["Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"],
+	shortDays : ["Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"],
+	months : ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"],
+	shortMonths : ["Янв", "Фев", "Мар", "Апр", "Май", "Июн", "Июл", "Авг", "Сен", "Окт", "Ноя", "Дек"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Закрыть",
+	save: "Очистить"
+};
diff --git a/core/media/system/js/fields/calendar-locales/sk.js b/core/media/system/js/fields/calendar-locales/sk.js
new file mode 100644
index 00000000..4ee73417
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/sk.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Dnes",
+	weekend : [0, 6],
+	wk : "týž.",
+	time : "Čas:",
+	days : ["Nedeľa", "Pondelok", "Utorok", "Streda", "Štvrtok", "Piatok", "Sobota"],
+	shortDays : ["Ned", "Pon", "Uto", "Str", "Štv", "Pia", "Sob"],
+	months : ["Január", "Február", "Marec", "Apríl", "Máj", "Jún", "Júl", "August", "September", "Október", "November", "December"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Máj", "Jún", "Júl", "Aug", "Sep", "Okt", "Nov", "Dec"],
+	AM : "DOPOL.",
+	PM :  "POPOL.",
+	am : "dopol.",
+	pm : "popol.",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Zavrieť",
+	save: "Vymazať"
+};
diff --git a/core/media/system/js/fields/calendar-locales/sl.js b/core/media/system/js/fields/calendar-locales/sl.js
new file mode 100644
index 00000000..730bb9f6
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/sl.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Danes",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Čas:",
+	days : ["Nedelja", "Ponedeljek", "Torek", "Sreda", "Četrtek", "Petek", "Sobota"],
+	shortDays : ["Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob"],
+	months : ["Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Zapri",
+	save: "Počisti"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/sr-rs.js b/core/media/system/js/fields/calendar-locales/sr-rs.js
new file mode 100644
index 00000000..5ff59b26
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/sr-rs.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Данас",
+	weekend : [0, 6],
+	wk : "нед",
+	time : "Време:",
+	days : ["Недеља", "Понедељак", "Уторак", "Среда", "Четвртак", "Петак", "Субота"],
+	shortDays : ["Нед", "Пон", "Уто", "Сре", "Чет", "Пет", "Суб"],
+	months : ["Јануар", "Фенруар", "Март", "Април", "Мај", "Јуни", "Јули", "Август", "Септембар", "Октобар", "Новембар", "Децембар"],
+	shortMonths : ["Јан", "Феб", "Мар", "Апр", "Мај", "Јун", "Јул", "Авг", "Сеп", "Окт", "Нов", "Дец"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Затвори",
+	save: "Зачувај"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/sr-yu.js b/core/media/system/js/fields/calendar-locales/sr-yu.js
new file mode 100644
index 00000000..d6745bd6
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/sr-yu.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Danas",
+	weekend : [0, 6],
+	wk : "ned",
+	time : "Vreme:",
+	days : ["Nedelja", "Ponedeljak", "Utorak", "Sreda", "Četvrtak", "Petak", "Subota"],
+	shortDays : ["Ned", "Pon", "Uto", "Sre", "Čet", "Pet", "Sub"],
+	months : ["Januar", "Fenruar", "Mart", "April", "Maj", "Juni", "Juli", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Avg", "Sep", "Okt", "Nov", "Dec"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Zatvori",
+	save: "Sačuvaj"
+};
diff --git a/core/media/system/js/fields/calendar-locales/sv.js b/core/media/system/js/fields/calendar-locales/sv.js
new file mode 100644
index 00000000..6902f416
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/sv.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Idag",
+	weekend : [0, 6],
+	wk : "vk",
+	time : "Tid:",
+	days : ["Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"],
+	shortDays : ["Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"],
+	months : ["Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"],
+	shortMonths : ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"],
+	AM : "FM",
+	PM :  "EM",
+	am : "fm",
+	pm : "em",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Stäng",
+	save: "Rensa"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/sw.js b/core/media/system/js/fields/calendar-locales/sw.js
new file mode 100644
index 00000000..a270f85d
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/sw.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Leo",
+	weekend : [0, 6],
+	wk : "wk",
+	time : "Saa:",
+	days : ["Jumapili", "Jumatatu", "Jumanne", "Jumatano", "Alhamisi", "Ijumaa", "Jumamosi"],
+	shortDays : ["Jmp", "Jmt", "Jmn", "Jtn", "Alh", "Ijm", "Jmm"],
+	months : ["Januari", "Februari", "Machi", "Aprili", "Mai", "Juni", "Julai", "Augosti", "Septemba", "Oktoba", "Novemba", "Desemba"],
+	shortMonths : ["Jan", "Feb", "Mach", "Apr", "Mai", "Jun", "Jul", "Ago", "Sep", "Okt", "Nov", "Des"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Funga",
+	save: "Safisha"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/ta.js b/core/media/system/js/fields/calendar-locales/ta.js
new file mode 100644
index 00000000..408287cf
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/ta.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "இன்று",
+	weekend : [0, 6],
+	wk : "வா",
+	time : "நேரம்:",
+	days : ["ஞாயிறு", "திங்கள்", "செவ்வாய்", "புதன்", "வியாழன்", "வெள்ளி", "சனி"],
+	shortDays : ["ஞா", "தி", "செ", "பு", "வி", "வெ", "ச"],
+	months : ["ஜனவரி", "பிப்ரவரி", "மார்ச்", "ஏப்ரல்", "மே", "ஜூன்", "ஜூலை", "ஆகஸ்ட்", "செப்டம்பர்", "அக்டோபர்", "நவம்பர்", "டிசம்பர்"],
+	shortMonths : ["ஜன", "பிப்", "மார்", "ஏப்", "மே", "ஜூன்", "ஜூலை", "ஆக", "செப்", "அக்", "நவ", "டிச"],
+	AM : "காலை",
+	PM : "மாலை",
+	am : "காலை",
+	pm : "மாலை",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "மூடுக",
+	save: "துடைக்க"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/th.js b/core/media/system/js/fields/calendar-locales/th.js
new file mode 100644
index 00000000..2743692c
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/th.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "วันนี้",
+	weekend : [0, 6],
+	wk : "สัปดาห์",
+	time : "เวลา:",
+	days : ["อาทิตย์", "จันทร์", "อังคาร", "พุธ", "พฤหัสบดี", "ศุกร์", "เสาร์"],
+	shortDays : ["อา.", "จ.", "อ.", "พ.", "พฤ.", "ศ.", "ส."],
+	months : ["มกราคม", "กุมภาพันธ์", "มีนาคม", "เมษายน", "พฤษภาคม", "มิถุนายน", "กรกฏาคม", "สิงหาคม", "กันยายน", "ตุลาคม", "พฤศจิกายน", "ธันวาคม"],
+	shortMonths : ["ม.ค.", "ก.พ.", "มี.ค.", "เม.ย.", "พ.ค.", "มิ.ย.", "ก.ค.", "ส.ค.", "ก.ย.", "ต.ค.", "พ.ย.", "ธ.ค."],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "ปิด",
+	save: "ล้าง"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/uk.js b/core/media/system/js/fields/calendar-locales/uk.js
new file mode 100644
index 00000000..6a31d866
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/uk.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "Сьогодні",
+	weekend : [0, 6],
+	wk : "тждн.",
+	time : "Час:",
+	days : ["Неділя", "Понеділок", "Вівторок", "Середа", "Четвер", "П'ятниця", "Субота"],
+	shortDays : ["Нд.", "Пн.", "Вт.", "Ср.", "Чт.", "Пт.", "Сб."],
+	months : ["Січень", "Лютий", "Березень", "Квітень", "Травень", "Червень", "Липень", "Серпень", "Вересень", "Жовтень", "Листопад", "Грудень"],
+	shortMonths : ["Січ.", "Лют.", "Бер.", "Квіт.", "Трав.", "Черв.", "Лип.", "Серп.", "Вер.", "Жовт.", "Лист.", "Груд."],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "Закрити",
+	save: "Очистити"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/zh-CN.js b/core/media/system/js/fields/calendar-locales/zh-CN.js
new file mode 100644
index 00000000..b2c2f6b2
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/zh-CN.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "今天",
+	weekend : [0, 6],
+	wk : "星期",
+	time : "时间",
+	days : ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
+	shortDays : ["日", "一", "二", "三", "四", "五", "六"],
+	months : ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+	shortMonths : ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二"],
+	AM : "上午",
+	PM :  "下午",
+	am : "上午",
+	pm : "下午",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "关闭",
+	save: "清除"
+};
\ No newline at end of file
diff --git a/core/media/system/js/fields/calendar-locales/zh-TW.js b/core/media/system/js/fields/calendar-locales/zh-TW.js
new file mode 100644
index 00000000..dee824bd
--- /dev/null
+++ b/core/media/system/js/fields/calendar-locales/zh-TW.js
@@ -0,0 +1,19 @@
+window.JoomlaCalLocale = {
+	today : "今天",
+	weekend : [0, 6],
+	wk : "週",
+	time : "時間:",
+	days : ["日", "一", "二", "三", "四", "五", "六"],
+	shortDays : ["日", "一", "二", "三", "四", "五", "六"],
+	months : ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+	shortMonths : ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二"],
+	AM : "AM",
+	PM :  "PM",
+	am : "am",
+	pm : "pm",
+	dateType : "gregorian",
+	minYear : 1900,
+	maxYear : 2100,
+	exit: "關閉",
+	save: "清除"
+};
diff --git a/core/media/system/js/fields/calendar.js b/core/media/system/js/fields/calendar.js
new file mode 100644
index 00000000..8fead10b
--- /dev/null
+++ b/core/media/system/js/fields/calendar.js
@@ -0,0 +1,1247 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+!(function(window, document){
+	'use strict';
+
+	/** Method to convert numbers to local symbols. */
+	Date.convertNumbers = function(str) {
+		var str = str.toString();
+
+		if (Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers) === '[object Array]') {
+			for (var i = 0; i < JoomlaCalLocale.localLangNumbers.length; i++) {
+				str = str.replace(new RegExp(i, 'g'), JoomlaCalLocale.localLangNumbers[i]);
+			}
+		}
+		return str;
+	};
+
+	/** Translates to english numbers a string. */
+	Date.toEnglish = function(str) {
+		str = this.toString();
+		var nums = [0,1,2,3,4,5,6,7,8,9];
+		for (var i = 0; i < 10; i++) {
+			str = str.replace(new RegExp(nums[i], 'g'), i);
+		}
+		return str;
+	};
+
+	var JoomlaCalendar = function (element) {
+
+		// Initialize only if the element exists
+		if (!element) {
+			throw new Error("Calendar setup failed:\n  No valid element found, Please check your code");
+		}
+
+		if (typeof Date.parseFieldDate !== 'function') {
+			throw new Error("Calendar setup failed:\n  No valid date helper, Please check your code");
+		}
+
+		if (element._joomlaCalendar) {
+			throw new Error('JoomlaCalendar instance already exists for the element');
+		}
+
+		element._joomlaCalendar = this;
+
+		this.writable   = true;
+		this.hidden     = true;
+		this.params     = {};
+		this.element    = element;
+		this.inputField = element.getElementsByTagName('input')[0];
+		this.button     = element.getElementsByTagName('button')[0];
+
+		if (!this.inputField) {
+			throw new Error("Calendar setup failed:\n  No valid input found, Please check your code");
+		}
+
+		// Prepare the parameters
+		this.params = {
+			debug: false,
+			clicked: false,
+			element: {style: {display: "none"}},
+			writable: true
+		};
+
+		var self = this,
+			btn  = this.button,
+			instanceParams = {
+				inputField      : this.inputField,
+				dateType        : JoomlaCalLocale.dateType ? JoomlaCalLocale.dateType : 'gregorian',
+				direction       : (document.dir !== undefined) ? document.dir : document.getElementsByTagName("html")[0].getAttribute("dir"),
+				firstDayOfWeek  : btn.getAttribute("data-firstday") ? parseInt(btn.getAttribute("data-firstday")) : 0,
+				dateFormat      : "%Y-%m-%d %H:%M:%S",
+				weekend         : JoomlaCalLocale.weekend ? JoomlaCalLocale.weekend : [0,6],
+				minYear         : JoomlaCalLocale.minYear ? JoomlaCalLocale.minYear : 1900,
+				maxYear         : JoomlaCalLocale.maxYear ? JoomlaCalLocale.maxYear : 2100,
+				minYearTmp      : btn.getAttribute("data-min-year"),
+				maxYearTmp      : btn.getAttribute("data-max-year"),
+				weekendTmp      : btn.getAttribute("data-weekend"),
+				time24          : true,
+				showsOthers     : (parseInt(btn.getAttribute("data-show-others")) === 1) ? true : false,
+				showsTime       : true,
+				weekNumbers     : (parseInt(btn.getAttribute("data-week-numbers")) === 1) ? true : false,
+				showsTodayBtn   : true,
+				compressedHeader: (parseInt(btn.getAttribute("data-only-months-nav")) === 1) ? true : false,
+			};
+
+		// Keep B/C
+		if (btn.getAttribute("data-dayformat")) {
+			instanceParams.dateFormat = btn.getAttribute("data-dayformat") ? btn.getAttribute("data-dayformat") : "%Y-%m-%d %H:%M:%S";
+		}
+
+		if (btn.getAttribute("data-time-24")) {
+			instanceParams.time24 = parseInt(btn.getAttribute("data-time-24")) === 24 ? true : false;
+		}
+
+		if (btn.getAttribute("data-show-time")) {
+			instanceParams.showsTime = parseInt(btn.getAttribute("data-show-time")) === 1 ? true : false;
+		}
+
+		if (btn.getAttribute("data-today-btn")) {
+			instanceParams.showsTodayBtn = parseInt(btn.getAttribute("data-today-btn")) === 1 ? true : false;
+		}
+
+		// Merge the parameters
+		for (var param in instanceParams) {
+			this.params[param] = instanceParams[param];
+		}
+
+		// Evaluate the min year
+		if (isInt(self.params.minYearTmp)) {
+			self.params.minYear = getBoundary(parseInt(self.params.minYearTmp), self.params.dateType);
+		}
+		// Evaluate the max year
+		if (isInt(self.params.maxYearTmp)) {
+			self.params.maxYear = getBoundary(parseInt(self.params.maxYearTmp), self.params.dateType);
+		}
+		// Evaluate the weekend days
+		if (self.params.weekendTmp !== "undefined") {
+			self.params.weekend = self.params.weekendTmp.split(',').map(function(item) { return parseInt(item, 10); });
+		}
+
+		// Event handler need to define here, to be able access in current context
+		this._dayMouseDown = function(event) {
+			return self._handleDayMouseDown(event);
+		};
+		this._calKeyEvent = function(event) {
+			return self._handleCalKeyEvent(event);
+		};
+		this._documentClick = function(event) {
+			return self._handleDocumentClick(event);
+		};
+
+		// Set it up
+		this.checkInputs();
+
+		// For the fields with readonly tag calendar will not initiate fully
+		if (this.inputField.getAttribute('readonly')) {
+			return;
+		}
+
+		this._create();
+		this._bindEvents();
+	};
+
+	JoomlaCalendar.prototype.checkInputs = function () {
+		// Get the date from the input
+		var inputAltValueDate = Date.parseFieldDate(this.inputField.getAttribute('data-alt-value'), this.params.dateFormat, 'gregorian');
+
+		if (this.inputField.value !== '') {
+			this.date = inputAltValueDate;
+			this.inputField.value = inputAltValueDate.print(this.params.dateFormat, this.params.dateType, true);
+		} else {
+			this.date = new Date();
+		}
+	};
+
+	/** Removes the calendar object from the DOM tree and destroys it and then recreates it. */
+	JoomlaCalendar.prototype.recreate = function () {
+		var element = this.element, el = element.querySelector('.js-calendar');
+		if (el) {
+			element._joomlaCalendar = null;
+			el.parentNode.removeChild(el);
+			new JoomlaCalendar(element);
+		}
+	};
+
+	/** Time Control */
+	JoomlaCalendar.prototype.updateTime = function (hours, mins, secs) {
+		var self = this,
+			date = self.date;
+
+		var d = self.date.getLocalDate(self.params.dateType),
+			m = self.date.getLocalMonth(self.params.dateType),
+			y = self.date.getLocalFullYear(self.params.dateType),
+			ampm = this.inputField.parentNode.parentNode.querySelectorAll('.time-ampm')[0];
+
+		if (!self.params.time24) {
+			if (/pm/i.test(ampm.value) && hours < 12) {
+				hours = parseInt(hours) + 12;
+			} else if (/am/i.test(ampm.value) && hours == 12) {
+				hours = 0;
+			}
+		}
+
+		date.setHours(hours);
+		date.setMinutes(parseInt(mins, 10));
+		date.setSeconds(date.getSeconds());
+		date.setLocalFullYear(self.params.dateType, y);
+		date.setLocalMonth(self.params.dateType, m);
+		date.setLocalDate(self.params.dateType, d);
+		self.dateClicked = false;
+
+		this.callHandler();
+	};
+
+	/** Method to set the date to the given date object */
+	JoomlaCalendar.prototype.setDate = function (date) {
+		if (!date.equalsTo(this.date)) {
+			this.date = date;
+			this.processCalendar(this.params.firstDayOfWeek, date);
+		}
+	};
+
+	/** Method to set the current date by a number, step */
+	JoomlaCalendar.prototype.moveCursorBy = function (step) {
+		var date = new Date(this.date);
+		date.setDate(date.getDate() - step);
+		this.setDate(date);
+	};
+
+	/** Reset select element */
+	JoomlaCalendar.prototype.resetSelected = function (element) {
+		var options = element.options;
+		var i = options.length;
+		while (i--) {
+			var current = options[i];
+			if (current.selected) {
+				current.selected = false;
+			}
+		}
+	};
+
+	/** Method to set the value for the input field */
+	JoomlaCalendar.prototype.callHandler = function () {
+		/** Output the date **/
+		this.inputField.setAttribute('data-alt-value', this.date.print(this.params.dateFormat, 'gregorian', false));
+
+		if (this.inputField.getAttribute('data-alt-value') && this.inputField.getAttribute('data-alt-value') !== '0000-00-00 00:00:00') {
+			this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true);
+			if (this.params.dateType !== 'gregorian') {
+				this.inputField.setAttribute('data-local-value', this.date.print(this.params.dateFormat, this.params.dateType, true));
+			}
+		}
+		this.inputField.value = this.date.print(this.params.dateFormat, this.params.dateType, true);
+
+		if (typeof this.inputField.onchange == "function") {
+			this.inputField.onchange();
+		}
+
+		if (this.dateClicked && typeof this.params.onUpdate === "function") {
+			this.params.onUpdate(this);
+		}
+
+		if (this.dateClicked) {
+			this.close();
+		} else {
+			this.processCalendar();
+		}
+	};
+
+	/** Method to close/hide the calendar */
+	JoomlaCalendar.prototype.close = function () {
+		this.hide();
+	};
+
+	/** Method to show the calendar. */
+	JoomlaCalendar.prototype.show = function () {
+		/** This is needed for IE8 */
+		if (navigator.appName.indexOf("Internet Explorer")!==-1) {
+			var badBrowser = (
+				navigator.appVersion.indexOf("MSIE 9")===-1 &&
+				navigator.appVersion.indexOf("MSIE 1")===-1
+			);
+
+			if (badBrowser) {
+				if (window.jQuery && jQuery().chosen) {
+					var selItems = this.element.getElementsByTagName('select');
+					for (var i = 0; i < selItems.length; i++) {
+						jQuery(selItems[i]).chosen('destroy');
+					}
+				}
+			}
+		}
+
+		this.checkInputs();
+		this.inputField.focus();
+		this.dropdownElement.style.display = "block";
+		this.hidden = false;
+
+		document.addEventListener("keydown", this._calKeyEvent, true);
+		document.addEventListener("keypress", this._calKeyEvent, true);
+		document.addEventListener("mousedown", this._documentClick, true);
+
+		/** Move the calendar to top position if it doesn't fit below. */
+		var containerTmp = this.element.querySelector('.js-calendar');
+
+		if ((window.innerHeight + window.scrollY) < containerTmp.getBoundingClientRect().bottom + 20) {
+			containerTmp.style.marginTop = - (containerTmp.getBoundingClientRect().height + this.inputField.getBoundingClientRect().height) + "px";
+		}
+
+		this.processCalendar();
+	};
+
+	/** Method to hide the calendar. */
+	JoomlaCalendar.prototype.hide = function () {
+		document.removeEventListener("keydown", this._calKeyEvent, true);
+		document.removeEventListener("keypress", this._calKeyEvent, true);
+		document.removeEventListener("mousedown", this._documentClick, true);
+
+		this.dropdownElement.style.display = "none";
+		this.hidden = true;
+	};
+
+	/** Method to catch clicks outside of the calendar (used as close call) */
+	JoomlaCalendar.prototype._handleDocumentClick = function (ev) {
+		var el = ev.target;
+
+		if (el !== null && !el.classList.contains('time')) {
+			for (; el !== null && el !== this.element; el = el.parentNode);
+		}
+
+		if (el === null) {
+			document.activeElement.blur();
+			this.hide();
+			return stopCalEvent(ev);
+		}
+	};
+
+	/** Method to handle mouse click events (menus, buttons) **/
+	JoomlaCalendar.prototype._handleDayMouseDown = function (ev) {
+		var self = this,
+			el = ev.currentTarget,
+			target = ev.target || ev.srcElement;
+
+		if (target && target.hasAttribute('data-action')) {
+			return;
+		}
+
+		if (el.nodeName !== 'TD') {                         // A bootstrap inner button was pressed?
+			var testel = el.getParent('TD');
+			if (testel.nodeName === 'TD') {                 // Yes so use that element's td
+				el = testel;
+			} else {                                        // No - try to find the table this way
+				el = el.getParent('TD');
+				if (el.classList.contains('js-calendar')) {
+					el = el.getElementsByTagName('table')[0];
+				}
+			}
+		} else {                                            // Check that doesn't have a button and is not a day td
+			if (!(target.classList.contains('js-btn')) && !el.classList.contains('day') && !el.classList.contains('title')) {
+				return;
+			}
+		}
+
+		if (!el || el.disabled) {
+			return false;
+		}
+
+		if (typeof el.navtype === "undefined" || el.navtype !== 300) {
+			if (el.navtype === 50) { el._current = el.innerHTML; }
+
+			if (target === el || target.parentNode === el) { self.cellClick(el, ev); }
+
+			var mon = null;
+			if (typeof el.month !== "undefined") {
+				mon = el;
+			}
+			if (typeof el.parentNode.month !== "undefined") {
+				mon = el.parentNode;
+			}
+			var date = null;
+			if (mon) {
+				date = new Date(self.date);
+				if (mon.month !== date.getLocalMonth(self.params.dateType)) {
+					date.setLocalMonth(self.params.dateType, mon.month);
+					self.setDate(date);
+					self.dateClicked = false;
+					this.callHandler();
+				}
+			} else {
+				var year = null;
+				if (typeof el.year !== "undefined") {
+					year = target;
+				}
+				if (typeof el.parentNode.year !== "undefined") {
+					year = target.parentNode;
+				}
+				if (year) {
+					date = new Date(self.date);
+					if (year.year !== date.getLocalFullYear(self.params.dateType)) {
+						date.setFullYear(self.params.dateType, year.year);
+						self.setDate(date);
+						self.dateClicked = false;
+						this.callHandler();
+					}
+				}
+			}
+		}
+
+		return stopCalEvent(ev);
+	};
+
+	/** Method to handle mouse click events (dates) **/
+	JoomlaCalendar.prototype.cellClick = function (el, ev) {
+		var self = this,
+			closing = false,
+			newdate = false,
+			date = null;
+
+		if (typeof el.navtype === "undefined") {
+			if (self.currentDateEl) {
+				el.classList.add("selected");
+				self.currentDateEl = el.caldate;
+				closing = (self.currentDateEl === el.caldate);
+				if (!closing) {
+					self.currentDateEl = el.caldate;
+				}
+			}
+			self.date.setLocalDateOnly('gregorian', el.caldate);
+			var other_month = !(self.dateClicked = !el.otherMonth);
+			if (self.currentDateEl) { newdate = !el.disabled; }
+			if (other_month) {
+				this.processCalendar();
+			}
+		} else {
+			date = new Date(self.date);
+			self.dateClicked = false;
+			var year = date.getOtherFullYear(self.params.dateType), mon = date.getLocalMonth(self.params.dateType);
+			switch (el.navtype) {
+				case 400:
+					break;
+				case -2:                                                                             // Prev year
+					if (!self.params.compressedHeader) {
+						if (year > self.params.minYear) {
+							date.setOtherFullYear(self.params.dateType, year - 1);
+						}
+					}
+					break;
+				case -1:                                                                             // Prev month
+					var day = date.getLocalDate(self.params.dateType);
+					if (mon > 0) {
+						var max = date.getLocalMonthDays(self.params.dateType, mon - 1);
+						if (day > max) {
+							date.setLocalDate(self.params.dateType, max);
+						}
+						date.setLocalMonth(self.params.dateType, mon - 1);
+					} else if (year-- > self.params.minYear) {
+						date.setOtherFullYear(self.params.dateType, year);
+						var max = date.getLocalMonthDays(self.params.dateType, 11);
+						if (day > max) {
+							date.setLocalDate(self.params.dateType, max);
+						}
+						date.setLocalMonth(self.params.dateType, 11);
+					}
+					break;
+				case 1:                                                                             // Next month
+					var day = date.getLocalDate(self.params.dateType);
+					if (mon < 11) {
+						var max = date.getLocalMonthDays(self.params.dateType, mon + 1);
+						if (day > max) {
+							date.setLocalDate(self.params.dateType, max);
+						}
+						date.setLocalMonth(self.params.dateType, mon + 1);
+					} else if (year < self.params.maxYear) {
+						date.setOtherFullYear(self.params.dateType, year + 1);
+						var max = date.getLocalMonthDays(self.params.dateType, 0);
+						if (day > max) {
+							date.setLocalDate(self.params.dateType, max);
+						}
+						date.setLocalMonth(self.params.dateType, 0);
+					}
+					break;
+				case 2:                                                                             // Next year
+					if (!self.params.compressedHeader)
+						if (year < self.params.maxYear) {
+							date.setOtherFullYear(self.params.dateType, year + 1);
+						}
+					break;
+				case 0:                                                                             // Today
+					break;
+			}
+
+			if (!date.equalsTo(self.date)) {
+				this.setDate(date);
+				newdate = true;
+			} else if (el.navtype === 0) {
+				newdate = closing = true;
+			}
+		}
+
+		if (newdate) {
+			if (self.params.showsTime) {
+				this.dateClicked = false;
+			}
+			ev && this.callHandler();
+		}
+
+		el.classList.remove("hilite");
+
+		if (closing && !self.params.showsTime) {
+			self.dateClicked = false;
+			ev && this.close();
+		}
+	};
+
+	/** Method to handle keyboard click events **/
+	JoomlaCalendar.prototype._handleCalKeyEvent = function (ev) {
+		var self = this,
+			K = ev.keyCode;
+
+		// Get value from input
+		if (ev.target === this.inputField && (K === 13 || K === 9)) {
+			this.close();
+		}
+
+		if (self.params.direction === 'rtl') {
+			if (K === 37) {
+				K = 39;
+			} else if (K === 39) {
+				K = 37;
+			}
+		}
+
+		if (K === 32) {                                // KEY Shift + space (now)
+			if (ev.shiftKey) {
+				ev.preventDefault();
+				this.cellClick(self._nav_now, ev);
+				self.close();
+			}
+		}
+		if (K === 27) {                                // KEY esc (close);
+			this.close();
+		}
+		if (K === 38) {                                // KEY up (previous week)
+			this.moveCursorBy(7);
+		}
+		if (K === 40) {                                // KEY down (next week)
+			this.moveCursorBy( -7);
+		}
+		if (K === 37) {                                // KEY left (previous day)
+			this.moveCursorBy(1);
+		}
+		if (K === 39) {                                // KEY right (next day)
+			this.moveCursorBy( -1);
+		}
+		if (ev.target === this.inputField && !(K>48 || K<57 || K===186 || K===189 || K===190 || K===32)) {
+			return stopCalEvent(ev);
+		}
+	};
+
+	/** Method to create the html structure of the calendar */
+	JoomlaCalendar.prototype._create = function () {
+		var self   = this,
+			parent = this.element,
+			table  = createElement("table"),
+			div    = createElement("div");
+
+		this.table = table;
+		table.className = 'table';
+		table.cellSpacing = 0;
+		table.cellPadding = 0;
+		table.style.marginBottom = 0;
+
+		this.dropdownElement = div;
+		parent.appendChild(div);
+
+		if (this.params.direction) {
+			div.style.direction = this.params.direction;
+		}
+
+		div.className = 'js-calendar';
+		div.style.position = "absolute";
+		div.style.boxShadow = "0px 0px 70px 0px rgba(0,0,0,0.67)";
+		div.style.minWidth = this.inputField.width;
+		div.style.padding = '0';
+		div.style.display = "none";
+		div.style.left = "auto";
+		div.style.top = "auto";
+		div.style.zIndex = 1060;
+		div.style.borderRadius = "20px";
+
+		this.wrapper = createElement('div');
+		this.wrapper.className = 'calendar-container';
+		div.appendChild(this.wrapper);
+		this.wrapper.appendChild(table);
+
+		var thead = createElement("thead", table);
+		thead.className = 'calendar-header';
+
+		var cell = null,
+			row  = null,
+			cal  = this,
+			hh   = function (text, cs, navtype, node, styles, classes, attributes) {
+				node = node ? node : "td";
+				styles = styles ? styles : {};
+				cell = createElement(node, row);
+				if (cs) {
+					classes = classes ? 'class="' + classes + '"' : '';
+				cell.colSpan = cs;
+				}
+
+				for (var key in styles) {
+					cell.style[key] = styles[key];
+				}
+				for (var key in attributes) {
+					cell.setAttribute(key, attributes[key]);
+				}
+				if (navtype !== 0 && Math.abs(navtype) <= 2) {
+					cell.className += " nav";
+				}
+
+				if (cs) {
+					cell.addEventListener("mousedown", self._dayMouseDown, true);
+				}
+
+				cell.calendar = cal;
+				cell.navtype = navtype;
+				if (navtype !== 0 && Math.abs(navtype) <= 2) {
+					cell.innerHTML = "<a " + classes + " style='display:inline;padding:2px 6px;cursor:pointer;text-decoration:none;' unselectable='on'>" + text + "</a>";
+				} else {
+					cell.innerHTML = cs ? "<div unselectable='on'" + classes + ">" + text + "</div>" : text;
+					if (!cs && classes) {
+						cell.className = classes;
+					}
+				}
+				return cell;
+			};
+
+		if (this.params.compressedHeader === false) {                                                        // Head - year
+			row = createElement("tr", thead);
+			row.className = "calendar-head-row";
+			this._nav_py = hh("&lsaquo;", 1, -2, '', {"text-align": "center", "font-size": "18px", "line-height": "18px"}, 'js-btn btn-prev-year');                   // Previous year button
+			this.title = hh('<div style="text-align:center;font-size:18px"><span></span></div>', this.params.weekNumbers ? 6 : 5, 300);
+			this.title.className = "title";
+			this._nav_ny = hh(" &rsaquo;", 1, 2, '', {"text-align": "center", "font-size": "18px", "line-height": "18px"}, 'js-btn btn-next-year');                   // Next year button
+		}
+
+		row = createElement("tr", thead);                                                                   // Head - month
+		row.className = "calendar-head-row";
+		this._nav_pm = hh("&lsaquo;", 1, -1, '', {"text-align": "center", "font-size": "2em", "line-height": "1em"}, 'js-btn btn-prev-month');                       // Previous month button
+		this._nav_month = hh('<div style="text-align:center;font-size:1.2em"><span></span></div>', this.params.weekNumbers ? 6 : 5, 888, 'td', {'textAlign': 'center'});
+		this._nav_month.className = "title";
+		this._nav_nm = hh(" &rsaquo;", 1, 1, '', {"text-align": "center", "font-size": "2em", "line-height": "1em"}, 'js-btn btn-next-month');                       // Next month button
+
+		row = createElement("tr", thead);                                                                   // day names
+		row.className = self.params.weekNumbers ? "daynames wk" : "daynames";
+		if (this.params.weekNumbers) {
+			cell = createElement("td", row);
+			cell.className = "day-name wn";
+			cell.innerHTML = JoomlaCalLocale.wk;
+		}
+		for (var i = 7; i > 0; --i) {
+			cell = createElement("td", row);
+			if (!i) {
+				cell.calendar = self;
+			}
+		}
+		this.firstdayname = (this.params.weekNumbers) ? row.firstChild.nextSibling : row.firstChild;
+
+		var fdow = this.params.firstDayOfWeek,
+			cell = this.firstdayname,
+			weekend = JoomlaCalLocale.weekend;
+
+		for (var i = 0; i < 7; ++i) {
+			var realday = (i + fdow) % 7;
+			cell.classList.add("day-name");
+			this.params.weekNumbers ? cell.classList.add('day-name-week') : '';
+
+			if (i) {
+				cell.calendar = self;
+				cell.fdow = realday;
+			}
+			if (weekend.indexOf(weekend) !== -1) {
+				cell.classList.add("weekend");
+			}
+
+			cell.innerHTML = JoomlaCalLocale.shortDays[(i + fdow) % 7];
+			cell = cell.nextSibling;
+		}
+
+		var tbody = createElement("tbody", table);
+		this.tbody = tbody;
+		for (i = 6; i > 0; --i) {
+			row = createElement("tr", tbody);
+			if (this.params.weekNumbers) {
+				cell = createElement("td", row);
+			}
+
+			for (var j = 7; j > 0; --j) {
+				cell = createElement("td", row);
+				cell.calendar = this;
+				cell.addEventListener("mousedown", this._dayMouseDown, true);
+			}
+		}
+
+		if (this.params.showsTime) {
+			row = createElement("tr", tbody);
+			row.className = "time";
+
+			cell = createElement("td", row);
+			cell.className = "time time-title";
+			cell.colSpan = 1;
+			cell.style.verticalAlign = 'middle';
+			cell.innerHTML = " ";
+
+			var cell1 = createElement("td", row);
+			cell1.className = "time hours-select";
+			cell1.colSpan = 2;
+
+			var cell2 = createElement("td", row);
+			cell2.className = "time minutes-select";
+			cell2.colSpan = 2;
+
+			(function () {
+				function makeTimePart(className, selected, range_start, range_end, cellTml) {
+					var part = createElement("select", cellTml), num;
+					part.calendar  = self;
+					part.className =  className;
+					part.setAttribute('data-chosen', true); // avoid Chosen, hack
+					part.style.width = '100%';
+					part.navtype = 50;
+					part._range = [];
+					for (var i = range_start; i <= range_end; ++i) {
+						var txt, selAttr = '';
+						if (i === selected) {
+							selAttr = true;
+						}
+						if (i < 10 && range_end >= 10) {
+							num = '0' + i;
+							txt = Date.convertNumbers('0') + Date.convertNumbers(i);
+						} else {
+							num = '' + i;
+							txt = '' + Date.convertNumbers(i);
+						}
+						part.options.add(new Option(txt, num, selAttr, selAttr));
+					}
+					return part;
+				}
+				var hrs  = self.date.getHours(),
+					mins = self.date.getMinutes(),
+					t12  = !self.params.time24,
+					pm   = (self.date.getHours() > 12);
+
+				if (t12 && pm) {
+					hrs -= 12;
+				}
+
+				var H = makeTimePart("time time-hours", hrs, t12 ? 1 : 0, t12 ? 12 : 23, cell1),
+					M = makeTimePart("time time-minutes", mins, 0, 59, cell2),
+					AP = null;
+
+				cell = createElement("td", row);
+				cell.className = "time ampm-select";
+				cell.colSpan = self.params.weekNumbers ? 1 : 2;
+
+				if (t12) {
+					var selAttr = true,
+						altDate = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, 'gregorian');
+					pm = (altDate.getHours() >= 12);
+
+					var part = createElement("select", cell);
+					part.className = "time-ampm";
+					part.style.width = '100%';
+					part.options.add(new Option(JoomlaCalLocale.PM, "pm", pm ? selAttr : '', pm ? selAttr : ''));
+					part.options.add(new Option(JoomlaCalLocale.AM, "am", pm ? '' : selAttr, pm ? '' : selAttr));
+					AP = part;
+
+					// Event listener for the am/pm select
+					AP.addEventListener("change", function (event) {
+						self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
+							event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
+					}, false);
+				} else {
+					cell.innerHTML = "&#160;";
+					cell.colSpan = self.params.weekNumbers ? 3 : 2;
+				}
+
+				H.addEventListener("change", function (event) {
+					self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+						event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
+						event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
+				}, false);
+				M.addEventListener("change", function (event) {
+					self.updateTime(event.target.parentNode.parentNode.childNodes[1].childNodes[0].value,
+						event.target.parentNode.parentNode.childNodes[2].childNodes[0].value,
+						event.target.parentNode.parentNode.childNodes[3].childNodes[0].value);
+				}, false);
+			})();
+		}
+
+		row = createElement("div", this.wrapper);
+		row.className = "buttons-wrapper btn-group";
+
+		this._nav_clear = hh(JoomlaCalLocale.clear, '', 100, 'button', '', 'js-btn btn btn-clear', {"type": "button", "data-action": "clear"});
+
+			var cleara = row.querySelector('[data-action="clear"]');
+			cleara.addEventListener("click", function (e) {
+				e.preventDefault();
+				var days = self.table.querySelectorAll('td');
+				for (var i = 0; i < days.length; i++) {
+					if (days[i].classList.contains('selected')) {
+						days[i].classList.remove('selected');
+						break;
+					}
+				}
+				self.inputField.setAttribute('data-alt-value', "0000-00-00 00:00:00");
+				self.inputField.setAttribute('value', '');
+				self.inputField.value = '';
+			});
+
+		if (this.params.showsTodayBtn) {
+			this._nav_now = hh(JoomlaCalLocale.today, '', 0, 'button', '', 'js-btn btn btn-today', {"type": "button", "data-action": "today"});
+
+			var todaya = this.wrapper.querySelector('[data-action="today"]');
+			todaya.addEventListener('click', function (e) {
+				e.preventDefault();
+				self.date.setLocalDateOnly('gregorian', new Date());                                  // TODAY
+				self.dateClicked = true;
+				self.callHandler();
+				self.close();
+			});
+		}
+
+		this._nav_exit = hh(JoomlaCalLocale.exit, '', 999, 'button', '', 'js-btn btn btn-exit', {"type": "button", "data-action": "exit"});
+		var exita = this.wrapper.querySelector('[data-action="exit"]');
+		exita.addEventListener('click', function (e) {
+			e.preventDefault();
+			if (!self.dateClicked) {
+				if (self.inputField.value) {
+					if (self.params.dateType !== 'gregorian') {
+						self.inputField.setAttribute('data-local-value', self.inputField.value);
+					}
+					if (typeof self.dateClicked === 'undefined') {
+						// value needs to be validated
+						self.inputField.setAttribute('data-alt-value', Date.parseFieldDate(self.inputField.value, self.params.dateFormat, self.params.dateType)
+							.print(self.params.dateFormat, 'gregorian', false));
+					} else {
+						self.inputField.setAttribute('data-alt-value', self.date.print(self.params.dateFormat, 'gregorian', false));
+					}
+				} else {
+					self.inputField.setAttribute('data-alt-value', '0000-00-00 00:00:00');
+				}
+				self.date = Date.parseFieldDate(self.inputField.getAttribute('data-alt-value'), self.params.dateFormat, self.params.dateType);
+			}
+			self.close();
+		});
+
+		this.processCalendar();
+	};
+
+	/** Method to append numbers to the calendar table */
+	JoomlaCalendar.prototype.processCalendar = function () {
+		this.table.style.visibility = "hidden";
+
+		var firstDayOfWeek = this.params.firstDayOfWeek,
+			date  = this.date,
+			today = new Date(),
+			TY    = today.getLocalFullYear(this.params.dateType),
+			TM    = today.getLocalMonth(this.params.dateType),
+			TD    = today.getLocalDate(this.params.dateType),
+			year  = date.getOtherFullYear(this.params.dateType),
+			hrs   = date.getHours(),
+			mins  = date.getMinutes(),
+			secs  = date.getSeconds(),
+			t12   = !this.params.time24;
+
+		if (year < this.params.minYear) {                                                                   // Check min,max year
+			year = this.params.minYear;
+			date.getOtherFullYear(this.params.dateType, year);
+		} else if (year > this.params.maxYear) {
+			year = this.params.maxYear;
+			date.getOtherFullYear(this.params.dateType, year);
+		}
+
+		this.params.firstDayOfWeek = firstDayOfWeek;
+		this.date = new Date(date);
+
+		var month = date.getLocalMonth(this.params.dateType);
+		var mday  = date.getLocalDate(this.params.dateType);
+
+		// Compute the first day that would actually be displayed in the calendar, even if it's from the previous month.
+		date.setLocalDate(this.params.dateType, 1);
+		var day1 = (date.getLocalDay(this.params.dateType) - this.params.firstDayOfWeek) % 7;
+
+		if (day1 < 0) {
+			day1 += 7;
+		}
+
+		date.setLocalDate(this.params.dateType, - day1);
+		date.setLocalDate(this.params.dateType, date.getLocalDate(this.params.dateType) + 1);
+
+		var row = this.tbody.firstChild,
+			ar_days = this.ar_days = new Array(),
+			weekend = JoomlaCalLocale.weekend,
+			monthDays = parseInt(date.getLocalWeekDays(this.params.dateType));
+
+		/** Fill the table **/
+		for (var i = 0; i < monthDays; ++i, row = row.nextSibling) {
+			var cell = row.firstChild;
+			if (this.params.weekNumbers) {
+				cell.className = "day wn";
+				cell.innerHTML = date.getLocalWeekNumber(this.params.dateType); //date.convertNumbers();
+				cell = cell.nextSibling;
+			}
+
+			row.className = this.params.weekNumbers ? "daysrow wk" : "daysrow";
+			var hasdays = false, iday,
+				dpos = ar_days[i] = [],
+				totalDays = monthDays + 1;
+
+			for (var j = 0; j < totalDays; ++j, cell = cell.nextSibling, date.setLocalDate(this.params.dateType, iday + 1)) {
+				cell.className = "day";
+				cell.style['textAlign'] = 'center';
+				iday = date.getLocalDate(this.params.dateType);
+				var wday = date.getLocalDay(this.params.dateType);
+				cell.pos = i << 4 | j;
+				dpos[j] = cell;
+				var current_month = (date.getLocalMonth(this.params.dateType) === month);
+				if (!current_month) {
+					if (this.params.showsOthers) {
+						cell.className += " disabled othermonth ";
+						cell.otherMonth = true;
+					} else {
+						cell.className += " emptycell";
+						cell.innerHTML = "&#160;";
+						cell.disabled = true;
+						continue;
+					}
+				} else {
+					cell.otherMonth = false;
+					hasdays = true;
+					cell.style.cursor = "pointer";
+				}
+				cell.disabled = false;
+				cell.innerHTML = this.params.debug ? iday : Date.convertNumbers(iday);          // translated day number for each cell
+				if (!cell.disabled) {
+					cell.caldate = new Date(date);
+					if (current_month && iday === mday) {
+						cell.className += " selected";
+						this.currentDateEl = cell;
+					}
+					if (date.getLocalFullYear(this.params.dateType) === TY && date.getLocalMonth(this.params.dateType) === TM && iday === TD) {
+						cell.className += " today";
+					}
+					if (weekend.indexOf(wday) !== -1)
+						cell.className += " weekend";
+				}
+			}
+			if (!(hasdays || this.params.showsOthers)) {
+				row.style.display = 'none';
+				row.className = "emptyrow";
+			} else {
+				row.style.display = '';
+			}
+		}
+
+		/* Set the time */
+		if (this.params.showsTime) {
+			if (hrs > 12 && t12) {
+				hrs -= 12;
+			}
+
+			hrs = (hrs < 10) ? "0" + hrs : hrs;
+			mins = (mins < 10) ? "0" + mins : mins;
+
+			var hoursEl = this.table.querySelector('.time-hours'),
+				minsEl = this.table.querySelector('.time-minutes');
+
+			/* remove the selected class  for the hours*/
+			this.resetSelected(hoursEl);
+			if (!this.params.time24) 
+			{ 
+				hoursEl.value = (hrs == "00") ? "12" : hrs; 
+			} 
+			else 
+			{ 
+				hoursEl.value = hrs; 
+			}
+
+			/* remove the selected class  for the minutes*/
+			this.resetSelected(minsEl);
+			minsEl.value = mins;
+
+			if (!this.params.time24)
+			{
+				var dateAlt = new Date(this.inputField.getAttribute('data-alt-value')),
+					ampmEl = this.table.querySelector('.time-ampm'),
+					hrsAlt = dateAlt.getHours();
+
+				if (hrsAlt > 12) {
+					/* remove the selected class  for the am-pm*/
+					this.resetSelected(ampmEl);
+					ampmEl.value = 'pm';
+				}
+			}
+		}
+
+		if (!this.params.compressedHeader) {
+			this._nav_month.getElementsByTagName('span')[0].innerHTML = this.params.debug ? month + ' ' + JoomlaCalLocale.months[month] : JoomlaCalLocale.months[month];
+			this.title.getElementsByTagName('span')[0].innerHTML = this.params.debug ? year + ' ' +  Date.convertNumbers(year.toString()) : Date.convertNumbers(year.toString());
+		} else {
+			var tmpYear = Date.convertNumbers(year.toString());
+			this._nav_month.getElementsByTagName('span')[0].innerHTML = !this.params.monthBefore  ? JoomlaCalLocale.months[month] + ' - ' + tmpYear : tmpYear + ' - ' + JoomlaCalLocale.months[month] ;
+		}
+		this.table.style.visibility = "visible";
+	};
+
+	/** Method to listen for the click event on the input button. **/
+	JoomlaCalendar.prototype._bindEvents = function () {
+		var self = this;
+		this.inputField.addEventListener('blur', function(event) {
+			var calObj = JoomlaCalendar.getCalObject(this)._joomlaCalendar;
+
+			// If calendar is open we will handle the event elsewhere
+			if (calObj.dropdownElement.style.display === 'block') {
+				event.preventDefault();
+				return;
+			}
+
+			if (calObj) {
+				if (calObj.inputField.value) {
+					if (typeof calObj.params.dateClicked === 'undefined') {
+						calObj.inputField.setAttribute('data-local-value', calObj.inputField.value);
+
+						if (calObj.params.dateType !== 'gregorian') {
+							// We need to transform the date for the data-alt-value
+							var ndate, date = Date.parseFieldDate(calObj.inputField.value, calObj.params.dateFormat, calObj.params.dateType);
+							ndate = Date.localCalToGregorian(date.getFullYear(), date.getMonth(), date.getDate());
+							date.setFullYear(ndate[0]);
+							date.setMonth(ndate[1]);
+							date.setDate(ndate[2]);
+							calObj.inputField.setAttribute('data-alt-value', date.print(calObj.params.dateFormat, 'gregorian', false));
+						} else {
+							calObj.inputField.setAttribute('data-alt-value', Date.parseFieldDate(calObj.inputField.value, calObj.params.dateFormat, calObj.params.dateType)
+								.print(calObj.params.dateFormat, 'gregorian', false));
+						}
+					} else {
+						calObj.inputField.setAttribute('data-alt-value', calObj.date.print(calObj.params.dateFormat, 'gregorian', false));
+					}
+				} else {
+					calObj.inputField.setAttribute('data-alt-value', '0000-00-00 00:00:00');
+				}
+				calObj.date = Date.parseFieldDate(calObj.inputField.getAttribute('data-alt-value'), calObj.params.dateFormat, calObj.params.dateType);
+			}
+
+			self.close();
+		}, true);
+		this.button.addEventListener('click', function() {
+			self.show();
+		}, false);
+	};
+
+	/** Helpers **/
+	var stopCalEvent = function (ev) { ev || (ev = window.event);  ev.preventDefault(); ev.stopPropagation(); return false; };
+	var createElement = function (type, parent) { var el = null; el = document.createElement(type); if (typeof parent !== "undefined") { parent.appendChild(el); } return el; };
+	var isInt = function (input) { return !isNaN(input) && (function(x) { return (x | 0) === x; })(parseFloat(input)) };
+	var getBoundary = function (input, type) { var date = new Date(); var y = date.getLocalFullYear(type); return y + input; };
+	/**
+	 * IE8 polyfill for indexOf()
+	 */
+	if (!Array.prototype.indexOf) {
+		Array.prototype.indexOf = function(elt) {
+			var len = this.length >>> 0,
+				from = Number(arguments[1]) || 0;
+
+			from = (from < 0) ? Math.ceil(from) : Math.floor(from);
+
+			if (from < 0) {
+				from += len;
+			}
+
+			for (; from < len; from++) {
+				if (from in this && this[from] === elt) {
+					return from;
+				}
+			}
+			return -1;
+		};
+	}
+
+	/** Method to get the active calendar element through any descendant element. */
+	JoomlaCalendar.getCalObject = function(element) {
+		if (!element) {
+			return false;
+		}
+		while (element.parentNode) {
+			element = element.parentNode;
+			if (element.classList.contains('field-calendar')) {
+				return element;
+			}
+		}
+		return false;
+	};
+
+	/** Method to change input values with the data-alt-value values. **/
+	JoomlaCalendar.prototype.setAltValue = function() {
+		var input = this.inputField;
+		if (input.getAttribute('disabled')) return;
+		input.value = input.getAttribute('data-alt-value') ? input.getAttribute('data-alt-value') : '';
+	};
+
+	/** Method to change the inputs before submit. **/
+	JoomlaCalendar.onSubmit = function() {
+		Joomla = window.Joomla || {};
+		if (!Joomla.calendarProcessed) {
+			Joomla.calendarProcessed = true;
+			var elements = document.querySelectorAll(".field-calendar");
+
+			for (var i = 0; i < elements.length; i++) {
+				var element  = elements[i],
+				    instance = element._joomlaCalendar;
+
+				if (instance) {
+					instance.setAltValue();
+				}
+			}
+		}
+	};
+
+	/**
+	 * Init the Calendars on the page
+	 *
+	 * @param {Node}        element    The element node
+	 * @param {HTMLElement} container  The field container (optional)
+	 */
+	JoomlaCalendar.init = function (element, container) {
+
+		// Fall back for translation strings
+		window.JoomlaCalLocale           = window.JoomlaCalLocale ? JoomlaCalLocale : {};
+		JoomlaCalLocale.today            = JoomlaCalLocale.today ? JoomlaCalLocale.today : 'today';
+		JoomlaCalLocale.weekend          = JoomlaCalLocale.weekend ? JoomlaCalLocale.weekend : [0, 6];
+		JoomlaCalLocale.localLangNumbers = JoomlaCalLocale.localLangNumbers ? JoomlaCalLocale.localLangNumbers : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+		JoomlaCalLocale.wk               = JoomlaCalLocale.wk ? JoomlaCalLocale.wk : 'wk';
+		JoomlaCalLocale.AM               = JoomlaCalLocale.AM ? JoomlaCalLocale.AM : 'AM';
+		JoomlaCalLocale.PM               = JoomlaCalLocale.PM ? JoomlaCalLocale.PM : 'PM';
+		JoomlaCalLocale.am               = JoomlaCalLocale.am ? JoomlaCalLocale.am : 'am';
+		JoomlaCalLocale.pm               = JoomlaCalLocale.pm ? JoomlaCalLocale.pm : 'pm';
+		JoomlaCalLocale.dateType         = JoomlaCalLocale.dateType ? JoomlaCalLocale.dateType : 'gregorian';
+		JoomlaCalLocale.time             = JoomlaCalLocale.time ? JoomlaCalLocale.time : 'time';
+		JoomlaCalLocale.days             = JoomlaCalLocale.days ? JoomlaCalLocale.days : '["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]';
+		JoomlaCalLocale.shortDays        = JoomlaCalLocale.shortDays ? JoomlaCalLocale.shortDays : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
+		JoomlaCalLocale.months           = JoomlaCalLocale.months ? JoomlaCalLocale.months : ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+		JoomlaCalLocale.shortMonths      = JoomlaCalLocale.shortMonths ? JoomlaCalLocale.shortMonths : ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+		JoomlaCalLocale.minYear          = JoomlaCalLocale.minYear ? JoomlaCalLocale.minYear : 1900;
+		JoomlaCalLocale.maxYear          = JoomlaCalLocale.maxYear ? JoomlaCalLocale.maxYear : 2100;
+		JoomlaCalLocale.exit             = JoomlaCalLocale.exit ? JoomlaCalLocale.exit : 'Cancel';
+		JoomlaCalLocale.clear            = JoomlaCalLocale.clear ? JoomlaCalLocale.clear : 'Clear';
+
+		var instance = element._joomlaCalendar;
+		if (!instance) {
+			new JoomlaCalendar(element);
+		} else {
+			instance.recreate();
+		}
+
+		if (element && element.getElementsByTagName('input')[0] && element.getElementsByTagName('input')[0].form && !element.getElementsByTagName('input')[0].disabled) {
+			element.getElementsByTagName('input')[0].form.addEventListener('submit', JoomlaCalendar.onSubmit);
+		}
+	};
+
+	window.JoomlaCalendar = JoomlaCalendar;
+
+	/** Instantiate all the calendar fields when the document is ready */
+	document.addEventListener("DOMContentLoaded", function() {
+		var elements, i;
+
+		elements = document.querySelectorAll(".field-calendar");
+
+		for (i = 0; i < elements.length; i++) {
+			JoomlaCalendar.init(elements[i]);
+		}
+
+		window.jQuery && jQuery(document).on("subform-row-add", function (event, row) {
+			elements = row.querySelectorAll(".field-calendar");
+
+			for (i = 0; i < elements.length; i++) {
+				JoomlaCalendar.init(elements[i]);
+			}
+		});
+
+		/** B/C related code
+		 *  @deprecated 4.0
+		 */
+		window.Calendar = {};
+
+		/** B/C related code
+		 *  @deprecated 4.0
+		 */
+		Calendar.setup = function(obj) {
+
+			if (obj.inputField && document.getElementById(obj.inputField)) {
+				var element = document.getElementById(obj.inputField),
+					cal = element.parentNode.querySelectorAll('button')[0];
+
+				for (var property in obj) {
+					if (obj.hasOwnProperty(property)) {
+						switch (property) {
+							case 'ifFormat':
+								if (cal) cal.setAttribute('data-dayformat', obj.ifFormat);
+								break;
+
+							case 'firstDay':
+								if (cal) cal.setAttribute('data-firstday', parseInt(obj.firstDay));
+								break;
+
+							case 'weekNumbers':
+								if (cal) cal.setAttribute('data-week-numbers', (obj.weekNumbers === "true" || obj.weekNumbers === true) ? '1' : '0');
+								break;
+
+							case 'showOthers':
+								if (cal) cal.setAttribute('data-show-others', (obj.showOthers === "true" || obj.showOthers === true) ? '1' : '0');
+								break;
+
+							case 'showsTime':
+								if (cal) cal.setAttribute('data-show-time', (obj.showsTime === "true" || obj.showsTime === true) ? '1' : '0');
+								break;
+
+							case 'timeFormat':
+								if (cal) cal.setAttribute('data-time-24', parseInt(obj.timeFormat));
+								break;
+
+							case 'displayArea':
+							case 'inputField':
+							case 'button':
+							case 'eventName':
+							case 'daFormat':
+							case 'disableFunc':
+							case 'dateStatusFunc':
+							case 'dateTooltipFunc':
+							case 'dateText':
+							case 'align':
+							case 'range':
+							case 'flat':
+							case 'flatCallback':
+							case 'onSelect':
+							case 'onClose':
+							case 'onUpdate':
+							case 'date':
+							case 'electric':
+							case 'step':
+							case 'position':
+							case 'cache':
+							case 'multiple':
+								break;
+						}
+
+
+					}
+				}
+				JoomlaCalendar.init(element.parentNode.parentNode);
+			}
+			return null;
+		};
+	});
+})(window, document);
diff --git a/core/media/system/js/fields/calendar.min.js b/core/media/system/js/fields/calendar.min.js
new file mode 100644
index 00000000..5c8f71b0
--- /dev/null
+++ b/core/media/system/js/fields/calendar.min.js
@@ -0,0 +1 @@
+!function(e,a){"use strict";Date.convertNumbers=function(e){e=e.toString();if("[object Array]"===Object.prototype.toString.call(JoomlaCalLocale.localLangNumbers))for(var a=0;a<JoomlaCalLocale.localLangNumbers.length;a++)e=e.replace(new RegExp(a,"g"),JoomlaCalLocale.localLangNumbers[a]);return e},Date.toEnglish=function(e){e=this.toString();for(var a=[0,1,2,3,4,5,6,7,8,9],t=0;t<10;t++)e=e.replace(new RegExp(a[t],"g"),t);return e};var t=function(e){if(!e)throw new Error("Calendar setup failed:\n  No valid element found, Please check your code");if("function"!=typeof Date.parseFieldDate)throw new Error("Calendar setup failed:\n  No valid date helper, Please check your code");if(e._joomlaCalendar)throw new Error("JoomlaCalendar instance already exists for the element");if(e._joomlaCalendar=this,this.writable=!0,this.hidden=!0,this.params={},this.element=e,this.inputField=e.getElementsByTagName("input")[0],this.button=e.getElementsByTagName("button")[0],!this.inputField)throw new Error("Calendar setup failed:\n  No valid input found, Please check your code");this.params={debug:!1,clicked:!1,element:{style:{display:"none"}},writable:!0};var t=this,r=this.button,s={inputField:this.inputField,dateType:JoomlaCalLocale.dateType?JoomlaCalLocale.dateType:"gregorian",direction:void 0!==a.dir?a.dir:a.getElementsByTagName("html")[0].getAttribute("dir"),firstDayOfWeek:r.getAttribute("data-firstday")?parseInt(r.getAttribute("data-firstday")):0,dateFormat:"%Y-%m-%d %H:%M:%S",weekend:JoomlaCalLocale.weekend?JoomlaCalLocale.weekend:[0,6],minYear:JoomlaCalLocale.minYear?JoomlaCalLocale.minYear:1900,maxYear:JoomlaCalLocale.maxYear?JoomlaCalLocale.maxYear:2100,minYearTmp:r.getAttribute("data-min-year"),maxYearTmp:r.getAttribute("data-max-year"),weekendTmp:r.getAttribute("data-weekend"),time24:!0,showsOthers:1===parseInt(r.getAttribute("data-show-others")),showsTime:!0,weekNumbers:1===parseInt(r.getAttribute("data-week-numbers")),showsTodayBtn:!0,compressedHeader:1===parseInt(r.getAttribute("data-only-months-nav"))};for(var i in r.getAttribute("data-dayformat")&&(s.dateFormat=r.getAttribute("data-dayformat")?r.getAttribute("data-dayformat"):"%Y-%m-%d %H:%M:%S"),r.getAttribute("data-time-24")&&(s.time24=24===parseInt(r.getAttribute("data-time-24"))),r.getAttribute("data-show-time")&&(s.showsTime=1===parseInt(r.getAttribute("data-show-time"))),r.getAttribute("data-today-btn")&&(s.showsTodayBtn=1===parseInt(r.getAttribute("data-today-btn"))),s)this.params[i]=s[i];l(t.params.minYearTmp)&&(t.params.minYear=o(parseInt(t.params.minYearTmp),t.params.dateType)),l(t.params.maxYearTmp)&&(t.params.maxYear=o(parseInt(t.params.maxYearTmp),t.params.dateType)),"undefined"!==t.params.weekendTmp&&(t.params.weekend=t.params.weekendTmp.split(",").map(function(e){return parseInt(e,10)})),this._dayMouseDown=function(e){return t._handleDayMouseDown(e)},this._calKeyEvent=function(e){return t._handleCalKeyEvent(e)},this._documentClick=function(e){return t._handleDocumentClick(e)},this.checkInputs(),this.inputField.getAttribute("readonly")||(this._create(),this._bindEvents())};t.prototype.checkInputs=function(){var e=Date.parseFieldDate(this.inputField.getAttribute("data-alt-value"),this.params.dateFormat,"gregorian");""!==this.inputField.value?(this.date=e,this.inputField.value=e.print(this.params.dateFormat,this.params.dateType,!0)):this.date=new Date},t.prototype.recreate=function(){var e=this.element,a=e.querySelector(".js-calendar");a&&(e._joomlaCalendar=null,a.parentNode.removeChild(a),new t(e))},t.prototype.updateTime=function(e,a,t){var r=this,s=r.date,l=r.date.getLocalDate(r.params.dateType),o=r.date.getLocalMonth(r.params.dateType),i=r.date.getLocalFullYear(r.params.dateType),n=this.inputField.parentNode.parentNode.querySelectorAll(".time-ampm")[0];r.params.time24||(/pm/i.test(n.value)&&e<12?e=parseInt(e)+12:/am/i.test(n.value)&&12===e&&(e=0)),s.setHours(e),s.setMinutes(parseInt(a,10)),s.setSeconds(s.getSeconds()),s.setLocalFullYear(r.params.dateType,i),s.setLocalMonth(r.params.dateType,o),s.setLocalDate(r.params.dateType,l),r.dateClicked=!1,this.callHandler()},t.prototype.setDate=function(e){e.equalsTo(this.date)||(this.date=e,this.processCalendar(this.params.firstDayOfWeek,e))},t.prototype.moveCursorBy=function(e){var a=new Date(this.date);a.setDate(a.getDate()-e),this.setDate(a)},t.prototype.resetSelected=function(e){for(var a=e.options,t=a.length;t--;){var r=a[t];r.selected&&(r.selected=!1)}},t.prototype.callHandler=function(){this.inputField.setAttribute("data-alt-value",this.date.print(this.params.dateFormat,"gregorian",!1)),this.inputField.getAttribute("data-alt-value")&&"0000-00-00 00:00:00"!==this.inputField.getAttribute("data-alt-value")&&(this.inputField.value=this.date.print(this.params.dateFormat,this.params.dateType,!0),"gregorian"!==this.params.dateType&&this.inputField.setAttribute("data-local-value",this.date.print(this.params.dateFormat,this.params.dateType,!0))),this.inputField.value=this.date.print(this.params.dateFormat,this.params.dateType,!0),"function"==typeof this.inputField.onchange&&this.inputField.onchange(),this.dateClicked&&"function"==typeof this.params.onUpdate&&this.params.onUpdate(this),this.dateClicked?this.close():this.processCalendar()},t.prototype.close=function(){a.activeElement.blur(),this.hide()},t.prototype.show=function(){if(-1!==navigator.appName.indexOf("Internet Explorer")&&(-1===navigator.appVersion.indexOf("MSIE 9")&&-1===navigator.appVersion.indexOf("MSIE 1")&&e.jQuery&&jQuery().chosen))for(var t=this.element.getElementsByTagName("select"),r=0;r<t.length;r++)jQuery(t[r]).chosen("destroy");this.checkInputs(),this.inputField.focus(),this.dropdownElement.style.display="block",this.hidden=!1,a.addEventListener("keydown",this._calKeyEvent,!0),a.addEventListener("keypress",this._calKeyEvent,!0),a.addEventListener("mousedown",this._documentClick,!0);var s=this.element.querySelector(".js-calendar");e.innerHeight+e.scrollY<s.getBoundingClientRect().bottom+20&&(s.style.marginTop=-(s.getBoundingClientRect().height+this.inputField.getBoundingClientRect().height)+"px"),this.processCalendar()},t.prototype.hide=function(){a.removeEventListener("keydown",this._calKeyEvent,!0),a.removeEventListener("keypress",this._calKeyEvent,!0),a.removeEventListener("mousedown",this._documentClick,!0),this.dropdownElement.style.display="none",this.hidden=!0},t.prototype._handleDocumentClick=function(e){var t=e.target;if(null!==t&&!t.classList.contains("time"))for(;null!==t&&t!==this.element;t=t.parentNode);if(null===t)return a.activeElement.blur(),this.hide(),r(e)},t.prototype._handleDayMouseDown=function(e){var a=this,t=e.currentTarget,s=e.target||e.srcElement;if(!s||!s.hasAttribute("data-action")){if("TD"!==t.nodeName){var l=t.getParent("TD");"TD"===l.nodeName?t=l:(t=t.getParent("TD")).classList.contains("js-calendar")&&(t=t.getElementsByTagName("table")[0])}else if(!s.classList.contains("js-btn")&&!t.classList.contains("day")&&!t.classList.contains("title"))return;if(!t||t.disabled)return!1;if(void 0===t.navtype||300!==t.navtype){50===t.navtype&&(t._current=t.innerHTML),s!==t&&s.parentNode!==t||a.cellClick(t,e);var o=null;void 0!==t.month&&(o=t),void 0!==t.parentNode.month&&(o=t.parentNode);var i=null;if(o)i=new Date(a.date),o.month!==i.getLocalMonth(a.params.dateType)&&(i.setLocalMonth(a.params.dateType,o.month),a.setDate(i),a.dateClicked=!1,this.callHandler());else{var n=null;void 0!==t.year&&(n=s),void 0!==t.parentNode.year&&(n=s.parentNode),n&&(i=new Date(a.date),n.year!==i.getLocalFullYear(a.params.dateType)&&(i.setFullYear(a.params.dateType,n.year),a.setDate(i),a.dateClicked=!1,this.callHandler()))}}return r(e)}},t.prototype.cellClick=function(e,a){var t=this,r=!1,s=!1,l=null;if(void 0===e.navtype){t.currentDateEl&&(e.classList.add("selected"),t.currentDateEl=e.caldate,(r=t.currentDateEl===e.caldate)||(t.currentDateEl=e.caldate)),t.date.setLocalDateOnly("gregorian",e.caldate);var o=!(t.dateClicked=!e.otherMonth);t.currentDateEl&&(s=!e.disabled),o&&this.processCalendar()}else{l=new Date(t.date),t.dateClicked=!1;var i=l.getOtherFullYear(t.params.dateType),n=l.getLocalMonth(t.params.dateType);switch(e.navtype){case 400:break;case-2:t.params.compressedHeader||i>t.params.minYear&&l.setOtherFullYear(t.params.dateType,i-1);break;case-1:var d=l.getLocalDate(t.params.dateType);if(n>0)d>(m=l.getLocalMonthDays(t.params.dateType,n-1))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,n-1);else if(i-- >t.params.minYear){l.setOtherFullYear(t.params.dateType,i),d>(m=l.getLocalMonthDays(t.params.dateType,11))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,11)}break;case 1:d=l.getLocalDate(t.params.dateType);if(n<11)d>(m=l.getLocalMonthDays(t.params.dateType,n+1))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,n+1);else if(i<t.params.maxYear){var m;l.setOtherFullYear(t.params.dateType,i+1),d>(m=l.getLocalMonthDays(t.params.dateType,0))&&l.setLocalDate(t.params.dateType,m),l.setLocalMonth(t.params.dateType,0)}break;case 2:t.params.compressedHeader||i<t.params.maxYear&&l.setOtherFullYear(t.params.dateType,i+1)}l.equalsTo(t.date)?0===e.navtype&&(s=r=!0):(this.setDate(l),s=!0)}s&&(t.params.showsTime&&(this.dateClicked=!1),a&&this.callHandler()),e.classList.remove("hilite"),r&&!t.params.showsTime&&(t.dateClicked=!1,a&&this.close())},t.prototype._handleCalKeyEvent=function(e){var a=e.keyCode;if(e.target!==this.inputField||13!==a&&9!==a||this.close(),"rtl"===this.params.direction&&(37===a?a=39:39===a&&(a=37)),32===a&&e.shiftKey&&(e.preventDefault(),this.cellClick(this._nav_now,e),this.close()),27===a&&this.close(),38===a&&this.moveCursorBy(7),40===a&&this.moveCursorBy(-7),37===a&&this.moveCursorBy(1),39===a&&this.moveCursorBy(-1),e.target===this.inputField&&!(a>48||a<57||186===a||189===a||190===a||32===a))return r(e)},t.prototype._create=function(){var e=this,a=this.element,t=s("table"),r=s("div");this.table=t,t.className="table",t.cellSpacing=0,t.cellPadding=0,t.style.marginBottom=0,this.dropdownElement=r,a.appendChild(r),this.params.direction&&(r.style.direction=this.params.direction),r.className="js-calendar",r.style.position="absolute",r.style.boxShadow="0px 0px 70px 0px rgba(0,0,0,0.67)",r.style.minWidth=this.inputField.width,r.style.padding="0",r.style.display="none",r.style.left="auto",r.style.top="auto",r.style.zIndex=1060,r.style.borderRadius="20px",this.wrapper=s("div"),this.wrapper.className="calendar-container",r.appendChild(this.wrapper),this.wrapper.appendChild(t);var l=s("thead",t);l.className="calendar-header";var o=null,i=null,n=this,d=function(a,t,r,l,d,m,p){for(var c in d=d||{},o=s(l=l||"td",i),t&&(m=m?'class="'+m+'"':"",o.colSpan=t),d)o.style[c]=d[c];for(var c in p)o.setAttribute(c,p[c]);return 0!==r&&Math.abs(r)<=2&&(o.className+=" nav"),t&&o.addEventListener("mousedown",e._dayMouseDown,!0),o.calendar=n,o.navtype=r,0!==r&&Math.abs(r)<=2?o.innerHTML="<a "+m+" style='display:inline;padding:2px 6px;cursor:pointer;text-decoration:none;' unselectable='on'>"+a+"</a>":(o.innerHTML=t?"<div unselectable='on'"+m+">"+a+"</div>":a,!t&&m&&(o.className=m)),o};!1===this.params.compressedHeader&&((i=s("tr",l)).className="calendar-head-row",this._nav_py=d("&lsaquo;",1,-2,"",{"text-align":"center","font-size":"18px","line-height":"18px"},"js-btn btn-prev-year"),this.title=d('<div style="text-align:center;font-size:18px"><span></span></div>',this.params.weekNumbers?6:5,300),this.title.className="title",this._nav_ny=d(" &rsaquo;",1,2,"",{"text-align":"center","font-size":"18px","line-height":"18px"},"js-btn btn-next-year")),(i=s("tr",l)).className="calendar-head-row",this._nav_pm=d("&lsaquo;",1,-1,"",{"text-align":"center","font-size":"2em","line-height":"1em"},"js-btn btn-prev-month"),this._nav_month=d('<div style="text-align:center;font-size:1.2em"><span></span></div>',this.params.weekNumbers?6:5,888,"td",{textAlign:"center"}),this._nav_month.className="title",this._nav_nm=d(" &rsaquo;",1,1,"",{"text-align":"center","font-size":"2em","line-height":"1em"},"js-btn btn-next-month"),(i=s("tr",l)).className=e.params.weekNumbers?"daynames wk":"daynames",this.params.weekNumbers&&((o=s("td",i)).className="day-name wn",o.innerHTML=JoomlaCalLocale.wk);for(var m=7;m>0;--m)o=s("td",i),m||(o.calendar=e);this.firstdayname=this.params.weekNumbers?i.firstChild.nextSibling:i.firstChild;var p=this.params.firstDayOfWeek,c=(o=this.firstdayname,JoomlaCalLocale.weekend);for(m=0;m<7;++m){var u=(m+p)%7;o.classList.add("day-name"),this.params.weekNumbers&&o.classList.add("day-name-week"),m&&(o.calendar=e,o.fdow=u),-1!==c.indexOf(c)&&o.classList.add("weekend"),o.innerHTML=JoomlaCalLocale.shortDays[(m+p)%7],o=o.nextSibling}var h=s("tbody",t);for(this.tbody=h,m=6;m>0;--m){i=s("tr",h),this.params.weekNumbers&&(o=s("td",i));for(var y=7;y>0;--y)(o=s("td",i)).calendar=this,o.addEventListener("mousedown",this._dayMouseDown,!0)}if(this.params.showsTime){(i=s("tr",h)).className="time",(o=s("td",i)).className="time time-title",o.colSpan=1,o.style.verticalAlign="middle",o.innerHTML=" ";var v=s("td",i);v.className="time hours-select",v.colSpan=2;var g=s("td",i);g.className="time minutes-select",g.colSpan=2,function(){function a(a,t,r,l,o){var i,n=s("select",o);n.calendar=e,n.className=a,n.setAttribute("data-chosen",!0),n.style.width="100%",n.navtype=50,n._range=[];for(var d=r;d<=l;++d){var m,p="";d===t&&(p=!0),d<10&&l>=10?(i="0"+d,m=Date.convertNumbers("0")+Date.convertNumbers(d)):(i=""+d,m=""+Date.convertNumbers(d)),n.options.add(new Option(m,i,p,p))}return n}var t=e.date.getHours(),r=e.date.getMinutes(),l=!e.params.time24,n=e.date.getHours()>12;l&&n&&(t-=12);var d=a("time time-hours",t,l?1:0,l?12:23,v),m=a("time time-minutes",r,0,59,g);if((o=s("td",i)).className="time ampm-select",o.colSpan=e.params.weekNumbers?1:2,l){n=Date.parseFieldDate(e.inputField.getAttribute("data-alt-value"),e.params.dateFormat,"gregorian").getHours()>12;var p=s("select",o);p.className="time-ampm",p.style.width="100%",p.options.add(new Option(JoomlaCalLocale.PM,"pm",!!n||"",!!n||"")),p.options.add(new Option(JoomlaCalLocale.AM,"am",!n||"",!n||"")),p.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1)}else o.innerHTML="&#160;",o.colSpan=e.params.weekNumbers?3:2;d.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1),m.addEventListener("change",function(a){e.updateTime(a.target.parentNode.parentNode.childNodes[1].childNodes[0].value,a.target.parentNode.parentNode.childNodes[2].childNodes[0].value,a.target.parentNode.parentNode.childNodes[3].childNodes[0].value)},!1)}()}((i=s("div",this.wrapper)).className="buttons-wrapper btn-group",this._nav_clear=d(JoomlaCalLocale.clear,"",100,"button","","js-btn btn btn-clear",{type:"button","data-action":"clear"}),i.querySelector('[data-action="clear"]').addEventListener("click",function(a){a.preventDefault();for(var t=e.table.querySelectorAll("td"),r=0;r<t.length;r++)if(t[r].classList.contains("selected")){t[r].classList.remove("selected");break}e.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00"),e.inputField.setAttribute("value",""),e.inputField.value=""}),this.params.showsTodayBtn)&&(this._nav_now=d(JoomlaCalLocale.today,"",0,"button","","js-btn btn btn-today",{type:"button","data-action":"today"}),this.wrapper.querySelector('[data-action="today"]').addEventListener("click",function(a){a.preventDefault(),e.date.setLocalDateOnly("gregorian",new Date),e.dateClicked=!0,e.callHandler(),e.close()}));this._nav_exit=d(JoomlaCalLocale.exit,"",999,"button","","js-btn btn btn-exit",{type:"button","data-action":"exit"}),this.wrapper.querySelector('[data-action="exit"]').addEventListener("click",function(a){a.preventDefault(),e.dateClicked||(e.inputField.value?("gregorian"!==e.params.dateType&&e.inputField.setAttribute("data-local-value",e.inputField.value),void 0===e.dateClicked?e.inputField.setAttribute("data-alt-value",Date.parseFieldDate(e.inputField.value,e.params.dateFormat,e.params.dateType).print(e.params.dateFormat,"gregorian",!1)):e.inputField.setAttribute("data-alt-value",e.date.print(e.params.dateFormat,"gregorian",!1))):e.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00"),e.date=Date.parseFieldDate(e.inputField.getAttribute("data-alt-value"),e.params.dateFormat,e.params.dateType)),e.close()}),this.processCalendar()},t.prototype.processCalendar=function(){this.table.style.visibility="hidden";var e=this.params.firstDayOfWeek,a=this.date,t=new Date,r=t.getLocalFullYear(this.params.dateType),s=t.getLocalMonth(this.params.dateType),l=t.getLocalDate(this.params.dateType),o=a.getOtherFullYear(this.params.dateType),i=a.getHours(),n=a.getMinutes(),d=(a.getSeconds(),!this.params.time24);o<this.params.minYear?(o=this.params.minYear,a.getOtherFullYear(this.params.dateType,o)):o>this.params.maxYear&&(o=this.params.maxYear,a.getOtherFullYear(this.params.dateType,o)),this.params.firstDayOfWeek=e,this.date=new Date(a);var m=a.getLocalMonth(this.params.dateType),p=a.getLocalDate(this.params.dateType);a.setLocalDate(this.params.dateType,1);var c=(a.getLocalDay(this.params.dateType)-this.params.firstDayOfWeek)%7;c<0&&(c+=7),a.setLocalDate(this.params.dateType,-c),a.setLocalDate(this.params.dateType,a.getLocalDate(this.params.dateType)+1);for(var u=this.tbody.firstChild,h=this.ar_days=new Array,y=JoomlaCalLocale.weekend,v=parseInt(a.getLocalWeekDays(this.params.dateType)),g=0;g<v;++g,u=u.nextSibling){var b=u.firstChild;this.params.weekNumbers&&(b.className="day wn",b.innerHTML=a.getLocalWeekNumber(this.params.dateType),b=b.nextSibling),u.className=this.params.weekNumbers?"daysrow wk":"daysrow";for(var f,L=!1,C=h[g]=[],w=v+1,T=0;T<w;++T,b=b.nextSibling,a.setLocalDate(this.params.dateType,f+1)){b.className="day",b.style.textAlign="center",f=a.getLocalDate(this.params.dateType);var N=a.getLocalDay(this.params.dateType);b.pos=g<<4|T,C[T]=b;var D=a.getLocalMonth(this.params.dateType)===m;if(D)b.otherMonth=!1,L=!0,b.style.cursor="pointer";else{if(!this.params.showsOthers){b.className+=" emptycell",b.innerHTML="&#160;",b.disabled=!0;continue}b.className+=" disabled othermonth ",b.otherMonth=!0}b.disabled=!1,b.innerHTML=this.params.debug?f:Date.convertNumbers(f),b.disabled||(b.caldate=new Date(a),D&&f===p&&(b.className+=" selected",this.currentDateEl=b),a.getLocalFullYear(this.params.dateType)===r&&a.getLocalMonth(this.params.dateType)===s&&f===l&&(b.className+=" today"),-1!==y.indexOf(N)&&(b.className+=" weekend"))}L||this.params.showsOthers?u.style.display="":(u.style.display="none",u.className="emptyrow")}if(this.params.showsTime){i>12&&d&&(i-=12),i=i<10?"0"+i:i,n=n<10?"0"+n:n;var F=this.table.querySelector(".time-hours"),k=this.table.querySelector(".time-minutes");if(this.resetSelected(F),F.value=i,this.resetSelected(k),k.value=n,!this.params.time24){var J=new Date(this.inputField.getAttribute("data-alt-value")),A=this.table.querySelector(".time-ampm");J.getHours()>12&&(this.resetSelected(A),A.value="pm")}}if(this.params.compressedHeader){var M=Date.convertNumbers(o.toString());this._nav_month.getElementsByTagName("span")[0].innerHTML=this.params.monthBefore?M+" - "+JoomlaCalLocale.months[m]:JoomlaCalLocale.months[m]+" - "+M}else this._nav_month.getElementsByTagName("span")[0].innerHTML=this.params.debug?m+" "+JoomlaCalLocale.months[m]:JoomlaCalLocale.months[m],this.title.getElementsByTagName("span")[0].innerHTML=this.params.debug?o+" "+Date.convertNumbers(o.toString()):Date.convertNumbers(o.toString());this.table.style.visibility="visible"},t.prototype._bindEvents=function(){var e=this;this.inputField.addEventListener("blur",function(a){var r=t.getCalObject(this)._joomlaCalendar;if("block"!==r.dropdownElement.style.display){if(r){if(r.inputField.value)if(void 0===r.params.dateClicked)if(r.inputField.setAttribute("data-local-value",r.inputField.value),"gregorian"!==r.params.dateType){var s,l=Date.parseFieldDate(r.inputField.value,r.params.dateFormat,r.params.dateType);s=Date.localCalToGregorian(l.getFullYear(),l.getMonth(),l.getDate()),l.setFullYear(s[0]),l.setMonth(s[1]),l.setDate(s[2]),r.inputField.setAttribute("data-alt-value",l.print(r.params.dateFormat,"gregorian",!1))}else r.inputField.setAttribute("data-alt-value",Date.parseFieldDate(r.inputField.value,r.params.dateFormat,r.params.dateType).print(r.params.dateFormat,"gregorian",!1));else r.inputField.setAttribute("data-alt-value",r.date.print(r.params.dateFormat,"gregorian",!1));else r.inputField.setAttribute("data-alt-value","0000-00-00 00:00:00");r.date=Date.parseFieldDate(r.inputField.getAttribute("data-alt-value"),r.params.dateFormat,r.params.dateType)}e.close()}else a.preventDefault()},!0),this.button.addEventListener("click",function(){e.show()},!1)};var r=function(a){return a||(a=e.event),a.preventDefault(),a.stopPropagation(),!1},s=function(e,t){var r;return r=a.createElement(e),void 0!==t&&t.appendChild(r),r},l=function(e){return!isNaN(e)&&(0|(a=parseFloat(e)))===a;var a},o=function(e,a){return(new Date).getLocalFullYear(a)+e};Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var a=this.length>>>0,t=Number(arguments[1])||0;for((t=t<0?Math.ceil(t):Math.floor(t))<0&&(t+=a);t<a;t++)if(t in this&&this[t]===e)return t;return-1}),t.getCalObject=function(e){if(!e)return!1;for(;e.parentNode;)if((e=e.parentNode).classList.contains("field-calendar"))return e;return!1},t.prototype.setAltValue=function(){var e=this.inputField;e.getAttribute("disabled")||(e.value=e.getAttribute("data-alt-value")?e.getAttribute("data-alt-value"):"")},t.onSubmit=function(){if(Joomla=e.Joomla||{},!Joomla.calendarProcessed){Joomla.calendarProcessed=!0;for(var t=a.querySelectorAll(".field-calendar"),r=0;r<t.length;r++){var s=t[r]._joomlaCalendar;s&&s.setAltValue()}}},t.init=function(a,r){e.JoomlaCalLocale=e.JoomlaCalLocale?JoomlaCalLocale:{},JoomlaCalLocale.today=JoomlaCalLocale.today?JoomlaCalLocale.today:"today",JoomlaCalLocale.weekend=JoomlaCalLocale.weekend?JoomlaCalLocale.weekend:[0,6],JoomlaCalLocale.localLangNumbers=JoomlaCalLocale.localLangNumbers?JoomlaCalLocale.localLangNumbers:[0,1,2,3,4,5,6,7,8,9],JoomlaCalLocale.wk=JoomlaCalLocale.wk?JoomlaCalLocale.wk:"wk",JoomlaCalLocale.AM=JoomlaCalLocale.AM?JoomlaCalLocale.AM:"AM",JoomlaCalLocale.PM=JoomlaCalLocale.PM?JoomlaCalLocale.PM:"PM",JoomlaCalLocale.am=JoomlaCalLocale.am?JoomlaCalLocale.am:"am",JoomlaCalLocale.pm=JoomlaCalLocale.pm?JoomlaCalLocale.pm:"pm",JoomlaCalLocale.dateType=JoomlaCalLocale.dateType?JoomlaCalLocale.dateType:"gregorian",JoomlaCalLocale.time=JoomlaCalLocale.time?JoomlaCalLocale.time:"time",JoomlaCalLocale.days=JoomlaCalLocale.days?JoomlaCalLocale.days:'["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]',JoomlaCalLocale.shortDays=JoomlaCalLocale.shortDays?JoomlaCalLocale.shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat","Sun"],JoomlaCalLocale.months=JoomlaCalLocale.months?JoomlaCalLocale.months:["January","February","March","April","May","June","July","August","September","October","November","December"],JoomlaCalLocale.shortMonths=JoomlaCalLocale.shortMonths?JoomlaCalLocale.shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],JoomlaCalLocale.minYear=JoomlaCalLocale.minYear?JoomlaCalLocale.minYear:1900,JoomlaCalLocale.maxYear=JoomlaCalLocale.maxYear?JoomlaCalLocale.maxYear:2100,JoomlaCalLocale.exit=JoomlaCalLocale.exit?JoomlaCalLocale.exit:"Cancel",JoomlaCalLocale.clear=JoomlaCalLocale.clear?JoomlaCalLocale.clear:"Clear";var s=a._joomlaCalendar;s?s.recreate():new t(a),a&&a.getElementsByTagName("input")[0]&&a.getElementsByTagName("input")[0].form&&!a.getElementsByTagName("input")[0].disabled&&a.getElementsByTagName("input")[0].form.addEventListener("submit",t.onSubmit)},e.JoomlaCalendar=t,a.addEventListener("DOMContentLoaded",function(){var r,s;for(r=a.querySelectorAll(".field-calendar"),s=0;s<r.length;s++)t.init(r[s]);e.jQuery&&jQuery(a).on("subform-row-add",function(e,a){for(r=a.querySelectorAll(".field-calendar"),s=0;s<r.length;s++)t.init(r[s])}),e.Calendar={},Calendar.setup=function(e){if(e.inputField&&a.getElementById(e.inputField)){var r=a.getElementById(e.inputField),s=r.parentNode.querySelectorAll("button")[0];for(var l in e)if(e.hasOwnProperty(l))switch(l){case"ifFormat":s&&s.setAttribute("data-dayformat",e.ifFormat);break;case"firstDay":s&&s.setAttribute("data-firstday",parseInt(e.firstDay));break;case"weekNumbers":s&&s.setAttribute("data-week-numbers","true"===e.weekNumbers||!0===e.weekNumbers?"1":"0");break;case"showOthers":s&&s.setAttribute("data-show-others","true"===e.showOthers||!0===e.showOthers?"1":"0");break;case"showsTime":s&&s.setAttribute("data-show-time","true"===e.showsTime||!0===e.showsTime?"1":"0");break;case"timeFormat":s&&s.setAttribute("data-time-24",parseInt(e.timeFormat))}t.init(r.parentNode.parentNode)}return null}})}(window,document);
\ No newline at end of file
diff --git a/core/media/system/js/frontediting-uncompressed.js b/core/media/system/js/frontediting-uncompressed.js
new file mode 100644
index 00000000..b5820446
--- /dev/null
+++ b/core/media/system/js/frontediting-uncompressed.js
@@ -0,0 +1,200 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * JavaScript behavior to add front-end hover edit icons with tooltips for modules and menu items.
+ *
+ */
+(function($) {
+
+	$.fn.extend({
+		/**
+		 * This jQuery custom method makes the elements absolute, and with true argument moves them to end of body to avoid CSS inheritence
+		 *
+		 * @param   rebase boolean
+		 * @returns {jQuery}
+		 */
+		jEditMakeAbsolute: function(rebase) {
+
+			return this.each(function() {
+
+				var el = $(this);
+				var pos;
+
+				if (rebase) {
+					pos = el.offset();
+				} else {
+					pos = el.position();
+				}
+
+				el.css({ position: "absolute",
+					marginLeft: 0, marginTop: 0,
+					top: pos.top, left: pos.left,
+					bottom: 'auto', right: 'auto'
+				});
+
+				if (rebase) {
+					el.detach().appendTo("body");
+				}
+			});
+
+		}
+	});
+
+	$(document).ready(function () {
+
+		// Tooltip maximal dimensions for intelligent placement:
+		var actualWidth = 200;
+		var actualHeight = 100;
+		// Tooltip smart tooltip placement function:
+		var tooltipPlacer = function(tip, element) {
+			var $element, above, below, boundBottom, boundLeft, boundRight, boundTop, elementAbove, elementBelow, elementLeft, elementRight, isWithinBounds, left, pos, right;
+			isWithinBounds = function(elementPosition) {
+				return boundTop < elementPosition.top && boundLeft < elementPosition.left && boundRight > (elementPosition.left + actualWidth) && boundBottom > (elementPosition.top + actualHeight);
+			};
+			$element = $(element);
+			pos = $.extend({}, $element.offset(), {
+				width: element.offsetWidth,
+				height: element.offsetHeight
+			});
+			boundTop = $(document).scrollTop();
+			boundLeft = $(document).scrollLeft();
+			boundRight = boundLeft + $(window).width();
+			boundBottom = boundTop + $(window).height();
+			elementAbove = {
+				top: pos.top - actualHeight,
+				left: pos.left + pos.width / 2 - actualWidth / 2
+			};
+			elementBelow = {
+				top: pos.top + pos.height,
+				left: pos.left + pos.width / 2 - actualWidth / 2
+			};
+			elementLeft = {
+				top: pos.top + pos.height / 2 - actualHeight / 2,
+				left: pos.left - actualWidth
+			};
+			elementRight = {
+				top: pos.top + pos.height / 2 - actualHeight / 2,
+				left: pos.left + pos.width
+			};
+			above = isWithinBounds(elementAbove);
+			below = isWithinBounds(elementBelow);
+			left = isWithinBounds(elementLeft);
+			right = isWithinBounds(elementRight);
+			if (above) {
+				return "top";
+			} else {
+				if (below) {
+					return "bottom";
+				} else {
+					if (left) {
+						return "left";
+					} else {
+						if (right) {
+							return "right";
+						} else {
+							return "right";
+						}
+					}
+				}
+			}
+		};
+
+		// Modules edit icons:
+
+		$('.jmoddiv').on({
+			mouseenter: function() {
+
+				// Get module editing URL and tooltip for module edit:
+				var moduleEditUrl = $(this).data('jmodediturl');
+				var moduleTip = $(this).data('jmodtip');
+                var moduleTarget = $(this).data('target');
+
+				// Stop timeout on previous tooltip and remove it:
+				$('body>.btn.jmodedit').clearQueue().tooltip('destroy').remove();
+
+				// Add editing button with tooltip:
+				$(this).addClass('jmodinside')
+					.prepend('<a class="btn jmodedit" href="#" target="' + moduleTarget + '"><span class="icon-edit"></span></a>')
+					.children(":first").attr('href', moduleEditUrl).attr('title', moduleTip)
+					.tooltip({"container": false, html: true, placement: tooltipPlacer})
+					.jEditMakeAbsolute(true);
+
+				$('.btn.jmodedit')
+					.on({
+						mouseenter: function() {
+							// Stop delayed removal programmed by mouseleave of .jmoddiv or of this one:
+							$(this).clearQueue();
+						},
+						mouseleave: function() {
+							// Delay remove editing button if not hovering it:
+							$(this).delay(500).queue(function(next) {
+								$(this).tooltip('destroy').remove();
+								next();
+							});
+						}
+					});
+			},
+			mouseleave: function() {
+
+				// Delay remove editing button if not hovering it:
+				$('body>.btn.jmodedit').delay(500).queue(function(next) {
+					$(this).tooltip('destroy').remove();
+					next();
+				});
+			}
+		});
+
+		// Menu items edit icons:
+
+		var activePopover = null;
+
+		$('.jmoddiv[data-jmenuedittip] .nav li,.jmoddiv[data-jmenuedittip].nav li,.jmoddiv[data-jmenuedittip] .nav .nav-child li,.jmoddiv[data-jmenuedittip].nav .nav-child li').on({
+			mouseenter: function() {
+
+				// Get menu ItemId from the item-nnn class of the li element of the menu:
+				var itemids = /\bitem-(\d+)\b/.exec($(this).attr('class'));
+				if (typeof itemids[1] == 'string') {
+					// Find module editing URL from enclosing module:
+					var enclosingModuleDiv = $(this).closest('.jmoddiv');
+					var moduleEditUrl = enclosingModuleDiv.data('jmodediturl');
+					// Transform module editing URL into Menu Item editing url:
+					var menuitemEditUrl = moduleEditUrl.replace(/\/index.php\?option=com_config&controller=config.display.modules([^\d]+).+$/, '/administrator/index.php?option=com_menus&view=item&layout=edit$1' + itemids[1]);
+
+				}
+
+				// Get tooltip for menu items from enclosing module
+				var menuEditTip = enclosingModuleDiv.data('jmenuedittip').replace('%s', itemids[1]);
+
+				var content = $('<div><a class="btn jfedit-menu" href="#" target="_blank"><span class="icon-edit"></span></a></div>');
+				content.children('a.jfedit-menu').prop('href', menuitemEditUrl).prop('title', menuEditTip);
+
+				if (activePopover) {
+					$(activePopover).popover('hide');
+				}
+				$(this).popover({html:true, content:content.html(), container:'body', trigger:'manual', animation:false, placement: 'bottom'}).popover('show');
+				activePopover = this;
+
+				$('body>div.popover')
+					.on({
+					mouseenter: function() {
+						if (activePopover) {
+							$(activePopover).clearQueue();
+						}
+					},
+					mouseleave: function() {
+						if (activePopover) {
+							$(activePopover).popover('hide');
+						}
+					}
+				})
+				.find('a.jfedit-menu').tooltip({"container": false, html: true, placement: 'bottom'});
+			},
+			mouseleave: function() {
+				$(this).delay(1500).queue(function(next) { $(this).popover('hide'); next() });
+			}
+		});
+	});
+})(jQuery);
diff --git a/core/media/system/js/frontediting.js b/core/media/system/js/frontediting.js
new file mode 100644
index 00000000..89009814
--- /dev/null
+++ b/core/media/system/js/frontediting.js
@@ -0,0 +1 @@
+!function(t){t.fn.extend({jEditMakeAbsolute:function(e){return this.each(function(){var o,i=t(this);o=e?i.offset():i.position(),i.css({position:"absolute",marginLeft:0,marginTop:0,top:o.top,left:o.left,bottom:"auto",right:"auto"}),e&&i.detach().appendTo("body")})}}),t(document).ready(function(){var e=200,o=100,i=function(i,n){var d,a,l,r,s,p,u,m,c,h,f,v,j,b,g;return v=function(t){return u<t.top&&s<t.left&&p>t.left+e&&r>t.top+o},d=t(n),b=t.extend({},d.offset(),{width:n.offsetWidth,height:n.offsetHeight}),u=t(document).scrollTop(),s=t(document).scrollLeft(),p=s+t(window).width(),r=u+t(window).height(),m={top:b.top-o,left:b.left+b.width/2-e/2},c={top:b.top+b.height,left:b.left+b.width/2-e/2},h={top:b.top+b.height/2-o/2,left:b.left-e},f={top:b.top+b.height/2-o/2,left:b.left+b.width},a=v(m),l=v(c),j=v(h),g=v(f),a?"top":l?"bottom":j?"left":"right"};t(".jmoddiv").on({mouseenter:function(){var e=t(this).data("jmodediturl"),o=t(this).data("jmodtip"),n=t(this).data("target");t("body>.btn.jmodedit").clearQueue().tooltip("destroy").remove(),t(this).addClass("jmodinside").prepend('<a class="btn jmodedit" href="#" target="'+n+'"><span class="icon-edit"></span></a>').children(":first").attr("href",e).attr("title",o).tooltip({container:!1,html:!0,placement:i}).jEditMakeAbsolute(!0),t(".btn.jmodedit").on({mouseenter:function(){t(this).clearQueue()},mouseleave:function(){t(this).delay(500).queue(function(e){t(this).tooltip("destroy").remove(),e()})}})},mouseleave:function(){t("body>.btn.jmodedit").delay(500).queue(function(e){t(this).tooltip("destroy").remove(),e()})}});var n=null;t(".jmoddiv[data-jmenuedittip] .nav li,.jmoddiv[data-jmenuedittip].nav li,.jmoddiv[data-jmenuedittip] .nav .nav-child li,.jmoddiv[data-jmenuedittip].nav .nav-child li").on({mouseenter:function(){var e=/\bitem-(\d+)\b/.exec(t(this).attr("class"));if("string"==typeof e[1])var o=t(this).closest(".jmoddiv"),i=o.data("jmodediturl"),d=i.replace(/\/index.php\?option=com_config&controller=config.display.modules([^\d]+).+$/,"/administrator/index.php?option=com_menus&view=item&layout=edit$1"+e[1]);var a=o.data("jmenuedittip").replace("%s",e[1]),l=t('<div><a class="btn jfedit-menu" href="#" target="_blank"><span class="icon-edit"></span></a></div>');l.children("a.jfedit-menu").prop("href",d).prop("title",a),n&&t(n).popover("hide"),t(this).popover({html:!0,content:l.html(),container:"body",trigger:"manual",animation:!1,placement:"bottom"}).popover("show"),n=this,t("body>div.popover").on({mouseenter:function(){n&&t(n).clearQueue()},mouseleave:function(){n&&t(n).popover("hide")}}).find("a.jfedit-menu").tooltip({container:!1,html:!0,placement:"bottom"})},mouseleave:function(){t(this).delay(1500).queue(function(e){t(this).popover("hide"),e()})}})})}(jQuery);
\ No newline at end of file
diff --git a/core/media/system/js/helpsite.js b/core/media/system/js/helpsite.js
new file mode 100644
index 00000000..c4317536
--- /dev/null
+++ b/core/media/system/js/helpsite.js
@@ -0,0 +1,32 @@
+/**
+ * @package		Joomla.JavaScript
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * gets the help site with ajax
+ */
+jQuery(document).ready(function() {
+	jQuery('#helpsite-refresh').click(function()
+	{
+		// Uses global variable helpsite_base for bast uri
+		var select_id   = jQuery(this).attr('rel');
+		var showDefault = jQuery(this).attr('showDefault');
+
+		jQuery.getJSON('index.php?option=com_users&task=profile.gethelpsites&format=json', function(data){
+			// The response contains the options to use in help site select field
+			var items = [];
+
+			// Build options
+			jQuery.each(data, function(key, val) {
+				if (val.value !== '' || showDefault === 'true') {
+					items.push('<option value="' + val.value + '">' + val.text + '</option>');
+				}
+			});
+
+			// Replace current select options. The trigger is needed for Chosen select box enhancer
+			jQuery("#" + select_id).empty().append(items).trigger("liszt:updated");
+		});
+	});
+});
diff --git a/core/media/system/js/highlighter-uncompressed.js b/core/media/system/js/highlighter-uncompressed.js
new file mode 100644
index 00000000..e9a8ff19
--- /dev/null
+++ b/core/media/system/js/highlighter-uncompressed.js
@@ -0,0 +1,111 @@
+/**
+ * @package     Joomla.JavaScript
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Only define the Joomla namespace if not defined.
+if (typeof(Joomla) === 'undefined') {
+    var Joomla = {};
+}
+
+Joomla.Highlighter = function(_options){
+    var $, words, options = {
+        autoUnhighlight: true,
+        caseSensitive: false,
+        startElement: false,
+        endElement: false,
+        elements: [],
+        className: 'highlight',
+        onlyWords: true,
+        tag: 'span'
+    },
+
+    highlight = function (words) {
+        if (words.constructor === String) {
+            words = [words];
+        }
+        if (options.autoUnhighlight) {
+            unhighlight(words);
+        }
+        var pattern = options.onlyWords ? '\b' + pattern + '\b' : '(' + words.join('\\b|\\b') + ')',
+        regex = new RegExp(pattern, options.caseSensitive ? '' : 'i');
+        options.elements.map(function(el){
+            recurse(el, regex, options.className);
+        });
+        return this;
+    },
+
+    unhighlight = function (words) {
+        if (words.constructor === String) {
+            words = [words];
+        }
+
+        var $elements, tn;
+        words.map(function(word){
+            word = (options.caseSensitive ? word : word.toUpperCase());
+            if (words[word]) {
+                $elements = $(words[word]);
+                $elements.removeClass();
+                $elements.each(function (index, el) {
+                    tn = document.createTextNode($(el).text());
+                    el.parentNode.replaceChild(tn, el);
+                });
+            }
+        });
+        return this;
+    },
+
+    recurse = function (node, regex, klass) {
+        if (node.nodeType === 3) {
+            var match = node.nodeValue.match(regex), highlight, $highlight, wordNode, wordClone, comparer, i;
+            if (match) {
+                highlight = document.createElement(options.tag);
+                $highlight = $(highlight);
+                $highlight.addClass(klass);
+                wordNode = node.splitText(match.index);
+                wordNode.splitText(match[0].length);
+                wordClone = wordNode.cloneNode(true);
+                $highlight.append(wordClone);
+                $(wordNode).replaceWith(highlight)
+                $highlight.attr('rel', $highlight.text());
+                comparer = $highlight.text()
+                if (!options.caseSensitive) {
+                    comparer = $highlight.text().toUpperCase();
+                }
+                if (!words[comparer]) {
+                    words[comparer] = [];
+                }
+                words[comparer].push(highlight);
+                return 1;
+            }
+        } else if ((node.nodeType === 1 && node.childNodes) && !/(script|style|textarea|iframe)/i.test(node.tagName) && !(node.tagName === options.tag.toUpperCase() && node.className === klass)) {
+            for (i = 0; i < node.childNodes.length; i++) {
+                i += recurse(node.childNodes[i], regex, klass);
+            }
+        }
+        return 0;
+    },
+
+    getElements = function ($start, $end) {
+        var $next = $start.next();
+        if ($next.attr('id') !== $end.attr('id')) {
+            options.elements.push($next.get(0));
+            getElements($next, $end);
+        }
+    },
+
+    initialize = function(_options) {
+        $ = jQuery.noConflict();
+        $.extend(options, _options);
+        getElements($(options.startElement), $(options.endElement));
+        words = [];
+    };
+
+    initialize(_options);
+
+    return {
+        highlight: highlight,
+        unhighlight : unhighlight
+    };
+}
diff --git a/core/media/system/js/highlighter.js b/core/media/system/js/highlighter.js
new file mode 100644
index 00000000..b6e0ff19
--- /dev/null
+++ b/core/media/system/js/highlighter.js
@@ -0,0 +1,4 @@
+/*
+		GNU General Public License version 2 or later; see LICENSE.txt
+*/
+if(typeof(Joomla)==="undefined"){var Joomla={}}Joomla.Highlighter=function(h){var d,f,i={autoUnhighlight:true,caseSensitive:false,startElement:false,endElement:false,elements:[],className:"highlight",onlyWords:true,tag:"span"},b=function(l){if(l.constructor===String){l=[l]}if(i.autoUnhighlight){g(l)}var k=i.onlyWords?"\b"+k+"\b":"("+l.join("\\b|\\b")+")",j=new RegExp(k,i.caseSensitive?"":"i");i.elements.map(function(m){a(m,j,i.className)});return this},g=function(l){if(l.constructor===String){l=[l]}var k,j;l.map(function(m){m=(i.caseSensitive?m:m.toUpperCase());if(l[m]){k=d(l[m]);k.removeClass();k.each(function(n,o){j=document.createTextNode(d(o).text());o.parentNode.replaceChild(j,o)})}});return this},a=function(k,r,q){if(k.nodeType===3){var o=k.nodeValue.match(r),l,j,s,p,n,m;if(o){l=document.createElement(i.tag);j=d(l);j.addClass(q);s=k.splitText(o.index);s.splitText(o[0].length);p=s.cloneNode(true);j.append(p);d(s).replaceWith(l);j.attr("rel",j.text());n=j.text();if(!i.caseSensitive){n=j.text().toUpperCase()}if(!f[n]){f[n]=[]}f[n].push(l);return 1}}else{if((k.nodeType===1&&k.childNodes)&&!/(script|style|textarea|iframe)/i.test(k.tagName)&&!(k.tagName===i.tag.toUpperCase()&&k.className===q)){for(m=0;m<k.childNodes.length;m++){m+=a(k.childNodes[m],r,q)}}}return 0},e=function(l,k){var j=l.next();if(j.attr("id")!==k.attr("id")){i.elements.push(j.get(0));e(j,k)}},c=function(j){d=jQuery.noConflict();d.extend(i,j);e(d(i.startElement),d(i.endElement));f=[]};c(h);return{highlight:b,unhighlight:g}};
\ No newline at end of file
diff --git a/core/media/system/js/html5fallback-uncompressed.js b/core/media/system/js/html5fallback-uncompressed.js
new file mode 100644
index 00000000..19825a36
--- /dev/null
+++ b/core/media/system/js/html5fallback-uncompressed.js
@@ -0,0 +1,541 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Unobtrusive Form Validation and HTML5 Form polyfill library
+ *
+ * Inspired by: Ryan Seddon <http://thecssninja.com/javascript/H5F>
+ *
+ * @package		Joomla.Framework
+ * @subpackage	Forms
+ */
+
+( function( $, document, undefined ) {
+	"use strict";
+
+	// Utility function
+	if ( typeof Object.create !== 'function' ) {
+		Object.create = function( obj ) {
+			function F() {}
+			F.prototype = obj;
+			return new F();
+		};
+	}
+
+	var features = ( function( el, item ) {
+		var attributes = [ 'required', 'pattern', 'placeholder', 'autofocus', 'formnovalidate' ],
+			types = [ 'email', 'url', 'number', 'range' ],
+			result = {
+				attributes: {},
+				types: {}
+			};
+
+		while ( item = attributes.pop() ) {
+			result.attributes[ item ] = !!( item in el );
+		}
+
+		while ( item = types.pop() ) {
+			el.setAttribute( 'type', item );
+			result.types[ item ] = ( el.type == item );
+		}
+
+		return result;
+	}( document.createElement( "input" ) ) );
+
+	var H5Form = {
+		/**
+		 * Init function, prepares the form for for validation
+		 *
+		 * @param   object   options  Some options to override the defaults.
+		 * @param   Element  elem     The form or element to validate.
+		 *
+		 * @return  void
+		 */
+		init: function( options, elem ) {
+			var self = this;
+
+			self.elem = elem;
+			self.$elem = $( elem );
+			elem.H5Form = self;
+			self.options = $.extend( {}, $.fn.h5f.options, options );
+
+			// Check whether the element is form or not
+			if ( elem.nodeName.toLowerCase() === "form" ) {
+				self.bindWithForm( self.elem, self.$elem );
+			}
+		},
+
+		/**
+		 * Attach the validation behaviors to the form
+		 *
+		 * @param   Element  form   The form element
+		 * @param   jQuery   $form  A jQuery object containing the form
+		 *
+		 * @return  void
+		 */
+		bindWithForm: function( form, $form ) {
+			var self = this,
+				novalidate = !!$form.attr( 'novalidate' ),
+				f = form.elements,
+				flen = f.length,
+				formnovalidate;
+
+			if ( self.options.formValidationEvent === "onSubmit" ) {
+				$form.on( 'submit', function( e ) {
+					formnovalidate = this.H5Form.donotValidate !== undefined ? this.H5Form.donotValidate : false;
+
+					if ( !formnovalidate && !novalidate && !self.validateForm( self ) ) {
+						// Prevent form from submit
+						e.preventDefault();
+						this.donotValidate = false;
+					} else {
+						$form.find( ':input' )
+							.each( function() {
+								self.placeholder( self, this, 'submit' );
+							} );
+					}
+				});
+			}
+
+			$form.on( 'focusout focusin', function( event ) {
+				self.placeholder( self, event.target, event.type );
+			});
+
+			$form.on( 'focusout change', self.validateField );
+
+			$form.find( 'fieldset' )
+				.on( 'change', function() {
+					self.validateField( this );
+				});
+
+			if ( !features.attributes.formnovalidate ) {
+				$form.find( ':submit[formnovalidate]' )
+					.on( 'click', function() {
+						self.donotValidate = true;
+					});
+			}
+
+			while ( flen-- ) {
+				// Assign graphical polyfills
+				self.polyfill( f[ flen ] );
+				self.autofocus( self, f[ flen ] );
+			}
+		},
+
+		/**
+		 * Apply the polyfills where applicable
+		 *
+		 * @param   Element  elem  The element to apply polyfills to
+		 *
+		 * @return  void
+		 */
+		polyfill: function( elem ) {
+			if ( elem.nodeName.toLowerCase() === 'form' ) return true;
+
+			var self = elem.form.H5Form;
+
+			self.placeholder( self, elem );
+			self.numberType( self, elem );
+		},
+
+		/**
+		 * Validate the form
+		 *
+		 * @return  boolean  True if the form is valid, False if not
+		 */
+		validateForm: function() {
+			var self = this,
+				form = self.elem,
+				f = form.elements,
+				flen = f.length,
+				isFieldValid = true,
+				i, elem;
+
+			form.isValid = true;
+
+			for ( i = 0; i < flen; i++ ) {
+				elem = f[ i ];
+				elem.isRequired = !!elem.required;
+				if (elem.isDisabled) {
+					elem.isDisabled = !!elem.disabled;
+				}
+
+				//Do Validation
+				if ( !elem.isDisabled ) {
+					isFieldValid = self.validateField( elem );
+
+					// Set focus to first invalid field
+					if ( form.isValid && !isFieldValid ) {
+						self.setFocusOn( elem );
+					}
+
+					form.isValid = isFieldValid && form.isValid;
+				}
+			}
+
+			if ( self.options.doRenderMessage ) {
+				self.renderErrorMessages( self, form );
+			}
+
+			return form.isValid;
+		},
+
+		/**
+		 * Validate a field
+		 *
+		 * @param   mixed  e  Either an Event or Element
+		 *
+		 * @return  mixed  True if the field is valid, False if not, null if the field has no form.
+		 */
+		validateField: function( e ) {
+			var elem = e.target || e,
+				isMissing = false,
+				isRequired = false,
+				isDisabled = false,
+				isPatternMismatched = false,
+				self, $elem, $labelref;
+
+			if ( elem.form === undefined ) {
+				return null;
+			}
+
+			self = elem.form.H5Form;
+			$elem = $( elem );
+			isRequired = !!$elem.attr( "required" );
+			isDisabled = !!$elem.attr( "disabled" );
+
+			if ( !elem.isDisabled ) {
+				isMissing = !features.attributes.required && isRequired && self.isValueMissing( self, elem );
+				isPatternMismatched = !features.attributes.pattern && self.matchPattern( self, elem );
+			}
+
+			elem.validityState = {
+				valueMissing: isMissing,
+				patternMismatch: isPatternMismatched,
+				valid: ( elem.isDisabled || !( isMissing || isPatternMismatched ) )
+			};
+
+			if ( !features.attributes.required ) {
+				if ( elem.validityState.valueMissing ) {
+					$elem.addClass( self.options.requiredClass );
+				} else {
+					$elem.removeClass( self.options.requiredClass );
+				}
+			}
+
+			if ( !features.attributespattern ) {
+				if ( elem.validityState.patternMismatch ) {
+					$elem.addClass( self.options.patternClass );
+				} else {
+					$elem.removeClass( self.options.patternClass );
+				}
+			}
+
+			if ( !elem.validityState.valid ) {
+				$elem.addClass( self.options.invalidClass );
+				$labelref = self.findLabel( $elem );
+				$labelref.addClass( self.options.invalidClass );
+				$labelref.attr( 'aria-invalid', 'true' );
+			} else {
+				$elem.removeClass( self.options.invalidClass );
+				$labelref = self.findLabel( $elem );
+				$labelref.removeClass( self.options.invalidClass );
+				$labelref.attr( 'aria-invalid', 'false' );
+			}
+
+			return elem.validityState.valid;
+		},
+
+		/**
+		 * Check if the field has no value
+		 *
+		 * @param   H5Form    self  This
+		 * @param   Element   elem  A field element to check
+		 *
+		 * @return  Boolean
+		 */
+		isValueMissing: function( self, elem ) {
+			var $elem = $( elem ),
+				type = elem.type !== undefined ? elem.type : elem.tagName.toLowerCase(),
+				isSpecialType = /^(checkbox|radio|fieldset)$/i.test( type ),
+				isIgnoredType = /^submit$/i.test( type ),
+				elements, i, l;
+
+			if ( isIgnoredType ) {
+				return false;
+			}
+
+			if ( !isSpecialType ) {
+				if ( $elem.val() === "" || ( !features.attributes.placeholder && $elem.hasClass( self.options.placeholderClass ) ) ) {
+					return true;
+				}
+			} else {
+				if ( type === "checkbox" ) {
+					return !$elem.is( ':checked' );
+				} else {
+					elements = ( type === "fieldset" ) ? $elem.find( 'input' ) : document.getElementsByName( elem.name );
+
+					for ( i = 0, l = elements.length; i < l; i++ ) {
+						if ( $( elements[ i ] ).is( ':checked' ) ) {
+							return false;
+						}
+					}
+
+					// Since no checkbox or radio box is checked value is missing.
+					return true;
+				}
+			}
+
+			return false;
+		},
+
+		/**
+		 * Check if a pattern is not matched
+		 *
+		 * @param   H5Form    self  This
+		 * @param   Element   elem  A field element to check
+		 *
+		 * @return  boolean   True if the pattern does not match.
+		 */
+		matchPattern: function( self, elem ) {
+			var $elem = $( elem ),
+				val = $elem.attr( 'value' ),
+				pattern = $elem.attr( 'pattern' ),
+				type = $elem.attr( 'type' ),
+				i, l;
+
+			if ( features.attributes.placeholder || !$elem.attr( 'placeholder' ) || !$elem.hasClass( self.options.placeholderClass ) ) {
+				val = $elem.attr( 'value' );
+			}
+
+			if ( val === "" ) {
+				return false;
+			}
+
+			if ( type === "email" ) {
+				if ( $elem.attr( 'multiple' ) !== undefined ) {
+					val = val.split( self.options.mutipleDelimiter );
+
+					for ( i = 0, l = val.length; i < l; i++ ) {
+						if ( !self.options.emailPatt.test( val[ i ].replace( /[ ]*/g, '' ) ) ) return true;
+					}
+				} else {
+					return !self.options.emailPatt.test( val );
+				}
+			} else if ( type === "url" ) {
+				return !self.options.urlPatt.test( val );
+			} else if ( type === 'text' ) {
+				if ( pattern !== undefined ) {
+					usrPatt = new RegExp( '^(?:' + pattern + ')$' );
+
+					return !usrPatt.test( val );
+				}
+			}
+
+			return false;
+		},
+
+		/**
+		 * Placeholder polyfill
+		 *
+		 * @param   H5Form    self   This
+		 * @param   Element   elem   A field element to fill
+		 * @param   Event     event  Event object
+		 *
+		 * @return  void
+		 */
+		placeholder: function( self, elem, event ) {
+			var $elem = $( elem ),
+				placeholder = $elem.attr( "placeholder" ),
+				expectEmpty = /^(focusin|submit)$/i.test( event ),
+				isInput = /^(input|textarea)$/i.test( elem.nodeName ),
+				isIgnored = /^password$/i.test( elem.type ),
+				isNative = features.attributes.placeholder;
+
+			if ( isNative || !isInput || isIgnored || placeholder === undefined ) {
+				return;
+			}
+
+			if ( elem.value === "" && !expectEmpty ) {
+				elem.value = placeholder;
+				$elem.addClass( self.options.placeholderClass );
+			} else if ( elem.value === placeholder && expectEmpty ) {
+				elem.value = "";
+				$elem.removeClass( self.options.placeholderClass );
+			}
+		},
+
+		/**
+		 * Polyfill for number type fields
+		 *
+		 * @param   H5Form    self   This
+		 * @param   Element   elem   A field element to replace
+		 *
+		 * @return  void
+		 */
+		numberType: function( self, elem ) {
+			var $elem = $( elem ),
+				type = $elem.attr( 'type' ),
+				isInput = /^input$/i.test( elem.nodeName ),
+				isType = /^(number|range)$/i.test( type ),
+				min, max, step, value, attributes, $select, $option, i;
+
+			if ( !isInput || !isType || ( type == "number" && features.types.number ) || ( type == "range" && features.types.range ) ) {
+				return;
+			}
+
+			min = parseInt( $elem.attr( 'min' ) );
+			max = parseInt( $elem.attr( 'max' ) );
+			step = parseInt( $elem.attr( 'step' ) );
+			value = parseInt( $elem.attr( 'value' ) );
+			attributes = $elem.prop( "attributes" );
+			$select = $( '<select>' );
+
+			min = isNaN( min ) ? -100 : min;
+
+			for ( i = min; i <= max; i += step ) {
+				$option = $( '<option value="' + i + '">' + i + '</option>' );
+
+				if ( value == i || ( value > i && value < i + step ) ) {
+					$option.attr( 'selected', '' );
+				}
+
+				$select.append( $option );
+			}
+
+			$.each( attributes, function() {
+				$select.attr( this.name, this.value );
+			});
+
+			$elem.replaceWith( $select );
+		},
+
+		/**
+		 * Autofocus polyfill
+		 *
+		 * @param   H5Form    self   This
+		 * @param   Element   elem   A field element to autofocus
+		 *
+		 * @return  void
+		 */
+		autofocus: function( self, elem ) {
+			var $elem = $( elem ),
+				doAutofocus = !!$elem.attr( "autofocus" ),
+				canFocus = /^(input|textarea|select|fieldset)$/i.test( elem.nodeName ),
+				isIgnored = /^submit$/i.test( elem.type ),
+				isNative = features.attributes.autofocus;
+
+			if ( !isNative && canFocus && !isIgnored && doAutofocus ) {
+				$(function() {
+					self.setFocusOn( elem );
+				});
+			}
+		},
+
+		/**
+		 * Find an element's label.
+		 *
+		 * @param   Element  $elem  Some kind of input element
+		 *
+		 * @return  Element  A label element
+		 */
+		findLabel: function( $elem ) {
+			var $label = $( 'label[for="' + $elem.attr( 'id' ) + '"]' ),
+				$parentElem;
+
+			if ( $label.length <= 0 ) {
+				$parentElem = $elem.parent();
+
+				if ( $parentElem.get( 0 )
+					.tagName.toLowerCase() == "label" ) {
+					$label = $parentElem;
+				}
+			}
+
+			return $label;
+		},
+
+		/**
+		 * Set focus on an element.
+		 *
+		 * @param  Element  elem  The element to focus on.
+		 */
+		setFocusOn: function( elem ) {
+			if ( elem.tagName.toLowerCase() === "fieldset" ) {
+				$( elem )
+					.find( ":first" )
+					.focus();
+			} else {
+				$( elem )
+					.focus();
+			}
+		},
+
+		/**
+		 * Renders any error messages
+		 *
+		 * @param   H5Form    self   This
+		 * @param   Element   form   A form element
+		 *
+		 * @return  void
+		 */
+		renderErrorMessages: function( self, form ) {
+			var f = form.elements,
+				flen = f.length,
+				error = {
+					errors: []
+				},
+				$elem, $label;
+
+			while ( flen-- ) {
+				$elem = $( f[ flen ] );
+				$label = self.findLabel( $elem );
+
+				if ( $elem.hasClass( self.options.requiredClass ) ) {
+					error.errors[ flen ] = $label.text()
+						.replace( "*", "" ) + self.options.requiredMessage;
+				}
+
+				if ( $elem.hasClass( self.options.patternClass ) ) {
+					error.errors[ flen ] = $label.text()
+						.replace( "*", "" ) + self.options.patternMessage;
+				}
+			}
+
+			if ( error.errors.length > 0 ) {
+				Joomla.renderMessages( error );
+			}
+		}
+	};
+
+	$.fn.h5f = function( options ) {
+		return this.each(function() {
+			Object.create( H5Form )
+				.init( options, this );
+		});
+	};
+
+	$.fn.h5f.options = {
+		invalidClass: "invalid",
+		requiredClass: "required",
+		requiredMessage: " is required.",
+		placeholderClass: "placeholder",
+		patternClass: "pattern",
+		patternMessage: " doesn't match pattern.",
+		doRenderMessage: false,
+		formValidationEvent: 'onSubmit',
+		emailPatt: /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
+		urlPatt: /[a-z][\-\.+a-z]*:\/\//i
+	};
+
+	$( function() {
+		$( 'form' )
+			.h5f({
+				doRenderMessage: true,
+				requiredClass: "musthavevalue"
+			});
+	});
+
+})( jQuery, document );
diff --git a/core/media/system/js/html5fallback.js b/core/media/system/js/html5fallback.js
new file mode 100644
index 00000000..dc38d28d
--- /dev/null
+++ b/core/media/system/js/html5fallback.js
@@ -0,0 +1 @@
+!function(a,b,c){"use strict";"function"!=typeof Object.create&&(Object.create=function(a){function b(){}return b.prototype=a,new b});var d=function(a,b){for(var c=["required","pattern","placeholder","autofocus","formnovalidate"],d=["email","url","number","range"],e={attributes:{},types:{}};b=c.pop();)e.attributes[b]=!!(b in a);for(;b=d.pop();)a.setAttribute("type",b),e.types[b]=a.type==b;return e}(b.createElement("input")),e={init:function(b,c){var d=this;d.elem=c,d.$elem=a(c),c.H5Form=d,d.options=a.extend({},a.fn.h5f.options,b),"form"===c.nodeName.toLowerCase()&&d.bindWithForm(d.elem,d.$elem)},bindWithForm:function(a,b){var i,e=this,f=!!b.attr("novalidate"),g=a.elements,h=g.length;for("onSubmit"===e.options.formValidationEvent&&b.on("submit",function(a){i=this.H5Form.donotValidate!==c&&this.H5Form.donotValidate,i||f||e.validateForm(e)?b.find(":input").each(function(){e.placeholder(e,this,"submit")}):(a.preventDefault(),this.donotValidate=!1)}),b.on("focusout focusin",function(a){e.placeholder(e,a.target,a.type)}),b.on("focusout change",e.validateField),b.find("fieldset").on("change",function(){e.validateField(this)}),d.attributes.formnovalidate||b.find(":submit[formnovalidate]").on("click",function(){e.donotValidate=!0});h--;)e.polyfill(g[h]),e.autofocus(e,g[h])},polyfill:function(a){if("form"===a.nodeName.toLowerCase())return!0;var b=a.form.H5Form;b.placeholder(b,a),b.numberType(b,a)},validateForm:function(){var f,g,a=this,b=a.elem,c=b.elements,d=c.length,e=!0;for(b.isValid=!0,f=0;f<d;f++)g=c[f],g.isRequired=!!g.required,g.isDisabled&&(g.isDisabled=!!g.disabled),g.isDisabled||(e=a.validateField(g),b.isValid&&!e&&a.setFocusOn(g),b.isValid=e&&b.isValid);return a.options.doRenderMessage&&a.renderErrorMessages(a,b),b.isValid},validateField:function(b){var j,k,l,e=b.target||b,f=!1,g=!1,h=!1,i=!1;return e.form===c?null:(j=e.form.H5Form,k=a(e),g=!!k.attr("required"),h=!!k.attr("disabled"),e.isDisabled||(f=!d.attributes.required&&g&&j.isValueMissing(j,e),i=!d.attributes.pattern&&j.matchPattern(j,e)),e.validityState={valueMissing:f,patternMismatch:i,valid:e.isDisabled||!(f||i)},d.attributes.required||(e.validityState.valueMissing?k.addClass(j.options.requiredClass):k.removeClass(j.options.requiredClass)),d.attributespattern||(e.validityState.patternMismatch?k.addClass(j.options.patternClass):k.removeClass(j.options.patternClass)),e.validityState.valid?(k.removeClass(j.options.invalidClass),l=j.findLabel(k),l.removeClass(j.options.invalidClass),l.attr("aria-invalid","false")):(k.addClass(j.options.invalidClass),l=j.findLabel(k),l.addClass(j.options.invalidClass),l.attr("aria-invalid","true")),e.validityState.valid)},isValueMissing:function(e,f){var k,l,m,g=a(f),h=f.type!==c?f.type:f.tagName.toLowerCase(),i=/^(checkbox|radio|fieldset)$/i.test(h),j=/^submit$/i.test(h);if(j)return!1;if(i){if("checkbox"===h)return!g.is(":checked");for(k="fieldset"===h?g.find("input"):b.getElementsByName(f.name),l=0,m=k.length;l<m;l++)if(a(k[l]).is(":checked"))return!1;return!0}return!(""!==g.val()&&(d.attributes.placeholder||!g.hasClass(e.options.placeholderClass)))},matchPattern:function(b,e){var j,k,f=a(e),g=f.attr("value"),h=f.attr("pattern"),i=f.attr("type");if(!d.attributes.placeholder&&f.attr("placeholder")&&f.hasClass(b.options.placeholderClass)||(g=f.attr("value")),""===g)return!1;if("email"===i){if(f.attr("multiple")===c)return!b.options.emailPatt.test(g);for(g=g.split(b.options.mutipleDelimiter),j=0,k=g.length;j<k;j++)if(!b.options.emailPatt.test(g[j].replace(/[ ]*/g,"")))return!0}else{if("url"===i)return!b.options.urlPatt.test(g);if("text"===i&&h!==c)return usrPatt=new RegExp("^(?:"+h+")$"),!usrPatt.test(g)}return!1},placeholder:function(b,e,f){var g=a(e),h=g.attr("placeholder"),i=/^(focusin|submit)$/i.test(f),j=/^(input|textarea)$/i.test(e.nodeName),k=/^password$/i.test(e.type),l=d.attributes.placeholder;l||!j||k||h===c||(""!==e.value||i?e.value===h&&i&&(e.value="",g.removeClass(b.options.placeholderClass)):(e.value=h,g.addClass(b.options.placeholderClass)))},numberType:function(b,c){var i,j,k,l,m,n,o,p,e=a(c),f=e.attr("type"),g=/^input$/i.test(c.nodeName),h=/^(number|range)$/i.test(f);if(!(!g||!h||"number"==f&&d.types.number||"range"==f&&d.types.range)){for(i=parseInt(e.attr("min")),j=parseInt(e.attr("max")),k=parseInt(e.attr("step")),l=parseInt(e.attr("value")),m=e.prop("attributes"),n=a("<select>"),i=isNaN(i)?-100:i,p=i;p<=j;p+=k)o=a('<option value="'+p+'">'+p+"</option>"),(l==p||l>p&&l<p+k)&&o.attr("selected",""),n.append(o);a.each(m,function(){n.attr(this.name,this.value)}),e.replaceWith(n)}},autofocus:function(b,c){var e=a(c),f=!!e.attr("autofocus"),g=/^(input|textarea|select|fieldset)$/i.test(c.nodeName),h=/^submit$/i.test(c.type),i=d.attributes.autofocus;!i&&g&&!h&&f&&a(function(){b.setFocusOn(c)})},findLabel:function(b){var d,c=a('label[for="'+b.attr("id")+'"]');return c.length<=0&&(d=b.parent(),"label"==d.get(0).tagName.toLowerCase()&&(c=d)),c},setFocusOn:function(b){"fieldset"===b.tagName.toLowerCase()?a(b).find(":first").focus():a(b).focus()},renderErrorMessages:function(b,c){for(var g,h,d=c.elements,e=d.length,f={errors:[]};e--;)g=a(d[e]),h=b.findLabel(g),g.hasClass(b.options.requiredClass)&&(f.errors[e]=h.text().replace("*","")+b.options.requiredMessage),g.hasClass(b.options.patternClass)&&(f.errors[e]=h.text().replace("*","")+b.options.patternMessage);f.errors.length>0&&Joomla.renderMessages(f)}};a.fn.h5f=function(a){return this.each(function(){Object.create(e).init(a,this)})},a.fn.h5f.options={invalidClass:"invalid",requiredClass:"required",requiredMessage:" is required.",placeholderClass:"placeholder",patternClass:"pattern",patternMessage:" doesn't match pattern.",doRenderMessage:!1,formValidationEvent:"onSubmit",emailPatt:/^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,urlPatt:/[a-z][\-\.+a-z]*:\/\//i},a(function(){a("form").h5f({doRenderMessage:!0,requiredClass:"musthavevalue"})})}(jQuery,document);
\ No newline at end of file
diff --git a/core/media/system/js/jquery.Jcrop.js b/core/media/system/js/jquery.Jcrop.js
new file mode 100644
index 00000000..5e2edc57
--- /dev/null
+++ b/core/media/system/js/jquery.Jcrop.js
@@ -0,0 +1,2859 @@
+/*! Jcrop.js v2.0.4 - build: 20151117
+ *  @copyright 2008-2015 Tapmodo Interactive LLC
+ *  @license Free software under MIT License
+ *  @website http://jcrop.org/
+ **/
+(function($){
+  'use strict';
+
+  // Jcrop constructor
+  var Jcrop = function(element,opt){
+    var _ua = navigator.userAgent.toLowerCase();
+
+    this.opt = $.extend({},Jcrop.defaults,opt || {});
+
+    this.container = $(element);
+
+    this.opt.is_msie = /msie/.test(_ua);
+    this.opt.is_ie_lt9 = /msie [1-8]\./.test(_ua);
+
+    this.container.addClass(this.opt.css_container);
+
+    this.ui = {};
+    this.state = null;
+    this.ui.multi = [];
+    this.ui.selection = null;
+    this.filter = {};
+
+    this.init();
+    this.setOptions(opt);
+    this.applySizeConstraints();
+    this.container.trigger('cropinit',this);
+      
+    // IE<9 doesn't work if mouse events are attached to window
+    if (this.opt.is_ie_lt9)
+      this.opt.dragEventTarget = document.body;
+  };
+
+
+  // Jcrop static functions
+  $.extend(Jcrop,{
+    component: { },
+    filter: { },
+    stage: { },
+    registerComponent: function(name,component){
+      Jcrop.component[name] = component;
+    },
+    registerFilter: function(name,filter){
+      Jcrop.filter[name] = filter;
+    },
+    registerStageType: function(name,stage){
+      Jcrop.stage[name] = stage;
+    },
+    // attach: function(element,opt){{{
+    attach: function(element,opt){
+      var obj = new $.Jcrop(element,opt);
+      return obj;
+    },
+    // }}}
+    // imgCopy: function(imgel){{{
+    imgCopy: function(imgel){
+      var img = new Image;
+      img.src = imgel.src;
+      return img;
+    },
+    // }}}
+    // imageClone: function(imgel){{{
+    imageClone: function(imgel){
+      return $.Jcrop.supportsCanvas?
+        Jcrop.canvasClone(imgel):
+        Jcrop.imgCopy(imgel);
+    },
+    // }}}
+    // canvasClone: function(imgel){{{
+    canvasClone: function(imgel){
+      var canvas = document.createElement('canvas'),
+          ctx = canvas.getContext('2d');
+
+      $(canvas).width(imgel.width).height(imgel.height),
+      canvas.width = imgel.naturalWidth;
+      canvas.height = imgel.naturalHeight;
+      ctx.drawImage(imgel,0,0,imgel.naturalWidth,imgel.naturalHeight);
+      return canvas;
+    },
+    // }}}
+    // propagate: function(plist,config,obj){{{
+    propagate: function(plist,config,obj){
+      for(var i=0,l=plist.length;i<l;i++)
+        if (config.hasOwnProperty(plist[i]))
+          obj[plist[i]] = config[plist[i]];
+    },
+    // }}}
+    // getLargestBox: function(ratio,w,h){{{
+    getLargestBox: function(ratio,w,h){
+      if ((w/h) > ratio)
+        return [ h * ratio, h ];
+          else return [ w, w / ratio ];
+    },
+    // }}}
+    // stageConstructor: function(el,options,callback){{{
+    stageConstructor: function(el,options,callback){
+
+      // Get a priority-ordered list of available stages
+      var stages = [];
+      $.each(Jcrop.stage,function(i,e){
+        stages.push(e);
+      });
+      stages.sort(function(a,b){ return a.priority - b.priority; });
+
+      // Find the first one that supports this element
+      for(var i=0,l=stages.length;i<l;i++){
+        if (stages[i].isSupported(el,options)){
+          stages[i].create(el,options,function(obj,opt){
+            if (typeof callback == 'function') callback(obj,opt);
+          });
+          break;
+        }
+      }
+    },
+    // }}}
+    // supportsColorFade: function(){{{
+    supportsColorFade: function(){
+      return $.fx.step.hasOwnProperty('backgroundColor');
+    },
+    // }}}
+    // wrapFromXywh: function(xywh){{{
+    wrapFromXywh: function(xywh){
+      var b = { x: xywh[0], y: xywh[1], w: xywh[2], h: xywh[3] };
+      b.x2 = b.x + b.w;
+      b.y2 = b.y + b.h;
+      return b;
+    }
+    // }}}
+  });
+
+var AbstractStage = function(){
+};
+
+$.extend(AbstractStage,{
+  isSupported: function(el,o){
+    // @todo: should actually check if it's an HTML element
+    return true;
+  },
+  // A higher priority means less desirable
+  // AbstractStage is the last one we want to use
+  priority: 100,
+  create: function(el,options,callback){
+    var obj = new AbstractStage;
+    obj.element = el;
+    callback.call(this,obj,options);
+  },
+  prototype: {
+    attach: function(core){
+      this.init(core);
+      core.ui.stage = this;
+    },
+    triggerEvent: function(ev){
+      $(this.element).trigger(ev);
+      return this;
+    },
+    getElement: function(){
+      return this.element;
+    }
+  }
+});
+Jcrop.registerStageType('Block',AbstractStage);
+
+
+var ImageStage = function(){
+};
+
+ImageStage.prototype = new AbstractStage();
+
+$.extend(ImageStage,{
+  isSupported: function(el,o){
+    if (el.tagName == 'IMG') return true;
+  },
+  priority: 90,
+  create: function(el,options,callback){
+    $.Jcrop.component.ImageLoader.attach(el,function(w,h){
+      var obj = new ImageStage;
+      obj.element = $(el).wrap('<div />').parent();
+
+      obj.element.width(w).height(h);
+      obj.imgsrc = el;
+
+      if (typeof callback == 'function')
+        callback.call(this,obj,options);
+    });
+  }
+});
+Jcrop.registerStageType('Image',ImageStage);
+
+
+var CanvasStage = function(){
+  this.angle = 0;
+  this.scale = 1;
+  this.scaleMin = 0.2;
+  this.scaleMax = 1.25;
+  this.offset = [0,0];
+};
+
+CanvasStage.prototype = new ImageStage();
+
+$.extend(CanvasStage,{
+  isSupported: function(el,o){
+    if ($.Jcrop.supportsCanvas && (el.tagName == 'IMG')) return true;
+  },
+  priority: 60,
+  create: function(el,options,callback){
+    var $el = $(el);
+    var opt = $.extend({},options);
+    $.Jcrop.component.ImageLoader.attach(el,function(w,h){
+      var obj = new CanvasStage;
+      $el.hide();
+      obj.createCanvas(el,w,h);
+      $el.before(obj.element);
+      obj.imgsrc = el;
+      opt.imgsrc = el;
+
+      if (typeof callback == 'function'){
+        callback(obj,opt);
+        obj.redraw();
+      }
+    });
+  }
+});
+
+$.extend(CanvasStage.prototype,{
+  init: function(core){
+    this.core = core;
+  },
+  // setOffset: function(x,y) {{{
+  setOffset: function(x,y) {
+    this.offset = [x,y];
+    return this;
+  },
+  // }}}
+  // setAngle: function(v) {{{
+  setAngle: function(v) {
+    this.angle = v;
+    return this;
+  },
+  // }}}
+  // setScale: function(v) {{{
+  setScale: function(v) {
+    this.scale = this.boundScale(v);
+    return this;
+  },
+  // }}}
+  boundScale: function(v){
+    if (v<this.scaleMin) v = this.scaleMin;
+    else if (v>this.scaleMax) v = this.scaleMax;
+    return v;
+  },
+  createCanvas: function(img,w,h){
+    this.width = w;
+    this.height = h;
+    this.canvas = document.createElement('canvas');
+    this.canvas.width = w;
+    this.canvas.height = h;
+    this.$canvas = $(this.canvas).width('100%').height('100%');
+    this.context = this.canvas.getContext('2d');
+    this.fillstyle = "rgb(0,0,0)";
+    this.element = this.$canvas.wrap('<div />').parent().width(w).height(h);
+  },
+  triggerEvent: function(ev){
+    this.$canvas.trigger(ev);
+    return this;
+  },
+  // clear: function() {{{
+  clear: function() {
+    this.context.fillStyle = this.fillstyle;
+    this.context.fillRect(0, 0, this.canvas.width, this.canvas.height);
+    return this;
+  },
+  // }}}
+  // redraw: function() {{{
+  redraw: function() {
+    // Save the current context
+    this.context.save();
+    this.clear();
+
+    // Translate to the center point of our image
+    this.context.translate(parseInt(this.width * 0.5), parseInt(this.height * 0.5));
+    // Perform the rotation and scaling
+    this.context.translate(this.offset[0]/this.core.opt.xscale,this.offset[1]/this.core.opt.yscale);
+    this.context.rotate(this.angle * (Math.PI/180));
+    this.context.scale(this.scale,this.scale);
+    // Translate back to the top left of our image
+    this.context.translate(-parseInt(this.width * 0.5), -parseInt(this.height * 0.5));
+    // Finally we draw the image
+    this.context.drawImage(this.imgsrc,0,0,this.width,this.height);
+
+    // And restore the updated context
+    this.context.restore();
+    this.$canvas.trigger('cropredraw');
+    return this;
+  },
+  // }}}
+  // setFillStyle: function(v) {{{
+  setFillStyle: function(v) {
+    this.fillstyle = v;
+    return this;
+  }
+  // }}}
+});
+
+Jcrop.registerStageType('Canvas',CanvasStage);
+
+
+  /**
+   *  BackoffFilter
+   *  move out-of-bounds selection into allowed position at same size
+   */
+  var BackoffFilter = function(){
+    this.minw = 40;
+    this.minh = 40;
+    this.maxw = 0;
+    this.maxh = 0;
+    this.core = null;
+  };
+  $.extend(BackoffFilter.prototype,{
+    tag: 'backoff',
+    priority: 22,
+    filter: function(b){
+      var r = this.bound;
+
+      if (b.x < r.minx) { b.x = r.minx; b.x2 = b.w + b.x; }
+      if (b.y < r.miny) { b.y = r.miny; b.y2 = b.h + b.y; }
+      if (b.x2 > r.maxx) { b.x2 = r.maxx; b.x = b.x2 - b.w; }
+      if (b.y2 > r.maxy) { b.y2 = r.maxy; b.y = b.y2 - b.h; }
+
+      return b;
+    },
+    refresh: function(sel){
+      this.elw = sel.core.container.width();
+      this.elh = sel.core.container.height();
+      this.bound = {
+        minx: 0 + sel.edge.w,
+        miny: 0 + sel.edge.n,
+        maxx: this.elw + sel.edge.e,
+        maxy: this.elh + sel.edge.s
+      };
+    }
+  });
+  Jcrop.registerFilter('backoff',BackoffFilter);
+
+  /**
+   *  ConstrainFilter
+   *  a filter to constrain crop selection to bounding element
+   */
+  var ConstrainFilter = function(){
+    this.core = null;
+  };
+  $.extend(ConstrainFilter.prototype,{
+    tag: 'constrain',
+    priority: 5,
+    filter: function(b,ord){
+      if (ord == 'move') {
+        if (b.x < this.minx) { b.x = this.minx; b.x2 = b.w + b.x; }
+        if (b.y < this.miny) { b.y = this.miny; b.y2 = b.h + b.y; }
+        if (b.x2 > this.maxx) { b.x2 = this.maxx; b.x = b.x2 - b.w; }
+        if (b.y2 > this.maxy) { b.y2 = this.maxy; b.y = b.y2 - b.h; }
+      } else {
+        if (b.x < this.minx) { b.x = this.minx; }
+        if (b.y < this.miny) { b.y = this.miny; }
+        if (b.x2 > this.maxx) { b.x2 = this.maxx; }
+        if (b.y2 > this.maxy) { b.y2 = this.maxy; }
+      }
+      b.w = b.x2 - b.x;
+      b.h = b.y2 - b.y;
+      return b;
+    },
+    refresh: function(sel){
+      this.elw = sel.core.container.width();
+      this.elh = sel.core.container.height();
+      this.minx = 0 + sel.edge.w;
+      this.miny = 0 + sel.edge.n;
+      this.maxx = this.elw + sel.edge.e;
+      this.maxy = this.elh + sel.edge.s;
+    }
+  });
+  Jcrop.registerFilter('constrain',ConstrainFilter);
+
+  /**
+   *  ExtentFilter
+   *  a filter to implement minimum or maximum size
+   */
+  var ExtentFilter = function(){
+    this.core = null;
+  };
+  $.extend(ExtentFilter.prototype,{
+    tag: 'extent',
+    priority: 12,
+    offsetFromCorner: function(corner,box,b){
+      var w = box[0], h = box[1];
+      switch(corner){
+        case 'bl': return [ b.x2 - w, b.y, w, h ];
+        case 'tl': return [ b.x2 - w , b.y2 - h, w, h ];
+        case 'br': return [ b.x, b.y, w, h ];
+        case 'tr': return [ b.x, b.y2 - h, w, h ];
+      }
+    },
+    getQuadrant: function(s){
+      var relx = s.opposite[0]-s.offsetx
+      var rely = s.opposite[1]-s.offsety;
+
+      if ((relx < 0) && (rely < 0)) return 'br';
+        else if ((relx >= 0) && (rely >= 0)) return 'tl';
+        else if ((relx < 0) && (rely >= 0)) return 'tr';
+        return 'bl';
+    },
+    filter: function(b,ord,sel){
+
+      if (ord == 'move') return b;
+
+      var w = b.w, h = b.h, st = sel.state, r = this.limits;
+      var quad = st? this.getQuadrant(st): 'br';
+
+      if (r.minw && (w < r.minw)) w = r.minw;
+      if (r.minh && (h < r.minh)) h = r.minh;
+      if (r.maxw && (w > r.maxw)) w = r.maxw;
+      if (r.maxh && (h > r.maxh)) h = r.maxh;
+
+      if ((w == b.w) && (h == b.h)) return b;
+
+      return Jcrop.wrapFromXywh(this.offsetFromCorner(quad,[w,h],b));
+    },
+    refresh: function(sel){
+      this.elw = sel.core.container.width();
+      this.elh = sel.core.container.height();
+
+      this.limits = {
+        minw: sel.minSize[0],
+        minh: sel.minSize[1],
+        maxw: sel.maxSize[0],
+        maxh: sel.maxSize[1]
+      };
+    }
+  });
+  Jcrop.registerFilter('extent',ExtentFilter);
+
+
+  /**
+   *  GridFilter
+   *  a rudimentary grid effect
+   */
+  var GridFilter = function(){
+    this.stepx = 1;
+    this.stepy = 1;
+    this.core = null;
+  };
+  $.extend(GridFilter.prototype,{
+    tag: 'grid',
+    priority: 19,
+    filter: function(b){
+      
+      var n = {
+        x: Math.round(b.x / this.stepx) * this.stepx,
+        y: Math.round(b.y / this.stepy) * this.stepy,
+        x2: Math.round(b.x2 / this.stepx) * this.stepx,
+        y2: Math.round(b.y2 / this.stepy) * this.stepy
+      };
+      
+      n.w = n.x2 - n.x;
+      n.h = n.y2 - n.y;
+
+      return n;
+    }
+  });
+  Jcrop.registerFilter('grid',GridFilter);
+
+
+  /**
+   *  RatioFilter
+   *  implements aspectRatio locking
+   */
+  var RatioFilter = function(){
+    this.ratio = 0;
+    this.core = null;
+  };
+  $.extend(RatioFilter.prototype,{
+    tag: 'ratio',
+    priority: 15,
+    offsetFromCorner: function(corner,box,b){
+      var w = box[0], h = box[1];
+      switch(corner){
+        case 'bl': return [ b.x2 - w, b.y, w, h ];
+        case 'tl': return [ b.x2 - w , b.y2 - h, w, h ];
+        case 'br': return [ b.x, b.y, w, h ];
+        case 'tr': return [ b.x, b.y2 - h, w, h ];
+      }
+    },
+    getBoundRatio: function(b,quad){
+      var box = Jcrop.getLargestBox(this.ratio,b.w,b.h);
+      return Jcrop.wrapFromXywh(this.offsetFromCorner(quad,box,b));
+    },
+    getQuadrant: function(s){
+      var relx = s.opposite[0]-s.offsetx
+      var rely = s.opposite[1]-s.offsety;
+
+      if ((relx < 0) && (rely < 0)) return 'br';
+        else if ((relx >= 0) && (rely >= 0)) return 'tl';
+        else if ((relx < 0) && (rely >= 0)) return 'tr';
+        return 'bl';
+    },
+    filter: function(b,ord,sel){
+
+      if (!this.ratio) return b;
+
+      var rt = b.w / b.h;
+      var st = sel.state;
+
+      var quad = st? this.getQuadrant(st): 'br';
+      ord = ord || 'se';
+
+      if (ord == 'move') return b;
+
+      switch(ord) {
+        case 'n':
+          b.x2 = this.elw;
+          b.w = b.x2 - b.x;
+          quad = 'tr';
+          break;
+        case 's':
+          b.x2 = this.elw;
+          b.w = b.x2 - b.x;
+          quad = 'br';
+          break;
+        case 'e':
+          b.y2 = this.elh;
+          b.h = b.y2 - b.y;
+          quad = 'br';
+          break;
+        case 'w':
+          b.y2 = this.elh;
+          b.h = b.y2 - b.y;
+          quad = 'bl';
+          break;
+      }
+
+      return this.getBoundRatio(b,quad);
+    },
+    refresh: function(sel){
+      this.ratio = sel.aspectRatio;
+      this.elw = sel.core.container.width();
+      this.elh = sel.core.container.height();
+    }
+  });
+  Jcrop.registerFilter('ratio',RatioFilter);
+
+
+  /**
+   *  RoundFilter
+   *  rounds coordinate values to integers
+   */
+  var RoundFilter = function(){
+    this.core = null;
+  };
+  $.extend(RoundFilter.prototype,{
+    tag: 'round',
+    priority: 90,
+    filter: function(b){
+      
+      var n = {
+        x: Math.round(b.x),
+        y: Math.round(b.y),
+        x2: Math.round(b.x2),
+        y2: Math.round(b.y2)
+      };
+      
+      n.w = n.x2 - n.x;
+      n.h = n.y2 - n.y;
+
+      return n;
+    }
+  });
+  Jcrop.registerFilter('round',RoundFilter);
+
+
+  /**
+   *  ShadeFilter
+   *  A filter that implements div-based shading on any element
+   *
+   *  The shading you see is actually four semi-opaque divs
+   *  positioned inside the container, around the selection
+   */
+  var ShadeFilter = function(opacity,color){
+    this.color = color || 'black';
+    this.opacity = opacity || 0.5;
+    this.core = null;
+    this.shades = {};
+  };
+  $.extend(ShadeFilter.prototype,{
+    tag: 'shader',
+    fade: true,
+    fadeEasing: 'swing',
+    fadeSpeed: 320,
+    priority: 95,
+    init: function(){
+      var t = this;
+
+      if (!t.attached) {
+        t.visible = false;
+
+        t.container = $('<div />').addClass(t.core.opt.css_shades)
+          .prependTo(this.core.container).hide();
+
+        t.elh = this.core.container.height();
+        t.elw = this.core.container.width();
+
+        t.shades = {
+          top: t.createShade(),
+          right: t.createShade(),
+          left: t.createShade(),
+          bottom: t.createShade()
+        };
+
+        t.attached = true;
+      }
+    },
+    destroy: function(){
+      this.container.remove();
+    },
+    setColor: function(color,instant){
+      var t = this;
+
+      if (color == t.color) return t;
+
+      this.color = color;
+      var colorfade = Jcrop.supportsColorFade();
+      $.each(t.shades,function(u,i){
+        if (!t.fade || instant || !colorfade) i.css('backgroundColor',color);
+          else i.animate({backgroundColor:color},{queue:false,duration:t.fadeSpeed,easing:t.fadeEasing});
+      });
+      return t;
+    },
+    setOpacity: function(opacity,instant){
+      var t = this;
+
+      if (opacity == t.opacity) return t;
+
+      t.opacity = opacity;
+      $.each(t.shades,function(u,i){
+        if (!t.fade || instant) i.css({opacity:opacity});
+          else i.animate({opacity:opacity},{queue:false,duration:t.fadeSpeed,easing:t.fadeEasing});
+      });
+      return t;
+    },
+    createShade: function(){
+      return $('<div />').css({
+        position: 'absolute',
+        backgroundColor: this.color,
+        opacity: this.opacity
+      }).appendTo(this.container);
+    },
+    refresh: function(sel){
+      var m = this.core, s = this.shades;
+
+      this.setColor(sel.bgColor?sel.bgColor:this.core.opt.bgColor);
+      this.setOpacity(sel.bgOpacity?sel.bgOpacity:this.core.opt.bgOpacity);
+        
+      this.elh = m.container.height();
+      this.elw = m.container.width();
+      s.right.css('height',this.elh+'px');
+      s.left.css('height',this.elh+'px');
+    },
+    filter: function(b,ord,sel){
+
+      if (!sel.active) return b;
+
+      var t = this,
+        s = t.shades;
+      
+      s.top.css({
+        left: Math.round(b.x)+'px',
+        width: Math.round(b.w)+'px',
+        height: Math.round(b.y)+'px'
+      });
+      s.bottom.css({
+        top: Math.round(b.y2)+'px',
+        left: Math.round(b.x)+'px',
+        width: Math.round(b.w)+'px',
+        height: (t.elh-Math.round(b.y2))+'px'
+      });
+      s.right.css({
+        left: Math.round(b.x2)+'px',
+        width: (t.elw-Math.round(b.x2))+'px'
+      });
+      s.left.css({
+        width: Math.round(b.x)+'px'
+      });
+
+      if (!t.visible) {
+        t.container.show();
+        t.visible = true;
+      }
+
+      return b;
+    }
+  });
+  Jcrop.registerFilter('shader',ShadeFilter);
+  
+
+  /**
+   *  CanvasAnimator
+   *  manages smooth cropping animation
+   *
+   *  This object is called internally to manage animation.
+   *  An in-memory div is animated and a progress callback
+   *  is used to update the selection coordinates of the
+   *  visible selection in realtime.
+   */
+  var CanvasAnimator = function(stage){
+    this.stage = stage;
+    this.core = stage.core;
+    this.cloneStagePosition();
+  };
+
+  CanvasAnimator.prototype = {
+
+    cloneStagePosition: function(){
+      var s = this.stage;
+      this.angle = s.angle;
+      this.scale = s.scale;
+      this.offset = s.offset;
+    },
+
+    getElement: function(){
+      var s = this.stage;
+
+      return $('<div />')
+        .css({
+          position: 'absolute',
+          top: s.offset[0]+'px',
+          left: s.offset[1]+'px',
+          width: s.angle+'px',
+          height: s.scale+'px'
+        });
+    },
+
+    animate: function(cb){
+      var t = this;
+
+      this.scale = this.stage.boundScale(this.scale);
+      t.stage.triggerEvent('croprotstart');
+
+      t.getElement().animate({
+        top: t.offset[0]+'px',
+        left: t.offset[1]+'px',
+        width: t.angle+'px',
+        height: t.scale+'px'
+      },{
+        easing: t.core.opt.animEasing,
+        duration: t.core.opt.animDuration,
+        complete: function(){
+          t.stage.triggerEvent('croprotend');
+          (typeof cb == 'function') && cb.call(this);
+        },
+        progress: function(anim){
+          var props = {}, i, tw = anim.tweens;
+
+          for(i=0;i<tw.length;i++){
+            props[tw[i].prop] = tw[i].now; }
+
+          t.stage.setAngle(props.width)
+            .setScale(props.height)
+            .setOffset(props.top,props.left)
+            .redraw();
+        }
+      });
+    }
+
+  };
+  Jcrop.stage.Canvas.prototype.getAnimator = function(){
+    return new CanvasAnimator(this);
+  };
+  Jcrop.registerComponent('CanvasAnimator',CanvasAnimator);
+
+
+  /**
+   *  CropAnimator
+   *  manages smooth cropping animation
+   *
+   *  This object is called internally to manage animation.
+   *  An in-memory div is animated and a progress callback
+   *  is used to update the selection coordinates of the
+   *  visible selection in realtime.
+   */
+  // var CropAnimator = function(selection){{{
+  var CropAnimator = function(selection){
+    this.selection = selection;
+    this.core = selection.core;
+  };
+  // }}}
+
+  CropAnimator.prototype = {
+
+    getElement: function(){
+      var b = this.selection.get();
+
+      return $('<div />')
+        .css({
+          position: 'absolute',
+          top: b.y+'px',
+          left: b.x+'px',
+          width: b.w+'px',
+          height: b.h+'px'
+        });
+    },
+
+    animate: function(x,y,w,h,cb){
+      var t = this;
+
+      t.selection.allowResize(false);
+
+      t.getElement().animate({
+        top: y+'px',
+        left: x+'px',
+        width: w+'px',
+        height: h+'px'
+      },{
+        easing: t.core.opt.animEasing,
+        duration: t.core.opt.animDuration,
+        complete: function(){
+          t.selection.allowResize(true);
+          cb && cb.call(this);
+        },
+        progress: function(anim){
+          var props = {}, i, tw = anim.tweens;
+
+          for(i=0;i<tw.length;i++){
+            props[tw[i].prop] = tw[i].now; }
+
+          var b = {
+            x: parseInt(props.left),
+            y: parseInt(props.top),
+            w: parseInt(props.width),
+            h: parseInt(props.height)
+          };
+
+          b.x2 = b.x + b.w;
+          b.y2 = b.y + b.h;
+
+          t.selection.updateRaw(b,'se');
+        }
+      });
+    }
+
+  };
+  Jcrop.registerComponent('Animator',CropAnimator);
+
+
+  /**
+   *  DragState
+   *  an object that handles dragging events
+   *
+   *  This object is used by the built-in selection object to
+   *  track a dragging operation on a selection
+   */
+  // var DragState = function(e,selection,ord){{{
+  var DragState = function(e,selection,ord){
+    var t = this;
+
+    t.x = e.pageX;
+    t.y = e.pageY;
+
+    t.selection = selection;
+    t.eventTarget = selection.core.opt.dragEventTarget;
+    t.orig = selection.get();
+
+    selection.callFilterFunction('refresh');
+
+    var p = selection.core.container.position();
+    t.elx = p.left;
+    t.ely = p.top;
+
+    t.offsetx = 0;
+    t.offsety = 0;
+    t.ord = ord;
+    t.opposite = t.getOppositeCornerOffset();
+
+    t.initEvents(e);
+
+  };
+  // }}}
+
+  DragState.prototype = {
+    // getOppositeCornerOffset: function(){{{
+    // Calculate relative offset of locked corner
+    getOppositeCornerOffset: function(){
+
+      var o = this.orig;
+      var relx = this.x - this.elx - o.x;
+      var rely = this.y - this.ely - o.y;
+
+      switch(this.ord){
+        case 'nw':
+        case 'w':
+          return [ o.w - relx, o.h - rely ];
+          return [ o.x + o.w, o.y + o.h ];
+
+        case 'sw':
+          return [ o.w - relx, -rely ];
+          return [ o.x + o.w, o.y ];
+
+        case 'se':
+        case 's':
+        case 'e':
+          return [ -relx, -rely ];
+          return [ o.x, o.y ];
+
+        case 'ne':
+        case 'n':
+          return [ -relx, o.h - rely ];
+          return [ o.w, o.y + o.h ];
+      }
+
+      return [ null, null ];
+    },
+    // }}}
+    // initEvents: function(e){{{
+    initEvents: function(e){
+      $(this.eventTarget)
+        .on('mousemove.jcrop',this.createDragHandler())
+        .on('mouseup.jcrop',this.createStopHandler());
+    },
+    // }}}
+    // dragEvent: function(e){{{
+    dragEvent: function(e){
+      this.offsetx = e.pageX - this.x;
+      this.offsety = e.pageY - this.y;
+      this.selection.updateRaw(this.getBox(),this.ord);
+    },
+    // }}}
+    // endDragEvent: function(e){{{
+    endDragEvent: function(e){
+      var sel = this.selection;
+      sel.core.container.removeClass('jcrop-dragging');
+      sel.element.trigger('cropend',[sel,sel.core.unscale(sel.get())]);
+      sel.focus();
+    },
+    // }}}
+    // createStopHandler: function(){{{
+    createStopHandler: function(){
+      var t = this;
+      return function(e){
+        $(t.eventTarget).off('.jcrop');
+        t.endDragEvent(e);
+        return false;
+      };
+    },
+    // }}}
+    // createDragHandler: function(){{{
+    createDragHandler: function(){
+      var t = this;
+      return function(e){
+        t.dragEvent(e);
+        return false;
+      };
+    },
+    // }}}
+    //update: function(x,y){{{
+    update: function(x,y){
+      var t = this;
+      t.offsetx = x - t.x;
+      t.offsety = y - t.y;
+    },
+    //}}}
+    //resultWrap: function(d){{{
+    resultWrap: function(d){
+      var b = {
+          x: Math.min(d[0],d[2]),
+          y: Math.min(d[1],d[3]),
+          x2: Math.max(d[0],d[2]),
+          y2: Math.max(d[1],d[3])
+        };
+
+      b.w = b.x2 - b.x;
+      b.h = b.y2 - b.y;
+
+      return b;
+    },
+    //}}}
+    //getBox: function(){{{
+    getBox: function(){
+      var t = this;
+      var o = t.orig;
+      var _c = { x2: o.x + o.w, y2: o.y + o.h };
+      switch(t.ord){
+        case 'n': return t.resultWrap([ o.x, t.offsety + o.y, _c.x2, _c.y2 ]);
+        case 's': return t.resultWrap([ o.x, o.y, _c.x2, t.offsety + _c.y2 ]);
+        case 'e': return t.resultWrap([ o.x, o.y, t.offsetx + _c.x2, _c.y2 ]);
+        case 'w': return t.resultWrap([ o.x + t.offsetx, o.y, _c.x2, _c.y2 ]);
+        case 'sw': return t.resultWrap([ t.offsetx + o.x, o.y, _c.x2, t.offsety + _c.y2 ]);
+        case 'se': return t.resultWrap([ o.x, o.y, t.offsetx + _c.x2, t.offsety + _c.y2 ]);
+        case 'ne': return t.resultWrap([ o.x, t.offsety + o.y, t.offsetx + _c.x2, _c.y2 ]);
+        case 'nw': return t.resultWrap([ t.offsetx + o.x, t.offsety + o.y, _c.x2, _c.y2 ]);
+        case 'move':
+          _c.nx = o.x + t.offsetx;
+          _c.ny = o.y + t.offsety;
+          return t.resultWrap([ _c.nx, _c.ny, _c.nx + o.w, _c.ny + o.h ]);
+      }
+    }
+    //}}}
+  };
+  Jcrop.registerComponent('DragState',DragState);
+
+
+  /**
+   *  EventManager
+   *  provides internal event support
+   */
+  var EventManager = function(core){
+    this.core = core;
+  };
+  EventManager.prototype = {
+      on: function(n,cb){ $(this).on(n,cb); },
+      off: function(n){ $(this).off(n); },
+      trigger: function(n){ $(this).trigger(n); }
+  };
+  Jcrop.registerComponent('EventManager',EventManager);
+
+
+  /**
+   * Image Loader
+   * Reliably pre-loads images
+   */
+  // var ImageLoader = function(src,element,cb){{{
+  var ImageLoader = function(src,element,cb){
+    this.src = src;
+    if (!element) element = new Image;
+    this.element = element;
+    this.callback = cb;
+    this.load();
+  };
+  // }}}
+
+  $.extend(ImageLoader,{
+    // attach: function(el,cb){{{
+    attach: function(el,cb){
+      return new ImageLoader(el.src,el,cb);
+    },
+    // }}}
+    // prototype: {{{
+    prototype: {
+      getDimensions: function(){
+        var el = this.element;
+
+        if (el.naturalWidth)
+          return [ el.naturalWidth, el. naturalHeight ];
+
+        if (el.width)
+          return [ el.width, el.height ];
+
+        return null;
+      },
+      fireCallback: function(){
+        this.element.onload = null;
+        if (typeof this.callback == 'function')
+          this.callback.apply(this,this.getDimensions());
+      },
+      isLoaded: function(){
+        return this.element.complete;
+      },
+      load: function(){
+        var t = this;
+        var el = t.element;
+
+        el.src = t.src;
+
+        if (t.isLoaded()) t.fireCallback();
+          else t.element.onload = function(e){
+            t.fireCallback();
+          };
+      }
+    }
+    // }}}
+  });
+  Jcrop.registerComponent('ImageLoader',ImageLoader);
+
+
+  /**
+   * JcropTouch
+   * Detects and enables mobile touch support
+   */
+  // var JcropTouch = function(core){{{
+  var JcropTouch = function(core){
+    this.core = core;
+    this.init();
+  };
+  // }}}
+
+  $.extend(JcropTouch,{
+    // support: function(){{{
+    support: function(){
+      if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch)
+        return true;
+    },
+    // }}}
+    prototype: {
+      // init: function(){{{
+      init: function(){
+        var t = this,
+          p = $.Jcrop.component.DragState.prototype;
+
+        // A bit of an ugly hack to make sure we modify prototype
+        // only once, store a key on the prototype
+        if (!p.touch) {
+          t.initEvents();
+          t.shimDragState();
+          t.shimStageDrag();
+          p.touch = true;
+        }
+      },
+      // }}}
+      // shimDragState: function(){{{
+      shimDragState: function(){
+        var t = this;
+        $.Jcrop.component.DragState.prototype.initEvents = function(e){
+          
+          // Attach subsequent drag event handlers based on initial
+          // event type - avoids collecting "pseudo-mouse" events
+          // generated by some mobile browsers in some circumstances
+          if (e.type.substr(0,5) == 'touch') {
+
+            $(this.eventTarget)
+              .on('touchmove.jcrop.jcrop-touch',t.dragWrap(this.createDragHandler()))
+              .on('touchend.jcrop.jcrop-touch',this.createStopHandler());
+
+          }
+          
+          // For other events, use the mouse handlers that
+          // the default DragState.initEvents() method sets...
+          else {
+
+            $(this.eventTarget)
+              .on('mousemove.jcrop',this.createDragHandler())
+              .on('mouseup.jcrop',this.createStopHandler());
+
+          }
+
+        };
+      },
+      // }}}
+      // shimStageDrag: function(){{{
+      shimStageDrag: function(){
+        this.core.container
+          .addClass('jcrop-touch')
+          .on('touchstart.jcrop.jcrop-stage',this.dragWrap(this.core.ui.manager.startDragHandler()));
+      },
+      // }}}
+      // dragWrap: function(cb){{{
+      dragWrap: function(cb){
+        return function(e){
+          e.preventDefault();
+          e.stopPropagation();
+          if (e.type.substr(0,5) == 'touch') {
+            e.pageX = e.originalEvent.changedTouches[0].pageX;
+            e.pageY = e.originalEvent.changedTouches[0].pageY;
+            return cb(e);
+          }
+          return false;
+        };
+      },
+      // }}}
+      // initEvents: function(){{{
+      initEvents: function(){
+        var t = this, c = t.core;
+
+        c.container.on(
+          'touchstart.jcrop.jcrop-touch',
+          '.'+c.opt.css_drag,
+          t.dragWrap(c.startDrag())
+        );
+      }
+      // }}}
+    }
+  });
+  Jcrop.registerComponent('Touch',JcropTouch);
+
+
+  /**
+   *  KeyWatcher
+   *  provides keyboard support
+   */
+  // var KeyWatcher = function(core){{{
+  var KeyWatcher = function(core){
+    this.core = core;
+    this.init();
+  };
+  // }}}
+  $.extend(KeyWatcher,{
+    // defaults: {{{
+    defaults: {
+      eventName: 'keydown.jcrop',
+      passthru: [ 9 ],
+      debug: false
+    },
+    // }}}
+    prototype: {
+      // init: function(){{{
+      init: function(){
+        $.extend(this,KeyWatcher.defaults);
+        this.enable();
+      },
+      // }}}
+      // disable: function(){{{
+      disable: function(){
+        this.core.container.off(this.eventName);
+      },
+      // }}}
+      // enable: function(){{{
+      enable: function(){
+        var t = this, m = t.core;
+        m.container.on(t.eventName,function(e){
+          var nudge = e.shiftKey? 16: 2;
+
+          if ($.inArray(e.keyCode,t.passthru) >= 0)
+            return true;
+
+          switch(e.keyCode){
+            case 37: m.nudge(-nudge,0); break;
+            case 38: m.nudge(0,-nudge); break;
+            case 39: m.nudge(nudge,0); break;
+            case 40: m.nudge(0,nudge); break;
+
+            case 46:
+            case 8:
+              m.requestDelete();
+              return false;
+              break;
+
+            default:
+              if (t.debug) console.log('keycode: ' + e.keyCode);
+              break;
+          }
+
+          if (!e.metaKey && !e.ctrlKey)
+            e.preventDefault();
+        });
+      }
+      // }}}
+    }
+  });
+  Jcrop.registerComponent('Keyboard',KeyWatcher);
+
+
+  /**
+   * Selection
+   * Built-in selection object
+   */
+  var Selection = function(){};
+
+  $.extend(Selection,{
+    // defaults: {{{
+    defaults: {
+      minSize: [ 8, 8 ],
+      maxSize: [ 0, 0 ],
+      aspectRatio: 0,
+      edge: { n: 0, s: 0, e: 0, w: 0 },
+      bgColor: null,
+      bgOpacity: null,
+      last: null,
+
+      state: null,
+      active: true,
+      linked: true,
+      canDelete: true,
+      canDrag: true,
+      canResize: true,
+      canSelect: true
+    },
+    // }}}
+    prototype: {
+      // init: function(core){{{
+      init: function(core){
+        this.core = core;
+        this.startup();
+        this.linked = this.core.opt.linked;
+        this.attach();
+        this.setOptions(this.core.opt);
+        core.container.trigger('cropcreate',[this]);
+      },
+      // }}}
+      // attach: function(){{{
+      attach: function(){
+        // For extending init() sequence
+      },
+      // }}}
+      // startup: function(){{{
+      startup: function(){
+        var t = this, o = t.core.opt;
+        $.extend(t,Selection.defaults);
+        t.filter = t.core.getDefaultFilters();
+
+        t.element = $('<div />').addClass(o.css_selection).data({ selection: t });
+        t.frame = $('<button />').addClass(o.css_button).data('ord','move').attr('type','button');
+        t.element.append(t.frame).appendTo(t.core.container);
+
+        // IE background/draggable hack
+        if (t.core.opt.is_msie) t.frame.css({
+          opacity: 0,
+          backgroundColor: 'white'
+        });
+
+        t.insertElements();
+
+        // Bind focus and blur events for this selection
+        t.frame.on('focus.jcrop',function(e){
+          t.core.setSelection(t);
+          t.element.trigger('cropfocus',t);
+          t.element.addClass('jcrop-focus');
+        }).on('blur.jcrop',function(e){
+          t.element.removeClass('jcrop-focus');
+          t.element.trigger('cropblur',t);
+        });
+      },
+      // }}}
+      // propagate: [{{{
+      propagate: [
+        'canDelete', 'canDrag', 'canResize', 'canSelect',
+        'minSize', 'maxSize', 'aspectRatio', 'edge'
+      ],
+      // }}}
+      // setOptions: function(opt){{{
+      setOptions: function(opt){
+        Jcrop.propagate(this.propagate,opt,this);
+        this.refresh();
+        return this;
+      },
+      // }}}
+      // refresh: function(){{{
+      refresh: function(){
+        this.allowResize();
+        this.allowDrag();
+        this.allowSelect();
+        this.callFilterFunction('refresh');
+        this.updateRaw(this.get(),'se');
+      },
+      // }}}
+      // callFilterFunction: function(f,args){{{
+      callFilterFunction: function(f,args){
+        for(var i=0;i<this.filter.length;i++)
+          if (this.filter[i][f]) this.filter[i][f](this);
+        return this;
+      },
+      // }}}
+      //addFilter: function(filter){{{
+      addFilter: function(filter){
+        filter.core = this.core;
+        if (!this.hasFilter(filter)) {
+          this.filter.push(filter);
+          this.sortFilters();
+          if (filter.init) filter.init();
+          this.refresh();
+        }
+      },
+      //}}}
+      // hasFilter: function(filter){{{
+      hasFilter: function(filter){
+        var i, f = this.filter, n = [];
+        for(i=0;i<f.length;i++) if (f[i] === filter) return true;
+      },
+      // }}}
+      // sortFilters: function(){{{
+      sortFilters: function(){
+        this.filter.sort(
+          function(x,y){ return x.priority - y.priority; }
+        );
+      },
+      // }}}
+      //clearFilters: function(){{{
+      clearFilters: function(){
+        var i, f = this.filter;
+
+        for(var i=0;i<f.length;i++)
+          if (f[i].destroy) f[i].destroy();
+
+        this.filter = [];
+      },
+      //}}}
+      // removeFiltersByTag: function(tag){{{
+      removeFilter: function(tag){
+        var i, f = this.filter, n = [];
+
+        for(var i=0;i<f.length;i++)
+          if ((f[i].tag && (f[i].tag == tag)) || (tag === f[i])){
+            if (f[i].destroy) f[i].destroy();
+          }
+          else n.push(f[i]);
+
+        this.filter = n;
+      },
+      // }}}
+      // runFilters: function(b,ord){{{
+      runFilters: function(b,ord){
+        for(var i=0;i<this.filter.length;i++)
+          b = this.filter[i].filter(b,ord,this);
+        return b;
+      },
+      // }}}
+      //endDrag: function(){{{
+      endDrag: function(){
+        if (this.state) {
+          $(document.body).off('.jcrop');
+          this.focus();
+          this.state = null;
+        }
+      },
+      //}}}
+      // startDrag: function(e,ord){{{
+      startDrag: function(e,ord){
+        var t = this;
+        var m = t.core;
+
+        ord = ord || $(e.target).data('ord');
+
+        this.focus();
+
+        if ((ord == 'move') && t.element.hasClass(t.core.opt.css_nodrag))
+          return false;
+
+        this.state = new Jcrop.component.DragState(e,this,ord);
+        return false;
+      },
+      // }}}
+      // allowSelect: function(v){{{
+      allowSelect: function(v){
+        if (v === undefined) v = this.canSelect;
+
+        if (v && this.canSelect) this.frame.attr('disabled',false);
+          else this.frame.attr('disabled','disabled');
+
+        return this;
+      },
+      // }}}
+      // allowDrag: function(v){{{
+      allowDrag: function(v){
+        var t = this, o = t.core.opt;
+        if (v == undefined) v = t.canDrag;
+
+        if (v && t.canDrag) t.element.removeClass(o.css_nodrag);
+          else t.element.addClass(o.css_nodrag);
+
+        return this;
+      },
+      // }}}
+      // allowResize: function(v){{{
+      allowResize: function(v){
+        var t = this, o = t.core.opt;
+        if (v == undefined) v = t.canResize;
+
+        if (v && t.canResize) t.element.removeClass(o.css_noresize);
+          else t.element.addClass(o.css_noresize);
+
+        return this;
+      },
+      // }}}
+      // remove: function(){{{
+      remove: function(){
+        this.element.trigger('cropremove',this);
+        this.element.remove();
+      },
+      // }}}
+      // toBack: function(){{{
+      toBack: function(){
+        this.active = false;
+        this.element.removeClass('jcrop-current jcrop-focus');
+      },
+      // }}}
+      // toFront: function(){{{
+      toFront: function(){
+        this.active = true;
+        this.element.addClass('jcrop-current');
+        this.callFilterFunction('refresh');
+        this.refresh();
+      },
+      // }}}
+      // redraw: function(b){{{
+      redraw: function(b){
+        this.moveTo(b.x,b.y);
+        this.resize(b.w,b.h);
+        this.last = b;
+        return this;
+      },
+      // }}}
+      // update: function(b,ord){{{
+      update: function(b,ord){
+        return this.updateRaw(this.core.scale(b),ord);
+      },
+      // }}}
+      // update: function(b,ord){{{
+      updateRaw: function(b,ord){
+        b = this.runFilters(b,ord);
+        this.redraw(b);
+        this.element.trigger('cropmove',[this,this.core.unscale(b)]);
+        return this;
+      },
+      // }}}
+      // animateTo: function(box,cb){{{
+      animateTo: function(box,cb){
+        var ca = new Jcrop.component.Animator(this),
+            b = this.core.scale(Jcrop.wrapFromXywh(box));
+
+        ca.animate(b.x,b.y,b.w,b.h,cb);
+      },
+      // }}}
+      // center: function(instant){{{
+      center: function(instant){
+        var b = this.get(), m = this.core;
+        var elw = m.container.width(), elh = m.container.height();
+        var box = [ (elw-b.w)/2, (elh-b.h)/2, b.w, b.h ];
+        return this[instant?'setSelect':'animateTo'](box);
+      },
+      // }}}
+      //createElement: function(type,ord){{{
+      createElement: function(type,ord){
+        return $('<div />').addClass(type+' ord-'+ord).data('ord',ord);
+      },
+      //}}}
+      //moveTo: function(x,y){{{
+      moveTo: function(x,y){
+        this.element.css({top: y+'px', left: x+'px'});
+      },
+      //}}}
+      // blur: function(){{{
+      blur: function(){
+        this.element.blur();
+        return this;
+      },
+      // }}}
+      // focus: function(){{{
+      focus: function(){
+        this.core.setSelection(this);
+        this.frame.focus();
+        return this;
+      },
+      // }}}
+      //resize: function(w,h){{{
+      resize: function(w,h){
+        this.element.css({width: w+'px', height: h+'px'});
+      },
+      //}}}
+      //get: function(){{{
+      get: function(){
+        var b = this.element,
+          o = b.position(),
+          w = b.width(),
+          h = b.height(),
+          rv = { x: o.left, y: o.top };
+
+        rv.x2 = rv.x + w;
+        rv.y2 = rv.y + h;
+        rv.w = w;
+        rv.h = h;
+
+        return rv;
+      },
+      //}}}
+      //insertElements: function(){{{
+      insertElements: function(){
+        var t = this, i,
+          m = t.core,
+          fr = t.element,
+          o = t.core.opt,
+          b = o.borders,
+          h = o.handles,
+          d = o.dragbars;
+
+        for(i=0; i<d.length; i++)
+          fr.append(t.createElement(o.css_dragbars,d[i]));
+
+        for(i=0; i<h.length; i++)
+          fr.append(t.createElement(o.css_handles,h[i]));
+
+        for(i=0; i<b.length; i++)
+          fr.append(t.createElement(o.css_borders,b[i]));
+      }
+      //}}}
+    }
+  });
+  Jcrop.registerComponent('Selection',Selection);
+
+
+  /**
+   * StageDrag
+   * Facilitates dragging
+   */
+  // var StageDrag = function(manager,opt){{{
+  var StageDrag = function(manager,opt){
+    $.extend(this,StageDrag.defaults,opt || {});
+    this.manager = manager;
+    this.core = manager.core;
+  };
+  // }}}
+  // StageDrag.defaults = {{{
+  StageDrag.defaults = {
+    offset: [ -8, -8 ],
+    active: true,
+    minsize: [ 20, 20 ]
+  };
+  // }}}
+
+  $.extend(StageDrag.prototype,{
+    // start: function(e){{{
+    start: function(e){
+      var c = this.core;
+
+      // Do nothing if allowSelect is off
+      if (!c.opt.allowSelect) return;
+
+      // Also do nothing if we can't draw any more selections
+      if (c.opt.multi && c.opt.multiMax && (c.ui.multi.length >= c.opt.multiMax)) return false;
+
+      // calculate a few variables for this drag operation
+      var o = $(e.currentTarget).offset();
+      var origx = e.pageX - o.left + this.offset[0];
+      var origy = e.pageY - o.top + this.offset[1];
+      var m = c.ui.multi;
+
+      // Determine newly dragged crop behavior if multi disabled
+      if (!c.opt.multi) {
+        // For multiCleaanup true, remove all existing selections
+        if (c.opt.multiCleanup){
+          for(var i=0;i<m.length;i++) m[i].remove();
+          c.ui.multi = [];
+        }
+        // If not, only remove the currently active selection
+        else {
+          c.removeSelection(c.ui.selection);
+        }
+      }
+
+      c.container.addClass('jcrop-dragging');
+
+      // Create the new selection
+      var sel = c.newSelection()
+        // and position it
+        .updateRaw(Jcrop.wrapFromXywh([origx,origy,1,1]));
+
+      sel.element.trigger('cropstart',[sel,this.core.unscale(sel.get())]);
+      
+      return sel.startDrag(e,'se');
+    },
+    // }}}
+    // end: function(x,y){{{
+    end: function(x,y){
+      this.drag(x,y);
+      var b = this.sel.get();
+
+      this.core.container.removeClass('jcrop-dragging');
+
+      if ((b.w < this.minsize[0]) || (b.h < this.minsize[1]))
+        this.core.requestDelete();
+
+        else this.sel.focus();
+    }
+    // }}}
+  });
+  Jcrop.registerComponent('StageDrag',StageDrag);
+
+
+  /**
+   * StageManager
+   * Provides basic stage-specific functionality
+   */
+  // var StageManager = function(core){{{
+  var StageManager = function(core){
+    this.core = core;
+    this.ui = core.ui;
+    this.init();
+  };
+  // }}}
+
+  $.extend(StageManager.prototype,{
+    // init: function(){{{
+    init: function(){
+      this.setupEvents();
+      this.dragger = new StageDrag(this);
+    },
+    // }}}
+    // tellConfigUpdate: function(options){{{
+    tellConfigUpdate: function(options){
+      for(var i=0,m=this.ui.multi,l=m.length;i<l;i++)
+        if (m[i].setOptions && (m[i].linked || (this.core.opt.linkCurrent && m[i] == this.ui.selection)))
+          m[i].setOptions(options);
+    },
+    // }}}
+    // startDragHandler: function(){{{
+    startDragHandler: function(){
+      var t = this;
+      return function(e){
+        if (!e.button || t.core.opt.is_ie_lt9) return t.dragger.start(e);
+      };
+    },
+    // }}}
+    // removeEvents: function(){{{
+    removeEvents: function(){
+      this.core.event.off('.jcrop-stage');
+      this.core.container.off('.jcrop-stage');
+    },
+    // }}}
+    // shimLegacyHandlers: function(options){{{
+    // This method uses the legacyHandlers configuration object to
+    // gracefully wrap old-style Jcrop events with new ones
+    shimLegacyHandlers: function(options){
+      var _x = {}, core = this.core, tmp;
+
+      $.each(core.opt.legacyHandlers,function(k,i){
+        if (k in options) {
+          tmp = options[k];
+          core.container.off('.jcrop-'+k)
+            .on(i+'.jcrop.jcrop-'+k,function(e,s,c){
+              tmp.call(core,c);
+            });
+          delete options[k];
+        }
+      });
+    },
+    // }}}
+    // setupEvents: function(){{{
+    setupEvents: function(){
+      var t = this, c = t.core;
+
+      c.event.on('configupdate.jcrop-stage',function(e){
+        t.shimLegacyHandlers(c.opt);
+        t.tellConfigUpdate(c.opt)
+        c.container.trigger('cropconfig',[c,c.opt]);
+      });
+
+      this.core.container
+        .on('mousedown.jcrop.jcrop-stage',this.startDragHandler());
+    }
+    // }}}
+  });
+  Jcrop.registerComponent('StageManager',StageManager);
+
+
+  var Thumbnailer = function(){
+  };
+
+  $.extend(Thumbnailer,{
+    defaults: {
+      // Set to a specific Selection object
+      // If this value is set, the preview will only track that Selection
+      selection: null,
+
+      fading: true,
+      fadeDelay: 1000,
+      fadeDuration: 1000,
+      autoHide: false,
+      width: 80,
+      height: 80,
+      _hiding: null
+    },
+
+    prototype: {
+      recopyCanvas: function(){
+        var s = this.core.ui.stage, cxt = s.context;
+        this.context.putImageData(cxt.getImageData(0,0,s.canvas.width,s.canvas.height),0,0);
+      },
+      init: function(core,options){
+        var t = this;
+        this.core = core;
+        $.extend(this,Thumbnailer.defaults,options);
+        t.initEvents();
+        t.refresh();
+        t.insertElements();
+        if (t.selection) {
+          t.renderSelection(t.selection);
+          t.selectionTarget = t.selection.element[0];
+        } else if (t.core.ui.selection) {
+          t.renderSelection(t.core.ui.selection);
+        }
+
+        if (t.core.ui.stage.canvas) {
+          t.context = t.preview[0].getContext('2d');
+          t.core.container.on('cropredraw',function(e){
+            t.recopyCanvas();
+            t.refresh();
+          });
+        }
+      },
+      updateImage: function(imgel){
+        this.preview.remove();
+        this.preview = $($.Jcrop.imageClone(imgel));
+        this.element.append(this.preview);
+        this.refresh();
+        return this;
+      },
+      insertElements: function(){
+        this.preview = $($.Jcrop.imageClone(this.core.ui.stage.imgsrc));
+
+        this.element = $('<div />').addClass('jcrop-thumb')
+          .width(this.width).height(this.height)
+          .append(this.preview)
+          .appendTo(this.core.container);
+      },
+      resize: function(w,h){
+        this.width = w;
+        this.height = h;
+        this.element.width(w).height(h);
+        this.renderCoords(this.last);
+      },
+      refresh: function(){
+        this.cw = (this.core.opt.xscale * this.core.container.width());
+        this.ch = (this.core.opt.yscale * this.core.container.height());
+        if (this.last) {
+          this.renderCoords(this.last);
+        }
+      },
+      renderCoords: function(c){
+        var rx = this.width / c.w;
+        var ry = this.height / c.h;
+
+        this.preview.css({
+          width: Math.round(rx * this.cw) + 'px',
+          height: Math.round(ry * this.ch) + 'px',
+          marginLeft: '-' + Math.round(rx * c.x) + 'px',
+          marginTop: '-' + Math.round(ry * c.y) + 'px'
+        });
+
+        this.last = c;
+        return this;
+      },
+      renderSelection: function(s){
+        return this.renderCoords(s.core.unscale(s.get()));
+      },
+      selectionStart: function(s){
+        this.renderSelection(s);
+      },
+      show: function(){
+        if (this._hiding) clearTimeout(this._hiding);
+
+        if (!this.fading) this.element.stop().css({ opacity: 1 });
+        else this.element.stop().animate({ opacity: 1 },{ duration: 80, queue: false });
+      },
+      hide: function(){
+        var t = this;
+        if (!t.fading) t.element.hide();
+        else t._hiding = setTimeout(function(){
+          t._hiding = null;
+          t.element.stop().animate({ opacity: 0 },{ duration: t.fadeDuration, queue: false });
+        },t.fadeDelay);
+      },
+      initEvents: function(){
+        var t = this;
+        t.core.container.on('croprotstart croprotend cropimage cropstart cropmove cropend',function(e,s,c){
+          if (t.selectionTarget && (t.selectionTarget !== e.target)) return false;
+
+          switch(e.type){
+
+            case 'cropimage':
+              t.updateImage(c);
+              break;
+
+            case 'cropstart':
+              t.selectionStart(s);
+            case 'croprotstart':
+              t.show();
+              break;
+
+            case 'cropend':
+              t.renderCoords(c);
+            case 'croprotend':
+              if (t.autoHide) t.hide();
+              break;
+
+            case 'cropmove':
+              t.renderCoords(c);
+              break;
+          }
+        });
+      }
+    }
+  });
+  Jcrop.registerComponent('Thumbnailer',Thumbnailer);
+
+
+  /**
+   * DialDrag component
+   * This is a little hacky, it was adapted from some previous/old code
+   * Plan to update this API in the future
+   */
+  var DialDrag = function() { };
+
+  DialDrag.prototype = {
+
+    init: function(core,actuator,callback){
+      var that = this;
+
+      if (!actuator) actuator = core.container;
+      this.$btn = $(actuator);
+      this.$targ = $(actuator);
+      this.core = core;
+
+      this.$btn
+        .addClass('dialdrag')
+        .on('mousedown.dialdrag',this.mousedown())
+        .data('dialdrag',this);
+
+      if (!$.isFunction(callback)) callback = function(){ };
+      this.callback = callback;
+      this.ondone = callback;
+    },
+
+    remove: function(){
+      this.$btn
+        .removeClass('dialdrag')
+        .off('.dialdrag')
+        .data('dialdrag',null);
+      return this;
+    },
+
+    setTarget: function(obj){
+      this.$targ = $(obj);
+      return this;
+    },
+
+    getOffset: function(){
+      var targ = this.$targ, pos = targ.offset();
+      return [
+        pos.left + (targ.width()/2),
+        pos.top + (targ.height()/2)
+      ];
+    },
+
+    relMouse: function(e){
+      var x = e.pageX - this.offset[0],
+          y = e.pageY - this.offset[1],
+          ang = Math.atan2(y,x) * (180 / Math.PI),
+          vec = Math.sqrt(Math.pow(x,2)+Math.pow(y,2));
+      return [ x, y, ang, vec ];
+    },
+
+    mousedown: function(){
+      var that = this;
+
+      function mouseUp(e){
+        $(window).off('.dialdrag');
+        that.ondone.call(that,that.relMouse(e));
+        that.core.container.trigger('croprotend');
+      }
+
+      function mouseMove(e){
+        that.callback.call(that,that.relMouse(e));
+      }
+
+      return function(e) {
+        that.offset = that.getOffset();
+        var rel = that.relMouse(e);
+        that.angleOffset = -that.core.ui.stage.angle+rel[2];
+        that.distOffset = rel[3];
+        that.dragOffset = [rel[0],rel[1]];
+        that.core.container.trigger('croprotstart');
+
+        $(window)
+          .on('mousemove.dialdrag',mouseMove)
+          .on('mouseup.dialdrag',mouseUp);
+
+        that.callback.call(that,that.relMouse(e));
+
+        return false;
+      };
+    }
+    
+  };
+  Jcrop.registerComponent('DialDrag',DialDrag);
+
+
+    /////////////////////////////////
+    // DEFAULT SETTINGS
+
+    Jcrop.defaults = {
+
+      // Selection Behavior
+      edge: { n: 0, s: 0, e: 0, w: 0 },
+      setSelect: null,
+      linked: true,
+      linkCurrent: true,
+      canDelete: true,
+      canSelect: true,
+      canDrag: true,
+      canResize: true,
+
+      // Component constructors
+      eventManagerComponent:  Jcrop.component.EventManager,
+      keyboardComponent:      Jcrop.component.Keyboard,
+      dragstateComponent:     Jcrop.component.DragState,
+      stagemanagerComponent:  Jcrop.component.StageManager,
+      animatorComponent:      Jcrop.component.Animator,
+      selectionComponent:     Jcrop.component.Selection,
+
+      // This is a function that is called, which returns a stage object
+      stageConstructor:       Jcrop.stageConstructor,
+
+      // Stage Behavior
+      allowSelect: true,
+      multi: false,
+      multiMax: false,
+      multiCleanup: true,
+      animation: true,
+      animEasing: 'swing',
+      animDuration: 400,
+      fading: true,
+      fadeDuration: 300,
+      fadeEasing: 'swing',
+      bgColor: 'black',
+      bgOpacity: .5,
+
+      // Startup options
+      applyFilters: [ 'constrain', 'extent', 'backoff', 'ratio', 'shader', 'round' ],
+      borders:  [ 'e', 'w', 's', 'n' ],
+      handles:  [ 'n', 's', 'e', 'w', 'sw', 'ne', 'nw', 'se' ],
+      dragbars: [ 'n', 'e', 'w', 's' ],
+
+      dragEventTarget: window,
+
+      xscale: 1,
+      yscale: 1,
+
+      boxWidth: null,
+      boxHeight: null,
+
+      // CSS Classes
+      // @todo: These need to be moved to top-level object keys
+      // for better customization. Currently if you try to extend one
+      // via an options object to Jcrop, it will wipe out all
+      // the others you don't specify. Be careful for now!
+      css_nodrag: 'jcrop-nodrag',
+      css_drag: 'jcrop-drag',
+      css_container: 'jcrop-active',
+      css_shades: 'jcrop-shades',
+      css_selection: 'jcrop-selection',
+      css_borders: 'jcrop-border',
+      css_handles: 'jcrop-handle jcrop-drag',
+      css_button: 'jcrop-box jcrop-drag',
+      css_noresize: 'jcrop-noresize',
+      css_dragbars: 'jcrop-dragbar jcrop-drag',
+
+      legacyHandlers: {
+        onChange: 'cropmove',
+        onSelect: 'cropend'
+      }
+
+    };
+
+
+  // Jcrop API methods
+  $.extend(Jcrop.prototype,{
+    //init: function(){{{
+    init: function(){
+      this.event = new this.opt.eventManagerComponent(this);
+      this.ui.keyboard = new this.opt.keyboardComponent(this);
+      this.ui.manager = new this.opt.stagemanagerComponent(this);
+      this.applyFilters();
+
+      if ($.Jcrop.supportsTouch)
+        new $.Jcrop.component.Touch(this);
+
+      this.initEvents();
+    },
+    //}}}
+    // applySizeConstraints: function(){{{
+    applySizeConstraints: function(){
+      var o = this.opt,
+          img = this.opt.imgsrc;
+
+      if (img){
+
+        var iw = img.naturalWidth || img.width,
+            ih = img.naturalHeight || img.height,
+            bw = o.boxWidth || iw,
+            bh = o.boxHeight || ih;
+
+        if (img && ((iw > bw) || (ih > bh))){
+          var bx = Jcrop.getLargestBox(iw/ih,bw,bh);
+          $(img).width(bx[0]).height(bx[1]);
+          this.resizeContainer(bx[0],bx[1]);
+          this.opt.xscale = iw / bx[0];
+          this.opt.yscale = ih / bx[1];
+        }
+          
+      }
+
+      if (this.opt.trueSize){
+        var dw = this.opt.trueSize[0];
+        var dh = this.opt.trueSize[1];
+        var cs = this.getContainerSize();
+        this.opt.xscale = dw / cs[0];
+        this.opt.yscale = dh / cs[1];
+      }
+    },
+    // }}}
+    initComponent: function(name){
+      if (Jcrop.component[name]) {
+        var args = Array.prototype.slice.call(arguments);
+        var obj = new Jcrop.component[name];
+        args.shift();
+        args.unshift(this);
+        obj.init.apply(obj,args);
+        return obj;
+      }
+    },
+    // setOptions: function(opt){{{
+    setOptions: function(opt,proptype){
+
+      if (!$.isPlainObject(opt)) opt = {};
+
+      $.extend(this.opt,opt);
+
+      // Handle a setSelect value
+      if (this.opt.setSelect) {
+
+        // If there is no current selection
+        // passing setSelect will create one
+        if (!this.ui.multi.length)
+          this.newSelection();
+
+        // Use these values to update the current selection
+        this.setSelect(this.opt.setSelect);
+
+        // Set to null so it doesn't get called again
+        this.opt.setSelect = null;
+      }
+
+      this.event.trigger('configupdate');
+      return this;
+    },
+    // }}}
+    //destroy: function(){{{
+    destroy: function(){
+      if (this.opt.imgsrc) {
+        this.container.before(this.opt.imgsrc);
+        this.container.remove();
+        $(this.opt.imgsrc).removeData('Jcrop').show();
+      } else {
+        // @todo: more elegant destroy() process for non-image containers
+        this.container.remove();
+      }
+    },
+    // }}}
+    // applyFilters: function(){{{
+    applyFilters: function(){
+      var obj;
+      for(var i=0,f=this.opt.applyFilters,l=f.length; i<l; i++){
+        if ($.Jcrop.filter[f[i]])
+          obj = new $.Jcrop.filter[f[i]];
+          obj.core = this;
+          if (obj.init) obj.init();
+          this.filter[f[i]] = obj;
+      }
+    },
+    // }}}
+    // getDefaultFilters: function(){{{
+    getDefaultFilters: function(){
+      var rv = [];
+
+      for(var i=0,f=this.opt.applyFilters,l=f.length; i<l; i++)
+        if(this.filter.hasOwnProperty(f[i]))
+          rv.push(this.filter[f[i]]);
+
+      rv.sort(function(x,y){ return x.priority - y.priority; });
+      return rv;
+    },
+    // }}}
+    // setSelection: function(sel){{{
+    setSelection: function(sel){
+      var m = this.ui.multi;
+      var n = [];
+      for(var i=0;i<m.length;i++) {
+        if (m[i] !== sel) n.push(m[i]);
+        m[i].toBack();
+      }
+      n.unshift(sel);
+      this.ui.multi = n;
+      this.ui.selection = sel;
+      sel.toFront();
+      return sel;
+    },
+    // }}}
+    // getSelection: function(raw){{{
+    getSelection: function(raw){
+      var b = this.ui.selection.get();
+      return b;
+    },
+    // }}}
+    // newSelection: function(){{{
+    newSelection: function(sel){
+      if (!sel)
+        sel = new this.opt.selectionComponent();
+
+      sel.init(this);
+      this.setSelection(sel);
+
+      return sel;
+    },
+    // }}}
+    // hasSelection: function(sel){{{
+    hasSelection: function(sel){
+      for(var i=0;i<this.ui.multi;i++)
+        if (sel === this.ui.multi[i]) return true;
+    },
+    // }}}
+    // removeSelection: function(sel){{{
+    removeSelection: function(sel){
+      var i, n = [], m = this.ui.multi;
+      for(var i=0;i<m.length;i++){
+        if (sel !== m[i])
+          n.push(m[i]);
+        else m[i].remove();
+      }
+      return this.ui.multi = n;
+    },
+    // }}}
+    //addFilter: function(filter){{{
+    addFilter: function(filter){
+      for(var i=0,m=this.ui.multi,l=m.length; i<l; i++)
+        m[i].addFilter(filter);
+
+      return this;
+    },
+    //}}}
+    // removeFiltersByTag: function(tag){{{
+    removeFilter: function(filter){
+      for(var i=0,m=this.ui.multi,l=m.length; i<l; i++)
+        m[i].removeFilter(filter);
+
+      return this;
+    },
+    // }}}
+    // blur: function(){{{
+    blur: function(){
+      this.ui.selection.blur();
+      return this;
+    },
+    // }}}
+    // focus: function(){{{
+    focus: function(){
+      this.ui.selection.focus();
+      return this;
+    },
+    // }}}
+    //initEvents: function(){{{
+    initEvents: function(){
+      var t = this;
+      t.container.on('selectstart',function(e){ return false; })
+        .on('mousedown','.'+t.opt.css_drag,t.startDrag());
+    },
+    //}}}
+    // maxSelect: function(){{{
+    maxSelect: function(){
+      this.setSelect([0,0,this.elw,this.elh]);
+    },
+    // }}}
+    // nudge: function(x,y){{{
+    nudge: function(x,y){
+      var s = this.ui.selection, b = s.get();
+
+      b.x += x;
+      b.x2 += x;
+      b.y += y;
+      b.y2 += y;
+
+      if (b.x < 0) { b.x2 = b.w; b.x = 0; }
+        else if (b.x2 > this.elw) { b.x2 = this.elw; b.x = b.x2 - b.w; }
+
+      if (b.y < 0) { b.y2 = b.h; b.y = 0; }
+        else if (b.y2 > this.elh) { b.y2 = this.elh; b.y = b.y2 - b.h; }
+      
+      s.element.trigger('cropstart',[s,this.unscale(b)]);
+      s.updateRaw(b,'move');
+      s.element.trigger('cropend',[s,this.unscale(b)]);
+    },
+    // }}}
+    // refresh: function(){{{
+    refresh: function(){
+      for(var i=0,s=this.ui.multi,l=s.length;i<l;i++)
+        s[i].refresh();
+    },
+    // }}}
+    // blurAll: function(){{{
+    blurAll: function(){
+      var m = this.ui.multi;
+      for(var i=0;i<m.length;i++) {
+        if (m[i] !== sel) n.push(m[i]);
+        m[i].toBack();
+      }
+    },
+    // }}}
+    // scale: function(b){{{
+    scale: function(b){
+      var xs = this.opt.xscale,
+          ys = this.opt.yscale;
+
+      return {
+        x: b.x / xs,
+        y: b.y / ys,
+        x2: b.x2 / xs,
+        y2: b.y2 / ys,
+        w: b.w / xs,
+        h: b.h / ys
+      };
+    },
+    // }}}
+    // unscale: function(b){{{
+    unscale: function(b){
+      var xs = this.opt.xscale,
+          ys = this.opt.yscale;
+
+      return {
+        x: b.x * xs,
+        y: b.y * ys,
+        x2: b.x2 * xs,
+        y2: b.y2 * ys,
+        w: b.w * xs,
+        h: b.h * ys
+      };
+    },
+    // }}}
+    // requestDelete: function(){{{
+    requestDelete: function(){
+      if ((this.ui.multi.length > 1) && (this.ui.selection.canDelete))
+        return this.deleteSelection();
+    },
+    // }}}
+    // deleteSelection: function(){{{
+    deleteSelection: function(){
+      if (this.ui.selection) {
+        this.removeSelection(this.ui.selection);
+        if (this.ui.multi.length) this.ui.multi[0].focus();
+        this.ui.selection.refresh();
+      }
+    },
+    // }}}
+    // animateTo: function(box){{{
+    animateTo: function(box){
+      if (this.ui.selection)
+        this.ui.selection.animateTo(box);
+      return this;
+    },
+    // }}}
+    // setselect: function(box){{{
+    setSelect: function(box){
+      if (this.ui.selection)
+        this.ui.selection.update(Jcrop.wrapFromXywh(box));
+      return this;
+    },
+    // }}}
+    //startDrag: function(){{{
+    startDrag: function(){
+      var t = this;
+      return function(e){
+        var $targ = $(e.target);
+        var selection = $targ.closest('.'+t.opt.css_selection).data('selection');
+        var ord = $targ.data('ord');
+        t.container.trigger('cropstart',[selection,t.unscale(selection.get())]);
+        selection.startDrag(e,ord);
+        return false;
+      };
+    },
+    //}}}
+    // getContainerSize: function(){{{
+    getContainerSize: function(){
+      return [ this.container.width(), this.container.height() ];
+    },
+    // }}}
+    // resizeContainer: function(w,h){{{
+    resizeContainer: function(w,h){
+      this.container.width(w).height(h);
+      this.refresh();
+    },
+    // }}}
+    // setImage: function(src,cb){{{
+    setImage: function(src,cb){
+      var t = this, targ = t.opt.imgsrc;
+
+      if (!targ) return false;
+
+      new $.Jcrop.component.ImageLoader(src,null,function(w,h){
+        t.resizeContainer(w,h);
+
+        targ.src = src;
+        $(targ).width(w).height(h);
+        t.applySizeConstraints();
+        t.refresh();
+        t.container.trigger('cropimage',[t,targ]);
+
+        if (typeof cb == 'function')
+          cb.call(t,w,h);
+      });
+    },
+    // }}}
+    // update: function(b){{{
+    update: function(b){
+      if (this.ui.selection)
+        this.ui.selection.update(b);
+    }
+    // }}}
+  });
+
+  // Jcrop jQuery plugin function
+  $.fn.Jcrop = function(options,callback){
+    options = options || {};
+
+    var first = this.eq(0).data('Jcrop');
+    var args = Array.prototype.slice.call(arguments);
+
+    // Return API if requested
+    if (options == 'api') { return first; }
+
+    // Allow calling API methods (with arguments)
+    else if (first && (typeof options == 'string')) {
+
+      // Call method if it exists
+      if (first[options]) {
+        args.shift();
+        first[options].apply(first,args);
+        return first;
+      }
+
+      // Unknown input/method does not exist
+      return false;
+    }
+
+    // Otherwise, loop over selected elements
+    this.each(function(){
+      var t = this, $t = $(this);
+      var exists = $t.data('Jcrop');
+      var obj;
+
+      // If Jcrop already exists on this element only setOptions()
+      if (exists)
+        exists.setOptions(options);
+
+      else {
+
+        if (!options.stageConstructor)
+          options.stageConstructor = $.Jcrop.stageConstructor;
+
+        options.stageConstructor(this,options,function(stage,options){
+          var selection = options.setSelect;
+          if (selection) delete(options.setSelect);
+
+          var obj = $.Jcrop.attach(stage.element,options);
+
+          if (typeof stage.attach == 'function')
+            stage.attach(obj);
+
+          $t.data('Jcrop',obj);
+
+          if (selection) {
+            obj.newSelection();
+            obj.setSelect(selection);
+          }
+
+          if (typeof callback == 'function')
+            callback.call(obj);
+        });
+      }
+
+      return this;
+    });
+  };
+
+/* Modernizr 2.7.1 (Custom Build) | MIT & BSD
+ * Build: http://modernizr.com/download/#-csstransforms-canvas-canvastext-draganddrop-inlinesvg-svg-svgclippaths-touch-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-url_data_uri
+ */
+;
+
+var Modernizr = (function( window, document, undefined ) {
+
+    var version = '2.7.1',
+
+    Modernizr = {},
+
+
+    docElement = document.documentElement,
+
+    mod = 'modernizr',
+    modElem = document.createElement(mod),
+    mStyle = modElem.style,
+
+    inputElem  ,
+
+
+    toString = {}.toString,
+
+    prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),
+
+
+
+    omPrefixes = 'Webkit Moz O ms',
+
+    cssomPrefixes = omPrefixes.split(' '),
+
+    domPrefixes = omPrefixes.toLowerCase().split(' '),
+
+    ns = {'svg': 'http://www.w3.org/2000/svg'},
+
+    tests = {},
+    inputs = {},
+    attrs = {},
+
+    classes = [],
+
+    slice = classes.slice,
+
+    featureName, 
+
+
+    injectElementWithStyles = function( rule, callback, nodes, testnames ) {
+
+      var style, ret, node, docOverflow,
+          div = document.createElement('div'),
+                body = document.body,
+                fakeBody = body || document.createElement('body');
+
+      if ( parseInt(nodes, 10) ) {
+                      while ( nodes-- ) {
+              node = document.createElement('div');
+              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
+              div.appendChild(node);
+          }
+      }
+
+                style = ['&#173;','<style id="s', mod, '">', rule, '</style>'].join('');
+      div.id = mod;
+          (body ? div : fakeBody).innerHTML += style;
+      fakeBody.appendChild(div);
+      if ( !body ) {
+                fakeBody.style.background = '';
+                fakeBody.style.overflow = 'hidden';
+          docOverflow = docElement.style.overflow;
+          docElement.style.overflow = 'hidden';
+          docElement.appendChild(fakeBody);
+      }
+
+      ret = callback(div, rule);
+        if ( !body ) {
+          fakeBody.parentNode.removeChild(fakeBody);
+          docElement.style.overflow = docOverflow;
+      } else {
+          div.parentNode.removeChild(div);
+      }
+
+      return !!ret;
+
+    },
+
+
+
+    isEventSupported = (function() {
+
+      var TAGNAMES = {
+        'select': 'input', 'change': 'input',
+        'submit': 'form', 'reset': 'form',
+        'error': 'img', 'load': 'img', 'abort': 'img'
+      };
+
+      function isEventSupported( eventName, element ) {
+
+        element = element || document.createElement(TAGNAMES[eventName] || 'div');
+        eventName = 'on' + eventName;
+
+            var isSupported = eventName in element;
+
+        if ( !isSupported ) {
+                if ( !element.setAttribute ) {
+            element = document.createElement('div');
+          }
+          if ( element.setAttribute && element.removeAttribute ) {
+            element.setAttribute(eventName, '');
+            isSupported = is(element[eventName], 'function');
+
+                    if ( !is(element[eventName], 'undefined') ) {
+              element[eventName] = undefined;
+            }
+            element.removeAttribute(eventName);
+          }
+        }
+
+        element = null;
+        return isSupported;
+      }
+      return isEventSupported;
+    })(),
+
+
+    _hasOwnProperty = ({}).hasOwnProperty, hasOwnProp;
+
+    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
+      hasOwnProp = function (object, property) {
+        return _hasOwnProperty.call(object, property);
+      };
+    }
+    else {
+      hasOwnProp = function (object, property) { 
+        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
+      };
+    }
+
+
+    if (!Function.prototype.bind) {
+      Function.prototype.bind = function bind(that) {
+
+        var target = this;
+
+        if (typeof target != "function") {
+            throw new TypeError();
+        }
+
+        var args = slice.call(arguments, 1),
+            bound = function () {
+
+            if (this instanceof bound) {
+
+              var F = function(){};
+              F.prototype = target.prototype;
+              var self = new F();
+
+              var result = target.apply(
+                  self,
+                  args.concat(slice.call(arguments))
+              );
+              if (Object(result) === result) {
+                  return result;
+              }
+              return self;
+
+            } else {
+
+              return target.apply(
+                  that,
+                  args.concat(slice.call(arguments))
+              );
+
+            }
+
+        };
+
+        return bound;
+      };
+    }
+
+    function setCss( str ) {
+        mStyle.cssText = str;
+    }
+
+    function setCssAll( str1, str2 ) {
+        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
+    }
+
+    function is( obj, type ) {
+        return typeof obj === type;
+    }
+
+    function contains( str, substr ) {
+        return !!~('' + str).indexOf(substr);
+    }
+
+    function testProps( props, prefixed ) {
+        for ( var i in props ) {
+            var prop = props[i];
+            if ( !contains(prop, "-") && mStyle[prop] !== undefined ) {
+                return prefixed == 'pfx' ? prop : true;
+            }
+        }
+        return false;
+    }
+
+    function testDOMProps( props, obj, elem ) {
+        for ( var i in props ) {
+            var item = obj[props[i]];
+            if ( item !== undefined) {
+
+                            if (elem === false) return props[i];
+
+                            if (is(item, 'function')){
+                                return item.bind(elem || obj);
+                }
+
+                            return item;
+            }
+        }
+        return false;
+    }
+
+    function testPropsAll( prop, prefixed, elem ) {
+
+        var ucProp  = prop.charAt(0).toUpperCase() + prop.slice(1),
+            props   = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
+
+            if(is(prefixed, "string") || is(prefixed, "undefined")) {
+          return testProps(props, prefixed);
+
+            } else {
+          props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');
+          return testDOMProps(props, prefixed, elem);
+        }
+    }
+
+
+
+    tests['canvas'] = function() {
+        var elem = document.createElement('canvas');
+        return !!(elem.getContext && elem.getContext('2d'));
+    };
+
+    tests['canvastext'] = function() {
+        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
+    };
+    tests['touch'] = function() {
+        var bool;
+
+        if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) {
+          bool = true;
+        } else {
+          injectElementWithStyles(['@media (',prefixes.join('touch-enabled),('),mod,')','{#modernizr{top:9px;position:absolute}}'].join(''), function( node ) {
+            bool = node.offsetTop === 9;
+          });
+        }
+
+        return bool;
+    };
+
+    tests['draganddrop'] = function() {
+        var div = document.createElement('div');
+        return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);
+    };
+
+
+    tests['csstransforms'] = function() {
+        return !!testPropsAll('transform');
+    };
+
+
+    tests['svg'] = function() {
+        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
+    };
+
+    tests['inlinesvg'] = function() {
+      var div = document.createElement('div');
+      div.innerHTML = '<svg/>';
+      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
+    };
+
+
+
+    tests['svgclippaths'] = function() {
+        return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
+    };
+
+    for ( var feature in tests ) {
+        if ( hasOwnProp(tests, feature) ) {
+                                    featureName  = feature.toLowerCase();
+            Modernizr[featureName] = tests[feature]();
+
+            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
+        }
+    }
+
+
+
+     Modernizr.addTest = function ( feature, test ) {
+       if ( typeof feature == 'object' ) {
+         for ( var key in feature ) {
+           if ( hasOwnProp( feature, key ) ) {
+             Modernizr.addTest( key, feature[ key ] );
+           }
+         }
+       } else {
+
+         feature = feature.toLowerCase();
+
+         if ( Modernizr[feature] !== undefined ) {
+                                              return Modernizr;
+         }
+
+         test = typeof test == 'function' ? test() : test;
+
+         if (typeof enableClasses !== "undefined" && enableClasses) {
+           docElement.className += ' ' + (test ? '' : 'no-') + feature;
+         }
+         Modernizr[feature] = test;
+
+       }
+
+       return Modernizr; 
+     };
+
+
+    setCss('');
+    modElem = inputElem = null;
+
+
+    Modernizr._version      = version;
+
+    Modernizr._prefixes     = prefixes;
+    Modernizr._domPrefixes  = domPrefixes;
+    Modernizr._cssomPrefixes  = cssomPrefixes;
+
+
+    Modernizr.hasEvent      = isEventSupported;
+
+    Modernizr.testProp      = function(prop){
+        return testProps([prop]);
+    };
+
+    Modernizr.testAllProps  = testPropsAll;
+
+
+    Modernizr.testStyles    = injectElementWithStyles;
+    return Modernizr;
+
+})(window, window.document);
+// data uri test.
+// https://github.com/Modernizr/Modernizr/issues/14
+
+// This test is asynchronous. Watch out.
+
+
+// in IE7 in HTTPS this can cause a Mixed Content security popup. 
+//  github.com/Modernizr/Modernizr/issues/362
+// To avoid that you can create a new iframe and inject this.. perhaps..
+
+
+(function(){
+
+  var datauri = new Image();
+
+
+  datauri.onerror = function() {
+      Modernizr.addTest('datauri', function () { return false; });
+  };  
+  datauri.onload = function() {
+      Modernizr.addTest('datauri', function () { return (datauri.width == 1 && datauri.height == 1); });
+  };
+
+  datauri.src = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";
+
+})();
+;
+
+  // Attach to jQuery object
+  $.Jcrop = Jcrop;
+
+  $.Jcrop.supportsCanvas = Modernizr.canvas;
+  $.Jcrop.supportsCanvasText = Modernizr.canvastext;
+  $.Jcrop.supportsDragAndDrop = Modernizr.draganddrop;
+  $.Jcrop.supportsDataURI = Modernizr.datauri;
+  $.Jcrop.supportsSVG = Modernizr.svg;
+  $.Jcrop.supportsInlineSVG = Modernizr.inlinesvg;
+  $.Jcrop.supportsSVGClipPaths = Modernizr.svgclippaths;
+  $.Jcrop.supportsCSSTransforms = Modernizr.csstransforms;
+  $.Jcrop.supportsTouch = Modernizr.touch;
+
+})(jQuery);
diff --git a/core/media/system/js/jquery.Jcrop.min.js b/core/media/system/js/jquery.Jcrop.min.js
new file mode 100644
index 00000000..00892f84
--- /dev/null
+++ b/core/media/system/js/jquery.Jcrop.min.js
@@ -0,0 +1,6 @@
+/*! Jcrop.min.js v2.0.4 - build: 20151117
+ *  Copyright 2008-2015 Tapmodo Interactive LLC
+ *  Free software under MIT License
+ **/
+!function(a){"use strict";var b=function(c,d){var e=navigator.userAgent.toLowerCase();this.opt=a.extend({},b.defaults,d||{}),this.container=a(c),this.opt.is_msie=/msie/.test(e),this.opt.is_ie_lt9=/msie [1-8]\./.test(e),this.container.addClass(this.opt.css_container),this.ui={},this.state=null,this.ui.multi=[],this.ui.selection=null,this.filter={},this.init(),this.setOptions(d),this.applySizeConstraints(),this.container.trigger("cropinit",this),this.opt.is_ie_lt9&&(this.opt.dragEventTarget=document.body)};a.extend(b,{component:{},filter:{},stage:{},registerComponent:function(a,c){b.component[a]=c},registerFilter:function(a,c){b.filter[a]=c},registerStageType:function(a,c){b.stage[a]=c},attach:function(b,c){var d=new a.Jcrop(b,c);return d},imgCopy:function(a){var b=new Image;return b.src=a.src,b},imageClone:function(c){return a.Jcrop.supportsCanvas?b.canvasClone(c):b.imgCopy(c)},canvasClone:function(b){var c=document.createElement("canvas"),d=c.getContext("2d");return a(c).width(b.width).height(b.height),c.width=b.naturalWidth,c.height=b.naturalHeight,d.drawImage(b,0,0,b.naturalWidth,b.naturalHeight),c},propagate:function(a,b,c){for(var d=0,e=a.length;e>d;d++)b.hasOwnProperty(a[d])&&(c[a[d]]=b[a[d]])},getLargestBox:function(a,b,c){return b/c>a?[c*a,c]:[b,b/a]},stageConstructor:function(c,d,e){var f=[];a.each(b.stage,function(a,b){f.push(b)}),f.sort(function(a,b){return a.priority-b.priority});for(var g=0,h=f.length;h>g;g++)if(f[g].isSupported(c,d)){f[g].create(c,d,function(a,b){"function"==typeof e&&e(a,b)});break}},supportsColorFade:function(){return a.fx.step.hasOwnProperty("backgroundColor")},wrapFromXywh:function(a){var b={x:a[0],y:a[1],w:a[2],h:a[3]};return b.x2=b.x+b.w,b.y2=b.y+b.h,b}});var c=function(){};a.extend(c,{isSupported:function(a,b){return!0},priority:100,create:function(a,b,d){var e=new c;e.element=a,d.call(this,e,b)},prototype:{attach:function(a){this.init(a),a.ui.stage=this},triggerEvent:function(b){return a(this.element).trigger(b),this},getElement:function(){return this.element}}}),b.registerStageType("Block",c);var d=function(){};d.prototype=new c,a.extend(d,{isSupported:function(a,b){return"IMG"==a.tagName?!0:void 0},priority:90,create:function(b,c,e){a.Jcrop.component.ImageLoader.attach(b,function(f,g){var h=new d;h.element=a(b).wrap("<div />").parent(),h.element.width(f).height(g),h.imgsrc=b,"function"==typeof e&&e.call(this,h,c)})}}),b.registerStageType("Image",d);var e=function(){this.angle=0,this.scale=1,this.scaleMin=.2,this.scaleMax=1.25,this.offset=[0,0]};e.prototype=new d,a.extend(e,{isSupported:function(b,c){return a.Jcrop.supportsCanvas&&"IMG"==b.tagName?!0:void 0},priority:60,create:function(b,c,d){var f=a(b),g=a.extend({},c);a.Jcrop.component.ImageLoader.attach(b,function(a,c){var h=new e;f.hide(),h.createCanvas(b,a,c),f.before(h.element),h.imgsrc=b,g.imgsrc=b,"function"==typeof d&&(d(h,g),h.redraw())})}}),a.extend(e.prototype,{init:function(a){this.core=a},setOffset:function(a,b){return this.offset=[a,b],this},setAngle:function(a){return this.angle=a,this},setScale:function(a){return this.scale=this.boundScale(a),this},boundScale:function(a){return a<this.scaleMin?a=this.scaleMin:a>this.scaleMax&&(a=this.scaleMax),a},createCanvas:function(b,c,d){this.width=c,this.height=d,this.canvas=document.createElement("canvas"),this.canvas.width=c,this.canvas.height=d,this.$canvas=a(this.canvas).width("100%").height("100%"),this.context=this.canvas.getContext("2d"),this.fillstyle="rgb(0,0,0)",this.element=this.$canvas.wrap("<div />").parent().width(c).height(d)},triggerEvent:function(a){return this.$canvas.trigger(a),this},clear:function(){return this.context.fillStyle=this.fillstyle,this.context.fillRect(0,0,this.canvas.width,this.canvas.height),this},redraw:function(){return this.context.save(),this.clear(),this.context.translate(parseInt(.5*this.width),parseInt(.5*this.height)),this.context.translate(this.offset[0]/this.core.opt.xscale,this.offset[1]/this.core.opt.yscale),this.context.rotate(this.angle*(Math.PI/180)),this.context.scale(this.scale,this.scale),this.context.translate(-parseInt(.5*this.width),-parseInt(.5*this.height)),this.context.drawImage(this.imgsrc,0,0,this.width,this.height),this.context.restore(),this.$canvas.trigger("cropredraw"),this},setFillStyle:function(a){return this.fillstyle=a,this}}),b.registerStageType("Canvas",e);var f=function(){this.minw=40,this.minh=40,this.maxw=0,this.maxh=0,this.core=null};a.extend(f.prototype,{tag:"backoff",priority:22,filter:function(a){var b=this.bound;return a.x<b.minx&&(a.x=b.minx,a.x2=a.w+a.x),a.y<b.miny&&(a.y=b.miny,a.y2=a.h+a.y),a.x2>b.maxx&&(a.x2=b.maxx,a.x=a.x2-a.w),a.y2>b.maxy&&(a.y2=b.maxy,a.y=a.y2-a.h),a},refresh:function(a){this.elw=a.core.container.width(),this.elh=a.core.container.height(),this.bound={minx:0+a.edge.w,miny:0+a.edge.n,maxx:this.elw+a.edge.e,maxy:this.elh+a.edge.s}}}),b.registerFilter("backoff",f);var g=function(){this.core=null};a.extend(g.prototype,{tag:"constrain",priority:5,filter:function(a,b){return"move"==b?(a.x<this.minx&&(a.x=this.minx,a.x2=a.w+a.x),a.y<this.miny&&(a.y=this.miny,a.y2=a.h+a.y),a.x2>this.maxx&&(a.x2=this.maxx,a.x=a.x2-a.w),a.y2>this.maxy&&(a.y2=this.maxy,a.y=a.y2-a.h)):(a.x<this.minx&&(a.x=this.minx),a.y<this.miny&&(a.y=this.miny),a.x2>this.maxx&&(a.x2=this.maxx),a.y2>this.maxy&&(a.y2=this.maxy)),a.w=a.x2-a.x,a.h=a.y2-a.y,a},refresh:function(a){this.elw=a.core.container.width(),this.elh=a.core.container.height(),this.minx=0+a.edge.w,this.miny=0+a.edge.n,this.maxx=this.elw+a.edge.e,this.maxy=this.elh+a.edge.s}}),b.registerFilter("constrain",g);var h=function(){this.core=null};a.extend(h.prototype,{tag:"extent",priority:12,offsetFromCorner:function(a,b,c){var d=b[0],e=b[1];switch(a){case"bl":return[c.x2-d,c.y,d,e];case"tl":return[c.x2-d,c.y2-e,d,e];case"br":return[c.x,c.y,d,e];case"tr":return[c.x,c.y2-e,d,e]}},getQuadrant:function(a){var b=a.opposite[0]-a.offsetx,c=a.opposite[1]-a.offsety;return 0>b&&0>c?"br":b>=0&&c>=0?"tl":0>b&&c>=0?"tr":"bl"},filter:function(a,c,d){if("move"==c)return a;var e=a.w,f=a.h,g=d.state,h=this.limits,i=g?this.getQuadrant(g):"br";return h.minw&&e<h.minw&&(e=h.minw),h.minh&&f<h.minh&&(f=h.minh),h.maxw&&e>h.maxw&&(e=h.maxw),h.maxh&&f>h.maxh&&(f=h.maxh),e==a.w&&f==a.h?a:b.wrapFromXywh(this.offsetFromCorner(i,[e,f],a))},refresh:function(a){this.elw=a.core.container.width(),this.elh=a.core.container.height(),this.limits={minw:a.minSize[0],minh:a.minSize[1],maxw:a.maxSize[0],maxh:a.maxSize[1]}}}),b.registerFilter("extent",h);var i=function(){this.stepx=1,this.stepy=1,this.core=null};a.extend(i.prototype,{tag:"grid",priority:19,filter:function(a){var b={x:Math.round(a.x/this.stepx)*this.stepx,y:Math.round(a.y/this.stepy)*this.stepy,x2:Math.round(a.x2/this.stepx)*this.stepx,y2:Math.round(a.y2/this.stepy)*this.stepy};return b.w=b.x2-b.x,b.h=b.y2-b.y,b}}),b.registerFilter("grid",i);var j=function(){this.ratio=0,this.core=null};a.extend(j.prototype,{tag:"ratio",priority:15,offsetFromCorner:function(a,b,c){var d=b[0],e=b[1];switch(a){case"bl":return[c.x2-d,c.y,d,e];case"tl":return[c.x2-d,c.y2-e,d,e];case"br":return[c.x,c.y,d,e];case"tr":return[c.x,c.y2-e,d,e]}},getBoundRatio:function(a,c){var d=b.getLargestBox(this.ratio,a.w,a.h);return b.wrapFromXywh(this.offsetFromCorner(c,d,a))},getQuadrant:function(a){var b=a.opposite[0]-a.offsetx,c=a.opposite[1]-a.offsety;return 0>b&&0>c?"br":b>=0&&c>=0?"tl":0>b&&c>=0?"tr":"bl"},filter:function(a,b,c){if(!this.ratio)return a;var d=(a.w/a.h,c.state),e=d?this.getQuadrant(d):"br";if(b=b||"se","move"==b)return a;switch(b){case"n":a.x2=this.elw,a.w=a.x2-a.x,e="tr";break;case"s":a.x2=this.elw,a.w=a.x2-a.x,e="br";break;case"e":a.y2=this.elh,a.h=a.y2-a.y,e="br";break;case"w":a.y2=this.elh,a.h=a.y2-a.y,e="bl"}return this.getBoundRatio(a,e)},refresh:function(a){this.ratio=a.aspectRatio,this.elw=a.core.container.width(),this.elh=a.core.container.height()}}),b.registerFilter("ratio",j);var k=function(){this.core=null};a.extend(k.prototype,{tag:"round",priority:90,filter:function(a){var b={x:Math.round(a.x),y:Math.round(a.y),x2:Math.round(a.x2),y2:Math.round(a.y2)};return b.w=b.x2-b.x,b.h=b.y2-b.y,b}}),b.registerFilter("round",k);var l=function(a,b){this.color=b||"black",this.opacity=a||.5,this.core=null,this.shades={}};a.extend(l.prototype,{tag:"shader",fade:!0,fadeEasing:"swing",fadeSpeed:320,priority:95,init:function(){var b=this;b.attached||(b.visible=!1,b.container=a("<div />").addClass(b.core.opt.css_shades).prependTo(this.core.container).hide(),b.elh=this.core.container.height(),b.elw=this.core.container.width(),b.shades={top:b.createShade(),right:b.createShade(),left:b.createShade(),bottom:b.createShade()},b.attached=!0)},destroy:function(){this.container.remove()},setColor:function(c,d){var e=this;if(c==e.color)return e;this.color=c;var f=b.supportsColorFade();return a.each(e.shades,function(a,b){e.fade&&!d&&f?b.animate({backgroundColor:c},{queue:!1,duration:e.fadeSpeed,easing:e.fadeEasing}):b.css("backgroundColor",c)}),e},setOpacity:function(b,c){var d=this;return b==d.opacity?d:(d.opacity=b,a.each(d.shades,function(a,e){!d.fade||c?e.css({opacity:b}):e.animate({opacity:b},{queue:!1,duration:d.fadeSpeed,easing:d.fadeEasing})}),d)},createShade:function(){return a("<div />").css({position:"absolute",backgroundColor:this.color,opacity:this.opacity}).appendTo(this.container)},refresh:function(a){var b=this.core,c=this.shades;this.setColor(a.bgColor?a.bgColor:this.core.opt.bgColor),this.setOpacity(a.bgOpacity?a.bgOpacity:this.core.opt.bgOpacity),this.elh=b.container.height(),this.elw=b.container.width(),c.right.css("height",this.elh+"px"),c.left.css("height",this.elh+"px")},filter:function(a,b,c){if(!c.active)return a;var d=this,e=d.shades;return e.top.css({left:Math.round(a.x)+"px",width:Math.round(a.w)+"px",height:Math.round(a.y)+"px"}),e.bottom.css({top:Math.round(a.y2)+"px",left:Math.round(a.x)+"px",width:Math.round(a.w)+"px",height:d.elh-Math.round(a.y2)+"px"}),e.right.css({left:Math.round(a.x2)+"px",width:d.elw-Math.round(a.x2)+"px"}),e.left.css({width:Math.round(a.x)+"px"}),d.visible||(d.container.show(),d.visible=!0),a}}),b.registerFilter("shader",l);var m=function(a){this.stage=a,this.core=a.core,this.cloneStagePosition()};m.prototype={cloneStagePosition:function(){var a=this.stage;this.angle=a.angle,this.scale=a.scale,this.offset=a.offset},getElement:function(){var b=this.stage;return a("<div />").css({position:"absolute",top:b.offset[0]+"px",left:b.offset[1]+"px",width:b.angle+"px",height:b.scale+"px"})},animate:function(a){var b=this;this.scale=this.stage.boundScale(this.scale),b.stage.triggerEvent("croprotstart"),b.getElement().animate({top:b.offset[0]+"px",left:b.offset[1]+"px",width:b.angle+"px",height:b.scale+"px"},{easing:b.core.opt.animEasing,duration:b.core.opt.animDuration,complete:function(){b.stage.triggerEvent("croprotend"),"function"==typeof a&&a.call(this)},progress:function(a){var c,d={},e=a.tweens;for(c=0;c<e.length;c++)d[e[c].prop]=e[c].now;b.stage.setAngle(d.width).setScale(d.height).setOffset(d.top,d.left).redraw()}})}},b.stage.Canvas.prototype.getAnimator=function(){return new m(this)},b.registerComponent("CanvasAnimator",m);var o=function(a){this.selection=a,this.core=a.core};o.prototype={getElement:function(){var b=this.selection.get();return a("<div />").css({position:"absolute",top:b.y+"px",left:b.x+"px",width:b.w+"px",height:b.h+"px"})},animate:function(a,b,c,d,e){var f=this;f.selection.allowResize(!1),f.getElement().animate({top:b+"px",left:a+"px",width:c+"px",height:d+"px"},{easing:f.core.opt.animEasing,duration:f.core.opt.animDuration,complete:function(){f.selection.allowResize(!0),e&&e.call(this)},progress:function(a){var b,c={},d=a.tweens;for(b=0;b<d.length;b++)c[d[b].prop]=d[b].now;var e={x:parseInt(c.left),y:parseInt(c.top),w:parseInt(c.width),h:parseInt(c.height)};e.x2=e.x+e.w,e.y2=e.y+e.h,f.selection.updateRaw(e,"se")}})}},b.registerComponent("Animator",o);var p=function(a,b,c){var d=this;d.x=a.pageX,d.y=a.pageY,d.selection=b,d.eventTarget=b.core.opt.dragEventTarget,d.orig=b.get(),b.callFilterFunction("refresh");var e=b.core.container.position();d.elx=e.left,d.ely=e.top,d.offsetx=0,d.offsety=0,d.ord=c,d.opposite=d.getOppositeCornerOffset(),d.initEvents(a)};p.prototype={getOppositeCornerOffset:function(){var a=this.orig,b=this.x-this.elx-a.x,c=this.y-this.ely-a.y;switch(this.ord){case"nw":case"w":return[a.w-b,a.h-c];case"sw":return[a.w-b,-c];case"se":case"s":case"e":return[-b,-c];case"ne":case"n":return[-b,a.h-c]}return[null,null]},initEvents:function(b){a(this.eventTarget).on("mousemove.jcrop",this.createDragHandler()).on("mouseup.jcrop",this.createStopHandler())},dragEvent:function(a){this.offsetx=a.pageX-this.x,this.offsety=a.pageY-this.y,this.selection.updateRaw(this.getBox(),this.ord)},endDragEvent:function(a){var b=this.selection;b.core.container.removeClass("jcrop-dragging"),b.element.trigger("cropend",[b,b.core.unscale(b.get())]),b.focus()},createStopHandler:function(){var b=this;return function(c){return a(b.eventTarget).off(".jcrop"),b.endDragEvent(c),!1}},createDragHandler:function(){var a=this;return function(b){return a.dragEvent(b),!1}},update:function(a,b){var c=this;c.offsetx=a-c.x,c.offsety=b-c.y},resultWrap:function(a){var b={x:Math.min(a[0],a[2]),y:Math.min(a[1],a[3]),x2:Math.max(a[0],a[2]),y2:Math.max(a[1],a[3])};return b.w=b.x2-b.x,b.h=b.y2-b.y,b},getBox:function(){var a=this,b=a.orig,c={x2:b.x+b.w,y2:b.y+b.h};switch(a.ord){case"n":return a.resultWrap([b.x,a.offsety+b.y,c.x2,c.y2]);case"s":return a.resultWrap([b.x,b.y,c.x2,a.offsety+c.y2]);case"e":return a.resultWrap([b.x,b.y,a.offsetx+c.x2,c.y2]);case"w":return a.resultWrap([b.x+a.offsetx,b.y,c.x2,c.y2]);case"sw":return a.resultWrap([a.offsetx+b.x,b.y,c.x2,a.offsety+c.y2]);case"se":return a.resultWrap([b.x,b.y,a.offsetx+c.x2,a.offsety+c.y2]);case"ne":return a.resultWrap([b.x,a.offsety+b.y,a.offsetx+c.x2,c.y2]);case"nw":return a.resultWrap([a.offsetx+b.x,a.offsety+b.y,c.x2,c.y2]);case"move":return c.nx=b.x+a.offsetx,c.ny=b.y+a.offsety,a.resultWrap([c.nx,c.ny,c.nx+b.w,c.ny+b.h])}}},b.registerComponent("DragState",p);var q=function(a){this.core=a};q.prototype={on:function(b,c){a(this).on(b,c)},off:function(b){a(this).off(b)},trigger:function(b){a(this).trigger(b)}},b.registerComponent("EventManager",q);var r=function(a,b,c){this.src=a,b||(b=new Image),this.element=b,this.callback=c,this.load()};a.extend(r,{attach:function(a,b){return new r(a.src,a,b)},prototype:{getDimensions:function(){var a=this.element;return a.naturalWidth?[a.naturalWidth,a.naturalHeight]:a.width?[a.width,a.height]:null},fireCallback:function(){this.element.onload=null,"function"==typeof this.callback&&this.callback.apply(this,this.getDimensions())},isLoaded:function(){return this.element.complete},load:function(){var a=this,b=a.element;b.src=a.src,a.isLoaded()?a.fireCallback():a.element.onload=function(b){a.fireCallback()}}}}),b.registerComponent("ImageLoader",r);var s=function(a){this.core=a,this.init()};a.extend(s,{support:function(){return"ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch?!0:void 0},prototype:{init:function(){var b=this,c=a.Jcrop.component.DragState.prototype;c.touch||(b.initEvents(),b.shimDragState(),b.shimStageDrag(),c.touch=!0)},shimDragState:function(){var b=this;a.Jcrop.component.DragState.prototype.initEvents=function(c){"touch"==c.type.substr(0,5)?a(this.eventTarget).on("touchmove.jcrop.jcrop-touch",b.dragWrap(this.createDragHandler())).on("touchend.jcrop.jcrop-touch",this.createStopHandler()):a(this.eventTarget).on("mousemove.jcrop",this.createDragHandler()).on("mouseup.jcrop",this.createStopHandler())}},shimStageDrag:function(){this.core.container.addClass("jcrop-touch").on("touchstart.jcrop.jcrop-stage",this.dragWrap(this.core.ui.manager.startDragHandler()))},dragWrap:function(a){return function(b){return b.preventDefault(),b.stopPropagation(),"touch"==b.type.substr(0,5)?(b.pageX=b.originalEvent.changedTouches[0].pageX,b.pageY=b.originalEvent.changedTouches[0].pageY,a(b)):!1}},initEvents:function(){var a=this,b=a.core;b.container.on("touchstart.jcrop.jcrop-touch","."+b.opt.css_drag,a.dragWrap(b.startDrag()))}}}),b.registerComponent("Touch",s);var t=function(a){this.core=a,this.init()};a.extend(t,{defaults:{eventName:"keydown.jcrop",passthru:[9],debug:!1},prototype:{init:function(){a.extend(this,t.defaults),this.enable()},disable:function(){this.core.container.off(this.eventName)},enable:function(){var b=this,c=b.core;c.container.on(b.eventName,function(d){var e=d.shiftKey?16:2;if(a.inArray(d.keyCode,b.passthru)>=0)return!0;switch(d.keyCode){case 37:c.nudge(-e,0);break;case 38:c.nudge(0,-e);break;case 39:c.nudge(e,0);break;case 40:c.nudge(0,e);break;case 46:case 8:return c.requestDelete(),!1;default:b.debug&&console.log("keycode: "+d.keyCode)}d.metaKey||d.ctrlKey||d.preventDefault()})}}}),b.registerComponent("Keyboard",t);var u=function(){};a.extend(u,{defaults:{minSize:[8,8],maxSize:[0,0],aspectRatio:0,edge:{n:0,s:0,e:0,w:0},bgColor:null,bgOpacity:null,last:null,state:null,active:!0,linked:!0,canDelete:!0,canDrag:!0,canResize:!0,canSelect:!0},prototype:{init:function(a){this.core=a,this.startup(),this.linked=this.core.opt.linked,this.attach(),this.setOptions(this.core.opt),a.container.trigger("cropcreate",[this])},attach:function(){},startup:function(){var b=this,c=b.core.opt;a.extend(b,u.defaults),b.filter=b.core.getDefaultFilters(),b.element=a("<div />").addClass(c.css_selection).data({selection:b}),b.frame=a("<button />").addClass(c.css_button).data("ord","move").attr("type","button"),b.element.append(b.frame).appendTo(b.core.container),b.core.opt.is_msie&&b.frame.css({opacity:0,backgroundColor:"white"}),b.insertElements(),b.frame.on("focus.jcrop",function(a){b.core.setSelection(b),b.element.trigger("cropfocus",b),b.element.addClass("jcrop-focus")}).on("blur.jcrop",function(a){b.element.removeClass("jcrop-focus"),b.element.trigger("cropblur",b)})},propagate:["canDelete","canDrag","canResize","canSelect","minSize","maxSize","aspectRatio","edge"],setOptions:function(a){return b.propagate(this.propagate,a,this),this.refresh(),this},refresh:function(){this.allowResize(),this.allowDrag(),this.allowSelect(),this.callFilterFunction("refresh"),this.updateRaw(this.get(),"se")},callFilterFunction:function(a,b){for(var c=0;c<this.filter.length;c++)this.filter[c][a]&&this.filter[c][a](this);return this},addFilter:function(a){a.core=this.core,this.hasFilter(a)||(this.filter.push(a),this.sortFilters(),a.init&&a.init(),this.refresh())},hasFilter:function(a){var b,c=this.filter;for(b=0;b<c.length;b++)if(c[b]===a)return!0},sortFilters:function(){this.filter.sort(function(a,b){return a.priority-b.priority})},clearFilters:function(){for(var a,b=this.filter,a=0;a<b.length;a++)b[a].destroy&&b[a].destroy();this.filter=[]},removeFilter:function(a){for(var b,c=this.filter,d=[],b=0;b<c.length;b++)c[b].tag&&c[b].tag==a||a===c[b]?c[b].destroy&&c[b].destroy():d.push(c[b]);this.filter=d},runFilters:function(a,b){for(var c=0;c<this.filter.length;c++)a=this.filter[c].filter(a,b,this);return a},endDrag:function(){this.state&&(a(document.body).off(".jcrop"),this.focus(),this.state=null)},startDrag:function(c,d){var e=this;e.core;return d=d||a(c.target).data("ord"),this.focus(),"move"==d&&e.element.hasClass(e.core.opt.css_nodrag)?!1:(this.state=new b.component.DragState(c,this,d),!1)},allowSelect:function(a){return void 0===a&&(a=this.canSelect),a&&this.canSelect?this.frame.attr("disabled",!1):this.frame.attr("disabled","disabled"),this},allowDrag:function(a){var b=this,c=b.core.opt;return void 0==a&&(a=b.canDrag),a&&b.canDrag?b.element.removeClass(c.css_nodrag):b.element.addClass(c.css_nodrag),this},allowResize:function(a){var b=this,c=b.core.opt;return void 0==a&&(a=b.canResize),a&&b.canResize?b.element.removeClass(c.css_noresize):b.element.addClass(c.css_noresize),this},remove:function(){this.element.trigger("cropremove",this),this.element.remove()},toBack:function(){this.active=!1,this.element.removeClass("jcrop-current jcrop-focus")},toFront:function(){this.active=!0,this.element.addClass("jcrop-current"),this.callFilterFunction("refresh"),this.refresh()},redraw:function(a){return this.moveTo(a.x,a.y),this.resize(a.w,a.h),this.last=a,this},update:function(a,b){return this.updateRaw(this.core.scale(a),b)},updateRaw:function(a,b){return a=this.runFilters(a,b),this.redraw(a),this.element.trigger("cropmove",[this,this.core.unscale(a)]),this},animateTo:function(a,c){var d=new b.component.Animator(this),e=this.core.scale(b.wrapFromXywh(a));d.animate(e.x,e.y,e.w,e.h,c)},center:function(a){var b=this.get(),c=this.core,d=c.container.width(),e=c.container.height(),f=[(d-b.w)/2,(e-b.h)/2,b.w,b.h];return this[a?"setSelect":"animateTo"](f)},createElement:function(b,c){return a("<div />").addClass(b+" ord-"+c).data("ord",c)},moveTo:function(a,b){this.element.css({top:b+"px",left:a+"px"})},blur:function(){return this.element.blur(),this},focus:function(){return this.core.setSelection(this),this.frame.focus(),this},resize:function(a,b){this.element.css({width:a+"px",height:b+"px"})},get:function(){var a=this.element,b=a.position(),c=a.width(),d=a.height(),e={x:b.left,y:b.top};return e.x2=e.x+c,e.y2=e.y+d,e.w=c,e.h=d,e},insertElements:function(){var a,b=this,c=(b.core,b.element),d=b.core.opt,e=d.borders,f=d.handles,g=d.dragbars;for(a=0;a<g.length;a++)c.append(b.createElement(d.css_dragbars,g[a]));for(a=0;a<f.length;a++)c.append(b.createElement(d.css_handles,f[a]));for(a=0;a<e.length;a++)c.append(b.createElement(d.css_borders,e[a]))}}}),b.registerComponent("Selection",u);var v=function(b,c){a.extend(this,v.defaults,c||{}),this.manager=b,this.core=b.core};v.defaults={offset:[-8,-8],active:!0,minsize:[20,20]},a.extend(v.prototype,{start:function(c){var d=this.core;if(d.opt.allowSelect){if(d.opt.multi&&d.opt.multiMax&&d.ui.multi.length>=d.opt.multiMax)return!1;var e=a(c.currentTarget).offset(),f=c.pageX-e.left+this.offset[0],g=c.pageY-e.top+this.offset[1],h=d.ui.multi;if(!d.opt.multi)if(d.opt.multiCleanup){for(var i=0;i<h.length;i++)h[i].remove();d.ui.multi=[]}else d.removeSelection(d.ui.selection);d.container.addClass("jcrop-dragging");var j=d.newSelection().updateRaw(b.wrapFromXywh([f,g,1,1]));return j.element.trigger("cropstart",[j,this.core.unscale(j.get())]),j.startDrag(c,"se")}},end:function(a,b){this.drag(a,b);var c=this.sel.get();this.core.container.removeClass("jcrop-dragging"),c.w<this.minsize[0]||c.h<this.minsize[1]?this.core.requestDelete():this.sel.focus()}}),b.registerComponent("StageDrag",v);var w=function(a){this.core=a,this.ui=a.ui,this.init()};a.extend(w.prototype,{init:function(){this.setupEvents(),this.dragger=new v(this)},tellConfigUpdate:function(a){for(var b=0,c=this.ui.multi,d=c.length;d>b;b++)c[b].setOptions&&(c[b].linked||this.core.opt.linkCurrent&&c[b]==this.ui.selection)&&c[b].setOptions(a)},startDragHandler:function(){var a=this;return function(b){return!b.button||a.core.opt.is_ie_lt9?a.dragger.start(b):void 0}},removeEvents:function(){this.core.event.off(".jcrop-stage"),this.core.container.off(".jcrop-stage")},shimLegacyHandlers:function(b){var c,d=this.core;a.each(d.opt.legacyHandlers,function(a,e){a in b&&(c=b[a],d.container.off(".jcrop-"+a).on(e+".jcrop.jcrop-"+a,function(a,b,e){c.call(d,e)}),delete b[a])})},setupEvents:function(){var a=this,b=a.core;b.event.on("configupdate.jcrop-stage",function(c){a.shimLegacyHandlers(b.opt),a.tellConfigUpdate(b.opt),b.container.trigger("cropconfig",[b,b.opt])}),this.core.container.on("mousedown.jcrop.jcrop-stage",this.startDragHandler())}}),b.registerComponent("StageManager",w);var x=function(){};a.extend(x,{defaults:{selection:null,fading:!0,fadeDelay:1e3,fadeDuration:1e3,autoHide:!1,width:80,height:80,_hiding:null},prototype:{recopyCanvas:function(){var a=this.core.ui.stage,b=a.context;this.context.putImageData(b.getImageData(0,0,a.canvas.width,a.canvas.height),0,0)},init:function(b,c){var d=this;this.core=b,a.extend(this,x.defaults,c),d.initEvents(),d.refresh(),d.insertElements(),d.selection?(d.renderSelection(d.selection),d.selectionTarget=d.selection.element[0]):d.core.ui.selection&&d.renderSelection(d.core.ui.selection),d.core.ui.stage.canvas&&(d.context=d.preview[0].getContext("2d"),d.core.container.on("cropredraw",function(a){d.recopyCanvas(),d.refresh()}))},updateImage:function(b){return this.preview.remove(),this.preview=a(a.Jcrop.imageClone(b)),this.element.append(this.preview),this.refresh(),this},insertElements:function(){this.preview=a(a.Jcrop.imageClone(this.core.ui.stage.imgsrc)),this.element=a("<div />").addClass("jcrop-thumb").width(this.width).height(this.height).append(this.preview).appendTo(this.core.container)},resize:function(a,b){this.width=a,this.height=b,this.element.width(a).height(b),this.renderCoords(this.last)},refresh:function(){this.cw=this.core.opt.xscale*this.core.container.width(),this.ch=this.core.opt.yscale*this.core.container.height(),this.last&&this.renderCoords(this.last)},renderCoords:function(a){var b=this.width/a.w,c=this.height/a.h;return this.preview.css({width:Math.round(b*this.cw)+"px",height:Math.round(c*this.ch)+"px",marginLeft:"-"+Math.round(b*a.x)+"px",marginTop:"-"+Math.round(c*a.y)+"px"}),this.last=a,this},renderSelection:function(a){return this.renderCoords(a.core.unscale(a.get()))},selectionStart:function(a){this.renderSelection(a)},show:function(){this._hiding&&clearTimeout(this._hiding),this.fading?this.element.stop().animate({opacity:1},{duration:80,queue:!1}):this.element.stop().css({opacity:1})},hide:function(){var a=this;a.fading?a._hiding=setTimeout(function(){a._hiding=null,a.element.stop().animate({opacity:0},{duration:a.fadeDuration,queue:!1})},a.fadeDelay):a.element.hide()},initEvents:function(){var a=this;a.core.container.on("croprotstart croprotend cropimage cropstart cropmove cropend",function(b,c,d){if(a.selectionTarget&&a.selectionTarget!==b.target)return!1;switch(b.type){case"cropimage":a.updateImage(d);break;case"cropstart":a.selectionStart(c);case"croprotstart":a.show();break;case"cropend":a.renderCoords(d);case"croprotend":a.autoHide&&a.hide();break;case"cropmove":a.renderCoords(d)}})}}}),b.registerComponent("Thumbnailer",x);var y=function(){};y.prototype={init:function(b,c,d){c||(c=b.container),this.$btn=a(c),this.$targ=a(c),this.core=b,this.$btn.addClass("dialdrag").on("mousedown.dialdrag",this.mousedown()).data("dialdrag",this),a.isFunction(d)||(d=function(){}),this.callback=d,this.ondone=d},remove:function(){return this.$btn.removeClass("dialdrag").off(".dialdrag").data("dialdrag",null),this},setTarget:function(b){return this.$targ=a(b),this},getOffset:function(){var a=this.$targ,b=a.offset();return[b.left+a.width()/2,b.top+a.height()/2]},relMouse:function(a){var b=a.pageX-this.offset[0],c=a.pageY-this.offset[1],d=Math.atan2(c,b)*(180/Math.PI),e=Math.sqrt(Math.pow(b,2)+Math.pow(c,2));return[b,c,d,e]},mousedown:function(){function b(b){a(window).off(".dialdrag"),d.ondone.call(d,d.relMouse(b)),d.core.container.trigger("croprotend")}function c(a){d.callback.call(d,d.relMouse(a))}var d=this;return function(e){d.offset=d.getOffset();var f=d.relMouse(e);return d.angleOffset=-d.core.ui.stage.angle+f[2],d.distOffset=f[3],d.dragOffset=[f[0],f[1]],d.core.container.trigger("croprotstart"),a(window).on("mousemove.dialdrag",c).on("mouseup.dialdrag",b),d.callback.call(d,d.relMouse(e)),!1}}},b.registerComponent("DialDrag",y),b.defaults={edge:{n:0,s:0,e:0,w:0},setSelect:null,linked:!0,linkCurrent:!0,canDelete:!0,canSelect:!0,canDrag:!0,canResize:!0,eventManagerComponent:b.component.EventManager,keyboardComponent:b.component.Keyboard,dragstateComponent:b.component.DragState,stagemanagerComponent:b.component.StageManager,animatorComponent:b.component.Animator,selectionComponent:b.component.Selection,stageConstructor:b.stageConstructor,allowSelect:!0,multi:!1,multiMax:!1,multiCleanup:!0,animation:!0,animEasing:"swing",animDuration:400,fading:!0,fadeDuration:300,fadeEasing:"swing",bgColor:"black",bgOpacity:.5,applyFilters:["constrain","extent","backoff","ratio","shader","round"],borders:["e","w","s","n"],handles:["n","s","e","w","sw","ne","nw","se"],dragbars:["n","e","w","s"],dragEventTarget:window,xscale:1,yscale:1,boxWidth:null,boxHeight:null,css_nodrag:"jcrop-nodrag",css_drag:"jcrop-drag",css_container:"jcrop-active",css_shades:"jcrop-shades",css_selection:"jcrop-selection",css_borders:"jcrop-border",css_handles:"jcrop-handle jcrop-drag",css_button:"jcrop-box jcrop-drag",css_noresize:"jcrop-noresize",css_dragbars:"jcrop-dragbar jcrop-drag",legacyHandlers:{onChange:"cropmove",onSelect:"cropend"}},a.extend(b.prototype,{init:function(){this.event=new this.opt.eventManagerComponent(this),this.ui.keyboard=new this.opt.keyboardComponent(this),this.ui.manager=new this.opt.stagemanagerComponent(this),this.applyFilters(),a.Jcrop.supportsTouch&&new a.Jcrop.component.Touch(this),this.initEvents()},applySizeConstraints:function(){var c=this.opt,d=this.opt.imgsrc;if(d){var e=d.naturalWidth||d.width,f=d.naturalHeight||d.height,g=c.boxWidth||e,h=c.boxHeight||f;if(d&&(e>g||f>h)){var i=b.getLargestBox(e/f,g,h);a(d).width(i[0]).height(i[1]),this.resizeContainer(i[0],i[1]),this.opt.xscale=e/i[0],this.opt.yscale=f/i[1]}}if(this.opt.trueSize){var j=this.opt.trueSize[0],k=this.opt.trueSize[1],l=this.getContainerSize();this.opt.xscale=j/l[0],this.opt.yscale=k/l[1]}},initComponent:function(a){if(b.component[a]){var c=Array.prototype.slice.call(arguments),d=new b.component[a];return c.shift(),c.unshift(this),d.init.apply(d,c),d}},setOptions:function(b,c){return a.isPlainObject(b)||(b={}),a.extend(this.opt,b),this.opt.setSelect&&(this.ui.multi.length||this.newSelection(),this.setSelect(this.opt.setSelect),this.opt.setSelect=null),this.event.trigger("configupdate"),this},destroy:function(){this.opt.imgsrc?(this.container.before(this.opt.imgsrc),this.container.remove(),a(this.opt.imgsrc).removeData("Jcrop").show()):this.container.remove()},applyFilters:function(){for(var b,c=0,d=this.opt.applyFilters,e=d.length;e>c;c++)a.Jcrop.filter[d[c]]&&(b=new a.Jcrop.filter[d[c]]),b.core=this,b.init&&b.init(),this.filter[d[c]]=b},getDefaultFilters:function(){for(var a=[],b=0,c=this.opt.applyFilters,d=c.length;d>b;b++)this.filter.hasOwnProperty(c[b])&&a.push(this.filter[c[b]]);return a.sort(function(a,b){return a.priority-b.priority}),a},setSelection:function(a){for(var b=this.ui.multi,c=[],d=0;d<b.length;d++)b[d]!==a&&c.push(b[d]),b[d].toBack();return c.unshift(a),this.ui.multi=c,this.ui.selection=a,a.toFront(),a},getSelection:function(a){var b=this.ui.selection.get();return b},newSelection:function(a){return a||(a=new this.opt.selectionComponent),a.init(this),this.setSelection(a),a},hasSelection:function(a){for(var b=0;b<this.ui.multi;b++)if(a===this.ui.multi[b])return!0},removeSelection:function(a){for(var b,c=[],d=this.ui.multi,b=0;b<d.length;b++)a!==d[b]?c.push(d[b]):d[b].remove();return this.ui.multi=c},addFilter:function(a){for(var b=0,c=this.ui.multi,d=c.length;d>b;b++)c[b].addFilter(a);return this},removeFilter:function(a){for(var b=0,c=this.ui.multi,d=c.length;d>b;b++)c[b].removeFilter(a);return this},blur:function(){return this.ui.selection.blur(),this},focus:function(){return this.ui.selection.focus(),this},initEvents:function(){var a=this;a.container.on("selectstart",function(a){return!1}).on("mousedown","."+a.opt.css_drag,a.startDrag())},maxSelect:function(){this.setSelect([0,0,this.elw,this.elh])},nudge:function(a,b){var c=this.ui.selection,d=c.get();d.x+=a,d.x2+=a,d.y+=b,d.y2+=b,d.x<0?(d.x2=d.w,d.x=0):d.x2>this.elw&&(d.x2=this.elw,d.x=d.x2-d.w),d.y<0?(d.y2=d.h,d.y=0):d.y2>this.elh&&(d.y2=this.elh,d.y=d.y2-d.h),c.element.trigger("cropstart",[c,this.unscale(d)]),c.updateRaw(d,"move"),c.element.trigger("cropend",[c,this.unscale(d)])},refresh:function(){for(var a=0,b=this.ui.multi,c=b.length;c>a;a++)b[a].refresh()},blurAll:function(){for(var a=this.ui.multi,b=0;b<a.length;b++)a[b]!==sel&&n.push(a[b]),a[b].toBack()},scale:function(a){var b=this.opt.xscale,c=this.opt.yscale;return{x:a.x/b,y:a.y/c,x2:a.x2/b,y2:a.y2/c,
+w:a.w/b,h:a.h/c}},unscale:function(a){var b=this.opt.xscale,c=this.opt.yscale;return{x:a.x*b,y:a.y*c,x2:a.x2*b,y2:a.y2*c,w:a.w*b,h:a.h*c}},requestDelete:function(){return this.ui.multi.length>1&&this.ui.selection.canDelete?this.deleteSelection():void 0},deleteSelection:function(){this.ui.selection&&(this.removeSelection(this.ui.selection),this.ui.multi.length&&this.ui.multi[0].focus(),this.ui.selection.refresh())},animateTo:function(a){return this.ui.selection&&this.ui.selection.animateTo(a),this},setSelect:function(a){return this.ui.selection&&this.ui.selection.update(b.wrapFromXywh(a)),this},startDrag:function(){var b=this;return function(c){var d=a(c.target),e=d.closest("."+b.opt.css_selection).data("selection"),f=d.data("ord");return b.container.trigger("cropstart",[e,b.unscale(e.get())]),e.startDrag(c,f),!1}},getContainerSize:function(){return[this.container.width(),this.container.height()]},resizeContainer:function(a,b){this.container.width(a).height(b),this.refresh()},setImage:function(b,c){var d=this,e=d.opt.imgsrc;return e?void new a.Jcrop.component.ImageLoader(b,null,function(f,g){d.resizeContainer(f,g),e.src=b,a(e).width(f).height(g),d.applySizeConstraints(),d.refresh(),d.container.trigger("cropimage",[d,e]),"function"==typeof c&&c.call(d,f,g)}):!1},update:function(a){this.ui.selection&&this.ui.selection.update(a)}}),a.fn.Jcrop=function(b,c){b=b||{};var d=this.eq(0).data("Jcrop"),e=Array.prototype.slice.call(arguments);return"api"==b?d:d&&"string"==typeof b?d[b]?(e.shift(),d[b].apply(d,e),d):!1:void this.each(function(){var d=a(this),e=d.data("Jcrop");return e?e.setOptions(b):(b.stageConstructor||(b.stageConstructor=a.Jcrop.stageConstructor),b.stageConstructor(this,b,function(b,e){var f=e.setSelect;f&&delete e.setSelect;var g=a.Jcrop.attach(b.element,e);"function"==typeof b.attach&&b.attach(g),d.data("Jcrop",g),f&&(g.newSelection(),g.setSelect(f)),"function"==typeof c&&c.call(g)})),this})};var z=function(a,b,c){function d(a){r.cssText=a}function e(a,b){return typeof a===b}function f(a,b){return!!~(""+a).indexOf(b)}function g(a,b){for(var d in a){var e=a[d];if(!f(e,"-")&&r[e]!==c)return"pfx"==b?e:!0}return!1}function h(a,b,d){for(var f in a){var g=b[a[f]];if(g!==c)return d===!1?a[f]:e(g,"function")?g.bind(d||b):g}return!1}function i(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),f=(a+" "+v.join(d+" ")+d).split(" ");return e(b,"string")||e(b,"undefined")?g(f,b):(f=(a+" "+w.join(d+" ")+d).split(" "),h(f,b,c))}var j,k,l,m="2.7.1",n={},o=b.documentElement,p="modernizr",q=b.createElement(p),r=q.style,s={}.toString,t=" -webkit- -moz- -o- -ms- ".split(" "),u="Webkit Moz O ms",v=u.split(" "),w=u.toLowerCase().split(" "),x={svg:"http://www.w3.org/2000/svg"},y={},z=[],A=z.slice,B=function(a,c,d,e){var f,g,h,i,j=b.createElement("div"),k=b.body,l=k||b.createElement("body");if(parseInt(d,10))for(;d--;)h=b.createElement("div"),h.id=e?e[d]:p+(d+1),j.appendChild(h);return f=["&#173;",'<style id="s',p,'">',a,"</style>"].join(""),j.id=p,(k?j:l).innerHTML+=f,l.appendChild(j),k||(l.style.background="",l.style.overflow="hidden",i=o.style.overflow,o.style.overflow="hidden",o.appendChild(l)),g=c(j,a),k?j.parentNode.removeChild(j):(l.parentNode.removeChild(l),o.style.overflow=i),!!g},C=function(){function a(a,f){f=f||b.createElement(d[a]||"div"),a="on"+a;var g=a in f;return g||(f.setAttribute||(f=b.createElement("div")),f.setAttribute&&f.removeAttribute&&(f.setAttribute(a,""),g=e(f[a],"function"),e(f[a],"undefined")||(f[a]=c),f.removeAttribute(a))),f=null,g}var d={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return a}(),D={}.hasOwnProperty;l=e(D,"undefined")||e(D.call,"undefined")?function(a,b){return b in a&&e(a.constructor.prototype[b],"undefined")}:function(a,b){return D.call(a,b)},Function.prototype.bind||(Function.prototype.bind=function(a){var b=this;if("function"!=typeof b)throw new TypeError;var c=A.call(arguments,1),d=function(){if(this instanceof d){var e=function(){};e.prototype=b.prototype;var f=new e,g=b.apply(f,c.concat(A.call(arguments)));return Object(g)===g?g:f}return b.apply(a,c.concat(A.call(arguments)))};return d}),y.canvas=function(){var a=b.createElement("canvas");return!(!a.getContext||!a.getContext("2d"))},y.canvastext=function(){return!(!n.canvas||!e(b.createElement("canvas").getContext("2d").fillText,"function"))},y.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:B(["@media (",t.join("touch-enabled),("),p,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=9===a.offsetTop}),c},y.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},y.csstransforms=function(){return!!i("transform")},y.svg=function(){return!!b.createElementNS&&!!b.createElementNS(x.svg,"svg").createSVGRect},y.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==x.svg},y.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(s.call(b.createElementNS(x.svg,"clipPath")))};for(var E in y)l(y,E)&&(k=E.toLowerCase(),n[k]=y[E](),z.push((n[k]?"":"no-")+k));return n.addTest=function(a,b){if("object"==typeof a)for(var d in a)l(a,d)&&n.addTest(d,a[d]);else{if(a=a.toLowerCase(),n[a]!==c)return n;b="function"==typeof b?b():b,"undefined"!=typeof enableClasses&&enableClasses&&(o.className+=" "+(b?"":"no-")+a),n[a]=b}return n},d(""),q=j=null,n._version=m,n._prefixes=t,n._domPrefixes=w,n._cssomPrefixes=v,n.hasEvent=C,n.testProp=function(a){return g([a])},n.testAllProps=i,n.testStyles=B,n}(window,window.document);!function(){var a=new Image;a.onerror=function(){z.addTest("datauri",function(){return!1})},a.onload=function(){z.addTest("datauri",function(){return 1==a.width&&1==a.height})},a.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=="}(),a.Jcrop=b,a.Jcrop.supportsCanvas=z.canvas,a.Jcrop.supportsCanvasText=z.canvastext,a.Jcrop.supportsDragAndDrop=z.draganddrop,a.Jcrop.supportsDataURI=z.datauri,a.Jcrop.supportsSVG=z.svg,a.Jcrop.supportsInlineSVG=z.inlinesvg,a.Jcrop.supportsSVGClipPaths=z.svgclippaths,a.Jcrop.supportsCSSTransforms=z.csstransforms,a.Jcrop.supportsTouch=z.touch}(jQuery);
\ No newline at end of file
diff --git a/core/media/system/js/keepalive-uncompressed.js b/core/media/system/js/keepalive-uncompressed.js
new file mode 100644
index 00000000..9569be18
--- /dev/null
+++ b/core/media/system/js/keepalive-uncompressed.js
@@ -0,0 +1,47 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Keepalive javascript behavior
+ *
+ * Used for keeping the session alive
+ *
+ * @package  Joomla
+ * @since    3.7.0
+ */
+!(function(){
+	'use strict';
+
+	document.addEventListener('DOMContentLoaded', function() {
+
+		var keepaliveOptions  = Joomla.getOptions('system.keepalive'),
+		    keepaliveUri      = keepaliveOptions && keepaliveOptions.uri ? keepaliveOptions.uri.replace(/&amp;/g, '&') : '',
+		    keepaliveInterval = keepaliveOptions && keepaliveOptions.interval ? keepaliveOptions.interval : 45 * 1000;
+
+		// Fallback in case no keepalive uri was found.
+		if (keepaliveUri === '')
+		{
+			var systemPaths = Joomla.getOptions('system.paths');
+
+			keepaliveUri = (systemPaths ? systemPaths.root + '/index.php' : window.location.pathname) + '?option=com_ajax&format=json';
+		}
+
+		window.setInterval(function() {
+			Joomla.request({
+				url: keepaliveUri,
+				onSuccess: function(response, xhr)
+				{
+					// Do nothing
+				},
+				onError: function(xhr)
+				{
+					// Do nothing
+				}
+			});
+		}, keepaliveInterval);
+
+	});
+
+})(window, document, Joomla);
diff --git a/core/media/system/js/keepalive.js b/core/media/system/js/keepalive.js
new file mode 100644
index 00000000..ec2cb13e
--- /dev/null
+++ b/core/media/system/js/keepalive.js
@@ -0,0 +1 @@
+!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){var o=Joomla.getOptions("system.keepalive"),n=o&&o.uri?o.uri.replace(/&amp;/g,"&"):"",t=o&&o.interval?o.interval:45e3;if(""===n){var e=Joomla.getOptions("system.paths");n=(e?e.root+"/index.php":window.location.pathname)+"?option=com_ajax&format=json"}window.setInterval(function(){Joomla.request({url:n,onSuccess:function(){},onError:function(){}})},t)})}(window,document,Joomla);
diff --git a/core/media/system/js/modal-fields-uncompressed.js b/core/media/system/js/modal-fields-uncompressed.js
new file mode 100644
index 00000000..a8e3e8f4
--- /dev/null
+++ b/core/media/system/js/modal-fields-uncompressed.js
@@ -0,0 +1,191 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(function() {
+	"use strict";
+
+	/**
+	 * Process modal fields in parent.
+	 *
+	 * @param   string  fieldPrefix  The fields to be updated prefix.
+	 * @param   string  id           The new id for the item.
+	 * @param   string  title        The new title for the item.
+	 * @param   string  catid        Future usage.
+	 * @param   object  object       Future usage.
+	 * @param   string  url          Future usage.
+	 * @param   string  language     Future usage.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	window.processModalParent = function (fieldPrefix, id, title, catid, url, language, object)
+	{
+		var fieldId = document.getElementById(fieldPrefix + '_id'), fieldTitle = document.getElementById(fieldPrefix + '_name');
+
+		// Default values.
+		id       = id || '';
+		title    = title || '';
+		catid    = catid || '';
+		object   = object || '';
+		url      = url || '';
+		language = language || '';
+
+		if (id)
+		{
+			fieldId.value    = id;
+			fieldTitle.value = title;
+
+			if (document.getElementById(fieldPrefix + '_select'))
+			{
+				jQuery('#' + fieldPrefix + '_select').addClass('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_new'))
+			{
+				jQuery('#' + fieldPrefix + '_new').addClass('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_edit'))
+			{
+				jQuery('#' + fieldPrefix + '_edit').removeClass('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_clear'))
+			{
+				jQuery('#' + fieldPrefix + '_clear').removeClass('hidden');
+			}
+		}
+		else
+		{
+			fieldId.value    = '';
+			fieldTitle.value = fieldId.getAttribute('data-text');
+
+			if (document.getElementById(fieldPrefix + '_select'))
+			{
+				jQuery('#' + fieldPrefix + '_select').removeClass('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_new'))
+			{
+				jQuery('#' + fieldPrefix + '_new').removeClass('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_edit'))
+			{
+				jQuery('#' + fieldPrefix + '_edit').addClass('hidden');
+			}
+			if (document.getElementById(fieldPrefix + '_clear'))
+			{
+				jQuery('#' + fieldPrefix + '_clear').addClass('hidden');
+			}
+		}
+
+		if (fieldId.getAttribute('data-required') == '1')
+		{
+			document.formvalidator.validate(fieldId);
+			document.formvalidator.validate(fieldTitle);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Process new/edit modal fields in child.
+	 *
+	 * @param   object  element       The modal footer button element.
+	 * @param   string  fieldPrefix   The fields to be updated prefix.
+	 * @param   string  action        Modal action (add, edit).
+	 * @param   string  itemType      The item type (Article, Contact, etc).
+	 * @param   string  task          Task to be done (apply, save, cancel).
+	 * @param   string  formId        Id of the form field (defaults to itemtype-form).
+	 * @param   string  idFieldId     Id of the id field (defaults to jform_id).
+	 * @param   string  titleFieldId  Id of the title field (defaults to jform_title).
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	window.processModalEdit = function (element, fieldPrefix, action, itemType, task, formId, idFieldId, titleFieldId)
+	{
+		formId       = formId || itemType.toLowerCase() + '-form';
+		idFieldId    = idFieldId || 'jform_id';
+		titleFieldId = titleFieldId || 'jform_title';
+
+		var modalId = element.parentNode.parentNode.id, submittedTask = task;
+
+		// Set frame id.
+		jQuery('#' + modalId + ' iframe').get(0).id = 'Frame_' + modalId;
+
+		var iframeDocument = jQuery('#Frame_' + modalId).contents().get(0);
+
+		// If Close (cancel task), close the modal.
+		if (task === 'cancel')
+		{
+			// Submit button on child iframe so we can check out.
+			document.getElementById('Frame_' + modalId).contentWindow.Joomla.submitbutton(itemType.toLowerCase() + '.' + task);
+
+			jQuery('#' + modalId).modal('hide');
+		}
+		// For Save (apply task) and Save & Close (save task).
+		else
+		{
+			// Attach onload event to the iframe.
+			jQuery('#Frame_' + modalId).on('load', function()
+			{
+				// Reload iframe document var value.
+				iframeDocument = jQuery(this).contents().get(0);
+
+				// Validate the child form and update parent form.
+				if (iframeDocument.getElementById(idFieldId) && iframeDocument.getElementById(idFieldId).value != '0')
+				{
+					window.processModalParent(fieldPrefix, iframeDocument.getElementById(idFieldId).value, iframeDocument.getElementById(titleFieldId).value);
+
+					// If Save & Close (save task), submit the edit close action (so we don't have checked out items).
+					if (task === 'save')
+					{
+						window.processModalEdit(element, fieldPrefix, 'edit', itemType, 'cancel', formId, idFieldId, titleFieldId);
+					}
+				}
+
+				// Show the iframe again for future modals or in case of error.
+				jQuery('#' + modalId + ' iframe').removeClass('hidden');
+			});
+
+			// Submit button on child iframe.
+			if (iframeDocument.formvalidator.isValid(iframeDocument.getElementById(formId)))
+			{
+				// For Save & Close (save task) when creating we need to replace the task as apply because of redirects after submit and hide the iframe.
+				if (task === 'save')
+				{
+					submittedTask = 'apply';
+				}
+
+				document.getElementById('Frame_' + modalId).contentWindow.Joomla.submitbutton(itemType.toLowerCase() + '.' + submittedTask);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Process select modal fields in child.
+	 *
+	 * @param   string  itemType     The item type (Article, Contact, etc).
+	 * @param   string  fieldPrefix  The fields to be updated prefix.
+	 * @param   string  id           The new id for the item.
+	 * @param   string  title        The new title for the item.
+	 * @param   string  catid        Future usage.
+	 * @param   object  object       Future usage.
+	 * @param   string  url          Future usage.
+	 * @param   string  language     Future usage.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	window.processModalSelect = function(itemType, fieldPrefix, id, title, catid, object, url, language) {
+		window.processModalParent(fieldPrefix, id, title, catid, url, language, object);
+		jQuery('#ModalSelect' + itemType + '_' + fieldPrefix).modal('hide');
+
+		return false;
+	}
+
+}());
diff --git a/core/media/system/js/modal-fields.js b/core/media/system/js/modal-fields.js
new file mode 100644
index 00000000..1c916aba
--- /dev/null
+++ b/core/media/system/js/modal-fields.js
@@ -0,0 +1 @@
+(function(){"use strict";window.processModalParent=function(fieldPrefix,id,title,catid,url,language,object){var fieldId=document.getElementById(fieldPrefix+"_id"),fieldTitle=document.getElementById(fieldPrefix+"_name");id=id||"";title=title||"";catid=catid||"";object=object||"";url=url||"";language=language||"";if(id){fieldId.value=id;fieldTitle.value=title;if(document.getElementById(fieldPrefix+"_select")){jQuery("#"+fieldPrefix+"_select").addClass("hidden")}if(document.getElementById(fieldPrefix+"_new")){jQuery("#"+fieldPrefix+"_new").addClass("hidden")}if(document.getElementById(fieldPrefix+"_edit")){jQuery("#"+fieldPrefix+"_edit").removeClass("hidden")}if(document.getElementById(fieldPrefix+"_clear")){jQuery("#"+fieldPrefix+"_clear").removeClass("hidden")}}else{fieldId.value="";fieldTitle.value=fieldId.getAttribute("data-text");if(document.getElementById(fieldPrefix+"_select")){jQuery("#"+fieldPrefix+"_select").removeClass("hidden")}if(document.getElementById(fieldPrefix+"_new")){jQuery("#"+fieldPrefix+"_new").removeClass("hidden")}if(document.getElementById(fieldPrefix+"_edit")){jQuery("#"+fieldPrefix+"_edit").addClass("hidden")}if(document.getElementById(fieldPrefix+"_clear")){jQuery("#"+fieldPrefix+"_clear").addClass("hidden")}}if(fieldId.getAttribute("data-required")=="1"){document.formvalidator.validate(fieldId);document.formvalidator.validate(fieldTitle)}return false};window.processModalEdit=function(element,fieldPrefix,action,itemType,task,formId,idFieldId,titleFieldId){formId=formId||itemType.toLowerCase()+"-form";idFieldId=idFieldId||"jform_id";titleFieldId=titleFieldId||"jform_title";var modalId=element.parentNode.parentNode.id,submittedTask=task;jQuery("#"+modalId+" iframe").get(0).id="Frame_"+modalId;var iframeDocument=jQuery("#Frame_"+modalId).contents().get(0);if(task==="cancel"){document.getElementById("Frame_"+modalId).contentWindow.Joomla.submitbutton(itemType.toLowerCase()+"."+task);jQuery("#"+modalId).modal("hide")}else{jQuery("#Frame_"+modalId).on("load",function(){iframeDocument=jQuery(this).contents().get(0);if(iframeDocument.getElementById(idFieldId)&&iframeDocument.getElementById(idFieldId).value!="0"){window.processModalParent(fieldPrefix,iframeDocument.getElementById(idFieldId).value,iframeDocument.getElementById(titleFieldId).value);if(task==="save"){window.processModalEdit(element,fieldPrefix,"edit",itemType,"cancel",formId,idFieldId,titleFieldId)}}jQuery("#"+modalId+" iframe").removeClass("hidden")});if(iframeDocument.formvalidator.isValid(iframeDocument.getElementById(formId))){if(task==="save"){submittedTask="apply"}document.getElementById("Frame_"+modalId).contentWindow.Joomla.submitbutton(itemType.toLowerCase()+"."+submittedTask)}}return false};window.processModalSelect=function(itemType,fieldPrefix,id,title,catid,object,url,language){window.processModalParent(fieldPrefix,id,title,catid,url,language,object);jQuery("#ModalSelect"+itemType+"_"+fieldPrefix).modal("hide");return false}})();
\ No newline at end of file
diff --git a/core/media/system/js/modal-uncompressed.js b/core/media/system/js/modal-uncompressed.js
new file mode 100644
index 00000000..803a58fe
--- /dev/null
+++ b/core/media/system/js/modal-uncompressed.js
@@ -0,0 +1,477 @@
+/**
+ * SqueezeBox - Expandable Lightbox
+ *
+ * Allows to open various content as modal,
+ * centered and animated box.
+ *
+ * Dependencies: MooTools 1.4 or newer
+ *
+ * Inspired by
+ *  ... Lokesh Dhakar	- The original Lightbox v2
+ *
+ * @version		1.3
+ *
+ * @license		MIT-style license
+ * @author		Harald Kirschner <mail [at] digitarald.de>
+ * @author		Rouven Weßling <me [at] rouvenwessling.de>
+ * @copyright	Author
+ */
+
+var SqueezeBox = {
+
+	presets: {
+		onOpen: function(){},
+		onClose: function(){},
+		onUpdate: function(){},
+		onResize: function(){},
+		onMove: function(){},
+		onShow: function(){},
+		onHide: function(){},
+		size: {x: 600, y: 450},
+		sizeLoading: {x: 200, y: 150},
+		marginInner: {x: 20, y: 20},
+		marginImage: {x: 50, y: 75},
+		handler: false,
+		target: null,
+		closable: true,
+		closeBtn: true,
+		zIndex: 65555,
+		overlayOpacity: 0.7,
+		classWindow: '',
+		classOverlay: '',
+		overlayFx: {},
+		resizeFx: {},
+		contentFx: {},
+		parse: false, // 'rel'
+		parseSecure: false,
+		shadow: true,
+		overlay: true,
+		document: null,
+		ajaxOptions: {}
+	},
+
+	initialize: function(presets) {
+		if (this.options) return this;
+
+		this.presets = Object.merge(this.presets, presets);
+		this.doc = this.presets.document || document;
+		this.options = {};
+		this.setOptions(this.presets).build();
+		this.bound = {
+			window: this.reposition.bind(this, [null]),
+			scroll: this.checkTarget.bind(this),
+			close: this.close.bind(this),
+			key: this.onKey.bind(this)
+		};
+		this.isOpen = this.isLoading = false;
+		return this;
+	},
+
+	build: function() {
+		this.overlay = new Element('div', {
+			id: 'sbox-overlay',
+			'aria-hidden': 'true',
+			styles: { zIndex: this.options.zIndex},
+			tabindex: -1
+		});
+		this.win = new Element('div', {
+			id: 'sbox-window',
+			role: 'dialog',
+			'aria-hidden': 'true',
+			styles: {zIndex: this.options.zIndex + 2}
+		});
+		if (this.options.shadow) {
+			if (Browser.chrome
+			|| (Browser.safari && Browser.version >= 3)
+			|| (Browser.opera && Browser.version >= 10.5)
+			|| (Browser.firefox && Browser.version >= 3.5)
+			|| (Browser.ie && Browser.version >= 9)) {
+				this.win.addClass('shadow');
+			} else if (!Browser.ie6) {
+				var shadow = new Element('div', {'class': 'sbox-bg-wrap'}).inject(this.win);
+				var relay = function(e) {
+					this.overlay.fireEvent('click', [e]);
+				}.bind(this);
+				['n', 'ne', 'e', 'se', 's', 'sw', 'w', 'nw'].each(function(dir) {
+					new Element('div', {'class': 'sbox-bg sbox-bg-' + dir}).inject(shadow).addEvent('click', relay);
+				});
+			}
+		}
+		this.content = new Element('div', {id: 'sbox-content'}).inject(this.win);
+		this.closeBtn = new Element('a', {id: 'sbox-btn-close', href: '#', role: 'button'}).inject(this.win);
+		this.closeBtn.setProperty('aria-controls', 'sbox-window');
+		this.fx = {
+			overlay: new Fx.Tween(this.overlay, Object.merge({
+				property: 'opacity',
+				onStart: Events.prototype.clearChain,
+				duration: 250,
+				link: 'cancel'
+			}, this.options.overlayFx)).set(0),
+			win: new Fx.Morph(this.win, Object.merge({
+				onStart: Events.prototype.clearChain,
+				unit: 'px',
+				duration: 750,
+				transition: Fx.Transitions.Quint.easeOut,
+				link: 'cancel',
+				unit: 'px'
+			}, this.options.resizeFx)),
+			content: new Fx.Tween(this.content, Object.merge({
+				property: 'opacity',
+				duration: 250,
+				link: 'cancel'
+			}, this.options.contentFx)).set(0)
+		};
+		document.id(this.doc.body).adopt(this.overlay, this.win);
+	},
+
+	assign: function(to, options) {
+		return (document.id(to) || $$(to)).addEvent('click', function() {
+			return !SqueezeBox.fromElement(this, options);
+		});
+	},
+
+	open: function(subject, options) {
+		this.initialize();
+
+		if (this.element != null) this.trash();
+		this.element = document.id(subject) || false;
+
+		this.setOptions(Object.merge(this.presets, options || {}));
+
+		if (this.element && this.options.parse) {
+			var obj = this.element.getProperty(this.options.parse);
+			if (obj && (obj = JSON.decode(obj, this.options.parseSecure))) this.setOptions(obj);
+		}
+		this.url = ((this.element) ? (this.element.get('href')) : subject) || this.options.url || '';
+
+		this.assignOptions();
+
+		var handler = handler || this.options.handler;
+		if (handler) return this.setContent(handler, this.parsers[handler].call(this, true));
+		var ret = false;
+		return this.parsers.some(function(parser, key) {
+			var content = parser.call(this);
+			if (content) {
+				ret = this.setContent(key, content);
+				return true;
+			}
+			return false;
+		}, this);
+	},
+
+	fromElement: function(from, options) {
+		return this.open(from, options);
+	},
+
+	assignOptions: function() {
+		this.overlay.addClass(this.options.classOverlay);
+		this.win.addClass(this.options.classWindow);
+	},
+
+	close: function(e) {
+		var stoppable = (typeOf(e) == 'domevent');
+		if (stoppable) e.stop();
+		if (!this.isOpen || (stoppable && !Function.from(this.options.closable).call(this, e))) return this;
+		this.fx.overlay.start(0).chain(this.toggleOverlay.bind(this));
+		this.win.setProperty('aria-hidden', 'true');
+		this.fireEvent('onClose', [this.content]);
+		this.trash();
+		this.toggleListeners();
+		this.isOpen = false;
+		return this;
+	},
+
+	trash: function() {
+		this.element = this.asset = null;
+		this.content.empty();
+		this.options = {};
+		this.removeEvents().setOptions(this.presets).callChain();
+	},
+
+	onError: function() {
+		this.asset = null;
+		this.setContent('string', this.options.errorMsg || 'An error occurred');
+	},
+
+	setContent: function(handler, content) {
+		if (!this.handlers[handler]) return false;
+		this.content.className = 'sbox-content-' + handler;
+		this.applyTimer = this.applyContent.delay(this.fx.overlay.options.duration, this, this.handlers[handler].call(this, content));
+		if (this.overlay.retrieve('opacity')) return this;
+		this.toggleOverlay(true);
+		this.fx.overlay.start(this.options.overlayOpacity);
+		return this.reposition();
+	},
+
+	applyContent: function(content, size) {
+		if (!this.isOpen && !this.applyTimer) return;
+		this.applyTimer = clearTimeout(this.applyTimer);
+		this.hideContent();
+		if (!content) {
+			this.toggleLoading(true);
+		} else {
+			if (this.isLoading) this.toggleLoading(false);
+			this.fireEvent('onUpdate', [this.content], 20);
+		}
+		if (content) {
+			if (['string', 'array'].contains(typeOf(content))) {
+				this.content.set('html', content);
+			} else {
+				this.content.adopt(content);
+			}
+		}
+		this.callChain();
+		if (!this.isOpen) {
+			this.toggleListeners(true);
+			this.resize(size, true);
+			this.isOpen = true;
+			this.win.setProperty('aria-hidden', 'false');
+			this.fireEvent('onOpen', [this.content]);
+		} else {
+			this.resize(size);
+		}
+	},
+
+	resize: function(size, instantly) {
+		this.showTimer = clearTimeout(this.showTimer || null);
+		var box = this.doc.getSize(), scroll = this.doc.getScroll();
+		this.size = Object.merge((this.isLoading) ? this.options.sizeLoading : this.options.size, size);
+		var parentSize = self.getSize();
+		if (this.size.x == parentSize.x) {
+			this.size.y = this.size.y - 50;
+			this.size.x = this.size.x - 20;
+		}
+		if (box.x > 979) {
+			var to = {
+				width: this.size.x,
+				height: this.size.y,
+				left: (scroll.x + (box.x - this.size.x - this.options.marginInner.x) / 2).toInt(),
+				top: (scroll.y + (box.y - this.size.y - this.options.marginInner.y) / 2).toInt()
+			};
+		} else {
+			var to = {
+				width: box.x - 40,
+				height: box.y,
+				left: (scroll.x + 10).toInt(),
+				top: (scroll.y + 20).toInt()
+			};
+		}
+		this.hideContent();
+		if (!instantly) {
+			this.fx.win.start(to).chain(this.showContent.bind(this));
+		} else {
+			this.win.setStyles(to);
+			this.showTimer = this.showContent.delay(50, this);
+		}
+		return this.reposition();
+	},
+
+	toggleListeners: function(state) {
+		var fn = (state) ? 'addEvent' : 'removeEvent';
+		this.closeBtn[fn]('click', this.bound.close);
+		this.overlay[fn]('click', this.bound.close);
+		this.doc[fn]('keydown', this.bound.key)[fn]('mousewheel', this.bound.scroll);
+		this.doc.getWindow()[fn]('resize', this.bound.window)[fn]('scroll', this.bound.window);
+	},
+
+	toggleLoading: function(state) {
+		this.isLoading = state;
+		this.win[(state) ? 'addClass' : 'removeClass']('sbox-loading');
+		if (state) {
+			this.win.setProperty('aria-busy', state);
+			this.fireEvent('onLoading', [this.win]);
+		}
+	},
+
+	toggleOverlay: function(state) {
+		if (this.options.overlay) {
+			var full = this.doc.getSize().x;
+			this.overlay.set('aria-hidden', (state) ? 'false' : 'true');
+			this.doc.body[(state) ? 'addClass' : 'removeClass']('body-overlayed');
+			if (state) {
+				this.scrollOffset = this.doc.getWindow().getSize().x - full;
+			} else {
+				this.doc.body.setStyle('margin-right', '');
+			}
+		}
+	},
+
+	showContent: function() {
+		if (this.content.get('opacity')) this.fireEvent('onShow', [this.win]);
+		this.fx.content.start(1);
+	},
+
+	hideContent: function() {
+		if (!this.content.get('opacity')) this.fireEvent('onHide', [this.win]);
+		this.fx.content.cancel().set(0);
+	},
+
+	onKey: function(e) {
+		switch (e.key) {
+			case 'esc': this.close(e);
+			case 'up': case 'down': return false;
+		}
+	},
+
+	checkTarget: function(e) {
+		return e.target !== this.content && this.content.contains(e.target);
+	},
+
+	reposition: function() {
+		var size = this.doc.getSize(), scroll = this.doc.getScroll(), ssize = this.doc.getScrollSize();
+		var over = this.overlay.getStyles('height');
+		var j = parseInt(over.height);
+		if (ssize.y > j && size.y >= j) {
+			this.overlay.setStyles({
+				width: ssize.x + 'px',
+				height: ssize.y + 'px'
+			});
+			this.win.setStyles({
+				left: (scroll.x + (size.x - this.win.offsetWidth) / 2 - this.scrollOffset).toInt() + 'px',
+				top: (scroll.y + (size.y - this.win.offsetHeight) / 2).toInt() + 'px'
+			});
+		}
+		return this.fireEvent('onMove', [this.overlay, this.win]);
+	},
+
+	removeEvents: function(type){
+		if (!this.$events) return this;
+		if (!type) this.$events = null;
+		else if (this.$events[type]) this.$events[type] = null;
+		return this;
+	},
+
+	extend: function(properties) {
+		return Object.append(this, properties);
+	},
+
+	handlers: new Hash(),
+
+	parsers: new Hash()
+};
+
+SqueezeBox.extend(new Events(function(){})).extend(new Options(function(){})).extend(new Chain(function(){}));
+
+SqueezeBox.parsers.extend({
+
+	image: function(preset) {
+		return (preset || (/\.(?:jpg|png|gif)$/i).test(this.url)) ? this.url : false;
+	},
+
+	clone: function(preset) {
+		if (document.id(this.options.target)) return document.id(this.options.target);
+		if (this.element && !this.element.parentNode) return this.element;
+		var bits = this.url.match(/#([\w-]+)$/);
+		return (bits) ? document.id(bits[1]) : (preset ? this.element : false);
+	},
+
+	ajax: function(preset) {
+		return (preset || (this.url && !(/^(?:javascript|#)/i).test(this.url))) ? this.url : false;
+	},
+
+	iframe: function(preset) {
+		return (preset || this.url) ? this.url : false;
+	},
+
+	string: function(preset) {
+		return true;
+	}
+});
+
+SqueezeBox.handlers.extend({
+
+	image: function(url) {
+		var size, tmp = new Image();
+		this.asset = null;
+		tmp.onload = tmp.onabort = tmp.onerror = (function() {
+			tmp.onload = tmp.onabort = tmp.onerror = null;
+			if (!tmp.width) {
+				this.onError.delay(10, this);
+				return;
+			}
+			var box = this.doc.getSize();
+			box.x -= this.options.marginImage.x;
+			box.y -= this.options.marginImage.y;
+			size = {x: tmp.width, y: tmp.height};
+			for (var i = 2; i--;) {
+				if (size.x > box.x) {
+					size.y *= box.x / size.x;
+					size.x = box.x;
+				} else if (size.y > box.y) {
+					size.x *= box.y / size.y;
+					size.y = box.y;
+				}
+			}
+			size.x = size.x.toInt();
+			size.y = size.y.toInt();
+			this.asset = document.id(tmp);
+			tmp = null;
+			this.asset.width = size.x;
+			this.asset.height = size.y;
+			this.applyContent(this.asset, size);
+		}).bind(this);
+		tmp.src = url;
+		if (tmp && tmp.onload && tmp.complete) tmp.onload();
+		return (this.asset) ? [this.asset, size] : null;
+	},
+
+	clone: function(el) {
+		if (el) return el.clone();
+		return this.onError();
+	},
+
+	adopt: function(el) {
+		if (el) return el;
+		return this.onError();
+	},
+
+	ajax: function(url) {
+		var options = this.options.ajaxOptions || {};
+		this.asset = new Request.HTML(Object.merge({
+			method: 'get',
+			evalScripts: false
+		}, this.options.ajaxOptions)).addEvents({
+			onSuccess: function(resp) {
+				this.applyContent(resp);
+				if (options.evalScripts !== null && !options.evalScripts) Browser.exec(this.asset.response.javascript);
+				this.fireEvent('onAjax', [resp, this.asset]);
+				this.asset = null;
+			}.bind(this),
+			onFailure: this.onError.bind(this)
+		});
+		this.asset.send.delay(10, this.asset, [{url: url}]);
+	},
+
+	iframe: function(url) {
+		var box = this.doc.getSize();
+		if (box.x > 979) {
+			var modal_width = this.options.size.x;
+			var modal_height = this.options.size.y;
+		} else {
+			var modal_width = box.x;
+			var modal_height = box.y - 50;
+		}
+		this.asset = new Element('iframe', Object.merge({
+			src: url,
+			frameBorder: 0,
+			width: modal_width,
+			height: modal_height
+		}, this.options.iframeOptions));
+		if (this.options.iframePreload) {
+			this.asset.addEvent('load', function() {
+				this.applyContent(this.asset.setStyle('display', ''));
+			}.bind(this));
+			this.asset.setStyle('display', 'none').inject(this.content);
+			return false;
+		}
+		return this.asset;
+	},
+
+	string: function(str) {
+		return str;
+	}
+});
+
+SqueezeBox.handlers.url = SqueezeBox.handlers.ajax;
+SqueezeBox.parsers.url = SqueezeBox.parsers.ajax;
+SqueezeBox.parsers.adopt = SqueezeBox.parsers.clone;
diff --git a/core/media/system/js/modal.js b/core/media/system/js/modal.js
new file mode 100644
index 00000000..892d198b
--- /dev/null
+++ b/core/media/system/js/modal.js
@@ -0,0 +1,7 @@
+/*
+		MIT-style license
+ @author		Harald Kirschner <mail [at] digitarald.de>
+ @author		Rouven Weßling <me [at] rouvenwessling.de>
+ @copyright	Author
+*/
+var SqueezeBox={presets:{onOpen:function(){},onClose:function(){},onUpdate:function(){},onResize:function(){},onMove:function(){},onShow:function(){},onHide:function(){},size:{x:600,y:450},sizeLoading:{x:200,y:150},marginInner:{x:20,y:20},marginImage:{x:50,y:75},handler:false,target:null,closable:true,closeBtn:true,zIndex:65555,overlayOpacity:.7,classWindow:"",classOverlay:"",overlayFx:{},resizeFx:{},contentFx:{},parse:false,parseSecure:false,shadow:true,overlay:true,document:null,ajaxOptions:{}},initialize:function(e){if(this.options)return this;this.presets=Object.merge(this.presets,e);this.doc=this.presets.document||document;this.options={};this.setOptions(this.presets).build();this.bound={window:this.reposition.bind(this,[null]),scroll:this.checkTarget.bind(this),close:this.close.bind(this),key:this.onKey.bind(this)};this.isOpen=this.isLoading=false;return this},build:function(){this.overlay=new Element("div",{id:"sbox-overlay","aria-hidden":"true",styles:{zIndex:this.options.zIndex},tabindex:-1});this.win=new Element("div",{id:"sbox-window",role:"dialog","aria-hidden":"true",styles:{zIndex:this.options.zIndex+2}});if(this.options.shadow){if(Browser.chrome||Browser.safari&&Browser.version>=3||Browser.opera&&Browser.version>=10.5||Browser.firefox&&Browser.version>=3.5||Browser.ie&&Browser.version>=9){this.win.addClass("shadow")}else if(!Browser.ie6){var e=(new Element("div",{"class":"sbox-bg-wrap"})).inject(this.win);var t=function(e){this.overlay.fireEvent("click",[e])}.bind(this);["n","ne","e","se","s","sw","w","nw"].each(function(n){(new Element("div",{"class":"sbox-bg sbox-bg-"+n})).inject(e).addEvent("click",t)})}}this.content=(new Element("div",{id:"sbox-content"})).inject(this.win);this.closeBtn=(new Element("a",{id:"sbox-btn-close",href:"#",role:"button"})).inject(this.win);this.closeBtn.setProperty("aria-controls","sbox-window");this.fx={overlay:(new Fx.Tween(this.overlay,Object.merge({property:"opacity",onStart:Events.prototype.clearChain,duration:250,link:"cancel"},this.options.overlayFx))).set(0),win:new Fx.Morph(this.win,Object.merge({onStart:Events.prototype.clearChain,unit:"px",duration:750,transition:Fx.Transitions.Quint.easeOut,link:"cancel",unit:"px"},this.options.resizeFx)),content:(new Fx.Tween(this.content,Object.merge({property:"opacity",duration:250,link:"cancel"},this.options.contentFx))).set(0)};document.id(this.doc.body).adopt(this.overlay,this.win)},assign:function(e,t){return(document.id(e)||$$(e)).addEvent("click",function(){return!SqueezeBox.fromElement(this,t)})},open:function(e,t){this.initialize();if(this.element!=null)this.trash();this.element=document.id(e)||false;this.setOptions(Object.merge(this.presets,t||{}));if(this.element&&this.options.parse){var n=this.element.getProperty(this.options.parse);if(n&&(n=JSON.decode(n,this.options.parseSecure)))this.setOptions(n)}this.url=(this.element?this.element.get("href"):e)||this.options.url||"";this.assignOptions();var r=r||this.options.handler;if(r)return this.setContent(r,this.parsers[r].call(this,true));var i=false;return this.parsers.some(function(e,t){var n=e.call(this);if(n){i=this.setContent(t,n);return true}return false},this)},fromElement:function(e,t){return this.open(e,t)},assignOptions:function(){this.overlay.addClass(this.options.classOverlay);this.win.addClass(this.options.classWindow)},close:function(e){var t=typeOf(e)=="domevent";if(t)e.stop();if(!this.isOpen||t&&!Function.from(this.options.closable).call(this,e))return this;this.fx.overlay.start(0).chain(this.toggleOverlay.bind(this));this.win.setProperty("aria-hidden","true");this.fireEvent("onClose",[this.content]);this.trash();this.toggleListeners();this.isOpen=false;return this},trash:function(){this.element=this.asset=null;this.content.empty();this.options={};this.removeEvents().setOptions(this.presets).callChain()},onError:function(){this.asset=null;this.setContent("string",this.options.errorMsg||"An error occurred")},setContent:function(e,t){if(!this.handlers[e])return false;this.content.className="sbox-content-"+e;this.applyTimer=this.applyContent.delay(this.fx.overlay.options.duration,this,this.handlers[e].call(this,t));if(this.overlay.retrieve("opacity"))return this;this.toggleOverlay(true);this.fx.overlay.start(this.options.overlayOpacity);return this.reposition()},applyContent:function(e,t){if(!this.isOpen&&!this.applyTimer)return;this.applyTimer=clearTimeout(this.applyTimer);this.hideContent();if(!e){this.toggleLoading(true)}else{if(this.isLoading)this.toggleLoading(false);this.fireEvent("onUpdate",[this.content],20)}if(e){if(["string","array"].contains(typeOf(e))){this.content.set("html",e)}else {this.content.adopt(e)}}this.callChain();if(!this.isOpen){this.toggleListeners(true);this.resize(t,true);this.isOpen=true;this.win.setProperty("aria-hidden","false");this.fireEvent("onOpen",[this.content])}else{this.resize(t)}},resize:function(e,t){this.showTimer=clearTimeout(this.showTimer||null);var n=this.doc.getSize(),r=this.doc.getScroll();this.size=Object.merge(this.isLoading?this.options.sizeLoading:this.options.size,e);var i=self.getSize();if(this.size.x==i.x){this.size.y=this.size.y-50;this.size.x=this.size.x-20}if(n.x>979){var s={width:this.size.x,height:this.size.y,left:(r.x+(n.x-this.size.x-this.options.marginInner.x)/2).toInt(),top:(r.y+(n.y-this.size.y-this.options.marginInner.y)/2).toInt()}}else{var s={width:n.x-40,height:n.y,left:(r.x+10).toInt(),top:(r.y+20).toInt()}}this.hideContent();if(!t){this.fx.win.start(s).chain(this.showContent.bind(this))}else{this.win.setStyles(s);this.showTimer=this.showContent.delay(50,this)}return this.reposition()},toggleListeners:function(e){var t=e?"addEvent":"removeEvent";this.closeBtn[t]("click",this.bound.close);this.overlay[t]("click",this.bound.close);this.doc[t]("keydown",this.bound.key)[t]("mousewheel",this.bound.scroll);this.doc.getWindow()[t]("resize",this.bound.window)[t]("scroll",this.bound.window)},toggleLoading:function(e){this.isLoading=e;this.win[e?"addClass":"removeClass"]("sbox-loading");if(e){this.win.setProperty("aria-busy",e);this.fireEvent("onLoading",[this.win])}},toggleOverlay:function(e){if(this.options.overlay){var t=this.doc.getSize().x;this.overlay.set("aria-hidden",e?"false":"true");this.doc.body[e?"addClass":"removeClass"]("body-overlayed");if(e){this.scrollOffset=this.doc.getWindow().getSize().x-t}else{this.doc.body.setStyle("margin-right","")}}},showContent:function(){if(this.content.get("opacity"))this.fireEvent("onShow",[this.win]);this.fx.content.start(1)},hideContent:function(){if(!this.content.get("opacity"))this.fireEvent("onHide",[this.win]);this.fx.content.cancel().set(0)},onKey:function(e){switch(e.key){case"esc":this.close(e);case"up":case"down":return false}},checkTarget:function(e){return e.target!==this.content&&this.content.contains(e.target)},reposition:function(){var e=this.doc.getSize(),t=this.doc.getScroll(),n=this.doc.getScrollSize();var r=this.overlay.getStyles("height");var i=parseInt(r.height);if(n.y>i&&e.y>=i){this.overlay.setStyles({width:n.x+"px",height:n.y+"px"});this.win.setStyles({left:(t.x+(e.x-this.win.offsetWidth)/2-this.scrollOffset).toInt()+"px",top:(t.y+(e.y-this.win.offsetHeight)/2).toInt()+"px"})}return this.fireEvent("onMove",[this.overlay,this.win])},removeEvents:function(e){if(!this.$events)return this;if(!e)this.$events=null;else if(this.$events[e])this.$events[e]=null;return this},extend:function(e){return Object.append(this,e)},handlers:new Hash,parsers:new Hash};SqueezeBox.extend(new Events(function(){})).extend(new Options(function(){})).extend(new Chain(function(){}));SqueezeBox.parsers.extend({image:function(e){return e||/\.(?:jpg|png|gif)$/i.test(this.url)?this.url:false},clone:function(e){if(document.id(this.options.target))return document.id(this.options.target);if(this.element&&!this.element.parentNode)return this.element;var t=this.url.match(/#([\w-]+)$/);return t?document.id(t[1]):e?this.element:false},ajax:function(e){return e||this.url&&!/^(?:javascript|#)/i.test(this.url)?this.url:false},iframe:function(e){return e||this.url?this.url:false},string:function(e){return true}});SqueezeBox.handlers.extend({image:function(e){var t,n=new Image;this.asset=null;n.onload=n.onabort=n.onerror=function(){n.onload=n.onabort=n.onerror=null;if(!n.width){this.onError.delay(10,this);return}var e=this.doc.getSize();e.x-=this.options.marginImage.x;e.y-=this.options.marginImage.y;t={x:n.width,y:n.height};for(var r=2;r--;){if(t.x>e.x){t.y*=e.x/t.x;t.x=e.x}else if(t.y>e.y){t.x*=e.y/t.y;t.y=e.y}}t.x=t.x.toInt();t.y=t.y.toInt();this.asset=document.id(n);n=null;this.asset.width=t.x;this.asset.height=t.y;this.applyContent(this.asset,t)}.bind(this);n.src=e;if(n&&n.onload&&n.complete)n.onload();return this.asset?[this.asset,t]:null},clone:function(e){if(e)return e.clone();return this.onError()},adopt:function(e){if(e)return e;return this.onError()},ajax:function(e){var t=this.options.ajaxOptions||{};this.asset=(new Request.HTML(Object.merge({method:"get",evalScripts:false},this.options.ajaxOptions))).addEvents({onSuccess:function(e){this.applyContent(e);if(t.evalScripts!==null&&!t.evalScripts)Browser.exec(this.asset.response.javascript);this.fireEvent("onAjax",[e,this.asset]);this.asset=null}.bind(this),onFailure:this.onError.bind(this)});this.asset.send.delay(10,this.asset,[{url:e}])},iframe:function(e){var t=this.doc.getSize();if(t.x>979){var n=this.options.size.x;var r=this.options.size.y}else{var n=t.x;var r=t.y-50}this.asset=new Element("iframe",Object.merge({src:e,frameBorder:0,width:n,height:r},this.options.iframeOptions));if(this.options.iframePreload){this.asset.addEvent("load",function(){this.applyContent(this.asset.setStyle("display",""))}.bind(this));this.asset.setStyle("display","none").inject(this.content);return false}return this.asset},string:function(e){return e}});SqueezeBox.handlers.url=SqueezeBox.handlers.ajax;SqueezeBox.parsers.url=SqueezeBox.parsers.ajax;SqueezeBox.parsers.adopt=SqueezeBox.parsers.clone;
diff --git a/core/media/system/js/moduleorder.js b/core/media/system/js/moduleorder.js
new file mode 100644
index 00000000..0aac1a85
--- /dev/null
+++ b/core/media/system/js/moduleorder.js
@@ -0,0 +1,69 @@
+!(function() {
+	jQuery(document).ready(function($) {
+		var $field = $('.module-ajax-ordering'),
+			$url = $field.data('url'),
+			$clientId = $field.data('client-id'),
+			$element = document.getElementById($field.data('element')),
+			$linkedField = $field.data('linked-field') ? $field.data('linked-field') : 'jform_position',
+			$linkedFieldEl = $('#' + $linkedField),
+			$originalOrder = $field.data('ordering'),
+			$originalPos = $linkedFieldEl.val(),
+			$name = $field.data('name'),
+			$attr = $field.data('client-attr') ? $field.data('client-attr') : '',
+			$id = $field.attr('id') + '_1',
+			$orders = new Array(),
+			getNewOrder = function() {
+				$.ajax({
+					type: "GET",
+					dataType: "json",
+					url: $url,
+					data: {
+						"client_id": $clientId,
+						"position" : $originalPos
+					}
+					})
+					.fail(function (jqXHR, textStatus, error) {
+						Joomla.renderMessages(Joomla.ajaxErrorsMessages(jqXHR, textStatus, error));
+
+						window.scrollTo(0, 0);
+					})
+					.done(function (response) {
+						if (response.data)
+						{
+							// Check if everything is OK
+							if (response.data.length > 0)
+							{
+								var i;
+								for (i = 0; i < response.data.length; ++i) {
+									$orders[i] = response.data[i].split(',');
+								}
+								writeDynaList('name="' + $name + '" id="' + $id +'"' + $attr, $orders, $originalPos, $originalPos, $originalOrder, $element);
+
+								// Add chosen to the element
+								var $el = $("#" + $id);
+								if ($el.length && $el.data('chosen') && $.fn.chosen) {
+									$el.chosen('destroy');
+									$el.chosen();
+								}
+							}
+						}
+
+						// Render messages, if any. There are only message in case of errors.
+						if (typeof response.messages == 'object' && response.messages !== null)
+						{
+							Joomla.renderMessages(response.messages);
+							window.scrollTo(0, 0);
+						}
+					});
+			};
+
+		// Initialize the field on document ready
+		getNewOrder();
+
+		// Event listener for the linked field
+		$linkedFieldEl.change( function() {
+			$originalPos = $('#' + $linkedField).val();
+			getNewOrder();
+		});
+	});
+})();
diff --git a/core/media/system/js/mootools-core-uncompressed.js b/core/media/system/js/mootools-core-uncompressed.js
new file mode 100644
index 00000000..d4dc9b99
--- /dev/null
+++ b/core/media/system/js/mootools-core-uncompressed.js
@@ -0,0 +1,5976 @@
+/*
+---
+MooTools: the javascript framework
+
+web build:
+ - http://mootools.net/core/76bf47062d6c1983d66ce47ad66aa0e0
+
+packager build:
+ - packager build Core/Core Core/Array Core/String Core/Number Core/Function Core/Object Core/Event Core/Browser Core/Class Core/Class.Extras Core/Slick.Parser Core/Slick.Finder Core/Element Core/Element.Style Core/Element.Event Core/Element.Delegation Core/Element.Dimensions Core/Fx Core/Fx.CSS Core/Fx.Tween Core/Fx.Morph Core/Fx.Transitions Core/Request Core/Request.HTML Core/Request.JSON Core/Cookie Core/JSON Core/DOMReady Core/Swiff
+
+...
+*/
+
+/*
+---
+
+name: Core
+
+description: The heart of MooTools.
+
+license: MIT-style license.
+
+copyright: Copyright (c) 2006-2012 [Valerio Proietti](http://mad4milk.net/).
+
+authors: The MooTools production team (http://mootools.net/developers/)
+
+inspiration:
+  - Class implementation inspired by [Base.js](http://dean.edwards.name/weblog/2006/03/base/) Copyright (c) 2006 Dean Edwards, [GNU Lesser General Public License](http://opensource.org/licenses/lgpl-license.php)
+  - Some functionality inspired by [Prototype.js](http://prototypejs.org) Copyright (c) 2005-2007 Sam Stephenson, [MIT License](http://opensource.org/licenses/mit-license.php)
+
+provides: [Core, MooTools, Type, typeOf, instanceOf, Native]
+
+...
+*/
+
+(function(){
+
+this.MooTools = {
+	version: '1.4.5',
+	build: '74e34796f5f76640cdb98853004650aea1499d69'
+};
+
+// typeOf, instanceOf
+
+var typeOf = this.typeOf = function(item){
+	if (item == null) return 'null';
+	if (item.$family != null) return item.$family();
+
+	if (item.nodeName){
+		if (item.nodeType == 1) return 'element';
+		if (item.nodeType == 3) return (/\S/).test(item.nodeValue) ? 'textnode' : 'whitespace';
+	} else if (typeof item.length == 'number'){
+		if (item.callee) return 'arguments';
+		if ('item' in item) return 'collection';
+	}
+
+	return typeof item;
+};
+
+var instanceOf = this.instanceOf = function(item, object){
+	if (item == null) return false;
+	var constructor = item.$constructor || item.constructor;
+	while (constructor){
+		if (constructor === object) return true;
+		constructor = constructor.parent;
+	}
+	/*<ltIE8>*/
+	if (!item.hasOwnProperty) return false;
+	/*</ltIE8>*/
+	return item instanceof object;
+};
+
+// Function overloading
+
+var Function = this.Function;
+
+var enumerables = true;
+for (var i in {toString: 1}) enumerables = null;
+if (enumerables) enumerables = ['hasOwnProperty', 'valueOf', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'constructor'];
+
+Function.prototype.overloadSetter = function(usePlural){
+	var self = this;
+	return function(a, b){
+		if (a == null) return this;
+		if (usePlural || typeof a != 'string'){
+			for (var k in a) self.call(this, k, a[k]);
+			if (enumerables) for (var i = enumerables.length; i--;){
+				k = enumerables[i];
+				if (a.hasOwnProperty(k)) self.call(this, k, a[k]);
+			}
+		} else {
+			self.call(this, a, b);
+		}
+		return this;
+	};
+};
+
+Function.prototype.overloadGetter = function(usePlural){
+	var self = this;
+	return function(a){
+		var args, result;
+		if (typeof a != 'string') args = a;
+		else if (arguments.length > 1) args = arguments;
+		else if (usePlural) args = [a];
+		if (args){
+			result = {};
+			for (var i = 0; i < args.length; i++) result[args[i]] = self.call(this, args[i]);
+		} else {
+			result = self.call(this, a);
+		}
+		return result;
+	};
+};
+
+Function.prototype.extend = function(key, value){
+	this[key] = value;
+}.overloadSetter();
+
+Function.prototype.implement = function(key, value){
+	this.prototype[key] = value;
+}.overloadSetter();
+
+// From
+
+var slice = Array.prototype.slice;
+
+Function.from = function(item){
+	return (typeOf(item) == 'function') ? item : function(){
+		return item;
+	};
+};
+
+Array.from = function(item){
+	if (item == null) return [];
+	return (Type.isEnumerable(item) && typeof item != 'string') ? (typeOf(item) == 'array') ? item : slice.call(item) : [item];
+};
+
+Number.from = function(item){
+	var number = parseFloat(item);
+	return isFinite(number) ? number : null;
+};
+
+String.from = function(item){
+	return item + '';
+};
+
+// hide, protect
+
+Function.implement({
+
+	hide: function(){
+		this.$hidden = true;
+		return this;
+	},
+
+	protect: function(){
+		this.$protected = true;
+		return this;
+	}
+
+});
+
+// Type
+
+var Type = this.Type = function(name, object){
+	if (name){
+		var lower = name.toLowerCase();
+		var typeCheck = function(item){
+			return (typeOf(item) == lower);
+		};
+
+		Type['is' + name] = typeCheck;
+		if (object != null){
+			object.prototype.$family = (function(){
+				return lower;
+			}).hide();
+			
+		}
+	}
+
+	if (object == null) return null;
+
+	object.extend(this);
+	object.$constructor = Type;
+	object.prototype.$constructor = object;
+
+	return object;
+};
+
+var toString = Object.prototype.toString;
+
+Type.isEnumerable = function(item){
+	return (item != null && typeof item.length == 'number' && toString.call(item) != '[object Function]' );
+};
+
+var hooks = {};
+
+var hooksOf = function(object){
+	var type = typeOf(object.prototype);
+	return hooks[type] || (hooks[type] = []);
+};
+
+var implement = function(name, method){
+	if (method && method.$hidden) return;
+
+	var hooks = hooksOf(this);
+
+	for (var i = 0; i < hooks.length; i++){
+		var hook = hooks[i];
+		if (typeOf(hook) == 'type') implement.call(hook, name, method);
+		else hook.call(this, name, method);
+	}
+
+	var previous = this.prototype[name];
+	if (previous == null || !previous.$protected) this.prototype[name] = method;
+
+	if (this[name] == null && typeOf(method) == 'function') extend.call(this, name, function(item){
+		return method.apply(item, slice.call(arguments, 1));
+	});
+};
+
+var extend = function(name, method){
+	if (method && method.$hidden) return;
+	var previous = this[name];
+	if (previous == null || !previous.$protected) this[name] = method;
+};
+
+Type.implement({
+
+	implement: implement.overloadSetter(),
+
+	extend: extend.overloadSetter(),
+
+	alias: function(name, existing){
+		implement.call(this, name, this.prototype[existing]);
+	}.overloadSetter(),
+
+	mirror: function(hook){
+		hooksOf(this).push(hook);
+		return this;
+	}
+
+});
+
+new Type('Type', Type);
+
+// Default Types
+
+var force = function(name, object, methods){
+	var isType = (object != Object),
+		prototype = object.prototype;
+
+	if (isType) object = new Type(name, object);
+
+	for (var i = 0, l = methods.length; i < l; i++){
+		var key = methods[i],
+			generic = object[key],
+			proto = prototype[key];
+
+		if (generic) generic.protect();
+		if (isType && proto) object.implement(key, proto.protect());
+	}
+
+	if (isType){
+		var methodsEnumerable = prototype.propertyIsEnumerable(methods[0]);
+		object.forEachMethod = function(fn){
+			if (!methodsEnumerable) for (var i = 0, l = methods.length; i < l; i++){
+				fn.call(prototype, prototype[methods[i]], methods[i]);
+			}
+			for (var key in prototype) fn.call(prototype, prototype[key], key)
+		};
+	}
+
+	return force;
+};
+
+force('String', String, [
+	'charAt', 'charCodeAt', 'concat', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
+	'slice', 'split', 'substr', 'substring', 'trim', 'toLowerCase', 'toUpperCase'
+])('Array', Array, [
+	'pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice',
+	'indexOf', 'lastIndexOf', 'filter', 'forEach', 'every', 'map', 'some', 'reduce', 'reduceRight'
+])('Number', Number, [
+	'toExponential', 'toFixed', 'toLocaleString', 'toPrecision'
+])('Function', Function, [
+	'apply', 'call', 'bind'
+])('RegExp', RegExp, [
+	'exec', 'test'
+])('Object', Object, [
+	'create', 'defineProperty', 'defineProperties', 'keys',
+	'getPrototypeOf', 'getOwnPropertyDescriptor', 'getOwnPropertyNames',
+	'preventExtensions', 'isExtensible', 'seal', 'isSealed', 'freeze', 'isFrozen'
+])('Date', Date, ['now']);
+
+Object.extend = extend.overloadSetter();
+
+Date.extend('now', function(){
+	return +(new Date);
+});
+
+new Type('Boolean', Boolean);
+
+// fixes NaN returning as Number
+
+Number.prototype.$family = function(){
+	return isFinite(this) ? 'number' : 'null';
+}.hide();
+
+// Number.random
+
+Number.extend('random', function(min, max){
+	return Math.floor(Math.random() * (max - min + 1) + min);
+});
+
+// forEach, each
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+Object.extend('forEach', function(object, fn, bind){
+	for (var key in object){
+		if (hasOwnProperty.call(object, key)) fn.call(bind, object[key], key, object);
+	}
+});
+
+Object.each = Object.forEach;
+
+Array.implement({
+
+	forEach: function(fn, bind){
+		for (var i = 0, l = this.length; i < l; i++){
+			if (i in this) fn.call(bind, this[i], i, this);
+		}
+	},
+
+	each: function(fn, bind){
+		Array.forEach(this, fn, bind);
+		return this;
+	}
+
+});
+
+// Array & Object cloning, Object merging and appending
+
+var cloneOf = function(item){
+	switch (typeOf(item)){
+		case 'array': return item.clone();
+		case 'object': return Object.clone(item);
+		default: return item;
+	}
+};
+
+Array.implement('clone', function(){
+	var i = this.length, clone = new Array(i);
+	while (i--) clone[i] = cloneOf(this[i]);
+	return clone;
+});
+
+var mergeOne = function(source, key, current){
+	switch (typeOf(current)){
+		case 'object':
+			if (typeOf(source[key]) == 'object') Object.merge(source[key], current);
+			else source[key] = Object.clone(current);
+		break;
+		case 'array': source[key] = current.clone(); break;
+		default: source[key] = current;
+	}
+	return source;
+};
+
+Object.extend({
+
+	merge: function(source, k, v){
+		if (typeOf(k) == 'string') return mergeOne(source, k, v);
+		for (var i = 1, l = arguments.length; i < l; i++){
+			var object = arguments[i];
+			for (var key in object) mergeOne(source, key, object[key]);
+		}
+		return source;
+	},
+
+	clone: function(object){
+		var clone = {};
+		for (var key in object) clone[key] = cloneOf(object[key]);
+		return clone;
+	},
+
+	append: function(original){
+		for (var i = 1, l = arguments.length; i < l; i++){
+			var extended = arguments[i] || {};
+			for (var key in extended) original[key] = extended[key];
+		}
+		return original;
+	}
+
+});
+
+// Object-less types
+
+['Object', 'WhiteSpace', 'TextNode', 'Collection', 'Arguments'].each(function(name){
+	new Type(name);
+});
+
+// Unique ID
+
+var UID = Date.now();
+
+String.extend('uniqueID', function(){
+	return (UID++).toString(36);
+});
+
+
+
+})();
+
+
+/*
+---
+
+name: Array
+
+description: Contains Array Prototypes like each, contains, and erase.
+
+license: MIT-style license.
+
+requires: Type
+
+provides: Array
+
+...
+*/
+
+Array.implement({
+
+	/*<!ES5>*/
+	every: function(fn, bind){
+		for (var i = 0, l = this.length >>> 0; i < l; i++){
+			if ((i in this) && !fn.call(bind, this[i], i, this)) return false;
+		}
+		return true;
+	},
+
+	filter: function(fn, bind){
+		var results = [];
+		for (var value, i = 0, l = this.length >>> 0; i < l; i++) if (i in this){
+			value = this[i];
+			if (fn.call(bind, value, i, this)) results.push(value);
+		}
+		return results;
+	},
+
+	indexOf: function(item, from){
+		var length = this.length >>> 0;
+		for (var i = (from < 0) ? Math.max(0, length + from) : from || 0; i < length; i++){
+			if (this[i] === item) return i;
+		}
+		return -1;
+	},
+
+	map: function(fn, bind){
+		var length = this.length >>> 0, results = Array(length);
+		for (var i = 0; i < length; i++){
+			if (i in this) results[i] = fn.call(bind, this[i], i, this);
+		}
+		return results;
+	},
+
+	some: function(fn, bind){
+		for (var i = 0, l = this.length >>> 0; i < l; i++){
+			if ((i in this) && fn.call(bind, this[i], i, this)) return true;
+		}
+		return false;
+	},
+	/*</!ES5>*/
+
+	clean: function(){
+		return this.filter(function(item){
+			return item != null;
+		});
+	},
+
+	invoke: function(methodName){
+		var args = Array.slice(arguments, 1);
+		return this.map(function(item){
+			return item[methodName].apply(item, args);
+		});
+	},
+
+	associate: function(keys){
+		var obj = {}, length = Math.min(this.length, keys.length);
+		for (var i = 0; i < length; i++) obj[keys[i]] = this[i];
+		return obj;
+	},
+
+	link: function(object){
+		var result = {};
+		for (var i = 0, l = this.length; i < l; i++){
+			for (var key in object){
+				if (object[key](this[i])){
+					result[key] = this[i];
+					delete object[key];
+					break;
+				}
+			}
+		}
+		return result;
+	},
+
+	contains: function(item, from){
+		return this.indexOf(item, from) != -1;
+	},
+
+	append: function(array){
+		this.push.apply(this, array);
+		return this;
+	},
+
+	getLast: function(){
+		return (this.length) ? this[this.length - 1] : null;
+	},
+
+	getRandom: function(){
+		return (this.length) ? this[Number.random(0, this.length - 1)] : null;
+	},
+
+	include: function(item){
+		if (!this.contains(item)) this.push(item);
+		return this;
+	},
+
+	combine: function(array){
+		for (var i = 0, l = array.length; i < l; i++) this.include(array[i]);
+		return this;
+	},
+
+	erase: function(item){
+		for (var i = this.length; i--;){
+			if (this[i] === item) this.splice(i, 1);
+		}
+		return this;
+	},
+
+	empty: function(){
+		this.length = 0;
+		return this;
+	},
+
+	flatten: function(){
+		var array = [];
+		for (var i = 0, l = this.length; i < l; i++){
+			var type = typeOf(this[i]);
+			if (type == 'null') continue;
+			array = array.concat((type == 'array' || type == 'collection' || type == 'arguments' || instanceOf(this[i], Array)) ? Array.flatten(this[i]) : this[i]);
+		}
+		return array;
+	},
+
+	pick: function(){
+		for (var i = 0, l = this.length; i < l; i++){
+			if (this[i] != null) return this[i];
+		}
+		return null;
+	},
+
+	hexToRgb: function(array){
+		if (this.length != 3) return null;
+		var rgb = this.map(function(value){
+			if (value.length == 1) value += value;
+			return value.toInt(16);
+		});
+		return (array) ? rgb : 'rgb(' + rgb + ')';
+	},
+
+	rgbToHex: function(array){
+		if (this.length < 3) return null;
+		if (this.length == 4 && this[3] == 0 && !array) return 'transparent';
+		var hex = [];
+		for (var i = 0; i < 3; i++){
+			var bit = (this[i] - 0).toString(16);
+			hex.push((bit.length == 1) ? '0' + bit : bit);
+		}
+		return (array) ? hex : '#' + hex.join('');
+	}
+
+});
+
+
+
+
+/*
+---
+
+name: String
+
+description: Contains String Prototypes like camelCase, capitalize, test, and toInt.
+
+license: MIT-style license.
+
+requires: Type
+
+provides: String
+
+...
+*/
+
+String.implement({
+
+	test: function(regex, params){
+		return ((typeOf(regex) == 'regexp') ? regex : new RegExp('' + regex, params)).test(this);
+	},
+
+	contains: function(string, separator){
+		return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : String(this).indexOf(string) > -1;
+	},
+
+	trim: function(){
+		return String(this).replace(/^\s+|\s+$/g, '');
+	},
+
+	clean: function(){
+		return String(this).replace(/\s+/g, ' ').trim();
+	},
+
+	camelCase: function(){
+		return String(this).replace(/-\D/g, function(match){
+			return match.charAt(1).toUpperCase();
+		});
+	},
+
+	hyphenate: function(){
+		return String(this).replace(/[A-Z]/g, function(match){
+			return ('-' + match.charAt(0).toLowerCase());
+		});
+	},
+
+	capitalize: function(){
+		return String(this).replace(/\b[a-z]/g, function(match){
+			return match.toUpperCase();
+		});
+	},
+
+	escapeRegExp: function(){
+		return String(this).replace(/([-.*+?^${}()|[\]\/\\])/g, '\\$1');
+	},
+
+	toInt: function(base){
+		return parseInt(this, base || 10);
+	},
+
+	toFloat: function(){
+		return parseFloat(this);
+	},
+
+	hexToRgb: function(array){
+		var hex = String(this).match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
+		return (hex) ? hex.slice(1).hexToRgb(array) : null;
+	},
+
+	rgbToHex: function(array){
+		var rgb = String(this).match(/\d{1,3}/g);
+		return (rgb) ? rgb.rgbToHex(array) : null;
+	},
+
+	substitute: function(object, regexp){
+		return String(this).replace(regexp || (/\\?\{([^{}]+)\}/g), function(match, name){
+			if (match.charAt(0) == '\\') return match.slice(1);
+			return (object[name] != null) ? object[name] : '';
+		});
+	}
+
+});
+
+
+/*
+---
+
+name: Number
+
+description: Contains Number Prototypes like limit, round, times, and ceil.
+
+license: MIT-style license.
+
+requires: Type
+
+provides: Number
+
+...
+*/
+
+Number.implement({
+
+	limit: function(min, max){
+		return Math.min(max, Math.max(min, this));
+	},
+
+	round: function(precision){
+		precision = Math.pow(10, precision || 0).toFixed(precision < 0 ? -precision : 0);
+		return Math.round(this * precision) / precision;
+	},
+
+	times: function(fn, bind){
+		for (var i = 0; i < this; i++) fn.call(bind, i, this);
+	},
+
+	toFloat: function(){
+		return parseFloat(this);
+	},
+
+	toInt: function(base){
+		return parseInt(this, base || 10);
+	}
+
+});
+
+Number.alias('each', 'times');
+
+(function(math){
+	var methods = {};
+	math.each(function(name){
+		if (!Number[name]) methods[name] = function(){
+			return Math[name].apply(null, [this].concat(Array.from(arguments)));
+		};
+	});
+	Number.implement(methods);
+})(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']);
+
+
+/*
+---
+
+name: Function
+
+description: Contains Function Prototypes like create, bind, pass, and delay.
+
+license: MIT-style license.
+
+requires: Type
+
+provides: Function
+
+...
+*/
+
+Function.extend({
+
+	attempt: function(){
+		for (var i = 0, l = arguments.length; i < l; i++){
+			try {
+				return arguments[i]();
+			} catch (e){}
+		}
+		return null;
+	}
+
+});
+
+Function.implement({
+
+	attempt: function(args, bind){
+		try {
+			return this.apply(bind, Array.from(args));
+		} catch (e){}
+
+		return null;
+	},
+
+	/*<!ES5-bind>*/
+	bind: function(that){
+		var self = this,
+			args = arguments.length > 1 ? Array.slice(arguments, 1) : null,
+			F = function(){};
+
+		var bound = function(){
+			var context = that, length = arguments.length;
+			if (this instanceof bound){
+				F.prototype = self.prototype;
+				context = new F;
+			}
+			var result = (!args && !length)
+				? self.call(context)
+				: self.apply(context, args && length ? args.concat(Array.slice(arguments)) : args || arguments);
+			return context == that ? result : context;
+		};
+		return bound;
+	},
+	/*</!ES5-bind>*/
+
+	pass: function(args, bind){
+		var self = this;
+		if (args != null) args = Array.from(args);
+		return function(){
+			return self.apply(bind, args || arguments);
+		};
+	},
+
+	delay: function(delay, bind, args){
+		return setTimeout(this.pass((args == null ? [] : args), bind), delay);
+	},
+
+	periodical: function(periodical, bind, args){
+		return setInterval(this.pass((args == null ? [] : args), bind), periodical);
+	}
+
+});
+
+
+
+
+/*
+---
+
+name: Object
+
+description: Object generic methods
+
+license: MIT-style license.
+
+requires: Type
+
+provides: [Object, Hash]
+
+...
+*/
+
+(function(){
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+Object.extend({
+
+	subset: function(object, keys){
+		var results = {};
+		for (var i = 0, l = keys.length; i < l; i++){
+			var k = keys[i];
+			if (k in object) results[k] = object[k];
+		}
+		return results;
+	},
+
+	map: function(object, fn, bind){
+		var results = {};
+		for (var key in object){
+			if (hasOwnProperty.call(object, key)) results[key] = fn.call(bind, object[key], key, object);
+		}
+		return results;
+	},
+
+	filter: function(object, fn, bind){
+		var results = {};
+		for (var key in object){
+			var value = object[key];
+			if (hasOwnProperty.call(object, key) && fn.call(bind, value, key, object)) results[key] = value;
+		}
+		return results;
+	},
+
+	every: function(object, fn, bind){
+		for (var key in object){
+			if (hasOwnProperty.call(object, key) && !fn.call(bind, object[key], key)) return false;
+		}
+		return true;
+	},
+
+	some: function(object, fn, bind){
+		for (var key in object){
+			if (hasOwnProperty.call(object, key) && fn.call(bind, object[key], key)) return true;
+		}
+		return false;
+	},
+
+	keys: function(object){
+		var keys = [];
+		for (var key in object){
+			if (hasOwnProperty.call(object, key)) keys.push(key);
+		}
+		return keys;
+	},
+
+	values: function(object){
+		var values = [];
+		for (var key in object){
+			if (hasOwnProperty.call(object, key)) values.push(object[key]);
+		}
+		return values;
+	},
+
+	getLength: function(object){
+		return Object.keys(object).length;
+	},
+
+	keyOf: function(object, value){
+		for (var key in object){
+			if (hasOwnProperty.call(object, key) && object[key] === value) return key;
+		}
+		return null;
+	},
+
+	contains: function(object, value){
+		return Object.keyOf(object, value) != null;
+	},
+
+	toQueryString: function(object, base){
+		var queryString = [];
+
+		Object.each(object, function(value, key){
+			if (base) key = base + '[' + key + ']';
+			var result;
+			switch (typeOf(value)){
+				case 'object': result = Object.toQueryString(value, key); break;
+				case 'array':
+					var qs = {};
+					value.each(function(val, i){
+						qs[i] = val;
+					});
+					result = Object.toQueryString(qs, key);
+				break;
+				default: result = key + '=' + encodeURIComponent(value);
+			}
+			if (value != null) queryString.push(result);
+		});
+
+		return queryString.join('&');
+	}
+
+});
+
+})();
+
+
+
+
+/*
+---
+
+name: Browser
+
+description: The Browser Object. Contains Browser initialization, Window and Document, and the Browser Hash.
+
+license: MIT-style license.
+
+requires: [Array, Function, Number, String]
+
+provides: [Browser, Window, Document]
+
+...
+*/
+
+(function(){
+
+var document = this.document;
+var window = document.window = this;
+
+var ua = navigator.userAgent.toLowerCase(),
+	platform = navigator.platform.toLowerCase(),
+	UA = ua.match(/(opera|ie|firefox|chrome|version)[\s\/:]([\w\d\.]+)?.*?(safari|version[\s\/:]([\w\d\.]+)|$)/) || [null, 'unknown', 0],
+	mode = UA[1] == 'ie' && document.documentMode;
+
+var Browser = this.Browser = {
+
+	extend: Function.prototype.extend,
+
+	name: (UA[1] == 'version') ? UA[3] : UA[1],
+
+	version: mode || parseFloat((UA[1] == 'opera' && UA[4]) ? UA[4] : UA[2]),
+
+	Platform: {
+		name: ua.match(/ip(?:ad|od|hone)/) ? 'ios' : (ua.match(/(?:webos|android)/) || platform.match(/mac|win|linux/) || ['other'])[0]
+	},
+
+	Features: {
+		xpath: !!(document.evaluate),
+		air: !!(window.runtime),
+		query: !!(document.querySelector),
+		json: !!(window.JSON)
+	},
+
+	Plugins: {}
+
+};
+
+Browser[Browser.name] = true;
+Browser[Browser.name + parseInt(Browser.version, 10)] = true;
+Browser.Platform[Browser.Platform.name] = true;
+
+// Request
+
+Browser.Request = (function(){
+
+	var XMLHTTP = function(){
+		return new XMLHttpRequest();
+	};
+
+	var MSXML2 = function(){
+		return new ActiveXObject('MSXML2.XMLHTTP');
+	};
+
+	var MSXML = function(){
+		return new ActiveXObject('Microsoft.XMLHTTP');
+	};
+
+	return Function.attempt(function(){
+		XMLHTTP();
+		return XMLHTTP;
+	}, function(){
+		MSXML2();
+		return MSXML2;
+	}, function(){
+		MSXML();
+		return MSXML;
+	});
+
+})();
+
+Browser.Features.xhr = !!(Browser.Request);
+
+// Flash detection
+
+var version = (Function.attempt(function(){
+	return navigator.plugins['Shockwave Flash'].description;
+}, function(){
+	return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
+}) || '0 r0').match(/\d+/g);
+
+Browser.Plugins.Flash = {
+	version: Number(version[0] || '0.' + version[1]) || 0,
+	build: Number(version[2]) || 0
+};
+
+// String scripts
+
+Browser.exec = function(text){
+	if (!text) return text;
+	if (window.execScript){
+		window.execScript(text);
+	} else {
+		var script = document.createElement('script');
+		script.setAttribute('type', 'text/javascript');
+		script.text = text;
+		document.head.appendChild(script);
+		document.head.removeChild(script);
+	}
+	return text;
+};
+
+String.implement('stripScripts', function(exec){
+	var scripts = '';
+	var text = this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi, function(all, code){
+		scripts += code + '\n';
+		return '';
+	});
+	if (exec === true) Browser.exec(scripts);
+	else if (typeOf(exec) == 'function') exec(scripts, text);
+	return text;
+});
+
+// Window, Document
+
+Browser.extend({
+	Document: this.Document,
+	Window: this.Window,
+	Element: this.Element,
+	Event: this.Event
+});
+
+this.Window = this.$constructor = new Type('Window', function(){});
+
+this.$family = Function.from('window').hide();
+
+Window.mirror(function(name, method){
+	window[name] = method;
+});
+
+this.Document = document.$constructor = new Type('Document', function(){});
+
+document.$family = Function.from('document').hide();
+
+Document.mirror(function(name, method){
+	document[name] = method;
+});
+
+document.html = document.documentElement;
+if (!document.head) document.head = document.getElementsByTagName('head')[0];
+
+if (document.execCommand) try {
+	document.execCommand("BackgroundImageCache", false, true);
+} catch (e){}
+
+/*<ltIE9>*/
+if (this.attachEvent && !this.addEventListener){
+	var unloadEvent = function(){
+		this.detachEvent('onunload', unloadEvent);
+		document.head = document.html = document.window = null;
+	};
+	this.attachEvent('onunload', unloadEvent);
+}
+
+// IE fails on collections and <select>.options (refers to <select>)
+var arrayFrom = Array.from;
+try {
+	arrayFrom(document.html.childNodes);
+} catch(e){
+	Array.from = function(item){
+		if (typeof item != 'string' && Type.isEnumerable(item) && typeOf(item) != 'array'){
+			var i = item.length, array = new Array(i);
+			while (i--) array[i] = item[i];
+			return array;
+		}
+		return arrayFrom(item);
+	};
+
+	var prototype = Array.prototype,
+		slice = prototype.slice;
+	['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice'].each(function(name){
+		var method = prototype[name];
+		Array[name] = function(item){
+			return method.apply(Array.from(item), slice.call(arguments, 1));
+		};
+	});
+}
+/*</ltIE9>*/
+
+
+
+})();
+
+
+/*
+---
+
+name: Event
+
+description: Contains the Event Type, to make the event object cross-browser.
+
+license: MIT-style license.
+
+requires: [Window, Document, Array, Function, String, Object]
+
+provides: Event
+
+...
+*/
+
+(function() {
+
+var _keys = {};
+
+var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
+	if (!win) win = window;
+	event = event || win.event;
+	if (event.$extended) return event;
+	this.event = event;
+	this.$extended = true;
+	this.shift = event.shiftKey;
+	this.control = event.ctrlKey;
+	this.alt = event.altKey;
+	this.meta = event.metaKey;
+	var type = this.type = event.type;
+	var target = event.target || event.srcElement;
+	while (target && target.nodeType == 3) target = target.parentNode;
+	this.target = document.id(target);
+
+	if (type.indexOf('key') == 0){
+		var code = this.code = (event.which || event.keyCode);
+		this.key = _keys[code];
+		if (type == 'keydown'){
+			if (code > 111 && code < 124) this.key = 'f' + (code - 111);
+			else if (code > 95 && code < 106) this.key = code - 96;
+		}
+		if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
+	} else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
+		var doc = win.document;
+		doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
+		this.page = {
+			x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
+			y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
+		};
+		this.client = {
+			x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
+			y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
+		};
+		if (type == 'DOMMouseScroll' || type == 'mousewheel')
+			this.wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
+
+		this.rightClick = (event.which == 3 || event.button == 2);
+		if (type == 'mouseover' || type == 'mouseout'){
+			var related = event.relatedTarget || event[(type == 'mouseover' ? 'from' : 'to') + 'Element'];
+			while (related && related.nodeType == 3) related = related.parentNode;
+			this.relatedTarget = document.id(related);
+		}
+	} else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
+		this.rotation = event.rotation;
+		this.scale = event.scale;
+		this.targetTouches = event.targetTouches;
+		this.changedTouches = event.changedTouches;
+		var touches = this.touches = event.touches;
+		if (touches && touches[0]){
+			var touch = touches[0];
+			this.page = {x: touch.pageX, y: touch.pageY};
+			this.client = {x: touch.clientX, y: touch.clientY};
+		}
+	}
+
+	if (!this.client) this.client = {};
+	if (!this.page) this.page = {};
+});
+
+DOMEvent.implement({
+
+	stop: function(){
+		return this.preventDefault().stopPropagation();
+	},
+
+	stopPropagation: function(){
+		if (this.event.stopPropagation) this.event.stopPropagation();
+		else this.event.cancelBubble = true;
+		return this;
+	},
+
+	preventDefault: function(){
+		if (this.event.preventDefault) this.event.preventDefault();
+		else this.event.returnValue = false;
+		return this;
+	}
+
+});
+
+DOMEvent.defineKey = function(code, key){
+	_keys[code] = key;
+	return this;
+};
+
+DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
+
+DOMEvent.defineKeys({
+	'38': 'up', '40': 'down', '37': 'left', '39': 'right',
+	'27': 'esc', '32': 'space', '8': 'backspace', '9': 'tab',
+	'46': 'delete', '13': 'enter'
+});
+
+})();
+
+
+
+
+
+
+/*
+---
+
+name: Class
+
+description: Contains the Class Function for easily creating, extending, and implementing reusable Classes.
+
+license: MIT-style license.
+
+requires: [Array, String, Function, Number]
+
+provides: Class
+
+...
+*/
+
+(function(){
+
+var Class = this.Class = new Type('Class', function(params){
+	if (instanceOf(params, Function)) params = {initialize: params};
+
+	var newClass = function(){
+		reset(this);
+		if (newClass.$prototyping) return this;
+		this.$caller = null;
+		var value = (this.initialize) ? this.initialize.apply(this, arguments) : this;
+		this.$caller = this.caller = null;
+		return value;
+	}.extend(this).implement(params);
+
+	newClass.$constructor = Class;
+	newClass.prototype.$constructor = newClass;
+	newClass.prototype.parent = parent;
+
+	return newClass;
+});
+
+var parent = function(){
+	if (!this.$caller) throw new Error('The method "parent" cannot be called.');
+	var name = this.$caller.$name,
+		parent = this.$caller.$owner.parent,
+		previous = (parent) ? parent.prototype[name] : null;
+	if (!previous) throw new Error('The method "' + name + '" has no parent.');
+	return previous.apply(this, arguments);
+};
+
+var reset = function(object){
+	for (var key in object){
+		var value = object[key];
+		switch (typeOf(value)){
+			case 'object':
+				var F = function(){};
+				F.prototype = value;
+				object[key] = reset(new F);
+			break;
+			case 'array': object[key] = value.clone(); break;
+		}
+	}
+	return object;
+};
+
+var wrap = function(self, key, method){
+	if (method.$origin) method = method.$origin;
+	var wrapper = function(){
+		if (method.$protected && this.$caller == null) throw new Error('The method "' + key + '" cannot be called.');
+		var caller = this.caller, current = this.$caller;
+		this.caller = current; this.$caller = wrapper;
+		var result = method.apply(this, arguments);
+		this.$caller = current; this.caller = caller;
+		return result;
+	}.extend({$owner: self, $origin: method, $name: key});
+	return wrapper;
+};
+
+var implement = function(key, value, retain){
+	if (Class.Mutators.hasOwnProperty(key)){
+		value = Class.Mutators[key].call(this, value);
+		if (value == null) return this;
+	}
+
+	if (typeOf(value) == 'function'){
+		if (value.$hidden) return this;
+		this.prototype[key] = (retain) ? value : wrap(this, key, value);
+	} else {
+		Object.merge(this.prototype, key, value);
+	}
+
+	return this;
+};
+
+var getInstance = function(klass){
+	klass.$prototyping = true;
+	var proto = new klass;
+	delete klass.$prototyping;
+	return proto;
+};
+
+Class.implement('implement', implement.overloadSetter());
+
+Class.Mutators = {
+
+	Extends: function(parent){
+		this.parent = parent;
+		this.prototype = getInstance(parent);
+	},
+
+	Implements: function(items){
+		Array.from(items).each(function(item){
+			var instance = new item;
+			for (var key in instance) implement.call(this, key, instance[key], true);
+		}, this);
+	}
+};
+
+})();
+
+
+/*
+---
+
+name: Class.Extras
+
+description: Contains Utility Classes that can be implemented into your own Classes to ease the execution of many common tasks.
+
+license: MIT-style license.
+
+requires: Class
+
+provides: [Class.Extras, Chain, Events, Options]
+
+...
+*/
+
+(function(){
+
+this.Chain = new Class({
+
+	$chain: [],
+
+	chain: function(){
+		this.$chain.append(Array.flatten(arguments));
+		return this;
+	},
+
+	callChain: function(){
+		return (this.$chain.length) ? this.$chain.shift().apply(this, arguments) : false;
+	},
+
+	clearChain: function(){
+		this.$chain.empty();
+		return this;
+	}
+
+});
+
+var removeOn = function(string){
+	return string.replace(/^on([A-Z])/, function(full, first){
+		return first.toLowerCase();
+	});
+};
+
+this.Events = new Class({
+
+	$events: {},
+
+	addEvent: function(type, fn, internal){
+		type = removeOn(type);
+
+		
+
+		this.$events[type] = (this.$events[type] || []).include(fn);
+		if (internal) fn.internal = true;
+		return this;
+	},
+
+	addEvents: function(events){
+		for (var type in events) this.addEvent(type, events[type]);
+		return this;
+	},
+
+	fireEvent: function(type, args, delay){
+		type = removeOn(type);
+		var events = this.$events[type];
+		if (!events) return this;
+		args = Array.from(args);
+		events.each(function(fn){
+			if (delay) fn.delay(delay, this, args);
+			else fn.apply(this, args);
+		}, this);
+		return this;
+	},
+
+	removeEvent: function(type, fn){
+		type = removeOn(type);
+		var events = this.$events[type];
+		if (events && !fn.internal){
+			var index =  events.indexOf(fn);
+			if (index != -1) delete events[index];
+		}
+		return this;
+	},
+
+	removeEvents: function(events){
+		var type;
+		if (typeOf(events) == 'object'){
+			for (type in events) this.removeEvent(type, events[type]);
+			return this;
+		}
+		if (events) events = removeOn(events);
+		for (type in this.$events){
+			if (events && events != type) continue;
+			var fns = this.$events[type];
+			for (var i = fns.length; i--;) if (i in fns){
+				this.removeEvent(type, fns[i]);
+			}
+		}
+		return this;
+	}
+
+});
+
+this.Options = new Class({
+
+	setOptions: function(){
+		var options = this.options = Object.merge.apply(null, [{}, this.options].append(arguments));
+		if (this.addEvent) for (var option in options){
+			if (typeOf(options[option]) != 'function' || !(/^on[A-Z]/).test(option)) continue;
+			this.addEvent(option, options[option]);
+			delete options[option];
+		}
+		return this;
+	}
+
+});
+
+})();
+
+
+/*
+---
+name: Slick.Parser
+description: Standalone CSS3 Selector parser
+provides: Slick.Parser
+...
+*/
+
+;(function(){
+
+var parsed,
+	separatorIndex,
+	combinatorIndex,
+	reversed,
+	cache = {},
+	reverseCache = {},
+	reUnescape = /\\/g;
+
+var parse = function(expression, isReversed){
+	if (expression == null) return null;
+	if (expression.Slick === true) return expression;
+	expression = ('' + expression).replace(/^\s+|\s+$/g, '');
+	reversed = !!isReversed;
+	var currentCache = (reversed) ? reverseCache : cache;
+	if (currentCache[expression]) return currentCache[expression];
+	parsed = {
+		Slick: true,
+		expressions: [],
+		raw: expression,
+		reverse: function(){
+			return parse(this.raw, true);
+		}
+	};
+	separatorIndex = -1;
+	while (expression != (expression = expression.replace(regexp, parser)));
+	parsed.length = parsed.expressions.length;
+	return currentCache[parsed.raw] = (reversed) ? reverse(parsed) : parsed;
+};
+
+var reverseCombinator = function(combinator){
+	if (combinator === '!') return ' ';
+	else if (combinator === ' ') return '!';
+	else if ((/^!/).test(combinator)) return combinator.replace(/^!/, '');
+	else return '!' + combinator;
+};
+
+var reverse = function(expression){
+	var expressions = expression.expressions;
+	for (var i = 0; i < expressions.length; i++){
+		var exp = expressions[i];
+		var last = {parts: [], tag: '*', combinator: reverseCombinator(exp[0].combinator)};
+
+		for (var j = 0; j < exp.length; j++){
+			var cexp = exp[j];
+			if (!cexp.reverseCombinator) cexp.reverseCombinator = ' ';
+			cexp.combinator = cexp.reverseCombinator;
+			delete cexp.reverseCombinator;
+		}
+
+		exp.reverse().push(last);
+	}
+	return expression;
+};
+
+var escapeRegExp = function(string){// Credit: XRegExp 0.6.1 (c) 2007-2008 Steven Levithan <http://stevenlevithan.com/regex/xregexp/> MIT License
+	return string.replace(/[-[\]{}()*+?.\\^$|,#\s]/g, function(match){
+		return '\\' + match;
+	});
+};
+
+var regexp = new RegExp(
+/*
+#!/usr/bin/env ruby
+puts "\t\t" + DATA.read.gsub(/\(\?x\)|\s+#.*$|\s+|\\$|\\n/,'')
+__END__
+	"(?x)^(?:\
+	  \\s* ( , ) \\s*               # Separator          \n\
+	| \\s* ( <combinator>+ ) \\s*   # Combinator         \n\
+	|      ( \\s+ )                 # CombinatorChildren \n\
+	|      ( <unicode>+ | \\* )     # Tag                \n\
+	| \\#  ( <unicode>+       )     # ID                 \n\
+	| \\.  ( <unicode>+       )     # ClassName          \n\
+	|                               # Attribute          \n\
+	\\[  \
+		\\s* (<unicode1>+)  (?:  \
+			\\s* ([*^$!~|]?=)  (?:  \
+				\\s* (?:\
+					([\"']?)(.*?)\\9 \
+				)\
+			)  \
+		)?  \\s*  \
+	\\](?!\\]) \n\
+	|   :+ ( <unicode>+ )(?:\
+	\\( (?:\
+		(?:([\"'])([^\\12]*)\\12)|((?:\\([^)]+\\)|[^()]*)+)\
+	) \\)\
+	)?\
+	)"
+*/
+	"^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)"
+	.replace(/<combinator>/, '[' + escapeRegExp(">+~`!@$%^&={}\\;</") + ']')
+	.replace(/<unicode>/g, '(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
+	.replace(/<unicode1>/g, '(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
+);
+
+function parser(
+	rawMatch,
+
+	separator,
+	combinator,
+	combinatorChildren,
+
+	tagName,
+	id,
+	className,
+
+	attributeKey,
+	attributeOperator,
+	attributeQuote,
+	attributeValue,
+
+	pseudoMarker,
+	pseudoClass,
+	pseudoQuote,
+	pseudoClassQuotedValue,
+	pseudoClassValue
+){
+	if (separator || separatorIndex === -1){
+		parsed.expressions[++separatorIndex] = [];
+		combinatorIndex = -1;
+		if (separator) return '';
+	}
+
+	if (combinator || combinatorChildren || combinatorIndex === -1){
+		combinator = combinator || ' ';
+		var currentSeparator = parsed.expressions[separatorIndex];
+		if (reversed && currentSeparator[combinatorIndex])
+			currentSeparator[combinatorIndex].reverseCombinator = reverseCombinator(combinator);
+		currentSeparator[++combinatorIndex] = {combinator: combinator, tag: '*'};
+	}
+
+	var currentParsed = parsed.expressions[separatorIndex][combinatorIndex];
+
+	if (tagName){
+		currentParsed.tag = tagName.replace(reUnescape, '');
+
+	} else if (id){
+		currentParsed.id = id.replace(reUnescape, '');
+
+	} else if (className){
+		className = className.replace(reUnescape, '');
+
+		if (!currentParsed.classList) currentParsed.classList = [];
+		if (!currentParsed.classes) currentParsed.classes = [];
+		currentParsed.classList.push(className);
+		currentParsed.classes.push({
+			value: className,
+			regexp: new RegExp('(^|\\s)' + escapeRegExp(className) + '(\\s|$)')
+		});
+
+	} else if (pseudoClass){
+		pseudoClassValue = pseudoClassValue || pseudoClassQuotedValue;
+		pseudoClassValue = pseudoClassValue ? pseudoClassValue.replace(reUnescape, '') : null;
+
+		if (!currentParsed.pseudos) currentParsed.pseudos = [];
+		currentParsed.pseudos.push({
+			key: pseudoClass.replace(reUnescape, ''),
+			value: pseudoClassValue,
+			type: pseudoMarker.length == 1 ? 'class' : 'element'
+		});
+
+	} else if (attributeKey){
+		attributeKey = attributeKey.replace(reUnescape, '');
+		attributeValue = (attributeValue || '').replace(reUnescape, '');
+
+		var test, regexp;
+
+		switch (attributeOperator){
+			case '^=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue)            ); break;
+			case '$=' : regexp = new RegExp(            escapeRegExp(attributeValue) +'$'       ); break;
+			case '~=' : regexp = new RegExp( '(^|\\s)'+ escapeRegExp(attributeValue) +'(\\s|$)' ); break;
+			case '|=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue) +'(-|$)'   ); break;
+			case  '=' : test = function(value){
+				return attributeValue == value;
+			}; break;
+			case '*=' : test = function(value){
+				return value && value.indexOf(attributeValue) > -1;
+			}; break;
+			case '!=' : test = function(value){
+				return attributeValue != value;
+			}; break;
+			default   : test = function(value){
+				return !!value;
+			};
+		}
+
+		if (attributeValue == '' && (/^[*$^]=$/).test(attributeOperator)) test = function(){
+			return false;
+		};
+
+		if (!test) test = function(value){
+			return value && regexp.test(value);
+		};
+
+		if (!currentParsed.attributes) currentParsed.attributes = [];
+		currentParsed.attributes.push({
+			key: attributeKey,
+			operator: attributeOperator,
+			value: attributeValue,
+			test: test
+		});
+
+	}
+
+	return '';
+};
+
+// Slick NS
+
+var Slick = (this.Slick || {});
+
+Slick.parse = function(expression){
+	return parse(expression);
+};
+
+Slick.escapeRegExp = escapeRegExp;
+
+if (!this.Slick) this.Slick = Slick;
+
+}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
+
+
+/*
+---
+name: Slick.Finder
+description: The new, superfast css selector engine.
+provides: Slick.Finder
+requires: Slick.Parser
+...
+*/
+
+;(function(){
+
+var local = {},
+	featuresCache = {},
+	toString = Object.prototype.toString;
+
+// Feature / Bug detection
+
+local.isNativeCode = function(fn){
+	return (/\{\s*\[native code\]\s*\}/).test('' + fn);
+};
+
+local.isXML = function(document){
+	return (!!document.xmlVersion) || (!!document.xml) || (toString.call(document) == '[object XMLDocument]') ||
+	(document.nodeType == 9 && document.documentElement.nodeName != 'HTML');
+};
+
+local.setDocument = function(document){
+
+	// convert elements / window arguments to document. if document cannot be extrapolated, the function returns.
+	var nodeType = document.nodeType;
+	if (nodeType == 9); // document
+	else if (nodeType) document = document.ownerDocument; // node
+	else if (document.navigator) document = document.document; // window
+	else return;
+
+	// check if it's the old document
+
+	if (this.document === document) return;
+	this.document = document;
+
+	// check if we have done feature detection on this document before
+
+	var root = document.documentElement,
+		rootUid = this.getUIDXML(root),
+		features = featuresCache[rootUid],
+		feature;
+
+	if (features){
+		for (feature in features){
+			this[feature] = features[feature];
+		}
+		return;
+	}
+
+	features = featuresCache[rootUid] = {};
+
+	features.root = root;
+	features.isXMLDocument = this.isXML(document);
+
+	features.brokenStarGEBTN
+	= features.starSelectsClosedQSA
+	= features.idGetsName
+	= features.brokenMixedCaseQSA
+	= features.brokenGEBCN
+	= features.brokenCheckedQSA
+	= features.brokenEmptyAttributeQSA
+	= features.isHTMLDocument
+	= features.nativeMatchesSelector
+	= false;
+
+	var starSelectsClosed, starSelectsComments,
+		brokenSecondClassNameGEBCN, cachedGetElementsByClassName,
+		brokenFormAttributeGetter;
+
+	var selected, id = 'slick_uniqueid';
+	var testNode = document.createElement('div');
+
+	var testRoot = document.body || document.getElementsByTagName('body')[0] || root;
+	testRoot.appendChild(testNode);
+
+	// on non-HTML documents innerHTML and getElementsById doesnt work properly
+	try {
+		testNode.innerHTML = '<a id="'+id+'"></a>';
+		features.isHTMLDocument = !!document.getElementById(id);
+	} catch(e){};
+
+	if (features.isHTMLDocument){
+
+		testNode.style.display = 'none';
+
+		// IE returns comment nodes for getElementsByTagName('*') for some documents
+		testNode.appendChild(document.createComment(''));
+		starSelectsComments = (testNode.getElementsByTagName('*').length > 1);
+
+		// IE returns closed nodes (EG:"</foo>") for getElementsByTagName('*') for some documents
+		try {
+			testNode.innerHTML = 'foo</foo>';
+			selected = testNode.getElementsByTagName('*');
+			starSelectsClosed = (selected && !!selected.length && selected[0].nodeName.charAt(0) == '/');
+		} catch(e){};
+
+		features.brokenStarGEBTN = starSelectsComments || starSelectsClosed;
+
+		// IE returns elements with the name instead of just id for getElementsById for some documents
+		try {
+			testNode.innerHTML = '<a name="'+ id +'"></a><b id="'+ id +'"></b>';
+			features.idGetsName = document.getElementById(id) === testNode.firstChild;
+		} catch(e){};
+
+		if (testNode.getElementsByClassName){
+
+			// Safari 3.2 getElementsByClassName caches results
+			try {
+				testNode.innerHTML = '<a class="f"></a><a class="b"></a>';
+				testNode.getElementsByClassName('b').length;
+				testNode.firstChild.className = 'b';
+				cachedGetElementsByClassName = (testNode.getElementsByClassName('b').length != 2);
+			} catch(e){};
+
+			// Opera 9.6 getElementsByClassName doesnt detects the class if its not the first one
+			try {
+				testNode.innerHTML = '<a class="a"></a><a class="f b a"></a>';
+				brokenSecondClassNameGEBCN = (testNode.getElementsByClassName('a').length != 2);
+			} catch(e){};
+
+			features.brokenGEBCN = cachedGetElementsByClassName || brokenSecondClassNameGEBCN;
+		}
+
+		if (testNode.querySelectorAll){
+			// IE 8 returns closed nodes (EG:"</foo>") for querySelectorAll('*') for some documents
+			try {
+				testNode.innerHTML = 'foo</foo>';
+				selected = testNode.querySelectorAll('*');
+				features.starSelectsClosedQSA = (selected && !!selected.length && selected[0].nodeName.charAt(0) == '/');
+			} catch(e){};
+
+			// Safari 3.2 querySelectorAll doesnt work with mixedcase on quirksmode
+			try {
+				testNode.innerHTML = '<a class="MiX"></a>';
+				features.brokenMixedCaseQSA = !testNode.querySelectorAll('.MiX').length;
+			} catch(e){};
+
+			// Webkit and Opera dont return selected options on querySelectorAll
+			try {
+				testNode.innerHTML = '<select><option selected="selected">a</option></select>';
+				features.brokenCheckedQSA = (testNode.querySelectorAll(':checked').length == 0);
+			} catch(e){};
+
+			// IE returns incorrect results for attr[*^$]="" selectors on querySelectorAll
+			try {
+				testNode.innerHTML = '<a class=""></a>';
+				features.brokenEmptyAttributeQSA = (testNode.querySelectorAll('[class*=""]').length != 0);
+			} catch(e){};
+
+		}
+
+		// IE6-7, if a form has an input of id x, form.getAttribute(x) returns a reference to the input
+		try {
+			testNode.innerHTML = '<form action="s"><input id="action"/></form>';
+			brokenFormAttributeGetter = (testNode.firstChild.getAttribute('action') != 's');
+		} catch(e){};
+
+		// native matchesSelector function
+
+		features.nativeMatchesSelector = root.matchesSelector || /*root.msMatchesSelector ||*/ root.mozMatchesSelector || root.webkitMatchesSelector;
+		if (features.nativeMatchesSelector) try {
+			// if matchesSelector trows errors on incorrect sintaxes we can use it
+			features.nativeMatchesSelector.call(root, ':slick');
+			features.nativeMatchesSelector = null;
+		} catch(e){};
+
+	}
+
+	try {
+		root.slick_expando = 1;
+		delete root.slick_expando;
+		features.getUID = this.getUIDHTML;
+	} catch(e) {
+		features.getUID = this.getUIDXML;
+	}
+
+	testRoot.removeChild(testNode);
+	testNode = selected = testRoot = null;
+
+	// getAttribute
+
+	features.getAttribute = (features.isHTMLDocument && brokenFormAttributeGetter) ? function(node, name){
+		var method = this.attributeGetters[name];
+		if (method) return method.call(node);
+		var attributeNode = node.getAttributeNode(name);
+		return (attributeNode) ? attributeNode.nodeValue : null;
+	} : function(node, name){
+		var method = this.attributeGetters[name];
+		return (method) ? method.call(node) : node.getAttribute(name);
+	};
+
+	// hasAttribute
+
+	features.hasAttribute = (root && this.isNativeCode(root.hasAttribute)) ? function(node, attribute) {
+		return node.hasAttribute(attribute);
+	} : function(node, attribute) {
+		node = node.getAttributeNode(attribute);
+		return !!(node && (node.specified || node.nodeValue));
+	};
+
+	// contains
+	// FIXME: Add specs: local.contains should be different for xml and html documents?
+	var nativeRootContains = root && this.isNativeCode(root.contains),
+		nativeDocumentContains = document && this.isNativeCode(document.contains);
+
+	features.contains = (nativeRootContains && nativeDocumentContains) ? function(context, node){
+		return context.contains(node);
+	} : (nativeRootContains && !nativeDocumentContains) ? function(context, node){
+		// IE8 does not have .contains on document.
+		return context === node || ((context === document) ? document.documentElement : context).contains(node);
+	} : (root && root.compareDocumentPosition) ? function(context, node){
+		return context === node || !!(context.compareDocumentPosition(node) & 16);
+	} : function(context, node){
+		if (node) do {
+			if (node === context) return true;
+		} while ((node = node.parentNode));
+		return false;
+	};
+
+	// document order sorting
+	// credits to Sizzle (http://sizzlejs.com/)
+
+	features.documentSorter = (root.compareDocumentPosition) ? function(a, b){
+		if (!a.compareDocumentPosition || !b.compareDocumentPosition) return 0;
+		return a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+	} : ('sourceIndex' in root) ? function(a, b){
+		if (!a.sourceIndex || !b.sourceIndex) return 0;
+		return a.sourceIndex - b.sourceIndex;
+	} : (document.createRange) ? function(a, b){
+		if (!a.ownerDocument || !b.ownerDocument) return 0;
+		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+		aRange.setStart(a, 0);
+		aRange.setEnd(a, 0);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		return aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+	} : null ;
+
+	root = null;
+
+	for (feature in features){
+		this[feature] = features[feature];
+	}
+};
+
+// Main Method
+
+var reSimpleSelector = /^([#.]?)((?:[\w-]+|\*))$/,
+	reEmptyAttribute = /\[.+[*$^]=(?:""|'')?\]/,
+	qsaFailExpCache = {};
+
+local.search = function(context, expression, append, first){
+
+	var found = this.found = (first) ? null : (append || []);
+
+	if (!context) return found;
+	else if (context.navigator) context = context.document; // Convert the node from a window to a document
+	else if (!context.nodeType) return found;
+
+	// setup
+
+	var parsed, i,
+		uniques = this.uniques = {},
+		hasOthers = !!(append && append.length),
+		contextIsDocument = (context.nodeType == 9);
+
+	if (this.document !== (contextIsDocument ? context : context.ownerDocument)) this.setDocument(context);
+
+	// avoid duplicating items already in the append array
+	if (hasOthers) for (i = found.length; i--;) uniques[this.getUID(found[i])] = true;
+
+	// expression checks
+
+	if (typeof expression == 'string'){ // expression is a string
+
+		/*<simple-selectors-override>*/
+		var simpleSelector = expression.match(reSimpleSelector);
+		simpleSelectors: if (simpleSelector) {
+
+			var symbol = simpleSelector[1],
+				name = simpleSelector[2],
+				node, nodes;
+
+			if (!symbol){
+
+				if (name == '*' && this.brokenStarGEBTN) break simpleSelectors;
+				nodes = context.getElementsByTagName(name);
+				if (first) return nodes[0] || null;
+				for (i = 0; node = nodes[i++];){
+					if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+				}
+
+			} else if (symbol == '#'){
+
+				if (!this.isHTMLDocument || !contextIsDocument) break simpleSelectors;
+				node = context.getElementById(name);
+				if (!node) return found;
+				if (this.idGetsName && node.getAttributeNode('id').nodeValue != name) break simpleSelectors;
+				if (first) return node || null;
+				if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+
+			} else if (symbol == '.'){
+
+				if (!this.isHTMLDocument || ((!context.getElementsByClassName || this.brokenGEBCN) && context.querySelectorAll)) break simpleSelectors;
+				if (context.getElementsByClassName && !this.brokenGEBCN){
+					nodes = context.getElementsByClassName(name);
+					if (first) return nodes[0] || null;
+					for (i = 0; node = nodes[i++];){
+						if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+					}
+				} else {
+					var matchClass = new RegExp('(^|\\s)'+ Slick.escapeRegExp(name) +'(\\s|$)');
+					nodes = context.getElementsByTagName('*');
+					for (i = 0; node = nodes[i++];){
+						className = node.className;
+						if (!(className && matchClass.test(className))) continue;
+						if (first) return node;
+						if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+					}
+				}
+
+			}
+
+			if (hasOthers) this.sort(found);
+			return (first) ? null : found;
+
+		}
+		/*</simple-selectors-override>*/
+
+		/*<query-selector-override>*/
+		querySelector: if (context.querySelectorAll) {
+
+			if (!this.isHTMLDocument
+				|| qsaFailExpCache[expression]
+				//TODO: only skip when expression is actually mixed case
+				|| this.brokenMixedCaseQSA
+				|| (this.brokenCheckedQSA && expression.indexOf(':checked') > -1)
+				|| (this.brokenEmptyAttributeQSA && reEmptyAttribute.test(expression))
+				|| (!contextIsDocument //Abort when !contextIsDocument and...
+					//  there are multiple expressions in the selector
+					//  since we currently only fix non-document rooted QSA for single expression selectors
+					&& expression.indexOf(',') > -1
+				)
+				|| Slick.disableQSA
+			) break querySelector;
+
+			var _expression = expression, _context = context;
+			if (!contextIsDocument){
+				// non-document rooted QSA
+				// credits to Andrew Dupont
+				var currentId = _context.getAttribute('id'), slickid = 'slickid__';
+				_context.setAttribute('id', slickid);
+				_expression = '#' + slickid + ' ' + _expression;
+				context = _context.parentNode;
+			}
+
+			try {
+				if (first) return context.querySelector(_expression) || null;
+				else nodes = context.querySelectorAll(_expression);
+			} catch(e) {
+				qsaFailExpCache[expression] = 1;
+				break querySelector;
+			} finally {
+				if (!contextIsDocument){
+					if (currentId) _context.setAttribute('id', currentId);
+					else _context.removeAttribute('id');
+					context = _context;
+				}
+			}
+
+			if (this.starSelectsClosedQSA) for (i = 0; node = nodes[i++];){
+				if (node.nodeName > '@' && !(hasOthers && uniques[this.getUID(node)])) found.push(node);
+			} else for (i = 0; node = nodes[i++];){
+				if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+			}
+
+			if (hasOthers) this.sort(found);
+			return found;
+
+		}
+		/*</query-selector-override>*/
+
+		parsed = this.Slick.parse(expression);
+		if (!parsed.length) return found;
+	} else if (expression == null){ // there is no expression
+		return found;
+	} else if (expression.Slick){ // expression is a parsed Slick object
+		parsed = expression;
+	} else if (this.contains(context.documentElement || context, expression)){ // expression is a node
+		(found) ? found.push(expression) : found = expression;
+		return found;
+	} else { // other junk
+		return found;
+	}
+
+	/*<pseudo-selectors>*//*<nth-pseudo-selectors>*/
+
+	// cache elements for the nth selectors
+
+	this.posNTH = {};
+	this.posNTHLast = {};
+	this.posNTHType = {};
+	this.posNTHTypeLast = {};
+
+	/*</nth-pseudo-selectors>*//*</pseudo-selectors>*/
+
+	// if append is null and there is only a single selector with one expression use pushArray, else use pushUID
+	this.push = (!hasOthers && (first || (parsed.length == 1 && parsed.expressions[0].length == 1))) ? this.pushArray : this.pushUID;
+
+	if (found == null) found = [];
+
+	// default engine
+
+	var j, m, n;
+	var combinator, tag, id, classList, classes, attributes, pseudos;
+	var currentItems, currentExpression, currentBit, lastBit, expressions = parsed.expressions;
+
+	search: for (i = 0; (currentExpression = expressions[i]); i++) for (j = 0; (currentBit = currentExpression[j]); j++){
+
+		combinator = 'combinator:' + currentBit.combinator;
+		if (!this[combinator]) continue search;
+
+		tag        = (this.isXMLDocument) ? currentBit.tag : currentBit.tag.toUpperCase();
+		id         = currentBit.id;
+		classList  = currentBit.classList;
+		classes    = currentBit.classes;
+		attributes = currentBit.attributes;
+		pseudos    = currentBit.pseudos;
+		lastBit    = (j === (currentExpression.length - 1));
+
+		this.bitUniques = {};
+
+		if (lastBit){
+			this.uniques = uniques;
+			this.found = found;
+		} else {
+			this.uniques = {};
+			this.found = [];
+		}
+
+		if (j === 0){
+			this[combinator](context, tag, id, classes, attributes, pseudos, classList);
+			if (first && lastBit && found.length) break search;
+		} else {
+			if (first && lastBit) for (m = 0, n = currentItems.length; m < n; m++){
+				this[combinator](currentItems[m], tag, id, classes, attributes, pseudos, classList);
+				if (found.length) break search;
+			} else for (m = 0, n = currentItems.length; m < n; m++) this[combinator](currentItems[m], tag, id, classes, attributes, pseudos, classList);
+		}
+
+		currentItems = this.found;
+	}
+
+	// should sort if there are nodes in append and if you pass multiple expressions.
+	if (hasOthers || (parsed.expressions.length > 1)) this.sort(found);
+
+	return (first) ? (found[0] || null) : found;
+};
+
+// Utils
+
+local.uidx = 1;
+local.uidk = 'slick-uniqueid';
+
+local.getUIDXML = function(node){
+	var uid = node.getAttribute(this.uidk);
+	if (!uid){
+		uid = this.uidx++;
+		node.setAttribute(this.uidk, uid);
+	}
+	return uid;
+};
+
+local.getUIDHTML = function(node){
+	return node.uniqueNumber || (node.uniqueNumber = this.uidx++);
+};
+
+// sort based on the setDocument documentSorter method.
+
+local.sort = function(results){
+	if (!this.documentSorter) return results;
+	results.sort(this.documentSorter);
+	return results;
+};
+
+/*<pseudo-selectors>*//*<nth-pseudo-selectors>*/
+
+local.cacheNTH = {};
+
+local.matchNTH = /^([+-]?\d*)?([a-z]+)?([+-]\d+)?$/;
+
+local.parseNTHArgument = function(argument){
+	var parsed = argument.match(this.matchNTH);
+	if (!parsed) return false;
+	var special = parsed[2] || false;
+	var a = parsed[1] || 1;
+	if (a == '-') a = -1;
+	var b = +parsed[3] || 0;
+	parsed =
+		(special == 'n')	? {a: a, b: b} :
+		(special == 'odd')	? {a: 2, b: 1} :
+		(special == 'even')	? {a: 2, b: 0} : {a: 0, b: a};
+
+	return (this.cacheNTH[argument] = parsed);
+};
+
+local.createNTHPseudo = function(child, sibling, positions, ofType){
+	return function(node, argument){
+		var uid = this.getUID(node);
+		if (!this[positions][uid]){
+			var parent = node.parentNode;
+			if (!parent) return false;
+			var el = parent[child], count = 1;
+			if (ofType){
+				var nodeName = node.nodeName;
+				do {
+					if (el.nodeName != nodeName) continue;
+					this[positions][this.getUID(el)] = count++;
+				} while ((el = el[sibling]));
+			} else {
+				do {
+					if (el.nodeType != 1) continue;
+					this[positions][this.getUID(el)] = count++;
+				} while ((el = el[sibling]));
+			}
+		}
+		argument = argument || 'n';
+		var parsed = this.cacheNTH[argument] || this.parseNTHArgument(argument);
+		if (!parsed) return false;
+		var a = parsed.a, b = parsed.b, pos = this[positions][uid];
+		if (a == 0) return b == pos;
+		if (a > 0){
+			if (pos < b) return false;
+		} else {
+			if (b < pos) return false;
+		}
+		return ((pos - b) % a) == 0;
+	};
+};
+
+/*</nth-pseudo-selectors>*//*</pseudo-selectors>*/
+
+local.pushArray = function(node, tag, id, classes, attributes, pseudos){
+	if (this.matchSelector(node, tag, id, classes, attributes, pseudos)) this.found.push(node);
+};
+
+local.pushUID = function(node, tag, id, classes, attributes, pseudos){
+	var uid = this.getUID(node);
+	if (!this.uniques[uid] && this.matchSelector(node, tag, id, classes, attributes, pseudos)){
+		this.uniques[uid] = true;
+		this.found.push(node);
+	}
+};
+
+local.matchNode = function(node, selector){
+	if (this.isHTMLDocument && this.nativeMatchesSelector){
+		try {
+			return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
+		} catch(matchError) {}
+	}
+
+	var parsed = this.Slick.parse(selector);
+	if (!parsed) return true;
+
+	// simple (single) selectors
+	var expressions = parsed.expressions, simpleExpCounter = 0, i;
+	for (i = 0; (currentExpression = expressions[i]); i++){
+		if (currentExpression.length == 1){
+			var exp = currentExpression[0];
+			if (this.matchSelector(node, (this.isXMLDocument) ? exp.tag : exp.tag.toUpperCase(), exp.id, exp.classes, exp.attributes, exp.pseudos)) return true;
+			simpleExpCounter++;
+		}
+	}
+
+	if (simpleExpCounter == parsed.length) return false;
+
+	var nodes = this.search(this.document, parsed), item;
+	for (i = 0; item = nodes[i++];){
+		if (item === node) return true;
+	}
+	return false;
+};
+
+local.matchPseudo = function(node, name, argument){
+	var pseudoName = 'pseudo:' + name;
+	if (this[pseudoName]) return this[pseudoName](node, argument);
+	var attribute = this.getAttribute(node, name);
+	return (argument) ? argument == attribute : !!attribute;
+};
+
+local.matchSelector = function(node, tag, id, classes, attributes, pseudos){
+	if (tag){
+		var nodeName = (this.isXMLDocument) ? node.nodeName : node.nodeName.toUpperCase();
+		if (tag == '*'){
+			if (nodeName < '@') return false; // Fix for comment nodes and closed nodes
+		} else {
+			if (nodeName != tag) return false;
+		}
+	}
+
+	if (id && node.getAttribute('id') != id) return false;
+
+	var i, part, cls;
+	if (classes) for (i = classes.length; i--;){
+		cls = this.getAttribute(node, 'class');
+		if (!(cls && classes[i].regexp.test(cls))) return false;
+	}
+	if (attributes) for (i = attributes.length; i--;){
+		part = attributes[i];
+		if (part.operator ? !part.test(this.getAttribute(node, part.key)) : !this.hasAttribute(node, part.key)) return false;
+	}
+	if (pseudos) for (i = pseudos.length; i--;){
+		part = pseudos[i];
+		if (!this.matchPseudo(node, part.key, part.value)) return false;
+	}
+	return true;
+};
+
+var combinators = {
+
+	' ': function(node, tag, id, classes, attributes, pseudos, classList){ // all child nodes, any level
+
+		var i, item, children;
+
+		if (this.isHTMLDocument){
+			getById: if (id){
+				item = this.document.getElementById(id);
+				if ((!item && node.all) || (this.idGetsName && item && item.getAttributeNode('id').nodeValue != id)){
+					// all[id] returns all the elements with that name or id inside node
+					// if theres just one it will return the element, else it will be a collection
+					children = node.all[id];
+					if (!children) return;
+					if (!children[0]) children = [children];
+					for (i = 0; item = children[i++];){
+						var idNode = item.getAttributeNode('id');
+						if (idNode && idNode.nodeValue == id){
+							this.push(item, tag, null, classes, attributes, pseudos);
+							break;
+						}
+					}
+					return;
+				}
+				if (!item){
+					// if the context is in the dom we return, else we will try GEBTN, breaking the getById label
+					if (this.contains(this.root, node)) return;
+					else break getById;
+				} else if (this.document !== node && !this.contains(node, item)) return;
+				this.push(item, tag, null, classes, attributes, pseudos);
+				return;
+			}
+			getByClass: if (classes && node.getElementsByClassName && !this.brokenGEBCN){
+				children = node.getElementsByClassName(classList.join(' '));
+				if (!(children && children.length)) break getByClass;
+				for (i = 0; item = children[i++];) this.push(item, tag, id, null, attributes, pseudos);
+				return;
+			}
+		}
+		getByTag: {
+			children = node.getElementsByTagName(tag);
+			if (!(children && children.length)) break getByTag;
+			if (!this.brokenStarGEBTN) tag = null;
+			for (i = 0; item = children[i++];) this.push(item, tag, id, classes, attributes, pseudos);
+		}
+	},
+
+	'>': function(node, tag, id, classes, attributes, pseudos){ // direct children
+		if ((node = node.firstChild)) do {
+			if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
+		} while ((node = node.nextSibling));
+	},
+
+	'+': function(node, tag, id, classes, attributes, pseudos){ // next sibling
+		while ((node = node.nextSibling)) if (node.nodeType == 1){
+			this.push(node, tag, id, classes, attributes, pseudos);
+			break;
+		}
+	},
+
+	'^': function(node, tag, id, classes, attributes, pseudos){ // first child
+		node = node.firstChild;
+		if (node){
+			if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
+			else this['combinator:+'](node, tag, id, classes, attributes, pseudos);
+		}
+	},
+
+	'~': function(node, tag, id, classes, attributes, pseudos){ // next siblings
+		while ((node = node.nextSibling)){
+			if (node.nodeType != 1) continue;
+			var uid = this.getUID(node);
+			if (this.bitUniques[uid]) break;
+			this.bitUniques[uid] = true;
+			this.push(node, tag, id, classes, attributes, pseudos);
+		}
+	},
+
+	'++': function(node, tag, id, classes, attributes, pseudos){ // next sibling and previous sibling
+		this['combinator:+'](node, tag, id, classes, attributes, pseudos);
+		this['combinator:!+'](node, tag, id, classes, attributes, pseudos);
+	},
+
+	'~~': function(node, tag, id, classes, attributes, pseudos){ // next siblings and previous siblings
+		this['combinator:~'](node, tag, id, classes, attributes, pseudos);
+		this['combinator:!~'](node, tag, id, classes, attributes, pseudos);
+	},
+
+	'!': function(node, tag, id, classes, attributes, pseudos){ // all parent nodes up to document
+		while ((node = node.parentNode)) if (node !== this.document) this.push(node, tag, id, classes, attributes, pseudos);
+	},
+
+	'!>': function(node, tag, id, classes, attributes, pseudos){ // direct parent (one level)
+		node = node.parentNode;
+		if (node !== this.document) this.push(node, tag, id, classes, attributes, pseudos);
+	},
+
+	'!+': function(node, tag, id, classes, attributes, pseudos){ // previous sibling
+		while ((node = node.previousSibling)) if (node.nodeType == 1){
+			this.push(node, tag, id, classes, attributes, pseudos);
+			break;
+		}
+	},
+
+	'!^': function(node, tag, id, classes, attributes, pseudos){ // last child
+		node = node.lastChild;
+		if (node){
+			if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
+			else this['combinator:!+'](node, tag, id, classes, attributes, pseudos);
+		}
+	},
+
+	'!~': function(node, tag, id, classes, attributes, pseudos){ // previous siblings
+		while ((node = node.previousSibling)){
+			if (node.nodeType != 1) continue;
+			var uid = this.getUID(node);
+			if (this.bitUniques[uid]) break;
+			this.bitUniques[uid] = true;
+			this.push(node, tag, id, classes, attributes, pseudos);
+		}
+	}
+
+};
+
+for (var c in combinators) local['combinator:' + c] = combinators[c];
+
+var pseudos = {
+
+	/*<pseudo-selectors>*/
+
+	'empty': function(node){
+		var child = node.firstChild;
+		return !(child && child.nodeType == 1) && !(node.innerText || node.textContent || '').length;
+	},
+
+	'not': function(node, expression){
+		return !this.matchNode(node, expression);
+	},
+
+	'contains': function(node, text){
+		return (node.innerText || node.textContent || '').indexOf(text) > -1;
+	},
+
+	'first-child': function(node){
+		while ((node = node.previousSibling)) if (node.nodeType == 1) return false;
+		return true;
+	},
+
+	'last-child': function(node){
+		while ((node = node.nextSibling)) if (node.nodeType == 1) return false;
+		return true;
+	},
+
+	'only-child': function(node){
+		var prev = node;
+		while ((prev = prev.previousSibling)) if (prev.nodeType == 1) return false;
+		var next = node;
+		while ((next = next.nextSibling)) if (next.nodeType == 1) return false;
+		return true;
+	},
+
+	/*<nth-pseudo-selectors>*/
+
+	'nth-child': local.createNTHPseudo('firstChild', 'nextSibling', 'posNTH'),
+
+	'nth-last-child': local.createNTHPseudo('lastChild', 'previousSibling', 'posNTHLast'),
+
+	'nth-of-type': local.createNTHPseudo('firstChild', 'nextSibling', 'posNTHType', true),
+
+	'nth-last-of-type': local.createNTHPseudo('lastChild', 'previousSibling', 'posNTHTypeLast', true),
+
+	'index': function(node, index){
+		return this['pseudo:nth-child'](node, '' + (index + 1));
+	},
+
+	'even': function(node){
+		return this['pseudo:nth-child'](node, '2n');
+	},
+
+	'odd': function(node){
+		return this['pseudo:nth-child'](node, '2n+1');
+	},
+
+	/*</nth-pseudo-selectors>*/
+
+	/*<of-type-pseudo-selectors>*/
+
+	'first-of-type': function(node){
+		var nodeName = node.nodeName;
+		while ((node = node.previousSibling)) if (node.nodeName == nodeName) return false;
+		return true;
+	},
+
+	'last-of-type': function(node){
+		var nodeName = node.nodeName;
+		while ((node = node.nextSibling)) if (node.nodeName == nodeName) return false;
+		return true;
+	},
+
+	'only-of-type': function(node){
+		var prev = node, nodeName = node.nodeName;
+		while ((prev = prev.previousSibling)) if (prev.nodeName == nodeName) return false;
+		var next = node;
+		while ((next = next.nextSibling)) if (next.nodeName == nodeName) return false;
+		return true;
+	},
+
+	/*</of-type-pseudo-selectors>*/
+
+	// custom pseudos
+
+	'enabled': function(node){
+		return !node.disabled;
+	},
+
+	'disabled': function(node){
+		return node.disabled;
+	},
+
+	'checked': function(node){
+		return node.checked || node.selected;
+	},
+
+	'focus': function(node){
+		return this.isHTMLDocument && this.document.activeElement === node && (node.href || node.type || this.hasAttribute(node, 'tabindex'));
+	},
+
+	'root': function(node){
+		return (node === this.root);
+	},
+
+	'selected': function(node){
+		return node.selected;
+	}
+
+	/*</pseudo-selectors>*/
+};
+
+for (var p in pseudos) local['pseudo:' + p] = pseudos[p];
+
+// attributes methods
+
+var attributeGetters = local.attributeGetters = {
+
+	'for': function(){
+		return ('htmlFor' in this) ? this.htmlFor : this.getAttribute('for');
+	},
+
+	'href': function(){
+		return ('href' in this) ? this.getAttribute('href', 2) : this.getAttribute('href');
+	},
+
+	'style': function(){
+		return (this.style) ? this.style.cssText : this.getAttribute('style');
+	},
+
+	'tabindex': function(){
+		var attributeNode = this.getAttributeNode('tabindex');
+		return (attributeNode && attributeNode.specified) ? attributeNode.nodeValue : null;
+	},
+
+	'type': function(){
+		return this.getAttribute('type');
+	},
+
+	'maxlength': function(){
+		var attributeNode = this.getAttributeNode('maxLength');
+		return (attributeNode && attributeNode.specified) ? attributeNode.nodeValue : null;
+	}
+
+};
+
+attributeGetters.MAXLENGTH = attributeGetters.maxLength = attributeGetters.maxlength;
+
+// Slick
+
+var Slick = local.Slick = (this.Slick || {});
+
+Slick.version = '1.1.7';
+
+// Slick finder
+
+Slick.search = function(context, expression, append){
+	return local.search(context, expression, append);
+};
+
+Slick.find = function(context, expression){
+	return local.search(context, expression, null, true);
+};
+
+// Slick containment checker
+
+Slick.contains = function(container, node){
+	local.setDocument(container);
+	return local.contains(container, node);
+};
+
+// Slick attribute getter
+
+Slick.getAttribute = function(node, name){
+	local.setDocument(node);
+	return local.getAttribute(node, name);
+};
+
+Slick.hasAttribute = function(node, name){
+	local.setDocument(node);
+	return local.hasAttribute(node, name);
+};
+
+// Slick matcher
+
+Slick.match = function(node, selector){
+	if (!(node && selector)) return false;
+	if (!selector || selector === node) return true;
+	local.setDocument(node);
+	return local.matchNode(node, selector);
+};
+
+// Slick attribute accessor
+
+Slick.defineAttributeGetter = function(name, fn){
+	local.attributeGetters[name] = fn;
+	return this;
+};
+
+Slick.lookupAttributeGetter = function(name){
+	return local.attributeGetters[name];
+};
+
+// Slick pseudo accessor
+
+Slick.definePseudo = function(name, fn){
+	local['pseudo:' + name] = function(node, argument){
+		return fn.call(node, argument);
+	};
+	return this;
+};
+
+Slick.lookupPseudo = function(name){
+	var pseudo = local['pseudo:' + name];
+	if (pseudo) return function(argument){
+		return pseudo.call(this, argument);
+	};
+	return null;
+};
+
+// Slick overrides accessor
+
+Slick.override = function(regexp, fn){
+	local.override(regexp, fn);
+	return this;
+};
+
+Slick.isXML = local.isXML;
+
+Slick.uidOf = function(node){
+	return local.getUIDHTML(node);
+};
+
+if (!this.Slick) this.Slick = Slick;
+
+}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
+
+
+/*
+---
+
+name: Element
+
+description: One of the most important items in MooTools. Contains the dollar function, the dollars function, and an handful of cross-browser, time-saver methods to let you easily work with HTML Elements.
+
+license: MIT-style license.
+
+requires: [Window, Document, Array, String, Function, Object, Number, Slick.Parser, Slick.Finder]
+
+provides: [Element, Elements, $, $$, Iframe, Selectors]
+
+...
+*/
+
+var Element = function(tag, props){
+	var konstructor = Element.Constructors[tag];
+	if (konstructor) return konstructor(props);
+	if (typeof tag != 'string') return document.id(tag).set(props);
+
+	if (!props) props = {};
+
+	if (!(/^[\w-]+$/).test(tag)){
+		var parsed = Slick.parse(tag).expressions[0][0];
+		tag = (parsed.tag == '*') ? 'div' : parsed.tag;
+		if (parsed.id && props.id == null) props.id = parsed.id;
+
+		var attributes = parsed.attributes;
+		if (attributes) for (var attr, i = 0, l = attributes.length; i < l; i++){
+			attr = attributes[i];
+			if (props[attr.key] != null) continue;
+
+			if (attr.value != null && attr.operator == '=') props[attr.key] = attr.value;
+			else if (!attr.value && !attr.operator) props[attr.key] = true;
+		}
+
+		if (parsed.classList && props['class'] == null) props['class'] = parsed.classList.join(' ');
+	}
+
+	return document.newElement(tag, props);
+};
+
+
+if (Browser.Element){
+	Element.prototype = Browser.Element.prototype;
+	// IE8 and IE9 require the wrapping.
+	Element.prototype._fireEvent = (function(fireEvent){
+		return function(type, event){
+			return fireEvent.call(this, type, event);
+		};
+	})(Element.prototype.fireEvent);
+}
+
+new Type('Element', Element).mirror(function(name){
+	if (Array.prototype[name]) return;
+
+	var obj = {};
+	obj[name] = function(){
+		var results = [], args = arguments, elements = true;
+		for (var i = 0, l = this.length; i < l; i++){
+			var element = this[i], result = results[i] = element[name].apply(element, args);
+			elements = (elements && typeOf(result) == 'element');
+		}
+		return (elements) ? new Elements(results) : results;
+	};
+
+	Elements.implement(obj);
+});
+
+if (!Browser.Element){
+	Element.parent = Object;
+
+	Element.Prototype = {
+		'$constructor': Element,
+		'$family': Function.from('element').hide()
+	};
+
+	Element.mirror(function(name, method){
+		Element.Prototype[name] = method;
+	});
+}
+
+Element.Constructors = {};
+
+
+
+var IFrame = new Type('IFrame', function(){
+	var params = Array.link(arguments, {
+		properties: Type.isObject,
+		iframe: function(obj){
+			return (obj != null);
+		}
+	});
+
+	var props = params.properties || {}, iframe;
+	if (params.iframe) iframe = document.id(params.iframe);
+	var onload = props.onload || function(){};
+	delete props.onload;
+	props.id = props.name = [props.id, props.name, iframe ? (iframe.id || iframe.name) : 'IFrame_' + String.uniqueID()].pick();
+	iframe = new Element(iframe || 'iframe', props);
+
+	var onLoad = function(){
+		onload.call(iframe.contentWindow);
+	};
+
+	if (window.frames[props.id]) onLoad();
+	else iframe.addListener('load', onLoad);
+	return iframe;
+});
+
+var Elements = this.Elements = function(nodes){
+	if (nodes && nodes.length){
+		var uniques = {}, node;
+		for (var i = 0; node = nodes[i++];){
+			var uid = Slick.uidOf(node);
+			if (!uniques[uid]){
+				uniques[uid] = true;
+				this.push(node);
+			}
+		}
+	}
+};
+
+Elements.prototype = {length: 0};
+Elements.parent = Array;
+
+new Type('Elements', Elements).implement({
+
+	filter: function(filter, bind){
+		if (!filter) return this;
+		return new Elements(Array.filter(this, (typeOf(filter) == 'string') ? function(item){
+			return item.match(filter);
+		} : filter, bind));
+	}.protect(),
+
+	push: function(){
+		var length = this.length;
+		for (var i = 0, l = arguments.length; i < l; i++){
+			var item = document.id(arguments[i]);
+			if (item) this[length++] = item;
+		}
+		return (this.length = length);
+	}.protect(),
+
+	unshift: function(){
+		var items = [];
+		for (var i = 0, l = arguments.length; i < l; i++){
+			var item = document.id(arguments[i]);
+			if (item) items.push(item);
+		}
+		return Array.prototype.unshift.apply(this, items);
+	}.protect(),
+
+	concat: function(){
+		var newElements = new Elements(this);
+		for (var i = 0, l = arguments.length; i < l; i++){
+			var item = arguments[i];
+			if (Type.isEnumerable(item)) newElements.append(item);
+			else newElements.push(item);
+		}
+		return newElements;
+	}.protect(),
+
+	append: function(collection){
+		for (var i = 0, l = collection.length; i < l; i++) this.push(collection[i]);
+		return this;
+	}.protect(),
+
+	empty: function(){
+		while (this.length) delete this[--this.length];
+		return this;
+	}.protect()
+
+});
+
+
+
+(function(){
+
+// FF, IE
+var splice = Array.prototype.splice, object = {'0': 0, '1': 1, length: 2};
+
+splice.call(object, 1, 1);
+if (object[1] == 1) Elements.implement('splice', function(){
+	var length = this.length;
+	var result = splice.apply(this, arguments);
+	while (length >= this.length) delete this[length--];
+	return result;
+}.protect());
+
+Array.forEachMethod(function(method, name){
+	Elements.implement(name, method);
+});
+
+Array.mirror(Elements);
+
+/*<ltIE8>*/
+var createElementAcceptsHTML;
+try {
+    createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
+} catch (e){}
+
+var escapeQuotes = function(html){
+	return ('' + html).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+};
+/*</ltIE8>*/
+
+Document.implement({
+
+	newElement: function(tag, props){
+		if (props && props.checked != null) props.defaultChecked = props.checked;
+		/*<ltIE8>*/// Fix for readonly name and type properties in IE < 8
+		if (createElementAcceptsHTML && props){
+			tag = '<' + tag;
+			if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
+			if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
+			tag += '>';
+			delete props.name;
+			delete props.type;
+		}
+		/*</ltIE8>*/
+		return this.id(this.createElement(tag)).set(props);
+	}
+
+});
+
+})();
+
+(function(){
+
+Slick.uidOf(window);
+Slick.uidOf(document);
+
+Document.implement({
+
+	newTextNode: function(text){
+		return this.createTextNode(text);
+	},
+
+	getDocument: function(){
+		return this;
+	},
+
+	getWindow: function(){
+		return this.window;
+	},
+
+	id: (function(){
+
+		var types = {
+
+			string: function(id, nocash, doc){
+				id = Slick.find(doc, '#' + id.replace(/(\W)/g, '\\$1'));
+				return (id) ? types.element(id, nocash) : null;
+			},
+
+			element: function(el, nocash){
+				Slick.uidOf(el);
+				if (!nocash && !el.$family && !(/^(?:object|embed)$/i).test(el.tagName)){
+					var fireEvent = el.fireEvent;
+					// wrapping needed in IE7, or else crash
+					el._fireEvent = function(type, event){
+						return fireEvent(type, event);
+					};
+					Object.append(el, Element.Prototype);
+				}
+				return el;
+			},
+
+			object: function(obj, nocash, doc){
+				if (obj.toElement) return types.element(obj.toElement(doc), nocash);
+				return null;
+			}
+
+		};
+
+		types.textnode = types.whitespace = types.window = types.document = function(zero){
+			return zero;
+		};
+
+		return function(el, nocash, doc){
+			if (el && el.$family && el.uniqueNumber) return el;
+			var type = typeOf(el);
+			return (types[type]) ? types[type](el, nocash, doc || document) : null;
+		};
+
+	})()
+
+});
+
+if (window.$ == null) Window.implement('$', function(el, nc){
+	return document.id(el, nc, this.document);
+});
+
+Window.implement({
+
+	getDocument: function(){
+		return this.document;
+	},
+
+	getWindow: function(){
+		return this;
+	}
+
+});
+
+[Document, Element].invoke('implement', {
+
+	getElements: function(expression){
+		return Slick.search(this, expression, new Elements);
+	},
+
+	getElement: function(expression){
+		return document.id(Slick.find(this, expression));
+	}
+
+});
+
+var contains = {contains: function(element){
+	return Slick.contains(this, element);
+}};
+
+if (!document.contains) Document.implement(contains);
+if (!document.createElement('div').contains) Element.implement(contains);
+
+
+
+// tree walking
+
+var injectCombinator = function(expression, combinator){
+	if (!expression) return combinator;
+
+	expression = Object.clone(Slick.parse(expression));
+
+	var expressions = expression.expressions;
+	for (var i = expressions.length; i--;)
+		expressions[i][0].combinator = combinator;
+
+	return expression;
+};
+
+Object.forEach({
+	getNext: '~',
+	getPrevious: '!~',
+	getParent: '!'
+}, function(combinator, method){
+	Element.implement(method, function(expression){
+		return this.getElement(injectCombinator(expression, combinator));
+	});
+});
+
+Object.forEach({
+	getAllNext: '~',
+	getAllPrevious: '!~',
+	getSiblings: '~~',
+	getChildren: '>',
+	getParents: '!'
+}, function(combinator, method){
+	Element.implement(method, function(expression){
+		return this.getElements(injectCombinator(expression, combinator));
+	});
+});
+
+Element.implement({
+
+	getFirst: function(expression){
+		return document.id(Slick.search(this, injectCombinator(expression, '>'))[0]);
+	},
+
+	getLast: function(expression){
+		return document.id(Slick.search(this, injectCombinator(expression, '>')).getLast());
+	},
+
+	getWindow: function(){
+		return this.ownerDocument.window;
+	},
+
+	getDocument: function(){
+		return this.ownerDocument;
+	},
+
+	getElementById: function(id){
+		return document.id(Slick.find(this, '#' + ('' + id).replace(/(\W)/g, '\\$1')));
+	},
+
+	match: function(expression){
+		return !expression || Slick.match(this, expression);
+	}
+
+});
+
+
+
+if (window.$$ == null) Window.implement('$$', function(selector){
+	if (arguments.length == 1){
+		if (typeof selector == 'string') return Slick.search(this.document, selector, new Elements);
+		else if (Type.isEnumerable(selector)) return new Elements(selector);
+	}
+	return new Elements(arguments);
+});
+
+// Inserters
+
+var inserters = {
+
+	before: function(context, element){
+		var parent = element.parentNode;
+		if (parent) parent.insertBefore(context, element);
+	},
+
+	after: function(context, element){
+		var parent = element.parentNode;
+		if (parent) parent.insertBefore(context, element.nextSibling);
+	},
+
+	bottom: function(context, element){
+		element.appendChild(context);
+	},
+
+	top: function(context, element){
+		element.insertBefore(context, element.firstChild);
+	}
+
+};
+
+inserters.inside = inserters.bottom;
+
+
+
+// getProperty / setProperty
+
+var propertyGetters = {}, propertySetters = {};
+
+// properties
+
+var properties = {};
+Array.forEach([
+	'type', 'value', 'defaultValue', 'accessKey', 'cellPadding', 'cellSpacing', 'colSpan',
+	'frameBorder', 'rowSpan', 'tabIndex', 'useMap'
+], function(property){
+	properties[property.toLowerCase()] = property;
+});
+
+properties.html = 'innerHTML';
+properties.text = (document.createElement('div').textContent == null) ? 'innerText': 'textContent';
+
+Object.forEach(properties, function(real, key){
+	propertySetters[key] = function(node, value){
+		node[real] = value;
+	};
+	propertyGetters[key] = function(node){
+		return node[real];
+	};
+});
+
+// Booleans
+
+var bools = [
+	'compact', 'nowrap', 'ismap', 'declare', 'noshade', 'checked',
+	'disabled', 'readOnly', 'multiple', 'selected', 'noresize',
+	'defer', 'defaultChecked', 'autofocus', 'controls', 'autoplay',
+	'loop'
+];
+
+var booleans = {};
+Array.forEach(bools, function(bool){
+	var lower = bool.toLowerCase();
+	booleans[lower] = bool;
+	propertySetters[lower] = function(node, value){
+		node[bool] = !!value;
+	};
+	propertyGetters[lower] = function(node){
+		return !!node[bool];
+	};
+});
+
+// Special cases
+
+Object.append(propertySetters, {
+
+	'class': function(node, value){
+		('className' in node) ? node.className = (value || '') : node.setAttribute('class', value);
+	},
+
+	'for': function(node, value){
+		('htmlFor' in node) ? node.htmlFor = value : node.setAttribute('for', value);
+	},
+
+	'style': function(node, value){
+		(node.style) ? node.style.cssText = value : node.setAttribute('style', value);
+	},
+
+	'value': function(node, value){
+		node.value = (value != null) ? value : '';
+	}
+
+});
+
+propertyGetters['class'] = function(node){
+	return ('className' in node) ? node.className || null : node.getAttribute('class');
+};
+
+/* <webkit> */
+var el = document.createElement('button');
+// IE sets type as readonly and throws
+try { el.type = 'button'; } catch(e){}
+if (el.type != 'button') propertySetters.type = function(node, value){
+	node.setAttribute('type', value);
+};
+el = null;
+/* </webkit> */
+
+/*<IE>*/
+var input = document.createElement('input');
+input.value = 't';
+input.type = 'submit';
+if (input.value != 't') propertySetters.type = function(node, type){
+	var value = node.value;
+	node.type = type;
+	node.value = value;
+};
+input = null;
+/*</IE>*/
+
+/* getProperty, setProperty */
+
+/* <ltIE9> */
+var pollutesGetAttribute = (function(div){
+	div.random = 'attribute';
+	return (div.getAttribute('random') == 'attribute');
+})(document.createElement('div'));
+
+/* <ltIE9> */
+
+Element.implement({
+
+	setProperty: function(name, value){
+		var setter = propertySetters[name.toLowerCase()];
+		if (setter){
+			setter(this, value);
+		} else {
+			/* <ltIE9> */
+			if (pollutesGetAttribute) var attributeWhiteList = this.retrieve('$attributeWhiteList', {});
+			/* </ltIE9> */
+
+			if (value == null){
+				this.removeAttribute(name);
+				/* <ltIE9> */
+				if (pollutesGetAttribute) delete attributeWhiteList[name];
+				/* </ltIE9> */
+			} else {
+				this.setAttribute(name, '' + value);
+				/* <ltIE9> */
+				if (pollutesGetAttribute) attributeWhiteList[name] = true;
+				/* </ltIE9> */
+			}
+		}
+		return this;
+	},
+
+	setProperties: function(attributes){
+		for (var attribute in attributes) this.setProperty(attribute, attributes[attribute]);
+		return this;
+	},
+
+	getProperty: function(name){
+		var getter = propertyGetters[name.toLowerCase()];
+		if (getter) return getter(this);
+		/* <ltIE9> */
+		if (pollutesGetAttribute){
+			var attr = this.getAttributeNode(name), attributeWhiteList = this.retrieve('$attributeWhiteList', {});
+			if (!attr) return null;
+			if (attr.expando && !attributeWhiteList[name]){
+				var outer = this.outerHTML;
+				// segment by the opening tag and find mention of attribute name
+				if (outer.substr(0, outer.search(/\/?['"]?>(?![^<]*<['"])/)).indexOf(name) < 0) return null;
+				attributeWhiteList[name] = true;
+			}
+		}
+		/* </ltIE9> */
+		var result = Slick.getAttribute(this, name);
+		return (!result && !Slick.hasAttribute(this, name)) ? null : result;
+	},
+
+	getProperties: function(){
+		var args = Array.from(arguments);
+		return args.map(this.getProperty, this).associate(args);
+	},
+
+	removeProperty: function(name){
+		return this.setProperty(name, null);
+	},
+
+	removeProperties: function(){
+		Array.each(arguments, this.removeProperty, this);
+		return this;
+	},
+
+	set: function(prop, value){
+		var property = Element.Properties[prop];
+		(property && property.set) ? property.set.call(this, value) : this.setProperty(prop, value);
+	}.overloadSetter(),
+
+	get: function(prop){
+		var property = Element.Properties[prop];
+		return (property && property.get) ? property.get.apply(this) : this.getProperty(prop);
+	}.overloadGetter(),
+
+	erase: function(prop){
+		var property = Element.Properties[prop];
+		(property && property.erase) ? property.erase.apply(this) : this.removeProperty(prop);
+		return this;
+	},
+
+	hasClass: function(className){
+		return this.className.clean().contains(className, ' ');
+	},
+
+	addClass: function(className){
+		if (!this.hasClass(className)) this.className = (this.className + ' ' + className).clean();
+		return this;
+	},
+
+	removeClass: function(className){
+		this.className = this.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1');
+		return this;
+	},
+
+	toggleClass: function(className, force){
+		if (force == null) force = !this.hasClass(className);
+		return (force) ? this.addClass(className) : this.removeClass(className);
+	},
+
+	adopt: function(){
+		var parent = this, fragment, elements = Array.flatten(arguments), length = elements.length;
+		if (length > 1) parent = fragment = document.createDocumentFragment();
+
+		for (var i = 0; i < length; i++){
+			var element = document.id(elements[i], true);
+			if (element) parent.appendChild(element);
+		}
+
+		if (fragment) this.appendChild(fragment);
+
+		return this;
+	},
+
+	appendText: function(text, where){
+		return this.grab(this.getDocument().newTextNode(text), where);
+	},
+
+	grab: function(el, where){
+		inserters[where || 'bottom'](document.id(el, true), this);
+		return this;
+	},
+
+	inject: function(el, where){
+		inserters[where || 'bottom'](this, document.id(el, true));
+		return this;
+	},
+
+	replaces: function(el){
+		el = document.id(el, true);
+		el.parentNode.replaceChild(this, el);
+		return this;
+	},
+
+	wraps: function(el, where){
+		el = document.id(el, true);
+		return this.replaces(el).grab(el, where);
+	},
+
+	getSelected: function(){
+		this.selectedIndex; // Safari 3.2.1
+		return new Elements(Array.from(this.options).filter(function(option){
+			return option.selected;
+		}));
+	},
+
+	toQueryString: function(){
+		var queryString = [];
+		this.getElements('input, select, textarea').each(function(el){
+			var type = el.type;
+			if (!el.name || el.disabled || type == 'submit' || type == 'reset' || type == 'file' || type == 'image') return;
+
+			var value = (el.get('tag') == 'select') ? el.getSelected().map(function(opt){
+				// IE
+				return document.id(opt).get('value');
+			}) : ((type == 'radio' || type == 'checkbox') && !el.checked) ? null : el.get('value');
+
+			Array.from(value).each(function(val){
+				if (typeof val != 'undefined') queryString.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(val));
+			});
+		});
+		return queryString.join('&');
+	}
+
+});
+
+var collected = {}, storage = {};
+
+var get = function(uid){
+	return (storage[uid] || (storage[uid] = {}));
+};
+
+var clean = function(item){
+	var uid = item.uniqueNumber;
+	if (item.removeEvents) item.removeEvents();
+	if (item.clearAttributes) item.clearAttributes();
+	if (uid != null){
+		delete collected[uid];
+		delete storage[uid];
+	}
+	return item;
+};
+
+var formProps = {input: 'checked', option: 'selected', textarea: 'value'};
+
+Element.implement({
+
+	destroy: function(){
+		var children = clean(this).getElementsByTagName('*');
+		Array.each(children, clean);
+		Element.dispose(this);
+		return null;
+	},
+
+	empty: function(){
+		Array.from(this.childNodes).each(Element.dispose);
+		return this;
+	},
+
+	dispose: function(){
+		return (this.parentNode) ? this.parentNode.removeChild(this) : this;
+	},
+
+	clone: function(contents, keepid){
+		contents = contents !== false;
+		var clone = this.cloneNode(contents), ce = [clone], te = [this], i;
+
+		if (contents){
+			ce.append(Array.from(clone.getElementsByTagName('*')));
+			te.append(Array.from(this.getElementsByTagName('*')));
+		}
+
+		for (i = ce.length; i--;){
+			var node = ce[i], element = te[i];
+			if (!keepid) node.removeAttribute('id');
+			/*<ltIE9>*/
+			if (node.clearAttributes){
+				node.clearAttributes();
+				node.mergeAttributes(element);
+				node.removeAttribute('uniqueNumber');
+				if (node.options){
+					var no = node.options, eo = element.options;
+					for (var j = no.length; j--;) no[j].selected = eo[j].selected;
+				}
+			}
+			/*</ltIE9>*/
+			var prop = formProps[element.tagName.toLowerCase()];
+			if (prop && element[prop]) node[prop] = element[prop];
+		}
+
+		/*<ltIE9>*/
+		if (Browser.ie){
+			var co = clone.getElementsByTagName('object'), to = this.getElementsByTagName('object');
+			for (i = co.length; i--;) co[i].outerHTML = to[i].outerHTML;
+		}
+		/*</ltIE9>*/
+		return document.id(clone);
+	}
+
+});
+
+[Element, Window, Document].invoke('implement', {
+
+	addListener: function(type, fn){
+		if (type == 'unload'){
+			var old = fn, self = this;
+			fn = function(){
+				self.removeListener('unload', fn);
+				old();
+			};
+		} else {
+			collected[Slick.uidOf(this)] = this;
+		}
+		if (this.addEventListener) this.addEventListener(type, fn, !!arguments[2]);
+		else this.attachEvent('on' + type, fn);
+		return this;
+	},
+
+	removeListener: function(type, fn){
+		if (this.removeEventListener) this.removeEventListener(type, fn, !!arguments[2]);
+		else this.detachEvent('on' + type, fn);
+		return this;
+	},
+
+	retrieve: function(property, dflt){
+		var storage = get(Slick.uidOf(this)), prop = storage[property];
+		if (dflt != null && prop == null) prop = storage[property] = dflt;
+		return prop != null ? prop : null;
+	},
+
+	store: function(property, value){
+		var storage = get(Slick.uidOf(this));
+		storage[property] = value;
+		return this;
+	},
+
+	eliminate: function(property){
+		var storage = get(Slick.uidOf(this));
+		delete storage[property];
+		return this;
+	}
+
+});
+
+/*<ltIE9>*/
+if (window.attachEvent && !window.addEventListener) window.addListener('unload', function(){
+	Object.each(collected, clean);
+	if (window.CollectGarbage) CollectGarbage();
+});
+/*</ltIE9>*/
+
+Element.Properties = {};
+
+
+
+Element.Properties.style = {
+
+	set: function(style){
+		this.style.cssText = style;
+	},
+
+	get: function(){
+		return this.style.cssText;
+	},
+
+	erase: function(){
+		this.style.cssText = '';
+	}
+
+};
+
+Element.Properties.tag = {
+
+	get: function(){
+		return this.tagName.toLowerCase();
+	}
+
+};
+
+Element.Properties.html = {
+
+	set: function(html){
+		if (html == null) html = '';
+		else if (typeOf(html) == 'array') html = html.join('');
+		this.innerHTML = html;
+	},
+
+	erase: function(){
+		this.innerHTML = '';
+	}
+
+};
+
+/*<ltIE9>*/
+// technique by jdbarlett - http://jdbartlett.com/innershiv/
+var div = document.createElement('div');
+div.innerHTML = '<nav></nav>';
+var supportsHTML5Elements = (div.childNodes.length == 1);
+if (!supportsHTML5Elements){
+	var tags = 'abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video'.split(' '),
+		fragment = document.createDocumentFragment(), l = tags.length;
+	while (l--) fragment.createElement(tags[l]);
+}
+div = null;
+/*</ltIE9>*/
+
+/*<IE>*/
+var supportsTableInnerHTML = Function.attempt(function(){
+	var table = document.createElement('table');
+	table.innerHTML = '<tr><td></td></tr>';
+	return true;
+});
+
+/*<ltFF4>*/
+var tr = document.createElement('tr'), html = '<td></td>';
+tr.innerHTML = html;
+var supportsTRInnerHTML = (tr.innerHTML == html);
+tr = null;
+/*</ltFF4>*/
+
+if (!supportsTableInnerHTML || !supportsTRInnerHTML || !supportsHTML5Elements){
+
+	Element.Properties.html.set = (function(set){
+
+		var translations = {
+			table: [1, '<table>', '</table>'],
+			select: [1, '<select>', '</select>'],
+			tbody: [2, '<table><tbody>', '</tbody></table>'],
+			tr: [3, '<table><tbody><tr>', '</tr></tbody></table>']
+		};
+
+		translations.thead = translations.tfoot = translations.tbody;
+
+		return function(html){
+			var wrap = translations[this.get('tag')];
+			if (!wrap && !supportsHTML5Elements) wrap = [0, '', ''];
+			if (!wrap) return set.call(this, html);
+
+			var level = wrap[0], wrapper = document.createElement('div'), target = wrapper;
+			if (!supportsHTML5Elements) fragment.appendChild(wrapper);
+			wrapper.innerHTML = [wrap[1], html, wrap[2]].flatten().join('');
+			while (level--) target = target.firstChild;
+			this.empty().adopt(target.childNodes);
+			if (!supportsHTML5Elements) fragment.removeChild(wrapper);
+			wrapper = null;
+		};
+
+	})(Element.Properties.html.set);
+}
+/*</IE>*/
+
+/*<ltIE9>*/
+var testForm = document.createElement('form');
+testForm.innerHTML = '<select><option>s</option></select>';
+
+if (testForm.firstChild.value != 's') Element.Properties.value = {
+
+	set: function(value){
+		var tag = this.get('tag');
+		if (tag != 'select') return this.setProperty('value', value);
+		var options = this.getElements('option');
+		for (var i = 0; i < options.length; i++){
+			var option = options[i],
+				attr = option.getAttributeNode('value'),
+				optionValue = (attr && attr.specified) ? option.value : option.get('text');
+			if (optionValue == value) return option.selected = true;
+		}
+	},
+
+	get: function(){
+		var option = this, tag = option.get('tag');
+
+		if (tag != 'select' && tag != 'option') return this.getProperty('value');
+
+		if (tag == 'select' && !(option = option.getSelected()[0])) return '';
+
+		var attr = option.getAttributeNode('value');
+		return (attr && attr.specified) ? option.value : option.get('text');
+	}
+
+};
+testForm = null;
+/*</ltIE9>*/
+
+/*<IE>*/
+if (document.createElement('div').getAttributeNode('id')) Element.Properties.id = {
+	set: function(id){
+		this.id = this.getAttributeNode('id').value = id;
+	},
+	get: function(){
+		return this.id || null;
+	},
+	erase: function(){
+		this.id = this.getAttributeNode('id').value = '';
+	}
+};
+/*</IE>*/
+
+})();
+
+
+/*
+---
+
+name: Element.Style
+
+description: Contains methods for interacting with the styles of Elements in a fashionable way.
+
+license: MIT-style license.
+
+requires: Element
+
+provides: Element.Style
+
+...
+*/
+
+(function(){
+
+var html = document.html;
+
+//<ltIE9>
+// Check for oldIE, which does not remove styles when they're set to null
+var el = document.createElement('div');
+el.style.color = 'red';
+el.style.color = null;
+var doesNotRemoveStyles = el.style.color == 'red';
+el = null;
+//</ltIE9>
+
+Element.Properties.styles = {set: function(styles){
+	this.setStyles(styles);
+}};
+
+var hasOpacity = (html.style.opacity != null),
+	hasFilter = (html.style.filter != null),
+	reAlpha = /alpha\(opacity=([\d.]+)\)/i;
+
+var setVisibility = function(element, opacity){
+	element.store('$opacity', opacity);
+	element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
+};
+
+var setOpacity = (hasOpacity ? function(element, opacity){
+	element.style.opacity = opacity;
+} : (hasFilter ? function(element, opacity){
+	var style = element.style;
+	if (!element.currentStyle || !element.currentStyle.hasLayout) style.zoom = 1;
+	if (opacity == null || opacity == 1) opacity = '';
+	else opacity = 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')';
+	var filter = style.filter || element.getComputedStyle('filter') || '';
+	style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
+	if (!style.filter) style.removeAttribute('filter');
+} : setVisibility));
+
+var getOpacity = (hasOpacity ? function(element){
+	var opacity = element.style.opacity || element.getComputedStyle('opacity');
+	return (opacity == '') ? 1 : opacity.toFloat();
+} : (hasFilter ? function(element){
+	var filter = (element.style.filter || element.getComputedStyle('filter')),
+		opacity;
+	if (filter) opacity = filter.match(reAlpha);
+	return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
+} : function(element){
+	var opacity = element.retrieve('$opacity');
+	if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
+	return opacity;
+}));
+
+var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat';
+
+Element.implement({
+
+	getComputedStyle: function(property){
+		if (this.currentStyle) return this.currentStyle[property.camelCase()];
+		var defaultView = Element.getDocument(this).defaultView,
+			computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
+		return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : null;
+	},
+
+	setStyle: function(property, value){
+		if (property == 'opacity'){
+			if (value != null) value = parseFloat(value);
+			setOpacity(this, value);
+			return this;
+		}
+		property = (property == 'float' ? floatName : property).camelCase();
+		if (typeOf(value) != 'string'){
+			var map = (Element.Styles[property] || '@').split(' ');
+			value = Array.from(value).map(function(val, i){
+				if (!map[i]) return '';
+				return (typeOf(val) == 'number') ? map[i].replace('@', Math.round(val)) : val;
+			}).join(' ');
+		} else if (value == String(Number(value))){
+			value = Math.round(value);
+		}
+		this.style[property] = value;
+		//<ltIE9>
+		if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
+			this.style.removeAttribute(property);
+		}
+		//</ltIE9>
+		return this;
+	},
+
+	getStyle: function(property){
+		if (property == 'opacity') return getOpacity(this);
+		property = (property == 'float' ? floatName : property).camelCase();
+		var result = this.style[property];
+		if (!result || property == 'zIndex'){
+			result = [];
+			for (var style in Element.ShortStyles){
+				if (property != style) continue;
+				for (var s in Element.ShortStyles[style]) result.push(this.getStyle(s));
+				return result.join(' ');
+			}
+			result = this.getComputedStyle(property);
+		}
+		if (result){
+			result = String(result);
+			var color = result.match(/rgba?\([\d\s,]+\)/);
+			if (color) result = result.replace(color[0], color[0].rgbToHex());
+		}
+		if (Browser.ie && isNaN(parseFloat(result))){
+			if ((/^(height|width)$/).test(property)){
+				var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
+				values.each(function(value){
+					size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
+				}, this);
+				return this['offset' + property.capitalize()] - size + 'px';
+			}
+			if (Browser.opera && String(result).indexOf('px') != -1) return result;
+			if ((/^border(.+)Width|margin|padding/).test(property)) return '0px';
+		}
+		return result;
+	},
+
+	setStyles: function(styles){
+		for (var style in styles) this.setStyle(style, styles[style]);
+		return this;
+	},
+
+	getStyles: function(){
+		var result = {};
+		Array.flatten(arguments).each(function(key){
+			result[key] = this.getStyle(key);
+		}, this);
+		return result;
+	}
+
+});
+
+Element.Styles = {
+	left: '@px', top: '@px', bottom: '@px', right: '@px',
+	width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px',
+	backgroundColor: 'rgb(@, @, @)', backgroundPosition: '@px @px', color: 'rgb(@, @, @)',
+	fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)',
+	margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)',
+	borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)',
+	zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@'
+};
+
+
+
+
+
+Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
+
+['Top', 'Right', 'Bottom', 'Left'].each(function(direction){
+	var Short = Element.ShortStyles;
+	var All = Element.Styles;
+	['margin', 'padding'].each(function(style){
+		var sd = style + direction;
+		Short[style][sd] = All[sd] = '@px';
+	});
+	var bd = 'border' + direction;
+	Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)';
+	var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color';
+	Short[bd] = {};
+	Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px';
+	Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@';
+	Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)';
+});
+
+})();
+
+
+/*
+---
+
+name: Element.Event
+
+description: Contains Element methods for dealing with events. This file also includes mouseenter and mouseleave custom Element Events, if necessary.
+
+license: MIT-style license.
+
+requires: [Element, Event]
+
+provides: Element.Event
+
+...
+*/
+
+(function(){
+
+Element.Properties.events = {set: function(events){
+	this.addEvents(events);
+}};
+
+[Element, Window, Document].invoke('implement', {
+
+	addEvent: function(type, fn){
+		var events = this.retrieve('events', {});
+		if (!events[type]) events[type] = {keys: [], values: []};
+		if (events[type].keys.contains(fn)) return this;
+		events[type].keys.push(fn);
+		var realType = type,
+			custom = Element.Events[type],
+			condition = fn,
+			self = this;
+		if (custom){
+			if (custom.onAdd) custom.onAdd.call(this, fn, type);
+			if (custom.condition){
+				condition = function(event){
+					if (custom.condition.call(this, event, type)) return fn.call(this, event);
+					return true;
+				};
+			}
+			if (custom.base) realType = Function.from(custom.base).call(this, type);
+		}
+		var defn = function(){
+			return fn.call(self);
+		};
+		var nativeEvent = Element.NativeEvents[realType];
+		if (nativeEvent){
+			if (nativeEvent == 2){
+				defn = function(event){
+					event = new DOMEvent(event, self.getWindow());
+					if (condition.call(self, event) === false) event.stop();
+				};
+			}
+			this.addListener(realType, defn, arguments[2]);
+		}
+		events[type].values.push(defn);
+		return this;
+	},
+
+	removeEvent: function(type, fn){
+		var events = this.retrieve('events');
+		if (!events || !events[type]) return this;
+		var list = events[type];
+		var index = list.keys.indexOf(fn);
+		if (index == -1) return this;
+		var value = list.values[index];
+		delete list.keys[index];
+		delete list.values[index];
+		var custom = Element.Events[type];
+		if (custom){
+			if (custom.onRemove) custom.onRemove.call(this, fn, type);
+			if (custom.base) type = Function.from(custom.base).call(this, type);
+		}
+		return (Element.NativeEvents[type]) ? this.removeListener(type, value, arguments[2]) : this;
+	},
+
+	addEvents: function(events){
+		for (var event in events) this.addEvent(event, events[event]);
+		return this;
+	},
+
+	removeEvents: function(events){
+		var type;
+		if (typeOf(events) == 'object'){
+			for (type in events) this.removeEvent(type, events[type]);
+			return this;
+		}
+		var attached = this.retrieve('events');
+		if (!attached) return this;
+		if (!events){
+			for (type in attached) this.removeEvents(type);
+			this.eliminate('events');
+		} else if (attached[events]){
+			attached[events].keys.each(function(fn){
+				this.removeEvent(events, fn);
+			}, this);
+			delete attached[events];
+		}
+		return this;
+	},
+
+	fireEvent: function(type, args, delay){
+		var events = this.retrieve('events');
+		if (!events || !events[type]) return this;
+		args = Array.from(args);
+
+		events[type].keys.each(function(fn){
+			if (delay) fn.delay(delay, this, args);
+			else fn.apply(this, args);
+		}, this);
+		return this;
+	},
+
+	cloneEvents: function(from, type){
+		from = document.id(from);
+		var events = from.retrieve('events');
+		if (!events) return this;
+		if (!type){
+			for (var eventType in events) this.cloneEvents(from, eventType);
+		} else if (events[type]){
+			events[type].keys.each(function(fn){
+				this.addEvent(type, fn);
+			}, this);
+		}
+		return this;
+	}
+
+});
+
+Element.NativeEvents = {
+	click: 2, dblclick: 2, mouseup: 2, mousedown: 2, contextmenu: 2, //mouse buttons
+	mousewheel: 2, DOMMouseScroll: 2, //mouse wheel
+	mouseover: 2, mouseout: 2, mousemove: 2, selectstart: 2, selectend: 2, //mouse movement
+	keydown: 2, keypress: 2, keyup: 2, //keyboard
+	orientationchange: 2, // mobile
+	touchstart: 2, touchmove: 2, touchend: 2, touchcancel: 2, // touch
+	gesturestart: 2, gesturechange: 2, gestureend: 2, // gesture
+	focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, paste: 2, input: 2, //form elements
+	load: 2, unload: 1, beforeunload: 2, resize: 1, move: 1, DOMContentLoaded: 1, readystatechange: 1, //window
+	error: 1, abort: 1, scroll: 1 //misc
+};
+
+Element.Events = {mousewheel: {
+	base: (Browser.firefox) ? 'DOMMouseScroll' : 'mousewheel'
+}};
+
+if ('onmouseenter' in document.documentElement){
+	Element.NativeEvents.mouseenter = Element.NativeEvents.mouseleave = 2;
+} else {
+	var check = function(event){
+		var related = event.relatedTarget;
+		if (related == null) return true;
+		if (!related) return false;
+		return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
+	};
+
+	Element.Events.mouseenter = {
+		base: 'mouseover',
+		condition: check
+	};
+
+	Element.Events.mouseleave = {
+		base: 'mouseout',
+		condition: check
+	};
+}
+
+/*<ltIE9>*/
+if (!window.addEventListener){
+	Element.NativeEvents.propertychange = 2;
+	Element.Events.change = {
+		base: function(){
+			var type = this.type;
+			return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change'
+		},
+		condition: function(event){
+			return this.type != 'radio' || (event.event.propertyName == 'checked' && this.checked);
+		}
+	}
+}
+/*</ltIE9>*/
+
+
+
+})();
+
+
+/*
+---
+
+name: Element.Delegation
+
+description: Extends the Element native object to include the delegate method for more efficient event management.
+
+license: MIT-style license.
+
+requires: [Element.Event]
+
+provides: [Element.Delegation]
+
+...
+*/
+
+(function(){
+
+var eventListenerSupport = !!window.addEventListener;
+
+Element.NativeEvents.focusin = Element.NativeEvents.focusout = 2;
+
+var bubbleUp = function(self, match, fn, event, target){
+	while (target && target != self){
+		if (match(target, event)) return fn.call(target, event, target);
+		target = document.id(target.parentNode);
+	}
+};
+
+var map = {
+	mouseenter: {
+		base: 'mouseover'
+	},
+	mouseleave: {
+		base: 'mouseout'
+	},
+	focus: {
+		base: 'focus' + (eventListenerSupport ? '' : 'in'),
+		capture: true
+	},
+	blur: {
+		base: eventListenerSupport ? 'blur' : 'focusout',
+		capture: true
+	}
+};
+
+/*<ltIE9>*/
+var _key = '$delegation:';
+var formObserver = function(type){
+
+	return {
+
+		base: 'focusin',
+
+		remove: function(self, uid){
+			var list = self.retrieve(_key + type + 'listeners', {})[uid];
+			if (list && list.forms) for (var i = list.forms.length; i--;){
+				list.forms[i].removeEvent(type, list.fns[i]);
+			}
+		},
+
+		listen: function(self, match, fn, event, target, uid){
+			var form = (target.get('tag') == 'form') ? target : event.target.getParent('form');
+			if (!form) return;
+
+			var listeners = self.retrieve(_key + type + 'listeners', {}),
+				listener = listeners[uid] || {forms: [], fns: []},
+				forms = listener.forms, fns = listener.fns;
+
+			if (forms.indexOf(form) != -1) return;
+			forms.push(form);
+
+			var _fn = function(event){
+				bubbleUp(self, match, fn, event, target);
+			};
+			form.addEvent(type, _fn);
+			fns.push(_fn);
+
+			listeners[uid] = listener;
+			self.store(_key + type + 'listeners', listeners);
+		}
+	};
+};
+
+var inputObserver = function(type){
+	return {
+		base: 'focusin',
+		listen: function(self, match, fn, event, target){
+			var events = {blur: function(){
+				this.removeEvents(events);
+			}};
+			events[type] = function(event){
+				bubbleUp(self, match, fn, event, target);
+			};
+			event.target.addEvents(events);
+		}
+	};
+};
+
+if (!eventListenerSupport) Object.append(map, {
+	submit: formObserver('submit'),
+	reset: formObserver('reset'),
+	change: inputObserver('change'),
+	select: inputObserver('select')
+});
+/*</ltIE9>*/
+
+var proto = Element.prototype,
+	addEvent = proto.addEvent,
+	removeEvent = proto.removeEvent;
+
+var relay = function(old, method){
+	return function(type, fn, useCapture){
+		if (type.indexOf(':relay') == -1) return old.call(this, type, fn, useCapture);
+		var parsed = Slick.parse(type).expressions[0][0];
+		if (parsed.pseudos[0].key != 'relay') return old.call(this, type, fn, useCapture);
+		var newType = parsed.tag;
+		parsed.pseudos.slice(1).each(function(pseudo){
+			newType += ':' + pseudo.key + (pseudo.value ? '(' + pseudo.value + ')' : '');
+		});
+		old.call(this, type, fn);
+		return method.call(this, newType, parsed.pseudos[0].value, fn);
+	};
+};
+
+var delegation = {
+
+	addEvent: function(type, match, fn){
+		var storage = this.retrieve('$delegates', {}), stored = storage[type];
+		if (stored) for (var _uid in stored){
+			if (stored[_uid].fn == fn && stored[_uid].match == match) return this;
+		}
+
+		var _type = type, _match = match, _fn = fn, _map = map[type] || {};
+		type = _map.base || _type;
+
+		match = function(target){
+			return Slick.match(target, _match);
+		};
+
+		var elementEvent = Element.Events[_type];
+		if (elementEvent && elementEvent.condition){
+			var __match = match, condition = elementEvent.condition;
+			match = function(target, event){
+				return __match(target, event) && condition.call(target, event, type);
+			};
+		}
+
+		var self = this, uid = String.uniqueID();
+		var delegator = _map.listen ? function(event, target){
+			if (!target && event && event.target) target = event.target;
+			if (target) _map.listen(self, match, fn, event, target, uid);
+		} : function(event, target){
+			if (!target && event && event.target) target = event.target;
+			if (target) bubbleUp(self, match, fn, event, target);
+		};
+
+		if (!stored) stored = {};
+		stored[uid] = {
+			match: _match,
+			fn: _fn,
+			delegator: delegator
+		};
+		storage[_type] = stored;
+		return addEvent.call(this, type, delegator, _map.capture);
+	},
+
+	removeEvent: function(type, match, fn, _uid){
+		var storage = this.retrieve('$delegates', {}), stored = storage[type];
+		if (!stored) return this;
+
+		if (_uid){
+			var _type = type, delegator = stored[_uid].delegator, _map = map[type] || {};
+			type = _map.base || _type;
+			if (_map.remove) _map.remove(this, _uid);
+			delete stored[_uid];
+			storage[_type] = stored;
+			return removeEvent.call(this, type, delegator);
+		}
+
+		var __uid, s;
+		if (fn) for (__uid in stored){
+			s = stored[__uid];
+			if (s.match == match && s.fn == fn) return delegation.removeEvent.call(this, type, match, fn, __uid);
+		} else for (__uid in stored){
+			s = stored[__uid];
+			if (s.match == match) delegation.removeEvent.call(this, type, match, s.fn, __uid);
+		}
+		return this;
+	}
+
+};
+
+[Element, Window, Document].invoke('implement', {
+	addEvent: relay(addEvent, delegation.addEvent),
+	removeEvent: relay(removeEvent, delegation.removeEvent)
+});
+
+})();
+
+
+/*
+---
+
+name: Element.Dimensions
+
+description: Contains methods to work with size, scroll, or positioning of Elements and the window object.
+
+license: MIT-style license.
+
+credits:
+  - Element positioning based on the [qooxdoo](http://qooxdoo.org/) code and smart browser fixes, [LGPL License](http://www.gnu.org/licenses/lgpl.html).
+  - Viewport dimensions based on [YUI](http://developer.yahoo.com/yui/) code, [BSD License](http://developer.yahoo.com/yui/license.html).
+
+requires: [Element, Element.Style]
+
+provides: [Element.Dimensions]
+
+...
+*/
+
+(function(){
+
+var element = document.createElement('div'),
+	child = document.createElement('div');
+element.style.height = '0';
+element.appendChild(child);
+var brokenOffsetParent = (child.offsetParent === element);
+element = child = null;
+
+var isOffset = function(el){
+	return styleString(el, 'position') != 'static' || isBody(el);
+};
+
+var isOffsetStatic = function(el){
+	return isOffset(el) || (/^(?:table|td|th)$/i).test(el.tagName);
+};
+
+Element.implement({
+
+	scrollTo: function(x, y){
+		if (isBody(this)){
+			this.getWindow().scrollTo(x, y);
+		} else {
+			this.scrollLeft = x;
+			this.scrollTop = y;
+		}
+		return this;
+	},
+
+	getSize: function(){
+		if (isBody(this)) return this.getWindow().getSize();
+		return {x: this.offsetWidth, y: this.offsetHeight};
+	},
+
+	getScrollSize: function(){
+		if (isBody(this)) return this.getWindow().getScrollSize();
+		return {x: this.scrollWidth, y: this.scrollHeight};
+	},
+
+	getScroll: function(){
+		if (isBody(this)) return this.getWindow().getScroll();
+		return {x: this.scrollLeft, y: this.scrollTop};
+	},
+
+	getScrolls: function(){
+		var element = this.parentNode, position = {x: 0, y: 0};
+		while (element && !isBody(element)){
+			position.x += element.scrollLeft;
+			position.y += element.scrollTop;
+			element = element.parentNode;
+		}
+		return position;
+	},
+
+	getOffsetParent: brokenOffsetParent ? function(){
+		var element = this;
+		if (isBody(element) || styleString(element, 'position') == 'fixed') return null;
+
+		var isOffsetCheck = (styleString(element, 'position') == 'static') ? isOffsetStatic : isOffset;
+		while ((element = element.parentNode)){
+			if (isOffsetCheck(element)) return element;
+		}
+		return null;
+	} : function(){
+		var element = this;
+		if (isBody(element) || styleString(element, 'position') == 'fixed') return null;
+
+		try {
+			return element.offsetParent;
+		} catch(e) {}
+		return null;
+	},
+
+	getOffsets: function(){
+		if (this.getBoundingClientRect && !Browser.Platform.ios){
+			var bound = this.getBoundingClientRect(),
+				html = document.id(this.getDocument().documentElement),
+				htmlScroll = html.getScroll(),
+				elemScrolls = this.getScrolls(),
+				isFixed = (styleString(this, 'position') == 'fixed');
+
+			return {
+				x: bound.left.toInt() + elemScrolls.x + ((isFixed) ? 0 : htmlScroll.x) - html.clientLeft,
+				y: bound.top.toInt()  + elemScrolls.y + ((isFixed) ? 0 : htmlScroll.y) - html.clientTop
+			};
+		}
+
+		var element = this, position = {x: 0, y: 0};
+		if (isBody(this)) return position;
+
+		while (element && !isBody(element)){
+			position.x += element.offsetLeft;
+			position.y += element.offsetTop;
+
+			if (Browser.firefox){
+				if (!borderBox(element)){
+					position.x += leftBorder(element);
+					position.y += topBorder(element);
+				}
+				var parent = element.parentNode;
+				if (parent && styleString(parent, 'overflow') != 'visible'){
+					position.x += leftBorder(parent);
+					position.y += topBorder(parent);
+				}
+			} else if (element != this && Browser.safari){
+				position.x += leftBorder(element);
+				position.y += topBorder(element);
+			}
+
+			element = element.offsetParent;
+		}
+		if (Browser.firefox && !borderBox(this)){
+			position.x -= leftBorder(this);
+			position.y -= topBorder(this);
+		}
+		return position;
+	},
+
+	getPosition: function(relative){
+		var offset = this.getOffsets(),
+			scroll = this.getScrolls();
+		var position = {
+			x: offset.x - scroll.x,
+			y: offset.y - scroll.y
+		};
+
+		if (relative && (relative = document.id(relative))){
+			var relativePosition = relative.getPosition();
+			return {x: position.x - relativePosition.x - leftBorder(relative), y: position.y - relativePosition.y - topBorder(relative)};
+		}
+		return position;
+	},
+
+	getCoordinates: function(element){
+		if (isBody(this)) return this.getWindow().getCoordinates();
+		var position = this.getPosition(element),
+			size = this.getSize();
+		var obj = {
+			left: position.x,
+			top: position.y,
+			width: size.x,
+			height: size.y
+		};
+		obj.right = obj.left + obj.width;
+		obj.bottom = obj.top + obj.height;
+		return obj;
+	},
+
+	computePosition: function(obj){
+		return {
+			left: obj.x - styleNumber(this, 'margin-left'),
+			top: obj.y - styleNumber(this, 'margin-top')
+		};
+	},
+
+	setPosition: function(obj){
+		return this.setStyles(this.computePosition(obj));
+	}
+
+});
+
+
+[Document, Window].invoke('implement', {
+
+	getSize: function(){
+		var doc = getCompatElement(this);
+		return {x: doc.clientWidth, y: doc.clientHeight};
+	},
+
+	getScroll: function(){
+		var win = this.getWindow(), doc = getCompatElement(this);
+		return {x: win.pageXOffset || doc.scrollLeft, y: win.pageYOffset || doc.scrollTop};
+	},
+
+	getScrollSize: function(){
+		var doc = getCompatElement(this),
+			min = this.getSize(),
+			body = this.getDocument().body;
+
+		return {x: Math.max(doc.scrollWidth, body.scrollWidth, min.x), y: Math.max(doc.scrollHeight, body.scrollHeight, min.y)};
+	},
+
+	getPosition: function(){
+		return {x: 0, y: 0};
+	},
+
+	getCoordinates: function(){
+		var size = this.getSize();
+		return {top: 0, left: 0, bottom: size.y, right: size.x, height: size.y, width: size.x};
+	}
+
+});
+
+// private methods
+
+var styleString = Element.getComputedStyle;
+
+function styleNumber(element, style){
+	return styleString(element, style).toInt() || 0;
+}
+
+function borderBox(element){
+	return styleString(element, '-moz-box-sizing') == 'border-box';
+}
+
+function topBorder(element){
+	return styleNumber(element, 'border-top-width');
+}
+
+function leftBorder(element){
+	return styleNumber(element, 'border-left-width');
+}
+
+function isBody(element){
+	return (/^(?:body|html)$/i).test(element.tagName);
+}
+
+function getCompatElement(element){
+	var doc = element.getDocument();
+	return (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
+}
+
+})();
+
+//aliases
+Element.alias({position: 'setPosition'}); //compatability
+
+[Window, Document, Element].invoke('implement', {
+
+	getHeight: function(){
+		return this.getSize().y;
+	},
+
+	getWidth: function(){
+		return this.getSize().x;
+	},
+
+	getScrollTop: function(){
+		return this.getScroll().y;
+	},
+
+	getScrollLeft: function(){
+		return this.getScroll().x;
+	},
+
+	getScrollHeight: function(){
+		return this.getScrollSize().y;
+	},
+
+	getScrollWidth: function(){
+		return this.getScrollSize().x;
+	},
+
+	getTop: function(){
+		return this.getPosition().y;
+	},
+
+	getLeft: function(){
+		return this.getPosition().x;
+	}
+
+});
+
+
+/*
+---
+
+name: Fx
+
+description: Contains the basic animation logic to be extended by all other Fx Classes.
+
+license: MIT-style license.
+
+requires: [Chain, Events, Options]
+
+provides: Fx
+
+...
+*/
+
+(function(){
+
+var Fx = this.Fx = new Class({
+
+	Implements: [Chain, Events, Options],
+
+	options: {
+		/*
+		onStart: nil,
+		onCancel: nil,
+		onComplete: nil,
+		*/
+		fps: 60,
+		unit: false,
+		duration: 500,
+		frames: null,
+		frameSkip: true,
+		link: 'ignore'
+	},
+
+	initialize: function(options){
+		this.subject = this.subject || this;
+		this.setOptions(options);
+	},
+
+	getTransition: function(){
+		return function(p){
+			return -(Math.cos(Math.PI * p) - 1) / 2;
+		};
+	},
+
+	step: function(now){
+		if (this.options.frameSkip){
+			var diff = (this.time != null) ? (now - this.time) : 0, frames = diff / this.frameInterval;
+			this.time = now;
+			this.frame += frames;
+		} else {
+			this.frame++;
+		}
+
+		if (this.frame < this.frames){
+			var delta = this.transition(this.frame / this.frames);
+			this.set(this.compute(this.from, this.to, delta));
+		} else {
+			this.frame = this.frames;
+			this.set(this.compute(this.from, this.to, 1));
+			this.stop();
+		}
+	},
+
+	set: function(now){
+		return now;
+	},
+
+	compute: function(from, to, delta){
+		return Fx.compute(from, to, delta);
+	},
+
+	check: function(){
+		if (!this.isRunning()) return true;
+		switch (this.options.link){
+			case 'cancel': this.cancel(); return true;
+			case 'chain': this.chain(this.caller.pass(arguments, this)); return false;
+		}
+		return false;
+	},
+
+	start: function(from, to){
+		if (!this.check(from, to)) return this;
+		this.from = from;
+		this.to = to;
+		this.frame = (this.options.frameSkip) ? 0 : -1;
+		this.time = null;
+		this.transition = this.getTransition();
+		var frames = this.options.frames, fps = this.options.fps, duration = this.options.duration;
+		this.duration = Fx.Durations[duration] || duration.toInt();
+		this.frameInterval = 1000 / fps;
+		this.frames = frames || Math.round(this.duration / this.frameInterval);
+		this.fireEvent('start', this.subject);
+		pushInstance.call(this, fps);
+		return this;
+	},
+
+	stop: function(){
+		if (this.isRunning()){
+			this.time = null;
+			pullInstance.call(this, this.options.fps);
+			if (this.frames == this.frame){
+				this.fireEvent('complete', this.subject);
+				if (!this.callChain()) this.fireEvent('chainComplete', this.subject);
+			} else {
+				this.fireEvent('stop', this.subject);
+			}
+		}
+		return this;
+	},
+
+	cancel: function(){
+		if (this.isRunning()){
+			this.time = null;
+			pullInstance.call(this, this.options.fps);
+			this.frame = this.frames;
+			this.fireEvent('cancel', this.subject).clearChain();
+		}
+		return this;
+	},
+
+	pause: function(){
+		if (this.isRunning()){
+			this.time = null;
+			pullInstance.call(this, this.options.fps);
+		}
+		return this;
+	},
+
+	resume: function(){
+		if ((this.frame < this.frames) && !this.isRunning()) pushInstance.call(this, this.options.fps);
+		return this;
+	},
+
+	isRunning: function(){
+		var list = instances[this.options.fps];
+		return list && list.contains(this);
+	}
+
+});
+
+Fx.compute = function(from, to, delta){
+	return (to - from) * delta + from;
+};
+
+Fx.Durations = {'short': 250, 'normal': 500, 'long': 1000};
+
+// global timers
+
+var instances = {}, timers = {};
+
+var loop = function(){
+	var now = Date.now();
+	for (var i = this.length; i--;){
+		var instance = this[i];
+		if (instance) instance.step(now);
+	}
+};
+
+var pushInstance = function(fps){
+	var list = instances[fps] || (instances[fps] = []);
+	list.push(this);
+	if (!timers[fps]) timers[fps] = loop.periodical(Math.round(1000 / fps), list);
+};
+
+var pullInstance = function(fps){
+	var list = instances[fps];
+	if (list){
+		list.erase(this);
+		if (!list.length && timers[fps]){
+			delete instances[fps];
+			timers[fps] = clearInterval(timers[fps]);
+		}
+	}
+};
+
+})();
+
+
+/*
+---
+
+name: Fx.CSS
+
+description: Contains the CSS animation logic. Used by Fx.Tween, Fx.Morph, Fx.Elements.
+
+license: MIT-style license.
+
+requires: [Fx, Element.Style]
+
+provides: Fx.CSS
+
+...
+*/
+
+Fx.CSS = new Class({
+
+	Extends: Fx,
+
+	//prepares the base from/to object
+
+	prepare: function(element, property, values){
+		values = Array.from(values);
+		var from = values[0], to = values[1];
+		if (to == null){
+			to = from;
+			from = element.getStyle(property);
+			var unit = this.options.unit;
+			// adapted from: https://github.com/ryanmorr/fx/blob/master/fx.js#L299
+			if (unit && from.slice(-unit.length) != unit && parseFloat(from) != 0){
+				element.setStyle(property, to + unit);
+				var value = element.getComputedStyle(property);
+				// IE and Opera support pixelLeft or pixelWidth
+				if (!(/px$/.test(value))){
+					value = element.style[('pixel-' + property).camelCase()];
+					if (value == null){
+						// adapted from Dean Edwards' http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+						var left = element.style.left;
+						element.style.left = to + unit;
+						value = element.style.pixelLeft;
+						element.style.left = left;
+					}
+				}
+				from = (to || 1) / (parseFloat(value) || 1) * (parseFloat(from) || 0);
+				element.setStyle(property, from + unit);
+			}
+		}
+		return {from: this.parse(from), to: this.parse(to)};
+	},
+
+	//parses a value into an array
+
+	parse: function(value){
+		value = Function.from(value)();
+		value = (typeof value == 'string') ? value.split(' ') : Array.from(value);
+		return value.map(function(val){
+			val = String(val);
+			var found = false;
+			Object.each(Fx.CSS.Parsers, function(parser, key){
+				if (found) return;
+				var parsed = parser.parse(val);
+				if (parsed || parsed === 0) found = {value: parsed, parser: parser};
+			});
+			found = found || {value: val, parser: Fx.CSS.Parsers.String};
+			return found;
+		});
+	},
+
+	//computes by a from and to prepared objects, using their parsers.
+
+	compute: function(from, to, delta){
+		var computed = [];
+		(Math.min(from.length, to.length)).times(function(i){
+			computed.push({value: from[i].parser.compute(from[i].value, to[i].value, delta), parser: from[i].parser});
+		});
+		computed.$family = Function.from('fx:css:value');
+		return computed;
+	},
+
+	//serves the value as settable
+
+	serve: function(value, unit){
+		if (typeOf(value) != 'fx:css:value') value = this.parse(value);
+		var returned = [];
+		value.each(function(bit){
+			returned = returned.concat(bit.parser.serve(bit.value, unit));
+		});
+		return returned;
+	},
+
+	//renders the change to an element
+
+	render: function(element, property, value, unit){
+		element.setStyle(property, this.serve(value, unit));
+	},
+
+	//searches inside the page css to find the values for a selector
+
+	search: function(selector){
+		if (Fx.CSS.Cache[selector]) return Fx.CSS.Cache[selector];
+		var to = {}, selectorTest = new RegExp('^' + selector.escapeRegExp() + '$');
+		Array.each(document.styleSheets, function(sheet, j){
+			var href = sheet.href;
+			if (href && href.contains('://') && !href.contains(document.domain)) return;
+			var rules = sheet.rules || sheet.cssRules;
+			Array.each(rules, function(rule, i){
+				if (!rule.style) return;
+				var selectorText = (rule.selectorText) ? rule.selectorText.replace(/^\w+/, function(m){
+					return m.toLowerCase();
+				}) : null;
+				if (!selectorText || !selectorTest.test(selectorText)) return;
+				Object.each(Element.Styles, function(value, style){
+					if (!rule.style[style] || Element.ShortStyles[style]) return;
+					value = String(rule.style[style]);
+					to[style] = ((/^rgb/).test(value)) ? value.rgbToHex() : value;
+				});
+			});
+		});
+		return Fx.CSS.Cache[selector] = to;
+	}
+
+});
+
+Fx.CSS.Cache = {};
+
+Fx.CSS.Parsers = {
+
+	Color: {
+		parse: function(value){
+			if (value.match(/^#[0-9a-f]{3,6}$/i)) return value.hexToRgb(true);
+			return ((value = value.match(/(\d+),\s*(\d+),\s*(\d+)/))) ? [value[1], value[2], value[3]] : false;
+		},
+		compute: function(from, to, delta){
+			return from.map(function(value, i){
+				return Math.round(Fx.compute(from[i], to[i], delta));
+			});
+		},
+		serve: function(value){
+			return value.map(Number);
+		}
+	},
+
+	Number: {
+		parse: parseFloat,
+		compute: Fx.compute,
+		serve: function(value, unit){
+			return (unit) ? value + unit : value;
+		}
+	},
+
+	String: {
+		parse: Function.from(false),
+		compute: function(zero, one){
+			return one;
+		},
+		serve: function(zero){
+			return zero;
+		}
+	}
+
+};
+
+
+
+
+/*
+---
+
+name: Fx.Tween
+
+description: Formerly Fx.Style, effect to transition any CSS property for an element.
+
+license: MIT-style license.
+
+requires: Fx.CSS
+
+provides: [Fx.Tween, Element.fade, Element.highlight]
+
+...
+*/
+
+Fx.Tween = new Class({
+
+	Extends: Fx.CSS,
+
+	initialize: function(element, options){
+		this.element = this.subject = document.id(element);
+		this.parent(options);
+	},
+
+	set: function(property, now){
+		if (arguments.length == 1){
+			now = property;
+			property = this.property || this.options.property;
+		}
+		this.render(this.element, property, now, this.options.unit);
+		return this;
+	},
+
+	start: function(property, from, to){
+		if (!this.check(property, from, to)) return this;
+		var args = Array.flatten(arguments);
+		this.property = this.options.property || args.shift();
+		var parsed = this.prepare(this.element, this.property, args);
+		return this.parent(parsed.from, parsed.to);
+	}
+
+});
+
+Element.Properties.tween = {
+
+	set: function(options){
+		this.get('tween').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var tween = this.retrieve('tween');
+		if (!tween){
+			tween = new Fx.Tween(this, {link: 'cancel'});
+			this.store('tween', tween);
+		}
+		return tween;
+	}
+
+};
+
+Element.implement({
+
+	tween: function(property, from, to){
+		this.get('tween').start(property, from, to);
+		return this;
+	},
+
+	fade: function(how){
+		var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
+		if (args[1] == null) args[1] = 'toggle';
+		switch (args[1]){
+			case 'in': method = 'start'; args[1] = 1; break;
+			case 'out': method = 'start'; args[1] = 0; break;
+			case 'show': method = 'set'; args[1] = 1; break;
+			case 'hide': method = 'set'; args[1] = 0; break;
+			case 'toggle':
+				var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
+				method = 'start';
+				args[1] = flag ? 0 : 1;
+				this.store('fade:flag', !flag);
+				toggle = true;
+			break;
+			default: method = 'start';
+		}
+		if (!toggle) this.eliminate('fade:flag');
+		fade[method].apply(fade, args);
+		var to = args[args.length - 1];
+		if (method == 'set' || to != 0) this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
+		else fade.chain(function(){
+			this.element.setStyle('visibility', 'hidden');
+			this.callChain();
+		});
+		return this;
+	},
+
+	highlight: function(start, end){
+		if (!end){
+			end = this.retrieve('highlight:original', this.getStyle('background-color'));
+			end = (end == 'transparent') ? '#fff' : end;
+		}
+		var tween = this.get('tween');
+		tween.start('background-color', start || '#ffff88', end).chain(function(){
+			this.setStyle('background-color', this.retrieve('highlight:original'));
+			tween.callChain();
+		}.bind(this));
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+name: Fx.Morph
+
+description: Formerly Fx.Styles, effect to transition any number of CSS properties for an element using an object of rules, or CSS based selector rules.
+
+license: MIT-style license.
+
+requires: Fx.CSS
+
+provides: Fx.Morph
+
+...
+*/
+
+Fx.Morph = new Class({
+
+	Extends: Fx.CSS,
+
+	initialize: function(element, options){
+		this.element = this.subject = document.id(element);
+		this.parent(options);
+	},
+
+	set: function(now){
+		if (typeof now == 'string') now = this.search(now);
+		for (var p in now) this.render(this.element, p, now[p], this.options.unit);
+		return this;
+	},
+
+	compute: function(from, to, delta){
+		var now = {};
+		for (var p in from) now[p] = this.parent(from[p], to[p], delta);
+		return now;
+	},
+
+	start: function(properties){
+		if (!this.check(properties)) return this;
+		if (typeof properties == 'string') properties = this.search(properties);
+		var from = {}, to = {};
+		for (var p in properties){
+			var parsed = this.prepare(this.element, p, properties[p]);
+			from[p] = parsed.from;
+			to[p] = parsed.to;
+		}
+		return this.parent(from, to);
+	}
+
+});
+
+Element.Properties.morph = {
+
+	set: function(options){
+		this.get('morph').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var morph = this.retrieve('morph');
+		if (!morph){
+			morph = new Fx.Morph(this, {link: 'cancel'});
+			this.store('morph', morph);
+		}
+		return morph;
+	}
+
+};
+
+Element.implement({
+
+	morph: function(props){
+		this.get('morph').start(props);
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+name: Fx.Transitions
+
+description: Contains a set of advanced transitions to be used with any of the Fx Classes.
+
+license: MIT-style license.
+
+credits:
+  - Easing Equations by Robert Penner, <http://www.robertpenner.com/easing/>, modified and optimized to be used with MooTools.
+
+requires: Fx
+
+provides: Fx.Transitions
+
+...
+*/
+
+Fx.implement({
+
+	getTransition: function(){
+		var trans = this.options.transition || Fx.Transitions.Sine.easeInOut;
+		if (typeof trans == 'string'){
+			var data = trans.split(':');
+			trans = Fx.Transitions;
+			trans = trans[data[0]] || trans[data[0].capitalize()];
+			if (data[1]) trans = trans['ease' + data[1].capitalize() + (data[2] ? data[2].capitalize() : '')];
+		}
+		return trans;
+	}
+
+});
+
+Fx.Transition = function(transition, params){
+	params = Array.from(params);
+	var easeIn = function(pos){
+		return transition(pos, params);
+	};
+	return Object.append(easeIn, {
+		easeIn: easeIn,
+		easeOut: function(pos){
+			return 1 - transition(1 - pos, params);
+		},
+		easeInOut: function(pos){
+			return (pos <= 0.5 ? transition(2 * pos, params) : (2 - transition(2 * (1 - pos), params))) / 2;
+		}
+	});
+};
+
+Fx.Transitions = {
+
+	linear: function(zero){
+		return zero;
+	}
+
+};
+
+
+
+Fx.Transitions.extend = function(transitions){
+	for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
+};
+
+Fx.Transitions.extend({
+
+	Pow: function(p, x){
+		return Math.pow(p, x && x[0] || 6);
+	},
+
+	Expo: function(p){
+		return Math.pow(2, 8 * (p - 1));
+	},
+
+	Circ: function(p){
+		return 1 - Math.sin(Math.acos(p));
+	},
+
+	Sine: function(p){
+		return 1 - Math.cos(p * Math.PI / 2);
+	},
+
+	Back: function(p, x){
+		x = x && x[0] || 1.618;
+		return Math.pow(p, 2) * ((x + 1) * p - x);
+	},
+
+	Bounce: function(p){
+		var value;
+		for (var a = 0, b = 1; 1; a += b, b /= 2){
+			if (p >= (7 - 4 * a) / 11){
+				value = b * b - Math.pow((11 - 6 * a - 11 * p) / 4, 2);
+				break;
+			}
+		}
+		return value;
+	},
+
+	Elastic: function(p, x){
+		return Math.pow(2, 10 * --p) * Math.cos(20 * p * Math.PI * (x && x[0] || 1) / 3);
+	}
+
+});
+
+['Quad', 'Cubic', 'Quart', 'Quint'].each(function(transition, i){
+	Fx.Transitions[transition] = new Fx.Transition(function(p){
+		return Math.pow(p, i + 2);
+	});
+});
+
+
+/*
+---
+
+name: Request
+
+description: Powerful all purpose Request Class. Uses XMLHTTPRequest.
+
+license: MIT-style license.
+
+requires: [Object, Element, Chain, Events, Options, Browser]
+
+provides: Request
+
+...
+*/
+
+(function(){
+
+var empty = function(){},
+	progressSupport = ('onprogress' in new Browser.Request);
+
+var Request = this.Request = new Class({
+
+	Implements: [Chain, Events, Options],
+
+	options: {/*
+		onRequest: function(){},
+		onLoadstart: function(event, xhr){},
+		onProgress: function(event, xhr){},
+		onComplete: function(){},
+		onCancel: function(){},
+		onSuccess: function(responseText, responseXML){},
+		onFailure: function(xhr){},
+		onException: function(headerName, value){},
+		onTimeout: function(){},
+		user: '',
+		password: '',*/
+		url: '',
+		data: '',
+		headers: {
+			'X-Requested-With': 'XMLHttpRequest',
+			'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+		},
+		async: true,
+		format: false,
+		method: 'post',
+		link: 'ignore',
+		isSuccess: null,
+		emulation: true,
+		urlEncoded: true,
+		encoding: 'utf-8',
+		evalScripts: false,
+		evalResponse: false,
+		timeout: 0,
+		noCache: false
+	},
+
+	initialize: function(options){
+		this.xhr = new Browser.Request();
+		this.setOptions(options);
+		this.headers = this.options.headers;
+	},
+
+	onStateChange: function(){
+		var xhr = this.xhr;
+		if (xhr.readyState != 4 || !this.running) return;
+		this.running = false;
+		this.status = 0;
+		Function.attempt(function(){
+			var status = xhr.status;
+			this.status = (status == 1223) ? 204 : status;
+		}.bind(this));
+		xhr.onreadystatechange = empty;
+		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
+		clearTimeout(this.timer);
+
+		this.response = {text: this.xhr.responseText || '', xml: this.xhr.responseXML};
+		if (this.options.isSuccess.call(this, this.status))
+			this.success(this.response.text, this.response.xml);
+		else
+			this.failure();
+	},
+
+	isSuccess: function(){
+		var status = this.status;
+		return (status >= 200 && status < 300);
+	},
+
+	isRunning: function(){
+		return !!this.running;
+	},
+
+	processScripts: function(text){
+		if (this.options.evalResponse || (/(ecma|java)script/).test(this.getHeader('Content-type'))) return Browser.exec(text);
+		return text.stripScripts(this.options.evalScripts);
+	},
+
+	success: function(text, xml){
+		this.onSuccess(this.processScripts(text), xml);
+	},
+
+	onSuccess: function(){
+		this.fireEvent('complete', arguments).fireEvent('success', arguments).callChain();
+	},
+
+	failure: function(){
+		this.onFailure();
+	},
+
+	onFailure: function(){
+		this.fireEvent('complete').fireEvent('failure', this.xhr);
+	},
+
+	loadstart: function(event){
+		this.fireEvent('loadstart', [event, this.xhr]);
+	},
+
+	progress: function(event){
+		this.fireEvent('progress', [event, this.xhr]);
+	},
+
+	timeout: function(){
+		this.fireEvent('timeout', this.xhr);
+	},
+
+	setHeader: function(name, value){
+		this.headers[name] = value;
+		return this;
+	},
+
+	getHeader: function(name){
+		return Function.attempt(function(){
+			return this.xhr.getResponseHeader(name);
+		}.bind(this));
+	},
+
+	check: function(){
+		if (!this.running) return true;
+		switch (this.options.link){
+			case 'cancel': this.cancel(); return true;
+			case 'chain': this.chain(this.caller.pass(arguments, this)); return false;
+		}
+		return false;
+	},
+
+	send: function(options){
+		if (!this.check(options)) return this;
+
+		this.options.isSuccess = this.options.isSuccess || this.isSuccess;
+		this.running = true;
+
+		var type = typeOf(options);
+		if (type == 'string' || type == 'element') options = {data: options};
+
+		var old = this.options;
+		options = Object.append({data: old.data, url: old.url, method: old.method}, options);
+		var data = options.data, url = String(options.url), method = options.method.toLowerCase();
+
+		switch (typeOf(data)){
+			case 'element': data = document.id(data).toQueryString(); break;
+			case 'object': case 'hash': data = Object.toQueryString(data);
+		}
+
+		if (this.options.format){
+			var format = 'format=' + this.options.format;
+			data = (data) ? format + '&' + data : format;
+		}
+
+		if (this.options.emulation && !['get', 'post'].contains(method)){
+			var _method = '_method=' + method;
+			data = (data) ? _method + '&' + data : _method;
+			method = 'post';
+		}
+
+		if (this.options.urlEncoded && ['post', 'put'].contains(method)){
+			var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : '';
+			this.headers['Content-type'] = 'application/x-www-form-urlencoded' + encoding;
+		}
+
+		if (!url) url = document.location.pathname;
+
+		var trimPosition = url.lastIndexOf('/');
+		if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition);
+
+		if (this.options.noCache)
+			url += (url.contains('?') ? '&' : '?') + String.uniqueID();
+
+		if (data && method == 'get'){
+			url += (url.contains('?') ? '&' : '?') + data;
+			data = null;
+		}
+
+		var xhr = this.xhr;
+		if (progressSupport){
+			xhr.onloadstart = this.loadstart.bind(this);
+			xhr.onprogress = this.progress.bind(this);
+		}
+
+		xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
+		if (this.options.user && 'withCredentials' in xhr) xhr.withCredentials = true;
+
+		xhr.onreadystatechange = this.onStateChange.bind(this);
+
+		Object.each(this.headers, function(value, key){
+			try {
+				xhr.setRequestHeader(key, value);
+			} catch (e){
+				this.fireEvent('exception', [key, value]);
+			}
+		}, this);
+
+		this.fireEvent('request');
+		xhr.send(data);
+		if (!this.options.async) this.onStateChange();
+		else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);
+		return this;
+	},
+
+	cancel: function(){
+		if (!this.running) return this;
+		this.running = false;
+		var xhr = this.xhr;
+		xhr.abort();
+		clearTimeout(this.timer);
+		xhr.onreadystatechange = empty;
+		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
+		this.xhr = new Browser.Request();
+		this.fireEvent('cancel');
+		return this;
+	}
+
+});
+
+var methods = {};
+['get', 'post', 'put', 'delete', 'GET', 'POST', 'PUT', 'DELETE'].each(function(method){
+	methods[method] = function(data){
+		var object = {
+			method: method
+		};
+		if (data != null) object.data = data;
+		return this.send(object);
+	};
+});
+
+Request.implement(methods);
+
+Element.Properties.send = {
+
+	set: function(options){
+		var send = this.get('send').cancel();
+		send.setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var send = this.retrieve('send');
+		if (!send){
+			send = new Request({
+				data: this, link: 'cancel', method: this.get('method') || 'post', url: this.get('action')
+			});
+			this.store('send', send);
+		}
+		return send;
+	}
+
+};
+
+Element.implement({
+
+	send: function(url){
+		var sender = this.get('send');
+		sender.send({data: this, url: url || sender.options.url});
+		return this;
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+name: Request.HTML
+
+description: Extends the basic Request Class with additional methods for interacting with HTML responses.
+
+license: MIT-style license.
+
+requires: [Element, Request]
+
+provides: Request.HTML
+
+...
+*/
+
+Request.HTML = new Class({
+
+	Extends: Request,
+
+	options: {
+		update: false,
+		append: false,
+		evalScripts: true,
+		filter: false,
+		headers: {
+			Accept: 'text/html, application/xml, text/xml, */*'
+		}
+	},
+
+	success: function(text){
+		var options = this.options, response = this.response;
+
+		response.html = text.stripScripts(function(script){
+			response.javascript = script;
+		});
+
+		var match = response.html.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
+		if (match) response.html = match[1];
+		var temp = new Element('div').set('html', response.html);
+
+		response.tree = temp.childNodes;
+		response.elements = temp.getElements(options.filter || '*');
+
+		if (options.filter) response.tree = response.elements;
+		if (options.update){
+			var update = document.id(options.update).empty();
+			if (options.filter) update.adopt(response.elements);
+			else update.set('html', response.html);
+		} else if (options.append){
+			var append = document.id(options.append);
+			if (options.filter) response.elements.reverse().inject(append);
+			else append.adopt(temp.getChildren());
+		}
+		if (options.evalScripts) Browser.exec(response.javascript);
+
+		this.onSuccess(response.tree, response.elements, response.html, response.javascript);
+	}
+
+});
+
+Element.Properties.load = {
+
+	set: function(options){
+		var load = this.get('load').cancel();
+		load.setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var load = this.retrieve('load');
+		if (!load){
+			load = new Request.HTML({data: this, link: 'cancel', update: this, method: 'get'});
+			this.store('load', load);
+		}
+		return load;
+	}
+
+};
+
+Element.implement({
+
+	load: function(){
+		this.get('load').send(Array.link(arguments, {data: Type.isObject, url: Type.isString}));
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+name: JSON
+
+description: JSON encoder and decoder.
+
+license: MIT-style license.
+
+SeeAlso: <http://www.json.org/>
+
+requires: [Array, String, Number, Function]
+
+provides: JSON
+
+...
+*/
+
+if (typeof JSON == 'undefined') this.JSON = {};
+
+
+
+(function(){
+
+var special = {'\b': '\\b', '\t': '\\t', '\n': '\\n', '\f': '\\f', '\r': '\\r', '"' : '\\"', '\\': '\\\\'};
+
+var escape = function(chr){
+	return special[chr] || '\\u' + ('0000' + chr.charCodeAt(0).toString(16)).slice(-4);
+};
+
+JSON.validate = function(string){
+	string = string.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+					replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+					replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+
+	return (/^[\],:{}\s]*$/).test(string);
+};
+
+JSON.encode = JSON.stringify ? function(obj){
+	return JSON.stringify(obj);
+} : function(obj){
+	if (obj && obj.toJSON) obj = obj.toJSON();
+
+	switch (typeOf(obj)){
+		case 'string':
+			return '"' + obj.replace(/[\x00-\x1f\\"]/g, escape) + '"';
+		case 'array':
+			return '[' + obj.map(JSON.encode).clean() + ']';
+		case 'object': case 'hash':
+			var string = [];
+			Object.each(obj, function(value, key){
+				var json = JSON.encode(value);
+				if (json) string.push(JSON.encode(key) + ':' + json);
+			});
+			return '{' + string + '}';
+		case 'number': case 'boolean': return '' + obj;
+		case 'null': return 'null';
+	}
+
+	return null;
+};
+
+JSON.decode = function(string, secure){
+	if (!string || typeOf(string) != 'string') return null;
+
+	if (secure || JSON.secure){
+		if (JSON.parse) return JSON.parse(string);
+		if (!JSON.validate(string)) throw new Error('JSON could not decode the input; security is enabled and the value is not secure.');
+	}
+
+	return eval('(' + string + ')');
+};
+
+})();
+
+
+/*
+---
+
+name: Request.JSON
+
+description: Extends the basic Request Class with additional methods for sending and receiving JSON data.
+
+license: MIT-style license.
+
+requires: [Request, JSON]
+
+provides: Request.JSON
+
+...
+*/
+
+Request.JSON = new Class({
+
+	Extends: Request,
+
+	options: {
+		/*onError: function(text, error){},*/
+		secure: true
+	},
+
+	initialize: function(options){
+		this.parent(options);
+		Object.append(this.headers, {
+			'Accept': 'application/json',
+			'X-Request': 'JSON'
+		});
+	},
+
+	success: function(text){
+		var json;
+		try {
+			json = this.response.json = JSON.decode(text, this.options.secure);
+		} catch (error){
+			this.fireEvent('error', [text, error]);
+			return;
+		}
+		if (json == null) this.onFailure();
+		else this.onSuccess(json, text);
+	}
+
+});
+
+
+/*
+---
+
+name: Cookie
+
+description: Class for creating, reading, and deleting browser Cookies.
+
+license: MIT-style license.
+
+credits:
+  - Based on the functions by Peter-Paul Koch (http://quirksmode.org).
+
+requires: [Options, Browser]
+
+provides: Cookie
+
+...
+*/
+
+var Cookie = new Class({
+
+	Implements: Options,
+
+	options: {
+		path: '/',
+		domain: false,
+		duration: false,
+		secure: false,
+		document: document,
+		encode: true
+	},
+
+	initialize: function(key, options){
+		this.key = key;
+		this.setOptions(options);
+	},
+
+	write: function(value){
+		if (this.options.encode) value = encodeURIComponent(value);
+		if (this.options.domain) value += '; domain=' + this.options.domain;
+		if (this.options.path) value += '; path=' + this.options.path;
+		if (this.options.duration){
+			var date = new Date();
+			date.setTime(date.getTime() + this.options.duration * 24 * 60 * 60 * 1000);
+			value += '; expires=' + date.toGMTString();
+		}
+		if (this.options.secure) value += '; secure';
+		this.options.document.cookie = this.key + '=' + value;
+		return this;
+	},
+
+	read: function(){
+		var value = this.options.document.cookie.match('(?:^|;)\\s*' + this.key.escapeRegExp() + '=([^;]*)');
+		return (value) ? decodeURIComponent(value[1]) : null;
+	},
+
+	dispose: function(){
+		new Cookie(this.key, Object.merge({}, this.options, {duration: -1})).write('');
+		return this;
+	}
+
+});
+
+Cookie.write = function(key, value, options){
+	return new Cookie(key, options).write(value);
+};
+
+Cookie.read = function(key){
+	return new Cookie(key).read();
+};
+
+Cookie.dispose = function(key, options){
+	return new Cookie(key, options).dispose();
+};
+
+
+/*
+---
+
+name: DOMReady
+
+description: Contains the custom event domready.
+
+license: MIT-style license.
+
+requires: [Browser, Element, Element.Event]
+
+provides: [DOMReady, DomReady]
+
+...
+*/
+
+(function(window, document){
+
+var ready,
+	loaded,
+	checks = [],
+	shouldPoll,
+	timer,
+	testElement = document.createElement('div');
+
+var domready = function(){
+	clearTimeout(timer);
+	if (ready) return;
+	Browser.loaded = ready = true;
+	document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
+
+	document.fireEvent('domready');
+	window.fireEvent('domready');
+};
+
+var check = function(){
+	for (var i = checks.length; i--;) if (checks[i]()){
+		domready();
+		return true;
+	}
+	return false;
+};
+
+var poll = function(){
+	clearTimeout(timer);
+	if (!check()) timer = setTimeout(poll, 10);
+};
+
+document.addListener('DOMContentLoaded', domready);
+
+/*<ltIE8>*/
+// doScroll technique by Diego Perini http://javascript.nwbox.com/IEContentLoaded/
+// testElement.doScroll() throws when the DOM is not ready, only in the top window
+var doScrollWorks = function(){
+	try {
+		testElement.doScroll();
+		return true;
+	} catch (e){}
+	return false;
+};
+// If doScroll works already, it can't be used to determine domready
+//   e.g. in an iframe
+if (testElement.doScroll && !doScrollWorks()){
+	checks.push(doScrollWorks);
+	shouldPoll = true;
+}
+/*</ltIE8>*/
+
+if (document.readyState) checks.push(function(){
+	var state = document.readyState;
+	return (state == 'loaded' || state == 'complete');
+});
+
+if ('onreadystatechange' in document) document.addListener('readystatechange', check);
+else shouldPoll = true;
+
+if (shouldPoll) poll();
+
+Element.Events.domready = {
+	onAdd: function(fn){
+		if (ready) fn.call(this);
+	}
+};
+
+// Make sure that domready fires before load
+Element.Events.load = {
+	base: 'load',
+	onAdd: function(fn){
+		if (loaded && this == window) fn.call(this);
+	},
+	condition: function(){
+		if (this == window){
+			domready();
+			delete Element.Events.load;
+		}
+		return true;
+	}
+};
+
+// This is based on the custom load event
+window.addEvent('load', function(){
+	loaded = true;
+});
+
+})(window, document);
+
+
+/*
+---
+
+name: Swiff
+
+description: Wrapper for embedding SWF movies. Supports External Interface Communication.
+
+license: MIT-style license.
+
+credits:
+  - Flash detection & Internet Explorer + Flash Player 9 fix inspired by SWFObject.
+
+requires: [Options, Object, Element]
+
+provides: Swiff
+
+...
+*/
+
+(function(){
+
+var Swiff = this.Swiff = new Class({
+
+	Implements: Options,
+
+	options: {
+		id: null,
+		height: 1,
+		width: 1,
+		container: null,
+		properties: {},
+		params: {
+			quality: 'high',
+			allowScriptAccess: 'always',
+			wMode: 'window',
+			swLiveConnect: true
+		},
+		callBacks: {},
+		vars: {}
+	},
+
+	toElement: function(){
+		return this.object;
+	},
+
+	initialize: function(path, options){
+		this.instance = 'Swiff_' + String.uniqueID();
+
+		this.setOptions(options);
+		options = this.options;
+		var id = this.id = options.id || this.instance;
+		var container = document.id(options.container);
+
+		Swiff.CallBacks[this.instance] = {};
+
+		var params = options.params, vars = options.vars, callBacks = options.callBacks;
+		var properties = Object.append({height: options.height, width: options.width}, options.properties);
+
+		var self = this;
+
+		for (var callBack in callBacks){
+			Swiff.CallBacks[this.instance][callBack] = (function(option){
+				return function(){
+					return option.apply(self.object, arguments);
+				};
+			})(callBacks[callBack]);
+			vars[callBack] = 'Swiff.CallBacks.' + this.instance + '.' + callBack;
+		}
+
+		params.flashVars = Object.toQueryString(vars);
+		if (Browser.ie){
+			properties.classid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+			params.movie = path;
+		} else {
+			properties.type = 'application/x-shockwave-flash';
+		}
+		properties.data = path;
+
+		var build = '<object id="' + id + '"';
+		for (var property in properties) build += ' ' + property + '="' + properties[property] + '"';
+		build += '>';
+		for (var param in params){
+			if (params[param]) build += '<param name="' + param + '" value="' + params[param] + '" />';
+		}
+		build += '</object>';
+		this.object = ((container) ? container.empty() : new Element('div')).set('html', build).firstChild;
+	},
+
+	replaces: function(element){
+		element = document.id(element, true);
+		element.parentNode.replaceChild(this.toElement(), element);
+		return this;
+	},
+
+	inject: function(element){
+		document.id(element, true).appendChild(this.toElement());
+		return this;
+	},
+
+	remote: function(){
+		return Swiff.remote.apply(Swiff, [this.toElement()].append(arguments));
+	}
+
+});
+
+Swiff.CallBacks = {};
+
+Swiff.remote = function(obj, fn){
+	var rs = obj.CallFunction('<invoke name="' + fn + '" returntype="javascript">' + __flash__argumentsToXML(arguments, 2) + '</invoke>');
+	return eval(rs);
+};
+
+})();
+
diff --git a/core/media/system/js/mootools-core.js b/core/media/system/js/mootools-core.js
new file mode 100644
index 00000000..8b9bbf02
--- /dev/null
+++ b/core/media/system/js/mootools-core.js
@@ -0,0 +1,180 @@
+(function(){this.MooTools={version:"1.4.5",build:"74e34796f5f76640cdb98853004650aea1499d69"};var b=this.typeOf=function(b){if(null==b)return"null";if(null!=b.$family)return b.$family();if(b.nodeName){if(1==b.nodeType)return"element";if(3==b.nodeType)return/\S/.test(b.nodeValue)?"textnode":"whitespace"}else if("number"==typeof b.length){if(b.callee)return"arguments";if("item"in b)return"collection"}return typeof b};this.instanceOf=function(b,a){if(null==b)return!1;for(var c=b.$constructor||b.constructor;c;){if(c===
+a)return!0;c=c.parent}return!b.hasOwnProperty?!1:b instanceof a};var a=this.Function,c=!0,d;for(d in{toString:1})c=null;c&&(c="hasOwnProperty,valueOf,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,constructor".split(","));a.prototype.overloadSetter=function(b){var a=this;return function(h,k){if(null==h)return this;if(b||"string"!=typeof h){for(var e in h)a.call(this,e,h[e]);if(c)for(var d=c.length;d--;)e=c[d],h.hasOwnProperty(e)&&a.call(this,e,h[e])}else a.call(this,h,k);return this}};
+a.prototype.overloadGetter=function(b){var a=this;return function(c){var h,k;"string"!=typeof c?h=c:1<arguments.length?h=arguments:b&&(h=[c]);if(h){k={};for(var e=0;e<h.length;e++)k[h[e]]=a.call(this,h[e])}else k=a.call(this,c);return k}};a.prototype.extend=function(b,a){this[b]=a}.overloadSetter();a.prototype.implement=function(b,a){this.prototype[b]=a}.overloadSetter();var e=Array.prototype.slice;a.from=function(a){return"function"==b(a)?a:function(){return a}};Array.from=function(a){return null==
+a?[]:f.isEnumerable(a)&&"string"!=typeof a?"array"==b(a)?a:e.call(a):[a]};Number.from=function(b){b=parseFloat(b);return isFinite(b)?b:null};String.from=function(b){return b+""};a.implement({hide:function(){this.$hidden=!0;return this},protect:function(){this.$protected=!0;return this}});var f=this.Type=function(a,c){if(a){var h=a.toLowerCase();f["is"+a]=function(a){return b(a)==h};null!=c&&(c.prototype.$family=function(){return h}.hide())}if(null==c)return null;c.extend(this);c.$constructor=f;return c.prototype.$constructor=
+c},g=Object.prototype.toString;f.isEnumerable=function(b){return null!=b&&"number"==typeof b.length&&"[object Function]"!=g.call(b)};var i={},j=function(a){a=b(a.prototype);return i[a]||(i[a]=[])},m=function(a,c){if(!c||!c.$hidden){for(var k=j(this),d=0;d<k.length;d++){var o=k[d];"type"==b(o)?m.call(o,a,c):o.call(this,a,c)}k=this.prototype[a];if(null==k||!k.$protected)this.prototype[a]=c;null==this[a]&&"function"==b(c)&&h.call(this,a,function(b){return c.apply(b,e.call(arguments,1))})}},h=function(b,
+a){if(!a||!a.$hidden){var c=this[b];if(null==c||!c.$protected)this[b]=a}};f.implement({implement:m.overloadSetter(),extend:h.overloadSetter(),alias:function(b,a){m.call(this,b,this.prototype[a])}.overloadSetter(),mirror:function(b){j(this).push(b);return this}});new f("Type",f);var k=function(b,a,c){var h=a!=Object,e=a.prototype;h&&(a=new f(b,a));for(var b=0,d=c.length;b<d;b++){var o=c[b],q=a[o],g=e[o];q&&q.protect();h&&g&&a.implement(o,g.protect())}if(h){var j=e.propertyIsEnumerable(c[0]);a.forEachMethod=
+function(b){if(!j)for(var a=0,h=c.length;a<h;a++)b.call(e,e[c[a]],c[a]);for(var k in e)b.call(e,e[k],k)}}return k};k("String",String,"charAt,charCodeAt,concat,indexOf,lastIndexOf,match,quote,replace,search,slice,split,substr,substring,trim,toLowerCase,toUpperCase".split(","))("Array",Array,"pop,push,reverse,shift,sort,splice,unshift,concat,join,slice,indexOf,lastIndexOf,filter,forEach,every,map,some,reduce,reduceRight".split(","))("Number",Number,["toExponential","toFixed","toLocaleString","toPrecision"])("Function",
+a,["apply","call","bind"])("RegExp",RegExp,["exec","test"])("Object",Object,"create,defineProperty,defineProperties,keys,getPrototypeOf,getOwnPropertyDescriptor,getOwnPropertyNames,preventExtensions,isExtensible,seal,isSealed,freeze,isFrozen".split(","))("Date",Date,["now"]);Object.extend=h.overloadSetter();Date.extend("now",function(){return+new Date});new f("Boolean",Boolean);Number.prototype.$family=function(){return isFinite(this)?"number":"null"}.hide();Number.extend("random",function(b,a){return Math.floor(Math.random()*
+(a-b+1)+b)});var o=Object.prototype.hasOwnProperty;Object.extend("forEach",function(b,a,c){for(var h in b)o.call(b,h)&&a.call(c,b[h],h,b)});Object.each=Object.forEach;Array.implement({forEach:function(b,a){for(var c=0,h=this.length;c<h;c++)c in this&&b.call(a,this[c],c,this)},each:function(b,a){Array.forEach(this,b,a);return this}});var q=function(a){switch(b(a)){case "array":return a.clone();case "object":return Object.clone(a);default:return a}};Array.implement("clone",function(){for(var b=this.length,
+a=Array(b);b--;)a[b]=q(this[b]);return a});var u=function(a,c,h){switch(b(h)){case "object":"object"==b(a[c])?Object.merge(a[c],h):a[c]=Object.clone(h);break;case "array":a[c]=h.clone();break;default:a[c]=h}return a};Object.extend({merge:function(a,c,h){if("string"==b(c))return u(a,c,h);for(var k=1,e=arguments.length;k<e;k++){var d=arguments[k],o;for(o in d)u(a,o,d[o])}return a},clone:function(b){var a={},c;for(c in b)a[c]=q(b[c]);return a},append:function(b){for(var a=1,c=arguments.length;a<c;a++){var h=
+arguments[a]||{},k;for(k in h)b[k]=h[k]}return b}});["Object","WhiteSpace","TextNode","Collection","Arguments"].each(function(b){new f(b)});var r=Date.now();String.extend("uniqueID",function(){return(r++).toString(36)})})();
+Array.implement({every:function(b,a){for(var c=0,d=this.length>>>0;c<d;c++)if(c in this&&!b.call(a,this[c],c,this))return!1;return!0},filter:function(b,a){for(var c=[],d,e=0,f=this.length>>>0;e<f;e++)e in this&&(d=this[e],b.call(a,d,e,this)&&c.push(d));return c},indexOf:function(b,a){for(var c=this.length>>>0,d=0>a?Math.max(0,c+a):a||0;d<c;d++)if(this[d]===b)return d;return-1},map:function(b,a){for(var c=this.length>>>0,d=Array(c),e=0;e<c;e++)e in this&&(d[e]=b.call(a,this[e],e,this));return d},some:function(b,
+a){for(var c=0,d=this.length>>>0;c<d;c++)if(c in this&&b.call(a,this[c],c,this))return!0;return!1},clean:function(){return this.filter(function(b){return null!=b})},invoke:function(b){var a=Array.slice(arguments,1);return this.map(function(c){return c[b].apply(c,a)})},associate:function(b){for(var a={},c=Math.min(this.length,b.length),d=0;d<c;d++)a[b[d]]=this[d];return a},link:function(b){for(var a={},c=0,d=this.length;c<d;c++)for(var e in b)if(b[e](this[c])){a[e]=this[c];delete b[e];break}return a},
+contains:function(b,a){return-1!=this.indexOf(b,a)},append:function(b){this.push.apply(this,b);return this},getLast:function(){return this.length?this[this.length-1]:null},getRandom:function(){return this.length?this[Number.random(0,this.length-1)]:null},include:function(b){this.contains(b)||this.push(b);return this},combine:function(b){for(var a=0,c=b.length;a<c;a++)this.include(b[a]);return this},erase:function(b){for(var a=this.length;a--;)this[a]===b&&this.splice(a,1);return this},empty:function(){this.length=
+0;return this},flatten:function(){for(var b=[],a=0,c=this.length;a<c;a++){var d=typeOf(this[a]);"null"!=d&&(b=b.concat("array"==d||"collection"==d||"arguments"==d||instanceOf(this[a],Array)?Array.flatten(this[a]):this[a]))}return b},pick:function(){for(var b=0,a=this.length;b<a;b++)if(null!=this[b])return this[b];return null},hexToRgb:function(b){if(3!=this.length)return null;var a=this.map(function(b){1==b.length&&(b+=b);return b.toInt(16)});return b?a:"rgb("+a+")"},rgbToHex:function(b){if(3>this.length)return null;
+if(4==this.length&&0==this[3]&&!b)return"transparent";for(var a=[],c=0;3>c;c++){var d=(this[c]-0).toString(16);a.push(1==d.length?"0"+d:d)}return b?a:"#"+a.join("")}});
+String.implement({test:function(b,a){return("regexp"==typeOf(b)?b:RegExp(""+b,a)).test(this)},contains:function(b,a){return a?-1<(a+this+a).indexOf(a+b+a):-1<(""+this).indexOf(b)},trim:function(){return(""+this).replace(/^\s+|\s+$/g,"")},clean:function(){return(""+this).replace(/\s+/g," ").trim()},camelCase:function(){return(""+this).replace(/-\D/g,function(b){return b.charAt(1).toUpperCase()})},hyphenate:function(){return(""+this).replace(/[A-Z]/g,function(b){return"-"+b.charAt(0).toLowerCase()})},
+capitalize:function(){return(""+this).replace(/\b[a-z]/g,function(b){return b.toUpperCase()})},escapeRegExp:function(){return(""+this).replace(/([-.*+?^${}()|[\]\/\\])/g,"\\$1")},toInt:function(b){return parseInt(this,b||10)},toFloat:function(){return parseFloat(this)},hexToRgb:function(b){var a=(""+this).match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);return a?a.slice(1).hexToRgb(b):null},rgbToHex:function(b){var a=(""+this).match(/\d{1,3}/g);return a?a.rgbToHex(b):null},substitute:function(b,a){return(""+
+this).replace(a||/\\?\{([^{}]+)\}/g,function(a,d){return"\\"==a.charAt(0)?a.slice(1):null!=b[d]?b[d]:""})}});Number.implement({limit:function(b,a){return Math.min(a,Math.max(b,this))},round:function(b){b=Math.pow(10,b||0).toFixed(0>b?-b:0);return Math.round(this*b)/b},times:function(b,a){for(var c=0;c<this;c++)b.call(a,c,this)},toFloat:function(){return parseFloat(this)},toInt:function(b){return parseInt(this,b||10)}});Number.alias("each","times");
+(function(b){var a={};b.each(function(b){Number[b]||(a[b]=function(){return Math[b].apply(null,[this].concat(Array.from(arguments)))})});Number.implement(a)})("abs,acos,asin,atan,atan2,ceil,cos,exp,floor,log,max,min,pow,sin,sqrt,tan".split(","));Function.extend({attempt:function(){for(var b=0,a=arguments.length;b<a;b++)try{return arguments[b]()}catch(c){}return null}});
+Function.implement({attempt:function(b,a){try{return this.apply(a,Array.from(b))}catch(c){}return null},bind:function(b){var a=this,c=1<arguments.length?Array.slice(arguments,1):null,d=function(){},e=function(){var f=b,g=arguments.length;this instanceof e&&(d.prototype=a.prototype,f=new d);g=!c&&!g?a.call(f):a.apply(f,c&&g?c.concat(Array.slice(arguments)):c||arguments);return f==b?g:f};return e},pass:function(b,a){var c=this;null!=b&&(b=Array.from(b));return function(){return c.apply(a,b||arguments)}},
+delay:function(b,a,c){return setTimeout(this.pass(null==c?[]:c,a),b)},periodical:function(b,a,c){return setInterval(this.pass(null==c?[]:c,a),b)}});
+(function(){var b=Object.prototype.hasOwnProperty;Object.extend({subset:function(b,c){for(var d={},e=0,f=c.length;e<f;e++){var g=c[e];g in b&&(d[g]=b[g])}return d},map:function(a,c,d){var e={},f;for(f in a)b.call(a,f)&&(e[f]=c.call(d,a[f],f,a));return e},filter:function(a,c,d){var e={},f;for(f in a){var g=a[f];b.call(a,f)&&c.call(d,g,f,a)&&(e[f]=g)}return e},every:function(a,c,d){for(var e in a)if(b.call(a,e)&&!c.call(d,a[e],e))return!1;return!0},some:function(a,c,d){for(var e in a)if(b.call(a,e)&&
+c.call(d,a[e],e))return!0;return!1},keys:function(a){var c=[],d;for(d in a)b.call(a,d)&&c.push(d);return c},values:function(a){var c=[],d;for(d in a)b.call(a,d)&&c.push(a[d]);return c},getLength:function(b){return Object.keys(b).length},keyOf:function(a,c){for(var d in a)if(b.call(a,d)&&a[d]===c)return d;return null},contains:function(b,c){return null!=Object.keyOf(b,c)},toQueryString:function(b,c){var d=[];Object.each(b,function(b,a){c&&(a=c+"["+a+"]");var g;switch(typeOf(b)){case "object":g=Object.toQueryString(b,
+a);break;case "array":var i={};b.each(function(b,a){i[a]=b});g=Object.toQueryString(i,a);break;default:g=a+"="+encodeURIComponent(b)}null!=b&&d.push(g)});return d.join("&")}})})();
+(function(){var b=this.document,a=b.window=this,c=navigator.userAgent.toLowerCase(),d=navigator.platform.toLowerCase(),e=c.match(/(opera|ie|firefox|chrome|version)[\s\/:]([\w\d\.]+)?.*?(safari|version[\s\/:]([\w\d\.]+)|$)/)||[null,"unknown",0],f=this.Browser={extend:Function.prototype.extend,name:"version"==e[1]?e[3]:e[1],version:"ie"==e[1]&&b.documentMode||parseFloat("opera"==e[1]&&e[4]?e[4]:e[2]),Platform:{name:c.match(/ip(?:ad|od|hone)/)?"ios":(c.match(/(?:webos|android)/)||d.match(/mac|win|linux/)||
+["other"])[0]},Features:{xpath:!!b.evaluate,air:!!a.runtime,query:!!b.querySelector,json:!!a.JSON},Plugins:{}};f[f.name]=!0;f[f.name+parseInt(f.version,10)]=!0;f.Platform[f.Platform.name]=!0;f.Request=function(){var b=function(){return new XMLHttpRequest},a=function(){return new ActiveXObject("MSXML2.XMLHTTP")},c=function(){return new ActiveXObject("Microsoft.XMLHTTP")};return Function.attempt(function(){b();return b},function(){a();return a},function(){c();return c})}();f.Features.xhr=!!f.Request;
+c=(Function.attempt(function(){return navigator.plugins["Shockwave Flash"].description},function(){return(new ActiveXObject("ShockwaveFlash.ShockwaveFlash")).GetVariable("$version")})||"0 r0").match(/\d+/g);f.Plugins.Flash={version:Number(c[0]||"0."+c[1])||0,build:Number(c[2])||0};f.exec=function(c){if(!c)return c;if(a.execScript)a.execScript(c);else{var h=b.createElement("script");h.setAttribute("type","text/javascript");h.text=c;b.head.appendChild(h);b.head.removeChild(h)}return c};String.implement("stripScripts",
+function(b){var a="",c=this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi,function(b,c){a+=c+"\n";return""});!0===b?f.exec(a):"function"==typeOf(b)&&b(a,c);return c});f.extend({Document:this.Document,Window:this.Window,Element:this.Element,Event:this.Event});this.Window=this.$constructor=new Type("Window",function(){});this.$family=Function.from("window").hide();Window.mirror(function(b,c){a[b]=c});this.Document=b.$constructor=new Type("Document",function(){});b.$family=Function.from("document").hide();
+Document.mirror(function(a,c){b[a]=c});b.html=b.documentElement;b.head||(b.head=b.getElementsByTagName("head")[0]);if(b.execCommand)try{b.execCommand("BackgroundImageCache",!1,!0)}catch(g){}if(this.attachEvent&&!this.addEventListener){var i=function(){this.detachEvent("onunload",i);b.head=b.html=b.window=null};this.attachEvent("onunload",i)}var j=Array.from;try{j(b.html.childNodes)}catch(m){Array.from=function(b){if(typeof b!="string"&&Type.isEnumerable(b)&&typeOf(b)!="array"){for(var a=b.length,
+c=Array(a);a--;)c[a]=b[a];return c}return j(b)};var h=Array.prototype,k=h.slice;"pop,push,reverse,shift,sort,splice,unshift,concat,join,slice".split(",").each(function(b){var a=h[b];Array[b]=function(b){return a.apply(Array.from(b),k.call(arguments,1))}})}})();
+(function(){var b={},a=this.DOMEvent=new Type("DOMEvent",function(a,d){d||(d=window);a=a||d.event;if(a.$extended)return a;this.event=a;this.$extended=!0;this.shift=a.shiftKey;this.control=a.ctrlKey;this.alt=a.altKey;this.meta=a.metaKey;for(var e=this.type=a.type,f=a.target||a.srcElement;f&&3==f.nodeType;)f=f.parentNode;this.target=document.id(f);if(0==e.indexOf("key")){if(f=this.code=a.which||a.keyCode,this.key=b[f],"keydown"==e&&(111<f&&124>f?this.key="f"+(f-111):95<f&&106>f&&(this.key=f-96)),null==
+this.key)this.key=String.fromCharCode(f).toLowerCase()}else if("click"==e||"dblclick"==e||"contextmenu"==e||"DOMMouseScroll"==e||0==e.indexOf("mouse")){f=d.document;f=!f.compatMode||"CSS1Compat"==f.compatMode?f.html:f.body;this.page={x:null!=a.pageX?a.pageX:a.clientX+f.scrollLeft,y:null!=a.pageY?a.pageY:a.clientY+f.scrollTop};this.client={x:null!=a.pageX?a.pageX-d.pageXOffset:a.clientX,y:null!=a.pageY?a.pageY-d.pageYOffset:a.clientY};if("DOMMouseScroll"==e||"mousewheel"==e)this.wheel=a.wheelDelta?
+a.wheelDelta/120:-(a.detail||0)/3;this.rightClick=3==a.which||2==a.button;if("mouseover"==e||"mouseout"==e){for(e=a.relatedTarget||a[("mouseover"==e?"from":"to")+"Element"];e&&3==e.nodeType;)e=e.parentNode;this.relatedTarget=document.id(e)}}else if(0==e.indexOf("touch")||0==e.indexOf("gesture"))if(this.rotation=a.rotation,this.scale=a.scale,this.targetTouches=a.targetTouches,this.changedTouches=a.changedTouches,(e=this.touches=a.touches)&&e[0])e=e[0],this.page={x:e.pageX,y:e.pageY},this.client={x:e.clientX,
+y:e.clientY};this.client||(this.client={});this.page||(this.page={})});a.implement({stop:function(){return this.preventDefault().stopPropagation()},stopPropagation:function(){this.event.stopPropagation?this.event.stopPropagation():this.event.cancelBubble=!0;return this},preventDefault:function(){this.event.preventDefault?this.event.preventDefault():this.event.returnValue=!1;return this}});a.defineKey=function(a,d){b[a]=d;return this};a.defineKeys=a.defineKey.overloadSetter(!0);a.defineKeys({38:"up",
+40:"down",37:"left",39:"right",27:"esc",32:"space",8:"backspace",9:"tab",46:"delete",13:"enter"})})();
+(function(){var b=this.Class=new Type("Class",function(e){instanceOf(e,Function)&&(e={initialize:e});var d=function(){c(this);if(d.$prototyping)return this;this.$caller=null;var a=this.initialize?this.initialize.apply(this,arguments):this;this.$caller=this.caller=null;return a}.extend(this).implement(e);d.$constructor=b;d.prototype.$constructor=d;d.prototype.parent=a;return d}),a=function(){if(!this.$caller)throw Error('The method "parent" cannot be called.');var a=this.$caller.$name,b=this.$caller.$owner.parent,
+b=b?b.prototype[a]:null;if(!b)throw Error('The method "'+a+'" has no parent.');return b.apply(this,arguments)},c=function(a){for(var b in a){var e=a[b];switch(typeOf(e)){case "object":var d=function(){};d.prototype=e;a[b]=c(new d);break;case "array":a[b]=e.clone()}}return a},d=function(a,b,c){c.$origin&&(c=c.$origin);var e=function(){if(c.$protected&&this.$caller==null)throw Error('The method "'+b+'" cannot be called.');var a=this.caller,h=this.$caller;this.caller=h;this.$caller=e;var k=c.apply(this,
+arguments);this.$caller=h;this.caller=a;return k}.extend({$owner:a,$origin:c,$name:b});return e},e=function(a,c,e){if(b.Mutators.hasOwnProperty(a)&&(c=b.Mutators[a].call(this,c),null==c))return this;if("function"==typeOf(c)){if(c.$hidden)return this;this.prototype[a]=e?c:d(this,a,c)}else Object.merge(this.prototype,a,c);return this};b.implement("implement",e.overloadSetter());b.Mutators={Extends:function(a){this.parent=a;a.$prototyping=!0;var b=new a;delete a.$prototyping;this.prototype=b},Implements:function(a){Array.from(a).each(function(a){var a=
+new a,b;for(b in a)e.call(this,b,a[b],!0)},this)}}})();
+(function(){this.Chain=new Class({$chain:[],chain:function(){this.$chain.append(Array.flatten(arguments));return this},callChain:function(){return this.$chain.length?this.$chain.shift().apply(this,arguments):!1},clearChain:function(){this.$chain.empty();return this}});var b=function(a){return a.replace(/^on([A-Z])/,function(a,b){return b.toLowerCase()})};this.Events=new Class({$events:{},addEvent:function(a,c,d){a=b(a);this.$events[a]=(this.$events[a]||[]).include(c);d&&(c.internal=!0);return this},
+addEvents:function(a){for(var b in a)this.addEvent(b,a[b]);return this},fireEvent:function(a,c,d){a=b(a);a=this.$events[a];if(!a)return this;c=Array.from(c);a.each(function(a){d?a.delay(d,this,c):a.apply(this,c)},this);return this},removeEvent:function(a,c){var a=b(a),d=this.$events[a];if(d&&!c.internal){var e=d.indexOf(c);-1!=e&&delete d[e]}return this},removeEvents:function(a){var c;if("object"==typeOf(a)){for(c in a)this.removeEvent(c,a[c]);return this}a&&(a=b(a));for(c in this.$events)if(!(a&&
+a!=c))for(var d=this.$events[c],e=d.length;e--;)e in d&&this.removeEvent(c,d[e]);return this}});this.Options=new Class({setOptions:function(){var a=this.options=Object.merge.apply(null,[{},this.options].append(arguments));if(this.addEvent)for(var b in a)"function"==typeOf(a[b])&&/^on[A-Z]/.test(b)&&(this.addEvent(b,a[b]),delete a[b]);return this}})})();
+(function(){function b(b,h,o,l,f,q,j,g,x,F,t,B,A,D,v,z){if(h||-1===c)if(a.expressions[++c]=[],d=-1,h)return"";if(o||l||-1===d)o=o||" ",b=a.expressions[c],e&&b[d]&&(b[d].reverseCombinator=m(o)),b[++d]={combinator:o,tag:"*"};o=a.expressions[c][d];if(f)o.tag=f.replace(i,"");else if(q)o.id=q.replace(i,"");else if(j)j=j.replace(i,""),o.classList||(o.classList=[]),o.classes||(o.classes=[]),o.classList.push(j),o.classes.push({value:j,regexp:RegExp("(^|\\s)"+k(j)+"(\\s|$)")});else if(A)z=(z=z||v)?z.replace(i,
+""):null,o.pseudos||(o.pseudos=[]),o.pseudos.push({key:A.replace(i,""),value:z,type:1==B.length?"class":"element"});else if(g){var g=g.replace(i,""),t=(t||"").replace(i,""),y,E;switch(x){case "^=":E=RegExp("^"+k(t));break;case "$=":E=RegExp(k(t)+"$");break;case "~=":E=RegExp("(^|\\s)"+k(t)+"(\\s|$)");break;case "|=":E=RegExp("^"+k(t)+"(-|$)");break;case "=":y=function(a){return t==a};break;case "*=":y=function(a){return a&&-1<a.indexOf(t)};break;case "!=":y=function(a){return t!=a};break;default:y=
+function(a){return!!a}}""==t&&/^[*$^]=$/.test(x)&&(y=function(){return!1});y||(y=function(a){return a&&E.test(a)});o.attributes||(o.attributes=[]);o.attributes.push({key:g,operator:x,value:t,test:y})}return""}var a,c,d,e,f={},g={},i=/\\/g,j=function(k,d){if(null==k)return null;if(!0===k.Slick)return k;var k=(""+k).replace(/^\s+|\s+$/g,""),q=(e=!!d)?g:f;if(q[k])return q[k];a={Slick:!0,expressions:[],raw:k,reverse:function(){return j(this.raw,!0)}};for(c=-1;k!=(k=k.replace(o,b)););a.length=a.expressions.length;
+return q[a.raw]=e?h(a):a},m=function(a){return"!"===a?" ":" "===a?"!":/^!/.test(a)?a.replace(/^!/,""):"!"+a},h=function(a){for(var b=a.expressions,c=0;c<b.length;c++){for(var h=b[c],k={parts:[],tag:"*",combinator:m(h[0].combinator)},e=0;e<h.length;e++){var d=h[e];d.reverseCombinator||(d.reverseCombinator=" ");d.combinator=d.reverseCombinator;delete d.reverseCombinator}h.reverse().push(k)}return a},k=function(a){return a.replace(/[-[\]{}()*+?.\\^$|,#\s]/g,function(a){return"\\"+a})},o=RegExp("^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)".replace(/<combinator>/,
+"["+k(">+~`!@$%^&={}\\;</")+"]").replace(/<unicode>/g,"(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])").replace(/<unicode1>/g,"(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])")),q=this.Slick||{};q.parse=function(a){return j(a)};q.escapeRegExp=k;this.Slick||(this.Slick=q)}).apply("undefined"!=typeof exports?exports:this);
+(function(){var b={},a={},c=Object.prototype.toString;b.isNativeCode=function(a){return/\{\s*\[native code\]\s*\}/.test(""+a)};b.isXML=function(a){return!!a.xmlVersion||!!a.xml||"[object XMLDocument]"==c.call(a)||9==a.nodeType&&"HTML"!=a.documentElement.nodeName};b.setDocument=function(b){var c=b.nodeType;if(9!=c)if(c)b=b.ownerDocument;else if(b.navigator)b=b.document;else return;if(this.document!==b){this.document=b;var c=b.documentElement,e=this.getUIDXML(c),d=a[e],f;if(!d){d=a[e]={};d.root=c;d.isXMLDocument=
+this.isXML(b);d.brokenStarGEBTN=d.starSelectsClosedQSA=d.idGetsName=d.brokenMixedCaseQSA=d.brokenGEBCN=d.brokenCheckedQSA=d.brokenEmptyAttributeQSA=d.isHTMLDocument=d.nativeMatchesSelector=!1;var j,m,l,s,g,n=b.createElement("div"),i=b.body||b.getElementsByTagName("body")[0]||c;i.appendChild(n);try{n.innerHTML='<a id="slick_uniqueid"></a>',d.isHTMLDocument=!!b.getElementById("slick_uniqueid")}catch(x){}if(d.isHTMLDocument){n.style.display="none";n.appendChild(b.createComment(""));e=1<n.getElementsByTagName("*").length;
+try{n.innerHTML="foo</foo>",j=(g=n.getElementsByTagName("*"))&&!!g.length&&"/"==g[0].nodeName.charAt(0)}catch(F){}d.brokenStarGEBTN=e||j;try{n.innerHTML='<a name="slick_uniqueid"></a><b id="slick_uniqueid"></b>',d.idGetsName=b.getElementById("slick_uniqueid")===n.firstChild}catch(t){}if(n.getElementsByClassName){try{n.innerHTML='<a class="f"></a><a class="b"></a>',n.getElementsByClassName("b").length,n.firstChild.className="b",l=2!=n.getElementsByClassName("b").length}catch(B){}try{n.innerHTML='<a class="a"></a><a class="f b a"></a>',
+m=2!=n.getElementsByClassName("a").length}catch(A){}d.brokenGEBCN=l||m}if(n.querySelectorAll){try{n.innerHTML="foo</foo>",g=n.querySelectorAll("*"),d.starSelectsClosedQSA=g&&!!g.length&&"/"==g[0].nodeName.charAt(0)}catch(D){}try{n.innerHTML='<a class="MiX"></a>',d.brokenMixedCaseQSA=!n.querySelectorAll(".MiX").length}catch(v){}try{n.innerHTML='<select><option selected="selected">a</option></select>',d.brokenCheckedQSA=0==n.querySelectorAll(":checked").length}catch(z){}try{n.innerHTML='<a class=""></a>',
+d.brokenEmptyAttributeQSA=0!=n.querySelectorAll('[class*=""]').length}catch(y){}}try{n.innerHTML='<form action="s"><input id="action"/></form>',s="s"!=n.firstChild.getAttribute("action")}catch(E){}d.nativeMatchesSelector=c.matchesSelector||c.mozMatchesSelector||c.webkitMatchesSelector;if(d.nativeMatchesSelector)try{d.nativeMatchesSelector.call(c,":slick"),d.nativeMatchesSelector=null}catch(G){}}try{c.slick_expando=1,delete c.slick_expando,d.getUID=this.getUIDHTML}catch(H){d.getUID=this.getUIDXML}i.removeChild(n);
+n=g=i=null;d.getAttribute=d.isHTMLDocument&&s?function(a,b){var c=this.attributeGetters[b];return c?c.call(a):(c=a.getAttributeNode(b))?c.nodeValue:null}:function(a,b){var c=this.attributeGetters[b];return c?c.call(a):a.getAttribute(b)};d.hasAttribute=c&&this.isNativeCode(c.hasAttribute)?function(a,b){return a.hasAttribute(b)}:function(a,b){a=a.getAttributeNode(b);return!(!a||!a.specified&&!a.nodeValue)};j=c&&this.isNativeCode(c.contains);m=b&&this.isNativeCode(b.contains);d.contains=j&&m?function(a,
+b){return a.contains(b)}:j&&!m?function(a,c){return a===c||(a===b?b.documentElement:a).contains(c)}:c&&c.compareDocumentPosition?function(a,b){return a===b||!!(a.compareDocumentPosition(b)&16)}:function(a,b){if(b){do if(b===a)return!0;while(b=b.parentNode)}return!1};d.documentSorter=c.compareDocumentPosition?function(a,b){return!a.compareDocumentPosition||!b.compareDocumentPosition?0:a.compareDocumentPosition(b)&4?-1:a===b?0:1}:"sourceIndex"in c?function(a,b){return!a.sourceIndex||!b.sourceIndex?
+0:a.sourceIndex-b.sourceIndex}:b.createRange?function(a,b){if(!a.ownerDocument||!b.ownerDocument)return 0;var c=a.ownerDocument.createRange(),h=b.ownerDocument.createRange();c.setStart(a,0);c.setEnd(a,0);h.setStart(b,0);h.setEnd(b,0);return c.compareBoundaryPoints(Range.START_TO_END,h)}:null;c=null}for(f in d)this[f]=d[f]}};var d=/^([#.]?)((?:[\w-]+|\*))$/,e=/\[.+[*$^]=(?:""|'')?\]/,f={};b.search=function(a,b,c,j){var g=this.found=j?null:c||[];if(a)if(a.navigator)a=a.document;else{if(!a.nodeType)return g}else return g;
+var r,i,l=this.uniques={},c=!(!c||!c.length),s=9==a.nodeType;this.document!==(s?a:a.ownerDocument)&&this.setDocument(a);if(c)for(i=g.length;i--;)l[this.getUID(g[i])]=!0;if("string"==typeof b){var p=b.match(d);a:if(p){i=p[1];var n=p[2];if(i)if("#"==i){if(!this.isHTMLDocument||!s)break a;p=a.getElementById(n);if(!p)return g;if(this.idGetsName&&p.getAttributeNode("id").nodeValue!=n)break a;if(j)return p||null;(!c||!l[this.getUID(p)])&&g.push(p)}else{if("."==i){if(!this.isHTMLDocument||(!a.getElementsByClassName||
+this.brokenGEBCN)&&a.querySelectorAll)break a;if(a.getElementsByClassName&&!this.brokenGEBCN){r=a.getElementsByClassName(n);if(j)return r[0]||null;for(i=0;p=r[i++];)(!c||!l[this.getUID(p)])&&g.push(p)}else{var C=RegExp("(^|\\s)"+m.escapeRegExp(n)+"(\\s|$)");r=a.getElementsByTagName("*");for(i=0;p=r[i++];)if((className=p.className)&&C.test(className)){if(j)return p;(!c||!l[this.getUID(p)])&&g.push(p)}}}}else{if("*"==n&&this.brokenStarGEBTN)break a;r=a.getElementsByTagName(n);if(j)return r[0]||null;
+for(i=0;p=r[i++];)(!c||!l[this.getUID(p)])&&g.push(p)}c&&this.sort(g);return j?null:g}a:if(a.querySelectorAll&&this.isHTMLDocument&&!f[b]&&!this.brokenMixedCaseQSA&&!(this.brokenCheckedQSA&&-1<b.indexOf(":checked")||this.brokenEmptyAttributeQSA&&e.test(b)||!s&&-1<b.indexOf(",")||m.disableQSA)){i=b;p=a;if(!s){var x=p.getAttribute("id");p.setAttribute("id","slickid__");i="#slickid__ "+i;a=p.parentNode}try{if(j)return a.querySelector(i)||null;r=a.querySelectorAll(i)}catch(F){f[b]=1;break a}finally{s||
+(x?p.setAttribute("id",x):p.removeAttribute("id"),a=p)}if(this.starSelectsClosedQSA)for(i=0;p=r[i++];)"@"<p.nodeName&&(!c||!l[this.getUID(p)])&&g.push(p);else for(i=0;p=r[i++];)(!c||!l[this.getUID(p)])&&g.push(p);c&&this.sort(g);return g}r=this.Slick.parse(b);if(!r.length)return g}else{if(null==b)return g;if(b.Slick)r=b;else{if(this.contains(a.documentElement||a,b))g?g.push(b):g=b;return g}}this.posNTH={};this.posNTHLast={};this.posNTHType={};this.posNTHTypeLast={};this.push=!c&&(j||1==r.length&&
+1==r.expressions[0].length)?this.pushArray:this.pushUID;null==g&&(g=[]);var t,B,A,D,v,z,y=r.expressions;i=0;a:for(;z=y[i];i++)for(b=0;v=z[b];b++){x="combinator:"+v.combinator;if(!this[x])continue a;s=this.isXMLDocument?v.tag:v.tag.toUpperCase();p=v.id;n=v.classList;A=v.classes;D=v.attributes;v=v.pseudos;t=b===z.length-1;this.bitUniques={};t?(this.uniques=l,this.found=g):(this.uniques={},this.found=[]);if(0===b){if(this[x](a,s,p,A,D,v,n),j&&t&&g.length)break a}else if(j&&t){t=0;for(B=C.length;t<B;t++)if(this[x](C[t],
+s,p,A,D,v,n),g.length)break a}else{t=0;for(B=C.length;t<B;t++)this[x](C[t],s,p,A,D,v,n)}C=this.found}(c||1<r.expressions.length)&&this.sort(g);return j?g[0]||null:g};b.uidx=1;b.uidk="slick-uniqueid";b.getUIDXML=function(a){var b=a.getAttribute(this.uidk);b||(b=this.uidx++,a.setAttribute(this.uidk,b));return b};b.getUIDHTML=function(a){return a.uniqueNumber||(a.uniqueNumber=this.uidx++)};b.sort=function(a){if(!this.documentSorter)return a;a.sort(this.documentSorter);return a};b.cacheNTH={};b.matchNTH=
+/^([+-]?\d*)?([a-z]+)?([+-]\d+)?$/;b.parseNTHArgument=function(a){var b=a.match(this.matchNTH);if(!b)return!1;var c=b[2]||!1,d=b[1]||1;"-"==d&&(d=-1);b=+b[3]||0;b="n"==c?{a:d,b:b}:"odd"==c?{a:2,b:1}:"even"==c?{a:2,b:0}:{a:0,b:d};return this.cacheNTH[a]=b};b.createNTHPseudo=function(a,b,c,d){return function(e,f){var g=this.getUID(e);if(!this[c][g]){var l=e.parentNode;if(!l)return!1;var l=l[a],s=1;if(d){var j=e.nodeName;do l.nodeName==j&&(this[c][this.getUID(l)]=s++);while(l=l[b])}else{do 1==l.nodeType&&
+(this[c][this.getUID(l)]=s++);while(l=l[b])}}f=f||"n";s=this.cacheNTH[f]||this.parseNTHArgument(f);if(!s)return!1;l=s.a;s=s.b;g=this[c][g];if(0==l)return s==g;if(0<l){if(g<s)return!1}else if(s<g)return!1;return 0==(g-s)%l}};b.pushArray=function(a,b,c,d,e,f){this.matchSelector(a,b,c,d,e,f)&&this.found.push(a)};b.pushUID=function(a,b,c,d,e,f){var g=this.getUID(a);!this.uniques[g]&&this.matchSelector(a,b,c,d,e,f)&&(this.uniques[g]=!0,this.found.push(a))};b.matchNode=function(a,b){if(this.isHTMLDocument&&
+this.nativeMatchesSelector)try{return this.nativeMatchesSelector.call(a,b.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g,'[$1="$2"]'))}catch(c){}var d=this.Slick.parse(b);if(!d)return!0;var e=d.expressions,f=0,g;for(g=0;currentExpression=e[g];g++)if(1==currentExpression.length){var l=currentExpression[0];if(this.matchSelector(a,this.isXMLDocument?l.tag:l.tag.toUpperCase(),l.id,l.classes,l.attributes,l.pseudos))return!0;f++}if(f==d.length)return!1;d=this.search(this.document,d);for(g=0;e=d[g++];)if(e===
+a)return!0;return!1};b.matchPseudo=function(a,b,c){var d="pseudo:"+b;if(this[d])return this[d](a,c);a=this.getAttribute(a,b);return c?c==a:!!a};b.matchSelector=function(a,b,c,d,e,f){if(b){var g=this.isXMLDocument?a.nodeName:a.nodeName.toUpperCase();if("*"==b){if("@">g)return!1}else if(g!=b)return!1}if(c&&a.getAttribute("id")!=c)return!1;if(d)for(b=d.length;b--;)if(c=this.getAttribute(a,"class"),!c||!d[b].regexp.test(c))return!1;if(e)for(b=e.length;b--;)if(d=e[b],d.operator?!d.test(this.getAttribute(a,
+d.key)):!this.hasAttribute(a,d.key))return!1;if(f)for(b=f.length;b--;)if(d=f[b],!this.matchPseudo(a,d.key,d.value))return!1;return!0};var g={" ":function(a,b,c,d,e,f,g){var l;if(this.isHTMLDocument){if(c){l=this.document.getElementById(c);if(!l&&a.all||this.idGetsName&&l&&l.getAttributeNode("id").nodeValue!=c){g=a.all[c];if(!g)return;g[0]||(g=[g]);for(a=0;l=g[a++];){var s=l.getAttributeNode("id");if(s&&s.nodeValue==c){this.push(l,b,null,d,e,f);break}}return}if(l){if(this.document!==a&&!this.contains(a,
+l))return;this.push(l,b,null,d,e,f);return}if(this.contains(this.root,a))return}if(d&&a.getElementsByClassName&&!this.brokenGEBCN&&(g=a.getElementsByClassName(g.join(" ")))&&g.length){for(a=0;l=g[a++];)this.push(l,b,c,null,e,f);return}}if((g=a.getElementsByTagName(b))&&g.length){this.brokenStarGEBTN||(b=null);for(a=0;l=g[a++];)this.push(l,b,c,d,e,f)}},">":function(a,b,c,d,e,f){if(a=a.firstChild){do 1==a.nodeType&&this.push(a,b,c,d,e,f);while(a=a.nextSibling)}},"+":function(a,b,c,d,e,f){for(;a=a.nextSibling;)if(1==
+a.nodeType){this.push(a,b,c,d,e,f);break}},"^":function(a,b,c,d,e,f){if(a=a.firstChild)if(1==a.nodeType)this.push(a,b,c,d,e,f);else this["combinator:+"](a,b,c,d,e,f)},"~":function(a,b,c,d,e,f){for(;a=a.nextSibling;)if(1==a.nodeType){var g=this.getUID(a);if(this.bitUniques[g])break;this.bitUniques[g]=!0;this.push(a,b,c,d,e,f)}},"++":function(a,b,c,d,e,f){this["combinator:+"](a,b,c,d,e,f);this["combinator:!+"](a,b,c,d,e,f)},"~~":function(a,b,c,d,e,f){this["combinator:~"](a,b,c,d,e,f);this["combinator:!~"](a,
+b,c,d,e,f)},"!":function(a,b,c,d,e,f){for(;a=a.parentNode;)a!==this.document&&this.push(a,b,c,d,e,f)},"!>":function(a,b,c,d,e,f){a=a.parentNode;a!==this.document&&this.push(a,b,c,d,e,f)},"!+":function(a,b,c,d,e,f){for(;a=a.previousSibling;)if(1==a.nodeType){this.push(a,b,c,d,e,f);break}},"!^":function(a,b,c,d,e,f){if(a=a.lastChild)if(1==a.nodeType)this.push(a,b,c,d,e,f);else this["combinator:!+"](a,b,c,d,e,f)},"!~":function(a,b,c,d,e,f){for(;a=a.previousSibling;)if(1==a.nodeType){var g=this.getUID(a);
+if(this.bitUniques[g])break;this.bitUniques[g]=!0;this.push(a,b,c,d,e,f)}}},i;for(i in g)b["combinator:"+i]=g[i];var g={empty:function(a){var b=a.firstChild;return!(b&&1==b.nodeType)&&!(a.innerText||a.textContent||"").length},not:function(a,b){return!this.matchNode(a,b)},contains:function(a,b){return-1<(a.innerText||a.textContent||"").indexOf(b)},"first-child":function(a){for(;a=a.previousSibling;)if(1==a.nodeType)return!1;return!0},"last-child":function(a){for(;a=a.nextSibling;)if(1==a.nodeType)return!1;
+return!0},"only-child":function(a){for(var b=a;b=b.previousSibling;)if(1==b.nodeType)return!1;for(;a=a.nextSibling;)if(1==a.nodeType)return!1;return!0},"nth-child":b.createNTHPseudo("firstChild","nextSibling","posNTH"),"nth-last-child":b.createNTHPseudo("lastChild","previousSibling","posNTHLast"),"nth-of-type":b.createNTHPseudo("firstChild","nextSibling","posNTHType",!0),"nth-last-of-type":b.createNTHPseudo("lastChild","previousSibling","posNTHTypeLast",!0),index:function(a,b){return this["pseudo:nth-child"](a,
+""+(b+1))},even:function(a){return this["pseudo:nth-child"](a,"2n")},odd:function(a){return this["pseudo:nth-child"](a,"2n+1")},"first-of-type":function(a){for(var b=a.nodeName;a=a.previousSibling;)if(a.nodeName==b)return!1;return!0},"last-of-type":function(a){for(var b=a.nodeName;a=a.nextSibling;)if(a.nodeName==b)return!1;return!0},"only-of-type":function(a){for(var b=a,c=a.nodeName;b=b.previousSibling;)if(b.nodeName==c)return!1;for(;a=a.nextSibling;)if(a.nodeName==c)return!1;return!0},enabled:function(a){return!a.disabled},
+disabled:function(a){return a.disabled},checked:function(a){return a.checked||a.selected},focus:function(a){return this.isHTMLDocument&&this.document.activeElement===a&&(a.href||a.type||this.hasAttribute(a,"tabindex"))},root:function(a){return a===this.root},selected:function(a){return a.selected}},j;for(j in g)b["pseudo:"+j]=g[j];j=b.attributeGetters={"for":function(){return"htmlFor"in this?this.htmlFor:this.getAttribute("for")},href:function(){return"href"in this?this.getAttribute("href",2):this.getAttribute("href")},
+style:function(){return this.style?this.style.cssText:this.getAttribute("style")},tabindex:function(){var a=this.getAttributeNode("tabindex");return a&&a.specified?a.nodeValue:null},type:function(){return this.getAttribute("type")},maxlength:function(){var a=this.getAttributeNode("maxLength");return a&&a.specified?a.nodeValue:null}};j.MAXLENGTH=j.maxLength=j.maxlength;var m=b.Slick=this.Slick||{};m.version="1.1.7";m.search=function(a,c,d){return b.search(a,c,d)};m.find=function(a,c){return b.search(a,
+c,null,!0)};m.contains=function(a,c){b.setDocument(a);return b.contains(a,c)};m.getAttribute=function(a,c){b.setDocument(a);return b.getAttribute(a,c)};m.hasAttribute=function(a,c){b.setDocument(a);return b.hasAttribute(a,c)};m.match=function(a,c){if(!a||!c)return!1;if(!c||c===a)return!0;b.setDocument(a);return b.matchNode(a,c)};m.defineAttributeGetter=function(a,c){b.attributeGetters[a]=c;return this};m.lookupAttributeGetter=function(a){return b.attributeGetters[a]};m.definePseudo=function(a,c){b["pseudo:"+
+a]=function(a,b){return c.call(a,b)};return this};m.lookupPseudo=function(a){var c=b["pseudo:"+a];return c?function(a){return c.call(this,a)}:null};m.override=function(a,c){b.override(a,c);return this};m.isXML=b.isXML;m.uidOf=function(a){return b.getUIDHTML(a)};this.Slick||(this.Slick=m)}).apply("undefined"!=typeof exports?exports:this);
+var Element=function(b,a){var c=Element.Constructors[b];if(c)return c(a);if("string"!=typeof b)return document.id(b).set(a);a||(a={});if(!/^[\w-]+$/.test(b)){c=Slick.parse(b).expressions[0][0];b="*"==c.tag?"div":c.tag;c.id&&null==a.id&&(a.id=c.id);var d=c.attributes;if(d)for(var e,f=0,g=d.length;f<g;f++)e=d[f],null==a[e.key]&&(null!=e.value&&"="==e.operator?a[e.key]=e.value:!e.value&&!e.operator&&(a[e.key]=!0));c.classList&&null==a["class"]&&(a["class"]=c.classList.join(" "))}return document.newElement(b,
+a)};Browser.Element&&(Element.prototype=Browser.Element.prototype,Element.prototype._fireEvent=function(b){return function(a,c){return b.call(this,a,c)}}(Element.prototype.fireEvent));(new Type("Element",Element)).mirror(function(b){if(!Array.prototype[b]){var a={};a[b]=function(){for(var a=[],d=arguments,e=true,f=0,g=this.length;f<g;f++)var i=this[f],i=a[f]=i[b].apply(i,d),e=e&&typeOf(i)=="element";return e?new Elements(a):a};Elements.implement(a)}});
+Browser.Element||(Element.parent=Object,Element.Prototype={$constructor:Element,$family:Function.from("element").hide()},Element.mirror(function(b,a){Element.Prototype[b]=a}));Element.Constructors={};
+var IFrame=new Type("IFrame",function(){var b=Array.link(arguments,{properties:Type.isObject,iframe:function(a){return a!=null}}),a=b.properties||{},c;b.iframe&&(c=document.id(b.iframe));var d=a.onload||function(){};delete a.onload;a.id=a.name=[a.id,a.name,c?c.id||c.name:"IFrame_"+String.uniqueID()].pick();c=new Element(c||"iframe",a);b=function(){d.call(c.contentWindow)};window.frames[a.id]?b():c.addListener("load",b);return c}),Elements=this.Elements=function(b){if(b&&b.length)for(var a={},c,d=
+0;c=b[d++];){var e=Slick.uidOf(c);if(!a[e]){a[e]=true;this.push(c)}}};Elements.prototype={length:0};Elements.parent=Array;
+(new Type("Elements",Elements)).implement({filter:function(b,a){return!b?this:new Elements(Array.filter(this,typeOf(b)=="string"?function(a){return a.match(b)}:b,a))}.protect(),push:function(){for(var b=this.length,a=0,c=arguments.length;a<c;a++){var d=document.id(arguments[a]);d&&(this[b++]=d)}return this.length=b}.protect(),unshift:function(){for(var b=[],a=0,c=arguments.length;a<c;a++){var d=document.id(arguments[a]);d&&b.push(d)}return Array.prototype.unshift.apply(this,b)}.protect(),concat:function(){for(var b=
+new Elements(this),a=0,c=arguments.length;a<c;a++){var d=arguments[a];Type.isEnumerable(d)?b.append(d):b.push(d)}return b}.protect(),append:function(b){for(var a=0,c=b.length;a<c;a++)this.push(b[a]);return this}.protect(),empty:function(){for(;this.length;)delete this[--this.length];return this}.protect()});
+(function(){var b=Array.prototype.splice,a={"0":0,1:1,length:2};b.call(a,1,1);a[1]==1&&Elements.implement("splice",function(){for(var a=this.length,c=b.apply(this,arguments);a>=this.length;)delete this[a--];return c}.protect());Array.forEachMethod(function(a,b){Elements.implement(b,a)});Array.mirror(Elements);var c;try{c=document.createElement("<input name=x>").name=="x"}catch(d){}var e=function(a){return(""+a).replace(/&/g,"&amp;").replace(/"/g,"&quot;")};Document.implement({newElement:function(a,
+b){if(b&&b.checked!=null)b.defaultChecked=b.checked;if(c&&b){a="<"+a;b.name&&(a=a+(' name="'+e(b.name)+'"'));b.type&&(a=a+(' type="'+e(b.type)+'"'));a=a+">";delete b.name;delete b.type}return this.id(this.createElement(a)).set(b)}})})();
+(function(){Slick.uidOf(window);Slick.uidOf(document);Document.implement({newTextNode:function(a){return this.createTextNode(a)},getDocument:function(){return this},getWindow:function(){return this.window},id:function(){var a={string:function(b,c,d){return(b=Slick.find(d,"#"+b.replace(/(\W)/g,"\\$1")))?a.element(b,c):null},element:function(a,b){Slick.uidOf(a);if(!b&&!a.$family&&!/^(?:object|embed)$/i.test(a.tagName)){var c=a.fireEvent;a._fireEvent=function(a,b){return c(a,b)};Object.append(a,Element.Prototype)}return a},
+object:function(b,c,d){return b.toElement?a.element(b.toElement(d),c):null}};a.textnode=a.whitespace=a.window=a.document=function(a){return a};return function(b,c,d){if(b&&b.$family&&b.uniqueNumber)return b;var e=typeOf(b);return a[e]?a[e](b,c,d||document):null}}()});window.$==null&&Window.implement("$",function(a,b){return document.id(a,b,this.document)});Window.implement({getDocument:function(){return this.document},getWindow:function(){return this}});[Document,Element].invoke("implement",{getElements:function(a){return Slick.search(this,
+a,new Elements)},getElement:function(a){return document.id(Slick.find(this,a))}});var b={contains:function(a){return Slick.contains(this,a)}};document.contains||Document.implement(b);document.createElement("div").contains||Element.implement(b);var a=function(a,b){if(!a)return b;for(var a=Object.clone(Slick.parse(a)),c=a.expressions,d=c.length;d--;)c[d][0].combinator=b;return a};Object.forEach({getNext:"~",getPrevious:"!~",getParent:"!"},function(b,c){Element.implement(c,function(c){return this.getElement(a(c,
+b))})});Object.forEach({getAllNext:"~",getAllPrevious:"!~",getSiblings:"~~",getChildren:">",getParents:"!"},function(b,c){Element.implement(c,function(c){return this.getElements(a(c,b))})});Element.implement({getFirst:function(b){return document.id(Slick.search(this,a(b,">"))[0])},getLast:function(b){return document.id(Slick.search(this,a(b,">")).getLast())},getWindow:function(){return this.ownerDocument.window},getDocument:function(){return this.ownerDocument},getElementById:function(a){return document.id(Slick.find(this,
+"#"+(""+a).replace(/(\W)/g,"\\$1")))},match:function(a){return!a||Slick.match(this,a)}});window.$$==null&&Window.implement("$$",function(a){if(arguments.length==1){if(typeof a=="string")return Slick.search(this.document,a,new Elements);if(Type.isEnumerable(a))return new Elements(a)}return new Elements(arguments)});var c={before:function(a,b){var c=b.parentNode;c&&c.insertBefore(a,b)},after:function(a,b){var c=b.parentNode;c&&c.insertBefore(a,b.nextSibling)},bottom:function(a,b){b.appendChild(a)},
+top:function(a,b){b.insertBefore(a,b.firstChild)}};c.inside=c.bottom;var d={},e={},f={};Array.forEach(["type","value","defaultValue","accessKey","cellPadding","cellSpacing","colSpan","frameBorder","rowSpan","tabIndex","useMap"],function(a){f[a.toLowerCase()]=a});f.html="innerHTML";f.text=document.createElement("div").textContent==null?"innerText":"textContent";Object.forEach(f,function(a,b){e[b]=function(b,c){b[a]=c};d[b]=function(b){return b[a]}});Array.forEach(["compact","nowrap","ismap","declare",
+"noshade","checked","disabled","readOnly","multiple","selected","noresize","defer","defaultChecked","autofocus","controls","autoplay","loop"],function(a){var b=a.toLowerCase();e[b]=function(b,c){b[a]=!!c};d[b]=function(b){return!!b[a]}});Object.append(e,{"class":function(a,b){"className"in a?a.className=b||"":a.setAttribute("class",b)},"for":function(a,b){"htmlFor"in a?a.htmlFor=b:a.setAttribute("for",b)},style:function(a,b){a.style?a.style.cssText=b:a.setAttribute("style",b)},value:function(a,b){a.value=
+b!=null?b:""}});d["class"]=function(a){return"className"in a?a.className||null:a.getAttribute("class")};b=document.createElement("button");try{b.type="button"}catch(g){}if(b.type!="button")e.type=function(a,b){a.setAttribute("type",b)};b=null;b=document.createElement("input");b.value="t";b.type="submit";if(b.value!="t")e.type=function(a,b){var c=a.value;a.type=b;a.value=c};var b=null,i=function(a){a.random="attribute";return a.getAttribute("random")=="attribute"}(document.createElement("div"));Element.implement({setProperty:function(a,
+b){var c=e[a.toLowerCase()];if(c)c(this,b);else{if(i)var d=this.retrieve("$attributeWhiteList",{});if(b==null){this.removeAttribute(a);i&&delete d[a]}else{this.setAttribute(a,""+b);i&&(d[a]=true)}}return this},setProperties:function(a){for(var b in a)this.setProperty(b,a[b]);return this},getProperty:function(a){var b=d[a.toLowerCase()];if(b)return b(this);if(i){var c=this.getAttributeNode(a),b=this.retrieve("$attributeWhiteList",{});if(!c)return null;if(c.expando&&!b[a]){c=this.outerHTML;if(c.substr(0,
+c.search(/\/?['"]?>(?![^<]*<['"])/)).indexOf(a)<0)return null;b[a]=true}}b=Slick.getAttribute(this,a);return!b&&!Slick.hasAttribute(this,a)?null:b},getProperties:function(){var a=Array.from(arguments);return a.map(this.getProperty,this).associate(a)},removeProperty:function(a){return this.setProperty(a,null)},removeProperties:function(){Array.each(arguments,this.removeProperty,this);return this},set:function(a,b){var c=Element.Properties[a];c&&c.set?c.set.call(this,b):this.setProperty(a,b)}.overloadSetter(),
+get:function(a){var b=Element.Properties[a];return b&&b.get?b.get.apply(this):this.getProperty(a)}.overloadGetter(),erase:function(a){var b=Element.Properties[a];b&&b.erase?b.erase.apply(this):this.removeProperty(a);return this},hasClass:function(a){return this.className.clean().contains(a," ")},addClass:function(a){if(!this.hasClass(a))this.className=(this.className+" "+a).clean();return this},removeClass:function(a){this.className=this.className.replace(RegExp("(^|\\s)"+a+"(?:\\s|$)"),"$1");return this},
+toggleClass:function(a,b){b==null&&(b=!this.hasClass(a));return b?this.addClass(a):this.removeClass(a)},adopt:function(){var a=this,b,c=Array.flatten(arguments),d=c.length;d>1&&(a=b=document.createDocumentFragment());for(var e=0;e<d;e++){var f=document.id(c[e],true);f&&a.appendChild(f)}b&&this.appendChild(b);return this},appendText:function(a,b){return this.grab(this.getDocument().newTextNode(a),b)},grab:function(a,b){c[b||"bottom"](document.id(a,true),this);return this},inject:function(a,b){c[b||
+"bottom"](this,document.id(a,true));return this},replaces:function(a){a=document.id(a,true);a.parentNode.replaceChild(this,a);return this},wraps:function(a,b){a=document.id(a,true);return this.replaces(a).grab(a,b)},getSelected:function(){this.selectedIndex;return new Elements(Array.from(this.options).filter(function(a){return a.selected}))},toQueryString:function(){var a=[];this.getElements("input, select, textarea").each(function(b){var c=b.type;if(b.name&&!b.disabled&&!(c=="submit"||c=="reset"||
+c=="file"||c=="image")){c=b.get("tag")=="select"?b.getSelected().map(function(a){return document.id(a).get("value")}):(c=="radio"||c=="checkbox")&&!b.checked?null:b.get("value");Array.from(c).each(function(c){typeof c!="undefined"&&a.push(encodeURIComponent(b.name)+"="+encodeURIComponent(c))})}});return a.join("&")}});var j={},m={},h=function(a){return m[a]||(m[a]={})},k=function(a){var b=a.uniqueNumber;a.removeEvents&&a.removeEvents();a.clearAttributes&&a.clearAttributes();if(b!=null){delete j[b];
+delete m[b]}return a},o={input:"checked",option:"selected",textarea:"value"};Element.implement({destroy:function(){var a=k(this).getElementsByTagName("*");Array.each(a,k);Element.dispose(this);return null},empty:function(){Array.from(this.childNodes).each(Element.dispose);return this},dispose:function(){return this.parentNode?this.parentNode.removeChild(this):this},clone:function(a,b){var a=a!==false,c=this.cloneNode(a),d=[c],e=[this],f;if(a){d.append(Array.from(c.getElementsByTagName("*")));e.append(Array.from(this.getElementsByTagName("*")))}for(f=
+d.length;f--;){var k=d[f],g=e[f];b||k.removeAttribute("id");if(k.clearAttributes){k.clearAttributes();k.mergeAttributes(g);k.removeAttribute("uniqueNumber");if(k.options)for(var j=k.options,m=g.options,h=j.length;h--;)j[h].selected=m[h].selected}(j=o[g.tagName.toLowerCase()])&&g[j]&&(k[j]=g[j])}if(Browser.ie){d=c.getElementsByTagName("object");e=this.getElementsByTagName("object");for(f=d.length;f--;)d[f].outerHTML=e[f].outerHTML}return document.id(c)}});[Element,Window,Document].invoke("implement",
+{addListener:function(a,b,c){if(a=="unload")var d=b,e=this,b=function(){e.removeListener("unload",b);d()};else j[Slick.uidOf(this)]=this;this.addEventListener?this.addEventListener(a,b,!!c):this.attachEvent("on"+a,b);return this},removeListener:function(a,b,c){this.removeEventListener?this.removeEventListener(a,b,!!c):this.detachEvent("on"+a,b);return this},retrieve:function(a,b){var c=h(Slick.uidOf(this)),d=c[a];b!=null&&d==null&&(d=c[a]=b);return d!=null?d:null},store:function(a,b){h(Slick.uidOf(this))[a]=
+b;return this},eliminate:function(a){delete h(Slick.uidOf(this))[a];return this}});window.attachEvent&&!window.addEventListener&&window.addListener("unload",function(){Object.each(j,k);window.CollectGarbage&&CollectGarbage()});Element.Properties={};Element.Properties.style={set:function(a){this.style.cssText=a},get:function(){return this.style.cssText},erase:function(){this.style.cssText=""}};Element.Properties.tag={get:function(){return this.tagName.toLowerCase()}};Element.Properties.html={set:function(a){a==
+null?a="":typeOf(a)=="array"&&(a=a.join(""));this.innerHTML=a},erase:function(){this.innerHTML=""}};b=document.createElement("div");b.innerHTML="<nav></nav>";var q=b.childNodes.length==1;if(!q)for(var b=["abbr","article","aside","audio","canvas","datalist","details","figcaption","figure","footer","header","hgroup","mark","meter","nav","output","progress","section","summary","time","video"],u=document.createDocumentFragment(),r=b.length;r--;)u.createElement(b[r]);b=null;b=Function.attempt(function(){document.createElement("table").innerHTML=
+"<tr><td></td></tr>";return true});r=document.createElement("tr");r.innerHTML="<td></td>";var w=r.innerHTML=="<td></td>",r=null;if(!b||!w||!q)Element.Properties.html.set=function(a){var b={table:[1,"<table>","</table>"],select:[1,"<select>","</select>"],tbody:[2,"<table><tbody>","</tbody></table>"],tr:[3,"<table><tbody><tr>","</tr></tbody></table>"]};b.thead=b.tfoot=b.tbody;return function(c){var d=b[this.get("tag")];!d&&!q&&(d=[0,"",""]);if(!d)return a.call(this,c);var e=d[0],f=document.createElement("div"),
+k=f;q||u.appendChild(f);for(f.innerHTML=[d[1],c,d[2]].flatten().join("");e--;)k=k.firstChild;this.empty().adopt(k.childNodes);q||u.removeChild(f)}}(Element.Properties.html.set);b=document.createElement("form");b.innerHTML="<select><option>s</option></select>";if(b.firstChild.value!="s")Element.Properties.value={set:function(a){if(this.get("tag")!="select")return this.setProperty("value",a);for(var b=this.getElements("option"),c=0;c<b.length;c++){var d=b[c],e=d.getAttributeNode("value");if((e&&e.specified?
+d.value:d.get("text"))==a)return d.selected=true}},get:function(){var a=this,b=a.get("tag");if(b!="select"&&b!="option")return this.getProperty("value");if(b=="select"&&!(a=a.getSelected()[0]))return"";return(b=a.getAttributeNode("value"))&&b.specified?a.value:a.get("text")}};b=null;if(document.createElement("div").getAttributeNode("id"))Element.Properties.id={set:function(a){this.id=this.getAttributeNode("id").value=a},get:function(){return this.id||null},erase:function(){this.id=this.getAttributeNode("id").value=
+""}}})();
+(function(){var b=document.html,a=document.createElement("div");a.style.color="red";a.style.color=null;var c=a.style.color=="red",a=null;Element.Properties.styles={set:function(a){this.setStyles(a)}};var a=b.style.opacity!=null,d=b.style.filter!=null,e=/alpha\(opacity=([\d.]+)\)/i,f=a?function(a,b){a.style.opacity=b}:d?function(a,b){var c=a.style;if(!a.currentStyle||!a.currentStyle.hasLayout)c.zoom=1;var b=b==null||b==1?"":"alpha(opacity="+(b*100).limit(0,100).round()+")",d=c.filter||a.getComputedStyle("filter")||"";
+c.filter=e.test(d)?d.replace(e,b):d+b;c.filter||c.removeAttribute("filter")}:function(a,b){a.store("$opacity",b);a.style.visibility=b>0||b==null?"visible":"hidden"},g=a?function(a){a=a.style.opacity||a.getComputedStyle("opacity");return a==""?1:a.toFloat()}:d?function(a){var a=a.style.filter||a.getComputedStyle("filter"),b;a&&(b=a.match(e));return b==null||a==null?1:b[1]/100}:function(a){var b=a.retrieve("$opacity");b==null&&(b=a.style.visibility=="hidden"?0:1);return b},i=b.style.cssFloat==null?
+"styleFloat":"cssFloat";Element.implement({getComputedStyle:function(a){if(this.currentStyle)return this.currentStyle[a.camelCase()];var b=Element.getDocument(this).defaultView;return(b=b?b.getComputedStyle(this,null):null)?b.getPropertyValue(a==i?"float":a.hyphenate()):null},setStyle:function(a,b){if(a=="opacity"){b!=null&&(b=parseFloat(b));f(this,b);return this}a=(a=="float"?i:a).camelCase();if(typeOf(b)!="string")var d=(Element.Styles[a]||"@").split(" "),b=Array.from(b).map(function(a,b){return!d[b]?
+"":typeOf(a)=="number"?d[b].replace("@",Math.round(a)):a}).join(" ");else b==""+Number(b)&&(b=Math.round(b));this.style[a]=b;(b==""||b==null)&&c&&this.style.removeAttribute&&this.style.removeAttribute(a);return this},getStyle:function(a){if(a=="opacity")return g(this);var a=(a=="float"?i:a).camelCase(),b=this.style[a];if(!b||a=="zIndex"){var b=[],c;for(c in Element.ShortStyles)if(a==c){for(var d in Element.ShortStyles[c])b.push(this.getStyle(d));return b.join(" ")}b=this.getComputedStyle(a)}if(b){b=
+""+b;(c=b.match(/rgba?\([\d\s,]+\)/))&&(b=b.replace(c[0],c[0].rgbToHex()))}if(Browser.ie&&isNaN(parseFloat(b))){if(/^(height|width)$/.test(a)){var e=0;(a=="width"?["left","right"]:["top","bottom"]).each(function(a){e=e+(this.getStyle("border-"+a+"-width").toInt()+this.getStyle("padding-"+a).toInt())},this);return this["offset"+a.capitalize()]-e+"px"}if(Browser.opera&&(""+b).indexOf("px")!=-1)return b;if(/^border(.+)Width|margin|padding/.test(a))return"0px"}return b},setStyles:function(a){for(var b in a)this.setStyle(b,
+a[b]);return this},getStyles:function(){var a={};Array.flatten(arguments).each(function(b){a[b]=this.getStyle(b)},this);return a}});Element.Styles={left:"@px",top:"@px",bottom:"@px",right:"@px",width:"@px",height:"@px",maxWidth:"@px",maxHeight:"@px",minWidth:"@px",minHeight:"@px",backgroundColor:"rgb(@, @, @)",backgroundPosition:"@px @px",color:"rgb(@, @, @)",fontSize:"@px",letterSpacing:"@px",lineHeight:"@px",clip:"rect(@px @px @px @px)",margin:"@px @px @px @px",padding:"@px @px @px @px",border:"@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)",
+borderWidth:"@px @px @px @px",borderStyle:"@ @ @ @",borderColor:"rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)",zIndex:"@",zoom:"@",fontWeight:"@",textIndent:"@px",opacity:"@"};Element.ShortStyles={margin:{},padding:{},border:{},borderWidth:{},borderStyle:{},borderColor:{}};["Top","Right","Bottom","Left"].each(function(a){var b=Element.ShortStyles,c=Element.Styles;["margin","padding"].each(function(d){var e=d+a;b[d][e]=c[e]="@px"});var d="border"+a;b.border[d]=c[d]="@px @ rgb(@, @, @)";var e=
+d+"Width",f=d+"Style",g=d+"Color";b[d]={};b.borderWidth[e]=b[d][e]=c[e]="@px";b.borderStyle[f]=b[d][f]=c[f]="@";b.borderColor[g]=b[d][g]=c[g]="rgb(@, @, @)"})})();
+(function(){Element.Properties.events={set:function(a){this.addEvents(a)}};[Element,Window,Document].invoke("implement",{addEvent:function(a,b,d){var e=this.retrieve("events",{});e[a]||(e[a]={keys:[],values:[]});if(e[a].keys.contains(b))return this;e[a].keys.push(b);var f=a,g=Element.Events[a],i=b,j=this;if(g){g.onAdd&&g.onAdd.call(this,b,a);g.condition&&(i=function(d){return g.condition.call(this,d,a)?b.call(this,d):true});g.base&&(f=Function.from(g.base).call(this,a))}var m=function(){return b.call(j)},
+h=Element.NativeEvents[f];if(h){h==2&&(m=function(a){a=new DOMEvent(a,j.getWindow());i.call(j,a)===false&&a.stop()});this.addListener(f,m,d)}e[a].values.push(m);return this},removeEvent:function(a,b,d){var e=this.retrieve("events");if(!e||!e[a])return this;var f=e[a],g=f.keys.indexOf(b);if(g==-1)return this;e=f.values[g];delete f.keys[g];delete f.values[g];if(f=Element.Events[a]){f.onRemove&&f.onRemove.call(this,b,a);f.base&&(a=Function.from(f.base).call(this,a))}return Element.NativeEvents[a]?this.removeListener(a,
+e,d):this},addEvents:function(a){for(var b in a)this.addEvent(b,a[b]);return this},removeEvents:function(a){var b;if(typeOf(a)=="object"){for(b in a)this.removeEvent(b,a[b]);return this}var d=this.retrieve("events");if(!d)return this;if(a){if(d[a]){d[a].keys.each(function(b){this.removeEvent(a,b)},this);delete d[a]}}else{for(b in d)this.removeEvents(b);this.eliminate("events")}return this},fireEvent:function(a,b,d){var e=this.retrieve("events");if(!e||!e[a])return this;b=Array.from(b);e[a].keys.each(function(a){d?
+a.delay(d,this,b):a.apply(this,b)},this);return this},cloneEvents:function(a,b){var a=document.id(a),d=a.retrieve("events");if(!d)return this;if(b)d[b]&&d[b].keys.each(function(a){this.addEvent(b,a)},this);else for(var e in d)this.cloneEvents(a,e);return this}});Element.NativeEvents={click:2,dblclick:2,mouseup:2,mousedown:2,contextmenu:2,mousewheel:2,DOMMouseScroll:2,mouseover:2,mouseout:2,mousemove:2,selectstart:2,selectend:2,keydown:2,keypress:2,keyup:2,orientationchange:2,touchstart:2,touchmove:2,
+touchend:2,touchcancel:2,gesturestart:2,gesturechange:2,gestureend:2,focus:2,blur:2,change:2,reset:2,select:2,submit:2,paste:2,input:2,load:2,unload:1,beforeunload:2,resize:1,move:1,DOMContentLoaded:1,readystatechange:1,error:1,abort:1,scroll:1};Element.Events={mousewheel:{base:Browser.firefox?"DOMMouseScroll":"mousewheel"}};if("onmouseenter"in document.documentElement)Element.NativeEvents.mouseenter=Element.NativeEvents.mouseleave=2;else{var b=function(a){a=a.relatedTarget;return a==null?true:!a?
+false:a!=this&&a.prefix!="xul"&&typeOf(this)!="document"&&!this.contains(a)};Element.Events.mouseenter={base:"mouseover",condition:b};Element.Events.mouseleave={base:"mouseout",condition:b}}if(!window.addEventListener){Element.NativeEvents.propertychange=2;Element.Events.change={base:function(){var a=this.type;return this.get("tag")=="input"&&(a=="radio"||a=="checkbox")?"propertychange":"change"},condition:function(a){return this.type!="radio"||a.event.propertyName=="checked"&&this.checked}}}})();
+(function(){var b,a=!!window.addEventListener;Element.NativeEvents.focusin=Element.NativeEvents.focusout=2;var c=function(a,b,c,d,e){for(;e&&e!=a;){if(b(e,d))return c.call(e,d,e);e=document.id(e.parentNode)}},d={mouseenter:{base:"mouseover"},mouseleave:{base:"mouseout"},focus:{base:"focus"+(a?"":"in"),capture:true},blur:{base:a?"blur":"focusout",capture:true}},e=function(a){return{base:"focusin",remove:function(b,c){var d=b.retrieve("$delegation:"+a+"listeners",{})[c];if(d&&d.forms)for(var e=d.forms.length;e--;)d.forms[e].removeEvent(a,
+d.fns[e])},listen:function(b,d,e,f,g,i){if(f=g.get("tag")=="form"?g:f.target.getParent("form")){var r=b.retrieve("$delegation:"+a+"listeners",{}),w=r[i]||{forms:[],fns:[]},l=w.forms,s=w.fns;if(l.indexOf(f)==-1){l.push(f);l=function(a){c(b,d,e,a,g)};f.addEvent(a,l);s.push(l);r[i]=w;b.store("$delegation:"+a+"listeners",r)}}}}},f=function(a){return{base:"focusin",listen:function(b,d,e,f,g){var i={blur:function(){this.removeEvents(i)}};i[a]=function(a){c(b,d,e,a,g)};f.target.addEvents(i)}}};a||Object.append(d,
+{submit:e("submit"),reset:e("reset"),change:f("change"),select:f("select")});var a=Element.prototype,g=a.addEvent,i=a.removeEvent,a=function(a,b){return function(c,d,e){if(c.indexOf(":relay")==-1)return a.call(this,c,d,e);var f=Slick.parse(c).expressions[0][0];if(f.pseudos[0].key!="relay")return a.call(this,c,d,e);var g=f.tag;f.pseudos.slice(1).each(function(a){g=g+(":"+a.key+(a.value?"("+a.value+")":""))});a.call(this,c,d);return b.call(this,g,f.pseudos[0].value,d)}};b=function(a,c,e,f){var g=this.retrieve("$delegates",
+{}),q=g[a];if(!q)return this;if(f){var c=a,e=q[f].delegator,u=d[a]||{},a=u.base||c;u.remove&&u.remove(this,f);delete q[f];g[c]=q;return i.call(this,a,e)}if(e)for(u in q){f=q[u];if(f.match==c&&f.fn==e)return b.call(this,a,c,e,u)}else for(u in q){f=q[u];f.match==c&&b.call(this,a,c,f.fn,u)}return this};[Element,Window,Document].invoke("implement",{addEvent:a(g,function(a,b,e){var f=this.retrieve("$delegates",{}),i=f[a];if(i)for(var q in i)if(i[q].fn==e&&i[q].match==b)return this;q=a;var u=b,r=d[a]||
+{},a=r.base||q,b=function(a){return Slick.match(a,u)},w=Element.Events[q];if(w&&w.condition)var l=b,s=w.condition,b=function(b,c){return l(b,c)&&s.call(b,c,a)};var p=this,n=String.uniqueID(),w=r.listen?function(a,c){if(!c&&a&&a.target)c=a.target;c&&r.listen(p,b,e,a,c,n)}:function(a,d){if(!d&&a&&a.target)d=a.target;d&&c(p,b,e,a,d)};i||(i={});i[n]={match:u,fn:e,delegator:w};f[q]=i;return g.call(this,a,w,r.capture)}),removeEvent:a(i,b)})})();
+(function(){function b(a){return h(a,"-moz-box-sizing")=="border-box"}function a(a){return h(a,"border-top-width").toInt()||0}function c(a){return h(a,"border-left-width").toInt()||0}function d(a){return/^(?:body|html)$/i.test(a.tagName)}function e(a){a=a.getDocument();return!a.compatMode||a.compatMode=="CSS1Compat"?a.html:a.body}var f=document.createElement("div"),g=document.createElement("div");f.style.height="0";f.appendChild(g);var i=g.offsetParent===f,f=g=null,j=function(a){return h(a,"position")!=
+"static"||d(a)},m=function(a){return j(a)||/^(?:table|td|th)$/i.test(a.tagName)};Element.implement({scrollTo:function(a,b){if(d(this))this.getWindow().scrollTo(a,b);else{this.scrollLeft=a;this.scrollTop=b}return this},getSize:function(){return d(this)?this.getWindow().getSize():{x:this.offsetWidth,y:this.offsetHeight}},getScrollSize:function(){return d(this)?this.getWindow().getScrollSize():{x:this.scrollWidth,y:this.scrollHeight}},getScroll:function(){return d(this)?this.getWindow().getScroll():
+{x:this.scrollLeft,y:this.scrollTop}},getScrolls:function(){for(var a=this.parentNode,b={x:0,y:0};a&&!d(a);){b.x=b.x+a.scrollLeft;b.y=b.y+a.scrollTop;a=a.parentNode}return b},getOffsetParent:i?function(){var a=this;if(d(a)||h(a,"position")=="fixed")return null;for(var b=h(a,"position")=="static"?m:j;a=a.parentNode;)if(b(a))return a;return null}:function(){if(d(this)||h(this,"position")=="fixed")return null;try{return this.offsetParent}catch(a){}return null},getOffsets:function(){if(this.getBoundingClientRect&&
+!Browser.Platform.ios){var e=this.getBoundingClientRect(),f=document.id(this.getDocument().documentElement),g=f.getScroll(),i=this.getScrolls(),j=h(this,"position")=="fixed";return{x:e.left.toInt()+i.x+(j?0:g.x)-f.clientLeft,y:e.top.toInt()+i.y+(j?0:g.y)-f.clientTop}}e=this;f={x:0,y:0};if(d(this))return f;for(;e&&!d(e);){f.x=f.x+e.offsetLeft;f.y=f.y+e.offsetTop;if(Browser.firefox){if(!b(e)){f.x=f.x+c(e);f.y=f.y+a(e)}if((g=e.parentNode)&&h(g,"overflow")!="visible"){f.x=f.x+c(g);f.y=f.y+a(g)}}else if(e!=
+this&&Browser.safari){f.x=f.x+c(e);f.y=f.y+a(e)}e=e.offsetParent}if(Browser.firefox&&!b(this)){f.x=f.x-c(this);f.y=f.y-a(this)}return f},getPosition:function(b){var d=this.getOffsets(),e=this.getScrolls(),d={x:d.x-e.x,y:d.y-e.y};if(b&&(b=document.id(b))){e=b.getPosition();return{x:d.x-e.x-c(b),y:d.y-e.y-a(b)}}return d},getCoordinates:function(a){if(d(this))return this.getWindow().getCoordinates();var a=this.getPosition(a),b=this.getSize(),a={left:a.x,top:a.y,width:b.x,height:b.y};a.right=a.left+a.width;
+a.bottom=a.top+a.height;return a},computePosition:function(a){return{left:a.x-(h(this,"margin-left").toInt()||0),top:a.y-(h(this,"margin-top").toInt()||0)}},setPosition:function(a){return this.setStyles(this.computePosition(a))}});[Document,Window].invoke("implement",{getSize:function(){var a=e(this);return{x:a.clientWidth,y:a.clientHeight}},getScroll:function(){var a=this.getWindow(),b=e(this);return{x:a.pageXOffset||b.scrollLeft,y:a.pageYOffset||b.scrollTop}},getScrollSize:function(){var a=e(this),
+b=this.getSize(),c=this.getDocument().body;return{x:Math.max(a.scrollWidth,c.scrollWidth,b.x),y:Math.max(a.scrollHeight,c.scrollHeight,b.y)}},getPosition:function(){return{x:0,y:0}},getCoordinates:function(){var a=this.getSize();return{top:0,left:0,bottom:a.y,right:a.x,height:a.y,width:a.x}}});var h=Element.getComputedStyle})();Element.alias({position:"setPosition"});
+[Window,Document,Element].invoke("implement",{getHeight:function(){return this.getSize().y},getWidth:function(){return this.getSize().x},getScrollTop:function(){return this.getScroll().y},getScrollLeft:function(){return this.getScroll().x},getScrollHeight:function(){return this.getScrollSize().y},getScrollWidth:function(){return this.getScrollSize().x},getTop:function(){return this.getPosition().y},getLeft:function(){return this.getPosition().x}});
+(function(){var b=this.Fx=new Class({Implements:[Chain,Events,Options],options:{fps:60,unit:false,duration:500,frames:null,frameSkip:true,link:"ignore"},initialize:function(a){this.subject=this.subject||this;this.setOptions(a)},getTransition:function(){return function(a){return-(Math.cos(Math.PI*a)-1)/2}},step:function(a){if(this.options.frameSkip){var b=(this.time!=null?a-this.time:0)/this.frameInterval;this.time=a;this.frame=this.frame+b}else this.frame++;if(this.frame<this.frames)this.set(this.compute(this.from,
+this.to,this.transition(this.frame/this.frames)));else{this.frame=this.frames;this.set(this.compute(this.from,this.to,1));this.stop()}},set:function(a){return a},compute:function(a,c,d){return b.compute(a,c,d)},check:function(){if(!this.isRunning())return true;switch(this.options.link){case "cancel":this.cancel();return true;case "chain":this.chain(this.caller.pass(arguments,this))}return false},start:function(a,c){if(!this.check(a,c))return this;this.from=a;this.to=c;this.frame=this.options.frameSkip?
+0:-1;this.time=null;this.transition=this.getTransition();var d=this.options.frames,f=this.options.fps,h=this.options.duration;this.duration=b.Durations[h]||h.toInt();this.frameInterval=1E3/f;this.frames=d||Math.round(this.duration/this.frameInterval);this.fireEvent("start",this.subject);e.call(this,f);return this},stop:function(){if(this.isRunning()){this.time=null;f.call(this,this.options.fps);if(this.frames==this.frame){this.fireEvent("complete",this.subject);this.callChain()||this.fireEvent("chainComplete",
+this.subject)}else this.fireEvent("stop",this.subject)}return this},cancel:function(){if(this.isRunning()){this.time=null;f.call(this,this.options.fps);this.frame=this.frames;this.fireEvent("cancel",this.subject).clearChain()}return this},pause:function(){if(this.isRunning()){this.time=null;f.call(this,this.options.fps)}return this},resume:function(){this.frame<this.frames&&!this.isRunning()&&e.call(this,this.options.fps);return this},isRunning:function(){var b=a[this.options.fps];return b&&b.contains(this)}});
+b.compute=function(a,b,c){return(b-a)*c+a};b.Durations={"short":250,normal:500,"long":1E3};var a={},c={},d=function(){for(var a=Date.now(),b=this.length;b--;){var c=this[b];c&&c.step(a)}},e=function(b){var e=a[b]||(a[b]=[]);e.push(this);c[b]||(c[b]=d.periodical(Math.round(1E3/b),e))},f=function(b){var d=a[b];if(d){d.erase(this);if(!d.length&&c[b]){delete a[b];c[b]=clearInterval(c[b])}}}})();
+Fx.CSS=new Class({Extends:Fx,prepare:function(b,a,c){var c=Array.from(c),d=c[0],c=c[1];if(c==null){var c=d,d=b.getStyle(a),e=this.options.unit;if(e&&d.slice(-e.length)!=e&&parseFloat(d)!=0){b.setStyle(a,c+e);var f=b.getComputedStyle(a);if(!/px$/.test(f)){f=b.style[("pixel-"+a).camelCase()];if(f==null){var g=b.style.left;b.style.left=c+e;f=b.style.pixelLeft;b.style.left=g}}d=(c||1)/(parseFloat(f)||1)*(parseFloat(d)||0);b.setStyle(a,d+e)}}return{from:this.parse(d),to:this.parse(c)}},parse:function(b){b=
+Function.from(b)();b=typeof b=="string"?b.split(" "):Array.from(b);return b.map(function(a){var a=""+a,b=false;Object.each(Fx.CSS.Parsers,function(d){if(!b){var e=d.parse(a);if(e||e===0)b={value:e,parser:d}}});return b=b||{value:a,parser:Fx.CSS.Parsers.String}})},compute:function(b,a,c){var d=[];Math.min(b.length,a.length).times(function(e){d.push({value:b[e].parser.compute(b[e].value,a[e].value,c),parser:b[e].parser})});d.$family=Function.from("fx:css:value");return d},serve:function(b,a){typeOf(b)!=
+"fx:css:value"&&(b=this.parse(b));var c=[];b.each(function(b){c=c.concat(b.parser.serve(b.value,a))});return c},render:function(b,a,c,d){b.setStyle(a,this.serve(c,d))},search:function(b){if(Fx.CSS.Cache[b])return Fx.CSS.Cache[b];var a={},c=RegExp("^"+b.escapeRegExp()+"$");Array.each(document.styleSheets,function(b){var e=b.href;if(!e||!e.contains("://")||e.contains(document.domain))Array.each(b.rules||b.cssRules,function(b){if(b.style){var d=b.selectorText?b.selectorText.replace(/^\w+/,function(a){return a.toLowerCase()}):
+null;d&&c.test(d)&&Object.each(Element.Styles,function(c,d){if(b.style[d]&&!Element.ShortStyles[d]){c=""+b.style[d];a[d]=/^rgb/.test(c)?c.rgbToHex():c}})}})});return Fx.CSS.Cache[b]=a}});Fx.CSS.Cache={};
+Fx.CSS.Parsers={Color:{parse:function(b){return b.match(/^#[0-9a-f]{3,6}$/i)?b.hexToRgb(true):(b=b.match(/(\d+),\s*(\d+),\s*(\d+)/))?[b[1],b[2],b[3]]:false},compute:function(b,a,c){return b.map(function(d,e){return Math.round(Fx.compute(b[e],a[e],c))})},serve:function(b){return b.map(Number)}},Number:{parse:parseFloat,compute:Fx.compute,serve:function(b,a){return a?b+a:b}},String:{parse:Function.from(!1),compute:function(b,a){return a},serve:function(b){return b}}};
+Fx.Tween=new Class({Extends:Fx.CSS,initialize:function(b,a){this.element=this.subject=document.id(b);this.parent(a)},set:function(b,a){if(arguments.length==1){a=b;b=this.property||this.options.property}this.render(this.element,b,a,this.options.unit);return this},start:function(b,a,c){if(!this.check(b,a,c))return this;var d=Array.flatten(arguments);this.property=this.options.property||d.shift();d=this.prepare(this.element,this.property,d);return this.parent(d.from,d.to)}});
+Element.Properties.tween={set:function(b){this.get("tween").cancel().setOptions(b);return this},get:function(){var b=this.retrieve("tween");if(!b){b=new Fx.Tween(this,{link:"cancel"});this.store("tween",b)}return b}};
+Element.implement({tween:function(b,a,c){this.get("tween").start(b,a,c);return this},fade:function(b){var a=this.get("tween"),c,d=["opacity"].append(arguments),e;d[1]==null&&(d[1]="toggle");switch(d[1]){case "in":c="start";d[1]=1;break;case "out":c="start";d[1]=0;break;case "show":c="set";d[1]=1;break;case "hide":c="set";d[1]=0;break;case "toggle":e=this.retrieve("fade:flag",this.getStyle("opacity")==1);c="start";d[1]=e?0:1;this.store("fade:flag",!e);e=true;break;default:c="start"}e||this.eliminate("fade:flag");
+a[c].apply(a,d);d=d[d.length-1];c=="set"||d!=0?this.setStyle("visibility",d==0?"hidden":"visible"):a.chain(function(){this.element.setStyle("visibility","hidden");this.callChain()});return this},highlight:function(b,a){if(!a){a=this.retrieve("highlight:original",this.getStyle("background-color"));a=a=="transparent"?"#fff":a}var c=this.get("tween");c.start("background-color",b||"#ffff88",a).chain(function(){this.setStyle("background-color",this.retrieve("highlight:original"));c.callChain()}.bind(this));
+return this}});
+Fx.Morph=new Class({Extends:Fx.CSS,initialize:function(b,a){this.element=this.subject=document.id(b);this.parent(a)},set:function(b){typeof b=="string"&&(b=this.search(b));for(var a in b)this.render(this.element,a,b[a],this.options.unit);return this},compute:function(b,a,c){var d={},e;for(e in b)d[e]=this.parent(b[e],a[e],c);return d},start:function(b){if(!this.check(b))return this;typeof b=="string"&&(b=this.search(b));var a={},c={},d;for(d in b){var e=this.prepare(this.element,d,b[d]);a[d]=e.from;
+c[d]=e.to}return this.parent(a,c)}});Element.Properties.morph={set:function(b){this.get("morph").cancel().setOptions(b);return this},get:function(){var b=this.retrieve("morph");if(!b){b=new Fx.Morph(this,{link:"cancel"});this.store("morph",b)}return b}};Element.implement({morph:function(b){this.get("morph").start(b);return this}});
+Fx.implement({getTransition:function(){var b=this.options.transition||Fx.Transitions.Sine.easeInOut;if(typeof b=="string"){var a=b.split(":"),b=Fx.Transitions,b=b[a[0]]||b[a[0].capitalize()];a[1]&&(b=b["ease"+a[1].capitalize()+(a[2]?a[2].capitalize():"")])}return b}});Fx.Transition=function(b,a){var a=Array.from(a),c=function(c){return b(c,a)};return Object.append(c,{easeIn:c,easeOut:function(c){return 1-b(1-c,a)},easeInOut:function(c){return(c<=0.5?b(2*c,a):2-b(2*(1-c),a))/2}})};Fx.Transitions={linear:function(b){return b}};
+Fx.Transitions.extend=function(b){for(var a in b)Fx.Transitions[a]=new Fx.Transition(b[a])};
+Fx.Transitions.extend({Pow:function(b,a){return Math.pow(b,a&&a[0]||6)},Expo:function(b){return Math.pow(2,8*(b-1))},Circ:function(b){return 1-Math.sin(Math.acos(b))},Sine:function(b){return 1-Math.cos(b*Math.PI/2)},Back:function(b,a){a=a&&a[0]||1.618;return Math.pow(b,2)*((a+1)*b-a)},Bounce:function(b){for(var a,c=0,d=1;;c=c+d,d=d/2)if(b>=(7-4*c)/11){a=d*d-Math.pow((11-6*c-11*b)/4,2);break}return a},Elastic:function(b,a){return Math.pow(2,10*--b)*Math.cos(20*b*Math.PI*(a&&a[0]||1)/3)}});
+["Quad","Cubic","Quart","Quint"].each(function(b,a){Fx.Transitions[b]=new Fx.Transition(function(b){return Math.pow(b,a+2)})});
+(function(){var b=function(){},a="onprogress"in new Browser.Request,c=this.Request=new Class({Implements:[Chain,Events,Options],options:{url:"",data:"",headers:{"X-Requested-With":"XMLHttpRequest",Accept:"text/javascript, text/html, application/xml, text/xml, */*"},async:true,format:false,method:"post",link:"ignore",isSuccess:null,emulation:true,urlEncoded:true,encoding:"utf-8",evalScripts:false,evalResponse:false,timeout:0,noCache:false},initialize:function(a){this.xhr=new Browser.Request;this.setOptions(a);
+this.headers=this.options.headers},onStateChange:function(){var c=this.xhr;if(c.readyState==4&&this.running){this.running=false;this.status=0;Function.attempt(function(){var a=c.status;this.status=a==1223?204:a}.bind(this));c.onreadystatechange=b;if(a)c.onprogress=c.onloadstart=b;clearTimeout(this.timer);this.response={text:this.xhr.responseText||"",xml:this.xhr.responseXML};this.options.isSuccess.call(this,this.status)?this.success(this.response.text,this.response.xml):this.failure()}},isSuccess:function(){var a=
+this.status;return a>=200&&a<300},isRunning:function(){return!!this.running},processScripts:function(a){return this.options.evalResponse||/(ecma|java)script/.test(this.getHeader("Content-type"))?Browser.exec(a):a.stripScripts(this.options.evalScripts)},success:function(a,b){this.onSuccess(this.processScripts(a),b)},onSuccess:function(){this.fireEvent("complete",arguments).fireEvent("success",arguments).callChain()},failure:function(){this.onFailure()},onFailure:function(){this.fireEvent("complete").fireEvent("failure",
+this.xhr)},loadstart:function(a){this.fireEvent("loadstart",[a,this.xhr])},progress:function(a){this.fireEvent("progress",[a,this.xhr])},timeout:function(){this.fireEvent("timeout",this.xhr)},setHeader:function(a,b){this.headers[a]=b;return this},getHeader:function(a){return Function.attempt(function(){return this.xhr.getResponseHeader(a)}.bind(this))},check:function(){if(!this.running)return true;switch(this.options.link){case "cancel":this.cancel();return true;case "chain":this.chain(this.caller.pass(arguments,
+this))}return false},send:function(b){if(!this.check(b))return this;this.options.isSuccess=this.options.isSuccess||this.isSuccess;this.running=true;var c=typeOf(b);if(c=="string"||c=="element")b={data:b};var c=this.options,b=Object.append({data:c.data,url:c.url,method:c.method},b),c=b.data,d=""+b.url,b=b.method.toLowerCase();switch(typeOf(c)){case "element":c=document.id(c).toQueryString();break;case "object":case "hash":c=Object.toQueryString(c)}if(this.options.format)var i="format="+this.options.format,
+c=c?i+"&"+c:i;if(this.options.emulation&&!["get","post"].contains(b)){b="_method="+b;c=c?b+"&"+c:b;b="post"}this.options.urlEncoded&&["post","put"].contains(b)&&(this.headers["Content-type"]="application/x-www-form-urlencoded"+(this.options.encoding?"; charset="+this.options.encoding:""));if(!d)d=document.location.pathname;i=d.lastIndexOf("/");if(i>-1&&(i=d.indexOf("#"))>-1)d=d.substr(0,i);this.options.noCache&&(d=d+((d.contains("?")?"&":"?")+String.uniqueID()));if(c&&b=="get"){d=d+((d.contains("?")?
+"&":"?")+c);c=null}var j=this.xhr;if(a){j.onloadstart=this.loadstart.bind(this);j.onprogress=this.progress.bind(this)}j.open(b.toUpperCase(),d,this.options.async,this.options.user,this.options.password);if(this.options.user&&"withCredentials"in j)j.withCredentials=true;j.onreadystatechange=this.onStateChange.bind(this);Object.each(this.headers,function(a,b){try{j.setRequestHeader(b,a)}catch(c){this.fireEvent("exception",[b,a])}},this);this.fireEvent("request");j.send(c);if(this.options.async){if(this.options.timeout)this.timer=
+this.timeout.delay(this.options.timeout,this)}else this.onStateChange();return this},cancel:function(){if(!this.running)return this;this.running=false;var c=this.xhr;c.abort();clearTimeout(this.timer);c.onreadystatechange=b;if(a)c.onprogress=c.onloadstart=b;this.xhr=new Browser.Request;this.fireEvent("cancel");return this}}),d={};["get","post","put","delete","GET","POST","PUT","DELETE"].each(function(a){d[a]=function(b){var c={method:a};if(b!=null)c.data=b;return this.send(c)}});c.implement(d);Element.Properties.send=
+{set:function(a){this.get("send").cancel().setOptions(a);return this},get:function(){var a=this.retrieve("send");if(!a){a=new c({data:this,link:"cancel",method:this.get("method")||"post",url:this.get("action")});this.store("send",a)}return a}};Element.implement({send:function(a){var b=this.get("send");b.send({data:this,url:a||b.options.url});return this}})})();
+Request.HTML=new Class({Extends:Request,options:{update:!1,append:!1,evalScripts:!0,filter:!1,headers:{Accept:"text/html, application/xml, text/xml, */*"}},success:function(b){var a=this.options,c=this.response;c.html=b.stripScripts(function(a){c.javascript=a});if(b=c.html.match(/<body[^>]*>([\s\S]*?)<\/body>/i))c.html=b[1];b=(new Element("div")).set("html",c.html);c.tree=b.childNodes;c.elements=b.getElements(a.filter||"*");if(a.filter)c.tree=c.elements;if(a.update){b=document.id(a.update).empty();
+a.filter?b.adopt(c.elements):b.set("html",c.html)}else if(a.append){var d=document.id(a.append);a.filter?c.elements.reverse().inject(d):d.adopt(b.getChildren())}a.evalScripts&&Browser.exec(c.javascript);this.onSuccess(c.tree,c.elements,c.html,c.javascript)}});Element.Properties.load={set:function(b){this.get("load").cancel().setOptions(b);return this},get:function(){var b=this.retrieve("load");if(!b){b=new Request.HTML({data:this,link:"cancel",update:this,method:"get"});this.store("load",b)}return b}};
+Element.implement({load:function(){this.get("load").send(Array.link(arguments,{data:Type.isObject,url:Type.isString}));return this}});"undefined"==typeof JSON&&(this.JSON={});
+(function(){var b={"\u0008":"\\b","\t":"\\t","\n":"\\n","\u000c":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},a=function(a){return b[a]||"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)};JSON.validate=function(a){a=a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"");return/^[\],:{}\s]*$/.test(a)};JSON.encode=JSON.stringify?function(a){return JSON.stringify(a)}:function(b){b&&b.toJSON&&
+(b=b.toJSON());switch(typeOf(b)){case "string":return'"'+b.replace(/[\x00-\x1f\\"]/g,a)+'"';case "array":return"["+b.map(JSON.encode).clean()+"]";case "object":case "hash":var d=[];Object.each(b,function(a,b){var c=JSON.encode(a);c&&d.push(JSON.encode(b)+":"+c)});return"{"+d+"}";case "number":case "boolean":return""+b;case "null":return"null"}return null};JSON.decode=function(a,b){if(!a||typeOf(a)!="string")return null;if(b||JSON.secure){if(JSON.parse)return JSON.parse(a);if(!JSON.validate(a))throw Error("JSON could not decode the input; security is enabled and the value is not secure.");
+}return eval("("+a+")")}})();Request.JSON=new Class({Extends:Request,options:{secure:!0},initialize:function(b){this.parent(b);Object.append(this.headers,{Accept:"application/json","X-Request":"JSON"})},success:function(b){var a;try{a=this.response.json=JSON.decode(b,this.options.secure)}catch(c){this.fireEvent("error",[b,c]);return}if(a==null)this.onFailure();else this.onSuccess(a,b)}});
+var Cookie=new Class({Implements:Options,options:{path:"/",domain:!1,duration:!1,secure:!1,document:document,encode:!0},initialize:function(b,a){this.key=b;this.setOptions(a)},write:function(b){this.options.encode&&(b=encodeURIComponent(b));this.options.domain&&(b=b+("; domain="+this.options.domain));this.options.path&&(b=b+("; path="+this.options.path));if(this.options.duration){var a=new Date;a.setTime(a.getTime()+this.options.duration*864E5);b=b+("; expires="+a.toGMTString())}this.options.secure&&
+(b=b+"; secure");this.options.document.cookie=this.key+"="+b;return this},read:function(){var b=this.options.document.cookie.match("(?:^|;)\\s*"+this.key.escapeRegExp()+"=([^;]*)");return b?decodeURIComponent(b[1]):null},dispose:function(){(new Cookie(this.key,Object.merge({},this.options,{duration:-1}))).write("");return this}});Cookie.write=function(b,a,c){return(new Cookie(b,c)).write(a)};Cookie.read=function(b){return(new Cookie(b)).read()};Cookie.dispose=function(b,a){return(new Cookie(b,a)).dispose()};
+(function(b,a){var c,d,e=[],f,g,i=a.createElement("div"),j=function(){clearTimeout(g);if(!c){Browser.loaded=c=true;a.removeListener("DOMContentLoaded",j).removeListener("readystatechange",m);a.fireEvent("domready");b.fireEvent("domready")}},m=function(){for(var a=e.length;a--;)if(e[a]()){j();return true}return false},h=function(){clearTimeout(g);m()||(g=setTimeout(h,10))};a.addListener("DOMContentLoaded",j);var k=function(){try{i.doScroll();return true}catch(a){}return false};if(i.doScroll&&!k()){e.push(k);
+f=true}a.readyState&&e.push(function(){var b=a.readyState;return b=="loaded"||b=="complete"});"onreadystatechange"in a?a.addListener("readystatechange",m):f=true;f&&h();Element.Events.domready={onAdd:function(a){c&&a.call(this)}};Element.Events.load={base:"load",onAdd:function(a){d&&this==b&&a.call(this)},condition:function(){if(this==b){j();delete Element.Events.load}return true}};b.addEvent("load",function(){d=true})})(window,document);
+(function(){var b=this.Swiff=new Class({Implements:Options,options:{id:null,height:1,width:1,container:null,properties:{},params:{quality:"high",allowScriptAccess:"always",wMode:"window",swLiveConnect:true},callBacks:{},vars:{}},toElement:function(){return this.object},initialize:function(a,c){this.instance="Swiff_"+String.uniqueID();this.setOptions(c);var c=this.options,d=this.id=c.id||this.instance,e=document.id(c.container);b.CallBacks[this.instance]={};var f=c.params,g=c.vars,i=c.callBacks,j=
+Object.append({height:c.height,width:c.width},c.properties),m=this,h;for(h in i){b.CallBacks[this.instance][h]=function(a){return function(){return a.apply(m.object,arguments)}}(i[h]);g[h]="Swiff.CallBacks."+this.instance+"."+h}f.flashVars=Object.toQueryString(g);if(Browser.ie){j.classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";f.movie=a}else j.type="application/x-shockwave-flash";j.data=a;var d='<object id="'+d+'"',k;for(k in j)d=d+(" "+k+'="'+j[k]+'"');var d=d+">",o;for(o in f)f[o]&&(d=d+('<param name="'+
+o+'" value="'+f[o]+'" />'));this.object=(e?e.empty():new Element("div")).set("html",d+"</object>").firstChild},replaces:function(a){a=document.id(a,true);a.parentNode.replaceChild(this.toElement(),a);return this},inject:function(a){document.id(a,true).appendChild(this.toElement());return this},remote:function(){return b.remote.apply(b,[this.toElement()].append(arguments))}});b.CallBacks={};b.remote=function(a,b){var d=a.CallFunction('<invoke name="'+b+'" returntype="javascript">'+__flash__argumentsToXML(arguments,
+2)+"</invoke>");return eval(d)}})();
\ No newline at end of file
diff --git a/core/media/system/js/mootools-more-uncompressed.js b/core/media/system/js/mootools-more-uncompressed.js
new file mode 100644
index 00000000..2f8db409
--- /dev/null
+++ b/core/media/system/js/mootools-more-uncompressed.js
@@ -0,0 +1,13373 @@
+// MooTools: the javascript framework.
+// Load this file's selection again by visiting: http://mootools.net/more/065f2f092ece4e3b32bb5214464cf926 
+// Or build this file again with packager using: packager build More/More More/Events.Pseudos More/Class.Refactor More/Class.Binds More/Class.Occlude More/Chain.Wait More/Array.Extras More/Date More/Date.Extras More/Number.Format More/Object.Extras More/String.Extras More/String.QueryString More/URI More/URI.Relative More/Hash More/Hash.Extras More/Element.Forms More/Elements.From More/Element.Event.Pseudos More/Element.Event.Pseudos.Keys More/Element.Measure More/Element.Pin More/Element.Position More/Element.Shortcuts More/Form.Request More/Form.Request.Append More/Form.Validator More/Form.Validator.Inline More/Form.Validator.Extras More/OverText More/Fx.Elements More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Scroll More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag More/Drag.Move More/Slider More/Sortables More/Request.JSONP More/Request.Queue More/Request.Periodical More/Assets More/Color More/Group More/Hash.Cookie More/IframeShim More/Table More/HtmlTable More/HtmlTable.Zebra More/HtmlTable.Sort More/HtmlTable.Select More/Keyboard More/Keyboard.Extras More/Mask More/Scroller More/Tips More/Spinner More/Locale More/Locale.Set.From More/Locale.en-US.Date More/Locale.en-US.Form.Validator More/Locale.en-US.Number More/Locale.ar.Date More/Locale.ar.Form.Validator More/Locale.ca-CA.Date More/Locale.ca-CA.Form.Validator More/Locale.cs-CZ.Date More/Locale.cs-CZ.Form.Validator More/Locale.da-DK.Date More/Locale.da-DK.Form.Validator More/Locale.de-CH.Date More/Locale.de-CH.Form.Validator More/Locale.de-DE.Date More/Locale.de-DE.Form.Validator More/Locale.de-DE.Number More/Locale.en-GB.Date More/Locale.es-AR.Date More/Locale.es-AR.Form.Validator More/Locale.es-ES.Date More/Locale.es-ES.Form.Validator More/Locale.et-EE.Date More/Locale.et-EE.Form.Validator More/Locale.EU.Number More/Locale.fa.Date More/Locale.fa.Form.Validator More/Locale.fi-FI.Date More/Locale.fi-FI.Form.Validator More/Locale.fi-FI.Number More/Locale.fr-FR.Date More/Locale.fr-FR.Form.Validator More/Locale.fr-FR.Number More/Locale.he-IL.Date More/Locale.he-IL.Form.Validator More/Locale.he-IL.Number More/Locale.hu-HU.Date More/Locale.hu-HU.Form.Validator More/Locale.it-IT.Date More/Locale.it-IT.Form.Validator More/Locale.ja-JP.Date More/Locale.ja-JP.Form.Validator More/Locale.ja-JP.Number More/Locale.nl-NL.Date More/Locale.nl-NL.Form.Validator More/Locale.nl-NL.Number More/Locale.no-NO.Date More/Locale.no-NO.Form.Validator More/Locale.pl-PL.Date More/Locale.pl-PL.Form.Validator More/Locale.pt-BR.Date More/Locale.pt-BR.Form.Validator More/Locale.pt-PT.Date More/Locale.pt-PT.Form.Validator More/Locale.ru-RU-unicode.Date More/Locale.ru-RU-unicode.Form.Validator More/Locale.si-SI.Date More/Locale.si-SI.Form.Validator More/Locale.sv-SE.Date More/Locale.sv-SE.Form.Validator More/Locale.uk-UA.Date More/Locale.uk-UA.Form.Validator More/Locale.zh-CH.Date More/Locale.zh-CH.Form.Validator
+/*
+---
+
+script: More.js
+
+name: More
+
+description: MooTools More
+
+license: MIT-style license
+
+authors:
+  - Guillermo Rauch
+  - Thomas Aylott
+  - Scott Kyle
+  - Arian Stolwijk
+  - Tim Wienk
+  - Christoph Pojer
+  - Aaron Newton
+  - Jacob Thornton
+
+requires:
+  - Core/MooTools
+
+provides: [MooTools.More]
+
+...
+*/
+
+MooTools.More = {
+	'version': '1.4.0.1',
+	'build': 'a4244edf2aa97ac8a196fc96082dd35af1abab87'
+};
+
+
+/*
+---
+
+name: Events.Pseudos
+
+description: Adds the functionality to add pseudo events
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires: [Core/Class.Extras, Core/Slick.Parser, More/MooTools.More]
+
+provides: [Events.Pseudos]
+
+...
+*/
+
+(function(){
+
+Events.Pseudos = function(pseudos, addEvent, removeEvent){
+
+	var storeKey = '_monitorEvents:';
+
+	var storageOf = function(object){
+		return {
+			store: object.store ? function(key, value){
+				object.store(storeKey + key, value);
+			} : function(key, value){
+				(object._monitorEvents || (object._monitorEvents = {}))[key] = value;
+			},
+			retrieve: object.retrieve ? function(key, dflt){
+				return object.retrieve(storeKey + key, dflt);
+			} : function(key, dflt){
+				if (!object._monitorEvents) return dflt;
+				return object._monitorEvents[key] || dflt;
+			}
+		};
+	};
+
+	var splitType = function(type){
+		if (type.indexOf(':') == -1 || !pseudos) return null;
+
+		var parsed = Slick.parse(type).expressions[0][0],
+			parsedPseudos = parsed.pseudos,
+			l = parsedPseudos.length,
+			splits = [];
+
+		while (l--){
+			var pseudo = parsedPseudos[l].key,
+				listener = pseudos[pseudo];
+			if (listener != null) splits.push({
+				event: parsed.tag,
+				value: parsedPseudos[l].value,
+				pseudo: pseudo,
+				original: type,
+				listener: listener
+			});
+		}
+		return splits.length ? splits : null;
+	};
+
+	return {
+
+		addEvent: function(type, fn, internal){
+			var split = splitType(type);
+			if (!split) return addEvent.call(this, type, fn, internal);
+
+			var storage = storageOf(this),
+				events = storage.retrieve(type, []),
+				eventType = split[0].event,
+				args = Array.slice(arguments, 2),
+				stack = fn,
+				self = this;
+
+			split.each(function(item){
+				var listener = item.listener,
+					stackFn = stack;
+				if (listener == false) eventType += ':' + item.pseudo + '(' + item.value + ')';
+				else stack = function(){
+					listener.call(self, item, stackFn, arguments, stack);
+				};
+			});
+
+			events.include({type: eventType, event: fn, monitor: stack});
+			storage.store(type, events);
+
+			if (type != eventType) addEvent.apply(this, [type, fn].concat(args));
+			return addEvent.apply(this, [eventType, stack].concat(args));
+		},
+
+		removeEvent: function(type, fn){
+			var split = splitType(type);
+			if (!split) return removeEvent.call(this, type, fn);
+
+			var storage = storageOf(this),
+				events = storage.retrieve(type);
+			if (!events) return this;
+
+			var args = Array.slice(arguments, 2);
+
+			removeEvent.apply(this, [type, fn].concat(args));
+			events.each(function(monitor, i){
+				if (!fn || monitor.event == fn) removeEvent.apply(this, [monitor.type, monitor.monitor].concat(args));
+				delete events[i];
+			}, this);
+
+			storage.store(type, events);
+			return this;
+		}
+
+	};
+
+};
+
+var pseudos = {
+
+	once: function(split, fn, args, monitor){
+		fn.apply(this, args);
+		this.removeEvent(split.event, monitor)
+			.removeEvent(split.original, fn);
+	},
+
+	throttle: function(split, fn, args){
+		if (!fn._throttled){
+			fn.apply(this, args);
+			fn._throttled = setTimeout(function(){
+				fn._throttled = false;
+			}, split.value || 250);
+		}
+	},
+
+	pause: function(split, fn, args){
+		clearTimeout(fn._pause);
+		fn._pause = fn.delay(split.value || 250, this, args);
+	}
+
+};
+
+Events.definePseudo = function(key, listener){
+	pseudos[key] = listener;
+	return this;
+};
+
+Events.lookupPseudo = function(key){
+	return pseudos[key];
+};
+
+var proto = Events.prototype;
+Events.implement(Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
+
+['Request', 'Fx'].each(function(klass){
+	if (this[klass]) this[klass].implement(Events.prototype);
+});
+
+})();
+
+
+/*
+---
+
+script: Class.Refactor.js
+
+name: Class.Refactor
+
+description: Extends a class onto itself with new property, preserving any items attached to the class's namespace.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Class
+  - /MooTools.More
+
+# Some modules declare themselves dependent on Class.Refactor
+provides: [Class.refactor, Class.Refactor]
+
+...
+*/
+
+Class.refactor = function(original, refactors){
+
+	Object.each(refactors, function(item, name){
+		var origin = original.prototype[name];
+		origin = (origin && origin.$origin) || origin || function(){};
+		original.implement(name, (typeof item == 'function') ? function(){
+			var old = this.previous;
+			this.previous = origin;
+			var value = item.apply(this, arguments);
+			this.previous = old;
+			return value;
+		} : item);
+	});
+
+	return original;
+
+};
+
+
+/*
+---
+
+script: Class.Binds.js
+
+name: Class.Binds
+
+description: Automagically binds specified methods in a class to the instance of the class.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Class
+  - /MooTools.More
+
+provides: [Class.Binds]
+
+...
+*/
+
+Class.Mutators.Binds = function(binds){
+	if (!this.prototype.initialize) this.implement('initialize', function(){});
+	return Array.from(binds).concat(this.prototype.Binds || []);
+};
+
+Class.Mutators.initialize = function(initialize){
+	return function(){
+		Array.from(this.Binds).each(function(name){
+			var original = this[name];
+			if (original) this[name] = original.bind(this);
+		}, this);
+		return initialize.apply(this, arguments);
+	};
+};
+
+
+/*
+---
+
+script: Class.Occlude.js
+
+name: Class.Occlude
+
+description: Prevents a class from being applied to a DOM element twice.
+
+license: MIT-style license.
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Class
+  - Core/Element
+  - /MooTools.More
+
+provides: [Class.Occlude]
+
+...
+*/
+
+Class.Occlude = new Class({
+
+	occlude: function(property, element){
+		element = document.id(element || this.element);
+		var instance = element.retrieve(property || this.property);
+		if (instance && !this.occluded)
+			return (this.occluded = instance);
+
+		this.occluded = false;
+		element.store(property || this.property, this);
+		return this.occluded;
+	}
+
+});
+
+
+/*
+---
+
+script: Chain.Wait.js
+
+name: Chain.Wait
+
+description: value, Adds a method to inject pauses between chained events.
+
+license: MIT-style license.
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Chain
+  - Core/Element
+  - Core/Fx
+  - /MooTools.More
+
+provides: [Chain.Wait]
+
+...
+*/
+
+(function(){
+
+	var wait = {
+		wait: function(duration){
+			return this.chain(function(){
+				this.callChain.delay(duration == null ? 500 : duration, this);
+				return this;
+			}.bind(this));
+		}
+	};
+
+	Chain.implement(wait);
+
+	if (this.Fx) Fx.implement(wait);
+
+	if (this.Element && Element.implement && this.Fx){
+		Element.implement({
+
+			chains: function(effects){
+				Array.from(effects || ['tween', 'morph', 'reveal']).each(function(effect){
+					effect = this.get(effect);
+					if (!effect) return;
+					effect.setOptions({
+						link:'chain'
+					});
+				}, this);
+				return this;
+			},
+
+			pauseFx: function(duration, effect){
+				this.chains(effect).get(effect || 'tween').wait(duration);
+				return this;
+			}
+
+		});
+	}
+
+})();
+
+
+/*
+---
+
+script: Array.Extras.js
+
+name: Array.Extras
+
+description: Extends the Array native object to include useful methods to work with arrays.
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+  - Sebastian Markbåge
+
+requires:
+  - Core/Array
+  - MooTools.More
+
+provides: [Array.Extras]
+
+...
+*/
+
+(function(nil){
+
+Array.implement({
+
+	min: function(){
+		return Math.min.apply(null, this);
+	},
+
+	max: function(){
+		return Math.max.apply(null, this);
+	},
+
+	average: function(){
+		return this.length ? this.sum() / this.length : 0;
+	},
+
+	sum: function(){
+		var result = 0, l = this.length;
+		if (l){
+			while (l--) result += this[l];
+		}
+		return result;
+	},
+
+	unique: function(){
+		return [].combine(this);
+	},
+
+	shuffle: function(){
+		for (var i = this.length; i && --i;){
+			var temp = this[i], r = Math.floor(Math.random() * ( i + 1 ));
+			this[i] = this[r];
+			this[r] = temp;
+		}
+		return this;
+	},
+
+	reduce: function(fn, value){
+		for (var i = 0, l = this.length; i < l; i++){
+			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
+		}
+		return value;
+	},
+
+	reduceRight: function(fn, value){
+		var i = this.length;
+		while (i--){
+			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
+		}
+		return value;
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: Object.Extras.js
+
+name: Object.Extras
+
+description: Extra Object generics, like getFromPath which allows a path notation to child elements.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Object
+  - /MooTools.More
+
+provides: [Object.Extras]
+
+...
+*/
+
+(function(){
+
+var defined = function(value){
+	return value != null;
+};
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+Object.extend({
+
+	getFromPath: function(source, parts){
+		if (typeof parts == 'string') parts = parts.split('.');
+		for (var i = 0, l = parts.length; i < l; i++){
+			if (hasOwnProperty.call(source, parts[i])) source = source[parts[i]];
+			else return null;
+		}
+		return source;
+	},
+
+	cleanValues: function(object, method){
+		method = method || defined;
+		for (var key in object) if (!method(object[key])){
+			delete object[key];
+		}
+		return object;
+	},
+
+	erase: function(object, key){
+		if (hasOwnProperty.call(object, key)) delete object[key];
+		return object;
+	},
+
+	run: function(object){
+		var args = Array.slice(arguments, 1);
+		for (var key in object) if (object[key].apply){
+			object[key].apply(object, args);
+		}
+		return object;
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: Locale.js
+
+name: Locale
+
+description: Provides methods for localization.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Arian Stolwijk
+
+requires:
+  - Core/Events
+  - /Object.Extras
+  - /MooTools.More
+
+provides: [Locale, Lang]
+
+...
+*/
+
+(function(){
+
+var current = null,
+	locales = {},
+	inherits = {};
+
+var getSet = function(set){
+	if (instanceOf(set, Locale.Set)) return set;
+	else return locales[set];
+};
+
+var Locale = this.Locale = {
+
+	define: function(locale, set, key, value){
+		var name;
+		if (instanceOf(locale, Locale.Set)){
+			name = locale.name;
+			if (name) locales[name] = locale;
+		} else {
+			name = locale;
+			if (!locales[name]) locales[name] = new Locale.Set(name);
+			locale = locales[name];
+		}
+
+		if (set) locale.define(set, key, value);
+
+		
+
+		if (!current) current = locale;
+
+		return locale;
+	},
+
+	use: function(locale){
+		locale = getSet(locale);
+
+		if (locale){
+			current = locale;
+
+			this.fireEvent('change', locale);
+
+			
+		}
+
+		return this;
+	},
+
+	getCurrent: function(){
+		return current;
+	},
+
+	get: function(key, args){
+		return (current) ? current.get(key, args) : '';
+	},
+
+	inherit: function(locale, inherits, set){
+		locale = getSet(locale);
+
+		if (locale) locale.inherit(inherits, set);
+		return this;
+	},
+
+	list: function(){
+		return Object.keys(locales);
+	}
+
+};
+
+Object.append(Locale, new Events);
+
+Locale.Set = new Class({
+
+	sets: {},
+
+	inherits: {
+		locales: [],
+		sets: {}
+	},
+
+	initialize: function(name){
+		this.name = name || '';
+	},
+
+	define: function(set, key, value){
+		var defineData = this.sets[set];
+		if (!defineData) defineData = {};
+
+		if (key){
+			if (typeOf(key) == 'object') defineData = Object.merge(defineData, key);
+			else defineData[key] = value;
+		}
+		this.sets[set] = defineData;
+
+		return this;
+	},
+
+	get: function(key, args, _base){
+		var value = Object.getFromPath(this.sets, key);
+		if (value != null){
+			var type = typeOf(value);
+			if (type == 'function') value = value.apply(null, Array.from(args));
+			else if (type == 'object') value = Object.clone(value);
+			return value;
+		}
+
+		// get value of inherited locales
+		var index = key.indexOf('.'),
+			set = index < 0 ? key : key.substr(0, index),
+			names = (this.inherits.sets[set] || []).combine(this.inherits.locales).include('en-US');
+		if (!_base) _base = [];
+
+		for (var i = 0, l = names.length; i < l; i++){
+			if (_base.contains(names[i])) continue;
+			_base.include(names[i]);
+
+			var locale = locales[names[i]];
+			if (!locale) continue;
+
+			value = locale.get(key, args, _base);
+			if (value != null) return value;
+		}
+
+		return '';
+	},
+
+	inherit: function(names, set){
+		names = Array.from(names);
+
+		if (set && !this.inherits.sets[set]) this.inherits.sets[set] = [];
+
+		var l = names.length;
+		while (l--) (set ? this.inherits.sets[set] : this.inherits.locales).unshift(names[l]);
+
+		return this;
+	}
+
+});
+
+
+
+})();
+
+
+/*
+---
+
+name: Locale.en-US.Date
+
+description: Date messages for US English.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Locale
+
+provides: [Locale.en-US.Date]
+
+...
+*/
+
+Locale.define('en-US', 'Date', {
+
+	months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+	months_abbr: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+	days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+	days_abbr: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['month', 'date', 'year'],
+	shortDate: '%m/%d/%Y',
+	shortTime: '%I:%M%p',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		// 1st, 2nd, 3rd, etc.
+		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'th' : ['th', 'st', 'nd', 'rd', 'th'][Math.min(dayOfMonth % 10, 4)];
+	},
+
+	lessThanMinuteAgo: 'less than a minute ago',
+	minuteAgo: 'about a minute ago',
+	minutesAgo: '{delta} minutes ago',
+	hourAgo: 'about an hour ago',
+	hoursAgo: 'about {delta} hours ago',
+	dayAgo: '1 day ago',
+	daysAgo: '{delta} days ago',
+	weekAgo: '1 week ago',
+	weeksAgo: '{delta} weeks ago',
+	monthAgo: '1 month ago',
+	monthsAgo: '{delta} months ago',
+	yearAgo: '1 year ago',
+	yearsAgo: '{delta} years ago',
+
+	lessThanMinuteUntil: 'less than a minute from now',
+	minuteUntil: 'about a minute from now',
+	minutesUntil: '{delta} minutes from now',
+	hourUntil: 'about an hour from now',
+	hoursUntil: 'about {delta} hours from now',
+	dayUntil: '1 day from now',
+	daysUntil: '{delta} days from now',
+	weekUntil: '1 week from now',
+	weeksUntil: '{delta} weeks from now',
+	monthUntil: '1 month from now',
+	monthsUntil: '{delta} months from now',
+	yearUntil: '1 year from now',
+	yearsUntil: '{delta} years from now'
+
+});
+
+
+/*
+---
+
+script: Date.js
+
+name: Date
+
+description: Extends the Date native object to include methods useful in managing dates.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Nicholas Barthelemy - https://svn.nbarthelemy.com/date-js/
+  - Harald Kirshner - mail [at] digitarald.de; http://digitarald.de
+  - Scott Kyle - scott [at] appden.com; http://appden.com
+
+requires:
+  - Core/Array
+  - Core/String
+  - Core/Number
+  - MooTools.More
+  - Locale
+  - Locale.en-US.Date
+
+provides: [Date]
+
+...
+*/
+
+(function(){
+
+var Date = this.Date;
+
+var DateMethods = Date.Methods = {
+	ms: 'Milliseconds',
+	year: 'FullYear',
+	min: 'Minutes',
+	mo: 'Month',
+	sec: 'Seconds',
+	hr: 'Hours'
+};
+
+['Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset',
+	'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear',
+	'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds', 'UTCMilliseconds'].each(function(method){
+	Date.Methods[method.toLowerCase()] = method;
+});
+
+var pad = function(n, digits, string){
+	if (digits == 1) return n;
+	return n < Math.pow(10, digits - 1) ? (string || '0') + pad(n, digits - 1, string) : n;
+};
+
+Date.implement({
+
+	set: function(prop, value){
+		prop = prop.toLowerCase();
+		var method = DateMethods[prop] && 'set' + DateMethods[prop];
+		if (method && this[method]) this[method](value);
+		return this;
+	}.overloadSetter(),
+
+	get: function(prop){
+		prop = prop.toLowerCase();
+		var method = DateMethods[prop] && 'get' + DateMethods[prop];
+		if (method && this[method]) return this[method]();
+		return null;
+	}.overloadGetter(),
+
+	clone: function(){
+		return new Date(this.get('time'));
+	},
+
+	increment: function(interval, times){
+		interval = interval || 'day';
+		times = times != null ? times : 1;
+
+		switch (interval){
+			case 'year':
+				return this.increment('month', times * 12);
+			case 'month':
+				var d = this.get('date');
+				this.set('date', 1).set('mo', this.get('mo') + times);
+				return this.set('date', d.min(this.get('lastdayofmonth')));
+			case 'week':
+				return this.increment('day', times * 7);
+			case 'day':
+				return this.set('date', this.get('date') + times);
+		}
+
+		if (!Date.units[interval]) throw new Error(interval + ' is not a supported interval');
+
+		return this.set('time', this.get('time') + times * Date.units[interval]());
+	},
+
+	decrement: function(interval, times){
+		return this.increment(interval, -1 * (times != null ? times : 1));
+	},
+
+	isLeapYear: function(){
+		return Date.isLeapYear(this.get('year'));
+	},
+
+	clearTime: function(){
+		return this.set({hr: 0, min: 0, sec: 0, ms: 0});
+	},
+
+	diff: function(date, resolution){
+		if (typeOf(date) == 'string') date = Date.parse(date);
+
+		return ((date - this) / Date.units[resolution || 'day'](3, 3)).round(); // non-leap year, 30-day month
+	},
+
+	getLastDayOfMonth: function(){
+		return Date.daysInMonth(this.get('mo'), this.get('year'));
+	},
+
+	getDayOfYear: function(){
+		return (Date.UTC(this.get('year'), this.get('mo'), this.get('date') + 1)
+			- Date.UTC(this.get('year'), 0, 1)) / Date.units.day();
+	},
+
+	setDay: function(day, firstDayOfWeek){
+		if (firstDayOfWeek == null){
+			firstDayOfWeek = Date.getMsg('firstDayOfWeek');
+			if (firstDayOfWeek === '') firstDayOfWeek = 1;
+		}
+
+		day = (7 + Date.parseDay(day, true) - firstDayOfWeek) % 7;
+		var currentDay = (7 + this.get('day') - firstDayOfWeek) % 7;
+
+		return this.increment('day', day - currentDay);
+	},
+
+	getWeek: function(firstDayOfWeek){
+		if (firstDayOfWeek == null){
+			firstDayOfWeek = Date.getMsg('firstDayOfWeek');
+			if (firstDayOfWeek === '') firstDayOfWeek = 1;
+		}
+
+		var date = this,
+			dayOfWeek = (7 + date.get('day') - firstDayOfWeek) % 7,
+			dividend = 0,
+			firstDayOfYear;
+
+		if (firstDayOfWeek == 1){
+			// ISO-8601, week belongs to year that has the most days of the week (i.e. has the thursday of the week)
+			var month = date.get('month'),
+				startOfWeek = date.get('date') - dayOfWeek;
+
+			if (month == 11 && startOfWeek > 28) return 1; // Week 1 of next year
+
+			if (month == 0 && startOfWeek < -2){
+				// Use a date from last year to determine the week
+				date = new Date(date).decrement('day', dayOfWeek);
+				dayOfWeek = 0;
+			}
+
+			firstDayOfYear = new Date(date.get('year'), 0, 1).get('day') || 7;
+			if (firstDayOfYear > 4) dividend = -7; // First week of the year is not week 1
+		} else {
+			// In other cultures the first week of the year is always week 1 and the last week always 53 or 54.
+			// Days in the same week can have a different weeknumber if the week spreads across two years.
+			firstDayOfYear = new Date(date.get('year'), 0, 1).get('day');
+		}
+
+		dividend += date.get('dayofyear');
+		dividend += 6 - dayOfWeek; // Add days so we calculate the current date's week as a full week
+		dividend += (7 + firstDayOfYear - firstDayOfWeek) % 7; // Make up for first week of the year not being a full week
+
+		return (dividend / 7);
+	},
+
+	getOrdinal: function(day){
+		return Date.getMsg('ordinal', day || this.get('date'));
+	},
+
+	getTimezone: function(){
+		return this.toString()
+			.replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/, '$1')
+			.replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, '$1$2$3');
+	},
+
+	getGMTOffset: function(){
+		var off = this.get('timezoneOffset');
+		return ((off > 0) ? '-' : '+') + pad((off.abs() / 60).floor(), 2) + pad(off % 60, 2);
+	},
+
+	setAMPM: function(ampm){
+		ampm = ampm.toUpperCase();
+		var hr = this.get('hr');
+		if (hr > 11 && ampm == 'AM') return this.decrement('hour', 12);
+		else if (hr < 12 && ampm == 'PM') return this.increment('hour', 12);
+		return this;
+	},
+
+	getAMPM: function(){
+		return (this.get('hr') < 12) ? 'AM' : 'PM';
+	},
+
+	parse: function(str){
+		this.set('time', Date.parse(str));
+		return this;
+	},
+
+	isValid: function(date){
+		if (!date) date = this;
+		return typeOf(date) == 'date' && !isNaN(date.valueOf());
+	},
+
+	format: function(format){
+		if (!this.isValid()) return 'invalid date';
+
+		if (!format) format = '%x %X';
+		if (typeof format == 'string') format = formats[format.toLowerCase()] || format;
+		if (typeof format == 'function') return format(this);
+
+		var d = this;
+		return format.replace(/%([a-z%])/gi,
+			function($0, $1){
+				switch ($1){
+					case 'a': return Date.getMsg('days_abbr')[d.get('day')];
+					case 'A': return Date.getMsg('days')[d.get('day')];
+					case 'b': return Date.getMsg('months_abbr')[d.get('month')];
+					case 'B': return Date.getMsg('months')[d.get('month')];
+					case 'c': return d.format('%a %b %d %H:%M:%S %Y');
+					case 'd': return pad(d.get('date'), 2);
+					case 'e': return pad(d.get('date'), 2, ' ');
+					case 'H': return pad(d.get('hr'), 2);
+					case 'I': return pad((d.get('hr') % 12) || 12, 2);
+					case 'j': return pad(d.get('dayofyear'), 3);
+					case 'k': return pad(d.get('hr'), 2, ' ');
+					case 'l': return pad((d.get('hr') % 12) || 12, 2, ' ');
+					case 'L': return pad(d.get('ms'), 3);
+					case 'm': return pad((d.get('mo') + 1), 2);
+					case 'M': return pad(d.get('min'), 2);
+					case 'o': return d.get('ordinal');
+					case 'p': return Date.getMsg(d.get('ampm'));
+					case 's': return Math.round(d / 1000);
+					case 'S': return pad(d.get('seconds'), 2);
+					case 'T': return d.format('%H:%M:%S');
+					case 'U': return pad(d.get('week'), 2);
+					case 'w': return d.get('day');
+					case 'x': return d.format(Date.getMsg('shortDate'));
+					case 'X': return d.format(Date.getMsg('shortTime'));
+					case 'y': return d.get('year').toString().substr(2);
+					case 'Y': return d.get('year');
+					case 'z': return d.get('GMTOffset');
+					case 'Z': return d.get('Timezone');
+				}
+				return $1;
+			}
+		);
+	},
+
+	toISOString: function(){
+		return this.format('iso8601');
+	}
+
+}).alias({
+	toJSON: 'toISOString',
+	compare: 'diff',
+	strftime: 'format'
+});
+
+// The day and month abbreviations are standardized, so we cannot use simply %a and %b because they will get localized
+var rfcDayAbbr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+	rfcMonthAbbr = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+var formats = {
+	db: '%Y-%m-%d %H:%M:%S',
+	compact: '%Y%m%dT%H%M%S',
+	'short': '%d %b %H:%M',
+	'long': '%B %d, %Y %H:%M',
+	rfc822: function(date){
+		return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %Z');
+	},
+	rfc2822: function(date){
+		return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %z');
+	},
+	iso8601: function(date){
+		return (
+			date.getUTCFullYear() + '-' +
+			pad(date.getUTCMonth() + 1, 2) + '-' +
+			pad(date.getUTCDate(), 2) + 'T' +
+			pad(date.getUTCHours(), 2) + ':' +
+			pad(date.getUTCMinutes(), 2) + ':' +
+			pad(date.getUTCSeconds(), 2) + '.' +
+			pad(date.getUTCMilliseconds(), 3) + 'Z'
+		);
+	}
+};
+
+var parsePatterns = [],
+	nativeParse = Date.parse;
+
+var parseWord = function(type, word, num){
+	var ret = -1,
+		translated = Date.getMsg(type + 's');
+	switch (typeOf(word)){
+		case 'object':
+			ret = translated[word.get(type)];
+			break;
+		case 'number':
+			ret = translated[word];
+			if (!ret) throw new Error('Invalid ' + type + ' index: ' + word);
+			break;
+		case 'string':
+			var match = translated.filter(function(name){
+				return this.test(name);
+			}, new RegExp('^' + word, 'i'));
+			if (!match.length) throw new Error('Invalid ' + type + ' string');
+			if (match.length > 1) throw new Error('Ambiguous ' + type);
+			ret = match[0];
+	}
+
+	return (num) ? translated.indexOf(ret) : ret;
+};
+
+var startCentury = 1900,
+	startYear = 70;
+
+Date.extend({
+
+	getMsg: function(key, args){
+		return Locale.get('Date.' + key, args);
+	},
+
+	units: {
+		ms: Function.from(1),
+		second: Function.from(1000),
+		minute: Function.from(60000),
+		hour: Function.from(3600000),
+		day: Function.from(86400000),
+		week: Function.from(608400000),
+		month: function(month, year){
+			var d = new Date;
+			return Date.daysInMonth(month != null ? month : d.get('mo'), year != null ? year : d.get('year')) * 86400000;
+		},
+		year: function(year){
+			year = year || new Date().get('year');
+			return Date.isLeapYear(year) ? 31622400000 : 31536000000;
+		}
+	},
+
+	daysInMonth: function(month, year){
+		return [31, Date.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
+	},
+
+	isLeapYear: function(year){
+		return ((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0);
+	},
+
+	parse: function(from){
+		var t = typeOf(from);
+		if (t == 'number') return new Date(from);
+		if (t != 'string') return from;
+		from = from.clean();
+		if (!from.length) return null;
+
+		var parsed;
+		parsePatterns.some(function(pattern){
+			var bits = pattern.re.exec(from);
+			return (bits) ? (parsed = pattern.handler(bits)) : false;
+		});
+
+		if (!(parsed && parsed.isValid())){
+			parsed = new Date(nativeParse(from));
+			if (!(parsed && parsed.isValid())) parsed = new Date(from.toInt());
+		}
+		return parsed;
+	},
+
+	parseDay: function(day, num){
+		return parseWord('day', day, num);
+	},
+
+	parseMonth: function(month, num){
+		return parseWord('month', month, num);
+	},
+
+	parseUTC: function(value){
+		var localDate = new Date(value);
+		var utcSeconds = Date.UTC(
+			localDate.get('year'),
+			localDate.get('mo'),
+			localDate.get('date'),
+			localDate.get('hr'),
+			localDate.get('min'),
+			localDate.get('sec'),
+			localDate.get('ms')
+		);
+		return new Date(utcSeconds);
+	},
+
+	orderIndex: function(unit){
+		return Date.getMsg('dateOrder').indexOf(unit) + 1;
+	},
+
+	defineFormat: function(name, format){
+		formats[name] = format;
+		return this;
+	},
+
+	
+
+	defineParser: function(pattern){
+		parsePatterns.push((pattern.re && pattern.handler) ? pattern : build(pattern));
+		return this;
+	},
+
+	defineParsers: function(){
+		Array.flatten(arguments).each(Date.defineParser);
+		return this;
+	},
+
+	define2DigitYearStart: function(year){
+		startYear = year % 100;
+		startCentury = year - startYear;
+		return this;
+	}
+
+}).extend({
+	defineFormats: Date.defineFormat.overloadSetter()
+});
+
+var regexOf = function(type){
+	return new RegExp('(?:' + Date.getMsg(type).map(function(name){
+		return name.substr(0, 3);
+	}).join('|') + ')[a-z]*');
+};
+
+var replacers = function(key){
+	switch (key){
+		case 'T':
+			return '%H:%M:%S';
+		case 'x': // iso8601 covers yyyy-mm-dd, so just check if month is first
+			return ((Date.orderIndex('month') == 1) ? '%m[-./]%d' : '%d[-./]%m') + '([-./]%y)?';
+		case 'X':
+			return '%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?';
+	}
+	return null;
+};
+
+var keys = {
+	d: /[0-2]?[0-9]|3[01]/,
+	H: /[01]?[0-9]|2[0-3]/,
+	I: /0?[1-9]|1[0-2]/,
+	M: /[0-5]?\d/,
+	s: /\d+/,
+	o: /[a-z]*/,
+	p: /[ap]\.?m\.?/,
+	y: /\d{2}|\d{4}/,
+	Y: /\d{4}/,
+	z: /Z|[+-]\d{2}(?::?\d{2})?/
+};
+
+keys.m = keys.I;
+keys.S = keys.M;
+
+var currentLanguage;
+
+var recompile = function(language){
+	currentLanguage = language;
+
+	keys.a = keys.A = regexOf('days');
+	keys.b = keys.B = regexOf('months');
+
+	parsePatterns.each(function(pattern, i){
+		if (pattern.format) parsePatterns[i] = build(pattern.format);
+	});
+};
+
+var build = function(format){
+	if (!currentLanguage) return {format: format};
+
+	var parsed = [];
+	var re = (format.source || format) // allow format to be regex
+	 .replace(/%([a-z])/gi,
+		function($0, $1){
+			return replacers($1) || $0;
+		}
+	).replace(/\((?!\?)/g, '(?:') // make all groups non-capturing
+	 .replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas
+	 .replace(/%([a-z%])/gi,
+		function($0, $1){
+			var p = keys[$1];
+			if (!p) return $1;
+			parsed.push($1);
+			return '(' + p.source + ')';
+		}
+	).replace(/\[a-z\]/gi, '[a-z\\u00c0-\\uffff;\&]'); // handle unicode words
+
+	return {
+		format: format,
+		re: new RegExp('^' + re + '$', 'i'),
+		handler: function(bits){
+			bits = bits.slice(1).associate(parsed);
+			var date = new Date().clearTime(),
+				year = bits.y || bits.Y;
+
+			if (year != null) handle.call(date, 'y', year); // need to start in the right year
+			if ('d' in bits) handle.call(date, 'd', 1);
+			if ('m' in bits || bits.b || bits.B) handle.call(date, 'm', 1);
+
+			for (var key in bits) handle.call(date, key, bits[key]);
+			return date;
+		}
+	};
+};
+
+var handle = function(key, value){
+	if (!value) return this;
+
+	switch (key){
+		case 'a': case 'A': return this.set('day', Date.parseDay(value, true));
+		case 'b': case 'B': return this.set('mo', Date.parseMonth(value, true));
+		case 'd': return this.set('date', value);
+		case 'H': case 'I': return this.set('hr', value);
+		case 'm': return this.set('mo', value - 1);
+		case 'M': return this.set('min', value);
+		case 'p': return this.set('ampm', value.replace(/\./g, ''));
+		case 'S': return this.set('sec', value);
+		case 's': return this.set('ms', ('0.' + value) * 1000);
+		case 'w': return this.set('day', value);
+		case 'Y': return this.set('year', value);
+		case 'y':
+			value = +value;
+			if (value < 100) value += startCentury + (value < startYear ? 100 : 0);
+			return this.set('year', value);
+		case 'z':
+			if (value == 'Z') value = '+00';
+			var offset = value.match(/([+-])(\d{2}):?(\d{2})?/);
+			offset = (offset[1] + '1') * (offset[2] * 60 + (+offset[3] || 0)) + this.getTimezoneOffset();
+			return this.set('time', this - offset * 60000);
+	}
+
+	return this;
+};
+
+Date.defineParsers(
+	'%Y([-./]%m([-./]%d((T| )%X)?)?)?', // "1999-12-31", "1999-12-31 11:59pm", "1999-12-31 23:59:59", ISO8601
+	'%Y%m%d(T%H(%M%S?)?)?', // "19991231", "19991231T1159", compact
+	'%x( %X)?', // "12/31", "12.31.99", "12-31-1999", "12/31/2008 11:59 PM"
+	'%d%o( %b( %Y)?)?( %X)?', // "31st", "31st December", "31 Dec 1999", "31 Dec 1999 11:59pm"
+	'%b( %d%o)?( %Y)?( %X)?', // Same as above with month and day switched
+	'%Y %b( %d%o( %X)?)?', // Same as above with year coming first
+	'%o %b %d %X %z %Y', // "Thu Oct 22 08:11:23 +0000 2009"
+	'%T', // %H:%M:%S
+	'%H:%M( ?%p)?' // "11:05pm", "11:05 am" and "11:05"
+);
+
+Locale.addEvent('change', function(language){
+	if (Locale.get('Date')) recompile(language);
+}).fireEvent('change', Locale.getCurrent());
+
+})();
+
+
+/*
+---
+
+script: Date.Extras.js
+
+name: Date.Extras
+
+description: Extends the Date native object to include extra methods (on top of those in Date.js).
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Scott Kyle
+
+requires:
+  - /Date
+
+provides: [Date.Extras]
+
+...
+*/
+
+Date.implement({
+
+	timeDiffInWords: function(to){
+		return Date.distanceOfTimeInWords(this, to || new Date);
+	},
+
+	timeDiff: function(to, separator){
+		if (to == null) to = new Date;
+		var delta = ((to - this) / 1000).floor().abs();
+
+		var vals = [],
+			durations = [60, 60, 24, 365, 0],
+			names = ['s', 'm', 'h', 'd', 'y'],
+			value, duration;
+
+		for (var item = 0; item < durations.length; item++){
+			if (item && !delta) break;
+			value = delta;
+			if ((duration = durations[item])){
+				value = (delta % duration);
+				delta = (delta / duration).floor();
+			}
+			vals.unshift(value + (names[item] || ''));
+		}
+
+		return vals.join(separator || ':');
+	}
+
+}).extend({
+
+	distanceOfTimeInWords: function(from, to){
+		return Date.getTimePhrase(((to - from) / 1000).toInt());
+	},
+
+	getTimePhrase: function(delta){
+		var suffix = (delta < 0) ? 'Until' : 'Ago';
+		if (delta < 0) delta *= -1;
+
+		var units = {
+			minute: 60,
+			hour: 60,
+			day: 24,
+			week: 7,
+			month: 52 / 12,
+			year: 12,
+			eon: Infinity
+		};
+
+		var msg = 'lessThanMinute';
+
+		for (var unit in units){
+			var interval = units[unit];
+			if (delta < 1.5 * interval){
+				if (delta > 0.75 * interval) msg = unit;
+				break;
+			}
+			delta /= interval;
+			msg = unit + 's';
+		}
+
+		delta = delta.round();
+		return Date.getMsg(msg + suffix, delta).substitute({delta: delta});
+	}
+
+}).defineParsers(
+
+	{
+		// "today", "tomorrow", "yesterday"
+		re: /^(?:tod|tom|yes)/i,
+		handler: function(bits){
+			var d = new Date().clearTime();
+			switch (bits[0]){
+				case 'tom': return d.increment();
+				case 'yes': return d.decrement();
+				default: return d;
+			}
+		}
+	},
+
+	{
+		// "next Wednesday", "last Thursday"
+		re: /^(next|last) ([a-z]+)$/i,
+		handler: function(bits){
+			var d = new Date().clearTime();
+			var day = d.getDay();
+			var newDay = Date.parseDay(bits[2], true);
+			var addDays = newDay - day;
+			if (newDay <= day) addDays += 7;
+			if (bits[1] == 'last') addDays -= 7;
+			return d.set('date', d.getDate() + addDays);
+		}
+	}
+
+).alias('timeAgoInWords', 'timeDiffInWords');
+
+
+/*
+---
+
+name: Locale.en-US.Number
+
+description: Number messages for US English.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires:
+  - /Locale
+
+provides: [Locale.en-US.Number]
+
+...
+*/
+
+Locale.define('en-US', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+/* 	Commented properties are the defaults for Number.format
+	decimals: 0,
+	precision: 0,
+	scientific: null,
+
+	prefix: null,
+	suffic: null,
+
+	// Negative/Currency/percentage will mixin Number
+	negative: {
+		prefix: '-'
+	},*/
+
+	currency: {
+//		decimals: 2,
+		prefix: '$ '
+	}/*,
+
+	percentage: {
+		decimals: 2,
+		suffix: '%'
+	}*/
+
+});
+
+
+
+
+/*
+---
+name: Number.Format
+description: Extends the Number Type object to include a number formatting method.
+license: MIT-style license
+authors: [Arian Stolwijk]
+requires: [Core/Number, Locale.en-US.Number]
+# Number.Extras is for compatibility
+provides: [Number.Format, Number.Extras]
+...
+*/
+
+
+Number.implement({
+
+	format: function(options){
+		// Thanks dojo and YUI for some inspiration
+		var value = this;
+		options = options ? Object.clone(options) : {};
+		var getOption = function(key){
+			if (options[key] != null) return options[key];
+			return Locale.get('Number.' + key);
+		};
+
+		var negative = value < 0,
+			decimal = getOption('decimal'),
+			precision = getOption('precision'),
+			group = getOption('group'),
+			decimals = getOption('decimals');
+
+		if (negative){
+			var negativeLocale = getOption('negative') || {};
+			if (negativeLocale.prefix == null && negativeLocale.suffix == null) negativeLocale.prefix = '-';
+			['prefix', 'suffix'].each(function(key){
+				if (negativeLocale[key]) options[key] = getOption(key) + negativeLocale[key];
+			});
+
+			value = -value;
+		}
+
+		var prefix = getOption('prefix'),
+			suffix = getOption('suffix');
+
+		if (decimals !== '' && decimals >= 0 && decimals <= 20) value = value.toFixed(decimals);
+		if (precision >= 1 && precision <= 21) value = (+value).toPrecision(precision);
+
+		value += '';
+		var index;
+		if (getOption('scientific') === false && value.indexOf('e') > -1){
+			var match = value.split('e'),
+				zeros = +match[1];
+			value = match[0].replace('.', '');
+
+			if (zeros < 0){
+				zeros = -zeros - 1;
+				index = match[0].indexOf('.');
+				if (index > -1) zeros -= index - 1;
+				while (zeros--) value = '0' + value;
+				value = '0.' + value;
+			} else {
+				index = match[0].lastIndexOf('.');
+				if (index > -1) zeros -= match[0].length - index - 1;
+				while (zeros--) value += '0';
+			}
+		}
+
+		if (decimal != '.') value = value.replace('.', decimal);
+
+		if (group){
+			index = value.lastIndexOf(decimal);
+			index = (index > -1) ? index : value.length;
+			var newOutput = value.substring(index),
+				i = index;
+
+			while (i--){
+				if ((index - i - 1) % 3 == 0 && i != (index - 1)) newOutput = group + newOutput;
+				newOutput = value.charAt(i) + newOutput;
+			}
+
+			value = newOutput;
+		}
+
+		if (prefix) value = prefix + value;
+		if (suffix) value += suffix;
+
+		return value;
+	},
+
+	formatCurrency: function(decimals){
+		var locale = Locale.get('Number.currency') || {};
+		if (locale.scientific == null) locale.scientific = false;
+		locale.decimals = decimals != null ? decimals
+			: (locale.decimals == null ? 2 : locale.decimals);
+
+		return this.format(locale);
+	},
+
+	formatPercentage: function(decimals){
+		var locale = Locale.get('Number.percentage') || {};
+		if (locale.suffix == null) locale.suffix = '%';
+		locale.decimals = decimals != null ? decimals
+			: (locale.decimals == null ? 2 : locale.decimals);
+
+		return this.format(locale);
+	}
+
+});
+
+
+/*
+---
+
+script: String.Extras.js
+
+name: String.Extras
+
+description: Extends the String native object to include methods useful in managing various kinds of strings (query strings, urls, html, etc).
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Guillermo Rauch
+  - Christopher Pitt
+
+requires:
+  - Core/String
+  - Core/Array
+  - MooTools.More
+
+provides: [String.Extras]
+
+...
+*/
+
+(function(){
+
+var special = {
+	'a': /[àáâãäåăą]/g,
+	'A': /[ÀÁÂÃÄÅĂĄ]/g,
+	'c': /[ćčç]/g,
+	'C': /[ĆČÇ]/g,
+	'd': /[ďđ]/g,
+	'D': /[ĎÐ]/g,
+	'e': /[èéêëěę]/g,
+	'E': /[ÈÉÊËĚĘ]/g,
+	'g': /[ğ]/g,
+	'G': /[Ğ]/g,
+	'i': /[ìíîï]/g,
+	'I': /[ÌÍÎÏ]/g,
+	'l': /[ĺľł]/g,
+	'L': /[ĹĽŁ]/g,
+	'n': /[ñňń]/g,
+	'N': /[ÑŇŃ]/g,
+	'o': /[òóôõöøő]/g,
+	'O': /[ÒÓÔÕÖØ]/g,
+	'r': /[řŕ]/g,
+	'R': /[ŘŔ]/g,
+	's': /[ššş]/g,
+	'S': /[ŠŞŚ]/g,
+	't': /[ťţ]/g,
+	'T': /[ŤŢ]/g,
+	'ue': /[ü]/g,
+	'UE': /[Ü]/g,
+	'u': /[ùúûůµ]/g,
+	'U': /[ÙÚÛŮ]/g,
+	'y': /[ÿý]/g,
+	'Y': /[ŸÝ]/g,
+	'z': /[žźż]/g,
+	'Z': /[ŽŹŻ]/g,
+	'th': /[þ]/g,
+	'TH': /[Þ]/g,
+	'dh': /[ð]/g,
+	'DH': /[Ð]/g,
+	'ss': /[ß]/g,
+	'oe': /[œ]/g,
+	'OE': /[Œ]/g,
+	'ae': /[æ]/g,
+	'AE': /[Æ]/g
+},
+
+tidy = {
+	' ': /[\xa0\u2002\u2003\u2009]/g,
+	'*': /[\xb7]/g,
+	'\'': /[\u2018\u2019]/g,
+	'"': /[\u201c\u201d]/g,
+	'...': /[\u2026]/g,
+	'-': /[\u2013]/g,
+//	'--': /[\u2014]/g,
+	'&raquo;': /[\uFFFD]/g
+};
+
+var walk = function(string, replacements){
+	var result = string, key;
+	for (key in replacements) result = result.replace(replacements[key], key);
+	return result;
+};
+
+var getRegexForTag = function(tag, contents){
+	tag = tag || '';
+	var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)<\/" + tag + "(?!\\w)>" : "<\/?" + tag + "([^>]+)?>",
+		reg = new RegExp(regstr, "gi");
+	return reg;
+};
+
+String.implement({
+
+	standardize: function(){
+		return walk(this, special);
+	},
+
+	repeat: function(times){
+		return new Array(times + 1).join(this);
+	},
+
+	pad: function(length, str, direction){
+		if (this.length >= length) return this;
+
+		var pad = (str == null ? ' ' : '' + str)
+			.repeat(length - this.length)
+			.substr(0, length - this.length);
+
+		if (!direction || direction == 'right') return this + pad;
+		if (direction == 'left') return pad + this;
+
+		return pad.substr(0, (pad.length / 2).floor()) + this + pad.substr(0, (pad.length / 2).ceil());
+	},
+
+	getTags: function(tag, contents){
+		return this.match(getRegexForTag(tag, contents)) || [];
+	},
+
+	stripTags: function(tag, contents){
+		return this.replace(getRegexForTag(tag, contents), '');
+	},
+
+	tidy: function(){
+		return walk(this, tidy);
+	},
+
+	truncate: function(max, trail, atChar){
+		var string = this;
+		if (trail == null && arguments.length == 1) trail = '…';
+		if (string.length > max){
+			string = string.substring(0, max);
+			if (atChar){
+				var index = string.lastIndexOf(atChar);
+				if (index != -1) string = string.substr(0, index);
+			}
+			if (trail) string += trail;
+		}
+		return string;
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: String.QueryString.js
+
+name: String.QueryString
+
+description: Methods for dealing with URI query strings.
+
+license: MIT-style license
+
+authors:
+  - Sebastian Markbåge
+  - Aaron Newton
+  - Lennart Pilon
+  - Valerio Proietti
+
+requires:
+  - Core/Array
+  - Core/String
+  - /MooTools.More
+
+provides: [String.QueryString]
+
+...
+*/
+
+String.implement({
+
+	parseQueryString: function(decodeKeys, decodeValues){
+		if (decodeKeys == null) decodeKeys = true;
+		if (decodeValues == null) decodeValues = true;
+
+		var vars = this.split(/[&;]/),
+			object = {};
+		if (!vars.length) return object;
+
+		vars.each(function(val){
+			var index = val.indexOf('=') + 1,
+				value = index ? val.substr(index) : '',
+				keys = index ? val.substr(0, index - 1).match(/([^\]\[]+|(\B)(?=\]))/g) : [val],
+				obj = object;
+			if (!keys) return;
+			if (decodeValues) value = decodeURIComponent(value);
+			keys.each(function(key, i){
+				if (decodeKeys) key = decodeURIComponent(key);
+				var current = obj[key];
+
+				if (i < keys.length - 1) obj = obj[key] = current || {};
+				else if (typeOf(current) == 'array') current.push(value);
+				else obj[key] = current != null ? [current, value] : value;
+			});
+		});
+
+		return object;
+	},
+
+	cleanQueryString: function(method){
+		return this.split('&').filter(function(val){
+			var index = val.indexOf('='),
+				key = index < 0 ? '' : val.substr(0, index),
+				value = val.substr(index + 1);
+
+			return method ? method.call(null, key, value) : (value || value === 0);
+		}).join('&');
+	}
+
+});
+
+
+/*
+---
+
+script: URI.js
+
+name: URI
+
+description: Provides methods useful in managing the window location and uris.
+
+license: MIT-style license
+
+authors:
+  - Sebastian Markbåge
+  - Aaron Newton
+
+requires:
+  - Core/Object
+  - Core/Class
+  - Core/Class.Extras
+  - Core/Element
+  - /String.QueryString
+
+provides: [URI]
+
+...
+*/
+
+(function(){
+
+var toString = function(){
+	return this.get('value');
+};
+
+var URI = this.URI = new Class({
+
+	Implements: Options,
+
+	options: {
+		/*base: false*/
+	},
+
+	regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
+	parts: ['scheme', 'user', 'password', 'host', 'port', 'directory', 'file', 'query', 'fragment'],
+	schemes: {http: 80, https: 443, ftp: 21, rtsp: 554, mms: 1755, file: 0},
+
+	initialize: function(uri, options){
+		this.setOptions(options);
+		var base = this.options.base || URI.base;
+		if (!uri) uri = base;
+
+		if (uri && uri.parsed) this.parsed = Object.clone(uri.parsed);
+		else this.set('value', uri.href || uri.toString(), base ? new URI(base) : false);
+	},
+
+	parse: function(value, base){
+		var bits = value.match(this.regex);
+		if (!bits) return false;
+		bits.shift();
+		return this.merge(bits.associate(this.parts), base);
+	},
+
+	merge: function(bits, base){
+		if ((!bits || !bits.scheme) && (!base || !base.scheme)) return false;
+		if (base){
+			this.parts.every(function(part){
+				if (bits[part]) return false;
+				bits[part] = base[part] || '';
+				return true;
+			});
+		}
+		bits.port = bits.port || this.schemes[bits.scheme.toLowerCase()];
+		bits.directory = bits.directory ? this.parseDirectory(bits.directory, base ? base.directory : '') : '/';
+		return bits;
+	},
+
+	parseDirectory: function(directory, baseDirectory){
+		directory = (directory.substr(0, 1) == '/' ? '' : (baseDirectory || '/')) + directory;
+		if (!directory.test(URI.regs.directoryDot)) return directory;
+		var result = [];
+		directory.replace(URI.regs.endSlash, '').split('/').each(function(dir){
+			if (dir == '..' && result.length > 0) result.pop();
+			else if (dir != '.') result.push(dir);
+		});
+		return result.join('/') + '/';
+	},
+
+	combine: function(bits){
+		return bits.value || bits.scheme + '://' +
+			(bits.user ? bits.user + (bits.password ? ':' + bits.password : '') + '@' : '') +
+			(bits.host || '') + (bits.port && bits.port != this.schemes[bits.scheme] ? ':' + bits.port : '') +
+			(bits.directory || '/') + (bits.file || '') +
+			(bits.query ? '?' + bits.query : '') +
+			(bits.fragment ? '#' + bits.fragment : '');
+	},
+
+	set: function(part, value, base){
+		if (part == 'value'){
+			var scheme = value.match(URI.regs.scheme);
+			if (scheme) scheme = scheme[1];
+			if (scheme && this.schemes[scheme.toLowerCase()] == null) this.parsed = { scheme: scheme, value: value };
+			else this.parsed = this.parse(value, (base || this).parsed) || (scheme ? { scheme: scheme, value: value } : { value: value });
+		} else if (part == 'data'){
+			this.setData(value);
+		} else {
+			this.parsed[part] = value;
+		}
+		return this;
+	},
+
+	get: function(part, base){
+		switch (part){
+			case 'value': return this.combine(this.parsed, base ? base.parsed : false);
+			case 'data' : return this.getData();
+		}
+		return this.parsed[part] || '';
+	},
+
+	go: function(){
+		document.location.href = this.toString();
+	},
+
+	toURI: function(){
+		return this;
+	},
+
+	getData: function(key, part){
+		var qs = this.get(part || 'query');
+		if (!(qs || qs === 0)) return key ? null : {};
+		var obj = qs.parseQueryString();
+		return key ? obj[key] : obj;
+	},
+
+	setData: function(values, merge, part){
+		if (typeof values == 'string'){
+			var data = this.getData();
+			data[arguments[0]] = arguments[1];
+			values = data;
+		} else if (merge){
+			values = Object.merge(this.getData(), values);
+		}
+		return this.set(part || 'query', Object.toQueryString(values));
+	},
+
+	clearData: function(part){
+		return this.set(part || 'query', '');
+	},
+
+	toString: toString,
+	valueOf: toString
+
+});
+
+URI.regs = {
+	endSlash: /\/$/,
+	scheme: /^(\w+):/,
+	directoryDot: /\.\/|\.$/
+};
+
+URI.base = new URI(Array.from(document.getElements('base[href]', true)).getLast(), {base: document.location});
+
+String.implement({
+
+	toURI: function(options){
+		return new URI(this, options);
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: URI.Relative.js
+
+name: URI.Relative
+
+description: Extends the URI class to add methods for computing relative and absolute urls.
+
+license: MIT-style license
+
+authors:
+  - Sebastian Markbåge
+
+
+requires:
+  - /Class.refactor
+  - /URI
+
+provides: [URI.Relative]
+
+...
+*/
+
+URI = Class.refactor(URI, {
+
+	combine: function(bits, base){
+		if (!base || bits.scheme != base.scheme || bits.host != base.host || bits.port != base.port)
+			return this.previous.apply(this, arguments);
+		var end = bits.file + (bits.query ? '?' + bits.query : '') + (bits.fragment ? '#' + bits.fragment : '');
+
+		if (!base.directory) return (bits.directory || (bits.file ? '' : './')) + end;
+
+		var baseDir = base.directory.split('/'),
+			relDir = bits.directory.split('/'),
+			path = '',
+			offset;
+
+		var i = 0;
+		for (offset = 0; offset < baseDir.length && offset < relDir.length && baseDir[offset] == relDir[offset]; offset++);
+		for (i = 0; i < baseDir.length - offset - 1; i++) path += '../';
+		for (i = offset; i < relDir.length - 1; i++) path += relDir[i] + '/';
+
+		return (path || (bits.file ? '' : './')) + end;
+	},
+
+	toAbsolute: function(base){
+		base = new URI(base);
+		if (base) base.set('directory', '').set('file', '');
+		return this.toRelative(base);
+	},
+
+	toRelative: function(base){
+		return this.get('value', new URI(base));
+	}
+
+});
+
+
+/*
+---
+
+name: Hash
+
+description: Contains Hash Prototypes. Provides a means for overcoming the JavaScript practical impossibility of extending native Objects.
+
+license: MIT-style license.
+
+requires:
+  - Core/Object
+  - /MooTools.More
+
+provides: [Hash]
+
+...
+*/
+
+(function(){
+
+if (this.Hash) return;
+
+var Hash = this.Hash = new Type('Hash', function(object){
+	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
+	for (var key in object) this[key] = object[key];
+	return this;
+});
+
+this.$H = function(object){
+	return new Hash(object);
+};
+
+Hash.implement({
+
+	forEach: function(fn, bind){
+		Object.forEach(this, fn, bind);
+	},
+
+	getClean: function(){
+		var clean = {};
+		for (var key in this){
+			if (this.hasOwnProperty(key)) clean[key] = this[key];
+		}
+		return clean;
+	},
+
+	getLength: function(){
+		var length = 0;
+		for (var key in this){
+			if (this.hasOwnProperty(key)) length++;
+		}
+		return length;
+	}
+
+});
+
+Hash.alias('each', 'forEach');
+
+Hash.implement({
+
+	has: Object.prototype.hasOwnProperty,
+
+	keyOf: function(value){
+		return Object.keyOf(this, value);
+	},
+
+	hasValue: function(value){
+		return Object.contains(this, value);
+	},
+
+	extend: function(properties){
+		Hash.each(properties || {}, function(value, key){
+			Hash.set(this, key, value);
+		}, this);
+		return this;
+	},
+
+	combine: function(properties){
+		Hash.each(properties || {}, function(value, key){
+			Hash.include(this, key, value);
+		}, this);
+		return this;
+	},
+
+	erase: function(key){
+		if (this.hasOwnProperty(key)) delete this[key];
+		return this;
+	},
+
+	get: function(key){
+		return (this.hasOwnProperty(key)) ? this[key] : null;
+	},
+
+	set: function(key, value){
+		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
+		return this;
+	},
+
+	empty: function(){
+		Hash.each(this, function(value, key){
+			delete this[key];
+		}, this);
+		return this;
+	},
+
+	include: function(key, value){
+		if (this[key] == undefined) this[key] = value;
+		return this;
+	},
+
+	map: function(fn, bind){
+		return new Hash(Object.map(this, fn, bind));
+	},
+
+	filter: function(fn, bind){
+		return new Hash(Object.filter(this, fn, bind));
+	},
+
+	every: function(fn, bind){
+		return Object.every(this, fn, bind);
+	},
+
+	some: function(fn, bind){
+		return Object.some(this, fn, bind);
+	},
+
+	getKeys: function(){
+		return Object.keys(this);
+	},
+
+	getValues: function(){
+		return Object.values(this);
+	},
+
+	toQueryString: function(base){
+		return Object.toQueryString(this, base);
+	}
+
+});
+
+Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
+
+
+})();
+
+
+
+/*
+---
+
+script: Hash.Extras.js
+
+name: Hash.Extras
+
+description: Extends the Hash Type to include getFromPath which allows a path notation to child elements.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Hash
+  - /Object.Extras
+
+provides: [Hash.Extras]
+
+...
+*/
+
+Hash.implement({
+
+	getFromPath: function(notation){
+		return Object.getFromPath(this, notation);
+	},
+
+	cleanValues: function(method){
+		return new Hash(Object.cleanValues(this, method));
+	},
+
+	run: function(){
+		Object.run(arguments);
+	}
+
+});
+
+
+/*
+---
+
+script: Element.Forms.js
+
+name: Element.Forms
+
+description: Extends the Element native object to include methods useful in managing inputs.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element
+  - /String.Extras
+  - /MooTools.More
+
+provides: [Element.Forms]
+
+...
+*/
+
+Element.implement({
+
+	tidy: function(){
+		this.set('value', this.get('value').tidy());
+	},
+
+	getTextInRange: function(start, end){
+		return this.get('value').substring(start, end);
+	},
+
+	getSelectedText: function(){
+		if (this.setSelectionRange) return this.getTextInRange(this.getSelectionStart(), this.getSelectionEnd());
+		return document.selection.createRange().text;
+	},
+
+	getSelectedRange: function(){
+		if (this.selectionStart != null){
+			return {
+				start: this.selectionStart,
+				end: this.selectionEnd
+			};
+		}
+
+		var pos = {
+			start: 0,
+			end: 0
+		};
+		var range = this.getDocument().selection.createRange();
+		if (!range || range.parentElement() != this) return pos;
+		var duplicate = range.duplicate();
+
+		if (this.type == 'text'){
+			pos.start = 0 - duplicate.moveStart('character', -100000);
+			pos.end = pos.start + range.text.length;
+		} else {
+			var value = this.get('value');
+			var offset = value.length;
+			duplicate.moveToElementText(this);
+			duplicate.setEndPoint('StartToEnd', range);
+			if (duplicate.text.length) offset -= value.match(/[\n\r]*$/)[0].length;
+			pos.end = offset - duplicate.text.length;
+			duplicate.setEndPoint('StartToStart', range);
+			pos.start = offset - duplicate.text.length;
+		}
+		return pos;
+	},
+
+	getSelectionStart: function(){
+		return this.getSelectedRange().start;
+	},
+
+	getSelectionEnd: function(){
+		return this.getSelectedRange().end;
+	},
+
+	setCaretPosition: function(pos){
+		if (pos == 'end') pos = this.get('value').length;
+		this.selectRange(pos, pos);
+		return this;
+	},
+
+	getCaretPosition: function(){
+		return this.getSelectedRange().start;
+	},
+
+	selectRange: function(start, end){
+		if (this.setSelectionRange){
+			this.focus();
+			this.setSelectionRange(start, end);
+		} else {
+			var value = this.get('value');
+			var diff = value.substr(start, end - start).replace(/\r/g, '').length;
+			start = value.substr(0, start).replace(/\r/g, '').length;
+			var range = this.createTextRange();
+			range.collapse(true);
+			range.moveEnd('character', start + diff);
+			range.moveStart('character', start);
+			range.select();
+		}
+		return this;
+	},
+
+	insertAtCursor: function(value, select){
+		var pos = this.getSelectedRange();
+		var text = this.get('value');
+		this.set('value', text.substring(0, pos.start) + value + text.substring(pos.end, text.length));
+		if (select !== false) this.selectRange(pos.start, pos.start + value.length);
+		else this.setCaretPosition(pos.start + value.length);
+		return this;
+	},
+
+	insertAroundCursor: function(options, select){
+		options = Object.append({
+			before: '',
+			defaultMiddle: '',
+			after: ''
+		}, options);
+
+		var value = this.getSelectedText() || options.defaultMiddle;
+		var pos = this.getSelectedRange();
+		var text = this.get('value');
+
+		if (pos.start == pos.end){
+			this.set('value', text.substring(0, pos.start) + options.before + value + options.after + text.substring(pos.end, text.length));
+			this.selectRange(pos.start + options.before.length, pos.end + options.before.length + value.length);
+		} else {
+			var current = text.substring(pos.start, pos.end);
+			this.set('value', text.substring(0, pos.start) + options.before + current + options.after + text.substring(pos.end, text.length));
+			var selStart = pos.start + options.before.length;
+			if (select !== false) this.selectRange(selStart, selStart + current.length);
+			else this.setCaretPosition(selStart + text.length);
+		}
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+script: Elements.From.js
+
+name: Elements.From
+
+description: Returns a collection of elements from a string of html.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/String
+  - Core/Element
+  - /MooTools.More
+
+provides: [Elements.from, Elements.From]
+
+...
+*/
+
+Elements.from = function(text, excludeScripts){
+	if (excludeScripts || excludeScripts == null) text = text.stripScripts();
+
+	var container, match = text.match(/^\s*<(t[dhr]|tbody|tfoot|thead)/i);
+
+	if (match){
+		container = new Element('table');
+		var tag = match[1].toLowerCase();
+		if (['td', 'th', 'tr'].contains(tag)){
+			container = new Element('tbody').inject(container);
+			if (tag != 'tr') container = new Element('tr').inject(container);
+		}
+	}
+
+	return (container || new Element('div')).set('html', text).getChildren();
+};
+
+
+/*
+---
+
+name: Element.Event.Pseudos
+
+description: Adds the functionality to add pseudo events for Elements
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires: [Core/Element.Event, Core/Element.Delegation, Events.Pseudos]
+
+provides: [Element.Event.Pseudos, Element.Delegation]
+
+...
+*/
+
+(function(){
+
+var pseudos = {relay: false},
+	copyFromEvents = ['once', 'throttle', 'pause'],
+	count = copyFromEvents.length;
+
+while (count--) pseudos[copyFromEvents[count]] = Events.lookupPseudo(copyFromEvents[count]);
+
+DOMEvent.definePseudo = function(key, listener){
+	pseudos[key] = listener;
+	return this;
+};
+
+var proto = Element.prototype;
+[Element, Window, Document].invoke('implement', Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
+
+})();
+
+
+/*
+---
+
+name: Element.Event.Pseudos.Keys
+
+description: Adds functionality fire events if certain keycombinations are pressed
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires: [Element.Event.Pseudos]
+
+provides: [Element.Event.Pseudos.Keys]
+
+...
+*/
+
+(function(){
+
+var keysStoreKey = '$moo:keys-pressed',
+	keysKeyupStoreKey = '$moo:keys-keyup';
+
+
+DOMEvent.definePseudo('keys', function(split, fn, args){
+
+	var event = args[0],
+		keys = [],
+		pressed = this.retrieve(keysStoreKey, []);
+
+	keys.append(split.value.replace('++', function(){
+		keys.push('+'); // shift++ and shift+++a
+		return '';
+	}).split('+'));
+
+	pressed.include(event.key);
+
+	if (keys.every(function(key){
+		return pressed.contains(key);
+	})) fn.apply(this, args);
+
+	this.store(keysStoreKey, pressed);
+
+	if (!this.retrieve(keysKeyupStoreKey)){
+		var keyup = function(event){
+			(function(){
+				pressed = this.retrieve(keysStoreKey, []).erase(event.key);
+				this.store(keysStoreKey, pressed);
+			}).delay(0, this); // Fix for IE
+		};
+		this.store(keysKeyupStoreKey, keyup).addEvent('keyup', keyup);
+	}
+
+});
+
+DOMEvent.defineKeys({
+	'16': 'shift',
+	'17': 'control',
+	'18': 'alt',
+	'20': 'capslock',
+	'33': 'pageup',
+	'34': 'pagedown',
+	'35': 'end',
+	'36': 'home',
+	'144': 'numlock',
+	'145': 'scrolllock',
+	'186': ';',
+	'187': '=',
+	'188': ',',
+	'190': '.',
+	'191': '/',
+	'192': '`',
+	'219': '[',
+	'220': '\\',
+	'221': ']',
+	'222': "'",
+	'107': '+'
+}).defineKey(Browser.firefox ? 109 : 189, '-');
+
+})();
+
+
+/*
+---
+
+script: Element.Measure.js
+
+name: Element.Measure
+
+description: Extends the Element native object to include methods useful in measuring dimensions.
+
+credits: "Element.measure / .expose methods by Daniel Steigerwald License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz"
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Style
+  - Core/Element.Dimensions
+  - /MooTools.More
+
+provides: [Element.Measure]
+
+...
+*/
+
+(function(){
+
+var getStylesList = function(styles, planes){
+	var list = [];
+	Object.each(planes, function(directions){
+		Object.each(directions, function(edge){
+			styles.each(function(style){
+				list.push(style + '-' + edge + (style == 'border' ? '-width' : ''));
+			});
+		});
+	});
+	return list;
+};
+
+var calculateEdgeSize = function(edge, styles){
+	var total = 0;
+	Object.each(styles, function(value, style){
+		if (style.test(edge)) total = total + value.toInt();
+	});
+	return total;
+};
+
+var isVisible = function(el){
+	return !!(!el || el.offsetHeight || el.offsetWidth);
+};
+
+
+Element.implement({
+
+	measure: function(fn){
+		if (isVisible(this)) return fn.call(this);
+		var parent = this.getParent(),
+			toMeasure = [];
+		while (!isVisible(parent) && parent != document.body){
+			toMeasure.push(parent.expose());
+			parent = parent.getParent();
+		}
+		var restore = this.expose(),
+			result = fn.call(this);
+		restore();
+		toMeasure.each(function(restore){
+			restore();
+		});
+		return result;
+	},
+
+	expose: function(){
+		if (this.getStyle('display') != 'none') return function(){};
+		var before = this.style.cssText;
+		this.setStyles({
+			display: 'block',
+			position: 'absolute',
+			visibility: 'hidden'
+		});
+		return function(){
+			this.style.cssText = before;
+		}.bind(this);
+	},
+
+	getDimensions: function(options){
+		options = Object.merge({computeSize: false}, options);
+		var dim = {x: 0, y: 0};
+
+		var getSize = function(el, options){
+			return (options.computeSize) ? el.getComputedSize(options) : el.getSize();
+		};
+
+		var parent = this.getParent('body');
+
+		if (parent && this.getStyle('display') == 'none'){
+			dim = this.measure(function(){
+				return getSize(this, options);
+			});
+		} else if (parent){
+			try { //safari sometimes crashes here, so catch it
+				dim = getSize(this, options);
+			}catch(e){}
+		}
+
+		return Object.append(dim, (dim.x || dim.x === 0) ? {
+				width: dim.x,
+				height: dim.y
+			} : {
+				x: dim.width,
+				y: dim.height
+			}
+		);
+	},
+
+	getComputedSize: function(options){
+		
+
+		options = Object.merge({
+			styles: ['padding','border'],
+			planes: {
+				height: ['top','bottom'],
+				width: ['left','right']
+			},
+			mode: 'both'
+		}, options);
+
+		var styles = {},
+			size = {width: 0, height: 0},
+			dimensions;
+
+		if (options.mode == 'vertical'){
+			delete size.width;
+			delete options.planes.width;
+		} else if (options.mode == 'horizontal'){
+			delete size.height;
+			delete options.planes.height;
+		}
+
+		getStylesList(options.styles, options.planes).each(function(style){
+			styles[style] = this.getStyle(style).toInt();
+		}, this);
+
+		Object.each(options.planes, function(edges, plane){
+
+			var capitalized = plane.capitalize(),
+				style = this.getStyle(plane);
+
+			if (style == 'auto' && !dimensions) dimensions = this.getDimensions();
+
+			style = styles[plane] = (style == 'auto') ? dimensions[plane] : style.toInt();
+			size['total' + capitalized] = style;
+
+			edges.each(function(edge){
+				var edgesize = calculateEdgeSize(edge, styles);
+				size['computed' + edge.capitalize()] = edgesize;
+				size['total' + capitalized] += edgesize;
+			});
+
+		}, this);
+
+		return Object.append(size, styles);
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: Element.Pin.js
+
+name: Element.Pin
+
+description: Extends the Element native object to include the pin method useful for fixed positioning for elements.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Event
+  - Core/Element.Dimensions
+  - Core/Element.Style
+  - /MooTools.More
+
+provides: [Element.Pin]
+
+...
+*/
+
+(function(){
+	var supportsPositionFixed = false,
+		supportTested = false;
+
+	var testPositionFixed = function(){
+		var test = new Element('div').setStyles({
+			position: 'fixed',
+			top: 0,
+			right: 0
+		}).inject(document.body);
+		supportsPositionFixed = (test.offsetTop === 0);
+		test.dispose();
+		supportTested = true;
+	};
+
+	Element.implement({
+
+		pin: function(enable, forceScroll){
+			if (!supportTested) testPositionFixed();
+			if (this.getStyle('display') == 'none') return this;
+
+			var pinnedPosition,
+				scroll = window.getScroll(),
+				parent,
+				scrollFixer;
+
+			if (enable !== false){
+				pinnedPosition = this.getPosition(supportsPositionFixed ? document.body : this.getOffsetParent());
+				if (!this.retrieve('pin:_pinned')){
+					var currentPosition = {
+						top: pinnedPosition.y - scroll.y,
+						left: pinnedPosition.x - scroll.x
+					};
+
+					if (supportsPositionFixed && !forceScroll){
+						this.setStyle('position', 'fixed').setStyles(currentPosition);
+					} else {
+
+						parent = this.getOffsetParent();
+						var position = this.getPosition(parent),
+							styles = this.getStyles('left', 'top');
+
+						if (parent && styles.left == 'auto' || styles.top == 'auto') this.setPosition(position);
+						if (this.getStyle('position') == 'static') this.setStyle('position', 'absolute');
+
+						position = {
+							x: styles.left.toInt() - scroll.x,
+							y: styles.top.toInt() - scroll.y
+						};
+
+						scrollFixer = function(){
+							if (!this.retrieve('pin:_pinned')) return;
+							var scroll = window.getScroll();
+							this.setStyles({
+								left: position.x + scroll.x,
+								top: position.y + scroll.y
+							});
+						}.bind(this);
+
+						this.store('pin:_scrollFixer', scrollFixer);
+						window.addEvent('scroll', scrollFixer);
+					}
+					this.store('pin:_pinned', true);
+				}
+
+			} else {
+				if (!this.retrieve('pin:_pinned')) return this;
+
+				parent = this.getParent();
+				var offsetParent = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent());
+
+				pinnedPosition = this.getPosition(offsetParent);
+
+				this.store('pin:_pinned', false);
+				scrollFixer = this.retrieve('pin:_scrollFixer');
+				if (!scrollFixer){
+					this.setStyles({
+						position: 'absolute',
+						top: pinnedPosition.y + scroll.y,
+						left: pinnedPosition.x + scroll.x
+					});
+				} else {
+					this.store('pin:_scrollFixer', null);
+					window.removeEvent('scroll', scrollFixer);
+				}
+				this.removeClass('isPinned');
+			}
+			return this;
+		},
+
+		unpin: function(){
+			return this.pin(false);
+		},
+
+		togglePin: function(){
+			return this.pin(!this.retrieve('pin:_pinned'));
+		}
+
+	});
+
+
+
+})();
+
+
+/*
+---
+
+script: Element.Position.js
+
+name: Element.Position
+
+description: Extends the Element native object to include methods useful positioning elements relative to others.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Jacob Thornton
+
+requires:
+  - Core/Options
+  - Core/Element.Dimensions
+  - Element.Measure
+
+provides: [Element.Position]
+
+...
+*/
+
+(function(original){
+
+var local = Element.Position = {
+
+	options: {/*
+		edge: false,
+		returnPos: false,
+		minimum: {x: 0, y: 0},
+		maximum: {x: 0, y: 0},
+		relFixedPosition: false,
+		ignoreMargins: false,
+		ignoreScroll: false,
+		allowNegative: false,*/
+		relativeTo: document.body,
+		position: {
+			x: 'center', //left, center, right
+			y: 'center' //top, center, bottom
+		},
+		offset: {x: 0, y: 0}
+	},
+
+	getOptions: function(element, options){
+		options = Object.merge({}, local.options, options);
+		local.setPositionOption(options);
+		local.setEdgeOption(options);
+		local.setOffsetOption(element, options);
+		local.setDimensionsOption(element, options);
+		return options;
+	},
+
+	setPositionOption: function(options){
+		options.position = local.getCoordinateFromValue(options.position);
+	},
+
+	setEdgeOption: function(options){
+		var edgeOption = local.getCoordinateFromValue(options.edge);
+		options.edge = edgeOption ? edgeOption :
+			(options.position.x == 'center' && options.position.y == 'center') ? {x: 'center', y: 'center'} :
+			{x: 'left', y: 'top'};
+	},
+
+	setOffsetOption: function(element, options){
+		var parentOffset = {x: 0, y: 0},
+			offsetParent = element.measure(function(){
+				return document.id(this.getOffsetParent());
+			}),
+			parentScroll = offsetParent.getScroll();
+
+		if (!offsetParent || offsetParent == element.getDocument().body) return;
+		parentOffset = offsetParent.measure(function(){
+			var position = this.getPosition();
+			if (this.getStyle('position') == 'fixed'){
+				var scroll = window.getScroll();
+				position.x += scroll.x;
+				position.y += scroll.y;
+			}
+			return position;
+		});
+
+		options.offset = {
+			parentPositioned: offsetParent != document.id(options.relativeTo),
+			x: options.offset.x - parentOffset.x + parentScroll.x,
+			y: options.offset.y - parentOffset.y + parentScroll.y
+		};
+	},
+
+	setDimensionsOption: function(element, options){
+		options.dimensions = element.getDimensions({
+			computeSize: true,
+			styles: ['padding', 'border', 'margin']
+		});
+	},
+
+	getPosition: function(element, options){
+		var position = {};
+		options = local.getOptions(element, options);
+		var relativeTo = document.id(options.relativeTo) || document.body;
+
+		local.setPositionCoordinates(options, position, relativeTo);
+		if (options.edge) local.toEdge(position, options);
+
+		var offset = options.offset;
+		position.left = ((position.x >= 0 || offset.parentPositioned || options.allowNegative) ? position.x : 0).toInt();
+		position.top = ((position.y >= 0 || offset.parentPositioned || options.allowNegative) ? position.y : 0).toInt();
+
+		local.toMinMax(position, options);
+
+		if (options.relFixedPosition || relativeTo.getStyle('position') == 'fixed') local.toRelFixedPosition(relativeTo, position);
+		if (options.ignoreScroll) local.toIgnoreScroll(relativeTo, position);
+		if (options.ignoreMargins) local.toIgnoreMargins(position, options);
+
+		position.left = Math.ceil(position.left);
+		position.top = Math.ceil(position.top);
+		delete position.x;
+		delete position.y;
+
+		return position;
+	},
+
+	setPositionCoordinates: function(options, position, relativeTo){
+		var offsetY = options.offset.y,
+			offsetX = options.offset.x,
+			calc = (relativeTo == document.body) ? window.getScroll() : relativeTo.getPosition(),
+			top = calc.y,
+			left = calc.x,
+			winSize = window.getSize();
+
+		switch(options.position.x){
+			case 'left': position.x = left + offsetX; break;
+			case 'right': position.x = left + offsetX + relativeTo.offsetWidth; break;
+			default: position.x = left + ((relativeTo == document.body ? winSize.x : relativeTo.offsetWidth) / 2) + offsetX; break;
+		}
+
+		switch(options.position.y){
+			case 'top': position.y = top + offsetY; break;
+			case 'bottom': position.y = top + offsetY + relativeTo.offsetHeight; break;
+			default: position.y = top + ((relativeTo == document.body ? winSize.y : relativeTo.offsetHeight) / 2) + offsetY; break;
+		}
+	},
+
+	toMinMax: function(position, options){
+		var xy = {left: 'x', top: 'y'}, value;
+		['minimum', 'maximum'].each(function(minmax){
+			['left', 'top'].each(function(lr){
+				value = options[minmax] ? options[minmax][xy[lr]] : null;
+				if (value != null && ((minmax == 'minimum') ? position[lr] < value : position[lr] > value)) position[lr] = value;
+			});
+		});
+	},
+
+	toRelFixedPosition: function(relativeTo, position){
+		var winScroll = window.getScroll();
+		position.top += winScroll.y;
+		position.left += winScroll.x;
+	},
+
+	toIgnoreScroll: function(relativeTo, position){
+		var relScroll = relativeTo.getScroll();
+		position.top -= relScroll.y;
+		position.left -= relScroll.x;
+	},
+
+	toIgnoreMargins: function(position, options){
+		position.left += options.edge.x == 'right'
+			? options.dimensions['margin-right']
+			: (options.edge.x != 'center'
+				? -options.dimensions['margin-left']
+				: -options.dimensions['margin-left'] + ((options.dimensions['margin-right'] + options.dimensions['margin-left']) / 2));
+
+		position.top += options.edge.y == 'bottom'
+			? options.dimensions['margin-bottom']
+			: (options.edge.y != 'center'
+				? -options.dimensions['margin-top']
+				: -options.dimensions['margin-top'] + ((options.dimensions['margin-bottom'] + options.dimensions['margin-top']) / 2));
+	},
+
+	toEdge: function(position, options){
+		var edgeOffset = {},
+			dimensions = options.dimensions,
+			edge = options.edge;
+
+		switch(edge.x){
+			case 'left': edgeOffset.x = 0; break;
+			case 'right': edgeOffset.x = -dimensions.x - dimensions.computedRight - dimensions.computedLeft; break;
+			// center
+			default: edgeOffset.x = -(Math.round(dimensions.totalWidth / 2)); break;
+		}
+
+		switch(edge.y){
+			case 'top': edgeOffset.y = 0; break;
+			case 'bottom': edgeOffset.y = -dimensions.y - dimensions.computedTop - dimensions.computedBottom; break;
+			// center
+			default: edgeOffset.y = -(Math.round(dimensions.totalHeight / 2)); break;
+		}
+
+		position.x += edgeOffset.x;
+		position.y += edgeOffset.y;
+	},
+
+	getCoordinateFromValue: function(option){
+		if (typeOf(option) != 'string') return option;
+		option = option.toLowerCase();
+
+		return {
+			x: option.test('left') ? 'left'
+				: (option.test('right') ? 'right' : 'center'),
+			y: option.test(/upper|top/) ? 'top'
+				: (option.test('bottom') ? 'bottom' : 'center')
+		};
+	}
+
+};
+
+Element.implement({
+
+	position: function(options){
+		if (options && (options.x != null || options.y != null)){
+			return (original ? original.apply(this, arguments) : this);
+		}
+		var position = this.setStyle('position', 'absolute').calculatePosition(options);
+		return (options && options.returnPos) ? position : this.setStyles(position);
+	},
+
+	calculatePosition: function(options){
+		return local.getPosition(this, options);
+	}
+
+});
+
+})(Element.prototype.position);
+
+
+/*
+---
+
+script: Element.Shortcuts.js
+
+name: Element.Shortcuts
+
+description: Extends the Element native object to include some shortcut methods.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Style
+  - /MooTools.More
+
+provides: [Element.Shortcuts]
+
+...
+*/
+
+Element.implement({
+
+	isDisplayed: function(){
+		return this.getStyle('display') != 'none';
+	},
+
+	isVisible: function(){
+		var w = this.offsetWidth,
+			h = this.offsetHeight;
+		return (w == 0 && h == 0) ? false : (w > 0 && h > 0) ? true : this.style.display != 'none';
+	},
+
+	toggle: function(){
+		return this[this.isDisplayed() ? 'hide' : 'show']();
+	},
+
+	hide: function(){
+		var d;
+		try {
+			//IE fails here if the element is not in the dom
+			d = this.getStyle('display');
+		} catch(e){}
+		if (d == 'none') return this;
+		return this.store('element:_originalDisplay', d || '').setStyle('display', 'none');
+	},
+
+	show: function(display){
+		if (!display && this.isDisplayed()) return this;
+		display = display || this.retrieve('element:_originalDisplay') || 'block';
+		return this.setStyle('display', (display == 'none') ? 'block' : display);
+	},
+
+	swapClass: function(remove, add){
+		return this.removeClass(remove).addClass(add);
+	}
+
+});
+
+Document.implement({
+
+	clearSelection: function(){
+		if (window.getSelection){
+			var selection = window.getSelection();
+			if (selection && selection.removeAllRanges) selection.removeAllRanges();
+		} else if (document.selection && document.selection.empty){
+			try {
+				//IE fails here if selected element is not in dom
+				document.selection.empty();
+			} catch(e){}
+		}
+	}
+
+});
+
+
+/*
+---
+
+script: IframeShim.js
+
+name: IframeShim
+
+description: Defines IframeShim, a class for obscuring select lists and flash objects in IE.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/Options
+  - Core/Events
+  - /Element.Position
+  - /Class.Occlude
+
+provides: [IframeShim]
+
+...
+*/
+
+var IframeShim = new Class({
+
+	Implements: [Options, Events, Class.Occlude],
+
+	options: {
+		className: 'iframeShim',
+		src: 'javascript:false;document.write("");',
+		display: false,
+		zIndex: null,
+		margin: 0,
+		offset: {x: 0, y: 0},
+		browsers: (Browser.ie6 || (Browser.firefox && Browser.version < 3 && Browser.Platform.mac))
+	},
+
+	property: 'IframeShim',
+
+	initialize: function(element, options){
+		this.element = document.id(element);
+		if (this.occlude()) return this.occluded;
+		this.setOptions(options);
+		this.makeShim();
+		return this;
+	},
+
+	makeShim: function(){
+		if (this.options.browsers){
+			var zIndex = this.element.getStyle('zIndex').toInt();
+
+			if (!zIndex){
+				zIndex = 1;
+				var pos = this.element.getStyle('position');
+				if (pos == 'static' || !pos) this.element.setStyle('position', 'relative');
+				this.element.setStyle('zIndex', zIndex);
+			}
+			zIndex = ((this.options.zIndex != null || this.options.zIndex === 0) && zIndex > this.options.zIndex) ? this.options.zIndex : zIndex - 1;
+			if (zIndex < 0) zIndex = 1;
+			this.shim = new Element('iframe', {
+				src: this.options.src,
+				scrolling: 'no',
+				frameborder: 0,
+				styles: {
+					zIndex: zIndex,
+					position: 'absolute',
+					border: 'none',
+					filter: 'progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)'
+				},
+				'class': this.options.className
+			}).store('IframeShim', this);
+			var inject = (function(){
+				this.shim.inject(this.element, 'after');
+				this[this.options.display ? 'show' : 'hide']();
+				this.fireEvent('inject');
+			}).bind(this);
+			if (!IframeShim.ready) window.addEvent('load', inject);
+			else inject();
+		} else {
+			this.position = this.hide = this.show = this.dispose = Function.from(this);
+		}
+	},
+
+	position: function(){
+		if (!IframeShim.ready || !this.shim) return this;
+		var size = this.element.measure(function(){
+			return this.getSize();
+		});
+		if (this.options.margin != undefined){
+			size.x = size.x - (this.options.margin * 2);
+			size.y = size.y - (this.options.margin * 2);
+			this.options.offset.x += this.options.margin;
+			this.options.offset.y += this.options.margin;
+		}
+		this.shim.set({width: size.x, height: size.y}).position({
+			relativeTo: this.element,
+			offset: this.options.offset
+		});
+		return this;
+	},
+
+	hide: function(){
+		if (this.shim) this.shim.setStyle('display', 'none');
+		return this;
+	},
+
+	show: function(){
+		if (this.shim) this.shim.setStyle('display', 'block');
+		return this.position();
+	},
+
+	dispose: function(){
+		if (this.shim) this.shim.dispose();
+		return this;
+	},
+
+	destroy: function(){
+		if (this.shim) this.shim.destroy();
+		return this;
+	}
+
+});
+
+window.addEvent('load', function(){
+	IframeShim.ready = true;
+});
+
+
+/*
+---
+
+script: Mask.js
+
+name: Mask
+
+description: Creates a mask element to cover another.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Core/Element.Event
+  - /Class.Binds
+  - /Element.Position
+  - /IframeShim
+
+provides: [Mask]
+
+...
+*/
+
+var Mask = new Class({
+
+	Implements: [Options, Events],
+
+	Binds: ['position'],
+
+	options: {/*
+		onShow: function(){},
+		onHide: function(){},
+		onDestroy: function(){},
+		onClick: function(event){},
+		inject: {
+			where: 'after',
+			target: null,
+		},
+		hideOnClick: false,
+		id: null,
+		destroyOnHide: false,*/
+		style: {},
+		'class': 'mask',
+		maskMargins: false,
+		useIframeShim: true,
+		iframeShimOptions: {}
+	},
+
+	initialize: function(target, options){
+		this.target = document.id(target) || document.id(document.body);
+		this.target.store('mask', this);
+		this.setOptions(options);
+		this.render();
+		this.inject();
+	},
+
+	render: function(){
+		this.element = new Element('div', {
+			'class': this.options['class'],
+			id: this.options.id || 'mask-' + String.uniqueID(),
+			styles: Object.merge({}, this.options.style, {
+				display: 'none'
+			}),
+			events: {
+				click: function(event){
+					this.fireEvent('click', event);
+					if (this.options.hideOnClick) this.hide();
+				}.bind(this)
+			}
+		});
+
+		this.hidden = true;
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	inject: function(target, where){
+		where = where || (this.options.inject ? this.options.inject.where : '') || this.target == document.body ? 'inside' : 'after';
+		target = target || (this.options.inject && this.options.inject.target) || this.target;
+
+		this.element.inject(target, where);
+
+		if (this.options.useIframeShim){
+			this.shim = new IframeShim(this.element, this.options.iframeShimOptions);
+
+			this.addEvents({
+				show: this.shim.show.bind(this.shim),
+				hide: this.shim.hide.bind(this.shim),
+				destroy: this.shim.destroy.bind(this.shim)
+			});
+		}
+	},
+
+	position: function(){
+		this.resize(this.options.width, this.options.height);
+
+		this.element.position({
+			relativeTo: this.target,
+			position: 'topLeft',
+			ignoreMargins: !this.options.maskMargins,
+			ignoreScroll: this.target == document.body
+		});
+
+		return this;
+	},
+
+	resize: function(x, y){
+		var opt = {
+			styles: ['padding', 'border']
+		};
+		if (this.options.maskMargins) opt.styles.push('margin');
+
+		var dim = this.target.getComputedSize(opt);
+		if (this.target == document.body){
+			this.element.setStyles({width: 0, height: 0});
+			var win = window.getScrollSize();
+			if (dim.totalHeight < win.y) dim.totalHeight = win.y;
+			if (dim.totalWidth < win.x) dim.totalWidth = win.x;
+		}
+		this.element.setStyles({
+			width: Array.pick([x, dim.totalWidth, dim.x]),
+			height: Array.pick([y, dim.totalHeight, dim.y])
+		});
+
+		return this;
+	},
+
+	show: function(){
+		if (!this.hidden) return this;
+
+		window.addEvent('resize', this.position);
+		this.position();
+		this.showMask.apply(this, arguments);
+
+		return this;
+	},
+
+	showMask: function(){
+		this.element.setStyle('display', 'block');
+		this.hidden = false;
+		this.fireEvent('show');
+	},
+
+	hide: function(){
+		if (this.hidden) return this;
+
+		window.removeEvent('resize', this.position);
+		this.hideMask.apply(this, arguments);
+		if (this.options.destroyOnHide) return this.destroy();
+
+		return this;
+	},
+
+	hideMask: function(){
+		this.element.setStyle('display', 'none');
+		this.hidden = true;
+		this.fireEvent('hide');
+	},
+
+	toggle: function(){
+		this[this.hidden ? 'show' : 'hide']();
+	},
+
+	destroy: function(){
+		this.hide();
+		this.element.destroy();
+		this.fireEvent('destroy');
+		this.target.eliminate('mask');
+	}
+
+});
+
+Element.Properties.mask = {
+
+	set: function(options){
+		var mask = this.retrieve('mask');
+		if (mask) mask.destroy();
+		return this.eliminate('mask').store('mask:options', options);
+	},
+
+	get: function(){
+		var mask = this.retrieve('mask');
+		if (!mask){
+			mask = new Mask(this, this.retrieve('mask:options'));
+			this.store('mask', mask);
+		}
+		return mask;
+	}
+
+};
+
+Element.implement({
+
+	mask: function(options){
+		if (options) this.set('mask', options);
+		this.get('mask').show();
+		return this;
+	},
+
+	unmask: function(){
+		this.get('mask').hide();
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+script: Spinner.js
+
+name: Spinner
+
+description: Adds a semi-transparent overlay over a dom element with a spinnin ajax icon.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Fx.Tween
+  - Core/Request
+  - /Class.refactor
+  - /Mask
+
+provides: [Spinner]
+
+...
+*/
+
+var Spinner = new Class({
+
+	Extends: Mask,
+
+	Implements: Chain,
+
+	options: {/*
+		message: false,*/
+		'class': 'spinner',
+		containerPosition: {},
+		content: {
+			'class': 'spinner-content'
+		},
+		messageContainer: {
+			'class': 'spinner-msg'
+		},
+		img: {
+			'class': 'spinner-img'
+		},
+		fxOptions: {
+			link: 'chain'
+		}
+	},
+
+	initialize: function(target, options){
+		this.target = document.id(target) || document.id(document.body);
+		this.target.store('spinner', this);
+		this.setOptions(options);
+		this.render();
+		this.inject();
+
+		// Add this to events for when noFx is true; parent methods handle hide/show.
+		var deactivate = function(){ this.active = false; }.bind(this);
+		this.addEvents({
+			hide: deactivate,
+			show: deactivate
+		});
+	},
+
+	render: function(){
+		this.parent();
+
+		this.element.set('id', this.options.id || 'spinner-' + String.uniqueID());
+
+		this.content = document.id(this.options.content) || new Element('div', this.options.content);
+		this.content.inject(this.element);
+
+		if (this.options.message){
+			this.msg = document.id(this.options.message) || new Element('p', this.options.messageContainer).appendText(this.options.message);
+			this.msg.inject(this.content);
+		}
+
+		if (this.options.img){
+			this.img = document.id(this.options.img) || new Element('div', this.options.img);
+			this.img.inject(this.content);
+		}
+
+		this.element.set('tween', this.options.fxOptions);
+	},
+
+	show: function(noFx){
+		if (this.active) return this.chain(this.show.bind(this));
+		if (!this.hidden){
+			this.callChain.delay(20, this);
+			return this;
+		}
+
+		this.active = true;
+
+		return this.parent(noFx);
+	},
+
+	showMask: function(noFx){
+		var pos = function(){
+			this.content.position(Object.merge({
+				relativeTo: this.element
+			}, this.options.containerPosition));
+		}.bind(this);
+
+		if (noFx){
+			this.parent();
+			pos();
+		} else {
+			if (!this.options.style.opacity) this.options.style.opacity = this.element.getStyle('opacity').toFloat();
+			this.element.setStyles({
+				display: 'block',
+				opacity: 0
+			}).tween('opacity', this.options.style.opacity);
+			pos();
+			this.hidden = false;
+			this.fireEvent('show');
+			this.callChain();
+		}
+	},
+
+	hide: function(noFx){
+		if (this.active) return this.chain(this.hide.bind(this));
+		if (this.hidden){
+			this.callChain.delay(20, this);
+			return this;
+		}
+		this.active = true;
+		return this.parent(noFx);
+	},
+
+	hideMask: function(noFx){
+		if (noFx) return this.parent();
+		this.element.tween('opacity', 0).get('tween').chain(function(){
+			this.element.setStyle('display', 'none');
+			this.hidden = true;
+			this.fireEvent('hide');
+			this.callChain();
+		}.bind(this));
+	},
+
+	destroy: function(){
+		this.content.destroy();
+		this.parent();
+		this.target.eliminate('spinner');
+	}
+
+});
+
+Request = Class.refactor(Request, {
+
+	options: {
+		useSpinner: false,
+		spinnerOptions: {},
+		spinnerTarget: false
+	},
+
+	initialize: function(options){
+		this._send = this.send;
+		this.send = function(options){
+			var spinner = this.getSpinner();
+			if (spinner) spinner.chain(this._send.pass(options, this)).show();
+			else this._send(options);
+			return this;
+		};
+		this.previous(options);
+	},
+
+	getSpinner: function(){
+		if (!this.spinner){
+			var update = document.id(this.options.spinnerTarget) || document.id(this.options.update);
+			if (this.options.useSpinner && update){
+				update.set('spinner', this.options.spinnerOptions);
+				var spinner = this.spinner = update.get('spinner');
+				['complete', 'exception', 'cancel'].each(function(event){
+					this.addEvent(event, spinner.hide.bind(spinner));
+				}, this);
+			}
+		}
+		return this.spinner;
+	}
+
+});
+
+Element.Properties.spinner = {
+
+	set: function(options){
+		var spinner = this.retrieve('spinner');
+		if (spinner) spinner.destroy();
+		return this.eliminate('spinner').store('spinner:options', options);
+	},
+
+	get: function(){
+		var spinner = this.retrieve('spinner');
+		if (!spinner){
+			spinner = new Spinner(this, this.retrieve('spinner:options'));
+			this.store('spinner', spinner);
+		}
+		return spinner;
+	}
+
+};
+
+Element.implement({
+
+	spin: function(options){
+		if (options) this.set('spinner', options);
+		this.get('spinner').show();
+		return this;
+	},
+
+	unspin: function(){
+		this.get('spinner').hide();
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+script: Form.Request.js
+
+name: Form.Request
+
+description: Handles the basic functionality of submitting a form and updating a dom element with the result.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Request.HTML
+  - /Class.Binds
+  - /Class.Occlude
+  - /Spinner
+  - /String.QueryString
+  - /Element.Delegation
+
+provides: [Form.Request]
+
+...
+*/
+
+if (!window.Form) window.Form = {};
+
+(function(){
+
+	Form.Request = new Class({
+
+		Binds: ['onSubmit', 'onFormValidate'],
+
+		Implements: [Options, Events, Class.Occlude],
+
+		options: {/*
+			onFailure: function(){},
+			onSuccess: function(){}, // aliased to onComplete,
+			onSend: function(){}*/
+			requestOptions: {
+				evalScripts: true,
+				useSpinner: true,
+				emulation: false,
+				link: 'ignore'
+			},
+			sendButtonClicked: true,
+			extraData: {},
+			resetForm: true
+		},
+
+		property: 'form.request',
+
+		initialize: function(form, target, options){
+			this.element = document.id(form);
+			if (this.occlude()) return this.occluded;
+			this.setOptions(options)
+				.setTarget(target)
+				.attach();
+		},
+
+		setTarget: function(target){
+			this.target = document.id(target);
+			if (!this.request){
+				this.makeRequest();
+			} else {
+				this.request.setOptions({
+					update: this.target
+				});
+			}
+			return this;
+		},
+
+		toElement: function(){
+			return this.element;
+		},
+
+		makeRequest: function(){
+			var self = this;
+			this.request = new Request.HTML(Object.merge({
+					update: this.target,
+					emulation: false,
+					spinnerTarget: this.element,
+					method: this.element.get('method') || 'post'
+			}, this.options.requestOptions)).addEvents({
+				success: function(tree, elements, html, javascript){
+					['complete', 'success'].each(function(evt){
+						self.fireEvent(evt, [self.target, tree, elements, html, javascript]);
+					});
+				},
+				failure: function(){
+					self.fireEvent('complete', arguments).fireEvent('failure', arguments);
+				},
+				exception: function(){
+					self.fireEvent('failure', arguments);
+				}
+			});
+			return this.attachReset();
+		},
+
+		attachReset: function(){
+			if (!this.options.resetForm) return this;
+			this.request.addEvent('success', function(){
+				Function.attempt(function(){
+					this.element.reset();
+				}.bind(this));
+				if (window.OverText) OverText.update();
+			}.bind(this));
+			return this;
+		},
+
+		attach: function(attach){
+			var method = (attach != false) ? 'addEvent' : 'removeEvent';
+			this.element[method]('click:relay(button, input[type=submit])', this.saveClickedButton.bind(this));
+
+			var fv = this.element.retrieve('validator');
+			if (fv) fv[method]('onFormValidate', this.onFormValidate);
+			else this.element[method]('submit', this.onSubmit);
+
+			return this;
+		},
+
+		detach: function(){
+			return this.attach(false);
+		},
+
+		//public method
+		enable: function(){
+			return this.attach();
+		},
+
+		//public method
+		disable: function(){
+			return this.detach();
+		},
+
+		onFormValidate: function(valid, form, event){
+			//if there's no event, then this wasn't a submit event
+			if (!event) return;
+			var fv = this.element.retrieve('validator');
+			if (valid || (fv && !fv.options.stopOnFailure)){
+				event.stop();
+				this.send();
+			}
+		},
+
+		onSubmit: function(event){
+			var fv = this.element.retrieve('validator');
+			if (fv){
+				//form validator was created after Form.Request
+				this.element.removeEvent('submit', this.onSubmit);
+				fv.addEvent('onFormValidate', this.onFormValidate);
+				this.element.validate();
+				return;
+			}
+			if (event) event.stop();
+			this.send();
+		},
+
+		saveClickedButton: function(event, target){
+			var targetName = target.get('name');
+			if (!targetName || !this.options.sendButtonClicked) return;
+			this.options.extraData[targetName] = target.get('value') || true;
+			this.clickedCleaner = function(){
+				delete this.options.extraData[targetName];
+				this.clickedCleaner = function(){};
+			}.bind(this);
+		},
+
+		clickedCleaner: function(){},
+
+		send: function(){
+			var str = this.element.toQueryString().trim(),
+				data = Object.toQueryString(this.options.extraData);
+
+			if (str) str += "&" + data;
+			else str = data;
+
+			this.fireEvent('send', [this.element, str.parseQueryString()]);
+			this.request.send({
+				data: str,
+				url: this.options.requestOptions.url || this.element.get('action')
+			});
+			this.clickedCleaner();
+			return this;
+		}
+
+	});
+
+	Element.implement('formUpdate', function(update, options){
+		var fq = this.retrieve('form.request');
+		if (!fq){
+			fq = new Form.Request(this, update, options);
+		} else {
+			if (update) fq.setTarget(update);
+			if (options) fq.setOptions(options).makeRequest();
+		}
+		fq.send();
+		return this;
+	});
+
+})();
+
+
+/*
+---
+
+script: Fx.Reveal.js
+
+name: Fx.Reveal
+
+description: Defines Fx.Reveal, a class that shows and hides elements with a transition.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Fx.Morph
+  - /Element.Shortcuts
+  - /Element.Measure
+
+provides: [Fx.Reveal]
+
+...
+*/
+
+(function(){
+
+
+var hideTheseOf = function(object){
+	var hideThese = object.options.hideInputs;
+	if (window.OverText){
+		var otClasses = [null];
+		OverText.each(function(ot){
+			otClasses.include('.' + ot.options.labelClass);
+		});
+		if (otClasses) hideThese += otClasses.join(', ');
+	}
+	return (hideThese) ? object.element.getElements(hideThese) : null;
+};
+
+
+Fx.Reveal = new Class({
+
+	Extends: Fx.Morph,
+
+	options: {/*
+		onShow: function(thisElement){},
+		onHide: function(thisElement){},
+		onComplete: function(thisElement){},
+		heightOverride: null,
+		widthOverride: null,*/
+		link: 'cancel',
+		styles: ['padding', 'border', 'margin'],
+		transitionOpacity: !Browser.ie6,
+		mode: 'vertical',
+		display: function(){
+			return this.element.get('tag') != 'tr' ? 'block' : 'table-row';
+		},
+		opacity: 1,
+		hideInputs: Browser.ie ? 'select, input, textarea, object, embed' : null
+	},
+
+	dissolve: function(){
+		if (!this.hiding && !this.showing){
+			if (this.element.getStyle('display') != 'none'){
+				this.hiding = true;
+				this.showing = false;
+				this.hidden = true;
+				this.cssText = this.element.style.cssText;
+
+				var startStyles = this.element.getComputedSize({
+					styles: this.options.styles,
+					mode: this.options.mode
+				});
+				if (this.options.transitionOpacity) startStyles.opacity = this.options.opacity;
+
+				var zero = {};
+				Object.each(startStyles, function(style, name){
+					zero[name] = [style, 0];
+				});
+
+				this.element.setStyles({
+					display: Function.from(this.options.display).call(this),
+					overflow: 'hidden'
+				});
+
+				var hideThese = hideTheseOf(this);
+				if (hideThese) hideThese.setStyle('visibility', 'hidden');
+
+				this.$chain.unshift(function(){
+					if (this.hidden){
+						this.hiding = false;
+						this.element.style.cssText = this.cssText;
+						this.element.setStyle('display', 'none');
+						if (hideThese) hideThese.setStyle('visibility', 'visible');
+					}
+					this.fireEvent('hide', this.element);
+					this.callChain();
+				}.bind(this));
+
+				this.start(zero);
+			} else {
+				this.callChain.delay(10, this);
+				this.fireEvent('complete', this.element);
+				this.fireEvent('hide', this.element);
+			}
+		} else if (this.options.link == 'chain'){
+			this.chain(this.dissolve.bind(this));
+		} else if (this.options.link == 'cancel' && !this.hiding){
+			this.cancel();
+			this.dissolve();
+		}
+		return this;
+	},
+
+	reveal: function(){
+		if (!this.showing && !this.hiding){
+			if (this.element.getStyle('display') == 'none'){
+				this.hiding = false;
+				this.showing = true;
+				this.hidden = false;
+				this.cssText = this.element.style.cssText;
+
+				var startStyles;
+				this.element.measure(function(){
+					startStyles = this.element.getComputedSize({
+						styles: this.options.styles,
+						mode: this.options.mode
+					});
+				}.bind(this));
+				if (this.options.heightOverride != null) startStyles.height = this.options.heightOverride.toInt();
+				if (this.options.widthOverride != null) startStyles.width = this.options.widthOverride.toInt();
+				if (this.options.transitionOpacity){
+					this.element.setStyle('opacity', 0);
+					startStyles.opacity = this.options.opacity;
+				}
+
+				var zero = {
+					height: 0,
+					display: Function.from(this.options.display).call(this)
+				};
+				Object.each(startStyles, function(style, name){
+					zero[name] = 0;
+				});
+				zero.overflow = 'hidden';
+
+				this.element.setStyles(zero);
+
+				var hideThese = hideTheseOf(this);
+				if (hideThese) hideThese.setStyle('visibility', 'hidden');
+
+				this.$chain.unshift(function(){
+					this.element.style.cssText = this.cssText;
+					this.element.setStyle('display', Function.from(this.options.display).call(this));
+					if (!this.hidden) this.showing = false;
+					if (hideThese) hideThese.setStyle('visibility', 'visible');
+					this.callChain();
+					this.fireEvent('show', this.element);
+				}.bind(this));
+
+				this.start(startStyles);
+			} else {
+				this.callChain();
+				this.fireEvent('complete', this.element);
+				this.fireEvent('show', this.element);
+			}
+		} else if (this.options.link == 'chain'){
+			this.chain(this.reveal.bind(this));
+		} else if (this.options.link == 'cancel' && !this.showing){
+			this.cancel();
+			this.reveal();
+		}
+		return this;
+	},
+
+	toggle: function(){
+		if (this.element.getStyle('display') == 'none'){
+			this.reveal();
+		} else {
+			this.dissolve();
+		}
+		return this;
+	},
+
+	cancel: function(){
+		this.parent.apply(this, arguments);
+		if (this.cssText != null) this.element.style.cssText = this.cssText;
+		this.hiding = false;
+		this.showing = false;
+		return this;
+	}
+
+});
+
+Element.Properties.reveal = {
+
+	set: function(options){
+		this.get('reveal').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var reveal = this.retrieve('reveal');
+		if (!reveal){
+			reveal = new Fx.Reveal(this);
+			this.store('reveal', reveal);
+		}
+		return reveal;
+	}
+
+};
+
+Element.Properties.dissolve = Element.Properties.reveal;
+
+Element.implement({
+
+	reveal: function(options){
+		this.get('reveal').setOptions(options).reveal();
+		return this;
+	},
+
+	dissolve: function(options){
+		this.get('reveal').setOptions(options).dissolve();
+		return this;
+	},
+
+	nix: function(options){
+		var params = Array.link(arguments, {destroy: Type.isBoolean, options: Type.isObject});
+		this.get('reveal').setOptions(options).dissolve().chain(function(){
+			this[params.destroy ? 'destroy' : 'dispose']();
+		}.bind(this));
+		return this;
+	},
+
+	wink: function(){
+		var params = Array.link(arguments, {duration: Type.isNumber, options: Type.isObject});
+		var reveal = this.get('reveal').setOptions(params.options);
+		reveal.reveal().chain(function(){
+			(function(){
+				reveal.dissolve();
+			}).delay(params.duration || 2000);
+		});
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: Form.Request.Append.js
+
+name: Form.Request.Append
+
+description: Handles the basic functionality of submitting a form and updating a dom element with the result. The result is appended to the DOM element instead of replacing its contents.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Form.Request
+  - /Fx.Reveal
+  - /Elements.from
+
+provides: [Form.Request.Append]
+
+...
+*/
+
+Form.Request.Append = new Class({
+
+	Extends: Form.Request,
+
+	options: {
+		//onBeforeEffect: function(){},
+		useReveal: true,
+		revealOptions: {},
+		inject: 'bottom'
+	},
+
+	makeRequest: function(){
+		this.request = new Request.HTML(Object.merge({
+				url: this.element.get('action'),
+				method: this.element.get('method') || 'post',
+				spinnerTarget: this.element
+			}, this.options.requestOptions, {
+				evalScripts: false
+			})
+		).addEvents({
+			success: function(tree, elements, html, javascript){
+				var container;
+				var kids = Elements.from(html);
+				if (kids.length == 1){
+					container = kids[0];
+				} else {
+					 container = new Element('div', {
+						styles: {
+							display: 'none'
+						}
+					}).adopt(kids);
+				}
+				container.inject(this.target, this.options.inject);
+				if (this.options.requestOptions.evalScripts) Browser.exec(javascript);
+				this.fireEvent('beforeEffect', container);
+				var finish = function(){
+					this.fireEvent('success', [container, this.target, tree, elements, html, javascript]);
+				}.bind(this);
+				if (this.options.useReveal){
+					container.set('reveal', this.options.revealOptions).get('reveal').chain(finish);
+					container.reveal();
+				} else {
+					finish();
+				}
+			}.bind(this),
+			failure: function(xhr){
+				this.fireEvent('failure', xhr);
+			}.bind(this)
+		});
+		this.attachReset();
+	}
+
+});
+
+
+/*
+---
+
+name: Locale.en-US.Form.Validator
+
+description: Form Validator messages for English.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Locale
+
+provides: [Locale.en-US.Form.Validator]
+
+...
+*/
+
+Locale.define('en-US', 'FormValidator', {
+
+	required: 'This field is required.',
+	length: 'Please enter {length} characters (you entered {elLength} characters)',
+	minLength: 'Please enter at least {minLength} characters (you entered {length} characters).',
+	maxLength: 'Please enter no more than {maxLength} characters (you entered {length} characters).',
+	integer: 'Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.',
+	numeric: 'Please enter only numeric values in this field (i.e. "1" or "1.1" or "-1" or "-1.1").',
+	digits: 'Please use numbers and punctuation only in this field (for example, a phone number with dashes or dots is permitted).',
+	alpha: 'Please use only letters (a-z) within this field. No spaces or other characters are allowed.',
+	alphanum: 'Please use only letters (a-z) or numbers (0-9) in this field. No spaces or other characters are allowed.',
+	dateSuchAs: 'Please enter a valid date such as {date}',
+	dateInFormatMDY: 'Please enter a valid date such as MM/DD/YYYY (i.e. "12/31/1999")',
+	email: 'Please enter a valid email address. For example "fred@domain.com".',
+	url: 'Please enter a valid URL such as http://www.example.com.',
+	currencyDollar: 'Please enter a valid $ amount. For example $100.00 .',
+	oneRequired: 'Please enter something for at least one of these inputs.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Warning: ',
+
+	// Form.Validator.Extras
+	noSpace: 'There can be no spaces in this input.',
+	reqChkByNode: 'No items are selected.',
+	requiredChk: 'This field is required.',
+	reqChkByName: 'Please select a {label}.',
+	match: 'This field needs to match the {matchName} field',
+	startDate: 'the start date',
+	endDate: 'the end date',
+	currendDate: 'the current date',
+	afterDate: 'The date should be the same or after {label}.',
+	beforeDate: 'The date should be the same or before {label}.',
+	startMonth: 'Please select a start month',
+	sameMonth: 'These two dates must be in the same month - you must change one or the other.',
+	creditcard: 'The credit card number entered is invalid. Please check the number and try again. {length} digits entered.'
+
+});
+
+
+/*
+---
+
+script: Form.Validator.js
+
+name: Form.Validator
+
+description: A css-class based form validation system.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Core/Slick.Finder
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/JSON
+  - /Locale
+  - /Class.Binds
+  - /Date
+  - /Element.Forms
+  - /Locale.en-US.Form.Validator
+  - /Element.Shortcuts
+
+provides: [Form.Validator, InputValidator, FormValidator.BaseValidators]
+
+...
+*/
+if (!window.Form) window.Form = {};
+
+var InputValidator = this.InputValidator = new Class({
+
+	Implements: [Options],
+
+	options: {
+		errorMsg: 'Validation failed.',
+		test: Function.from(true)
+	},
+
+	initialize: function(className, options){
+		this.setOptions(options);
+		this.className = className;
+	},
+
+	test: function(field, props){
+		field = document.id(field);
+		return (field) ? this.options.test(field, props || this.getProps(field)) : false;
+	},
+
+	getError: function(field, props){
+		field = document.id(field);
+		var err = this.options.errorMsg;
+		if (typeOf(err) == 'function') err = err(field, props || this.getProps(field));
+		return err;
+	},
+
+	getProps: function(field){
+		field = document.id(field);
+		return (field) ? field.get('validatorProps') : {};
+	}
+
+});
+
+Element.Properties.validators = {
+
+	get: function(){
+		return (this.get('data-validators') || this.className).clean().split(' ');
+	}
+
+};
+
+Element.Properties.validatorProps = {
+
+	set: function(props){
+		return this.eliminate('$moo:validatorProps').store('$moo:validatorProps', props);
+	},
+
+	get: function(props){
+		if (props) this.set(props);
+		if (this.retrieve('$moo:validatorProps')) return this.retrieve('$moo:validatorProps');
+		if (this.getProperty('data-validator-properties') || this.getProperty('validatorProps')){
+			try {
+				this.store('$moo:validatorProps', JSON.decode(this.getProperty('validatorProps') || this.getProperty('data-validator-properties')));
+			}catch(e){
+				return {};
+			}
+		} else {
+			var vals = this.get('validators').filter(function(cls){
+				return cls.test(':');
+			});
+			if (!vals.length){
+				this.store('$moo:validatorProps', {});
+			} else {
+				props = {};
+				vals.each(function(cls){
+					var split = cls.split(':');
+					if (split[1]){
+						try {
+							props[split[0]] = JSON.decode(split[1]);
+						} catch(e){}
+					}
+				});
+				this.store('$moo:validatorProps', props);
+			}
+		}
+		return this.retrieve('$moo:validatorProps');
+	}
+
+};
+
+Form.Validator = new Class({
+
+	Implements: [Options, Events],
+
+	Binds: ['onSubmit'],
+
+	options: {/*
+		onFormValidate: function(isValid, form, event){},
+		onElementValidate: function(isValid, field, className, warn){},
+		onElementPass: function(field){},
+		onElementFail: function(field, validatorsFailed){}, */
+		fieldSelectors: 'input, select, textarea',
+		ignoreHidden: true,
+		ignoreDisabled: true,
+		useTitles: false,
+		evaluateOnSubmit: true,
+		evaluateFieldsOnBlur: true,
+		evaluateFieldsOnChange: true,
+		serial: true,
+		stopOnFailure: true,
+		warningPrefix: function(){
+			return Form.Validator.getMsg('warningPrefix') || 'Warning: ';
+		},
+		errorPrefix: function(){
+			return Form.Validator.getMsg('errorPrefix') || 'Error: ';
+		}
+	},
+
+	initialize: function(form, options){
+		this.setOptions(options);
+		this.element = document.id(form);
+		this.element.store('validator', this);
+		this.warningPrefix = Function.from(this.options.warningPrefix)();
+		this.errorPrefix = Function.from(this.options.errorPrefix)();
+		if (this.options.evaluateOnSubmit) this.element.addEvent('submit', this.onSubmit);
+		if (this.options.evaluateFieldsOnBlur || this.options.evaluateFieldsOnChange) this.watchFields(this.getFields());
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	getFields: function(){
+		return (this.fields = this.element.getElements(this.options.fieldSelectors));
+	},
+
+	watchFields: function(fields){
+		fields.each(function(el){
+			if (this.options.evaluateFieldsOnBlur)
+				el.addEvent('blur', this.validationMonitor.pass([el, false], this));
+			if (this.options.evaluateFieldsOnChange)
+				el.addEvent('change', this.validationMonitor.pass([el, true], this));
+		}, this);
+	},
+
+	validationMonitor: function(){
+		clearTimeout(this.timer);
+		this.timer = this.validateField.delay(50, this, arguments);
+	},
+
+	onSubmit: function(event){
+		if (this.validate(event)) this.reset();
+	},
+
+	reset: function(){
+		this.getFields().each(this.resetField, this);
+		return this;
+	},
+
+	validate: function(event){
+		var result = this.getFields().map(function(field){
+			return this.validateField(field, true);
+		}, this).every(function(v){
+			return v;
+		});
+		this.fireEvent('formValidate', [result, this.element, event]);
+		if (this.options.stopOnFailure && !result && event) event.preventDefault();
+		return result;
+	},
+
+	validateField: function(field, force){
+		if (this.paused) return true;
+		field = document.id(field);
+		var passed = !field.hasClass('validation-failed');
+		var failed, warned;
+		if (this.options.serial && !force){
+			failed = this.element.getElement('.validation-failed');
+			warned = this.element.getElement('.warning');
+		}
+		if (field && (!failed || force || field.hasClass('validation-failed') || (failed && !this.options.serial))){
+			var validationTypes = field.get('validators');
+			var validators = validationTypes.some(function(cn){
+				return this.getValidator(cn);
+			}, this);
+			var validatorsFailed = [];
+			validationTypes.each(function(className){
+				if (className && !this.test(className, field)) validatorsFailed.include(className);
+			}, this);
+			passed = validatorsFailed.length === 0;
+			if (validators && !this.hasValidator(field, 'warnOnly')){
+				if (passed){
+					field.addClass('validation-passed').removeClass('validation-failed');
+					this.fireEvent('elementPass', [field]);
+				} else {
+					field.addClass('validation-failed').removeClass('validation-passed');
+					this.fireEvent('elementFail', [field, validatorsFailed]);
+				}
+			}
+			if (!warned){
+				var warnings = validationTypes.some(function(cn){
+					if (cn.test('^warn'))
+						return this.getValidator(cn.replace(/^warn-/,''));
+					else return null;
+				}, this);
+				field.removeClass('warning');
+				var warnResult = validationTypes.map(function(cn){
+					if (cn.test('^warn'))
+						return this.test(cn.replace(/^warn-/,''), field, true);
+					else return null;
+				}, this);
+			}
+		}
+		return passed;
+	},
+
+	test: function(className, field, warn){
+		field = document.id(field);
+		if ((this.options.ignoreHidden && !field.isVisible()) || (this.options.ignoreDisabled && field.get('disabled'))) return true;
+		var validator = this.getValidator(className);
+		if (warn != null) warn = false;
+		if (this.hasValidator(field, 'warnOnly')) warn = true;
+		var isValid = this.hasValidator(field, 'ignoreValidation') || (validator ? validator.test(field) : true);
+		if (validator && field.isVisible()) this.fireEvent('elementValidate', [isValid, field, className, warn]);
+		if (warn) return true;
+		return isValid;
+	},
+
+	hasValidator: function(field, value){
+		return field.get('validators').contains(value);
+	},
+
+	resetField: function(field){
+		field = document.id(field);
+		if (field){
+			field.get('validators').each(function(className){
+				if (className.test('^warn-')) className = className.replace(/^warn-/, '');
+				field.removeClass('validation-failed');
+				field.removeClass('warning');
+				field.removeClass('validation-passed');
+			}, this);
+		}
+		return this;
+	},
+
+	stop: function(){
+		this.paused = true;
+		return this;
+	},
+
+	start: function(){
+		this.paused = false;
+		return this;
+	},
+
+	ignoreField: function(field, warn){
+		field = document.id(field);
+		if (field){
+			this.enforceField(field);
+			if (warn) field.addClass('warnOnly');
+			else field.addClass('ignoreValidation');
+		}
+		return this;
+	},
+
+	enforceField: function(field){
+		field = document.id(field);
+		if (field) field.removeClass('warnOnly').removeClass('ignoreValidation');
+		return this;
+	}
+
+});
+
+Form.Validator.getMsg = function(key){
+	return Locale.get('FormValidator.' + key);
+};
+
+Form.Validator.adders = {
+
+	validators:{},
+
+	add : function(className, options){
+		this.validators[className] = new InputValidator(className, options);
+		//if this is a class (this method is used by instances of Form.Validator and the Form.Validator namespace)
+		//extend these validators into it
+		//this allows validators to be global and/or per instance
+		if (!this.initialize){
+			this.implement({
+				validators: this.validators
+			});
+		}
+	},
+
+	addAllThese : function(validators){
+		Array.from(validators).each(function(validator){
+			this.add(validator[0], validator[1]);
+		}, this);
+	},
+
+	getValidator: function(className){
+		return this.validators[className.split(':')[0]];
+	}
+
+};
+
+Object.append(Form.Validator, Form.Validator.adders);
+
+Form.Validator.implement(Form.Validator.adders);
+
+Form.Validator.add('IsEmpty', {
+
+	errorMsg: false,
+	test: function(element){
+		if (element.type == 'select-one' || element.type == 'select')
+			return !(element.selectedIndex >= 0 && element.options[element.selectedIndex].value != '');
+		else
+			return ((element.get('value') == null) || (element.get('value').length == 0));
+	}
+
+});
+
+Form.Validator.addAllThese([
+
+	['required', {
+		errorMsg: function(){
+			return Form.Validator.getMsg('required');
+		},
+		test: function(element){
+			return !Form.Validator.getValidator('IsEmpty').test(element);
+		}
+	}],
+
+	['length', {
+		errorMsg: function(element, props){
+			if (typeOf(props.length) != 'null')
+				return Form.Validator.getMsg('length').substitute({length: props.length, elLength: element.get('value').length});
+			else return '';
+		},
+		test: function(element, props){
+			if (typeOf(props.length) != 'null') return (element.get('value').length == props.length || element.get('value').length == 0);
+			else return true;
+		}
+	}],	
+
+	['minLength', {
+		errorMsg: function(element, props){
+			if (typeOf(props.minLength) != 'null')
+				return Form.Validator.getMsg('minLength').substitute({minLength: props.minLength, length: element.get('value').length});
+			else return '';
+		},
+		test: function(element, props){
+			if (typeOf(props.minLength) != 'null') return (element.get('value').length >= (props.minLength || 0));
+			else return true;
+		}
+	}],
+
+	['maxLength', {
+		errorMsg: function(element, props){
+			//props is {maxLength:10}
+			if (typeOf(props.maxLength) != 'null')
+				return Form.Validator.getMsg('maxLength').substitute({maxLength: props.maxLength, length: element.get('value').length});
+			else return '';
+		},
+		test: function(element, props){
+			return element.get('value').length <= (props.maxLength || 10000);
+		}
+	}],
+
+	['validate-integer', {
+		errorMsg: Form.Validator.getMsg.pass('integer'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) || (/^(-?[1-9]\d*|0)$/).test(element.get('value'));
+		}
+	}],
+
+	['validate-numeric', {
+		errorMsg: Form.Validator.getMsg.pass('numeric'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) ||
+				(/^-?(?:0$0(?=\d*\.)|[1-9]|0)\d*(\.\d+)?$/).test(element.get('value'));
+		}
+	}],
+
+	['validate-digits', {
+		errorMsg: Form.Validator.getMsg.pass('digits'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) || (/^[\d() .:\-\+#]+$/.test(element.get('value')));
+		}
+	}],
+
+	['validate-alpha', {
+		errorMsg: Form.Validator.getMsg.pass('alpha'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) || (/^[a-zA-Z]+$/).test(element.get('value'));
+		}
+	}],
+
+	['validate-alphanum', {
+		errorMsg: Form.Validator.getMsg.pass('alphanum'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) || !(/\W/).test(element.get('value'));
+		}
+	}],
+
+	['validate-date', {
+		errorMsg: function(element, props){
+			if (Date.parse){
+				var format = props.dateFormat || '%x';
+				return Form.Validator.getMsg('dateSuchAs').substitute({date: new Date().format(format)});
+			} else {
+				return Form.Validator.getMsg('dateInFormatMDY');
+			}
+		},
+		test: function(element, props){
+			if (Form.Validator.getValidator('IsEmpty').test(element)) return true;
+			var dateLocale = Locale.getCurrent().sets.Date,
+				dateNouns = new RegExp([dateLocale.days, dateLocale.days_abbr, dateLocale.months, dateLocale.months_abbr].flatten().join('|'), 'i'),
+				value = element.get('value'),
+				wordsInValue = value.match(/[a-z]+/gi);
+
+				if (wordsInValue && !wordsInValue.every(dateNouns.exec, dateNouns)) return false;
+
+				var date = Date.parse(value),
+					format = props.dateFormat || '%x',
+					formatted = date.format(format);
+
+				if (formatted != 'invalid date') element.set('value', formatted);
+				return date.isValid();
+		}
+	}],
+
+	['validate-email', {
+		errorMsg: Form.Validator.getMsg.pass('email'),
+		test: function(element){
+			/*
+			var chars = "[a-z0-9!#$%&'*+/=?^_`{|}~-]",
+				local = '(?:' + chars + '\\.?){0,63}' + chars,
+
+				label = '[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?',
+				hostname = '(?:' + label + '\\.)*' + label;
+
+				octet = '(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)',
+				ipv4 = '\\[(?:' + octet + '\\.){3}' + octet + '\\]',
+
+				domain = '(?:' + hostname + '|' + ipv4 + ')';
+
+			var regex = new RegExp('^' + local + '@' + domain + '$', 'i');
+			*/
+			return Form.Validator.getValidator('IsEmpty').test(element) || (/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+\/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(element.get('value'));
+		}
+	}],
+
+	['validate-url', {
+		errorMsg: Form.Validator.getMsg.pass('url'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) || (/^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i).test(element.get('value'));
+		}
+	}],
+
+	['validate-currency-dollar', {
+		errorMsg: Form.Validator.getMsg.pass('currencyDollar'),
+		test: function(element){
+			return Form.Validator.getValidator('IsEmpty').test(element) || (/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(element.get('value'));
+		}
+	}],
+
+	['validate-one-required', {
+		errorMsg: Form.Validator.getMsg.pass('oneRequired'),
+		test: function(element, props){
+			var p = document.id(props['validate-one-required']) || element.getParent(props['validate-one-required']);
+			return p.getElements('input').some(function(el){
+				if (['checkbox', 'radio'].contains(el.get('type'))) return el.get('checked');
+				return el.get('value');
+			});
+		}
+	}]
+
+]);
+
+Element.Properties.validator = {
+
+	set: function(options){
+		this.get('validator').setOptions(options);
+	},
+
+	get: function(){
+		var validator = this.retrieve('validator');
+		if (!validator){
+			validator = new Form.Validator(this);
+			this.store('validator', validator);
+		}
+		return validator;
+	}
+
+};
+
+Element.implement({
+
+	validate: function(options){
+		if (options) this.set('validator', options);
+		return this.get('validator').validate();
+	}
+
+});
+
+
+
+
+
+
+
+/*
+---
+
+script: Form.Validator.Inline.js
+
+name: Form.Validator.Inline
+
+description: Extends Form.Validator to add inline messages.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Form.Validator
+
+provides: [Form.Validator.Inline]
+
+...
+*/
+
+Form.Validator.Inline = new Class({
+
+	Extends: Form.Validator,
+
+	options: {
+		showError: function(errorElement){
+			if (errorElement.reveal) errorElement.reveal();
+			else errorElement.setStyle('display', 'block');
+		},
+		hideError: function(errorElement){
+			if (errorElement.dissolve) errorElement.dissolve();
+			else errorElement.setStyle('display', 'none');
+		},
+		scrollToErrorsOnSubmit: true,
+		scrollToErrorsOnBlur: false,
+		scrollToErrorsOnChange: false,
+		scrollFxOptions: {
+			transition: 'quad:out',
+			offset: {
+				y: -20
+			}
+		}
+	},
+
+	initialize: function(form, options){
+		this.parent(form, options);
+		this.addEvent('onElementValidate', function(isValid, field, className, warn){
+			var validator = this.getValidator(className);
+			if (!isValid && validator.getError(field)){
+				if (warn) field.addClass('warning');
+				var advice = this.makeAdvice(className, field, validator.getError(field), warn);
+				this.insertAdvice(advice, field);
+				this.showAdvice(className, field);
+			} else {
+				this.hideAdvice(className, field);
+			}
+		});
+	},
+
+	makeAdvice: function(className, field, error, warn){
+		var errorMsg = (warn) ? this.warningPrefix : this.errorPrefix;
+			errorMsg += (this.options.useTitles) ? field.title || error:error;
+		var cssClass = (warn) ? 'warning-advice' : 'validation-advice';
+		var advice = this.getAdvice(className, field);
+		if (advice){
+			advice = advice.set('html', errorMsg);
+		} else {
+			advice = new Element('div', {
+				html: errorMsg,
+				styles: { display: 'none' },
+				id: 'advice-' + className.split(':')[0] + '-' + this.getFieldId(field)
+			}).addClass(cssClass);
+		}
+		field.store('$moo:advice-' + className, advice);
+		return advice;
+	},
+
+	getFieldId : function(field){
+		return field.id ? field.id : field.id = 'input_' + field.name;
+	},
+
+	showAdvice: function(className, field){
+		var advice = this.getAdvice(className, field);
+		if (
+			advice &&
+			!field.retrieve('$moo:' + this.getPropName(className)) &&
+			(
+				advice.getStyle('display') == 'none' ||
+				advice.getStyle('visiblity') == 'hidden' ||
+				advice.getStyle('opacity') == 0
+			)
+		){
+			field.store('$moo:' + this.getPropName(className), true);
+			this.options.showError(advice);
+			this.fireEvent('showAdvice', [field, advice, className]);
+		}
+	},
+
+	hideAdvice: function(className, field){
+		var advice = this.getAdvice(className, field);
+		if (advice && field.retrieve('$moo:' + this.getPropName(className))){
+			field.store('$moo:' + this.getPropName(className), false);
+			this.options.hideError(advice);
+			this.fireEvent('hideAdvice', [field, advice, className]);
+		}
+	},
+
+	getPropName: function(className){
+		return 'advice' + className;
+	},
+
+	resetField: function(field){
+		field = document.id(field);
+		if (!field) return this;
+		this.parent(field);
+		field.get('validators').each(function(className){
+			this.hideAdvice(className, field);
+		}, this);
+		return this;
+	},
+
+	getAllAdviceMessages: function(field, force){
+		var advice = [];
+		if (field.hasClass('ignoreValidation') && !force) return advice;
+		var validators = field.get('validators').some(function(cn){
+			var warner = cn.test('^warn-') || field.hasClass('warnOnly');
+			if (warner) cn = cn.replace(/^warn-/, '');
+			var validator = this.getValidator(cn);
+			if (!validator) return;
+			advice.push({
+				message: validator.getError(field),
+				warnOnly: warner,
+				passed: validator.test(),
+				validator: validator
+			});
+		}, this);
+		return advice;
+	},
+
+	getAdvice: function(className, field){
+		return field.retrieve('$moo:advice-' + className);
+	},
+
+	insertAdvice: function(advice, field){
+		//Check for error position prop
+		var props = field.get('validatorProps');
+		//Build advice
+		if (!props.msgPos || !document.id(props.msgPos)){
+			if (field.type && field.type.toLowerCase() == 'radio') field.getParent().adopt(advice);
+			else advice.inject(document.id(field), 'after');
+		} else {
+			document.id(props.msgPos).grab(advice);
+		}
+	},
+
+	validateField: function(field, force, scroll){
+		var result = this.parent(field, force);
+		if (((this.options.scrollToErrorsOnSubmit && scroll == null) || scroll) && !result){
+			var failed = document.id(this).getElement('.validation-failed');
+			var par = document.id(this).getParent();
+			while (par != document.body && par.getScrollSize().y == par.getSize().y){
+				par = par.getParent();
+			}
+			var fx = par.retrieve('$moo:fvScroller');
+			if (!fx && window.Fx && Fx.Scroll){
+				fx = new Fx.Scroll(par, this.options.scrollFxOptions);
+				par.store('$moo:fvScroller', fx);
+			}
+			if (failed){
+				if (fx) fx.toElement(failed);
+				else par.scrollTo(par.getScroll().x, failed.getPosition(par).y - 20);
+			}
+		}
+		return result;
+	},
+
+	watchFields: function(fields){
+		fields.each(function(el){
+		if (this.options.evaluateFieldsOnBlur){
+			el.addEvent('blur', this.validationMonitor.pass([el, false, this.options.scrollToErrorsOnBlur], this));
+		}
+		if (this.options.evaluateFieldsOnChange){
+				el.addEvent('change', this.validationMonitor.pass([el, true, this.options.scrollToErrorsOnChange], this));
+			}
+		}, this);
+	}
+
+});
+
+
+/*
+---
+
+script: Form.Validator.Extras.js
+
+name: Form.Validator.Extras
+
+description: Additional validators for the Form.Validator class.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Form.Validator
+
+provides: [Form.Validator.Extras]
+
+...
+*/
+Form.Validator.addAllThese([
+
+	['validate-enforce-oncheck', {
+		test: function(element, props){
+			var fv = element.getParent('form').retrieve('validator');
+			if (!fv) return true;
+			(props.toEnforce || document.id(props.enforceChildrenOf).getElements('input, select, textarea')).map(function(item){
+				if (element.checked){
+					fv.enforceField(item);
+				} else {
+					fv.ignoreField(item);
+					fv.resetField(item);
+				}
+			});
+			return true;
+		}
+	}],
+
+	['validate-ignore-oncheck', {
+		test: function(element, props){
+			var fv = element.getParent('form').retrieve('validator');
+			if (!fv) return true;
+			(props.toIgnore || document.id(props.ignoreChildrenOf).getElements('input, select, textarea')).each(function(item){
+				if (element.checked){
+					fv.ignoreField(item);
+					fv.resetField(item);
+				} else {
+					fv.enforceField(item);
+				}
+			});
+			return true;
+		}
+	}],
+
+	['validate-nospace', {
+		errorMsg: function(){
+			return Form.Validator.getMsg('noSpace');
+		},
+		test: function(element, props){
+			return !element.get('value').test(/\s/);
+		}
+	}],
+
+	['validate-toggle-oncheck', {
+		test: function(element, props){
+			var fv = element.getParent('form').retrieve('validator');
+			if (!fv) return true;
+			var eleArr = props.toToggle || document.id(props.toToggleChildrenOf).getElements('input, select, textarea');
+			if (!element.checked){
+				eleArr.each(function(item){
+					fv.ignoreField(item);
+					fv.resetField(item);
+				});
+			} else {
+				eleArr.each(function(item){
+					fv.enforceField(item);
+				});
+			}
+			return true;
+		}
+	}],
+
+	['validate-reqchk-bynode', {
+		errorMsg: function(){
+			return Form.Validator.getMsg('reqChkByNode');
+		},
+		test: function(element, props){
+			return (document.id(props.nodeId).getElements(props.selector || 'input[type=checkbox], input[type=radio]')).some(function(item){
+				return item.checked;
+			});
+		}
+	}],
+
+	['validate-required-check', {
+		errorMsg: function(element, props){
+			return props.useTitle ? element.get('title') : Form.Validator.getMsg('requiredChk');
+		},
+		test: function(element, props){
+			return !!element.checked;
+		}
+	}],
+
+	['validate-reqchk-byname', {
+		errorMsg: function(element, props){
+			return Form.Validator.getMsg('reqChkByName').substitute({label: props.label || element.get('type')});
+		},
+		test: function(element, props){
+			var grpName = props.groupName || element.get('name');
+			var oneCheckedItem = $$(document.getElementsByName(grpName)).some(function(item, index){
+				return item.checked;
+			});
+			var fv = element.getParent('form').retrieve('validator');
+			if (oneCheckedItem && fv) fv.resetField(element);
+			return oneCheckedItem;
+		}
+	}],
+
+	['validate-match', {
+		errorMsg: function(element, props){
+			return Form.Validator.getMsg('match').substitute({matchName: props.matchName || document.id(props.matchInput).get('name')});
+		},
+		test: function(element, props){
+			var eleVal = element.get('value');
+			var matchVal = document.id(props.matchInput) && document.id(props.matchInput).get('value');
+			return eleVal && matchVal ? eleVal == matchVal : true;
+		}
+	}],
+
+	['validate-after-date', {
+		errorMsg: function(element, props){
+			return Form.Validator.getMsg('afterDate').substitute({
+				label: props.afterLabel || (props.afterElement ? Form.Validator.getMsg('startDate') : Form.Validator.getMsg('currentDate'))
+			});
+		},
+		test: function(element, props){
+			var start = document.id(props.afterElement) ? Date.parse(document.id(props.afterElement).get('value')) : new Date();
+			var end = Date.parse(element.get('value'));
+			return end && start ? end >= start : true;
+		}
+	}],
+
+	['validate-before-date', {
+		errorMsg: function(element, props){
+			return Form.Validator.getMsg('beforeDate').substitute({
+				label: props.beforeLabel || (props.beforeElement ? Form.Validator.getMsg('endDate') : Form.Validator.getMsg('currentDate'))
+			});
+		},
+		test: function(element, props){
+			var start = Date.parse(element.get('value'));
+			var end = document.id(props.beforeElement) ? Date.parse(document.id(props.beforeElement).get('value')) : new Date();
+			return end && start ? end >= start : true;
+		}
+	}],
+
+	['validate-custom-required', {
+		errorMsg: function(){
+			return Form.Validator.getMsg('required');
+		},
+		test: function(element, props){
+			return element.get('value') != props.emptyValue;
+		}
+	}],
+
+	['validate-same-month', {
+		errorMsg: function(element, props){
+			var startMo = document.id(props.sameMonthAs) && document.id(props.sameMonthAs).get('value');
+			var eleVal = element.get('value');
+			if (eleVal != '') return Form.Validator.getMsg(startMo ? 'sameMonth' : 'startMonth');
+		},
+		test: function(element, props){
+			var d1 = Date.parse(element.get('value'));
+			var d2 = Date.parse(document.id(props.sameMonthAs) && document.id(props.sameMonthAs).get('value'));
+			return d1 && d2 ? d1.format('%B') == d2.format('%B') : true;
+		}
+	}],
+
+
+	['validate-cc-num', {
+		errorMsg: function(element){
+			var ccNum = element.get('value').replace(/[^0-9]/g, '');
+			return Form.Validator.getMsg('creditcard').substitute({length: ccNum.length});
+		},
+		test: function(element){
+			// required is a different test
+			if (Form.Validator.getValidator('IsEmpty').test(element)) return true;
+
+			// Clean number value
+			var ccNum = element.get('value');
+			ccNum = ccNum.replace(/[^0-9]/g, '');
+
+			var valid_type = false;
+
+			if (ccNum.test(/^4[0-9]{12}([0-9]{3})?$/)) valid_type = 'Visa';
+			else if (ccNum.test(/^5[1-5]([0-9]{14})$/)) valid_type = 'Master Card';
+			else if (ccNum.test(/^3[47][0-9]{13}$/)) valid_type = 'American Express';
+			else if (ccNum.test(/^6011[0-9]{12}$/)) valid_type = 'Discover';
+
+			if (valid_type){
+				var sum = 0;
+				var cur = 0;
+
+				for (var i=ccNum.length-1; i>=0; --i){
+					cur = ccNum.charAt(i).toInt();
+					if (cur == 0) continue;
+
+					if ((ccNum.length-i) % 2 == 0) cur += cur;
+					if (cur > 9){
+						cur = cur.toString().charAt(0).toInt() + cur.toString().charAt(1).toInt();
+					}
+
+					sum += cur;
+				}
+				if ((sum % 10) == 0) return true;
+			}
+
+			var chunks = '';
+			while (ccNum != ''){
+				chunks += ' ' + ccNum.substr(0,4);
+				ccNum = ccNum.substr(4);
+			}
+
+			element.getParent('form').retrieve('validator').ignoreField(element);
+			element.set('value', chunks.clean());
+			element.getParent('form').retrieve('validator').enforceField(element);
+			return false;
+		}
+	}]
+
+
+]);
+
+
+/*
+---
+
+script: OverText.js
+
+name: OverText
+
+description: Shows text over an input that disappears when the user clicks into it. The text remains hidden if the user adds a value.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Core/Element.Event
+  - Class.Binds
+  - Class.Occlude
+  - Element.Position
+  - Element.Shortcuts
+
+provides: [OverText]
+
+...
+*/
+
+var OverText = new Class({
+
+	Implements: [Options, Events, Class.Occlude],
+
+	Binds: ['reposition', 'assert', 'focus', 'hide'],
+
+	options: {/*
+		textOverride: null,
+		onFocus: function(){},
+		onTextHide: function(textEl, inputEl){},
+		onTextShow: function(textEl, inputEl){}, */
+		element: 'label',
+		labelClass: 'overTxtLabel',
+		positionOptions: {
+			position: 'upperLeft',
+			edge: 'upperLeft',
+			offset: {
+				x: 4,
+				y: 2
+			}
+		},
+		poll: false,
+		pollInterval: 250,
+		wrap: false
+	},
+
+	property: 'OverText',
+
+	initialize: function(element, options){
+		element = this.element = document.id(element);
+
+		if (this.occlude()) return this.occluded;
+		this.setOptions(options);
+
+		this.attach(element);
+		OverText.instances.push(this);
+
+		if (this.options.poll) this.poll();
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	attach: function(){
+		var element = this.element,
+			options = this.options,
+			value = options.textOverride || element.get('alt') || element.get('title');
+
+		if (!value) return this;
+
+		var text = this.text = new Element(options.element, {
+			'class': options.labelClass,
+			styles: {
+				lineHeight: 'normal',
+				position: 'absolute',
+				cursor: 'text'
+			},
+			html: value,
+			events: {
+				click: this.hide.pass(options.element == 'label', this)
+			}
+		}).inject(element, 'after');
+
+		if (options.element == 'label'){
+			if (!element.get('id')) element.set('id', 'input_' + String.uniqueID());
+			text.set('for', element.get('id'));
+		}
+
+		if (options.wrap){
+			this.textHolder = new Element('div.overTxtWrapper', {
+				styles: {
+					lineHeight: 'normal',
+					position: 'relative'
+				}
+			}).grab(text).inject(element, 'before');
+		}
+
+		return this.enable();
+	},
+
+	destroy: function(){
+		this.element.eliminate(this.property); // Class.Occlude storage
+		this.disable();
+		if (this.text) this.text.destroy();
+		if (this.textHolder) this.textHolder.destroy();
+		return this;
+	},
+
+	disable: function(){
+		this.element.removeEvents({
+			focus: this.focus,
+			blur: this.assert,
+			change: this.assert
+		});
+		window.removeEvent('resize', this.reposition);
+		this.hide(true, true);
+		return this;
+	},
+
+	enable: function(){
+		this.element.addEvents({
+			focus: this.focus,
+			blur: this.assert,
+			change: this.assert
+		});
+		window.addEvent('resize', this.reposition);
+		this.reposition();
+		return this;
+	},
+
+	wrap: function(){
+		if (this.options.element == 'label'){
+			if (!this.element.get('id')) this.element.set('id', 'input_' + String.uniqueID());
+			this.text.set('for', this.element.get('id'));
+		}
+	},
+
+	startPolling: function(){
+		this.pollingPaused = false;
+		return this.poll();
+	},
+
+	poll: function(stop){
+		//start immediately
+		//pause on focus
+		//resumeon blur
+		if (this.poller && !stop) return this;
+		if (stop){
+			clearInterval(this.poller);
+		} else {
+			this.poller = (function(){
+				if (!this.pollingPaused) this.assert(true);
+			}).periodical(this.options.pollInterval, this);
+		}
+
+		return this;
+	},
+
+	stopPolling: function(){
+		this.pollingPaused = true;
+		return this.poll(true);
+	},
+
+	focus: function(){
+		if (this.text && (!this.text.isDisplayed() || this.element.get('disabled'))) return this;
+		return this.hide();
+	},
+
+	hide: function(suppressFocus, force){
+		if (this.text && (this.text.isDisplayed() && (!this.element.get('disabled') || force))){
+			this.text.hide();
+			this.fireEvent('textHide', [this.text, this.element]);
+			this.pollingPaused = true;
+			if (!suppressFocus){
+				try {
+					this.element.fireEvent('focus');
+					this.element.focus();
+				} catch(e){} //IE barfs if you call focus on hidden elements
+			}
+		}
+		return this;
+	},
+
+	show: function(){
+		if (this.text && !this.text.isDisplayed()){
+			this.text.show();
+			this.reposition();
+			this.fireEvent('textShow', [this.text, this.element]);
+			this.pollingPaused = false;
+		}
+		return this;
+	},
+
+	test: function(){
+		return !this.element.get('value');
+	},
+
+	assert: function(suppressFocus){
+		return this[this.test() ? 'show' : 'hide'](suppressFocus);
+	},
+
+	reposition: function(){
+		this.assert(true);
+		if (!this.element.isVisible()) return this.stopPolling().hide();
+		if (this.text && this.test()){
+			this.text.position(Object.merge(this.options.positionOptions, {
+				relativeTo: this.element
+			}));
+		}
+		return this;
+	}
+
+});
+
+OverText.instances = [];
+
+Object.append(OverText, {
+
+	each: function(fn){
+		return OverText.instances.each(function(ot, i){
+			if (ot.element && ot.text) fn.call(OverText, ot, i);
+		});
+	},
+
+	update: function(){
+
+		return OverText.each(function(ot){
+			return ot.reposition();
+		});
+
+	},
+
+	hideAll: function(){
+
+		return OverText.each(function(ot){
+			return ot.hide(true, true);
+		});
+
+	},
+
+	showAll: function(){
+		return OverText.each(function(ot){
+			return ot.show();
+		});
+	}
+
+});
+
+
+
+/*
+---
+
+script: Fx.Elements.js
+
+name: Fx.Elements
+
+description: Effect to change any number of CSS properties of any number of Elements.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Fx.CSS
+  - /MooTools.More
+
+provides: [Fx.Elements]
+
+...
+*/
+
+Fx.Elements = new Class({
+
+	Extends: Fx.CSS,
+
+	initialize: function(elements, options){
+		this.elements = this.subject = $$(elements);
+		this.parent(options);
+	},
+
+	compute: function(from, to, delta){
+		var now = {};
+
+		for (var i in from){
+			var iFrom = from[i], iTo = to[i], iNow = now[i] = {};
+			for (var p in iFrom) iNow[p] = this.parent(iFrom[p], iTo[p], delta);
+		}
+
+		return now;
+	},
+
+	set: function(now){
+		for (var i in now){
+			if (!this.elements[i]) continue;
+
+			var iNow = now[i];
+			for (var p in iNow) this.render(this.elements[i], p, iNow[p], this.options.unit);
+		}
+
+		return this;
+	},
+
+	start: function(obj){
+		if (!this.check(obj)) return this;
+		var from = {}, to = {};
+
+		for (var i in obj){
+			if (!this.elements[i]) continue;
+
+			var iProps = obj[i], iFrom = from[i] = {}, iTo = to[i] = {};
+
+			for (var p in iProps){
+				var parsed = this.prepare(this.elements[i], p, iProps[p]);
+				iFrom[p] = parsed.from;
+				iTo[p] = parsed.to;
+			}
+		}
+
+		return this.parent(from, to);
+	}
+
+});
+
+
+/*
+---
+
+script: Fx.Accordion.js
+
+name: Fx.Accordion
+
+description: An Fx.Elements extension which allows you to easily create accordion type controls.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Element.Event
+  - /Fx.Elements
+
+provides: [Fx.Accordion]
+
+...
+*/
+
+Fx.Accordion = new Class({
+
+	Extends: Fx.Elements,
+
+	options: {/*
+		onActive: function(toggler, section){},
+		onBackground: function(toggler, section){},*/
+		fixedHeight: false,
+		fixedWidth: false,
+		display: 0,
+		show: false,
+		height: true,
+		width: false,
+		opacity: true,
+		alwaysHide: false,
+		trigger: 'click',
+		initialDisplayFx: true,
+		resetHeight: true
+	},
+
+	initialize: function(){
+		var defined = function(obj){
+			return obj != null;
+		};
+
+		var params = Array.link(arguments, {
+			'container': Type.isElement, //deprecated
+			'options': Type.isObject,
+			'togglers': defined,
+			'elements': defined
+		});
+		this.parent(params.elements, params.options);
+
+		var options = this.options,
+			togglers = this.togglers = $$(params.togglers);
+
+		this.previous = -1;
+		this.internalChain = new Chain();
+
+		if (options.alwaysHide) this.options.link = 'chain';
+
+		if (options.show || this.options.show === 0){
+			options.display = false;
+			this.previous = options.show;
+		}
+
+		if (options.start){
+			options.display = false;
+			options.show = false;
+		}
+
+		var effects = this.effects = {};
+
+		if (options.opacity) effects.opacity = 'fullOpacity';
+		if (options.width) effects.width = options.fixedWidth ? 'fullWidth' : 'offsetWidth';
+		if (options.height) effects.height = options.fixedHeight ? 'fullHeight' : 'scrollHeight';
+
+		for (var i = 0, l = togglers.length; i < l; i++) this.addSection(togglers[i], this.elements[i]);
+
+		this.elements.each(function(el, i){
+			if (options.show === i){
+				this.fireEvent('active', [togglers[i], el]);
+			} else {
+				for (var fx in effects) el.setStyle(fx, 0);
+			}
+		}, this);
+
+		if (options.display || options.display === 0 || options.initialDisplayFx === false){
+			this.display(options.display, options.initialDisplayFx);
+		}
+
+		if (options.fixedHeight !== false) options.resetHeight = false;
+		this.addEvent('complete', this.internalChain.callChain.bind(this.internalChain));
+	},
+
+	addSection: function(toggler, element){
+		toggler = document.id(toggler);
+		element = document.id(element);
+		this.togglers.include(toggler);
+		this.elements.include(element);
+
+		var togglers = this.togglers,
+			options = this.options,
+			test = togglers.contains(toggler),
+			idx = togglers.indexOf(toggler),
+			displayer = this.display.pass(idx, this);
+
+		toggler.store('accordion:display', displayer)
+			.addEvent(options.trigger, displayer);
+
+		if (options.height) element.setStyles({'padding-top': 0, 'border-top': 'none', 'padding-bottom': 0, 'border-bottom': 'none'});
+		if (options.width) element.setStyles({'padding-left': 0, 'border-left': 'none', 'padding-right': 0, 'border-right': 'none'});
+
+		element.fullOpacity = 1;
+		if (options.fixedWidth) element.fullWidth = options.fixedWidth;
+		if (options.fixedHeight) element.fullHeight = options.fixedHeight;
+		element.setStyle('overflow', 'hidden');
+
+		if (!test) for (var fx in this.effects){
+			element.setStyle(fx, 0);
+		}
+		return this;
+	},
+
+	removeSection: function(toggler, displayIndex){
+		var togglers = this.togglers,
+			idx = togglers.indexOf(toggler),
+			element = this.elements[idx];
+
+		var remover = function(){
+			togglers.erase(toggler);
+			this.elements.erase(element);
+			this.detach(toggler);
+		}.bind(this);
+
+		if (this.now == idx || displayIndex != null){
+			this.display(displayIndex != null ? displayIndex : (idx - 1 >= 0 ? idx - 1 : 0)).chain(remover);
+		} else {
+			remover();
+		}
+		return this;
+	},
+
+	detach: function(toggler){
+		var remove = function(toggler){
+			toggler.removeEvent(this.options.trigger, toggler.retrieve('accordion:display'));
+		}.bind(this);
+
+		if (!toggler) this.togglers.each(remove);
+		else remove(toggler);
+		return this;
+	},
+
+	display: function(index, useFx){
+		if (!this.check(index, useFx)) return this;
+
+		var obj = {},
+			elements = this.elements,
+			options = this.options,
+			effects = this.effects;
+
+		if (useFx == null) useFx = true;
+		if (typeOf(index) == 'element') index = elements.indexOf(index);
+		if (index == this.previous && !options.alwaysHide) return this;
+
+		if (options.resetHeight){
+			var prev = elements[this.previous];
+			if (prev && !this.selfHidden){
+				for (var fx in effects) prev.setStyle(fx, prev[effects[fx]]);
+			}
+		}
+
+		if ((this.timer && options.link == 'chain') || (index === this.previous && !options.alwaysHide)) return this;
+
+		this.previous = index;
+		this.selfHidden = false;
+
+		elements.each(function(el, i){
+			obj[i] = {};
+			var hide;
+			if (i != index){
+				hide = true;
+			} else if (options.alwaysHide && ((el.offsetHeight > 0 && options.height) || el.offsetWidth > 0 && options.width)){
+				hide = true;
+				this.selfHidden = true;
+			}
+			this.fireEvent(hide ? 'background' : 'active', [this.togglers[i], el]);
+			for (var fx in effects) obj[i][fx] = hide ? 0 : el[effects[fx]];
+			if (!useFx && !hide && options.resetHeight) obj[i].height = 'auto';
+		}, this);
+
+		this.internalChain.clearChain();
+		this.internalChain.chain(function(){
+			if (options.resetHeight && !this.selfHidden){
+				var el = elements[index];
+				if (el) el.setStyle('height', 'auto');
+			}
+		}.bind(this));
+
+		return useFx ? this.start(obj) : this.set(obj).internalChain.callChain();
+	}
+
+});
+
+
+
+
+/*
+---
+
+script: Fx.Move.js
+
+name: Fx.Move
+
+description: Defines Fx.Move, a class that works with Element.Position.js to transition an element from one location to another.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Fx.Morph
+  - /Element.Position
+
+provides: [Fx.Move]
+
+...
+*/
+
+Fx.Move = new Class({
+
+	Extends: Fx.Morph,
+
+	options: {
+		relativeTo: document.body,
+		position: 'center',
+		edge: false,
+		offset: {x: 0, y: 0}
+	},
+
+	start: function(destination){
+		var element = this.element,
+			topLeft = element.getStyles('top', 'left');
+		if (topLeft.top == 'auto' || topLeft.left == 'auto'){
+			element.setPosition(element.getPosition(element.getOffsetParent()));
+		}
+		return this.parent(element.position(Object.merge({}, this.options, destination, {returnPos: true})));
+	}
+
+});
+
+Element.Properties.move = {
+
+	set: function(options){
+		this.get('move').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var move = this.retrieve('move');
+		if (!move){
+			move = new Fx.Move(this, {link: 'cancel'});
+			this.store('move', move);
+		}
+		return move;
+	}
+
+};
+
+Element.implement({
+
+	move: function(options){
+		this.get('move').start(options);
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+script: Fx.Scroll.js
+
+name: Fx.Scroll
+
+description: Effect to smoothly scroll any element, including the window.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Fx
+  - Core/Element.Event
+  - Core/Element.Dimensions
+  - /MooTools.More
+
+provides: [Fx.Scroll]
+
+...
+*/
+
+(function(){
+
+Fx.Scroll = new Class({
+
+	Extends: Fx,
+
+	options: {
+		offset: {x: 0, y: 0},
+		wheelStops: true
+	},
+
+	initialize: function(element, options){
+		this.element = this.subject = document.id(element);
+		this.parent(options);
+
+		if (typeOf(this.element) != 'element') this.element = document.id(this.element.getDocument().body);
+
+		if (this.options.wheelStops){
+			var stopper = this.element,
+				cancel = this.cancel.pass(false, this);
+			this.addEvent('start', function(){
+				stopper.addEvent('mousewheel', cancel);
+			}, true);
+			this.addEvent('complete', function(){
+				stopper.removeEvent('mousewheel', cancel);
+			}, true);
+		}
+	},
+
+	set: function(){
+		var now = Array.flatten(arguments);
+		if (Browser.firefox) now = [Math.round(now[0]), Math.round(now[1])]; // not needed anymore in newer firefox versions
+		this.element.scrollTo(now[0], now[1]);
+		return this;
+	},
+
+	compute: function(from, to, delta){
+		return [0, 1].map(function(i){
+			return Fx.compute(from[i], to[i], delta);
+		});
+	},
+
+	start: function(x, y){
+		if (!this.check(x, y)) return this;
+		var scroll = this.element.getScroll();
+		return this.parent([scroll.x, scroll.y], [x, y]);
+	},
+
+	calculateScroll: function(x, y){
+		var element = this.element,
+			scrollSize = element.getScrollSize(),
+			scroll = element.getScroll(),
+			size = element.getSize(),
+			offset = this.options.offset,
+			values = {x: x, y: y};
+
+		for (var z in values){
+			if (!values[z] && values[z] !== 0) values[z] = scroll[z];
+			if (typeOf(values[z]) != 'number') values[z] = scrollSize[z] - size[z];
+			values[z] += offset[z];
+		}
+
+		return [values.x, values.y];
+	},
+
+	toTop: function(){
+		return this.start.apply(this, this.calculateScroll(false, 0));
+	},
+
+	toLeft: function(){
+		return this.start.apply(this, this.calculateScroll(0, false));
+	},
+
+	toRight: function(){
+		return this.start.apply(this, this.calculateScroll('right', false));
+	},
+
+	toBottom: function(){
+		return this.start.apply(this, this.calculateScroll(false, 'bottom'));
+	},
+
+	toElement: function(el, axes){
+		axes = axes ? Array.from(axes) : ['x', 'y'];
+		var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
+		var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
+			return axes.contains(axis) ? value + scroll[axis] : false;
+		});
+		return this.start.apply(this, this.calculateScroll(position.x, position.y));
+	},
+
+	toElementEdge: function(el, axes, offset){
+		axes = axes ? Array.from(axes) : ['x', 'y'];
+		el = document.id(el);
+		var to = {},
+			position = el.getPosition(this.element),
+			size = el.getSize(),
+			scroll = this.element.getScroll(),
+			containerSize = this.element.getSize(),
+			edge = {
+				x: position.x + size.x,
+				y: position.y + size.y
+			};
+
+		['x', 'y'].each(function(axis){
+			if (axes.contains(axis)){
+				if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
+				if (position[axis] < scroll[axis]) to[axis] = position[axis];
+			}
+			if (to[axis] == null) to[axis] = scroll[axis];
+			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+		}, this);
+
+		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+		return this;
+	},
+
+	toElementCenter: function(el, axes, offset){
+		axes = axes ? Array.from(axes) : ['x', 'y'];
+		el = document.id(el);
+		var to = {},
+			position = el.getPosition(this.element),
+			size = el.getSize(),
+			scroll = this.element.getScroll(),
+			containerSize = this.element.getSize();
+
+		['x', 'y'].each(function(axis){
+			if (axes.contains(axis)){
+				to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
+			}
+			if (to[axis] == null) to[axis] = scroll[axis];
+			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+		}, this);
+
+		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+		return this;
+	}
+
+});
+
+
+
+function isBody(element){
+	return (/^(?:body|html)$/i).test(element.tagName);
+}
+
+})();
+
+
+/*
+---
+
+script: Fx.Slide.js
+
+name: Fx.Slide
+
+description: Effect to slide an element in and out of view.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Fx
+  - Core/Element.Style
+  - /MooTools.More
+
+provides: [Fx.Slide]
+
+...
+*/
+
+Fx.Slide = new Class({
+
+	Extends: Fx,
+
+	options: {
+		mode: 'vertical',
+		wrapper: false,
+		hideOverflow: true,
+		resetHeight: false
+	},
+
+	initialize: function(element, options){
+		element = this.element = this.subject = document.id(element);
+		this.parent(options);
+		options = this.options;
+
+		var wrapper = element.retrieve('wrapper'),
+			styles = element.getStyles('margin', 'position', 'overflow');
+
+		if (options.hideOverflow) styles = Object.append(styles, {overflow: 'hidden'});
+		if (options.wrapper) wrapper = document.id(options.wrapper).setStyles(styles);
+
+		if (!wrapper) wrapper = new Element('div', {
+			styles: styles
+		}).wraps(element);
+
+		element.store('wrapper', wrapper).setStyle('margin', 0);
+		if (element.getStyle('overflow') == 'visible') element.setStyle('overflow', 'hidden');
+
+		this.now = [];
+		this.open = true;
+		this.wrapper = wrapper;
+
+		this.addEvent('complete', function(){
+			this.open = (wrapper['offset' + this.layout.capitalize()] != 0);
+			if (this.open && this.options.resetHeight) wrapper.setStyle('height', '');
+		}, true);
+	},
+
+	vertical: function(){
+		this.margin = 'margin-top';
+		this.layout = 'height';
+		this.offset = this.element.offsetHeight;
+	},
+
+	horizontal: function(){
+		this.margin = 'margin-left';
+		this.layout = 'width';
+		this.offset = this.element.offsetWidth;
+	},
+
+	set: function(now){
+		this.element.setStyle(this.margin, now[0]);
+		this.wrapper.setStyle(this.layout, now[1]);
+		return this;
+	},
+
+	compute: function(from, to, delta){
+		return [0, 1].map(function(i){
+			return Fx.compute(from[i], to[i], delta);
+		});
+	},
+
+	start: function(how, mode){
+		if (!this.check(how, mode)) return this;
+		this[mode || this.options.mode]();
+
+		var margin = this.element.getStyle(this.margin).toInt(),
+			layout = this.wrapper.getStyle(this.layout).toInt(),
+			caseIn = [[margin, layout], [0, this.offset]],
+			caseOut = [[margin, layout], [-this.offset, 0]],
+			start;
+
+		switch (how){
+			case 'in': start = caseIn; break;
+			case 'out': start = caseOut; break;
+			case 'toggle': start = (layout == 0) ? caseIn : caseOut;
+		}
+		return this.parent(start[0], start[1]);
+	},
+
+	slideIn: function(mode){
+		return this.start('in', mode);
+	},
+
+	slideOut: function(mode){
+		return this.start('out', mode);
+	},
+
+	hide: function(mode){
+		this[mode || this.options.mode]();
+		this.open = false;
+		return this.set([-this.offset, 0]);
+	},
+
+	show: function(mode){
+		this[mode || this.options.mode]();
+		this.open = true;
+		return this.set([0, this.offset]);
+	},
+
+	toggle: function(mode){
+		return this.start('toggle', mode);
+	}
+
+});
+
+Element.Properties.slide = {
+
+	set: function(options){
+		this.get('slide').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var slide = this.retrieve('slide');
+		if (!slide){
+			slide = new Fx.Slide(this, {link: 'cancel'});
+			this.store('slide', slide);
+		}
+		return slide;
+	}
+
+};
+
+Element.implement({
+
+	slide: function(how, mode){
+		how = how || 'toggle';
+		var slide = this.get('slide'), toggle;
+		switch (how){
+			case 'hide': slide.hide(mode); break;
+			case 'show': slide.show(mode); break;
+			case 'toggle':
+				var flag = this.retrieve('slide:flag', slide.open);
+				slide[flag ? 'slideOut' : 'slideIn'](mode);
+				this.store('slide:flag', !flag);
+				toggle = true;
+			break;
+			default: slide.start(how, mode);
+		}
+		if (!toggle) this.eliminate('slide:flag');
+		return this;
+	}
+
+});
+
+
+/*
+---
+
+script: Fx.SmoothScroll.js
+
+name: Fx.SmoothScroll
+
+description: Class for creating a smooth scrolling effect to all internal links on the page.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Slick.Finder
+  - /Fx.Scroll
+
+provides: [Fx.SmoothScroll]
+
+...
+*/
+
+Fx.SmoothScroll = new Class({
+
+	Extends: Fx.Scroll,
+
+	options: {
+		axes: ['x', 'y']
+	},
+
+	initialize: function(options, context){
+		context = context || document;
+		this.doc = context.getDocument();
+		this.parent(this.doc, options);
+
+		var win = context.getWindow(),
+			location = win.location.href.match(/^[^#]*/)[0] + '#',
+			links = $$(this.options.links || this.doc.links);
+
+		links.each(function(link){
+			if (link.href.indexOf(location) != 0) return;
+			var anchor = link.href.substr(location.length);
+			if (anchor) this.useLink(link, anchor);
+		}, this);
+
+		this.addEvent('complete', function(){
+			win.location.hash = this.anchor;
+			this.element.scrollTo(this.to[0], this.to[1]);
+		}, true);
+	},
+
+	useLink: function(link, anchor){
+
+		link.addEvent('click', function(event){
+			var el = document.id(anchor) || this.doc.getElement('a[name=' + anchor + ']');
+			if (!el) return;
+
+			event.preventDefault();
+			this.toElement(el, this.options.axes).chain(function(){
+				this.fireEvent('scrolledTo', [link, el]);
+			}.bind(this));
+
+			this.anchor = anchor;
+
+		}.bind(this));
+
+		return this;
+	}
+});
+
+
+/*
+---
+
+script: Fx.Sort.js
+
+name: Fx.Sort
+
+description: Defines Fx.Sort, a class that reorders lists with a transition.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Dimensions
+  - /Fx.Elements
+  - /Element.Measure
+
+provides: [Fx.Sort]
+
+...
+*/
+
+Fx.Sort = new Class({
+
+	Extends: Fx.Elements,
+
+	options: {
+		mode: 'vertical'
+	},
+
+	initialize: function(elements, options){
+		this.parent(elements, options);
+		this.elements.each(function(el){
+			if (el.getStyle('position') == 'static') el.setStyle('position', 'relative');
+		});
+		this.setDefaultOrder();
+	},
+
+	setDefaultOrder: function(){
+		this.currentOrder = this.elements.map(function(el, index){
+			return index;
+		});
+	},
+
+	sort: function(){
+		if (!this.check(arguments)) return this;
+		var newOrder = Array.flatten(arguments);
+
+		var top = 0,
+			left = 0,
+			next = {},
+			zero = {},
+			vert = this.options.mode == 'vertical';
+
+		var current = this.elements.map(function(el, index){
+			var size = el.getComputedSize({styles: ['border', 'padding', 'margin']});
+			var val;
+			if (vert){
+				val = {
+					top: top,
+					margin: size['margin-top'],
+					height: size.totalHeight
+				};
+				top += val.height - size['margin-top'];
+			} else {
+				val = {
+					left: left,
+					margin: size['margin-left'],
+					width: size.totalWidth
+				};
+				left += val.width;
+			}
+			var plane = vert ? 'top' : 'left';
+			zero[index] = {};
+			var start = el.getStyle(plane).toInt();
+			zero[index][plane] = start || 0;
+			return val;
+		}, this);
+
+		this.set(zero);
+		newOrder = newOrder.map(function(i){ return i.toInt(); });
+		if (newOrder.length != this.elements.length){
+			this.currentOrder.each(function(index){
+				if (!newOrder.contains(index)) newOrder.push(index);
+			});
+			if (newOrder.length > this.elements.length)
+				newOrder.splice(this.elements.length-1, newOrder.length - this.elements.length);
+		}
+		var margin = 0;
+		top = left = 0;
+		newOrder.each(function(item){
+			var newPos = {};
+			if (vert){
+				newPos.top = top - current[item].top - margin;
+				top += current[item].height;
+			} else {
+				newPos.left = left - current[item].left;
+				left += current[item].width;
+			}
+			margin = margin + current[item].margin;
+			next[item]=newPos;
+		}, this);
+		var mapped = {};
+		Array.clone(newOrder).sort().each(function(index){
+			mapped[index] = next[index];
+		});
+		this.start(mapped);
+		this.currentOrder = newOrder;
+
+		return this;
+	},
+
+	rearrangeDOM: function(newOrder){
+		newOrder = newOrder || this.currentOrder;
+		var parent = this.elements[0].getParent();
+		var rearranged = [];
+		this.elements.setStyle('opacity', 0);
+		//move each element and store the new default order
+		newOrder.each(function(index){
+			rearranged.push(this.elements[index].inject(parent).setStyles({
+				top: 0,
+				left: 0
+			}));
+		}, this);
+		this.elements.setStyle('opacity', 1);
+		this.elements = $$(rearranged);
+		this.setDefaultOrder();
+		return this;
+	},
+
+	getDefaultOrder: function(){
+		return this.elements.map(function(el, index){
+			return index;
+		});
+	},
+
+	getCurrentOrder: function(){
+		return this.currentOrder;
+	},
+
+	forward: function(){
+		return this.sort(this.getDefaultOrder());
+	},
+
+	backward: function(){
+		return this.sort(this.getDefaultOrder().reverse());
+	},
+
+	reverse: function(){
+		return this.sort(this.currentOrder.reverse());
+	},
+
+	sortByElements: function(elements){
+		return this.sort(elements.map(function(el){
+			return this.elements.indexOf(el);
+		}, this));
+	},
+
+	swap: function(one, two){
+		if (typeOf(one) == 'element') one = this.elements.indexOf(one);
+		if (typeOf(two) == 'element') two = this.elements.indexOf(two);
+
+		var newOrder = Array.clone(this.currentOrder);
+		newOrder[this.currentOrder.indexOf(one)] = two;
+		newOrder[this.currentOrder.indexOf(two)] = one;
+
+		return this.sort(newOrder);
+	}
+
+});
+
+
+/*
+---
+
+script: Drag.js
+
+name: Drag
+
+description: The base Drag Class. Can be used to drag and resize Elements using mouse events.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Tom Occhinno
+  - Jan Kassens
+
+requires:
+  - Core/Events
+  - Core/Options
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/Element.Dimensions
+  - /MooTools.More
+
+provides: [Drag]
+...
+
+*/
+
+var Drag = new Class({
+
+	Implements: [Events, Options],
+
+	options: {/*
+		onBeforeStart: function(thisElement){},
+		onStart: function(thisElement, event){},
+		onSnap: function(thisElement){},
+		onDrag: function(thisElement, event){},
+		onCancel: function(thisElement){},
+		onComplete: function(thisElement, event){},*/
+		snap: 6,
+		unit: 'px',
+		grid: false,
+		style: true,
+		limit: false,
+		handle: false,
+		invert: false,
+		preventDefault: false,
+		stopPropagation: false,
+		modifiers: {x: 'left', y: 'top'}
+	},
+
+	initialize: function(){
+		var params = Array.link(arguments, {
+			'options': Type.isObject,
+			'element': function(obj){
+				return obj != null;
+			}
+		});
+
+		this.element = document.id(params.element);
+		this.document = this.element.getDocument();
+		this.setOptions(params.options || {});
+		var htype = typeOf(this.options.handle);
+		this.handles = ((htype == 'array' || htype == 'collection') ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
+		this.mouse = {'now': {}, 'pos': {}};
+		this.value = {'start': {}, 'now': {}};
+
+		this.selection = (Browser.ie) ? 'selectstart' : 'mousedown';
+
+
+		if (Browser.ie && !Drag.ondragstartFixed){
+			document.ondragstart = Function.from(false);
+			Drag.ondragstartFixed = true;
+		}
+
+		this.bound = {
+			start: this.start.bind(this),
+			check: this.check.bind(this),
+			drag: this.drag.bind(this),
+			stop: this.stop.bind(this),
+			cancel: this.cancel.bind(this),
+			eventStop: Function.from(false)
+		};
+		this.attach();
+	},
+
+	attach: function(){
+		this.handles.addEvent('mousedown', this.bound.start);
+		return this;
+	},
+
+	detach: function(){
+		this.handles.removeEvent('mousedown', this.bound.start);
+		return this;
+	},
+
+	start: function(event){
+		var options = this.options;
+
+		if (event.rightClick) return;
+
+		if (options.preventDefault) event.preventDefault();
+		if (options.stopPropagation) event.stopPropagation();
+		this.mouse.start = event.page;
+
+		this.fireEvent('beforeStart', this.element);
+
+		var limit = options.limit;
+		this.limit = {x: [], y: []};
+
+		var z, coordinates;
+		for (z in options.modifiers){
+			if (!options.modifiers[z]) continue;
+
+			var style = this.element.getStyle(options.modifiers[z]);
+
+			// Some browsers (IE and Opera) don't always return pixels.
+			if (style && !style.match(/px$/)){
+				if (!coordinates) coordinates = this.element.getCoordinates(this.element.getOffsetParent());
+				style = coordinates[options.modifiers[z]];
+			}
+
+			if (options.style) this.value.now[z] = (style || 0).toInt();
+			else this.value.now[z] = this.element[options.modifiers[z]];
+
+			if (options.invert) this.value.now[z] *= -1;
+
+			this.mouse.pos[z] = event.page[z] - this.value.now[z];
+
+			if (limit && limit[z]){
+				var i = 2;
+				while (i--){
+					var limitZI = limit[z][i];
+					if (limitZI || limitZI === 0) this.limit[z][i] = (typeof limitZI == 'function') ? limitZI() : limitZI;
+				}
+			}
+		}
+
+		if (typeOf(this.options.grid) == 'number') this.options.grid = {
+			x: this.options.grid,
+			y: this.options.grid
+		};
+
+		var events = {
+			mousemove: this.bound.check,
+			mouseup: this.bound.cancel
+		};
+		events[this.selection] = this.bound.eventStop;
+		this.document.addEvents(events);
+	},
+
+	check: function(event){
+		if (this.options.preventDefault) event.preventDefault();
+		var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
+		if (distance > this.options.snap){
+			this.cancel();
+			this.document.addEvents({
+				mousemove: this.bound.drag,
+				mouseup: this.bound.stop
+			});
+			this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
+		}
+	},
+
+	drag: function(event){
+		var options = this.options;
+
+		if (options.preventDefault) event.preventDefault();
+		this.mouse.now = event.page;
+
+		for (var z in options.modifiers){
+			if (!options.modifiers[z]) continue;
+			this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
+
+			if (options.invert) this.value.now[z] *= -1;
+
+			if (options.limit && this.limit[z]){
+				if ((this.limit[z][1] || this.limit[z][1] === 0) && (this.value.now[z] > this.limit[z][1])){
+					this.value.now[z] = this.limit[z][1];
+				} else if ((this.limit[z][0] || this.limit[z][0] === 0) && (this.value.now[z] < this.limit[z][0])){
+					this.value.now[z] = this.limit[z][0];
+				}
+			}
+
+			if (options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % options.grid[z]);
+
+			if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit);
+			else this.element[options.modifiers[z]] = this.value.now[z];
+		}
+
+		this.fireEvent('drag', [this.element, event]);
+	},
+
+	cancel: function(event){
+		this.document.removeEvents({
+			mousemove: this.bound.check,
+			mouseup: this.bound.cancel
+		});
+		if (event){
+			this.document.removeEvent(this.selection, this.bound.eventStop);
+			this.fireEvent('cancel', this.element);
+		}
+	},
+
+	stop: function(event){
+		var events = {
+			mousemove: this.bound.drag,
+			mouseup: this.bound.stop
+		};
+		events[this.selection] = this.bound.eventStop;
+		this.document.removeEvents(events);
+		if (event) this.fireEvent('complete', [this.element, event]);
+	}
+
+});
+
+Element.implement({
+
+	makeResizable: function(options){
+		var drag = new Drag(this, Object.merge({
+			modifiers: {
+				x: 'width',
+				y: 'height'
+			}
+		}, options));
+
+		this.store('resizer', drag);
+		return drag.addEvent('drag', function(){
+			this.fireEvent('resize', drag);
+		}.bind(this));
+	}
+
+});
+
+
+/*
+---
+
+script: Drag.Move.js
+
+name: Drag.Move
+
+description: A Drag extension that provides support for the constraining of draggables to containers and droppables.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Tom Occhinno
+  - Jan Kassens
+  - Aaron Newton
+  - Scott Kyle
+
+requires:
+  - Core/Element.Dimensions
+  - /Drag
+
+provides: [Drag.Move]
+
+...
+*/
+
+Drag.Move = new Class({
+
+	Extends: Drag,
+
+	options: {/*
+		onEnter: function(thisElement, overed){},
+		onLeave: function(thisElement, overed){},
+		onDrop: function(thisElement, overed, event){},*/
+		droppables: [],
+		container: false,
+		precalculate: false,
+		includeMargins: true,
+		checkDroppables: true
+	},
+
+	initialize: function(element, options){
+		this.parent(element, options);
+		element = this.element;
+
+		this.droppables = $$(this.options.droppables);
+		this.container = document.id(this.options.container);
+
+		if (this.container && typeOf(this.container) != 'element')
+			this.container = document.id(this.container.getDocument().body);
+
+		if (this.options.style){
+			if (this.options.modifiers.x == 'left' && this.options.modifiers.y == 'top'){
+				var parent = element.getOffsetParent(),
+					styles = element.getStyles('left', 'top');
+				if (parent && (styles.left == 'auto' || styles.top == 'auto')){
+					element.setPosition(element.getPosition(parent));
+				}
+			}
+
+			if (element.getStyle('position') == 'static') element.setStyle('position', 'absolute');
+		}
+
+		this.addEvent('start', this.checkDroppables, true);
+		this.overed = null;
+	},
+
+	start: function(event){
+		if (this.container) this.options.limit = this.calculateLimit();
+
+		if (this.options.precalculate){
+			this.positions = this.droppables.map(function(el){
+				return el.getCoordinates();
+			});
+		}
+
+		this.parent(event);
+	},
+
+	calculateLimit: function(){
+		var element = this.element,
+			container = this.container,
+
+			offsetParent = document.id(element.getOffsetParent()) || document.body,
+			containerCoordinates = container.getCoordinates(offsetParent),
+			elementMargin = {},
+			elementBorder = {},
+			containerMargin = {},
+			containerBorder = {},
+			offsetParentPadding = {};
+
+		['top', 'right', 'bottom', 'left'].each(function(pad){
+			elementMargin[pad] = element.getStyle('margin-' + pad).toInt();
+			elementBorder[pad] = element.getStyle('border-' + pad).toInt();
+			containerMargin[pad] = container.getStyle('margin-' + pad).toInt();
+			containerBorder[pad] = container.getStyle('border-' + pad).toInt();
+			offsetParentPadding[pad] = offsetParent.getStyle('padding-' + pad).toInt();
+		}, this);
+
+		var width = element.offsetWidth + elementMargin.left + elementMargin.right,
+			height = element.offsetHeight + elementMargin.top + elementMargin.bottom,
+			left = 0,
+			top = 0,
+			right = containerCoordinates.right - containerBorder.right - width,
+			bottom = containerCoordinates.bottom - containerBorder.bottom - height;
+
+		if (this.options.includeMargins){
+			left += elementMargin.left;
+			top += elementMargin.top;
+		} else {
+			right += elementMargin.right;
+			bottom += elementMargin.bottom;
+		}
+
+		if (element.getStyle('position') == 'relative'){
+			var coords = element.getCoordinates(offsetParent);
+			coords.left -= element.getStyle('left').toInt();
+			coords.top -= element.getStyle('top').toInt();
+
+			left -= coords.left;
+			top -= coords.top;
+			if (container.getStyle('position') != 'relative'){
+				left += containerBorder.left;
+				top += containerBorder.top;
+			}
+			right += elementMargin.left - coords.left;
+			bottom += elementMargin.top - coords.top;
+
+			if (container != offsetParent){
+				left += containerMargin.left + offsetParentPadding.left;
+				top += ((Browser.ie6 || Browser.ie7) ? 0 : containerMargin.top) + offsetParentPadding.top;
+			}
+		} else {
+			left -= elementMargin.left;
+			top -= elementMargin.top;
+			if (container != offsetParent){
+				left += containerCoordinates.left + containerBorder.left;
+				top += containerCoordinates.top + containerBorder.top;
+			}
+		}
+
+		return {
+			x: [left, right],
+			y: [top, bottom]
+		};
+	},
+
+	getDroppableCoordinates: function(element){
+		var position = element.getCoordinates();
+		if (element.getStyle('position') == 'fixed'){
+			var scroll = window.getScroll();
+			position.left += scroll.x;
+			position.right += scroll.x;
+			position.top += scroll.y;
+			position.bottom += scroll.y;
+		}
+		return position;
+	},
+
+	checkDroppables: function(){
+		var overed = this.droppables.filter(function(el, i){
+			el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
+			var now = this.mouse.now;
+			return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
+		}, this).getLast();
+
+		if (this.overed != overed){
+			if (this.overed) this.fireEvent('leave', [this.element, this.overed]);
+			if (overed) this.fireEvent('enter', [this.element, overed]);
+			this.overed = overed;
+		}
+	},
+
+	drag: function(event){
+		this.parent(event);
+		if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
+	},
+
+	stop: function(event){
+		this.checkDroppables();
+		this.fireEvent('drop', [this.element, this.overed, event]);
+		this.overed = null;
+		return this.parent(event);
+	}
+
+});
+
+Element.implement({
+
+	makeDraggable: function(options){
+		var drag = new Drag.Move(this, options);
+		this.store('dragger', drag);
+		return drag;
+	}
+
+});
+
+
+/*
+---
+
+script: Slider.js
+
+name: Slider
+
+description: Class for creating horizontal and vertical slider controls.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Element.Dimensions
+  - /Class.Binds
+  - /Drag
+  - /Element.Measure
+
+provides: [Slider]
+
+...
+*/
+
+var Slider = new Class({
+
+	Implements: [Events, Options],
+
+	Binds: ['clickedElement', 'draggedKnob', 'scrolledElement'],
+
+	options: {/*
+		onTick: function(intPosition){},
+		onChange: function(intStep){},
+		onComplete: function(strStep){},*/
+		onTick: function(position){
+			this.setKnobPosition(position);
+		},
+		initialStep: 0,
+		snap: false,
+		offset: 0,
+		range: false,
+		wheel: false,
+		steps: 100,
+		mode: 'horizontal'
+	},
+
+	initialize: function(element, knob, options){
+		this.setOptions(options);
+		options = this.options;
+		this.element = document.id(element);
+		knob = this.knob = document.id(knob);
+		this.previousChange = this.previousEnd = this.step = -1;
+
+		var limit = {},
+			modifiers = {x: false, y: false};
+
+		switch (options.mode){
+			case 'vertical':
+				this.axis = 'y';
+				this.property = 'top';
+				this.offset = 'offsetHeight';
+				break;
+			case 'horizontal':
+				this.axis = 'x';
+				this.property = 'left';
+				this.offset = 'offsetWidth';
+		}
+
+		this.setSliderDimensions();
+		this.setRange(options.range);
+
+		if (knob.getStyle('position') == 'static') knob.setStyle('position', 'relative');
+		knob.setStyle(this.property, -options.offset);
+		modifiers[this.axis] = this.property;
+		limit[this.axis] = [-options.offset, this.full - options.offset];
+
+		var dragOptions = {
+			snap: 0,
+			limit: limit,
+			modifiers: modifiers,
+			onDrag: this.draggedKnob,
+			onStart: this.draggedKnob,
+			onBeforeStart: (function(){
+				this.isDragging = true;
+			}).bind(this),
+			onCancel: function(){
+				this.isDragging = false;
+			}.bind(this),
+			onComplete: function(){
+				this.isDragging = false;
+				this.draggedKnob();
+				this.end();
+			}.bind(this)
+		};
+		if (options.snap) this.setSnap(dragOptions);
+
+		this.drag = new Drag(knob, dragOptions);
+		this.attach();
+		if (options.initialStep != null) this.set(options.initialStep);
+	},
+
+	attach: function(){
+		this.element.addEvent('mousedown', this.clickedElement);
+		if (this.options.wheel) this.element.addEvent('mousewheel', this.scrolledElement);
+		this.drag.attach();
+		return this;
+	},
+
+	detach: function(){
+		this.element.removeEvent('mousedown', this.clickedElement)
+			.removeEvent('mousewheel', this.scrolledElement);
+		this.drag.detach();
+		return this;
+	},
+
+	autosize: function(){
+		this.setSliderDimensions()
+			.setKnobPosition(this.toPosition(this.step));
+		this.drag.options.limit[this.axis] = [-this.options.offset, this.full - this.options.offset];
+		if (this.options.snap) this.setSnap();
+		return this;
+	},
+
+	setSnap: function(options){
+		if (!options) options = this.drag.options;
+		options.grid = Math.ceil(this.stepWidth);
+		options.limit[this.axis][1] = this.full;
+		return this;
+	},
+
+	setKnobPosition: function(position){
+		if (this.options.snap) position = this.toPosition(this.step);
+		this.knob.setStyle(this.property, position);
+		return this;
+	},
+
+	setSliderDimensions: function(){
+		this.full = this.element.measure(function(){
+			this.half = this.knob[this.offset] / 2;
+			return this.element[this.offset] - this.knob[this.offset] + (this.options.offset * 2);
+		}.bind(this));
+		return this;
+	},
+
+	set: function(step){
+		if (!((this.range > 0) ^ (step < this.min))) step = this.min;
+		if (!((this.range > 0) ^ (step > this.max))) step = this.max;
+
+		this.step = Math.round(step);
+		return this.checkStep()
+			.fireEvent('tick', this.toPosition(this.step))
+			.end();
+	},
+
+	setRange: function(range, pos){
+		this.min = Array.pick([range[0], 0]);
+		this.max = Array.pick([range[1], this.options.steps]);
+		this.range = this.max - this.min;
+		this.steps = this.options.steps || this.full;
+		this.stepSize = Math.abs(this.range) / this.steps;
+		this.stepWidth = this.stepSize * this.full / Math.abs(this.range);
+		if (range) this.set(Array.pick([pos, this.step]).floor(this.min).max(this.max));
+		return this;
+	},
+
+	clickedElement: function(event){
+		if (this.isDragging || event.target == this.knob) return;
+
+		var dir = this.range < 0 ? -1 : 1,
+			position = event.page[this.axis] - this.element.getPosition()[this.axis] - this.half;
+
+		position = position.limit(-this.options.offset, this.full - this.options.offset);
+
+		this.step = Math.round(this.min + dir * this.toStep(position));
+
+		this.checkStep()
+			.fireEvent('tick', position)
+			.end();
+	},
+
+	scrolledElement: function(event){
+		var mode = (this.options.mode == 'horizontal') ? (event.wheel < 0) : (event.wheel > 0);
+		this.set(this.step + (mode ? -1 : 1) * this.stepSize);
+		event.stop();
+	},
+
+	draggedKnob: function(){
+		var dir = this.range < 0 ? -1 : 1,
+			position = this.drag.value.now[this.axis];
+
+		position = position.limit(-this.options.offset, this.full -this.options.offset);
+
+		this.step = Math.round(this.min + dir * this.toStep(position));
+		this.checkStep();
+	},
+
+	checkStep: function(){
+		var step = this.step;
+		if (this.previousChange != step){
+			this.previousChange = step;
+			this.fireEvent('change', step);
+		}
+		return this;
+	},
+
+	end: function(){
+		var step = this.step;
+		if (this.previousEnd !== step){
+			this.previousEnd = step;
+			this.fireEvent('complete', step + '');
+		}
+		return this;
+	},
+
+	toStep: function(position){
+		var step = (position + this.options.offset) * this.stepSize / this.full * this.steps;
+		return this.options.steps ? Math.round(step -= step % this.stepSize) : step;
+	},
+
+	toPosition: function(step){
+		return (this.full * Math.abs(this.min - step)) / (this.steps * this.stepSize) - this.options.offset;
+	}
+
+});
+
+
+/*
+---
+
+script: Sortables.js
+
+name: Sortables
+
+description: Class for creating a drag and drop sorting interface for lists of items.
+
+license: MIT-style license
+
+authors:
+  - Tom Occhino
+
+requires:
+  - Core/Fx.Morph
+  - /Drag.Move
+
+provides: [Sortables]
+
+...
+*/
+
+var Sortables = new Class({
+
+	Implements: [Events, Options],
+
+	options: {/*
+		onSort: function(element, clone){},
+		onStart: function(element, clone){},
+		onComplete: function(element){},*/
+		opacity: 1,
+		clone: false,
+		revert: false,
+		handle: false,
+		dragOptions: {}
+	},
+
+	initialize: function(lists, options){
+		this.setOptions(options);
+
+		this.elements = [];
+		this.lists = [];
+		this.idle = true;
+
+		this.addLists($$(document.id(lists) || lists));
+
+		if (!this.options.clone) this.options.revert = false;
+		if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
+			duration: 250,
+			link: 'cancel'
+		}, this.options.revert));
+	},
+
+	attach: function(){
+		this.addLists(this.lists);
+		return this;
+	},
+
+	detach: function(){
+		this.lists = this.removeLists(this.lists);
+		return this;
+	},
+
+	addItems: function(){
+		Array.flatten(arguments).each(function(element){
+			this.elements.push(element);
+			var start = element.retrieve('sortables:start', function(event){
+				this.start.call(this, event, element);
+			}.bind(this));
+			(this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent('mousedown', start);
+		}, this);
+		return this;
+	},
+
+	addLists: function(){
+		Array.flatten(arguments).each(function(list){
+			this.lists.include(list);
+			this.addItems(list.getChildren());
+		}, this);
+		return this;
+	},
+
+	removeItems: function(){
+		return $$(Array.flatten(arguments).map(function(element){
+			this.elements.erase(element);
+			var start = element.retrieve('sortables:start');
+			(this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent('mousedown', start);
+
+			return element;
+		}, this));
+	},
+
+	removeLists: function(){
+		return $$(Array.flatten(arguments).map(function(list){
+			this.lists.erase(list);
+			this.removeItems(list.getChildren());
+
+			return list;
+		}, this));
+	},
+
+	getClone: function(event, element){
+		if (!this.options.clone) return new Element(element.tagName).inject(document.body);
+		if (typeOf(this.options.clone) == 'function') return this.options.clone.call(this, event, element, this.list);
+		var clone = element.clone(true).setStyles({
+			margin: 0,
+			position: 'absolute',
+			visibility: 'hidden',
+			width: element.getStyle('width')
+		}).addEvent('mousedown', function(event){
+			element.fireEvent('mousedown', event);
+		});
+		//prevent the duplicated radio inputs from unchecking the real one
+		if (clone.get('html').test('radio')){
+			clone.getElements('input[type=radio]').each(function(input, i){
+				input.set('name', 'clone_' + i);
+				if (input.get('checked')) element.getElements('input[type=radio]')[i].set('checked', true);
+			});
+		}
+
+		return clone.inject(this.list).setPosition(element.getPosition(element.getOffsetParent()));
+	},
+
+	getDroppables: function(){
+		var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
+		if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
+		return droppables;
+	},
+
+	insert: function(dragging, element){
+		var where = 'inside';
+		if (this.lists.contains(element)){
+			this.list = element;
+			this.drag.droppables = this.getDroppables();
+		} else {
+			where = this.element.getAllPrevious().contains(element) ? 'before' : 'after';
+		}
+		this.element.inject(element, where);
+		this.fireEvent('sort', [this.element, this.clone]);
+	},
+
+	start: function(event, element){
+		if (
+			!this.idle ||
+			event.rightClick ||
+			['button', 'input', 'a', 'textarea'].contains(event.target.get('tag'))
+		) return;
+
+		this.idle = false;
+		this.element = element;
+		this.opacity = element.getStyle('opacity');
+		this.list = element.getParent();
+		this.clone = this.getClone(event, element);
+
+		this.drag = new Drag.Move(this.clone, Object.merge({
+			
+			droppables: this.getDroppables()
+		}, this.options.dragOptions)).addEvents({
+			onSnap: function(){
+				event.stop();
+				this.clone.setStyle('visibility', 'visible');
+				this.element.setStyle('opacity', this.options.opacity || 0);
+				this.fireEvent('start', [this.element, this.clone]);
+			}.bind(this),
+			onEnter: this.insert.bind(this),
+			onCancel: this.end.bind(this),
+			onComplete: this.end.bind(this)
+		});
+
+		this.clone.inject(this.element, 'before');
+		this.drag.start(event);
+	},
+
+	end: function(){
+		this.drag.detach();
+		this.element.setStyle('opacity', this.opacity);
+		if (this.effect){
+			var dim = this.element.getStyles('width', 'height'),
+				clone = this.clone,
+				pos = clone.computePosition(this.element.getPosition(this.clone.getOffsetParent()));
+
+			var destroy = function(){
+				this.removeEvent('cancel', destroy);
+				clone.destroy();
+			};
+
+			this.effect.element = clone;
+			this.effect.start({
+				top: pos.top,
+				left: pos.left,
+				width: dim.width,
+				height: dim.height,
+				opacity: 0.25
+			}).addEvent('cancel', destroy).chain(destroy);
+		} else {
+			this.clone.destroy();
+		}
+		this.reset();
+	},
+
+	reset: function(){
+		this.idle = true;
+		this.fireEvent('complete', this.element);
+	},
+
+	serialize: function(){
+		var params = Array.link(arguments, {
+			modifier: Type.isFunction,
+			index: function(obj){
+				return obj != null;
+			}
+		});
+		var serial = this.lists.map(function(list){
+			return list.getChildren().map(params.modifier || function(element){
+				return element.get('id');
+			}, this);
+		}, this);
+
+		var index = params.index;
+		if (this.lists.length == 1) index = 0;
+		return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
+	}
+
+});
+
+
+/*
+---
+
+script: Request.JSONP.js
+
+name: Request.JSONP
+
+description: Defines Request.JSONP, a class for cross domain javascript via script injection.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Guillermo Rauch
+  - Arian Stolwijk
+
+requires:
+  - Core/Element
+  - Core/Request
+  - MooTools.More
+
+provides: [Request.JSONP]
+
+...
+*/
+
+Request.JSONP = new Class({
+
+	Implements: [Chain, Events, Options],
+
+	options: {/*
+		onRequest: function(src, scriptElement){},
+		onComplete: function(data){},
+		onSuccess: function(data){},
+		onCancel: function(){},
+		onTimeout: function(){},
+		onError: function(){}, */
+		onRequest: function(src){
+			if (this.options.log && window.console && console.log){
+				console.log('JSONP retrieving script with url:' + src);
+			}
+		},
+		onError: function(src){
+			if (this.options.log && window.console && console.warn){
+				console.warn('JSONP '+ src +' will fail in Internet Explorer, which enforces a 2083 bytes length limit on URIs');
+			}
+		},
+		url: '',
+		callbackKey: 'callback',
+		injectScript: document.head,
+		data: '',
+		link: 'ignore',
+		timeout: 0,
+		log: false
+	},
+
+	initialize: function(options){
+		this.setOptions(options);
+	},
+
+	send: function(options){
+		if (!Request.prototype.check.call(this, options)) return this;
+		this.running = true;
+
+		var type = typeOf(options);
+		if (type == 'string' || type == 'element') options = {data: options};
+		options = Object.merge(this.options, options || {});
+
+		var data = options.data;
+		switch (typeOf(data)){
+			case 'element': data = document.id(data).toQueryString(); break;
+			case 'object': case 'hash': data = Object.toQueryString(data);
+		}
+
+		var index = this.index = Request.JSONP.counter++;
+
+		var src = options.url +
+			(options.url.test('\\?') ? '&' :'?') +
+			(options.callbackKey) +
+			'=Request.JSONP.request_map.request_'+ index +
+			(data ? '&' + data : '');
+
+		if (src.length > 2083) this.fireEvent('error', src);
+
+		Request.JSONP.request_map['request_' + index] = function(){
+			this.success(arguments, index);
+		}.bind(this);
+
+		var script = this.getScript(src).inject(options.injectScript);
+		this.fireEvent('request', [src, script]);
+
+		if (options.timeout) this.timeout.delay(options.timeout, this);
+
+		return this;
+	},
+
+	getScript: function(src){
+		if (!this.script) this.script = new Element('script', {
+			type: 'text/javascript',
+			async: true,
+			src: src
+		});
+		return this.script;
+	},
+
+	success: function(args, index){
+		if (!this.running) return;
+		this.clear()
+			.fireEvent('complete', args).fireEvent('success', args)
+			.callChain();
+	},
+
+	cancel: function(){
+		if (this.running) this.clear().fireEvent('cancel');
+		return this;
+	},
+
+	isRunning: function(){
+		return !!this.running;
+	},
+
+	clear: function(){
+		this.running = false;
+		if (this.script){
+			this.script.destroy();
+			this.script = null;
+		}
+		return this;
+	},
+
+	timeout: function(){
+		if (this.running){
+			this.running = false;
+			this.fireEvent('timeout', [this.script.get('src'), this.script]).fireEvent('failure').cancel();
+		}
+		return this;
+	}
+
+});
+
+Request.JSONP.counter = 0;
+Request.JSONP.request_map = {};
+
+
+/*
+---
+
+script: Request.Queue.js
+
+name: Request.Queue
+
+description: Controls several instances of Request and its variants to run only one request at a time.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element
+  - Core/Request
+  - /Class.Binds
+
+provides: [Request.Queue]
+
+...
+*/
+
+Request.Queue = new Class({
+
+	Implements: [Options, Events],
+
+	Binds: ['attach', 'request', 'complete', 'cancel', 'success', 'failure', 'exception'],
+
+	options: {/*
+		onRequest: function(argsPassedToOnRequest){},
+		onSuccess: function(argsPassedToOnSuccess){},
+		onComplete: function(argsPassedToOnComplete){},
+		onCancel: function(argsPassedToOnCancel){},
+		onException: function(argsPassedToOnException){},
+		onFailure: function(argsPassedToOnFailure){},
+		onEnd: function(){},
+		*/
+		stopOnFailure: true,
+		autoAdvance: true,
+		concurrent: 1,
+		requests: {}
+	},
+
+	initialize: function(options){
+		var requests;
+		if (options){
+			requests = options.requests;
+			delete options.requests;
+		}
+		this.setOptions(options);
+		this.requests = {};
+		this.queue = [];
+		this.reqBinders = {};
+
+		if (requests) this.addRequests(requests);
+	},
+
+	addRequest: function(name, request){
+		this.requests[name] = request;
+		this.attach(name, request);
+		return this;
+	},
+
+	addRequests: function(obj){
+		Object.each(obj, function(req, name){
+			this.addRequest(name, req);
+		}, this);
+		return this;
+	},
+
+	getName: function(req){
+		return Object.keyOf(this.requests, req);
+	},
+
+	attach: function(name, req){
+		if (req._groupSend) return this;
+		['request', 'complete', 'cancel', 'success', 'failure', 'exception'].each(function(evt){
+			if (!this.reqBinders[name]) this.reqBinders[name] = {};
+			this.reqBinders[name][evt] = function(){
+				this['on' + evt.capitalize()].apply(this, [name, req].append(arguments));
+			}.bind(this);
+			req.addEvent(evt, this.reqBinders[name][evt]);
+		}, this);
+		req._groupSend = req.send;
+		req.send = function(options){
+			this.send(name, options);
+			return req;
+		}.bind(this);
+		return this;
+	},
+
+	removeRequest: function(req){
+		var name = typeOf(req) == 'object' ? this.getName(req) : req;
+		if (!name && typeOf(name) != 'string') return this;
+		req = this.requests[name];
+		if (!req) return this;
+		['request', 'complete', 'cancel', 'success', 'failure', 'exception'].each(function(evt){
+			req.removeEvent(evt, this.reqBinders[name][evt]);
+		}, this);
+		req.send = req._groupSend;
+		delete req._groupSend;
+		return this;
+	},
+
+	getRunning: function(){
+		return Object.filter(this.requests, function(r){
+			return r.running;
+		});
+	},
+
+	isRunning: function(){
+		return !!(Object.keys(this.getRunning()).length);
+	},
+
+	send: function(name, options){
+		var q = function(){
+			this.requests[name]._groupSend(options);
+			this.queue.erase(q);
+		}.bind(this);
+
+		q.name = name;
+		if (Object.keys(this.getRunning()).length >= this.options.concurrent || (this.error && this.options.stopOnFailure)) this.queue.push(q);
+		else q();
+		return this;
+	},
+
+	hasNext: function(name){
+		return (!name) ? !!this.queue.length : !!this.queue.filter(function(q){ return q.name == name; }).length;
+	},
+
+	resume: function(){
+		this.error = false;
+		(this.options.concurrent - Object.keys(this.getRunning()).length).times(this.runNext, this);
+		return this;
+	},
+
+	runNext: function(name){
+		if (!this.queue.length) return this;
+		if (!name){
+			this.queue[0]();
+		} else {
+			var found;
+			this.queue.each(function(q){
+				if (!found && q.name == name){
+					found = true;
+					q();
+				}
+			});
+		}
+		return this;
+	},
+
+	runAll: function(){
+		this.queue.each(function(q){
+			q();
+		});
+		return this;
+	},
+
+	clear: function(name){
+		if (!name){
+			this.queue.empty();
+		} else {
+			this.queue = this.queue.map(function(q){
+				if (q.name != name) return q;
+				else return false;
+			}).filter(function(q){
+				return q;
+			});
+		}
+		return this;
+	},
+
+	cancel: function(name){
+		this.requests[name].cancel();
+		return this;
+	},
+
+	onRequest: function(){
+		this.fireEvent('request', arguments);
+	},
+
+	onComplete: function(){
+		this.fireEvent('complete', arguments);
+		if (!this.queue.length) this.fireEvent('end');
+	},
+
+	onCancel: function(){
+		if (this.options.autoAdvance && !this.error) this.runNext();
+		this.fireEvent('cancel', arguments);
+	},
+
+	onSuccess: function(){
+		if (this.options.autoAdvance && !this.error) this.runNext();
+		this.fireEvent('success', arguments);
+	},
+
+	onFailure: function(){
+		this.error = true;
+		if (!this.options.stopOnFailure && this.options.autoAdvance) this.runNext();
+		this.fireEvent('failure', arguments);
+	},
+
+	onException: function(){
+		this.error = true;
+		if (!this.options.stopOnFailure && this.options.autoAdvance) this.runNext();
+		this.fireEvent('exception', arguments);
+	}
+
+});
+
+
+/*
+---
+
+script: Request.Periodical.js
+
+name: Request.Periodical
+
+description: Requests the same URL to pull data from a server but increases the intervals if no data is returned to reduce the load
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+
+requires:
+  - Core/Request
+  - /MooTools.More
+
+provides: [Request.Periodical]
+
+...
+*/
+
+Request.implement({
+
+	options: {
+		initialDelay: 5000,
+		delay: 5000,
+		limit: 60000
+	},
+
+	startTimer: function(data){
+		var fn = function(){
+			if (!this.running) this.send({data: data});
+		};
+		this.lastDelay = this.options.initialDelay;
+		this.timer = fn.delay(this.lastDelay, this);
+		this.completeCheck = function(response){
+			clearTimeout(this.timer);
+			this.lastDelay = (response) ? this.options.delay : (this.lastDelay + this.options.delay).min(this.options.limit);
+			this.timer = fn.delay(this.lastDelay, this);
+		};
+		return this.addEvent('complete', this.completeCheck);
+	},
+
+	stopTimer: function(){
+		clearTimeout(this.timer);
+		return this.removeEvent('complete', this.completeCheck);
+	}
+
+});
+
+
+/*
+---
+
+script: Assets.js
+
+name: Assets
+
+description: Provides methods to dynamically load JavaScript, CSS, and Image files into the document.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Element.Event
+  - /MooTools.More
+
+provides: [Assets]
+
+...
+*/
+
+var Asset = {
+
+	javascript: function(source, properties){
+		if (!properties) properties = {};
+
+		var script = new Element('script', {src: source, type: 'text/javascript'}),
+			doc = properties.document || document,
+			load = properties.onload || properties.onLoad;
+
+		delete properties.onload;
+		delete properties.onLoad;
+		delete properties.document;
+
+		if (load){
+			if (typeof script.onreadystatechange != 'undefined'){
+				script.addEvent('readystatechange', function(){
+					if (['loaded', 'complete'].contains(this.readyState)) load.call(this);
+				});
+			} else {
+				script.addEvent('load', load);
+			}
+		}
+
+		return script.set(properties).inject(doc.head);
+	},
+
+	css: function(source, properties){
+		if (!properties) properties = {};
+
+		var link = new Element('link', {
+			rel: 'stylesheet',
+			media: 'screen',
+			type: 'text/css',
+			href: source
+		});
+
+		var load = properties.onload || properties.onLoad,
+			doc = properties.document || document;
+
+		delete properties.onload;
+		delete properties.onLoad;
+		delete properties.document;
+
+		if (load) link.addEvent('load', load);
+		return link.set(properties).inject(doc.head);
+	},
+
+	image: function(source, properties){
+		if (!properties) properties = {};
+
+		var image = new Image(),
+			element = document.id(image) || new Element('img');
+
+		['load', 'abort', 'error'].each(function(name){
+			var type = 'on' + name,
+				cap = 'on' + name.capitalize(),
+				event = properties[type] || properties[cap] || function(){};
+
+			delete properties[cap];
+			delete properties[type];
+
+			image[type] = function(){
+				if (!image) return;
+				if (!element.parentNode){
+					element.width = image.width;
+					element.height = image.height;
+				}
+				image = image.onload = image.onabort = image.onerror = null;
+				event.delay(1, element, element);
+				element.fireEvent(name, element, 1);
+			};
+		});
+
+		image.src = element.src = source;
+		if (image && image.complete) image.onload.delay(1);
+		return element.set(properties);
+	},
+
+	images: function(sources, options){
+		sources = Array.from(sources);
+
+		var fn = function(){},
+			counter = 0;
+
+		options = Object.merge({
+			onComplete: fn,
+			onProgress: fn,
+			onError: fn,
+			properties: {}
+		}, options);
+
+		return new Elements(sources.map(function(source, index){
+			return Asset.image(source, Object.append(options.properties, {
+				onload: function(){
+					counter++;
+					options.onProgress.call(this, counter, index, source);
+					if (counter == sources.length) options.onComplete();
+				},
+				onerror: function(){
+					counter++;
+					options.onError.call(this, counter, index, source);
+					if (counter == sources.length) options.onComplete();
+				}
+			}));
+		}));
+	}
+
+};
+
+
+/*
+---
+
+script: Color.js
+
+name: Color
+
+description: Class for creating and manipulating colors in JavaScript. Supports HSB -> RGB Conversions and vice versa.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Array
+  - Core/String
+  - Core/Number
+  - Core/Hash
+  - Core/Function
+  - MooTools.More
+
+provides: [Color]
+
+...
+*/
+
+(function(){
+
+var Color = this.Color = new Type('Color', function(color, type){
+	if (arguments.length >= 3){
+		type = 'rgb'; color = Array.slice(arguments, 0, 3);
+	} else if (typeof color == 'string'){
+		if (color.match(/rgb/)) color = color.rgbToHex().hexToRgb(true);
+		else if (color.match(/hsb/)) color = color.hsbToRgb();
+		else color = color.hexToRgb(true);
+	}
+	type = type || 'rgb';
+	switch (type){
+		case 'hsb':
+			var old = color;
+			color = color.hsbToRgb();
+			color.hsb = old;
+		break;
+		case 'hex': color = color.hexToRgb(true); break;
+	}
+	color.rgb = color.slice(0, 3);
+	color.hsb = color.hsb || color.rgbToHsb();
+	color.hex = color.rgbToHex();
+	return Object.append(color, this);
+});
+
+Color.implement({
+
+	mix: function(){
+		var colors = Array.slice(arguments);
+		var alpha = (typeOf(colors.getLast()) == 'number') ? colors.pop() : 50;
+		var rgb = this.slice();
+		colors.each(function(color){
+			color = new Color(color);
+			for (var i = 0; i < 3; i++) rgb[i] = Math.round((rgb[i] / 100 * (100 - alpha)) + (color[i] / 100 * alpha));
+		});
+		return new Color(rgb, 'rgb');
+	},
+
+	invert: function(){
+		return new Color(this.map(function(value){
+			return 255 - value;
+		}));
+	},
+
+	setHue: function(value){
+		return new Color([value, this.hsb[1], this.hsb[2]], 'hsb');
+	},
+
+	setSaturation: function(percent){
+		return new Color([this.hsb[0], percent, this.hsb[2]], 'hsb');
+	},
+
+	setBrightness: function(percent){
+		return new Color([this.hsb[0], this.hsb[1], percent], 'hsb');
+	}
+
+});
+
+this.$RGB = function(r, g, b){
+	return new Color([r, g, b], 'rgb');
+};
+
+this.$HSB = function(h, s, b){
+	return new Color([h, s, b], 'hsb');
+};
+
+this.$HEX = function(hex){
+	return new Color(hex, 'hex');
+};
+
+Array.implement({
+
+	rgbToHsb: function(){
+		var red = this[0],
+				green = this[1],
+				blue = this[2],
+				hue = 0;
+		var max = Math.max(red, green, blue),
+				min = Math.min(red, green, blue);
+		var delta = max - min;
+		var brightness = max / 255,
+				saturation = (max != 0) ? delta / max : 0;
+		if (saturation != 0){
+			var rr = (max - red) / delta;
+			var gr = (max - green) / delta;
+			var br = (max - blue) / delta;
+			if (red == max) hue = br - gr;
+			else if (green == max) hue = 2 + rr - br;
+			else hue = 4 + gr - rr;
+			hue /= 6;
+			if (hue < 0) hue++;
+		}
+		return [Math.round(hue * 360), Math.round(saturation * 100), Math.round(brightness * 100)];
+	},
+
+	hsbToRgb: function(){
+		var br = Math.round(this[2] / 100 * 255);
+		if (this[1] == 0){
+			return [br, br, br];
+		} else {
+			var hue = this[0] % 360;
+			var f = hue % 60;
+			var p = Math.round((this[2] * (100 - this[1])) / 10000 * 255);
+			var q = Math.round((this[2] * (6000 - this[1] * f)) / 600000 * 255);
+			var t = Math.round((this[2] * (6000 - this[1] * (60 - f))) / 600000 * 255);
+			switch (Math.floor(hue / 60)){
+				case 0: return [br, t, p];
+				case 1: return [q, br, p];
+				case 2: return [p, br, t];
+				case 3: return [p, q, br];
+				case 4: return [t, p, br];
+				case 5: return [br, p, q];
+			}
+		}
+		return false;
+	}
+
+});
+
+String.implement({
+
+	rgbToHsb: function(){
+		var rgb = this.match(/\d{1,3}/g);
+		return (rgb) ? rgb.rgbToHsb() : null;
+	},
+
+	hsbToRgb: function(){
+		var hsb = this.match(/\d{1,3}/g);
+		return (hsb) ? hsb.hsbToRgb() : null;
+	}
+
+});
+
+})();
+
+
+
+/*
+---
+
+script: Group.js
+
+name: Group
+
+description: Class for monitoring collections of events
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Events
+  - /MooTools.More
+
+provides: [Group]
+
+...
+*/
+
+(function(){
+
+this.Group = new Class({
+
+	initialize: function(){
+		this.instances = Array.flatten(arguments);
+	},
+
+	addEvent: function(type, fn){
+		var instances = this.instances,
+			len = instances.length,
+			togo = len,
+			args = new Array(len),
+			self = this;
+
+		instances.each(function(instance, i){
+			instance.addEvent(type, function(){
+				if (!args[i]) togo--;
+				args[i] = arguments;
+				if (!togo){
+					fn.call(self, instances, instance, args);
+					togo = len;
+					args = new Array(len);
+				}
+			});
+		});
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: Hash.Cookie.js
+
+name: Hash.Cookie
+
+description: Class for creating, reading, and deleting Cookies in JSON format.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Aaron Newton
+
+requires:
+  - Core/Cookie
+  - Core/JSON
+  - /MooTools.More
+  - /Hash
+
+provides: [Hash.Cookie]
+
+...
+*/
+
+Hash.Cookie = new Class({
+
+	Extends: Cookie,
+
+	options: {
+		autoSave: true
+	},
+
+	initialize: function(name, options){
+		this.parent(name, options);
+		this.load();
+	},
+
+	save: function(){
+		var value = JSON.encode(this.hash);
+		if (!value || value.length > 4096) return false; //cookie would be truncated!
+		if (value == '{}') this.dispose();
+		else this.write(value);
+		return true;
+	},
+
+	load: function(){
+		this.hash = new Hash(JSON.decode(this.read(), true));
+		return this;
+	}
+
+});
+
+Hash.each(Hash.prototype, function(method, name){
+	if (typeof method == 'function') Hash.Cookie.implement(name, function(){
+		var value = method.apply(this.hash, arguments);
+		if (this.options.autoSave) this.save();
+		return value;
+	});
+});
+
+
+/*
+---
+name: Table
+description: LUA-Style table implementation.
+license: MIT-style license
+authors:
+  - Valerio Proietti
+requires: [Core/Array]
+provides: [Table]
+...
+*/
+
+(function(){
+
+var Table = this.Table = function(){
+
+	this.length = 0;
+	var keys = [],
+	    values = [];
+	
+	this.set = function(key, value){
+		var index = keys.indexOf(key);
+		if (index == -1){
+			var length = keys.length;
+			keys[length] = key;
+			values[length] = value;
+			this.length++;
+		} else {
+			values[index] = value;
+		}
+		return this;
+	};
+
+	this.get = function(key){
+		var index = keys.indexOf(key);
+		return (index == -1) ? null : values[index];
+	};
+
+	this.erase = function(key){
+		var index = keys.indexOf(key);
+		if (index != -1){
+			this.length--;
+			keys.splice(index, 1);
+			return values.splice(index, 1)[0];
+		}
+		return null;
+	};
+
+	this.each = this.forEach = function(fn, bind){
+		for (var i = 0, l = this.length; i < l; i++) fn.call(bind, keys[i], values[i], this);
+	};
+	
+};
+
+if (this.Type) new Type('Table', Table);
+
+})();
+
+
+/*
+---
+
+script: HtmlTable.js
+
+name: HtmlTable
+
+description: Builds table elements with methods to add rows.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Options
+  - Core/Events
+  - /Class.Occlude
+
+provides: [HtmlTable]
+
+...
+*/
+
+var HtmlTable = new Class({
+
+	Implements: [Options, Events, Class.Occlude],
+
+	options: {
+		properties: {
+			cellpadding: 0,
+			cellspacing: 0,
+			border: 0
+		},
+		rows: [],
+		headers: [],
+		footers: []
+	},
+
+	property: 'HtmlTable',
+
+	initialize: function(){
+		var params = Array.link(arguments, {options: Type.isObject, table: Type.isElement, id: Type.isString});
+		this.setOptions(params.options);
+		if (!params.table && params.id) params.table = document.id(params.id);
+		this.element = params.table || new Element('table', this.options.properties);
+		if (this.occlude()) return this.occluded;
+		this.build();
+	},
+
+	build: function(){
+		this.element.store('HtmlTable', this);
+
+		this.body = document.id(this.element.tBodies[0]) || new Element('tbody').inject(this.element);
+		$$(this.body.rows);
+
+		if (this.options.headers.length) this.setHeaders(this.options.headers);
+		else this.thead = document.id(this.element.tHead);
+
+		if (this.thead) this.head = this.getHead();
+		if (this.options.footers.length) this.setFooters(this.options.footers);
+
+		this.tfoot = document.id(this.element.tFoot);
+		if (this.tfoot) this.foot = document.id(this.tfoot.rows[0]);
+
+		this.options.rows.each(function(row){
+			this.push(row);
+		}, this);
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	empty: function(){
+		this.body.empty();
+		return this;
+	},
+
+	set: function(what, items){
+		var target = (what == 'headers') ? 'tHead' : 'tFoot',
+			lower = target.toLowerCase();
+
+		this[lower] = (document.id(this.element[target]) || new Element(lower).inject(this.element, 'top')).empty();
+		var data = this.push(items, {}, this[lower], what == 'headers' ? 'th' : 'td');
+
+		if (what == 'headers') this.head = this.getHead();
+		else this.foot = this.getHead();
+
+		return data;
+	},
+
+	getHead: function(){
+		var rows = this.thead.rows;
+		return rows.length > 1 ? $$(rows) : rows.length ? document.id(rows[0]) : false;
+	},
+
+	setHeaders: function(headers){
+		this.set('headers', headers);
+		return this;
+	},
+
+	setFooters: function(footers){
+		this.set('footers', footers);
+		return this;
+	},
+
+	update: function(tr, row, tag){
+		var tds = tr.getChildren(tag || 'td'), last = tds.length - 1;
+
+		row.each(function(data, index){
+			var td = tds[index] || new Element(tag || 'td').inject(tr),
+				content = (data ? data.content : '') || data,
+				type = typeOf(content);
+
+			if (data && data.properties) td.set(data.properties);
+			if (/(element(s?)|array|collection)/.test(type)) td.empty().adopt(content);
+			else td.set('html', content);
+
+			if (index > last) tds.push(td);
+			else tds[index] = td;
+		});
+
+		return {
+			tr: tr,
+			tds: tds
+		};
+	},
+
+	push: function(row, rowProperties, target, tag, where){
+		if (typeOf(row) == 'element' && row.get('tag') == 'tr'){
+			row.inject(target || this.body, where);
+			return {
+				tr: row,
+				tds: row.getChildren('td')
+			};
+		}
+		return this.update(new Element('tr', rowProperties).inject(target || this.body, where), row, tag);
+	},
+
+	pushMany: function(rows, rowProperties, target, tag, where){
+		return rows.map(function(row){
+			return this.push(row, rowProperties, target, tag, where);
+		}, this);
+	}
+
+});
+
+
+['adopt', 'inject', 'wraps', 'grab', 'replaces', 'dispose'].each(function(method){
+	HtmlTable.implement(method, function(){
+		this.element[method].apply(this.element, arguments);
+		return this;
+	});
+});
+
+
+
+
+/*
+---
+
+script: HtmlTable.Zebra.js
+
+name: HtmlTable.Zebra
+
+description: Builds a stripy table with methods to add rows.
+
+license: MIT-style license
+
+authors:
+  - Harald Kirschner
+  - Aaron Newton
+
+requires:
+  - /HtmlTable
+  - /Element.Shortcuts
+  - /Class.refactor
+
+provides: [HtmlTable.Zebra]
+
+...
+*/
+
+HtmlTable = Class.refactor(HtmlTable, {
+
+	options: {
+		classZebra: 'table-tr-odd',
+		zebra: true,
+		zebraOnlyVisibleRows: true
+	},
+
+	initialize: function(){
+		this.previous.apply(this, arguments);
+		if (this.occluded) return this.occluded;
+		if (this.options.zebra) this.updateZebras();
+	},
+
+	updateZebras: function(){
+		var index = 0;
+		Array.each(this.body.rows, function(row){
+			if (!this.options.zebraOnlyVisibleRows || row.isDisplayed()){
+				this.zebra(row, index++);
+			}
+		}, this);
+	},
+
+	setRowStyle: function(row, i){
+		if (this.previous) this.previous(row, i);
+		this.zebra(row, i);
+	},
+
+	zebra: function(row, i){
+		return row[((i % 2) ? 'remove' : 'add')+'Class'](this.options.classZebra);
+	},
+
+	push: function(){
+		var pushed = this.previous.apply(this, arguments);
+		if (this.options.zebra) this.updateZebras();
+		return pushed;
+	}
+
+});
+
+
+/*
+---
+
+script: HtmlTable.Sort.js
+
+name: HtmlTable.Sort
+
+description: Builds a stripy, sortable table with methods to add rows.
+
+license: MIT-style license
+
+authors:
+  - Harald Kirschner
+  - Aaron Newton
+  - Jacob Thornton
+
+requires:
+  - Core/Hash
+  - /HtmlTable
+  - /Class.refactor
+  - /Element.Delegation
+  - /String.Extras
+  - /Date
+
+provides: [HtmlTable.Sort]
+
+...
+*/
+
+HtmlTable = Class.refactor(HtmlTable, {
+
+	options: {/*
+		onSort: function(){}, */
+		sortIndex: 0,
+		sortReverse: false,
+		parsers: [],
+		defaultParser: 'string',
+		classSortable: 'table-sortable',
+		classHeadSort: 'table-th-sort',
+		classHeadSortRev: 'table-th-sort-rev',
+		classNoSort: 'table-th-nosort',
+		classGroupHead: 'table-tr-group-head',
+		classGroup: 'table-tr-group',
+		classCellSort: 'table-td-sort',
+		classSortSpan: 'table-th-sort-span',
+		sortable: false,
+		thSelector: 'th'
+	},
+
+	initialize: function (){
+		this.previous.apply(this, arguments);
+		if (this.occluded) return this.occluded;
+		this.sorted = {index: null, dir: 1};
+		if (!this.bound) this.bound = {};
+		this.bound.headClick = this.headClick.bind(this);
+		this.sortSpans = new Elements();
+		if (this.options.sortable){
+			this.enableSort();
+			if (this.options.sortIndex != null) this.sort(this.options.sortIndex, this.options.sortReverse);
+		}
+	},
+
+	attachSorts: function(attach){
+		this.detachSorts();
+		if (attach !== false) this.element.addEvent('click:relay(' + this.options.thSelector + ')', this.bound.headClick);
+	},
+
+	detachSorts: function(){
+		this.element.removeEvents('click:relay(' + this.options.thSelector + ')');
+	},
+
+	setHeaders: function(){
+		this.previous.apply(this, arguments);
+		if (this.sortEnabled) this.setParsers();
+	},
+
+	setParsers: function(){
+		this.parsers = this.detectParsers();
+	},
+
+	detectParsers: function(){
+		return this.head && this.head.getElements(this.options.thSelector).flatten().map(this.detectParser, this);
+	},
+
+	detectParser: function(cell, index){
+		if (cell.hasClass(this.options.classNoSort) || cell.retrieve('htmltable-parser')) return cell.retrieve('htmltable-parser');
+		var thDiv = new Element('div');
+		thDiv.adopt(cell.childNodes).inject(cell);
+		var sortSpan = new Element('span', {'class': this.options.classSortSpan}).inject(thDiv, 'top');
+		this.sortSpans.push(sortSpan);
+		var parser = this.options.parsers[index],
+			rows = this.body.rows,
+			cancel;
+		switch (typeOf(parser)){
+			case 'function': parser = {convert: parser}; cancel = true; break;
+			case 'string': parser = parser; cancel = true; break;
+		}
+		if (!cancel){
+			HtmlTable.ParserPriority.some(function(parserName){
+				var current = HtmlTable.Parsers[parserName],
+					match = current.match;
+				if (!match) return false;
+				for (var i = 0, j = rows.length; i < j; i++){
+					var cell = document.id(rows[i].cells[index]),
+						text = cell ? cell.get('html').clean() : '';
+					if (text && match.test(text)){
+						parser = current;
+						return true;
+					}
+				}
+			});
+		}
+		if (!parser) parser = this.options.defaultParser;
+		cell.store('htmltable-parser', parser);
+		return parser;
+	},
+
+	headClick: function(event, el){
+		if (!this.head || el.hasClass(this.options.classNoSort)) return;
+		return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(), el) % this.body.rows[0].cells.length);
+	},
+
+	serialize: function(){
+		var previousSerialization = this.previous.apply(this, arguments) || {};
+		if (this.options.sortable){
+			previousSerialization.sortIndex = this.sorted.index;
+			previousSerialization.sortReverse = this.sorted.reverse;
+		}
+		return previousSerialization;
+	},
+
+	restore: function(tableState){
+		if (this.options.sortable && tableState.sortIndex){
+			this.sort(tableState.sortIndex, tableState.sortReverse);
+		}
+		this.previous.apply(this, arguments);
+	},
+
+	setSortedState: function(index, reverse){
+		if (reverse != null) this.sorted.reverse = reverse;
+		else if (this.sorted.index == index) this.sorted.reverse = !this.sorted.reverse;
+		else this.sorted.reverse = this.sorted.index == null;
+
+		if (index != null) this.sorted.index = index;
+	},
+
+	setHeadSort: function(sorted){
+		var head = $$(!this.head.length ? this.head.cells[this.sorted.index] : this.head.map(function(row){
+			return row.getElements(this.options.thSelector)[this.sorted.index];
+		}, this).clean());
+		if (!head.length) return;
+		if (sorted){
+			head.addClass(this.options.classHeadSort);
+			if (this.sorted.reverse) head.addClass(this.options.classHeadSortRev);
+			else head.removeClass(this.options.classHeadSortRev);
+		} else {
+			head.removeClass(this.options.classHeadSort).removeClass(this.options.classHeadSortRev);
+		}
+	},
+
+	setRowSort: function(data, pre){
+		var count = data.length,
+			body = this.body,
+			group,
+			rowIndex;
+
+		while (count){
+			var item = data[--count],
+				position = item.position,
+				row = body.rows[position];
+
+			if (row.disabled) continue;
+			if (!pre){
+				group = this.setGroupSort(group, row, item);
+				this.setRowStyle(row, count);
+			}
+			body.appendChild(row);
+
+			for (rowIndex = 0; rowIndex < count; rowIndex++){
+				if (data[rowIndex].position > position) data[rowIndex].position--;
+			}
+		}
+	},
+
+	setRowStyle: function(row, i){
+		this.previous(row, i);
+		row.cells[this.sorted.index].addClass(this.options.classCellSort);
+	},
+
+	setGroupSort: function(group, row, item){
+		if (group == item.value) row.removeClass(this.options.classGroupHead).addClass(this.options.classGroup);
+		else row.removeClass(this.options.classGroup).addClass(this.options.classGroupHead);
+		return item.value;
+	},
+
+	getParser: function(){
+		var parser = this.parsers[this.sorted.index];
+		return typeOf(parser) == 'string' ? HtmlTable.Parsers[parser] : parser;
+	},
+
+	sort: function(index, reverse, pre){
+		if (!this.head) return;
+
+		if (!pre){
+			this.clearSort();
+			this.setSortedState(index, reverse);
+			this.setHeadSort(true);
+		}
+
+		var parser = this.getParser();
+		if (!parser) return;
+
+		var rel;
+		if (!Browser.ie){
+			rel = this.body.getParent();
+			this.body.dispose();
+		}
+
+		var data = this.parseData(parser).sort(function(a, b){
+			if (a.value === b.value) return 0;
+			return a.value > b.value ? 1 : -1;
+		});
+
+		if (this.sorted.reverse == (parser == HtmlTable.Parsers['input-checked'])) data.reverse(true);
+		this.setRowSort(data, pre);
+
+		if (rel) rel.grab(this.body);
+		this.fireEvent('stateChanged');
+		return this.fireEvent('sort', [this.body, this.sorted.index]);
+	},
+
+	parseData: function(parser){
+		return Array.map(this.body.rows, function(row, i){
+			var value = parser.convert.call(document.id(row.cells[this.sorted.index]));
+			return {
+				position: i,
+				value: value
+			};
+		}, this);
+	},
+
+	clearSort: function(){
+		this.setHeadSort(false);
+		this.body.getElements('td').removeClass(this.options.classCellSort);
+	},
+
+	reSort: function(){
+		if (this.sortEnabled) this.sort.call(this, this.sorted.index, this.sorted.reverse);
+		return this;
+	},
+
+	enableSort: function(){
+		this.element.addClass(this.options.classSortable);
+		this.attachSorts(true);
+		this.setParsers();
+		this.sortEnabled = true;
+		return this;
+	},
+
+	disableSort: function(){
+		this.element.removeClass(this.options.classSortable);
+		this.attachSorts(false);
+		this.sortSpans.each(function(span){
+			span.destroy();
+		});
+		this.sortSpans.empty();
+		this.sortEnabled = false;
+		return this;
+	}
+
+});
+
+HtmlTable.ParserPriority = ['date', 'input-checked', 'input-value', 'float', 'number'];
+
+HtmlTable.Parsers = {
+
+	'date': {
+		match: /^\d{2}[-\/ ]\d{2}[-\/ ]\d{2,4}$/,
+		convert: function(){
+			var d = Date.parse(this.get('text').stripTags());
+			return (typeOf(d) == 'date') ? d.format('db') : '';
+		},
+		type: 'date'
+	},
+	'input-checked': {
+		match: / type="(radio|checkbox)" /,
+		convert: function(){
+			return this.getElement('input').checked;
+		}
+	},
+	'input-value': {
+		match: /<input/,
+		convert: function(){
+			return this.getElement('input').value;
+		}
+	},
+	'number': {
+		match: /^\d+[^\d.,]*$/,
+		convert: function(){
+			return this.get('text').stripTags().toInt();
+		},
+		number: true
+	},
+	'numberLax': {
+		match: /^[^\d]+\d+$/,
+		convert: function(){
+			return this.get('text').replace(/[^-?^0-9]/, '').stripTags().toInt();
+		},
+		number: true
+	},
+	'float': {
+		match: /^[\d]+\.[\d]+/,
+		convert: function(){
+			return this.get('text').replace(/[^-?^\d.]/, '').stripTags().toFloat();
+		},
+		number: true
+	},
+	'floatLax': {
+		match: /^[^\d]+[\d]+\.[\d]+$/,
+		convert: function(){
+			return this.get('text').replace(/[^-?^\d.]/, '').stripTags();
+		},
+		number: true
+	},
+	'string': {
+		match: null,
+		convert: function(){
+			return this.get('text').stripTags().toLowerCase();
+		}
+	},
+	'title': {
+		match: null,
+		convert: function(){
+			return this.title;
+		}
+	}
+
+};
+
+
+
+HtmlTable.defineParsers = function(parsers){
+	HtmlTable.Parsers = Object.append(HtmlTable.Parsers, parsers);
+	for (var parser in parsers){
+		HtmlTable.ParserPriority.unshift(parser);
+	}
+};
+
+
+/*
+---
+
+script: Keyboard.js
+
+name: Keyboard
+
+description: KeyboardEvents used to intercept events on a class for keyboard and format modifiers in a specific order so as to make alt+shift+c the same as shift+alt+c.
+
+license: MIT-style license
+
+authors:
+  - Perrin Westrich
+  - Aaron Newton
+  - Scott Kyle
+
+requires:
+  - Core/Events
+  - Core/Options
+  - Core/Element.Event
+  - Element.Event.Pseudos.Keys
+
+provides: [Keyboard]
+
+...
+*/
+
+(function(){
+
+	var Keyboard = this.Keyboard = new Class({
+
+		Extends: Events,
+
+		Implements: [Options],
+
+		options: {/*
+			onActivate: function(){},
+			onDeactivate: function(){},*/
+			defaultEventType: 'keydown',
+			active: false,
+			manager: null,
+			events: {},
+			nonParsedEvents: ['activate', 'deactivate', 'onactivate', 'ondeactivate', 'changed', 'onchanged']
+		},
+
+		initialize: function(options){
+			if (options && options.manager){
+				this._manager = options.manager;
+				delete options.manager;
+			}
+			this.setOptions(options);
+			this._setup();
+		},
+
+		addEvent: function(type, fn, internal){
+			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
+		},
+
+		removeEvent: function(type, fn){
+			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
+		},
+
+		toggleActive: function(){
+			return this[this.isActive() ? 'deactivate' : 'activate']();
+		},
+
+		activate: function(instance){
+			if (instance){
+				if (instance.isActive()) return this;
+				//if we're stealing focus, store the last keyboard to have it so the relinquish command works
+				if (this._activeKB && instance != this._activeKB){
+					this.previous = this._activeKB;
+					this.previous.fireEvent('deactivate');
+				}
+				//if we're enabling a child, assign it so that events are now passed to it
+				this._activeKB = instance.fireEvent('activate');
+				Keyboard.manager.fireEvent('changed');
+			} else if (this._manager){
+				//else we're enabling ourselves, we must ask our parent to do it for us
+				this._manager.activate(this);
+			}
+			return this;
+		},
+
+		isActive: function(){
+			return this._manager ? (this._manager._activeKB == this) : (Keyboard.manager == this);
+		},
+
+		deactivate: function(instance){
+			if (instance){
+				if (instance === this._activeKB){
+					this._activeKB = null;
+					instance.fireEvent('deactivate');
+					Keyboard.manager.fireEvent('changed');
+				}
+			} else if (this._manager){
+				this._manager.deactivate(this);
+			}
+			return this;
+		},
+
+		relinquish: function(){
+			if (this.isActive() && this._manager && this._manager.previous) this._manager.activate(this._manager.previous);
+			else this.deactivate();
+			return this;
+		},
+
+		//management logic
+		manage: function(instance){
+			if (instance._manager) instance._manager.drop(instance);
+			this._instances.push(instance);
+			instance._manager = this;
+			if (!this._activeKB) this.activate(instance);
+			return this;
+		},
+
+		drop: function(instance){
+			instance.relinquish();
+			this._instances.erase(instance);
+			if (this._activeKB == instance){
+				if (this.previous && this._instances.contains(this.previous)) this.activate(this.previous);
+				else this._activeKB = this._instances[0];
+			}
+			return this;
+		},
+
+		trace: function(){
+			Keyboard.trace(this);
+		},
+
+		each: function(fn){
+			Keyboard.each(this, fn);
+		},
+
+		/*
+			PRIVATE METHODS
+		*/
+
+		_instances: [],
+
+		_disable: function(instance){
+			if (this._activeKB == instance) this._activeKB = null;
+		},
+
+		_setup: function(){
+			this.addEvents(this.options.events);
+			//if this is the root manager, nothing manages it
+			if (Keyboard.manager && !this._manager) Keyboard.manager.manage(this);
+			if (this.options.active) this.activate();
+			else this.relinquish();
+		},
+
+		_handle: function(event, type){
+			//Keyboard.stop(event) prevents key propagation
+			if (event.preventKeyboardPropagation) return;
+
+			var bubbles = !!this._manager;
+			if (bubbles && this._activeKB){
+				this._activeKB._handle(event, type);
+				if (event.preventKeyboardPropagation) return;
+			}
+			this.fireEvent(type, event);
+
+			if (!bubbles && this._activeKB) this._activeKB._handle(event, type);
+		}
+
+	});
+
+	var parsed = {};
+	var modifiers = ['shift', 'control', 'alt', 'meta'];
+	var regex = /^(?:shift|control|ctrl|alt|meta)$/;
+
+	Keyboard.parse = function(type, eventType, ignore){
+		if (ignore && ignore.contains(type.toLowerCase())) return type;
+
+		type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
+			eventType = $1;
+			return '';
+		});
+
+		if (!parsed[type]){
+			var key, mods = {};
+			type.split('+').each(function(part){
+				if (regex.test(part)) mods[part] = true;
+				else key = part;
+			});
+
+			mods.control = mods.control || mods.ctrl; // allow both control and ctrl
+
+			var keys = [];
+			modifiers.each(function(mod){
+				if (mods[mod]) keys.push(mod);
+			});
+
+			if (key) keys.push(key);
+			parsed[type] = keys.join('+');
+		}
+
+		return eventType + ':keys(' + parsed[type] + ')';
+	};
+
+	Keyboard.each = function(keyboard, fn){
+		var current = keyboard || Keyboard.manager;
+		while (current){
+			fn.run(current);
+			current = current._activeKB;
+		}
+	};
+
+	Keyboard.stop = function(event){
+		event.preventKeyboardPropagation = true;
+	};
+
+	Keyboard.manager = new Keyboard({
+		active: true
+	});
+
+	Keyboard.trace = function(keyboard){
+		keyboard = keyboard || Keyboard.manager;
+		var hasConsole = window.console && console.log;
+		if (hasConsole) console.log('the following items have focus: ');
+		Keyboard.each(keyboard, function(current){
+			if (hasConsole) console.log(document.id(current.widget) || current.wiget || current);
+		});
+	};
+
+	var handler = function(event){
+		var keys = [];
+		modifiers.each(function(mod){
+			if (event[mod]) keys.push(mod);
+		});
+
+		if (!regex.test(event.key)) keys.push(event.key);
+		Keyboard.manager._handle(event, event.type + ':keys(' + keys.join('+') + ')');
+	};
+
+	document.addEvents({
+		'keyup': handler,
+		'keydown': handler
+	});
+
+})();
+
+
+/*
+---
+
+script: Keyboard.Extras.js
+
+name: Keyboard.Extras
+
+description: Enhances Keyboard by adding the ability to name and describe keyboard shortcuts, and the ability to grab shortcuts by name and bind the shortcut to different keys.
+
+license: MIT-style license
+
+authors:
+  - Perrin Westrich
+
+requires:
+  - /Keyboard
+  - /MooTools.More
+
+provides: [Keyboard.Extras]
+
+...
+*/
+Keyboard.prototype.options.nonParsedEvents.combine(['rebound', 'onrebound']);
+
+Keyboard.implement({
+
+	/*
+		shortcut should be in the format of:
+		{
+			'keys': 'shift+s', // the default to add as an event.
+			'description': 'blah blah blah', // a brief description of the functionality.
+			'handler': function(){} // the event handler to run when keys are pressed.
+		}
+	*/
+	addShortcut: function(name, shortcut){
+		this._shortcuts = this._shortcuts || [];
+		this._shortcutIndex = this._shortcutIndex || {};
+
+		shortcut.getKeyboard = Function.from(this);
+		shortcut.name = name;
+		this._shortcutIndex[name] = shortcut;
+		this._shortcuts.push(shortcut);
+		if (shortcut.keys) this.addEvent(shortcut.keys, shortcut.handler);
+		return this;
+	},
+
+	addShortcuts: function(obj){
+		for (var name in obj) this.addShortcut(name, obj[name]);
+		return this;
+	},
+
+	removeShortcut: function(name){
+		var shortcut = this.getShortcut(name);
+		if (shortcut && shortcut.keys){
+			this.removeEvent(shortcut.keys, shortcut.handler);
+			delete this._shortcutIndex[name];
+			this._shortcuts.erase(shortcut);
+		}
+		return this;
+	},
+
+	removeShortcuts: function(names){
+		names.each(this.removeShortcut, this);
+		return this;
+	},
+
+	getShortcuts: function(){
+		return this._shortcuts || [];
+	},
+
+	getShortcut: function(name){
+		return (this._shortcutIndex || {})[name];
+	}
+
+});
+
+Keyboard.rebind = function(newKeys, shortcuts){
+	Array.from(shortcuts).each(function(shortcut){
+		shortcut.getKeyboard().removeEvent(shortcut.keys, shortcut.handler);
+		shortcut.getKeyboard().addEvent(newKeys, shortcut.handler);
+		shortcut.keys = newKeys;
+		shortcut.getKeyboard().fireEvent('rebound');
+	});
+};
+
+
+Keyboard.getActiveShortcuts = function(keyboard){
+	var activeKBS = [], activeSCS = [];
+	Keyboard.each(keyboard, [].push.bind(activeKBS));
+	activeKBS.each(function(kb){ activeSCS.extend(kb.getShortcuts()); });
+	return activeSCS;
+};
+
+Keyboard.getShortcut = function(name, keyboard, opts){
+	opts = opts || {};
+	var shortcuts = opts.many ? [] : null,
+		set = opts.many ? function(kb){
+				var shortcut = kb.getShortcut(name);
+				if (shortcut) shortcuts.push(shortcut);
+			} : function(kb){
+				if (!shortcuts) shortcuts = kb.getShortcut(name);
+			};
+	Keyboard.each(keyboard, set);
+	return shortcuts;
+};
+
+Keyboard.getShortcuts = function(name, keyboard){
+	return Keyboard.getShortcut(name, keyboard, { many: true });
+};
+
+
+/*
+---
+
+script: HtmlTable.Select.js
+
+name: HtmlTable.Select
+
+description: Builds a stripy, sortable table with methods to add rows. Rows can be selected with the mouse or keyboard navigation.
+
+license: MIT-style license
+
+authors:
+  - Harald Kirschner
+  - Aaron Newton
+
+requires:
+  - /Keyboard
+  - /Keyboard.Extras
+  - /HtmlTable
+  - /Class.refactor
+  - /Element.Delegation
+  - /Element.Shortcuts
+
+provides: [HtmlTable.Select]
+
+...
+*/
+
+HtmlTable = Class.refactor(HtmlTable, {
+
+	options: {
+		/*onRowFocus: function(){},
+		onRowUnfocus: function(){},*/
+		useKeyboard: true,
+		classRowSelected: 'table-tr-selected',
+		classRowHovered: 'table-tr-hovered',
+		classSelectable: 'table-selectable',
+		shiftForMultiSelect: true,
+		allowMultiSelect: true,
+		selectable: false,
+		selectHiddenRows: false
+	},
+
+	initialize: function(){
+		this.previous.apply(this, arguments);
+		if (this.occluded) return this.occluded;
+
+		this.selectedRows = new Elements();
+
+		if (!this.bound) this.bound = {};
+		this.bound.mouseleave = this.mouseleave.bind(this);
+		this.bound.clickRow = this.clickRow.bind(this);
+		this.bound.activateKeyboard = function(){
+			if (this.keyboard && this.selectEnabled) this.keyboard.activate();
+		}.bind(this);
+
+		if (this.options.selectable) this.enableSelect();
+	},
+
+	empty: function(){
+		this.selectNone();
+		return this.previous();
+	},
+
+	enableSelect: function(){
+		this.selectEnabled = true;
+		this.attachSelects();
+		this.element.addClass(this.options.classSelectable);
+		return this;
+	},
+
+	disableSelect: function(){
+		this.selectEnabled = false;
+		this.attachSelects(false);
+		this.element.removeClass(this.options.classSelectable);
+		return this;
+	},
+
+	push: function(){
+		var ret = this.previous.apply(this, arguments);
+		this.updateSelects();
+		return ret;
+	},
+
+	toggleRow: function(row){
+		return this[(this.isSelected(row) ? 'de' : '') + 'selectRow'](row);
+	},
+
+	selectRow: function(row, _nocheck){
+		//private variable _nocheck: boolean whether or not to confirm the row is in the table body
+		//added here for optimization when selecting ranges
+		if (this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
+		if (!this.options.allowMultiSelect) this.selectNone();
+
+		if (!this.isSelected(row)){
+			this.selectedRows.push(row);
+			row.addClass(this.options.classRowSelected);
+			this.fireEvent('rowFocus', [row, this.selectedRows]);
+			this.fireEvent('stateChanged');
+		}
+
+		this.focused = row;
+		document.clearSelection();
+
+		return this;
+	},
+
+	isSelected: function(row){
+		return this.selectedRows.contains(row);
+	},
+
+	getSelected: function(){
+		return this.selectedRows;
+	},
+
+	getSelected: function(){
+		return this.selectedRows;
+	},
+
+	serialize: function(){
+		var previousSerialization = this.previous.apply(this, arguments) || {};
+		if (this.options.selectable){
+			previousSerialization.selectedRows = this.selectedRows.map(function(row){
+				return Array.indexOf(this.body.rows, row);
+			}.bind(this));
+		}
+		return previousSerialization;
+	},
+
+	restore: function(tableState){
+		if (this.options.selectable && tableState.selectedRows){
+			tableState.selectedRows.each(function(index){
+				this.selectRow(this.body.rows[index]);
+			}.bind(this));
+		}
+		this.previous.apply(this, arguments);
+	},
+
+	deselectRow: function(row, _nocheck){
+		if (!this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
+
+		this.selectedRows = new Elements(Array.from(this.selectedRows).erase(row));
+		row.removeClass(this.options.classRowSelected);
+		this.fireEvent('rowUnfocus', [row, this.selectedRows]);
+		this.fireEvent('stateChanged');
+		return this;
+	},
+
+	selectAll: function(selectNone){
+		if (!selectNone && !this.options.allowMultiSelect) return;
+		this.selectRange(0, this.body.rows.length, selectNone);
+		return this;
+	},
+
+	selectNone: function(){
+		return this.selectAll(true);
+	},
+
+	selectRange: function(startRow, endRow, _deselect){
+		if (!this.options.allowMultiSelect && !_deselect) return;
+		var method = _deselect ? 'deselectRow' : 'selectRow',
+			rows = Array.clone(this.body.rows);
+
+		if (typeOf(startRow) == 'element') startRow = rows.indexOf(startRow);
+		if (typeOf(endRow) == 'element') endRow = rows.indexOf(endRow);
+		endRow = endRow < rows.length - 1 ? endRow : rows.length - 1;
+
+		if (endRow < startRow){
+			var tmp = startRow;
+			startRow = endRow;
+			endRow = tmp;
+		}
+
+		for (var i = startRow; i <= endRow; i++){
+			if (this.options.selectHiddenRows || rows[i].isDisplayed()) this[method](rows[i], true);
+		}
+
+		return this;
+	},
+
+	deselectRange: function(startRow, endRow){
+		this.selectRange(startRow, endRow, true);
+	},
+
+	getSelected: function(){
+		return this.selectedRows;
+	},
+
+/*
+	Private methods:
+*/
+
+	enterRow: function(row){
+		if (this.hovered) this.hovered = this.leaveRow(this.hovered);
+		this.hovered = row.addClass(this.options.classRowHovered);
+	},
+
+	leaveRow: function(row){
+		row.removeClass(this.options.classRowHovered);
+	},
+
+	updateSelects: function(){
+		Array.each(this.body.rows, function(row){
+			var binders = row.retrieve('binders');
+			if (!binders && !this.selectEnabled) return;
+			if (!binders){
+				binders = {
+					mouseenter: this.enterRow.pass([row], this),
+					mouseleave: this.leaveRow.pass([row], this)
+				};
+				row.store('binders', binders);
+			}
+			if (this.selectEnabled) row.addEvents(binders);
+			else row.removeEvents(binders);
+		}, this);
+	},
+
+	shiftFocus: function(offset, event){
+		if (!this.focused) return this.selectRow(this.body.rows[0], event);
+		var to = this.getRowByOffset(offset, this.options.selectHiddenRows);
+		if (to === null || this.focused == this.body.rows[to]) return this;
+		this.toggleRow(this.body.rows[to], event);
+	},
+
+	clickRow: function(event, row){
+		var selecting = (event.shift || event.meta || event.control) && this.options.shiftForMultiSelect;
+		if (!selecting && !(event.rightClick && this.isSelected(row) && this.options.allowMultiSelect)) this.selectNone();
+
+		if (event.rightClick) this.selectRow(row);
+		else this.toggleRow(row);
+
+		if (event.shift){
+			this.selectRange(this.rangeStart || this.body.rows[0], row, this.rangeStart ? !this.isSelected(row) : true);
+			this.focused = row;
+		}
+		this.rangeStart = row;
+	},
+
+	getRowByOffset: function(offset, includeHiddenRows){
+		if (!this.focused) return 0;
+		var index = Array.indexOf(this.body.rows, this.focused);
+		if ((index == 0 && offset < 0) || (index == this.body.rows.length -1 && offset > 0)) return null;
+		if (includeHiddenRows){
+			index += offset;
+		} else {
+			var limit = 0,
+			    count = 0;
+			if (offset > 0){
+				while (count < offset && index < this.body.rows.length -1){
+					if (this.body.rows[++index].isDisplayed()) count++;
+				}
+			} else {
+				while (count > offset && index > 0){
+					if (this.body.rows[--index].isDisplayed()) count--;
+				}
+			}
+		}
+		return index;
+	},
+
+	attachSelects: function(attach){
+		attach = attach != null ? attach : true;
+
+		var method = attach ? 'addEvents' : 'removeEvents';
+		this.element[method]({
+			mouseleave: this.bound.mouseleave,
+			click: this.bound.activateKeyboard
+		});
+
+		this.body[method]({
+			'click:relay(tr)': this.bound.clickRow,
+			'contextmenu:relay(tr)': this.bound.clickRow
+		});
+
+		if (this.options.useKeyboard || this.keyboard){
+			if (!this.keyboard) this.keyboard = new Keyboard();
+			if (!this.selectKeysDefined){
+				this.selectKeysDefined = true;
+				var timer, held;
+
+				var move = function(offset){
+					var mover = function(e){
+						clearTimeout(timer);
+						e.preventDefault();
+						var to = this.body.rows[this.getRowByOffset(offset, this.options.selectHiddenRows)];
+						if (e.shift && to && this.isSelected(to)){
+							this.deselectRow(this.focused);
+							this.focused = to;
+						} else {
+							if (to && (!this.options.allowMultiSelect || !e.shift)){
+								this.selectNone();
+							}
+							this.shiftFocus(offset, e);
+						}
+
+						if (held){
+							timer = mover.delay(100, this, e);
+						} else {
+							timer = (function(){
+								held = true;
+								mover(e);
+							}).delay(400);
+						}
+					}.bind(this);
+					return mover;
+				}.bind(this);
+
+				var clear = function(){
+					clearTimeout(timer);
+					held = false;
+				};
+
+				this.keyboard.addEvents({
+					'keydown:shift+up': move(-1),
+					'keydown:shift+down': move(1),
+					'keyup:shift+up': clear,
+					'keyup:shift+down': clear,
+					'keyup:up': clear,
+					'keyup:down': clear
+				});
+
+				var shiftHint = '';
+				if (this.options.allowMultiSelect && this.options.shiftForMultiSelect && this.options.useKeyboard){
+					shiftHint = " (Shift multi-selects).";
+				}
+
+				this.keyboard.addShortcuts({
+					'Select Previous Row': {
+						keys: 'up',
+						shortcut: 'up arrow',
+						handler: move(-1),
+						description: 'Select the previous row in the table.' + shiftHint
+					},
+					'Select Next Row': {
+						keys: 'down',
+						shortcut: 'down arrow',
+						handler: move(1),
+						description: 'Select the next row in the table.' + shiftHint
+					}
+				});
+
+			}
+			this.keyboard[attach ? 'activate' : 'deactivate']();
+		}
+		this.updateSelects();
+	},
+
+	mouseleave: function(){
+		if (this.hovered) this.leaveRow(this.hovered);
+	}
+
+});
+
+
+/*
+---
+
+script: Scroller.js
+
+name: Scroller
+
+description: Class which scrolls the contents of any Element (including the window) when the mouse reaches the Element's boundaries.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Events
+  - Core/Options
+  - Core/Element.Event
+  - Core/Element.Dimensions
+  - MooTools.More
+
+provides: [Scroller]
+
+...
+*/
+
+var Scroller = new Class({
+
+	Implements: [Events, Options],
+
+	options: {
+		area: 20,
+		velocity: 1,
+		onChange: function(x, y){
+			this.element.scrollTo(x, y);
+		},
+		fps: 50
+	},
+
+	initialize: function(element, options){
+		this.setOptions(options);
+		this.element = document.id(element);
+		this.docBody = document.id(this.element.getDocument().body);
+		this.listener = (typeOf(this.element) != 'element') ? this.docBody : this.element;
+		this.timer = null;
+		this.bound = {
+			attach: this.attach.bind(this),
+			detach: this.detach.bind(this),
+			getCoords: this.getCoords.bind(this)
+		};
+	},
+
+	start: function(){
+		this.listener.addEvents({
+			mouseover: this.bound.attach,
+			mouseleave: this.bound.detach
+		});
+		return this;
+	},
+
+	stop: function(){
+		this.listener.removeEvents({
+			mouseover: this.bound.attach,
+			mouseleave: this.bound.detach
+		});
+		this.detach();
+		this.timer = clearInterval(this.timer);
+		return this;
+	},
+
+	attach: function(){
+		this.listener.addEvent('mousemove', this.bound.getCoords);
+	},
+
+	detach: function(){
+		this.listener.removeEvent('mousemove', this.bound.getCoords);
+		this.timer = clearInterval(this.timer);
+	},
+
+	getCoords: function(event){
+		this.page = (this.listener.get('tag') == 'body') ? event.client : event.page;
+		if (!this.timer) this.timer = this.scroll.periodical(Math.round(1000 / this.options.fps), this);
+	},
+
+	scroll: function(){
+		var size = this.element.getSize(),
+			scroll = this.element.getScroll(),
+			pos = this.element != this.docBody ? this.element.getOffsets() : {x: 0, y:0},
+			scrollSize = this.element.getScrollSize(),
+			change = {x: 0, y: 0},
+			top = this.options.area.top || this.options.area,
+			bottom = this.options.area.bottom || this.options.area;
+		for (var z in this.page){
+			if (this.page[z] < (top + pos[z]) && scroll[z] != 0){
+				change[z] = (this.page[z] - top - pos[z]) * this.options.velocity;
+			} else if (this.page[z] + bottom > (size[z] + pos[z]) && scroll[z] + size[z] != scrollSize[z]){
+				change[z] = (this.page[z] - size[z] + bottom - pos[z]) * this.options.velocity;
+			}
+			change[z] = change[z].round();
+		}
+		if (change.y || change.x) this.fireEvent('change', [scroll.x + change.x, scroll.y + change.y]);
+	}
+
+});
+
+
+/*
+---
+
+script: Tips.js
+
+name: Tips
+
+description: Class for creating nice tips that follow the mouse cursor when hovering an element.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Christoph Pojer
+  - Luis Merino
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/Element.Dimensions
+  - /MooTools.More
+
+provides: [Tips]
+
+...
+*/
+
+(function(){
+
+var read = function(option, element){
+	return (option) ? (typeOf(option) == 'function' ? option(element) : element.get(option)) : '';
+};
+
+this.Tips = new Class({
+
+	Implements: [Events, Options],
+
+	options: {/*
+		id: null,
+		onAttach: function(element){},
+		onDetach: function(element){},
+		onBound: function(coords){},*/
+		onShow: function(){
+			this.tip.setStyle('display', 'block');
+		},
+		onHide: function(){
+			this.tip.setStyle('display', 'none');
+		},
+		title: 'title',
+		text: function(element){
+			return element.get('rel') || element.get('href');
+		},
+		showDelay: 100,
+		hideDelay: 100,
+		className: 'tip-wrap',
+		offset: {x: 16, y: 16},
+		windowPadding: {x:0, y:0},
+		fixed: false,
+		waiAria: true
+	},
+
+	initialize: function(){
+		var params = Array.link(arguments, {
+			options: Type.isObject,
+			elements: function(obj){
+				return obj != null;
+			}
+		});
+		this.setOptions(params.options);
+		if (params.elements) this.attach(params.elements);
+		this.container = new Element('div', {'class': 'tip'});
+
+		if (this.options.id){
+			this.container.set('id', this.options.id);
+			if (this.options.waiAria) this.attachWaiAria();
+		}
+	},
+
+	toElement: function(){
+		if (this.tip) return this.tip;
+
+		this.tip = new Element('div', {
+			'class': this.options.className,
+			styles: {
+				position: 'absolute',
+				top: 0,
+				left: 0
+			}
+		}).adopt(
+			new Element('div', {'class': 'tip-top'}),
+			this.container,
+			new Element('div', {'class': 'tip-bottom'})
+		);
+
+		return this.tip;
+	},
+
+	attachWaiAria: function(){
+		var id = this.options.id;
+		this.container.set('role', 'tooltip');
+
+		if (!this.waiAria){
+			this.waiAria = {
+				show: function(element){
+					if (id) element.set('aria-describedby', id);
+					this.container.set('aria-hidden', 'false');
+				},
+				hide: function(element){
+					if (id) element.erase('aria-describedby');
+					this.container.set('aria-hidden', 'true');
+				}
+			};
+		}
+		this.addEvents(this.waiAria);
+	},
+
+	detachWaiAria: function(){
+		if (this.waiAria){
+			this.container.erase('role');
+			this.container.erase('aria-hidden');
+			this.removeEvents(this.waiAria);
+		}
+	},
+
+	attach: function(elements){
+		$$(elements).each(function(element){
+			var title = read(this.options.title, element),
+				text = read(this.options.text, element);
+
+			element.set('title', '').store('tip:native', title).retrieve('tip:title', title);
+			element.retrieve('tip:text', text);
+			this.fireEvent('attach', [element]);
+
+			var events = ['enter', 'leave'];
+			if (!this.options.fixed) events.push('move');
+
+			events.each(function(value){
+				var event = element.retrieve('tip:' + value);
+				if (!event) event = function(event){
+					this['element' + value.capitalize()].apply(this, [event, element]);
+				}.bind(this);
+
+				element.store('tip:' + value, event).addEvent('mouse' + value, event);
+			}, this);
+		}, this);
+
+		return this;
+	},
+
+	detach: function(elements){
+		$$(elements).each(function(element){
+			['enter', 'leave', 'move'].each(function(value){
+				element.removeEvent('mouse' + value, element.retrieve('tip:' + value)).eliminate('tip:' + value);
+			});
+
+			this.fireEvent('detach', [element]);
+
+			if (this.options.title == 'title'){ // This is necessary to check if we can revert the title
+				var original = element.retrieve('tip:native');
+				if (original) element.set('title', original);
+			}
+		}, this);
+
+		return this;
+	},
+
+	elementEnter: function(event, element){
+		clearTimeout(this.timer);
+		this.timer = (function(){
+			this.container.empty();
+
+			['title', 'text'].each(function(value){
+				var content = element.retrieve('tip:' + value);
+				var div = this['_' + value + 'Element'] = new Element('div', {
+						'class': 'tip-' + value
+					}).inject(this.container);
+				if (content) this.fill(div, content);
+			}, this);
+			this.show(element);
+			this.position((this.options.fixed) ? {page: element.getPosition()} : event);
+		}).delay(this.options.showDelay, this);
+	},
+
+	elementLeave: function(event, element){
+		clearTimeout(this.timer);
+		this.timer = this.hide.delay(this.options.hideDelay, this, element);
+		this.fireForParent(event, element);
+	},
+
+	setTitle: function(title){
+		if (this._titleElement){
+			this._titleElement.empty();
+			this.fill(this._titleElement, title);
+		}
+		return this;
+	},
+
+	setText: function(text){
+		if (this._textElement){
+			this._textElement.empty();
+			this.fill(this._textElement, text);
+		}
+		return this;
+	},
+
+	fireForParent: function(event, element){
+		element = element.getParent();
+		if (!element || element == document.body) return;
+		if (element.retrieve('tip:enter')) element.fireEvent('mouseenter', event);
+		else this.fireForParent(event, element);
+	},
+
+	elementMove: function(event, element){
+		this.position(event);
+	},
+
+	position: function(event){
+		if (!this.tip) document.id(this);
+
+		var size = window.getSize(), scroll = window.getScroll(),
+			tip = {x: this.tip.offsetWidth, y: this.tip.offsetHeight},
+			props = {x: 'left', y: 'top'},
+			bounds = {y: false, x2: false, y2: false, x: false},
+			obj = {};
+
+		for (var z in props){
+			obj[props[z]] = event.page[z] + this.options.offset[z];
+			if (obj[props[z]] < 0) bounds[z] = true;
+			if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]){
+				obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z];
+				bounds[z+'2'] = true;
+			}
+		}
+
+		this.fireEvent('bound', bounds);
+		this.tip.setStyles(obj);
+	},
+
+	fill: function(element, contents){
+		if (typeof contents == 'string') element.set('html', contents);
+		else element.adopt(contents);
+	},
+
+	show: function(element){
+		if (!this.tip) document.id(this);
+		if (!this.tip.getParent()) this.tip.inject(document.body);
+		this.fireEvent('show', [this.tip, element]);
+	},
+
+	hide: function(element){
+		if (!this.tip) document.id(this);
+		this.fireEvent('hide', [this.tip, element]);
+	}
+
+});
+
+})();
+
+
+/*
+---
+
+script: Locale.Set.From.js
+
+name: Locale.Set.From
+
+description: Provides an alternative way to create Locale.Set objects.
+
+license: MIT-style license
+
+authors:
+  - Tim Wienk
+
+requires:
+  - Core/JSON
+  - /Locale
+
+provides: Locale.Set.From
+
+...
+*/
+
+(function(){
+
+var parsers = {
+	'json': JSON.decode
+};
+
+Locale.Set.defineParser = function(name, fn){
+	parsers[name] = fn;
+};
+
+Locale.Set.from = function(set, type){
+	if (instanceOf(set, Locale.Set)) return set;
+
+	if (!type && typeOf(set) == 'string') type = 'json';
+	if (parsers[type]) set = parsers[type](set);
+
+	var locale = new Locale.Set;
+
+	locale.sets = set.sets || {};
+
+	if (set.inherits){
+		locale.inherits.locales = Array.from(set.inherits.locales);
+		locale.inherits.sets = set.inherits.sets || {};
+	}
+
+	return locale;
+};
+
+})();
+
+
+/*
+---
+
+name: Locale.ar.Date
+
+description: Date messages for Arabic.
+
+license: MIT-style license
+
+authors:
+  - Chafik Barbar
+
+requires:
+  - /Locale
+
+provides: [Locale.ar.Date]
+
+...
+*/
+
+Locale.define('ar', 'Date', {
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M'
+
+});
+
+
+/*
+---
+
+name: Locale.ar.Form.Validator
+
+description: Form Validator messages for Arabic.
+
+license: MIT-style license
+
+authors:
+  - Chafik Barbar
+
+requires:
+  - /Locale
+
+provides: [Locale.ar.Form.Validator]
+
+...
+*/
+
+Locale.define('ar', 'FormValidator', {
+
+	required: 'هذا الحقل مطلوب.',
+	minLength: 'رجاءً إدخال {minLength} أحرف على الأقل (تم إدخال {length} أحرف).',
+	maxLength: 'الرجاء عدم إدخال أكثر من {maxLength} أحرف (تم إدخال {length} أحرف).',
+	integer: 'الرجاء إدخال عدد صحيح في هذا الحقل. أي رقم ذو كسر عشري أو مئوي (مثال 1.25 ) غير مسموح.',
+	numeric: 'الرجاء إدخال قيم رقمية في هذا الحقل (مثال "1" أو "1.1" أو "-1" أو "-1.1").',
+	digits: 'الرجاء أستخدام قيم رقمية وعلامات ترقيمية فقط في هذا الحقل (مثال, رقم هاتف مع نقطة أو شحطة)',
+	alpha: 'الرجاء أستخدام أحرف فقط (ا-ي) في هذا الحقل. أي فراغات أو علامات غير مسموحة.',
+	alphanum: 'الرجاء أستخدام أحرف فقط (ا-ي) أو أرقام (0-9) فقط في هذا الحقل. أي فراغات أو علامات غير مسموحة.',
+	dateSuchAs: 'الرجاء إدخال تاريخ صحيح كالتالي {date}',
+	dateInFormatMDY: 'الرجاء إدخال تاريخ صحيح (مثال, 31-12-1999)',
+	email: 'الرجاء إدخال بريد إلكتروني صحيح.',
+	url: 'الرجاء إدخال عنوان إلكتروني صحيح مثل http://www.example.com',
+	currencyDollar: 'الرجاء إدخال قيمة $ صحيحة. مثال, 100.00$',
+	oneRequired: 'الرجاء إدخال قيمة في أحد هذه الحقول على الأقل.',
+	errorPrefix: 'خطأ: ',
+	warningPrefix: 'تحذير: '
+
+});
+
+
+/*
+---
+
+name: Locale.ca-CA.Date
+
+description: Date messages for Catalan.
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+
+requires:
+  - /Locale
+
+provides: [Locale.ca-CA.Date]
+
+...
+*/
+
+Locale.define('ca-CA', 'Date', {
+
+	months: ['Gener', 'Febrer', 'Març', 'Abril', 'Maig', 'Juny', 'Juli', 'Agost', 'Setembre', 'Octubre', 'Novembre', 'Desembre'],
+	months_abbr: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.', 'set.', 'oct.', 'nov.', 'des.'],
+	days: ['Diumenge', 'Dilluns', 'Dimarts', 'Dimecres', 'Dijous', 'Divendres', 'Dissabte'],
+	days_abbr: ['dg', 'dl', 'dt', 'dc', 'dj', 'dv', 'ds'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'fa menys d`un minut',
+	minuteAgo: 'fa un minut',
+	minutesAgo: 'fa {delta} minuts',
+	hourAgo: 'fa un hora',
+	hoursAgo: 'fa unes {delta} hores',
+	dayAgo: 'fa un dia',
+	daysAgo: 'fa {delta} dies',
+
+	lessThanMinuteUntil: 'menys d`un minut des d`ara',
+	minuteUntil: 'un minut des d`ara',
+	minutesUntil: '{delta} minuts des d`ara',
+	hourUntil: 'un hora des d`ara',
+	hoursUntil: 'unes {delta} hores des d`ara',
+	dayUntil: '1 dia des d`ara',
+	daysUntil: '{delta} dies des d`ara'
+
+});
+
+
+/*
+---
+
+name: Locale.ca-CA.Form.Validator
+
+description: Form Validator messages for Catalan.
+
+license: MIT-style license
+
+authors:
+  - Miquel Hudin
+  - Ãlfons Sanchez
+
+requires:
+  - /Locale
+
+provides: [Locale.ca-CA.Form.Validator]
+
+...
+*/
+
+Locale.define('ca-CA', 'FormValidator', {
+
+	required: 'Aquest camp es obligatori.',
+	minLength: 'Per favor introdueix al menys {minLength} caracters (has introduit {length} caracters).',
+	maxLength: 'Per favor introdueix no mes de {maxLength} caracters (has introduit {length} caracters).',
+	integer: 'Per favor introdueix un nombre enter en aquest camp. Nombres amb decimals (p.e. 1,25) no estan permesos.',
+	numeric: 'Per favor introdueix sols valors numerics en aquest camp (p.e. "1" o "1,1" o "-1" o "-1,1").',
+	digits: 'Per favor usa sols numeros i puntuacio en aquest camp (per exemple, un nombre de telefon amb guions i punts no esta permes).',
+	alpha: 'Per favor utilitza lletres nomes (a-z) en aquest camp. No s´admiteixen espais ni altres caracters.',
+	alphanum: 'Per favor, utilitza nomes lletres (a-z) o numeros (0-9) en aquest camp. No s´admiteixen espais ni altres caracters.',
+	dateSuchAs: 'Per favor introdueix una data valida com {date}',
+	dateInFormatMDY: 'Per favor introdueix una data valida com DD/MM/YYYY (p.e. "31/12/1999")',
+	email: 'Per favor, introdueix una adreça de correu electronic valida. Per exemple, "fred@domain.com".',
+	url: 'Per favor introdueix una URL valida com http://www.example.com.',
+	currencyDollar: 'Per favor introdueix una quantitat valida de €. Per exemple €100,00 .',
+	oneRequired: 'Per favor introdueix alguna cosa per al menys una d´aquestes entrades.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Avis: ',
+
+	// Form.Validator.Extras
+	noSpace: 'No poden haver espais en aquesta entrada.',
+	reqChkByNode: 'No hi han elements seleccionats.',
+	requiredChk: 'Aquest camp es obligatori.',
+	reqChkByName: 'Per favor selecciona una {label}.',
+	match: 'Aquest camp necessita coincidir amb el camp {matchName}',
+	startDate: 'la data de inici',
+	endDate: 'la data de fi',
+	currendDate: 'la data actual',
+	afterDate: 'La data deu ser igual o posterior a {label}.',
+	beforeDate: 'La data deu ser igual o anterior a {label}.',
+	startMonth: 'Per favor selecciona un mes d´orige',
+	sameMonth: 'Aquestes dos dates deuen estar dins del mateix mes - deus canviar una o altra.'
+
+});
+
+
+/*
+---
+
+name: Locale.cs-CZ.Date
+
+description: Date messages for Czech.
+
+license: MIT-style license
+
+authors:
+  - Jan Černý chemiX
+  - Christopher Zukowski
+
+requires:
+  - /Locale
+
+provides: [Locale.cs-CZ.Date]
+
+...
+*/
+(function(){
+
+// Czech language pluralization rules, see http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+// one -> n is 1;            1
+// few -> n in 2..4;         2-4
+// other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
+var pluralize = function (n, one, few, other){
+	if (n == 1) return one;
+	else if (n == 2 || n == 3 || n == 4) return few;
+	else return other;
+};
+
+Locale.define('cs-CZ', 'Date', {
+
+	months: ['Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec'],
+	months_abbr: ['ledna', 'února', 'března', 'dubna', 'května', 'června', 'července', 'srpna', 'září', 'října', 'listopadu', 'prosince'],
+	days: ['Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota'],
+	days_abbr: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'dop.',
+	PM: 'odp.',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'před chvílí',
+	minuteAgo: 'přibližně před minutou',
+	minutesAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'minutou', 'minutami', 'minutami'); },
+	hourAgo: 'přibližně před hodinou',
+	hoursAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'hodinou', 'hodinami', 'hodinami'); },
+	dayAgo: 'před dnem',
+	daysAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'dnem', 'dny', 'dny'); },
+	weekAgo: 'před týdnem',
+	weeksAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'týdnem', 'týdny', 'týdny'); },
+	monthAgo: 'před měsícem',
+	monthsAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'měsícem', 'měsíci', 'měsíci'); },
+	yearAgo: 'před rokem',
+	yearsAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'rokem', 'lety', 'lety'); },
+
+	lessThanMinuteUntil: 'za chvíli',
+	minuteUntil: 'přibližně za minutu',
+	minutesUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'minutu', 'minuty', 'minut'); },
+	hourUntil: 'přibližně za hodinu',
+	hoursUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'hodinu', 'hodiny', 'hodin'); },
+	dayUntil: 'za den',
+	daysUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'den', 'dny', 'dnů'); },
+	weekUntil: 'za týden',
+	weeksUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'týden', 'týdny', 'týdnů'); },
+	monthUntil: 'za měsíc',
+	monthsUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'měsíc', 'měsíce', 'měsíců'); },
+	yearUntil: 'za rok',
+	yearsUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'rok', 'roky', 'let'); }
+});
+
+})();
+
+
+/*
+---
+
+name: Locale.cs-CZ.Form.Validator
+
+description: Form Validator messages for Czech.
+
+license: MIT-style license
+
+authors:
+  - Jan Černý chemiX
+
+requires:
+  - /Locale
+
+provides: [Locale.cs-CZ.Form.Validator]
+
+...
+*/
+
+Locale.define('cs-CZ', 'FormValidator', {
+
+	required: 'Tato položka je povinná.',
+	minLength: 'Zadejte prosím alespoň {minLength} znaků (napsáno {length} znaků).',
+	maxLength: 'Zadejte prosím méně než {maxLength} znaků (nápsáno {length} znaků).',
+	integer: 'Zadejte prosím celé číslo. Desetinná čísla (např. 1.25) nejsou povolena.',
+	numeric: 'Zadejte jen číselné hodnoty (tj. "1" nebo "1.1" nebo "-1" nebo "-1.1").',
+	digits: 'Zadejte prosím pouze čísla a interpunkční znaménka(například telefonní číslo s pomlčkami nebo tečkami je povoleno).',
+	alpha: 'Zadejte prosím pouze písmena (a-z). Mezery nebo jiné znaky nejsou povoleny.',
+	alphanum: 'Zadejte prosím pouze písmena (a-z) nebo číslice (0-9). Mezery nebo jiné znaky nejsou povoleny.',
+	dateSuchAs: 'Zadejte prosím platné datum jako {date}',
+	dateInFormatMDY: 'Zadejte prosím platné datum jako MM / DD / RRRR (tj. "12/31/1999")',
+	email: 'Zadejte prosím platnou e-mailovou adresu. Například "fred@domain.com".',
+	url: 'Zadejte prosím platnou URL adresu jako http://www.example.com.',
+	currencyDollar: 'Zadejte prosím platnou částku. Například $100.00.',
+	oneRequired: 'Zadejte prosím alespoň jednu hodnotu pro tyto položky.',
+	errorPrefix: 'Chyba: ',
+	warningPrefix: 'Upozornění: ',
+
+	// Form.Validator.Extras
+	noSpace: 'V této položce nejsou povoleny mezery',
+	reqChkByNode: 'Nejsou vybrány žádné položky.',
+	requiredChk: 'Tato položka je vyžadována.',
+	reqChkByName: 'Prosím vyberte {label}.',
+	match: 'Tato položka se musí shodovat s položkou {matchName}',
+	startDate: 'datum zahájení',
+	endDate: 'datum ukončení',
+	currendDate: 'aktuální datum',
+	afterDate: 'Datum by mělo být stejné nebo větší než {label}.',
+	beforeDate: 'Datum by mělo být stejné nebo menší než {label}.',
+	startMonth: 'Vyberte počáteční měsíc.',
+	sameMonth: 'Tyto dva datumy musí být ve stejném měsíci - změňte jeden z nich.',
+	creditcard: 'Zadané číslo kreditní karty je neplatné. Prosím opravte ho. Bylo zadáno {length} čísel.'
+
+});
+
+
+/*
+---
+
+name: Locale.da-DK.Date
+
+description: Date messages for Danish.
+
+license: MIT-style license
+
+authors:
+  - Martin Overgaard
+  - Henrik Hansen
+
+requires:
+  - /Locale
+
+provides: [Locale.da-DK.Date]
+
+...
+*/
+
+Locale.define('da-DK', 'Date', {
+
+	months: ['Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December'],
+	months_abbr: ['jan.', 'feb.', 'mar.', 'apr.', 'maj.', 'jun.', 'jul.', 'aug.', 'sep.', 'okt.', 'nov.', 'dec.'],
+	days: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
+	days_abbr: ['søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør'],
+
+	// Culture's date order: DD-MM-YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'mindre end et minut siden',
+	minuteAgo: 'omkring et minut siden',
+	minutesAgo: '{delta} minutter siden',
+	hourAgo: 'omkring en time siden',
+	hoursAgo: 'omkring {delta} timer siden',
+	dayAgo: '1 dag siden',
+	daysAgo: '{delta} dage siden',
+	weekAgo: '1 uge siden',
+	weeksAgo: '{delta} uger siden',
+	monthAgo: '1 måned siden',
+	monthsAgo: '{delta} måneder siden',
+	yearAgo: '1 år siden',
+	yearsAgo: '{delta} år siden',
+
+	lessThanMinuteUntil: 'mindre end et minut fra nu',
+	minuteUntil: 'omkring et minut fra nu',
+	minutesUntil: '{delta} minutter fra nu',
+	hourUntil: 'omkring en time fra nu',
+	hoursUntil: 'omkring {delta} timer fra nu',
+	dayUntil: '1 dag fra nu',
+	daysUntil: '{delta} dage fra nu',
+	weekUntil: '1 uge fra nu',
+	weeksUntil: '{delta} uger fra nu',
+	monthUntil: '1 måned fra nu',
+	monthsUntil: '{delta} måneder fra nu',
+	yearUntil: '1 år fra nu',
+	yearsUntil: '{delta} år fra nu'
+
+});
+
+
+/*
+---
+
+name: Locale.da-DK.Form.Validator
+
+description: Form Validator messages for Danish.
+
+license: MIT-style license
+
+authors:
+  - Martin Overgaard
+
+requires:
+  - /Locale
+
+provides: [Locale.da-DK.Form.Validator]
+
+...
+*/
+
+Locale.define('da-DK', 'FormValidator', {
+
+	required: 'Feltet skal udfyldes.',
+	minLength: 'Skriv mindst {minLength} tegn (du skrev {length} tegn).',
+	maxLength: 'Skriv maksimalt {maxLength} tegn (du skrev {length} tegn).',
+	integer: 'Skriv et tal i dette felt. Decimal tal (f.eks. 1.25) er ikke tilladt.',
+	numeric: 'Skriv kun tal i dette felt (i.e. "1" eller "1.1" eller "-1" eller "-1.1").',
+	digits: 'Skriv kun tal og tegnsætning i dette felt (eksempel, et telefon nummer med bindestreg eller punktum er tilladt).',
+	alpha: 'Skriv kun bogstaver (a-z) i dette felt. Mellemrum og andre tegn er ikke tilladt.',
+	alphanum: 'Skriv kun bogstaver (a-z) eller tal (0-9) i dette felt. Mellemrum og andre tegn er ikke tilladt.',
+	dateSuchAs: 'Skriv en gyldig dato som {date}',
+	dateInFormatMDY: 'Skriv dato i formatet DD-MM-YYYY (f.eks. "31-12-1999")',
+	email: 'Skriv en gyldig e-mail adresse. F.eks "fred@domain.com".',
+	url: 'Skriv en gyldig URL adresse. F.eks "http://www.example.com".',
+	currencyDollar: 'Skriv et gldigt beløb. F.eks Kr.100.00 .',
+	oneRequired: 'Et eller flere af felterne i denne formular skal udfyldes.',
+	errorPrefix: 'Fejl: ',
+	warningPrefix: 'Advarsel: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Der må ikke benyttes mellemrum i dette felt.',
+	reqChkByNode: 'Foretag et valg.',
+	requiredChk: 'Dette felt skal udfyldes.',
+	reqChkByName: 'Vælg en {label}.',
+	match: 'Dette felt skal matche {matchName} feltet',
+	startDate: 'start dato',
+	endDate: 'slut dato',
+	currendDate: 'dags dato',
+	afterDate: 'Datoen skal være større end eller lig med {label}.',
+	beforeDate: 'Datoen skal være mindre end eller lig med {label}.',
+	startMonth: 'Vælg en start måned',
+	sameMonth: 'De valgte datoer skal være i samme måned - skift en af dem.'
+
+});
+
+
+/*
+---
+
+name: Locale.de-DE.Date
+
+description: Date messages for German.
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+  - Frank Rossi
+  - Ulrich Petri
+  - Fabian Beiner
+
+requires:
+  - /Locale
+
+provides: [Locale.de-DE.Date]
+
+...
+*/
+
+Locale.define('de-DE', 'Date', {
+
+	months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+	months_abbr: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
+	days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+	days_abbr: ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'vormittags',
+	PM: 'nachmittags',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'vor weniger als einer Minute',
+	minuteAgo: 'vor einer Minute',
+	minutesAgo: 'vor {delta} Minuten',
+	hourAgo: 'vor einer Stunde',
+	hoursAgo: 'vor {delta} Stunden',
+	dayAgo: 'vor einem Tag',
+	daysAgo: 'vor {delta} Tagen',
+	weekAgo: 'vor einer Woche',
+	weeksAgo: 'vor {delta} Wochen',
+	monthAgo: 'vor einem Monat',
+	monthsAgo: 'vor {delta} Monaten',
+	yearAgo: 'vor einem Jahr',
+	yearsAgo: 'vor {delta} Jahren',
+
+	lessThanMinuteUntil: 'in weniger als einer Minute',
+	minuteUntil: 'in einer Minute',
+	minutesUntil: 'in {delta} Minuten',
+	hourUntil: 'in ca. einer Stunde',
+	hoursUntil: 'in ca. {delta} Stunden',
+	dayUntil: 'in einem Tag',
+	daysUntil: 'in {delta} Tagen',
+	weekUntil: 'in einer Woche',
+	weeksUntil: 'in {delta} Wochen',
+	monthUntil: 'in einem Monat',
+	monthsUntil: 'in {delta} Monaten',
+	yearUntil: 'in einem Jahr',
+	yearsUntil: 'in {delta} Jahren'
+
+});
+
+
+/*
+---
+
+name: Locale.de-CH.Date
+
+description: Date messages for German (Switzerland).
+
+license: MIT-style license
+
+authors:
+  - Michael van der Weg
+
+requires:
+  - /Locale
+  - /Locale.de-DE.Date
+
+provides: [Locale.de-CH.Date]
+
+...
+*/
+
+Locale.define('de-CH').inherit('de-DE', 'Date');
+
+
+/*
+---
+
+name: Locale.de-CH.Form.Validator
+
+description: Form Validator messages for German (Switzerland).
+
+license: MIT-style license
+
+authors:
+  - Michael van der Weg
+
+requires:
+  - /Locale
+
+provides: [Locale.de-CH.Form.Validator]
+
+...
+*/
+
+Locale.define('de-CH', 'FormValidator', {
+
+	required: 'Dieses Feld ist obligatorisch.',
+	minLength: 'Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
+	maxLength: 'Bitte geben Sie nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
+	integer: 'Geben Sie bitte eine ganze Zahl ein. Dezimalzahlen (z.B. 1.25) sind nicht erlaubt.',
+	numeric: 'Geben Sie bitte nur Zahlenwerte in dieses Eingabefeld ein (z.B. &quot;1&quot;, &quot;1.1&quot;, &quot;-1&quot; oder &quot;-1.1&quot;).',
+	digits: 'Benutzen Sie bitte nur Zahlen und Satzzeichen in diesem Eingabefeld (erlaubt ist z.B. eine Telefonnummer mit Bindestrichen und Punkten).',
+	alpha: 'Benutzen Sie bitte nur Buchstaben (a-z) in diesem Feld. Leerzeichen und andere Zeichen sind nicht erlaubt.',
+	alphanum: 'Benutzen Sie bitte nur Buchstaben (a-z) und Zahlen (0-9) in diesem Eingabefeld. Leerzeichen und andere Zeichen sind nicht erlaubt.',
+	dateSuchAs: 'Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel {date}',
+	dateInFormatMDY: 'Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel TT.MM.JJJJ (z.B. &quot;31.12.1999&quot;)',
+	email: 'Geben Sie bitte eine g&uuml;ltige E-Mail Adresse ein. Wie zum Beispiel &quot;maria@bernasconi.ch&quot;.',
+	url: 'Geben Sie bitte eine g&uuml;ltige URL ein. Wie zum Beispiel http://www.example.com.',
+	currencyDollar: 'Geben Sie bitte einen g&uuml;ltigen Betrag in Schweizer Franken ein. Wie zum Beispiel 100.00 CHF .',
+	oneRequired: 'Machen Sie f&uuml;r mindestens eines der Eingabefelder einen Eintrag.',
+	errorPrefix: 'Fehler: ',
+	warningPrefix: 'Warnung: ',
+
+	// Form.Validator.Extras
+	noSpace: 'In diesem Eingabefeld darf kein Leerzeichen sein.',
+	reqChkByNode: 'Es wurden keine Elemente gew&auml;hlt.',
+	requiredChk: 'Dieses Feld ist obligatorisch.',
+	reqChkByName: 'Bitte w&auml;hlen Sie ein {label}.',
+	match: 'Dieses Eingabefeld muss mit dem Feld {matchName} &uuml;bereinstimmen.',
+	startDate: 'Das Anfangsdatum',
+	endDate: 'Das Enddatum',
+	currendDate: 'Das aktuelle Datum',
+	afterDate: 'Das Datum sollte zur gleichen Zeit oder sp&auml;ter sein {label}.',
+	beforeDate: 'Das Datum sollte zur gleichen Zeit oder fr&uuml;her sein {label}.',
+	startMonth: 'W&auml;hlen Sie bitte einen Anfangsmonat',
+	sameMonth: 'Diese zwei Datumsangaben m&uuml;ssen im selben Monat sein - Sie m&uuml;ssen eine von beiden ver&auml;ndern.',
+	creditcard: 'Die eingegebene Kreditkartennummer ist ung&uuml;ltig. Bitte &uuml;berpr&uuml;fen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben.'
+
+});
+
+
+/*
+---
+
+name: Locale.de-DE.Form.Validator
+
+description: Form Validator messages for German.
+
+license: MIT-style license
+
+authors:
+  - Frank Rossi
+  - Ulrich Petri
+  - Fabian Beiner
+
+requires:
+  - /Locale
+
+provides: [Locale.de-DE.Form.Validator]
+
+...
+*/
+
+Locale.define('de-DE', 'FormValidator', {
+
+	required: 'Dieses Eingabefeld muss ausgefüllt werden.',
+	minLength: 'Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben nur {length} Zeichen eingegeben).',
+	maxLength: 'Geben Sie bitte nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
+	integer: 'Geben Sie in diesem Eingabefeld bitte eine ganze Zahl ein. Dezimalzahlen (z.B. "1.25") sind nicht erlaubt.',
+	numeric: 'Geben Sie in diesem Eingabefeld bitte nur Zahlenwerte (z.B. "1", "1.1", "-1" oder "-1.1") ein.',
+	digits: 'Geben Sie in diesem Eingabefeld bitte nur Zahlen und Satzzeichen ein (z.B. eine Telefonnummer mit Bindestrichen und Punkten ist erlaubt).',
+	alpha: 'Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) ein. Leerzeichen und andere Zeichen sind nicht erlaubt.',
+	alphanum: 'Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) und Zahlen (0-9) ein. Leerzeichen oder andere Zeichen sind nicht erlaubt.',
+	dateSuchAs: 'Geben Sie bitte ein gültiges Datum ein (z.B. "{date}").',
+	dateInFormatMDY: 'Geben Sie bitte ein gültiges Datum im Format TT.MM.JJJJ ein (z.B. "31.12.1999").',
+	email: 'Geben Sie bitte eine gültige E-Mail-Adresse ein (z.B. "max@mustermann.de").',
+	url: 'Geben Sie bitte eine gültige URL ein (z.B. "http://www.example.com").',
+	currencyDollar: 'Geben Sie bitte einen gültigen Betrag in EURO ein (z.B. 100.00€).',
+	oneRequired: 'Bitte füllen Sie mindestens ein Eingabefeld aus.',
+	errorPrefix: 'Fehler: ',
+	warningPrefix: 'Warnung: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Es darf kein Leerzeichen in diesem Eingabefeld sein.',
+	reqChkByNode: 'Es wurden keine Elemente gewählt.',
+	requiredChk: 'Dieses Feld muss ausgefüllt werden.',
+	reqChkByName: 'Bitte wählen Sie ein {label}.',
+	match: 'Dieses Eingabefeld muss mit dem {matchName} Eingabefeld übereinstimmen.',
+	startDate: 'Das Anfangsdatum',
+	endDate: 'Das Enddatum',
+	currendDate: 'Das aktuelle Datum',
+	afterDate: 'Das Datum sollte zur gleichen Zeit oder später sein als {label}.',
+	beforeDate: 'Das Datum sollte zur gleichen Zeit oder früher sein als {label}.',
+	startMonth: 'Wählen Sie bitte einen Anfangsmonat',
+	sameMonth: 'Diese zwei Datumsangaben müssen im selben Monat sein - Sie müssen eines von beiden verändern.',
+	creditcard: 'Die eingegebene Kreditkartennummer ist ungültig. Bitte überprüfen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben.'
+
+});
+
+
+/*
+---
+
+name: Locale.EU.Number
+
+description: Number messages for Europe.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires:
+  - /Locale
+
+provides: [Locale.EU.Number]
+
+...
+*/
+
+Locale.define('EU', 'Number', {
+
+	decimal: ',',
+	group: '.',
+
+	currency: {
+		prefix: '€ '
+	}
+
+});
+
+
+/*
+---
+
+name: Locale.de-DE.Number
+
+description: Number messages for German.
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+
+requires:
+  - /Locale
+  - /Locale.EU.Number
+
+provides: [Locale.de-DE.Number]
+
+...
+*/
+
+Locale.define('de-DE').inherit('EU', 'Number');
+
+
+/*
+---
+
+name: Locale.en-GB.Date
+
+description: Date messages for British English.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - /Locale
+  - /Locale.en-US.Date
+
+provides: [Locale.en-GB.Date]
+
+...
+*/
+
+Locale.define('en-GB', 'Date', {
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M'
+
+}).inherit('en-US', 'Date');
+
+
+/*
+---
+
+name: Locale.es-ES.Date
+
+description: Date messages for Spanish.
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+
+requires:
+  - /Locale
+
+provides: [Locale.es-ES.Date]
+
+...
+*/
+
+Locale.define('es-ES', 'Date', {
+
+	months: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+	months_abbr: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic'],
+	days: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'],
+	days_abbr: ['dom', 'lun', 'mar', 'mié', 'juv', 'vie', 'sáb'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'hace menos de un minuto',
+	minuteAgo: 'hace un minuto',
+	minutesAgo: 'hace {delta} minutos',
+	hourAgo: 'hace una hora',
+	hoursAgo: 'hace unas {delta} horas',
+	dayAgo: 'hace un día',
+	daysAgo: 'hace {delta} días',
+	weekAgo: 'hace una semana',
+	weeksAgo: 'hace unas {delta} semanas',
+	monthAgo: 'hace un mes',
+	monthsAgo: 'hace {delta} meses',
+	yearAgo: 'hace un año',
+	yearsAgo: 'hace {delta} años',
+
+	lessThanMinuteUntil: 'menos de un minuto desde ahora',
+	minuteUntil: 'un minuto desde ahora',
+	minutesUntil: '{delta} minutos desde ahora',
+	hourUntil: 'una hora desde ahora',
+	hoursUntil: 'unas {delta} horas desde ahora',
+	dayUntil: 'un día desde ahora',
+	daysUntil: '{delta} días desde ahora',
+	weekUntil: 'una semana desde ahora',
+	weeksUntil: 'unas {delta} semanas desde ahora',
+	monthUntil: 'un mes desde ahora',
+	monthsUntil: '{delta} meses desde ahora',
+	yearUntil: 'un año desde ahora',
+	yearsUntil: '{delta} años desde ahora'
+
+});
+
+
+/*
+---
+
+name: Locale.es-AR.Date
+
+description: Date messages for Spanish (Argentina).
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+  - Diego Massanti
+
+requires:
+  - /Locale
+  - /Locale.es-ES.Date
+
+provides: [Locale.es-AR.Date]
+
+...
+*/
+
+Locale.define('es-AR').inherit('es-ES', 'Date');
+
+
+/*
+---
+
+name: Locale.es-AR.Form.Validator
+
+description: Form Validator messages for Spanish (Argentina).
+
+license: MIT-style license
+
+authors:
+  - Diego Massanti
+
+requires:
+  - /Locale
+
+provides: [Locale.es-AR.Form.Validator]
+
+...
+*/
+
+Locale.define('es-AR', 'FormValidator', {
+
+	required: 'Este campo es obligatorio.',
+	minLength: 'Por favor ingrese al menos {minLength} caracteres (ha ingresado {length} caracteres).',
+	maxLength: 'Por favor no ingrese más de {maxLength} caracteres (ha ingresado {length} caracteres).',
+	integer: 'Por favor ingrese un número entero en este campo. Números con decimales (p.e. 1,25) no se permiten.',
+	numeric: 'Por favor ingrese solo valores numéricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',
+	digits: 'Por favor use sólo números y puntuación en este campo (por ejemplo, un número de teléfono con guiones y/o puntos no está permitido).',
+	alpha: 'Por favor use sólo letras (a-z) en este campo. No se permiten espacios ni otros caracteres.',
+	alphanum: 'Por favor, usa sólo letras (a-z) o números (0-9) en este campo. No se permiten espacios u otros caracteres.',
+	dateSuchAs: 'Por favor ingrese una fecha válida como {date}',
+	dateInFormatMDY: 'Por favor ingrese una fecha válida, utulizando el formato DD/MM/YYYY (p.e. "31/12/1999")',
+	email: 'Por favor, ingrese una dirección de e-mail válida. Por ejemplo, "fred@dominio.com".',
+	url: 'Por favor ingrese una URL válida como http://www.example.com.',
+	currencyDollar: 'Por favor ingrese una cantidad válida de pesos. Por ejemplo $100,00 .',
+	oneRequired: 'Por favor ingrese algo para por lo menos una de estas entradas.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Advertencia: ',
+
+	// Form.Validator.Extras
+	noSpace: 'No se permiten espacios en este campo.',
+	reqChkByNode: 'No hay elementos seleccionados.',
+	requiredChk: 'Este campo es obligatorio.',
+	reqChkByName: 'Por favor selecciona una {label}.',
+	match: 'Este campo necesita coincidir con el campo {matchName}',
+	startDate: 'la fecha de inicio',
+	endDate: 'la fecha de fin',
+	currendDate: 'la fecha actual',
+	afterDate: 'La fecha debe ser igual o posterior a {label}.',
+	beforeDate: 'La fecha debe ser igual o anterior a {label}.',
+	startMonth: 'Por favor selecciona un mes de origen',
+	sameMonth: 'Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra.'
+
+});
+
+
+/*
+---
+
+name: Locale.es-ES.Form.Validator
+
+description: Form Validator messages for Spanish.
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+
+requires:
+  - /Locale
+
+provides: [Locale.es-ES.Form.Validator]
+
+...
+*/
+
+Locale.define('es-ES', 'FormValidator', {
+
+	required: 'Este campo es obligatorio.',
+	minLength: 'Por favor introduce al menos {minLength} caracteres (has introducido {length} caracteres).',
+	maxLength: 'Por favor introduce no m&aacute;s de {maxLength} caracteres (has introducido {length} caracteres).',
+	integer: 'Por favor introduce un n&uacute;mero entero en este campo. N&uacute;meros con decimales (p.e. 1,25) no se permiten.',
+	numeric: 'Por favor introduce solo valores num&eacute;ricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',
+	digits: 'Por favor usa solo n&uacute;meros y puntuaci&oacute;n en este campo (por ejemplo, un n&uacute;mero de tel&eacute;fono con guiones y puntos no esta permitido).',
+	alpha: 'Por favor usa letras solo (a-z) en este campo. No se admiten espacios ni otros caracteres.',
+	alphanum: 'Por favor, usa solo letras (a-z) o n&uacute;meros (0-9) en este campo. No se admiten espacios ni otros caracteres.',
+	dateSuchAs: 'Por favor introduce una fecha v&aacute;lida como {date}',
+	dateInFormatMDY: 'Por favor introduce una fecha v&aacute;lida como DD/MM/YYYY (p.e. "31/12/1999")',
+	email: 'Por favor, introduce una direcci&oacute;n de email v&aacute;lida. Por ejemplo, "fred@domain.com".',
+	url: 'Por favor introduce una URL v&aacute;lida como http://www.example.com.',
+	currencyDollar: 'Por favor introduce una cantidad v&aacute;lida de €. Por ejemplo €100,00 .',
+	oneRequired: 'Por favor introduce algo para por lo menos una de estas entradas.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Aviso: ',
+
+	// Form.Validator.Extras
+	noSpace: 'No pueden haber espacios en esta entrada.',
+	reqChkByNode: 'No hay elementos seleccionados.',
+	requiredChk: 'Este campo es obligatorio.',
+	reqChkByName: 'Por favor selecciona una {label}.',
+	match: 'Este campo necesita coincidir con el campo {matchName}',
+	startDate: 'la fecha de inicio',
+	endDate: 'la fecha de fin',
+	currendDate: 'la fecha actual',
+	afterDate: 'La fecha debe ser igual o posterior a {label}.',
+	beforeDate: 'La fecha debe ser igual o anterior a {label}.',
+	startMonth: 'Por favor selecciona un mes de origen',
+	sameMonth: 'Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra.'
+
+});
+
+
+/*
+---
+
+name: Locale.et-EE.Date
+
+description: Date messages for Estonian.
+
+license: MIT-style license
+
+authors:
+  - Kevin Valdek
+
+requires:
+  - /Locale
+
+provides: [Locale.et-EE.Date]
+
+...
+*/
+
+Locale.define('et-EE', 'Date', {
+
+	months: ['jaanuar', 'veebruar', 'märts', 'aprill', 'mai', 'juuni', 'juuli', 'august', 'september', 'oktoober', 'november', 'detsember'],
+	months_abbr: ['jaan', 'veebr', 'märts', 'apr', 'mai', 'juuni', 'juuli', 'aug', 'sept', 'okt', 'nov', 'dets'],
+	days: ['pühapäev', 'esmaspäev', 'teisipäev', 'kolmapäev', 'neljapäev', 'reede', 'laupäev'],
+	days_abbr: ['pühap', 'esmasp', 'teisip', 'kolmap', 'neljap', 'reede', 'laup'],
+
+	// Culture's date order: MM.DD.YYYY
+	dateOrder: ['month', 'date', 'year'],
+	shortDate: '%m.%d.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'vähem kui minut aega tagasi',
+	minuteAgo: 'umbes minut aega tagasi',
+	minutesAgo: '{delta} minutit tagasi',
+	hourAgo: 'umbes tund aega tagasi',
+	hoursAgo: 'umbes {delta} tundi tagasi',
+	dayAgo: '1 päev tagasi',
+	daysAgo: '{delta} päeva tagasi',
+	weekAgo: '1 nädal tagasi',
+	weeksAgo: '{delta} nädalat tagasi',
+	monthAgo: '1 kuu tagasi',
+	monthsAgo: '{delta} kuud tagasi',
+	yearAgo: '1 aasta tagasi',
+	yearsAgo: '{delta} aastat tagasi',
+
+	lessThanMinuteUntil: 'vähem kui minuti aja pärast',
+	minuteUntil: 'umbes minuti aja pärast',
+	minutesUntil: '{delta} minuti pärast',
+	hourUntil: 'umbes tunni aja pärast',
+	hoursUntil: 'umbes {delta} tunni pärast',
+	dayUntil: '1 päeva pärast',
+	daysUntil: '{delta} päeva pärast',
+	weekUntil: '1 nädala pärast',
+	weeksUntil: '{delta} nädala pärast',
+	monthUntil: '1 kuu pärast',
+	monthsUntil: '{delta} kuu pärast',
+	yearUntil: '1 aasta pärast',
+	yearsUntil: '{delta} aasta pärast'
+
+});
+
+
+/*
+---
+
+name: Locale.et-EE.Form.Validator
+
+description: Form Validator messages for Estonian.
+
+license: MIT-style license
+
+authors:
+  - Kevin Valdek
+
+requires:
+  - /Locale
+
+provides: [Locale.et-EE.Form.Validator]
+
+...
+*/
+
+Locale.define('et-EE', 'FormValidator', {
+
+	required: 'Väli peab olema täidetud.',
+	minLength: 'Palun sisestage vähemalt {minLength} tähte (te sisestasite {length} tähte).',
+	maxLength: 'Palun ärge sisestage rohkem kui {maxLength} tähte (te sisestasite {length} tähte).',
+	integer: 'Palun sisestage väljale täisarv. Kümnendarvud (näiteks 1.25) ei ole lubatud.',
+	numeric: 'Palun sisestage ainult numbreid väljale (näiteks "1", "1.1", "-1" või "-1.1").',
+	digits: 'Palun kasutage ainult numbreid ja kirjavahemärke (telefoninumbri sisestamisel on lubatud kasutada kriipse ja punkte).',
+	alpha: 'Palun kasutage ainult tähti (a-z). Tühikud ja teised sümbolid on keelatud.',
+	alphanum: 'Palun kasutage ainult tähti (a-z) või numbreid (0-9). Tühikud ja teised sümbolid on keelatud.',
+	dateSuchAs: 'Palun sisestage kehtiv kuupäev kujul {date}',
+	dateInFormatMDY: 'Palun sisestage kehtiv kuupäev kujul MM.DD.YYYY (näiteks: "12.31.1999").',
+	email: 'Palun sisestage kehtiv e-maili aadress (näiteks: "fred@domain.com").',
+	url: 'Palun sisestage kehtiv URL (näiteks: http://www.example.com).',
+	currencyDollar: 'Palun sisestage kehtiv $ summa (näiteks: $100.00).',
+	oneRequired: 'Palun sisestage midagi vähemalt ühele antud väljadest.',
+	errorPrefix: 'Viga: ',
+	warningPrefix: 'Hoiatus: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Väli ei tohi sisaldada tühikuid.',
+	reqChkByNode: 'Ükski väljadest pole valitud.',
+	requiredChk: 'Välja täitmine on vajalik.',
+	reqChkByName: 'Palun valige üks {label}.',
+	match: 'Väli peab sobima {matchName} väljaga',
+	startDate: 'algkuupäev',
+	endDate: 'lõppkuupäev',
+	currendDate: 'praegune kuupäev',
+	afterDate: 'Kuupäev peab olema võrdne või pärast {label}.',
+	beforeDate: 'Kuupäev peab olema võrdne või enne {label}.',
+	startMonth: 'Palun valige algkuupäev.',
+	sameMonth: 'Antud kaks kuupäeva peavad olema samas kuus - peate muutma ühte kuupäeva.'
+
+});
+
+
+/*
+---
+
+name: Locale.fa.Date
+
+description: Date messages for Persian.
+
+license: MIT-style license
+
+authors:
+  - Amir Hossein Hodjaty Pour
+
+requires:
+  - /Locale
+
+provides: [Locale.fa.Date]
+
+...
+*/
+
+Locale.define('fa', 'Date', {
+
+	months: ['ژانویه', 'فوریه', 'مارس', 'آپریل', 'مه', 'ژوئن', 'ژوئیه', 'آگوست', 'سپتامبر', 'اکتبر', 'نوامبر', 'دسامبر'],
+	months_abbr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+	days: ['یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پنجشنبه', 'جمعه', 'شنبه'],
+	days_abbr: ['ي', 'د', 'س', 'چ', 'پ', 'ج', 'ش'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['month', 'date', 'year'],
+	shortDate: '%m/%d/%Y',
+	shortTime: '%I:%M%p',
+	AM: 'ق.ظ',
+	PM: 'ب.ظ',
+
+	// Date.Extras
+	ordinal: 'ام',
+
+	lessThanMinuteAgo: 'کمتر از یک دقیقه پیش',
+	minuteAgo: 'حدود یک دقیقه پیش',
+	minutesAgo: '{delta} دقیقه پیش',
+	hourAgo: 'حدود یک ساعت پیش',
+	hoursAgo: 'حدود {delta} ساعت پیش',
+	dayAgo: '1 روز پیش',
+	daysAgo: '{delta} روز پیش',
+	weekAgo: '1 هفته پیش',
+	weeksAgo: '{delta} هفته پیش',
+	monthAgo: '1 ماه پیش',
+	monthsAgo: '{delta} ماه پیش',
+	yearAgo: '1 سال پیش',
+	yearsAgo: '{delta} سال پیش',
+
+	lessThanMinuteUntil: 'کمتر از یک دقیقه از حالا',
+	minuteUntil: 'حدود یک دقیقه از حالا',
+	minutesUntil: '{delta} دقیقه از حالا',
+	hourUntil: 'حدود یک ساعت از حالا',
+	hoursUntil: 'حدود {delta} ساعت از حالا',
+	dayUntil: '1 روز از حالا',
+	daysUntil: '{delta} روز از حالا',
+	weekUntil: '1 هفته از حالا',
+	weeksUntil: '{delta} هفته از حالا',
+	monthUntil: '1 ماه از حالا',
+	monthsUntil: '{delta} ماه از حالا',
+	yearUntil: '1 سال از حالا',
+	yearsUntil: '{delta} سال از حالا'
+
+});
+
+
+/*
+---
+
+name: Locale.fa.Form.Validator
+
+description: Form Validator messages for Persian.
+
+license: MIT-style license
+
+authors:
+  - Amir Hossein Hodjaty Pour
+
+requires:
+  - /Locale
+
+provides: [Locale.fa.Form.Validator]
+
+...
+*/
+
+Locale.define('fa', 'FormValidator', {
+
+	required: 'این فیلد الزامی است.',
+	minLength: 'شما باید حداقل {minLength} حرف وارد کنید ({length} حرف وارد کرده اید).',
+	maxLength: 'لطفا حداکثر {maxLength} حرف وارد کنید (شما {length} حرف وارد کرده اید).',
+	integer: 'لطفا از عدد صحیح استفاده کنید. اعداد اعشاری (مانند 1.25) مجاز نیستند.',
+	numeric: 'لطفا فقط داده عددی وارد کنید (مانند "1" یا "1.1" یا "1-" یا "1.1-").',
+	digits: 'لطفا فقط از اعداد و علامتها در این فیلد استفاده کنید (برای مثال شماره تلفن با خط تیره و نقطه قابل قبول است).',
+	alpha: 'لطفا فقط از حروف الفباء برای این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.',
+	alphanum: 'لطفا فقط از حروف الفباء و اعداد در این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.',
+	dateSuchAs: 'لطفا یک تاریخ معتبر مانند {date} وارد کنید.',
+	dateInFormatMDY: 'لطفا یک تاریخ معتبر به شکل MM/DD/YYYY وارد کنید (مانند "12/31/1999").',
+	email: 'لطفا یک آدرس ایمیل معتبر وارد کنید. برای مثال "fred@domain.com".',
+	url: 'لطفا یک URL معتبر مانند http://www.example.com وارد کنید.',
+	currencyDollar: 'لطفا یک محدوده معتبر برای این بخش وارد کنید مانند 100.00$ .',
+	oneRequired: 'لطفا حداقل یکی از فیلدها را پر کنید.',
+	errorPrefix: 'خطا: ',
+	warningPrefix: 'هشدار: ',
+
+	// Form.Validator.Extras
+	noSpace: 'استفاده از فاصله در این بخش مجاز نیست.',
+	reqChkByNode: 'موردی انتخاب نشده است.',
+	requiredChk: 'این فیلد الزامی است.',
+	reqChkByName: 'لطفا یک {label} را انتخاب کنید.',
+	match: 'این فیلد باید با فیلد {matchName} مطابقت داشته باشد.',
+	startDate: 'تاریخ شروع',
+	endDate: 'تاریخ پایان',
+	currendDate: 'تاریخ کنونی',
+	afterDate: 'تاریخ میبایست برابر یا بعد از {label} باشد',
+	beforeDate: 'تاریخ میبایست برابر یا قبل از {label} باشد',
+	startMonth: 'لطفا ماه شروع را انتخاب کنید',
+	sameMonth: 'این دو تاریخ باید در یک ماه باشند - شما باید یکی یا هر دو را تغییر دهید.',
+	creditcard: 'شماره کارت اعتباری که وارد کرده اید معتبر نیست. لطفا شماره را بررسی کنید و مجددا تلاش کنید. {length} رقم وارد شده است.'
+
+});
+
+
+/*
+---
+
+name: Locale.fi-FI.Date
+
+description: Date messages for Finnish.
+
+license: MIT-style license
+
+authors:
+  - ksel
+
+requires:
+  - /Locale
+
+provides: [Locale.fi-FI.Date]
+
+...
+*/
+
+Locale.define('fi-FI', 'Date', {
+
+	// NOTE: months and days are not capitalized in finnish
+	months: ['tammikuu', 'helmikuu', 'maaliskuu', 'huhtikuu', 'toukokuu', 'kesäkuu', 'heinäkuu', 'elokuu', 'syyskuu', 'lokakuu', 'marraskuu', 'joulukuu'],
+
+	// these abbreviations are really not much used in finnish because they obviously won't abbreviate very much. ;)
+	// NOTE: sometimes one can see forms such as "tammi", "helmi", etc. but that is not proper finnish.
+	months_abbr: ['tammik.', 'helmik.', 'maalisk.', 'huhtik.', 'toukok.', 'kesäk.', 'heinäk.', 'elok.', 'syysk.', 'lokak.', 'marrask.', 'jouluk.'],
+
+	days: ['sunnuntai', 'maanantai', 'tiistai', 'keskiviikko', 'torstai', 'perjantai', 'lauantai'],
+	days_abbr: ['su', 'ma', 'ti', 'ke', 'to', 'pe', 'la'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'vajaa minuutti sitten',
+	minuteAgo: 'noin minuutti sitten',
+	minutesAgo: '{delta} minuuttia sitten',
+	hourAgo: 'noin tunti sitten',
+	hoursAgo: 'noin {delta} tuntia sitten',
+	dayAgo: 'päivä sitten',
+	daysAgo: '{delta} päivää sitten',
+	weekAgo: 'viikko sitten',
+	weeksAgo: '{delta} viikkoa sitten',
+	monthAgo: 'kuukausi sitten',
+	monthsAgo: '{delta} kuukautta sitten',
+	yearAgo: 'vuosi sitten',
+	yearsAgo: '{delta} vuotta sitten',
+
+	lessThanMinuteUntil: 'vajaan minuutin kuluttua',
+	minuteUntil: 'noin minuutin kuluttua',
+	minutesUntil: '{delta} minuutin kuluttua',
+	hourUntil: 'noin tunnin kuluttua',
+	hoursUntil: 'noin {delta} tunnin kuluttua',
+	dayUntil: 'päivän kuluttua',
+	daysUntil: '{delta} päivän kuluttua',
+	weekUntil: 'viikon kuluttua',
+	weeksUntil: '{delta} viikon kuluttua',
+	monthUntil: 'kuukauden kuluttua',
+	monthsUntil: '{delta} kuukauden kuluttua',
+	yearUntil: 'vuoden kuluttua',
+	yearsUntil: '{delta} vuoden kuluttua'
+
+});
+
+
+/*
+---
+
+name: Locale.fi-FI.Form.Validator
+
+description: Form Validator messages for Finnish.
+
+license: MIT-style license
+
+authors:
+  - ksel
+
+requires:
+  - /Locale
+
+provides: [Locale.fi-FI.Form.Validator]
+
+...
+*/
+
+Locale.define('fi-FI', 'FormValidator', {
+
+	required: 'Tämä kenttä on pakollinen.',
+	minLength: 'Ole hyvä ja anna vähintään {minLength} merkkiä (annoit {length} merkkiä).',
+	maxLength: 'Älä anna enempää kuin {maxLength} merkkiä (annoit {length} merkkiä).',
+	integer: 'Ole hyvä ja anna kokonaisluku. Luvut, joissa on desimaaleja (esim. 1.25) eivät ole sallittuja.',
+	numeric: 'Anna tähän kenttään lukuarvo (kuten "1" tai "1.1" tai "-1" tai "-1.1").',
+	digits: 'Käytä pelkästään numeroita ja välimerkkejä tässä kentässä (syötteet, kuten esim. puhelinnumero, jossa on väliviivoja, pilkkuja tai pisteitä, kelpaa).',
+	alpha: 'Anna tähän kenttään vain kirjaimia (a-z). Välilyönnit tai muut merkit eivät ole sallittuja.',
+	alphanum: 'Anna tähän kenttään vain kirjaimia (a-z) tai numeroita (0-9). Välilyönnit tai muut merkit eivät ole sallittuja.',
+	dateSuchAs: 'Ole hyvä ja anna kelvollinen päivmäärä, kuten esimerkiksi {date}',
+	dateInFormatMDY: 'Ole hyvä ja anna kelvollinen päivämäärä muodossa pp/kk/vvvv (kuten "12/31/1999")',
+	email: 'Ole hyvä ja anna kelvollinen sähköpostiosoite (kuten esimerkiksi "matti@meikalainen.com").',
+	url: 'Ole hyvä ja anna kelvollinen URL, kuten esimerkiksi http://www.example.com.',
+	currencyDollar: 'Ole hyvä ja anna kelvollinen eurosumma (kuten esimerkiksi 100,00 EUR) .',
+	oneRequired: 'Ole hyvä ja syötä jotakin ainakin johonkin näistä kentistä.',
+	errorPrefix: 'Virhe: ',
+	warningPrefix: 'Varoitus: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Tässä syötteessä ei voi olla välilyöntejä',
+	reqChkByNode: 'Ei valintoja.',
+	requiredChk: 'Tämä kenttä on pakollinen.',
+	reqChkByName: 'Ole hyvä ja valitse {label}.',
+	match: 'Tämän kentän tulee vastata kenttää {matchName}',
+	startDate: 'alkupäivämäärä',
+	endDate: 'loppupäivämäärä',
+	currendDate: 'nykyinen päivämäärä',
+	afterDate: 'Päivämäärän tulisi olla sama tai myöhäisempi ajankohta kuin {label}.',
+	beforeDate: 'Päivämäärän tulisi olla sama tai aikaisempi ajankohta kuin {label}.',
+	startMonth: 'Ole hyvä ja valitse aloituskuukausi',
+	sameMonth: 'Näiden kahden päivämäärän tulee olla saman kuun sisällä -- sinun pitää muuttaa jompaa kumpaa.',
+	creditcard: 'Annettu luottokortin numero ei kelpaa. Ole hyvä ja tarkista numero sekä yritä uudelleen. {length} numeroa syötetty.'
+
+});
+
+
+/*
+---
+
+name: Locale.fi-FI.Number
+
+description: Finnish number messages
+
+license: MIT-style license
+
+authors:
+  - ksel
+
+requires:
+  - /Locale
+  - /Locale.EU.Number
+
+provides: [Locale.fi-FI.Number]
+
+...
+*/
+
+Locale.define('fi-FI', 'Number', {
+
+	group: ' ' // grouped by space
+
+}).inherit('EU', 'Number');
+
+
+/*
+---
+
+name: Locale.fr-FR.Date
+
+description: Date messages for French.
+
+license: MIT-style license
+
+authors:
+  - Nicolas Sorosac
+  - Antoine Abt
+
+requires:
+  - /Locale
+
+provides: [Locale.fr-FR.Date]
+
+...
+*/
+
+Locale.define('fr-FR', 'Date', {
+
+	months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
+	months_abbr: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
+	days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
+	days_abbr: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		return (dayOfMonth > 1) ? '' : 'er';
+	},
+
+	lessThanMinuteAgo: "il y a moins d'une minute",
+	minuteAgo: 'il y a une minute',
+	minutesAgo: 'il y a {delta} minutes',
+	hourAgo: 'il y a une heure',
+	hoursAgo: 'il y a {delta} heures',
+	dayAgo: 'il y a un jour',
+	daysAgo: 'il y a {delta} jours',
+	weekAgo: 'il y a une semaine',
+	weeksAgo: 'il y a {delta} semaines',
+	monthAgo: 'il y a 1 mois',
+	monthsAgo: 'il y a {delta} mois',
+	yearthAgo: 'il y a 1 an',
+	yearsAgo: 'il y a {delta} ans',
+
+	lessThanMinuteUntil: "dans moins d'une minute",
+	minuteUntil: 'dans une minute',
+	minutesUntil: 'dans {delta} minutes',
+	hourUntil: 'dans une heure',
+	hoursUntil: 'dans {delta} heures',
+	dayUntil: 'dans un jour',
+	daysUntil: 'dans {delta} jours',
+	weekUntil: 'dans 1 semaine',
+	weeksUntil: 'dans {delta} semaines',
+	monthUntil: 'dans 1 mois',
+	monthsUntil: 'dans {delta} mois',
+	yearUntil: 'dans 1 an',
+	yearsUntil: 'dans {delta} ans'
+
+});
+
+
+/*
+---
+
+name: Locale.fr-FR.Form.Validator
+
+description: Form Validator messages for French.
+
+license: MIT-style license
+
+authors:
+  - Miquel Hudin
+  - Nicolas Sorosac
+
+requires:
+  - /Locale
+
+provides: [Locale.fr-FR.Form.Validator]
+
+...
+*/
+
+Locale.define('fr-FR', 'FormValidator', {
+
+	required: 'Ce champ est obligatoire.',
+	length: 'Veuillez saisir {length} caract&egrave;re(s) (vous avez saisi {elLength} caract&egrave;re(s)',
+	minLength: 'Veuillez saisir un minimum de {minLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
+	maxLength: 'Veuillez saisir un maximum de {maxLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
+	integer: 'Veuillez saisir un nombre entier dans ce champ. Les nombres d&eacute;cimaux (ex : "1,25") ne sont pas autoris&eacute;s.',
+	numeric: 'Veuillez saisir uniquement des chiffres dans ce champ (ex : "1" ou "1,1" ou "-1" ou "-1,1").',
+	digits: "Veuillez saisir uniquement des chiffres et des signes de ponctuation dans ce champ (ex : un num&eacute;ro de t&eacute;l&eacute;phone avec des traits d'union est autoris&eacute;).",
+	alpha: 'Veuillez saisir uniquement des lettres (a-z) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.',
+	alphanum: 'Veuillez saisir uniquement des lettres (a-z) ou des chiffres (0-9) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.',
+	dateSuchAs: 'Veuillez saisir une date correcte comme {date}',
+	dateInFormatMDY: 'Veuillez saisir une date correcte, au format JJ/MM/AAAA (ex : "31/11/1999").',
+	email: 'Veuillez saisir une adresse de courrier &eacute;lectronique. Par example "fred@domaine.com".',
+	url: 'Veuillez saisir une URL, comme http://www.example.com.',
+	currencyDollar: 'Veuillez saisir une quantit&eacute; correcte. Par example 100,00&euro;.',
+	oneRequired: 'Veuillez s&eacute;lectionner au moins une de ces options.',
+	errorPrefix: 'Erreur : ',
+	warningPrefix: 'Attention : ',
+
+	// Form.Validator.Extras
+	noSpace: "Ce champ n'accepte pas les espaces.",
+	reqChkByNode: "Aucun &eacute;l&eacute;ment n'est s&eacute;lectionn&eacute;.",
+	requiredChk: 'Ce champ est obligatoire.',
+	reqChkByName: 'Veuillez s&eacute;lectionner un(e) {label}.',
+	match: 'Ce champ doit correspondre avec le champ {matchName}.',
+	startDate: 'date de d&eacute;but',
+	endDate: 'date de fin',
+	currendDate: 'date actuelle',
+	afterDate: 'La date doit &ecirc;tre identique ou post&eacute;rieure &agrave; {label}.',
+	beforeDate: 'La date doit &ecirc;tre identique ou ant&eacute;rieure &agrave; {label}.',
+	startMonth: 'Veuillez s&eacute;lectionner un mois de d&eacute;but.',
+	sameMonth: 'Ces deux dates doivent &ecirc;tre dans le m&ecirc;me mois - vous devez en modifier une.',
+	creditcard: 'Le num&eacute;ro de carte de cr&eacute;dit est invalide. Merci de v&eacute;rifier le num&eacute;ro et de r&eacute;essayer. Vous avez entr&eacute; {length} chiffre(s).'
+
+});
+
+
+/*
+---
+
+name: Locale.fr-FR.Number
+
+description: Number messages for French.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+  - sv1l
+
+requires:
+  - /Locale
+  - /Locale.EU.Number
+
+provides: [Locale.fr-FR.Number]
+
+...
+*/
+
+Locale.define('fr-FR', 'Number', {
+
+	group: ' ' // In fr-FR localization, group character is a blank space
+
+}).inherit('EU', 'Number');
+
+
+/*
+---
+
+name: Locale.he-IL.Date
+
+description: Date messages for Hebrew.
+
+license: MIT-style license
+
+authors:
+  - Elad Ossadon
+
+requires:
+  - /Locale
+
+provides: [Locale.he-IL.Date]
+
+...
+*/
+
+Locale.define('he-IL', 'Date', {
+
+	months: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
+	months_abbr: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
+	days: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
+	days_abbr: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'לפני פחות מדקה',
+	minuteAgo: 'לפני כדקה',
+	minutesAgo: 'לפני {delta} דקות',
+	hourAgo: 'לפני כשעה',
+	hoursAgo: 'לפני {delta} שעות',
+	dayAgo: 'לפני יום',
+	daysAgo: 'לפני {delta} ימים',
+	weekAgo: 'לפני שבוע',
+	weeksAgo: 'לפני {delta} שבועות',
+	monthAgo: 'לפני חודש',
+	monthsAgo: 'לפני {delta} חודשים',
+	yearAgo: 'לפני שנה',
+	yearsAgo: 'לפני {delta} שנים',
+
+	lessThanMinuteUntil: 'בעוד פחות מדקה',
+	minuteUntil: 'בעוד כדקה',
+	minutesUntil: 'בעוד {delta} דקות',
+	hourUntil: 'בעוד כשעה',
+	hoursUntil: 'בעוד {delta} שעות',
+	dayUntil: 'בעוד יום',
+	daysUntil: 'בעוד {delta} ימים',
+	weekUntil: 'בעוד שבוע',
+	weeksUntil: 'בעוד {delta} שבועות',
+	monthUntil: 'בעוד חודש',
+	monthsUntil: 'בעוד {delta} חודשים',
+	yearUntil: 'בעוד שנה',
+	yearsUntil: 'בעוד {delta} שנים'
+
+});
+
+
+/*
+---
+
+name: Locale.he-IL.Form.Validator
+
+description: Form Validator messages for Hebrew.
+
+license: MIT-style license
+
+authors:
+  - Elad Ossadon
+
+requires:
+  - /Locale
+
+provides: [Locale.he-IL.Form.Validator]
+
+...
+*/
+
+Locale.define('he-IL', 'FormValidator', {
+
+	required: 'נא למלא שדה זה.',
+	minLength: 'נא להזין לפחות {minLength} תווים (הזנת {length} תווים).',
+	maxLength: 'נא להזין עד {maxLength} תווים (הזנת {length} תווים).',
+	integer: 'נא להזין מספר שלם לשדה זה. מספרים עשרוניים (כמו 1.25) אינם חוקיים.',
+	numeric: 'נא להזין ערך מספרי בלבד בשדה זה (כמו "1", "1.1", "-1" או "-1.1").',
+	digits: 'נא להזין רק ספרות וסימני הפרדה בשדה זה (למשל, מספר טלפון עם מקפים או נקודות הוא חוקי).',
+	alpha: 'נא להזין רק אותיות באנגלית (a-z) בשדה זה. רווחים או תווים אחרים אינם חוקיים.',
+	alphanum: 'נא להזין רק אותריות באנגלית (a-z) או ספרות (0-9) בשדה זה. אווחרים או תווים אחרים אינם חוקיים.',
+	dateSuchAs: 'נא להזין תאריך חוקי, כמו {date}',
+	dateInFormatMDY: 'נא להזין תאריך חוקי בפורמט MM/DD/YYYY (כמו "12/31/1999")',
+	email: 'נא להזין כתובת אימייל חוקית. לדוגמה: "fred@domain.com".',
+	url: 'נא להזין כתובת אתר חוקית, כמו http://www.example.com.',
+	currencyDollar: 'נא להזין סכום דולרי חוקי. לדוגמה $100.00.',
+	oneRequired: 'נא לבחור לפחות בשדה אחד.',
+	errorPrefix: 'שגיאה: ',
+	warningPrefix: 'אזהרה: ',
+
+	// Form.Validator.Extras
+	noSpace: 'אין להזין רווחים בשדה זה.',
+	reqChkByNode: 'נא לבחור אחת מהאפשרויות.',
+	requiredChk: 'שדה זה נדרש.',
+	reqChkByName: 'נא לבחור {label}.',
+	match: 'שדה זה צריך להתאים לשדה {matchName}',
+	startDate: 'תאריך ההתחלה',
+	endDate: 'תאריך הסיום',
+	currendDate: 'התאריך הנוכחי',
+	afterDate: 'התאריך צריך להיות זהה או אחרי {label}.',
+	beforeDate: 'התאריך צריך להיות זהה או לפני {label}.',
+	startMonth: 'נא לבחור חודש התחלה',
+	sameMonth: 'שני תאריכים אלה צריכים להיות באותו חודש - נא לשנות אחד התאריכים.',
+	creditcard: 'מספר כרטיס האשראי שהוזן אינו חוקי. נא לבדוק שנית. הוזנו {length} ספרות.'
+
+});
+
+
+/*
+---
+
+name: Locale.he-IL.Number
+
+description: Number messages for Hebrew.
+
+license: MIT-style license
+
+authors:
+  - Elad Ossadon
+
+requires:
+  - /Locale
+
+provides: [Locale.he-IL.Number]
+
+...
+*/
+
+Locale.define('he-IL', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+	currency: {
+		suffix: ' ₪'
+	}
+
+});
+
+
+/*
+---
+
+name: Locale.hu-HU.Date
+
+description: Date messages for Hungarian.
+
+license: MIT-style license
+
+authors:
+  - Zsolt Szegheő
+
+requires:
+  - /Locale
+
+provides: [Locale.hu-HU.Date]
+
+...
+*/
+
+Locale.define('hu-HU', 'Date', {
+
+	months: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június', 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
+	months_abbr: ['jan.', 'febr.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
+	days: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
+	days_abbr: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
+
+	// Culture's date order: YYYY.MM.DD.
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y.%m.%d.',
+	shortTime: '%I:%M',
+	AM: 'de.',
+	PM: 'du.',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'alig egy perce',
+	minuteAgo: 'egy perce',
+	minutesAgo: '{delta} perce',
+	hourAgo: 'egy órája',
+	hoursAgo: '{delta} órája',
+	dayAgo: '1 napja',
+	daysAgo: '{delta} napja',
+	weekAgo: '1 hete',
+	weeksAgo: '{delta} hete',
+	monthAgo: '1 hónapja',
+	monthsAgo: '{delta} hónapja',
+	yearAgo: '1 éve',
+	yearsAgo: '{delta} éve',
+
+	lessThanMinuteUntil: 'alig egy perc múlva',
+	minuteUntil: 'egy perc múlva',
+	minutesUntil: '{delta} perc múlva',
+	hourUntil: 'egy óra múlva',
+	hoursUntil: '{delta} óra múlva',
+	dayUntil: '1 nap múlva',
+	daysUntil: '{delta} nap múlva',
+	weekUntil: '1 hét múlva',
+	weeksUntil: '{delta} hét múlva',
+	monthUntil: '1 hónap múlva',
+	monthsUntil: '{delta} hónap múlva',
+	yearUntil: '1 év múlva',
+	yearsUntil: '{delta} év múlva'
+
+});
+
+
+/*
+---
+
+name: Locale.hu-HU.Form.Validator
+
+description: Form Validator messages for Hungarian.
+
+license: MIT-style license
+
+authors:
+  - Zsolt Szegheő
+
+requires:
+  - /Locale
+
+provides: [Locale.hu-HU.Form.Validator]
+
+...
+*/
+
+Locale.define('hu-HU', 'FormValidator', {
+
+	required: 'A mező kitöltése kötelező.',
+	minLength: 'Legalább {minLength} karakter megadása szükséges (megadva {length} karakter).',
+	maxLength: 'Legfeljebb {maxLength} karakter megadása lehetséges (megadva {length} karakter).',
+	integer: 'Egész szám megadása szükséges. A tizedesjegyek (pl. 1.25) nem engedélyezettek.',
+	numeric: 'Szám megadása szükséges (pl. "1" vagy "1.1" vagy "-1" vagy "-1.1").',
+	digits: 'Csak számok és írásjelek megadása lehetséges (pl. telefonszám kötőjelek és/vagy perjelekkel).',
+	alpha: 'Csak betűk (a-z) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.',
+	alphanum: 'Csak betűk (a-z) vagy számok (0-9) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.',
+	dateSuchAs: 'Valós dátum megadása szükséges (pl. {date}).',
+	dateInFormatMDY: 'Valós dátum megadása szükséges ÉÉÉÉ.HH.NN. formában. (pl. "1999.12.31.")',
+	email: 'Valós e-mail cím megadása szükséges (pl. "fred@domain.hu").',
+	url: 'Valós URL megadása szükséges (pl. http://www.example.com).',
+	currencyDollar: 'Valós pénzösszeg megadása szükséges (pl. 100.00 Ft.).',
+	oneRequired: 'Az alábbi mezők legalább egyikének kitöltése kötelező.',
+	errorPrefix: 'Hiba: ',
+	warningPrefix: 'Figyelem: ',
+
+	// Form.Validator.Extras
+	noSpace: 'A mező nem tartalmazhat szóközöket.',
+	reqChkByNode: 'Nincs egyetlen kijelölt elem sem.',
+	requiredChk: 'A mező kitöltése kötelező.',
+	reqChkByName: 'Egy {label} kiválasztása szükséges.',
+	match: 'A mezőnek egyeznie kell a(z) {matchName} mezővel.',
+	startDate: 'a kezdet dátuma',
+	endDate: 'a vég dátuma',
+	currendDate: 'jelenlegi dátum',
+	afterDate: 'A dátum nem lehet kisebb, mint {label}.',
+	beforeDate: 'A dátum nem lehet nagyobb, mint {label}.',
+	startMonth: 'Kezdeti hónap megadása szükséges.',
+	sameMonth: 'A két dátumnak ugyanazon hónapban kell lennie.',
+	creditcard: 'A megadott bankkártyaszám nem valódi (megadva {length} számjegy).'
+
+});
+
+
+/*
+---
+
+name: Locale.it-IT.Date
+
+description: Date messages for Italian.
+
+license: MIT-style license.
+
+authors:
+  - Andrea Novero
+  - Valerio Proietti
+
+requires:
+  - /Locale
+
+provides: [Locale.it-IT.Date]
+
+...
+*/
+
+Locale.define('it-IT', 'Date', {
+
+	months: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
+	months_abbr: ['gen', 'feb', 'mar', 'apr', 'mag', 'giu', 'lug', 'ago', 'set', 'ott', 'nov', 'dic'],
+	days: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
+	days_abbr: ['dom', 'lun', 'mar', 'mer', 'gio', 'ven', 'sab'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H.%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: 'º',
+
+	lessThanMinuteAgo: 'meno di un minuto fa',
+	minuteAgo: 'circa un minuto fa',
+	minutesAgo: 'circa {delta} minuti fa',
+	hourAgo: "circa un'ora fa",
+	hoursAgo: 'circa {delta} ore fa',
+	dayAgo: 'circa 1 giorno fa',
+	daysAgo: 'circa {delta} giorni fa',
+	weekAgo: 'una settimana fa',
+	weeksAgo: '{delta} settimane fa',
+	monthAgo: 'un mese fa',
+	monthsAgo: '{delta} mesi fa',
+	yearAgo: 'un anno fa',
+	yearsAgo: '{delta} anni fa',
+
+	lessThanMinuteUntil: 'tra meno di un minuto',
+	minuteUntil: 'tra circa un minuto',
+	minutesUntil: 'tra circa {delta} minuti',
+	hourUntil: "tra circa un'ora",
+	hoursUntil: 'tra circa {delta} ore',
+	dayUntil: 'tra circa un giorno',
+	daysUntil: 'tra circa {delta} giorni',
+	weekUntil: 'tra una settimana',
+	weeksUntil: 'tra {delta} settimane',
+	monthUntil: 'tra un mese',
+	monthsUntil: 'tra {delta} mesi',
+	yearUntil: 'tra un anno',
+	yearsUntil: 'tra {delta} anni'
+
+});
+
+
+/*
+---
+
+name: Locale.it-IT.Form.Validator
+
+description: Form Validator messages for Italian.
+
+license: MIT-style license
+
+authors:
+  - Leonardo Laureti
+  - Andrea Novero
+
+requires:
+  - /Locale
+
+provides: [Locale.it-IT.Form.Validator]
+
+...
+*/
+
+Locale.define('it-IT', 'FormValidator', {
+
+	required: 'Il campo &egrave; obbligatorio.',
+	minLength: 'Inserire almeno {minLength} caratteri (ne sono stati inseriti {length}).',
+	maxLength: 'Inserire al massimo {maxLength} caratteri (ne sono stati inseriti {length}).',
+	integer: 'Inserire un numero intero. Non sono consentiti decimali (es.: 1.25).',
+	numeric: 'Inserire solo valori numerici (es.: "1" oppure "1.1" oppure "-1" oppure "-1.1").',
+	digits: 'Inserire solo numeri e caratteri di punteggiatura. Per esempio &egrave; consentito un numero telefonico con trattini o punti.',
+	alpha: 'Inserire solo lettere (a-z). Non sono consentiti spazi o altri caratteri.',
+	alphanum: 'Inserire solo lettere (a-z) o numeri (0-9). Non sono consentiti spazi o altri caratteri.',
+	dateSuchAs: 'Inserire una data valida del tipo {date}',
+	dateInFormatMDY: 'Inserire una data valida nel formato MM/GG/AAAA (es.: "12/31/1999")',
+	email: 'Inserire un indirizzo email valido. Per esempio "nome@dominio.com".',
+	url: 'Inserire un indirizzo valido. Per esempio "http://www.example.com".',
+	currencyDollar: 'Inserire un importo valido. Per esempio "$100.00".',
+	oneRequired: 'Completare almeno uno dei campi richiesti.',
+	errorPrefix: 'Errore: ',
+	warningPrefix: 'Attenzione: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Non sono consentiti spazi.',
+	reqChkByNode: 'Nessuna voce selezionata.',
+	requiredChk: 'Il campo &egrave; obbligatorio.',
+	reqChkByName: 'Selezionare un(a) {label}.',
+	match: 'Il valore deve corrispondere al campo {matchName}',
+	startDate: "data d'inizio",
+	endDate: 'data di fine',
+	currendDate: 'data attuale',
+	afterDate: 'La data deve corrispondere o essere successiva al {label}.',
+	beforeDate: 'La data deve corrispondere o essere precedente al {label}.',
+	startMonth: "Selezionare un mese d'inizio",
+	sameMonth: 'Le due date devono essere dello stesso mese - occorre modificarne una.'
+
+});
+
+
+/*
+---
+
+name: Locale.ja-JP.Date
+
+description: Date messages for Japanese.
+
+license: MIT-style license
+
+authors:
+  - Noritaka Horio
+
+requires:
+  - /Locale
+
+provides: [Locale.ja-JP.Date]
+
+...
+*/
+
+Locale.define('ja-JP', 'Date', {
+
+	months: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+	months_abbr: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+	days: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'],
+	days_abbr: ['日', '月', '火', '水', '木', '金', '土'],
+
+	// Culture's date order: YYYY/MM/DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y/%m/%d',
+	shortTime: '%H:%M',
+	AM: '午前',
+	PM: '午後',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: '1分以内前',
+	minuteAgo: '約1分前',
+	minutesAgo: '約{delta}分前',
+	hourAgo: '約1時間前',
+	hoursAgo: '約{delta}時間前',
+	dayAgo: '1日前',
+	daysAgo: '{delta}日前',
+	weekAgo: '1週間前',
+	weeksAgo: '{delta}週間前',
+	monthAgo: '1ヶ月前',
+	monthsAgo: '{delta}ヶ月前',
+	yearAgo: '1年前',
+	yearsAgo: '{delta}年前',
+
+	lessThanMinuteUntil: '今から約1分以内',
+	minuteUntil: '今から約1分',
+	minutesUntil: '今から約{delta}分',
+	hourUntil: '今から約1時間',
+	hoursUntil: '今から約{delta}時間',
+	dayUntil: '今から1日間',
+	daysUntil: '今から{delta}日間',
+	weekUntil: '今から1週間',
+	weeksUntil: '今から{delta}週間',
+	monthUntil: '今から1ヶ月',
+	monthsUntil: '今から{delta}ヶ月',
+	yearUntil: '今から1年',
+	yearsUntil: '今から{delta}年'
+
+});
+
+
+/*
+---
+
+name: Locale.ja-JP.Form.Validator
+
+description: Form Validator messages for Japanese.
+
+license: MIT-style license
+
+authors:
+  - Noritaka Horio
+
+requires:
+  - /Locale
+
+provides: [Locale.ja-JP.Form.Validator]
+
+...
+*/
+
+Locale.define("ja-JP", "FormValidator", {
+
+	required: '入力は必須です。',
+	minLength: '入力文字数は{minLength}以上にしてください。({length}文字)',
+	maxLength: '入力文字数は{maxLength}以下にしてください。({length}文字)',
+	integer: '整数を入力してください。',
+	numeric: '入力できるのは数値だけです。(例: "1", "1.1", "-1", "-1.1"....)',
+	digits: '入力できるのは数値と句読記号です。 (例: -や+を含む電話番号など).',
+	alpha: '入力できるのは半角英字だけです。それ以外の文字は入力できません。',
+	alphanum: '入力できるのは半角英数字だけです。それ以外の文字は入力できません。',
+	dateSuchAs: '有効な日付を入力してください。{date}',
+	dateInFormatMDY: '日付の書式に誤りがあります。YYYY/MM/DD (i.e. "1999/12/31")',
+	email: 'メールアドレスに誤りがあります。',
+	url: 'URLアドレスに誤りがあります。',
+	currencyDollar: '金額に誤りがあります。',
+	oneRequired: 'ひとつ以上入力してください。',
+	errorPrefix: 'エラー: ',
+	warningPrefix: '警告: ',
+
+	// FormValidator.Extras
+	noSpace: 'スペースは入力できません。',
+	reqChkByNode: '選択されていません。',
+	requiredChk: 'この項目は必須です。',
+	reqChkByName: '{label}を選択してください。',
+	match: '{matchName}が入力されている場合必須です。',
+	startDate: '開始日',
+	endDate: '終了日',
+	currendDate: '今日',
+	afterDate: '{label}以降の日付にしてください。',
+	beforeDate: '{label}以前の日付にしてください。',
+	startMonth: '開始月を選択してください。',
+	sameMonth: '日付が同一です。どちらかを変更してください。'
+
+});
+
+
+/*
+---
+
+name: Locale.ja-JP.Number
+
+description: Number messages for Japanese.
+
+license: MIT-style license
+
+authors:
+  - Noritaka Horio
+
+requires:
+  - /Locale
+
+provides: [Locale.ja-JP.Number]
+
+...
+*/
+
+Locale.define('ja-JP', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+	currency: {
+		decimals: 0,
+		prefix: '\\'
+	}
+
+});
+
+
+/*
+---
+
+name: Locale.nl-NL.Date
+
+description: Date messages for Dutch.
+
+license: MIT-style license
+
+authors:
+  - Lennart Pilon
+  - Tim Wienk
+
+requires:
+  - /Locale
+
+provides: [Locale.nl-NL.Date]
+
+...
+*/
+
+Locale.define('nl-NL', 'Date', {
+
+	months: ['januari', 'februari', 'maart', 'april', 'mei', 'juni', 'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
+	months_abbr: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
+	days: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
+	days_abbr: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
+
+	// Culture's date order: DD-MM-YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: 'e',
+
+	lessThanMinuteAgo: 'minder dan een minuut geleden',
+	minuteAgo: 'ongeveer een minuut geleden',
+	minutesAgo: '{delta} minuten geleden',
+	hourAgo: 'ongeveer een uur geleden',
+	hoursAgo: 'ongeveer {delta} uur geleden',
+	dayAgo: 'een dag geleden',
+	daysAgo: '{delta} dagen geleden',
+	weekAgo: 'een week geleden',
+	weeksAgo: '{delta} weken geleden',
+	monthAgo: 'een maand geleden',
+	monthsAgo: '{delta} maanden geleden',
+	yearAgo: 'een jaar geleden',
+	yearsAgo: '{delta} jaar geleden',
+
+	lessThanMinuteUntil: 'over minder dan een minuut',
+	minuteUntil: 'over ongeveer een minuut',
+	minutesUntil: 'over {delta} minuten',
+	hourUntil: 'over ongeveer een uur',
+	hoursUntil: 'over {delta} uur',
+	dayUntil: 'over ongeveer een dag',
+	daysUntil: 'over {delta} dagen',
+	weekUntil: 'over een week',
+	weeksUntil: 'over {delta} weken',
+	monthUntil: 'over een maand',
+	monthsUntil: 'over {delta} maanden',
+	yearUntil: 'over een jaar',
+	yearsUntil: 'over {delta} jaar'
+
+});
+
+
+/*
+---
+
+name: Locale.nl-NL.Form.Validator
+
+description: Form Validator messages for Dutch.
+
+license: MIT-style license
+
+authors:
+  - Lennart Pilon
+  - Arian Stolwijk
+  - Tim Wienk
+
+requires:
+  - /Locale
+
+provides: [Locale.nl-NL.Form.Validator]
+
+...
+*/
+
+Locale.define('nl-NL', 'FormValidator', {
+
+	required: 'Dit veld is verplicht.',
+	length: 'Vul precies {length} karakters in (je hebt {elLength} karakters ingevoerd).',
+	minLength: 'Vul minimaal {minLength} karakters in (je hebt {length} karakters ingevoerd).',
+	maxLength: 'Vul niet meer dan {maxLength} karakters in (je hebt {length} karakters ingevoerd).',
+	integer: 'Vul een getal in. Getallen met decimalen (bijvoorbeeld 1.25) zijn niet toegestaan.',
+	numeric: 'Vul alleen numerieke waarden in (bijvoorbeeld "1" of "1.1" of "-1" of "-1.1").',
+	digits: 'Vul alleen nummers en leestekens in (bijvoorbeeld een telefoonnummer met streepjes is toegestaan).',
+	alpha: 'Vul alleen letters in (a-z). Spaties en andere karakters zijn niet toegestaan.',
+	alphanum: 'Vul alleen letters (a-z) of nummers (0-9) in. Spaties en andere karakters zijn niet toegestaan.',
+	dateSuchAs: 'Vul een geldige datum in, zoals {date}',
+	dateInFormatMDY: 'Vul een geldige datum, in het formaat MM/DD/YYYY (bijvoorbeeld "12/31/1999")',
+	email: 'Vul een geldig e-mailadres in. Bijvoorbeeld "fred@domein.nl".',
+	url: 'Vul een geldige URL in, zoals http://www.example.com.',
+	currencyDollar: 'Vul een geldig $ bedrag in. Bijvoorbeeld $100.00 .',
+	oneRequired: 'Vul iets in bij in ieder geval een van deze velden.',
+	warningPrefix: 'Waarschuwing: ',
+	errorPrefix: 'Fout: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Spaties zijn niet toegestaan in dit veld.',
+	reqChkByNode: 'Er zijn geen items geselecteerd.',
+	requiredChk: 'Dit veld is verplicht.',
+	reqChkByName: 'Selecteer een {label}.',
+	match: 'Dit veld moet overeen komen met het {matchName} veld',
+	startDate: 'de begin datum',
+	endDate: 'de eind datum',
+	currendDate: 'de huidige datum',
+	afterDate: 'De datum moet hetzelfde of na {label} zijn.',
+	beforeDate: 'De datum moet hetzelfde of voor {label} zijn.',
+	startMonth: 'Selecteer een begin maand',
+	sameMonth: 'Deze twee data moeten in dezelfde maand zijn - u moet een van beide aanpassen.',
+	creditcard: 'Het ingevulde creditcardnummer is niet geldig. Controleer het nummer en probeer opnieuw. {length} getallen ingevuld.'
+
+});
+
+
+/*
+---
+
+name: Locale.nl-NL.Number
+
+description: Number messages for Dutch.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires:
+  - /Locale
+  - /Locale.EU.Number
+
+provides: [Locale.nl-NL.Number]
+
+...
+*/
+
+Locale.define('nl-NL').inherit('EU', 'Number');
+
+
+
+
+
+/*
+---
+
+name: Locale.no-NO.Date
+
+description: Date messages for Norwegian.
+
+license: MIT-style license
+
+authors:
+  - Espen 'Rexxars' Hovlandsdal
+
+requires:
+  - /Locale
+
+provides: [Locale.no-NO.Date]
+
+...
+*/
+
+Locale.define('no-NO', 'Date', {
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	lessThanMinuteAgo: 'kortere enn et minutt siden',
+	minuteAgo: 'omtrent et minutt siden',
+	minutesAgo: '{delta} minutter siden',
+	hourAgo: 'omtrent en time siden',
+	hoursAgo: 'omtrent {delta} timer siden',
+	dayAgo: '{delta} dag siden',
+	daysAgo: '{delta} dager siden'
+
+});
+
+
+/*
+---
+
+name: Locale.no-NO.Form.Validator
+
+description: Form Validator messages for Norwegian.
+
+license: MIT-style license
+
+authors:
+  - Espen 'Rexxars' Hovlandsdal
+
+requires:
+  - /Locale
+
+provides: [Locale.no-NO.Form.Validator]
+
+...
+*/
+
+Locale.define('no-NO', 'FormValidator', {
+
+	required: 'Dette feltet er påkrevd.',
+	minLength: 'Vennligst skriv inn minst {minLength} tegn (du skrev {length} tegn).',
+	maxLength: 'Vennligst skriv inn maksimalt {maxLength} tegn (du skrev {length} tegn).',
+	integer: 'Vennligst skriv inn et tall i dette feltet. Tall med desimaler (for eksempel 1,25) er ikke tillat.',
+	numeric: 'Vennligst skriv inn kun numeriske verdier i dette feltet (for eksempel "1", "1.1", "-1" eller "-1.1").',
+	digits: 'Vennligst bruk kun nummer og skilletegn i dette feltet.',
+	alpha: 'Vennligst bruk kun bokstaver (a-z) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
+	alphanum: 'Vennligst bruk kun bokstaver (a-z) eller nummer (0-9) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
+	dateSuchAs: 'Vennligst skriv inn en gyldig dato, som {date}',
+	dateInFormatMDY: 'Vennligst skriv inn en gyldig dato, i formatet MM/DD/YYYY (for eksempel "12/31/1999")',
+	email: 'Vennligst skriv inn en gyldig epost-adresse. For eksempel "espen@domene.no".',
+	url: 'Vennligst skriv inn en gyldig URL, for eksempel http://www.example.com.',
+	currencyDollar: 'Vennligst fyll ut et gyldig $ beløp. For eksempel $100.00 .',
+	oneRequired: 'Vennligst fyll ut noe i minst ett av disse feltene.',
+	errorPrefix: 'Feil: ',
+	warningPrefix: 'Advarsel: '
+
+});
+
+
+/*
+---
+
+name: Locale.pl-PL.Date
+
+description: Date messages for Polish.
+
+license: MIT-style license
+
+authors:
+  - Oskar Krawczyk
+
+requires:
+  - /Locale
+
+provides: [Locale.pl-PL.Date]
+
+...
+*/
+
+Locale.define('pl-PL', 'Date', {
+
+	months: ['Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'],
+	months_abbr: ['sty', 'lut', 'mar', 'kwi', 'maj', 'cze', 'lip', 'sie', 'wrz', 'paź', 'lis', 'gru'],
+	days: ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'],
+	days_abbr: ['niedz.', 'pon.', 'wt.', 'śr.', 'czw.', 'pt.', 'sob.'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%H:%M',
+	AM: 'nad ranem',
+	PM: 'po południu',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'ty' : ['ty', 'szy', 'gi', 'ci', 'ty'][Math.min(dayOfMonth % 10, 4)];
+	},
+
+	lessThanMinuteAgo: 'mniej niż minute temu',
+	minuteAgo: 'około minutę temu',
+	minutesAgo: '{delta} minut temu',
+	hourAgo: 'około godzinę temu',
+	hoursAgo: 'około {delta} godzin temu',
+	dayAgo: 'Wczoraj',
+	daysAgo: '{delta} dni temu',
+
+	lessThanMinuteUntil: 'za niecałą minutę',
+	minuteUntil: 'za około minutę',
+	minutesUntil: 'za {delta} minut',
+	hourUntil: 'za około godzinę',
+	hoursUntil: 'za około {delta} godzin',
+	dayUntil: 'za 1 dzień',
+	daysUntil: 'za {delta} dni'
+
+});
+
+
+/*
+---
+
+name: Locale.pl-PL.Form.Validator
+
+description: Form Validator messages for Polish.
+
+license: MIT-style license
+
+authors:
+  - Oskar Krawczyk
+
+requires:
+  - /Locale
+
+provides: [Locale.pl-PL.Form.Validator]
+
+...
+*/
+
+Locale.define('pl-PL', 'FormValidator', {
+
+	required: 'To pole jest wymagane.',
+	minLength: 'Wymagane jest przynajmniej {minLength} znaków (wpisanych zostało tylko {length}).',
+	maxLength: 'Dozwolone jest nie więcej niż {maxLength} znaków (wpisanych zostało {length})',
+	integer: 'To pole wymaga liczb całych. Liczby dziesiętne (np. 1.25) są niedozwolone.',
+	numeric: 'Prosimy używać tylko numerycznych wartości w tym polu (np. "1", "1.1", "-1" lub "-1.1").',
+	digits: 'Prosimy używać liczb oraz zankow punktuacyjnych w typ polu (dla przykładu, przy numerze telefonu myślniki i kropki są dozwolone).',
+	alpha: 'Prosimy używać tylko liter (a-z) w tym polu. Spacje oraz inne znaki są niedozwolone.',
+	alphanum: 'Prosimy używać tylko liter (a-z) lub liczb (0-9) w tym polu. Spacje oraz inne znaki są niedozwolone.',
+	dateSuchAs: 'Prosimy podać prawidłową datę w formacie: {date}',
+	dateInFormatMDY: 'Prosimy podać poprawną date w formacie DD.MM.RRRR (i.e. "12.01.2009")',
+	email: 'Prosimy podać prawidłowy adres e-mail, np. "jan@domena.pl".',
+	url: 'Prosimy podać prawidłowy adres URL, np. http://www.example.com.',
+	currencyDollar: 'Prosimy podać prawidłową sumę w PLN. Dla przykładu: 100.00 PLN.',
+	oneRequired: 'Prosimy wypełnić chociaż jedno z pól.',
+	errorPrefix: 'Błąd: ',
+	warningPrefix: 'Uwaga: ',
+
+	// Form.Validator.Extras
+	noSpace: 'W tym polu nie mogą znajdować się spacje.',
+	reqChkByNode: 'Brak zaznaczonych elementów.',
+	requiredChk: 'To pole jest wymagane.',
+	reqChkByName: 'Prosimy wybrać z {label}.',
+	match: 'To pole musi być takie samo jak {matchName}',
+	startDate: 'data początkowa',
+	endDate: 'data końcowa',
+	currendDate: 'aktualna data',
+	afterDate: 'Podana data poinna być taka sama lub po {label}.',
+	beforeDate: 'Podana data poinna być taka sama lub przed {label}.',
+	startMonth: 'Prosimy wybrać początkowy miesiąc.',
+	sameMonth: 'Te dwie daty muszą być w zakresie tego samego miesiąca - wymagana jest zmiana któregoś z pól.'
+
+});
+
+
+/*
+---
+
+name: Locale.pt-PT.Date
+
+description: Date messages for Portuguese.
+
+license: MIT-style license
+
+authors:
+  - Fabio Miranda Costa
+
+requires:
+  - /Locale
+
+provides: [Locale.pt-PT.Date]
+
+...
+*/
+
+Locale.define('pt-PT', 'Date', {
+
+	months: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+	months_abbr: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+	days: ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'],
+	days_abbr: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
+
+	// Culture's date order: DD-MM-YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: 'º',
+
+	lessThanMinuteAgo: 'há menos de um minuto',
+	minuteAgo: 'há cerca de um minuto',
+	minutesAgo: 'há {delta} minutos',
+	hourAgo: 'há cerca de uma hora',
+	hoursAgo: 'há cerca de {delta} horas',
+	dayAgo: 'há um dia',
+	daysAgo: 'há {delta} dias',
+	weekAgo: 'há uma semana',
+	weeksAgo: 'há {delta} semanas',
+	monthAgo: 'há um mês',
+	monthsAgo: 'há {delta} meses',
+	yearAgo: 'há um ano',
+	yearsAgo: 'há {delta} anos',
+
+	lessThanMinuteUntil: 'em menos de um minuto',
+	minuteUntil: 'em um minuto',
+	minutesUntil: 'em {delta} minutos',
+	hourUntil: 'em uma hora',
+	hoursUntil: 'em {delta} horas',
+	dayUntil: 'em um dia',
+	daysUntil: 'em {delta} dias',
+	weekUntil: 'em uma semana',
+	weeksUntil: 'em {delta} semanas',
+	monthUntil: 'em um mês',
+	monthsUntil: 'em {delta} meses',
+	yearUntil: 'em um ano',
+	yearsUntil: 'em {delta} anos'
+
+});
+
+
+/*
+---
+
+name: Locale.pt-BR.Date
+
+description: Date messages for Portuguese (Brazil).
+
+license: MIT-style license
+
+authors:
+  - Fabio Miranda Costa
+
+requires:
+  - /Locale
+  - /Locale.pt-PT.Date
+
+provides: [Locale.pt-BR.Date]
+
+...
+*/
+
+Locale.define('pt-BR', 'Date', {
+
+	// Culture's date order: DD/MM/YYYY
+	shortDate: '%d/%m/%Y'
+
+}).inherit('pt-PT', 'Date');
+
+
+/*
+---
+
+name: Locale.pt-BR.Form.Validator
+
+description: Form Validator messages for Portuguese (Brazil).
+
+license: MIT-style license
+
+authors:
+  - Fábio Miranda Costa
+
+requires:
+  - /Locale
+
+provides: [Locale.pt-BR.Form.Validator]
+
+...
+*/
+
+Locale.define('pt-BR', 'FormValidator', {
+
+	required: 'Este campo é obrigatório.',
+	minLength: 'Digite pelo menos {minLength} caracteres (tamanho atual: {length}).',
+	maxLength: 'Não digite mais de {maxLength} caracteres (tamanho atual: {length}).',
+	integer: 'Por favor digite apenas um número inteiro neste campo. Não são permitidos números decimais (por exemplo, 1,25).',
+	numeric: 'Por favor digite apenas valores numéricos neste campo (por exemplo, "1" ou "1.1" ou "-1" ou "-1,1").',
+	digits: 'Por favor use apenas números e pontuação neste campo (por exemplo, um número de telefone com traços ou pontos é permitido).',
+	alpha: 'Por favor use somente letras (a-z). Espaço e outros caracteres não são permitidos.',
+	alphanum: 'Use somente letras (a-z) ou números (0-9) neste campo. Espaço e outros caracteres não são permitidos.',
+	dateSuchAs: 'Digite uma data válida, como {date}',
+	dateInFormatMDY: 'Digite uma data válida, como DD/MM/YYYY (por exemplo, "31/12/1999")',
+	email: 'Digite um endereço de email válido. Por exemplo "nome@dominio.com".',
+	url: 'Digite uma URL válida. Exemplo: http://www.example.com.',
+	currencyDollar: 'Digite um valor em dinheiro válido. Exemplo: R$100,00 .',
+	oneRequired: 'Digite algo para pelo menos um desses campos.',
+	errorPrefix: 'Erro: ',
+	warningPrefix: 'Aviso: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Não é possível digitar espaços neste campo.',
+	reqChkByNode: 'Não foi selecionado nenhum item.',
+	requiredChk: 'Este campo é obrigatório.',
+	reqChkByName: 'Por favor digite um {label}.',
+	match: 'Este campo deve ser igual ao campo {matchName}.',
+	startDate: 'a data inicial',
+	endDate: 'a data final',
+	currendDate: 'a data atual',
+	afterDate: 'A data deve ser igual ou posterior a {label}.',
+	beforeDate: 'A data deve ser igual ou anterior a {label}.',
+	startMonth: 'Por favor selecione uma data inicial.',
+	sameMonth: 'Estas duas datas devem ter o mesmo mês - você deve modificar uma das duas.',
+	creditcard: 'O número do cartão de crédito informado é inválido. Por favor verifique o valor e tente novamente. {length} números informados.'
+
+});
+
+
+/*
+---
+
+name: Locale.pt-PT.Form.Validator
+
+description: Form Validator messages for Portuguese.
+
+license: MIT-style license
+
+authors:
+  - Miquel Hudin
+
+requires:
+  - /Locale
+
+provides: [Locale.pt-PT.Form.Validator]
+
+...
+*/
+
+Locale.define('pt-PT', 'FormValidator', {
+
+	required: 'Este campo é necessário.',
+	minLength: 'Digite pelo menos{minLength} caracteres (comprimento {length} caracteres).',
+	maxLength: 'Não insira mais de {maxLength} caracteres (comprimento {length} caracteres).',
+	integer: 'Digite um número inteiro neste domínio. Com números decimais (por exemplo, 1,25), não são permitidas.',
+	numeric: 'Digite apenas valores numéricos neste domínio (p.ex., "1" ou "1.1" ou "-1" ou "-1,1").',
+	digits: 'Por favor, use números e pontuação apenas neste campo (p.ex., um número de telefone com traços ou pontos é permitida).',
+	alpha: 'Por favor use somente letras (a-z), com nesta área. Não utilize espaços nem outros caracteres são permitidos.',
+	alphanum: 'Use somente letras (a-z) ou números (0-9) neste campo. Não utilize espaços nem outros caracteres são permitidos.',
+	dateSuchAs: 'Digite uma data válida, como {date}',
+	dateInFormatMDY: 'Digite uma data válida, como DD/MM/YYYY (p.ex. "31/12/1999")',
+	email: 'Digite um endereço de email válido. Por exemplo "fred@domain.com".',
+	url: 'Digite uma URL válida, como http://www.example.com.',
+	currencyDollar: 'Digite um valor válido $. Por exemplo $ 100,00. ',
+	oneRequired: 'Digite algo para pelo menos um desses insumos.',
+	errorPrefix: 'Erro: ',
+	warningPrefix: 'Aviso: '
+
+});
+
+
+/*
+---
+
+name: Locale.ru-RU-unicode.Date
+
+description: Date messages for Russian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Evstigneev Pavel
+  - Kuryanovich Egor
+
+requires:
+  - /Locale
+
+provides: [Locale.ru-RU.Date]
+
+...
+*/
+
+(function(){
+
+// Russian language pluralization rules, taken from CLDR project, http://unicode.org/cldr/
+// one -> n mod 10 is 1 and n mod 100 is not 11;
+// few -> n mod 10 in 2..4 and n mod 100 not in 12..14;
+// many -> n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14;
+// other -> everything else (example 3.14)
+var pluralize = function (n, one, few, many, other){
+	var modulo10 = n % 10,
+		modulo100 = n % 100;
+
+	if (modulo10 == 1 && modulo100 != 11){
+		return one;
+	} else if ((modulo10 == 2 || modulo10 == 3 || modulo10 == 4) && !(modulo100 == 12 || modulo100 == 13 || modulo100 == 14)){
+		return few;
+	} else if (modulo10 == 0 || (modulo10 == 5 || modulo10 == 6 || modulo10 == 7 || modulo10 == 8 || modulo10 == 9) || (modulo100 == 11 || modulo100 == 12 || modulo100 == 13 || modulo100 == 14)){
+		return many;
+	} else {
+		return other;
+	}
+};
+
+Locale.define('ru-RU', 'Date', {
+
+	months: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'],
+	months_abbr: ['янв', 'февр', 'март', 'апр', 'май','июнь','июль','авг','сент','окт','нояб','дек'],
+	days: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'],
+	days_abbr: ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'меньше минуты назад',
+	minuteAgo: 'минуту назад',
+	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'минуту', 'минуты', 'минут') + ' назад'; },
+	hourAgo: 'час назад',
+	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ' назад'; },
+	dayAgo: 'вчера',
+	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'день', 'дня', 'дней') + ' назад'; },
+	weekAgo: 'неделю назад',
+	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'неделя', 'недели', 'недель') + ' назад'; },
+	monthAgo: 'месяц назад',
+	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'месяц', 'месяца', 'месецев') + ' назад'; },
+	yearAgo: 'год назад',
+	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'год', 'года', 'лет') + ' назад'; },
+
+	lessThanMinuteUntil: 'меньше чем через минуту',
+	minuteUntil: 'через минуту',
+	minutesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ''; },
+	hourUntil: 'через час',
+	hoursUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ''; },
+	dayUntil: 'завтра',
+	daysUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'день', 'дня', 'дней') + ''; },
+	weekUntil: 'через неделю',
+	weeksUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'неделю', 'недели', 'недель') + ''; },
+	monthUntil: 'через месяц',
+	monthsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'месяц', 'месяца', 'месецев') + ''; },
+	yearUntil: 'через',
+	yearsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'год', 'года', 'лет') + ''; }
+
+});
+
+
+
+})();
+
+
+/*
+---
+
+name: Locale.ru-RU-unicode.Form.Validator
+
+description: Form Validator messages for Russian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Chernodarov Egor
+
+requires:
+  - /Locale
+
+provides: [Locale.ru-RU.Form.Validator]
+
+...
+*/
+
+Locale.define('ru-RU', 'FormValidator', {
+
+	required: 'Это поле обязательно к заполнению.',
+	minLength: 'Пожалуйста, введите хотя бы {minLength} символов (Вы ввели {length}).',
+	maxLength: 'Пожалуйста, введите не больше {maxLength} символов (Вы ввели {length}).',
+	integer: 'Пожалуйста, введите в это поле число. Дробные числа (например 1.25) тут не разрешены.',
+	numeric: 'Пожалуйста, введите в это поле число (например "1" или "1.1", или "-1", или "-1.1").',
+	digits: 'В этом поле Вы можете использовать только цифры и знаки пунктуации (например, телефонный номер со знаками дефиса или с точками).',
+	alpha: 'В этом поле можно использовать только латинские буквы (a-z). Пробелы и другие символы запрещены.',
+	alphanum: 'В этом поле можно использовать только латинские буквы (a-z) и цифры (0-9). Пробелы и другие символы запрещены.',
+	dateSuchAs: 'Пожалуйста, введите корректную дату {date}',
+	dateInFormatMDY: 'Пожалуйста, введите дату в формате ММ/ДД/ГГГГ (например "12/31/1999")',
+	email: 'Пожалуйста, введите корректный емейл-адрес. Для примера "fred@domain.com".',
+	url: 'Пожалуйста, введите правильную ссылку вида http://www.example.com.',
+	currencyDollar: 'Пожалуйста, введите сумму в долларах. Например: $100.00 .',
+	oneRequired: 'Пожалуйста, выберите хоть что-нибудь в одном из этих полей.',
+	errorPrefix: 'Ошибка: ',
+	warningPrefix: 'Внимание: '
+
+});
+
+
+
+
+/*
+---
+
+name: Locale.si-SI.Date
+
+description: Date messages for Slovenian.
+
+license: MIT-style license
+
+authors:
+  - Radovan Lozej
+
+requires:
+  - /Locale
+
+provides: [Locale.si-SI.Date]
+
+...
+*/
+
+(function(){
+
+var pluralize = function(n, one, two, three, other){
+	return (n >= 1 && n <= 3) ? arguments[n] : other;
+};
+
+Locale.define('si-SI', 'Date', {
+
+	months: ['januar', 'februar', 'marec', 'april', 'maj', 'junij', 'julij', 'avgust', 'september', 'oktober', 'november', 'december'],
+	months_abbr: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep', 'okt', 'nov', 'dec'],
+	days: ['nedelja', 'ponedeljek', 'torek', 'sreda', 'četrtek', 'petek', 'sobota'],
+	days_abbr: ['ned', 'pon', 'tor', 'sre', 'čet', 'pet', 'sob'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H.%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'manj kot minuto nazaj',
+	minuteAgo: 'minuto nazaj',
+	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'minuto', 'minuti', 'minute', 'minut') + ' nazaj'; },
+	hourAgo: 'uro nazaj',
+	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'uro', 'uri', 'ure', 'ur') + ' nazaj'; },
+	dayAgo: 'dan nazaj',
+	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'dan', 'dneva', 'dni', 'dni') + ' nazaj'; },
+	weekAgo: 'teden nazaj',
+	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'teden', 'tedna', 'tedne', 'tednov') + ' nazaj'; },
+	monthAgo: 'mesec nazaj',
+	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'mesec', 'meseca', 'mesece', 'mesecov') + ' nazaj'; },
+	yearthAgo: 'leto nazaj',
+	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'leto', 'leti', 'leta', 'let') + ' nazaj'; },
+
+	lessThanMinuteUntil: 'še manj kot minuto',
+	minuteUntil: 'še minuta',
+	minutesUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'minuta', 'minuti', 'minute', 'minut'); },
+	hourUntil: 'še ura',
+	hoursUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'ura', 'uri', 'ure', 'ur'); },
+	dayUntil: 'še dan',
+	daysUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'dan', 'dneva', 'dnevi', 'dni'); },
+	weekUntil: 'še tedn',
+	weeksUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'teden', 'tedna', 'tedni', 'tednov'); },
+	monthUntil: 'še mesec',
+	monthsUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'mesec', 'meseca', 'meseci', 'mesecov'); },
+	yearUntil: 'še leto',
+	yearsUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'leto', 'leti', 'leta', 'let'); }
+
+});
+
+})();
+
+
+/*
+---
+
+name: Locale.si-SI.Form.Validator
+
+description: Form Validator messages for Slovenian.
+
+license: MIT-style license
+
+authors:
+  - Radovan Lozej
+
+requires:
+  - /Locale
+
+provides: [Locale.si-SI.Form.Validator]
+
+...
+*/
+
+Locale.define('si-SI', 'FormValidator', {
+
+	required: 'To polje je obvezno',
+	minLength: 'Prosim, vnesite vsaj {minLength} znakov (vnesli ste {length} znakov).',
+	maxLength: 'Prosim, ne vnesite več kot {maxLength} znakov (vnesli ste {length} znakov).',
+	integer: 'Prosim, vnesite celo število. Decimalna števila (kot 1,25) niso dovoljena.',
+	numeric: 'Prosim, vnesite samo numerične vrednosti (kot "1" ali "1.1" ali "-1" ali "-1.1").',
+	digits: 'Prosim, uporabite številke in ločila le na tem polju (na primer, dovoljena je telefonska številka z pomišlaji ali pikami).',
+	alpha: 'Prosim, uporabite le črke v tem plju. Presledki in drugi znaki niso dovoljeni.',
+	alphanum: 'Prosim, uporabite samo črke ali številke v tem polju. Presledki in drugi znaki niso dovoljeni.',
+	dateSuchAs: 'Prosim, vnesite pravilen datum kot {date}',
+	dateInFormatMDY: 'Prosim, vnesite pravilen datum kot MM.DD.YYYY (primer "12.31.1999")',
+	email: 'Prosim, vnesite pravilen email naslov. Na primer "fred@domain.com".',
+	url: 'Prosim, vnesite pravilen URL kot http://www.example.com.',
+	currencyDollar: 'Prosim, vnesit epravilno vrednost €. Primer 100,00€ .',
+	oneRequired: 'Prosimo, vnesite nekaj za vsaj eno izmed teh polj.',
+	errorPrefix: 'Napaka: ',
+	warningPrefix: 'Opozorilo: ',
+
+	// Form.Validator.Extras
+	noSpace: 'To vnosno polje ne dopušča presledkov.',
+	reqChkByNode: 'Nič niste izbrali.',
+	requiredChk: 'To polje je obvezno',
+	reqChkByName: 'Prosim, izberite {label}.',
+	match: 'To polje se mora ujemati z poljem {matchName}',
+	startDate: 'datum začetka',
+	endDate: 'datum konca',
+	currendDate: 'trenuten datum',
+	afterDate: 'Datum bi moral biti isti ali po {label}.',
+	beforeDate: 'Datum bi moral biti isti ali pred {label}.',
+	startMonth: 'Prosim, vnesite začetni datum',
+	sameMonth: 'Ta dva datuma morata biti v istem mesecu - premeniti morate eno ali drugo.',
+	creditcard: 'Številka kreditne kartice ni pravilna. Preverite številko ali poskusite še enkrat. Vnešenih {length} znakov.'
+
+});
+
+
+/*
+---
+
+name: Locale.sv-SE.Date
+
+description: Date messages for Swedish.
+
+license: MIT-style license
+
+authors:
+  - Martin Lundgren
+
+requires:
+  - /Locale
+
+provides: [Locale.sv-SE.Date]
+
+...
+*/
+
+Locale.define('sv-SE', 'Date', {
+
+	months: ['januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december'],
+	months_abbr: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
+	days: ['söndag', 'måndag', 'tisdag', 'onsdag', 'torsdag', 'fredag', 'lördag'],
+	days_abbr: ['sön', 'mån', 'tis', 'ons', 'tor', 'fre', 'lör'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%H:%M',
+	AM: '',
+	PM: '',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'mindre än en minut sedan',
+	minuteAgo: 'ungefär en minut sedan',
+	minutesAgo: '{delta} minuter sedan',
+	hourAgo: 'ungefär en timme sedan',
+	hoursAgo: 'ungefär {delta} timmar sedan',
+	dayAgo: '1 dag sedan',
+	daysAgo: '{delta} dagar sedan',
+
+	lessThanMinuteUntil: 'mindre än en minut sedan',
+	minuteUntil: 'ungefär en minut sedan',
+	minutesUntil: '{delta} minuter sedan',
+	hourUntil: 'ungefär en timme sedan',
+	hoursUntil: 'ungefär {delta} timmar sedan',
+	dayUntil: '1 dag sedan',
+	daysUntil: '{delta} dagar sedan'
+
+});
+
+
+/*
+---
+
+name: Locale.sv-SE.Form.Validator
+
+description: Form Validator messages for Swedish.
+
+license: MIT-style license
+
+authors:
+  - Martin Lundgren
+
+requires:
+  - /Locale
+
+provides: [Locale.sv-SE.Form.Validator]
+
+...
+*/
+
+Locale.define('sv-SE', 'FormValidator', {
+
+	required: 'Fältet är obligatoriskt.',
+	minLength: 'Ange minst {minLength} tecken (du angav {length} tecken).',
+	maxLength: 'Ange högst {maxLength} tecken (du angav {length} tecken). ',
+	integer: 'Ange ett heltal i fältet. Tal med decimaler (t.ex. 1,25) är inte tillåtna.',
+	numeric: 'Ange endast numeriska värden i detta fält (t.ex. "1" eller "1.1" eller "-1" eller "-1,1").',
+	digits: 'Använd endast siffror och skiljetecken i detta fält (till exempel ett telefonnummer med bindestreck tillåtet).',
+	alpha: 'Använd endast bokstäver (a-ö) i detta fält. Inga mellanslag eller andra tecken är tillåtna.',
+	alphanum: 'Använd endast bokstäver (a-ö) och siffror (0-9) i detta fält. Inga mellanslag eller andra tecken är tillåtna.',
+	dateSuchAs: 'Ange ett giltigt datum som t.ex. {date}',
+	dateInFormatMDY: 'Ange ett giltigt datum som t.ex. YYYY-MM-DD (i.e. "1999-12-31")',
+	email: 'Ange en giltig e-postadress. Till exempel "erik@domain.com".',
+	url: 'Ange en giltig webbadress som http://www.example.com.',
+	currencyDollar: 'Ange en giltig belopp. Exempelvis 100,00.',
+	oneRequired: 'Vänligen ange minst ett av dessa alternativ.',
+	errorPrefix: 'Fel: ',
+	warningPrefix: 'Varning: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Det får inte finnas några mellanslag i detta fält.',
+	reqChkByNode: 'Inga objekt är valda.',
+	requiredChk: 'Detta är ett obligatoriskt fält.',
+	reqChkByName: 'Välj en {label}.',
+	match: 'Detta fält måste matcha {matchName}',
+	startDate: 'startdatumet',
+	endDate: 'slutdatum',
+	currendDate: 'dagens datum',
+	afterDate: 'Datumet bör vara samma eller senare än {label}.',
+	beforeDate: 'Datumet bör vara samma eller tidigare än {label}.',
+	startMonth: 'Välj en start månad',
+	sameMonth: 'Dessa två datum måste vara i samma månad - du måste ändra det ena eller det andra.'
+
+});
+
+
+/*
+---
+
+name: Locale.uk-UA.Date
+
+description: Date messages for Ukrainian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Slik
+
+requires:
+  - /Locale
+
+provides: [Locale.uk-UA.Date]
+
+...
+*/
+
+(function(){
+
+var pluralize = function(n, one, few, many, other){
+	var d = (n / 10).toInt(),
+		z = n % 10,
+		s = (n / 100).toInt();
+
+	if (d == 1 && n > 10) return many;
+	if (z == 1) return one;
+	if (z > 0 && z < 5) return few;
+	return many;
+};
+
+Locale.define('uk-UA', 'Date', {
+
+	months: ['Січень', 'Лютий', 'Березень', 'Квітень', 'Травень', 'Червень', 'Липень', 'Серпень', 'Вересень', 'Жовтень', 'Листопад', 'Грудень'],
+	months_abbr: ['Січ', 'Лют', 'Бер', 'Квіт', 'Трав', 'Черв', 'Лип', 'Серп', 'Вер', 'Жовт', 'Лист', 'Груд' ],
+	days: ['Неділя', 'Понеділок', 'Вівторок', 'Середа', 'Четвер', "П'ятниця", 'Субота'],
+	days_abbr: ['Нд', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'до полудня',
+	PM: 'по полудню',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'меньше хвилини тому',
+	minuteAgo: 'хвилину тому',
+	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'хвилину', 'хвилини', 'хвилин') + ' тому'; },
+	hourAgo: 'годину тому',
+	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'годину', 'години', 'годин') + ' тому'; },
+	dayAgo: 'вчора',
+	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'день', 'дня', 'днів') + ' тому'; },
+	weekAgo: 'тиждень тому',
+	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'тиждень', 'тижні', 'тижнів') + ' тому'; },
+	monthAgo: 'місяць тому',
+	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'місяць', 'місяці', 'місяців') + ' тому'; },
+	yearAgo: 'рік тому',
+	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'рік', 'роки', 'років') + ' тому'; },
+
+	lessThanMinuteUntil: 'за мить',
+	minuteUntil: 'через хвилину',
+	minutesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'хвилину', 'хвилини', 'хвилин'); },
+	hourUntil: 'через годину',
+	hoursUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'годину', 'години', 'годин'); },
+	dayUntil: 'завтра',
+	daysUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'день', 'дня', 'днів'); },
+	weekUntil: 'через тиждень',
+	weeksUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'тиждень', 'тижні', 'тижнів'); },
+	monthUntil: 'через місяць',
+	monthesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'місяць', 'місяці', 'місяців'); },
+	yearUntil: 'через рік',
+	yearsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'рік', 'роки', 'років'); }
+
+});
+
+})();
+
+
+/*
+---
+
+name: Locale.uk-UA.Form.Validator
+
+description: Form Validator messages for Ukrainian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Slik
+
+requires:
+  - /Locale
+
+provides: [Locale.uk-UA.Form.Validator]
+
+...
+*/
+
+Locale.define('uk-UA', 'FormValidator', {
+
+	required: 'Це поле повинне бути заповненим.',
+	minLength: 'Введіть хоча б {minLength} символів (Ви ввели {length}).',
+	maxLength: 'Кількість символів не може бути більше {maxLength} (Ви ввели {length}).',
+	integer: 'Введіть в це поле число. Дробові числа (наприклад 1.25) не дозволені.',
+	numeric: 'Введіть в це поле число (наприклад "1" або "1.1", або "-1", або "-1.1").',
+	digits: 'В цьому полі ви можете використовувати лише цифри і знаки пунктіації (наприклад, телефонний номер з знаками дефізу або з крапками).',
+	alpha: 'В цьому полі можна використовувати лише латинські літери (a-z). Пробіли і інші символи заборонені.',
+	alphanum: 'В цьому полі можна використовувати лише латинські літери (a-z) і цифри (0-9). Пробіли і інші символи заборонені.',
+	dateSuchAs: 'Введіть коректну дату {date}.',
+	dateInFormatMDY: 'Введіть дату в форматі ММ/ДД/РРРР (наприклад "12/31/2009").',
+	email: 'Введіть коректну адресу електронної пошти (наприклад "name@domain.com").',
+	url: 'Введіть коректне інтернет-посилання (наприклад http://www.example.com).',
+	currencyDollar: 'Введіть суму в доларах (наприклад "$100.00").',
+	oneRequired: 'Заповніть одне з полів.',
+	errorPrefix: 'Помилка: ',
+	warningPrefix: 'Увага: ',
+
+	noSpace: 'Пробіли заборонені.',
+	reqChkByNode: 'Не відмічено жодного варіанту.',
+	requiredChk: 'Це поле повинне бути віміченим.',
+	reqChkByName: 'Будь ласка, відмітьте {label}.',
+	match: 'Це поле повинно відповідати {matchName}',
+	startDate: 'початкова дата',
+	endDate: 'кінцева дата',
+	currendDate: 'сьогоднішня дата',
+	afterDate: 'Ця дата повинна бути такою ж, або пізнішою за {label}.',
+	beforeDate: 'Ця дата повинна бути такою ж, або ранішою за {label}.',
+	startMonth: 'Будь ласка, виберіть початковий місяць',
+	sameMonth: 'Ці дати повинні відноситись одного і того ж місяця. Будь ласка, змініть одну з них.',
+	creditcard: 'Номер кредитної карти введений неправильно. Будь ласка, перевірте його. Введено {length} символів.'
+
+});
+
+
+/*
+---
+
+name: Locale.zh-CH.Date
+
+description: Date messages for Chinese (simplified and traditional).
+
+license: MIT-style license
+
+authors:
+  - YMind Chan
+
+requires:
+  - /Locale
+
+provides: [Locale.zh-CH.Date]
+
+...
+*/
+
+// Simplified Chinese
+Locale.define('zh-CHS', 'Date', {
+
+	months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+	months_abbr: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
+	days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+	days_abbr: ['日', '一', '二', '三', '四', '五', '六'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%I:%M%p',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: '不到1分钟前',
+	minuteAgo: '大约1分钟前',
+	minutesAgo: '{delta}分钟之前',
+	hourAgo: '大约1小时前',
+	hoursAgo: '大约{delta}小时前',
+	dayAgo: '1天前',
+	daysAgo: '{delta}天前',
+	weekAgo: '1星期前',
+	weeksAgo: '{delta}星期前',
+	monthAgo: '1个月前',
+	monthsAgo: '{delta}个月前',
+	yearAgo: '1年前',
+	yearsAgo: '{delta}年前',
+
+	lessThanMinuteUntil: '从现在开始不到1分钟',
+	minuteUntil: '从现在开始約1分钟',
+	minutesUntil: '从现在开始约{delta}分钟',
+	hourUntil: '从现在开始1小时',
+	hoursUntil: '从现在开始约{delta}小时',
+	dayUntil: '从现在开始1天',
+	daysUntil: '从现在开始{delta}天',
+	weekUntil: '从现在开始1星期',
+	weeksUntil: '从现在开始{delta}星期',
+	monthUntil: '从现在开始一个月',
+	monthsUntil: '从现在开始{delta}个月',
+	yearUntil: '从现在开始1年',
+	yearsUntil: '从现在开始{delta}年'
+
+});
+
+// Traditional Chinese
+Locale.define('zh-CHT', 'Date', {
+
+	months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+	months_abbr: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
+	days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+	days_abbr: ['日', '一', '二', '三', '四', '五', '六'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%I:%M%p',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: '不到1分鐘前',
+	minuteAgo: '大約1分鐘前',
+	minutesAgo: '{delta}分鐘之前',
+	hourAgo: '大約1小時前',
+	hoursAgo: '大約{delta}小時前',
+	dayAgo: '1天前',
+	daysAgo: '{delta}天前',
+	weekAgo: '1星期前',
+	weeksAgo: '{delta}星期前',
+	monthAgo: '1个月前',
+	monthsAgo: '{delta}个月前',
+	yearAgo: '1年前',
+	yearsAgo: '{delta}年前',
+
+	lessThanMinuteUntil: '從現在開始不到1分鐘',
+	minuteUntil: '從現在開始約1分鐘',
+	minutesUntil: '從現在開始約{delta}分鐘',
+	hourUntil: '從現在開始1小時',
+	hoursUntil: '從現在開始約{delta}小時',
+	dayUntil: '從現在開始1天',
+	daysUntil: '從現在開始{delta}天',
+	weekUntil: '從現在開始1星期',
+	weeksUntil: '從現在開始{delta}星期',
+	monthUntil: '從現在開始一個月',
+	monthsUntil: '從現在開始{delta}個月',
+	yearUntil: '從現在開始1年',
+	yearsUntil: '從現在開始{delta}年'
+
+});
+
+
+/*
+---
+
+name: Locale.zh-CH.Form.Validator
+
+description: Form Validator messages for Chinese (simplified and traditional).
+
+license: MIT-style license
+
+authors:
+  - YMind Chan
+
+requires:
+  - /Locale
+  - /Form.Validator
+
+provides: [Form.zh-CH.Form.Validator, Form.Validator.CurrencyYuanValidator]
+
+...
+*/
+
+// Simplified Chinese
+Locale.define('zh-CHS', 'FormValidator', {
+
+	required: '此项必填。',
+	minLength: '请至少输入 {minLength} 个字符 (已输入 {length} 个)。',
+	maxLength: '最多只能输入 {maxLength} 个字符 (已输入 {length} 个)。',
+	integer: '请输入一个整数，不能包含小数点。例如："1", "200"。',
+	numeric: '请输入一个数字，例如："1", "1.1", "-1", "-1.1"。',
+	digits: '请输入由数字和标点符号组成的内容。例如电话号码。',
+	alpha: '请输入 A-Z 的 26 个字母，不能包含空格或任何其他字符。',
+	alphanum: '请输入 A-Z 的 26 个字母或 0-9 的 10 个数字，不能包含空格或任何其他字符。',
+	dateSuchAs: '请输入合法的日期格式，如：{date}。',
+	dateInFormatMDY: '请输入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。',
+	email: '请输入合法的电子信箱地址，例如："fred@domain.com"。',
+	url: '请输入合法的 Url 地址，例如：http://www.example.com。',
+	currencyDollar: '请输入合法的货币符号，例如：￥100.0',
+	oneRequired: '请至少选择一项。',
+	errorPrefix: '错误：',
+	warningPrefix: '警告：',
+
+	// Form.Validator.Extras
+	noSpace: '不能包含空格。',
+	reqChkByNode: '未选择任何内容。',
+	requiredChk: '此项必填。',
+	reqChkByName: '请选择 {label}.',
+	match: '必须与{matchName}相匹配',
+	startDate: '起始日期',
+	endDate: '结束日期',
+	currendDate: '当前日期',
+	afterDate: '日期必须等于或晚于 {label}.',
+	beforeDate: '日期必须早于或等于 {label}.',
+	startMonth: '请选择起始月份',
+	sameMonth: '您必须修改两个日期中的一个，以确保它们在同一月份。',
+	creditcard: '您输入的信用卡号码不正确。当前已输入{length}个字符。'
+
+});
+
+// Traditional Chinese
+Locale.define('zh-CHT', 'FormValidator', {
+
+	required: '此項必填。 ',
+	minLength: '請至少輸入{minLength} 個字符(已輸入{length} 個)。 ',
+	maxLength: '最多只能輸入{maxLength} 個字符(已輸入{length} 個)。 ',
+	integer: '請輸入一個整數，不能包含小數點。例如："1", "200"。 ',
+	numeric: '請輸入一個數字，例如："1", "1.1", "-1", "-1.1"。 ',
+	digits: '請輸入由數字和標點符號組成的內容。例如電話號碼。 ',
+	alpha: '請輸入AZ 的26 個字母，不能包含空格或任何其他字符。 ',
+	alphanum: '請輸入AZ 的26 個字母或0-9 的10 個數字，不能包含空格或任何其他字符。 ',
+	dateSuchAs: '請輸入合法的日期格式，如：{date}。 ',
+	dateInFormatMDY: '請輸入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。 ',
+	email: '請輸入合法的電子信箱地址，例如："fred@domain.com"。 ',
+	url: '請輸入合法的Url 地址，例如：http://www.example.com。 ',
+	currencyDollar: '請輸入合法的貨幣符號，例如：￥100.0',
+	oneRequired: '請至少選擇一項。 ',
+	errorPrefix: '錯誤：',
+	warningPrefix: '警告：',
+
+	// Form.Validator.Extras
+	noSpace: '不能包含空格。 ',
+	reqChkByNode: '未選擇任何內容。 ',
+	requiredChk: '此項必填。 ',
+	reqChkByName: '請選擇 {label}.',
+	match: '必須與{matchName}相匹配',
+	startDate: '起始日期',
+	endDate: '結束日期',
+	currendDate: '當前日期',
+	afterDate: '日期必須等於或晚於{label}.',
+	beforeDate: '日期必須早於或等於{label}.',
+	startMonth: '請選擇起始月份',
+	sameMonth: '您必須修改兩個日期中的一個，以確保它們在同一月份。 ',
+	creditcard: '您輸入的信用卡號碼不正確。當前已輸入{length}個字符。 '
+
+});
+
+Form.Validator.add('validate-currency-yuan', {
+
+	errorMsg: function(){
+		return Form.Validator.getMsg('currencyYuan');
+	},
+
+	test: function(element){
+		// [￥]1[##][,###]+[.##]
+		// [￥]1###+[.##]
+		// [￥]0.##
+		// [￥].##
+		return Form.Validator.getValidator('IsEmpty').test(element) || (/^￥?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(element.get('value'));
+	}
+
+});
+
diff --git a/core/media/system/js/mootools-more.js b/core/media/system/js/mootools-more.js
new file mode 100644
index 00000000..923b0c36
--- /dev/null
+++ b/core/media/system/js/mootools-more.js
@@ -0,0 +1,820 @@
+// MooTools: the javascript framework.
+// Load this file's selection again by visiting: http://mootools.net/more/065f2f092ece4e3b32bb5214464cf926 
+// Or build this file again with packager using: packager build More/More More/Events.Pseudos More/Class.Refactor More/Class.Binds More/Class.Occlude More/Chain.Wait More/Array.Extras More/Date More/Date.Extras More/Number.Format More/Object.Extras More/String.Extras More/String.QueryString More/URI More/URI.Relative More/Hash More/Hash.Extras More/Element.Forms More/Elements.From More/Element.Event.Pseudos More/Element.Event.Pseudos.Keys More/Element.Measure More/Element.Pin More/Element.Position More/Element.Shortcuts More/Form.Request More/Form.Request.Append More/Form.Validator More/Form.Validator.Inline More/Form.Validator.Extras More/OverText More/Fx.Elements More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Scroll More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag More/Drag.Move More/Slider More/Sortables More/Request.JSONP More/Request.Queue More/Request.Periodical More/Assets More/Color More/Group More/Hash.Cookie More/IframeShim More/Table More/HtmlTable More/HtmlTable.Zebra More/HtmlTable.Sort More/HtmlTable.Select More/Keyboard More/Keyboard.Extras More/Mask More/Scroller More/Tips More/Spinner More/Locale More/Locale.Set.From More/Locale.en-US.Date More/Locale.en-US.Form.Validator More/Locale.en-US.Number More/Locale.ar.Date More/Locale.ar.Form.Validator More/Locale.ca-CA.Date More/Locale.ca-CA.Form.Validator More/Locale.cs-CZ.Date More/Locale.cs-CZ.Form.Validator More/Locale.da-DK.Date More/Locale.da-DK.Form.Validator More/Locale.de-CH.Date More/Locale.de-CH.Form.Validator More/Locale.de-DE.Date More/Locale.de-DE.Form.Validator More/Locale.de-DE.Number More/Locale.en-GB.Date More/Locale.es-AR.Date More/Locale.es-AR.Form.Validator More/Locale.es-ES.Date More/Locale.es-ES.Form.Validator More/Locale.et-EE.Date More/Locale.et-EE.Form.Validator More/Locale.EU.Number More/Locale.fa.Date More/Locale.fa.Form.Validator More/Locale.fi-FI.Date More/Locale.fi-FI.Form.Validator More/Locale.fi-FI.Number More/Locale.fr-FR.Date More/Locale.fr-FR.Form.Validator More/Locale.fr-FR.Number More/Locale.he-IL.Date More/Locale.he-IL.Form.Validator More/Locale.he-IL.Number More/Locale.hu-HU.Date More/Locale.hu-HU.Form.Validator More/Locale.it-IT.Date More/Locale.it-IT.Form.Validator More/Locale.ja-JP.Date More/Locale.ja-JP.Form.Validator More/Locale.ja-JP.Number More/Locale.nl-NL.Date More/Locale.nl-NL.Form.Validator More/Locale.nl-NL.Number More/Locale.no-NO.Date More/Locale.no-NO.Form.Validator More/Locale.pl-PL.Date More/Locale.pl-PL.Form.Validator More/Locale.pt-BR.Date More/Locale.pt-BR.Form.Validator More/Locale.pt-PT.Date More/Locale.pt-PT.Form.Validator More/Locale.ru-RU-unicode.Date More/Locale.ru-RU-unicode.Form.Validator More/Locale.si-SI.Date More/Locale.si-SI.Form.Validator More/Locale.sv-SE.Date More/Locale.sv-SE.Form.Validator More/Locale.uk-UA.Date More/Locale.uk-UA.Form.Validator More/Locale.zh-CH.Date More/Locale.zh-CH.Form.Validator
+/*
+---
+copyrights:
+  - [MooTools](http://mootools.net)
+
+licenses:
+  - [MIT License](http://mootools.net/license.txt)
+...
+*/
+MooTools.More={version:"1.4.0.1",build:"a4244edf2aa97ac8a196fc96082dd35af1abab87"};(function(){Events.Pseudos=function(h,e,f){var d="_monitorEvents:";var c=function(i){return{store:i.store?function(j,k){i.store(d+j,k);
+}:function(j,k){(i._monitorEvents||(i._monitorEvents={}))[j]=k;},retrieve:i.retrieve?function(j,k){return i.retrieve(d+j,k);}:function(j,k){if(!i._monitorEvents){return k;
+}return i._monitorEvents[j]||k;}};};var g=function(k){if(k.indexOf(":")==-1||!h){return null;}var j=Slick.parse(k).expressions[0][0],p=j.pseudos,i=p.length,o=[];
+while(i--){var n=p[i].key,m=h[n];if(m!=null){o.push({event:j.tag,value:p[i].value,pseudo:n,original:k,listener:m});}}return o.length?o:null;};return{addEvent:function(m,p,j){var n=g(m);
+if(!n){return e.call(this,m,p,j);}var k=c(this),r=k.retrieve(m,[]),i=n[0].event,l=Array.slice(arguments,2),o=p,q=this;n.each(function(s){var t=s.listener,u=o;
+if(t==false){i+=":"+s.pseudo+"("+s.value+")";}else{o=function(){t.call(q,s,u,arguments,o);};}});r.include({type:i,event:p,monitor:o});k.store(m,r);if(m!=i){e.apply(this,[m,p].concat(l));
+}return e.apply(this,[i,o].concat(l));},removeEvent:function(m,l){var k=g(m);if(!k){return f.call(this,m,l);}var n=c(this),j=n.retrieve(m);if(!j){return this;
+}var i=Array.slice(arguments,2);f.apply(this,[m,l].concat(i));j.each(function(o,p){if(!l||o.event==l){f.apply(this,[o.type,o.monitor].concat(i));}delete j[p];
+},this);n.store(m,j);return this;}};};var b={once:function(e,f,d,c){f.apply(this,d);this.removeEvent(e.event,c).removeEvent(e.original,f);},throttle:function(d,e,c){if(!e._throttled){e.apply(this,c);
+e._throttled=setTimeout(function(){e._throttled=false;},d.value||250);}},pause:function(d,e,c){clearTimeout(e._pause);e._pause=e.delay(d.value||250,this,c);
+}};Events.definePseudo=function(c,d){b[c]=d;return this;};Events.lookupPseudo=function(c){return b[c];};var a=Events.prototype;Events.implement(Events.Pseudos(b,a.addEvent,a.removeEvent));
+["Request","Fx"].each(function(c){if(this[c]){this[c].implement(Events.prototype);}});})();Class.refactor=function(b,a){Object.each(a,function(e,d){var c=b.prototype[d];
+c=(c&&c.$origin)||c||function(){};b.implement(d,(typeof e=="function")?function(){var f=this.previous;this.previous=c;var g=e.apply(this,arguments);this.previous=f;
+return g;}:e);});return b;};Class.Mutators.Binds=function(a){if(!this.prototype.initialize){this.implement("initialize",function(){});}return Array.from(a).concat(this.prototype.Binds||[]);
+};Class.Mutators.initialize=function(a){return function(){Array.from(this.Binds).each(function(b){var c=this[b];if(c){this[b]=c.bind(this);}},this);return a.apply(this,arguments);
+};};Class.Occlude=new Class({occlude:function(c,b){b=document.id(b||this.element);var a=b.retrieve(c||this.property);if(a&&!this.occluded){return(this.occluded=a);
+}this.occluded=false;b.store(c||this.property,this);return this.occluded;}});(function(){var a={wait:function(b){return this.chain(function(){this.callChain.delay(b==null?500:b,this);
+return this;}.bind(this));}};Chain.implement(a);if(this.Fx){Fx.implement(a);}if(this.Element&&Element.implement&&this.Fx){Element.implement({chains:function(b){Array.from(b||["tween","morph","reveal"]).each(function(c){c=this.get(c);
+if(!c){return;}c.setOptions({link:"chain"});},this);return this;},pauseFx:function(c,b){this.chains(b).get(b||"tween").wait(c);return this;}});}})();(function(a){Array.implement({min:function(){return Math.min.apply(null,this);
+},max:function(){return Math.max.apply(null,this);},average:function(){return this.length?this.sum()/this.length:0;},sum:function(){var b=0,c=this.length;
+if(c){while(c--){b+=this[c];}}return b;},unique:function(){return[].combine(this);},shuffle:function(){for(var c=this.length;c&&--c;){var b=this[c],d=Math.floor(Math.random()*(c+1));
+this[c]=this[d];this[d]=b;}return this;},reduce:function(d,e){for(var c=0,b=this.length;c<b;c++){if(c in this){e=e===a?this[c]:d.call(null,e,this[c],c,this);
+}}return e;},reduceRight:function(c,d){var b=this.length;while(b--){if(b in this){d=d===a?this[b]:c.call(null,d,this[b],b,this);}}return d;}});})();(function(){var b=function(c){return c!=null;
+};var a=Object.prototype.hasOwnProperty;Object.extend({getFromPath:function(e,f){if(typeof f=="string"){f=f.split(".");}for(var d=0,c=f.length;d<c;d++){if(a.call(e,f[d])){e=e[f[d]];
+}else{return null;}}return e;},cleanValues:function(c,e){e=e||b;for(var d in c){if(!e(c[d])){delete c[d];}}return c;},erase:function(c,d){if(a.call(c,d)){delete c[d];
+}return c;},run:function(d){var c=Array.slice(arguments,1);for(var e in d){if(d[e].apply){d[e].apply(d,c);}}return d;}});})();(function(){var b=null,a={},d={};
+var c=function(f){if(instanceOf(f,e.Set)){return f;}else{return a[f];}};var e=this.Locale={define:function(f,j,h,i){var g;if(instanceOf(f,e.Set)){g=f.name;
+if(g){a[g]=f;}}else{g=f;if(!a[g]){a[g]=new e.Set(g);}f=a[g];}if(j){f.define(j,h,i);}if(!b){b=f;}return f;},use:function(f){f=c(f);if(f){b=f;this.fireEvent("change",f);
+}return this;},getCurrent:function(){return b;},get:function(g,f){return(b)?b.get(g,f):"";},inherit:function(f,g,h){f=c(f);if(f){f.inherit(g,h);}return this;
+},list:function(){return Object.keys(a);}};Object.append(e,new Events);e.Set=new Class({sets:{},inherits:{locales:[],sets:{}},initialize:function(f){this.name=f||"";
+},define:function(i,g,h){var f=this.sets[i];if(!f){f={};}if(g){if(typeOf(g)=="object"){f=Object.merge(f,g);}else{f[g]=h;}}this.sets[i]=f;return this;},get:function(r,j,q){var p=Object.getFromPath(this.sets,r);
+if(p!=null){var m=typeOf(p);if(m=="function"){p=p.apply(null,Array.from(j));}else{if(m=="object"){p=Object.clone(p);}}return p;}var h=r.indexOf("."),o=h<0?r:r.substr(0,h),k=(this.inherits.sets[o]||[]).combine(this.inherits.locales).include("en-US");
+if(!q){q=[];}for(var g=0,f=k.length;g<f;g++){if(q.contains(k[g])){continue;}q.include(k[g]);var n=a[k[g]];if(!n){continue;}p=n.get(r,j,q);if(p!=null){return p;
+}}return"";},inherit:function(g,h){g=Array.from(g);if(h&&!this.inherits.sets[h]){this.inherits.sets[h]=[];}var f=g.length;while(f--){(h?this.inherits.sets[h]:this.inherits.locales).unshift(g[f]);
+}return this;}});})();Locale.define("en-US","Date",{months:["January","February","March","April","May","June","July","August","September","October","November","December"],months_abbr:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],days_abbr:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dateOrder:["month","date","year"],shortDate:"%m/%d/%Y",shortTime:"%I:%M%p",AM:"AM",PM:"PM",firstDayOfWeek:0,ordinal:function(a){return(a>3&&a<21)?"th":["th","st","nd","rd","th"][Math.min(a%10,4)];
+},lessThanMinuteAgo:"less than a minute ago",minuteAgo:"about a minute ago",minutesAgo:"{delta} minutes ago",hourAgo:"about an hour ago",hoursAgo:"about {delta} hours ago",dayAgo:"1 day ago",daysAgo:"{delta} days ago",weekAgo:"1 week ago",weeksAgo:"{delta} weeks ago",monthAgo:"1 month ago",monthsAgo:"{delta} months ago",yearAgo:"1 year ago",yearsAgo:"{delta} years ago",lessThanMinuteUntil:"less than a minute from now",minuteUntil:"about a minute from now",minutesUntil:"{delta} minutes from now",hourUntil:"about an hour from now",hoursUntil:"about {delta} hours from now",dayUntil:"1 day from now",daysUntil:"{delta} days from now",weekUntil:"1 week from now",weeksUntil:"{delta} weeks from now",monthUntil:"1 month from now",monthsUntil:"{delta} months from now",yearUntil:"1 year from now",yearsUntil:"{delta} years from now"});
+(function(){var a=this.Date;var f=a.Methods={ms:"Milliseconds",year:"FullYear",min:"Minutes",mo:"Month",sec:"Seconds",hr:"Hours"};["Date","Day","FullYear","Hours","Milliseconds","Minutes","Month","Seconds","Time","TimezoneOffset","Week","Timezone","GMTOffset","DayOfYear","LastMonth","LastDayOfMonth","UTCDate","UTCDay","UTCFullYear","AMPM","Ordinal","UTCHours","UTCMilliseconds","UTCMinutes","UTCMonth","UTCSeconds","UTCMilliseconds"].each(function(s){a.Methods[s.toLowerCase()]=s;
+});var p=function(u,t,s){if(t==1){return u;}return u<Math.pow(10,t-1)?(s||"0")+p(u,t-1,s):u;};a.implement({set:function(u,s){u=u.toLowerCase();var t=f[u]&&"set"+f[u];
+if(t&&this[t]){this[t](s);}return this;}.overloadSetter(),get:function(t){t=t.toLowerCase();var s=f[t]&&"get"+f[t];if(s&&this[s]){return this[s]();}return null;
+}.overloadGetter(),clone:function(){return new a(this.get("time"));},increment:function(s,u){s=s||"day";u=u!=null?u:1;switch(s){case"year":return this.increment("month",u*12);
+case"month":var t=this.get("date");this.set("date",1).set("mo",this.get("mo")+u);return this.set("date",t.min(this.get("lastdayofmonth")));case"week":return this.increment("day",u*7);
+case"day":return this.set("date",this.get("date")+u);}if(!a.units[s]){throw new Error(s+" is not a supported interval");}return this.set("time",this.get("time")+u*a.units[s]());
+},decrement:function(s,t){return this.increment(s,-1*(t!=null?t:1));},isLeapYear:function(){return a.isLeapYear(this.get("year"));},clearTime:function(){return this.set({hr:0,min:0,sec:0,ms:0});
+},diff:function(t,s){if(typeOf(t)=="string"){t=a.parse(t);}return((t-this)/a.units[s||"day"](3,3)).round();},getLastDayOfMonth:function(){return a.daysInMonth(this.get("mo"),this.get("year"));
+},getDayOfYear:function(){return(a.UTC(this.get("year"),this.get("mo"),this.get("date")+1)-a.UTC(this.get("year"),0,1))/a.units.day();},setDay:function(t,s){if(s==null){s=a.getMsg("firstDayOfWeek");
+if(s===""){s=1;}}t=(7+a.parseDay(t,true)-s)%7;var u=(7+this.get("day")-s)%7;return this.increment("day",t-u);},getWeek:function(v){if(v==null){v=a.getMsg("firstDayOfWeek");
+if(v===""){v=1;}}var x=this,u=(7+x.get("day")-v)%7,t=0,w;if(v==1){var y=x.get("month"),s=x.get("date")-u;if(y==11&&s>28){return 1;}if(y==0&&s<-2){x=new a(x).decrement("day",u);
+u=0;}w=new a(x.get("year"),0,1).get("day")||7;if(w>4){t=-7;}}else{w=new a(x.get("year"),0,1).get("day");}t+=x.get("dayofyear");t+=6-u;t+=(7+w-v)%7;return(t/7);
+},getOrdinal:function(s){return a.getMsg("ordinal",s||this.get("date"));},getTimezone:function(){return this.toString().replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/,"$1").replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/,"$1$2$3");
+},getGMTOffset:function(){var s=this.get("timezoneOffset");return((s>0)?"-":"+")+p((s.abs()/60).floor(),2)+p(s%60,2);},setAMPM:function(s){s=s.toUpperCase();
+var t=this.get("hr");if(t>11&&s=="AM"){return this.decrement("hour",12);}else{if(t<12&&s=="PM"){return this.increment("hour",12);}}return this;},getAMPM:function(){return(this.get("hr")<12)?"AM":"PM";
+},parse:function(s){this.set("time",a.parse(s));return this;},isValid:function(s){if(!s){s=this;}return typeOf(s)=="date"&&!isNaN(s.valueOf());},format:function(s){if(!this.isValid()){return"invalid date";
+}if(!s){s="%x %X";}if(typeof s=="string"){s=g[s.toLowerCase()]||s;}if(typeof s=="function"){return s(this);}var t=this;return s.replace(/%([a-z%])/gi,function(v,u){switch(u){case"a":return a.getMsg("days_abbr")[t.get("day")];
+case"A":return a.getMsg("days")[t.get("day")];case"b":return a.getMsg("months_abbr")[t.get("month")];case"B":return a.getMsg("months")[t.get("month")];
+case"c":return t.format("%a %b %d %H:%M:%S %Y");case"d":return p(t.get("date"),2);case"e":return p(t.get("date"),2," ");case"H":return p(t.get("hr"),2);
+case"I":return p((t.get("hr")%12)||12,2);case"j":return p(t.get("dayofyear"),3);case"k":return p(t.get("hr"),2," ");case"l":return p((t.get("hr")%12)||12,2," ");
+case"L":return p(t.get("ms"),3);case"m":return p((t.get("mo")+1),2);case"M":return p(t.get("min"),2);case"o":return t.get("ordinal");case"p":return a.getMsg(t.get("ampm"));
+case"s":return Math.round(t/1000);case"S":return p(t.get("seconds"),2);case"T":return t.format("%H:%M:%S");case"U":return p(t.get("week"),2);case"w":return t.get("day");
+case"x":return t.format(a.getMsg("shortDate"));case"X":return t.format(a.getMsg("shortTime"));case"y":return t.get("year").toString().substr(2);case"Y":return t.get("year");
+case"z":return t.get("GMTOffset");case"Z":return t.get("Timezone");}return u;});},toISOString:function(){return this.format("iso8601");}}).alias({toJSON:"toISOString",compare:"diff",strftime:"format"});
+var k=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],h=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];var g={db:"%Y-%m-%d %H:%M:%S",compact:"%Y%m%dT%H%M%S","short":"%d %b %H:%M","long":"%B %d, %Y %H:%M",rfc822:function(s){return k[s.get("day")]+s.format(", %d ")+h[s.get("month")]+s.format(" %Y %H:%M:%S %Z");
+},rfc2822:function(s){return k[s.get("day")]+s.format(", %d ")+h[s.get("month")]+s.format(" %Y %H:%M:%S %z");},iso8601:function(s){return(s.getUTCFullYear()+"-"+p(s.getUTCMonth()+1,2)+"-"+p(s.getUTCDate(),2)+"T"+p(s.getUTCHours(),2)+":"+p(s.getUTCMinutes(),2)+":"+p(s.getUTCSeconds(),2)+"."+p(s.getUTCMilliseconds(),3)+"Z");
+}};var c=[],n=a.parse;var r=function(v,x,u){var t=-1,w=a.getMsg(v+"s");switch(typeOf(x)){case"object":t=w[x.get(v)];break;case"number":t=w[x];if(!t){throw new Error("Invalid "+v+" index: "+x);
+}break;case"string":var s=w.filter(function(y){return this.test(y);},new RegExp("^"+x,"i"));if(!s.length){throw new Error("Invalid "+v+" string");}if(s.length>1){throw new Error("Ambiguous "+v);
+}t=s[0];}return(u)?w.indexOf(t):t;};var i=1900,o=70;a.extend({getMsg:function(t,s){return Locale.get("Date."+t,s);},units:{ms:Function.from(1),second:Function.from(1000),minute:Function.from(60000),hour:Function.from(3600000),day:Function.from(86400000),week:Function.from(608400000),month:function(t,s){var u=new a;
+return a.daysInMonth(t!=null?t:u.get("mo"),s!=null?s:u.get("year"))*86400000;},year:function(s){s=s||new a().get("year");return a.isLeapYear(s)?31622400000:31536000000;
+}},daysInMonth:function(t,s){return[31,a.isLeapYear(s)?29:28,31,30,31,30,31,31,30,31,30,31][t];},isLeapYear:function(s){return((s%4===0)&&(s%100!==0))||(s%400===0);
+},parse:function(v){var u=typeOf(v);if(u=="number"){return new a(v);}if(u!="string"){return v;}v=v.clean();if(!v.length){return null;}var s;c.some(function(w){var t=w.re.exec(v);
+return(t)?(s=w.handler(t)):false;});if(!(s&&s.isValid())){s=new a(n(v));if(!(s&&s.isValid())){s=new a(v.toInt());}}return s;},parseDay:function(s,t){return r("day",s,t);
+},parseMonth:function(t,s){return r("month",t,s);},parseUTC:function(t){var s=new a(t);var u=a.UTC(s.get("year"),s.get("mo"),s.get("date"),s.get("hr"),s.get("min"),s.get("sec"),s.get("ms"));
+return new a(u);},orderIndex:function(s){return a.getMsg("dateOrder").indexOf(s)+1;},defineFormat:function(s,t){g[s]=t;return this;},defineParser:function(s){c.push((s.re&&s.handler)?s:l(s));
+return this;},defineParsers:function(){Array.flatten(arguments).each(a.defineParser);return this;},define2DigitYearStart:function(s){o=s%100;i=s-o;return this;
+}}).extend({defineFormats:a.defineFormat.overloadSetter()});var d=function(s){return new RegExp("(?:"+a.getMsg(s).map(function(t){return t.substr(0,3);
+}).join("|")+")[a-z]*");};var m=function(s){switch(s){case"T":return"%H:%M:%S";case"x":return((a.orderIndex("month")==1)?"%m[-./]%d":"%d[-./]%m")+"([-./]%y)?";
+case"X":return"%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?";}return null;};var j={d:/[0-2]?[0-9]|3[01]/,H:/[01]?[0-9]|2[0-3]/,I:/0?[1-9]|1[0-2]/,M:/[0-5]?\d/,s:/\d+/,o:/[a-z]*/,p:/[ap]\.?m\.?/,y:/\d{2}|\d{4}/,Y:/\d{4}/,z:/Z|[+-]\d{2}(?::?\d{2})?/};
+j.m=j.I;j.S=j.M;var e;var b=function(s){e=s;j.a=j.A=d("days");j.b=j.B=d("months");c.each(function(u,t){if(u.format){c[t]=l(u.format);}});};var l=function(u){if(!e){return{format:u};
+}var s=[];var t=(u.source||u).replace(/%([a-z])/gi,function(w,v){return m(v)||w;}).replace(/\((?!\?)/g,"(?:").replace(/ (?!\?|\*)/g,",? ").replace(/%([a-z%])/gi,function(w,v){var x=j[v];
+if(!x){return v;}s.push(v);return"("+x.source+")";}).replace(/\[a-z\]/gi,"[a-z\\u00c0-\\uffff;&]");return{format:u,re:new RegExp("^"+t+"$","i"),handler:function(y){y=y.slice(1).associate(s);
+var v=new a().clearTime(),x=y.y||y.Y;if(x!=null){q.call(v,"y",x);}if("d" in y){q.call(v,"d",1);}if("m" in y||y.b||y.B){q.call(v,"m",1);}for(var w in y){q.call(v,w,y[w]);
+}return v;}};};var q=function(s,t){if(!t){return this;}switch(s){case"a":case"A":return this.set("day",a.parseDay(t,true));case"b":case"B":return this.set("mo",a.parseMonth(t,true));
+case"d":return this.set("date",t);case"H":case"I":return this.set("hr",t);case"m":return this.set("mo",t-1);case"M":return this.set("min",t);case"p":return this.set("ampm",t.replace(/\./g,""));
+case"S":return this.set("sec",t);case"s":return this.set("ms",("0."+t)*1000);case"w":return this.set("day",t);case"Y":return this.set("year",t);case"y":t=+t;
+if(t<100){t+=i+(t<o?100:0);}return this.set("year",t);case"z":if(t=="Z"){t="+00";}var u=t.match(/([+-])(\d{2}):?(\d{2})?/);u=(u[1]+"1")*(u[2]*60+(+u[3]||0))+this.getTimezoneOffset();
+return this.set("time",this-u*60000);}return this;};a.defineParsers("%Y([-./]%m([-./]%d((T| )%X)?)?)?","%Y%m%d(T%H(%M%S?)?)?","%x( %X)?","%d%o( %b( %Y)?)?( %X)?","%b( %d%o)?( %Y)?( %X)?","%Y %b( %d%o( %X)?)?","%o %b %d %X %z %Y","%T","%H:%M( ?%p)?");
+Locale.addEvent("change",function(s){if(Locale.get("Date")){b(s);}}).fireEvent("change",Locale.getCurrent());})();Date.implement({timeDiffInWords:function(a){return Date.distanceOfTimeInWords(this,a||new Date);
+},timeDiff:function(f,c){if(f==null){f=new Date;}var h=((f-this)/1000).floor().abs();var e=[],a=[60,60,24,365,0],d=["s","m","h","d","y"],g,b;for(var i=0;
+i<a.length;i++){if(i&&!h){break;}g=h;if((b=a[i])){g=(h%b);h=(h/b).floor();}e.unshift(g+(d[i]||""));}return e.join(c||":");}}).extend({distanceOfTimeInWords:function(b,a){return Date.getTimePhrase(((a-b)/1000).toInt());
+},getTimePhrase:function(f){var d=(f<0)?"Until":"Ago";if(f<0){f*=-1;}var b={minute:60,hour:60,day:24,week:7,month:52/12,year:12,eon:Infinity};var e="lessThanMinute";
+for(var c in b){var a=b[c];if(f<1.5*a){if(f>0.75*a){e=c;}break;}f/=a;e=c+"s";}f=f.round();return Date.getMsg(e+d,f).substitute({delta:f});}}).defineParsers({re:/^(?:tod|tom|yes)/i,handler:function(a){var b=new Date().clearTime();
+switch(a[0]){case"tom":return b.increment();case"yes":return b.decrement();default:return b;}}},{re:/^(next|last) ([a-z]+)$/i,handler:function(e){var f=new Date().clearTime();
+var b=f.getDay();var c=Date.parseDay(e[2],true);var a=c-b;if(c<=b){a+=7;}if(e[1]=="last"){a-=7;}return f.set("date",f.getDate()+a);}}).alias("timeAgoInWords","timeDiffInWords");
+Locale.define("en-US","Number",{decimal:".",group:",",currency:{prefix:"$ "}});Number.implement({format:function(q){var n=this;q=q?Object.clone(q):{};var a=function(i){if(q[i]!=null){return q[i];
+}return Locale.get("Number."+i);};var f=n<0,h=a("decimal"),k=a("precision"),o=a("group"),c=a("decimals");if(f){var e=a("negative")||{};if(e.prefix==null&&e.suffix==null){e.prefix="-";
+}["prefix","suffix"].each(function(i){if(e[i]){q[i]=a(i)+e[i];}});n=-n;}var l=a("prefix"),p=a("suffix");if(c!==""&&c>=0&&c<=20){n=n.toFixed(c);}if(k>=1&&k<=21){n=(+n).toPrecision(k);
+}n+="";var m;if(a("scientific")===false&&n.indexOf("e")>-1){var j=n.split("e"),b=+j[1];n=j[0].replace(".","");if(b<0){b=-b-1;m=j[0].indexOf(".");if(m>-1){b-=m-1;
+}while(b--){n="0"+n;}n="0."+n;}else{m=j[0].lastIndexOf(".");if(m>-1){b-=j[0].length-m-1;}while(b--){n+="0";}}}if(h!="."){n=n.replace(".",h);}if(o){m=n.lastIndexOf(h);
+m=(m>-1)?m:n.length;var d=n.substring(m),g=m;while(g--){if((m-g-1)%3==0&&g!=(m-1)){d=o+d;}d=n.charAt(g)+d;}n=d;}if(l){n=l+n;}if(p){n+=p;}return n;},formatCurrency:function(b){var a=Locale.get("Number.currency")||{};
+if(a.scientific==null){a.scientific=false;}a.decimals=b!=null?b:(a.decimals==null?2:a.decimals);return this.format(a);},formatPercentage:function(b){var a=Locale.get("Number.percentage")||{};
+if(a.suffix==null){a.suffix="%";}a.decimals=b!=null?b:(a.decimals==null?2:a.decimals);return this.format(a);}});(function(){var c={a:/[àáâãäåăą]/g,A:/[ÀÁÂÃÄÅĂĄ]/g,c:/[ćčç]/g,C:/[ĆČÇ]/g,d:/[ďđ]/g,D:/[ĎÐ]/g,e:/[èéêëěę]/g,E:/[ÈÉÊËĚĘ]/g,g:/[ğ]/g,G:/[Ğ]/g,i:/[ìíîï]/g,I:/[ÌÍÎÏ]/g,l:/[ĺľł]/g,L:/[ĹĽŁ]/g,n:/[ñňń]/g,N:/[ÑŇŃ]/g,o:/[òóôõöøő]/g,O:/[ÒÓÔÕÖØ]/g,r:/[řŕ]/g,R:/[ŘŔ]/g,s:/[ššş]/g,S:/[ŠŞŚ]/g,t:/[ťţ]/g,T:/[ŤŢ]/g,ue:/[ü]/g,UE:/[Ü]/g,u:/[ùúûůµ]/g,U:/[ÙÚÛŮ]/g,y:/[ÿý]/g,Y:/[ŸÝ]/g,z:/[žźż]/g,Z:/[ŽŹŻ]/g,th:/[þ]/g,TH:/[Þ]/g,dh:/[ð]/g,DH:/[Ð]/g,ss:/[ß]/g,oe:/[œ]/g,OE:/[Œ]/g,ae:/[æ]/g,AE:/[Æ]/g},b={" ":/[\xa0\u2002\u2003\u2009]/g,"*":/[\xb7]/g,"'":/[\u2018\u2019]/g,'"':/[\u201c\u201d]/g,"...":/[\u2026]/g,"-":/[\u2013]/g,"&raquo;":/[\uFFFD]/g};
+var a=function(f,h){var e=f,g;for(g in h){e=e.replace(h[g],g);}return e;};var d=function(e,g){e=e||"";var h=g?"<"+e+"(?!\\w)[^>]*>([\\s\\S]*?)</"+e+"(?!\\w)>":"</?"+e+"([^>]+)?>",f=new RegExp(h,"gi");
+return f;};String.implement({standardize:function(){return a(this,c);},repeat:function(e){return new Array(e+1).join(this);},pad:function(e,h,g){if(this.length>=e){return this;
+}var f=(h==null?" ":""+h).repeat(e-this.length).substr(0,e-this.length);if(!g||g=="right"){return this+f;}if(g=="left"){return f+this;}return f.substr(0,(f.length/2).floor())+this+f.substr(0,(f.length/2).ceil());
+},getTags:function(e,f){return this.match(d(e,f))||[];},stripTags:function(e,f){return this.replace(d(e,f),"");},tidy:function(){return a(this,b);},truncate:function(e,f,i){var h=this;
+if(f==null&&arguments.length==1){f="…";}if(h.length>e){h=h.substring(0,e);if(i){var g=h.lastIndexOf(i);if(g!=-1){h=h.substr(0,g);}}if(f){h+=f;}}return h;
+}});})();String.implement({parseQueryString:function(d,a){if(d==null){d=true;}if(a==null){a=true;}var c=this.split(/[&;]/),b={};if(!c.length){return b;
+}c.each(function(i){var e=i.indexOf("=")+1,g=e?i.substr(e):"",f=e?i.substr(0,e-1).match(/([^\]\[]+|(\B)(?=\]))/g):[i],h=b;if(!f){return;}if(a){g=decodeURIComponent(g);
+}f.each(function(k,j){if(d){k=decodeURIComponent(k);}var l=h[k];if(j<f.length-1){h=h[k]=l||{};}else{if(typeOf(l)=="array"){l.push(g);}else{h[k]=l!=null?[l,g]:g;
+}}});});return b;},cleanQueryString:function(a){return this.split("&").filter(function(e){var b=e.indexOf("="),c=b<0?"":e.substr(0,b),d=e.substr(b+1);return a?a.call(null,c,d):(d||d===0);
+}).join("&");}});(function(){var b=function(){return this.get("value");};var a=this.URI=new Class({Implements:Options,options:{},regex:/^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,parts:["scheme","user","password","host","port","directory","file","query","fragment"],schemes:{http:80,https:443,ftp:21,rtsp:554,mms:1755,file:0},initialize:function(d,c){this.setOptions(c);
+var e=this.options.base||a.base;if(!d){d=e;}if(d&&d.parsed){this.parsed=Object.clone(d.parsed);}else{this.set("value",d.href||d.toString(),e?new a(e):false);
+}},parse:function(e,d){var c=e.match(this.regex);if(!c){return false;}c.shift();return this.merge(c.associate(this.parts),d);},merge:function(d,c){if((!d||!d.scheme)&&(!c||!c.scheme)){return false;
+}if(c){this.parts.every(function(e){if(d[e]){return false;}d[e]=c[e]||"";return true;});}d.port=d.port||this.schemes[d.scheme.toLowerCase()];d.directory=d.directory?this.parseDirectory(d.directory,c?c.directory:""):"/";
+return d;},parseDirectory:function(d,e){d=(d.substr(0,1)=="/"?"":(e||"/"))+d;if(!d.test(a.regs.directoryDot)){return d;}var c=[];d.replace(a.regs.endSlash,"").split("/").each(function(f){if(f==".."&&c.length>0){c.pop();
+}else{if(f!="."){c.push(f);}}});return c.join("/")+"/";},combine:function(c){return c.value||c.scheme+"://"+(c.user?c.user+(c.password?":"+c.password:"")+"@":"")+(c.host||"")+(c.port&&c.port!=this.schemes[c.scheme]?":"+c.port:"")+(c.directory||"/")+(c.file||"")+(c.query?"?"+c.query:"")+(c.fragment?"#"+c.fragment:"");
+},set:function(d,f,e){if(d=="value"){var c=f.match(a.regs.scheme);if(c){c=c[1];}if(c&&this.schemes[c.toLowerCase()]==null){this.parsed={scheme:c,value:f};
+}else{this.parsed=this.parse(f,(e||this).parsed)||(c?{scheme:c,value:f}:{value:f});}}else{if(d=="data"){this.setData(f);}else{this.parsed[d]=f;}}return this;
+},get:function(c,d){switch(c){case"value":return this.combine(this.parsed,d?d.parsed:false);case"data":return this.getData();}return this.parsed[c]||"";
+},go:function(){document.location.href=this.toString();},toURI:function(){return this;},getData:function(e,d){var c=this.get(d||"query");if(!(c||c===0)){return e?null:{};
+}var f=c.parseQueryString();return e?f[e]:f;},setData:function(c,f,d){if(typeof c=="string"){var e=this.getData();e[arguments[0]]=arguments[1];c=e;}else{if(f){c=Object.merge(this.getData(),c);
+}}return this.set(d||"query",Object.toQueryString(c));},clearData:function(c){return this.set(c||"query","");},toString:b,valueOf:b});a.regs={endSlash:/\/$/,scheme:/^(\w+):/,directoryDot:/\.\/|\.$/};
+a.base=new a(Array.from(document.getElements("base[href]",true)).getLast(),{base:document.location});String.implement({toURI:function(c){return new a(this,c);
+}});})();URI=Class.refactor(URI,{combine:function(f,e){if(!e||f.scheme!=e.scheme||f.host!=e.host||f.port!=e.port){return this.previous.apply(this,arguments);
+}var a=f.file+(f.query?"?"+f.query:"")+(f.fragment?"#"+f.fragment:"");if(!e.directory){return(f.directory||(f.file?"":"./"))+a;}var d=e.directory.split("/"),c=f.directory.split("/"),g="",h;
+var b=0;for(h=0;h<d.length&&h<c.length&&d[h]==c[h];h++){}for(b=0;b<d.length-h-1;b++){g+="../";}for(b=h;b<c.length-1;b++){g+=c[b]+"/";}return(g||(f.file?"":"./"))+a;
+},toAbsolute:function(a){a=new URI(a);if(a){a.set("directory","").set("file","");}return this.toRelative(a);},toRelative:function(a){return this.get("value",new URI(a));
+}});(function(){if(this.Hash){return;}var a=this.Hash=new Type("Hash",function(b){if(typeOf(b)=="hash"){b=Object.clone(b.getClean());}for(var c in b){this[c]=b[c];
+}return this;});this.$H=function(b){return new a(b);};a.implement({forEach:function(b,c){Object.forEach(this,b,c);},getClean:function(){var c={};for(var b in this){if(this.hasOwnProperty(b)){c[b]=this[b];
+}}return c;},getLength:function(){var c=0;for(var b in this){if(this.hasOwnProperty(b)){c++;}}return c;}});a.alias("each","forEach");a.implement({has:Object.prototype.hasOwnProperty,keyOf:function(b){return Object.keyOf(this,b);
+},hasValue:function(b){return Object.contains(this,b);},extend:function(b){a.each(b||{},function(d,c){a.set(this,c,d);},this);return this;},combine:function(b){a.each(b||{},function(d,c){a.include(this,c,d);
+},this);return this;},erase:function(b){if(this.hasOwnProperty(b)){delete this[b];}return this;},get:function(b){return(this.hasOwnProperty(b))?this[b]:null;
+},set:function(b,c){if(!this[b]||this.hasOwnProperty(b)){this[b]=c;}return this;},empty:function(){a.each(this,function(c,b){delete this[b];},this);return this;
+},include:function(b,c){if(this[b]==undefined){this[b]=c;}return this;},map:function(b,c){return new a(Object.map(this,b,c));},filter:function(b,c){return new a(Object.filter(this,b,c));
+},every:function(b,c){return Object.every(this,b,c);},some:function(b,c){return Object.some(this,b,c);},getKeys:function(){return Object.keys(this);},getValues:function(){return Object.values(this);
+},toQueryString:function(b){return Object.toQueryString(this,b);}});a.alias({indexOf:"keyOf",contains:"hasValue"});})();Hash.implement({getFromPath:function(a){return Object.getFromPath(this,a);
+},cleanValues:function(a){return new Hash(Object.cleanValues(this,a));},run:function(){Object.run(arguments);}});Element.implement({tidy:function(){this.set("value",this.get("value").tidy());
+},getTextInRange:function(b,a){return this.get("value").substring(b,a);},getSelectedText:function(){if(this.setSelectionRange){return this.getTextInRange(this.getSelectionStart(),this.getSelectionEnd());
+}return document.selection.createRange().text;},getSelectedRange:function(){if(this.selectionStart!=null){return{start:this.selectionStart,end:this.selectionEnd};
+}var e={start:0,end:0};var a=this.getDocument().selection.createRange();if(!a||a.parentElement()!=this){return e;}var c=a.duplicate();if(this.type=="text"){e.start=0-c.moveStart("character",-100000);
+e.end=e.start+a.text.length;}else{var b=this.get("value");var d=b.length;c.moveToElementText(this);c.setEndPoint("StartToEnd",a);if(c.text.length){d-=b.match(/[\n\r]*$/)[0].length;
+}e.end=d-c.text.length;c.setEndPoint("StartToStart",a);e.start=d-c.text.length;}return e;},getSelectionStart:function(){return this.getSelectedRange().start;
+},getSelectionEnd:function(){return this.getSelectedRange().end;},setCaretPosition:function(a){if(a=="end"){a=this.get("value").length;}this.selectRange(a,a);
+return this;},getCaretPosition:function(){return this.getSelectedRange().start;},selectRange:function(e,a){if(this.setSelectionRange){this.focus();this.setSelectionRange(e,a);
+}else{var c=this.get("value");var d=c.substr(e,a-e).replace(/\r/g,"").length;e=c.substr(0,e).replace(/\r/g,"").length;var b=this.createTextRange();b.collapse(true);
+b.moveEnd("character",e+d);b.moveStart("character",e);b.select();}return this;},insertAtCursor:function(b,a){var d=this.getSelectedRange();var c=this.get("value");
+this.set("value",c.substring(0,d.start)+b+c.substring(d.end,c.length));if(a!==false){this.selectRange(d.start,d.start+b.length);}else{this.setCaretPosition(d.start+b.length);
+}return this;},insertAroundCursor:function(b,a){b=Object.append({before:"",defaultMiddle:"",after:""},b);var c=this.getSelectedText()||b.defaultMiddle;
+var g=this.getSelectedRange();var f=this.get("value");if(g.start==g.end){this.set("value",f.substring(0,g.start)+b.before+c+b.after+f.substring(g.end,f.length));
+this.selectRange(g.start+b.before.length,g.end+b.before.length+c.length);}else{var d=f.substring(g.start,g.end);this.set("value",f.substring(0,g.start)+b.before+d+b.after+f.substring(g.end,f.length));
+var e=g.start+b.before.length;if(a!==false){this.selectRange(e,e+d.length);}else{this.setCaretPosition(e+f.length);}}return this;}});Elements.from=function(e,d){if(d||d==null){e=e.stripScripts();
+}var b,c=e.match(/^\s*<(t[dhr]|tbody|tfoot|thead)/i);if(c){b=new Element("table");var a=c[1].toLowerCase();if(["td","th","tr"].contains(a)){b=new Element("tbody").inject(b);
+if(a!="tr"){b=new Element("tr").inject(b);}}}return(b||new Element("div")).set("html",e).getChildren();};(function(){var d={relay:false},c=["once","throttle","pause"],b=c.length;
+while(b--){d[c[b]]=Events.lookupPseudo(c[b]);}DOMEvent.definePseudo=function(e,f){d[e]=f;return this;};var a=Element.prototype;[Element,Window,Document].invoke("implement",Events.Pseudos(d,a.addEvent,a.removeEvent));
+})();(function(){var a="$moo:keys-pressed",b="$moo:keys-keyup";DOMEvent.definePseudo("keys",function(d,e,c){var g=c[0],f=[],h=this.retrieve(a,[]);f.append(d.value.replace("++",function(){f.push("+");
+return"";}).split("+"));h.include(g.key);if(f.every(function(j){return h.contains(j);})){e.apply(this,c);}this.store(a,h);if(!this.retrieve(b)){var i=function(j){(function(){h=this.retrieve(a,[]).erase(j.key);
+this.store(a,h);}).delay(0,this);};this.store(b,i).addEvent("keyup",i);}});DOMEvent.defineKeys({"16":"shift","17":"control","18":"alt","20":"capslock","33":"pageup","34":"pagedown","35":"end","36":"home","144":"numlock","145":"scrolllock","186":";","187":"=","188":",","190":".","191":"/","192":"`","219":"[","220":"\\","221":"]","222":"'","107":"+"}).defineKey(Browser.firefox?109:189,"-");
+})();(function(){var b=function(e,d){var f=[];Object.each(d,function(g){Object.each(g,function(h){e.each(function(i){f.push(i+"-"+h+(i=="border"?"-width":""));
+});});});return f;};var c=function(f,e){var d=0;Object.each(e,function(h,g){if(g.test(f)){d=d+h.toInt();}});return d;};var a=function(d){return !!(!d||d.offsetHeight||d.offsetWidth);
+};Element.implement({measure:function(h){if(a(this)){return h.call(this);}var g=this.getParent(),e=[];while(!a(g)&&g!=document.body){e.push(g.expose());
+g=g.getParent();}var f=this.expose(),d=h.call(this);f();e.each(function(i){i();});return d;},expose:function(){if(this.getStyle("display")!="none"){return function(){};
+}var d=this.style.cssText;this.setStyles({display:"block",position:"absolute",visibility:"hidden"});return function(){this.style.cssText=d;}.bind(this);
+},getDimensions:function(d){d=Object.merge({computeSize:false},d);var i={x:0,y:0};var h=function(j,e){return(e.computeSize)?j.getComputedSize(e):j.getSize();
+};var f=this.getParent("body");if(f&&this.getStyle("display")=="none"){i=this.measure(function(){return h(this,d);});}else{if(f){try{i=h(this,d);}catch(g){}}}return Object.append(i,(i.x||i.x===0)?{width:i.x,height:i.y}:{x:i.width,y:i.height});
+},getComputedSize:function(d){d=Object.merge({styles:["padding","border"],planes:{height:["top","bottom"],width:["left","right"]},mode:"both"},d);var g={},e={width:0,height:0},f;
+if(d.mode=="vertical"){delete e.width;delete d.planes.width;}else{if(d.mode=="horizontal"){delete e.height;delete d.planes.height;}}b(d.styles,d.planes).each(function(h){g[h]=this.getStyle(h).toInt();
+},this);Object.each(d.planes,function(i,h){var k=h.capitalize(),j=this.getStyle(h);if(j=="auto"&&!f){f=this.getDimensions();}j=g[h]=(j=="auto")?f[h]:j.toInt();
+e["total"+k]=j;i.each(function(m){var l=c(m,g);e["computed"+m.capitalize()]=l;e["total"+k]+=l;});},this);return Object.append(e,g);}});})();(function(){var a=false,b=false;
+var c=function(){var d=new Element("div").setStyles({position:"fixed",top:0,right:0}).inject(document.body);a=(d.offsetTop===0);d.dispose();b=true;};Element.implement({pin:function(h,f){if(!b){c();
+}if(this.getStyle("display")=="none"){return this;}var j,k=window.getScroll(),l,e;if(h!==false){j=this.getPosition(a?document.body:this.getOffsetParent());
+if(!this.retrieve("pin:_pinned")){var g={top:j.y-k.y,left:j.x-k.x};if(a&&!f){this.setStyle("position","fixed").setStyles(g);}else{l=this.getOffsetParent();
+var i=this.getPosition(l),m=this.getStyles("left","top");if(l&&m.left=="auto"||m.top=="auto"){this.setPosition(i);}if(this.getStyle("position")=="static"){this.setStyle("position","absolute");
+}i={x:m.left.toInt()-k.x,y:m.top.toInt()-k.y};e=function(){if(!this.retrieve("pin:_pinned")){return;}var n=window.getScroll();this.setStyles({left:i.x+n.x,top:i.y+n.y});
+}.bind(this);this.store("pin:_scrollFixer",e);window.addEvent("scroll",e);}this.store("pin:_pinned",true);}}else{if(!this.retrieve("pin:_pinned")){return this;
+}l=this.getParent();var d=(l.getComputedStyle("position")!="static"?l:l.getOffsetParent());j=this.getPosition(d);this.store("pin:_pinned",false);e=this.retrieve("pin:_scrollFixer");
+if(!e){this.setStyles({position:"absolute",top:j.y+k.y,left:j.x+k.x});}else{this.store("pin:_scrollFixer",null);window.removeEvent("scroll",e);}this.removeClass("isPinned");
+}return this;},unpin:function(){return this.pin(false);},togglePin:function(){return this.pin(!this.retrieve("pin:_pinned"));}});})();(function(b){var a=Element.Position={options:{relativeTo:document.body,position:{x:"center",y:"center"},offset:{x:0,y:0}},getOptions:function(d,c){c=Object.merge({},a.options,c);
+a.setPositionOption(c);a.setEdgeOption(c);a.setOffsetOption(d,c);a.setDimensionsOption(d,c);return c;},setPositionOption:function(c){c.position=a.getCoordinateFromValue(c.position);
+},setEdgeOption:function(d){var c=a.getCoordinateFromValue(d.edge);d.edge=c?c:(d.position.x=="center"&&d.position.y=="center")?{x:"center",y:"center"}:{x:"left",y:"top"};
+},setOffsetOption:function(f,d){var c={x:0,y:0},g=f.measure(function(){return document.id(this.getOffsetParent());}),e=g.getScroll();if(!g||g==f.getDocument().body){return;
+}c=g.measure(function(){var i=this.getPosition();if(this.getStyle("position")=="fixed"){var h=window.getScroll();i.x+=h.x;i.y+=h.y;}return i;});d.offset={parentPositioned:g!=document.id(d.relativeTo),x:d.offset.x-c.x+e.x,y:d.offset.y-c.y+e.y};
+},setDimensionsOption:function(d,c){c.dimensions=d.getDimensions({computeSize:true,styles:["padding","border","margin"]});},getPosition:function(e,d){var c={};
+d=a.getOptions(e,d);var f=document.id(d.relativeTo)||document.body;a.setPositionCoordinates(d,c,f);if(d.edge){a.toEdge(c,d);}var g=d.offset;c.left=((c.x>=0||g.parentPositioned||d.allowNegative)?c.x:0).toInt();
+c.top=((c.y>=0||g.parentPositioned||d.allowNegative)?c.y:0).toInt();a.toMinMax(c,d);if(d.relFixedPosition||f.getStyle("position")=="fixed"){a.toRelFixedPosition(f,c);
+}if(d.ignoreScroll){a.toIgnoreScroll(f,c);}if(d.ignoreMargins){a.toIgnoreMargins(c,d);}c.left=Math.ceil(c.left);c.top=Math.ceil(c.top);delete c.x;delete c.y;
+return c;},setPositionCoordinates:function(k,g,d){var f=k.offset.y,h=k.offset.x,e=(d==document.body)?window.getScroll():d.getPosition(),j=e.y,c=e.x,i=window.getSize();
+switch(k.position.x){case"left":g.x=c+h;break;case"right":g.x=c+h+d.offsetWidth;break;default:g.x=c+((d==document.body?i.x:d.offsetWidth)/2)+h;break;}switch(k.position.y){case"top":g.y=j+f;
+break;case"bottom":g.y=j+f+d.offsetHeight;break;default:g.y=j+((d==document.body?i.y:d.offsetHeight)/2)+f;break;}},toMinMax:function(c,d){var f={left:"x",top:"y"},e;
+["minimum","maximum"].each(function(g){["left","top"].each(function(h){e=d[g]?d[g][f[h]]:null;if(e!=null&&((g=="minimum")?c[h]<e:c[h]>e)){c[h]=e;}});});
+},toRelFixedPosition:function(e,c){var d=window.getScroll();c.top+=d.y;c.left+=d.x;},toIgnoreScroll:function(e,d){var c=e.getScroll();d.top-=c.y;d.left-=c.x;
+},toIgnoreMargins:function(c,d){c.left+=d.edge.x=="right"?d.dimensions["margin-right"]:(d.edge.x!="center"?-d.dimensions["margin-left"]:-d.dimensions["margin-left"]+((d.dimensions["margin-right"]+d.dimensions["margin-left"])/2));
+c.top+=d.edge.y=="bottom"?d.dimensions["margin-bottom"]:(d.edge.y!="center"?-d.dimensions["margin-top"]:-d.dimensions["margin-top"]+((d.dimensions["margin-bottom"]+d.dimensions["margin-top"])/2));
+},toEdge:function(c,d){var e={},g=d.dimensions,f=d.edge;switch(f.x){case"left":e.x=0;break;case"right":e.x=-g.x-g.computedRight-g.computedLeft;break;default:e.x=-(Math.round(g.totalWidth/2));
+break;}switch(f.y){case"top":e.y=0;break;case"bottom":e.y=-g.y-g.computedTop-g.computedBottom;break;default:e.y=-(Math.round(g.totalHeight/2));break;}c.x+=e.x;
+c.y+=e.y;},getCoordinateFromValue:function(c){if(typeOf(c)!="string"){return c;}c=c.toLowerCase();return{x:c.test("left")?"left":(c.test("right")?"right":"center"),y:c.test(/upper|top/)?"top":(c.test("bottom")?"bottom":"center")};
+}};Element.implement({position:function(d){if(d&&(d.x!=null||d.y!=null)){return(b?b.apply(this,arguments):this);}var c=this.setStyle("position","absolute").calculatePosition(d);
+return(d&&d.returnPos)?c:this.setStyles(c);},calculatePosition:function(c){return a.getPosition(this,c);}});})(Element.prototype.position);Element.implement({isDisplayed:function(){return this.getStyle("display")!="none";
+},isVisible:function(){var a=this.offsetWidth,b=this.offsetHeight;return(a==0&&b==0)?false:(a>0&&b>0)?true:this.style.display!="none";},toggle:function(){return this[this.isDisplayed()?"hide":"show"]();
+},hide:function(){var b;try{b=this.getStyle("display");}catch(a){}if(b=="none"){return this;}return this.store("element:_originalDisplay",b||"").setStyle("display","none");
+},show:function(a){if(!a&&this.isDisplayed()){return this;}a=a||this.retrieve("element:_originalDisplay")||"block";return this.setStyle("display",(a=="none")?"block":a);
+},swapClass:function(a,b){return this.removeClass(a).addClass(b);}});Document.implement({clearSelection:function(){if(window.getSelection){var a=window.getSelection();
+if(a&&a.removeAllRanges){a.removeAllRanges();}}else{if(document.selection&&document.selection.empty){try{document.selection.empty();}catch(b){}}}}});var IframeShim=new Class({Implements:[Options,Events,Class.Occlude],options:{className:"iframeShim",src:'javascript:false;document.write("");',display:false,zIndex:null,margin:0,offset:{x:0,y:0},browsers:(Browser.ie6||(Browser.firefox&&Browser.version<3&&Browser.Platform.mac))},property:"IframeShim",initialize:function(b,a){this.element=document.id(b);
+if(this.occlude()){return this.occluded;}this.setOptions(a);this.makeShim();return this;},makeShim:function(){if(this.options.browsers){var c=this.element.getStyle("zIndex").toInt();
+if(!c){c=1;var b=this.element.getStyle("position");if(b=="static"||!b){this.element.setStyle("position","relative");}this.element.setStyle("zIndex",c);
+}c=((this.options.zIndex!=null||this.options.zIndex===0)&&c>this.options.zIndex)?this.options.zIndex:c-1;if(c<0){c=1;}this.shim=new Element("iframe",{src:this.options.src,scrolling:"no",frameborder:0,styles:{zIndex:c,position:"absolute",border:"none",filter:"progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"},"class":this.options.className}).store("IframeShim",this);
+var a=(function(){this.shim.inject(this.element,"after");this[this.options.display?"show":"hide"]();this.fireEvent("inject");}).bind(this);if(!IframeShim.ready){window.addEvent("load",a);
+}else{a();}}else{this.position=this.hide=this.show=this.dispose=Function.from(this);}},position:function(){if(!IframeShim.ready||!this.shim){return this;
+}var a=this.element.measure(function(){return this.getSize();});if(this.options.margin!=undefined){a.x=a.x-(this.options.margin*2);a.y=a.y-(this.options.margin*2);
+this.options.offset.x+=this.options.margin;this.options.offset.y+=this.options.margin;}this.shim.set({width:a.x,height:a.y}).position({relativeTo:this.element,offset:this.options.offset});
+return this;},hide:function(){if(this.shim){this.shim.setStyle("display","none");}return this;},show:function(){if(this.shim){this.shim.setStyle("display","block");
+}return this.position();},dispose:function(){if(this.shim){this.shim.dispose();}return this;},destroy:function(){if(this.shim){this.shim.destroy();}return this;
+}});window.addEvent("load",function(){IframeShim.ready=true;});var Mask=new Class({Implements:[Options,Events],Binds:["position"],options:{style:{},"class":"mask",maskMargins:false,useIframeShim:true,iframeShimOptions:{}},initialize:function(b,a){this.target=document.id(b)||document.id(document.body);
+this.target.store("mask",this);this.setOptions(a);this.render();this.inject();},render:function(){this.element=new Element("div",{"class":this.options["class"],id:this.options.id||"mask-"+String.uniqueID(),styles:Object.merge({},this.options.style,{display:"none"}),events:{click:function(a){this.fireEvent("click",a);
+if(this.options.hideOnClick){this.hide();}}.bind(this)}});this.hidden=true;},toElement:function(){return this.element;},inject:function(b,a){a=a||(this.options.inject?this.options.inject.where:"")||this.target==document.body?"inside":"after";
+b=b||(this.options.inject&&this.options.inject.target)||this.target;this.element.inject(b,a);if(this.options.useIframeShim){this.shim=new IframeShim(this.element,this.options.iframeShimOptions);
+this.addEvents({show:this.shim.show.bind(this.shim),hide:this.shim.hide.bind(this.shim),destroy:this.shim.destroy.bind(this.shim)});}},position:function(){this.resize(this.options.width,this.options.height);
+this.element.position({relativeTo:this.target,position:"topLeft",ignoreMargins:!this.options.maskMargins,ignoreScroll:this.target==document.body});return this;
+},resize:function(a,e){var b={styles:["padding","border"]};if(this.options.maskMargins){b.styles.push("margin");}var d=this.target.getComputedSize(b);if(this.target==document.body){this.element.setStyles({width:0,height:0});
+var c=window.getScrollSize();if(d.totalHeight<c.y){d.totalHeight=c.y;}if(d.totalWidth<c.x){d.totalWidth=c.x;}}this.element.setStyles({width:Array.pick([a,d.totalWidth,d.x]),height:Array.pick([e,d.totalHeight,d.y])});
+return this;},show:function(){if(!this.hidden){return this;}window.addEvent("resize",this.position);this.position();this.showMask.apply(this,arguments);
+return this;},showMask:function(){this.element.setStyle("display","block");this.hidden=false;this.fireEvent("show");},hide:function(){if(this.hidden){return this;
+}window.removeEvent("resize",this.position);this.hideMask.apply(this,arguments);if(this.options.destroyOnHide){return this.destroy();}return this;},hideMask:function(){this.element.setStyle("display","none");
+this.hidden=true;this.fireEvent("hide");},toggle:function(){this[this.hidden?"show":"hide"]();},destroy:function(){this.hide();this.element.destroy();this.fireEvent("destroy");
+this.target.eliminate("mask");}});Element.Properties.mask={set:function(b){var a=this.retrieve("mask");if(a){a.destroy();}return this.eliminate("mask").store("mask:options",b);
+},get:function(){var a=this.retrieve("mask");if(!a){a=new Mask(this,this.retrieve("mask:options"));this.store("mask",a);}return a;}};Element.implement({mask:function(a){if(a){this.set("mask",a);
+}this.get("mask").show();return this;},unmask:function(){this.get("mask").hide();return this;}});var Spinner=new Class({Extends:Mask,Implements:Chain,options:{"class":"spinner",containerPosition:{},content:{"class":"spinner-content"},messageContainer:{"class":"spinner-msg"},img:{"class":"spinner-img"},fxOptions:{link:"chain"}},initialize:function(c,a){this.target=document.id(c)||document.id(document.body);
+this.target.store("spinner",this);this.setOptions(a);this.render();this.inject();var b=function(){this.active=false;}.bind(this);this.addEvents({hide:b,show:b});
+},render:function(){this.parent();this.element.set("id",this.options.id||"spinner-"+String.uniqueID());this.content=document.id(this.options.content)||new Element("div",this.options.content);
+this.content.inject(this.element);if(this.options.message){this.msg=document.id(this.options.message)||new Element("p",this.options.messageContainer).appendText(this.options.message);
+this.msg.inject(this.content);}if(this.options.img){this.img=document.id(this.options.img)||new Element("div",this.options.img);this.img.inject(this.content);
+}this.element.set("tween",this.options.fxOptions);},show:function(a){if(this.active){return this.chain(this.show.bind(this));}if(!this.hidden){this.callChain.delay(20,this);
+return this;}this.active=true;return this.parent(a);},showMask:function(a){var b=function(){this.content.position(Object.merge({relativeTo:this.element},this.options.containerPosition));
+}.bind(this);if(a){this.parent();b();}else{if(!this.options.style.opacity){this.options.style.opacity=this.element.getStyle("opacity").toFloat();}this.element.setStyles({display:"block",opacity:0}).tween("opacity",this.options.style.opacity);
+b();this.hidden=false;this.fireEvent("show");this.callChain();}},hide:function(a){if(this.active){return this.chain(this.hide.bind(this));}if(this.hidden){this.callChain.delay(20,this);
+return this;}this.active=true;return this.parent(a);},hideMask:function(a){if(a){return this.parent();}this.element.tween("opacity",0).get("tween").chain(function(){this.element.setStyle("display","none");
+this.hidden=true;this.fireEvent("hide");this.callChain();}.bind(this));},destroy:function(){this.content.destroy();this.parent();this.target.eliminate("spinner");
+}});Request=Class.refactor(Request,{options:{useSpinner:false,spinnerOptions:{},spinnerTarget:false},initialize:function(a){this._send=this.send;this.send=function(b){var c=this.getSpinner();
+if(c){c.chain(this._send.pass(b,this)).show();}else{this._send(b);}return this;};this.previous(a);},getSpinner:function(){if(!this.spinner){var b=document.id(this.options.spinnerTarget)||document.id(this.options.update);
+if(this.options.useSpinner&&b){b.set("spinner",this.options.spinnerOptions);var a=this.spinner=b.get("spinner");["complete","exception","cancel"].each(function(c){this.addEvent(c,a.hide.bind(a));
+},this);}}return this.spinner;}});Element.Properties.spinner={set:function(a){var b=this.retrieve("spinner");if(b){b.destroy();}return this.eliminate("spinner").store("spinner:options",a);
+},get:function(){var a=this.retrieve("spinner");if(!a){a=new Spinner(this,this.retrieve("spinner:options"));this.store("spinner",a);}return a;}};Element.implement({spin:function(a){if(a){this.set("spinner",a);
+}this.get("spinner").show();return this;},unspin:function(){this.get("spinner").hide();return this;}});if(!window.Form){window.Form={};}(function(){Form.Request=new Class({Binds:["onSubmit","onFormValidate"],Implements:[Options,Events,Class.Occlude],options:{requestOptions:{evalScripts:true,useSpinner:true,emulation:false,link:"ignore"},sendButtonClicked:true,extraData:{},resetForm:true},property:"form.request",initialize:function(b,c,a){this.element=document.id(b);
+if(this.occlude()){return this.occluded;}this.setOptions(a).setTarget(c).attach();},setTarget:function(a){this.target=document.id(a);if(!this.request){this.makeRequest();
+}else{this.request.setOptions({update:this.target});}return this;},toElement:function(){return this.element;},makeRequest:function(){var a=this;this.request=new Request.HTML(Object.merge({update:this.target,emulation:false,spinnerTarget:this.element,method:this.element.get("method")||"post"},this.options.requestOptions)).addEvents({success:function(c,e,d,b){["complete","success"].each(function(f){a.fireEvent(f,[a.target,c,e,d,b]);
+});},failure:function(){a.fireEvent("complete",arguments).fireEvent("failure",arguments);},exception:function(){a.fireEvent("failure",arguments);}});return this.attachReset();
+},attachReset:function(){if(!this.options.resetForm){return this;}this.request.addEvent("success",function(){Function.attempt(function(){this.element.reset();
+}.bind(this));if(window.OverText){OverText.update();}}.bind(this));return this;},attach:function(a){var c=(a!=false)?"addEvent":"removeEvent";this.element[c]("click:relay(button, input[type=submit])",this.saveClickedButton.bind(this));
+var b=this.element.retrieve("validator");if(b){b[c]("onFormValidate",this.onFormValidate);}else{this.element[c]("submit",this.onSubmit);}return this;},detach:function(){return this.attach(false);
+},enable:function(){return this.attach();},disable:function(){return this.detach();},onFormValidate:function(c,b,a){if(!a){return;}var d=this.element.retrieve("validator");
+if(c||(d&&!d.options.stopOnFailure)){a.stop();this.send();}},onSubmit:function(a){var b=this.element.retrieve("validator");if(b){this.element.removeEvent("submit",this.onSubmit);
+b.addEvent("onFormValidate",this.onFormValidate);this.element.validate();return;}if(a){a.stop();}this.send();},saveClickedButton:function(b,c){var a=c.get("name");
+if(!a||!this.options.sendButtonClicked){return;}this.options.extraData[a]=c.get("value")||true;this.clickedCleaner=function(){delete this.options.extraData[a];
+this.clickedCleaner=function(){};}.bind(this);},clickedCleaner:function(){},send:function(){var b=this.element.toQueryString().trim(),a=Object.toQueryString(this.options.extraData);
+if(b){b+="&"+a;}else{b=a;}this.fireEvent("send",[this.element,b.parseQueryString()]);this.request.send({data:b,url:this.options.requestOptions.url||this.element.get("action")});
+this.clickedCleaner();return this;}});Element.implement("formUpdate",function(c,b){var a=this.retrieve("form.request");if(!a){a=new Form.Request(this,c,b);
+}else{if(c){a.setTarget(c);}if(b){a.setOptions(b).makeRequest();}}a.send();return this;});})();(function(){var a=function(d){var b=d.options.hideInputs;
+if(window.OverText){var c=[null];OverText.each(function(e){c.include("."+e.options.labelClass);});if(c){b+=c.join(", ");}}return(b)?d.element.getElements(b):null;
+};Fx.Reveal=new Class({Extends:Fx.Morph,options:{link:"cancel",styles:["padding","border","margin"],transitionOpacity:!Browser.ie6,mode:"vertical",display:function(){return this.element.get("tag")!="tr"?"block":"table-row";
+},opacity:1,hideInputs:Browser.ie?"select, input, textarea, object, embed":null},dissolve:function(){if(!this.hiding&&!this.showing){if(this.element.getStyle("display")!="none"){this.hiding=true;
+this.showing=false;this.hidden=true;this.cssText=this.element.style.cssText;var d=this.element.getComputedSize({styles:this.options.styles,mode:this.options.mode});
+if(this.options.transitionOpacity){d.opacity=this.options.opacity;}var c={};Object.each(d,function(f,e){c[e]=[f,0];});this.element.setStyles({display:Function.from(this.options.display).call(this),overflow:"hidden"});
+var b=a(this);if(b){b.setStyle("visibility","hidden");}this.$chain.unshift(function(){if(this.hidden){this.hiding=false;this.element.style.cssText=this.cssText;
+this.element.setStyle("display","none");if(b){b.setStyle("visibility","visible");}}this.fireEvent("hide",this.element);this.callChain();}.bind(this));this.start(c);
+}else{this.callChain.delay(10,this);this.fireEvent("complete",this.element);this.fireEvent("hide",this.element);}}else{if(this.options.link=="chain"){this.chain(this.dissolve.bind(this));
+}else{if(this.options.link=="cancel"&&!this.hiding){this.cancel();this.dissolve();}}}return this;},reveal:function(){if(!this.showing&&!this.hiding){if(this.element.getStyle("display")=="none"){this.hiding=false;
+this.showing=true;this.hidden=false;this.cssText=this.element.style.cssText;var d;this.element.measure(function(){d=this.element.getComputedSize({styles:this.options.styles,mode:this.options.mode});
+}.bind(this));if(this.options.heightOverride!=null){d.height=this.options.heightOverride.toInt();}if(this.options.widthOverride!=null){d.width=this.options.widthOverride.toInt();
+}if(this.options.transitionOpacity){this.element.setStyle("opacity",0);d.opacity=this.options.opacity;}var c={height:0,display:Function.from(this.options.display).call(this)};
+Object.each(d,function(f,e){c[e]=0;});c.overflow="hidden";this.element.setStyles(c);var b=a(this);if(b){b.setStyle("visibility","hidden");}this.$chain.unshift(function(){this.element.style.cssText=this.cssText;
+this.element.setStyle("display",Function.from(this.options.display).call(this));if(!this.hidden){this.showing=false;}if(b){b.setStyle("visibility","visible");
+}this.callChain();this.fireEvent("show",this.element);}.bind(this));this.start(d);}else{this.callChain();this.fireEvent("complete",this.element);this.fireEvent("show",this.element);
+}}else{if(this.options.link=="chain"){this.chain(this.reveal.bind(this));}else{if(this.options.link=="cancel"&&!this.showing){this.cancel();this.reveal();
+}}}return this;},toggle:function(){if(this.element.getStyle("display")=="none"){this.reveal();}else{this.dissolve();}return this;},cancel:function(){this.parent.apply(this,arguments);
+if(this.cssText!=null){this.element.style.cssText=this.cssText;}this.hiding=false;this.showing=false;return this;}});Element.Properties.reveal={set:function(b){this.get("reveal").cancel().setOptions(b);
+return this;},get:function(){var b=this.retrieve("reveal");if(!b){b=new Fx.Reveal(this);this.store("reveal",b);}return b;}};Element.Properties.dissolve=Element.Properties.reveal;
+Element.implement({reveal:function(b){this.get("reveal").setOptions(b).reveal();return this;},dissolve:function(b){this.get("reveal").setOptions(b).dissolve();
+return this;},nix:function(b){var c=Array.link(arguments,{destroy:Type.isBoolean,options:Type.isObject});this.get("reveal").setOptions(b).dissolve().chain(function(){this[c.destroy?"destroy":"dispose"]();
+}.bind(this));return this;},wink:function(){var c=Array.link(arguments,{duration:Type.isNumber,options:Type.isObject});var b=this.get("reveal").setOptions(c.options);
+b.reveal().chain(function(){(function(){b.dissolve();}).delay(c.duration||2000);});}});})();Form.Request.Append=new Class({Extends:Form.Request,options:{useReveal:true,revealOptions:{},inject:"bottom"},makeRequest:function(){this.request=new Request.HTML(Object.merge({url:this.element.get("action"),method:this.element.get("method")||"post",spinnerTarget:this.element},this.options.requestOptions,{evalScripts:false})).addEvents({success:function(b,g,f,a){var c;
+var d=Elements.from(f);if(d.length==1){c=d[0];}else{c=new Element("div",{styles:{display:"none"}}).adopt(d);}c.inject(this.target,this.options.inject);
+if(this.options.requestOptions.evalScripts){Browser.exec(a);}this.fireEvent("beforeEffect",c);var e=function(){this.fireEvent("success",[c,this.target,b,g,f,a]);
+}.bind(this);if(this.options.useReveal){c.set("reveal",this.options.revealOptions).get("reveal").chain(e);c.reveal();}else{e();}}.bind(this),failure:function(a){this.fireEvent("failure",a);
+}.bind(this)});this.attachReset();}});Locale.define("en-US","FormValidator",{required:"This field is required.",length:"Please enter {length} characters (you entered {elLength} characters)",minLength:"Please enter at least {minLength} characters (you entered {length} characters).",maxLength:"Please enter no more than {maxLength} characters (you entered {length} characters).",integer:"Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.",numeric:'Please enter only numeric values in this field (i.e. "1" or "1.1" or "-1" or "-1.1").',digits:"Please use numbers and punctuation only in this field (for example, a phone number with dashes or dots is permitted).",alpha:"Please use only letters (a-z) within this field. No spaces or other characters are allowed.",alphanum:"Please use only letters (a-z) or numbers (0-9) in this field. No spaces or other characters are allowed.",dateSuchAs:"Please enter a valid date such as {date}",dateInFormatMDY:'Please enter a valid date such as MM/DD/YYYY (i.e. "12/31/1999")',email:'Please enter a valid email address. For example "fred@domain.com".',url:"Please enter a valid URL such as http://www.example.com.",currencyDollar:"Please enter a valid $ amount. For example $100.00 .",oneRequired:"Please enter something for at least one of these inputs.",errorPrefix:"Error: ",warningPrefix:"Warning: ",noSpace:"There can be no spaces in this input.",reqChkByNode:"No items are selected.",requiredChk:"This field is required.",reqChkByName:"Please select a {label}.",match:"This field needs to match the {matchName} field",startDate:"the start date",endDate:"the end date",currendDate:"the current date",afterDate:"The date should be the same or after {label}.",beforeDate:"The date should be the same or before {label}.",startMonth:"Please select a start month",sameMonth:"These two dates must be in the same month - you must change one or the other.",creditcard:"The credit card number entered is invalid. Please check the number and try again. {length} digits entered."});
+if(!window.Form){window.Form={};}var InputValidator=this.InputValidator=new Class({Implements:[Options],options:{errorMsg:"Validation failed.",test:Function.from(true)},initialize:function(b,a){this.setOptions(a);
+this.className=b;},test:function(b,a){b=document.id(b);return(b)?this.options.test(b,a||this.getProps(b)):false;},getError:function(c,a){c=document.id(c);
+var b=this.options.errorMsg;if(typeOf(b)=="function"){b=b(c,a||this.getProps(c));}return b;},getProps:function(a){a=document.id(a);return(a)?a.get("validatorProps"):{};
+}});Element.Properties.validators={get:function(){return(this.get("data-validators")||this.className).clean().split(" ");}};Element.Properties.validatorProps={set:function(a){return this.eliminate("$moo:validatorProps").store("$moo:validatorProps",a);
+},get:function(a){if(a){this.set(a);}if(this.retrieve("$moo:validatorProps")){return this.retrieve("$moo:validatorProps");}if(this.getProperty("data-validator-properties")||this.getProperty("validatorProps")){try{this.store("$moo:validatorProps",JSON.decode(this.getProperty("validatorProps")||this.getProperty("data-validator-properties")));
+}catch(c){return{};}}else{var b=this.get("validators").filter(function(d){return d.test(":");});if(!b.length){this.store("$moo:validatorProps",{});}else{a={};
+b.each(function(d){var f=d.split(":");if(f[1]){try{a[f[0]]=JSON.decode(f[1]);}catch(g){}}});this.store("$moo:validatorProps",a);}}return this.retrieve("$moo:validatorProps");
+}};Form.Validator=new Class({Implements:[Options,Events],Binds:["onSubmit"],options:{fieldSelectors:"input, select, textarea",ignoreHidden:true,ignoreDisabled:true,useTitles:false,evaluateOnSubmit:true,evaluateFieldsOnBlur:true,evaluateFieldsOnChange:true,serial:true,stopOnFailure:true,warningPrefix:function(){return Form.Validator.getMsg("warningPrefix")||"Warning: ";
+},errorPrefix:function(){return Form.Validator.getMsg("errorPrefix")||"Error: ";}},initialize:function(b,a){this.setOptions(a);this.element=document.id(b);
+this.element.store("validator",this);this.warningPrefix=Function.from(this.options.warningPrefix)();this.errorPrefix=Function.from(this.options.errorPrefix)();
+if(this.options.evaluateOnSubmit){this.element.addEvent("submit",this.onSubmit);}if(this.options.evaluateFieldsOnBlur||this.options.evaluateFieldsOnChange){this.watchFields(this.getFields());
+}},toElement:function(){return this.element;},getFields:function(){return(this.fields=this.element.getElements(this.options.fieldSelectors));},watchFields:function(a){a.each(function(b){if(this.options.evaluateFieldsOnBlur){b.addEvent("blur",this.validationMonitor.pass([b,false],this));
+}if(this.options.evaluateFieldsOnChange){b.addEvent("change",this.validationMonitor.pass([b,true],this));}},this);},validationMonitor:function(){clearTimeout(this.timer);
+this.timer=this.validateField.delay(50,this,arguments);},onSubmit:function(a){if(this.validate(a)){this.reset();}},reset:function(){this.getFields().each(this.resetField,this);
+return this;},validate:function(b){var a=this.getFields().map(function(c){return this.validateField(c,true);},this).every(function(c){return c;});this.fireEvent("formValidate",[a,this.element,b]);
+if(this.options.stopOnFailure&&!a&&b){b.preventDefault();}return a;},validateField:function(j,b){if(this.paused){return true;}j=document.id(j);var f=!j.hasClass("validation-failed");
+var g,i;if(this.options.serial&&!b){g=this.element.getElement(".validation-failed");i=this.element.getElement(".warning");}if(j&&(!g||b||j.hasClass("validation-failed")||(g&&!this.options.serial))){var a=j.get("validators");
+var d=a.some(function(k){return this.getValidator(k);},this);var h=[];a.each(function(k){if(k&&!this.test(k,j)){h.include(k);}},this);f=h.length===0;if(d&&!this.hasValidator(j,"warnOnly")){if(f){j.addClass("validation-passed").removeClass("validation-failed");
+this.fireEvent("elementPass",[j]);}else{j.addClass("validation-failed").removeClass("validation-passed");this.fireEvent("elementFail",[j,h]);}}if(!i){var e=a.some(function(k){if(k.test("^warn")){return this.getValidator(k.replace(/^warn-/,""));
+}else{return null;}},this);j.removeClass("warning");var c=a.map(function(k){if(k.test("^warn")){return this.test(k.replace(/^warn-/,""),j,true);}else{return null;
+}},this);}}return f;},test:function(b,d,e){d=document.id(d);if((this.options.ignoreHidden&&!d.isVisible())||(this.options.ignoreDisabled&&d.get("disabled"))){return true;
+}var a=this.getValidator(b);if(e!=null){e=false;}if(this.hasValidator(d,"warnOnly")){e=true;}var c=this.hasValidator(d,"ignoreValidation")||(a?a.test(d):true);
+if(a&&d.isVisible()){this.fireEvent("elementValidate",[c,d,b,e]);}if(e){return true;}return c;},hasValidator:function(b,a){return b.get("validators").contains(a);
+},resetField:function(a){a=document.id(a);if(a){a.get("validators").each(function(b){if(b.test("^warn-")){b=b.replace(/^warn-/,"");}a.removeClass("validation-failed");
+a.removeClass("warning");a.removeClass("validation-passed");},this);}return this;},stop:function(){this.paused=true;return this;},start:function(){this.paused=false;
+return this;},ignoreField:function(a,b){a=document.id(a);if(a){this.enforceField(a);if(b){a.addClass("warnOnly");}else{a.addClass("ignoreValidation");}}return this;
+},enforceField:function(a){a=document.id(a);if(a){a.removeClass("warnOnly").removeClass("ignoreValidation");}return this;}});Form.Validator.getMsg=function(a){return Locale.get("FormValidator."+a);
+};Form.Validator.adders={validators:{},add:function(b,a){this.validators[b]=new InputValidator(b,a);if(!this.initialize){this.implement({validators:this.validators});
+}},addAllThese:function(a){Array.from(a).each(function(b){this.add(b[0],b[1]);},this);},getValidator:function(a){return this.validators[a.split(":")[0]];
+}};Object.append(Form.Validator,Form.Validator.adders);Form.Validator.implement(Form.Validator.adders);Form.Validator.add("IsEmpty",{errorMsg:false,test:function(a){if(a.type=="select-one"||a.type=="select"){return !(a.selectedIndex>=0&&a.options[a.selectedIndex].value!="");
+}else{return((a.get("value")==null)||(a.get("value").length==0));}}});Form.Validator.addAllThese([["required",{errorMsg:function(){return Form.Validator.getMsg("required");
+},test:function(a){return !Form.Validator.getValidator("IsEmpty").test(a);}}],["length",{errorMsg:function(a,b){if(typeOf(b.length)!="null"){return Form.Validator.getMsg("length").substitute({length:b.length,elLength:a.get("value").length});
+}else{return"";}},test:function(a,b){if(typeOf(b.length)!="null"){return(a.get("value").length==b.length||a.get("value").length==0);}else{return true;}}}],["minLength",{errorMsg:function(a,b){if(typeOf(b.minLength)!="null"){return Form.Validator.getMsg("minLength").substitute({minLength:b.minLength,length:a.get("value").length});
+}else{return"";}},test:function(a,b){if(typeOf(b.minLength)!="null"){return(a.get("value").length>=(b.minLength||0));}else{return true;}}}],["maxLength",{errorMsg:function(a,b){if(typeOf(b.maxLength)!="null"){return Form.Validator.getMsg("maxLength").substitute({maxLength:b.maxLength,length:a.get("value").length});
+}else{return"";}},test:function(a,b){return a.get("value").length<=(b.maxLength||10000);}}],["validate-integer",{errorMsg:Form.Validator.getMsg.pass("integer"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^(-?[1-9]\d*|0)$/).test(a.get("value"));
+}}],["validate-numeric",{errorMsg:Form.Validator.getMsg.pass("numeric"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^-?(?:0$0(?=\d*\.)|[1-9]|0)\d*(\.\d+)?$/).test(a.get("value"));
+}}],["validate-digits",{errorMsg:Form.Validator.getMsg.pass("digits"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^[\d() .:\-\+#]+$/.test(a.get("value")));
+}}],["validate-alpha",{errorMsg:Form.Validator.getMsg.pass("alpha"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^[a-zA-Z]+$/).test(a.get("value"));
+}}],["validate-alphanum",{errorMsg:Form.Validator.getMsg.pass("alphanum"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||!(/\W/).test(a.get("value"));
+}}],["validate-date",{errorMsg:function(a,b){if(Date.parse){var c=b.dateFormat||"%x";return Form.Validator.getMsg("dateSuchAs").substitute({date:new Date().format(c)});
+}else{return Form.Validator.getMsg("dateInFormatMDY");}},test:function(e,g){if(Form.Validator.getValidator("IsEmpty").test(e)){return true;}var a=Locale.getCurrent().sets.Date,b=new RegExp([a.days,a.days_abbr,a.months,a.months_abbr].flatten().join("|"),"i"),i=e.get("value"),f=i.match(/[a-z]+/gi);
+if(f&&!f.every(b.exec,b)){return false;}var c=Date.parse(i),h=g.dateFormat||"%x",d=c.format(h);if(d!="invalid date"){e.set("value",d);}return c.isValid();
+}}],["validate-email",{errorMsg:Form.Validator.getMsg.pass("email"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+\/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(a.get("value"));
+}}],["validate-url",{errorMsg:Form.Validator.getMsg.pass("url"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i).test(a.get("value"));
+}}],["validate-currency-dollar",{errorMsg:Form.Validator.getMsg.pass("currencyDollar"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(a.get("value"));
+}}],["validate-one-required",{errorMsg:Form.Validator.getMsg.pass("oneRequired"),test:function(a,b){var c=document.id(b["validate-one-required"])||a.getParent(b["validate-one-required"]);
+return c.getElements("input").some(function(d){if(["checkbox","radio"].contains(d.get("type"))){return d.get("checked");}return d.get("value");});}}]]);
+Element.Properties.validator={set:function(a){this.get("validator").setOptions(a);},get:function(){var a=this.retrieve("validator");if(!a){a=new Form.Validator(this);
+this.store("validator",a);}return a;}};Element.implement({validate:function(a){if(a){this.set("validator",a);}return this.get("validator").validate();}});
+Form.Validator.Inline=new Class({Extends:Form.Validator,options:{showError:function(a){if(a.reveal){a.reveal();}else{a.setStyle("display","block");}},hideError:function(a){if(a.dissolve){a.dissolve();
+}else{a.setStyle("display","none");}},scrollToErrorsOnSubmit:true,scrollToErrorsOnBlur:false,scrollToErrorsOnChange:false,scrollFxOptions:{transition:"quad:out",offset:{y:-20}}},initialize:function(b,a){this.parent(b,a);
+this.addEvent("onElementValidate",function(g,f,e,h){var d=this.getValidator(e);if(!g&&d.getError(f)){if(h){f.addClass("warning");}var c=this.makeAdvice(e,f,d.getError(f),h);
+this.insertAdvice(c,f);this.showAdvice(e,f);}else{this.hideAdvice(e,f);}});},makeAdvice:function(d,f,c,g){var e=(g)?this.warningPrefix:this.errorPrefix;
+e+=(this.options.useTitles)?f.title||c:c;var a=(g)?"warning-advice":"validation-advice";var b=this.getAdvice(d,f);if(b){b=b.set("html",e);}else{b=new Element("div",{html:e,styles:{display:"none"},id:"advice-"+d.split(":")[0]+"-"+this.getFieldId(f)}).addClass(a);
+}f.store("$moo:advice-"+d,b);return b;},getFieldId:function(a){return a.id?a.id:a.id="input_"+a.name;},showAdvice:function(b,c){var a=this.getAdvice(b,c);
+if(a&&!c.retrieve("$moo:"+this.getPropName(b))&&(a.getStyle("display")=="none"||a.getStyle("visiblity")=="hidden"||a.getStyle("opacity")==0)){c.store("$moo:"+this.getPropName(b),true);
+this.options.showError(a);this.fireEvent("showAdvice",[c,a,b]);}},hideAdvice:function(b,c){var a=this.getAdvice(b,c);if(a&&c.retrieve("$moo:"+this.getPropName(b))){c.store("$moo:"+this.getPropName(b),false);
+this.options.hideError(a);this.fireEvent("hideAdvice",[c,a,b]);}},getPropName:function(a){return"advice"+a;},resetField:function(a){a=document.id(a);if(!a){return this;
+}this.parent(a);a.get("validators").each(function(b){this.hideAdvice(b,a);},this);return this;},getAllAdviceMessages:function(d,c){var b=[];if(d.hasClass("ignoreValidation")&&!c){return b;
+}var a=d.get("validators").some(function(g){var e=g.test("^warn-")||d.hasClass("warnOnly");if(e){g=g.replace(/^warn-/,"");}var f=this.getValidator(g);if(!f){return;
+}b.push({message:f.getError(d),warnOnly:e,passed:f.test(),validator:f});},this);return b;},getAdvice:function(a,b){return b.retrieve("$moo:advice-"+a);
+},insertAdvice:function(a,c){var b=c.get("validatorProps");if(!b.msgPos||!document.id(b.msgPos)){if(c.type&&c.type.toLowerCase()=="radio"){c.getParent().adopt(a);
+}else{a.inject(document.id(c),"after");}}else{document.id(b.msgPos).grab(a);}},validateField:function(g,f,b){var a=this.parent(g,f);if(((this.options.scrollToErrorsOnSubmit&&b==null)||b)&&!a){var c=document.id(this).getElement(".validation-failed");
+var d=document.id(this).getParent();while(d!=document.body&&d.getScrollSize().y==d.getSize().y){d=d.getParent();}var e=d.retrieve("$moo:fvScroller");if(!e&&window.Fx&&Fx.Scroll){e=new Fx.Scroll(d,this.options.scrollFxOptions);
+d.store("$moo:fvScroller",e);}if(c){if(e){e.toElement(c);}else{d.scrollTo(d.getScroll().x,c.getPosition(d).y-20);}}}return a;},watchFields:function(a){a.each(function(b){if(this.options.evaluateFieldsOnBlur){b.addEvent("blur",this.validationMonitor.pass([b,false,this.options.scrollToErrorsOnBlur],this));
+}if(this.options.evaluateFieldsOnChange){b.addEvent("change",this.validationMonitor.pass([b,true,this.options.scrollToErrorsOnChange],this));}},this);}});
+Form.Validator.addAllThese([["validate-enforce-oncheck",{test:function(a,b){var c=a.getParent("form").retrieve("validator");if(!c){return true;}(b.toEnforce||document.id(b.enforceChildrenOf).getElements("input, select, textarea")).map(function(d){if(a.checked){c.enforceField(d);
+}else{c.ignoreField(d);c.resetField(d);}});return true;}}],["validate-ignore-oncheck",{test:function(a,b){var c=a.getParent("form").retrieve("validator");
+if(!c){return true;}(b.toIgnore||document.id(b.ignoreChildrenOf).getElements("input, select, textarea")).each(function(d){if(a.checked){c.ignoreField(d);
+c.resetField(d);}else{c.enforceField(d);}});return true;}}],["validate-nospace",{errorMsg:function(){return Form.Validator.getMsg("noSpace");},test:function(a,b){return !a.get("value").test(/\s/);
+}}],["validate-toggle-oncheck",{test:function(b,c){var d=b.getParent("form").retrieve("validator");if(!d){return true;}var a=c.toToggle||document.id(c.toToggleChildrenOf).getElements("input, select, textarea");
+if(!b.checked){a.each(function(e){d.ignoreField(e);d.resetField(e);});}else{a.each(function(e){d.enforceField(e);});}return true;}}],["validate-reqchk-bynode",{errorMsg:function(){return Form.Validator.getMsg("reqChkByNode");
+},test:function(a,b){return(document.id(b.nodeId).getElements(b.selector||"input[type=checkbox], input[type=radio]")).some(function(c){return c.checked;
+});}}],["validate-required-check",{errorMsg:function(a,b){return b.useTitle?a.get("title"):Form.Validator.getMsg("requiredChk");},test:function(a,b){return !!a.checked;
+}}],["validate-reqchk-byname",{errorMsg:function(a,b){return Form.Validator.getMsg("reqChkByName").substitute({label:b.label||a.get("type")});},test:function(b,d){var c=d.groupName||b.get("name");
+var a=$$(document.getElementsByName(c)).some(function(g,f){return g.checked;});var e=b.getParent("form").retrieve("validator");if(a&&e){e.resetField(b);
+}return a;}}],["validate-match",{errorMsg:function(a,b){return Form.Validator.getMsg("match").substitute({matchName:b.matchName||document.id(b.matchInput).get("name")});
+},test:function(b,c){var d=b.get("value");var a=document.id(c.matchInput)&&document.id(c.matchInput).get("value");return d&&a?d==a:true;}}],["validate-after-date",{errorMsg:function(a,b){return Form.Validator.getMsg("afterDate").substitute({label:b.afterLabel||(b.afterElement?Form.Validator.getMsg("startDate"):Form.Validator.getMsg("currentDate"))});
+},test:function(b,c){var d=document.id(c.afterElement)?Date.parse(document.id(c.afterElement).get("value")):new Date();var a=Date.parse(b.get("value"));
+return a&&d?a>=d:true;}}],["validate-before-date",{errorMsg:function(a,b){return Form.Validator.getMsg("beforeDate").substitute({label:b.beforeLabel||(b.beforeElement?Form.Validator.getMsg("endDate"):Form.Validator.getMsg("currentDate"))});
+},test:function(b,c){var d=Date.parse(b.get("value"));var a=document.id(c.beforeElement)?Date.parse(document.id(c.beforeElement).get("value")):new Date();
+return a&&d?a>=d:true;}}],["validate-custom-required",{errorMsg:function(){return Form.Validator.getMsg("required");},test:function(a,b){return a.get("value")!=b.emptyValue;
+}}],["validate-same-month",{errorMsg:function(a,b){var c=document.id(b.sameMonthAs)&&document.id(b.sameMonthAs).get("value");var d=a.get("value");if(d!=""){return Form.Validator.getMsg(c?"sameMonth":"startMonth");
+}},test:function(a,b){var d=Date.parse(a.get("value"));var c=Date.parse(document.id(b.sameMonthAs)&&document.id(b.sameMonthAs).get("value"));return d&&c?d.format("%B")==c.format("%B"):true;
+}}],["validate-cc-num",{errorMsg:function(a){var b=a.get("value").replace(/[^0-9]/g,"");return Form.Validator.getMsg("creditcard").substitute({length:b.length});
+},test:function(c){if(Form.Validator.getValidator("IsEmpty").test(c)){return true;}var g=c.get("value");g=g.replace(/[^0-9]/g,"");var a=false;if(g.test(/^4[0-9]{12}([0-9]{3})?$/)){a="Visa";
+}else{if(g.test(/^5[1-5]([0-9]{14})$/)){a="Master Card";}else{if(g.test(/^3[47][0-9]{13}$/)){a="American Express";}else{if(g.test(/^6011[0-9]{12}$/)){a="Discover";
+}}}}if(a){var d=0;var e=0;for(var b=g.length-1;b>=0;--b){e=g.charAt(b).toInt();if(e==0){continue;}if((g.length-b)%2==0){e+=e;}if(e>9){e=e.toString().charAt(0).toInt()+e.toString().charAt(1).toInt();
+}d+=e;}if((d%10)==0){return true;}}var f="";while(g!=""){f+=" "+g.substr(0,4);g=g.substr(4);}c.getParent("form").retrieve("validator").ignoreField(c);c.set("value",f.clean());
+c.getParent("form").retrieve("validator").enforceField(c);return false;}}]]);var OverText=new Class({Implements:[Options,Events,Class.Occlude],Binds:["reposition","assert","focus","hide"],options:{element:"label",labelClass:"overTxtLabel",positionOptions:{position:"upperLeft",edge:"upperLeft",offset:{x:4,y:2}},poll:false,pollInterval:250,wrap:false},property:"OverText",initialize:function(b,a){b=this.element=document.id(b);
+if(this.occlude()){return this.occluded;}this.setOptions(a);this.attach(b);OverText.instances.push(this);if(this.options.poll){this.poll();}},toElement:function(){return this.element;
+},attach:function(){var b=this.element,a=this.options,c=a.textOverride||b.get("alt")||b.get("title");if(!c){return this;}var d=this.text=new Element(a.element,{"class":a.labelClass,styles:{lineHeight:"normal",position:"absolute",cursor:"text"},html:c,events:{click:this.hide.pass(a.element=="label",this)}}).inject(b,"after");
+if(a.element=="label"){if(!b.get("id")){b.set("id","input_"+String.uniqueID());}d.set("for",b.get("id"));}if(a.wrap){this.textHolder=new Element("div.overTxtWrapper",{styles:{lineHeight:"normal",position:"relative"}}).grab(d).inject(b,"before");
+}return this.enable();},destroy:function(){this.element.eliminate(this.property);this.disable();if(this.text){this.text.destroy();}if(this.textHolder){this.textHolder.destroy();
+}return this;},disable:function(){this.element.removeEvents({focus:this.focus,blur:this.assert,change:this.assert});window.removeEvent("resize",this.reposition);
+this.hide(true,true);return this;},enable:function(){this.element.addEvents({focus:this.focus,blur:this.assert,change:this.assert});window.addEvent("resize",this.reposition);
+this.reposition();return this;},wrap:function(){if(this.options.element=="label"){if(!this.element.get("id")){this.element.set("id","input_"+String.uniqueID());
+}this.text.set("for",this.element.get("id"));}},startPolling:function(){this.pollingPaused=false;return this.poll();},poll:function(a){if(this.poller&&!a){return this;
+}if(a){clearInterval(this.poller);}else{this.poller=(function(){if(!this.pollingPaused){this.assert(true);}}).periodical(this.options.pollInterval,this);
+}return this;},stopPolling:function(){this.pollingPaused=true;return this.poll(true);},focus:function(){if(this.text&&(!this.text.isDisplayed()||this.element.get("disabled"))){return this;
+}return this.hide();},hide:function(c,a){if(this.text&&(this.text.isDisplayed()&&(!this.element.get("disabled")||a))){this.text.hide();this.fireEvent("textHide",[this.text,this.element]);
+this.pollingPaused=true;if(!c){try{this.element.fireEvent("focus");this.element.focus();}catch(b){}}}return this;},show:function(){if(this.text&&!this.text.isDisplayed()){this.text.show();
+this.reposition();this.fireEvent("textShow",[this.text,this.element]);this.pollingPaused=false;}return this;},test:function(){return !this.element.get("value");
+},assert:function(a){return this[this.test()?"show":"hide"](a);},reposition:function(){this.assert(true);if(!this.element.isVisible()){return this.stopPolling().hide();
+}if(this.text&&this.test()){this.text.position(Object.merge(this.options.positionOptions,{relativeTo:this.element}));}return this;}});OverText.instances=[];
+Object.append(OverText,{each:function(a){return OverText.instances.each(function(c,b){if(c.element&&c.text){a.call(OverText,c,b);}});},update:function(){return OverText.each(function(a){return a.reposition();
+});},hideAll:function(){return OverText.each(function(a){return a.hide(true,true);});},showAll:function(){return OverText.each(function(a){return a.show();
+});}});Fx.Elements=new Class({Extends:Fx.CSS,initialize:function(b,a){this.elements=this.subject=$$(b);this.parent(a);},compute:function(g,h,j){var c={};
+for(var d in g){var a=g[d],e=h[d],f=c[d]={};for(var b in a){f[b]=this.parent(a[b],e[b],j);}}return c;},set:function(b){for(var c in b){if(!this.elements[c]){continue;
+}var a=b[c];for(var d in a){this.render(this.elements[c],d,a[d],this.options.unit);}}return this;},start:function(c){if(!this.check(c)){return this;}var h={},j={};
+for(var d in c){if(!this.elements[d]){continue;}var f=c[d],a=h[d]={},g=j[d]={};for(var b in f){var e=this.prepare(this.elements[d],b,f[b]);a[b]=e.from;
+g[b]=e.to;}}return this.parent(h,j);}});Fx.Accordion=new Class({Extends:Fx.Elements,options:{fixedHeight:false,fixedWidth:false,display:0,show:false,height:true,width:false,opacity:true,alwaysHide:false,trigger:"click",initialDisplayFx:true,resetHeight:true},initialize:function(){var g=function(h){return h!=null;
+};var f=Array.link(arguments,{container:Type.isElement,options:Type.isObject,togglers:g,elements:g});this.parent(f.elements,f.options);var b=this.options,e=this.togglers=$$(f.togglers);
+this.previous=-1;this.internalChain=new Chain();if(b.alwaysHide){this.options.link="chain";}if(b.show||this.options.show===0){b.display=false;this.previous=b.show;
+}if(b.start){b.display=false;b.show=false;}var d=this.effects={};if(b.opacity){d.opacity="fullOpacity";}if(b.width){d.width=b.fixedWidth?"fullWidth":"offsetWidth";
+}if(b.height){d.height=b.fixedHeight?"fullHeight":"scrollHeight";}for(var c=0,a=e.length;c<a;c++){this.addSection(e[c],this.elements[c]);}this.elements.each(function(j,h){if(b.show===h){this.fireEvent("active",[e[h],j]);
+}else{for(var k in d){j.setStyle(k,0);}}},this);if(b.display||b.display===0||b.initialDisplayFx===false){this.display(b.display,b.initialDisplayFx);}if(b.fixedHeight!==false){b.resetHeight=false;
+}this.addEvent("complete",this.internalChain.callChain.bind(this.internalChain));},addSection:function(g,d){g=document.id(g);d=document.id(d);this.togglers.include(g);
+this.elements.include(d);var f=this.togglers,c=this.options,h=f.contains(g),a=f.indexOf(g),b=this.display.pass(a,this);g.store("accordion:display",b).addEvent(c.trigger,b);
+if(c.height){d.setStyles({"padding-top":0,"border-top":"none","padding-bottom":0,"border-bottom":"none"});}if(c.width){d.setStyles({"padding-left":0,"border-left":"none","padding-right":0,"border-right":"none"});
+}d.fullOpacity=1;if(c.fixedWidth){d.fullWidth=c.fixedWidth;}if(c.fixedHeight){d.fullHeight=c.fixedHeight;}d.setStyle("overflow","hidden");if(!h){for(var e in this.effects){d.setStyle(e,0);
+}}return this;},removeSection:function(f,b){var e=this.togglers,a=e.indexOf(f),c=this.elements[a];var d=function(){e.erase(f);this.elements.erase(c);this.detach(f);
+}.bind(this);if(this.now==a||b!=null){this.display(b!=null?b:(a-1>=0?a-1:0)).chain(d);}else{d();}return this;},detach:function(b){var a=function(c){c.removeEvent(this.options.trigger,c.retrieve("accordion:display"));
+}.bind(this);if(!b){this.togglers.each(a);}else{a(b);}return this;},display:function(b,c){if(!this.check(b,c)){return this;}var h={},g=this.elements,a=this.options,f=this.effects;
+if(c==null){c=true;}if(typeOf(b)=="element"){b=g.indexOf(b);}if(b==this.previous&&!a.alwaysHide){return this;}if(a.resetHeight){var e=g[this.previous];
+if(e&&!this.selfHidden){for(var d in f){e.setStyle(d,e[f[d]]);}}}if((this.timer&&a.link=="chain")||(b===this.previous&&!a.alwaysHide)){return this;}this.previous=b;
+this.selfHidden=false;g.each(function(l,k){h[k]={};var j;if(k!=b){j=true;}else{if(a.alwaysHide&&((l.offsetHeight>0&&a.height)||l.offsetWidth>0&&a.width)){j=true;
+this.selfHidden=true;}}this.fireEvent(j?"background":"active",[this.togglers[k],l]);for(var m in f){h[k][m]=j?0:l[f[m]];}if(!c&&!j&&a.resetHeight){h[k].height="auto";
+}},this);this.internalChain.clearChain();this.internalChain.chain(function(){if(a.resetHeight&&!this.selfHidden){var i=g[b];if(i){i.setStyle("height","auto");
+}}}.bind(this));return c?this.start(h):this.set(h).internalChain.callChain();}});Fx.Move=new Class({Extends:Fx.Morph,options:{relativeTo:document.body,position:"center",edge:false,offset:{x:0,y:0}},start:function(a){var b=this.element,c=b.getStyles("top","left");
+if(c.top=="auto"||c.left=="auto"){b.setPosition(b.getPosition(b.getOffsetParent()));}return this.parent(b.position(Object.merge({},this.options,a,{returnPos:true})));
+}});Element.Properties.move={set:function(a){this.get("move").cancel().setOptions(a);return this;},get:function(){var a=this.retrieve("move");if(!a){a=new Fx.Move(this,{link:"cancel"});
+this.store("move",a);}return a;}};Element.implement({move:function(a){this.get("move").start(a);return this;}});(function(){Fx.Scroll=new Class({Extends:Fx,options:{offset:{x:0,y:0},wheelStops:true},initialize:function(c,b){this.element=this.subject=document.id(c);
+this.parent(b);if(typeOf(this.element)!="element"){this.element=document.id(this.element.getDocument().body);}if(this.options.wheelStops){var d=this.element,e=this.cancel.pass(false,this);
+this.addEvent("start",function(){d.addEvent("mousewheel",e);},true);this.addEvent("complete",function(){d.removeEvent("mousewheel",e);},true);}},set:function(){var b=Array.flatten(arguments);
+if(Browser.firefox){b=[Math.round(b[0]),Math.round(b[1])];}this.element.scrollTo(b[0],b[1]);return this;},compute:function(d,c,b){return[0,1].map(function(e){return Fx.compute(d[e],c[e],b);
+});},start:function(c,d){if(!this.check(c,d)){return this;}var b=this.element.getScroll();return this.parent([b.x,b.y],[c,d]);},calculateScroll:function(g,f){var d=this.element,b=d.getScrollSize(),h=d.getScroll(),j=d.getSize(),c=this.options.offset,i={x:g,y:f};
+for(var e in i){if(!i[e]&&i[e]!==0){i[e]=h[e];}if(typeOf(i[e])!="number"){i[e]=b[e]-j[e];}i[e]+=c[e];}return[i.x,i.y];},toTop:function(){return this.start.apply(this,this.calculateScroll(false,0));
+},toLeft:function(){return this.start.apply(this,this.calculateScroll(0,false));},toRight:function(){return this.start.apply(this,this.calculateScroll("right",false));
+},toBottom:function(){return this.start.apply(this,this.calculateScroll(false,"bottom"));},toElement:function(d,e){e=e?Array.from(e):["x","y"];var c=a(this.element)?{x:0,y:0}:this.element.getScroll();
+var b=Object.map(document.id(d).getPosition(this.element),function(g,f){return e.contains(f)?g+c[f]:false;});return this.start.apply(this,this.calculateScroll(b.x,b.y));
+},toElementEdge:function(d,g,e){g=g?Array.from(g):["x","y"];d=document.id(d);var i={},f=d.getPosition(this.element),j=d.getSize(),h=this.element.getScroll(),b=this.element.getSize(),c={x:f.x+j.x,y:f.y+j.y};
+["x","y"].each(function(k){if(g.contains(k)){if(c[k]>h[k]+b[k]){i[k]=c[k]-b[k];}if(f[k]<h[k]){i[k]=f[k];}}if(i[k]==null){i[k]=h[k];}if(e&&e[k]){i[k]=i[k]+e[k];
+}},this);if(i.x!=h.x||i.y!=h.y){this.start(i.x,i.y);}return this;},toElementCenter:function(e,f,h){f=f?Array.from(f):["x","y"];e=document.id(e);var i={},c=e.getPosition(this.element),d=e.getSize(),b=this.element.getScroll(),g=this.element.getSize();
+["x","y"].each(function(j){if(f.contains(j)){i[j]=c[j]-(g[j]-d[j])/2;}if(i[j]==null){i[j]=b[j];}if(h&&h[j]){i[j]=i[j]+h[j];}},this);if(i.x!=b.x||i.y!=b.y){this.start(i.x,i.y);
+}return this;}});function a(b){return(/^(?:body|html)$/i).test(b.tagName);}})();Fx.Slide=new Class({Extends:Fx,options:{mode:"vertical",wrapper:false,hideOverflow:true,resetHeight:false},initialize:function(b,a){b=this.element=this.subject=document.id(b);
+this.parent(a);a=this.options;var d=b.retrieve("wrapper"),c=b.getStyles("margin","position","overflow");if(a.hideOverflow){c=Object.append(c,{overflow:"hidden"});
+}if(a.wrapper){d=document.id(a.wrapper).setStyles(c);}if(!d){d=new Element("div",{styles:c}).wraps(b);}b.store("wrapper",d).setStyle("margin",0);if(b.getStyle("overflow")=="visible"){b.setStyle("overflow","hidden");
+}this.now=[];this.open=true;this.wrapper=d;this.addEvent("complete",function(){this.open=(d["offset"+this.layout.capitalize()]!=0);if(this.open&&this.options.resetHeight){d.setStyle("height","");
+}},true);},vertical:function(){this.margin="margin-top";this.layout="height";this.offset=this.element.offsetHeight;},horizontal:function(){this.margin="margin-left";
+this.layout="width";this.offset=this.element.offsetWidth;},set:function(a){this.element.setStyle(this.margin,a[0]);this.wrapper.setStyle(this.layout,a[1]);
+return this;},compute:function(c,b,a){return[0,1].map(function(d){return Fx.compute(c[d],b[d],a);});},start:function(b,e){if(!this.check(b,e)){return this;
+}this[e||this.options.mode]();var d=this.element.getStyle(this.margin).toInt(),c=this.wrapper.getStyle(this.layout).toInt(),a=[[d,c],[0,this.offset]],g=[[d,c],[-this.offset,0]],f;
+switch(b){case"in":f=a;break;case"out":f=g;break;case"toggle":f=(c==0)?a:g;}return this.parent(f[0],f[1]);},slideIn:function(a){return this.start("in",a);
+},slideOut:function(a){return this.start("out",a);},hide:function(a){this[a||this.options.mode]();this.open=false;return this.set([-this.offset,0]);},show:function(a){this[a||this.options.mode]();
+this.open=true;return this.set([0,this.offset]);},toggle:function(a){return this.start("toggle",a);}});Element.Properties.slide={set:function(a){this.get("slide").cancel().setOptions(a);
+return this;},get:function(){var a=this.retrieve("slide");if(!a){a=new Fx.Slide(this,{link:"cancel"});this.store("slide",a);}return a;}};Element.implement({slide:function(d,e){d=d||"toggle";
+var b=this.get("slide"),a;switch(d){case"hide":b.hide(e);break;case"show":b.show(e);break;case"toggle":var c=this.retrieve("slide:flag",b.open);b[c?"slideOut":"slideIn"](e);
+this.store("slide:flag",!c);a=true;break;default:b.start(d,e);}if(!a){this.eliminate("slide:flag");}return this;}});Fx.SmoothScroll=new Class({Extends:Fx.Scroll,options:{axes:["x","y"]},initialize:function(c,d){d=d||document;
+this.doc=d.getDocument();this.parent(this.doc,c);var e=d.getWindow(),a=e.location.href.match(/^[^#]*/)[0]+"#",b=$$(this.options.links||this.doc.links);
+b.each(function(g){if(g.href.indexOf(a)!=0){return;}var f=g.href.substr(a.length);if(f){this.useLink(g,f);}},this);this.addEvent("complete",function(){e.location.hash=this.anchor;
+this.element.scrollTo(this.to[0],this.to[1]);},true);},useLink:function(b,a){b.addEvent("click",function(d){var c=document.id(a)||this.doc.getElement("a[name="+a+"]");
+if(!c){return;}d.preventDefault();this.toElement(c,this.options.axes).chain(function(){this.fireEvent("scrolledTo",[b,c]);}.bind(this));this.anchor=a;}.bind(this));
+return this;}});Fx.Sort=new Class({Extends:Fx.Elements,options:{mode:"vertical"},initialize:function(b,a){this.parent(b,a);this.elements.each(function(c){if(c.getStyle("position")=="static"){c.setStyle("position","relative");
+}});this.setDefaultOrder();},setDefaultOrder:function(){this.currentOrder=this.elements.map(function(b,a){return a;});},sort:function(){if(!this.check(arguments)){return this;
+}var e=Array.flatten(arguments);var i=0,a=0,c={},h={},d=this.options.mode=="vertical";var f=this.elements.map(function(m,k){var l=m.getComputedSize({styles:["border","padding","margin"]});
+var n;if(d){n={top:i,margin:l["margin-top"],height:l.totalHeight};i+=n.height-l["margin-top"];}else{n={left:a,margin:l["margin-left"],width:l.totalWidth};
+a+=n.width;}var j=d?"top":"left";h[k]={};var o=m.getStyle(j).toInt();h[k][j]=o||0;return n;},this);this.set(h);e=e.map(function(j){return j.toInt();});
+if(e.length!=this.elements.length){this.currentOrder.each(function(j){if(!e.contains(j)){e.push(j);}});if(e.length>this.elements.length){e.splice(this.elements.length-1,e.length-this.elements.length);
+}}var b=0;i=a=0;e.each(function(k){var j={};if(d){j.top=i-f[k].top-b;i+=f[k].height;}else{j.left=a-f[k].left;a+=f[k].width;}b=b+f[k].margin;c[k]=j;},this);
+var g={};Array.clone(e).sort().each(function(j){g[j]=c[j];});this.start(g);this.currentOrder=e;return this;},rearrangeDOM:function(a){a=a||this.currentOrder;
+var b=this.elements[0].getParent();var c=[];this.elements.setStyle("opacity",0);a.each(function(d){c.push(this.elements[d].inject(b).setStyles({top:0,left:0}));
+},this);this.elements.setStyle("opacity",1);this.elements=$$(c);this.setDefaultOrder();return this;},getDefaultOrder:function(){return this.elements.map(function(b,a){return a;
+});},getCurrentOrder:function(){return this.currentOrder;},forward:function(){return this.sort(this.getDefaultOrder());},backward:function(){return this.sort(this.getDefaultOrder().reverse());
+},reverse:function(){return this.sort(this.currentOrder.reverse());},sortByElements:function(a){return this.sort(a.map(function(b){return this.elements.indexOf(b);
+},this));},swap:function(c,b){if(typeOf(c)=="element"){c=this.elements.indexOf(c);}if(typeOf(b)=="element"){b=this.elements.indexOf(b);}var a=Array.clone(this.currentOrder);
+a[this.currentOrder.indexOf(c)]=b;a[this.currentOrder.indexOf(b)]=c;return this.sort(a);}});var Drag=new Class({Implements:[Events,Options],options:{snap:6,unit:"px",grid:false,style:true,limit:false,handle:false,invert:false,preventDefault:false,stopPropagation:false,modifiers:{x:"left",y:"top"}},initialize:function(){var b=Array.link(arguments,{options:Type.isObject,element:function(c){return c!=null;
+}});this.element=document.id(b.element);this.document=this.element.getDocument();this.setOptions(b.options||{});var a=typeOf(this.options.handle);this.handles=((a=="array"||a=="collection")?$$(this.options.handle):document.id(this.options.handle))||this.element;
+this.mouse={now:{},pos:{}};this.value={start:{},now:{}};this.selection=(Browser.ie)?"selectstart":"mousedown";if(Browser.ie&&!Drag.ondragstartFixed){document.ondragstart=Function.from(false);
+Drag.ondragstartFixed=true;}this.bound={start:this.start.bind(this),check:this.check.bind(this),drag:this.drag.bind(this),stop:this.stop.bind(this),cancel:this.cancel.bind(this),eventStop:Function.from(false)};
+this.attach();},attach:function(){this.handles.addEvent("mousedown",this.bound.start);return this;},detach:function(){this.handles.removeEvent("mousedown",this.bound.start);
+return this;},start:function(a){var j=this.options;if(a.rightClick){return;}if(j.preventDefault){a.preventDefault();}if(j.stopPropagation){a.stopPropagation();
+}this.mouse.start=a.page;this.fireEvent("beforeStart",this.element);var c=j.limit;this.limit={x:[],y:[]};var e,g;for(e in j.modifiers){if(!j.modifiers[e]){continue;
+}var b=this.element.getStyle(j.modifiers[e]);if(b&&!b.match(/px$/)){if(!g){g=this.element.getCoordinates(this.element.getOffsetParent());}b=g[j.modifiers[e]];
+}if(j.style){this.value.now[e]=(b||0).toInt();}else{this.value.now[e]=this.element[j.modifiers[e]];}if(j.invert){this.value.now[e]*=-1;}this.mouse.pos[e]=a.page[e]-this.value.now[e];
+if(c&&c[e]){var d=2;while(d--){var f=c[e][d];if(f||f===0){this.limit[e][d]=(typeof f=="function")?f():f;}}}}if(typeOf(this.options.grid)=="number"){this.options.grid={x:this.options.grid,y:this.options.grid};
+}var h={mousemove:this.bound.check,mouseup:this.bound.cancel};h[this.selection]=this.bound.eventStop;this.document.addEvents(h);},check:function(a){if(this.options.preventDefault){a.preventDefault();
+}var b=Math.round(Math.sqrt(Math.pow(a.page.x-this.mouse.start.x,2)+Math.pow(a.page.y-this.mouse.start.y,2)));if(b>this.options.snap){this.cancel();this.document.addEvents({mousemove:this.bound.drag,mouseup:this.bound.stop});
+this.fireEvent("start",[this.element,a]).fireEvent("snap",this.element);}},drag:function(b){var a=this.options;if(a.preventDefault){b.preventDefault();
+}this.mouse.now=b.page;for(var c in a.modifiers){if(!a.modifiers[c]){continue;}this.value.now[c]=this.mouse.now[c]-this.mouse.pos[c];if(a.invert){this.value.now[c]*=-1;
+}if(a.limit&&this.limit[c]){if((this.limit[c][1]||this.limit[c][1]===0)&&(this.value.now[c]>this.limit[c][1])){this.value.now[c]=this.limit[c][1];}else{if((this.limit[c][0]||this.limit[c][0]===0)&&(this.value.now[c]<this.limit[c][0])){this.value.now[c]=this.limit[c][0];
+}}}if(a.grid[c]){this.value.now[c]-=((this.value.now[c]-(this.limit[c][0]||0))%a.grid[c]);}if(a.style){this.element.setStyle(a.modifiers[c],this.value.now[c]+a.unit);
+}else{this.element[a.modifiers[c]]=this.value.now[c];}}this.fireEvent("drag",[this.element,b]);},cancel:function(a){this.document.removeEvents({mousemove:this.bound.check,mouseup:this.bound.cancel});
+if(a){this.document.removeEvent(this.selection,this.bound.eventStop);this.fireEvent("cancel",this.element);}},stop:function(b){var a={mousemove:this.bound.drag,mouseup:this.bound.stop};
+a[this.selection]=this.bound.eventStop;this.document.removeEvents(a);if(b){this.fireEvent("complete",[this.element,b]);}}});Element.implement({makeResizable:function(a){var b=new Drag(this,Object.merge({modifiers:{x:"width",y:"height"}},a));
+this.store("resizer",b);return b.addEvent("drag",function(){this.fireEvent("resize",b);}.bind(this));}});Drag.Move=new Class({Extends:Drag,options:{droppables:[],container:false,precalculate:false,includeMargins:true,checkDroppables:true},initialize:function(b,a){this.parent(b,a);
+b=this.element;this.droppables=$$(this.options.droppables);this.container=document.id(this.options.container);if(this.container&&typeOf(this.container)!="element"){this.container=document.id(this.container.getDocument().body);
+}if(this.options.style){if(this.options.modifiers.x=="left"&&this.options.modifiers.y=="top"){var c=b.getOffsetParent(),d=b.getStyles("left","top");if(c&&(d.left=="auto"||d.top=="auto")){b.setPosition(b.getPosition(c));
+}}if(b.getStyle("position")=="static"){b.setStyle("position","absolute");}}this.addEvent("start",this.checkDroppables,true);this.overed=null;},start:function(a){if(this.container){this.options.limit=this.calculateLimit();
+}if(this.options.precalculate){this.positions=this.droppables.map(function(b){return b.getCoordinates();});}this.parent(a);},calculateLimit:function(){var j=this.element,e=this.container,d=document.id(j.getOffsetParent())||document.body,h=e.getCoordinates(d),c={},b={},k={},g={},m={};
+["top","right","bottom","left"].each(function(q){c[q]=j.getStyle("margin-"+q).toInt();b[q]=j.getStyle("border-"+q).toInt();k[q]=e.getStyle("margin-"+q).toInt();
+g[q]=e.getStyle("border-"+q).toInt();m[q]=d.getStyle("padding-"+q).toInt();},this);var f=j.offsetWidth+c.left+c.right,p=j.offsetHeight+c.top+c.bottom,i=0,l=0,o=h.right-g.right-f,a=h.bottom-g.bottom-p;
+if(this.options.includeMargins){i+=c.left;l+=c.top;}else{o+=c.right;a+=c.bottom;}if(j.getStyle("position")=="relative"){var n=j.getCoordinates(d);n.left-=j.getStyle("left").toInt();
+n.top-=j.getStyle("top").toInt();i-=n.left;l-=n.top;if(e.getStyle("position")!="relative"){i+=g.left;l+=g.top;}o+=c.left-n.left;a+=c.top-n.top;if(e!=d){i+=k.left+m.left;
+l+=((Browser.ie6||Browser.ie7)?0:k.top)+m.top;}}else{i-=c.left;l-=c.top;if(e!=d){i+=h.left+g.left;l+=h.top+g.top;}}return{x:[i,o],y:[l,a]};},getDroppableCoordinates:function(c){var b=c.getCoordinates();
+if(c.getStyle("position")=="fixed"){var a=window.getScroll();b.left+=a.x;b.right+=a.x;b.top+=a.y;b.bottom+=a.y;}return b;},checkDroppables:function(){var a=this.droppables.filter(function(d,c){d=this.positions?this.positions[c]:this.getDroppableCoordinates(d);
+var b=this.mouse.now;return(b.x>d.left&&b.x<d.right&&b.y<d.bottom&&b.y>d.top);},this).getLast();if(this.overed!=a){if(this.overed){this.fireEvent("leave",[this.element,this.overed]);
+}if(a){this.fireEvent("enter",[this.element,a]);}this.overed=a;}},drag:function(a){this.parent(a);if(this.options.checkDroppables&&this.droppables.length){this.checkDroppables();
+}},stop:function(a){this.checkDroppables();this.fireEvent("drop",[this.element,this.overed,a]);this.overed=null;return this.parent(a);}});Element.implement({makeDraggable:function(a){var b=new Drag.Move(this,a);
+this.store("dragger",b);return b;}});var Slider=new Class({Implements:[Events,Options],Binds:["clickedElement","draggedKnob","scrolledElement"],options:{onTick:function(a){this.setKnobPosition(a);
+},initialStep:0,snap:false,offset:0,range:false,wheel:false,steps:100,mode:"horizontal"},initialize:function(f,a,e){this.setOptions(e);e=this.options;this.element=document.id(f);
+a=this.knob=document.id(a);this.previousChange=this.previousEnd=this.step=-1;var b={},d={x:false,y:false};switch(e.mode){case"vertical":this.axis="y";this.property="top";
+this.offset="offsetHeight";break;case"horizontal":this.axis="x";this.property="left";this.offset="offsetWidth";}this.setSliderDimensions();this.setRange(e.range);
+if(a.getStyle("position")=="static"){a.setStyle("position","relative");}a.setStyle(this.property,-e.offset);d[this.axis]=this.property;b[this.axis]=[-e.offset,this.full-e.offset];
+var c={snap:0,limit:b,modifiers:d,onDrag:this.draggedKnob,onStart:this.draggedKnob,onBeforeStart:(function(){this.isDragging=true;}).bind(this),onCancel:function(){this.isDragging=false;
+}.bind(this),onComplete:function(){this.isDragging=false;this.draggedKnob();this.end();}.bind(this)};if(e.snap){this.setSnap(c);}this.drag=new Drag(a,c);
+this.attach();if(e.initialStep!=null){this.set(e.initialStep);}},attach:function(){this.element.addEvent("mousedown",this.clickedElement);if(this.options.wheel){this.element.addEvent("mousewheel",this.scrolledElement);
+}this.drag.attach();return this;},detach:function(){this.element.removeEvent("mousedown",this.clickedElement).removeEvent("mousewheel",this.scrolledElement);
+this.drag.detach();return this;},autosize:function(){this.setSliderDimensions().setKnobPosition(this.toPosition(this.step));this.drag.options.limit[this.axis]=[-this.options.offset,this.full-this.options.offset];
+if(this.options.snap){this.setSnap();}return this;},setSnap:function(a){if(!a){a=this.drag.options;}a.grid=Math.ceil(this.stepWidth);a.limit[this.axis][1]=this.full;
+return this;},setKnobPosition:function(a){if(this.options.snap){a=this.toPosition(this.step);}this.knob.setStyle(this.property,a);return this;},setSliderDimensions:function(){this.full=this.element.measure(function(){this.half=this.knob[this.offset]/2;
+return this.element[this.offset]-this.knob[this.offset]+(this.options.offset*2);}.bind(this));return this;},set:function(a){if(!((this.range>0)^(a<this.min))){a=this.min;
+}if(!((this.range>0)^(a>this.max))){a=this.max;}this.step=Math.round(a);return this.checkStep().fireEvent("tick",this.toPosition(this.step)).end();},setRange:function(a,b){this.min=Array.pick([a[0],0]);
+this.max=Array.pick([a[1],this.options.steps]);this.range=this.max-this.min;this.steps=this.options.steps||this.full;this.stepSize=Math.abs(this.range)/this.steps;
+this.stepWidth=this.stepSize*this.full/Math.abs(this.range);if(a){this.set(Array.pick([b,this.step]).floor(this.min).max(this.max));}return this;},clickedElement:function(c){if(this.isDragging||c.target==this.knob){return;
+}var b=this.range<0?-1:1,a=c.page[this.axis]-this.element.getPosition()[this.axis]-this.half;a=a.limit(-this.options.offset,this.full-this.options.offset);
+this.step=Math.round(this.min+b*this.toStep(a));this.checkStep().fireEvent("tick",a).end();},scrolledElement:function(a){var b=(this.options.mode=="horizontal")?(a.wheel<0):(a.wheel>0);
+this.set(this.step+(b?-1:1)*this.stepSize);a.stop();},draggedKnob:function(){var b=this.range<0?-1:1,a=this.drag.value.now[this.axis];a=a.limit(-this.options.offset,this.full-this.options.offset);
+this.step=Math.round(this.min+b*this.toStep(a));this.checkStep();},checkStep:function(){var a=this.step;if(this.previousChange!=a){this.previousChange=a;
+this.fireEvent("change",a);}return this;},end:function(){var a=this.step;if(this.previousEnd!==a){this.previousEnd=a;this.fireEvent("complete",a+"");}return this;
+},toStep:function(a){var b=(a+this.options.offset)*this.stepSize/this.full*this.steps;return this.options.steps?Math.round(b-=b%this.stepSize):b;},toPosition:function(a){return(this.full*Math.abs(this.min-a))/(this.steps*this.stepSize)-this.options.offset;
+}});var Sortables=new Class({Implements:[Events,Options],options:{opacity:1,clone:false,revert:false,handle:false,dragOptions:{}},initialize:function(a,b){this.setOptions(b);
+this.elements=[];this.lists=[];this.idle=true;this.addLists($$(document.id(a)||a));if(!this.options.clone){this.options.revert=false;}if(this.options.revert){this.effect=new Fx.Morph(null,Object.merge({duration:250,link:"cancel"},this.options.revert));
+}},attach:function(){this.addLists(this.lists);return this;},detach:function(){this.lists=this.removeLists(this.lists);return this;},addItems:function(){Array.flatten(arguments).each(function(a){this.elements.push(a);
+var b=a.retrieve("sortables:start",function(c){this.start.call(this,c,a);}.bind(this));(this.options.handle?a.getElement(this.options.handle)||a:a).addEvent("mousedown",b);
+},this);return this;},addLists:function(){Array.flatten(arguments).each(function(a){this.lists.include(a);this.addItems(a.getChildren());},this);return this;
+},removeItems:function(){return $$(Array.flatten(arguments).map(function(a){this.elements.erase(a);var b=a.retrieve("sortables:start");(this.options.handle?a.getElement(this.options.handle)||a:a).removeEvent("mousedown",b);
+return a;},this));},removeLists:function(){return $$(Array.flatten(arguments).map(function(a){this.lists.erase(a);this.removeItems(a.getChildren());return a;
+},this));},getClone:function(b,a){if(!this.options.clone){return new Element(a.tagName).inject(document.body);}if(typeOf(this.options.clone)=="function"){return this.options.clone.call(this,b,a,this.list);
+}var c=a.clone(true).setStyles({margin:0,position:"absolute",visibility:"hidden",width:a.getStyle("width")}).addEvent("mousedown",function(d){a.fireEvent("mousedown",d);
+});if(c.get("html").test("radio")){c.getElements("input[type=radio]").each(function(d,e){d.set("name","clone_"+e);if(d.get("checked")){a.getElements("input[type=radio]")[e].set("checked",true);
+}});}return c.inject(this.list).setPosition(a.getPosition(a.getOffsetParent()));},getDroppables:function(){var a=this.list.getChildren().erase(this.clone).erase(this.element);
+if(!this.options.constrain){a.append(this.lists).erase(this.list);}return a;},insert:function(c,b){var a="inside";if(this.lists.contains(b)){this.list=b;
+this.drag.droppables=this.getDroppables();}else{a=this.element.getAllPrevious().contains(b)?"before":"after";}this.element.inject(b,a);this.fireEvent("sort",[this.element,this.clone]);
+},start:function(b,a){if(!this.idle||b.rightClick||["button","input","a","textarea"].contains(b.target.get("tag"))){return;}this.idle=false;this.element=a;
+this.opacity=a.getStyle("opacity");this.list=a.getParent();this.clone=this.getClone(b,a);this.drag=new Drag.Move(this.clone,Object.merge({droppables:this.getDroppables()},this.options.dragOptions)).addEvents({onSnap:function(){b.stop();
+this.clone.setStyle("visibility","visible");this.element.setStyle("opacity",this.options.opacity||0);this.fireEvent("start",[this.element,this.clone]);
+}.bind(this),onEnter:this.insert.bind(this),onCancel:this.end.bind(this),onComplete:this.end.bind(this)});this.clone.inject(this.element,"before");this.drag.start(b);
+},end:function(){this.drag.detach();this.element.setStyle("opacity",this.opacity);if(this.effect){var b=this.element.getStyles("width","height"),d=this.clone,c=d.computePosition(this.element.getPosition(this.clone.getOffsetParent()));
+var a=function(){this.removeEvent("cancel",a);d.destroy();};this.effect.element=d;this.effect.start({top:c.top,left:c.left,width:b.width,height:b.height,opacity:0.25}).addEvent("cancel",a).chain(a);
+}else{this.clone.destroy();}this.reset();},reset:function(){this.idle=true;this.fireEvent("complete",this.element);},serialize:function(){var c=Array.link(arguments,{modifier:Type.isFunction,index:function(d){return d!=null;
+}});var b=this.lists.map(function(d){return d.getChildren().map(c.modifier||function(e){return e.get("id");},this);},this);var a=c.index;if(this.lists.length==1){a=0;
+}return(a||a===0)&&a>=0&&a<this.lists.length?b[a]:b;}});Request.JSONP=new Class({Implements:[Chain,Events,Options],options:{onRequest:function(a){if(this.options.log&&window.console&&console.log){console.log("JSONP retrieving script with url:"+a);
+}},onError:function(a){if(this.options.log&&window.console&&console.warn){console.warn("JSONP "+a+" will fail in Internet Explorer, which enforces a 2083 bytes length limit on URIs");
+}},url:"",callbackKey:"callback",injectScript:document.head,data:"",link:"ignore",timeout:0,log:false},initialize:function(a){this.setOptions(a);},send:function(c){if(!Request.prototype.check.call(this,c)){return this;
+}this.running=true;var d=typeOf(c);if(d=="string"||d=="element"){c={data:c};}c=Object.merge(this.options,c||{});var e=c.data;switch(typeOf(e)){case"element":e=document.id(e).toQueryString();
+break;case"object":case"hash":e=Object.toQueryString(e);}var b=this.index=Request.JSONP.counter++;var f=c.url+(c.url.test("\\?")?"&":"?")+(c.callbackKey)+"=Request.JSONP.request_map.request_"+b+(e?"&"+e:"");
+if(f.length>2083){this.fireEvent("error",f);}Request.JSONP.request_map["request_"+b]=function(){this.success(arguments,b);}.bind(this);var a=this.getScript(f).inject(c.injectScript);
+this.fireEvent("request",[f,a]);if(c.timeout){this.timeout.delay(c.timeout,this);}return this;},getScript:function(a){if(!this.script){this.script=new Element("script",{type:"text/javascript",async:true,src:a});
+}return this.script;},success:function(b,a){if(!this.running){return;}this.clear().fireEvent("complete",b).fireEvent("success",b).callChain();},cancel:function(){if(this.running){this.clear().fireEvent("cancel");
+}return this;},isRunning:function(){return !!this.running;},clear:function(){this.running=false;if(this.script){this.script.destroy();this.script=null;
+}return this;},timeout:function(){if(this.running){this.running=false;this.fireEvent("timeout",[this.script.get("src"),this.script]).fireEvent("failure").cancel();
+}return this;}});Request.JSONP.counter=0;Request.JSONP.request_map={};Request.Queue=new Class({Implements:[Options,Events],Binds:["attach","request","complete","cancel","success","failure","exception"],options:{stopOnFailure:true,autoAdvance:true,concurrent:1,requests:{}},initialize:function(a){var b;
+if(a){b=a.requests;delete a.requests;}this.setOptions(a);this.requests={};this.queue=[];this.reqBinders={};if(b){this.addRequests(b);}},addRequest:function(a,b){this.requests[a]=b;
+this.attach(a,b);return this;},addRequests:function(a){Object.each(a,function(c,b){this.addRequest(b,c);},this);return this;},getName:function(a){return Object.keyOf(this.requests,a);
+},attach:function(a,b){if(b._groupSend){return this;}["request","complete","cancel","success","failure","exception"].each(function(c){if(!this.reqBinders[a]){this.reqBinders[a]={};
+}this.reqBinders[a][c]=function(){this["on"+c.capitalize()].apply(this,[a,b].append(arguments));}.bind(this);b.addEvent(c,this.reqBinders[a][c]);},this);
+b._groupSend=b.send;b.send=function(c){this.send(a,c);return b;}.bind(this);return this;},removeRequest:function(b){var a=typeOf(b)=="object"?this.getName(b):b;
+if(!a&&typeOf(a)!="string"){return this;}b=this.requests[a];if(!b){return this;}["request","complete","cancel","success","failure","exception"].each(function(c){b.removeEvent(c,this.reqBinders[a][c]);
+},this);b.send=b._groupSend;delete b._groupSend;return this;},getRunning:function(){return Object.filter(this.requests,function(a){return a.running;});
+},isRunning:function(){return !!(Object.keys(this.getRunning()).length);},send:function(b,a){var c=function(){this.requests[b]._groupSend(a);this.queue.erase(c);
+}.bind(this);c.name=b;if(Object.keys(this.getRunning()).length>=this.options.concurrent||(this.error&&this.options.stopOnFailure)){this.queue.push(c);}else{c();
+}return this;},hasNext:function(a){return(!a)?!!this.queue.length:!!this.queue.filter(function(b){return b.name==a;}).length;},resume:function(){this.error=false;
+(this.options.concurrent-Object.keys(this.getRunning()).length).times(this.runNext,this);return this;},runNext:function(a){if(!this.queue.length){return this;
+}if(!a){this.queue[0]();}else{var b;this.queue.each(function(c){if(!b&&c.name==a){b=true;c();}});}return this;},runAll:function(){this.queue.each(function(a){a();
+});return this;},clear:function(a){if(!a){this.queue.empty();}else{this.queue=this.queue.map(function(b){if(b.name!=a){return b;}else{return false;}}).filter(function(b){return b;
+});}return this;},cancel:function(a){this.requests[a].cancel();return this;},onRequest:function(){this.fireEvent("request",arguments);},onComplete:function(){this.fireEvent("complete",arguments);
+if(!this.queue.length){this.fireEvent("end");}},onCancel:function(){if(this.options.autoAdvance&&!this.error){this.runNext();}this.fireEvent("cancel",arguments);
+},onSuccess:function(){if(this.options.autoAdvance&&!this.error){this.runNext();}this.fireEvent("success",arguments);},onFailure:function(){this.error=true;
+if(!this.options.stopOnFailure&&this.options.autoAdvance){this.runNext();}this.fireEvent("failure",arguments);},onException:function(){this.error=true;
+if(!this.options.stopOnFailure&&this.options.autoAdvance){this.runNext();}this.fireEvent("exception",arguments);}});Request.implement({options:{initialDelay:5000,delay:5000,limit:60000},startTimer:function(b){var a=function(){if(!this.running){this.send({data:b});
+}};this.lastDelay=this.options.initialDelay;this.timer=a.delay(this.lastDelay,this);this.completeCheck=function(c){clearTimeout(this.timer);this.lastDelay=(c)?this.options.delay:(this.lastDelay+this.options.delay).min(this.options.limit);
+this.timer=a.delay(this.lastDelay,this);};return this.addEvent("complete",this.completeCheck);},stopTimer:function(){clearTimeout(this.timer);return this.removeEvent("complete",this.completeCheck);
+}});var Asset={javascript:function(d,b){if(!b){b={};}var a=new Element("script",{src:d,type:"text/javascript"}),e=b.document||document,c=b.onload||b.onLoad;
+delete b.onload;delete b.onLoad;delete b.document;if(c){if(typeof a.onreadystatechange!="undefined"){a.addEvent("readystatechange",function(){if(["loaded","complete"].contains(this.readyState)){c.call(this);
+}});}else{a.addEvent("load",c);}}return a.set(b).inject(e.head);},css:function(d,a){if(!a){a={};}var b=new Element("link",{rel:"stylesheet",media:"screen",type:"text/css",href:d});
+var c=a.onload||a.onLoad,e=a.document||document;delete a.onload;delete a.onLoad;delete a.document;if(c){b.addEvent("load",c);}return b.set(a).inject(e.head);
+},image:function(c,b){if(!b){b={};}var d=new Image(),a=document.id(d)||new Element("img");["load","abort","error"].each(function(e){var g="on"+e,f="on"+e.capitalize(),h=b[g]||b[f]||function(){};
+delete b[f];delete b[g];d[g]=function(){if(!d){return;}if(!a.parentNode){a.width=d.width;a.height=d.height;}d=d.onload=d.onabort=d.onerror=null;h.delay(1,a,a);
+a.fireEvent(e,a,1);};});d.src=a.src=c;if(d&&d.complete){d.onload.delay(1);}return a.set(b);},images:function(c,b){c=Array.from(c);var d=function(){},a=0;
+b=Object.merge({onComplete:d,onProgress:d,onError:d,properties:{}},b);return new Elements(c.map(function(f,e){return Asset.image(f,Object.append(b.properties,{onload:function(){a++;
+b.onProgress.call(this,a,e,f);if(a==c.length){b.onComplete();}},onerror:function(){a++;b.onError.call(this,a,e,f);if(a==c.length){b.onComplete();}}}));
+}));}};(function(){var a=this.Color=new Type("Color",function(c,d){if(arguments.length>=3){d="rgb";c=Array.slice(arguments,0,3);}else{if(typeof c=="string"){if(c.match(/rgb/)){c=c.rgbToHex().hexToRgb(true);
+}else{if(c.match(/hsb/)){c=c.hsbToRgb();}else{c=c.hexToRgb(true);}}}}d=d||"rgb";switch(d){case"hsb":var b=c;c=c.hsbToRgb();c.hsb=b;break;case"hex":c=c.hexToRgb(true);
+break;}c.rgb=c.slice(0,3);c.hsb=c.hsb||c.rgbToHsb();c.hex=c.rgbToHex();return Object.append(c,this);});a.implement({mix:function(){var b=Array.slice(arguments);
+var d=(typeOf(b.getLast())=="number")?b.pop():50;var c=this.slice();b.each(function(e){e=new a(e);for(var f=0;f<3;f++){c[f]=Math.round((c[f]/100*(100-d))+(e[f]/100*d));
+}});return new a(c,"rgb");},invert:function(){return new a(this.map(function(b){return 255-b;}));},setHue:function(b){return new a([b,this.hsb[1],this.hsb[2]],"hsb");
+},setSaturation:function(b){return new a([this.hsb[0],b,this.hsb[2]],"hsb");},setBrightness:function(b){return new a([this.hsb[0],this.hsb[1],b],"hsb");
+}});this.$RGB=function(e,d,c){return new a([e,d,c],"rgb");};this.$HSB=function(e,d,c){return new a([e,d,c],"hsb");};this.$HEX=function(b){return new a(b,"hex");
+};Array.implement({rgbToHsb:function(){var c=this[0],d=this[1],k=this[2],h=0;var j=Math.max(c,d,k),f=Math.min(c,d,k);var l=j-f;var i=j/255,g=(j!=0)?l/j:0;
+if(g!=0){var e=(j-c)/l;var b=(j-d)/l;var m=(j-k)/l;if(c==j){h=m-b;}else{if(d==j){h=2+e-m;}else{h=4+b-e;}}h/=6;if(h<0){h++;}}return[Math.round(h*360),Math.round(g*100),Math.round(i*100)];
+},hsbToRgb:function(){var d=Math.round(this[2]/100*255);if(this[1]==0){return[d,d,d];}else{var b=this[0]%360;var g=b%60;var h=Math.round((this[2]*(100-this[1]))/10000*255);
+var e=Math.round((this[2]*(6000-this[1]*g))/600000*255);var c=Math.round((this[2]*(6000-this[1]*(60-g)))/600000*255);switch(Math.floor(b/60)){case 0:return[d,c,h];
+case 1:return[e,d,h];case 2:return[h,d,c];case 3:return[h,e,d];case 4:return[c,h,d];case 5:return[d,h,e];}}return false;}});String.implement({rgbToHsb:function(){var b=this.match(/\d{1,3}/g);
+return(b)?b.rgbToHsb():null;},hsbToRgb:function(){var b=this.match(/\d{1,3}/g);return(b)?b.hsbToRgb():null;}});})();(function(){this.Group=new Class({initialize:function(){this.instances=Array.flatten(arguments);
+},addEvent:function(e,d){var g=this.instances,a=g.length,f=a,c=new Array(a),b=this;g.each(function(h,j){h.addEvent(e,function(){if(!c[j]){f--;}c[j]=arguments;
+if(!f){d.call(b,g,h,c);f=a;c=new Array(a);}});});}});})();Hash.Cookie=new Class({Extends:Cookie,options:{autoSave:true},initialize:function(b,a){this.parent(b,a);
+this.load();},save:function(){var a=JSON.encode(this.hash);if(!a||a.length>4096){return false;}if(a=="{}"){this.dispose();}else{this.write(a);}return true;
+},load:function(){this.hash=new Hash(JSON.decode(this.read(),true));return this;}});Hash.each(Hash.prototype,function(b,a){if(typeof b=="function"){Hash.Cookie.implement(a,function(){var c=b.apply(this.hash,arguments);
+if(this.options.autoSave){this.save();}return c;});}});(function(){var a=this.Table=function(){this.length=0;var c=[],b=[];this.set=function(e,g){var d=c.indexOf(e);
+if(d==-1){var f=c.length;c[f]=e;b[f]=g;this.length++;}else{b[d]=g;}return this;};this.get=function(e){var d=c.indexOf(e);return(d==-1)?null:b[d];};this.erase=function(e){var d=c.indexOf(e);
+if(d!=-1){this.length--;c.splice(d,1);return b.splice(d,1)[0];}return null;};this.each=this.forEach=function(f,g){for(var e=0,d=this.length;e<d;e++){f.call(g,c[e],b[e],this);
+}};};if(this.Type){new Type("Table",a);}})();var HtmlTable=new Class({Implements:[Options,Events,Class.Occlude],options:{properties:{cellpadding:0,cellspacing:0,border:0},rows:[],headers:[],footers:[]},property:"HtmlTable",initialize:function(){var a=Array.link(arguments,{options:Type.isObject,table:Type.isElement,id:Type.isString});
+this.setOptions(a.options);if(!a.table&&a.id){a.table=document.id(a.id);}this.element=a.table||new Element("table",this.options.properties);if(this.occlude()){return this.occluded;
+}this.build();},build:function(){this.element.store("HtmlTable",this);this.body=document.id(this.element.tBodies[0])||new Element("tbody").inject(this.element);
+$$(this.body.rows);if(this.options.headers.length){this.setHeaders(this.options.headers);}else{this.thead=document.id(this.element.tHead);}if(this.thead){this.head=this.getHead();
+}if(this.options.footers.length){this.setFooters(this.options.footers);}this.tfoot=document.id(this.element.tFoot);if(this.tfoot){this.foot=document.id(this.tfoot.rows[0]);
+}this.options.rows.each(function(a){this.push(a);},this);},toElement:function(){return this.element;},empty:function(){this.body.empty();return this;},set:function(e,a){var d=(e=="headers")?"tHead":"tFoot",b=d.toLowerCase();
+this[b]=(document.id(this.element[d])||new Element(b).inject(this.element,"top")).empty();var c=this.push(a,{},this[b],e=="headers"?"th":"td");if(e=="headers"){this.head=this.getHead();
+}else{this.foot=this.getHead();}return c;},getHead:function(){var a=this.thead.rows;return a.length>1?$$(a):a.length?document.id(a[0]):false;},setHeaders:function(a){this.set("headers",a);
+return this;},setFooters:function(a){this.set("footers",a);return this;},update:function(d,e,a){var b=d.getChildren(a||"td"),c=b.length-1;e.each(function(i,f){var j=b[f]||new Element(a||"td").inject(d),h=(i?i.content:"")||i,g=typeOf(h);
+if(i&&i.properties){j.set(i.properties);}if(/(element(s?)|array|collection)/.test(g)){j.empty().adopt(h);}else{j.set("html",h);}if(f>c){b.push(j);}else{b[f]=j;
+}});return{tr:d,tds:b};},push:function(e,c,d,a,b){if(typeOf(e)=="element"&&e.get("tag")=="tr"){e.inject(d||this.body,b);return{tr:e,tds:e.getChildren("td")};
+}return this.update(new Element("tr",c).inject(d||this.body,b),e,a);},pushMany:function(d,c,e,a,b){return d.map(function(f){return this.push(f,c,e,a,b);
+},this);}});["adopt","inject","wraps","grab","replaces","dispose"].each(function(a){HtmlTable.implement(a,function(){this.element[a].apply(this.element,arguments);
+return this;});});HtmlTable=Class.refactor(HtmlTable,{options:{classZebra:"table-tr-odd",zebra:true,zebraOnlyVisibleRows:true},initialize:function(){this.previous.apply(this,arguments);
+if(this.occluded){return this.occluded;}if(this.options.zebra){this.updateZebras();}},updateZebras:function(){var a=0;Array.each(this.body.rows,function(b){if(!this.options.zebraOnlyVisibleRows||b.isDisplayed()){this.zebra(b,a++);
+}},this);},setRowStyle:function(b,a){if(this.previous){this.previous(b,a);}this.zebra(b,a);},zebra:function(b,a){return b[((a%2)?"remove":"add")+"Class"](this.options.classZebra);
+},push:function(){var a=this.previous.apply(this,arguments);if(this.options.zebra){this.updateZebras();}return a;}});HtmlTable=Class.refactor(HtmlTable,{options:{sortIndex:0,sortReverse:false,parsers:[],defaultParser:"string",classSortable:"table-sortable",classHeadSort:"table-th-sort",classHeadSortRev:"table-th-sort-rev",classNoSort:"table-th-nosort",classGroupHead:"table-tr-group-head",classGroup:"table-tr-group",classCellSort:"table-td-sort",classSortSpan:"table-th-sort-span",sortable:false,thSelector:"th"},initialize:function(){this.previous.apply(this,arguments);
+if(this.occluded){return this.occluded;}this.sorted={index:null,dir:1};if(!this.bound){this.bound={};}this.bound.headClick=this.headClick.bind(this);this.sortSpans=new Elements();
+if(this.options.sortable){this.enableSort();if(this.options.sortIndex!=null){this.sort(this.options.sortIndex,this.options.sortReverse);}}},attachSorts:function(a){this.detachSorts();
+if(a!==false){this.element.addEvent("click:relay("+this.options.thSelector+")",this.bound.headClick);}},detachSorts:function(){this.element.removeEvents("click:relay("+this.options.thSelector+")");
+},setHeaders:function(){this.previous.apply(this,arguments);if(this.sortEnabled){this.setParsers();}},setParsers:function(){this.parsers=this.detectParsers();
+},detectParsers:function(){return this.head&&this.head.getElements(this.options.thSelector).flatten().map(this.detectParser,this);},detectParser:function(a,b){if(a.hasClass(this.options.classNoSort)||a.retrieve("htmltable-parser")){return a.retrieve("htmltable-parser");
+}var c=new Element("div");c.adopt(a.childNodes).inject(a);var f=new Element("span",{"class":this.options.classSortSpan}).inject(c,"top");this.sortSpans.push(f);
+var g=this.options.parsers[b],e=this.body.rows,d;switch(typeOf(g)){case"function":g={convert:g};d=true;break;case"string":g=g;d=true;break;}if(!d){HtmlTable.ParserPriority.some(function(k){var o=HtmlTable.Parsers[k],m=o.match;
+if(!m){return false;}for(var n=0,l=e.length;n<l;n++){var h=document.id(e[n].cells[b]),p=h?h.get("html").clean():"";if(p&&m.test(p)){g=o;return true;}}});
+}if(!g){g=this.options.defaultParser;}a.store("htmltable-parser",g);return g;},headClick:function(b,a){if(!this.head||a.hasClass(this.options.classNoSort)){return;
+}return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(),a)%this.body.rows[0].cells.length);},serialize:function(){var a=this.previous.apply(this,arguments)||{};
+if(this.options.sortable){a.sortIndex=this.sorted.index;a.sortReverse=this.sorted.reverse;}return a;},restore:function(a){if(this.options.sortable&&a.sortIndex){this.sort(a.sortIndex,a.sortReverse);
+}this.previous.apply(this,arguments);},setSortedState:function(b,a){if(a!=null){this.sorted.reverse=a;}else{if(this.sorted.index==b){this.sorted.reverse=!this.sorted.reverse;
+}else{this.sorted.reverse=this.sorted.index==null;}}if(b!=null){this.sorted.index=b;}},setHeadSort:function(a){var b=$$(!this.head.length?this.head.cells[this.sorted.index]:this.head.map(function(c){return c.getElements(this.options.thSelector)[this.sorted.index];
+},this).clean());if(!b.length){return;}if(a){b.addClass(this.options.classHeadSort);if(this.sorted.reverse){b.addClass(this.options.classHeadSortRev);}else{b.removeClass(this.options.classHeadSortRev);
+}}else{b.removeClass(this.options.classHeadSort).removeClass(this.options.classHeadSortRev);}},setRowSort:function(b,a){var e=b.length,d=this.body,g,f;
+while(e){var h=b[--e],c=h.position,i=d.rows[c];if(i.disabled){continue;}if(!a){g=this.setGroupSort(g,i,h);this.setRowStyle(i,e);}d.appendChild(i);for(f=0;
+f<e;f++){if(b[f].position>c){b[f].position--;}}}},setRowStyle:function(b,a){this.previous(b,a);b.cells[this.sorted.index].addClass(this.options.classCellSort);
+},setGroupSort:function(b,c,a){if(b==a.value){c.removeClass(this.options.classGroupHead).addClass(this.options.classGroup);}else{c.removeClass(this.options.classGroup).addClass(this.options.classGroupHead);
+}return a.value;},getParser:function(){var a=this.parsers[this.sorted.index];return typeOf(a)=="string"?HtmlTable.Parsers[a]:a;},sort:function(c,b,e){if(!this.head){return;
+}if(!e){this.clearSort();this.setSortedState(c,b);this.setHeadSort(true);}var f=this.getParser();if(!f){return;}var a;if(!Browser.ie){a=this.body.getParent();
+this.body.dispose();}var d=this.parseData(f).sort(function(h,g){if(h.value===g.value){return 0;}return h.value>g.value?1:-1;});if(this.sorted.reverse==(f==HtmlTable.Parsers["input-checked"])){d.reverse(true);
+}this.setRowSort(d,e);if(a){a.grab(this.body);}this.fireEvent("stateChanged");return this.fireEvent("sort",[this.body,this.sorted.index]);},parseData:function(a){return Array.map(this.body.rows,function(d,b){var c=a.convert.call(document.id(d.cells[this.sorted.index]));
+return{position:b,value:c};},this);},clearSort:function(){this.setHeadSort(false);this.body.getElements("td").removeClass(this.options.classCellSort);},reSort:function(){if(this.sortEnabled){this.sort.call(this,this.sorted.index,this.sorted.reverse);
+}return this;},enableSort:function(){this.element.addClass(this.options.classSortable);this.attachSorts(true);this.setParsers();this.sortEnabled=true;return this;
+},disableSort:function(){this.element.removeClass(this.options.classSortable);this.attachSorts(false);this.sortSpans.each(function(a){a.destroy();});this.sortSpans.empty();
+this.sortEnabled=false;return this;}});HtmlTable.ParserPriority=["date","input-checked","input-value","float","number"];HtmlTable.Parsers={date:{match:/^\d{2}[-\/ ]\d{2}[-\/ ]\d{2,4}$/,convert:function(){var a=Date.parse(this.get("text").stripTags());
+return(typeOf(a)=="date")?a.format("db"):"";},type:"date"},"input-checked":{match:/ type="(radio|checkbox)" /,convert:function(){return this.getElement("input").checked;
+}},"input-value":{match:/<input/,convert:function(){return this.getElement("input").value;}},number:{match:/^\d+[^\d.,]*$/,convert:function(){return this.get("text").stripTags().toInt();
+},number:true},numberLax:{match:/^[^\d]+\d+$/,convert:function(){return this.get("text").replace(/[^-?^0-9]/,"").stripTags().toInt();},number:true},"float":{match:/^[\d]+\.[\d]+/,convert:function(){return this.get("text").replace(/[^-?^\d.]/,"").stripTags().toFloat();
+},number:true},floatLax:{match:/^[^\d]+[\d]+\.[\d]+$/,convert:function(){return this.get("text").replace(/[^-?^\d.]/,"").stripTags();},number:true},string:{match:null,convert:function(){return this.get("text").stripTags().toLowerCase();
+}},title:{match:null,convert:function(){return this.title;}}};HtmlTable.defineParsers=function(a){HtmlTable.Parsers=Object.append(HtmlTable.Parsers,a);
+for(var b in a){HtmlTable.ParserPriority.unshift(b);}};(function(){var a=this.Keyboard=new Class({Extends:Events,Implements:[Options],options:{defaultEventType:"keydown",active:false,manager:null,events:{},nonParsedEvents:["activate","deactivate","onactivate","ondeactivate","changed","onchanged"]},initialize:function(f){if(f&&f.manager){this._manager=f.manager;
+delete f.manager;}this.setOptions(f);this._setup();},addEvent:function(h,g,f){return this.parent(a.parse(h,this.options.defaultEventType,this.options.nonParsedEvents),g,f);
+},removeEvent:function(g,f){return this.parent(a.parse(g,this.options.defaultEventType,this.options.nonParsedEvents),f);},toggleActive:function(){return this[this.isActive()?"deactivate":"activate"]();
+},activate:function(f){if(f){if(f.isActive()){return this;}if(this._activeKB&&f!=this._activeKB){this.previous=this._activeKB;this.previous.fireEvent("deactivate");
+}this._activeKB=f.fireEvent("activate");a.manager.fireEvent("changed");}else{if(this._manager){this._manager.activate(this);}}return this;},isActive:function(){return this._manager?(this._manager._activeKB==this):(a.manager==this);
+},deactivate:function(f){if(f){if(f===this._activeKB){this._activeKB=null;f.fireEvent("deactivate");a.manager.fireEvent("changed");}}else{if(this._manager){this._manager.deactivate(this);
+}}return this;},relinquish:function(){if(this.isActive()&&this._manager&&this._manager.previous){this._manager.activate(this._manager.previous);}else{this.deactivate();
+}return this;},manage:function(f){if(f._manager){f._manager.drop(f);}this._instances.push(f);f._manager=this;if(!this._activeKB){this.activate(f);}return this;
+},drop:function(f){f.relinquish();this._instances.erase(f);if(this._activeKB==f){if(this.previous&&this._instances.contains(this.previous)){this.activate(this.previous);
+}else{this._activeKB=this._instances[0];}}return this;},trace:function(){a.trace(this);},each:function(f){a.each(this,f);},_instances:[],_disable:function(f){if(this._activeKB==f){this._activeKB=null;
+}},_setup:function(){this.addEvents(this.options.events);if(a.manager&&!this._manager){a.manager.manage(this);}if(this.options.active){this.activate();
+}else{this.relinquish();}},_handle:function(h,g){if(h.preventKeyboardPropagation){return;}var f=!!this._manager;if(f&&this._activeKB){this._activeKB._handle(h,g);
+if(h.preventKeyboardPropagation){return;}}this.fireEvent(g,h);if(!f&&this._activeKB){this._activeKB._handle(h,g);}}});var b={};var c=["shift","control","alt","meta"];
+var e=/^(?:shift|control|ctrl|alt|meta)$/;a.parse=function(h,g,k){if(k&&k.contains(h.toLowerCase())){return h;}h=h.toLowerCase().replace(/^(keyup|keydown):/,function(m,l){g=l;
+return"";});if(!b[h]){var f,j={};h.split("+").each(function(l){if(e.test(l)){j[l]=true;}else{f=l;}});j.control=j.control||j.ctrl;var i=[];c.each(function(l){if(j[l]){i.push(l);
+}});if(f){i.push(f);}b[h]=i.join("+");}return g+":keys("+b[h]+")";};a.each=function(f,g){var h=f||a.manager;while(h){g.run(h);h=h._activeKB;}};a.stop=function(f){f.preventKeyboardPropagation=true;
+};a.manager=new a({active:true});a.trace=function(f){f=f||a.manager;var g=window.console&&console.log;if(g){console.log("the following items have focus: ");
+}a.each(f,function(h){if(g){console.log(document.id(h.widget)||h.wiget||h);}});};var d=function(g){var f=[];c.each(function(h){if(g[h]){f.push(h);}});if(!e.test(g.key)){f.push(g.key);
+}a.manager._handle(g,g.type+":keys("+f.join("+")+")");};document.addEvents({keyup:d,keydown:d});})();Keyboard.prototype.options.nonParsedEvents.combine(["rebound","onrebound"]);
+Keyboard.implement({addShortcut:function(b,a){this._shortcuts=this._shortcuts||[];this._shortcutIndex=this._shortcutIndex||{};a.getKeyboard=Function.from(this);
+a.name=b;this._shortcutIndex[b]=a;this._shortcuts.push(a);if(a.keys){this.addEvent(a.keys,a.handler);}return this;},addShortcuts:function(b){for(var a in b){this.addShortcut(a,b[a]);
+}return this;},removeShortcut:function(b){var a=this.getShortcut(b);if(a&&a.keys){this.removeEvent(a.keys,a.handler);delete this._shortcutIndex[b];this._shortcuts.erase(a);
+}return this;},removeShortcuts:function(a){a.each(this.removeShortcut,this);return this;},getShortcuts:function(){return this._shortcuts||[];},getShortcut:function(a){return(this._shortcutIndex||{})[a];
+}});Keyboard.rebind=function(b,a){Array.from(a).each(function(c){c.getKeyboard().removeEvent(c.keys,c.handler);c.getKeyboard().addEvent(b,c.handler);c.keys=b;
+c.getKeyboard().fireEvent("rebound");});};Keyboard.getActiveShortcuts=function(b){var a=[],c=[];Keyboard.each(b,[].push.bind(a));a.each(function(d){c.extend(d.getShortcuts());
+});return c;};Keyboard.getShortcut=function(c,b,d){d=d||{};var a=d.many?[]:null,e=d.many?function(g){var f=g.getShortcut(c);if(f){a.push(f);}}:function(f){if(!a){a=f.getShortcut(c);
+}};Keyboard.each(b,e);return a;};Keyboard.getShortcuts=function(b,a){return Keyboard.getShortcut(b,a,{many:true});};HtmlTable=Class.refactor(HtmlTable,{options:{useKeyboard:true,classRowSelected:"table-tr-selected",classRowHovered:"table-tr-hovered",classSelectable:"table-selectable",shiftForMultiSelect:true,allowMultiSelect:true,selectable:false,selectHiddenRows:false},initialize:function(){this.previous.apply(this,arguments);
+if(this.occluded){return this.occluded;}this.selectedRows=new Elements();if(!this.bound){this.bound={};}this.bound.mouseleave=this.mouseleave.bind(this);
+this.bound.clickRow=this.clickRow.bind(this);this.bound.activateKeyboard=function(){if(this.keyboard&&this.selectEnabled){this.keyboard.activate();}}.bind(this);
+if(this.options.selectable){this.enableSelect();}},empty:function(){this.selectNone();return this.previous();},enableSelect:function(){this.selectEnabled=true;
+this.attachSelects();this.element.addClass(this.options.classSelectable);return this;},disableSelect:function(){this.selectEnabled=false;this.attachSelects(false);
+this.element.removeClass(this.options.classSelectable);return this;},push:function(){var a=this.previous.apply(this,arguments);this.updateSelects();return a;
+},toggleRow:function(a){return this[(this.isSelected(a)?"de":"")+"selectRow"](a);},selectRow:function(b,a){if(this.isSelected(b)||(!a&&!this.body.getChildren().contains(b))){return;
+}if(!this.options.allowMultiSelect){this.selectNone();}if(!this.isSelected(b)){this.selectedRows.push(b);b.addClass(this.options.classRowSelected);this.fireEvent("rowFocus",[b,this.selectedRows]);
+this.fireEvent("stateChanged");}this.focused=b;document.clearSelection();return this;},isSelected:function(a){return this.selectedRows.contains(a);},getSelected:function(){return this.selectedRows;
+},getSelected:function(){return this.selectedRows;},serialize:function(){var a=this.previous.apply(this,arguments)||{};if(this.options.selectable){a.selectedRows=this.selectedRows.map(function(b){return Array.indexOf(this.body.rows,b);
+}.bind(this));}return a;},restore:function(a){if(this.options.selectable&&a.selectedRows){a.selectedRows.each(function(b){this.selectRow(this.body.rows[b]);
+}.bind(this));}this.previous.apply(this,arguments);},deselectRow:function(b,a){if(!this.isSelected(b)||(!a&&!this.body.getChildren().contains(b))){return;
+}this.selectedRows=new Elements(Array.from(this.selectedRows).erase(b));b.removeClass(this.options.classRowSelected);this.fireEvent("rowUnfocus",[b,this.selectedRows]);
+this.fireEvent("stateChanged");return this;},selectAll:function(a){if(!a&&!this.options.allowMultiSelect){return;}this.selectRange(0,this.body.rows.length,a);
+return this;},selectNone:function(){return this.selectAll(true);},selectRange:function(b,a,f){if(!this.options.allowMultiSelect&&!f){return;}var g=f?"deselectRow":"selectRow",e=Array.clone(this.body.rows);
+if(typeOf(b)=="element"){b=e.indexOf(b);}if(typeOf(a)=="element"){a=e.indexOf(a);}a=a<e.length-1?a:e.length-1;if(a<b){var d=b;b=a;a=d;}for(var c=b;c<=a;
+c++){if(this.options.selectHiddenRows||e[c].isDisplayed()){this[g](e[c],true);}}return this;},deselectRange:function(b,a){this.selectRange(b,a,true);},getSelected:function(){return this.selectedRows;
+},enterRow:function(a){if(this.hovered){this.hovered=this.leaveRow(this.hovered);}this.hovered=a.addClass(this.options.classRowHovered);},leaveRow:function(a){a.removeClass(this.options.classRowHovered);
+},updateSelects:function(){Array.each(this.body.rows,function(a){var b=a.retrieve("binders");if(!b&&!this.selectEnabled){return;}if(!b){b={mouseenter:this.enterRow.pass([a],this),mouseleave:this.leaveRow.pass([a],this)};
+a.store("binders",b);}if(this.selectEnabled){a.addEvents(b);}else{a.removeEvents(b);}},this);},shiftFocus:function(b,a){if(!this.focused){return this.selectRow(this.body.rows[0],a);
+}var c=this.getRowByOffset(b,this.options.selectHiddenRows);if(c===null||this.focused==this.body.rows[c]){return this;}this.toggleRow(this.body.rows[c],a);
+},clickRow:function(a,b){var c=(a.shift||a.meta||a.control)&&this.options.shiftForMultiSelect;if(!c&&!(a.rightClick&&this.isSelected(b)&&this.options.allowMultiSelect)){this.selectNone();
+}if(a.rightClick){this.selectRow(b);}else{this.toggleRow(b);}if(a.shift){this.selectRange(this.rangeStart||this.body.rows[0],b,this.rangeStart?!this.isSelected(b):true);
+this.focused=b;}this.rangeStart=b;},getRowByOffset:function(e,d){if(!this.focused){return 0;}var b=Array.indexOf(this.body.rows,this.focused);if((b==0&&e<0)||(b==this.body.rows.length-1&&e>0)){return null;
+}if(d){b+=e;}else{var a=0,c=0;if(e>0){while(c<e&&b<this.body.rows.length-1){if(this.body.rows[++b].isDisplayed()){c++;}}}else{while(c>e&&b>0){if(this.body.rows[--b].isDisplayed()){c--;
+}}}}return b;},attachSelects:function(d){d=d!=null?d:true;var g=d?"addEvents":"removeEvents";this.element[g]({mouseleave:this.bound.mouseleave,click:this.bound.activateKeyboard});
+this.body[g]({"click:relay(tr)":this.bound.clickRow,"contextmenu:relay(tr)":this.bound.clickRow});if(this.options.useKeyboard||this.keyboard){if(!this.keyboard){this.keyboard=new Keyboard();
+}if(!this.selectKeysDefined){this.selectKeysDefined=true;var f,e;var c=function(i){var h=function(j){clearTimeout(f);j.preventDefault();var k=this.body.rows[this.getRowByOffset(i,this.options.selectHiddenRows)];
+if(j.shift&&k&&this.isSelected(k)){this.deselectRow(this.focused);this.focused=k;}else{if(k&&(!this.options.allowMultiSelect||!j.shift)){this.selectNone();
+}this.shiftFocus(i,j);}if(e){f=h.delay(100,this,j);}else{f=(function(){e=true;h(j);}).delay(400);}}.bind(this);return h;}.bind(this);var b=function(){clearTimeout(f);
+e=false;};this.keyboard.addEvents({"keydown:shift+up":c(-1),"keydown:shift+down":c(1),"keyup:shift+up":b,"keyup:shift+down":b,"keyup:up":b,"keyup:down":b});
+var a="";if(this.options.allowMultiSelect&&this.options.shiftForMultiSelect&&this.options.useKeyboard){a=" (Shift multi-selects).";}this.keyboard.addShortcuts({"Select Previous Row":{keys:"up",shortcut:"up arrow",handler:c(-1),description:"Select the previous row in the table."+a},"Select Next Row":{keys:"down",shortcut:"down arrow",handler:c(1),description:"Select the next row in the table."+a}});
+}this.keyboard[d?"activate":"deactivate"]();}this.updateSelects();},mouseleave:function(){if(this.hovered){this.leaveRow(this.hovered);}}});var Scroller=new Class({Implements:[Events,Options],options:{area:20,velocity:1,onChange:function(a,b){this.element.scrollTo(a,b);
+},fps:50},initialize:function(b,a){this.setOptions(a);this.element=document.id(b);this.docBody=document.id(this.element.getDocument().body);this.listener=(typeOf(this.element)!="element")?this.docBody:this.element;
+this.timer=null;this.bound={attach:this.attach.bind(this),detach:this.detach.bind(this),getCoords:this.getCoords.bind(this)};},start:function(){this.listener.addEvents({mouseover:this.bound.attach,mouseleave:this.bound.detach});
+return this;},stop:function(){this.listener.removeEvents({mouseover:this.bound.attach,mouseleave:this.bound.detach});this.detach();this.timer=clearInterval(this.timer);
+return this;},attach:function(){this.listener.addEvent("mousemove",this.bound.getCoords);},detach:function(){this.listener.removeEvent("mousemove",this.bound.getCoords);
+this.timer=clearInterval(this.timer);},getCoords:function(a){this.page=(this.listener.get("tag")=="body")?a.client:a.page;if(!this.timer){this.timer=this.scroll.periodical(Math.round(1000/this.options.fps),this);
+}},scroll:function(){var c=this.element.getSize(),a=this.element.getScroll(),h=this.element!=this.docBody?this.element.getOffsets():{x:0,y:0},d=this.element.getScrollSize(),g={x:0,y:0},e=this.options.area.top||this.options.area,b=this.options.area.bottom||this.options.area;
+for(var f in this.page){if(this.page[f]<(e+h[f])&&a[f]!=0){g[f]=(this.page[f]-e-h[f])*this.options.velocity;}else{if(this.page[f]+b>(c[f]+h[f])&&a[f]+c[f]!=d[f]){g[f]=(this.page[f]-c[f]+b-h[f])*this.options.velocity;
+}}g[f]=g[f].round();}if(g.y||g.x){this.fireEvent("change",[a.x+g.x,a.y+g.y]);}}});(function(){var a=function(c,b){return(c)?(typeOf(c)=="function"?c(b):b.get(c)):"";
+};this.Tips=new Class({Implements:[Events,Options],options:{onShow:function(){this.tip.setStyle("display","block");},onHide:function(){this.tip.setStyle("display","none");
+},title:"title",text:function(b){return b.get("rel")||b.get("href");},showDelay:100,hideDelay:100,className:"tip-wrap",offset:{x:16,y:16},windowPadding:{x:0,y:0},fixed:false,waiAria:true},initialize:function(){var b=Array.link(arguments,{options:Type.isObject,elements:function(c){return c!=null;
+}});this.setOptions(b.options);if(b.elements){this.attach(b.elements);}this.container=new Element("div",{"class":"tip"});if(this.options.id){this.container.set("id",this.options.id);
+if(this.options.waiAria){this.attachWaiAria();}}},toElement:function(){if(this.tip){return this.tip;}this.tip=new Element("div",{"class":this.options.className,styles:{position:"absolute",top:0,left:0}}).adopt(new Element("div",{"class":"tip-top"}),this.container,new Element("div",{"class":"tip-bottom"}));
+return this.tip;},attachWaiAria:function(){var b=this.options.id;this.container.set("role","tooltip");if(!this.waiAria){this.waiAria={show:function(c){if(b){c.set("aria-describedby",b);
+}this.container.set("aria-hidden","false");},hide:function(c){if(b){c.erase("aria-describedby");}this.container.set("aria-hidden","true");}};}this.addEvents(this.waiAria);
+},detachWaiAria:function(){if(this.waiAria){this.container.erase("role");this.container.erase("aria-hidden");this.removeEvents(this.waiAria);}},attach:function(b){$$(b).each(function(d){var f=a(this.options.title,d),e=a(this.options.text,d);
+d.set("title","").store("tip:native",f).retrieve("tip:title",f);d.retrieve("tip:text",e);this.fireEvent("attach",[d]);var c=["enter","leave"];if(!this.options.fixed){c.push("move");
+}c.each(function(h){var g=d.retrieve("tip:"+h);if(!g){g=function(i){this["element"+h.capitalize()].apply(this,[i,d]);}.bind(this);}d.store("tip:"+h,g).addEvent("mouse"+h,g);
+},this);},this);return this;},detach:function(b){$$(b).each(function(d){["enter","leave","move"].each(function(e){d.removeEvent("mouse"+e,d.retrieve("tip:"+e)).eliminate("tip:"+e);
+});this.fireEvent("detach",[d]);if(this.options.title=="title"){var c=d.retrieve("tip:native");if(c){d.set("title",c);}}},this);return this;},elementEnter:function(c,b){clearTimeout(this.timer);
+this.timer=(function(){this.container.empty();["title","text"].each(function(e){var d=b.retrieve("tip:"+e);var f=this["_"+e+"Element"]=new Element("div",{"class":"tip-"+e}).inject(this.container);
+if(d){this.fill(f,d);}},this);this.show(b);this.position((this.options.fixed)?{page:b.getPosition()}:c);}).delay(this.options.showDelay,this);},elementLeave:function(c,b){clearTimeout(this.timer);
+this.timer=this.hide.delay(this.options.hideDelay,this,b);this.fireForParent(c,b);},setTitle:function(b){if(this._titleElement){this._titleElement.empty();
+this.fill(this._titleElement,b);}return this;},setText:function(b){if(this._textElement){this._textElement.empty();this.fill(this._textElement,b);}return this;
+},fireForParent:function(c,b){b=b.getParent();if(!b||b==document.body){return;}if(b.retrieve("tip:enter")){b.fireEvent("mouseenter",c);}else{this.fireForParent(c,b);
+}},elementMove:function(c,b){this.position(c);},position:function(f){if(!this.tip){document.id(this);}var c=window.getSize(),b=window.getScroll(),g={x:this.tip.offsetWidth,y:this.tip.offsetHeight},d={x:"left",y:"top"},e={y:false,x2:false,y2:false,x:false},h={};
+for(var i in d){h[d[i]]=f.page[i]+this.options.offset[i];if(h[d[i]]<0){e[i]=true;}if((h[d[i]]+g[i]-b[i])>c[i]-this.options.windowPadding[i]){h[d[i]]=f.page[i]-this.options.offset[i]-g[i];
+e[i+"2"]=true;}}this.fireEvent("bound",e);this.tip.setStyles(h);},fill:function(b,c){if(typeof c=="string"){b.set("html",c);}else{b.adopt(c);}},show:function(b){if(!this.tip){document.id(this);
+}if(!this.tip.getParent()){this.tip.inject(document.body);}this.fireEvent("show",[this.tip,b]);},hide:function(b){if(!this.tip){document.id(this);}this.fireEvent("hide",[this.tip,b]);
+}});})();(function(){var a={json:JSON.decode};Locale.Set.defineParser=function(b,c){a[b]=c;};Locale.Set.from=function(d,c){if(instanceOf(d,Locale.Set)){return d;
+}if(!c&&typeOf(d)=="string"){c="json";}if(a[c]){d=a[c](d);}var b=new Locale.Set;b.sets=d.sets||{};if(d.inherits){b.inherits.locales=Array.from(d.inherits.locales);
+b.inherits.sets=d.inherits.sets||{};}return b;};})();Locale.define("ar","Date",{dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M"});
+Locale.define("ar","FormValidator",{required:"هذا الحقل مطلوب.",minLength:"رجاءً إدخال {minLength} أحرف على الأقل (تم إدخال {length} أحرف).",maxLength:"الرجاء عدم إدخال أكثر من {maxLength} أحرف (تم إدخال {length} أحرف).",integer:"الرجاء إدخال عدد صحيح في هذا الحقل. أي رقم ذو كسر عشري أو مئوي (مثال 1.25 ) غير مسموح.",numeric:'الرجاء إدخال قيم رقمية في هذا الحقل (مثال "1" أو "1.1" أو "-1" أو "-1.1").',digits:"الرجاء أستخدام قيم رقمية وعلامات ترقيمية فقط في هذا الحقل (مثال, رقم هاتف مع نقطة أو شحطة)",alpha:"الرجاء أستخدام أحرف فقط (ا-ي) في هذا الحقل. أي فراغات أو علامات غير مسموحة.",alphanum:"الرجاء أستخدام أحرف فقط (ا-ي) أو أرقام (0-9) فقط في هذا الحقل. أي فراغات أو علامات غير مسموحة.",dateSuchAs:"الرجاء إدخال تاريخ صحيح كالتالي {date}",dateInFormatMDY:"الرجاء إدخال تاريخ صحيح (مثال, 31-12-1999)",email:"الرجاء إدخال بريد إلكتروني صحيح.",url:"الرجاء إدخال عنوان إلكتروني صحيح مثل http://www.example.com",currencyDollar:"الرجاء إدخال قيمة $ صحيحة. مثال, 100.00$",oneRequired:"الرجاء إدخال قيمة في أحد هذه الحقول على الأقل.",errorPrefix:"خطأ: ",warningPrefix:"تحذير: "});
+Locale.define("ca-CA","Date",{months:["Gener","Febrer","Març","Abril","Maig","Juny","Juli","Agost","Setembre","Octubre","Novembre","Desembre"],months_abbr:["gen.","febr.","març","abr.","maig","juny","jul.","ag.","set.","oct.","nov.","des."],days:["Diumenge","Dilluns","Dimarts","Dimecres","Dijous","Divendres","Dissabte"],days_abbr:["dg","dl","dt","dc","dj","dv","ds"],dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:0,ordinal:"",lessThanMinuteAgo:"fa menys d`un minut",minuteAgo:"fa un minut",minutesAgo:"fa {delta} minuts",hourAgo:"fa un hora",hoursAgo:"fa unes {delta} hores",dayAgo:"fa un dia",daysAgo:"fa {delta} dies",lessThanMinuteUntil:"menys d`un minut des d`ara",minuteUntil:"un minut des d`ara",minutesUntil:"{delta} minuts des d`ara",hourUntil:"un hora des d`ara",hoursUntil:"unes {delta} hores des d`ara",dayUntil:"1 dia des d`ara",daysUntil:"{delta} dies des d`ara"});
+Locale.define("ca-CA","FormValidator",{required:"Aquest camp es obligatori.",minLength:"Per favor introdueix al menys {minLength} caracters (has introduit {length} caracters).",maxLength:"Per favor introdueix no mes de {maxLength} caracters (has introduit {length} caracters).",integer:"Per favor introdueix un nombre enter en aquest camp. Nombres amb decimals (p.e. 1,25) no estan permesos.",numeric:'Per favor introdueix sols valors numerics en aquest camp (p.e. "1" o "1,1" o "-1" o "-1,1").',digits:"Per favor usa sols numeros i puntuacio en aquest camp (per exemple, un nombre de telefon amb guions i punts no esta permes).",alpha:"Per favor utilitza lletres nomes (a-z) en aquest camp. No s´admiteixen espais ni altres caracters.",alphanum:"Per favor, utilitza nomes lletres (a-z) o numeros (0-9) en aquest camp. No s´admiteixen espais ni altres caracters.",dateSuchAs:"Per favor introdueix una data valida com {date}",dateInFormatMDY:'Per favor introdueix una data valida com DD/MM/YYYY (p.e. "31/12/1999")',email:'Per favor, introdueix una adreça de correu electronic valida. Per exemple, "fred@domain.com".',url:"Per favor introdueix una URL valida com http://www.example.com.",currencyDollar:"Per favor introdueix una quantitat valida de €. Per exemple €100,00 .",oneRequired:"Per favor introdueix alguna cosa per al menys una d´aquestes entrades.",errorPrefix:"Error: ",warningPrefix:"Avis: ",noSpace:"No poden haver espais en aquesta entrada.",reqChkByNode:"No hi han elements seleccionats.",requiredChk:"Aquest camp es obligatori.",reqChkByName:"Per favor selecciona una {label}.",match:"Aquest camp necessita coincidir amb el camp {matchName}",startDate:"la data de inici",endDate:"la data de fi",currendDate:"la data actual",afterDate:"La data deu ser igual o posterior a {label}.",beforeDate:"La data deu ser igual o anterior a {label}.",startMonth:"Per favor selecciona un mes d´orige",sameMonth:"Aquestes dos dates deuen estar dins del mateix mes - deus canviar una o altra."});
+(function(){var a=function(e,d,c,b){if(e==1){return d;}else{if(e==2||e==3||e==4){return c;}else{return b;}}};Locale.define("cs-CZ","Date",{months:["Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec"],months_abbr:["ledna","února","března","dubna","května","června","července","srpna","září","října","listopadu","prosince"],days:["Neděle","Pondělí","Úterý","Středa","Čtvrtek","Pátek","Sobota"],days_abbr:["ne","po","út","st","čt","pá","so"],dateOrder:["date","month","year"],shortDate:"%d.%m.%Y",shortTime:"%H:%M",AM:"dop.",PM:"odp.",firstDayOfWeek:1,ordinal:".",lessThanMinuteAgo:"před chvílí",minuteAgo:"přibližně před minutou",minutesAgo:function(b){return"před {delta} "+a(b,"minutou","minutami","minutami");
+},hourAgo:"přibližně před hodinou",hoursAgo:function(b){return"před {delta} "+a(b,"hodinou","hodinami","hodinami");},dayAgo:"před dnem",daysAgo:function(b){return"před {delta} "+a(b,"dnem","dny","dny");
+},weekAgo:"před týdnem",weeksAgo:function(b){return"před {delta} "+a(b,"týdnem","týdny","týdny");},monthAgo:"před měsícem",monthsAgo:function(b){return"před {delta} "+a(b,"měsícem","měsíci","měsíci");
+},yearAgo:"před rokem",yearsAgo:function(b){return"před {delta} "+a(b,"rokem","lety","lety");},lessThanMinuteUntil:"za chvíli",minuteUntil:"přibližně za minutu",minutesUntil:function(b){return"za {delta} "+a(b,"minutu","minuty","minut");
+},hourUntil:"přibližně za hodinu",hoursUntil:function(b){return"za {delta} "+a(b,"hodinu","hodiny","hodin");},dayUntil:"za den",daysUntil:function(b){return"za {delta} "+a(b,"den","dny","dnů");
+},weekUntil:"za týden",weeksUntil:function(b){return"za {delta} "+a(b,"týden","týdny","týdnů");},monthUntil:"za měsíc",monthsUntil:function(b){return"za {delta} "+a(b,"měsíc","měsíce","měsíců");
+},yearUntil:"za rok",yearsUntil:function(b){return"za {delta} "+a(b,"rok","roky","let");}});})();Locale.define("cs-CZ","FormValidator",{required:"Tato položka je povinná.",minLength:"Zadejte prosím alespoň {minLength} znaků (napsáno {length} znaků).",maxLength:"Zadejte prosím méně než {maxLength} znaků (nápsáno {length} znaků).",integer:"Zadejte prosím celé číslo. Desetinná čísla (např. 1.25) nejsou povolena.",numeric:'Zadejte jen číselné hodnoty (tj. "1" nebo "1.1" nebo "-1" nebo "-1.1").',digits:"Zadejte prosím pouze čísla a interpunkční znaménka(například telefonní číslo s pomlčkami nebo tečkami je povoleno).",alpha:"Zadejte prosím pouze písmena (a-z). Mezery nebo jiné znaky nejsou povoleny.",alphanum:"Zadejte prosím pouze písmena (a-z) nebo číslice (0-9). Mezery nebo jiné znaky nejsou povoleny.",dateSuchAs:"Zadejte prosím platné datum jako {date}",dateInFormatMDY:'Zadejte prosím platné datum jako MM / DD / RRRR (tj. "12/31/1999")',email:'Zadejte prosím platnou e-mailovou adresu. Například "fred@domain.com".',url:"Zadejte prosím platnou URL adresu jako http://www.example.com.",currencyDollar:"Zadejte prosím platnou částku. Například $100.00.",oneRequired:"Zadejte prosím alespoň jednu hodnotu pro tyto položky.",errorPrefix:"Chyba: ",warningPrefix:"Upozornění: ",noSpace:"V této položce nejsou povoleny mezery",reqChkByNode:"Nejsou vybrány žádné položky.",requiredChk:"Tato položka je vyžadována.",reqChkByName:"Prosím vyberte {label}.",match:"Tato položka se musí shodovat s položkou {matchName}",startDate:"datum zahájení",endDate:"datum ukončení",currendDate:"aktuální datum",afterDate:"Datum by mělo být stejné nebo větší než {label}.",beforeDate:"Datum by mělo být stejné nebo menší než {label}.",startMonth:"Vyberte počáteční měsíc.",sameMonth:"Tyto dva datumy musí být ve stejném měsíci - změňte jeden z nich.",creditcard:"Zadané číslo kreditní karty je neplatné. Prosím opravte ho. Bylo zadáno {length} čísel."});
+Locale.define("da-DK","Date",{months:["Januar","Februar","Marts","April","Maj","Juni","Juli","August","September","Oktober","November","December"],months_abbr:["jan.","feb.","mar.","apr.","maj.","jun.","jul.","aug.","sep.","okt.","nov.","dec."],days:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"],days_abbr:["søn","man","tir","ons","tor","fre","lør"],dateOrder:["date","month","year"],shortDate:"%d-%m-%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:".",lessThanMinuteAgo:"mindre end et minut siden",minuteAgo:"omkring et minut siden",minutesAgo:"{delta} minutter siden",hourAgo:"omkring en time siden",hoursAgo:"omkring {delta} timer siden",dayAgo:"1 dag siden",daysAgo:"{delta} dage siden",weekAgo:"1 uge siden",weeksAgo:"{delta} uger siden",monthAgo:"1 måned siden",monthsAgo:"{delta} måneder siden",yearAgo:"1 år siden",yearsAgo:"{delta} år siden",lessThanMinuteUntil:"mindre end et minut fra nu",minuteUntil:"omkring et minut fra nu",minutesUntil:"{delta} minutter fra nu",hourUntil:"omkring en time fra nu",hoursUntil:"omkring {delta} timer fra nu",dayUntil:"1 dag fra nu",daysUntil:"{delta} dage fra nu",weekUntil:"1 uge fra nu",weeksUntil:"{delta} uger fra nu",monthUntil:"1 måned fra nu",monthsUntil:"{delta} måneder fra nu",yearUntil:"1 år fra nu",yearsUntil:"{delta} år fra nu"});
+Locale.define("da-DK","FormValidator",{required:"Feltet skal udfyldes.",minLength:"Skriv mindst {minLength} tegn (du skrev {length} tegn).",maxLength:"Skriv maksimalt {maxLength} tegn (du skrev {length} tegn).",integer:"Skriv et tal i dette felt. Decimal tal (f.eks. 1.25) er ikke tilladt.",numeric:'Skriv kun tal i dette felt (i.e. "1" eller "1.1" eller "-1" eller "-1.1").',digits:"Skriv kun tal og tegnsætning i dette felt (eksempel, et telefon nummer med bindestreg eller punktum er tilladt).",alpha:"Skriv kun bogstaver (a-z) i dette felt. Mellemrum og andre tegn er ikke tilladt.",alphanum:"Skriv kun bogstaver (a-z) eller tal (0-9) i dette felt. Mellemrum og andre tegn er ikke tilladt.",dateSuchAs:"Skriv en gyldig dato som {date}",dateInFormatMDY:'Skriv dato i formatet DD-MM-YYYY (f.eks. "31-12-1999")',email:'Skriv en gyldig e-mail adresse. F.eks "fred@domain.com".',url:'Skriv en gyldig URL adresse. F.eks "http://www.example.com".',currencyDollar:"Skriv et gldigt beløb. F.eks Kr.100.00 .",oneRequired:"Et eller flere af felterne i denne formular skal udfyldes.",errorPrefix:"Fejl: ",warningPrefix:"Advarsel: ",noSpace:"Der må ikke benyttes mellemrum i dette felt.",reqChkByNode:"Foretag et valg.",requiredChk:"Dette felt skal udfyldes.",reqChkByName:"Vælg en {label}.",match:"Dette felt skal matche {matchName} feltet",startDate:"start dato",endDate:"slut dato",currendDate:"dags dato",afterDate:"Datoen skal være større end eller lig med {label}.",beforeDate:"Datoen skal være mindre end eller lig med {label}.",startMonth:"Vælg en start måned",sameMonth:"De valgte datoer skal være i samme måned - skift en af dem."});
+Locale.define("de-DE","Date",{months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],months_abbr:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],days:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],days_abbr:["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."],dateOrder:["date","month","year"],shortDate:"%d.%m.%Y",shortTime:"%H:%M",AM:"vormittags",PM:"nachmittags",firstDayOfWeek:1,ordinal:".",lessThanMinuteAgo:"vor weniger als einer Minute",minuteAgo:"vor einer Minute",minutesAgo:"vor {delta} Minuten",hourAgo:"vor einer Stunde",hoursAgo:"vor {delta} Stunden",dayAgo:"vor einem Tag",daysAgo:"vor {delta} Tagen",weekAgo:"vor einer Woche",weeksAgo:"vor {delta} Wochen",monthAgo:"vor einem Monat",monthsAgo:"vor {delta} Monaten",yearAgo:"vor einem Jahr",yearsAgo:"vor {delta} Jahren",lessThanMinuteUntil:"in weniger als einer Minute",minuteUntil:"in einer Minute",minutesUntil:"in {delta} Minuten",hourUntil:"in ca. einer Stunde",hoursUntil:"in ca. {delta} Stunden",dayUntil:"in einem Tag",daysUntil:"in {delta} Tagen",weekUntil:"in einer Woche",weeksUntil:"in {delta} Wochen",monthUntil:"in einem Monat",monthsUntil:"in {delta} Monaten",yearUntil:"in einem Jahr",yearsUntil:"in {delta} Jahren"});
+Locale.define("de-CH").inherit("de-DE","Date");Locale.define("de-CH","FormValidator",{required:"Dieses Feld ist obligatorisch.",minLength:"Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).",maxLength:"Bitte geben Sie nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).",integer:"Geben Sie bitte eine ganze Zahl ein. Dezimalzahlen (z.B. 1.25) sind nicht erlaubt.",numeric:"Geben Sie bitte nur Zahlenwerte in dieses Eingabefeld ein (z.B. &quot;1&quot;, &quot;1.1&quot;, &quot;-1&quot; oder &quot;-1.1&quot;).",digits:"Benutzen Sie bitte nur Zahlen und Satzzeichen in diesem Eingabefeld (erlaubt ist z.B. eine Telefonnummer mit Bindestrichen und Punkten).",alpha:"Benutzen Sie bitte nur Buchstaben (a-z) in diesem Feld. Leerzeichen und andere Zeichen sind nicht erlaubt.",alphanum:"Benutzen Sie bitte nur Buchstaben (a-z) und Zahlen (0-9) in diesem Eingabefeld. Leerzeichen und andere Zeichen sind nicht erlaubt.",dateSuchAs:"Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel {date}",dateInFormatMDY:"Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel TT.MM.JJJJ (z.B. &quot;31.12.1999&quot;)",email:"Geben Sie bitte eine g&uuml;ltige E-Mail Adresse ein. Wie zum Beispiel &quot;maria@bernasconi.ch&quot;.",url:"Geben Sie bitte eine g&uuml;ltige URL ein. Wie zum Beispiel http://www.example.com.",currencyDollar:"Geben Sie bitte einen g&uuml;ltigen Betrag in Schweizer Franken ein. Wie zum Beispiel 100.00 CHF .",oneRequired:"Machen Sie f&uuml;r mindestens eines der Eingabefelder einen Eintrag.",errorPrefix:"Fehler: ",warningPrefix:"Warnung: ",noSpace:"In diesem Eingabefeld darf kein Leerzeichen sein.",reqChkByNode:"Es wurden keine Elemente gew&auml;hlt.",requiredChk:"Dieses Feld ist obligatorisch.",reqChkByName:"Bitte w&auml;hlen Sie ein {label}.",match:"Dieses Eingabefeld muss mit dem Feld {matchName} &uuml;bereinstimmen.",startDate:"Das Anfangsdatum",endDate:"Das Enddatum",currendDate:"Das aktuelle Datum",afterDate:"Das Datum sollte zur gleichen Zeit oder sp&auml;ter sein {label}.",beforeDate:"Das Datum sollte zur gleichen Zeit oder fr&uuml;her sein {label}.",startMonth:"W&auml;hlen Sie bitte einen Anfangsmonat",sameMonth:"Diese zwei Datumsangaben m&uuml;ssen im selben Monat sein - Sie m&uuml;ssen eine von beiden ver&auml;ndern.",creditcard:"Die eingegebene Kreditkartennummer ist ung&uuml;ltig. Bitte &uuml;berpr&uuml;fen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben."});
+Locale.define("de-DE","FormValidator",{required:"Dieses Eingabefeld muss ausgefüllt werden.",minLength:"Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben nur {length} Zeichen eingegeben).",maxLength:"Geben Sie bitte nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).",integer:'Geben Sie in diesem Eingabefeld bitte eine ganze Zahl ein. Dezimalzahlen (z.B. "1.25") sind nicht erlaubt.',numeric:'Geben Sie in diesem Eingabefeld bitte nur Zahlenwerte (z.B. "1", "1.1", "-1" oder "-1.1") ein.',digits:"Geben Sie in diesem Eingabefeld bitte nur Zahlen und Satzzeichen ein (z.B. eine Telefonnummer mit Bindestrichen und Punkten ist erlaubt).",alpha:"Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) ein. Leerzeichen und andere Zeichen sind nicht erlaubt.",alphanum:"Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) und Zahlen (0-9) ein. Leerzeichen oder andere Zeichen sind nicht erlaubt.",dateSuchAs:'Geben Sie bitte ein gültiges Datum ein (z.B. "{date}").',dateInFormatMDY:'Geben Sie bitte ein gültiges Datum im Format TT.MM.JJJJ ein (z.B. "31.12.1999").',email:'Geben Sie bitte eine gültige E-Mail-Adresse ein (z.B. "max@mustermann.de").',url:'Geben Sie bitte eine gültige URL ein (z.B. "http://www.example.com").',currencyDollar:"Geben Sie bitte einen gültigen Betrag in EURO ein (z.B. 100.00€).",oneRequired:"Bitte füllen Sie mindestens ein Eingabefeld aus.",errorPrefix:"Fehler: ",warningPrefix:"Warnung: ",noSpace:"Es darf kein Leerzeichen in diesem Eingabefeld sein.",reqChkByNode:"Es wurden keine Elemente gewählt.",requiredChk:"Dieses Feld muss ausgefüllt werden.",reqChkByName:"Bitte wählen Sie ein {label}.",match:"Dieses Eingabefeld muss mit dem {matchName} Eingabefeld übereinstimmen.",startDate:"Das Anfangsdatum",endDate:"Das Enddatum",currendDate:"Das aktuelle Datum",afterDate:"Das Datum sollte zur gleichen Zeit oder später sein als {label}.",beforeDate:"Das Datum sollte zur gleichen Zeit oder früher sein als {label}.",startMonth:"Wählen Sie bitte einen Anfangsmonat",sameMonth:"Diese zwei Datumsangaben müssen im selben Monat sein - Sie müssen eines von beiden verändern.",creditcard:"Die eingegebene Kreditkartennummer ist ungültig. Bitte überprüfen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben."});
+Locale.define("EU","Number",{decimal:",",group:".",currency:{prefix:"€ "}});Locale.define("de-DE").inherit("EU","Number");Locale.define("en-GB","Date",{dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M"}).inherit("en-US","Date");
+Locale.define("es-ES","Date",{months:["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"],months_abbr:["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],days:["Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"],days_abbr:["dom","lun","mar","mié","juv","vie","sáb"],dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"hace menos de un minuto",minuteAgo:"hace un minuto",minutesAgo:"hace {delta} minutos",hourAgo:"hace una hora",hoursAgo:"hace unas {delta} horas",dayAgo:"hace un día",daysAgo:"hace {delta} días",weekAgo:"hace una semana",weeksAgo:"hace unas {delta} semanas",monthAgo:"hace un mes",monthsAgo:"hace {delta} meses",yearAgo:"hace un año",yearsAgo:"hace {delta} años",lessThanMinuteUntil:"menos de un minuto desde ahora",minuteUntil:"un minuto desde ahora",minutesUntil:"{delta} minutos desde ahora",hourUntil:"una hora desde ahora",hoursUntil:"unas {delta} horas desde ahora",dayUntil:"un día desde ahora",daysUntil:"{delta} días desde ahora",weekUntil:"una semana desde ahora",weeksUntil:"unas {delta} semanas desde ahora",monthUntil:"un mes desde ahora",monthsUntil:"{delta} meses desde ahora",yearUntil:"un año desde ahora",yearsUntil:"{delta} años desde ahora"});
+Locale.define("es-AR").inherit("es-ES","Date");Locale.define("es-AR","FormValidator",{required:"Este campo es obligatorio.",minLength:"Por favor ingrese al menos {minLength} caracteres (ha ingresado {length} caracteres).",maxLength:"Por favor no ingrese más de {maxLength} caracteres (ha ingresado {length} caracteres).",integer:"Por favor ingrese un número entero en este campo. Números con decimales (p.e. 1,25) no se permiten.",numeric:'Por favor ingrese solo valores numéricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',digits:"Por favor use sólo números y puntuación en este campo (por ejemplo, un número de teléfono con guiones y/o puntos no está permitido).",alpha:"Por favor use sólo letras (a-z) en este campo. No se permiten espacios ni otros caracteres.",alphanum:"Por favor, usa sólo letras (a-z) o números (0-9) en este campo. No se permiten espacios u otros caracteres.",dateSuchAs:"Por favor ingrese una fecha válida como {date}",dateInFormatMDY:'Por favor ingrese una fecha válida, utulizando el formato DD/MM/YYYY (p.e. "31/12/1999")',email:'Por favor, ingrese una dirección de e-mail válida. Por ejemplo, "fred@dominio.com".',url:"Por favor ingrese una URL válida como http://www.example.com.",currencyDollar:"Por favor ingrese una cantidad válida de pesos. Por ejemplo $100,00 .",oneRequired:"Por favor ingrese algo para por lo menos una de estas entradas.",errorPrefix:"Error: ",warningPrefix:"Advertencia: ",noSpace:"No se permiten espacios en este campo.",reqChkByNode:"No hay elementos seleccionados.",requiredChk:"Este campo es obligatorio.",reqChkByName:"Por favor selecciona una {label}.",match:"Este campo necesita coincidir con el campo {matchName}",startDate:"la fecha de inicio",endDate:"la fecha de fin",currendDate:"la fecha actual",afterDate:"La fecha debe ser igual o posterior a {label}.",beforeDate:"La fecha debe ser igual o anterior a {label}.",startMonth:"Por favor selecciona un mes de origen",sameMonth:"Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra."});
+Locale.define("es-ES","FormValidator",{required:"Este campo es obligatorio.",minLength:"Por favor introduce al menos {minLength} caracteres (has introducido {length} caracteres).",maxLength:"Por favor introduce no m&aacute;s de {maxLength} caracteres (has introducido {length} caracteres).",integer:"Por favor introduce un n&uacute;mero entero en este campo. N&uacute;meros con decimales (p.e. 1,25) no se permiten.",numeric:'Por favor introduce solo valores num&eacute;ricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',digits:"Por favor usa solo n&uacute;meros y puntuaci&oacute;n en este campo (por ejemplo, un n&uacute;mero de tel&eacute;fono con guiones y puntos no esta permitido).",alpha:"Por favor usa letras solo (a-z) en este campo. No se admiten espacios ni otros caracteres.",alphanum:"Por favor, usa solo letras (a-z) o n&uacute;meros (0-9) en este campo. No se admiten espacios ni otros caracteres.",dateSuchAs:"Por favor introduce una fecha v&aacute;lida como {date}",dateInFormatMDY:'Por favor introduce una fecha v&aacute;lida como DD/MM/YYYY (p.e. "31/12/1999")',email:'Por favor, introduce una direcci&oacute;n de email v&aacute;lida. Por ejemplo, "fred@domain.com".',url:"Por favor introduce una URL v&aacute;lida como http://www.example.com.",currencyDollar:"Por favor introduce una cantidad v&aacute;lida de €. Por ejemplo €100,00 .",oneRequired:"Por favor introduce algo para por lo menos una de estas entradas.",errorPrefix:"Error: ",warningPrefix:"Aviso: ",noSpace:"No pueden haber espacios en esta entrada.",reqChkByNode:"No hay elementos seleccionados.",requiredChk:"Este campo es obligatorio.",reqChkByName:"Por favor selecciona una {label}.",match:"Este campo necesita coincidir con el campo {matchName}",startDate:"la fecha de inicio",endDate:"la fecha de fin",currendDate:"la fecha actual",afterDate:"La fecha debe ser igual o posterior a {label}.",beforeDate:"La fecha debe ser igual o anterior a {label}.",startMonth:"Por favor selecciona un mes de origen",sameMonth:"Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra."});
+Locale.define("et-EE","Date",{months:["jaanuar","veebruar","märts","aprill","mai","juuni","juuli","august","september","oktoober","november","detsember"],months_abbr:["jaan","veebr","märts","apr","mai","juuni","juuli","aug","sept","okt","nov","dets"],days:["pühapäev","esmaspäev","teisipäev","kolmapäev","neljapäev","reede","laupäev"],days_abbr:["pühap","esmasp","teisip","kolmap","neljap","reede","laup"],dateOrder:["month","date","year"],shortDate:"%m.%d.%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"vähem kui minut aega tagasi",minuteAgo:"umbes minut aega tagasi",minutesAgo:"{delta} minutit tagasi",hourAgo:"umbes tund aega tagasi",hoursAgo:"umbes {delta} tundi tagasi",dayAgo:"1 päev tagasi",daysAgo:"{delta} päeva tagasi",weekAgo:"1 nädal tagasi",weeksAgo:"{delta} nädalat tagasi",monthAgo:"1 kuu tagasi",monthsAgo:"{delta} kuud tagasi",yearAgo:"1 aasta tagasi",yearsAgo:"{delta} aastat tagasi",lessThanMinuteUntil:"vähem kui minuti aja pärast",minuteUntil:"umbes minuti aja pärast",minutesUntil:"{delta} minuti pärast",hourUntil:"umbes tunni aja pärast",hoursUntil:"umbes {delta} tunni pärast",dayUntil:"1 päeva pärast",daysUntil:"{delta} päeva pärast",weekUntil:"1 nädala pärast",weeksUntil:"{delta} nädala pärast",monthUntil:"1 kuu pärast",monthsUntil:"{delta} kuu pärast",yearUntil:"1 aasta pärast",yearsUntil:"{delta} aasta pärast"});
+Locale.define("et-EE","FormValidator",{required:"Väli peab olema täidetud.",minLength:"Palun sisestage vähemalt {minLength} tähte (te sisestasite {length} tähte).",maxLength:"Palun ärge sisestage rohkem kui {maxLength} tähte (te sisestasite {length} tähte).",integer:"Palun sisestage väljale täisarv. Kümnendarvud (näiteks 1.25) ei ole lubatud.",numeric:'Palun sisestage ainult numbreid väljale (näiteks "1", "1.1", "-1" või "-1.1").',digits:"Palun kasutage ainult numbreid ja kirjavahemärke (telefoninumbri sisestamisel on lubatud kasutada kriipse ja punkte).",alpha:"Palun kasutage ainult tähti (a-z). Tühikud ja teised sümbolid on keelatud.",alphanum:"Palun kasutage ainult tähti (a-z) või numbreid (0-9). Tühikud ja teised sümbolid on keelatud.",dateSuchAs:"Palun sisestage kehtiv kuupäev kujul {date}",dateInFormatMDY:'Palun sisestage kehtiv kuupäev kujul MM.DD.YYYY (näiteks: "12.31.1999").',email:'Palun sisestage kehtiv e-maili aadress (näiteks: "fred@domain.com").',url:"Palun sisestage kehtiv URL (näiteks: http://www.example.com).",currencyDollar:"Palun sisestage kehtiv $ summa (näiteks: $100.00).",oneRequired:"Palun sisestage midagi vähemalt ühele antud väljadest.",errorPrefix:"Viga: ",warningPrefix:"Hoiatus: ",noSpace:"Väli ei tohi sisaldada tühikuid.",reqChkByNode:"Ükski väljadest pole valitud.",requiredChk:"Välja täitmine on vajalik.",reqChkByName:"Palun valige üks {label}.",match:"Väli peab sobima {matchName} väljaga",startDate:"algkuupäev",endDate:"lõppkuupäev",currendDate:"praegune kuupäev",afterDate:"Kuupäev peab olema võrdne või pärast {label}.",beforeDate:"Kuupäev peab olema võrdne või enne {label}.",startMonth:"Palun valige algkuupäev.",sameMonth:"Antud kaks kuupäeva peavad olema samas kuus - peate muutma ühte kuupäeva."});
+Locale.define("fa","Date",{months:["ژانویه","فوریه","مارس","آپریل","مه","ژوئن","ژوئیه","آگوست","سپتامبر","اکتبر","نوامبر","دسامبر"],months_abbr:["1","2","3","4","5","6","7","8","9","10","11","12"],days:["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],days_abbr:["ي","د","س","چ","پ","ج","ش"],dateOrder:["month","date","year"],shortDate:"%m/%d/%Y",shortTime:"%I:%M%p",AM:"ق.ظ",PM:"ب.ظ",ordinal:"ام",lessThanMinuteAgo:"کمتر از یک دقیقه پیش",minuteAgo:"حدود یک دقیقه پیش",minutesAgo:"{delta} دقیقه پیش",hourAgo:"حدود یک ساعت پیش",hoursAgo:"حدود {delta} ساعت پیش",dayAgo:"1 روز پیش",daysAgo:"{delta} روز پیش",weekAgo:"1 هفته پیش",weeksAgo:"{delta} هفته پیش",monthAgo:"1 ماه پیش",monthsAgo:"{delta} ماه پیش",yearAgo:"1 سال پیش",yearsAgo:"{delta} سال پیش",lessThanMinuteUntil:"کمتر از یک دقیقه از حالا",minuteUntil:"حدود یک دقیقه از حالا",minutesUntil:"{delta} دقیقه از حالا",hourUntil:"حدود یک ساعت از حالا",hoursUntil:"حدود {delta} ساعت از حالا",dayUntil:"1 روز از حالا",daysUntil:"{delta} روز از حالا",weekUntil:"1 هفته از حالا",weeksUntil:"{delta} هفته از حالا",monthUntil:"1 ماه از حالا",monthsUntil:"{delta} ماه از حالا",yearUntil:"1 سال از حالا",yearsUntil:"{delta} سال از حالا"});
+Locale.define("fa","FormValidator",{required:"این فیلد الزامی است.",minLength:"شما باید حداقل {minLength} حرف وارد کنید ({length} حرف وارد کرده اید).",maxLength:"لطفا حداکثر {maxLength} حرف وارد کنید (شما {length} حرف وارد کرده اید).",integer:"لطفا از عدد صحیح استفاده کنید. اعداد اعشاری (مانند 1.25) مجاز نیستند.",numeric:'لطفا فقط داده عددی وارد کنید (مانند "1" یا "1.1" یا "1-" یا "1.1-").',digits:"لطفا فقط از اعداد و علامتها در این فیلد استفاده کنید (برای مثال شماره تلفن با خط تیره و نقطه قابل قبول است).",alpha:"لطفا فقط از حروف الفباء برای این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.",alphanum:"لطفا فقط از حروف الفباء و اعداد در این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.",dateSuchAs:"لطفا یک تاریخ معتبر مانند {date} وارد کنید.",dateInFormatMDY:'لطفا یک تاریخ معتبر به شکل MM/DD/YYYY وارد کنید (مانند "12/31/1999").',email:'لطفا یک آدرس ایمیل معتبر وارد کنید. برای مثال "fred@domain.com".',url:"لطفا یک URL معتبر مانند http://www.example.com وارد کنید.",currencyDollar:"لطفا یک محدوده معتبر برای این بخش وارد کنید مانند 100.00$ .",oneRequired:"لطفا حداقل یکی از فیلدها را پر کنید.",errorPrefix:"خطا: ",warningPrefix:"هشدار: ",noSpace:"استفاده از فاصله در این بخش مجاز نیست.",reqChkByNode:"موردی انتخاب نشده است.",requiredChk:"این فیلد الزامی است.",reqChkByName:"لطفا یک {label} را انتخاب کنید.",match:"این فیلد باید با فیلد {matchName} مطابقت داشته باشد.",startDate:"تاریخ شروع",endDate:"تاریخ پایان",currendDate:"تاریخ کنونی",afterDate:"تاریخ میبایست برابر یا بعد از {label} باشد",beforeDate:"تاریخ میبایست برابر یا قبل از {label} باشد",startMonth:"لطفا ماه شروع را انتخاب کنید",sameMonth:"این دو تاریخ باید در یک ماه باشند - شما باید یکی یا هر دو را تغییر دهید.",creditcard:"شماره کارت اعتباری که وارد کرده اید معتبر نیست. لطفا شماره را بررسی کنید و مجددا تلاش کنید. {length} رقم وارد شده است."});
+Locale.define("fi-FI","Date",{months:["tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kesäkuu","heinäkuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu"],months_abbr:["tammik.","helmik.","maalisk.","huhtik.","toukok.","kesäk.","heinäk.","elok.","syysk.","lokak.","marrask.","jouluk."],days:["sunnuntai","maanantai","tiistai","keskiviikko","torstai","perjantai","lauantai"],days_abbr:["su","ma","ti","ke","to","pe","la"],dateOrder:["date","month","year"],shortDate:"%d.%m.%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:".",lessThanMinuteAgo:"vajaa minuutti sitten",minuteAgo:"noin minuutti sitten",minutesAgo:"{delta} minuuttia sitten",hourAgo:"noin tunti sitten",hoursAgo:"noin {delta} tuntia sitten",dayAgo:"päivä sitten",daysAgo:"{delta} päivää sitten",weekAgo:"viikko sitten",weeksAgo:"{delta} viikkoa sitten",monthAgo:"kuukausi sitten",monthsAgo:"{delta} kuukautta sitten",yearAgo:"vuosi sitten",yearsAgo:"{delta} vuotta sitten",lessThanMinuteUntil:"vajaan minuutin kuluttua",minuteUntil:"noin minuutin kuluttua",minutesUntil:"{delta} minuutin kuluttua",hourUntil:"noin tunnin kuluttua",hoursUntil:"noin {delta} tunnin kuluttua",dayUntil:"päivän kuluttua",daysUntil:"{delta} päivän kuluttua",weekUntil:"viikon kuluttua",weeksUntil:"{delta} viikon kuluttua",monthUntil:"kuukauden kuluttua",monthsUntil:"{delta} kuukauden kuluttua",yearUntil:"vuoden kuluttua",yearsUntil:"{delta} vuoden kuluttua"});
+Locale.define("fi-FI","FormValidator",{required:"Tämä kenttä on pakollinen.",minLength:"Ole hyvä ja anna vähintään {minLength} merkkiä (annoit {length} merkkiä).",maxLength:"Älä anna enempää kuin {maxLength} merkkiä (annoit {length} merkkiä).",integer:"Ole hyvä ja anna kokonaisluku. Luvut, joissa on desimaaleja (esim. 1.25) eivät ole sallittuja.",numeric:'Anna tähän kenttään lukuarvo (kuten "1" tai "1.1" tai "-1" tai "-1.1").',digits:"Käytä pelkästään numeroita ja välimerkkejä tässä kentässä (syötteet, kuten esim. puhelinnumero, jossa on väliviivoja, pilkkuja tai pisteitä, kelpaa).",alpha:"Anna tähän kenttään vain kirjaimia (a-z). Välilyönnit tai muut merkit eivät ole sallittuja.",alphanum:"Anna tähän kenttään vain kirjaimia (a-z) tai numeroita (0-9). Välilyönnit tai muut merkit eivät ole sallittuja.",dateSuchAs:"Ole hyvä ja anna kelvollinen päivmäärä, kuten esimerkiksi {date}",dateInFormatMDY:'Ole hyvä ja anna kelvollinen päivämäärä muodossa pp/kk/vvvv (kuten "12/31/1999")',email:'Ole hyvä ja anna kelvollinen sähköpostiosoite (kuten esimerkiksi "matti@meikalainen.com").',url:"Ole hyvä ja anna kelvollinen URL, kuten esimerkiksi http://www.example.com.",currencyDollar:"Ole hyvä ja anna kelvollinen eurosumma (kuten esimerkiksi 100,00 EUR) .",oneRequired:"Ole hyvä ja syötä jotakin ainakin johonkin näistä kentistä.",errorPrefix:"Virhe: ",warningPrefix:"Varoitus: ",noSpace:"Tässä syötteessä ei voi olla välilyöntejä",reqChkByNode:"Ei valintoja.",requiredChk:"Tämä kenttä on pakollinen.",reqChkByName:"Ole hyvä ja valitse {label}.",match:"Tämän kentän tulee vastata kenttää {matchName}",startDate:"alkupäivämäärä",endDate:"loppupäivämäärä",currendDate:"nykyinen päivämäärä",afterDate:"Päivämäärän tulisi olla sama tai myöhäisempi ajankohta kuin {label}.",beforeDate:"Päivämäärän tulisi olla sama tai aikaisempi ajankohta kuin {label}.",startMonth:"Ole hyvä ja valitse aloituskuukausi",sameMonth:"Näiden kahden päivämäärän tulee olla saman kuun sisällä -- sinun pitää muuttaa jompaa kumpaa.",creditcard:"Annettu luottokortin numero ei kelpaa. Ole hyvä ja tarkista numero sekä yritä uudelleen. {length} numeroa syötetty."});
+Locale.define("fi-FI","Number",{group:" "}).inherit("EU","Number");Locale.define("fr-FR","Date",{months:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],months_abbr:["janv.","févr.","mars","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],days_abbr:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:function(a){return(a>1)?"":"er";
+},lessThanMinuteAgo:"il y a moins d'une minute",minuteAgo:"il y a une minute",minutesAgo:"il y a {delta} minutes",hourAgo:"il y a une heure",hoursAgo:"il y a {delta} heures",dayAgo:"il y a un jour",daysAgo:"il y a {delta} jours",weekAgo:"il y a une semaine",weeksAgo:"il y a {delta} semaines",monthAgo:"il y a 1 mois",monthsAgo:"il y a {delta} mois",yearthAgo:"il y a 1 an",yearsAgo:"il y a {delta} ans",lessThanMinuteUntil:"dans moins d'une minute",minuteUntil:"dans une minute",minutesUntil:"dans {delta} minutes",hourUntil:"dans une heure",hoursUntil:"dans {delta} heures",dayUntil:"dans un jour",daysUntil:"dans {delta} jours",weekUntil:"dans 1 semaine",weeksUntil:"dans {delta} semaines",monthUntil:"dans 1 mois",monthsUntil:"dans {delta} mois",yearUntil:"dans 1 an",yearsUntil:"dans {delta} ans"});
+Locale.define("fr-FR","FormValidator",{required:"Ce champ est obligatoire.",length:"Veuillez saisir {length} caract&egrave;re(s) (vous avez saisi {elLength} caract&egrave;re(s)",minLength:"Veuillez saisir un minimum de {minLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).",maxLength:"Veuillez saisir un maximum de {maxLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).",integer:'Veuillez saisir un nombre entier dans ce champ. Les nombres d&eacute;cimaux (ex : "1,25") ne sont pas autoris&eacute;s.',numeric:'Veuillez saisir uniquement des chiffres dans ce champ (ex : "1" ou "1,1" ou "-1" ou "-1,1").',digits:"Veuillez saisir uniquement des chiffres et des signes de ponctuation dans ce champ (ex : un num&eacute;ro de t&eacute;l&eacute;phone avec des traits d'union est autoris&eacute;).",alpha:"Veuillez saisir uniquement des lettres (a-z) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.",alphanum:"Veuillez saisir uniquement des lettres (a-z) ou des chiffres (0-9) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.",dateSuchAs:"Veuillez saisir une date correcte comme {date}",dateInFormatMDY:'Veuillez saisir une date correcte, au format JJ/MM/AAAA (ex : "31/11/1999").',email:'Veuillez saisir une adresse de courrier &eacute;lectronique. Par example "fred@domaine.com".',url:"Veuillez saisir une URL, comme http://www.example.com.",currencyDollar:"Veuillez saisir une quantit&eacute; correcte. Par example 100,00&euro;.",oneRequired:"Veuillez s&eacute;lectionner au moins une de ces options.",errorPrefix:"Erreur : ",warningPrefix:"Attention : ",noSpace:"Ce champ n'accepte pas les espaces.",reqChkByNode:"Aucun &eacute;l&eacute;ment n'est s&eacute;lectionn&eacute;.",requiredChk:"Ce champ est obligatoire.",reqChkByName:"Veuillez s&eacute;lectionner un(e) {label}.",match:"Ce champ doit correspondre avec le champ {matchName}.",startDate:"date de d&eacute;but",endDate:"date de fin",currendDate:"date actuelle",afterDate:"La date doit &ecirc;tre identique ou post&eacute;rieure &agrave; {label}.",beforeDate:"La date doit &ecirc;tre identique ou ant&eacute;rieure &agrave; {label}.",startMonth:"Veuillez s&eacute;lectionner un mois de d&eacute;but.",sameMonth:"Ces deux dates doivent &ecirc;tre dans le m&ecirc;me mois - vous devez en modifier une.",creditcard:"Le num&eacute;ro de carte de cr&eacute;dit est invalide. Merci de v&eacute;rifier le num&eacute;ro et de r&eacute;essayer. Vous avez entr&eacute; {length} chiffre(s)."});
+Locale.define("fr-FR","Number",{group:" "}).inherit("EU","Number");Locale.define("he-IL","Date",{months:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],months_abbr:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],days:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת"],days_abbr:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת"],dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:0,ordinal:"",lessThanMinuteAgo:"לפני פחות מדקה",minuteAgo:"לפני כדקה",minutesAgo:"לפני {delta} דקות",hourAgo:"לפני כשעה",hoursAgo:"לפני {delta} שעות",dayAgo:"לפני יום",daysAgo:"לפני {delta} ימים",weekAgo:"לפני שבוע",weeksAgo:"לפני {delta} שבועות",monthAgo:"לפני חודש",monthsAgo:"לפני {delta} חודשים",yearAgo:"לפני שנה",yearsAgo:"לפני {delta} שנים",lessThanMinuteUntil:"בעוד פחות מדקה",minuteUntil:"בעוד כדקה",minutesUntil:"בעוד {delta} דקות",hourUntil:"בעוד כשעה",hoursUntil:"בעוד {delta} שעות",dayUntil:"בעוד יום",daysUntil:"בעוד {delta} ימים",weekUntil:"בעוד שבוע",weeksUntil:"בעוד {delta} שבועות",monthUntil:"בעוד חודש",monthsUntil:"בעוד {delta} חודשים",yearUntil:"בעוד שנה",yearsUntil:"בעוד {delta} שנים"});
+Locale.define("he-IL","FormValidator",{required:"נא למלא שדה זה.",minLength:"נא להזין לפחות {minLength} תווים (הזנת {length} תווים).",maxLength:"נא להזין עד {maxLength} תווים (הזנת {length} תווים).",integer:"נא להזין מספר שלם לשדה זה. מספרים עשרוניים (כמו 1.25) אינם חוקיים.",numeric:'נא להזין ערך מספרי בלבד בשדה זה (כמו "1", "1.1", "-1" או "-1.1").',digits:"נא להזין רק ספרות וסימני הפרדה בשדה זה (למשל, מספר טלפון עם מקפים או נקודות הוא חוקי).",alpha:"נא להזין רק אותיות באנגלית (a-z) בשדה זה. רווחים או תווים אחרים אינם חוקיים.",alphanum:"נא להזין רק אותריות באנגלית (a-z) או ספרות (0-9) בשדה זה. אווחרים או תווים אחרים אינם חוקיים.",dateSuchAs:"נא להזין תאריך חוקי, כמו {date}",dateInFormatMDY:'נא להזין תאריך חוקי בפורמט MM/DD/YYYY (כמו "12/31/1999")',email:'נא להזין כתובת אימייל חוקית. לדוגמה: "fred@domain.com".',url:"נא להזין כתובת אתר חוקית, כמו http://www.example.com.",currencyDollar:"נא להזין סכום דולרי חוקי. לדוגמה $100.00.",oneRequired:"נא לבחור לפחות בשדה אחד.",errorPrefix:"שגיאה: ",warningPrefix:"אזהרה: ",noSpace:"אין להזין רווחים בשדה זה.",reqChkByNode:"נא לבחור אחת מהאפשרויות.",requiredChk:"שדה זה נדרש.",reqChkByName:"נא לבחור {label}.",match:"שדה זה צריך להתאים לשדה {matchName}",startDate:"תאריך ההתחלה",endDate:"תאריך הסיום",currendDate:"התאריך הנוכחי",afterDate:"התאריך צריך להיות זהה או אחרי {label}.",beforeDate:"התאריך צריך להיות זהה או לפני {label}.",startMonth:"נא לבחור חודש התחלה",sameMonth:"שני תאריכים אלה צריכים להיות באותו חודש - נא לשנות אחד התאריכים.",creditcard:"מספר כרטיס האשראי שהוזן אינו חוקי. נא לבדוק שנית. הוזנו {length} ספרות."});
+Locale.define("he-IL","Number",{decimal:".",group:",",currency:{suffix:" ₪"}});Locale.define("hu-HU","Date",{months:["Január","Február","Március","Április","Május","Június","Július","Augusztus","Szeptember","Október","November","December"],months_abbr:["jan.","febr.","márc.","ápr.","máj.","jún.","júl.","aug.","szept.","okt.","nov.","dec."],days:["Vasárnap","Hétfő","Kedd","Szerda","Csütörtök","Péntek","Szombat"],days_abbr:["V","H","K","Sze","Cs","P","Szo"],dateOrder:["year","month","date"],shortDate:"%Y.%m.%d.",shortTime:"%I:%M",AM:"de.",PM:"du.",firstDayOfWeek:1,ordinal:".",lessThanMinuteAgo:"alig egy perce",minuteAgo:"egy perce",minutesAgo:"{delta} perce",hourAgo:"egy órája",hoursAgo:"{delta} órája",dayAgo:"1 napja",daysAgo:"{delta} napja",weekAgo:"1 hete",weeksAgo:"{delta} hete",monthAgo:"1 hónapja",monthsAgo:"{delta} hónapja",yearAgo:"1 éve",yearsAgo:"{delta} éve",lessThanMinuteUntil:"alig egy perc múlva",minuteUntil:"egy perc múlva",minutesUntil:"{delta} perc múlva",hourUntil:"egy óra múlva",hoursUntil:"{delta} óra múlva",dayUntil:"1 nap múlva",daysUntil:"{delta} nap múlva",weekUntil:"1 hét múlva",weeksUntil:"{delta} hét múlva",monthUntil:"1 hónap múlva",monthsUntil:"{delta} hónap múlva",yearUntil:"1 év múlva",yearsUntil:"{delta} év múlva"});
+Locale.define("hu-HU","FormValidator",{required:"A mező kitöltése kötelező.",minLength:"Legalább {minLength} karakter megadása szükséges (megadva {length} karakter).",maxLength:"Legfeljebb {maxLength} karakter megadása lehetséges (megadva {length} karakter).",integer:"Egész szám megadása szükséges. A tizedesjegyek (pl. 1.25) nem engedélyezettek.",numeric:'Szám megadása szükséges (pl. "1" vagy "1.1" vagy "-1" vagy "-1.1").',digits:"Csak számok és írásjelek megadása lehetséges (pl. telefonszám kötőjelek és/vagy perjelekkel).",alpha:"Csak betűk (a-z) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.",alphanum:"Csak betűk (a-z) vagy számok (0-9) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.",dateSuchAs:"Valós dátum megadása szükséges (pl. {date}).",dateInFormatMDY:'Valós dátum megadása szükséges ÉÉÉÉ.HH.NN. formában. (pl. "1999.12.31.")',email:'Valós e-mail cím megadása szükséges (pl. "fred@domain.hu").',url:"Valós URL megadása szükséges (pl. http://www.example.com).",currencyDollar:"Valós pénzösszeg megadása szükséges (pl. 100.00 Ft.).",oneRequired:"Az alábbi mezők legalább egyikének kitöltése kötelező.",errorPrefix:"Hiba: ",warningPrefix:"Figyelem: ",noSpace:"A mező nem tartalmazhat szóközöket.",reqChkByNode:"Nincs egyetlen kijelölt elem sem.",requiredChk:"A mező kitöltése kötelező.",reqChkByName:"Egy {label} kiválasztása szükséges.",match:"A mezőnek egyeznie kell a(z) {matchName} mezővel.",startDate:"a kezdet dátuma",endDate:"a vég dátuma",currendDate:"jelenlegi dátum",afterDate:"A dátum nem lehet kisebb, mint {label}.",beforeDate:"A dátum nem lehet nagyobb, mint {label}.",startMonth:"Kezdeti hónap megadása szükséges.",sameMonth:"A két dátumnak ugyanazon hónapban kell lennie.",creditcard:"A megadott bankkártyaszám nem valódi (megadva {length} számjegy)."});
+Locale.define("it-IT","Date",{months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],months_abbr:["gen","feb","mar","apr","mag","giu","lug","ago","set","ott","nov","dic"],days:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],days_abbr:["dom","lun","mar","mer","gio","ven","sab"],dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H.%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"º",lessThanMinuteAgo:"meno di un minuto fa",minuteAgo:"circa un minuto fa",minutesAgo:"circa {delta} minuti fa",hourAgo:"circa un'ora fa",hoursAgo:"circa {delta} ore fa",dayAgo:"circa 1 giorno fa",daysAgo:"circa {delta} giorni fa",weekAgo:"una settimana fa",weeksAgo:"{delta} settimane fa",monthAgo:"un mese fa",monthsAgo:"{delta} mesi fa",yearAgo:"un anno fa",yearsAgo:"{delta} anni fa",lessThanMinuteUntil:"tra meno di un minuto",minuteUntil:"tra circa un minuto",minutesUntil:"tra circa {delta} minuti",hourUntil:"tra circa un'ora",hoursUntil:"tra circa {delta} ore",dayUntil:"tra circa un giorno",daysUntil:"tra circa {delta} giorni",weekUntil:"tra una settimana",weeksUntil:"tra {delta} settimane",monthUntil:"tra un mese",monthsUntil:"tra {delta} mesi",yearUntil:"tra un anno",yearsUntil:"tra {delta} anni"});
+Locale.define("it-IT","FormValidator",{required:"Il campo &egrave; obbligatorio.",minLength:"Inserire almeno {minLength} caratteri (ne sono stati inseriti {length}).",maxLength:"Inserire al massimo {maxLength} caratteri (ne sono stati inseriti {length}).",integer:"Inserire un numero intero. Non sono consentiti decimali (es.: 1.25).",numeric:'Inserire solo valori numerici (es.: "1" oppure "1.1" oppure "-1" oppure "-1.1").',digits:"Inserire solo numeri e caratteri di punteggiatura. Per esempio &egrave; consentito un numero telefonico con trattini o punti.",alpha:"Inserire solo lettere (a-z). Non sono consentiti spazi o altri caratteri.",alphanum:"Inserire solo lettere (a-z) o numeri (0-9). Non sono consentiti spazi o altri caratteri.",dateSuchAs:"Inserire una data valida del tipo {date}",dateInFormatMDY:'Inserire una data valida nel formato MM/GG/AAAA (es.: "12/31/1999")',email:'Inserire un indirizzo email valido. Per esempio "nome@dominio.com".',url:'Inserire un indirizzo valido. Per esempio "http://www.example.com".',currencyDollar:'Inserire un importo valido. Per esempio "$100.00".',oneRequired:"Completare almeno uno dei campi richiesti.",errorPrefix:"Errore: ",warningPrefix:"Attenzione: ",noSpace:"Non sono consentiti spazi.",reqChkByNode:"Nessuna voce selezionata.",requiredChk:"Il campo &egrave; obbligatorio.",reqChkByName:"Selezionare un(a) {label}.",match:"Il valore deve corrispondere al campo {matchName}",startDate:"data d'inizio",endDate:"data di fine",currendDate:"data attuale",afterDate:"La data deve corrispondere o essere successiva al {label}.",beforeDate:"La data deve corrispondere o essere precedente al {label}.",startMonth:"Selezionare un mese d'inizio",sameMonth:"Le due date devono essere dello stesso mese - occorre modificarne una."});
+Locale.define("ja-JP","Date",{months:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],months_abbr:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],days:["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],days_abbr:["日","月","火","水","木","金","土"],dateOrder:["year","month","date"],shortDate:"%Y/%m/%d",shortTime:"%H:%M",AM:"午前",PM:"午後",firstDayOfWeek:0,ordinal:"",lessThanMinuteAgo:"1分以内前",minuteAgo:"約1分前",minutesAgo:"約{delta}分前",hourAgo:"約1時間前",hoursAgo:"約{delta}時間前",dayAgo:"1日前",daysAgo:"{delta}日前",weekAgo:"1週間前",weeksAgo:"{delta}週間前",monthAgo:"1ヶ月前",monthsAgo:"{delta}ヶ月前",yearAgo:"1年前",yearsAgo:"{delta}年前",lessThanMinuteUntil:"今から約1分以内",minuteUntil:"今から約1分",minutesUntil:"今から約{delta}分",hourUntil:"今から約1時間",hoursUntil:"今から約{delta}時間",dayUntil:"今から1日間",daysUntil:"今から{delta}日間",weekUntil:"今から1週間",weeksUntil:"今から{delta}週間",monthUntil:"今から1ヶ月",monthsUntil:"今から{delta}ヶ月",yearUntil:"今から1年",yearsUntil:"今から{delta}年"});
+Locale.define("ja-JP","FormValidator",{required:"入力は必須です。",minLength:"入力文字数は{minLength}以上にしてください。({length}文字)",maxLength:"入力文字数は{maxLength}以下にしてください。({length}文字)",integer:"整数を入力してください。",numeric:'入力できるのは数値だけです。(例: "1", "1.1", "-1", "-1.1"....)',digits:"入力できるのは数値と句読記号です。 (例: -や+を含む電話番号など).",alpha:"入力できるのは半角英字だけです。それ以外の文字は入力できません。",alphanum:"入力できるのは半角英数字だけです。それ以外の文字は入力できません。",dateSuchAs:"有効な日付を入力してください。{date}",dateInFormatMDY:'日付の書式に誤りがあります。YYYY/MM/DD (i.e. "1999/12/31")',email:"メールアドレスに誤りがあります。",url:"URLアドレスに誤りがあります。",currencyDollar:"金額に誤りがあります。",oneRequired:"ひとつ以上入力してください。",errorPrefix:"エラー: ",warningPrefix:"警告: ",noSpace:"スペースは入力できません。",reqChkByNode:"選択されていません。",requiredChk:"この項目は必須です。",reqChkByName:"{label}を選択してください。",match:"{matchName}が入力されている場合必須です。",startDate:"開始日",endDate:"終了日",currendDate:"今日",afterDate:"{label}以降の日付にしてください。",beforeDate:"{label}以前の日付にしてください。",startMonth:"開始月を選択してください。",sameMonth:"日付が同一です。どちらかを変更してください。"});
+Locale.define("ja-JP","Number",{decimal:".",group:",",currency:{decimals:0,prefix:"\\"}});Locale.define("nl-NL","Date",{months:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],months_abbr:["jan","feb","mrt","apr","mei","jun","jul","aug","sep","okt","nov","dec"],days:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"],days_abbr:["zo","ma","di","wo","do","vr","za"],dateOrder:["date","month","year"],shortDate:"%d-%m-%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"e",lessThanMinuteAgo:"minder dan een minuut geleden",minuteAgo:"ongeveer een minuut geleden",minutesAgo:"{delta} minuten geleden",hourAgo:"ongeveer een uur geleden",hoursAgo:"ongeveer {delta} uur geleden",dayAgo:"een dag geleden",daysAgo:"{delta} dagen geleden",weekAgo:"een week geleden",weeksAgo:"{delta} weken geleden",monthAgo:"een maand geleden",monthsAgo:"{delta} maanden geleden",yearAgo:"een jaar geleden",yearsAgo:"{delta} jaar geleden",lessThanMinuteUntil:"over minder dan een minuut",minuteUntil:"over ongeveer een minuut",minutesUntil:"over {delta} minuten",hourUntil:"over ongeveer een uur",hoursUntil:"over {delta} uur",dayUntil:"over ongeveer een dag",daysUntil:"over {delta} dagen",weekUntil:"over een week",weeksUntil:"over {delta} weken",monthUntil:"over een maand",monthsUntil:"over {delta} maanden",yearUntil:"over een jaar",yearsUntil:"over {delta} jaar"});
+Locale.define("nl-NL","FormValidator",{required:"Dit veld is verplicht.",length:"Vul precies {length} karakters in (je hebt {elLength} karakters ingevoerd).",minLength:"Vul minimaal {minLength} karakters in (je hebt {length} karakters ingevoerd).",maxLength:"Vul niet meer dan {maxLength} karakters in (je hebt {length} karakters ingevoerd).",integer:"Vul een getal in. Getallen met decimalen (bijvoorbeeld 1.25) zijn niet toegestaan.",numeric:'Vul alleen numerieke waarden in (bijvoorbeeld "1" of "1.1" of "-1" of "-1.1").',digits:"Vul alleen nummers en leestekens in (bijvoorbeeld een telefoonnummer met streepjes is toegestaan).",alpha:"Vul alleen letters in (a-z). Spaties en andere karakters zijn niet toegestaan.",alphanum:"Vul alleen letters (a-z) of nummers (0-9) in. Spaties en andere karakters zijn niet toegestaan.",dateSuchAs:"Vul een geldige datum in, zoals {date}",dateInFormatMDY:'Vul een geldige datum, in het formaat MM/DD/YYYY (bijvoorbeeld "12/31/1999")',email:'Vul een geldig e-mailadres in. Bijvoorbeeld "fred@domein.nl".',url:"Vul een geldige URL in, zoals http://www.example.com.",currencyDollar:"Vul een geldig $ bedrag in. Bijvoorbeeld $100.00 .",oneRequired:"Vul iets in bij in ieder geval een van deze velden.",warningPrefix:"Waarschuwing: ",errorPrefix:"Fout: ",noSpace:"Spaties zijn niet toegestaan in dit veld.",reqChkByNode:"Er zijn geen items geselecteerd.",requiredChk:"Dit veld is verplicht.",reqChkByName:"Selecteer een {label}.",match:"Dit veld moet overeen komen met het {matchName} veld",startDate:"de begin datum",endDate:"de eind datum",currendDate:"de huidige datum",afterDate:"De datum moet hetzelfde of na {label} zijn.",beforeDate:"De datum moet hetzelfde of voor {label} zijn.",startMonth:"Selecteer een begin maand",sameMonth:"Deze twee data moeten in dezelfde maand zijn - u moet een van beide aanpassen.",creditcard:"Het ingevulde creditcardnummer is niet geldig. Controleer het nummer en probeer opnieuw. {length} getallen ingevuld."});
+Locale.define("nl-NL").inherit("EU","Number");Locale.define("no-NO","Date",{dateOrder:["date","month","year"],shortDate:"%d.%m.%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,lessThanMinuteAgo:"kortere enn et minutt siden",minuteAgo:"omtrent et minutt siden",minutesAgo:"{delta} minutter siden",hourAgo:"omtrent en time siden",hoursAgo:"omtrent {delta} timer siden",dayAgo:"{delta} dag siden",daysAgo:"{delta} dager siden"});
+Locale.define("no-NO","FormValidator",{required:"Dette feltet er påkrevd.",minLength:"Vennligst skriv inn minst {minLength} tegn (du skrev {length} tegn).",maxLength:"Vennligst skriv inn maksimalt {maxLength} tegn (du skrev {length} tegn).",integer:"Vennligst skriv inn et tall i dette feltet. Tall med desimaler (for eksempel 1,25) er ikke tillat.",numeric:'Vennligst skriv inn kun numeriske verdier i dette feltet (for eksempel "1", "1.1", "-1" eller "-1.1").',digits:"Vennligst bruk kun nummer og skilletegn i dette feltet.",alpha:"Vennligst bruk kun bokstaver (a-z) i dette feltet. Ingen mellomrom eller andre tegn er tillat.",alphanum:"Vennligst bruk kun bokstaver (a-z) eller nummer (0-9) i dette feltet. Ingen mellomrom eller andre tegn er tillat.",dateSuchAs:"Vennligst skriv inn en gyldig dato, som {date}",dateInFormatMDY:'Vennligst skriv inn en gyldig dato, i formatet MM/DD/YYYY (for eksempel "12/31/1999")',email:'Vennligst skriv inn en gyldig epost-adresse. For eksempel "espen@domene.no".',url:"Vennligst skriv inn en gyldig URL, for eksempel http://www.example.com.",currencyDollar:"Vennligst fyll ut et gyldig $ beløp. For eksempel $100.00 .",oneRequired:"Vennligst fyll ut noe i minst ett av disse feltene.",errorPrefix:"Feil: ",warningPrefix:"Advarsel: "});
+Locale.define("pl-PL","Date",{months:["Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień"],months_abbr:["sty","lut","mar","kwi","maj","cze","lip","sie","wrz","paź","lis","gru"],days:["Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota"],days_abbr:["niedz.","pon.","wt.","śr.","czw.","pt.","sob."],dateOrder:["year","month","date"],shortDate:"%Y-%m-%d",shortTime:"%H:%M",AM:"nad ranem",PM:"po południu",firstDayOfWeek:1,ordinal:function(a){return(a>3&&a<21)?"ty":["ty","szy","gi","ci","ty"][Math.min(a%10,4)];
+},lessThanMinuteAgo:"mniej niż minute temu",minuteAgo:"około minutę temu",minutesAgo:"{delta} minut temu",hourAgo:"około godzinę temu",hoursAgo:"około {delta} godzin temu",dayAgo:"Wczoraj",daysAgo:"{delta} dni temu",lessThanMinuteUntil:"za niecałą minutę",minuteUntil:"za około minutę",minutesUntil:"za {delta} minut",hourUntil:"za około godzinę",hoursUntil:"za około {delta} godzin",dayUntil:"za 1 dzień",daysUntil:"za {delta} dni"});
+Locale.define("pl-PL","FormValidator",{required:"To pole jest wymagane.",minLength:"Wymagane jest przynajmniej {minLength} znaków (wpisanych zostało tylko {length}).",maxLength:"Dozwolone jest nie więcej niż {maxLength} znaków (wpisanych zostało {length})",integer:"To pole wymaga liczb całych. Liczby dziesiętne (np. 1.25) są niedozwolone.",numeric:'Prosimy używać tylko numerycznych wartości w tym polu (np. "1", "1.1", "-1" lub "-1.1").',digits:"Prosimy używać liczb oraz zankow punktuacyjnych w typ polu (dla przykładu, przy numerze telefonu myślniki i kropki są dozwolone).",alpha:"Prosimy używać tylko liter (a-z) w tym polu. Spacje oraz inne znaki są niedozwolone.",alphanum:"Prosimy używać tylko liter (a-z) lub liczb (0-9) w tym polu. Spacje oraz inne znaki są niedozwolone.",dateSuchAs:"Prosimy podać prawidłową datę w formacie: {date}",dateInFormatMDY:'Prosimy podać poprawną date w formacie DD.MM.RRRR (i.e. "12.01.2009")',email:'Prosimy podać prawidłowy adres e-mail, np. "jan@domena.pl".',url:"Prosimy podać prawidłowy adres URL, np. http://www.example.com.",currencyDollar:"Prosimy podać prawidłową sumę w PLN. Dla przykładu: 100.00 PLN.",oneRequired:"Prosimy wypełnić chociaż jedno z pól.",errorPrefix:"Błąd: ",warningPrefix:"Uwaga: ",noSpace:"W tym polu nie mogą znajdować się spacje.",reqChkByNode:"Brak zaznaczonych elementów.",requiredChk:"To pole jest wymagane.",reqChkByName:"Prosimy wybrać z {label}.",match:"To pole musi być takie samo jak {matchName}",startDate:"data początkowa",endDate:"data końcowa",currendDate:"aktualna data",afterDate:"Podana data poinna być taka sama lub po {label}.",beforeDate:"Podana data poinna być taka sama lub przed {label}.",startMonth:"Prosimy wybrać początkowy miesiąc.",sameMonth:"Te dwie daty muszą być w zakresie tego samego miesiąca - wymagana jest zmiana któregoś z pól."});
+Locale.define("pt-PT","Date",{months:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],months_abbr:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],days:["Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado"],days_abbr:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dateOrder:["date","month","year"],shortDate:"%d-%m-%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"º",lessThanMinuteAgo:"há menos de um minuto",minuteAgo:"há cerca de um minuto",minutesAgo:"há {delta} minutos",hourAgo:"há cerca de uma hora",hoursAgo:"há cerca de {delta} horas",dayAgo:"há um dia",daysAgo:"há {delta} dias",weekAgo:"há uma semana",weeksAgo:"há {delta} semanas",monthAgo:"há um mês",monthsAgo:"há {delta} meses",yearAgo:"há um ano",yearsAgo:"há {delta} anos",lessThanMinuteUntil:"em menos de um minuto",minuteUntil:"em um minuto",minutesUntil:"em {delta} minutos",hourUntil:"em uma hora",hoursUntil:"em {delta} horas",dayUntil:"em um dia",daysUntil:"em {delta} dias",weekUntil:"em uma semana",weeksUntil:"em {delta} semanas",monthUntil:"em um mês",monthsUntil:"em {delta} meses",yearUntil:"em um ano",yearsUntil:"em {delta} anos"});
+Locale.define("pt-BR","Date",{shortDate:"%d/%m/%Y"}).inherit("pt-PT","Date");Locale.define("pt-BR","FormValidator",{required:"Este campo é obrigatório.",minLength:"Digite pelo menos {minLength} caracteres (tamanho atual: {length}).",maxLength:"Não digite mais de {maxLength} caracteres (tamanho atual: {length}).",integer:"Por favor digite apenas um número inteiro neste campo. Não são permitidos números decimais (por exemplo, 1,25).",numeric:'Por favor digite apenas valores numéricos neste campo (por exemplo, "1" ou "1.1" ou "-1" ou "-1,1").',digits:"Por favor use apenas números e pontuação neste campo (por exemplo, um número de telefone com traços ou pontos é permitido).",alpha:"Por favor use somente letras (a-z). Espaço e outros caracteres não são permitidos.",alphanum:"Use somente letras (a-z) ou números (0-9) neste campo. Espaço e outros caracteres não são permitidos.",dateSuchAs:"Digite uma data válida, como {date}",dateInFormatMDY:'Digite uma data válida, como DD/MM/YYYY (por exemplo, "31/12/1999")',email:'Digite um endereço de email válido. Por exemplo "nome@dominio.com".',url:"Digite uma URL válida. Exemplo: http://www.example.com.",currencyDollar:"Digite um valor em dinheiro válido. Exemplo: R$100,00 .",oneRequired:"Digite algo para pelo menos um desses campos.",errorPrefix:"Erro: ",warningPrefix:"Aviso: ",noSpace:"Não é possível digitar espaços neste campo.",reqChkByNode:"Não foi selecionado nenhum item.",requiredChk:"Este campo é obrigatório.",reqChkByName:"Por favor digite um {label}.",match:"Este campo deve ser igual ao campo {matchName}.",startDate:"a data inicial",endDate:"a data final",currendDate:"a data atual",afterDate:"A data deve ser igual ou posterior a {label}.",beforeDate:"A data deve ser igual ou anterior a {label}.",startMonth:"Por favor selecione uma data inicial.",sameMonth:"Estas duas datas devem ter o mesmo mês - você deve modificar uma das duas.",creditcard:"O número do cartão de crédito informado é inválido. Por favor verifique o valor e tente novamente. {length} números informados."});
+Locale.define("pt-PT","FormValidator",{required:"Este campo é necessário.",minLength:"Digite pelo menos{minLength} caracteres (comprimento {length} caracteres).",maxLength:"Não insira mais de {maxLength} caracteres (comprimento {length} caracteres).",integer:"Digite um número inteiro neste domínio. Com números decimais (por exemplo, 1,25), não são permitidas.",numeric:'Digite apenas valores numéricos neste domínio (p.ex., "1" ou "1.1" ou "-1" ou "-1,1").',digits:"Por favor, use números e pontuação apenas neste campo (p.ex., um número de telefone com traços ou pontos é permitida).",alpha:"Por favor use somente letras (a-z), com nesta área. Não utilize espaços nem outros caracteres são permitidos.",alphanum:"Use somente letras (a-z) ou números (0-9) neste campo. Não utilize espaços nem outros caracteres são permitidos.",dateSuchAs:"Digite uma data válida, como {date}",dateInFormatMDY:'Digite uma data válida, como DD/MM/YYYY (p.ex. "31/12/1999")',email:'Digite um endereço de email válido. Por exemplo "fred@domain.com".',url:"Digite uma URL válida, como http://www.example.com.",currencyDollar:"Digite um valor válido $. Por exemplo $ 100,00. ",oneRequired:"Digite algo para pelo menos um desses insumos.",errorPrefix:"Erro: ",warningPrefix:"Aviso: "});
+(function(){var a=function(h,e,d,g,b){var c=h%10,f=h%100;if(c==1&&f!=11){return e;}else{if((c==2||c==3||c==4)&&!(f==12||f==13||f==14)){return d;}else{if(c==0||(c==5||c==6||c==7||c==8||c==9)||(f==11||f==12||f==13||f==14)){return g;
+}else{return b;}}}};Locale.define("ru-RU","Date",{months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],months_abbr:["янв","февр","март","апр","май","июнь","июль","авг","сент","окт","нояб","дек"],days:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],days_abbr:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],dateOrder:["date","month","year"],shortDate:"%d.%m.%Y",shortTime:"%H:%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"меньше минуты назад",minuteAgo:"минуту назад",minutesAgo:function(b){return"{delta} "+a(b,"минуту","минуты","минут")+" назад";
+},hourAgo:"час назад",hoursAgo:function(b){return"{delta} "+a(b,"час","часа","часов")+" назад";},dayAgo:"вчера",daysAgo:function(b){return"{delta} "+a(b,"день","дня","дней")+" назад";
+},weekAgo:"неделю назад",weeksAgo:function(b){return"{delta} "+a(b,"неделя","недели","недель")+" назад";},monthAgo:"месяц назад",monthsAgo:function(b){return"{delta} "+a(b,"месяц","месяца","месецев")+" назад";
+},yearAgo:"год назад",yearsAgo:function(b){return"{delta} "+a(b,"год","года","лет")+" назад";},lessThanMinuteUntil:"меньше чем через минуту",minuteUntil:"через минуту",minutesUntil:function(b){return"через {delta} "+a(b,"час","часа","часов")+"";
+},hourUntil:"через час",hoursUntil:function(b){return"через {delta} "+a(b,"час","часа","часов")+"";},dayUntil:"завтра",daysUntil:function(b){return"через {delta} "+a(b,"день","дня","дней")+"";
+},weekUntil:"через неделю",weeksUntil:function(b){return"через {delta} "+a(b,"неделю","недели","недель")+"";},monthUntil:"через месяц",monthsUntil:function(b){return"через {delta} "+a(b,"месяц","месяца","месецев")+"";
+},yearUntil:"через",yearsUntil:function(b){return"через {delta} "+a(b,"год","года","лет")+"";}});})();Locale.define("ru-RU","FormValidator",{required:"Это поле обязательно к заполнению.",minLength:"Пожалуйста, введите хотя бы {minLength} символов (Вы ввели {length}).",maxLength:"Пожалуйста, введите не больше {maxLength} символов (Вы ввели {length}).",integer:"Пожалуйста, введите в это поле число. Дробные числа (например 1.25) тут не разрешены.",numeric:'Пожалуйста, введите в это поле число (например "1" или "1.1", или "-1", или "-1.1").',digits:"В этом поле Вы можете использовать только цифры и знаки пунктуации (например, телефонный номер со знаками дефиса или с точками).",alpha:"В этом поле можно использовать только латинские буквы (a-z). Пробелы и другие символы запрещены.",alphanum:"В этом поле можно использовать только латинские буквы (a-z) и цифры (0-9). Пробелы и другие символы запрещены.",dateSuchAs:"Пожалуйста, введите корректную дату {date}",dateInFormatMDY:'Пожалуйста, введите дату в формате ММ/ДД/ГГГГ (например "12/31/1999")',email:'Пожалуйста, введите корректный емейл-адрес. Для примера "fred@domain.com".',url:"Пожалуйста, введите правильную ссылку вида http://www.example.com.",currencyDollar:"Пожалуйста, введите сумму в долларах. Например: $100.00 .",oneRequired:"Пожалуйста, выберите хоть что-нибудь в одном из этих полей.",errorPrefix:"Ошибка: ",warningPrefix:"Внимание: "});
+(function(){var a=function(f,d,c,e,b){return(f>=1&&f<=3)?arguments[f]:b;};Locale.define("si-SI","Date",{months:["januar","februar","marec","april","maj","junij","julij","avgust","september","oktober","november","december"],months_abbr:["jan","feb","mar","apr","maj","jun","jul","avg","sep","okt","nov","dec"],days:["nedelja","ponedeljek","torek","sreda","četrtek","petek","sobota"],days_abbr:["ned","pon","tor","sre","čet","pet","sob"],dateOrder:["date","month","year"],shortDate:"%d.%m.%Y",shortTime:"%H.%M",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:".",lessThanMinuteAgo:"manj kot minuto nazaj",minuteAgo:"minuto nazaj",minutesAgo:function(b){return"{delta} "+a(b,"minuto","minuti","minute","minut")+" nazaj";
+},hourAgo:"uro nazaj",hoursAgo:function(b){return"{delta} "+a(b,"uro","uri","ure","ur")+" nazaj";},dayAgo:"dan nazaj",daysAgo:function(b){return"{delta} "+a(b,"dan","dneva","dni","dni")+" nazaj";
+},weekAgo:"teden nazaj",weeksAgo:function(b){return"{delta} "+a(b,"teden","tedna","tedne","tednov")+" nazaj";},monthAgo:"mesec nazaj",monthsAgo:function(b){return"{delta} "+a(b,"mesec","meseca","mesece","mesecov")+" nazaj";
+},yearthAgo:"leto nazaj",yearsAgo:function(b){return"{delta} "+a(b,"leto","leti","leta","let")+" nazaj";},lessThanMinuteUntil:"še manj kot minuto",minuteUntil:"še minuta",minutesUntil:function(b){return"še {delta} "+a(b,"minuta","minuti","minute","minut");
+},hourUntil:"še ura",hoursUntil:function(b){return"še {delta} "+a(b,"ura","uri","ure","ur");},dayUntil:"še dan",daysUntil:function(b){return"še {delta} "+a(b,"dan","dneva","dnevi","dni");
+},weekUntil:"še tedn",weeksUntil:function(b){return"še {delta} "+a(b,"teden","tedna","tedni","tednov");},monthUntil:"še mesec",monthsUntil:function(b){return"še {delta} "+a(b,"mesec","meseca","meseci","mesecov");
+},yearUntil:"še leto",yearsUntil:function(b){return"še {delta} "+a(b,"leto","leti","leta","let");}});})();Locale.define("si-SI","FormValidator",{required:"To polje je obvezno",minLength:"Prosim, vnesite vsaj {minLength} znakov (vnesli ste {length} znakov).",maxLength:"Prosim, ne vnesite več kot {maxLength} znakov (vnesli ste {length} znakov).",integer:"Prosim, vnesite celo število. Decimalna števila (kot 1,25) niso dovoljena.",numeric:'Prosim, vnesite samo numerične vrednosti (kot "1" ali "1.1" ali "-1" ali "-1.1").',digits:"Prosim, uporabite številke in ločila le na tem polju (na primer, dovoljena je telefonska številka z pomišlaji ali pikami).",alpha:"Prosim, uporabite le črke v tem plju. Presledki in drugi znaki niso dovoljeni.",alphanum:"Prosim, uporabite samo črke ali številke v tem polju. Presledki in drugi znaki niso dovoljeni.",dateSuchAs:"Prosim, vnesite pravilen datum kot {date}",dateInFormatMDY:'Prosim, vnesite pravilen datum kot MM.DD.YYYY (primer "12.31.1999")',email:'Prosim, vnesite pravilen email naslov. Na primer "fred@domain.com".',url:"Prosim, vnesite pravilen URL kot http://www.example.com.",currencyDollar:"Prosim, vnesit epravilno vrednost €. Primer 100,00€ .",oneRequired:"Prosimo, vnesite nekaj za vsaj eno izmed teh polj.",errorPrefix:"Napaka: ",warningPrefix:"Opozorilo: ",noSpace:"To vnosno polje ne dopušča presledkov.",reqChkByNode:"Nič niste izbrali.",requiredChk:"To polje je obvezno",reqChkByName:"Prosim, izberite {label}.",match:"To polje se mora ujemati z poljem {matchName}",startDate:"datum začetka",endDate:"datum konca",currendDate:"trenuten datum",afterDate:"Datum bi moral biti isti ali po {label}.",beforeDate:"Datum bi moral biti isti ali pred {label}.",startMonth:"Prosim, vnesite začetni datum",sameMonth:"Ta dva datuma morata biti v istem mesecu - premeniti morate eno ali drugo.",creditcard:"Številka kreditne kartice ni pravilna. Preverite številko ali poskusite še enkrat. Vnešenih {length} znakov."});
+Locale.define("sv-SE","Date",{months:["januari","februari","mars","april","maj","juni","juli","augusti","september","oktober","november","december"],months_abbr:["jan","feb","mar","apr","maj","jun","jul","aug","sep","okt","nov","dec"],days:["söndag","måndag","tisdag","onsdag","torsdag","fredag","lördag"],days_abbr:["sön","mån","tis","ons","tor","fre","lör"],dateOrder:["year","month","date"],shortDate:"%Y-%m-%d",shortTime:"%H:%M",AM:"",PM:"",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"mindre än en minut sedan",minuteAgo:"ungefär en minut sedan",minutesAgo:"{delta} minuter sedan",hourAgo:"ungefär en timme sedan",hoursAgo:"ungefär {delta} timmar sedan",dayAgo:"1 dag sedan",daysAgo:"{delta} dagar sedan",lessThanMinuteUntil:"mindre än en minut sedan",minuteUntil:"ungefär en minut sedan",minutesUntil:"{delta} minuter sedan",hourUntil:"ungefär en timme sedan",hoursUntil:"ungefär {delta} timmar sedan",dayUntil:"1 dag sedan",daysUntil:"{delta} dagar sedan"});
+Locale.define("sv-SE","FormValidator",{required:"Fältet är obligatoriskt.",minLength:"Ange minst {minLength} tecken (du angav {length} tecken).",maxLength:"Ange högst {maxLength} tecken (du angav {length} tecken). ",integer:"Ange ett heltal i fältet. Tal med decimaler (t.ex. 1,25) är inte tillåtna.",numeric:'Ange endast numeriska värden i detta fält (t.ex. "1" eller "1.1" eller "-1" eller "-1,1").',digits:"Använd endast siffror och skiljetecken i detta fält (till exempel ett telefonnummer med bindestreck tillåtet).",alpha:"Använd endast bokstäver (a-ö) i detta fält. Inga mellanslag eller andra tecken är tillåtna.",alphanum:"Använd endast bokstäver (a-ö) och siffror (0-9) i detta fält. Inga mellanslag eller andra tecken är tillåtna.",dateSuchAs:"Ange ett giltigt datum som t.ex. {date}",dateInFormatMDY:'Ange ett giltigt datum som t.ex. YYYY-MM-DD (i.e. "1999-12-31")',email:'Ange en giltig e-postadress. Till exempel "erik@domain.com".',url:"Ange en giltig webbadress som http://www.example.com.",currencyDollar:"Ange en giltig belopp. Exempelvis 100,00.",oneRequired:"Vänligen ange minst ett av dessa alternativ.",errorPrefix:"Fel: ",warningPrefix:"Varning: ",noSpace:"Det får inte finnas några mellanslag i detta fält.",reqChkByNode:"Inga objekt är valda.",requiredChk:"Detta är ett obligatoriskt fält.",reqChkByName:"Välj en {label}.",match:"Detta fält måste matcha {matchName}",startDate:"startdatumet",endDate:"slutdatum",currendDate:"dagens datum",afterDate:"Datumet bör vara samma eller senare än {label}.",beforeDate:"Datumet bör vara samma eller tidigare än {label}.",startMonth:"Välj en start månad",sameMonth:"Dessa två datum måste vara i samma månad - du måste ändra det ena eller det andra."});
+(function(){var a=function(j,e,c,i,b){var h=(j/10).toInt(),g=j%10,f=(j/100).toInt();if(h==1&&j>10){return i;}if(g==1){return e;}if(g>0&&g<5){return c;}return i;
+};Locale.define("uk-UA","Date",{months:["Січень","Лютий","Березень","Квітень","Травень","Червень","Липень","Серпень","Вересень","Жовтень","Листопад","Грудень"],months_abbr:["Січ","Лют","Бер","Квіт","Трав","Черв","Лип","Серп","Вер","Жовт","Лист","Груд"],days:["Неділя","Понеділок","Вівторок","Середа","Четвер","П'ятниця","Субота"],days_abbr:["Нд","Пн","Вт","Ср","Чт","Пт","Сб"],dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M",AM:"до полудня",PM:"по полудню",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"меньше хвилини тому",minuteAgo:"хвилину тому",minutesAgo:function(b){return"{delta} "+a(b,"хвилину","хвилини","хвилин")+" тому";
+},hourAgo:"годину тому",hoursAgo:function(b){return"{delta} "+a(b,"годину","години","годин")+" тому";},dayAgo:"вчора",daysAgo:function(b){return"{delta} "+a(b,"день","дня","днів")+" тому";
+},weekAgo:"тиждень тому",weeksAgo:function(b){return"{delta} "+a(b,"тиждень","тижні","тижнів")+" тому";},monthAgo:"місяць тому",monthsAgo:function(b){return"{delta} "+a(b,"місяць","місяці","місяців")+" тому";
+},yearAgo:"рік тому",yearsAgo:function(b){return"{delta} "+a(b,"рік","роки","років")+" тому";},lessThanMinuteUntil:"за мить",minuteUntil:"через хвилину",minutesUntil:function(b){return"через {delta} "+a(b,"хвилину","хвилини","хвилин");
+},hourUntil:"через годину",hoursUntil:function(b){return"через {delta} "+a(b,"годину","години","годин");},dayUntil:"завтра",daysUntil:function(b){return"через {delta} "+a(b,"день","дня","днів");
+},weekUntil:"через тиждень",weeksUntil:function(b){return"через {delta} "+a(b,"тиждень","тижні","тижнів");},monthUntil:"через місяць",monthesUntil:function(b){return"через {delta} "+a(b,"місяць","місяці","місяців");
+},yearUntil:"через рік",yearsUntil:function(b){return"через {delta} "+a(b,"рік","роки","років");}});})();Locale.define("uk-UA","FormValidator",{required:"Це поле повинне бути заповненим.",minLength:"Введіть хоча б {minLength} символів (Ви ввели {length}).",maxLength:"Кількість символів не може бути більше {maxLength} (Ви ввели {length}).",integer:"Введіть в це поле число. Дробові числа (наприклад 1.25) не дозволені.",numeric:'Введіть в це поле число (наприклад "1" або "1.1", або "-1", або "-1.1").',digits:"В цьому полі ви можете використовувати лише цифри і знаки пунктіації (наприклад, телефонний номер з знаками дефізу або з крапками).",alpha:"В цьому полі можна використовувати лише латинські літери (a-z). Пробіли і інші символи заборонені.",alphanum:"В цьому полі можна використовувати лише латинські літери (a-z) і цифри (0-9). Пробіли і інші символи заборонені.",dateSuchAs:"Введіть коректну дату {date}.",dateInFormatMDY:'Введіть дату в форматі ММ/ДД/РРРР (наприклад "12/31/2009").',email:'Введіть коректну адресу електронної пошти (наприклад "name@domain.com").',url:"Введіть коректне інтернет-посилання (наприклад http://www.example.com).",currencyDollar:'Введіть суму в доларах (наприклад "$100.00").',oneRequired:"Заповніть одне з полів.",errorPrefix:"Помилка: ",warningPrefix:"Увага: ",noSpace:"Пробіли заборонені.",reqChkByNode:"Не відмічено жодного варіанту.",requiredChk:"Це поле повинне бути віміченим.",reqChkByName:"Будь ласка, відмітьте {label}.",match:"Це поле повинно відповідати {matchName}",startDate:"початкова дата",endDate:"кінцева дата",currendDate:"сьогоднішня дата",afterDate:"Ця дата повинна бути такою ж, або пізнішою за {label}.",beforeDate:"Ця дата повинна бути такою ж, або ранішою за {label}.",startMonth:"Будь ласка, виберіть початковий місяць",sameMonth:"Ці дати повинні відноситись одного і того ж місяця. Будь ласка, змініть одну з них.",creditcard:"Номер кредитної карти введений неправильно. Будь ласка, перевірте його. Введено {length} символів."});
+Locale.define("zh-CHS","Date",{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],months_abbr:["一","二","三","四","五","六","七","八","九","十","十一","十二"],days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],days_abbr:["日","一","二","三","四","五","六"],dateOrder:["year","month","date"],shortDate:"%Y-%m-%d",shortTime:"%I:%M%p",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"不到1分钟前",minuteAgo:"大约1分钟前",minutesAgo:"{delta}分钟之前",hourAgo:"大约1小时前",hoursAgo:"大约{delta}小时前",dayAgo:"1天前",daysAgo:"{delta}天前",weekAgo:"1星期前",weeksAgo:"{delta}星期前",monthAgo:"1个月前",monthsAgo:"{delta}个月前",yearAgo:"1年前",yearsAgo:"{delta}年前",lessThanMinuteUntil:"从现在开始不到1分钟",minuteUntil:"从现在开始約1分钟",minutesUntil:"从现在开始约{delta}分钟",hourUntil:"从现在开始1小时",hoursUntil:"从现在开始约{delta}小时",dayUntil:"从现在开始1天",daysUntil:"从现在开始{delta}天",weekUntil:"从现在开始1星期",weeksUntil:"从现在开始{delta}星期",monthUntil:"从现在开始一个月",monthsUntil:"从现在开始{delta}个月",yearUntil:"从现在开始1年",yearsUntil:"从现在开始{delta}年"});
+Locale.define("zh-CHT","Date",{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],months_abbr:["一","二","三","四","五","六","七","八","九","十","十一","十二"],days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],days_abbr:["日","一","二","三","四","五","六"],dateOrder:["year","month","date"],shortDate:"%Y-%m-%d",shortTime:"%I:%M%p",AM:"AM",PM:"PM",firstDayOfWeek:1,ordinal:"",lessThanMinuteAgo:"不到1分鐘前",minuteAgo:"大約1分鐘前",minutesAgo:"{delta}分鐘之前",hourAgo:"大約1小時前",hoursAgo:"大約{delta}小時前",dayAgo:"1天前",daysAgo:"{delta}天前",weekAgo:"1星期前",weeksAgo:"{delta}星期前",monthAgo:"1个月前",monthsAgo:"{delta}个月前",yearAgo:"1年前",yearsAgo:"{delta}年前",lessThanMinuteUntil:"從現在開始不到1分鐘",minuteUntil:"從現在開始約1分鐘",minutesUntil:"從現在開始約{delta}分鐘",hourUntil:"從現在開始1小時",hoursUntil:"從現在開始約{delta}小時",dayUntil:"從現在開始1天",daysUntil:"從現在開始{delta}天",weekUntil:"從現在開始1星期",weeksUntil:"從現在開始{delta}星期",monthUntil:"從現在開始一個月",monthsUntil:"從現在開始{delta}個月",yearUntil:"從現在開始1年",yearsUntil:"從現在開始{delta}年"});
+Locale.define("zh-CHS","FormValidator",{required:"此项必填。",minLength:"请至少输入 {minLength} 个字符 (已输入 {length} 个)。",maxLength:"最多只能输入 {maxLength} 个字符 (已输入 {length} 个)。",integer:'请输入一个整数，不能包含小数点。例如："1", "200"。',numeric:'请输入一个数字，例如："1", "1.1", "-1", "-1.1"。',digits:"请输入由数字和标点符号组成的内容。例如电话号码。",alpha:"请输入 A-Z 的 26 个字母，不能包含空格或任何其他字符。",alphanum:"请输入 A-Z 的 26 个字母或 0-9 的 10 个数字，不能包含空格或任何其他字符。",dateSuchAs:"请输入合法的日期格式，如：{date}。",dateInFormatMDY:'请输入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。',email:'请输入合法的电子信箱地址，例如："fred@domain.com"。',url:"请输入合法的 Url 地址，例如：http://www.example.com。",currencyDollar:"请输入合法的货币符号，例如：￥100.0",oneRequired:"请至少选择一项。",errorPrefix:"错误：",warningPrefix:"警告：",noSpace:"不能包含空格。",reqChkByNode:"未选择任何内容。",requiredChk:"此项必填。",reqChkByName:"请选择 {label}.",match:"必须与{matchName}相匹配",startDate:"起始日期",endDate:"结束日期",currendDate:"当前日期",afterDate:"日期必须等于或晚于 {label}.",beforeDate:"日期必须早于或等于 {label}.",startMonth:"请选择起始月份",sameMonth:"您必须修改两个日期中的一个，以确保它们在同一月份。",creditcard:"您输入的信用卡号码不正确。当前已输入{length}个字符。"});
+Locale.define("zh-CHT","FormValidator",{required:"此項必填。 ",minLength:"請至少輸入{minLength} 個字符(已輸入{length} 個)。 ",maxLength:"最多只能輸入{maxLength} 個字符(已輸入{length} 個)。 ",integer:'請輸入一個整數，不能包含小數點。例如："1", "200"。 ',numeric:'請輸入一個數字，例如："1", "1.1", "-1", "-1.1"。 ',digits:"請輸入由數字和標點符號組成的內容。例如電話號碼。 ",alpha:"請輸入AZ 的26 個字母，不能包含空格或任何其他字符。 ",alphanum:"請輸入AZ 的26 個字母或0-9 的10 個數字，不能包含空格或任何其他字符。 ",dateSuchAs:"請輸入合法的日期格式，如：{date}。 ",dateInFormatMDY:'請輸入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。 ',email:'請輸入合法的電子信箱地址，例如："fred@domain.com"。 ',url:"請輸入合法的Url 地址，例如：http://www.example.com。 ",currencyDollar:"請輸入合法的貨幣符號，例如：￥100.0",oneRequired:"請至少選擇一項。 ",errorPrefix:"錯誤：",warningPrefix:"警告：",noSpace:"不能包含空格。 ",reqChkByNode:"未選擇任何內容。 ",requiredChk:"此項必填。 ",reqChkByName:"請選擇 {label}.",match:"必須與{matchName}相匹配",startDate:"起始日期",endDate:"結束日期",currendDate:"當前日期",afterDate:"日期必須等於或晚於{label}.",beforeDate:"日期必須早於或等於{label}.",startMonth:"請選擇起始月份",sameMonth:"您必須修改兩個日期中的一個，以確保它們在同一月份。 ",creditcard:"您輸入的信用卡號碼不正確。當前已輸入{length}個字符。 "});
+Form.Validator.add("validate-currency-yuan",{errorMsg:function(){return Form.Validator.getMsg("currencyYuan");},test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^￥?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(a.get("value"));
+}});
\ No newline at end of file
diff --git a/core/media/system/js/mootree-uncompressed.js b/core/media/system/js/mootree-uncompressed.js
new file mode 100644
index 00000000..08a32c9b
--- /dev/null
+++ b/core/media/system/js/mootree-uncompressed.js
@@ -0,0 +1,686 @@
+/*
+Script: mootree.js
+	My Object Oriented Tree
+	- Developed by Rasmus Schultz, <http://www.mindplay.dk>
+	- Tested with MooTools release 1.2, under Firefox 2, Opera 9 and Internet Explorer 6 and 7.
+
+License:
+	MIT-style license.
+
+Credits:
+	Inspired by:
+	- WebFX xTree, <http://webfx.eae.net/dhtml/xtree/>
+	- Destroydrop dTree, <http://www.destroydrop.com/javascripts/tree/>
+
+Changes:
+
+	rev.12:
+	- load() only worked once on the same node, fixed.
+	- the script would sometimes try to get 'R' from the server, fixed.
+	- the 'load' attribute is now supported in XML files (see example_5.html).
+
+	rev.13:
+	- enable() and disable() added - the adopt() and load() methods use these to improve performance by minimizing the number of visual updates.
+
+	rev.14:
+	- toggle() was using enable() and disable() which actually caused it to do extra work - fixed.
+
+	rev.15:
+	- adopt() now picks up 'href', 'target', 'title' and 'name' attributes of the a-tag, and stores them in the data object.
+	- adopt() now picks up additional constructor arguments from embedded comments, e.g. icons, colors, etc.
+	- documentation now generates properly with NaturalDocs, <http://www.naturaldocs.org/>
+
+	rev.16:
+	- onClick events added to MooTreeControl and MooTreeNode
+	- nodes can now have id's - <MooTreeControl.get> method can be used to find a node with a given id
+
+	rev.17:
+	- changed icon rendering to use innerHTML, making the control faster (and code size slightly smaller).
+
+	rev.18:
+	- migrated to MooTools 1.2 (previous versions no longer supported)
+
+*/
+
+var MooTreeIcon = ['I','L','Lminus','Lplus','Rminus','Rplus','T','Tminus','Tplus','_closed','_doc','_open','minus','plus'];
+
+/*
+Class: MooTreeControl
+	This class implements a tree control.
+
+Properties:
+	root - returns the root <MooTreeNode> object.
+	selected - returns the currently selected <MooTreeNode> object, or null if nothing is currently selected.
+
+Events:
+	onExpand - called when a node is expanded or collapsed: function(node, state) - where node is the <MooTreeNode> object that fired the event, and state is a boolean meaning true:expanded or false:collapsed.
+	onSelect - called when a node is selected or deselected: function(node, state) - where node is the <MooTreeNode> object that fired the event, and state is a boolean meaning true:selected or false:deselected.
+	onClick - called when a node is clicked: function(node) - where node is the <MooTreeNode> object that fired the event.
+
+Parameters:
+	The constructor takes two object parameters: config and options.
+	The first, config, contains global settings for the tree control - you can use the configuration options listed below.
+	The second, options, should contain options for the <MooTreeNode> constructor - please refer to the options listed in the <MooTreeNode> documentation.
+
+Config:
+	div - a string representing the div Element inside which to build the tree control.
+	mode - optional string, defaults to 'files' - specifies default icon behavior. In 'files' mode, empty nodes have a document icon - whereas, in 'folders' mode, all nodes are displayed as folders (a'la explorer).
+	grid - boolean, defaults to false. If set to true, a grid is drawn to outline the structure of the tree.
+
+	theme - string, optional, defaults to 'mootree.gif' - specifies the 'theme' GIF to use.
+
+	loader - optional, an options object for the <MooTreeNode> constructor - defaults to {icon:'mootree_loader.gif', text:'Loading...', color:'a0a0a0'}
+
+	onExpand - optional function (see Events above)
+	onSelect - optional function (see Events above)
+
+*/
+
+var MooTreeControl = new Class({
+
+	initialize: function(config, options) {
+
+		options.control = this;               // make sure our new MooTreeNode knows who it's owner control is
+		options.div = config.div;             // tells the root node which div to insert itself into
+		this.root = new MooTreeNode(options); // create the root node of this tree control
+
+		this.index = new Object();            // used by the get() method
+
+		this.enabled = true;                  // enable visual updates of the control
+
+		this.theme = config.theme || 'mootree.gif';
+
+		this.loader = config.loader || {icon:'mootree_loader.gif', text:'Loading...', color:'#a0a0a0'};
+
+		this.selected = null;                 // set the currently selected node to nothing
+		this.mode = config.mode;              // mode can be "folders" or "files", and affects the default icons
+		this.grid = config.grid;              // grid can be turned on (true) or off (false)
+
+		this.onExpand = config.onExpand || new Function(); // called when any node in the tree is expanded/collapsed
+		this.onSelect = config.onSelect || new Function(); // called when any node in the tree is selected/deselected
+		this.onClick = config.onClick || new Function(); // called when any node in the tree is clicked
+
+		this.root.update(true);
+
+	},
+
+	/*
+	Property: insert
+		Creates a new node under the root node of this tree.
+
+	Parameters:
+		options - an object containing the same options available to the <MooTreeNode> constructor.
+
+	Returns:
+		A new <MooTreeNode> instance.
+	*/
+
+	insert: function(options) {
+		options.control = this;
+		return this.root.insert(options);
+	},
+
+	/*
+	Property: select
+		Sets the currently selected node.
+		This is called by <MooTreeNode> when a node is selected (e.g. by clicking it's title with the mouse).
+
+	Parameters:
+		node - the <MooTreeNode> object to select.
+	*/
+
+	select: function(node) {
+		this.onClick(node); node.onClick(); // fire click events
+		if (this.selected === node) return; // already selected
+		if (this.selected) {
+			// deselect previously selected node:
+			this.selected.select(false);
+			this.onSelect(this.selected, false);
+		}
+		// select new node:
+		this.selected = node;
+		node.select(true);
+		this.onSelect(node, true);
+	},
+
+	/*
+	Property: expand
+		Expands the entire tree, recursively.
+	*/
+
+	expand: function() {
+		this.root.toggle(true, true);
+	},
+
+	/*
+	Property: collapse
+		Collapses the entire tree, recursively.
+	*/
+
+	collapse: function() {
+		this.root.toggle(true, false);
+	},
+
+	/*
+	Property: get
+		Retrieves the node with the given id - or null, if no node with the given id exists.
+
+	Parameters:
+		id - a string, the id of the node you wish to retrieve.
+
+	Note:
+		Node id can be assigned via the <MooTreeNode> constructor, e.g. using the <MooTreeNode.insert> method.
+	*/
+
+	get: function(id) {
+		return this.index[id] || null;
+	},
+
+	/*
+	Property: adopt
+		Adopts a structure of nested ul/li/a elements as tree nodes, then removes the original elements.
+
+	Parameters:
+		id - a string representing the ul element to be adopted, or an element reference.
+		parentNode - optional, a <MooTreeNode> object under which to import the specified ul element. Defaults to the root node of the parent control.
+
+	Note:
+		The ul/li structure must be properly nested, and each li-element must contain one a-element, e.g.:
+
+		><ul id="mytree">
+		>  <li><a href="test.html">Item One</a></li>
+		>  <li><a href="test.html">Item Two</a>
+		>    <ul>
+		>      <li><a href="test.html">Item Two Point One</a></li>
+		>      <li><a href="test.html">Item Two Point Two</a></li>
+		>    </ul>
+		>  </li>
+		>  <li><a href="test.html"><!-- icon:_doc; color:#ff0000 -->Item Three</a></li>
+		></ul>
+
+		The "href", "target", "title" and "name" attributes of the a-tags are picked up and stored in the
+		data property of the node.
+
+		CSS-style comments inside a-tags are parsed, and treated as arguments for <MooTreeNode> constructor,
+		e.g. "icon", "openicon", "color", etc.
+	*/
+
+	adopt: function(id, parentNode) {
+		if (parentNode === undefined) parentNode = this.root;
+		this.disable();
+		this._adopt(id, parentNode);
+		parentNode.update(true);
+		document.id(id).destroy();
+		this.enable();
+	},
+
+	_adopt: function(id, parentNode) {
+		/* adopts a structure of ul/li elements into this tree */
+		e = document.id(id);
+		var i=0, c = e.getChildren();
+		for (i=0; i<c.length; i++) {
+			if (c[i].nodeName == 'LI') {
+				var con={text:''}, comment='', node=null, subul=null;
+				var n=0, z=0, se=null, s = c[i].getChildren();
+				for (n=0; n<s.length; n++) {
+					switch (s[n].nodeName) {
+						case 'A':
+							for (z=0; z<s[n].childNodes.length; z++) {
+								se = s[n].childNodes[z];
+								switch (se.nodeName) {
+									case '#text': con.text += se.nodeValue; break;
+									case '#comment': comment += se.nodeValue; break;
+								}
+							}
+							con.data = s[n].getProperties('href','target','title','name');
+						break;
+						case 'UL':
+							subul = s[n];
+						break;
+					}
+				}
+				if (con.label != '') {
+					con.data.url = con.data['href']; // (for backwards compatibility)
+					if (comment != '') {
+						var bits = comment.split(';');
+						for (z=0; z<bits.length; z++) {
+							var pcs = bits[z].trim().split(':');
+							if (pcs.length == 2) con[pcs[0].trim()] = pcs[1].trim();
+						}
+					}
+					if (c[i].id != null) {
+						con.id = 'node_'+c[i].id;
+					}
+					node = parentNode.insert(con);
+					if (subul) this._adopt(subul, node);
+				}
+			}
+		}
+	},
+
+	/*
+	Property: disable
+		Call this to temporarily disable visual updates -- if you need to insert/remove many nodes
+		at a time, many visual updates would normally occur. By temporarily disabling the control,
+		these visual updates will be skipped.
+
+		When you're done making changes, call <MooTreeControl.enable> to turn on visual updates
+		again, and automatically repaint all nodes that were changed.
+	*/
+
+	disable: function() {
+		this.enabled = false;
+	},
+
+	/*
+	Property: enable
+		Enables visual updates again after a call to <MooTreeControl.disable>
+	*/
+
+	enable: function() {
+		this.enabled = true;
+		this.root.update(true, true);
+	}
+
+});
+
+/*
+Class: MooTreeNode
+	This class implements the functionality of a single node in a <MooTreeControl>.
+
+Note:
+	You should not manually create objects of this class -- rather, you should use
+	<MooTreeControl.insert> to create nodes in the root of the tree, and then use
+	the similar function <MooTreeNode.insert> to create subnodes.
+
+	Both insert methods have a similar syntax, and both return the newly created
+	<MooTreeNode> object.
+
+Parameters:
+	options - an object. See options below.
+
+Options:
+	text - this is the displayed text of the node, and as such as is the only required parameter.
+	id - string, optional - if specified, must be a unique node identifier. Nodes with id can be retrieved using the <MooTreeControl.get> method.
+	color - string, optional - if specified, must be a six-digit hexadecimal RGB color code.
+
+	open - boolean value, defaults to false. Use true if you want the node open from the start.
+
+	icon - use this to customize the icon of the node. The following predefined values may be used: '_open', '_closed' and '_doc'. Alternatively, specify the URL of a GIF or PNG image to use - this should be exactly 18x18 pixels in size. If you have a strip of images, you can specify an image number (e.g. 'my_icons.gif#4' for icon number 4).
+	openicon - use this to customize the icon of the node when it's open.
+
+	data - an object containing whatever data you wish to associate with this node (such as an url and/or an id, etc.)
+
+Events:
+	onExpand - called when the node is expanded or collapsed: function(state) - where state is a boolean meaning true:expanded or false:collapsed.
+	onSelect - called when the node is selected or deselected: function(state) - where state is a boolean meaning true:selected or false:deselected.
+	onClick - called when the node is clicked (no arguments).
+*/
+
+var MooTreeNode = new Class({
+
+	initialize: function(options) {
+
+		this.text = options.text;       // the text displayed by this node
+		this.id = options.id || null;   // the node's unique id
+		this.nodes = new Array();       // subnodes nested beneath this node (MooTreeNode objects)
+		this.parent = null;             // this node's parent node (another MooTreeNode object)
+		this.last = true;               // a flag telling whether this node is the last (bottom) node of it's parent
+		this.control = options.control; // owner control of this node's tree
+		this.selected = false;          // a flag telling whether this node is the currently selected node in it's tree
+
+		this.color = options.color || null; // text color of this node
+
+		this.data = options.data || {}; // optional object containing whatever data you wish to associate with the node (typically an url or an id)
+
+		this.onExpand = options.onExpand || new Function(); // called when the individual node is expanded/collapsed
+		this.onSelect = options.onSelect || new Function(); // called when the individual node is selected/deselected
+		this.onClick = options.onClick || new Function(); // called when the individual node is clicked
+
+		this.open = options.open ? true : false; // flag: node open or closed?
+
+		this.icon = options.icon;
+		this.openicon = options.openicon || this.icon;
+
+		// add the node to the control's node index:
+		if (this.id) this.control.index[this.id] = this;
+
+		// create the necessary divs:
+		this.div = {
+			main: new Element('div').addClass('mooTree_node'),
+			indent: new Element('div'),
+			gadget: new Element('div'),
+			icon: new Element('div'),
+			text: new Element('div').addClass('mooTree_text'),
+			sub: new Element('div')
+		}
+
+		// put the other divs under the main div:
+		this.div.main.adopt(this.div.indent);
+		this.div.main.adopt(this.div.gadget);
+		this.div.main.adopt(this.div.icon);
+		this.div.main.adopt(this.div.text);
+
+		// put the main and sub divs in the specified parent div:
+		document.id(options.div).adopt(this.div.main);
+		document.id(options.div).adopt(this.div.sub);
+
+		// attach event handler to gadget:
+		this.div.gadget._node = this;
+		this.div.gadget.onclick = this.div.gadget.ondblclick = function() {
+			this._node.toggle();
+		}
+
+		// attach event handler to icon/text:
+		this.div.icon._node = this.div.text._node = this;
+		this.div.icon.onclick = this.div.icon.ondblclick = this.div.text.onclick = this.div.text.ondblclick = function() {
+			this._node.control.select(this._node);
+		}
+
+	},
+
+	/*
+	Property: insert
+		Creates a new node, nested inside this one.
+
+	Parameters:
+		options - an object containing the same options available to the <MooTreeNode> constructor.
+
+	Returns:
+		A new <MooTreeNode> instance.
+	*/
+
+	insert: function(options) {
+
+		// set the parent div and create the node:
+		options.div = this.div.sub;
+		options.control = this.control;
+		var node = new MooTreeNode(options);
+
+		// set the new node's parent:
+		node.parent = this;
+
+		// mark this node's last node as no longer being the last, then add the new last node:
+		var n = this.nodes;
+		if (n.length) n[n.length-1].last = false;
+		n.push(node);
+
+		// repaint the new node:
+		node.update();
+
+		// repaint the new node's parent (this node):
+		if (n.length == 1) this.update();
+
+		// recursively repaint the new node's previous sibling node:
+		if (n.length > 1) n[n.length-2].update(true);
+
+		return node;
+
+	},
+
+	/*
+	Property: remove
+		Removes this node, and all of it's child nodes. If you want to remove all the childnodes without removing the node itself, use <MooTreeNode.clear>
+	*/
+
+	remove: function() {
+		var p = this.parent;
+		this._remove();
+		p.update(true);
+	},
+
+	_remove: function() {
+
+		// recursively remove this node's subnodes:
+		var n = this.nodes;
+		while (n.length) n[n.length-1]._remove();
+
+		// remove the node id from the control's index:
+		delete this.control.index[this.id];
+
+		// remove this node's divs:
+		this.div.main.destroy();
+		this.div.sub.destroy();
+
+		if (this.parent) {
+
+			// remove this node from the parent's collection of nodes:
+			var p = this.parent.nodes;
+			p.erase(this);
+
+			// in case we removed the parent's last node, flag it's current last node as being the last:
+			if (p.length) p[p.length-1].last = true;
+
+		}
+
+	},
+
+	/*
+	Property: clear
+		Removes all child nodes under this node, without removing the node itself.
+		To remove all nodes including this one, use <MooTreeNode.remove>
+	*/
+
+	clear: function() {
+		this.control.disable();
+		while (this.nodes.length) this.nodes[this.nodes.length-1].remove();
+		this.control.enable();
+	},
+
+	/*
+	Property: update
+		Update the tree node's visual appearance.
+
+	Parameters:
+		recursive - boolean, defaults to false. If true, recursively updates all nodes beneath this one.
+		invalidated - boolean, defaults to false. If true, updates only nodes that have been invalidated while the control has been disabled.
+	*/
+
+	update: function(recursive, invalidated) {
+
+		var draw = true;
+
+		if (!this.control.enabled) {
+			// control is currently disabled, so we don't do any visual updates
+			this.invalidated = true;
+			draw = false;
+		}
+
+		if (invalidated) {
+			if (!this.invalidated) {
+				draw = false; // this one is still valid, don't draw
+			} else {
+				this.invalidated = false; // we're drawing this item now
+			}
+		}
+
+		if (draw) {
+
+			var x;
+
+			// make selected, or not:
+			this.div.main.className = 'mooTree_node' + (this.selected ? ' mooTree_selected' : '');
+
+			// update indentations:
+			var p = this, i = '';
+			while (p.parent) {
+				p = p.parent;
+				i = this.getImg(p.last || !this.control.grid ? '' : 'I') + i;
+			}
+			this.div.indent.innerHTML = i;
+
+			// update the text:
+			x = this.div.text;
+			x.empty();
+			x.appendText(this.text);
+			if (this.color) x.style.color = this.color;
+
+			// update the icon:
+			this.div.icon.innerHTML = this.getImg( this.nodes.length ? ( this.open ? (this.openicon || this.icon || '_open') : (this.icon || '_closed') ) : ( this.icon || (this.control.mode == 'folders' ? '_closed' : '_doc') ) );
+
+			// update the plus/minus gadget:
+			this.div.gadget.innerHTML = this.getImg( ( this.control.grid ? ( this.control.root == this ? (this.nodes.length ? 'R' : '') : (this.last?'L':'T') ) : '') + (this.nodes.length ? (this.open?'minus':'plus') : '') );
+
+			// show/hide subnodes:
+			this.div.sub.style.display = this.open ? 'block' : 'none';
+
+		}
+
+		// if recursively updating, update all child nodes:
+		if (recursive) this.nodes.forEach( function(node) {
+			node.update(true, invalidated);
+		});
+
+	},
+
+	/*
+	Property: getImg
+		Creates a new image, in the form of HTML for a DIV element with appropriate style.
+		You should not need to manually call this method. (though if for some reason you want to, you can)
+
+	Parameters:
+		name - the name of new image to create, defined by <MooTreeIcon> or located in an external file.
+
+	Returns:
+		The HTML for a new div Element.
+	*/
+
+	getImg: function(name) {
+
+		var html = '<div class="mooTree_img"';
+
+		if (name != '') {
+			var img = this.control.theme;
+			var i = MooTreeIcon.indexOf(name);
+			if (i == -1) {
+				// custom (external) icon:
+				var x = name.split('#');
+				img = x[0];
+				i = (x.length == 2 ? parseInt(x[1])-1 : 0);
+			}
+			html += ' style="background-image:url(' + img + '); background-position:-' + (i*18) + 'px 0px;"';
+		}
+
+		html += "></div>";
+
+		return html;
+
+	},
+
+	/*
+	Property: toggle
+		By default (with no arguments) this function toggles the node between expanded/collapsed.
+		Can also be used to recursively expand/collapse all or part of the tree.
+
+	Parameters:
+		recursive - boolean, defaults to false. With recursive set to true, all child nodes are recursively toggle to this node's new state.
+		state - boolean. If undefined, the node's state is toggled. If true or false, the node can be explicitly opened or closed.
+	*/
+
+	toggle: function(recursive, state) {
+
+		this.open = (state === undefined ? !this.open : state);
+		this.update();
+
+		this.onExpand(this.open);
+		this.control.onExpand(this, this.open);
+
+		if (recursive) this.nodes.forEach( function(node) {
+			node.toggle(true, this.open);
+		}, this);
+
+	},
+
+	/*
+	Property: select
+		Called by <MooTreeControl> when the selection changes.
+		You should not manually call this method - to set the selection, use the <MooTreeControl.select> method.
+	*/
+
+	select: function(state) {
+		this.selected = state;
+		this.update();
+		this.onSelect(state);
+	},
+
+	/*
+	Property: load
+		Asynchronously load an XML structure into a node of this tree.
+
+	Parameters:
+		url - string, required, specifies the URL from which to load the XML document.
+		vars - query string, optional.
+	*/
+
+	load: function(url, vars) {
+
+		if (this.loading) return; // if this node is already loading, return
+		this.loading = true;      // flag this node as loading
+
+		this.toggle(false, true); // expand the node to make the loader visible
+
+		this.clear();
+
+		this.insert(this.control.loader);
+
+		var f = function() {
+			new Request({
+				method: 'GET',
+				url: url,
+				onSuccess: this._loaded.bind(this),
+				onFailure: this._load_err.bind(this)
+			}).send(vars || '');
+		}.bind(this).delay(20);
+
+		//window.setTimeout(f.bind(this), 20); // allowing a small delay for the browser to draw the loader-icon.
+
+	},
+
+	_loaded: function(text, xml) {
+		// called on success - import nodes from the root element:
+		this.control.disable();
+		this.clear();
+		this._import(xml.documentElement);
+		this.control.enable();
+		this.loading = false;
+	},
+
+	_import: function(e) {
+		// import childnodes from an xml element:
+		var n = e.childNodes;
+		for (var i=0; i<n.length; i++) if (n[i].tagName == 'node') {
+			var opt = {data:{}};
+			var a = n[i].attributes;
+			for (var t=0; t<a.length; t++) {
+				switch (a[t].name) {
+					case 'text':
+					case 'id':
+					case 'icon':
+					case 'openicon':
+					case 'color':
+					case 'open':
+						opt[a[t].name] = a[t].value;
+						break;
+					default:
+						opt.data[a[t].name] = a[t].value;
+				}
+			}
+			var node = this.insert(opt);
+			if (node.data.load) {
+				node.open = false; // can't have a dynamically loading node that's already open!
+				node.insert(this.control.loader);
+				node.onExpand = function(state) {
+					this.load(this.data.load);
+					this.onExpand = new Function();
+				}
+			}
+			// recursively import subnodes of this node:
+			if (n[i].childNodes.length) node._import(n[i]);
+		}
+	},
+
+	_load_err: function(req) {
+		window.alert('Error loading: ' + this.text);
+	}
+
+});
diff --git a/core/media/system/js/mootree.js b/core/media/system/js/mootree.js
new file mode 100644
index 00000000..b54550fa
--- /dev/null
+++ b/core/media/system/js/mootree.js
@@ -0,0 +1,12 @@
+var MooTreeIcon="I,L,Lminus,Lplus,Rminus,Rplus,T,Tminus,Tplus,_closed,_doc,_open,minus,plus".split(","),MooTreeControl=new Class({initialize:function(a,b){b.control=this;b.div=a.div;this.root=new MooTreeNode(b);this.index={};this.enabled=!0;this.theme=a.theme||"mootree.gif";this.loader=a.loader||{icon:"mootree_loader.gif",text:"Loading...",color:"#a0a0a0"};this.selected=null;this.mode=a.mode;this.grid=a.grid;this.onExpand=a.onExpand||new Function;this.onSelect=a.onSelect||new Function;this.onClick=
+a.onClick||new Function;this.root.update(!0)},insert:function(a){a.control=this;return this.root.insert(a)},select:function(a){this.onClick(a);a.onClick();this.selected!==a&&(this.selected&&(this.selected.select(!1),this.onSelect(this.selected,!1)),this.selected=a,a.select(!0),this.onSelect(a,!0))},expand:function(){this.root.toggle(!0,!0)},collapse:function(){this.root.toggle(!0,!1)},get:function(a){return this.index[a]||null},adopt:function(a,b){void 0===b&&(b=this.root);this.disable();this._adopt(a,
+b);b.update(!0);document.id(a).destroy();this.enable()},_adopt:function(a,b){e=document.id(a);for(var c=0,d=e.getChildren(),c=0;c<d.length;c++)if("LI"==d[c].nodeName){for(var f={text:""},i="",h=null,l=null,g=0,h=0,k=null,j=d[c].getChildren(),g=0;g<j.length;g++)switch(j[g].nodeName){case "A":for(h=0;h<j[g].childNodes.length;h++)switch(k=j[g].childNodes[h],k.nodeName){case "#text":f.text+=k.nodeValue;break;case "#comment":i+=k.nodeValue}f.data=j[g].getProperties("href","target","title","name");break;
+case "UL":l=j[g]}if(""!=f.label){f.data.url=f.data.href;if(""!=i){i=i.split(";");for(h=0;h<i.length;h++)g=i[h].trim().split(":"),2==g.length&&(f[g[0].trim()]=g[1].trim())}null!=d[c].id&&(f.id="node_"+d[c].id);h=b.insert(f);l&&this._adopt(l,h)}}},disable:function(){this.enabled=!1},enable:function(){this.enabled=!0;this.root.update(!0,!0)}}),MooTreeNode=new Class({initialize:function(a){this.text=a.text;this.id=a.id||null;this.nodes=[];this.parent=null;this.last=!0;this.control=a.control;this.selected=
+!1;this.color=a.color||null;this.data=a.data||{};this.onExpand=a.onExpand||new Function;this.onSelect=a.onSelect||new Function;this.onClick=a.onClick||new Function;this.open=a.open?!0:!1;this.icon=a.icon;this.openicon=a.openicon||this.icon;this.id&&(this.control.index[this.id]=this);this.div={main:(new Element("div")).addClass("mooTree_node"),indent:new Element("div"),gadget:new Element("div"),icon:new Element("div"),text:(new Element("div")).addClass("mooTree_text"),sub:new Element("div")};this.div.main.adopt(this.div.indent);
+this.div.main.adopt(this.div.gadget);this.div.main.adopt(this.div.icon);this.div.main.adopt(this.div.text);document.id(a.div).adopt(this.div.main);document.id(a.div).adopt(this.div.sub);this.div.gadget._node=this;this.div.gadget.onclick=this.div.gadget.ondblclick=function(){this._node.toggle()};this.div.icon._node=this.div.text._node=this;this.div.icon.onclick=this.div.icon.ondblclick=this.div.text.onclick=this.div.text.ondblclick=function(){this._node.control.select(this._node)}},insert:function(a){a.div=
+this.div.sub;a.control=this.control;a=new MooTreeNode(a);a.parent=this;var b=this.nodes;b.length&&(b[b.length-1].last=!1);b.push(a);a.update();1==b.length&&this.update();1<b.length&&b[b.length-2].update(!0);return a},remove:function(){var a=this.parent;this._remove();a.update(!0)},_remove:function(){for(var a=this.nodes;a.length;)a[a.length-1]._remove();delete this.control.index[this.id];this.div.main.destroy();this.div.sub.destroy();this.parent&&(a=this.parent.nodes,a.erase(this),a.length&&(a[a.length-
+1].last=!0))},clear:function(){for(this.control.disable();this.nodes.length;)this.nodes[this.nodes.length-1].remove();this.control.enable()},update:function(a,b){var c=!0;this.control.enabled||(this.invalidated=!0,c=!1);b&&(this.invalidated?this.invalidated=!1:c=!1);if(c){this.div.main.className="mooTree_node"+(this.selected?" mooTree_selected":"");for(var c=this,d="";c.parent;)c=c.parent,d=this.getImg(c.last||!this.control.grid?"":"I")+d;this.div.indent.innerHTML=d;c=this.div.text;c.empty();c.appendText(this.text);
+this.color&&(c.style.color=this.color);this.div.icon.innerHTML=this.getImg(this.nodes.length?this.open?this.openicon||this.icon||"_open":this.icon||"_closed":this.icon||("folders"==this.control.mode?"_closed":"_doc"));this.div.gadget.innerHTML=this.getImg((this.control.grid?this.control.root==this?this.nodes.length?"R":"":this.last?"L":"T":"")+(this.nodes.length?this.open?"minus":"plus":""));this.div.sub.style.display=this.open?"block":"none"}a&&this.nodes.forEach(function(a){a.update(!0,b)})},getImg:function(a){var b=
+'<div class="mooTree_img"';if(""!=a){var c=this.control.theme,d=MooTreeIcon.indexOf(a);-1==d&&(a=a.split("#"),c=a[0],d=2==a.length?parseInt(a[1])-1:0);b+=' style="background-image:url('+c+"); background-position:-"+18*d+'px 0px;"'}return b+"></div>"},toggle:function(a,b){this.open=void 0===b?!this.open:b;this.update();this.onExpand(this.open);this.control.onExpand(this,this.open);a&&this.nodes.forEach(function(a){a.toggle(!0,this.open)},this)},select:function(a){this.selected=a;this.update();this.onSelect(a)},
+load:function(a,b){this.loading||(this.loading=!0,this.toggle(!1,!0),this.clear(),this.insert(this.control.loader),function(){(new Request({method:"GET",url:a,onSuccess:this._loaded.bind(this),onFailure:this._load_err.bind(this)})).send(b||"")}.bind(this).delay(20))},_loaded:function(a,b){this.control.disable();this.clear();this._import(b.documentElement);this.control.enable();this.loading=!1},_import:function(a){for(var a=a.childNodes,b=0;b<a.length;b++)if("node"==a[b].tagName){for(var c={data:{}},
+d=a[b].attributes,f=0;f<d.length;f++)switch(d[f].name){case "text":case "id":case "icon":case "openicon":case "color":case "open":c[d[f].name]=d[f].value;break;default:c.data[d[f].name]=d[f].value}c=this.insert(c);c.data.load&&(c.open=!1,c.insert(this.control.loader),c.onExpand=function(){this.load(this.data.load);this.onExpand=new Function});a[b].childNodes.length&&c._import(a[b])}},_load_err:function(){window.alert("Error loading: "+this.text)}});
\ No newline at end of file
diff --git a/core/media/system/js/multiselect-uncompressed.js b/core/media/system/js/multiselect-uncompressed.js
new file mode 100644
index 00000000..1704e4b3
--- /dev/null
+++ b/core/media/system/js/multiselect-uncompressed.js
@@ -0,0 +1,43 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * JavaScript behavior to allow shift select in administrator grids
+ */
+(function($) {
+    
+    Joomla = window.Joomla || {};
+    var $boxes;
+    Joomla.JMultiSelect = function(table) {
+        var $last,
+        
+        initialize = function(table) {
+            $boxes = $('#' + table).find('input[type=checkbox]');
+            $boxes.on('click', function(e) {
+                doselect(e)
+            });
+        },
+        
+        doselect = function(e) {
+            var $current = $(e.target), isChecked, lastIndex, currentIndex, swap;
+            if (e.shiftKey && $last.length) {
+                isChecked = $current.is(':checked');
+                lastIndex = $boxes.index($last);
+                currentIndex = $boxes.index($current);
+                if (currentIndex < lastIndex) {
+                    // handle selection from bottom up
+                    swap = lastIndex;
+                    lastIndex = currentIndex;
+                    currentIndex = swap;
+                }
+                $boxes.slice(lastIndex, currentIndex + 1).attr('checked', isChecked);
+            }
+
+            $last = $current;
+        }
+        initialize(table);
+    }
+
+})(jQuery);
diff --git a/core/media/system/js/multiselect.js b/core/media/system/js/multiselect.js
new file mode 100644
index 00000000..efdc3a91
--- /dev/null
+++ b/core/media/system/js/multiselect.js
@@ -0,0 +1,4 @@
+/*
+        GNU General Public License version 2 or later; see LICENSE.txt
+*/
+(function(b){Joomla=window.Joomla||{};var a;Joomla.JMultiSelect=function(f){var e,c=function(g){a=b("#"+g).find("input[type=checkbox]");a.on("click",function(h){d(h)})},d=function(j){var h=b(j.target),l,k,g,i;if(j.shiftKey&&e.length){l=h.is(":checked");k=a.index(e);g=a.index(h);if(g<k){i=k;k=g;g=i}a.slice(k,g+1).attr("checked",l)}e=h};c(f)}})(jQuery);
diff --git a/core/media/system/js/passwordstrength.js b/core/media/system/js/passwordstrength.js
new file mode 100644
index 00000000..bf425193
--- /dev/null
+++ b/core/media/system/js/passwordstrength.js
@@ -0,0 +1,99 @@
+/*
+---
+description: Form.PasswordStrength class, and basic dom methods
+
+license: MIT-style
+
+authors:
+ - Al Kent
+
+requires:
+ - core/1.3.1: '*'
+
+provides:
+ - Form.PasswordStrength
+ - Element.Events.keyupandchange
+ - String.strength
+...
+*/
+
+if (!this.Form) this.Form = {};
+
+Form.PasswordStrength = new Class({
+	
+	Implements: [Options, Events],
+	
+	options: {
+		//onUpdate: $empty,
+		threshold: 66,
+		primer: '',
+		height: 5,
+		opacity: 1,
+		bgcolor: 'transparent'
+	},
+	
+	element: null,
+	fx: null,
+	
+	initialize: function(el, options){
+		this.element = document.id(el);
+		this.setOptions(options);
+		if (this.options.primer) this.options.threshold = this.options.primer.strength();
+		var coord = this.element.getCoordinates();
+		var bar = new Element('div', {
+			styles: {
+				'width': coord.width,
+				'height': this.options.height,
+				'opacity': this.options.opacity,
+				'background-color': this.options.bgcolor
+			}
+		}).inject(this.element, 'after');
+		var meter = new Element('div', {
+			styles: {
+				'width': 0,
+				'height': '100%'
+			}
+		}).inject(bar);
+		this.fx = new Fx.Morph(meter, {
+			duration: 'short',
+			link: 'cancel',
+			unit: '%'
+		});
+		this.element.addEvent('keyupandchange', this.animate.bind(this));
+		if (this.element.get('value')) this.animate();
+	},
+	
+	animate: function(){
+		var value = this.element.get('value');
+		var color, strength = value.strength(), ratio = (strength / this.options.threshold).round(2).limit(0, 1);
+		if (ratio < 0.5) color = ('rgb(255, ' + (255 * ratio * 2).round() + ', 0)').rgbToHex();
+		else color = ('rgb(' + (255 * (1 - ratio) * 2).round() + ', 255, 0)').rgbToHex();
+		this.fx.start({
+			'width': 100 * ratio,
+			'background-color': color
+		});
+		this.fireEvent('update', [this.element, strength, this.options.threshold]);
+	}
+});
+
+Element.Events.keyupandchange = {
+	base: 'keyup',
+	condition: function(event){
+		var prev = this.retrieve('prev', null);
+		var cur = this.get('value');
+		if (typeOf(prev) != 'null' && prev == cur) return false;
+		this.store('prev', cur);
+		return true;
+	}
+};
+
+String.implement({
+	strength: function(){
+		var n = 0;
+		if (this.match(/\d/)) n += 10;
+		if (this.match(/[a-z]+/)) n += 26;
+		if (this.match(/[A-Z]+/)) n += 26;
+		if (this.match(/[^\da-zA-Z]/)) n += 33;
+		return (n == 0) ? 0 : (this.length * n.log() / (2).log()).round();
+	}
+});
diff --git a/core/media/system/js/permissions-uncompressed.js b/core/media/system/js/permissions-uncompressed.js
new file mode 100644
index 00000000..f903fbcd
--- /dev/null
+++ b/core/media/system/js/permissions-uncompressed.js
@@ -0,0 +1,133 @@
+/**
+ * Function to send Permissions via Ajax to Com-Config Application Controller
+ */
+function sendPermissions(event) {
+	// set the icon while storing the values
+	var icon = document.getElementById('icon_' + this.id);
+	icon.removeAttribute('class');
+	icon.setAttribute('style', 'background: url(../media/system/images/modal/spinner.gif); display: inline-block; width: 16px; height: 16px');
+
+	//get values and prepare GET-Parameter
+	var asset = 'not';
+	var component = getUrlParam('component');
+	var extension = getUrlParam('extension');
+	var option    = getUrlParam('option');
+	var view      = getUrlParam('view');
+	var title     = component;
+	var value     = this.value;
+	var context   = '';
+
+	if (document.getElementById('jform_context')){
+		context = document.getElementById('jform_context').value;
+		context = context.split('.')[0];
+	}
+
+	if (option == 'com_config' && component == false && extension == false)
+	{
+		asset = 'root.1';
+	}
+	else if (extension == false && view == 'component'){
+		asset = component;
+	}
+	else if (context){
+		if (view == 'group') {
+			asset = context + '.fieldgroup.' + getUrlParam('id');
+		}
+		else {
+			asset = context + '.field.' + getUrlParam('id');
+		}
+		title = document.getElementById('jform_title').value;
+	}
+	else if (extension != false && view != false){
+		asset = extension + '.' + view + '.' + getUrlParam('id');
+		title = document.getElementById('jform_title').value;
+	}
+	else if (extension == false && view != false){
+		asset = option + '.' + view + '.' + getUrlParam('id');
+		title = document.getElementById('jform_title').value;
+	}
+
+	var id = this.id.replace('jform_rules_', '');
+	var lastUnderscoreIndex = id.lastIndexOf('_');
+
+	var permission_data = {
+		comp   : asset,
+		action : id.substring(0, lastUnderscoreIndex),
+		rule   : id.substring(lastUnderscoreIndex + 1),
+		value  : value,
+		title  : title
+	};
+
+	// Remove js messages, if they exist.
+	Joomla.removeMessages();
+
+	// doing ajax request
+	jQuery.ajax({
+		method: "POST",
+		url: document.getElementById('permissions-sliders').getAttribute('data-ajaxuri'),
+		data: permission_data,
+		datatype: 'json'
+	})
+	.fail(function (jqXHR, textStatus, error) {
+		// Remove the spinning icon.
+		icon.removeAttribute('style');
+
+		Joomla.renderMessages(Joomla.ajaxErrorsMessages(jqXHR, textStatus, error));
+
+		window.scrollTo(0, 0);
+
+		icon.setAttribute('class', 'icon-cancel');
+	})
+	.done(function (response) {
+		// Remove the spinning icon.
+		icon.removeAttribute('style');
+
+		if (response.data)
+		{
+			// Check if everything is OK
+			if (response.data.result == true)
+			{
+				icon.setAttribute('class', 'icon-save');
+
+				jQuery(event.target).parents().next("td").find("span")
+					.removeClass()
+					.addClass(response['data']['class'])
+					.html(response.data.text);
+			}
+		}
+
+		// Render messages, if any. There are only message in case of errors.
+		if (typeof response.messages == 'object' && response.messages !== null)
+		{
+			Joomla.renderMessages(response.messages);
+
+			if (response.data && response.data.result == true)
+			{
+				icon.setAttribute('class', 'icon-save');
+			}
+			else
+			{
+				icon.setAttribute('class', 'icon-cancel');
+			}
+
+			window.scrollTo(0, 0);
+		}
+	});
+}
+
+/**
+ * Function to get parameters out of the url
+ */
+function getUrlParam(variable) {
+	var query = window.location.search.substring(1);
+	var vars = query.split('&');
+	for (var i=0;i<vars.length;i++)
+	{
+		var pair = vars[i].split('=');
+		if (pair[0] == variable)
+		{
+			return pair[1];
+		}
+	}
+	return false;
+}
diff --git a/core/media/system/js/permissions.js b/core/media/system/js/permissions.js
new file mode 100644
index 00000000..75520005
--- /dev/null
+++ b/core/media/system/js/permissions.js
@@ -0,0 +1 @@
+function sendPermissions(e){var t=document.getElementById("icon_"+this.id);t.removeAttribute("class"),t.setAttribute("style","background: url(../media/system/images/modal/spinner.gif); display: inline-block; width: 16px; height: 16px");var a="not",s=getUrlParam("component"),r=getUrlParam("extension"),o=getUrlParam("option"),l=getUrlParam("view"),n=s,i=this.value,m="";document.getElementById("jform_context")&&(m=document.getElementById("jform_context").value,m=m.split(".")[0]),"com_config"==o&&0==s&&0==r?a="root.1":0==r&&"component"==l?a=s:m?(a="group"==l?m+".fieldgroup."+getUrlParam("id"):m+".field."+getUrlParam("id"),n=document.getElementById("jform_title").value):0!=r&&0!=l?(a=r+"."+l+"."+getUrlParam("id"),n=document.getElementById("jform_title").value):0==r&&0!=l&&(a=o+"."+l+"."+getUrlParam("id"),n=document.getElementById("jform_title").value);var d=this.id.replace("jform_rules_",""),u=d.lastIndexOf("_"),c={comp:a,action:d.substring(0,u),rule:d.substring(u+1),value:i,title:n};Joomla.removeMessages(),jQuery.ajax({method:"POST",url:document.getElementById("permissions-sliders").getAttribute("data-ajaxuri"),data:c,datatype:"json"}).fail(function(e,a,s){t.removeAttribute("style"),Joomla.renderMessages(Joomla.ajaxErrorsMessages(e,a,s)),window.scrollTo(0,0),t.setAttribute("class","icon-cancel")}).done(function(a){t.removeAttribute("style"),a.data&&1==a.data.result&&(t.setAttribute("class","icon-save"),jQuery(e.target).parents().next("td").find("span").removeClass().addClass(a.data["class"]).html(a.data.text)),"object"==typeof a.messages&&null!==a.messages&&(Joomla.renderMessages(a.messages),a.data&&1==a.data.result?t.setAttribute("class","icon-save"):t.setAttribute("class","icon-cancel"),window.scrollTo(0,0))})}function getUrlParam(e){for(var t=window.location.search.substring(1),a=t.split("&"),s=0;s<a.length;s++){var r=a[s].split("=");if(r[0]==e)return r[1]}return!1}
\ No newline at end of file
diff --git a/core/media/system/js/polyfill.classlist-uncompressed.js b/core/media/system/js/polyfill.classlist-uncompressed.js
new file mode 100644
index 00000000..a3b7f472
--- /dev/null
+++ b/core/media/system/js/polyfill.classlist-uncompressed.js
@@ -0,0 +1,378 @@
+/**
+ * Polyfill service v3.13.0
+ * For detailed credits and licence information see http://github.com/financial-times/polyfill-service.
+ * 
+ * Features requested: Element.prototype.classList
+ * 
+ * - Object.defineProperty, License: CC0 (required by "Element.prototype.classList")
+ * - _DOMTokenList, License: CC0 (required by "Element.prototype.classList")
+ * - Document, License: CC0 (required by "Element", "Element.prototype.classList")
+ * - Element, License: CC0 (required by "Element.prototype.classList")
+ * - Element.prototype.classList, License: CC0
+ *
+ * @build      https://cdn.polyfill.io/v2/polyfill.js?features=Element.prototype.classList&flags=always,gated
+ * 
+ * @copyright  Copyright (c) 2016 Financial Times
+ * @license    MIT License, https://github.com/Financial-Times/polyfill-service/blob/master/LICENSE.md
+ */
+
+(function(undefined) {
+if (!(// In IE8, defineProperty could only act on DOM elements, so full support
+// for the feature requires the ability to set a property on an arbitrary object
+'defineProperty' in Object && (function() {
+	try {
+		var a = {};
+		Object.defineProperty(a, 'test', {value:42});
+		return true;
+	} catch(e) {
+		return false
+	}
+}()))) {
+
+// Object.defineProperty
+(function (nativeDefineProperty) {
+
+	var supportsAccessors = Object.prototype.hasOwnProperty('__defineGetter__');
+	var ERR_ACCESSORS_NOT_SUPPORTED = 'Getters & setters cannot be defined on this javascript engine';
+	var ERR_VALUE_ACCESSORS = 'A property cannot both have accessors and be writable or have a value';
+
+	Object.defineProperty = function defineProperty(object, property, descriptor) {
+
+		// Where native support exists, assume it
+		if (nativeDefineProperty && (object === window || object === document || object === Element.prototype || object instanceof Element)) {
+			return nativeDefineProperty(object, property, descriptor);
+		}
+
+		if (object === null || !(object instanceof Object || typeof object === 'object')) {
+			throw new TypeError('Object must be an object (Object.defineProperty polyfill)');
+		}
+
+		if (!(descriptor instanceof Object)) {
+			throw new TypeError('Descriptor must be an object (Object.defineProperty polyfill)');
+		}
+
+		var propertyString = String(property);
+		var hasValueOrWritable = 'value' in descriptor || 'writable' in descriptor;
+		var getterType = 'get' in descriptor && typeof descriptor.get;
+		var setterType = 'set' in descriptor && typeof descriptor.set;
+
+		// handle descriptor.get
+		if (getterType) {
+			if (getterType !== 'function') {
+				throw new TypeError('Getter expected a function (Object.defineProperty polyfill)');
+			}
+			if (!supportsAccessors) {
+				throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+			}
+			if (hasValueOrWritable) {
+				throw new TypeError(ERR_VALUE_ACCESSORS);
+			}
+			object.__defineGetter__(propertyString, descriptor.get);
+		} else {
+			object[propertyString] = descriptor.value;
+		}
+
+		// handle descriptor.set
+		if (setterType) {
+			if (setterType !== 'function') {
+				throw new TypeError('Setter expected a function (Object.defineProperty polyfill)');
+			}
+			if (!supportsAccessors) {
+				throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+			}
+			if (hasValueOrWritable) {
+				throw new TypeError(ERR_VALUE_ACCESSORS);
+			}
+			object.__defineSetter__(propertyString, descriptor.set);
+		}
+
+		// OK to define value unconditionally - if a getter has been specified as well, an error would be thrown above
+		if ('value' in descriptor) {
+			object[propertyString] = descriptor.value;
+		}
+
+		return object;
+	};
+}(Object.defineProperty));
+
+}
+
+
+// _DOMTokenList
+var _DOMTokenList = (function () { // eslint-disable-line no-unused-vars
+
+	function tokenize(token) {
+		if (/^-?[_a-zA-Z]+[_a-zA-Z0-9-]*$/.test(token)) {
+			return String(token);
+		} else {
+			throw new Error('InvalidCharacterError: DOM Exception 5');
+		}
+	}
+
+	function toObject(self) {
+		for (var index = -1, object = {}, element; element = self[++index];) {
+			object[element] = true;
+		}
+
+		return object;
+	}
+
+	function fromObject(self, object) {
+		var array = [], token;
+
+		for (token in object) {
+			if (object[token]) {
+				array.push(token);
+			}
+		}
+
+		[].splice.apply(self, [0, self.length].concat(array));
+	}
+
+	var DTL = function() {};
+
+	DTL.prototype = {
+		constructor: DTL,
+		item: function item(index) {
+			return this[parseFloat(index)] || null;
+		},
+		length: Array.prototype.length,
+		toString: function toString() {
+			return [].join.call(this, ' ');
+		},
+
+		add: function add() {
+			for (var object = toObject(this), index = 0, token; index in arguments; ++index) {
+				token = tokenize(arguments[index]);
+
+				object[token] = true;
+			}
+
+			fromObject(this, object);
+		},
+		contains: function contains(token) {
+			return token in toObject(this);
+		},
+		remove: function remove() {
+			for (var object = toObject(this), index = 0, token; index in arguments; ++index) {
+				token = tokenize(arguments[index]);
+
+				object[token] = false;
+			}
+
+			fromObject(this, object);
+		},
+		toggle: function toggle(token) {
+			var
+			object = toObject(this),
+			contains = 1 in arguments ? !arguments[1] : tokenize(token) in object;
+
+			object[token] = !contains;
+
+			fromObject(this, object);
+
+			return !contains;
+		}
+	};
+
+	return DTL;
+
+}());
+if (!("Document" in this)) {
+
+// Document
+if (this.HTMLDocument) { // IE8
+
+	// HTMLDocument is an extension of Document.  If the browser has HTMLDocument but not Document, the former will suffice as an alias for the latter.
+	this.Document = this.HTMLDocument;
+
+} else {
+
+	// Create an empty function to act as the missing constructor for the document object, attach the document object as its prototype.  The function needs to be anonymous else it is hoisted and causes the feature detect to prematurely pass, preventing the assignments below being made.
+	this.Document = this.HTMLDocument = document.constructor = (new Function('return function Document() {}')());
+	this.Document.prototype = document;
+}
+
+}
+
+if (!('Element' in this && 'HTMLElement' in this)) {
+
+// Element
+(function () {
+
+	// IE8
+	if (window.Element && !window.HTMLElement) {
+		window.HTMLElement = window.Element;
+		return;
+	}
+
+	// create Element constructor
+	window.Element = window.HTMLElement = new Function('return function Element() {}')();
+
+	// generate sandboxed iframe
+	var vbody = document.appendChild(document.createElement('body'));
+	var frame = vbody.appendChild(document.createElement('iframe'));
+
+	// use sandboxed iframe to replicate Element functionality
+	var frameDocument = frame.contentWindow.document;
+	var prototype = Element.prototype = frameDocument.appendChild(frameDocument.createElement('*'));
+	var cache = {};
+
+	// polyfill Element.prototype on an element
+	var shiv = function (element, deep) {
+		var
+		childNodes = element.childNodes || [],
+		index = -1,
+		key, value, childNode;
+
+		if (element.nodeType === 1 && element.constructor !== Element) {
+			element.constructor = Element;
+
+			for (key in cache) {
+				value = cache[key];
+				element[key] = value;
+			}
+		}
+
+		while (childNode = deep && childNodes[++index]) {
+			shiv(childNode, deep);
+		}
+
+		return element;
+	};
+
+	var elements = document.getElementsByTagName('*');
+	var nativeCreateElement = document.createElement;
+	var interval;
+	var loopLimit = 100;
+
+	prototype.attachEvent('onpropertychange', function (event) {
+		var
+		propertyName = event.propertyName,
+		nonValue = !cache.hasOwnProperty(propertyName),
+		newValue = prototype[propertyName],
+		oldValue = cache[propertyName],
+		index = -1,
+		element;
+
+		while (element = elements[++index]) {
+			if (element.nodeType === 1) {
+				if (nonValue || element[propertyName] === oldValue) {
+					element[propertyName] = newValue;
+				}
+			}
+		}
+
+		cache[propertyName] = newValue;
+	});
+
+	prototype.constructor = Element;
+
+	if (!prototype.hasAttribute) {
+		// <Element>.hasAttribute
+		prototype.hasAttribute = function hasAttribute(name) {
+			return this.getAttribute(name) !== null;
+		};
+	}
+
+	// Apply Element prototype to the pre-existing DOM as soon as the body element appears.
+	function bodyCheck() {
+		if (!(loopLimit--)) clearTimeout(interval);
+		if (document.body && !document.body.prototype && /(complete|interactive)/.test(document.readyState)) {
+			shiv(document, true);
+			if (interval && document.body.prototype) clearTimeout(interval);
+			return (!!document.body.prototype);
+		}
+		return false;
+	}
+	if (!bodyCheck(true)) {
+		document.onreadystatechange = bodyCheck;
+		interval = setInterval(bodyCheck, 25);
+	}
+
+	// Apply to any new elements created after load
+	document.createElement = function createElement(nodeName) {
+		var element = nativeCreateElement(String(nodeName).toLowerCase());
+		return shiv(element);
+	};
+
+	// remove sandboxed iframe
+	document.removeChild(vbody);
+}());
+
+}
+
+if (!('document' in this && "classList" in document.documentElement)) {
+
+// Element.prototype.classList
+Object.defineProperty(Element.prototype, 'classList', {
+	configurable: true,
+	get: function () {
+
+		function pull() {
+			var className = (typeof element.className === "object" ? element.className.baseVal : element.className);
+			[].splice.apply(classList, [0, classList.length].concat((className || '').replace(/^\s+|\s+$/g, '').split(/\s+/)));
+		}
+
+		function push() {
+			if (element.attachEvent) {
+				element.detachEvent('onpropertychange', pull);
+			}
+
+			if (typeof element.className === "object") {
+				element.className.baseVal = original.toString.call(classList);
+			} else {
+				element.className = original.toString.call(classList);
+			}
+
+			if (element.attachEvent) {
+				element.attachEvent('onpropertychange', pull);
+			}
+		}
+
+		var element = this;
+		var original = _DOMTokenList.prototype;
+		var ClassList = function ClassList() {};
+		var classList;
+
+		ClassList.prototype = new _DOMTokenList;
+
+		ClassList.prototype.item = function item(index) { // eslint-disable-line no-unused-vars
+			return pull(), original.item.apply(classList, arguments);
+		};
+
+		ClassList.prototype.toString = function toString() {
+			return pull(), original.toString.apply(classList, arguments);
+		};
+
+		ClassList.prototype.add = function add() {
+			return pull(), original.add.apply(classList, arguments), push();
+		};
+
+		ClassList.prototype.contains = function contains(token) { // eslint-disable-line no-unused-vars
+			return pull(), original.contains.apply(classList, arguments);
+		};
+
+		ClassList.prototype.remove = function remove() {
+			return pull(), original.remove.apply(classList, arguments), push();
+		};
+
+		ClassList.prototype.toggle = function toggle(token) {
+			return pull(), token = original.toggle.apply(classList, arguments), push(), token;
+		};
+
+		classList = new ClassList;
+
+		if (element.attachEvent) {
+			element.attachEvent('onpropertychange', pull);
+		}
+
+		return classList;
+	}
+});
+
+}
+
+
+})
+.call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
diff --git a/core/media/system/js/polyfill.classlist.js b/core/media/system/js/polyfill.classlist.js
new file mode 100644
index 00000000..e3482839
--- /dev/null
+++ b/core/media/system/js/polyfill.classlist.js
@@ -0,0 +1 @@
+(function(){"defineProperty"in Object&&function(){try{var t={};return Object.defineProperty(t,"test",{value:42}),!0}catch(e){return!1}}()||!function(t){var e=Object.prototype.hasOwnProperty("__defineGetter__"),n="Getters & setters cannot be defined on this javascript engine",o="A property cannot both have accessors and be writable or have a value";Object.defineProperty=function(r,i,c){if(t&&(r===window||r===document||r===Element.prototype||r instanceof Element))return t(r,i,c);if(null===r||!(r instanceof Object||"object"==typeof r))throw new TypeError("Object must be an object (Object.defineProperty polyfill)");if(!(c instanceof Object))throw new TypeError("Descriptor must be an object (Object.defineProperty polyfill)");var a=String(i),u="value"in c||"writable"in c,p="get"in c&&typeof c.get,l="set"in c&&typeof c.set;if(p){if("function"!==p)throw new TypeError("Getter expected a function (Object.defineProperty polyfill)");if(!e)throw new TypeError(n);if(u)throw new TypeError(o);r.__defineGetter__(a,c.get)}else r[a]=c.value;if(l){if("function"!==l)throw new TypeError("Setter expected a function (Object.defineProperty polyfill)");if(!e)throw new TypeError(n);if(u)throw new TypeError(o);r.__defineSetter__(a,c.set)}return"value"in c&&(r[a]=c.value),r}}(Object.defineProperty);var t=function(){function t(t){if(/^-?[_a-zA-Z]+[_a-zA-Z0-9-]*$/.test(t))return String(t);throw new Error("InvalidCharacterError: DOM Exception 5")}function e(t){for(var e,n=-1,o={};e=t[++n];)o[e]=!0;return o}function n(t,e){var n,o=[];for(n in e)e[n]&&o.push(n);[].splice.apply(t,[0,t.length].concat(o))}var o=function(){};return o.prototype={constructor:o,item:function(t){return this[parseFloat(t)]||null},length:Array.prototype.length,toString:function(){return[].join.call(this," ")},add:function(){for(var o,r=e(this),i=0;i in arguments;++i)o=t(arguments[i]),r[o]=!0;n(this,r)},contains:function(t){return t in e(this)},remove:function(){for(var o,r=e(this),i=0;i in arguments;++i)o=t(arguments[i]),r[o]=!1;n(this,r)},toggle:function(o){var r=e(this),i=1 in arguments?!arguments[1]:t(o)in r;return r[o]=!i,n(this,r),!i}},o}();"Document"in this||(this.HTMLDocument?this.Document=this.HTMLDocument:(this.Document=this.HTMLDocument=document.constructor=new Function("return function Document() {}")(),this.Document.prototype=document)),"Element"in this&&"HTMLElement"in this||!function(){function t(){return l--||clearTimeout(e),document.body&&!document.body.prototype&&/(complete|interactive)/.test(document.readyState)?(a(document,!0),e&&document.body.prototype&&clearTimeout(e),!!document.body.prototype):!1}if(window.Element&&!window.HTMLElement)return void(window.HTMLElement=window.Element);window.Element=window.HTMLElement=new Function("return function Element() {}")();var e,n=document.appendChild(document.createElement("body")),o=n.appendChild(document.createElement("iframe")),r=o.contentWindow.document,i=Element.prototype=r.appendChild(r.createElement("*")),c={},a=function(t,e){var n,o,r,i=t.childNodes||[],u=-1;if(1===t.nodeType&&t.constructor!==Element){t.constructor=Element;for(n in c)o=c[n],t[n]=o}for(;r=e&&i[++u];)a(r,e);return t},u=document.getElementsByTagName("*"),p=document.createElement,l=100;i.attachEvent("onpropertychange",function(t){for(var e,n=t.propertyName,o=!c.hasOwnProperty(n),r=i[n],a=c[n],p=-1;e=u[++p];)1===e.nodeType&&(o||e[n]===a)&&(e[n]=r);c[n]=r}),i.constructor=Element,i.hasAttribute||(i.hasAttribute=function(t){return null!==this.getAttribute(t)}),t(!0)||(document.onreadystatechange=t,e=setInterval(t,25)),document.createElement=function(t){var e=p(String(t).toLowerCase());return a(e)},document.removeChild(n)}(),"document"in this&&"classList"in document.documentElement||Object.defineProperty(Element.prototype,"classList",{configurable:!0,get:function(){function e(){var t="object"==typeof r.className?r.className.baseVal:r.className;[].splice.apply(o,[0,o.length].concat((t||"").replace(/^\s+|\s+$/g,"").split(/\s+/)))}function n(){r.attachEvent&&r.detachEvent("onpropertychange",e),"object"==typeof r.className?r.className.baseVal=i.toString.call(o):r.className=i.toString.call(o),r.attachEvent&&r.attachEvent("onpropertychange",e)}var o,r=this,i=t.prototype,c=function(){};return c.prototype=new t,c.prototype.item=function(){return e(),i.item.apply(o,arguments)},c.prototype.toString=function(){return e(),i.toString.apply(o,arguments)},c.prototype.add=function(){return e(),i.add.apply(o,arguments),n()},c.prototype.contains=function(){return e(),i.contains.apply(o,arguments)},c.prototype.remove=function(){return e(),i.remove.apply(o,arguments),n()},c.prototype.toggle=function(t){return e(),t=i.toggle.apply(o,arguments),n(),t},o=new c,r.attachEvent&&r.attachEvent("onpropertychange",e),o}})}).call("object"==typeof window&&window||"object"==typeof self&&self||"object"==typeof global&&global||{});
diff --git a/core/media/system/js/polyfill.event-uncompressed.js b/core/media/system/js/polyfill.event-uncompressed.js
new file mode 100644
index 00000000..a9e97013
--- /dev/null
+++ b/core/media/system/js/polyfill.event-uncompressed.js
@@ -0,0 +1,474 @@
+/**
+ * Polyfill service v3.13.0
+ * For detailed credits and licence information see http://github.com/financial-times/polyfill-service.
+ * 
+ * Features requested: Event
+ * 
+ * - Window, License: CC0 (required by "Event")
+ * - Document, License: CC0 (required by "Element", "Event")
+ * - Element, License: CC0 (required by "Event")
+ * - Object.defineProperty, License: CC0 (required by "Event")
+ * - Event, License: CC0
+ *
+ * @build      https://cdn.polyfill.io/v2/polyfill.js?features=Event&flags=always,gated
+ * 
+ * @copyright  Copyright (c) 2016 Financial Times
+ * @license    MIT License, https://github.com/Financial-Times/polyfill-service/blob/master/LICENSE.md
+ */
+
+(function(undefined) {
+if (!('Window' in this)) {
+
+// Window
+(function(global) {
+	if (global.constructor) {
+		global.Window = global.constructor;
+	} else {
+		(global.Window = global.constructor = new Function('return function Window() {}')()).prototype = this;
+	}
+}(this));
+
+}
+
+if (!("Document" in this)) {
+
+// Document
+if (this.HTMLDocument) { // IE8
+
+	// HTMLDocument is an extension of Document.  If the browser has HTMLDocument but not Document, the former will suffice as an alias for the latter.
+	this.Document = this.HTMLDocument;
+
+} else {
+
+	// Create an empty function to act as the missing constructor for the document object, attach the document object as its prototype.  The function needs to be anonymous else it is hoisted and causes the feature detect to prematurely pass, preventing the assignments below being made.
+	this.Document = this.HTMLDocument = document.constructor = (new Function('return function Document() {}')());
+	this.Document.prototype = document;
+}
+
+}
+
+if (!('Element' in this && 'HTMLElement' in this)) {
+
+// Element
+(function () {
+
+	// IE8
+	if (window.Element && !window.HTMLElement) {
+		window.HTMLElement = window.Element;
+		return;
+	}
+
+	// create Element constructor
+	window.Element = window.HTMLElement = new Function('return function Element() {}')();
+
+	// generate sandboxed iframe
+	var vbody = document.appendChild(document.createElement('body'));
+	var frame = vbody.appendChild(document.createElement('iframe'));
+
+	// use sandboxed iframe to replicate Element functionality
+	var frameDocument = frame.contentWindow.document;
+	var prototype = Element.prototype = frameDocument.appendChild(frameDocument.createElement('*'));
+	var cache = {};
+
+	// polyfill Element.prototype on an element
+	var shiv = function (element, deep) {
+		var
+		childNodes = element.childNodes || [],
+		index = -1,
+		key, value, childNode;
+
+		if (element.nodeType === 1 && element.constructor !== Element) {
+			element.constructor = Element;
+
+			for (key in cache) {
+				value = cache[key];
+				element[key] = value;
+			}
+		}
+
+		while (childNode = deep && childNodes[++index]) {
+			shiv(childNode, deep);
+		}
+
+		return element;
+	};
+
+	var elements = document.getElementsByTagName('*');
+	var nativeCreateElement = document.createElement;
+	var interval;
+	var loopLimit = 100;
+
+	prototype.attachEvent('onpropertychange', function (event) {
+		var
+		propertyName = event.propertyName,
+		nonValue = !cache.hasOwnProperty(propertyName),
+		newValue = prototype[propertyName],
+		oldValue = cache[propertyName],
+		index = -1,
+		element;
+
+		while (element = elements[++index]) {
+			if (element.nodeType === 1) {
+				if (nonValue || element[propertyName] === oldValue) {
+					element[propertyName] = newValue;
+				}
+			}
+		}
+
+		cache[propertyName] = newValue;
+	});
+
+	prototype.constructor = Element;
+
+	if (!prototype.hasAttribute) {
+		// <Element>.hasAttribute
+		prototype.hasAttribute = function hasAttribute(name) {
+			return this.getAttribute(name) !== null;
+		};
+	}
+
+	// Apply Element prototype to the pre-existing DOM as soon as the body element appears.
+	function bodyCheck() {
+		if (!(loopLimit--)) clearTimeout(interval);
+		if (document.body && !document.body.prototype && /(complete|interactive)/.test(document.readyState)) {
+			shiv(document, true);
+			if (interval && document.body.prototype) clearTimeout(interval);
+			return (!!document.body.prototype);
+		}
+		return false;
+	}
+	if (!bodyCheck(true)) {
+		document.onreadystatechange = bodyCheck;
+		interval = setInterval(bodyCheck, 25);
+	}
+
+	// Apply to any new elements created after load
+	document.createElement = function createElement(nodeName) {
+		var element = nativeCreateElement(String(nodeName).toLowerCase());
+		return shiv(element);
+	};
+
+	// remove sandboxed iframe
+	document.removeChild(vbody);
+}());
+
+}
+
+if (!(// In IE8, defineProperty could only act on DOM elements, so full support
+// for the feature requires the ability to set a property on an arbitrary object
+'defineProperty' in Object && (function() {
+	try {
+		var a = {};
+		Object.defineProperty(a, 'test', {value:42});
+		return true;
+	} catch(e) {
+		return false
+	}
+}()))) {
+
+// Object.defineProperty
+(function (nativeDefineProperty) {
+
+	var supportsAccessors = Object.prototype.hasOwnProperty('__defineGetter__');
+	var ERR_ACCESSORS_NOT_SUPPORTED = 'Getters & setters cannot be defined on this javascript engine';
+	var ERR_VALUE_ACCESSORS = 'A property cannot both have accessors and be writable or have a value';
+
+	Object.defineProperty = function defineProperty(object, property, descriptor) {
+
+		// Where native support exists, assume it
+		if (nativeDefineProperty && (object === window || object === document || object === Element.prototype || object instanceof Element)) {
+			return nativeDefineProperty(object, property, descriptor);
+		}
+
+		if (object === null || !(object instanceof Object || typeof object === 'object')) {
+			throw new TypeError('Object must be an object (Object.defineProperty polyfill)');
+		}
+
+		if (!(descriptor instanceof Object)) {
+			throw new TypeError('Descriptor must be an object (Object.defineProperty polyfill)');
+		}
+
+		var propertyString = String(property);
+		var hasValueOrWritable = 'value' in descriptor || 'writable' in descriptor;
+		var getterType = 'get' in descriptor && typeof descriptor.get;
+		var setterType = 'set' in descriptor && typeof descriptor.set;
+
+		// handle descriptor.get
+		if (getterType) {
+			if (getterType !== 'function') {
+				throw new TypeError('Getter expected a function (Object.defineProperty polyfill)');
+			}
+			if (!supportsAccessors) {
+				throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+			}
+			if (hasValueOrWritable) {
+				throw new TypeError(ERR_VALUE_ACCESSORS);
+			}
+			object.__defineGetter__(propertyString, descriptor.get);
+		} else {
+			object[propertyString] = descriptor.value;
+		}
+
+		// handle descriptor.set
+		if (setterType) {
+			if (setterType !== 'function') {
+				throw new TypeError('Setter expected a function (Object.defineProperty polyfill)');
+			}
+			if (!supportsAccessors) {
+				throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+			}
+			if (hasValueOrWritable) {
+				throw new TypeError(ERR_VALUE_ACCESSORS);
+			}
+			object.__defineSetter__(propertyString, descriptor.set);
+		}
+
+		// OK to define value unconditionally - if a getter has been specified as well, an error would be thrown above
+		if ('value' in descriptor) {
+			object[propertyString] = descriptor.value;
+		}
+
+		return object;
+	};
+}(Object.defineProperty));
+
+}
+
+if (!((function(global) {
+
+	if (!('Event' in global)) return false;
+	if (typeof global.Event === 'function') return true;
+
+	try {
+
+		// In IE 9-11, the Event object exists but cannot be instantiated
+		new Event('click');
+		return true;
+	} catch(e) {
+		return false;
+	}
+}(this)))) {
+
+// Event
+(function () {
+	var unlistenableWindowEvents = {
+		click: 1,
+		dblclick: 1,
+		keyup: 1,
+		keypress: 1,
+		keydown: 1,
+		mousedown: 1,
+		mouseup: 1,
+		mousemove: 1,
+		mouseover: 1,
+		mouseenter: 1,
+		mouseleave: 1,
+		mouseout: 1,
+		storage: 1,
+		storagecommit: 1,
+		textinput: 1
+	};
+
+	function indexOf(array, element) {
+		var
+		index = -1,
+		length = array.length;
+
+		while (++index < length) {
+			if (index in array && array[index] === element) {
+				return index;
+			}
+		}
+
+		return -1;
+	}
+
+	var existingProto = (window.Event && window.Event.prototype) || null;
+	window.Event = Window.prototype.Event = function Event(type, eventInitDict) {
+		if (!type) {
+			throw new Error('Not enough arguments');
+		}
+
+		// Shortcut if browser supports createEvent
+		if ('createEvent' in document) {
+			var event = document.createEvent('Event');
+			var bubbles = eventInitDict && eventInitDict.bubbles !== undefined ? eventInitDict.bubbles : false;
+			var cancelable = eventInitDict && eventInitDict.cancelable !== undefined ? eventInitDict.cancelable : false;
+
+			event.initEvent(type, bubbles, cancelable);
+
+			return event;
+		}
+
+		var event = document.createEventObject();
+
+		event.type = type;
+		event.bubbles = eventInitDict && eventInitDict.bubbles !== undefined ? eventInitDict.bubbles : false;
+		event.cancelable = eventInitDict && eventInitDict.cancelable !== undefined ? eventInitDict.cancelable : false;
+
+		return event;
+	};
+	if (existingProto) {
+		Object.defineProperty(window.Event, 'prototype', {
+			configurable: false,
+			enumerable: false,
+			writable: true,
+			value: existingProto
+		});
+	}
+
+	if (!('createEvent' in document)) {
+		window.addEventListener = Window.prototype.addEventListener = Document.prototype.addEventListener = Element.prototype.addEventListener = function addEventListener() {
+			var
+			element = this,
+			type = arguments[0],
+			listener = arguments[1];
+
+			if (element === window && type in unlistenableWindowEvents) {
+				throw new Error('In IE8 the event: ' + type + ' is not available on the window object. Please see https://github.com/Financial-Times/polyfill-service/issues/317 for more information.');
+			}
+
+			if (!element._events) {
+				element._events = {};
+			}
+
+			if (!element._events[type]) {
+				element._events[type] = function (event) {
+					var
+					list = element._events[event.type].list,
+					events = list.slice(),
+					index = -1,
+					length = events.length,
+					eventElement;
+
+					event.preventDefault = function preventDefault() {
+						if (event.cancelable !== false) {
+							event.returnValue = false;
+						}
+					};
+
+					event.stopPropagation = function stopPropagation() {
+						event.cancelBubble = true;
+					};
+
+					event.stopImmediatePropagation = function stopImmediatePropagation() {
+						event.cancelBubble = true;
+						event.cancelImmediate = true;
+					};
+
+					event.currentTarget = element;
+					event.relatedTarget = event.fromElement || null;
+					event.target = event.target || event.srcElement || element;
+					event.timeStamp = new Date().getTime();
+
+					if (event.clientX) {
+						event.pageX = event.clientX + document.documentElement.scrollLeft;
+						event.pageY = event.clientY + document.documentElement.scrollTop;
+					}
+
+					while (++index < length && !event.cancelImmediate) {
+						if (index in events) {
+							eventElement = events[index];
+
+							if (indexOf(list, eventElement) !== -1 && typeof eventElement === 'function') {
+								eventElement.call(element, event);
+							}
+						}
+					}
+				};
+
+				element._events[type].list = [];
+
+				if (element.attachEvent) {
+					element.attachEvent('on' + type, element._events[type]);
+				}
+			}
+
+			element._events[type].list.push(listener);
+		};
+
+		window.removeEventListener = Window.prototype.removeEventListener = Document.prototype.removeEventListener = Element.prototype.removeEventListener = function removeEventListener() {
+			var
+			element = this,
+			type = arguments[0],
+			listener = arguments[1],
+			index;
+
+			if (element._events && element._events[type] && element._events[type].list) {
+				index = indexOf(element._events[type].list, listener);
+
+				if (index !== -1) {
+					element._events[type].list.splice(index, 1);
+
+					if (!element._events[type].list.length) {
+						if (element.detachEvent) {
+							element.detachEvent('on' + type, element._events[type]);
+						}
+						delete element._events[type];
+					}
+				}
+			}
+		};
+
+		window.dispatchEvent = Window.prototype.dispatchEvent = Document.prototype.dispatchEvent = Element.prototype.dispatchEvent = function dispatchEvent(event) {
+			if (!arguments.length) {
+				throw new Error('Not enough arguments');
+			}
+
+			if (!event || typeof event.type !== 'string') {
+				throw new Error('DOM Events Exception 0');
+			}
+
+			var element = this, type = event.type;
+
+			try {
+				if (!event.bubbles) {
+					event.cancelBubble = true;
+
+					var cancelBubbleEvent = function (event) {
+						event.cancelBubble = true;
+
+						(element || window).detachEvent('on' + type, cancelBubbleEvent);
+					};
+
+					this.attachEvent('on' + type, cancelBubbleEvent);
+				}
+
+				this.fireEvent('on' + type, event);
+			} catch (error) {
+				event.target = element;
+
+				do {
+					event.currentTarget = element;
+
+					if ('_events' in element && typeof element._events[type] === 'function') {
+						element._events[type].call(element, event);
+					}
+
+					if (typeof element['on' + type] === 'function') {
+						element['on' + type].call(element, event);
+					}
+
+					element = element.nodeType === 9 ? element.parentWindow : element.parentNode;
+				} while (element && !event.cancelBubble);
+			}
+
+			return true;
+		};
+
+		// Add the DOMContentLoaded Event
+		document.attachEvent('onreadystatechange', function() {
+			if (document.readyState === 'complete') {
+				document.dispatchEvent(new Event('DOMContentLoaded', {
+					bubbles: true
+				}));
+			}
+		});
+	}
+}());
+
+}
+
+
+})
+.call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
diff --git a/core/media/system/js/polyfill.event.js b/core/media/system/js/polyfill.event.js
new file mode 100644
index 00000000..c1f64483
--- /dev/null
+++ b/core/media/system/js/polyfill.event.js
@@ -0,0 +1 @@
+(function(e){"Window"in this||!function(e){e.constructor?e.Window=e.constructor:(e.Window=e.constructor=new Function("return function Window() {}")()).prototype=this}(this),"Document"in this||(this.HTMLDocument?this.Document=this.HTMLDocument:(this.Document=this.HTMLDocument=document.constructor=new Function("return function Document() {}")(),this.Document.prototype=document)),"Element"in this&&"HTMLElement"in this||!function(){function e(){return s--||clearTimeout(t),document.body&&!document.body.prototype&&/(complete|interactive)/.test(document.readyState)?(a(document,!0),t&&document.body.prototype&&clearTimeout(t),!!document.body.prototype):!1}if(window.Element&&!window.HTMLElement)return void(window.HTMLElement=window.Element);window.Element=window.HTMLElement=new Function("return function Element() {}")();var t,n=document.appendChild(document.createElement("body")),o=n.appendChild(document.createElement("iframe")),r=o.contentWindow.document,i=Element.prototype=r.appendChild(r.createElement("*")),c={},a=function(e,t){var n,o,r,i=e.childNodes||[],u=-1;if(1===e.nodeType&&e.constructor!==Element){e.constructor=Element;for(n in c)o=c[n],e[n]=o}for(;r=t&&i[++u];)a(r,t);return e},u=document.getElementsByTagName("*"),l=document.createElement,s=100;i.attachEvent("onpropertychange",function(e){for(var t,n=e.propertyName,o=!c.hasOwnProperty(n),r=i[n],a=c[n],l=-1;t=u[++l];)1===t.nodeType&&(o||t[n]===a)&&(t[n]=r);c[n]=r}),i.constructor=Element,i.hasAttribute||(i.hasAttribute=function(e){return null!==this.getAttribute(e)}),e(!0)||(document.onreadystatechange=e,t=setInterval(e,25)),document.createElement=function(e){var t=l(String(e).toLowerCase());return a(t)},document.removeChild(n)}(),"defineProperty"in Object&&function(){try{var e={};return Object.defineProperty(e,"test",{value:42}),!0}catch(t){return!1}}()||!function(e){var t=Object.prototype.hasOwnProperty("__defineGetter__"),n="Getters & setters cannot be defined on this javascript engine",o="A property cannot both have accessors and be writable or have a value";Object.defineProperty=function(r,i,c){if(e&&(r===window||r===document||r===Element.prototype||r instanceof Element))return e(r,i,c);if(null===r||!(r instanceof Object||"object"==typeof r))throw new TypeError("Object must be an object (Object.defineProperty polyfill)");if(!(c instanceof Object))throw new TypeError("Descriptor must be an object (Object.defineProperty polyfill)");var a=String(i),u="value"in c||"writable"in c,l="get"in c&&typeof c.get,s="set"in c&&typeof c.set;if(l){if("function"!==l)throw new TypeError("Getter expected a function (Object.defineProperty polyfill)");if(!t)throw new TypeError(n);if(u)throw new TypeError(o);r.__defineGetter__(a,c.get)}else r[a]=c.value;if(s){if("function"!==s)throw new TypeError("Setter expected a function (Object.defineProperty polyfill)");if(!t)throw new TypeError(n);if(u)throw new TypeError(o);r.__defineSetter__(a,c.set)}return"value"in c&&(r[a]=c.value),r}}(Object.defineProperty),function(e){if(!("Event"in e))return!1;if("function"==typeof e.Event)return!0;try{return new Event("click"),!0}catch(t){return!1}}(this)||!function(){function t(e,t){for(var n=-1,o=e.length;++n<o;)if(n in e&&e[n]===t)return n;return-1}var n={click:1,dblclick:1,keyup:1,keypress:1,keydown:1,mousedown:1,mouseup:1,mousemove:1,mouseover:1,mouseenter:1,mouseleave:1,mouseout:1,storage:1,storagecommit:1,textinput:1},o=window.Event&&window.Event.prototype||null;window.Event=Window.prototype.Event=function(t,n){if(!t)throw new Error("Not enough arguments");if("createEvent"in document){var o=document.createEvent("Event"),r=n&&n.bubbles!==e?n.bubbles:!1,i=n&&n.cancelable!==e?n.cancelable:!1;return o.initEvent(t,r,i),o}var o=document.createEventObject();return o.type=t,o.bubbles=n&&n.bubbles!==e?n.bubbles:!1,o.cancelable=n&&n.cancelable!==e?n.cancelable:!1,o},o&&Object.defineProperty(window.Event,"prototype",{configurable:!1,enumerable:!1,writable:!0,value:o}),"createEvent"in document||(window.addEventListener=Window.prototype.addEventListener=Document.prototype.addEventListener=Element.prototype.addEventListener=function(){var e=this,o=arguments[0],r=arguments[1];if(e===window&&o in n)throw new Error("In IE8 the event: "+o+" is not available on the window object. Please see https://github.com/Financial-Times/polyfill-service/issues/317 for more information.");e._events||(e._events={}),e._events[o]||(e._events[o]=function(n){var o,r=e._events[n.type].list,i=r.slice(),c=-1,a=i.length;for(n.preventDefault=function(){n.cancelable!==!1&&(n.returnValue=!1)},n.stopPropagation=function(){n.cancelBubble=!0},n.stopImmediatePropagation=function(){n.cancelBubble=!0,n.cancelImmediate=!0},n.currentTarget=e,n.relatedTarget=n.fromElement||null,n.target=n.target||n.srcElement||e,n.timeStamp=(new Date).getTime(),n.clientX&&(n.pageX=n.clientX+document.documentElement.scrollLeft,n.pageY=n.clientY+document.documentElement.scrollTop);++c<a&&!n.cancelImmediate;)c in i&&(o=i[c],-1!==t(r,o)&&"function"==typeof o&&o.call(e,n))},e._events[o].list=[],e.attachEvent&&e.attachEvent("on"+o,e._events[o])),e._events[o].list.push(r)},window.removeEventListener=Window.prototype.removeEventListener=Document.prototype.removeEventListener=Element.prototype.removeEventListener=function(){var e,n=this,o=arguments[0],r=arguments[1];n._events&&n._events[o]&&n._events[o].list&&(e=t(n._events[o].list,r),-1!==e&&(n._events[o].list.splice(e,1),n._events[o].list.length||(n.detachEvent&&n.detachEvent("on"+o,n._events[o]),delete n._events[o])))},window.dispatchEvent=Window.prototype.dispatchEvent=Document.prototype.dispatchEvent=Element.prototype.dispatchEvent=function(e){if(!arguments.length)throw new Error("Not enough arguments");if(!e||"string"!=typeof e.type)throw new Error("DOM Events Exception 0");var t=this,n=e.type;try{if(!e.bubbles){e.cancelBubble=!0;var o=function(e){e.cancelBubble=!0,(t||window).detachEvent("on"+n,o)};this.attachEvent("on"+n,o)}this.fireEvent("on"+n,e)}catch(r){e.target=t;do e.currentTarget=t,"_events"in t&&"function"==typeof t._events[n]&&t._events[n].call(t,e),"function"==typeof t["on"+n]&&t["on"+n].call(t,e),t=9===t.nodeType?t.parentWindow:t.parentNode;while(t&&!e.cancelBubble)}return!0},document.attachEvent("onreadystatechange",function(){"complete"===document.readyState&&document.dispatchEvent(new Event("DOMContentLoaded",{bubbles:!0}))}))}()}).call("object"==typeof window&&window||"object"==typeof self&&self||"object"==typeof global&&global||{});
diff --git a/core/media/system/js/polyfill.filter-uncompressed.js b/core/media/system/js/polyfill.filter-uncompressed.js
new file mode 100644
index 00000000..40425f2e
--- /dev/null
+++ b/core/media/system/js/polyfill.filter-uncompressed.js
@@ -0,0 +1,45 @@
+/* Polyfill service v3.14.0
+ * For detailed credits and licence information see https://github.com/financial-times/polyfill-service.
+ * 
+ * UA detected: ie/8.0.0
+ * Features requested: Array.prototype.filter
+ * 
+ * - Array.prototype.filter, License: CC0 */
+
+(function(undefined) {
+if (!('filter' in Array.prototype)) {
+
+// Array.prototype.filter
+Array.prototype.filter = function filter(callback) {
+	if (this === undefined || this === null) {
+		throw new TypeError(this + ' is not an object');
+	}
+
+	if (!(callback instanceof Function)) {
+		throw new TypeError(callback + ' is not a function');
+	}
+
+	var
+	object = Object(this),
+	scope = arguments[1],
+	arraylike = object instanceof String ? object.split('') : object,
+	length = Math.max(Math.min(arraylike.length, 9007199254740991), 0) || 0,
+	index = -1,
+	result = [],
+	element;
+
+	while (++index < length) {
+		element = arraylike[index];
+
+		if (index in arraylike && callback.call(scope, element, index, object)) {
+			result.push(element);
+		}
+	}
+
+	return result;
+};
+
+}
+
+})
+.call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
diff --git a/core/media/system/js/polyfill.filter.js b/core/media/system/js/polyfill.filter.js
new file mode 100644
index 00000000..c63db74c
--- /dev/null
+++ b/core/media/system/js/polyfill.filter.js
@@ -0,0 +1 @@
+(function(a){"filter"in Array.prototype||(Array.prototype.filter=function(c){if(this===a||null===this)throw new TypeError(this+" is not an object");if(!(c instanceof Function))throw new TypeError(c+" is not a function");for(var j,d=Object(this),e=arguments[1],f=d instanceof String?d.split(""):d,g=Math.max(Math.min(f.length,9007199254740991),0)||0,h=-1,i=[];++h<g;)j=f[h],h in f&&c.call(e,j,h,d)&&i.push(j);return i})}).call("object"==typeof window&&window||"object"==typeof self&&self||"object"==typeof global&&global||{});
\ No newline at end of file
diff --git a/core/media/system/js/polyfill.map-uncompressed.js b/core/media/system/js/polyfill.map-uncompressed.js
new file mode 100644
index 00000000..df4b72bf
--- /dev/null
+++ b/core/media/system/js/polyfill.map-uncompressed.js
@@ -0,0 +1,42 @@
+/* Polyfill service v3.14.0
+ * For detailed credits and licence information see https://github.com/financial-times/polyfill-service.
+ * 
+ * UA detected: ie/8.0.0
+ * Features requested: Array.prototype.map
+ * 
+ * - Array.prototype.map, License: CC0 */
+
+(function(undefined) {
+if (!('map' in Array.prototype)) {
+
+// Array.prototype.map
+Array.prototype.map = function map(callback) {
+	if (this === undefined || this === null) {
+		throw new TypeError(this + ' is not an object');
+	}
+
+	if (!(callback instanceof Function)) {
+		throw new TypeError(callback + ' is not a function');
+	}
+
+	var
+	object = Object(this),
+	scope = arguments[1],
+	arraylike = object instanceof String ? object.split('') : object,
+	length = Math.max(Math.min(arraylike.length, 9007199254740991), 0) || 0,
+	index = -1,
+	result = [];
+
+	while (++index < length) {
+		if (index in arraylike) {
+			result[index] = callback.call(scope, arraylike[index], index, object);
+		}
+	}
+
+	return result;
+};
+
+}
+
+})
+.call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
diff --git a/core/media/system/js/polyfill.map.js b/core/media/system/js/polyfill.map.js
new file mode 100644
index 00000000..4f0a0227
--- /dev/null
+++ b/core/media/system/js/polyfill.map.js
@@ -0,0 +1 @@
+(function(a){"map"in Array.prototype||(Array.prototype.map=function(c){if(this===a||null===this)throw new TypeError(this+" is not an object");if(!(c instanceof Function))throw new TypeError(c+" is not a function");for(var d=Object(this),e=arguments[1],f=d instanceof String?d.split(""):d,g=Math.max(Math.min(f.length,9007199254740991),0)||0,h=-1,i=[];++h<g;)h in f&&(i[h]=c.call(e,f[h],h,d));return i})}).call("object"==typeof window&&window||"object"==typeof self&&self||"object"==typeof global&&global||{});
\ No newline at end of file
diff --git a/core/media/system/js/polyfill.xpath-uncompressed.js b/core/media/system/js/polyfill.xpath-uncompressed.js
new file mode 100644
index 00000000..257f9afe
--- /dev/null
+++ b/core/media/system/js/polyfill.xpath-uncompressed.js
@@ -0,0 +1,85 @@
+(function(undefined) {
+    if (!('evaluate' in Array.prototype)) {
+        (function(){'use strict';var k=this;
+            function aa(a){var b=typeof a;if("object"==b)if(a){if(a instanceof Array)return"array";if(a instanceof Object)return b;var c=Object.prototype.toString.call(a);if("[object Window]"==c)return"object";if("[object Array]"==c||"number"==typeof a.length&&"undefined"!=typeof a.splice&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("splice"))return"array";if("[object Function]"==c||"undefined"!=typeof a.call&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("call"))return"function"}else return"null";else if("function"==
+                b&&"undefined"==typeof a.call)return"object";return b}function l(a){return"string"==typeof a}function ba(a,b,c){return a.call.apply(a.bind,arguments)}function ca(a,b,c){if(!a)throw Error();if(2<arguments.length){var d=Array.prototype.slice.call(arguments,2);return function(){var c=Array.prototype.slice.call(arguments);Array.prototype.unshift.apply(c,d);return a.apply(b,c)}}return function(){return a.apply(b,arguments)}}
+            function da(a,b,c){da=Function.prototype.bind&&-1!=Function.prototype.bind.toString().indexOf("native code")?ba:ca;return da.apply(null,arguments)}function ea(a,b){var c=Array.prototype.slice.call(arguments,1);return function(){var b=c.slice();b.push.apply(b,arguments);return a.apply(this,b)}}
+            function m(a){var b=n;function c(){}c.prototype=b.prototype;a.G=b.prototype;a.prototype=new c;a.prototype.constructor=a;a.F=function(a,c,f){for(var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=arguments[h];return b.prototype[c].apply(a,g)}};/*
+
+             The MIT License
+
+             Copyright (c) 2007 Cybozu Labs, Inc.
+             Copyright (c) 2012 Google Inc.
+
+             Permission is hereby granted, free of charge, to any person obtaining a copy
+             of this software and associated documentation files (the "Software"), to
+             deal in the Software without restriction, including without limitation the
+             rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+             sell copies of the Software, and to permit persons to whom the Software is
+             furnished to do so, subject to the following conditions:
+
+             The above copyright notice and this permission notice shall be included in
+             all copies or substantial portions of the Software.
+
+             THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+             IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+             FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+             AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+             LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+             FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+             IN THE SOFTWARE.
+             */
+            var fa=String.prototype.trim?function(a){return a.trim()}:function(a){return a.replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")};function q(a,b){return-1!=a.indexOf(b)}function ga(a,b){return a<b?-1:a>b?1:0};var ha=Array.prototype.indexOf?function(a,b,c){return Array.prototype.indexOf.call(a,b,c)}:function(a,b,c){c=null==c?0:0>c?Math.max(0,a.length+c):c;if(l(a))return l(b)&&1==b.length?a.indexOf(b,c):-1;for(;c<a.length;c++)if(c in a&&a[c]===b)return c;return-1},r=Array.prototype.forEach?function(a,b,c){Array.prototype.forEach.call(a,b,c)}:function(a,b,c){for(var d=a.length,e=l(a)?a.split(""):a,f=0;f<d;f++)f in e&&b.call(c,e[f],f,a)},ia=Array.prototype.filter?function(a,b,c){return Array.prototype.filter.call(a,
+                b,c)}:function(a,b,c){for(var d=a.length,e=[],f=0,g=l(a)?a.split(""):a,h=0;h<d;h++)if(h in g){var p=g[h];b.call(c,p,h,a)&&(e[f++]=p)}return e},t=Array.prototype.reduce?function(a,b,c,d){d&&(b=da(b,d));return Array.prototype.reduce.call(a,b,c)}:function(a,b,c,d){var e=c;r(a,function(c,g){e=b.call(d,e,c,g,a)});return e},ja=Array.prototype.some?function(a,b,c){return Array.prototype.some.call(a,b,c)}:function(a,b,c){for(var d=a.length,e=l(a)?a.split(""):a,f=0;f<d;f++)if(f in e&&b.call(c,e[f],f,a))return!0;
+                return!1};function ka(a,b){a:{for(var c=a.length,d=l(a)?a.split(""):a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a)){b=e;break a}b=-1}return 0>b?null:l(a)?a.charAt(b):a[b]}function la(a){return Array.prototype.concat.apply(Array.prototype,arguments)}function ma(a,b,c){return 2>=arguments.length?Array.prototype.slice.call(a,b):Array.prototype.slice.call(a,b,c)};var u;a:{var na=k.navigator;if(na){var oa=na.userAgent;if(oa){u=oa;break a}}u=""};var pa=q(u,"Opera"),v=q(u,"Trident")||q(u,"MSIE"),qa=q(u,"Edge"),ra=q(u,"Gecko")&&!(q(u.toLowerCase(),"webkit")&&!q(u,"Edge"))&&!(q(u,"Trident")||q(u,"MSIE"))&&!q(u,"Edge"),sa=q(u.toLowerCase(),"webkit")&&!q(u,"Edge");function ta(){var a=k.document;return a?a.documentMode:void 0}var ua;
+            a:{var va="",wa=function(){var a=u;if(ra)return/rv\:([^\);]+)(\)|;)/.exec(a);if(qa)return/Edge\/([\d\.]+)/.exec(a);if(v)return/\b(?:MSIE|rv)[: ]([^\);]+)(\)|;)/.exec(a);if(sa)return/WebKit\/(\S+)/.exec(a);if(pa)return/(?:Version)[ \/]?(\S+)/.exec(a)}();wa&&(va=wa?wa[1]:"");if(v){var xa=ta();if(null!=xa&&xa>parseFloat(va)){ua=String(xa);break a}}ua=va}var ya={};
+            function za(a){if(!ya[a]){for(var b=0,c=fa(String(ua)).split("."),d=fa(String(a)).split("."),e=Math.max(c.length,d.length),f=0;0==b&&f<e;f++){var g=c[f]||"",h=d[f]||"",p=/(\d*)(\D*)/g,x=/(\d*)(\D*)/g;do{var D=p.exec(g)||["","",""],X=x.exec(h)||["","",""];if(0==D[0].length&&0==X[0].length)break;b=ga(0==D[1].length?0:parseInt(D[1],10),0==X[1].length?0:parseInt(X[1],10))||ga(0==D[2].length,0==X[2].length)||ga(D[2],X[2])}while(0==b)}ya[a]=0<=b}}
+            var Aa=k.document,Ba=Aa&&v?ta()||("CSS1Compat"==Aa.compatMode?parseInt(ua,10):5):void 0;!ra&&!v||v&&9<=Number(Ba)||ra&&za("1.9.1");v&&za("9");function Ca(a,b){if(!a||!b)return!1;if(a.contains&&1==b.nodeType)return a==b||a.contains(b);if("undefined"!=typeof a.compareDocumentPosition)return a==b||!!(a.compareDocumentPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;return b==a}
+            function Da(a,b){if(a==b)return 0;if(a.compareDocumentPosition)return a.compareDocumentPosition(b)&2?1:-1;if(v&&!(9<=Number(Ba))){if(9==a.nodeType)return-1;if(9==b.nodeType)return 1}if("sourceIndex"in a||a.parentNode&&"sourceIndex"in a.parentNode){var c=1==a.nodeType,d=1==b.nodeType;if(c&&d)return a.sourceIndex-b.sourceIndex;var e=a.parentNode,f=b.parentNode;return e==f?Ea(a,b):!c&&Ca(e,b)?-1*Fa(a,b):!d&&Ca(f,a)?Fa(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.sourceIndex:f.sourceIndex)}d=9==a.nodeType?
+                a:a.ownerDocument||a.document;c=d.createRange();c.selectNode(a);c.collapse(!0);a=d.createRange();a.selectNode(b);a.collapse(!0);return c.compareBoundaryPoints(k.Range.START_TO_END,a)}function Fa(a,b){var c=a.parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=b.parentNode;return Ea(b,a)}function Ea(a,b){for(;b=b.previousSibling;)if(b==a)return-1;return 1};var w=v&&!(9<=Number(Ba)),Ga=v&&!(8<=Number(Ba));function y(a,b,c,d){this.a=a;this.nodeName=c;this.nodeValue=d;this.nodeType=2;this.parentNode=this.ownerElement=b}function Ha(a,b){var c=Ga&&"href"==b.nodeName?a.getAttribute(b.nodeName,2):b.nodeValue;return new y(b,a,b.nodeName,c)};function z(a){var b=null,c=a.nodeType;1==c&&(b=a.textContent,b=void 0==b||null==b?a.innerText:b,b=void 0==b||null==b?"":b);if("string"!=typeof b)if(w&&"title"==a.nodeName.toLowerCase()&&1==c)b=a.text;else if(9==c||1==c){a=9==c?a.documentElement:a.firstChild;for(var c=0,d=[],b="";a;){do 1!=a.nodeType&&(b+=a.nodeValue),w&&"title"==a.nodeName.toLowerCase()&&(b+=a.text),d[c++]=a;while(a=a.firstChild);for(;c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;return""+b}
+            function A(a,b,c){if(null===b)return!0;try{if(!a.getAttribute)return!1}catch(d){return!1}Ga&&"class"==b&&(b="className");return null==c?!!a.getAttribute(b):a.getAttribute(b,2)==c}function B(a,b,c,d,e){return(w?Ia:Ja).call(null,a,b,l(c)?c:null,l(d)?d:null,e||new C)}
+            function Ia(a,b,c,d,e){if(a instanceof E||8==a.b||c&&null===a.b){var f=b.all;if(!f)return e;a=Ka(a);if("*"!=a&&(f=b.getElementsByTagName(a),!f))return e;if(c){for(var g=[],h=0;b=f[h++];)A(b,c,d)&&g.push(b);f=g}for(h=0;b=f[h++];)"*"==a&&"!"==b.tagName||F(e,b);return e}La(a,b,c,d,e);return e}
+            function Ja(a,b,c,d,e){b.getElementsByName&&d&&"name"==c&&!v?(b=b.getElementsByName(d),r(b,function(b){a.a(b)&&F(e,b)})):b.getElementsByClassName&&d&&"class"==c?(b=b.getElementsByClassName(d),r(b,function(b){b.className==d&&a.a(b)&&F(e,b)})):a instanceof G?La(a,b,c,d,e):b.getElementsByTagName&&(b=b.getElementsByTagName(a.f()),r(b,function(a){A(a,c,d)&&F(e,a)}));return e}
+            function Ma(a,b,c,d,e){var f;if((a instanceof E||8==a.b||c&&null===a.b)&&(f=b.childNodes)){var g=Ka(a);if("*"!=g&&(f=ia(f,function(a){return a.tagName&&a.tagName.toLowerCase()==g}),!f))return e;c&&(f=ia(f,function(a){return A(a,c,d)}));r(f,function(a){"*"==g&&("!"==a.tagName||"*"==g&&1!=a.nodeType)||F(e,a)});return e}return Na(a,b,c,d,e)}function Na(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)A(b,c,d)&&a.a(b)&&F(e,b);return e}
+            function La(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)A(b,c,d)&&a.a(b)&&F(e,b),La(a,b,c,d,e)}function Ka(a){if(a instanceof G){if(8==a.b)return"!";if(null===a.b)return"*"}return a.f()};function C(){this.b=this.a=null;this.l=0}function Oa(a){this.node=a;this.a=this.b=null}function Pa(a,b){if(!a.a)return b;if(!b.a)return a;var c=a.a;b=b.a;for(var d=null,e,f=0;c&&b;){e=c.node;var g=b.node;e==g||e instanceof y&&g instanceof y&&e.a==g.a?(e=c,c=c.a,b=b.a):0<Da(c.node,b.node)?(e=b,b=b.a):(e=c,c=c.a);(e.b=d)?d.a=e:a.a=e;d=e;f++}for(e=c||b;e;)e.b=d,d=d.a=e,f++,e=e.a;a.b=d;a.l=f;return a}function Qa(a,b){b=new Oa(b);b.a=a.a;a.b?a.a.b=b:a.a=a.b=b;a.a=b;a.l++}
+            function F(a,b){b=new Oa(b);b.b=a.b;a.a?a.b.a=b:a.a=a.b=b;a.b=b;a.l++}function Ra(a){return(a=a.a)?a.node:null}function Sa(a){return(a=Ra(a))?z(a):""}function H(a,b){return new Ta(a,!!b)}function Ta(a,b){this.f=a;this.b=(this.c=b)?a.b:a.a;this.a=null}function I(a){var b=a.b;if(null==b)return null;var c=a.a=b;a.b=a.c?b.b:b.a;return c.node};function n(a){this.i=a;this.b=this.g=!1;this.f=null}function J(a){return"\n  "+a.toString().split("\n").join("\n  ")}function Ua(a,b){a.g=b}function Va(a,b){a.b=b}function K(a,b){a=a.a(b);return a instanceof C?+Sa(a):+a}function L(a,b){a=a.a(b);return a instanceof C?Sa(a):""+a}function M(a,b){a=a.a(b);return a instanceof C?!!a.l:!!a};function N(a,b,c){n.call(this,a.i);this.c=a;this.h=b;this.o=c;this.g=b.g||c.g;this.b=b.b||c.b;this.c==Wa&&(c.b||c.g||4==c.i||0==c.i||!b.f?b.b||b.g||4==b.i||0==b.i||!c.f||(this.f={name:c.f.name,s:b}):this.f={name:b.f.name,s:c})}m(N);
+            function O(a,b,c,d,e){b=b.a(d);c=c.a(d);var f;if(b instanceof C&&c instanceof C){b=H(b);for(d=I(b);d;d=I(b))for(e=H(c),f=I(e);f;f=I(e))if(a(z(d),z(f)))return!0;return!1}if(b instanceof C||c instanceof C){b instanceof C?(e=b,d=c):(e=c,d=b);f=H(e);for(var g=typeof d,h=I(f);h;h=I(f)){switch(g){case "number":h=+z(h);break;case "boolean":h=!!z(h);break;case "string":h=z(h);break;default:throw Error("Illegal primitive type for comparison.");}if(e==b&&a(h,d)||e==c&&a(d,h))return!0}return!1}return e?"boolean"==
+            typeof b||"boolean"==typeof c?a(!!b,!!c):"number"==typeof b||"number"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}N.prototype.a=function(a){return this.c.m(this.h,this.o,a)};N.prototype.toString=function(){var a="Binary Expression: "+this.c,a=a+J(this.h);return a+=J(this.o)};function Xa(a,b,c,d){this.a=a;this.w=b;this.i=c;this.m=d}Xa.prototype.toString=function(){return this.a};var Ya={};
+            function P(a,b,c,d){if(Ya.hasOwnProperty(a))throw Error("Binary operator already created: "+a);a=new Xa(a,b,c,d);return Ya[a.toString()]=a}P("div",6,1,function(a,b,c){return K(a,c)/K(b,c)});P("mod",6,1,function(a,b,c){return K(a,c)%K(b,c)});P("*",6,1,function(a,b,c){return K(a,c)*K(b,c)});P("+",5,1,function(a,b,c){return K(a,c)+K(b,c)});P("-",5,1,function(a,b,c){return K(a,c)-K(b,c)});P("<",4,2,function(a,b,c){return O(function(a,b){return a<b},a,b,c)});
+            P(">",4,2,function(a,b,c){return O(function(a,b){return a>b},a,b,c)});P("<=",4,2,function(a,b,c){return O(function(a,b){return a<=b},a,b,c)});P(">=",4,2,function(a,b,c){return O(function(a,b){return a>=b},a,b,c)});var Wa=P("=",3,2,function(a,b,c){return O(function(a,b){return a==b},a,b,c,!0)});P("!=",3,2,function(a,b,c){return O(function(a,b){return a!=b},a,b,c,!0)});P("and",2,2,function(a,b,c){return M(a,c)&&M(b,c)});P("or",1,2,function(a,b,c){return M(a,c)||M(b,c)});function Q(a,b,c){this.a=a;this.b=b||1;this.f=c||1};function Za(a,b){if(b.a.length&&4!=a.i)throw Error("Primary expression must evaluate to nodeset if filter has predicate(s).");n.call(this,a.i);this.c=a;this.h=b;this.g=a.g;this.b=a.b}m(Za);Za.prototype.a=function(a){a=this.c.a(a);return $a(this.h,a)};Za.prototype.toString=function(){var a;a="Filter:"+J(this.c);return a+=J(this.h)};function ab(a,b){if(b.length<a.A)throw Error("Function "+a.j+" expects at least"+a.A+" arguments, "+b.length+" given");if(null!==a.v&&b.length>a.v)throw Error("Function "+a.j+" expects at most "+a.v+" arguments, "+b.length+" given");a.B&&r(b,function(b,d){if(4!=b.i)throw Error("Argument "+d+" to function "+a.j+" is not of type Nodeset: "+b);});n.call(this,a.i);this.h=a;this.c=b;Ua(this,a.g||ja(b,function(a){return a.g}));Va(this,a.D&&!b.length||a.C&&!!b.length||ja(b,function(a){return a.b}))}m(ab);
+            ab.prototype.a=function(a){return this.h.m.apply(null,la(a,this.c))};ab.prototype.toString=function(){var a="Function: "+this.h;if(this.c.length)var b=t(this.c,function(a,b){return a+J(b)},"Arguments:"),a=a+J(b);return a};function bb(a,b,c,d,e,f,g,h,p){this.j=a;this.i=b;this.g=c;this.D=d;this.C=e;this.m=f;this.A=g;this.v=void 0!==h?h:g;this.B=!!p}bb.prototype.toString=function(){return this.j};var cb={};
+            function R(a,b,c,d,e,f,g,h){if(cb.hasOwnProperty(a))throw Error("Function already created: "+a+".");cb[a]=new bb(a,b,c,d,!1,e,f,g,h)}R("boolean",2,!1,!1,function(a,b){return M(b,a)},1);R("ceiling",1,!1,!1,function(a,b){return Math.ceil(K(b,a))},1);R("concat",3,!1,!1,function(a,b){return t(ma(arguments,1),function(b,d){return b+L(d,a)},"")},2,null);R("contains",2,!1,!1,function(a,b,c){return q(L(b,a),L(c,a))},2);R("count",1,!1,!1,function(a,b){return b.a(a).l},1,1,!0);
+            R("false",2,!1,!1,function(){return!1},0);R("floor",1,!1,!1,function(a,b){return Math.floor(K(b,a))},1);R("id",4,!1,!1,function(a,b){function c(a){if(w){var b=e.all[a];if(b){if(b.nodeType&&a==b.id)return b;if(b.length)return ka(b,function(b){return a==b.id})}return null}return e.getElementById(a)}var d=a.a,e=9==d.nodeType?d:d.ownerDocument;a=L(b,a).split(/\s+/);var f=[];r(a,function(a){a=c(a);!a||0<=ha(f,a)||f.push(a)});f.sort(Da);var g=new C;r(f,function(a){F(g,a)});return g},1);
+            R("lang",2,!1,!1,function(){return!1},1);R("last",1,!0,!1,function(a){if(1!=arguments.length)throw Error("Function last expects ()");return a.f},0);R("local-name",3,!1,!0,function(a,b){return(a=b?Ra(b.a(a)):a.a)?a.localName||a.nodeName.toLowerCase():""},0,1,!0);R("name",3,!1,!0,function(a,b){return(a=b?Ra(b.a(a)):a.a)?a.nodeName.toLowerCase():""},0,1,!0);R("namespace-uri",3,!0,!1,function(){return""},0,1,!0);
+            R("normalize-space",3,!1,!0,function(a,b){return(b?L(b,a):z(a.a)).replace(/[\s\xa0]+/g," ").replace(/^\s+|\s+$/g,"")},0,1);R("not",2,!1,!1,function(a,b){return!M(b,a)},1);R("number",1,!1,!0,function(a,b){return b?K(b,a):+z(a.a)},0,1);R("position",1,!0,!1,function(a){return a.b},0);R("round",1,!1,!1,function(a,b){return Math.round(K(b,a))},1);R("starts-with",2,!1,!1,function(a,b,c){b=L(b,a);a=L(c,a);return 0==b.lastIndexOf(a,0)},2);R("string",3,!1,!0,function(a,b){return b?L(b,a):z(a.a)},0,1);
+            R("string-length",1,!1,!0,function(a,b){return(b?L(b,a):z(a.a)).length},0,1);R("substring",3,!1,!1,function(a,b,c,d){c=K(c,a);if(isNaN(c)||Infinity==c||-Infinity==c)return"";d=d?K(d,a):Infinity;if(isNaN(d)||-Infinity===d)return"";c=Math.round(c)-1;var e=Math.max(c,0);a=L(b,a);return Infinity==d?a.substring(e):a.substring(e,c+Math.round(d))},2,3);R("substring-after",3,!1,!1,function(a,b,c){b=L(b,a);a=L(c,a);c=b.indexOf(a);return-1==c?"":b.substring(c+a.length)},2);
+            R("substring-before",3,!1,!1,function(a,b,c){b=L(b,a);a=L(c,a);a=b.indexOf(a);return-1==a?"":b.substring(0,a)},2);R("sum",1,!1,!1,function(a,b){a=H(b.a(a));b=0;for(var c=I(a);c;c=I(a))b+=+z(c);return b},1,1,!0);R("translate",3,!1,!1,function(a,b,c,d){b=L(b,a);c=L(c,a);var e=L(d,a);a={};for(d=0;d<c.length;d++){var f=c.charAt(d);f in a||(a[f]=e.charAt(d))}c="";for(d=0;d<b.length;d++)f=b.charAt(d),c+=f in a?a[f]:f;return c},3);R("true",2,!1,!1,function(){return!0},0);function G(a,b){this.h=a;this.c=void 0!==b?b:null;this.b=null;switch(a){case "comment":this.b=8;break;case "text":this.b=3;break;case "processing-instruction":this.b=7;break;case "node":break;default:throw Error("Unexpected argument");}}function db(a){return"comment"==a||"text"==a||"processing-instruction"==a||"node"==a}G.prototype.a=function(a){return null===this.b||this.b==a.nodeType};G.prototype.f=function(){return this.h};
+            G.prototype.toString=function(){var a="Kind Test: "+this.h;null===this.c||(a+=J(this.c));return a};function eb(a){this.b=a;this.a=0}function fb(a){a=a.match(gb);for(var b=0;b<a.length;b++)hb.test(a[b])&&a.splice(b,1);return new eb(a)}var gb=/\$?(?:(?![0-9-\.])(?:\*|[\w-\.]+):)?(?![0-9-\.])(?:\*|[\w-\.]+)|\/\/|\.\.|::|\d+(?:\.\d*)?|\.\d+|"[^"]*"|'[^']*'|[!<>]=|\s+|./g,hb=/^\s/;function S(a,b){return a.b[a.a+(b||0)]}function T(a){return a.b[a.a++]}function ib(a){return a.b.length<=a.a};function jb(a){n.call(this,3);this.c=a.substring(1,a.length-1)}m(jb);jb.prototype.a=function(){return this.c};jb.prototype.toString=function(){return"Literal: "+this.c};function E(a,b){this.j=a.toLowerCase();a="*"==this.j?"*":"http://www.w3.org/1999/xhtml";this.c=b?b.toLowerCase():a}E.prototype.a=function(a){var b=a.nodeType;if(1!=b&&2!=b)return!1;b=void 0!==a.localName?a.localName:a.nodeName;return"*"!=this.j&&this.j!=b.toLowerCase()?!1:"*"==this.c?!0:this.c==(a.namespaceURI?a.namespaceURI.toLowerCase():"http://www.w3.org/1999/xhtml")};E.prototype.f=function(){return this.j};
+            E.prototype.toString=function(){return"Name Test: "+("http://www.w3.org/1999/xhtml"==this.c?"":this.c+":")+this.j};function kb(a){n.call(this,1);this.c=a}m(kb);kb.prototype.a=function(){return this.c};kb.prototype.toString=function(){return"Number: "+this.c};function lb(a,b){n.call(this,a.i);this.h=a;this.c=b;this.g=a.g;this.b=a.b;1==this.c.length&&(a=this.c[0],a.u||a.c!=mb||(a=a.o,"*"!=a.f()&&(this.f={name:a.f(),s:null})))}m(lb);function nb(){n.call(this,4)}m(nb);nb.prototype.a=function(a){var b=new C;a=a.a;9==a.nodeType?F(b,a):F(b,a.ownerDocument);return b};nb.prototype.toString=function(){return"Root Helper Expression"};function ob(){n.call(this,4)}m(ob);ob.prototype.a=function(a){var b=new C;F(b,a.a);return b};ob.prototype.toString=function(){return"Context Helper Expression"};
+            function pb(a){return"/"==a||"//"==a}lb.prototype.a=function(a){var b=this.h.a(a);if(!(b instanceof C))throw Error("Filter expression must evaluate to nodeset.");a=this.c;for(var c=0,d=a.length;c<d&&b.l;c++){var e=a[c],f=H(b,e.c.a),g;if(e.g||e.c!=qb)if(e.g||e.c!=rb)for(g=I(f),b=e.a(new Q(g));null!=(g=I(f));)g=e.a(new Q(g)),b=Pa(b,g);else g=I(f),b=e.a(new Q(g));else{for(g=I(f);(b=I(f))&&(!g.contains||g.contains(b))&&b.compareDocumentPosition(g)&8;g=b);b=e.a(new Q(g))}}return b};
+            lb.prototype.toString=function(){var a;a="Path Expression:"+J(this.h);if(this.c.length){var b=t(this.c,function(a,b){return a+J(b)},"Steps:");a+=J(b)}return a};function sb(a,b){this.a=a;this.b=!!b}
+            function $a(a,b,c){for(c=c||0;c<a.a.length;c++)for(var d=a.a[c],e=H(b),f=b.l,g,h=0;g=I(e);h++){var p=a.b?f-h:h+1;g=d.a(new Q(g,p,f));if("number"==typeof g)p=p==g;else if("string"==typeof g||"boolean"==typeof g)p=!!g;else if(g instanceof C)p=0<g.l;else throw Error("Predicate.evaluate returned an unexpected type.");if(!p){p=e;g=p.f;var x=p.a;if(!x)throw Error("Next must be called at least once before remove.");var D=x.b,x=x.a;D?D.a=x:g.a=x;x?x.b=D:g.b=D;g.l--;p.a=null}}return b}
+            sb.prototype.toString=function(){return t(this.a,function(a,b){return a+J(b)},"Predicates:")};function U(a,b,c,d){n.call(this,4);this.c=a;this.o=b;this.h=c||new sb([]);this.u=!!d;b=this.h;b=0<b.a.length?b.a[0].f:null;a.b&&b&&(a=b.name,a=w?a.toLowerCase():a,this.f={name:a,s:b.s});a:{a=this.h;for(b=0;b<a.a.length;b++)if(c=a.a[b],c.g||1==c.i||0==c.i){a=!0;break a}a=!1}this.g=a}m(U);
+            U.prototype.a=function(a){var b=a.a,c=this.f,d=null,e=null,f=0;c&&(d=c.name,e=c.s?L(c.s,a):null,f=1);if(this.u)if(this.g||this.c!=tb)if(b=H((new U(ub,new G("node"))).a(a)),c=I(b))for(a=this.m(c,d,e,f);null!=(c=I(b));)a=Pa(a,this.m(c,d,e,f));else a=new C;else a=B(this.o,b,d,e),a=$a(this.h,a,f);else a=this.m(a.a,d,e,f);return a};U.prototype.m=function(a,b,c,d){a=this.c.f(this.o,a,b,c);return a=$a(this.h,a,d)};
+            U.prototype.toString=function(){var a;a="Step:"+J("Operator: "+(this.u?"//":"/"));this.c.j&&(a+=J("Axis: "+this.c));a+=J(this.o);if(this.h.a.length){var b=t(this.h.a,function(a,b){return a+J(b)},"Predicates:");a+=J(b)}return a};function vb(a,b,c,d){this.j=a;this.f=b;this.a=c;this.b=d}vb.prototype.toString=function(){return this.j};var wb={};function V(a,b,c,d){if(wb.hasOwnProperty(a))throw Error("Axis already created: "+a);b=new vb(a,b,c,!!d);return wb[a]=b}
+            V("ancestor",function(a,b){for(var c=new C;b=b.parentNode;)a.a(b)&&Qa(c,b);return c},!0);V("ancestor-or-self",function(a,b){var c=new C;do a.a(b)&&Qa(c,b);while(b=b.parentNode);return c},!0);
+            var mb=V("attribute",function(a,b){var c=new C,d=a.f();if("style"==d&&w&&b.style)return F(c,new y(b.style,b,"style",b.style.cssText)),c;var e=b.attributes;if(e)if(a instanceof G&&null===a.b||"*"==d)for(a=0;d=e[a];a++)w?d.nodeValue&&F(c,Ha(b,d)):F(c,d);else(d=e.getNamedItem(d))&&(w?d.nodeValue&&F(c,Ha(b,d)):F(c,d));return c},!1),tb=V("child",function(a,b,c,d,e){return(w?Ma:Na).call(null,a,b,l(c)?c:null,l(d)?d:null,e||new C)},!1,!0);V("descendant",B,!1,!0);
+            var ub=V("descendant-or-self",function(a,b,c,d){var e=new C;A(b,c,d)&&a.a(b)&&F(e,b);return B(a,b,c,d,e)},!1,!0),qb=V("following",function(a,b,c,d){var e=new C;do for(var f=b;f=f.nextSibling;)A(f,c,d)&&a.a(f)&&F(e,f),e=B(a,f,c,d,e);while(b=b.parentNode);return e},!1,!0);V("following-sibling",function(a,b){for(var c=new C;b=b.nextSibling;)a.a(b)&&F(c,b);return c},!1);V("namespace",function(){return new C},!1);
+            var xb=V("parent",function(a,b){var c=new C;if(9==b.nodeType)return c;if(2==b.nodeType)return F(c,b.ownerElement),c;b=b.parentNode;a.a(b)&&F(c,b);return c},!1),rb=V("preceding",function(a,b,c,d){var e=new C,f=[];do f.unshift(b);while(b=b.parentNode);for(var g=1,h=f.length;g<h;g++){var p=[];for(b=f[g];b=b.previousSibling;)p.unshift(b);for(var x=0,D=p.length;x<D;x++)b=p[x],A(b,c,d)&&a.a(b)&&F(e,b),e=B(a,b,c,d,e)}return e},!0,!0);
+            V("preceding-sibling",function(a,b){for(var c=new C;b=b.previousSibling;)a.a(b)&&Qa(c,b);return c},!0);var yb=V("self",function(a,b){var c=new C;a.a(b)&&F(c,b);return c},!1);function zb(a){n.call(this,1);this.c=a;this.g=a.g;this.b=a.b}m(zb);zb.prototype.a=function(a){return-K(this.c,a)};zb.prototype.toString=function(){return"Unary Expression: -"+J(this.c)};function Ab(a){n.call(this,4);this.c=a;Ua(this,ja(this.c,function(a){return a.g}));Va(this,ja(this.c,function(a){return a.b}))}m(Ab);Ab.prototype.a=function(a){var b=new C;r(this.c,function(c){c=c.a(a);if(!(c instanceof C))throw Error("Path expression must evaluate to NodeSet.");b=Pa(b,c)});return b};Ab.prototype.toString=function(){return t(this.c,function(a,b){return a+J(b)},"Union Expression:")};function Bb(a,b){this.a=a;this.b=b}function Cb(a){for(var b,c=[];;){W(a,"Missing right hand side of binary expression.");b=Db(a);var d=T(a.a);if(!d)break;var e=(d=Ya[d]||null)&&d.w;if(!e){a.a.a--;break}for(;c.length&&e<=c[c.length-1].w;)b=new N(c.pop(),c.pop(),b);c.push(b,d)}for(;c.length;)b=new N(c.pop(),c.pop(),b);return b}function W(a,b){if(ib(a.a))throw Error(b);}function Eb(a,b){a=T(a.a);if(a!=b)throw Error("Bad token, expected: "+b+" got: "+a);}
+            function Fb(a){a=T(a.a);if(")"!=a)throw Error("Bad token: "+a);}function Gb(a){a=T(a.a);if(2>a.length)throw Error("Unclosed literal string");return new jb(a)}
+            function Hb(a){var b,c=[],d;if(pb(S(a.a))){b=T(a.a);d=S(a.a);if("/"==b&&(ib(a.a)||"."!=d&&".."!=d&&"@"!=d&&"*"!=d&&!/(?![0-9])[\w]/.test(d)))return new nb;d=new nb;W(a,"Missing next location step.");b=Ib(a,b);c.push(b)}else{a:{b=S(a.a);d=b.charAt(0);switch(d){case "$":throw Error("Variable reference not allowed in HTML XPath");case "(":T(a.a);b=Cb(a);W(a,'unclosed "("');Eb(a,")");break;case '"':case "'":b=Gb(a);break;default:if(isNaN(+b))if(!db(b)&&/(?![0-9])[\w]/.test(d)&&"("==S(a.a,1)){b=T(a.a);
+                b=cb[b]||null;T(a.a);for(d=[];")"!=S(a.a);){W(a,"Missing function argument list.");d.push(Cb(a));if(","!=S(a.a))break;T(a.a)}W(a,"Unclosed function argument list.");Fb(a);b=new ab(b,d)}else{b=null;break a}else b=new kb(+T(a.a))}"["==S(a.a)&&(d=new sb(Jb(a)),b=new Za(b,d))}if(b)if(pb(S(a.a)))d=b;else return b;else b=Ib(a,"/"),d=new ob,c.push(b)}for(;pb(S(a.a));)b=T(a.a),W(a,"Missing next location step."),b=Ib(a,b),c.push(b);return new lb(d,c)}
+            function Ib(a,b){var c,d;if("/"!=b&&"//"!=b)throw Error('Step op should be "/" or "//"');if("."==S(a.a))return d=new U(yb,new G("node")),T(a.a),d;if(".."==S(a.a))return d=new U(xb,new G("node")),T(a.a),d;var e;if("@"==S(a.a))e=mb,T(a.a),W(a,"Missing attribute name");else if("::"==S(a.a,1)){if(!/(?![0-9])[\w]/.test(S(a.a).charAt(0)))throw Error("Bad token: "+T(a.a));c=T(a.a);e=wb[c]||null;if(!e)throw Error("No axis with name: "+c);T(a.a);W(a,"Missing node name")}else e=tb;c=S(a.a);if(/(?![0-9])[\w\*]/.test(c.charAt(0)))if("("==
+                S(a.a,1)){if(!db(c))throw Error("Invalid node type: "+c);c=T(a.a);if(!db(c))throw Error("Invalid type name: "+c);Eb(a,"(");W(a,"Bad nodetype");var f=S(a.a).charAt(0),g=null;if('"'==f||"'"==f)g=Gb(a);W(a,"Bad nodetype");Fb(a);c=new G(c,g)}else if(c=T(a.a),f=c.indexOf(":"),-1==f)c=new E(c);else{var g=c.substring(0,f),h;if("*"==g)h="*";else if(h=a.b(g),!h)throw Error("Namespace prefix not declared: "+g);c=c.substr(f+1);c=new E(c,h)}else throw Error("Bad token: "+T(a.a));a=new sb(Jb(a),e.a);return d||
+                new U(e,c,a,"//"==b)}function Jb(a){for(var b=[];"["==S(a.a);){T(a.a);W(a,"Missing predicate expression.");var c=Cb(a);b.push(c);W(a,"Unclosed predicate expression.");Eb(a,"]")}return b}function Db(a){if("-"==S(a.a))return T(a.a),new zb(Db(a));var b=Hb(a);if("|"!=S(a.a))a=b;else{for(b=[b];"|"==T(a.a);)W(a,"Missing next union location path."),b.push(Hb(a));a.a.a--;a=new Ab(b)}return a};function Kb(a){switch(a.nodeType){case 1:return ea(Lb,a);case 9:return Kb(a.documentElement);case 11:case 10:case 6:case 12:return Mb;default:return a.parentNode?Kb(a.parentNode):Mb}}function Mb(){return null}function Lb(a,b){if(a.prefix==b)return a.namespaceURI||"http://www.w3.org/1999/xhtml";var c=a.getAttributeNode("xmlns:"+b);return c&&c.specified?c.value||null:a.parentNode&&9!=a.parentNode.nodeType?Lb(a.parentNode,b):null};function Nb(a,b){if(!a.length)throw Error("Empty XPath expression.");a=fb(a);if(ib(a))throw Error("Invalid XPath expression.");b?"function"==aa(b)||(b=da(b.lookupNamespaceURI,b)):b=function(){return null};var c=Cb(new Bb(a,b));if(!ib(a))throw Error("Bad token: "+T(a));this.evaluate=function(a,b){a=c.a(new Q(a));return new Y(a,b)}}
+            function Y(a,b){if(0==b)if(a instanceof C)b=4;else if("string"==typeof a)b=2;else if("number"==typeof a)b=1;else if("boolean"==typeof a)b=3;else throw Error("Unexpected evaluation result.");if(2!=b&&1!=b&&3!=b&&!(a instanceof C))throw Error("value could not be converted to the specified type");this.resultType=b;var c;switch(b){case 2:this.stringValue=a instanceof C?Sa(a):""+a;break;case 1:this.numberValue=a instanceof C?+Sa(a):+a;break;case 3:this.booleanValue=a instanceof C?0<a.l:!!a;break;case 4:case 5:case 6:case 7:var d=
+                H(a);c=[];for(var e=I(d);e;e=I(d))c.push(e instanceof y?e.a:e);this.snapshotLength=a.l;this.invalidIteratorState=!1;break;case 8:case 9:a=Ra(a);this.singleNodeValue=a instanceof y?a.a:a;break;default:throw Error("Unknown XPathResult type.");}var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw Error("iterateNext called with wrong result type");return f>=c.length?null:c[f++]};this.snapshotItem=function(a){if(6!=b&&7!=b)throw Error("snapshotItem called with wrong result type");return a>=c.length||
+            0>a?null:c[a]}}Y.ANY_TYPE=0;Y.NUMBER_TYPE=1;Y.STRING_TYPE=2;Y.BOOLEAN_TYPE=3;Y.UNORDERED_NODE_ITERATOR_TYPE=4;Y.ORDERED_NODE_ITERATOR_TYPE=5;Y.UNORDERED_NODE_SNAPSHOT_TYPE=6;Y.ORDERED_NODE_SNAPSHOT_TYPE=7;Y.ANY_UNORDERED_NODE_TYPE=8;Y.FIRST_ORDERED_NODE_TYPE=9;function Ob(a){this.lookupNamespaceURI=Kb(a)}
+            function Pb(a,b){a=a||k;var c=a.Document&&a.Document.prototype||a.document;if(!c.evaluate||b)a.XPathResult=Y,c.evaluate=function(a,b,c,g){return(new Nb(a,c)).evaluate(b,g)},c.createExpression=function(a,b){return new Nb(a,b)},c.createNSResolver=function(a){return new Ob(a)}}var Qb=["wgxpath","install"],Z=k;Qb[0]in Z||!Z.execScript||Z.execScript("var "+Qb[0]);for(var Rb;Qb.length&&(Rb=Qb.shift());)Qb.length||void 0===Pb?Z[Rb]?Z=Z[Rb]:Z=Z[Rb]={}:Z[Rb]=Pb;}).call(this)
+    }
+
+    setTimeout(function(){wgxpath.install()}, 100);
+})
+    .call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
+
diff --git a/core/media/system/js/polyfill.xpath.js b/core/media/system/js/polyfill.xpath.js
new file mode 100644
index 00000000..191014a6
--- /dev/null
+++ b/core/media/system/js/polyfill.xpath.js
@@ -0,0 +1,85 @@
+(function(undefined) {
+    if (!('evaluate' in Array.prototype)) {
+(function(){'use strict';var k=this;
+    function aa(a){var b=typeof a;if("object"==b)if(a){if(a instanceof Array)return"array";if(a instanceof Object)return b;var c=Object.prototype.toString.call(a);if("[object Window]"==c)return"object";if("[object Array]"==c||"number"==typeof a.length&&"undefined"!=typeof a.splice&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("splice"))return"array";if("[object Function]"==c||"undefined"!=typeof a.call&&"undefined"!=typeof a.propertyIsEnumerable&&!a.propertyIsEnumerable("call"))return"function"}else return"null";else if("function"==
+        b&&"undefined"==typeof a.call)return"object";return b}function l(a){return"string"==typeof a}function ba(a,b,c){return a.call.apply(a.bind,arguments)}function ca(a,b,c){if(!a)throw Error();if(2<arguments.length){var d=Array.prototype.slice.call(arguments,2);return function(){var c=Array.prototype.slice.call(arguments);Array.prototype.unshift.apply(c,d);return a.apply(b,c)}}return function(){return a.apply(b,arguments)}}
+    function da(a,b,c){da=Function.prototype.bind&&-1!=Function.prototype.bind.toString().indexOf("native code")?ba:ca;return da.apply(null,arguments)}function ea(a,b){var c=Array.prototype.slice.call(arguments,1);return function(){var b=c.slice();b.push.apply(b,arguments);return a.apply(this,b)}}
+    function m(a){var b=n;function c(){}c.prototype=b.prototype;a.G=b.prototype;a.prototype=new c;a.prototype.constructor=a;a.F=function(a,c,f){for(var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=arguments[h];return b.prototype[c].apply(a,g)}};/*
+
+     The MIT License
+
+     Copyright (c) 2007 Cybozu Labs, Inc.
+     Copyright (c) 2012 Google Inc.
+
+     Permission is hereby granted, free of charge, to any person obtaining a copy
+     of this software and associated documentation files (the "Software"), to
+     deal in the Software without restriction, including without limitation the
+     rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+     sell copies of the Software, and to permit persons to whom the Software is
+     furnished to do so, subject to the following conditions:
+
+     The above copyright notice and this permission notice shall be included in
+     all copies or substantial portions of the Software.
+
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+     IN THE SOFTWARE.
+     */
+    var fa=String.prototype.trim?function(a){return a.trim()}:function(a){return a.replace(/^[\s\xa0]+|[\s\xa0]+$/g,"")};function q(a,b){return-1!=a.indexOf(b)}function ga(a,b){return a<b?-1:a>b?1:0};var ha=Array.prototype.indexOf?function(a,b,c){return Array.prototype.indexOf.call(a,b,c)}:function(a,b,c){c=null==c?0:0>c?Math.max(0,a.length+c):c;if(l(a))return l(b)&&1==b.length?a.indexOf(b,c):-1;for(;c<a.length;c++)if(c in a&&a[c]===b)return c;return-1},r=Array.prototype.forEach?function(a,b,c){Array.prototype.forEach.call(a,b,c)}:function(a,b,c){for(var d=a.length,e=l(a)?a.split(""):a,f=0;f<d;f++)f in e&&b.call(c,e[f],f,a)},ia=Array.prototype.filter?function(a,b,c){return Array.prototype.filter.call(a,
+        b,c)}:function(a,b,c){for(var d=a.length,e=[],f=0,g=l(a)?a.split(""):a,h=0;h<d;h++)if(h in g){var p=g[h];b.call(c,p,h,a)&&(e[f++]=p)}return e},t=Array.prototype.reduce?function(a,b,c,d){d&&(b=da(b,d));return Array.prototype.reduce.call(a,b,c)}:function(a,b,c,d){var e=c;r(a,function(c,g){e=b.call(d,e,c,g,a)});return e},ja=Array.prototype.some?function(a,b,c){return Array.prototype.some.call(a,b,c)}:function(a,b,c){for(var d=a.length,e=l(a)?a.split(""):a,f=0;f<d;f++)if(f in e&&b.call(c,e[f],f,a))return!0;
+        return!1};function ka(a,b){a:{for(var c=a.length,d=l(a)?a.split(""):a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a)){b=e;break a}b=-1}return 0>b?null:l(a)?a.charAt(b):a[b]}function la(a){return Array.prototype.concat.apply(Array.prototype,arguments)}function ma(a,b,c){return 2>=arguments.length?Array.prototype.slice.call(a,b):Array.prototype.slice.call(a,b,c)};var u;a:{var na=k.navigator;if(na){var oa=na.userAgent;if(oa){u=oa;break a}}u=""};var pa=q(u,"Opera"),v=q(u,"Trident")||q(u,"MSIE"),qa=q(u,"Edge"),ra=q(u,"Gecko")&&!(q(u.toLowerCase(),"webkit")&&!q(u,"Edge"))&&!(q(u,"Trident")||q(u,"MSIE"))&&!q(u,"Edge"),sa=q(u.toLowerCase(),"webkit")&&!q(u,"Edge");function ta(){var a=k.document;return a?a.documentMode:void 0}var ua;
+    a:{var va="",wa=function(){var a=u;if(ra)return/rv\:([^\);]+)(\)|;)/.exec(a);if(qa)return/Edge\/([\d\.]+)/.exec(a);if(v)return/\b(?:MSIE|rv)[: ]([^\);]+)(\)|;)/.exec(a);if(sa)return/WebKit\/(\S+)/.exec(a);if(pa)return/(?:Version)[ \/]?(\S+)/.exec(a)}();wa&&(va=wa?wa[1]:"");if(v){var xa=ta();if(null!=xa&&xa>parseFloat(va)){ua=String(xa);break a}}ua=va}var ya={};
+    function za(a){if(!ya[a]){for(var b=0,c=fa(String(ua)).split("."),d=fa(String(a)).split("."),e=Math.max(c.length,d.length),f=0;0==b&&f<e;f++){var g=c[f]||"",h=d[f]||"",p=/(\d*)(\D*)/g,x=/(\d*)(\D*)/g;do{var D=p.exec(g)||["","",""],X=x.exec(h)||["","",""];if(0==D[0].length&&0==X[0].length)break;b=ga(0==D[1].length?0:parseInt(D[1],10),0==X[1].length?0:parseInt(X[1],10))||ga(0==D[2].length,0==X[2].length)||ga(D[2],X[2])}while(0==b)}ya[a]=0<=b}}
+    var Aa=k.document,Ba=Aa&&v?ta()||("CSS1Compat"==Aa.compatMode?parseInt(ua,10):5):void 0;!ra&&!v||v&&9<=Number(Ba)||ra&&za("1.9.1");v&&za("9");function Ca(a,b){if(!a||!b)return!1;if(a.contains&&1==b.nodeType)return a==b||a.contains(b);if("undefined"!=typeof a.compareDocumentPosition)return a==b||!!(a.compareDocumentPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;return b==a}
+    function Da(a,b){if(a==b)return 0;if(a.compareDocumentPosition)return a.compareDocumentPosition(b)&2?1:-1;if(v&&!(9<=Number(Ba))){if(9==a.nodeType)return-1;if(9==b.nodeType)return 1}if("sourceIndex"in a||a.parentNode&&"sourceIndex"in a.parentNode){var c=1==a.nodeType,d=1==b.nodeType;if(c&&d)return a.sourceIndex-b.sourceIndex;var e=a.parentNode,f=b.parentNode;return e==f?Ea(a,b):!c&&Ca(e,b)?-1*Fa(a,b):!d&&Ca(f,a)?Fa(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.sourceIndex:f.sourceIndex)}d=9==a.nodeType?
+        a:a.ownerDocument||a.document;c=d.createRange();c.selectNode(a);c.collapse(!0);a=d.createRange();a.selectNode(b);a.collapse(!0);return c.compareBoundaryPoints(k.Range.START_TO_END,a)}function Fa(a,b){var c=a.parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=b.parentNode;return Ea(b,a)}function Ea(a,b){for(;b=b.previousSibling;)if(b==a)return-1;return 1};var w=v&&!(9<=Number(Ba)),Ga=v&&!(8<=Number(Ba));function y(a,b,c,d){this.a=a;this.nodeName=c;this.nodeValue=d;this.nodeType=2;this.parentNode=this.ownerElement=b}function Ha(a,b){var c=Ga&&"href"==b.nodeName?a.getAttribute(b.nodeName,2):b.nodeValue;return new y(b,a,b.nodeName,c)};function z(a){var b=null,c=a.nodeType;1==c&&(b=a.textContent,b=void 0==b||null==b?a.innerText:b,b=void 0==b||null==b?"":b);if("string"!=typeof b)if(w&&"title"==a.nodeName.toLowerCase()&&1==c)b=a.text;else if(9==c||1==c){a=9==c?a.documentElement:a.firstChild;for(var c=0,d=[],b="";a;){do 1!=a.nodeType&&(b+=a.nodeValue),w&&"title"==a.nodeName.toLowerCase()&&(b+=a.text),d[c++]=a;while(a=a.firstChild);for(;c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;return""+b}
+    function A(a,b,c){if(null===b)return!0;try{if(!a.getAttribute)return!1}catch(d){return!1}Ga&&"class"==b&&(b="className");return null==c?!!a.getAttribute(b):a.getAttribute(b,2)==c}function B(a,b,c,d,e){return(w?Ia:Ja).call(null,a,b,l(c)?c:null,l(d)?d:null,e||new C)}
+    function Ia(a,b,c,d,e){if(a instanceof E||8==a.b||c&&null===a.b){var f=b.all;if(!f)return e;a=Ka(a);if("*"!=a&&(f=b.getElementsByTagName(a),!f))return e;if(c){for(var g=[],h=0;b=f[h++];)A(b,c,d)&&g.push(b);f=g}for(h=0;b=f[h++];)"*"==a&&"!"==b.tagName||F(e,b);return e}La(a,b,c,d,e);return e}
+    function Ja(a,b,c,d,e){b.getElementsByName&&d&&"name"==c&&!v?(b=b.getElementsByName(d),r(b,function(b){a.a(b)&&F(e,b)})):b.getElementsByClassName&&d&&"class"==c?(b=b.getElementsByClassName(d),r(b,function(b){b.className==d&&a.a(b)&&F(e,b)})):a instanceof G?La(a,b,c,d,e):b.getElementsByTagName&&(b=b.getElementsByTagName(a.f()),r(b,function(a){A(a,c,d)&&F(e,a)}));return e}
+    function Ma(a,b,c,d,e){var f;if((a instanceof E||8==a.b||c&&null===a.b)&&(f=b.childNodes)){var g=Ka(a);if("*"!=g&&(f=ia(f,function(a){return a.tagName&&a.tagName.toLowerCase()==g}),!f))return e;c&&(f=ia(f,function(a){return A(a,c,d)}));r(f,function(a){"*"==g&&("!"==a.tagName||"*"==g&&1!=a.nodeType)||F(e,a)});return e}return Na(a,b,c,d,e)}function Na(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)A(b,c,d)&&a.a(b)&&F(e,b);return e}
+    function La(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)A(b,c,d)&&a.a(b)&&F(e,b),La(a,b,c,d,e)}function Ka(a){if(a instanceof G){if(8==a.b)return"!";if(null===a.b)return"*"}return a.f()};function C(){this.b=this.a=null;this.l=0}function Oa(a){this.node=a;this.a=this.b=null}function Pa(a,b){if(!a.a)return b;if(!b.a)return a;var c=a.a;b=b.a;for(var d=null,e,f=0;c&&b;){e=c.node;var g=b.node;e==g||e instanceof y&&g instanceof y&&e.a==g.a?(e=c,c=c.a,b=b.a):0<Da(c.node,b.node)?(e=b,b=b.a):(e=c,c=c.a);(e.b=d)?d.a=e:a.a=e;d=e;f++}for(e=c||b;e;)e.b=d,d=d.a=e,f++,e=e.a;a.b=d;a.l=f;return a}function Qa(a,b){b=new Oa(b);b.a=a.a;a.b?a.a.b=b:a.a=a.b=b;a.a=b;a.l++}
+    function F(a,b){b=new Oa(b);b.b=a.b;a.a?a.b.a=b:a.a=a.b=b;a.b=b;a.l++}function Ra(a){return(a=a.a)?a.node:null}function Sa(a){return(a=Ra(a))?z(a):""}function H(a,b){return new Ta(a,!!b)}function Ta(a,b){this.f=a;this.b=(this.c=b)?a.b:a.a;this.a=null}function I(a){var b=a.b;if(null==b)return null;var c=a.a=b;a.b=a.c?b.b:b.a;return c.node};function n(a){this.i=a;this.b=this.g=!1;this.f=null}function J(a){return"\n  "+a.toString().split("\n").join("\n  ")}function Ua(a,b){a.g=b}function Va(a,b){a.b=b}function K(a,b){a=a.a(b);return a instanceof C?+Sa(a):+a}function L(a,b){a=a.a(b);return a instanceof C?Sa(a):""+a}function M(a,b){a=a.a(b);return a instanceof C?!!a.l:!!a};function N(a,b,c){n.call(this,a.i);this.c=a;this.h=b;this.o=c;this.g=b.g||c.g;this.b=b.b||c.b;this.c==Wa&&(c.b||c.g||4==c.i||0==c.i||!b.f?b.b||b.g||4==b.i||0==b.i||!c.f||(this.f={name:c.f.name,s:b}):this.f={name:b.f.name,s:c})}m(N);
+    function O(a,b,c,d,e){b=b.a(d);c=c.a(d);var f;if(b instanceof C&&c instanceof C){b=H(b);for(d=I(b);d;d=I(b))for(e=H(c),f=I(e);f;f=I(e))if(a(z(d),z(f)))return!0;return!1}if(b instanceof C||c instanceof C){b instanceof C?(e=b,d=c):(e=c,d=b);f=H(e);for(var g=typeof d,h=I(f);h;h=I(f)){switch(g){case "number":h=+z(h);break;case "boolean":h=!!z(h);break;case "string":h=z(h);break;default:throw Error("Illegal primitive type for comparison.");}if(e==b&&a(h,d)||e==c&&a(d,h))return!0}return!1}return e?"boolean"==
+    typeof b||"boolean"==typeof c?a(!!b,!!c):"number"==typeof b||"number"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}N.prototype.a=function(a){return this.c.m(this.h,this.o,a)};N.prototype.toString=function(){var a="Binary Expression: "+this.c,a=a+J(this.h);return a+=J(this.o)};function Xa(a,b,c,d){this.a=a;this.w=b;this.i=c;this.m=d}Xa.prototype.toString=function(){return this.a};var Ya={};
+    function P(a,b,c,d){if(Ya.hasOwnProperty(a))throw Error("Binary operator already created: "+a);a=new Xa(a,b,c,d);return Ya[a.toString()]=a}P("div",6,1,function(a,b,c){return K(a,c)/K(b,c)});P("mod",6,1,function(a,b,c){return K(a,c)%K(b,c)});P("*",6,1,function(a,b,c){return K(a,c)*K(b,c)});P("+",5,1,function(a,b,c){return K(a,c)+K(b,c)});P("-",5,1,function(a,b,c){return K(a,c)-K(b,c)});P("<",4,2,function(a,b,c){return O(function(a,b){return a<b},a,b,c)});
+    P(">",4,2,function(a,b,c){return O(function(a,b){return a>b},a,b,c)});P("<=",4,2,function(a,b,c){return O(function(a,b){return a<=b},a,b,c)});P(">=",4,2,function(a,b,c){return O(function(a,b){return a>=b},a,b,c)});var Wa=P("=",3,2,function(a,b,c){return O(function(a,b){return a==b},a,b,c,!0)});P("!=",3,2,function(a,b,c){return O(function(a,b){return a!=b},a,b,c,!0)});P("and",2,2,function(a,b,c){return M(a,c)&&M(b,c)});P("or",1,2,function(a,b,c){return M(a,c)||M(b,c)});function Q(a,b,c){this.a=a;this.b=b||1;this.f=c||1};function Za(a,b){if(b.a.length&&4!=a.i)throw Error("Primary expression must evaluate to nodeset if filter has predicate(s).");n.call(this,a.i);this.c=a;this.h=b;this.g=a.g;this.b=a.b}m(Za);Za.prototype.a=function(a){a=this.c.a(a);return $a(this.h,a)};Za.prototype.toString=function(){var a;a="Filter:"+J(this.c);return a+=J(this.h)};function ab(a,b){if(b.length<a.A)throw Error("Function "+a.j+" expects at least"+a.A+" arguments, "+b.length+" given");if(null!==a.v&&b.length>a.v)throw Error("Function "+a.j+" expects at most "+a.v+" arguments, "+b.length+" given");a.B&&r(b,function(b,d){if(4!=b.i)throw Error("Argument "+d+" to function "+a.j+" is not of type Nodeset: "+b);});n.call(this,a.i);this.h=a;this.c=b;Ua(this,a.g||ja(b,function(a){return a.g}));Va(this,a.D&&!b.length||a.C&&!!b.length||ja(b,function(a){return a.b}))}m(ab);
+    ab.prototype.a=function(a){return this.h.m.apply(null,la(a,this.c))};ab.prototype.toString=function(){var a="Function: "+this.h;if(this.c.length)var b=t(this.c,function(a,b){return a+J(b)},"Arguments:"),a=a+J(b);return a};function bb(a,b,c,d,e,f,g,h,p){this.j=a;this.i=b;this.g=c;this.D=d;this.C=e;this.m=f;this.A=g;this.v=void 0!==h?h:g;this.B=!!p}bb.prototype.toString=function(){return this.j};var cb={};
+    function R(a,b,c,d,e,f,g,h){if(cb.hasOwnProperty(a))throw Error("Function already created: "+a+".");cb[a]=new bb(a,b,c,d,!1,e,f,g,h)}R("boolean",2,!1,!1,function(a,b){return M(b,a)},1);R("ceiling",1,!1,!1,function(a,b){return Math.ceil(K(b,a))},1);R("concat",3,!1,!1,function(a,b){return t(ma(arguments,1),function(b,d){return b+L(d,a)},"")},2,null);R("contains",2,!1,!1,function(a,b,c){return q(L(b,a),L(c,a))},2);R("count",1,!1,!1,function(a,b){return b.a(a).l},1,1,!0);
+    R("false",2,!1,!1,function(){return!1},0);R("floor",1,!1,!1,function(a,b){return Math.floor(K(b,a))},1);R("id",4,!1,!1,function(a,b){function c(a){if(w){var b=e.all[a];if(b){if(b.nodeType&&a==b.id)return b;if(b.length)return ka(b,function(b){return a==b.id})}return null}return e.getElementById(a)}var d=a.a,e=9==d.nodeType?d:d.ownerDocument;a=L(b,a).split(/\s+/);var f=[];r(a,function(a){a=c(a);!a||0<=ha(f,a)||f.push(a)});f.sort(Da);var g=new C;r(f,function(a){F(g,a)});return g},1);
+    R("lang",2,!1,!1,function(){return!1},1);R("last",1,!0,!1,function(a){if(1!=arguments.length)throw Error("Function last expects ()");return a.f},0);R("local-name",3,!1,!0,function(a,b){return(a=b?Ra(b.a(a)):a.a)?a.localName||a.nodeName.toLowerCase():""},0,1,!0);R("name",3,!1,!0,function(a,b){return(a=b?Ra(b.a(a)):a.a)?a.nodeName.toLowerCase():""},0,1,!0);R("namespace-uri",3,!0,!1,function(){return""},0,1,!0);
+    R("normalize-space",3,!1,!0,function(a,b){return(b?L(b,a):z(a.a)).replace(/[\s\xa0]+/g," ").replace(/^\s+|\s+$/g,"")},0,1);R("not",2,!1,!1,function(a,b){return!M(b,a)},1);R("number",1,!1,!0,function(a,b){return b?K(b,a):+z(a.a)},0,1);R("position",1,!0,!1,function(a){return a.b},0);R("round",1,!1,!1,function(a,b){return Math.round(K(b,a))},1);R("starts-with",2,!1,!1,function(a,b,c){b=L(b,a);a=L(c,a);return 0==b.lastIndexOf(a,0)},2);R("string",3,!1,!0,function(a,b){return b?L(b,a):z(a.a)},0,1);
+    R("string-length",1,!1,!0,function(a,b){return(b?L(b,a):z(a.a)).length},0,1);R("substring",3,!1,!1,function(a,b,c,d){c=K(c,a);if(isNaN(c)||Infinity==c||-Infinity==c)return"";d=d?K(d,a):Infinity;if(isNaN(d)||-Infinity===d)return"";c=Math.round(c)-1;var e=Math.max(c,0);a=L(b,a);return Infinity==d?a.substring(e):a.substring(e,c+Math.round(d))},2,3);R("substring-after",3,!1,!1,function(a,b,c){b=L(b,a);a=L(c,a);c=b.indexOf(a);return-1==c?"":b.substring(c+a.length)},2);
+    R("substring-before",3,!1,!1,function(a,b,c){b=L(b,a);a=L(c,a);a=b.indexOf(a);return-1==a?"":b.substring(0,a)},2);R("sum",1,!1,!1,function(a,b){a=H(b.a(a));b=0;for(var c=I(a);c;c=I(a))b+=+z(c);return b},1,1,!0);R("translate",3,!1,!1,function(a,b,c,d){b=L(b,a);c=L(c,a);var e=L(d,a);a={};for(d=0;d<c.length;d++){var f=c.charAt(d);f in a||(a[f]=e.charAt(d))}c="";for(d=0;d<b.length;d++)f=b.charAt(d),c+=f in a?a[f]:f;return c},3);R("true",2,!1,!1,function(){return!0},0);function G(a,b){this.h=a;this.c=void 0!==b?b:null;this.b=null;switch(a){case "comment":this.b=8;break;case "text":this.b=3;break;case "processing-instruction":this.b=7;break;case "node":break;default:throw Error("Unexpected argument");}}function db(a){return"comment"==a||"text"==a||"processing-instruction"==a||"node"==a}G.prototype.a=function(a){return null===this.b||this.b==a.nodeType};G.prototype.f=function(){return this.h};
+    G.prototype.toString=function(){var a="Kind Test: "+this.h;null===this.c||(a+=J(this.c));return a};function eb(a){this.b=a;this.a=0}function fb(a){a=a.match(gb);for(var b=0;b<a.length;b++)hb.test(a[b])&&a.splice(b,1);return new eb(a)}var gb=/\$?(?:(?![0-9-\.])(?:\*|[\w-\.]+):)?(?![0-9-\.])(?:\*|[\w-\.]+)|\/\/|\.\.|::|\d+(?:\.\d*)?|\.\d+|"[^"]*"|'[^']*'|[!<>]=|\s+|./g,hb=/^\s/;function S(a,b){return a.b[a.a+(b||0)]}function T(a){return a.b[a.a++]}function ib(a){return a.b.length<=a.a};function jb(a){n.call(this,3);this.c=a.substring(1,a.length-1)}m(jb);jb.prototype.a=function(){return this.c};jb.prototype.toString=function(){return"Literal: "+this.c};function E(a,b){this.j=a.toLowerCase();a="*"==this.j?"*":"http://www.w3.org/1999/xhtml";this.c=b?b.toLowerCase():a}E.prototype.a=function(a){var b=a.nodeType;if(1!=b&&2!=b)return!1;b=void 0!==a.localName?a.localName:a.nodeName;return"*"!=this.j&&this.j!=b.toLowerCase()?!1:"*"==this.c?!0:this.c==(a.namespaceURI?a.namespaceURI.toLowerCase():"http://www.w3.org/1999/xhtml")};E.prototype.f=function(){return this.j};
+    E.prototype.toString=function(){return"Name Test: "+("http://www.w3.org/1999/xhtml"==this.c?"":this.c+":")+this.j};function kb(a){n.call(this,1);this.c=a}m(kb);kb.prototype.a=function(){return this.c};kb.prototype.toString=function(){return"Number: "+this.c};function lb(a,b){n.call(this,a.i);this.h=a;this.c=b;this.g=a.g;this.b=a.b;1==this.c.length&&(a=this.c[0],a.u||a.c!=mb||(a=a.o,"*"!=a.f()&&(this.f={name:a.f(),s:null})))}m(lb);function nb(){n.call(this,4)}m(nb);nb.prototype.a=function(a){var b=new C;a=a.a;9==a.nodeType?F(b,a):F(b,a.ownerDocument);return b};nb.prototype.toString=function(){return"Root Helper Expression"};function ob(){n.call(this,4)}m(ob);ob.prototype.a=function(a){var b=new C;F(b,a.a);return b};ob.prototype.toString=function(){return"Context Helper Expression"};
+    function pb(a){return"/"==a||"//"==a}lb.prototype.a=function(a){var b=this.h.a(a);if(!(b instanceof C))throw Error("Filter expression must evaluate to nodeset.");a=this.c;for(var c=0,d=a.length;c<d&&b.l;c++){var e=a[c],f=H(b,e.c.a),g;if(e.g||e.c!=qb)if(e.g||e.c!=rb)for(g=I(f),b=e.a(new Q(g));null!=(g=I(f));)g=e.a(new Q(g)),b=Pa(b,g);else g=I(f),b=e.a(new Q(g));else{for(g=I(f);(b=I(f))&&(!g.contains||g.contains(b))&&b.compareDocumentPosition(g)&8;g=b);b=e.a(new Q(g))}}return b};
+    lb.prototype.toString=function(){var a;a="Path Expression:"+J(this.h);if(this.c.length){var b=t(this.c,function(a,b){return a+J(b)},"Steps:");a+=J(b)}return a};function sb(a,b){this.a=a;this.b=!!b}
+    function $a(a,b,c){for(c=c||0;c<a.a.length;c++)for(var d=a.a[c],e=H(b),f=b.l,g,h=0;g=I(e);h++){var p=a.b?f-h:h+1;g=d.a(new Q(g,p,f));if("number"==typeof g)p=p==g;else if("string"==typeof g||"boolean"==typeof g)p=!!g;else if(g instanceof C)p=0<g.l;else throw Error("Predicate.evaluate returned an unexpected type.");if(!p){p=e;g=p.f;var x=p.a;if(!x)throw Error("Next must be called at least once before remove.");var D=x.b,x=x.a;D?D.a=x:g.a=x;x?x.b=D:g.b=D;g.l--;p.a=null}}return b}
+    sb.prototype.toString=function(){return t(this.a,function(a,b){return a+J(b)},"Predicates:")};function U(a,b,c,d){n.call(this,4);this.c=a;this.o=b;this.h=c||new sb([]);this.u=!!d;b=this.h;b=0<b.a.length?b.a[0].f:null;a.b&&b&&(a=b.name,a=w?a.toLowerCase():a,this.f={name:a,s:b.s});a:{a=this.h;for(b=0;b<a.a.length;b++)if(c=a.a[b],c.g||1==c.i||0==c.i){a=!0;break a}a=!1}this.g=a}m(U);
+    U.prototype.a=function(a){var b=a.a,c=this.f,d=null,e=null,f=0;c&&(d=c.name,e=c.s?L(c.s,a):null,f=1);if(this.u)if(this.g||this.c!=tb)if(b=H((new U(ub,new G("node"))).a(a)),c=I(b))for(a=this.m(c,d,e,f);null!=(c=I(b));)a=Pa(a,this.m(c,d,e,f));else a=new C;else a=B(this.o,b,d,e),a=$a(this.h,a,f);else a=this.m(a.a,d,e,f);return a};U.prototype.m=function(a,b,c,d){a=this.c.f(this.o,a,b,c);return a=$a(this.h,a,d)};
+    U.prototype.toString=function(){var a;a="Step:"+J("Operator: "+(this.u?"//":"/"));this.c.j&&(a+=J("Axis: "+this.c));a+=J(this.o);if(this.h.a.length){var b=t(this.h.a,function(a,b){return a+J(b)},"Predicates:");a+=J(b)}return a};function vb(a,b,c,d){this.j=a;this.f=b;this.a=c;this.b=d}vb.prototype.toString=function(){return this.j};var wb={};function V(a,b,c,d){if(wb.hasOwnProperty(a))throw Error("Axis already created: "+a);b=new vb(a,b,c,!!d);return wb[a]=b}
+    V("ancestor",function(a,b){for(var c=new C;b=b.parentNode;)a.a(b)&&Qa(c,b);return c},!0);V("ancestor-or-self",function(a,b){var c=new C;do a.a(b)&&Qa(c,b);while(b=b.parentNode);return c},!0);
+    var mb=V("attribute",function(a,b){var c=new C,d=a.f();if("style"==d&&w&&b.style)return F(c,new y(b.style,b,"style",b.style.cssText)),c;var e=b.attributes;if(e)if(a instanceof G&&null===a.b||"*"==d)for(a=0;d=e[a];a++)w?d.nodeValue&&F(c,Ha(b,d)):F(c,d);else(d=e.getNamedItem(d))&&(w?d.nodeValue&&F(c,Ha(b,d)):F(c,d));return c},!1),tb=V("child",function(a,b,c,d,e){return(w?Ma:Na).call(null,a,b,l(c)?c:null,l(d)?d:null,e||new C)},!1,!0);V("descendant",B,!1,!0);
+    var ub=V("descendant-or-self",function(a,b,c,d){var e=new C;A(b,c,d)&&a.a(b)&&F(e,b);return B(a,b,c,d,e)},!1,!0),qb=V("following",function(a,b,c,d){var e=new C;do for(var f=b;f=f.nextSibling;)A(f,c,d)&&a.a(f)&&F(e,f),e=B(a,f,c,d,e);while(b=b.parentNode);return e},!1,!0);V("following-sibling",function(a,b){for(var c=new C;b=b.nextSibling;)a.a(b)&&F(c,b);return c},!1);V("namespace",function(){return new C},!1);
+    var xb=V("parent",function(a,b){var c=new C;if(9==b.nodeType)return c;if(2==b.nodeType)return F(c,b.ownerElement),c;b=b.parentNode;a.a(b)&&F(c,b);return c},!1),rb=V("preceding",function(a,b,c,d){var e=new C,f=[];do f.unshift(b);while(b=b.parentNode);for(var g=1,h=f.length;g<h;g++){var p=[];for(b=f[g];b=b.previousSibling;)p.unshift(b);for(var x=0,D=p.length;x<D;x++)b=p[x],A(b,c,d)&&a.a(b)&&F(e,b),e=B(a,b,c,d,e)}return e},!0,!0);
+    V("preceding-sibling",function(a,b){for(var c=new C;b=b.previousSibling;)a.a(b)&&Qa(c,b);return c},!0);var yb=V("self",function(a,b){var c=new C;a.a(b)&&F(c,b);return c},!1);function zb(a){n.call(this,1);this.c=a;this.g=a.g;this.b=a.b}m(zb);zb.prototype.a=function(a){return-K(this.c,a)};zb.prototype.toString=function(){return"Unary Expression: -"+J(this.c)};function Ab(a){n.call(this,4);this.c=a;Ua(this,ja(this.c,function(a){return a.g}));Va(this,ja(this.c,function(a){return a.b}))}m(Ab);Ab.prototype.a=function(a){var b=new C;r(this.c,function(c){c=c.a(a);if(!(c instanceof C))throw Error("Path expression must evaluate to NodeSet.");b=Pa(b,c)});return b};Ab.prototype.toString=function(){return t(this.c,function(a,b){return a+J(b)},"Union Expression:")};function Bb(a,b){this.a=a;this.b=b}function Cb(a){for(var b,c=[];;){W(a,"Missing right hand side of binary expression.");b=Db(a);var d=T(a.a);if(!d)break;var e=(d=Ya[d]||null)&&d.w;if(!e){a.a.a--;break}for(;c.length&&e<=c[c.length-1].w;)b=new N(c.pop(),c.pop(),b);c.push(b,d)}for(;c.length;)b=new N(c.pop(),c.pop(),b);return b}function W(a,b){if(ib(a.a))throw Error(b);}function Eb(a,b){a=T(a.a);if(a!=b)throw Error("Bad token, expected: "+b+" got: "+a);}
+    function Fb(a){a=T(a.a);if(")"!=a)throw Error("Bad token: "+a);}function Gb(a){a=T(a.a);if(2>a.length)throw Error("Unclosed literal string");return new jb(a)}
+    function Hb(a){var b,c=[],d;if(pb(S(a.a))){b=T(a.a);d=S(a.a);if("/"==b&&(ib(a.a)||"."!=d&&".."!=d&&"@"!=d&&"*"!=d&&!/(?![0-9])[\w]/.test(d)))return new nb;d=new nb;W(a,"Missing next location step.");b=Ib(a,b);c.push(b)}else{a:{b=S(a.a);d=b.charAt(0);switch(d){case "$":throw Error("Variable reference not allowed in HTML XPath");case "(":T(a.a);b=Cb(a);W(a,'unclosed "("');Eb(a,")");break;case '"':case "'":b=Gb(a);break;default:if(isNaN(+b))if(!db(b)&&/(?![0-9])[\w]/.test(d)&&"("==S(a.a,1)){b=T(a.a);
+        b=cb[b]||null;T(a.a);for(d=[];")"!=S(a.a);){W(a,"Missing function argument list.");d.push(Cb(a));if(","!=S(a.a))break;T(a.a)}W(a,"Unclosed function argument list.");Fb(a);b=new ab(b,d)}else{b=null;break a}else b=new kb(+T(a.a))}"["==S(a.a)&&(d=new sb(Jb(a)),b=new Za(b,d))}if(b)if(pb(S(a.a)))d=b;else return b;else b=Ib(a,"/"),d=new ob,c.push(b)}for(;pb(S(a.a));)b=T(a.a),W(a,"Missing next location step."),b=Ib(a,b),c.push(b);return new lb(d,c)}
+    function Ib(a,b){var c,d;if("/"!=b&&"//"!=b)throw Error('Step op should be "/" or "//"');if("."==S(a.a))return d=new U(yb,new G("node")),T(a.a),d;if(".."==S(a.a))return d=new U(xb,new G("node")),T(a.a),d;var e;if("@"==S(a.a))e=mb,T(a.a),W(a,"Missing attribute name");else if("::"==S(a.a,1)){if(!/(?![0-9])[\w]/.test(S(a.a).charAt(0)))throw Error("Bad token: "+T(a.a));c=T(a.a);e=wb[c]||null;if(!e)throw Error("No axis with name: "+c);T(a.a);W(a,"Missing node name")}else e=tb;c=S(a.a);if(/(?![0-9])[\w\*]/.test(c.charAt(0)))if("("==
+        S(a.a,1)){if(!db(c))throw Error("Invalid node type: "+c);c=T(a.a);if(!db(c))throw Error("Invalid type name: "+c);Eb(a,"(");W(a,"Bad nodetype");var f=S(a.a).charAt(0),g=null;if('"'==f||"'"==f)g=Gb(a);W(a,"Bad nodetype");Fb(a);c=new G(c,g)}else if(c=T(a.a),f=c.indexOf(":"),-1==f)c=new E(c);else{var g=c.substring(0,f),h;if("*"==g)h="*";else if(h=a.b(g),!h)throw Error("Namespace prefix not declared: "+g);c=c.substr(f+1);c=new E(c,h)}else throw Error("Bad token: "+T(a.a));a=new sb(Jb(a),e.a);return d||
+        new U(e,c,a,"//"==b)}function Jb(a){for(var b=[];"["==S(a.a);){T(a.a);W(a,"Missing predicate expression.");var c=Cb(a);b.push(c);W(a,"Unclosed predicate expression.");Eb(a,"]")}return b}function Db(a){if("-"==S(a.a))return T(a.a),new zb(Db(a));var b=Hb(a);if("|"!=S(a.a))a=b;else{for(b=[b];"|"==T(a.a);)W(a,"Missing next union location path."),b.push(Hb(a));a.a.a--;a=new Ab(b)}return a};function Kb(a){switch(a.nodeType){case 1:return ea(Lb,a);case 9:return Kb(a.documentElement);case 11:case 10:case 6:case 12:return Mb;default:return a.parentNode?Kb(a.parentNode):Mb}}function Mb(){return null}function Lb(a,b){if(a.prefix==b)return a.namespaceURI||"http://www.w3.org/1999/xhtml";var c=a.getAttributeNode("xmlns:"+b);return c&&c.specified?c.value||null:a.parentNode&&9!=a.parentNode.nodeType?Lb(a.parentNode,b):null};function Nb(a,b){if(!a.length)throw Error("Empty XPath expression.");a=fb(a);if(ib(a))throw Error("Invalid XPath expression.");b?"function"==aa(b)||(b=da(b.lookupNamespaceURI,b)):b=function(){return null};var c=Cb(new Bb(a,b));if(!ib(a))throw Error("Bad token: "+T(a));this.evaluate=function(a,b){a=c.a(new Q(a));return new Y(a,b)}}
+    function Y(a,b){if(0==b)if(a instanceof C)b=4;else if("string"==typeof a)b=2;else if("number"==typeof a)b=1;else if("boolean"==typeof a)b=3;else throw Error("Unexpected evaluation result.");if(2!=b&&1!=b&&3!=b&&!(a instanceof C))throw Error("value could not be converted to the specified type");this.resultType=b;var c;switch(b){case 2:this.stringValue=a instanceof C?Sa(a):""+a;break;case 1:this.numberValue=a instanceof C?+Sa(a):+a;break;case 3:this.booleanValue=a instanceof C?0<a.l:!!a;break;case 4:case 5:case 6:case 7:var d=
+        H(a);c=[];for(var e=I(d);e;e=I(d))c.push(e instanceof y?e.a:e);this.snapshotLength=a.l;this.invalidIteratorState=!1;break;case 8:case 9:a=Ra(a);this.singleNodeValue=a instanceof y?a.a:a;break;default:throw Error("Unknown XPathResult type.");}var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw Error("iterateNext called with wrong result type");return f>=c.length?null:c[f++]};this.snapshotItem=function(a){if(6!=b&&7!=b)throw Error("snapshotItem called with wrong result type");return a>=c.length||
+    0>a?null:c[a]}}Y.ANY_TYPE=0;Y.NUMBER_TYPE=1;Y.STRING_TYPE=2;Y.BOOLEAN_TYPE=3;Y.UNORDERED_NODE_ITERATOR_TYPE=4;Y.ORDERED_NODE_ITERATOR_TYPE=5;Y.UNORDERED_NODE_SNAPSHOT_TYPE=6;Y.ORDERED_NODE_SNAPSHOT_TYPE=7;Y.ANY_UNORDERED_NODE_TYPE=8;Y.FIRST_ORDERED_NODE_TYPE=9;function Ob(a){this.lookupNamespaceURI=Kb(a)}
+    function Pb(a,b){a=a||k;var c=a.Document&&a.Document.prototype||a.document;if(!c.evaluate||b)a.XPathResult=Y,c.evaluate=function(a,b,c,g){return(new Nb(a,c)).evaluate(b,g)},c.createExpression=function(a,b){return new Nb(a,b)},c.createNSResolver=function(a){return new Ob(a)}}var Qb=["wgxpath","install"],Z=k;Qb[0]in Z||!Z.execScript||Z.execScript("var "+Qb[0]);for(var Rb;Qb.length&&(Rb=Qb.shift());)Qb.length||void 0===Pb?Z[Rb]?Z=Z[Rb]:Z=Z[Rb]={}:Z[Rb]=Pb;}).call(this)
+    }
+
+    setTimeout(function(){wgxpath.install()}, 100);
+})
+    .call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
+
diff --git a/core/media/system/js/progressbar-uncompressed.js b/core/media/system/js/progressbar-uncompressed.js
new file mode 100644
index 00000000..4a68088b
--- /dev/null
+++ b/core/media/system/js/progressbar-uncompressed.js
@@ -0,0 +1,109 @@
+/*
+ name: Fx.ProgressBar
+
+ description: Creates a progressbar with WAI-ARIA and optional HTML5 support.
+
+ license: MIT-style
+
+ authors:
+ - Harald Kirschner <mail [at] digitarald [dot] de>
+ - Rouven Weßling <me [at] rouvenwessling [dot] de>
+
+ requires: [Core/Fx, Core/Class, Core/Element]
+
+ provides: Fx.ProgressBar
+ */
+
+Fx.ProgressBar = function(_element, _options) {
+    var $, useHtml5, now, $element, indeterminate, options = {
+        onComplete : function() {
+        },
+        text : null,
+        html5 : true
+    },
+    
+    initialize = function(_element, _options) {
+        $ = jQuery.noConflict();
+        $.extend(options, _options);
+
+        var element, classes = $(_element).attr('class'), id = $(_element).attr('id'), progress;
+
+        element = $(_element).get(0);
+        useHtml5 = options.html5 && supportsHtml5();
+        if (useHtml5) {
+            progress = $('<progress></progress>', {
+                'value' : 10,
+                'max' : 100,
+                'class' : classes,
+                'id' : id
+            });
+            $(element).replaceWith(progress);
+            element = progress;
+        } else {
+            progress = $('<div>', {
+                'id' : id,
+                'class' : classes,
+                'class' : 'progress progress-striped',
+                'role' : 'progressbar',
+                'aria-valuenow' : '0', // WAI-ARIA
+                'aria-valuemin' : '0',
+                'aria-valuemax' : '100'
+            }).html($('<div>', {
+                'class' : 'bar'
+            })).get(0);
+            $(element).replaceWith(progress);
+            element = progress;
+        }
+
+        $element = $(element);
+        set(0);
+    },
+    
+    supportsHtml5 = function() {
+        return 'value' in document.createElement('progress');
+    },
+    
+    setIndeterminate = function() {
+        indeterminate = true;
+
+        if (useHtml5) {
+            $element.removeAttr('value');
+        } else {
+            $element.find('.bar').css('width', '100%').addClass('active');
+            $element.removeAttr('aria-valuenow').attr('title', '');
+        }
+    },
+    
+    set = function(to) {
+        var $text = $(options.text);
+
+        if (to >= 100) {
+            to = 100;
+        }
+        now = to;
+
+        if (useHtml5) {
+            $element.val(to);
+        } else {
+            $element.find('.bar').css('width', to + '%');
+            $element.removeAttr('aria-valuenow').attr('title', Math.round(to) + '%');
+        }
+
+        if ($text.length) {
+            $text.text(Math.round(to) + '%');
+        }
+        if (to >= 100) {
+            options.onComplete('complete');
+        }
+
+        return this;
+    };
+    
+    initialize(_element, _options);
+
+    return {
+        set : set,
+        setIndeterminate : setIndeterminate,
+        element : $element.get(0)
+    };
+}
diff --git a/core/media/system/js/progressbar.js b/core/media/system/js/progressbar.js
new file mode 100644
index 00000000..2139a8c1
--- /dev/null
+++ b/core/media/system/js/progressbar.js
@@ -0,0 +1,4 @@
+/*
+        license: MIT-style
+*/
+Fx.ProgressBar=function(e,k){var g,h,c,j,a,l={onComplete:function(){},text:null,html5:true},f=function(n,m){g=jQuery.noConflict();g.extend(l,m);var q,p=g(n).attr("class"),r=g(n).attr("id"),o;q=g(n).get(0);h=l.html5&&b();if(h){o=g("<progress></progress>",{value:10,max:100,"class":p,id:r});g(q).replaceWith(o);q=o}else{o=g("<div>",{id:r,"class":p,"class":"progress progress-striped",role:"progressbar","aria-valuenow":"0","aria-valuemin":"0","aria-valuemax":"100"}).html(g("<div>",{"class":"bar"})).get(0);g(q).replaceWith(o);q=o}j=g(q);i(0)},b=function(){return"value" in document.createElement("progress")},d=function(){a=true;if(h){j.removeAttr("value")}else{j.find(".bar").css("width","100%").addClass("active");j.removeAttr("aria-valuenow").attr("title","")}},i=function(n){var m=g(l.text);if(n>=100){n=100}c=n;if(h){j.val(n)}else{j.find(".bar").css("width",n+"%");j.removeAttr("aria-valuenow").attr("title",Math.round(n)+"%")}if(m.length){m.text(Math.round(n)+"%")}if(n>=100){l.onComplete("complete")}return this};f(e,k);return{set:i,setIndeterminate:d,element:j.get(0)}};
diff --git a/core/media/system/js/punycode-uncompressed.js b/core/media/system/js/punycode-uncompressed.js
new file mode 100644
index 00000000..9255a042
--- /dev/null
+++ b/core/media/system/js/punycode-uncompressed.js
@@ -0,0 +1,533 @@
+/*! https://mths.be/punycode v1.4.1 by @mathias - do not update to v2 */
+;(function(root) {
+
+	/** Detect free variables */
+	var freeExports = typeof exports == 'object' && exports &&
+		!exports.nodeType && exports;
+	var freeModule = typeof module == 'object' && module &&
+		!module.nodeType && module;
+	var freeGlobal = typeof global == 'object' && global;
+	if (
+		freeGlobal.global === freeGlobal ||
+		freeGlobal.window === freeGlobal ||
+		freeGlobal.self === freeGlobal
+	) {
+		root = freeGlobal;
+	}
+
+	/**
+	 * The `punycode` object.
+	 * @name punycode
+	 * @type Object
+	 */
+	var punycode,
+
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/** Temporary variable */
+	key;
+
+	/*--------------------------------------------------------------------------*/
+
+	/**
+	 * A generic error utility function.
+	 * @private
+	 * @param {String} type The error type.
+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
+	 */
+	function error(type) {
+		throw new RangeError(errors[type]);
+	}
+
+	/**
+	 * A generic `Array#map` utility function.
+	 * @private
+	 * @param {Array} array The array to iterate over.
+	 * @param {Function} callback The function that gets called for every array
+	 * item.
+	 * @returns {Array} A new array of values returned by the callback function.
+	 */
+	function map(array, fn) {
+		var length = array.length;
+		var result = [];
+		while (length--) {
+			result[length] = fn(array[length]);
+		}
+		return result;
+	}
+
+	/**
+	 * A simple `Array#map`-like wrapper to work with domain name strings or email
+	 * addresses.
+	 * @private
+	 * @param {String} domain The domain name or email address.
+	 * @param {Function} callback The function that gets called for every
+	 * character.
+	 * @returns {Array} A new string of characters returned by the callback
+	 * function.
+	 */
+	function mapDomain(string, fn) {
+		var parts = string.split('@');
+		var result = '';
+		if (parts.length > 1) {
+			// In email addresses, only the domain name should be punycoded. Leave
+			// the local part (i.e. everything up to `@`) intact.
+			result = parts[0] + '@';
+			string = parts[1];
+		}
+		// Avoid `split(regex)` for IE8 compatibility. See #17.
+		string = string.replace(regexSeparators, '\x2E');
+		var labels = string.split('.');
+		var encoded = map(labels, fn).join('.');
+		return result + encoded;
+	}
+
+	/**
+	 * Creates an array containing the numeric code points of each Unicode
+	 * character in the string. While JavaScript uses UCS-2 internally,
+	 * this function will convert a pair of surrogate halves (each of which
+	 * UCS-2 exposes as separate characters) into a single code point,
+	 * matching UTF-16.
+	 * @see `punycode.ucs2.encode`
+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+	 * @memberOf punycode.ucs2
+	 * @name decode
+	 * @param {String} string The Unicode input string (UCS-2).
+	 * @returns {Array} The new array of code points.
+	 */
+	function ucs2decode(string) {
+		var output = [],
+		    counter = 0,
+		    length = string.length,
+		    value,
+		    extra;
+		while (counter < length) {
+			value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+				// high surrogate, and there is a next character
+				extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				} else {
+					// unmatched surrogate; only append this code unit, in case the next
+					// code unit is the high surrogate of a surrogate pair
+					output.push(value);
+					counter--;
+				}
+			} else {
+				output.push(value);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * Creates a string based on an array of numeric code points.
+	 * @see `punycode.ucs2.decode`
+	 * @memberOf punycode.ucs2
+	 * @name encode
+	 * @param {Array} codePoints The array of numeric code points.
+	 * @returns {String} The new Unicode string (UCS-2).
+	 */
+	function ucs2encode(array) {
+		return map(array, function(value) {
+			var output = '';
+			if (value > 0xFFFF) {
+				value -= 0x10000;
+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
+				value = 0xDC00 | value & 0x3FF;
+			}
+			output += stringFromCharCode(value);
+			return output;
+		}).join('');
+	}
+
+	/**
+	 * Converts a basic code point into a digit/integer.
+	 * @see `digitToBasic()`
+	 * @private
+	 * @param {Number} codePoint The basic numeric code point value.
+	 * @returns {Number} The numeric value of a basic code point (for use in
+	 * representing integers) in the range `0` to `base - 1`, or `base` if
+	 * the code point does not represent a value.
+	 */
+	function basicToDigit(codePoint) {
+		if (codePoint - 48 < 10) {
+			return codePoint - 22;
+		}
+		if (codePoint - 65 < 26) {
+			return codePoint - 65;
+		}
+		if (codePoint - 97 < 26) {
+			return codePoint - 97;
+		}
+		return base;
+	}
+
+	/**
+	 * Converts a digit/integer into a basic code point.
+	 * @see `basicToDigit()`
+	 * @private
+	 * @param {Number} digit The numeric value of a basic code point.
+	 * @returns {Number} The basic code point whose value (when used for
+	 * representing integers) is `digit`, which needs to be in the range
+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+	 * used; else, the lowercase form is used. The behavior is undefined
+	 * if `flag` is non-zero and `digit` has no uppercase form.
+	 */
+	function digitToBasic(digit, flag) {
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+	}
+
+	/**
+	 * Bias adaptation function as per section 3.4 of RFC 3492.
+	 * https://tools.ietf.org/html/rfc3492#section-3.4
+	 * @private
+	 */
+	function adapt(delta, numPoints, firstTime) {
+		var k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
+		}
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+	}
+
+	/**
+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The Punycode string of ASCII-only symbols.
+	 * @returns {String} The resulting string of Unicode symbols.
+	 */
+	function decode(input) {
+		// Don't use UCS-2
+		var output = [],
+		    inputLength = input.length,
+		    out,
+		    i = 0,
+		    n = initialN,
+		    bias = initialBias,
+		    basic,
+		    j,
+		    index,
+		    oldi,
+		    w,
+		    k,
+		    digit,
+		    t,
+		    /** Cached calculation results */
+		    baseMinusT;
+
+		// Handle the basic code points: let `basic` be the number of input code
+		// points before the last delimiter, or `0` if there is none, then copy
+		// the first basic code points to the output.
+
+		basic = input.lastIndexOf(delimiter);
+		if (basic < 0) {
+			basic = 0;
+		}
+
+		for (j = 0; j < basic; ++j) {
+			// if it's not a basic code point
+			if (input.charCodeAt(j) >= 0x80) {
+				error('not-basic');
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: start just after the last delimiter if any basic code
+		// points were copied; start at the beginning otherwise.
+
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+			// `index` is the index of the next character to be consumed.
+			// Decode a generalized variable-length integer into `delta`,
+			// which gets added to `i`. The overflow checking is easier
+			// if we increase `i` as we go, then subtract off its starting
+			// value at the end to obtain `delta`.
+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
+
+				if (index >= inputLength) {
+					error('invalid-input');
+				}
+
+				digit = basicToDigit(input.charCodeAt(index++));
+
+				if (digit >= base || digit > floor((maxInt - i) / w)) {
+					error('overflow');
+				}
+
+				i += digit * w;
+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+				if (digit < t) {
+					break;
+				}
+
+				baseMinusT = base - t;
+				if (w > floor(maxInt / baseMinusT)) {
+					error('overflow');
+				}
+
+				w *= baseMinusT;
+
+			}
+
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
+
+			// `i` was supposed to wrap around from `out` to `0`,
+			// incrementing `n` each time, so we'll fix that now:
+			if (floor(i / out) > maxInt - n) {
+				error('overflow');
+			}
+
+			n += floor(i / out);
+			i %= out;
+
+			// Insert `n` at position `i` of the output
+			output.splice(i++, 0, n);
+
+		}
+
+		return ucs2encode(output);
+	}
+
+	/**
+	 * Converts a string of Unicode symbols (e.g. a domain name label) to a
+	 * Punycode string of ASCII-only symbols.
+	 * @memberOf punycode
+	 * @param {String} input The string of Unicode symbols.
+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
+	 */
+	function encode(input) {
+		var n,
+		    delta,
+		    handledCPCount,
+		    basicLength,
+		    bias,
+		    j,
+		    m,
+		    q,
+		    k,
+		    t,
+		    currentValue,
+		    output = [],
+		    /** `inputLength` will hold the number of code points in `input`. */
+		    inputLength,
+		    /** Cached calculation results */
+		    handledCPCountPlusOne,
+		    baseMinusT,
+		    qMinusT;
+
+		// Convert the input in UCS-2 to Unicode
+		input = ucs2decode(input);
+
+		// Cache the length
+		inputLength = input.length;
+
+		// Initialize the state
+		n = initialN;
+		delta = 0;
+		bias = initialBias;
+
+		// Handle the basic code points
+		for (j = 0; j < inputLength; ++j) {
+			currentValue = input[j];
+			if (currentValue < 0x80) {
+				output.push(stringFromCharCode(currentValue));
+			}
+		}
+
+		handledCPCount = basicLength = output.length;
+
+		// `handledCPCount` is the number of code points that have been handled;
+		// `basicLength` is the number of basic code points.
+
+		// Finish the basic string - if it is not empty - with a delimiter
+		if (basicLength) {
+			output.push(delimiter);
+		}
+
+		// Main encoding loop:
+		while (handledCPCount < inputLength) {
+
+			// All non-basic code points < n have been handled already. Find the next
+			// larger one:
+			for (m = maxInt, j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+				if (currentValue >= n && currentValue < m) {
+					m = currentValue;
+				}
+			}
+
+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+			// but guard against overflow
+			handledCPCountPlusOne = handledCPCount + 1;
+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+				error('overflow');
+			}
+
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
+
+			for (j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+
+				if (currentValue < n && ++delta > maxInt) {
+					error('overflow');
+				}
+
+				if (currentValue == n) {
+					// Represent delta as a generalized variable-length integer
+					for (q = delta, k = base; /* no condition */; k += base) {
+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+						if (q < t) {
+							break;
+						}
+						qMinusT = q - t;
+						baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
+					}
+
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+					delta = 0;
+					++handledCPCount;
+				}
+			}
+
+			++delta;
+			++n;
+
+		}
+		return output.join('');
+	}
+
+	/**
+	 * Converts a Punycode string representing a domain name or an email address
+	 * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+	 * it doesn't matter if you call it on a string that has already been
+	 * converted to Unicode.
+	 * @memberOf punycode
+	 * @param {String} input The Punycoded domain name or email address to
+	 * convert to Unicode.
+	 * @returns {String} The Unicode representation of the given Punycode
+	 * string.
+	 */
+	function toUnicode(input) {
+		return mapDomain(input, function(string) {
+			return regexPunycode.test(string)
+				? decode(string.slice(4).toLowerCase())
+				: string;
+		});
+	}
+
+	/**
+	 * Converts a Unicode string representing a domain name or an email address to
+	 * Punycode. Only the non-ASCII parts of the domain name will be converted,
+	 * i.e. it doesn't matter if you call it with a domain that's already in
+	 * ASCII.
+	 * @memberOf punycode
+	 * @param {String} input The domain name or email address to convert, as a
+	 * Unicode string.
+	 * @returns {String} The Punycode representation of the given domain name or
+	 * email address.
+	 */
+	function toASCII(input) {
+		return mapDomain(input, function(string) {
+			return regexNonASCII.test(string)
+				? 'xn--' + encode(string)
+				: string;
+		});
+	}
+
+	/*--------------------------------------------------------------------------*/
+
+	/** Define the public API */
+	punycode = {
+		/**
+		 * A string representing the current Punycode.js version number.
+		 * @memberOf punycode
+		 * @type String
+		 */
+		'version': '1.4.1',
+		/**
+		 * An object of methods to convert from JavaScript's internal character
+		 * representation (UCS-2) to Unicode code points, and back.
+		 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+		 * @memberOf punycode
+		 * @type Object
+		 */
+		'ucs2': {
+			'decode': ucs2decode,
+			'encode': ucs2encode
+		},
+		'decode': decode,
+		'encode': encode,
+		'toASCII': toASCII,
+		'toUnicode': toUnicode
+	};
+
+	/** Expose `punycode` */
+	// Some AMD build optimizers, like r.js, check for specific condition patterns
+	// like the following:
+	if (
+		typeof define == 'function' &&
+		typeof define.amd == 'object' &&
+		define.amd
+	) {
+		define('punycode', function() {
+			return punycode;
+		});
+	} else if (freeExports && freeModule) {
+		if (module.exports == freeExports) {
+			// in Node.js, io.js, or RingoJS v0.8.0+
+			freeModule.exports = punycode;
+		} else {
+			// in Narwhal or RingoJS v0.7.0-
+			for (key in punycode) {
+				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);
+			}
+		}
+	} else {
+		// in Rhino or a web browser
+		root.punycode = punycode;
+	}
+
+}(this));
diff --git a/core/media/system/js/punycode.js b/core/media/system/js/punycode.js
new file mode 100644
index 00000000..1cf8e016
--- /dev/null
+++ b/core/media/system/js/punycode.js
@@ -0,0 +1,2 @@
+/*! https://mths.be/punycode v1.4.1 by @mathias - do not update to v2 */
+!function(a){function b(a){throw new RangeError(E[a])}function c(a,b){for(var c=a.length,d=[];c--;)d[c]=b(a[c]);return d}function d(a,b){var d=a.split("@"),e="";d.length>1&&(e=d[0]+"@",a=d[1]),a=a.replace(D,".");var f=a.split("."),g=c(f,b).join(".");return e+g}function e(a){for(var b,c,d=[],e=0,f=a.length;f>e;)b=a.charCodeAt(e++),b>=55296&&56319>=b&&f>e?(c=a.charCodeAt(e++),56320==(64512&c)?d.push(((1023&b)<<10)+(1023&c)+65536):(d.push(b),e--)):d.push(b);return d}function f(a){return c(a,function(a){var b="";return a>65535&&(a-=65536,b+=H(a>>>10&1023|55296),a=56320|1023&a),b+=H(a)}).join("")}function g(a){return 10>a-48?a-22:26>a-65?a-65:26>a-97?a-97:t}function h(a,b){return a+22+75*(26>a)-((0!=b)<<5)}function i(a,b,c){var d=0;for(a=c?G(a/x):a>>1,a+=G(a/b);a>F*v>>1;d+=t)a=G(a/F);return G(d+(F+1)*a/(a+w))}function j(a){var c,d,e,h,j,k,l,m,n,o,p=[],q=a.length,r=0,w=z,x=y;for(d=a.lastIndexOf(A),0>d&&(d=0),e=0;d>e;++e)a.charCodeAt(e)>=128&&b("not-basic"),p.push(a.charCodeAt(e));for(h=d>0?d+1:0;q>h;){for(j=r,k=1,l=t;h>=q&&b("invalid-input"),m=g(a.charCodeAt(h++)),(m>=t||m>G((s-r)/k))&&b("overflow"),r+=m*k,n=x>=l?u:l>=x+v?v:l-x,!(n>m);l+=t)o=t-n,k>G(s/o)&&b("overflow"),k*=o;c=p.length+1,x=i(r-j,c,0==j),G(r/c)>s-w&&b("overflow"),w+=G(r/c),r%=c,p.splice(r++,0,w)}return f(p)}function k(a){var c,d,f,g,j,k,l,m,n,o,p,q,r,w,x,B=[];for(a=e(a),q=a.length,c=z,d=0,j=y,k=0;q>k;++k)p=a[k],128>p&&B.push(H(p));for(f=g=B.length,g&&B.push(A);q>f;){for(l=s,k=0;q>k;++k)p=a[k],p>=c&&l>p&&(l=p);for(r=f+1,l-c>G((s-d)/r)&&b("overflow"),d+=(l-c)*r,c=l,k=0;q>k;++k)if(p=a[k],c>p&&++d>s&&b("overflow"),p==c){for(m=d,n=t;o=j>=n?u:n>=j+v?v:n-j,!(o>m);n+=t)x=m-o,w=t-o,B.push(H(h(o+x%w,0))),m=G(x/w);B.push(H(h(m,0))),j=i(d,r,f==g),d=0,++f}++d,++c}return B.join("")}function l(a){return d(a,function(a){return B.test(a)?j(a.slice(4).toLowerCase()):a})}function m(a){return d(a,function(a){return C.test(a)?"xn--"+k(a):a})}var n="object"==typeof exports&&exports&&!exports.nodeType&&exports,o="object"==typeof module&&module&&!module.nodeType&&module,p="object"==typeof global&&global;(p.global===p||p.window===p||p.self===p)&&(a=p);var q,r,s=2147483647,t=36,u=1,v=26,w=38,x=700,y=72,z=128,A="-",B=/^xn--/,C=/[^\x20-\x7E]/,D=/[\x2E\u3002\uFF0E\uFF61]/g,E={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},F=t-u,G=Math.floor,H=String.fromCharCode;if(q={version:"1.4.1",ucs2:{decode:e,encode:f},decode:j,encode:k,toASCII:m,toUnicode:l},"function"==typeof define&&"object"==typeof define.amd&&define.amd)define("punycode",function(){return q});else if(n&&o)if(module.exports==n)o.exports=q;else for(r in q)q.hasOwnProperty(r)&&(n[r]=q[r]);else a.punycode=q}(this);
\ No newline at end of file
diff --git a/core/media/system/js/repeatable-uncompressed.js b/core/media/system/js/repeatable-uncompressed.js
new file mode 100644
index 00000000..8e69e2e7
--- /dev/null
+++ b/core/media/system/js/repeatable-uncompressed.js
@@ -0,0 +1,537 @@
+/**
+ * @package		Joomla.JavaScript
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Options:
+ * 		see defaults $.JRepeatable.defaults,
+ * Options can be set through "data" atribute of the JRepeatable container (see example markup)
+ *
+ * Events:
+ * 		$('input.form-field-repeatable')
+ * 		.on('weready', function(e){
+ * 			// fires when JRepeatable initialized
+ * 		})
+ * 		.on('prepare-template', function(e, template){
+ * 			// fires when row template initialized
+ * 		})
+ * 		.on('prepare-modal', function(e, modal){
+ * 			// fires when modal container initialized
+ * 		})
+ * 		.on('row-add', function(e, row){
+ * 			// fires when new row added
+ * 		})
+ * 		.on('row-remove', function(e, row){
+ * 			// fires before row removing
+ * 		})
+ * 		.on('value-update', function(e, value){
+ * 			// fires before when value in hidden input was updated
+ * 		});
+ *
+ * Dependancies: jQuery, Bootsrap.modal
+ *
+ * Example fields initial markup:
+ *
+ * <div id="jform_somename_container">
+ *	<div id="jform_somename_modal" class="modal hide">
+ * 		<table>
+ * 			<thead>
+ * 				<tr>
+ * 					<th>Field label 1</th>
+ * 					<th>Field label 2</th>
+ * 					<th><a href="#" class="add">Add new</a></th>
+ * 				</tr>
+ * 			</thead>
+ * 			<tbody>
+ * 				<tr>
+ * 					<td><input type="text" name="field1" /></td>
+ * 					<td><input type="text" name="field2" /></td>
+ * 					<td>
+ * 						<a href="#" class="add">Add new after</a>
+ * 						<a href="#" class="remove">Remove</a>
+ * 					</td>
+ * 				</tr>
+ * 			</tbody>
+ * 		</table>
+ * 		<a href="#" class="close-modal">Close</a>
+ * 	</div>
+ * </div>
+ * <button id="jform_somename_button" >Open modal</button>
+ * <input type="hidden" name="jform[somename]" id="jform_somename" value=""
+ * 		class="form-field-repeatable"
+ * 		data-container="#jform_somename_container"
+ * 		data-modal-element="#jform_somename_modal"
+ * 		data-repeatable-element="table tbody tr"
+ * 		data-bt-add="a.add" data-bt-remove="a.remove"
+ * 		data-bt-modal-open="#jform_somename_button"
+ * 		data-bt-modal-close="a.close-modal"
+ * 		data-maximum="3" data-input="#jform_somename"
+ * 		/>
+ *
+ * data-repeatable-element="table tbody tr" - means that <tr> inside <tbody> will be repeatable
+ */
+
+;(function($){
+	"use strict";
+
+    $.JRepeatable = function(input, options){
+        // To avoid scope issues,
+        var self = this;
+
+        //direct call
+        if(!self || self === window){
+        	return new $.JRepeatable(input, options);
+        }
+
+        self.$input = $(input);
+
+        // check if alredy exist
+        if(self.$input.data("JRepeatable")){
+        	return self;
+        }
+
+        // Add a reverse reference to the DOM object
+        self.$input.data("JRepeatable", self);
+
+        // method initialize
+        self.init = function(){
+        	// merge options
+            self.options = $.extend({}, $.JRepeatable.defaults, options);
+
+            self.$container = $(self.options.container);
+            // Move out form the Form container
+            // for prevent sending to server
+            $('body').append(self.$container);
+
+            // container where the rows is live
+            self.$rowsContainer = self.$container.find(self.options.repeatableElement).parent();
+
+            // prepare modal window
+            self.prepareModal();
+
+            // container for storing info about inputs
+            self.inputs = [];
+            self.values = {};
+
+            // prepare a row template, and find available field names
+            self.prepareTemplate();
+
+            // check the values and keep it as object
+            var val = self.$input.val();
+            if(val){
+            	// value can be not valid JSON
+            	try {
+            		self.values = JSON.parse(val);
+				} catch (e) {
+					if(e instanceof SyntaxError){
+						// guess there a single quote problem
+						try {
+							val = val.replace(/'/g, '"').replace(/\\"/g, "\'");// ho ho ho
+		            		self.values = JSON.parse(val);
+						} catch (e) {
+							// nop
+							if(window.console){
+    							console.log(e);
+    						}
+						}
+					} else if(window.console){
+						console.log(e);
+					}
+				}
+            }
+
+            // so init the form depend from values that we have
+            self.buildRows();
+
+            // bind open the modal
+            $(document).on('click', self.options.btModalOpen, function (e) {
+            	e.preventDefault();
+            	self.$modalWindow.modal('show');
+            });
+            // bind close the modal
+            self.$modalWindow.on('click', self.options.btModalClose, function (e) {
+            	e.preventDefault();
+            	self.$modalWindow.modal('hide');
+            	// rollback
+            	self.buildRows();
+            });
+
+            // bind save the modaldata
+            self.$modalWindow.on('click', self.options.btModalSaveData, function (e) {
+            	e.preventDefault();
+            	self.$modalWindow.modal('hide');
+            	self.refreshValue();
+            });
+
+            // bind add button
+            self.$container.on('click', self.options.btAdd, function (e) {
+            	e.preventDefault();
+            	var after = $(this).parents(self.options.repeatableElement);
+            	if(!after.length){
+            		after = null;
+            	}
+            	self.addRow(after);
+            });
+            // bind remove button
+            self.$container.on('click', self.options.btRemove, function (e) {
+            	e.preventDefault();
+            	var row = $(this).parents(self.options.repeatableElement);
+            	self.removeRow(row);
+            });
+
+            // tell all that we a ready
+            self.$input.trigger('weready');
+        };
+
+        // prepare a template that we will use for repeating
+        self.prepareTemplate = function(){
+        	//find available
+        	var $rows = self.$container.find(self.options.repeatableElement);
+        	var $row = $($rows.get(0));
+        	// clear scripts that can be attached to the fields
+        	try {
+        		self.clearScripts($row);
+			} catch (e) {
+				if(window.console){
+					console.log(e);
+				}
+			}
+
+        	var inputs = $row.find('*[name]');
+        	//keep the name and type for each
+        	for(var i = 0, l = inputs.length; i < l; i++){
+        		var name = $(inputs[i]).attr('name');
+        		// check if alredy exist, for radio case
+        		if(self.values[name]){
+        			continue;
+        		}
+        		self.inputs.push({
+        			name: name,
+        			type: $(inputs[i]).attr('type') || inputs[i].tagName.toLowerCase()
+        		});
+        		// initialize values
+        		self.values[name] = [];
+        	}
+
+        	// keep template
+        	self.template = $row.prop('outerHTML');
+        	// remove
+        	$rows.remove();
+
+        	// tell all that the template ready
+            self.$input.trigger('prepare-template', self.template);
+        };
+
+        // prepare modal window
+        self.prepareModal = function(){
+        	var modalEl = $(self.options.modalElement);
+
+        	// fix modal style
+        	modalEl.css({
+        		position: 'absolute',
+        		width: 'auto',
+        		'max-width': '100%'
+        	});
+
+        	modalEl.on('shown', function () {
+        		self.resizeModal();
+        	});
+        	$(window).resize(function() {
+        		self.resizeModal();
+        	});
+
+        	// init bootstrap modal
+        	self.$modalWindow = modalEl.modal({show: false, backdrop: 'static'});
+
+        	// tell all that the modal are ready
+            self.$input.trigger('prepare-modal', self.$modalWindow);
+        };
+
+        //resize and count position for the modal popup
+        self.resizeModal = function (){
+        	if(!self.$modalWindow.is(':visible')){
+        		// do nothing with hidden
+        		return;
+        	}
+        	var docHalfWidth = $(document).width() / 2,
+      	 	 	modalHalfWidth = self.$modalWindow.width() / 2,
+      	 	 	rowsHalfWidth = self.$rowsContainer.width() / 2,
+      	 	 	marginLeft = modalHalfWidth >= docHalfWidth ? 0 : -modalHalfWidth,
+      	 	 	left = marginLeft ? '50%' : 0,
+      	 	 	top = $(document).scrollTop() + $(window).height() * 0.2;//20% from top of visible win
+
+        	self.$modalWindow.css({
+       	    	 top: top,
+       	    	 left: left,
+       	         'margin-left': marginLeft,
+       	         overflow: rowsHalfWidth > modalHalfWidth ? 'auto' : 'visible'
+       	    });
+
+        };
+
+        // build rows
+        self.buildRows = function(){
+        	// clean up any old
+        	var $oldRows = self.$rowsContainer.children();
+        	if($oldRows.length){
+        		self.removeRow($oldRows);
+        	}
+
+	        // go through values and add a new copy
+	        // but make sure that at least one will be added
+	        var count = self.values[Object.keys(self.values)[0]].length || 1,
+            	row = null;
+            for(var i = 0; i < count; i++){
+            	row = self.addRow(row, i);
+            }
+        };
+
+        // add new row
+        self.addRow = function(after, valueKey){
+        	// count how much we already have
+        	var count = self.$container.find(self.options.repeatableElement).length;
+        	if(count >= self.options.maximum){
+        		return null;
+        	}
+
+        	// make new from template
+        	var row = $.parseHTML(self.template);
+
+        	//add to container
+        	if(after){
+        		$(after).after(row);
+        	} else {
+        		self.$rowsContainer.append(row);
+        	}
+
+        	var $row = $(row);
+        	// fix names and id`s
+        	self.fixUniqueAttributes($row, count + 1);
+        	// set values
+        	if(valueKey !== null && valueKey !== undefined){
+            	for(var i = 0, l = self.inputs.length; i < l; i++){
+            		var name  = self.inputs[i].name,
+            			type  = self.inputs[i].type,
+            			value = null;
+            		if(self.values[name]){
+            			value = self.values[name][valueKey];
+            		}
+            		// skip undefined
+            		if(value === null || value === undefined){
+            			continue;
+            		}
+
+            		if(type === 'radio'){
+            			$row.find('*[name*="'+name+'"][value="' + value + '"]').attr('checked', 'checked');
+            		}else if(type === 'checkbox'){
+            			// check if there a multiple
+            			if(value.length){
+            				for(var v = 0, vl = value.length; v < vl; v++){
+            					$row.find('*[name*="'+name+'"][value="' + value[v] + '"]').attr('checked', 'checked');
+            				}
+            			} else {
+            				$row.find('*[name*="'+name+'"][value="' + value + '"]').attr('checked', 'checked');
+            			}
+
+            		} else {
+            			$row.find('*[name*="'+name+'"]').val(value);
+            		}
+            	}
+        	}
+
+        	// try find out with related scripts,
+        	// tricky thing, so be careful
+        	try {
+        		self.fixScripts($row);
+			} catch (e) {
+				if(window.console){
+					console.log(e);
+				}
+			}
+
+			// tell all about new row
+            self.$input.trigger('row-add', $row);
+
+        	return $row;
+        };
+
+        // remove row from container
+        self.removeRow = function(row){
+        	// tell all about row removing
+            self.$input.trigger('row-remove', row);
+
+        	$(row).remove();
+        };
+
+        //fix names ind id`s for field that in $row
+        self.fixUniqueAttributes = function($row, count){
+        	//all elements that have a "id" attribute
+        	var haveIds = $row.find('*[id]');
+        	self.increaseAttrName(haveIds, 'id', count);
+        	// all labels that have a "for" attribute
+        	var haveFor = $row.find('label[for]');
+        	self.increaseAttrName(haveFor, 'for', count);
+        	// all inputs that have a "name" attribute
+        	var haveName = $row.find('*[name]');
+        	self.increaseAttrName(haveName, 'name', count);
+        };
+
+        // increase attribute name like: attribute_value + '-' + count
+        self.increaseAttrName = function (elements, attr, count){
+        	for(var i = 0, l = elements.length; i < l; i++){
+        		var $el =  $(elements[i]);
+        		var oldValue = $el.attr(attr);
+        		// set new
+        		$el.attr(attr, count + '-' + oldValue);
+        	}
+        };
+
+        // refresh value in the main input
+        self.refreshValue = function(){
+        	var $rows = self.$container.find(self.options.repeatableElement);
+        	// reset existing
+        	self.values = {};
+        	// go through available input names
+            for(var i = 0, l = self.inputs.length; i < l; i++){
+            	var name = self.inputs[i].name,
+            		type = self.inputs[i].type;
+            	// init new
+            	self.values[name] = [];
+            	// find all inputs and take their values
+            	for(var r = 0, rl = $rows.length; r < rl; r++){
+            		var $row = $($rows[r]),
+            			val  = null;
+            		if(type === 'radio'){
+            			val = $row.find('*[name*="'+name+'"]:checked').val();
+            		}else if(type === 'checkbox'){
+            			var checked = $row.find('*[name*="'+name+'"]:checked');
+            			// test for multiple
+            			if(checked.length > 1){
+            				val = [];
+            				for(var c = 0, cl = checked.length; c < cl; c++){
+            					val.push($(checked[c]).val());
+            				}
+            			} else {
+            				// single checkbox
+            				val = checked.val();
+            			}
+            		}else{
+            			val = $row.find('*[name*="'+name+'"]').val();
+            		}
+            		val = val === null ? '' : val;
+
+            		self.values[name].push(val)
+            	}
+        	}
+        	// put in to the main input
+            self.$input.val(JSON.stringify(self.values));
+
+            // tell all about value changed
+            self.$input.trigger('value-update', self.values);
+        };
+
+        // remove scripts attached to fields
+        self.clearScripts = function($row){
+        	// destroy chosen if any
+        	if($.fn.chosen){
+                $row.find('select').each(function(){
+					var $el = $(this);
+					if ($el.data('chosen')) {
+						$el.chosen('destroy');
+						$el.addClass('here-was-chosen');
+					}
+				});
+        	}
+        	// colorpicker
+        	if($.fn.minicolors){
+        		$row.find('.minicolors input').each(function(){
+        			$(this).minicolors('destroy', $(this));
+        		});
+        	}
+        };
+
+        // method for hack the scripts that can be related
+        // to the one of field that in given $row
+        self.fixScripts = function($row){
+
+			// Chosen.js
+			if ($.fn.chosen) {
+				$row.find('select.here-was-chosen').removeClass('here-was-chosen').chosen();
+			}
+
+        	//color picker
+        	$row.find('.minicolors').each(function() {
+        		var $el = $(this);
+        		$el.minicolors({
+					control: $el.attr('data-control') || 'hue',
+					position: $el.attr('data-position') || 'right',
+					theme: 'bootstrap'
+				});
+			});
+
+        	// fix media field
+        	$row.find('a[onclick*="jInsertFieldValue"]').each(function(){
+        		var $el = $(this),
+        			inputId = $el.siblings('input[type="text"]').attr('id'),
+        			$select = $el.prev(),
+        			oldHref = $select.attr('href');
+        		// update the clear button
+        		$el.attr('onclick', "jInsertFieldValue('', '" + inputId + "');return false;");
+        		// update select button
+        		$select.attr('href', oldHref.replace(/&fieldid=(.+)&/, '&fieldid=' + inputId + '&'));
+				jMediaRefreshPreview(inputId);
+        	});
+		
+		// fix media field in ISIS Template
+		$row.find('.field-media-wrapper').each(function(){
+			var $el = $(this);
+			$el.fieldMedia();
+		});
+
+        	// another modals
+        	if(window.SqueezeBox && window.SqueezeBox.assign){
+        		SqueezeBox.assign($row.find('a.modal').get(), {parse: 'rel'});
+        	}
+        };
+
+        // Run initializer
+        self.init();
+    };
+
+    // defaults
+    $.JRepeatable.defaults = {
+    	modalElement: "#modal-container", // id of the modal container
+    	btModalOpen: "#open-modal", // id of the button for initiate the modal window
+    	btModalClose: ".close-modal", // button for close the modal window, and rollback all changes
+    	btModalSaveData: ".save-modal-data", // button for close the modal window, and keep the all changes
+    	btAdd: "a.add", //  button selector for "add" action
+    	btRemove: "a.remove",//  button selector for "remove" action
+    	maximum: 10, // maximum repeating
+    	repeatableElement: "table tbody tr"
+    };
+
+    $.fn.JRepeatable = function(options){
+        return this.each(function(){
+        	var options = options || {},
+        		data = $(this).data();
+
+        	for (var p in data) {
+                // check options in the element
+                if (data.hasOwnProperty(p)) {
+                     options[p] = data[p];
+                }
+            }
+         	new $.JRepeatable(this, options);
+        });
+    };
+
+    // initialise all available
+    // wait when all will be loaded, important for scripts fix
+	$(window).on('load', function(){
+		$('input.form-field-repeatable').JRepeatable();
+	})
+
+})(jQuery);
+
diff --git a/core/media/system/js/repeatable.js b/core/media/system/js/repeatable.js
new file mode 100644
index 00000000..934f6d79
--- /dev/null
+++ b/core/media/system/js/repeatable.js
@@ -0,0 +1 @@
+!function(e){"use strict";e.JRepeatable=function(t,n){var a=this;return a&&a!==window?(a.$input=e(t),a.$input.data("JRepeatable")?a:(a.$input.data("JRepeatable",a),a.init=function(){a.options=e.extend({},e.JRepeatable.defaults,n),a.$container=e(a.options.container),e("body").append(a.$container),a.$rowsContainer=a.$container.find(a.options.repeatableElement).parent(),a.prepareModal(),a.inputs=[],a.values={},a.prepareTemplate();var t=a.$input.val();if(t)try{a.values=JSON.parse(t)}catch(e){if(e instanceof SyntaxError)try{t=t.replace(/'/g,'"').replace(/\\"/g,"'"),a.values=JSON.parse(t)}catch(e){window.console&&console.log(e)}else window.console&&console.log(e)}a.buildRows(),e(document).on("click",a.options.btModalOpen,function(e){e.preventDefault(),a.$modalWindow.modal("show")}),a.$modalWindow.on("click",a.options.btModalClose,function(e){e.preventDefault(),a.$modalWindow.modal("hide"),a.buildRows()}),a.$modalWindow.on("click",a.options.btModalSaveData,function(e){e.preventDefault(),a.$modalWindow.modal("hide"),a.refreshValue()}),a.$container.on("click",a.options.btAdd,function(t){t.preventDefault();var n=e(this).parents(a.options.repeatableElement);n.length||(n=null),a.addRow(n)}),a.$container.on("click",a.options.btRemove,function(t){t.preventDefault();var n=e(this).parents(a.options.repeatableElement);a.removeRow(n)}),a.$input.trigger("weready")},a.prepareTemplate=function(){var t=a.$container.find(a.options.repeatableElement),n=e(t.get(0));try{a.clearScripts(n)}catch(e){window.console&&console.log(e)}for(var o=n.find("*[name]"),i=0,r=o.length;i<r;i++){var l=e(o[i]).attr("name");a.values[l]||(a.inputs.push({name:l,type:e(o[i]).attr("type")||o[i].tagName.toLowerCase()}),a.values[l]=[])}a.template=n.prop("outerHTML"),t.remove(),a.$input.trigger("prepare-template",a.template)},a.prepareModal=function(){var t=e(a.options.modalElement);t.css({position:"absolute",width:"auto","max-width":"100%"}),t.on("shown",function(){a.resizeModal()}),e(window).resize(function(){a.resizeModal()}),a.$modalWindow=t.modal({show:!1,backdrop:"static"}),a.$input.trigger("prepare-modal",a.$modalWindow)},a.resizeModal=function(){if(a.$modalWindow.is(":visible")){var t=e(document).width()/2,n=a.$modalWindow.width()/2,o=a.$rowsContainer.width()/2,i=n>=t?0:-n,r=i?"50%":0,l=e(document).scrollTop()+.2*e(window).height();a.$modalWindow.css({top:l,left:r,"margin-left":i,overflow:o>n?"auto":"visible"})}},a.buildRows=function(){var e=a.$rowsContainer.children();e.length&&a.removeRow(e);for(var t=a.values[Object.keys(a.values)[0]].length||1,n=null,o=0;o<t;o++)n=a.addRow(n,o)},a.addRow=function(t,n){var o=a.$container.find(a.options.repeatableElement).length;if(o>=a.options.maximum)return null;var i=e.parseHTML(a.template);t?e(t).after(i):a.$rowsContainer.append(i);var r=e(i);if(a.fixUniqueAttributes(r,o+1),null!==n&&void 0!==n)for(var l=0,d=a.inputs.length;l<d;l++){var s=a.inputs[l].name,c=a.inputs[l].type,p=null;if(a.values[s]&&(p=a.values[s][n]),null!==p&&void 0!==p)if("radio"===c)r.find('*[name*="'+s+'"][value="'+p+'"]').attr("checked","checked");else if("checkbox"===c)if(p.length)for(var u=0,f=p.length;u<f;u++)r.find('*[name*="'+s+'"][value="'+p[u]+'"]').attr("checked","checked");else r.find('*[name*="'+s+'"][value="'+p+'"]').attr("checked","checked");else r.find('*[name*="'+s+'"]').val(p)}try{a.fixScripts(r)}catch(e){window.console&&console.log(e)}return a.$input.trigger("row-add",r),r},a.removeRow=function(t){a.$input.trigger("row-remove",t),e(t).remove()},a.fixUniqueAttributes=function(e,t){var n=e.find("*[id]");a.increaseAttrName(n,"id",t);var o=e.find("label[for]");a.increaseAttrName(o,"for",t);var i=e.find("*[name]");a.increaseAttrName(i,"name",t)},a.increaseAttrName=function(t,n,a){for(var o=0,i=t.length;o<i;o++){var r=e(t[o]),l=r.attr(n);r.attr(n,a+"-"+l)}},a.refreshValue=function(){var t=a.$container.find(a.options.repeatableElement);a.values={};for(var n=0,o=a.inputs.length;n<o;n++){var i=a.inputs[n].name,r=a.inputs[n].type;a.values[i]=[];for(var l=0,d=t.length;l<d;l++){var s=e(t[l]),c=null;if("radio"===r)c=s.find('*[name*="'+i+'"]:checked').val();else if("checkbox"===r){var p=s.find('*[name*="'+i+'"]:checked');if(p.length>1){c=[];for(var u=0,f=p.length;u<f;u++)c.push(e(p[u]).val())}else c=p.val()}else c=s.find('*[name*="'+i+'"]').val();c=null===c?"":c,a.values[i].push(c)}}a.$input.val(JSON.stringify(a.values)),a.$input.trigger("value-update",a.values)},a.clearScripts=function(t){e.fn.chosen&&t.find("select").each(function(){e(this).data("chosen")&&e(this).chosen("destroy")}),e.fn.minicolors&&t.find(".minicolors input").each(function(){e(this).minicolors("destroy",e(this))})},a.fixScripts=function(t){t.find(".minicolors").each(function(){var t=e(this);t.minicolors({control:t.attr("data-control")||"hue",position:t.attr("data-position")||"right",theme:"bootstrap"})}),t.find('a[onclick*="jInsertFieldValue"]').each(function(){var t=e(this),n=t.siblings('input[type="text"]').attr("id"),a=t.prev(),o=a.attr("href");t.attr("onclick","jInsertFieldValue('', '"+n+"');return false;"),a.attr("href",o.replace(/&fieldid=(.+)&/,"&fieldid="+n+"&")),jMediaRefreshPreview(n)}),t.find(".field-media-wrapper").each(function(){e(this).fieldMedia()}),window.SqueezeBox&&window.SqueezeBox.assign&&SqueezeBox.assign(t.find("a.modal").get(),{parse:"rel"})},void a.init())):new e.JRepeatable(t,n)},e.JRepeatable.defaults={modalElement:"#modal-container",btModalOpen:"#open-modal",btModalClose:".close-modal",btModalSaveData:".save-modal-data",btAdd:"a.add",btRemove:"a.remove",maximum:10,repeatableElement:"table tbody tr"},e.fn.JRepeatable=function(t){return this.each(function(){var t=t||{},n=e(this).data();for(var a in n)n.hasOwnProperty(a)&&(t[a]=n[a]);new e.JRepeatable(this,t)})},e(window).on("load",function(){e("input.form-field-repeatable").JRepeatable()})}(jQuery);
\ No newline at end of file
diff --git a/core/media/system/js/sendtestmail-uncompressed.js b/core/media/system/js/sendtestmail-uncompressed.js
new file mode 100644
index 00000000..c238952f
--- /dev/null
+++ b/core/media/system/js/sendtestmail-uncompressed.js
@@ -0,0 +1,55 @@
+/**
+ * @package         Joomla.JavaScript
+ * @copyright       Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Calls the sending process of the config class
+ */
+var sendTestMail = function ()
+{
+	$ = jQuery;
+
+	var email_data = {
+		smtpauth  : $('input[name="jform[smtpauth]"]:checked').val(),
+		smtpuser  : $('input[name="jform[smtpuser]"]').val(),
+		smtppass  : $('input[name="jform[smtppass]"]').val(),
+		smtphost  : $('input[name="jform[smtphost]"]').val(),
+		smtpsecure: $('select[name="jform[smtpsecure]"]').val(),
+		smtpport  : $('input[name="jform[smtpport]"]').val(),
+		mailfrom  : $('input[name="jform[mailfrom]"]').val(),
+		fromname  : $('input[name="jform[fromname]"]').val(),
+		mailer    : $('select[name="jform[mailer]"]').val(),
+		mailonline: $('input[name="jform[mailonline]"]:checked').val()
+	};
+
+	// Remove js messages, if they exist.
+	Joomla.removeMessages();
+
+	$.ajax({
+		method: "POST",
+		url: document.getElementById('sendtestmail').getAttribute('data-ajaxuri'),
+		data: email_data,
+		dataType: "json"
+	})
+	.fail(function (jqXHR, textStatus, error) {
+		Joomla.renderMessages(Joomla.ajaxErrorsMessages(jqXHR, textStatus, error));
+
+		window.scrollTo(0, 0);
+	})
+	.done(function (response) {
+		// Render messages, if any.
+		if (typeof response.messages == 'object' && response.messages !== null)
+		{
+			Joomla.renderMessages(response.messages);
+
+			window.scrollTo(0, 0);
+		}
+	});
+};
+
+jQuery(document).ready(function ($)
+{
+	$('#sendtestmail').click(sendTestMail);
+});
diff --git a/core/media/system/js/sendtestmail.js b/core/media/system/js/sendtestmail.js
new file mode 100644
index 00000000..ab0314a2
--- /dev/null
+++ b/core/media/system/js/sendtestmail.js
@@ -0,0 +1 @@
+var sendTestMail=function(){$=jQuery;var e={smtpauth:$('input[name="jform[smtpauth]"]:checked').val(),smtpuser:$('input[name="jform[smtpuser]"]').val(),smtppass:$('input[name="jform[smtppass]"]').val(),smtphost:$('input[name="jform[smtphost]"]').val(),smtpsecure:$('select[name="jform[smtpsecure]"]').val(),smtpport:$('input[name="jform[smtpport]"]').val(),mailfrom:$('input[name="jform[mailfrom]"]').val(),fromname:$('input[name="jform[fromname]"]').val(),mailer:$('select[name="jform[mailer]"]').val(),mailonline:$('input[name="jform[mailonline]"]:checked').val()};Joomla.removeMessages(),$.ajax({method:"POST",url:document.getElementById("sendtestmail").getAttribute("data-ajaxuri"),data:e,dataType:"json"}).fail(function(e,a,m){Joomla.renderMessages(Joomla.ajaxErrorsMessages(e,a,m)),window.scrollTo(0,0)}).done(function(e){"object"==typeof e.messages&&null!==e.messages&&(Joomla.renderMessages(e.messages),window.scrollTo(0,0))})};jQuery(document).ready(function(e){e("#sendtestmail").click(sendTestMail)});
\ No newline at end of file
diff --git a/core/media/system/js/subform-repeatable-uncompressed.js b/core/media/system/js/subform-repeatable-uncompressed.js
new file mode 100644
index 00000000..fb7d5dd0
--- /dev/null
+++ b/core/media/system/js/subform-repeatable-uncompressed.js
@@ -0,0 +1,292 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+;(function($){
+	"use strict";
+	$.subformRepeatable = function(container, options){
+		this.$container = $(container);
+
+		// check if already exist
+		if(this.$container.data("subformRepeatable")){
+			return self;
+		}
+
+		// Add a reverse reference to the DOM object
+		this.$container.data("subformRepeatable", self);
+
+		// merge options
+		this.options = $.extend({}, $.subformRepeatable.defaults, options);
+
+		// template for the repeating group
+		this.template = '';
+
+		// prepare a row template, and find available field names
+		this.prepareTemplate();
+
+		// check rows container
+		this.$containerRows = this.options.rowsContainer ? this.$container.find(this.options.rowsContainer) : this.$container;
+
+		// last row number, help to avoid the name duplications
+        this.lastRowNum = this.$containerRows.find(this.options.repeatableElement).length;
+
+		// To avoid scope issues,
+		var self = this;
+
+		// bind add button
+		this.$container.on('click', this.options.btAdd, function (e) {
+			e.preventDefault();
+			var after = $(this).parents(self.options.repeatableElement);
+			if(!after.length){
+				after = null;
+			}
+			self.addRow(after);
+		});
+
+		// bind remove button
+		this.$container.on('click', this.options.btRemove, function (e) {
+			e.preventDefault();
+			var $row = $(this).parents(self.options.repeatableElement);
+			self.removeRow($row);
+		});
+
+		// bind move button
+		if(this.options.btMove){
+			this.$containerRows.sortable({
+				items: this.options.repeatableElement,
+				handle: this.options.btMove,
+				tolerance: 'pointer'
+			});
+		}
+
+		// tell all that we a ready
+		this.$container.trigger('subform-ready');
+	};
+
+	// prepare a template that we will use repeating
+	$.subformRepeatable.prototype.prepareTemplate = function(){
+		// create from template
+		if(this.options.rowTemplateSelector){
+			var tmplElement = this.$container.find(this.options.rowTemplateSelector)[0] || {};
+			this.template = $.trim(tmplElement.text || tmplElement.textContent); //(text || textContent) is IE8 fix
+		}
+		// create from existing rows
+		else {
+			//find first available
+			var row = this.$container.find(this.options.repeatableElement).get(0),
+				$row = $(row).clone();
+
+			// clear scripts that can be attached to the fields
+			try {
+				this.clearScripts($row);
+			} catch (e) {
+				if(window.console){
+					console.log(e);
+				}
+			}
+
+			this.template = $row.prop('outerHTML');
+		}
+	};
+
+	// add new row
+	$.subformRepeatable.prototype.addRow = function(after){
+		// count how much we already have
+		var count = this.$containerRows.find(this.options.repeatableElement).length;
+		if(count >= this.options.maximum){
+			return null;
+		}
+
+		// make new from template
+		var row = $.parseHTML(this.template);
+
+		//add to container
+		if(after){
+			$(after).after(row);
+		} else {
+			this.$containerRows.append(row);
+		}
+
+		var $row = $(row);
+		//add marker that it is new
+		$row.attr('data-new', 'true');
+		// fix names and id`s, and reset values
+		this.fixUniqueAttributes($row, count);
+
+		// try find out with related scripts,
+		// tricky thing, so be careful
+		try {
+			this.fixScripts($row);
+		} catch (e) {
+			if(window.console){
+				console.log(e);
+			}
+		}
+
+		// tell everyone about the new row
+		this.$container.trigger('subform-row-add', $row);
+		return $row;
+	};
+
+	// remove row
+	$.subformRepeatable.prototype.removeRow = function($row){
+		// count how much we have
+		var count = this.$containerRows.find(this.options.repeatableElement).length;
+		if(count <= this.options.minimum){
+			return;
+		}
+
+		// tell everyoune about the row will be removed
+		this.$container.trigger('subform-row-remove', $row);
+		$row.remove();
+	};
+
+	// fix names ind id`s for field that in $row
+	$.subformRepeatable.prototype.fixUniqueAttributes = function($row, count){
+		var group = $row.attr('data-group'),// current group name
+			basename = $row.attr('data-base-name'), // group base name, without count
+			count    = count || 0,
+			countnew = Math.max(this.lastRowNum, count),
+			groupnew = basename + countnew; // new group name
+
+		this.lastRowNum = countnew + 1;
+		$row.attr('data-group', groupnew);
+
+		// Fix inputs that have a "name" attribute
+		var haveName = $row.find('[name]'),
+			ids = {}; // Collect id for fix checkboxes and radio
+
+		for (var i = 0, l = haveName.length; i < l; i++) {
+			var $el     = $(haveName[i]),
+				name    = $el.attr('name'),
+				id      = name.replace(/(\[\]$)/g, '').replace(/(\]\[)/g, '__').replace(/\[/g, '_').replace(/\]/g, ''), // id from name
+				nameNew = name.replace('[' + group + '][', '['+ groupnew +']['), // New name
+				idNew   = id.replace(group, groupnew), // Count new id
+				countMulti = 0, // count for multiple radio/checkboxes
+				forOldAttr = id; // Fix "for" in the labels
+
+			if ($el.prop('type') === 'checkbox' && name.match(/\[\]$/)) { // <input type="checkbox" name="name[]"> fix
+				// Recount id
+				countMulti = ids[id] ? ids[id].length : 0;
+				if (!countMulti) {
+					// Set the id for fieldset and group label
+					$el.closest('fieldset.checkboxes').attr('id', idNew);
+					$row.find('label[for="' + id + '"]').attr('for', idNew).attr('id', idNew + '-lbl');
+				}
+				forOldAttr = forOldAttr + countMulti;
+				idNew = idNew + countMulti;
+			}
+			else if ($el.prop('type') === 'radio') { // <input type="radio"> fix
+				// Recount id
+				countMulti = ids[id] ? ids[id].length : 0;
+				if (!countMulti) {
+					// Set the id for fieldset and group label
+					$el.closest('fieldset.radio').attr('id', idNew);
+					$row.find('label[for="' + id + '"]').attr('for', idNew).attr('id', idNew + '-lbl');
+				}
+				forOldAttr = forOldAttr + countMulti;
+				idNew = idNew + countMulti;
+			}
+
+			// Cache already used id
+			if (ids[id]) {
+				ids[id].push(true);
+			} else {
+				ids[id] = [true];
+			}
+
+			// Replace the name to new one
+			$el.attr('name', nameNew);
+			// Set new id
+			$el.attr('id', idNew);
+			// Guess there a label for this input
+			$row.find('label[for="' + forOldAttr + '"]').attr('for', idNew).attr('id', idNew + '-lbl');
+		}
+	};
+
+	// remove scripts attached to fields
+	// @TODO: make thing better when something like that will be accepted https://github.com/joomla/joomla-cms/pull/6357
+	$.subformRepeatable.prototype.clearScripts = function($row){
+		// destroy chosen if any
+		if($.fn.chosen){
+			$row.find('select.chzn-done').each(function(){
+				var $el = $(this);
+				$el.next('.chzn-container').remove();
+				$el.show().addClass('fix-chosen');
+			});
+		}
+	};
+
+	// method for hack the scripts that can be related
+	// to the one of field that in given $row
+	$.subformRepeatable.prototype.fixScripts = function($row){
+		// fix media field
+		$row.find('a[onclick*="jInsertFieldValue"]').each(function(){
+				var $el = $(this),
+				inputId = $el.siblings('input[type="text"]').attr('id'),
+				$select = $el.prev(),
+				oldHref = $select.attr('href');
+			// update the clear button
+			$el.attr('onclick', "jInsertFieldValue('', '" + inputId + "');return false;")
+			// update select button
+			$select.attr('href', oldHref.replace(/&fieldid=(.+)&/, '&fieldid=' + inputId + '&'));
+		});
+
+		// bootstrap based Media field
+		if($.fn.fieldMedia){
+			$row.find('.field-media-wrapper').fieldMedia();
+		}
+
+		// bootstrap based User field
+		if($.fn.fieldUser){
+			$row.find('.field-user-wrapper').fieldUser();
+		}
+
+		// another modals
+		if(window.SqueezeBox && window.SqueezeBox.assign){
+			SqueezeBox.assign($row.find('a.modal').get(), {parse: 'rel'});
+		}
+	};
+
+	// defaults
+	$.subformRepeatable.defaults = {
+		btAdd: ".group-add", //  button selector for "add" action
+		btRemove: ".group-remove",//  button selector for "remove" action
+		btMove: ".group-move",//  button selector for "move" action
+		minimum: 0, // minimum repeating
+		maximum: 10, // maximum repeating
+		repeatableElement: ".subform-repeatable-group",
+		rowTemplateSelector: 'script.subform-repeatable-template-section', // selector for the row template <script>
+		rowsContainer: null // container for rows, same as main container by default
+	};
+
+	$.fn.subformRepeatable = function(options){
+		return this.each(function(){
+			var options = options || {},
+				data = $(this).data();
+
+			if(data.subformRepeatable){
+				// Alredy initialized, nothing to do here
+				return;
+			}
+
+			for (var p in data) {
+				// check options in the element
+				if (data.hasOwnProperty(p)) {
+					options[p] = data[p];
+				}
+			}
+
+			var inst = new $.subformRepeatable(this, options);
+			$(this).data('subformRepeatable', inst);
+		});
+	};
+
+	// initialise all available
+	// wait when all will be loaded, important for scripts fix
+	$(window).on('load', function(){
+		$('div.subform-repeatable').subformRepeatable();
+	})
+
+})(jQuery);
diff --git a/core/media/system/js/subform-repeatable.js b/core/media/system/js/subform-repeatable.js
new file mode 100644
index 00000000..09bb5adc
--- /dev/null
+++ b/core/media/system/js/subform-repeatable.js
@@ -0,0 +1 @@
+!function(w){"use strict";w.subformRepeatable=function(e,t){if(this.$container=w(e),this.$container.data("subformRepeatable"))return a;this.$container.data("subformRepeatable",a),this.options=w.extend({},w.subformRepeatable.defaults,t),this.template="",this.prepareTemplate(),this.$containerRows=this.options.rowsContainer?this.$container.find(this.options.rowsContainer):this.$container,this.lastRowNum=this.$containerRows.find(this.options.repeatableElement).length;var a=this;this.$container.on("click",this.options.btAdd,function(e){e.preventDefault();var t=w(this).parents(a.options.repeatableElement);t.length||(t=null),a.addRow(t)}),this.$container.on("click",this.options.btRemove,function(e){e.preventDefault();var t=w(this).parents(a.options.repeatableElement);a.removeRow(t)}),this.options.btMove&&this.$containerRows.sortable({items:this.options.repeatableElement,handle:this.options.btMove,tolerance:"pointer"}),this.$container.trigger("subform-ready")},w.subformRepeatable.prototype.prepareTemplate=function(){if(this.options.rowTemplateSelector){var e=this.$container.find(this.options.rowTemplateSelector)[0]||{};this.template=w.trim(e.text||e.textContent)}else{var t=this.$container.find(this.options.repeatableElement).get(0),a=w(t).clone();try{this.clearScripts(a)}catch(e){window.console&&console.log(e)}this.template=a.prop("outerHTML")}},w.subformRepeatable.prototype.addRow=function(e){var t=this.$containerRows.find(this.options.repeatableElement).length;if(t>=this.options.maximum)return null;var a=w.parseHTML(this.template);e?w(e).after(a):this.$containerRows.append(a);var o=w(a);o.attr("data-new","true"),this.fixUniqueAttributes(o,t);try{this.fixScripts(o)}catch(e){window.console&&console.log(e)}return this.$container.trigger("subform-row-add",o),o},w.subformRepeatable.prototype.removeRow=function(e){this.$containerRows.find(this.options.repeatableElement).length<=this.options.minimum||(this.$container.trigger("subform-row-remove",e),e.remove())},w.subformRepeatable.prototype.fixUniqueAttributes=function(e,t){var a=e.attr("data-group"),o=e.attr("data-base-name"),r=(t=t||0,Math.max(this.lastRowNum,t)),i=o+r;this.lastRowNum=r+1,e.attr("data-group",i);for(var n=e.find("[name]"),s={},l=0,p=n.length;l<p;l++){var f=w(n[l]),c=f.attr("name"),h=c.replace(/(\[\]$)/g,"").replace(/(\]\[)/g,"__").replace(/\[/g,"_").replace(/\]/g,""),d=c.replace("["+a+"][","["+i+"]["),u=h.replace(a,i),m=0,b=h;"checkbox"===f.prop("type")&&c.match(/\[\]$/)?((m=s[h]?s[h].length:0)||(f.closest("fieldset.checkboxes").attr("id",u),e.find('label[for="'+h+'"]').attr("for",u).attr("id",u+"-lbl")),b+=m,u+=m):"radio"===f.prop("type")&&((m=s[h]?s[h].length:0)||(f.closest("fieldset.radio").attr("id",u),e.find('label[for="'+h+'"]').attr("for",u).attr("id",u+"-lbl")),b+=m,u+=m),s[h]?s[h].push(!0):s[h]=[!0],f.attr("name",d),f.attr("id",u),e.find('label[for="'+b+'"]').attr("for",u).attr("id",u+"-lbl")}},w.subformRepeatable.prototype.clearScripts=function(e){w.fn.chosen&&e.find("select.chzn-done").each(function(){var e=w(this);e.next(".chzn-container").remove(),e.show().addClass("fix-chosen")})},w.subformRepeatable.prototype.fixScripts=function(e){e.find('a[onclick*="jInsertFieldValue"]').each(function(){var e=w(this),t=e.siblings('input[type="text"]').attr("id"),a=e.prev(),o=a.attr("href");e.attr("onclick","jInsertFieldValue('', '"+t+"');return false;"),a.attr("href",o.replace(/&fieldid=(.+)&/,"&fieldid="+t+"&"))}),w.fn.fieldMedia&&e.find(".field-media-wrapper").fieldMedia(),w.fn.fieldUser&&e.find(".field-user-wrapper").fieldUser(),window.SqueezeBox&&window.SqueezeBox.assign&&SqueezeBox.assign(e.find("a.modal").get(),{parse:"rel"})},w.subformRepeatable.defaults={btAdd:".group-add",btRemove:".group-remove",btMove:".group-move",minimum:0,maximum:10,repeatableElement:".subform-repeatable-group",rowTemplateSelector:"script.subform-repeatable-template-section",rowsContainer:null},w.fn.subformRepeatable=function(e){return this.each(function(){var e=e||{},t=w(this).data();if(!t.subformRepeatable){for(var a in t)t.hasOwnProperty(a)&&(e[a]=t[a]);var o=new w.subformRepeatable(this,e);w(this).data("subformRepeatable",o)}})},w(window).on("load",function(){w("div.subform-repeatable").subformRepeatable()})}(jQuery);
\ No newline at end of file
diff --git a/core/media/system/js/switcher-uncompressed.js b/core/media/system/js/switcher-uncompressed.js
new file mode 100644
index 00000000..7fa15b0b
--- /dev/null
+++ b/core/media/system/js/switcher-uncompressed.js
@@ -0,0 +1,93 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Switcher behavior
+ *
+ * @package     Joomla
+ * @since       1.5
+ */
+var JSwitcher = function(toggler, element, _options) {
+    var $, $togglers, $elements, current, options = {
+        onShow : function() {
+        },
+        onHide : function() {
+        },
+        cookieName : 'switcher',
+        togglerSelector : 'a',
+        elementSelector : 'div.tab',
+        elementPrefix : 'page-'
+    },
+
+    initialize = function(toggler, element, _options) {
+        $ = jQuery.noConflict();
+        $.extend(options, _options);
+
+        $togglers = $(toggler).find(options.togglerSelector);
+        $elements = $(element).find(options.elementSelector);
+
+        if (($togglers.length === 0) || ($togglers.length !== $elements.length)) {
+            return;
+        }
+
+        hideAll();
+
+        $togglers.each(function() {
+            $(this).on('click', function() {
+                display($(this).attr('id'));
+            });
+        })
+
+        var first = document.location.hash.substring(1);
+        if (first) {
+            display(first);
+        } else if ($togglers.length) {
+            display($togglers.first().attr('id'));
+        }
+    },
+
+    display = function(togglerId) {
+        var $toggler = $('#' + togglerId), $element = $('#' + options.elementPrefix + togglerId);
+
+        if ($toggler.length === 0 || $element.length === 0 || togglerId === current) {
+            return this;
+        }
+
+        if (current) {
+            hide($('#' + options.elementPrefix + current));
+            $('#' + current).removeClass('active');
+        }
+
+        show($element);
+        $toggler.addClass('active');
+        current = togglerId;
+        document.location.hash = current;
+        $(window).scrollTop(0);
+    },
+
+    hide = function(element) {
+        options.onShow(element);
+        $(element).hide();
+    },
+
+    hideAll = function() {
+        $elements.hide();
+        $togglers.removeClass('active');
+    },
+
+    show = function(element) {
+        options.onHide(element);
+        $(element).show();
+    };
+
+    initialize(toggler, element, _options);
+
+    return{
+        display: display,
+        hide: hide,
+        hideAll: hideAll,
+        show: show
+    };
+};
diff --git a/core/media/system/js/switcher.js b/core/media/system/js/switcher.js
new file mode 100644
index 00000000..63ae9101
--- /dev/null
+++ b/core/media/system/js/switcher.js
@@ -0,0 +1 @@
+/*        GNU General Public License version 2 or later; see LICENSE.txt*/var JSwitcher=function(f,c,l){var b,k,i,g,m={onShow:function(){},onHide:function(){},cookieName:"switcher",togglerSelector:"a",elementSelector:"div.tab",elementPrefix:"page-"},a=function(p,o,n){b=jQuery.noConflict();b.extend(m,n);k=b(p).find(m.togglerSelector);i=b(o).find(m.elementSelector);if((k.length===0)||(k.length!==i.length)){return}d();k.each(function(){b(this).on("click",function(){h(b(this).attr("id"))})});var q=document.location.hash.substring(1);if(q){h(q)}else{if(k.length){h(k.first().attr("id"))}}},h=function(o){var p=b("#"+o),n=b("#"+m.elementPrefix+o);if(p.length===0||n.length===0||o===g){return this}if(g){e(b("#"+m.elementPrefix+g));b("#"+g).removeClass("active")}j(n);p.addClass("active");g=o;document.location.hash=g;b(window).scrollTop(0)},e=function(n){m.onShow(n);b(n).hide()},d=function(){i.hide();k.removeClass("active")},j=function(n){m.onHide(n);b(n).show()};a(f,c,l);return{display:h,hide:e,hideAll:d,show:j}};
\ No newline at end of file
diff --git a/core/media/system/js/tabs-state-uncompressed.js b/core/media/system/js/tabs-state-uncompressed.js
new file mode 100644
index 00000000..e7fb61ac
--- /dev/null
+++ b/core/media/system/js/tabs-state-uncompressed.js
@@ -0,0 +1,243 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * JavaScript behavior to allow selected tab to be remained after save or page reload
+ * keeping state in sessionStorage with better handling of multiple tab widgets per page
+ * and not saving the state if there is no id in the url (like on the CREATE page of content)
+ */
+
+jQuery(function ($) {
+
+    // Ensure in IE8 we can use xpath
+    if (typeof wgxpath.install === "function") {
+        wgxpath.install();
+    }
+
+    /**
+     * Tiny jQuery extension to allow getting of url params
+     * @use jQuery.urlParam('param') or $.urlParam('myRegex|anotherRegex')
+     * If no trailing equals sign in name, add one, allows for general reuse
+     */
+    $.urlParam = function (name) {
+        if (!new RegExp("=$").exec(name)) {
+            name = name + '=';
+        }
+        var results = new RegExp("[\\?&](" + name + ")([^&#]*)").exec(window.location.href);
+        return results ? results[1] : null;
+    };
+
+    // jQuery extension to get the XPATH of a DOM element
+    $.getXpath = function (el) {
+        if (typeof el == "string") {
+            return document.evaluate(el, document, null, 0, null);
+        }
+        if (!el || el.nodeType != 1) {
+            return "";
+        }
+        if (el.id) {
+            return "//*[@id='" + el.id + "']";
+        }
+        var a = [];
+        var sames = a.filter.call(el.parentNode.children, function (x) {
+            return x.tagName == el.tagName;
+        });
+        var b = [];
+        return $.getXpath(el.parentNode) + "/" + el.tagName.toLowerCase() + (sames.length > 1 ? "[" + (b.indexOf.call(sames, el) + 1) + "]" : "");
+    };
+
+    // jQuery extension to get the DOM element from an XPATH
+    $.findXpath = function (exp, ctxt) {
+        var item;
+        var coll = [];
+        var result = document.evaluate(exp, ctxt || document, null, 5, null);
+
+        while (item = result.iterateNext()) {
+            coll.push(item);
+        }
+
+        return $(coll);
+    };
+
+    var loadTabs = function () {
+
+        /**
+         * Remove an item from an array
+         */
+        function remove_item(activeTabsHrefs, tabCollection) {
+            for (var i = 0; i < activeTabsHrefs.length; i++) {
+                if (activeTabsHrefs[i].indexOf(tabCollection) > -1) {
+                    activeTabsHrefs.splice(i, 1);
+                }
+            }
+
+            return activeTabsHrefs;
+        }
+
+        /**
+         * Generate the sessionStorage key we will use
+         * This is the URL minus some cleanup
+         */
+        function getStorageKey() {
+            return window.location.href.toString().split(window.location.host)[1].replace(/&return=[a-zA-Z0-9%]+/, "").split('#')[0];
+        }
+
+        /**
+         * Save this tab to the storage in the form of a pseudo keyed array
+         */
+        function saveActiveTab(event) {
+
+            // Get a new storage key, normally the full url we are on with some cleanup
+            var storageKey = getStorageKey();
+
+            // get this tabs own href
+            var href = $(event.target).attr("href");
+
+            // find the collection of tabs this tab belongs to, and calcuate the unique xpath to it
+            var tabCollection = $.getXpath($(event.target).closest(".nav-tabs").first().get(0));
+
+            // error handling
+            if (!tabCollection || typeof href == "undefined") {
+                return;
+            }
+
+            // Create a dummy keyed array as js doesnt allow keyed arrays
+            var storageValue = tabCollection + "|" + href;
+
+            // Get the current array from the storage
+            var activeTabsHrefs = JSON.parse(sessionStorage.getItem(storageKey));
+
+            // If none start a new array
+            if (!activeTabsHrefs) {
+                var activeTabsHrefs = [];
+            } else {
+                // Avoid Duplicates in the storage
+                remove_item(activeTabsHrefs, tabCollection);
+            }
+
+            // Save clicked tab, with relationship to tabCollection to the array
+            activeTabsHrefs.push(storageValue);
+
+            // Store the selected tabs as an array in sessionStorage
+            sessionStorage.setItem(storageKey, JSON.stringify(activeTabsHrefs));
+        }
+
+        // Array with active tabs hrefs
+        var activeTabsHrefs = JSON.parse(sessionStorage.getItem(getStorageKey()));
+
+        // jQuery object with all tabs links
+        var alltabs = $("a[data-toggle='tab']");
+
+        // When a tab is clicked, save its state!
+        alltabs.on("click", function (e) {
+            saveActiveTab(e);
+        });
+
+        // Clean default tabs
+        alltabs.parent(".active").removeClass("active");
+
+        // If we cannot find a tab storage for this url, see if we are coming from a save of a new item
+        if (!activeTabsHrefs) {
+            var unSavedStateUrl = getStorageKey().replace(/\&id=[0-9]*|[a-z]\&{1}_id=[0-9]*/, '');
+            activeTabsHrefs = JSON.parse(sessionStorage.getItem(unSavedStateUrl));
+            sessionStorage.removeItem(unSavedStateUrl);
+        }
+
+        // we have some tab states to restore, if we see a hash then let that trump the saved state
+        if (activeTabsHrefs !== null && !window.location.hash) {
+
+            // When moving from tab area to a different view
+            $.each(activeTabsHrefs, function (index, tabFakexPath) {
+
+                // Click the tab
+                var parts = tabFakexPath.split("|");
+                $.findXpath(parts[0]).find("a[data-toggle='tab'][href='" + parts[1] + "']").click();
+
+            });
+
+        } else { // clean slate start
+
+            // a list of tabs to click
+            var tabsToClick = [];
+
+            // If we are passing a hash then this trumps everything
+            if (window.location.hash) {
+
+                // for each set of tabs on the page
+                alltabs.parents("ul").each(function (index, ul) {
+
+                    // If no tabs is saved, activate first tab from each tab set and save it
+                    var tabToClick = $(ul).find("a[href='" + window.location.hash + "']");
+
+                    // If we found some|one
+                    if (tabToClick.length) {
+
+                        // if we managed to locate its selector directly
+                        if (tabToClick.selector) {
+
+                            // highlight tab of the tabs if the hash matches
+                            tabsToClick.push(tabToClick);
+                        } else {
+
+                            // highlight first tab of the tabs
+                            tabsToClick.push(tabToClick.first());
+                        }
+
+                        var parentPane = tabToClick.closest('.tab-pane');
+
+                        // bubble up for nested tabs (like permissions tabs in the permissions pane)
+                        if (parentPane) {
+                            var id = parentPane.attr('id');
+                            if (id) {
+                                var parentTabToClick = $(parentPane).find("a[href='#" + id + "']");
+                                if (parentTabToClick) {
+                                    tabsToClick.push(parentTabToClick);
+                                }
+                            }
+                        }
+                    }
+
+                    // cleanup for another loop
+                    parentTabToClick = null;
+                    tabToClick = null;
+                    parentPane = null;
+                    id = null;
+                });
+
+                // run in the right order bubbling up
+                tabsToClick.reverse();
+
+                // for all queued tabs
+                for (var i = 0; i < tabsToClick.length; i++) {
+
+                    // click the tabs, thus storing them
+                    jQuery(tabsToClick[i].selector).click();
+                }
+
+                // Remove the #hash in the url - with support for older browsers with no flicker
+                var scrollV, scrollH, loc = window.location;
+                if ("pushState" in history)
+                    history.pushState("", document.title, loc.pathname + loc.search);
+                else {
+                    // Prevent scrolling by storing the page's current scroll offset
+                    scrollV = document.body.scrollTop;
+                    scrollH = document.body.scrollLeft;
+                    loc.hash = "";
+                    // Restore the scroll offset, should be flicker free
+                    document.body.scrollTop = scrollV;
+                    document.body.scrollLeft = scrollH;
+                }
+
+            } else {
+                alltabs.parents("ul").each(function (index, ul) {
+                    // If no tabs is saved, activate first tab from each tab set and save it
+                    $(ul).find("a").first().click();
+                });
+            }
+        }
+    };
+
+    setTimeout(loadTabs, 100);
+});
diff --git a/core/media/system/js/tabs-state.js b/core/media/system/js/tabs-state.js
new file mode 100644
index 00000000..f76dd4f7
--- /dev/null
+++ b/core/media/system/js/tabs-state.js
@@ -0,0 +1 @@
+jQuery(function($){if(typeof wgxpath.install==="function"){wgxpath.install()}$.urlParam=function(a){if(!new RegExp("=$").exec(a)){a=a+'='}var b=new RegExp("[\\?&]("+a+")([^&#]*)").exec(window.location.href);return b?b[1]:null};$.getXpath=function(c){if(typeof c=="string"){return document.evaluate(c,document,null,0,null)}if(!c||c.nodeType!=1){return""}if(c.id){return"//*[@id='"+c.id+"']"}var a=[];var d=a.filter.call(c.parentNode.children,function(x){return x.tagName==c.tagName});var b=[];return $.getXpath(c.parentNode)+"/"+c.tagName.toLowerCase()+(d.length>1?"["+(b.indexOf.call(d,c)+1)+"]":"")};$.findXpath=function(a,b){var c;var d=[];var e=document.evaluate(a,b||document,null,5,null);while(c=e.iterateNext()){d.push(c)}return $(d)};var m=function(){function remove_item(a,b){for(var i=0;i<a.length;i++){if(a[i].indexOf(b)>-1){a.splice(i,1)}}return a}function getStorageKey(){return window.location.href.toString().split(window.location.host)[1].replace(/&return=[a-zA-Z0-9%]+/,"").split('#')[0]}function saveActiveTab(a){var b=getStorageKey();var c=$(a.target).attr("href");var d=$.getXpath($(a.target).closest(".nav-tabs").first().get(0));if(!d||typeof c=="undefined"){return}var e=d+"|"+c;var f=JSON.parse(sessionStorage.getItem(b));if(!f){var f=[]}else{remove_item(f,d)}f.push(e);sessionStorage.setItem(b,JSON.stringify(f))}var g=JSON.parse(sessionStorage.getItem(getStorageKey()));var h=$("a[data-toggle='tab']");h.on("click",function(e){saveActiveTab(e)});h.parent(".active").removeClass("active");if(!g){var j=getStorageKey().replace(/\&id=[0-9]*|[a-z]\&{1}_id=[0-9]*/,'');g=JSON.parse(sessionStorage.getItem(j));sessionStorage.removeItem(j)}if(g!==null&&!window.location.hash){$.each(g,function(a,b){var c=b.split("|");$.findXpath(c[0]).find("a[data-toggle='tab'][href='"+c[1]+"']").click()})}else{var k=[];if(window.location.hash){h.parents("ul").each(function(a,b){var c=$(b).find("a[href='"+window.location.hash+"']");if(c.length){if(c.selector){k.push(c)}else{k.push(c.first())}var d=c.closest('.tab-pane');if(d){var e=d.attr('id');if(e){var f=$(d).find("a[href='#"+e+"']");if(f){k.push(f)}}}}f=null;c=null;d=null;e=null});k.reverse();for(var i=0;i<k.length;i++){jQuery(k[i].selector).click()}var l,scrollH,loc=window.location;if("pushState"in history)history.pushState("",document.title,loc.pathname+loc.search);else{l=document.body.scrollTop;scrollH=document.body.scrollLeft;loc.hash="";document.body.scrollTop=l;document.body.scrollLeft=scrollH}}else{h.parents("ul").each(function(a,b){$(b).find("a").first().click()})}}};setTimeout(m,100)});
\ No newline at end of file
diff --git a/core/media/system/js/tabs.js b/core/media/system/js/tabs.js
new file mode 100644
index 00000000..897ff31b
--- /dev/null
+++ b/core/media/system/js/tabs.js
@@ -0,0 +1,89 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Object.append(Browser.Features, {
+	localstorage: (function() {
+		return ('localStorage' in window) && window.localStorage !== null;
+	})()
+});
+
+/**
+ * Tabs behavior
+ *
+ * @package		Joomla!
+ * @subpackage	JavaScript
+ * @since		1.5
+ */
+var JTabs = new Class({
+	Implements: [Options, Events],
+
+	options : {
+		display: 0,
+		useStorage: true,
+		onActive: function(title, description) {
+			description.setStyle('display', 'block');
+			title.addClass('open').removeClass('closed');
+		},
+		onBackground: function(title, description){
+			description.setStyle('display', 'none');
+			title.addClass('closed').removeClass('open');
+		},
+		titleSelector: 'dt',
+		descriptionSelector: 'dd'
+	},
+
+	initialize: function(dlist, options){
+		this.setOptions(options);
+		this.dlist = document.id(dlist);
+		this.titles = this.dlist.getChildren(this.options.titleSelector);
+		this.descriptions = this.dlist.getChildren(this.options.descriptionSelector);
+		this.content = new Element('div').inject(this.dlist, 'after').addClass('current');
+		this.storageName = 'jpanetabs_'+this.dlist.id;
+
+		if (this.options.useStorage) {
+			if (Browser.Features.localstorage) {
+				this.options.display = this.options.display || localStorage[this.storageName];
+			} else {
+				this.options.display = this.options.display || Cookie.read(this.storageName);
+			}
+		}
+		if (this.options.display === null || this.options.display === undefined) {
+			this.options.display = 0;
+		}
+		this.options.display = this.options.display.toInt().limit(0, this.titles.length-1);
+
+		for (var i = 0, l = this.titles.length; i < l; i++)
+		{
+			var title = this.titles[i];
+			var description = this.descriptions[i];
+			title.setStyle('cursor', 'pointer');
+			title.addEvent('click', this.display.bind(this, i));
+			description.inject(this.content);
+		}
+
+		this.display(this.options.display);
+
+		if (this.options.initialize) this.options.initialize.call(this);
+	},
+
+	hideAllBut: function(but) {
+		for (var i = 0, l = this.titles.length; i < l; i++)
+		{
+			if (i != but) this.fireEvent('onBackground', [this.titles[i], this.descriptions[i]]);
+		}
+	},
+
+	display: function(i) {
+		this.hideAllBut(i);
+		this.fireEvent('onActive', [this.titles[i], this.descriptions[i]]);
+		if (this.options.useStorage) {
+			if (Browser.Features.localstorage) {
+				localStorage[this.storageName] = i;
+			} else {
+				Cookie.write(this.storageName, i);
+			}
+		}
+	}
+});
diff --git a/core/media/system/js/validate-uncompressed.js b/core/media/system/js/validate-uncompressed.js
new file mode 100644
index 00000000..bf76efdc
--- /dev/null
+++ b/core/media/system/js/validate-uncompressed.js
@@ -0,0 +1,240 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Unobtrusive Form Validation library
+ *
+ * Inspired by: Chris Campbell <www.particletree.com>
+ *
+ * @since  1.5
+ */
+var JFormValidator = function() {
+	"use strict";
+	var handlers, inputEmail, custom,
+
+ 	setHandler = function(name, fn, en) {
+ 	 	en = (en === '') ? true : en;
+ 	 	handlers[name] = {
+ 	 	 	enabled : en,
+ 	 	 	exec : fn
+ 	 	};
+ 	},
+
+ 	findLabel = function(id, form){
+ 	 	var $label, $form = jQuery(form);
+ 	 	if (!id) {
+ 	 	 	return false;
+ 	 	}
+ 	 	$label = $form.find('#' + id + '-lbl');
+ 	 	if ($label.length) {
+ 	 	 	return $label;
+ 	 	}
+ 	 	$label = $form.find('label[for="' + id + '"]');
+ 	 	if ($label.length) {
+ 	 	 	return $label;
+ 	 	}
+ 	 	return false;
+ 	},
+
+ 	handleResponse = function(state, $el) {
+ 		// Get a label
+ 	 	var $label = $el.data('label');
+ 	 	if ($label === undefined) {
+ 	 		$label = findLabel($el.attr('id'), $el.get(0).form);
+ 	 		$el.data('label', $label);
+ 	 	}
+
+ 	 	// Set the element and its label (if exists) invalid state
+ 	 	if (state === false) {
+ 	 	 	$el.addClass('invalid').attr('aria-invalid', 'true');
+ 	 	 	if ($label) {
+ 	 	 	 	$label.addClass('invalid');
+ 	 	 	}
+ 	 	} else {
+ 	 	 	$el.removeClass('invalid').attr('aria-invalid', 'false');
+ 	 	 	if ($label) {
+ 	 	 	 	$label.removeClass('invalid');
+ 	 	 	}
+ 	 	}
+ 	},
+
+ 	validate = function(el) {
+ 	 	var $el = jQuery(el), tagName, handler;
+ 	 	// Ignore the element if its currently disabled, because are not submitted for the http-request. For those case return always true.
+ 	 	if ($el.attr('disabled')) {
+ 	 	 	handleResponse(true, $el);
+ 	 	 	return true;
+ 	 	}
+ 	 	// If the field is required make sure it has a value
+ 	 	if ($el.attr('required') || $el.hasClass('required')) {
+ 	 	 	tagName = $el.prop("tagName").toLowerCase();
+ 	 	 	if (tagName === 'fieldset' && ($el.hasClass('radio') || $el.hasClass('checkboxes'))) {
+ 	 	 	 	if (!$el.find('input:checked').length){
+ 	 	 	 	 	handleResponse(false, $el);
+ 	 	 	 	 	return false;
+ 	 	 	 	}
+ 	 	 	//If element has class placeholder that means it is empty.
+ 	 	 	} else if (!$el.val() || $el.hasClass('placeholder') || ($el.attr('type') === 'checkbox' && !$el.is(':checked'))) {
+ 	 	 	 	handleResponse(false, $el);
+ 	 	 	 	return false;
+ 	 	 	}
+ 	 	}
+ 	 	// Only validate the field if the validate class is set
+ 	 	handler = ($el.attr('class') && $el.attr('class').match(/validate-([a-zA-Z0-9\_\-]+)/)) ? $el.attr('class').match(/validate-([a-zA-Z0-9\_\-]+)/)[1] : "";
+
+		// Try HTML5 pattern first then the handlers
+	    if ($el.attr('pattern') && $el.attr('pattern') != '') {
+		if ($el.val().length) {
+			isValid = new RegExp('^'+$el.attr('pattern')+'$').test($el.val());
+			handleResponse(isValid, $el);
+			return isValid;					
+		}
+		if ($el.attr('required') || $el.hasClass('required')) {
+			handleResponse(false, $el);
+			return false;
+		}
+		handleResponse(true, $el);
+		return true;
+	    } else {
+		    if (handler === '') {
+			    handleResponse(true, $el);
+			    return true;
+		    }
+		    // Check the additional validation types
+		    if ((handler) && (handler !== 'none') && (handlers[handler]) && $el.val()) {
+			    // Execute the validation handler and return result
+			    if (handlers[handler].exec($el.val(), $el) !== true) {
+				    handleResponse(false, $el);
+				    return false;
+			    }
+		    }
+		    // Return validation state
+		    handleResponse(true, $el);
+		    return true;
+	    }
+ 	},
+
+ 	isValid = function(form) {
+ 		var fields, valid = true, message, error, label, invalid = [], i, l;
+
+ 		// Validate form fields
+ 		fields = jQuery(form).find('input, textarea, select, fieldset');
+ 	 	for (i = 0, l = fields.length; i < l; i++) {
+ 	 		// Ignore Rule/Filters/Assigned field for spead up validation
+ 	 		// And other fields that has class="novalidate"
+ 	 		if(jQuery(fields[i]).hasClass('novalidate')) {
+ 	 			continue;
+ 	 		}
+ 	 	 	if (validate(fields[i]) === false) {
+ 	 	 	 	valid = false;
+ 	 	 	 	invalid.push(fields[i]);
+ 	 	 	}
+ 	 	}
+
+ 	 	// Run custom form validators if present
+ 	 	jQuery.each(custom, function(key, validator) {
+ 	 	 	if (validator.exec() !== true) {
+ 	 	 	 	valid = false;
+ 	 	 	}
+ 	 	});
+
+ 	 	if (!valid && invalid.length > 0) {
+ 	 	 	message = Joomla.JText._('JLIB_FORM_FIELD_INVALID');
+ 	 	 	error = {"error": []};
+ 	 	 	for (i = invalid.length - 1; i >= 0; i--) {
+ 	 	 		label = jQuery(invalid[i]).data("label");
+ 	 			if (label) {
+ 	 	 			error.error.push(message + label.text().replace("*", ""));
+                		}
+ 	 	 	}
+ 	 	 	Joomla.renderMessages(error);
+ 	 	}
+ 	 	return valid;
+ 	},
+
+ 	attachToForm = function(form) {
+ 	 	var inputFields = [], elements,
+ 	 		$form = jQuery(form);
+ 	 	// Iterate through the form object and attach the validate method to all input fields.
+ 	 	elements = $form.find('input, textarea, select, fieldset, button');
+ 	 	for (var i = 0, l = elements.length; i < l; i++) {
+ 	 	 	var $el = jQuery(elements[i]), tagName = $el.prop("tagName").toLowerCase();
+ 	 	 	// Attach isValid method to submit button
+ 	 	 	if ((tagName === 'input' || tagName === 'button') && ($el.attr('type') === 'submit' || $el.attr('type') === 'image')) {
+ 	 	 	 	if ($el.hasClass('validate')) {
+ 	 	 	 	 	$el.on('click', function() {
+ 	 	 	 	 	 	return isValid(form);
+ 	 	 	 	 	});
+ 	 	 	 	}
+ 	 	 	}
+ 	 	 	// Attach validate method only to fields
+ 	 	 	else if (tagName !== 'button' && !(tagName === 'input' && $el.attr('type') === 'button')) {
+ 	 	 	 	if ($el.hasClass('required')) {
+ 	 	 	 	 	$el.attr('aria-required', 'true').attr('required', 'required');
+ 	 	 	 	}
+ 	 	 	 	if (tagName !== 'fieldset') {
+ 	 	 	 	 	$el.on('blur', function() {
+ 	 	 	 	 	 	return validate(this);
+ 	 	 	 	 	});
+ 	 	 	 	 	if ($el.hasClass('validate-email') && inputEmail) {
+ 	 	 	 	 		elements[i].setAttribute('type', 'email');
+ 	 	 	 	 	}
+ 	 	 	 	}
+ 	 	 	 	inputFields.push($el);
+ 	 	 	}
+ 	 	}
+ 	 	$form.data('inputfields', inputFields);
+ 	},
+
+ 	initialize = function() {
+ 	 	handlers = {};
+ 	 	custom = custom || {};
+
+ 	 	inputEmail = (function() {
+ 	 	 	var input = document.createElement("input");
+ 	 	 	input.setAttribute("type", "email");
+ 	 	 	return input.type !== "text";
+ 	 	})();
+ 	 	// Default handlers
+ 	 	setHandler('username', function(value, element) {
+ 	 	 	var regex = new RegExp("[\<|\>|\"|\'|\%|\;|\(|\)|\&]", "i");
+ 	 	 	return !regex.test(value);
+ 	 	});
+ 	 	setHandler('password', function(value, element) {
+ 	 	 	var regex = /^\S[\S ]{2,98}\S$/;
+ 	 	 	return regex.test(value);
+ 	 	});
+ 	 	setHandler('numeric', function(value, element) {
+ 	 		var regex = /^(\d|-)?(\d|,)*\.?\d*$/;
+ 	 	 	return regex.test(value);
+ 	 	});
+ 	 	setHandler('email', function(value, element) {
+		    value = punycode.toASCII(value);
+ 	 	 	var regex = /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
+ 	 	 	return regex.test(value);
+ 	 	});
+ 	 	// Attach to forms with class 'form-validate'
+ 	 	var forms = jQuery('form.form-validate');
+ 	 	for (var i = 0, l = forms.length; i < l; i++) {
+ 	 	 	attachToForm(forms[i]);
+ 	 	}
+ 	};
+
+ 	// Initialize handlers and attach validation to form
+ 	initialize();
+
+ 	return {
+ 	 	isValid : isValid,
+ 	 	validate : validate,
+ 	 	setHandler : setHandler,
+ 	 	attachToForm : attachToForm,
+ 	 	custom: custom
+ 	};
+};
+
+document.formvalidator = null;
+jQuery(function() {
+	document.formvalidator = new JFormValidator();
+});
diff --git a/core/media/system/js/validate.js b/core/media/system/js/validate.js
new file mode 100644
index 00000000..b26b658d
--- /dev/null
+++ b/core/media/system/js/validate.js
@@ -0,0 +1 @@
+var JFormValidator=function(){"use strict";var t,e,a,r=function(e,a,r){r=""===r||r,t[e]={enabled:r,exec:a}},n=function(t,e){var a,r,n,i,l=e.data("label");void 0===l&&(a=e.attr("id"),r=e.get(0).form,i=jQuery(r),l=!!a&&((n=i.find("#"+a+"-lbl")).length?n:!!(n=i.find('label[for="'+a+'"]')).length&&n),e.data("label",l)),!1===t?(e.addClass("invalid").attr("aria-invalid","true"),l&&l.addClass("invalid")):(e.removeClass("invalid").attr("aria-invalid","false"),l&&l.removeClass("invalid"))},i=function(e){var a,r=jQuery(e);if(r.attr("disabled"))return n(!0,r),!0;if(r.attr("required")||r.hasClass("required"))if("fieldset"===r.prop("tagName").toLowerCase()&&(r.hasClass("radio")||r.hasClass("checkboxes"))){if(!r.find("input:checked").length)return n(!1,r),!1}else if(!r.val()||r.hasClass("placeholder")||"checkbox"===r.attr("type")&&!r.is(":checked"))return n(!1,r),!1;return a=r.attr("class")&&r.attr("class").match(/validate-([a-zA-Z0-9\_\-]+)/)?r.attr("class").match(/validate-([a-zA-Z0-9\_\-]+)/)[1]:"",r.attr("pattern")&&""!=r.attr("pattern")?r.val().length?(l=new RegExp("^"+r.attr("pattern")+"$").test(r.val()),n(l,r),l):r.attr("required")||r.hasClass("required")?(n(!1,r),!1):(n(!0,r),!0):""===a?(n(!0,r),!0):a&&"none"!==a&&t[a]&&r.val()&&!0!==t[a].exec(r.val(),r)?(n(!1,r),!1):(n(!0,r),!0)},l=function(t){var e,r,n,l,s,u,o=!0,d=[];for(s=0,u=(e=jQuery(t).find("input, textarea, select, fieldset")).length;s<u;s++)jQuery(e[s]).hasClass("novalidate")||!1===i(e[s])&&(o=!1,d.push(e[s]));if(jQuery.each(a,function(t,e){!0!==e.exec()&&(o=!1)}),!o&&d.length>0){for(r=Joomla.JText._("JLIB_FORM_FIELD_INVALID"),n={error:[]},s=d.length-1;s>=0;s--)(l=jQuery(d[s]).data("label"))&&n.error.push(r+l.text().replace("*",""));Joomla.renderMessages(n)}return o},s=function(t){for(var a,r=[],n=jQuery(t),s=0,u=(a=n.find("input, textarea, select, fieldset, button")).length;s<u;s++){var o=jQuery(a[s]),d=o.prop("tagName").toLowerCase();"input"!==d&&"button"!==d||"submit"!==o.attr("type")&&"image"!==o.attr("type")?"button"===d||"input"===d&&"button"===o.attr("type")||(o.hasClass("required")&&o.attr("aria-required","true").attr("required","required"),"fieldset"!==d&&(o.on("blur",function(){return i(this)}),o.hasClass("validate-email")&&e&&a[s].setAttribute("type","email")),r.push(o)):o.hasClass("validate")&&o.on("click",function(){return l(t)})}n.data("inputfields",r)};return function(){var n;t={},a=a||{},(n=document.createElement("input")).setAttribute("type","email"),e="text"!==n.type,r("username",function(t,e){return!new RegExp("[<|>|\"|'|%|;|(|)|&]","i").test(t)}),r("password",function(t,e){return/^\S[\S ]{2,98}\S$/.test(t)}),r("numeric",function(t,e){return/^(\d|-)?(\d|,)*\.?\d*$/.test(t)}),r("email",function(t,e){return t=punycode.toASCII(t),/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(t)});for(var i=jQuery("form.form-validate"),l=0,u=i.length;l<u;l++)s(i[l])}(),{isValid:l,validate:i,setHandler:r,attachToForm:s,custom:a}};document.formvalidator=null,jQuery(function(){document.formvalidator=new JFormValidator});
diff --git a/core/modules/index.html b/core/modules/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/modules/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/modules/mod_articles_archive/helper.php b/core/modules/mod_articles_archive/helper.php
new file mode 100644
index 00000000..406f2b1c
--- /dev/null
+++ b/core/modules/mod_articles_archive/helper.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_articles_archive
+ *
+ * @since  1.5
+ */
+class ModArchiveHelper
+{
+	/**
+	 * Retrieve list of archived articles
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public static function getList(&$params)
+	{
+		// Get database
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$query->select($query->month($db->quoteName('created')) . ' AS created_month')
+			->select('MIN(' . $db->quoteName('created') . ') AS created')
+			->select($query->year($db->quoteName('created')) . ' AS created_year')
+			->from('#__content')
+			->where('state = 2')
+			->group($query->year($db->quoteName('created')) . ', ' . $query->month($db->quoteName('created')))
+			->order($query->year($db->quoteName('created')) . ' DESC, ' . $query->month($db->quoteName('created')) . ' DESC');
+
+		// Filter by language
+		if (JFactory::getApplication()->getLanguageFilter())
+		{
+			$query->where('language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		$db->setQuery($query, 0, (int) $params->get('count'));
+
+		try
+		{
+			$rows = (array) $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+			return array();
+		}
+
+		$app    = JFactory::getApplication();
+		$menu   = $app->getMenu();
+		$item   = $menu->getItems('link', 'index.php?option=com_content&view=archive', true);
+		$itemid = (isset($item) && !empty($item->id)) ? '&Itemid=' . $item->id : '';
+
+		$i     = 0;
+		$lists = array();
+
+		foreach ($rows as $row)
+		{
+			$date = JFactory::getDate($row->created);
+
+			$createdMonth = $date->format('n');
+			$createdYear  = $date->format('Y');
+
+			$createdYearCal = JHtml::_('date', $row->created, 'Y');
+			$monthNameCal   = JHtml::_('date', $row->created, 'F');
+
+			$lists[$i] = new stdClass;
+
+			$lists[$i]->link = JRoute::_('index.php?option=com_content&view=archive&year=' . $createdYear . '&month=' . $createdMonth . $itemid);
+			$lists[$i]->text = JText::sprintf('MOD_ARTICLES_ARCHIVE_DATE', $monthNameCal, $createdYearCal);
+
+			$i++;
+		}
+
+		return $lists;
+	}
+}
diff --git a/core/modules/mod_articles_archive/mod_articles_archive.php b/core/modules/mod_articles_archive/mod_articles_archive.php
new file mode 100644
index 00000000..c6e36a09
--- /dev/null
+++ b/core/modules/mod_articles_archive/mod_articles_archive.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the archive functions only once
+JLoader::register('ModArchiveHelper', __DIR__ . '/helper.php');
+
+$params->def('count', 10);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$list            = ModArchiveHelper::getList($params);
+
+require JModuleHelper::getLayoutPath('mod_articles_archive', $params->get('layout', 'default'));
diff --git a/core/modules/mod_articles_archive/mod_articles_archive.xml b/core/modules/mod_articles_archive/mod_articles_archive.xml
new file mode 100644
index 00000000..3a064a4a
--- /dev/null
+++ b/core/modules/mod_articles_archive/mod_articles_archive.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_articles_archive</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_ARTICLES_ARCHIVE_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_articles_archive">mod_articles_archive.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_articles_archive.ini</language>
+		<language tag="en-GB">en-GB.mod_articles_archive.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_ARCHIVE" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="count"
+					type="number"
+					label="MOD_ARTICLES_ARCHIVE_FIELD_COUNT_LABEL"
+					description="MOD_ARTICLES_ARCHIVE_FIELD_COUNT_DESC"
+					default="10"
+					filter="integer"
+				/>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_articles_archive/tmpl/default.php b/core/modules/mod_articles_archive/tmpl/default.php
new file mode 100644
index 00000000..30b61522
--- /dev/null
+++ b/core/modules/mod_articles_archive/tmpl/default.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_archive
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (!empty($list)) : ?>
+	<ul class="archive-module<?php echo $moduleclass_sfx; ?>">
+	<?php foreach ($list as $item) : ?>
+	<li>
+		<a href="<?php echo $item->link; ?>">
+			<?php echo $item->text; ?>
+		</a>
+	</li>
+	<?php endforeach; ?>
+</ul>
+<?php endif; ?>
diff --git a/core/modules/mod_articles_categories/helper.php b/core/modules/mod_articles_categories/helper.php
new file mode 100644
index 00000000..806c5d72
--- /dev/null
+++ b/core/modules/mod_articles_categories/helper.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_articles_categories
+ *
+ * @since  1.5
+ */
+abstract class ModArticlesCategoriesHelper
+{
+	/**
+	 * Get list of articles
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public static function getList(&$params)
+	{
+		$options               = array();
+		$options['countItems'] = $params->get('numitems', 0);
+
+		$categories = JCategories::getInstance('Content', $options);
+		$category   = $categories->get($params->get('parent', 'root'));
+
+		if ($category !== null)
+		{
+			$items = $category->getChildren();
+
+			$count = $params->get('count', 0);
+
+			if ($count > 0 && count($items) > $count)
+			{
+				$items = array_slice($items, 0, $count);
+			}
+
+			return $items;
+		}
+	}
+}
diff --git a/core/modules/mod_articles_categories/mod_articles_categories.php b/core/modules/mod_articles_categories/mod_articles_categories.php
new file mode 100644
index 00000000..66091bf0
--- /dev/null
+++ b/core/modules/mod_articles_categories/mod_articles_categories.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the helper functions only once
+JLoader::register('ModArticlesCategoriesHelper', __DIR__ . '/helper.php');
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+JLoader::register('JCategoryNode', JPATH_BASE . '/libraries/legacy/categories/categories.php');
+
+$cacheid = md5($module->id);
+
+$cacheparams               = new stdClass;
+$cacheparams->cachemode    = 'id';
+$cacheparams->class        = 'ModArticlesCategoriesHelper';
+$cacheparams->method       = 'getList';
+$cacheparams->methodparams = $params;
+$cacheparams->modeparams   = $cacheid;
+
+$list = JModuleHelper::moduleCache($module, $params, $cacheparams);
+
+if (!empty($list))
+{
+	$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+	$startLevel      = reset($list)->getParent()->level;
+
+	require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default'));
+}
diff --git a/core/modules/mod_articles_categories/mod_articles_categories.xml b/core/modules/mod_articles_categories/mod_articles_categories.xml
new file mode 100644
index 00000000..b1a275ca
--- /dev/null
+++ b/core/modules/mod_articles_categories/mod_articles_categories.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_articles_categories</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_ARTICLES_CATEGORIES_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_articles_categories">mod_articles_categories.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_articles_categories.ini</language>
+		<language tag="en-GB">en-GB.mod_articles_categories.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORIES" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic"
+				addfieldpath="/administrator/components/com_categories/models/fields"
+			>
+				<field
+					name="parent"
+					type="modal_category"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_PARENT_DESC"
+					extension="com_content"
+					filter="integer"
+					published=""
+					required="true"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+				/>
+
+				<field
+					name="show_description"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_DESCRIPTION_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="numitems"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_NUMITEMS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="show_children"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_SHOW_CHILDREN_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="count"
+					type="list"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_COUNT_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JALL</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+					<option value="6">J6</option>
+					<option value="7">J7</option>
+					<option value="8">J8</option>
+					<option value="9">J9</option>
+					<option value="10">J10</option>
+				</field>
+
+				<field
+					name="maxlevel"
+					type="list"
+					label="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_FIELD_MAXLEVEL_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JALL</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+					<option value="6">J6</option>
+					<option value="7">J7</option>
+					<option value="8">J8</option>
+					<option value="9">J9</option>
+					<option value="10">J10</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="item_heading"
+					type="list"
+					label="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_LABEL"
+					description="MOD_ARTICLES_CATEGORIES_TITLE_HEADING_DESC"
+					default="4"
+					filter="integer"
+					>
+					<option value="1">JH1</option>
+					<option value="2">JH2</option>
+					<option value="3">JH3</option>
+					<option value="4">JH4</option>
+					<option value="5">JH5</option>
+				</field>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="owncache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_articles_categories/tmpl/default.php b/core/modules/mod_articles_categories/tmpl/default.php
new file mode 100644
index 00000000..daa5864c
--- /dev/null
+++ b/core/modules/mod_articles_categories/tmpl/default.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="categories-module<?php echo $moduleclass_sfx; ?>">
+<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
+</ul>
diff --git a/core/modules/mod_articles_categories/tmpl/default_items.php b/core/modules/mod_articles_categories/tmpl/default_items.php
new file mode 100644
index 00000000..2e1278f8
--- /dev/null
+++ b/core/modules/mod_articles_categories/tmpl/default_items.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input  = JFactory::getApplication()->input;
+$option = $input->getCmd('option');
+$view   = $input->getCmd('view');
+$id     = $input->getInt('id');
+
+foreach ($list as $item) : ?>
+	<li<?php if ($id == $item->id && $view == 'category' && $option == 'com_content') echo ' class="active"'; ?>> <?php $levelup = $item->level - $startLevel - 1; ?>
+		<h<?php echo $params->get('item_heading') + $levelup; ?>>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id)); ?>">
+		<?php echo $item->title; ?>
+			<?php if ($params->get('numitems')) : ?>
+				(<?php echo $item->numitems; ?>)
+			<?php endif; ?>
+		</a>
+		</h<?php echo $params->get('item_heading') + $levelup; ?>>
+
+		<?php if ($params->get('show_description', 0)) : ?>
+			<?php echo JHtml::_('content.prepare', $item->description, $item->getParams(), 'mod_articles_categories.content'); ?>
+		<?php endif; ?>
+		<?php if ($params->get('show_children', 0) && (($params->get('maxlevel', 0) == 0)
+			|| ($params->get('maxlevel') >= ($item->level - $startLevel)))
+			&& count($item->getChildren())) : ?>
+			<?php echo '<ul>'; ?>
+			<?php $temp = $list; ?>
+			<?php $list = $item->getChildren(); ?>
+			<?php require JModuleHelper::getLayoutPath('mod_articles_categories', $params->get('layout', 'default') . '_items'); ?>
+			<?php $list = $temp; ?>
+			<?php echo '</ul>'; ?>
+		<?php endif; ?>
+	</li>
+<?php endforeach; ?>
diff --git a/core/modules/mod_articles_category/helper.php b/core/modules/mod_articles_category/helper.php
new file mode 100644
index 00000000..a7c5c14e
--- /dev/null
+++ b/core/modules/mod_articles_category/helper.php
@@ -0,0 +1,506 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_category
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+$com_path = JPATH_SITE . '/components/com_content/';
+
+JLoader::register('ContentHelperRoute', $com_path . 'helpers/route.php');
+JModelLegacy::addIncludePath($com_path . 'models', 'ContentModel');
+
+/**
+ * Helper for mod_articles_category
+ *
+ * @since  1.6
+ */
+abstract class ModArticlesCategoryHelper
+{
+	/**
+	 * Get a list of articles from a specific category
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  object holding the models parameters
+	 *
+	 * @return  mixed
+	 *
+	 * @since  1.6
+	 */
+	public static function getList(&$params)
+	{
+		// Get an instance of the generic articles model
+		$articles = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		// Set application parameters in model
+		$app       = JFactory::getApplication();
+		$appParams = $app->getParams();
+		$articles->setState('params', $appParams);
+
+		// Set the filters based on the module params
+		$articles->setState('list.start', 0);
+		$articles->setState('list.limit', (int) $params->get('count', 0));
+		$articles->setState('filter.published', 1);
+
+		// This module does not use tags data
+		$articles->setState('load_tags', $params->get('filter_tag', '') !== '' ? true : false);
+
+		// Access filter
+		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
+		$articles->setState('filter.access', $access);
+
+		// Prep for Normal or Dynamic Modes
+		$mode = $params->get('mode', 'normal');
+
+		switch ($mode)
+		{
+			case 'dynamic' :
+				$option = $app->input->get('option');
+				$view   = $app->input->get('view');
+
+				if ($option === 'com_content')
+				{
+					switch ($view)
+					{
+						case 'category' :
+						case 'categories' :
+							$catids = array($app->input->getInt('id'));
+							break;
+						case 'article' :
+							if ($params->get('show_on_article_page', 1))
+							{
+								$article_id = $app->input->getInt('id');
+								$catid      = $app->input->getInt('catid');
+
+								if (!$catid)
+								{
+									// Get an instance of the generic article model
+									$article = JModelLegacy::getInstance('Article', 'ContentModel', array('ignore_request' => true));
+
+									$article->setState('params', $appParams);
+									$article->setState('filter.published', 1);
+									$article->setState('article.id', (int) $article_id);
+									$item   = $article->getItem();
+									$catids = array($item->catid);
+								}
+								else
+								{
+									$catids = array($catid);
+								}
+							}
+							else
+							{
+								// Return right away if show_on_article_page option is off
+								return;
+							}
+							break;
+
+						case 'featured' :
+						default:
+							// Return right away if not on the category or article views
+							return;
+					}
+				}
+				else
+				{
+					// Return right away if not on a com_content page
+					return;
+				}
+
+				break;
+
+			case 'normal' :
+			default:
+				$catids = $params->get('catid');
+				$articles->setState('filter.category_id.include', (bool) $params->get('category_filtering_type', 1));
+				break;
+		}
+
+		// Category filter
+		if ($catids)
+		{
+			if ($params->get('show_child_category_articles', 0) && (int) $params->get('levels', 0) > 0)
+			{
+				// Get an instance of the generic categories model
+				$categories = JModelLegacy::getInstance('Categories', 'ContentModel', array('ignore_request' => true));
+				$categories->setState('params', $appParams);
+				$levels = $params->get('levels', 1) ?: 9999;
+				$categories->setState('filter.get_children', $levels);
+				$categories->setState('filter.published', 1);
+				$categories->setState('filter.access', $access);
+				$additional_catids = array();
+
+				foreach ($catids as $catid)
+				{
+					$categories->setState('filter.parentId', $catid);
+					$recursive = true;
+					$items     = $categories->getItems($recursive);
+
+					if ($items)
+					{
+						foreach ($items as $category)
+						{
+							$condition = (($category->level - $categories->getParent()->level) <= $levels);
+
+							if ($condition)
+							{
+								$additional_catids[] = $category->id;
+							}
+						}
+					}
+				}
+
+				$catids = array_unique(array_merge($catids, $additional_catids));
+			}
+
+			$articles->setState('filter.category_id', $catids);
+		}
+
+		// Ordering
+		$ordering = $params->get('article_ordering', 'a.ordering');
+
+		switch ($ordering)
+		{
+			case 'random':
+				$articles->setState('list.ordering', JFactory::getDbo()->getQuery(true)->Rand());
+				break;
+
+			case 'rating_count':
+			case 'rating':
+				$articles->setState('list.ordering', $ordering);
+				$articles->setState('list.direction', $params->get('article_ordering_direction', 'ASC'));
+
+				if (!JPluginHelper::isEnabled('content', 'vote'))
+				{
+					$articles->setState('list.ordering', 'a.ordering');
+				}
+
+				break;
+
+			default:
+				$articles->setState('list.ordering', $ordering);
+				$articles->setState('list.direction', $params->get('article_ordering_direction', 'ASC'));
+				break;
+		}
+
+		// Filter by multiple tags
+		$articles->setState('filter.tag', $params->get('filter_tag', array()));
+
+		$articles->setState('filter.featured', $params->get('show_front', 'show'));
+		$articles->setState('filter.author_id', $params->get('created_by', array()));
+		$articles->setState('filter.author_id.include', $params->get('author_filtering_type', 1));
+		$articles->setState('filter.author_alias', $params->get('created_by_alias', array()));
+		$articles->setState('filter.author_alias.include', $params->get('author_alias_filtering_type', 1));
+		$excluded_articles = $params->get('excluded_articles', '');
+
+		if ($excluded_articles)
+		{
+			$excluded_articles = explode("\r\n", $excluded_articles);
+			$articles->setState('filter.article_id', $excluded_articles);
+
+			// Exclude
+			$articles->setState('filter.article_id.include', false);
+		}
+
+		$date_filtering = $params->get('date_filtering', 'off');
+
+		if ($date_filtering !== 'off')
+		{
+			$articles->setState('filter.date_filtering', $date_filtering);
+			$articles->setState('filter.date_field', $params->get('date_field', 'a.created'));
+			$articles->setState('filter.start_date_range', $params->get('start_date_range', '1000-01-01 00:00:00'));
+			$articles->setState('filter.end_date_range', $params->get('end_date_range', '9999-12-31 23:59:59'));
+			$articles->setState('filter.relative_date', $params->get('relative_date', 30));
+		}
+
+		// Filter by language
+		$articles->setState('filter.language', $app->getLanguageFilter());
+
+		$items = $articles->getItems();
+
+		// Display options
+		$show_date        = $params->get('show_date', 0);
+		$show_date_field  = $params->get('show_date_field', 'created');
+		$show_date_format = $params->get('show_date_format', 'Y-m-d H:i:s');
+		$show_category    = $params->get('show_category', 0);
+		$show_hits        = $params->get('show_hits', 0);
+		$show_author      = $params->get('show_author', 0);
+		$show_introtext   = $params->get('show_introtext', 0);
+		$introtext_limit  = $params->get('introtext_limit', 100);
+
+		// Find current Article ID if on an article page
+		$option = $app->input->get('option');
+		$view   = $app->input->get('view');
+
+		if ($option === 'com_content' && $view === 'article')
+		{
+			$active_article_id = $app->input->getInt('id');
+		}
+		else
+		{
+			$active_article_id = 0;
+		}
+
+		// Prepare data for display using display options
+		foreach ($items as &$item)
+		{
+			$item->slug    = $item->id . ':' . $item->alias;
+
+			/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
+			$item->catslug = $item->catid . ':' . $item->category_alias;
+
+			if ($access || in_array($item->access, $authorised))
+			{
+				// We know that user has the privilege to view the article
+				$item->link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+			}
+			else
+			{
+				$menu      = $app->getMenu();
+				$menuitems = $menu->getItems('link', 'index.php?option=com_users&view=login');
+
+				if (isset($menuitems[0]))
+				{
+					$Itemid = $menuitems[0]->id;
+				}
+				elseif ($app->input->getInt('Itemid') > 0)
+				{
+					// Use Itemid from requesting page only if there is no existing menu
+					$Itemid = $app->input->getInt('Itemid');
+				}
+
+				$item->link = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $Itemid);
+			}
+
+			// Used for styling the active article
+			$item->active      = $item->id == $active_article_id ? 'active' : '';
+			$item->displayDate = '';
+
+			if ($show_date)
+			{
+				$item->displayDate = JHtml::_('date', $item->$show_date_field, $show_date_format);
+			}
+
+			if ($item->catid)
+			{
+				$item->displayCategoryLink  = JRoute::_(ContentHelperRoute::getCategoryRoute($item->catid));
+				$item->displayCategoryTitle = $show_category ? '<a href="' . $item->displayCategoryLink . '">' . $item->category_title . '</a>' : '';
+			}
+			else
+			{
+				$item->displayCategoryTitle = $show_category ? $item->category_title : '';
+			}
+
+			$item->displayHits       = $show_hits ? $item->hits : '';
+			$item->displayAuthorName = $show_author ? $item->author : '';
+
+			if ($show_introtext)
+			{
+				$item->introtext = JHtml::_('content.prepare', $item->introtext, '', 'mod_articles_category.content');
+				$item->introtext = self::_cleanIntrotext($item->introtext);
+			}
+
+			$item->displayIntrotext = $show_introtext ? self::truncate($item->introtext, $introtext_limit) : '';
+			$item->displayReadmore  = $item->alternative_readmore;
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Strips unnecessary tags from the introtext
+	 *
+	 * @param   string  $introtext  introtext to sanitize
+	 *
+	 * @return mixed|string
+	 *
+	 * @since  1.6
+	 */
+	public static function _cleanIntrotext($introtext)
+	{
+		$introtext = str_replace(array('<p>','</p>'), ' ', $introtext);
+		$introtext = strip_tags($introtext, '<a><em><strong>');
+		$introtext = trim($introtext);
+
+		return $introtext;
+	}
+
+	/**
+	 * Method to truncate introtext
+	 *
+	 * The goal is to get the proper length plain text string with as much of
+	 * the html intact as possible with all tags properly closed.
+	 *
+	 * @param   string   $html       The content of the introtext to be truncated
+	 * @param   integer  $maxLength  The maximum number of charactes to render
+	 *
+	 * @return  string  The truncated string
+	 *
+	 * @since   1.6
+	 */
+	public static function truncate($html, $maxLength = 0)
+	{
+		$baseLength = strlen($html);
+
+		// First get the plain text string. This is the rendered text we want to end up with.
+		$ptString = JHtml::_('string.truncate', $html, $maxLength, $noSplit = true, $allowHtml = false);
+
+		for ($maxLength; $maxLength < $baseLength;)
+		{
+			// Now get the string if we allow html.
+			$htmlString = JHtml::_('string.truncate', $html, $maxLength, $noSplit = true, $allowHtml = true);
+
+			// Now get the plain text from the html string.
+			$htmlStringToPtString = JHtml::_('string.truncate', $htmlString, $maxLength, $noSplit = true, $allowHtml = false);
+
+			// If the new plain text string matches the original plain text string we are done.
+			if ($ptString === $htmlStringToPtString)
+			{
+				return $htmlString;
+			}
+
+			// Get the number of html tag characters in the first $maxlength characters
+			$diffLength = strlen($ptString) - strlen($htmlStringToPtString);
+
+			// Set new $maxlength that adjusts for the html tags
+			$maxLength += $diffLength;
+
+			if ($baseLength <= $maxLength || $diffLength <= 0)
+			{
+				return $htmlString;
+			}
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Groups items by field
+	 *
+	 * @param   array   $list                        list of items
+	 * @param   string  $fieldName                   name of field that is used for grouping
+	 * @param   string  $article_grouping_direction  ordering direction
+	 * @param   null    $fieldNameToKeep             field name to keep
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function groupBy($list, $fieldName, $article_grouping_direction, $fieldNameToKeep = null)
+	{
+		$grouped = array();
+
+		if (!is_array($list))
+		{
+			if ($list == '')
+			{
+				return $grouped;
+			}
+
+			$list = array($list);
+		}
+
+		foreach ($list as $key => $item)
+		{
+			if (!isset($grouped[$item->$fieldName]))
+			{
+				$grouped[$item->$fieldName] = array();
+			}
+
+			if ($fieldNameToKeep === null)
+			{
+				$grouped[$item->$fieldName][$key] = $item;
+			}
+			else
+			{
+				$grouped[$item->$fieldName][$key] = $item->$fieldNameToKeep;
+			}
+
+			unset($list[$key]);
+		}
+
+		$article_grouping_direction($grouped);
+
+		return $grouped;
+	}
+
+	/**
+	 * Groups items by date
+	 *
+	 * @param   array   $list                        list of items
+	 * @param   string  $type                        type of grouping
+	 * @param   string  $article_grouping_direction  ordering direction
+	 * @param   string  $month_year_format           date format to use
+	 *
+	 * @return  array
+	 *
+	 * @since   1.6
+	 */
+	public static function groupByDate($list, $type = 'year', $article_grouping_direction, $month_year_format = 'F Y')
+	{
+		$grouped = array();
+
+		if (!is_array($list))
+		{
+			if ($list == '')
+			{
+				return $grouped;
+			}
+
+			$list = array($list);
+		}
+
+		foreach ($list as $key => $item)
+		{
+			switch ($type)
+			{
+				case 'month_year' :
+					$month_year = StringHelper::substr($item->created, 0, 7);
+
+					if (!isset($grouped[$month_year]))
+					{
+						$grouped[$month_year] = array();
+					}
+
+					$grouped[$month_year][$key] = $item;
+					break;
+
+				case 'year' :
+				default:
+					$year = StringHelper::substr($item->created, 0, 4);
+
+					if (!isset($grouped[$year]))
+					{
+						$grouped[$year] = array();
+					}
+
+					$grouped[$year][$key] = $item;
+					break;
+			}
+
+			unset($list[$key]);
+		}
+
+		$article_grouping_direction($grouped);
+
+		if ($type === 'month_year')
+		{
+			foreach ($grouped as $group => $items)
+			{
+				$date                      = new JDate($group);
+				$formatted_group           = $date->format($month_year_format);
+				$grouped[$formatted_group] = $items;
+
+				unset($grouped[$group]);
+			}
+		}
+
+		return $grouped;
+	}
+}
diff --git a/core/modules/mod_articles_category/mod_articles_category.php b/core/modules/mod_articles_category/mod_articles_category.php
new file mode 100644
index 00000000..ed1d05a6
--- /dev/null
+++ b/core/modules/mod_articles_category/mod_articles_category.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_category
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the helper functions only once
+JLoader::register('ModArticlesCategoryHelper', __DIR__ . '/helper.php');
+
+$input = JFactory::getApplication()->input;
+
+// Prep for Normal or Dynamic Modes
+$mode   = $params->get('mode', 'normal');
+$idbase = null;
+
+switch ($mode)
+{
+	case 'dynamic' :
+		$option = $input->get('option');
+		$view   = $input->get('view');
+
+		if ($option === 'com_content')
+		{
+			switch ($view)
+			{
+				case 'category' :
+					$idbase = $input->getInt('id');
+					break;
+				case 'categories' :
+					$idbase = $input->getInt('id');
+					break;
+				case 'article' :
+					if ($params->get('show_on_article_page', 1))
+					{
+						$idbase = $input->getInt('catid');
+					}
+					break;
+			}
+		}
+		break;
+	case 'normal' :
+	default:
+		$idbase = $params->get('catid');
+		break;
+}
+
+$cacheid = md5(serialize(array ($idbase, $module->module, $module->id)));
+
+$cacheparams               = new stdClass;
+$cacheparams->cachemode    = 'id';
+$cacheparams->class        = 'ModArticlesCategoryHelper';
+$cacheparams->method       = 'getList';
+$cacheparams->methodparams = $params;
+$cacheparams->modeparams   = $cacheid;
+
+$list = JModuleHelper::moduleCache($module, $params, $cacheparams);
+
+if (!empty($list))
+{
+	$grouped                    = false;
+	$article_grouping           = $params->get('article_grouping', 'none');
+	$article_grouping_direction = $params->get('article_grouping_direction', 'ksort');
+	$moduleclass_sfx            = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+	$item_heading               = $params->get('item_heading');
+
+	if ($article_grouping !== 'none')
+	{
+		$grouped = true;
+
+		switch ($article_grouping)
+		{
+			case 'year' :
+			case 'month_year' :
+				$list = ModArticlesCategoryHelper::groupByDate($list, $article_grouping, $article_grouping_direction, $params->get('month_year_format', 'F Y'));
+				break;
+			case 'author' :
+			case 'category_title' :
+				$list = ModArticlesCategoryHelper::groupBy($list, $article_grouping, $article_grouping_direction);
+				break;
+			default:
+				break;
+		}
+	}
+
+	require JModuleHelper::getLayoutPath('mod_articles_category', $params->get('layout', 'default'));
+}
diff --git a/core/modules/mod_articles_category/mod_articles_category.xml b/core/modules/mod_articles_category/mod_articles_category.xml
new file mode 100644
index 00000000..14d32c08
--- /dev/null
+++ b/core/modules/mod_articles_category/mod_articles_category.xml
@@ -0,0 +1,564 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_articles_category</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_ARTICLES_CATEGORY_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_articles_category">mod_articles_category.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_articles_category.ini</language>
+		<language tag="en-GB">en-GB.mod_articles_category.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_CATEGORY" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="mode"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_MODE_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC"
+					default="normal"
+					>
+					<option value="normal">MOD_ARTICLES_CATEGORY_OPTION_NORMAL_VALUE</option>
+					<option value="dynamic">MOD_ARTICLES_CATEGORY_OPTION_DYNAMIC_VALUE</option>
+				</field>
+
+				<field
+					name="show_on_article_page"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWONARTICLEPAGE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="mode:dynamic"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+			</fieldset>
+
+			<fieldset
+				name="filtering"
+				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_FILTERING_LABEL"
+			>
+
+				<field
+					name="count"
+					type="number"
+					label="MOD_ARTICLES_CATEGORY_FIELD_COUNT_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_COUNT_DESC"
+					default="0"
+					filter="integer"
+				/>
+
+				<field
+					name="show_front"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWFEATURED_DESC"
+					default="show"
+					>
+					<option value="show">JSHOW</option>
+					<option value="hide">JHIDE</option>
+					<option value="only">MOD_ARTICLES_CATEGORY_OPTION_ONLYFEATURED_VALUE</option>
+				</field>
+
+				<field
+					name="filteringspacer0"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="category_filtering_type"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_CATFILTERINGTYPE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
+				</field>
+
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_ARTICLES_CATEGORY_FIELD_CATEGORY_DESC"
+					extension="com_content"
+					multiple="true"
+					filter="int_array"
+					class="multipleCategories"
+				/>
+
+				<field
+					name="show_child_category_articles"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCHILDCATEGORYARTICLES_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUDE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUDE_VALUE</option>
+				</field>
+
+				<field
+					name="levels"
+					type="number"
+					label="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_CATDEPTH_DESC"
+					default="1"
+					filter="integer"
+					showon="show_child_category_articles:1"
+				/>
+
+				<field
+					name="filteringspacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="filter_tag"
+					type="tag"
+					label="JTAG"
+					description="JTAG_FIELD_SELECT_DESC"
+					mode="nested"
+					multiple="true"
+					filter="int_array"
+					class="multipleTags"
+				/>
+
+				<field
+					name="filteringspacer2"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="author_filtering_type"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORFILTERING_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
+				</field>
+
+				<field
+					name="created_by"
+					type="author"
+					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHOR_DESC"
+					multiple="true"
+					filter="int_array"
+					class="multipleAuthors"
+				/>
+
+				<field
+					name="filteringspacer3"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="author_alias_filtering_type"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIASFILTERING_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">MOD_ARTICLES_CATEGORY_OPTION_INCLUSIVE_VALUE</option>
+					<option value="0">MOD_ARTICLES_CATEGORY_OPTION_EXCLUSIVE_VALUE</option>
+				</field>
+
+				<field
+					name="created_by_alias"
+					type="sql"
+					label="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_AUTHORALIAS_DESC"
+					multiple="true"
+					query="select distinct(created_by_alias) from #__content where created_by_alias != '' order by created_by_alias ASC"
+					key_field="created_by_alias"
+					value_field="created_by_alias"
+					class="multipleAuthorAliases"
+				/>
+
+				<field
+					name="filteringspacer4"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="excluded_articles"
+					type="textarea"
+					label="MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_EXCLUDEDARTICLES_DESC"
+					cols="10"
+					rows="3"
+				/>
+
+				<field
+					name="filteringspacer5"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="date_filtering"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFILTERING_DESC"
+					default="off"
+					>
+					<option value="off">MOD_ARTICLES_CATEGORY_OPTION_OFF_VALUE</option>
+					<option value="range">MOD_ARTICLES_CATEGORY_OPTION_DATERANGE_VALUE</option>
+					<option value="relative">MOD_ARTICLES_CATEGORY_OPTION_RELATIVEDAY_VALUE</option>
+				</field>
+
+				<field
+					name="date_field"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_DATERANGEFIELD_DESC"
+					default="a.created"
+					showon="date_filtering!:off"
+					>
+					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="a.modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="a.publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
+				</field>
+
+				<field
+					name="start_date_range"
+					type="calendar"
+					label="MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_STARTDATE_DESC"
+					translateformat="true"
+					showtime="true"
+					size="22"
+					filter="user_utc"
+					showon="date_filtering:range"
+				/>
+
+				<field
+					name="end_date_range"
+					type="calendar"
+					label="MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_ENDDATE_DESC"
+					translateformat="true"
+					showtime="true"
+					size="22"
+					filter="user_utc"
+					showon="date_filtering:range"
+				/>
+
+				<field
+					name="relative_date"
+					type="number"
+					label="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_RELATIVEDATE_DESC"
+					default="30"
+					filter="integer"
+					showon="date_filtering:relative"
+				/>
+
+			</fieldset>
+
+			<fieldset
+				name="ordering"
+				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_ORDERING_LABEL"
+			>
+
+				<field
+					name="article_ordering"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERING_DESC"
+					default="a.title"
+					>
+					<option value="a.ordering">MOD_ARTICLES_CATEGORY_OPTION_ORDERING_VALUE</option>
+					<option value="fp.ordering">MOD_ARTICLES_CATEGORY_OPTION_ORDERINGFEATURED_VALUE</option>
+					<option value="a.hits">MOD_ARTICLES_CATEGORY_OPTION_HITS_VALUE</option>
+					<option value="a.title">JGLOBAL_TITLE</option>
+					<option value="a.id">MOD_ARTICLES_CATEGORY_OPTION_ID_VALUE</option>
+					<option value="a.alias">JFIELD_ALIAS_LABEL</option>
+					<option value="a.created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
+					<option value="a.publish_down">MOD_ARTICLES_CATEGORY_OPTION_FINISHPUBLISHING_VALUE</option>
+					<option value="random">MOD_ARTICLES_CATEGORY_OPTION_RANDOM_VALUE</option>
+					<option value="rating_count" requires="vote">MOD_ARTICLES_CATEGORY_OPTION_VOTE_VALUE</option>
+					<option value="rating" requires="vote">MOD_ARTICLES_CATEGORY_OPTION_RATING_VALUE</option>
+				</field>
+
+				<field
+					name="article_ordering_direction"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEORDERINGDIR_DESC"
+					default="ASC"
+					>
+					<option value="DESC">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE</option>
+					<option value="ASC">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE</option>
+				</field>
+			</fieldset>
+
+			<fieldset
+				name="grouping"
+				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_GROUPING_LABEL"
+				>
+
+				<field
+					name="article_grouping"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPING_DESC"
+					default="none"
+					>
+					<option value="none">JNONE</option>
+					<option value="year">MOD_ARTICLES_CATEGORY_OPTION_YEAR_VALUE</option>
+					<option value="month_year">MOD_ARTICLES_CATEGORY_OPTION_MONTHYEAR_VALUE</option>
+					<option value="author">JAUTHOR</option>
+					<option value="category_title">JCATEGORY</option>
+				</field>
+
+				<field
+					name="month_year_format"
+					type="text"
+					label="MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_DESC"
+					default="F Y"
+					showon="article_grouping:year,month_year"
+				/>
+
+				<field
+					name="article_grouping_direction"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_ARTICLEGROUPINGDIR_DESC"
+					default="ksort"
+					showon="article_grouping!:none"
+					>
+					<option value="krsort">MOD_ARTICLES_CATEGORY_OPTION_DESCENDING_VALUE</option>
+					<option value="ksort">MOD_ARTICLES_CATEGORY_OPTION_ASCENDING_VALUE</option>
+				</field>
+
+			</fieldset>
+
+			<fieldset
+				name="display"
+				label="MOD_ARTICLES_CATEGORY_FIELD_GROUP_DISPLAY_LABEL"
+				>
+
+				<field
+					name="link_titles"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="show_date"
+					type="radio"
+					label="JDATE"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWDATE_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_date_field"
+					type="list"
+					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELD_DESC"
+					default="created"
+					showon="show_date:1"
+					>
+					<option value="created">MOD_ARTICLES_CATEGORY_OPTION_CREATED_VALUE</option>
+					<option value="modified">MOD_ARTICLES_CATEGORY_OPTION_MODIFIED_VALUE</option>
+					<option value="publish_up">MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE</option>
+				</field>
+
+				<field
+					name="show_date_format"
+					type="text"
+					label="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_DATEFIELDFORMAT_DESC"
+					default="Y-m-d H:i:s"
+					showon="show_date:1"
+				/>
+
+				<field
+					name="show_category"
+					type="radio"
+					label="JCATEGORY"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWCATEGORY_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_hits"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWHITS_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_author"
+					type="radio"
+					label="JAUTHOR"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWAUTHOR_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_introtext"
+					type="radio"
+					label="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_SHOWINTROTEXT_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="introtext_limit"
+					type="number"
+					label="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL"
+					description="MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_DESC"
+					default="100"
+					filter="integer"
+					showon="show_introtext:1"
+				/>
+
+				<field
+					name="show_readmore"
+					type="radio"
+					label="JGLOBAL_SHOW_READMORE_LABEL"
+					description="JGLOBAL_SHOW_READMORE_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_readmore_title"
+					type="radio"
+					label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+					description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					showon="show_readmore:1"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="readmore_limit"
+					type="number"
+					label="JGLOBAL_SHOW_READMORE_LIMIT_LABEL"
+					description="JGLOBAL_SHOW_READMORE_LIMIT_DESC"
+					default="15"
+					filter="integer"
+					showon="show_readmore:1[AND]show_readmore_title:1"
+				/>
+
+			</fieldset>
+
+			<fieldset name="advanced">
+
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="owncache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_articles_category/tmpl/default.php b/core/modules/mod_articles_category/tmpl/default.php
new file mode 100644
index 00000000..072ad20a
--- /dev/null
+++ b/core/modules/mod_articles_category/tmpl/default.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_category
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<ul class="category-module<?php echo $moduleclass_sfx; ?>">
+	<?php if ($grouped) : ?>
+		<?php foreach ($list as $group_name => $group) : ?>
+		<li>
+			<div class="mod-articles-category-group"><?php echo $group_name; ?></div>
+			<ul>
+				<?php foreach ($group as $item) : ?>
+					<li>
+						<?php if ($params->get('link_titles') == 1) : ?>
+							<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+								<?php echo $item->title; ?>
+							</a>
+						<?php else : ?>
+							<?php echo $item->title; ?>
+						<?php endif; ?>
+
+						<?php if ($item->displayHits) : ?>
+							<span class="mod-articles-category-hits">
+								(<?php echo $item->displayHits; ?>)
+							</span>
+						<?php endif; ?>
+
+						<?php if ($params->get('show_author')) : ?>
+							<span class="mod-articles-category-writtenby">
+								<?php echo $item->displayAuthorName; ?>
+							</span>
+						<?php endif; ?>
+
+						<?php if ($item->displayCategoryTitle) : ?>
+							<span class="mod-articles-category-category">
+								(<?php echo $item->displayCategoryTitle; ?>)
+							</span>
+						<?php endif; ?>
+
+						<?php if ($item->displayDate) : ?>
+							<span class="mod-articles-category-date"><?php echo $item->displayDate; ?></span>
+						<?php endif; ?>
+
+						<?php if ($params->get('show_introtext')) : ?>
+							<p class="mod-articles-category-introtext">
+								<?php echo $item->displayIntrotext; ?>
+							</p>
+						<?php endif; ?>
+
+						<?php if ($params->get('show_readmore')) : ?>
+							<p class="mod-articles-category-readmore">
+								<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+									<?php if ($item->params->get('access-view') == false) : ?>
+										<?php echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE'); ?>
+									<?php elseif ($readmore = $item->alternative_readmore) : ?>
+										<?php echo $readmore; ?>
+										<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+											<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
+												<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+											<?php endif; ?>
+									<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+										<?php echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE'); ?>
+									<?php else : ?>
+										<?php echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE'); ?>
+										<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+									<?php endif; ?>
+								</a>
+							</p>
+						<?php endif; ?>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+		</li>
+		<?php endforeach; ?>
+	<?php else : ?>
+		<?php foreach ($list as $item) : ?>
+			<li>
+				<?php if ($params->get('link_titles') == 1) : ?>
+					<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>"><?php echo $item->title; ?></a>
+				<?php else : ?>
+					<?php echo $item->title; ?>
+				<?php endif; ?>
+
+				<?php if ($item->displayHits) : ?>
+					<span class="mod-articles-category-hits">
+						(<?php echo $item->displayHits; ?>)
+					</span>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_author')) : ?>
+					<span class="mod-articles-category-writtenby">
+						<?php echo $item->displayAuthorName; ?>
+					</span>
+				<?php endif; ?>
+
+				<?php if ($item->displayCategoryTitle) : ?>
+					<span class="mod-articles-category-category">
+						(<?php echo $item->displayCategoryTitle; ?>)
+					</span>
+				<?php endif; ?>
+
+				<?php if ($item->displayDate) : ?>
+					<span class="mod-articles-category-date">
+						<?php echo $item->displayDate; ?>
+					</span>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_introtext')) : ?>
+					<p class="mod-articles-category-introtext">
+						<?php echo $item->displayIntrotext; ?>
+					</p>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_readmore')) : ?>
+					<p class="mod-articles-category-readmore">
+						<a class="mod-articles-category-title <?php echo $item->active; ?>" href="<?php echo $item->link; ?>">
+							<?php if ($item->params->get('access-view') == false) : ?>
+								<?php echo JText::_('MOD_ARTICLES_CATEGORY_REGISTER_TO_READ_MORE'); ?>
+							<?php elseif ($readmore = $item->alternative_readmore) : ?>
+								<?php echo $readmore; ?>
+								<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+							<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+								<?php echo JText::sprintf('MOD_ARTICLES_CATEGORY_READ_MORE_TITLE'); ?>
+							<?php else : ?>
+								<?php echo JText::_('MOD_ARTICLES_CATEGORY_READ_MORE'); ?>
+								<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
+							<?php endif; ?>
+						</a>
+					</p>
+				<?php endif; ?>
+			</li>
+		<?php endforeach; ?>
+	<?php endif; ?>
+</ul>
diff --git a/core/modules/mod_articles_latest/helper.php b/core/modules/mod_articles_latest/helper.php
new file mode 100644
index 00000000..9cada52b
--- /dev/null
+++ b/core/modules/mod_articles_latest/helper.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models', 'ContentModel');
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Helper for mod_articles_latest
+ *
+ * @since  1.6
+ */
+abstract class ModArticlesLatestHelper
+{
+	/**
+	 * Retrieve a list of article
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.6
+	 */
+	public static function getList(&$params)
+	{
+		// Get the dbo
+		$db = JFactory::getDbo();
+
+		// Get an instance of the generic articles model
+		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		// Set application parameters in model
+		$app       = JFactory::getApplication();
+		$appParams = $app->getParams();
+		$model->setState('params', $appParams);
+
+		// Set the filters based on the module params
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', (int) $params->get('count', 5));
+		$model->setState('filter.published', 1);
+
+		// This module does not use tags data
+		$model->setState('load_tags', false);
+
+		// Access filter
+		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
+		$model->setState('filter.access', $access);
+
+		// Category filter
+		$model->setState('filter.category_id', $params->get('catid', array()));
+
+		// User filter
+		$userId = JFactory::getUser()->get('id');
+
+		switch ($params->get('user_id'))
+		{
+			case 'by_me' :
+				$model->setState('filter.author_id', (int) $userId);
+				break;
+			case 'not_me' :
+				$model->setState('filter.author_id', $userId);
+				$model->setState('filter.author_id.include', false);
+				break;
+
+			case '0' :
+				break;
+
+			default:
+				$model->setState('filter.author_id', (int) $params->get('user_id'));
+				break;
+		}
+
+		// Filter by language
+		$model->setState('filter.language', $app->getLanguageFilter());
+
+		//  Featured switch
+		switch ($params->get('show_featured'))
+		{
+			case 1 :
+				$model->setState('filter.featured', 'only');
+				break;
+			case 0 :
+				$model->setState('filter.featured', 'hide');
+				break;
+			default :
+				$model->setState('filter.featured', 'show');
+				break;
+		}
+
+		// Set ordering
+		$order_map = array(
+			'm_dsc' => 'a.modified DESC, a.created',
+			'mc_dsc' => 'CASE WHEN (a.modified = ' . $db->quote($db->getNullDate()) . ') THEN a.created ELSE a.modified END',
+			'c_dsc' => 'a.created',
+			'p_dsc' => 'a.publish_up',
+			'random' => $db->getQuery(true)->Rand(),
+		);
+
+		$ordering = ArrayHelper::getValue($order_map, $params->get('ordering'), 'a.publish_up');
+		$dir      = 'DESC';
+
+		$model->setState('list.ordering', $ordering);
+		$model->setState('list.direction', $dir);
+
+		$items = $model->getItems();
+
+		foreach ($items as &$item)
+		{
+			$item->slug    = $item->id . ':' . $item->alias;
+
+			/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
+			$item->catslug = $item->catid . ':' . $item->category_alias;
+
+			if ($access || in_array($item->access, $authorised))
+			{
+				// We know that user has the privilege to view the article
+				$item->link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+			}
+			else
+			{
+				$item->link = JRoute::_('index.php?option=com_users&view=login');
+			}
+		}
+
+		return $items;
+	}
+}
diff --git a/core/modules/mod_articles_latest/mod_articles_latest.php b/core/modules/mod_articles_latest/mod_articles_latest.php
new file mode 100644
index 00000000..f6ef9762
--- /dev/null
+++ b/core/modules/mod_articles_latest/mod_articles_latest.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the latest functions only once
+JLoader::register('ModArticlesLatestHelper', __DIR__ . '/helper.php');
+
+$list            = ModArticlesLatestHelper::getList($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_articles_latest', $params->get('layout', 'default'));
diff --git a/core/modules/mod_articles_latest/mod_articles_latest.xml b/core/modules/mod_articles_latest/mod_articles_latest.xml
new file mode 100644
index 00000000..3218a860
--- /dev/null
+++ b/core/modules/mod_articles_latest/mod_articles_latest.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_articles_latest</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_LATEST_NEWS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_articles_latest">mod_articles_latest.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_articles_latest.ini</language>
+		<language tag="en-GB">en-GB.mod_articles_latest.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_NEWS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_LATEST_NEWS_FIELD_CATEGORY_DESC"
+					extension="com_content"
+					multiple="true"
+					filter="int_array"
+				/>
+
+				<field
+					name="count"
+					type="number"
+					label="MOD_LATEST_NEWS_FIELD_COUNT_LABEL"
+					description="MOD_LATEST_NEWS_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="show_featured"
+					type="list"
+					label="MOD_LATEST_NEWS_FIELD_FEATURED_LABEL"
+					description="MOD_LATEST_NEWS_FIELD_FEATURED_DESC"
+					default=""
+					filter="integer"
+					>
+					<option value="">JSHOW</option>
+					<option value="0">JHIDE</option>
+					<option value="1">MOD_LATEST_NEWS_VALUE_ONLY_SHOW_FEATURED</option>
+				</field>
+
+				<field
+					name="ordering"
+					type="list"
+					label="MOD_LATEST_NEWS_FIELD_ORDERING_LABEL"
+					description="MOD_LATEST_NEWS_FIELD_ORDERING_DESC"
+					default="published"
+					>
+					<option value="c_dsc">MOD_LATEST_NEWS_VALUE_RECENT_ADDED</option>
+					<option value="m_dsc">MOD_LATEST_NEWS_VALUE_RECENT_MODIFIED</option>
+					<option value="p_dsc">MOD_LATEST_NEWS_VALUE_RECENT_PUBLISHED</option>
+					<option value="mc_dsc">MOD_LATEST_NEWS_VALUE_RECENT_TOUCHED</option>
+					<option	value="random">MOD_LATEST_NEWS_VALUE_RECENT_RAND</option>
+				</field>
+
+				<field
+					name="user_id"
+					type="list"
+					label="MOD_LATEST_NEWS_FIELD_USER_LABEL"
+					description="MOD_LATEST_NEWS_FIELD_USER_DESC"
+					default="0"
+					>
+					<option value="0">MOD_LATEST_NEWS_VALUE_ANYONE</option>
+					<option value="by_me">MOD_LATEST_NEWS_VALUE_ADDED_BY_ME</option>
+					<option value="not_me">MOD_LATEST_NEWS_VALUE_NOTADDED_BY_ME</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_articles_latest/tmpl/default.php b/core/modules/mod_articles_latest/tmpl/default.php
new file mode 100644
index 00000000..17699e2f
--- /dev/null
+++ b/core/modules/mod_articles_latest/tmpl/default.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="latestnews<?php echo $moduleclass_sfx; ?>">
+<?php foreach ($list as $item) : ?>
+	<li itemscope itemtype="https://schema.org/Article">
+		<a href="<?php echo $item->link; ?>" itemprop="url">
+			<span itemprop="name">
+				<?php echo $item->title; ?>
+			</span>
+		</a>
+	</li>
+<?php endforeach; ?>
+</ul>
diff --git a/core/modules/mod_articles_news/helper.php b/core/modules/mod_articles_news/helper.php
new file mode 100644
index 00000000..a296564c
--- /dev/null
+++ b/core/modules/mod_articles_news/helper.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_news
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models', 'ContentModel');
+
+/**
+ * Helper for mod_articles_news
+ *
+ * @since  1.6
+ */
+abstract class ModArticlesNewsHelper
+{
+	/**
+	 * Get a list of the latest articles from the article model
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  object holding the models parameters
+	 *
+	 * @return  mixed
+	 *
+	 * @since 1.6
+	 */
+	public static function getList(&$params)
+	{
+		// Get an instance of the generic articles model
+		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		// Set application parameters in model
+		$app       = JFactory::getApplication();
+		$appParams = $app->getParams();
+		$model->setState('params', $appParams);
+
+		// Set the filters based on the module params
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', (int) $params->get('count', 5));
+		$model->setState('filter.published', 1);
+
+		// This module does not use tags data
+		$model->setState('load_tags', false);
+
+		// Access filter
+		$access     = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
+		$model->setState('filter.access', $access);
+
+		// Category filter
+		$model->setState('filter.category_id', $params->get('catid', array()));
+
+		// Filter by language
+		$model->setState('filter.language', $app->getLanguageFilter());
+
+		// Filer by tag
+		$model->setState('filter.tag', $params->get('tag', array()));
+
+		//  Featured switch
+		switch ($params->get('show_featured'))
+		{
+			case 1 :
+				$model->setState('filter.featured', 'only');
+				break;
+			case 0 :
+				$model->setState('filter.featured', 'hide');
+				break;
+			default :
+				$model->setState('filter.featured', 'show');
+				break;
+		}
+
+		// Set ordering
+		$ordering = $params->get('ordering', 'a.publish_up');
+		$model->setState('list.ordering', $ordering);
+
+		if (trim($ordering) === 'rand()')
+		{
+			$model->setState('list.ordering', JFactory::getDbo()->getQuery(true)->Rand());
+		}
+		else
+		{
+			$direction = $params->get('direction', 1) ? 'DESC' : 'ASC';
+			$model->setState('list.direction', $direction);
+			$model->setState('list.ordering', $ordering);
+		}
+
+		// Check if we should trigger additional plugin events
+		$triggerEvents = $params->get('triggerevents', 1);
+
+		// Retrieve Content
+		$items = $model->getItems();
+
+		foreach ($items as &$item)
+		{
+			$item->readmore = strlen(trim($item->fulltext));
+			$item->slug     = $item->id . ':' . $item->alias;
+
+			/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
+			$item->catslug  = $item->catid . ':' . $item->category_alias;
+
+			if ($access || in_array($item->access, $authorised))
+			{
+				// We know that user has the privilege to view the article
+				$item->link     = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+				$item->linkText = JText::_('MOD_ARTICLES_NEWS_READMORE');
+			}
+			else
+			{
+				$item->link = new JUri(JRoute::_('index.php?option=com_users&view=login', false));
+				$item->link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)));
+				$item->linkText = JText::_('MOD_ARTICLES_NEWS_READMORE_REGISTER');
+			}
+
+			$item->introtext = JHtml::_('content.prepare', $item->introtext, '', 'mod_articles_news.content');
+
+			if (!$params->get('image'))
+			{
+				$item->introtext = preg_replace('/<img[^>]*>/', '', $item->introtext);
+			}
+
+			if ($triggerEvents)
+			{
+				$item->text = '';
+				$app->triggerEvent('onContentPrepare', array ('com_content.article', &$item, &$params, 0));
+
+				$results                 = $app->triggerEvent('onContentAfterTitle', array('com_content.article', &$item, &$params, 0));
+				$item->afterDisplayTitle = trim(implode("\n", $results));
+
+				$results                    = $app->triggerEvent('onContentBeforeDisplay', array('com_content.article', &$item, &$params, 0));
+				$item->beforeDisplayContent = trim(implode("\n", $results));
+
+				$results                   = $app->triggerEvent('onContentAfterDisplay', array('com_content.article', &$item, &$params, 0));
+				$item->afterDisplayContent = trim(implode("\n", $results));
+			}
+			else
+			{
+				$item->afterDisplayTitle    = '';
+				$item->beforeDisplayContent = '';
+				$item->afterDisplayContent  = '';
+			}
+		}
+
+		return $items;
+	}
+}
diff --git a/core/modules/mod_articles_news/mod_articles_news.php b/core/modules/mod_articles_news/mod_articles_news.php
new file mode 100644
index 00000000..8f4e2f20
--- /dev/null
+++ b/core/modules/mod_articles_news/mod_articles_news.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_news
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the news functions only once
+JLoader::register('ModArticlesNewsHelper', __DIR__ . '/helper.php');
+
+$list            = ModArticlesNewsHelper::getList($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_articles_news', $params->get('layout', 'horizontal'));
diff --git a/core/modules/mod_articles_news/mod_articles_news.xml b/core/modules/mod_articles_news/mod_articles_news.xml
new file mode 100644
index 00000000..54850454
--- /dev/null
+++ b/core/modules/mod_articles_news/mod_articles_news.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_articles_news</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_ARTICLES_NEWS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_articles_news">mod_articles_news.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_articles_news.ini</language>
+		<language tag="en-GB">en-GB.mod_articles_news.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_NEWSFLASH"/>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC"
+					extension="com_content"
+					multiple="true"
+					filter="int_array"
+					class="multipleCategories"
+				/>
+
+				<field
+					name="tag"
+					type="tag"
+					label="JTAG"
+					description="JTAG_DESC"
+					mode="nested"
+					multiple="true"
+					filter="int_array"
+					class="multipleTags"
+				/>
+
+				<field
+					name="image"
+					type="radio"
+					label="MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="item_title"
+					type="radio"
+					label="MOD_ARTICLES_NEWS_FIELD_TITLE_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_TITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="link_titles"
+					type="list"
+					label="MOD_ARTICLES_NEWS_FIELD_LINKTITLE_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_LINKTITLE_DESC"
+					default=""
+					filter="integer"
+					class="chzn-color"
+					showon="item_title:1"
+					>
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
+				<field
+					name="item_heading"
+					type="list"
+					label="MOD_ARTICLES_NEWS_TITLE_HEADING"
+					description="MOD_ARTICLES_NEWS_TITLE_HEADING_DESCRIPTION"
+					default="h4"
+					showon="item_title:1"
+					>
+					<option value="h1">JH1</option>
+					<option value="h2">JH2</option>
+					<option value="h3">JH3</option>
+					<option value="h4">JH4</option>
+					<option value="h5">JH5</option>
+				</field>
+
+				<field
+					name="triggerevents"
+					type="radio"
+					label="MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="showLastSeparator"
+					type="radio"
+					label="MOD_ARTICLES_NEWS_FIELD_SEPARATOR_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_SEPARATOR_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="show_introtext"
+					type="radio"
+					label="MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="readmore"
+					type="radio"
+					label="MOD_ARTICLES_NEWS_FIELD_READMORE_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_READMORE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="count"
+					type="number"
+					label="MOD_ARTICLES_NEWS_FIELD_ITEMS_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_ITEMS_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="show_featured"
+					type="list"
+					label="MOD_ARTICLES_NEWS_FIELD_FEATURED_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_FEATURED_DESC"
+					default=""
+					filter="integer"
+					>
+					<option value="">JSHOW</option>
+					<option value="0">JHIDE</option>
+					<option value="1">MOD_ARTICLES_NEWS_VALUE_ONLY_SHOW_FEATURED</option>
+				</field>
+
+				<field
+					name="ordering"
+					type="list"
+					label="MOD_ARTICLES_NEWS_FIELD_ORDERING_LABEL"
+					description="MOD_ARTICLES_NEWS_FIELD_ORDERING_DESC"
+					default="a.publish_up"
+					>
+					<option value="a.publish_up">MOD_ARTICLES_NEWS_FIELD_ORDERING_PUBLISHED_DATE</option>
+					<option value="a.created">MOD_ARTICLES_NEWS_FIELD_ORDERING_CREATED_DATE</option>
+					<option value="a.modified">MOD_ARTICLES_NEWS_FIELD_ORDERING_MODIFIED_DATE</option>
+					<option value="a.ordering">MOD_ARTICLES_NEWS_FIELD_ORDERING_ORDERING</option>
+					<option value="a.hits">JGLOBAL_HITS</option>
+					<option value="rand()">MOD_ARTICLES_NEWS_FIELD_ORDERING_RANDOM</option>
+				</field>
+
+				<field
+					name="direction"
+					type="list"
+					label="JGLOBAL_ORDER_DIRECTION_LABEL"
+					description="JGLOBAL_ORDER_DIRECTION_DESC"
+					default="1"
+					filter="integer"
+					showon="ordering:a.publish_up,a.created,a.modified,a.ordering,a.hits"
+					>
+					<option value="0">JGLOBAL_ORDER_ASCENDING</option>
+					<option value="1">JGLOBAL_ORDER_DESCENDING</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="itemid"
+					>
+					<option value="itemid"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_articles_news/tmpl/_item.php b/core/modules/mod_articles_news/tmpl/_item.php
new file mode 100644
index 00000000..38990876
--- /dev/null
+++ b/core/modules/mod_articles_news/tmpl/_item.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_news
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if ($params->get('item_title')) : ?>
+	<?php $item_heading = $params->get('item_heading', 'h4'); ?>
+	<<?php echo $item_heading; ?> class="newsflash-title<?php echo $params->get('moduleclass_sfx'); ?>">
+	<?php if ($item->link !== '' && $params->get('link_titles')) : ?>
+		<a href="<?php echo $item->link; ?>">
+			<?php echo $item->title; ?>
+		</a>
+	<?php else : ?>
+		<?php echo $item->title; ?>
+	<?php endif; ?>
+	</<?php echo $item_heading; ?>>
+<?php endif; ?>
+
+<?php if (!$params->get('intro_only')) : ?>
+	<?php echo $item->afterDisplayTitle; ?>
+<?php endif; ?>
+
+<?php echo $item->beforeDisplayContent; ?>
+
+<?php if ($params->get('show_introtext', 1)) : ?>
+	<?php echo $item->introtext; ?>
+<?php endif; ?>
+
+<?php echo $item->afterDisplayContent; ?>
+
+<?php if (isset($item->link) && $item->readmore != 0 && $params->get('readmore')) : ?>
+	<?php echo '<a class="readmore" href="' . $item->link . '">' . $item->linkText . '</a>'; ?>
+<?php endif; ?>
diff --git a/core/modules/mod_articles_news/tmpl/default.php b/core/modules/mod_articles_news/tmpl/default.php
new file mode 100644
index 00000000..3596c551
--- /dev/null
+++ b/core/modules/mod_articles_news/tmpl/default.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_news
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="newsflash<?php echo $moduleclass_sfx; ?>">
+	<?php foreach ($list as $item) : ?>
+		<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
+	<?php endforeach; ?>
+</div>
diff --git a/core/modules/mod_articles_news/tmpl/horizontal.php b/core/modules/mod_articles_news/tmpl/horizontal.php
new file mode 100644
index 00000000..7a2cd74e
--- /dev/null
+++ b/core/modules/mod_articles_news/tmpl/horizontal.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_news
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="newsflash-horiz<?php echo $params->get('moduleclass_sfx'); ?>">
+	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
+		<?php $item = $list[$i]; ?>
+		<li>
+			<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
+
+			<?php if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
+				<span class="article-separator">&#160;</span>
+			<?php endif; ?>
+		</li>
+	<?php endfor; ?>
+</ul>
diff --git a/core/modules/mod_articles_news/tmpl/vertical.php b/core/modules/mod_articles_news/tmpl/vertical.php
new file mode 100644
index 00000000..324df176
--- /dev/null
+++ b/core/modules/mod_articles_news/tmpl/vertical.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_news
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="newsflash-vert<?php echo $params->get('moduleclass_sfx'); ?>">
+	<?php for ($i = 0, $n = count($list); $i < $n; $i ++) : ?>
+		<?php $item = $list[$i]; ?>
+		<li class="newsflash-item">
+			<?php require JModuleHelper::getLayoutPath('mod_articles_news', '_item'); ?>
+
+			<?php if ($n > 1 && (($i < $n - 1) || $params->get('showLastSeparator'))) : ?>
+				<span class="article-separator">&#160;</span>
+			<?php endif; ?>
+		</li>
+	<?php endfor; ?>
+</ul>
diff --git a/core/modules/mod_articles_popular/helper.php b/core/modules/mod_articles_popular/helper.php
new file mode 100644
index 00000000..279b4456
--- /dev/null
+++ b/core/modules/mod_articles_popular/helper.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models', 'ContentModel');
+
+/**
+ * Helper for mod_articles_popular
+ *
+ * @since  1.6
+ */
+abstract class ModArticlesPopularHelper
+{
+	/**
+	 * Get a list of popular articles from the articles model
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  object holding the models parameters
+	 *
+	 * @return mixed
+	 */
+	public static function getList(&$params)
+	{
+		// Get an instance of the generic articles model
+		$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		// Set application parameters in model
+		$app = JFactory::getApplication();
+		$appParams = $app->getParams();
+		$model->setState('params', $appParams);
+
+		// Set the filters based on the module params
+		$model->setState('list.start', 0);
+		$model->setState('list.limit', (int) $params->get('count', 5));
+		$model->setState('filter.published', 1);
+		$model->setState('filter.featured', $params->get('show_front', 1) == 1 ? 'show' : 'hide');
+
+		// This module does not use tags data
+		$model->setState('load_tags', false);
+
+		// Access filter
+		$access = !JComponentHelper::getParams('com_content')->get('show_noauth');
+		$authorised = JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id'));
+		$model->setState('filter.access', $access);
+
+		// Category filter
+		$model->setState('filter.category_id', $params->get('catid', array()));
+
+		// Date filter
+		$date_filtering = $params->get('date_filtering', 'off');
+
+		if ($date_filtering !== 'off')
+		{
+			$model->setState('filter.date_filtering', $date_filtering);
+			$model->setState('filter.date_field', $params->get('date_field', 'a.created'));
+			$model->setState('filter.start_date_range', $params->get('start_date_range', '1000-01-01 00:00:00'));
+			$model->setState('filter.end_date_range', $params->get('end_date_range', '9999-12-31 23:59:59'));
+			$model->setState('filter.relative_date', $params->get('relative_date', 30));
+		}
+
+		// Filter by language
+		$model->setState('filter.language', $app->getLanguageFilter());
+
+		// Ordering
+		$model->setState('list.ordering', 'a.hits');
+		$model->setState('list.direction', 'DESC');
+
+		$items = $model->getItems();
+
+		foreach ($items as &$item)
+		{
+			$item->slug = $item->id . ':' . $item->alias;
+
+			/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
+			$item->catslug = $item->catid . ':' . $item->category_alias;
+
+			if ($access || in_array($item->access, $authorised))
+			{
+				// We know that user has the privilege to view the article
+				$item->link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+			}
+			else
+			{
+				$item->link = JRoute::_('index.php?option=com_users&view=login');
+			}
+		}
+
+		return $items;
+	}
+}
diff --git a/core/modules/mod_articles_popular/mod_articles_popular.php b/core/modules/mod_articles_popular/mod_articles_popular.php
new file mode 100644
index 00000000..9cac2006
--- /dev/null
+++ b/core/modules/mod_articles_popular/mod_articles_popular.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the popular functions only once
+JLoader::register('ModArticlesPopularHelper', __DIR__ . '/helper.php');
+
+$list = ModArticlesPopularHelper::getList($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_articles_popular', $params->get('layout', 'default'));
diff --git a/core/modules/mod_articles_popular/mod_articles_popular.xml b/core/modules/mod_articles_popular/mod_articles_popular.xml
new file mode 100644
index 00000000..b4c97f36
--- /dev/null
+++ b/core/modules/mod_articles_popular/mod_articles_popular.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_articles_popular</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_POPULAR_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_articles_popular">mod_articles_popular.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_articles_popular.ini</language>
+		<language tag="en-GB">en-GB.mod_articles_popular.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_MOST_READ" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_POPULAR_FIELD_CATEGORY_DESC"
+					extension="com_content"
+					multiple="true"
+					filter="int_array"
+				/>
+
+				<field
+					name="count"
+					type="number"
+					label="MOD_POPULAR_FIELD_COUNT_LABEL"
+					description="MOD_POPULAR_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="show_front"
+					type="radio"
+					label="MOD_POPULAR_FIELD_FEATURED_LABEL"
+					description="MOD_POPULAR_FIELD_FEATURED_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="basicspacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="date_filtering"
+					type="list"
+					label="MOD_POPULAR_FIELD_DATEFILTERING_LABEL"
+					description="MOD_POPULAR_FIELD_DATEFILTERING_DESC"
+					default="off"
+					>
+					<option value="off">MOD_POPULAR_OPTION_OFF_VALUE</option>
+					<option value="range">MOD_POPULAR_OPTION_DATERANGE_VALUE</option>
+					<option value="relative">MOD_POPULAR_OPTION_RELATIVEDAY_VALUE</option>
+				</field>
+
+				<field
+					name="date_field"
+					type="list"
+					label="MOD_POPULAR_FIELD_DATEFIELD_LABEL"
+					description="MOD_POPULAR_FIELD_DATEFIELD_DESC"
+					default="a.created"
+					showon="date_filtering:range,relative"
+					>
+					<option value="a.created">MOD_POPULAR_OPTION_CREATED_VALUE</option>
+					<option value="a.modified">MOD_POPULAR_OPTION_MODIFIED_VALUE</option>
+					<option value="a.publish_up">MOD_POPULAR_OPTION_STARTPUBLISHING_VALUE</option>
+				</field>
+
+				<field
+					name="start_date_range"
+					type="calendar"
+					label="MOD_POPULAR_FIELD_STARTDATE_LABEL"
+					description="MOD_POPULAR_FIELD_STARTDATE_DESC"
+					translateformat="true"
+					showtime="true"
+					size="22"
+					filter="user_utc"
+					showon="date_filtering:range"
+				/>
+
+				<field
+					name="end_date_range"
+					type="calendar"
+					label="MOD_POPULAR_FIELD_ENDDATE_LABEL"
+					description="MOD_POPULAR_FIELD_ENDDATE_DESC"
+					translateformat="true"
+					showtime="true"
+					size="22"
+					filter="user_utc"
+					showon="date_filtering:range"
+				/>
+
+				<field
+					name="relative_date"
+					type="number"
+					label="MOD_POPULAR_FIELD_RELATIVEDATE_LABEL"
+					description="MOD_POPULAR_FIELD_RELATIVEDATE_DESC"
+					default="30"
+					filter="integer"
+					showon="date_filtering:relative"
+				/>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_articles_popular/tmpl/default.php b/core/modules/mod_articles_popular/tmpl/default.php
new file mode 100644
index 00000000..094c2923
--- /dev/null
+++ b/core/modules/mod_articles_popular/tmpl/default.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_articles_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="mostread<?php echo $moduleclass_sfx; ?>">
+<?php foreach ($list as $item) : ?>
+	<li itemscope itemtype="https://schema.org/Article">
+		<a href="<?php echo $item->link; ?>" itemprop="url">
+			<span itemprop="name">
+				<?php echo $item->title; ?>
+			</span>
+		</a>
+	</li>
+<?php endforeach; ?>
+</ul>
diff --git a/core/modules/mod_banners/helper.php b/core/modules/mod_banners/helper.php
new file mode 100644
index 00000000..21db8769
--- /dev/null
+++ b/core/modules/mod_banners/helper.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_banners
+ *
+ * @since  1.5
+ */
+class ModBannersHelper
+{
+	/**
+	 * Retrieve list of banners
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  mixed
+	 */
+	public static function &getList(&$params)
+	{
+		JModelLegacy::addIncludePath(JPATH_ROOT . '/components/com_banners/models', 'BannersModel');
+
+		$document = JFactory::getDocument();
+		$app      = JFactory::getApplication();
+		$keywords = explode(',', $document->getMetaData('keywords'));
+
+		$model = JModelLegacy::getInstance('Banners', 'BannersModel', array('ignore_request' => true));
+		$model->setState('filter.client_id', (int) $params->get('cid'));
+		$model->setState('filter.category_id', $params->get('catid', array()));
+		$model->setState('list.limit', (int) $params->get('count', 1));
+		$model->setState('list.start', 0);
+		$model->setState('filter.ordering', $params->get('ordering'));
+		$model->setState('filter.tag_search', $params->get('tag_search'));
+		$model->setState('filter.keywords', $keywords);
+		$model->setState('filter.language', $app->getLanguageFilter());
+
+		$banners = $model->getItems();
+
+		if ($banners)
+		{
+			$model->impress();
+		}
+
+		return $banners;
+	}
+}
diff --git a/core/modules/mod_banners/mod_banners.php b/core/modules/mod_banners/mod_banners.php
new file mode 100644
index 00000000..9cc3f2b6
--- /dev/null
+++ b/core/modules/mod_banners/mod_banners.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the banners functions only once
+JLoader::register('ModBannersHelper', __DIR__ . '/helper.php');
+
+$headerText = trim($params->get('header_text'));
+$footerText = trim($params->get('footer_text'));
+
+JLoader::register('BannersHelper', JPATH_ADMINISTRATOR . '/components/com_banners/helpers/banners.php');
+BannersHelper::updateReset();
+$list = &ModBannersHelper::getList($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_banners', $params->get('layout', 'default'));
diff --git a/core/modules/mod_banners/mod_banners.xml b/core/modules/mod_banners/mod_banners.xml
new file mode 100644
index 00000000..81b49748
--- /dev/null
+++ b/core/modules/mod_banners/mod_banners.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_banners</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_BANNERS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_banners">mod_banners.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_banners.ini</language>
+		<language tag="en-GB">en-GB.mod_banners.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_BANNERS" />
+	<config>
+		<fields name="params">
+			<fieldset
+				name="basic"
+				addfieldpath="/administrator/components/com_banners/models/fields"
+				>
+
+				<field
+					name="target"
+					type="list"
+					label="MOD_BANNERS_FIELD_TARGET_LABEL"
+					description="MOD_BANNERS_FIELD_TARGET_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JBROWSERTARGET_PARENT</option>
+					<option value="1">JBROWSERTARGET_NEW</option>
+					<option value="2">JBROWSERTARGET_POPUP</option>
+				</field>
+
+				<field
+					name="count"
+					type="number"
+					label="MOD_BANNERS_FIELD_COUNT_LABEL"
+					description="MOD_BANNERS_FIELD_COUNT_DESC"
+					default="5"
+					filter="integer"
+					class="validate-numeric"
+				/>
+
+				<field
+					name="cid"
+					type="bannerclient"
+					label="MOD_BANNERS_FIELD_BANNERCLIENT_LABEL"
+					description="MOD_BANNERS_FIELD_BANNERCLIENT_DESC"
+					filter="integer"
+				/>
+
+				<field
+					name="catid"
+					type="category"
+					label="JCATEGORY"
+					description="MOD_BANNERS_FIELD_CATEGORY_DESC"
+					extension="com_banners"
+					multiple="true"
+					filter="int_array"
+					class="multipleCategories"
+				/>
+
+				<field
+					name="tag_search"
+					type="radio"
+					label="MOD_BANNERS_FIELD_TAG_LABEL"
+					description="MOD_BANNERS_FIELD_TAG_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="ordering"
+					type="list"
+					label="MOD_BANNERS_FIELD_RANDOMISE_LABEL"
+					description="MOD_BANNERS_FIELD_RANDOMISE_DESC"
+					default="0"
+					>
+					<option value="0">MOD_BANNERS_VALUE_STICKYORDERING</option>
+					<option value="random">MOD_BANNERS_VALUE_STICKYRANDOMISE</option>
+				</field>
+
+				<field
+					name="header_text"
+					type="textarea"
+					label="MOD_BANNERS_FIELD_HEADER_LABEL"
+					description="MOD_BANNERS_FIELD_HEADER_DESC"
+					filter="safehtml"
+					rows="3"
+					cols="40"
+				/>
+
+				<field
+					name="footer_text"
+					type="textarea"
+					label="MOD_BANNERS_FIELD_FOOTER_LABEL"
+					description="MOD_BANNERS_FIELD_FOOTER_DESC"
+					filter="safehtml"
+					rows="3"
+					cols="40"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_banners/tmpl/default.php b/core/modules/mod_banners/tmpl/default.php
new file mode 100644
index 00000000..241fb447
--- /dev/null
+++ b/core/modules/mod_banners/tmpl/default.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_banners
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('BannerHelper', JPATH_ROOT . '/components/com_banners/helpers/banner.php');
+?>
+<div class="bannergroup<?php echo $moduleclass_sfx; ?>">
+<?php if ($headerText) : ?>
+	<?php echo $headerText; ?>
+<?php endif; ?>
+
+<?php foreach ($list as $item) : ?>
+	<div class="banneritem">
+		<?php $link = JRoute::_('index.php?option=com_banners&task=click&id=' . $item->id); ?>
+		<?php if ($item->type == 1) : ?>
+			<?php // Text based banners ?>
+			<?php echo str_replace(array('{CLICKURL}', '{NAME}'), array($link, $item->name), $item->custombannercode); ?>
+		<?php else : ?>
+			<?php $imageurl = $item->params->get('imageurl'); ?>
+			<?php $width = $item->params->get('width'); ?>
+			<?php $height = $item->params->get('height'); ?>
+			<?php if (BannerHelper::isImage($imageurl)) : ?>
+				<?php // Image based banner ?>
+				<?php $baseurl = strpos($imageurl, 'http') === 0 ? '' : JUri::base(); ?>
+				<?php $alt = $item->params->get('alt'); ?>
+				<?php $alt = $alt ?: $item->name; ?>
+				<?php $alt = $alt ?: JText::_('MOD_BANNERS_BANNER'); ?>
+				<?php if ($item->clickurl) : ?>
+					<?php // Wrap the banner in a link ?>
+					<?php $target = $params->get('target', 1); ?>
+					<?php if ($target == 1) : ?>
+						<?php // Open in a new window ?>
+						<a
+							href="<?php echo $link; ?>" target="_blank" rel="noopener noreferrer"
+							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
+							<img
+								src="<?php echo $baseurl . $imageurl; ?>"
+								alt="<?php echo $alt;?>"
+								<?php if (!empty($width)) echo ' width="' . $width . '"';?>
+								<?php if (!empty($height)) echo ' height="' . $height . '"';?>
+							/>
+						</a>
+					<?php elseif ($target == 2) : ?>
+						<?php // Open in a popup window ?>
+						<a
+							href="<?php echo $link; ?>" onclick="window.open(this.href, '',
+								'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=780,height=550');
+								return false"
+							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
+							<img
+								src="<?php echo $baseurl . $imageurl; ?>"
+								alt="<?php echo $alt;?>"
+								<?php if (!empty($width)) echo ' width="' . $width . '"';?>
+								<?php if (!empty($height)) echo ' height="' . $height . '"';?>
+							/>
+						</a>
+					<?php else : ?>
+						<?php // Open in parent window ?>
+						<a
+							href="<?php echo $link; ?>"
+							title="<?php echo htmlspecialchars($item->name, ENT_QUOTES, 'UTF-8'); ?>">
+							<img
+								src="<?php echo $baseurl . $imageurl; ?>"
+								alt="<?php echo $alt;?>"
+								<?php if (!empty($width)) echo ' width="' . $width . '"';?>
+								<?php if (!empty($height)) echo ' height="' . $height . '"';?>
+							/>
+						</a>
+					<?php endif; ?>
+				<?php else : ?>
+					<?php // Just display the image if no link specified ?>
+					<img
+						src="<?php echo $baseurl . $imageurl; ?>"
+						alt="<?php echo $alt;?>"
+						<?php if (!empty($width)) echo ' width="' . $width . '"';?>
+						<?php if (!empty($height)) echo ' height="' . $height . '"';?>
+					/>
+				<?php endif; ?>
+			<?php elseif (BannerHelper::isFlash($imageurl)) : ?>
+				<object
+					classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+					codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
+					<?php if (!empty($width)) echo ' width="' . $width . '"';?>
+					<?php if (!empty($height)) echo ' height="' . $height . '"';?>
+				>
+					<param name="movie" value="<?php echo $imageurl; ?>" />
+					<embed
+						src="<?php echo $imageurl; ?>"
+						loop="false"
+						pluginspage="http://www.macromedia.com/go/get/flashplayer"
+						type="application/x-shockwave-flash"
+						<?php if (!empty($width)) echo ' width="' . $width . '"';?>
+						<?php if (!empty($height)) echo ' height="' . $height . '"';?>
+					/>
+				</object>
+			<?php endif; ?>
+		<?php endif; ?>
+		<div class="clr"></div>
+	</div>
+<?php endforeach; ?>
+
+<?php if ($footerText) : ?>
+	<div class="bannerfooter">
+		<?php echo $footerText; ?>
+	</div>
+<?php endif; ?>
+</div>
diff --git a/core/modules/mod_breadcrumbs/helper.php b/core/modules/mod_breadcrumbs/helper.php
new file mode 100644
index 00000000..5a606d6c
--- /dev/null
+++ b/core/modules/mod_breadcrumbs/helper.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_breadcrumbs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_breadcrumbs
+ *
+ * @since  1.5
+ */
+class ModBreadCrumbsHelper
+{
+	/**
+	 * Retrieve breadcrumb items
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return array
+	 */
+	public static function getList(&$params)
+	{
+		// Get the PathWay object from the application
+		$app     = JFactory::getApplication();
+		$pathway = $app->getPathway();
+		$items   = $pathway->getPathWay();
+		$lang    = JFactory::getLanguage();
+		$menu    = $app->getMenu();
+
+		// Look for the home menu
+		if (JLanguageMultilang::isEnabled())
+		{
+			$home = $menu->getDefault($lang->getTag());
+		}
+		else
+		{
+			$home  = $menu->getDefault();
+		}
+
+		$count = count($items);
+
+		// Don't use $items here as it references JPathway properties directly
+		$crumbs = array();
+
+		for ($i = 0; $i < $count; $i ++)
+		{
+			$crumbs[$i]       = new stdClass;
+			$crumbs[$i]->name = stripslashes(htmlspecialchars($items[$i]->name, ENT_COMPAT, 'UTF-8'));
+			$crumbs[$i]->link = JRoute::_($items[$i]->link);
+		}
+
+		if ($params->get('showHome', 1))
+		{
+			$item       = new stdClass;
+			$item->name = htmlspecialchars($params->get('homeText', JText::_('MOD_BREADCRUMBS_HOME')), ENT_COMPAT, 'UTF-8');
+			$item->link = JRoute::_('index.php?Itemid=' . $home->id);
+			array_unshift($crumbs, $item);
+		}
+
+		return $crumbs;
+	}
+
+	/**
+	 * Set the breadcrumbs separator for the breadcrumbs display.
+	 *
+	 * @param   string  $custom  Custom xhtml complient string to separate the
+	 * items of the breadcrumbs
+	 *
+	 * @return  string	Separator string
+	 *
+	 * @since   1.5
+	 */
+	public static function setSeparator($custom = null)
+	{
+		$lang = JFactory::getLanguage();
+
+		// If a custom separator has not been provided we try to load a template
+		// specific one first, and if that is not present we load the default separator
+		if ($custom === null)
+		{
+			if ($lang->isRtl())
+			{
+				$_separator = JHtml::_('image', 'system/arrow_rtl.png', null, null, true);
+			}
+			else
+			{
+				$_separator = JHtml::_('image', 'system/arrow.png', null, null, true);
+			}
+		}
+		else
+		{
+			$_separator     = htmlspecialchars($custom, ENT_COMPAT, 'UTF-8');
+		}
+
+		return $_separator;
+	}
+}
diff --git a/core/modules/mod_breadcrumbs/mod_breadcrumbs.php b/core/modules/mod_breadcrumbs/mod_breadcrumbs.php
new file mode 100644
index 00000000..73160276
--- /dev/null
+++ b/core/modules/mod_breadcrumbs/mod_breadcrumbs.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_breadcrumbs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the breadcrumbs functions only once
+JLoader::register('ModBreadCrumbsHelper', __DIR__ . '/helper.php');
+
+// Get the breadcrumbs
+$list  = ModBreadCrumbsHelper::getList($params);
+$count = count($list);
+
+// Set the default separator
+$separator = ModBreadCrumbsHelper::setSeparator($params->get('separator'));
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_breadcrumbs', $params->get('layout', 'default'));
diff --git a/core/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/core/modules/mod_breadcrumbs/mod_breadcrumbs.xml
new file mode 100644
index 00000000..6333c1a0
--- /dev/null
+++ b/core/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_breadcrumbs</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_BREADCRUMBS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_breadcrumbs">mod_breadcrumbs.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_breadcrumbs.ini</language>
+		<language tag="en-GB">en-GB.mod_breadcrumbs.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_BREADCRUMBS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="showHere"
+					type="radio"
+					label="MOD_BREADCRUMBS_FIELD_SHOWHERE_LABEL"
+					description="MOD_BREADCRUMBS_FIELD_SHOWHERE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="showHome"
+					type="radio"
+					label="MOD_BREADCRUMBS_FIELD_SHOWHOME_LABEL"
+					description="MOD_BREADCRUMBS_FIELD_SHOWHOME_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="homeText"
+					type="text"
+					label="MOD_BREADCRUMBS_FIELD_HOMETEXT_LABEL"
+					description="MOD_BREADCRUMBS_FIELD_HOMETEXT_DESC"
+					showon="showHome:1"
+				/>
+
+				<field
+					name="showLast"
+					type="radio"
+					label="MOD_BREADCRUMBS_FIELD_SHOWLAST_LABEL"
+					description="MOD_BREADCRUMBS_FIELD_SHOWLAST_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="separator"
+					type="text"
+					label="MOD_BREADCRUMBS_FIELD_SEPARATOR_LABEL"
+					description="MOD_BREADCRUMBS_FIELD_SEPARATOR_DESC"
+				/>
+
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="0"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="itemid"
+					>
+					<option value="itemid"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_breadcrumbs/tmpl/default.php b/core/modules/mod_breadcrumbs/tmpl/default.php
new file mode 100644
index 00000000..2cfe5108
--- /dev/null
+++ b/core/modules/mod_breadcrumbs/tmpl/default.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_breadcrumbs
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<ul itemscope itemtype="https://schema.org/BreadcrumbList" class="breadcrumb<?php echo $moduleclass_sfx; ?>">
+	<?php if ($params->get('showHere', 1)) : ?>
+		<li>
+			<?php echo JText::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
+		</li>
+	<?php else : ?>
+		<li class="active">
+			<span class="divider icon-location"></span>
+		</li>
+	<?php endif; ?>
+
+	<?php
+	// Get rid of duplicated entries on trail including home page when using multilanguage
+	for ($i = 0; $i < $count; $i++)
+	{
+		if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link)
+		{
+			unset($list[$i]);
+		}
+	}
+
+	// Find last and penultimate items in breadcrumbs list
+	end($list);
+	$last_item_key   = key($list);
+	prev($list);
+	$penult_item_key = key($list);
+
+	// Make a link if not the last item in the breadcrumbs
+	$show_last = $params->get('showLast', 1);
+
+	// Generate the trail
+	foreach ($list as $key => $item) :
+		if ($key !== $last_item_key) :
+			// Render all but last item - along with separator ?>
+			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+				<?php if (!empty($item->link)) : ?>
+					<a itemprop="item" href="<?php echo $item->link; ?>" class="pathway"><span itemprop="name"><?php echo $item->name; ?></span></a>
+				<?php else : ?>
+					<span itemprop="name">
+						<?php echo $item->name; ?>
+					</span>
+				<?php endif; ?>
+
+				<?php if (($key !== $penult_item_key) || $show_last) : ?>
+					<span class="divider">
+						<?php echo $separator; ?>
+					</span>
+				<?php endif; ?>
+				<meta itemprop="position" content="<?php echo $key + 1; ?>">
+			</li>
+		<?php elseif ($show_last) :
+			// Render last item if reqd. ?>
+			<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="active">
+				<span itemprop="name">
+					<?php echo $item->name; ?>
+				</span>
+				<meta itemprop="position" content="<?php echo $key + 1; ?>">
+			</li>
+		<?php endif;
+	endforeach; ?>
+</ul>
diff --git a/core/modules/mod_custom/mod_custom.php b/core/modules/mod_custom/mod_custom.php
new file mode 100644
index 00000000..81afe2a1
--- /dev/null
+++ b/core/modules/mod_custom/mod_custom.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_custom
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if ($params->def('prepare_content', 1))
+{
+	JPluginHelper::importPlugin('content');
+	$module->content = JHtml::_('content.prepare', $module->content, '', 'mod_custom.content');
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_custom', $params->get('layout', 'default'));
diff --git a/core/modules/mod_custom/mod_custom.xml b/core/modules/mod_custom/mod_custom.xml
new file mode 100644
index 00000000..af6080df
--- /dev/null
+++ b/core/modules/mod_custom/mod_custom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_custom</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_CUSTOM_XML_DESCRIPTION</description>
+
+	<customContent />
+
+	<files>
+		<filename module="mod_custom">mod_custom.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_custom.ini</language>
+		<language tag="en-GB">en-GB.mod_custom.sys.ini</language>
+	</languages>
+
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_CUSTOM_HTML" />
+	<config>
+		<fields name="params">
+			<fieldset name="options" label="COM_MODULES_BASIC_FIELDSET_LABEL">
+				<field
+					name="prepare_content"
+					type="radio"
+					label="MOD_CUSTOM_FIELD_PREPARE_CONTENT_LABEL"
+					description="MOD_CUSTOM_FIELD_PREPARE_CONTENT_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="backgroundimage"
+					type="media"
+					label="MOD_CUSTOM_FIELD_BACKGROUNDIMAGE_LABEL"
+					description="MOD_BACKGROUNDIMAGE_FIELD_LOGO_DESC"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_custom/tmpl/default.php b/core/modules/mod_custom/tmpl/default.php
new file mode 100644
index 00000000..beff7fc1
--- /dev/null
+++ b/core/modules/mod_custom/tmpl/default.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_custom
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+
+<div class="custom<?php echo $moduleclass_sfx; ?>" <?php if ($params->get('backgroundimage')) : ?> style="background-image:url(<?php echo $params->get('backgroundimage'); ?>)"<?php endif; ?> >
+	<?php echo $module->content; ?>
+</div>
diff --git a/core/modules/mod_feed/helper.php b/core/modules/mod_feed/helper.php
new file mode 100644
index 00000000..338d62bf
--- /dev/null
+++ b/core/modules/mod_feed/helper.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_feed
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_feed
+ *
+ * @since  1.5
+ */
+class ModFeedHelper
+{
+	/**
+	 * Retrieve feed information
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  module parameters
+	 *
+	 * @return  JFeedReader|string
+	 */
+	public static function getFeed($params)
+	{
+		// Module params
+		$rssurl = $params->get('rssurl', '');
+
+		// Get RSS parsed object
+		try
+		{
+			$feed   = new JFeedFactory;
+			$rssDoc = $feed->getFeed($rssurl);
+		}
+		catch (Exception $e)
+		{
+			return JText::_('MOD_FEED_ERR_FEED_NOT_RETRIEVED');
+		}
+
+		if (empty($rssDoc))
+		{
+			return JText::_('MOD_FEED_ERR_FEED_NOT_RETRIEVED');
+		}
+
+		if ($rssDoc)
+		{
+			return $rssDoc;
+		}
+	}
+}
diff --git a/core/modules/mod_feed/mod_feed.php b/core/modules/mod_feed/mod_feed.php
new file mode 100644
index 00000000..b91af118
--- /dev/null
+++ b/core/modules/mod_feed/mod_feed.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_feed
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the feed functions only once
+JLoader::register('ModFeedHelper', __DIR__ . '/helper.php');
+
+$rssurl = $params->get('rssurl', '');
+$rssrtl = $params->get('rssrtl', 0);
+
+// Check if feed URL has been set
+if (empty ($rssurl))
+{
+	echo '<div>';
+	echo JText::_('MOD_FEED_ERR_NO_URL');
+	echo '</div>';
+
+	return;
+}
+
+$feed = ModFeedHelper::getFeed($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_feed', $params->get('layout', 'default'));
diff --git a/core/modules/mod_feed/mod_feed.xml b/core/modules/mod_feed/mod_feed.xml
new file mode 100644
index 00000000..0d0dee1b
--- /dev/null
+++ b/core/modules/mod_feed/mod_feed.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_feed</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_FEED_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_feed">mod_feed.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_feed.ini</language>
+		<language tag="en-GB">en-GB.mod_feed.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_FEED_DISPLAY" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="rssurl"
+					type="url"
+					label="MOD_FEED_FIELD_RSSURL_LABEL"
+					description="MOD_FEED_FIELD_RSSURL_DESC"
+					size="50"
+					filter="url"
+					required="true"
+					validate="url"
+				/>
+
+				<field
+					name="rssrtl"
+					type="radio"
+					label="MOD_FEED_FIELD_RTL_LABEL"
+					description="MOD_FEED_FIELD_RTL_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rsstitle"
+					type="radio"
+					label="MOD_FEED_FIELD_RSSTITLE_LABEL"
+					description="MOD_FEED_FIELD_RSSTITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rssdesc"
+					type="radio"
+					label="MOD_FEED_FIELD_DESCRIPTION_LABEL"
+					description="MOD_FEED_FIELD_DESCRIPTION_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rssimage"
+					type="radio"
+					label="MOD_FEED_FIELD_IMAGE_LABEL"
+					description="MOD_FEED_FIELD_IMAGE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="rssitems"
+					type="number"
+					label="MOD_FEED_FIELD_ITEMS_LABEL"
+					description="MOD_FEED_FIELD_ITEMS_DESC"
+					default="3"
+					filter="integer"
+				/>
+
+				<field
+					name="rssitemdesc"
+					type="radio"
+					label="MOD_FEED_FIELD_ITEMDESCRIPTION_LABEL"
+					description="MOD_FEED_FIELD_ITEMDESCRIPTION_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="word_count"
+					type="text"
+					label="MOD_FEED_FIELD_WORDCOUNT_LABEL"
+					description="MOD_FEED_FIELD_WORDCOUNT_DESC"
+					size="6"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_feed/tmpl/default.php b/core/modules/mod_feed/tmpl/default.php
new file mode 100644
index 00000000..079cc542
--- /dev/null
+++ b/core/modules/mod_feed/tmpl/default.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_feed
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<?php
+if (!empty($feed) && is_string($feed))
+{
+	echo $feed;
+}
+else
+{
+	$lang      = JFactory::getLanguage();
+	$myrtl     = $params->get('rssrtl', 0);
+	$direction = ' ';
+
+	$isRtl = $lang->isRtl();
+
+	if ($isRtl && $myrtl == 0)
+	{
+		$direction = ' redirect-rtl';
+	}
+
+	// Feed description
+	elseif ($isRtl && $myrtl == 1)
+	{
+		$direction = ' redirect-ltr';
+	}
+
+	elseif ($isRtl && $myrtl == 2)
+	{
+		$direction = ' redirect-rtl';
+	}
+
+	elseif ($myrtl == 0)
+	{
+		$direction = ' redirect-ltr';
+	}
+	elseif ($myrtl == 1)
+	{
+		$direction = ' redirect-ltr';
+	}
+	elseif ($myrtl == 2)
+	{
+		$direction = ' redirect-rtl';
+	}
+
+	if ($feed !== false)
+	{
+		// Image handling
+		$iUrl   = isset($feed->image) ? $feed->image : null;
+		$iTitle = isset($feed->imagetitle) ? $feed->imagetitle : null;
+		?>
+		<div style="direction: <?php echo $rssrtl ? 'rtl' :'ltr'; ?>; text-align: <?php echo $rssrtl ? 'right' :'left'; ?> !important" class="feed<?php echo $moduleclass_sfx; ?>">
+		<?php
+		// Feed description
+		if ($feed->title !== null && $params->get('rsstitle', 1))
+		{
+			?>
+					<h2 class="<?php echo $direction; ?>">
+						<a href="<?php echo htmlspecialchars($rssurl, ENT_COMPAT, 'UTF-8'); ?>" target="_blank">
+						<?php echo $feed->title; ?></a>
+					</h2>
+			<?php
+		}
+		// Feed description
+		if ($params->get('rssdesc', 1))
+		{
+		?>
+			<?php echo $feed->description; ?>
+			<?php
+		}
+		// Feed image
+		if ($iUrl && $params->get('rssimage', 1)) :
+		?>
+			<img src="<?php echo $iUrl; ?>" alt="<?php echo @$iTitle; ?>"/>
+		<?php endif; ?>
+
+
+	<!-- Show items -->
+	<?php if (!empty($feed))
+	{ ?>
+		<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?>">
+		<?php for ($i = 0, $max = min(count($feed), $params->get('rssitems', 3)); $i < $max; $i++) { ?>
+			<?php
+				$uri  = $feed[$i]->uri || !$feed[$i]->isPermaLink ? trim($feed[$i]->uri) : trim($feed[$i]->guid);
+				$uri  = !$uri || stripos($uri, 'http') !== 0 ? $rssurl : $uri;
+				$text = $feed[$i]->content !== '' ? trim($feed[$i]->content) : '';
+			?>
+				<li>
+					<?php if (!empty($uri)) : ?>
+						<span class="feed-link">
+						<a href="<?php echo htmlspecialchars($uri, ENT_COMPAT, 'UTF-8'); ?>" target="_blank">
+						<?php echo trim($feed[$i]->title); ?></a></span>
+					<?php else : ?>
+						<span class="feed-link"><?php echo trim($feed[$i]->title); ?></span>
+					<?php endif; ?>
+
+					<?php if ($params->get('rssitemdesc', 1) && $text !== '') : ?>
+						<div class="feed-item-description">
+						<?php
+							// Strip the images.
+							$text = JFilterOutput::stripImages($text);
+							$text = JHtml::_('string.truncate', $text, $params->get('word_count', 0));
+							echo str_replace('&apos;', "'", $text);
+						?>
+						</div>
+					<?php endif; ?>
+				</li>
+		<?php } ?>
+		</ul>
+	<?php } ?>
+	</div>
+	<?php }
+}
diff --git a/core/modules/mod_finder/helper.php b/core/modules/mod_finder/helper.php
new file mode 100644
index 00000000..8c362ece
--- /dev/null
+++ b/core/modules/mod_finder/helper.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Finder module helper.
+ *
+ * @since  2.5
+ */
+class ModFinderHelper
+{
+	/**
+	 * Method to get hidden input fields for a get form so that control variables
+	 * are not lost upon form submission.
+	 *
+	 * @param   string   $route      The route to the page. [optional]
+	 * @param   integer  $paramItem  The menu item ID. (@since 3.1) [optional]
+	 *
+	 * @return  string  A string of hidden input form fields
+	 *
+	 * @since   2.5
+	 */
+	public static function getGetFields($route = null, $paramItem = 0)
+	{
+		// Determine if there is an item id before routing.
+		$needId = !JUri::getInstance($route)->getVar('Itemid');
+
+		$fields = array();
+		$uri = JUri::getInstance(JRoute::_($route));
+		$uri->delVar('q');
+
+		// Create hidden input elements for each part of the URI.
+		foreach ($uri->getQuery(true) as $n => $v)
+		{
+			$fields[] = '<input type="hidden" name="' . $n . '" value="' . $v . '" />';
+		}
+
+		// Add a field for Itemid if we need one.
+		if ($needId)
+		{
+			$id       = $paramItem ?: JFactory::getApplication()->input->get('Itemid', '0', 'int');
+			$fields[] = '<input type="hidden" name="Itemid" value="' . $id . '" />';
+		}
+
+		return implode('', $fields);
+	}
+
+	/**
+	 * Get Smart Search query object.
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  Module parameters.
+	 *
+	 * @return  FinderIndexerQuery object
+	 *
+	 * @since   2.5
+	 */
+	public static function getQuery($params)
+	{
+		$app     = JFactory::getApplication();
+		$input   = $app->input;
+		$request = $input->request;
+		$filter  = JFilterInput::getInstance();
+
+		// Get the static taxonomy filters.
+		$options = array();
+		$options['filter'] = ($request->get('f', 0, 'int') !== 0) ? $request->get('f', '', 'int') : $params->get('searchfilter');
+		$options['filter'] = $filter->clean($options['filter'], 'int');
+
+		// Get the dynamic taxonomy filters.
+		$options['filters'] = $request->get('t', '', 'array');
+		$options['filters'] = $filter->clean($options['filters'], 'array');
+		$options['filters'] = ArrayHelper::toInteger($options['filters']);
+
+		// Instantiate a query object.
+		return new FinderIndexerQuery($options);
+	}
+}
diff --git a/core/modules/mod_finder/mod_finder.php b/core/modules/mod_finder/mod_finder.php
new file mode 100644
index 00000000..d8c47165
--- /dev/null
+++ b/core/modules/mod_finder/mod_finder.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('FinderHelperRoute', JPATH_SITE . '/components/com_finder/helpers/route.php');
+JLoader::register('FinderHelperLanguage', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/language.php');
+
+// Include the helper.
+JLoader::register('ModFinderHelper', __DIR__ . '/helper.php');
+
+if (!defined('FINDER_PATH_INDEXER'))
+{
+	define('FINDER_PATH_INDEXER', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer');
+}
+
+JLoader::register('FinderIndexerQuery', FINDER_PATH_INDEXER . '/query.php');
+
+// Check for OpenSearch
+if ($params->get('opensearch', 1))
+{
+	/*
+	This code intentionally commented
+	$doc = JFactory::getDocument();
+	$app = JFactory::getApplication();
+
+	$ostitle = $params->get('opensearch_title', JText::_('MOD_FINDER_SEARCHBUTTON_TEXT') . ' ' . $app->get('sitename'));
+	$doc->addHeadLink(
+						JUri::getInstance()->toString(array('scheme', 'host', 'port')) . JRoute::_('&option=com_finder&format=opensearch'),
+						'search', 'rel', array('title' => $ostitle, 'type' => 'application/opensearchdescription+xml')
+					);
+	*/
+}
+
+// Initialize module parameters.
+$params->def('field_size', 20);
+
+// Get the route.
+$route = FinderHelperRoute::getSearchRoute($params->get('searchfilter', null));
+
+// Load component language file.
+FinderHelperLanguage::loadComponentLanguage();
+
+// Load plugin language files.
+FinderHelperLanguage::loadPluginLanguage();
+
+// Get Smart Search query object.
+$query = ModFinderHelper::getQuery($params);
+
+require JModuleHelper::getLayoutPath('mod_finder', $params->get('layout', 'default'));
diff --git a/core/modules/mod_finder/mod_finder.xml b/core/modules/mod_finder/mod_finder.xml
new file mode 100644
index 00000000..30e39ec8
--- /dev/null
+++ b/core/modules/mod_finder/mod_finder.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_finder</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_FINDER_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_finder">mod_finder.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.mod_finder.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.mod_finder.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_SMART_SEARCH" />
+	<config>
+		<fields name="params" addfieldpath="/administrator/components/com_finder/models/fields">
+			<fieldset name="basic">
+				<field
+					name="searchfilter"
+					type="searchfilter"
+					label="MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_LABEL"
+					description="MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_DESCRIPTION"
+					default=""
+				/>
+
+				<field
+					name="show_autosuggest"
+					type="radio"
+					label="MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_LABEL"
+					description="MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_DESCRIPTION"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="show_advanced"
+					type="list"
+					label="MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_LABEL"
+					description="MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_DESCRIPTION"
+					default="0"
+					filter="integer"
+					>
+					<option value="2">MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_OPTION_LINK</option>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="field_size"
+					type="number"
+					label="MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_DESCRIPTION"
+					default="25"
+					filter="integer"
+				/>
+
+				<field
+					name="show_label"
+					type="radio"
+					label="MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_DESCRIPTION"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="label_pos"
+					type="list"
+					label="MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_DESCRIPTION"
+					default="left"
+					>
+					<option value="right">JGLOBAL_RIGHT</option>
+					<option value="left">JGLOBAL_LEFT</option>
+					<option value="top">MOD_FINDER_CONFIG_OPTION_TOP</option>
+					<option value="bottom">MOD_FINDER_CONFIG_OPTION_BOTTOM</option>
+				</field>
+
+				<field
+					name="alt_label"
+					type="text"
+					label="MOD_FINDER_FIELDSET_ADVANCED_ALT_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_ALT_DESCRIPTION"
+				/>
+
+				<field
+					name="show_button"
+					type="radio"
+					label="MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_DESCRIPTION"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="button_pos"
+					type="list"
+					label="MOD_FINDER_FIELDSET_ADVANCED_BUTTON_POS_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_BUTTON_POS_DESCRIPTION"
+					default="left"
+					>
+					<option value="right">JGLOBAL_RIGHT</option>
+					<option value="left">JGLOBAL_LEFT</option>
+					<option value="top">MOD_FINDER_CONFIG_OPTION_TOP</option>
+					<option value="bottom">MOD_FINDER_CONFIG_OPTION_BOTTOM</option>
+				</field>
+
+				<field
+					name="opensearch"
+					type="radio"
+					label="MOD_FINDER_FIELD_OPENSEARCH_LABEL"
+					description="MOD_FINDER_FIELD_OPENSEARCH_DESCRIPTION"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="opensearch_title"
+					type="text"
+					label="MOD_FINDER_FIELD_OPENSEARCH_TEXT_LABEL"
+					description="MOD_FINDER_FIELD_OPENSEARCH_TEXT_DESCRIPTION"
+				/>
+
+				<field
+					name="set_itemid"
+					type="menuitem"
+					label="MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">MOD_FINDER_SELECT_MENU_ITEMID</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+					default=""
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_finder/tmpl/default.php b/core/modules/mod_finder/tmpl/default.php
new file mode 100644
index 00000000..3d739b4e
--- /dev/null
+++ b/core/modules/mod_finder/tmpl/default.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_SITE . '/components/com_finder/helpers/html');
+
+JHtml::_('jquery.framework');
+JHtml::_('formbehavior.chosen');
+JHtml::_('bootstrap.tooltip');
+
+// Load the smart search component language file.
+$lang = JFactory::getLanguage();
+$lang->load('com_finder', JPATH_SITE);
+
+$suffix = $params->get('moduleclass_sfx');
+$output = '<input type="text" name="q" id="mod-finder-searchword' . $module->id . '" class="search-query input-medium" size="'
+	. $params->get('field_size', 20) . '" value="' . htmlspecialchars(JFactory::getApplication()->input->get('q', '', 'string'), ENT_COMPAT, 'UTF-8') . '"'
+	. ' placeholder="' . JText::_('MOD_FINDER_SEARCH_VALUE') . '"/>';
+
+$showLabel  = $params->get('show_label', 1);
+$labelClass = (!$showLabel ? 'element-invisible ' : '') . 'finder' . $suffix;
+$label      = '<label for="mod-finder-searchword' . $module->id . '" class="' . $labelClass . '">' . $params->get('alt_label', JText::_('JSEARCH_FILTER_SUBMIT')) . '</label>';
+
+switch ($params->get('label_pos', 'left'))
+{
+	case 'top' :
+		$output = $label . '<br />' . $output;
+		break;
+
+	case 'bottom' :
+		$output .= '<br />' . $label;
+		break;
+
+	case 'right' :
+		$output .= $label;
+		break;
+
+	case 'left' :
+	default :
+		$output = $label . $output;
+		break;
+}
+
+if ($params->get('show_button', 0))
+{
+	$button = '<button class="btn btn-primary hasTooltip ' . $suffix . ' finder' . $suffix . '" type="submit" title="' . JText::_('MOD_FINDER_SEARCH_BUTTON') . '"><span class="icon-search icon-white"></span>' . JText::_('JSEARCH_FILTER_SUBMIT') . '</button>';
+
+	switch ($params->get('button_pos', 'left'))
+	{
+		case 'top' :
+			$output = $button . '<br />' . $output;
+			break;
+
+		case 'bottom' :
+			$output .= '<br />' . $button;
+			break;
+
+		case 'right' :
+			$output .= $button;
+			break;
+
+		case 'left' :
+		default :
+			$output = $button . $output;
+			break;
+	}
+}
+
+JHtml::_('stylesheet', 'com_finder/finder.css', array('version' => 'auto', 'relative' => true));
+
+$script = "
+jQuery(document).ready(function() {
+	var value, searchword = jQuery('#mod-finder-searchword" . $module->id . "');
+
+		// Get the current value.
+		value = searchword.val();
+
+		// If the current value equals the default value, clear it.
+		searchword.on('focus', function ()
+		{
+			var el = jQuery(this);
+
+			if (el.val() === '" . JText::_('MOD_FINDER_SEARCH_VALUE', true) . "')
+			{
+				el.val('');
+			}
+		});
+
+		// If the current value is empty, set the previous value.
+		searchword.on('blur', function ()
+		{
+			var el = jQuery(this);
+
+			if (!el.val())
+			{
+				el.val(value);
+			}
+		});
+
+		jQuery('#mod-finder-searchform" . $module->id . "').on('submit', function (e)
+		{
+			e.stopPropagation();
+			var advanced = jQuery('#mod-finder-advanced" . $module->id . "');
+
+			// Disable select boxes with no value selected.
+			if (advanced.length)
+			{
+				advanced.find('select').each(function (index, el)
+				{
+					var el = jQuery(el);
+
+					if (!el.val())
+					{
+						el.attr('disabled', 'disabled');
+					}
+				});
+			}
+		});";
+/*
+ * This segment of code sets up the autocompleter.
+ */
+if ($params->get('show_autosuggest', 1))
+{
+	JHtml::_('script', 'jui/jquery.autocomplete.min.js', array('version' => 'auto', 'relative' => true));
+
+	$script .= "
+	var suggest = jQuery('#mod-finder-searchword" . $module->id . "').autocomplete({
+		serviceUrl: '" . JRoute::_('index.php?option=com_finder&task=suggestions.suggest&format=json&tmpl=component') . "',
+		paramName: 'q',
+		minChars: 1,
+		maxHeight: 400,
+		width: 300,
+		zIndex: 9999,
+		deferRequestBy: 500
+	});";
+}
+
+$script .= '});';
+
+JFactory::getDocument()->addScriptDeclaration($script);
+?>
+
+<form id="mod-finder-searchform<?php echo $module->id; ?>" action="<?php echo JRoute::_($route); ?>" method="get" class="form-search">
+	<div class="finder<?php echo $suffix; ?>">
+		<?php
+		// Show the form fields.
+		echo $output;
+		?>
+
+		<?php $show_advanced = $params->get('show_advanced', 0); ?>
+		<?php if ($show_advanced == 2) : ?>
+			<br />
+			<a href="<?php echo JRoute::_($route); ?>"><?php echo JText::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
+		<?php elseif ($show_advanced == 1) : ?>
+			<div id="mod-finder-advanced<?php echo $module->id; ?>">
+				<?php echo JHtml::_('filter.select', $query, $params); ?>
+			</div>
+		<?php endif; ?>
+		<?php echo modFinderHelper::getGetFields($route, (int) $params->get('set_itemid', 0)); ?>
+	</div>
+</form>
diff --git a/core/modules/mod_footer/mod_footer.php b/core/modules/mod_footer/mod_footer.php
new file mode 100644
index 00000000..7a5048d4
--- /dev/null
+++ b/core/modules/mod_footer/mod_footer.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_footer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+$app        = JFactory::getApplication();
+$date       = JFactory::getDate();
+$cur_year   = JHtml::_('date', $date, 'Y');
+$csite_name = $app->get('sitename');
+
+if (is_int(StringHelper::strpos(JText :: _('MOD_FOOTER_LINE1'), '%date%')))
+{
+	$line1 = str_replace('%date%', $cur_year, JText :: _('MOD_FOOTER_LINE1'));
+}
+else
+{
+	$line1 = JText :: _('MOD_FOOTER_LINE1');
+}
+
+if (is_int(StringHelper::strpos($line1, '%sitename%')))
+{
+	$lineone = str_replace('%sitename%', $csite_name, $line1);
+}
+else
+{
+	$lineone = $line1;
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_footer', $params->get('layout', 'default'));
diff --git a/core/modules/mod_footer/mod_footer.xml b/core/modules/mod_footer/mod_footer.xml
new file mode 100644
index 00000000..123f9ae5
--- /dev/null
+++ b/core/modules/mod_footer/mod_footer.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_footer</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_FOOTER_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_footer">mod_footer.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_footer.ini</language>
+		<language tag="en-GB">en-GB.mod_footer.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_FOOTER" />
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_footer/tmpl/default.php b/core/modules/mod_footer/tmpl/default.php
new file mode 100644
index 00000000..4113c134
--- /dev/null
+++ b/core/modules/mod_footer/tmpl/default.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_footer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="footer1<?php echo $moduleclass_sfx; ?>"><?php echo $lineone; ?></div>
+<div class="footer2<?php echo $moduleclass_sfx; ?>"><?php echo JText::_('MOD_FOOTER_LINE2'); ?></div>
diff --git a/core/modules/mod_languages/helper.php b/core/modules/mod_languages/helper.php
new file mode 100644
index 00000000..c426373f
--- /dev/null
+++ b/core/modules/mod_languages/helper.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Helper for mod_languages
+ *
+ * @since  1.6
+ */
+abstract class ModLanguagesHelper
+{
+	/**
+	 * Gets a list of available languages
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module params
+	 *
+	 * @return  array
+	 */
+	public static function getList(&$params)
+	{
+		$user		= JFactory::getUser();
+		$lang		= JFactory::getLanguage();
+		$languages	= JLanguageHelper::getLanguages();
+		$app		= JFactory::getApplication();
+		$menu		= $app->getMenu();
+		$active		= $menu->getActive();
+
+		// Get menu home items
+		$homes = array();
+		$homes['*'] = $menu->getDefault('*');
+
+		foreach ($languages as $item)
+		{
+			$default = $menu->getDefault($item->lang_code);
+
+			if ($default && $default->language === $item->lang_code)
+			{
+				$homes[$item->lang_code] = $default;
+			}
+		}
+
+		// Load associations
+		$assoc = JLanguageAssociations::isEnabled();
+
+		if ($assoc)
+		{
+			if ($active)
+			{
+				$associations = MenusHelper::getAssociations($active->id);
+			}
+
+			// Load component associations
+			$class = str_replace('com_', '', $app->input->get('option')) . 'HelperAssociation';
+			JLoader::register($class, JPATH_COMPONENT_SITE . '/helpers/association.php');
+
+			if (class_exists($class) && is_callable(array($class, 'getAssociations')))
+			{
+				$cassociations = call_user_func(array($class, 'getAssociations'));
+			}
+		}
+
+		$levels    = $user->getAuthorisedViewLevels();
+		$sitelangs = JLanguageHelper::getInstalledLanguages(0);
+		$multilang = JLanguageMultilang::isEnabled();
+
+		// Filter allowed languages
+		foreach ($languages as $i => &$language)
+		{
+			// Do not display language without frontend UI
+			if (!array_key_exists($language->lang_code, $sitelangs))
+			{
+				unset($languages[$i]);
+			}
+			// Do not display language without specific home menu
+			elseif (!isset($homes[$language->lang_code]))
+			{
+				unset($languages[$i]);
+			}
+			// Do not display language without authorized access level
+			elseif (isset($language->access) && $language->access && !in_array($language->access, $levels))
+			{
+				unset($languages[$i]);
+			}
+			else
+			{
+				$language->active = ($language->lang_code === $lang->getTag());
+
+				// Fetch language rtl
+				// If loaded language get from current JLanguage metadata
+				if ($language->active)
+				{
+					$language->rtl = $lang->isRtl();
+				}
+				// If not loaded language fetch metadata directly for performance
+				else
+				{
+					$languageMetadata = JLanguageHelper::getMetadata($language->lang_code);
+					$language->rtl    = $languageMetadata['rtl'];
+				}
+
+				if ($multilang)
+				{
+					if (isset($cassociations[$language->lang_code]))
+					{
+						$language->link = JRoute::_($cassociations[$language->lang_code] . '&lang=' . $language->sef);
+					}
+					elseif (isset($associations[$language->lang_code]) && $menu->getItem($associations[$language->lang_code]))
+					{
+						$itemid = $associations[$language->lang_code];
+						$language->link = JRoute::_('index.php?lang=' . $language->sef . '&Itemid=' . $itemid);
+					}
+					elseif ($active && $active->language == '*')
+					{
+						$language->link = JRoute::_('index.php?lang=' . $language->sef . '&Itemid=' . $active->id);
+					}
+					else
+					{
+						if ($language->active)
+						{
+							$language->link = JUri::getInstance()->toString(array('path', 'query'));
+						}
+						else
+						{
+							$itemid = isset($homes[$language->lang_code]) ? $homes[$language->lang_code]->id : $homes['*']->id;
+							$language->link = JRoute::_('index.php?lang=' . $language->sef . '&Itemid=' . $itemid);
+						}
+					}
+				}
+				else
+				{
+					$language->link = JRoute::_('&Itemid=' . $homes['*']->id);
+				}
+			}
+		}
+
+		return $languages;
+	}
+}
diff --git a/core/modules/mod_languages/mod_languages.php b/core/modules/mod_languages/mod_languages.php
new file mode 100644
index 00000000..42f56602
--- /dev/null
+++ b/core/modules/mod_languages/mod_languages.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the languages functions only once
+JLoader::register('ModLanguagesHelper', __DIR__ . '/helper.php');
+
+$headerText      = $params->get('header_text');
+$footerText      = $params->get('footer_text');
+$list            = ModLanguagesHelper::getList($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_languages', $params->get('layout', 'default'));
diff --git a/core/modules/mod_languages/mod_languages.xml b/core/modules/mod_languages/mod_languages.xml
new file mode 100644
index 00000000..05a691f3
--- /dev/null
+++ b/core/modules/mod_languages/mod_languages.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_languages</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>MOD_LANGUAGES_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_languages">mod_languages.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_languages.ini</language>
+		<language tag="en-GB">en-GB.mod_languages.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_LANGUAGE_SWITCHER" />
+	<config>
+		<fieldset>
+			<field
+				name="language"
+				type="list"
+				label="JFIELD_LANGUAGE_LABEL"
+				description="JFIELD_MODULE_LANGUAGE_DESC"
+				>
+				<option value="*">JALL</option>
+			</field>
+		</fieldset>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="header_text"
+					type="textarea"
+					label="MOD_LANGUAGES_FIELD_HEADER_LABEL"
+					description="MOD_LANGUAGES_FIELD_HEADER_DESC"
+					filter="safehtml"
+					rows="3"
+					cols="40"
+				/>
+
+				<field
+					name="footer_text"
+					type="textarea"
+					label="MOD_LANGUAGES_FIELD_FOOTER_LABEL"
+					description="MOD_LANGUAGES_FIELD_FOOTER_DESC"
+					filter="safehtml"
+					rows="3"
+					cols="40"
+				/>
+
+				<field
+					name="dropdown"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_DROPDOWN_LABEL"
+					description="MOD_LANGUAGES_FIELD_DROPDOWN_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="dropdownimage"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_DROPDOWN_IMAGE_LABEL"
+					description="MOD_LANGUAGES_FIELD_DROPDOWN_IMAGE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="dropdown:1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="lineheight"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_LINEHEIGHT_LABEL"
+					description="MOD_LANGUAGES_FIELD_LINEHEIGHT_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					showon="dropdown:1[AND]dropdownimage:1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="image"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_USEIMAGE_LABEL"
+					description="MOD_LANGUAGES_FIELD_USEIMAGE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="dropdown:0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="spacer3"
+					type="spacer"
+					label="MOD_LANGUAGES_SPACER_USENAME_LABEL"
+					class="text"
+					showon="image:0[AND]dropdown:0"
+				/>
+
+				<field
+					name="show_active"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_ACTIVE_LABEL"
+					description="MOD_LANGUAGES_FIELD_ACTIVE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="dropdownimage:1[OR]dropdown:0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="full_name"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_FULL_NAME_LABEL"
+					description="MOD_LANGUAGES_FIELD_FULL_NAME_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="dropdown:0[AND]image:0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="inline"
+					type="radio"
+					label="MOD_LANGUAGES_FIELD_INLINE_LABEL"
+					description="MOD_LANGUAGES_FIELD_INLINE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					showon="dropdown:0"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="MOD_LANGUAGES_FIELD_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="MOD_LANGUAGES_FIELD_CACHING_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="itemid"
+					>
+					<option	value="itemid"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_languages/tmpl/default.php b/core/modules/mod_languages/tmpl/default.php
new file mode 100644
index 00000000..c9ab9b6b
--- /dev/null
+++ b/core/modules/mod_languages/tmpl/default.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('stylesheet', 'mod_languages/template.css', array('version' => 'auto', 'relative' => true));
+
+if ($params->get('dropdown', 0) && !$params->get('dropdownimage', 1))
+{
+	JHtml::_('formbehavior.chosen');
+}
+?>
+<div class="mod-languages<?php echo $moduleclass_sfx; ?>">
+<?php if ($headerText) : ?>
+	<div class="pretext"><p><?php echo $headerText; ?></p></div>
+<?php endif; ?>
+
+<?php if ($params->get('dropdown', 0) && !$params->get('dropdownimage', 1)) : ?>
+	<form name="lang" method="post" action="<?php echo htmlspecialchars(JUri::current(), ENT_COMPAT, 'UTF-8'); ?>">
+	<select class="inputbox advancedSelect" onchange="document.location.replace(this.value);" >
+	<?php foreach ($list as $language) : ?>
+		<option dir=<?php echo $language->rtl ? '"rtl"' : '"ltr"'; ?> value="<?php echo htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'); ?>" <?php echo $language->active ? 'selected="selected"' : ''; ?>>
+		<?php echo $language->title_native; ?></option>
+	<?php endforeach; ?>
+	</select>
+	</form>
+<?php elseif ($params->get('dropdown', 0) && $params->get('dropdownimage', 1)) : ?>
+	<div class="btn-group">
+		<?php foreach ($list as $language) : ?>
+			<?php if ($language->active) : ?>
+				<a href="#" data-toggle="dropdown" class="btn dropdown-toggle">
+					<span class="caret"></span>
+					<?php if ($language->image) : ?>
+						&nbsp;<?php echo JHtml::_('image', 'mod_languages/' . $language->image . '.gif', '', null, true); ?>
+					<?php endif; ?>
+					<?php echo $language->title_native; ?>
+				</a>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		<ul class="<?php echo $params->get('lineheight', 0) ? 'lang-block' : 'lang-inline'; ?> dropdown-menu" dir="<?php echo JFactory::getLanguage()->isRtl() ? 'rtl' : 'ltr'; ?>">
+		<?php foreach ($list as $language) : ?>
+			<?php if (!$language->active || $params->get('show_active', 1)) : ?>
+				<li<?php echo $language->active ? ' class="lang-active"' : ''; ?>>
+				<a href="<?php echo htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'); ?>">
+					<?php if ($language->image) : ?>
+						<?php echo JHtml::_('image', 'mod_languages/' . $language->image . '.gif', '', null, true); ?>
+					<?php endif; ?>
+					<?php echo $language->title_native; ?>
+				</a>
+				</li>
+			<?php endif; ?>
+		<?php endforeach; ?>
+		</ul>
+	</div>
+<?php else : ?>
+	<ul class="<?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>">
+	<?php foreach ($list as $language) : ?>
+		<?php if (!$language->active || $params->get('show_active', 1)) : ?>
+			<li<?php echo $language->active ? ' class="lang-active"' : ''; ?> dir="<?php echo $language->rtl ? 'rtl' : 'ltr'; ?>">
+			<a href="<?php echo htmlspecialchars($language->link, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php if ($params->get('image', 1)) : ?>
+				<?php if ($language->image) : ?>
+					<?php echo JHtml::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
+				<?php else : ?>
+					<span class="label"><?php echo strtoupper($language->sef); ?></span>
+				<?php endif; ?>
+			<?php else : ?>
+				<?php echo $params->get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?>
+			<?php endif; ?>
+			</a>
+			</li>
+		<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
+
+<?php if ($footerText) : ?>
+	<div class="posttext"><p><?php echo $footerText; ?></p></div>
+<?php endif; ?>
+</div>
diff --git a/core/modules/mod_login/helper.php b/core/modules/mod_login/helper.php
new file mode 100644
index 00000000..1e2b3e68
--- /dev/null
+++ b/core/modules/mod_login/helper.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_login
+ *
+ * @since  1.5
+ */
+class ModLoginHelper
+{
+	/**
+	 * Retrieve the URL where the user should be returned after logging in
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  module parameters
+	 * @param   string                     $type    return type
+	 *
+	 * @return string
+	 */
+	public static function getReturnUrl($params, $type)
+	{
+		$app  = JFactory::getApplication();
+		$item = $app->getMenu()->getItem($params->get($type));
+
+		// Stay on the same page
+		$url = JUri::getInstance()->toString();
+
+		if ($item)
+		{
+			$lang = '';
+
+			if ($item->language !== '*' && JLanguageMultilang::isEnabled())
+			{
+				$lang = '&lang=' . $item->language;
+			}
+
+			$url = 'index.php?Itemid=' . $item->id . $lang;
+		}
+
+		return base64_encode($url);
+	}
+
+	/**
+	 * Returns the current users type
+	 *
+	 * @return string
+	 */
+	public static function getType()
+	{
+		$user = JFactory::getUser();
+
+		return (!$user->get('guest')) ? 'logout' : 'login';
+	}
+
+	/**
+	 * Get list of available two factor methods
+	 *
+	 * @return array
+	 *
+	 * @deprecated  4.0  Use JAuthenticationHelper::getTwoFactorMethods() instead.
+	 */
+	public static function getTwoFactorMethods()
+	{
+		JLog::add(__METHOD__ . ' is deprecated, use JAuthenticationHelper::getTwoFactorMethods() instead.', JLog::WARNING, 'deprecated');
+
+		return JAuthenticationHelper::getTwoFactorMethods();
+	}
+}
diff --git a/core/modules/mod_login/mod_login.php b/core/modules/mod_login/mod_login.php
new file mode 100644
index 00000000..7996c0b3
--- /dev/null
+++ b/core/modules/mod_login/mod_login.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the login functions only once
+JLoader::register('ModLoginHelper', __DIR__ . '/helper.php');
+
+$params->def('greeting', 1);
+
+$type             = ModLoginHelper::getType();
+$return           = ModLoginHelper::getReturnUrl($params, $type);
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+$user             = JFactory::getUser();
+$layout           = $params->get('layout', 'default');
+
+// Logged users must load the logout sublayout
+if (!$user->guest)
+{
+	$layout .= '_logout';
+}
+
+require JModuleHelper::getLayoutPath('mod_login', $layout);
diff --git a/core/modules/mod_login/mod_login.xml b/core/modules/mod_login/mod_login.xml
new file mode 100644
index 00000000..d9f175e8
--- /dev/null
+++ b/core/modules/mod_login/mod_login.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_login</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_LOGIN_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_login">mod_login.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_login.ini</language>
+		<language tag="en-GB">en-GB.mod_login.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic"
+				addfieldpath="/administrator/components/com_menus/models/fields"
+			>
+				<field
+					name="pretext"
+					type="textarea"
+					label="MOD_LOGIN_FIELD_PRE_TEXT_LABEL"
+					description="MOD_LOGIN_FIELD_PRE_TEXT_DESC"
+					filter="safehtml"
+					cols="30"
+					rows="5"
+				/>
+
+				<field
+					name="posttext"
+					type="textarea"
+					label="MOD_LOGIN_FIELD_POST_TEXT_LABEL"
+					description="MOD_LOGIN_FIELD_POST_TEXT_DESC"
+					filter="safehtml"
+					cols="30"
+					rows="5"
+				/>
+
+				<field
+					name="login"
+					type="modal_menu"
+					label="MOD_LOGIN_FIELD_LOGIN_REDIRECTURL_LABEL"
+					description="MOD_LOGIN_FIELD_LOGIN_REDIRECTURL_DESC"
+					disable="separator,alias,heading,url"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					>
+					<option value="">JDEFAULT</option>
+				</field>
+
+				<field
+					name="logout"
+					type="modal_menu"
+					label="MOD_LOGIN_FIELD_LOGOUT_REDIRECTURL_LABEL"
+					description="MOD_LOGIN_FIELD_LOGOUT_REDIRECTURL_DESC"
+					disable="separator,alias,heading,url"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					>
+					<option value="">JDEFAULT</option>
+				</field>
+
+				<field
+					name="greeting"
+					type="radio"
+					label="MOD_LOGIN_FIELD_GREETING_LABEL"
+					description="MOD_LOGIN_FIELD_GREETING_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="name"
+					type="list"
+					label="MOD_LOGIN_FIELD_NAME_LABEL"
+					description="MOD_LOGIN_FIELD_NAME_DESC"
+					default="0"
+					filter="integer"
+					showon="greeting:1"
+					>
+					<option value="0">MOD_LOGIN_VALUE_NAME</option>
+					<option value="1">MOD_LOGIN_VALUE_USERNAME</option>
+				</field>
+
+				<field
+					name="profilelink"
+					type="radio"
+					label="MOD_LOGIN_FIELD_PROFILE_LABEL"
+					description="MOD_LOGIN_FIELD_PROFILE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="usesecure"
+					type="radio"
+					label="MOD_LOGIN_FIELD_USESECURE_LABEL"
+					description="MOD_LOGIN_FIELD_USESECURE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="usetext"
+					type="list"
+					label="MOD_LOGIN_FIELD_USETEXT_LABEL"
+					description="MOD_LOGIN_FIELD_USETEXT_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">MOD_LOGIN_VALUE_ICONS</option>
+					<option value="1">MOD_LOGIN_VALUE_TEXT</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_login/tmpl/default.php b/core/modules/mod_login/tmpl/default.php
new file mode 100644
index 00000000..ac8beeba
--- /dev/null
+++ b/core/modules/mod_login/tmpl/default.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('UsersHelperRoute', JPATH_SITE . '/components/com_users/helpers/route.php');
+
+JHtml::_('behavior.keepalive');
+JHtml::_('bootstrap.tooltip');
+
+?>
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure', 0)); ?>" method="post" id="login-form" class="form-inline">
+	<?php if ($params->get('pretext')) : ?>
+		<div class="pretext">
+			<p><?php echo $params->get('pretext'); ?></p>
+		</div>
+	<?php endif; ?>
+	<div class="userdata">
+		<div id="form-login-username" class="control-group">
+			<div class="controls">
+				<?php if (!$params->get('usetext', 0)) : ?>
+					<div class="input-prepend">
+						<span class="add-on">
+							<span class="icon-user hasTooltip" title="<?php echo JText::_('MOD_LOGIN_VALUE_USERNAME'); ?>"></span>
+							<label for="modlgn-username" class="element-invisible"><?php echo JText::_('MOD_LOGIN_VALUE_USERNAME'); ?></label>
+						</span>
+						<input id="modlgn-username" type="text" name="username" class="input-small" tabindex="0" size="18" placeholder="<?php echo JText::_('MOD_LOGIN_VALUE_USERNAME'); ?>" />
+					</div>
+				<?php else : ?>
+					<label for="modlgn-username"><?php echo JText::_('MOD_LOGIN_VALUE_USERNAME'); ?></label>
+					<input id="modlgn-username" type="text" name="username" class="input-small" tabindex="0" size="18" placeholder="<?php echo JText::_('MOD_LOGIN_VALUE_USERNAME'); ?>" />
+				<?php endif; ?>
+			</div>
+		</div>
+		<div id="form-login-password" class="control-group">
+			<div class="controls">
+				<?php if (!$params->get('usetext', 0)) : ?>
+					<div class="input-prepend">
+						<span class="add-on">
+							<span class="icon-lock hasTooltip" title="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>">
+							</span>
+								<label for="modlgn-passwd" class="element-invisible"><?php echo JText::_('JGLOBAL_PASSWORD'); ?>
+							</label>
+						</span>
+						<input id="modlgn-passwd" type="password" name="password" class="input-small" tabindex="0" size="18" placeholder="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" />
+					</div>
+				<?php else : ?>
+					<label for="modlgn-passwd"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+					<input id="modlgn-passwd" type="password" name="password" class="input-small" tabindex="0" size="18" placeholder="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" />
+				<?php endif; ?>
+			</div>
+		</div>
+		<?php if (count($twofactormethods) > 1) : ?>
+		<div id="form-login-secretkey" class="control-group">
+			<div class="controls">
+				<?php if (!$params->get('usetext', 0)) : ?>
+					<div class="input-prepend input-append">
+						<span class="add-on">
+							<span class="icon-star hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>">
+							</span>
+								<label for="modlgn-secretkey" class="element-invisible"><?php echo JText::_('JGLOBAL_SECRETKEY'); ?>
+							</label>
+						</span>
+						<input id="modlgn-secretkey" autocomplete="off" type="text" name="secretkey" class="input-small" tabindex="0" size="18" placeholder="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" />
+						<span class="btn width-auto hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY_HELP'); ?>">
+							<span class="icon-help"></span>
+						</span>
+				</div>
+				<?php else : ?>
+					<label for="modlgn-secretkey"><?php echo JText::_('JGLOBAL_SECRETKEY'); ?></label>
+					<input id="modlgn-secretkey" autocomplete="off" type="text" name="secretkey" class="input-small" tabindex="0" size="18" placeholder="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" />
+					<span class="btn width-auto hasTooltip" title="<?php echo JText::_('JGLOBAL_SECRETKEY_HELP'); ?>">
+						<span class="icon-help"></span>
+					</span>
+				<?php endif; ?>
+
+			</div>
+		</div>
+		<?php endif; ?>
+		<?php if (JPluginHelper::isEnabled('system', 'remember')) : ?>
+		<div id="form-login-remember" class="control-group checkbox">
+			<label for="modlgn-remember" class="control-label"><?php echo JText::_('MOD_LOGIN_REMEMBER_ME'); ?></label> <input id="modlgn-remember" type="checkbox" name="remember" class="inputbox" value="yes"/>
+		</div>
+		<?php endif; ?>
+		<div id="form-login-submit" class="control-group">
+			<div class="controls">
+				<button type="submit" tabindex="0" name="Submit" class="btn btn-primary login-button"><?php echo JText::_('JLOGIN'); ?></button>
+			</div>
+		</div>
+		<?php
+			$usersConfig = JComponentHelper::getParams('com_users'); ?>
+			<ul class="unstyled">
+			<?php if ($usersConfig->get('allowUserRegistration')) : ?>
+				<li>
+					<a href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
+					<?php echo JText::_('MOD_LOGIN_REGISTER'); ?> <span class="icon-arrow-right"></span></a>
+				</li>
+			<?php endif; ?>
+				<li>
+					<a href="<?php echo JRoute::_('index.php?option=com_users&view=remind'); ?>">
+					<?php echo JText::_('MOD_LOGIN_FORGOT_YOUR_USERNAME'); ?></a>
+				</li>
+				<li>
+					<a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
+					<?php echo JText::_('MOD_LOGIN_FORGOT_YOUR_PASSWORD'); ?></a>
+				</li>
+			</ul>
+		<input type="hidden" name="option" value="com_users" />
+		<input type="hidden" name="task" value="user.login" />
+		<input type="hidden" name="return" value="<?php echo $return; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+	<?php if ($params->get('posttext')) : ?>
+		<div class="posttext">
+			<p><?php echo $params->get('posttext'); ?></p>
+		</div>
+	<?php endif; ?>
+</form>
diff --git a/core/modules/mod_login/tmpl/default_logout.php b/core/modules/mod_login/tmpl/default_logout.php
new file mode 100644
index 00000000..ce845f64
--- /dev/null
+++ b/core/modules/mod_login/tmpl/default_logout.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_login
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+?>
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure', 0)); ?>" method="post" id="login-form" class="form-vertical">
+<?php if ($params->get('greeting', 1)) : ?>
+	<div class="login-greeting">
+	<?php if (!$params->get('name', 0)) : ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('name'), ENT_COMPAT, 'UTF-8')); ?>
+	<?php else : ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('username'), ENT_COMPAT, 'UTF-8')); ?>
+	<?php endif; ?>
+	</div>
+<?php endif; ?>
+<?php if ($params->get('profilelink', 0)) : ?>
+	<ul class="unstyled">
+		<li>
+			<a href="<?php echo JRoute::_('index.php?option=com_users&view=profile'); ?>">
+			<?php echo JText::_('MOD_LOGIN_PROFILE'); ?></a>
+		</li>
+	</ul>
+<?php endif; ?>
+	<div class="logout-button">
+		<input type="submit" name="Submit" class="btn btn-primary" value="<?php echo JText::_('JLOGOUT'); ?>" />
+		<input type="hidden" name="option" value="com_users" />
+		<input type="hidden" name="task" value="user.logout" />
+		<input type="hidden" name="return" value="<?php echo $return; ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/core/modules/mod_menu/helper.php b/core/modules/mod_menu/helper.php
new file mode 100644
index 00000000..dbc92541
--- /dev/null
+++ b/core/modules/mod_menu/helper.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_menu
+ *
+ * @since  1.5
+ */
+class ModMenuHelper
+{
+	/**
+	 * Get a list of the menu items.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The module options.
+	 *
+	 * @return  array
+	 *
+	 * @since   1.5
+	 */
+	public static function getList(&$params)
+	{
+		$app = JFactory::getApplication();
+		$menu = $app->getMenu();
+
+		// Get active menu item
+		$base = self::getBase($params);
+		$user = JFactory::getUser();
+		$levels = $user->getAuthorisedViewLevels();
+		asort($levels);
+		$key = 'menu_items' . $params . implode(',', $levels) . '.' . $base->id;
+		$cache = JFactory::getCache('mod_menu', '');
+
+		if ($cache->contains($key))
+		{
+			$items = $cache->get($key);
+		}
+		else
+		{
+			$path           = $base->tree;
+			$start          = (int) $params->get('startLevel', 1);
+			$end            = (int) $params->get('endLevel', 0);
+			$showAll        = $params->get('showAllChildren', 1);
+			$items          = $menu->getItems('menutype', $params->get('menutype'));
+			$hidden_parents = array();
+			$lastitem       = 0;
+
+			if ($items)
+			{
+				foreach ($items as $i => $item)
+				{
+					$item->parent = false;
+
+					if (isset($items[$lastitem]) && $items[$lastitem]->id == $item->parent_id && $item->params->get('menu_show', 1) == 1)
+					{
+						$items[$lastitem]->parent = true;
+					}
+
+					if (($start && $start > $item->level)
+						|| ($end && $item->level > $end)
+						|| (!$showAll && $item->level > 1 && !in_array($item->parent_id, $path))
+						|| ($start > 1 && !in_array($item->tree[$start - 2], $path)))
+					{
+						unset($items[$i]);
+						continue;
+					}
+
+					// Exclude item with menu item option set to exclude from menu modules
+					if (($item->params->get('menu_show', 1) == 0) || in_array($item->parent_id, $hidden_parents))
+					{
+						$hidden_parents[] = $item->id;
+						unset($items[$i]);
+						continue;
+					}
+
+					$item->deeper     = false;
+					$item->shallower  = false;
+					$item->level_diff = 0;
+
+					if (isset($items[$lastitem]))
+					{
+						$items[$lastitem]->deeper     = ($item->level > $items[$lastitem]->level);
+						$items[$lastitem]->shallower  = ($item->level < $items[$lastitem]->level);
+						$items[$lastitem]->level_diff = ($items[$lastitem]->level - $item->level);
+					}
+
+					$lastitem     = $i;
+					$item->active = false;
+					$item->flink  = $item->link;
+
+					// Reverted back for CMS version 2.5.6
+					switch ($item->type)
+					{
+						case 'separator':
+							break;
+
+						case 'heading':
+							// No further action needed.
+							break;
+
+						case 'url':
+							if ((strpos($item->link, 'index.php?') === 0) && (strpos($item->link, 'Itemid=') === false))
+							{
+								// If this is an internal Joomla link, ensure the Itemid is set.
+								$item->flink = $item->link . '&Itemid=' . $item->id;
+							}
+							break;
+
+						case 'alias':
+							$item->flink = 'index.php?Itemid=' . $item->params->get('aliasoptions');
+							break;
+
+						default:
+							$item->flink = 'index.php?Itemid=' . $item->id;
+							break;
+					}
+
+					if ((strpos($item->flink, 'index.php?') !== false) && strcasecmp(substr($item->flink, 0, 4), 'http'))
+					{
+						$item->flink = JRoute::_($item->flink, true, $item->params->get('secure'));
+					}
+					else
+					{
+						$item->flink = JRoute::_($item->flink);
+					}
+
+					// We prevent the double encoding because for some reason the $item is shared for menu modules and we get double encoding
+					// when the cause of that is found the argument should be removed
+					$item->title          = htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8', false);
+					$item->anchor_css     = htmlspecialchars($item->params->get('menu-anchor_css', ''), ENT_COMPAT, 'UTF-8', false);
+					$item->anchor_title   = htmlspecialchars($item->params->get('menu-anchor_title', ''), ENT_COMPAT, 'UTF-8', false);
+					$item->anchor_rel     = htmlspecialchars($item->params->get('menu-anchor_rel', ''), ENT_COMPAT, 'UTF-8', false);
+					$item->menu_image     = $item->params->get('menu_image', '') ?
+						htmlspecialchars($item->params->get('menu_image', ''), ENT_COMPAT, 'UTF-8', false) : '';
+					$item->menu_image_css = htmlspecialchars($item->params->get('menu_image_css', ''), ENT_COMPAT, 'UTF-8', false);
+				}
+
+				if (isset($items[$lastitem]))
+				{
+					$items[$lastitem]->deeper     = (($start ?: 1) > $items[$lastitem]->level);
+					$items[$lastitem]->shallower  = (($start ?: 1) < $items[$lastitem]->level);
+					$items[$lastitem]->level_diff = ($items[$lastitem]->level - ($start ?: 1));
+				}
+			}
+
+			$cache->store($items, $key);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get base menu item.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The module options.
+	 *
+	 * @return  object
+	 *
+	 * @since	3.0.2
+	 */
+	public static function getBase(&$params)
+	{
+		// Get base menu item from parameters
+		if ($params->get('base'))
+		{
+			$base = JFactory::getApplication()->getMenu()->getItem($params->get('base'));
+		}
+		else
+		{
+			$base = false;
+		}
+
+		// Use active menu item if no base found
+		if (!$base)
+		{
+			$base = self::getActive($params);
+		}
+
+		return $base;
+	}
+
+	/**
+	 * Get active menu item.
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  The module options.
+	 *
+	 * @return  object
+	 *
+	 * @since	3.0.2
+	 */
+	public static function getActive(&$params)
+	{
+		$menu = JFactory::getApplication()->getMenu();
+
+		return $menu->getActive() ?: self::getDefault();
+	}
+
+	/**
+	 * Get default menu item (home page) for current language.
+	 *
+	 * @return  object
+	 */
+	public static function getDefault()
+	{
+		$menu = JFactory::getApplication()->getMenu();
+		$lang = JFactory::getLanguage();
+
+		// Look for the home menu
+		if (JLanguageMultilang::isEnabled())
+		{
+			return $menu->getDefault($lang->getTag());
+		}
+		else
+		{
+			return $menu->getDefault();
+		}
+	}
+}
diff --git a/core/modules/mod_menu/mod_menu.php b/core/modules/mod_menu/mod_menu.php
new file mode 100644
index 00000000..8defd856
--- /dev/null
+++ b/core/modules/mod_menu/mod_menu.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the menu functions only once
+JLoader::register('ModMenuHelper', __DIR__ . '/helper.php');
+
+$list       = ModMenuHelper::getList($params);
+$base       = ModMenuHelper::getBase($params);
+$active     = ModMenuHelper::getActive($params);
+$default    = ModMenuHelper::getDefault();
+$active_id  = $active->id;
+$default_id = $default->id;
+$path       = $base->tree;
+$showAll    = $params->get('showAllChildren', 1);
+$class_sfx  = htmlspecialchars($params->get('class_sfx'), ENT_COMPAT, 'UTF-8');
+
+if (count($list))
+{
+	require JModuleHelper::getLayoutPath('mod_menu', $params->get('layout', 'default'));
+}
diff --git a/core/modules/mod_menu/mod_menu.xml b/core/modules/mod_menu/mod_menu.xml
new file mode 100644
index 00000000..e7f2860c
--- /dev/null
+++ b/core/modules/mod_menu/mod_menu.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_menu</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_MENU_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_menu">mod_menu.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_menu.ini</language>
+		<language tag="en-GB">en-GB.mod_menu.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_MENU" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic"
+				addfieldpath="/administrator/components/com_menus/models/fields"
+			>
+				<field
+					name="menutype"
+					type="menu"
+					label="MOD_MENU_FIELD_MENUTYPE_LABEL"
+					description="MOD_MENU_FIELD_MENUTYPE_DESC"
+					clientid="0"
+				/>
+
+				<field
+					name="base"
+					type="modal_menu"
+					label="MOD_MENU_FIELD_ACTIVE_LABEL"
+					description="MOD_MENU_FIELD_ACTIVE_DESC"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					filter="integer"
+					>
+					<option value="">JCURRENT</option>
+				</field>
+
+				<field
+					name="startLevel"
+					type="list"
+					label="MOD_MENU_FIELD_STARTLEVEL_LABEL"
+					description="MOD_MENU_FIELD_STARTLEVEL_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+					<option value="6">J6</option>
+					<option value="7">J7</option>
+					<option value="8">J8</option>
+					<option value="9">J9</option>
+					<option value="10">J10</option>
+				</field>
+
+				<field
+					name="endLevel"
+					type="list"
+					label="MOD_MENU_FIELD_ENDLEVEL_LABEL"
+					description="MOD_MENU_FIELD_ENDLEVEL_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JALL</option>
+					<option value="1">J1</option>
+					<option value="2">J2</option>
+					<option value="3">J3</option>
+					<option value="4">J4</option>
+					<option value="5">J5</option>
+					<option value="6">J6</option>
+					<option value="7">J7</option>
+					<option value="8">J8</option>
+					<option value="9">J9</option>
+					<option value="10">J10</option>
+				</field>
+
+				<field
+					name="showAllChildren"
+					type="radio"
+					label="MOD_MENU_FIELD_ALLCHILDREN_LABEL"
+					description="MOD_MENU_FIELD_ALLCHILDREN_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="advanced">
+				<field
+					name="tag_id"
+					type="text"
+					label="MOD_MENU_FIELD_TAG_ID_LABEL"
+					description="MOD_MENU_FIELD_TAG_ID_DESC"
+				/>
+
+				<field
+					name="class_sfx"
+					type="text"
+					label="MOD_MENU_FIELD_CLASS_LABEL"
+					description="MOD_MENU_FIELD_CLASS_DESC"
+				/>
+
+				<field
+					name="window_open"
+					type="text"
+					label="MOD_MENU_FIELD_TARGET_LABEL"
+					description="MOD_MENU_FIELD_TARGET_DESC"
+				/>
+
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="itemid"
+					>
+					<option value="itemid"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_menu/tmpl/default.php b/core/modules/mod_menu/tmpl/default.php
new file mode 100644
index 00000000..afac8041
--- /dev/null
+++ b/core/modules/mod_menu/tmpl/default.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id = '';
+
+if ($tagId = $params->get('tag_id', ''))
+{
+	$id = ' id="' . $tagId . '"';
+}
+
+// The menu class is deprecated. Use nav instead
+?>
+<ul class="nav menu<?php echo $class_sfx; ?>"<?php echo $id; ?>>
+<?php foreach ($list as $i => &$item)
+{
+	$class = 'item-' . $item->id;
+
+	if ($item->id == $default_id)
+	{
+		$class .= ' default';
+	}
+
+	if ($item->id == $active_id || ($item->type === 'alias' && $item->params->get('aliasoptions') == $active_id))
+	{
+		$class .= ' current';
+	}
+
+	if (in_array($item->id, $path))
+	{
+		$class .= ' active';
+	}
+	elseif ($item->type === 'alias')
+	{
+		$aliasToId = $item->params->get('aliasoptions');
+
+		if (count($path) > 0 && $aliasToId == $path[count($path) - 1])
+		{
+			$class .= ' active';
+		}
+		elseif (in_array($aliasToId, $path))
+		{
+			$class .= ' alias-parent-active';
+		}
+	}
+
+	if ($item->type === 'separator')
+	{
+		$class .= ' divider';
+	}
+
+	if ($item->deeper)
+	{
+		$class .= ' deeper';
+	}
+
+	if ($item->parent)
+	{
+		$class .= ' parent';
+	}
+
+	echo '<li class="' . $class . '">';
+
+	switch ($item->type) :
+		case 'separator':
+		case 'component':
+		case 'heading':
+		case 'url':
+			require JModuleHelper::getLayoutPath('mod_menu', 'default_' . $item->type);
+			break;
+
+		default:
+			require JModuleHelper::getLayoutPath('mod_menu', 'default_url');
+			break;
+	endswitch;
+
+	// The next item is deeper.
+	if ($item->deeper)
+	{
+		echo '<ul class="nav-child unstyled small">';
+	}
+	// The next item is shallower.
+	elseif ($item->shallower)
+	{
+		echo '</li>';
+		echo str_repeat('</ul></li>', $item->level_diff);
+	}
+	// The next item is on the same level.
+	else
+	{
+		echo '</li>';
+	}
+}
+?></ul>
diff --git a/core/modules/mod_menu/tmpl/default_component.php b/core/modules/mod_menu/tmpl/default_component.php
new file mode 100644
index 00000000..74791dcf
--- /dev/null
+++ b/core/modules/mod_menu/tmpl/default_component.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$attributes = array();
+
+if ($item->anchor_title)
+{
+	$attributes['title'] = $item->anchor_title;
+}
+
+if ($item->anchor_css)
+{
+	$attributes['class'] = $item->anchor_css;
+}
+
+if ($item->anchor_rel)
+{
+	$attributes['rel'] = $item->anchor_rel;
+}
+
+$linktype = $item->title;
+
+if ($item->menu_image)
+{
+	if ($item->menu_image_css)
+	{
+		$image_attributes['class'] = $item->menu_image_css;
+		$linktype = JHtml::_('image', $item->menu_image, $item->title, $image_attributes);
+	}
+	else
+	{
+		$linktype = JHtml::_('image', $item->menu_image, $item->title);
+	}
+
+	if ($item->params->get('menu_text', 1))
+	{
+		$linktype .= '<span class="image-title">' . $item->title . '</span>';
+	}
+}
+
+if ($item->browserNav == 1)
+{
+	$attributes['target'] = '_blank';
+}
+elseif ($item->browserNav == 2)
+{
+	$options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes';
+
+	$attributes['onclick'] = "window.open(this.href, 'targetWindow', '" . $options . "'); return false;";
+}
+
+echo JHtml::_('link', JFilterOutput::ampReplace(htmlspecialchars($item->flink, ENT_COMPAT, 'UTF-8', false)), $linktype, $attributes);
diff --git a/core/modules/mod_menu/tmpl/default_heading.php b/core/modules/mod_menu/tmpl/default_heading.php
new file mode 100644
index 00000000..0f0f3dd1
--- /dev/null
+++ b/core/modules/mod_menu/tmpl/default_heading.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title      = $item->anchor_title ? ' title="' . $item->anchor_title . '"' : '';
+$anchor_css = $item->anchor_css ?: '';
+
+$linktype   = $item->title;
+
+if ($item->menu_image)
+{
+	if ($item->menu_image_css)
+	{
+		$image_attributes['class'] = $item->menu_image_css;
+		$linktype = JHtml::_('image', $item->menu_image, $item->title, $image_attributes);
+	}
+	else
+	{
+		$linktype = JHtml::_('image', $item->menu_image, $item->title);
+	}
+
+	if ($item->params->get('menu_text', 1))
+	{
+		$linktype .= '<span class="image-title">' . $item->title . '</span>';
+	}
+}
+
+?>
+<span class="nav-header <?php echo $anchor_css; ?>"<?php echo $title; ?>><?php echo $linktype; ?></span>
diff --git a/core/modules/mod_menu/tmpl/default_separator.php b/core/modules/mod_menu/tmpl/default_separator.php
new file mode 100644
index 00000000..4a766f68
--- /dev/null
+++ b/core/modules/mod_menu/tmpl/default_separator.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title      = $item->anchor_title ? ' title="' . $item->anchor_title . '"' : '';
+$anchor_css = $item->anchor_css ?: '';
+
+$linktype   = $item->title;
+
+if ($item->menu_image)
+{
+	if ($item->menu_image_css)
+	{
+		$image_attributes['class'] = $item->menu_image_css;
+		$linktype = JHtml::_('image', $item->menu_image, $item->title, $image_attributes);
+	}
+	else
+	{
+		$linktype = JHtml::_('image', $item->menu_image, $item->title);
+	}
+
+	if ($item->params->get('menu_text', 1))
+	{
+		$linktype .= '<span class="image-title">' . $item->title . '</span>';
+	}
+}
+
+?>
+<span class="separator <?php echo $anchor_css; ?>"<?php echo $title; ?>><?php echo $linktype; ?></span>
diff --git a/core/modules/mod_menu/tmpl/default_url.php b/core/modules/mod_menu/tmpl/default_url.php
new file mode 100644
index 00000000..166189a7
--- /dev/null
+++ b/core/modules/mod_menu/tmpl/default_url.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$attributes = array();
+
+if ($item->anchor_title)
+{
+	$attributes['title'] = $item->anchor_title;
+}
+
+if ($item->anchor_css)
+{
+	$attributes['class'] = $item->anchor_css;
+}
+
+if ($item->anchor_rel)
+{
+	$attributes['rel'] = $item->anchor_rel;
+}
+
+$linktype = $item->title;
+
+if ($item->menu_image)
+{
+	if ($item->menu_image_css)
+	{
+		$image_attributes['class'] = $item->menu_image_css;
+		$linktype = JHtml::_('image', $item->menu_image, $item->title, $image_attributes);
+	}
+	else
+	{
+		$linktype = JHtml::_('image', $item->menu_image, $item->title);
+	}
+
+	if ($item->params->get('menu_text', 1))
+	{
+		$linktype .= '<span class="image-title">' . $item->title . '</span>';
+	}
+}
+
+if ($item->browserNav == 1)
+{
+	$attributes['target'] = '_blank';
+	$attributes['rel'] = 'noopener noreferrer';
+
+	if ($item->anchor_rel == 'nofollow')
+	{
+		$attributes['rel'] .= ' nofollow';
+	}
+}
+elseif ($item->browserNav == 2)
+{
+	$options = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,' . $params->get('window_open');
+
+	$attributes['onclick'] = "window.open(this.href, 'targetWindow', '" . $options . "'); return false;";
+}
+
+echo JHtml::_('link', JFilterOutput::ampReplace(htmlspecialchars($item->flink, ENT_COMPAT, 'UTF-8', false)), $linktype, $attributes);
diff --git a/core/modules/mod_random_image/helper.php b/core/modules/mod_random_image/helper.php
new file mode 100644
index 00000000..849c3006
--- /dev/null
+++ b/core/modules/mod_random_image/helper.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_random_image
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Helper for mod_random_image
+ *
+ * @since  1.5
+ */
+class ModRandomImageHelper
+{
+	/**
+	 * Retrieves a random image
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters object
+	 * @param   array                      $images   list of images
+	 *
+	 * @return  mixed
+	 */
+	public static function getRandomImage(&$params, $images)
+	{
+		$width  = $params->get('width', 100);
+		$height = $params->get('height', null);
+
+		$i      = count($images);
+		$random = mt_rand(0, $i - 1);
+		$image  = $images[$random];
+		$size   = getimagesize(JPATH_BASE . '/' . $image->folder . '/' . $image->name);
+
+		if ($size[0] < $width)
+		{
+			$width = $size[0];
+		}
+
+		$coeff = $size[0] / $size[1];
+
+		if ($height === null)
+		{
+			$height = (int) ($width / $coeff);
+		}
+		else
+		{
+			$newheight = min($height, (int) ($width / $coeff));
+
+			if ($newheight < $height)
+			{
+				$height = $newheight;
+			}
+			else
+			{
+				$width = $height * $coeff;
+			}
+		}
+
+		$image->width  = $width;
+		$image->height = $height;
+		$image->folder = str_replace('\\', '/', $image->folder);
+
+		return $image;
+	}
+
+	/**
+	 * Retrieves images from a specific folder
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module params
+	 * @param   string                     $folder   folder to get the images from
+	 *
+	 * @return array
+	 */
+	public static function getImages(&$params, $folder)
+	{
+		$type   = $params->get('type', 'jpg');
+		$files  = array();
+		$images = array();
+
+		$dir = JPATH_BASE . '/' . $folder;
+
+		// Check if directory exists
+		if (is_dir($dir))
+		{
+			if ($handle = opendir($dir))
+			{
+				while (false !== ($file = readdir($handle)))
+				{
+					if ($file !== '.' && $file !== '..' && $file !== 'CVS' && $file !== 'index.html')
+					{
+						$files[] = $file;
+					}
+				}
+			}
+
+			closedir($handle);
+
+			$i = 0;
+
+			foreach ($files as $img)
+			{
+				if (!is_dir($dir . '/' . $img) && preg_match('/' . $type . '/', $img))
+				{
+					$images[$i] = new stdClass;
+
+					$images[$i]->name   = $img;
+					$images[$i]->folder = $folder;
+					$i++;
+				}
+			}
+		}
+
+		return $images;
+	}
+
+	/**
+	 * Get sanitized folder
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module params objects
+	 *
+	 * @return  mixed
+	 */
+	public static function getFolder(&$params)
+	{
+		$folder   = $params->get('folder');
+		$LiveSite = JUri::base();
+
+		// If folder includes livesite info, remove
+		if (StringHelper::strpos($folder, $LiveSite) === 0)
+		{
+			$folder = str_replace($LiveSite, '', $folder);
+		}
+
+		// If folder includes absolute path, remove
+		if (StringHelper::strpos($folder, JPATH_SITE) === 0)
+		{
+			$folder = str_replace(JPATH_BASE, '', $folder);
+		}
+
+		return str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $folder);
+	}
+}
diff --git a/core/modules/mod_random_image/mod_random_image.php b/core/modules/mod_random_image/mod_random_image.php
new file mode 100644
index 00000000..fa959ea4
--- /dev/null
+++ b/core/modules/mod_random_image/mod_random_image.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_random_image
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the random image functions only once
+JLoader::register('ModRandomImageHelper', __DIR__ . '/helper.php');
+
+$link   = $params->get('link');
+$folder = ModRandomImageHelper::getFolder($params);
+$images = ModRandomImageHelper::getImages($params, $folder);
+
+if (!count($images))
+{
+	echo JText::_('MOD_RANDOM_IMAGE_NO_IMAGES');
+
+	return;
+}
+
+$image           = ModRandomImageHelper::getRandomImage($params, $images);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_random_image', $params->get('layout', 'default'));
diff --git a/core/modules/mod_random_image/mod_random_image.xml b/core/modules/mod_random_image/mod_random_image.xml
new file mode 100644
index 00000000..5625de9c
--- /dev/null
+++ b/core/modules/mod_random_image/mod_random_image.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_random_image</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_RANDOM_IMAGE_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_random_image">mod_random_image.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_random_image.ini</language>
+		<language tag="en-GB">en-GB.mod_random_image.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_RANDOM_IMAGE" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="type"
+					type="text"
+					label="MOD_RANDOM_IMAGE_FIELD_TYPE_LABEL"
+					description="MOD_RANDOM_IMAGE_FIELD_TYPE_DESC"
+					default="jpg"
+				/>
+
+				<field
+					name="folder"
+					type="text"
+					label="MOD_RANDOM_IMAGE_FIELD_FOLDER_LABEL"
+					description="MOD_RANDOM_IMAGE_FIELD_FOLDER_DESC"
+				/>
+
+				<field
+					name="link"
+					type="text"
+					label="MOD_RANDOM_IMAGE_FIELD_LINK_LABEL"
+					description="MOD_RANDOM_IMAGE_FIELD_LINK_DESC"
+				/>
+
+				<field
+					name="width"
+					type="number"
+					label="MOD_RANDOM_IMAGE_FIELD_WIDTH_LABEL"
+					description="MOD_RANDOM_IMAGE_FIELD_WIDTH_DESC"
+					default="100"
+					filter="integer"
+				/>
+
+				<field
+					name="height"
+					type="number"
+					label="MOD_RANDOM_IMAGE_FIELD_HEIGHT_LABEL"
+					description="MOD_RANDOM_IMAGE_FIELD_HEIGHT_DESC"
+					filter="integer"
+				/>
+
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_random_image/tmpl/default.php b/core/modules/mod_random_image/tmpl/default.php
new file mode 100644
index 00000000..87d73b10
--- /dev/null
+++ b/core/modules/mod_random_image/tmpl/default.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_random_image
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="random-image<?php echo $moduleclass_sfx; ?>">
+<?php if ($link) : ?>
+<a href="<?php echo $link; ?>">
+<?php endif; ?>
+	<?php echo JHtml::_('image', $image->folder . '/' . htmlspecialchars($image->name, ENT_COMPAT, 'UTF-8'), htmlspecialchars($image->name, ENT_COMPAT, 'UTF-8'), array('width' => $image->width, 'height' => $image->height)); ?>
+<?php if ($link) : ?>
+</a>
+<?php endif; ?>
+</div>
diff --git a/core/modules/mod_related_items/helper.php b/core/modules/mod_related_items/helper.php
new file mode 100644
index 00000000..d0a3df80
--- /dev/null
+++ b/core/modules/mod_related_items/helper.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_related_items
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+/**
+ * Helper for mod_related_items
+ *
+ * @since  1.5
+ */
+abstract class ModRelatedItemsHelper
+{
+	/**
+	 * Get a list of related articles
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  array
+	 */
+	public static function getList(&$params)
+	{
+		$db      = JFactory::getDbo();
+		$app     = JFactory::getApplication();
+		$user    = JFactory::getUser();
+		$groups  = implode(',', $user->getAuthorisedViewLevels());
+		$date    = JFactory::getDate();
+		$maximum = (int) $params->get('maximum', 5);
+
+		// Get an instance of the generic articles model
+		JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_content/models');
+		$articles = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+
+		if ($articles === false)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+			return array();
+		}
+
+		// Set application parameters in model
+		$appParams = $app->getParams();
+		$articles->setState('params', $appParams);
+
+		$option = $app->input->get('option');
+		$view   = $app->input->get('view');
+
+		$temp = $app->input->getString('id');
+		$temp = explode(':', $temp);
+		$id   = $temp[0];
+
+		$nullDate = $db->getNullDate();
+		$now      = $date->toSql();
+		$related  = array();
+		$query    = $db->getQuery(true);
+
+		if ($option === 'com_content' && $view === 'article' && $id)
+		{
+			// Select the meta keywords from the item
+			$query->select('metakey')
+				->from('#__content')
+				->where('id = ' . (int) $id);
+			$db->setQuery($query);
+
+			try
+			{
+				$metakey = trim($db->loadResult());
+			}
+			catch (RuntimeException $e)
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+				return array();
+			}
+
+			// Explode the meta keys on a comma
+			$keys  = explode(',', $metakey);
+			$likes = array();
+
+			// Assemble any non-blank word(s)
+			foreach ($keys as $key)
+			{
+				$key = trim($key);
+
+				if ($key)
+				{
+					$likes[] = $db->escape($key);
+				}
+			}
+
+			if (count($likes))
+			{
+				// Select other items based on the metakey field 'like' the keys found
+				$query->clear()
+					->select('a.id')
+					->select('a.title')
+					->select('CAST(a.created AS DATE) as created')
+					->select('a.catid')
+					->select('a.language')
+					->select('cc.access AS cat_access')
+					->select('cc.published AS cat_state');
+
+				// Sqlsrv changes
+				$case_when = ' CASE WHEN ';
+				$case_when .= $query->charLength('a.alias', '!=', '0');
+				$case_when .= ' THEN ';
+				$a_id = $query->castAsChar('a.id');
+				$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+				$case_when .= ' ELSE ';
+				$case_when .= $a_id . ' END as slug';
+
+				$query->select($case_when)
+					->from('#__content AS a')
+					->join('LEFT', '#__content_frontpage AS f ON f.content_id = a.id')
+					->join('LEFT', '#__categories AS cc ON cc.id = a.catid')
+					->where('a.id != ' . (int) $id)
+					->where('a.state = 1')
+					->where('a.access IN (' . $groups . ')');
+
+				$wheres = array();
+
+				foreach ($likes as $keyword)
+				{
+					$wheres[] = 'a.metakey LIKE ' . $db->quote('%' . $keyword . '%');
+				}
+
+				$query->where('(' . implode(' OR ', $wheres) . ')')
+					->where('(a.publish_up = ' . $db->quote($nullDate) . ' OR a.publish_up <= ' . $db->quote($now) . ')')
+					->where('(a.publish_down = ' . $db->quote($nullDate) . ' OR a.publish_down >= ' . $db->quote($now) . ')');
+
+				// Filter by language
+				if (JLanguageMultilang::isEnabled())
+				{
+					$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+				}
+
+				$db->setQuery($query, 0, $maximum);
+
+				try
+				{
+					$temp = $db->loadObjectList();
+				}
+				catch (RuntimeException $e)
+				{
+					JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+					return array();
+				}
+
+				if (count($temp))
+				{
+					$articles_ids = array();
+
+					foreach ($temp as $row)
+					{
+						$articles_ids[] = $row->id;
+					}
+
+					$articles->setState('filter.article_id', $articles_ids);
+					$articles->setState('filter.published', 1);
+					$related = $articles->getItems();
+				}
+
+				unset ($temp);
+			}
+		}
+
+		if (count($related))
+		{
+			// Prepare data for display using display options
+			foreach ($related as &$item)
+			{
+				$item->slug    = $item->id . ':' . $item->alias;
+
+				/** @deprecated Catslug is deprecated, use catid instead. 4.0 */
+				$item->catslug = $item->catid . ':' . $item->category_alias;
+
+				$item->route   = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language));
+			}
+		}
+
+		return $related;
+	}
+}
diff --git a/core/modules/mod_related_items/mod_related_items.php b/core/modules/mod_related_items/mod_related_items.php
new file mode 100644
index 00000000..132e969e
--- /dev/null
+++ b/core/modules/mod_related_items/mod_related_items.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_related_items
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the related items functions only once
+JLoader::register('ModRelatedItemsHelper', __DIR__ . '/helper.php');
+
+$cacheparams = new stdClass;
+$cacheparams->cachemode = 'safeuri';
+$cacheparams->class = 'ModRelatedItemsHelper';
+$cacheparams->method = 'getList';
+$cacheparams->methodparams = $params;
+$cacheparams->modeparams = array('id' => 'int', 'Itemid' => 'int');
+
+$list = JModuleHelper::moduleCache($module, $params, $cacheparams);
+
+if (!count($list))
+{
+	return;
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$showDate        = $params->get('showDate', 0);
+
+require JModuleHelper::getLayoutPath('mod_related_items', $params->get('layout', 'default'));
diff --git a/core/modules/mod_related_items/mod_related_items.xml b/core/modules/mod_related_items/mod_related_items.xml
new file mode 100644
index 00000000..ba567538
--- /dev/null
+++ b/core/modules/mod_related_items/mod_related_items.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_related_items</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_RELATED_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_related_items">mod_related_items.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_related_items.ini</language>
+		<language tag="en-GB">en-GB.mod_related_items.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_ARTICLES_RELATED" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="showDate"
+					type="radio"
+					label="MOD_RELATED_FIELD_SHOWDATE_LABEL"
+					description="MOD_RELATED_FIELD_SHOWDATE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="maximum"
+					type="number"
+					label="MOD_RELATED_FIELD_MAX_LABEL"
+					description="MOD_RELATED_FIELD_MAX_DESC"
+					default="5"
+					filter="integer"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="owncache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_related_items/tmpl/default.php b/core/modules/mod_related_items/tmpl/default.php
new file mode 100644
index 00000000..fce58cf4
--- /dev/null
+++ b/core/modules/mod_related_items/tmpl/default.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_related_items
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ul class="relateditems<?php echo $moduleclass_sfx; ?>">
+<?php foreach ($list as $item) : ?>
+<li>
+	<a href="<?php echo $item->route; ?>">
+		<?php if ($showDate) echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')) . ' - '; ?>
+		<?php echo $item->title; ?></a>
+</li>
+<?php endforeach; ?>
+</ul>
diff --git a/core/modules/mod_search/helper.php b/core/modules/mod_search/helper.php
new file mode 100644
index 00000000..66804a1f
--- /dev/null
+++ b/core/modules/mod_search/helper.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_search
+ *
+ * @since  1.5
+ */
+class ModSearchHelper
+{
+	/**
+	 * Display the search button as an image.
+	 *
+	 * @param   string  $button_text  The alt text for the button.
+	 *
+	 * @return  string  The HTML for the image.
+	 *
+	 * @since   1.5
+	 */
+	public static function getSearchImage($button_text)
+	{
+		return JHtml::_('image', 'searchButton.gif', $button_text, null, true, true);
+	}
+}
diff --git a/core/modules/mod_search/mod_search.php b/core/modules/mod_search/mod_search.php
new file mode 100644
index 00000000..5ae0e254
--- /dev/null
+++ b/core/modules/mod_search/mod_search.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the search functions only once
+JLoader::register('ModSearchHelper', __DIR__ . '/helper.php');
+
+$lang = JFactory::getLanguage();
+$app  = JFactory::getApplication();
+
+if ($params->get('opensearch', 1))
+{
+	$doc = JFactory::getDocument();
+
+	$ostitle = $params->get('opensearch_title', JText::_('MOD_SEARCH_SEARCHBUTTON_TEXT') . ' ' . $app->get('sitename'));
+	$doc->addHeadLink(
+			JUri::getInstance()->toString(array('scheme', 'host', 'port'))
+			. JRoute::_('&option=com_search&format=opensearch'), 'search', 'rel',
+			array(
+				'title' => htmlspecialchars($ostitle, ENT_COMPAT, 'UTF-8'),
+				'type' => 'application/opensearchdescription+xml'
+			)
+		);
+}
+
+$upper_limit     = $lang->getUpperLimitSearchWord();
+$button          = $params->get('button', 0);
+$imagebutton     = $params->get('imagebutton', 0);
+$button_pos      = $params->get('button_pos', 'left');
+$button_text     = htmlspecialchars($params->get('button_text', JText::_('MOD_SEARCH_SEARCHBUTTON_TEXT')), ENT_COMPAT, 'UTF-8');
+$width           = (int) $params->get('width');
+$maxlength       = $upper_limit;
+$text            = htmlspecialchars($params->get('text', JText::_('MOD_SEARCH_SEARCHBOX_TEXT')), ENT_COMPAT, 'UTF-8');
+$label           = htmlspecialchars($params->get('label', JText::_('MOD_SEARCH_LABEL_TEXT')), ENT_COMPAT, 'UTF-8');
+$set_Itemid      = (int) $params->get('set_itemid', 0);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+if ($imagebutton)
+{
+	$img = ModSearchHelper::getSearchImage($button_text);
+}
+
+$mitemid = $set_Itemid > 0 ? $set_Itemid : $app->input->getInt('Itemid');
+require JModuleHelper::getLayoutPath('mod_search', $params->get('layout', 'default'));
diff --git a/core/modules/mod_search/mod_search.xml b/core/modules/mod_search/mod_search.xml
new file mode 100644
index 00000000..f9df2a05
--- /dev/null
+++ b/core/modules/mod_search/mod_search.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_search</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_SEARCH_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_search">mod_search.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_search.ini</language>
+		<language tag="en-GB">en-GB.mod_search.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_SEARCH" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="label"
+					type="label"
+					label="MOD_SEARCH_FIELD_LABEL_TEXT_LABEL"
+					description="MOD_SEARCH_FIELD_LABEL_TEXT_DESC"
+				/>
+
+				<field
+					name="width"
+					type="number"
+					label="MOD_SEARCH_FIELD_BOXWIDTH_LABEL"
+					description="MOD_SEARCH_FIELD_BOXWIDTH_DESC"
+					filter="integer"
+				/>
+
+				<field
+					name="text"
+					type="text"
+					label="MOD_SEARCH_FIELD_TEXT_LABEL"
+					description="MOD_SEARCH_FIELD_TEXT_DESC"
+				/>
+
+				<field
+					name="button"
+					type="radio"
+					label="MOD_SEARCH_FIELD_BUTTON_LABEL"
+					description="MOD_SEARCH_FIELD_BUTTON_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="button_pos"
+					type="list"
+					label="MOD_SEARCH_FIELD_BUTTONPOS_LABEL"
+					description="MOD_SEARCH_FIELD_BUTTONPOS_DESC"
+					default="left"
+					showon="button:1"
+					>
+					<option value="right">MOD_SEARCH_FIELD_VALUE_RIGHT</option>
+					<option value="left">MOD_SEARCH_FIELD_VALUE_LEFT</option>
+					<option value="top">MOD_SEARCH_FIELD_VALUE_TOP</option>
+					<option value="bottom">MOD_SEARCH_FIELD_VALUE_BOTTOM</option>
+				</field>
+
+				<field
+					name="imagebutton"
+					type="radio"
+					label="MOD_SEARCH_FIELD_IMAGEBUTTON_LABEL"
+					description="MOD_SEARCH_FIELD_IMAGEBUTTON_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					showon="button:1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="button_text"
+					type="text"
+					label="MOD_SEARCH_FIELD_BUTTONTEXT_LABEL"
+					description="MOD_SEARCH_FIELD_BUTTONTEXT_DESC"
+					showon="button:1"
+				/>
+
+				<field
+					name="opensearch"
+					type="radio"
+					label="MOD_SEARCH_FIELD_OPENSEARCH_LABEL"
+					description="MOD_SEARCH_FIELD_OPENSEARCH_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="opensearch_title"
+					type="text"
+					label="MOD_SEARCH_FIELD_OPENSEARCH_TEXT_LABEL"
+					description="MOD_SEARCH_FIELD_OPENSEARCH_TEXT_DESC"
+					showon="opensearch:1"
+				/>
+
+				<field
+					name="set_itemid"
+					type="menuitem"
+					label="MOD_SEARCH_FIELD_SETITEMID_LABEL"
+					description="MOD_SEARCH_FIELD_SETITEMID_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">MOD_SEARCH_SELECT_MENU_ITEMID</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="itemid"
+					>
+					<option value="itemid"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_search/tmpl/default.php b/core/modules/mod_search/tmpl/default.php
new file mode 100644
index 00000000..ff888acb
--- /dev/null
+++ b/core/modules/mod_search/tmpl/default.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_search
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Including fallback code for the placeholder attribute in the search field.
+JHtml::_('jquery.framework');
+JHtml::_('script', 'system/html5fallback.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+if ($width)
+{
+	$moduleclass_sfx .= ' ' . 'mod_search' . $module->id;
+	$css = 'div.mod_search' . $module->id . ' input[type="search"]{ width:auto; }';
+	JFactory::getDocument()->addStyleDeclaration($css);
+	$width = ' size="' . $width . '"';
+}
+else
+{
+	$width = '';
+}
+?>
+<div class="search<?php echo $moduleclass_sfx; ?>">
+	<form action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-inline">
+		<?php
+			$output = '<label for="mod-search-searchword' . $module->id . '" class="element-invisible">' . $label . '</label> ';
+			$output .= '<input name="searchword" id="mod-search-searchword' . $module->id . '" maxlength="' . $maxlength . '"  class="inputbox search-query input-medium" type="search"' . $width;
+			$output .= ' placeholder="' . $text . '" />';
+
+			if ($button) :
+				if ($imagebutton) :
+					$btn_output = ' <input type="image" alt="' . $button_text . '" class="button" src="' . $img . '" onclick="this.form.searchword.focus();"/>';
+				else :
+					$btn_output = ' <button class="button btn btn-primary" onclick="this.form.searchword.focus();">' . $button_text . '</button>';
+				endif;
+
+				switch ($button_pos) :
+					case 'top' :
+						$output = $btn_output . '<br />' . $output;
+						break;
+
+					case 'bottom' :
+						$output .= '<br />' . $btn_output;
+						break;
+
+					case 'right' :
+						$output .= $btn_output;
+						break;
+
+					case 'left' :
+					default :
+						$output = $btn_output . $output;
+						break;
+				endswitch;
+			endif;
+
+			echo $output;
+		?>
+		<input type="hidden" name="task" value="search" />
+		<input type="hidden" name="option" value="com_search" />
+		<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
+	</form>
+</div>
diff --git a/core/modules/mod_stats/helper.php b/core/modules/mod_stats/helper.php
new file mode 100644
index 00000000..492429cb
--- /dev/null
+++ b/core/modules/mod_stats/helper.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_stats
+ *
+ * @since  1.5
+ */
+class ModStatsHelper
+{
+	/**
+	 * Get list of stats
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  array
+	 */
+	public static function &getList(&$params)
+	{
+		$app        = JFactory::getApplication();
+		$db         = JFactory::getDbo();
+		$rows       = array();
+		$query      = $db->getQuery(true);
+		$serverinfo = $params->get('serverinfo', 0);
+		$siteinfo   = $params->get('siteinfo', 0);
+		$counter    = $params->get('counter', 0);
+		$increase   = $params->get('increase', 0);
+
+		$i = 0;
+
+		if ($serverinfo)
+		{
+			$rows[$i] = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_OS');
+			$rows[$i]->data  = substr(php_uname(), 0, 7);
+			$i++;
+
+			$rows[$i] = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_PHP');
+			$rows[$i]->data  = phpversion();
+			$i++;
+
+			$rows[$i] = new stdClass;
+			$rows[$i]->title = JText::_($db->name);
+			$rows[$i]->data  = $db->getVersion();
+			$i++;
+
+			$rows[$i] = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_TIME');
+			$rows[$i]->data  = JHtml::_('date', 'now', 'H:i');
+			$i++;
+
+			$rows[$i] = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_CACHING');
+			$rows[$i]->data  = $app->get('caching') ? JText::_('JENABLED') : JText::_('JDISABLED');
+			$i++;
+
+			$rows[$i] = new stdClass;
+			$rows[$i]->title = JText::_('MOD_STATS_GZIP');
+			$rows[$i]->data  = $app->get('gzip') ? JText::_('JENABLED') : JText::_('JDISABLED');
+			$i++;
+		}
+
+		if ($siteinfo)
+		{
+			$query->select('COUNT(id) AS count_users')
+				->from('#__users');
+			$db->setQuery($query);
+
+			try
+			{
+				$users = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$users = false;
+			}
+
+			$query->clear()
+				->select('COUNT(id) AS count_items')
+				->from('#__content')
+				->where('state = 1');
+			$db->setQuery($query);
+
+			try
+			{
+				$items = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$items = false;
+			}
+
+			if ($users)
+			{
+				$rows[$i] = new stdClass;
+				$rows[$i]->title = JText::_('MOD_STATS_USERS');
+				$rows[$i]->data  = $users;
+				$i++;
+			}
+
+			if ($items)
+			{
+				$rows[$i] = new stdClass;
+				$rows[$i]->title = JText::_('MOD_STATS_ARTICLES');
+				$rows[$i]->data  = $items;
+				$i++;
+			}
+		}
+
+		if ($counter)
+		{
+			$query->clear()
+				->select('SUM(hits) AS count_hits')
+				->from('#__content')
+				->where('state = 1');
+			$db->setQuery($query);
+
+			try
+			{
+				$hits = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				$hits = false;
+			}
+
+			if ($hits)
+			{
+				$rows[$i] = new stdClass;
+				$rows[$i]->title = JText::_('MOD_STATS_ARTICLES_VIEW_HITS');
+				$rows[$i]->data  = $hits + $increase;
+				$i++;
+			}
+		}
+
+		// Include additional data defined by published system plugins
+		JPluginHelper::importPlugin('system');
+
+		$arrays = (array) $app->triggerEvent('onGetStats', array('mod_stats'));
+
+		foreach ($arrays as $response)
+		{
+			foreach ($response as $row)
+			{
+				// We only add a row if the title and data are given
+				if (isset($row['title']) && isset($row['data']))
+				{
+					$rows[$i]        = new stdClass;
+					$rows[$i]->title = $row['title'];
+					$rows[$i]->icon  = isset($row['icon']) ? $row['icon'] : 'info';
+					$rows[$i]->data  = $row['data'];
+					$i++;
+				}
+			}
+		}
+
+		return $rows;
+	}
+}
diff --git a/core/modules/mod_stats/mod_stats.php b/core/modules/mod_stats/mod_stats.php
new file mode 100644
index 00000000..01e5c78f
--- /dev/null
+++ b/core/modules/mod_stats/mod_stats.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the statistics functions only once
+JLoader::register('ModStatsHelper', __DIR__ . '/helper.php');
+
+$serverinfo      = $params->get('serverinfo', 0);
+$siteinfo        = $params->get('siteinfo', 0);
+$list            = ModStatsHelper::getList($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_stats', $params->get('layout', 'default'));
diff --git a/core/modules/mod_stats/mod_stats.xml b/core/modules/mod_stats/mod_stats.xml
new file mode 100644
index 00000000..421a33ab
--- /dev/null
+++ b/core/modules/mod_stats/mod_stats.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_stats</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_STATS_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_stats">mod_stats.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_stats.ini</language>
+		<language tag="en-GB">en-GB.mod_stats.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_STATISTICS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="serverinfo"
+					type="radio"
+					label="MOD_STATS_FIELD_SERVERINFO_LABEL"
+					description="MOD_STATS_FIELD_SERVERINFO_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="siteinfo"
+					type="radio"
+					label="MOD_STATS_FIELD_SITEINFO_LABEL"
+					description="MOD_STATS_FIELD_SITEINFO_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="counter"
+					type="radio"
+					label="MOD_STATS_FIELD_COUNTER_LABEL"
+					description="MOD_STATS_FIELD_COUNTER_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="increase"
+					type="number"
+					label="MOD_STATS_FIELD_INCREASECOUNTER_LABEL"
+					description="MOD_STATS_FIELD_INCREASECOUNTER_DESC"
+					default="0"
+					filter="integer"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_stats/tmpl/default.php b/core/modules/mod_stats/tmpl/default.php
new file mode 100644
index 00000000..b658631d
--- /dev/null
+++ b/core/modules/mod_stats/tmpl/default.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<dl class="stats-module<?php echo $moduleclass_sfx; ?>">
+<?php foreach ($list as $item) : ?>
+	<dt><?php echo $item->title; ?></dt>
+	<dd><?php echo $item->data; ?></dd>
+<?php endforeach; ?>
+</dl>
diff --git a/core/modules/mod_syndicate/helper.php b/core/modules/mod_syndicate/helper.php
new file mode 100644
index 00000000..3b28c69e
--- /dev/null
+++ b/core/modules/mod_syndicate/helper.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_syndicate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Helper for mod_syndicate
+ *
+ * @since  1.5
+ */
+class ModSyndicateHelper
+{
+	/**
+	 * Gets the link
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  array  The link as a string
+	 *
+	 * @since   1.5
+	 */
+	public static function getLink(&$params)
+	{
+		$document = JFactory::getDocument();
+
+		foreach ($document->_links as $link => $value)
+		{
+			$value = ArrayHelper::toString($value);
+
+			if (strpos($value, 'application/' . $params->get('format') . '+xml'))
+			{
+				return $link;
+			}
+		}
+	}
+}
diff --git a/core/modules/mod_syndicate/mod_syndicate.php b/core/modules/mod_syndicate/mod_syndicate.php
new file mode 100644
index 00000000..812ce580
--- /dev/null
+++ b/core/modules/mod_syndicate/mod_syndicate.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_syndicate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the syndicate functions only once
+JLoader::register('ModSyndicateHelper', __DIR__ . '/helper.php');
+
+$params->def('format', 'rss');
+
+$link = ModSyndicateHelper::getLink($params);
+
+if ($link === null)
+{
+	return;
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$text            = htmlspecialchars($params->get('text'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_syndicate', $params->get('layout', 'default'));
diff --git a/core/modules/mod_syndicate/mod_syndicate.xml b/core/modules/mod_syndicate/mod_syndicate.xml
new file mode 100644
index 00000000..ba96a059
--- /dev/null
+++ b/core/modules/mod_syndicate/mod_syndicate.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_syndicate</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_SYNDICATE_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_syndicate">mod_syndicate.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_syndicate.ini</language>
+		<language tag="en-GB">en-GB.mod_syndicate.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_SYNDICATION_FEEDS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="display_text"
+					type="radio"
+					label="MOD_SYNDICATE_FIELD_DISPLAYTEXT_LABEL"
+					description="MOD_SYNDICATE_FIELD_DISPLAYTEXT_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="text"
+					type="text"
+					label="MOD_SYNDICATE_FIELD_TEXT_LABEL"
+					description="MOD_SYNDICATE_FIELD_TEXT_DESC"
+					showon="display_text:1"
+				/>
+
+				<field
+					name="format"
+					type="list"
+					label="MOD_SYNDICATE_FIELD_FORMAT_LABEL"
+					description="MOD_SYNDICATE_FIELD_FORMAT_DESC"
+					default="rss"
+					>
+					<option value="rss">MOD_SYNDICATE_FIELD_VALUE_RSS</option>
+					<option value="atom">MOD_SYNDICATE_FIELD_VALUE_ATOM</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_syndicate/tmpl/default.php b/core/modules/mod_syndicate/tmpl/default.php
new file mode 100644
index 00000000..3b68459a
--- /dev/null
+++ b/core/modules/mod_syndicate/tmpl/default.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_syndicate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<a href="<?php echo $link; ?>" class="syndicate-module<?php echo $moduleclass_sfx; ?>">
+	<?php echo JHtml::_('image', 'system/livemarks.png', 'feed-image', null, true); ?>
+	<?php if ($params->get('display_text', 1)) : ?>
+		<span>
+		<?php if (str_replace(' ', '', $text) !== '') : ?>
+			<?php echo $text; ?>
+		<?php else : ?>
+			<?php echo JText::_('MOD_SYNDICATE_DEFAULT_FEED_ENTRIES'); ?>
+		<?php endif; ?>
+		</span>
+	<?php endif; ?>
+</a>
diff --git a/core/modules/mod_tags_popular/helper.php b/core/modules/mod_tags_popular/helper.php
new file mode 100644
index 00000000..2de540c2
--- /dev/null
+++ b/core/modules/mod_tags_popular/helper.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_tags_popular
+ *
+ * @since  3.1
+ */
+abstract class ModTagsPopularHelper
+{
+	/**
+	 * Get list of popular tags
+	 *
+	 * @param   \Joomla\Registry\Registry  &$params  module parameters
+	 *
+	 * @return  mixed
+	 *
+	 * @since   3.1
+	 */
+	public static function getList(&$params)
+	{
+		$db          = JFactory::getDbo();
+		$user        = JFactory::getUser();
+		$groups      = implode(',', $user->getAuthorisedViewLevels());
+		$timeframe   = $params->get('timeframe', 'alltime');
+		$maximum     = $params->get('maximum', 5);
+		$order_value = $params->get('order_value', 'title');
+		$nowDate     = JFactory::getDate()->toSql();
+		$nullDate    = $db->quote($db->getNullDate());
+
+		$query = $db->getQuery(true)
+			->select(
+				array(
+					'MAX(' . $db->quoteName('tag_id') . ') AS tag_id',
+					' COUNT(*) AS count', 'MAX(t.title) AS title',
+					'MAX(' . $db->quoteName('t.access') . ') AS access',
+					'MAX(' . $db->quoteName('t.alias') . ') AS alias',
+					'MAX(' . $db->quoteName('t.params') . ') AS params',
+				)
+			)
+			->group($db->quoteName(array('tag_id', 'title', 'access', 'alias')))
+			->from($db->quoteName('#__contentitem_tag_map', 'm'))
+			->where($db->quoteName('t.access') . ' IN (' . $groups . ')');
+
+		// Only return published tags
+		$query->where($db->quoteName('t.published') . ' = 1 ');
+
+		// Filter by Parent Tag
+		$parentTags = $params->get('parentTag', array());
+
+		if ($parentTags)
+		{
+			$query->where($db->quoteName('t.parent_id') . ' IN (' . implode(',', $parentTags) . ')');
+		}
+
+		// Optionally filter on language
+		$language = JComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
+
+		if ($language !== 'all')
+		{
+			if ($language === 'current_language')
+			{
+				$language = JHelperContent::getCurrentLanguage();
+			}
+
+			$query->where($db->quoteName('t.language') . ' IN (' . $db->quote($language) . ', ' . $db->quote('*') . ')');
+		}
+
+		if ($timeframe !== 'alltime')
+		{
+			$query->where($db->quoteName('tag_date') . ' > ' . $query->dateAdd($nowDate, '-1', strtoupper($timeframe)));
+		}
+
+		$query->join('INNER', $db->quoteName('#__tags', 't') . ' ON ' . $db->quoteName('tag_id') . ' = t.id')
+		->join('INNER', $db->qn('#__ucm_content', 'c') . ' ON ' . $db->qn('m.core_content_id') . ' = ' . $db->qn('c.core_content_id'));
+
+		$query->where($db->quoteName('m.type_alias') . ' = ' . $db->quoteName('c.core_type_alias'));
+
+		// Only return tags connected to published articles
+		$query->where($db->quoteName('c.core_state') . ' = 1')
+			->where('(' . $db->quoteName('c.core_publish_up') . ' = ' . $nullDate
+				. ' OR ' . $db->quoteName('c.core_publish_up') . ' <= ' . $db->quote($nowDate) . ')')
+			->where('(' . $db->quoteName('c.core_publish_down') . ' = ' . $nullDate
+				. ' OR  ' . $db->quoteName('c.core_publish_down') . ' >= ' . $db->quote($nowDate) . ')');
+
+		// Set query depending on order_value param
+		if ($order_value === 'rand()')
+		{
+			$query->order($query->Rand());
+		}
+		else
+		{
+			$order_value     = $db->quoteName($order_value);
+			$order_direction = $params->get('order_direction', 1) ? 'DESC' : 'ASC';
+
+			if ($params->get('order_value', 'title') === 'title')
+			{
+				$query->setLimit($maximum);
+				$query->order('count DESC');
+				$equery = $db->getQuery(true)
+					->select(
+						array(
+							'a.tag_id',
+							'a.count',
+							'a.title',
+							'a.access',
+							'a.alias',
+						)
+					)
+					->from('(' . (string) $query . ') AS a')
+					->order('a.title' . ' ' . $order_direction);
+
+				$query = $equery;
+			}
+			else
+			{
+				$query->order($order_value . ' ' . $order_direction);
+			}
+		}
+
+		$db->setQuery($query, 0, $maximum);
+
+		try
+		{
+			$results = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$results = array();
+			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		return $results;
+	}
+}
diff --git a/core/modules/mod_tags_popular/mod_tags_popular.php b/core/modules/mod_tags_popular/mod_tags_popular.php
new file mode 100644
index 00000000..80ac4e97
--- /dev/null
+++ b/core/modules/mod_tags_popular/mod_tags_popular.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the tags_popular functions only once
+JLoader::register('ModTagsPopularHelper', __DIR__ . '/helper.php');
+
+$cacheparams = new stdClass;
+$cacheparams->cachemode = 'safeuri';
+$cacheparams->class = 'ModTagsPopularHelper';
+$cacheparams->method = 'getList';
+$cacheparams->methodparams = $params;
+$cacheparams->modeparams = array('id' => 'array', 'Itemid' => 'int');
+
+$list = JModuleHelper::moduleCache($module, $params, $cacheparams);
+
+if (!count($list) && !$params->get('no_results_text'))
+{
+	return;
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$display_count   = $params->get('display_count', 0);
+
+require JModuleHelper::getLayoutPath('mod_tags_popular', $params->get('layout', 'default'));
diff --git a/core/modules/mod_tags_popular/mod_tags_popular.xml b/core/modules/mod_tags_popular/mod_tags_popular.xml
new file mode 100644
index 00000000..9207e015
--- /dev/null
+++ b/core/modules/mod_tags_popular/mod_tags_popular.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_tags_popular</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2013</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.1.0</version>
+	<description>MOD_TAGS_POPULAR_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_tags_popular">mod_tags_popular.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_tags_popular.ini</language>
+		<language tag="en-GB">en-GB.mod_tags_popular.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_POPULAR" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="parentTag"
+					type="tag"
+					label="MOD_TAGS_POPULAR_PARENT_TAG_LABEL"
+					description="MOD_TAGS_POPULAR_PARENT_TAG_DESC"
+					multiple="true"
+					filter="int_array"
+				/>
+
+				<field
+					name="maximum"
+					type="integer"
+					label="MOD_TAGS_POPULAR_MAX_LABEL"
+					description="MOD_TAGS_POPULAR_MAX_DESC"
+					default="5"
+					filter="integer"
+					first="1"
+					last="20"
+					step="1"
+				/>
+
+				<field
+					name="timeframe"
+					type="list"
+					label="MOD_TAGS_POPULAR_FIELD_TIMEFRAME_LABEL"
+					description="MOD_TAGS_POPULAR_FIELD_TIMEFRAME_DESC"
+					default="alltime"
+					>
+					<option value="alltime">MOD_TAGS_POPULAR_FIELD_ALL_TIME</option>
+					<option value="hour">MOD_TAGS_POPULAR_FIELD_LAST_HOUR</option>
+					<option value="day">MOD_TAGS_POPULAR_FIELD_LAST_DAY</option>
+					<option value="week">MOD_TAGS_POPULAR_FIELD_LAST_WEEK</option>
+					<option value="month">MOD_TAGS_POPULAR_FIELD_LAST_MONTH</option>
+					<option value="year">MOD_TAGS_POPULAR_FIELD_LAST_YEAR</option>
+				</field>
+
+				<field
+					name="order_value"
+					type="list"
+					label="MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_LABEL"
+					description="MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_DESC"
+					default="count"
+					>
+					<option value="title">MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_TITLE</option>
+					<option value="count">MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_COUNT</option>
+					<option value="rand()">MOD_TAGS_POPULAR_FIELD_ORDER_VALUE_RANDOM</option>
+				</field>
+
+				<field
+					name="order_direction"
+					type="list"
+					label="JGLOBAL_ORDER_DIRECTION_LABEL"
+					description="JGLOBAL_ORDER_DIRECTION_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JGLOBAL_ORDER_ASCENDING</option>
+					<option value="1">JGLOBAL_ORDER_DESCENDING</option>
+				</field>
+
+				<field
+					name="display_count"
+					type="radio"
+					label="MOD_TAGS_POPULAR_FIELD_DISPLAY_COUNT_LABEL"
+					description="MOD_TAGS_POPULAR_FIELD_DISPLAY_COUNT_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="no_results_text"
+					type="radio"
+					label="MOD_TAGS_POPULAR_FIELD_NO_RESULTS_LABEL"
+					description="MOD_TAGS_POPULAR_FIELD_NO_RESULTS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset
+				name="cloud"
+				label="MOD_TAGS_POPULAR_FIELDSET_CLOUD_LABEL"
+			>
+				<field
+					name="minsize"
+					type="number"
+					label="MOD_TAGS_POPULAR_FIELD_MINSIZE_LABEL"
+					description="MOD_TAGS_POPULAR_FIELD_MINSIZE_DESC"
+					default="1"
+					filter="float"
+				/>
+
+				<field
+					name="maxsize"
+					type="number"
+					label="MOD_TAGS_POPULAR_FIELD_MAXSIZE_LABEL"
+					description="MOD_TAGS_POPULAR_FIELD_MAXSIZE_DESC"
+					default="2"
+					filter="float"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+					default="_:default"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="owncache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_tags_popular/tmpl/cloud.php b/core/modules/mod_tags_popular/tmpl/cloud.php
new file mode 100644
index 00000000..7a63a6aa
--- /dev/null
+++ b/core/modules/mod_tags_popular/tmpl/cloud.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$minsize = $params->get('minsize', 1);
+$maxsize = $params->get('maxsize', 2);
+
+JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
+?>
+<div class="tagspopular<?php echo $moduleclass_sfx; ?> tagscloud<?php echo $moduleclass_sfx; ?>">
+<?php
+if (!count($list)) : ?>
+	<div class="alert alert-no-items"><?php echo JText::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?></div>
+<?php else :
+	// Find maximum and minimum count
+	$mincount = null;
+	$maxcount = null;
+	foreach ($list as $item)
+	{
+		if ($mincount === null || $mincount > $item->count)
+		{
+			$mincount = $item->count;
+		}
+		if ($maxcount === null || $maxcount < $item->count)
+		{
+			$maxcount = $item->count;
+		}
+	}
+	$countdiff = $maxcount - $mincount;
+
+	foreach ($list as $item) :
+		if ($countdiff === 0) :
+			$fontsize = $minsize;
+		else :
+			$fontsize = $minsize + (($maxsize - $minsize) / $countdiff) * ($item->count - $mincount);
+		endif;
+?>
+		<span class="tag">
+			<a class="tag-name" style="font-size: <?php echo $fontsize . 'em'; ?>" href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($item->tag_id . ':' . $item->alias)); ?>">
+				<?php echo htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8'); ?></a>
+			<?php if ($display_count) : ?>
+				<span class="tag-count badge badge-info"><?php echo $item->count; ?></span>
+			<?php endif; ?>
+		</span>
+	<?php endforeach; ?>
+<?php endif; ?>
+</div>
diff --git a/core/modules/mod_tags_popular/tmpl/default.php b/core/modules/mod_tags_popular/tmpl/default.php
new file mode 100644
index 00000000..1d5e5d5d
--- /dev/null
+++ b/core/modules/mod_tags_popular/tmpl/default.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_popular
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<?php JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php'); ?>
+<div class="tagspopular<?php echo $moduleclass_sfx; ?>">
+<?php if (!count($list)) : ?>
+	<div class="alert alert-no-items"><?php echo JText::_('MOD_TAGS_POPULAR_NO_ITEMS_FOUND'); ?></div>
+<?php else : ?>
+	<ul>
+	<?php foreach ($list as $item) : ?>
+	<li>
+		<a href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($item->tag_id . ':' . $item->alias)); ?>">
+			<?php echo htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8'); ?></a>
+		<?php if ($display_count) : ?>
+			<span class="tag-count badge badge-info"><?php echo $item->count; ?></span>
+		<?php endif; ?>
+	</li>
+	<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
+</div>
diff --git a/core/modules/mod_tags_similar/helper.php b/core/modules/mod_tags_similar/helper.php
new file mode 100644
index 00000000..b0de1512
--- /dev/null
+++ b/core/modules/mod_tags_similar/helper.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_similar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
+
+/**
+ * Helper for mod_tags_similar
+ *
+ * @since  3.1
+ */
+abstract class ModTagssimilarHelper
+{
+	/**
+	 * Get a list of tags
+	 *
+	 * @param   Registry  &$params  Module parameters
+	 *
+	 * @return  array
+	 */
+	public static function getList(&$params)
+	{
+		$app        = JFactory::getApplication();
+		$option     = $app->input->get('option');
+		$view       = $app->input->get('view');
+
+		// For now assume com_tags and com_users do not have tags.
+		// This module does not apply to list views in general at this point.
+		if ($option === 'com_tags' || $view === 'category' || $option === 'com_users')
+		{
+			return array();
+		}
+
+		$db         = JFactory::getDbo();
+		$user       = JFactory::getUser();
+		$groups     = implode(',', $user->getAuthorisedViewLevels());
+		$matchtype  = $params->get('matchtype', 'all');
+		$maximum    = $params->get('maximum', 5);
+		$ordering   = $params->get('ordering', 'count');
+		$tagsHelper = new JHelperTags;
+		$prefix     = $option . '.' . $view;
+		$id         = $app->input->getInt('id');
+		$now        = JFactory::getDate()->toSql();
+		$nullDate   = $db->getNullDate();
+
+		$tagsToMatch = $tagsHelper->getTagIds($id, $prefix);
+
+		if (!$tagsToMatch || $tagsToMatch === null)
+		{
+			return array();
+		}
+
+		$tagCount = substr_count($tagsToMatch, ',') + 1;
+
+		$query = $db->getQuery(true)
+			->select(
+				array(
+					$db->quoteName('m.core_content_id'),
+					$db->quoteName('m.content_item_id'),
+					$db->quoteName('m.type_alias'),
+					'COUNT( ' . $db->quoteName('tag_id') . ') AS ' . $db->quoteName('count'),
+					$db->quoteName('ct.router'),
+					$db->quoteName('cc.core_title'),
+					$db->quoteName('cc.core_alias'),
+					$db->quoteName('cc.core_catid'),
+					$db->quoteName('cc.core_language'),
+					$db->quoteName('cc.core_params'),
+				)
+			);
+
+		$query->from($db->quoteName('#__contentitem_tag_map', 'm'));
+
+		$query->join('INNER', $db->quoteName('#__tags', 't') . ' ON m.tag_id = t.id')
+			->join('INNER', $db->quoteName('#__ucm_content', 'cc') . ' ON m.core_content_id = cc.core_content_id')
+			->join('INNER', $db->quoteName('#__content_types', 'ct') . ' ON m.type_alias = ct.type_alias');
+
+		$query->where($db->quoteName('m.tag_id') . ' IN (' . $tagsToMatch . ')');
+		$query->where('t.access IN (' . $groups . ')');
+		$query->where('(cc.core_access IN (' . $groups . ') OR cc.core_access = 0)');
+
+		// Don't show current item
+		$query->where('(' . $db->quoteName('m.content_item_id') . ' <> ' . $id
+			. ' OR ' . $db->quoteName('m.type_alias') . ' <> ' . $db->quote($prefix) . ')'
+		);
+
+		// Only return published tags
+		$query->where($db->quoteName('cc.core_state') . ' = 1 ')
+			->where('(' . $db->quoteName('cc.core_publish_up') . '=' . $db->quote($nullDate) . ' OR '
+				. $db->quoteName('cc.core_publish_up') . '<=' . $db->quote($now) . ')'
+			)
+			->where('(' . $db->quoteName('cc.core_publish_down') . '=' . $db->quote($nullDate) . ' OR '
+				. $db->quoteName('cc.core_publish_down') . '>=' . $db->quote($now) . ')'
+			);
+
+		// Optionally filter on language
+		$language = JComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
+
+		if ($language !== 'all')
+		{
+			if ($language === 'current_language')
+			{
+				$language = JHelperContent::getCurrentLanguage();
+			}
+
+			$query->where($db->quoteName('cc.core_language') . ' IN (' . $db->quote($language) . ', ' . $db->quote('*') . ')');
+		}
+
+		$query->group(
+			$db->quoteName(
+				array('m.core_content_id', 'm.content_item_id', 'm.type_alias', 'ct.router', 'cc.core_title',
+				'cc.core_alias', 'cc.core_catid', 'cc.core_language', 'cc.core_params')
+			)
+		);
+
+		if ($matchtype === 'all' && $tagCount > 0)
+		{
+			$query->having('COUNT( ' . $db->quoteName('tag_id') . ')  = ' . $tagCount);
+		}
+		elseif ($matchtype === 'half' && $tagCount > 0)
+		{
+			$tagCountHalf = ceil($tagCount / 2);
+			$query->having('COUNT( ' . $db->quoteName('tag_id') . ')  >= ' . $tagCountHalf);
+		}
+
+		if ($ordering === 'count' || $ordering === 'countrandom')
+		{
+			$query->order($db->quoteName('count') . ' DESC');
+		}
+
+		if ($ordering === 'random' || $ordering === 'countrandom')
+		{
+			$query->order($query->Rand());
+		}
+
+		$db->setQuery($query, 0, $maximum);
+
+		try
+		{
+			$results = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$results = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		foreach ($results as $result)
+		{
+			$result->link = TagsHelperRoute::getItemRoute(
+				$result->content_item_id,
+				$result->core_alias,
+				$result->core_catid,
+				$result->core_language,
+				$result->type_alias,
+				$result->router
+			);
+
+			$result->core_params = new Registry($result->core_params);
+		}
+
+		return $results;
+	}
+}
diff --git a/core/modules/mod_tags_similar/mod_tags_similar.php b/core/modules/mod_tags_similar/mod_tags_similar.php
new file mode 100644
index 00000000..c7ec00ba
--- /dev/null
+++ b/core/modules/mod_tags_similar/mod_tags_similar.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_similar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the tags_similar functions only once
+JLoader::register('ModTagssimilarHelper', __DIR__ . '/helper.php');
+
+$cacheparams = new stdClass;
+$cacheparams->cachemode = 'safeuri';
+$cacheparams->class = 'ModTagssimilarHelper';
+$cacheparams->method = 'getList';
+$cacheparams->methodparams = $params;
+$cacheparams->modeparams = array('id' => 'array', 'Itemid' => 'int');
+
+$list = JModuleHelper::moduleCache($module, $params, $cacheparams);
+
+if (!count($list))
+{
+	return;
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_tags_similar', $params->get('layout', 'default'));
diff --git a/core/modules/mod_tags_similar/mod_tags_similar.xml b/core/modules/mod_tags_similar/mod_tags_similar.xml
new file mode 100644
index 00000000..8fd8c126
--- /dev/null
+++ b/core/modules/mod_tags_similar/mod_tags_similar.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_tags_similar</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2013</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.1.0</version>
+	<description>MOD_TAGS_SIMILAR_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_tags_similar">mod_tags_similar.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_tags_similar.ini</language>
+		<language tag="en-GB">en-GB.mod_tags_similar.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_TAGS_SIMILAR" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="maximum"
+					type="integer"
+					label="MOD_TAGS_SIMILAR_MAX_LABEL"
+					description="MOD_TAGS_SIMILAR_MAX_DESC"
+					default="5"
+					filter="integer"
+					first="1"
+					last="20"
+					step="1"
+				/>
+
+				<field
+					name="matchtype"
+					type="list"
+					label="MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_LABEL"
+					description="MOD_TAGS_SIMILAR_FIELD_MATCHTYPE_DESC"
+					default="any"
+					>
+					<option value="all">MOD_TAGS_SIMILAR_FIELD_ALL</option>
+					<option value="any">MOD_TAGS_SIMILAR_FIELD_ONE</option>
+					<option value="half">MOD_TAGS_SIMILAR_FIELD_HALF</option>
+				</field>
+
+				<field
+					name="ordering"
+					type="list"
+					label="MOD_TAGS_SIMILAR_FIELD_ORDERING_LABEL"
+					description="MOD_TAGS_SIMILAR_FIELD_ORDERING_DESC"
+					default="count"
+					>
+					<option value="count">MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT</option>
+					<option value="random">MOD_TAGS_SIMILAR_FIELD_ORDERING_RANDOM</option>
+					<option value="countrandom">MOD_TAGS_SIMILAR_FIELD_ORDERING_COUNT_AND_RANDOM</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="owncache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_tags_similar/tmpl/default.php b/core/modules/mod_tags_similar/tmpl/default.php
new file mode 100644
index 00000000..647d99c4
--- /dev/null
+++ b/core/modules/mod_tags_similar/tmpl/default.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_tags_similar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="tagssimilar<?php echo $moduleclass_sfx; ?>">
+<?php if ($list) : ?>
+	<ul>
+	<?php foreach ($list as $i => $item) : ?>
+		<li>
+			<?php if (($item->type_alias === 'com_users.category') || ($item->type_alias === 'com_banners.category')) : ?>
+				<?php if (!empty($item->core_title)) : ?>
+					<?php echo htmlspecialchars($item->core_title, ENT_COMPAT, 'UTF-8'); ?>
+				<?php endif; ?>
+			<?php else : ?>
+				<a href="<?php echo JRoute::_($item->link); ?>">
+					<?php if (!empty($item->core_title)) : ?>
+						<?php echo htmlspecialchars($item->core_title, ENT_COMPAT, 'UTF-8'); ?>
+					<?php endif; ?>
+				</a>
+			<?php endif; ?>
+		</li>
+	<?php endforeach; ?>
+	</ul>
+<?php else : ?>
+	<span><?php echo JText::_('MOD_TAGS_SIMILAR_NO_MATCHING_TAGS'); ?></span>
+<?php endif; ?>
+</div>
diff --git a/core/modules/mod_users_latest/helper.php b/core/modules/mod_users_latest/helper.php
new file mode 100644
index 00000000..144ff78e
--- /dev/null
+++ b/core/modules/mod_users_latest/helper.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_users_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_users_latest
+ *
+ * @since  1.6
+ */
+class ModUsersLatestHelper
+{
+	/**
+	 * Get users sorted by activation date
+	 *
+	 * @param   \Joomla\Registry\Registry  $params  module parameters
+	 *
+	 * @return  array  The array of users
+	 *
+	 * @since   1.6
+	 */
+	public static function getUsers($params)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('a.id', 'a.name', 'a.username', 'a.registerDate')))
+			->order($db->quoteName('a.registerDate') . ' DESC')
+			->from('#__users AS a');
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('core.admin') && $params->get('filter_groups', 0) == 1)
+		{
+			$groups = $user->getAuthorisedGroups();
+
+			if (empty($groups))
+			{
+				return array();
+			}
+
+			$query->join('LEFT', '#__user_usergroup_map AS m ON m.user_id = a.id')
+				->join('LEFT', '#__usergroups AS ug ON ug.id = m.group_id')
+				->where('ug.id in (' . implode(',', $groups) . ')')
+				->where('ug.id <> 1');
+		}
+
+		$db->setQuery($query, 0, $params->get('shownumber', 5));
+
+		try
+		{
+			return (array) $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+			return array();
+		}
+	}
+}
diff --git a/core/modules/mod_users_latest/mod_users_latest.php b/core/modules/mod_users_latest/mod_users_latest.php
new file mode 100644
index 00000000..0a3848a8
--- /dev/null
+++ b/core/modules/mod_users_latest/mod_users_latest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_users_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the latest functions only once
+JLoader::register('ModUsersLatestHelper', __DIR__ . '/helper.php');
+
+$shownumber      = $params->get('shownumber', 5);
+$names           = ModUsersLatestHelper::getUsers($params);
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_users_latest', $params->get('layout', 'default'));
diff --git a/core/modules/mod_users_latest/mod_users_latest.xml b/core/modules/mod_users_latest/mod_users_latest.xml
new file mode 100644
index 00000000..2304a834
--- /dev/null
+++ b/core/modules/mod_users_latest/mod_users_latest.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_users_latest</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2009</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_USERS_LATEST_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_users_latest">mod_users_latest.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_users_latest.ini</language>
+		<language tag="en-GB">en-GB.mod_users_latest.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_LATEST_USERS" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="shownumber"
+					type="number"
+					label="MOD_USERS_LATEST_FIELD_NUMBER_LABEL"
+					description="MOD_USERS_LATEST_FIELD_NUMBER_DESC"
+					default="5"
+					filter="integer"
+				/>
+
+				<field
+					name="filter_groups"
+					type="radio"
+					label="MOD_USERS_LATEST_FIELD_FILTER_GROUPS_LABEL"
+					description="MOD_USERS_LATEST_FIELD_FILTER_GROUPS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_users_latest/tmpl/default.php b/core/modules/mod_users_latest/tmpl/default.php
new file mode 100644
index 00000000..ef870139
--- /dev/null
+++ b/core/modules/mod_users_latest/tmpl/default.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_users_latest
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (!empty($names)) : ?>
+	<ul class="latestusers<?php echo $moduleclass_sfx; ?>" >
+	<?php foreach ($names as $name) : ?>
+		<li>
+			<?php echo $name->username; ?>
+		</li>
+	<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
diff --git a/core/modules/mod_whosonline/helper.php b/core/modules/mod_whosonline/helper.php
new file mode 100644
index 00000000..8dd0367c
--- /dev/null
+++ b/core/modules/mod_whosonline/helper.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_whosonline
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_whosonline
+ *
+ * @since  1.5
+ */
+class ModWhosonlineHelper
+{
+	/**
+	 * Show online count
+	 *
+	 * @return  array  The number of Users and Guests online.
+	 *
+	 * @since   1.5
+	 **/
+	public static function getOnlineCount()
+	{
+		$db = JFactory::getDbo();
+
+		// Calculate number of guests and users
+		$result	     = array();
+		$user_array  = 0;
+		$guest_array = 0;
+
+		$whereCondition = JFactory::getConfig()->get('shared_session', '0') ? 'IS NULL' : '= 0';
+
+		$query = $db->getQuery(true)
+			->select('guest, client_id')
+			->from('#__session')
+			->where('client_id ' . $whereCondition);
+		$db->setQuery($query);
+
+		try
+		{
+			$sessions = (array) $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			// Don't worry be happy
+			$sessions = array();
+		}
+
+		if (count($sessions))
+		{
+			foreach ($sessions as $session)
+			{
+				// If guest increase guest count by 1
+				if ($session->guest == 1)
+				{
+					$guest_array ++;
+				}
+
+				// If member increase member count by 1
+				if ($session->guest == 0)
+				{
+					$user_array ++;
+				}
+			}
+		}
+
+		$result['user']  = $user_array;
+		$result['guest'] = $guest_array;
+
+		return $result;
+	}
+
+	/**
+	 * Show online member names
+	 *
+	 * @param   mixed  $params  The parameters
+	 *
+	 * @return  array   (array) $db->loadObjectList()  The names of the online users.
+	 *
+	 * @since   1.5
+	 **/
+	public static function getOnlineUserNames($params)
+	{
+		$whereCondition = JFactory::getConfig()->get('shared_session', '0') ? 'IS NULL' : '= 0';
+
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('a.username', 'a.userid', 'a.client_id')))
+			->from('#__session AS a')
+			->where($db->quoteName('a.userid') . ' != 0')
+			->where($db->quoteName('a.client_id') . ' ' . $whereCondition)
+			->group($db->quoteName(array('a.username', 'a.userid', 'a.client_id')));
+
+		$user = JFactory::getUser();
+
+		if (!$user->authorise('core.admin') && $params->get('filter_groups', 0) == 1)
+		{
+			$groups = $user->getAuthorisedGroups();
+
+			if (empty($groups))
+			{
+				return array();
+			}
+
+			$query->join('LEFT', '#__user_usergroup_map AS m ON m.user_id = a.userid')
+				->join('LEFT', '#__usergroups AS ug ON ug.id = m.group_id')
+				->where('ug.id in (' . implode(',', $groups) . ')')
+				->where('ug.id <> 1');
+		}
+
+		$db->setQuery($query);
+
+		try
+		{
+			return (array) $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			return array();
+		}
+	}
+}
diff --git a/core/modules/mod_whosonline/mod_whosonline.php b/core/modules/mod_whosonline/mod_whosonline.php
new file mode 100644
index 00000000..be61cf43
--- /dev/null
+++ b/core/modules/mod_whosonline/mod_whosonline.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_whosonline
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the whosonline functions only once
+JLoader::register('ModWhosonlineHelper', __DIR__ . '/helper.php');
+
+$showmode = $params->get('showmode', 0);
+
+if ($showmode == 0 || $showmode == 2)
+{
+	$count = ModWhosonlineHelper::getOnlineCount();
+}
+
+if ($showmode > 0)
+{
+	$names = ModWhosonlineHelper::getOnlineUserNames($params);
+}
+
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+
+require JModuleHelper::getLayoutPath('mod_whosonline', $params->get('layout', 'default'));
diff --git a/core/modules/mod_whosonline/mod_whosonline.xml b/core/modules/mod_whosonline/mod_whosonline.xml
new file mode 100644
index 00000000..fb68c441
--- /dev/null
+++ b/core/modules/mod_whosonline/mod_whosonline.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_whosonline</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_WHOSONLINE_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_whosonline">mod_whosonline.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_whosonline.ini</language>
+		<language tag="en-GB">en-GB.mod_whosonline.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_WHO_ONLINE" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="showmode"
+					type="list"
+					label="MOD_WHOSONLINE_SHOWMODE_LABEL"
+					description="MOD_WHOSONLINE_SHOWMODE_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">MOD_WHOSONLINE_FIELD_VALUE_NUMBER</option>
+					<option value="1">MOD_WHOSONLINE_FIELD_VALUE_NAMES</option>
+					<option value="2">MOD_WHOSONLINE_FIELD_VALUE_BOTH</option>
+				</field>
+
+				<field
+					name="filter_groups"
+					type="radio"
+					label="MOD_WHOSONLINE_FIELD_FILTER_GROUPS_LABEL"
+					description="MOD_WHOSONLINE_FIELD_FILTER_GROUPS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_whosonline/tmpl/default.php b/core/modules/mod_whosonline/tmpl/default.php
new file mode 100644
index 00000000..c2756b41
--- /dev/null
+++ b/core/modules/mod_whosonline/tmpl/default.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_whosonline
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<?php if ($showmode == 0 || $showmode == 2) : ?>
+	<?php $guest = JText::plural('MOD_WHOSONLINE_GUESTS', $count['guest']); ?>
+	<?php $member = JText::plural('MOD_WHOSONLINE_MEMBERS', $count['user']); ?>
+	<p><?php echo JText::sprintf('MOD_WHOSONLINE_WE_HAVE', $guest, $member); ?></p>
+<?php endif; ?>
+
+<?php if (($showmode > 0) && count($names)) : ?>
+	<?php if ($params->get('filter_groups', 0)) : ?>
+		<p><?php echo JText::_('MOD_WHOSONLINE_SAME_GROUP_MESSAGE'); ?></p>
+	<?php endif; ?>
+	<ul class="whosonline<?php echo $moduleclass_sfx; ?>">
+	<?php foreach ($names as $name) : ?>
+		<li>
+			<?php echo $name->username; ?>
+		</li>
+	<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/core/modules/mod_wrapper/helper.php b/core/modules/mod_wrapper/helper.php
new file mode 100644
index 00000000..2c0582a0
--- /dev/null
+++ b/core/modules/mod_wrapper/helper.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Helper for mod_wrapper
+ *
+ * @since  1.5
+ */
+class ModWrapperHelper
+{
+	/**
+	 * Gets the parameters for the wrapper
+	 *
+	 * @param   mixed  &$params  The parameters set in the administrator section
+	 *
+	 * @return  mixed  &params  The modified parameters
+	 *
+	 * @since   1.5
+	 */
+	public static function getParams(&$params)
+	{
+		$params->def('url', '');
+		$params->def('scrolling', 'auto');
+		$params->def('height', '200');
+		$params->def('height_auto', 0);
+		$params->def('width', '100%');
+		$params->def('add', 1);
+		$params->def('name', 'wrapper');
+
+		$url = $params->get('url');
+
+		if ($params->get('add'))
+		{
+			// Adds 'http://' if none is set
+			if (strpos($url, '/') === 0)
+			{
+				// Relative URL in component. use server http_host.
+				$url = 'http://' . $_SERVER['HTTP_HOST'] . $url;
+			}
+			elseif (strpos($url, 'http') === false && strpos($url, 'https') === false)
+			{
+				$url = 'http://' . $url;
+			}
+		}
+
+		// Auto height control
+		if ($params->def('height_auto'))
+		{
+			$load = 'onload="iFrameHeight(this)"';
+		}
+		else
+		{
+			$load = '';
+		}
+
+		$params->set('load', $load);
+		$params->set('url', $url);
+
+		return $params;
+	}
+}
diff --git a/core/modules/mod_wrapper/mod_wrapper.php b/core/modules/mod_wrapper/mod_wrapper.php
new file mode 100644
index 00000000..5caea945
--- /dev/null
+++ b/core/modules/mod_wrapper/mod_wrapper.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the wrapper functions only once
+JLoader::register('ModWrapperHelper', __DIR__ . '/helper.php');
+
+$params = ModWrapperHelper::getParams($params);
+
+$load            = $params->get('load');
+$url             = htmlspecialchars($params->get('url'), ENT_COMPAT, 'UTF-8');
+$target          = htmlspecialchars($params->get('target'), ENT_COMPAT, 'UTF-8');
+$width           = htmlspecialchars($params->get('width'), ENT_COMPAT, 'UTF-8');
+$height          = htmlspecialchars($params->get('height'), ENT_COMPAT, 'UTF-8');
+$scroll          = htmlspecialchars($params->get('scrolling'), ENT_COMPAT, 'UTF-8');
+$moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
+$frameborder     = htmlspecialchars($params->get('frameborder'), ENT_COMPAT, 'UTF-8');
+$ititle          = $module->title;
+$id              = $module->id;
+
+require JModuleHelper::getLayoutPath('mod_wrapper', $params->get('layout', 'default'));
diff --git a/core/modules/mod_wrapper/mod_wrapper.xml b/core/modules/mod_wrapper/mod_wrapper.xml
new file mode 100644
index 00000000..4cf27f72
--- /dev/null
+++ b/core/modules/mod_wrapper/mod_wrapper.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="module" version="3.1" client="site" method="upgrade">
+	<name>mod_wrapper</name>
+	<author>Joomla! Project</author>
+	<creationDate>October 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>MOD_WRAPPER_XML_DESCRIPTION</description>
+	<files>
+		<filename module="mod_wrapper">mod_wrapper.php</filename>
+		<folder>tmpl</folder>
+		<filename>helper.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.mod_wrapper.ini</language>
+		<language tag="en-GB">en-GB.mod_wrapper.sys.ini</language>
+	</languages>
+	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_WRAPPER" />
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="url"
+					type="text"
+					label="MOD_WRAPPER_FIELD_URL_LABEL"
+					description="MOD_WRAPPER_FIELD_URL_DESC"
+					size="30"
+					required="true"
+				/>
+
+				<field
+					name="add"
+					type="radio"
+					label="MOD_WRAPPER_FIELD_ADD_LABEL"
+					description="MOD_WRAPPER_FIELD_ADD_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="scrolling"
+					type="list"
+					label="MOD_WRAPPER_FIELD_SCROLL_LABEL"
+					description="MOD_WRAPPER_FIELD_SCROLL_DESC"
+					default="auto"
+					>
+					<option value="auto">MOD_WRAPPER_FIELD_VALUE_AUTO</option>
+					<option value="no">JNO</option>
+					<option value="yes">JYES</option>
+				</field>
+
+				<field
+					name="width"
+					type="text"
+					label="MOD_WRAPPER_FIELD_WIDTH_LABEL"
+					description="MOD_WRAPPER_FIELD_WIDTH_DESC"
+					size="5"
+					default="100%"
+				/>
+
+				<field
+					name="height"
+					type="text"
+					label="MOD_WRAPPER_FIELD_HEIGHT_LABEL"
+					description="MOD_WRAPPER_FIELD_HEIGHT_DESC"
+					size="5"
+					default="200"
+				/>
+
+				<field
+					name="height_auto"
+					type="radio"
+					label="MOD_WRAPPER_FIELD_AUTOHEIGHT_LABEL"
+					description="MOD_WRAPPER_FIELD_AUTOHEIGHT_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="frameborder"
+					type="radio"
+					label="MOD_WRAPPER_FIELD_FRAME_LABEL"
+					description="MOD_WRAPPER_FIELD_FRAME_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="target"
+					type="text"
+					label="MOD_WRAPPER_FIELD_TARGET_LABEL"
+					description="MOD_WRAPPER_FIELD_TARGET_DESC"
+					size="30"
+				/>
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="layout"
+					type="modulelayout"
+					label="JFIELD_ALT_LAYOUT_LABEL"
+					description="JFIELD_ALT_MODULE_LAYOUT_DESC"
+				/>
+
+				<field
+					name="moduleclass_sfx"
+					type="textarea"
+					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
+					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
+				/>
+
+				<field
+					name="cache"
+					type="list"
+					label="COM_MODULES_FIELD_CACHING_LABEL"
+					description="COM_MODULES_FIELD_CACHING_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
+				</field>
+
+				<field
+					name="cache_time"
+					type="number"
+					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
+					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
+					filter="integer"
+				/>
+
+				<field
+					name="cachemode"
+					type="hidden"
+					default="static"
+					>
+					<option value="static"></option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/modules/mod_wrapper/tmpl/default.php b/core/modules/mod_wrapper/tmpl/default.php
new file mode 100644
index 00000000..045e3fb2
--- /dev/null
+++ b/core/modules/mod_wrapper/tmpl/default.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_wrapper
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('script', 'com_wrapper/iframe-height.min.js', array('version' => 'auto', 'relative' => true));
+?>
+<iframe <?php echo $load; ?>
+	id="blockrandom-<?php echo $id; ?>"
+	name="<?php echo $target; ?>"
+	src="<?php echo $url; ?>"
+	width="<?php echo $width; ?>"
+	height="<?php echo $height; ?>"
+	scrolling="<?php echo $scroll; ?>"
+	frameborder="<?php echo $frameborder; ?>"
+	title="<?php echo $ititle; ?>"
+	class="wrapper<?php echo $moduleclass_sfx; ?>" >
+	<?php echo JText::_('MOD_WRAPPER_NO_IFRAMES'); ?>
+</iframe>
diff --git a/core/plugins/authentication/cookie/cookie.php b/core/plugins/authentication/cookie/cookie.php
new file mode 100644
index 00000000..9a2effc8
--- /dev/null
+++ b/core/plugins/authentication/cookie/cookie.php
@@ -0,0 +1,405 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Authentication.cookie
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla Authentication plugin
+ *
+ * @since  3.2
+ * @note   Code based on http://jaspan.com/improved_persistent_login_cookie_best_practice
+ *         and http://fishbowl.pastiche.org/2004/01/19/persistent_login_cookie_best_practice/
+ */
+class PlgAuthenticationCookie extends JPlugin
+{
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.2
+	 */
+	protected $db;
+
+	/**
+	 * This method should handle any authentication and report back to the subject
+	 *
+	 * @param   array   $credentials  Array holding the user credentials
+	 * @param   array   $options      Array of extra options
+	 * @param   object  &$response    Authentication response object
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	public function onUserAuthenticate($credentials, $options, &$response)
+	{
+		// No remember me for admin
+		if ($this->app->isClient('administrator'))
+		{
+			return false;
+		}
+
+		// Get cookie
+		$cookieName  = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
+		$cookieValue = $this->app->input->cookie->get($cookieName);
+
+		// Try with old cookieName (pre 3.6.0) if not found
+		if (!$cookieValue)
+		{
+			$cookieName  = JUserHelper::getShortHashedUserAgent();
+			$cookieValue = $this->app->input->cookie->get($cookieName);
+		}
+
+		if (!$cookieValue)
+		{
+			return false;
+		}
+
+		$cookieArray = explode('.', $cookieValue);
+
+		// Check for valid cookie value
+		if (count($cookieArray) !== 2)
+		{
+			// Destroy the cookie in the browser.
+			$this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+			JLog::add('Invalid cookie detected.', JLog::WARNING, 'error');
+
+			return false;
+		}
+
+		$response->type = 'Cookie';
+
+		// Filter series since we're going to use it in the query
+		$filter = new JFilterInput;
+		$series = $filter->clean($cookieArray[1], 'ALNUM');
+
+		// Remove expired tokens
+		$query = $this->db->getQuery(true)
+			->delete('#__user_keys')
+			->where($this->db->quoteName('time') . ' < ' . $this->db->quote(time()));
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			// We aren't concerned with errors from this query, carry on
+		}
+
+		// Find the matching record if it exists.
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName(array('user_id', 'token', 'series', 'time')))
+			->from($this->db->quoteName('#__user_keys'))
+			->where($this->db->quoteName('series') . ' = ' . $this->db->quote($series))
+			->where($this->db->quoteName('uastring') . ' = ' . $this->db->quote($cookieName))
+			->order($this->db->quoteName('time') . ' DESC');
+
+		try
+		{
+			$results = $this->db->setQuery($query)->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$response->status = JAuthentication::STATUS_FAILURE;
+
+			return false;
+		}
+
+		if (count($results) !== 1)
+		{
+			// Destroy the cookie in the browser.
+			$this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+			$response->status = JAuthentication::STATUS_FAILURE;
+
+			return false;
+		}
+
+		// We have a user with one cookie with a valid series and a corresponding record in the database.
+		if (!JUserHelper::verifyPassword($cookieArray[0], $results[0]->token))
+		{
+			/*
+			 * This is a real attack!
+			 * Either the series was guessed correctly or a cookie was stolen and used twice (once by attacker and once by victim).
+			 * Delete all tokens for this user!
+			 */
+			$query = $this->db->getQuery(true)
+				->delete('#__user_keys')
+				->where($this->db->quoteName('user_id') . ' = ' . $this->db->quote($results[0]->user_id));
+
+			try
+			{
+				$this->db->setQuery($query)->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				// Log an alert for the site admin
+				JLog::add(
+					sprintf('Failed to delete cookie token for user %s with the following error: %s', $results[0]->user_id, $e->getMessage()),
+					JLog::WARNING,
+					'security'
+				);
+			}
+
+			// Destroy the cookie in the browser.
+			$this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+
+			// Issue warning by email to user and/or admin?
+			JLog::add(JText::sprintf('PLG_AUTH_COOKIE_ERROR_LOG_LOGIN_FAILED', $results[0]->user_id), JLog::WARNING, 'security');
+			$response->status = JAuthentication::STATUS_FAILURE;
+
+			return false;
+		}
+
+		// Make sure there really is a user with this name and get the data for the session.
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName(array('id', 'username', 'password')))
+			->from($this->db->quoteName('#__users'))
+			->where($this->db->quoteName('username') . ' = ' . $this->db->quote($results[0]->user_id))
+			->where($this->db->quoteName('requireReset') . ' = 0');
+
+		try
+		{
+			$result = $this->db->setQuery($query)->loadObject();
+		}
+		catch (RuntimeException $e)
+		{
+			$response->status = JAuthentication::STATUS_FAILURE;
+
+			return false;
+		}
+
+		if ($result)
+		{
+			// Bring this in line with the rest of the system
+			$user = JUser::getInstance($result->id);
+
+			// Set response data.
+			$response->username = $result->username;
+			$response->email    = $user->email;
+			$response->fullname = $user->name;
+			$response->password = $result->password;
+			$response->language = $user->getParam('language');
+
+			// Set response status.
+			$response->status        = JAuthentication::STATUS_SUCCESS;
+			$response->error_message = '';
+		}
+		else
+		{
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::_('JGLOBAL_AUTH_NO_USER');
+		}
+	}
+
+	/**
+	 * We set the authentication cookie only after login is successfullly finished.
+	 * We set a new cookie either for a user with no cookies or one
+	 * where the user used a cookie to authenticate.
+	 *
+	 * @param   array  $options  Array holding options
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 */
+	public function onUserAfterLogin($options)
+	{
+		// No remember me for admin
+		if ($this->app->isClient('administrator'))
+		{
+			return false;
+		}
+
+		if (isset($options['responseType']) && $options['responseType'] === 'Cookie')
+		{
+			// Logged in using a cookie
+			$cookieName = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
+
+			// We need the old data to get the existing series
+			$cookieValue = $this->app->input->cookie->get($cookieName);
+
+			// Try with old cookieName (pre 3.6.0) if not found
+			if (!$cookieValue)
+			{
+				$oldCookieName = JUserHelper::getShortHashedUserAgent();
+				$cookieValue   = $this->app->input->cookie->get($oldCookieName);
+
+				// Destroy the old cookie in the browser
+				$this->app->input->cookie->set($oldCookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+			}
+
+			$cookieArray = explode('.', $cookieValue);
+
+			// Filter series since we're going to use it in the query
+			$filter = new JFilterInput;
+			$series = $filter->clean($cookieArray[1], 'ALNUM');
+		}
+		elseif (!empty($options['remember']))
+		{
+			// Remember checkbox is set
+			$cookieName = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
+
+			// Create a unique series which will be used over the lifespan of the cookie
+			$unique     = false;
+			$errorCount = 0;
+
+			do
+			{
+				$series = JUserHelper::genRandomPassword(20);
+				$query  = $this->db->getQuery(true)
+					->select($this->db->quoteName('series'))
+					->from($this->db->quoteName('#__user_keys'))
+					->where($this->db->quoteName('series') . ' = ' . $this->db->quote($series));
+
+				try
+				{
+					$results = $this->db->setQuery($query)->loadResult();
+
+					if ($results === null)
+					{
+						$unique = true;
+					}
+				}
+				catch (RuntimeException $e)
+				{
+					$errorCount++;
+
+					// We'll let this query fail up to 5 times before giving up, there's probably a bigger issue at this point
+					if ($errorCount === 5)
+					{
+						return false;
+					}
+				}
+			}
+
+			while ($unique === false);
+		}
+		else
+		{
+			return false;
+		}
+
+		// Get the parameter values
+		$lifetime = $this->params->get('cookie_lifetime', 60) * 24 * 60 * 60;
+		$length   = $this->params->get('key_length', 16);
+
+		// Generate new cookie
+		$token       = JUserHelper::genRandomPassword($length);
+		$cookieValue = $token . '.' . $series;
+
+		// Overwrite existing cookie with new value
+		$this->app->input->cookie->set(
+			$cookieName,
+			$cookieValue,
+			time() + $lifetime,
+			$this->app->get('cookie_path', '/'),
+			$this->app->get('cookie_domain', ''),
+			$this->app->isHttpsForced(),
+			true
+		);
+
+		$query = $this->db->getQuery(true);
+
+		if (!empty($options['remember']))
+		{
+			// Create new record
+			$query
+				->insert($this->db->quoteName('#__user_keys'))
+				->set($this->db->quoteName('user_id') . ' = ' . $this->db->quote($options['user']->username))
+				->set($this->db->quoteName('series') . ' = ' . $this->db->quote($series))
+				->set($this->db->quoteName('uastring') . ' = ' . $this->db->quote($cookieName))
+				->set($this->db->quoteName('time') . ' = ' . (time() + $lifetime));
+		}
+		else
+		{
+			// Update existing record with new token
+			$query
+				->update($this->db->quoteName('#__user_keys'))
+				->where($this->db->quoteName('user_id') . ' = ' . $this->db->quote($options['user']->username))
+				->where($this->db->quoteName('series') . ' = ' . $this->db->quote($series))
+				->where($this->db->quoteName('uastring') . ' = ' . $this->db->quote($cookieName));
+		}
+
+		$hashedToken = JUserHelper::hashPassword($token);
+
+		$query->set($this->db->quoteName('token') . ' = ' . $this->db->quote($hashedToken));
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This is where we delete any authentication cookie when a user logs out
+	 *
+	 * @param   array  $options  Array holding options (length, timeToExpiration)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   3.2
+	 */
+	public function onUserAfterLogout($options)
+	{
+		// No remember me for admin
+		if ($this->app->isClient('administrator'))
+		{
+			return false;
+		}
+
+		$cookieName  = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
+		$cookieValue = $this->app->input->cookie->get($cookieName);
+
+		// There are no cookies to delete.
+		if (!$cookieValue)
+		{
+			return true;
+		}
+
+		$cookieArray = explode('.', $cookieValue);
+
+		// Filter series since we're going to use it in the query
+		$filter = new JFilterInput;
+		$series = $filter->clean($cookieArray[1], 'ALNUM');
+
+		// Remove the record from the database
+		$query = $this->db->getQuery(true)
+			->delete('#__user_keys')
+			->where($this->db->quoteName('series') . ' = ' . $this->db->quote($series));
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			// We aren't concerned with errors from this query, carry on
+		}
+
+		// Destroy the cookie
+		$this->app->input->cookie->set($cookieName, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+
+		return true;
+	}
+}
diff --git a/core/plugins/authentication/cookie/cookie.xml b/core/plugins/authentication/cookie/cookie.xml
new file mode 100644
index 00000000..f6a50bee
--- /dev/null
+++ b/core/plugins/authentication/cookie/cookie.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.2" type="plugin" group="authentication" method="upgrade">
+	<name>plg_authentication_cookie</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2013</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_AUTH_COOKIE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="cookie">cookie.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_authentication_cookie.ini</language>
+		<language tag="en-GB">en-GB.plg_authentication_cookie.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="cookie_lifetime"
+					type="number"
+					label="PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_LABEL"
+					description="PLG_AUTH_COOKIE_FIELD_COOKIE_LIFETIME_DESC"
+					default="60"
+					filter="integer"
+					required="true"
+				/>
+
+				<field
+					name="key_length"
+					type="list"
+					label="PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_LABEL"
+					description="PLG_AUTH_COOKIE_FIELD_KEY_LENGTH_DESC"
+					default="16"
+					filter="integer"
+					required="true"
+					>
+					<option value="8">8</option>
+					<option value="16">16</option>
+					<option value="32">32</option>
+					<option value="64">64</option>
+				</field>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/authentication/gmail/gmail.php b/core/plugins/authentication/gmail/gmail.php
new file mode 100644
index 00000000..15154e98
--- /dev/null
+++ b/core/plugins/authentication/gmail/gmail.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Authentication.gmail
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Authentication\AuthenticationResponse;
+use Joomla\Registry\Registry;
+
+/**
+ * GMail Authentication Plugin
+ *
+ * @since  1.5
+ */
+class PlgAuthenticationGMail extends JPlugin
+{
+	/**
+	 * This method should handle any authentication and report back to the subject
+	 *
+	 * @param   array                   $credentials  Array holding the user credentials
+	 * @param   array                   $options      Array of extra options
+	 * @param   AuthenticationResponse  &$response    Authentication response object
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function onUserAuthenticate($credentials, $options, &$response)
+	{
+		// Load plugin language
+		$this->loadLanguage();
+
+		// No backend authentication
+		if (JFactory::getApplication()->isClient('administrator') && !$this->params->get('backendLogin', 0))
+		{
+			return;
+		}
+
+		$success = false;
+
+		$curlParams = array(
+			'follow_location' => true,
+			'transport.curl'  => array(
+				CURLOPT_SSL_VERIFYPEER => $this->params->get('verifypeer', 1)
+			),
+		);
+
+		$transportParams = new Registry($curlParams);
+
+		try
+		{
+			$http = JHttpFactory::getHttp($transportParams, 'curl');
+		}
+		catch (RuntimeException $e)
+		{
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->type          = 'GMail';
+			$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', JText::_('JGLOBAL_AUTH_CURL_NOT_INSTALLED'));
+
+			return;
+		}
+
+		// Check if we have a username and password
+		if ($credentials['username'] === '' || $credentials['password'] === '')
+		{
+			$response->type          = 'GMail';
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', JText::_('JGLOBAL_AUTH_USER_BLACKLISTED'));
+
+			return;
+		}
+
+		$blacklist = explode(',', $this->params->get('user_blacklist', ''));
+
+		// Check if the username isn't blacklisted
+		if (in_array($credentials['username'], $blacklist))
+		{
+			$response->type          = 'GMail';
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', JText::_('JGLOBAL_AUTH_USER_BLACKLISTED'));
+
+			return;
+		}
+
+		$suffix      = $this->params->get('suffix', '');
+		$applysuffix = $this->params->get('applysuffix', 0);
+		$offset      = strpos($credentials['username'], '@');
+
+		// Check if we want to do suffix stuff, typically for Google Apps for Your Domain
+		if ($suffix && $applysuffix)
+		{
+			if ($applysuffix == 1 && $offset === false)
+			{
+				// Apply suffix if missing
+				$credentials['username'] .= '@' . $suffix;
+			}
+			elseif ($applysuffix == 2)
+			{
+				// Always use suffix
+				if ($offset)
+				{
+					// If we already have an @, get rid of it and replace it
+					$credentials['username'] = substr($credentials['username'], 0, $offset);
+				}
+
+				$credentials['username'] .= '@' . $suffix;
+			}
+		}
+
+		$headers = array(
+			'Authorization' => 'Basic ' . base64_encode($credentials['username'] . ':' . $credentials['password'])
+		);
+
+		try
+		{
+			$result = $http->get('https://mail.google.com/mail/feed/atom', $headers);
+		}
+		catch (Exception $e)
+		{
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->type          = 'GMail';
+			$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', JText::_('JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED'));
+
+			return;
+		}
+
+		$code = $result->code;
+
+		switch ($code)
+		{
+			case 200 :
+				$message = JText::_('JGLOBAL_AUTH_ACCESS_GRANTED');
+				$success = true;
+				break;
+
+			case 401 :
+				$message = JText::_('JGLOBAL_AUTH_ACCESS_DENIED');
+				break;
+
+			default :
+				$message = JText::_('JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED');
+				break;
+		}
+
+		$response->type = 'GMail';
+
+		if (!$success)
+		{
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', $message);
+
+			return;
+		}
+
+		if (strpos($credentials['username'], '@') === false)
+		{
+			if ($suffix)
+			{
+				// If there is a suffix then we want to apply it
+				$email = $credentials['username'] . '@' . $suffix;
+			}
+			else
+			{
+				// If there isn't a suffix just use the default gmail one
+				$email = $credentials['username'] . '@gmail.com';
+			}
+		}
+		else
+		{
+			// The username looks like an email address (probably is) so use that
+			$email = $credentials['username'];
+		}
+
+		// Extra security checks with existing local accounts
+		$db                  = JFactory::getDbo();
+		$localUsernameChecks = array(strstr($email, '@', true), $email);
+
+		$query = $db->getQuery(true)
+			->select('id, activation, username, email, block')
+			->from('#__users')
+			->where('username IN(' . implode(',', array_map(array($db, 'quote'), $localUsernameChecks)) . ')'
+				. ' OR email = ' . $db->quote($email)
+			);
+
+		$db->setQuery($query);
+
+		if ($localUsers = $db->loadObjectList())
+		{
+			foreach ($localUsers as $localUser)
+			{
+				// Local user exists with same username but different email address
+				if ($email !== $localUser->email)
+				{
+					$response->status        = JAuthentication::STATUS_FAILURE;
+					$response->error_message = JText::sprintf('JGLOBAL_AUTH_FAILED', JText::_('PLG_GMAIL_ERROR_LOCAL_USERNAME_CONFLICT'));
+
+					return;
+				}
+				else
+				{
+					// Existing user disabled locally
+					if ($localUser->block || !empty($localUser->activation))
+					{
+						$response->status        = JAuthentication::STATUS_FAILURE;
+						$response->error_message = JText::_('JGLOBAL_AUTH_ACCESS_DENIED');
+
+						return;
+					}
+
+					// We will always keep the local username for existing accounts
+					$credentials['username'] = $localUser->username;
+
+					break;
+				}
+			}
+		}
+		elseif (JFactory::getApplication()->isClient('administrator'))
+		{
+			// We wont' allow backend access without local account
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::_('JERROR_LOGIN_DENIED');
+
+			return;
+		}
+
+		$response->status        = JAuthentication::STATUS_SUCCESS;
+		$response->error_message = '';
+		$response->email         = $email;
+
+		// Reset the username to what we ended up using
+		$response->username = $credentials['username'];
+		$response->fullname = $credentials['username'];
+	}
+}
diff --git a/core/plugins/authentication/gmail/gmail.xml b/core/plugins/authentication/gmail/gmail.xml
new file mode 100644
index 00000000..46e78ad4
--- /dev/null
+++ b/core/plugins/authentication/gmail/gmail.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="authentication" method="upgrade">
+	<name>plg_authentication_gmail</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_GMAIL_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="gmail">gmail.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_authentication_gmail.ini</language>
+		<language tag="en-GB">en-GB.plg_authentication_gmail.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="applysuffix"
+					type="list"
+					label="PLG_GMAIL_FIELD_APPLYSUFFIX_LABEL"
+					description="PLG_GMAIL_FIELD_APPLYSUFFIX_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">PLG_GMAIL_FIELD_VALUE_NOAPPLYSUFFIX</option>
+					<option value="1">PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXMISSING</option>
+					<option value="2">PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXALWAYS</option>
+				</field>
+
+				<field
+					name="suffix"
+					type="text"
+					label="PLG_GMAIL_FIELD_SUFFIX_LABEL"
+					description="PLG_GMAIL_FIELD_SUFFIX_DESC"
+					size="20"
+					showon="applysuffix:1,2"
+				/>
+
+				<field
+					name="verifypeer"
+					type="radio"
+					label="PLG_GMAIL_FIELD_VERIFYPEER_LABEL"
+					description="PLG_GMAIL_FIELD_VERIFYPEER_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="user_blacklist"
+					type="text"
+					label="PLG_GMAIL_FIELD_USER_BLACKLIST_LABEL"
+					description="PLG_GMAIL_FIELD_USER_BLACKLIST_DESC"
+					size="20"
+				/>
+
+				<field
+					name="backendLogin"
+					type="radio"
+					label="PLG_GMAIL_FIELD_BACKEND_LOGIN_LABEL"
+					description="PLG_GMAIL_FIELD_BACKEND_LOGIN_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JENABLED</option>
+					<option value="0">JDISABLED</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/authentication/joomla/joomla.php b/core/plugins/authentication/joomla/joomla.php
new file mode 100644
index 00000000..19970d01
--- /dev/null
+++ b/core/plugins/authentication/joomla/joomla.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Authentication.joomla
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla Authentication plugin
+ *
+ * @since  1.5
+ */
+class PlgAuthenticationJoomla extends JPlugin
+{
+	/**
+	 * This method should handle any authentication and report back to the subject
+	 *
+	 * @param   array   $credentials  Array holding the user credentials
+	 * @param   array   $options      Array of extra options
+	 * @param   object  &$response    Authentication response object
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function onUserAuthenticate($credentials, $options, &$response)
+	{
+		$response->type = 'Joomla';
+
+		// Joomla does not like blank passwords
+		if (empty($credentials['password']))
+		{
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::_('JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED');
+
+			return;
+		}
+
+		// Get a database object
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('id, password')
+			->from('#__users')
+			->where('username=' . $db->quote($credentials['username']));
+
+		$db->setQuery($query);
+		$result = $db->loadObject();
+
+		if ($result)
+		{
+			$match = JUserHelper::verifyPassword($credentials['password'], $result->password, $result->id);
+
+			if ($match === true)
+			{
+				// Bring this in line with the rest of the system
+				$user               = JUser::getInstance($result->id);
+				$response->email    = $user->email;
+				$response->fullname = $user->name;
+
+				if (JFactory::getApplication()->isClient('administrator'))
+				{
+					$response->language = $user->getParam('admin_language');
+				}
+				else
+				{
+					$response->language = $user->getParam('language');
+				}
+
+				$response->status        = JAuthentication::STATUS_SUCCESS;
+				$response->error_message = '';
+			}
+			else
+			{
+				// Invalid password
+				$response->status        = JAuthentication::STATUS_FAILURE;
+				$response->error_message = JText::_('JGLOBAL_AUTH_INVALID_PASS');
+			}
+		}
+		else
+		{
+			// Let's hash the entered password even if we don't have a matching user for some extra response time
+			// By doing so, we mitigate side channel user enumeration attacks
+			JUserHelper::hashPassword($credentials['password']);
+
+			// Invalid user
+			$response->status        = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::_('JGLOBAL_AUTH_NO_USER');
+		}
+
+		// Check the two factor authentication
+		if ($response->status === JAuthentication::STATUS_SUCCESS)
+		{
+			$methods = JAuthenticationHelper::getTwoFactorMethods();
+
+			if (count($methods) <= 1)
+			{
+				// No two factor authentication method is enabled
+				return;
+			}
+
+			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_users/models', 'UsersModel');
+
+			/** @var UsersModelUser $model */
+			$model = JModelLegacy::getInstance('User', 'UsersModel', array('ignore_request' => true));
+
+			// Load the user's OTP (one time password, a.k.a. two factor auth) configuration
+			if (!array_key_exists('otp_config', $options))
+			{
+				$otpConfig             = $model->getOtpConfig($result->id);
+				$options['otp_config'] = $otpConfig;
+			}
+			else
+			{
+				$otpConfig = $options['otp_config'];
+			}
+
+			// Check if the user has enabled two factor authentication
+			if (empty($otpConfig->method) || ($otpConfig->method === 'none'))
+			{
+				// Warn the user if they are using a secret code but they have not
+				// enabled two factor auth in their account.
+				if (!empty($credentials['secretkey']))
+				{
+					try
+					{
+						$app = JFactory::getApplication();
+
+						$this->loadLanguage();
+
+						$app->enqueueMessage(JText::_('PLG_AUTH_JOOMLA_ERR_SECRET_CODE_WITHOUT_TFA'), 'warning');
+					}
+					catch (Exception $exc)
+					{
+						// This happens when we are in CLI mode. In this case
+						// no warning is issued
+						return;
+					}
+				}
+
+				return;
+			}
+
+			// Try to validate the OTP
+			FOFPlatform::getInstance()->importPlugin('twofactorauth');
+
+			$otpAuthReplies = FOFPlatform::getInstance()->runPlugins('onUserTwofactorAuthenticate', array($credentials, $options));
+
+			$check = false;
+
+			/*
+			 * This looks like noob code but DO NOT TOUCH IT and do not convert
+			 * to in_array(). During testing in_array() inexplicably returned
+			 * null when the OTEP begins with a zero! o_O
+			 */
+			if (!empty($otpAuthReplies))
+			{
+				foreach ($otpAuthReplies as $authReply)
+				{
+					$check = $check || $authReply;
+				}
+			}
+
+			// Fall back to one time emergency passwords
+			if (!$check)
+			{
+				// Did the user use an OTEP instead?
+				if (empty($otpConfig->otep))
+				{
+					if (empty($otpConfig->method) || ($otpConfig->method === 'none'))
+					{
+						// Two factor authentication is not enabled on this account.
+						// Any string is assumed to be a valid OTEP.
+
+						return;
+					}
+					else
+					{
+						/*
+						 * Two factor authentication enabled and no OTEPs defined. The
+						 * user has used them all up. Therefore anything they enter is
+						 * an invalid OTEP.
+						 */
+						$response->status        = JAuthentication::STATUS_FAILURE;
+						$response->error_message = JText::_('JGLOBAL_AUTH_INVALID_SECRETKEY');
+
+						return;
+					}
+				}
+
+				// Clean up the OTEP (remove dashes, spaces and other funny stuff
+				// our beloved users may have unwittingly stuffed in it)
+				$otep  = $credentials['secretkey'];
+				$otep  = filter_var($otep, FILTER_SANITIZE_NUMBER_INT);
+				$otep  = str_replace('-', '', $otep);
+				$check = false;
+
+				// Did we find a valid OTEP?
+				if (in_array($otep, $otpConfig->otep))
+				{
+					// Remove the OTEP from the array
+					$otpConfig->otep = array_diff($otpConfig->otep, array($otep));
+
+					$model->setOtpConfig($result->id, $otpConfig);
+
+					// Return true; the OTEP was a valid one
+					$check = true;
+				}
+			}
+
+			if (!$check)
+			{
+				$response->status        = JAuthentication::STATUS_FAILURE;
+				$response->error_message = JText::_('JGLOBAL_AUTH_INVALID_SECRETKEY');
+			}
+		}
+	}
+}
diff --git a/core/plugins/authentication/joomla/joomla.xml b/core/plugins/authentication/joomla/joomla.xml
new file mode 100644
index 00000000..da4b7ad0
--- /dev/null
+++ b/core/plugins/authentication/joomla/joomla.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="authentication" method="upgrade">
+	<name>plg_authentication_joomla</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_AUTH_JOOMLA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="joomla">joomla.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_authentication_joomla.ini</language>
+		<language tag="en-GB">en-GB.plg_authentication_joomla.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/authentication/ldap/ldap.php b/core/plugins/authentication/ldap/ldap.php
new file mode 100644
index 00000000..fed64b70
--- /dev/null
+++ b/core/plugins/authentication/ldap/ldap.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Authentication.ldap
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Ldap\LdapClient;
+
+/**
+ * LDAP Authentication Plugin
+ *
+ * @since  1.5
+ */
+class PlgAuthenticationLdap extends JPlugin
+{
+	/**
+	 * This method should handle any authentication and report back to the subject
+	 *
+	 * @param   array   $credentials  Array holding the user credentials
+	 * @param   array   $options      Array of extra options
+	 * @param   object  &$response    Authentication response object
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.5
+	 */
+	public function onUserAuthenticate($credentials, $options, &$response)
+	{
+		$userdetails = null;
+		$success = 0;
+		$userdetails = array();
+
+		// For JLog
+		$response->type = 'LDAP';
+
+		// Strip null bytes from the password
+		$credentials['password'] = str_replace(chr(0), '', $credentials['password']);
+
+		// LDAP does not like Blank passwords (tries to Anon Bind which is bad)
+		if (empty($credentials['password']))
+		{
+			$response->status = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::_('JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED');
+
+			return false;
+		}
+
+		// Load plugin params info
+		$ldap_email    = $this->params->get('ldap_email');
+		$ldap_fullname = $this->params->get('ldap_fullname');
+		$ldap_uid      = $this->params->get('ldap_uid');
+		$auth_method   = $this->params->get('auth_method');
+
+		$ldap = new LdapClient($this->params);
+
+		if (!$ldap->connect())
+		{
+			$response->status = JAuthentication::STATUS_FAILURE;
+			$response->error_message = JText::_('JGLOBAL_AUTH_NOT_CONNECT');
+
+			return;
+		}
+
+		switch ($auth_method)
+		{
+			case 'search':
+			{
+				// Bind using Connect Username/password
+				// Force anon bind to mitigate misconfiguration like [#7119]
+				if ($this->params->get('username', '') !== '')
+				{
+					$bindtest = $ldap->bind();
+				}
+				else
+				{
+					$bindtest = $ldap->anonymous_bind();
+				}
+
+				if ($bindtest)
+				{
+					// Search for users DN
+					$binddata = $this->searchByString(
+						str_replace(
+							'[search]',
+							str_replace(';', '\3b', $ldap->escape($credentials['username'], null, LDAP_ESCAPE_FILTER)),
+							$this->params->get('search_string')
+						),
+						$ldap
+					);
+
+					if (isset($binddata[0], $binddata[0]['dn']))
+					{
+						// Verify Users Credentials
+						$success = $ldap->bind($binddata[0]['dn'], $credentials['password'], 1);
+
+						// Get users details
+						$userdetails = $binddata;
+					}
+					else
+					{
+						$response->status = JAuthentication::STATUS_FAILURE;
+						$response->error_message = JText::_('JGLOBAL_AUTH_NO_USER');
+					}
+				}
+				else
+				{
+					$response->status = JAuthentication::STATUS_FAILURE;
+					$response->error_message = JText::_('JGLOBAL_AUTH_NOT_CONNECT');
+				}
+			}	break;
+
+			case 'bind':
+			{
+				// We just accept the result here
+				$success = $ldap->bind($ldap->escape($credentials['username'], null, LDAP_ESCAPE_DN), $credentials['password']);
+
+				if ($success)
+				{
+					$userdetails = $this->searchByString(
+						str_replace(
+							'[search]',
+							str_replace(';', '\3b', $ldap->escape($credentials['username'], null, LDAP_ESCAPE_FILTER)),
+							$this->params->get('search_string')
+						),
+						$ldap
+					);
+				}
+				else
+				{
+					$response->status = JAuthentication::STATUS_FAILURE;
+					$response->error_message = JText::_('JGLOBAL_AUTH_INVALID_PASS');
+				}
+			}	break;
+		}
+
+		if (!$success)
+		{
+			$response->status = JAuthentication::STATUS_FAILURE;
+
+			if ($response->error_message === '')
+			{
+				$response->error_message = JText::_('JGLOBAL_AUTH_INVALID_PASS');
+			}
+		}
+		else
+		{
+			// Grab some details from LDAP and return them
+			if (isset($userdetails[0][$ldap_uid][0]))
+			{
+				$response->username = $userdetails[0][$ldap_uid][0];
+			}
+
+			if (isset($userdetails[0][$ldap_email][0]))
+			{
+				$response->email = $userdetails[0][$ldap_email][0];
+			}
+
+			if (isset($userdetails[0][$ldap_fullname][0]))
+			{
+				$response->fullname = $userdetails[0][$ldap_fullname][0];
+			}
+			else
+			{
+				$response->fullname = $credentials['username'];
+			}
+
+			// Were good - So say so.
+			$response->status        = JAuthentication::STATUS_SUCCESS;
+			$response->error_message = '';
+		}
+
+		$ldap->close();
+	}
+
+	/**
+	 * Shortcut method to build a LDAP search based on a semicolon separated string
+	 *
+	 * Note that this method requires that semicolons which should be part of the search term to be escaped
+	 * to correctly split the search string into separate lookups
+	 *
+	 * @param   string      $search  search string of search values
+	 * @param   LdapClient  $ldap    The LDAP client
+	 *
+	 * @return  array  Search results
+	 *
+	 * @since   3.8.2
+	 */
+	private function searchByString($search, LdapClient $ldap)
+	{
+		$results = explode(';', $search);
+
+		foreach ($results as $key => $result)
+		{
+			$results[$key] = '(' . str_replace('\3b', ';', $result) . ')';
+		}
+
+		return $ldap->search($results);
+	}
+}
diff --git a/core/plugins/authentication/ldap/ldap.xml b/core/plugins/authentication/ldap/ldap.xml
new file mode 100644
index 00000000..32be857a
--- /dev/null
+++ b/core/plugins/authentication/ldap/ldap.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="authentication" method="upgrade">
+	<name>plg_authentication_ldap</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_LDAP_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="ldap">ldap.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_authentication_ldap.ini</language>
+		<language tag="en-GB">en-GB.plg_authentication_ldap.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="host"
+					type="text"
+					label="PLG_LDAP_FIELD_HOST_LABEL"
+					description="PLG_LDAP_FIELD_HOST_DESC"
+					size="20"
+				/>
+
+				<field
+					name="port"
+					type="number"
+					label="PLG_LDAP_FIELD_PORT_LABEL"
+					description="PLG_LDAP_FIELD_PORT_DESC"
+					min="1"
+					max="65535"
+					default="389"
+					hint="389"
+					validate="number"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="use_ldapV3"
+					type="radio"
+					label="PLG_LDAP_FIELD_V3_LABEL"
+					description="PLG_LDAP_FIELD_V3_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="negotiate_tls"
+					type="radio"
+					label="PLG_LDAP_FIELD_NEGOCIATE_LABEL"
+					description="PLG_LDAP_FIELD_NEGOCIATE_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="no_referrals"
+					type="radio"
+					label="PLG_LDAP_FIELD_REFERRALS_LABEL"
+					description="PLG_LDAP_FIELD_REFERRALS_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="auth_method"
+					type="list"
+					label="PLG_LDAP_FIELD_AUTHMETHOD_LABEL"
+					description="PLG_LDAP_FIELD_AUTHMETHOD_DESC"
+					default="bind"
+					>
+					<option value="search">PLG_LDAP_FIELD_VALUE_BINDSEARCH</option>
+					<option value="bind">PLG_LDAP_FIELD_VALUE_BINDUSER</option>
+				</field>
+
+				<field
+					name="base_dn"
+					type="text"
+					label="PLG_LDAP_FIELD_BASEDN_LABEL"
+					description="PLG_LDAP_FIELD_BASEDN_DESC"
+					size="20"
+				/>
+
+				<field
+					name="search_string"
+					type="text"
+					label="PLG_LDAP_FIELD_SEARCHSTRING_LABEL"
+					description="PLG_LDAP_FIELD_SEARCHSTRING_DESC"
+					size="20"
+				/>
+
+				<field
+					name="users_dn"
+					type="text"
+					label="PLG_LDAP_FIELD_USERSDN_LABEL"
+					description="PLG_LDAP_FIELD_USERSDN_DESC"
+					size="20"
+				/>
+
+				<field
+					name="username"
+					type="text"
+					label="PLG_LDAP_FIELD_USERNAME_LABEL"
+					description="PLG_LDAP_FIELD_USERNAME_DESC"
+					size="20"
+				/>
+
+				<field
+					name="password"
+					type="password"
+					label="PLG_LDAP_FIELD_PASSWORD_LABEL"
+					description="PLG_LDAP_FIELD_PASSWORD_DESC"
+					size="20"
+				/>
+
+				<field
+					name="ldap_fullname"
+					type="text"
+					label="PLG_LDAP_FIELD_FULLNAME_LABEL"
+					description="PLG_LDAP_FIELD_FULLNAME_DESC"
+					default="fullName"
+					size="20"
+				/>
+
+				<field
+					name="ldap_email"
+					type="text"
+					label="PLG_LDAP_FIELD_EMAIL_LABEL"
+					description="PLG_LDAP_FIELD_EMAIL_DESC"
+					default="mail"
+					size="20"
+				/>
+
+				<field
+					name="ldap_uid"
+					type="text"
+					label="PLG_LDAP_FIELD_UID_LABEL"
+					description="PLG_LDAP_FIELD_UID_DESC"
+					default="uid"
+					size="20"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/captcha/recaptcha/postinstall/actions.php b/core/plugins/captcha/recaptcha/postinstall/actions.php
new file mode 100644
index 00000000..40619b3f
--- /dev/null
+++ b/core/plugins/captcha/recaptcha/postinstall/actions.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Captcha
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains the functions used by the com_postinstall code to deliver
+ * the necessary post-installation messages for the end of life of reCAPTCHA V1.
+ */
+
+/**
+ * Checks if the plugin is enabled and reCAPTCHA V1 is being used. If true then the
+ * message about reCAPTCHA v1 EOL should be displayed.
+ *
+ * @return  boolean
+ *
+ * @since  3.8.6
+ */
+function recaptcha_postinstall_condition()
+{
+	$db = JFactory::getDbo();
+
+	$query = $db->getQuery(true)
+		->select('1')
+		->from($db->qn('#__extensions'))
+		->where($db->qn('name') . ' = ' . $db->q('plg_captcha_recaptcha'))
+		->where($db->qn('enabled') . ' = 1')
+		->where($db->qn('params') . ' LIKE ' . $db->q('%1.0%'));
+	$db->setQuery($query);
+	$enabled_plugins = $db->loadObjectList();
+
+	return count($enabled_plugins) === 1;
+}
+
+/**
+ * Open the reCAPTCHA plugin so that they can update the settings to V2 and new keys.
+ *
+ * @return  void
+ *
+ * @since   3.8.6
+ */
+function recaptcha_postinstall_action()
+{
+	$db = JFactory::getDbo();
+
+	$query = $db->getQuery(true)
+		->select('extension_id')
+		->from($db->qn('#__extensions'))
+		->where($db->qn('name') . ' = ' . $db->q('plg_captcha_recaptcha'));
+	$db->setQuery($query);
+	$e_id = $db->loadResult();
+
+	$url = 'index.php?option=com_plugins&task=plugin.edit&extension_id=' . $e_id;
+	JFactory::getApplication()->redirect($url);
+}
diff --git a/core/plugins/captcha/recaptcha/recaptcha.php b/core/plugins/captcha/recaptcha/recaptcha.php
new file mode 100644
index 00000000..6aae275f
--- /dev/null
+++ b/core/plugins/captcha/recaptcha/recaptcha.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Captcha
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Recaptcha Plugin.
+ * Based on the official recaptcha library( https://developers.google.com/recaptcha/docs/php )
+ *
+ * @since  2.5
+ */
+class PlgCaptchaRecaptcha extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Initialise the captcha
+	 *
+	 * @param   string  $id  The id of the field.
+	 *
+	 * @return  Boolean	True on success, false otherwise
+	 *
+	 * @throws  Exception
+	 *
+	 * @since  2.5
+	 */
+	public function onInit($id = 'dynamic_recaptcha_1')
+	{
+		$pubkey = $this->params->get('public_key', '');
+
+		if ($pubkey === '')
+		{
+			throw new Exception(JText::_('PLG_RECAPTCHA_ERROR_NO_PUBLIC_KEY'));
+		}
+
+		if ($this->params->get('version', '1.0') === '1.0')
+		{
+			JHtml::_('jquery.framework');
+
+			$theme	= $this->params->get('theme', 'clean');
+			$file	= 'https://www.google.com/recaptcha/api/js/recaptcha_ajax.js';
+
+			JHtml::_('script', $file);
+			JFactory::getDocument()->addScriptDeclaration('jQuery( document ).ready(function()
+				{Recaptcha.create("' . $pubkey . '", "' . $id . '", {theme: "' . $theme . '",' . $this->_getLanguage() . 'tabindex: 0});});');
+		}
+		else
+		{
+			// Load callback first for browser compatibility
+			JHtml::_('script', 'plg_captcha_recaptcha/recaptcha.min.js', array('version' => 'auto', 'relative' => true));
+
+			$file = 'https://www.google.com/recaptcha/api.js?onload=JoomlaInitReCaptcha2&render=explicit&hl=' . JFactory::getLanguage()->getTag();
+			JHtml::_('script', $file);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the challenge HTML
+	 *
+	 * @param   string  $name   The name of the field. Not Used.
+	 * @param   string  $id     The id of the field.
+	 * @param   string  $class  The class of the field. This should be passed as
+	 *                          e.g. 'class="required"'.
+	 *
+	 * @return  string  The HTML to be embedded in the form.
+	 *
+	 * @since  2.5
+	 */
+	public function onDisplay($name = null, $id = 'dynamic_recaptcha_1', $class = '')
+	{
+		if ($this->params->get('version', '1.0') === '1.0')
+		{
+			return '<div id="' . $id . '" ' . $class . '></div>';
+		}
+		else
+		{
+			return '<div id="' . $id . '" ' . str_replace('class="', 'class="g-recaptcha ', $class)
+					. ' data-sitekey="' . $this->params->get('public_key', '')
+					. '" data-theme="' . $this->params->get('theme2', 'light')
+					. '" data-size="' . $this->params->get('size', 'normal')
+					. '"></div>';
+		}
+	}
+
+	/**
+	 * Calls an HTTP POST function to verify if the user's guess was correct
+	 *
+	 * @param   string  $code  Answer provided by user. Not needed for the Recaptcha implementation
+	 *
+	 * @return  True if the answer is correct, false otherwise
+	 *
+	 * @since  2.5
+	 */
+	public function onCheckAnswer($code = null)
+	{
+		$input      = JFactory::getApplication()->input;
+		$privatekey = $this->params->get('private_key');
+		$version    = $this->params->get('version', '1.0');
+		$remoteip   = $input->server->get('REMOTE_ADDR', '', 'string');
+
+		switch ($version)
+		{
+			case '1.0':
+				$challenge = $input->get('recaptcha_challenge_field', '', 'string');
+				$response  = $input->get('recaptcha_response_field', '', 'string');
+				$spam      = ($challenge === '' || $response === '');
+				break;
+			case '2.0':
+				// Challenge Not needed in 2.0 but needed for getResponse call
+				$challenge = null;
+				$response  = $input->get('g-recaptcha-response', '', 'string');
+				$spam      = ($response === '');
+				break;
+		}
+
+		// Check for Private Key
+		if (empty($privatekey))
+		{
+			$this->_subject->setError(JText::_('PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY'));
+
+			return false;
+		}
+
+		// Check for IP
+		if (empty($remoteip))
+		{
+			$this->_subject->setError(JText::_('PLG_RECAPTCHA_ERROR_NO_IP'));
+
+			return false;
+		}
+
+		// Discard spam submissions
+		if ($spam)
+		{
+			$this->_subject->setError(JText::_('PLG_RECAPTCHA_ERROR_EMPTY_SOLUTION'));
+
+			return false;
+		}
+
+		return $this->getResponse($privatekey, $remoteip, $response, $challenge);
+	}
+
+	/**
+	 * Get the reCaptcha response.
+	 *
+	 * @param   string  $privatekey  The private key for authentication.
+	 * @param   string  $remoteip    The remote IP of the visitor.
+	 * @param   string  $response    The response received from Google.
+	 * @param   string  $challenge   The challenge field from the reCaptcha. Only for 1.0.
+	 *
+	 * @return bool True if response is good | False if response is bad.
+	 *
+	 * @since   3.4
+	 */
+	private function getResponse($privatekey, $remoteip, $response, $challenge = null)
+	{
+		$version = $this->params->get('version', '1.0');
+
+		switch ($version)
+		{
+			case '1.0':
+				$response = $this->_recaptcha_http_post(
+					'www.google.com', '/recaptcha/api/verify',
+					array(
+						'privatekey' => $privatekey,
+						'remoteip'   => $remoteip,
+						'challenge'  => $challenge,
+						'response'   => $response
+					)
+				);
+
+				$answers = explode("\n", $response[1]);
+
+				if (trim($answers[0]) !== 'true')
+				{
+					// @todo use exceptions here
+					$this->_subject->setError(JText::_('PLG_RECAPTCHA_ERROR_' . strtoupper(str_replace('-', '_', $answers[1]))));
+
+					return false;
+				}
+				break;
+			case '2.0':
+				require_once 'recaptchalib.php';
+
+				$reCaptcha = new JReCaptcha($privatekey);
+				$response  = $reCaptcha->verifyResponse($remoteip, $response);
+
+				if (!isset($response->success) || !$response->success)
+				{
+					// @todo use exceptions here
+					if (is_array($response->errorCodes))
+					{
+						foreach ($response->errorCodes as $error)
+						{
+							$this->_subject->setError($error);
+						}
+					}
+
+					return false;
+				}
+				break;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Encodes the given data into a query string format.
+	 *
+	 * @param   array  $data  Array of string elements to be encoded
+	 *
+	 * @return  string  Encoded request
+	 *
+	 * @since  2.5
+	 */
+	private function _recaptcha_qsencode($data)
+	{
+		$req = '';
+
+		foreach ($data as $key => $value)
+		{
+			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+		}
+
+		// Cut the last '&'
+		$req = rtrim($req, '&');
+
+		return $req;
+	}
+
+	/**
+	 * Submits an HTTP POST to a reCAPTCHA server.
+	 *
+	 * @param   string  $host  Host name to POST to.
+	 * @param   string  $path  Path on host to POST to.
+	 * @param   array   $data  Data to be POSTed.
+	 * @param   int     $port  Optional port number on host.
+	 *
+	 * @return  array   Response
+	 *
+	 * @since  2.5
+	 */
+	private function _recaptcha_http_post($host, $path, $data, $port = 80)
+	{
+		$req = $this->_recaptcha_qsencode($data);
+
+		$http_request  = "POST $path HTTP/1.0\r\n";
+		$http_request .= "Host: $host\r\n";
+		$http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+		$http_request .= "Content-Length: " . strlen($req) . "\r\n";
+		$http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+		$http_request .= "\r\n";
+		$http_request .= $req;
+
+		$response = '';
+
+		if (($fs = @fsockopen($host, $port, $errno, $errstr, 10)) === false)
+		{
+			die('Could not open socket');
+		}
+
+		fwrite($fs, $http_request);
+
+		while (!feof($fs))
+		{
+			// One TCP-IP packet
+			$response .= fgets($fs, 1160);
+		}
+
+		fclose($fs);
+		$response = explode("\r\n\r\n", $response, 2);
+
+		return $response;
+	}
+
+	/**
+	 * Get the language tag or a custom translation
+	 *
+	 * @return  string
+	 *
+	 * @since  2.5
+	 */
+	private function _getLanguage()
+	{
+		$language = JFactory::getLanguage();
+
+		$tag = explode('-', $language->getTag());
+		$tag = $tag[0];
+		$available = array('en', 'pt', 'fr', 'de', 'nl', 'ru', 'es', 'tr');
+
+		if (in_array($tag, $available))
+		{
+			return "lang : '" . $tag . "',";
+		}
+
+		// If the default language is not available, let's search for a custom translation
+		if ($language->hasKey('PLG_RECAPTCHA_CUSTOM_LANG'))
+		{
+			$custom[] = 'custom_translations : {';
+			$custom[] = "\t" . 'instructions_visual : "' . JText::_('PLG_RECAPTCHA_INSTRUCTIONS_VISUAL') . '",';
+			$custom[] = "\t" . 'instructions_audio : "' . JText::_('PLG_RECAPTCHA_INSTRUCTIONS_AUDIO') . '",';
+			$custom[] = "\t" . 'play_again : "' . JText::_('PLG_RECAPTCHA_PLAY_AGAIN') . '",';
+			$custom[] = "\t" . 'cant_hear_this : "' . JText::_('PLG_RECAPTCHA_CANT_HEAR_THIS') . '",';
+			$custom[] = "\t" . 'visual_challenge : "' . JText::_('PLG_RECAPTCHA_VISUAL_CHALLENGE') . '",';
+			$custom[] = "\t" . 'audio_challenge : "' . JText::_('PLG_RECAPTCHA_AUDIO_CHALLENGE') . '",';
+			$custom[] = "\t" . 'refresh_btn : "' . JText::_('PLG_RECAPTCHA_REFRESH_BTN') . '",';
+			$custom[] = "\t" . 'help_btn : "' . JText::_('PLG_RECAPTCHA_HELP_BTN') . '",';
+			$custom[] = "\t" . 'incorrect_try_again : "' . JText::_('PLG_RECAPTCHA_INCORRECT_TRY_AGAIN') . '",';
+			$custom[] = '},';
+			$custom[] = "lang : '" . $tag . "',";
+
+			return implode("\n", $custom);
+		}
+
+		// If nothing helps fall back to english
+		return '';
+	}
+}
diff --git a/core/plugins/captcha/recaptcha/recaptcha.xml b/core/plugins/captcha/recaptcha/recaptcha.xml
new file mode 100644
index 00000000..1325c6f4
--- /dev/null
+++ b/core/plugins/captcha/recaptcha/recaptcha.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.4" type="plugin" group="captcha" method="upgrade">
+	<name>plg_captcha_recaptcha</name>
+	<version>3.4.0</version>
+	<creationDate>December 2011</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="recaptcha">recaptcha.php</filename>
+		<filename>recaptchalib.php</filename>
+	</files>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="message"
+					type="note"
+					label="PLG_RECAPTCHA_VERSION_1_WARNING_LABEL"
+					showon="version:1.0"
+				/>
+
+				<field
+					name="version"
+					type="list"
+					label="PLG_RECAPTCHA_VERSION_LABEL"
+					description="PLG_RECAPTCHA_VERSION_DESC"
+					default="2.0"
+					size="1"
+					>
+					<option value="1.0">PLG_RECAPTCHA_VERSION_V1</option>
+					<option value="2.0">PLG_RECAPTCHA_VERSION_V2</option>
+				</field>
+
+				<field
+					name="public_key"
+					type="text"
+					label="PLG_RECAPTCHA_PUBLIC_KEY_LABEL"
+					description="PLG_RECAPTCHA_PUBLIC_KEY_DESC"
+					default=""
+					required="true"
+					filter="string"
+					size="50"
+				/>
+
+				<field
+					name="private_key"
+					type="text"
+					label="PLG_RECAPTCHA_PRIVATE_KEY_LABEL"
+					description="PLG_RECAPTCHA_PRIVATE_KEY_DESC"
+					default=""
+					required="true"
+					filter="string"
+					size="50"
+				/>
+
+				<field
+					name="theme"
+					type="list"
+					label="PLG_RECAPTCHA_THEME_LABEL"
+					description="PLG_RECAPTCHA_THEME_DESC"
+					default="clean"
+					showon="version:1.0"
+					filter=""
+					>
+					<option value="clean">PLG_RECAPTCHA_THEME_CLEAN</option>
+					<option value="white">PLG_RECAPTCHA_THEME_WHITE</option>
+					<option value="blackglass">PLG_RECAPTCHA_THEME_BLACKGLASS</option>
+					<option value="red">PLG_RECAPTCHA_THEME_RED</option>
+				</field>
+
+				<field
+					name="theme2"
+					type="list"
+					label="PLG_RECAPTCHA_THEME_LABEL"
+					description="PLG_RECAPTCHA_THEME_DESC"
+					default="light"
+					showon="version:2.0"
+					filter=""
+					>
+					<option value="light">PLG_RECAPTCHA_THEME_LIGHT</option>
+					<option value="dark">PLG_RECAPTCHA_THEME_DARK</option>
+				</field>
+
+				<field
+					name="size"
+					type="list"
+					label="PLG_RECAPTCHA_SIZE_LABEL"
+					description="PLG_RECAPTCHA_SIZE_DESC"
+					default="normal"
+					showon="version:2.0"
+					filter=""
+					>
+					<option value="normal">PLG_RECAPTCHA_THEME_NORMAL</option>
+					<option value="compact">PLG_RECAPTCHA_THEME_COMPACT</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/captcha/recaptcha/recaptchalib.php b/core/plugins/captcha/recaptcha/recaptchalib.php
new file mode 100644
index 00000000..ee969b79
--- /dev/null
+++ b/core/plugins/captcha/recaptcha/recaptchalib.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *    - Documentation and latest version
+ *          https://developers.google.com/recaptcha/docs/php
+ *    - Get a reCAPTCHA API Key
+ *          https://www.google.com/recaptcha/admin/create
+ *    - Discussion group
+ *          http://groups.google.com/group/recaptcha
+ *
+ * @copyright Copyright (c) 2014, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * A JReCaptchaResponse is returned from checkAnswer().
+ */
+class JReCaptchaResponse
+{
+	public $success;
+	public $errorCodes;
+}
+
+class JReCaptcha
+{
+	private static $_signupUrl = 'https://www.google.com/recaptcha/admin';
+	private static $_siteVerifyUrl = 'https://www.google.com/recaptcha/api/siteverify';
+	private $_secret;
+	private static $_version = 'php_1.0';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $secret shared secret between site and ReCAPTCHA server.
+	 */
+	public function __construct($secret)
+	{
+		if ($secret === null || $secret === '')
+		{
+			die("To use reCAPTCHA you must get an API key from <a href='"
+				. self::$_signupUrl . "'>" . self::$_signupUrl . "</a>");
+		}
+
+		$this->_secret = $secret;
+	}
+
+	/**
+	 * Encodes the given data into a query string format.
+	 *
+	 * @param array $data array of string elements to be encoded.
+	 *
+	 * @return string - encoded request.
+	 */
+	private function _encodeQS($data)
+	{
+		$req = '';
+
+		foreach ($data as $key => $value)
+		{
+			$req .= $key . '=' . urlencode(stripslashes($value)) . '&';
+		}
+
+		// Cut the last '&'
+		return substr($req, 0, strlen($req) - 1);
+	}
+
+	/**
+	 * Submits an HTTP GET to a reCAPTCHA server.
+	 *
+	 * @param string $path URL path to recaptcha server.
+	 * @param array  $data array of parameters to be sent.
+	 *
+	 * @return mixed JSON string or false on error
+	 */
+	private function _submitHTTPGet($path, $data)
+	{
+		$req = $this->_encodeQS($data);
+
+		try
+		{
+			$http   = JHttpFactory::getHttp();
+			$result = $http->get($path . '?' . $req)->body;
+		}
+		catch (RuntimeException $e)
+		{
+			return false;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Calls the reCAPTCHA siteverify API to verify whether the user passes
+	 * CAPTCHA test.
+	 *
+	 * @param string $remoteIp IP address of end user.
+	 * @param string $response response string from recaptcha verification.
+	 *
+	 * @return JReCaptchaResponse
+	 */
+	public function verifyResponse($remoteIp, $response)
+	{
+		// Discard empty solution submissions
+		if ($response === null || $response === '')
+		{
+			$recaptchaResponse = new JReCaptchaResponse();
+			$recaptchaResponse->success = false;
+			$recaptchaResponse->errorCodes = 'missing-input';
+
+			return $recaptchaResponse;
+		}
+
+		$getResponse = $this->_submitHttpGet(
+			self::$_siteVerifyUrl,
+			array(
+				'secret'   => $this->_secret,
+				'remoteip' => $remoteIp,
+				'v'        => self::$_version,
+				'response' => $response
+			)
+		);
+
+		// Something is broken in submiting the http get request
+		if ($getResponse === false)
+		{
+			$recaptchaResponse->success = false;
+		}
+
+		$answers = json_decode($getResponse, true);
+		$recaptchaResponse = new JReCaptchaResponse();
+
+		if (trim($answers['success']) !== '')
+		{
+			$recaptchaResponse->success = true;
+		}
+		else
+		{
+			$recaptchaResponse->success = false;
+			$recaptchaResponse->errorCodes = isset($answers['error-codes']) ? $answers['error-codes'] : '';
+		}
+
+		return $recaptchaResponse;
+	}
+}
\ No newline at end of file
diff --git a/core/plugins/content/contact/contact.php b/core/plugins/content/contact/contact.php
new file mode 100644
index 00000000..a22ddd1d
--- /dev/null
+++ b/core/plugins/content/contact/contact.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.Contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Contact Plugin
+ *
+ * @since  3.2
+ */
+class PlgContentContact extends JPlugin
+{
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.3
+	 */
+	protected $db;
+
+	/**
+	 * Plugin that retrieves contact information for contact
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin.
+	 * @param   mixed    &$row     An object with a "text" property
+	 * @param   mixed    $params   Additional parameters. See {@see PlgContentContent()}.
+	 * @param   integer  $page     Optional page number. Unused. Defaults to zero.
+	 *
+	 * @return  boolean	True on success.
+	 */
+	public function onContentPrepare($context, &$row, $params, $page = 0)
+	{
+		$allowed_contexts = array('com_content.category', 'com_content.article', 'com_content.featured');
+
+		if (!in_array($context, $allowed_contexts))
+		{
+			return true;
+		}
+
+		// Return if we don't have valid params or don't link the author
+		if (!($params instanceof Registry) || !$params->get('link_author'))
+		{
+			return true;
+		}
+
+		// Return if we don't have a valid article id
+		if (!isset($row->id) || !(int) $row->id)
+		{
+			return true;
+		}
+
+		$contact = $this->getContactId($row->created_by);
+		$row->contactid = $contact->contactid;
+
+		if ($row->contactid)
+		{
+			JLoader::register('ContactHelperRoute', JPATH_SITE . '/components/com_contact/helpers/route.php');
+			$row->contact_link = JRoute::_(ContactHelperRoute::getContactRoute($contact->contactid . ':' . $contact->alias, $contact->catid));
+		}
+		else
+		{
+			$row->contact_link = '';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Retrieve Contact
+	 *
+	 * @param   int  $created_by  Id of the user who created the contact
+	 *
+	 * @return  mixed|null|integer
+	 */
+	protected function getContactId($created_by)
+	{
+		static $contacts = array();
+
+		if (isset($contacts[$created_by]))
+		{
+			return $contacts[$created_by];
+		}
+
+		$query = $this->db->getQuery(true);
+
+		$query->select('MAX(contact.id) AS contactid, contact.alias, contact.catid');
+		$query->from($this->db->quoteName('#__contact_details', 'contact'));
+		$query->where('contact.published = 1');
+		$query->where('contact.user_id = ' . (int) $created_by);
+
+		if (JLanguageMultilang::isEnabled() === true)
+		{
+			$query->where('(contact.language in '
+				. '(' . $this->db->quote(JFactory::getLanguage()->getTag()) . ',' . $this->db->quote('*') . ') '
+				. ' OR contact.language IS NULL)');
+		}
+
+		$this->db->setQuery($query);
+
+		$contacts[$created_by] = $this->db->loadObject();
+
+		return $contacts[$created_by];
+	}
+}
diff --git a/core/plugins/content/contact/contact.xml b/core/plugins/content/contact/contact.xml
new file mode 100644
index 00000000..fe5aac18
--- /dev/null
+++ b/core/plugins/content/contact/contact.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.2" type="plugin" group="content" method="upgrade">
+	<name>plg_content_contact</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2014</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.2</version>
+	<description>PLG_CONTENT_CONTACT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contact">contact.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_contact.ini</language>
+		<language tag="en-GB">en-GB.plg_content_contact.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/emailcloak/emailcloak.php b/core/plugins/content/emailcloak/emailcloak.php
new file mode 100644
index 00000000..9dd2e4ca
--- /dev/null
+++ b/core/plugins/content/emailcloak/emailcloak.php
@@ -0,0 +1,502 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.emailcloak
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Email cloack plugin class.
+ *
+ * @since  1.5
+ */
+class PlgContentEmailcloak extends JPlugin
+{
+	/**
+	 * Plugin that cloaks all emails in content from spambots via Javascript.
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin.
+	 * @param   mixed    &$row     An object with a "text" property or the string to be cloaked.
+	 * @param   mixed    &$params  Additional parameters. See {@see PlgContentEmailcloak()}.
+	 * @param   integer  $page     Optional page number. Unused. Defaults to zero.
+	 *
+	 * @return  boolean	True on success.
+	 */
+	public function onContentPrepare($context, &$row, &$params, $page = 0)
+	{
+		// Don't run this plugin when the content is being indexed
+		if ($context === 'com_finder.indexer')
+		{
+			return true;
+		}
+
+		if (is_object($row))
+		{
+			return $this->_cloak($row->text, $params);
+		}
+
+		return $this->_cloak($row, $params);
+	}
+
+	/**
+	 * Generate a search pattern based on link and text.
+	 *
+	 * @param   string  $link  The target of an email link.
+	 * @param   string  $text  The text enclosed by the link.
+	 *
+	 * @return  string	A regular expression that matches a link containing the parameters.
+	 */
+	protected function _getPattern ($link, $text)
+	{
+		$pattern = '~(?:<a ([^>]*)href\s*=\s*"mailto:' . $link . '"([^>]*))>' . $text . '</a>~i';
+
+		return $pattern;
+	}
+
+	/**
+	 * Adds an attributes to the js cloaked email.
+	 *
+	 * @param   string  $jsEmail  Js cloaked email.
+	 * @param   string  $before   Attributes before email.
+	 * @param   string  $after    Attributes after email.
+	 *
+	 * @return string Js cloaked email with attributes.
+	 */
+	protected function _addAttributesToEmail($jsEmail, $before, $after)
+	{
+		if ($before !== '')
+		{
+			$before = str_replace("'", "\'", $before);
+			$jsEmail = str_replace(".innerHTML += '<a '", ".innerHTML += '<a {$before}'", $jsEmail);
+		}
+
+		if ($after !== '')
+		{
+			$after = str_replace("'", "\'", $after);
+			$jsEmail = str_replace("'\'>'", "'\'{$after}>'", $jsEmail);
+		}
+
+		return $jsEmail;
+	}
+
+	/**
+	 * Cloak all emails in text from spambots via Javascript.
+	 *
+	 * @param   string  &$text    The string to be cloaked.
+	 * @param   mixed   &$params  Additional parameters. Parameter "mode" (integer, default 1)
+	 *                             replaces addresses with "mailto:" links if nonzero.
+	 *
+	 * @return  boolean  True on success.
+	 */
+	protected function _cloak(&$text, &$params)
+	{
+		/*
+		 * Check for presence of {emailcloak=off} which is explicits disables this
+		 * bot for the item.
+		 */
+		if (StringHelper::strpos($text, '{emailcloak=off}') !== false)
+		{
+			$text = StringHelper::str_ireplace('{emailcloak=off}', '', $text);
+
+			return true;
+		}
+
+		// Simple performance check to determine whether bot should process further.
+		if (StringHelper::strpos($text, '@') === false)
+		{
+			return true;
+		}
+
+		$mode = $this->params->def('mode', 1);
+
+		// Example: any@example.org
+		$searchEmail = '([\w\.\'\-\+]+\@(?:[a-z0-9\.\-]+\.)+(?:[a-zA-Z0-9\-]{2,10}))';
+
+		// Example: any@example.org?subject=anyText
+		$searchEmailLink = $searchEmail . '([?&][\x20-\x7f][^"<>]+)';
+
+		// Any Text
+		$searchText = '((?:[\x20-\x7f]|[\xA1-\xFF]|[\xC2-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF4][\x80-\xBF]{3})[^<>]+)';
+
+		// Any Image link
+		$searchImage = '(<img[^>]+>)';
+
+		// Any Text with <span or <strong
+		$searchTextSpan = '(<span[^>]+>|<span>|<strong>|<strong><span[^>]+>|<strong><span>)' . $searchText . '(</span>|</strong>|</span></strong>)';
+
+		// Any address with <span or <strong
+		$searchEmailSpan = '(<span[^>]+>|<span>|<strong>|<strong><span[^>]+>|<strong><span>)' . $searchEmail . '(</span>|</strong>|</span></strong>)';
+
+		/*
+		 * Search and fix derivatives of link code <a href="http://mce_host/ourdirectory/email@example.org"
+		 * >email@example.org</a>. This happens when inserting an email in TinyMCE, cancelling its suggestion to add
+		 * the mailto: prefix...
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchEmail);
+		$pattern = str_replace('"mailto:', '"http://mce_host([\x20-\x7f][^<>]+/)', $pattern);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[3][0];
+			$mailText = $regs[5][0];
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search and fix derivatives of link code <a href="http://mce_host/ourdirectory/email@example.org"
+		 * >anytext</a>. This happens when inserting an email in TinyMCE, cancelling its suggestion to add
+		 * the mailto: prefix...
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchText);
+		$pattern = str_replace('"mailto:', '"http://mce_host([\x20-\x7f][^<>]+/)', $pattern);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[3][0];
+			$mailText = $regs[5][0];
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org"
+		 * >email@example.org</a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchEmail);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = $regs[4][0];
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@amail.com"
+		 * ><anyspan >email@amail.com</anyspan></a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchEmailSpan);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0];
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@amail.com">
+		 * <anyspan >anytext</anyspan></a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchTextSpan);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = $regs[4][0] . addslashes($regs[5][0]) . $regs[6][0];
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org">
+		 * anytext</a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchText);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = addslashes($regs[4][0]);
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org">
+		 * <img anything></a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchImage);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = $regs[4][0];
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org">
+		 * <img anything>email@example.org</a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchImage . $searchEmail);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = $regs[4][0] . $regs[5][0];
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org">
+		 * <img anything>any text</a>
+		 */
+		$pattern = $this->_getPattern($searchEmail, $searchImage . $searchText);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0];
+			$mailText = $regs[4][0] . addslashes($regs[5][0]);
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org?
+		 * subject=Text">email@example.org</a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchEmail);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0] . $regs[3][0];
+			$mailText = $regs[5][0];
+
+			// Needed for handling of Body parameter
+			$mail = str_replace('&amp;', '&', $mail);
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@example.org?
+		 * subject=Text">anytext</a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchText);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0] . $regs[3][0];
+			$mailText = addslashes($regs[5][0]);
+
+			// Needed for handling of Body parameter
+			$mail = str_replace('&amp;', '&', $mail);
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@amail.com?subject= Text"
+		 * ><anyspan >email@amail.com</anyspan></a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchEmailSpan);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0] . $regs[3][0];
+			$mailText = $regs[5][0] . $regs[6][0] . $regs[7][0];
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code <a href="mailto:email@amail.com?subject= Text">
+		 * <anyspan >anytext</anyspan></a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchTextSpan);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[2][0] . $regs[3][0];
+			$mailText = $regs[5][0] . addslashes($regs[6][0]) . $regs[7][0];
+
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code
+		 * <a href="mailto:email@amail.com?subject=Text"><img anything></a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchImage);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[1][0] . $regs[2][0] . $regs[3][0];
+			$mailText = $regs[5][0];
+
+			// Needed for handling of Body parameter
+			$mail = str_replace('&amp;', '&', $mail);
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code
+		 * <a href="mailto:email@amail.com?subject=Text"><img anything>email@amail.com</a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchImage . $searchEmail);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[1][0] . $regs[2][0] . $regs[3][0];
+			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0];
+
+			// Needed for handling of Body parameter
+			$mail = str_replace('&amp;', '&', $mail);
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for derivatives of link code
+		 * <a href="mailto:email@amail.com?subject=Text"><img anything>any text</a>
+		 */
+		$pattern = $this->_getPattern($searchEmailLink, $searchImage . $searchText);
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[1][0] . $regs[2][0] . $regs[3][0];
+			$mailText = $regs[4][0] . $regs[5][0] . addslashes($regs[6][0]);
+
+			// Needed for handling of Body parameter
+			$mail = str_replace('&amp;', '&', $mail);
+
+			// Check to see if mail text is different from mail addy
+			$replacement = JHtml::_('email.cloak', $mail, $mode, $mailText, 0);
+
+			// Ensure that attributes is not stripped out by email cloaking
+			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
+		}
+
+		/*
+		 * Search for plain text email addresses, such as email@example.org but not within HTML tags:
+		 * <img src="..." title="email@example.org"> or <input type="text" placeholder="email@example.org">
+		 * The '<[^<]*>(*SKIP)(*F)|' trick is used to exclude this kind of occurrences
+		 */
+		$pattern = '~<[^<]*>(*SKIP)(*F)|' . $searchEmail . '~i';
+
+		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
+		{
+			$mail = $regs[1][0];
+			$replacement = JHtml::_('email.cloak', $mail, $mode);
+
+			// Replace the found address with the js cloaked email
+			$text = substr_replace($text, $replacement, $regs[1][1], strlen($mail));
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/content/emailcloak/emailcloak.xml b/core/plugins/content/emailcloak/emailcloak.xml
new file mode 100644
index 00000000..0e58e1dc
--- /dev/null
+++ b/core/plugins/content/emailcloak/emailcloak.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_emailcloak</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_CONTENT_EMAILCLOAK_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="emailcloak">emailcloak.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_emailcloak.ini</language>
+		<language tag="en-GB">en-GB.plg_content_emailcloak.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="mode"
+					type="list"
+					label="PLG_CONTENT_EMAILCLOAK_MODE_LABEL"
+					description="PLG_CONTENT_EMAILCLOAK_MODE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">PLG_CONTENT_EMAILCLOAK_NONLINKABLE</option>
+					<option value="1">PLG_CONTENT_EMAILCLOAK_LINKABLE</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/fields/fields.php b/core/plugins/content/fields/fields.php
new file mode 100644
index 00000000..029c9115
--- /dev/null
+++ b/core/plugins/content/fields/fields.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.Fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die();
+
+/**
+ * Plug-in to show a custom field in eg an article
+ * This uses the {fields ID} syntax
+ *
+ * @since  3.7.0
+ */
+class PlgContentFields extends JPlugin
+{
+	/**
+	 * Plugin that shows a custom field
+	 *
+	 * @param   string  $context  The context of the content being passed to the plugin.
+	 * @param   object  &$item    The item object.  Note $article->text is also available
+	 * @param   object  &$params  The article params
+	 * @param   int     $page     The 'page' number
+	 *
+	 * @return void
+	 *
+	 * @since  3.7.0
+	 */
+	public function onContentPrepare($context, &$item, &$params, $page = 0)
+	{
+		// If the item has a context, overwrite the existing one
+		if ($context == 'com_finder.indexer' && !empty($item->context))
+		{
+			$context = $item->context;
+		}
+		elseif ($context == 'com_finder.indexer')
+		{
+			// Don't run this plugin when the content is being indexed and we have no real context
+			return;
+		}
+
+		// Don't run if there is no text property (in case of bad calls) or it is empty
+		if (empty($item->text))
+		{
+			return;
+		}
+
+		// Simple performance check to determine whether bot should process further
+		if (strpos($item->text, 'field') === false)
+		{
+			return;
+		}
+
+		// Register FieldsHelper
+		JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+		// Prepare the text
+		if (isset($item->text))
+		{
+			$item->text = $this->prepare($item->text, $context, $item);
+		}
+
+		// Prepare the intro text
+		if (isset($item->introtext))
+		{
+			$item->introtext = $this->prepare($item->introtext, $context, $item);
+		}
+	}
+
+	/**
+	 * Prepares the given string by parsing {field} and {fieldgroup} groups and replacing them.
+	 *
+	 * @param   string  $string   The text to prepare
+	 * @param   string  $context  The context of the content
+	 * @param   object  $item     The item object
+	 *
+	 * @return string
+	 *
+	 * @since  3.8.1
+	 */
+	private function prepare($string, $context, $item)
+	{
+		// Search for {field ID} or {fieldgroup ID} tags and put the results into $matches.
+		$regex = '/{(field|fieldgroup)\s+(.*?)}/i';
+		preg_match_all($regex, $string, $matches, PREG_SET_ORDER);
+
+		if (!$matches)
+		{
+			return $string;
+		}
+
+		$parts = FieldsHelper::extract($context);
+
+		if (count($parts) < 2)
+		{
+			return $string;
+		}
+
+		$context    = $parts[0] . '.' . $parts[1];
+		$fields     = FieldsHelper::getFields($context, $item, true);
+		$fieldsById = array();
+		$groups     = array();
+
+		// Rearranging fields in arrays for easier lookup later.
+		foreach ($fields as $field)
+		{
+			$fieldsById[$field->id]     = $field;
+			$groups[$field->group_id][] = $field;
+		}
+
+		foreach ($matches as $i => $match)
+		{
+			// $match[0] is the full pattern match, $match[1] is the type (field or fieldgroup) and $match[2] the ID and optional the layout
+			$explode = explode(',', $match[2]);
+			$id      = (int) $explode[0];
+			$layout  = !empty($explode[1]) ? trim($explode[1]) : 'render';
+			$output  = '';
+
+			if ($match[1] == 'field' && $id)
+			{
+				if (isset($fieldsById[$id]))
+				{
+					$output = FieldsHelper::render(
+						$context,
+						'field.' . $layout,
+						array(
+							'item'    => $item,
+							'context' => $context,
+							'field'   => $fieldsById[$id]
+						)
+					);
+				}
+			}
+			else
+			{
+				if ($match[2] === '*')
+				{
+					$match[0]     = str_replace('*', '\*', $match[0]);
+					$renderFields = $fields;
+				}
+				else
+				{
+					$renderFields = isset($groups[$id]) ? $groups[$id] : '';
+				}
+
+				if ($renderFields)
+				{
+					$output = FieldsHelper::render(
+						$context,
+						'fields.' . $layout,
+						array(
+							'item'    => $item,
+							'context' => $context,
+							'fields'  => $renderFields
+						)
+					);
+				}
+			}
+
+			$string = preg_replace("|$match[0]|", addcslashes($output, '\\$'), $string, 1);
+		}
+
+		return $string;
+	}
+}
diff --git a/core/plugins/content/fields/fields.xml b/core/plugins/content/fields/fields.xml
new file mode 100644
index 00000000..2ebcd27c
--- /dev/null
+++ b/core/plugins/content/fields/fields.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.7.0" type="plugin" group="content" method="upgrade">
+	<name>plg_content_fields</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_CONTENT_FIELDS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="fields">fields.php</filename>
+	</files>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/finder/finder.php b/core/plugins/content/finder/finder.php
new file mode 100644
index 00000000..bf1bf43a
--- /dev/null
+++ b/core/plugins/content/finder/finder.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Smart Search Content Plugin
+ *
+ * @since  2.5
+ */
+class PlgContentFinder extends JPlugin
+{
+	/**
+	 * Smart Search after save content method.
+	 * Content is passed by reference, but after the save, so no changes will be saved.
+	 * Method is called right after the content is saved.
+	 *
+	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6)
+	 * @param   object  $article  A JTableContent object
+	 * @param   bool    $isNew    If the content has just been created
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onContentAfterSave($context, $article, $isNew)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('finder');
+
+		// Trigger the onFinderAfterSave event.
+		$dispatcher->trigger('onFinderAfterSave', array($context, $article, $isNew));
+	}
+
+	/**
+	 * Smart Search before save content method.
+	 * Content is passed by reference. Method is called before the content is saved.
+	 *
+	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6).
+	 * @param   object  $article  A JTableContent object.
+	 * @param   bool    $isNew    If the content is just about to be created.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onContentBeforeSave($context, $article, $isNew)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('finder');
+
+		// Trigger the onFinderBeforeSave event.
+		$dispatcher->trigger('onFinderBeforeSave', array($context, $article, $isNew));
+	}
+
+	/**
+	 * Smart Search after delete content method.
+	 * Content is passed by reference, but after the deletion.
+	 *
+	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6).
+	 * @param   object  $article  A JTableContent object.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onContentAfterDelete($context, $article)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('finder');
+
+		// Trigger the onFinderAfterDelete event.
+		$dispatcher->trigger('onFinderAfterDelete', array($context, $article));
+	}
+
+	/**
+	 * Smart Search content state change method.
+	 * Method to update the link information for items that have been changed
+	 * from outside the edit screen. This is fired when the item is published,
+	 * unpublished, archived, or unarchived from the list view.
+	 *
+	 * @param   string   $context  The context for the content passed to the plugin.
+	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onContentChangeState($context, $pks, $value)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('finder');
+
+		// Trigger the onFinderChangeState event.
+		$dispatcher->trigger('onFinderChangeState', array($context, $pks, $value));
+	}
+
+	/**
+	 * Smart Search change category state content method.
+	 * Method is called when the state of the category to which the
+	 * content item belongs is changed.
+	 *
+	 * @param   string   $extension  The extension whose category has been updated.
+	 * @param   array    $pks        A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value      The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onCategoryChangeState($extension, $pks, $value)
+	{
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('finder');
+
+		// Trigger the onFinderCategoryChangeState event.
+		$dispatcher->trigger('onFinderCategoryChangeState', array($extension, $pks, $value));
+	}
+}
diff --git a/core/plugins/content/finder/finder.xml b/core/plugins/content/finder/finder.xml
new file mode 100644
index 00000000..afd19630
--- /dev/null
+++ b/core/plugins/content/finder/finder.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_finder</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_CONTENT_FINDER_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="finder">finder.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_finder.ini</language>
+		<language tag="en-GB">en-GB.plg_content_finder.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/joomla/joomla.php b/core/plugins/content/joomla/joomla.php
new file mode 100644
index 00000000..a6e624d7
--- /dev/null
+++ b/core/plugins/content/joomla/joomla.php
@@ -0,0 +1,302 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.joomla
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Example Content Plugin
+ *
+ * @since  1.6
+ */
+class PlgContentJoomla extends JPlugin
+{
+	/**
+	 * Example after save content method
+	 * Article is passed by reference, but after the save, so no changes will be saved.
+	 * Method is called right after the content is saved
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin (added in 1.6)
+	 * @param   object   $article  A JTableContent object
+	 * @param   boolean  $isNew    If the content is just about to be created
+	 *
+	 * @return  boolean   true if function not enabled, is in frontend or is new. Else true or
+	 *                    false depending on success of save function.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentAfterSave($context, $article, $isNew)
+	{
+		// Check we are handling the frontend edit form.
+		if ($context !== 'com_content.form')
+		{
+			return true;
+		}
+
+		// Check if this function is enabled.
+		if (!$this->params->def('email_new_fe', 1))
+		{
+			return true;
+		}
+
+		// Check this is a new article.
+		if (!$isNew)
+		{
+			return true;
+		}
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('id'))
+			->from($db->quoteName('#__users'))
+			->where($db->quoteName('sendEmail') . ' = 1')
+			->where($db->quoteName('block') . ' = 0');
+		$db->setQuery($query);
+		$users = (array) $db->loadColumn();
+
+		if (empty($users))
+		{
+			return true;
+		}
+
+		$user = JFactory::getUser();
+
+		// Messaging for new items
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/models', 'MessagesModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_messages/tables');
+
+		$default_language = JComponentHelper::getParams('com_languages')->get('administrator');
+		$debug = JFactory::getConfig()->get('debug_lang');
+		$result = true;
+
+		foreach ($users as $user_id)
+		{
+			if ($user_id != $user->id)
+			{
+				// Load language for messaging
+				$receiver = JUser::getInstance($user_id);
+				$lang = JLanguage::getInstance($receiver->getParam('admin_language', $default_language), $debug);
+				$lang->load('com_content');
+				$message = array(
+					'user_id_to' => $user_id,
+					'subject' => $lang->_('COM_CONTENT_NEW_ARTICLE'),
+					'message' => sprintf($lang->_('COM_CONTENT_ON_NEW_CONTENT'), $user->get('name'), $article->title)
+				);
+				$model_message = JModelLegacy::getInstance('Message', 'MessagesModel');
+				$result = $model_message->save($message);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Don't allow categories to be deleted if they contain items or subcategories with items
+	 *
+	 * @param   string  $context  The context for the content passed to the plugin.
+	 * @param   object  $data     The data relating to the content that was deleted.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function onContentBeforeDelete($context, $data)
+	{
+		// Skip plugin if we are deleting something other than categories
+		if ($context !== 'com_categories.category')
+		{
+			return true;
+		}
+
+		// Check if this function is enabled.
+		if (!$this->params->def('check_categories', 1))
+		{
+			return true;
+		}
+
+		$extension = JFactory::getApplication()->input->getString('extension');
+
+		// Default to true if not a core extension
+		$result = true;
+
+		$tableInfo = array(
+			'com_banners' => array('table_name' => '#__banners'),
+			'com_contact' => array('table_name' => '#__contact_details'),
+			'com_content' => array('table_name' => '#__content'),
+			'com_newsfeeds' => array('table_name' => '#__newsfeeds'),
+			'com_weblinks' => array('table_name' => '#__weblinks')
+		);
+
+		// Now check to see if this is a known core extension
+		if (isset($tableInfo[$extension]))
+		{
+			// Get table name for known core extensions
+			$table = $tableInfo[$extension]['table_name'];
+
+			// See if this category has any content items
+			$count = $this->_countItemsInCategory($table, $data->get('id'));
+
+			// Return false if db error
+			if ($count === false)
+			{
+				$result = false;
+			}
+			else
+			{
+				// Show error if items are found in the category
+				if ($count > 0)
+				{
+					$msg = JText::sprintf('COM_CATEGORIES_DELETE_NOT_ALLOWED', $data->get('title'))
+						. JText::plural('COM_CATEGORIES_N_ITEMS_ASSIGNED', $count);
+					JError::raiseWarning(403, $msg);
+					$result = false;
+				}
+
+				// Check for items in any child categories (if it is a leaf, there are no child categories)
+				if (!$data->isLeaf())
+				{
+					$count = $this->_countItemsInChildren($table, $data->get('id'), $data);
+
+					if ($count === false)
+					{
+						$result = false;
+					}
+					elseif ($count > 0)
+					{
+						$msg = JText::sprintf('COM_CATEGORIES_DELETE_NOT_ALLOWED', $data->get('title'))
+							. JText::plural('COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS', $count);
+						JError::raiseWarning(403, $msg);
+						$result = false;
+					}
+				}
+			}
+
+			return $result;
+		}
+	}
+
+	/**
+	 * Get count of items in a category
+	 *
+	 * @param   string   $table  table name of component table (column is catid)
+	 * @param   integer  $catid  id of the category to check
+	 *
+	 * @return  mixed  count of items found or false if db error
+	 *
+	 * @since   1.6
+	 */
+	private function _countItemsInCategory($table, $catid)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Count the items in this category
+		$query->select('COUNT(id)')
+			->from($table)
+			->where('catid = ' . $catid);
+		$db->setQuery($query);
+
+		try
+		{
+			$count = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JError::raiseWarning(500, $e->getMessage());
+
+			return false;
+		}
+
+		return $count;
+	}
+
+	/**
+	 * Get count of items in a category's child categories
+	 *
+	 * @param   string   $table  table name of component table (column is catid)
+	 * @param   integer  $catid  id of the category to check
+	 * @param   object   $data   The data relating to the content that was deleted.
+	 *
+	 * @return  mixed  count of items found or false if db error
+	 *
+	 * @since   1.6
+	 */
+	private function _countItemsInChildren($table, $catid, $data)
+	{
+		$db = JFactory::getDbo();
+
+		// Create subquery for list of child categories
+		$childCategoryTree = $data->getTree();
+
+		// First element in tree is the current category, so we can skip that one
+		unset($childCategoryTree[0]);
+		$childCategoryIds = array();
+
+		foreach ($childCategoryTree as $node)
+		{
+			$childCategoryIds[] = $node->id;
+		}
+
+		// Make sure we only do the query if we have some categories to look in
+		if (count($childCategoryIds))
+		{
+			// Count the items in this category
+			$query = $db->getQuery(true)
+				->select('COUNT(id)')
+				->from($table)
+				->where('catid IN (' . implode(',', $childCategoryIds) . ')');
+			$db->setQuery($query);
+
+			try
+			{
+				$count = $db->loadResult();
+			}
+			catch (RuntimeException $e)
+			{
+				JError::raiseWarning(500, $e->getMessage());
+
+				return false;
+			}
+
+			return $count;
+		}
+		else
+			// If we didn't have any categories to check, return 0
+		{
+			return 0;
+		}
+	}
+
+	/**
+	 * Change the state in core_content if the state in a table is changed
+	 *
+	 * @param   string   $context  The context for the content passed to the plugin.
+	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 */
+	public function onContentChangeState($context, $pks, $value)
+	{
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('core_content_id'))
+			->from($db->quoteName('#__ucm_content'))
+			->where($db->quoteName('core_type_alias') . ' = ' . $db->quote($context))
+			->where($db->quoteName('core_content_item_id') . ' IN (' . $pksImploded = implode(',', $pks) . ')');
+		$db->setQuery($query);
+		$ccIds = $db->loadColumn();
+
+		$cctable = new JTableCorecontent($db);
+		$cctable->publish($ccIds, $value);
+
+		return true;
+	}
+}
diff --git a/core/plugins/content/joomla/joomla.xml b/core/plugins/content/joomla/joomla.xml
new file mode 100644
index 00000000..4e1ff78c
--- /dev/null
+++ b/core/plugins/content/joomla/joomla.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_joomla</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_CONTENT_JOOMLA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="joomla">joomla.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_joomla.ini</language>
+		<language tag="en-GB">en-GB.plg_content_joomla.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="check_categories"
+					type="radio"
+					label="PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_LABEL"
+					description="PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field 
+					name="email_new_fe"
+					type="radio"
+					label="PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_LABEL"
+					description="PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+
+</extension>
diff --git a/core/plugins/content/loadmodule/loadmodule.php b/core/plugins/content/loadmodule/loadmodule.php
new file mode 100644
index 00000000..7e166cd5
--- /dev/null
+++ b/core/plugins/content/loadmodule/loadmodule.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.loadmodule
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugin to enable loading modules into content (e.g. articles)
+ * This uses the {loadmodule} syntax
+ *
+ * @since  1.5
+ */
+class PlgContentLoadmodule extends JPlugin
+{
+	protected static $modules = array();
+
+	protected static $mods = array();
+
+	/**
+	 * Plugin that loads module positions within content
+	 *
+	 * @param   string   $context   The context of the content being passed to the plugin.
+	 * @param   object   &$article  The article object.  Note $article->text is also available
+	 * @param   mixed    &$params   The article params
+	 * @param   integer  $page      The 'page' number
+	 *
+	 * @return  mixed   true if there is an error. Void otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentPrepare($context, &$article, &$params, $page = 0)
+	{
+		// Don't run this plugin when the content is being indexed
+		if ($context === 'com_finder.indexer')
+		{
+			return true;
+		}
+
+		// Simple performance check to determine whether bot should process further
+		if (strpos($article->text, 'loadposition') === false && strpos($article->text, 'loadmodule') === false)
+		{
+			return true;
+		}
+
+		// Expression to search for (positions)
+		$regex = '/{loadposition\s(.*?)}/i';
+		$style = $this->params->def('style', 'none');
+
+		// Expression to search for(modules)
+		$regexmod = '/{loadmodule\s(.*?)}/i';
+		$stylemod = $this->params->def('style', 'none');
+
+		// Find all instances of plugin and put in $matches for loadposition
+		// $matches[0] is full pattern match, $matches[1] is the position
+		preg_match_all($regex, $article->text, $matches, PREG_SET_ORDER);
+
+		// No matches, skip this
+		if ($matches)
+		{
+			foreach ($matches as $match)
+			{
+				$matcheslist = explode(',', $match[1]);
+
+				// We may not have a module style so fall back to the plugin default.
+				if (!array_key_exists(1, $matcheslist))
+				{
+					$matcheslist[1] = $style;
+				}
+
+				$position = trim($matcheslist[0]);
+				$style    = trim($matcheslist[1]);
+
+				$output = $this->_load($position, $style);
+
+				// We should replace only first occurrence in order to allow positions with the same name to regenerate their content:
+				$article->text = preg_replace("|$match[0]|", addcslashes($output, '\\$'), $article->text, 1);
+				$style = $this->params->def('style', 'none');
+			}
+		}
+
+		// Find all instances of plugin and put in $matchesmod for loadmodule
+		preg_match_all($regexmod, $article->text, $matchesmod, PREG_SET_ORDER);
+
+		// If no matches, skip this
+		if ($matchesmod)
+		{
+			foreach ($matchesmod as $matchmod)
+			{
+				$matchesmodlist = explode(',', $matchmod[1]);
+
+				// We may not have a specific module so set to null
+				if (!array_key_exists(1, $matchesmodlist))
+				{
+					$matchesmodlist[1] = null;
+				}
+
+				// We may not have a module style so fall back to the plugin default.
+				if (!array_key_exists(2, $matchesmodlist))
+				{
+					$matchesmodlist[2] = $stylemod;
+				}
+
+				$module = trim($matchesmodlist[0]);
+				$name   = htmlspecialchars_decode(trim($matchesmodlist[1]));
+				$stylemod  = trim($matchesmodlist[2]);
+
+				// $match[0] is full pattern match, $match[1] is the module,$match[2] is the title
+				$output = $this->_loadmod($module, $name, $stylemod);
+
+				// We should replace only first occurrence in order to allow positions with the same name to regenerate their content:
+				$article->text = preg_replace(addcslashes("|$matchmod[0]|", '()'), addcslashes($output, '\\$'), $article->text, 1);
+				$stylemod = $this->params->def('style', 'none');
+			}
+		}
+	}
+
+	/**
+	 * Loads and renders the module
+	 *
+	 * @param   string  $position  The position assigned to the module
+	 * @param   string  $style     The style assigned to the module
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.6
+	 */
+	protected function _load($position, $style = 'none')
+	{
+		self::$modules[$position] = '';
+		$document = JFactory::getDocument();
+		$renderer = $document->loadRenderer('module');
+		$modules  = JModuleHelper::getModules($position);
+		$params   = array('style' => $style);
+		ob_start();
+
+		foreach ($modules as $module)
+		{
+			echo $renderer->render($module, $params);
+		}
+
+		self::$modules[$position] = ob_get_clean();
+
+		return self::$modules[$position];
+	}
+
+	/**
+	 * This is always going to get the first instance of the module type unless
+	 * there is a title.
+	 *
+	 * @param   string  $module  The module title
+	 * @param   string  $title   The title of the module
+	 * @param   string  $style   The style of the module
+	 *
+	 * @return  mixed
+	 *
+	 * @since   1.6
+	 */
+	protected function _loadmod($module, $title, $style = 'none')
+	{
+		self::$mods[$module] = '';
+		$document = JFactory::getDocument();
+		$renderer = $document->loadRenderer('module');
+		$mod      = JModuleHelper::getModule($module, $title);
+
+		// If the module without the mod_ isn't found, try it with mod_.
+		// This allows people to enter it either way in the content
+		if (!isset($mod))
+		{
+			$name = 'mod_' . $module;
+			$mod  = JModuleHelper::getModule($name, $title);
+		}
+
+		$params = array('style' => $style);
+		ob_start();
+
+		if ($mod->id)
+		{
+			echo $renderer->render($mod, $params);
+		}
+
+		self::$mods[$module] = ob_get_clean();
+
+		return self::$mods[$module];
+	}
+}
diff --git a/core/plugins/content/loadmodule/loadmodule.xml b/core/plugins/content/loadmodule/loadmodule.xml
new file mode 100644
index 00000000..86187902
--- /dev/null
+++ b/core/plugins/content/loadmodule/loadmodule.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_loadmodule</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_LOADMODULE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="loadmodule">loadmodule.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_loadmodule.ini</language>
+		<language tag="en-GB">en-GB.plg_content_loadmodule.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="style"
+					type="list"
+					label="PLG_LOADMODULE_FIELD_STYLE_LABEL"
+					description="PLG_LOADMODULE_FIELD_STYLE_DESC"
+					default="table"
+					>
+					<option value="table">PLG_LOADMODULE_FIELD_VALUE_TABLE</option>
+					<option value="horz">PLG_LOADMODULE_FIELD_VALUE_HORIZONTAL</option>
+					<option value="xhtml">PLG_LOADMODULE_FIELD_VALUE_DIVS</option>
+					<option value="rounded">PLG_LOADMODULE_FIELD_VALUE_MULTIPLEDIVS</option>
+					<option value="none">PLG_LOADMODULE_FIELD_VALUE_RAW</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/pagebreak/pagebreak.php b/core/plugins/content/pagebreak/pagebreak.php
new file mode 100644
index 00000000..4ba66411
--- /dev/null
+++ b/core/plugins/content/pagebreak/pagebreak.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.pagebreak
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+jimport('joomla.utilities.utility');
+
+/**
+ * Page break plugin
+ *
+ * <b>Usage:</b>
+ * <code><hr class="system-pagebreak" /></code>
+ * <code><hr class="system-pagebreak" title="The page title" /></code>
+ * or
+ * <code><hr class="system-pagebreak" alt="The first page" /></code>
+ * or
+ * <code><hr class="system-pagebreak" title="The page title" alt="The first page" /></code>
+ * or
+ * <code><hr class="system-pagebreak" alt="The first page" title="The page title" /></code>
+ *
+ * @since  1.6
+ */
+class PlgContentPagebreak extends JPlugin
+{
+	/**
+	 * Plugin that adds a pagebreak into the text and truncates text at that point
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin.
+	 * @param   object   &$row     The article object.  Note $article->text is also available
+	 * @param   mixed    &$params  The article params
+	 * @param   integer  $page     The 'page' number
+	 *
+	 * @return  mixed  Always returns void or true
+	 *
+	 * @since   1.6
+	 */
+	public function onContentPrepare($context, &$row, &$params, $page = 0)
+	{
+		$canProceed = $context === 'com_content.article';
+
+		if (!$canProceed)
+		{
+			return;
+		}
+
+		$style = $this->params->get('style', 'pages');
+
+		// Expression to search for.
+		$regex = '#<hr(.*)class="system-pagebreak"(.*)\/>#iU';
+
+		$input = JFactory::getApplication()->input;
+
+		$print = $input->getBool('print');
+		$showall = $input->getBool('showall');
+
+		if (!$this->params->get('enabled', 1))
+		{
+			$print = true;
+		}
+
+		if ($print)
+		{
+			$row->text = preg_replace($regex, '<br />', $row->text);
+
+			return true;
+		}
+
+		// Simple performance check to determine whether bot should process further.
+		if (StringHelper::strpos($row->text, 'class="system-pagebreak') === false)
+		{
+			if ($page > 0)
+			{
+				throw new Exception(JText::_('JERROR_PAGE_NOT_FOUND'), 404);
+			}
+
+			return true;
+		}
+
+		$view = $input->getString('view');
+		$full = $input->getBool('fullview');
+
+		if (!$page)
+		{
+			$page = 0;
+		}
+
+		if ($full || $view !== 'article' || $params->get('intro_only') || $params->get('popup'))
+		{
+			$row->text = preg_replace($regex, '', $row->text);
+
+			return;
+		}
+
+		// Load plugin language files only when needed (ex: not needed if no system-pagebreak class exists).
+		$this->loadLanguage();
+
+		// Find all instances of plugin and put in $matches.
+		$matches = array();
+		preg_match_all($regex, $row->text, $matches, PREG_SET_ORDER);
+
+		if ($showall && $this->params->get('showall', 1))
+		{
+			$hasToc = $this->params->get('multipage_toc', 1);
+
+			if ($hasToc)
+			{
+				// Display TOC.
+				$page = 1;
+				$this->_createToc($row, $matches, $page);
+			}
+			else
+			{
+				$row->toc = '';
+			}
+
+			$row->text = preg_replace($regex, '<br />', $row->text);
+
+			return true;
+		}
+
+		// Split the text around the plugin.
+		$text = preg_split($regex, $row->text);
+
+		if (!isset($text[$page]))
+		{
+			throw new Exception(JText::_('JERROR_PAGE_NOT_FOUND'), 404);
+		}
+
+		// Count the number of pages.
+		$n = count($text);
+
+		// We have found at least one plugin, therefore at least 2 pages.
+		if ($n > 1)
+		{
+			$title  = $this->params->get('title', 1);
+			$hasToc = $this->params->get('multipage_toc', 1);
+
+			// Adds heading or title to <site> Title.
+			if ($title && $page && isset($matches[$page - 1], $matches[$page - 1][2]))
+			{
+				$attrs = JUtility::parseAttributes($matches[$page - 1][1]);
+
+				if (isset($attrs['title']))
+				{
+					$row->page_title = $attrs['title'];
+				}
+			}
+
+			// Reset the text, we already hold it in the $text array.
+			$row->text = '';
+
+			if ($style === 'pages')
+			{
+				// Display TOC.
+				if ($hasToc)
+				{
+					$this->_createToc($row, $matches, $page);
+				}
+				else
+				{
+					$row->toc = '';
+				}
+
+				// Traditional mos page navigation
+				$pageNav = new JPagination($n, $page, 1);
+
+				// Page counter.
+				$row->text .= '<div class="pagenavcounter">';
+				$row->text .= $pageNav->getPagesCounter();
+				$row->text .= '</div>';
+
+				// Page text.
+				$text[$page] = str_replace('<hr id="system-readmore" />', '', $text[$page]);
+				$row->text .= $text[$page];
+
+				// $row->text .= '<br />';
+				$row->text .= '<div class="pager">';
+
+				// Adds navigation between pages to bottom of text.
+				if ($hasToc)
+				{
+					$this->_createNavigation($row, $page, $n);
+				}
+
+				// Page links shown at bottom of page if TOC disabled.
+				if (!$hasToc)
+				{
+					$row->text .= $pageNav->getPagesLinks();
+				}
+
+				$row->text .= '</div>';
+			}
+			else
+			{
+				$t[] = $text[0];
+
+				$t[] = (string) JHtml::_($style . '.start', 'article' . $row->id . '-' . $style);
+
+				foreach ($text as $key => $subtext)
+				{
+					if ($key >= 1)
+					{
+						$match = $matches[$key - 1];
+						$match = (array) JUtility::parseAttributes($match[0]);
+
+						if (isset($match['alt']))
+						{
+							$title = stripslashes($match['alt']);
+						}
+						elseif (isset($match['title']))
+						{
+							$title = stripslashes($match['title']);
+						}
+						else
+						{
+							$title = JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $key + 1);
+						}
+
+						$t[] = (string) JHtml::_($style . '.panel', $title, 'article' . $row->id . '-' . $style . $key);
+					}
+
+					$t[] = (string) $subtext;
+				}
+
+				$t[] = (string) JHtml::_($style . '.end');
+
+				$row->text = implode(' ', $t);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Creates a Table of Contents for the pagebreak
+	 *
+	 * @param   object   &$row      The article object.  Note $article->text is also available
+	 * @param   array    &$matches  Array of matches of a regex in onContentPrepare
+	 * @param   integer  &$page     The 'page' number
+	 *
+	 * @return  void
+	 *
+	 * @since  1.6
+	 */
+	protected function _createToc(&$row, &$matches, &$page)
+	{
+		$heading = isset($row->title) ? $row->title : JText::_('PLG_CONTENT_PAGEBREAK_NO_TITLE');
+		$input = JFactory::getApplication()->input;
+		$limitstart = $input->getUInt('limitstart', 0);
+		$showall = $input->getInt('showall', 0);
+
+		// TOC header.
+		$row->toc = '<div class="pull-right article-index">';
+
+		if ($this->params->get('article_index') == 1)
+		{
+			$headingtext = JText::_('PLG_CONTENT_PAGEBREAK_ARTICLE_INDEX');
+
+			if ($this->params->get('article_index_text'))
+			{
+				$headingtext = htmlspecialchars($this->params->get('article_index_text'), ENT_QUOTES, 'UTF-8');
+			}
+
+			$row->toc .= '<h3>' . $headingtext . '</h3>';
+		}
+
+		// TOC first Page link.
+		$class = ($limitstart === 0 && $showall === 0) ? 'toclink active' : 'toclink';
+		$row->toc .= '<ul class="nav nav-tabs nav-stacked">
+		<li class="' . $class . '">
+			<a href="'
+			. JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=')
+			. '" class="' . $class . '">' . $heading . '</a>
+		</li>
+		';
+
+		$i = 2;
+
+		foreach ($matches as $bot)
+		{
+			$link = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=' . ($i - 1));
+
+			if (@$bot[0])
+			{
+				$attrs2 = JUtility::parseAttributes($bot[0]);
+
+				if (@$attrs2['alt'])
+				{
+					$title = stripslashes($attrs2['alt']);
+				}
+				elseif (@$attrs2['title'])
+				{
+					$title = stripslashes($attrs2['title']);
+				}
+				else
+				{
+					$title = JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $i);
+				}
+			}
+			else
+			{
+				$title = JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $i);
+			}
+
+			$liClass   = ($limitstart === $i - 1) ? ' class="active"' : '';
+			$class     = ($limitstart === $i - 1) ? 'toclink active' : 'toclink';
+			$row->toc .= '<li' . $liClass . '><a href="' . $link . '" class="' . $class . '">' . $title . '</a></li>';
+			$i++;
+		}
+
+		if ($this->params->get('showall'))
+		{
+			$link      = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=1&limitstart=');
+			$liClass   = ($limitstart === $i - 1) ? ' class="active"' : '';
+			$class     = ($limitstart === $i - 1) ? 'toclink active' : 'toclink';
+			$row->toc .= '<li' . $liClass . '><a href="' . $link . '" class="' . $class . '">'
+				. JText::_('PLG_CONTENT_PAGEBREAK_ALL_PAGES') . '</a></li>';
+		}
+
+		$row->toc .= '</ul></div>';
+	}
+
+	/**
+	 * Creates the navigation for the item
+	 *
+	 * @param   object  &$row  The article object.  Note $article->text is also available
+	 * @param   int     $page  The total number of pages
+	 * @param   int     $n     The page number
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function _createNavigation(&$row, $page, $n)
+	{
+		$pnSpace = '';
+
+		if (JText::_('JGLOBAL_LT') || JText::_('JGLOBAL_LT'))
+		{
+			$pnSpace = ' ';
+		}
+
+		if ($page < $n - 1)
+		{
+			$page_next = $page + 1;
+
+			$link_next = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=' . $page_next);
+
+			// Next >>
+			$next = '<a href="' . $link_next . '">' . JText::_('JNEXT') . $pnSpace . JText::_('JGLOBAL_GT') . JText::_('JGLOBAL_GT') . '</a>';
+		}
+		else
+		{
+			$next = JText::_('JNEXT');
+		}
+
+		if ($page > 0)
+		{
+			$page_prev = $page - 1 === 0 ? '' : $page - 1;
+
+			$link_prev = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language) . '&showall=&limitstart=' . $page_prev);
+
+			// << Prev
+			$prev = '<a href="' . $link_prev . '">' . JText::_('JGLOBAL_LT') . JText::_('JGLOBAL_LT') . $pnSpace . JText::_('JPREV') . '</a>';
+		}
+		else
+		{
+			$prev = JText::_('JPREV');
+		}
+
+		$row->text .= '<ul><li>' . $prev . ' </li><li>' . $next . '</li></ul>';
+	}
+}
diff --git a/core/plugins/content/pagebreak/pagebreak.xml b/core/plugins/content/pagebreak/pagebreak.xml
new file mode 100644
index 00000000..30a235e8
--- /dev/null
+++ b/core/plugins/content/pagebreak/pagebreak.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_pagebreak</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_CONTENT_PAGEBREAK_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="pagebreak">pagebreak.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_pagebreak.ini</language>
+		<language tag="en-GB">en-GB.plg_content_pagebreak.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+
+			<fieldset name="basic">
+				<field
+					name="title"
+					type="radio"
+					label="PLG_CONTENT_PAGEBREAK_SITE_TITLE_LABEL"
+					description="PLG_CONTENT_PAGEBREAK_SITE_TITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="article_index"
+					type="radio"
+					label="PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEX_LABEL"
+					description="PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEX_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="article_index_text"
+					type="text"
+					label="PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEXTEXT"
+					description="PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEXTEXT_DESC"
+					showon="article_index:1"
+				/>
+
+				<field
+					name="multipage_toc"
+					type="radio"
+					label="PLG_CONTENT_PAGEBREAK_TOC_LABEL"
+					description="PLG_CONTENT_PAGEBREAK_TOC_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="showall"
+					type="radio"
+					label="PLG_CONTENT_PAGEBREAK_SHOW_ALL_LABEL"
+					description="PLG_CONTENT_PAGEBREAK_SHOW_ALL_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JSHOW</option>
+					<option value="0">JHIDE</option>
+				</field>
+
+				<field
+					name="style"
+					type="list"
+					label="PLG_CONTENT_PAGEBREAK_STYLE_LABEL"
+					description="PLG_CONTENT_PAGEBREAK_STYLE_DESC"
+					default="pages"
+					>
+					<option value="pages">PLG_CONTENT_PAGEBREAK_PAGES</option>
+					<option value="sliders">PLG_CONTENT_PAGEBREAK_SLIDERS</option>
+					<option value="tabs">PLG_CONTENT_PAGEBREAK_TABS</option>
+				</field>
+			</fieldset>
+
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/pagenavigation/pagenavigation.php b/core/plugins/content/pagenavigation/pagenavigation.php
new file mode 100644
index 00000000..015c4057
--- /dev/null
+++ b/core/plugins/content/pagenavigation/pagenavigation.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.pagenavigation
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Pagenavigation plugin class.
+ *
+ * @since  1.5
+ */
+class PlgContentPagenavigation extends JPlugin
+{
+	/**
+	 * If in the article view and the parameter is enabled shows the page navigation
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin
+	 * @param   object   &$row     The article object
+	 * @param   mixed    &$params  The article params
+	 * @param   integer  $page     The 'page' number
+	 *
+	 * @return  mixed  void or true
+	 *
+	 * @since   1.6
+	 */
+	public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
+	{
+		$app   = JFactory::getApplication();
+		$view  = $app->input->get('view');
+		$print = $app->input->getBool('print');
+
+		if ($print)
+		{
+			return false;
+		}
+
+		if ($context === 'com_content.article' && $view === 'article' && $params->get('show_item_navigation'))
+		{
+			$db       = JFactory::getDbo();
+			$user     = JFactory::getUser();
+			$lang     = JFactory::getLanguage();
+			$nullDate = $db->getNullDate();
+
+			$date = JFactory::getDate();
+			$now  = $date->toSql();
+
+			$uid        = $row->id;
+			$option     = 'com_content';
+			$canPublish = $user->authorise('core.edit.state', $option . '.article.' . $row->id);
+
+			/**
+			 * The following is needed as different menu items types utilise a different param to control ordering.
+			 * For Blogs the `orderby_sec` param is the order controlling param.
+			 * For Table and List views it is the `orderby` param.
+			**/
+			$params_list = $params->toArray();
+
+			if (array_key_exists('orderby_sec', $params_list))
+			{
+				$order_method = $params->get('orderby_sec', '');
+			}
+			else
+			{
+				$order_method = $params->get('orderby', '');
+			}
+
+			// Additional check for invalid sort ordering.
+			if ($order_method === 'front')
+			{
+				$order_method = '';
+			}
+
+			// Get the order code
+			$orderDate = $params->get('order_date');
+			$queryDate = $this->getQueryDate($orderDate);
+
+			// Determine sort order.
+			switch ($order_method)
+			{
+				case 'date' :
+					$orderby = $queryDate;
+					break;
+				case 'rdate' :
+					$orderby = $queryDate . ' DESC ';
+					break;
+				case 'alpha' :
+					$orderby = 'a.title';
+					break;
+				case 'ralpha' :
+					$orderby = 'a.title DESC';
+					break;
+				case 'hits' :
+					$orderby = 'a.hits';
+					break;
+				case 'rhits' :
+					$orderby = 'a.hits DESC';
+					break;
+				case 'order' :
+					$orderby = 'a.ordering';
+					break;
+				case 'author' :
+					$orderby = 'a.created_by_alias, u.name';
+					break;
+				case 'rauthor' :
+					$orderby = 'a.created_by_alias DESC, u.name DESC';
+					break;
+				case 'front' :
+					$orderby = 'f.ordering';
+					break;
+				default :
+					$orderby = 'a.ordering';
+					break;
+			}
+
+			$xwhere = ' AND (a.state = 1 OR a.state = -1)'
+				. ' AND (publish_up = ' . $db->quote($nullDate) . ' OR publish_up <= ' . $db->quote($now) . ')'
+				. ' AND (publish_down = ' . $db->quote($nullDate) . ' OR publish_down >= ' . $db->quote($now) . ')';
+
+			// Array of articles in same category correctly ordered.
+			$query = $db->getQuery(true);
+
+			// Sqlsrv changes
+			$case_when = ' CASE WHEN ' . $query->charLength('a.alias', '!=', '0');
+			$a_id = $query->castAsChar('a.id');
+			$case_when .= ' THEN ' . $query->concatenate(array($a_id, 'a.alias'), ':');
+			$case_when .= ' ELSE ' . $a_id . ' END as slug';
+
+			$case_when1 = ' CASE WHEN ' . $query->charLength('cc.alias', '!=', '0');
+			$c_id = $query->castAsChar('cc.id');
+			$case_when1 .= ' THEN ' . $query->concatenate(array($c_id, 'cc.alias'), ':');
+			$case_when1 .= ' ELSE ' . $c_id . ' END as catslug';
+			$query->select('a.id, a.title, a.catid, a.language,' . $case_when . ',' . $case_when1)
+				->from('#__content AS a')
+				->join('LEFT', '#__categories AS cc ON cc.id = a.catid');
+
+			if ($order_method === 'author' || $order_method === 'rauthor')
+			{
+				$query->select('a.created_by, u.name');
+				$query->join('LEFT', '#__users AS u ON u.id = a.created_by');
+			}
+
+			$query->where(
+					'a.catid = ' . (int) $row->catid . ' AND a.state = ' . (int) $row->state
+						. ($canPublish ? '' : ' AND a.access IN (' . implode(',', JAccess::getAuthorisedViewLevels($user->id)) . ') ') . $xwhere
+				);
+			$query->order($orderby);
+
+			if ($app->isClient('site') && $app->getLanguageFilter())
+			{
+				$query->where('a.language in (' . $db->quote($lang->getTag()) . ',' . $db->quote('*') . ')');
+			}
+
+			$db->setQuery($query);
+			$list = $db->loadObjectList('id');
+
+			// This check needed if incorrect Itemid is given resulting in an incorrect result.
+			if (!is_array($list))
+			{
+				$list = array();
+			}
+
+			reset($list);
+
+			// Location of current content item in array list.
+			$location = array_search($uid, array_keys($list));
+			$rows     = array_values($list);
+
+			$row->prev = null;
+			$row->next = null;
+
+			if ($location - 1 >= 0)
+			{
+				// The previous content item cannot be in the array position -1.
+				$row->prev = $rows[$location - 1];
+			}
+
+			if (($location + 1) < count($rows))
+			{
+				// The next content item cannot be in an array position greater than the number of array postions.
+				$row->next = $rows[$location + 1];
+			}
+
+			if ($row->prev)
+			{
+				$row->prev_label = ($this->params->get('display', 0) == 0) ? JText::_('JPREV') : $row->prev->title;
+				$row->prev = JRoute::_(ContentHelperRoute::getArticleRoute($row->prev->slug, $row->prev->catid, $row->prev->language));
+			}
+			else
+			{
+				$row->prev_label = '';
+				$row->prev = '';
+			}
+
+			if ($row->next)
+			{
+				$row->next_label = ($this->params->get('display', 0) == 0) ? JText::_('JNEXT') : $row->next->title;
+				$row->next = JRoute::_(ContentHelperRoute::getArticleRoute($row->next->slug, $row->next->catid, $row->next->language));
+			}
+			else
+			{
+				$row->next_label = '';
+				$row->next = '';
+			}
+
+			// Output.
+			if ($row->prev || $row->next)
+			{
+				// Get the path for the layout file
+				$path = JPluginHelper::getLayoutPath('content', 'pagenavigation');
+
+				// Render the pagenav
+				ob_start();
+				include $path;
+				$row->pagination = ob_get_clean();
+
+				$row->paginationposition = $this->params->get('position', 1);
+
+				// This will default to the 1.5 and 1.6-1.7 behavior.
+				$row->paginationrelative = $this->params->get('relative', 0);
+			}
+		}
+	}
+
+	/**
+	 * Translate an order code to a field for primary ordering.
+	 *
+	 * @param   string  $orderDate  The ordering code.
+	 *
+	 * @return  string  The SQL field(s) to order by.
+	 *
+	 * @since   3.3
+	 */
+	private static function getQueryDate($orderDate)
+	{
+		$db = JFactory::getDbo();
+
+		switch ($orderDate)
+		{
+			// Use created if modified is not set
+			case 'modified' :
+				$queryDate = ' CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END';
+				break;
+
+			// Use created if publish_up is not set
+			case 'published' :
+				$queryDate = ' CASE WHEN a.publish_up = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END ';
+				break;
+
+			// Use created as default
+			case 'created' :
+			default :
+				$queryDate = ' a.created ';
+				break;
+		}
+
+		return $queryDate;
+	}
+}
diff --git a/core/plugins/content/pagenavigation/pagenavigation.xml b/core/plugins/content/pagenavigation/pagenavigation.xml
new file mode 100644
index 00000000..73e91636
--- /dev/null
+++ b/core/plugins/content/pagenavigation/pagenavigation.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_pagenavigation</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_PAGENAVIGATION_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="pagenavigation">pagenavigation.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_pagenavigation.ini</language>
+		<language tag="en-GB">en-GB.plg_content_pagenavigation.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+
+			<fieldset name="basic">
+				<field
+					name="position"
+					type="list"
+					label="PLG_PAGENAVIGATION_FIELD_POSITION_LABEL"
+					description="PLG_PAGENAVIGATION_FIELD_POSITION_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">PLG_PAGENAVIGATION_FIELD_VALUE_BELOW</option>
+					<option value="0">PLG_PAGENAVIGATION_FIELD_VALUE_ABOVE</option>
+				</field>
+
+				<field
+					name="relative"
+					type="list"
+					label="PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL"
+					description="PLG_PAGENAVIGATION_FIELD_RELATIVE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">PLG_PAGENAVIGATION_FIELD_VALUE_ARTICLE</option>
+					<option value="0">PLG_PAGENAVIGATION_FIELD_VALUE_TEXT</option>
+				</field>
+
+				<field
+					name="display"
+					type="list"
+					label="PLG_PAGENAVIGATION_FIELD_DISPLAY_LABEL"
+					description="PLG_PAGENAVIGATION_FIELD_DISPLAY_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">PLG_PAGENAVIGATION_FIELD_VALUE_NEXTPREV</option>
+					<option value="1">PLG_PAGENAVIGATION_FIELD_VALUE_TITLE</option>
+				</field>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/content/pagenavigation/tmpl/default.php b/core/plugins/content/pagenavigation/tmpl/default.php
new file mode 100644
index 00000000..be90841a
--- /dev/null
+++ b/core/plugins/content/pagenavigation/tmpl/default.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.pagenavigation
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$lang = JFactory::getLanguage(); ?>
+
+<ul class="pager pagenav">
+<?php if ($row->prev) :
+	$direction = $lang->isRtl() ? 'right' : 'left'; ?>
+	<li class="previous">
+		<a class="hasTooltip" title="<?php echo htmlspecialchars($rows[$location-1]->title); ?>" aria-label="<?php echo JText::sprintf('JPREVIOUS_TITLE', htmlspecialchars($rows[$location-1]->title)); ?>" href="<?php echo $row->prev; ?>" rel="prev">
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span> <span aria-hidden="true">' . $row->prev_label . '</span>'; ?>
+		</a>
+	</li>
+<?php endif; ?>
+<?php if ($row->next) :
+	$direction = $lang->isRtl() ? 'left' : 'right'; ?>
+	<li class="next">
+		<a class="hasTooltip" title="<?php echo htmlspecialchars($rows[$location+1]->title); ?>" aria-label="<?php echo JText::sprintf('JNEXT_TITLE', htmlspecialchars($rows[$location+1]->title)); ?>" href="<?php echo $row->next; ?>" rel="next">
+			<?php echo '<span aria-hidden="true">' . $row->next_label . '</span> <span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
+		</a>
+	</li>
+<?php endif; ?>
+</ul>
diff --git a/core/plugins/content/vote/tmpl/rating.php b/core/plugins/content/vote/tmpl/rating.php
new file mode 100644
index 00000000..acbc7522
--- /dev/null
+++ b/core/plugins/content/vote/tmpl/rating.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.vote
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $context  The context of the content being passed to the plugin
+ * @var   object   &$row     The article object
+ * @var   object   &$params  The article params
+ * @var   integer  $page     The 'page' number
+ * @var   array    $parts    The context segments
+ * @var   string   $path     Path to this file
+ */
+
+if ($context == 'com_content.categories')
+{
+	return;
+}
+
+$rating = (int) $row->rating;
+
+// Look for images in template if available
+$starImageOn  = JHtml::_('image', 'system/rating_star.png', JText::_('PLG_VOTE_STAR_ACTIVE'), null, true);
+$starImageOff = JHtml::_('image', 'system/rating_star_blank.png', JText::_('PLG_VOTE_STAR_INACTIVE'), null, true);
+
+$img = '';
+for ($i = 0; $i < $rating; $i++)
+{
+	$img .= $starImageOn;
+}
+
+for ($i = $rating; $i < 5; $i++)
+{
+	$img .= $starImageOff;
+}
+
+?>
+<div class="content_rating" itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">
+	<p class="unseen element-invisible">
+		<?php echo JText::sprintf('PLG_VOTE_USER_RATING', '<span itemprop="ratingValue">' . $rating . '</span>', '<span itemprop="bestRating">5</span>'); ?>
+		<meta itemprop="ratingCount" content="<?php echo (int) $row->rating_count; ?>" />
+		<meta itemprop="worstRating" content="0" />
+	</p>
+	<?php echo $img; ?>
+</div>
diff --git a/core/plugins/content/vote/tmpl/vote.php b/core/plugins/content/vote/tmpl/vote.php
new file mode 100644
index 00000000..3e27ed6e
--- /dev/null
+++ b/core/plugins/content/vote/tmpl/vote.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.vote
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $context  The context of the content being passed to the plugin
+ * @var   object   &$row     The article object
+ * @var   object   &$params  The article params
+ * @var   integer  $page     The 'page' number
+ * @var   array    $parts    The context segments
+ * @var   string   $path     Path to this file
+ */
+
+$uri = clone JUri::getInstance();
+$uri->setVar('hitcount', '0');
+
+// Create option list for voting select box
+$options = array();
+
+for ($i = 1; $i < 6; $i++)
+{
+	$options[] = JHtml::_('select.option', $i, JText::sprintf('PLG_VOTE_VOTE', $i));
+}
+
+?>
+<form method="post" action="<?php echo htmlspecialchars($uri->toString(), ENT_COMPAT, 'UTF-8'); ?>" class="form-inline">
+	<span class="content_vote">
+		<label class="unseen element-invisible" for="content_vote_<?php echo (int) $row->id; ?>"><?php echo JText::_('PLG_VOTE_LABEL'); ?></label>
+		<?php echo JHtml::_('select.genericlist', $options, 'user_rating', null, 'value', 'text', '5', 'content_vote_' . (int) $row->id); ?>
+		&#160;<input class="btn btn-mini" type="submit" name="submit_vote" value="<?php echo JText::_('PLG_VOTE_RATE'); ?>" />
+		<input type="hidden" name="task" value="article.vote" />
+		<input type="hidden" name="hitcount" value="0" />
+		<input type="hidden" name="url" value="<?php echo htmlspecialchars($uri->toString(), ENT_COMPAT, 'UTF-8'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</span>
+</form>
diff --git a/core/plugins/content/vote/vote.php b/core/plugins/content/vote/vote.php
new file mode 100644
index 00000000..82b5cc53
--- /dev/null
+++ b/core/plugins/content/vote/vote.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.vote
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Vote plugin.
+ *
+ * @since  1.5
+ */
+class PlgContentVote extends JPlugin
+{
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.7.0
+	 */
+	protected $app;
+
+	/**
+	 * The position the voting data is displayed in relative to the article.
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $votingPosition;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   3.7.0
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$this->votingPosition = $this->params->get('position', 'top');
+	}
+
+	/**
+	 * Displays the voting area when viewing an article and the voting section is displayed before the article
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin
+	 * @param   object   &$row     The article object
+	 * @param   object   &$params  The article params
+	 * @param   integer  $page     The 'page' number
+	 *
+	 * @return  string|boolean  HTML string containing code for the votes if in com_content else boolean false
+	 *
+	 * @since   1.6
+	 */
+	public function onContentBeforeDisplay($context, &$row, &$params, $page = 0)
+	{
+		if ($this->votingPosition !== 'top')
+		{
+			return '';
+		}
+
+		return $this->displayVotingData($context, $row, $params, $page);
+	}
+
+	/**
+	 * Displays the voting area when viewing an article and the voting section is displayed after the article
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin
+	 * @param   object   &$row     The article object
+	 * @param   object   &$params  The article params
+	 * @param   integer  $page     The 'page' number
+	 *
+	 * @return  string|boolean  HTML string containing code for the votes if in com_content else boolean false
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentAfterDisplay($context, &$row, &$params, $page = 0)
+	{
+		if ($this->votingPosition !== 'bottom')
+		{
+			return '';
+		}
+
+		return $this->displayVotingData($context, $row, $params, $page);
+	}
+
+	/**
+	 * Displays the voting area
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin
+	 * @param   object   &$row     The article object
+	 * @param   object   &$params  The article params
+	 * @param   integer  $page     The 'page' number
+	 *
+	 * @return  string|boolean  HTML string containing code for the votes if in com_content else boolean false
+	 *
+	 * @since   3.7.0
+	 */
+	private function displayVotingData($context, &$row, &$params, $page)
+	{
+		$parts = explode('.', $context);
+
+		if ($parts[0] !== 'com_content')
+		{
+			return false;
+		}
+
+		if (empty($params) || !$params->get('show_vote', null))
+		{
+			return '';
+		}
+
+		// Load plugin language files only when needed (ex: they are not needed if show_vote is not active).
+		$this->loadLanguage();
+
+		// Get the path for the rating summary layout file
+		$path = JPluginHelper::getLayoutPath('content', 'vote', 'rating');
+
+		// Render the layout
+		ob_start();
+		include $path;
+		$html = ob_get_clean();
+
+		if ($this->app->input->getString('view', '') === 'article' && $row->state == 1)
+		{
+			// Get the path for the voting form layout file
+			$path = JPluginHelper::getLayoutPath('content', 'vote', 'vote');
+
+			// Render the layout
+			ob_start();
+			include $path;
+			$html .= ob_get_clean();
+		}
+
+		return $html;
+	}
+}
diff --git a/core/plugins/content/vote/vote.xml b/core/plugins/content/vote/vote.xml
new file mode 100644
index 00000000..42881e6e
--- /dev/null
+++ b/core/plugins/content/vote/vote.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="content" method="upgrade">
+	<name>plg_content_vote</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_VOTE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="vote">vote.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_vote.ini</language>
+		<language tag="en-GB">en-GB.plg_content_vote.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="position"
+					type="list"
+					label="PLG_VOTE_POSITION_LABEL"
+					description="PLG_VOTE_POSITION_DESC"
+					default="top"
+					>
+					<option value="top">PLG_VOTE_TOP</option>
+					<option value="bottom">PLG_VOTE_BOTTOM</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/editors-xtd/article/article.php b/core/plugins/editors-xtd/article/article.php
new file mode 100644
index 00000000..3b35f755
--- /dev/null
+++ b/core/plugins/editors-xtd/article/article.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.article
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Article buton
+ *
+ * @since  1.5
+ */
+class PlgButtonArticle extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @return  JObject  The button options as JObject
+	 *
+	 * @since   1.5
+	 */
+	public function onDisplay($name)
+	{
+		$input = JFactory::getApplication()->input;
+		$user  = JFactory::getUser();
+
+		// Can create in any category (component permission) or at least in one category
+		$canCreateRecords = $user->authorise('core.create', 'com_content')
+			|| count($user->getAuthorisedCategories('com_content', 'core.create')) > 0;
+
+		// Instead of checking edit on all records, we can use **same** check as the form editing view
+		$values = (array) JFactory::getApplication()->getUserState('com_content.edit.article.id');
+		$isEditingRecords = count($values);
+
+		// This ACL check is probably a double-check (form view already performed checks)
+		$hasAccess = $canCreateRecords || $isEditingRecords;
+		if (!$hasAccess)
+		{
+			return;
+		}
+
+		$link = 'index.php?option=com_content&amp;view=articles&amp;layout=modal&amp;tmpl=component&amp;'
+			. JSession::getFormToken() . '=1&amp;editor=' . $name;
+
+		$button = new JObject;
+		$button->modal   = true;
+		$button->class   = 'btn';
+		$button->link    = $link;
+		$button->text    = JText::_('PLG_ARTICLE_BUTTON_ARTICLE');
+		$button->name    = 'file-add';
+		$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+
+		return $button;
+	}
+}
diff --git a/core/plugins/editors-xtd/article/article.xml b/core/plugins/editors-xtd/article/article.xml
new file mode 100644
index 00000000..05863493
--- /dev/null
+++ b/core/plugins/editors-xtd/article/article.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_article</name>
+	<author>Joomla! Project</author>
+	<creationDate>October 2009</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_ARTICLE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="article">article.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_article.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_article.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/contact/contact.php b/core/plugins/editors-xtd/contact/contact.php
new file mode 100644
index 00000000..d51abea5
--- /dev/null
+++ b/core/plugins/editors-xtd/contact/contact.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Contact buton
+ *
+ * @since  3.7.0
+ */
+class PlgButtonContact extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @return  JObject  The button options as JObject
+	 *
+	 * @since   3.7.0
+	 */
+	public function onDisplay($name)
+	{
+		$user  = JFactory::getUser();
+
+		if ($user->authorise('core.create', 'com_contact')
+			|| $user->authorise('core.edit', 'com_contact')
+			|| $user->authorise('core.edit.own', 'com_contact'))
+		{
+			// The URL for the contacts list
+			$link = 'index.php?option=com_contact&amp;view=contacts&amp;layout=modal&amp;tmpl=component&amp;'
+				. JSession::getFormToken() . '=1&amp;editor=' . $name;
+
+			$button          = new JObject;
+			$button->modal   = true;
+			$button->class   = 'btn';
+			$button->link    = $link;
+			$button->text    = JText::_('PLG_EDITORS-XTD_CONTACT_BUTTON_CONTACT');
+			$button->name    = 'address';
+			$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+
+			return $button;
+		}
+	}
+}
diff --git a/core/plugins/editors-xtd/contact/contact.xml b/core/plugins/editors-xtd/contact/contact.xml
new file mode 100644
index 00000000..df5f47a6
--- /dev/null
+++ b/core/plugins/editors-xtd/contact/contact.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.7" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_contact</name>
+	<author>Joomla! Project</author>
+	<creationDate>October 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_EDITORS-XTD_CONTACT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contact">contact.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_contact.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_contact.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/fields/fields.php b/core/plugins/editors-xtd/fields/fields.php
new file mode 100644
index 00000000..0c8f0958
--- /dev/null
+++ b/core/plugins/editors-xtd/fields/fields.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Fields button
+ *
+ * @since  3.7.0
+ */
+class PlgButtonFields extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @return  JObject  The button options as JObject
+	 *
+	 * @since  3.7.0
+	 */
+	public function onDisplay($name)
+	{
+		// Check if com_fields is enabled
+		if (!JComponentHelper::isEnabled('com_fields'))
+		{
+			return;
+		}
+
+		// Register FieldsHelper
+		JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+		// Guess the field context based on view.
+		$jinput = JFactory::getApplication()->input;
+		$context = $jinput->get('option') . '.' . $jinput->get('view');
+
+		// Validate context.
+		$context = implode('.', FieldsHelper::extract($context));
+		if (!FieldsHelper::getFields($context))
+		{
+			return;
+		}
+
+		$link = 'index.php?option=com_fields&amp;view=fields&amp;layout=modal&amp;tmpl=component&amp;context='
+			. $context . '&amp;editor=' . $name . '&amp;' . JSession::getFormToken() . '=1';
+
+		$button          = new JObject;
+		$button->modal   = true;
+		$button->class   = 'btn';
+		$button->link    = $link;
+		$button->text    = JText::_('PLG_EDITORS-XTD_FIELDS_BUTTON_FIELD');
+		$button->name    = 'puzzle';
+		$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+
+		return $button;
+	}
+}
diff --git a/core/plugins/editors-xtd/fields/fields.xml b/core/plugins/editors-xtd/fields/fields.xml
new file mode 100644
index 00000000..a708f59e
--- /dev/null
+++ b/core/plugins/editors-xtd/fields/fields.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.7" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_fields</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_EDITORS-XTD_FIELDS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="fields">fields.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_fields.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_fields.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/image/image.php b/core/plugins/editors-xtd/image/image.php
new file mode 100644
index 00000000..7f424c28
--- /dev/null
+++ b/core/plugins/editors-xtd/image/image.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.image
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Image buton
+ *
+ * @since  1.5
+ */
+class PlgButtonImage extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button.
+	 *
+	 * @param   string   $name    The name of the button to display.
+	 * @param   string   $asset   The name of the asset being edited.
+	 * @param   integer  $author  The id of the author owning the asset being edited.
+	 *
+	 * @return  JObject  The button options as JObject or false if not allowed
+	 *
+	 * @since   1.5
+	 */
+	public function onDisplay($name, $asset, $author)
+	{
+		$app       = JFactory::getApplication();
+		$user      = JFactory::getUser();
+		$extension = $app->input->get('option');
+
+		// For categories we check the extension (ex: component.section)
+		if ($extension === 'com_categories')
+		{
+			$parts     = explode('.', $app->input->get('extension', 'com_content'));
+			$extension = $parts[0];
+		}
+
+		$asset = $asset !== '' ? $asset : $extension;
+
+		if ($user->authorise('core.edit', $asset)
+			|| $user->authorise('core.create', $asset)
+			|| (count($user->getAuthorisedCategories($asset, 'core.create')) > 0)
+			|| ($user->authorise('core.edit.own', $asset) && $author === $user->id)
+			|| (count($user->getAuthorisedCategories($extension, 'core.edit')) > 0)
+			|| (count($user->getAuthorisedCategories($extension, 'core.edit.own')) > 0 && $author === $user->id))
+		{
+			$link = 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;e_name=' . $name . '&amp;asset=' . $asset . '&amp;author=' . $author;
+
+			$button = new JObject;
+			$button->modal   = true;
+			$button->class   = 'btn';
+			$button->link    = $link;
+			$button->text    = JText::_('PLG_IMAGE_BUTTON_IMAGE');
+			$button->name    = 'pictures';
+			$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+
+			return $button;
+		}
+
+		return false;
+	}
+}
diff --git a/core/plugins/editors-xtd/image/image.xml b/core/plugins/editors-xtd/image/image.xml
new file mode 100644
index 00000000..a9b0cfdb
--- /dev/null
+++ b/core/plugins/editors-xtd/image/image.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_image</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_IMAGE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="image">image.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_image.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_image.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/menu/menu.php b/core/plugins/editors-xtd/menu/menu.php
new file mode 100644
index 00000000..132b3d79
--- /dev/null
+++ b/core/plugins/editors-xtd/menu/menu.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.menu
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor menu buton
+ *
+ * @since  3.7.0
+ */
+class PlgButtonMenu extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @since  3.7.0
+	 * @return array
+	 */
+	public function onDisplay($name)
+	{
+		/*
+		 * Use the built-in element view to select the menu item.
+		 * Currently uses blank class.
+		 */
+		$user  = JFactory::getUser();
+
+		if ($user->authorise('core.create', 'com_menus')
+			|| $user->authorise('core.edit', 'com_menus'))
+		{
+		$link = 'index.php?option=com_menus&amp;view=items&amp;layout=modal&amp;tmpl=component&amp;'
+			. JSession::getFormToken() . '=1&amp;editor=' . $name;
+
+		$button          = new JObject;
+		$button->modal   = true;
+		$button->class   = 'btn';
+		$button->link    = $link;
+		$button->text    = JText::_('PLG_EDITORS-XTD_MENU_BUTTON_MENU');
+		$button->name    = 'share-alt';
+		$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+
+		return $button;
+		}
+	}
+}
diff --git a/core/plugins/editors-xtd/menu/menu.xml b/core/plugins/editors-xtd/menu/menu.xml
new file mode 100644
index 00000000..c3897f8e
--- /dev/null
+++ b/core/plugins/editors-xtd/menu/menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.7" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_menu</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_EDITORS-XTD_MENU_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="menu">menu.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_menu.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_menu.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/module/module.php b/core/plugins/editors-xtd/module/module.php
new file mode 100644
index 00000000..092885bb
--- /dev/null
+++ b/core/plugins/editors-xtd/module/module.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.module
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Module button
+ *
+ * @since  3.5
+ */
+class PlgButtonModule extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.5
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @return  JObject  The button options as JObject
+	 *
+	 * @since   3.5
+	 */
+	public function onDisplay($name)
+	{
+		/*
+		 * Use the built-in element view to select the module.
+		 * Currently uses blank class.
+		 */
+		$user  = JFactory::getUser();
+
+		if ($user->authorise('core.create', 'com_modules')
+			|| $user->authorise('core.edit', 'com_modules')
+			|| $user->authorise('core.edit.own', 'com_modules'))
+		{
+			$link = 'index.php?option=com_modules&amp;view=modules&amp;layout=modal&amp;tmpl=component&amp;editor='
+					. $name . '&amp;' . JSession::getFormToken() . '=1';
+
+			$button          = new JObject;
+			$button->modal   = true;
+			$button->class   = 'btn';
+			$button->link    = $link;
+			$button->text    = JText::_('PLG_MODULE_BUTTON_MODULE');
+			$button->name    = 'file-add';
+			$button->options = "{handler: 'iframe', size: {x: 800, y: 500}}";
+
+			return $button;
+		}
+	}
+}
diff --git a/core/plugins/editors-xtd/module/module.xml b/core/plugins/editors-xtd/module/module.xml
new file mode 100644
index 00000000..1b0b8952
--- /dev/null
+++ b/core/plugins/editors-xtd/module/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.6" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_module</name>
+	<author>Joomla! Project</author>
+	<creationDate>October 2015</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>PLG_MODULE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="module">module.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_module.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_module.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/pagebreak/pagebreak.php b/core/plugins/editors-xtd/pagebreak/pagebreak.php
new file mode 100644
index 00000000..7100d096
--- /dev/null
+++ b/core/plugins/editors-xtd/pagebreak/pagebreak.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.pagebreak
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Pagebreak buton
+ *
+ * @since  1.5
+ */
+class PlgButtonPagebreak extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Display the button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @return  JObject  The button options as JObject
+	 *
+	 * @since   1.5
+	 */
+	public function onDisplay($name)
+	{
+		$input = JFactory::getApplication()->input;
+		$user  = JFactory::getUser();
+
+		// Can create in any category (component permission) or at least in one category
+		$canCreateRecords = $user->authorise('core.create', 'com_content')
+			|| count($user->getAuthorisedCategories('com_content', 'core.create')) > 0;
+
+		// Instead of checking edit on all records, we can use **same** check as the form editing view
+		$values = (array) JFactory::getApplication()->getUserState('com_content.edit.article.id');
+		$isEditingRecords = count($values);
+
+		// This ACL check is probably a double-check (form view already performed checks)
+		$hasAccess = $canCreateRecords || $isEditingRecords;
+		if (!$hasAccess)
+		{
+			return;
+		}
+
+		JFactory::getDocument()->addScriptOptions('xtd-pagebreak', array('editor' => $name));
+		$link = 'index.php?option=com_content&amp;view=article&amp;layout=pagebreak&amp;tmpl=component&amp;e_name=' . $name;
+
+		$button          = new JObject;
+		$button->modal   = true;
+		$button->class   = 'btn';
+		$button->link    = $link;
+		$button->text    = JText::_('PLG_EDITORSXTD_PAGEBREAK_BUTTON_PAGEBREAK');
+		$button->name    = 'copy';
+		$button->options = "{handler: 'iframe', size: {x: 500, y: 300}}";
+
+		return $button;
+	}
+}
diff --git a/core/plugins/editors-xtd/pagebreak/pagebreak.xml b/core/plugins/editors-xtd/pagebreak/pagebreak.xml
new file mode 100644
index 00000000..b42f7355
--- /dev/null
+++ b/core/plugins/editors-xtd/pagebreak/pagebreak.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_pagebreak</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2004</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_EDITORSXTD_PAGEBREAK_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="pagebreak">pagebreak.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_pagebreak.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_pagebreak.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors-xtd/readmore/readmore.php b/core/plugins/editors-xtd/readmore/readmore.php
new file mode 100644
index 00000000..d151ffab
--- /dev/null
+++ b/core/plugins/editors-xtd/readmore/readmore.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors-xtd.readmore
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Editor Readmore button
+ *
+ * @since  1.5
+ */
+class PlgButtonReadmore extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Readmore button
+	 *
+	 * @param   string  $name  The name of the button to add
+	 *
+	 * @return  JObject  The button options as JObject
+	 *
+	 * @since   1.5
+	 */
+	public function onDisplay($name)
+	{
+		JHtml::_('script', 'com_content/admin-article-readmore.min.js', array('version' => 'auto', 'relative' => true));
+
+		// Pass some data to javascript
+		JFactory::getDocument()->addScriptOptions(
+			'xtd-readmore',
+			array(
+				'editor' => $this->_subject->getContent($name),
+				'exists' => JText::_('PLG_READMORE_ALREADY_EXISTS', true),
+			)
+		);
+
+		$button = new JObject;
+		$button->modal   = false;
+		$button->class   = 'btn';
+		$button->onclick = 'insertReadmore(\'' . $name . '\');return false;';
+		$button->text    = JText::_('PLG_READMORE_BUTTON_READMORE');
+		$button->name    = 'arrow-down';
+		$button->link    = '#';
+
+		return $button;
+	}
+}
diff --git a/core/plugins/editors-xtd/readmore/readmore.xml b/core/plugins/editors-xtd/readmore/readmore.xml
new file mode 100644
index 00000000..a658a8c7
--- /dev/null
+++ b/core/plugins/editors-xtd/readmore/readmore.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="editors-xtd" method="upgrade">
+	<name>plg_editors-xtd_readmore</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_READMORE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="readmore">readmore.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors-xtd_readmore.ini</language>
+		<language tag="en-GB">en-GB.plg_editors-xtd_readmore.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors/codemirror/codemirror.php b/core/plugins/editors/codemirror/codemirror.php
new file mode 100644
index 00000000..2cb2226b
--- /dev/null
+++ b/core/plugins/editors/codemirror/codemirror.php
@@ -0,0 +1,392 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+/**
+ * CodeMirror Editor Plugin.
+ *
+ * @since  1.6
+ */
+class PlgEditorCodemirror extends JPlugin
+{
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  12.3
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Mapping of syntax to CodeMirror modes.
+	 *
+	 * @var array
+	 */
+	protected $modeAlias = array();
+
+	/**
+	 * Initialises the Editor.
+	 *
+	 * @return  void
+	 */
+	public function onInit()
+	{
+		static $done = false;
+
+		// Do this only once.
+		if ($done)
+		{
+			return;
+		}
+
+		$done = true;
+
+		// Most likely need this later
+		$doc = JFactory::getDocument();
+
+		// Codemirror shall have its own group of plugins to modify and extend its behavior
+		JPluginHelper::importPlugin('editors_codemirror');
+		$dispatcher	= JEventDispatcher::getInstance();
+
+		// At this point, params can be modified by a plugin before going to the layout renderer.
+		$dispatcher->trigger('onCodeMirrorBeforeInit', array(&$this->params));
+
+		$displayData = (object) array('params'  => $this->params);
+
+		// We need to do output buffering here because layouts may actually 'echo' things which we do not want.
+		ob_start();
+		JLayoutHelper::render('editors.codemirror.init', $displayData, __DIR__ . '/layouts');
+		ob_end_clean();
+
+		$font = $this->params->get('fontFamily', 0);
+		$fontInfo = $this->getFontInfo($font);
+
+		if (isset($fontInfo))
+		{
+			if (isset($fontInfo->url))
+			{
+				$doc->addStyleSheet($fontInfo->url);
+			}
+
+			if (isset($fontInfo->css))
+			{
+				$displayData->fontFamily = $fontInfo->css . '!important';
+			}
+		}
+
+		// We need to do output buffering here because layouts may actually 'echo' things which we do not want.
+		ob_start();
+		JLayoutHelper::render('editors.codemirror.styles', $displayData, __DIR__ . '/layouts');
+		ob_end_clean();
+
+		$dispatcher->trigger('onCodeMirrorAfterInit', array(&$this->params));
+	}
+
+	/**
+	 * Copy editor content to form field.
+	 *
+	 * @param   string  $id  The id of the editor field.
+	 *
+	 * @return  string  Javascript
+	 *
+	 * @deprecated 4.0 Code executes directly on submit
+	 */
+	public function onSave($id)
+	{
+		return sprintf('document.getElementById(%1$s).value = Joomla.editors.instances[%1$s].getValue();', json_encode((string) $id));
+	}
+
+	/**
+	 * Get the editor content.
+	 *
+	 * @param   string  $id  The id of the editor field.
+	 *
+	 * @return  string  Javascript
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onGetContent($id)
+	{
+		return sprintf('Joomla.editors.instances[%1$s].getValue();', json_encode((string) $id));
+	}
+
+	/**
+	 * Set the editor content.
+	 *
+	 * @param   string  $id       The id of the editor field.
+	 * @param   string  $content  The content to set.
+	 *
+	 * @return  string  Javascript
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onSetContent($id, $content)
+	{
+		return sprintf('Joomla.editors.instances[%1$s].setValue(%2$s);', json_encode((string) $id), json_encode((string) $content));
+	}
+
+	/**
+	 * Adds the editor specific insert method.
+	 *
+	 * @return  void
+	 *
+	 * @deprecated 4.0 Code is loaded in the init script
+	 */
+	public function onGetInsertMethod()
+	{
+		static $done = false;
+
+		// Do this only once.
+		if ($done)
+		{
+			return true;
+		}
+
+		$done = true;
+
+		JFactory::getDocument()->addScriptDeclaration("
+		;function jInsertEditorText(text, editor) { Joomla.editors.instances[editor].replaceSelection(text); }
+		");
+
+		return true;
+	}
+
+	/**
+	 * Display the editor area.
+	 *
+	 * @param   string   $name     The control name.
+	 * @param   string   $content  The contents of the text area.
+	 * @param   string   $width    The width of the text area (px or %).
+	 * @param   string   $height   The height of the text area (px or %).
+	 * @param   int      $col      The number of columns for the textarea.
+	 * @param   int      $row      The number of rows for the textarea.
+	 * @param   boolean  $buttons  True and the editor buttons will be displayed.
+	 * @param   string   $id       An optional ID for the textarea (note: since 1.6). If not supplied the name is used.
+	 * @param   string   $asset    Not used.
+	 * @param   object   $author   Not used.
+	 * @param   array    $params   Associative array of editor parameters.
+	 *
+	 * @return  string  HTML
+	 */
+	public function onDisplay(
+		$name, $content, $width, $height, $col, $row, $buttons = true, $id = null, $asset = null, $author = null, $params = array())
+	{
+		// True if a CodeMirror already has autofocus. Prevent multiple autofocuses.
+		static $autofocused;
+
+		$id = empty($id) ? $name : $id;
+
+		// Must pass the field id to the buttons in this editor.
+		$buttons = $this->displayButtons($id, $buttons, $asset, $author);
+
+		// Only add "px" to width and height if they are not given as a percentage.
+		$width .= is_numeric($width) ? 'px' : '';
+		$height .= is_numeric($height) ? 'px' : '';
+
+		// Options for the CodeMirror constructor.
+		$options = new stdClass;
+
+		// Is field readonly?
+		if (!empty($params['readonly']))
+		{
+			$options->readOnly = 'nocursor';
+		}
+
+		// Should we focus on the editor on load?
+		if (!$autofocused)
+		{
+			$options->autofocus = isset($params['autofocus']) ? (bool) $params['autofocus'] : false;
+			$autofocused = $options->autofocus;
+		}
+
+		// Until there's a fix for the overflow problem, always wrap lines.
+		$options->lineWrapping = true;
+
+		// Add styling to the active line.
+		$options->styleActiveLine = (boolean) $this->params->get('activeLine', true);
+
+		// Add styling to the active line.
+		if ($this->params->get('selectionMatches', false))
+		{
+			$options->highlightSelectionMatches = array(
+					'showToken' => true,
+					'annotateScrollbar' => true,
+				);
+		}
+
+		// Do we use line numbering?
+		if ($options->lineNumbers = (boolean) $this->params->get('lineNumbers', 0))
+		{
+			$options->gutters[] = 'CodeMirror-linenumbers';
+		}
+
+		// Do we use code folding?
+		if ($options->foldGutter = (boolean) $this->params->get('codeFolding', 1))
+		{
+			$options->gutters[] = 'CodeMirror-foldgutter';
+		}
+
+		// Do we use a marker gutter?
+		if ($options->markerGutter = (boolean) $this->params->get('markerGutter', $this->params->get('marker-gutter', 0)))
+		{
+			$options->gutters[] = 'CodeMirror-markergutter';
+		}
+
+		// Load the syntax mode.
+		$syntax = !empty($params['syntax'])
+			? $params['syntax']
+			: $this->params->get('syntax', 'html');
+		$options->mode = isset($this->modeAlias[$syntax]) ? $this->modeAlias[$syntax] : $syntax;
+
+		// Load the theme if specified.
+		if ($theme = $this->params->get('theme'))
+		{
+			$options->theme = $theme;
+			JHtml::_('stylesheet', $this->params->get('basePath', 'media/editors/codemirror/') . 'theme/' . $theme . '.css', array('version' => 'auto'));
+		}
+
+		// Special options for tagged modes (xml/html).
+		if (in_array($options->mode, array('xml', 'html', 'php')))
+		{
+			// Autogenerate closing tags (html/xml only).
+			$options->autoCloseTags = (boolean) $this->params->get('autoCloseTags', true);
+
+			// Highlight the matching tag when the cursor is in a tag (html/xml only).
+			$options->matchTags = (boolean) $this->params->get('matchTags', true);
+		}
+
+		// Special options for non-tagged modes.
+		if (!in_array($options->mode, array('xml', 'html')))
+		{
+			// Autogenerate closing brackets.
+			$options->autoCloseBrackets = (boolean) $this->params->get('autoCloseBrackets', true);
+
+			// Highlight the matching bracket.
+			$options->matchBrackets = (boolean) $this->params->get('matchBrackets', true);
+		}
+
+		$options->scrollbarStyle = $this->params->get('scrollbarStyle', 'native');
+
+		// KeyMap settings.
+		$options->keyMap = $this->params->get('keyMap', false);
+
+		// Support for older settings.
+		if ($options->keyMap === false)
+		{
+			$options->keyMap = $this->params->get('vimKeyBinding', 0) ? 'vim' : 'default';
+		}
+
+		if ($options->keyMap && $options->keyMap != 'default')
+		{
+			$this->loadKeyMap($options->keyMap);
+		}
+
+		$displayData = (object) array(
+				'options' => $options,
+				'params'  => $this->params,
+				'name'    => $name,
+				'id'      => $id,
+				'cols'    => $col,
+				'rows'    => $row,
+				'content' => $content,
+				'buttons' => $buttons
+			);
+
+		$dispatcher = JEventDispatcher::getInstance();
+
+		// At this point, displayData can be modified by a plugin before going to the layout renderer.
+		$results = $dispatcher->trigger('onCodeMirrorBeforeDisplay', array(&$displayData));
+
+		$results[] = JLayoutHelper::render('editors.codemirror.element', $displayData, __DIR__ . '/layouts', array('debug' => JDEBUG));
+
+		foreach ($dispatcher->trigger('onCodeMirrorAfterDisplay', array(&$displayData)) as $result)
+		{
+			$results[] = $result;
+		}
+
+		return implode("\n", $results);
+	}
+
+	/**
+	 * Displays the editor buttons.
+	 *
+	 * @param   string  $name     Button name.
+	 * @param   mixed   $buttons  [array with button objects | boolean true to display buttons]
+	 * @param   mixed   $asset    Unused.
+	 * @param   mixed   $author   Unused.
+	 *
+	 * @return  string  HTML
+	 */
+	protected function displayButtons($name, $buttons, $asset, $author)
+	{
+		$return = '';
+
+		$args = array(
+			'name'  => $name,
+			'event' => 'onGetInsertMethod'
+		);
+
+		$results = (array) $this->update($args);
+
+		if ($results)
+		{
+			foreach ($results as $result)
+			{
+				if (is_string($result) && trim($result))
+				{
+					$return .= $result;
+				}
+			}
+		}
+
+		if (is_array($buttons) || (is_bool($buttons) && $buttons))
+		{
+			$buttons = $this->_subject->getButtons($name, $buttons, $asset, $author);
+
+			$return .= JLayoutHelper::render('joomla.editors.buttons', $buttons);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Gets font info from the json data file
+	 *
+	 * @param   string  $font  A key from the $fonts array.
+	 *
+	 * @return  object
+	 */
+	protected function getFontInfo($font)
+	{
+		static $fonts;
+
+		if (!$fonts)
+		{
+			$fonts = json_decode(file_get_contents(__DIR__ . '/fonts.json'), true);
+		}
+
+		return isset($fonts[$font]) ? (object) $fonts[$font] : null;
+	}
+
+	/**
+	 * Loads a keyMap file
+	 *
+	 * @param   string  $keyMap  The name of a keyMap file to load.
+	 *
+	 * @return  void
+	 */
+	protected function loadKeyMap($keyMap)
+	{
+		$basePath = $this->params->get('basePath', 'media/editors/codemirror/');
+		$ext = JDEBUG ? '.js' : '.min.js';
+		JHtml::_('script', $basePath . 'keymap/' . $keyMap . $ext, array('version' => 'auto'));
+	}
+}
diff --git a/core/plugins/editors/codemirror/codemirror.xml b/core/plugins/editors/codemirror/codemirror.xml
new file mode 100644
index 00000000..00c66259
--- /dev/null
+++ b/core/plugins/editors/codemirror/codemirror.xml
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.2" type="plugin" group="editors" method="upgrade">
+	<name>plg_editors_codemirror</name>
+	<version>5.38.0</version>
+	<creationDate>28 March 2011</creationDate>
+	<author>Marijn Haverbeke</author>
+	<authorEmail>marijnh@gmail.com</authorEmail>
+	<authorUrl>http://codemirror.net/</authorUrl>
+	<copyright>Copyright (C) 2014 - 2017 by Marijn Haverbeke &lt;marijnh@gmail.com&gt; and others</copyright>
+	<license>MIT license: http://codemirror.net/LICENSE</license>
+	<description>PLG_CODEMIRROR_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="codemirror">codemirror.php</filename>
+		<filename>styles.css</filename>
+		<filename>styles.min.css</filename>
+		<filename>fonts.json</filename>
+		<filename>fonts.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors_codemirror.ini</language>
+		<language tag="en-GB">en-GB.plg_editors_codemirror.sys.ini</language>
+	</languages>
+
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="lineNumbers"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_LINENUMBERS_LABEL"
+					description="PLG_CODEMIRROR_FIELD_LINENUMBERS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="codeFolding"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_CODEFOLDING_LABEL"
+					description="PLG_CODEMIRROR_FIELD_CODEFOLDING_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="markerGutter"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_MARKERGUTTER_LABEL"
+					description="PLG_CODEMIRROR_FIELD_MARKERGUTTER_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="lineWrapping"
+					type="hidden"
+					label="PLG_CODEMIRROR_FIELD_LINEWRAPPING_LABEL"
+					description="PLG_CODEMIRROR_FIELD_LINEWRAPPING_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="activeLine"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL"
+					description="PLG_CODEMIRROR_FIELD_ACTIVELINE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="selectionMatches"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_LABEL"
+					description="PLG_CODEMIRROR_FIELD_SELECTIONMATCHES_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="matchTags"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL"
+					description="PLG_CODEMIRROR_FIELD_MATCHTAGS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="matchBrackets"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL"
+					description="PLG_CODEMIRROR_FIELD_MATCHBRACKETS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="autoCloseTags"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL"
+					description="PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="autoCloseBrackets"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_LABEL"
+					description="PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="options"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+
+				<field
+					name="keyMap"
+					type="list"
+					label="PLG_CODEMIRROR_FIELD_KEYMAP_LABEL"
+					description="PLG_CODEMIRROR_FIELD_KEYMAP_DESC"
+					default=""
+					filter="options"
+					>
+					<option value="">JDEFAULT</option>
+					<option value="emacs">PLG_CODEMIRROR_FIELD_KEYMAP_EMACS</option>
+					<option value="sublime">PLG_CODEMIRROR_FIELD_KEYMAP_SUBLIME</option>
+					<option value="vim">PLG_CODEMIRROR_FIELD_KEYMAP_VIM</option>
+				</field>
+
+				<field
+					name="fullScreen"
+					type="list"
+					label="PLG_CODEMIRROR_FIELD_FULLSCREEN_LABEL"
+					description="PLG_CODEMIRROR_FIELD_FULLSCREEN_DESC"
+					default="F10"
+					filter="options"
+					>
+					<option value="F1">F1</option>
+					<option value="F2">F2</option>
+					<option value="F3">F3</option>
+					<option value="F4">F4</option>
+					<option value="F5">F5</option>
+					<option value="F6">F6</option>
+					<option value="F7">F7</option>
+					<option value="F8">F8</option>
+					<option value="F9">F9</option>
+					<option value="F10">F10</option>
+					<option value="F11">F11</option>
+					<option value="F12">F12</option>
+				</field>
+
+				<field
+					name="fullScreenMod"
+					type="checkboxes"
+					label="PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL"
+					description="PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_DESC"
+					filter="options"
+					>
+					<option value="Shift">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_SHIFT</option>
+					<option value="Cmd">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CMD</option>
+					<option value="Ctrl">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_CTRL</option>
+					<option value="Alt">PLG_CODEMIRROR_FIELD_VALUE_FULLSCREEN_MOD_ALT</option>
+				</field>
+
+				<field
+					name="basePath"
+					type="hidden"
+					default="media/editors/codemirror/"
+				/>
+
+				<field
+					name="modePath"
+					type="hidden"
+					default="media/editors/codemirror/mode/%N/%N"
+				/>
+			</fieldset>
+
+			<fieldset name="appearance" label="PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL" addfieldpath="plugins/editors/codemirror">
+				<field
+					name="theme"
+					type="filelist"
+					label="PLG_CODEMIRROR_FIELD_THEME_LABEL"
+					description="PLG_CODEMIRROR_FIELD_THEME_DESC"
+					default=""
+					filter="\.css$"
+					stripext="true"
+					hide_none="true"
+					hide_default="false"
+					directory="media/editors/codemirror/theme"
+					>
+					<option value="">JDEFAULT</option>
+				</field>
+
+				<field
+					name="activeLineColor"
+					type="color"
+					label="PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_LABEL"
+					description="PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_DESC"
+					default="#a4c2eb"
+					filter="color"
+				/>
+
+				<field
+					name="highlightMatchColor"
+					type="color"
+					label="PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL"
+					description="PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_DESC"
+					default="#fa542f"
+					filter="color"
+				/>
+
+				<field
+					name="fontFamily"
+					type="fonts"
+					label="PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL"
+					description="PLG_CODEMIRROR_FIELD_FONT_FAMILY_DESC"
+					default="0"
+					filter="options"
+					>
+					<option value="0">PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT</option>
+				</field>
+
+				<field
+					name="fontSize"
+					type="integer"
+					label="PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL"
+					description="PLG_CODEMIRROR_FIELD_FONT_SIZE_DESC"
+					first="6"
+					last="16"
+					step="1"
+					default="13"
+					filter="intval"
+				/>
+
+				<field
+					name="lineHeight"
+					type="list"
+					label="PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL"
+					description="PLG_CODEMIRROR_FIELD_LINE_HEIGHT_DESC"
+					default="1.2"
+					filter="options"
+					>
+					<option value="1.0">1.0</option>
+					<option value="1.1">1.1</option>
+					<option value="1.2">1.2</option>
+					<option value="1.3">1.3</option>
+					<option value="1.4">1.4</option>
+					<option value="1.5">1.5</option>
+					<option value="1.6">1.6</option>
+					<option value="1.7">1.7</option>
+					<option value="1.8">1.8</option>
+					<option value="1.9">1.9</option>
+					<option value="2.0">2.0</option>
+				</field>
+
+				<field
+					name="scrollbarStyle"
+					type="radio"
+					label="PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_LABEL"
+					description="PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="native"
+					filter="options"
+					>
+					<option value="native">PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DEFAULT</option>
+					<option value="simple">PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_SIMPLE</option>
+					<option value="overlay">PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_OVERLAY</option>
+				</field>
+
+				<field
+					name="preview"
+					type="editor"
+					label="PLG_CODEMIRROR_FIELD_PREVIEW_LABEL"
+					description="PLG_CODEMIRROR_FIELD_PREVIEW_DESC"
+					editor="codemirror"
+					filter="unset"
+					buttons="false"
+				>
+					<default>
+<![CDATA[
+<script type="text/javascript">
+	jQuery(function ($) {
+		$('.hello').html('Hello World');
+	});
+</script>
+
+<style type="text/css">
+	h1 {
+		background-clip: border-box;
+		background-color: #cacaff;
+		background-image: linear-gradient(45deg, transparent 0px, transparent 30px, #ababff 30px, #ababff 60px, transparent 60px);
+		background-repeat: repeat-x;
+		background-size: 90px 100%;
+		border: 1px solid #8989ff;
+		border-radius: 10px;
+		color: #333;
+		padding: 0 15px;
+	}
+</style>
+
+<div>
+	<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam a ornare lectus, quis semper urna. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Vivamus interdum metus id elit rutrum sollicitudin. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam in fermentum risus, id facilisis nulla. Phasellus gravida erat sed ullamcorper accumsan. Donec blandit sem eget sem congue, a varius sapien semper.</p>
+	<p>Integer euismod tempor convallis. Nullam porttitor et ex ac fringilla. Quisque facilisis est ac erat condimentum malesuada. Aenean commodo quam odio, tincidunt ultricies mauris suscipit et.</p>
+
+	<ul>
+		<li>Vivamus ultrices ligula a odio lacinia pellentesque.</li>
+		<li>Curabitur iaculis arcu pharetra, mollis turpis id, commodo erat.</li>
+		<li>Etiam consequat enim quis faucibus interdum.</li>
+		<li>Morbi in ipsum pulvinar, eleifend lorem sit amet, euismod magna.</li>
+		<li>Donec consectetur lacus vitae eros euismod porta.</li>
+	</ul>
+</div>
+]]>
+					</default>
+				</field>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/editors/codemirror/fonts.json b/core/plugins/editors/codemirror/fonts.json
new file mode 100644
index 00000000..a16b859d
--- /dev/null
+++ b/core/plugins/editors/codemirror/fonts.json
@@ -0,0 +1,107 @@
+{
+	"anonymous_pro": {
+		"name": "Anonymous Pro",
+		"url": "https://fonts.googleapis.com/css?family=Anonymous+Pro",
+		"css": "'Anonymous Pro', monospace"
+	},
+	"cousine": {
+		"name": "Cousine",
+		"url": "https://fonts.googleapis.com/css?family=Cousine",
+		"css": "Cousine, monospace"
+	},
+	"cutive_mono": {
+		"name": "Cutive Mono",
+		"url": "https://fonts.googleapis.com/css?family=Cutive+Mono",
+		"css": "'Cutive Mono', monospace"
+	},
+	"droid_sans_mono": {
+		"name": "Droid Sans Mono",
+		"url": "https://fonts.googleapis.com/css?family=Droid+Sans+Mono",
+		"css": "'Droid Sans Mono', monospace"
+	},
+	"fira_mono": {
+		"name": "Fira Mono",
+		"url": "https://fonts.googleapis.com/css?family=Fira+Mono",
+		"css": "'Fira Mono', monospace"
+	},
+	"ibm_plex_mono": {
+		"name": "IBM Plex Mono",
+		"url": "https://fonts.googleapis.com/css?family=IBM+Plex+Mono",
+		"css": "'IBM Plex Mono', monospace;"
+	},
+	"inconsolata": {
+		"name": "Inconsolata",
+		"url": "https://fonts.googleapis.com/css?family=Inconsolata",
+		"css": "Inconsolata, monospace"
+	},
+	"lekton": {
+		"name": "Lekton",
+		"url": "https://fonts.googleapis.com/css?family=Lekton",
+		"css": "Lekton, monospace"
+	},
+	"nanum_gothic_coding": {
+		"name": "Nanum Gothic Coding",
+		"url": "https://fonts.googleapis.com/css?family=Nanum+Gothic+Coding",
+		"css": "'Nanum Gothic Coding', monospace"
+	},
+	"nova_mono": {
+		"name": "Nova Mono",
+		"url": "https://fonts.googleapis.com/css?family=Nova+Mono",
+		"css": "'Nova Mono', monospace"
+	},
+	"overpass_mono": {
+		"name": "Overpass Mono",
+		"url": "https://fonts.googleapis.com/css?family=Overpass+Mono",
+		"css": "'Overpass Mono', monospace"
+	},
+	"oxygen_mono": {
+		"name": "Oxygen Mono",
+		"url": "https://fonts.googleapis.com/css?family=Oxygen+Mono",
+		"css": "'Oxygen Mono', monospace"
+	},
+	"press_start_2p": {
+		"name": "Press Start 2P",
+		"url": "https://fonts.googleapis.com/css?family=Press+Start+2P",
+		"css": "'Press Start 2P', monospace"
+	},
+	"pt_mono": {
+		"name": "PT Mono",
+		"url": "https://fonts.googleapis.com/css?family=PT+Mono",
+		"css": "'PT Mono', monospace"
+	},
+	"roboto_mono": {
+		"name": "Roboto Mono",
+		"url": "https://fonts.googleapis.com/css?family=Roboto+Mono",
+		"css": "'Roboto Mono', monospace"
+	},
+	"rubik_mono_one": {
+		"name": "Rubik Mono One",
+		"url": "https://fonts.googleapis.com/css?family=Rubik+Mono+One",
+		"css": "'Rubik Mono One', monospace"
+	},
+	"share_tech_mono": {
+		"name": "Share Tech Mono",
+		"url": "https://fonts.googleapis.com/css?family=Share+Tech+Mono",
+		"css": "'Share Tech Mono', monospace"
+	},
+	"source_code_pro": {
+		"name": "Source Code Pro",
+		"url": "https://fonts.googleapis.com/css?family=Source+Code+Pro",
+		"css": "'Source Code Pro', monospace"
+	},
+	"space_mono": {
+		"name": "Space Mono",
+		"url": "https://fonts.googleapis.com/css?family=Space+Mono",
+		"css": "'Space Mono', monospace"
+	},
+	"ubuntu_mono": {
+		"name": "Ubuntu Mono",
+		"url": "https://fonts.googleapis.com/css?family=Ubuntu+Mono",
+		"css": "'Ubuntu Mono', monospace"
+	},
+	"vt323": {
+		"name": "VT323",
+		"url": "https://fonts.googleapis.com/css?family=VT323",
+		"css": "'VT323', monospace"
+	}
+}
diff --git a/core/plugins/editors/codemirror/fonts.php b/core/plugins/editors/codemirror/fonts.php
new file mode 100644
index 00000000..7ba4a0a6
--- /dev/null
+++ b/core/plugins/editors/codemirror/fonts.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Supports an HTML select list of fonts
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ * @since       3.4
+ */
+class JFormFieldFonts extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.4
+	 */
+	protected $type = 'Fonts';
+
+	/**
+	 * Method to get the list of fonts field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   3.4
+	 */
+	protected function getOptions()
+	{
+		$fonts = json_decode(file_get_contents(__DIR__ . '/fonts.json'));
+		$options = array();
+
+		foreach ($fonts as $key => $info)
+		{
+			$options[] = JHtml::_('select.option', $key, $info->name);
+		}
+
+		// Merge any additional options in the XML definition.
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/core/plugins/editors/codemirror/layouts/editors/codemirror/element.php b/core/plugins/editors/codemirror/layouts/editors/codemirror/element.php
new file mode 100644
index 00000000..0a719b8e
--- /dev/null
+++ b/core/plugins/editors/codemirror/layouts/editors/codemirror/element.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+$options = $displayData->options;
+$params  = $displayData->params;
+$name    = $displayData->name;
+$id      = $displayData->id;
+$cols    = $displayData->cols;
+$rows    = $displayData->rows;
+$content = $displayData->content;
+$buttons = $displayData->buttons;
+$modifier = $params->get('fullScreenMod', '') !== '' ? implode($params->get('fullScreenMod', ''), ' + ') . ' + ' : '';
+
+?>
+
+<p class="label">
+    <?php echo JText::sprintf('PLG_CODEMIRROR_TOGGLE_FULL_SCREEN', $modifier, $params->get('fullScreen', 'F10')); ?>
+</p>
+
+<?php
+	echo '<textarea class="codemirror-source" name="', $name,
+		'" id="', $id,
+		'" cols="', $cols,
+		'" rows="', $rows,
+		'" data-options="', htmlspecialchars(json_encode($options)),
+		'">', $content, '</textarea>';
+?>
+
+<?php echo $buttons; ?>
diff --git a/core/plugins/editors/codemirror/layouts/editors/codemirror/init.php b/core/plugins/editors/codemirror/layouts/editors/codemirror/init.php
new file mode 100644
index 00000000..4e9d7fd5
--- /dev/null
+++ b/core/plugins/editors/codemirror/layouts/editors/codemirror/init.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+$params   = $displayData->params;
+$basePath = $params->get('basePath', 'media/editors/codemirror/');
+$modePath = $params->get('modePath', 'media/editors/codemirror/mode/%N/%N');
+$extJS    = JDEBUG ? '.js' : '.min.js';
+$extCSS   = JDEBUG ? '.css' : '.min.css';
+
+JHtml::_('script', $basePath . 'lib/codemirror' . $extJS, array('version' => 'auto'));
+JHtml::_('script', $basePath . 'lib/addons' . $extJS, array('version' => 'auto'));
+JHtml::_('stylesheet', $basePath . 'lib/codemirror' . $extCSS, array('version' => 'auto'));
+JHtml::_('stylesheet', $basePath . 'lib/addons' . $extCSS, array('version' => 'auto'));
+
+$fskeys          = $params->get('fullScreenMod', array());
+$fskeys[]        = $params->get('fullScreen', 'F10');
+$fullScreenCombo = implode('-', $fskeys);
+$fsCombo         = json_encode($fullScreenCombo);
+$modPath         = json_encode(JUri::root(true) . '/' . $modePath . $extJS);
+JFactory::getDocument()->addScriptDeclaration(
+<<<JS
+		;(function (cm, $) {
+			cm.commands.toggleFullScreen = function (cm) {
+				cm.setOption('fullScreen', !cm.getOption('fullScreen'));
+			};
+			cm.commands.closeFullScreen = function (cm) {
+				cm.getOption('fullScreen') && cm.setOption('fullScreen', false);
+			};
+
+			cm.keyMap.default['Ctrl-Q'] = 'toggleFullScreen';
+			cm.keyMap.default[$fsCombo] = 'toggleFullScreen';
+			cm.keyMap.default['Esc'] = 'closeFullScreen';
+			// For mode autoloading.
+			cm.modeURL = $modPath;
+			// Fire this function any time an editor is created.
+			cm.defineInitHook(function (editor)
+			{
+				// Try to set up the mode
+				var mode = cm.findModeByMIME(editor.options.mode || '') ||
+							cm.findModeByName(editor.options.mode || '') ||
+							cm.findModeByExtension(editor.options.mode || '');
+
+				cm.autoLoadMode(editor, mode ? mode.mode : editor.options.mode);
+
+				if (mode)
+				{
+					editor.setOption('mode', mode.mode);
+				}
+
+				// Handle gutter clicks (place or remove a marker).
+				editor.on('gutterClick', function (ed, n, gutter) {
+					if (gutter != 'CodeMirror-markergutter') { return; }
+					var info = ed.lineInfo(n),
+						hasMarker = !!info.gutterMarkers && !!info.gutterMarkers['CodeMirror-markergutter'];
+					ed.setGutterMarker(n, 'CodeMirror-markergutter', hasMarker ? null : makeMarker());
+				});
+
+				// jQuery's ready function.
+				$(function () {
+					// Some browsers do something weird with the fieldset which doesn't work well with CodeMirror. Fix it.
+					$(editor.getWrapperElement()).parent('fieldset').css('min-width', 0);
+					// Listen for Bootstrap's 'shown' event. If this editor was in a hidden element when created, it may need to be refreshed.
+					$(document.body).on('shown shown.bs.tab shown.bs.modal', function () { editor.refresh(); });
+				});
+			});
+
+			function makeMarker()
+			{
+				var marker = document.createElement('div');
+				marker.className = 'CodeMirror-markergutter-mark';
+				return marker;
+			}
+
+			// Initialize any CodeMirrors on page load and when a subform is added
+			$(function ($) {
+				initCodeMirror();
+				$('body').on('subform-row-add', initCodeMirror);
+			});
+
+			function initCodeMirror(event, container)
+			{
+				container = container || document;
+				$(container).find('textarea.codemirror-source').each(function () {
+					var input = $(this).removeClass('codemirror-source');
+					var id = input.prop('id');
+
+					Joomla.editors.instances[id] = cm.fromTextArea(this, input.data('options'));
+				});
+			}
+
+		}(CodeMirror, jQuery));
+JS
+);
diff --git a/core/plugins/editors/codemirror/layouts/editors/codemirror/styles.php b/core/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
new file mode 100644
index 00000000..20d82913
--- /dev/null
+++ b/core/plugins/editors/codemirror/layouts/editors/codemirror/styles.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.codemirror
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die;
+
+$params     = $displayData->params;
+$fontFamily = isset($displayData->fontFamily) ? $displayData->fontFamily : 'monospace';
+$fontSize   = $params->get('fontSize', 13) . 'px;';
+$lineHeight = $params->get('lineHeight', 1.2) . 'em;';
+
+// Set the active line color.
+$color           = $params->get('activeLineColor', '#a4c2eb');
+$r               = hexdec($color{1} . $color{2});
+$g               = hexdec($color{3} . $color{4});
+$b               = hexdec($color{5} . $color{6});
+$activeLineColor = 'rgba(' . $r . ', ' . $g . ', ' . $b . ', .5)';
+
+// Set the color for matched tags.
+$color               = $params->get('highlightMatchColor', '#fa542f');
+$r                   = hexdec($color{1} . $color{2});
+$g                   = hexdec($color{3} . $color{4});
+$b                   = hexdec($color{5} . $color{6});
+$highlightMatchColor = 'rgba(' . $r . ', ' . $g . ', ' . $b . ', .5)';
+
+JFactory::getDocument()->addStyleDeclaration(
+<<<CSS
+		.CodeMirror
+		{
+			font-family: $fontFamily;
+			font-size: $fontSize;
+			line-height: $lineHeight;
+			border: 1px solid #ccc;
+		}
+		/* In order to hid the Joomla menu */
+		.CodeMirror-fullscreen
+		{
+			z-index: 1040;
+		}
+		/* Make the fold marker a little more visible/nice */
+		.CodeMirror-foldmarker
+		{
+			background: rgb(255, 128, 0);
+			background: rgba(255, 128, 0, .5);
+			box-shadow: inset 0 0 2px rgba(255, 255, 255, .5);
+			font-family: serif;
+			font-size: 90%;
+			border-radius: 1em;
+			padding: 0 1em;
+			vertical-align: middle;
+			color: white;
+			text-shadow: none;
+		}
+		.CodeMirror-foldgutter, .CodeMirror-markergutter { width: 1.2em; text-align: center; }
+		.CodeMirror-markergutter { cursor: pointer; }
+		.CodeMirror-markergutter-mark { cursor: pointer; text-align: center; }
+		.CodeMirror-markergutter-mark:after { content: "\25CF"; }
+		.CodeMirror-activeline-background { background: $activeLineColor; }
+		.CodeMirror-matchingtag { background: $highlightMatchColor; }
+		.cm-matchhighlight {background-color: $highlightMatchColor; }
+		.CodeMirror-selection-highlight-scrollbar {background-color: $highlightMatchColor; }
+CSS
+);
diff --git a/core/plugins/editors/none/none.php b/core/plugins/editors/none/none.php
new file mode 100644
index 00000000..8c3af2a6
--- /dev/null
+++ b/core/plugins/editors/none/none.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.none
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plain Textarea Editor Plugin
+ *
+ * @since  1.5
+ */
+class PlgEditorNone extends JPlugin
+{
+	/**
+	 * Method to handle the onInitEditor event.
+	 *  - Initialises the Editor
+	 *
+	 * @return  void
+	 *
+	 * @since 1.5
+	 */
+	public function onInit()
+	{
+		JHtml::_('script', 'editors/none/none.min.js', array('version' => 'auto', 'relative' => true));
+	}
+
+	/**
+	 * Copy editor content to form field.
+	 *
+	 * Not applicable in this editor.
+	 *
+	 * @param   string  $editor  the editor id
+	 *
+	 * @return  void
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onSave($editor)
+	{
+	}
+
+	/**
+	 * Get the editor content.
+	 *
+	 * @param   string  $id  The id of the editor field.
+	 *
+	 * @return  string
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onGetContent($id)
+	{
+		return 'Joomla.editors.instances[' . json_encode($id) . '].getValue();';
+	}
+
+	/**
+	 * Set the editor content.
+	 *
+	 * @param   string  $id    The id of the editor field.
+	 * @param   string  $html  The content to set.
+	 *
+	 * @return  string
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onSetContent($id, $html)
+	{
+		return 'Joomla.editors.instances[' . json_encode($id) . '].setValue(' . json_encode($html) . ');';
+	}
+
+	/**
+	 * Inserts html code into the editor
+	 *
+	 * @param   string  $id  The id of the editor field
+	 *
+	 * @return  void
+	 *
+	 * @deprecated 4.0
+	 */
+	public function onGetInsertMethod($id)
+	{
+	}
+
+	/**
+	 * Display the editor area.
+	 *
+	 * @param   string   $name     The control name.
+	 * @param   string   $content  The contents of the text area.
+	 * @param   string   $width    The width of the text area (px or %).
+	 * @param   string   $height   The height of the text area (px or %).
+	 * @param   integer  $col      The number of columns for the textarea.
+	 * @param   integer  $row      The number of rows for the textarea.
+	 * @param   boolean  $buttons  True and the editor buttons will be displayed.
+	 * @param   string   $id       An optional ID for the textarea (note: since 1.6). If not supplied the name is used.
+	 * @param   string   $asset    The object asset
+	 * @param   object   $author   The author.
+	 * @param   array    $params   Associative array of editor parameters.
+	 *
+	 * @return  string
+	 */
+	public function onDisplay($name, $content, $width, $height, $col, $row, $buttons = true,
+		$id = null, $asset = null, $author = null, $params = array())
+	{
+		if (empty($id))
+		{
+			$id = $name;
+		}
+
+		// Only add "px" to width and height if they are not given as a percentage
+		if (is_numeric($width))
+		{
+			$width .= 'px';
+		}
+
+		if (is_numeric($height))
+		{
+			$height .= 'px';
+		}
+
+		$readonly = !empty($params['readonly']) ? ' readonly disabled' : '';
+
+		$editor = '<div class="js-editor-none">'
+			. '<textarea name="' . $name . '" id="' . $id . '" cols="' . $col . '" rows="' . $row
+			. '" style="width: ' . $width . '; height: ' . $height . ';"' . $readonly . '>' . $content . '</textarea>'
+			. $this->_displayButtons($id, $buttons, $asset, $author)
+			. '</div>';
+
+		return $editor;
+	}
+
+	/**
+	 * Displays the editor buttons.
+	 *
+	 * @param   string  $name     The control name.
+	 * @param   mixed   $buttons  [array with button objects | boolean true to display buttons]
+	 * @param   string  $asset    The object asset
+	 * @param   object  $author   The author.
+	 *
+	 * @return  void|string HTML
+	 */
+	public function _displayButtons($name, $buttons, $asset, $author)
+	{
+		if (is_array($buttons) || (is_bool($buttons) && $buttons))
+		{
+			$buttons = $this->_subject->getButtons($name, $buttons, $asset, $author);
+
+			return JLayoutHelper::render('joomla.editors.buttons', $buttons);
+		}
+	}
+}
diff --git a/core/plugins/editors/none/none.xml b/core/plugins/editors/none/none.xml
new file mode 100644
index 00000000..4751fd1d
--- /dev/null
+++ b/core/plugins/editors/none/none.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="editors" method="upgrade">
+	<name>plg_editors_none</name>
+	<version>3.0.0</version>
+	<creationDate>September 2005</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>PLG_NONE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="none">none.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors_none.ini</language>
+		<language tag="en-GB">en-GB.plg_editors_none.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/editors/tinymce/field/skins.php b/core/plugins/editors/tinymce/field/skins.php
new file mode 100644
index 00000000..425e82bb
--- /dev/null
+++ b/core/plugins/editors/tinymce/field/skins.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.form.helper');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Generates the list of options for available skins.
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ * @since       3.4
+ */
+class JFormFieldSkins extends JFormFieldList
+{
+	protected $type = 'skins';
+
+	/**
+	 * Method to get the skins options.
+	 *
+	 * @return  array  The skins option objects.
+	 *
+	 * @since   3.4
+	 */
+	public function getOptions()
+	{
+		$options = array();
+
+		$directories = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
+
+		for ($i = 0, $iMax = count($directories); $i < $iMax; ++$i)
+		{
+			$dir = basename($directories[$i]);
+			$options[] = JHtml::_('select.option', $i, $dir);
+		}
+
+		$options = array_merge(parent::getOptions(), $options);
+
+		return $options;
+	}
+
+	/**
+	 * Method to get the field input markup for the list of skins.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.4
+	 */
+	protected function getInput()
+	{
+		$html = array();
+
+		// Get the field options.
+		$options = (array) $this->getOptions();
+
+		// Create a regular list.
+		$html[] = JHtml::_('select.genericlist', $options, $this->name, '', 'value', 'text', $this->value, $this->id);
+
+		return implode($html);
+	}
+}
diff --git a/core/plugins/editors/tinymce/field/tinymcebuilder.php b/core/plugins/editors/tinymce/field/tinymcebuilder.php
new file mode 100644
index 00000000..1853c7f1
--- /dev/null
+++ b/core/plugins/editors/tinymce/field/tinymcebuilder.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Form Field class for the TinyMCE editor.
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ * @since       3.7.0
+ */
+class JFormFieldTinymceBuilder extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $type = 'tinymcebuilder';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.7.0
+	 */
+	protected $layout = 'plugins.editors.tinymce.field.tinymcebuilder';
+
+	/**
+	 * The prepared layout data
+	 *
+	 * @var    array
+	 * @since  3.7.0
+	 */
+	protected $layoutData = array();
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since  3.7.0
+	 */
+	protected function getLayoutData()
+	{
+		if (!empty($this->layoutData))
+		{
+			return $this->layoutData;
+		}
+
+		$data       = parent::getLayoutData();
+		$paramsAll  = (object) $this->form->getValue('params');
+		$setsAmount = empty($paramsAll->sets_amount) ? 3 : $paramsAll->sets_amount;
+
+		if (empty($data['value']))
+		{
+			$data['value'] = array();
+		}
+
+		// Get the plugin
+		require_once JPATH_PLUGINS . '/editors/tinymce/tinymce.php';
+
+		$menus = array(
+			'edit'   => array('label' => 'Edit'),
+			'insert' => array('label' => 'Insert'),
+			'view'   => array('label' => 'View'),
+			'format' => array('label' => 'Format'),
+			'table'  => array('label' => 'Table'),
+			'tools'  => array('label' => 'Tools'),
+		);
+
+		$data['menus']         = $menus;
+		$data['menubarSource'] = array_keys($menus);
+		$data['buttons']       = PlgEditorTinymce::getKnownButtons();
+		$data['buttonsSource'] = array_keys($data['buttons']);
+		$data['toolbarPreset'] = PlgEditorTinymce::getToolbarPreset();
+		$data['setsAmount']    = $setsAmount;
+
+		// Get array of sets names
+		for ($i = 0; $i < $setsAmount; $i++)
+		{
+			$data['setsNames'][$i] = JText::sprintf('PLG_TINY_SET_TITLE', $i);
+		}
+
+		// Prepare the forms for each set
+		$setsForms  = array();
+		$formsource = JPATH_PLUGINS . '/editors/tinymce/form/setoptions.xml';
+
+		// Preload an old params for B/C
+		$setParams = new stdClass;
+		if (!empty($paramsAll->html_width) && empty($paramsAll->configuration['setoptions']))
+		{
+			$plugin = JPluginHelper::getPlugin('editors', 'tinymce');
+
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('PLG_TINY_LEGACY_WARNING', '#'), 'warning');
+
+			if (is_object($plugin) && !empty($plugin->params))
+			{
+				$setParams = (object) json_decode($plugin->params);
+			}
+		}
+
+		// Collect already used groups
+		$groupsInUse = array();
+
+		// Prepare the Set forms, for the set options
+		foreach (array_keys($data['setsNames']) as $num)
+		{
+			$formname = 'set.form.' . $num;
+			$control  = $this->name . '[setoptions][' . $num . ']';
+
+			$setsForms[$num] = JForm::getInstance($formname, $formsource, array('control' => $control));
+
+			// Check whether we already have saved values or it first time or even old params
+			if (empty($this->value['setoptions'][$num]))
+			{
+				$formValues = $setParams;
+
+				/*
+				 * Predefine group:
+				 * Set 0: for Administrator, Editor, Super Users (4,7,8)
+				 * Set 1: for Registered, Manager (2,6), all else are public
+				 */
+				$formValues->access = !$num ? array(4,7,8) : ($num === 1 ? array(2,6) : array());
+
+				// Assign Public to the new Set, but only when it not in use already
+				if (empty($formValues->access) && !in_array(1, $groupsInUse))
+				{
+					$formValues->access = array(1);
+				}
+			}
+			else
+			{
+				$formValues = (object) $this->value['setoptions'][$num];
+			}
+
+			// Collect already used groups
+			if (!empty($formValues->access))
+			{
+				$groupsInUse = array_merge($groupsInUse, $formValues->access);
+			}
+
+			// Bind the values
+			$setsForms[$num]->bind($formValues);
+		}
+
+		krsort($data['setsNames']);
+
+		$data['setsForms'] = $setsForms;
+
+		// Check for TinyMCE language file
+		$language      = JFactory::getLanguage();
+		$languageFile1 = 'media/editors/tinymce/langs/' . $language->getTag() . '.js';
+		$languageFile2 = 'media/editors/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . '.js';
+
+		$data['languageFile'] = '';
+
+		if (file_exists(JPATH_ROOT . '/' . $languageFile1))
+		{
+			$data['languageFile'] = $languageFile1;
+		}
+		elseif (file_exists(JPATH_ROOT . '/' . $languageFile2))
+		{
+			$data['languageFile'] = $languageFile2;
+		}
+
+		$this->layoutData = $data;
+
+		return $data;
+	}
+
+}
diff --git a/core/plugins/editors/tinymce/field/uploaddirs.php b/core/plugins/editors/tinymce/field/uploaddirs.php
new file mode 100644
index 00000000..cf326d1c
--- /dev/null
+++ b/core/plugins/editors/tinymce/field/uploaddirs.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+jimport('joomla.form.helper');
+
+JFormHelper::loadFieldClass('folderlist');
+
+/**
+ * Generates the list of directories  available for drag and drop upload.
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ * @since       3.7.0
+ */
+class JFormFieldUploaddirs extends JFormFieldFolderList
+{
+	protected $type = 'uploaddirs';
+
+	/**
+	 * Method to attach a JForm object to the field.
+	 *
+	 * @param   SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed             $value    The form field value to validate.
+	 * @param   string            $group    The field name group control value. This acts as an array container for the field.
+	 *                                      For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                      full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @see     JFormField::setup()
+	 * @since   3.7.0
+	 */
+	public function setup(SimpleXMLElement $element, $value, $group = null)
+	{
+		$return = parent::setup($element, $value, $group);
+
+		// Get the path in which to search for file options.
+		$this->directory   = JComponentHelper::getParams('com_media')->get('image_path');
+		$this->recursive   = true;
+		$this->hideDefault = true;
+
+		return $return;
+	}
+
+	/**
+	 * Method to get the directories options.
+	 *
+	 * @return  array  The dirs option objects.
+	 *
+	 * @since   3.7.0
+	 */
+	public function getOptions()
+	{
+		return parent::getOptions();
+	}
+
+	/**
+	 * Method to get the field input markup for the list of directories.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.7.0
+	 */
+	protected function getInput()
+	{
+		$html = array();
+
+		// Get the field options.
+		$options = (array) $this->getOptions();
+
+		// Reset the non selected value to null
+		if ($options[0]->value === '-1')
+		{
+			$options[0]->value = '';
+		}
+
+		// Create a regular list.
+		$html[] = JHtml::_('select.genericlist', $options, $this->name, '', 'value', 'text', $this->value, $this->id);
+
+		return implode($html);
+	}
+}
diff --git a/core/plugins/editors/tinymce/form/setoptions.xml b/core/plugins/editors/tinymce/form/setoptions.xml
new file mode 100644
index 00000000..c2d1a722
--- /dev/null
+++ b/core/plugins/editors/tinymce/form/setoptions.xml
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+    <field
+        name="access"
+        type="usergrouplist"
+        label="PLG_TINY_FIELD_SETACCESS_LABEL"
+        description="PLG_TINY_FIELD_SETACCESS_DESC"
+        multiple="true"
+        class="access-select"
+        labelclass="label label-success"
+    />
+
+    <field
+        name="skins"
+        type="note"
+        label="PLG_TINY_FIELD_SKIN_INFO_LABEL"
+        description="PLG_TINY_FIELD_SKIN_INFO_DESC"
+    />
+
+    <field
+        name="skin"
+        type="skins"
+        label="PLG_TINY_FIELD_SKIN_LABEL"
+        description="PLG_TINY_FIELD_SKIN_DESC"
+    />
+
+    <field
+        name="skin_admin"
+        type="skins"
+        label="PLG_TINY_FIELD_SKIN_ADMIN_LABEL"
+        description="PLG_TINY_FIELD_SKIN_ADMIN_DESC"
+    />
+
+    <field
+        name="mobile"
+        type="radio"
+        label="PLG_TINY_FIELD_MOBILE_LABEL"
+        description="PLG_TINY_FIELD_MOBILE_DESC"
+        class="btn-group btn-group-yesno"
+        default="0"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="drag_drop"
+        type="radio"
+        label="PLG_TINY_FIELD_DRAG_DROP_LABEL"
+        description="PLG_TINY_FIELD_DRAG_DROP_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="path"
+        type="uploaddirs"
+        label="PLG_TINY_FIELD_CUSTOM_PATH_LABEL"
+        description="PLG_TINY_FIELD_CUSTOM_PATH_DESC"
+        class="input-xxlarge"
+        showon="drag_drop:1"
+    />
+
+    <field
+        name="entity_encoding"
+        type="list"
+        label="PLG_TINY_FIELD_ENCODING_LABEL"
+        description="PLG_TINY_FIELD_ENCODING_DESC"
+        default="raw"
+        >
+        <option value="named">PLG_TINY_FIELD_VALUE_NAMED</option>
+        <option value="numeric">PLG_TINY_FIELD_VALUE_NUMERIC</option>
+        <option value="raw">PLG_TINY_FIELD_VALUE_RAW</option>
+    </field>
+
+    <field
+        name="lang_mode"
+        type="radio"
+        label="PLG_TINY_FIELD_LANGSELECT_LABEL"
+        description="PLG_TINY_FIELD_LANGSELECT_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="lang_code"
+        type="filelist"
+        label="PLG_TINY_FIELD_LANGCODE_LABEL"
+        description="PLG_TINY_FIELD_LANGCODE_DESC"
+        class="inputbox"
+        stripext="1"
+        directory="media/editors/tinymce/langs/"
+        hide_none="1"
+        default="en"
+        hide_default="1"
+        filter="\.js$"
+        size="10"
+        showon="lang_mode:0"
+    />
+
+    <field
+        name="text_direction"
+        type="list"
+        label="PLG_TINY_FIELD_DIRECTION_LABEL"
+        description="PLG_TINY_FIELD_DIRECTION_DESC"
+        default="ltr"
+        >
+        <option value="ltr">PLG_TINY_FIELD_VALUE_LTR</option>
+        <option value="rtl">PLG_TINY_FIELD_VALUE_RTL</option>
+    </field>
+
+    <field
+        name="content_css"
+        type="radio"
+        label="PLG_TINY_FIELD_CSS_LABEL"
+        description="PLG_TINY_FIELD_CSS_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="content_css_custom"
+        type="text"
+        label="PLG_TINY_FIELD_CUSTOM_CSS_LABEL"
+        description="PLG_TINY_FIELD_CUSTOM_CSS_DESC"
+        class="input-xxlarge"
+    />
+
+    <field
+        name="relative_urls"
+        type="list"
+        label="PLG_TINY_FIELD_URLS_LABEL"
+        description="PLG_TINY_FIELD_URLS_DESC"
+        default="1"
+        >
+        <option value="0">PLG_TINY_FIELD_VALUE_ABSOLUTE</option>
+        <option value="1">PLG_TINY_FIELD_VALUE_RELATIVE</option>
+    </field>
+
+    <field
+        name="newlines"
+        type="list"
+        label="PLG_TINY_FIELD_NEWLINES_LABEL"
+        description="PLG_TINY_FIELD_NEWLINES_DESC"
+        default="0"
+        >
+        <option value="1">PLG_TINY_FIELD_VALUE_BR</option>
+        <option value="0">PLG_TINY_FIELD_VALUE_P</option>
+    </field>
+
+    <field
+        name="use_config_textfilters"
+        type="radio"
+        label="PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL"
+        description="PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC"
+        class="btn-group btn-group-yesno"
+        default="0"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="invalid_elements"
+        type="text"
+        label="PLG_TINY_FIELD_PROHIBITED_LABEL"
+        description="PLG_TINY_FIELD_PROHIBITED_DESC"
+        showon="use_config_textfilters:0"
+        default="script,applet,iframe"
+        class="input-xxlarge"
+    />
+
+    <field
+        name="valid_elements"
+        type="text"
+        label="PLG_TINY_FIELD_VALIDELEMENTS_LABEL"
+        description="PLG_TINY_FIELD_VALIDELEMENTS_DESC"
+        showon="use_config_textfilters:0"
+        class="input-xxlarge"
+    />
+
+    <field
+        name="extended_elements"
+        type="text"
+        label="PLG_TINY_FIELD_ELEMENTS_LABEL"
+        description="PLG_TINY_FIELD_ELEMENTS_DESC"
+        showon="use_config_textfilters:0"
+        class="input-xxlarge"
+    />
+
+    <!-- Extra plugins -->
+    <field
+        name="resizing"
+        type="radio"
+        label="PLG_TINY_FIELD_RESIZING_LABEL"
+        description="PLG_TINY_FIELD_RESIZING_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="resize_horizontal"
+        type="radio"
+        label="PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL"
+        description="PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        showon="resizing:1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="element_path"
+        type="radio"
+        label="PLG_TINY_FIELD_PATH_LABEL"
+        description="PLG_TINY_FIELD_PATH_DESC"
+        class="btn-group btn-group-yesno"
+        default="0"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="wordcount"
+        type="radio"
+        label="PLG_TINY_FIELD_WORDCOUNT_LABEL"
+        description="PLG_TINY_FIELD_WORDCOUNT_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="image_advtab"
+        type="radio"
+        label="PLG_TINY_FIELD_ADVIMAGE_LABEL"
+        description="PLG_TINY_FIELD_ADVIMAGE_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="advlist"
+        type="radio"
+        label="PLG_TINY_FIELD_ADVLIST_LABEL"
+        description="PLG_TINY_FIELD_ADVLIST_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="contextmenu"
+        type="radio"
+        label="PLG_TINY_FIELD_CONTEXTMENU_LABEL"
+        description="PLG_TINY_FIELD_CONTEXTMENU_DESC"
+        class="btn-group btn-group-yesno"
+        default="1"
+        >
+        <option value="1">JON</option>
+        <option value="0">JOFF</option>
+    </field>
+
+    <field
+        name="custom_plugin"
+        type="text"
+        label="PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL"
+        description="PLG_TINY_FIELD_CUSTOMPLUGIN_DESC"
+        class="input-xxlarge"
+    />
+
+    <field
+        name="custom_button"
+        type="text"
+        label="PLG_TINY_FIELD_CUSTOMBUTTON_LABEL"
+        description="PLG_TINY_FIELD_CUSTOMBUTTON_DESC"
+        class="input-xxlarge"
+    />
+</form>
\ No newline at end of file
diff --git a/core/plugins/editors/tinymce/tinymce.php b/core/plugins/editors/tinymce/tinymce.php
new file mode 100644
index 00000000..314263b1
--- /dev/null
+++ b/core/plugins/editors/tinymce/tinymce.php
@@ -0,0 +1,2051 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Editors.tinymce
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * TinyMCE Editor Plugin
+ *
+ * @since  1.5
+ */
+class PlgEditorTinymce extends JPlugin
+{
+	/**
+	 * Base path for editor files
+	 *
+	 * @since  3.5
+	 */
+	protected $_basePath = 'media/editors/tinymce';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Loads the application object
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app = null;
+
+	/**
+	 * Initialises the Editor.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function onInit()
+	{
+		JHtml::_('behavior.core');
+		JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
+		JHtml::_('script', $this->_basePath . '/tinymce.min.js', array('version' => 'auto'));
+		JHtml::_('script', 'editors/tinymce/tinymce.min.js', array('version' => 'auto', 'relative' => true));
+	}
+
+	/**
+	 * TinyMCE WYSIWYG Editor - get the editor content
+	 *
+	 * @param   string  $id  The name of the editor
+	 *
+	 * @since   1.5
+	 *
+	 * @return  string
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onGetContent($id)
+	{
+		return 'Joomla.editors.instances[' . json_encode($id) . '].getValue();';
+	}
+
+	/**
+	 * TinyMCE WYSIWYG Editor - set the editor content
+	 *
+	 * @param   string  $id    The name of the editor
+	 * @param   string  $html  The html to place in the editor
+	 *
+	 * @since   1.5
+	 *
+	 * @return  string
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onSetContent($id, $html)
+	{
+		return 'Joomla.editors.instances[' . json_encode($id) . '].setValue(' . json_encode($html) . ');';
+	}
+
+	/**
+	 * TinyMCE WYSIWYG Editor - copy editor content to form field
+	 *
+	 * @param   string  $id  The name of the editor
+	 *
+	 * @since   1.5
+	 *
+	 * @return  void
+	 *
+	 * @deprecated 4.0 Use directly the returned code
+	 */
+	public function onSave($id)
+	{
+	}
+
+	/**
+	 * Inserts html code into the editor
+	 *
+	 * @param   string  $name  The name of the editor
+	 *
+	 * @since   1.5
+	 *
+	 * @return  string
+	 *
+	 * @deprecated 3.5 tinyMCE (API v4) will get the content automatically from the text area
+	 */
+	public function onGetInsertMethod($name)
+	{
+	}
+
+	/**
+	 * Display the editor area.
+	 *
+	 * @param   string   $name     The name of the editor area.
+	 * @param   string   $content  The content of the field.
+	 * @param   string   $width    The width of the editor area.
+	 * @param   string   $height   The height of the editor area.
+	 * @param   int      $col      The number of columns for the editor area.
+	 * @param   int      $row      The number of rows for the editor area.
+	 * @param   boolean  $buttons  True and the editor buttons will be displayed.
+	 * @param   string   $id       An optional ID for the textarea. If not supplied the name is used.
+	 * @param   string   $asset    The object asset
+	 * @param   object   $author   The author.
+	 * @param   array    $params   Associative array of editor parameters.
+	 *
+	 * @return  string
+	 */
+	public function onDisplay(
+		$name, $content, $width, $height, $col, $row, $buttons = true, $id = null, $asset = null, $author = null, $params = array())
+	{
+		$app = JFactory::getApplication();
+
+		// Check for old params for B/C
+		$config_warn_count = $app->getUserState('plg_editors_tinymce.config_legacy_warn_count', 0);
+
+		if ($this->params->exists('mode') && $this->params->exists('alignment'))
+		{
+			if ($app->isClient('administrator') && $config_warn_count < 2)
+			{
+				$link = JRoute::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . $this->getPluginId());
+				$app->enqueueMessage(JText::sprintf('PLG_TINY_LEGACY_WARNING', $link), 'warning');
+				$app->setUserState('plg_editors_tinymce.config_legacy_warn_count', ++$config_warn_count);
+			}
+
+			return $this->onDisplayLegacy($name, $content, $width, $height, $col, $row, $buttons, $id, $asset, $author, $params);
+		}
+
+		if (empty($id))
+		{
+			$id = $name;
+		}
+
+		$id            = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id);
+		$nameGroup     = explode('[', preg_replace('/\[\]|\]/', '', $name));
+		$fieldName     = end($nameGroup);
+		$scriptOptions = array();
+
+		// Check for existing options
+		$doc     = JFactory::getDocument();
+		$options = $doc->getScriptOptions('plg_editor_tinymce');
+
+		// Only add "px" to width and height if they are not given as a percentage
+		if (is_numeric($width))
+		{
+			$width .= 'px';
+		}
+
+		if (is_numeric($height))
+		{
+			$height .= 'px';
+		}
+
+		// Data object for the layout
+		$textarea = new stdClass;
+		$textarea->name    = $name;
+		$textarea->id      = $id;
+		$textarea->class   = 'mce_editable joomla-editor-tinymce';
+		$textarea->cols    = $col;
+		$textarea->rows    = $row;
+		$textarea->width   = $width;
+		$textarea->height  = $height;
+		$textarea->content = $content;
+
+		// Set editor to readonly mode
+		$textarea->readonly = !empty($params['readonly']);
+
+		// Render Editor markup
+		$editor = '<div class="js-editor-tinymce">';
+		$editor .= JLayoutHelper::render('joomla.tinymce.textarea', $textarea);
+		$editor .= $this->_toogleButton($id);
+		$editor .= '</div>';
+
+		// Prepare the instance specific options, actually the ext-buttons
+		if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons']))
+		{
+			$btns = $this->tinyButtons($id, $buttons);
+
+			if (!empty($btns['names']))
+			{
+				JHtml::_('script', 'editors/tinymce/tiny-close.min.js', array('version' => 'auto', 'relative' => true), array('defer' => 'defer'));
+			}
+
+			// Set editor to readonly mode
+			if (!empty($params['readonly']))
+			{
+				$options['tinyMCE'][$fieldName]['readonly'] = 1;
+			}
+
+			$options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true;
+			$options['tinyMCE'][$fieldName]['joomlaExtButtons']    = $btns;
+
+			$doc->addScriptOptions('plg_editor_tinymce', $options, false);
+		}
+
+		// Setup Default (common) options for the Editor script
+
+		// Check whether we already have them
+		if (!empty($options['tinyMCE']['default']))
+		{
+			return $editor;
+		}
+
+		$user     = JFactory::getUser();
+		$language = JFactory::getLanguage();
+		$theme    = 'modern';
+		$ugroups  = array_combine($user->getAuthorisedGroups(), $user->getAuthorisedGroups());
+
+		// Prepare the parameters
+		$levelParams      = new Joomla\Registry\Registry;
+		$extraOptions     = new stdClass;
+		$toolbarParams    = new stdClass;
+		$extraOptionsAll  = $this->params->get('configuration.setoptions', array());
+		$toolbarParamsAll = $this->params->get('configuration.toolbars', array());
+
+		// Get configuration depend from User group
+		foreach ($extraOptionsAll as $set => $val)
+		{
+			$val->access = empty($val->access) ? array() : $val->access;
+
+			// Check whether User in one of allowed group
+			foreach ($val->access as $group)
+			{
+				if (isset($ugroups[$group]))
+				{
+					$extraOptions  = $val;
+					$toolbarParams = $toolbarParamsAll->$set;
+				}
+			}
+		}
+
+		// Merge the params
+		$levelParams->loadObject($toolbarParams);
+		$levelParams->loadObject($extraOptions);
+
+		// List the skins
+		$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
+
+		// Set the selected skin
+		$skin = 'lightgray';
+		$side = $app->isClient('administrator') ? 'skin_admin' : 'skin';
+
+		if ((int) $levelParams->get($side, 0) < count($skindirs))
+		{
+			$skin = basename($skindirs[(int) $levelParams->get($side, 0)]);
+		}
+
+		$langMode   = $levelParams->get('lang_mode', 1);
+		$langPrefix = $levelParams->get('lang_code', 'en');
+
+		if ($langMode)
+		{
+			if (file_exists(JPATH_ROOT . '/media/editors/tinymce/langs/' . $language->getTag() . '.js'))
+			{
+				$langPrefix = $language->getTag();
+			}
+			elseif (file_exists(JPATH_ROOT . '/media/editors/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . '.js'))
+			{
+				$langPrefix = substr($language->getTag(), 0, strpos($language->getTag(), '-'));
+			}
+			else
+			{
+				$langPrefix = 'en';
+			}
+		}
+
+		$text_direction = 'ltr';
+
+		if ($language->isRtl())
+		{
+			$text_direction = 'rtl';
+		}
+
+		$use_content_css    = $levelParams->get('content_css', 1);
+		$content_css_custom = $levelParams->get('content_css_custom', '');
+
+		/*
+		 * Lets get the default template for the site application
+		 */
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select('template')
+			->from('#__template_styles')
+			->where('client_id=0 AND home=' . $db->quote('1'));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$template = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			$app->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+			return '';
+		}
+
+		$content_css    = null;
+		$templates_path = JPATH_SITE . '/templates';
+
+		// Loading of css file for 'styles' dropdown
+		if ($content_css_custom)
+		{
+			// If URL, just pass it to $content_css
+			if (strpos($content_css_custom, 'http') !== false)
+			{
+				$content_css = $content_css_custom;
+			}
+
+			// If it is not a URL, assume it is a file name in the current template folder
+			else
+			{
+				$content_css = JUri::root(true) . '/templates/' . $template . '/css/' . $content_css_custom;
+
+				// Issue warning notice if the file is not found (but pass name to $content_css anyway to avoid TinyMCE error
+				if (!file_exists($templates_path . '/' . $template . '/css/' . $content_css_custom))
+				{
+					$msg = sprintf(JText::_('PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT'), $content_css_custom);
+					JLog::add($msg, JLog::WARNING, 'jerror');
+				}
+			}
+		}
+		else
+		{
+			// Process when use_content_css is Yes and no custom file given
+			if ($use_content_css)
+			{
+				// First check templates folder for default template
+				// if no editor.css file in templates folder, check system template folder
+				if (!file_exists($templates_path . '/' . $template . '/css/editor.css'))
+				{
+					// If no editor.css file in system folder, show alert
+					if (!file_exists($templates_path . '/system/css/editor.css'))
+					{
+						JLog::add(JText::_('PLG_TINY_ERR_EDITORCSSFILENOTPRESENT'), JLog::WARNING, 'jerror');
+					}
+					else
+					{
+						$content_css = JUri::root(true) . '/templates/system/css/editor.css';
+					}
+				}
+				else
+				{
+					$content_css = JUri::root(true) . '/templates/' . $template . '/css/editor.css';
+				}
+			}
+		}
+
+		$ignore_filter = false;
+
+		// Text filtering
+		if ($levelParams->get('use_config_textfilters', 0))
+		{
+			// Use filters from com_config
+			$filter = static::getGlobalFilters();
+
+			$ignore_filter = $filter === false;
+
+			$tagBlacklist  = !empty($filter->tagBlacklist) ? $filter->tagBlacklist : array();
+			$attrBlacklist = !empty($filter->attrBlacklist) ? $filter->attrBlacklist : array();
+			$tagArray      = !empty($filter->tagArray) ? $filter->tagArray : array();
+			$attrArray     = !empty($filter->attrArray) ? $filter->attrArray : array();
+
+			$invalid_elements  = implode(',', array_merge($tagBlacklist, $attrBlacklist, $tagArray, $attrArray));
+
+			// Valid elements are all whitelist entries in com_config, which are now missing in the tagBlacklist
+			$default_filter = JFilterInput::getInstance();
+			$valid_elements = implode(',', array_diff($default_filter->tagBlacklist, $tagBlacklist));
+
+			$extended_elements = '';
+		}
+		else
+		{
+			// Use filters from TinyMCE params
+			$invalid_elements  = trim($levelParams->get('invalid_elements', 'script,applet,iframe'));
+			$extended_elements = trim($levelParams->get('extended_elements', ''));
+			$valid_elements    = trim($levelParams->get('valid_elements', ''));
+		}
+
+		$html_height = $this->params->get('html_height', '550');
+		$html_width  = $this->params->get('html_width', '');
+
+		if ($html_width == 750)
+		{
+			$html_width = '';
+		}
+
+		// The param is true for vertical resizing only, false or both
+		$resizing          = (bool) $levelParams->get('resizing', true);
+		$resize_horizontal = (bool) $levelParams->get('resize_horizontal', true);
+
+		if ($resizing && $resize_horizontal)
+		{
+			$resizing = 'both';
+		}
+
+		// Set of always available plugins
+		$plugins  = array(
+			'autolink',
+			'lists',
+			'save',
+			'colorpicker',
+			'importcss',
+		);
+
+		// Allowed elements
+		$elements = array(
+			'hr[id|title|alt|class|width|size|noshade]',
+		);
+
+		if ($extended_elements)
+		{
+			$elements = array_merge($elements, explode(',', $extended_elements));
+		}
+
+		// Prepare the toolbar/menubar
+		$knownButtons = static::getKnownButtons();
+
+		// Check if there no value at all
+		if (!$levelParams->get('menu') && !$levelParams->get('toolbar1') && !$levelParams->get('toolbar2'))
+		{
+			// Get from preset
+			$presets = static::getToolbarPreset();
+
+			/*
+			 * Predefine group as:
+			 * Set 0: for Administrator, Editor, Super Users (4,7,8)
+			 * Set 1: for Registered, Manager (2,6), all else are public
+			 */
+			switch (true)
+			{
+				case isset($ugroups[4]) || isset($ugroups[7]) || isset($ugroups[8]):
+					$preset = $presets['advanced'];
+					break;
+
+				case isset($ugroups[2]) || isset($ugroups[6]):
+					$preset = $presets['medium'];
+					break;
+
+				default:
+					$preset = $presets['simple'];
+			}
+
+			$levelParams->loadArray($preset);
+		}
+
+		$menubar  = (array) $levelParams->get('menu', array());
+		$toolbar1 = (array) $levelParams->get('toolbar1', array());
+		$toolbar2 = (array) $levelParams->get('toolbar2', array());
+
+		// Make an easy way to check which button is enabled
+		$allButtons = array_merge($toolbar1, $toolbar2);
+		$allButtons = array_combine($allButtons, $allButtons);
+
+		// Check for button-specific plugins
+		foreach ($allButtons as $btnName)
+		{
+			if (!empty($knownButtons[$btnName]['plugin']))
+			{
+				$plugins[] = $knownButtons[$btnName]['plugin'];
+			}
+		}
+
+		// Template
+		$templates = array();
+
+		if (!empty($allButtons['template']))
+		{
+			// Note this check for the template_list.js file will be removed in Joomla 4.0
+			if (is_file(JPATH_ROOT . '/media/editors/tinymce/templates/template_list.js'))
+			{
+				// If using the legacy file we need to include and input the files the new way
+				$str = file_get_contents(JPATH_ROOT . '/media/editors/tinymce/templates/template_list.js');
+
+				// Find from one [ to the last ]
+				$matches = array();
+				preg_match_all('/\[.*\]/', $str, $matches);
+
+				// Set variables
+				foreach ($matches['0'] as $match)
+				{
+					$values = array();
+					preg_match_all('/\".*\"/', $match, $values);
+					$result       = trim($values['0']['0'], '"');
+					$final_result = explode(',', $result);
+
+					$templates[] = array(
+						'title' => trim($final_result['0'], ' " '),
+						'description' => trim($final_result['2'], ' " '),
+						'url' => JUri::root(true) . '/' . trim($final_result['1'], ' " '),
+					);
+				}
+
+			}
+			else
+			{
+				foreach (glob(JPATH_ROOT . '/media/editors/tinymce/templates/*.html') as $filename)
+				{
+					$filename = basename($filename, '.html');
+
+					if ($filename !== 'index')
+					{
+						$lang        = JFactory::getLanguage();
+						$title       = $filename;
+						$description = ' ';
+
+						if ($lang->hasKey('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_TITLE'))
+						{
+							$title = JText::_('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_TITLE');
+						}
+
+						if ($lang->hasKey('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_DESC'))
+						{
+							$description = JText::_('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_DESC');
+						}
+
+						$templates[] = array(
+							'title' => $title,
+							'description' => $description,
+							'url' => JUri::root(true) . '/media/editors/tinymce/templates/' . $filename . '.html',
+						);
+					}
+				}
+			}
+		}
+
+		// Check for extra plugins, from the setoptions form
+		foreach (array('wordcount' => 1, 'advlist' => 1, 'autosave' => 1, 'contextmenu' => 1) as $pName => $def)
+		{
+			if ($levelParams->get($pName, $def))
+			{
+				$plugins[] = $pName;
+			}
+		}
+
+		// User custom plugins and buttons
+		$custom_plugin = trim($levelParams->get('custom_plugin', ''));
+		$custom_button = trim($levelParams->get('custom_button', ''));
+
+		if ($custom_plugin)
+		{
+			$separator = strpos($custom_plugin, ',') !== false ? ',' : ' ';
+			$plugins   = array_merge($plugins, explode($separator, $custom_plugin));
+		}
+
+		if ($custom_button)
+		{
+			$separator = strpos($custom_button, ',') !== false ? ',' : ' ';
+			$toolbar1  = array_merge($toolbar1, explode($separator, $custom_button));
+		}
+
+		// Drag and drop Images
+		$allowImgPaste = false;
+		$dragdrop      = $levelParams->get('drag_drop', 1);
+
+		if ($dragdrop && $user->authorise('core.create', 'com_media'))
+		{
+			$externalPlugins['jdragdrop'] = JUri::root() . 'media/editors/tinymce/js/plugins/dragdrop/plugin.min.js';
+			$allowImgPaste = true;
+			$isSubDir      = '';
+			$session       = JFactory::getSession();
+			$uploadUrl     = JUri::base() . 'index.php?option=com_media&task=file.upload&tmpl=component&'
+				. $session->getName() . '=' . $session->getId()
+				. '&' . JSession::getFormToken() . '=1'
+				. '&asset=image&format=json';
+
+			if ($app->isClient('site'))
+			{
+				$uploadUrl = htmlentities($uploadUrl, null, 'UTF-8', null);
+			}
+
+			// Is Joomla installed in subdirectory
+			if (JUri::root(true) !== '/')
+			{
+				$isSubDir = JUri::root(true);
+			}
+
+			// Get specific path
+			$tempPath = $levelParams->get('path', '');
+
+			if (!empty($tempPath))
+			{
+				// Remove the root images path
+				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
+			}
+
+			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
+
+			$scriptOptions['setCustomDir']    = $isSubDir;
+			$scriptOptions['mediaUploadPath'] = $tempPath;
+			$scriptOptions['uploadUri']       = $uploadUrl;
+		}
+
+		// Build the final options set
+		$scriptOptions = array_merge(
+			$scriptOptions,
+			array(
+			'suffix'  => '.min',
+			'baseURL' => JUri::root(true) . '/media/editors/tinymce',
+			'directionality' => $text_direction,
+			'language' => $langPrefix,
+			'autosave_restore_when_empty' => false,
+			'skin'   => $skin,
+			'theme'  => $theme,
+			'schema' => 'html5',
+
+			// Toolbars
+			'menubar'  => empty($menubar)  ? false : implode(' ', array_unique($menubar)),
+			'toolbar1' => empty($toolbar1) ? null  : implode(' ', $toolbar1),
+			'toolbar2' => empty($toolbar2) ? null  : implode(' ', $toolbar2),
+
+			'plugins'  => implode(',', array_unique($plugins)),
+
+			// Cleanup/Output
+			'inline_styles'    => true,
+			'gecko_spellcheck' => true,
+			'entity_encoding'  => $levelParams->get('entity_encoding', 'raw'),
+			'verify_html'      => !$ignore_filter,
+
+			'valid_elements'          => $valid_elements,
+			'extended_valid_elements' => implode(',', $elements),
+			'invalid_elements'        => $invalid_elements,
+
+			// URL
+			'relative_urls'      => (bool) $levelParams->get('relative_urls', true),
+			'remove_script_host' => false,
+
+			// Layout
+			'content_css'        => $content_css,
+			'document_base_url'  => JUri::root(true) . '/',
+			'paste_data_images'  => $allowImgPaste,
+			'importcss_append'   => true,
+			'image_title'        => true,
+			'height'             => $html_height,
+			'width'              => $html_width,
+			'resize'             => $resizing,
+			'templates'          => $templates,
+			'image_advtab'       => (bool) $levelParams->get('image_advtab', false),
+			'external_plugins'   => empty($externalPlugins) ? null  : $externalPlugins,
+
+		)
+		);
+
+		if ($levelParams->get('newlines'))
+		{
+			// Break
+			$scriptOptions['force_br_newlines'] = true;
+			$scriptOptions['force_p_newlines']  = false;
+			$scriptOptions['forced_root_block'] = '';
+		}
+		else
+		{
+			// Paragraph
+			$scriptOptions['force_br_newlines'] = false;
+			$scriptOptions['force_p_newlines']  = true;
+			$scriptOptions['forced_root_block'] = 'p';
+		}
+
+		$scriptOptions['rel_list'] = array(
+			array('title' => 'None', 'value' => ''),
+			array('title' => 'Alternate', 'value' => 'alternate'),
+			array('title' => 'Author', 'value' => 'author'),
+			array('title' => 'Bookmark', 'value' => 'bookmark'),
+			array('title' => 'Help', 'value' => 'help'),
+			array('title' => 'License', 'value' => 'license'),
+			array('title' => 'Lightbox', 'value' => 'lightbox'),
+			array('title' => 'Next', 'value' => 'next'),
+			array('title' => 'No Follow', 'value' => 'nofollow'),
+			array('title' => 'No Referrer', 'value' => 'noreferrer'),
+			array('title' => 'Prefetch', 'value' => 'prefetch'),
+			array('title' => 'Prev', 'value' => 'prev'),
+			array('title' => 'Search', 'value' => 'search'),
+			array('title' => 'Tag', 'value' => 'tag'),
+		);
+
+		/**
+		 * Shrink the buttons if not on a mobile or if mobile view is off.
+		 * If mobile view is on force into simple mode and enlarge the buttons
+		 **/
+		if (!$this->app->client->mobile)
+		{
+			$scriptOptions['toolbar_items_size'] = 'small';
+		}
+		elseif ($levelParams->get('mobile', 0))
+		{
+			$scriptOptions['menubar'] = false;
+			unset($scriptOptions['toolbar2']);
+		}
+
+		$options['tinyMCE']['default'] = $scriptOptions;
+
+		$doc->addStyleDeclaration('.mce-in { padding: 5px 10px !important;}');
+		$doc->addScriptOptions('plg_editor_tinymce', $options);
+
+		return $editor;
+	}
+
+	/**
+	 * Get the toggle editor button
+	 *
+	 * @param   string  $name  Editor name
+	 *
+	 * @return  string
+	 */
+	private function _toogleButton($name)
+	{
+		return JLayoutHelper::render('joomla.tinymce.togglebutton', $name);
+	}
+
+	/**
+	 * Get the XTD buttons and render them inside tinyMCE
+	 *
+	 * @param   string  $name      the id of the editor field
+	 * @param   string  $excluded  the buttons that should be hidden
+	 *
+	 * @return array
+	 */
+	private function tinyButtons($name, $excluded)
+	{
+		// Get the available buttons
+		$buttons = $this->_subject->getButtons($name, $excluded);
+
+		// Init the arrays for the buttons
+		$tinyBtns  = array();
+		$btnsNames = array();
+
+		// Build the script
+		foreach ($buttons as $i => $button)
+		{
+			if ($button->get('name'))
+			{
+				// Set some vars
+				$name    = 'button-' . $i . str_replace(' ', '', $button->get('text'));
+				$title   = $button->get('text');
+				$onclick = $button->get('onclick') ?: null;
+				$options = $button->get('options');
+				$icon    = $button->get('name');
+
+				if ($button->get('link') !== '#')
+				{
+					$href = JUri::base() . $button->get('link');
+				}
+				else
+				{
+					$href = null;
+				}
+
+				// We do some hack here to set the correct icon for 3PD buttons
+				$icon = 'none icon-' . $icon;
+
+				$tempConstructor = array();
+
+				// Now we can built the script
+				$tempConstructor[] = '!(function(){';
+
+				// Get the modal width/height
+				if ($options && is_scalar($options))
+				{
+					$tempConstructor[] = 'var getBtnOptions=new Function("return ' . addslashes($options) . '"),';
+					$tempConstructor[] = 'btnOptions=getBtnOptions(),';
+					$tempConstructor[] = 'modalWidth=btnOptions.size&&btnOptions.size.x?btnOptions.size.x:null,';
+					$tempConstructor[] = 'modalHeight=btnOptions.size&&btnOptions.size.y?btnOptions.size.y:null;';
+				}
+				else
+				{
+					$tempConstructor[] = 'var btnOptions={},modalWidth=null,modalHeight=null;';
+				}
+
+				// Now we can built the script
+				// AddButton starts here
+				$tempConstructor[] = 'editor.addButton("' . $name . '",{';
+				$tempConstructor[] = 'text:"' . $title . '",';
+				$tempConstructor[] = 'title:"' . $title . '",';
+				$tempConstructor[] = 'icon:"' . $icon . '",';
+
+				// Onclick starts here
+				$tempConstructor[] = 'onclick:function(){';
+
+				if ($href || $button->get('modal'))
+				{
+					// TinyMCE standard modal options
+					$tempConstructor[] = 'var modalOptions={';
+					$tempConstructor[] = 'title:"' . $title . '",';
+					$tempConstructor[] = 'url:"' . $href . '",';
+					$tempConstructor[] = 'buttons:[{text: "Close",onclick:"close"}]';
+					$tempConstructor[] = '};';
+
+					// Set width/height
+					$tempConstructor[] = 'if(modalWidth){modalOptions.width=modalWidth;}';
+					$tempConstructor[] = 'if(modalHeight){modalOptions.height = modalHeight;}';
+					$tempConstructor[] = 'editor.windowManager.open(modalOptions);';
+
+					if ($onclick && ($button->get('modal') || $href))
+					{
+						// Adds callback for close button
+						$tempConstructor[] = $onclick . ';';
+					}
+				}
+				else
+				{
+					// Adds callback for the button, eg: readmore
+					$tempConstructor[] = $onclick . ';';
+				}
+
+				// Onclick ends here
+				$tempConstructor[] = '}';
+
+				// AddButton ends here
+				$tempConstructor[] = '});';
+
+				// IIFE ends here
+				$tempConstructor[] = '})();';
+
+				// The array with the toolbar buttons
+				$btnsNames[] = $name . ' | ';
+
+				// The array with code for each button
+				$tinyBtns[] = implode($tempConstructor, '');
+			}
+		}
+
+		return array(
+				'names'  => $btnsNames,
+				'script' => $tinyBtns
+		);
+	}
+
+	/**
+	 * Get the global text filters to arbitrary text as per settings for current user groups
+	 *
+	 * @return  JFilterInput
+	 *
+	 * @since   3.6
+	 */
+	protected static function getGlobalFilters()
+	{
+		// Filter settings
+		$config     = JComponentHelper::getParams('com_config');
+		$user       = JFactory::getUser();
+		$userGroups = JAccess::getGroupsByUser($user->get('id'));
+
+		$filters = $config->get('filters');
+
+		$blackListTags       = array();
+		$blackListAttributes = array();
+
+		$customListTags       = array();
+		$customListAttributes = array();
+
+		$whiteListTags       = array();
+		$whiteListAttributes = array();
+
+		$whiteList  = false;
+		$blackList  = false;
+		$customList = false;
+		$unfiltered = false;
+
+		// Cycle through each of the user groups the user is in.
+		// Remember they are included in the public group as well.
+		foreach ($userGroups as $groupId)
+		{
+			// May have added a group but not saved the filters.
+			if (!isset($filters->$groupId))
+			{
+				continue;
+			}
+
+			// Each group the user is in could have different filtering properties.
+			$filterData = $filters->$groupId;
+			$filterType = strtoupper($filterData->filter_type);
+
+			if ($filterType === 'NH')
+			{
+				// Maximum HTML filtering.
+			}
+			elseif ($filterType === 'NONE')
+			{
+				// No HTML filtering.
+				$unfiltered = true;
+			}
+			else
+			{
+				// Blacklist or whitelist.
+				// Preprocess the tags and attributes.
+				$tags           = explode(',', $filterData->filter_tags);
+				$attributes     = explode(',', $filterData->filter_attributes);
+				$tempTags       = array();
+				$tempAttributes = array();
+
+				foreach ($tags as $tag)
+				{
+					$tag = trim($tag);
+
+					if ($tag)
+					{
+						$tempTags[] = $tag;
+					}
+				}
+
+				foreach ($attributes as $attribute)
+				{
+					$attribute = trim($attribute);
+
+					if ($attribute)
+					{
+						$tempAttributes[] = $attribute;
+					}
+				}
+
+				// Collect the blacklist or whitelist tags and attributes.
+				// Each list is cummulative.
+				if ($filterType === 'BL')
+				{
+					$blackList           = true;
+					$blackListTags       = array_merge($blackListTags, $tempTags);
+					$blackListAttributes = array_merge($blackListAttributes, $tempAttributes);
+				}
+				elseif ($filterType === 'CBL')
+				{
+					// Only set to true if Tags or Attributes were added
+					if ($tempTags || $tempAttributes)
+					{
+						$customList           = true;
+						$customListTags       = array_merge($customListTags, $tempTags);
+						$customListAttributes = array_merge($customListAttributes, $tempAttributes);
+					}
+				}
+				elseif ($filterType === 'WL')
+				{
+					$whiteList           = true;
+					$whiteListTags       = array_merge($whiteListTags, $tempTags);
+					$whiteListAttributes = array_merge($whiteListAttributes, $tempAttributes);
+				}
+			}
+		}
+
+		// Remove duplicates before processing (because the blacklist uses both sets of arrays).
+		$blackListTags        = array_unique($blackListTags);
+		$blackListAttributes  = array_unique($blackListAttributes);
+		$customListTags       = array_unique($customListTags);
+		$customListAttributes = array_unique($customListAttributes);
+		$whiteListTags        = array_unique($whiteListTags);
+		$whiteListAttributes  = array_unique($whiteListAttributes);
+
+		// Unfiltered assumes first priority.
+		if ($unfiltered)
+		{
+			// Dont apply filtering.
+			return false;
+		}
+		else
+		{
+			// Custom blacklist precedes Default blacklist
+			if ($customList)
+			{
+				$filter = JFilterInput::getInstance(array(), array(), 1, 1);
+
+				// Override filter's default blacklist tags and attributes
+				if ($customListTags)
+				{
+					$filter->tagBlacklist = $customListTags;
+				}
+
+				if ($customListAttributes)
+				{
+					$filter->attrBlacklist = $customListAttributes;
+				}
+			}
+			// Blacklists take second precedence.
+			elseif ($blackList)
+			{
+				// Remove the white-listed tags and attributes from the black-list.
+				$blackListTags       = array_diff($blackListTags, $whiteListTags);
+				$blackListAttributes = array_diff($blackListAttributes, $whiteListAttributes);
+
+				$filter = JFilterInput::getInstance($blackListTags, $blackListAttributes, 1, 1);
+
+				// Remove whitelisted tags from filter's default blacklist
+				if ($whiteListTags)
+				{
+					$filter->tagBlacklist = array_diff($filter->tagBlacklist, $whiteListTags);
+				}
+
+				// Remove whitelisted attributes from filter's default blacklist
+				if ($whiteListAttributes)
+				{
+					$filter->attrBlacklist = array_diff($filter->attrBlacklist, $whiteListAttributes);
+				}
+			}
+			// Whitelists take third precedence.
+			elseif ($whiteList)
+			{
+				// Turn off XSS auto clean
+				$filter = JFilterInput::getInstance($whiteListTags, $whiteListAttributes, 0, 0, 0);
+			}
+			// No HTML takes last place.
+			else
+			{
+				$filter = JFilterInput::getInstance();
+			}
+
+			return $filter;
+		}
+	}
+
+	/**
+	 * Return list of known TinyMCE buttons
+	 *
+	 * @return array
+	 *
+	 * @since 3.7.0
+	 */
+	public static function getKnownButtons()
+	{
+		// See https://www.tinymce.com/docs/demo/full-featured/
+		// And https://www.tinymce.com/docs/plugins/
+		$buttons = array(
+
+			// General buttons
+			'|'              => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_SEPARATOR'), 'text' => '|'),
+
+			'undo'           => array('label' => 'Undo'),
+			'redo'           => array('label' => 'Redo'),
+
+			'bold'           => array('label' => 'Bold'),
+			'italic'         => array('label' => 'Italic'),
+			'underline'      => array('label' => 'Underline'),
+			'strikethrough'  => array('label' => 'Strikethrough'),
+			'styleselect'    => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_STYLESELECT'), 'text' => 'Formats'),
+			'formatselect'   => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT'), 'text' => 'Paragraph'),
+			'fontselect'     => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FONTSELECT'), 'text' => 'Font Family'),
+			'fontsizeselect' => array('label' => JText::_('PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT'), 'text' => 'Font Sizes'),
+
+			'alignleft'     => array('label' => 'Align left'),
+			'aligncenter'   => array('label' => 'Align center'),
+			'alignright'    => array('label' => 'Align right'),
+			'alignjustify'  => array('label' => 'Justify'),
+
+			'outdent'       => array('label' => 'Decrease indent'),
+			'indent'        => array('label' => 'Increase indent'),
+
+			'bullist'       => array('label' => 'Bullet list'),
+			'numlist'       => array('label' => 'Numbered list'),
+
+			'link'          => array('label' => 'Insert/edit link', 'plugin' => 'link'),
+			'unlink'        => array('label' => 'Remove link', 'plugin' => 'link'),
+
+			'subscript'     => array('label' => 'Subscript'),
+			'superscript'   => array('label' => 'Superscript'),
+			'blockquote'    => array('label' => 'Blockquote'),
+
+			'cut'           => array('label' => 'Cut'),
+			'copy'          => array('label' => 'Copy'),
+			'paste'         => array('label' => 'Paste', 'plugin' => 'paste'),
+			'pastetext'     => array('label' => 'Paste as text', 'plugin' => 'paste'),
+			'removeformat'  => array('label' => 'Clear formatting'),
+
+			// Buttons from the plugins
+			'forecolor'      => array('label' => 'Text color', 'plugin' => 'textcolor'),
+			'backcolor'      => array('label' => 'Background color', 'plugin' => 'textcolor'),
+			'anchor'         => array('label' => 'Anchor', 'plugin' => 'anchor'),
+			'hr'             => array('label' => 'Horizontal line', 'plugin' => 'hr'),
+			'ltr'            => array('label' => 'Left to right', 'plugin' => 'directionality'),
+			'rtl'            => array('label' => 'Right to left', 'plugin' => 'directionality'),
+			'code'           => array('label' => 'Source code', 'plugin' => 'code'),
+			'codesample'     => array('label' => 'Insert/Edit code sample', 'plugin' => 'codesample'),
+			'table'          => array('label' => 'Table', 'plugin' => 'table'),
+			'charmap'        => array('label' => 'Special character', 'plugin' => 'charmap'),
+			'visualchars'    => array('label' => 'Show invisible characters', 'plugin' => 'visualchars'),
+			'visualblocks'   => array('label' => 'Show blocks', 'plugin' => 'visualblocks'),
+			'nonbreaking'    => array('label' => 'Nonbreaking space', 'plugin' => 'nonbreaking'),
+			'emoticons'      => array('label' => 'Emoticons', 'plugin' => 'emoticons'),
+			'image'          => array('label' => 'Insert/edit image', 'plugin' => 'image'),
+			'media'          => array('label' => 'Insert/edit video', 'plugin' => 'media'),
+			'pagebreak'      => array('label' => 'Page break', 'plugin' => 'pagebreak'),
+			'print'          => array('label' => 'Print', 'plugin' => 'print'),
+			'preview'        => array('label' => 'Preview', 'plugin' => 'preview'),
+			'fullscreen'     => array('label' => 'Fullscreen', 'plugin' => 'fullscreen'),
+			'template'       => array('label' => 'Insert template', 'plugin' => 'template'),
+			'searchreplace'  => array('label' => 'Find and replace', 'plugin' => 'searchreplace'),
+			'insertdatetime' => array('label' => 'Insert date/time', 'plugin' => 'insertdatetime'),
+			// 'spellchecker'   => array('label' => 'Spellcheck', 'plugin' => 'spellchecker'),
+		);
+
+		return $buttons;
+	}
+
+	/**
+	 * Return toolbar presets
+	 *
+	 * @return array
+	 *
+	 * @since 3.7.0
+	 */
+	public static function getToolbarPreset()
+	{
+		$preset = array();
+
+		$preset['simple'] = array(
+			'menu' => array(),
+			'toolbar1' => array(
+				'bold', 'underline', 'strikethrough', '|',
+				'undo', 'redo', '|',
+				'bullist', 'numlist', '|',
+				'pastetext'
+			),
+			'toolbar2' => array(),
+		);
+
+		$preset['medium'] = array(
+			'menu' => array('edit', 'insert', 'view', 'format', 'table', 'tools'),
+			'toolbar1' => array(
+				'bold', 'italic', 'underline', 'strikethrough', '|',
+				'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
+				'formatselect', '|',
+				'bullist', 'numlist', '|',
+				'outdent', 'indent', '|',
+				'undo', 'redo', '|',
+				'link', 'unlink', 'anchor', 'code', '|',
+				'hr', 'table', '|',
+				'subscript', 'superscript', '|',
+				'charmap', 'pastetext' , 'preview'
+			),
+			'toolbar2' => array(),
+		);
+
+		$preset['advanced'] = array(
+			'menu'     => array('edit', 'insert', 'view', 'format', 'table', 'tools'),
+			'toolbar1' => array(
+				'bold', 'italic', 'underline', 'strikethrough', '|',
+				'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
+				'styleselect', '|',
+				'formatselect', 'fontselect', 'fontsizeselect', '|',
+				'searchreplace', '|',
+				'bullist', 'numlist', '|',
+				'outdent', 'indent', '|',
+				'undo', 'redo', '|',
+				'link', 'unlink', 'anchor', 'image', '|',
+				'code', '|',
+				'forecolor', 'backcolor', '|',
+				'fullscreen', '|',
+				'table', '|',
+				'subscript', 'superscript', '|',
+				'charmap', 'emoticons', 'media', 'hr', 'ltr', 'rtl', '|',
+				'cut', 'copy', 'paste', 'pastetext', '|',
+				'visualchars', 'visualblocks', 'nonbreaking', 'blockquote', 'template', '|',
+				'print', 'preview', 'codesample', 'insertdatetime', 'removeformat',
+			),
+			'toolbar2' => array(),
+		);
+
+		return $preset;
+	}
+
+	/**
+	 * Gets the plugin extension id.
+	 *
+	 * @return  int  The plugin id.
+	 *
+	 * @since   3.7.0
+	 */
+	private function getPluginId()
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+					->select($db->quoteName('extension_id'))
+					->from($db->quoteName('#__extensions'))
+					->where($db->quoteName('folder') . ' = ' . $db->quote($this->_type))
+					->where($db->quoteName('element') . ' = ' . $db->quote($this->_name));
+		$db->setQuery($query);
+
+		return (int) $db->loadResult();
+	}
+
+	/**
+	 * Display the editor area.
+	 *
+	 * @param   string   $name     The name of the editor area.
+	 * @param   string   $content  The content of the field.
+	 * @param   string   $width    The width of the editor area.
+	 * @param   string   $height   The height of the editor area.
+	 * @param   int      $col      The number of columns for the editor area.
+	 * @param   int      $row      The number of rows for the editor area.
+	 * @param   boolean  $buttons  True and the editor buttons will be displayed.
+	 * @param   string   $id       An optional ID for the textarea. If not supplied the name is used.
+	 * @param   string   $asset    The object asset
+	 * @param   object   $author   The author.
+	 * @param   array    $params   Associative array of editor parameters.
+	 *
+	 * @return  string
+	 *
+	 * @since  3.7.0
+	 *
+	 * @deprecated 4.0
+	 */
+	private function onDisplayLegacy(
+		$name, $content, $width, $height, $col, $row, $buttons = true, $id = null, $asset = null, $author = null, $params = array())
+	{
+		if (empty($id))
+		{
+			$id = $name;
+		}
+
+		$id            = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id);
+		$nameGroup     = explode('[', preg_replace('/\[\]|\]/', '', $name));
+		$fieldName     = end($nameGroup);
+		$scriptOptions = array();
+
+		// Check for existing options
+		$doc     = JFactory::getDocument();
+		$options = $doc->getScriptOptions('plg_editor_tinymce');
+
+		// Only add "px" to width and height if they are not given as a percentage
+		if (is_numeric($width))
+		{
+			$width .= 'px';
+		}
+
+		if (is_numeric($height))
+		{
+			$height .= 'px';
+		}
+
+		// Data object for the layout
+		$textarea = new stdClass;
+		$textarea->name    = $name;
+		$textarea->id      = $id;
+		$textarea->class   = 'mce_editable joomla-editor-tinymce';
+		$textarea->cols    = $col;
+		$textarea->rows    = $row;
+		$textarea->width   = $width;
+		$textarea->height  = $height;
+		$textarea->content = $content;
+
+		// Set editor to readonly mode
+		$textarea->readonly = !empty($params['readonly']);
+
+		// Render Editor markup
+		$editor = '<div class="editor js-editor-tinymce">';
+		$editor .= JLayoutHelper::render('joomla.tinymce.textarea', $textarea);
+		$editor .= $this->_toogleButton($id);
+		$editor .= '</div>';
+
+		// Prepare instance specific options, actually the ext-buttons
+		if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons']))
+		{
+			$btns = $this->tinyButtons($id, $buttons);
+
+			if (!empty($btns['names']))
+			{
+				JHtml::_('script', 'editors/tinymce/tiny-close.min.js', array('version' => 'auto', 'relative' => true), array('defer' => 'defer'));
+			}
+
+			// Set editor to readonly mode
+			if (!empty($params['readonly']))
+			{
+				$options['tinyMCE'][$fieldName]['readonly'] = 1;
+			}
+
+			$options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true;
+			$options['tinyMCE'][$fieldName]['joomlaExtButtons']    = $btns;
+
+			$doc->addScriptOptions('plg_editor_tinymce', $options, false);
+		}
+
+		// Setup Default options for the Editor script
+
+		// Check whether we already have them
+		if (!empty($options['tinyMCE']['default']))
+		{
+			return $editor;
+		}
+
+		$app      = JFactory::getApplication();
+		$user     = JFactory::getUser();
+		$language = JFactory::getLanguage();
+		$mode     = (int) $this->params->get('mode', 1);
+		$theme    = 'modern';
+
+		// List the skins
+		$skindirs = glob(JPATH_ROOT . '/media/editors/tinymce/skins' . '/*', GLOB_ONLYDIR);
+
+
+		// Set the selected skin
+		$skin = 'lightgray';
+		$side = $app->isClient('administrator') ? 'skin_admin' : 'skin';
+
+		if ((int) $this->params->get($side, 0) < count($skindirs))
+		{
+			$skin = basename($skindirs[(int) $this->params->get($side, 0)]);
+		}
+
+		$langMode        = $this->params->get('lang_mode', 0);
+		$langPrefix      = $this->params->get('lang_code', 'en');
+
+		if ($langMode)
+		{
+			if (file_exists(JPATH_ROOT . "/media/editors/tinymce/langs/" . $language->getTag() . ".js"))
+			{
+				$langPrefix = $language->getTag();
+			}
+			elseif (file_exists(JPATH_ROOT . "/media/editors/tinymce/langs/" . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . ".js"))
+			{
+				$langPrefix = substr($language->getTag(), 0, strpos($language->getTag(), '-'));
+			}
+			else
+			{
+				$langPrefix = "en";
+			}
+		}
+
+		$text_direction = 'ltr';
+
+		if ($language->isRtl())
+		{
+			$text_direction = 'rtl';
+		}
+
+		$use_content_css    = $this->params->get('content_css', 1);
+		$content_css_custom = $this->params->get('content_css_custom', '');
+
+		/*
+		 * Lets get the default template for the site application
+		 */
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true)
+					->select('template')
+					->from('#__template_styles')
+					->where('client_id=0 AND home=' . $db->quote('1'));
+
+		$db->setQuery($query);
+
+		try
+		{
+			$template = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			$app->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+
+			return;
+		}
+
+		$content_css    = null;
+		$templates_path = JPATH_SITE . '/templates';
+
+		// Loading of css file for 'styles' dropdown
+		if ($content_css_custom)
+		{
+			// If URL, just pass it to $content_css
+			if (strpos($content_css_custom, 'http') !== false)
+			{
+				$content_css = $content_css_custom;
+			}
+
+			// If it is not a URL, assume it is a file name in the current template folder
+			else
+			{
+				$content_css = JUri::root(true) . '/templates/' . $template . '/css/' . $content_css_custom;
+
+				// Issue warning notice if the file is not found (but pass name to $content_css anyway to avoid TinyMCE error
+				if (!file_exists($templates_path . '/' . $template . '/css/' . $content_css_custom))
+				{
+					$msg = sprintf(JText::_('PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT'), $content_css_custom);
+					JLog::add($msg, JLog::WARNING, 'jerror');
+				}
+			}
+		}
+		else
+		{
+			// Process when use_content_css is Yes and no custom file given
+			if ($use_content_css)
+			{
+				// First check templates folder for default template
+				// if no editor.css file in templates folder, check system template folder
+				if (!file_exists($templates_path . '/' . $template . '/css/editor.css'))
+				{
+					// If no editor.css file in system folder, show alert
+					if (!file_exists($templates_path . '/system/css/editor.css'))
+					{
+						JLog::add(JText::_('PLG_TINY_ERR_EDITORCSSFILENOTPRESENT'), JLog::WARNING, 'jerror');
+					}
+					else
+					{
+						$content_css = JUri::root(true) . '/templates/system/css/editor.css';
+					}
+				}
+				else
+				{
+					$content_css = JUri::root(true) . '/templates/' . $template . '/css/editor.css';
+				}
+			}
+		}
+
+		$ignore_filter = false;
+
+		// Text filtering
+		if ($this->params->get('use_config_textfilters', 0))
+		{
+			// Use filters from com_config
+			$filter = static::getGlobalFilters();
+
+			$ignore_filter = $filter === false;
+
+			$tagBlacklist  = !empty($filter->tagBlacklist) ? $filter->tagBlacklist : array();
+			$attrBlacklist = !empty($filter->attrBlacklist) ? $filter->attrBlacklist : array();
+			$tagArray      = !empty($filter->tagArray) ? $filter->tagArray : array();
+			$attrArray     = !empty($filter->attrArray) ? $filter->attrArray : array();
+
+			$invalid_elements  = implode(',', array_merge($tagBlacklist, $attrBlacklist, $tagArray, $attrArray));
+
+			// Valid elements are all whitelist entries in com_config, which are now missing in the tagBlacklist
+			$default_filter = JFilterInput::getInstance();
+			$valid_elements =	implode(',', array_diff($default_filter->tagBlacklist, $tagBlacklist));
+
+			$extended_elements = '';
+		}
+		else
+		{
+			// Use filters from TinyMCE params
+			$invalid_elements  = $this->params->get('invalid_elements', 'script,applet,iframe');
+			$extended_elements = $this->params->get('extended_elements', '');
+			$valid_elements    = $this->params->get('valid_elements', '');
+		}
+
+		// Advanced Options
+		$access = $user->getAuthorisedViewLevels();
+
+		// Flip for performance, so we can direct check for the key isset($access[$key])
+		$access = array_flip($access);
+
+		$html_height = $this->params->get('html_height', '550');
+		$html_width  = $this->params->get('html_width', '');
+
+		if ($html_width == 750)
+		{
+			$html_width = '';
+		}
+
+		// Image advanced options
+		$image_advtab = $this->params->get('image_advtab', true);
+
+		if (isset($access[$image_advtab]))
+		{
+			$image_advtab = true;
+		}
+		else
+		{
+			$image_advtab = false;
+		}
+
+		// The param is true for vertical resizing only, false or both
+		$resizing          = $this->params->get('resizing', '1');
+		$resize_horizontal = $this->params->get('resize_horizontal', '1');
+
+		if ($resizing || $resizing == 'true')
+		{
+			if ($resize_horizontal || $resize_horizontal == 'true')
+			{
+				$resizing = 'both';
+			}
+			else
+			{
+				$resizing = true;
+			}
+		}
+		else
+		{
+			$resizing = false;
+		}
+
+		$toolbar1_add   = array();
+		$toolbar2_add   = array();
+		$toolbar3_add   = array();
+		$toolbar4_add   = array();
+		$elements       = array();
+		$plugins        = array(
+			'autolink',
+			'lists',
+			'image',
+			'charmap',
+			'print',
+			'preview',
+			'anchor',
+			'pagebreak',
+			'code',
+			'save',
+			'textcolor',
+			'colorpicker',
+			'importcss');
+		$toolbar1_add[] = 'bold';
+		$toolbar1_add[] = 'italic';
+		$toolbar1_add[] = 'underline';
+		$toolbar1_add[] = 'strikethrough';
+
+		// Alignment buttons
+		$alignment = $this->params->get('alignment', 1);
+
+		if (isset($access[$alignment]))
+		{
+			$toolbar1_add[] = '|';
+			$toolbar1_add[] = 'alignleft';
+			$toolbar1_add[] = 'aligncenter';
+			$toolbar1_add[] = 'alignright';
+			$toolbar1_add[] = 'alignjustify';
+		}
+
+		$toolbar1_add[] = '|';
+		$toolbar1_add[] = 'styleselect';
+		$toolbar1_add[] = '|';
+		$toolbar1_add[] = 'formatselect';
+
+		// Fonts
+		$fonts = $this->params->get('fonts', 1);
+
+		if (isset($access[$fonts]))
+		{
+			$toolbar1_add[] = 'fontselect';
+			$toolbar1_add[] = 'fontsizeselect';
+		}
+
+		// Search & replace
+		$searchreplace = $this->params->get('searchreplace', 1);
+
+		if (isset($access[$searchreplace]))
+		{
+			$plugins[]      = 'searchreplace';
+			$toolbar2_add[] = 'searchreplace';
+		}
+
+		$toolbar2_add[] = '|';
+		$toolbar2_add[] = 'bullist';
+		$toolbar2_add[] = 'numlist';
+		$toolbar2_add[] = '|';
+		$toolbar2_add[] = 'outdent';
+		$toolbar2_add[] = 'indent';
+		$toolbar2_add[] = '|';
+		$toolbar2_add[] = 'undo';
+		$toolbar2_add[] = 'redo';
+		$toolbar2_add[] = '|';
+
+		// Insert date and/or time plugin
+		$insertdate = $this->params->get('insertdate', 1);
+
+		if (isset($access[$insertdate]))
+		{
+			$plugins[]      = 'insertdatetime';
+			$toolbar4_add[] = 'inserttime';
+		}
+
+		// Link plugin
+		$link = $this->params->get('link', 1);
+
+		if (isset($access[$link]))
+		{
+			$plugins[]      = 'link';
+			$toolbar2_add[] = 'link';
+			$toolbar2_add[] = 'unlink';
+		}
+
+		$toolbar2_add[] = 'anchor';
+		$toolbar2_add[] = 'image';
+		$toolbar2_add[] = '|';
+		$toolbar2_add[] = 'code';
+
+		// Colors
+		$colors = $this->params->get('colors', 1);
+
+		if (isset($access[$colors]))
+		{
+			$toolbar2_add[] = '|';
+			$toolbar2_add[] = 'forecolor,backcolor';
+		}
+
+		// Fullscreen
+		$fullscreen = $this->params->get('fullscreen', 1);
+
+		if (isset($access[$fullscreen]))
+		{
+			$plugins[]      = 'fullscreen';
+			$toolbar2_add[] = '|';
+			$toolbar2_add[] = 'fullscreen';
+		}
+
+		// Table
+		$table = $this->params->get('table', 1);
+
+		if (isset($access[$table]))
+		{
+			$plugins[]      = 'table';
+			$toolbar3_add[] = 'table';
+			$toolbar3_add[] = '|';
+		}
+
+		$toolbar3_add[] = 'subscript';
+		$toolbar3_add[] = 'superscript';
+		$toolbar3_add[] = '|';
+		$toolbar3_add[] = 'charmap';
+
+		// Emotions
+		$smilies = $this->params->get('smilies', 1);
+
+		if (isset($access[$smilies]))
+		{
+			$plugins[]      = 'emoticons';
+			$toolbar3_add[] = 'emoticons';
+		}
+
+		// Media plugin
+		$media = $this->params->get('media', 1);
+
+		if (isset($access[$media]))
+		{
+			$plugins[]      = 'media';
+			$toolbar3_add[] = 'media';
+		}
+
+		// Horizontal line
+		$hr = $this->params->get('hr', 1);
+
+		if (isset($access[$hr]))
+		{
+			$plugins[]      = 'hr';
+			$elements[]     = 'hr[id|title|alt|class|width|size|noshade]';
+			$toolbar3_add[] = 'hr';
+		}
+		else
+		{
+			$elements[] = 'hr[id|class|title|alt]';
+		}
+
+		// RTL/LTR buttons
+		$directionality = $this->params->get('directionality', 1);
+
+		if (isset($access[$directionality]))
+		{
+			$plugins[]      = 'directionality';
+			$toolbar3_add[] = 'ltr rtl';
+		}
+
+		if ($extended_elements != "")
+		{
+			$elements = explode(',', $extended_elements);
+		}
+
+		$toolbar4_add[] = 'cut';
+		$toolbar4_add[] = 'copy';
+
+		// Paste
+		$paste = $this->params->get('paste', 1);
+
+		if (isset($access[$paste]))
+		{
+			$plugins[]      = 'paste';
+			$toolbar4_add[] = 'paste';
+		}
+
+		$toolbar4_add[] = '|';
+
+		// Visualchars
+		$visualchars = $this->params->get('visualchars', 1);
+
+		if (isset($access[$visualchars]))
+		{
+			$plugins[]      = 'visualchars';
+			$toolbar4_add[] = 'visualchars';
+		}
+
+		// Visualblocks
+		$visualblocks = $this->params->get('visualblocks', 1);
+
+		if (isset($access[$visualblocks]))
+		{
+			$plugins[]      = 'visualblocks';
+			$toolbar4_add[] = 'visualblocks';
+		}
+
+		// Non-breaking
+		$nonbreaking = $this->params->get('nonbreaking', 1);
+
+		if (isset($access[$nonbreaking]))
+		{
+			$plugins[]      = 'nonbreaking';
+			$toolbar4_add[] = 'nonbreaking';
+		}
+
+		// Blockquote
+		$blockquote = $this->params->get('blockquote', 1);
+
+		if (isset($access[$blockquote]))
+		{
+			$toolbar4_add[] = 'blockquote';
+		}
+
+		// Template
+		$template = $this->params->get('template', 1);
+		$templates = array();
+
+		if (isset($access[$template]))
+		{
+			$plugins[]      = 'template';
+			$toolbar4_add[] = 'template';
+
+			// Note this check for the template_list.js file will be removed in Joomla 4.0
+			if (is_file(JPATH_ROOT . "/media/editors/tinymce/templates/template_list.js"))
+			{
+				// If using the legacy file we need to include and input the files the new way
+				$str = file_get_contents(JPATH_ROOT . "/media/editors/tinymce/templates/template_list.js");
+
+				// Find from one [ to the last ]
+				$matches = array();
+				preg_match_all('/\[.*\]/', $str, $matches);
+
+				// Set variables
+				foreach ($matches['0'] as $match)
+				{
+					$values = array();
+					preg_match_all('/\".*\"/', $match, $values);
+					$result       = trim($values["0"]["0"], '"');
+					$final_result = explode(',', $result);
+
+					$templates[] = array(
+						'title' => trim($final_result['0'], ' " '),
+						'description' => trim($final_result['2'], ' " '),
+						'url' => JUri::root(true) . '/' . trim($final_result['1'], ' " '),
+					);
+				}
+
+			}
+			else
+			{
+				foreach (glob(JPATH_ROOT . '/media/editors/tinymce/templates/*.html') as $filename)
+				{
+					$filename = basename($filename, '.html');
+
+					if ($filename !== 'index')
+					{
+						$lang        = JFactory::getLanguage();
+						$title       = $filename;
+						$description = ' ';
+
+						if ($lang->hasKey('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_TITLE'))
+						{
+							$title = JText::_('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_TITLE');
+						}
+
+						if ($lang->hasKey('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_DESC'))
+						{
+							$description = JText::_('PLG_TINY_TEMPLATE_' . strtoupper($filename) . '_DESC');
+						}
+
+						$templates[] = array(
+							'title' => $title,
+							'description' => $description,
+							'url' => JUri::root(true) . '/media/editors/tinymce/templates/' . $filename . '.html',
+						);
+					}
+				}
+			}
+		}
+
+		// Print
+		$print = $this->params->get('print', 1);
+
+		if (isset($access[$print]))
+		{
+			$plugins[]      = 'print';
+			$toolbar4_add[] = '|';
+			$toolbar4_add[] = 'print';
+			$toolbar4_add[] = 'preview';
+		}
+
+		// Spellchecker
+		$spell = $this->params->get('spell', 0);
+
+		if (isset($access[$spell]))
+		{
+			$plugins[]      = 'spellchecker';
+			$toolbar4_add[] = '|';
+			$toolbar4_add[] = 'spellchecker';
+		}
+
+		// Wordcount
+		$wordcount = $this->params->get('wordcount', 1);
+
+		if (isset($access[$wordcount]))
+		{
+			$plugins[] = 'wordcount';
+		}
+
+		// Advlist
+		$advlist = $this->params->get('advlist', 1);
+
+		if (isset($access[$advlist]))
+		{
+			$plugins[] = 'advlist';
+		}
+
+		// Codesample
+		$advlist = $this->params->get('code_sample', 1);
+
+		if (isset($access[$advlist]))
+		{
+			$plugins[]      = 'codesample';
+			$toolbar4_add[] = 'codesample';
+		}
+
+		// Autosave
+		$autosave = $this->params->get('autosave', 1);
+
+		if (isset($access[$autosave]))
+		{
+			$plugins[] = 'autosave';
+		}
+
+		// Context menu
+		$contextmenu = $this->params->get('contextmenu', 1);
+
+		if (isset($access[$contextmenu]))
+		{
+			$plugins[] = 'contextmenu';
+		}
+
+		$custom_plugin = $this->params->get('custom_plugin', '');
+
+		if ($custom_plugin != "")
+		{
+			$plugins[] = $custom_plugin;
+		}
+
+		$custom_button = $this->params->get('custom_button', '');
+
+		if ($custom_button != "")
+		{
+			$toolbar4_add[] = $custom_button;
+		}
+
+		// Drag and drop Images
+		$externalPlugins = array();
+		$allowImgPaste   = false;
+		$dragdrop        = $this->params->get('drag_drop', 1);
+
+		if ($dragdrop && $user->authorise('core.create', 'com_media'))
+		{
+			$allowImgPaste = true;
+			$isSubDir      = '';
+			$session       = JFactory::getSession();
+			$uploadUrl     = JUri::base() . 'index.php?option=com_media&task=file.upload&tmpl=component&'
+								. $session->getName() . '=' . $session->getId()
+								. '&' . JSession::getFormToken() . '=1'
+								. '&asset=image&format=json';
+
+			if ($app->isClient('site'))
+			{
+				$uploadUrl = htmlentities($uploadUrl, null, 'UTF-8', null);
+			}
+
+			// Is Joomla installed in subdirectory
+			if (JUri::root(true) != '/')
+			{
+				$isSubDir = JUri::root(true);
+			}
+
+			// Get specific path
+			$tempPath = $this->params->get('path', '');
+
+			if (!empty($tempPath))
+			{
+				// Remove the root images path
+				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
+			}
+
+			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
+
+			$scriptOptions['setCustomDir']    = $isSubDir;
+			$scriptOptions['mediaUploadPath'] = $tempPath;
+			$scriptOptions['uploadUri']       = $uploadUrl;
+
+			$externalPlugins = array(
+				array('jdragdrop' => JUri::root() . 'media/editors/tinymce/js/plugins/dragdrop/plugin.min.js'),
+			);
+		}
+
+		// Prepare config variables
+		$plugins  = implode(',', $plugins);
+		$elements = implode(',', $elements);
+
+		// Prepare config variables
+		$toolbar1 = implode(' ', $toolbar1_add) . ' | '
+					. implode(' ', $toolbar2_add) . ' | '
+					. implode(' ', $toolbar3_add) . ' | '
+					. implode(' ', $toolbar4_add);
+
+		// See if mobileVersion is activated
+		$mobileVersion = $this->params->get('mobile', 0);
+
+		$scriptOptions = array_merge(
+			$scriptOptions,
+			array(
+			'suffix'  => '.min',
+			'baseURL' => JUri::root(true) . '/media/editors/tinymce',
+			'directionality' => $text_direction,
+			'language' => $langPrefix,
+			'autosave_restore_when_empty' => false,
+			'skin'   => $skin,
+			'theme'  => $theme,
+			'schema' => 'html5',
+
+			// Cleanup/Output
+			'inline_styles'    => true,
+			'gecko_spellcheck' => true,
+			'entity_encoding'  => $this->params->get('entity_encoding', 'raw'),
+			'verify_html'      => !$ignore_filter,
+
+			// URL
+			'relative_urls'      => (bool) $this->params->get('relative_urls', true),
+			'remove_script_host' => false,
+
+			// Layout
+			'content_css'        => $content_css,
+			'document_base_url'  => JUri::root(true) . '/',
+			'paste_data_images'  => $allowImgPaste,
+			'externalPlugins'    => json_encode($externalPlugins),
+		)
+		);
+
+		if ($this->params->get('newlines'))
+		{
+			// Break
+			$scriptOptions['force_br_newlines'] = true;
+			$scriptOptions['force_p_newlines']  = false;
+			$scriptOptions['forced_root_block'] = '';
+		}
+		else
+		{
+			// Paragraph
+			$scriptOptions['force_br_newlines'] = false;
+			$scriptOptions['force_p_newlines']  = true;
+			$scriptOptions['forced_root_block'] = 'p';
+		}
+
+		/**
+		 * Shrink the buttons if not on a mobile or if mobile view is off.
+		 * If mobile view is on force into simple mode and enlarge the buttons
+		 **/
+		if (!$this->app->client->mobile)
+		{
+			$scriptOptions['toolbar_items_size'] = 'small';
+		}
+		elseif ($mobileVersion)
+		{
+			$mode = 0;
+		}
+
+		switch ($mode)
+		{
+			case 0: /* Simple mode*/
+				$scriptOptions['menubar']  = false;
+				$scriptOptions['toolbar1'] = 'bold italic underline strikethrough | undo redo | bullist numlist | code';
+				$scriptOptions['plugins']  = ' code';
+
+				break;
+
+			case 1:
+			default: /* Advanced mode*/
+				$toolbar1 = "bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | formatselect | bullist numlist "
+							. "| outdent indent | undo redo | link unlink anchor code | hr table | subscript superscript | charmap";
+
+				$scriptOptions['valid_elements'] = $valid_elements;
+				$scriptOptions['extended_valid_elements'] = $elements;
+				$scriptOptions['invalid_elements'] = $invalid_elements;
+				$scriptOptions['plugins']  = 'table link code hr charmap autolink lists importcss ';
+				$scriptOptions['toolbar1'] = $toolbar1;
+				$scriptOptions['removed_menuitems'] = 'newdocument';
+				$scriptOptions['importcss_append']  = true;
+				$scriptOptions['height'] = $html_height;
+				$scriptOptions['width']  = $html_width;
+				$scriptOptions['resize'] = $resizing;
+
+				break;
+
+			case 2: /* Extended mode*/
+				$scriptOptions['valid_elements'] = $valid_elements;
+				$scriptOptions['extended_valid_elements'] = $elements;
+				$scriptOptions['invalid_elements'] = $invalid_elements;
+				$scriptOptions['plugins']  = $plugins;
+				$scriptOptions['toolbar1'] = $toolbar1;
+				$scriptOptions['removed_menuitems'] = 'newdocument';
+				$scriptOptions['rel_list'] = array(
+					array('title' => 'None', 'value' => ''),
+					array('title' => 'Alternate', 'value' => 'alternate'),
+					array('title' => 'Author', 'value' => 'author'),
+					array('title' => 'Bookmark', 'value' => 'bookmark'),
+					array('title' => 'Help', 'value' => 'help'),
+					array('title' => 'License', 'value' => 'license'),
+					array('title' => 'Lightbox', 'value' => 'lightbox'),
+					array('title' => 'Next', 'value' => 'next'),
+					array('title' => 'No Follow', 'value' => 'nofollow'),
+					array('title' => 'No Referrer', 'value' => 'noreferrer'),
+					array('title' => 'Prefetch', 'value' => 'prefetch'),
+					array('title' => 'Prev', 'value' => 'prev'),
+					array('title' => 'Search', 'value' => 'search'),
+					array('title' => 'Tag', 'value' => 'tag'),
+				);
+				$scriptOptions['importcss_append'] = true;
+				$scriptOptions['image_advtab']     = $image_advtab;
+				$scriptOptions['height']    = $html_height;
+				$scriptOptions['width']     = $html_width;
+				$scriptOptions['resize']    = $resizing;
+				$scriptOptions['templates'] = $templates;
+
+				break;
+		}
+
+		$options['tinyMCE']['default'] = $scriptOptions;
+
+		$doc->addStyleDeclaration(".mce-in { padding: 5px 10px !important;}");
+		$doc->addScriptOptions('plg_editor_tinymce', $options);
+
+		return $editor;
+	}
+}
diff --git a/core/plugins/editors/tinymce/tinymce.xml b/core/plugins/editors/tinymce/tinymce.xml
new file mode 100644
index 00000000..23ec5e16
--- /dev/null
+++ b/core/plugins/editors/tinymce/tinymce.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.2" type="plugin" group="editors" method="upgrade">
+	<name>plg_editors_tinymce</name>
+	<version>4.5.8</version>
+	<creationDate>2005-2017</creationDate>
+	<author>Ephox Corporation</author>
+	<authorEmail>N/A</authorEmail>
+	<authorUrl>http://www.tinymce.com</authorUrl>
+	<copyright>Ephox Corporation</copyright>
+	<license>LGPL</license>
+	<description>PLG_TINY_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="tinymce">tinymce.php</filename>
+		<folder>fields</folder>
+		<folder>form</folder>
+	</files>
+	<media destination="editors" folder="media">
+		<folder>tinymce</folder>
+	</media>
+	<languages>
+		<language tag="en-GB">en-GB.plg_editors_tinymce.ini</language>
+		<language tag="en-GB">en-GB.plg_editors_tinymce.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field 
+				       name="configuration" 
+				       type="tinymcebuilder" 
+				       hiddenLabel="true" 
+				 />
+			</fieldset>
+
+			<fieldset name="advanced" label="PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS">
+				<field
+					name="sets_amount"
+					type="number"
+					label="PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL"
+					description="PLG_TINY_FIELD_NUMBER_OF_SETS_DESC"
+					filter="int"
+					validate="number"
+					min="3"
+					default="3"
+				/>
+
+				<field
+					name="html_height"
+					type="number"
+					label="PLG_TINY_FIELD_HTMLHEIGHT_LABEL"
+					description="PLG_TINY_FIELD_HTMLHEIGHT_DESC"
+					default="550"
+				/>
+
+				<field
+					name="html_width"
+					type="number"
+					label="PLG_TINY_FIELD_HTMLWIDTH_LABEL"
+					description="PLG_TINY_FIELD_HTMLWIDTH_DESC"
+					default=""
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/extension/joomla/joomla.php b/core/plugins/extension/joomla/joomla.php
new file mode 100644
index 00000000..a83db680
--- /dev/null
+++ b/core/plugins/extension/joomla/joomla.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Extension.Joomla
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! master extension plugin.
+ *
+ * @since  1.6
+ */
+class PlgExtensionJoomla extends JPlugin
+{
+	/**
+	 * @var    integer Extension Identifier
+	 * @since  1.6
+	 */
+	private $eid = 0;
+
+	/**
+	 * @var    JInstaller Installer object
+	 * @since  1.6
+	 */
+	private $installer = null;
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Adds an update site to the table if it doesn't exist.
+	 *
+	 * @param   string   $name      The friendly name of the site
+	 * @param   string   $type      The type of site (e.g. collection or extension)
+	 * @param   string   $location  The URI for the site
+	 * @param   boolean  $enabled   If this site is enabled
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	private function addUpdateSite($name, $type, $location, $enabled)
+	{
+		$db = JFactory::getDbo();
+
+		// Look if the location is used already; doesn't matter what type you can't have two types at the same address, doesn't make sense
+		$query = $db->getQuery(true)
+			->select('update_site_id')
+			->from('#__update_sites')
+			->where('location = ' . $db->quote($location));
+		$db->setQuery($query);
+		$update_site_id = (int) $db->loadResult();
+
+		// If it doesn't exist, add it!
+		if (!$update_site_id)
+		{
+			$query->clear()
+				->insert('#__update_sites')
+				->columns(array($db->quoteName('name'), $db->quoteName('type'), $db->quoteName('location'), $db->quoteName('enabled')))
+				->values($db->quote($name) . ', ' . $db->quote($type) . ', ' . $db->quote($location) . ', ' . (int) $enabled);
+			$db->setQuery($query);
+
+			if ($db->execute())
+			{
+				// Link up this extension to the update site
+				$update_site_id = $db->insertid();
+			}
+		}
+
+		// Check if it has an update site id (creation might have failed)
+		if ($update_site_id)
+		{
+			// Look for an update site entry that exists
+			$query->clear()
+				->select('update_site_id')
+				->from('#__update_sites_extensions')
+				->where('update_site_id = ' . $update_site_id)
+				->where('extension_id = ' . $this->eid);
+			$db->setQuery($query);
+			$tmpid = (int) $db->loadResult();
+
+			if (!$tmpid)
+			{
+				// Link this extension to the relevant update site
+				$query->clear()
+					->insert('#__update_sites_extensions')
+					->columns(array($db->quoteName('update_site_id'), $db->quoteName('extension_id')))
+					->values($update_site_id . ', ' . $this->eid);
+				$db->setQuery($query);
+				$db->execute();
+			}
+		}
+	}
+
+	/**
+	 * Handle post extension install update sites
+	 *
+	 * @param   JInstaller  $installer  Installer object
+	 * @param   integer     $eid        Extension Identifier
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onExtensionAfterInstall($installer, $eid )
+	{
+		if ($eid)
+		{
+			$this->installer = $installer;
+			$this->eid = $eid;
+
+			// After an install we only need to do update sites
+			$this->processUpdateSites();
+		}
+	}
+
+	/**
+	 * Handle extension uninstall
+	 *
+	 * @param   JInstaller  $installer  Installer instance
+	 * @param   integer     $eid        Extension id
+	 * @param   boolean     $result     Installation result
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onExtensionAfterUninstall($installer, $eid, $result)
+	{
+		// If we have a valid extension ID and the extension was successfully uninstalled wipe out any
+		// update sites for it
+		if ($eid && $result)
+		{
+			$db = JFactory::getDbo();
+			$query = $db->getQuery(true)
+				->delete('#__update_sites_extensions')
+				->where('extension_id = ' . $eid);
+			$db->setQuery($query);
+			$db->execute();
+
+			// Delete any unused update sites
+			$query->clear()
+				->select('update_site_id')
+				->from('#__update_sites_extensions');
+			$db->setQuery($query);
+			$results = $db->loadColumn();
+
+			if (is_array($results))
+			{
+				// So we need to delete the update sites and their associated updates
+				$updatesite_delete = $db->getQuery(true);
+				$updatesite_delete->delete('#__update_sites');
+				$updatesite_query = $db->getQuery(true);
+				$updatesite_query->select('update_site_id')
+					->from('#__update_sites');
+
+				// If we get results back then we can exclude them
+				if (count($results))
+				{
+					$updatesite_query->where('update_site_id NOT IN (' . implode(',', $results) . ')');
+					$updatesite_delete->where('update_site_id NOT IN (' . implode(',', $results) . ')');
+				}
+
+				// So let's find what update sites we're about to nuke and remove their associated extensions
+				$db->setQuery($updatesite_query);
+				$update_sites_pending_delete = $db->loadColumn();
+
+				if (is_array($update_sites_pending_delete) && count($update_sites_pending_delete))
+				{
+					// Nuke any pending updates with this site before we delete it
+					// TODO: investigate alternative of using a query after the delete below with a query and not in like above
+					$query->clear()
+						->delete('#__updates')
+						->where('update_site_id IN (' . implode(',', $update_sites_pending_delete) . ')');
+					$db->setQuery($query);
+					$db->execute();
+				}
+
+				// Note: this might wipe out the entire table if there are no extensions linked
+				$db->setQuery($updatesite_delete);
+				$db->execute();
+			}
+
+			// Last but not least we wipe out any pending updates for the extension
+			$query->clear()
+				->delete('#__updates')
+				->where('extension_id = ' . $eid);
+			$db->setQuery($query);
+			$db->execute();
+		}
+	}
+
+	/**
+	 * After update of an extension
+	 *
+	 * @param   JInstaller  $installer  Installer object
+	 * @param   integer     $eid        Extension identifier
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onExtensionAfterUpdate($installer, $eid)
+	{
+		if ($eid)
+		{
+			$this->installer = $installer;
+			$this->eid = $eid;
+
+			// Handle any update sites
+			$this->processUpdateSites();
+		}
+	}
+
+	/**
+	 * Processes the list of update sites for an extension.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	private function processUpdateSites()
+	{
+		$manifest      = $this->installer->getManifest();
+		$updateservers = $manifest->updateservers;
+
+		if ($updateservers)
+		{
+			$children = $updateservers->children();
+		}
+		else
+		{
+			$children = array();
+		}
+
+		if (count($children))
+		{
+			foreach ($children as $child)
+			{
+				$attrs = $child->attributes();
+				$this->addUpdateSite($attrs['name'], $attrs['type'], trim($child), true);
+			}
+		}
+		else
+		{
+			$data = trim((string) $updateservers);
+
+			if ($data !== '')
+			{
+				// We have a single entry in the update server line, let us presume this is an extension line
+				$this->addUpdateSite(JText::_('PLG_EXTENSION_JOOMLA_UNKNOWN_SITE'), 'extension', $data, true);
+			}
+		}
+	}
+}
diff --git a/core/plugins/extension/joomla/joomla.xml b/core/plugins/extension/joomla/joomla.xml
new file mode 100644
index 00000000..12ad8205
--- /dev/null
+++ b/core/plugins/extension/joomla/joomla.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="extension" method="upgrade">
+	<name>plg_extension_joomla</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_EXTENSION_JOOMLA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="joomla">joomla.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_extension_joomla.ini</language>
+		<language tag="en-GB">en-GB.plg_extension_joomla.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/fields/calendar/calendar.php b/core/plugins/fields/calendar/calendar.php
new file mode 100644
index 00000000..4d22d81d
--- /dev/null
+++ b/core/plugins/fields/calendar/calendar.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Calendar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Calendar Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsCalendar extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		// Set filter to user UTC
+		$fieldNode->setAttribute('filter', 'USER_UTC');
+
+		// Set field to use translated formats
+		$fieldNode->setAttribute('translateformat', '1');
+		$fieldNode->setAttribute('showtime', $field->fieldparams->get('showtime', 0) ? 'true' : 'false');
+
+		return $fieldNode;
+	}
+}
diff --git a/core/plugins/fields/calendar/calendar.xml b/core/plugins/fields/calendar/calendar.xml
new file mode 100644
index 00000000..892157e4
--- /dev/null
+++ b/core/plugins/fields/calendar/calendar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_calendar</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_CALENDAR_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="calendar">calendar.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_calendar.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_calendar.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/fields/calendar/params/calendar.xml b/core/plugins/fields/calendar/params/calendar.xml
new file mode 100644
index 00000000..85f90459
--- /dev/null
+++ b/core/plugins/fields/calendar/params/calendar.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="showtime"
+				type="radio"
+				label="PLG_FIELDS_CALENDAR_PARAMS_SHOWTIME_LABEL"
+				description="PLG_FIELDS_CALENDAR_PARAMS_SHOWTIME_DESC"
+				class="btn-group btn-group-yesno"
+				default="0"
+				filter="integer"
+				>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/calendar/tmpl/calendar.php b/core/plugins/fields/calendar/tmpl/calendar.php
new file mode 100644
index 00000000..57b6ae66
--- /dev/null
+++ b/core/plugins/fields/calendar/tmpl/calendar.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Calendar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+if (is_array($value))
+{
+	$value = implode(', ', $value);
+}
+
+$formatString =  $field->fieldparams->get('showtime', 0) ? 'DATE_FORMAT_LC5' : 'DATE_FORMAT_LC4';
+
+echo htmlentities(JHtml::_('date', $value, JText::_($formatString)));
diff --git a/core/plugins/fields/checkboxes/checkboxes.php b/core/plugins/fields/checkboxes/checkboxes.php
new file mode 100644
index 00000000..8c31ce0a
--- /dev/null
+++ b/core/plugins/fields/checkboxes/checkboxes.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Checkboxes
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldslistplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Checkboxes Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsCheckboxes extends FieldsListPlugin
+{
+}
diff --git a/core/plugins/fields/checkboxes/checkboxes.xml b/core/plugins/fields/checkboxes/checkboxes.xml
new file mode 100644
index 00000000..2628fceb
--- /dev/null
+++ b/core/plugins/fields/checkboxes/checkboxes.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_checkboxes</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_CHECKBOXES_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="checkboxes">checkboxes.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_checkboxes.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_checkboxes.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="options"
+					type="subform"
+					label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL"
+					description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
+					layout="joomla.form.field.subform.repeatable-table"
+					icon="list"
+					multiple="true"
+					>
+					<form hidden="true" name="list_templates_modal" repeat="true">
+						<field
+							name="name"
+							type="text"
+							label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_NAME_LABEL"
+							size="30"
+						/>
+
+						<field
+							name="value"
+							type="text"
+							label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_VALUE_LABEL"
+							size="30"
+						/>
+					</form>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/checkboxes/params/checkboxes.xml b/core/plugins/fields/checkboxes/params/checkboxes.xml
new file mode 100644
index 00000000..160c47ef
--- /dev/null
+++ b/core/plugins/fields/checkboxes/params/checkboxes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="options"
+				type="subform"
+				label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_LABEL"
+				description="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_DESC"
+				layout="joomla.form.field.subform.repeatable-table"
+				icon="list"
+				multiple="true"
+				>
+				<form hidden="true" name="list_templates_modal" repeat="true">
+					<field
+						name="name"
+						type="text"
+						label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_NAME_LABEL"
+						size="30"
+					/>
+
+					<field
+						name="value"
+						type="text"
+						label="PLG_FIELDS_CHECKBOXES_PARAMS_OPTIONS_VALUE_LABEL"
+						size="30"
+					/>
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/checkboxes/tmpl/checkboxes.php b/core/plugins/fields/checkboxes/tmpl/checkboxes.php
new file mode 100644
index 00000000..afb27c68
--- /dev/null
+++ b/core/plugins/fields/checkboxes/tmpl/checkboxes.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Checkboxes
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$fieldValue = $field->value;
+
+if ($fieldValue === '' || $fieldValue === null)
+{
+	return;
+}
+
+$fieldValue = (array) $fieldValue;
+$texts      = array();
+$options    = $this->getOptionsFromField($field);
+
+foreach ($options as $value => $name)
+{
+	if (in_array((string) $value, $fieldValue))
+	{
+		$texts[] = JText::_($name);
+	}
+}
+
+echo htmlentities(implode(', ', $texts));
diff --git a/core/plugins/fields/color/color.php b/core/plugins/fields/color/color.php
new file mode 100644
index 00000000..36da949a
--- /dev/null
+++ b/core/plugins/fields/color/color.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Color
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Color Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsColor extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('validate', 'color');
+
+		return $fieldNode;
+	}
+}
diff --git a/core/plugins/fields/color/color.xml b/core/plugins/fields/color/color.xml
new file mode 100644
index 00000000..a70f27d2
--- /dev/null
+++ b/core/plugins/fields/color/color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_color</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_COLOR_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="color">color.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_color.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_color.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/fields/color/tmpl/color.php b/core/plugins/fields/color/tmpl/color.php
new file mode 100644
index 00000000..1d2b1653
--- /dev/null
+++ b/core/plugins/fields/color/tmpl/color.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Color
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+if (is_array($value))
+{
+	$value = implode(', ', $value);
+}
+
+echo htmlentities($value);
diff --git a/core/plugins/fields/editor/editor.php b/core/plugins/fields/editor/editor.php
new file mode 100644
index 00000000..a8a444df
--- /dev/null
+++ b/core/plugins/fields/editor/editor.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Editor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Editor Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsEditor extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('buttons', $field->fieldparams->get('buttons', $this->params->get('buttons', 0)) ? 'true' : 'false');
+		$fieldNode->setAttribute('hide', implode(',', $field->fieldparams->get('hide', array())));
+
+		return $fieldNode;
+	}
+}
diff --git a/core/plugins/fields/editor/editor.xml b/core/plugins/fields/editor/editor.xml
new file mode 100644
index 00000000..16a697d7
--- /dev/null
+++ b/core/plugins/fields/editor/editor.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_editor</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_EDITOR_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="editor">editor.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_editor.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_editor.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="buttons"
+					type="radio"
+					label="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_LABEL"
+					description="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="hide"
+					type="plugins"
+					label="PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_LABEL"
+					description="JGLOBAL_SELECT_SOME_OPTIONS"
+					folder="editors-xtd"
+					multiple="true"
+				/>
+
+				<field
+					name="width"
+					type="text"
+					label="PLG_FIELDS_EDITOR_PARAMS_WIDTH_LABEL"
+					description="PLG_FIELDS_EDITOR_PARAMS_WIDTH_DESC"
+					default="100%"
+					size="5"
+				/>
+
+				<field
+					name="height"
+					type="text"
+					label="PLG_FIELDS_EDITOR_PARAMS_HEIGHT_LABEL"
+					description="PLG_FIELDS_EDITOR_PARAMS_HEIGHT_DESC"
+					default="250px"
+					size="5"
+				/>
+
+				<field
+					name="filter"
+					type="list"
+					label="PLG_FIELDS_EDITOR_PARAMS_FILTER_LABEL"
+					description="PLG_FIELDS_EDITOR_PARAMS_FILTER_DESC"
+					class="btn-group"
+					default="JComponentHelper::filterText"
+					validate="options"
+					>
+					<option value="0">JNO</option>
+					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
+					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
+					<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/editor/params/editor.xml b/core/plugins/fields/editor/params/editor.xml
new file mode 100644
index 00000000..ec609df7
--- /dev/null
+++ b/core/plugins/fields/editor/params/editor.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="buttons"
+				type="list"
+				label="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_LABEL"
+				description="PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="hide"
+				type="plugins"
+				label="PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_LABEL"
+				description="JGLOBAL_SELECT_SOME_OPTIONS"
+				folder="editors-xtd"
+				multiple="true"
+			/>
+
+			<field
+				name="width"
+				type="text"
+				label="PLG_FIELDS_EDITOR_PARAMS_WIDTH_LABEL"
+				description="PLG_FIELDS_EDITOR_PARAMS_WIDTH_DESC"
+				size="5"
+			/>
+
+			<field
+				name="height"
+				type="text"
+				label="PLG_FIELDS_EDITOR_PARAMS_HEIGHT_LABEL"
+				description="PLG_FIELDS_EDITOR_PARAMS_HEIGHT_DESC"
+				size="5"
+			/>
+
+			<field
+				name="filter"
+				type="list"
+				label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
+				description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
+				class="btn-group"
+				validate="options"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
+				<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
+				<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/editor/tmpl/editor.php b/core/plugins/fields/editor/tmpl/editor.php
new file mode 100644
index 00000000..019185ca
--- /dev/null
+++ b/core/plugins/fields/editor/tmpl/editor.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Editor
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+echo JHtml::_('content.prepare', $value);
diff --git a/core/plugins/fields/imagelist/imagelist.php b/core/plugins/fields/imagelist/imagelist.php
new file mode 100644
index 00000000..96c584aa
--- /dev/null
+++ b/core/plugins/fields/imagelist/imagelist.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Imagelist
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldslistplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Imagelist Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsImagelist extends FieldsListPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('hide_default', 'true');
+		$fieldNode->setAttribute('directory', '/images/' . $fieldNode->getAttribute('directory'));
+
+		return $fieldNode;
+	}
+}
diff --git a/core/plugins/fields/imagelist/imagelist.xml b/core/plugins/fields/imagelist/imagelist.xml
new file mode 100644
index 00000000..e3f06fd0
--- /dev/null
+++ b/core/plugins/fields/imagelist/imagelist.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_imagelist</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_IMAGELIST_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="imagelist">imagelist.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_imagelist.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_imagelist.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="directory"
+					type="folderlist"
+					label="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL"
+					description="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC"
+					directory="images"
+					hide_none="true"
+					hide_default="true"
+					recursive="true"
+					default="/"
+					>
+					<option value="/">/</option>
+				</field>
+
+				<field
+					name="multiple"
+					type="radio"
+					label="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL"
+					description="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="image_class"
+					type="textarea"
+					label="PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL"
+					description="PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_DESC"
+					size="40"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/imagelist/params/imagelist.xml b/core/plugins/fields/imagelist/params/imagelist.xml
new file mode 100644
index 00000000..8a4b9d01
--- /dev/null
+++ b/core/plugins/fields/imagelist/params/imagelist.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="directory"
+				type="folderlist"
+				label="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL"
+				description="PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC"
+				directory="images"
+				hide_none="true"
+				hide_default="true"
+				recursive="true"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="/">/</option>
+			</field>
+
+			<field
+				name="multiple"
+				type="list"
+				label="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL"
+				description="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="image_class"
+				type="textarea"
+				label="PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL"
+				description="PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_DESC"
+				size="40"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/imagelist/tmpl/imagelist.php b/core/plugins/fields/imagelist/tmpl/imagelist.php
new file mode 100644
index 00000000..8c956c7d
--- /dev/null
+++ b/core/plugins/fields/imagelist/tmpl/imagelist.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Imagelist
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+if ($field->value == '')
+{
+	return;
+}
+
+$class = $fieldParams->get('image_class');
+
+if ($class)
+{
+	// space before, so if no class sprintf below works
+	$class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"';
+}
+
+$value  = (array) $field->value;
+$buffer = '';
+
+foreach ($value as $path)
+{
+	if (!$path || $path == '-1')
+	{
+		continue;
+	}
+
+	if ($fieldParams->get('directory', '/') !== '/')
+	{
+		$buffer .= sprintf('<img src="images/%s/%s"%s>',
+			$fieldParams->get('directory'),
+			htmlentities($path, ENT_COMPAT, 'UTF-8', true),
+			$class
+		);
+	}
+	else
+	{
+		$buffer .= sprintf('<img src="images/%s"%s>',
+			htmlentities($path, ENT_COMPAT, 'UTF-8', true),
+			$class
+		);
+	}
+}
+
+echo $buffer;
diff --git a/core/plugins/fields/integer/integer.php b/core/plugins/fields/integer/integer.php
new file mode 100644
index 00000000..5ef99d3f
--- /dev/null
+++ b/core/plugins/fields/integer/integer.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Integer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Integer Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsInteger extends FieldsPlugin
+{
+}
diff --git a/core/plugins/fields/integer/integer.xml b/core/plugins/fields/integer/integer.xml
new file mode 100644
index 00000000..b879c854
--- /dev/null
+++ b/core/plugins/fields/integer/integer.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_integer</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_INTEGER_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="integer">integer.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_integer.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_integer.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="multiple"
+					type="radio"
+					label="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL"
+					description="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="first"
+					type="number"
+					label="PLG_FIELDS_INTEGER_PARAMS_FIRST_LABEL"
+					description="PLG_FIELDS_INTEGER_PARAMS_FIRST_DESC"
+					default="1"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="last"
+					type="number"
+					label="PLG_FIELDS_INTEGER_PARAMS_LAST_LABEL"
+					description="PLG_FIELDS_INTEGER_PARAMS_LAST_DESC"
+					default="100"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="step"
+					type="number"
+					label="PLG_FIELDS_INTEGER_PARAMS_STEP_LABEL"
+					description="PLG_FIELDS_INTEGER_PARAMS_STEP_DESC"
+					default="1"
+					filter="integer"
+					size="5"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/integer/params/integer.xml b/core/plugins/fields/integer/params/integer.xml
new file mode 100644
index 00000000..90a7e09c
--- /dev/null
+++ b/core/plugins/fields/integer/params/integer.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="multiple"
+				type="list"
+				label="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL"
+				description="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="first"
+				type="number"
+				label="PLG_FIELDS_INTEGER_PARAMS_FIRST_LABEL"
+				description="PLG_FIELDS_INTEGER_PARAMS_FIRST_DESC"
+				filter="integer"
+				size="5"
+			/>
+
+			<field
+				name="last"
+				type="number"
+				label="PLG_FIELDS_INTEGER_PARAMS_LAST_LABEL"
+				description="PLG_FIELDS_INTEGER_PARAMS_LAST_DESC"
+				filter="integer"
+				size="5"
+			/>
+
+			<field
+				name="step"
+				type="number"
+				label="PLG_FIELDS_INTEGER_PARAMS_STEP_LABEL"
+				description="PLG_FIELDS_INTEGER_PARAMS_STEP_DESC"
+				filter="integer"
+				size="5"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/integer/tmpl/integer.php b/core/plugins/fields/integer/tmpl/integer.php
new file mode 100644
index 00000000..fce68668
--- /dev/null
+++ b/core/plugins/fields/integer/tmpl/integer.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Integer
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+if (is_array($value))
+{
+	$value = implode(', ', array_map('intval', $value));
+}
+else
+{
+	$value = (int) $value;
+}
+
+echo $value;
diff --git a/core/plugins/fields/list/list.php b/core/plugins/fields/list/list.php
new file mode 100644
index 00000000..66a0dc74
--- /dev/null
+++ b/core/plugins/fields/list/list.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.List
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldslistplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields list Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsList extends FieldsListPlugin
+{
+}
diff --git a/core/plugins/fields/list/list.xml b/core/plugins/fields/list/list.xml
new file mode 100644
index 00000000..3cffb966
--- /dev/null
+++ b/core/plugins/fields/list/list.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_list</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_LIST_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="list">list.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_list.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_list.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="multiple"
+					type="radio"
+					label="PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL"
+					description="PLG_FIELDS_LIST_PARAMS_MULTIPLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="options"
+					type="subform"
+					label="PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL"
+					description="PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC"
+					layout="joomla.form.field.subform.repeatable-table"
+					icon="list"
+					multiple="true"
+					>
+					<form hidden="true" name="list_templates_modal" repeat="true">
+						<field
+							name="name"
+							type="text"
+							label="PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL"
+							size="30"
+						/>
+
+						<field
+							name="value"
+							type="text"
+							label="PLG_FIELDS_LIST_PARAMS_OPTIONS_VALUE_LABEL"
+							size="30"
+						/>
+					</form>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/list/params/list.xml b/core/plugins/fields/list/params/list.xml
new file mode 100644
index 00000000..1da9bcc2
--- /dev/null
+++ b/core/plugins/fields/list/params/list.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="multiple"
+				type="list"
+				label="PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL"
+				description="PLG_FIELDS_LIST_PARAMS_MULTIPLE_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+
+			<field
+				name="options"
+				type="subform"
+				label="PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL"
+				description="PLG_FIELDS_LIST_PARAMS_OPTIONS_DESC"
+				layout="joomla.form.field.subform.repeatable-table"
+				icon="list"
+				multiple="true"
+				>
+				<form hidden="true" name="list_templates_modal" repeat="true">
+					<field
+						name="name"
+						type="text"
+						label="PLG_FIELDS_LIST_PARAMS_OPTIONS_NAME_LABEL"
+						size="30"
+					/>
+
+					<field
+						name="value"
+						type="text"
+						label="PLG_FIELDS_LIST_PARAMS_OPTIONS_VALUE_LABEL"
+						size="30"
+					/>
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/list/tmpl/list.php b/core/plugins/fields/list/tmpl/list.php
new file mode 100644
index 00000000..870a69fc
--- /dev/null
+++ b/core/plugins/fields/list/tmpl/list.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.List
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$fieldValue = $field->value;
+
+if ($fieldValue == '')
+{
+	return;
+}
+
+$fieldValue = (array) $fieldValue;
+$texts      = array();
+$options    = $this->getOptionsFromField($field);
+
+foreach ($options as $value => $name)
+{
+	if (in_array((string) $value, $fieldValue))
+	{
+		$texts[] = JText::_($name);
+	}
+}
+
+
+echo htmlentities(implode(', ', $texts));
diff --git a/core/plugins/fields/media/media.php b/core/plugins/fields/media/media.php
new file mode 100644
index 00000000..a5e5f6a8
--- /dev/null
+++ b/core/plugins/fields/media/media.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Media Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsMedia extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('hide_default', 'true');
+
+		return $fieldNode;
+	}
+}
diff --git a/core/plugins/fields/media/media.xml b/core/plugins/fields/media/media.xml
new file mode 100644
index 00000000..9f531f2c
--- /dev/null
+++ b/core/plugins/fields/media/media.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_media</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_MEDIA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="media">media.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_media.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_media.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="directory"
+					type="folderlist"
+					label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+					description="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC"
+					directory="images"
+					hide_none="true"
+					recursive="true"
+				/>
+
+				<field
+					name="preview"
+					type="list"
+					label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
+					description="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC"
+					class="btn-group"
+					default="tooltip"
+					>
+					<option value="tooltip">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP</option>
+					<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
+					<option value="false">JNO</option>
+				</field>
+
+				<field
+					name="image_class"
+					type="textarea"
+					label="PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_LABEL"
+					description="PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_DESC"
+					size="40"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/media/params/media.xml b/core/plugins/fields/media/params/media.xml
new file mode 100644
index 00000000..a2c8466c
--- /dev/null
+++ b/core/plugins/fields/media/params/media.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="directory"
+				type="folderlist"
+				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+				description="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_DESC"
+				directory="images"
+				hide_none="true"
+				recursive="true"
+			/>
+
+			<field
+				name="preview"
+				type="list"
+				label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
+				description="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="tooltip">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP</option>
+				<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
+				<option value="false">JNO</option>
+			</field>
+
+			<field
+				name="image_class"
+				type="textarea"
+				label="PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_LABEL"
+				description="PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_DESC"
+				size="40"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/media/tmpl/media.php b/core/plugins/fields/media/tmpl/media.php
new file mode 100644
index 00000000..bc3dc727
--- /dev/null
+++ b/core/plugins/fields/media/tmpl/media.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+if ($field->value == '')
+{
+	return;
+}
+
+$class = $fieldParams->get('image_class');
+
+if ($class)
+{
+	$class = ' class="' . htmlentities($class, ENT_COMPAT, 'UTF-8', true) . '"';
+}
+
+$value  = (array) $field->value;
+$buffer = '';
+
+foreach ($value as $path)
+{
+	if (!$path)
+	{
+		continue;
+	}
+
+	$buffer .= sprintf('<img src="%s"%s>',
+		htmlentities($path, ENT_COMPAT, 'UTF-8', true),
+		$class
+	);
+}
+
+echo $buffer;
diff --git a/core/plugins/fields/radio/params/radio.xml b/core/plugins/fields/radio/params/radio.xml
new file mode 100644
index 00000000..8113b38c
--- /dev/null
+++ b/core/plugins/fields/radio/params/radio.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="options"
+				type="subform"
+				label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL"
+				description="PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC"
+				layout="joomla.form.field.subform.repeatable-table"
+				icon="list"
+				multiple="true"
+				>
+				<form hidden="true" name="list_templates_modal" repeat="true">
+					<field
+						name="name"
+						type="text"
+						label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_NAME_LABEL"
+						size="30"
+					/>
+
+					<field
+						name="value"
+						type="text"
+						label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_VALUE_LABEL"
+						size="30"
+					/>
+				</form>
+			</field>
+		</fieldset>
+	</fields>
+
+	<fields name="params">
+		<fieldset name="basic">
+			<field
+				name="class"
+				type="textarea"
+				label="COM_FIELDS_FIELD_CLASS_LABEL"
+				description="COM_FIELDS_FIELD_CLASS_DESC"
+				class="input-xxlarge"
+				size="40"
+				default="btn-group"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/radio/radio.php b/core/plugins/fields/radio/radio.php
new file mode 100644
index 00000000..6dc96448
--- /dev/null
+++ b/core/plugins/fields/radio/radio.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Radio
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldslistplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Radio Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsRadio extends FieldsListPlugin
+{
+}
diff --git a/core/plugins/fields/radio/radio.xml b/core/plugins/fields/radio/radio.xml
new file mode 100644
index 00000000..186158ae
--- /dev/null
+++ b/core/plugins/fields/radio/radio.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_radio</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_RADIO_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="radio">radio.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_radio.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_radio.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="options"
+					type="subform"
+					label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_LABEL"
+					description="PLG_FIELDS_RADIO_PARAMS_OPTIONS_DESC"
+					layout="joomla.form.field.subform.repeatable-table"
+					icon="list"
+					multiple="true"
+					>
+					<form hidden="true" name="list_templates_modal" repeat="true">
+						<field
+							name="name"
+							type="text"
+							label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_NAME_LABEL"
+							size="30"
+						/>
+
+						<field
+							name="value"
+							type="text"
+							label="PLG_FIELDS_RADIO_PARAMS_OPTIONS_VALUE_LABEL"
+							size="30"
+						/>
+					</form>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/radio/tmpl/radio.php b/core/plugins/fields/radio/tmpl/radio.php
new file mode 100644
index 00000000..84ce3166
--- /dev/null
+++ b/core/plugins/fields/radio/tmpl/radio.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Radio
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+$value   = (array) $value;
+$texts   = array();
+$options = $this->getOptionsFromField($field);
+
+foreach ($options as $optionValue => $optionText)
+{
+	if (in_array((string) $optionValue, $value))
+	{
+		$texts[] = JText::_($optionText);
+	}
+}
+
+
+echo htmlentities(implode(', ', $texts));
diff --git a/core/plugins/fields/sql/params/sql.xml b/core/plugins/fields/sql/params/sql.xml
new file mode 100644
index 00000000..75667b5e
--- /dev/null
+++ b/core/plugins/fields/sql/params/sql.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="query"
+				type="textarea"
+				label="PLG_FIELDS_SQL_PARAMS_QUERY_LABEL"
+				description="PLG_FIELDS_SQL_PARAMS_QUERY_DESC"
+				filter="raw"
+				rows="10"
+				required="true"
+			/>
+
+			<field
+				name="multiple"
+				type="list"
+				label="PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL"
+				description="PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/sql/sql.php b/core/plugins/fields/sql/sql.php
new file mode 100644
index 00000000..8ebfc5cc
--- /dev/null
+++ b/core/plugins/fields/sql/sql.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Sql
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldslistplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Sql Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsSql extends FieldsListPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('value_field', 'text');
+		$fieldNode->setAttribute('key_field', 'value');
+
+		return $fieldNode;
+	}
+
+	/**
+	 * The save event.
+	 *
+	 * @param   string   $context  The context
+	 * @param   JTable   $item     The table
+	 * @param   boolean  $isNew    Is new item
+	 * @param   array    $data     The validated data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentBeforeSave($context, $item, $isNew, $data = array())
+	{
+		// Only work on new SQL fields
+		if ($context != 'com_fields.field' || !isset($item->type) || $item->type != 'sql' || !$isNew)
+		{
+			return true;
+		}
+
+		// If we are not a super admin, don't let the user create a SQL field
+		if (!JAccess::getAssetRules(1)->allow('core.admin', JFactory::getUser()->getAuthorisedGroups()))
+		{
+			$item->setError(JText::_('PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE'));
+
+			return false;
+		}
+
+		$rules = $item->getRules()->getData();
+
+		// Only change the edit rule and when it is empty
+		if (key_exists('core.edit', $rules) && !$rules['core.edit']->getData())
+		{
+			// Set the denied flag on the root group
+			$rules['core.edit']->mergeIdentity(1, false);
+			JFactory::getApplication()->enqueueMessage(JText::_('PLG_FIELDS_SQL_RULES_ADAPTED'), 'warning');
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/fields/sql/sql.xml b/core/plugins/fields/sql/sql.xml
new file mode 100644
index 00000000..54486662
--- /dev/null
+++ b/core/plugins/fields/sql/sql.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_sql</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_SQL_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="sql">sql.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_sql.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_sql.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="query"
+					type="textarea"
+					label="PLG_FIELDS_SQL_PARAMS_QUERY_LABEL"
+					description="PLG_FIELDS_SQL_PARAMS_QUERY_DESC"
+					rows="10"
+					filter="raw"
+					required="true"
+				/>
+
+				<field
+					name="multiple"
+					type="radio"
+					label="PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL"
+					description="PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/sql/tmpl/sql.php b/core/plugins/fields/sql/tmpl/sql.php
new file mode 100644
index 00000000..0206f15e
--- /dev/null
+++ b/core/plugins/fields/sql/tmpl/sql.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Sql
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+$db        = JFactory::getDbo();
+$value     = (array) $value;
+$condition = '';
+
+foreach ($value as $v)
+{
+	if (!$v)
+	{
+		continue;
+	}
+
+	$condition .= ', ' . $db->q($v);
+}
+
+$query = $fieldParams->get('query', '');
+
+// Run the query with a having condition because it supports aliases
+$db->setQuery($query . ' having value in (' . trim($condition, ',') . ')');
+
+try
+{
+	$items = $db->loadObjectlist();
+}
+catch (Exception $e)
+{
+	// If the query failed, we fetch all elements
+	$db->setQuery($query);
+	$items = $db->loadObjectlist();
+}
+
+$texts = array();
+
+foreach ($items as $item)
+{
+	if (in_array($item->value, $value))
+	{
+		$texts[] = $item->text;
+	}
+}
+
+echo htmlentities(implode(', ', $texts));
diff --git a/core/plugins/fields/text/params/text.xml b/core/plugins/fields/text/params/text.xml
new file mode 100644
index 00000000..ad7e0317
--- /dev/null
+++ b/core/plugins/fields/text/params/text.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="filter"
+				type="list"
+				label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
+				description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
+				class="btn-group"
+				validate="options"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
+				<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
+				<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+				<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
+				<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
+				<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
+				<option value="tel">JLIB_FILTER_PARAMS_TEL</option>
+			</field>
+
+			<field
+				name="maxlength"
+				type="number"
+				label="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_LABEL"
+				description="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_DESC"
+				filter="integer"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/text/text.php b/core/plugins/fields/text/text.php
new file mode 100644
index 00000000..e09535ba
--- /dev/null
+++ b/core/plugins/fields/text/text.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Text
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Text Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsText extends FieldsPlugin
+{
+}
diff --git a/core/plugins/fields/text/text.xml b/core/plugins/fields/text/text.xml
new file mode 100644
index 00000000..f36219b9
--- /dev/null
+++ b/core/plugins/fields/text/text.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_text</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_TEXT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="text">text.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_text.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_text.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="filter"
+					type="list"
+					label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
+					description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
+					class="btn-group"
+					default="JComponentHelper::filterText"
+					validate="options"
+					>
+					<option value="0">JNO</option>
+					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
+					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
+					<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+					<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
+					<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
+					<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
+					<option value="tel">JLIB_FILTER_PARAMS_TEL</option>
+				</field>
+
+				<field
+					name="maxlength"
+					type="number"
+					label="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_LABEL"
+					description="PLG_FIELDS_TEXT_PARAMS_MAXLENGTH_DESC"
+					filter="integer"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/text/tmpl/text.php b/core/plugins/fields/text/tmpl/text.php
new file mode 100644
index 00000000..8ab4f25c
--- /dev/null
+++ b/core/plugins/fields/text/tmpl/text.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Text
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+if (is_array($value))
+{
+	$value = implode(', ', $value);
+}
+
+echo htmlentities($value);
diff --git a/core/plugins/fields/textarea/params/textarea.xml b/core/plugins/fields/textarea/params/textarea.xml
new file mode 100644
index 00000000..ee3d3a6f
--- /dev/null
+++ b/core/plugins/fields/textarea/params/textarea.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="rows"
+				type="number"
+				label="PLG_FIELDS_TEXTAREA_PARAMS_ROWS_LABEL"
+				description="PLG_FIELDS_TEXTAREA_PARAMS_ROWS_DESC"
+				filter="integer"
+				size="5"
+			/>
+
+			<field
+				name="cols"
+				type="number"
+				label="PLG_FIELDS_TEXTAREA_PARAMS_COLS_LABEL"
+				description="PLG_FIELDS_TEXTAREA_PARAMS_COLS_DESC"
+				filter="integer"
+				size="5"
+			/>
+
+			<field
+				name="maxlength"
+				type="number"
+				label="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_LABEL"
+				description="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_DESC"
+				filter="integer"
+			/>
+
+			<field
+				name="filter"
+				type="list"
+				label="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL"
+				description="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC"
+				class="btn-group"
+				validate="options"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
+				<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
+				<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+				<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
+				<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
+				<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
+				<option value="tel">JLIB_FILTER_PARAMS_TEL</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/textarea/textarea.php b/core/plugins/fields/textarea/textarea.php
new file mode 100644
index 00000000..a5e440b3
--- /dev/null
+++ b/core/plugins/fields/textarea/textarea.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Textarea
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Textarea Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsTextarea extends FieldsPlugin
+{
+}
diff --git a/core/plugins/fields/textarea/textarea.xml b/core/plugins/fields/textarea/textarea.xml
new file mode 100644
index 00000000..277930df
--- /dev/null
+++ b/core/plugins/fields/textarea/textarea.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_textarea</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_TEXTAREA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="textarea">textarea.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_textarea.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_textarea.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="rows"
+					type="number"
+					label="PLG_FIELDS_TEXTAREA_PARAMS_ROWS_LABEL"
+					description="PLG_FIELDS_TEXTAREA_PARAMS_ROWS_DESC"
+					default="10"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="cols"
+					type="number"
+					label="PLG_FIELDS_TEXTAREA_PARAMS_COLS_LABEL"
+					description="PLG_FIELDS_TEXTAREA_PARAMS_COLS_DESC"
+					default="10"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="maxlength"
+					type="number"
+					label="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_LABEL"
+					description="PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_DESC"
+					filter="integer"
+				/>
+
+				<field
+					name="filter"
+					type="list"
+					label="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL"
+					description="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC"
+					class="btn-group"
+					default="JComponentHelper::filterText"
+					validate="options"
+					>
+					<option value="0">JNO</option>
+					<option value="raw">JLIB_FILTER_PARAMS_RAW</option>
+					<option value="safehtml">JLIB_FILTER_PARAMS_SAFEHTML</option>
+					<option value="JComponentHelper::filterText">JLIB_FILTER_PARAMS_TEXT</option>
+					<option value="alnum">JLIB_FILTER_PARAMS_ALNUM</option>
+					<option value="integer">JLIB_FILTER_PARAMS_INTEGER</option>
+					<option value="float">JLIB_FILTER_PARAMS_FLOAT</option>
+					<option value="tel">JLIB_FILTER_PARAMS_TEL</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/textarea/tmpl/textarea.php b/core/plugins/fields/textarea/tmpl/textarea.php
new file mode 100644
index 00000000..a849f06b
--- /dev/null
+++ b/core/plugins/fields/textarea/tmpl/textarea.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Textarea
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+echo JHtml::_('content.prepare', $value);
diff --git a/core/plugins/fields/url/params/url.xml b/core/plugins/fields/url/params/url.xml
new file mode 100644
index 00000000..d844ab6b
--- /dev/null
+++ b/core/plugins/fields/url/params/url.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="schemes"
+				type="list"
+				label="PLG_FIELDS_URL_PARAMS_SCHEMES_LABEL"
+				description="PLG_FIELDS_URL_PARAMS_SCHEMES_DESC"
+				multiple="true"
+				>
+				<option value="http">HTTP</option>
+				<option value="https">HTTPS</option>
+				<option value="ftp">FTP</option>
+				<option value="ftps">FTPS</option>
+				<option value="file">FILE</option>
+				<option value="mailto">MAILTO</option>
+			</field>
+
+			<field
+				name="relative"
+				type="list"
+				label="PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL"
+				description="PLG_FIELDS_URL_PARAMS_RELATIVE_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/url/tmpl/url.php b/core/plugins/fields/url/tmpl/url.php
new file mode 100644
index 00000000..560246e4
--- /dev/null
+++ b/core/plugins/fields/url/tmpl/url.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.URL
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+$attributes = '';
+
+if (!JUri::isInternal($value))
+{
+	$attributes = ' rel="nofollow noopener noreferrer" target="_blank"';
+}
+
+echo sprintf('<a href="%s"%s>%s</a>',
+	htmlspecialchars($value),
+	$attributes,
+	htmlspecialchars($value)
+);
diff --git a/core/plugins/fields/url/url.php b/core/plugins/fields/url/url.php
new file mode 100644
index 00000000..c84e5437
--- /dev/null
+++ b/core/plugins/fields/url/url.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.URL
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields URL Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsUrl extends FieldsPlugin
+{
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		$fieldNode = parent::onCustomFieldsPrepareDom($field, $parent, $form);
+
+		if (!$fieldNode)
+		{
+			return $fieldNode;
+		}
+
+		$fieldNode->setAttribute('validate', 'url');
+
+		if (! $fieldNode->getAttribute('relative'))
+		{
+			$fieldNode->removeAttribute('relative');
+		}
+
+		return $fieldNode;
+	}
+}
diff --git a/core/plugins/fields/url/url.xml b/core/plugins/fields/url/url.xml
new file mode 100644
index 00000000..9d815e3f
--- /dev/null
+++ b/core/plugins/fields/url/url.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_url</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_URL_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="url">url.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_url.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_url.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="schemes"
+					type="list"
+					label="PLG_FIELDS_URL_PARAMS_SCHEMES_LABEL"
+					description="PLG_FIELDS_URL_PARAMS_SCHEMES_DESC"
+					multiple="true"
+					>
+					<option value="http">HTTP</option>
+					<option value="https">HTTPS</option>
+					<option value="ftp">FTP</option>
+					<option value="ftps">FTPS</option>
+					<option value="file">FILE</option>
+					<option value="mailto">MAILTO</option>
+				</field>
+
+				<field
+					name="relative"
+					type="radio"
+					label="PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL"
+					description="PLG_FIELDS_URL_PARAMS_RELATIVE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/fields/user/params/user.xml b/core/plugins/fields/user/params/user.xml
new file mode 100644
index 00000000..bcd0a7e4
--- /dev/null
+++ b/core/plugins/fields/user/params/user.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="default_value"
+		type="user"
+		label="PLG_FIELDS_USER_DEFAULT_VALUE_LABEL"
+		description="PLG_FIELDS_USER_DEFAULT_VALUE_DESC"
+	/>
+	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="basic">
+			<field
+				name="show_on"
+				type="hidden"
+				filter="unset"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/user/tmpl/user.php b/core/plugins/fields/user/tmpl/user.php
new file mode 100644
index 00000000..de7a035a
--- /dev/null
+++ b/core/plugins/fields/user/tmpl/user.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.User
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+$value = (array) $value;
+$texts = array();
+
+foreach ($value as $userId)
+{
+	if (!$userId)
+	{
+		continue;
+	}
+
+	$user = JFactory::getUser($userId);
+
+	if ($user)
+	{
+		// Use the Username
+		$texts[] = $user->name;
+		continue;
+	}
+
+	// Fallback and add the User ID if we get no JUser Object
+	$texts[] = $userId;
+}
+
+echo htmlentities(implode(', ', $texts));
diff --git a/core/plugins/fields/user/user.php b/core/plugins/fields/user/user.php
new file mode 100644
index 00000000..33244efa
--- /dev/null
+++ b/core/plugins/fields/user/user.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.User
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields User Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsUser extends FieldsPlugin
+{
+
+	/**
+	 * Transforms the field into a DOM XML element and appends it as a child on the given parent.
+	 *
+	 * @param   stdClass    $field   The field.
+	 * @param   DOMElement  $parent  The field node parent.
+	 * @param   JForm       $form    The form.
+	 *
+	 * @return  DOMElement
+	 *
+	 * @since   3.7.0
+	 */
+	public function onCustomFieldsPrepareDom($field, DOMElement $parent, JForm $form)
+	{
+		if (JFactory::getApplication()->isClient('site'))
+		{
+			// The user field is not working on the front end
+			return;
+		}
+
+		return parent::onCustomFieldsPrepareDom($field, $parent, $form);
+	}
+}
diff --git a/core/plugins/fields/user/user.xml b/core/plugins/fields/user/user.xml
new file mode 100644
index 00000000..4a1c88d4
--- /dev/null
+++ b/core/plugins/fields/user/user.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_user</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_USER_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="user">user.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_user.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_user.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/fields/usergrouplist/params/usergrouplist.xml b/core/plugins/fields/usergrouplist/params/usergrouplist.xml
new file mode 100644
index 00000000..eb3d0d7a
--- /dev/null
+++ b/core/plugins/fields/usergrouplist/params/usergrouplist.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="multiple"
+				type="list"
+				label="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL"
+				description="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC"
+				filter="integer"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/plugins/fields/usergrouplist/tmpl/usergrouplist.php b/core/plugins/fields/usergrouplist/tmpl/usergrouplist.php
new file mode 100644
index 00000000..7ae25946
--- /dev/null
+++ b/core/plugins/fields/usergrouplist/tmpl/usergrouplist.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Usergrouplist
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$value = $field->value;
+
+if ($value == '')
+{
+	return;
+}
+
+JLoader::register('UsersHelper', JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php');
+
+$value  = (array) $value;
+$texts  = array();
+$groups = UsersHelper::getGroups();
+
+foreach ($groups as $group)
+{
+	if (in_array($group->value, $value))
+	{
+		$texts[] = htmlentities(trim($group->text, '- '));
+	}
+}
+
+echo htmlentities(implode(', ', $texts));
diff --git a/core/plugins/fields/usergrouplist/usergrouplist.php b/core/plugins/fields/usergrouplist/usergrouplist.php
new file mode 100644
index 00000000..58fa2958
--- /dev/null
+++ b/core/plugins/fields/usergrouplist/usergrouplist.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Usergrouplist
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::import('components.com_fields.libraries.fieldsplugin', JPATH_ADMINISTRATOR);
+
+/**
+ * Fields Usergrouplist Plugin
+ *
+ * @since  3.7.0
+ */
+class PlgFieldsUsergrouplist extends FieldsPlugin
+{
+}
diff --git a/core/plugins/fields/usergrouplist/usergrouplist.xml b/core/plugins/fields/usergrouplist/usergrouplist.xml
new file mode 100644
index 00000000..690ce512
--- /dev/null
+++ b/core/plugins/fields/usergrouplist/usergrouplist.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="fields" method="upgrade">
+	<name>plg_fields_usergrouplist</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_FIELDS_USERGROUPLIST_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="usergrouplist">usergrouplist.php</filename>
+		<folder>params</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_fields_usergrouplist.ini</language>
+		<language tag="en-GB">en-GB.plg_fields_usergrouplist.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="multiple"
+					type="radio"
+					label="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL"
+					description="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/finder/categories/categories.php b/core/plugins/finder/categories/categories.php
new file mode 100644
index 00000000..d9be659e
--- /dev/null
+++ b/core/plugins/finder/categories/categories.php
@@ -0,0 +1,401 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Finder.Categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
+
+/**
+ * Smart Search adapter for Joomla Categories.
+ *
+ * @since  2.5
+ */
+class PlgFinderCategories extends FinderIndexerAdapter
+{
+	/**
+	 * The plugin identifier.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'Categories';
+
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $extension = 'com_categories';
+
+	/**
+	 * The sublayout to use when rendering the results.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $layout = 'category';
+
+	/**
+	 * The type of content that the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type_title = 'Category';
+
+	/**
+	 * The table name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $table = '#__categories';
+
+	/**
+	 * The field the published state is stored in.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $state_field = 'published';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method to remove the link information for items that have been deleted.
+	 *
+	 * @param   string  $context  The context of the action being performed.
+	 * @param   JTable  $table    A JTable object containing the record to be deleted
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderDelete($context, $table)
+	{
+		if ($context === 'com_categories.category')
+		{
+			$id = $table->id;
+		}
+		elseif ($context === 'com_finder.index')
+		{
+			$id = $table->link_id;
+		}
+		else
+		{
+			return true;
+		}
+
+		// Remove item from the index.
+		return $this->remove($id);
+	}
+
+	/**
+	 * Smart Search after save content method.
+	 * Reindexes the link information for a category that has been saved.
+	 * It also makes adjustments if the access level of the category has changed.
+	 *
+	 * @param   string   $context  The context of the category passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the category has just been created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterSave($context, $row, $isNew)
+	{
+		// We only want to handle categories here.
+		if ($context === 'com_categories.category')
+		{
+			// Check if the access levels are different.
+			if (!$isNew && $this->old_access != $row->access)
+			{
+				// Process the change.
+				$this->itemAccessChange($row);
+			}
+
+			// Reindex the category item.
+			$this->reindex($row->id);
+
+			// Check if the parent access level is different.
+			if (!$isNew && $this->old_cataccess != $row->access)
+			{
+				$this->categoryAccessChange($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
+	 *
+	 * @param   string   $context  The context of the category passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the category is just about to be created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderBeforeSave($context, $row, $isNew)
+	{
+		// We only want to handle categories here.
+		if ($context === 'com_categories.category')
+		{
+			// Query the database for the old access level and the parent if the item isn't new.
+			if (!$isNew)
+			{
+				$this->checkItemAccess($row);
+				$this->checkCategoryAccess($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to update the link information for items that have been changed
+	 * from outside the edit screen. This is fired when the item is published,
+	 * unpublished, archived, or unarchived from the list view.
+	 *
+	 * @param   string   $context  The context for the category passed to the plugin.
+	 * @param   array    $pks      An array of primary key ids of the category that has changed state.
+	 * @param   integer  $value    The value of the state that the category has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderChangeState($context, $pks, $value)
+	{
+		// We only want to handle categories here.
+		if ($context === 'com_categories.category')
+		{
+			/*
+			 * The category published state is tied to the parent category
+			 * published state so we need to look up all published states
+			 * before we change anything.
+			 */
+			foreach ($pks as $pk)
+			{
+				$query = clone $this->getStateQuery();
+				$query->where('a.id = ' . (int) $pk);
+
+				$this->db->setQuery($query);
+				$item = $this->db->loadObject();
+
+				// Translate the state.
+				$state = null;
+
+				if ($item->parent_id != 1)
+				{
+					$state = $item->cat_state;
+				}
+
+				$temp = $this->translateState($value, $state);
+
+				// Update the item.
+				$this->change($pk, 'state', $temp);
+
+				// Reindex the item.
+				$this->reindex($pk);
+			}
+		}
+
+		// Handle when the plugin is disabled.
+		if ($context === 'com_plugins.plugin' && $value === 0)
+		{
+			$this->pluginDisable($pks);
+		}
+	}
+
+	/**
+	 * Method to index an item. The item must be a FinderIndexerResult object.
+	 *
+	 * @param   FinderIndexerResult  $item    The item to index as a FinderIndexerResult object.
+	 * @param   string               $format  The item format.  Not used.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function index(FinderIndexerResult $item, $format = 'html')
+	{
+		// Check if the extension is enabled.
+		if (JComponentHelper::isEnabled($this->extension) === false)
+		{
+			return;
+		}
+
+		// Check if the extension that owns the category is also enabled.
+		if (JComponentHelper::isEnabled($item->extension) === false)
+		{
+			return;
+		}
+
+		$item->setLanguage();
+
+		$extension = ucfirst(substr($item->extension, 4));
+
+		// Initialize the item parameters.
+		$item->params = new Registry($item->params);
+
+		$item->metadata = new Registry($item->metadata);
+
+		/*
+		 * Add the metadata processing instructions based on the category's
+		 * configuration parameters.
+		 */
+		// Add the meta author.
+		$item->metaauthor = $item->metadata->get('author');
+
+		// Handle the link to the metadata.
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'link');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metakey');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metadesc');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metaauthor');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'author');
+
+		// Deactivated Methods
+		// $item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias');
+
+		// Trigger the onContentPrepare event.
+		$item->summary = FinderIndexerHelper::prepareContent($item->summary, $item->params);
+
+		// Build the necessary route and path information.
+		$item->url = $this->getUrl($item->id, $item->extension, $this->layout);
+
+		$class = $extension . 'HelperRoute';
+
+		// Need to import component route helpers dynamically, hence the reason it's handled here.
+		JLoader::register($class, JPATH_SITE . '/components/' . $item->extension . '/helpers/route.php');
+
+		if (class_exists($class) && method_exists($class, 'getCategoryRoute'))
+		{
+			$item->route = $class::getCategoryRoute($item->id, $item->language);
+		}
+		else
+		{
+			$item->route = ContentHelperRoute::getCategoryRoute($item->id, $item->language);
+		}
+
+		$item->path = FinderIndexerHelper::getContentPath($item->route);
+
+		// Get the menu title if it exists.
+		$title = $this->getItemMenuTitle($item->url);
+
+		// Adjust the title if necessary.
+		if (!empty($title) && $this->params->get('use_menu_title', true))
+		{
+			$item->title = $title;
+		}
+
+		// Translate the state. Categories should only be published if the parent category is published.
+		$item->state = $this->translateState($item->state);
+
+		// Add the type taxonomy data.
+		$item->addTaxonomy('Type', 'Category');
+
+		// Add the language taxonomy data.
+		$item->addTaxonomy('Language', $item->language);
+
+		// Get content extras.
+		FinderIndexerHelper::getContentExtras($item);
+
+		// Index the item.
+		$this->indexer->index($item);
+	}
+
+	/**
+	 * Method to setup the indexer to be run.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	protected function setup()
+	{
+		// Load com_content route helper as it is the fallback for routing in the indexer in this instance.
+		JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+		return true;
+	}
+
+	/**
+	 * Method to get the SQL query used to retrieve the list of content items.
+	 *
+	 * @param   mixed  $query  A JDatabaseQuery object or null.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery($query = null)
+	{
+		$db = JFactory::getDbo();
+
+		// Check if we can use the supplied SQL query.
+		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
+			->select('a.id, a.title, a.alias, a.description AS summary, a.extension')
+			->select('a.created_user_id AS created_by, a.modified_time AS modified, a.modified_user_id AS modified_by')
+			->select('a.metakey, a.metadesc, a.metadata, a.language, a.lft, a.parent_id, a.level')
+			->select('a.created_time AS start_date, a.published AS state, a.access, a.params');
+
+		// Handle the alias CASE WHEN portion of the query.
+		$case_when_item_alias = ' CASE WHEN ';
+		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
+		$case_when_item_alias .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when_item_alias .= ' ELSE ';
+		$case_when_item_alias .= $a_id . ' END as slug';
+		$query->select($case_when_item_alias)
+			->from('#__categories AS a')
+			->where($db->quoteName('a.id') . ' > 1');
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a SQL query to load the published and access states for
+	 * a category and its parents.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getStateQuery()
+	{
+		$query = $this->db->getQuery(true)
+			->select($this->db->quoteName('a.id'))
+			->select($this->db->quoteName('a.parent_id'))
+			->select('a.' . $this->state_field . ' AS state, c.published AS cat_state')
+			->select('a.access, c.access AS cat_access')
+			->from($this->db->quoteName('#__categories') . ' AS a')
+			->join('LEFT', '#__categories AS c ON c.id = a.parent_id');
+
+		return $query;
+	}
+}
diff --git a/core/plugins/finder/categories/categories.xml b/core/plugins/finder/categories/categories.xml
new file mode 100644
index 00000000..6b929033
--- /dev/null
+++ b/core/plugins/finder/categories/categories.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="finder" method="upgrade">
+	<name>plg_finder_categories</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_FINDER_CATEGORIES_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="categories">categories.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_categories.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_categories.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/finder/contacts/contacts.php b/core/plugins/finder/contacts/contacts.php
new file mode 100644
index 00000000..51797206
--- /dev/null
+++ b/core/plugins/finder/contacts/contacts.php
@@ -0,0 +1,449 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Finder.Contacts
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
+
+/**
+ * Finder adapter for Joomla Contacts.
+ *
+ * @since  2.5
+ */
+class PlgFinderContacts extends FinderIndexerAdapter
+{
+	/**
+	 * The plugin identifier.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'Contacts';
+
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $extension = 'com_contact';
+
+	/**
+	 * The sublayout to use when rendering the results.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $layout = 'contact';
+
+	/**
+	 * The type of content that the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type_title = 'Contact';
+
+	/**
+	 * The table name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $table = '#__contact_details';
+
+	/**
+	 * The field the published state is stored in.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $state_field = 'published';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method to update the item link information when the item category is
+	 * changed. This is fired when the item category is published or unpublished
+	 * from the list view.
+	 *
+	 * @param   string   $extension  The extension whose category has been updated.
+	 * @param   array    $pks        A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value      The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderCategoryChangeState($extension, $pks, $value)
+	{
+		// Make sure we're handling com_contact categories
+		if ($extension === 'com_contact')
+		{
+			$this->categoryStateChange($pks, $value);
+		}
+	}
+
+	/**
+	 * Method to remove the link information for items that have been deleted.
+	 *
+	 * This event will fire when contacts are deleted and when an indexed item is deleted.
+	 *
+	 * @param   string  $context  The context of the action being performed.
+	 * @param   JTable  $table    A JTable object containing the record to be deleted
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterDelete($context, $table)
+	{
+		if ($context === 'com_contact.contact')
+		{
+			$id = $table->id;
+		}
+		elseif ($context === 'com_finder.index')
+		{
+			$id = $table->link_id;
+		}
+		else
+		{
+			return true;
+		}
+
+		// Remove the items.
+		return $this->remove($id);
+	}
+
+	/**
+	 * Method to determine if the access level of an item changed.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object
+	 * @param   boolean  $isNew    If the content has just been created
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterSave($context, $row, $isNew)
+	{
+		// We only want to handle contacts here
+		if ($context === 'com_contact.contact')
+		{
+			// Check if the access levels are different
+			if (!$isNew && $this->old_access != $row->access)
+			{
+				// Process the change.
+				$this->itemAccessChange($row);
+			}
+
+			// Reindex the item
+			$this->reindex($row->id);
+		}
+
+		// Check for access changes in the category
+		if ($context === 'com_categories.category')
+		{
+			// Check if the access levels are different
+			if (!$isNew && $this->old_cataccess != $row->access)
+			{
+				$this->categoryAccessChange($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to reindex the link information for an item that has been saved.
+	 * This event is fired before the data is actually saved so we are going
+	 * to queue the item to be indexed later.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object
+	 * @param   boolean  $isNew    If the content is just about to be created
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderBeforeSave($context, $row, $isNew)
+	{
+		// We only want to handle contacts here
+		if ($context === 'com_contact.contact')
+		{
+			// Query the database for the old access level if the item isn't new
+			if (!$isNew)
+			{
+				$this->checkItemAccess($row);
+			}
+		}
+
+		// Check for access levels from the category
+		if ($context === 'com_categories.category')
+		{
+			// Query the database for the old access level if the item isn't new
+			if (!$isNew)
+			{
+				$this->checkCategoryAccess($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to update the link information for items that have been changed
+	 * from outside the edit screen. This is fired when the item is published,
+	 * unpublished, archived, or unarchived from the list view.
+	 *
+	 * @param   string   $context  The context for the content passed to the plugin.
+	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderChangeState($context, $pks, $value)
+	{
+		// We only want to handle contacts here
+		if ($context === 'com_contact.contact')
+		{
+			$this->itemStateChange($pks, $value);
+		}
+
+		// Handle when the plugin is disabled
+		if ($context === 'com_plugins.plugin' && $value === 0)
+		{
+			$this->pluginDisable($pks);
+		}
+	}
+
+	/**
+	 * Method to index an item. The item must be a FinderIndexerResult object.
+	 *
+	 * @param   FinderIndexerResult  $item    The item to index as a FinderIndexerResult object.
+	 * @param   string               $format  The item format
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function index(FinderIndexerResult $item, $format = 'html')
+	{
+		// Check if the extension is enabled
+		if (JComponentHelper::isEnabled($this->extension) === false)
+		{
+			return;
+		}
+
+		$item->setLanguage();
+
+		// Initialize the item parameters.
+		$item->params = new Registry($item->params);
+
+		// Build the necessary route and path information.
+		$item->url = $this->getUrl($item->id, $this->extension, $this->layout);
+		$item->route = ContactHelperRoute::getContactRoute($item->slug, $item->catslug, $item->language);
+		$item->path = FinderIndexerHelper::getContentPath($item->route);
+
+		// Get the menu title if it exists.
+		$title = $this->getItemMenuTitle($item->url);
+
+		// Adjust the title if necessary.
+		if (!empty($title) && $this->params->get('use_menu_title', true))
+		{
+			$item->title = $title;
+		}
+
+		/*
+		 * Add the metadata processing instructions based on the contact
+		 * configuration parameters.
+		 */
+		// Handle the contact position.
+		if ($item->params->get('show_position', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'position');
+		}
+
+		// Handle the contact street address.
+		if ($item->params->get('show_street_address', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'address');
+		}
+
+		// Handle the contact city.
+		if ($item->params->get('show_suburb', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'city');
+		}
+
+		// Handle the contact region.
+		if ($item->params->get('show_state', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'region');
+		}
+
+		// Handle the contact country.
+		if ($item->params->get('show_country', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'country');
+		}
+
+		// Handle the contact zip code.
+		if ($item->params->get('show_postcode', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'zip');
+		}
+
+		// Handle the contact telephone number.
+		if ($item->params->get('show_telephone', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'telephone');
+		}
+
+		// Handle the contact fax number.
+		if ($item->params->get('show_fax', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'fax');
+		}
+
+		// Handle the contact email address.
+		if ($item->params->get('show_email', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'email');
+		}
+
+		// Handle the contact mobile number.
+		if ($item->params->get('show_mobile', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'mobile');
+		}
+
+		// Handle the contact webpage.
+		if ($item->params->get('show_webpage', true))
+		{
+			$item->addInstruction(FinderIndexer::META_CONTEXT, 'webpage');
+		}
+
+		// Handle the contact user name.
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'user');
+
+		// Add the type taxonomy data.
+		$item->addTaxonomy('Type', 'Contact');
+
+		// Add the category taxonomy data.
+		$item->addTaxonomy('Category', $item->category, $item->cat_state, $item->cat_access);
+
+		// Add the language taxonomy data.
+		$item->addTaxonomy('Language', $item->language);
+
+		// Add the region taxonomy data.
+		if (!empty($item->region) && $this->params->get('tax_add_region', true))
+		{
+			$item->addTaxonomy('Region', $item->region);
+		}
+
+		// Add the country taxonomy data.
+		if (!empty($item->country) && $this->params->get('tax_add_country', true))
+		{
+			$item->addTaxonomy('Country', $item->country);
+		}
+
+		// Get content extras.
+		FinderIndexerHelper::getContentExtras($item);
+
+		// Index the item.
+		$this->indexer->index($item);
+	}
+
+	/**
+	 * Method to setup the indexer to be run.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	protected function setup()
+	{
+		// Load dependent classes.
+		JLoader::register('ContactHelperRoute', JPATH_SITE . '/components/com_contact/helpers/route.php');
+
+		// This is a hack to get around the lack of a route helper.
+		FinderIndexerHelper::getContentPath('index.php?option=com_contact');
+
+		return true;
+	}
+
+	/**
+	 * Method to get the SQL query used to retrieve the list of content items.
+	 *
+	 * @param   mixed  $query  A JDatabaseQuery object or null.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery($query = null)
+	{
+		$db = JFactory::getDbo();
+
+		// Check if we can use the supplied SQL query.
+		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
+			->select('a.id, a.name AS title, a.alias, a.con_position AS position, a.address, a.created AS start_date')
+			->select('a.created_by_alias, a.modified, a.modified_by')
+			->select('a.metakey, a.metadesc, a.metadata, a.language')
+			->select('a.sortname1, a.sortname2, a.sortname3')
+			->select('a.publish_up AS publish_start_date, a.publish_down AS publish_end_date')
+			->select('a.suburb AS city, a.state AS region, a.country, a.postcode AS zip')
+			->select('a.telephone, a.fax, a.misc AS summary, a.email_to AS email, a.mobile')
+			->select('a.webpage, a.access, a.published AS state, a.ordering, a.params, a.catid')
+			->select('c.title AS category, c.published AS cat_state, c.access AS cat_access');
+
+		// Handle the alias CASE WHEN portion of the query
+		$case_when_item_alias = ' CASE WHEN ';
+		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
+		$case_when_item_alias .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when_item_alias .= ' ELSE ';
+		$case_when_item_alias .= $a_id . ' END as slug';
+		$query->select($case_when_item_alias);
+
+		$case_when_category_alias = ' CASE WHEN ';
+		$case_when_category_alias .= $query->charLength('c.alias', '!=', '0');
+		$case_when_category_alias .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when_category_alias .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when_category_alias .= ' ELSE ';
+		$case_when_category_alias .= $c_id . ' END as catslug';
+		$query->select($case_when_category_alias)
+
+			->select('u.name')
+			->from('#__contact_details AS a')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid')
+			->join('LEFT', '#__users AS u ON u.id = a.user_id');
+
+		return $query;
+	}
+}
diff --git a/core/plugins/finder/contacts/contacts.xml b/core/plugins/finder/contacts/contacts.xml
new file mode 100644
index 00000000..f7d37c6b
--- /dev/null
+++ b/core/plugins/finder/contacts/contacts.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="finder" method="upgrade">
+	<name>plg_finder_contacts</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_FINDER_CONTACTS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contacts">contacts.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_contacts.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_contacts.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/finder/content/content.php b/core/plugins/finder/content/content.php
new file mode 100644
index 00000000..1ad10a60
--- /dev/null
+++ b/core/plugins/finder/content/content.php
@@ -0,0 +1,379 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Finder.Content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
+
+/**
+ * Smart Search adapter for com_content.
+ *
+ * @since  2.5
+ */
+class PlgFinderContent extends FinderIndexerAdapter
+{
+	/**
+	 * The plugin identifier.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'Content';
+
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $extension = 'com_content';
+
+	/**
+	 * The sublayout to use when rendering the results.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $layout = 'article';
+
+	/**
+	 * The type of content that the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type_title = 'Article';
+
+	/**
+	 * The table name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $table = '#__content';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method to update the item link information when the item category is
+	 * changed. This is fired when the item category is published or unpublished
+	 * from the list view.
+	 *
+	 * @param   string   $extension  The extension whose category has been updated.
+	 * @param   array    $pks        A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value      The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderCategoryChangeState($extension, $pks, $value)
+	{
+		// Make sure we're handling com_content categories.
+		if ($extension === 'com_content')
+		{
+			$this->categoryStateChange($pks, $value);
+		}
+	}
+
+	/**
+	 * Method to remove the link information for items that have been deleted.
+	 *
+	 * @param   string  $context  The context of the action being performed.
+	 * @param   JTable  $table    A JTable object containing the record to be deleted
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterDelete($context, $table)
+	{
+		if ($context === 'com_content.article')
+		{
+			$id = $table->id;
+		}
+		elseif ($context === 'com_finder.index')
+		{
+			$id = $table->link_id;
+		}
+		else
+		{
+			return true;
+		}
+
+		// Remove item from the index.
+		return $this->remove($id);
+	}
+
+	/**
+	 * Smart Search after save content method.
+	 * Reindexes the link information for an article that has been saved.
+	 * It also makes adjustments if the access level of an item or the
+	 * category to which it belongs has changed.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content has just been created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterSave($context, $row, $isNew)
+	{
+		// We only want to handle articles here.
+		if ($context === 'com_content.article' || $context === 'com_content.form')
+		{
+			// Check if the access levels are different.
+			if (!$isNew && $this->old_access != $row->access)
+			{
+				// Process the change.
+				$this->itemAccessChange($row);
+			}
+
+			// Reindex the item.
+			$this->reindex($row->id);
+		}
+
+		// Check for access changes in the category.
+		if ($context === 'com_categories.category')
+		{
+			// Check if the access levels are different.
+			if (!$isNew && $this->old_cataccess != $row->access)
+			{
+				$this->categoryAccessChange($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    If the content is just about to be created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderBeforeSave($context, $row, $isNew)
+	{
+		// We only want to handle articles here.
+		if ($context === 'com_content.article' || $context === 'com_content.form')
+		{
+			// Query the database for the old access level if the item isn't new.
+			if (!$isNew)
+			{
+				$this->checkItemAccess($row);
+			}
+		}
+
+		// Check for access levels from the category.
+		if ($context === 'com_categories.category')
+		{
+			// Query the database for the old access level if the item isn't new.
+			if (!$isNew)
+			{
+				$this->checkCategoryAccess($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to update the link information for items that have been changed
+	 * from outside the edit screen. This is fired when the item is published,
+	 * unpublished, archived, or unarchived from the list view.
+	 *
+	 * @param   string   $context  The context for the content passed to the plugin.
+	 * @param   array    $pks      An array of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderChangeState($context, $pks, $value)
+	{
+		// We only want to handle articles here.
+		if ($context === 'com_content.article' || $context === 'com_content.form')
+		{
+			$this->itemStateChange($pks, $value);
+		}
+
+		// Handle when the plugin is disabled.
+		if ($context === 'com_plugins.plugin' && $value === 0)
+		{
+			$this->pluginDisable($pks);
+		}
+	}
+
+	/**
+	 * Method to index an item. The item must be a FinderIndexerResult object.
+	 *
+	 * @param   FinderIndexerResult  $item    The item to index as a FinderIndexerResult object.
+	 * @param   string               $format  The item format.  Not used.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function index(FinderIndexerResult $item, $format = 'html')
+	{
+		$item->setLanguage();
+
+		// Check if the extension is enabled.
+		if (JComponentHelper::isEnabled($this->extension) === false)
+		{
+			return;
+		}
+
+		$item->context = 'com_content.article';
+
+		// Initialise the item parameters.
+		$registry = new Registry($item->params);
+		$item->params = JComponentHelper::getParams('com_content', true);
+		$item->params->merge($registry);
+
+		$item->metadata = new Registry($item->metadata);
+
+		// Trigger the onContentPrepare event.
+		$item->summary = FinderIndexerHelper::prepareContent($item->summary, $item->params, $item);
+		$item->body    = FinderIndexerHelper::prepareContent($item->body, $item->params, $item);
+
+		// Build the necessary route and path information.
+		$item->url = $this->getUrl($item->id, $this->extension, $this->layout);
+		$item->route = ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language);
+		$item->path = FinderIndexerHelper::getContentPath($item->route);
+
+		// Get the menu title if it exists.
+		$title = $this->getItemMenuTitle($item->url);
+
+		// Adjust the title if necessary.
+		if (!empty($title) && $this->params->get('use_menu_title', true))
+		{
+			$item->title = $title;
+		}
+
+		// Add the meta author.
+		$item->metaauthor = $item->metadata->get('author');
+
+		// Add the metadata processing instructions.
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metakey');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metadesc');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metaauthor');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'author');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias');
+
+		// Translate the state. Articles should only be published if the category is published.
+		$item->state = $this->translateState($item->state, $item->cat_state);
+
+		// Add the type taxonomy data.
+		$item->addTaxonomy('Type', 'Article');
+
+		// Add the author taxonomy data.
+		if (!empty($item->author) || !empty($item->created_by_alias))
+		{
+			$item->addTaxonomy('Author', !empty($item->created_by_alias) ? $item->created_by_alias : $item->author);
+		}
+
+		// Add the category taxonomy data.
+		$item->addTaxonomy('Category', $item->category, $item->cat_state, $item->cat_access);
+
+		// Add the language taxonomy data.
+		$item->addTaxonomy('Language', $item->language);
+
+		// Get content extras.
+		FinderIndexerHelper::getContentExtras($item);
+
+		// Index the item.
+		$this->indexer->index($item);
+	}
+
+	/**
+	 * Method to setup the indexer to be run.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	protected function setup()
+	{
+		// Load dependent classes.
+		JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+		return true;
+	}
+
+	/**
+	 * Method to get the SQL query used to retrieve the list of content items.
+	 *
+	 * @param   mixed  $query  A JDatabaseQuery object or null.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery($query = null)
+	{
+		$db = JFactory::getDbo();
+
+		// Check if we can use the supplied SQL query.
+		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
+			->select('a.id, a.title, a.alias, a.introtext AS summary, a.fulltext AS body')
+			->select('a.state, a.catid, a.created AS start_date, a.created_by')
+			->select('a.created_by_alias, a.modified, a.modified_by, a.attribs AS params')
+			->select('a.metakey, a.metadesc, a.metadata, a.language, a.access, a.version, a.ordering')
+			->select('a.publish_up AS publish_start_date, a.publish_down AS publish_end_date')
+			->select('c.title AS category, c.published AS cat_state, c.access AS cat_access');
+
+		// Handle the alias CASE WHEN portion of the query
+		$case_when_item_alias = ' CASE WHEN ';
+		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
+		$case_when_item_alias .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when_item_alias .= ' ELSE ';
+		$case_when_item_alias .= $a_id . ' END as slug';
+		$query->select($case_when_item_alias);
+
+		$case_when_category_alias = ' CASE WHEN ';
+		$case_when_category_alias .= $query->charLength('c.alias', '!=', '0');
+		$case_when_category_alias .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when_category_alias .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when_category_alias .= ' ELSE ';
+		$case_when_category_alias .= $c_id . ' END as catslug';
+		$query->select($case_when_category_alias)
+
+			->select('u.name AS author')
+			->from('#__content AS a')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid')
+			->join('LEFT', '#__users AS u ON u.id = a.created_by');
+
+		return $query;
+	}
+}
diff --git a/core/plugins/finder/content/content.xml b/core/plugins/finder/content/content.xml
new file mode 100644
index 00000000..f64a5bff
--- /dev/null
+++ b/core/plugins/finder/content/content.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="finder" method="upgrade">
+	<name>plg_finder_content</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_FINDER_CONTENT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="content">content.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_content.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_content.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/finder/newsfeeds/newsfeeds.php b/core/plugins/finder/newsfeeds/newsfeeds.php
new file mode 100644
index 00000000..b897dc47
--- /dev/null
+++ b/core/plugins/finder/newsfeeds/newsfeeds.php
@@ -0,0 +1,365 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Finder.Newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
+
+/**
+ * Smart Search adapter for Joomla Newsfeeds.
+ *
+ * @since  2.5
+ */
+class PlgFinderNewsfeeds extends FinderIndexerAdapter
+{
+	/**
+	 * The plugin identifier.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $context = 'Newsfeeds';
+
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $extension = 'com_newsfeeds';
+
+	/**
+	 * The sublayout to use when rendering the results.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $layout = 'newsfeed';
+
+	/**
+	 * The type of content that the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $type_title = 'News Feed';
+
+	/**
+	 * The table name.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $table = '#__newsfeeds';
+
+	/**
+	 * The field the published state is stored in.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $state_field = 'published';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method to update the item link information when the item category is
+	 * changed. This is fired when the item category is published or unpublished
+	 * from the list view.
+	 *
+	 * @param   string   $extension  The extension whose category has been updated.
+	 * @param   array    $pks        An array of primary key ids of the content that has changed state.
+	 * @param   integer  $value      The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderCategoryChangeState($extension, $pks, $value)
+	{
+		// Make sure we're handling com_newsfeeds categories.
+		if ($extension === 'com_newsfeeds')
+		{
+			$this->categoryStateChange($pks, $value);
+		}
+	}
+
+	/**
+	 * Method to remove the link information for items that have been deleted.
+	 *
+	 * @param   string  $context  The context of the action being performed.
+	 * @param   JTable  $table    A JTable object containing the record to be deleted.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterDelete($context, $table)
+	{
+		if ($context === 'com_newsfeeds.newsfeed')
+		{
+			$id = $table->id;
+		}
+		elseif ($context === 'com_finder.index')
+		{
+			$id = $table->link_id;
+		}
+		else
+		{
+			return true;
+		}
+
+		// Remove the item from the index.
+		return $this->remove($id);
+	}
+
+	/**
+	 * Smart Search after save content method.
+	 * Reindexes the link information for a newsfeed that has been saved.
+	 * It also makes adjustments if the access level of a newsfeed item or
+	 * the category to which it belongs has beend changed.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content has just been created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterSave($context, $row, $isNew)
+	{
+		// We only want to handle newsfeeds here.
+		if ($context === 'com_newsfeeds.newsfeed')
+		{
+			// Check if the access levels are different.
+			if (!$isNew && $this->old_access != $row->access)
+			{
+				// Process the change.
+				$this->itemAccessChange($row);
+			}
+
+			// Reindex the item.
+			$this->reindex($row->id);
+		}
+
+		// Check for access changes in the category.
+		if ($context === 'com_categories.category')
+		{
+			// Check if the access levels are different.
+			if (!$isNew && $this->old_cataccess != $row->access)
+			{
+				$this->categoryAccessChange($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content is just about to be created.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderBeforeSave($context, $row, $isNew)
+	{
+		// We only want to handle newsfeeds here.
+		if ($context === 'com_newsfeeds.newsfeed')
+		{
+			// Query the database for the old access level if the item isn't new.
+			if (!$isNew)
+			{
+				$this->checkItemAccess($row);
+			}
+		}
+
+		// Check for access levels from the category.
+		if ($context === 'com_categories.category')
+		{
+			// Query the database for the old access level if the item isn't new.
+			if (!$isNew)
+			{
+				$this->checkCategoryAccess($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to update the link information for items that have been changed
+	 * from outside the edit screen. This is fired when the item is published,
+	 * unpublished, archived, or unarchived from the list view.
+	 *
+	 * @param   string   $context  The context for the content passed to the plugin.
+	 * @param   array    $pks      An array of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onFinderChangeState($context, $pks, $value)
+	{
+		// We only want to handle newsfeeds here.
+		if ($context === 'com_newsfeeds.newsfeed')
+		{
+			$this->itemStateChange($pks, $value);
+		}
+
+		// Handle when the plugin is disabled.
+		if ($context === 'com_plugins.plugin' && $value === 0)
+		{
+			$this->pluginDisable($pks);
+		}
+	}
+
+	/**
+	 * Method to index an item. The item must be a FinderIndexerResult object.
+	 *
+	 * @param   FinderIndexerResult  $item    The item to index as a FinderIndexerResult object.
+	 * @param   string               $format  The item format.  Not used.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 * @throws  Exception on database error.
+	 */
+	protected function index(FinderIndexerResult $item, $format = 'html')
+	{
+		// Check if the extension is enabled.
+		if (JComponentHelper::isEnabled($this->extension) === false)
+		{
+			return;
+		}
+
+		$item->setLanguage();
+
+		// Initialize the item parameters.
+		$item->params = new Registry($item->params);
+
+		$item->metadata = new Registry($item->metadata);
+
+		// Build the necessary route and path information.
+		$item->url = $this->getUrl($item->id, $this->extension, $this->layout);
+		$item->route = NewsfeedsHelperRoute::getNewsfeedRoute($item->slug, $item->catslug, $item->language);
+		$item->path = FinderIndexerHelper::getContentPath($item->route);
+
+		/*
+		 * Add the metadata processing instructions based on the newsfeeds
+		 * configuration parameters.
+		 */
+		// Add the meta author.
+		$item->metaauthor = $item->metadata->get('author');
+
+		// Handle the link to the metadata.
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'link');
+
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metakey');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metadesc');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metaauthor');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'author');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias');
+
+		// Add the type taxonomy data.
+		$item->addTaxonomy('Type', 'News Feed');
+
+		// Add the category taxonomy data.
+		$item->addTaxonomy('Category', $item->category, $item->cat_state, $item->cat_access);
+
+		// Add the language taxonomy data.
+		$item->addTaxonomy('Language', $item->language);
+
+		// Get content extras.
+		FinderIndexerHelper::getContentExtras($item);
+
+		// Index the item.
+		$this->indexer->index($item);
+	}
+
+	/**
+	 * Method to setup the indexer to be run.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   2.5
+	 */
+	protected function setup()
+	{
+		// Load dependent classes.
+		JLoader::register('NewsfeedsHelperRoute', JPATH_SITE . '/components/com_newsfeeds/helpers/route.php');
+
+		return true;
+	}
+
+	/**
+	 * Method to get the SQL query used to retrieve the list of content items.
+	 *
+	 * @param   mixed  $query  A JDatabaseQuery object or null.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   2.5
+	 */
+	protected function getListQuery($query = null)
+	{
+		$db = JFactory::getDbo();
+
+		// Check if we can use the supplied SQL query.
+		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
+			->select('a.id, a.catid, a.name AS title, a.alias, a.link AS link')
+			->select('a.published AS state, a.ordering, a.created AS start_date, a.params, a.access')
+			->select('a.publish_up AS publish_start_date, a.publish_down AS publish_end_date')
+			->select('a.metakey, a.metadesc, a.metadata, a.language')
+			->select('a.created_by, a.created_by_alias, a.modified, a.modified_by')
+			->select('c.title AS category, c.published AS cat_state, c.access AS cat_access');
+
+		// Handle the alias CASE WHEN portion of the query.
+		$case_when_item_alias = ' CASE WHEN ';
+		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
+		$case_when_item_alias .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when_item_alias .= ' ELSE ';
+		$case_when_item_alias .= $a_id . ' END as slug';
+		$query->select($case_when_item_alias);
+
+		$case_when_category_alias = ' CASE WHEN ';
+		$case_when_category_alias .= $query->charLength('c.alias', '!=', '0');
+		$case_when_category_alias .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when_category_alias .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when_category_alias .= ' ELSE ';
+		$case_when_category_alias .= $c_id . ' END as catslug';
+		$query->select($case_when_category_alias)
+
+			->from('#__newsfeeds AS a')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		return $query;
+	}
+}
diff --git a/core/plugins/finder/newsfeeds/newsfeeds.xml b/core/plugins/finder/newsfeeds/newsfeeds.xml
new file mode 100644
index 00000000..b3949955
--- /dev/null
+++ b/core/plugins/finder/newsfeeds/newsfeeds.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="finder" method="upgrade">
+	<name>plg_finder_newsfeeds</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_FINDER_NEWSFEEDS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="newsfeeds">newsfeeds.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_newsfeeds.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/finder/tags/tags.php b/core/plugins/finder/tags/tags.php
new file mode 100644
index 00000000..ab17a440
--- /dev/null
+++ b/core/plugins/finder/tags/tags.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Finder.Tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+JLoader::register('FinderIndexerAdapter', JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php');
+
+/**
+ * Finder adapter for Joomla Tag.
+ *
+ * @since  3.1
+ */
+class PlgFinderTags extends FinderIndexerAdapter
+{
+	/**
+	 * The plugin identifier.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $context = 'Tags';
+
+	/**
+	 * The extension name.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $extension = 'com_tags';
+
+	/**
+	 * The sublayout to use when rendering the results.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $layout = 'tag';
+
+	/**
+	 * The type of content that the adapter indexes.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $type_title = 'Tag';
+
+	/**
+	 * The table name.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $table = '#__tags';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * The field the published state is stored in.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	protected $state_field = 'published';
+
+	/**
+	 * Method to remove the link information for items that have been deleted.
+	 *
+	 * @param   string  $context  The context of the action being performed.
+	 * @param   JTable  $table    A JTable object containing the record to be deleted
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterDelete($context, $table)
+	{
+		if ($context === 'com_tags.tag')
+		{
+			$id = $table->id;
+		}
+		elseif ($context === 'com_finder.index')
+		{
+			$id = $table->link_id;
+		}
+		else
+		{
+			return true;
+		}
+
+		// Remove the items.
+		return $this->remove($id);
+	}
+
+	/**
+	 * Method to determine if the access level of an item changed.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object
+	 * @param   boolean  $isNew    If the content has just been created
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderAfterSave($context, $row, $isNew)
+	{
+		// We only want to handle tags here.
+		if ($context === 'com_tags.tag')
+		{
+			// Check if the access levels are different
+			if (!$isNew && $this->old_access != $row->access)
+			{
+				// Process the change.
+				$this->itemAccessChange($row);
+			}
+
+			// Reindex the item
+			$this->reindex($row->id);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to reindex the link information for an item that has been saved.
+	 * This event is fired before the data is actually saved so we are going
+	 * to queue the item to be indexed later.
+	 *
+	 * @param   string   $context  The context of the content passed to the plugin.
+	 * @param   JTable   $row      A JTable object
+	 * @param   boolean  $isNew    If the content is just about to be created
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	public function onFinderBeforeSave($context, $row, $isNew)
+	{
+		// We only want to handle news feeds here
+		if ($context === 'com_tags.tag')
+		{
+			// Query the database for the old access level if the item isn't new
+			if (!$isNew)
+			{
+				$this->checkItemAccess($row);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to update the link information for items that have been changed
+	 * from outside the edit screen. This is fired when the item is published,
+	 * unpublished, archived, or unarchived from the list view.
+	 *
+	 * @param   string   $context  The context for the content passed to the plugin.
+	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function onFinderChangeState($context, $pks, $value)
+	{
+		// We only want to handle tags here
+		if ($context === 'com_tags.tag')
+		{
+			$this->itemStateChange($pks, $value);
+		}
+
+		// Handle when the plugin is disabled
+		if ($context === 'com_plugins.plugin' && $value === 0)
+		{
+			$this->pluginDisable($pks);
+		}
+	}
+
+	/**
+	 * Method to index an item. The item must be a FinderIndexerResult object.
+	 *
+	 * @param   FinderIndexerResult  $item    The item to index as a FinderIndexerResult object.
+	 * @param   string               $format  The item format
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 * @throws  Exception on database error.
+	 */
+	protected function index(FinderIndexerResult $item, $format = 'html')
+	{
+		// Check if the extension is enabled
+		if (JComponentHelper::isEnabled($this->extension) === false)
+		{
+			return;
+		}
+
+		$item->setLanguage();
+
+		// Initialize the item parameters.
+		$registry = new Registry($item->params);
+		$item->params = JComponentHelper::getParams('com_tags', true);
+		$item->params->merge($registry);
+
+		$item->metadata = new Registry($item->metadata);
+
+		// Build the necessary route and path information.
+		$item->url = $this->getUrl($item->id, $this->extension, $this->layout);
+		$item->route = TagsHelperRoute::getTagRoute($item->slug);
+		$item->path = FinderIndexerHelper::getContentPath($item->route);
+
+		// Get the menu title if it exists.
+		$title = $this->getItemMenuTitle($item->url);
+
+		// Adjust the title if necessary.
+		if (!empty($title) && $this->params->get('use_menu_title', true))
+		{
+			$item->title = $title;
+		}
+
+		// Add the meta author.
+		$item->metaauthor = $item->metadata->get('author');
+
+		// Handle the link to the metadata.
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'link');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metakey');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metadesc');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metaauthor');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'author');
+		$item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias');
+
+		// Add the type taxonomy data.
+		$item->addTaxonomy('Type', 'Tag');
+
+		// Add the author taxonomy data.
+		if (!empty($item->author) || !empty($item->created_by_alias))
+		{
+			$item->addTaxonomy('Author', !empty($item->created_by_alias) ? $item->created_by_alias : $item->author);
+		}
+
+		// Add the language taxonomy data.
+		$item->addTaxonomy('Language', $item->language);
+
+		// Get content extras.
+		FinderIndexerHelper::getContentExtras($item);
+
+		// Index the item.
+		$this->indexer->index($item);
+	}
+
+	/**
+	 * Method to setup the indexer to be run.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.1
+	 */
+	protected function setup()
+	{
+		// Load dependent classes.
+		JLoader::register('TagsHelperRoute', JPATH_SITE . '/components/com_tags/helpers/route.php');
+
+		return true;
+	}
+
+	/**
+	 * Method to get the SQL query used to retrieve the list of content items.
+	 *
+	 * @param   mixed  $query  A JDatabaseQuery object or null.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   3.1
+	 */
+	protected function getListQuery($query = null)
+	{
+		$db = JFactory::getDbo();
+
+		// Check if we can use the supplied SQL query.
+		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
+			->select('a.id, a.title, a.alias, a.description AS summary')
+			->select('a.created_time AS start_date, a.created_user_id AS created_by')
+			->select('a.metakey, a.metadesc, a.metadata, a.language, a.access')
+			->select('a.modified_time AS modified, a.modified_user_id AS modified_by')
+			->select('a.published AS state, a.access, a.created_time AS start_date, a.params');
+
+		// Handle the alias CASE WHEN portion of the query
+		$case_when_item_alias = ' CASE WHEN ';
+		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
+		$case_when_item_alias .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when_item_alias .= ' ELSE ';
+		$case_when_item_alias .= $a_id . ' END as slug';
+		$query->select($case_when_item_alias)
+			->from('#__tags AS a');
+
+		// Join the #__users table
+		$query->select('u.name AS author')
+			->join('LEFT', '#__users AS u ON u.id = a.created_user_id');
+
+		// Exclude the ROOT item
+		$query->where($db->quoteName('a.id') . ' > 1');
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a SQL query to load the published and access states for the given tag.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   3.1
+	 */
+	protected function getStateQuery()
+	{
+		$query = $this->db->getQuery(true);
+		$query->select($this->db->quoteName('a.id'))
+			->select($this->db->quoteName('a.' . $this->state_field, 'state') . ', ' . $this->db->quoteName('a.access'))
+			->select('NULL AS cat_state, NULL AS cat_access')
+			->from($this->db->quoteName($this->table, 'a'));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the query clause for getting items to update by time.
+	 *
+	 * @param   string  $time  The modified timestamp.
+	 *
+	 * @return  JDatabaseQuery  A database object.
+	 *
+	 * @since   3.1
+	 */
+	protected function getUpdateQueryByTime($time)
+	{
+		// Build an SQL query based on the modified time.
+		$query = $this->db->getQuery(true)
+			->where('a.date >= ' . $this->db->quote($time));
+
+		return $query;
+	}
+}
diff --git a/core/plugins/finder/tags/tags.xml b/core/plugins/finder/tags/tags.xml
new file mode 100644
index 00000000..f60c2732
--- /dev/null
+++ b/core/plugins/finder/tags/tags.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="3.1" type="plugin" group="finder" method="upgrade">
+	<name>plg_finder_tags</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2013</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_FINDER_TAGS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="tags">tags.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_tags.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_finder_tags.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/index.html b/core/plugins/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/plugins/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/plugins/installer/folderinstaller/folderinstaller.php b/core/plugins/installer/folderinstaller/folderinstaller.php
new file mode 100644
index 00000000..a16e2c35
--- /dev/null
+++ b/core/plugins/installer/folderinstaller/folderinstaller.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Installer.folderInstaller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * FolderInstaller Plugin.
+ *
+ * @since  3.6.0
+ */
+class PlgInstallerFolderInstaller extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.6.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Textfield or Form of the Plugin.
+	 *
+	 * @return  array  Returns an array with the tab information
+	 *
+	 * @since   3.6.0
+	 */
+	public function onInstallerAddInstallationTab()
+	{
+		$tab            = array();
+		$tab['name']    = 'folder';
+		$tab['label']   = JText::_('PLG_INSTALLER_FOLDERINSTALLER_TEXT');
+
+		// Render the input
+		ob_start();
+		include JPluginHelper::getLayoutPath('installer', 'folderinstaller');
+		$tab['content'] = ob_get_clean();
+
+		return $tab;
+	}
+}
diff --git a/core/plugins/installer/folderinstaller/folderinstaller.xml b/core/plugins/installer/folderinstaller/folderinstaller.xml
new file mode 100644
index 00000000..a9c062a4
--- /dev/null
+++ b/core/plugins/installer/folderinstaller/folderinstaller.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.6" type="plugin" group="installer">
+	<name>PLG_INSTALLER_FOLDERINSTALLER</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.6.0</version>
+	<description>PLG_INSTALLER_FOLDERINSTALLER_PLUGIN_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="folderinstaller">folderinstaller.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">en-GB.plg_installer_folderinstaller.ini</language>
+		<language tag="en-GB">en-GB.plg_installer_folderinstaller.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/installer/folderinstaller/tmpl/default.php b/core/plugins/installer/folderinstaller/tmpl/default.php
new file mode 100644
index 00000000..cca5a88d
--- /dev/null
+++ b/core/plugins/installer/folderinstaller/tmpl/default.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Installer.folderinstaller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$app = JFactory::getApplication('administrator');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbuttonfolder = function()
+	{
+		var form = document.getElementById("adminForm");
+
+		// do field validation 
+		if (form.install_directory.value == "")
+		{
+			alert("' . JText::_('PLG_INSTALLER_FOLDERINSTALLER_NO_INSTALL_PATH', true) . '");
+		}
+		else
+		{
+			JoomlaInstaller.showLoading();
+			form.installtype.value = "folder"
+			form.submit();
+		}
+	};
+');
+?>
+<legend><?php echo JText::_('PLG_INSTALLER_FOLDERINSTALLER_TEXT'); ?></legend>
+<div class="control-group">
+	<label for="install_directory" class="control-label"><?php echo JText::_('PLG_INSTALLER_FOLDERINSTALLER_TEXT'); ?></label>
+	<div class="controls">
+		<input type="text" id="install_directory" name="install_directory" class="span5 input_box" size="70"
+			value="<?php echo $app->input->get('install_directory', $app->get('tmp_path')); ?>" />
+	</div>
+</div>
+<div class="form-actions">
+	<input type="button" class="btn btn-primary" id="installbutton_directory"
+		value="<?php echo JText::_('PLG_INSTALLER_FOLDERINSTALLER_BUTTON'); ?>" onclick="Joomla.submitbuttonfolder()" />
+</div>
diff --git a/core/plugins/installer/packageinstaller/packageinstaller.php b/core/plugins/installer/packageinstaller/packageinstaller.php
new file mode 100644
index 00000000..67da528f
--- /dev/null
+++ b/core/plugins/installer/packageinstaller/packageinstaller.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Installer.packageInstaller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * PackageInstaller Plugin.
+ *
+ * @since  3.6.0
+ */
+class PlgInstallerPackageInstaller extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.6.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Textfield or Form of the Plugin.
+	 *
+	 * @return  array  Returns an array with the tab information
+	 *
+	 * @since   3.6.0
+	 */
+	public function onInstallerAddInstallationTab()
+	{
+		$tab            = array();
+		$tab['name']    = 'package';
+		$tab['label']   = JText::_('PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_PACKAGE_FILE');
+
+		// Render the input
+		ob_start();
+		include JPluginHelper::getLayoutPath('installer', 'packageinstaller');
+		$tab['content'] = ob_get_clean();
+
+		return $tab;
+	}
+}
diff --git a/core/plugins/installer/packageinstaller/packageinstaller.xml b/core/plugins/installer/packageinstaller/packageinstaller.xml
new file mode 100644
index 00000000..112a7128
--- /dev/null
+++ b/core/plugins/installer/packageinstaller/packageinstaller.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.6" type="plugin" group="installer">
+	<name>plg_installer_packageinstaller</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.6.0</version>
+	<description>PLG_INSTALLER_PACKAGEINSTALLER_PLUGIN_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="packageinstaller">packageinstaller.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">en-GB.plg_installer_packageinstaller.ini</language>
+		<language tag="en-GB">en-GB.plg_installer_packageinstaller.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/installer/packageinstaller/tmpl/default.php b/core/plugins/installer/packageinstaller/tmpl/default.php
new file mode 100644
index 00000000..d9046c2f
--- /dev/null
+++ b/core/plugins/installer/packageinstaller/tmpl/default.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Installer.packageinstaller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbuttonpackage = function()
+	{
+		var form = document.getElementById("adminForm");
+
+		// do field validation 
+		if (form.install_package.value == "")
+		{
+			alert("' . JText::_('PLG_INSTALLER_PACKAGEINSTALLER_NO_PACKAGE', true) . '");
+		}
+		else
+		{
+			JoomlaInstaller.showLoading();
+			form.installtype.value = "upload"
+			form.submit();
+		}
+	};
+');
+
+// Drag and Drop installation scripts
+$token = JSession::getFormToken();
+$return = JFactory::getApplication()->input->getBase64('return');
+
+// Drag-drop installation
+JFactory::getDocument()->addScriptDeclaration(
+<<<JS
+	jQuery(document).ready(function($) {
+		
+		if (typeof FormData === 'undefined') {
+			$('#legacy-uploader').show();
+			$('#uploader-wrapper').hide();
+			return;
+		}
+
+		var dragZone  = $('#dragarea');
+		var fileInput = $('#install_package');
+		var button    = $('#select-file-button');
+		var url       = 'index.php?option=com_installer&task=install.ajax_upload';
+		var returnUrl = $('#installer-return').val();
+		var token     = $('#installer-token').val();
+
+		if (returnUrl) {
+			url += '&return=' + returnUrl;
+		}
+		
+		button.on('click', function(e) {
+			fileInput.click();
+		});
+		
+		fileInput.on('change', function (e) {
+			Joomla.submitbuttonpackage();
+		});
+
+		dragZone.on('dragenter', function(e) {
+			e.preventDefault();
+			e.stopPropagation();
+			
+			dragZone.addClass('hover');
+			
+			return false;
+		});
+
+		// Notify user when file is over the drop area
+		dragZone.on('dragover', function(e) {
+			e.preventDefault();
+			e.stopPropagation();
+
+			dragZone.addClass('hover');
+
+			return false;
+		});
+
+		dragZone.on('dragleave', function(e) {
+			e.preventDefault();
+			e.stopPropagation();
+			dragZone.removeClass('hover');
+
+			return false;
+		});
+
+		dragZone.on('drop', function(e) {
+			e.preventDefault();
+			e.stopPropagation();
+
+			dragZone.removeClass('hover');
+
+			var files = e.originalEvent.target.files || e.originalEvent.dataTransfer.files;
+
+			if (!files.length) {
+				return;
+			}
+
+			var file = files[0];
+
+			var data = new FormData;
+			data.append('install_package', file);
+			data.append('installtype', 'upload');
+			data.append(token, 1);
+
+			JoomlaInstaller.showLoading();
+			
+			$.ajax({
+				url: url,
+				data: data,
+				type: 'post',
+				processData: false,
+				cache: false,
+				contentType: false
+			}).done(function (res) {
+				if (!res.success) {
+					console.log(res.message, res.messages);
+				}
+
+				// Always redirect that can show message queue from session 
+				if (res.data.redirect) {
+					location.href = res.data.redirect;
+				} else {
+					location.href = 'index.php?option=com_installer&view=install';
+				}
+			}).error (function (error) {
+				JoomlaInstaller.hideLoading();
+				alert(error.statusText);
+			});
+		});
+	});
+JS
+);
+
+JFactory::getDocument()->addStyleDeclaration(
+<<<CSS
+	#dragarea {
+		background-color: #fafbfc;
+		border: 1px dashed #999;
+		box-sizing: border-box;
+		padding: 5% 0;
+		transition: all 0.2s ease 0s;
+		width: 100%;
+	}
+	
+	#dragarea p.lead {
+		color: #999;
+	}
+
+	#upload-icon {
+		font-size: 48px;
+		width: auto;
+		height: auto;
+		margin: 0;
+		line-height: 175%;
+		color: #999;
+		transition: all .2s;
+	}
+	
+	#dragarea.hover {
+		border-color: #666;
+		background-color: #eee;
+	}
+	
+	#dragarea.hover #upload-icon,
+	#dragarea p.lead {
+		color: #666;
+	}
+CSS
+);
+
+$maxSize = JFilesystemHelper::fileUploadMaxSize();
+?>
+<legend><?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION'); ?></legend>
+
+<div id="uploader-wrapper">
+	<div id="dragarea" class="">
+		<div id="dragarea-content" class="text-center">
+			<p>
+				<span id="upload-icon" class="icon-upload" aria-hidden="true"></span>
+			</p>
+			<p class="lead">
+				<?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_DRAG_FILE_HERE'); ?>
+			</p>
+			<p>
+				<button id="select-file-button" type="button" class="btn btn-success">
+					<span class="icon-copy" aria-hidden="true"></span>
+					<?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_SELECT_FILE'); ?>
+				</button>
+			</p>
+			<p>
+				<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
+			</p>
+		</div>
+
+	</div>
+</div>
+
+<div id="legacy-uploader" style="display: none;">
+	<div class="control-group">
+		<label for="install_package" class="control-label"><?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_EXTENSION_PACKAGE_FILE'); ?></label>
+		<div class="controls">
+			<input class="input_box" id="install_package" name="install_package" type="file" size="57" /><br>
+			<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
+		</div>
+	</div>
+	<div class="form-actions">
+		<button class="btn btn-primary" type="button" id="installbutton_package" onclick="Joomla.submitbuttonpackage()">
+			<?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_UPLOAD_AND_INSTALL'); ?>
+		</button>
+	</div>
+
+	<input id="installer-return" name="return" type="hidden" value="<?php echo $return; ?>" />
+	<input id="installer-token" name="return" type="hidden" value="<?php echo $token; ?>" />
+</div>
diff --git a/core/plugins/installer/urlinstaller/tmpl/default.php b/core/plugins/installer/urlinstaller/tmpl/default.php
new file mode 100644
index 00000000..ba216705
--- /dev/null
+++ b/core/plugins/installer/urlinstaller/tmpl/default.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Installer.urlinstaller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbuttonurl = function()
+	{
+		var form = document.getElementById("adminForm");
+
+		// do field validation 
+		if (form.install_url.value == "" || form.install_url.value == "http://" || form.install_url.value == "https://") {
+			alert("' . JText::_('PLG_INSTALLER_URLINSTALLER_NO_URL', true) . '");
+		}
+		else
+		{
+			JoomlaInstaller.showLoading();
+			form.installtype.value = "url"
+			form.submit();
+		}
+	};
+');
+?>
+<legend><?php echo JText::_('PLG_INSTALLER_URLINSTALLER_TEXT'); ?></legend>
+<div class="control-group">
+	<label for="install_url" class="control-label"><?php echo JText::_('PLG_INSTALLER_URLINSTALLER_TEXT'); ?></label>
+	<div class="controls">
+		<input type="text" id="install_url" name="install_url" class="span5 input_box" size="70" placeholder="https://"/>
+	</div>
+</div>
+<div class="form-actions">
+	<input type="button" class="btn btn-primary" id="installbutton_url"
+		value="<?php echo JText::_('PLG_INSTALLER_URLINSTALLER_BUTTON'); ?>" onclick="Joomla.submitbuttonurl()" />
+</div>
diff --git a/core/plugins/installer/urlinstaller/urlinstaller.php b/core/plugins/installer/urlinstaller/urlinstaller.php
new file mode 100644
index 00000000..4d25bdb4
--- /dev/null
+++ b/core/plugins/installer/urlinstaller/urlinstaller.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Installer.urlinstaller
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * UrlFolderInstaller Plugin.
+ *
+ * @since  3.6.0
+ */
+class PlgInstallerUrlInstaller extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.6.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Textfield or Form of the Plugin.
+	 *
+	 * @return  array  Returns an array with the tab information
+	 *
+	 * @since   3.6.0
+	 */
+	public function onInstallerAddInstallationTab()
+	{
+		$tab            = array();
+		$tab['name']    = 'url';
+		$tab['label']   = JText::_('PLG_INSTALLER_URLINSTALLER_TEXT');
+
+		// Render the input
+		ob_start();
+		include JPluginHelper::getLayoutPath('installer', 'urlinstaller');
+		$tab['content'] = ob_get_clean();
+
+		return $tab;
+	}
+}
diff --git a/core/plugins/installer/urlinstaller/urlinstaller.xml b/core/plugins/installer/urlinstaller/urlinstaller.xml
new file mode 100644
index 00000000..03618b6c
--- /dev/null
+++ b/core/plugins/installer/urlinstaller/urlinstaller.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.6" type="plugin" group="installer">
+	<name>PLG_INSTALLER_URLINSTALLER</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.6.0</version>
+	<description>PLG_INSTALLER_URLINSTALLER_PLUGIN_XML_DESCRIPTION</description>
+
+	<files>
+		<filename plugin="urlinstaller">urlinstaller.php</filename>
+	</files>
+
+	<languages>
+		<language tag="en-GB">en-GB.plg_installer_urlinstaller.ini</language>
+		<language tag="en-GB">en-GB.plg_installer_urlinstaller.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/quickicon/extensionupdate/extensionupdate.php b/core/plugins/quickicon/extensionupdate/extensionupdate.php
new file mode 100644
index 00000000..dad583c1
--- /dev/null
+++ b/core/plugins/quickicon/extensionupdate/extensionupdate.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.Extensionupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! update notification plugin
+ *
+ * @since  2.5
+ */
+class PlgQuickiconExtensionupdate extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Returns an icon definition for an icon which looks for extensions updates
+	 * via AJAX and displays a notification when such updates are found.
+	 *
+	 * @param   string  $context  The calling context
+	 *
+	 * @return  array  A list of icon definition associative arrays, consisting of the
+	 *                 keys link, image, text and access.
+	 *
+	 * @since   2.5
+	 */
+	public function onGetIcons($context)
+	{
+		if ($context !== $this->params->get('context', 'mod_quickicon') || !JFactory::getUser()->authorise('core.manage', 'com_installer'))
+		{
+			return;
+		}
+
+		JHtml::_('jquery.framework');
+
+		$token    = JSession::getFormToken() . '=' . 1;
+		$url      = JUri::base() . 'index.php?option=com_installer&view=update&task=update.find&' . $token;
+		$ajax_url = JUri::base() . 'index.php?option=com_installer&view=update&task=update.ajax&' . $token;
+		$script   = array();
+		$script[] = 'var plg_quickicon_extensionupdate_url = \'' . $url . '\';';
+		$script[] = 'var plg_quickicon_extensionupdate_ajax_url = \'' . $ajax_url . '\';';
+		$script[] = 'var plg_quickicon_extensionupdate_text = {'
+			. '"UPTODATE" : "' . JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE', true) . '",'
+			. '"UPDATEFOUND": "' . JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND', true) . '",'
+			. '"UPDATEFOUND_MESSAGE": "' . JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE', true) . '",'
+			. '"UPDATEFOUND_BUTTON": "' . JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON', true) . '",'
+			. '"ERROR": "' . JText::_('PLG_QUICKICON_EXTENSIONUPDATE_ERROR', true) . '",'
+			. '};';
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+		JHtml::_('script', 'plg_quickicon_extensionupdate/extensionupdatecheck.js', array('version' => 'auto', 'relative' => true));
+
+		return array(
+			array(
+				'link'  => 'index.php?option=com_installer&view=update&task=update.find&' . $token,
+				'image' => 'asterisk',
+				'icon'  => 'header/icon-48-extension.png',
+				'text'  => JText::_('PLG_QUICKICON_EXTENSIONUPDATE_CHECKING'),
+				'id'    => 'plg_quickicon_extensionupdate',
+				'group' => 'MOD_QUICKICON_MAINTENANCE'
+			)
+		);
+	}
+}
diff --git a/core/plugins/quickicon/extensionupdate/extensionupdate.xml b/core/plugins/quickicon/extensionupdate/extensionupdate.xml
new file mode 100644
index 00000000..357e364e
--- /dev/null
+++ b/core/plugins/quickicon/extensionupdate/extensionupdate.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="quickicon" method="upgrade">
+	<name>plg_quickicon_extensionupdate</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="extensionupdate">extensionupdate.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_quickicon_extensionupdate.ini</language>
+		<language tag="en-GB">en-GB.plg_quickicon_extensionupdate.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field 
+					name="context"
+					type="text"
+					label="PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL"
+					description="PLG_QUICKICON_EXTENSIONUPDATE_GROUP_DESC"
+					default="mod_quickicon"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/quickicon/joomlaupdate/joomlaupdate.php b/core/plugins/quickicon/joomlaupdate/joomlaupdate.php
new file mode 100644
index 00000000..31b00041
--- /dev/null
+++ b/core/plugins/quickicon/joomlaupdate/joomlaupdate.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.Joomlaupdate
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! update notification plugin
+ *
+ * @since  2.5
+ */
+class PlgQuickiconJoomlaupdate extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * This method is called when the Quick Icons module is constructing its set
+	 * of icons. You can return an array which defines a single icon and it will
+	 * be rendered right after the stock Quick Icons.
+	 *
+	 * @param   string  $context  The calling context
+	 *
+	 * @return  array  A list of icon definition associative arrays, consisting of the
+	 *                 keys link, image, text and access.
+	 *
+	 * @since   2.5
+	 */
+	public function onGetIcons($context)
+	{
+		if ($context !== $this->params->get('context', 'mod_quickicon') || !JFactory::getUser()->authorise('core.manage', 'com_installer'))
+		{
+			return;
+		}
+
+		JHtml::_('jquery.framework');
+
+		$cur_template = JFactory::getApplication()->getTemplate();
+
+		$token    = JSession::getFormToken() . '=' . 1;
+		$url = JUri::base() . 'index.php?option=com_joomlaupdate';
+		$ajax_url = JUri::base() . 'index.php?option=com_installer&view=update&task=update.ajax&' . $token;
+		$script = array();
+		$script[] = 'var plg_quickicon_joomlaupdate_url = \'' . $url . '\';';
+		$script[] = 'var plg_quickicon_joomlaupdate_ajax_url = \'' . $ajax_url . '\';';
+		$script[] = 'var plg_quickicon_jupdatecheck_jversion = \'' . JVERSION . '\'';
+		$script[] = 'var plg_quickicon_joomlaupdate_text = {'
+			. '"UPTODATE" : "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE', true) . '",'
+			. '"UPDATEFOUND": "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND', true) . '",'
+			. '"UPDATEFOUND_MESSAGE": "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE', true) . '",'
+			. '"UPDATEFOUND_BUTTON": "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON', true) . '",'
+			. '"ERROR": "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_ERROR', true) . '",'
+			. '};';
+		$script[] = 'var plg_quickicon_joomlaupdate_img = {'
+			. '"UPTODATE" : "' . JUri::base(true) . '/templates/' . $cur_template . '/images/header/icon-48-jupdate-uptodate.png",'
+			. '"UPDATEFOUND": "' . JUri::base(true) . '/templates/' . $cur_template . '/images/header/icon-48-jupdate-updatefound.png",'
+			. '"ERROR": "' . JUri::base(true) . '/templates/' . $cur_template . '/images/header/icon-48-deny.png",'
+			. '};';
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+		JHtml::_('script', 'plg_quickicon_joomlaupdate/jupdatecheck.js', array('version' => 'auto', 'relative' => true));
+
+		return array(
+			array(
+				'link' => 'index.php?option=com_joomlaupdate',
+				'image' => 'joomla',
+				'icon' => 'header/icon-48-download.png',
+				'text' => JText::_('PLG_QUICKICON_JOOMLAUPDATE_CHECKING'),
+				'id' => 'plg_quickicon_joomlaupdate',
+				'group' => 'MOD_QUICKICON_MAINTENANCE'
+			)
+		);
+	}
+}
diff --git a/core/plugins/quickicon/joomlaupdate/joomlaupdate.xml b/core/plugins/quickicon/joomlaupdate/joomlaupdate.xml
new file mode 100644
index 00000000..3796508b
--- /dev/null
+++ b/core/plugins/quickicon/joomlaupdate/joomlaupdate.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="quickicon" method="upgrade">
+	<name>plg_quickicon_joomlaupdate</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="joomlaupdate">joomlaupdate.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_quickicon_joomlaupdate.ini</language>
+		<language tag="en-GB">en-GB.plg_quickicon_joomlaupdate.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="context"
+					type="text"
+					label="PLG_QUICKICON_JOOMLAUPDATE_GROUP_LABEL"
+					description="PLG_QUICKICON_JOOMLAUPDATE_GROUP_DESC"
+					default="mod_quickicon"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/quickicon/phpversioncheck/phpversioncheck.php b/core/plugins/quickicon/phpversioncheck/phpversioncheck.php
new file mode 100644
index 00000000..aed6f7e5
--- /dev/null
+++ b/core/plugins/quickicon/phpversioncheck/phpversioncheck.php
@@ -0,0 +1,239 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.phpversioncheck
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugin to check the PHP version and display a warning about its support status
+ *
+ * @since  3.7.0
+ */
+class PlgQuickiconPhpVersionCheck extends JPlugin
+{
+	/**
+	 * Constant representing the active PHP version being fully supported
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	const PHP_SUPPORTED = 0;
+
+	/**
+	 * Constant representing the active PHP version receiving security support only
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	const PHP_SECURITY_ONLY = 1;
+
+	/**
+	 * Constant representing the active PHP version being unsupported
+	 *
+	 * @var    integer
+	 * @since  3.7.0
+	 */
+	const PHP_UNSUPPORTED = 2;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.7.0
+	 */
+	protected $app;
+
+	/**
+	 * Load plugin language files automatically
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Check the PHP version after the admin component has been dispatched.
+	 *
+	 * @param   string  $context  The calling context
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function onGetIcons($context)
+	{
+		if (!$this->shouldDisplayMessage())
+		{
+			return;
+		}
+
+		$supportStatus = $this->getPhpSupport();
+
+		if ($supportStatus['status'] !== self::PHP_SUPPORTED)
+		{
+			// Enqueue the notification message; set a warning if receiving security support or "error" if unsupported
+			switch ($supportStatus['status'])
+			{
+				case self::PHP_SECURITY_ONLY:
+					$this->app->enqueueMessage($supportStatus['message'], 'warning');
+
+					break;
+
+				case self::PHP_UNSUPPORTED:
+					$this->app->enqueueMessage($supportStatus['message'], 'error');
+
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Gets PHP support status.
+	 *
+	 * @return  array  Array of PHP support data
+	 *
+	 * @since   3.7.0
+	 * @note    The dates used in this method should correspond to the dates given on PHP.net
+	 * @link    https://secure.php.net/supported-versions.php
+	 * @link    https://secure.php.net/eol.php
+	 */
+	private function getPhpSupport()
+	{
+		$phpSupportData = array(
+			'5.3' => array(
+				'security' => '2013-07-11',
+				'eos'      => '2014-08-14',
+			),
+			'5.4' => array(
+				'security' => '2014-09-14',
+				'eos'      => '2015-09-14',
+			),
+			'5.5' => array(
+				'security' => '2015-07-10',
+				'eos'      => '2016-07-21'
+			),
+			'5.6' => array(
+				'security' => '2017-01-19',
+				'eos'      => '2018-12-31'
+			),
+			'7.0' => array(
+				'security' => '2017-12-03',
+				'eos'      => '2018-12-03'
+			),
+			'7.1' => array(
+				'security' => '2018-12-01',
+				'eos'      => '2019-12-01'
+			),
+			'7.2' => array(
+				'security' => '2019-11-30',
+				'eos'      => '2020-11-30'
+			),
+		);
+
+		// Fill our return array with default values
+		$supportStatus = array(
+			'status'  => self::PHP_SUPPORTED,
+			'message' => null,
+		);
+
+		// Check the PHP version's support status using the minor version
+		$activePhpVersion = PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION;
+
+		// Do we have the PHP version's data?
+		if (isset($phpSupportData[$activePhpVersion]))
+		{
+			// First check if the version has reached end of support
+			$today           = new JDate;
+			$phpEndOfSupport = new JDate($phpSupportData[$activePhpVersion]['eos']);
+
+			if ($phpNotSupported = $today > $phpEndOfSupport)
+			{
+				/*
+				 * Find the oldest PHP version still supported that is newer than the current version,
+				 * this is our recommendation for users on unsupported platforms
+				 */
+				foreach ($phpSupportData as $version => $versionData)
+				{
+					$versionEndOfSupport = new JDate($versionData['eos']);
+
+					if (version_compare($version, $activePhpVersion, 'ge') && ($today < $versionEndOfSupport))
+					{
+						$recommendedVersion             = $version;
+						$recommendedVersionEndOfSupport = $versionEndOfSupport;
+
+						break;
+					}
+				}
+
+				$supportStatus['status']  = self::PHP_UNSUPPORTED;
+				$supportStatus['message'] = JText::sprintf(
+					'PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED',
+					PHP_VERSION,
+					$recommendedVersion,
+					$recommendedVersionEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+				);
+			}
+
+			// If the version is still supported, check if it has reached eol minus 3 month
+			$interval = new DateInterval('P3M');
+			$phpEndOfSupport->sub($interval);
+
+			if (!$phpNotSupported && $today > $phpEndOfSupport)
+			{
+				$supportStatus['status']  = self::PHP_SECURITY_ONLY;
+				$supportStatus['message'] = JText::sprintf(
+					'PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY', PHP_VERSION, $phpEndOfSupport->format(JText::_('DATE_FORMAT_LC4'))
+				);
+			}
+		}
+
+		return $supportStatus;
+	}
+
+	/**
+	 * Determines if the message should be displayed
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	private function shouldDisplayMessage()
+	{
+		// Only on admin app
+		if (!$this->app->isClient('administrator'))
+		{
+			return false;
+		}
+
+		// Only if authenticated
+		if (JFactory::getUser()->guest)
+		{
+			return false;
+		}
+
+		// Only on HTML documents
+		if ($this->app->getDocument()->getType() !== 'html')
+		{
+			return false;
+		}
+
+		// Only on full page requests
+		if ($this->app->input->getCmd('tmpl', 'index') === 'component')
+		{
+			return false;
+		}
+
+		// Only to com_cpanel
+		if ($this->app->input->get('option') !== 'com_cpanel')
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/quickicon/phpversioncheck/phpversioncheck.xml b/core/plugins/quickicon/phpversioncheck/phpversioncheck.xml
new file mode 100644
index 00000000..7131843e
--- /dev/null
+++ b/core/plugins/quickicon/phpversioncheck/phpversioncheck.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.7" type="plugin" group="quickicon" method="upgrade">
+	<name>plg_quickicon_phpversioncheck</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_QUICKICON_PHPVERSIONCHECK_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="phpversioncheck">phpversioncheck.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_quickicon_phpversioncheck.ini</language>
+		<language tag="en-GB">en-GB.plg_quickicon_phpversioncheck.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/sampledata/blog/blog.php b/core/plugins/sampledata/blog/blog.php
new file mode 100644
index 00000000..0be0f8e5
--- /dev/null
+++ b/core/plugins/sampledata/blog/blog.php
@@ -0,0 +1,1068 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Sampledata.Blog
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Multilanguage;
+
+/**
+ * Sampledata - Blog Plugin
+ *
+ * @since  3.8.0
+ */
+class PlgSampledataBlog extends JPlugin
+{
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 *
+	 * @since  3.8.0
+	 */
+	protected $db;
+
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 *
+	 * @since  3.8.0
+	 */
+	protected $app;
+
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 *
+	 * @since  3.8.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Holds the menuitem model
+	 *
+	 * @var    MenusModelItem
+	 *
+	 * @since  3.8.0
+	 */
+	private $menuItemModel;
+
+	/**
+	 * Get an overview of the proposed sampledata.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since  3.8.0
+	 */
+	public function onSampledataGetOverview()
+	{
+		$data              = new stdClass;
+		$data->name        = $this->_name;
+		$data->title       = JText::_('PLG_SAMPLEDATA_BLOG_OVERVIEW_TITLE');
+		$data->description = JText::_('PLG_SAMPLEDATA_BLOG_OVERVIEW_DESC');
+		$data->icon        = 'broadcast';
+		$data->steps       = 3;
+
+		return $data;
+	}
+
+	/**
+	 * First step to enter the sampledata. Content.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  3.8.0
+	 */
+	public function onAjaxSampledataApplyStep1()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		};
+
+		if (!JComponentHelper::isEnabled('com_content'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_SKIPPED', 1, 'com_content');
+
+			return $response;
+		}
+
+		// Get some metadata.
+		$access = (int) $this->app->get('access', 1);
+		$user   = JFactory::getUser();
+
+		// Detect language to be used.
+		$language   = Multilanguage::isEnabled() ? JFactory::getLanguage()->getTag() : '*';
+		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/models/', 'ContentModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_content/tables/');
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models/', 'CategoriesModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables/');
+
+		// Create "blog" category.
+		$categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel');
+		$catIds        = array();
+		$categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_0_TITLE');
+		$alias         = JApplicationHelper::stringURLSafe($categoryTitle);
+
+		// Set unicodeslugs if alias is empty
+		if (trim(str_replace('-', '', $alias) == ''))
+		{
+			$unicode = JFactory::getConfig()->set('unicodeslugs', 1);
+			$alias = JApplicationHelper::stringURLSafe($categoryTitle);
+			JFactory::getConfig()->set('unicodeslugs', $unicode);
+		}
+
+		$category      = array(
+			'title'           => $categoryTitle . $langSuffix,
+			'parent_id'       => 1,
+			'id'              => 0,
+			'published'       => 1,
+			'access'          => $access,
+			'created_user_id' => $user->id,
+			'extension'       => 'com_content',
+			'level'           => 1,
+			'alias'           => $alias . $langSuffix,
+			'associations'    => array(),
+			'description'     => '',
+			'language'        => $language,
+			'params'          => '',
+		);
+
+		try
+		{
+			if (!$categoryModel->save($category))
+			{
+				throw new Exception($categoryModel->getError());
+			}
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
+
+			return $response;
+		}
+
+		// Get ID from category we just added
+		$catIds[] = $categoryModel->getItem()->id;
+
+		// Create "help" category.
+		$categoryTitle = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_CATEGORY_1_TITLE');
+		$alias         = JApplicationHelper::stringURLSafe($categoryTitle);
+
+		// Set unicodeslugs if alias is empty
+		if (trim(str_replace('-', '', $alias) == ''))
+		{
+			$unicode = JFactory::getConfig()->set('unicodeslugs', 1);
+			$alias = JApplicationHelper::stringURLSafe($categoryTitle);
+			JFactory::getConfig()->set('unicodeslugs', $unicode);
+		}
+
+		$category      = array(
+			'title'           => $categoryTitle . $langSuffix,
+			'parent_id'       => 1,
+			'id'              => 0,
+			'published'       => 1,
+			'access'          => $access,
+			'created_user_id' => $user->id,
+			'extension'       => 'com_content',
+			'level'           => 1,
+			'alias'           => $alias . $langSuffix,
+			'associations'    => array(),
+			'description'     => '',
+			'language'        => $language,
+			'params'          => '',
+		);
+
+		try
+		{
+			if (!$categoryModel->save($category))
+			{
+				throw new Exception($categoryModel->getError());
+			}
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, $e->getMessage());
+
+			return $response;
+		}
+
+		// Get ID from category we just added
+		$catIds[] = $categoryModel->getItem()->id;
+
+		// Create Articles.
+		$articleModel = JModelLegacy::getInstance('Article', 'ContentModel');
+		$articles     = array(
+			array(
+				'catid'    => $catIds[1],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIds[1],
+				'ordering' => 1,
+				'access'   => 3,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 2,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 1,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 0,
+			),
+			array(
+				'catid'    => $catIds[0],
+				'ordering' => 0,
+			),
+		);
+
+		foreach ($articles as $i => $article)
+		{
+			// Set values from language strings.
+			$title                = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_TITLE');
+			$alias                = JApplicationHelper::stringURLSafe($title);
+			$article['title']     = $title . $langSuffix;
+			$article['introtext'] = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_INTROTEXT');
+			$article['fulltext']  = JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_' . $i . '_FULLTEXT');
+
+			// Set values which are always the same.
+			$article['id']              = 0;
+			$article['created_user_id'] = $user->id;
+			$article['alias']           = JApplicationHelper::stringURLSafe($article['title']);
+
+			// Set unicodeslugs if alias is empty
+			if (trim(str_replace('-', '', $alias) == ''))
+			{
+				$unicode = JFactory::getConfig()->set('unicodeslugs', 1);
+				$article['alias'] = JApplicationHelper::stringURLSafe($article['title']);
+				JFactory::getConfig()->set('unicodeslugs', $unicode);
+			}
+
+			$article['language']        = $language;
+			$article['associations']    = array();
+			$article['state']           = 1;
+			$article['featured']        = 0;
+			$article['images']          = '';
+			$article['metakey']         = '';
+			$article['metadesc']        = '';
+			$article['xreference']      = '';
+
+			if (!isset($article['access']))
+			{
+				$article['access'] = $access;
+			}
+
+			if (!$articleModel->save($article))
+			{
+				JFactory::getLanguage()->load('com_content');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 1, JText::_($articleModel->getError()));
+
+				return $response;
+			}
+
+			// Get ID from article we just added
+			$ids[] = $articleModel->getItem()->id;
+		}
+
+		$this->app->setUserState('sampledata.blog.articles', $ids);
+		$this->app->setUserState('sampledata.blog.articles.catids', $catIds);
+
+		$response          = new stdClass;
+		$response->success = true;
+		$response->message = JText::_('PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Second step to enter the sampledata. Menus.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  3.8.0
+	 */
+	public function onAjaxSampledataApplyStep2()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_menus'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_SKIPPED', 2, 'com_menus');
+
+			return $response;
+		}
+
+		// Detect language to be used.
+		$language   = Multilanguage::isEnabled() ? JFactory::getLanguage()->getTag() : '*';
+		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
+
+		// Create the menu types.
+		$menuTable = JTable::getInstance('Type', 'JTableMenu');
+		$menuTypes = array();
+
+		for ($i = 0; $i <= 2; $i++)
+		{
+			$menu = array(
+				'id'          => 0,
+				'title'       => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_' . $i . '_TITLE') . $langSuffix,
+				'description' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_' . $i . '_DESCRIPTION'),
+			);
+
+			// Calculate menutype. The number of characters allowed is 24.
+			$type = JHtml::_('string.truncate', $menu['title'], 23, true, false);
+
+			$menu['menutype'] = $i . $type;
+
+			try
+			{
+				$menuTable->load();
+				$menuTable->bind($menu);
+
+				if (!$menuTable->check())
+				{
+					throw new Exception($menuTable->getError());
+				}
+
+				$menuTable->store();
+			}
+			catch (Exception $e)
+			{
+				JFactory::getLanguage()->load('com_menus');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+				return $response;
+			}
+
+			$menuTypes[] = $menuTable->menutype;
+		}
+
+		// Storing IDs in UserState for later useage.
+		$this->app->setUserState('sampledata.blog.menutypes', $menuTypes);
+
+		// Get previously entered Data from UserStates.
+		$articleIds = $this->app->getUserState('sampledata.blog.articles');
+
+		// Get MenuItemModel.
+		JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/models/', 'MenusModel');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/tables/');
+		$this->menuItemModel = JModelLegacy::getInstance('Item', 'MenusModel');
+
+		// Get previously entered categories ids
+		$catids = $this->app->getUserState('sampledata.blog.articles.catids');
+
+		// Insert menuitems level 1.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE'),
+				'link'         => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[0],
+				'component_id' => 22,
+				'params'       => array(
+					'layout_type'             => 'blog',
+					'show_category_title'     => 0,
+					'num_leading_articles'    => 4,
+					'num_intro_articles'      => 0,
+					'num_columns'             => 1,
+					'num_links'               => 2,
+					'multi_column_order'      => 1,
+					'orderby_sec'             => 'rdate',
+					'order_date'              => 'published',
+					'show_pagination'         => 2,
+					'show_pagination_results' => 1,
+					'show_category'           => 0,
+					'info_bloc_position'      => 0,
+					'show_publish_date'       => 0,
+					'show_hits'               => 0,
+					'show_feed_link'          => 1,
+					'menu_text'               => 1,
+					'show_page_heading'       => 0,
+					'secure'                  => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[0],
+				'component_id' => 22,
+				'params'       => array(
+					'info_block_position' => 0,
+					'show_category'       => 0,
+					'link_category'       => 0,
+					'show_author'         => 0,
+					'show_create_date'    => 0,
+					'show_publish_date'   => 0,
+					'show_hits'           => 0,
+					'menu_text'           => 1,
+					'show_page_heading'   => 0,
+					'secure'              => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[0],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
+				'link'         => 'index.php?option=com_content&view=form&layout=edit',
+				'component_id' => 22,
+				'access'       => 3,
+				'params'       => array(
+					'enable_category'   => 1,
+					'catid'             => $catids[0],
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE'),
+				'link'         => 'index.php?option=com_content&view=article&id=' . $articleIds[1],
+				'component_id' => 22,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_5_TITLE'),
+				'link'         => 'administrator',
+				'type'         => 'url',
+				'component_id' => 0,
+				'browserNav'   => 1,
+				'access'       => 3,
+				'params'       => array(
+					'menu_text' => 1,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE'),
+				'link'         => 'index.php?option=com_users&view=profile&layout=edit',
+				'component_id' => 25,
+				'access'       => 2,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel1 = $this->addMenuItems($menuItems, 1);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert another level 1.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[2],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE'),
+				'link'         => 'index.php?option=com_users&view=login',
+				'component_id' => 25,
+				'params'       => array(
+					'login_redirect_url'     => 'index.php?Itemid=' . $menuIdsLevel1[0],
+					'logindescription_show'  => 1,
+					'logoutdescription_show' => 1,
+					'menu_text'              => 1,
+					'show_page_heading'      => 0,
+					'secure'                 => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$menuIdsLevel1 = array_merge($menuIdsLevel1, $this->addMenuItems($menuItems, 1));
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		// Insert menuitems level 2.
+		$menuItems = array(
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_9_TITLE'),
+				'link'         => 'index.php?option=com_config&view=config&controller=config.display.config',
+				'parent_id'    => $menuIdsLevel1[4],
+				'component_id' => 23,
+				'access'       => 6,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+			array(
+				'menutype'     => $menuTypes[1],
+				'title'        => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_10_TITLE'),
+				'link'         => 'index.php?option=com_config&view=templates&controller=config.display.templates',
+				'parent_id'    => $menuIdsLevel1[4],
+				'component_id' => 23,
+				'params'       => array(
+					'menu_text'         => 1,
+					'show_page_heading' => 0,
+					'secure'            => 0,
+				),
+			),
+		);
+
+		try
+		{
+			$this->addMenuItems($menuItems, 2);
+		}
+		catch (Exception $e)
+		{
+			$response            = array();
+			$response['success'] = false;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 2, $e->getMessage());
+
+			return $response;
+		}
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_BLOG_STEP2_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Third step to enter the sampledata. Modules.
+	 *
+	 * @return  array or void  Will be converted into the JSON response to the module.
+	 *
+	 * @since  3.8.0
+	 */
+	public function onAjaxSampledataApplyStep3()
+	{
+		if ($this->app->input->get('type') != $this->_name)
+		{
+			return;
+		}
+
+		if (!JComponentHelper::isEnabled('com_modules'))
+		{
+			$response            = array();
+			$response['success'] = true;
+			$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_SKIPPED', 3, 'com_modules');
+
+			return $response;
+		}
+
+		// Detect language to be used.
+		$language   = Multilanguage::isEnabled() ? JFactory::getLanguage()->getTag() : '*';
+		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
+
+		// Add Include Paths.
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_modules/models/', 'ModulesModelModule');
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_modules/tables/');
+		$model  = JModelLegacy::getInstance('Module', 'ModulesModel');
+		$access = (int) $this->app->get('access', 1);
+
+		// Get previously entered Data from UserStates
+		$menuTypes = $this->app->getUserState('sampledata.blog.menutypes');
+
+		$catids = $this->app->getUserState('sampledata.blog.articles.catids');
+
+		$modules = array(
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_0_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-1',
+				'module'    => 'mod_menu',
+				'showtitle' => 0,
+				'params'    => array(
+					'menutype'        => $menuTypes[0],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'class_sfx'       => ' nav-pills',
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_1_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'position-1',
+				'module'    => 'mod_menu',
+				'access'    => 3,
+				'showtitle' => 0,
+				'params'    => array(
+					'menutype'        => $menuTypes[1],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 1,
+					'class_sfx'       => ' nav-pills',
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_2_TITLE'),
+				'ordering'  => 6,
+				'position'  => 'position-7',
+				'module'    => 'mod_syndicate',
+				'showtitle' => 0,
+				'params'    => array(
+					'display_text' => 1,
+					'text'         => 'My Blog',
+					'format'       => 'rss',
+					'layout'       => '_:default',
+					'cache'        => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_3_TITLE'),
+				'ordering' => 4,
+				'position' => 'position-7',
+				'module'   => 'mod_articles_archive',
+				'params'   => array(
+					'count'      => 10,
+					'layout'     => '_:default',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static',
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_4_TITLE'),
+				'ordering' => 5,
+				'position' => 'position-7',
+				'module'   => 'mod_articles_popular',
+				'params'   => array(
+					'catid'      => $catids[0],
+					'count'      => 5,
+					'show_front' => 1,
+					'layout'     => '_:default',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'static',
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_5_TITLE'),
+				'ordering' => 2,
+				'position' => 'position-7',
+				'module'   => 'mod_articles_category',
+				'params'   => array(
+					'mode'                         => 'normal',
+					'show_on_article_page'         => 0,
+					'show_front'                   => 'show',
+					'count'                        => 6,
+					'category_filtering_type'      => 1,
+					'catid'                        => $catids[0],
+					'show_child_category_articles' => 0,
+					'levels'                       => 1,
+					'author_filtering_type'        => 1,
+					'author_alias_filtering_type'  => 1,
+					'date_filtering'               => 'off',
+					'date_field'                   => 'a.created',
+					'relative_date'                => 30,
+					'article_ordering'             => 'a.created',
+					'article_ordering_direction'   => 'DESC',
+					'article_grouping'             => 'none',
+					'article_grouping_direction'   => 'krsort',
+					'month_year_format'            => 'F Y',
+					'item_heading'                 => 5,
+					'link_titles'                  => 1,
+					'show_date'                    => 0,
+					'show_date_field'              => 'created',
+					'show_date_format'             => JText::_('DATE_FORMAT_LC5'),
+					'show_category'                => 0,
+					'show_hits'                    => 0,
+					'show_author'                  => 0,
+					'show_introtext'               => 0,
+					'introtext_limit'              => 100,
+					'show_readmore'                => 0,
+					'show_readmore_title'          => 1,
+					'readmore_limit'               => 15,
+					'layout'                       => '_:default',
+					'owncache'                     => 1,
+					'cache_time'                   => 900,
+					'module_tag'                   => 'div',
+					'bootstrap_size'               => 0,
+					'header_tag'                   => 'h3',
+					'style'                        => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_6_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'footer',
+				'module'    => 'mod_menu',
+				'showtitle' => 0,
+				'params'    => array(
+					'menutype'        => $menuTypes[2],
+					'startLevel'      => 1,
+					'endLevel'        => 0,
+					'showAllChildren' => 0,
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'itemid',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_7_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-0',
+				'module'   => 'mod_search',
+				'params'   => array(
+					'width'      => 20,
+					'button_pos' => 'right',
+					'opensearch' => 1,
+					'layout'     => '_:default',
+					'cache'      => 1,
+					'cache_time' => 900,
+					'cachemode'  => 'itemid',
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE'),
+				'content'   => '<p><img src="images/headers/raindrops.jpg" alt="" /></p>',
+				'ordering'  => 1,
+				'position'  => 'position-3',
+				'module'    => 'mod_custom',
+				'showtitle' => 0,
+				'params'    => array(
+					'prepare_content' => 1,
+					'layout'          => '_:default',
+					'cache'           => 1,
+					'cache_time'      => 900,
+					'cachemode'       => 'static',
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_9_TITLE'),
+				'ordering' => 1,
+				'position' => 'position-7',
+				'module'   => 'mod_tags_popular',
+				'params'   => array(
+					'maximum'         => 8,
+					'timeframe'       => 'alltime',
+					'order_value'     => 'count',
+					'order_direction' => 1,
+					'display_count'   => 0,
+					'no_results_text' => 0,
+					'minsize'         => 1,
+					'maxsize'         => 2,
+					'layout'          => '_:default',
+					'owncache'        => 1,
+					'module_tag'      => 'div',
+					'bootstrap_size'  => 0,
+					'header_tag'      => 'h3',
+					'style'           => 0,
+				),
+			),
+			array(
+				'title'    => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_10_TITLE'),
+				'ordering' => 0,
+				'position' => '',
+				'module'   => 'mod_tags_similar',
+				'params'   => array(
+					'maximum'        => 5,
+					'matchtype'      => 'any',
+					'layout'         => '_:default',
+					'owncache'       => 1,
+					'module_tag'     => 'div',
+					'bootstrap_size' => 0,
+					'header_tag'     => 'h3',
+					'style'          => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_11_TITLE'),
+				'ordering'  => 4,
+				'position'  => 'cpanel',
+				'module'    => 'mod_stats_admin',
+				'access'    => 6,
+				'client_id' => 1,
+				'params'    => array(
+					'serverinfo'     => 1,
+					'siteinfo'       => 1,
+					'counter'        => 0,
+					'increase'       => 0,
+					'layout'         => '_:default',
+					'cache'          => 1,
+					'cache_time'     => 900,
+					'cachemode'      => 'static',
+					'module_tag'     => 'div',
+					'bootstrap_size' => 6,
+					'header_tag'     => 'h3',
+					'style'          => 0,
+				),
+			),
+			array(
+				'title'     => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_12_TITLE'),
+				'ordering'  => 1,
+				'position'  => 'postinstall',
+				'module'    => 'mod_feed',
+				'client_id' => 1,
+				'params'    => array(
+					'rssurl'         => 'https://www.joomla.org/announcements/release-news.feed',
+					'rssrtl'         => 0,
+					'rsstitle'       => 1,
+					'rssdesc'        => 1,
+					'rssimage'       => 1,
+					'rssitems'       => 3,
+					'rssitemdesc'    => 1,
+					'word_count'     => 0,
+					'layout'         => '_:default',
+					'cache'          => 1,
+					'cache_time'     => 900,
+					'module_tag'     => 'div',
+					'bootstrap_size' => 0,
+					'header_tag'     => 'h3',
+					'style'          => 0,
+				),
+			),
+		);
+
+		foreach ($modules as $module)
+		{
+			// Append language suffix to title.
+			$module['title'] .= $langSuffix;
+
+			// Set values which are always the same.
+			$module['id']         = 0;
+			$module['asset_id']   = 0;
+			$module['language']   = $language;
+			$module['note']       = '';
+			$module['published']  = 1;
+			$module['assignment'] = 0;
+
+			if (!isset($module['content']))
+			{
+				$module['content'] = '';
+			}
+
+			if (!isset($module['access']))
+			{
+				$module['access'] = $access;
+			}
+
+			if (!isset($module['showtitle']))
+			{
+				$module['showtitle'] = 1;
+			}
+
+			if (!isset($module['client_id']))
+			{
+				$module['client_id'] = 0;
+			}
+
+			if (!$model->save($module))
+			{
+				JFactory::getLanguage()->load('com_modules');
+				$response            = array();
+				$response['success'] = false;
+				$response['message'] = JText::sprintf('PLG_SAMPLEDATA_BLOG_STEP_FAILED', 3, JText::_($model->getError()));
+
+				return $response;
+			}
+		}
+
+		$response            = array();
+		$response['success'] = true;
+		$response['message'] = JText::_('PLG_SAMPLEDATA_BLOG_STEP3_SUCCESS');
+
+		return $response;
+	}
+
+	/**
+	 * Adds menuitems.
+	 *
+	 * @param   array    $menuItems  Array holding the menuitems arrays.
+	 * @param   integer  $level      Level in the category tree.
+	 *
+	 * @return  array  IDs of the inserted menuitems.
+	 *
+	 * @since  3.8.0
+	 *
+	 * @throws  Exception
+	 */
+	private function addMenuItems(array $menuItems, $level)
+	{
+		$itemIds = array();
+		$access  = (int) $this->app->get('access', 1);
+		$user    = JFactory::getUser();
+
+		// Detect language to be used.
+		$language   = Multilanguage::isEnabled() ? JFactory::getLanguage()->getTag() : '*';
+		$langSuffix = ($language !== '*') ? ' (' . $language . ')' : '';
+
+		foreach ($menuItems as $menuItem)
+		{
+			// Reset item.id in model state.
+			$this->menuItemModel->setState('item.id', 0);
+
+			// Set values which are always the same.
+			$menuItem['id']              = 0;
+			$menuItem['created_user_id'] = $user->id;
+			$menuItem['alias']           = JApplicationHelper::stringURLSafe($menuItem['title']);
+
+			// Set unicodeslugs if alias is empty
+			if (trim(str_replace('-', '', $menuItem['alias']) == ''))
+			{
+				$unicode = JFactory::getConfig()->set('unicodeslugs', 1);
+				$menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['title']);
+				JFactory::getConfig()->set('unicodeslugs', $unicode);
+			}
+
+			// Append language suffix to title.
+			$menuItem['title'] .= $langSuffix;
+
+			$menuItem['published']       = 1;
+			$menuItem['language']        = $language;
+			$menuItem['note']            = '';
+			$menuItem['img']             = '';
+			$menuItem['associations']    = array();
+			$menuItem['client_id']       = 0;
+			$menuItem['level']           = $level;
+			$menuItem['home']            = 0;
+
+			// Set browserNav to default if not set
+			if (!isset($menuItem['browserNav']))
+			{
+				$menuItem['browserNav'] = 0;
+			}
+
+			// Set access to default if not set
+			if (!isset($menuItem['access']))
+			{
+				$menuItem['access'] = $access;
+			}
+
+			// Set type to 'component' if not set
+			if (!isset($menuItem['type']))
+			{
+				$menuItem['type'] = 'component';
+			}
+
+			// Set template_style_id to global if not set
+			if (!isset($menuItem['template_style_id']))
+			{
+				$menuItem['template_style_id'] = 0;
+			}
+
+			// Set parent_id to root (1) if not set
+			if (!isset($menuItem['parent_id']))
+			{
+				$menuItem['parent_id'] = 1;
+			}
+
+			if (!$this->menuItemModel->save($menuItem))
+			{
+				// Try two times with another alias (-1 and -2).
+				$menuItem['alias'] .= '-1';
+
+				if (!$this->menuItemModel->save($menuItem))
+				{
+					$menuItem['alias'] = substr_replace($menuItem['alias'], '2', -1);
+
+					if (!$this->menuItemModel->save($menuItem))
+					{
+						throw new Exception($menuItem['title'] . ' => ' . $menuItem['alias'] . ' : ' . $this->menuItemModel->getError());
+					}
+				}
+			}
+
+			// Get ID from menuitem we just added
+			$itemIds[] = $this->menuItemModel->getstate('item.id');
+		}
+
+		return $itemIds;
+	}
+}
diff --git a/core/plugins/sampledata/blog/blog.xml b/core/plugins/sampledata/blog/blog.xml
new file mode 100644
index 00000000..a8f960d8
--- /dev/null
+++ b/core/plugins/sampledata/blog/blog.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.8" type="plugin" group="sampledata" method="upgrade">
+	<name>plg_sampledata_blog</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2017</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.8.0</version>
+	<description>PLG_SAMPLEDATA_BLOG_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="blog">blog.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_sampledata_blog.ini</language>
+		<language tag="en-GB">en-GB.plg_sampledata_blog.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/search/categories/categories.php b/core/plugins/search/categories/categories.php
new file mode 100644
index 00000000..350a595b
--- /dev/null
+++ b/core/plugins/search/categories/categories.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Search.categories
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+/**
+ * Categories search plugin.
+ *
+ * @since  1.6
+ */
+class PlgSearchCategories extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearchAreas()
+	{
+		static $areas = array(
+			'categories' => 'PLG_SEARCH_CATEGORIES_CATEGORIES'
+		);
+
+		return $areas;
+	}
+
+	/**
+	 * Search content (categories).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search is to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
+	{
+		$db = JFactory::getDbo();
+		$user = JFactory::getUser();
+		$app = JFactory::getApplication();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+		$searchText = $text;
+
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
+		{
+			return array();
+		}
+
+		$sContent = $this->params->get('search_content', 1);
+		$sArchived = $this->params->get('search_archived', 1);
+		$limit = $this->params->def('search_limit', 50);
+		$state = array();
+
+		if ($sContent)
+		{
+			$state[] = 1;
+		}
+
+		if ($sArchived)
+		{
+			$state[] = 2;
+		}
+
+		if (empty($state))
+		{
+			return array();
+		}
+
+		$text = trim($text);
+
+		if ($text === '')
+		{
+			return array();
+		}
+
+		/* TODO: The $where variable does not seem to be used at all
+		switch ($phrase)
+		{
+			case 'exact':
+				$text = $db->quote('%' . $db->escape($text, true) . '%', false);
+				$wheres2 = array();
+				$wheres2[] = 'a.title LIKE ' . $text;
+				$wheres2[] = 'a.description LIKE ' . $text;
+				$where = '(' . implode(') OR (', $wheres2) . ')';
+				break;
+
+			case 'any':
+			case 'all';
+			default:
+				$words = explode(' ', $text);
+				$wheres = array();
+				foreach ($words as $word)
+				{
+					$word = $db->quote('%' . $db->escape($word, true) . '%', false);
+					$wheres2 = array();
+					$wheres2[] = 'a.title LIKE ' . $word;
+					$wheres2[] = 'a.description LIKE ' . $word;
+					$wheres[] = implode(' OR ', $wheres2);
+				}
+				$where = '(' . implode(($phrase == 'all' ? ') AND (' : ') OR ('), $wheres) . ')';
+				break;
+		}
+		*/
+
+		switch ($ordering)
+		{
+			case 'alpha':
+				$order = 'a.title ASC';
+				break;
+
+			case 'category':
+			case 'popular':
+			case 'newest':
+			case 'oldest':
+			default:
+				$order = 'a.title DESC';
+		}
+
+		$text = $db->quote('%' . $db->escape($text, true) . '%', false);
+		$query = $db->getQuery(true);
+
+		// SQLSRV changes.
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('a.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $a_id . ' END as slug';
+		$query->select('a.title, a.description AS text, a.created_time AS created, \'2\' AS browsernav, a.id AS catid, ' . $case_when)
+			->from('#__categories AS a')
+			->where(
+				'(a.title LIKE ' . $text . ' OR a.description LIKE ' . $text . ') AND a.published IN (' . implode(',', $state) . ') AND a.extension = '
+				. $db->quote('com_content') . 'AND a.access IN (' . $groups . ')'
+			)
+			->group('a.id, a.title, a.description, a.alias, a.created_time')
+			->order($order);
+
+		if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		$db->setQuery($query, 0, $limit);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		$return = array();
+
+		if ($rows)
+		{
+			foreach ($rows as $i => $row)
+			{
+				if (searchHelper::checkNoHtml($row, $searchText, array('name', 'title', 'text')))
+				{
+					$row->href = ContentHelperRoute::getCategoryRoute($row->slug);
+					$row->section = JText::_('JCATEGORY');
+
+					$return[] = $row;
+				}
+			}
+		}
+
+		return $return;
+	}
+}
diff --git a/core/plugins/search/categories/categories.xml b/core/plugins/search/categories/categories.xml
new file mode 100644
index 00000000..a9b40193
--- /dev/null
+++ b/core/plugins/search/categories/categories.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="search" method="upgrade">
+	<name>plg_search_categories</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SEARCH_CATEGORIES_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="categories">categories.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_search_categories.ini</language>
+		<language tag="en-GB">en-GB.plg_search_categories.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+
+			<fieldset name="basic">
+				<field
+					name="search_limit"
+					type="number"
+					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
+					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+					default="50"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="search_content"
+					type="radio"
+					label="JFIELD_PLG_SEARCH_ALL_LABEL"
+					description="JFIELD_PLG_SEARCH_ALL_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="search_archived"
+					type="radio"
+					label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"
+					description="JFIELD_PLG_SEARCH_ARCHIVED_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/search/contacts/contacts.php b/core/plugins/search/contacts/contacts.php
new file mode 100644
index 00000000..fcc12e03
--- /dev/null
+++ b/core/plugins/search/contacts/contacts.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Search.contacts
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contacts search plugin.
+ *
+ * @since  1.6
+ */
+class PlgSearchContacts extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearchAreas()
+	{
+		static $areas = array(
+			'contacts' => 'PLG_SEARCH_CONTACTS_CONTACTS'
+		);
+
+		return $areas;
+	}
+
+	/**
+	 * Search content (contacts).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   string  $areas     An array if the search is to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
+	{
+		JLoader::register('ContactHelperRoute', JPATH_SITE . '/components/com_contact/helpers/route.php');
+
+		$db     = JFactory::getDbo();
+		$app    = JFactory::getApplication();
+		$user   = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
+		{
+			return array();
+		}
+
+		$sContent  = $this->params->get('search_content', 1);
+		$sArchived = $this->params->get('search_archived', 1);
+		$limit     = $this->params->def('search_limit', 50);
+		$state     = array();
+
+		if ($sContent)
+		{
+			$state[] = 1;
+		}
+
+		if ($sArchived)
+		{
+			$state[] = 2;
+		}
+
+		if (empty($state))
+		{
+			return array();
+		}
+
+		$text = trim($text);
+
+		if ($text === '')
+		{
+			return array();
+		}
+
+		$section = JText::_('PLG_SEARCH_CONTACTS_CONTACTS');
+
+		switch ($ordering)
+		{
+			case 'alpha':
+				$order = 'a.name ASC';
+				break;
+
+			case 'category':
+				$order = 'c.title ASC, a.name ASC';
+				break;
+
+			case 'popular':
+			case 'newest':
+			case 'oldest':
+			default:
+				$order = 'a.name DESC';
+		}
+
+		$text = $db->quote('%' . $db->escape($text, true) . '%', false);
+
+		$query = $db->getQuery(true);
+
+		// SQLSRV changes.
+		$case_when  = ' CASE WHEN ';
+		$case_when .= $query->charLength('a.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $a_id . ' END as slug';
+
+		$case_when1  = ' CASE WHEN ';
+		$case_when1 .= $query->charLength('c.alias', '!=', '0');
+		$case_when1 .= ' THEN ';
+		$c_id        = $query->castAsChar('c.id');
+		$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when1 .= ' ELSE ';
+		$case_when1 .= $c_id . ' END as catslug';
+
+		$query->select(
+			'a.name AS title, \'\' AS created, a.con_position, a.misc, '
+				. $case_when . ',' . $case_when1 . ', '
+				. $query->concatenate(array('a.name', 'a.con_position', 'a.misc'), ',') . ' AS text,'
+				. $query->concatenate(array($db->quote($section), 'c.title'), ' / ') . ' AS section,'
+				. '\'2\' AS browsernav'
+		);
+		$query->from('#__contact_details AS a')
+			->join('INNER', '#__categories AS c ON c.id = a.catid')
+			->where(
+				'(a.name LIKE ' . $text . ' OR a.misc LIKE ' . $text . ' OR a.con_position LIKE ' . $text
+					. ' OR a.address LIKE ' . $text . ' OR a.suburb LIKE ' . $text . ' OR a.state LIKE ' . $text
+					. ' OR a.country LIKE ' . $text . ' OR a.postcode LIKE ' . $text . ' OR a.telephone LIKE ' . $text
+					. ' OR a.fax LIKE ' . $text . ') AND a.published IN (' . implode(',', $state) . ') AND c.published=1 '
+					. ' AND a.access IN (' . $groups . ') AND c.access IN (' . $groups . ')'
+			)
+			->order($order);
+
+		// Filter by language.
+		if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+		{
+			$tag = JFactory::getLanguage()->getTag();
+			$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
+				->where('c.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+		}
+
+		$db->setQuery($query, 0, $limit);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		if ($rows)
+		{
+			foreach ($rows as $key => $row)
+			{
+				$rows[$key]->href  = ContactHelperRoute::getContactRoute($row->slug, $row->catslug);
+				$rows[$key]->text  = $row->title;
+				$rows[$key]->text .= $row->con_position ? ', ' . $row->con_position : '';
+				$rows[$key]->text .= $row->misc ? ', ' . $row->misc : '';
+			}
+		}
+
+		return $rows;
+	}
+}
diff --git a/core/plugins/search/contacts/contacts.xml b/core/plugins/search/contacts/contacts.xml
new file mode 100644
index 00000000..a8d03288
--- /dev/null
+++ b/core/plugins/search/contacts/contacts.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="search" method="upgrade">
+	<name>plg_search_contacts</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SEARCH_CONTACTS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contacts">contacts.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_search_contacts.ini</language>
+		<language tag="en-GB">en-GB.plg_search_contacts.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="search_limit"
+					type="number"
+					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
+					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+					default="50"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="search_content"
+					type="radio"
+					label="JFIELD_PLG_SEARCH_ALL_LABEL"
+					description="JFIELD_PLG_SEARCH_ALL_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="search_archived"
+					type="radio"
+					label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"
+					description="JFIELD_PLG_SEARCH_ARCHIVED_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/search/content/content.php b/core/plugins/search/content/content.php
new file mode 100644
index 00000000..73697124
--- /dev/null
+++ b/core/plugins/search/content/content.php
@@ -0,0 +1,454 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Search.content
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content search plugin.
+ *
+ * @since  1.6
+ */
+class PlgSearchContent extends JPlugin
+{
+	/**
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearchAreas()
+	{
+		static $areas = array(
+			'content' => 'JGLOBAL_ARTICLES'
+		);
+
+		return $areas;
+	}
+
+	/**
+	 * Search content (articles).
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search it to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
+	{
+		$db         = JFactory::getDbo();
+		$serverType = $db->getServerType();
+		$app        = JFactory::getApplication();
+		$user       = JFactory::getUser();
+		$groups     = implode(',', $user->getAuthorisedViewLevels());
+		$tag        = JFactory::getLanguage()->getTag();
+
+		JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+		JLoader::register('SearchHelper', JPATH_ADMINISTRATOR . '/components/com_search/helpers/search.php');
+
+		$searchText = $text;
+
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
+		{
+			return array();
+		}
+
+		$sContent  = $this->params->get('search_content', 1);
+		$sArchived = $this->params->get('search_archived', 1);
+		$limit     = $this->params->def('search_limit', 50);
+
+		$nullDate  = $db->getNullDate();
+		$date      = JFactory::getDate();
+		$now       = $date->toSql();
+
+		$text = trim($text);
+
+		if ($text === '')
+		{
+			return array();
+		}
+
+		switch ($phrase)
+		{
+			case 'exact':
+				$text      = $db->quote('%' . $db->escape($text, true) . '%', false);
+				$wheres2   = array();
+				$wheres2[] = 'a.title LIKE ' . $text;
+				$wheres2[] = 'a.introtext LIKE ' . $text;
+				$wheres2[] = 'a.fulltext LIKE ' . $text;
+				$wheres2[] = 'a.metakey LIKE ' . $text;
+				$wheres2[] = 'a.metadesc LIKE ' . $text;
+
+				$relevance[] = ' CASE WHEN ' . $wheres2[0] . ' THEN 5 ELSE 0 END ';
+
+				// Join over Fields.
+				$subQuery = $db->getQuery(true);
+				$subQuery->select("cfv.item_id")
+					->from("#__fields_values AS cfv")
+					->join('LEFT', '#__fields AS f ON f.id = cfv.field_id')
+					->where('(f.context IS NULL OR f.context = ' . $db->q('com_content.article') . ')')
+					->where('(f.state IS NULL OR f.state = 1)')
+					->where('(f.access IS NULL OR f.access IN (' . $groups . '))')
+					->where('cfv.value LIKE ' . $text);
+
+				// Filter by language.
+				if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+				{
+					$subQuery->where('(f.language IS NULL OR f.language in (' . $db->quote($tag) . ',' . $db->quote('*') . '))');
+				}
+
+				if ($serverType == "mysql")
+				{
+					/* This generates a dependent sub-query so do no use in MySQL prior to version 6.0 !
+					* $wheres2[] = 'a.id IN( '. (string) $subQuery.')';
+					*/
+
+					$db->setQuery($subQuery);
+					$fieldids = $db->loadColumn();
+
+					if (count($fieldids))
+					{
+						$wheres2[] = 'a.id IN(' . implode(",", $fieldids) . ')';
+					}
+				}
+				else
+				{
+					$wheres2[] = $subQuery->castAsChar('a.id') . ' IN( ' . (string) $subQuery . ')';
+				}
+
+				$where = '(' . implode(') OR (', $wheres2) . ')';
+				break;
+
+			case 'all':
+			case 'any':
+			default:
+				$words = explode(' ', $text);
+				$wheres = array();
+				$cfwhere = array();
+
+				foreach ($words as $word)
+				{
+					$word      = $db->quote('%' . $db->escape($word, true) . '%', false);
+					$wheres2   = array();
+					$wheres2[] = 'LOWER(a.title) LIKE LOWER(' . $word . ')';
+					$wheres2[] = 'LOWER(a.introtext) LIKE LOWER(' . $word . ')';
+					$wheres2[] = 'LOWER(a.fulltext) LIKE LOWER(' . $word . ')';
+					$wheres2[] = 'LOWER(a.metakey) LIKE LOWER(' . $word . ')';
+					$wheres2[] = 'LOWER(a.metadesc) LIKE LOWER(' . $word . ')';
+
+					$relevance[] = ' CASE WHEN ' . $wheres2[0] . ' THEN 5 ELSE 0 END ';
+
+					if ($phrase === 'all')
+					{
+						// Join over Fields.
+						$subQuery = $db->getQuery(true);
+						$subQuery->select("cfv.item_id")
+							->from("#__fields_values AS cfv")
+							->join('LEFT', '#__fields AS f ON f.id = cfv.field_id')
+							->where('(f.context IS NULL OR f.context = ' . $db->q('com_content.article') . ')')
+							->where('(f.state IS NULL OR f.state = 1)')
+							->where('(f.access IS NULL OR f.access IN (' . $groups . '))')
+							->where('LOWER(cfv.value) LIKE LOWER(' . $word . ')');
+
+						// Filter by language.
+						if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+						{
+							$subQuery->where('(f.language IS NULL OR f.language in (' . $db->quote($tag) . ',' . $db->quote('*') . '))');
+						}
+
+						if ($serverType == "mysql")
+						{
+							$db->setQuery($subQuery);
+							$fieldids = $db->loadColumn();
+
+							if (count($fieldids))
+							{
+								$wheres2[] = 'a.id IN(' . implode(",", $fieldids) . ')';
+							}
+						}
+						else
+						{
+							$wheres2[] = $subQuery->castAsChar('a.id') . ' IN( ' . (string) $subQuery . ')';
+						}
+					}
+					else
+					{
+						$cfwhere[] = 'LOWER(cfv.value) LIKE LOWER(' . $word . ')';
+					}
+
+					$wheres[] = implode(' OR ', $wheres2);
+				}
+
+				if ($phrase === 'any')
+				{
+					// Join over Fields.
+					$subQuery = $db->getQuery(true);
+					$subQuery->select("cfv.item_id")
+						->from("#__fields_values AS cfv")
+						->join('LEFT', '#__fields AS f ON f.id = cfv.field_id')
+						->where('(f.context IS NULL OR f.context = ' . $db->q('com_content.article') . ')')
+						->where('(f.state IS NULL OR f.state = 1)')
+						->where('(f.access IS NULL OR f.access IN (' . $groups . '))')
+						->where('(' . implode(($phrase === 'all' ? ') AND (' : ') OR ('), $cfwhere) . ')');
+
+					// Filter by language.
+					if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+					{
+						$subQuery->where('(f.language IS NULL OR f.language in (' . $db->quote($tag) . ',' . $db->quote('*') . '))');
+					}
+
+					if ($serverType == "mysql")
+					{
+						$db->setQuery($subQuery);
+						$fieldids = $db->loadColumn();
+
+						if (count($fieldids))
+						{
+							$wheres[] = 'a.id IN(' . implode(",", $fieldids) . ')';
+						}
+					}
+					else
+					{
+						$wheres[] = $subQuery->castAsChar('a.id') . ' IN( ' . (string) $subQuery . ')';
+					}
+				}
+
+				$where = '(' . implode(($phrase === 'all' ? ') AND (' : ') OR ('), $wheres) . ')';
+				break;
+		}
+
+		switch ($ordering)
+		{
+			case 'oldest':
+				$order = 'a.created ASC';
+				break;
+
+			case 'popular':
+				$order = 'a.hits DESC';
+				break;
+
+			case 'alpha':
+				$order = 'a.title ASC';
+				break;
+
+			case 'category':
+				$order = 'c.title ASC, a.title ASC';
+				break;
+
+			case 'newest':
+			default:
+				$order = 'a.created DESC';
+				break;
+		}
+
+		$rows = array();
+		$query = $db->getQuery(true);
+
+		// Search articles.
+		if ($sContent && $limit > 0)
+		{
+			$query->clear();
+
+			// SQLSRV changes.
+			$case_when  = ' CASE WHEN ';
+			$case_when .= $query->charLength('a.alias', '!=', '0');
+			$case_when .= ' THEN ';
+			$a_id       = $query->castAsChar('a.id');
+			$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+			$case_when .= ' ELSE ';
+			$case_when .= $a_id . ' END as slug';
+
+			$case_when1  = ' CASE WHEN ';
+			$case_when1 .= $query->charLength('c.alias', '!=', '0');
+			$case_when1 .= ' THEN ';
+			$c_id        = $query->castAsChar('c.id');
+			$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+			$case_when1 .= ' ELSE ';
+			$case_when1 .= $c_id . ' END as catslug';
+
+			if (!empty($relevance))
+			{
+				$query->select(implode(' + ', $relevance) . ' AS relevance');
+				$order = ' relevance DESC, ' . $order;
+			}
+
+			$query->select('a.title AS title, a.metadesc, a.metakey, a.created AS created, a.language, a.catid')
+				->select($query->concatenate(array('a.introtext', 'a.fulltext')) . ' AS text')
+				->select('c.title AS section, ' . $case_when . ',' . $case_when1 . ', ' . '\'2\' AS browsernav')
+				->from('#__content AS a')
+				->join('INNER', '#__categories AS c ON c.id=a.catid')
+				->where(
+					'(' . $where . ') AND a.state=1 AND c.published = 1 AND a.access IN (' . $groups . ') '
+						. 'AND c.access IN (' . $groups . ')'
+						. 'AND (a.publish_up = ' . $db->quote($nullDate) . ' OR a.publish_up <= ' . $db->quote($now) . ') '
+						. 'AND (a.publish_down = ' . $db->quote($nullDate) . ' OR a.publish_down >= ' . $db->quote($now) . ')'
+				)
+				->group('a.id, a.title, a.metadesc, a.metakey, a.created, a.language, a.catid, a.introtext, a.fulltext, c.title, a.alias, c.alias, c.id')
+				->order($order);
+
+			// Filter by language.
+			if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+			{
+				$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
+					->where('c.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+			}
+
+			$db->setQuery($query, 0, $limit);
+
+			try
+			{
+				$list = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				$list = array();
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			}
+
+			$limit -= count($list);
+
+			if (isset($list))
+			{
+				foreach ($list as $key => $item)
+				{
+					$list[$key]->href = ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language);
+				}
+			}
+
+			$rows[] = $list;
+		}
+
+		// Search archived content.
+		if ($sArchived && $limit > 0)
+		{
+			$query->clear();
+
+			// SQLSRV changes.
+			$case_when  = ' CASE WHEN ';
+			$case_when .= $query->charLength('a.alias', '!=', '0');
+			$case_when .= ' THEN ';
+			$a_id       = $query->castAsChar('a.id');
+			$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+			$case_when .= ' ELSE ';
+			$case_when .= $a_id . ' END as slug';
+
+			$case_when1  = ' CASE WHEN ';
+			$case_when1 .= $query->charLength('c.alias', '!=', '0');
+			$case_when1 .= ' THEN ';
+			$c_id = $query->castAsChar('c.id');
+			$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+			$case_when1 .= ' ELSE ';
+			$case_when1 .= $c_id . ' END as catslug';
+
+			if (!empty($relevance))
+			{
+				$query->select(implode(' + ', $relevance) . ' AS relevance');
+				$order = ' relevance DESC, ' . $order;
+			}
+
+			$query->select(
+				'a.title AS title, a.metadesc, a.metakey, a.created AS created, '
+				. $query->concatenate(array('a.introtext', 'a.fulltext')) . ' AS text,'
+				. $case_when . ',' . $case_when1 . ', '
+				. 'c.title AS section, \'2\' AS browsernav'
+			);
+
+			// .'CONCAT_WS("/", c.title) AS section, \'2\' AS browsernav' );
+			$query->from('#__content AS a')
+				->join('INNER', '#__categories AS c ON c.id=a.catid AND c.access IN (' . $groups . ')')
+				->where(
+					'(' . $where . ') AND a.state = 2 AND c.published = 1 AND a.access IN (' . $groups
+						. ') AND c.access IN (' . $groups . ') '
+						. 'AND (a.publish_up = ' . $db->quote($nullDate) . ' OR a.publish_up <= ' . $db->quote($now) . ') '
+						. 'AND (a.publish_down = ' . $db->quote($nullDate) . ' OR a.publish_down >= ' . $db->quote($now) . ')'
+				)
+				->order($order);
+
+			// Join over Fields is no longer neded
+
+			// Filter by language.
+			if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+			{
+				$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
+					->where('c.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+			}
+
+			$db->setQuery($query, 0, $limit);
+
+			try
+			{
+				$list3 = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				$list3 = array();
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			}
+
+			// Find an itemid for archived to use if there isn't another one.
+			$item = $app->getMenu()->getItems('link', 'index.php?option=com_content&view=archive', true);
+			$itemid = isset($item->id) ? '&Itemid=' . $item->id : '';
+
+			if (isset($list3))
+			{
+				foreach ($list3 as $key => $item)
+				{
+					$date = JFactory::getDate($item->created);
+
+					$created_month = $date->format('n');
+					$created_year = $date->format('Y');
+
+					$list3[$key]->href = JRoute::_('index.php?option=com_content&view=archive&year=' . $created_year . '&month=' . $created_month . $itemid);
+				}
+			}
+
+			$rows[] = $list3;
+		}
+
+		$results = array();
+
+		if (count($rows))
+		{
+			foreach ($rows as $row)
+			{
+				$new_row = array();
+
+				foreach ($row as $article)
+				{
+					// Not efficient to get these ONE article at a TIME
+					// Lookup field values so they can be checked, GROUP_CONCAT would work in above queries, but isn't supported by non-MySQL DBs.
+					$query = $db->getQuery(true);
+					$query->select('fv.value')
+						->from('#__fields_values as fv')
+						->join('left', '#__fields as f on fv.field_id = f.id')
+						->where('f.context = ' . $db->quote('com_content.article'))
+						->where('fv.item_id = ' . $db->quote((int) $article->slug));
+					$db->setQuery($query);
+					$article->jcfields = implode(',', $db->loadColumn());
+
+					if (SearchHelper::checkNoHtml($article, $searchText, array('text', 'title', 'jcfields', 'metadesc', 'metakey')))
+					{
+						$new_row[] = $article;
+					}
+				}
+
+				$results = array_merge($results, (array) $new_row);
+			}
+		}
+
+		return $results;
+	}
+
+}
diff --git a/core/plugins/search/content/content.xml b/core/plugins/search/content/content.xml
new file mode 100644
index 00000000..7c47015d
--- /dev/null
+++ b/core/plugins/search/content/content.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="search" method="upgrade">
+	<name>plg_search_content</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SEARCH_CONTENT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="content">content.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_search_content.ini</language>
+		<language tag="en-GB">en-GB.plg_search_content.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="search_limit"
+					type="number"
+					label="PLG_SEARCH_CONTENT_FIELD_SEARCHLIMIT_LABEL"
+					description="PLG_SEARCH_CONTENT_FIELD_SEARCHLIMIT_DESC"
+					default="50"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="search_content"
+					type="radio"
+					label="PLG_SEARCH_CONTENT_FIELD_CONTENT_LABEL"
+					description="PLG_SEARCH_CONTENT_FIELD_CONTENT_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="search_archived"
+					type="radio"
+					label="PLG_SEARCH_CONTENT_FIELD_ARCHIVED_LABEL"
+					description="PLG_SEARCH_CONTENT_FIELD_ARCHIVED_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/search/newsfeeds/newsfeeds.php b/core/plugins/search/newsfeeds/newsfeeds.php
new file mode 100644
index 00000000..31358473
--- /dev/null
+++ b/core/plugins/search/newsfeeds/newsfeeds.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Search.newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Newsfeeds search plugin.
+ *
+ * @since  1.6
+ */
+class PlgSearchNewsfeeds extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearchAreas()
+	{
+		static $areas = array(
+			'newsfeeds' => 'PLG_SEARCH_NEWSFEEDS_NEWSFEEDS'
+		);
+
+		return $areas;
+	}
+
+	/**
+	 * Search content (newsfeeds).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search it to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
+	 */
+	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
+	{
+		$db = JFactory::getDbo();
+		$app = JFactory::getApplication();
+		$user = JFactory::getUser();
+		$groups = implode(',', $user->getAuthorisedViewLevels());
+
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
+		{
+			return array();
+		}
+
+		$sContent = $this->params->get('search_content', 1);
+		$sArchived = $this->params->get('search_archived', 1);
+		$limit = $this->params->def('search_limit', 50);
+		$state = array();
+
+		if ($sContent)
+		{
+			$state[] = 1;
+		}
+
+		if ($sArchived)
+		{
+			$state[] = 2;
+		}
+
+		if (empty($state))
+		{
+			return array();
+		}
+
+		$text = trim($text);
+
+		if ($text === '')
+		{
+			return array();
+		}
+
+		switch ($phrase)
+		{
+			case 'exact':
+				$text = $db->quote('%' . $db->escape($text, true) . '%', false);
+				$wheres2 = array();
+				$wheres2[] = 'a.name LIKE ' . $text;
+				$wheres2[] = 'a.link LIKE ' . $text;
+				$where = '(' . implode(') OR (', $wheres2) . ')';
+				break;
+
+			case 'all':
+			case 'any':
+			default:
+				$words = explode(' ', $text);
+				$wheres = array();
+
+				foreach ($words as $word)
+				{
+					$word = $db->quote('%' . $db->escape($word, true) . '%', false);
+					$wheres2 = array();
+					$wheres2[] = 'a.name LIKE ' . $word;
+					$wheres2[] = 'a.link LIKE ' . $word;
+					$wheres[] = implode(' OR ', $wheres2);
+				}
+
+				$where = '(' . implode(($phrase === 'all' ? ') AND (' : ') OR ('), $wheres) . ')';
+				break;
+		}
+
+		switch ($ordering)
+		{
+			case 'alpha':
+				$order = 'a.name ASC';
+				break;
+
+			case 'category':
+				$order = 'c.title ASC, a.name ASC';
+				break;
+
+			case 'oldest':
+			case 'popular':
+			case 'newest':
+			default:
+				$order = 'a.name ASC';
+		}
+
+		$searchNewsfeeds = JText::_('PLG_SEARCH_NEWSFEEDS_NEWSFEEDS');
+
+		$query = $db->getQuery(true);
+
+		// SQLSRV changes.
+		$case_when  = ' CASE WHEN ';
+		$case_when .= $query->charLength('a.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$a_id       = $query->castAsChar('a.id');
+		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $a_id . ' END as slug';
+
+		$case_when1  = ' CASE WHEN ';
+		$case_when1 .= $query->charLength('c.alias', '!=', '0');
+		$case_when1 .= ' THEN ';
+		$c_id        = $query->castAsChar('c.id');
+		$case_when1 .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when1 .= ' ELSE ';
+		$case_when1 .= $c_id . ' END as catslug';
+
+		$query->select('a.name AS title, \'\' AS created, a.link AS text, ' . $case_when . ',' . $case_when1)
+			->select($query->concatenate(array($db->quote($searchNewsfeeds), 'c.title'), ' / ') . ' AS section')
+			->select('\'1\' AS browsernav')
+			->from('#__newsfeeds AS a')
+			->join('INNER', '#__categories as c ON c.id = a.catid')
+			->where('(' . $where . ') AND a.published IN (' . implode(',', $state) . ') AND c.published = 1 AND c.access IN (' . $groups . ')')
+			->order($order);
+
+		// Filter by language.
+		if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+		{
+			$tag = JFactory::getLanguage()->getTag();
+			$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
+				->where('c.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+		}
+
+		$db->setQuery($query, 0, $limit);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		if ($rows)
+		{
+			foreach ($rows as $key => $row)
+			{
+				$rows[$key]->href = 'index.php?option=com_newsfeeds&view=newsfeed&catid=' . $row->catslug . '&id=' . $row->slug;
+			}
+		}
+
+		return $rows;
+	}
+}
diff --git a/core/plugins/search/newsfeeds/newsfeeds.xml b/core/plugins/search/newsfeeds/newsfeeds.xml
new file mode 100644
index 00000000..5d14be6c
--- /dev/null
+++ b/core/plugins/search/newsfeeds/newsfeeds.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="search" method="upgrade">
+	<name>plg_search_newsfeeds</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2005</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SEARCH_NEWSFEEDS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="newsfeeds">newsfeeds.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_search_newsfeeds.ini</language>
+		<language tag="en-GB">en-GB.plg_search_newsfeeds.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="search_limit"
+					type="number"
+					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
+					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+					default="50"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="search_content"
+					type="radio"
+					label="JFIELD_PLG_SEARCH_ALL_LABEL"
+					description="JFIELD_PLG_SEARCH_ALL_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="search_archived"
+					type="radio"
+					label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"
+					description="JFIELD_PLG_SEARCH_ARCHIVED_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JON</option>
+					<option value="0">JOFF</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/search/tags/tags.php b/core/plugins/search/tags/tags.php
new file mode 100644
index 00000000..8faaf696
--- /dev/null
+++ b/core/plugins/search/tags/tags.php
@@ -0,0 +1,218 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Search.tags
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+/**
+ * Tags search plugin.
+ *
+ * @since  3.3
+ */
+class PlgSearchTags extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.3
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   3.3
+	 */
+	public function onContentSearchAreas()
+	{
+		static $areas = array(
+			'tags' => 'PLG_SEARCH_TAGS_TAGS'
+		);
+
+		return $areas;
+	}
+
+	/**
+	 * Search content (tags).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   string  $areas     An array if the search is to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   3.3
+	 */
+	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
+	{
+		$db    = JFactory::getDbo();
+		$query = $db->getQuery(true);
+		$app   = JFactory::getApplication();
+		$user  = JFactory::getUser();
+		$lang  = JFactory::getLanguage();
+
+		$section = JText::_('PLG_SEARCH_TAGS_TAGS');
+		$limit   = $this->params->def('search_limit', 50);
+
+		if (is_array($areas) && !array_intersect($areas, array_keys($this->onContentSearchAreas())))
+		{
+			return array();
+		}
+
+		$text = trim($text);
+
+		if ($text === '')
+		{
+			return array();
+		}
+
+		$text = $db->quote('%' . $db->escape($text, true) . '%', false);
+
+		switch ($ordering)
+		{
+			case 'alpha':
+				$order = 'a.title ASC';
+				break;
+
+			case 'newest':
+				$order = 'a.created_time DESC';
+				break;
+
+			case 'oldest':
+				$order = 'a.created_time ASC';
+				break;
+
+			case 'popular':
+			default:
+				$order = 'a.title DESC';
+		}
+
+		$query->select('a.id, a.title, a.alias, a.note, a.published, a.access'
+			. ', a.checked_out, a.checked_out_time, a.created_user_id'
+			. ', a.path, a.parent_id, a.level, a.lft, a.rgt'
+			. ', a.language, a.created_time AS created, a.description');
+
+		$case_when_item_alias  = ' CASE WHEN ';
+		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
+		$case_when_item_alias .= ' THEN ';
+		$a_id                  = $query->castAsChar('a.id');
+		$case_when_item_alias .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when_item_alias .= ' ELSE ';
+		$case_when_item_alias .= $a_id . ' END as slug';
+		$query->select($case_when_item_alias);
+
+		$query->from('#__tags AS a');
+		$query->where('a.alias <> ' . $db->quote('root'));
+
+		$query->where('(a.title LIKE ' . $text . ' OR a.alias LIKE ' . $text . ')');
+
+		$query->where($db->qn('a.published') . ' = 1');
+
+		if (!$user->authorise('core.admin'))
+		{
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')');
+		}
+
+		if ($app->isClient('site') && JLanguageMultilang::isEnabled())
+		{
+			$tag = JFactory::getLanguage()->getTag();
+			$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')');
+		}
+
+		$query->order($order);
+
+		$db->setQuery($query, 0, $limit);
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+		}
+
+		if ($rows)
+		{
+			JLoader::register('TagsHelperRoute', JPATH_SITE . '/components/com_tags/helpers/route.php');
+
+			foreach ($rows as $key => $row)
+			{
+				$rows[$key]->href       = TagsHelperRoute::getTagRoute($row->slug);
+				$rows[$key]->text       = ($row->description !== '' ? $row->description : $row->title);
+				$rows[$key]->text      .= $row->note;
+				$rows[$key]->section    = $section;
+				$rows[$key]->created    = $row->created;
+				$rows[$key]->browsernav = 0;
+			}
+		}
+
+		if (!$this->params->get('show_tagged_items', 0))
+		{
+			return $rows;
+		}
+		else
+		{
+			$final_items = $rows;
+			JModelLegacy::addIncludePath(JPATH_SITE . '/components/com_tags/models');
+			$tag_model = JModelLegacy::getInstance('Tag', 'TagsModel');
+			$tag_model->getState();
+
+			foreach ($rows as $key => $row)
+			{
+				$tag_model->setState('tag.id', $row->id);
+				$tagged_items = $tag_model->getItems();
+
+				if ($tagged_items)
+				{
+					foreach ($tagged_items as $k => $item)
+					{
+						// For 3rd party extensions we need to load the component strings from its sys.ini file
+						$parts = explode('.', $item->type_alias);
+						$comp = array_shift($parts);
+						$lang->load($comp, JPATH_SITE, null, false, true)
+						|| $lang->load($comp, JPATH_SITE . '/components/' . $comp, null, false, true);
+
+						// Making up the type string
+						$type = implode('_', $parts);
+						$type = $comp . '_CONTENT_TYPE_' . $type;
+
+						$new_item        = new stdClass;
+						$new_item->href  = $item->link;
+						$new_item->title = $item->core_title;
+						$new_item->text  = $item->core_body;
+
+						if ($lang->hasKey($type))
+						{
+							$new_item->section = JText::sprintf('PLG_SEARCH_TAGS_ITEM_TAGGED_WITH', JText::_($type), $row->title);
+						}
+						else
+						{
+							$new_item->section = JText::sprintf('PLG_SEARCH_TAGS_ITEM_TAGGED_WITH', $item->content_type_title, $row->title);
+						}
+
+						$new_item->created    = $item->displayDate;
+						$new_item->browsernav = 0;
+						$final_items[]        = $new_item;
+					}
+				}
+			}
+
+			return $final_items;
+		}
+	}
+}
diff --git a/core/plugins/search/tags/tags.xml b/core/plugins/search/tags/tags.xml
new file mode 100644
index 00000000..34aa699d
--- /dev/null
+++ b/core/plugins/search/tags/tags.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="search" method="upgrade">
+	<name>plg_search_tags</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2014</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SEARCH_TAGS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="tags">tags.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_search_tags.ini</language>
+		<language tag="en-GB">en-GB.plg_search_tags.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="search_limit"
+					type="number"
+					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
+					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
+					default="50"
+					filter="integer"
+					size="5"
+				/>
+
+				<field
+					name="show_tagged_items"
+					type="radio"
+					label="PLG_SEARCH_TAGS_FIELD_SHOW_TAGGED_ITEMS_LABEL"
+					description="PLG_SEARCH_TAGS_FIELD_SHOW_TAGGED_ITEMS_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/cache/cache.php b/core/plugins/system/cache/cache.php
new file mode 100644
index 00000000..a8671f34
--- /dev/null
+++ b/core/plugins/system/cache/cache.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.cache
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Page Cache Plugin.
+ *
+ * @since  1.5
+ */
+class PlgSystemCache extends JPlugin
+{
+	/**
+	 * Cache instance.
+	 *
+	 * @var    JCache
+	 * @since  1.5
+	 */
+	public $_cache;
+
+	/**
+	 * Cache key
+	 *
+	 * @var    string
+	 * @since  3.0
+	 */
+	public $_cache_key;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.8.0
+	 */
+	protected $app;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(& $subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		// Set the language in the class.
+		$options = array(
+			'defaultgroup' => 'page',
+			'browsercache' => $this->params->get('browsercache', 0),
+			'caching'      => false,
+		);
+
+		// Get the application if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!$this->app)
+		{
+			$this->app = JFactory::getApplication();
+		}
+
+		$this->_cache = JCache::getInstance('page', $options);
+	}
+
+	/**
+	 * Get a cache key for the current page based on the url and possible other factors.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7
+	 */
+	protected function getCacheKey()
+	{
+		static $key;
+
+		if (!$key)
+		{
+			JPluginHelper::importPlugin('pagecache');
+
+			$parts = JEventDispatcher::getInstance()->trigger('onPageCacheGetKey');
+			$parts[] = JUri::getInstance()->toString();
+
+			$key = md5(serialize($parts));
+		}
+
+		return $key;
+	}
+
+	/**
+	 * Converting the site URL to fit to the HTTP request.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function onAfterInitialise()
+	{
+		$app  = $this->app;
+		$user = JFactory::getUser();
+
+		if ($app->isClient('administrator'))
+		{
+			return;
+		}
+
+		if (count($app->getMessageQueue()))
+		{
+			return;
+		}
+
+		// If any pagecache plugins return false for onPageCacheSetCaching, do not use the cache.
+		JPluginHelper::importPlugin('pagecache');
+
+		$results = JEventDispatcher::getInstance()->trigger('onPageCacheSetCaching');
+		$caching = !in_array(false, $results, true);
+
+		if ($caching && $user->get('guest') && $app->input->getMethod() == 'GET')
+		{
+			$this->_cache->setCaching(true);
+		}
+
+		$data = $this->_cache->get($this->getCacheKey());
+
+		if ($data !== false)
+		{
+			// Set cached body.
+			$app->setBody($data);
+
+			echo $app->toString();
+
+			if (JDEBUG)
+			{
+				JProfiler::getInstance('Application')->mark('afterCache');
+			}
+
+			$app->close();
+		}
+	}
+
+	/**
+	 * After render.
+	 *
+	 * @return   void
+	 *
+	 * @since   1.5
+	 */
+	public function onAfterRespond()
+	{
+		$app = $this->app;
+
+		if ($app->isClient('administrator'))
+		{
+			return;
+		}
+
+		if (count($app->getMessageQueue()))
+		{
+			return;
+		}
+
+		$user = JFactory::getUser();
+
+		if ($user->get('guest') && !$this->isExcluded())
+		{
+			// We need to check again here, because auto-login plugins have not been fired before the first aid check.
+			$this->_cache->store(null, $this->getCacheKey());
+		}
+	}
+
+	/**
+	 * Check if the page is excluded from the cache or not.
+	 *
+	 * @return   boolean  True if the page is excluded else false
+	 *
+	 * @since    3.5
+	 */
+	protected function isExcluded()
+	{
+		// Check if menu items have been excluded
+		if ($exclusions = $this->params->get('exclude_menu_items', array()))
+		{
+			// Get the current menu item
+			$active = $this->app->getMenu()->getActive();
+
+			if ($active && $active->id && in_array((int) $active->id, (array) $exclusions))
+			{
+				return true;
+			}
+		}
+
+		// Check if regular expressions are being used
+		if ($exclusions = $this->params->get('exclude', ''))
+		{
+			// Normalize line endings
+			$exclusions = str_replace(array("\r\n", "\r"), "\n", $exclusions);
+
+			// Split them
+			$exclusions = explode("\n", $exclusions);
+
+			// Get current path to match against
+			$path = JUri::getInstance()->toString(array('path', 'query', 'fragment'));
+
+			// Loop through each pattern
+			if ($exclusions)
+			{
+				foreach ($exclusions as $exclusion)
+				{
+					// Make sure the exclusion has some content
+					if ($exclusion !== '')
+					{
+						if (preg_match('/' . $exclusion . '/is', $path, $match))
+						{
+							return true;
+						}
+					}
+				}
+			}
+		}
+
+		// If any pagecache plugins return true for onPageCacheIsExcluded, exclude.
+		JPluginHelper::importPlugin('pagecache');
+
+		$results = JEventDispatcher::getInstance()->trigger('onPageCacheIsExcluded');
+
+		if (in_array(true, $results, true))
+		{
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/core/plugins/system/cache/cache.xml b/core/plugins/system/cache/cache.xml
new file mode 100644
index 00000000..5ffe5bf8
--- /dev/null
+++ b/core/plugins/system/cache/cache.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_cache</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2007</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_CACHE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="cache">cache.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_cache.ini</language>
+		<language tag="en-GB">en-GB.plg_system_cache.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="browsercache"
+					type="radio"
+					label="PLG_CACHE_FIELD_BROWSERCACHE_LABEL"
+					description="PLG_CACHE_FIELD_BROWSERCACHE_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="exclude_menu_items"
+					type="menuitem"
+					label="PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_LABEL"
+					description="PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_DESC"
+					multiple="multiple"
+					filter="int_array"
+				/>
+
+			</fieldset>
+			<fieldset name="advanced">
+				<field
+					name="exclude"
+					type="textarea"
+					label="PLG_CACHE_FIELD_EXCLUDE_LABEL"
+					description="PLG_CACHE_FIELD_EXCLUDE_DESC"
+					class="input-xxlarge"
+					rows="15"
+					filter="raw"
+				/>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/debug/debug.php b/core/plugins/system/debug/debug.php
new file mode 100644
index 00000000..e1989e94
--- /dev/null
+++ b/core/plugins/system/debug/debug.php
@@ -0,0 +1,2066 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.Debug
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Joomla! Debug plugin.
+ *
+ * @since  1.5
+ */
+class PlgSystemDebug extends JPlugin
+{
+	/**
+	 * xdebug.file_link_format from the php.ini.
+	 *
+	 * @var    string
+	 * @since  1.7
+	 */
+	protected $linkFormat = '';
+
+	/**
+	 * True if debug lang is on.
+	 *
+	 * @var    boolean
+	 * @since  3.0
+	 */
+	private $debugLang = false;
+
+	/**
+	 * Holds log entries handled by the plugin.
+	 *
+	 * @var    array
+	 * @since  3.1
+	 */
+	private $logEntries = array();
+
+	/**
+	 * Holds SHOW PROFILES of queries.
+	 *
+	 * @var    array
+	 * @since  3.1.2
+	 */
+	private $sqlShowProfiles = array();
+
+	/**
+	 * Holds all SHOW PROFILE FOR QUERY n, indexed by n-1.
+	 *
+	 * @var    array
+	 * @since  3.1.2
+	 */
+	private $sqlShowProfileEach = array();
+
+	/**
+	 * Holds all EXPLAIN EXTENDED for all queries.
+	 *
+	 * @var    array
+	 * @since  3.1.2
+	 */
+	private $explains = array();
+
+	/**
+	 * Holds total amount of executed queries.
+	 *
+	 * @var    int
+	 * @since  3.2
+	 */
+	private $totalQueries = 0;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.3
+	 */
+	protected $app;
+
+	/**
+	 * Database object.
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.8.0
+	 */
+	protected $db;
+
+	/**
+	 * Container for callback functions to be triggered when rendering the console.
+	 *
+	 * @var    callable[]
+	 * @since  3.7.0
+	 */
+	private static $displayCallbacks = array();
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		// Log the deprecated API.
+		if ($this->params->get('log-deprecated', 0))
+		{
+			JLog::addLogger(array('text_file' => 'deprecated.php'), JLog::ALL, array('deprecated'));
+		}
+
+		// Log everything (except deprecated APIs, these are logged separately with the option above).
+		if ($this->params->get('log-everything', 0))
+		{
+			JLog::addLogger(array('text_file' => 'everything.php'), JLog::ALL, array('deprecated', 'databasequery'), true);
+		}
+
+		// Get the application if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!$this->app)
+		{
+			$this->app = JFactory::getApplication();
+		}
+
+		// Get the db if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!$this->db)
+		{
+			$this->db = JFactory::getDbo();
+		}
+
+		$this->debugLang = $this->app->get('debug_lang');
+
+		// Skip the plugin if debug is off
+		if ($this->debugLang == '0' && $this->app->get('debug') == '0')
+		{
+			return;
+		}
+
+		// Only if debugging or language debug is enabled.
+		if (JDEBUG || $this->debugLang)
+		{
+			JFactory::getConfig()->set('gzip', 0);
+			ob_start();
+			ob_implicit_flush(false);
+		}
+
+		$this->linkFormat = ini_get('xdebug.file_link_format');
+
+		if ($this->params->get('logs', 1))
+		{
+			$priority = 0;
+
+			foreach ($this->params->get('log_priorities', array()) as $p)
+			{
+				$const = 'JLog::' . strtoupper($p);
+
+				if (!defined($const))
+				{
+					continue;
+				}
+
+				$priority |= constant($const);
+			}
+
+			// Split into an array at any character other than alphabet, numbers, _, ., or -
+			$categories = array_filter(preg_split('/[^A-Z0-9_\.-]/i', $this->params->get('log_categories', '')));
+			$mode       = $this->params->get('log_category_mode', 0);
+
+			JLog::addLogger(array('logger' => 'callback', 'callback' => array($this, 'logger')), $priority, $categories, $mode);
+		}
+
+		// Prepare disconnect handler for SQL profiling.
+		$db = $this->db;
+		$db->addDisconnectHandler(array($this, 'mysqlDisconnectHandler'));
+
+		// Log deprecated class aliases
+		foreach (JLoader::getDeprecatedAliases() as $deprecation)
+		{
+			JLog::add(
+				sprintf(
+					'%1$s has been aliased to %2$s and the former class name is deprecated. The alias will be removed in %3$s.',
+					$deprecation['old'],
+					$deprecation['new'],
+					$deprecation['version']
+				),
+				JLog::WARNING,
+				'deprecated'
+			);
+		}
+	}
+
+	/**
+	 * Add the CSS for debug.
+	 * We can't do this in the constructor because stuff breaks.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onAfterDispatch()
+	{
+		// Only if debugging or language debug is enabled.
+		if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug())
+		{
+			JHtml::_('stylesheet', 'cms/debug.css', array('version' => 'auto', 'relative' => true));
+		}
+
+		// Disable asset media version if needed.
+		if (JDEBUG && (int) $this->params->get('refresh_assets', 1) === 0)
+		{
+			$this->app->getDocument()->setMediaVersion(null);
+		}
+
+		// Only if debugging is enabled for SQL query popovers.
+		if (JDEBUG && $this->isAuthorisedDisplayDebug())
+		{
+			JHtml::_('bootstrap.tooltip');
+			JHtml::_('bootstrap.popover', '.hasPopover', array('placement' => 'top'));
+		}
+	}
+
+	/**
+	 * Show the debug info.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onAfterRespond()
+	{
+		// Do not render if debugging or language debug is not enabled.
+		if (!JDEBUG && !$this->debugLang)
+		{
+			return;
+		}
+
+		// User has to be authorised to see the debug information.
+		if (!$this->isAuthorisedDisplayDebug())
+		{
+			return;
+		}
+
+		// Only render for HTML output.
+		if (JFactory::getDocument()->getType() !== 'html')
+		{
+			return;
+		}
+
+		// Capture output.
+		$contents = ob_get_contents();
+
+		if ($contents)
+		{
+			ob_end_clean();
+		}
+
+		// No debug for Safari and Chrome redirection.
+		if (strpos($contents, '<html><head><meta http-equiv="refresh" content="0;') === 0
+			&& strpos(strtolower(isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : ''), 'webkit') !== false)
+		{
+			echo $contents;
+
+			return;
+		}
+
+		// Load language.
+		$this->loadLanguage();
+
+		$html = array();
+
+		// Some "mousewheel protecting" JS.
+		$html[] = "<script>function toggleContainer(name)
+		{
+			var e = document.getElementById(name);// MooTools might not be available ;)
+			e.style.display = e.style.display === 'none' ? 'block' : 'none';
+		}</script>";
+
+		$html[] = '<div id="system-debug" class="profiler">';
+
+		$html[] = '<h2>' . JText::_('PLG_DEBUG_TITLE') . '</h2>';
+
+		if (JDEBUG)
+		{
+			if (JError::getErrors())
+			{
+				$html[] = $this->display('errors');
+			}
+
+			if ($this->params->get('session', 1))
+			{
+				$html[] = $this->display('session');
+			}
+
+			if ($this->params->get('profile', 1))
+			{
+				$html[] = $this->display('profile_information');
+			}
+
+			if ($this->params->get('memory', 1))
+			{
+				$html[] = $this->display('memory_usage');
+			}
+
+			if ($this->params->get('queries', 1))
+			{
+				$html[] = $this->display('queries');
+			}
+
+			if (!empty($this->logEntries) && $this->params->get('logs', 1))
+			{
+				$html[] = $this->display('logs');
+			}
+		}
+
+		if ($this->debugLang)
+		{
+			if ($this->params->get('language_errorfiles', 1))
+			{
+				$languageErrors = JFactory::getLanguage()->getErrorFiles();
+				$html[]         = $this->display('language_files_in_error', $languageErrors);
+			}
+
+			if ($this->params->get('language_files', 1))
+			{
+				$html[] = $this->display('language_files_loaded');
+			}
+
+			if ($this->params->get('language_strings', 1))
+			{
+				$html[] = $this->display('untranslated_strings');
+			}
+		}
+
+		foreach (self::$displayCallbacks as $name => $callable)
+		{
+			$html[] = $this->displayCallback($name, $callable);
+		}
+
+		$html[] = '</div>';
+
+		echo str_replace('</body>', implode('', $html) . '</body>', $contents);
+	}
+
+	/**
+	 * Add a display callback to be rendered with the debug console.
+	 *
+	 * @param   string    $name      The name of the callable, this is used to generate the section title.
+	 * @param   callable  $callable  The callback function to be added.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 * @throws  InvalidArgumentException
+	 */
+	public static function addDisplayCallback($name, $callable)
+	{
+		// TODO - When PHP 5.4 is the minimum the parameter should be typehinted "callable" and this check removed
+		if (!is_callable($callable))
+		{
+			throw new InvalidArgumentException('A valid callback function must be given.');
+		}
+
+		self::$displayCallbacks[$name] = $callable;
+
+		return true;
+	}
+
+	/**
+	 * Remove a registered display callback
+	 *
+	 * @param   string  $name  The name of the callable.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public static function removeDisplayCallback($name)
+	{
+		unset(self::$displayCallbacks[$name]);
+
+		return true;
+	}
+
+	/**
+	 * Method to check if the current user is allowed to see the debug information or not.
+	 *
+	 * @return  boolean  True if access is allowed.
+	 *
+	 * @since   3.0
+	 */
+	private function isAuthorisedDisplayDebug()
+	{
+		static $result = null;
+
+		if ($result !== null)
+		{
+			return $result;
+		}
+
+		// If the user is not allowed to view the output then end here.
+		$filterGroups = (array) $this->params->get('filter_groups', array());
+
+		if (!empty($filterGroups))
+		{
+			$userGroups = JFactory::getUser()->get('groups');
+
+			if (!array_intersect($filterGroups, $userGroups))
+			{
+				$result = false;
+
+				return false;
+			}
+		}
+
+		$result = true;
+
+		return true;
+	}
+
+	/**
+	 * General display method.
+	 *
+	 * @param   string  $item    The item to display.
+	 * @param   array   $errors  Errors occurred during execution.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function display($item, array $errors = array())
+	{
+		$title = JText::_('PLG_DEBUG_' . strtoupper($item));
+
+		$status = '';
+
+		if (count($errors))
+		{
+			$status = ' dbg-error';
+		}
+
+		$fncName = 'display' . ucfirst(str_replace('_', '', $item));
+
+		if (!method_exists($this, $fncName))
+		{
+			return __METHOD__ . ' -- Unknown method: ' . $fncName . '<br />';
+		}
+
+		$html = array();
+
+		$js = "toggleContainer('dbg_container_" . $item . "');";
+
+		$class = 'dbg-header' . $status;
+
+		$html[] = '<div class="' . $class . '" onclick="' . $js . '"><a href="javascript:void(0);"><h3>' . $title . '</h3></a></div>';
+
+		// @todo set with js.. ?
+		$style = ' style="display: none;"';
+
+		$html[] = '<div ' . $style . ' class="dbg-container" id="dbg_container_' . $item . '">';
+		$html[] = $this->$fncName();
+		$html[] = '</div>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display method for callback functions.
+	 *
+	 * @param   string    $name      The name of the callable.
+	 * @param   callable  $callable  The callable function.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	protected function displayCallback($name, $callable)
+	{
+		$title = JText::_('PLG_DEBUG_' . strtoupper($name));
+
+		$html = array();
+
+		$js = "toggleContainer('dbg_container_" . $name . "');";
+
+		$class = 'dbg-header';
+
+		$html[] = '<div class="' . $class . '" onclick="' . $js . '"><a href="javascript:void(0);"><h3>' . $title . '</h3></a></div>';
+
+		// @todo set with js.. ?
+		$style = ' style="display: none;"';
+
+		$html[] = '<div ' . $style . ' class="dbg-container" id="dbg_container_' . $name . '">';
+		$html[] = call_user_func($callable);
+		$html[] = '</div>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display session information.
+	 *
+	 * Called recursively.
+	 *
+	 * @param   string   $key      A session key.
+	 * @param   mixed    $session  The session array, initially null.
+	 * @param   integer  $id       Used to identify the DIV for the JavaScript toggling code.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displaySession($key = '', $session = null, $id = 0)
+	{
+		if (!$session)
+		{
+			$session = JFactory::getSession()->getData();
+		}
+
+		$html = array();
+		static $id;
+
+		if (!is_array($session))
+		{
+			$html[] = $key . '<pre>' . $this->prettyPrintJSON($session) . '</pre>' . PHP_EOL;
+		}
+		else
+		{
+			foreach ($session as $sKey => $entries)
+			{
+				$display = true;
+
+				if (is_array($entries) && $entries)
+				{
+					$display = false;
+				}
+
+				if (is_object($entries))
+				{
+					$o = ArrayHelper::fromObject($entries);
+
+					if ($o)
+					{
+						$entries = $o;
+						$display = false;
+					}
+				}
+
+				if (!$display)
+				{
+					$js = "toggleContainer('dbg_container_session" . $id . '_' . $sKey . "');";
+
+					$html[] = '<div class="dbg-header" onclick="' . $js . '"><a href="javascript:void(0);"><h3>' . $sKey . '</h3></a></div>';
+
+					// @todo set with js.. ?
+					$style = ' style="display: none;"';
+
+					$html[] = '<div ' . $style . ' class="dbg-container" id="dbg_container_session' . $id . '_' . $sKey . '">';
+					$id++;
+
+					// Recurse...
+					$this->displaySession($sKey, $entries, $id);
+
+					$html[] = '</div>';
+
+					continue;
+				}
+
+				if (is_array($entries))
+				{
+					$entries = implode($entries);
+				}
+
+				if (is_string($entries))
+				{
+					$html[] = $sKey . '<pre>' . $this->prettyPrintJSON($entries) . '</pre>' . PHP_EOL;
+				}
+			}
+		}
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display errors.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayErrors()
+	{
+		$html = array();
+
+		$html[] = '<ol>';
+
+		while ($error = JError::getError(true))
+		{
+			$col = (E_WARNING == $error->get('level')) ? 'red' : 'orange';
+
+			$html[] = '<li>';
+			$html[] = '<b style="color: ' . $col . '">' . $error->getMessage() . '</b><br />';
+
+			$info = $error->get('info');
+
+			if ($info)
+			{
+				$html[] = '<pre>' . print_r($info, true) . '</pre><br />';
+			}
+
+			$html[] = $this->renderBacktrace($error);
+			$html[] = '</li>';
+		}
+
+		$html[] = '</ol>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display profile information.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayProfileInformation()
+	{
+		$html = array();
+
+		$htmlMarks = array();
+
+		$totalTime = 0;
+		$totalMem  = 0;
+		$marks     = array();
+
+		foreach (JProfiler::getInstance('Application')->getMarks() as $mark)
+		{
+			$totalTime += $mark->time;
+			$totalMem  += (float) $mark->memory;
+			$htmlMark  = sprintf(
+				JText::_('PLG_DEBUG_TIME') . ': <span class="label label-time">%.2f&nbsp;ms</span> / <span class="label label-default">%.2f&nbsp;ms</span>'
+				. ' ' . JText::_('PLG_DEBUG_MEMORY') . ': <span class="label label-memory">%0.3f MB</span> / <span class="label label-default">%0.2f MB</span>'
+				. ' %s: %s',
+				$mark->time,
+				$mark->totalTime,
+				$mark->memory,
+				$mark->totalMemory,
+				$mark->prefix,
+				$mark->label
+			);
+
+			$marks[] = (object) array(
+				'time'   => $mark->time,
+				'memory' => $mark->memory,
+				'html'   => $htmlMark,
+				'tip'    => $mark->label,
+			);
+		}
+
+		$avgTime = $totalTime / count($marks);
+		$avgMem  = $totalMem / count($marks);
+
+		foreach ($marks as $mark)
+		{
+			if ($mark->time > $avgTime * 1.5)
+			{
+				$barClass   = 'bar-danger';
+				$labelClass = 'label-important label-danger';
+			}
+			elseif ($mark->time < $avgTime / 1.5)
+			{
+				$barClass   = 'bar-success';
+				$labelClass = 'label-success';
+			}
+			else
+			{
+				$barClass   = 'bar-warning';
+				$labelClass = 'label-warning';
+			}
+
+			if ($mark->memory > $avgMem * 1.5)
+			{
+				$barClassMem   = 'bar-danger';
+				$labelClassMem = 'label-important label-danger';
+			}
+			elseif ($mark->memory < $avgMem / 1.5)
+			{
+				$barClassMem   = 'bar-success';
+				$labelClassMem = 'label-success';
+			}
+			else
+			{
+				$barClassMem   = 'bar-warning';
+				$labelClassMem = 'label-warning';
+			}
+
+			$barClass    .= " progress-$barClass";
+			$barClassMem .= " progress-$barClassMem";
+
+			$bars[] = (object) array(
+				'width' => round($mark->time / ($totalTime / 100), 4),
+				'class' => $barClass,
+				'tip'   => $mark->tip . ' ' . round($mark->time, 2) . ' ms',
+			);
+
+			$barsMem[] = (object) array(
+				'width' => round((float) $mark->memory / ($totalMem / 100), 4),
+				'class' => $barClassMem,
+				'tip'   => $mark->tip . ' ' . round($mark->memory, 3) . '  MB',
+			);
+
+			$htmlMarks[] = '<div>' . str_replace('label-time', $labelClass, str_replace('label-memory', $labelClassMem, $mark->html)) . '</div>';
+		}
+
+		$html[] = '<h4>' . JText::_('PLG_DEBUG_TIME') . '</h4>';
+		$html[] = $this->renderBars($bars, 'profile');
+		$html[] = '<h4>' . JText::_('PLG_DEBUG_MEMORY') . '</h4>';
+		$html[] = $this->renderBars($barsMem, 'profile');
+
+		$html[] = '<div class="dbg-profile-list">' . implode('', $htmlMarks) . '</div>';
+
+		$db = $this->db;
+
+		//  fix  for support custom shutdown function via register_shutdown_function().
+		$db->disconnect();
+
+		$log = $db->getLog();
+
+		if ($log)
+		{
+			$timings = $db->getTimings();
+
+			if ($timings)
+			{
+				$totalQueryTime = 0.0;
+				$lastStart      = null;
+
+				foreach ($timings as $k => $v)
+				{
+					if (!($k % 2))
+					{
+						$lastStart = $v;
+					}
+					else
+					{
+						$totalQueryTime += $v - $lastStart;
+					}
+				}
+
+				$totalQueryTime *= 1000;
+
+				if ($totalQueryTime > ($totalTime * 0.25))
+				{
+					$labelClass = 'label-important';
+				}
+				elseif ($totalQueryTime < ($totalTime * 0.15))
+				{
+					$labelClass = 'label-success';
+				}
+				else
+				{
+					$labelClass = 'label-warning';
+				}
+
+				$html[] = '<br /><div>' . JText::sprintf(
+						'PLG_DEBUG_QUERIES_TIME',
+						sprintf('<span class="label ' . $labelClass . '">%.2f&nbsp;ms</span>', $totalQueryTime)
+					) . '</div>';
+
+				if ($this->params->get('log-executed-sql', 0))
+				{
+					$this->writeToFile();
+				}
+			}
+		}
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display memory usage.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayMemoryUsage()
+	{
+		$bytes = memory_get_usage();
+
+		return '<span class="label label-default">' . JHtml::_('number.bytes', $bytes) . '</span>'
+			. ' (<span class="label label-default">'
+			. number_format($bytes, 0, JText::_('DECIMALS_SEPARATOR'), JText::_('THOUSANDS_SEPARATOR'))
+			. ' '
+			. JText::_('PLG_DEBUG_BYTES')
+			. '</span>)';
+	}
+
+	/**
+	 * Display logged queries.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayQueries()
+	{
+		$db  = $this->db;
+		$log = $db->getLog();
+
+		if (!$log)
+		{
+			return null;
+		}
+
+		$timings    = $db->getTimings();
+		$callStacks = $db->getCallStacks();
+
+		$db->setDebug(false);
+
+		$selectQueryTypeTicker = array();
+		$otherQueryTypeTicker  = array();
+
+		$timing  = array();
+		$maxtime = 0;
+
+		if (isset($timings[0]))
+		{
+			$startTime         = $timings[0];
+			$endTime           = $timings[count($timings) - 1];
+			$totalBargraphTime = $endTime - $startTime;
+
+			if ($totalBargraphTime > 0)
+			{
+				foreach ($log as $id => $query)
+				{
+					if (isset($timings[$id * 2 + 1]))
+					{
+						// Compute the query time: $timing[$k] = array( queryTime, timeBetweenQueries ).
+						$timing[$id] = array(
+							($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000,
+							$id > 0 ? ($timings[$id * 2] - $timings[$id * 2 - 1]) * 1000 : 0,
+						);
+						$maxtime     = max($maxtime, $timing[$id]['0']);
+					}
+				}
+			}
+		}
+		else
+		{
+			$startTime         = null;
+			$totalBargraphTime = 1;
+		}
+
+		$bars           = array();
+		$info           = array();
+		$totalQueryTime = 0;
+		$duplicates     = array();
+
+		foreach ($log as $id => $query)
+		{
+			$did = md5($query);
+
+			if (!isset($duplicates[$did]))
+			{
+				$duplicates[$did] = array();
+			}
+
+			$duplicates[$did][] = $id;
+
+			if ($timings && isset($timings[$id * 2 + 1]))
+			{
+				// Compute the query time.
+				$queryTime      = ($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000;
+				$totalQueryTime += $queryTime;
+
+				// Run an EXPLAIN EXTENDED query on the SQL query if possible.
+				$hasWarnings          = false;
+				$hasWarningsInProfile = false;
+
+				if (isset($this->explains[$id]))
+				{
+					$explain = $this->tableToHtml($this->explains[$id], $hasWarnings);
+				}
+				else
+				{
+					$explain = JText::sprintf('PLG_DEBUG_QUERY_EXPLAIN_NOT_POSSIBLE', htmlspecialchars($query));
+				}
+
+				// Run a SHOW PROFILE query.
+				$profile = '';
+
+				if (isset($this->sqlShowProfileEach[$id]) && $db->getServerType() === 'mysql')
+				{
+					$profileTable = $this->sqlShowProfileEach[$id];
+					$profile      = $this->tableToHtml($profileTable, $hasWarningsInProfile);
+				}
+
+				// How heavy should the string length count: 0 - 1.
+				$ratio     = 0.5;
+				$timeScore = $queryTime / ((strlen($query) + 1) * $ratio) * 200;
+
+				// Determine color of bargraph depending on query speed and presence of warnings in EXPLAIN.
+				if ($timeScore > 10)
+				{
+					$barClass   = 'bar-danger';
+					$labelClass = 'label-important';
+				}
+				elseif ($hasWarnings || $timeScore > 5)
+				{
+					$barClass   = 'bar-warning';
+					$labelClass = 'label-warning';
+				}
+				else
+				{
+					$barClass   = 'bar-success';
+					$labelClass = 'label-success';
+				}
+
+				// Computes bargraph as follows: Position begin and end of the bar relatively to whole execution time.
+				// TODO: $prevBar is not used anywhere. Remove?
+				$prevBar = $id && isset($bars[$id - 1]) ? $bars[$id - 1] : 0;
+
+				$barPre   = round($timing[$id][1] / ($totalBargraphTime * 10), 4);
+				$barWidth = round($timing[$id][0] / ($totalBargraphTime * 10), 4);
+				$minWidth = 0.3;
+
+				if ($barWidth < $minWidth)
+				{
+					$barPre -= ($minWidth - $barWidth);
+
+					if ($barPre < 0)
+					{
+						$minWidth += $barPre;
+						$barPre   = 0;
+					}
+
+					$barWidth = $minWidth;
+				}
+
+				$bars[$id] = (object) array(
+					'class' => $barClass,
+					'width' => $barWidth,
+					'pre'   => $barPre,
+					'tip'   => sprintf('%.2f&nbsp;ms', $queryTime),
+				);
+				$info[$id] = (object) array(
+					'class'       => $labelClass,
+					'explain'     => $explain,
+					'profile'     => $profile,
+					'hasWarnings' => $hasWarnings,
+				);
+			}
+		}
+
+		// Remove single queries from $duplicates.
+		$total_duplicates = 0;
+
+		foreach ($duplicates as $did => $dups)
+		{
+			if (count($dups) < 2)
+			{
+				unset($duplicates[$did]);
+			}
+			else
+			{
+				$total_duplicates += count($dups);
+			}
+		}
+
+		// Fix first bar width.
+		$minWidth = 0.3;
+
+		if ($bars[0]->width < $minWidth && isset($bars[1]))
+		{
+			$bars[1]->pre -= ($minWidth - $bars[0]->width);
+
+			if ($bars[1]->pre < 0)
+			{
+				$minWidth     += $bars[1]->pre;
+				$bars[1]->pre = 0;
+			}
+
+			$bars[0]->width = $minWidth;
+		}
+
+		$memoryUsageNow = memory_get_usage();
+		$list           = array();
+
+		foreach ($log as $id => $query)
+		{
+			// Start query type ticker additions.
+			$fromStart  = stripos($query, 'from');
+			$whereStart = stripos($query, 'where', $fromStart);
+
+			if ($whereStart === false)
+			{
+				$whereStart = stripos($query, 'order by', $fromStart);
+			}
+
+			if ($whereStart === false)
+			{
+				$whereStart = strlen($query) - 1;
+			}
+
+			$fromString = substr($query, 0, $whereStart);
+			$fromString = str_replace(array("\t", "\n"), ' ', $fromString);
+			$fromString = trim($fromString);
+
+			// Initialise the select/other query type counts the first time.
+			if (!isset($selectQueryTypeTicker[$fromString]))
+			{
+				$selectQueryTypeTicker[$fromString] = 0;
+			}
+
+			if (!isset($otherQueryTypeTicker[$fromString]))
+			{
+				$otherQueryTypeTicker[$fromString] = 0;
+			}
+
+			// Increment the count.
+			if (stripos($query, 'select') === 0)
+			{
+				$selectQueryTypeTicker[$fromString]++;
+				unset($otherQueryTypeTicker[$fromString]);
+			}
+			else
+			{
+				$otherQueryTypeTicker[$fromString]++;
+				unset($selectQueryTypeTicker[$fromString]);
+			}
+
+			$text = $this->highlightQuery($query);
+
+			if ($timings && isset($timings[$id * 2 + 1]))
+			{
+				// Compute the query time.
+				$queryTime = ($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000;
+
+				// Timing
+				// Formats the output for the query time with EXPLAIN query results as tooltip:
+				$htmlTiming = '<div style="margin: 0 0 5px;"><span class="dbg-query-time">';
+				$htmlTiming .= JText::sprintf(
+					'PLG_DEBUG_QUERY_TIME',
+					sprintf(
+						'<span class="label %s">%.2f&nbsp;ms</span>',
+						$info[$id]->class,
+						$timing[$id]['0']
+					)
+				);
+
+				if ($timing[$id]['1'])
+				{
+					$htmlTiming .= ' ' . JText::sprintf(
+							'PLG_DEBUG_QUERY_AFTER_LAST',
+							sprintf('<span class="label label-default">%.2f&nbsp;ms</span>', $timing[$id]['1'])
+						);
+				}
+
+				$htmlTiming .= '</span>';
+
+				if (isset($callStacks[$id][0]['memory']))
+				{
+					$memoryUsed        = $callStacks[$id][0]['memory'][1] - $callStacks[$id][0]['memory'][0];
+					$memoryBeforeQuery = $callStacks[$id][0]['memory'][0];
+
+					// Determine colour of query memory usage.
+					if ($memoryUsed > 0.1 * $memoryUsageNow)
+					{
+						$labelClass = 'label-important';
+					}
+					elseif ($memoryUsed > 0.05 * $memoryUsageNow)
+					{
+						$labelClass = 'label-warning';
+					}
+					else
+					{
+						$labelClass = 'label-success';
+					}
+
+					$htmlTiming .= ' ' . '<span class="dbg-query-memory">'
+						. JText::sprintf(
+							'PLG_DEBUG_MEMORY_USED_FOR_QUERY',
+							sprintf('<span class="label ' . $labelClass . '">%.3f&nbsp;MB</span>', $memoryUsed / 1048576),
+							sprintf('<span class="label label-default">%.3f&nbsp;MB</span>', $memoryBeforeQuery / 1048576)
+						)
+						. '</span>';
+
+					if ($callStacks[$id][0]['memory'][2] !== null)
+					{
+						// Determine colour of number or results.
+						$resultsReturned = $callStacks[$id][0]['memory'][2];
+
+						if ($resultsReturned > 3000)
+						{
+							$labelClass = 'label-important';
+						}
+						elseif ($resultsReturned > 1000)
+						{
+							$labelClass = 'label-warning';
+						}
+						elseif ($resultsReturned == 0)
+						{
+							$labelClass = '';
+						}
+						else
+						{
+							$labelClass = 'label-success';
+						}
+
+						$htmlResultsReturned = '<span class="label ' . $labelClass . '">' . (int) $resultsReturned . '</span>';
+						$htmlTiming          .= ' <span class="dbg-query-rowsnumber">'
+							. JText::sprintf('PLG_DEBUG_ROWS_RETURNED_BY_QUERY', $htmlResultsReturned) . '</span>';
+					}
+				}
+
+				$htmlTiming .= '</div>';
+
+				// Bar.
+				$htmlBar = $this->renderBars($bars, 'query', $id);
+
+				// Profile query.
+				$title = JText::_('PLG_DEBUG_PROFILE');
+
+				if (!$info[$id]->profile)
+				{
+					$title = '<span class="dbg-noprofile">' . $title . '</span>';
+				}
+
+				$htmlProfile = $info[$id]->profile ?: JText::_('PLG_DEBUG_NO_PROFILE');
+
+				$htmlAccordions = JHtml::_(
+					'bootstrap.startAccordion', 'dbg_query_' . $id, array(
+						'active' => $info[$id]->hasWarnings ? ('dbg_query_explain_' . $id) : '',
+					)
+				);
+
+				$htmlAccordions .= JHtml::_('bootstrap.addSlide', 'dbg_query_' . $id, JText::_('PLG_DEBUG_EXPLAIN'), 'dbg_query_explain_' . $id)
+					. $info[$id]->explain
+					. JHtml::_('bootstrap.endSlide');
+
+				$htmlAccordions .= JHtml::_('bootstrap.addSlide', 'dbg_query_' . $id, $title, 'dbg_query_profile_' . $id)
+					. $htmlProfile
+					. JHtml::_('bootstrap.endSlide');
+
+				// Call stack and back trace.
+				if (isset($callStacks[$id]))
+				{
+					$htmlAccordions .= JHtml::_('bootstrap.addSlide', 'dbg_query_' . $id, JText::_('PLG_DEBUG_CALL_STACK'), 'dbg_query_callstack_' . $id)
+						. $this->renderCallStack($callStacks[$id])
+						. JHtml::_('bootstrap.endSlide');
+				}
+
+				$htmlAccordions .= JHtml::_('bootstrap.endAccordion');
+
+				$did = md5($query);
+
+				if (isset($duplicates[$did]))
+				{
+					$dups = array();
+
+					foreach ($duplicates[$did] as $dup)
+					{
+						if ($dup != $id)
+						{
+							$dups[] = '<a class="alert-link" href="#dbg-query-' . ($dup + 1) . '">#' . ($dup + 1) . '</a>';
+						}
+					}
+
+					$htmlQuery = '<div class="alert alert-error">' . JText::_('PLG_DEBUG_QUERY_DUPLICATES') . ': ' . implode('&nbsp; ', $dups) . '</div>'
+						. '<pre class="alert hasTooltip" title="' . JHtml::_('tooltipText', 'PLG_DEBUG_QUERY_DUPLICATES_FOUND') . '">' . $text . '</pre>';
+				}
+				else
+				{
+					$htmlQuery = '<pre>' . $text . '</pre>';
+				}
+
+				$list[] = '<a name="dbg-query-' . ($id + 1) . '"></a>'
+					. $htmlTiming
+					. $htmlBar
+					. $htmlQuery
+					. $htmlAccordions;
+			}
+			else
+			{
+				$list[] = '<pre>' . $text . '</pre>';
+			}
+		}
+
+		$totalTime = 0;
+
+		foreach (JProfiler::getInstance('Application')->getMarks() as $mark)
+		{
+			$totalTime += $mark->time;
+		}
+
+		if ($totalQueryTime > ($totalTime * 0.25))
+		{
+			$labelClass = 'label-important';
+		}
+		elseif ($totalQueryTime < ($totalTime * 0.15))
+		{
+			$labelClass = 'label-success';
+		}
+		else
+		{
+			$labelClass = 'label-warning';
+		}
+
+		if ($this->totalQueries === 0)
+		{
+			$this->totalQueries = $db->getCount();
+		}
+
+		$html = array();
+
+		$html[] = '<h4>' . JText::sprintf('PLG_DEBUG_QUERIES_LOGGED', $this->totalQueries)
+			. sprintf(' <span class="label ' . $labelClass . '">%.2f&nbsp;ms</span>', $totalQueryTime) . '</h4><br />';
+
+		if ($total_duplicates)
+		{
+			$html[] = '<div class="alert alert-error">'
+				. '<h4>' . JText::sprintf('PLG_DEBUG_QUERY_DUPLICATES_TOTAL_NUMBER', $total_duplicates) . '</h4>';
+
+			foreach ($duplicates as $dups)
+			{
+				$links = array();
+
+				foreach ($dups as $dup)
+				{
+					$links[] = '<a class="alert-link" href="#dbg-query-' . ($dup + 1) . '">#' . ($dup + 1) . '</a>';
+				}
+
+				$html[] = '<div>' . JText::sprintf('PLG_DEBUG_QUERY_DUPLICATES_NUMBER', count($links)) . ': ' . implode('&nbsp; ', $links) . '</div>';
+			}
+
+			$html[] = '</div>';
+		}
+
+		$html[] = '<ol><li>' . implode('<hr /></li><li>', $list) . '<hr /></li></ol>';
+
+		if (!$this->params->get('query_types', 1))
+		{
+			return implode('', $html);
+		}
+
+		// Get the totals for the query types.
+		$totalSelectQueryTypes = count($selectQueryTypeTicker);
+		$totalOtherQueryTypes  = count($otherQueryTypeTicker);
+		$totalQueryTypes       = $totalSelectQueryTypes + $totalOtherQueryTypes;
+
+		$html[] = '<h4>' . JText::sprintf('PLG_DEBUG_QUERY_TYPES_LOGGED', $totalQueryTypes) . '</h4>';
+
+		if ($totalSelectQueryTypes)
+		{
+			$html[] = '<h5>' . JText::_('PLG_DEBUG_SELECT_QUERIES') . '</h5>';
+
+			arsort($selectQueryTypeTicker);
+
+			$list = array();
+
+			foreach ($selectQueryTypeTicker as $query => $occurrences)
+			{
+				$list[] = '<pre>'
+					. JText::sprintf('PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES', $this->highlightQuery($query), $occurrences)
+					. '</pre>';
+			}
+
+			$html[] = '<ol><li>' . implode('</li><li>', $list) . '</li></ol>';
+		}
+
+		if ($totalOtherQueryTypes)
+		{
+			$html[] = '<h5>' . JText::_('PLG_DEBUG_OTHER_QUERIES') . '</h5>';
+
+			arsort($otherQueryTypeTicker);
+
+			$list = array();
+
+			foreach ($otherQueryTypeTicker as $query => $occurrences)
+			{
+				$list[] = '<pre>'
+					. JText::sprintf('PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES', $this->highlightQuery($query), $occurrences)
+					. '</pre>';
+			}
+
+			$html[] = '<ol><li>' . implode('</li><li>', $list) . '</li></ol>';
+		}
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Render the bars.
+	 *
+	 * @param   array    &$bars  Array of bar data
+	 * @param   string   $class  Optional class for items
+	 * @param   integer  $id     Id if the bar to highlight
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1.2
+	 */
+	protected function renderBars(&$bars, $class = '', $id = null)
+	{
+		$html = array();
+
+		foreach ($bars as $i => $bar)
+		{
+			if (isset($bar->pre) && $bar->pre)
+			{
+				$html[] = '<div class="dbg-bar-spacer" style="width:' . $bar->pre . '%;"></div>';
+			}
+
+			$barClass = trim('bar dbg-bar progress-bar ' . (isset($bar->class) ? $bar->class : ''));
+
+			if ($id !== null && $i == $id)
+			{
+				$barClass .= ' dbg-bar-active';
+			}
+
+			$tip = '';
+
+			if (isset($bar->tip) && $bar->tip)
+			{
+				$barClass .= ' hasTooltip';
+				$tip      = JHtml::_('tooltipText', $bar->tip, '', 0);
+			}
+
+			$html[] = '<a class="bar dbg-bar ' . $barClass . '" title="' . $tip . '" style="width: '
+				. $bar->width . '%;" href="#dbg-' . $class . '-' . ($i + 1) . '"></a>';
+		}
+
+		return '<div class="progress dbg-bars dbg-bars-' . $class . '">' . implode('', $html) . '</div>';
+	}
+
+	/**
+	 * Render an HTML table based on a multi-dimensional array.
+	 *
+	 * @param   array    $table         An array of tabular data.
+	 * @param   boolean  &$hasWarnings  Changes value to true if warnings are displayed, otherwise untouched
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1.2
+	 */
+	protected function tableToHtml($table, &$hasWarnings)
+	{
+		if (!$table)
+		{
+			return null;
+		}
+
+		$html = array();
+
+		$html[] = '<table class="table table-striped dbg-query-table">';
+		$html[] = '<thead>';
+		$html[] = '<tr>';
+
+		foreach (array_keys($table[0]) as $k)
+		{
+			$html[] = '<th>' . htmlspecialchars($k) . '</th>';
+		}
+
+		$html[]    = '</tr>';
+		$html[]    = '</thead>';
+		$html[]    = '<tbody>';
+		$durations = array();
+
+		foreach ($table as $tr)
+		{
+			if (isset($tr['Duration']))
+			{
+				$durations[] = $tr['Duration'];
+			}
+		}
+
+		rsort($durations, SORT_NUMERIC);
+
+		foreach ($table as $tr)
+		{
+			$html[] = '<tr>';
+
+			foreach ($tr as $k => $td)
+			{
+				if ($td === null)
+				{
+					// Display null's as 'NULL'.
+					$td = 'NULL';
+				}
+
+				// Treat special columns.
+				if ($k === 'Duration')
+				{
+					if ($td >= 0.001 && ($td == $durations[0] || (isset($durations[1]) && $td == $durations[1])))
+					{
+						// Duration column with duration value of more than 1 ms and within 2 top duration in SQL engine: Highlight warning.
+						$html[]      = '<td class="dbg-warning">';
+						$hasWarnings = true;
+					}
+					else
+					{
+						$html[] = '<td>';
+					}
+
+					// Display duration in milliseconds with the unit instead of seconds.
+					$html[] = sprintf('%.2f&nbsp;ms', $td * 1000);
+				}
+				elseif ($k === 'Error')
+				{
+					// An error in the EXPLAIN query occurred, display it instead of the result (means original query had syntax error most probably).
+					$html[]      = '<td class="dbg-warning">' . htmlspecialchars($td);
+					$hasWarnings = true;
+				}
+				elseif ($k === 'key')
+				{
+					if ($td === 'NULL')
+					{
+						// Displays query parts which don't use a key with warning:
+						$html[]      = '<td><strong>' . '<span class="dbg-warning hasTooltip" title="'
+							. JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_NO_INDEX_DESC') . '">'
+							. JText::_('PLG_DEBUG_WARNING_NO_INDEX') . '</span>' . '</strong>';
+						$hasWarnings = true;
+					}
+					else
+					{
+						$html[] = '<td><strong>' . htmlspecialchars($td) . '</strong>';
+					}
+				}
+				elseif ($k === 'Extra')
+				{
+					$htmlTd = htmlspecialchars($td);
+
+					// Replace spaces with &nbsp; (non-breaking spaces) for less tall tables displayed.
+					$htmlTd = preg_replace('/([^;]) /', '\1&nbsp;', $htmlTd);
+
+					// Displays warnings for "Using filesort":
+					$htmlTdWithWarnings = str_replace(
+						'Using&nbsp;filesort',
+						'<span class="dbg-warning hasTooltip" title="'
+						. JHtml::_('tooltipText', 'PLG_DEBUG_WARNING_USING_FILESORT_DESC') . '">'
+						. JText::_('PLG_DEBUG_WARNING_USING_FILESORT') . '</span>',
+						$htmlTd
+					);
+
+					if ($htmlTdWithWarnings !== $htmlTd)
+					{
+						$hasWarnings = true;
+					}
+
+					$html[] = '<td>' . $htmlTdWithWarnings;
+				}
+				else
+				{
+					$html[] = '<td>' . htmlspecialchars($td);
+				}
+
+				$html[] = '</td>';
+			}
+
+			$html[] = '</tr>';
+		}
+
+		$html[] = '</tbody>';
+		$html[] = '</table>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Disconnect handler for database to collect profiling and explain information.
+	 *
+	 * @param   JDatabaseDriver  &$db  Database object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1.2
+	 */
+	public function mysqlDisconnectHandler(&$db)
+	{
+		$db->setDebug(false);
+
+		$this->totalQueries = $db->getCount();
+
+		$dbVersion5037 = $db->getServerType() === 'mysql' && version_compare($db->getVersion(), '5.0.37', '>=');
+
+		if ($dbVersion5037)
+		{
+			try
+			{
+				// Check if profiling is enabled.
+				$db->setQuery("SHOW VARIABLES LIKE 'have_profiling'");
+				$hasProfiling = $db->loadResult();
+
+				if ($hasProfiling)
+				{
+					// Run a SHOW PROFILE query.
+					$db->setQuery('SHOW PROFILES');
+					$this->sqlShowProfiles = $db->loadAssocList();
+
+					if ($this->sqlShowProfiles)
+					{
+						foreach ($this->sqlShowProfiles as $qn)
+						{
+							// Run SHOW PROFILE FOR QUERY for each query where a profile is available (max 100).
+							$db->setQuery('SHOW PROFILE FOR QUERY ' . (int) $qn['Query_ID']);
+							$this->sqlShowProfileEach[(int) ($qn['Query_ID'] - 1)] = $db->loadAssocList();
+						}
+					}
+				}
+				else
+				{
+					$this->sqlShowProfileEach[0] = array(array('Error' => 'MySql have_profiling = off'));
+				}
+			}
+			catch (Exception $e)
+			{
+				$this->sqlShowProfileEach[0] = array(array('Error' => $e->getMessage()));
+			}
+		}
+
+		if (in_array($db->getServerType(), array('mysql', 'postgresql'), true))
+		{
+			$log = $db->getLog();
+
+			foreach ($log as $k => $query)
+			{
+				$dbVersion56 = $db->getServerType() === 'mysql' && version_compare($db->getVersion(), '5.6', '>=');
+
+				if ((stripos($query, 'select') === 0) || ($dbVersion56 && ((stripos($query, 'delete') === 0) || (stripos($query, 'update') === 0))))
+				{
+					try
+					{
+						$db->setQuery('EXPLAIN ' . ($dbVersion56 ? 'EXTENDED ' : '') . $query);
+						$this->explains[$k] = $db->loadAssocList();
+					}
+					catch (Exception $e)
+					{
+						$this->explains[$k] = array(array('Error' => $e->getMessage()));
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Displays errors in language files.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayLanguageFilesInError()
+	{
+		$errorfiles = JFactory::getLanguage()->getErrorFiles();
+
+		if (!count($errorfiles))
+		{
+			return '<p>' . JText::_('JNONE') . '</p>';
+		}
+
+		$html = array();
+
+		$html[] = '<ul>';
+
+		foreach ($errorfiles as $file => $error)
+		{
+			$html[] = '<li>' . $this->formatLink($file) . str_replace($file, '', $error) . '</li>';
+		}
+
+		$html[] = '</ul>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display loaded language files.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayLanguageFilesLoaded()
+	{
+		$html = array();
+
+		$html[] = '<ul>';
+
+		foreach (JFactory::getLanguage()->getPaths() as /* $extension => */ $files)
+		{
+			foreach ($files as $file => $status)
+			{
+				$html[] = '<li>';
+
+				$html[] = $status
+					? JText::_('PLG_DEBUG_LANG_LOADED')
+					: JText::_('PLG_DEBUG_LANG_NOT_LOADED');
+
+				$html[] = ' : ';
+				$html[] = $this->formatLink($file);
+				$html[] = '</li>';
+			}
+		}
+
+		$html[] = '</ul>';
+
+		return implode('', $html);
+	}
+
+	/**
+	 * Display untranslated language strings.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function displayUntranslatedStrings()
+	{
+		$stripFirst = $this->params->get('strip-first', 1);
+		$stripPref  = $this->params->get('strip-prefix');
+		$stripSuff  = $this->params->get('strip-suffix');
+
+		$orphans = JFactory::getLanguage()->getOrphans();
+
+		if (!count($orphans))
+		{
+			return '<p>' . JText::_('JNONE') . '</p>';
+		}
+
+		ksort($orphans, SORT_STRING);
+
+		$guesses = array();
+
+		foreach ($orphans as $key => $occurance)
+		{
+			if (is_array($occurance) && isset($occurance[0]))
+			{
+				$info = $occurance[0];
+				$file = $info['file'] ?: '';
+
+				if (!isset($guesses[$file]))
+				{
+					$guesses[$file] = array();
+				}
+
+				// Prepare the key.
+				if (($pos = strpos($info['string'], '=')) > 0)
+				{
+					$parts = explode('=', $info['string']);
+					$key   = $parts[0];
+					$guess = $parts[1];
+				}
+				else
+				{
+					$guess = str_replace('_', ' ', $info['string']);
+
+					if ($stripFirst)
+					{
+						$parts = explode(' ', $guess);
+
+						if (count($parts) > 1)
+						{
+							array_shift($parts);
+							$guess = implode(' ', $parts);
+						}
+					}
+
+					$guess = trim($guess);
+
+					if ($stripPref)
+					{
+						$guess = trim(preg_replace(chr(1) . '^' . $stripPref . chr(1) . 'i', '', $guess));
+					}
+
+					if ($stripSuff)
+					{
+						$guess = trim(preg_replace(chr(1) . $stripSuff . '$' . chr(1) . 'i', '', $guess));
+					}
+				}
+
+				$key = strtoupper(trim($key));
+				$key = preg_replace('#\s+#', '_', $key);
+				$key = preg_replace('#\W#', '', $key);
+
+				// Prepare the text.
+				$guesses[$file][] = $key . '="' . $guess . '"';
+			}
+		}
+
+		$html = array();
+
+		foreach ($guesses as $file => $keys)
+		{
+			$html[] = "\n\n# " . ($file ? $this->formatLink($file) : JText::_('PLG_DEBUG_UNKNOWN_FILE')) . "\n\n";
+			$html[] = implode("\n", $keys);
+		}
+
+		return '<pre>' . implode('', $html) . '</pre>';
+	}
+
+	/**
+	 * Simple highlight for SQL queries.
+	 *
+	 * @param   string  $query  The query to highlight.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function highlightQuery($query)
+	{
+		$newlineKeywords = '#\b(FROM|LEFT|INNER|OUTER|WHERE|SET|VALUES|ORDER|GROUP|HAVING|LIMIT|ON|AND|CASE)\b#i';
+
+		$query = htmlspecialchars($query, ENT_QUOTES);
+
+		$query = preg_replace($newlineKeywords, '<br />&#160;&#160;\\0', $query);
+
+		$regex = array(
+
+			// Tables are identified by the prefix.
+			'/(=)/'                                        => '<b class="dbg-operator">$1</b>',
+
+			// All uppercase words have a special meaning.
+			'/(?<!\w|>)([A-Z_]{2,})(?!\w)/x'               => '<span class="dbg-command">$1</span>',
+
+			// Tables are identified by the prefix.
+			'/(' . $this->db->getPrefix() . '[a-z_0-9]+)/' => '<span class="dbg-table">$1</span>',
+
+		);
+
+		$query = preg_replace(array_keys($regex), array_values($regex), $query);
+
+		$query = str_replace('*', '<b style="color: red;">*</b>', $query);
+
+		return $query;
+	}
+
+	/**
+	 * Render the backtrace.
+	 *
+	 * Stolen from JError to prevent it's removal.
+	 *
+	 * @param   Exception  $error  The Exception object to be rendered.
+	 *
+	 * @return  string     Rendered backtrace.
+	 *
+	 * @since   2.5
+	 */
+	protected function renderBacktrace($error)
+	{
+		return JLayoutHelper::render('joomla.error.backtrace', array('backtrace' => $error->getTrace()));
+	}
+
+	/**
+	 * Replaces the Joomla! root with "JROOT" to improve readability.
+	 * Formats a link with a special value xdebug.file_link_format
+	 * from the php.ini file.
+	 *
+	 * @param   string  $file  The full path to the file.
+	 * @param   string  $line  The line number.
+	 *
+	 * @return  string
+	 *
+	 * @since   2.5
+	 */
+	protected function formatLink($file, $line = '')
+	{
+		return JHtml::_('debug.xdebuglink', $file, $line);
+	}
+
+	/**
+	 * Store log messages so they can be displayed later.
+	 * This function is passed log entries by JLogLoggerCallback.
+	 *
+	 * @param   JLogEntry  $entry  A log entry.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.1
+	 */
+	public function logger(JLogEntry $entry)
+	{
+		$this->logEntries[] = $entry;
+	}
+
+	/**
+	 * Display log messages.
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1
+	 */
+	protected function displayLogs()
+	{
+		$priorities = array(
+			JLog::EMERGENCY => '<span class="badge badge-important">EMERGENCY</span>',
+			JLog::ALERT     => '<span class="badge badge-important">ALERT</span>',
+			JLog::CRITICAL  => '<span class="badge badge-important">CRITICAL</span>',
+			JLog::ERROR     => '<span class="badge badge-important">ERROR</span>',
+			JLog::WARNING   => '<span class="badge badge-warning">WARNING</span>',
+			JLog::NOTICE    => '<span class="badge badge-info">NOTICE</span>',
+			JLog::INFO      => '<span class="badge badge-info">INFO</span>',
+			JLog::DEBUG     => '<span class="badge">DEBUG</span>',
+		);
+
+		$out = '';
+
+		$logEntriesTotal = count($this->logEntries);
+
+		// SQL log entries
+		$showExecutedSQL = $this->params->get('log-executed-sql', 0);
+
+		if (!$showExecutedSQL)
+		{
+			$logEntriesDatabasequery = count(
+				array_filter(
+					$this->logEntries, function ($logEntry)
+					{
+						return $logEntry->category === 'databasequery';
+					}
+				)
+			);
+			$logEntriesTotal         -= $logEntriesDatabasequery;
+		}
+
+		// Deprecated log entries
+		$logEntriesDeprecated = count(
+			array_filter(
+				$this->logEntries, function ($logEntry)
+				{
+					return $logEntry->category === 'deprecated';
+				}
+			)
+		);
+		$showDeprecated       = $this->params->get('log-deprecated', 0);
+
+		if (!$showDeprecated)
+		{
+			$logEntriesTotal -= $logEntriesDeprecated;
+		}
+
+		$showEverything = $this->params->get('log-everything', 0);
+
+		$out .= '<h4>' . JText::sprintf('PLG_DEBUG_LOGS_LOGGED', $logEntriesTotal) . '</h4><br />';
+
+		if ($showDeprecated && $logEntriesDeprecated > 0)
+		{
+			$out .= '
+			<div class="alert alert-warning">
+				<h4>' . JText::sprintf('PLG_DEBUG_LOGS_DEPRECATED_FOUND_TITLE', $logEntriesDeprecated) . '</h4>
+				<div>' . JText::_('PLG_DEBUG_LOGS_DEPRECATED_FOUND_TEXT') . '</div>
+			</div>
+			<br />';
+		}
+
+		$out   .= '<ol>';
+		$count = 1;
+
+		foreach ($this->logEntries as $entry)
+		{
+			// Don't show database queries if not selected.
+			if (!$showExecutedSQL && $entry->category === 'databasequery')
+			{
+				continue;
+			}
+
+			// Don't show deprecated logs if not selected.
+			if (!$showDeprecated && $entry->category === 'deprecated')
+			{
+				continue;
+			}
+
+			// Don't show everything logs if not selected.
+			if (!$showEverything && !in_array($entry->category, array('deprecated', 'databasequery'), true))
+			{
+				continue;
+			}
+
+			$out .= '<li id="dbg_logs_' . $count . '">';
+			$out .= '<h5>' . $priorities[$entry->priority] . ' ' . $entry->category . '</h5><br />
+				<pre>' . $entry->message . '</pre>';
+
+			if ($entry->callStack)
+			{
+				$out .= JHtml::_('bootstrap.startAccordion', 'dbg_logs_' . $count, array('active' => ''));
+				$out .= JHtml::_('bootstrap.addSlide', 'dbg_logs_' . $count, JText::_('PLG_DEBUG_CALL_STACK'), 'dbg_logs_backtrace_' . $count);
+				$out .= $this->renderCallStack($entry->callStack);
+				$out .= JHtml::_('bootstrap.endSlide');
+				$out .= JHtml::_('bootstrap.endAccordion');
+			}
+
+			$out .= '<hr /></li>';
+			$count++;
+		}
+
+		$out .= '</ol>';
+
+		return $out;
+	}
+
+	/**
+	 * Renders call stack and back trace in HTML.
+	 *
+	 * @param   array  $callStack  The call stack and back trace array.
+	 *
+	 * @return  string  The call stack and back trace in HMTL format.
+	 *
+	 * @since   3.5
+	 */
+	protected function renderCallStack(array $callStack = array())
+	{
+		$htmlCallStack = '';
+
+		if ($callStack !== null)
+		{
+			$htmlCallStack .= '<div>';
+			$htmlCallStack .= '<table class="table table-striped dbg-query-table">';
+			$htmlCallStack .= '<thead>';
+			$htmlCallStack .= '<tr>';
+			$htmlCallStack .= '<th>#</th>';
+			$htmlCallStack .= '<th>' . JText::_('PLG_DEBUG_CALL_STACK_CALLER') . '</th>';
+			$htmlCallStack .= '<th>' . JText::_('PLG_DEBUG_CALL_STACK_FILE_AND_LINE') . '</th>';
+			$htmlCallStack .= '</tr>';
+			$htmlCallStack .= '</thead>';
+			$htmlCallStack .= '<tbody>';
+
+			$count = count($callStack);
+
+			foreach ($callStack as $call)
+			{
+				// Dont' back trace log classes.
+				if (isset($call['class']) && strpos($call['class'], 'JLog') !== false)
+				{
+					$count--;
+					continue;
+				}
+
+				$htmlCallStack .= '<tr>';
+
+				$htmlCallStack .= '<td>' . $count . '</td>';
+
+				$htmlCallStack .= '<td>';
+
+				if (isset($call['class']))
+				{
+					// If entry has Class/Method print it.
+					$htmlCallStack .= htmlspecialchars($call['class'] . $call['type'] . $call['function']) . '()';
+				}
+				else
+				{
+					if (isset($call['args']))
+					{
+						// If entry has args is a require/include.
+						$htmlCallStack .= htmlspecialchars($call['function']) . ' ' . $this->formatLink($call['args'][0]);
+					}
+					else
+					{
+						// It's a function.
+						$htmlCallStack .= htmlspecialchars($call['function']) . '()';
+					}
+				}
+
+				$htmlCallStack .= '</td>';
+
+				$htmlCallStack .= '<td>';
+
+				// If entry doesn't have line and number the next is a call_user_func.
+				if (!isset($call['file']) && !isset($call['line']))
+				{
+					$htmlCallStack .= JText::_('PLG_DEBUG_CALL_STACK_SAME_FILE');
+				}
+				// If entry has file and line print it.
+				else
+				{
+					$htmlCallStack .= $this->formatLink(htmlspecialchars($call['file']), htmlspecialchars($call['line']));
+				}
+
+				$htmlCallStack .= '</td>';
+
+				$htmlCallStack .= '</tr>';
+				$count--;
+			}
+
+			$htmlCallStack .= '</tbody>';
+			$htmlCallStack .= '</table>';
+			$htmlCallStack .= '</div>';
+
+			if (!$this->linkFormat)
+			{
+				$htmlCallStack .= '<div>[<a href="https://xdebug.org/docs/all_settings#file_link_format" target="_blank" rel="noopener noreferrer">';
+				$htmlCallStack .= JText::_('PLG_DEBUG_LINK_FORMAT') . '</a>]</div>';
+			}
+		}
+
+		return $htmlCallStack;
+	}
+
+	/**
+	 * Pretty print JSON with colors.
+	 *
+	 * @param   string  $json  The json raw string.
+	 *
+	 * @return  string  The json string pretty printed.
+	 *
+	 * @since   3.5
+	 */
+	protected function prettyPrintJSON($json = '')
+	{
+		// In PHP 5.4.0 or later we have pretty print option.
+		if (version_compare(PHP_VERSION, '5.4', '>='))
+		{
+			$json = json_encode($json, JSON_PRETTY_PRINT);
+		}
+
+		// Add some colors
+		$json = preg_replace('#"([^"]+)":#', '<span class=\'black\'>"</span><span class=\'green\'>$1</span><span class=\'black\'>"</span>:', $json);
+		$json = preg_replace('#"(|[^"]+)"(\n|\r\n|,)#', '<span class=\'grey\'>"$1"</span>$2', $json);
+		$json = str_replace('null,', '<span class=\'blue\'>null</span>,', $json);
+
+		return $json;
+	}
+
+	/**
+	 * Write query to the log file
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	protected function writeToFile()
+	{
+		$app    = JFactory::getApplication();
+		$domain = $app->isClient('site') ? 'site' : 'admin';
+		$input  = $app->input;
+		$file   = $app->get('log_path') . '/' . $domain . '_' . $input->get('option') . $input->get('view') . $input->get('layout') . '.sql';
+
+		// Get the queries from log.
+		$current = '';
+		$db      = $this->db;
+		$log     = $db->getLog();
+		$timings = $db->getTimings();
+
+		foreach ($log as $id => $query)
+		{
+			if (isset($timings[$id * 2 + 1]))
+			{
+				$temp    = str_replace('`', '', $log[$id]);
+				$temp    = str_replace(array("\t", "\n", "\r\n"), ' ', $temp);
+				$current .= $temp . ";\n";
+			}
+		}
+
+		if (JFile::exists($file))
+		{
+			JFile::delete($file);
+		}
+
+		// Write new file.
+		JFile::write($file, $current);
+	}
+}
diff --git a/core/plugins/system/debug/debug.xml b/core/plugins/system/debug/debug.xml
new file mode 100644
index 00000000..c5579688
--- /dev/null
+++ b/core/plugins/system/debug/debug.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_debug</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2006</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_DEBUG_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="debug">debug.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_debug.ini</language>
+		<language tag="en-GB">en-GB.plg_system_debug.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="filter_groups"
+					type="usergrouplist"
+					label="PLG_DEBUG_FIELD_ALLOWED_GROUPS_LABEL"
+					description="PLG_DEBUG_FIELD_ALLOWED_GROUPS_DESC"
+					multiple="true"
+					filter="int_array"
+					size="10"
+				/>
+
+				<field
+					name="session"
+					type="radio"
+					label="PLG_DEBUG_FIELD_SESSION_LABEL"
+					description="PLG_DEBUG_FIELD_SESSION_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="profile"
+					type="radio"
+					label="PLG_DEBUG_FIELD_PROFILING_LABEL"
+					description="PLG_DEBUG_FIELD_PROFILING_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="queries"
+					type="radio"
+					label="PLG_DEBUG_FIELD_QUERIES_LABEL"
+					description="PLG_DEBUG_FIELD_QUERIES_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="query_types"
+					type="radio"
+					label="PLG_DEBUG_FIELD_QUERY_TYPES_LABEL"
+					description="PLG_DEBUG_FIELD_QUERY_TYPES_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="memory"
+					type="radio"
+					label="PLG_DEBUG_FIELD_MEMORY_LABEL"
+					description="PLG_DEBUG_FIELD_MEMORY_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="logs"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LOGS_LABEL"
+					description="PLG_DEBUG_FIELD_LOGS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="log_priorities"
+					type="list"
+					label="PLG_DEBUG_FIELD_LOG_PRIORITIES_LABEL"
+					description="PLG_DEBUG_FIELD_LOG_PRIORITIES_DESC"
+					multiple="true"
+					default="all"
+					>
+					<option value="all">PLG_DEBUG_FIELD_LOG_PRIORITIES_ALL</option>
+					<option value="emergency">PLG_DEBUG_FIELD_LOG_PRIORITIES_EMERGENCY</option>
+					<option value="alert">PLG_DEBUG_FIELD_LOG_PRIORITIES_ALERT</option>
+					<option value="critical">PLG_DEBUG_FIELD_LOG_PRIORITIES_CRITICAL</option>
+					<option value="error">PLG_DEBUG_FIELD_LOG_PRIORITIES_ERROR</option>
+					<option value="warning">PLG_DEBUG_FIELD_LOG_PRIORITIES_WARNING</option>
+					<option value="notice">PLG_DEBUG_FIELD_LOG_PRIORITIES_NOTICE</option>
+					<option value="info">PLG_DEBUG_FIELD_LOG_PRIORITIES_INFO</option>
+					<option value="debug">PLG_DEBUG_FIELD_LOG_PRIORITIES_DEBUG</option>
+				</field>
+
+				<field
+					name="log_categories"
+					type="text"
+					label="PLG_DEBUG_FIELD_LOG_CATEGORIES_LABEL"
+					description="PLG_DEBUG_FIELD_LOG_CATEGORIES_DESC"
+					size="60"
+				/>
+
+				<field
+					name="log_category_mode"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_LABEL"
+					description="PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno btn-group-reversed"
+					>
+					<option value="0">PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_INCLUDE</option>
+					<option value="1">PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_EXCLUDE</option>
+				</field>
+
+				<field
+					name="refresh_assets"
+					type="radio"
+					label="PLG_DEBUG_FIELD_REFRESH_ASSETS_LABEL"
+					description="PLG_DEBUG_FIELD_REFRESH_ASSETS_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+
+			<fieldset
+				name="language"
+				label="PLG_DEBUG_LANGUAGE_FIELDSET_LABEL"
+				>
+
+				<field
+					name="language_errorfiles"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_LABEL"
+					description="PLG_DEBUG_FIELD_LANGUAGE_ERRORFILES_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="language_files"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LANGUAGE_FILES_LABEL"
+					description="PLG_DEBUG_FIELD_LANGUAGE_FILES_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="language_strings"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LANGUAGE_STRING_LABEL"
+					description="PLG_DEBUG_FIELD_LANGUAGE_STRING_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="strip-first"
+					type="radio"
+					label="PLG_DEBUG_FIELD_STRIP_FIRST_LABEL"
+					description="PLG_DEBUG_FIELD_STRIP_FIRST_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="strip-prefix"
+					type="textarea"
+					label="PLG_DEBUG_FIELD_STRIP_PREFIX_LABEL"
+					description="PLG_DEBUG_FIELD_STRIP_PREFIX_DESC"
+					cols="30"
+					rows="4"
+				/>
+
+				<field
+					name="strip-suffix"
+					type="textarea"
+					label="PLG_DEBUG_FIELD_STRIP_SUFFIX_LABEL"
+					description="PLG_DEBUG_FIELD_STRIP_SUFFIX_DESC"
+					cols="30"
+					rows="4"
+				/>
+			</fieldset>
+
+			<fieldset
+				name="logging"
+				label="PLG_DEBUG_LOGGING_FIELDSET_LABEL"
+				>
+				<field
+					name="log-deprecated"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LOG_DEPRECATED_LABEL"
+					description="PLG_DEBUG_FIELD_LOG_DEPRECATED_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="log-everything"
+					type="radio"
+					label="PLG_DEBUG_FIELD_LOG_EVERYTHING_LABEL"
+					description="PLG_DEBUG_FIELD_LOG_EVERYTHING_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="log-executed-sql"
+					type="radio"
+					label="PLG_DEBUG_FIELD_EXECUTEDSQL_LABEL"
+					description="PLG_DEBUG_FIELD_EXECUTEDSQL_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/fields/fields.php b/core/plugins/system/fields/fields.php
new file mode 100644
index 00000000..a7b43201
--- /dev/null
+++ b/core/plugins/system/fields/fields.php
@@ -0,0 +1,574 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.Fields
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Multilanguage;
+
+JLoader::register('FieldsHelper', JPATH_ADMINISTRATOR . '/components/com_fields/helpers/fields.php');
+
+/**
+ * Fields Plugin
+ *
+ * @since  3.7
+ */
+class PlgSystemFields extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.7.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Normalizes the request data.
+	 *
+	 * @param   string  $context  The context
+	 * @param   object  $data     The object
+	 * @param   Form    $form     The form
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.7
+	 */
+	public function onContentNormaliseRequestData($context, $data, Form $form)
+	{
+		if (!FieldsHelper::extract($context, $data))
+		{
+			return true;
+		}
+
+		// Loop over all fields
+		foreach ($form->getGroup('com_fields') as $field)
+		{
+			// Make sure the data object has an entry
+			if (isset($data->com_fields[$field->fieldname]))
+			{
+				continue;
+			}
+
+			// Set a default value for the field
+			$data->com_fields[$field->fieldname] = false;
+		}
+	}
+
+	/**
+	 * The save event.
+	 *
+	 * @param   string   $context  The context
+	 * @param   JTable   $item     The table
+	 * @param   boolean  $isNew    Is new item
+	 * @param   array    $data     The validated data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentAfterSave($context, $item, $isNew, $data = array())
+	{
+		// Check if data is an array and the item has an id
+		if (!is_array($data) || empty($item->id) || empty($data['com_fields']))
+		{
+			return true;
+		}
+
+		// Create correct context for category
+		if ($context == 'com_categories.category')
+		{
+			$context = $item->extension . '.categories';
+
+			// Set the catid on the category to get only the fields which belong to this category
+			$item->catid = $item->id;
+		}
+
+		// Check the context
+		$parts = FieldsHelper::extract($context, $item);
+
+		if (!$parts)
+		{
+			return true;
+		}
+
+		// Compile the right context for the fields
+		$context = $parts[0] . '.' . $parts[1];
+
+		// Loading the fields
+		$fields = FieldsHelper::getFields($context, $item);
+
+		if (!$fields)
+		{
+			return true;
+		}
+
+		// Loading the model
+		$model = JModelLegacy::getInstance('Field', 'FieldsModel', array('ignore_request' => true));
+
+		// Loop over the fields
+		foreach ($fields as $field)
+		{
+			// Determine the value if it is (un)available from the data
+			if (key_exists($field->name, $data['com_fields']))
+			{
+				$value = $data['com_fields'][$field->name] === false ? null : $data['com_fields'][$field->name];
+			}
+			// Field not available on form, use stored value
+			else
+			{
+				$value = $field->rawvalue;
+			}
+
+			// If no value set (empty) remove value from database
+			if (is_array($value) ? !count($value) : !strlen($value))
+			{
+				$value = null;
+			}
+
+			// JSON encode value for complex fields
+			if (is_array($value) && (count($value, COUNT_NORMAL) !== count($value, COUNT_RECURSIVE) || !count(array_filter(array_keys($value), 'is_numeric'))))
+			{
+				$value = json_encode($value);
+			}
+
+			// Setting the value for the field and the item
+			$model->setFieldValue($field->id, $item->id, $value);
+		}
+
+		return true;
+	}
+
+	/**
+	 * The save event.
+	 *
+	 * @param   array    $userData  The date
+	 * @param   boolean  $isNew     Is new
+	 * @param   boolean  $success   Is success
+	 * @param   string   $msg       The message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onUserAfterSave($userData, $isNew, $success, $msg)
+	{
+		// It is not possible to manipulate the user during save events
+		// Check if data is valid or we are in a recursion
+		if (!$userData['id'] || !$success)
+		{
+			return true;
+		}
+
+		$user = JFactory::getUser($userData['id']);
+
+		$task = JFactory::getApplication()->input->getCmd('task');
+
+		// Skip fields save when we activate a user, because we will lose the saved data
+		if (in_array($task, array('activate', 'block', 'unblock')))
+		{
+			return true;
+		}
+
+		// Trigger the events with a real user
+		$this->onContentAfterSave('com_users.user', $user, false, $userData);
+
+		return true;
+	}
+
+	/**
+	 * The delete event.
+	 *
+	 * @param   string    $context  The context
+	 * @param   stdClass  $item     The item
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentAfterDelete($context, $item)
+	{
+		$parts = FieldsHelper::extract($context, $item);
+
+		if (!$parts || empty($item->id))
+		{
+			return true;
+		}
+
+		$context = $parts[0] . '.' . $parts[1];
+
+		JLoader::import('joomla.application.component.model');
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_fields/models', 'FieldsModel');
+
+		$model = JModelLegacy::getInstance('Field', 'FieldsModel', array('ignore_request' => true));
+		$model->cleanupValues($context, $item->id);
+
+		return true;
+	}
+
+	/**
+	 * The user delete event.
+	 *
+	 * @param   stdClass  $user    The context
+	 * @param   boolean   $succes  Is success
+	 * @param   string    $msg     The message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onUserAfterDelete($user, $succes, $msg)
+	{
+		$item     = new stdClass;
+		$item->id = $user['id'];
+
+		return $this->onContentAfterDelete('com_users.user', $item);
+	}
+
+	/**
+	 * The form event.
+	 *
+	 * @param   JForm     $form  The form
+	 * @param   stdClass  $data  The data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentPrepareForm(JForm $form, $data)
+	{
+		$context = $form->getName();
+
+		// When a category is edited, the context is com_categories.categorycom_content
+		if (strpos($context, 'com_categories.category') === 0)
+		{
+			$context = str_replace('com_categories.category', '', $context) . '.categories';
+
+			// Set the catid on the category to get only the fields which belong to this category
+			if (is_array($data) && key_exists('id', $data))
+			{
+				$data['catid'] = $data['id'];
+			}
+
+			if (is_object($data) && isset($data->id))
+			{
+				$data->catid = $data->id;
+			}
+		}
+
+		$parts = FieldsHelper::extract($context, $form);
+
+		if (!$parts)
+		{
+			return true;
+		}
+
+		$input = JFactory::getApplication()->input;
+
+		// If we are on the save command we need the actual data
+		$jformData = $input->get('jform', array(), 'array');
+
+		if ($jformData && !$data)
+		{
+			$data = $jformData;
+		}
+
+		if (is_array($data))
+		{
+			$data = (object) $data;
+		}
+
+		FieldsHelper::prepareForm($parts[0] . '.' . $parts[1], $form, $data);
+
+		return true;
+	}
+
+	/**
+	 * The display event.
+	 *
+	 * @param   string    $context     The context
+	 * @param   stdClass  $item        The item
+	 * @param   Registry  $params      The params
+	 * @param   integer   $limitstart  The start
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentAfterTitle($context, $item, $params, $limitstart = 0)
+	{
+		return $this->display($context, $item, $params, 1);
+	}
+
+	/**
+	 * The display event.
+	 *
+	 * @param   string    $context     The context
+	 * @param   stdClass  $item        The item
+	 * @param   Registry  $params      The params
+	 * @param   integer   $limitstart  The start
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentBeforeDisplay($context, $item, $params, $limitstart = 0)
+	{
+		return $this->display($context, $item, $params, 2);
+	}
+
+	/**
+	 * The display event.
+	 *
+	 * @param   string    $context     The context
+	 * @param   stdClass  $item        The item
+	 * @param   Registry  $params      The params
+	 * @param   integer   $limitstart  The start
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentAfterDisplay($context, $item, $params, $limitstart = 0)
+	{
+		return $this->display($context, $item, $params, 3);
+	}
+
+	/**
+	 * Performs the display event.
+	 *
+	 * @param   string    $context      The context
+	 * @param   stdClass  $item         The item
+	 * @param   Registry  $params       The params
+	 * @param   integer   $displayType  The type
+	 *
+	 * @return  string
+	 *
+	 * @since   3.7.0
+	 */
+	private function display($context, $item, $params, $displayType)
+	{
+		$parts = FieldsHelper::extract($context, $item);
+
+		if (!$parts)
+		{
+			return '';
+		}
+
+		// If we have a category, set the catid field to fetch only the fields which belong to it
+		if ($parts[1] == 'categories' && !isset($item->catid))
+		{
+			$item->catid = $item->id;
+		}
+
+		$context = $parts[0] . '.' . $parts[1];
+
+		// Convert tags
+		if ($context == 'com_tags.tag' && !empty($item->type_alias))
+		{
+			// Set the context
+			$context = $item->type_alias;
+
+			$item = $this->prepareTagItem($item);
+		}
+
+		if (is_string($params) || !$params)
+		{
+			$params = new Registry($params);
+		}
+
+		$fields = FieldsHelper::getFields($context, $item, $displayType);
+
+		if ($fields)
+		{
+			$app = Factory::getApplication();
+
+			if ($app->isClient('site') && Multilanguage::isEnabled() && isset($item->language) && $item->language == '*')
+			{
+				$lang = $app->getLanguage()->getTag();
+
+				foreach ($fields as $key => $field)
+				{
+					if ($field->language == '*' || $field->language == $lang)
+					{
+						continue;
+					}
+
+					unset($fields[$key]);
+				}
+			}
+		}
+
+		if ($fields)
+		{
+			foreach ($fields as $key => $field)
+			{
+				$fieldDisplayType = $field->params->get('display', '2');
+
+				if ($fieldDisplayType == $displayType)
+				{
+					continue;
+				}
+
+				unset($fields[$key]);
+			}
+		}
+
+		if ($fields)
+		{
+			return FieldsHelper::render(
+				$context,
+				'fields.render',
+				array(
+					'item'            => $item,
+					'context'         => $context,
+					'fields'          => $fields
+				)
+			);
+		}
+
+		return '';
+	}
+
+	/**
+	 * Performs the display event.
+	 *
+	 * @param   string    $context  The context
+	 * @param   stdClass  $item     The item
+	 *
+	 * @return  void
+	 *
+	 * @since   3.7.0
+	 */
+	public function onContentPrepare($context, $item)
+	{
+		// Check property exists (avoid costly & useless recreation), if need to recreate them, just unset the property!
+		if (isset($item->jcfields))
+		{
+			return;
+		}
+
+		$parts = FieldsHelper::extract($context, $item);
+
+		if (!$parts)
+		{
+			return;
+		}
+
+		$context = $parts[0] . '.' . $parts[1];
+
+		// Convert tags
+		if ($context == 'com_tags.tag' && !empty($item->type_alias))
+		{
+			// Set the context
+			$context = $item->type_alias;
+
+			$item = $this->prepareTagItem($item);
+		}
+
+		// Get item's fields, also preparing their value property for manual display
+		// (calling plugins events and loading layouts to get their HTML display)
+		$fields = FieldsHelper::getFields($context, $item, true);
+
+		// Adding the fields to the object
+		$item->jcfields = array();
+
+		foreach ($fields as $key => $field)
+		{
+			$item->jcfields[$field->id] = $field;
+		}
+	}
+
+	/**
+	 * The finder event.
+	 *
+	 * @param   stdClass  $item  The item
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.7.0
+	 */
+	public function onPrepareFinderContent($item)
+	{
+		$section = strtolower($item->layout);
+		$tax     = $item->getTaxonomy('Type');
+
+		if ($tax)
+		{
+			foreach ($tax as $context => $value)
+			{
+				// This is only a guess, needs to be improved
+				$component = strtolower($context);
+
+				if (strpos($context, 'com_') !== 0)
+				{
+					$component = 'com_' . $component;
+				}
+
+				// Transform com_article to com_content
+				if ($component === 'com_article')
+				{
+					$component = 'com_content';
+				}
+
+				// Create a dummy object with the required fields
+				$tmp     = new stdClass;
+				$tmp->id = $item->__get('id');
+
+				if ($item->__get('catid'))
+				{
+					$tmp->catid = $item->__get('catid');
+				}
+
+				// Getting the fields for the constructed context
+				$fields = FieldsHelper::getFields($component . '.' . $section, $tmp, true);
+
+				if (is_array($fields))
+				{
+					foreach ($fields as $field)
+					{
+						// Adding the instructions how to handle the text
+						$item->addInstruction(FinderIndexer::TEXT_CONTEXT, $field->name);
+
+						// Adding the field value as a field
+						$item->{$field->name} = $field->value;
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Prepares a tag item to be ready for com_fields.
+	 *
+	 * @param   stdClass  $item  The item
+	 *
+	 * @return  object
+	 *
+	 * @since   3.8.4
+	 */
+	private function prepareTagItem($item)
+	{
+		// Map core fields
+		$item->id       = $item->content_item_id;
+		$item->language = $item->core_language;
+
+		// Also handle the catid
+		if (!empty($item->core_catid))
+		{
+			$item->catid = $item->core_catid;
+		}
+
+		return $item;
+	}
+}
diff --git a/core/plugins/system/fields/fields.xml b/core/plugins/system/fields/fields.xml
new file mode 100644
index 00000000..0ed586f7
--- /dev/null
+++ b/core/plugins/system/fields/fields.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<extension type="plugin" version="3.7.0" group="system" method="upgrade">
+	<name>plg_system_fields</name>
+	<author>Joomla! Project</author>
+	<creationDate>March 2016</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.7.0</version>
+	<description>PLG_SYSTEM_FIELDS_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="fields">fields.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_fields.ini</language>
+		<language tag="en-GB">en-GB.plg_system_fields.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/system/highlight/highlight.php b/core/plugins/system/highlight/highlight.php
new file mode 100644
index 00000000..dfa2f339
--- /dev/null
+++ b/core/plugins/system/highlight/highlight.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.Highlight
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * System plugin to highlight terms.
+ *
+ * @since  2.5
+ */
+class PlgSystemHighlight extends JPlugin
+{
+	/**
+	 * Method to catch the onAfterDispatch event.
+	 *
+	 * This is where we setup the click-through content highlighting for.
+	 * The highlighting is done with JavaScript so we just
+	 * need to check a few parameters and the JHtml behavior will do the rest.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   2.5
+	 */
+	public function onAfterDispatch()
+	{
+		// Check that we are in the site application.
+		if (JFactory::getApplication()->isClient('administrator'))
+		{
+			return true;
+		}
+
+		// Set the variables.
+		$input = JFactory::getApplication()->input;
+		$extension = $input->get('option', '', 'cmd');
+
+		// Check if the highlighter is enabled.
+		if (!JComponentHelper::getParams($extension)->get('highlight_terms', 1))
+		{
+			return true;
+		}
+
+		// Check if the highlighter should be activated in this environment.
+		if ($input->get('tmpl', '', 'cmd') === 'component' || JFactory::getDocument()->getType() !== 'html')
+		{
+			return true;
+		}
+
+		// Get the terms to highlight from the request.
+		$terms = $input->request->get('highlight', null, 'base64');
+		$terms = $terms ? json_decode(base64_decode($terms)) : null;
+
+		// Check the terms.
+		if (empty($terms))
+		{
+			return true;
+		}
+
+		// Clean the terms array.
+		$filter     = JFilterInput::getInstance();
+
+		$cleanTerms = array();
+
+		foreach ($terms as $term)
+		{
+			$cleanTerms[] = htmlspecialchars($filter->clean($term, 'string'));
+		}
+
+		// Activate the highlighter.
+		JHtml::_('behavior.highlighter', $cleanTerms);
+
+		// Adjust the component buffer.
+		$doc = JFactory::getDocument();
+		$buf = $doc->getBuffer('component');
+		$buf = '<br id="highlighter-start" />' . $buf . '<br id="highlighter-end" />';
+		$doc->setBuffer($buf, 'component');
+
+		return true;
+	}
+}
diff --git a/core/plugins/system/highlight/highlight.xml b/core/plugins/system/highlight/highlight.xml
new file mode 100644
index 00000000..e3e077b6
--- /dev/null
+++ b/core/plugins/system/highlight/highlight.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_highlight</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2011</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SYSTEM_HIGHLIGHT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="highlight">highlight.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_highlight.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_highlight.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini b/core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
new file mode 100644
index 00000000..8de29193
--- /dev/null
+++ b/core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
@@ -0,0 +1,10 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LANGUAGECODE="System - Language Code"
+PLG_SYSTEM_LANGUAGECODE_FIELD_DESC="Changes the language code used for the <em>%s</em> language."
+PLG_SYSTEM_LANGUAGECODE_FIELDSET_DESC="Changes the language code for the generated HTML document. Example usage: You have installed the fr-FR language pack and want the Search Engines to recognise the page as aimed at French-speaking Canada. Add the tag 'fr-CA' to the corresponding field for 'fr-FR' to resolve this."
+PLG_SYSTEM_LANGUAGECODE_FIELDSET_LABEL="Language codes"
+PLG_SYSTEM_LANGUAGECODE_XML_DESCRIPTION="Provides the ability to change the language code in the generated HTML document to improve SEO.<br />The fields will appear when the plugin is enabled and saved.<br />More information at <a href="_QQ_"http://www.w3.org/TR/xhtml1/#docconf"_QQ_">W3.org</a>."
\ No newline at end of file
diff --git a/core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
new file mode 100644
index 00000000..b671d2ee
--- /dev/null
+++ b/core/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_LANGUAGECODE="System - Language Code"
+PLG_SYSTEM_LANGUAGECODE_XML_DESCRIPTION="Provides ability to change the language code in the generated HTML document to improve SEO"
+
diff --git a/core/plugins/system/languagecode/languagecode.php b/core/plugins/system/languagecode/languagecode.php
new file mode 100644
index 00000000..b10bb5d6
--- /dev/null
+++ b/core/plugins/system/languagecode/languagecode.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.languagecode
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Language Code plugin class.
+ *
+ * @since  2.5
+ */
+class PlgSystemLanguagecode extends JPlugin
+{
+	/**
+	 * Plugin that changes the language code used in the <html /> tag.
+	 *
+	 * @return  void
+	 *
+	 * @since   2.5
+	 */
+	public function onAfterRender()
+	{
+		$app = JFactory::getApplication();
+
+		// Use this plugin only in site application.
+		if ($app->isClient('site'))
+		{
+			// Get the response body.
+			$body = $app->getBody();
+
+			// Get the current language code.
+			$code = JFactory::getDocument()->getLanguage();
+
+			// Get the new code.
+			$new_code  = $this->params->get($code);
+
+			// Replace the old code by the new code in the <html /> tag.
+			if ($new_code)
+			{
+				// Replace the new code in the HTML document.
+				$patterns = array(
+					chr(1) . '(<html.*\s+xml:lang=")(' . $code . ')(".*>)' . chr(1) . 'i',
+					chr(1) . '(<html.*\s+lang=")(' . $code . ')(".*>)' . chr(1) . 'i',
+				);
+				$replace = array(
+					'${1}' . strtolower($new_code) . '${3}',
+					'${1}' . strtolower($new_code) . '${3}'
+				);
+			}
+			else
+			{
+				$patterns = array();
+				$replace  = array();
+			}
+
+			// Replace codes in <link hreflang="" /> attributes.
+			preg_match_all(chr(1) . '(<link.*\s+hreflang=")([0-9a-z\-]*)(".*\s+rel="alternate".*/>)' . chr(1) . 'i', $body, $matches);
+
+			foreach ($matches[2] as $match)
+			{
+				$new_code = $this->params->get(strtolower($match));
+
+				if ($new_code)
+				{
+					$patterns[] = chr(1) . '(<link.*\s+hreflang=")(' . $match . ')(".*\s+rel="alternate".*/>)' . chr(1) . 'i';
+					$replace[] = '${1}' . $new_code . '${3}';
+				}
+			}
+
+			preg_match_all(chr(1) . '(<link.*\s+rel="alternate".*\s+hreflang=")([0-9A-Za-z\-]*)(".*/>)' . chr(1) . 'i', $body, $matches);
+
+			foreach ($matches[2] as $match)
+			{
+				$new_code = $this->params->get(strtolower($match));
+
+				if ($new_code)
+				{
+					$patterns[] = chr(1) . '(<link.*\s+rel="alternate".*\s+hreflang=")(' . $match . ')(".*/>)' . chr(1) . 'i';
+					$replace[] = '${1}' . $new_code . '${3}';
+				}
+			}
+
+			// Replace codes in itemprop content
+			preg_match_all(chr(1) . '(<meta.*\s+itemprop="inLanguage".*\s+content=")([0-9A-Za-z\-]*)(".*/>)' . chr(1) . 'i', $body, $matches);
+
+			foreach ($matches[2] as $match)
+			{
+				$new_code = $this->params->get(strtolower($match));
+
+				if ($new_code)
+				{
+					$patterns[] = chr(1) . '(<meta.*\s+itemprop="inLanguage".*\s+content=")(' . $match . ')(".*/>)' . chr(1) . 'i';
+					$replace[] = '${1}' . $new_code . '${3}';
+				}
+			}
+
+			$app->setBody(preg_replace($patterns, $replace, $body));
+		}
+	}
+
+	/**
+	 * Prepare form.
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since	2.5
+	 */
+	public function onContentPrepareForm(JForm $form, $data)
+	{
+		// Check we are manipulating the languagecode plugin.
+		if ($form->getName() !== 'com_plugins.plugin' || !$form->getField('languagecodeplugin', 'params'))
+		{
+			return true;
+		}
+
+		// Get site languages.
+		if ($languages = JLanguageHelper::getKnownLanguages(JPATH_SITE))
+		{
+			// Inject fields into the form.
+			foreach ($languages as $tag => $language)
+			{
+				$form->load('
+					<form>
+						<fields name="params">
+							<fieldset
+								name="languagecode"
+								label="PLG_SYSTEM_LANGUAGECODE_FIELDSET_LABEL"
+								description="PLG_SYSTEM_LANGUAGECODE_FIELDSET_DESC"
+							>
+								<field
+									name="' . strtolower($tag) . '"
+									type="text"
+									label="' . $tag . '"
+									description="' . htmlspecialchars(JText::sprintf('PLG_SYSTEM_LANGUAGECODE_FIELD_DESC', $language['name']), ENT_COMPAT, 'UTF-8') . '"
+									translate_description="false"
+									translate_label="false"
+									size="7"
+									filter="cmd"
+								/>
+							</fieldset>
+						</fields>
+					</form>
+				');
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/system/languagecode/languagecode.xml b/core/plugins/system/languagecode/languagecode.xml
new file mode 100644
index 00000000..8203f5ff
--- /dev/null
+++ b/core/plugins/system/languagecode/languagecode.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_languagecode</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2011</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SYSTEM_LANGUAGECODE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="languagecode">languagecode.php</filename>
+		<folder>language</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_languagecode.ini</language>
+		<language tag="en-GB">language/en-GB/en-GB.plg_system_languagecode.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<field
+				name="languagecodeplugin"
+				type="hidden"
+				default="true"
+			/>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/languagefilter/languagefilter.php b/core/plugins/system/languagefilter/languagefilter.php
new file mode 100644
index 00000000..2076cad1
--- /dev/null
+++ b/core/plugins/system/languagefilter/languagefilter.php
@@ -0,0 +1,884 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.languagefilter
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
+
+/**
+ * Joomla! Language Filter Plugin.
+ *
+ * @since  1.6
+ */
+class PlgSystemLanguageFilter extends JPlugin
+{
+	/**
+	 * The routing mode.
+	 *
+	 * @var    boolean
+	 * @since  2.5
+	 */
+	protected $mode_sef;
+
+	/**
+	 * Available languages by sef.
+	 *
+	 * @var    array
+	 * @since  1.6
+	 */
+	protected $sefs;
+
+	/**
+	 * Available languages by language codes.
+	 *
+	 * @var    array
+	 * @since  2.5
+	 */
+	protected $lang_codes;
+
+	/**
+	 * The current language code.
+	 *
+	 * @var    string
+	 * @since  3.4.2
+	 */
+	protected $current_lang;
+
+	/**
+	 * The default language code.
+	 *
+	 * @var    string
+	 * @since  2.5
+	 */
+	protected $default_lang;
+
+	/**
+	 * The logged user language code.
+	 *
+	 * @var    string
+	 * @since  3.3.1
+	 */
+	private $user_lang_code;
+
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.3
+	 */
+	protected $app;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		$this->app = JFactory::getApplication();
+
+		if ($this->app->isClient('site'))
+		{
+			// Setup language data.
+			$this->mode_sef     = $this->app->get('sef', 0);
+			$this->sefs         = JLanguageHelper::getLanguages('sef');
+			$this->lang_codes   = JLanguageHelper::getLanguages('lang_code');
+			$this->default_lang = JComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+
+			$levels = JFactory::getUser()->getAuthorisedViewLevels();
+
+			foreach ($this->sefs as $sef => $language)
+			{
+				// @todo: In Joomla 2.5.4 and earlier access wasn't set. Non modified Content Languages got 0 as access value
+				// we also check if frontend language exists and is enabled
+				if (($language->access && !in_array($language->access, $levels))
+					|| (!array_key_exists($language->lang_code, JLanguageHelper::getInstalledLanguages(0))))
+				{
+					unset($this->lang_codes[$language->lang_code], $this->sefs[$language->sef]);
+				}
+			}
+		}
+	}
+
+	/**
+	 * After initialise.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onAfterInitialise()
+	{
+		$this->app->item_associations = $this->params->get('item_associations', 0);
+
+		if ($this->app->isClient('site'))
+		{
+			$router = $this->app->getRouter();
+
+			// Attach build rules for language SEF.
+			$router->attachBuildRule(array($this, 'preprocessBuildRule'), JRouter::PROCESS_BEFORE);
+			$router->attachBuildRule(array($this, 'buildRule'), JRouter::PROCESS_DURING);
+
+			if ($this->mode_sef)
+			{
+				$router->attachBuildRule(array($this, 'postprocessSEFBuildRule'), JRouter::PROCESS_AFTER);
+			}
+			else
+			{
+				$router->attachBuildRule(array($this, 'postprocessNonSEFBuildRule'), JRouter::PROCESS_AFTER);
+			}
+
+			// Attach parse rules for language SEF.
+			$router->attachParseRule(array($this, 'parseRule'), JRouter::PROCESS_DURING);
+		}
+	}
+
+	/**
+	 * After route.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function onAfterRoute()
+	{
+		// Add custom site name.
+		if (isset($this->lang_codes[$this->current_lang]) && $this->lang_codes[$this->current_lang]->sitename)
+		{
+			$this->app->set('sitename', $this->lang_codes[$this->current_lang]->sitename);
+		}
+	}
+
+	/**
+	 * Add build preprocess rule to router.
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function preprocessBuildRule(&$router, &$uri)
+	{
+		$lang = $uri->getVar('lang', $this->current_lang);
+		$uri->setVar('lang', $lang);
+
+		if (isset($this->sefs[$lang]))
+		{
+			$lang = $this->sefs[$lang]->lang_code;
+			$uri->setVar('lang', $lang);
+		}
+	}
+
+	/**
+	 * Add build rule to router.
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function buildRule(&$router, &$uri)
+	{
+		$lang = $uri->getVar('lang');
+
+		if (isset($this->lang_codes[$lang]))
+		{
+			$sef = $this->lang_codes[$lang]->sef;
+		}
+		else
+		{
+			$sef = $this->lang_codes[$this->current_lang]->sef;
+		}
+
+		if ($this->mode_sef
+			&& (!$this->params->get('remove_default_prefix', 0)
+			|| $lang !== $this->default_lang
+			|| $lang !== $this->current_lang))
+		{
+			$uri->setPath($uri->getPath() . '/' . $sef . '/');
+		}
+	}
+
+	/**
+	 * postprocess build rule for SEF URLs
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function postprocessSEFBuildRule(&$router, &$uri)
+	{
+		$uri->delVar('lang');
+	}
+
+	/**
+	 * postprocess build rule for non-SEF URLs
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function postprocessNonSEFBuildRule(&$router, &$uri)
+	{
+		$lang = $uri->getVar('lang');
+
+		if (isset($this->lang_codes[$lang]))
+		{
+			$uri->setVar('lang', $this->lang_codes[$lang]->sef);
+		}
+	}
+
+	/**
+	 * Add parse rule to router.
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function parseRule(&$router, &$uri)
+	{
+		// Did we find the current and existing language yet?
+		$found = false;
+
+		// Are we in SEF mode or not?
+		if ($this->mode_sef)
+		{
+			$path = $uri->getPath();
+			$parts = explode('/', $path);
+
+			$sef = $parts[0];
+
+			// Do we have a URL Language Code ?
+			if (!isset($this->sefs[$sef]))
+			{
+				// Check if remove default URL language code is set
+				if ($this->params->get('remove_default_prefix', 0))
+				{
+					if ($parts[0])
+					{
+						// We load a default site language page
+						$lang_code = $this->default_lang;
+					}
+					else
+					{
+						// We check for an existing language cookie
+						$lang_code = $this->getLanguageCookie();
+					}
+				}
+				else
+				{
+					$lang_code = $this->getLanguageCookie();
+				}
+
+				// No language code. Try using browser settings or default site language
+				if (!$lang_code && $this->params->get('detect_browser', 0) == 1)
+				{
+					$lang_code = JLanguageHelper::detectLanguage();
+				}
+
+				if (!$lang_code)
+				{
+					$lang_code = $this->default_lang;
+				}
+
+				if ($lang_code === $this->default_lang && $this->params->get('remove_default_prefix', 0))
+				{
+					$found = true;
+				}
+			}
+			else
+			{
+				// We found our language
+				$found = true;
+				$lang_code = $this->sefs[$sef]->lang_code;
+
+				// If we found our language, but its the default language and we don't want a prefix for that, we are on a wrong URL.
+				// Or we try to change the language back to the default language. We need a redirect to the proper URL for the default language.
+				if ($lang_code === $this->default_lang && $this->params->get('remove_default_prefix', 0))
+				{
+					// Create a cookie.
+					$this->setLanguageCookie($lang_code);
+
+					$found = false;
+					array_shift($parts);
+					$path = implode('/', $parts);
+				}
+
+				// We have found our language and the first part of our URL is the language prefix
+				if ($found)
+				{
+					array_shift($parts);
+
+					// Empty parts array when "index.php" is the only part left.
+					if (count($parts) === 1 && $parts[0] === 'index.php')
+					{
+						$parts = array();
+					}
+
+					$uri->setPath(implode('/', $parts));
+				}
+			}
+		}
+		// We are not in SEF mode
+		else
+		{
+			$lang_code = $this->getLanguageCookie();
+
+			if (!$lang_code && $this->params->get('detect_browser', 1))
+			{
+				$lang_code = JLanguageHelper::detectLanguage();
+			}
+
+			if (!isset($this->lang_codes[$lang_code]))
+			{
+				$lang_code = $this->default_lang;
+			}
+		}
+
+		$lang = $uri->getVar('lang', $lang_code);
+
+		if (isset($this->sefs[$lang]))
+		{
+			// We found our language
+			$found = true;
+			$lang_code = $this->sefs[$lang]->lang_code;
+		}
+
+		// We are called via POST. We don't care about the language
+		// and simply set the default language as our current language.
+		if ($this->app->input->getMethod() === 'POST'
+			|| count($this->app->input->post) > 0
+			|| count($this->app->input->files) > 0)
+		{
+			$found = true;
+
+			if (!isset($lang_code))
+			{
+				$lang_code = $this->getLanguageCookie();
+			}
+
+			if (!$lang_code && $this->params->get('detect_browser', 1))
+			{
+				$lang_code = JLanguageHelper::detectLanguage();
+			}
+
+			if (!isset($this->lang_codes[$lang_code]))
+			{
+				$lang_code = $this->default_lang;
+			}
+		}
+
+		// We have not found the language and thus need to redirect
+		if (!$found)
+		{
+			// Lets find the default language for this user
+			if (!isset($lang_code) || !isset($this->lang_codes[$lang_code]))
+			{
+				$lang_code = false;
+
+				if ($this->params->get('detect_browser', 1))
+				{
+					$lang_code = JLanguageHelper::detectLanguage();
+
+					if (!isset($this->lang_codes[$lang_code]))
+					{
+						$lang_code = false;
+					}
+				}
+
+				if (!$lang_code)
+				{
+					$lang_code = $this->default_lang;
+				}
+			}
+
+			if ($this->mode_sef)
+			{
+				// Use the current language sef or the default one.
+				if ($lang_code !== $this->default_lang
+					|| !$this->params->get('remove_default_prefix', 0))
+				{
+					$path = $this->lang_codes[$lang_code]->sef . '/' . $path;
+				}
+
+				$uri->setPath($path);
+
+				if (!$this->app->get('sef_rewrite'))
+				{
+					$uri->setPath('index.php/' . $uri->getPath());
+				}
+
+				$redirectUri = $uri->base() . $uri->toString(array('path', 'query', 'fragment'));
+			}
+			else
+			{
+				$uri->setVar('lang', $this->lang_codes[$lang_code]->sef);
+				$redirectUri = $uri->base() . 'index.php?' . $uri->getQuery();
+			}
+
+			// Set redirect HTTP code to "302 Found".
+			$redirectHttpCode = 302;
+
+			// If selected language is the default language redirect code is "301 Moved Permanently".
+			if ($lang_code === $this->default_lang)
+			{
+				$redirectHttpCode = 301;
+
+				// We cannot cache this redirect in browser. 301 is cachable by default so we need to force to not cache it in browsers.
+				$this->app->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
+				$this->app->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+				$this->app->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0', false);
+				$this->app->setHeader('Pragma', 'no-cache');
+				$this->app->sendHeaders();
+			}
+
+			// Redirect to language.
+			$this->app->redirect($redirectUri, $redirectHttpCode);
+		}
+
+		// We have found our language and now need to set the cookie and the language value in our system
+		$array = array('lang' => $lang_code);
+		$this->current_lang = $lang_code;
+
+		// Set the request var.
+		$this->app->input->set('language', $lang_code);
+		$this->app->set('language', $lang_code);
+		$language = JFactory::getLanguage();
+
+		if ($language->getTag() !== $lang_code)
+		{
+			$language_new = JLanguage::getInstance($lang_code);
+
+			foreach ($language->getPaths() as $extension => $files)
+			{
+				if (strpos($extension, 'plg_system') !== false)
+				{
+					$extension_name = substr($extension, 11);
+
+					$language_new->load($extension, JPATH_ADMINISTRATOR)
+					|| $language_new->load($extension, JPATH_PLUGINS . '/system/' . $extension_name);
+
+					continue;
+				}
+
+				$language_new->load($extension);
+			}
+
+			JFactory::$language = $language_new;
+			$this->app->loadLanguage($language_new);
+		}
+
+		// Create a cookie.
+		if ($this->getLanguageCookie() !== $lang_code)
+		{
+			$this->setLanguageCookie($lang_code);
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Before store user method.
+	 *
+	 * Method is called before user data is stored in the database.
+	 *
+	 * @param   array    $user   Holds the old user data.
+	 * @param   boolean  $isnew  True if a new user is stored.
+	 * @param   array    $new    Holds the new user data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onUserBeforeSave($user, $isnew, $new)
+	{
+		if (array_key_exists('params', $user) && $this->params->get('automatic_change', 1) == 1)
+		{
+			$registry = new Registry($user['params']);
+			$this->user_lang_code = $registry->get('language');
+
+			if (empty($this->user_lang_code))
+			{
+				$this->user_lang_code = $this->current_lang;
+			}
+		}
+	}
+
+	/**
+	 * After store user method.
+	 *
+	 * Method is called after user data is stored in the database.
+	 *
+	 * @param   array    $user     Holds the new user data.
+	 * @param   boolean  $isnew    True if a new user is stored.
+	 * @param   boolean  $success  True if user was succesfully stored in the database.
+	 * @param   string   $msg      Message.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onUserAfterSave($user, $isnew, $success, $msg)
+	{
+		if ($success && array_key_exists('params', $user) && $this->params->get('automatic_change', 1) == 1)
+		{
+			$registry = new Registry($user['params']);
+			$lang_code = $registry->get('language');
+
+			if (empty($lang_code))
+			{
+				$lang_code = $this->current_lang;
+			}
+
+			if ($lang_code === $this->user_lang_code || !isset($this->lang_codes[$lang_code]))
+			{
+				if ($this->app->isClient('site'))
+				{
+					$this->app->setUserState('com_users.edit.profile.redirect', null);
+				}
+			}
+			else
+			{
+				if ($this->app->isClient('site'))
+				{
+					$this->app->setUserState('com_users.edit.profile.redirect', 'index.php?Itemid='
+						. $this->app->getMenu()->getDefault($lang_code)->id . '&lang=' . $this->lang_codes[$lang_code]->sef
+					);
+
+					// Create a cookie.
+					$this->setLanguageCookie($lang_code);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to handle any login logic and report back to the subject.
+	 *
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (remember, autoregister, group).
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   1.5
+	 */
+	public function onUserLogin($user, $options = array())
+	{
+		$menu = $this->app->getMenu();
+
+		if ($this->app->isClient('site'))
+		{
+			if ($this->params->get('automatic_change', 1))
+			{
+				$assoc = JLanguageAssociations::isEnabled();
+				$lang_code = $user['language'];
+
+				// If no language is specified for this user, we set it to the site default language
+				if (empty($lang_code))
+				{
+					$lang_code = $this->default_lang;
+				}
+
+				jimport('joomla.filesystem.folder');
+
+				// The language has been deleted/disabled or the related content language does not exist/has been unpublished
+				// or the related home page does not exist/has been unpublished
+				if (!array_key_exists($lang_code, $this->lang_codes)
+					|| !array_key_exists($lang_code, JLanguageMultilang::getSiteHomePages())
+					|| !JFolder::exists(JPATH_SITE . '/language/' . $lang_code))
+				{
+					$lang_code = $this->current_lang;
+				}
+
+				// Try to get association from the current active menu item
+				$active = $menu->getActive();
+
+				$foundAssociation = false;
+
+				/**
+				 * Looking for associations.
+				 * If the login menu item form contains an internal URL redirection,
+				 * This will override the automatic change to the user preferred site language.
+				 * In that case we use the redirect as defined in the menu item.
+				 *  Otherwise we redirect, when available, to the user preferred site language.
+				 */
+				if ($active && !$active->params['login_redirect_url'])
+				{
+					if ($assoc)
+					{
+						$associations = MenusHelper::getAssociations($active->id);
+					}
+
+					// Retrieves the Itemid from a login form.
+					$uri = new JUri($this->app->getUserState('users.login.form.return'));
+
+					if ($uri->getVar('Itemid'))
+					{
+						// The login form contains a menu item redirection. Try to get associations from that menu item.
+						// If any association set to the user preferred site language, redirect to that page.
+						if ($assoc)
+						{
+							$associations = MenusHelper::getAssociations($uri->getVar('Itemid'));
+						}
+
+						if (isset($associations[$lang_code]) && $menu->getItem($associations[$lang_code]))
+						{
+							$associationItemid = $associations[$lang_code];
+							$this->app->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
+							$foundAssociation = true;
+						}
+					}
+					elseif (isset($associations[$lang_code]) && $menu->getItem($associations[$lang_code]))
+					{
+						/**
+						 * The login form does not contain a menu item redirection.
+						 * The active menu item has associations.
+						 * We redirect to the user preferred site language associated page.
+						 */
+						$associationItemid = $associations[$lang_code];
+						$this->app->setUserState('users.login.form.return', 'index.php?Itemid=' . $associationItemid);
+						$foundAssociation = true;
+					}
+					elseif ($active->home)
+					{
+						// We are on a Home page, we redirect to the user preferred site language Home page.
+						$item = $menu->getDefault($lang_code);
+
+						if ($item && $item->language !== $active->language && $item->language !== '*')
+						{
+							$this->app->setUserState('users.login.form.return', 'index.php?Itemid=' . $item->id);
+							$foundAssociation = true;
+						}
+					}
+				}
+
+				if ($foundAssociation && $lang_code !== $this->current_lang)
+				{
+					// Change language.
+					$this->current_lang = $lang_code;
+
+					// Create a cookie.
+					$this->setLanguageCookie($lang_code);
+
+					// Change the language code.
+					JFactory::getLanguage()->setLanguage($lang_code);
+				}
+			}
+			else
+			{
+				if ($this->app->getUserState('users.login.form.return'))
+				{
+					$this->app->setUserState('users.login.form.return', JRoute::_($this->app->getUserState('users.login.form.return'), false));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to add alternative meta tags for associated menu items.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.7
+	 */
+	public function onAfterDispatch()
+	{
+		$doc = JFactory::getDocument();
+
+		if ($this->app->isClient('site') && $this->params->get('alternate_meta', 1) && $doc->getType() === 'html')
+		{
+			$languages             = $this->lang_codes;
+			$homes                 = JLanguageMultilang::getSiteHomePages();
+			$menu                  = $this->app->getMenu();
+			$active                = $menu->getActive();
+			$levels                = JFactory::getUser()->getAuthorisedViewLevels();
+			$remove_default_prefix = $this->params->get('remove_default_prefix', 0);
+			$server                = JUri::getInstance()->toString(array('scheme', 'host', 'port'));
+			$is_home               = false;
+			$currentInternalUrl    = 'index.php?' . http_build_query($this->app->getRouter()->getVars());
+
+			if ($active)
+			{
+				$active_link  = JRoute::_($active->link . '&Itemid=' . $active->id);
+				$current_link = JRoute::_($currentInternalUrl);
+
+				// Load menu associations
+				if ($active_link === $current_link)
+				{
+					$associations = MenusHelper::getAssociations($active->id);
+				}
+
+				// Check if we are on the home page
+				$is_home = ($active->home
+					&& ($active_link === $current_link || $active_link === $current_link . 'index.php' || $active_link . '/' === $current_link));
+			}
+
+			// Load component associations.
+			$option = $this->app->input->get('option');
+			$cName = StringHelper::ucfirst(StringHelper::str_ireplace('com_', '', $option)) . 'HelperAssociation';
+			JLoader::register($cName, JPath::clean(JPATH_COMPONENT_SITE . '/helpers/association.php'));
+
+			if (class_exists($cName) && is_callable(array($cName, 'getAssociations')))
+			{
+				$cassociations = call_user_func(array($cName, 'getAssociations'));
+			}
+
+			// For each language...
+			foreach ($languages as $i => &$language)
+			{
+				switch (true)
+				{
+					// Language without frontend UI || Language without specific home menu || Language without authorized access level
+					case (!array_key_exists($i, JLanguageHelper::getInstalledLanguages(0))):
+					case (!isset($homes[$i])):
+					case (isset($language->access) && $language->access && !in_array($language->access, $levels)):
+						unset($languages[$i]);
+						break;
+
+					// Home page
+					case ($is_home):
+						$language->link = JRoute::_('index.php?lang=' . $language->sef . '&Itemid=' . $homes[$i]->id);
+						break;
+
+					// Current language link
+					case ($i === $this->current_lang):
+						$language->link = JRoute::_($currentInternalUrl);
+						break;
+
+					// Component association
+					case (isset($cassociations[$i])):
+						$language->link = JRoute::_($cassociations[$i] . '&lang=' . $language->sef);
+						break;
+
+					// Menu items association
+					// Heads up! "$item = $menu" here below is an assignment, *NOT* comparison
+					case (isset($associations[$i]) && ($item = $menu->getItem($associations[$i]))):
+
+						$language->link = JRoute::_('index.php?Itemid=' . $item->id . '&lang=' . $language->sef);
+						break;
+
+					// Too bad...
+					default:
+						unset($languages[$i]);
+				}
+			}
+
+			// If there are at least 2 of them, add the rel="alternate" links to the <head>
+			if (count($languages) > 1)
+			{
+				// Remove the sef from the default language if "Remove URL Language Code" is on
+				if ($remove_default_prefix && isset($languages[$this->default_lang]))
+				{
+					$languages[$this->default_lang]->link
+									= preg_replace('|/' . $languages[$this->default_lang]->sef . '/|', '/', $languages[$this->default_lang]->link, 1);
+				}
+
+				foreach ($languages as $i => &$language)
+				{
+					$doc->addHeadLink($server . $language->link, 'alternate', 'rel', array('hreflang' => $i));
+				}
+
+				// Add x-default language tag
+				if ($this->params->get('xdefault', 1))
+				{
+					$xdefault_language = $this->params->get('xdefault_language', $this->default_lang);
+					$xdefault_language = ($xdefault_language === 'default') ? $this->default_lang : $xdefault_language;
+
+					if (isset($languages[$xdefault_language]))
+					{
+						// Use a custom tag because addHeadLink is limited to one URI per tag
+						$doc->addCustomTag('<link href="' . $server . $languages[$xdefault_language]->link . '" rel="alternate" hreflang="x-default" />');
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Set the language cookie
+	 *
+	 * @param   string  $languageCode  The language code for which we want to set the cookie
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4.2
+	 */
+	private function setLanguageCookie($languageCode)
+	{
+		// If is set to use language cookie for a year in plugin params, save the user language in a new cookie.
+		if ((int) $this->params->get('lang_cookie', 0) === 1)
+		{
+			// Create a cookie with one year lifetime.
+			$this->app->input->cookie->set(
+				JApplicationHelper::getHash('language'),
+				$languageCode,
+				time() + 365 * 86400,
+				$this->app->get('cookie_path', '/'),
+				$this->app->get('cookie_domain', ''),
+				$this->app->isHttpsForced(),
+				true
+			);
+		}
+		// If not, set the user language in the session (that is already saved in a cookie).
+		else
+		{
+			JFactory::getSession()->set('plg_system_languagefilter.language', $languageCode);
+		}
+	}
+
+	/**
+	 * Get the language cookie
+	 *
+	 * @return  string
+	 *
+	 * @since   3.4.2
+	 */
+	private function getLanguageCookie()
+	{
+		// Is is set to use a year language cookie in plugin params, get the user language from the cookie.
+		if ((int) $this->params->get('lang_cookie', 0) === 1)
+		{
+			$languageCode = $this->app->input->cookie->get(JApplicationHelper::getHash('language'));
+		}
+		// Else get the user language from the session.
+		else
+		{
+			$languageCode = JFactory::getSession()->get('plg_system_languagefilter.language');
+		}
+
+		// Let's be sure we got a valid language code. Fallback to null.
+		if (!array_key_exists($languageCode, $this->lang_codes))
+		{
+			$languageCode = null;
+		}
+
+		return $languageCode;
+	}
+}
diff --git a/core/plugins/system/languagefilter/languagefilter.xml b/core/plugins/system/languagefilter/languagefilter.xml
new file mode 100644
index 00000000..065b7148
--- /dev/null
+++ b/core/plugins/system/languagefilter/languagefilter.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_languagefilter</name>
+	<author>Joomla! Project</author>
+	<creationDate>July 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SYSTEM_LANGUAGEFILTER_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="languagefilter">languagefilter.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_languagefilter.ini</language>
+		<language tag="en-GB">en-GB.plg_system_languagefilter.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="detect_browser"
+					type="list"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">PLG_SYSTEM_LANGUAGEFILTER_SITE_LANGUAGE</option>
+					<option value="1">PLG_SYSTEM_LANGUAGEFILTER_BROWSER_SETTINGS</option>
+				</field>
+
+				<field
+					name="automatic_change"
+					type="radio"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_AUTOMATIC_CHANGE_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="item_associations"
+					type="radio"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="alternate_meta"
+					type="radio"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_ALTERNATE_META_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="xdefault"
+					type="radio"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					showon="alternate_meta:1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="xdefault_language"
+					type="contentlanguage"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LANGUAGE_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LANGUAGE_DESC"
+					default="default"
+					showon="alternate_meta:1[AND]xdefault:1"
+					>
+					<option value="default">PLG_SYSTEM_LANGUAGEFILTER_OPTION_DEFAULT_LANGUAGE</option>
+				</field>
+
+				<field
+					name="remove_default_prefix"
+					type="radio"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_DESC"
+					default="0"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="lang_cookie"
+					type="list"
+					label="PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_LABEL"
+					description="PLG_SYSTEM_LANGUAGEFILTER_FIELD_COOKIE_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">PLG_SYSTEM_LANGUAGEFILTER_OPTION_YEAR</option>
+					<option value="0">PLG_SYSTEM_LANGUAGEFILTER_OPTION_SESSION</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
\ No newline at end of file
diff --git a/core/plugins/system/log/log.php b/core/plugins/system/log/log.php
new file mode 100644
index 00000000..58aa2c91
--- /dev/null
+++ b/core/plugins/system/log/log.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.log
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! System Logging Plugin.
+ *
+ * @since  1.5
+ */
+class PlgSystemLog extends JPlugin
+{
+	/**
+	 * Called if user fails to be logged in.
+	 *
+	 * @param   array  $response  Array of response data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
+	public function onUserLoginFailure($response)
+	{
+		$errorlog = array();
+
+		switch ($response['status'])
+		{
+			case JAuthentication::STATUS_SUCCESS:
+				$errorlog['status']  = $response['type'] . ' CANCELED: ';
+				$errorlog['comment'] = $response['error_message'];
+				break;
+
+			case JAuthentication::STATUS_FAILURE:
+				$errorlog['status']  = $response['type'] . ' FAILURE: ';
+
+				if ($this->params->get('log_username', 0))
+				{
+					$errorlog['comment'] = $response['error_message'] . ' ("' . $response['username'] . '")';
+				}
+				else
+				{
+					$errorlog['comment'] = $response['error_message'];
+				}
+				break;
+
+			default:
+				$errorlog['status']  = $response['type'] . ' UNKNOWN ERROR: ';
+				$errorlog['comment'] = $response['error_message'];
+				break;
+		}
+
+		JLog::addLogger(array(), JLog::INFO);
+
+		try
+		{
+			JLog::add($errorlog['comment'], JLog::INFO, $errorlog['status']);
+		}
+		catch (Exception $e)
+		{
+			// If the log file is unwriteable during login then we should not go to the error page
+			return;
+		}
+	}
+}
diff --git a/core/plugins/system/log/log.xml b/core/plugins/system/log/log.xml
new file mode 100644
index 00000000..b23e46e8
--- /dev/null
+++ b/core/plugins/system/log/log.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_log</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2007</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_LOG_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="log">log.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_log.ini</language>
+		<language tag="en-GB">en-GB.plg_system_log.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="log_username"
+					type="radio"
+					label="PLG_SYSTEM_LOG_FIELD_LOG_USERNAME_LABEL"
+					description="PLG_SYSTEM_LOG_FIELD_LOG_USERNAME_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/logout/logout.php b/core/plugins/system/logout/logout.php
new file mode 100644
index 00000000..53486a8e
--- /dev/null
+++ b/core/plugins/system/logout/logout.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.logout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Plugin class for logout redirect handling.
+ *
+ * @since  1.6
+ */
+class PlgSystemLogout extends JPlugin
+{
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.7.3
+	 */
+	protected $app;
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe -- event dispatcher.
+	 * @param   object  $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		// If we are on admin don't process.
+		if (!$this->app->isClient('site'))
+		{
+			return;
+		}
+
+		$hash  = JApplicationHelper::getHash('PlgSystemLogout');
+
+		if ($this->app->input->cookie->getString($hash))
+		{
+			// Destroy the cookie.
+			$this->app->input->cookie->set($hash, '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+
+			// Set the error handler for E_ALL to be the class handleError method.
+			JError::setErrorHandling(E_ALL, 'callback', array('PlgSystemLogout', 'handleError'));
+		}
+	}
+
+	/**
+	 * Method to handle any logout logic and report back to the subject.
+	 *
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (client, ...).
+	 *
+	 * @return  boolean  Always returns true.
+	 *
+	 * @since   1.6
+	 */
+	public function onUserLogout($user, $options = array())
+	{
+		if ($this->app->isClient('site'))
+		{
+			// Create the cookie.
+			$this->app->input->cookie->set(
+				JApplicationHelper::getHash('PlgSystemLogout'),
+				true,
+				time() + 86400,
+				$this->app->get('cookie_path', '/'),
+				$this->app->get('cookie_domain', ''),
+				$this->app->isHttpsForced(),
+				true
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method to handle an error condition.
+	 *
+	 * @param   Exception  &$error  The Exception object to be handled.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function handleError(&$error)
+	{
+		// Get the application object.
+		$app = JFactory::getApplication();
+
+		// Make sure the error is a 403 and we are in the frontend.
+		if ($error->getCode() == 403 && $app->isClient('site'))
+		{
+			// Redirect to the home page.
+			$app->enqueueMessage(JText::_('PLG_SYSTEM_LOGOUT_REDIRECT'));
+			$app->redirect('index.php');
+		}
+		else
+		{
+			// Render the custom error page.
+			JError::customErrorPage($error);
+		}
+	}
+}
diff --git a/core/plugins/system/logout/logout.xml b/core/plugins/system/logout/logout.xml
new file mode 100644
index 00000000..b41c9913
--- /dev/null
+++ b/core/plugins/system/logout/logout.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_logout</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2009</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SYSTEM_LOGOUT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="logout">logout.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_logout.ini</language>
+		<language tag="en-GB">en-GB.plg_system_logout.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/system/p3p/p3p.php b/core/plugins/system/p3p/p3p.php
new file mode 100644
index 00000000..162ae008
--- /dev/null
+++ b/core/plugins/system/p3p/p3p.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.p3p
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! P3P Header Plugin.
+ *
+ * @since  1.6
+ * @deprecate  4.0  Obsolete
+ */
+class PlgSystemP3p extends JPlugin
+{
+	/**
+	 * After initialise.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 * @deprecate  4.0  Obsolete
+	 */
+	public function onAfterInitialise()
+	{
+		// Get the header.
+		$header = $this->params->get('header', 'NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM');
+		$header = trim($header);
+
+		// Bail out on empty header (why would anyone do that?!).
+		if (empty($header))
+		{
+			return;
+		}
+
+		// Replace any existing P3P headers in the response.
+		JFactory::getApplication()->setHeader('P3P', 'CP="' . $header . '"', true);
+	}
+}
diff --git a/core/plugins/system/p3p/p3p.xml b/core/plugins/system/p3p/p3p.xml
new file mode 100644
index 00000000..552bb946
--- /dev/null
+++ b/core/plugins/system/p3p/p3p.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_p3p</name>
+	<author>Joomla! Project</author>
+	<creationDate>September 2010</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_P3P_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="p3p">p3p.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_p3p.ini</language>
+		<language tag="en-GB">en-GB.plg_system_p3p.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="header"
+					type="text"
+					label="PLG_P3P_HEADER_LABEL"
+					description="PLG_P3P_HEADER_DESCRIPTION"
+					default="NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM"
+					size="37"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/redirect/form/excludes.xml b/core/plugins/system/redirect/form/excludes.xml
new file mode 100644
index 00000000..3f4eae2c
--- /dev/null
+++ b/core/plugins/system/redirect/form/excludes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="term"
+			type="text"
+			label="PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_TERM_LABEL"
+			description="PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_TERM_DESC"
+			required="true"
+		/>
+		<field
+			name="regexp"
+			type="checkbox"
+			label="PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_REGEXP_LABEL"
+			description="PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_REGEXP_DESC"
+			filter="integer"
+		/>
+	</fieldset>
+</form>
diff --git a/core/plugins/system/redirect/redirect.php b/core/plugins/system/redirect/redirect.php
new file mode 100644
index 00000000..deebe6c2
--- /dev/null
+++ b/core/plugins/system/redirect/redirect.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.redirect
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+use Joomla\String\StringHelper;
+
+/**
+ * Plugin class for redirect handling.
+ *
+ * @since  1.6
+ */
+class PlgSystemRedirect extends JPlugin
+{
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  3.4
+	 */
+	protected $autoloadLanguage = false;
+
+	/**
+	 * The global exception handler registered before the plugin was instantiated
+	 *
+	 * @var    callable
+	 * @since  3.6
+	 */
+	private static $previousExceptionHandler;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
+	public function __construct(&$subject, $config)
+	{
+		parent::__construct($subject, $config);
+
+		// Set the JError handler for E_ERROR to be the class' handleError method.
+		JError::setErrorHandling(E_ERROR, 'callback', array('PlgSystemRedirect', 'handleError'));
+
+		// Register the previously defined exception handler so we can forward errors to it
+		self::$previousExceptionHandler = set_exception_handler(array('PlgSystemRedirect', 'handleException'));
+	}
+
+	/**
+	 * Method to handle an error condition from JError.
+	 *
+	 * @param   JException  $error  The JException object to be handled.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public static function handleError(JException $error)
+	{
+		self::doErrorHandling($error);
+	}
+
+	/**
+	 * Method to handle an uncaught exception.
+	 *
+	 * @param   Exception|Throwable  $exception  The Exception or Throwable object to be handled.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 * @throws  InvalidArgumentException
+	 */
+	public static function handleException($exception)
+	{
+		// If this isn't a Throwable then bail out
+		if (!($exception instanceof Throwable) && !($exception instanceof Exception))
+		{
+			throw new InvalidArgumentException(
+				sprintf('The error handler requires an Exception or Throwable object, a "%s" object was given instead.', get_class($exception))
+			);
+		}
+
+		self::doErrorHandling($exception);
+	}
+
+	/**
+	 * Internal processor for all error handlers
+	 *
+	 * @param   Exception|Throwable  $error  The Exception or Throwable object to be handled.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	private static function doErrorHandling($error)
+	{
+		$app = JFactory::getApplication();
+
+		if ($app->isClient('administrator') || ((int) $error->getCode() !== 404))
+		{
+			// Proxy to the previous exception handler if available, otherwise just render the error page
+			if (self::$previousExceptionHandler)
+			{
+				call_user_func_array(self::$previousExceptionHandler, array($error));
+			}
+			else
+			{
+				JErrorPage::render($error);
+			}
+		}
+
+		$uri = JUri::getInstance();
+
+		// These are the original URLs
+		$orgurl                = rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'query', 'fragment')));
+		$orgurlRel             = rawurldecode($uri->toString(array('path', 'query', 'fragment')));
+
+		// The above doesn't work for sub directories, so do this
+		$orgurlRootRel         = str_replace(JUri::root(), '', $orgurl);
+
+		// For when users have added / to the url
+		$orgurlRootRelSlash    = str_replace(JUri::root(), '/', $orgurl);
+		$orgurlWithoutQuery    = rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'fragment')));
+		$orgurlRelWithoutQuery = rawurldecode($uri->toString(array('path', 'fragment')));
+
+		// These are the URLs we save and use
+		$url                = StringHelper::strtolower(rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'query', 'fragment'))));
+		$urlRel             = StringHelper::strtolower(rawurldecode($uri->toString(array('path', 'query', 'fragment'))));
+
+		// The above doesn't work for sub directories, so do this
+		$urlRootRel         = str_replace(JUri::root(), '', $url);
+
+		// For when users have added / to the url
+		$urlRootRelSlash    = str_replace(JUri::root(), '/', $url);
+		$urlWithoutQuery    = StringHelper::strtolower(rawurldecode($uri->toString(array('scheme', 'host', 'port', 'path', 'fragment'))));
+		$urlRelWithoutQuery = StringHelper::strtolower(rawurldecode($uri->toString(array('path', 'fragment'))));
+
+		$plugin = JPluginHelper::getPlugin('system', 'redirect');
+
+		$params = new Registry($plugin->params);
+
+		$excludes = (array) $params->get('exclude_urls');
+
+		$skipUrl = false;
+
+		foreach ($excludes as $exclude)
+		{
+			if (empty($exclude->term))
+			{
+				continue;
+			}
+
+			if (!empty($exclude->regexp))
+			{
+				// Only check $url, because it includes all other sub urls
+				if (preg_match('/' . $exclude->term . '/i', $orgurlRel))
+				{
+					$skipUrl = true;
+					break;
+				}
+			}
+			else
+			{
+				if (StringHelper::strpos($orgurlRel, $exclude->term) !== false)
+				{
+					$skipUrl = true;
+					break;
+				}
+			}
+		}
+
+		// Why is this (still) here?
+		if ($skipUrl || (strpos($url, 'mosConfig_') !== false) || (strpos($url, '=http://') !== false))
+		{
+			JErrorPage::render($error);
+		}
+
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true);
+
+		$query->select('*')
+			->from($db->quoteName('#__redirect_links'))
+			->where(
+				'('
+				. $db->quoteName('old_url') . ' = ' . $db->quote($url)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($urlRel)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($urlRootRel)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($urlRootRelSlash)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($urlWithoutQuery)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($urlRelWithoutQuery)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurl)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlRel)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlRootRel)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlRootRelSlash)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlWithoutQuery)
+				. ' OR '
+				. $db->quoteName('old_url') . ' = ' . $db->quote($orgurlRelWithoutQuery)
+				. ')'
+			);
+
+		$db->setQuery($query);
+
+		$redirect = null;
+
+		try
+		{
+			$redirects = $db->loadAssocList();
+		}
+		catch (Exception $e)
+		{
+			JErrorPage::render(new Exception(JText::_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
+		}
+
+		$possibleMatches = array_unique(
+			array(
+				$url,
+				$urlRel,
+				$urlRootRel,
+				$urlRootRelSlash,
+				$urlWithoutQuery,
+				$urlRelWithoutQuery,
+				$orgurl,
+				$orgurlRel,
+				$orgurlRootRel,
+				$orgurlRootRelSlash,
+				$orgurlWithoutQuery,
+				$orgurlRelWithoutQuery,
+			)
+		);
+
+		foreach ($possibleMatches as $match)
+		{
+			if (($index = array_search($match, array_column($redirects, 'old_url'))) !== false)
+			{
+				$redirect = (object) $redirects[$index];
+
+				if ((int) $redirect->published === 1)
+				{
+					break;
+				}
+			}
+		}
+
+		// A redirect object was found and, if published, will be used
+		if ($redirect !== null && ((int) $redirect->published === 1))
+		{
+			if (!$redirect->header || (bool) JComponentHelper::getParams('com_redirect')->get('mode', false) === false)
+			{
+				$redirect->header = 301;
+			}
+
+			if ($redirect->header < 400 && $redirect->header >= 300)
+			{
+				$urlQuery = $uri->getQuery();
+
+				$oldUrlParts = parse_url($redirect->old_url);
+
+				if ($urlQuery !== '' && empty($oldUrlParts['query']))
+				{
+					$redirect->new_url .= '?' . $urlQuery;
+				}
+
+				$dest = JUri::isInternal($redirect->new_url) || strpos($redirect->new_url, 'http') === false ?
+					JRoute::_($redirect->new_url) : $redirect->new_url;
+
+				// In case the url contains double // lets remove it
+				$destination = str_replace(JUri::root() . '/', JUri::root(), $dest);
+
+				$app->redirect($destination, (int) $redirect->header);
+			}
+
+			JErrorPage::render(new RuntimeException($error->getMessage(), $redirect->header, $error));
+		}
+		// No redirect object was found so we create an entry in the redirect table
+		elseif ($redirect === null)
+		{
+			$params = new Registry(JPluginHelper::getPlugin('system', 'redirect')->params);
+
+			if ((bool) $params->get('collect_urls', 1))
+			{
+				if (!$params->get('includeUrl', 1))
+				{
+					$url = $urlRel;
+				}
+
+				$data = (object) array(
+					'id' => 0,
+					'old_url' => $url,
+					'referer' => $app->input->server->getString('HTTP_REFERER', ''),
+					'hits' => 1,
+					'published' => 0,
+					'created_date' => JFactory::getDate()->toSql()
+				);
+
+				try
+				{
+					$db->insertObject('#__redirect_links', $data, 'id');
+				}
+				catch (Exception $e)
+				{
+					JErrorPage::render(new Exception(JText::_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
+				}
+			}
+		}
+		// We have an unpublished redirect object, increment the hit counter
+		else
+		{
+			$redirect->hits++;
+
+			try
+			{
+				$db->updateObject('#__redirect_links', $redirect, 'id');
+			}
+			catch (Exception $e)
+			{
+				JErrorPage::render(new Exception(JText::_('PLG_SYSTEM_REDIRECT_ERROR_UPDATING_DATABASE'), 500, $e));
+			}
+		}
+
+		// Proxy to the previous exception handler if available, otherwise just render the error page
+		if (self::$previousExceptionHandler)
+		{
+			call_user_func_array(self::$previousExceptionHandler, array($error));
+		}
+		else
+		{
+			JErrorPage::render($error);
+		}
+	}
+}
diff --git a/core/plugins/system/redirect/redirect.xml b/core/plugins/system/redirect/redirect.xml
new file mode 100644
index 00000000..6438fb19
--- /dev/null
+++ b/core/plugins/system/redirect/redirect.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_redirect</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2009</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SYSTEM_REDIRECT_XML_DESCRIPTION</description>
+	<files>
+		<folder>form</folder>
+		<filename plugin="redirect">redirect.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_redirect.ini</language>
+		<language tag="en-GB">en-GB.plg_system_redirect.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="collect_urls"
+					type="radio"
+					label="PLG_SYSTEM_REDIRECT_FIELD_COLLECT_URLS_LABEL"
+					description="PLG_SYSTEM_REDIRECT_FIELD_COLLECT_URLS_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JENABLED</option>
+					<option value="0">JDISABLED</option>
+				</field>
+				<field
+					name="includeUrl"
+					type="radio"
+					label="PLG_SYSTEM_REDIRECT_FIELD_STORE_FULL_URL_LABEL"
+					description="PLG_SYSTEM_REDIRECT_FIELD_STORE_FULL_URL_DESC"
+					default="1"
+					filter="integer"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field
+					name="exclude_urls"
+					type="subform"
+					label="PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_LABEL"
+					description="PLG_SYSTEM_REDIRECT_FIELD_EXCLUDE_URLS_DESC"
+					multiple="true"
+					formsource="plugins/system/redirect/form/excludes.xml"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/remember/remember.php b/core/plugins/system/remember/remember.php
new file mode 100644
index 00000000..ec5dc22a
--- /dev/null
+++ b/core/plugins/system/remember/remember.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.remember
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! System Remember Me Plugin
+ *
+ * @since  1.5
+ */
+
+class PlgSystemRemember extends JPlugin
+{
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Remember me method to run onAfterInitialise
+	 * Only purpose is to initialise the login authentication process if a cookie is present
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 * @throws  InvalidArgumentException
+	 */
+	public function onAfterInitialise()
+	{
+		// Get the application if not done by JPlugin. This may happen during upgrades from Joomla 2.5.
+		if (!$this->app)
+		{
+			$this->app = JFactory::getApplication();
+		}
+
+		// No remember me for admin.
+		if ($this->app->isClient('administrator'))
+		{
+			return;
+		}
+
+		// Check for a cookie if user is not logged in
+		if (JFactory::getUser()->get('guest'))
+		{
+			$cookieName = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
+
+			// Try with old cookieName (pre 3.6.0) if not found
+			if (!$this->app->input->cookie->get($cookieName))
+			{
+				$cookieName = JUserHelper::getShortHashedUserAgent();
+			}
+
+			// Check for the cookie
+			if ($this->app->input->cookie->get($cookieName))
+			{
+				$this->app->login(array('username' => ''), array('silent' => true));
+			}
+		}
+	}
+
+	/**
+	 * Imports the authentication plugin on user logout to make sure that the cookie is destroyed.
+	 *
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (remember, autoregister, group).
+	 *
+	 * @return  boolean
+	 */
+	public function onUserLogout($user, $options)
+	{
+		// No remember me for admin
+		if ($this->app->isClient('administrator'))
+		{
+			return true;
+		}
+
+		$cookieName = 'joomla_remember_me_' . JUserHelper::getShortHashedUserAgent();
+
+		// Check for the cookie
+		if ($this->app->input->cookie->get($cookieName))
+		{
+			// Make sure authentication group is loaded to process onUserAfterLogout event
+			JPluginHelper::importPlugin('authentication');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method is called before user data is stored in the database
+	 * Invalidate all existing remember-me cookies after a password change
+	 *
+	 * @param   array    $user   Holds the old user data.
+	 * @param   boolean  $isnew  True if a new user is stored.
+	 * @param   array    $data   Holds the new user data.
+	 *
+	 * @return    boolean
+	 *
+	 * @since   3.8.6
+	 */
+	public function onUserBeforeSave($user, $isnew, $data)
+	{
+		// Irrelevant on new users
+		if ($isnew)
+		{
+			return true;
+		}
+
+		// Irrelevant, because password was not changed by user
+		if (empty($data['password_clear']))
+		{
+			return true;
+		}
+
+		/*
+		 * But now, we need to do something 
+		 * Delete all tokens for this user!
+		 */
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->delete('#__user_keys')
+			->where($db->quoteName('user_id') . ' = ' . $db->quote($user['username']));
+		try
+		{
+			$db->setQuery($query)->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			// Log an alert for the site admin
+			JLog::add(
+				sprintf('Failed to delete cookie token for user %s with the following error: %s', $user['username'], $e->getMessage()),
+				JLog::WARNING,
+				'security'
+			);
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/system/remember/remember.xml b/core/plugins/system/remember/remember.xml
new file mode 100644
index 00000000..f43aead4
--- /dev/null
+++ b/core/plugins/system/remember/remember.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_remember</name>
+	<author>Joomla! Project</author>
+	<creationDate>April 2007</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_REMEMBER_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="remember">remember.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_remember.ini</language>
+		<language tag="en-GB">en-GB.plg_system_remember.sys.ini</language>
+	</languages>
+</extension>
diff --git a/core/plugins/system/sef/sef.php b/core/plugins/system/sef/sef.php
new file mode 100644
index 00000000..dfe2eeda
--- /dev/null
+++ b/core/plugins/system/sef/sef.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.sef
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! SEF Plugin.
+ *
+ * @since  1.5
+ */
+class PlgSystemSef extends JPlugin
+{
+	/**
+	 * Application object.
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.5
+	 */
+	protected $app;
+
+	/**
+	 * Add the canonical uri to the head.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function onAfterDispatch()
+	{
+		$doc = $this->app->getDocument();
+
+		if (!$this->app->isClient('site') || $doc->getType() !== 'html')
+		{
+			return;
+		}
+
+		$sefDomain = $this->params->get('domain', false);
+
+		// Don't add a canonical html tag if no alternative domain has added in SEF plugin domain field.
+		if (empty($sefDomain))
+		{
+			return;
+		}
+
+		// Check if a canonical html tag already exists (for instance, added by a component).
+		$canonical = '';
+
+		foreach ($doc->_links as $linkUrl => $link)
+		{
+			if (isset($link['relation']) && $link['relation'] === 'canonical')
+			{
+				$canonical = $linkUrl;
+				break;
+			}
+		}
+
+		// If a canonical html tag already exists get the canonical and change it to use the SEF plugin domain field.
+		if (!empty($canonical))
+		{
+			// Remove current canonical link.
+			unset($doc->_links[$canonical]);
+
+			// Set the current canonical link but use the SEF system plugin domain field.
+			$canonical = $sefDomain . JUri::getInstance($canonical)->toString(array('path', 'query', 'fragment'));
+		}
+		// If a canonical html doesn't exists already add a canonical html tag using the SEF plugin domain field.
+		else
+		{
+			$canonical = $sefDomain . JUri::getInstance()->toString(array('path', 'query', 'fragment'));
+		}
+
+		// Add the canonical link.
+		$doc->addHeadLink(htmlspecialchars($canonical), 'canonical');
+	}
+
+	/**
+	 * Convert the site URL to fit to the HTTP request.
+	 *
+	 * @return  void
+	 */
+	public function onAfterRender()
+	{
+		if (!$this->app->isClient('site'))
+		{
+			return;
+		}
+
+		// Replace src links.
+		$base   = JUri::base(true) . '/';
+		$buffer = $this->app->getBody();
+
+		// For feeds we need to search for the URL with domain.
+		$prefix = $this->app->getDocument()->getType() === 'feed' ? JUri::root() : '';
+
+		// Replace index.php URI by SEF URI.
+		if (strpos($buffer, 'href="' . $prefix . 'index.php?') !== false)
+		{
+			preg_match_all('#href="' . $prefix . 'index.php\?([^"]+)"#m', $buffer, $matches);
+
+			foreach ($matches[1] as $urlQueryString)
+			{
+				$buffer = str_replace(
+					'href="' . $prefix . 'index.php?' . $urlQueryString . '"',
+					'href="' . trim($prefix, '/') . JRoute::_('index.php?' . $urlQueryString) . '"',
+					$buffer
+				);
+			}
+
+			$this->checkBuffer($buffer);
+		}
+
+		// Check for all unknown protocals (a protocol must contain at least one alpahnumeric character followed by a ":").
+		$protocols  = '[a-zA-Z0-9\-]+:';
+		$attributes = array('href=', 'src=', 'poster=');
+
+		foreach ($attributes as $attribute)
+		{
+			if (strpos($buffer, $attribute) !== false)
+			{
+				$regex  = '#\s' . $attribute . '"(?!/|' . $protocols . '|\#|\')([^"]*)"#m';
+				$buffer = preg_replace($regex, ' ' . $attribute . '"' . $base . '$1"', $buffer);
+				$this->checkBuffer($buffer);
+			}
+		}
+
+		if (strpos($buffer, 'srcset=') !== false)
+		{
+			$regex = '#\s+srcset="([^"]+)"#m';
+
+			$buffer = preg_replace_callback(
+				$regex,
+				function ($match) use ($base, $protocols)
+				{
+					preg_match_all('#(?:[^\s]+)\s*(?:[\d\.]+[wx])?(?:\,\s*)?#i', $match[1], $matches);
+
+					foreach ($matches[0] as &$src)
+					{
+						$src = preg_replace('#^(?!/|' . $protocols . '|\#|\')(.+)#', $base . '$1', $src);
+					}
+
+					return ' srcset="' . implode($matches[0]) . '"';
+				},
+				$buffer
+			);
+
+			$this->checkBuffer($buffer);
+		}
+
+		// Replace all unknown protocals in javascript window open events.
+		if (strpos($buffer, 'window.open(') !== false)
+		{
+			$regex  = '#onclick="window.open\(\'(?!/|' . $protocols . '|\#)([^/]+[^\']*?\')#m';
+			$buffer = preg_replace($regex, 'onclick="window.open(\'' . $base . '$1', $buffer);
+			$this->checkBuffer($buffer);
+		}
+
+		// Replace all unknown protocols in onmouseover and onmouseout attributes.
+		$attributes = array('onmouseover=', 'onmouseout=');
+
+		foreach ($attributes as $attribute)
+		{
+			if (strpos($buffer, $attribute) !== false)
+			{
+				$regex  = '#' . $attribute . '"this.src=([\']+)(?!/|' . $protocols . '|\#|\')([^"]+)"#m';
+				$buffer = preg_replace($regex, $attribute . '"this.src=$1' . $base . '$2"', $buffer);
+				$this->checkBuffer($buffer);
+			}
+		}
+
+		// Replace all unknown protocols in CSS background image.
+		if (strpos($buffer, 'style=') !== false)
+		{
+			$regex_url  = '\s*url\s*\(([\'\"]|\&\#0?3[49];)?(?!/|\&\#0?3[49];|' . $protocols . '|\#)([^\)\'\"]+)([\'\"]|\&\#0?3[49];)?\)';
+			$regex  = '#style=\s*([\'\"])(.*):' . $regex_url . '#m';
+			$buffer = preg_replace($regex, 'style=$1$2: url($3' . $base . '$4$5)', $buffer);
+			$this->checkBuffer($buffer);
+		}
+
+		// Replace all unknown protocols in OBJECT param tag.
+		if (strpos($buffer, '<param') !== false)
+		{
+			// OBJECT <param name="xx", value="yy"> -- fix it only inside the <param> tag.
+			$regex  = '#(<param\s+)name\s*=\s*"(movie|src|url)"[^>]\s*value\s*=\s*"(?!/|' . $protocols . '|\#|\')([^"]*)"#m';
+			$buffer = preg_replace($regex, '$1name="$2" value="' . $base . '$3"', $buffer);
+			$this->checkBuffer($buffer);
+
+			// OBJECT <param value="xx", name="yy"> -- fix it only inside the <param> tag.
+			$regex  = '#(<param\s+[^>]*)value\s*=\s*"(?!/|' . $protocols . '|\#|\')([^"]*)"\s*name\s*=\s*"(movie|src|url)"#m';
+			$buffer = preg_replace($regex, '<param value="' . $base . '$2" name="$3"', $buffer);
+			$this->checkBuffer($buffer);
+		}
+
+		// Replace all unknown protocols in OBJECT tag.
+		if (strpos($buffer, '<object') !== false)
+		{
+			$regex  = '#(<object\s+[^>]*)data\s*=\s*"(?!/|' . $protocols . '|\#|\')([^"]*)"#m';
+			$buffer = preg_replace($regex, '$1data="' . $base . '$2"', $buffer);
+			$this->checkBuffer($buffer);
+		}
+
+		// Use the replaced HTML body.
+		$this->app->setBody($buffer);
+	}
+
+	/**
+	 * Check the buffer.
+	 *
+	 * @param   string  $buffer  Buffer to be checked.
+	 *
+	 * @return  void
+	 */
+	private function checkBuffer($buffer)
+	{
+		if ($buffer === null)
+		{
+			switch (preg_last_error())
+			{
+				case PREG_BACKTRACK_LIMIT_ERROR:
+					$message = 'PHP regular expression limit reached (pcre.backtrack_limit)';
+					break;
+				case PREG_RECURSION_LIMIT_ERROR:
+					$message = 'PHP regular expression limit reached (pcre.recursion_limit)';
+					break;
+				case PREG_BAD_UTF8_ERROR:
+					$message = 'Bad UTF8 passed to PCRE function';
+					break;
+				default:
+					$message = 'Unknown PCRE error calling PCRE function';
+			}
+
+			throw new RuntimeException($message);
+		}
+	}
+
+	/**
+	 * Replace the matched tags.
+	 *
+	 * @param   array  &$matches  An array of matches (see preg_match_all).
+	 *
+	 * @return  string
+	 *
+	 * @deprecated  4.0  No replacement.
+	 */
+	protected static function route(&$matches)
+	{
+		JLog::add(__METHOD__ . ' is deprecated, no replacement.', JLog::WARNING, 'deprecated');
+
+		$url   = $matches[1];
+		$url   = str_replace('&amp;', '&', $url);
+		$route = JRoute::_('index.php?' . $url);
+
+		return 'href="' . $route;
+	}
+}
diff --git a/core/plugins/system/sef/sef.xml b/core/plugins/system/sef/sef.xml
new file mode 100644
index 00000000..be0f4368
--- /dev/null
+++ b/core/plugins/system/sef/sef.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_system_sef</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2007</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_SEF_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="sef">sef.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_system_sef.ini</language>
+		<language tag="en-GB">en-GB.plg_system_sef.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="domain"
+					type="url"
+					label="PLG_SEF_DOMAIN_LABEL"
+					description="PLG_SEF_DOMAIN_DESCRIPTION"
+					hint="https://www.example.com"
+					filter="url"
+					validate="url"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/sessiongc/sessiongc.php b/core/plugins/system/sessiongc/sessiongc.php
new file mode 100644
index 00000000..c9763e9e
--- /dev/null
+++ b/core/plugins/system/sessiongc/sessiongc.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.sessiongc
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Session\MetadataManager;
+
+/**
+ * Garbage collection handler for session related data
+ *
+ * @since  3.8.6
+ */
+class PlgSystemSessionGc extends CMSPlugin
+{
+	/**
+	 * Application object
+	 *
+	 * @var    CMSApplication
+	 * @since  3.8.6
+	 */
+	protected $app;
+
+	/**
+	 * Database driver
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.8.6
+	 */
+	protected $db;
+
+	/**
+	 * Runs after the HTTP response has been sent to the client and performs garbage collection tasks
+	 *
+	 * @return  void
+	 *
+	 * @since   3.8.6
+	 */
+	public function onAfterRespond()
+	{
+		$session = Factory::getSession();
+
+		if ($this->params->get('enable_session_gc', 1))
+		{
+			$probability = $this->params->get('gc_probability', 1);
+			$divisor     = $this->params->get('gc_divisor', 100);
+
+			$random = $divisor * lcg_value();
+
+			if ($probability > 0 && $random < $probability)
+			{
+				$session->gc();
+			}
+		}
+
+		if ($this->app->get('session_handler', 'none') !== 'database' && $this->params->get('enable_session_metadata_gc', 1))
+		{
+			$probability = $this->params->get('gc_probability', 1);
+			$divisor     = $this->params->get('gc_divisor', 100);
+
+			$random = $divisor * lcg_value();
+
+			if ($probability > 0 && $random < $probability)
+			{
+				$metadataManager = new MetadataManager($this->app, $this->db);
+				$metadataManager->deletePriorTo(time() - $session->getExpire());
+			}
+		}
+	}
+}
diff --git a/core/plugins/system/sessiongc/sessiongc.xml b/core/plugins/system/sessiongc/sessiongc.xml
new file mode 100644
index 00000000..ac4df63a
--- /dev/null
+++ b/core/plugins/system/sessiongc/sessiongc.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.8" type="plugin" group="system" method="upgrade">
+	<name>plg_system_sessiongc</name>
+	<author>Joomla! Project</author>
+	<creationDate>February 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.8.6</version>
+	<description>PLG_SYSTEM_SESSIONGC_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="sessiongc">sessiongc.php</filename>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.plg_system_sessiongc.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_system_sessiongc.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="enable_session_gc"
+					type="radio"
+					label="PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_GC_LABEL"
+					description="PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_GC_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="uint"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="enable_session_metadata_gc"
+					type="radio"
+					label="PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_METADATA_GC_LABEL"
+					description="PLG_SYSTEM_SESSIONGC_ENABLE_SESSION_METADATA_GC_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					filter="uint"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="gc_probability"
+					type="number"
+					label="PLG_SYSTEM_SESSIONGC_GC_PROBABILITY_LABEL"
+					description="PLG_SYSTEM_SESSIONGC_GC_PROBABILITY_DESC"
+					filter="uint"
+					validate="number"
+					min="1"
+					default="1"
+					showon="enable_session_gc:1[OR]enable_session_metadata_gc:1"
+				/>
+
+				<field
+					name="gc_divisor"
+					type="number"
+					label="PLG_SYSTEM_SESSIONGC_GC_DIVISOR_LABEL"
+					description="PLG_SYSTEM_SESSIONGC_GC_DIVISOR_DESC"
+					filter="uint"
+					validate="number"
+					min="1"
+					default="100"
+					showon="enable_session_gc:1[OR]enable_session_metadata_gc:1"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/stats/field/base.php b/core/plugins/system/stats/field/base.php
new file mode 100644
index 00000000..56d5ba2b
--- /dev/null
+++ b/core/plugins/system/stats/field/base.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Base field for the Stats Plugin.
+ *
+ * @since  3.5
+ */
+abstract class PlgSystemStatsFormFieldBase extends JFormField
+{
+	/**
+	 * Get the layouts paths
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutPaths()
+	{
+		$template = JFactory::getApplication()->getTemplate();
+
+		return array(
+			JPATH_ADMINISTRATOR . '/templates/' . $template . '/html/layouts/plugins/system/stats',
+			dirname(__DIR__) . '/layouts',
+			JPATH_SITE . '/layouts'
+		);
+	}
+}
diff --git a/core/plugins/system/stats/field/data.php b/core/plugins/system/stats/field/data.php
new file mode 100644
index 00000000..c7f00e96
--- /dev/null
+++ b/core/plugins/system/stats/field/data.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('PlgSystemStatsFormFieldBase', __DIR__ . '/base.php');
+
+/**
+ * Unique ID Field class for the Stats Plugin.
+ *
+ * @since  3.5
+ */
+class PlgSystemStatsFormFieldData extends PlgSystemStatsFormFieldBase
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $type = 'Data';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout = 'field.data';
+
+	/**
+	 * Method to get the data to be passed to the layout for rendering.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutData()
+	{
+		$data       = parent::getLayoutData();
+
+		$dispatcher = JEventDispatcher::getInstance();
+		JPluginHelper::importPlugin('system', 'stats');
+
+		$result = $dispatcher->trigger('onGetStatsData', array('stats.field.data'));
+
+		$data['statsData'] = $result ? reset($result) : array();
+
+		return $data;
+	}
+}
diff --git a/core/plugins/system/stats/field/uniqueid.php b/core/plugins/system/stats/field/uniqueid.php
new file mode 100644
index 00000000..246b3106
--- /dev/null
+++ b/core/plugins/system/stats/field/uniqueid.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('PlgSystemStatsFormFieldBase', __DIR__ . '/base.php');
+
+/**
+ * Unique ID Field class for the Stats Plugin.
+ *
+ * @since  3.5
+ */
+class PlgSystemStatsFormFieldUniqueid extends PlgSystemStatsFormFieldBase
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $type = 'Uniqueid';
+
+	/**
+	 * Name of the layout being used to render the field
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $layout = 'field.uniqueid';
+}
diff --git a/core/plugins/system/stats/layouts/field/data.php b/core/plugins/system/stats/layouts/field/data.php
new file mode 100644
index 00000000..f77845df
--- /dev/null
+++ b/core/plugins/system/stats/layouts/field/data.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $options         Options available for this field.
+ * @var   array    $statsData       Statistics that will be sent to the stats server
+ */
+
+JHtml::_('jquery.framework');
+?>
+<a href="#" onclick="jQuery(this).next().toggle(200); return false;"><?php echo JText::_('PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT'); ?></a>
+<?php
+echo $field->render('stats', compact('statsData'));
diff --git a/core/plugins/system/stats/layouts/field/uniqueid.php b/core/plugins/system/stats/layouts/field/uniqueid.php
new file mode 100644
index 00000000..537521da
--- /dev/null
+++ b/core/plugins/system/stats/layouts/field/uniqueid.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $options         Options available for this field.
+ */
+?>
+<input type="hidden" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" />
+<a class="btn" onclick="document.getElementById('<?php echo $id; ?>').value='';Joomla.submitbutton('plugin.apply');">
+	<span class="icon-refresh"></span> <?php echo JText::_('PLG_SYSTEM_STATS_RESET_UNIQUE_ID'); ?>
+</a>
\ No newline at end of file
diff --git a/core/plugins/system/stats/layouts/message.php b/core/plugins/system/stats/layouts/message.php
new file mode 100644
index 00000000..c6a08342
--- /dev/null
+++ b/core/plugins/system/stats/layouts/message.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var  PlgSystemStats             $plugin        Plugin rendering this layout
+ * @var  \Joomla\Registry\Registry  $pluginParams  Plugin parameters
+ * @var  array                      $statsData     Array containing the data that will be sent to the stats server
+ */
+?>
+<div class="alert alert-info js-pstats-alert" style="display:none;">
+	<button data-dismiss="alert" class="close" type="button">×</button>
+	<h2><?php echo JText::_('PLG_SYSTEM_STATS_LABEL_MESSAGE_TITLE'); ?></h2>
+	<p>
+		<?php echo JText::_('PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA'); ?>
+		<a href="#" class="js-pstats-btn-details alert-link"><?php echo JText::_('PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT'); ?></a>
+	</p>
+	<?php
+		echo $plugin->render('stats', compact('statsData'));
+	?>
+	<p><?php echo JText::_('PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA'); ?></p>
+	<p class="actions">
+		<a href="#" class="btn js-pstats-btn-allow-always"><?php echo JText::_('PLG_SYSTEM_STATS_BTN_SEND_ALWAYS'); ?></a>
+		<a href="#" class="btn js-pstats-btn-allow-once"><?php echo JText::_('PLG_SYSTEM_STATS_BTN_SEND_NOW'); ?></a>
+		<a href="#" class="btn js-pstats-btn-allow-never"><?php echo JText::_('PLG_SYSTEM_STATS_BTN_NEVER_SEND'); ?></a>
+	</p>
+</div>
diff --git a/core/plugins/system/stats/layouts/stats.php b/core/plugins/system/stats/layouts/stats.php
new file mode 100644
index 00000000..dc067c96
--- /dev/null
+++ b/core/plugins/system/stats/layouts/stats.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var  array  $statsData  Array containing the data that will be sent to the stats server
+ */
+
+$versionFields = array('php_version', 'db_version', 'cms_version');
+?>
+<dl class="dl-horizontal js-pstats-data-details"  style="display:none;">
+	<?php foreach ($statsData as $key => $value) : ?>
+		<dt><?php echo JText::_('PLG_SYSTEM_STATS_LABEL_' . strtoupper($key)); ?></dt>
+		<dd><?php echo in_array($key, $versionFields) ? (preg_match('/\d+(?:\.\d+)+/', $value, $matches) ? $matches[0] : $value) : $value; ?></dd>
+	<?php endforeach; ?>
+</dl>
diff --git a/core/plugins/system/stats/stats.php b/core/plugins/system/stats/stats.php
new file mode 100644
index 00000000..d886c0b6
--- /dev/null
+++ b/core/plugins/system/stats/stats.php
@@ -0,0 +1,564 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.stats
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Uncomment the following line to enable debug mode for testing purposes. Note: statistics will be sent on every page load
+// define('PLG_SYSTEM_STATS_DEBUG', 1);
+
+/**
+ * Statistics system plugin. This sends anonymous data back to the Joomla! Project about the
+ * PHP, SQL, Joomla and OS versions
+ *
+ * @since  3.5
+ */
+class PlgSystemStats extends JPlugin
+{
+	/**
+	 * @const  integer
+	 * @since  3.5
+	 */
+	const MODE_ALLOW_ALWAYS = 1;
+
+	/**
+	 * @const  integer
+	 * @since  3.5
+	 */
+	const MODE_ALLOW_ONCE = 2;
+
+	/**
+	 * @const  integer
+	 * @since  3.5
+	 */
+	const MODE_ALLOW_NEVER = 3;
+
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.5
+	 */
+	protected $app;
+
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.5
+	 */
+	protected $db;
+
+	/**
+	 * URL to send the statistics.
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $serverUrl = 'https://developer.joomla.org/stats/submit';
+
+	/**
+	 * Unique identifier for this site
+	 *
+	 * @var    string
+	 * @since  3.5
+	 */
+	protected $uniqueId;
+
+	/**
+	 * Listener for the `onAfterInitialise` event
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function onAfterInitialise()
+	{
+		if (!$this->app->isClient('administrator') || !$this->isAllowedUser())
+		{
+			return;
+		}
+
+		if (!$this->isDebugEnabled() && !$this->isUpdateRequired())
+		{
+			return;
+		}
+
+		if (JUri::getInstance()->getVar('tmpl') === 'component')
+		{
+			return;
+		}
+
+		// Load plugin language files only when needed (ex: they are not needed in site client).
+		$this->loadLanguage();
+
+		JHtml::_('jquery.framework');
+		JHtml::_('script', 'plg_system_stats/stats.js', array('version' => 'auto', 'relative' => true));
+	}
+
+	/**
+	 * User selected to always send data
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 *
+	 * @throws  Exception         If user is not allowed.
+	 * @throws  RuntimeException  If there is an error saving the params or sending the data.
+	 */
+	public function onAjaxSendAlways()
+	{
+		if (!$this->isAllowedUser() || !$this->isAjaxRequest())
+		{
+			throw new Exception(JText::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+		}
+
+		$this->params->set('mode', static::MODE_ALLOW_ALWAYS);
+
+		if (!$this->saveParams())
+		{
+			throw new RuntimeException('Unable to save plugin settings', 500);
+		}
+
+		$this->sendStats();
+
+		echo json_encode(array('sent' => 1));
+	}
+
+	/**
+	 * User selected to never send data.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 *
+	 * @throws  Exception         If user is not allowed.
+	 * @throws  RuntimeException  If there is an error saving the params.
+	 */
+	public function onAjaxSendNever()
+	{
+		if (!$this->isAllowedUser() || !$this->isAjaxRequest())
+		{
+			throw new Exception(JText::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+		}
+
+		$this->params->set('mode', static::MODE_ALLOW_NEVER);
+
+		if (!$this->saveParams())
+		{
+			throw new RuntimeException('Unable to save plugin settings', 500);
+		}
+
+		echo json_encode(array('sent' => 0));
+	}
+
+	/**
+	 * User selected to send data once.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 *
+	 * @throws  Exception         If user is not allowed.
+	 * @throws  RuntimeException  If there is an error saving the params or sending the data.
+	 */
+	public function onAjaxSendOnce()
+	{
+		if (!$this->isAllowedUser() || !$this->isAjaxRequest())
+		{
+			throw new Exception(JText::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+		}
+
+		$this->params->set('mode', static::MODE_ALLOW_ONCE);
+
+		if (!$this->saveParams())
+		{
+			throw new RuntimeException('Unable to save plugin settings', 500);
+		}
+
+		$this->sendStats();
+
+		echo json_encode(array('sent' => 1));
+	}
+
+	/**
+	 * Send the stats to the server.
+	 * On first load | on demand mode it will show a message asking users to select mode.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 *
+	 * @throws  Exception         If user is not allowed.
+	 * @throws  RuntimeException  If there is an error saving the params or sending the data.
+	 */
+	public function onAjaxSendStats()
+	{
+		if (!$this->isAllowedUser() || !$this->isAjaxRequest())
+		{
+			throw new Exception(JText::_('JGLOBAL_AUTH_ACCESS_DENIED'), 403);
+		}
+
+		// User has not selected the mode. Show message.
+		if ((int) $this->params->get('mode') !== static::MODE_ALLOW_ALWAYS)
+		{
+			$data = array(
+				'sent' => 0,
+				'html' => $this->getRenderer('message')->render($this->getLayoutData())
+			);
+
+			echo json_encode($data);
+
+			return;
+		}
+
+		if (!$this->saveParams())
+		{
+			throw new RuntimeException('Unable to save plugin settings', 500);
+		}
+
+		$this->sendStats();
+
+		echo json_encode(array('sent' => 1));
+	}
+
+	/**
+	 * Get the data through events
+	 *
+	 * @param   string  $context  Context where this will be called from
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	public function onGetStatsData($context)
+	{
+		return $this->getStatsData();
+	}
+
+	/**
+	 * Debug a layout of this plugin
+	 *
+	 * @param   string  $layoutId  Layout identifier
+	 * @param   array   $data      Optional data for the layout
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public function debug($layoutId, $data = array())
+	{
+		$data = array_merge($this->getLayoutData(), $data);
+
+		return $this->getRenderer($layoutId)->debug($data);
+	}
+
+	/**
+	 * Get the data for the layout
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutData()
+	{
+		return array(
+			'plugin'       => $this,
+			'pluginParams' => $this->params,
+			'statsData'    => $this->getStatsData()
+		);
+	}
+
+	/**
+	 * Get the layout paths
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	protected function getLayoutPaths()
+	{
+		$template = JFactory::getApplication()->getTemplate();
+
+		return array(
+			JPATH_ADMINISTRATOR . '/templates/' . $template . '/html/layouts/plugins/' . $this->_type . '/' . $this->_name,
+			__DIR__ . '/layouts',
+		);
+	}
+
+	/**
+	 * Get the plugin renderer
+	 *
+	 * @param   string  $layoutId  Layout identifier
+	 *
+	 * @return  JLayout
+	 *
+	 * @since   3.5
+	 */
+	protected function getRenderer($layoutId = 'default')
+	{
+		$renderer = new JLayoutFile($layoutId);
+
+		$renderer->setIncludePaths($this->getLayoutPaths());
+
+		return $renderer;
+	}
+
+	/**
+	 * Get the data that will be sent to the stats server.
+	 *
+	 * @return  array
+	 *
+	 * @since   3.5
+	 */
+	private function getStatsData()
+	{
+		return array(
+			'unique_id'   => $this->getUniqueId(),
+			'php_version' => PHP_VERSION,
+			'db_type'     => $this->db->name,
+			'db_version'  => $this->db->getVersion(),
+			'cms_version' => JVERSION,
+			'server_os'   => php_uname('s') . ' ' . php_uname('r')
+		);
+	}
+
+	/**
+	 * Get the unique id. Generates one if none is set.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.5
+	 */
+	private function getUniqueId()
+	{
+		if (null === $this->uniqueId)
+		{
+			$this->uniqueId = $this->params->get('unique_id', hash('sha1', JUserHelper::genRandomPassword(28) . time()));
+		}
+
+		return $this->uniqueId;
+	}
+
+	/**
+	 * Check if current user is allowed to send the data
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	private function isAllowedUser()
+	{
+		return JFactory::getUser()->authorise('core.admin');
+	}
+
+	/**
+	 * Check if the debug is enabled
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	private function isDebugEnabled()
+	{
+		return defined('PLG_SYSTEM_STATS_DEBUG');
+	}
+
+	/**
+	 * Check if last_run + interval > now
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	private function isUpdateRequired()
+	{
+		$last     = (int) $this->params->get('lastrun', 0);
+		$interval = (int) $this->params->get('interval', 12);
+		$mode     = (int) $this->params->get('mode', 0);
+
+		if ($mode === static::MODE_ALLOW_NEVER)
+		{
+			return false;
+		}
+
+		// Never updated or debug enabled
+		if (!$last || $this->isDebugEnabled())
+		{
+			return true;
+		}
+
+		return (abs(time() - $last) > $interval * 3600);
+	}
+
+	/**
+	 * Check valid AJAX request
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	private function isAjaxRequest()
+	{
+		return strtolower($this->app->input->server->get('HTTP_X_REQUESTED_WITH', '')) === 'xmlhttprequest';
+	}
+
+	/**
+	 * Render a layout of this plugin
+	 *
+	 * @param   string  $layoutId  Layout identifier
+	 * @param   array   $data      Optional data for the layout
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public function render($layoutId, $data = array())
+	{
+		$data = array_merge($this->getLayoutData(), $data);
+
+		return $this->getRenderer($layoutId)->render($data);
+	}
+
+	/**
+	 * Save the plugin parameters
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 */
+	private function saveParams()
+	{
+		// Update params
+		$this->params->set('lastrun', time());
+		$this->params->set('unique_id', $this->getUniqueId());
+		$interval = (int) $this->params->get('interval', 12);
+		$this->params->set('interval', $interval ?: 12);
+
+		$query = $this->db->getQuery(true)
+				->update($this->db->quoteName('#__extensions'))
+				->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON')))
+				->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin'))
+				->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('system'))
+				->where($this->db->quoteName('element') . ' = ' . $this->db->quote('stats'));
+
+		try
+		{
+			// Lock the tables to prevent multiple plugin executions causing a race condition
+			$this->db->lockTable('#__extensions');
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables it's too risky to continue execution
+			return false;
+		}
+
+		try
+		{
+			// Update the plugin parameters
+			$result = $this->db->setQuery($query)->execute();
+
+			$this->clearCacheGroups(array('com_plugins'), array(0, 1));
+		}
+		catch (Exception $exc)
+		{
+			// If we failed to execute
+			$this->db->unlockTables();
+			$result = false;
+		}
+
+		try
+		{
+			// Unlock the tables after writing
+			$this->db->unlockTables();
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables assume we have somehow failed
+			$result = false;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Send the stats to the stats server
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.5
+	 *
+	 * @throws  RuntimeException  If there is an error sending the data.
+	 */
+	private function sendStats()
+	{
+		try
+		{
+			// Don't let the request take longer than 2 seconds to avoid page timeout issues
+			$response = JHttpFactory::getHttp()->post($this->serverUrl, $this->getStatsData(), null, 2);
+		}
+		catch (UnexpectedValueException $e)
+		{
+			// There was an error sending stats. Should we do anything?
+			throw new RuntimeException('Could not send site statistics to remote server: ' . $e->getMessage(), 500);
+		}
+		catch (RuntimeException $e)
+		{
+			// There was an error connecting to the server or in the post request
+			throw new RuntimeException('Could not connect to statistics server: ' . $e->getMessage(), 500);
+		}
+		catch (Exception $e)
+		{
+			// An unexpected error in processing; don't let this failure kill the site
+			throw new RuntimeException('Unexpected error connecting to statistics server: ' . $e->getMessage(), 500);
+		}
+
+		if ($response->code !== 200)
+		{
+			$data = json_decode($response->body);
+
+			throw new RuntimeException('Could not send site statistics to remote server: ' . $data->message, $response->code);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
+	 *
+	 * @param   array  $clearGroups   The cache groups to clean
+	 * @param   array  $cacheClients  The cache clients (site, admin) to clean
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	private function clearCacheGroups(array $clearGroups, array $cacheClients = array(0, 1))
+	{
+		foreach ($clearGroups as $group)
+		{
+			foreach ($cacheClients as $client_id)
+			{
+				try
+				{
+					$options = array(
+						'defaultgroup' => $group,
+						'cachebase'    => $client_id ? JPATH_ADMINISTRATOR . '/cache' : $this->app->get('cache_path', JPATH_SITE . '/cache')
+					);
+
+					$cache = JCache::getInstance('callback', $options);
+					$cache->clean();
+				}
+				catch (Exception $e)
+				{
+					// Ignore it
+				}
+			}
+		}
+	}
+}
diff --git a/core/plugins/system/stats/stats.xml b/core/plugins/system/stats/stats.xml
new file mode 100644
index 00000000..d4bde9b7
--- /dev/null
+++ b/core/plugins/system/stats/stats.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.6" type="plugin" group="system" method="upgrade">
+	<name>plg_system_stats</name>
+	<author>Joomla! Project</author>
+	<creationDate>November 2013</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>PLG_SYSTEM_STATS_XML_DESCRIPTION</description>
+	<files>
+		<folder>field</folder>
+		<folder>layouts</folder>
+		<filename plugin="stats">stats.php</filename>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.plg_system_stats.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_system_stats.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="data"
+					type="plgsystemstats.data"
+					label=""
+				/>
+
+				<field
+					name="unique_id"
+					type="plgsystemstats.uniqueid"
+					label="PLG_SYSTEM_STATS_UNIQUE_ID_LABEL"
+					description="PLG_SYSTEM_STATS_UNIQUE_ID_DESC"
+					size="10"
+				/>
+
+				<field
+					name="interval"
+					type="number"
+					label="PLG_SYSTEM_STATS_INTERVAL_LABEL"
+					description="PLG_SYSTEM_STATS_INTERVAL_DESC"
+					filter="integer"
+					default="12"
+				/>
+
+				<field
+					name="mode"
+					type="list"
+					label="PLG_SYSTEM_STATS_MODE_LABEL"
+					description="PLG_SYSTEM_STATS_MODE_DESC"
+					default="1"
+					>
+					<option value="1">PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND</option>
+					<option value="2">PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND</option>
+					<option value="3">PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND</option>
+				</field>
+
+				<field
+					name="lastrun"
+					type="hidden"
+					default="0"
+					size="15"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/system/updatenotification/postinstall/updatecachetime.php b/core/plugins/system/updatenotification/postinstall/updatecachetime.php
new file mode 100644
index 00000000..3dab71c9
--- /dev/null
+++ b/core/plugins/system/updatenotification/postinstall/updatecachetime.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.updatenotification
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Checks if the com_installer config for the cache Hours are eq 0 and the updatenotification Plugin is enabled
+ *
+ * @return  boolean
+ *
+ * @since   3.6.3
+ */
+function updatecachetime_postinstall_condition()
+{
+	$cacheTimeout = (int) JComponentHelper::getComponent('com_installer')->params->get('cachetimeout', 6);
+
+	// Check if cachetimeout is eq zero
+	if ($cacheTimeout === 0 && JPluginHelper::isEnabled('system', 'updatenotification'))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Sets the cachtimeout back to the default (6 hours)
+ *
+ * @return  void
+ *
+ * @since   3.6.3
+ */
+function updatecachetime_postinstall_action()
+{
+	$installer = JComponentHelper::getComponent('com_installer');
+
+	// Sets the cachtimeout back to the default (6 hours)
+	$installer->params->set('cachetimeout', 6);
+
+	// Save the new parameters back to com_installer
+	$table = JTable::getInstance('extension');
+	$table->load($installer->id);
+	$table->bind(array('params' => $installer->params->toString()));
+
+	// Store the changes
+	if (!$table->store())
+	{
+		// If there is an error show it to the admin
+		JFactory::getApplication()->enqueueMessage($table->getError(), 'error');
+	}
+}
diff --git a/core/plugins/system/updatenotification/updatenotification.php b/core/plugins/system/updatenotification/updatenotification.php
new file mode 100644
index 00000000..8af6dcd2
--- /dev/null
+++ b/core/plugins/system/updatenotification/updatenotification.php
@@ -0,0 +1,420 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.updatenotification
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Uncomment the following line to enable debug mode (update notification email sent every single time)
+// define('PLG_SYSTEM_UPDATENOTIFICATION_DEBUG', 1);
+
+/**
+ * Joomla! Update Notification plugin
+ *
+ * Sends out an email to all Super Users or a predefined email address when a new Joomla! version is available.
+ *
+ * This plugin is a direct adaptation of the corresponding plugin in Akeeba Ltd's Admin Tools. The author has
+ * consented to relicensing their plugin's code under GPLv2 or later (the original version was licensed under
+ * GPLv3 or later) to allow its inclusion in the Joomla! CMS.
+ *
+ * @since  3.5
+ */
+class PlgSystemUpdatenotification extends JPlugin
+{
+	/**
+	 * Load plugin language files automatically
+	 *
+	 * @var    boolean
+	 * @since  3.6.3
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * The update check and notification email code is triggered after the page has fully rendered.
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	public function onAfterRender()
+	{
+		// Get the timeout for Joomla! updates, as configured in com_installer's component parameters
+		JLoader::import('joomla.application.component.helper');
+		$component = JComponentHelper::getComponent('com_installer');
+
+		/** @var \Joomla\Registry\Registry $params */
+		$params        = $component->params;
+		$cache_timeout = (int) $params->get('cachetimeout', 6);
+		$cache_timeout = 3600 * $cache_timeout;
+
+		// Do we need to run? Compare the last run timestamp stored in the plugin's options with the current
+		// timestamp. If the difference is greater than the cache timeout we shall not execute again.
+		$now  = time();
+		$last = (int) $this->params->get('lastrun', 0);
+
+		if (!defined('PLG_SYSTEM_UPDATENOTIFICATION_DEBUG') && (abs($now - $last) < $cache_timeout))
+		{
+			return;
+		}
+
+		// Update last run status
+		// If I have the time of the last run, I can update, otherwise insert
+		$this->params->set('lastrun', $now);
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true)
+					->update($db->qn('#__extensions'))
+					->set($db->qn('params') . ' = ' . $db->q($this->params->toString('JSON')))
+					->where($db->qn('type') . ' = ' . $db->q('plugin'))
+					->where($db->qn('folder') . ' = ' . $db->q('system'))
+					->where($db->qn('element') . ' = ' . $db->q('updatenotification'));
+
+		try
+		{
+			// Lock the tables to prevent multiple plugin executions causing a race condition
+			$db->lockTable('#__extensions');
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables it's too risky to continue execution
+			return;
+		}
+
+		try
+		{
+			// Update the plugin parameters
+			$result = $db->setQuery($query)->execute();
+
+			$this->clearCacheGroups(array('com_plugins'), array(0, 1));
+		}
+		catch (Exception $exc)
+		{
+			// If we failed to execite
+			$db->unlockTables();
+			$result = false;
+		}
+
+		try
+		{
+			// Unlock the tables after writing
+			$db->unlockTables();
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables assume we have somehow failed
+			$result = false;
+		}
+
+		// Abort on failure
+		if (!$result)
+		{
+			return;
+		}
+
+		// This is the extension ID for Joomla! itself
+		$eid = 700;
+
+		// Get any available updates
+		$updater = JUpdater::getInstance();
+		$results = $updater->findUpdates(array($eid), $cache_timeout);
+
+		// If there are no updates our job is done. We need BOTH this check AND the one below.
+		if (!$results)
+		{
+			return;
+		}
+
+		// Unfortunately Joomla! MVC doesn't allow us to autoload classes
+		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_installer/models', 'InstallerModel');
+
+		// Get the update model and retrieve the Joomla! core updates
+		$model = JModelLegacy::getInstance('Update', 'InstallerModel');
+		$model->setState('filter.extension_id', $eid);
+		$updates = $model->getItems();
+
+		// If there are no updates we don't have to notify anyone about anything. This is NOT a duplicate check.
+		if (empty($updates))
+		{
+			return;
+		}
+
+		// Get the available update
+		$update = array_pop($updates);
+
+		// Check the available version. If it's the same or less than the installed version we have no updates to notify about.
+		if (version_compare($update->version, JVERSION, 'le'))
+		{
+			return;
+		}
+
+		// If we're here, we have updates. First, get a link to the Joomla! Update component.
+		$baseURL  = JUri::base();
+		$baseURL  = rtrim($baseURL, '/');
+		$baseURL .= (substr($baseURL, -13) !== 'administrator') ? '/administrator/' : '/';
+		$baseURL .= 'index.php?option=com_joomlaupdate';
+		$uri      = new JUri($baseURL);
+
+		/**
+		 * Some third party security solutions require a secret query parameter to allow log in to the administrator
+		 * backend of the site. The link generated above will be invalid and could probably block the user out of their
+		 * site, confusing them (they can't understand the third party security solution is not part of Joomla! proper).
+		 * So, we're calling the onBuildAdministratorLoginURL system plugin event to let these third party solutions
+		 * add any necessary secret query parameters to the URL. The plugins are supposed to have a method with the
+		 * signature:
+		 *
+		 * public function onBuildAdministratorLoginURL(JUri &$uri);
+		 *
+		 * The plugins should modify the $uri object directly and return null.
+		 */
+
+		JEventDispatcher::getInstance()->trigger('onBuildAdministratorLoginURL', array(&$uri));
+
+		// Let's find out the email addresses to notify
+		$superUsers    = array();
+		$specificEmail = $this->params->get('email', '');
+
+		if (!empty($specificEmail))
+		{
+			$superUsers = $this->getSuperUsers($specificEmail);
+		}
+
+		if (empty($superUsers))
+		{
+			$superUsers = $this->getSuperUsers();
+		}
+
+		if (empty($superUsers))
+		{
+			return;
+		}
+
+		/*
+		 * Load the appropriate language. We try to load English (UK), the current user's language and the forced
+		 * language preference, in this order. This ensures that we'll never end up with untranslated strings in the
+		 * update email which would make Joomla! seem bad. So, please, if you don't fully understand what the
+		 * following code does DO NOT TOUCH IT. It makes the difference between a hobbyist CMS and a professional
+		 * solution! 
+		 */
+		$jLanguage = JFactory::getLanguage();
+		$jLanguage->load('plg_system_updatenotification', JPATH_ADMINISTRATOR, 'en-GB', true, true);
+		$jLanguage->load('plg_system_updatenotification', JPATH_ADMINISTRATOR, null, true, false);
+
+		// Then try loading the preferred (forced) language
+		$forcedLanguage = $this->params->get('language_override', '');
+
+		if (!empty($forcedLanguage))
+		{
+			$jLanguage->load('plg_system_updatenotification', JPATH_ADMINISTRATOR, $forcedLanguage, true, false);
+		}
+
+		// Set up the email subject and body
+
+		$email_subject = JText::_('PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT');
+		$email_body    = JText::_('PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY');
+
+		// Replace merge codes with their values
+		$newVersion = $update->version;
+
+		$jVersion       = new JVersion;
+		$currentVersion = $jVersion->getShortVersion();
+
+		$jConfig  = JFactory::getConfig();
+		$sitename = $jConfig->get('sitename');
+		$mailFrom = $jConfig->get('mailfrom');
+		$fromName = $jConfig->get('fromname');
+
+		$substitutions = array(
+			'[NEWVERSION]'  => $newVersion,
+			'[CURVERSION]'  => $currentVersion,
+			'[SITENAME]'    => $sitename,
+			'[URL]'         => JUri::base(),
+			'[LINK]'        => $uri->toString(),
+			'[RELEASENEWS]' => 'https://www.joomla.org/announcements/release-news/',
+			'\\n'           => "\n",
+		);
+
+		foreach ($substitutions as $k => $v)
+		{
+			$email_subject = str_replace($k, $v, $email_subject);
+			$email_body    = str_replace($k, $v, $email_body);
+		}
+
+		// Send the emails to the Super Users
+		foreach ($superUsers as $superUser)
+		{
+			$mailer = JFactory::getMailer();
+			$mailer->setSender(array($mailFrom, $fromName));
+			$mailer->addRecipient($superUser->email);
+			$mailer->setSubject($email_subject);
+			$mailer->setBody($email_body);
+			$mailer->Send();
+		}
+	}
+
+	/**
+	 * Returns the Super Users email information. If you provide a comma separated $email list
+	 * we will check that these emails do belong to Super Users and that they have not blocked
+	 * system emails.
+	 *
+	 * @param   null|string  $email  A list of Super Users to email
+	 *
+	 * @return  array  The list of Super User emails
+	 *
+	 * @since   3.5
+	 */
+	private function getSuperUsers($email = null)
+	{
+		// Get a reference to the database object
+		$db = JFactory::getDbo();
+
+		// Convert the email list to an array
+		if (!empty($email))
+		{
+			$temp   = explode(',', $email);
+			$emails = array();
+
+			foreach ($temp as $entry)
+			{
+				$entry    = trim($entry);
+				$emails[] = $db->q($entry);
+			}
+
+			$emails = array_unique($emails);
+		}
+		else
+		{
+			$emails = array();
+		}
+
+		// Get a list of groups which have Super User privileges
+		$ret = array();
+
+		try
+		{
+			$rootId    = JTable::getInstance('Asset', 'JTable')->getRootId();
+			$rules     = JAccess::getAssetRules($rootId)->getData();
+			$rawGroups = $rules['core.admin']->getData();
+			$groups    = array();
+
+			if (empty($rawGroups))
+			{
+				return $ret;
+			}
+
+			foreach ($rawGroups as $g => $enabled)
+			{
+				if ($enabled)
+				{
+					$groups[] = $db->q($g);
+				}
+			}
+
+			if (empty($groups))
+			{
+				return $ret;
+			}
+		}
+		catch (Exception $exc)
+		{
+			return $ret;
+		}
+
+		// Get the user IDs of users belonging to the SA groups
+		try
+		{
+			$query = $db->getQuery(true)
+						->select($db->qn('user_id'))
+						->from($db->qn('#__user_usergroup_map'))
+						->where($db->qn('group_id') . ' IN(' . implode(',', $groups) . ')');
+			$db->setQuery($query);
+			$rawUserIDs = $db->loadColumn(0);
+
+			if (empty($rawUserIDs))
+			{
+				return $ret;
+			}
+
+			$userIDs = array();
+
+			foreach ($rawUserIDs as $id)
+			{
+				$userIDs[] = $db->q($id);
+			}
+		}
+		catch (Exception $exc)
+		{
+			return $ret;
+		}
+
+		// Get the user information for the Super Administrator users
+		try
+		{
+			$query = $db->getQuery(true)
+						->select(
+							array(
+								$db->qn('id'),
+								$db->qn('username'),
+								$db->qn('email'),
+							)
+						)->from($db->qn('#__users'))
+						->where($db->qn('id') . ' IN(' . implode(',', $userIDs) . ')')
+						->where($db->qn('block') . ' = 0')
+						->where($db->qn('sendEmail') . ' = ' . $db->q('1'));
+
+			if (!empty($emails))
+			{
+				$query->where($db->qn('email') . 'IN(' . implode(',', $emails) . ')');
+			}
+
+			$db->setQuery($query);
+			$ret = $db->loadObjectList();
+		}
+		catch (Exception $exc)
+		{
+			return $ret;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Clears cache groups. We use it to clear the plugins cache after we update the last run timestamp.
+	 *
+	 * @param   array  $clearGroups   The cache groups to clean
+	 * @param   array  $cacheClients  The cache clients (site, admin) to clean
+	 *
+	 * @return  void
+	 *
+	 * @since   3.5
+	 */
+	private function clearCacheGroups(array $clearGroups, array $cacheClients = array(0, 1))
+	{
+		$conf = JFactory::getConfig();
+
+		foreach ($clearGroups as $group)
+		{
+			foreach ($cacheClients as $client_id)
+			{
+				try
+				{
+					$options = array(
+						'defaultgroup' => $group,
+						'cachebase'    => $client_id ? JPATH_ADMINISTRATOR . '/cache' :
+							$conf->get('cache_path', JPATH_SITE . '/cache')
+					);
+
+					$cache = JCache::getInstance('callback', $options);
+					$cache->clean();
+				}
+				catch (Exception $e)
+				{
+					// Ignore it
+				}
+			}
+		}
+	}
+}
diff --git a/core/plugins/system/updatenotification/updatenotification.xml b/core/plugins/system/updatenotification/updatenotification.xml
new file mode 100644
index 00000000..fc9e17a0
--- /dev/null
+++ b/core/plugins/system/updatenotification/updatenotification.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.6" type="plugin" group="system" method="upgrade">
+	<name>plg_system_updatenotification</name>
+	<author>Joomla! Project</author>
+	<creationDate>May 2015</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.5.0</version>
+	<description>PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="updatenotification">updatenotification.php</filename>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB.plg_system_updatenotification.ini</language>
+		<language tag="en-GB">en-GB.plg_system_updatenotification.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="email"
+					type="text"
+					label="PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL"
+					description="PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC"
+					default=""
+					size="40"
+				/>
+
+				<field
+					name="language_override"
+					type="language"
+					label="PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL"
+					description="PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC"
+					default=""
+					client="administrator"
+					>
+					<option value="">PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE</option>
+				</field>
+
+				<field
+					name="lastrun"
+					type="hidden"
+					default="0"
+					size="15"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/twofactorauth/totp/postinstall/actions.php b/core/plugins/twofactorauth/totp/postinstall/actions.php
new file mode 100644
index 00000000..c6989b74
--- /dev/null
+++ b/core/plugins/twofactorauth/totp/postinstall/actions.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Twofactorauth.totp
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains the functions used by the com_postinstall code to deliver
+ * the necessary post-installation messages concerning the activation of the
+ * two-factor authentication code.
+ */
+
+/**
+ * Checks if the plugin is enabled. If not it returns true, meaning that the
+ * message concerning two factor authentication should be displayed.
+ *
+ * @return  integer
+ *
+ * @since   3.2
+ */
+function twofactorauth_postinstall_condition()
+{
+	$db = JFactory::getDbo();
+
+	$query = $db->getQuery(true)
+		->select('*')
+		->from($db->qn('#__extensions'))
+		->where($db->qn('type') . ' = ' . $db->q('plugin'))
+		->where($db->qn('enabled') . ' = ' . $db->q('1'))
+		->where($db->qn('folder') . ' = ' . $db->q('twofactorauth'));
+	$db->setQuery($query);
+	$enabled_plugins = $db->loadObjectList();
+
+	return count($enabled_plugins) === 0;
+}
+
+/**
+ * Enables the two factor authentication plugin and redirects the user to their
+ * user profile page so that they can enable two factor authentication on their
+ * account.
+ *
+ * @return  void
+ *
+ * @since   3.2
+ */
+function twofactorauth_postinstall_action()
+{
+	// Enable the plugin
+	$db = JFactory::getDbo();
+
+	$query = $db->getQuery(true)
+		->update($db->qn('#__extensions'))
+		->set($db->qn('enabled') . ' = ' . $db->q(1))
+		->where($db->qn('type') . ' = ' . $db->q('plugin'))
+		->where($db->qn('folder') . ' = ' . $db->q('twofactorauth'));
+	$db->setQuery($query);
+	$db->execute();
+
+	// Redirect the user to their profile editor page
+	$url = 'index.php?option=com_users&task=user.edit&id=' . JFactory::getUser()->id;
+	JFactory::getApplication()->redirect($url);
+}
diff --git a/core/plugins/twofactorauth/totp/tmpl/form.php b/core/plugins/twofactorauth/totp/tmpl/form.php
new file mode 100644
index 00000000..3a155efc
--- /dev/null
+++ b/core/plugins/twofactorauth/totp/tmpl/form.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Twofactorauth.totp.tmpl
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<input type="hidden" name="jform[twofactor][totp][key]" value="<?php echo $secret ?>" />
+
+<div class="well">
+	<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_INTRO') ?>
+</div>
+
+<fieldset>
+	<legend>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_HEAD') ?>
+	</legend>
+	<p>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT') ?>
+	</p>
+	<ul>
+		<li>
+			<a href="<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK') ?>" target="_blank" rel="noopener noreferrer">
+				<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1') ?>
+			</a>
+		</li>
+		<li>
+			<a href="<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK') ?>" target="_blank" rel="noopener noreferrer">
+				<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2') ?>
+			</a>
+		</li>
+	</ul>
+	<div class="alert">
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP1_WARN') ?>
+	</div>
+</fieldset>
+
+<fieldset>
+	<legend>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP2_HEAD') ?>
+	</legend>
+
+	<div class="span6">
+		<p>
+			<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP2_TEXT') ?>
+		</p>
+		<table class="table table-striped">
+			<tr>
+				<td>
+					<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP2_ACCOUNT') ?>
+				</td>
+				<td>
+					<?php echo $username ?>@<?php echo $hostname ?>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP2_KEY') ?>
+				</td>
+				<td>
+					<?php echo $secret ?>
+				</td>
+			</tr>
+		</table>
+	</div>
+
+	<div class="span6">
+		<p>
+			<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP2_ALTTEXT') ?>
+			<br />
+			<img src="<?php echo $url ?>" style="float: none;" />
+		</p>
+	</div>
+
+	<div class="clearfix"></div>
+
+	<div class="alert alert-info">
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP2_RESET') ?>
+	</div>
+</fieldset>
+
+<?php if ($new_totp): ?>
+<fieldset>
+	<legend>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP3_HEAD') ?>
+	</legend>
+	<p>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT') ?>
+	</p>
+	<div class="control-group">
+		<label class="control-label" for="totpsecuritycode">
+			<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_STEP3_SECURITYCODE') ?>
+		</label>
+		<div class="controls">
+			<input type="text" class="input-small" name="jform[twofactor][totp][securitycode]" id="totpsecuritycode" autocomplete="0">
+		</div>
+	</div>
+</fieldset>
+<?php endif; ?>
diff --git a/core/plugins/twofactorauth/totp/totp.php b/core/plugins/twofactorauth/totp/totp.php
new file mode 100644
index 00000000..a70e91d6
--- /dev/null
+++ b/core/plugins/twofactorauth/totp/totp.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Twofactorauth.totp
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Two Factor Authentication using Google Authenticator TOTP Plugin
+ *
+ * @since  3.2
+ */
+class PlgTwofactorauthTotp extends JPlugin
+{
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method name
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $methodName = 'totp';
+
+	/**
+	 * This method returns the identification object for this two factor
+	 * authentication plugin.
+	 *
+	 * @return  stdClass  An object with public properties method and title
+	 *
+	 * @since   3.2
+	 */
+	public function onUserTwofactorIdentify()
+	{
+		$section = (int) $this->params->get('section', 3);
+
+		$current_section = 0;
+
+		try
+		{
+			$app = JFactory::getApplication();
+
+			if ($app->isClient('administrator'))
+			{
+				$current_section = 2;
+			}
+			elseif ($app->isClient('site'))
+			{
+				$current_section = 1;
+			}
+		}
+		catch (Exception $exc)
+		{
+			$current_section = 0;
+		}
+
+		if (!($current_section & $section))
+		{
+			return false;
+		}
+
+		return (object) array(
+			'method' => $this->methodName,
+			'title'  => JText::_('PLG_TWOFACTORAUTH_TOTP_METHOD_TITLE')
+		);
+	}
+
+	/**
+	 * Shows the configuration page for this two factor authentication method.
+	 *
+	 * @param   object   $otpConfig  The two factor auth configuration object
+	 * @param   integer  $user_id    The numeric user ID of the user whose form we'll display
+	 *
+	 * @return  boolean|string  False if the method is not ours, the HTML of the configuration page otherwise
+	 *
+	 * @see     UsersModelUser::getOtpConfig
+	 * @since   3.2
+	 */
+	public function onUserTwofactorShowConfiguration($otpConfig, $user_id = null)
+	{
+		// Create a new TOTP class with Google Authenticator compatible settings
+		$totp = new FOFEncryptTotp(30, 6, 10);
+
+		if ($otpConfig->method === $this->methodName)
+		{
+			// This method is already activated. Reuse the same secret key.
+			$secret = $otpConfig->config['code'];
+		}
+		else
+		{
+			// This methods is not activated yet. Create a new secret key.
+			$secret = $totp->generateSecret();
+		}
+
+		// These are used by Google Authenticator to tell accounts apart
+		$username = JFactory::getUser($user_id)->username;
+		$hostname = JUri::getInstance()->getHost();
+
+		// This is the URL to the QR code for Google Authenticator
+		$url = $totp->getUrl($username, $hostname, $secret);
+
+		// Is this a new TOTP setup? If so, we'll have to show the code validation field.
+		$new_totp = $otpConfig->method !== 'totp';
+
+		// Start output buffering
+		@ob_start();
+
+		// Include the form.php from a template override. If none is found use the default.
+		$path = FOFPlatform::getInstance()->getTemplateOverridePath('plg_twofactorauth_totp', true);
+
+		JLoader::import('joomla.filesystem.file');
+
+		if (JFile::exists($path . '/form.php'))
+		{
+			include_once $path . '/form.php';
+		}
+		else
+		{
+			include_once __DIR__ . '/tmpl/form.php';
+		}
+
+		// Stop output buffering and get the form contents
+		$html = @ob_get_clean();
+
+		// Return the form contents
+		return array(
+			'method' => $this->methodName,
+			'form'   => $html
+		);
+	}
+
+	/**
+	 * The save handler of the two factor configuration method's configuration
+	 * page.
+	 *
+	 * @param   string  $method  The two factor auth method for which we'll show the config page
+	 *
+	 * @return  boolean|stdClass  False if the method doesn't match or we have an error, OTP config object if it succeeds
+	 *
+	 * @see     UsersModelUser::setOtpConfig
+	 * @since   3.2
+	 */
+	public function onUserTwofactorApplyConfiguration($method)
+	{
+		if ($method !== $this->methodName)
+		{
+			return false;
+		}
+
+		// Get a reference to the input data object
+		$input = JFactory::getApplication()->input;
+
+		// Load raw data
+		$rawData = $input->get('jform', array(), 'array');
+
+		if (!isset($rawData['twofactor']['totp']))
+		{
+			return false;
+		}
+
+		$data = $rawData['twofactor']['totp'];
+
+		// Warn if the securitycode is empty
+		if (array_key_exists('securitycode', $data) && empty($data['securitycode']))
+		{
+			try
+			{
+				$app = JFactory::getApplication();
+				$app->enqueueMessage(JText::_('PLG_TWOFACTORAUTH_TOTP_ERR_VALIDATIONFAILED'), 'error');
+			}
+			catch (Exception $exc)
+			{
+				// This only happens when we are in a CLI application. We cannot
+				// enqueue a message, so just do nothing.
+			}
+
+			return false;
+		}
+
+		// Create a new TOTP class with Google Authenticator compatible settings
+		$totp = new FOFEncryptTotp(30, 6, 10);
+
+		// Check the security code entered by the user (exact time slot match)
+		$code = $totp->getCode($data['key']);
+		$check = $code === $data['securitycode'];
+
+		/*
+		 * If the check fails, test the previous 30 second slot. This allow the
+		 * user to enter the security code when it's becoming red in Google
+		 * Authenticator app (reaching the end of its 30 second lifetime)
+		 */
+		if (!$check)
+		{
+			$time = time() - 30;
+			$code = $totp->getCode($data['key'], $time);
+			$check = $code === $data['securitycode'];
+		}
+
+		/*
+		 * If the check fails, test the next 30 second slot. This allows some
+		 * time drift between the authentication device and the server
+		 */
+		if (!$check)
+		{
+			$time = time() + 30;
+			$code = $totp->getCode($data['key'], $time);
+			$check = $code === $data['securitycode'];
+		}
+
+		if (!$check)
+		{
+			// Check failed. Do not change two factor authentication settings.
+			return false;
+		}
+
+		// Check succeedeed; return an OTP configuration object
+		$otpConfig = (object) array(
+			'method'   => 'totp',
+			'config'   => array(
+				'code' => $data['key']
+			),
+			'otep'     => array()
+		);
+
+		return $otpConfig;
+	}
+
+	/**
+	 * This method should handle any two factor authentication and report back
+	 * to the subject.
+	 *
+	 * @param   array  $credentials  Array holding the user credentials
+	 * @param   array  $options      Array of extra options
+	 *
+	 * @return  boolean  True if the user is authorised with this two-factor authentication method
+	 *
+	 * @since   3.2
+	 */
+	public function onUserTwofactorAuthenticate($credentials, $options)
+	{
+		// Get the OTP configuration object
+		$otpConfig = $options['otp_config'];
+
+		// Make sure it's an object
+		if (empty($otpConfig) || !is_object($otpConfig))
+		{
+			return false;
+		}
+
+		// Check if we have the correct method
+		if ($otpConfig->method !== $this->methodName)
+		{
+			return false;
+		}
+
+		// Check if there is a security code
+		if (empty($credentials['secretkey']))
+		{
+			return false;
+		}
+
+		// Create a new TOTP class with Google Authenticator compatible settings
+		$totp = new FOFEncryptTotp(30, 6, 10);
+
+		// Check the code
+		$code = $totp->getCode($otpConfig->config['code']);
+		$check = $code === $credentials['secretkey'];
+
+		/*
+		 * If the check fails, test the previous 30 second slot. This allow the
+		 * user to enter the security code when it's becoming red in Google
+		 * Authenticator app (reaching the end of its 30 second lifetime)
+		 */
+		if (!$check)
+		{
+			$time = time() - 30;
+			$code = $totp->getCode($otpConfig->config['code'], $time);
+			$check = $code === $credentials['secretkey'];
+		}
+
+		/*
+		 * If the check fails, test the next 30 second slot. This allows some
+		 * time drift between the authentication device and the server
+		 */
+		if (!$check)
+		{
+			$time = time() + 30;
+			$code = $totp->getCode($otpConfig->config['code'], $time);
+			$check = $code === $credentials['secretkey'];
+		}
+
+		return $check;
+	}
+}
diff --git a/core/plugins/twofactorauth/totp/totp.xml b/core/plugins/twofactorauth/totp/totp.xml
new file mode 100644
index 00000000..ce69e3ba
--- /dev/null
+++ b/core/plugins/twofactorauth/totp/totp.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_twofactorauth_totp</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2013</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.0</version>
+	<description>PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="totp">totp.php</filename>
+		<folder>postinstall</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_twofactorauth_totp.ini</language>
+		<language tag="en-GB">en-GB.plg_twofactorauth_totp.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="section"
+					type="radio"
+					label="PLG_TWOFACTORAUTH_TOTP_SECTION_LABEL"
+					description="PLG_TWOFACTORAUTH_TOTP_SECTION_DESC"
+					default="3"
+					filter="integer"
+					class="btn-group"
+					>
+					<option value="1">PLG_TWOFACTORAUTH_TOTP_SECTION_SITE</option>
+					<option value="2">PLG_TWOFACTORAUTH_TOTP_SECTION_ADMIN</option>
+					<option value="3">PLG_TWOFACTORAUTH_TOTP_SECTION_BOTH</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/twofactorauth/yubikey/tmpl/form.php b/core/plugins/twofactorauth/yubikey/tmpl/form.php
new file mode 100644
index 00000000..f5ae02c7
--- /dev/null
+++ b/core/plugins/twofactorauth/yubikey/tmpl/form.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Twofactorauth.yubikey.tmpl
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="well">
+	<?php echo JText::_('PLG_TWOFACTORAUTH_YUBIKEY_INTRO') ?>
+</div>
+
+<?php if ($new_totp): ?>
+<fieldset>
+	<legend>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_YUBIKEY_STEP1_HEAD') ?>
+	</legend>
+
+	<p>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_YUBIKEY_STEP1_TEXT') ?>
+	</p>
+
+	<div class="control-group">
+		<label class="control-label" for="yubikeysecuritycode">
+			<?php echo JText::_('PLG_TWOFACTORAUTH_YUBIKEY_SECURITYCODE') ?>
+		</label>
+		<div class="controls">
+			<input type="text" class="input-medium" name="jform[twofactor][yubikey][securitycode]" id="yubikeysecuritycode" autocomplete="0">
+		</div>
+	</div>
+</fieldset>
+<?php else: ?>
+<fieldset>
+	<legend>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_RESET_HEAD') ?>
+	</legend>
+
+	<p>
+		<?php echo JText::_('PLG_TWOFACTORAUTH_TOTP_RESET_TEXT') ?>
+	</p>
+</fieldset>
+<?php endif; ?>
diff --git a/core/plugins/twofactorauth/yubikey/yubikey.php b/core/plugins/twofactorauth/yubikey/yubikey.php
new file mode 100644
index 00000000..a4d5e794
--- /dev/null
+++ b/core/plugins/twofactorauth/yubikey/yubikey.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Twofactorauth.yubikey
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Joomla! Two Factor Authentication using Yubikey Plugin
+ *
+ * @since  3.2
+ */
+class PlgTwofactorauthYubikey extends JPlugin
+{
+	/**
+	 * Affects constructor behavior. If true, language files will be loaded automatically.
+	 *
+	 * @var    boolean
+	 * @since  3.2
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method name
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
+	protected $methodName = 'yubikey';
+
+	/**
+	 * This method returns the identification object for this two factor
+	 * authentication plugin.
+	 *
+	 * @return  stdClass  An object with public properties method and title
+	 *
+	 * @since   3.2
+	 */
+	public function onUserTwofactorIdentify()
+	{
+		$section         = (int) $this->params->get('section', 3);
+		$current_section = 0;
+
+		try
+		{
+			$app = JFactory::getApplication();
+
+			if ($app->isClient('administrator'))
+			{
+				$current_section = 2;
+			}
+			elseif ($app->isClient('site'))
+			{
+				$current_section = 1;
+			}
+		}
+		catch (Exception $exc)
+		{
+			$current_section = 0;
+		}
+
+		if (!($current_section & $section))
+		{
+			return false;
+		}
+
+		return (object) array(
+			'method' => $this->methodName,
+			'title'  => JText::_('PLG_TWOFACTORAUTH_YUBIKEY_METHOD_TITLE'),
+		);
+	}
+
+	/**
+	 * Shows the configuration page for this two factor authentication method.
+	 *
+	 * @param   object   $otpConfig  The two factor auth configuration object
+	 * @param   integer  $user_id    The numeric user ID of the user whose form we'll display
+	 *
+	 * @return  boolean|string  False if the method is not ours, the HTML of the configuration page otherwise
+	 *
+	 * @see     UsersModelUser::getOtpConfig
+	 * @since   3.2
+	 */
+	public function onUserTwofactorShowConfiguration($otpConfig, $user_id = null)
+	{
+		if ($otpConfig->method === $this->methodName)
+		{
+			// This method is already activated. Reuse the same Yubikey ID.
+			$yubikey = $otpConfig->config['yubikey'];
+		}
+		else
+		{
+			// This methods is not activated yet. We'll need a Yubikey TOTP to setup this Yubikey.
+			$yubikey = '';
+		}
+
+		// Is this a new TOTP setup? If so, we'll have to show the code validation field.
+		$new_totp    = $otpConfig->method !== $this->methodName;
+
+		// Start output buffering
+		@ob_start();
+
+		// Include the form.php from a template override. If none is found use the default.
+		$path = FOFPlatform::getInstance()->getTemplateOverridePath('plg_twofactorauth_yubikey', true);
+
+		JLoader::import('joomla.filesystem.file');
+
+		if (JFile::exists($path . '/form.php'))
+		{
+			include_once $path . '/form.php';
+		}
+		else
+		{
+			include_once __DIR__ . '/tmpl/form.php';
+		}
+
+		// Stop output buffering and get the form contents
+		$html = @ob_get_clean();
+
+		// Return the form contents
+		return array(
+			'method' => $this->methodName,
+			'form'   => $html,
+		);
+	}
+
+	/**
+	 * The save handler of the two factor configuration method's configuration
+	 * page.
+	 *
+	 * @param   string  $method  The two factor auth method for which we'll show the config page
+	 *
+	 * @return  boolean|stdClass  False if the method doesn't match or we have an error, OTP config object if it succeeds
+	 *
+	 * @see     UsersModelUser::setOtpConfig
+	 * @since   3.2
+	 */
+	public function onUserTwofactorApplyConfiguration($method)
+	{
+		if ($method !== $this->methodName)
+		{
+			return false;
+		}
+
+		// Get a reference to the input data object
+		$input = JFactory::getApplication()->input;
+
+		// Load raw data
+		$rawData = $input->get('jform', array(), 'array');
+
+		if (!isset($rawData['twofactor']['yubikey']))
+		{
+			return false;
+		}
+
+		$data = $rawData['twofactor']['yubikey'];
+
+		// Warn if the securitycode is empty
+		if (array_key_exists('securitycode', $data) && empty($data['securitycode']))
+		{
+			try
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('PLG_TWOFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED'), 'error');
+			}
+			catch (Exception $exc)
+			{
+				// This only happens when we are in a CLI application. We cannot
+				// enqueue a message, so just do nothing.
+			}
+
+			return false;
+		}
+
+		// Validate the Yubikey OTP
+		$check = $this->validateYubikeyOtp($data['securitycode']);
+
+		if (!$check)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('PLG_TWOFACTORAUTH_YUBIKEY_ERR_VALIDATIONFAILED'), 'error');
+
+			// Check failed. Do not change two factor authentication settings.
+			return false;
+		}
+
+		// Remove the last 32 digits and store the rest in the user configuration parameters
+		$yubikey      = substr($data['securitycode'], 0, -32);
+
+		// Check succeedeed; return an OTP configuration object
+		$otpConfig    = (object) array(
+			'method'  => $this->methodName,
+			'config'  => array(
+				'yubikey' => $yubikey
+			),
+			'otep'    => array()
+		);
+
+		return $otpConfig;
+	}
+
+	/**
+	 * This method should handle any two factor authentication and report back
+	 * to the subject.
+	 *
+	 * @param   array  $credentials  Array holding the user credentials
+	 * @param   array  $options      Array of extra options
+	 *
+	 * @return  boolean  True if the user is authorised with this two-factor authentication method
+	 *
+	 * @since   3.2
+	 */
+	public function onUserTwofactorAuthenticate($credentials, $options)
+	{
+		// Get the OTP configuration object
+		$otpConfig = $options['otp_config'];
+
+		// Make sure it's an object
+		if (empty($otpConfig) || !is_object($otpConfig))
+		{
+			return false;
+		}
+
+		// Check if we have the correct method
+		if ($otpConfig->method !== $this->methodName)
+		{
+			return false;
+		}
+
+		// Check if there is a security code
+		if (empty($credentials['secretkey']))
+		{
+			return false;
+		}
+
+		// Check if the Yubikey starts with the configured Yubikey user string
+		$yubikey_valid = $otpConfig->config['yubikey'];
+		$yubikey       = substr($credentials['secretkey'], 0, -32);
+
+		$check = $yubikey === $yubikey_valid;
+
+		if ($check)
+		{
+			$check = $this->validateYubikeyOtp($credentials['secretkey']);
+		}
+
+		return $check;
+	}
+
+	/**
+	 * Validates a Yubikey OTP against the Yubikey servers
+	 *
+	 * @param   string  $otp  The OTP generated by your Yubikey
+	 *
+	 * @return  boolean  True if it's a valid OTP
+	 *
+	 * @since   3.2
+	 */
+	public function validateYubikeyOtp($otp)
+	{
+		$server_queue = array(
+			'api.yubico.com',
+			'api2.yubico.com',
+			'api3.yubico.com',
+			'api4.yubico.com',
+			'api5.yubico.com',
+		);
+
+		shuffle($server_queue);
+
+		$gotResponse = false;
+		$check       = false;
+
+		$token = JSession::getFormToken();
+		$nonce = md5($token . uniqid(mt_rand()));
+
+		while (!$gotResponse && !empty($server_queue))
+		{
+			$server = array_shift($server_queue);
+			$uri    = new JUri('https://' . $server . '/wsapi/2.0/verify');
+
+			// I don't see where this ID is used?
+			$uri->setVar('id', 1);
+
+			// The OTP we read from the user
+			$uri->setVar('otp', $otp);
+
+			// This prevents a REPLAYED_OTP status of the token doesn't change
+			// after a user submits an invalid OTP
+			$uri->setVar('nonce', $nonce);
+
+			// Minimum service level required: 50% (at least 50% of the YubiCloud
+			// servers must reply positively for the OTP to validate)
+			$uri->setVar('sl', 50);
+
+			// Timeou waiting for YubiCloud servers to reply: 5 seconds.
+			$uri->setVar('timeout', 5);
+
+			try
+			{
+				$http     = JHttpFactory::getHttp();
+				$response = $http->get($uri->toString(), null, 6);
+
+				if (!empty($response))
+				{
+					$gotResponse = true;
+				}
+				else
+				{
+					continue;
+				}
+			}
+			catch (Exception $exc)
+			{
+				// No response, continue with the next server
+				continue;
+			}
+		}
+
+		// No server replied; we can't validate this OTP
+		if (!$gotResponse)
+		{
+			return false;
+		}
+
+		// Parse response
+		$lines = explode("\n", $response->body);
+		$data  = array();
+
+		foreach ($lines as $line)
+		{
+			$line  = trim($line);
+			$parts = explode('=', $line, 2);
+
+			if (count($parts) < 2)
+			{
+				continue;
+			}
+
+			$data[$parts[0]] = $parts[1];
+		}
+
+		// Validate the response - We need an OK message reply
+		if ($data['status'] !== 'OK')
+		{
+			return false;
+		}
+
+		// Validate the response - We need a confidence level over 50%
+		if ($data['sl'] < 50)
+		{
+			return false;
+		}
+
+		// Validate the response - The OTP must match
+		if ($data['otp'] !== $otp)
+		{
+			return false;
+		}
+
+		// Validate the response - The token must match
+		if ($data['nonce'] !== $nonce)
+		{
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/twofactorauth/yubikey/yubikey.xml b/core/plugins/twofactorauth/yubikey/yubikey.xml
new file mode 100644
index 00000000..9779e85b
--- /dev/null
+++ b/core/plugins/twofactorauth/yubikey/yubikey.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="system" method="upgrade">
+	<name>plg_twofactorauth_yubikey</name>
+	<author>Joomla! Project</author>
+	<creationDate>September 2013</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.0</version>
+	<description>PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="yubikey">yubikey.php</filename>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_twofactorauth_yubikey.ini</language>
+		<language tag="en-GB">en-GB.plg_twofactorauth_yubikey.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="section"
+					type="radio"
+					label="PLG_TWOFACTORAUTH_YUBIKEY_SECTION_LABEL"
+					description="PLG_TWOFACTORAUTH_YUBIKEY_SECTION_DESC"
+					default="3"
+					filter="integer"
+					class="btn-group"
+					>
+					<option value="1">PLG_TWOFACTORAUTH_YUBIKEY_SECTION_SITE</option>
+					<option value="2">PLG_TWOFACTORAUTH_YUBIKEY_SECTION_ADMIN</option>
+					<option value="3">PLG_TWOFACTORAUTH_YUBIKEY_SECTION_BOTH</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/user/contactcreator/contactcreator.php b/core/plugins/user/contactcreator/contactcreator.php
new file mode 100644
index 00000000..56b66384
--- /dev/null
+++ b/core/plugins/user/contactcreator/contactcreator.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.contactcreator
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\String\StringHelper;
+
+/**
+ * Class for Contact Creator
+ *
+ * A tool to automatically create and synchronise contacts with a user
+ *
+ * @since  1.6
+ */
+class PlgUserContactCreator extends JPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Utility method to act on a user after it has been saved.
+	 *
+	 * This method creates a contact for the saved user
+	 *
+	 * @param   array    $user     Holds the new user data.
+	 * @param   boolean  $isnew    True if a new user is stored.
+	 * @param   boolean  $success  True if user was succesfully stored in the database.
+	 * @param   string   $msg      Message.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function onUserAfterSave($user, $isnew, $success, $msg)
+	{
+		// If the user wasn't stored we don't resync
+		if (!$success)
+		{
+			return false;
+		}
+
+		// If the user isn't new we don't sync
+		if (!$isnew)
+		{
+			return false;
+		}
+
+		// Ensure the user id is really an int
+		$user_id = (int) $user['id'];
+
+		// If the user id appears invalid then bail out just in case
+		if (empty($user_id))
+		{
+			return false;
+		}
+
+		$categoryId = $this->params->get('category', 0);
+
+		if (empty($categoryId))
+		{
+			JError::raiseWarning('', JText::_('PLG_CONTACTCREATOR_ERR_NO_CATEGORY'));
+
+			return false;
+		}
+
+		if ($contact = $this->getContactTable())
+		{
+			/**
+			 * Try to pre-load a contact for this user. Apparently only possible if other plugin creates it
+			 * Note: $user_id is cleaned above
+			 */
+			if (!$contact->load(array('user_id' => (int) $user_id)))
+			{
+				$contact->published = $this->params->get('autopublish', 0);
+			}
+
+			$contact->name     = $user['name'];
+			$contact->user_id  = $user_id;
+			$contact->email_to = $user['email'];
+			$contact->catid    = $categoryId;
+			$contact->access   = (int) JFactory::getConfig()->get('access');
+			$contact->language = '*';
+			$contact->generateAlias();
+
+			// Check if the contact already exists to generate new name & alias if required
+			if ($contact->id == 0)
+			{
+				list($name, $alias) = $this->generateAliasAndName($contact->alias, $contact->name, $categoryId);
+
+				$contact->name  = $name;
+				$contact->alias = $alias;
+			}
+
+			$autowebpage = $this->params->get('autowebpage', '');
+
+			if (!empty($autowebpage))
+			{
+				// Search terms
+				$search_array = array('[name]', '[username]', '[userid]', '[email]');
+
+				// Replacement terms, urlencoded
+				$replace_array = array_map('urlencode', array($user['name'], $user['username'], $user['id'], $user['email']));
+
+				// Now replace it in together
+				$contact->webpage = str_replace($search_array, $replace_array, $autowebpage);
+			}
+
+			if ($contact->check() && $contact->store())
+			{
+				return true;
+			}
+		}
+
+		JError::raiseWarning('', JText::_('PLG_CONTACTCREATOR_ERR_FAILED_CREATING_CONTACT'));
+
+		return false;
+	}
+
+	/**
+	 * Method to change the name & alias if alias is already in use
+	 *
+	 * @param   string   $alias       The alias.
+	 * @param   string   $name        The name.
+	 * @param   integer  $categoryId  Category identifier
+	 *
+	 * @return  array  Contains the modified title and alias.
+	 *
+	 * @since   3.2.3
+	 */
+	protected function generateAliasAndName($alias, $name, $categoryId)
+	{
+		$table = $this->getContactTable();
+
+		while ($table->load(array('alias' => $alias, 'catid' => $categoryId)))
+		{
+			if ($name === $table->name)
+			{
+				$name = StringHelper::increment($name);
+			}
+
+			$alias = StringHelper::increment($alias, 'dash');
+		}
+
+		return array($name, $alias);
+	}
+
+	/**
+	 * Get an instance of the contact table
+	 *
+	 * @return  ContactTableContact
+	 *
+	 * @since   3.2.3
+	 */
+	protected function getContactTable()
+	{
+		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_contact/tables');
+
+		return JTable::getInstance('contact', 'ContactTable');
+	}
+}
diff --git a/core/plugins/user/contactcreator/contactcreator.xml b/core/plugins/user/contactcreator/contactcreator.xml
new file mode 100644
index 00000000..1b881245
--- /dev/null
+++ b/core/plugins/user/contactcreator/contactcreator.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="user" method="upgrade">
+	<name>plg_user_contactcreator</name>
+	<author>Joomla! Project</author>
+	<creationDate>August 2009</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_CONTACTCREATOR_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contactcreator">contactcreator.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_user_contactcreator.ini</language>
+		<language tag="en-GB">en-GB.plg_user_contactcreator.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="autowebpage"
+					type="text"
+					label="PLG_CONTACTCREATOR_FIELD_AUTOMATIC_WEBPAGE_LABEL"
+					description="PLG_CONTACTCREATOR_FIELD_AUTOMATIC_WEBPAGE_DESC"
+					size="40"
+				/>
+
+				<field
+					name="category"
+					type="category"
+					label="JCATEGORY"
+					description="PLG_CONTACTCREATOR_FIELD_CATEGORY_DESC"
+					extension="com_contact"
+					filter="integer"
+				/>
+
+				<field
+					name="autopublish"
+					type="radio"
+					label="PLG_CONTACTCREATOR_FIELD_AUTOPUBLISH_LABEL"
+					description="PLG_CONTACTCREATOR_FIELD_AUTOPUBLISH_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					filter="integer"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/user/joomla/joomla.php b/core/plugins/user/joomla/joomla.php
new file mode 100644
index 00000000..4f7f9d8d
--- /dev/null
+++ b/core/plugins/user/joomla/joomla.php
@@ -0,0 +1,396 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.joomla
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Joomla User plugin
+ *
+ * @since  1.5
+ */
+class PlgUserJoomla extends JPlugin
+{
+	/**
+	 * Application object
+	 *
+	 * @var    JApplicationCms
+	 * @since  3.2
+	 */
+	protected $app;
+
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.2
+	 */
+	protected $db;
+
+	/**
+	 * Remove all sessions for the user name
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   array    $user     Holds the user data
+	 * @param   boolean  $success  True if user was successfully stored in the database
+	 * @param   string   $msg      Message
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function onUserAfterDelete($user, $success, $msg)
+	{
+		if (!$success)
+		{
+			return false;
+		}
+
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__session'))
+			->where($this->db->quoteName('userid') . ' = ' . (int) $user['id']);
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		$query = $this->db->getQuery(true)
+			->delete($this->db->quoteName('#__messages'))
+			->where($this->db->quoteName('user_id_from') . ' = ' . (int) $user['id']);
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Utility method to act on a user after it has been saved.
+	 *
+	 * This method sends a registration email to new users created in the backend.
+	 *
+	 * @param   array    $user     Holds the new user data.
+	 * @param   boolean  $isnew    True if a new user is stored.
+	 * @param   boolean  $success  True if user was successfully stored in the database.
+	 * @param   string   $msg      Message.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function onUserAfterSave($user, $isnew, $success, $msg)
+	{
+		$mail_to_user = $this->params->get('mail_to_user', 1);
+
+		if (!$isnew || !$mail_to_user)
+		{
+			return;
+		}
+
+		// TODO: Suck in the frontend registration emails here as well. Job for a rainy day.
+		// The method check here ensures that if running as a CLI Application we don't get any errors
+		if (method_exists($this->app, 'isClient') && !$this->app->isClient('administrator'))
+		{
+			return;
+		}
+
+		// Check if we have a sensible from email address, if not bail out as mail would not be sent anyway
+		if (strpos($this->app->get('mailfrom'), '@') === false)
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_SENDING_EMAIL'), 'warning');
+
+			return;
+		}
+
+		$lang = JFactory::getLanguage();
+		$defaultLocale = $lang->getTag();
+
+		/**
+		 * Look for user language. Priority:
+		 * 	1. User frontend language
+		 * 	2. User backend language
+		 */
+		$userParams = new Registry($user['params']);
+		$userLocale = $userParams->get('language', $userParams->get('admin_language', $defaultLocale));
+
+		if ($userLocale !== $defaultLocale)
+		{
+			$lang->setLanguage($userLocale);
+		}
+
+		$lang->load('plg_user_joomla', JPATH_ADMINISTRATOR);
+
+		// Compute the mail subject.
+		$emailSubject = JText::sprintf(
+			'PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT',
+			$user['name'],
+			$this->app->get('sitename')
+		);
+
+		// Compute the mail body.
+		$emailBody = JText::sprintf(
+			'PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY',
+			$user['name'],
+			$this->app->get('sitename'),
+			JUri::root(),
+			$user['username'],
+			$user['password_clear']
+		);
+
+		$res = JFactory::getMailer()->sendMail(
+			$this->app->get('mailfrom'),
+			$this->app->get('fromname'),
+			$user['email'],
+			$emailSubject,
+			$emailBody
+		);
+
+		if ($res === false)
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_SENDING_EMAIL'), 'warning');
+		}
+
+		// Set application language back to default if we changed it
+		if ($userLocale !== $defaultLocale)
+		{
+			$lang->setLanguage($defaultLocale);
+		}
+	}
+
+	/**
+	 * This method should handle any login logic and report back to the subject
+	 *
+	 * @param   array  $user     Holds the user data
+	 * @param   array  $options  Array holding options (remember, autoregister, group)
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function onUserLogin($user, $options = array())
+	{
+		$instance = $this->_getUser($user, $options);
+
+		// If _getUser returned an error, then pass it back.
+		if ($instance instanceof Exception)
+		{
+			return false;
+		}
+
+		// If the user is blocked, redirect with an error
+		if ($instance->block == 1)
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_NOLOGIN_BLOCKED'), 'warning');
+
+			return false;
+		}
+
+		// Authorise the user based on the group information
+		if (!isset($options['group']))
+		{
+			$options['group'] = 'USERS';
+		}
+
+		// Check the user can login.
+		$result = $instance->authorise($options['action']);
+
+		if (!$result)
+		{
+			$this->app->enqueueMessage(JText::_('JERROR_LOGIN_DENIED'), 'warning');
+
+			return false;
+		}
+
+		// Mark the user as logged in
+		$instance->guest = 0;
+
+		$session = JFactory::getSession();
+
+		// Grab the current session ID
+		$oldSessionId = $session->getId();
+
+		// Fork the session
+		$session->fork();
+
+		$session->set('user', $instance);
+
+		// Ensure the new session's metadata is written to the database
+		$this->app->checkSession();
+
+		// Purge the old session
+		$query = $this->db->getQuery(true)
+			->delete('#__session')
+			->where($this->db->quoteName('session_id') . ' = ' . $this->db->quote($oldSessionId));
+
+		try
+		{
+			$this->db->setQuery($query)->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			// The old session is already invalidated, don't let this block logging in
+		}
+
+		// Hit the user last visit field
+		$instance->setLastVisit();
+
+		// Add "user state" cookie used for reverse caching proxies like Varnish, Nginx etc.
+		if ($this->app->isClient('site'))
+		{
+			$this->app->input->cookie->set(
+				'joomla_user_state',
+				'logged_in',
+				0,
+				$this->app->get('cookie_path', '/'),
+				$this->app->get('cookie_domain', ''),
+				$this->app->isHttpsForced(),
+				true
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method should handle any logout logic and report back to the subject
+	 *
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (client, ...).
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   1.5
+	 */
+	public function onUserLogout($user, $options = array())
+	{
+		$my      = JFactory::getUser();
+		$session = JFactory::getSession();
+
+		// Make sure we're a valid user first
+		if ($user['id'] == 0 && !$my->get('tmp_user'))
+		{
+			return true;
+		}
+
+		$sharedSessions = $this->app->get('shared_session', '0');
+
+		// Check to see if we're deleting the current session
+		if ($my->id == $user['id'] && ($sharedSessions || (!$sharedSessions && $options['clientid'] == $this->app->getClientId())))
+		{
+			// Hit the user last visit field
+			$my->setLastVisit();
+
+			// Destroy the php session for this user
+			$session->destroy();
+		}
+
+		// Enable / Disable Forcing logout all users with same userid
+		$forceLogout = $this->params->get('forceLogout', 1);
+
+		if ($forceLogout)
+		{
+			$query = $this->db->getQuery(true)
+				->delete($this->db->quoteName('#__session'))
+				->where($this->db->quoteName('userid') . ' = ' . (int) $user['id']);
+
+			if (!$sharedSessions)
+			{
+				$query->where($this->db->quoteName('client_id') . ' = ' . (int) $options['clientid']);
+			}
+
+			try
+			{
+				$this->db->setQuery($query)->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				return false;
+			}
+		}
+
+		// Delete "user state" cookie used for reverse caching proxies like Varnish, Nginx etc.
+		if ($this->app->isClient('site'))
+		{
+			$this->app->input->cookie->set('joomla_user_state', '', 1, $this->app->get('cookie_path', '/'), $this->app->get('cookie_domain', ''));
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method will return a user object
+	 *
+	 * If options['autoregister'] is true, if the user doesn't exist yet they will be created
+	 *
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (remember, autoregister, group).
+	 *
+	 * @return  JUser
+	 *
+	 * @since   1.5
+	 */
+	protected function _getUser($user, $options = array())
+	{
+		$instance = JUser::getInstance();
+		$id = (int) JUserHelper::getUserId($user['username']);
+
+		if ($id)
+		{
+			$instance->load($id);
+
+			return $instance;
+		}
+
+		// TODO : move this out of the plugin
+		$config = JComponentHelper::getParams('com_users');
+
+		// Hard coded default to match the default value from com_users.
+		$defaultUserGroup = $config->get('new_usertype', 2);
+
+		$instance->id = 0;
+		$instance->name = $user['fullname'];
+		$instance->username = $user['username'];
+		$instance->password_clear = $user['password_clear'];
+
+		// Result should contain an email (check).
+		$instance->email = $user['email'];
+		$instance->groups = array($defaultUserGroup);
+
+		// If autoregister is set let's register the user
+		$autoregister = isset($options['autoregister']) ? $options['autoregister'] : $this->params->get('autoregister', 1);
+
+		if ($autoregister)
+		{
+			if (!$instance->save())
+			{
+				JLog::add('Error in autoregistration for user ' . $user['username'] . '.', JLog::WARNING, 'error');
+			}
+		}
+		else
+		{
+			// No existing user and autoregister off, this is a temporary user.
+			$instance->set('tmp_user', true);
+		}
+
+		return $instance;
+	}
+}
diff --git a/core/plugins/user/joomla/joomla.xml b/core/plugins/user/joomla/joomla.xml
new file mode 100644
index 00000000..8ea25fff
--- /dev/null
+++ b/core/plugins/user/joomla/joomla.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="user" method="upgrade">
+	<name>plg_user_joomla</name>
+	<author>Joomla! Project</author>
+	<creationDate>December 2006</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_USER_JOOMLA_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="joomla">joomla.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_user_joomla.ini</language>
+		<language tag="en-GB">en-GB.plg_user_joomla.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="autoregister"
+					type="radio"
+					label="PLG_USER_JOOMLA_FIELD_AUTOREGISTER_LABEL"
+					description="PLG_USER_JOOMLA_FIELD_AUTOREGISTER_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="mail_to_user"
+					type="radio"
+					label="PLG_USER_JOOMLA_FIELD_MAILTOUSER_LABEL"
+					description="PLG_USER_JOOMLA_FIELD_MAILTOUSER_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field
+					name="forceLogout"
+					type="radio"
+					label="PLG_USER_JOOMLA_FIELD_FORCELOGOUT_LABEL"
+					description="PLG_USER_JOOMLA_FIELD_FORCELOGOUT_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/user/profile/field/dob.php b/core/plugins/user/profile/field/dob.php
new file mode 100644
index 00000000..b2957582
--- /dev/null
+++ b/core/plugins/user/profile/field/dob.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.profile
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('calendar');
+
+/**
+ * Provides input for "Date of Birth" field
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  User.profile
+ * @since       3.3.7
+ */
+class JFormFieldDob extends JFormFieldCalendar
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  3.3.7
+	 */
+	protected $type = 'Dob';
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   3.3.7
+	 */
+	protected function getLabel()
+	{
+		$label = parent::getLabel();
+
+		// Get the info text from the XML element, defaulting to empty.
+		$text  = $this->element['info'] ? (string) $this->element['info'] : '';
+		$text  = $this->translateLabel ? JText::_($text) : $text;
+
+		if ($text)
+		{
+			$app    = JFactory::getApplication();
+			$layout = new JLayoutFile('plugins.user.profile.fields.dob');
+			$view   = $app->input->getString('view', '');
+
+			// Only display the tip when editing profile
+			if ($view === 'registration' || $view === 'profile' || $app->isClient('administrator'))
+			{
+				$layout = new JLayoutFile('plugins.user.profile.fields.dob');
+				$info   = $layout->render(array('text' => $text));
+				$label  = $info . $label;
+			}
+		}
+
+		return $label;
+	}
+}
diff --git a/core/plugins/user/profile/field/tos.php b/core/plugins/user/profile/field/tos.php
new file mode 100644
index 00000000..012aa872
--- /dev/null
+++ b/core/plugins/user/profile/field/tos.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.profile
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+JFormHelper::loadFieldClass('radio');
+
+/**
+ * Provides input for TOS
+ *
+ * @since  2.5.5
+ */
+class JFormFieldTos extends JFormFieldRadio
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  2.5.5
+	 */
+	protected $type = 'Tos';
+
+	/**
+	 * Method to get the field label markup.
+	 *
+	 * @return  string  The field label markup.
+	 *
+	 * @since   2.5.5
+	 */
+	protected function getLabel()
+	{
+		$label = '';
+
+		if ($this->hidden)
+		{
+			return $label;
+		}
+
+		// Get the label text from the XML element, defaulting to the element name.
+		$text = $this->element['label'] ? (string) $this->element['label'] : (string) $this->element['name'];
+		$text = $this->translateLabel ? JText::_($text) : $text;
+
+		// Set required to true as this field is not displayed at all if not required.
+		$this->required = true;
+
+		// Build the class for the label.
+		$class = !empty($this->description) ? 'hasPopover' : '';
+		$class = $class . ' required';
+		$class = !empty($this->labelClass) ? $class . ' ' . $this->labelClass : $class;
+
+		// Add the opening label tag and main attributes attributes.
+		$label .= '<label id="' . $this->id . '-lbl" for="' . $this->id . '" class="' . $class . '"';
+
+		// If a description is specified, use it to build a tooltip.
+		if (!empty($this->description))
+		{
+			$label .= ' title="' . htmlspecialchars(trim($text, ':'), ENT_COMPAT, 'UTF-8') . '"';
+			$label .= ' data-content="' . htmlspecialchars(
+				$this->translateDescription ? JText::_($this->description) : $this->description,
+				ENT_COMPAT,
+				'UTF-8'
+			) . '"';
+
+			if (JFactory::getLanguage()->isRtl())
+			{
+				$label .= ' data-placement="left"';
+			}
+		}
+
+		$tosArticle = $this->element['article'] > 0 ? (int) $this->element['article'] : 0;
+
+		if ($tosArticle)
+		{
+			JHtml::_('behavior.modal');
+			JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
+
+			$attribs          = array();
+			$attribs['class'] = 'modal';
+			$attribs['rel']   = '{handler: \'iframe\', size: {x:800, y:500}}';
+
+			$db    = JFactory::getDbo();
+			$query = $db->getQuery(true);
+			$query->select('id, alias, catid, language')
+				->from('#__content')
+				->where('id = ' . $tosArticle);
+			$db->setQuery($query);
+			$article = $db->loadObject();
+
+			if (JLanguageAssociations::isEnabled())
+			{
+				$tosAssociated = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $tosArticle);
+			}
+
+			$currentLang = JFactory::getLanguage()->getTag();
+
+			if (isset($tosAssociated) && $currentLang !== $article->language && array_key_exists($currentLang, $tosAssociated))
+			{
+				$url = ContentHelperRoute::getArticleRoute(
+					$tosAssociated[$currentLang]->id,
+					$tosAssociated[$currentLang]->catid,
+					$tosAssociated[$currentLang]->language
+				);
+
+				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
+			}
+			else
+			{
+				$slug = $article->alias ? ($article->id . ':' . $article->alias) : $article->id;
+				$url  = ContentHelperRoute::getArticleRoute($slug, $article->catid, $article->language);
+				$link = JHtml::_('link', JRoute::_($url . '&tmpl=component'), $text, $attribs);
+			}
+		}
+		else
+		{
+			$link = $text;
+		}
+
+		// Add the label text and closing tag.
+		$label .= '>' . $link . '<span class="star">&#160;*</span></label>';
+
+		return $label;
+	}
+}
diff --git a/core/plugins/user/profile/profile.php b/core/plugins/user/profile/profile.php
new file mode 100644
index 00000000..fed1b8e9
--- /dev/null
+++ b/core/plugins/user/profile/profile.php
@@ -0,0 +1,513 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  User.profile
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * An example custom profile plugin.
+ *
+ * @since  1.6
+ */
+class PlgUserProfile extends JPlugin
+{
+	/**
+	 * Date of birth.
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	private $date = '';
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 * @since  3.1
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An array that holds the plugin configuration
+	 *
+	 * @since   1.5
+	 */
+	public function __construct(& $subject, $config)
+	{
+		parent::__construct($subject, $config);
+		JFormHelper::addFieldPath(__DIR__ . '/field');
+	}
+
+	/**
+	 * Runs on content preparation
+	 *
+	 * @param   string  $context  The context for the data
+	 * @param   object  $data     An object containing the data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function onContentPrepareData($context, $data)
+	{
+		// Check we are manipulating a valid form.
+		if (!in_array($context, array('com_users.profile', 'com_users.user', 'com_users.registration', 'com_admin.profile')))
+		{
+			return true;
+		}
+
+		if (is_object($data))
+		{
+			$userId = isset($data->id) ? $data->id : 0;
+
+			if (!isset($data->profile) && $userId > 0)
+			{
+				// Load the profile data from the database.
+				$db = JFactory::getDbo();
+				$db->setQuery(
+					'SELECT profile_key, profile_value FROM #__user_profiles'
+						. ' WHERE user_id = ' . (int) $userId . " AND profile_key LIKE 'profile.%'"
+						. ' ORDER BY ordering'
+				);
+
+				try
+				{
+					$results = $db->loadRowList();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->_subject->setError($e->getMessage());
+
+					return false;
+				}
+
+				// Merge the profile data.
+				$data->profile = array();
+
+				foreach ($results as $v)
+				{
+					$k = str_replace('profile.', '', $v[0]);
+					$data->profile[$k] = json_decode($v[1], true);
+
+					if ($data->profile[$k] === null)
+					{
+						$data->profile[$k] = $v[1];
+					}
+				}
+			}
+
+			if (!JHtml::isRegistered('users.url'))
+			{
+				JHtml::register('users.url', array(__CLASS__, 'url'));
+			}
+
+			if (!JHtml::isRegistered('users.calendar'))
+			{
+				JHtml::register('users.calendar', array(__CLASS__, 'calendar'));
+			}
+
+			if (!JHtml::isRegistered('users.tos'))
+			{
+				JHtml::register('users.tos', array(__CLASS__, 'tos'));
+			}
+
+			if (!JHtml::isRegistered('users.dob'))
+			{
+				JHtml::register('users.dob', array(__CLASS__, 'dob'));
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns an anchor tag generated from a given value
+	 *
+	 * @param   string  $value  URL to use
+	 *
+	 * @return  mixed|string
+	 */
+	public static function url($value)
+	{
+		if (empty($value))
+		{
+			return JHtml::_('users.value', $value);
+		}
+		else
+		{
+			// Convert website URL to utf8 for display
+			$value = JStringPunycode::urlToUTF8(htmlspecialchars($value));
+
+			if (strpos($value, 'http') === 0)
+			{
+				return '<a href="' . $value . '">' . $value . '</a>';
+			}
+			else
+			{
+				return '<a href="http://' . $value . '">' . $value . '</a>';
+			}
+		}
+	}
+
+	/**
+	 * Returns html markup showing a date picker
+	 *
+	 * @param   string  $value  valid date string
+	 *
+	 * @return  mixed
+	 */
+	public static function calendar($value)
+	{
+		if (empty($value))
+		{
+			return JHtml::_('users.value', $value);
+		}
+		else
+		{
+			return JHtml::_('date', $value, null, null);
+		}
+	}
+
+	/**
+	 * Returns the date of birth formatted and calculated using server timezone.
+	 *
+	 * @param   string  $value  valid date string
+	 *
+	 * @return  mixed
+	 */
+	public static function dob($value)
+	{
+		if (!$value)
+		{
+			return '';
+		}
+
+		return JHtml::_('date', $value, JText::_('DATE_FORMAT_LC1'), false);
+	}
+
+	/**
+	 * Return the translated strings yes or no depending on the value
+	 *
+	 * @param   boolean  $value  input value
+	 *
+	 * @return  string
+	 */
+	public static function tos($value)
+	{
+		if ($value)
+		{
+			return JText::_('JYES');
+		}
+		else
+		{
+			return JText::_('JNO');
+		}
+	}
+
+	/**
+	 * Adds additional fields to the user editing form
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   mixed  $data  The associated data for the form.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	public function onContentPrepareForm(JForm $form, $data)
+	{
+		// Check we are manipulating a valid form.
+		$name = $form->getName();
+
+		if (!in_array($name, array('com_admin.profile', 'com_users.user', 'com_users.profile', 'com_users.registration')))
+		{
+			return true;
+		}
+
+		// Add the registration fields to the form.
+		JForm::addFormPath(__DIR__ . '/profiles');
+		$form->loadFile('profile');
+
+		$fields = array(
+			'address1',
+			'address2',
+			'city',
+			'region',
+			'country',
+			'postal_code',
+			'phone',
+			'website',
+			'favoritebook',
+			'aboutme',
+			'dob',
+			'tos',
+		);
+
+		// Change fields description when displayed in frontend or backend profile editing
+		$app = JFactory::getApplication();
+
+		if ($app->isClient('site') || $name === 'com_users.user' || $name === 'com_admin.profile')
+		{
+			$form->setFieldAttribute('address1', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('address2', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('city', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('region', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('country', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('postal_code', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('phone', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('website', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('favoritebook', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('aboutme', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('dob', 'description', 'PLG_USER_PROFILE_FILL_FIELD_DESC_SITE', 'profile');
+			$form->setFieldAttribute('tos', 'description', 'PLG_USER_PROFILE_FIELD_TOS_DESC_SITE', 'profile');
+		}
+
+		$tosArticle = $this->params->get('register_tos_article');
+		$tosEnabled = $this->params->get('register-require_tos', 0);
+
+		// We need to be in the registration form and field needs to be enabled
+		if ($name !== 'com_users.registration' || !$tosEnabled)
+		{
+			// We only want the TOS in the registration form
+			$form->removeField('tos', 'profile');
+		}
+		else
+		{
+			// Push the TOS article ID into the TOS field.
+			$form->setFieldAttribute('tos', 'article', $tosArticle, 'profile');
+		}
+
+		foreach ($fields as $field)
+		{
+			// Case using the users manager in admin
+			if ($name === 'com_users.user')
+			{
+				// Toggle whether the field is required.
+				if ($this->params->get('profile-require_' . $field, 1) > 0)
+				{
+					$form->setFieldAttribute($field, 'required', ($this->params->get('profile-require_' . $field) == 2) ? 'required' : '', 'profile');
+				}
+				// Remove the field if it is disabled in registration and profile
+				elseif ($this->params->get('register-require_' . $field, 1) == 0
+					&& $this->params->get('profile-require_' . $field, 1) == 0)
+				{
+					$form->removeField($field, 'profile');
+				}
+			}
+			// Case registration
+			elseif ($name === 'com_users.registration')
+			{
+				// Toggle whether the field is required.
+				if ($this->params->get('register-require_' . $field, 1) > 0)
+				{
+					$form->setFieldAttribute($field, 'required', ($this->params->get('register-require_' . $field) == 2) ? 'required' : '', 'profile');
+				}
+				else
+				{
+					$form->removeField($field, 'profile');
+				}
+			}
+			// Case profile in site or admin
+			elseif ($name === 'com_users.profile' || $name === 'com_admin.profile')
+			{
+				// Toggle whether the field is required.
+				if ($this->params->get('profile-require_' . $field, 1) > 0)
+				{
+					$form->setFieldAttribute($field, 'required', ($this->params->get('profile-require_' . $field) == 2) ? 'required' : '', 'profile');
+				}
+				else
+				{
+					$form->removeField($field, 'profile');
+				}
+			}
+		}
+
+		// Drop the profile form entirely if there aren't any fields to display.
+		$remainingfields = $form->getGroup('profile');
+
+		if (!count($remainingfields))
+		{
+			$form->removeGroup('profile');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Method is called before user data is stored in the database
+	 *
+	 * @param   array    $user   Holds the old user data.
+	 * @param   boolean  $isnew  True if a new user is stored.
+	 * @param   array    $data   Holds the new user data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.1
+	 * @throws  InvalidArgumentException on invalid date.
+	 */
+	public function onUserBeforeSave($user, $isnew, $data)
+	{
+		// Check that the date is valid.
+		if (!empty($data['profile']['dob']))
+		{
+			try
+			{
+				$date = new JDate($data['profile']['dob']);
+				$this->date = $date->format('Y-m-d H:i:s');
+			}
+			catch (Exception $e)
+			{
+				// Throw an exception if date is not valid.
+				throw new InvalidArgumentException(JText::_('PLG_USER_PROFILE_ERROR_INVALID_DOB'));
+			}
+
+			if (JDate::getInstance('now') < $date)
+			{
+				// Throw an exception if dob is greather than now.
+				throw new InvalidArgumentException(JText::_('PLG_USER_PROFILE_ERROR_INVALID_DOB_FUTURE_DATE'));
+			}
+		}
+
+		// Check that the tos is checked if required ie only in registration from frontend.
+		$task       = JFactory::getApplication()->input->getCmd('task');
+		$option     = JFactory::getApplication()->input->getCmd('option');
+		$tosArticle = $this->params->get('register_tos_article');
+		$tosEnabled = ($this->params->get('register-require_tos', 0) == 2);
+
+		// Check that the tos is checked.
+		if ($task === 'register' && $tosEnabled && $tosArticle && $option === 'com_users' && !$data['profile']['tos'])
+		{
+			throw new InvalidArgumentException(JText::_('PLG_USER_PROFILE_FIELD_TOS_DESC_SITE'));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Saves user profile data
+	 *
+	 * @param   array    $data    entered user data
+	 * @param   boolean  $isNew   true if this is a new user
+	 * @param   boolean  $result  true if saving the user worked
+	 * @param   string   $error   error message
+	 *
+	 * @return  boolean
+	 */
+	public function onUserAfterSave($data, $isNew, $result, $error)
+	{
+		$userId = ArrayHelper::getValue($data, 'id', 0, 'int');
+
+		if ($userId && $result && isset($data['profile']) && count($data['profile']))
+		{
+			try
+			{
+				$db = JFactory::getDbo();
+
+				// Sanitize the date
+				if (!empty($data['profile']['dob']))
+				{
+					$data['profile']['dob'] = $this->date;
+				}
+
+				$keys = array_keys($data['profile']);
+
+				foreach ($keys as &$key)
+				{
+					$key = 'profile.' . $key;
+					$key = $db->quote($key);
+				}
+
+				$query = $db->getQuery(true)
+					->delete($db->quoteName('#__user_profiles'))
+					->where($db->quoteName('user_id') . ' = ' . (int) $userId)
+					->where($db->quoteName('profile_key') . ' IN (' . implode(',', $keys) . ')');
+				$db->setQuery($query);
+				$db->execute();
+
+				$query = $db->getQuery(true)
+					->select($db->quoteName('ordering'))
+					->from($db->quoteName('#__user_profiles'))
+					->where($db->quoteName('user_id') . ' = ' . (int) $userId);
+				$db->setQuery($query);
+				$usedOrdering = $db->loadColumn();
+
+				$tuples = array();
+				$order = 1;
+
+				foreach ($data['profile'] as $k => $v)
+				{
+					while (in_array($order, $usedOrdering))
+					{
+						$order++;
+					}
+
+					$tuples[] = '(' . $userId . ', ' . $db->quote('profile.' . $k) . ', ' . $db->quote(json_encode($v)) . ', ' . ($order++) . ')';
+				}
+
+				$db->setQuery('INSERT INTO #__user_profiles VALUES ' . implode(', ', $tuples));
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->_subject->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove all user profile information for the given user ID
+	 *
+	 * Method is called after user data is deleted from the database
+	 *
+	 * @param   array    $user     Holds the user data
+	 * @param   boolean  $success  True if user was succesfully stored in the database
+	 * @param   string   $msg      Message
+	 *
+	 * @return  boolean
+	 */
+	public function onUserAfterDelete($user, $success, $msg)
+	{
+		if (!$success)
+		{
+			return false;
+		}
+
+		$userId = ArrayHelper::getValue($user, 'id', 0, 'int');
+
+		if ($userId)
+		{
+			try
+			{
+				$db = JFactory::getDbo();
+				$db->setQuery(
+					'DELETE FROM #__user_profiles WHERE user_id = ' . $userId
+						. " AND profile_key LIKE 'profile.%'"
+				);
+
+				$db->execute();
+			}
+			catch (Exception $e)
+			{
+				$this->_subject->setError($e->getMessage());
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/core/plugins/user/profile/profile.xml b/core/plugins/user/profile/profile.xml
new file mode 100644
index 00000000..e478d683
--- /dev/null
+++ b/core/plugins/user/profile/profile.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.1" type="plugin" group="user" method="upgrade">
+	<name>plg_user_profile</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2008</creationDate>
+	<copyright>(C) 2005 - 2018 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.0.0</version>
+	<description>PLG_USER_PROFILE_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="profile">profile.php</filename>
+		<folder>profiles</folder>
+		<folder>field</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_user_profile.ini</language>
+		<language tag="en-GB">en-GB.plg_user_profile.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" addfieldpath="/administrator/components/com_content/models/fields">
+				<field
+					name="register-require-user"
+					type="spacer"
+					label="PLG_USER_PROFILE_FIELD_NAME_REGISTER_REQUIRE_USER"
+					class="text"
+				/>
+
+				<field
+					name="register-require_address1"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_address2"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ADDRESS2_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_city"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_CITY_LABEL"
+					description="PLG_USER_PROFILE_FIELD_CITY_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_region"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_REGION_LABEL"
+					description="PLG_USER_PROFILE_FIELD_REGION_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_country"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_COUNTRY_LABEL"
+					description="PLG_USER_PROFILE_FIELD_COUNTRY_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_postal_code"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_POSTAL_CODE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_POSTAL_CODE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_phone"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_PHONE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_PHONE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_website"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_WEB_SITE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_favoritebook"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL"
+					description="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_aboutme"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_ABOUT_ME_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ABOUT_ME_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option	value="2">JOPTION_REQUIRED</option>
+					<option	value="1">JOPTION_OPTIONAL</option>
+					<option	value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register-require_tos"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_TOS_LABEL"
+					description="PLG_USER_PROFILE_FIELD_TOS_DESC"
+					default="0"
+					filter="integer"
+					>
+					<option	value="2">JOPTION_REQUIRED</option>
+					<option	value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="register_tos_article"
+					type="modal_article"
+					label="PLG_USER_PROFILE_FIELD_TOS_ARTICLE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_TOS_ARTICLE_DESC"
+					select="true"
+					new="true"
+					edit="true"
+					clear="true"
+					filter="integer"
+				/>
+
+				<field
+					name="register-require_dob"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
+					description="PLG_USER_PROFILE_FIELD_DOB_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option	value="2">JOPTION_REQUIRED</option>
+					<option	value="1">JOPTION_OPTIONAL</option>
+					<option	value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="spacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="profile-require-user"
+					type="spacer"
+					label="PLG_USER_PROFILE_FIELD_NAME_PROFILE_REQUIRE_USER"
+					class="text"
+				/>
+
+				<field
+					name="profile-require_address1"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_address2"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ADDRESS2_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_city"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_CITY_LABEL"
+					description="PLG_USER_PROFILE_FIELD_CITY_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_region"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_REGION_LABEL"
+					description="PLG_USER_PROFILE_FIELD_REGION_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_country"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_COUNTRY_LABEL"
+					description="PLG_USER_PROFILE_FIELD_COUNTRY_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_postal_code"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_POSTAL_CODE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_POSTAL_CODE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_phone"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_PHONE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_PHONE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_website"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL"
+					description="PLG_USER_PROFILE_FIELD_WEB_SITE_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_favoritebook"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL"
+					description="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option value="2">JOPTION_REQUIRED</option>
+					<option value="1">JOPTION_OPTIONAL</option>
+					<option value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_aboutme"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_ABOUT_ME_LABEL"
+					description="PLG_USER_PROFILE_FIELD_ABOUT_ME_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option	value="2">JOPTION_REQUIRED</option>
+					<option	value="1">JOPTION_OPTIONAL</option>
+					<option	value="0">JDISABLED</option>
+				</field>
+
+				<field
+					name="profile-require_dob"
+					type="list"
+					label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
+					description="PLG_USER_PROFILE_FIELD_DOB_DESC"
+					default="1"
+					filter="integer"
+					>
+					<option	value="2">JOPTION_REQUIRED</option>
+					<option	value="1">JOPTION_OPTIONAL</option>
+					<option	value="0">JDISABLED</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/plugins/user/profile/profiles/profile.xml b/core/plugins/user/profile/profiles/profile.xml
new file mode 100644
index 00000000..c5488854
--- /dev/null
+++ b/core/plugins/user/profile/profiles/profile.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="profile">
+		<fieldset
+			name="profile"
+			label="PLG_USER_PROFILE_SLIDER_LABEL"
+		>
+			<field
+				name="address1"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_ADDRESS1_LABEL"
+				description="PLG_USER_PROFILE_FIELD_ADDRESS1_DESC"
+				id="address1"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="address2"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_ADDRESS2_LABEL"
+				description="PLG_USER_PROFILE_FIELD_ADDRESS2_DESC"
+				id="address2"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="city"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_CITY_LABEL"
+				description="PLG_USER_PROFILE_FIELD_CITY_DESC"
+				id="city"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="region"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_REGION_LABEL"
+				description="PLG_USER_PROFILE_FIELD_REGION_DESC"
+				id="region"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="country"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_COUNTRY_LABEL"
+				description="PLG_USER_PROFILE_FIELD_COUNTRY_DESC"
+				id="country"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="postal_code"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_POSTAL_CODE_LABEL"
+				description="PLG_USER_PROFILE_FIELD_POSTAL_CODE_DESC"
+				id="postal_code"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="phone"
+				type="tel"
+				label="PLG_USER_PROFILE_FIELD_PHONE_LABEL"
+				description="PLG_USER_PROFILE_FIELD_PHONE_DESC"
+				id="phone"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="website"
+				type="url"
+				label="PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL"
+				description="PLG_USER_PROFILE_FIELD_WEB_SITE_DESC"
+				id="website"
+				filter="url"
+				size="30"
+			/>
+
+			<field
+				name="favoritebook"
+				type="text"
+				label="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_LABEL"
+				description="PLG_USER_PROFILE_FIELD_FAVORITE_BOOK_DESC"
+				filter="string"
+				size="30"
+			/>
+
+			<field
+				name="aboutme"
+				type="textarea"
+				label="PLG_USER_PROFILE_FIELD_ABOUT_ME_LABEL"
+				description="PLG_USER_PROFILE_FIELD_ABOUT_ME_DESC"
+				cols="30"
+				rows="5"
+				filter="safehtml"
+			/>
+
+			<field
+				name="dob"
+				type="dob"
+				label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
+				description="PLG_USER_PROFILE_FIELD_DOB_DESC"
+				info="PLG_USER_PROFILE_SPACER_DOB"
+				translateformat="true"
+				showtime="false"
+				filter="server_utc"
+			/>
+
+			<field
+				name="tos"
+				type="tos"
+				label="PLG_USER_PROFILE_FIELD_TOS_LABEL"
+				description="PLG_USER_PROFILE_FIELD_TOS_DESC"
+				default="0"
+				filter="integer"
+				>
+				<option value="1">PLG_USER_PROFILE_OPTION_AGREE</option>
+				<option value="0">JNO</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/core/robots.txt.dist b/core/robots.txt.dist
new file mode 100644
index 00000000..7c25fb19
--- /dev/null
+++ b/core/robots.txt.dist
@@ -0,0 +1,32 @@
+# If the Joomla site is installed within a folder 
+# eg www.example.com/joomla/ then the robots.txt file 
+# MUST be moved to the site root 
+# eg www.example.com/robots.txt
+# AND the joomla folder name MUST be prefixed to all of the
+# paths. 
+# eg the Disallow rule for the /administrator/ folder MUST 
+# be changed to read 
+# Disallow: /joomla/administrator/
+#
+# For more information about the robots.txt standard, see:
+# http://www.robotstxt.org/orig.html
+#
+# For syntax checking, see:
+# http://tool.motoricerca.info/robots-checker.phtml
+
+User-agent: *
+Disallow: /administrator/
+Disallow: /bin/
+Disallow: /cache/
+Disallow: /cli/
+Disallow: /components/
+Disallow: /includes/
+Disallow: /installation/
+Disallow: /language/
+Disallow: /layouts/
+Disallow: /libraries/
+Disallow: /logs/
+Disallow: /modules/
+Disallow: /plugins/
+Disallow: /tmp/
+
diff --git a/core/templates/beez3/component.php b/core/templates/beez3/component.php
new file mode 100644
index 00000000..89163099
--- /dev/null
+++ b/core/templates/beez3/component.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$color = $this->params->get('templatecolor');
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add stylesheets
+JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto'));
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'position.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'layout.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'print.css', array('version' => 'auto', 'relative' => true), array('media' => 'print'));
+JHtml::_('stylesheet', 'general.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', htmlspecialchars($color, ENT_COMPAT, 'UTF-8') . '.css', array('version' => 'auto', 'relative' => true));
+
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', htmlspecialchars($color, ENT_COMPAT, 'UTF-8') . '_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+JHtml::_('stylesheet', 'ieonly.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'lte IE 6'));
+
+// Check for a custom CSS file
+JHtml::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body class="contentpane">
+	<div id="all">
+		<div id="main">
+			<jdoc:include type="message" />
+			<jdoc:include type="component" />
+		</div>
+	</div>
+</body>
+</html>
diff --git a/core/templates/beez3/css/general.css b/core/templates/beez3/css/general.css
new file mode 100644
index 00000000..49f77f23
--- /dev/null
+++ b/core/templates/beez3/css/general.css
@@ -0,0 +1,605 @@
+/* not ready */
+
+/* -- form validation */
+.invalid { border-color: #B94A48;background:#F2DEDE}
+label.invalid , label.required  span{ color: #B94A48; background:none
+	}
+
+/* -- Joomla edit buttons  Frontendediting*/
+#editor-xtd-buttons {
+	padding: 0px;
+}
+.edit tr:hover  td {background:#eee}
+.button2-left,
+.button2-right,
+.button2-left div,
+.button2-right div {
+	float: left;
+}
+
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	display: block;
+	float: left;
+	color: #666;
+	cursor: pointer;
+}
+
+.button2-left span,
+.button2-right span {
+	cursor: default;
+	color: #999;
+}
+
+.button2-left .page a,
+.button2-right .page a,
+.button2-left .page span,
+.button2-right .page span {
+	padding: 0 6px;
+}
+
+.page span {
+	color: #000;
+	font-weight: bold;
+}
+
+
+.button2-left,
+.button2-right {
+
+	float: left;
+	margin-left: 5px;
+}
+
+
+.edit .formelm-buttons {text-align:right}
+.edit .formelm-buttons button {background:#D9EDF7; color:#095197;}
+.edit .formelm-buttons button:hover {color:#D9EDF7; background:#095197;}
+.modal-button:link,
+.modal-button:visited,
+.button2-left .readmore a:link,
+.button2-left .readmore a:visited,
+.button2-left .blank a:link,
+.button2-left .blank a:visited
+{ background-color: #D9EDF7;
+
+	color:#095197;border:solid 1px #BCE8F1; border-top:0; border-radius:0 0 3px 3px;  text-decoration:none; padding:3px}
+.button2-left a:hover,
+.button2-left .blank a:hover,
+.button2-left .readmore a:hover,
+.button2-right a:hover {
+	text-decoration: none;
+	color: #fff;
+	background:#095197;
+}
+.pull-right {
+	float: right;
+}
+.pull-left {
+	float: left;
+}
+.btn-toolbar .btn {
+	-moz-border-bottom-colors: none;
+	-moz-border-left-colors: none;
+	-moz-border-right-colors: none;
+	-moz-border-top-colors: none;
+	background-color: #D9EDF7;
+	border-image: none;
+	border-radius: 0 0 3px 3px;
+	color: #095197;
+	padding: 3px;
+	text-decoration: none;
+}
+
+div.toggle-editor {
+
+}
+/* Caption fixes */
+.img_caption .left {
+	float: left;
+	margin-right: 1em;
+}
+
+.img_caption .right {
+	float: right;
+	margin-left: 1em;
+}
+
+.img_caption .left p {
+	clear: left;
+	text-align: center;
+}
+
+.img_caption .right p {
+	clear: right;
+	text-align: center;
+}
+
+.img_caption  {
+	text-align: center!important;
+}
+
+.img_caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+/* New captions */
+figure {
+	display: table;
+}
+figure.pull-center,
+img.pull-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+figcaption {
+	display: table-caption;
+	caption-side: bottom;
+}
+/* Calendar */
+#jform_publish_down_btn {
+	width: 18px;
+	height: 18px;
+	margin-left: 3px;
+	background: url(../images/system/calendar.png) no-repeat;
+	cursor: pointer;
+	vertical-align: middle;
+}
+#jform_publish_up_btn {
+	width: 18px;
+	height: 18px;
+	margin-left: 3px;
+	background: url(../images/system/calendar.png) no-repeat;
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+
+/* System Messages */
+
+.error
+{
+	padding:0px;
+	margin-bottom: 20px;
+}
+
+.error h2
+{
+	color:#000 !important;
+	font-size:1.4em !important;
+	text-transform:uppercase;
+	padding:0 0 0 0px !important
+}
+
+#system-message dt
+{
+	font-weight: bold;
+}
+#system-message dd
+{
+	margin: 0 0 15px 0;
+	font-weight: bold;
+	text-indent: 0px;
+	padding:0
+}
+#system-message dd ul
+{
+	color: #000;
+	list-style: none;
+	padding: 0px;
+}
+#system-message dd ul li
+{
+	line-height:1.5em
+}
+
+/* System Standard Messages */
+#system-message dt.message
+{
+	position:absolute;
+	top:-2000px;
+	left:-3000px;
+}
+
+#system-message dd.message  ul
+{
+	background: #fff  url(../images/system/notice-info.png) no-repeat;
+	padding-left:40px;
+	padding: 10px 10px 10px 40px;
+	border: 2px solid #90B203;
+	border-radius:10px
+}
+
+#system-message dd.message ul li{background:none !important}
+
+/* System Error Messages */
+#system-message dt.error
+{
+	position:absolute;
+	top:-2000px;
+	left:-3000px;
+}
+
+#system-message dd.error ul
+{
+	background:#fff url(../images/system/notice-alert.png) no-repeat ;
+	padding-left:40px;
+ 	padding: 10px 10px 10px 40px;
+	border: 2px solid #990000;
+	border-radius:10px
+
+}
+
+
+
+/* System Notice Messages */
+#system-message dt.notice
+{
+	position:absolute;
+	top:-2000px;
+	left:-3000px;
+}
+
+#system-message dd.notice  ul
+{
+	background:#fff url(../images/system/notice-note.png) no-repeat ;
+	padding-left:40px;
+	padding: 10px 10px 10px 40px;
+	border: 2px solid #FAA528;
+	border-radius:10px
+
+}
+#system-message dd.notice ul { color: #000;margin:10px 0 }
+
+#system-message
+{
+	margin-bottom: 0px;
+	padding: 0;
+}
+
+#system-message dt
+{
+	font-weight: bold;
+}
+
+#system-message dd
+{
+	font-weight: bold;
+	padding: 0;
+}
+
+
+.tip-wrap { background:#FEFDE2; font-size:0.8em ; padding:5px; border:solid 1px #ddd; border-radius:3px; box-shadow: 0 1px 5px #ccc }
+.tip-title {font-weight:bold}
+
+#all #upload-flash ul li a:hover,
+#all .item a:hover span {
+	background:#095197;
+	color:#fff;
+}
+
+
+/* ##########################  user profile  ########################### */
+
+#users-profile-core,
+#users-profile-custom
+{
+	margin:10px 0 15px 0;
+	padding:15px;
+}
+
+#users-profile-core dt,
+#users-profile-custom dt
+{
+	float:left;
+	width:12em;
+	padding:3px 0;
+
+
+}
+
+#users-profile-core dd,
+#users-profile-custom dd
+{
+	padding:3px 0;
+}
+
+#member-profile fieldset,
+.registration fieldset
+{
+	margin:10px 0 15px 0;
+	padding:15px;
+
+}
+
+#users-profile-core legend,
+#users-profile-custom legend,
+.profile-edit legend,
+.registration legend
+{
+	font-weight:bold
+}
+
+.profile-edit form#member-profile fieldset dd,
+.registration form#member-registration fieldset dd
+{ float:none; padding:5px 0}
+
+.profile-edit form#member-profile fieldset dd input,
+.profile-edit form#member-profile fieldset dd select,
+.registration form#member-registration fieldset dd input
+{width:17em}
+.profile-edit form#member-profile fieldset dt,
+.registration form#member-registration fieldset dt
+{padding:5px 5px 5px 0; width:13em}
+
+
+span.optional
+{font-size:0.9em}
+
+/* ##########################  clearing  ########################### */
+.clr {
+	clear: both;
+	overflow: hidden;
+	height: 0;
+}
+
+/* ##########################  tooltip  ########################### */
+.tooltip {
+	position: absolute;
+	z-index: 103000;
+	display: block;
+	visibility: visible;
+	font-size: 11px;
+	line-height: 1.4;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+.tooltip.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top: -3px;
+	padding: 5px 0;
+}
+.tooltip.right {
+	margin-left: 3px;
+	padding: 0 5px;
+}
+.tooltip.bottom {
+	margin-top: 3px;
+	padding: 5px 0;
+}
+.tooltip.left {
+	margin-left: -3px;
+	padding: 0 5px;
+}
+.tooltip-inner {
+	max-width: 200px;
+	padding: 8px;
+	color: #fff;
+	text-align: left;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+#filter-search {
+	vertical-align: top;
+}
+.input-mini {
+	width: 60px;
+}
+
+/* ##########################  popover  ########################### */
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1010;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	text-align: left;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	white-space: normal;
+}
+.popover.top {
+	margin-top: -10px;
+}
+.popover.right {
+	margin-left: 10px;
+}
+.popover.bottom {
+	margin-top: 10px;
+}
+.popover.left {
+	margin-left: -10px;
+}
+.popover-title {
+	margin: 0;
+	padding: 8px 14px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.popover-title:empty {
+	display: none;
+}
+.popover-content {
+	padding: 9px 14px;
+	min-height: 33px;
+}
+.popover .arrow,
+.popover .arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.popover .arrow {
+	border-width: 11px;
+}
+.popover .arrow:after {
+	border-width: 10px;
+	content: "";
+}
+.popover.top .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-bottom-width: 0;
+	border-top-color: #999;
+	border-top-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+}
+.popover.top .arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	border-bottom-width: 0;
+	border-top-color: #fff;
+}
+.popover.right .arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-left-width: 0;
+	border-right-color: #999;
+	border-right-color: rgba(0,0,0,0.25);
+}
+.popover.right .arrow:after {
+	left: 1px;
+	bottom: -10px;
+	border-left-width: 0;
+	border-right-color: #fff;
+}
+.popover.bottom .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0,0,0,0.25);
+	top: -11px;
+}
+.popover.bottom .arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	border-top-width: 0;
+	border-bottom-color: #fff;
+}
+.popover.left .arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0,0,0,0.25);
+}
+.popover.left .arrow:after {
+	right: 1px;
+	border-right-width: 0;
+	border-left-color: #fff;
+	bottom: -10px;
+}
+
+/* Bootstrap overrides anhiliation
+ * @since 3.2
+ */
+body#shadow {
+    line-height: 1.5em;
+}
+body .nav-pills > .active > a, body .nav-pills > .active > a:hover, body .nav-pills > .active > a:focus {
+    background-color: transparent;
+}
+body .nav-pills > li > a {
+    border-radius: 0px;
+    line-height: 1.5em;
+}
+body a {
+    text-decoration: underline;
+}
+body input[type="text"].search-query {
+    line-height: 1.5em;
+    height: auto;
+    border-radius: 4px;
+
+}
+/* Text alignments */
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+
+/* Component pop-up */
+.container-popup {
+	padding: 28px 10px 10px 10px;
+}
diff --git a/core/templates/beez3/css/ie7only.css b/core/templates/beez3/css/ie7only.css
new file mode 100644
index 00000000..a23b1cad
--- /dev/null
+++ b/core/templates/beez3/css/ie7only.css
@@ -0,0 +1,40 @@
+/**
+ * @author  ( Angie Radtke  )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+ */
+
+
+
+div.current , fieldset {zoom:1}
+dl.tabs ,.tabs dt,.tabs dd
+{display:inline}
+.contact-links , .js_heading{zoom:1}
+
+legend {margin-left:-7px}
+
+#users-profile-core legend,
+#users-profile-custom legend,
+.profile-edit legend,
+.registration legend
+{margin-bottom:15px}
+
+.login-fields input
+{width:14em}
+
+#close a
+{
+	cursor:pointer
+}
+
+#close a span
+{
+	line-height:normal
+}
diff --git a/core/templates/beez3/css/ieonly.css b/core/templates/beez3/css/ieonly.css
new file mode 100644
index 00000000..4d65e760
--- /dev/null
+++ b/core/templates/beez3/css/ieonly.css
@@ -0,0 +1,191 @@
+/**
+
+ * @author ( Angie Radtke )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+ */
+
+
+
+#all { width: expression(document . body . clientWidth > 1050 ? "1050" : "auto");  }
+#footer-inner { width: expression(document . body . clientWidth > 1050 ? "1025" : "auto");  }
+#footer { width: expression(document . body . clientWidth > 1050 ? "1020" : "auto");  }
+
+#all
+{
+        border:solid 1px #fff;
+                zoom:1
+}
+
+#header
+{ position:relative; zoom:1}
+
+
+#line
+{
+        width:19.0em;
+        margin-right:20px;
+
+}
+
+
+#header ul.skiplinks li a
+{
+
+background:#cc0000;
+border:0px solid #000
+
+}
+
+
+#contentarea,
+#contentarea2
+{
+       display:inline-block;
+        position:relative;
+}
+
+#main
+{
+            height:520px;
+}
+
+#back
+{
+        margin: 0;
+        padding:0 0px;
+}
+
+#right
+{
+        float:left;
+        width: 20.5%;
+        text-align:left !important
+}
+
+.left
+{
+            margin:10px 0px 10px 18px;
+
+}
+
+/* haslayout erzwingen */
+
+.blog
+{
+            width:100%
+}
+
+.article_row
+{
+        width:auto;
+}
+
+.row1 .cols2
+{
+        width:auto;
+}
+
+.moduletable,
+.moduletable_js
+{
+            zoom:1
+}
+
+#nav ul li,
+#right ul li,
+#bottom ul li
+{
+            height:1%
+}
+
+p.articleinfo
+{
+            display:inline-block
+}
+
+h1
+{
+
+}
+
+ul.tabs
+{
+        text-align:left
+}
+
+ul.newsflash-horiz,
+#footer-outer,
+ul.tabs
+{
+        zoom:1
+}
+
+.tabcontent
+{
+        overflow:hidden !important;
+        position:relative
+}
+
+#main h1
+{ zoom:1}
+
+.box {width:26%}
+
+#bottom
+{display:inline-block}
+
+.panel,
+div.current
+{zoom:1}
+
+.contact-image
+{
+	display:inline-block
+}
+.item-page
+{ width:100%}
+
+#mailto-window  .mailto-close a
+{
+
+	width:25px;
+	height:25px;
+
+
+
+}
+
+#users-profile-core legend,
+#users-profile-custom legend,
+.profile-edit legend,
+.registration legend
+{
+	margin-bottom:15px
+}
+
+
+.login-fields input
+{
+	width:14em
+}
+
+dd.error
+{zoom:1}
+
+#close a
+{
+	cursor:pointer
+}
+
+#close a span
+{
+	line-height:normal
+}
diff --git a/core/templates/beez3/css/layout.css b/core/templates/beez3/css/layout.css
new file mode 100644
index 00000000..a93bbd7f
--- /dev/null
+++ b/core/templates/beez3/css/layout.css
@@ -0,0 +1,1105 @@
+/**
+ * @author  ( Angie Radtke  )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+	/* Typography =================================================== */
+body#shadow {
+	font-family: arial,sans-serif
+}
+
+body h1,body h2,body h3,body h4,body h5,body h6 {
+	margin: 0;
+	font-family: inherit;
+	font-weight: normal;
+	color: inherit;
+	text-rendering: optimizelegibility;
+	word-wrap: break-word;
+}
+
+body h1 {
+	margin-bottom: 0.75em;
+	font-size: 3.6em;
+	line-height: 1.2;
+}
+
+body h2 {
+	margin-bottom: 0.75em;
+	font-size: 1.5em;
+	line-height: 1.2;
+	padding: 5px 0
+}
+
+body h3 {
+	margin-bottom: 1em;
+	font-size: 1.4em;
+	line-height: 1.3;
+	padding-bottom: 5px
+}
+
+body h4 {
+	margin-bottom: 1.5em;
+	font-size: 1.2em;
+	line-height: 1.25;
+}
+
+body h5 {
+	font-size: 1.1em;
+	margin-bottom: 1.5em;
+}
+
+body p,body ol,body ul,body dl,body address {
+	margin-bottom: 1.5em;
+	font-size: 1.0em;
+	line-height: 1.5em;
+	word-wrap: break-word;
+}
+
+small {
+	font-size: 0.9em;
+}
+
+body ul,body ol {
+	margin: 0 0 1.5em 12px;
+	padding: 0 0 0 12px;
+}
+
+body li ul,body li ol {
+	margin: 0;
+}
+
+
+ul.categories-module
+{ padding:0; margin:0}
+
+
+blockquote {
+	margin: 0 0 1.5em -24px;
+	padding-left: 24px;
+	border-left: 2px solid #c7ced6;
+	font-style: normal;
+}
+
+q {
+	quotes: none;
+}
+
+
+
+cite {
+	font-style: normal;
+}
+
+abbr[title] {
+	border-bottom: 1px dotted #c7ced6;
+	cursor: help;
+}
+
+b,strong {
+	font-weight: bold;
+}
+
+dfn {
+	font-style: italic;
+}
+
+ins {
+	text-decoration: none;
+}
+
+mark {
+	font-style: italic;
+	font-weight: bold;
+}
+
+pre,code,kbd,samp {
+	line-height: 1.5em;
+}
+
+pre {
+	white-space: pre-wrap;
+	}
+
+sub,sup {
+	position: relative;
+	line-height: 0;
+}
+
+sup {
+	top: -0.5em;
+}
+
+sub {
+	bottom: -0.25em;
+}
+
+table {
+	width: 100%;
+	max-width: 100%;
+	margin-bottom: 1.5em;
+	border-collapse: collapse;
+	border-spacing: 0;
+	background-color: transparent;
+	font-size: 1em
+}
+
+table th,table td {
+	padding: 8px;
+	vertical-align: top;
+	border-top: 1px solid #ddd;
+	line-height: 1.5em;
+	text-align: left;
+}
+
+table th {
+	font-weight: bold;
+	border: 0
+}
+
+table thead th {
+	vertical-align: bottom;
+}
+
+table  tr:first-child th,table tr:first-child td,table thead:first-child tr:first-child th,table thead:first-child tr:first-child td
+	{
+	border-top: 0;
+}
+
+table tbody+tbody {
+	border-top: 2px solid #8c9bab;
+}
+
+table tbody tr td,table tbody tr th {
+	-webkit-transition: background-color 0.25s 0 linear;
+	-moz-transition: background-color 0.25s 0 linear;
+	-ms-transition: background-color 0.25s 0 linear;
+	-o-transition: background-color 0.25s 0 linear;
+	transition: background-color 0.25s 0 linear;
+}
+
+/* links */
+p.readmore a,  .mod-articles-category-readmore a {
+	border: 1px solid #CCCCCC;
+	border-radius: 3px;
+	display: inline-block;
+	text-decoration: none;
+	margin-bottom: 9px;
+	padding: 4px;
+	line-height: 1.6em;
+}
+
+/* +++++++++++++++++  forms general #######################  */
+form {
+	margin: 0 0 18px;
+}
+
+fieldset {
+	border: solid 1px #ddd;
+	margin: 10px 0;
+	padding: 20px;
+	border-radius: 5px
+}
+
+fieldset p {
+	margin: 0;
+	padding: 0;
+}
+
+legend {
+	font-weight: bold;
+	background: #fff;
+	padding: 5px 10px
+}
+
+label,input,button,select,textarea {
+	font-weight: normal;
+}
+
+label {
+	color: #333333;
+	margin-bottom: 5px;
+	max-width: 90%
+}
+
+input,textarea,select,#advanced-search-toggle, input.search-query {
+	border: 1px solid #CCCCCC;
+	border-radius: 3px;
+	display: inline-block;
+	margin-bottom: 9px;
+	padding: 4px;
+}
+.filter-search-lbl {display:inline}
+.filter-search, .display-limit {float:left; margin-right:10px}
+.button,button,.profile-edit a {
+	border-radius: 3px;
+	padding: 4px;
+	line-height: 1.2em;
+	text-decoration: none;
+}
+
+label input,label textarea,label select {
+	display: block;
+}
+
+input[type="image"],input[type="checkbox"],input[type="radio"] {
+	border-radius: 0;
+	cursor: pointer;
+	height: auto;
+	line-height: normal;
+	margin: 3px 0;
+	padding: 0;
+	width: auto;
+}
+
+input[type="button"],input[type="reset"],input[type="submit"] {
+	height: auto;
+	width: auto;
+}
+
+select {
+	height: 28px;
+	line-height: 28px;
+	max-width:99%}
+
+select {
+	width: 220px;
+}
+
+select[multiple],select[size] {
+	height: auto;
+}
+
+textarea {
+	height: auto;
+}
+
+.radio,.checkbox {
+	padding-left: 18px;
+}
+
+input[type="radio"],input[type="checkbox"] {
+	display: inline;
+	 margin-right : 10px;
+	 border:none
+}
+
+input,textarea {
+	-moz-transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s;
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
+}
+
+input:focus,textarea:focus {
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px
+		rgba(82, 168, 236, 0.6);
+	outline: 0 none;
+}
+
+input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus
+	{
+	box-shadow: none;
+	outline-offset: -2px;
+}
+
+/* +++++++++++++++++++++++  header searchbox +++++++++++++++++++++  */
+
+#header form {
+	overflow: hidden;
+	float: right
+}
+#header form .search {display:inline}
+#header input {
+	font-weight: bold;
+	float: left;
+}
+
+#header .inputbox {
+	margin-right: 5px
+}
+
+/* ++++++++++++++++++++  search component +++++++++++++++++++++++ */
+
+fieldset.word {
+	border: 0;
+	background: #fff;
+	padding: 0
+}
+
+fieldset.phrases label,fieldset.only label {
+	display: inline;
+}
+
+ :root *> fieldset.only label:before {
+	background: #a7c7dc;
+	background: -moz-linear-gradient(-45deg, #fefefe, #ddd);
+	background: -webkit-linear-gradient(-45deg, #fefefe, #ddd);
+	background: -o-linear-gradient(-45deg, #fefefe, #ddd);
+	background: -ms-linear-gradient(-45deg, #fefefe, #ddd);
+	background: linear-gradient(-45deg, #fefefe, #ddd);
+	border: 1px solid #aaa;
+	border-radius: 3px;
+	box-shadow: 0 0 1px 1px #CCCCCC;
+	height: 1em;
+	margin: 0 4px 0 0;
+	text-transform: uppercase;
+	width: 1em;
+	display: inline-block;
+	margin-left: -40px;
+	padding: 2px;
+	line-height: 1em;
+	text-indent: -50px;
+}
+
+input[type="checkbox"]:checked+label:before {
+	content: "\2714";
+	text-indent: 0;
+	background: -moz-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -webkit-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -o-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -ms-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: linear-gradient(-45deg, #fefefe, #0b70cd);
+	border: 1px solid #0B70CD;
+}
+
+:root *> .phrases-box  label:before {
+	background: #a7c7dc;
+	background: -moz-linear-gradient(-45deg, #fefefe, #ccc);
+	background: -webkit-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -o-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -ms-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: linear-gradient(-45deg, #fefefe, #0b70cd);
+	border: 1px solid #aaa;
+	line-height: 1.3em;
+	margin: 0 4px 0 0;
+	text-transform: uppercase;
+	width: 1.3em;
+	display: inline-block;
+	margin-left: -40px;
+	-moz-border-radius: 12px;
+	-webkit-border-radius: 12px;
+	border-radius: 12px;
+	text-indent: -40px;
+	color: #fff;
+	text-shadow: 0 10px 6px #fff;
+}
+
+/*
+input[type="radio"]:checked + label:before {
+	content: "\2022";
+	text-indent: 6px;
+	background: -moz-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -webkit-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -o-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: -ms-linear-gradient(-45deg, #fefefe, #0b70cd);
+	background: linear-gradient(-45deg, #fefefe, #0b70cd);
+	color: #000;
+	zoom:1;
+	border: 1px solid #aaa;
+}*/
+
+.ordering-box {
+	margin: 10px 0;
+}
+
+.search-results dt.result-title {
+	padding: 15px 15px 0 5px;
+	font-weight: bold;
+}
+
+.search-results dd {
+	padding: 2px 15px 2px 5px
+}
+
+.search-results dd.result-text {
+	padding: 10px 15px 10px 5px;
+	line-height: 1.7em
+}
+
+.search-results dd.result-url {
+	font-size: 90%;
+	padding: 2px 15px 15px 5px;
+}
+
+.search-results dd.result-created {
+	padding: 2px 15px 15px 5px
+}
+
+.search-results dd.result-category {
+	padding: 10px 15px 5px 5px
+}
+
+/* Com_search break long titles & text */
+dt.result-title {
+	word-wrap: break-word;
+}
+
+dd.result-text {
+	word-wrap: break-word;
+}
+
+.advanced-search-tip {
+	background: #FEFDE2;
+	border-radius: 3px;
+	padding: 20px;
+	border: solid 1px #ddd
+}
+
+.advanced-search-tip p {
+	margin: 0
+}
+
+.advanced-search-tip .term {
+	font-weight: bold;
+	font-style: italic
+}
+
+.panel {
+	border: solid 1px #ddd;
+	margin-top: -1px;
+}
+
+#main  .panel h3 {
+	margin: 0;
+	padding: 0;
+	background: #eee;
+	border: 0;
+	font-size: 1.0em
+}
+
+.panel h3 a {
+	display: block;
+	text-decoration: none;
+	padding: 6px;
+}
+
+.pane-slider {
+	border: solid 0;
+	padding: 10px;
+	margin: 0;
+}
+
+
+/* +++++++++++++++++++  Contact Form +++++++++++++++++++++++++++++++++ */
+
+
+.panel .contact-form,.panel .contact-miscinfo {
+	padding: 10px
+}
+
+.contact .panel .contact-form form,.contact .panel .contact-address {
+	margin: 20px 0 0 0
+}
+
+textarea,.contact-form input[type="text"],.contact-form input[type="email"],.contact-form textarea
+	{
+	width: 80%;
+	-moz-box-sizing: border-box;
+	border: 1px solid #DDDDDD;
+	color: #333333;
+	overflow: auto;
+	padding: 5px;
+	vertical-align: top;
+}
+
+#jform_contact_email_copy-lbl,#jform_contact_email_copy {
+	float: left;
+	margin-right: 10px;
+	border: 0
+}
+
+#jform_captcha {
+	clear:both;
+	padding-bottom:10px;
+}
+
+label#jform_captcha-lbl {
+	clear: both;
+  	position: relative;
+  	float: left;
+}
+
+.contact-form .button {
+	clear: left;
+	float: left;
+	margin: 20px 0
+}
+
+fieldset.filters {
+	background: none;
+	border: none;
+	padding: 0
+}
+
+.contact-form,.contact-links,.contact-misc,.contact-image,.contact-contactinfo,.contact-address
+	{
+	margin: 20px 0
+}
+
+/* ++++++++++++++ loginmodule +++++++++++++++++++++++++++ */
+
+#form-login-remember {
+	overflow: hidden;
+	margin-bottom: 10px
+}
+
+#form-login-remember label {
+	display: inline;
+	margin-left: 10px
+}
+
+#modlgn-remember {
+	float: left
+}
+
+#login-form fieldset {
+	background: #f5f5f5
+}
+
+#login-form input[type="text"], input[type="password"], input[type="submit"] {
+	width: 100%;
+	box-sizing: border-box
+}
+
+form ul {
+	list-style-type: none;
+	margin: 0;
+	padding: 0
+}
+
+/* +++++++++++++++++++++++ pagenav +++++++++++++++++++++++  */
+.pagenav {
+	text-align: right
+}
+
+.pagenav ul {
+	display: inline-block;
+	*display: inline;
+	/* IE7 inline-block hack */
+	list-style-type: none;
+	margin-left: 0;
+	margin-bottom: 0;
+}
+
+.pagenav li {
+	display: inline;
+	margin: 0;
+	padding: 0
+}
+
+.pagenav a,span.pagenav {
+	padding: 0 14px;
+	margin: 0;
+	text-decoration: none;
+	border: 1px solid #ddd;
+	border-left: 0 solid #ddd;
+	display: inline-block;
+	line-height: 1.9em;
+}
+
+.pagenav li:first-child a,.pagination-start span {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+	border-left: solid 1px #ddd
+}
+
+.pagenav li:last-child a,.pagination-end span {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+
+.pagination ul {
+	margin: 10px 10px 10px 0;
+	padding: 0
+}
+
+.pagination li {
+	display: inline;
+}
+
+.pagination a {
+	padding: 0 14px;
+	line-height: 2em;
+	text-decoration: none;
+	border: 1px solid #ddd;
+	border-left: 0 solid #ddd;
+	display: inline-block
+}
+
+.pagination .active a {
+	cursor: default;
+}
+
+.pagination span,.pagination span  a:hover {
+	cursor: default;
+	padding: 0 14px;
+	line-height: 2em;
+}
+
+.pagination li:first-child a {
+	border-left-width: 1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+
+.pagination li:last-child a {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+
+
+/* +++++++++++++++++ Breadcrumbs  +++++++++++++++++++++++++++  */
+
+.breadcrumbs,.article-info {
+	padding: 7px;
+	margin: 0 0 18px;
+	list-style: none;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.breadcrumbs li {
+	display: inline-block;
+}
+
+/* +++++++++++++++++ articleinfo /actions  +++++++++++++++++++++++++++  */
+
+ul.actions {
+	list-style-type: none;
+	text-align: right
+}
+ul.actions a {padding:0}
+ul.actions  li {
+	display: inline
+}
+
+.article-info-term {
+	display: none
+}
+
+.article-info {
+	overflow: hidden;
+	font-size: 0.9em
+}
+
+.article-info dd {
+	float: left;
+	padding: 0 5px;
+	border-right: solid 1px #ccc
+}
+
+.article-info dd span {
+	text-transform: none;
+	display: inline-block;
+	padding: 0 5px 0 0;
+	margin: 0 10px 0 0;
+}
+
+.article-info dd.create {
+	clear: left
+}
+
+/* ######################  header   ###################### */
+#fontsize {
+	padding: 0;
+	margin: 0 20px 0 1px;
+	text-align: right;
+	margin-bottom: 0;
+	float: none;
+}
+
+#fontsize h3 {
+	padding-right: 0;
+	font-weight: normal;
+	display: inline;
+	font-size: 1em;
+	margin: 0
+}
+
+#fontsize p {
+	margin: 0 0 0 2px;
+	padding: 0;
+	display: inline;
+	font-size: 1em;
+}
+
+#fontsize p a {
+	margin: 0 2px;
+	display: inline;
+	padding: 0 5px;
+}
+
+/* +++++++++++++++  menus ++++++++++++++++++++++++ */
+#header ul.menu {
+	padding: 0;
+	width: auto;
+	text-align: left;
+	display: block;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+	margin: 0 10px
+}
+
+#header ul.menu li {
+	display: inline;
+	padding: 0;
+	margin: 0;
+}
+
+#header ul.menu li a:link,#header ul.menu li a:visited,#header ul.menu li:last-child a
+	{
+	font-weight: bold;
+	text-decoration: none;
+	margin: 0;
+	display: inline-block;
+	padding: 12px 15px;
+	position: relative;
+	border-right: 1px solid #ddd;
+	box-shadow: 1px 0 0 #f5f5f5;
+}
+
+#header ul.menu li:first-child a {
+	border-radius: 4px 0 0 0;
+	margin-left: -1px
+}
+
+.moduletable_menu {
+	border: solid 1px #ddd;
+	background: #f9f9f9;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	padding: 20px;
+	margin-bottom: 20px
+}
+
+ul.menu {
+	margin: 0 0 20px 0;
+	padding: 0;
+}
+
+ul.menu,ul.menu ul {
+	list-style-type: none;
+}
+
+ul.menu a {
+	display: block;
+	margin: 0;
+	text-decoration: none;
+	padding: 5px 0;
+	border-bottom: solid 1px #ddd;
+}
+
+ul.menu li:last-child a {
+	border: 0;
+	box-shadow: none
+}
+
+ul.menu ul {
+	margin: 0;
+	padding: 0
+}
+
+ul.menu ul a {
+	padding-left: 20px
+}
+
+ul.menu ul ul a {
+	padding-left: 30px
+}
+
+ul.menu ul ul ul a {
+	padding-left: 40px
+}
+
+ul.menu ul ul ul ul a {
+	padding-left: 45px
+}
+
+/* ++++++++++++++  content-module ++++++++++++++ */
+.category-module {
+	margin: 0;
+	padding: 0
+}
+
+.category-module li {
+	padding: 5px 0 5px 0;
+	margin: 0;
+	list-style-type: none
+}
+
+.category-module li h4 {
+	margin-bottom: 0
+}
+
+.category-module span {
+	display: block;
+	font-size: 0.85em;
+}
+
+.category-module a span {
+	display: inline
+}
+
+/* content */
+.categories-list  .item-title  a {
+	text-decoration: none;
+	margin-bottom: 20px
+}
+
+.category-desc {
+	margin: 20px 0
+}
+
+.category-desc img {
+	float: left;
+	margin: 0 20px 10px 0
+}
+
+.categories-list dt,.categories-list dd {
+	display: inline
+}
+
+ul.latestnews li {
+	word-wrap: break-word;
+}
+
+/* ++++++++++++++++++++++  Footer +++++++++++++++++++++++++ */
+#footer-outer
+{font-size:0.8em}
+.box {
+	text-align: left
+}
+
+.box ul {
+	list-style-type: none
+}
+
+#bottom .newsfeed-item {
+	padding: 0;
+	margin-bottom: 10px
+}
+
+.box .moduletable_menu,.box .moduletable {
+	margin: 10px
+}
+
+.box3 {
+	padding-left: 10px
+}
+
+.box h3 {
+	font-size: 1.3em
+}
+
+#footer {
+	font-size: 0.8em
+}
+
+/*  ####################   Sliding modules  ################## */
+.moduletable_js,.moduletable {
+	margin-bottom: 20px;
+}
+
+.js_heading,.js_heading {
+	position: relative;
+	display: block;
+	padding: 5px 10px;
+	margin: 0;
+	font-size: 1.40em;
+	border-radius: 3px
+}
+
+h3.js_heading a {
+	display: block;
+	position: absolute;
+	right: 0;
+	top: 0;
+	padding: 5px 5px 0 0;
+	text-decoration: none;
+	background: none
+}
+
+.module_content {
+	padding: 10px;
+	border: solid 1px #ddd;
+	border-top: 0;
+	border-radius: 0 0 3px 3px;
+	margin-top: -1px
+}
+
+.no {
+	font-size: 1px;
+}
+
+.slide {
+	height: auto !important;
+}
+
+/*  +++++++++++++++++++++++++++++   Module Tabs / Pagebreak Tabs / Contact Tabs ++++++++++++++++ */
+ul.tabs {
+	margin: 0;
+	padding: 0;
+	overflow: hidden
+}
+
+dl.tabs dt,dl.tabs dd {
+	margin: 0;
+	padding: 7px 5px;
+}
+
+dl.tabs dt h3 {
+	font-size: 1em;
+	margin: 0;
+	padding: 0
+}
+
+dl.tabs dt {
+	position: relative;
+	z-index: 1
+}
+
+ul.tabs li,dl.tabs dt {
+	list-style-type: none;
+	float: left;
+	width: auto;
+	padding: 0;
+	display: block;
+	margin: 0 3px 0 0;
+	font-size: 1em;
+}
+
+ul.tabs li a:link,ul.tabs li a:visited,dl.tabs dt h3 a:link,dl.tabs dt h3 a:visited
+	{
+	text-decoration: none;
+	padding: 7px 5px;
+	margin: 0;
+	display: block;
+	font-size: 0.9em;
+	font-weight: normal;
+	border-radius: 5px 5px 0 0;
+}
+
+ul.tabs li a.linkopen:link,ul.tabs li a.linkopen:visited,dl.tabs dt.open  h3 a:link,dl.tabs dt.open  h3 a:visited
+	{
+	font-weight: bold;
+}
+
+.tabcontent,div.current {
+	padding: 30px 20px;
+	margin: -1px 0 0 0;
+	border-radius: 0 3px 3px 3px;
+	clear: left;
+}
+
+div.current {
+	position: relative;
+	z-index: 0;
+	top: -1px
+}
+
+.tabcontent:focus {
+	outline: none
+}
+
+.tabopen {
+	display: block;
+	margin-bottom: 20px;
+	overflow: hidden
+}
+
+.tabclosed {
+	display: none
+}
+
+.tabcontent ul {
+	padding: 0
+}
+
+.tabcontent ul li {
+	list-style-type: none
+}
+
+/* ++++++++++++++  image float style ++++++++++++++ */
+.img-fulltext-left {
+	float:left;
+	margin-right: 20px;
+	margin-bottom: 20px;
+}
+
+.img-intro-left {
+	float: left;
+	margin-right: 10px;
+	margin-bottom: 10px;
+}
+
+.img-fulltext-right {
+	float: right;
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+
+.img-intro-right {
+	float: right;
+	margin-left: 10px;
+	margin-bottom: 10px;
+}
+
+.img-fulltext-none
+{display:block;
+	margin:10px 0
+}
+
+/* Correction for user profile date of birth calendar image */
+#jform_profile_dob_img {
+	background: url("../images/system/calendar.png") no-repeat scroll 0 0 transparent;
+	cursor: pointer;
+	height: 18px;
+	margin: 0 3px;
+	vertical-align: middle;
+	width: 18px;
+}
+/* Smartsearch Calendar*/
+#filter_date1_img,
+#filter_date2_img {
+	background: rgba(0, 0, 0, 0) url("../images/system/calendar.png") no-repeat scroll 0 0;
+	cursor: pointer;
+	height: 18px;
+	margin-left: 3px;
+	vertical-align: middle;
+	width: 18px;
+}
+#search-results {
+	clear: both;
+}
+#finder-filter-window {
+	overflow: visible;
+}
+#searchForm .searchintro {
+	padding: 0 0 0 250px;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+#finder-search .in.collapse {
+	overflow: visible;
+}
diff --git a/core/templates/beez3/css/nature.css b/core/templates/beez3/css/nature.css
new file mode 100644
index 00000000..5d0ec1b0
--- /dev/null
+++ b/core/templates/beez3/css/nature.css
@@ -0,0 +1,468 @@
+/*
+ * @author ( Angie Radtke )
+*/
+
+
+/* ##########################  general  ########################### */
+
+body
+{
+	font-family: arial, helvetica, sans-serif;
+	background:#fff;
+	color:#444
+}
+
+h3 {
+	color: #555
+}
+
+h2 a {
+	text-decoration: none
+}
+
+h2, .moduletable h3 {
+	border-bottom: solid 1px #ddd;
+}
+
+.items-row h2
+{border-top: solid 1px #ddd;
+}
+
+a:link,
+a:visited
+{
+	color:#0A5E69
+}
+
+a:hover,
+a:active,
+a:focus
+{
+	background:#0A5E69;
+	color:#FFF;
+}
+
+/* ##########################  logo  ########################### */
+
+.logoheader
+{
+	border-top:solid 1px transparent;
+	color:#fff;
+	max-width: 1050px;
+	margin:37px auto;
+	min-height:20px;
+	margin-bottom:0;
+
+}
+.logoheader h1#logo
+{padding:20px 10px 0px 10px; }
+.logoheader h1#logo  span.header1 {padding:0}
+
+/* ##########################  header  ########################### */
+
+#all {padding-top:13em}
+#line { position:relative; max-width:1050px; margin:0 auto; text-align:right; right:0;  top:0em}
+#header
+{
+	background: #004746; /* Old browsers */
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#185359", endColorstr="#007774");
+	background: -moz-linear-gradient(top,  #004746 0%, #0a5e69 25%, #185359 18%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#004746), color-stop(25%,#0a5e69), color-stop(18%,#185359)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top,  #004746 0%,#0a5e69 25%,#185359 18%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top,  #004746 0%,#0a5e69 25%,#185359 18%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top,  #004746 0%,#0a5e69 25%,#185359 18%); /* IE10+ */
+	background: linear-gradient(top,  #004746 0%,#0a5e69 25%,#185359 18%); /* W3C */
+	position:absolute;
+	left:0;
+	top:0;
+	width:99.9%;
+	padding:0;
+}
+/* green background */
+.button:hover, button:hover, p.readmore a:hover,
+.pagenav a:hover, .pagenav a:active,  .pagenav a:focus,  #advanced-search-toggle:hover,  #advanced-search-toggle:active,  #advanced-search-toggle:focus,
+.profile-edit a:hover, .profile-edit a:active, .profile-edit a:focus,
+#fontsize a:hover,  #fontsize a:active,  #fontsize a:focus,#mobile_select h2 a
+	{
+
+	color: #fff;
+	background: #008885; /* Old browsers */
+
+
+	background-color: hsl(165, 27%, 27%) ;
+	 background-repeat: repeat-x;
+	  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#008885", endColorstr="#004746");
+	   background-image: -khtml-gradient(linear, left top, left bottom, from(#008885), to(#004746));
+	   background-image: -moz-linear-gradient(top, #008885, #004746);
+background-image: -ms-linear-gradient(top, #008885, #004746);
+background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #008885), color-stop(100%, #004746));
+background-image: -webkit-linear-gradient(top, #008885, #004746);
+background-image: -o-linear-gradient(top, #008885, #004746);
+background-image: linear-gradient(#008885, #004746);
+border-color: #004746 #004746 hsl(165, 27%, 22.5%);
+text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.29);
+-webkit-font-smoothing: antialiased;
+}
+
+/* ++++++++++++++ header  menu ++++++++++++++ */
+
+#header ul.menu
+{
+
+	border:0;
+	list-style-type:none;
+	border-radius:0;
+	overflow:hidden;
+	margin:0 auto ;
+	text-align:right;
+	position:absolute;
+	top:0;
+	right:10px;
+}
+
+#header ul.menu li
+{
+	border:0;
+
+}
+#header ul.menu a {
+	box-shadow:none;
+	border-bottom:0
+	}
+#header ul.menu li a:link,
+#header ul.menu li a:visited
+{
+	color:#fff;
+	border:0;
+	border-right:solid 1px #237D85;
+	box-shadow: none;
+	background:transparent;
+	padding:10px ;
+	display:inline-block
+}
+#header ul.menu li:first-child a {border-radius:0}
+#header ul.menu li a:hover,
+#header ul.menu li a:active,
+#header ul.menu li a:focus
+{
+	color:#333;
+	background:#bddfb3;
+	padding:10px
+}
+
+#header ul li.active a:link,
+#header ul li.active a:visited
+{
+	color:#333;
+	border-right:solid 1px #237D85;
+	background:#bddfb3;
+	padding: 10px  ;
+
+}
+
+#fontsize a , #fontsize h3 {color:#fff}
+/*  grey background */
+.button, button , p.readmore a ,
+ .pagenav a:link, .pagenav a:visited, #advanced-search-toggle , .profile-edit a:link,.profile-edit a:visited,  h3.js_heading
+ {
+	background-color: #F5F5F5;
+	background-image: -moz-linear-gradient(center top, #FFFFFF, #E6E6E6);
+	background-repeat: repeat-x;
+	border:solid 1px #ccc;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px
+		rgba(0, 0, 0, 0.05);
+	color: #004746;
+}
+
+
+/* ++++++++++++++++++++++  navigation  ++++++++++++++++++++++++++  */
+
+.moduletable_menu {
+	border: solid 1px #ddd;
+	background: #f9f9f9;
+
+}
+#header ul.menu {
+	border-color: #D5D5D5;
+}
+
+ul.menu a:hover,
+ul.menu a:active,
+ul.menu a:focus {
+	background-color: #F5F5F5;
+	background-image: -moz-linear-gradient(center top, #FFFFFF, #E6E6E6);
+	background-repeat: repeat-x;
+	background: url(../images/arrow.png) no-repeat right center;
+	color: #004746;
+
+}
+
+
+/* ++++++++++++++++   highlightning active menuitem  +++++++++++++++++++ */
+
+ul.menu li.active a,ul.menu  li.active ul li.active a,
+ul.menu  li.active ul li.active  ul li.active a,
+ul.menu  li.active ul li.active  ul li.active ul li.active  a ,
+ul.menu  li.active ul li.active  ul li.active ul li.active ul li.active a
+{font-weight:bold; }
+ul.menu  li.active ul li a,
+ul.menu  li.active ul li.active  ul li a,
+ul.menu  li.active ul li.active  ul li.active ul li  a,
+ul.menu  li.active ul li.active  ul li.active ul li.active ul li a
+{font-weight:normal}
+
+ul.menu a
+{
+	box-shadow:0 1px 0 #fff;
+	border-bottom:solid 1px #ddd;
+
+}
+
+ul.menu ul a {
+	background: #e5e5e5;
+	margin-bottom:1px
+}
+
+ul.menu ul ul ul a {
+	background: #f5f5f5 url(../images/arrow.png) no-repeat 24px center;
+
+}
+
+ul.menu ul ul ul ul a {
+	background: #fff;
+}
+
+/* +++++++++++++++++  content  +++++++++++++++ */
+
+
+.article-info {
+	background-color: #fbfbfb;
+	background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff),
+		to(#f5f5f5) );
+	background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: linear-gradient(top, #ffffff, #f5f5f5);
+	background-repeat: repeat-x;
+	filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr =
+		'#ffffff', endColorstr = '#f5f5f5', GradientType = 0 );
+	border: 1px solid #ddd;
+	-webkit-box-shadow: inset 0 1px 0 #ffffff;
+	-moz-box-shadow: inset 0 1px 0 #ffffff;
+	box-shadow: inset 0 1px 0 #ffffff;
+}
+
+ul.menu a:link,ul.menu a:visited {
+	color: #444;
+}
+
+
+#footer-inner, #footer , #footer-outer {
+	background: #f5f5f5;
+}
+#footer-sub {background:#555;}
+#footer {background:#555; max-width:1025px; margin:0 auto; }
+#footer a {color:#fff}
+
+.box1
+{border-right:solid 1px #ccc}
+.box3
+{border-left:solid 1px #ccc}
+#bottom  ul li a
+{background-image:none;
+padding-left:0}
+
+/* +++++++++++++++++++++++  SLIDER  ++++++++++++++++++++  */
+
+.panel h3.pane-toggler a
+{
+	background: url(../images/slider_plus.png) right  top no-repeat;
+	color:#333
+}
+.panel h3.pane-toggler-down a
+{
+	background: url(../images/slider_minus.png) right  top no-repeat;
+	border-bottom:solid 1px #ddd;
+	color:#333
+}
+
+/*  +++++++++++++++++   Tabs ++++++++++++++++++++++  */
+
+ul.tabs li,
+dl.tabs dt h3 a:link,
+dl.tabs dt h3 a:visited
+{
+	background:#f5f5f5 url(../images/nature/box.png) repeat-x;
+
+}
+ul.tabs li a:link,
+ul.tabs li a:visited,
+dl.tabs dt a
+{
+	color:#333;
+	border:solid 1px #ddd; border-bottom:0
+}
+
+ul.tabs li a:hover,
+ul.tabs li a:active,
+ul.tabs li a:focus
+{
+	color:#000
+}
+
+.tabcontent, div.current
+{
+	background:#fff;
+	color:#000;
+	border:solid 1px #ddd;
+}
+
+.tabcontent .linkclosed
+{
+	color:#000;
+	border-bottom:solid 1px #e5e5e5;
+}
+
+ul.tabs li a.linkopen,
+dl.tabs dt.open  h3 a:link,
+dl.tabs dt.open  h3 a:visited
+{
+	background:#fff;
+	color:#333;
+	border-radius: 5px 5px 0px 0px;
+}
+
+ul.tabs li a.linkclosed:hover,
+ul.tabs li a.linkclosed:active,
+ul.tabs li a.linkclosed:focus,
+ul.tabs li a.linkopen:hover,
+ul.tabs li a.linkopen:active,
+ul.tabs li a.linkopen:focus
+{
+	background:#555;
+	color:#fff
+}
+
+
+/* +++++++++++++++++  Pagination +++++++++++++++ */
+
+.pagination span,
+.pagination span  a:hover {
+	color: #999999;
+	background-color: #f5f5f5;
+}
+
+/* active item */
+span.pagenav
+{
+background:#0A5E69;
+color:#fff
+}
+
+.pagination-start span.pagenav,
+.pagination-prev  span.pagenav,
+.pagination-end span.pagenav,
+.pagination-next span.pagenav
+
+{
+background-color:#f5f5f5;
+color:#444
+}
+
+/* +++++++++++++  table display  Catgegories table, contact etc, ++++++++++++++++++++* */
+
+table {border:solid 1px #ddd}
+table th
+ {
+	background-color: #0A5E69;;
+	color: #fff;
+}
+table th a:link,
+table th a:visited
+{color:#fff}
+tr.odd, tr.cat-list-row1 {background:#f8f8f8}
+table  tr:hover td,
+table tr:hover th {
+  background-color: #FEFDE2;
+}
+
+/* responsive */
+#mobile_select h2 {border:0; margin:-17px 0 0 0; padding:0; background:#004746;text-align:right}
+#mobile_select h2 a {
+display:inline-block;
+font-size:0.8em;
+border-radius:4px 4px 0 0;
+padding:6px;
+font-size:0.75em;
+margin-right:5px;
+}
+
+@media only screen and (max-width: 480px) {
+
+	  img {
+  max-width: 100%;
+  height: auto;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+	#fontsize{display:none}
+	#nav,#wrapper2,#wrapper,.cols-3 .column-1,.cols-3 .column-2,.cols-3 .column-3,#right,.box,#header form
+		{
+		float: none;
+		width: 100%
+	}
+	#header {padding-top:3em; position:relative; margin:0; max-height:auto !important; }
+	#header form  {margin:0}
+	#all {padding-top:0}
+	.logoheader {background:#004746 ; min-height:100px;margin:0 }
+	.box {
+		border-left: 0 !important;
+		border-bottom: solid 1px #ddd;
+	}
+	#line {
+		text-align: center;
+		top: 0;
+		right: auto;
+		max-width: 100% ;
+		min-width:100%;
+		margin: 0 0px;
+		background:#0A5E69;
+		position:absolute
+	}
+	#header form input {
+		float: none; margin-bottom:4px
+	}
+	#menuwrapper { margin-top:10px; background:#fff; padding:10px; width:97%}
+	#header ul.menu {position:relative; top:0;left:20px; right:20px; margin:0; width:90%; border-radius:4px; text-align:left; border:0}
+	#header ul.menu li:first-child a {border-radius: 4px 4px 0 0}
+	#header ul.menu li:last-child a {border-radius:0 0 4px 4px }
+	#header ul.menu li a:link,
+	#header ul.menu li a:visited {
+		display: block;
+		padding: 6px 10px;
+		border-right:0;
+		border-bottom: solid 1px #ccc;
+		background:#eee;
+		color:#444
+	}
+}
+
+@media only screen and (min-width: 600px) {
+}
+
+@media only screen and (min-width: 768px) {
+}
+
+@media only screen and (min-width: 992px) {
+}
+
+@media only screen and (min-width: 1382px) { /* Styles */
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) , only screen and
+		(min--moz-device-pixel-ratio: 1.5) , only screen and
+	(min-device-pixel-ratio: 1.5) { /* Styles */
+}
diff --git a/core/templates/beez3/css/nature_rtl.css b/core/templates/beez3/css/nature_rtl.css
new file mode 100644
index 00000000..f1f8f82f
--- /dev/null
+++ b/core/templates/beez3/css/nature_rtl.css
@@ -0,0 +1,11 @@
+h1#logo {
+	padding: 0.6em 20px 10px 10px;
+}
+
+#header ul.menu {
+	left: 0;
+	right: auto;
+}
+#logo span {
+    padding-right: 2px;
+}
diff --git a/core/templates/beez3/css/personal.css b/core/templates/beez3/css/personal.css
new file mode 100644
index 00000000..59e63dd3
--- /dev/null
+++ b/core/templates/beez3/css/personal.css
@@ -0,0 +1,460 @@
+body {
+	background: #eee
+}
+
+h3 {
+	color: #555
+}
+
+h2 a {
+	text-decoration: none
+}
+
+h2,.moduletable h3, .items-leading h2 {
+	border-bottom: solid 1px #ddd;
+}
+
+.items-row h2 {
+	border-top: solid 1px #ddd;
+	border-bottom: solid 1px #ddd;
+}
+
+a:link,a:visited {
+	color: #095197
+}
+
+a:hover,a:active,a:focus {
+	background: #095197;
+	color: #FFF;
+}
+
+.logoheader {
+	background: url(../images/personal/personal2.png) no-repeat right
+		bottom #0C1A3E;
+	color: #FFFFFF;
+	min-height: 250px;
+}
+
+#all {
+	background: #FFFFFF;
+	color: #444;
+}
+
+#shadow #all {
+	box-shadow: 0px 20px 10px #555555
+}
+
+#header ul.menu {
+  background-color:#ddd;
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#eeeeee", endColorstr="#dddddd");
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
+  background-image: -moz-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -ms-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));
+  background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -o-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: linear-gradient(#eeeeee, #dddddd);
+  border-color: #b2b2b2 #b2b2b2 hsl(114, 0%, 62.5%);
+
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.49);
+  -webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px
+		rgba(0, 0, 0, 0.05);
+	color: #095197;
+	border: solid 1px #ddd;
+	border: 1px solid #e5e5e5;
+	text-transform: uppercase;
+}
+
+#header ul.menu a:link,#header ul.menu a:visited {
+	color: #333;
+	display: inline-block;
+	font-weight: bold;
+	text-decoration: none;
+	padding: 0px 10px;
+	margin: 0;
+	display: inline-block;
+	margin: 0 0 0;
+	padding: 12px 15px;
+	position: relative;
+	border-right: 1px solid #ddd;
+	box-shadow: 1px 0px 0px #f5f5f5;
+}
+
+/*  grey background */
+.button,button,p.readmore a,#header input.button,.pagenav a:link,.pagenav a:visited,#advanced-search-toggle,.profile-edit a:link,.profile-edit a:visited,h3.js_heading
+	{
+  background-color:#ddd;
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#ffffff", endColorstr="#dddddd");
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#dddddd));
+  background-image: -moz-linear-gradient(top, #ffffff, #dddddd);
+  background-image: -ms-linear-gradient(top, #ffffff, #dddddd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #dddddd));
+  background-image: -webkit-linear-gradient(top, #ffffff, #dddddd);
+  background-image: -o-linear-gradient(top, #ffffff, #dddddd);
+  background-image: linear-gradient(#ffffff, #dddddd);
+  border-color: #b2b2b2 #b2b2b2 hsl(114, 0%, 62.5%);
+
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.49);
+  -webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px
+		rgba(0, 0, 0, 0.05);
+	color: #095197;
+	border: solid 1px #ddd
+}
+
+/* +++++++++++++  table display  Catgegories table, contact etc, ++++++++++++++++++++* */
+table {
+	border: solid 1px #ddd
+}
+
+table th {
+	background-color: #0074cc;
+	color: #fff;
+	background-image: -moz-linear-gradient(top, #095197, #1B6BA5);
+	background-image: -ms-linear-gradient(top, #095197, #1B6BA5);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#095197),
+		to(#1B6BA5) );
+	background-image: -webkit-linear-gradient(top, #095197, #1B6BA5);
+	background-image: -o-linear-gradient(top, #095197, #1B6BA5);
+	background-image: linear-gradient(top, #095197, #1B6BA5);
+	background-repeat: repeat-x;
+	filter: progid :   DXImageTransform.Microsoft.gradient (   startColorstr
+		=
+		 '#095197', endColorstr =   '#1B6BA5', GradientType =   0 );
+	border-color: #0055cc #0055cc #003580;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	filter: progid :   dximagetransform.microsoft.gradient (   enabled =
+		false );
+}
+
+table th a:link,table th a:visited {
+	color: #fff
+}
+
+tr.odd,tr.cat-list-row1 {
+	background: #f8f8f8
+}
+
+table  tr:hover td {
+	background: #FEFDE2;
+}
+
+/* blue background */
+.button:hover,
+.button:active,
+.button:focus,
+button:hover,
+p.readmore a:hover,
+#header ul.menu a:hover,
+#header ul.menu a:active,
+#header ul.menu a:focus,
+.pagenav a:hover,
+.pagenav a:active,
+.pagenav a:focus,
+#advanced-search-toggle:hover,
+#advanced-search-toggle:active,
+#advanced-search-toggle:focus,
+.profile-edit a:hover,
+.profile-edit a:active,
+.profile-edit a:focus,
+#fontsize a:hover,#fontsize a:active,#fontsize a:focus,
+#mobile_select h2 a
+	{
+	background-color: #000000;
+	color: #fff;
+
+  background-color:#095197;
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#0087d1", endColorstr="#095197");
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#0087d1), to(#095197));
+  background-image: -moz-linear-gradient(top, #0087d1, #095197);
+  background-image: -ms-linear-gradient(top, #0087d1, #095197);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0087d1), color-stop(100%, #095197));
+  background-image: -webkit-linear-gradient(top, #0087d1, #095197);
+  background-image: -o-linear-gradient(top, #0087d1, #095197);
+  background-image: linear-gradient(#0087d1, #095197);
+  border-color: #00456b #095197 hsl(201, 100%, 16%);
+  color: #fff ;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.33);
+  -webkit-font-smoothing: antialiased;
+
+
+
+}
+
+/* +++++++++++++++++  Pagination +++++++++++++++ */
+.pagination span,.pagination span  a:hover {
+	color: #999999;
+	background-color: #f5f5f5;
+}
+
+/* active item */
+span.pagenav {
+	background: #095197;
+	color: #fff
+}
+
+.pagination-start span.pagenav,.pagination-prev  span.pagenav,.pagination-end span.pagenav,.pagination-next span.pagenav
+	{
+	background-color: #f5f5f5;
+	color: #444
+}
+
+/* +++++++++++++++++  content  +++++++++++++++ */
+.article-info {
+	background-color: #fbfbfb;
+	background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff),
+		to(#f5f5f5) );
+	background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+	background-image: linear-gradient(top, #ffffff, #f5f5f5);
+	background-repeat: repeat-x;
+	filter: progid :   DXImageTransform.Microsoft.gradient (   startColorstr
+		=
+		 '#ffffff', endColorstr =   '#f5f5f5', GradientType =   0 );
+	border: 1px solid #ddd;
+	-webkit-box-shadow: inset 0 1px 0 #ffffff;
+	-moz-box-shadow: inset 0 1px 0 #ffffff;
+	box-shadow: inset 0 1px 0 #ffffff;
+}
+
+ul.menu a:link,ul.menu a:visited {
+	color: #444;
+}
+
+/* ++++++++++++++++++++++  menu ++++++++++++++++++++++++++  */
+.moduletable_menu {
+	border: solid 1px #ddd;
+	background: #f9f9f9;
+}
+
+#header ul.menu {
+	border: solid 1px #D5D5D5;
+	box-shadow: 0 1px 0 #FFFFFF inset, 0 1px 5px rgba(0, 0, 0, 0.1);
+}
+
+#header ul.menu a {
+	box-shadow: none;
+	border-bottom: 0
+}
+
+ul.menu a:hover,ul.menu a:active,ul.menu a:focus {
+	background-color: #F5F5F5;
+	background-image: -moz-linear-gradient(center top, #FFFFFF, #E6E6E6);
+	background-repeat: repeat-x;
+	background: url(../images/arrow.png) no-repeat right center;
+	color: #095197
+}
+
+/* ++++++++++++++++   highlightning active menuitem  +++++++++++++++++++ */
+ul.menu li.active a,ul.menu  li.active ul li.active a,ul.menu  li.active ul li.active  ul li.active a,ul.menu  li.active ul li.active  ul li.active ul li.active  a,ul.menu  li.active ul li.active  ul li.active ul li.active ul li.active a
+	{
+	font-weight: bold;
+}
+
+ul.menu  li.active ul li a,ul.menu  li.active ul li.active  ul li a,ul.menu  li.active ul li.active  ul li.active ul li  a,ul.menu  li.active ul li.active  ul li.active ul li.active ul li a
+	{
+	font-weight: normal
+}
+
+ul.menu a {
+	box-shadow: 0 1px 0 #fff;
+	border-bottom: solid 1px #ddd;
+	text-shadow: 0 1px 0 #fff
+}
+
+ul.menu ul a {
+	background: #e5e5e5;
+	margin-bottom: 1px
+}
+
+ul.menu ul ul ul a {
+	background: #f5f5f5 url(../images/arrow.png) no-repeat 24px center;
+}
+
+ul.menu ul ul ul ul a {
+	background: #fff;
+}
+
+/* +++++++++++++++++++++++  SLIDER  ++++++++++++++++++++  */
+.panel h3.pane-toggler a {
+	background: url(../images/slider_plus.png) right top no-repeat;
+	color: #333
+}
+
+.panel h3.pane-toggler-down a {
+	background: url(../images/slider_minus.png) right top no-repeat;
+	border-bottom: solid 1px #ddd;
+	color: #333
+}
+
+/*  +++++++++++++++++   Tabs ++++++++++++++++++++++  */
+ul.tabs li,dl.tabs dt h3 a:link,dl.tabs dt h3 a:visited {
+	background: #f5f5f5 url(../images/nature/box.png) repeat-x;
+}
+
+ul.tabs li a:link,ul.tabs li a:visited,dl.tabs dt a {
+	color: #333;
+	border: solid 1px #ddd;
+	border-bottom: 0
+}
+
+ul.tabs li a:hover,ul.tabs li a:active,ul.tabs li a:focus {
+	color: #000
+}
+
+.tabcontent,div.current {
+	background: #fff;
+	color: #000;
+	border: solid 1px #ddd;
+}
+
+.tabcontent .linkclosed {
+	color: #000;
+	border-bottom: solid 1px #e5e5e5;
+}
+
+ul.tabs li a.linkopen,dl.tabs dt.open  h3 a:link,dl.tabs dt.open  h3 a:visited
+	{
+	background: #fff;
+	color: #333;
+	border-radius: 5px 5px 0px 0px;
+}
+
+ul.tabs li a.linkclosed:hover,ul.tabs li a.linkclosed:active,ul.tabs li a.linkclosed:focus,ul.tabs li a.linkopen:hover,ul.tabs li a.linkopen:active,ul.tabs li a.linkopen:focus
+	{
+	background: #555;
+	color: #fff
+}
+
+#footer-inner,#footer {
+	background: #f5f5f5;
+	box-shadow: 0px 20px 10px #555
+}
+
+#footer {
+	background: #555;
+	max-width: 1025px;
+	margin: 0 auto;
+	box-shadow: 0px 0px 10px #555555;
+	color: #fff
+}
+
+#footer a {
+	color: #fff;
+	background: none
+}
+
+#bottom a {
+	background: none
+}
+
+.box1 {
+	border-right: solid 1px #ccc
+}
+
+.box3 {
+	border-left: solid 1px #ccc
+}
+
+#bottom  ul li a {
+	background-image: none;
+	padding-left: 0
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* responsive */
+#mobile_select h2 {border:0; margin:-17px 0 0 0; padding:0; background:#0C1D43;text-align:right}
+#mobile_select h2 a {
+display:inline-block;
+font-size:0.8em;
+border-radius:4px 4px 0 0;
+padding:6px;
+font-size:0.75em;
+margin-right:5px;
+}
+
+
+
+@media only screen and (max-width: 480px) {
+
+	img {
+  max-width: 100%;
+  height: auto;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+
+	#fontsize{display:none}
+	#nav,#wrapper2,#wrapper,.cols-3 .column-1,.cols-3 .column-2,.cols-3 .column-3,#right,.box,#header form
+		{
+		float: none;
+		width: 100%
+	}
+	#header {padding-top:3em}
+	#header form  {margin:0}
+	.logoheader {background:#0C1D43; min-height:100px; margin:0}
+	.box {
+		border-left: 0 !important;
+		border-bottom: solid 1px #ddd;
+	}
+	#line {
+		text-align: center;
+		top: 0;
+		right: auto;
+		max-width: 100% ;
+		min-width:100%;
+
+		margin: 0 0px; background:#095197;
+	}
+	#header form input {
+		float: none; margin-bottom:4px
+	}
+	#menuwrapper { margin-top:10px; }
+	#header ul.menu {position:relative; top:0;left:20px; right:20px; margin:0; width:90%; border-radius:4px}
+	#header ul.menu li:first-child a {border-radius: 4px 4px 0 0}
+	#header ul.menu li:last-child a {border-radius:0 0 4px 4px }
+	#header ul.menu li a:link,
+	#header ul.menu li a:visited {
+		display: block;
+		padding: 6px 10px;
+		border-bottom: solid 1px #ccc
+	}
+}
+
+@media only screen and (min-width: 600px) {
+}
+
+@media only screen and (min-width: 768px) {
+}
+
+@media only screen and (min-width: 992px) {
+}
+
+@media only screen and (min-width: 1382px) { /* Styles */
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) , only screen and
+		(min--moz-device-pixel-ratio: 1.5) , only screen and
+	(min-device-pixel-ratio: 1.5) { /* Styles */
+}
diff --git a/core/templates/beez3/css/personal_rtl.css b/core/templates/beez3/css/personal_rtl.css
new file mode 100644
index 00000000..7af5a6c0
--- /dev/null
+++ b/core/templates/beez3/css/personal_rtl.css
@@ -0,0 +1,4 @@
+h1#logo {
+	margin-right: 90px;
+}
+
diff --git a/core/templates/beez3/css/position.css b/core/templates/beez3/css/position.css
new file mode 100644
index 00000000..1a675dbe
--- /dev/null
+++ b/core/templates/beez3/css/position.css
@@ -0,0 +1,495 @@
+/**
+
+ * @author ( Angie Radtke )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+ */
+
+html,
+body,
+body div,
+span,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+abbr,
+address,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+samp,
+small,
+strong,
+sub,
+sup,
+var,
+b,
+i,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section,
+time,
+mark,
+audio,
+video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+    vertical-align: baseline;
+    background: transparent;
+}
+
+article,
+aside,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+    display: block;
+}
+
+html {
+    background: #ffffff;
+    font-size: 100.01%;
+    -webkit-overflow-scrolling: touch;
+    -webkit-tap-highlight-color: #f3f5f6;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+}
+
+body {
+
+    position: relative;
+    width: 100%;
+    line-height: 1.5em;
+    background: #eee
+}
+
+/* ###################### general ###################### */
+#all {
+    margin: 0 auto;
+    max-width: 1050px;
+    padding: 0;
+    text-align: left;
+    font-size: 0.8em
+}
+
+#header {
+    display: block !important;
+    position: relative;
+    padding: 8em 0 0 0;
+    overflow: hidden;
+}
+
+#header ul {
+    position: absolute;
+    left: 0;
+    top: 5em;
+    right: 0;
+    display: block;
+    margin: 0 0 1px 0;
+    text-align: right;
+    list-style-type: none;
+    padding: 10px 0
+}
+
+#back {
+    margin: 0;
+    padding: 0;
+}
+
+#contentarea,
+#contentarea2 {
+    position: relative;
+    overflow: hidden;
+    padding: 0 20px !important;
+    margin: 0;
+
+}
+
+#wrapper {
+    width: 53%;
+    float: left;
+    position: relative;
+
+}
+
+#wrapper2 {
+    width: 72%;
+    float: left;
+    position: relative;
+    padding-bottom: 20px;
+
+}
+
+#wrapper2 .item-page {
+    max-width: 660px
+}
+
+#main {
+    padding-top: 10px;
+    padding-bottom: 20px;
+    position: relative;
+
+}
+
+#right {
+    float: left;
+    width: 20%;
+    margin: 10px 0 10px 2%;
+    padding: 0 0 5px 0;
+    position: relative;
+}
+
+.unseen,
+.hidelabeltxt,
+#line label {
+    display: inline;
+    height: 0;
+    left: -3000px;
+    position: absolute;
+    top: -2000px;
+    width: 0;
+}
+
+/* ++++++++++++++  nav after content  ++++++++++++++ */
+.left {
+    padding-top: 0;
+    float: right;
+    margin: 10px 0 10px 0;
+    width: 22%;
+    position: relative;
+
+}
+
+/* ++++++++++++++  nav before content  ++++++++++++++ */
+.left1 {
+    padding: 0;
+    float: left;
+    margin: 10px 3% 10px 0;
+    width: 21%;
+    position: relative
+}
+
+.leftbigger {
+    width: 25%
+}
+
+/* ###################### header ###################### */
+
+.skiplinks,
+.skiplinks li {
+    display: inline;
+    height: 0;
+    line-height: 0;
+    padding: 0 !important;
+}
+
+.skiplinks li a.u2 {
+    display: inline;
+    height: 0;
+    left: -3000px;
+    position: absolute;
+    top: -2000px;
+    width: 0;
+
+}
+
+.skiplinks li a.u2:active,
+.skiplinks li a.u2:focus {
+    position: absolute;
+    width: 13em;
+    top: -4em;
+    left: 10px;
+    line-height: 1.5em;
+    padding: 5px;
+    font-weight: bold;
+    height: 3em;
+
+}
+
+.wrap {
+    border: 0;
+    clear: both;
+    float: none;
+    font-size: 1px;
+    height: 0;
+    line-height: 1px;
+    margin: 0;
+    padding: 0;
+    visibility: hidden;
+}
+
+#logo {
+    margin-top: 0;
+    margin-left: 10px;
+    display: block;
+    padding: 1em 20px 20px 10px;
+    width: 425px;
+    font-weight: normal;
+    line-height: 1em;
+
+}
+
+#logo img {
+    display: block;
+}
+
+#logo span {
+    padding-left: 2px
+}
+
+#logo span.header1 {
+    display: block;
+    top: 0;
+    line-height: 0.8em;
+    font-size: 0.7em;
+    padding-left: 55px
+}
+
+.logoheader {
+    margin: -2px 10px 0;
+    padding: 0;
+    text-align: left;
+    font-weight: normal;
+    line-height: 1.5em;
+}
+.header1 {
+	font-size: 1.5em;
+	margin-left: 10px;
+}
+
+#line {
+    padding: 5px 0 2px 2px;
+    position: absolute;
+    right: 10px;
+    top: 0.5em;
+    max-width: 40em;
+    text-align: right;
+    min-width: 40em
+
+}
+
+#fontsize,
+#line .search {
+    display: inline;
+    margin: 0;
+}
+
+/* ++++++++++++++  button for closing right column  ++++++++++++++ */
+
+#close {
+    margin-right: 0;
+    text-transform: uppercase;
+}
+
+#close span {
+    position: absolute;
+    right: 20px;
+    z-index: 10000;
+    top: 5px;
+    font-weight: bold;
+    text-align: right;
+    line-height: 1.5em;
+    margin-top:20px;
+    padding: 5px
+}
+
+#close > a {
+    display: block;
+    overflow: hidden
+}
+
+#close > a:hover span {
+    background: #095197
+}
+
+/* ###################### main ###################### */
+
+/* ++++++++++++++  position  ++++++++++++++ */
+
+.blog-featured {
+    padding: 0;
+}
+
+.items-leading {
+    padding: 0 5px 10px 5px;
+    overflow: hidden;
+    margin-bottom: 10px
+}
+
+.row-separator {
+    display: block;
+    clear: both;
+    margin: 0;
+    border: 0;
+    height: 1px
+}
+
+.item-separator {
+    display: none;
+    margin: 0;
+}
+
+.shownocolumns {
+    width: 98% !important;
+}
+
+#top {
+    margin: 0 0 20px 0;
+    overflow: hidden
+}
+
+/* ++++++++++++++  blog  ++++++++++++++ */
+
+.cols-1 {
+    display: block;
+    float: none !important;
+    margin: 0 !important;
+}
+
+.cols-2 .column-1 {
+    width: 46%;
+    float: left;
+}
+
+.cols-2 .column-2 {
+    width: 46%;
+    float: right;
+    margin: 0
+}
+
+.cols-3 .column-1 {
+    float: left;
+    width: 29%;
+    padding: 0 5px;
+    margin-right: 4%
+
+}
+
+.cols-3 .column-2 {
+    float: left;
+    width: 29%;
+    margin-left: 0;
+    padding: 0 5px
+}
+
+.cols-3 .column-3 {
+    float: right;
+    width: 29%;
+    padding: 0 5px
+}
+
+.items-row {
+    overflow: hidden;
+    margin-bottom: 10px !important;
+}
+
+.column-1,
+.column-2,
+.column-3 {
+    padding: 10px 5px
+}
+
+.column-2 {
+    width: 55%;
+    margin-left: 40%;
+}
+
+.column-3 {
+    width: 30%
+}
+
+.blog-more {
+    padding: 10px 5px
+}
+
+/* ++++++++++++++  footer  ++++++++++++++ */
+
+#bottom {
+    overflow: hidden
+}
+
+.box {
+    width: 27%;
+    float: left;
+    margin-right: 10px;
+    min-height: 100px
+}
+
+.box1 {
+    width: 35%
+}
+
+.box2 {
+    width: 32%
+}
+
+.box3 {
+    float: right
+}
+
+#footer-inner, #footer {
+    max-width: 1025px;
+    margin: 0 auto;
+
+    padding: 10px 15px 10px 10px;
+}
+
+img {
+    border: 0 none;
+    max-width: 100%;
+}
+
+/* hide the mobile menu button */
+#mobile_select {
+    display: none
+}
diff --git a/core/templates/beez3/css/print.css b/core/templates/beez3/css/print.css
new file mode 100644
index 00000000..67988222
--- /dev/null
+++ b/core/templates/beez3/css/print.css
@@ -0,0 +1,464 @@
+/**
+ * @author Design & Accessible Team ( Angie Radtke / Robert Deutz )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+ */
+
+
+/* not ready */
+
+h1,
+#main h1
+{
+      font-size: 16pt;
+      font-weight: bold;
+      margin: 0.4em 0 0.5em 0;
+      padding:0;
+}
+
+h2,
+#main h2
+{
+      font-size: 14pt;
+      font-weight: bold;
+      margin: 0.2em 0 0.5em 0;
+      padding: 0.3em 0.3em 0.3em 0;
+}
+
+h3
+{
+      font-size: 12pt;
+      font-weight: bold;
+      margin: 0.4em 0 0.2em 0;
+}
+
+/* Vermeidung von Seitenumbr�chen direkt nach einer �berschrift */
+h1,
+h2,
+h3
+{
+      page-break-after: avoid;
+}
+
+body
+{
+  line-height:150%;
+  font-family:Arial, Verdana, Helvetica, sans-serif;
+}
+
+p,
+ul li, ol li,
+address,
+.category-desc,
+table,
+label,
+dt,
+dd
+{
+  font-size:10pt
+}
+
+address
+{
+	font-style:normal
+}
+
+.contact-address address span
+{
+	display:block
+}
+
+a
+{
+      font-weight: bold;
+}
+
+.unseen,
+#line,
+#header ul,
+#breadcrumbs,
+.article-info-term,
+ul.actions,
+#close,
+.display-limit,
+.moduletable_menu,
+.moduletable_js,
+.tabouter,
+#bottom,
+.pagination,
+#footer,
+#header-image
+
+{
+      display: none;
+}
+
+.skiplinks,
+#suckerfish
+{
+	display:none !important
+}
+
+#header .logoheader
+{
+	border:0;
+}
+
+#header
+{
+      width: auto;
+}
+
+#all #back #header
+{
+padding-top:0
+}
+
+
+#all
+{
+      text-align:left;
+      border:solid 0px #000
+}
+
+#back
+{
+  border:solid 0px #000;
+  padding:0
+}
+
+#right
+{
+      display: block;
+}
+
+#header h1#logo
+{
+  font-size:20pt;
+  font-weight:normal
+}
+
+#contentarea2,
+#contentarea
+{
+	border: solid 0px #000;
+	padding:0 !important
+}
+
+#main .blog-featured h1
+{
+  padding:0 !important;
+}
+
+#main #top
+{
+  overflow:hidden;
+  margin-bottom:25pt;
+  border:0
+}
+
+#main .categories-listalphabet ul
+{
+	padding-left:0
+}
+
+#main .categories-listalphabet ul li
+{
+	display:inline;
+	padding:5pt;
+	border-right:solid 1pt #ddd
+}
+
+#wrapper
+{
+	display:block;
+	width:100% !important;
+}
+
+.item
+{
+  margin-bottom:30pt
+}
+
+.category-desc
+{
+	margin:15pt 0
+}
+
+.items-leading
+{
+	margin-bottom:30pt
+}
+
+#main .items-leading h2,
+#main .item h2
+{
+      font-size: 14pt;
+      font-weight: bold;
+}
+
+h2 a
+{
+	text-decoration:none
+}
+
+#main h1
+{
+	padding:5pt
+}
+
+#main .readmore a
+{
+  border:0 !important;
+  padding-left:0 !important
+}
+
+.image-left {
+	float:left;
+	margin:0 15pt 5pt 0;
+}
+
+table
+{
+  margin:20pt 0;
+  border-collapse:collapse;
+  width:90%;
+}
+
+table td,
+table th
+{
+  padding:2pt 5pt;
+  border:solid 1pt #ddd
+}
+
+.items-more h3
+{
+	padding: 5pt 0;
+	font-size:14pt
+}
+
+.items-more ol li a
+{
+	font-weight:normal
+}
+
+#nav a.readmore
+{
+  font-size:10pt
+}
+
+#nav .module_content
+{
+  margin-bottom:20pt;
+  border:0 !important;
+  padding:0 !important
+}
+
+#nav .moduletable ul.menu
+{
+	border:0;
+	list-style-type:none;
+	padding:0
+}
+
+#nav .moduletable ul.menu,
+#nav .moduletable ul.menu ul,
+#nav .moduletable ul.menu ul ul
+{
+	border:0;
+	list-style-type:none
+}
+
+#nav .moduletable ul.menu ul,
+#nav .moduletable ul.menu ul ul
+{
+	padding-left:15pt
+}
+
+#nav .moduletable ul.menu li
+{
+  border:0
+}
+
+#nav .moduletable ul.menu li a,
+#nav .moduletable ul.menu li.active ul li a,
+#nav .moduletable ul.menu li.active ul li.active ul li a
+{
+	text-decoration:none;
+	border:solid 0px #000
+}
+
+ul#archive-items
+{
+	list-style-type:none;
+	padding-left:0
+}
+
+.moduletable
+{
+  margin:20pt 0
+}
+
+dl.article-info
+{
+	line-height:120%;
+	font-size:9pt
+}
+
+dl.article-info dd
+{
+	margin-left:0
+}
+
+h3.js_heading a img
+{
+  border:0
+}
+
+h3.js_heading,
+#bottom h3,
+.moduletable h3,
+#nav h3
+{
+  font-size:12pt !important;
+}
+
+.category-list
+{
+	padding:0 !important;
+}
+
+.moduletable_js
+{
+  margin-bottom:20pt
+}
+
+.tabouter
+{
+  border:solid 0px ;
+  overflow:hidden;
+  margin:20pt 0
+}
+
+ul.tabs
+{
+  padding:0;
+}
+
+ul.tabs li.tab
+{
+  list-style-type:none;
+  text-transform:uppercase;
+  display:inline;
+  border-right:solid 1pt #ddd;
+  padding:2pt 10pt
+}
+
+ul.tabs li.tab a
+{
+  text-decoration:none;
+}
+
+.tabcontent
+{
+  padding:10pt
+}
+
+.contact-email div
+{
+	overflow:hidden
+}
+
+.contact-email label
+{
+	border:solid 0px #000;
+	float:left;
+	width:10em
+}
+
+.login div
+{
+	overflow:hidden
+}
+
+.login label
+{
+	float:left;
+	width:10em
+}
+
+form fieldset dt
+{
+	clear:left;
+	float:left;
+	width:12em;
+}
+
+legend
+{
+	background:#fff;
+	font-size:.85em
+}
+
+.phrases,
+.only
+{
+	margin-bottom:15pt
+}
+
+.newsflash a.readmore:link
+{
+	border: solid 0pt ;
+	font-weight:normal;
+	font-size:0.8em;
+	text-decoration:none
+}
+
+.stats dt
+{
+	float:left;
+	width:10em
+}
+
+#footer-outer
+{
+  border:solid 0px;
+  padding:0;
+  background:none
+}
+
+#bottom
+{
+  text-align:left
+}
+
+#footer-outer #bottom .box .moduletable
+{
+  border-bottom:solid 1px #ddd;
+  padding:10pt 0
+}
+
+#footer-outer #bottom .box1,
+#footer-outer #bottom .box3
+{
+  border:0;
+}
+
+#bottom ul
+{
+  list-style-type:none;
+  padding:0 !important
+}
+
+#bottom ul li
+{
+  border:solid 0px #c00
+}
diff --git a/core/templates/beez3/css/red.css b/core/templates/beez3/css/red.css
new file mode 100644
index 00000000..93645db2
--- /dev/null
+++ b/core/templates/beez3/css/red.css
@@ -0,0 +1,384 @@
+/* This beautiful CSS-File has been crafted with LESS (lesscss.org) and compiled by simpLESS (wearekiss.com/simpless) */
+body {
+	background: #eee
+}
+
+h3 {
+	color: #555
+}
+
+h2 a {
+	text-decoration: none
+}
+
+h2, .moduletable h3, .items-leading h2 {
+	border-bottom: solid 1px #ddd
+}
+
+.items-row h2 {
+	border-top: solid 1px #ddd;
+	border-bottom: solid 1px #ddd
+}
+
+a:link, a:visited {
+	color: #c00
+}
+
+a:hover, a:active, a:focus {
+	background: #c00;
+	color: #FFF
+}
+
+.logoheader {
+	background: #900;
+	color: #FFF;
+	min-height: 200px
+}
+
+#all {
+	background: #fff;
+	color: #555
+}
+
+#shadow #all {
+	box-shadow: 0 20px 10px #555
+}
+
+#header ul.menu {
+	background-color: #ddd;
+	background-repeat: repeat-x;
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr=#eeeeee, endColorstr=#dddddd);
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#eee), to(#ddd));
+	background-image: -moz-linear-gradient(top, #eee, #ddd);
+	background-image: -ms-linear-gradient(top, #eee, #ddd);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eee), color-stop(100%, #ddd));
+	background-image: -webkit-linear-gradient(top, #eee, #ddd);
+	background-image: -o-linear-gradient(top, #eee, #ddd);
+	background-image: linear-gradient(#eee, #ddd);
+	border-color: #b2b2b2 #b2b2b2 #9f9f9f;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, .49);
+	-webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset, 0 1px 2px rgba(0, 0, 0, .05);
+	border: solid 1px #ddd;
+	border: 1px solid #e5e5e5;
+	text-transform: uppercase
+}
+
+#header ul.menu a:link, #header ul.menu a:visited {
+	color: #333;
+	display: inline-block;
+	font-weight: 700;
+	text-decoration: none;
+	padding: 0 10px;
+	margin: 0;
+	display: inline-block;
+	margin: 0 0 0;
+	padding: 12px 15px;
+	position: relative;
+	border-right: 1px solid #ddd;
+	box-shadow: 1px 0 0 #f5f5f5
+}
+
+.button, button, p.readmore a, #header input.button, .pagenav a:link, .pagenav a:visited, #advanced-search-toggle, .profile-edit a:link, .profile-edit a:visited, h3.js_heading, .article-info {
+	background-color: #ddd;
+	background-repeat: repeat-x;
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr=#ffffff, endColorstr=#dddddd);
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#fff), to(#ddd));
+	background-image: -moz-linear-gradient(top, #fff, #ddd);
+	background-image: -ms-linear-gradient(top, #fff, #ddd);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #ddd));
+	background-image: -webkit-linear-gradient(top, #fff, #ddd);
+	background-image: -o-linear-gradient(top, #fff, #ddd);
+	background-image: linear-gradient(#fff, #ddd);
+	border-color: #b2b2b2 #b2b2b2 #9f9f9f;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, .49);
+	-webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, .2) inset, 0 1px 2px rgba(0, 0, 0, .05);
+	color: #c00;
+	border: solid 1px #ddd
+}
+
+.article-info {
+	color: #555
+}
+
+table {
+	border: solid 1px #ddd
+}
+
+table th a:link, table th a:visited {
+	color: #fff
+}
+
+tr.odd, tr.cat-list-row1 {
+	background: #f8f8f8
+}
+
+table tr:hover td {
+	background: #FEFDE2
+}
+
+.button:hover, .button:active, .button:focus, button:hover, p.readmore a:hover, #header ul.menu a:hover, #header ul.menu a:active, #header ul.menu a:focus, .pagenav a:hover, .pagenav a:active, .pagenav a:focus, #advanced-search-toggle:hover, #advanced-search-toggle:active, #advanced-search-toggle:focus, .profile-edit a:hover, .profile-edit a:active, .profile-edit a:focus, #fontsize a:hover, #fontsize a:active, #fontsize a:focus, #mobile_select h2 a, table th, .logoheader {
+	background-color: #c00;
+	background-repeat: repeat-x;
+	filter: progid:dximagetransform.microsoft.gradient(startColorstr=#cc0000, endColorstr=#990000);
+	background-image: -khtml-gradient(linear, left top, left bottom, from(#c00), to(#900));
+	background-image: -moz-linear-gradient(top, #c00, #900);
+	background-image: -ms-linear-gradient(top, #c00, #900);
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #c00), color-stop(100%, #900));
+	background-image: -webkit-linear-gradient(top, #c00, #900);
+	background-image: -o-linear-gradient(top, #c00, #900);
+	background-image: linear-gradient(#c00, #900);
+	border-color: #900;
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, .33);
+	-webkit-font-smoothing: antialiased
+}
+
+.pagination span, .pagination span a:hover {
+	color: #999;
+	background-color: #f5f5f5
+}
+
+span.pagenav {
+	background: #095197;
+	color: #fff
+}
+
+.pagination-start span.pagenav, .pagination-prev span.pagenav, .pagination-end span.pagenav, .pagination-next span.pagenav {
+	background-color: #f5f5f5;
+	color: #444
+}
+
+ul.menu a:link, ul.menu a:visited {
+	color: #444
+}
+
+.moduletable_menu {
+	border: solid 1px #ddd;
+	background: #f9f9f9
+}
+
+#header ul.menu {
+	border: solid 1px #D5D5D5;
+	box-shadow: 0 1px 0 #fff inset, 0 1px 5px rgba(0, 0, 0, .1)
+}
+
+#header ul.menu a {
+	box-shadow: none;
+	border-bottom: 0
+}
+
+ul.menu a:hover, ul.menu a:active, ul.menu a:focus {
+	background-color: #F5F5F5;
+	background-image: -moz-linear-gradient(center top, #fff, #e6e6e6);
+	background-repeat: repeat-x;
+	background: url(../images/arrow.png) no-repeat right center;
+	color: #c00
+}
+
+ul.menu li.active a, ul.menu li.active ul li.active a, ul.menu li.active ul li.active ul li.active a, ul.menu li.active ul li.active ul li.active ul li.active a, ul.menu li.active ul li.active ul li.active ul li.active ul li.active a {
+	font-weight: 700
+}
+
+ul.menu li.active ul li a, ul.menu li.active ul li.active ul li a, ul.menu li.active ul li.active ul li.active ul li a, ul.menu li.active ul li.active ul li.active ul li.active ul li a {
+	font-weight: 400
+}
+
+ul.menu a {
+	box-shadow: 0 1px 0 #fff;
+	border-bottom: solid 1px #ddd;
+	text-shadow: 0 1px 0 #fff
+}
+
+ul.menu ul a {
+	background: #e5e5e5;
+	margin-bottom: 1px
+}
+
+ul.menu ul ul ul a {
+	background: #f5f5f5 url(../images/arrow.png) no-repeat 24px center
+}
+
+ul.menu ul ul ul ul a {
+	background: #fff
+}
+
+.panel h3.pane-toggler a {
+	background: url(../images/slider_plus.png) right top no-repeat;
+	color: #333
+}
+
+.panel h3.pane-toggler-down a {
+	background: url(../images/slider_minus.png) right top no-repeat;
+	border-bottom: solid 1px #ddd;
+	color: #333
+}
+
+ul.tabs li, dl.tabs dt h3 a:link, dl.tabs dt h3 a:visited {
+	background: #f5f5f5 url(../images/nature/box.png) repeat-x
+}
+
+ul.tabs li a:link, ul.tabs li a:visited, dl.tabs dt a {
+	color: #333;
+	border: solid 1px #ddd;
+	border-bottom: 0
+}
+
+ul.tabs li a:hover, ul.tabs li a:active, ul.tabs li a:focus {
+	color: #000
+}
+
+.tabcontent, div.current {
+	background: #fff;
+	color: #000;
+	border: solid 1px #ddd
+}
+
+.tabcontent .linkclosed {
+	color: #000;
+	border-bottom: solid 1px #e5e5e5
+}
+
+ul.tabs li a.linkopen, dl.tabs dt.open h3 a:link, dl.tabs dt.open h3 a:visited {
+	background: #fff;
+	color: #333;
+	border-radius: 5px 5px 0 0
+}
+
+ul.tabs li a.linkclosed:hover, ul.tabs li a.linkclosed:active, ul.tabs li a.linkclosed:focus, ul.tabs li a.linkopen:hover, ul.tabs li a.linkopen:active, ul.tabs li a.linkopen:focus {
+	background: #555;
+	color: #fff
+}
+
+#footer-inner, #footer {
+	background: #f5f5f5;
+	box-shadow: 0 20px 10px #555
+}
+
+#footer {
+	background: #555;
+	max-width: 1025px;
+	margin: 0 auto;
+	box-shadow: 0 0 10px #555;
+	color: #fff
+}
+
+#footer a {
+	color: #fff;
+	background: 0
+}
+
+#bottom a {
+	background: 0
+}
+
+.box1 {
+	border-right: solid 1px #ccc
+}
+
+.box3 {
+	border-left: solid 1px #ccc
+}
+
+#bottom ul li a {
+	background-image: none;
+	padding-left: 0
+}
+
+#mobile_select h2 {
+	border: 0;
+	margin: -17px 0 0 0;
+	padding: 0;
+	background: #900;
+	text-align: right
+}
+
+#mobile_select h2 a {
+	display: inline-block;
+	font-size: .8em;
+	border-radius: 4px 4px 0 0;
+	padding: 6px;
+	font-size: .75em;
+	margin-right: 5px
+}
+
+@media only screen and (max-width: 480px) {
+	img {
+		max-width: 100%;
+		height: auto;
+		border: 0;
+		-ms-interpolation-mode: bicubic
+	}
+
+	#fontsize {
+		display: none
+	}
+
+	#nav, #wrapper2, #wrapper, .cols-3 .column-1, .cols-3 .column-2, .cols-3 .column-3, #right, .box, #header form {
+		float: none;
+		width: 100%
+	}
+
+	#header {
+		padding-top: 3em
+	}
+
+	#header form {
+		margin: 0
+	}
+
+	.logoheader {
+		background: #900;
+		min-height: 100px;
+		margin: 0
+	}
+
+	.box {
+		border-left: 0 !important;
+		border-bottom: solid 1px #ddd
+	}
+
+	#line {
+		text-align: center;
+		top: 0;
+		right: auto;
+		max-width: 100%;
+		min-width: 100%;
+		margin: 0 0;
+		background: #c00
+	}
+
+	#header form input {
+		float: none;
+		margin-bottom: 4px
+	}
+
+	#menuwrapper {
+		margin-top: 10px
+	}
+
+	#header ul.menu {
+		position: relative;
+		top: 0;
+		left: 20px;
+		right: 20px;
+		margin: 0;
+		width: 90%;
+		border-radius: 4px
+	}
+
+	#header ul.menu li:first-child a {
+		border-radius: 4px 4px 0 0
+	}
+
+	#header ul.menu li:last-child a {
+		border-radius: 0 0 4px 4px
+	}
+
+	#header ul.menu li a:link, #header ul.menu li a:visited {
+		display: block;
+		padding: 6px 10px;
+		border-bottom: solid 1px #ccc
+	}
+}
diff --git a/core/templates/beez3/css/template.css b/core/templates/beez3/css/template.css
new file mode 100644
index 00000000..82451abb
--- /dev/null
+++ b/core/templates/beez3/css/template.css
@@ -0,0 +1,31 @@
+/**
+ * @author Design & Accessible Team ( Angie Radtke  )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+ */
+
+
+body {
+    background: #fff;
+    color: #000000;
+    font-size: 100.1%;
+    padding: 0px;
+    text-align: center;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+
+body.contentpane {
+	width:auto;
+	margin:10px;
+	text-align: left;
+}
+
+img { border: 0 none; }
diff --git a/core/templates/beez3/css/template_rtl.css b/core/templates/beez3/css/template_rtl.css
new file mode 100644
index 00000000..f27a0b94
--- /dev/null
+++ b/core/templates/beez3/css/template_rtl.css
@@ -0,0 +1,553 @@
+/**
+ * @author Design & Accessible Team ( Angie Radtke  )
+ * @package Joomla
+ * @subpackage Accessible-Template-Beez
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+ * @license GNU/GPL, see LICENSE.php
+ * Joomla! is free software. This version may have been modified pursuant to the
+ * GNU General Public License, and as distributed it includes or is derivative
+ * of works licensed under the GNU General Public License or other free or open
+ * source software licenses. See COPYRIGHT.php for copyright notices and
+ * details.
+ */
+
+
+ #all
+{
+	text-align: right;
+}
+
+#wrapper
+{
+	float:right;
+}
+
+
+#logo span
+{
+	padding-right:15px;}
+
+
+h1#logo{
+	font-family: 'Titillium Maps',  Arial;
+	padding:0.9em 20px 20px 10px;
+	/*text-transform:uppercase;*/
+	text-align:right;
+}
+
+#logo
+{
+	margin-top:0.6em;
+	margin-left:10px;
+	/* position:absolute;*/
+	display:block;
+	padding:20px 20px 20px 10px;
+	width:425px;
+	padding-top:0.6em;
+	font-weight:normal;
+	line-height:1em;
+	font-size:3em;
+}
+
+.logoheader
+{
+	text-align:right;
+}
+
+/* ##########################  header  ########################### */
+
+#header
+{
+	font-size:1em;
+	position:relative
+}
+
+#header ul.menu {
+	text-align: right;
+}
+
+/* ++++++++++++++  search box+font options ++++++++++++++ */
+#line {
+	left: 20px;
+	margin-right: -10px;
+	right: auto;
+	text-align: left;
+}
+
+/* ++++++++++++++  breadcrumbs   ++++++++++++++ */
+
+#breadcrumbs {
+	/*display: block;*/
+	background: none;
+	float: right;
+	text-align: right;
+	width: 100%;
+}
+
+#breadcrumbs *
+{
+	text-align:right;
+	float: right;
+
+}
+/* for IE7 and less */
+*:first-child+html .breadcrumbs, * html .breadcrumbs {
+	width: 100%;
+}
+#breadcrumbs
+{
+	margin:15px 5px 15px 0px;
+}
+#breadcrumbs img
+{
+	padding: 4px 5px 0px 5px;
+}
+
+#breadcrumbs .showHere {
+	margin-left: 4px;
+}
+ul.menu li a:link,ul.menu li a:visited {
+	background: url(../images/nature/karo.gif) no-repeat scroll right 14px;
+	padding-right: 10px;
+}
+
+ul.menu li {
+	text-align: right;
+}
+
+ul.menu li.active ul li a:link,
+ul.menu li.active ul li a:visited
+{
+	padding-right: 20px;
+}
+
+ul.menu li.active ul li.active a:link,
+ul.menu li.active ul li.active a:visited
+{
+	padding-right: 20px;
+}
+
+ul.menu li.active ul li.active ul li a:link,
+ul.menu li.active ul li.active ul li a:visited
+{
+	padding-right: 33px;
+}
+
+ul.menu li.active  ul li.active  ul li.active  ul li  a:link,
+ul.menu li.active  ul li.active  ul li.active  ul li a:visited
+{
+	padding: 3px 47px 3px 2px;
+	background:#fff url(../images/nature/arrow_small_rtl.png) no-repeat scroll right 8px;
+}
+
+ul.menu li.active  ul li.active  ul li.active  ul li.active	ul li  a:link,
+ul.menu li.active  ul li.active  ul li.active  ul li.active	ul li a:visited
+{
+	padding-right:30px;
+}
+
+h3 {
+	text-align: right
+}
+
+h3.js_heading a {
+	position: absolute;
+	right: auto;
+	left: 5px
+}
+
+.box {
+	text-align: right
+}
+
+ul.newsfeed {
+	text-align: right
+}
+
+a.readmore:link,a.readmore:visited,.readmore a:link,.readmore a:visited
+	{
+	background: url(../images/nature/arrow1_rtl.gif) repeat-x scroll right top;
+	padding-right: 10px !important
+}
+
+.readmore a:hover, .readmore a:active, .readmore a:focus,
+a.readmore a:hover, a.readmore a:active, a.readmore a:focus
+{
+	background: url(../images/nature/arrow2_rtl.gif) no-repeat right 6px #555 !important;
+}
+
+.mailto-close {
+	left: 5px !important;
+	right: auto !important;
+}
+
+* html .mailto-close {
+	left: 0;
+	position: absolute;
+	right: 340px !important
+}
+
+/* personal.css overrides */
+
+.panel h3.pane-toggler a
+{
+	background:#f5f5f5 url(../images/slider_plus_rtl.png) left top no-repeat;
+}
+.panel h3.pane-toggler-down a
+{
+	background:#f5f5f5  url(../images/slider_minus_rtl.png) left top no-repeat;
+	border-bottom:solid 1px #ddd;
+}
+
+.form-required
+{
+	background-position: right;
+}
+
+input.button,
+button.button
+{
+	background:#FFFFFF url(../images/nature/arrow1_rtl.gif) no-repeat right top;
+}
+
+/* layout.css overrides */
+
+#main ul
+{
+	padding:0 15px 0 0;
+	margin:10px 0 10px 0px;
+}
+
+#main ol
+{
+	padding:0 20px 0 0;
+	margin:10px 0 10px 0px;
+}
+
+.contact-email label
+{
+	width:17em;
+	float:right;
+}
+
+#contact-email-copy
+{
+	float:right;
+	margin-left:10px;
+}
+
+table.weblinks th, table.category th {
+	text-align: right;
+}
+
+table th, table td {
+	text-align: right;
+}
+
+dl.tabs {
+	float: right;
+	margin: 50px 0 0 0;
+	z-index: 50;
+	clear:both;
+}
+
+dl.tabs dt {
+	float: right;
+	padding: 4px 10px;
+	border-left: 1px solid #ccc;
+	border-right: 1px solid #ccc;
+	border-top: 1px solid #ccc;
+	margin-left: 3px;
+	margin-right: 0px;
+}
+
+form fieldset dt
+{
+	clear:right ;
+	float:right;
+	width:12em;
+	padding:3px 0
+}
+
+form fieldset dd
+{
+	float:right;
+	padding:3px 0
+}
+
+#users-profile-core dt,
+#users-profile-custom dt
+{
+	float:right;
+	width:12em;
+	padding:3px 0;
+
+
+}
+
+.profile-edit form#member-profile fieldset dt,
+.registration form#member-registration fieldset dt
+{padding:5px 0px 5px 5px; width:13em}
+
+
+.login-fields label
+{float:right}
+
+/* ++++++++++++++  pagination  ++++++++++++++ */
+
+#main .pagination
+{
+	float:right;
+	text-align:right;
+	padding:10px 10px 0px 0px;
+	width: 100%;
+	clear:both;
+}
+
+#main .pagination ul
+{
+	float:right;
+	text-align:right;
+
+}
+
+#main .pagination li
+{
+	float:right;
+	text-align:right;
+}
+
+#main .pagination li.pagination-start span,
+#main .pagination li.pagination-start a
+{
+padding:4px 0;
+}
+
+.left1 {
+	float: right;
+	margin: 10px 10px 3% 10px ;
+}
+
+
+/* ++++++++++++++  login  ++++++++++++++ */
+
+
+
+#login-form label
+{
+	margin-right:0px;
+}
+
+#form-login-remember label
+{
+	float:none;
+	width:auto;
+	display:inline
+}
+
+input.button,
+button.button,
+button.validate
+{
+	padding:3px 7px 5px 7px;
+}
+
+#modlgn-username,
+#modlgn-passwd
+{
+	margin-right: 0;
+}
+
+.module_content #form-login-username label,
+.module_content #form-login-password label
+{
+	float:right;
+
+}
+
+.login-fields
+{
+	margin:10px 0
+}
+
+.login-fields label
+{
+	float:right;
+}
+
+.login-description img,
+.logout-description img
+{
+	float:right;
+	margin-right:0px
+}
+
+.login-description,
+.logout-description
+{
+	padding-right:5px;
+	margin:20px 10px 0 0;
+}
+
+/* ++++++++++++++  columns alignment left to right  ++++++++++++++ */
+ul.tabs li {
+	float: right;
+	border-left: 1px solid #DDDDDD;
+	border-right: 0px solid #DDDDDD;
+}
+
+
+ul.pagenav li.pagenav-next {
+	float: left;
+}
+ul.pagenav li.pagenav-prev {
+	float: right;
+}
+#close span {
+	width: auto;
+	left: 20px;
+	right: auto;
+}
+#header ul.menu li a:link,
+#header ul.menu li a:visited
+{
+	border-right:solid 0px #237D85;
+	border-left:solid 1px #237D85;
+}
+
+#header ul li.active a:link,
+#header ul li.active a:visited
+{
+	border-right:solid 0px #237D85;
+	border-left:solid 1px #237D85;
+}
+#fontsize {
+	margin: 0 1px 0 20px;
+	text-align: right;
+}
+#fontsize p a:link, #fontsize p a:visited {
+	border-left: 1px solid #CCCCCC;
+	border-right: none;
+}
+#header form .inputbox {
+	margin: 2px 2px 2px 13px;
+}
+#header form .inputbox:focus { margin: 1px 1px 0 11px; }
+#header ul.menu li {
+	float: right;
+}
+
+/* ############## Blog/featured columns ######## */
+
+.blog-featured .item, .blog .item {
+	float:right;
+}
+.items-row .column-1 {
+	margin-right: 0;
+	margin-left: 4%;
+}
+
+#main ul.actions {
+	text-align: left;
+}
+
+.content_rating {
+	text-align: right;
+
+}
+
+ul.menu li ul li ul li ul li ul {
+	padding-right: 7px;
+}
+
+#system-message dd.notice ul,
+#system-message dd.error ul,
+#system-message dd.message  ul {
+        background-position: 100% 0!important;
+        padding: 10px 40px 10px 10px!important;
+}
+#system-message dd.message  ul {
+        background-image:url(../images/system/notice-info_rtl.png)!important;
+}
+#system-message dd.notice ul {
+        background-image:url("../images/system/notice-note_rtl.png")!important;
+}
+#system-message dd.error ul {
+        background-image:url(../images/system/notice-alert_rtl.png)!important;
+}
+
+/* ++++++++++++++  image float style ++++++++++++++ */
+.img-fulltext-left {
+	float: right;
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+
+.img-intro-left {
+	float: right;
+	margin-left: 10px;
+	margin-bottom: 10px;
+}
+
+.img-fulltext-right {
+	float:left;
+	margin-right: 20px;
+	margin-bottom: 20px;
+}
+
+.img-intro-right {
+	float: left;
+	margin-right: 10px;
+	margin-bottom: 10px;
+}
+
+/* ++++++ Bootstrap markup ++++++++++++++ */
+.pull-left {
+	float: right;
+}
+
+/* ++++++ tooltip  +++++++ */
+.tooltip.right {
+	margin-left: -3px;
+}
+.tooltip.left {
+	margin-left: 3px;
+}
+.popover,
+.tooltip-inner {
+	text-align: right;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	right: 50%;
+	margin-right: -5px;
+}
+.tooltip.right .tooltip-arrow {
+	left: 0;
+	border-width: 5px 0 5px 5px;
+}
+.tooltip.left .tooltip-arrow {
+	right: 0;
+	border-width: 5px 5px 5px 0;
+}
+.tooltip.bottom .tooltip-arrow {
+	right: 50%;
+	margin-right: -5px;
+}
+
+/* Smartsearch Calendar*/
+#filter_date1_img,
+#filter_date2_img {
+	margin-left: 0;
+	margin-right: 3px;
+}
+ul#finder-filter-select-dates li.filter-date {
+	text-align: right;
+}
+.radio, .checkbox {
+	padding-left: 0;
+	padding-right: 4px;
+}
+#searchForm .searchintro {
+	padding: 0 250px 0 0;
+}
\ No newline at end of file
diff --git a/core/templates/beez3/css/turq.css b/core/templates/beez3/css/turq.css
new file mode 100644
index 00000000..aabf15a7
--- /dev/null
+++ b/core/templates/beez3/css/turq.css
@@ -0,0 +1,401 @@
+body {
+	background: #eeeeee;
+}
+h3 {
+	color: #555;
+}
+h2 a {
+	text-decoration: none;
+}
+h2,
+.moduletable h3,
+.items-leading h2 {
+	border-bottom: solid 1px #ddd;
+}
+.items-row h2 {
+	border-top: solid 1px #ddd;
+	border-bottom: solid 1px #ddd;
+}
+a:link,
+a:visited {
+	color: #009999;
+}
+a:hover,
+a:active,
+a:focus {
+	background: #009999;
+	color: #FFF;
+}
+.logoheader {
+	background: #009999;
+	color: #FFFFFF;
+	min-height: 200px;
+}
+#all {
+	background: #fff;
+	color: #555;
+}
+#shadow #all {
+	box-shadow: 0px 20px 10px #555555;
+}
+#header ul.menu {
+	background-color: #ddd;
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#eee,endColorstr=#ddd);
+	background-image: -khtml-gradient(linear,left top,left bottom,from(#eee),to(#ddd));
+	background-image: -moz-linear-gradient(top,#eee,#ddd);
+	background-image: -ms-linear-gradient(top,#eee,#ddd);
+	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#eee),color-stop(100%,#ddd));
+	background-image: -webkit-linear-gradient(top,#eee,#ddd);
+	background-image: -o-linear-gradient(top,#eee,#ddd);
+	background-image: linear-gradient(#eee,#ddd);
+	border-color: #b2b2b2 #b2b2b2 #9f9f9f;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.49);
+	-webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255,255,255,0.2) inset, 0 1px 2px rgba(0,0,0,0.05);
+	border: solid 1px #ddd;
+	border: 1px solid #e5e5e5;
+	text-transform: uppercase;
+}
+#header ul.menu a:link,
+#header ul.menu a:visited {
+	color: #333;
+	font-weight: bold;
+	text-decoration: none;
+	padding: 0px 10px;
+	margin: 0;
+	display: inline-block;
+	margin: 0 0 0;
+	padding: 12px 15px;
+	position: relative;
+	border-right: 1px solid #ddd;
+	box-shadow: 1px 0px 0px #f5f5f5;
+}
+.button,
+button,
+p.readmore a,
+#header input.button,
+.pagenav a:link,
+.pagenav a:visited,
+#advanced-search-toggle,
+.profile-edit a:link,
+.profile-edit a:visited,
+h3.js_heading,
+.article-info {
+	background-color: #ddd;
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff,endColorstr=#dddddd);
+	background-image: -khtml-gradient(linear,left top,left bottom,from(#ffffff),to(#dddddd));
+	background-image: -moz-linear-gradient(top,#ffffff,#dddddd);
+	background-image: -ms-linear-gradient(top,#ffffff,#dddddd);
+	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#ffffff),color-stop(100%,#dddddd));
+	background-image: -webkit-linear-gradient(top,#ffffff,#dddddd);
+	background-image: -o-linear-gradient(top,#ffffff,#dddddd);
+	background-image: linear-gradient(#ffffff,#dddddd);
+	border-color: #b2b2b2 #b2b2b2 #9f9f9f;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.49);
+	-webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255,255,255,0.2) inset, 0 1px 2px rgba(0,0,0,0.05);
+	color: #009999;
+	border: solid 1px #ddd;
+}
+.article-info {
+	color: #555;
+}
+table {
+	border: solid 1px #ddd;
+}
+table th a:link,
+table th a:visited {
+	color: #fff;
+}
+tr.odd,
+tr.cat-list-row1 {
+	background: #f8f8f8;
+}
+table  tr:hover td {
+	background: #FEFDE2;
+}
+.button:hover,
+.button:active,
+.button:focus,
+button:hover,
+p.readmore a:hover,
+#header ul.menu a:hover,
+#header ul.menu a:active,
+#header ul.menu a:focus,
+.pagenav a:hover,
+.pagenav a:active,
+.pagenav a:focus,
+#advanced-search-toggle:hover,
+#advanced-search-toggle:active,
+#advanced-search-toggle:focus,
+.profile-edit a:hover,
+.profile-edit a:active,
+.profile-edit a:focus,
+#fontsize a:hover,
+#fontsize a:active,
+#fontsize a:focus,
+#mobile_select h2 a,
+table th,
+.logoheader {
+	background-color: #00B9B9;
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00B9B9,endColorstr=#009999);
+	background-image: -khtml-gradient(linear,left top,left bottom,from(#00B9B9),to(#009999));
+	background-image: -moz-linear-gradient(top,#00B9B9,#009999);
+	background-image: -ms-linear-gradient(top,#00B9B9,#009999);
+	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#00B9B9),color-stop(100%,#009999));
+	background-image: -webkit-linear-gradient(top,#00B9B9,#009999);
+	background-image: -o-linear-gradient(top,#00B9B9,#009999);
+	background-image: linear-gradient(#00B9B9,#009999);
+	border-color: #009999;
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.33);
+	-webkit-font-smoothing: antialiased;
+}
+input:focus,
+textarea:focus {
+	box-shadow: 0 1px 1px #ddd inset, 0 0 8px #00B9B9;
+	outline: 0 none;
+}
+.pagination span,
+.pagination span  a:hover {
+	color: #999999;
+	background-color: #f5f5f5;
+}
+span.pagenav {
+	background: #009999;
+	color: #fff;
+}
+.pagination-start span.pagenav,
+.pagination-prev  span.pagenav,
+.pagination-end span.pagenav,
+.pagination-next span.pagenav {
+	background-color: #f5f5f5;
+	color: #444;
+}
+ul.menu a:link,
+ul.menu a:visited {
+	color: #444;
+}
+.moduletable_menu {
+	border: solid 1px #ddd;
+	background: #f9f9f9;
+}
+#header ul.menu {
+	border: solid 1px #D5D5D5;
+	box-shadow: 0 1px 0 #FFFFFF inset, 0 1px 5px rgba(0,0,0,0.1);
+}
+#header ul.menu a {
+	box-shadow: none;
+	border-bottom: 0;
+}
+ul.menu a:hover,
+ul.menu a:active,
+ul.menu a:focus {
+	background-color: #F5F5F5;
+	background-image: -moz-linear-gradient(center top,#FFFFFF,#E6E6E6);
+	background-repeat: repeat-x;
+	background: url(../images/arrow.png) no-repeat right center;
+	color: #009999;
+}
+ul.menu li.active a,
+ul.menu  li.active ul li.active a,
+ul.menu  li.active ul li.active  ul li.active a,
+ul.menu  li.active ul li.active  ul li.active ul li.active  a,
+ul.menu  li.active ul li.active  ul li.active ul li.active ul li.active a {
+	font-weight: bold;
+}
+ul.menu  li.active ul li a,
+ul.menu  li.active ul li.active  ul li a,
+ul.menu  li.active ul li.active  ul li.active ul li  a,
+ul.menu  li.active ul li.active  ul li.active ul li.active ul li a {
+	font-weight: normal;
+}
+ul.menu a {
+	box-shadow: 0 1px 0 #fff;
+	border-bottom: solid 1px #ddd;
+	text-shadow: 0 1px 0 #fff;
+}
+ul.menu ul a {
+	background: #e5e5e5;
+	margin-bottom: 1px;
+}
+ul.menu ul ul ul a {
+	background: #f5f5f5 url(../images/arrow.png) no-repeat 24px center;
+}
+ul.menu ul ul ul ul a {
+	background: #fff;
+}
+.panel h3.pane-toggler a {
+	background: url(../images/slider_plus.png) right top no-repeat;
+	color: #333;
+}
+.panel h3.pane-toggler-down a {
+	background: url(../images/slider_minus.png) right top no-repeat;
+	border-bottom: solid 1px #ddd;
+	color: #333;
+}
+ul.tabs li,
+dl.tabs dt h3 a:link,
+dl.tabs dt h3 a:visited {
+	background: #f5f5f5 url(../images/nature/box.png) repeat-x;
+}
+ul.tabs li a:link,
+ul.tabs li a:visited,
+dl.tabs dt a {
+	color: #333;
+	border: solid 1px #ddd;
+	border-bottom: 0;
+}
+ul.tabs li a:hover,
+ul.tabs li a:active,
+ul.tabs li a:focus {
+	color: #000;
+}
+.tabcontent,
+div.current {
+	background: #fff;
+	color: #000;
+	border: solid 1px #ddd;
+}
+.tabcontent .linkclosed {
+	color: #000;
+	border-bottom: solid 1px #e5e5e5;
+}
+ul.tabs li a.linkopen,
+dl.tabs dt.open  h3 a:link,
+dl.tabs dt.open  h3 a:visited {
+	background: #fff;
+	color: #333;
+	border-radius: 5px 5px 0px 0px;
+}
+ul.tabs li a.linkclosed:hover,
+ul.tabs li a.linkclosed:active,
+ul.tabs li a.linkclosed:focus,
+ul.tabs li a.linkopen:hover,
+ul.tabs li a.linkopen:active,
+ul.tabs li a.linkopen:focus {
+	background: #555;
+	color: #fff;
+}
+#footer-inner,
+#footer {
+	background: #f5f5f5;
+	box-shadow: 0px 20px 10px #555;
+}
+#footer {
+	background: #555;
+	max-width: 1025px;
+	margin: 0 auto;
+	box-shadow: 0px 0px 10px #555555;
+	color: #fff;
+}
+#footer a {
+	color: #fff;
+	background: none;
+}
+#bottom a {
+	background: none;
+}
+.box1 {
+	border-right: solid 1px #ccc;
+}
+.box3 {
+	border-left: solid 1px #ccc;
+}
+#bottom  ul li a {
+	background-image: none;
+	padding-left: 0;
+}
+#mobile_select h2 {
+	border: 0;
+	margin: -17px 0 0 0;
+	padding: 0;
+	background: #009999;
+	text-align: right;
+}
+#mobile_select h2 a {
+	display: inline-block;
+	font-size: 0.8em;
+	border-radius: 4px 4px 0 0;
+	padding: 6px;
+	font-size: 0.75em;
+	margin-right: 5px;
+}
+@media only screen and (max-width: 480px) {
+	img {
+		max-width: 100%;
+		height: auto;
+		border: 0;
+		-ms-interpolation-mode: bicubic;
+	}
+	#fontsize {
+		display: none;
+	}
+	#nav,
+	#wrapper2,
+	#wrapper,
+	.cols-3 .column-1,
+	.cols-3 .column-2,
+	.cols-3 .column-3,
+	#right,
+	.box,
+	#header form {
+		float: none;
+		width: 100%;
+	}
+	#header {
+		padding-top: 3em;
+	}
+	#header form {
+		margin: 0;
+	}
+	.logoheader {
+		background: #009999;
+		min-height: 100px;
+		margin: 0;
+	}
+	.box {
+		border-left: 0 !important;
+		border-bottom: solid 1px #ddd;
+	}
+	#line {
+		text-align: center;
+		top: 0;
+		right: auto;
+		max-width: 100%;
+		min-width: 100%;
+		margin: 0 0px;
+		background: #00B9B9;
+	}
+	#header form input {
+		float: none;
+		margin-bottom: 4px;
+	}
+	#menuwrapper {
+		margin-top: 10px;
+	}
+	#header ul.menu {
+		position: relative;
+		top: 0;
+		left: 20px;
+		right: 20px;
+		margin: 0;
+		width: 90%;
+		border-radius: 4px;
+	}
+	#header ul.menu li:first-child a {
+		border-radius: 4px 4px 0 0;
+	}
+	#header ul.menu li:last-child a {
+		border-radius: 0 0 4px 4px;
+	}
+	#header ul.menu li a:link,
+	#header ul.menu li a:visited {
+		display: block;
+		padding: 6px 10px;
+		border-bottom: solid 1px #ccc;
+	}
+}
diff --git a/core/templates/beez3/css/turq.less b/core/templates/beez3/css/turq.less
new file mode 100644
index 00000000..bcd2f39c
--- /dev/null
+++ b/core/templates/beez3/css/turq.less
@@ -0,0 +1,426 @@
+@basecolor 		: rgb(45,53,62);
+@compcolor 		: spin(@basecolor, 180);
+@bordercolor    : lighten(@basecolor, 60%);
+@bodycolor : #eeeeee;
+@contentbackground:#fff;
+@textcolor : #555;
+@linkcolor 		    : #009999;
+@linkcolorhover 	: darken(@linkcolor, 10);
+@linkcolorvisited   : darken(@linkcolorhover, 10);
+@linkcolorfocus 	: darken(@linkcolorvisited, 10);
+@backgroundlogoheader: #009999;
+@headermenugradientfrom:#eee;
+@headermenugradientto:#ddd;
+@uxelmentsgradientfrom: #ffffff;
+@uxelmentsgradientto: #dddddd;
+@uxelmentshovergradientfrom: #00B9B9;
+@uxelmentshovergradientto: #009999;
+
+body {
+	background: @bodycolor
+}
+
+h3 {
+	color: @textcolor
+}
+
+h2 a {
+	text-decoration: none
+}
+
+h2,.moduletable h3, .items-leading h2 {
+	border-bottom: solid 1px #ddd;
+}
+
+.items-row h2 {
+	border-top: solid 1px #ddd;
+	border-bottom: solid 1px #ddd;
+}
+
+a:link,a:visited {
+	color: @linkcolor
+}
+
+a:hover,a:active,a:focus {
+	background:@linkcolor 	 ;
+	color: #FFF;
+}
+
+.logoheader {
+	background: @backgroundlogoheader;
+	color: #FFFFFF;
+	min-height: 200px;
+}
+
+#all {
+	background: @contentbackground;
+	color: @textcolor ;
+}
+
+#shadow #all {
+	box-shadow: 0px 20px 10px #555555
+}
+
+#header ul.menu {
+  background-color:#ddd;
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=@headermenugradientfrom, endColorstr=@headermenugradientto);
+  background-image: -khtml-gradient(linear, left top, left bottom, from(@headermenugradientfrom), to(@headermenugradientto));
+  background-image: -moz-linear-gradient(top, @headermenugradientfrom, @headermenugradientto);
+  background-image: -ms-linear-gradient(top, @headermenugradientfrom, @headermenugradientto);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @headermenugradientfrom), color-stop(100%, @headermenugradientto));
+  background-image: -webkit-linear-gradient(top, @headermenugradientfrom, @headermenugradientto);
+  background-image: -o-linear-gradient(top, @headermenugradientfrom, @headermenugradientto);
+  background-image: linear-gradient(@headermenugradientfrom, @headermenugradientto);
+  border-color: #b2b2b2 #b2b2b2 hsl(114, 0%, 62.5%);
+
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.49);
+  -webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px
+		rgba(0, 0, 0, 0.05);
+	border: solid 1px #ddd;
+	border: 1px solid #e5e5e5;
+	text-transform: uppercase;
+}
+
+#header ul.menu a:link,#header ul.menu a:visited {
+	color: #333;
+	font-weight: bold;
+	text-decoration: none;
+	padding: 0px 10px;
+	margin: 0;
+	display: inline-block;
+	margin: 0 0 0;
+	padding: 12px 15px;
+	position: relative;
+	border-right: 1px solid #ddd;
+	box-shadow: 1px 0px 0px #f5f5f5;
+}
+
+/*  grey background */
+.button,button,p.readmore a,#header input.button,.pagenav a:link,.pagenav a:visited,#advanced-search-toggle,.profile-edit a:link,.profile-edit a:visited,h3.js_heading,.article-info
+	{
+  background-color:#ddd;
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=@uxelmentsgradientfrom, endColorstr=@uxelmentsgradientto);
+  background-image: -khtml-gradient(linear, left top, left bottom, from(@uxelmentsgradientfrom), to(@uxelmentsgradientto));
+  background-image: -moz-linear-gradient(top, @uxelmentsgradientfrom, @uxelmentsgradientto);
+  background-image: -ms-linear-gradient(top, #ffffff, #dddddd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @uxelmentsgradientfrom), color-stop(100%, @uxelmentsgradientto));
+  background-image: -webkit-linear-gradient(top, @uxelmentsgradientfrom, @uxelmentsgradientto);
+  background-image: -o-linear-gradient(top, @uxelmentsgradientfrom, @uxelmentsgradientto);
+  background-image: linear-gradient(@uxelmentsgradientfrom, @uxelmentsgradientto);
+  border-color: #b2b2b2 #b2b2b2 hsl(114, 0%, 62.5%);
+
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.49);
+  -webkit-font-smoothing: antialiased;
+	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px
+		rgba(0, 0, 0, 0.05);
+	color: @linkcolor;
+	border: solid 1px #ddd
+}
+.article-info
+{color:@textcolor}
+/* +++++++++++++  table display  Catgegories table, contact etc, ++++++++++++++++++++* */
+table {
+	border: solid 1px #ddd
+}
+
+
+
+table th a:link,table th a:visited {
+	color: #fff
+}
+
+tr.odd,tr.cat-list-row1 {
+	background: #f8f8f8
+}
+
+table  tr:hover td {
+	background: #FEFDE2;
+}
+
+/* blue background */
+.button:hover,
+.button:active,
+.button:focus,
+button:hover,
+p.readmore a:hover,
+#header ul.menu a:hover,
+#header ul.menu a:active,
+#header ul.menu a:focus,
+.pagenav a:hover,
+.pagenav a:active,
+.pagenav a:focus,
+#advanced-search-toggle:hover,
+#advanced-search-toggle:active,
+#advanced-search-toggle:focus,
+.profile-edit a:hover,
+.profile-edit a:active,
+.profile-edit a:focus,
+#fontsize a:hover,#fontsize a:active,#fontsize a:focus,
+#mobile_select h2 a,table th,.logoheader
+	{
+
+  background-color:@uxelmentshovergradientfrom;
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=@uxelmentshovergradientfrom, endColorstr=@uxelmentshovergradientto);
+  background-image: -khtml-gradient(linear, left top, left bottom, from(@uxelmentshovergradientfrom), to(@uxelmentshovergradientto));
+  background-image: -moz-linear-gradient(top,@uxelmentshovergradientfrom, @uxelmentshovergradientto);
+  background-image: -ms-linear-gradient(top, @uxelmentshovergradientfrom, @uxelmentshovergradientto);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @uxelmentshovergradientfrom), color-stop(100%, @uxelmentshovergradientto));
+  background-image: -webkit-linear-gradient(top, @uxelmentshovergradientfrom, @uxelmentshovergradientto);
+  background-image: -o-linear-gradient(top, @uxelmentshovergradientfrom, @uxelmentshovergradientto);
+  background-image: linear-gradient(@uxelmentshovergradientfrom, @uxelmentshovergradientto);
+  border-color: @uxelmentshovergradientto;
+  color: #fff ;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.33);
+  -webkit-font-smoothing: antialiased;
+
+
+
+}
+input:focus,textarea:focus {
+	box-shadow: 0 1px 1px  @headermenugradientto inset, 0 0 8px @uxelmentshovergradientfrom;
+	outline: 0 none;
+}
+/* +++++++++++++++++  Pagination +++++++++++++++ */
+.pagination span,.pagination span  a:hover {
+	color: #999999;
+	background-color: #f5f5f5;
+}
+
+/* active item */
+
+span.pagenav {
+	background: @uxelmentshovergradientto;
+	color: #fff;
+}
+
+.pagination-start span.pagenav,.pagination-prev  span.pagenav,.pagination-end span.pagenav,.pagination-next span.pagenav
+	{
+	background-color: #f5f5f5;
+	color: #444;
+}
+
+/* +++++++++++++++++  content  +++++++++++++++ */
+
+
+ul.menu a:link,ul.menu a:visited {
+	color: #444;
+}
+
+/* ++++++++++++++++++++++  menu ++++++++++++++++++++++++++  */
+.moduletable_menu {
+	border: solid 1px #ddd;
+	background: #f9f9f9;
+}
+
+#header ul.menu {
+	border: solid 1px #D5D5D5;
+	box-shadow: 0 1px 0 #FFFFFF inset, 0 1px 5px rgba(0, 0, 0, 0.1);
+}
+
+#header ul.menu a {
+	box-shadow: none;
+	border-bottom: 0
+}
+
+ul.menu a:hover,ul.menu a:active,ul.menu a:focus {
+	background-color: #F5F5F5;
+	background-image: -moz-linear-gradient(center top, #FFFFFF, #E6E6E6);
+	background-repeat: repeat-x;
+  background: url(../images/arrow.png) no-repeat right center;
+  color:@linkcolor
+}
+
+/* ++++++++++++++++   highlightning active menuitem  +++++++++++++++++++ */
+ul.menu li.active a,ul.menu  li.active ul li.active a,ul.menu  li.active ul li.active  ul li.active a,ul.menu  li.active ul li.active  ul li.active ul li.active  a,ul.menu  li.active ul li.active  ul li.active ul li.active ul li.active a
+	{
+	font-weight: bold;
+}
+
+ul.menu  li.active ul li a,ul.menu  li.active ul li.active  ul li a,ul.menu  li.active ul li.active  ul li.active ul li  a,ul.menu  li.active ul li.active  ul li.active ul li.active ul li a
+	{
+	font-weight: normal
+}
+
+ul.menu a {
+	box-shadow: 0 1px 0 #fff;
+	border-bottom: solid 1px #ddd;
+	text-shadow: 0 1px 0 #fff
+}
+
+ul.menu ul a {
+	background: #e5e5e5;
+	margin-bottom: 1px
+}
+
+ul.menu ul ul ul a {
+  background: #f5f5f5 url(../images/arrow.png) no-repeat 24px center;
+}
+
+ul.menu ul ul ul ul a {
+	background: #fff;
+}
+
+/* +++++++++++++++++++++++  SLIDER  ++++++++++++++++++++  */
+.panel h3.pane-toggler a {
+	background: url(../images/slider_plus.png) right top no-repeat;
+	color: #333
+}
+
+.panel h3.pane-toggler-down a {
+	background: url(../images/slider_minus.png) right top no-repeat;
+	border-bottom: solid 1px #ddd;
+	color: #333
+}
+
+/*  +++++++++++++++++   Tabs ++++++++++++++++++++++  */
+ul.tabs li,dl.tabs dt h3 a:link,dl.tabs dt h3 a:visited {
+	background: #f5f5f5 url(../images/nature/box.png) repeat-x;
+}
+
+ul.tabs li a:link,ul.tabs li a:visited,dl.tabs dt a {
+	color: #333;
+	border: solid 1px #ddd;
+	border-bottom: 0
+}
+
+ul.tabs li a:hover,ul.tabs li a:active,ul.tabs li a:focus {
+	color: #000
+}
+
+.tabcontent,div.current {
+	background: #fff;
+	color: #000;
+	border: solid 1px #ddd;
+}
+
+.tabcontent .linkclosed {
+	color: #000;
+	border-bottom: solid 1px #e5e5e5;
+}
+
+ul.tabs li a.linkopen,dl.tabs dt.open  h3 a:link,dl.tabs dt.open  h3 a:visited
+	{
+	background: #fff;
+	color: #333;
+	border-radius: 5px 5px 0px 0px;
+}
+
+ul.tabs li a.linkclosed:hover,ul.tabs li a.linkclosed:active,ul.tabs li a.linkclosed:focus,ul.tabs li a.linkopen:hover,ul.tabs li a.linkopen:active,ul.tabs li a.linkopen:focus
+	{
+	background: #555;
+	color: #fff
+}
+
+#footer-inner,#footer {
+	background: #f5f5f5;
+	box-shadow: 0px 20px 10px #555
+}
+
+#footer {
+	background: #555;
+	max-width: 1025px;
+	margin: 0 auto;
+	box-shadow: 0px 0px 10px #555555;
+	color: #fff
+}
+
+#footer a {
+	color: #fff;
+	background: none
+}
+
+#bottom a {
+	background: none
+}
+
+.box1 {
+	border-right: solid 1px #ccc
+}
+
+.box3 {
+	border-left: solid 1px #ccc
+}
+
+#bottom  ul li a {
+	background-image: none;
+	padding-left: 0
+}
+
+/* responsive */
+#mobile_select h2 {border:0; margin:-17px 0 0 0; padding:0; background:@uxelmentshovergradientto;text-align:right}
+#mobile_select h2 a {
+display:inline-block;
+font-size:0.8em;
+border-radius:4px 4px 0 0;
+padding:6px;
+font-size:0.75em;
+margin-right:5px;
+}
+
+@media only screen and (max-width: 480px) {
+
+	img {
+  max-width: 100%;
+  height: auto;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+	#fontsize{display:none}
+	#nav,#wrapper2,#wrapper,.cols-3 .column-1,.cols-3 .column-2,.cols-3 .column-3,#right,.box,#header form
+		{
+		float: none;
+		width: 100%
+	}
+	#header {padding-top:3em}
+	#header form  {margin:0}
+	.logoheader {background:@uxelmentshovergradientto; min-height:100px; margin:0}
+	.box {
+		border-left: 0 !important;
+		border-bottom: solid 1px #ddd;
+	}
+	#line {
+		text-align: center;
+		top: 0;
+		right: auto;
+		max-width: 100% ;
+		min-width:100%;
+
+		margin: 0 0px; background:@uxelmentshovergradientfrom;
+	}
+	#header form input {
+		float: none; margin-bottom:4px
+	}
+	#menuwrapper { margin-top:10px; }
+	#header ul.menu {position:relative; top:0;left:20px; right:20px; margin:0; width:90%; border-radius:4px}
+	#header ul.menu li:first-child a {border-radius: 4px 4px 0 0}
+	#header ul.menu li:last-child a {border-radius:0 0 4px 4px }
+	#header ul.menu li a:link,
+
+	#header ul.menu li a:visited {
+		display: block;
+		padding: 6px 10px;
+		border-bottom: solid 1px #ccc
+	}
+}
+
+@media only screen and (min-width: 600px) {
+}
+
+@media only screen and (min-width: 768px) {
+}
+
+@media only screen and (min-width: 992px) {
+}
+
+@media only screen and (min-width: 1382px) { /* Styles */
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) , only screen and
+		(min--moz-device-pixel-ratio: 1.5) , only screen and
+	(min-device-pixel-ratio: 1.5) { /* Styles */
+}
diff --git a/core/templates/beez3/error.php b/core/templates/beez3/error.php
new file mode 100644
index 00000000..06e4c749
--- /dev/null
+++ b/core/templates/beez3/error.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentError $this */
+
+$showRightColumn = 0;
+$showleft        = 0;
+$showbottom      = 0;
+
+// Get params
+$app         = JFactory::getApplication();
+$params      = $app->getTemplate(true)->params;
+$logo        = $params->get('logo');
+$color       = $params->get('templatecolor');
+$navposition = $params->get('navposition');
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $this->error->getCode(); ?> - <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></title>
+	<link href="<?php echo $this->baseurl; ?>/templates/system/css/system.css" rel="stylesheet" />
+	<link href="<?php echo $this->baseurl; ?>/templates/system/css/error.css" rel="stylesheet" />
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/position.css" rel="stylesheet" media="screen" />
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/layout.css" rel="stylesheet" media="screen" />
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/print.css" rel="stylesheet" media="print" />
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/<?php echo htmlspecialchars($color); ?>.css" rel="stylesheet" />
+	<?php $files = JHtml::_('stylesheet', 'general.css', array('relative' => true, 'returnPath' => true)); ?>
+	<?php if ($files) : ?>
+		<?php if (!is_array($files)) : ?>
+			<?php $files = array($files); ?>
+		<?php endif; ?>
+	<?php foreach ($files as $file) : ?>
+		<link href="<?php echo $file; ?>" rel="stylesheet" />
+	<?php endforeach; ?>
+	<?php endif; ?>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/<?php echo htmlspecialchars($color, ENT_COMPAT, 'UTF-8'); ?>.css" rel="stylesheet" />
+	<?php if ($this->direction === 'rtl') : ?>
+		<link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template; ?>/css/template_rtl.css" rel="stylesheet" />
+		<?php if (file_exists(JPATH_SITE . '/templates/' . $this->template . '/css/' . $color . '_rtl.css')) : ?>
+			<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/<?php echo htmlspecialchars($color, ENT_COMPAT, 'UTF-8'); ?>_rtl.css" rel="stylesheet" />
+		<?php endif; ?>
+	<?php endif; ?>
+	<?php if ($app->get('debug_lang', '0') == '1' || $app->get('debug', '0') == '1') : ?>
+		<link href="<?php echo JUri::root(true); ?>/media/cms/css/debug.css" rel="stylesheet" />
+	<?php endif; ?>
+	<!--[if lte IE 6]><link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/ieonly.css" rel="stylesheet" /><![endif]-->
+	<!--[if IE 7]><link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/ie7only.css" rel="stylesheet" /><![endif]-->
+	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
+	<style>
+	<!--
+		#errorboxbody
+		{margin:30px}
+		#errorboxbody h2
+		{font-weight:normal;
+		font-size:1.5em}
+		#searchbox
+		{background:#eee;
+		padding:10px;
+		margin-top:20px;
+		border:solid 1px #ddd
+		}
+	-->
+	</style>
+</head>
+	<body>
+		<div id="all">
+			<div id="back">
+				<div id="header">
+					<div class="logoheader">
+						<h1 id="logo">
+							<?php if ($logo) : ?>
+								<img src="<?php echo $this->baseurl; ?>/<?php echo htmlspecialchars($logo); ?>"  alt="<?php echo htmlspecialchars($params->get('sitetitle')); ?>" />
+							<?php else : ?>
+								<?php echo htmlspecialchars($params->get('sitetitle')); ?>
+							<?php endif; ?>
+							<span class="header1">
+								<?php echo htmlspecialchars($params->get('sitedescription')); ?>
+							</span>
+						</h1>
+					</div><!-- end logoheader -->
+					<ul class="skiplinks">
+						<li>
+							<a href="#wrapper2" class="u2">
+								<?php echo JText::_('TPL_BEEZ3_SKIP_TO_ERROR_CONTENT'); ?>
+							</a>
+						</li>
+						<li>
+							<a href="#nav" class="u2">
+								<?php echo JText::_('TPL_BEEZ3_ERROR_JUMP_TO_NAV'); ?>
+							</a>
+						</li>
+					</ul>
+					<div id="line">
+					</div><!-- end line -->
+				</div><!-- end header -->
+				<div id="contentarea2" >
+					<div class="left1" id="nav">
+						<h2 class="unseen">
+							<?php echo JText::_('TPL_BEEZ3_NAVIGATION'); ?>
+						</h2>
+						<?php $module = JModuleHelper::getModule('menu'); ?>
+						<?php echo JModuleHelper::renderModule($module); ?>
+					</div><!-- end navi -->
+					<div id="wrapper2">
+						<div id="errorboxbody">
+							<h2>
+								<?php echo JText::_('JERROR_LAYOUT_PAGE_NOT_FOUND'); ?>
+							</h2>
+							<h3><?php echo JText::_('JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST'); ?></h3>
+							<p><?php echo JText::_('JERROR_LAYOUT_NOT_ABLE_TO_VISIT'); ?></p>
+							<ul>
+								<li><?php echo JText::_('JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE'); ?></li>
+								<li><?php echo JText::_('JERROR_LAYOUT_MIS_TYPED_ADDRESS'); ?></li>
+								<li><?php echo JText::_('JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING'); ?></li>
+								<li><?php echo JText::_('JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE'); ?></li>
+							</ul>
+							<?php if (JModuleHelper::getModule('mod_search')) : ?>
+								<div id="searchbox">
+									<h3 class="unseen">
+										<?php echo JText::_('TPL_BEEZ3_SEARCH'); ?>
+									</h3>
+									<p>
+										<?php echo JText::_('JERROR_LAYOUT_SEARCH'); ?>
+									</p>
+									<?php $module = JModuleHelper::getModule('mod_search'); ?>
+									<?php echo JModuleHelper::renderModule($module); ?>
+								</div><!-- end searchbox -->
+							<?php endif; ?>
+							<div><!-- start goto home page -->
+								<p>
+								<a href="<?php echo $this->baseurl; ?>/index.php" title="<?php echo JText::_('JERROR_LAYOUT_GO_TO_THE_HOME_PAGE'); ?>"><?php echo JText::_('JERROR_LAYOUT_HOME_PAGE'); ?></a>
+								</p>
+							</div><!-- end goto home page -->
+							<h3>
+								<?php echo JText::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?>
+							</h3>
+							<h2>
+								#<?php echo $this->error->getCode(); ?>&nbsp;<?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+							</h2>
+							<?php if ($this->debug) : ?>
+								<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+							<?php endif; ?>
+							<br />
+						</div><!-- end errorboxbody -->
+					</div><!-- end wrapper2 -->
+				</div><!-- end contentarea2 -->
+				<?php if ($this->debug) : ?>
+					<div>
+						<?php echo $this->renderBacktrace(); ?>
+						<?php // Check if there are more Exceptions and render their data as well ?>
+						<?php if ($this->error->getPrevious()) : ?>
+							<?php $loop = true; ?>
+							<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+							<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+							<?php $this->setError($this->_error->getPrevious()); ?>
+							<?php while ($loop === true) : ?>
+								<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+								<p>
+									<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+									<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+								</p>
+								<?php echo $this->renderBacktrace(); ?>
+								<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+							<?php endwhile; ?>
+							<?php // Reset the main error object to the base error ?>
+							<?php $this->setError($this->error); ?>
+						<?php endif; ?>
+					</div>
+				<?php endif; ?>
+			</div><!--end back -->
+		</div><!--end all -->
+		<div id="footer-outer">
+			<div id="footer-sub">
+				<div id="footer">
+				<p>
+					<?php echo JText::_('TPL_BEEZ3_POWERED_BY'); ?>
+					<a href="https://www.joomla.org/">
+						Joomla!&#174;
+					</a>
+				</p>
+				</div><!-- end footer -->
+			 </div><!-- end footer-sub -->
+		</div><!-- end footer-outer-->
+	</body>
+</html>
diff --git a/core/templates/beez3/favicon.ico b/core/templates/beez3/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1a4d7979dcf49a5f677c7e0075781431e23f2c50
GIT binary patch
literal 2019
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z81_l<D%#etZ2wxwo<osN{#FYG`RK1Ga0-$OJ2Ac{iATu|$BvGLvHz%*y
zs=`(YtilS&1_|pcDS(xfWZNo5_y#CA=NF|anChA687SFtDJUq|6s4qD1-ZCEwF7y!
zN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWfdBw^QLty5(q!uR^
zWfqiV=I1GZ%uP(nFD<cEQUX~72M~9bWTqi($}5I?3+O?8kc_^eo`F6#ZK)NRIJALe
zaB53QhWo0Zv?vGcr<7#<)ST4Z)Vz{npgu#a)&av7t`WtN6^R89%fNvM@tY0E<yJwd
z#rZj<pdbj%%Pg@ovH^PtT^JD}5M9psxdlb3#l=8vcBW7*$YSW~BM{cunZxWr7DU(J
zUz7>-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{
zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+7C`G)JGDw(Z{OV
z2AC48eDhN>(<)sOOH%EO3=B=J42-P|O%)7{K@1b1chS@!xd0^NT$Gwvl3x^(pPyp~
z_C+p;t6;2WtOxWrx(cXf8+}kdLdsW=ObZqT=2|;0piWo`V8><WSr*H{z#QS};uvBf
zSUV{;BgR$a`1zSLtIOZ-+U*&e+Zy34mg8+QHON&;<ZQXF>*uQ)x^_R)YBVb+)M-R5
zR64Q9QE&-I(5j51QHz~S%zS4r(^V0@+-9bxE0HZ_Vko_N_U`Y=&nohMJqkX5IOg4%
zpMU=spOazeV@{W{j@y5sr1pM5a`l(`<sbU4Zhifj_xj$&rLuu?@1$2%hk1Q9Rq|B2
zV71`df$7cfxBZFuvtQt=`TeJ7+5I&&_wAkAZN=kb{Z2m1VtG!W^e?smg$WB)6+g%e
ze0V*75?_sx<hsj+l>$7ey^SW%@8t3{=5lk`7%y^otho54iu@4?HZkqw=bI)iTy>7s
zYl6`2CAz@}*n*gTFxKDn$iC-jp~82a|4a7T-3%v1xir6=iSB0czpg(czf9+_S<mSy
z@7Zb>3i%t<^zb$`<grR^JN}*LTlWe-#$V!>8r+(zFE@U#KEBt-oAK2_A<h5Os?XN^
za=-L;=N5%iYx`N1!kJHhylX$dFG5sznqc?7hDcH2o9y9V*z1DwHVPZP-TmwIhJ3wg
z3Ke}?!S~xAdmmn9#rxo(NrH>pGnxD=bM-VLZ}F=Yco%*=ba89MrMw>t_ga2VO3K?d
zyXO0z<m737fA`*<9VK^U%U`w6A{*~ayFKwn$ttH)kB)^DWyRjxsP!wjqA=xkx&59g
zoCT|D9$!12$G2Y7IL_4~lHvcEM-#WFi-{{0g(igO9dTUhFVbZ?d&(^PnI30y3S=Uq
z=d1{{`1?V-^~~Q`@ppHNmKN^Hzqc`U>$H;l52b%To_HXOGpdt^-+d~Be~fhPa`ufs
zKAkFh^Xa|$uJW6GTb+L|-G463Os?cl62G}Y)+1#>nWL*36jzH)h!6MB-uf-*^^K$F
z-PH8=Pvif>EWPF1=kxvYKVN0(S%&v4y;TwAs5njkYPg*+XF~M*2<rvEn%n~f=P!Ct
zZniLN<CHH=LHnvr%D1LITYfy;<&41!rgIbT9L$*ZM_{)^)0_z_d`>Lx;n}R}^>WsQ
z*$+-uZGF03`1Ri>wwVf1=QkW(u=uB#P~f5kGQSVTDJ@<q`uO((e<mwai>tGrXU~&)
zQI{cc{{QcvISF#U602t&-y6*Et1!&aC2GP=>8Xsl?|a|A`H_*dU~Bo7%F@St-uqUr
lx|x59Pegi?_2Mo68Ggz3@0scntO2TdJzf1=);T3K0RSjD{7e7<

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/html/com_contact/categories/default.php b/core/templates/beez3/html/com_contact/categories/default.php
new file mode 100644
index 00000000..c47d0bd3
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/categories/default.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+	<?php if ($this->params->get('show_base_description')) : ?>
+	<?php 	//If there is a description in the menu parameters use that; ?>
+		<?php if ($this->params->get('categories_description')) : ?>
+		<div class="category-desc base-desc">
+			<?php echo  JHtml::_('content.prepare', $this->params->get('categories_description'), '', 'com_contact.categories'); ?>
+			</div>
+		<?php  else: ?>
+			<?php //Otherwise get one from the database if it exists. ?>
+			<?php  if ($this->parent->description) : ?>
+				<div class="category-desc base-desc">
+					<?php  echo JHtml::_('content.prepare', $this->parent->description, '', 'com_contact.categories'); ?>
+				</div>
+			<?php  endif; ?>
+		<?php  endif; ?>
+	<?php endif; ?>
+<?php
+echo $this->loadTemplate('items');
+?>
+</div>
diff --git a/core/templates/beez3/html/com_contact/categories/default_items.php b/core/templates/beez3/html/com_contact/categories/default_items.php
new file mode 100644
index 00000000..fa487e2f
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/categories/default_items.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$class = ' class="first"';
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
+	if (!isset($this->items[$this->parent->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+	<?php $class = ''; ?>
+		<span class="item-title"><a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($item->id));?>">
+			<?php echo $this->escape($item->title); ?></a>
+		</span>
+
+		<?php if ($this->params->get('show_subcat_desc_cat') == 1) :?>
+		<?php if ($item->description) : ?>
+			<div class="category-desc">
+				<?php echo JHtml::_('content.prepare', $item->description, '', 'com_contact.categories'); ?>
+			</div>
+		<?php endif; ?>
+		<?php endif; ?>
+
+		<?php if ($this->params->get('show_cat_items_cat') == 1) :?>
+			<dl><dt>
+				<?php echo JText::_('COM_CONTACT_COUNT'); ?></dt>
+				<dd><?php echo $item->numitems; ?></dd>
+			</dl>
+		<?php endif; ?>
+
+		<?php if (count($item->getChildren()) > 0) :
+			$this->items[$item->id] = $item->getChildren();
+			$this->parent = $item;
+			$this->maxLevelcat--;
+			echo $this->loadTemplate('items');
+			$this->parent = $item->getParent();
+			$this->maxLevelcat++;
+		endif; ?>
+
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_contact/category/default.php b/core/templates/beez3/html/com_contact/category/default.php
new file mode 100644
index 00000000..5cc81804
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/category/default.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="contact-category<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<?php if ($this->params->get('show_category_title', 1)) : ?>
+<h2>
+	<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_contact.category.title'); ?>
+</h2>
+<?php endif; ?>
+<?php if ($this->params->def('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+	<div class="category-desc">
+	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+	<?php endif; ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_contact.category.description'); ?>
+	<?php endif; ?>
+	<div class="clr"></div>
+	</div>
+<?php endif; ?>
+
+<?php echo $this->loadTemplate('items'); ?>
+
+<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
+<div class="cat-children">
+	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
+	<?php echo $this->loadTemplate('children'); ?>
+</div>
+<?php endif; ?>
+</div>
diff --git a/core/templates/beez3/html/com_contact/category/default_children.php b/core/templates/beez3/html/com_contact/category/default_children.php
new file mode 100644
index 00000000..5c2d7f8c
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/category/default_children.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$class = ' class="first"';
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+	<?php
+	if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
+	if (!isset($this->children[$this->category->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+		<?php $class = ''; ?>
+			<span class="item-title"><a href="<?php echo JRoute::_(ContactHelperRoute::getCategoryRoute($child->id));?>">
+				<?php echo $this->escape($child->title); ?></a>
+			</span>
+
+			<?php if ($this->params->get('show_subcat_desc') == 1) :?>
+			<?php if ($child->description) : ?>
+				<div class="category-desc">
+					<?php echo JHtml::_('content.prepare', $child->description, '', 'com_contact.category'); ?>
+				</div>
+			<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_cat_items') == 1) :?>
+				<dl><dt>
+					<?php echo JText::_('COM_CONTACT_CAT_NUM'); ?></dt>
+					<dd><?php echo $child->numitems; ?></dd>
+				</dl>
+		<?php endif; ?>
+			<?php if (count($child->getChildren()) > 0 ) :
+				$this->children[$child->id] = $child->getChildren();
+				$this->category = $child;
+				$this->maxLevel--;
+				echo $this->loadTemplate('children');
+				$this->category = $child->getParent();
+				$this->maxLevel++;
+			endif; ?>
+		</li>
+	<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/core/templates/beez3/html/com_contact/category/default_items.php b/core/templates/beez3/html/com_contact/category/default_items.php
new file mode 100644
index 00000000..1f6564bc
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/category/default_items.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.framework');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<?php if (empty($this->items)) : ?>
+	<p> <?php echo JText::_('COM_CONTACT_NO_CONTACTS'); ?> </p>
+<?php else : ?>
+
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+<?php if ($this->params->get('show_pagination_limit')) : ?>
+	<fieldset class="filters">
+	<legend class="hidelabeltxt"><?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?></legend>
+
+		<div class="display-limit">
+			<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+	</fieldset>
+<?php endif; ?>
+	<table class="category">
+		<?php if ($this->params->get('show_headings')) : ?>
+		<thead><tr>
+
+			<?php if ($this->params->get('show_image_heading')) : ?>
+			<th class="item-image">
+			</th>
+			<?php endif; ?>
+			<th class="item-title">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_CONTACT_EMAIL_NAME_LABEL', 'a.name', $listDirn, $listOrder); ?>
+			</th>
+			<?php if ($this->params->get('show_position_headings')) : ?>
+			<th class="item-position">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_POSITION', 'a.con_position', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_email_headings')) : ?>
+			<th class="item-email">
+				<?php echo JText::_('JGLOBAL_EMAIL'); ?>
+			</th>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_telephone_headings')) : ?>
+			<th class="item-phone">
+				<?php echo JText::_('COM_CONTACT_TELEPHONE'); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_mobile_headings')) : ?>
+			<th class="item-phone">
+				<?php echo JText::_('COM_CONTACT_MOBILE'); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_fax_headings')) : ?>
+			<th class="item-phone">
+				<?php echo JText::_('COM_CONTACT_FAX'); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_suburb_headings')) : ?>
+			<th class="item-suburb">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_SUBURB', 'a.suburb', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_state_headings')) : ?>
+			<th class="item-state">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_STATE', 'a.state', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_country_headings')) : ?>
+			<th class="item-state">
+				<?php echo JHtml::_('grid.sort', 'COM_CONTACT_COUNTRY', 'a.country', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+
+			</tr>
+		</thead>
+		<?php endif; ?>
+
+		<tbody>
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php if ($this->items[$i]->published == 0) : ?>
+					<tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+				<?php else: ?>
+					<tr class="cat-list-row<?php echo $i % 2; ?>" >
+				<?php endif; ?>
+
+					<?php if ($this->params->get('show_image_heading')) : ?>
+						<td class="item-image">
+							<?php if ($this->items[$i]->image) : ?>
+								<?php echo JHtml::_('image', $this->items[$i]->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('class' => 'contact-thumbnail img-thumbnail')); ?>
+							<?php endif; ?>
+						</td>
+					<?php endif; ?>
+
+					<td class="item-title">
+						<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
+							<?php echo $item->name; ?></a>
+					</td>
+
+					<?php if ($this->params->get('show_position_headings')) : ?>
+						<td class="item-position">
+							<?php echo $item->con_position; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_email_headings')) : ?>
+						<td class="item-email">
+							<?php echo $item->email_to; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_telephone_headings')) : ?>
+						<td class="item-phone">
+							<?php echo $item->telephone; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_mobile_headings')) : ?>
+						<td class="item-phone">
+							<?php echo $item->mobile; ?>
+						</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_fax_headings')) : ?>
+					<td class="item-phone">
+						<?php echo $item->fax; ?>
+					</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_suburb_headings')) : ?>
+					<td class="item-suburb">
+						<?php echo $item->suburb; ?>
+					</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_state_headings')) : ?>
+					<td class="item-state">
+						<?php echo $item->state; ?>
+					</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_country_headings')) : ?>
+					<td class="item-state">
+						<?php echo $item->country; ?>
+					</td>
+					<?php endif; ?>
+
+				</tr>
+			<?php endforeach; ?>
+
+		</tbody>
+	</table>
+
+	<?php if ($this->params->get('show_pagination')) : ?>
+	<div class="pagination">
+		<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+		<p class="counter">
+			<?php echo $this->pagination->getPagesCounter(); ?>
+		</p>
+		<?php endif; ?>
+		<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+	<?php endif; ?>
+	<div>
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	</div>
+</form>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_contact/contact/default.php b/core/templates/beez3/html/com_contact/contact/default.php
new file mode 100644
index 00000000..1fbc42e2
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$cparams = JComponentHelper::getParams('com_media');
+?>
+
+<div class="contact<?php echo $this->pageclass_sfx?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+		<h1>
+			<?php echo $this->escape($this->params->get('page_heading')); ?>
+		</h1>
+	<?php endif; ?>
+	<?php if ($this->contact->name && $this->params->get('show_name')) : ?>
+		<div class="page-header">
+			<h2>
+				<span class="contact-name"><?php echo $this->contact->name; ?></span>
+			</h2>
+		</div>
+	<?php endif;  ?>
+	<?php if ($this->params->get('show_contact_category') === 'show_no_link') : ?>
+		<h3>
+			<span class="contact-category"><?php echo $this->contact->category_title; ?></span>
+		</h3>
+	<?php endif; ?>
+	<?php if ($this->params->get('show_contact_category') === 'show_with_link') : ?>
+		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid);?>
+		<h3>
+			<span class="contact-category"><a href="<?php echo $contactLink; ?>">
+				<?php echo $this->escape($this->contact->category_title); ?></a>
+			</span>
+		</h3>
+	<?php endif; ?>
+
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
+	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
+		<form action="#" method="get" name="selectForm" id="selectForm">
+			<label for="select_contact"><?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?></label>
+			<?php echo JHtml::_('select.genericlist', $this->contacts, 'select_contact', 'class="inputbox" onchange="document.location.href = this.value"', 'link', 'name', $this->contact->link); ?>
+		</form>
+	<?php endif; ?>
+
+	<?php if (!empty($this->item->tags->itemTags) && $this->params->get('show_tags', 1)) : ?>
+		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+	<?php endif; ?>
+
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
+	<?php  if ($this->params->get('presentation_style') === 'sliders') : ?>
+		<?php echo JHtml::_('sliders.start', 'panel-sliders', array('useCookie' => '1')); ?>
+		<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
+	<?php endif; ?>
+	<?php  if ($this->params->get('presentation_style') === 'tabs') : ?>
+		<?php echo JHtmlTabs::start('tabs', array('useCookie' => '1')); ?>
+		<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
+
+	<?php endif; ?>
+	<?php if ($this->params->get('presentation_style') === 'plain'):?>
+		<?php  echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>';  ?>
+	<?php endif; ?>
+
+	<?php if ($this->contact->image && $this->params->get('show_image')) : ?>
+		<div class="thumbnail pull-right">
+			<?php echo JHtml::_('image', $this->contact->image, $this->contact->name, array('style' => 'vertical-align: middle;')); ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($this->contact->con_position && $this->params->get('show_position')) : ?>
+		<dl class="contact-position dl-horizontal">
+		<dt><?php echo JText::_('COM_CONTACT_POSITION'); ?>:</dt>
+			<dd>
+				<?php echo $this->contact->con_position; ?>
+			</dd>
+		</dl>
+	<?php endif; ?>
+
+	<?php echo $this->loadTemplate('address'); ?>
+
+	<?php if ($this->params->get('allow_vcard')) :	?>
+		<?php echo JText::_('COM_CONTACT_DOWNLOAD_INFORMATION_AS');?>
+			<a href="<?php echo JRoute::_('index.php?option=com_contact&amp;view=contact&amp;id='.$this->contact->id . '&amp;format=vcf'); ?>">
+			<?php echo JText::_('COM_CONTACT_VCARD');?></a>
+	<?php endif; ?>
+
+	<?php if (($this->contact->email_to || $this->contact->user_id) && $this->params->get('show_email_form')) : ?>
+
+		<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
+			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'plain'):?>
+			<?php  echo '<h3>'. JText::_('COM_CONTACT_EMAIL_FORM').'</h3>';  ?>
+		<?php endif; ?>
+		<?php  echo $this->loadTemplate('form');  ?>
+
+	<?php endif; ?>
+
+	<?php if ($this->params->get('show_links')) : ?>
+		<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->contact->user_id && $this->contact->articles && $this->params->get('show_articles')) : ?>
+
+		<?php if ($this->params->get('presentation_style') === 'sliders') :
+			echo JHtml::_('sliders.panel', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+			<?php echo JHtmlTabs::panel(JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
+		<?php endif; ?>
+		<?php if  ($this->params->get('presentation_style') === 'plain'):?>
+			<?php echo '<h3>'. JText::_('JGLOBAL_ARTICLES').'</h3>'; ?>
+		<?php endif; ?>
+
+		<?php echo $this->loadTemplate('articles'); ?>
+
+	<?php endif; ?>
+
+	<?php if ($this->contact->user_id && $this->params->get('show_profile') && JPluginHelper::isEnabled('user', 'profile')) : ?>
+
+		<?php if ($this->params->get('presentation_style') === 'sliders') :
+			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'plain'):?>
+			<?php echo '<h3>'. JText::_('COM_CONTACT_PROFILE').'</h3>'; ?>
+		<?php endif; ?>
+
+		<?php echo $this->loadTemplate('profile'); ?>
+
+	<?php endif; ?>
+
+	<?php if ($this->contactUser && $this->params->get('show_user_custom_fields')) : ?>
+		<?php echo $this->loadTemplate('user_custom_fields'); ?>
+	<?php endif; ?>
+
+	<?php if ($this->contact->misc && $this->params->get('show_misc')) : ?>
+
+		<?php if ($this->params->get('presentation_style') === 'sliders') :
+			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('presentation_style') === 'plain'):?>
+			<?php echo '<h3>'. JText::_('COM_CONTACT_OTHER_INFORMATION').'</h3>'; ?>
+		<?php endif; ?>
+
+		<div class="contact-miscinfo">
+			<dl class="dl-horizontal">
+				<dt>
+					<span class="<?php echo $this->params->get('marker_class'); ?>">
+						<?php echo $this->params->get('marker_misc'); ?>
+					</span>
+				</dt>
+				<dd>
+					<span class="contact-misc">
+						<?php echo $this->contact->misc; ?>
+					</span>
+				</dd>
+			</dl>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($this->params->get('presentation_style') === 'sliders') :
+		echo JHtml::_('sliders.end');
+	endif; ?>
+
+	<?php echo $this->item->event->afterDisplayContent; ?>
+</div>
diff --git a/core/templates/beez3/html/com_contact/contact/default_address.php b/core/templates/beez3/html/com_contact/contact/default_address.php
new file mode 100644
index 00000000..093e7913
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default_address.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/* marker_class: Class based on the selection of text, none, or icons
+ * jicon-text, jicon-none, jicon-icon
+ */
+?>
+<dl class="contact-address dl-horizontal">
+<?php if (($this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode) && ($addressCheck = $this->params->get('address_check') > 0)) : ?>
+	<?php if ($addressCheck === true) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" >
+			<?php echo $this->params->get('marker_address'); ?>
+		</span>
+	</dt>
+	<dd>
+	<address>
+	<?php endif; ?>
+	<?php if ($this->contact->address && $this->params->get('show_street_address')) : ?>
+		<span class="contact-street">
+			<?php echo nl2br($this->contact->address); ?>
+		</span>
+	<?php endif; ?>
+	<?php if ($this->contact->suburb && $this->params->get('show_suburb')) : ?>
+		<span class="contact-suburb">
+			<?php echo $this->contact->suburb; ?>
+		</span>
+	<?php endif; ?>
+	<?php if ($this->contact->state && $this->params->get('show_state')) : ?>
+		<span class="contact-state">
+			<?php echo $this->contact->state; ?>
+		</span>
+	<?php endif; ?>
+	<?php if ($this->contact->postcode && $this->params->get('show_postcode')) : ?>
+		<span class="contact-postcode">
+			<?php echo $this->contact->postcode; ?>
+		</span>
+	<?php endif; ?>
+	<?php if ($this->contact->country && $this->params->get('show_country')) : ?>
+		<span class="contact-country">
+			<?php echo $this->contact->country; ?>
+		</span>
+	<?php endif; ?>
+<?php endif; ?>
+<?php if ($this->params->get('address_check') > 0) : ?>
+	</address>
+	</dd>
+<?php endif; ?>
+
+<?php if ($this->contact->email_to && $this->params->get('show_email')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" >
+			<?php echo $this->params->get('marker_email'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-emailto">
+			<?php echo $this->contact->email_to; ?>
+		</span>
+	</dd>
+<?php endif; ?>
+
+<?php if ($this->contact->telephone && $this->params->get('show_telephone')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" >
+			<?php echo $this->params->get('marker_telephone'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-telephone">
+			<?php echo nl2br($this->contact->telephone); ?>
+		</span>
+	</dd>
+<?php endif; ?>
+<?php if ($this->contact->fax && $this->params->get('show_fax')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" >
+			<?php echo $this->params->get('marker_fax'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-fax">
+		<?php echo nl2br($this->contact->fax); ?>
+		</span>
+	</dd>
+<?php endif; ?>
+<?php if ($this->contact->mobile && $this->params->get('show_mobile')) :?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" >
+			<?php echo $this->params->get('marker_mobile'); ?>
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-mobile">
+			<?php echo nl2br($this->contact->mobile); ?>
+		</span>
+	</dd>
+<?php endif; ?>
+<?php if ($this->contact->webpage && $this->params->get('show_webpage')) : ?>
+	<dt>
+		<span class="<?php echo $this->params->get('marker_class'); ?>" >
+		</span>
+	</dt>
+	<dd>
+		<span class="contact-webpage">
+			<a href="<?php echo $this->contact->webpage; ?>" target="_blank" rel="noopener noreferrer">
+			<?php echo $this->contact->webpage; ?></a>
+		</span>
+	</dd>
+<?php endif; ?>
+</dl>
diff --git a/core/templates/beez3/html/com_contact/contact/default_articles.php b/core/templates/beez3/html/com_contact/contact/default_articles.php
new file mode 100644
index 00000000..319b7b84
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default_articles.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelperRoute', JPATH_SITE . '/components/com_content/helpers/route.php');
+
+?>
+<?php if ($this->params->get('show_articles')) : ?>
+<div class="contact-articles">
+
+	<ol>
+		<?php foreach ($this->item->articles as $article) :	?>
+			<li>
+				<?php echo JHtml::_('link', JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)), htmlspecialchars($article->title, ENT_COMPAT, 'UTF-8')); ?>
+			</li>
+		<?php endforeach; ?>
+	</ol>
+</div>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_contact/contact/default_form.php b/core/templates/beez3/html/com_contact/contact/default_form.php
new file mode 100644
index 00000000..37c5776b
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default_form.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidation');
+
+if (isset($this->error)) : ?>
+	<div class="contact-error">
+		<?php echo $this->error; ?>
+	</div>
+<?php endif; ?>
+
+<div class="contact-form">
+	<form id="contact-form" action="<?php echo JRoute::_('index.php'); ?>" method="post" class="form-validate form-horizontal">
+		<fieldset>
+			<legend><?php echo JText::_('COM_CONTACT_FORM_LABEL'); ?></legend>
+			<div class="control-group">
+				<div class="control-label"><?php echo $this->form->getLabel('contact_name'); ?></div>
+				<div class="controls"><?php echo $this->form->getInput('contact_name'); ?></div>
+			</div>
+			<div class="control-group">
+				<div class="control-label"><?php echo $this->form->getLabel('contact_email'); ?></div>
+				<div class="controls"><?php echo $this->form->getInput('contact_email'); ?></div>
+			</div>
+			<div class="control-group">
+				<div class="control-label"><?php echo $this->form->getLabel('contact_subject'); ?></div>
+				<div class="controls"><?php echo $this->form->getInput('contact_subject'); ?></div>
+			</div>
+			<div class="control-group">
+				<div class="control-label"><?php echo $this->form->getLabel('contact_message'); ?></div>
+				<div class="controls"><?php echo $this->form->getInput('contact_message'); ?></div>
+			</div>
+				<?php if ($this->params->get('show_email_copy', 0)){ ?>
+					<div class="control-group">
+						<div class="control-label"><?php echo $this->form->getLabel('contact_email_copy'); ?></div>
+						<div class="controls"><?php echo $this->form->getInput('contact_email_copy'); ?></div>
+					</div>
+				<?php } ?>
+			<?php //Dynamically load any additional fields from plugins. ?>
+				<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
+					<?php if ($fieldset->name !== 'contact'):?>
+						<?php $fields = $this->form->getFieldset($fieldset->name);?>
+						<?php foreach ($fields as $field) : ?>
+							<div class="control-group">
+								<?php if ($field->hidden) : ?>
+									<div class="controls">
+									 <?php echo $field->input;?>
+									</div>
+								<?php else:?>
+									<div class="control-label">
+										<?php echo $field->label; ?>
+										<?php if (!$field->required && $field->type !== 'Spacer') : ?>
+											<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL');?></span>
+										<?php endif; ?>
+									</div>
+									<div class="controls"><?php echo $field->input;?></div>
+								<?php endif;?>
+							</div>
+						<?php endforeach;?>
+					<?php endif ?>
+				<?php endforeach;?>
+				<div class="form-actions"><button class="btn btn-primary validate" type="submit"><?php echo JText::_('COM_CONTACT_CONTACT_SEND'); ?></button>
+					<input type="hidden" name="option" value="com_contact" />
+					<input type="hidden" name="task" value="contact.submit" />
+					<input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
+					<input type="hidden" name="id" value="<?php echo $this->contact->slug; ?>" />
+					<?php echo JHtml::_('form.token'); ?>
+				</div>
+		</fieldset>
+	</form>
+</div>
diff --git a/core/templates/beez3/html/com_contact/contact/default_links.php b/core/templates/beez3/html/com_contact/contact/default_links.php
new file mode 100644
index 00000000..96f154a0
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default_links.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+if ($this->params->get('presentation_style') === 'sliders') : ?>
+	<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
+<?php endif; ?>
+<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+	<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
+<?php endif; ?>
+<?php if  ($this->params->get('presentation_style') === 'plain'):?>
+	<?php echo '<h3>'. JText::_('COM_CONTACT_LINKS').'</h3>'; ?>
+<?php endif; ?>
+
+<div class="contact-links">
+	<ul class="nav nav-list">
+		<?php foreach (range('a', 'e') as $char) :// letters 'a' to 'e'
+			$link = $this->contact->params->get('link'.$char);
+			$label = $this->contact->params->get('link'.$char.'_name');
+
+			if (!$link) :
+				continue;
+			endif;
+
+			// Add 'http://' if not present
+			$link = (0 === strpos($link, 'http')) ? $link : 'http://'.$link;
+
+			// If no label is present, take the link
+			$label = $label ?: $link;
+			?>
+			<li>
+				<a href="<?php echo $link; ?>">
+					<?php echo $label; ?>
+				</a>
+			</li>
+		<?php endforeach; ?>
+	</ul>
+</div>
diff --git a/core/templates/beez3/html/com_contact/contact/default_profile.php b/core/templates/beez3/html/com_contact/contact/default_profile.php
new file mode 100644
index 00000000..e0fb921a
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default_profile.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<?php if (JPluginHelper::isEnabled('user', 'profile')) :
+	$fields = $this->item->profile->getFieldset('profile'); ?>
+<div class="contact-profile" id="users-profile-custom">
+	<dl class="dl-horizontal">
+	<?php foreach ($fields as $profile) :
+		if ($profile->value) :
+			echo '<dt>'.$profile->label.'</dt>';
+			$profile->text = htmlspecialchars($profile->value, ENT_COMPAT, 'UTF-8');
+
+			switch ($profile->id) :
+				case 'profile_website' :
+					$v_http = substr($profile->profile_value, 0, 4);
+
+					if ($v_http === 'http') :
+						echo '<dd><a href="'.$profile->text.'">'.$profile->text.'</a></dd>';
+					else :
+						echo '<dd><a href="http://'.$profile->text.'">'.$profile->text.'</a></dd>';
+					endif;
+					break;
+
+				default:
+					echo '<dd>'.$profile->text.'</dd>';
+					break;
+			endswitch;
+		endif;
+	endforeach; ?>
+	</dl>
+</div>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_contact/contact/default_user_custom_fields.php b/core/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
new file mode 100644
index 00000000..21379a6c
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/default_user_custom_fields.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_contact
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$params             = $this->params;
+
+$displayGroups      = $params->get('show_user_custom_fields');
+$userFieldGroups    = array();
+?>
+
+<?php if (!$displayGroups || !$this->contactUser) : ?>
+	<?php return; ?>
+<?php endif; ?>
+
+<?php foreach ($this->contactUser->jcfields as $field) :?>
+	<?php if (!in_array('-1', $displayGroups) && (!$field->group_id || !in_array($field->group_id, $displayGroups))) : ?>
+		<?php continue; ?>
+	<?php endif; ?>
+	<?php if (!array_key_exists($field->group_title, $userFieldGroups)) : ?>
+		<?php $userFieldGroups[$field->group_title] = array();?>
+	<?php endif; ?>
+	<?php $userFieldGroups[$field->group_title][] = $field;?>
+<?php endforeach; ?>
+
+<?php foreach ($userFieldGroups as $groupTitle => $fields) :?>
+	<?php $id = JApplicationHelper::stringURLSafe($groupTitle); ?>
+	<?php if ($this->params->get('presentation_style') === 'sliders') :
+		echo JHtml::_('sliders.panel', $groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+		<?php echo JHtmlTabs::panel($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS'), 'display-' . $id); ?>
+	<?php endif; ?>
+	<?php if ($this->params->get('presentation_style') === 'plain'):?>
+		<?php echo '<h3>' . ($groupTitle ?: JText::_('COM_CONTACT_USER_FIELDS')) . '</h3>'; ?>
+	<?php endif; ?>
+
+	<div class="contact-profile" id="user-custom-fields-<?php echo $id; ?>">
+		<dl class="dl-horizontal">
+		<?php foreach ($fields as $field) :?>
+			<?php if (!$field->value) : ?>
+				<?php continue; ?>
+			<?php endif; ?>
+
+			<?php echo '<dt>' . $field->label . '</dt>'; ?>
+			<?php echo '<dd>' . $field->value . '</dd>'; ?>
+		<?php endforeach; ?>
+		</dl>
+	</div>
+
+<?php endforeach; ?>
diff --git a/core/templates/beez3/html/com_contact/contact/encyclopedia.php b/core/templates/beez3/html/com_contact/contact/encyclopedia.php
new file mode 100644
index 00000000..f86a6955
--- /dev/null
+++ b/core/templates/beez3/html/com_contact/contact/encyclopedia.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$cparams = JComponentHelper::getParams('com_media');
+?>
+<div class="contact<?php echo $this->pageclass_sfx?>">
+		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid);?>
+		<h3>
+			<span class="contact-category"><a href="<?php echo $contactLink; ?>">
+				<?php echo $this->escape($this->contact->category_title); ?></a>
+			</span>
+		</h3>
+	<?php if ($this->contact->name && $this->params->get('show_name')) : ?>
+		<h2>
+			<span class="contact-name"><?php echo $this->contact->name; ?></span>
+		</h2>
+	<?php endif;  ?>
+
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
+	<div class="encyclopedia_col1">
+		<?php if ($this->contact->image ) : ?>
+			<div class="contact-image">
+			<?php // We are going to use the contact address field for the main image caption.
+				// If we have a caption load the caption behavior. ?>
+			<?php if ($this->contact->address)
+			{
+				JHtml::_('behavior.caption');
+			}?>
+				<?php echo JHtml::_('image', $this->contact->image, $this->contact->name, array('align' => 'middle', 'class' => 'caption', 'title' => $this->contact->address)); ?>
+			</div>
+		<?php endif; ?>
+	</div>
+	<div class="encyclopedia_col2">
+		<?php // We are going to use some of the standard content fields in non standard ways. ?>
+				<div class="contact-miscinfo">
+
+						<div class="contact-misc">
+							<?php echo $this->contact->misc; ?>
+						</div>
+					</div>
+
+
+		<?php //Let's use position for the scientific name. ?>
+		<?php if ($this->contact->con_position && $this->params->get('show_position')) : ?>
+			<p class="contact-position"><?php echo $this->contact->con_position; ?></p>
+		<?php endif; ?>
+		<?php //Let's use state to put the family name.  ?>
+		<?php if ($this->contact->state && $this->params->get('show_state')) : ?>
+			<p class="contact-state"><?php echo $this->contact->state; ?></p>
+		<?php endif; ?>
+		<?php // Let's use country to list the main countries it grows in. ?>
+		<?php if ($this->contact->country && $this->params->get('show_country')) : ?>
+			<p class="contact-country"><?php echo $this->contact->country; ?></p>
+		<?php endif; ?>
+	</div>
+
+<div class="clr"> </div>
+	<?php  if ($this->params->get('presentation_style') !== 'plain'):?>
+		<?php  echo  JHtml::_($this->params->get('presentation_style').'.start', 'contact-slider'); ?>
+	<?php endif ?>
+<div class="encyclopedia_links">
+<?php echo $this->loadTemplate('links'); ?>
+
+</div>
+	<?php if ($this->params->get('presentation_style') !== 'plain'):?>
+			<?php echo JHtml::_($this->params->get('presentation_style').'.end'); ?>
+			<?php endif; ?>
+</div>
+<?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/core/templates/beez3/html/com_content/archive/default.php b/core/templates/beez3/html/com_content/archive/default.php
new file mode 100644
index 00000000..e083dd23
--- /dev/null
+++ b/core/templates/beez3/html/com_content/archive/default.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.beez5
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+if (!$templateparams->get('html5', 0))
+{
+	require JPATH_BASE.'/components/com_content/views/archive/tmpl/default.php';
+	//evtl. ersetzen durch JPATH_COMPONENT.'/views/...'
+} else {
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+?><div class="archive<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<form id="adminForm" action="<?php echo JRoute::_('index.php')?>" method="post">
+	<fieldset class="filters">
+	<legend class="hidelabeltxt"><?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?></legend>
+	<div class="filter-search">
+		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
+		<label class="filter-search-lbl" for="filter-search"><?php echo JText::_('COM_CONTENT_'.$this->params->get('filter_field').'_FILTER_LABEL').'&#160;'; ?></label>
+		<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->filter); ?>" class="inputbox" onchange="document.getElementById('adminForm').submit();" />
+		<?php endif; ?>
+
+		<?php echo $this->form->monthField; ?>
+		<?php echo $this->form->yearField; ?>
+		<?php echo $this->form->limitField; ?>
+		<button type="submit" class="button"><?php echo JText::_('JGLOBAL_FILTER_BUTTON'); ?></button>
+	</div>
+	<input type="hidden" name="view" value="archive" />
+	<input type="hidden" name="option" value="com_content" />
+	<input type="hidden" name="limitstart" value="0" />
+	</fieldset>
+
+	<?php echo $this->loadTemplate('items'); ?>
+</form>
+</div>
+<?php } ?>
diff --git a/core/templates/beez3/html/com_content/archive/default_items.php b/core/templates/beez3/html/com_content/archive/default_items.php
new file mode 100644
index 00000000..c1724cca
--- /dev/null
+++ b/core/templates/beez3/html/com_content/archive/default_items.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.beez5
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+if (!$templateparams->get('html5', 0))
+{
+	require JPATH_BASE.'/components/com_content/views/archive/tmpl/default_items.php';
+	//evtl. ersetzen durch JPATH_COMPONENT.'/views/...'
+} else {
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+$params = &$this->params;
+?>
+<ul id="archive-items">
+<?php foreach ($this->items as $i => $item) : ?>
+	<li class="row<?php echo $i % 2; ?>">
+
+		<h2>
+		<?php if ($params->get('link_titles')) : ?>
+			<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)); ?>">
+				<?php echo $this->escape($item->title); ?></a>
+		<?php else: ?>
+				<?php echo $this->escape($item->title); ?>
+		<?php endif; ?>
+		</h2>
+
+
+<?php if ($params->get('show_author') or $params->get('show_parent_category') or $params->get('show_category') or $params->get('show_create_date') or $params->get('show_modify_date') or $params->get('show_publish_date') or $params->get('show_hits')) : ?>
+ <dl class="article-info">
+ <dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+<?php endif; ?>
+<?php if ($params->get('show_parent_category')) : ?>
+		<dd class="parent-category-name">
+			<?php	$title = $this->escape($item->parent_title);
+					$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($item->parent_slug)).'">'.$title.'</a>';?>
+			<?php if ($item->parent_slug && $params->get('link_parent_category')) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+
+<?php if ($params->get('show_category')) : ?>
+		<dd class="category-name">
+			<?php	$title = $this->escape($item->category_title);
+					$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug)) . '">' . $title . '</a>'; ?>
+			<?php if ($item->catslug && $params->get('link_category')) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_create_date')) : ?>
+		<dd class="create">
+		<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_modify_date')) : ?>
+		<dd class="modified">
+		<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_publish_date')) : ?>
+		<dd class="published">
+		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if (!empty($item->author) && $params->get('show_author')) : ?>
+	<dd class="createdby">
+		<?php $author = $item->created_by_alias ?: $item->author; ?>
+			<?php if (!empty($item->contact_link ) &&  $params->get('link_author') == true):?>
+				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $item->contact_link, $author)); ?>
+			<?php else :?>
+				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+			<?php endif; ?>
+	</dd>
+<?php endif; ?>
+<?php if ($params->get('show_hits')) : ?>
+		<dd class="hits">
+		<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_author') or $params->get('show_category') or $params->get('show_create_date') or $params->get('show_modify_date') or $params->get('show_publish_date') or $params->get('show_hits')) :?>
+	 </dl>
+<?php endif; ?>
+
+<?php  if ($params->get('show_intro')) :?>
+		<div class="intro">
+			<?php echo JHtml::_('string.truncate', $item->introtext, $params->get('introtext_limit')); ?>
+		</div>
+
+		<?php endif; ?>
+	</li>
+<?php endforeach; ?>
+</ul>
+<div id="pagination">
+	<span><?php echo $this->pagination->getPagesLinks(); ?></span>
+	<span><?php echo $this->pagination->getPagesCounter(); ?></span>
+</div>
+<?php } ?>
diff --git a/core/templates/beez3/html/com_content/article/default.php b/core/templates/beez3/html/com_content/article/default.php
new file mode 100644
index 00000000..74797563
--- /dev/null
+++ b/core/templates/beez3/html/com_content/article/default.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app            = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+$images         = json_decode($this->item->images);
+$urls           = json_decode($this->item->urls);
+$user           = JFactory::getUser();
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+
+// Create shortcut to parameters.
+$params = $this->item->params;
+
+$accessEdit    = $params->get('access-edit');
+$showPrintIcon = $params->get('show_print_icon');
+$showEmailIcon = $params->get('show_email_icon');
+
+?>
+<article class="item-page<?php echo $this->pageclass_sfx?>">
+<?php if ($showPageHeading = $this->params->get('show_page_heading')) : ?>
+
+<?php if ($showPageHeading and $params->get('show_title')) :?>
+<hgroup>
+<?php endif; ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<?php
+if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative)
+{
+	echo $this->item->pagination;
+}
+
+if ($params->get('show_title')) : ?>
+		<h2>
+			<?php echo $this->escape($this->item->title); ?>
+		</h2>
+<?php endif; ?>
+<?php if ($showPageHeading and $params->get('show_title')) :?>
+</hgroup>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+<div class="pull-left"><?php echo $this->item->event->afterDisplayTitle; ?></div>
+
+<?php
+
+if ($accessEdit || $showPrintIcon || $showEmailIcon) : ?>
+		<ul class="actions">
+		<?php if (!$this->print) : ?>
+				<?php if ($showPrintIcon) : ?>
+				<li class="print-icon">
+						<?php echo JHtml::_('icon.print_popup', $this->item, $params, array(), true); ?>
+				</li>
+				<?php endif; ?>
+
+				<?php if ($showEmailIcon) : ?>
+				<li class="email-icon">
+						<?php echo JHtml::_('icon.email', $this->item, $params, array(), true); ?>
+				</li>
+				<?php endif; ?>
+				<?php if ($this->user->authorise('core.edit', 'com_content.article.' . $this->item->id)) : ?>
+						<li class="edit-icon">
+							<?php echo JHtml::_('icon.edit', $this->item, $params, array(), true); ?>
+						</li>
+					<?php endif; ?>
+		<?php else : ?>
+				<li>
+						<?php echo JHtml::_('icon.print_screen', $this->item, $params, array(), true); ?>
+				</li>
+		<?php endif; ?>
+		</ul>
+<?php endif; ?>
+
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php $useDefList = ($params->get('show_author') or $params->get('show_category') or $params->get('show_parent_category')
+	or $params->get('show_create_date') or $params->get('show_modify_date') or $params->get('show_publish_date')
+	or $params->get('show_hits')); ?>
+
+<?php if ($useDefList) : ?>
+ <dl class="article-info">
+ <dt class="article-info-term"><?php  echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+<?php endif; ?>
+<?php if ($this->item->parent_slug !== '1:root' && $params->get('show_parent_category')) : ?>
+		<dd class="parent-category-name">
+			<?php 	$title = $this->escape($this->item->parent_title);
+					$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)) . '">' . $title . '</a>';?>
+			<?php if ($params->get('link_parent_category') and $this->item->parent_slug) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_category')) : ?>
+		<dd class="category-name">
+			<?php 	$title = $this->escape($this->item->category_title);
+					$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug)) . '">' . $title . '</a>';?>
+			<?php if ($params->get('link_category') and $this->item->catslug) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_create_date')) : ?>
+		<dd class="create">
+		<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_modify_date')) : ?>
+		<dd class="modified">
+		<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_publish_date')) : ?>
+		<dd class="published">
+		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if (!empty($this->item->author) && $params->get('show_author')) : ?>
+	<dd class="createdby">
+		<?php $author = $this->item->created_by_alias ?: $this->item->author; ?>
+		<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+		<?php else : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+		<?php endif; ?>
+	</dd>
+<?php endif; ?>
+<?php if ($params->get('show_hits')) : ?>
+		<dd class="hits">
+		<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($useDefList) : ?>
+ </dl>
+<?php endif; ?>
+
+	<?php if (isset ($this->item->toc)) : ?>
+		<?php echo $this->item->toc; ?>
+	<?php endif; ?>
+
+<?php if (isset($urls) AND ((!empty($urls->urls_position) AND ($urls->urls_position == '0')) OR ($params->get('urls_position') == '0' AND empty($urls->urls_position)))
+		OR (empty($urls->urls_position) AND (!$params->get('urls_position')))) : ?>
+
+	<?php echo $this->loadTemplate('links'); ?>
+<?php endif; ?>
+	<?php  if (isset($images->image_fulltext) and !empty($images->image_fulltext)) : ?>
+	<?php $imgfloat = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
+
+	<div class="img-fulltext-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>">
+	<img
+		<?php if ($images->image_fulltext_caption):
+			echo 'class="caption"'.' title="' .htmlspecialchars($images->image_fulltext_caption, ENT_COMPAT, 'UTF-8') .'"';
+		endif; ?>
+		src="<?php echo htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt, ENT_COMPAT, 'UTF-8'); ?>"/>
+	</div>
+	<?php endif; ?>
+<?php
+if (!empty($this->item->pagination) AND $this->item->pagination AND !$this->item->paginationposition AND !$this->item->paginationrelative):
+	echo $this->item->pagination;
+endif;
+?>
+<?php if ($params->get('access-view')):?>
+	<?php echo $this->item->text; ?>
+	<?php // Optional teaser intro text for guests ?>
+	<?php elseif ($params->get('show_noauth') == true && $user->get('guest')) : ?>
+		<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
+	<?php echo JHtml::_('content.prepare', $this->item->introtext); ?>
+	<?php // Optional link to let them register to see the whole article. ?>
+	<?php if ($this->item->fulltext != null && $params->get('show_readmore')) : ?>
+		<?php $menu = JFactory::getApplication()->getMenu(); ?>
+		<?php $active = $menu->getActive(); ?>
+		<?php $itemId = $active->id; ?>
+		<?php $link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false)); ?>
+		<?php $link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language))); ?>
+		<p class="readmore">
+			<a href="<?php echo $link; ?>" class="register">
+			<?php $attribs = json_decode($this->item->attribs); ?>
+			<?php if ($attribs->alternative_readmore == null) : ?>
+				<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
+			<?php elseif ($readmore = $attribs->alternative_readmore) : ?>
+				<?php echo $readmore; ?>
+				<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
+					<?php echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit')); ?>
+				<?php endif; ?>
+			<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); ?>
+			<?php else : ?>
+				<?php echo JText::_('COM_CONTENT_READ_MORE'); ?>
+				<?php echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit')); ?>
+			<?php endif; ?>
+			</a>
+		</p>
+	<?php endif; ?>
+<?php endif; ?>
+<?php // TAGS ?>
+<?php if (!empty($this->item->tags->itemTags) && $params->get('show_tags', 1)) : ?>
+	<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+	<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+<?php endif; ?>
+<?php if (!empty($this->item->pagination) AND $this->item->pagination AND $this->item->paginationposition AND!$this->item->paginationrelative) : ?>
+	<?php echo $this->item->pagination; ?>
+<?php endif; ?>
+	<?php if (isset($urls) AND ((!empty($urls->urls_position) AND ($urls->urls_position == '1')) OR ( $params->get('urls_position') == '1'))) : ?>
+		<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+<?php if (!empty($this->item->pagination) AND $this->item->pagination AND $this->item->paginationposition AND $this->item->paginationrelative) : ?>
+	<?php echo $this->item->pagination; ?>
+<?php endif; ?>
+	<?php echo $this->item->event->afterDisplayContent; ?>
+</article>
diff --git a/core/templates/beez3/html/com_content/article/default_links.php b/core/templates/beez3/html/com_content/article/default_links.php
new file mode 100644
index 00000000..3cec787d
--- /dev/null
+++ b/core/templates/beez3/html/com_content/article/default_links.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create shortcut
+$urls = json_decode($this->item->urls);
+
+// Create shortcuts to some parameters.
+$params = $this->item->params;
+if ($urls && (!empty($urls->urla) || !empty($urls->urlb) || !empty($urls->urlc))) :
+?>
+<div class="content-links">
+	<ul class="nav nav-tabs nav-stacked">
+		<?php
+			$urlarray = array(
+			array($urls->urla, $urls->urlatext, $urls->targeta, 'a'),
+			array($urls->urlb, $urls->urlbtext, $urls->targetb, 'b'),
+			array($urls->urlc, $urls->urlctext, $urls->targetc, 'c')
+			);
+			foreach ($urlarray as $url) :
+				$link = $url[0];
+				$label = $url[1];
+				$target = $url[2];
+				$id = $url[3];
+
+				if (!$link) :
+					continue;
+				endif;
+
+				// If no label is present, take the link
+				$label = $label ?: $link;
+
+				// If no target is present, use the default
+				$target = $target ?: $params->get('target'.$id);
+				?>
+			<li class="content-links-<?php echo $id; ?>">
+				<?php
+					// Compute the correct link
+
+					switch ($target)
+					{
+						case 1:
+							// open in a new window
+							echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" target="_blank"  rel="nofollow noopener noreferrer">' .
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') .'</a>';
+							break;
+
+						case 2:
+							// open in a popup window
+							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=600,height=600';
+							echo "<a href=\"" . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . "\" onclick=\"window.open(this.href, 'targetWindow', '".$attribs."'); return false;\" rel=\"noopener noreferrer\">".
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8').'</a>';
+							break;
+						case 3:
+							// open in a modal window
+							JHtml::_('behavior.modal', 'a.modal');
+							echo '<a class="modal" href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '"  rel="{handler: \'iframe\', size: {x:600, y:600}} noopener noreferrer">'.
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
+							break;
+
+						default:
+							// open in parent window
+							echo '<a href="' .  htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="nofollow">'.
+								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
+							break;
+					}
+				?>
+				</li>
+		<?php endforeach; ?>
+	</ul>
+</div>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_content/categories/default.php b/core/templates/beez3/html/com_content/categories/default.php
new file mode 100644
index 00000000..0833461c
--- /dev/null
+++ b/core/templates/beez3/html/com_content/categories/default.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.beez5
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<?php if ($this->params->get('show_base_description')) : ?>
+	<?php 	//If there is a description in the menu parameters use that; ?>
+		<?php if ($this->params->get('categories_description')) : ?>
+			<?php echo  JHtml::_('content.prepare', $this->params->get('categories_description'), '', 'com_content.categories'); ?>
+		<?php  else: ?>
+			<?php //Otherwise get one from the database if it exists. ?>
+			<?php  if ($this->parent->description) : ?>
+				<div class="category-desc">
+					<?php  echo JHtml::_('content.prepare', $this->parent->description, '', 'com_content.categories'); ?>
+				</div>
+			<?php  endif; ?>
+		<?php  endif; ?>
+<?php endif; ?>
+<?php
+echo $this->loadTemplate('items');
+?>
+</div>
+
diff --git a/core/templates/beez3/html/com_content/categories/default_items.php b/core/templates/beez3/html/com_content/categories/default_items.php
new file mode 100644
index 00000000..537b9add
--- /dev/null
+++ b/core/templates/beez3/html/com_content/categories/default_items.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// no direct access
+defined('_JEXEC') or die;
+$class = ' class="first"';
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
+	if (!isset($this->items[$this->parent->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+	<?php $class = ''; ?>
+		<h3 class="item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id));?>">
+			<?php echo $this->escape($item->title); ?></a>
+		</h3>
+
+		<?php if ($this->params->get('show_subcat_desc_cat') == 1) :?>
+		<?php if ($item->description) : ?>
+			<div class="category-desc">
+				<?php echo JHtml::_('content.prepare', $item->description); ?>
+			</div>
+		<?php endif; ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('show_cat_num_articles_cat') == 1) :?>
+			<dl class="article-count"><dt>
+				<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?></dt>
+				<dd><?php echo $item->numitems; ?></dd>
+			</dl>
+		<?php endif; ?>
+
+		<?php if (count($item->getChildren()) > 0) :
+			$this->items[$item->id] = $item->getChildren();
+			$this->parent = $item;
+			$this->maxLevelcat--;
+			echo $this->loadTemplate('items');
+			$this->parent = $item->getParent();
+			$this->maxLevelcat++;
+		endif; ?>
+
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_content/category/blog.php b/core/templates/beez3/html/com_content/category/blog.php
new file mode 100644
index 00000000..b304e434
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/blog.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+
+$cparams = JComponentHelper::getParams('com_media');
+
+// If the page class is defined, add to class as suffix.
+// It will be a separate class if the user starts it with a space
+?>
+<section class="blog<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading') != 0) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<?php if ($this->params->get('show_category_title')) : ?>
+<h2 class="subheading-category">
+	<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_content.category.title'); ?>
+</h2>
+<?php endif; ?>
+
+<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+	<div class="category-desc">
+	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+	<?php endif; ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
+	<?php endif; ?>
+	<div class="clr"></div>
+	</div>
+<?php endif; ?>
+
+<?php if (empty($this->lead_items) && empty($this->link_items) && empty($this->intro_items)) : ?>
+	<?php if ($this->params->get('show_no_articles', 1)) : ?>
+		<p><?php echo JText::_('COM_CONTENT_NO_ARTICLES'); ?></p>
+	<?php endif; ?>
+<?php endif; ?>
+
+<?php $leadingcount = 0; ?>
+<?php if (!empty($this->lead_items)) : ?>
+<div class="items-leading">
+	<?php foreach ($this->lead_items as &$item) : ?>
+		<article class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? 'system-unpublished' : null; ?>">
+			<?php
+				$this->item = &$item;
+				echo $this->loadTemplate('item');
+			?>
+		</article>
+		<?php $leadingcount++; ?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>
+<?php if (!empty($this->intro_items)) : ?>
+	<?php $introcount = count($this->intro_items); ?>
+	<?php $counter = 0; ?>
+	<?php foreach ($this->intro_items as $key => &$item) : ?>
+		<?php $rowcount = ((int) $key % (int) $this->columns) + 1; ?>
+		<?php if ($rowcount === 1) : ?>
+			<?php $row = $counter / $this->columns; ?>
+			<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-'.$row; ?>">
+		<?php endif; ?>
+		<article class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>">
+		<?php
+			$this->item = &$item;
+			echo $this->loadTemplate('item');
+		?>
+		</article>
+		<?php $counter++; ?>
+		<?php if ($rowcount === (int) $this->columns or $counter === $introcount) : ?>
+			<span class="row-separator"></span>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+
+<?php endif; ?>
+
+<?php if (!empty($this->link_items)) : ?>
+	<?php echo $this->loadTemplate('links'); ?>
+<?php endif; ?>
+
+<?php if ($this->params->get('maxLevel') != 0 && is_array($this->children[$this->category->id]) && count($this->children[$this->category->id]) > 0) : ?>
+	<div class="cat-children">
+
+	<?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
+		<h3>
+			<?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
+		</h3>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('children'); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ($this->pagination->pagesTotal > 1 && ($this->params->def('show_pagination', 1) == 1 || $this->params->get('show_pagination') == 2)) : ?>
+	<div class="pagination">
+	<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+		<p class="counter">
+		<?php echo $this->pagination->getPagesCounter(); ?>
+		</p>
+	<?php endif; ?>
+	<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+<?php endif; ?>
+
+</section>
diff --git a/core/templates/beez3/html/com_content/category/blog_children.php b/core/templates/beez3/html/com_content/category/blog_children.php
new file mode 100644
index 00000000..707ac210
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/blog_children.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+$class  = ' class="first"';
+$user   = JFactory::getUser();
+$groups = $user->getAuthorisedViewLevels();
+?>
+
+<?php if (count($this->children[$this->category->id]) > 0) : ?>
+
+	<ul>
+	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+		<?php // Check whether category access level allows access to subcategories. ?>
+		<?php if (in_array($child->access, $groups)) : ?>
+			<?php
+			if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
+				if (!isset($this->children[$this->category->id][$id + 1])) :
+					$class = ' class="last"';
+				endif;
+			?>
+				<li<?php echo $class; ?>>
+				<?php $class = ''; ?>
+					<span class="item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+						<?php echo $this->escape($child->title); ?></a>
+					</span>
+
+					<?php if ($this->params->get('show_subcat_desc') == 1) :?>
+						<?php if ($child->description) : ?>
+							<div class="category-desc">
+								<?php echo JHtml::_('content.prepare', $child->description, '', 'com_content.category'); ?>
+							</div>
+						<?php endif; ?>
+					<?php endif; ?>
+
+					<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+						<dl>
+							<dt>
+								<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>
+							</dt>
+							<dd>
+								<?php echo $child->getNumItems(true); ?>
+							</dd>
+						</dl>
+					<?php endif; ?>
+
+					<?php if (count($child->getChildren()) > 0):
+						$this->children[$child->id] = $child->getChildren();
+						$this->category = $child;
+						$this->maxLevel--;
+						if ($this->maxLevel !== 0) :
+							echo $this->loadTemplate('children');
+						endif;
+						$this->category = $child->getParent();
+						$this->maxLevel++;
+					endif; ?>
+				</li>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_content/category/blog_item.php b/core/templates/beez3/html/com_content/category/blog_item.php
new file mode 100644
index 00000000..d3a47913
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/blog_item.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('_JEXEC') or die;
+
+$params = &$this->item->params;
+$images = json_decode($this->item->images);
+$app = JFactory::getApplication();
+$canEdit = $this->item->params->get('access-edit');
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+?>
+
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
+<div class="system-unpublished">
+<?php endif; ?>
+<?php if ($params->get('show_title')) : ?>
+	<h2>
+		<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+			<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); ?>">
+			<?php echo $this->escape($this->item->title); ?></a>
+		<?php else : ?>
+			<?php echo $this->escape($this->item->title); ?>
+		<?php endif; ?>
+	</h2>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+<div class="pull-left"><?php echo $this->item->event->afterDisplayTitle; ?></div>
+
+<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+	<ul class="actions">
+		<?php if ($params->get('show_print_icon')) : ?>
+		<li class="print-icon">
+			<?php echo JHtml::_('icon.print_popup', $this->item, $params, array(), true); ?>
+		</li>
+		<?php endif; ?>
+		<?php if ($params->get('show_email_icon')) : ?>
+		<li class="email-icon">
+			<?php echo JHtml::_('icon.email', $this->item, $params, array(), true); ?>
+		</li>
+		<?php endif; ?>
+		<?php if ($canEdit) : ?>
+		<li class="edit-icon">
+			<?php echo JHtml::_('icon.edit', $this->item, $params, array(), true); ?>
+		</li>
+		<?php endif; ?>
+	</ul>
+<?php endif; ?>
+
+<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php // to do not that elegant would be nice to group the params ?>
+
+<?php if ($params->get('show_author') || $params->get('show_category') || $params->get('show_create_date') || $params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_parent_category') || $params->get('show_hits')) : ?>
+	<dl class="article-info">
+	<dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+<?php endif; ?>
+<?php if ($params->get('show_parent_category') && $this->item->parent_id != 1) : ?>
+		<dd class="parent-category-name">
+			<?php $title = $this->escape($this->item->parent_title);
+				$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_id)) . '">' . $title . '</a>'; ?>
+			<?php if ($params->get('link_parent_category')) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_category')) : ?>
+		<dd class="category-name">
+			<?php $title = $this->escape($this->item->category_title);
+					$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catid)) . '">' . $title . '</a>'; ?>
+			<?php if ($params->get('link_category')) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_create_date')) : ?>
+		<dd class="create">
+		<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_modify_date')) : ?>
+		<dd class="modified">
+		<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_publish_date')) : ?>
+		<dd class="published">
+		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+	<dd class="createdby">
+		<?php $author = $this->item->created_by_alias ?: $this->item->author; ?>
+		<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+		<?php else :?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+		<?php endif; ?>
+	</dd>
+<?php endif; ?>
+<?php if ($params->get('show_hits')) : ?>
+		<dd class="hits">
+		<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_author') || $params->get('show_category') || $params->get('show_create_date') || $params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_parent_category') || $params->get('show_hits')) :?>
+	</dl>
+<?php endif; ?>
+<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
+	<?php $imgfloat = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro; ?>
+	<div class="img-intro-<?php echo htmlspecialchars($imgfloat); ?>">
+	<img
+		<?php if ($images->image_intro_caption):
+			echo 'class="caption"'.' title="' . htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8') . '"';
+		endif; ?>
+		src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8'); ?>"/>
+	</div>
+<?php endif; ?>
+<?php echo $this->item->introtext; ?>
+
+<?php if ($params->get('show_readmore') && $this->item->readmore) :
+	if ($params->get('access-view')) :
+		$link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language));
+	else :
+		$menu = JFactory::getApplication()->getMenu();
+		$active = $menu->getActive();
+		$itemId = $active->id;
+		$link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false));
+		$link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)));
+	endif;
+?>
+		<p class="readmore">
+				<a href="<?php echo $link; ?>">
+					<?php if (!$params->get('access-view')) :
+						echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE');
+					elseif ($readmore = $this->item->alternative_readmore) :
+						echo $readmore;
+						if ($params->get('show_readmore_title', 0) != 0) :
+							echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
+						endif;
+					elseif ($params->get('show_readmore_title', 0) == 0) :
+						echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
+					else :
+						echo JText::_('COM_CONTENT_READ_MORE');
+						echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
+					endif; ?></a>
+		</p>
+<?php endif; ?>
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
+</div>
+<?php endif; ?>
+
+<div class="item-separator"></div>
+<?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/core/templates/beez3/html/com_content/category/blog_links.php b/core/templates/beez3/html/com_content/category/blog_links.php
new file mode 100644
index 00000000..7bcdad86
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/blog_links.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$params = &$this->item->params;
+$app = JFactory::getApplication();
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+?>
+
+<div class="items-more">
+	<h3><?php echo JText::_('COM_CONTENT_MORE_ARTICLES'); ?></h3>
+	<ol>
+	<?php foreach ($this->link_items as &$item) : ?>
+		<li>
+			<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)); ?>">
+			<?php echo $item->title; ?></a>
+		</li>
+	<?php endforeach; ?>
+	</ol>
+</div>
diff --git a/core/templates/beez3/html/com_content/category/default.php b/core/templates/beez3/html/com_content/category/default.php
new file mode 100644
index 00000000..db7f6a1c
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/default.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app            = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+
+$showCategoryTitle            = $this->params->get('show_category_title') == 1;
+$showCategoryHeadingTitleText = $this->params->get('show_category_heading_title_text', 1) == 1;
+$pageSubHeading               = $this->params->get('page_subheading');
+?>
+<section class="category-list<?php echo $this->pageclass_sfx;?>">
+<?php
+if ($showPageHeading = $this->params->get('show_page_heading')) : ?>
+<?php if ($showPageHeading and ($showCategoryTitle === true or $pageSubHeading)) : ?>
+<hgroup>
+<?php endif; ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<?php if ($showCategoryTitle === true or $pageSubHeading) : ?>
+<h2>
+	<?php echo $this->escape($pageSubHeading); ?>
+	<?php if ($showCategoryTitle === true)
+	{
+		echo '<span class="subheading-category">'.JHtml::_('content.prepare', $this->category->title, '', 'com_content.category.title').'</span>';
+	}
+	?>
+</h2>
+<?php if ($this->params->get('show_page_heading') and ($this->params->get('show_category_title', 1) or $pageSubHeading)) : ?>
+</hgroup>
+<?php endif; ?>
+<?php endif; ?>
+
+<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+	<div class="category-desc">
+	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+	<?php endif; ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
+	<?php endif; ?>
+	<div class="clr"></div>
+	</div>
+<?php endif; ?>
+
+<?php if ($this->params->get('maxLevel') != 0 && is_array($this->children[$this->category->id]) && count($this->children[$this->category->id]) > 0) : ?>
+	<div class="cat-children">
+
+	<?php if ($showCategoryTitle === true or $pageSubHeading)
+	{
+		echo '<h3>';
+	}
+	elseif ($showCategoryHeadingTitleText === true)
+	{
+		echo '<h2>';
+	} ?>
+	<?php if ($showCategoryHeadingTitleText === true) : ?>
+		<?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
+	<?php endif; ?>
+	<?php if ($showCategoryTitle === true or $pageSubHeading)
+	{
+		echo '</h3>';
+	}
+	elseif ($showCategoryHeadingTitleText === true)
+	{
+		echo '</h2>';
+	} ?>
+	</div>
+	<?php endif; ?>
+	<?php echo $this->loadTemplate('children'); ?>
+	<div class="cat-items">
+		<?php echo $this->loadTemplate('articles'); ?>
+	</div>
+</section>
diff --git a/core/templates/beez3/html/com_content/category/default_articles.php b/core/templates/beez3/html/com_content/category/default_articles.php
new file mode 100644
index 00000000..20e525b3
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/default_articles.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.framework');
+
+$params    = &$this->item->params;
+$n         = count($this->items);
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+// Check for at least one editable article
+$isEditable = false;
+
+if (!empty($this->items))
+{
+	foreach ($this->items as $article)
+	{
+		if ($article->params->get('access-edit'))
+		{
+			$isEditable = true;
+			break;
+		}
+	}
+}
+?>
+
+<?php if (empty($this->items)) : ?>
+
+	<?php if ($this->params->get('show_no_articles', 1)) : ?>
+		<p><?php echo JText::_('COM_CONTENT_NO_ARTICLES'); ?></p>
+	<?php endif; ?>
+
+<?php else : ?>
+
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if ($this->params->get('filter_field') !== 'hide') : ?>
+	<fieldset class="filters">
+		<legend class="hidelabeltxt">
+			<?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?>
+		</legend>
+		<?php if ($this->params->get('filter_field') !== 'tag') :?>
+		<div class="filter-search">
+			<label class="filter-search-lbl element-invisible" for="filter-search">
+				<?php echo JText::_('COM_CONTENT_'.$this->params->get('filter_field').'_FILTER_LABEL').'&#160;'; ?>
+			</label>
+			<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTENT_'.$this->params->get('filter_field').'_FILTER_LABEL'); ?>" />
+		</div>
+		<?php else :?>
+		<div class="filter-search">
+			<select name="filter_tag" id="filter_tag" onchange="document.adminForm.submit();" >
+				<option value=""><?php echo JText::_('JOPTION_SELECT_TAG'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('tag.options', true, true), 'value', 'text', $this->state->get('filter.tag')); ?>
+			</select>
+		</div>
+		<?php endif; ?>
+	<?php endif; ?>
+
+	<?php if ($this->params->get('show_pagination_limit')) : ?>
+		<div class="display-limit">
+			<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($this->params->get('filter_field') !== 'hide') :?>
+	</fieldset>
+	<?php endif; ?>
+
+	<div class="clr"></div>
+
+	<table class="category">
+		<?php if ($this->params->get('show_headings')) : ?>
+		<thead>
+			<tr>
+				<th class="list-title" id="tableOrdering">
+					<?php echo JHtml::_('grid.sort', 'COM_CONTENT_HEADING_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+
+				<?php if ($date = $this->params->get('list_show_date')) : ?>
+				<th class="list-date" id="tableOrdering2">
+					<?php if ($date === 'created') : ?>
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_'.$date.'_DATE', 'a.created', $listDirn, $listOrder); ?>
+					<?php elseif ($date === 'modified') : ?>
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_'.$date.'_DATE', 'a.modified', $listDirn, $listOrder); ?>
+					<?php elseif ($date === 'published') : ?>
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_'.$date.'_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
+					<?php endif; ?>
+				</th>
+				<?php endif; ?>
+
+				<?php if ($this->params->get('list_show_author', 1)) : ?>
+				<th class="list-author" id="tableOrdering3">
+					<?php echo JHtml::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif; ?>
+
+				<?php if ($this->params->get('list_show_hits', 1)) : ?>
+				<th class="list-hits" id="tableOrdering4">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_votes', 0) && $this->vote) : ?>
+					<th id="categorylist_header_votes">
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_VOTES', 'rating_count', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_ratings', 0) && $this->vote) : ?>
+					<th id="categorylist_header_ratings">
+						<?php echo JHtml::_('grid.sort', 'COM_CONTENT_RATINGS', 'rating', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($isEditable) : ?>
+					<th id="categorylist_header_edit"><?php echo JText::_('COM_CONTENT_EDIT_ITEM'); ?></th>
+				<?php endif; ?>
+			</tr>
+		</thead>
+		<?php endif; ?>
+
+		<tbody>
+
+			<?php foreach ($this->items as $i => &$article) : ?>
+			<tr class="cat-list-row<?php echo $i % 2; ?>">
+
+				<?php if (in_array($article->access, $this->user->getAuthorisedViewLevels())) : ?>
+
+					<td class="list-title">
+						<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)); ?>">
+							<?php echo $this->escape($article->title); ?></a>
+					</td>
+
+					<?php if ($this->params->get('list_show_date')) : ?>
+					<td class="list-date">
+						<?php
+							echo JHtml::_(
+									'date', $article->displayDate, $this->escape(
+											$this->params->get('date_format', JText::_('DATE_FORMAT_LC3'))
+									)
+							);
+						?>
+					</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('list_show_author', 1)) : ?>
+					<td class="list-author">
+						<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
+							<?php $author = $article->created_by_alias ?: $article->author; ?>
+							<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true):?>
+								<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
+							<?php else :?>
+								<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+							<?php endif; ?>
+						<?php endif; ?>
+					</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('list_show_hits', 1)) : ?>
+					<td class="list-hits">
+						<?php echo $article->hits; ?>
+					</td>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('list_show_votes', 0) && $this->vote) : ?>
+						<td class="list-votes">
+							<?php echo $article->rating_count; ?>
+						</td>
+					<?php endif; ?>
+					<?php if ($this->params->get('list_show_ratings', 0) && $this->vote) : ?>
+						<td class="list-ratings">
+							<?php echo $article->rating; ?>
+						</td>
+					<?php endif; ?>
+					<?php if ($isEditable) : ?>
+						<td class="list-edit">
+							<?php if ($article->params->get('access-edit')) : ?>
+								<?php echo JHtml::_('icon.edit', $article, $params, array(), true); ?>
+							<?php endif; ?>
+						</td>
+					<?php endif; ?>
+				<?php else : ?>
+				<td>
+					<?php
+						echo $this->escape($article->title).' : ';
+						$menu = JFactory::getApplication()->getMenu();
+						$active = $menu->getActive();
+						$itemId = $active->id;
+						$link   = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false));
+						$link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)));
+					?>
+					<a href="<?php echo $link; ?>" class="register">
+					<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?></a>
+				</td>
+				<?php endif; ?>
+
+			</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+<?php endif; ?>
+
+<?php // Code to add a link to submit an article. ?>
+<?php if ($this->category->getParams()->get('access-create')) : ?>
+	<?php echo JHtml::_('icon.create', $this->category, $this->category->params, array(), true); ?>
+<?php  endif; ?>
+
+<?php // Add pagination links ?>
+<?php if (!empty($this->items)) : ?>
+	<?php if (($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
+	<div class="pagination">
+
+		<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+			 <p class="counter">
+				<?php echo $this->pagination->getPagesCounter(); ?>
+			</p>
+		<?php  endif; ?>
+
+		<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+	<?php endif; ?>
+
+	<div>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="filter_order" value="" />
+		<input type="hidden" name="filter_order_Dir" value="" />
+		<input type="hidden" name="limitstart" value="" />
+	</div>
+</form>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_content/category/default_children.php b/core/templates/beez3/html/com_content/category/default_children.php
new file mode 100644
index 00000000..0c81876c
--- /dev/null
+++ b/core/templates/beez3/html/com_content/category/default_children.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+$class  = ' class="first"';
+$user   = JFactory::getUser();
+$groups = $user->getAuthorisedViewLevels();
+?>
+
+<?php if (count($this->children[$this->category->id]) > 0) :?>
+
+	<ul>
+	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+		<?php // Check whether category access level allows access to subcategories. ?>
+		<?php if (in_array($child->access, $groups)) : ?>
+			<?php
+			if ($this->params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) :
+				if (!isset($this->children[$this->category->id][$id + 1])) :
+					$class = ' class="last"';
+				endif;
+			?>
+				<li<?php echo $class; ?>>
+				<?php $class = ''; ?>
+					<h3 class="item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+						<?php echo $this->escape($child->title); ?></a>
+					</h3>
+					<?php if ($this->params->get('show_subcat_desc') == 1) :?>
+						<?php if ($child->description and $this->params->get('show_description') != 0 ) : ?>
+							<div class="category-desc">
+								<?php echo JHtml::_('content.prepare', $child->description, '', 'com_content.category'); ?>
+							</div>
+						<?php endif; ?>
+					<?php endif; ?>
+
+					<?php if ($this->params->get('show_cat_num_articles', 1)) : ?>
+						<?php if ($child->getNumItems() == true) : ?>
+						<dl>
+							<dt>
+								<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>
+							</dt>
+							<dd>
+								<?php echo $child->getNumItems(true); ?>
+							</dd>
+						</dl>
+						<?php endif; ?>
+					<?php endif; ?>
+
+					<?php if (count($child->getChildren()) > 0 ) :
+						$this->children[$child->id] = $child->getChildren();
+						$this->category = $child;
+						$this->maxLevel--;
+						if ($this->maxLevel !== 0) :
+							echo $this->loadTemplate('children');
+						endif;
+						$this->category = $child->getParent();
+						$this->maxLevel++;
+					endif; ?>
+				</li>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_content/featured/default.php b/core/templates/beez3/html/com_content/featured/default.php
new file mode 100644
index 00000000..72e9eb3c
--- /dev/null
+++ b/core/templates/beez3/html/com_content/featured/default.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+
+?>
+
+<section class="blog-featured<?php echo $this->pageclass_sfx;?>">
+<?php if ( $this->params->get('show_page_heading') != 0) : ?>
+	<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>
+<?php endif; ?>
+<?php $leadingcount = 0; ?>
+<?php if (!empty($this->lead_items)) : ?>
+<div class="items-leading">
+	<?php foreach ($this->lead_items as &$item) : ?>
+		<article class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>">
+			<?php
+				$this->item = &$item;
+				echo $this->loadTemplate('item');
+			?>
+		</article>
+		<?php
+			$leadingcount++;
+		?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>
+<?php
+	$introcount = count($this->intro_items);
+	$counter = 0;
+?>
+<?php if (!empty($this->intro_items)) : ?>
+	<?php foreach ($this->intro_items as $key => &$item) : ?>
+
+	<?php
+		$key = ($key - $leadingcount) + 1;
+		$rowcount = (((int) $key - 1) % (int) $this->columns) + 1;
+		$row = $counter / $this->columns;
+
+		if ($rowcount === 1) : ?>
+
+			<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-'.$row; ?>">
+		<?php endif; ?>
+		<article class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished"' : null; ?>">
+			<?php
+					$this->item = &$item;
+					echo $this->loadTemplate('item');
+			?>
+		</article>
+		<?php $counter++; ?>
+			<?php if (($rowcount == $this->columns) or ($counter == $introcount)) : ?>
+				<span class="row-separator"></span>
+				</div>
+
+			<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>
+
+<?php if (!empty($this->link_items)) : ?>
+	<div class="items-more">
+	<?php echo $this->loadTemplate('links'); ?>
+	</div>
+<?php endif; ?>
+
+<?php if ($this->params->def('show_pagination', 2) == 1  || ($this->params->get('show_pagination') == 2 && $this->pagination->pagesTotal > 1)) : ?>
+	<div class="pagination">
+
+		<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+			<p class="counter">
+				<?php echo $this->pagination->getPagesCounter(); ?>
+			</p>
+		<?php  endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+<?php endif; ?>
+</section>
+
+
diff --git a/core/templates/beez3/html/com_content/featured/default_item.php b/core/templates/beez3/html/com_content/featured/default_item.php
new file mode 100644
index 00000000..c635dc4c
--- /dev/null
+++ b/core/templates/beez3/html/com_content/featured/default_item.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create a shortcut for params.
+$canEdit = $this->item->params->get('access-edit');
+$params  = &$this->item->params;
+
+$showPrintIcon = $params->get('show_print_icon');
+$showEmailIcon = $params->get('show_email_icon');
+
+$images         = json_decode($this->item->images);
+$app            = JFactory::getApplication();
+$templateparams = $app->getTemplate(true)->params;
+
+?>
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
+<div class="system-unpublished">
+<?php endif; ?>
+<?php if ($params->get('show_title')) : ?>
+	<h2>
+		<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+			<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)); ?>">
+			<?php echo $this->escape($this->item->title); ?></a>
+		<?php else : ?>
+			<?php echo $this->escape($this->item->title); ?>
+		<?php endif; ?>
+	</h2>
+<?php endif; ?>
+
+<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
+<div class="pull-left"><?php echo $this->item->event->afterDisplayTitle; ?></div>
+
+<?php if ($canEdit || $showPrintIcon || $showEmailIcon) : ?>
+	<ul class="actions">
+		<?php if ($showPrintIcon) : ?>
+		<li class="print-icon">
+			<?php echo JHtml::_('icon.print_popup', $this->item, $params, array(), true); ?>
+		</li>
+		<?php endif; ?>
+		<?php if ($showEmailIcon) : ?>
+		<li class="email-icon">
+			<?php echo JHtml::_('icon.email', $this->item, $params, array(), true); ?>
+		</li>
+		<?php endif; ?>
+
+		<?php if ($canEdit) : ?>
+		<li class="edit-icon">
+			<?php echo JHtml::_('icon.edit', $this->item, $params, array(), true); ?>
+		</li>
+		<?php endif; ?>
+	</ul>
+<?php endif; ?>
+
+<?php echo $this->item->event->beforeDisplayContent; ?>
+
+<?php // to do not that elegant would be nice to group the params ?>
+
+<?php if ($params->get('show_author') or $params->get('show_category') or $params->get('show_create_date') or $params->get('show_modify_date') or $params->get('show_publish_date') or $params->get('show_parent_category') or $params->get('show_hits')) : ?>
+ <dl class="article-info">
+ <dt class="article-info-term"><?php  echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+<?php endif; ?>
+<?php if ($this->item->parent_id != 1 && $params->get('show_parent_category')) : ?>
+		<dd class="parent-category-name">
+			<?php $title = $this->escape($this->item->parent_title);
+				$title = $title ?: JText::_('JGLOBAL_UNCATEGORISED');
+				$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)) . '">' . $title . '</a>'; ?>
+			<?php if ($params->get('link_parent_category') and $this->item->parent_slug) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_category')) : ?>
+		<dd class="category-name">
+			<?php 	$title = $this->escape($this->item->category_title);
+					$title = $title ?: JText::_('JGLOBAL_UNCATEGORISED');
+					$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug)).'">'.$title.'</a>';?>
+			<?php if ($params->get('link_category') and $this->item->catslug) : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+				<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+			<?php endif; ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_create_date')) : ?>
+		<dd class="create">
+		<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_modify_date')) : ?>
+		<dd class="modified">
+		<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_publish_date')) : ?>
+		<dd class="published">
+		<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
+		</dd>
+<?php endif; ?>
+<?php if (!empty($this->item->author) && $params->get('show_author')) : ?>
+	<dd class="createdby">
+		<?php $author = $this->item->created_by_alias ?: $this->item->author; ?>
+		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+		<?php else :?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+		<?php endif; ?>
+	</dd>
+<?php endif; ?>
+<?php if ($params->get('show_hits')) : ?>
+		<dd class="hits">
+		<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+		</dd>
+<?php endif; ?>
+<?php if ($params->get('show_author') or $params->get('show_category') or $params->get('show_create_date') or $params->get('show_modify_date') or $params->get('show_publish_date') or $params->get('show_parent_category') or $params->get('show_hits')) : ?>
+ </dl>
+<?php endif; ?>
+
+<?php  if (isset($images->image_intro) and !empty($images->image_intro)) : ?>
+	<?php $imgfloat = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro; ?>
+	<div class="img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>">
+	<img
+		<?php if ($images->image_intro_caption):
+			echo 'class="caption"'.' title="' . htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8') .'"';
+		endif; ?>
+		src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8'); ?>"/>
+	</div>
+<?php endif; ?>
+
+<?php echo $this->item->introtext; ?>
+
+<?php if ($this->item->readmore && $params->get('show_readmore')) :
+	if ($params->get('access-view')) :
+		$link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language));
+	else :
+		$menu = JFactory::getApplication()->getMenu();
+		$active = $menu->getActive();
+		$itemId = $active->id;
+		$link = new JUri(JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId, false));
+		$link->setVar('return', base64_encode(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid, $this->item->language)));
+	endif;
+?>
+		<p class="readmore">
+				<a href="<?php echo $link; ?>">
+					<?php if (!$params->get('access-view')) :
+						echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE');
+					elseif ($readmore = $this->item->alternative_readmore) :
+						echo $readmore;
+						if ($params->get('show_readmore_title', 0) != 0) :
+							echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
+						endif;
+					elseif ($params->get('show_readmore_title', 0) == 0) :
+						echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
+					else :
+						echo JText::_('COM_CONTENT_READ_MORE');
+						echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
+					endif; ?></a>
+		</p>
+<?php endif; ?>
+
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| (strtotime($this->item->publish_down) < strtotime(JFactory::getDate()) && $this->item->publish_down !== JFactory::getDbo()->getNullDate())) : ?>
+</div>
+<?php endif; ?>
+
+<div class="item-separator"></div>
+<?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/core/templates/beez3/html/com_content/featured/default_links.php b/core/templates/beez3/html/com_content/featured/default_links.php
new file mode 100644
index 00000000..821f6acd
--- /dev/null
+++ b/core/templates/beez3/html/com_content/featured/default_links.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+
+<h3><?php echo JText::_('COM_CONTENT_MORE_ARTICLES'); ?></h3>
+
+<ol class="links">
+<?php foreach ($this->link_items as &$item) : ?>
+	<li>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid, $item->language)); ?>">
+			<?php echo $item->title; ?></a>
+	</li>
+<?php endforeach; ?>
+</ol>
+
diff --git a/core/templates/beez3/html/com_content/form/edit.php b/core/templates/beez3/html/com_content/form/edit.php
new file mode 100644
index 00000000..bf3755f1
--- /dev/null
+++ b/core/templates/beez3/html/com_content/form/edit.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// no direct access
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidation');
+
+// Create shortcut to parameters.
+$params = $this->state->get('params');
+//$images = json_decode($this->item->images);
+//$urls = json_decode($this->item->urls);
+
+// This checks if the editor config options have ever been saved. If they haven't they will fall back to the original settings.
+$editoroptions = isset($params->show_publishing_options);
+if (!$editoroptions):
+	$params->show_urls_images_frontend = '0';
+endif;
+?>
+
+<script type="text/javascript">
+	Joomla.submitbutton = function(task)
+	{
+		if (task === 'article.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
+		{
+			<?php echo $this->form->getField('articletext')->save(); ?>
+			Joomla.submitform(task);
+		}
+	}
+</script>
+<div class="edit item-page<?php echo $this->pageclass_sfx; ?>">
+<?php if ($params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<form action="<?php echo JRoute::_('index.php?option=com_content&a_id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
+	<fieldset>
+		<legend><?php echo JText::_('COM_CONTENT_ARTICLE_CONTENT'); ?></legend>
+
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('title'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('title'); ?>
+				</div>
+			</div>
+
+		<?php if ($this->item->id === null):?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('alias'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('alias'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+
+			<div class="btn-group">
+				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('article.save')">
+					<?php echo JText::_('JSAVE') ?>
+				</button>
+				<button type="button" class="btn" onclick="Joomla.submitbutton('article.cancel')">
+					<?php echo JText::_('JCANCEL') ?>
+				</button>
+			</div>
+			<?php if ($this->captchaEnabled) : ?>
+				<?php echo $this->form->renderField('captcha'); ?>
+			<?php endif; ?>
+			<?php echo $this->form->getInput('articletext'); ?>
+
+	</fieldset>
+	<?php if ($params->get('show_urls_images_frontend')  ) : ?>
+	<fieldset>
+		<legend><?php echo JText::_('COM_CONTENT_IMAGES_AND_URLS'); ?></legend>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('image_intro', 'images'); ?>
+					<?php echo $this->form->getInput('image_intro', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('image_intro_alt', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('image_intro_alt', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('image_intro_caption', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('image_intro_caption', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('float_intro', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('float_intro', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('image_fulltext', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('image_fulltext', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('image_fulltext_alt', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('image_fulltext_alt', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('image_fulltext_caption', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('image_fulltext_caption', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('float_fulltext', 'images'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('float_fulltext', 'images'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('urla', 'urls'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('urla', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('urlatext', 'urls'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('urlatext', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $this->form->getInput('targeta', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('urlb', 'urls'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('urlb', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('urlbtext', 'urls'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('urlbtext', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $this->form->getInput('targetb', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('urlc', 'urls'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('urlc', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('urlctext', 'urls'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('urlctext', 'urls'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $this->form->getInput('targetc', 'urls'); ?>
+				</div>
+			</div>
+	</fieldset>
+	<?php endif; ?>
+
+	<fieldset>
+		<legend><?php echo JText::_('COM_CONTENT_PUBLISHING'); ?></legend>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('catid'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('catid'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('tags'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('tags'); ?>
+				</div>
+			</div>
+			<?php if ($params->get('show_publishing_options', 1) == 1) : ?>	
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('created_by_alias'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('created_by_alias'); ?>
+				</div>
+			</div>
+			<?php endif; ?>
+			<?php if ($this->item->params->get('access-change')) : ?>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('state'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('state'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('featured'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('featured'); ?>
+					</div>
+				</div>
+				<?php if ($params->get('show_publishing_options', 1) == 1) : ?>	
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('publish_up'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('publish_up'); ?>
+					</div>
+				</div>
+				<div class="control-group">
+					<div class="control-label">
+						<?php echo $this->form->getLabel('publish_down'); ?>
+					</div>
+					<div class="controls">
+						<?php echo $this->form->getInput('publish_down'); ?>
+					</div>
+				</div>
+				<?php endif; ?>
+			<?php endif; ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('access'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('access'); ?>
+				</div>
+			</div>
+			<?php if ($this->item->id === null):?>
+				<div class="control-group">
+					<div class="control-label">
+					</div>
+					<div class="controls">
+						<?php echo JText::_('COM_CONTENT_ORDERING'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
+	</fieldset>
+
+	<fieldset>
+		<legend><?php echo JText::_('JFIELD_LANGUAGE_LABEL'); ?></legend>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('language'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('language'); ?>
+				</div>
+			</div>
+	</fieldset>
+
+	<?php if ($params->get('show_publishing_options', 1) == 1) : ?>	
+	<fieldset>
+		<legend><?php echo JText::_('COM_CONTENT_METADATA'); ?></legend>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('metadesc'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('metadesc'); ?>
+				</div>
+			</div>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('metakey'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('metakey'); ?>
+				</div>
+			</div>
+	</fieldset>
+	<?php endif; ?>
+		<input type="hidden" name="task" value="" />
+		<input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
+		<?php if ($this->params->get('enable_category', 0) == 1) : ?>
+			<input type="hidden" name="jform[catid]" value="<?php echo $this->params->get('catid', 1);?>"/>
+		<?php endif;?>
+		<?php echo JHtml::_('form.token'); ?>
+
+</form>
+</div>
diff --git a/core/templates/beez3/html/com_newsfeeds/categories/default.php b/core/templates/beez3/html/com_newsfeeds/categories/default.php
new file mode 100644
index 00000000..c776db16
--- /dev/null
+++ b/core/templates/beez3/html/com_newsfeeds/categories/default.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+JHtml::_('behavior.caption');
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx;?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+	<h1>
+		<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>
+	<?php endif; ?>
+
+		<?php if ($this->params->get('show_base_description')) : ?>
+		<?php // If there is a description in the menu parameters use that. ?>
+			<?php if ($this->params->get('categories_description')) : ?>
+				<div class="category-desc base-desc">
+					<?php echo  JHtml::_('content.prepare', $this->params->get('categories_description'), '', 'com_newsfeeds.categories'); ?>
+				</div>
+			<?php else : ?>
+				<?php // Otherwise get one from the database if it exists. ?>
+				<?php if ($this->parent->description) : ?>
+					<div class="category-desc base-desc">
+						<?php echo JHtml::_('content.prepare', $this->parent->description, '', 'com_newsfeeds.categories'); ?>
+					</div>
+				<?php endif; ?>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php echo $this->loadTemplate('items'); ?>
+</div>
diff --git a/core/templates/beez3/html/com_newsfeeds/categories/default_items.php b/core/templates/beez3/html/com_newsfeeds/categories/default_items.php
new file mode 100644
index 00000000..ad69fedc
--- /dev/null
+++ b/core/templates/beez3/html/com_newsfeeds/categories/default_items.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$class = ' class="first"';
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
+	if (!isset($this->items[$this->parent->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+	<?php $class = ''; ?>
+		<span class="item-title"><a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($item->id));?>">
+			<?php echo $this->escape($item->title); ?></a>
+		</span>
+		<?php if ($this->params->get('show_subcat_desc_cat') == 1) :?>
+		<?php if ($item->description) : ?>
+			<div class="category-desc">
+				<?php echo JHtml::_('content.prepare', $item->description, '', 'com_newsfeeds.categories'); ?>
+			</div>
+		<?php endif; ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('show_cat_items_cat') == 1) : ?>
+			<dl class="newsfeed-count"><dt>
+				<?php echo JText::_('COM_NEWSFEEDS_CAT_NUM'); ?></dt>
+				<dd><?php echo $item->numitems; ?></dd>
+			</dl>
+		<?php endif; ?>
+
+		<?php if (count($item->getChildren()) > 0) :
+			$this->items[$item->id] = $item->getChildren();
+			$this->parent = $item;
+			$this->maxLevelcat--;
+			echo $this->loadTemplate('items');
+			$this->parent = $item->getParent();
+			$this->maxLevelcat++;
+		endif; ?>
+
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_newsfeeds/category/default.php b/core/templates/beez3/html/com_newsfeeds/category/default.php
new file mode 100644
index 00000000..b1fe0416
--- /dev/null
+++ b/core/templates/beez3/html/com_newsfeeds/category/default.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<div class="newsfeed-category<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<?php if ($this->params->get('show_category_title', 1)) : ?>
+<h2>
+	<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_newsfeeds.category.title'); ?>
+</h2>
+<?php endif; ?>
+<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+	<div class="category-desc">
+	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+	<?php endif; ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_newsfeeds.category'); ?>
+	<?php endif; ?>
+	<div class="clr"></div>
+	</div>
+<?php endif; ?>
+
+<?php echo $this->loadTemplate('items'); ?>
+
+<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
+<div class="cat-children">
+	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
+	<?php echo $this->loadTemplate('children'); ?>
+</div>
+<?php endif; ?>
+</div>
diff --git a/core/templates/beez3/html/com_newsfeeds/category/default_children.php b/core/templates/beez3/html/com_newsfeeds/category/default_children.php
new file mode 100644
index 00000000..247c3388
--- /dev/null
+++ b/core/templates/beez3/html/com_newsfeeds/category/default_children.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+	<?php
+	if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
+	if (!isset($this->children[$this->category->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+		<?php $class = ''; ?>
+			<span class="item-title"><a href="<?php echo JRoute::_(NewsfeedsHelperRoute::getCategoryRoute($child->id));?>">
+				<?php echo $this->escape($child->title); ?></a>
+			</span>
+
+			<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+			<?php if ($child->description) : ?>
+				<div class="category-desc">
+					<?php echo JHtml::_('content.prepare', $child->description, '', 'com_newsfeeds.category'); ?>
+				</div>
+			<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_cat_items') == 1) : ?>
+				<dl class="newsfeed-count"><dt>
+					<?php echo JText::_('COM_NEWSFEEDS_CAT_NUM'); ?></dt>
+					<dd><?php echo $child->numitems; ?></dd>
+				</dl>
+			<?php endif; ?>
+
+			<?php if (count($child->getChildren()) > 0) :
+				$this->children[$child->id] = $child->getChildren();
+				$this->category = $child;
+				$this->maxLevel--;
+				echo $this->loadTemplate('children');
+				$this->category = $child->getParent();
+				$this->maxLevel++;
+			endif; ?>
+		</li>
+	<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/core/templates/beez3/html/com_newsfeeds/category/default_items.php b/core/templates/beez3/html/com_newsfeeds/category/default_items.php
new file mode 100644
index 00000000..5d32369a
--- /dev/null
+++ b/core/templates/beez3/html/com_newsfeeds/category/default_items.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_newsfeeds
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.framework');
+
+$n         = count($this->items);
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+
+<?php if (empty($this->items)) : ?>
+	<p><?php echo JText::_('COM_NEWSFEEDS_NO_ARTICLES'); ?></p>
+<?php else : ?>
+
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
+	<fieldset class="filters">
+	<legend class="hidelabeltxt"><?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?></legend>
+	<?php if ($this->params->get('show_pagination_limit')) : ?>
+		<div class="display-limit">
+			<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	</fieldset>
+	<table class="category">
+		<?php if ($this->params->get('show_headings') == 1) : ?>
+		<thead><tr>
+				<th class="item-title" id="tableOrdering">
+					<?php echo JHtml::_('grid.sort', 'COM_NEWSFEEDS_FEED_NAME', 'a.name', $listDirn, $listOrder); ?>
+				</th>
+
+				<?php if ($this->params->get('show_articles')) : ?>
+				<th class="item-num-art" id="tableOrdering2">
+					<?php echo JHtml::_('grid.sort', 'COM_NEWSFEEDS_NUM_ARTICLES', 'a.numarticles', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif; ?>
+
+				<?php if ($this->params->get('show_link')) : ?>
+				<th class="item-link" id="tableOrdering3">
+					<?php echo JHtml::_('grid.sort', 'COM_NEWSFEEDS_FEED_LINK', 'a.link', $listDirn, $listOrder); ?>
+				</th>
+				<?php endif; ?>
+
+			</tr>
+		</thead>
+		<?php endif; ?>
+
+		<tbody>
+			<?php foreach ($this->items as $i => $item) : ?>
+				<?php if ($this->items[$i]->published == 0) : ?>
+					<tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+				<?php else: ?>
+					<tr class="cat-list-row<?php echo $i % 2; ?>" >
+				<?php endif; ?>
+
+				<td class="item-title">
+					<a href="<?php echo JRoute::_(NewsFeedsHelperRoute::getNewsfeedRoute($item->slug, $item->catid)); ?>">
+						<?php echo $item->name; ?></a>
+				</td>
+
+				<?php if ($this->params->get('show_articles')) : ?>
+					<td class="item-num-art">
+						<?php echo $item->numarticles; ?>
+					</td>
+				<?php  endif; ?>
+
+				<?php if ($this->params->get('show_link')) : ?>
+					<td class="item-link">
+						<a href="<?php echo $item->link; ?>"><?php echo $item->link; ?></a>
+					</td>
+				<?php endif; ?>
+
+					</tr>
+
+			<?php endforeach; ?>
+
+		</tbody>
+	</table>
+
+	<?php if ($this->params->get('show_pagination')) : ?>
+		<div class="pagination">
+		<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+			<p class="counter">
+				<?php echo $this->pagination->getPagesCounter(); ?>
+			</p>
+		<?php endif; ?>
+		<?php echo $this->pagination->getPagesLinks(); ?>
+		</div>
+	<?php endif; ?>
+
+</form>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_weblinks/categories/default.php b/core/templates/beez3/html/com_weblinks/categories/default.php
new file mode 100644
index 00000000..cc080f0a
--- /dev/null
+++ b/core/templates/beez3/html/com_weblinks/categories/default.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+JHtml::_('behavior.caption');
+?>
+<div class="categories-list<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<?php if ($this->params->get('show_base_description')) : ?>
+	<?php 	//If there is a description in the menu parameters use that; ?>
+		<?php if ($this->params->get('categories_description')) : ?>
+			<div class="category-desc base-desc">
+			<?php echo JHtml::_('content.prepare', $this->params->get('categories_description'), '', 'com_weblinks.categories'); ?>
+			</div>
+		<?php  else: ?>
+			<?php //Otherwise get one from the database if it exists. ?>
+			<?php  if ($this->parent->description) : ?>
+				<div class="category-desc base-desc">
+					<?php echo JHtml::_('content.prepare', $this->parent->description, '', 'com_weblinks.categories'); ?>
+				</div>
+			<?php  endif; ?>
+		<?php  endif; ?>
+	<?php endif; ?>
+<?php
+echo $this->loadTemplate('items');
+?>
+</div>
diff --git a/core/templates/beez3/html/com_weblinks/categories/default_items.php b/core/templates/beez3/html/com_weblinks/categories/default_items.php
new file mode 100644
index 00000000..56c983cc
--- /dev/null
+++ b/core/templates/beez3/html/com_weblinks/categories/default_items.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
+	<?php
+	if ($item->numitems || $this->params->get('show_empty_categories_cat') || count($item->getChildren())) :
+	if (!isset($this->items[$this->parent->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+	<?php $class = ''; ?>
+		<span class="item-title"><a href="<?php echo JRoute::_(WeblinksHelperRoute::getCategoryRoute($item->id)); ?>">
+			<?php echo $this->escape($item->title); ?></a>
+		</span>
+		<?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
+		<?php if ($item->description) : ?>
+			<div class="category-desc">
+				<?php echo JHtml::_('content.prepare', $item->description, '', 'com_weblinks.categories'); ?>
+			</div>
+		<?php endif; ?>
+		<?php endif; ?>
+		<?php if ($this->params->get('show_cat_num_links_cat') == 1) : ?>
+			<dl class="weblink-count"><dt>
+				<?php echo JText::_('COM_WEBLINKS_NUM'); ?></dt>
+				<dd><?php echo $item->numitems; ?></dd>
+			</dl>
+		<?php endif; ?>
+
+		<?php if (count($item->getChildren()) > 0) :
+			$this->items[$item->id] = $item->getChildren();
+			$this->parent = $item;
+			$this->maxLevelcat--;
+			echo $this->loadTemplate('items');
+			$this->parent = $item->getParent();
+			$this->maxLevelcat++;
+		endif; ?>
+
+	</li>
+	<?php endif; ?>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_weblinks/category/default.php b/core/templates/beez3/html/com_weblinks/category/default.php
new file mode 100644
index 00000000..392f21e3
--- /dev/null
+++ b/core/templates/beez3/html/com_weblinks/category/default.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+JHtml::_('behavior.caption');
+?>
+<div class="weblink-category<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<?php if ($this->params->get('show_category_title', 1)) : ?>
+<h2>
+	<?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_weblinks.category.title'); ?>
+</h2>
+<?php endif; ?>
+<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+	<div class="category-desc">
+	<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+		<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+	<?php endif; ?>
+	<?php if ($this->category->description && $this->params->get('show_description')) : ?>
+		<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_weblinks.category'); ?>
+	<?php endif; ?>
+	<div class="clr"></div>
+	</div>
+<?php endif; ?>
+<?php echo $this->loadTemplate('items'); ?>
+<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
+	<div class="cat-children">
+	<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
+	<?php echo $this->loadTemplate('children'); ?>
+	</div>
+<?php endif; ?>
+</div>
diff --git a/core/templates/beez3/html/com_weblinks/category/default_children.php b/core/templates/beez3/html/com_weblinks/category/default_children.php
new file mode 100644
index 00000000..801a9510
--- /dev/null
+++ b/core/templates/beez3/html/com_weblinks/category/default_children.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
+?>
+<ul>
+<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+	<?php
+	if ($child->numitems || $this->params->get('show_empty_categories') || count($child->getChildren())) :
+	if (!isset($this->children[$this->category->id][$id + 1]))
+	{
+		$class = ' class="last"';
+	}
+	?>
+	<li<?php echo $class; ?>>
+		<?php $class = ''; ?>
+			<span class="item-title"><a href="<?php echo JRoute::_(WeblinksHelperRoute::getCategoryRoute($child->id)); ?>">
+				<?php echo $this->escape($child->title); ?></a>
+			</span>
+
+			<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+			<?php if ($child->description) : ?>
+				<div class="category-desc">
+					<?php echo JHtml::_('content.prepare', $child->description, '', 'com_weblinks.category'); ?>
+				</div>
+			<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_cat_num_links') == 1) : ?>
+				<dl class="weblink-count"><dt>
+					<?php echo JText::_('COM_WEBLINKS_NUM'); ?></dt>
+					<dd><?php echo $child->numitems; ?></dd>
+				</dl>
+			<?php endif; ?>
+
+			<?php if (count($child->getChildren()) > 0 ) :
+				$this->children[$child->id] = $child->getChildren();
+				$this->category = $child;
+				$this->maxLevel--;
+				echo $this->loadTemplate('children');
+				$this->category = $child->getParent();
+				$this->maxLevel++;
+			endif; ?>
+		</li>
+	<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/core/templates/beez3/html/com_weblinks/category/default_items.php b/core/templates/beez3/html/com_weblinks/category/default_items.php
new file mode 100644
index 00000000..993624f5
--- /dev/null
+++ b/core/templates/beez3/html/com_weblinks/category/default_items.php
@@ -0,0 +1,186 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Code to support edit links for weblinks
+// Create a shortcut for params.
+$params = &$this->item->params;
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.framework');
+
+// Get the user object.
+$user = JFactory::getUser();
+
+// Check if user is allowed to add/edit based on weblinks permissinos.
+$canEdit      = $user->authorise('core.edit', 'com_weblinks');
+$canCreate    = $user->authorise('core.create', 'com_weblinks');
+$canEditState = $user->authorise('core.edit.state', 'com_weblinks');
+$n            = count($this->items);
+$listOrder    = $this->escape($this->state->get('list.ordering'));
+$listDirn     = $this->escape($this->state->get('list.direction'));
+?>
+
+<?php if (empty($this->items)) : ?>
+	<p> <?php echo JText::_('COM_WEBLINKS_NO_WEBLINKS'); ?></p>
+<?php else : ?>
+
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
+	<?php if ($this->params->get('show_pagination_limit')) : ?>
+		<fieldset class="filters">
+		<legend class="hidelabeltxt"><?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?></legend>
+		<div class="display-limit">
+			<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
+			<?php echo $this->pagination->getLimitBox(); ?>
+		</div>
+		<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+		<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+		</fieldset>
+	<?php endif; ?>
+
+	<table class="category">
+		<?php if ($this->params->get('show_headings') == 1) : ?>
+
+		<thead><tr>
+
+			<th class="title">
+					<?php echo JHtml::_('grid.sort',  'COM_WEBLINKS_GRID_TITLE', 'title', $listDirn, $listOrder); ?>
+			</th>
+			<?php if ($this->params->get('show_link_hits')) : ?>
+			<th class="hits">
+					<?php echo JHtml::_('grid.sort',  'JGLOBAL_HITS', 'hits', $listDirn, $listOrder); ?>
+			</th>
+			<?php endif; ?>
+		</tr>
+	</thead>
+	<?php endif; ?>
+	<tbody>
+	<?php foreach ($this->items as $i => $item) : ?>
+		<?php if ($this->items[$i]->state == 0) : ?>
+			<tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+		<?php else: ?>
+			<tr class="cat-list-row<?php echo $i % 2; ?>" >
+		<?php endif; ?>
+
+			<td class="title">
+			<p>
+				<?php if ($this->params->get('icons') == 0) : ?>
+					 <?php echo JText::_('COM_WEBLINKS_LINK'); ?>
+				<?php elseif ($this->params->get('icons') == 1) : ?>
+					<?php if (!$this->params->get('link_icons')) : ?>
+						<?php echo JHtml::_('image', 'system/'.$this->params->get('link_icons', 'weblink.png'), JText::_('COM_WEBLINKS_LINK'), null, true); ?>
+					<?php else: ?>
+						<?php echo '<img src="'.$this->params->get('link_icons').'" alt="'.JText::_('COM_WEBLINKS_LINK').'" />'; ?>
+					<?php endif; ?>
+				<?php endif; ?>
+				<?php
+					// Compute the correct link
+					$menuclass = 'category' . $this->pageclass_sfx;
+					$link   = $item->link;
+					$width  = $item->params->get('width');
+					$height = $item->params->get('height');
+
+					if ($width == null || $height == null)
+					{
+						$width  = 600;
+						$height = 500;
+					}
+
+					switch ($item->params->get('target', $this->params->get('target')))
+					{
+						case 1:
+							// open in a new window
+							echo '<a href="'. $link .'" target="_blank" class="'. $menuclass .'" rel="nofollow">'.
+								$this->escape($item->title) .'</a>';
+							break;
+
+						case 2:
+							// open in a popup window
+							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='.$this->escape($width).',height='.$this->escape($height).'';
+							echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '".$attribs."'); return false;\">".
+								$this->escape($item->title).'</a>';
+							break;
+						case 3:
+							// open in a modal window
+							JHtml::_('behavior.modal', 'a.modal');
+							echo '<a class="modal" href="'.$link.'"  rel="{handler: \'iframe\', size: {x:'.$this->escape($width).', y:'.$this->escape($height).'}}">'.
+								$this->escape($item->title). ' </a>';
+							break;
+
+						default:
+							// open in parent window
+							echo '<a href="'.  $link . '" class="'. $menuclass .'" rel="nofollow">'.
+								$this->escape($item->title) . ' </a>';
+							break;
+					}
+				?>
+				<?php // Code to add the edit link for the weblink. ?>
+
+						<?php if ($canEdit) : ?>
+							<ul class="actions">
+								<li class="edit-icon">
+									<?php echo JHtml::_('icon.edit', $item, $params); ?>
+								</li>
+							</ul>
+						<?php endif; ?>
+			</p>
+			<?php $tagsData = $item->tags->getItemTags('com_weblinks.weblink', $item->id); ?>
+			<?php if ($this->params->get('show_tags', 1)) : ?>
+				<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+				<?php echo $this->item->tagLayout->render($tagsData); ?>
+			<?php endif; ?>
+
+			<?php if ($this->params->get('show_link_description') and ($item->description != '')) : ?>
+				<?php $images = json_decode($item->images); ?>
+				<?php  if (isset($images->image_first) and !empty($images->image_first)) : ?>
+				<?php $imgfloat = empty($images->float_first) ? $this->params->get('float_first') : $images->float_first; ?>
+				<div class="img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>"> <img
+					<?php if ($images->image_first_caption):
+						echo 'class="caption"'.' title="' .htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') .'"';
+					endif; ?>
+					src="<?php echo htmlspecialchars($images->image_first, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_first_alt, ENT_COMPAT, 'UTF-8'); ?>"/> </div>
+				<?php endif; ?>
+				<?php  if (isset($images->image_second) and !empty($images->image_second)) : ?>
+					<?php $imgfloat = empty($images->float_second) ? $this->params->get('float_second') : $images->float_second; ?>
+					<div class="pull-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image"> <img
+					<?php if ($images->image_second_caption):
+						echo 'class="caption"'.' title="' .htmlspecialchars($images->image_second_caption, ENT_COMPAT, 'UTF-8') .'"';
+					endif; ?>
+					src="<?php echo htmlspecialchars($images->image_second, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_second_alt, ENT_COMPAT, 'UTF-8'); ?>"/> </div>
+				<?php endif; ?>
+
+				<?php echo $item->description; ?>
+			<?php endif; ?>
+		</td>
+		<?php if ($this->params->get('show_link_hits')) : ?>
+		<td class="hits">
+			<?php echo $item->hits; ?>
+		</td>
+		<?php endif; ?>
+	</tr>
+	<?php endforeach; ?>
+</tbody>
+</table>
+
+	<?php // Code to add a link to submit a weblink. ?>
+	<?php /* if ($canCreate) : // TODO This is not working due to some problem in the router, I think. Ref issue #23685 ?>
+		<?php echo JHtml::_('icon.create', $item, $item->params); ?>
+ 	<?php  endif; */ ?>
+		<?php if ($this->params->get('show_pagination')) : ?>
+		 <div class="pagination">
+			<?php if ($this->params->def('show_pagination_results', 1)) : ?>
+				<p class="counter">
+					<?php echo $this->pagination->getPagesCounter(); ?>
+				</p>
+			<?php endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
+			</div>
+		<?php endif; ?>
+	</form>
+<?php endif; ?>
diff --git a/core/templates/beez3/html/com_weblinks/form/edit.php b/core/templates/beez3/html/com_weblinks/form/edit.php
new file mode 100644
index 00000000..5e852b29
--- /dev/null
+++ b/core/templates/beez3/html/com_weblinks/form/edit.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_weblinks
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidation');
+
+// Create shortcut to parameters.
+$params = $this->state->get('params');
+?>
+
+<script type="text/javascript">
+	Joomla.submitbutton = function(task)
+	{
+		if (task === 'weblink.cancel' || document.formvalidator.isValid(document.getElementById('adminForm')))
+		{
+			<?php echo $this->form->getField('description')->save(); ?>
+			Joomla.submitform(task);
+		}
+	}
+</script>
+<div class="edit<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($this->params->get('show_page_heading')) : ?>
+	<h1>
+		<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=form&w_id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
+		<div class="btn-toolbar">
+			<div class="btn-group">
+				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('weblink.save')">
+					<span class="icon-ok" aria-hidden="true"></span> <?php echo JText::_('JSAVE') ?>
+				</button>
+			</div>
+			<div class="btn-group">
+				<button type="button" class="btn" onclick="Joomla.submitbutton('weblink.cancel')">
+					<span class="icon-cancel" aria-hidden="true"></span> <?php echo JText::_('JCANCEL') ?>
+				</button>
+			</div>
+		</div>
+
+		<hr class="hr-condensed" />
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('title'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('title'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('alias'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('alias'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('catid'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('catid'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('tags'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('tags'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('url'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('url'); ?>
+			</div>
+		</div>
+		<?php if ($this->user->authorise('core.edit.state', 'com_weblinks.weblink')) : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $this->form->getLabel('state'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $this->form->getInput('state'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('language'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('language'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('description'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('description'); ?>
+			</div>
+		</div>
+
+		<input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
+		<input type="hidden" name="task" value="" />
+		<?php echo JHtml::_('form.token'); ?>
+	</form>
+</div>
diff --git a/core/templates/beez3/html/layouts/joomla/system/message.php b/core/templates/beez3/html/layouts/joomla/system/message.php
new file mode 100644
index 00000000..c2f6b242
--- /dev/null
+++ b/core/templates/beez3/html/layouts/joomla/system/message.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$msgList = $displayData['msgList'];
+
+?>
+<div id="system-message-container">
+	<?php if (is_array($msgList) && $msgList) : ?>
+		<dl id="system-message">
+			<?php foreach ($msgList as $type => $msgs) : ?>
+				<?php if ($msgs) : ?>
+					<dt class="<?php echo strtolower($type); ?>"><?php echo JText::_($type); ?></dt>
+					<dd class="<?php echo strtolower($type); ?> message">
+						<ul>
+							<?php foreach ($msgs as $msg) : ?>
+								<li><?php echo $msg; ?></li>
+							<?php endforeach; ?>
+						</ul>
+					</dd>
+				<?php endif; ?>
+			<?php endforeach; ?>
+		</dl>
+	<?php endif; ?>
+</div>
diff --git a/core/templates/beez3/html/mod_breadcrumbs/default.php b/core/templates/beez3/html/mod_breadcrumbs/default.php
new file mode 100644
index 00000000..539ac9a1
--- /dev/null
+++ b/core/templates/beez3/html/mod_breadcrumbs/default.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+<div class = "breadcrumbs<?php echo $moduleclass_sfx; ?>">
+<?php if ($params->get('showHere', 1))
+	{
+		echo '<span class="showHere">' .JText::_('MOD_BREADCRUMBS_HERE').'</span>';
+	}
+
+	// Get rid of duplicated entries on trail including home page when using multilanguage
+	for ($i = 0; $i < $count; $i++)
+	{
+		if ($i === 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link === $list[$i - 1]->link)
+		{
+			unset($list[$i]);
+		}
+	}
+
+	// Find last and penultimate items in breadcrumbs list
+	end($list);
+	$last_item_key = key($list);
+	prev($list);
+	$penult_item_key = key($list);
+
+	// Generate the trail
+	foreach ($list as $key => $item) :
+	// Make a link if not the last item in the breadcrumbs
+	$show_last = $params->get('showLast', 1);
+	if ($key !== $last_item_key)
+	{
+		// Render all but last item - along with separator
+		if (!empty($item->link))
+		{
+			echo '<a href="' . $item->link . '" class="pathway">' . $item->name . '</a>';
+		}
+		else
+		{
+			echo '<span>' . $item->name . '</span>';
+		}
+
+		if ($key !== $penult_item_key || $show_last)
+		{
+			echo ' '.$separator.' ';
+		}
+
+	}
+	elseif ($show_last)
+	{
+		// Render last item if reqd.
+		echo '<span>' . $item->name . '</span>';
+	}
+	endforeach; ?>
+</div>
diff --git a/core/templates/beez3/html/mod_languages/default.php b/core/templates/beez3/html/mod_languages/default.php
new file mode 100644
index 00000000..c3dd2dd7
--- /dev/null
+++ b/core/templates/beez3/html/mod_languages/default.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  mod_languages
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('stylesheet', 'mod_languages/template.css', array('version' => 'auto', 'relative' => true));
+?>
+<div class="mod-languages<?php echo $moduleclass_sfx; ?>">
+<?php if ($headerText) : ?>
+	<div class="pretext"><p><?php echo $headerText; ?></p></div>
+<?php endif; ?>
+
+<?php if ($params->get('dropdown', 1)) : ?>
+	<form name="lang" method="post" action="<?php echo htmlspecialchars(JUri::current(), ENT_COMPAT, 'UTF-8'); ?>">
+	<select class="inputbox" onchange="document.location.replace(this.value);" >
+	<?php foreach ($list as $language) : ?>
+		<option dir=<?php echo $language->rtl ? '"rtl"' : '"ltr"'; ?> value="<?php echo $language->link; ?>" <?php echo $language->active ? 'selected="selected"' : ''; ?>>
+		<?php echo $language->title_native; ?></option>
+	<?php endforeach; ?>
+	</select>
+	</form>
+<?php else : ?>
+	<ul class="<?php echo $params->get('inline', 1) ? 'lang-inline' : 'lang-block'; ?>">
+	<?php foreach ($list as $language) : ?>
+		<?php if (!$language->active || $params->get('show_active', 0)) : ?>
+			<li class="<?php echo $language->active ? 'lang-active' : ''; ?>" dir="<?php echo $language->rtl ? 'rtl' : 'ltr'; ?>">
+			<a href="<?php echo $language->link; ?>">
+			<?php if ($params->get('image', 1)) : ?>
+				<?php echo JHtml::_('image', 'mod_languages/' . $language->image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?>
+			<?php else : ?>
+				<?php echo $params->get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?>
+			<?php endif; ?>
+			</a>
+			</li>
+		<?php endif; ?>
+	<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
+
+<?php if ($footerText) : ?>
+	<div class="posttext"><p><?php echo $footerText; ?></p></div>
+<?php endif; ?>
+</div>
diff --git a/core/templates/beez3/html/mod_login/default.php b/core/templates/beez3/html/mod_login/default.php
new file mode 100644
index 00000000..9af4363d
--- /dev/null
+++ b/core/templates/beez3/html/mod_login/default.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// no direct access
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+?>
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post" id="login-form" >
+<?php if ($params->get('pretext')) : ?>
+	<div class="pretext">
+	<p><?php echo $params->get('pretext'); ?></p>
+	</div>
+<?php endif; ?>
+<fieldset class="userdata">
+<p id="form-login-username">
+	<label for="modlgn-username"><?php echo JText::_('MOD_LOGIN_VALUE_USERNAME') ?></label>
+	<input id="modlgn-username" type="text" name="username" class="inputbox"  size="18" />
+</p>
+<p id="form-login-password">
+	<label for="modlgn-passwd"><?php echo JText::_('JGLOBAL_PASSWORD') ?></label>
+	<input id="modlgn-passwd" type="password" name="password" class="inputbox" size="18" />
+</p>
+<?php if (count($twofactormethods) > 1) : ?>
+	<div id="form-login-secretkey" class="control-group">
+		<div class="controls">
+			<?php if (!$params->get('usetext')) : ?>
+				<div class="input-prepend input-append">
+					<label for="modlgn-secretkey"><?php echo JText::_('JGLOBAL_SECRETKEY'); ?></label>
+					<input id="modlgn-secretkey" autocomplete="off" type="text" name="secretkey" class="input-small" tabindex="0" size="18" />
+				</div>
+			<?php else: ?>
+				<label for="modlgn-secretkey"><?php echo JText::_('JGLOBAL_SECRETKEY') ?></label>
+				<input id="modlgn-secretkey" autocomplete="off" type="text" name="secretkey" class="input-small" tabindex="0" size="18" />
+			<?php endif; ?>
+		</div>
+	</div>
+<?php endif; ?>
+<?php if (JPluginHelper::isEnabled('system', 'remember')) : ?>
+	<p id="form-login-remember">
+		<label for="modlgn-remember"><?php echo JText::_('MOD_LOGIN_REMEMBER_ME') ?></label>
+		<input id="modlgn-remember" type="checkbox" name="remember" class="inputbox" value="yes"/>
+	</p>
+<?php endif; ?>
+<input type="submit" name="Submit" class="button" value="<?php echo JText::_('JLOGIN') ?>" />
+<input type="hidden" name="option" value="com_users" />
+<input type="hidden" name="task" value="user.login" />
+<input type="hidden" name="return" value="<?php echo $return; ?>" />
+<?php echo JHtml::_('form.token'); ?>
+<ul>
+	<li>
+		<a href="<?php echo JRoute::_('index.php?option=com_users&view=reset'); ?>">
+		<?php echo JText::_('MOD_LOGIN_FORGOT_YOUR_PASSWORD'); ?></a>
+	</li>
+	<li>
+		<a href="<?php echo JRoute::_('index.php?option=com_users&view=remind'); ?>">
+		<?php echo JText::_('MOD_LOGIN_FORGOT_YOUR_USERNAME'); ?></a>
+	</li>
+	<?php if (JComponentHelper::getParams('com_users')->get('allowUserRegistration')) : ?>
+		<li>
+			<a href="<?php echo JRoute::_('index.php?option=com_users&view=registration'); ?>">
+			<?php echo JText::_('MOD_LOGIN_REGISTER'); ?></a>
+		</li>
+	<?php endif; ?>
+</ul>
+<?php if ($params->get('posttext')) : ?>
+	<div class="posttext">
+		<p><?php echo $params->get('posttext'); ?></p>
+	</div>
+<?php endif; ?>
+</fieldset>
+</form>
diff --git a/core/templates/beez3/html/mod_login/default_logout.php b/core/templates/beez3/html/mod_login/default_logout.php
new file mode 100644
index 00000000..60ca8444
--- /dev/null
+++ b/core/templates/beez3/html/mod_login/default_logout.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// no direct access
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+?>
+<form action="<?php echo JRoute::_('index.php', true, $params->get('usesecure')); ?>" method="post" id="login-form">
+<?php if ($params->get('greeting')) : ?>
+	<div class="login-greeting">
+	<?php if ($params->get('name') == 0) : ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('name'), ENT_COMPAT, 'UTF-8')); ?>
+	<?php else : ?>
+		<?php echo JText::sprintf('MOD_LOGIN_HINAME', htmlspecialchars($user->get('username'), ENT_COMPAT, 'UTF-8')); ?>
+	<?php endif; ?>
+	</div>
+<?php endif; ?>
+<?php if ($params->get('profilelink')) : ?>
+	<div class="login-profilelink">
+		<a href="<?php echo JRoute::_('index.php?option=com_users&view=profile'); ?>">
+		<?php echo JText::_('MOD_LOGIN_PROFILE'); ?></a>
+	</div>
+<?php endif; ?>
+<div class="logout-button">
+	<input type="submit" name="Submit" class="button" value="<?php echo JText::_('JLOGOUT'); ?>" />
+	<input type="hidden" name="option" value="com_users" />
+	<input type="hidden" name="task" value="user.logout" />
+	<input type="hidden" name="return" value="<?php echo $return; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
+</div>
+</form>
diff --git a/core/templates/beez3/html/modules.php b/core/templates/beez3/html/modules.php
new file mode 100644
index 00000000..2e924e42
--- /dev/null
+++ b/core/templates/beez3/html/modules.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * beezDivision chrome.
+ *
+ * @since   3.0
+ */
+function modChrome_beezDivision($module, &$params, &$attribs)
+{
+	$headerLevel = isset($attribs['headerLevel']) ? (int) $attribs['headerLevel'] : 3;
+	if (!empty ($module->content)) : ?>
+		<div class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
+		<?php if ($module->showtitle) : ?>
+			<h<?php echo $headerLevel; ?>><?php echo $module->title; ?></h<?php echo $headerLevel; ?>>
+		<?php endif; ?>
+		<?php echo $module->content; ?></div>
+	<?php endif;
+}
+
+/**
+ * beezHide chrome.
+ *
+ * @since   3.0
+ */
+function modChrome_beezHide($module, &$params, &$attribs)
+{
+	$headerLevel = isset($attribs['headerLevel']) ? (int) $attribs['headerLevel'] : 3;
+	$state = isset($attribs['state']) ? (int) $attribs['state'] : 0;
+
+	if (!empty ($module->content)) { ?>
+
+<div
+	class="moduletable_js <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');?>"><?php if ($module->showtitle) : ?>
+<h<?php echo $headerLevel; ?> class="js_heading"> <?php echo $module->title; ?> <a href="#"
+	title="<?php echo JText::_('TPL_BEEZ3_CLICK'); ?>"
+	onclick="auf('module_<?php echo $module->id; ?>'); return false"
+	class="opencloselink" id="link_<?php echo $module->id?>"> <span
+	class="no"><img src="templates/beez3/images/plus.png"
+	alt="<?php if ($state === 1) { echo JText::_('TPL_BEEZ3_ALTOPEN');} else {echo JText::_('TPL_BEEZ3_ALTCLOSE');} ?>" />
+</span></a></h<?php echo $headerLevel; ?>> <?php endif; ?>
+<div class="module_content <?php if ($state === 1){echo 'open';} ?>"
+	id="module_<?php echo $module->id; ?>" tabindex="-1"><?php echo $module->content; ?></div>
+</div>
+	<?php }
+}
+
+/**
+ * beezTabs chrome.
+ *
+ * @since   3.0
+ */
+function modChrome_beezTabs($module, $params, $attribs)
+{
+	$area = isset($attribs['id']) ? (int) $attribs['id'] : '1';
+	$area = 'area-'.$area;
+
+	static $modulecount;
+	static $modules;
+
+	if ($modulecount < 1)
+	{
+		$modulecount = count(JModuleHelper::getModules($module->position));
+		$modules = array();
+	}
+
+	if ($modulecount === 1)
+	{
+		$temp = new stdClass;
+		$temp->content = $module->content;
+		$temp->title = $module->title;
+		$temp->params = $module->params;
+		$temp->id = $module->id;
+		$modules[] = $temp;
+		// list of moduletitles
+		// list of moduletitles
+		echo '<div id="'. $area.'" class="tabouter"><ul class="tabs">';
+
+		foreach ($modules as $rendermodule)
+		{
+			echo '<li class="tab"><a href="#" id="link_'.$rendermodule->id.'" class="linkopen" onclick="tabshow(\'module_'. $rendermodule->id.'\');return false">'.$rendermodule->title.'</a></li>';
+		}
+		echo '</ul>';
+		$counter = 0;
+		// modulecontent
+		foreach ($modules as $rendermodule)
+		{
+			$counter ++;
+
+			echo '<div tabindex="-1" class="tabcontent tabopen" id="module_'.$rendermodule->id.'">';
+			echo $rendermodule->content;
+			if ($counter !== count($modules))
+			{
+			echo '<a href="#" class="unseen" onclick="nexttab(\'module_'. $rendermodule->id.'\');return false;" id="next_'.$rendermodule->id.'">'.JText::_('TPL_BEEZ3_NEXTTAB').'</a>';
+			}
+			echo '</div>';
+		}
+		$modulecount--;
+		echo '</div>';
+	} else {
+		$temp = new stdClass;
+		$temp->content = $module->content;
+		$temp->params = $module->params;
+		$temp->title = $module->title;
+		$temp->id = $module->id;
+		$modules[] = $temp;
+		$modulecount--;
+	}
+}
diff --git a/core/templates/beez3/images/all_bg.gif b/core/templates/beez3/images/all_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d26a58e1cce1885cb256dcf897d4740f68325940
GIT binary patch
literal 143
zcmZ?wbhEHblw*)%Sj50^=FFM@|Np;x_wMoI$2V`@1hN^xK=CIFs|W)tgARxXQp>;`
zBC+cZUrLAP+`R#pDy>gTKd(%%m=vfnCwAw?h^#~Xe=hY#Kb*h!GuK=W34wJTuJ;8p
rT+~d>lY}j&YW0V`=&vjd+j&d%z4g1GvyoH9dBf%(zEP&Z$Y2cs+X_58

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/arrow.png b/core/templates/beez3/images/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..757c25f4ea4f4b3b8296c38608b242c41c404f04
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#%spKkLn;`PIj(Z-6+CsYfyKe;
ze`A5vECG==1<r#HcL(r=ER<hZwqli3z}cw2q;w7U6>Q9k3=H0aYJNf0e#?PIFnGH9
KxvX<aXaWEb)E^uG

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/arrow2_grey.png b/core/templates/beez3/images/arrow2_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..757c25f4ea4f4b3b8296c38608b242c41c404f04
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#%spKkLn;`PIj(Z-6+CsYfyKe;
ze`A5vECG==1<r#HcL(r=ER<hZwqli3z}cw2q;w7U6>Q9k3=H0aYJNf0e#?PIFnGH9
KxvX<aXaWEb)E^uG

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/arrow_white_grey.png b/core/templates/beez3/images/arrow_white_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..da1c6dd292214d8c4f0de90434ffd1696309ff4b
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#{5)M8LpZJ{TPT;bO=c9GQ(5rr
zg=BTe!us@o%!R)t(^@XnYwRg=6IA;msrTcxkBG|){+Jj4BuhhjjUSjXPyKKG`D>5)
ire62PPnS;QF)+-#=H#W_QI-odnZeW5&t;ucLK6VrZZHS{

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/blog_more.gif b/core/templates/beez3/images/blog_more.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b66f81360cf4de09ceb54058ea033d52e3df348
GIT binary patch
literal 230
zcmZ?wbh9u|<Y(Y#_#(;h>eZ`-3m5L%wM$G?bpQVS9PI3S4<2-MaF{%8+Tz8FD=R8)
z-MbeP8+-Te-3=QyWM^kTfAi+vy?b}=+&Ovj<h5(pPMtdS;>C-N8#n&{|9|S#sSFrE
z2P6Wr%YijpL9H*PGgfE;Q{=>zmsF#|m#7_)iWT#W74CF3+8N-p|G|a|nT25t#||(w
z>ZC}_;$7enqR8uh-o-3ZYx;quM&CHMSvd*^&vXdscl0w|*})_hz`)L|CB~>!s;#SE
UQ>P@7-y~R+mXVdCqR3zk0NwyxYXATM

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/blog_more_hover.gif b/core/templates/beez3/images/blog_more_hover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a7f00836c639a71a4c9449388c0dfec79fa74733
GIT binary patch
literal 230
zcmZ?wbh9u|<Y(Y#_#(~l>eZ_kFJA20wQKg=`C_7?9PI4-_wUcn&W?$Vy?giWh7B7W
z9ULkvDsJ7ow|Md5$<wCoJ$Uf>n>Y9F-P^cv<DENqVrypWB+v9Jo^|r%$>xdkI0L6o
zojR2P3Fv^>AiEe?vlpoKrFce#nx#xl&AQ$a$k^%|Udbu+;J1*YU&_oc419<EjS4fh
zW^}xF2>4|n8rb%US%G7M$C8PHyiBnNnjUcTY`JrP*@lmSr~G^7{5vevYsbT%B*@9-
aXJC`*=&WpLY---CuBol7KSM>4!5RSBKwka;

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/close.png b/core/templates/beez3/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c308570dca52545fdddc4b3c7e7f63e2ad8230a
GIT binary patch
literal 659
zcmV;E0&M+>P)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e00006bW%=J0RI60
z0RJ~w8+`x(0!T?jK~#7FrIZ6~BvBa0-&$wRZf$H4J85u^owMzWRU5P6`7SymW-qGk
zHa^z2J8$m)`qjq&8NdB7Gt1O%NY7@~)h)!<ltFKh?2^@Dq2&x*Rb8Xk>+N>QY%+1K
zav?=gXb_s3UJMNnmz0);1O-Zx1WFeh8{62}gqg3ekI`skLK-HbVbqg{w4v2%Z8qDl
zU%x!uJ#;#)7FYf?Hv0H@>%<B|uhD4GNK7=U44oLPHe3HdKb8XCxpOBV!077gYLk<b
z-@kuPmr)xU8eDSLw{KqsNRb;1=n2MRK5dbak-53Kw{PFd&(FuQzrX+C!w0e~hlV=Y
zGR<HdS(+Bc&!0bsgoK<qbGEv=DkCEUmSbXLLqkK6wiRHcf-4+8LV$Pf-1Y3)vomMT
zL`6k4HZ~qVe&X8IYecFL0SjPN;R+?0jGsJt>gLT`FJ3&~wQHBl<syc_*@0pfQk5BT
zRL(`Kudl<wz`y{W1wx{@&`7f|SzaWbnwnZrPymNv`P$Vh{e6AvLVgj<7#W1n*Vfi#
zWTZQt&Npx0K7Rb9si`SGK90|zoXCZi85u<D>FK?A@gfYqe*FgP%a<=7J$mf>_wPTl
zv&l5N#gA&*ZCdyC_GZcQuARFa4u`^pQq$7TU$_8jAxYA}jncAmyCjJhkbGK@7(Ofd
zA%cg7hJpeE4(#7AJ`8NNwYQtiW=_BoE!ZK0$X`%k(9DP7;o*+&v8}CbY-~(fEXpG)
tkrNXWU0q#a&QS42liOSVGhpgA^dCf~W&%&hkTw7S002ovPDHLkV1m}vHRJ#Q

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/content_bg.gif b/core/templates/beez3/images/content_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5e444766cde4c48faeb77d09d0c0d86e935f588e
GIT binary patch
literal 157
zcmZ?wbh9u|WMU{~_#(jY@87?VA3wf*^XA8oAAkP*`SRuSuV264y?y)b+t<&ZKfizb
z?(d&JzkdDt`|sbkuV4TF|Nr6rdj?W~4oES`E(TVm1qvGMEUb<b70ww*@N8r_n|!}w
W-TRvN{|_uE@X(R!_lV(Oum%9WfkPGm

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/footer_bg.gif b/core/templates/beez3/images/footer_bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d23544c45407f64b4fbf0f120299f8c7174e7809
GIT binary patch
literal 2231
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
O*5QKA8*U)bf&T&Mw&OMc

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/footer_bg.png b/core/templates/beez3/images/footer_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..bec4c6f8537402d91b5c56a53346ebbadd1ff02a
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCH*x?8hSQpxX8{HDJzX3_Dj45hVHb3A6mU6c
zo7JMo@V~0S;a}p4IyR2I=C7@+mzwHNS-bymwdUzurj3zms}(1+9!ay+&AZIKG19^3
z8r$~FO*vu$<rC-KHi<Oj?%3^dFn5;DY@nL2zSB+`MLNj1-B~7{w7Fr%8s5CiDK~W#
z-YMC_^fW>AoP9N0XL9PM28*5@zWPVf7!4z(?<_mHDbnGNYZXinD@4!itLBkvr&AaU
zB?@Q9b)02N+GMuFcXI0Hh8ITvMFbcbl@uIUTpSuWIH=9ud3NR{*~t@`5=H(eoCF1-
Mr>mdKI;Vst0M^oWUH||9

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/header-bg.gif b/core/templates/beez3/images/header-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1037d96cbef609228a8bdf95b638c86e7c1e9158
GIT binary patch
literal 128
zcmZ?wbh9u|WMU{~_{_=h{rmSHKYo1p@ZrmsFJHfY{q*V6w{PD*fByXO<HvXJ-Z5YR
z9gqk}F9VCIfocl}r^Rd8hW`l~eTx$3Wvp5j_Ilq2>oX;}_rENBU-SNZ>w*Fg9U;vV
SONvgWaLv20LPUy@!5RS4F*?Zr

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/minus.png b/core/templates/beez3/images/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..10fd95a139b439bc2132d6483f866567e1ce88c3
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^{2<H$BpBrOo|*=v96eneLn;`Pe-xCyH<Pd^`O19w
z>gxZ35B^EE?fpOTU|d^n#n0OvkEER$6#qs%{l4h)#Vhf9```Rqt?>V#?T+uS*co=a
Vo^f2T-t|AoP)}Dsmvv4FO#sp(F`57X

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow1.gif b/core/templates/beez3/images/nature/arrow1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..798b6f33bad19a619e2542801b8e19e101cd6316
GIT binary patch
literal 1700
zcmd6k`BPI@0EHvFg2E^xNEu3z0%F`df^iw9RtQV2POUPw0v4-?xKtfLEyyN82oMoT
zKqRYxVFxAb*+3E!1;L8Sk{6I9B#^w9JuFFscKSE;JNJI){CH<>NN8~2zO$HBfiMva
zW-?<m8qNA#U#8KxY>shx`HPm8mX?>778e&6%oxmBFc=Ja^U;5iPOsDJb-ER;luoDB
zYR&pwE7Kf}Mx)hgK9_l_HEQ+0SEEv^%$TJ#11TX00wK_hxfCF%02PY=u0n2(LM~s?
z=Q2+~AOHlw0Ef$@Ggx#cqlZo*k{)AAi}EoK@(WXM-HHF>!r5P=VE<RXF<4nS!%Q&v
z$^%#a1ZHbWgJoo9-OEPh+|SKJ=NA-W9uz$+epG_Rm6km&e^P-b5J_ap)5@yqXVjY7
zy84F3rskICFIs7B?H!$6-92;$lf~}sd)d$74)FM|UJnkv86J5{K!*9FSB;HNObP(u
z)P&`XNGuUq%jV|g3UJO!rPgS5kYNFw7S5VrmaX>4MnXr5wfxN<MkA4pva$1m4>geb
z{<PQ~Kh9|)_oJ;c;m4aT(zy?PeW_Wf=BGUD&e(zS&<)Ii$MD$t6O0>zbbOE_=pOdG
z`ndH%hW{C=bJa-Fk*hwqGT>P!IkLs8&rmdx(GZ05HiWg-erSmsp`PKj){W7wnWhI)
z#t8Kj?a3<X1drArpr>rIJH*P$0oXYkwnp*Wnx^|Po5L$2+M8#1xILF9`Ry&@L2Ulc
zO;d#Dvm@0%*F?SQcp)2YjOA7Q*x5Qi)^<ZS`Kpt4b?iu1P;yXL8#K*%xHbB9SG!6)
zL=MLv?e5UX9KGWDUw3!v6aYTl^{1XLgGw?|6Fu0|y{H4HdH5Z7Gg21xD%q*4bh>Hv
zVkjuMEBhseaLdLA7n9~d!ZI_Rg8hV<&L`r8_gv58gx2nf5+TYX-ft?$yCiPv-iAt7
z;r)#nlBv9}fA=J#-4f%N`GKNpasm9LWC|T*v3lA%Q0qs^Mf&VJYbxC07D}=?hS)Mw
zeB$KAnMaWodS=OQiQE~RnCva*aUR7NMWu0-&qQSji9jXx+Vxpc`OSA1#ZQt&&%_nU
z*?_NInvK7NkS?7S6LWm1ezxenQVAIo>_1B>-W$()iaSr8tt>48W~=bm{iW5Ek}&`3
z>Po7V`Yi^K)-)C|q_xDd_?o(=R0ONOODmPt<BSLvl{6eb*HnAnP1f9)3(U0)1<U5@
z%00sCDz}`gnQt9Wl+DwC?5*;)PbHV+?UI5#R>vF(Bku%@?y$O`clL@d{nXg@POVn9
z!yaY}2N_l_2_VzXw-#hM1k8bKrw};Q>wK#An#tZZHUWC+o)pn&?}>sdIo{X=CD*U2
zRyhEt%_(_1`{647ccTfaSDWdCJ+BWmIIstUY`3Y0esH<0euMO_Qx8W3%&SL^g>2Kj
zJ#p%?=I=<`gY0(^JU}xVgW9Hje-3+D`ysBXPWv%|Hs3nBt9MyDeslD)ZX#J+ryCDY
z&+7zfw%heUmdh2rFlCgWpUT@D6}T32Sg!w+HXYNx78iT;mY_6AZV(et75k<sJ1PvK
z^pGpbpK8Mk7GweChms`}wny7c8+)>CzDp-xRCJp>|614Ua`ga&@TRks`~bS8kQ>r)
z*zxUG3by8b^xXpxUj;1dfc-m+%lc1Ajy*b7RfEy-ElrW?_}((rxTMC@jat1JPgf7q
zqYpwxRWzUvVOWGUq{_kx7A_oy4FXJeLKCcfk<2xx!3<YE!6tyiTz4DH^mHKFg&<k$
z%fKwZ2;!Pk9M;AT@ZL@|(cuD;?e-DO4&)QpC2`mu3m_`Uf#ifj_IkNNImigodMu~c
z2Latbh9)^zA^ZGKL%ETB(ncDmZ~JX1FUEoF+K+s>y9`3dMUdS_IWPBiK>63uWOp&L
zAMp_?NamA0be#S}3s7O21I5!el=Hot5|a}_@p9pEf)UCG7&OJ(H<TN8T3LkSQ+xur
N+@qF=T~4t5{{ZB?!ASrB

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow1_rtl.gif b/core/templates/beez3/images/nature/arrow1_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c2f6a2eb29fcde3965e2a97edcf35e0e2ed7ca41
GIT binary patch
literal 1710
zcmd6k`BRf;6opZdMKj6>MF&w4C?K0wEg&Mz)Q$v5twZZlMMR4lL0e|D5Tm0M*@OT=
zFhr0gBoKrk2ucEBOM)ao5EKg{Xu_Hm@_pF@;Y$N{`Zx5Pd!KWDeCNF(p~nLJFXGk&
zm}!t^v6rtJAqX-Wq1E_OA!ylTXnFYy3<ksUvSDdyY0)IT$%}fuUS}HJ7ie`_oldJ=
z!AfYg8jZ$;)mW(}tJP|aM!g!Qs#2>||E^l8QkrCf!X!`uf*=3_CYeGG0CGSs|8M0B
zCd(HVR<IhTD&X@4d_f<#m)Y6H>ST6xbdre`#f48EW#jU)bMM{0bMai1(P%XLzsh^%
zVJo*Vvot0llOLp{rln^*%*?`O=j7t@9_1H2#upNv6cs-$DJ?4}R*=Y*Rg~&yHMP{b
z=k*OQ8k=6eYNpX!S{ZHa9i3fF7Q6d(4~N^^*UuYxGdT42-SGR;b)z3f*N#to`pg%M
zubG~iofC@0k~Qn+O<y>sSZATuXmu9mO9lgAoS(CHMA(colC7+thg&uf+3Cy9VFkK|
zDRzp|K6Zkhm$%_-gn7$Rc%$puETdg@WN%|-INrm{jqt?j3Ip$VGdQTLi85IB-L4Kt
z$rjOHnO--FA~6w^;RGZptR(DJ&B>ad9*3PLn!|B%8(En<!kejMO{n3T^Zm_r<Ft6=
zbYBUh`L9omTT02Ne%fBXYj{$|WjMWIlAU4e6~&{!nC9SI!b_1YjkEoP196{uEln}b
z;W>5*@Ya{&;p(4jqXt@ENk<!g>o5J0(L6s+zbXAZz|hKehhuH-!Q1HIG&kSt!ke}h
zrErK8URD~E{HNqYQyl+IJ3}iM<R7((NO_r}6b;v280=`jqxx#9Kes*#TC&zDrS}JS
zwL?Z*mAfFx+#VH;(eJ1hB*Xkff(JJC2xf}iDHJi)AqG8}=6IICOn166G?}^^kD7Yu
zksL6UX?s>MwSHfZhl|C*5tNI?{vPh7R9}r~Iu|ZMPi7yozc!P1ID+78%nbDtlk-E4
zSx@J?_};#B$1&#FEIu+pT#4VEvS*GE^Jt9u1XX3tD!Se*b}PPAwMY2$*2pzs33_gf
zX?a&8rj(&DPNMP@`&bb%!>yHBf%WSXmEjbjv*dzPvEoWX4vJOvG(mFBx;)J@wz?D_
z>q&7Y*GOupRbi~!h91v23TY%(T1TJ5Na|cv5~<Zw$WzwPo)##5#&xT`{+x$*k~R$-
zJ6GHI{#4vNg%(vTE1XCuX3+#`UJLXYeB45dC?|{6DyxWRF@TQZg*MeloNt?Eu2$YL
z-^h@6npt`SUFIa|o{d)SRDcEZmjP^>5O1*C&SipSe7*HF73^_Llz|+lbZ-UMwJ`F<
zMh^;A(dSK*Df;(u3@qL^qt}%K0Ya+sO^{Zm9E4l?sD^%^@z%l+?sckn2M)HYhEIg}
zsNer``iA=NGgs@>Baw;o>e1+QAI*oD3qI^I6s1n{@j7i@Gak?J(N5eNy`lYt79L52
z-IdO3`AL?(IzcQynm+lh>pk5R*8lf_O}L{Ax|sr(QuLHx%=6oG1#wY&VY&Ztwuqb$
zwTOv{rTSSatwS$u;P@VvJ=+UmW?l*Jp~VM9pV3n4lCJ^i-k#&Pnd_e0wu$F2Hz<ds
zL+H)#Pyca5eJJMs5%pUsZdofx-wPRaW5(zXeIKPBS`6B^z+M_ZcONnc>pR)YI$^yL
zGRV7v6}s*GC5r$!aB?%IK)MSm3JC^E>d`jXa&vb=;Nq`9@-|+%g+G_M2?IQEf)TAk
z5UedlK#B*FxZyOHW#0;<?!yvcR}pN7k3d=gkGLt3%ig&Nq{CqqHtC3NX9q9?fvnh4
z$nACu1RtKjR@hMxuRYI#nP+$v_B8HmUksQP4I^#iAbR!}fmjrh<S@$Z@oNRM<FO=1
zA%YY55zImJNISJ$PVgd_n*<{}S%z}IcTnImkYwkrz1(AgiaZ>a?CKuc8+KOlh`=Me
h`S<o7$0%&`%VCusA)$Q{MT&xIWThu<o0Zw&e*mcf#LWNz

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow2.gif b/core/templates/beez3/images/nature/arrow2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..efa2f997e6b5c6949dc9361552dfdfd1112958fe
GIT binary patch
literal 100
zcmZ?wbh9u|<YC}p_{_!7-_si(7q@@c-b-iBZ{4_g_3~A%%`H#wJ$m>2b!cd4Q9&UC
pD$oIOL3$ZjBn?h_uHHMNOK_9boOTY$Muv#Ow1$a$3uG7>tO0dsA}#;`

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow2_grey.png b/core/templates/beez3/images/nature/arrow2_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..757c25f4ea4f4b3b8296c38608b242c41c404f04
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#%spKkLn;`PIj(Z-6+CsYfyKe;
ze`A5vECG==1<r#HcL(r=ER<hZwqli3z}cw2q;w7U6>Q9k3=H0aYJNf0e#?PIFnGH9
KxvX<aXaWEb)E^uG

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow2_rtl.gif b/core/templates/beez3/images/nature/arrow2_rtl.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f94e2d639e6e758c96ef1db83d48b5a844e322c7
GIT binary patch
literal 101
zcmZ?wbh9u|<YC}p_{_!7-_si(7q@@c-b-iBZ{4_g_3~A%%`H#wJ$m>2b!cd4Q9&UC
qD$oIOL3$Zjqzq1auHL(&P4R;rmzshin}W-<Ijva?Svv884AuaP0U=NT

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow_nav.gif b/core/templates/beez3/images/nature/arrow_nav.gif
new file mode 100644
index 0000000000000000000000000000000000000000..800b2a2e49c28a29d1cff6ee2f45478847e4cb8b
GIT binary patch
literal 79
zcmZ?wbhEHb<YM4rSj50!XJ_~7)$@%T*O!-<d3t)DIB_&BEv>n^QSm1WiwMJi1|0?<
h0I6kQ7LnL>NAKuL=0!50Y)N@}Q?5Eh&17J(1^_t?8aV&}

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow_small.png b/core/templates/beez3/images/nature/arrow_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2d1304961f9e9a3cdc20e3f1916e0abb5863d8f
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^>>$hmBp4oAa_|Ewbx#+^kP61+im&oK5@DsajTaU!
s{jOM&aj1?%c9*D6x^2UX-&{fL3;~X66O#{p5d~@WboFyt=akR{00S5q-v9sr

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/arrow_small_rtl.png b/core/templates/beez3/images/nature/arrow_small_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fada116a68b64b2f0d5e59e04c7be27578c742b
GIT binary patch
literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj>0VEjW^8-KvOeH~n!3+##lh0ZJd3v5Mjv*C{
z$qfzRJT8s;v8y|R%J-X0(P;fG?9>^&!*q&AD-Zvsj*t@{rgEHTV92lKTPYG;{T*bU
Mr>mdKI;Vst03|>m!2kdN

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/blog_more.gif b/core/templates/beez3/images/nature/blog_more.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bd394eb21f825b6a498aabb3e44600b8ab762b8e
GIT binary patch
literal 349
zcmV-j0iym#Nk%v~VaNb70Q4UKtgNhNVPUYXt!!pyh=PKQhKAnU+)_?XWM5v)%F0Sd
zMs;p(X=7qeN=ipXMTLZfJ2^S>^70@bA3Z-k!otGAz`#&YP=<qpC?_YXsj1r9*^`lx
z*VorJG&BGI|6EsBEC2ui0LTC`06+!epeK%GX`X1Ru59bRa4gTQArwm?7<BLdz@TtA
zG7uP_&E@c65O~C>bV{vSuh^`1%k6r<;IMd1E}PHjw0bQp1P%~OgyT2_3hcao&+q&H
zfPsR8goTEOh>41ej73Ku2MtV4P>q&UZg3a?9uIbSm!VTOI69T0sHv)}tgWuEu(7hU
zw6(UkxVgH!yuH4^fC&Tx0SEyD1PQ>Z0s|ik6dDc+9|Ho*s0#=U9TF2B6%7ar*rLtP
v8J*PD<)XsG#>mR;^!4`l`1$(#{Qds_00RmfNU)&6g9sBUT*$EDpb!8%$Ni&^

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/box.png b/core/templates/beez3/images/nature/box.png
new file mode 100644
index 0000000000000000000000000000000000000000..98d1f73690cec621ba85f20a332f1d593beebd41
GIT binary patch
literal 94
zcmeAS@N?(olHy`uVBq!ia0vp^l0eMQ0VEhqc&#mgl&YtTV@L&Ka?R-mW`lpnH9re3
rKa)PkD8ArS%~8$Ixd&4BU2<n*Shj&L+iF+85J;n^tDnm{r-UW|3Njlt

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/box1.png b/core/templates/beez3/images/nature/box1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e52e2aaf26b142685f18888ea3bbaa27396adadc
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^l0eMQ0VEhqc&#mgl$xiDV@L&Ka#c6C0p~*|pZEes
rwX~RqPMHH8+!L0zGm0y?^OvSFd^9m)^Vxn=5Tw)7)z4*}Q$iB}So;<4

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/grey_bg.png b/core/templates/beez3/images/nature/grey_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..035de2ba1982760b2baecf32a2c8d38ec19a701d
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^l0aO<0VEijH>#=uDN|1u$B+uf<X;Wk28IuqDpDj0
z8yn4gZ|O;tn(p<Hj$0?^o4@#FZb%v&vI#RVghorAxxbew1!Rz?tDnm{r-UW|vEm+k

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/headingback.png b/core/templates/beez3/images/nature/headingback.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cb1252e49847504cba8a2f848d7dcca5f20b695
GIT binary patch
literal 87
zcmeAS@N?(olHy`uVBq!ia0vp^Y(T8R0VEiHFkZO?q~ttZ977~7C+|GTz@*b-vS7xF
kOfKd`Il(qVfoaVF46zc7^R*Uo&jRW2boFyt=akR{04;(QJ^%m!

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/karo.gif b/core/templates/beez3/images/nature/karo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5ba0027b96bd9d987863ba31f38f832d3c41cc9b
GIT binary patch
literal 45
xcmZ?wbhEHbWMyDwXkcJCbLPzd|Nj+#vapCS{AbW%00NK<0~1S2|H=pkYXCOW3{(IB

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/level4.png b/core/templates/beez3/images/nature/level4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1d04af21c9d8de70fa88672a4149afdff6f2186
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^8bB<<0VEi1=_;fHDMe2g$B+uf<evu}WD*jW>~dmz
n6>U4m=CDJ2>te3|f-40WZhv9&%h8Ts0n+5@>gTe~DWM4fnba7v

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/nav_level1_a.gif b/core/templates/beez3/images/nature/nav_level1_a.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a4341489b5f9454bf82be1dc2c15c6f0c9e93d3a
GIT binary patch
literal 160
zcmV;R0AK${Nk%w1VJra@0FeLy>FMeJ|Nrjp?f?J)A^8LZ6afDKEC2ui04xC%0007U
zjE||y?GK}zwAzca-n{z{hT=$;=82~2%C_zc$MQ_q_KoNI&iDQg3<`(DqVb4KDwoWr
z^9hYgr_`$Tip^@b+^+Wv4vWX+viXcotJmzdI|PW!=k&V$j?e4&{J#HhCm=XTSZH{N
On5ekO*f=;;0028vfm5CU

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/nav_level_1.gif b/core/templates/beez3/images/nature/nav_level_1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3169b910caedb4352a1a6a1393491a52bf8c28e0
GIT binary patch
literal 223
zcmV<503iQINk%w1VJH9;0J8u9{r&y?{QUd-`}+F&`T6<y`1tqt_xASo_4W1i^z`%d
z^YZfY@$vES@bK^N@9ysIA^8LZ6afDKEC2ui04M+y000Dx@W@H4y_mkuyZ>O=Ib>;`
zXsVh`>%MR-&o5)&c&_g}zWl(Ta7Zi$709G=$!t2G(5Muds9LYstaf`vc)#GVcuWRo
z&gipY&2GEj@OZmGuiNkVynfH``{@LMf`f#GhKGX#ii?bmj*pOx0+W=LmY0~Bl>wZc
Zo}ZwhqMiVyrl+W>s;jK6uCJvL06UNcgbx4!

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/pfeil.gif b/core/templates/beez3/images/nature/pfeil.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e5cc250b2f2a3667f09357ea3745481ff2cd3796
GIT binary patch
literal 158
zcmV;P0Ac?}Nk%w1VG95v0J8u9W@cvS=;+18#kIAyuCA`7rKOpfng9R)*4EaGi;MR5
z_Pe{g%*@Q*-rnu)?EnA(A^8La6aWVREC2ui01E&j000C_@W@H4y*TU5yG8&(AeKTD
zg`rqMaV8fdrsXmWg>c=2;na(T;UXvwEX5+jQeZe&l%_LKDIyS!N@H+EKqsTC#i1yB
M&gisyjg9~SJFI+1>;M1&

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/readmore_arrow.png b/core/templates/beez3/images/nature/readmore_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3e40edb4d9c6e4b0bc83373941a460f1ea9602
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000jF000jN0ssI2w6p>p0002{Nkl<ZcmbV~
zwR(d96h`~%QQV39m`vCcq!Uc_nUObOY|mGmdT;!{=X!2l|6(0F%d#X%eBVEvPQ3FS
z<#YPw<z=;6nT8<>!gw^|-7t*ha*5ujk!G`5!HtH)`W*!wZ$nd#9D*PWheM#t`Mh4Q
zhn1n@g(+$Jvn*>mdAIR6j^jMfH|sUI`N`8VO_-8qAX$=XA0hYm_XO;=TT<{;WErNU
z*#Ht;`<bRG0YyE$Fs<COj9Ob51n5B!6a}da)9JfG!>~Z%KIxlz*|a2z1$}$HMqx<x
zx@o*Hoqf+|GXf}GEW3CL^}av3<#O4+CErod|NTGti@gCIN&mIEEsO;K0000<MNUMn
GLSTYW0gKB3

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/searchbutton.png b/core/templates/beez3/images/nature/searchbutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f1eb5bd136b11c3e8290391dbe07013401e180c
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^B0xNig9%6mPPXp^Qth5Djv*C{Z)aTRZ7>jUeybsD
z#FF}-bq1r;=Z`<O7tCAtJ$Giwx7U+abqFfE<;)k4mJ;Cqdo%aR*~D%4m%shU;k|h+
z!)^5=7u2@#=H>{iNN%}bZ~T@mVgDMHs_aYhi)AyTkC{0J6&Fue%9XxVx-Mu9=Nisl
s1w{{rV|tvqLe0D8rp;DJEWXbeq0e$%ZPGR?ppzIpUHx3vIVCg!0AHX-`Tzg`

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nature/tabs.gif b/core/templates/beez3/images/nature/tabs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7a647beb8af4c3c6f858b46887c8c9c24a2810d8
GIT binary patch
literal 1630
zcmeH``BPK{0LS0%!tTnsag3M?u8IeU3L^x{kjoK*ZboH|Mopk->L@8*q)sgg$S5IN
z8Yv1mc;<nVsihVmCOYoD``+8PZ+G8)za4CHP=_M@Kl=Xu`Q`JO?~?M;yxi&ppavMd
z09f1>S(bf4p969TqQLU34YUP`pd?Ei&oLZ>VyGyIcF-<|LXsqT5D!LTPT1+k{VuO7
zfCp?Io7?LaMUkXQ*bfJY0O$j~0WUA`NDv_?0tq0YkSs}}*YCB1HkxH9hP1k^a!B@L
ze%SA&S=x=bU9bzMa0rDxKF|p{c!85-87J|O9D-1Y;aH2?N;0G!vSSo32m&W?EXRUA
z55-V!#N+b1If1u<RuF}p@GD$!LQV%{CuowO2^fWWk*8=1L_o*~GAwO%TdW=n#n5)h
zLDB>oL<NDz$e_(*b$Xo?OS@pFEK3g9L36YXv<FE{5JivA1Nk9>#zjd&0$!S-gJe*a
zL!u~9EM@iBKp#Z2lsABIJj-$nP7%HU;sEU)#O=pWC+y-y0ro>UjeGsD#bbqh5Kdtj
zg$a^~5kV_xB^c6;xGWxv9}hq%Xa^lU&vQKQ_PQ_v3&}E!LL@`sG!Y<zq9ow2a(G<~
z%dk9$kvQasB}qntK2Bh1h9YT-;piX{aKUaA^IKdNUl0w2LROCz_<sP9@mj*`F96zc
zK%v!_ZK=ArPaB{9>2TlF`}&1|u|#2B`ar+pUsGXY#DjztK*d;L!===Sqcc7{Q}Qf}
zKAx-2SZU1pxu)l6WyQUoRYUt4rWHhMpKa(VGj*wNYUd8zXiUnAj>_&xUw2V)F8Z?6
zff&mnb>;baNDpN_m8?>CzngC?|76Z4P5;_C#YJ(GmZ(z~PE)i-W$yYXP*6A2lrk?)
zx2zpodwpU->-@Ci#(}0ok2{t`|7z-4&@{De(dX;8R%i3hbLF>^>Z*r(B6W>J&E_R<
zg&{?oif3=zlY1bk!aUxl2-7}I(&r`2SB1yu-_h5Wl-Gu}ADR9Br65*SlRss_$*PWV
zN0nOLI{An-7k3Tq{ch%*?4iTg8XDEnUys?Z{c+}-1KFuzWks6gVaI@36W3ANuwk#R
zNP7y#vHd$6M+TZ=RwwNP^bu7{4;Y%^>Xelkea4jDjtj)W$nRkyEOU9gwl#eyukhP+
ztb<f1jts9kT=4Swn)XC}74@d3q7FD(n&Ry}a;Bs^eCpv6!`WjWZ_H{wR$1D2cIN!M
zhL#yQBNgimId}V2C+7D)QpN5tj}%QYbiOf5YcdUno!W6)G1#@N#=s>usMFW0mt_tN
zB{oOx9*kd9cIJM3AqPC3u&A?p!@0tW-O9*~w|h!;Tl*@)BWt%mE!Th4xoG3W&t{M7
z4kpa3TD?zs<AhEf`CD_fGBU${slP7*Git8qC7jH-zJ1JGtOy?)QQdHtR&M@faVl1<
zobY5|?yVoU+}W%=UH{V+&D%PBAWDksxvD97VsD8RXZE*f_81)d<5$(&Rf<)Ao5SLk
z15()UW%WitF+R^^oE(#nswYK`S58nR)pTb48MVDtF)1l(5ExGC&QhwT_dYQ{N?vUK
zOEs&jRjrJ5j{%lk*X3;%EoUkQvhDp7l*Uoh{fUabj%|Qxda^lM(QC+YrDa-5ftbu>
zAa&)T_CZft9@d{0(_+{OobNR#z2|ROZu+)7oI8qczf-W&U(a3{4eT8)mPdnT&Ai*_
zuGre=Xw#Id&xx;m{m%n!5AWR!9O?St1=;b%)fY_Nd)8ZQr{;7$*ZV{5Oa8pM?WJ(}
OR%o~H(w8YZApbv4B^(w2

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/nav_level_1.gif b/core/templates/beez3/images/nav_level_1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3169b910caedb4352a1a6a1393491a52bf8c28e0
GIT binary patch
literal 223
zcmV<503iQINk%w1VJH9;0J8u9{r&y?{QUd-`}+F&`T6<y`1tqt_xASo_4W1i^z`%d
z^YZfY@$vES@bK^N@9ysIA^8LZ6afDKEC2ui04M+y000Dx@W@H4y_mkuyZ>O=Ib>;`
zXsVh`>%MR-&o5)&c&_g}zWl(Ta7Zi$709G=$!t2G(5Muds9LYstaf`vc)#GVcuWRo
z&gipY&2GEj@OZmGuiNkVynfH``{@LMf`f#GhKGX#ii?bmj*pOx0+W=LmY0~Bl>wZc
Zo}ZwhqMiVyrl+W>s;jK6uCJvL06UNcgbx4!

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/news.gif b/core/templates/beez3/images/news.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94e5aef1db552a317c85e1719e6c4d7219bbc144
GIT binary patch
literal 149
zcmZ?wbhEHb6k#~Qu!w=-`}gmkKYxDz{{8FMub)4E&Hw|7KUr8r82&TpfCNBl8JMFy
zcHOZxIAz(o*W&qs-T&nk`cg9IWvp74^Lk%_&iRtu`xWcn*S!CKU_pV0j#U4NB}FH5
xtma=>QR1~WYW<BhWvAa(?SHVL!bflR`4?NN&gSjD|6xas-}>9{D}tC9tO2`-NgDtF

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/arrow2_grey.jpg b/core/templates/beez3/images/personal/arrow2_grey.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a64b1e3407adead2fc9eb9830528381462a0aff1
GIT binary patch
literal 347
zcmex=<NpH&0WUXCHwH!~28I+MWcYuZp@o5wc))}J%y0nJ&cw(Flm%kA1hI_&2N(o7
z7&sX?nHdEcm;@P_1sVSzVF(8~i~$93atSanvM@0tiL)}ZuyHUjF|u=th#?6>wF#mb
z0QB)K1|DWcpe@XT4E78w?xlW>-y*pBWd@I0{s+18z1z!Vx;{!99XUDWiQppH+eQ{I
rpC-0`_>=NV<-@%tS7JBDFG<n7_asbl7u%eLhjW|5B6!%?|K9`v6reTH

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/arrow2_grey.png b/core/templates/beez3/images/personal/arrow2_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..757c25f4ea4f4b3b8296c38608b242c41c404f04
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>0wld=oSO}#%spKkLn;`PIj(Z-6+CsYfyKe;
ze`A5vECG==1<r#HcL(r=ER<hZwqli3z}cw2q;w7U6>Q9k3=H0aYJNf0e#?PIFnGH9
KxvX<aXaWEb)E^uG

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/bg2.png b/core/templates/beez3/images/personal/bg2.png
new file mode 100644
index 0000000000000000000000000000000000000000..755a563205fb12cbd6ec55691d1eb3525dd64cf3
GIT binary patch
literal 2603
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
N002ovPDHLkV1g~5J`n%_

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/button.png b/core/templates/beez3/images/personal/button.png
new file mode 100644
index 0000000000000000000000000000000000000000..03221a8abfb95b042fb1d68f5f37d984e9ff6f31
GIT binary patch
literal 3007
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
B3$_3N

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/dot.png b/core/templates/beez3/images/personal/dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0dcfac4966223d0b34293573b7904be7b9d428c
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^e@_?3kP61+AN|Y@s&aeoetmr2
zT7k((K*-_T?fmIsaTggDowt`~+8MyP;85vxpR{?242#xoztb4ga->Z<?1T`<V!MAk
kctx0$Is$*_9%p25xVmyp_WkGbK%*HvUHx3vIVCg!0C`9)<NyEw

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/ecke.gif b/core/templates/beez3/images/personal/ecke.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e49fa0d794a42893f95627e0b38dcd789ea17edd
GIT binary patch
literal 825
zcmcJL`Abs)0DvEPWZ4guA!eQ!GE~CS#17Ch%CiDPBGe2)Rz^gDh=EM!J<nEJc{j^>
zl+(>Q-E`Ac&b>Tp<u!G0dpq8HJKpBn)ah9HNA&#zAK!N);d=Ci2PHr-U<m-!Dis7l
zT1>0aX!iE@^m;vx<1h@%WHPxzfnk_IZ&0h%cDvnXvstYctxjh$nG6O4Zom~VtX69f
z1hH5wD1vG+OsCVKC<@8tN?5tMxoI>SK@bG~CxJW8E&vb!gzZcAn*djbpqzFk%)3t1
z^=#(x#r6dPHTKiJf#v=@P+!1@7+Y7*G|wZfg4rirnUN!n8<67Lyux{W*Fh>OJXTU#
zR$ftAMX9c-t*dXS^?&ucvFXj*cg-!WZS5VM?`d5hK6cZ4di(l6b-6MIhnTEk_6TQm
zjLRDz^AJo<3BP>(HZ7VFgWqSx#}|J5l>GX=xU{^oDqUM&b%*2%SgHDV48^oMJ?3IG
zZJPgBtXtbVw%t9u%^Pq!>=V!Em?XP-grtiYox<{?L5VH#X9G(pUJ;MhM1!>Hx`4PU
zpM-N=Bq|}bH+^R41K1RvEpADO$SG@%evYlpFuUg+?Xl#;zKN0aVp=>kBty*Vk#ygt
zCAKD>$IANdG9Rsrhx?WWvV>K>N$ma=CQ;Ix;qFP6jy#3Mtw|%F*SYy-Y@M=HEaQ`$
z-2IX{47sqvBQ&!*p9D|W2PL&7j}EE8HxaoT)uY9l`Hnb>U&<H@mC#fBGHc!yX_pw;
zU|R~8t(S71Yd306k#L!S?CyV)$1%YoYUuqr-l$o#Kue0*=p3_XmzlY;xpD3m4hbp#
zw<dTyW<>HLMldnHyJdvI_FMc3`|h?`+AZMo9S*>i0Fj(MiBOSSFfr@EkthTrAH7bH
zmz+o=%1ga+h=B)v@{lxnc|aLKQE|GFsHh}-q${ez*ocA>-smN$j$9<dHPLE1TzlDy
zz;&_K3PJrf&xgu}_~0Jp%j76jNxdC)XzJCSw1=wKcXN7Fjp=!)swpe)q%&~oFI4x#
A4FCWD

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/footer.jpg b/core/templates/beez3/images/personal/footer.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..87bf62466ad797c1ffb62b7b02cbf7a727603347
GIT binary patch
literal 531
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZp#{VnSn&S<gCGaP2?kkaMnMK9K}Kdl#{Wkc
zB7qKLU}iuDEX=H20t}2y>_8a=5Kd%d5=v@Z`0&F-6mhT$L1dL+k^i?Cc$gW1_Am=F
z*fYFafG`Lbi{;hbbqrx|3z)WNH;C?zVG@mtPhncGzlkw?`b~z_r{6R(ZOC6B+FZ-9
zM*0P7!hMIPZTA_%Za?6<UBeii-{2S{!&*=vdhkFvI}>YMK2WDQQ0Hu*&a*(B)7=w9
zc3Cqly?BFFukS!(^wtAh2+JInUbw)j*Vdp}V#4UXaDhVT({B!1pMEQdR@P47+OzM3
zz%{rn+PNQiYjgK8tlfS<blVRmpbMIISa3afpxxZCj*o?F&%G1Kb~AGT{rdkV0JyVs
Ar2qf`

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/grey_bg.png b/core/templates/beez3/images/personal/grey_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..089d059bf1328b2c4112bbb1dbb3828e5ddc66c5
GIT binary patch
literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^k|4|hBp4nx-P#YNWIbIRLn;`PD-Sg=Z`g3jvyF8*
ikFlR*+e0;DEoKH5H^!8Ca<4l;8a!S7T-G@yGywoV9~J!o

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/navi_active.png b/core/templates/beez3/images/personal/navi_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c439e918bb27481374709024d1e029e1ce543f8
GIT binary patch
literal 88
zcmeAS@N?(olHy`uVBq!ia0vp^CxBRukr_ztzTu`1q?iMILR{nG;xacIc>=ito-U3d
j5|YUhtcw#wc)Wq~cNiEa-(XJy$}xDl`njxgN@xNA?Wq#D

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/personal2.png b/core/templates/beez3/images/personal/personal2.png
new file mode 100644
index 0000000000000000000000000000000000000000..82f13a7400313dbc764b32d0ce65e0e0caa26b25
GIT binary patch
literal 19575
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
Ef*P39cK`qY

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/readmore_arrow.png b/core/templates/beez3/images/personal/readmore_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a3e40edb4d9c6e4b0bc83373941a460f1ea9602
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000jF000jN0ssI2w6p>p0002{Nkl<ZcmbV~
zwR(d96h`~%QQV39m`vCcq!Uc_nUObOY|mGmdT;!{=X!2l|6(0F%d#X%eBVEvPQ3FS
z<#YPw<z=;6nT8<>!gw^|-7t*ha*5ujk!G`5!HtH)`W*!wZ$nd#9D*PWheM#t`Mh4Q
zhn1n@g(+$Jvn*>mdAIR6j^jMfH|sUI`N`8VO_-8qAX$=XA0hYm_XO;=TT<{;WErNU
z*#Ht;`<bRG0YyE$Fs<COj9Ob51n5B!6a}da)9JfG!>~Z%KIxlz*|a2z1$}$HMqx<x
zx@o*Hoqf+|GXf}GEW3CL^}av3<#O4+CErod|NTGti@gCIN&mIEEsO;K0000<MNUMn
GLSTYW0gKB3

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/readmore_arrow_hover.png b/core/templates/beez3/images/personal/readmore_arrow_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0919971c7825273fc8ad510375b0ce94f66c195
GIT binary patch
literal 256
zcmV+b0ssDqP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-0000{P)t-sm6et1
z>gtY;j#*h*Yin!g?Ci<O$#-{m=;-Jc6&0PGow2d8+}zyW-rl;py1&1_2nPpwczC0u
zqp+~Bla`j+-rl{z!QI{6K|nxUU0p;(L`V+{`Tzg`YDq*vRCobpPE`VhKnPrV1AU$M
zzo*^KACrXt9>YzB8I9(fi+Xe|Jl<Sa(4(rkzo~TR{n8VKy4zF$IQ4{Dccb^_UwVtY
zu)A~YZ}=vFm=`@<1Aya@pHEPm`)^MX`8?>nfBx_E{}wHJatpEu!Sycy0000<MNUMn
GLSTaF4Rx&m

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/personal/tabs_back.png b/core/templates/beez3/images/personal/tabs_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7c88106b3da4ffc33e73f2384cec54d6ab5708d
GIT binary patch
literal 4727
zcmV--5{T`IP)<h;3K|Lk000e1NJLTq000yK00O)S0{{R3*oSYG0003IP)t-sUteKQ
zPfuA{T31(CPEJl+TU=LGS5Hn(R#jF}P*Gl9U|(NgU0q&YU0+>YUs_sQQ&Lk^R8>?|
zRajVATwGmHP*71(QBzV<RaI6~Q&V1EUtC;XQc+S<Q&dk*PgGM>TU=dVUSL^RT2fI_
zQBY7=SXf(IT~t(5RaI46T3lONTUJ(9T3K3BQc_Y=Q&?A7Pf$=@TwPjQTv}OMP*71{
zUSC;QSz20LRa8_~R##C`Qdn15R##X~PEA}}Tu@I>P)|@@USCmCQcg}!U0hyLQd3x1
zT3lUUSz23ERaH(;PhMYPQ&Cb}TU}sZVqjolU|(TiU}8;8OifKqO-xKpOifHoOioQr
zOifKqPEJiuP4^`Aj{pD>AxT6*RCobI$cGIDF$e=tkW#kDCa3l{uu0v2kn``<2L>R5
zTnL~;B4DHx5T6mRX<F;`8NE}8z%W4v)&H=~^MckS=a!Pyl+x5OXSyzV>tU&C)^`Z6
zvf5hn=I)Q=PgHL=8{(i?Q4E9Otk(x^k9}?1v%U9!nx&obCHav%z<P}5;0a`d@pxQ!
z9OuNT3p;R}x^n{adO<ROGgl<oy0KfUp~kL@p(YGGZ{WqTHyE6G4_@qf-kCQ5&WA(J
zdBB4qzZ?c!06|g;a7sx~N|II*BpARnjFxGx4fBnbX{=k|8*Rhz4gc2n4WsS14ZrO}
zFQ3ngllVQEA)DQ21)ERVry%tYU|Gw?$l6(>oz;+IHAYaih()T^Dj~RJd4)%S5JuRH
z2>N}YH~l^^K^M2nW~|$ptyZi98DuK2gD1gf)3%#O<#M^%v@=J|Ou7762F<>hMA5{y
z#c6hgK?4n;8jUncqe#=PDOS)!U8g#wy0lXoVuwW~tSAfRR0%7gu3%C^9TZimsH%dd
ziVan@q5z^wQKj9(8!zxI^&77w%F#gsKoCTst8nMhe=%wz--MK6i@O&}9Z}7@rPgYN
zvqxQRwhnF2R+>arpBWEp5TA)Dt(4DfP0T`gi%AmQeI}Cysp@}D3|iO24JfPf>VByz
z4>MPT7zC<982T^fg@y0z%W0)WF#7FRcoUT9V(i|r8aPa>7@k_k$w5W+z5ZRGN)o62
zeXp4ylTa&!LM4V>#7@X&GIQC~yC^YS+;(O$L9RF3wS5;o+4;8g&Avu(HbL)XLN(b>
zFuEsaDrcZB2tb3x;NI@6-fnYVHOfpi<hc|rku=T=L}d)qv=2R3H>iosCAayq^E^W8
zBQV2rqvn|x9OaEEXF)|n5&hu0Fvw9vHWXm_Aa)Q>R2bfNcKv#At(hwe<k*RMfnJ)!
zrSP<KO%`E!D)rOCIO<u~4WsIGW%;n|b>y86=hzK#YxBxocW1KWG<V7-gRvyPbKc~E
zbENLBECFM_rmZ-{CsK7|(U=oqjAA<=-(py#w}@eBK>cPB50`i*C+tCU&PF}?<z+{<
zdf~m_u?yW;Lde_X?HQ9K8e$-W7SiP2o9{FZ?4_RQW#mcm9C_va48rW9=x07)&Qs5W
zz)N!s_M}25TELi@!)1<Ds^9xAiWmO;gsk`8m%Fl-wJg`YGBU~7yD8%Nt1kDwYuz4Y
z3T`#mZgu651NP26R}XE|Q}v)6AyeqIoXdW-um<x5+01i@<y_33$Qq6KmWF2$+3V4`
z$RggD>~!qdTkWUF7O)54l0<Vh@%8sderpEpesm(5QKD9Py;(+pi@PAoMVX>GB3{JK
zVq4IoZos|@ZDE(hcFZp$q%Iia>WbW$*(U74(!{hTHz|&z?B}}`4Y@|V)duaR#bHB?
z5(K~Y{iQtW_L8}0W#c<{@<C|pjk)BW_uH@Y`0^r}$<aJZsfLTS*MA00<Ip-1FLz)F
zHA}LWiKUyDvqzn1FQ^f(XEI?yQF6;a&i2X4Q7Ox$n{%M%wd7-S9y4U$!6Vr<PASQL
zY8>?X2+UD~1@?5gVVW&-g>LqKt;Xuq^fB*T@l{X7zKC@KWlBk29Ajp-48>@s2Ns;@
zy3OT0LZ0Xbp?J>cr=jye@e8i1yRr>#>pwfU#T#YY{R*~RUEwSf&acpAyybZ?ctl`7
zX)mJ&@|rM1u%n52a=A!O0gTS$GmR*=EvXst0FbB%3|DE}r6F)A*7nHdA@@U8cbu1K
zw`d(JX=$$8sAq=M2+1#)Bh-Zr`E<5lmuSxVYOAd%9^uy$a}yKuPKuv^x`)#lb=ppH
zz1c!8#=*B-yLPB?#D=Ue6+J`P&IL9mV3a5mcQ)z*W0u{eak77PqIewcDUIV(T|g@)
z;WVKFd-@K;^!o>}qF|!1+;X;TQ+8ZXTmIwMs2gukz(ZN;8WGIi<|o?mXq{LL-W=Vd
zo1Zk&v9wj$9J<#IBI#!zZ`tl&98g1+PuQS)m6<13^6ohd<7*F=a#pSAiS@N`Y!oM*
z(~=d<5Zk+HKAUS*Ww$svwB?Yo72-{_^2Z*|bqm1n@Rd*R*ptu@bcx5crgeU5jrrS@
zeW1w-<3Iq`302Jf53_;#)x6C+A2hZlRkCili9;31-=2UppeQy|YDnT^O6;GC&sN6_
zLa1VWsi0LY4^zJ>x@Dv8{W-(@?sj73T;&$5UYI)9k$rIS+Uire^E|VUd3{&2U3{gz
z0iv8n6M>36Ng0-9I;JkD7R;-U7@V9@OLkhTF_?(#31rA3GJu)%k5w4YY0Y^KN)N|!
zI^?<X0oBt9@yaXqw$s^i!n{det)4K4?0-9^--k9o?Pqj`TK|a?B&FjwD0z1d2~SHc
zryp$i+AlN#=J&SY=r#qB^LVpumqMLKr~I?K5z?^LH~tR)0*%BX8d8lvm}Hriv;`qG
zLK>Xh1HjhprS|Na@i#Rxg9Kx{E`2cHk<1+r2i$~bABsfb7U@41R>j(e%wVW12L?NP
zX4}av&$-CFrK;cwW0fr8TL+RZvw;S%lTxXsR4pV9sN8CQ=XUsbM0Ijz;<a25l?QXZ
zOwhSZ!$wD>pCl5WJ_x}z?dsfFA!sV98#UT(V6X&iN1xLhXT(a*{;}0IU5n${;_GO(
zL;oH~$myI2l~o$d+z)5?Z?MwInq>D$6u==1HA%R_46$dUnhY~RWj#5LqMX_oWahlm
z?<|XT1%CZq1ncQghW<J2wHk6|YJ-`g#zICr{KhM)lV$>~SU6=_r7n6Z59FU1!|+s5
zgIHROS`%L#3^V|Wz9g%T-yx%#R37ZUN$*-kDxyTCtK3jAwt7&BFO^s(V4DrbeRY0$
zN5Mviq%rHVd<=LyS>l*~)0o_+FJPBL{1X&-<tFI@_L5EmlHDE%xPgFz0%S<+32$$%
zeh0TA8koRf?sST}M35skk0{Q%N+^3S|NiLJ0yox<P5ymeP#W`DkNTrEZ?+#cu)^>1
z^d^w`YskQHlN?|(pZ@1%tSYp3v(&ni{$pv}J>K>D{SRV#ohL@RnD%vabF+4p<|40$
z_S1D5OmpX*;`S+q_VxactuvJmjY;e2HHtNxJ|vYrhtj>KJ0>KkIOigYkI7P(@q?Xc
zZiXmrH58OQ5ch5NsiMAQ`H4a4AavU_BlK2R@fu~-@?iP=BnQ?}*6owgCODBi(8i6I
zrV~d6{RHroDgU(&#B+R|mZMlS&0etVAojG>3R*q+F{1M%CY0b<rXi{?&$AVYLaKsQ
zk(jV!(nKFNgV5%fv470d$V;4}%Q{DG)JO(;j03qvuOO(<-PYc%xEx7Bt0pa;@Ak#m
zx4jw8@@yeUxiLWdcJf4Ou}TPjujTFlXY(oD9LEtm{%<F~LF+A`V7hb3aw7ZA-%c)|
z|AJ*T(mMu?-!x}!g(pKOr9lg^cXF`Gq5q5hNFrEnAZ)Ol%B%1uX~0neE&Wdgiy9TM
zp78_ggapDG5zIcF_vlTn=*lL6eSkxM{`hFIwx+!4es(E=dom7jdNqKQVa)6~;$yC5
zfs5yGY!@o_cH-8$Q-Lj<xr|z60oJ8(WX<qh>q)Zn$FVUo;>yzu{l2kIqelJdX6cF9
zG}m%PUuS*+Sn(4JY^<G-$kSXDGIll((Men4WS0u;&nDBLS$19#D$&(=?mVm$1R0*o
z72TWZ+Bq|z;=KTpET8sfF~mmQqVTqLjk)WL&m}ArAx79!(-$l&oRw_LQeT`;7Zvpf
z{kOUINa{L7u>4&aT+czM({<3IU^v1=4g~~lulsKN@w<S@n)su$d?n&-I2O`E3dM|E
z1G8fVfmk2<ugf5QJ4gE#&UVr)5GH5495L&@v1Da3|HqY0ZGcD3+3^uFzfLw)=`zHU
zCi25O>ule2O{FwZ!jn;e<{|HluUwCwmn=&fbn>x%;VD~ddHyjwN&5Om^k@u=ONNEL
zN~oX<m_M^DV7(auYvM|-*piCQu3X;516Pv8>(|v^EG=LsCFBp=m|`7;Za79rg<h$b
z4ryyl(m9+I=D!^N(n3w<x@&2$wmQ-#$dAI?sdZ=ee1_ugx%juM)%=7scwDz^F+^NF
zE{2R%zbMj87OZH0KAS59=$Y<ZIR(pet5c~!n;A2Ty_4}+F3Y(PuUza{9yem`zZ>r_
zOV{=fhhpvnijb*GE)-N1eGr{zg=jmoQfLsBhGjh@h1hnoqzy`T3HMGrw=3SExqFXG
zK~9eoF7PEISx(WR(>mYP({W;#B=Dz(4Q!q-yUs~sieDJgQ~IJ~6n&|?ag&|QCKTct
z`_!(kF~(+@r;WjizLS_is>c9%NDhzY7d6gDgI};bUP<DlSoJeT)#^#n`+ECEZo>4S
zd3AjPQul)5XR>(xg5?-PzY7QUnUv_+3#e$!w|&~z3a`8fHV5e#%E9kgot8<v&PUIh
zl01LcYi|j#40nHkJuk3yBHSvW9{<ymzuPNq{6tN5$8nIF+(acj-O;wJ8c8DRZHG_2
ze?5k+%hH9QfFlFqcm078Ggbct%M1=fA}c8y0w%hLp3h}LC8Ft|e=@>{B+Gj>eJW%0
zVyj-}k}Q9EX-BgatccS=|2a4H^prxUH|nGSAEzGrUfU4m8xuCxW<G~$f(a4{ccvc`
zT#%p@Wq5tK)zq2d*YrN_!f?UzFQR$KrXKyYQHy;y%)La0Om_r04!P>R=^TFgmn&xr
z+f78N(ss9-q$jYkbkbwz>A)W?l+Hxuq1i@<NR}&Pq+8PY7#Fc5yeOi*ojw|<)f6m`
z6-R3PG^_k~i=xA6e08_VUH#PH>SMw3*jW)xS~rqqZm3pe8VGhlm85VfVMNV%9kR6(
z);pJ1Z$7&!N`iL`LvcQxus`vHs8e+X%hPJ#r1yo1Hdf;V>E}8&ka13ilNh8Xj<VS{
z*d@#638e_GHJQOl|JnS661Y32{qk%AvNOBgDomzW9=TE8a=^CY-ATA8x&;dg78<L<
zbg*d^hHSRhvJ;BX_&91wi{rTGP`2w#PWT!2jOb&ZTt*=+Bzxr(^17}sQp8sq*^G+D
z^}W^UC5rka^A{}3sL6IXjbY=@T-Cs%e3ve3HoJ026u}^g?3d2|UosgfoMf2~drLDL
zBPcD&ZpX0aRuwAE-Y;=tgl9=As>9b;mgMmMY*XQX*^kJ}LK`b7K$g0<y;*1G=)X|(
z>x8Y-mu7IHkd|tgD)}rMc#`_^B{f>i3iL89Nn_P^U7y?^6L)Acmx%q)Iwe!=u}nEs
zRA=b0Xcv3<K3lE!yQP~+^(T*)y^-NO7PD-odNT5BQM{vTLE7jU8*ljg*RGN$b8KwY
zP;JpUP!X<GHf;yNbp7m{aI8K1{J<tAj;}ws9PJ|AsR<d6ydv*H|6WEKkhcRjA8+n2
zFpT?mJWL5OIFhNZKIP)HvQp-KAt>ABydP<%x;nF4pni*F6~LNe{C=yc`csJ*lLhM>
zNQDuXWVDT;pxK8&8a*|q4?9kO`^LPl;6JS4ASTIIwF~X_jA{L*1C2ADMa7E_s@WW!
zrfEJ>Os?=0ff<Pl$DExG*)Q*r72u<vUrbf)bchN*BIt}Ru=-}&9sZkZ??{cn)GfXa
z*$_x}$2+uY*Ee;l+q#`jJ`Iz6>Bq!VPbJ1BdxY07eqq%``8PaURY@x8TimhI9QOtX
zYtl~o)9<uO`~0N`(so<8o{A{c^Y@uNt!OAy5ScyQ#xXUGNmhQb2aD4dYy=U?YrYKZ
zh?^bIi~B^==31lDr(@VDzoTmNPEG_7V`bRgpO-om`7e}vhV&UNNwoj~002ovPDHLk
FV1gVq7I6Ro

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/plus.png b/core/templates/beez3/images/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..98714d848cc1dac2cdf5fe24be6da50d775b0008
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^{2<H$BpBrOo|*=vTs&PILn;`Pe-xCyH<Pd^`O19w
z>gxZ35B^EE?fpOTU|d`7ji1K^vZMoRk~tLC$Op@vwY_a{r~Iqkrr+zE{;+?4aBsCd
YLv8x;O6A3@|3Kz?y85}Sb4q9e0M0fq2mk;8

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/req.png b/core/templates/beez3/images/req.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1cb844c9a4d82ae486e0953d29def2826bacc4a
GIT binary patch
literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq000>P000>X0{{R3^EY)-0001TP)t-s%*x8w
z)YLjXKgPz!%gV~PwY9agv(U}Wpr4=O;o<P`@Z8zi=jZ2~o1C(-vBbi{;oaS%qN4rz
z`ReB8?ds~$&d%1;)0LEzot&KI;o_p9p~Aqx<>KONY;N!C>+|sN+Sk{#va{si;DdyP
z*w)tn|NjUW=wAQ;0LDo~K~#8NrP5at!Y~X3P_JClo!;p6{#S%JfG`<`5A^#+BWq=G
z{Z<c2l@0sQs`Nu*S(-fPg4~ocewS#_El?Cif>sX^OSD=8XoL`B0<2fjQ{rI)R78~3
zxYH0nL~3{fEoVu~*2#WLB#KGeGIgR1J_JTNvH3!B>m&>o5`<3rZkFAdXiS`Rz1LG`
zL>0J)=Om*L4R{W}?R0sGQHy;l@IIUYi<W+Fn`4$W;M_QCZ0h;|&YJJz%D>O@roaDz
bU;oJs38^rdF)_y`00000NkvXXu0mjfN%6!3

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/slider_minus.png b/core/templates/beez3/images/slider_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a7bfbe0303004303daa6b21af3bf5c70a6e2d64
GIT binary patch
literal 2594
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

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/slider_minus_rtl.png b/core/templates/beez3/images/slider_minus_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..8611fbe85a78b56b59e55fb2731a5d255d3f0b65
GIT binary patch
literal 2616
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
PM@MUjgGH^G@5BE9b;3iD

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/slider_plus.png b/core/templates/beez3/images/slider_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..78c2ad2acf6f1be6f50136d327837ff923fc1325
GIT binary patch
literal 2599
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
JPDHLkV1h;YI70vc

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/slider_plus_rtl.png b/core/templates/beez3/images/slider_plus_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6dd52f49a6f535197ad5de4f104c4f6500dbabc
GIT binary patch
literal 2623
zcmZ`*c{CJk7axqZNR}GCS&G-%AiE(;24hW9mShjfQc_yRUKlNtZIFFvqJ$K(FY_{!
zeQjhXG9zLZV`dCqb<X$x_uc25`#ksD`^WFz=XdY92nTyhL4gwj002PH3I=rq0Jw+;
zZwo%I109%PKYnn9IoLXx@9pi;Xtb7=mhtg%I-O3XQpprDl}e$~s0_yTAEDE>4nn9q
z?47#0Iy!x8Yl}8FH@CUDxy{(#-`{7mcPJDJlgZH3)ZE$GIdHRBtliyRHk;ko*VozE
zNuiJ#3<i_QB$LV08_0S9fd8o#)YR!d$J!JxN>=|c*HHLMzy9ElmVJr(8!%5)nEDpJ
z?y`tE8i0RD9XYw5Zv=rrSm?+In)wEisAqOkEhdai(U4XXuZ0)N=Z6UrLa1lnhF@;C
z5fXqetI1R)|5VZ^#lDsB`^y`+W&Y?2pA7U@`-g(*vA7k}=R_G!q^Vp7XTrQT;6(6G
zw23*Y33~5BoKp78q)V@p{p3<%;;tVPrJz3+espw4Izzks1)no!RKT&|SU8U#D<>C$
z7m1rH8OUk^aW;?oR<)++XFClw$baEqi}c|s4VIl(=t|qt53RUjrz~;?Cvmg1W~BO;
z@EobSuJ7>^hQ4od&6ozbL$-ia+>h)cY=D4sks&&l7xNyj^^f_J#Nawk5lVJXPC%No
zpOhzQrB~F)xy9%5MEgy}y1v5CxGzt;FDyL=eLT_3kFW(APl}e=6}Xk(dq_06Co`>}
z*W}VLsran<M!{)7pqU)f^6N=?e{hS`cL$4XGy4f~!)R;xHiO`-DJ9jmLxK(u51&<I
z70&HdFOtd691RZYY|Os(*O8Uuv%|y3ci(ARuM>$+_b!Jr)S`xsyNL(Jf#bGen~`x_
ztI^ywnssYHRSco5h9#dGK))H1nP%%)YDitfytxwlGu2f%?FbyEcojCmO&34^V_SLY
zlhazpWfi=P*LY!ZflqmEv(|)3x>F_oTT#NrrSstew{#M4c@KI;{SaQyQ(igdY5?y#
zD&?ZeXUOTiys<SBFLFtSIi(<PbY{tfY41-sVl&rE&vITEm7^x^(Gvu(&jMU??yl%;
zAdQ<~Lm{nhH4vUfvl$BX8f`_?+|m-4irZ}?24qbB&TgUkcuPsicLsWK{b^Io@SL)K
zT{n9joc{3Zr_-0X{Xbr??A`_hR=<DOEf=a%V}Bb2u(>ASUtiY&`~t1RVNM9v+MfAF
z6XKkGBQ{$7^|I$pM+J?_-Uv6-p3(F6GNZ;Fw#vb2xbdRl+UaF*D{bOkm5-3TctoXD
zIOk4&Hiyy_AH(XyKe*V{GD|S{esL!hM+^o_2>6aKE<}kNcs>_CW$P<iIw+?+aMwd$
zSf{=u^^19%d-!mGp}T69nrdd-7{ff#CMw+;^0(Eo9`=O2vm4d<Y!L_M(WmPRTPmpo
zYXIOzNOeLoN`un`UMz|2We6kVSJx;>v2x4|o-+SPP~I!q%2>q?#KuE@ymYwhb2ZF(
zk%;Jxo}&}e?0c$-`n4v8&l#dGbkdtGb*%?D0O$QwJ+&a04#^uJ<W4HzXw0(CyKk=5
z030HLa+ag+a1*?zDqf~9ffp+YKz*K>q+K+!{#Ib?81C%nLyD{q#O+0R>M6GinB3^M
zEuj3d`}3XUk1O7_GuC8a+)o@<hW+?w*VW|?y}F|}gcA463xa7vxh?f;kd+*K@nN<r
zGR`Adp5VGsFZo5=gfbM4&Gl=%iR9**B7+@~>)@3S>~q%irtMsXFuM>9HRYh0WUl$m
zp~nNJRepzV=411C!mc`^m4@ca<>`$^st8<Ij0<`F`|AS|7%re=wi)xrRp$(&BQ44$
zC8LH7AQ1bLINib+YQJtF!KHBU=H-vC<Yfy>JKQS$NoBQ@g9+Cbw1sg~D_p5!f$zl2
z;FM2?_yi)tM@)JwjEGJFX{OHL&Bp~$hYwRTXFGch#Xql_x%s8@i)PscDdMwmrnM&R
z)<LB1V$>!l;wYC^z^6Ebov<&!=!zTxYx0931N6F)tEk=pVK2(aq`btZZ?i^WAGAn)
zc{9m+ibb@ucea#ARr0lmYkE0bTqWD?MnvQp{WmE8bSnAcKjbaKg^if4@_??<OLkRA
z)(a-#iujfjv-Y~3awekmhr(vbxzv{6XO<(gg*}_V{4>Ji+Wi_$F8$+ZbqeM|3ZN(|
zDO*muCI@`SMqC`kHLsF1k+c^AaHD8XlXO?45e{z@6*tLOEx%~4g7xq=c<+XW43Tx$
zQ?bGg9m9PFcjq5C$U>5XyOq^@u|N#gv{1nUY*jYTgIJ@>rutsQJjMh<n8rJ_xbOH6
zK=02B1T5@=lzrpAWLKp$i*GaED>>QQ`ML#b`h9>d9LSz)Tg%irj5Y8*5(T0UC3)ZH
zb@yzA?^4<czy7JZcpLfiCzk|TgVM9!p1;ht620RNX#_eICp+6eUG)(i#Hn0W)t8}`
zhqz_b-5p^DpZjM2I5#EoV}MAg>2me>^z}nOdZjLv)ndXSr;S5IRSMeD__JYAHap_9
zK;&wmvK?o|?Z1C`aeX=VH{AmLf@yO#`5Q!2A+Yn<*s5|qCPHzRhn1p-5<81Pz1_Bt
z;v0OU0*mqC{OSW9ob0=9M#%C8%}PBYVylyk4sw`hF;@l)WA@m3*!R<J!EILu&O_W8
z(^=ZZ!R3Qz%3qsc6t8vi);J}`M9-W^i@$mIaZob)mS-wYW`4oGx8stUk=;QPnUZJv
zCQX;vBk<_K+nF0S1VQBKm;Tp9VpKW0L`AqQEQC|){H3^0E*(A9<24OhHhg12wHa#y
z<P{VMcFoI5M!5TR9a&U~E_(J1vN{42>MR(HH`9Fwt-*)paXv#cUqtKN+ufyu5*H+;
zSn7ul(5t)e8*Wa8Np5fH4c^`tilMbqBl~pIJlaIWW+l~(FtjfhSnA^Ts&2AhQY68c
zmz0!c`D6K^fx#T^XWEOI@lN$GiH7|c2^)uge`~r1O7*!1xcU8xRL7`)u)}x%!}Ry_
zaSbrXvQSI4AckEA>xjAwN7b}YL8PirW5w%)Cczt&%u#gX1hm(=Uj%99SAF;YeW$_a
z##srhIz0Jzz5hcW({e7+n<0F_pu}@D?>{v9ym$Z6VeICq|HZ5oAHm+*rF_Tj8o-+O
zqaVN}jeWvMakdf$Iido3P~#wHQpyWkC6A>T&!etl4!_hjUgwzfHN0IMc{(rLVLUTt
z{;D_8N7MTF#oQBnPu}?V#A@E(V+~ZP)qfsykzxl8dF1KHnm=*zsX*-SavQ+b%z9AT
z8=&hV0=-roC4ORIKp)nfza-;NuXTt3>HIp`t-Ivjp-HXWZoF&Ly&R<2WX8;n<A|Gw
z^UZU6O%A?e4SOMlLIQx;BE{I2(=;Rr!@;N%`f2h2oj|+*fbx#SQlPxU9Dh!n9p}LU
a_*-nbq+C4Kk)Wvf-<FlRJ+$(?SNy-`MM+oy

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/arrow.png b/core/templates/beez3/images/system/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cd097a820ebc7611d4bb360f1c611b31911902e
GIT binary patch
literal 99
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRZ0VEjyf3VmCq_jL;978G?lYjjGf3@C#VN+OX
xZR18K@Aroz7IOYhTytS<K-e|r8GY*&WErAnn>1J3ct(PBd%F6$taD0e0sv&xAN2qL

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/arrow_rtl.png b/core/templates/beez3/images/system/arrow_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c67d6f274962e4e57af895d411725a17b506fb74
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^oIuRZ0VEjyf3VmCq?k&A{DK)6$|j$+0P-|FT^vIy
z7?T?s!UKMJU)SPzT$icQvejNu<kT%Gu4F@-6HOZ>_BE9-FkBMkTdB3;`+Ja4p00i_
I>zopr0RGM(t^fc4

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/calendar.png b/core/templates/beez3/images/system/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..586bc28ed06b0a6af93f67c5649f1a58ac1a7ad1
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006PNkl<Zcmb`F
zgR>t=5P-kkeYRuUwo9?CVvKTZ>%WNYq!8P-eRr|-+nJs$>Q(IP#Y_*rCVwjyz=GXR
zCmKV4ZKR-xpaqmaYJYA}-uUs;Xl2kMM`rddT{{Xuj2Yg!c5)WKA(NL~tqc$VJX&x$
zan%qo2DAdv;JV>F@*dm>ymy1O*Q2+4gO2?KU<k!P{%jBxent^Oe1P|<2%P^H09R=~
z0<?Tg$v+RlNa%@3=!wo9fjoHth<plAA%G=Crqi=w4$Jr5r(1(OtT^z1uJv+Qb?`o&
z>*itIq5HJ2lZUr2-hJ+Ys|7KJC<j(~mmJ4t^}z>$zV7e?_T8V(?zMsuA^O;4$`wc;
z;)Vb_Hv|LT1&hv}#V8v()y*N=8{5~;!L}UAlqiX9JG82iCoHX!&pj|gaB<_Yha7%1
zk3*Xc#`o&PDDR@hjhnY{Jir<+i~^}PhED-Xg2T}cw5XQNfz437NKvlex*6z>HI}+%
z(h+UAa_>1ADX}ERMtuxHNl0^Si>;>~0dV8iEi5dypMHcZAY!=s&vVj}V#rE~3&Q?b
z1*I^AAvCL$MU*p=rWLc;b@mZWym9rxhg`e&g4DzqvQy&%m}B$N16PM3R4kmtzfay$
zB2PRw{(D7%^cXJPdG5swsh;JWwD{0d$MPZaNh6tkQ<hw*8qt#I*Vq5Fk^ro<;#>0U
e<+~01AMyb~u`?HDzjjFg0000<MNUMnLSTZiIv1k=

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/j_button2_blank.png b/core/templates/beez3/images/system/j_button2_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..7288c9f25564650d58b2b85b42504c51c95adb6d
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#=`Bp4pvH+~MJ3OrpLLn;_cPna?tHV|Mr@b~}i
zBZ+Bhp5kvNUD{?A%opM;F+aKI#}!*Y=goh<?k?DNx+DB$%DD=mzk+f{&Rssobx0${
zP0^5RVxWZqSMjraeTi1p!__Y~C^?D0zT_gmQM2c)$)XbrmK!>m?zpFU><8<w&)Z5Y
S9vRF7xxv%b&t;ucLK6UlEJADm

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/j_button2_image.png b/core/templates/beez3/images/system/j_button2_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..41ea3a008abc8ada3a76700d365f66ac59cf8508
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0006>Nkl<ZcmbW1
z1GC&}0EY8(I!1p+hqZ0n9M!h1W1qESC+pyt>)pd)zij%Y+2ZzgpLycEZybdAM<hv7
zRW+N<79q&|zc4*Loyla<=`_c2gM)+LE9U9~oCVMGW(zV~FW_{*xqvQY22!b1CMGj~
zwOA}!kz_KdC<-zS35IY}QHuXbh83MIzZDr98xuwGM@3g}pv#Lj^ac$bq2Jo>L0j5A
zR-{}mgJ*<PAl=UJl~&)o&d56lx#n@J<@#ssmS?`Y9B#B?!>A}j93K3M1AYFc`9r(^
zbZgl1d<SNFshha(rd(dKY{RH1K|BHay({wgOZTH@_cJ_Y`i52-#6F;39RoIViZ{rX
zY#0?qNFdBp%3!aozbBKA(Zrol4ETXcePNY$Ne!kHHYtDk`XLYziZ+aj2}lT&&NaA~
zJZf3_tYiJl?k#T}dp@~&JuyDU=Erf<!G1JC#3pPQ75xyf?N$%E^P}7J;8*X9AlW~r
z%$C(smh~y`&ryfh`8VNAvfoBc1;M6ob)$zHyf1?&m11)lAvx^wC~sd#SJwnrE$CVZ
zT;y6t^V-i90}xu!P+1D6-3{``+sxe)*oDLB8Pg-^S<@@TT}J2|uwhgTLShM>7gbY+
zPyI<bt`FL%sQ{m_EXy=ahr?ly$J5i((@_P?fW=580yagXQB_s#5kU};p<4Q@fc?_7
z=v6?>zOy7r@pv2=t`|+ySeBifoJ2<I0-Pqtap1g+UrrriaQ@)<W*&er{|LB$i9{lk
c$rK^q0Qm5}-T`q6YybcN07*qoM6N<$g8C9G?f?J)

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/j_button2_left.png b/core/templates/beez3/images/system/j_button2_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e216ee620974091e23fd9cac96f52349fc435b6
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^-9RkH0VEi%b{XsgQe~bljv*C{XU|<_WHJyraNv!-
z^t*TK*6aRaPky3iq4dZoGnA(z!c=Yh_wa@Y(|7XhdS8D>H+}q(>iGG~mIXmR;=Eds
z&0d!l2uX$XNri|>tvem`xIQxS!i+UKFScG6o3m<jFN@*ov)lMw&a8TS(yOSmcz>Yb
Z55`;9?j~5QO<e|ZiKnZd%Q~loCIAL&MU?;m

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/j_button2_pagebreak.png b/core/templates/beez3/images/system/j_button2_pagebreak.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eabea6d1215282a2f4cd2050e589a65fef761d6
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0004hNkl<Zcmbu<
zg_7$a0EJ=R|7otftvhL`Wg3?%!~^RBtP!rK-~1!BLmeFdCxnpWIE0Ym5jg)Jlv0fG
zWHNyeMp5)Ian=bT#4wEe6>!=W#u!4#w*Xs%Wm&du11eQjwOFqHTAmkFF`v&((|nlN
z*xb9%M5Etzd}4n5^qngB!Td7<we<GG#$e=V9Uc!xmaF#i&9}NuOjOc`FT3X#7f)SX
zUGwG(d~tF4)b;iC*Y5{ao0ur2&)*LjJJXuZmhALg?c2sl*(N3m>Dv~pYo-+^i@ITI
z8#}$CO-wAMjUBTnsa6;-ii)aj?+=!3Vj_^X_xf2*wSs7w6;y5SXdJXXPw?B)oN5Kp
zO1tI|+P|0xr6a>38P(zwB&TZ7^usnW5lImFOVT_=a<;^^A7Pv^HKQMCo+pN5&*(b_
z`b+(h7b*C!zSrx4cnt`l(P#vcu3XnWIXPLaR$$tR<2VpP&-27zPKO60g!uXL@d7yh
iPyGEGkH;9};?W(q9~pk7u!DC10000<MNUMnLSTY@zRq$0

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/j_button2_readmore.png b/core/templates/beez3/images/system/j_button2_readmore.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff10dbcd227c058913816419e37513aabd79455b
GIT binary patch
literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0005WNkl<Zcmbu<
zMS9yn0ES`Rti4CMUG^SjW~NP<IcA4JER)F0AeO?(K)~$4`+QsdGe%-zpE!<_Wx3I4
z=-Y^;{cs$oUayOyNKsTSm)n|HJP>dTnx^pz;T;sX4!8^0BHTkrCX<pR5e{OSW~Evi
znWpJZn{v6#vh3DGBsz^_x%i+KNcR6&$Y}!(2A>gOA;14c^7(SHRBf+Ru66a}cgX4l
zCrsq8Z_>8iL3!R1?!SM^>;xwaWGpz-Xd2CyIVjz*LB7DO(FsoINH9v4Dy<<^>pI9E
zCiPBmqKbqk*hDIe6XpD%0uj2}2~K2?iD`a$c?Gw!vf7nTdHIgI{8hO9Zzh=Ov^z09
zpRnB}r(Yk1YhO~A|CjE9E(TA?X|a1Ei_FoIZhAPwT5Ru0{A{4`Ag+Z#Z_?+2!pCeI
zIFUmrE?sNdJ2iE0r&scE(fzTpu@P_j-qepy#sB5n>`ufID#I%@FZcFk?)mflk=f?G
z@3k{esdKqDq9`&9L*z$M6y@*4r)$5@KmU745P0zV^V`7RPdpwc3I_$INs_G9YDDos
zWLc&tN>x?(mvexJ!TrJc_<3O8f4|`UOC%EYdR^bP3AHK*_@HeVG5`Po07*qoM6N<$
Ef_JF+q5uE@

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/notice-alert.png b/core/templates/beez3/images/system/notice-alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..7aed5fb6d4ce42d4500c52ad541cc91d9b5badd1
GIT binary patch
literal 1225
zcmaKsk2BP19LGP}#p+Hjq2nTx)y!3r#gIbQrd)pQcUMg+?&^dS%hs-+D_mLW>~23$
z(wWMS#8A4fyC@8GcWS@=LbkR2P)@9k7W>=oJ^cgs%rozKectoT=QGde^UQN1CTg4Y
zVyDFbU>&}lh5-<-Bi=|NAYE#+$_TJ1EGB}v)nqcA2dD+O18@_d31AGM7eJ@@pqm=k
z$;Wh)@3kM^X~*Ac|9zt!d#!md)4Utej7rsSCF(cB>enySuLfscNvCBJIsTVi{Gj_>
zW!KqLcTe)`*qK){(o2|(5+?IF1LHBUHh=%@(9kRzEpPMYLJFm5!-kV&@<#xZ(I^9u
z01N=&0Q~@B0K@D|CqNg1Pah4+>E8fu1GE7&15}!uR}qQ&nW=h!ivap*c{S3HlTsGz
zT7F)0ZcbBf&V!7MYgtE{xks8f?5iBML7^~e)phBIF0;}ur>0y=O)lOU`}5A&1+|LL
zWat%&5(Yz~Q1F<H0tQxy(T`%-QH;Kzn&V;gd<KJuLOMMk!#FX~PyGBi(b4~)yF^BE
zqaw4AMn>jDL~tV_RI&kXSXd5?#tRKyn4dMwDRZgRY$~-NI5;~bq$n^jFDOVg^1Q&$
zkMHAif<ie)p&a$`DWOnQFP|29d8s5%3cb9_Jv@F{x2|~odf}Qir&q7$lgWH{_xa(+
zrEYGet5%h{xRg0N*DhZ^|3ZAm(eZ+V!~9^s0EI)3bT}@wvlH0ct8rYkY?;W`R)gc8
zaC`>GuaQW`1w)&Kg=t}7wx_3^K==dTR}x9p)iu%Geb&lqvb%dsC~P1Sn+SwSfuO?D
zvc}xpXwbKyZd+J96AA}~LZe>SEh?`f5H6#+h{}yR&ACO3WGq$-FE50>X9apuLE*Fz
zW_G+ndZ7Bpkgv_(dY(*^{+=fIENCB2Vmv?Gd?(fN{A^!G>Fip;-VH?f+dUKtYkU!8
zBAD_<;DX@LXXiTvecBz)XDTXu1AL=4f$I&P^}f#BBs%@6(Rv5}{!bP_ZrJr~pnN>x
zuKK#9l~rA3cf}q=$+dkc(rKT$jDU`~FUD7g$%#PjPkK<4$L)~zrn8I<L3ViAGb`9$
z_d+BVR9E-A_%3M_51kJ7$K1emY5c>-!?M`eM3>m~JVpn$YbPxkB^XgAihE!7E3vAF
zv2pRcrEjJ_XwK^c_pSujA1Y66a+296wvLYO-?jUA#|_EBn+j+91{)B?JUr$mbm%N#
zOW1O4;|dNNyBY*rsOt{c_!*rFy84oouABfj8cNbrnQ8frE^=;V%N55S9e`DP-E?}~
z+-T3O3#O3*o!2(|I?D+Hke{4xH`XWc>(9nj*j_~ypv`@}+F1~nFwr_tt~GNqg9(+>
z^|2ezC-k;l&aL-LriMtcz438P@oj}eJyU*3axuURQf9-?#cNvLd5(QLxQ9!<5CvN%
zbMGgO?_&nuix=10CN!cx>h9@0AFcJzoE&cLOze{T5&%<pZuIc>_V)NQ4vj<pr5Usj
zeFd)G)@DF?g}@Ct%3cJu$Wh`5vJhbVNgy(j(AV=nt1x(DN1Y*GfA`zZhr+i;(ORkB
G7yk!7xi3Ee

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/notice-alert_rtl.png b/core/templates/beez3/images/system/notice-alert_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f8dbbd7b5565a45b81e57cedb7d5fc62db739b
GIT binary patch
literal 1218
zcmaLXc}&w+902fd4-lM81W{ZBH?Ap)(ymY@S1FZA!qo$e%gD^ch$tYHa<mjGDn)52
z3WAPnoEAkPVAOf6bxfQnKamv#Yf&bs92ErVO}pQ+|M&9EH=l3vUh-bP-@MatG2hv(
z{9+{l*hTK9F#zzLsK2$rp?S?}H!}b>A})%x%VM!y1gHnN4bTSA4KNAN15m_bT>+Ru
z9?tal$}d#PD$d?35jL|knvSLwv6y!OPB9sLCZi)DASXOLn?~aW1qq16<G#Kn9v&Y6
zEM~I`U=%<BfB^IX^aIR~Dd$w9*8y$<bO6WzDy^)l@c0&hT7aJcbZ=hj{#I(oN42j<
zOpEi{SI@O$L#B@(Obc@c^?SqYJHyPRVR}OU{*C_KxN&|~|Ms<h@|AIJMmM1{ewbFK
zr(e$FUE$`oadUf*9=)8Mc_k~ejl-65*e12wtk*WD9cfHYZ9IIa;c#+cLi~w@_+_m|
z$YL7R>LMmnr&jY>%zP$8z@Qf}7zGUavgQ+?LC<3{`DjU}=P?+ZxYz+QnG+lP2z_{T
zbXH7sHkzZObEBfNqM|e^MOH*aE{(<y4_{tdG<{m&QmHvqYJO;FPFUFS;9y=zi00*A
z`DC(?L^@3*o+J_rNTebnQS;*2aRNazIv^kr#6CWvZQBaBZ<ly`pY!q(dUyyuJ(otF
z7Q4F_ySbflbv@(aQonxv()0fE4I8T0ty>!ED@DuUCk6zOtX*5`<fKKAGDpWU2L~O3
zd_<6W1i5TuV_r6OSX*0`mlyBf@51430o2*pXk@Y}xxB*Gc3Li<lt^0f_%<AFy0rBC
ziWN0hR%Vm29qo~|^`JyDB$1en26>sd3WsY%dsikl8*~@2SXFv@JD+#gUs{At6giR>
z#>&B{l_$<6h1o}p-%S>)oR!@-QkDP3oml_0kg%a%{qGjrChA`HUPt(Hj~@ou7$ALh
z2`G+idlW_t#jy*A;xGvVgSJpnPTC$E%+F&y@pi#b2=051gjCel-aDx3T0_5ceFe1q
zvEwE8F)7rK%RBT~q$_q)1I07rGwcxOM&j_S`P#*dagS6C#q$`hUR>|`nC;iqE)*UV
zmS4xfsa1>d7hBc4x29B9z8&!oQZ$Fc=A<P~kF>4xhX;D`nUcg|eSCu#A474Gb(s~z
zFAkjFWtAIq>6?yUqzjJ>bN4s%f#R}%^@Y}{E!j?Q1CO!UHTqN67F7ES>0FFpXKNjS
zDEsX;@9NNEc1gW!{YKHCBPh;t5$Byg<cVie+2lhneA6cYPIFyxerM~dZGl9Bb4wsd
z-5;bU<>zM1#gtS_e%x_&q{=}wXonuXHS8;r2DX!{9Zt}1V+GW8Du2;H3$LYT{MTDS
ziX=eqzdIp5G4cJ5hSX4HNPwbw6G)TBo~88orhLzzf4chXDLe4q(m$dfOJ*r24(v-f
z6cBl^1t^a)Ux_zGbZ;FKohx=rT#Exs0#{oX#CtK9NZg!K^?4sga5CwpvbM&)yDtI;
zP96b>{&ORWC@hL(6eepFWE6RL6gU(USb-NF{c-+h$qSk>KXvBxuAC3>{C8XAt{B=i
I>b}B%0QXTV0RR91

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/notice-info.png b/core/templates/beez3/images/system/notice-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..76c79c340562444431b0cb8149a8f563a3c57e31
GIT binary patch
literal 1027
zcmV+e1pNDnP)<h;3K|Lk000e1NJLTq00giA0021%0{{R35f38%0005MP)t-s|NsAx
zvIBR1S#y0zYHeNZ^Va0-!LGT4jjRiUnj(09T6TR{a(G)wTLLmZ0j$MBny*5Xo@|S$
z59#pE>hRBgoCE3a%*@ZgYj0ZQ?84*hzvb=3?DEv_^xEj}%I5CJ=I+Ml?#XIxUS)1T
zs<nFJ>%Q>y-R<+&?(^B}@zQ;eFMN(N@bui0ooRG{MX|ez{QdXq@zHX4T5)$;ad%m8
zc}|d<V`yq&SYj~Y>b(B`{Pp<ft+;^o`04cb<>Kkc^Y`TP_TikSb9je4c!WiqrgEF6
zad&-MnWb!We?@eDO7iyNj;{y#`|<w%{&RR;jjRgc>bv3S$8K~~ZF5#_b5(A0SbB;#
zn4@W&r*o3D2>Sf=;^@cy{`z~2HJzt)ae7Sq{Pk;YTWW1!nWSudjWcO&UVDo*d5JiA
zi8*R*U*PJwlALJ#{rQKWB8{yIbACth_1|=UMsj;ga(G?&`}6qv?~bkuj;;uDcU+RG
zGT-U9-|4pD=f;ey4Bq9y*x|BlaaV0}R%>usYj0bUoM+hKu-M_V*Wj`D`tF9H8ik!6
zX>DI=Y+h<?UukP!_WA09nInOhCinU5eULDOTffBs00I9=L_t(|UhUMwnk+~dMbSS|
zws~#awr#X++qV0GJF60<VNW8yyVm5KC)n|6CIBAUU;%;!AXotLNhSc|l}rG{wM+oS
zzDxkbs<~F~?&#>)y>eA@0AhT$XP+P4yng+2=e{Z59Zw8EG|%|*qnke$s(vZ&_`W$Q
z05R6^!@K7zsfvi^%Dhq9`Qunh0Aixy%E=F^!5ZnBD%P7jCQ<?rOY834zF(;5S+Qbo
z*VJkK`s~t#0K}5IXI?K%>FMqLcxd{y{kkL}0I{s5<=euvi1=ctdY?YHEFA!`xaQT(
zjbM#*Rd4CL#pwWu;hN%x1;Ki}IGhfE7^pe(!h&G^TO3FSKn&ItUs@2X7mI`G0Elfh
zo8Dd!tS2{ZO9w!#t7#d%I6qi_w5&@9Kup%X{MWo-wf#Ps5P)c^J9X>ooM3&v=X6s-
z0Afu;XQ{PN(cRrW6|B}$=bDrN#M*|>wwL+~b^SNCUtgONfLJu+Nat^Dg=ruD{Z;3~
zMM(jOjk6tJzWkj#8&2#hm!H^}7=Tzk*OtEa_V&IltCIr|Z)E}?j%5NME@T2Aj%ETN
z4rc-&4rBr#4rKx${>%hG{F4cQ_$d<r@qQ)%;!-96;=N1&#Dh!##8a67h^?6bh}SX!
x5RYX7AogbhATDPDApREs0000000000{sSk;V`i7`X$t@V002ovPDHLkV1jKv7tH_w

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/notice-info_rtl.png b/core/templates/beez3/images/system/notice-info_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf8c6a2c98063e35953aa4db75db533edce81141
GIT binary patch
literal 1026
zcmV+d1pWJoP)<h;3K|Lk000e1NJLTq00giA0021%0{{R35f38%0005MP)t-s|NsAx
zvIBR1S#y0zYHeNZ^VaS2*W~QM;_JT5&%my^gsQcA@b%q|tP6vhB6xmUc70fKcw1|4
zT1i_1GCl#U#X_2|LX@6ti>VLk@XqS+&wiW(>F><s?84*hzjS~_vAc@={rCI)_3ZN0
zou_o1r*o3D2>Sf=nWSu(qiOK;+>)JX>+#W$n`7?t+3WGreULAFjxu|UHGGXTdy6&i
z^xEj}%I5CJ=I+Ml?#bot#Bz9Aae7Q~cUp0GS#Wty;^@a~Zd+<?U}|k%{r>uCZC+(=
zKxk@VSYj~Y>b(B`{Pp<ft+;^o`04cb<>Kkc^Y`TP_TikSb9je4c!WiqrgEF6ad&-M
znWb!We?@eDO7iyNj;{y#`|<w%{&RR;jjRgc>bv3S$8K~~ZF5#_b5(A0SbB;#d5JiA
zi8*R*U*PJwlALJ#{rQKWB8{yIbACth_1|=UMsj;ga(G?&`}6qv?~bkuj;;uDcU+RG
zGT-U9-|4pD=f;ey4Bq9y*x|BlaaV0}R%>usYj0bUoM+hKu-M_V*Wj`D`tF9H8ik!6
zX>DI=Y+h<?UukP!_WA09nInOhCinU5eULB}{+*Bj00I6<L_t(|0qxj>ldMM+z|q??
zYuk!#+qP{zTY1^o=Ks6?W){V;yK+wX{>r$GSS$oUECN_q!2gtm1rQ$q6e9K(0wCTf
z1VB7c2!QCw4nX%M0|Nt>bZ?u+TxI|+X!-nwt1iEMe(0X_x6GqGD*#{J((-*;_ubp?
zf70F*vpE6y=GOYblu~;{q?BGf_H{GGjX43h<<RQB8tz<QSSO!;t(oHbi~v0US#Me~
zeE+@oj;0mozI#ri#dQD~`JpeZnm#=?Hkwu)xU<pX27r7#d`DU{{c%L3HD7d9F|Gy3
z$CvfAs`|rPHNUTlF$0i~+Lb#N))loX#w0*KYJcolSXVz+#h3!fM{U=Rg|)j@#kd$C
z9~a%cV__Y+sETnJKt8&D-oCJ29_p%MoCT1PpZc~ftY7yuTC@UW<k|Z^+On`-f9IJ-
zi#C9q4Ay&B7uLwgNLtZbA8e+$6d)&W-t^W)s!Y^x`mmYe8i1_aKKSWxr_!3f9|s@1
zrYSB2$jsR-Ew?>&#d}BZy6ed;^XLJ{&cb+qfB*QxwrLzL1VB7d2!MF05CHLbApqjh
zLIA`=g#d_03IPzm6apZAF9bk*TL^$SQ3!x|r4Rsdybu6!ULgSD%t8Rf8HE6d{e=LC
wy9)sj4;BI-UM&Pb00000000000PvSA11V>jz#fbF4*&oF07*qoM6N<$f*XJm5C8xG

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/notice-note.png b/core/templates/beez3/images/system/notice-note.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7e588ca00d4035a2e801a1ea69f19137bf1361d
GIT binary patch
literal 1315
zcmaLX=~I(e6bA5%IEqvR1xM;2B2pC60%g&PR@osDBfAw8P(Z|`7814)ArSUO#j*#)
zvbh8msv=2sEP{rppoB$2SOaK)B!rNV4Y+;z2YTnsncqAg&WAf^PL3DWT}yMPCICPS
z?cw4B!1^Y{hcwiYzE#_J6@Ya(FHb*L2;u5YEBV~`a)G5JegAxl2|sDiOoHLpSOZnQ
z1zhC8#Th961{c1<g=r|7grX@p&xOKqC>(=|MLGAAocmcd)+yt>V?QrxuO_wMNrrMU
zl!>5hVX44Ik^7@O8?}^aCe1K|OY`D1QxVx*lwty<Lg95|0nr#r1@BUvpp<`)9Nv(2
z{#)!WD4A_Y4QnBypCw_QCt<kJ-&YVqEAYNUk=qJ!rweg`y`fss2Q&jLw?M%N6pZ#V
z+sg2M%vv&|CKW1WaCN1<ir8L>6rr7x2v?Wq2uAV(>-Y8Pkk3)&{RHQRAb)r<_h&de
z2xr;CEGsxOz|FEB$@G{{M~!D49?d)q6%xqnAI?02d=Fev@kpq-WK&-9{vNUei+l_&
zD-<J){#1Loto)ejG?;SWeX5g`-N8(CW{{jEU)p<#w%ku`EM}Xm(wqNp&BE)7p_jGv
z>mIeF^DRUS`(^Fx#A5^ay@T}XA$m2twUVCT*i7)ON<QD3;QTZZ-4gFSaZSI17)Bw6
zG$x*Cj`tY5x`W+HDJO)M5zdtnLQ4su<%E#(#NfJkug9@&k77OQ<Gn^M>6Ik}SH=34
z#D_qYyt6j_4$f<uN-oFymEioVW3Zi<49jr7gBP}P?~&f$&%KQcyb%+0GbXS!+MDtR
z_Di_Vt?1vF4cV;V@45puKAhUn5}<uO#G}qnkLavNaNLHo*NXXNGowB$#8NZBVhf`o
z$IDFf<i1T<Qw^w;LSCP&z<M#?c4lhgZKT0uwtXeumy#4b{`(G5o*g9vUlZr8xM5Af
z`*iD|4UqM_jCOJKO9&PWso$<UtCv2pSj=g;%F$nIYo!Q7`;MILA8dQ2JO4C0U$@--
zXw*6o-e?LOGS|?whKmSD2$XBdT?DiCxxDhy(l2{!u!n$=R1iy#j<_5b7stH$uv?m|
z1~y&NjZqHs`}+DiT(raF57hTKVvzL8c7lA+g=+UP3jMO@9xw9ZT?}wo7g#lXfPLXb
zUT@X&1-COje}Q5^lGCbQ6%BB_1I@7~E%qhqN4qPPX6r%6m|)b25~j+@r5THbL7232
z`41(hG(h%~52Ktv`StsR0hT(2vbf7N>?;;y<J2ucXLqU4-A0_^?|1BsxmfC)ocXrh
z3PV@iR|g%Oi0KMX#vQ7*;aT0N1VQIB$-(^78KbiREa2JA&C_q}Em@+!r{7cr@*W_Q
zEK9qB8oPE4WV`0U#2(hUE|kP)Bk)K)-X|>jTHM5qKGEeH)Qh>O=e`}8Zo-IIfqN;i
zsU#ySONKozw%R<&r5nToQaH`OtErC7Uz#x%4{y7s|4v3Zt*Hjk@&Ca2&vklKJ5QHU
z+iCwZ3MxJWkW5~fqYR5~g*G3dK6+%gd2%tA%rsX6IZ+WqwAmN5oC!(9sd6*7AAnKw
zRZo>gzD>o-L8Uy|x6ubU)NqoLsLcu8MGDGJ)Dw5q24K=!+h0hd(F#A1i`9X(n=UZg
zZKnoUt_UJ+)qwR01U5)w?TFwNlCb;{Od^SRhZ=I!{^yA{QlCy8ovQtH?F0g}E7s+)
HQ)t?M@)M=5

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/notice-note_rtl.png b/core/templates/beez3/images/system/notice-note_rtl.png
new file mode 100644
index 0000000000000000000000000000000000000000..d737875fffb4925bf177c99c4f0564443bf7ebd8
GIT binary patch
literal 1310
zcmV+(1>yRMP)<h;3K|Lk000e1NJLTq00giA0021%0{{R35f38%0007WP)t-s|NsB~
zk1+V_;QWm*^n@tye<bXCA?bJ?=5-wVj4uE4=>PNS|MKVm@#g>W<^S;G|M2Ah@8bXN
z;Q#L5|M~Oy;?MZv(EH!W_uIzVwU)!5fWw}C|M>F%_wfJs@%D`~`HC#~h%5GnDfNXZ
z|Mu_lf+p~TD)4_K|Ml+feIo6ABLDU6#(zTp_3WpEWTt{*=XD+b^y;R8W43%rw0lam
zdrIPQ8Jc=vnsigzXA+TfS&?&E(_js8HVRfR4*%`l|Lxw>$-$U(RLP@*$D)D%`uG3-
z{llGn!<>A>oO;8XdH??W>v|ygjWWumg#YZ@`-?6A>)QY9-1CYt|LWNP>e=pxF#qY+
z;)gojhDh&(E8vGa-iAB>`Skzj)!c?W|Ns8~{rl*EE9-tH=zb{CgFw=QKmYvs`Q69W
zfja;E`pkhs*nc+4fkO4!#L0m}$AClh*Td6%G~&;}(#gU1oKft+qVd0)+PtH>eMqB#
zVzzur*}S8_c|X>4BiOp1+Pa_FxSYCpL9u#Foql4tctf*!Nw#-G;cpn4d}Et@U#xje
zv3E${Z5P?No0)oGn0jHDdSI7&V3~SfnR#BMcTlc%My+*7rFT%>Y804wUY&JQmUmzO
z`}oMCgr0Ly<*S34bX1meRiAQB$Z8&#b5q!65#pzS%BYHxb6SpaTaR*DmvK>>a8B1`
z5Rh?L$)<?XUJK4z2+LOnwpI^)Ur3}>6nsMzdO;F%It_9-49BI1UoQ$)E)K`0iBKsD
zPbUdZCJ6uf_5bM9_l+|1j5O)w;l*bh<A^$(bW@vqUf^yQ@QXE@g><5JQTdKCn{-mn
z5J?;W00L%7L_t(|0qoiXlB7!%K;fI^YTLGL+hg1I%(HE4Y`n2;TRUnOqF0cA#QDPa
zEFdWl3<3aTzCi$h%m4s`kf{a%05Z)W06-=g1OUhcg8%@TY!Cn-joJZ#=<dS8!k*|c
zQ)$u+0JPOUE6>Zz`|j|u)+TQf3IJLO|8wU|<xEM*$jDf`cUQPqkq`jTNyPKgaVqKE
z$U#=?;;sKgc#;GIfKL7{O;kyrosvOzyKU+BJ3L7O0YD?;|4mfR)I*nKP(_8KFZ19Y
zcatCh&`8Z3rIOR1+!2xW)!Tn?*fyUDa*+T4(8rfmX0tiPYQHNYo9a$)udpvU`I{?>
zKLF^Xvs@{sCA;X}W0CjH*HynL%Kop*6~zw#^ii@#sfm^x$IWJu|1X?7@~b1~(~n$H
zd;mZnCCf*4Sl63H_KobYzWUJ>#TNkdQL<s=4(r;hceczLzQeM9`;99~F#zZzwoDDZ
z651};*I%q2ekDx*CDs)s9{}|6`2nSrGc~g>Dk|#z;eS}O-+tkWk_!MDIsQ~Bm1Map
zA}j57Tc%}It-DDU0BGb!RiaWV>6VB@TCM4+(_f!;H%S8ko&5FTL#0$hL&Ft|B{_LY
zS*0gQJOJp#RQdBGHOM^V<;OpnJV_D&Kr5y{w#|K`hAr6tyUD9a8~|wMXidx48<(vs
zYdLW{&YOe*fObBJDJUq2`DDyg<^g~~$o+x#;OL4W0008m4W|W5@B?<TYv;JWBqady
zDFKkT1VGLb0C`FPWG?}b6`(}E041^kln4L-00000000000000000000008hueye@t
UK9C%2BLDyZ07*qoM6N<$f(bsR$p8QV

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/system/selector-arrow.png b/core/templates/beez3/images/system/selector-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7687e582639071401cbb37959e5ffccf6e7f71
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#3?w5ARK5Wzg8-ip*Z=?jfB*jc{rk&LpKX8h
zcJKfHXa4;8e)rzS`wzA~e{tmJ&*NXeKD>T?&7()Vo;=<6>(~1ynjJHMdKpWC{DK)A
zp4~_Ta-2O~978y+`<^irYB1nA;vlS~XQuY&|8@~Mg;(1q&fI!-n$7J+8<+n-)iFo^
x9m|r%C0rc~t9~*pxc>T;PRJAvU+;s*+4K3B_$PmSZ4NY!!PC{xWt~$(697%*T*v?b

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/table_footer.gif b/core/templates/beez3/images/table_footer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..44e8e40fbeaf0f1edcc644d67126a53aab4a4ab0
GIT binary patch
literal 106
zcmV-w0G0noNk%w1VH5yl0FeLy>+9>_;NaEO)yvDvA^8LZ6afDKEC2ui02BaZ0006z
zgpaAq?GK}zwAzca-n{z{hT=$;=82~2%C_zc$MQ_q_KoNI&iDQg4Aug~qVaeXD3{D;
Ma{!G>r_%xeJ1-P7!~g&Q

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/images/trans.gif b/core/templates/beez3/images/trans.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a7114b3bd6d5ea04df528ac757adc0baa1654871
GIT binary patch
literal 37
pcmZ?wbhEHbWMp7uC}3bv{K>*9!oa|w1H?cPMg|8aCKpBqYXD~R1VjJ;

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/index.php b/core/templates/beez3/index.php
new file mode 100644
index 00000000..c85a6626
--- /dev/null
+++ b/core/templates/beez3/index.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access.
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+JLoader::import('joomla.filesystem.file');
+
+// Check modules
+$showRightColumn = ($this->countModules('position-3') or $this->countModules('position-6') or $this->countModules('position-8'));
+$showbottom      = ($this->countModules('position-9') or $this->countModules('position-10') or $this->countModules('position-11'));
+$showleft        = ($this->countModules('position-4') or $this->countModules('position-7') or $this->countModules('position-5'));
+
+if ($showRightColumn === false && $showleft === false)
+{
+	$showno = 0;
+}
+
+JHtml::_('behavior.framework', true);
+
+// Get params
+$color          = $this->params->get('templatecolor');
+$logo           = $this->params->get('logo');
+$navposition    = $this->params->get('navposition');
+$headerImage    = $this->params->get('headerImage');
+$config         = JFactory::getConfig();
+$bootstrap      = explode(',', $this->params->get('bootstrap'));
+$option         = JFactory::getApplication()->input->getCmd('option', '');
+
+// Output as HTML5
+$this->setHtml5(true);
+
+if (in_array($option, $bootstrap))
+{
+	// Load optional rtl Bootstrap css and Bootstrap bugfixes
+	JHtml::_('bootstrap.loadCss', true, $this->direction);
+}
+
+// Add stylesheets
+JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto'));
+JHtml::_('stylesheet', 'position.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'layout.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'print.css', array('version' => 'auto', 'relative' => true), array('media' => 'print'));
+JHtml::_('stylesheet', 'general.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', htmlspecialchars($color, ENT_COMPAT, 'UTF-8') . '.css', array('version' => 'auto', 'relative' => true));
+
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'template_rtl.css', array('version' => 'auto', 'relative' => true));
+	JHtml::_('stylesheet', htmlspecialchars($color, ENT_COMPAT, 'UTF-8') . '_rtl.css', array('version' => 'auto', 'relative' => true));
+}
+
+if ($color === 'image')
+{
+	$this->addStyleDeclaration("
+	.logoheader {
+		background: url('" . $this->baseurl . "/" . htmlspecialchars($headerImage) . "') no-repeat right;
+	}
+	body {
+		background: " . $this->params->get('backgroundcolor') . ";
+	}");
+}
+
+JHtml::_('stylesheet', 'ie7only.css', array('version' => 'auto', 'relative' => true, 'conditional' => 'IE 7'));
+
+// Check for a custom CSS file
+JHtml::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
+
+JHtml::_('bootstrap.framework');
+
+// Add template scripts
+JHtml::_('script', 'templates/' . $this->template . '/javascript/md_stylechanger.js', array('version' => 'auto'));
+JHtml::_('script', 'templates/' . $this->template . '/javascript/hide.js', array('version' => 'auto'));
+JHtml::_('script', 'templates/' . $this->template . '/javascript/respond.src.js', array('version' => 'auto'));
+JHtml::_('script', 'templates/' . $this->template . '/javascript/template.js', array('version' => 'auto'));
+
+// Check for a custom js file
+JHtml::_('script', 'templates/' . $this->template . '/javascript/user.js', array('version' => 'auto'));
+
+require __DIR__ . '/jsstrings.php';
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+	<head>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=3.0, user-scalable=yes"/>
+		<meta name="HandheldFriendly" content="true" />
+		<meta name="apple-mobile-web-app-capable" content="YES" />
+		<jdoc:include type="head" />
+	</head>
+	<body id="shadow">
+		<div id="all">
+			<div id="back">
+				<header id="header">
+					<div class="logoheader">
+						<h1 id="logo">
+						<?php if ($logo) : ?>
+							<img src="<?php echo $this->baseurl; ?>/<?php echo htmlspecialchars($logo); ?>"  alt="<?php echo htmlspecialchars($this->params->get('sitetitle')); ?>" />
+						<?php endif;?>
+						<?php if (!$logo AND $this->params->get('sitetitle')) : ?>
+							<?php echo htmlspecialchars($this->params->get('sitetitle')); ?>
+						<?php elseif (!$logo AND $config->get('sitename')) : ?>
+							<?php echo htmlspecialchars($config->get('sitename')); ?>
+						<?php endif; ?>
+						<span class="header1">
+						<?php echo htmlspecialchars($this->params->get('sitedescription')); ?>
+						</span></h1>
+					</div><!-- end logoheader -->
+					<ul class="skiplinks">
+						<li><a href="#main" class="u2"><?php echo JText::_('TPL_BEEZ3_SKIP_TO_CONTENT'); ?></a></li>
+						<li><a href="#nav" class="u2"><?php echo JText::_('TPL_BEEZ3_JUMP_TO_NAV'); ?></a></li>
+						<?php if ($showRightColumn) : ?>
+							<li><a href="#right" class="u2"><?php echo JText::_('TPL_BEEZ3_JUMP_TO_INFO'); ?></a></li>
+						<?php endif; ?>
+					</ul>
+					<h2 class="unseen"><?php echo JText::_('TPL_BEEZ3_NAV_VIEW_SEARCH'); ?></h2>
+					<h3 class="unseen"><?php echo JText::_('TPL_BEEZ3_NAVIGATION'); ?></h3>
+					<jdoc:include type="modules" name="position-1" />
+					<div id="line">
+						<div id="fontsize"></div>
+						<h3 class="unseen"><?php echo JText::_('TPL_BEEZ3_SEARCH'); ?></h3>
+						<jdoc:include type="modules" name="position-0" />
+					</div> <!-- end line -->
+				</header><!-- end header -->
+				<div id="<?php echo $showRightColumn ? 'contentarea2' : 'contentarea'; ?>">
+					<div id="breadcrumbs">
+						<jdoc:include type="modules" name="position-2" />
+					</div>
+
+					<?php if ($navposition === 'left' and $showleft) : ?>
+						<nav class="left1 <?php if ($showRightColumn == null) { echo 'leftbigger';} ?>" id="nav">
+							<jdoc:include type="modules" name="position-7" style="beezDivision" headerLevel="3" />
+							<jdoc:include type="modules" name="position-4" style="beezHide" headerLevel="3" state="0 " />
+							<jdoc:include type="modules" name="position-5" style="beezTabs" headerLevel="2"  id="3" />
+						</nav><!-- end navi -->
+					<?php endif; ?>
+
+					<div id="<?php echo $showRightColumn ? 'wrapper' : 'wrapper2'; ?>" <?php if (isset($showno)){echo 'class="shownocolumns"';}?>>
+						<div id="main">
+
+							<?php if ($this->countModules('position-12')) : ?>
+								<div id="top">
+									<jdoc:include type="modules" name="position-12" />
+								</div>
+							<?php endif; ?>
+
+							<jdoc:include type="message" />
+							<jdoc:include type="component" />
+
+						</div><!-- end main -->
+					</div><!-- end wrapper -->
+
+					<?php if ($showRightColumn) : ?>
+						<div id="close">
+							<a href="#" onclick="auf('right')">
+							<span id="bild">
+								<?php echo JText::_('TPL_BEEZ3_TEXTRIGHTCLOSE'); ?>
+							</span>
+							</a>
+						</div>
+
+						<aside id="right">
+							<h2 class="unseen"><?php echo JText::_('TPL_BEEZ3_ADDITIONAL_INFORMATION'); ?></h2>
+							<jdoc:include type="modules" name="position-6" style="beezDivision" headerLevel="3" />
+							<jdoc:include type="modules" name="position-8" style="beezDivision" headerLevel="3" />
+							<jdoc:include type="modules" name="position-3" style="beezDivision" headerLevel="3" />
+						</aside><!-- end right -->
+					<?php endif; ?>
+
+					<?php if ($navposition === 'center' and $showleft) : ?>
+						<nav class="left <?php if ($showRightColumn == null) { echo 'leftbigger'; } ?>" id="nav" >
+
+							<jdoc:include type="modules" name="position-7"  style="beezDivision" headerLevel="3" />
+							<jdoc:include type="modules" name="position-4" style="beezHide" headerLevel="3" state="0 " />
+							<jdoc:include type="modules" name="position-5" style="beezTabs" headerLevel="2"  id="3" />
+
+						</nav><!-- end navi -->
+					<?php endif; ?>
+
+					<div class="wrap"></div>
+				</div> <!-- end contentarea -->
+			</div><!-- back -->
+		</div><!-- all -->
+
+		<div id="footer-outer">
+			<?php if ($showbottom) : ?>
+				<div id="footer-inner" >
+
+					<div id="bottom">
+						<div class="box box1"> <jdoc:include type="modules" name="position-9" style="beezDivision" headerlevel="3" /></div>
+						<div class="box box2"> <jdoc:include type="modules" name="position-10" style="beezDivision" headerlevel="3" /></div>
+						<div class="box box3"> <jdoc:include type="modules" name="position-11" style="beezDivision" headerlevel="3" /></div>
+					</div>
+
+				</div>
+			<?php endif; ?>
+
+			<div id="footer-sub">
+				<footer id="footer">
+					<jdoc:include type="modules" name="position-14" />
+				</footer><!-- end footer -->
+			</div>
+		</div>
+		<jdoc:include type="modules" name="debug" />
+	</body>
+</html>
diff --git a/core/templates/beez3/javascript/hide.js b/core/templates/beez3/javascript/hide.js
new file mode 100644
index 00000000..1418a610
--- /dev/null
+++ b/core/templates/beez3/javascript/hide.js
@@ -0,0 +1,335 @@
+// Angie Radtke 2009 - 2012  thanks to daniel //
+
+/*global window, localStorage, Cookie, altopen, altclose, big, small, rightopen, rightclose, bildauf, bildzu */
+
+function saveIt(name) {
+	var x = document.getElementById(name).style.display;
+
+	if (!x) {
+		alert('No cookie available');
+	} else if (localStorage) {
+		localStorage[name] = x;
+	}
+}
+
+function readIt(name) {
+	if (localStorage) {
+		return localStorage[name];
+	}
+}
+
+function wrapperwidth(width) {
+	jQuery('#wrapper').css('width', width);
+}
+
+// add Wai-Aria landmark-roles
+jQuery(function($) {
+	$('#nav').attr('role', 'navigation');
+	$('input[id^="mod-search-searchword"]').closest('form').attr('role', 'search');
+	$('#main').attr('role', 'main');
+	$('#right').attr('role', 'contentinfo');
+});
+
+jQuery(function($) {
+		// get ankers
+		var $myankers = $('a.opencloselink');
+		$myankers.each(function() {
+			var $element = $(this);
+			$element.attr('role', 'tab');
+			var myid = $element.attr('id');
+			myid = myid.split('_');
+			myid = 'module_' + myid[1];
+			$element.attr('aria-controls', myid);
+		});
+
+		var $list = $('div.moduletable_js');
+		$list.each(function() {
+			var $element = $(this);
+			if ($element.find('div.module_content').length) {
+				var $el = $element.find('div.module_content');
+				$el.attr('role', 'tabpanel');
+				var myid = $el.attr('id');
+				myid = myid.split('_');
+				myid = 'link_' + myid[1];
+				$el.attr('aria-labelledby', myid);
+				var myclass = $el.attr('class');
+				var one = myclass.split(' ');
+				// search for active menu-item
+				var $listelement = $el.find('a.active').first();
+				var unique = $el.attr('id');
+				var nocookieset = readIt(unique);
+				if (($listelement.length) || ((one[1] == 'open') && (nocookieset == null))) {
+					$el.show();
+					var $eltern = $el.parent();
+					var $elternh = $eltern.find('h3').first();
+					var $elternbild = $eltern.find('img').first();
+					$elternbild.attr('alt', altopen).attr('src', bildzu);
+					$elternbild.focus();
+				} else {
+					$el.hide();
+					$el.attr('aria-expanded', 'false');
+				}
+
+				unique = $el.attr('id');
+				var cookieset = readIt(unique);
+				if (cookieset === 'block') {
+					$el.show();
+					$el.attr('aria-expanded', 'true');
+				}
+
+			}
+		});
+	});
+
+jQuery(function($) {
+	var $what = $('#right');
+	// if rightcolumn
+	if ($what.length) {
+		var whatid = $what.attr('id');
+		var rightcookie = readIt(whatid);
+		if (rightcookie === 'none') {
+			$what.hide();
+			$('#nav').addClass('leftbigger');
+			wrapperwidth(big);
+			var $grafik = $('#bild');
+			$grafik.html(rightopen);
+			$grafik.focus();
+		}
+	}
+});
+
+function auf(key) {
+	var $ = jQuery.noConflict();
+	var $el = $('#' + key);
+
+	if (!$el.is(':visible')) {
+		$el.show();
+		$el.attr('aria-expanded', 'true');
+
+		if (key !== 'right') {
+			$el.hide().toggle('slide');
+			$el.parent().attr('class', 'slide');
+			$eltern = $el.parent().parent();
+			$elternh = $eltern.find('h3').first();
+			$elternh.addClass('high');
+			$elternbild = $eltern.find('img').first();
+			$el.focus();
+			$elternbild.attr('alt', altopen).attr('src', bildzu);
+		}
+
+		if (key === 'right') {
+			$('#right').show();
+			wrapperwidth(small);
+			$('#nav').removeClass('leftbigger');
+			$grafik = $('#bild');
+			$('#bild').html(rightclose);
+			$grafik.focus();
+		}
+	} else {
+		$el.hide();
+		$el.attr('aria-expanded', 'false');
+
+		$el.removeClass('open');
+
+		if (key !== 'right') {
+			$eltern = $el.parent().parent();
+			$elternh = $eltern.find('h3').first();
+			$elternh.removeClass('high');
+			$elternbild = $eltern.find('img').first();
+			$elternbild.attr('alt', altclose).attr('src', bildauf);
+			$elternbild.focus();
+		}
+
+		if (key === 'right') {
+			$('#right').hide();
+			wrapperwidth(big);
+			$('#nav').addClass('leftbigger');
+			$grafik = $('#bild');
+			$grafik.html(rightopen);
+			$grafik.focus();
+		}
+	}
+	// write cookie
+	saveIt(key);
+}
+
+// ########### Tabfunctions ####################
+
+jQuery(function($) {
+	var $alldivs = $('div.tabcontent');
+	var $outerdivs = $('div.tabouter');
+	//outerdivs = outerdivs.getProperty('id');
+
+	$outerdivs.each(function() {
+		var $alldivs = $(this).find('div.tabcontent');
+		var count = 0;
+		var countankers = 0;
+		$alldivs.each(function() {
+		var $el = $(this);
+			count++;
+			$el.attr('role', 'tabpanel');
+			$el.attr('aria-hidden', 'false');
+			$el.attr('aria-expanded', 'true');
+			elid = $el.attr('id');
+			elid = elid.split('_');
+			elid = 'link_' + elid[1];
+			$el.attr('aria-labelledby', elid);
+
+			if (count !== 1) {
+				$el.addClass('tabclosed').removeClass('tabopen');
+				$el.attr('aria-hidden', 'true');
+				$el.attr('aria-expanded', 'false');
+			}
+		});
+
+		$allankers = $(this).find('ul.tabs').first().find('a');
+
+		$allankers.each(function() {
+			countankers++;
+			var $el = $(this);
+			$el.attr('aria-selected', 'true');
+			$el.attr('role', 'tab');
+			linkid = $el.attr('id');
+			moduleid = linkid.split('_');
+			moduleid = 'module_' + moduleid[1];
+			$el.attr('aria-controls', moduleid);
+
+			if (countankers != 1) {
+				$el.addClass('linkclosed').removeClass('linkopen');
+				$el.attr('aria-selected', 'false');
+			}
+		});
+	});
+});
+
+function tabshow(elid) {
+	var $ = jQuery.noConflict();
+	var $el = $('#' + elid);
+	var $outerdiv = $el.parent();
+
+	var $alldivs = $outerdiv.find('div.tabcontent');
+	var $liste = $outerdiv.find('ul.tabs').first();
+
+	$liste.find('a').attr('aria-selected', 'false');
+
+	$alldivs.each(function() {
+		var $element = $(this);
+		$element.addClass('tabclosed').removeClass('tabopen');
+		$element.attr('aria-hidden', 'true');
+		$element.attr('aria-expanded', 'false');
+	});
+
+	$el.addClass('tabopen').removeClass('tabclosed');
+	$el.attr('aria-hidden', 'false');
+	$el.attr('aria-expanded', 'true');
+	$el.focus();
+	var getid = elid.split('_');
+	var activelink = '#link_' + getid[1];
+	$(activelink).attr('aria-selected', 'true');
+	$liste.find('a').addClass('linkclosed').removeClass('linkopen');
+	$(activelink).addClass('linkopen').removeClass('linkclosed');
+}
+
+function nexttab(el) {
+	var $ = jQuery.noConflict();
+	var $outerdiv = $('#' + el).parent();
+	var $liste = $outerdiv.find('ul.tabs').first();
+	var getid = el.split('_');
+	var activelink = '#link_' + getid[1];
+	var aktiverlink = $(activelink).attr('aria-selected');
+	var $tablinks = $liste.find('a');
+
+	for (var i = 0; i < $tablinks.length; i++) {
+		if ($($tablinks[i]).attr('id') === activelink) {
+			if ($($tablinks[i + 1]).length) {
+				$($tablinks[i + 1]).click();
+				break;
+			}
+		}
+	}
+}
+
+// mobilemenuheader
+var mobileMenu = function(){
+
+	var $ = jQuery.noConflict(), displayed = false, $mobile, $menu, $menuWrapper;
+
+	var getX = function() {
+		return $(document).width();
+	};
+
+	var createElements = function () {
+		var Openmenu=Joomla.JText._('TPL_BEEZ3_OPENMENU');
+		var Closemenu=Joomla.JText._('TPL_BEEZ3_CLOSEMENU');
+		$menu = $("#header").find('ul.menu').first();
+		$menuWrapper = $('<div>', {id : 'menuwrapper', role: 'menubar'});
+
+		// create the menu opener and assign events
+		$mobile = $('<div>', {id: 'mobile_select'}).html('<h2><a href="#" id="menuopener" onclick="return false;"><span>'+Openmenu+'</span></a></h2>').show();
+		$mobile.on('click', function(){
+			var state = $menuWrapper.css('display');
+			$menuWrapper.slideToggle();
+
+			if (state === 'none') {
+				$('#menuopener').html(Closemenu);
+				$('#menuwrapper').attr('aria-expanded', 'true').attr('aria-hidden','false');
+			} else {
+				$('#menuopener').html(Openmenu);
+				$('#menuwrapper').attr('aria-expanded', 'false').attr('aria-hidden', 'true');
+			}
+		});
+
+		// add the menu to the dom
+		$menu.wrap($menuWrapper);
+
+		// add the menuopener to the dom and hide it
+		$('#header').find('#menuwrapper').first().before($mobile.hide());
+		$menuWrapper = $('#menuwrapper');
+		$mobile = $('#mobile_select');
+
+	};
+	var display = function () {
+		$menuWrapper.hide();
+		$mobile.show();
+		displayed = true;
+	};
+
+	var initialize = function () {
+		// create the elements once
+		createElements();
+
+		// show the elements if the browser size is smaller
+		if (getX() <= 461 && !displayed) {
+			display();
+		}
+
+		// react on resize events
+		$(window).on('resize', function () {
+			if (getX() >= 461) {
+				if (displayed) {
+					$mobile.hide();
+					$('#menuwrapper').show();
+					displayed = false;
+				}
+			}
+			if (getX() < 461) {
+				if (!displayed) {
+					display();
+				}
+
+			}
+		});
+	};
+
+	initialize();
+};
+
+jQuery(function () {
+	new mobileMenu();
+});
+
+
+
+//For discussion and comments, see: http://remysharp.com/2009/01/07/html5-enabling-script/
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,canvas,datalist,details,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(','),i=e.length;while(i--){document.createElement(e[i])}})()
+
diff --git a/core/templates/beez3/javascript/md_stylechanger.js b/core/templates/beez3/javascript/md_stylechanger.js
new file mode 100644
index 00000000..07b3f5ba
--- /dev/null
+++ b/core/templates/beez3/javascript/md_stylechanger.js
@@ -0,0 +1,82 @@
+/*global window, localStorage, fontSizeTitle, bigger, reset, smaller, biggerTitle, resetTitle, smallerTitle, Cookie */
+var prefsLoaded = false;
+var defaultFontSize = 100;
+var currentFontSize = defaultFontSize;
+
+
+
+Object.append(Browser.Features, {
+	localstorage: (function() {
+		return ('localStorage' in window) && window.localStorage !== null;
+	})()
+});
+
+function setFontSize(fontSize) {
+	document.body.style.fontSize = fontSize + '%';
+}
+
+function changeFontSize(sizeDifference) {
+	currentFontSize = parseInt(currentFontSize, 10) + parseInt(sizeDifference * 5, 10);
+	if (currentFontSize > 180) {
+		currentFontSize = 180;
+	} else if (currentFontSize < 60) {
+		currentFontSize = 60;
+	}
+	setFontSize(currentFontSize);
+}
+
+function revertStyles() {
+	currentFontSize = defaultFontSize;
+	changeFontSize(0);
+}
+
+function writeFontSize(value) {
+	if (Browser.Features.localstorage) {
+		localStorage.fontSize = value;
+	} else {
+		Cookie.write("fontSize", value, {duration: 180});
+	}
+}
+
+function readFontSize() {
+	if (Browser.Features.localstorage) {
+		return localStorage.fontSize;
+	} else {
+		return Cookie.read("fontSize");
+	}
+}
+
+function setUserOptions() {
+	if (!prefsLoaded) {
+		var size = readFontSize();
+		currentFontSize = size ? size : defaultFontSize;
+		setFontSize(currentFontSize);
+		prefsLoaded = true;
+	}
+}
+
+function addControls() {
+	var container = document.id('fontsize');
+	var content = '<h3>'+ fontSizeTitle +'</h3><p><a title="'+ biggerTitle +'"  href="#" onclick="changeFontSize(2); return false">'+ bigger +'</a><span class="unseen">.</span><a href="#" title="'+resetTitle+'" onclick="revertStyles(); return false">'+ reset +'</a><span class="unseen">.</span><a href="#"  title="'+ smallerTitle +'" onclick="changeFontSize(-2); return false">'+ smaller +'</a></p>';
+	container.set('html', content);
+}
+
+function saveSettings() {
+	writeFontSize(currentFontSize);
+}
+
+
+window.addEvent('domready', function () {
+
+    smaller = Joomla.JText._('TPL_BEEZ3_SMALLER');
+    fontSizeTitle = Joomla.JText._('TPL_BEEZ3_FONTSIZE');
+    bigger = Joomla.JText._('TPL_BEEZ3_BIGGER');
+    reset = Joomla.JText._('TPL_BEEZ3_RESET');
+    biggerTitle = Joomla.JText._('TPL_BEEZ3_INCREASE_SIZE');
+    smallerTitle = Joomla.JText._('TPL_BEEZ3_DECREASE_SIZE');
+    resetTitle = Joomla.JText._('TPL_BEEZ3_REVERT_STYLES_TO_DEFAULT');
+
+});
+window.addEvent('domready', setUserOptions);
+window.addEvent('domready', addControls);
+window.addEvent('unload', saveSettings);
diff --git a/core/templates/beez3/javascript/respond.js b/core/templates/beez3/javascript/respond.js
new file mode 100644
index 00000000..df8be8be
--- /dev/null
+++ b/core/templates/beez3/javascript/respond.js
@@ -0,0 +1,327 @@
+/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
+/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
+window.matchMedia = window.matchMedia || (function(doc, undefined){
+
+  var bool,
+      docElem  = doc.documentElement,
+      refNode  = docElem.firstElementChild || docElem.firstChild,
+      // fakeBody required for <FF4 when executed in <head>
+      fakeBody = doc.createElement('body'),
+      div      = doc.createElement('div');
+
+  div.id = 'mq-test-1';
+  div.style.cssText = "position:absolute;top:-100em";
+  fakeBody.style.background = "none";
+  fakeBody.appendChild(div);
+
+  return function(q){
+
+    div.innerHTML = '&shy;<style media="'+q+'"> #mq-test-1 { width: 42px; }</style>';
+
+    docElem.insertBefore(fakeBody, refNode);
+    bool = div.offsetWidth == 42;
+    docElem.removeChild(fakeBody);
+
+    return { matches: bool, media: q };
+  };
+
+})(document);
+
+
+
+
+/*! Respond.js v1.1.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
+(function( win ){
+	//exposed namespace
+	win.respond = {};
+
+	//define update even in native-mq-supporting browsers, to avoid errors
+	respond.update = function(){};
+
+	//expose media query support flag for external use
+	respond.mediaQueriesSupported = win.matchMedia && win.matchMedia( "only all" ).matches;
+
+	//if media queries are supported, exit here
+	if ( respond.mediaQueriesSupported ){ return; }
+
+	//define vars
+	var doc            = win.document,
+		docElem        = doc.documentElement,
+		mediastyles    = [],
+		rules          = [],
+		appendedEls    = [],
+		parsedSheets   = {},
+		resizeThrottle = 30,
+		head           = doc.getElementsByTagName( "head" )[0] || docElem,
+		base           = doc.getElementsByTagName( "base" )[0],
+		links          = head.getElementsByTagName( "link" ),
+		requestQueue   = [],
+
+		// Loop stylesheets, send text content to translate
+		ripCSS         = function(){
+			var sheets = links,
+				sl     = sheets.length,
+				i      = 0,
+				// Vars for loop:
+				sheet, href, media, isCSS;
+
+			for( ; i < sl; i++ ){
+				sheet = sheets[ i ],
+				href  = sheet.href,
+				media = sheet.media,
+				isCSS = sheet.rel && sheet.rel.toLowerCase() === "stylesheet";
+
+				// Only links plz and prevent re-parsing
+				if ( !!href && isCSS && !parsedSheets[ href ] ){
+					// Selectivizr exposes css through the rawCssText expando
+					if (sheet.styleSheet && sheet.styleSheet.rawCssText) {
+						translate( sheet.styleSheet.rawCssText, href, media );
+						parsedSheets[ href ] = true;
+					} else {
+						if ( (!/^([a-zA-Z:]*\/\/)/.test( href ) && !base)
+							|| href.replace( RegExp.$1, "" ).split( "/" )[0] === win.location.host ){
+							requestQueue.push( {
+								href: href,
+								media: media
+							} );
+						}
+					}
+				}
+			}
+			makeRequests();
+		},
+
+		// Recurse through request queue, get css text
+		makeRequests = function(){
+			if ( requestQueue.length ){
+				var thisRequest = requestQueue.shift();
+
+				ajax( thisRequest.href, function( styles ){
+					translate( styles, thisRequest.href, thisRequest.media );
+					parsedSheets[ thisRequest.href ] = true;
+					makeRequests();
+				} );
+			}
+		},
+
+		// Find media blocks in css text, convert to style blocks
+		translate       = function( styles, href, media ){
+			var qs      = styles.match(  /@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi ),
+				ql      = qs && qs.length || 0,
+				// Try to get CSS path
+				href    = href.substring( 0, href.lastIndexOf( "/" )),
+				repUrls = function( css ){
+					return css.replace( /(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g, "$1" + href + "$2$3" );
+				},
+				useMedia = !ql && media,
+				// Vars used in loop
+				i        = 0,
+				j, fullq, thisq, eachq, eql;
+
+			// If path exists, tack on trailing slash
+			if ( href.length ){ href += "/"; }
+
+			/* If no internal queries exist, but media attr does, use that
+			*  note: this currently lacks support for situations where a media attr is specified on a link AND
+			*  its associated stylesheet has internal CSS media queries.
+			*  In those cases, the media attribute will currently be ignored.
+			*/
+			if ( useMedia ){
+				ql = 1;
+			}
+
+
+			for( ; i < ql; i++ ){
+				j = 0;
+
+				// Media attr
+				if ( useMedia ){
+					fullq = media;
+					rules.push( repUrls( styles ) );
+				}
+				// Parse for styles
+				else{
+					fullq = qs[ i ].match( /@media *([^\{]+)\{([\S\s]+?)$/ ) && RegExp.$1;
+					rules.push( RegExp.$2 && repUrls( RegExp.$2 ) );
+				}
+
+				eachq = fullq.split( "," );
+				eql   = eachq.length;
+
+				for( ; j < eql; j++ ){
+					thisq = eachq[ j ];
+					mediastyles.push( {
+						media    : thisq.split( "(" )[ 0 ].match( /(only\s+)?([a-zA-Z]+)\s?/ ) && RegExp.$2 || "all",
+						rules    : rules.length - 1,
+						hasquery : thisq.indexOf("(") > -1,
+						minw     : thisq.match( /\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/ ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" ),
+						maxw     : thisq.match( /\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/ ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" )
+					} );
+				}
+			}
+
+			applyMedia();
+		},
+
+		lastCall,
+
+		resizeDefer,
+
+		// Returns the value of 1em in pixels
+		getEmValue = function() {
+			var ret,
+				div  = doc.createElement('div'),
+				body = doc.body,
+				fakeUsed = false;
+
+			div.style.cssText = "position:absolute;font-size:1em;width:1em";
+
+			if ( !body ){
+				body = fakeUsed = doc.createElement( "body" );
+				body.style.background = "none";
+			}
+
+			body.appendChild( div );
+
+			docElem.insertBefore( body, docElem.firstChild );
+
+			ret = div.offsetWidth;
+
+			if ( fakeUsed ){
+				docElem.removeChild( body );
+			}
+			else {
+				body.removeChild( div );
+			}
+
+			// Also update eminpx before returning
+			ret = eminpx = parseFloat(ret);
+
+			return ret;
+		},
+
+		// Cached container for 1em value, populated the first time it's needed
+		eminpx,
+
+		// Enable/disable styles
+		applyMedia          = function( fromResize ){
+			var name        = "clientWidth",
+				docElemProp = docElem[ name ],
+				currWidth   = doc.compatMode === "CSS1Compat" && docElemProp || doc.body[ name ] || docElemProp,
+				styleBlocks = {},
+				lastLink    = links[ links.length-1 ],
+				now         = (new Date()).getTime();
+
+			// Throttle resize calls
+			if ( fromResize && lastCall && now - lastCall < resizeThrottle ){
+				clearTimeout( resizeDefer );
+				resizeDefer = setTimeout( applyMedia, resizeThrottle );
+				return;
+			}
+			else {
+				lastCall = now;
+			}
+
+			for( var i in mediastyles ){
+				var thisstyle = mediastyles[ i ],
+					min       = thisstyle.minw,
+					max       = thisstyle.maxw,
+					minnull   = min === null,
+					maxnull   = max === null,
+					em        = "em";
+
+				if ( !!min ){
+					min = parseFloat( min ) * ( min.indexOf( em ) > -1 ? ( eminpx || getEmValue() ) : 1 );
+				}
+				if ( !!max ){
+					max = parseFloat( max ) * ( max.indexOf( em ) > -1 ? ( eminpx || getEmValue() ) : 1 );
+				}
+
+				// If there's no media query at all (the () part), or min or max is not null, and if either is present, they're true
+				if ( !thisstyle.hasquery || ( !minnull || !maxnull ) && ( minnull || currWidth >= min ) && ( maxnull || currWidth <= max ) ){
+						if ( !styleBlocks[ thisstyle.media ] ){
+							styleBlocks[ thisstyle.media ] = [];
+						}
+						styleBlocks[ thisstyle.media ].push( rules[ thisstyle.rules ] );
+				}
+			}
+
+			// Remove any existing respond style element(s)
+			for( var i in appendedEls ){
+				if ( appendedEls[ i ] && appendedEls[ i ].parentNode === head ){
+					head.removeChild( appendedEls[ i ] );
+				}
+			}
+
+			// Inject active styles, grouped by media type
+			for( var i in styleBlocks ){
+				var ss  = doc.createElement( "style" ),
+					css = styleBlocks[ i ].join( "\n" );
+
+				ss.type  = "text/css";
+				ss.media = i;
+
+				// Originally, ss was appended to a documentFragment and sheets were appended in bulk.
+				// This caused crashes in IE in a number of circumstances, such as when the HTML element had a bg image set, so appending beforehand seems best. Thanks to @dvelyk for the initial research on this one!
+				head.insertBefore( ss, lastLink.nextSibling );
+
+				if ( ss.styleSheet ){
+					ss.styleSheet.cssText = css;
+				}
+				else {
+					ss.appendChild( doc.createTextNode( css ) );
+				}
+
+				// Push to appendedEls to track for later removal
+				appendedEls.push( ss );
+			}
+		},
+		// Tweaked Ajax functions from Quirksmode
+		ajax = function( url, callback ) {
+			var req = xmlHttp();
+			if (!req){
+				return;
+			}
+			req.open( "GET", url, true );
+			req.onreadystatechange = function () {
+				if ( req.readyState != 4 || req.status != 200 && req.status != 304 ){
+					return;
+				}
+				callback( req.responseText );
+			}
+			if ( req.readyState == 4 ){
+				return;
+			}
+			req.send( null );
+		},
+		// Define ajax obj
+		xmlHttp = (function() {
+			var xmlhttpmethod = false;
+			try {
+				xmlhttpmethod = new XMLHttpRequest();
+			}
+			catch( e ){
+				xmlhttpmethod = new ActiveXObject( "Microsoft.XMLHTTP" );
+			}
+			return function(){
+				return xmlhttpmethod;
+			};
+		})();
+
+	// Translate CSS
+	ripCSS();
+
+	// Expose update for re-running respond later on
+	respond.update = ripCSS;
+
+	// Adjust on resize
+	function callMedia(){
+		applyMedia( true );
+	}
+	if ( win.addEventListener ){
+		win.addEventListener( "resize", callMedia, false );
+	}
+	else if( win.attachEvent ){
+		win.attachEvent( "onresize", callMedia );
+	}
+})(this);
diff --git a/core/templates/beez3/javascript/respond.src.js b/core/templates/beez3/javascript/respond.src.js
new file mode 100644
index 00000000..db157b63
--- /dev/null
+++ b/core/templates/beez3/javascript/respond.src.js
@@ -0,0 +1,329 @@
+/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
+/*! NOTE: If you're already including a window.matchMedia polyfill via Modernizr or otherwise, you don't need this part */
+window.matchMedia = window.matchMedia || (function(doc, undefined){
+
+  var bool,
+      docElem  = doc.documentElement,
+      refNode  = docElem.firstElementChild || docElem.firstChild,
+      // fakeBody required for <FF4 when executed in <head>
+      fakeBody = doc.createElement('body'),
+      div      = doc.createElement('div');
+
+  div.id = 'mq-test-1';
+  div.style.cssText = "position:absolute;top:-100em";
+  fakeBody.style.background = "none";
+  fakeBody.appendChild(div);
+
+  return function(q){
+
+    div.innerHTML = '&shy;<style media="'+q+'"> #mq-test-1 { width: 42px; }</style>';
+
+    docElem.insertBefore(fakeBody, refNode);
+    bool = div.offsetWidth == 42;
+    docElem.removeChild(fakeBody);
+
+    return { matches: bool, media: q };
+  };
+
+})(document);
+
+
+
+
+/*! Respond.js v1.1.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
+(function( win ){
+	// Exposed namespace
+	win.respond = {};
+
+	// Define update even in native-mq-supporting browsers, to avoid errors
+	respond.update = function(){};
+
+	// Expose media query support flag for external use
+	respond.mediaQueriesSupported = win.matchMedia && win.matchMedia( "only all" ).matches;
+
+	// If media queries are supported, exit here
+	if ( respond.mediaQueriesSupported ){ return; }
+
+	// Define vars
+	var doc            = win.document,
+		docElem        = doc.documentElement,
+		mediastyles    = [],
+		rules          = [],
+		appendedEls    = [],
+		parsedSheets   = {},
+		resizeThrottle = 30,
+		head           = doc.getElementsByTagName( "head" )[0] || docElem,
+		base           = doc.getElementsByTagName( "base" )[0],
+		links          = head.getElementsByTagName( "link" ),
+		requestQueue   = [],
+
+		// Loop stylesheets, send text content to translate
+		ripCSS = function(){
+
+			var sheets = links,
+				sl     = sheets.length,
+				i      = 0,
+				// Vars for loop:
+				sheet, href, media, isCSS;
+
+			for( ; i < sl; i++ ){
+				sheet = sheets[ i ],
+				href  = sheet.href,
+				media = sheet.media,
+				isCSS = sheet.rel && sheet.rel.toLowerCase() === "stylesheet";
+
+				//only links plz and prevent re-parsing
+				if ( !!href && isCSS && !parsedSheets[ href ] ){
+					// selectivizr exposes css through the rawCssText expando
+					if (sheet.styleSheet && sheet.styleSheet.rawCssText) {
+						translate( sheet.styleSheet.rawCssText, href, media );
+						parsedSheets[ href ] = true;
+					} else {
+
+						if ( (!/^([a-zA-Z:]*\/\/)/.test( href ) && !base)
+							|| href.replace( RegExp.$1, "" ).split( "/" )[0] === win.location.host ){
+							requestQueue.push( {
+								href: href,
+								media: media
+							} );
+						}
+					}
+				}
+			}
+			makeRequests();
+		},
+
+		// Recurse through request queue, get css text
+		makeRequests = function(){
+
+			if ( requestQueue.length ){
+				var thisRequest = requestQueue.shift();
+
+				ajax( thisRequest.href, function( styles ){
+
+					translate( styles, thisRequest.href, thisRequest.media );
+					parsedSheets[ thisRequest.href ] = true;
+					makeRequests();
+				} );
+			}
+		},
+
+		// Find media blocks in css text, convert to style blocks
+		translate       = function( styles, href, media ){
+			var qs      = styles.match(  /@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi ),
+				ql      = qs && qs.length || 0,
+				// Try to get CSS path
+				href    = href.substring( 0, href.lastIndexOf( "/" )),
+				repUrls = function( css ){
+					return css.replace( /(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g, "$1" + href + "$2$3" );
+				},
+				useMedia = !ql && media,
+				// Vars used in loop
+				i        = 0,
+				j, fullq, thisq, eachq, eql;
+
+			// If path exists, tack on trailing slash
+			if ( href.length ){ href += "/"; }
+
+			//if no internal queries exist, but media attr does, use that
+			//note: this currently lacks support for situations where a media attr is specified on a link AND
+				//its associated stylesheet has internal CSS media queries.
+				//In those cases, the media attribute will currently be ignored.
+			if ( useMedia ){
+				ql = 1;
+			}
+
+			for( ; i < ql; i++ ){
+				j = 0;
+
+				// Media attr
+				if ( useMedia ){
+					fullq = media;
+					rules.push( repUrls( styles ) );
+				}
+				// Parse for styles
+				else{
+					fullq = qs[ i ].match( /@media *([^\{]+)\{([\S\s]+?)$/ ) && RegExp.$1;
+					rules.push( RegExp.$2 && repUrls( RegExp.$2 ) );
+				}
+
+				eachq = fullq.split( "," );
+				eql   = eachq.length;
+
+				for( ; j < eql; j++ ){
+					thisq = eachq[ j ];
+					mediastyles.push( {
+						media    : thisq.split( "(" )[ 0 ].match( /(only\s+)?([a-zA-Z]+)\s?/ ) && RegExp.$2 || "all",
+						rules    : rules.length - 1,
+						hasquery : thisq.indexOf("(") > -1,
+						minw     : thisq.match( /\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/ ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" ),
+						maxw     : thisq.match( /\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/ ) && parseFloat( RegExp.$1 ) + ( RegExp.$2 || "" )
+					} );
+				}
+			}
+
+			applyMedia();
+		},
+
+		lastCall,
+
+		resizeDefer,
+
+		// returns the value of 1em in pixels
+		getEmValue = function() {
+			var ret,
+				div      = doc.createElement('div'),
+				body     = doc.body,
+				fakeUsed = false;
+
+			div.style.cssText = "position:absolute;font-size:1em;width:1em";
+
+			if ( !body ){
+				body = fakeUsed = doc.createElement( "body" );
+				body.style.background = "none";
+			}
+
+			body.appendChild( div );
+
+			docElem.insertBefore( body, docElem.firstChild );
+
+			ret = div.offsetWidth;
+
+			if ( fakeUsed ){
+				docElem.removeChild( body );
+			}
+			else {
+				body.removeChild( div );
+			}
+
+			// Also update eminpx before returning
+			ret = eminpx = parseFloat(ret);
+
+			return ret;
+		},
+
+		// Cached container for 1em value, populated the first time it's needed
+		eminpx,
+
+		// Enable/disable styles
+		applyMedia          = function( fromResize ){
+			var name        = "clientWidth",
+				docElemProp = docElem[ name ],
+				currWidth   = doc.compatMode === "CSS1Compat" && docElemProp || doc.body[ name ] || docElemProp,
+				styleBlocks = {},
+				lastLink    = links[ links.length-1 ],
+				now         = (new Date()).getTime();
+
+			// Throttle resize calls
+			if ( fromResize && lastCall && now - lastCall < resizeThrottle ){
+				clearTimeout( resizeDefer );
+				resizeDefer = setTimeout( applyMedia, resizeThrottle );
+				return;
+			}
+			else {
+				lastCall = now;
+			}
+
+			for( var i in mediastyles ){
+				var thisstyle = mediastyles[ i ],
+					min = thisstyle.minw,
+					max = thisstyle.maxw,
+					minnull = min === null,
+					maxnull = max === null,
+					em = "em";
+
+				if ( !!min ){
+					min = parseFloat( min ) * ( min.indexOf( em ) > -1 ? ( eminpx || getEmValue() ) : 1 );
+				}
+				if ( !!max ){
+					max = parseFloat( max ) * ( max.indexOf( em ) > -1 ? ( eminpx || getEmValue() ) : 1 );
+				}
+
+				// If there's no media query at all (the () part), or min or max is not null, and if either is present, they're true
+				if ( !thisstyle.hasquery || ( !minnull || !maxnull ) && ( minnull || currWidth >= min ) && ( maxnull || currWidth <= max ) ){
+						if ( !styleBlocks[ thisstyle.media ] ){
+							styleBlocks[ thisstyle.media ] = [];
+						}
+						styleBlocks[ thisstyle.media ].push( rules[ thisstyle.rules ] );
+				}
+			}
+
+			// Remove any existing respond style element(s)
+			for( var i in appendedEls ){
+				if ( appendedEls[ i ] && appendedEls[ i ].parentNode === head ){
+					head.removeChild( appendedEls[ i ] );
+				}
+			}
+
+			// Inject active styles, grouped by media type
+			for( var i in styleBlocks ){
+				var ss  = doc.createElement( "style" ),
+					css = styleBlocks[ i ].join( "\n" );
+
+				ss.type  = "text/css";
+				ss.media = i;
+
+				// Originally, ss was appended to a documentFragment and sheets were appended in bulk.
+				// This caused crashes in IE in a number of circumstances, such as when the HTML element had a bg image set, so appending beforehand seems best. Thanks to @dvelyk for the initial research on this one!
+				head.insertBefore( ss, lastLink.nextSibling );
+
+				if ( ss.styleSheet ){
+					ss.styleSheet.cssText = css;
+				}
+				else{
+					ss.appendChild( doc.createTextNode( css ) );
+		        }
+
+				// Push to appendedEls to track for later removal
+				appendedEls.push( ss );
+			}
+		},
+		// Tweaked Ajax functions from Quirksmode
+		ajax = function( url, callback ) {
+			var req = xmlHttp();
+			if (!req){
+				return;
+			}
+			req.open( "GET", url, true );
+			req.onreadystatechange = function () {
+				if ( req.readyState != 4 || req.status != 200 && req.status != 304 ){
+					return;
+				}
+				callback( req.responseText );
+			}
+			if ( req.readyState == 4 ){
+				return;
+			}
+			req.send( null );
+		},
+		// Define ajax obj
+		xmlHttp = (function() {
+			var xmlhttpmethod = false;
+			try {
+				xmlhttpmethod = new XMLHttpRequest();
+			}
+			catch( e ){
+				xmlhttpmethod = new ActiveXObject( "Microsoft.XMLHTTP" );
+			}
+			return function(){
+				return xmlhttpmethod;
+			};
+		})();
+
+	// Translate CSS
+	ripCSS();
+
+	// Expose update for re-running respond later on
+	respond.update = ripCSS;
+
+	// Adjust on resize
+	function callMedia(){
+		applyMedia( true );
+	}
+	if ( win.addEventListener ){
+		win.addEventListener( "resize", callMedia, false );
+	}
+	else if( win.attachEvent ){
+		win.attachEvent( "onresize", callMedia );
+	}
+})(this);
diff --git a/core/templates/beez3/javascript/template.js b/core/templates/beez3/javascript/template.js
new file mode 100644
index 00000000..f362ac78
--- /dev/null
+++ b/core/templates/beez3/javascript/template.js
@@ -0,0 +1,47 @@
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       3.2
+ */
+
+(function($)
+{
+	$(document).ready(function()
+	{
+		$('*[rel=tooltip]').tooltip();
+
+		// Turn radios into btn-group
+		$('.radio.btn-group label').addClass('btn');
+
+		$(".btn-group label:not(.active)").click(function()
+		{
+			var label = $(this);
+			var input = $('#' + label.attr('for'));
+
+			if (!input.prop('checked')) {
+				label.closest('.btn-group').find("label").removeClass('active btn-success btn-danger btn-primary');
+				if (input.val() === '') {
+					label.addClass('active btn-primary');
+				} else if (input.val() == 0) {
+					label.addClass('active btn-danger');
+				} else {
+					label.addClass('active btn-success');
+				}
+				input.prop('checked', true);
+				input.trigger('change');
+			}
+		});
+		$(".btn-group input[checked=checked]").each(function()
+		{
+			if ($(this).val() == '') {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-primary');
+			} else if ($(this).val() == 0) {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-danger');
+			} else {
+				$("label[for=" + $(this).attr('id') + "]").addClass('active btn-success');
+			}
+		});
+	})
+})(jQuery);
diff --git a/core/templates/beez3/jsstrings.php b/core/templates/beez3/jsstrings.php
new file mode 100644
index 00000000..8b949e0d
--- /dev/null
+++ b/core/templates/beez3/jsstrings.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.beez3
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access.
+defined('_JEXEC') or die;
+
+JText::script('TPL_BEEZ3_ALTOPEN');
+JText::script('TPL_BEEZ3_ALTCLOSE');
+JText::script('TPL_BEEZ3_TEXTRIGHTOPEN');
+JText::script('TPL_BEEZ3_TEXTRIGHTCLOSE');
+JText::script('TPL_BEEZ3_FONTSIZE');
+JText::script('TPL_BEEZ3_BIGGER');
+JText::script('TPL_BEEZ3_RESET');
+JText::script('TPL_BEEZ3_SMALLER');
+JText::script('TPL_BEEZ3_INCREASE_SIZE');
+JText::script('TPL_BEEZ3_REVERT_STYLES_TO_DEFAULT');
+JText::script('TPL_BEEZ3_DECREASE_SIZE');
+JText::script('TPL_BEEZ3_OPENMENU');
+JText::script('TPL_BEEZ3_CLOSEMENU');
+
+$this->addScriptDeclaration("
+	var big        = '" . (int) $this->params->get('wrapperLarge') . "%';
+	var small      = '" . (int) $this->params->get('wrapperSmall') . "%';
+	var bildauf    = '" . $this->baseurl . '/templates/' . $this->template . "/images/plus.png';
+	var bildzu     = '" . $this->baseurl . '/templates/' . $this->template . "/images/minus.png';
+	var rightopen  = '" . JText::_('TPL_BEEZ3_TEXTRIGHTOPEN', true) . "';
+	var rightclose = '" . JText::_('TPL_BEEZ3_TEXTRIGHTCLOSE', true) . "';
+	var altopen    = '" . JText::_('TPL_BEEZ3_ALTOPEN', true) . "';
+	var altclose   = '" . JText::_('TPL_BEEZ3_ALTCLOSE', true) . "';
+");
diff --git a/core/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini b/core/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini
new file mode 100644
index 00000000..3045420c
--- /dev/null
+++ b/core/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini
@@ -0,0 +1,60 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_BEEZ3_ADDITIONAL_INFORMATION="Additional information"
+TPL_BEEZ3_ALTCLOSE="is closed"
+TPL_BEEZ3_ALTOPEN="is open"
+TPL_BEEZ3_BIGGER="Bigger"
+TPL_BEEZ3_CLICK="select"
+TPL_BEEZ3_CLOSEMENU="Close Menu"
+TPL_BEEZ3_DECREASE_SIZE="Decrease size"
+TPL_BEEZ3_ERROR_JUMP_TO_NAV="Jump to navigation"
+TPL_BEEZ3_FIELD_BOOTSTRAP_DESC="Create a comma separated list of any components for which Bootstrap is needed, for example com_name, com_anothername."
+TPL_BEEZ3_FIELD_BOOTSTRAP_LABEL="Components Requiring<br /> Bootstrap"
+TPL_BEEZ3_FIELD_DESCRIPTION_DESC="Please add your site description here."
+TPL_BEEZ3_FIELD_DESCRIPTION_LABEL="Site Description"
+TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_DESC="Choose a colour for the Background when Custom is selected as the Template Colour. If left blank the Default (#eeeeee) is used."
+TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_LABEL="Background Colour"
+TPL_BEEZ3_FIELD_HEADER_IMAGE_DESC="Use the selected header image when Custom is selected as the Template Colour"
+TPL_BEEZ3_FIELD_HEADER_IMAGE_LABEL="Header Image"
+TPL_BEEZ3_FIELD_LOGO_DESC="Please choose an image. If you do not want to display a logo, select Clear and leave the field blank."
+TPL_BEEZ3_FIELD_LOGO_LABEL="Logo"
+TPL_BEEZ3_FIELD_NAVPOSITION_DESC="Navigation before or after content."
+TPL_BEEZ3_FIELD_NAVPOSITION_LABEL="Position of Navigation"
+TPL_BEEZ3_FIELD_SITETITLE_DESC="Please add your site title here, it's only displayed if you don't use a logo."
+TPL_BEEZ3_FIELD_SITETITLE_LABEL="Site Title"
+TPL_BEEZ3_FIELD_TEMPLATECOLOR_DESC="Colour of the template."
+TPL_BEEZ3_FIELD_TEMPLATECOLOR_LABEL="Template colour"
+TPL_BEEZ3_FIELD_WRAPPERLARGE_DESC="Wrapper width with closed additional columns in percent."
+TPL_BEEZ3_FIELD_WRAPPERLARGE_LABEL="Wrapper Large (%)"
+TPL_BEEZ3_FIELD_WRAPPERSMALL_DESC="Wrapper width with opened additional columns in percent."
+TPL_BEEZ3_FIELD_WRAPPERSMALL_LABEL="Wrapper Small (%)"
+TPL_BEEZ3_FONTSIZE="Font size"
+TPL_BEEZ3_INCREASE_SIZE="Increase size"
+TPL_BEEZ3_JUMP_TO_INFO="Jump to additional information"
+TPL_BEEZ3_JUMP_TO_NAV="Jump to main navigation and login"
+TPL_BEEZ3_NAVIGATION="Navigation"
+TPL_BEEZ3_NAV_VIEW_SEARCH="Nav view search"
+TPL_BEEZ3_NEXTTAB="Next Tab"
+TPL_BEEZ3_OPENMENU="Open Menu"
+TPL_BEEZ3_OPTION_AFTER_CONTENT="after content"
+TPL_BEEZ3_OPTION_BEFORE_CONTENT="before content"
+TPL_BEEZ3_OPTION_IMAGE="Custom"
+TPL_BEEZ3_OPTION_NATURE="Nature"
+TPL_BEEZ3_OPTION_PERSONAL="Personal"
+TPL_BEEZ3_OPTION_RED="Red"
+TPL_BEEZ3_OPTION_TURQ="Turquoise"
+TPL_BEEZ3_POWERED_BY="Powered by"
+TPL_BEEZ3_RESET="Reset"
+TPL_BEEZ3_REVERT_STYLES_TO_DEFAULT="Revert styles to default"
+TPL_BEEZ3_SEARCH="Search"
+TPL_BEEZ3_SKIP_TO_CONTENT="Skip to content"
+TPL_BEEZ3_SKIP_TO_ERROR_CONTENT="Jump to error message and search"
+TPL_BEEZ3_SMALLER="Smaller"
+TPL_BEEZ3_SYSTEM_MESSAGE="Error"
+TPL_BEEZ3_TEXTRIGHTCLOSE="Close info"
+TPL_BEEZ3_TEXTRIGHTOPEN="Open info"
+TPL_BEEZ3_XML_DESCRIPTION="Accessible site template for Joomla! 3.x. Beez3, the HTML5 version."
+TPL_BEEZ3_YOUR_SITE_DESCRIPTION="Your site description"
diff --git a/core/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini b/core/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini
new file mode 100644
index 00000000..94294a1f
--- /dev/null
+++ b/core/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini
@@ -0,0 +1,24 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_BEEZ3_POSITION_DEBUG="Debug"
+TPL_BEEZ3_POSITION_POSITION-0="Search"
+TPL_BEEZ3_POSITION_POSITION-10="Footer middle"
+TPL_BEEZ3_POSITION_POSITION-11="Footer bottom"
+TPL_BEEZ3_POSITION_POSITION-12="Middle top"
+TPL_BEEZ3_POSITION_POSITION-13="Unused"
+TPL_BEEZ3_POSITION_POSITION-14="Footer last"
+TPL_BEEZ3_POSITION_POSITION-15="Header"
+TPL_BEEZ3_POSITION_POSITION-1="Top"
+TPL_BEEZ3_POSITION_POSITION-2="Breadcrumbs"
+TPL_BEEZ3_POSITION_POSITION-3="Right bottom"
+TPL_BEEZ3_POSITION_POSITION-4="Left middle"
+TPL_BEEZ3_POSITION_POSITION-5="Left bottom"
+TPL_BEEZ3_POSITION_POSITION-6="Right top"
+TPL_BEEZ3_POSITION_POSITION-7="Left top"
+TPL_BEEZ3_POSITION_POSITION-8="Right middle"
+TPL_BEEZ3_POSITION_POSITION-9="Footer top"
+TPL_BEEZ3_XML_DESCRIPTION="Accessible site template for Joomla! 3.x. Beez3, the HTML5 version."
+
diff --git a/core/templates/beez3/templateDetails.xml b/core/templates/beez3/templateDetails.xml
new file mode 100644
index 00000000..45f53077
--- /dev/null
+++ b/core/templates/beez3/templateDetails.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/1.6/template-install.dtd">
+<extension version="3.1" type="template" client="site">
+	<name>beez3</name>
+	<creationDate>25 November 2009</creationDate>
+	<author>Angie Radtke</author>
+	<authorEmail>a.radtke@derauftritt.de</authorEmail>
+	<authorUrl>http://www.der-auftritt.de</authorUrl>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<version>3.1.0</version>
+	<description>TPL_BEEZ3_XML_DESCRIPTION</description>
+
+	<files>
+		<folder>css</folder>
+		<folder>html</folder>
+		<folder>images</folder>
+		<folder>javascript</folder>
+		<folder>language</folder>
+		<filename>index.php</filename>
+		<filename>templateDetails.xml</filename>
+		<filename>template_preview.png</filename>
+		<filename>template_thumbnail.png</filename>
+		<filename>jsstrings.php</filename>
+		<filename>favicon.ico</filename>
+		<filename>component.php</filename>
+		<filename>error.php</filename>
+	</files>
+
+	<positions>
+		<position>debug</position>
+		<position>position-0</position>
+		<position>position-1</position>
+		<position>position-2</position>
+		<position>position-3</position>
+		<position>position-4</position>
+		<position>position-5</position>
+		<position>position-6</position>
+		<position>position-7</position>
+		<position>position-8</position>
+		<position>position-9</position>
+		<position>position-10</position>
+		<position>position-11</position>
+		<position>position-12</position>
+		<position>position-13</position>
+		<position>position-14</position>
+	</positions>
+
+	<!-- 	For core templates, we also install/uninstall the language files in the core language folders.
+	-->
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.tpl_beez3.ini</language>
+		<language tag="en-GB">en-GB/en-GB.tpl_beez3.sys.ini</language>
+	</languages>
+
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field 
+					name="wrapperSmall"  
+					type="number" 
+					label="TPL_BEEZ3_FIELD_WRAPPERSMALL_LABEL"
+					description="TPL_BEEZ3_FIELD_WRAPPERSMALL_DESC"
+					class="validate-numeric" 
+					default="53"
+					filter="integer"
+				/>
+
+				<field 
+					name="wrapperLarge"  
+					type="number" 
+					label="TPL_BEEZ3_FIELD_WRAPPERLARGE_LABEL"
+					description="TPL_BEEZ3_FIELD_WRAPPERLARGE_DESC"
+					class="validate-numeric" 
+					default="72"
+					filter="integer"
+				 />
+
+				<field 
+					name="logo"
+					type="media"
+					label="TPL_BEEZ3_FIELD_LOGO_LABEL" 
+					description="TPL_BEEZ3_FIELD_LOGO_DESC" 
+				/>
+
+				<field 
+					name="sitetitle"  
+					type="text" 
+					label="TPL_BEEZ3_FIELD_SITETITLE_LABEL"
+					description="TPL_BEEZ3_FIELD_SITETITLE_DESC"
+					default=""
+					filter="string" 
+				/>
+
+				<field 
+					name="sitedescription"  
+					type="text" 
+					label="TPL_BEEZ3_FIELD_DESCRIPTION_LABEL"
+					description="TPL_BEEZ3_FIELD_DESCRIPTION_DESC"
+					default=""
+					filter="string" 
+				/>
+
+				<field 
+					name="navposition" 
+					type="list" 
+					label="TPL_BEEZ3_FIELD_NAVPOSITION_LABEL"
+					description="TPL_BEEZ3_FIELD_NAVPOSITION_DESC"
+					default="center"
+					filter="word"
+					>
+					<option value="center">TPL_BEEZ3_OPTION_AFTER_CONTENT</option>
+					<option value="left">TPL_BEEZ3_OPTION_BEFORE_CONTENT</option>
+				</field>
+
+				<field 
+					name="bootstrap" 
+					type="textarea"
+					label="TPL_BEEZ3_FIELD_BOOTSTRAP_LABEL"
+					description="TPL_BEEZ3_FIELD_BOOTSTRAP_DESC"
+					rows="4" 
+					columns="30"
+				/>
+
+				<field
+					name="templatecolor" 
+					type="list" 
+					label="TPL_BEEZ3_FIELD_TEMPLATECOLOR_LABEL"
+					description="TPL_BEEZ3_FIELD_TEMPLATECOLOR_DESC"
+					default="nature"
+					filter="word"
+					>
+					<option value="nature">TPL_BEEZ3_OPTION_NATURE</option>
+					<option value="personal">TPL_BEEZ3_OPTION_PERSONAL</option>
+					<option value="red">TPL_BEEZ3_OPTION_RED</option>
+					<option value="turq">TPL_BEEZ3_OPTION_TURQ</option>
+					<option value="image">TPL_BEEZ3_OPTION_IMAGE</option>
+				</field>
+
+				<field 
+					name="headerImage" 
+					type="media"
+					label="TPL_BEEZ3_FIELD_HEADER_IMAGE_LABEL" 
+					description="TPL_BEEZ3_FIELD_HEADER_IMAGE_DESC" 
+					showon="templatecolor:image" 
+				/>
+
+				<field 
+					name="backgroundcolor" 
+					type="color" 
+					label="TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_LABEL"
+					description="TPL_BEEZ3_FIELD_HEADER_BACKGROUND_COLOR_DESC"
+					default="#eee"
+					showon="templatecolor:image" 
+				/>
+
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/templates/beez3/template_preview.png b/core/templates/beez3/template_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aba8f3b9418429b64991a768af2b1bc09092a34
GIT binary patch
literal 118531
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

literal 0
HcmV?d00001

diff --git a/core/templates/beez3/template_thumbnail.png b/core/templates/beez3/template_thumbnail.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1997b7a8911e5aeb94eb8bfdc53b88774423db5
GIT binary patch
literal 21957
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

literal 0
HcmV?d00001

diff --git a/core/templates/index.html b/core/templates/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/templates/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/templates/protostar/component.php b/core/templates/protostar/component.php
new file mode 100644
index 00000000..ad597704
--- /dev/null
+++ b/core/templates/protostar/component.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app = JFactory::getApplication();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add Stylesheets
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+
+// Load optional rtl Bootstrap css and Bootstrap bugfixes
+JHtmlBootstrap::loadCss($includeMaincss = false, $this->direction);
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+	<jdoc:include type="head" />
+</head>
+<body class="contentpane modal<?php echo $this->direction === 'rtl' ? ' rtl' : ''; ?>">
+	<jdoc:include type="message" />
+	<jdoc:include type="component" />
+</body>
+</html>
diff --git a/core/templates/protostar/css/offline.css b/core/templates/protostar/css/offline.css
new file mode 100644
index 00000000..af3cb3cb
--- /dev/null
+++ b/core/templates/protostar/css/offline.css
@@ -0,0 +1,58 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license	GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+body.site {
+	margin: 0;
+	padding: 0;
+}
+
+.outer {
+	display: table;
+	position: absolute;
+	height: 100%;
+	width: 100%;
+}
+
+.middle {
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.inner {
+	margin: 0 auto;
+	max-width: 30em;
+	background-color: #ffffff;
+}
+
+.header {
+	text-align: center;
+	margin: 0 0 1em 0;
+}
+
+img {
+	max-width: 100%;
+	height: auto;
+	border: 0;
+}
+
+form, fieldset {
+	margin: 0;
+	padding: 0;
+}
+
+label {
+	display: block;
+	margin: 0;
+}
+
+input[type="text"], input[type="password"] {
+	box-sizing: border-box;
+	width: 100%;
+	height: auto;
+}
+
+input {
+	margin: .5em 0 1em 0;
+}
diff --git a/core/templates/protostar/css/template.css b/core/templates/protostar/css/template.css
new file mode 100644
index 00000000..c6bdb793
--- /dev/null
+++ b/core/templates/protostar/css/template.css
@@ -0,0 +1,7762 @@
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+	display: block;
+}
+audio,
+canvas,
+video {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+audio:not([controls]) {
+	display: none;
+}
+html {
+	font-size: 100%;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+}
+a:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+a:hover,
+a:active {
+	outline: 0;
+}
+sub,
+sup {
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline;
+}
+sup {
+	top: -0.5em;
+}
+sub {
+	bottom: -0.25em;
+}
+img {
+	max-width: 100%;
+	width: auto \9;
+	height: auto;
+	vertical-align: middle;
+	border: 0;
+	-ms-interpolation-mode: bicubic;
+}
+#map_canvas img,
+.google-maps img,
+.gm-style img {
+	max-width: none;
+}
+button,
+input,
+select,
+textarea {
+	margin: 0;
+	font-size: 100%;
+	vertical-align: middle;
+}
+button,
+input {
+	*overflow: visible;
+	line-height: normal;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+	-webkit-appearance: button;
+	cursor: pointer;
+}
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+	cursor: pointer;
+}
+input[type="search"] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+	-webkit-appearance: none;
+}
+textarea {
+	overflow: auto;
+	vertical-align: top;
+}
+@media print {
+	* {
+		text-shadow: none !important;
+		color: #000 !important;
+		background: transparent !important;
+		box-shadow: none !important;
+	}
+	a,
+	a:visited {
+		text-decoration: underline;
+	}
+	a[href]:after {
+		content: " (" attr(href) ")";
+	}
+	abbr[title]:after {
+		content: " (" attr(title) ")";
+	}
+	.ir a:after,
+	a[href^="javascript:"]:after,
+	a[href^="#"]:after {
+		content: "";
+	}
+	pre,
+	blockquote {
+		border: 1px solid #999;
+		page-break-inside: avoid;
+	}
+	thead {
+		display: table-header-group;
+	}
+	tr,
+	img {
+		page-break-inside: avoid;
+	}
+	img {
+		max-width: 100% !important;
+	}
+	@page {
+		margin: 0.5cm;
+	}
+	p,
+	h2,
+	h3 {
+		orphans: 3;
+		widows: 3;
+	}
+	h2,
+	h3 {
+		page-break-after: avoid;
+	}
+}
+.clearfix {
+	*zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.clearfix:after {
+	clear: both;
+}
+.hide-text {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
+}
+.input-block-level {
+	display: block;
+	width: 100%;
+	min-height: 28px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+body {
+	margin: 0;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	line-height: 18px;
+	color: #333;
+	background-color: #fff;
+}
+a {
+	color: #005e8d;
+	text-decoration: none;
+}
+a:hover,
+a:focus {
+	color: #002b41;
+	text-decoration: underline;
+}
+.img-rounded {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.img-polaroid {
+	padding: 4px;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+}
+.img-circle {
+	-webkit-border-radius: 500px;
+	-moz-border-radius: 500px;
+	border-radius: 500px;
+}
+.row {
+	margin-left: -20px;
+	*zoom: 1;
+}
+.row:before,
+.row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row:after {
+	clear: both;
+}
+[class*="span"] {
+	float: left;
+	min-height: 1px;
+	margin-left: 20px;
+}
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.span12 {
+	width: 940px;
+}
+.span11 {
+	width: 860px;
+}
+.span10 {
+	width: 780px;
+}
+.span9 {
+	width: 700px;
+}
+.span8 {
+	width: 620px;
+}
+.span7 {
+	width: 540px;
+}
+.span6 {
+	width: 460px;
+}
+.span5 {
+	width: 380px;
+}
+.span4 {
+	width: 300px;
+}
+.span3 {
+	width: 220px;
+}
+.span2 {
+	width: 140px;
+}
+.span1 {
+	width: 60px;
+}
+.offset12 {
+	margin-left: 980px;
+}
+.offset11 {
+	margin-left: 900px;
+}
+.offset10 {
+	margin-left: 820px;
+}
+.offset9 {
+	margin-left: 740px;
+}
+.offset8 {
+	margin-left: 660px;
+}
+.offset7 {
+	margin-left: 580px;
+}
+.offset6 {
+	margin-left: 500px;
+}
+.offset5 {
+	margin-left: 420px;
+}
+.offset4 {
+	margin-left: 340px;
+}
+.offset3 {
+	margin-left: 260px;
+}
+.offset2 {
+	margin-left: 180px;
+}
+.offset1 {
+	margin-left: 100px;
+}
+.row-fluid {
+	width: 100%;
+	*zoom: 1;
+}
+.row-fluid:before,
+.row-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.row-fluid:after {
+	clear: both;
+}
+.row-fluid [class*="span"] {
+	display: block;
+	width: 100%;
+	min-height: 28px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+	margin-left: 2.127659574%;
+	*margin-left: 2.0744680846383%;
+}
+.row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+	margin-left: 2.127659574%;
+}
+.row-fluid .span12 {
+	width: 99.99999999%;
+	*width: 99.946808500638%;
+}
+.row-fluid .span11 {
+	width: 91.489361693%;
+	*width: 91.436170203638%;
+}
+.row-fluid .span10 {
+	width: 82.978723396%;
+	*width: 82.925531906638%;
+}
+.row-fluid .span9 {
+	width: 74.468085099%;
+	*width: 74.414893609638%;
+}
+.row-fluid .span8 {
+	width: 65.957446802%;
+	*width: 65.904255312638%;
+}
+.row-fluid .span7 {
+	width: 57.446808505%;
+	*width: 57.393617015638%;
+}
+.row-fluid .span6 {
+	width: 48.936170208%;
+	*width: 48.882978718638%;
+}
+.row-fluid .span5 {
+	width: 40.425531911%;
+	*width: 40.372340421638%;
+}
+.row-fluid .span4 {
+	width: 31.914893614%;
+	*width: 31.861702124638%;
+}
+.row-fluid .span3 {
+	width: 23.404255317%;
+	*width: 23.351063827638%;
+}
+.row-fluid .span2 {
+	width: 14.89361702%;
+	*width: 14.840425530638%;
+}
+.row-fluid .span1 {
+	width: 6.382978723%;
+	*width: 6.3297872336383%;
+}
+.row-fluid .offset12 {
+	margin-left: 104.255319138%;
+	*margin-left: 104.14893615928%;
+}
+.row-fluid .offset12:first-child {
+	margin-left: 102.127659564%;
+	*margin-left: 102.02127658528%;
+}
+.row-fluid .offset11 {
+	margin-left: 95.744680841%;
+	*margin-left: 95.638297862277%;
+}
+.row-fluid .offset11:first-child {
+	margin-left: 93.617021267%;
+	*margin-left: 93.510638288277%;
+}
+.row-fluid .offset10 {
+	margin-left: 87.234042544%;
+	*margin-left: 87.127659565277%;
+}
+.row-fluid .offset10:first-child {
+	margin-left: 85.10638297%;
+	*margin-left: 84.999999991277%;
+}
+.row-fluid .offset9 {
+	margin-left: 78.723404247%;
+	*margin-left: 78.617021268277%;
+}
+.row-fluid .offset9:first-child {
+	margin-left: 76.595744673%;
+	*margin-left: 76.489361694277%;
+}
+.row-fluid .offset8 {
+	margin-left: 70.21276595%;
+	*margin-left: 70.106382971277%;
+}
+.row-fluid .offset8:first-child {
+	margin-left: 68.085106376%;
+	*margin-left: 67.978723397277%;
+}
+.row-fluid .offset7 {
+	margin-left: 61.702127653%;
+	*margin-left: 61.595744674277%;
+}
+.row-fluid .offset7:first-child {
+	margin-left: 59.574468079%;
+	*margin-left: 59.468085100277%;
+}
+.row-fluid .offset6 {
+	margin-left: 53.191489356%;
+	*margin-left: 53.085106377277%;
+}
+.row-fluid .offset6:first-child {
+	margin-left: 51.063829782%;
+	*margin-left: 50.957446803277%;
+}
+.row-fluid .offset5 {
+	margin-left: 44.680851059%;
+	*margin-left: 44.574468080277%;
+}
+.row-fluid .offset5:first-child {
+	margin-left: 42.553191485%;
+	*margin-left: 42.446808506277%;
+}
+.row-fluid .offset4 {
+	margin-left: 36.170212762%;
+	*margin-left: 36.063829783277%;
+}
+.row-fluid .offset4:first-child {
+	margin-left: 34.042553188%;
+	*margin-left: 33.936170209277%;
+}
+.row-fluid .offset3 {
+	margin-left: 27.659574465%;
+	*margin-left: 27.553191486277%;
+}
+.row-fluid .offset3:first-child {
+	margin-left: 25.531914891%;
+	*margin-left: 25.425531912277%;
+}
+.row-fluid .offset2 {
+	margin-left: 19.148936168%;
+	*margin-left: 19.042553189277%;
+}
+.row-fluid .offset2:first-child {
+	margin-left: 17.021276594%;
+	*margin-left: 16.914893615277%;
+}
+.row-fluid .offset1 {
+	margin-left: 10.638297871%;
+	*margin-left: 10.531914892277%;
+}
+.row-fluid .offset1:first-child {
+	margin-left: 8.510638297%;
+	*margin-left: 8.4042553182766%;
+}
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+	display: none;
+}
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+	float: right;
+}
+.container {
+	margin-right: auto;
+	margin-left: auto;
+	*zoom: 1;
+}
+.container:before,
+.container:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container:after {
+	clear: both;
+}
+.container-fluid {
+	padding-right: 20px;
+	padding-left: 20px;
+	*zoom: 1;
+}
+.container-fluid:before,
+.container-fluid:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.container-fluid:after {
+	clear: both;
+}
+p {
+	margin: 0 0 9px;
+}
+.lead {
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	font-weight: 200;
+	line-height: 27px;
+}
+small {
+	font-size: 85%;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+cite {
+	font-style: normal;
+}
+.muted {
+	color: #999;
+}
+a.muted:hover,
+a.muted:focus {
+	color: #808080;
+}
+.text-warning {
+	color: #c09853;
+}
+a.text-warning:hover,
+a.text-warning:focus {
+	color: #a47e3c;
+}
+.text-error {
+	color: #b94a48;
+}
+a.text-error:hover,
+a.text-error:focus {
+	color: #953b39;
+}
+.text-info {
+	color: #3a87ad;
+}
+a.text-info:hover,
+a.text-info:focus {
+	color: #2d6987;
+}
+.text-success {
+	color: #468847;
+}
+a.text-success:hover,
+a.text-success:focus {
+	color: #356635;
+}
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 9px 0;
+	font-family: inherit;
+	font-weight: bold;
+	line-height: 18px;
+	color: inherit;
+	text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+	font-weight: normal;
+	line-height: 1;
+	color: #999;
+}
+h1,
+h2,
+h3 {
+	line-height: 36px;
+}
+h1 {
+	font-size: 35.75px;
+}
+h2 {
+	font-size: 29.25px;
+}
+h3 {
+	font-size: 22.75px;
+}
+h4 {
+	font-size: 16.25px;
+}
+h5 {
+	font-size: 13px;
+}
+h6 {
+	font-size: 11.05px;
+}
+h1 small {
+	font-size: 22.75px;
+}
+h2 small {
+	font-size: 16.25px;
+}
+h3 small {
+	font-size: 13px;
+}
+h4 small {
+	font-size: 13px;
+}
+.page-header {
+	padding-bottom: 8px;
+	margin: 18px 0 27px;
+	border-bottom: 1px solid #eee;
+}
+ul,
+ol {
+	padding: 0;
+	margin: 0 0 9px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+	margin-bottom: 0;
+}
+li {
+	line-height: 18px;
+}
+ul.unstyled,
+ol.unstyled {
+	margin-left: 0;
+	list-style: none;
+}
+ul.inline,
+ol.inline {
+	margin-left: 0;
+	list-style: none;
+}
+ul.inline > li,
+ol.inline > li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+dl {
+	margin-bottom: 18px;
+}
+dt,
+dd {
+	line-height: 18px;
+}
+dt {
+	font-weight: bold;
+}
+dd {
+	margin-left: 9px;
+}
+.dl-horizontal {
+	*zoom: 1;
+}
+.dl-horizontal:before,
+.dl-horizontal:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.dl-horizontal:after {
+	clear: both;
+}
+.dl-horizontal dt {
+	float: left;
+	width: 160px;
+	clear: left;
+	text-align: right;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.dl-horizontal dd {
+	margin-left: 180px;
+}
+hr {
+	margin: 18px 0;
+	border: 0;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #fff;
+}
+abbr[title],
+abbr[data-original-title] {
+	cursor: help;
+	border-bottom: 1px dotted #999;
+}
+abbr.initialism {
+	font-size: 90%;
+	text-transform: uppercase;
+}
+blockquote {
+	padding: 0 0 0 15px;
+	margin: 0 0 18px;
+	border-left: 5px solid #eee;
+}
+blockquote p {
+	margin-bottom: 0;
+	font-size: 16.25px;
+	font-weight: 300;
+	line-height: 1.25;
+}
+blockquote small {
+	display: block;
+	line-height: 18px;
+	color: #999;
+}
+blockquote small:before {
+	content: '\2014 \00A0';
+}
+blockquote.pull-right {
+	float: right;
+	padding-right: 15px;
+	padding-left: 0;
+	border-right: 5px solid #eee;
+	border-left: 0;
+}
+blockquote.pull-right p,
+blockquote.pull-right small {
+	text-align: right;
+}
+blockquote.pull-right small:before {
+	content: '';
+}
+blockquote.pull-right small:after {
+	content: '\00A0 \2014';
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+	content: "";
+}
+address {
+	display: block;
+	margin-bottom: 18px;
+	font-style: normal;
+	line-height: 18px;
+}
+code,
+pre {
+	padding: 0 3px 2px;
+	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+	font-size: 11px;
+	color: #333;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+code {
+	padding: 2px 4px;
+	color: #d14;
+	background-color: #f7f7f9;
+	border: 1px solid #e1e1e8;
+	white-space: nowrap;
+}
+pre {
+	display: block;
+	padding: 8.5px;
+	margin: 0 0 9px;
+	font-size: 12px;
+	line-height: 18px;
+	word-break: break-all;
+	word-wrap: break-word;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.15);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+pre.prettyprint {
+	margin-bottom: 18px;
+}
+pre code {
+	padding: 0;
+	color: inherit;
+	white-space: pre;
+	white-space: pre-wrap;
+	background-color: transparent;
+	border: 0;
+}
+.pre-scrollable {
+	max-height: 340px;
+	overflow-y: scroll;
+}
+form {
+	margin: 0 0 18px;
+}
+fieldset {
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 18px;
+	font-size: 19.5px;
+	line-height: 36px;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5;
+}
+legend small {
+	font-size: 13.5px;
+	color: #999;
+}
+label,
+input,
+button,
+select,
+textarea {
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+}
+input,
+button,
+select,
+textarea {
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+label {
+	display: block;
+	margin-bottom: 5px;
+}
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	display: inline-block;
+	height: 18px;
+	padding: 4px 6px;
+	margin-bottom: 9px;
+	font-size: 13px;
+	line-height: 18px;
+	color: #555;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	vertical-align: middle;
+}
+input,
+textarea,
+.uneditable-input {
+	width: 206px;
+}
+textarea {
+	height: auto;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-webkit-transition: border linear .2s, box-shadow linear .2s;
+	-moz-transition: border linear .2s, box-shadow linear .2s;
+	-o-transition: border linear .2s, box-shadow linear .2s;
+	transition: border linear .2s, box-shadow linear .2s;
+}
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+	border-color: rgba(82,168,236,0.8);
+	outline: 0;
+	outline: thin dotted \9;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+input[type="radio"],
+input[type="checkbox"] {
+	margin: 4px 0 0;
+	*margin-top: 0;
+	margin-top: 1px \9;
+	line-height: normal;
+}
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+	width: auto;
+}
+select,
+input[type="file"] {
+	height: 28px;
+	*margin-top: 4px;
+	line-height: 28px;
+}
+select {
+	width: 220px;
+	border: 1px solid #ccc;
+	background-color: #fff;
+}
+select[multiple],
+select[size] {
+	height: auto;
+}
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.uneditable-input,
+.uneditable-textarea {
+	color: #999;
+	background-color: #fcfcfc;
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.025);
+	cursor: not-allowed;
+}
+.uneditable-input {
+	overflow: hidden;
+	white-space: nowrap;
+}
+.uneditable-textarea {
+	width: auto;
+	height: auto;
+}
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+	color: #999;
+}
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+	color: #999;
+}
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+	color: #999;
+}
+.radio,
+.checkbox {
+	min-height: 18px;
+	padding-left: 20px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+	float: left;
+	margin-left: -20px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.radio.inline,
+.checkbox.inline {
+	display: inline-block;
+	padding-top: 5px;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+	margin-left: 10px;
+}
+.input-mini {
+	width: 60px;
+}
+.input-small {
+	width: 90px;
+}
+.input-medium {
+	width: 150px;
+}
+.input-large {
+	width: 210px;
+}
+.input-xlarge {
+	width: 270px;
+}
+.input-xxlarge {
+	width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+	float: none;
+	margin-left: 0;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+	display: inline-block;
+}
+input,
+textarea,
+.uneditable-input {
+	margin-left: 0;
+}
+.controls-row [class*="span"] + [class*="span"] {
+	margin-left: 20px;
+}
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+	width: 926px;
+}
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+	width: 846px;
+}
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+	width: 766px;
+}
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+	width: 686px;
+}
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+	width: 606px;
+}
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+	width: 526px;
+}
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+	width: 446px;
+}
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+	width: 366px;
+}
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+	width: 286px;
+}
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+	width: 206px;
+}
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+	width: 126px;
+}
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+	width: 46px;
+}
+.controls-row {
+	*zoom: 1;
+}
+.controls-row:before,
+.controls-row:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.controls-row:after {
+	clear: both;
+}
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+	float: left;
+}
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+	padding-top: 5px;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+	cursor: not-allowed;
+	background-color: #eee;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+	background-color: transparent;
+}
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+	color: #c09853;
+}
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	color: #c09853;
+}
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+	border-color: #c09853;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+	border-color: #a47e3c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+	color: #c09853;
+	background-color: #fcf8e3;
+	border-color: #c09853;
+}
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+	color: #b94a48;
+}
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	color: #b94a48;
+}
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+	border-color: #b94a48;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+	border-color: #953b39;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+	color: #b94a48;
+	background-color: #f2dede;
+	border-color: #b94a48;
+}
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+	color: #468847;
+}
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	color: #468847;
+}
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+	border-color: #468847;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+	border-color: #356635;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+	color: #468847;
+	background-color: #dff0d8;
+	border-color: #468847;
+}
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+	color: #3a87ad;
+}
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+	color: #3a87ad;
+}
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+	border-color: #3a87ad;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+}
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+	border-color: #2d6987;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7ab5d3;
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7ab5d3;
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 6px #7ab5d3;
+}
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+	color: #3a87ad;
+	background-color: #d9edf7;
+	border-color: #3a87ad;
+}
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+	color: #b94a48;
+	border-color: #ee5f5b;
+}
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+	padding: 17px 20px 18px;
+	margin-top: 18px;
+	margin-bottom: 18px;
+	background-color: #f5f5f5;
+	border-top: 1px solid #e5e5e5;
+	*zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-actions:after {
+	clear: both;
+}
+.help-block,
+.help-inline {
+	color: #595959;
+}
+.help-block {
+	display: block;
+	margin-bottom: 9px;
+}
+.help-inline {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: middle;
+	padding-left: 5px;
+}
+.input-append,
+.input-prepend {
+	display: inline-block;
+	margin-bottom: 9px;
+	vertical-align: middle;
+	font-size: 0;
+	white-space: nowrap;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-append .dropdown-menu,
+.input-append .popover,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input,
+.input-prepend .dropdown-menu,
+.input-prepend .popover {
+	font-size: 13px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input,
+.input-prepend input,
+.input-prepend select,
+.input-prepend .uneditable-input {
+	position: relative;
+	margin-bottom: 0;
+	*margin-left: 0;
+	vertical-align: top;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append input:focus,
+.input-append select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend input:focus,
+.input-prepend select:focus,
+.input-prepend .uneditable-input:focus {
+	z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+	display: inline-block;
+	width: auto;
+	height: 18px;
+	min-width: 16px;
+	padding: 4px 5px;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	text-align: center;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #eee;
+	border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .add-on,
+.input-prepend .btn,
+.input-prepend .btn-group > .dropdown-toggle {
+	vertical-align: top;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+	margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+	margin-left: -1px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+	margin-right: -1px;
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+	margin-left: -1px;
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend.input-append .btn-group:first-child {
+	margin-left: 0;
+}
+input.search-query {
+	padding-right: 14px;
+	padding-right: 4px \9;
+	padding-left: 14px;
+	padding-left: 4px \9;
+	margin-bottom: 0;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.form-search .input-append .search-query {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+	-webkit-border-radius: 0 14px 14px 0;
+	-moz-border-radius: 0 14px 14px 0;
+	border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+	-webkit-border-radius: 14px 0 0 14px;
+	-moz-border-radius: 14px 0 0 14px;
+	border-radius: 14px 0 0 14px;
+}
+.js-stools-field-filter .input-prepend,
+.js-stools-field-filter .input-append {
+	margin-bottom: 0;
+}
+.form-search input,
+.form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-search .input-prepend,
+.form-search .input-append,
+.form-inline input,
+.form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-inline .input-prepend,
+.form-inline .input-append,
+.form-horizontal input,
+.form-horizontal textarea,
+.form-horizontal select,
+.form-horizontal .help-inline,
+.form-horizontal .uneditable-input,
+.form-horizontal .input-prepend,
+.form-horizontal .input-append {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+	display: none;
+}
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+	display: inline-block;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+	margin-bottom: 0;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+	padding-left: 0;
+	margin-bottom: 0;
+	vertical-align: middle;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+	float: left;
+	margin-right: 3px;
+	margin-left: 0;
+}
+.control-group {
+	margin-bottom: 9px;
+}
+legend + .control-group {
+	margin-top: 18px;
+	-webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+	margin-bottom: 18px;
+	*zoom: 1;
+}
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.form-horizontal .control-group:after {
+	clear: both;
+}
+.form-horizontal .control-label {
+	float: left;
+	width: 160px;
+	padding-top: 5px;
+	text-align: right;
+}
+.form-horizontal .controls {
+	*display: inline-block;
+	*padding-left: 20px;
+	margin-left: 180px;
+	*margin-left: 0;
+}
+.form-horizontal .controls:first-child {
+	*padding-left: 180px;
+}
+.form-horizontal .help-block {
+	margin-bottom: 0;
+}
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+	margin-top: 9px;
+}
+.form-horizontal .form-actions {
+	padding-left: 180px;
+}
+.control-label .hasPopover,
+.control-label .hasTooltip {
+	display: inline-block;
+}
+.subform-repeatable-wrapper .btn-group>.btn.button {
+	min-width: 0;
+}
+.subform-repeatable-wrapper .ui-sortable-helper {
+	background: #fff;
+}
+.subform-repeatable-wrapper tr.ui-sortable-helper {
+	display: table;
+}
+@media (min-width: 980px) and (max-width: 1215px) {
+	.float-cols .control-label {
+		float: none;
+	}
+	.float-cols .controls {
+		margin-left: 0;
+	}
+}
+table {
+	max-width: 100%;
+	background-color: transparent;
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+.table {
+	width: 100%;
+	margin-bottom: 18px;
+}
+.table th,
+.table td {
+	padding: 8px;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: top;
+	border-top: 1px solid #ddd;
+}
+.table th {
+	font-weight: bold;
+}
+.table thead th {
+	vertical-align: bottom;
+}
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+	border-top: 0;
+}
+.table tbody + tbody {
+	border-top: 2px solid #ddd;
+}
+.table .table {
+	background-color: #fff;
+}
+.table-condensed th,
+.table-condensed td {
+	padding: 4px 5px;
+}
+.table-bordered {
+	border: 1px solid #ddd;
+	border-collapse: separate;
+	*border-collapse: collapse;
+	border-left: 0;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.table-bordered th,
+.table-bordered td {
+	border-left: 1px solid #ddd;
+}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+	border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+}
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+}
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+	-webkit-border-bottom-left-radius: 0;
+	-moz-border-radius-bottomleft: 0;
+	border-bottom-left-radius: 0;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+	-webkit-border-bottom-right-radius: 0;
+	-moz-border-radius-bottomright: 0;
+	border-bottom-right-radius: 0;
+}
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+}
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+}
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+	background-color: #f9f9f9;
+}
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+	background-color: #f5f5f5;
+}
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+	display: table-cell;
+	float: none;
+	margin-left: 0;
+}
+.table td.span1,
+.table th.span1 {
+	float: none;
+	width: 44px;
+	margin-left: 0;
+}
+.table td.span2,
+.table th.span2 {
+	float: none;
+	width: 124px;
+	margin-left: 0;
+}
+.table td.span3,
+.table th.span3 {
+	float: none;
+	width: 204px;
+	margin-left: 0;
+}
+.table td.span4,
+.table th.span4 {
+	float: none;
+	width: 284px;
+	margin-left: 0;
+}
+.table td.span5,
+.table th.span5 {
+	float: none;
+	width: 364px;
+	margin-left: 0;
+}
+.table td.span6,
+.table th.span6 {
+	float: none;
+	width: 444px;
+	margin-left: 0;
+}
+.table td.span7,
+.table th.span7 {
+	float: none;
+	width: 524px;
+	margin-left: 0;
+}
+.table td.span8,
+.table th.span8 {
+	float: none;
+	width: 604px;
+	margin-left: 0;
+}
+.table td.span9,
+.table th.span9 {
+	float: none;
+	width: 684px;
+	margin-left: 0;
+}
+.table td.span10,
+.table th.span10 {
+	float: none;
+	width: 764px;
+	margin-left: 0;
+}
+.table td.span11,
+.table th.span11 {
+	float: none;
+	width: 844px;
+	margin-left: 0;
+}
+.table td.span12,
+.table th.span12 {
+	float: none;
+	width: 924px;
+	margin-left: 0;
+}
+.table tbody tr.success > td {
+	background-color: #dff0d8;
+}
+.table tbody tr.error > td {
+	background-color: #f2dede;
+}
+.table tbody tr.warning > td {
+	background-color: #fcf8e3;
+}
+.table tbody tr.info > td {
+	background-color: #d9edf7;
+}
+.table-hover tbody tr.success:hover > td {
+	background-color: #d0e9c6;
+}
+.table-hover tbody tr.error:hover > td {
+	background-color: #ebcccc;
+}
+.table-hover tbody tr.warning:hover > td {
+	background-color: #faf2cc;
+}
+.table-hover tbody tr.info:hover > td {
+	background-color: #c4e3f3;
+}
+.table-noheader {
+	border-collapse: collapse;
+}
+.table-noheader thead {
+	display: none;
+}
+.dropup,
+.dropdown {
+	position: relative;
+}
+.dropdown-toggle {
+	*margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+	outline: 0;
+}
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	vertical-align: top;
+	border-top: 4px solid #000;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent;
+	content: "";
+}
+.dropdown .caret {
+	margin-top: 8px;
+	margin-left: 2px;
+}
+.dropdown-menu {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	list-style: none;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+	right: 0;
+	left: auto;
+}
+.dropdown-menu .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+.dropdown-menu .menuitem-group {
+	margin: 4px 1px;
+	overflow: hidden;
+	border-top: 1px solid #eee;
+	border-bottom: 1px solid #eee;
+	background-color: #eee;
+	color: #555;
+	text-transform: capitalize;
+	font-size: 95%;
+	padding: 3px 20px;
+}
+.dropdown-menu > li > a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: normal;
+	line-height: 18px;
+	color: #333;
+	white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+	text-decoration: none;
+	color: #fff;
+	background-color: #005783;
+	background-image: -moz-linear-gradient(top,#005e8d,#004d74);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#004d74));
+	background-image: -webkit-linear-gradient(top,#005e8d,#004d74);
+	background-image: -o-linear-gradient(top,#005e8d,#004d74);
+	background-image: linear-gradient(to bottom,#005e8d,#004d74);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff004c73', GradientType=0);
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+	color: #333;
+	text-decoration: none;
+	outline: 0;
+	background-color: #005783;
+	background-image: -moz-linear-gradient(top,#005e8d,#004d74);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#004d74));
+	background-image: -webkit-linear-gradient(top,#005e8d,#004d74);
+	background-image: -o-linear-gradient(top,#005e8d,#004d74);
+	background-image: linear-gradient(to bottom,#005e8d,#004d74);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff004c73', GradientType=0);
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+	color: #999;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+	text-decoration: none;
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	cursor: default;
+}
+.open {
+	*z-index: 1000;
+}
+.open > .dropdown-menu {
+	display: block;
+}
+.dropdown-backdrop {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	top: 0;
+	z-index: 990;
+}
+.pull-right > .dropdown-menu {
+	right: 0;
+	left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+	border-top: 0;
+	border-bottom: 4px solid #000;
+	content: "";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 1px;
+}
+.dropdown-submenu {
+	position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+	top: 0;
+	left: 100%;
+	margin-top: -6px;
+	margin-left: -1px;
+	-webkit-border-radius: 6px 6px 6px 6px;
+	-moz-border-radius: 6px 6px 6px 6px;
+	border-radius: 6px 6px 6px 6px;
+}
+.dropdown-submenu:hover > .dropdown-menu {
+	display: block;
+}
+.dropup .dropdown-submenu > .dropdown-menu {
+	top: auto;
+	bottom: 0;
+	margin-top: 0;
+	margin-bottom: -2px;
+	-webkit-border-radius: 5px 5px 5px 0;
+	-moz-border-radius: 5px 5px 5px 0;
+	border-radius: 5px 5px 5px 0;
+}
+.dropdown-submenu > a:after {
+	display: block;
+	content: " ";
+	float: right;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #cccccc;
+	margin-top: 5px;
+	margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+	border-left-color: #fff;
+}
+.dropdown-submenu.pull-left {
+	float: none;
+}
+.dropdown-submenu.pull-left > .dropdown-menu {
+	left: -100%;
+	margin-left: 10px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.dropdown .dropdown-menu .nav-header {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+.typeahead {
+	z-index: 1051;
+	margin-top: 2px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #e3e3e3;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+	-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.05);
+}
+.well blockquote {
+	border-color: #ddd;
+	border-color: rgba(0,0,0,0.15);
+}
+.well-large {
+	padding: 24px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.well-small {
+	padding: 9px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-moz-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear;
+}
+.fade.in {
+	opacity: 1;
+}
+.collapse {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	-moz-transition: height .35s ease;
+	-o-transition: height .35s ease;
+	transition: height .35s ease;
+}
+.collapse.in {
+	height: auto;
+}
+.close {
+	float: right;
+	font-size: 20px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.close:hover,
+.close:focus {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+button.close {
+	padding: 3;
+	cursor: pointer;
+	background: transparent;
+	border: 0;
+	-webkit-appearance: none;
+}
+.alert-options {
+	float: right;
+	line-height: 18px;
+	color: #000;
+	text-shadow: 0 1px 0 #ffffff;
+	opacity: 0.2;
+	filter: alpha(opacity=20);
+}
+.alert-options:hover,
+.alert-options:focus {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	opacity: 0.4;
+	filter: alpha(opacity=40);
+}
+.btn {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	padding: 4px 12px;
+	margin-bottom: 0;
+	font-size: 13px;
+	line-height: 18px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333;
+	text-shadow: 0 1px 1px rgba(255,255,255,0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#fff,#e6e6e6);
+	background-image: -o-linear-gradient(top,#fff,#e6e6e6);
+	background-image: linear-gradient(to bottom,#fff,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	border: 1px solid #bbb;
+	*border: 0;
+	border-bottom-color: #a2a2a2;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*margin-left: .3em;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+	color: #333;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+.btn:active,
+.btn.active {
+	background-color: #cccccc \9;
+}
+.btn:first-child {
+	*margin-left: 0;
+}
+.btn:hover,
+.btn:focus {
+	color: #333;
+	text-decoration: none;
+	background-position: 0 -15px;
+	-webkit-transition: background-position .1s linear;
+	-moz-transition: background-position .1s linear;
+	-o-transition: background-position .1s linear;
+	transition: background-position .1s linear;
+}
+.btn:focus {
+	outline: thin dotted #333;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
+}
+.btn.active,
+.btn:active {
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn.disabled,
+.btn[disabled] {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-large {
+	padding: 11px 19px;
+	font-size: 16.25px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+	margin-top: 4px;
+}
+.btn-small {
+	padding: 2px 10px;
+	font-size: 12px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+	margin-top: 0;
+}
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+	margin-top: -1px;
+}
+.btn-mini {
+	padding: 0 6px;
+	font-size: 9.75px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.btn-block {
+	display: block;
+	width: 100%;
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.btn-block + .btn-block {
+	margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+	width: 100%;
+}
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+	color: rgba(255,255,255,0.75);
+}
+.btn-primary {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #004b8d;
+	background-image: -moz-linear-gradient(top,#005e8d,#002f8d);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#002f8d));
+	background-image: -webkit-linear-gradient(top,#005e8d,#002f8d);
+	background-image: -o-linear-gradient(top,#005e8d,#002f8d);
+	background-image: linear-gradient(to bottom,#005e8d,#002f8d);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff002e8d', GradientType=0);
+	border-color: #002f8d #002f8d #001641;
+	*background-color: #002f8d;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+	color: #fff;
+	background-color: #002f8d;
+	*background-color: #002674;
+}
+.btn-primary:active,
+.btn-primary.active {
+	background-color: #001e5a \9;
+}
+.btn-warning {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+	border-color: #f89406 #f89406 #ad6704;
+	*background-color: #f89406;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+	color: #fff;
+	background-color: #f89406;
+	*background-color: #df8505;
+}
+.btn-warning:active,
+.btn-warning.active {
+	background-color: #c67605 \9;
+}
+.btn-danger {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #da4f49;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: -o-linear-gradient(top,#ee5f5b,#bd362f);
+	background-image: linear-gradient(to bottom,#ee5f5b,#bd362f);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+	border-color: #bd362f #bd362f #802420;
+	*background-color: #bd362f;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+	color: #fff;
+	background-color: #bd362f;
+	*background-color: #a9302a;
+}
+.btn-danger:active,
+.btn-danger.active {
+	background-color: #942a25 \9;
+}
+.btn-success {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #5bb75b;
+	background-image: -moz-linear-gradient(top,#62c462,#51a351);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+	background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+	background-image: -o-linear-gradient(top,#62c462,#51a351);
+	background-image: linear-gradient(to bottom,#62c462,#51a351);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+	border-color: #51a351 #51a351 #387038;
+	*background-color: #51a351;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+	color: #fff;
+	background-color: #51a351;
+	*background-color: #499249;
+}
+.btn-success:active,
+.btn-success.active {
+	background-color: #408140 \9;
+}
+.btn-info {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #49afcd;
+	background-image: -moz-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: -o-linear-gradient(top,#5bc0de,#2f96b4);
+	background-image: linear-gradient(to bottom,#5bc0de,#2f96b4);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+	border-color: #2f96b4 #2f96b4 #1f6377;
+	*background-color: #2f96b4;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+	color: #fff;
+	background-color: #2f96b4;
+	*background-color: #2a85a0;
+}
+.btn-info:active,
+.btn-info.active {
+	background-color: #24748c \9;
+}
+.btn-inverse {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #363636;
+	background-image: -moz-linear-gradient(top,#444,#222);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));
+	background-image: -webkit-linear-gradient(top,#444,#222);
+	background-image: -o-linear-gradient(top,#444,#222);
+	background-image: linear-gradient(to bottom,#444,#222);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+	border-color: #222 #222 #000000;
+	*background-color: #222;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+	color: #fff;
+	background-color: #222;
+	*background-color: #151515;
+}
+.btn-inverse:active,
+.btn-inverse.active {
+	background-color: #090909 \9;
+}
+button.btn,
+input[type="submit"].btn {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+	padding: 0;
+	border: 0;
+}
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+	*padding-top: 3px;
+	*padding-bottom: 3px;
+}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+	*padding-top: 1px;
+	*padding-bottom: 1px;
+}
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+	background-color: transparent;
+	background-image: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+.btn-link {
+	border-color: transparent;
+	cursor: pointer;
+	color: #005e8d;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-link:hover,
+.btn-link:focus {
+	color: #002b41;
+	text-decoration: underline;
+	background-color: transparent;
+}
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+	color: #333;
+	text-decoration: none;
+}
+.btn-group {
+	position: relative;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	font-size: 0;
+	vertical-align: middle;
+	white-space: nowrap;
+	*margin-left: .3em;
+}
+.btn-group:first-child {
+	*margin-left: 0;
+}
+.btn-group + .btn-group {
+	margin-left: 5px;
+}
+.btn-toolbar {
+	font-size: 0;
+	margin-top: 9px;
+	margin-bottom: 9px;
+}
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+	margin-left: 5px;
+}
+.btn-group > .btn {
+	position: relative;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group > .btn + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+	font-size: 13px;
+}
+.btn-group > .btn-mini {
+	font-size: 9.75px;
+}
+.btn-group > .btn-small {
+	font-size: 12px;
+}
+.btn-group > .btn-large {
+	font-size: 16.25px;
+}
+.btn-group > .btn:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+}
+.btn-group > .btn.large:first-child {
+	margin-left: 0;
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+	z-index: 2;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+	outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.btn-group.open .dropdown-toggle {
+	background-image: none;
+	-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn-group.open .btn.dropdown-toggle {
+	background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+	background-color: #002f8d;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+	background-color: #f89406;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+	background-color: #bd362f;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+	background-color: #51a351;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+	background-color: #2f96b4;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+	background-color: #222;
+}
+.btn .caret {
+	margin-top: 8px;
+	margin-left: 0;
+}
+.btn-large .caret {
+	margin-top: 6px;
+}
+.btn-large .caret {
+	border-left-width: 5px;
+	border-right-width: 5px;
+	border-top-width: 5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+	margin-top: 8px;
+}
+.dropup .btn-large .caret {
+	border-bottom-width: 5px;
+}
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.btn-group-vertical {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+.btn-group-vertical > .btn {
+	display: block;
+	float: none;
+	max-width: 100%;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.btn-group-vertical > .btn + .btn {
+	margin-left: 0;
+	margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-group-vertical > .btn:last-child {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.btn-group-vertical > .btn-large:first-child {
+	-webkit-border-radius: 6px 6px 0 0;
+	-moz-border-radius: 6px 6px 0 0;
+	border-radius: 6px 6px 0 0;
+}
+.btn-group-vertical > .btn-large:last-child {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.alert {
+	padding: 8px 35px 8px 14px;
+	margin-bottom: 18px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	background-color: #fcf8e3;
+	border: 1px solid #fbeed5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.alert,
+.alert h4 {
+	color: #c09853;
+}
+.alert h4 {
+	margin: 0 0 .5em;
+}
+.alert .close {
+	position: relative;
+	top: -2px;
+	right: -21px;
+	line-height: 18px;
+	cursor: pointer;
+}
+.alert-success {
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
+	color: #468847;
+}
+.alert-success h4 {
+	color: #468847;
+}
+.alert-danger,
+.alert-error {
+	background-color: #f2dede;
+	border-color: #eed3d7;
+	color: #b94a48;
+}
+.alert-danger h4,
+.alert-error h4 {
+	color: #b94a48;
+}
+.alert-info {
+	background-color: #d9edf7;
+	border-color: #bce8f1;
+	color: #3a87ad;
+}
+.alert-info h4 {
+	color: #3a87ad;
+}
+.alert-block {
+	padding-top: 14px;
+	padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+	margin-bottom: 0;
+}
+.alert-block p + p {
+	margin-top: 5px;
+}
+.nav {
+	margin-left: 0;
+	margin-bottom: 18px;
+	list-style: none;
+}
+.nav > li > a {
+	display: block;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+	text-decoration: none;
+	background-color: #eee;
+}
+.nav > li > a > img {
+	max-width: none;
+}
+.nav > .pull-right {
+	float: right;
+}
+.nav-header {
+	display: block;
+	padding: 3px 15px;
+	font-size: 11px;
+	font-weight: bold;
+	line-height: 18px;
+	color: #999;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+	text-transform: uppercase;
+}
+.nav li + .nav-header {
+	margin-top: 9px;
+}
+.nav-list {
+	padding-left: 15px;
+	padding-right: 15px;
+	margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+	margin-left: -15px;
+	margin-right: -15px;
+	text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+}
+.nav-list > li > a {
+	padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.2);
+	background-color: #005e8d;
+}
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+	margin-right: 2px;
+}
+.nav-list .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+.nav-tabs,
+.nav-pills {
+	*zoom: 1;
+}
+.nav-tabs:before,
+.nav-tabs:after,
+.nav-pills:before,
+.nav-pills:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.nav-tabs:after,
+.nav-pills:after {
+	clear: both;
+}
+.nav-tabs > li,
+.nav-pills > li {
+	float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+	padding-right: 12px;
+	padding-left: 12px;
+	margin-right: 2px;
+	line-height: 14px;
+}
+.nav-tabs {
+	border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+	margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+	border-color: #eee #eee #ddd;
+}
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+	color: #555;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent;
+	cursor: default;
+}
+.nav-pills > li > a {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	margin-top: 2px;
+	margin-bottom: 2px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+	color: #fff;
+	background-color: #005e8d;
+}
+.nav-stacked > li {
+	float: none;
+}
+.nav-stacked > li > a {
+	margin-right: 0;
+}
+.nav-tabs.nav-stacked {
+	border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+	border: 1px solid #ddd;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+	border-color: #ddd;
+	z-index: 2;
+}
+.nav-pills.nav-stacked > li > a {
+	margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+	margin-bottom: 1px;
+}
+.nav-tabs .dropdown-menu {
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+}
+.nav-pills .dropdown-menu {
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.nav .dropdown-toggle .caret {
+	border-top-color: #005e8d;
+	border-bottom-color: #005e8d;
+	margin-top: 6px;
+}
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+	border-top-color: #002b41;
+	border-bottom-color: #002b41;
+}
+.nav-tabs .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.nav .active .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+	cursor: pointer;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+	color: #fff;
+	background-color: #999;
+	border-color: #999;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+	opacity: 1;
+	filter: alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+	border-color: #999;
+}
+.tabbable {
+	*zoom: 1;
+}
+.tabbable:before,
+.tabbable:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.tabbable:after {
+	clear: both;
+}
+.tab-content {
+	overflow: auto;
+}
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+	border-bottom: 0;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+	display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+	display: block;
+}
+.tabs-below > .nav-tabs {
+	border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+	margin-top: -1px;
+	margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+	border-bottom-color: transparent;
+	border-top-color: #ddd;
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+	border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+	float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+	min-width: 74px;
+	margin-right: 0;
+	margin-bottom: 3px;
+}
+.tabs-left > .nav-tabs {
+	float: left;
+	margin-right: 19px;
+	border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+	margin-right: -1px;
+	-webkit-border-radius: 4px 0 0 4px;
+	-moz-border-radius: 4px 0 0 4px;
+	border-radius: 4px 0 0 4px;
+}
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+	border-color: #eee #ddd #eee #eee;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+	border-color: #ddd transparent #ddd #ddd;
+	*border-right-color: #fff;
+}
+.tabs-right > .nav-tabs {
+	float: right;
+	margin-left: 19px;
+	border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+	margin-left: -1px;
+	-webkit-border-radius: 0 4px 4px 0;
+	-moz-border-radius: 0 4px 4px 0;
+	border-radius: 0 4px 4px 0;
+}
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+	border-color: #eee #eee #eee #ddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+	border-color: #ddd #ddd #ddd transparent;
+	*border-left-color: #fff;
+}
+.nav > .disabled > a {
+	color: #999;
+}
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+	text-decoration: none;
+	background-color: transparent;
+	cursor: default;
+}
+.navbar {
+	overflow: visible;
+	margin-bottom: 18px;
+	*position: relative;
+	*z-index: 2;
+}
+.navbar-inner {
+	min-height: 40px;
+	padding-left: 20px;
+	padding-right: 20px;
+	background-color: #fafafa;
+	background-image: -moz-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f2f2f2));
+	background-image: -webkit-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: -o-linear-gradient(top,#ffffff,#f2f2f2);
+	background-image: linear-gradient(to bottom,#ffffff,#f2f2f2);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+	border: 1px solid #d4d4d4;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	-moz-box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	box-shadow: 0 1px 4px rgba(0,0,0,0.065);
+	*zoom: 1;
+}
+.navbar-inner:before,
+.navbar-inner:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-inner:after {
+	clear: both;
+}
+.navbar .container {
+	width: auto;
+}
+.nav-collapse.collapse {
+	height: auto;
+	overflow: visible;
+}
+.navbar .brand {
+	float: left;
+	display: block;
+	padding: 11px 20px 11px;
+	margin-left: -20px;
+	font-size: 20px;
+	font-weight: 200;
+	color: #555;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .brand:hover,
+.navbar .brand:focus {
+	text-decoration: none;
+}
+.navbar-text {
+	margin-bottom: 0;
+	line-height: 40px;
+	color: #555;
+}
+.navbar-link {
+	color: #555;
+}
+.navbar-link:hover,
+.navbar-link:focus {
+	color: #333;
+}
+.navbar .divider-vertical {
+	height: 40px;
+	margin: 0 9px;
+	border-left: 1px solid #f2f2f2;
+	border-right: 1px solid #ffffff;
+}
+.navbar .btn,
+.navbar .btn-group {
+	margin-top: 5px;
+}
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+	margin-top: 0;
+}
+.navbar-form {
+	margin-bottom: 0;
+	*zoom: 1;
+}
+.navbar-form:before,
+.navbar-form:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.navbar-form:after {
+	clear: both;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+	margin-top: 5px;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+	display: inline-block;
+	margin-bottom: 0;
+}
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+	margin-top: 3px;
+}
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+	margin-top: 5px;
+	white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+	margin-top: 0;
+}
+.navbar-search {
+	position: relative;
+	float: left;
+	margin-top: 5px;
+	margin-bottom: 0;
+}
+.navbar-search .search-query {
+	margin-bottom: 0;
+	padding: 4px 14px;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 1;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.navbar-static-top {
+	position: static;
+	margin-bottom: 0;
+}
+.navbar-static-top .navbar-inner {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030;
+	margin-bottom: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	border-width: 0 0 1px;
+}
+.navbar-fixed-bottom .navbar-inner {
+	border-width: 1px 0 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+	padding-left: 0;
+	padding-right: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+	width: 940px;
+}
+.navbar-fixed-top {
+	top: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+	-webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+	box-shadow: 0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-fixed-bottom {
+	bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+	-webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+	-moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+	box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+}
+.navbar .nav {
+	position: relative;
+	left: 0;
+	display: block;
+	float: left;
+	margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+	float: right;
+	margin-right: 0;
+}
+.navbar .nav > li {
+	float: left;
+}
+.navbar .nav > li > a {
+	float: none;
+	padding: 11px 15px 11px;
+	color: #555;
+	text-decoration: none;
+	text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown-toggle .caret {
+	margin-top: 8px;
+}
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+	background-color: transparent;
+	color: #333;
+	text-decoration: none;
+}
+.navbar .nav > li > a:focus {
+	outline: 2px solid #5e9ed6;
+}
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+	color: #555;
+	text-decoration: none;
+	background-color: #e6e6e6;
+	-webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	-moz-box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+	box-shadow: inset 0 3px 8px rgba(0,0,0,0.125);
+}
+.navbar .btn-navbar {
+	display: none;
+	float: right;
+	padding: 7px 10px;
+	margin-left: 5px;
+	margin-right: 5px;
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #ededed;
+	background-image: -moz-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image: -o-linear-gradient(top,#f2f2f2,#e6e6e6);
+	background-image: linear-gradient(to bottom,#f2f2f2,#e6e6e6);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	*background-color: #e6e6e6;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+	box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+}
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #e6e6e6;
+	*background-color: #d9d9d9;
+}
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+	background-color: #cccccc \9;
+}
+.navbar .btn-navbar .icon-bar {
+	display: block;
+	width: 18px;
+	height: 2px;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 1px;
+	-moz-border-radius: 1px;
+	border-radius: 1px;
+	-webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	-moz-box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+	box-shadow: 0 1px 0 rgba(0,0,0,0.25);
+}
+.btn-navbar .icon-bar + .icon-bar {
+	margin-top: 3px;
+}
+.navbar .nav > li > .dropdown-menu:before {
+	content: '';
+	display: inline-block;
+	border-left: 7px solid transparent;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-bottom-color: rgba(0,0,0,0.2);
+	position: absolute;
+	top: -7px;
+	left: 9px;
+}
+.navbar .nav > li > .dropdown-menu:after {
+	content: '';
+	display: inline-block;
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	position: absolute;
+	top: -6px;
+	left: 10px;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+	border-top: 7px solid #ccc;
+	border-top-color: rgba(0,0,0,0.2);
+	border-bottom: 0;
+	bottom: -7px;
+	top: auto;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+	border-top: 6px solid #fff;
+	border-bottom: 0;
+	bottom: -6px;
+	top: auto;
+}
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+	border-top-color: #333;
+	border-bottom-color: #333;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #e6e6e6;
+	color: #555;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #555;
+	border-bottom-color: #555;
+}
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+	left: auto;
+	right: 0;
+}
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+	left: auto;
+	right: 12px;
+}
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+	left: auto;
+	right: 13px;
+}
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+	left: auto;
+	right: 100%;
+	margin-left: 0;
+	margin-right: -1px;
+	-webkit-border-radius: 6px 0 6px 6px;
+	-moz-border-radius: 6px 0 6px 6px;
+	border-radius: 6px 0 6px 6px;
+}
+.navbar-inverse .navbar-inner {
+	background-color: #1b1b1b;
+	background-image: -moz-linear-gradient(top,#222222,#111111);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#222222),to(#111111));
+	background-image: -webkit-linear-gradient(top,#222222,#111111);
+	background-image: -o-linear-gradient(top,#222222,#111111);
+	background-image: linear-gradient(to bottom,#222222,#111111);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+	border-color: #252525;
+}
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+	color: #999;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+}
+.navbar-inverse .brand:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .nav > li > a:focus {
+	color: #fff;
+}
+.navbar-inverse .brand {
+	color: #999;
+}
+.navbar-inverse .navbar-text {
+	color: #999;
+}
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+	background-color: transparent;
+	color: #fff;
+}
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+	color: #fff;
+	background-color: #111111;
+}
+.navbar-inverse .navbar-link {
+	color: #999;
+}
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+	color: #fff;
+}
+.navbar-inverse .divider-vertical {
+	border-left-color: #111111;
+	border-right-color: #222222;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+	background-color: #111111;
+	color: #fff;
+}
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+	border-top-color: #999;
+	border-bottom-color: #999;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+	border-top-color: #fff;
+	border-bottom-color: #fff;
+}
+.navbar-inverse .navbar-search .search-query {
+	color: #fff;
+	background-color: #515151;
+	border-color: #111111;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+	-webkit-transition: none;
+	-moz-transition: none;
+	-o-transition: none;
+	transition: none;
+}
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+	color: #ccc;
+}
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+	padding: 5px 15px;
+	color: #333;
+	text-shadow: 0 1px 0 #fff;
+	background-color: #fff;
+	border: 0;
+	-webkit-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	-moz-box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	box-shadow: 0 0 3px rgba(0,0,0,0.15);
+	outline: 0;
+}
+.navbar-inverse .btn-navbar {
+	color: #fff;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #0e0e0e;
+	background-image: -moz-linear-gradient(top,#151515,#040404);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));
+	background-image: -webkit-linear-gradient(top,#151515,#040404);
+	background-image: -o-linear-gradient(top,#151515,#040404);
+	background-image: linear-gradient(to bottom,#151515,#040404);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+	border-color: #040404 #040404 #000000;
+	*background-color: #040404;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+	color: #fff;
+	background-color: #040404;
+	*background-color: #000000;
+}
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+	background-color: #000000 \9;
+}
+.breadcrumb {
+	padding: 8px 15px;
+	margin: 0 0 18px;
+	list-style: none;
+	background-color: #f5f5f5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.breadcrumb > li {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	text-shadow: 0 1px 0 #fff;
+}
+.breadcrumb > li > .divider {
+	padding: 0 5px;
+	color: #ccc;
+}
+.breadcrumb > .active {
+	color: #999;
+}
+.pagination {
+	margin: 18px 0;
+}
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	margin-left: 0;
+	margin-bottom: 0;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+	box-shadow: 0 1px 2px rgba(0,0,0,0.05);
+}
+.pagination ul > li {
+	display: inline;
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
+	float: left;
+	padding: 4px 12px;
+	line-height: 18px;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-left-width: 0;
+}
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+	background-color: #f5f5f5;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+	color: #999;
+	cursor: default;
+}
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+	color: #999;
+	background-color: transparent;
+	cursor: default;
+}
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+	border-left-width: 1px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	border-bottom-left-radius: 4px;
+}
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 4px;
+	border-bottom-right-radius: 4px;
+}
+.pagination-centered {
+	text-align: center;
+}
+.pagination-right {
+	text-align: right;
+}
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+	padding: 11px 19px;
+	font-size: 16.25px;
+}
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+	-webkit-border-top-left-radius: 6px;
+	-moz-border-radius-topleft: 6px;
+	border-top-left-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-moz-border-radius-bottomleft: 6px;
+	border-bottom-left-radius: 6px;
+}
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+	-webkit-border-top-right-radius: 6px;
+	-moz-border-radius-topright: 6px;
+	border-top-right-radius: 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-moz-border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
+}
+.pagination-mini ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > a,
+.pagination-small ul > li:first-child > span {
+	-webkit-border-top-left-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	border-bottom-left-radius: 3px;
+}
+.pagination-mini ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > a,
+.pagination-small ul > li:last-child > span {
+	-webkit-border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	border-top-right-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	border-bottom-right-radius: 3px;
+}
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+	padding: 2px 10px;
+	font-size: 12px;
+}
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+	padding: 0 6px;
+	font-size: 9.75px;
+}
+.pager {
+	margin: 18px 0;
+	list-style: none;
+	text-align: center;
+	*zoom: 1;
+}
+.pager:before,
+.pager:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.pager:after {
+	clear: both;
+}
+.pager li {
+	display: inline;
+}
+.pager li > a,
+.pager li > span {
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	border-radius: 15px;
+}
+.pager li > a:hover,
+.pager li > a:focus {
+	text-decoration: none;
+	background-color: #f5f5f5;
+}
+.pager .next > a,
+.pager .next > span {
+	float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+	float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+	color: #999;
+	background-color: #fff;
+	cursor: default;
+}
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000;
+}
+.modal-backdrop.fade {
+	opacity: 0;
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.modal-header {
+	padding: 9px 15px;
+	border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+	margin-top: 2px;
+}
+.modal-header h3 {
+	margin: 0;
+	line-height: 30px;
+}
+.modal-body {
+	width: 98%;
+	position: relative;
+	max-height: 400px;
+	padding: 1%;
+}
+.modal-body iframe {
+	width: 100%;
+	max-height: none;
+	border: 0 !important;
+}
+.modal-form {
+	margin-bottom: 0;
+}
+.modal-footer {
+	padding: 14px 15px 15px;
+	margin-bottom: 0;
+	text-align: right;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	-webkit-border-radius: 0 0 6px 6px;
+	-moz-border-radius: 0 0 6px 6px;
+	border-radius: 0 0 6px 6px;
+	-webkit-box-shadow: inset 0 1px 0 #fff;
+	-moz-box-shadow: inset 0 1px 0 #fff;
+	box-shadow: inset 0 1px 0 #fff;
+	*zoom: 1;
+}
+.modal-footer:before,
+.modal-footer:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.modal-footer:after {
+	clear: both;
+}
+.modal-footer .btn + .btn {
+	margin-left: 5px;
+	margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+	margin-left: -1px;
+}
+.modal-footer .btn-block + .btn-block {
+	margin-left: 0;
+}
+.tooltip {
+	position: absolute;
+	z-index: 1030;
+	display: block;
+	visibility: visible;
+	font-size: 11px;
+	line-height: 1.4;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+.tooltip.in {
+	opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+.tooltip.top {
+	margin-top: -3px;
+	padding: 5px 0;
+}
+.tooltip.right {
+	margin-left: 3px;
+	padding: 0 5px;
+}
+.tooltip.bottom {
+	margin-top: 3px;
+	padding: 5px 0;
+}
+.tooltip.left {
+	margin-left: -3px;
+	padding: 0 5px;
+}
+.tooltip-inner {
+	max-width: 200px;
+	padding: 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
+}
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1060;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	text-align: left;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	white-space: normal;
+}
+.popover.top {
+	margin-top: -10px;
+}
+.popover.right {
+	margin-left: 10px;
+}
+.popover.bottom {
+	margin-top: 10px;
+}
+.popover.left {
+	margin-left: -10px;
+}
+.popover-title {
+	margin: 0;
+	padding: 8px 14px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.popover-title:empty {
+	display: none;
+}
+.popover-content {
+	padding: 9px 14px;
+}
+.popover .arrow,
+.popover .arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
+.popover .arrow {
+	border-width: 11px;
+}
+.popover .arrow:after {
+	border-width: 10px;
+	content: "";
+}
+.popover.top .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-bottom-width: 0;
+	border-top-color: #999;
+	border-top-color: rgba(0,0,0,0.25);
+	bottom: -11px;
+}
+.popover.top .arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	border-bottom-width: 0;
+	border-top-color: #fff;
+}
+.popover.right .arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-left-width: 0;
+	border-right-color: #999;
+	border-right-color: rgba(0,0,0,0.25);
+}
+.popover.right .arrow:after {
+	left: 1px;
+	bottom: -10px;
+	border-left-width: 0;
+	border-right-color: #fff;
+}
+.popover.bottom .arrow {
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0,0,0,0.25);
+	top: -11px;
+}
+.popover.bottom .arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	border-top-width: 0;
+	border-bottom-color: #fff;
+}
+.popover.left .arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0,0,0,0.25);
+}
+.popover.left .arrow:after {
+	right: 1px;
+	border-right-width: 0;
+	border-left-color: #fff;
+	bottom: -10px;
+}
+.thumbnails {
+	margin-left: -20px;
+	list-style: none;
+	*zoom: 1;
+}
+.thumbnails:before,
+.thumbnails:after {
+	display: table;
+	content: "";
+	line-height: 0;
+}
+.thumbnails:after {
+	clear: both;
+}
+.row-fluid .thumbnails {
+	margin-left: 0;
+}
+.thumbnails > li {
+	float: left;
+	margin-bottom: 18px;
+	margin-left: 20px;
+}
+.thumbnail {
+	display: block;
+	padding: 4px;
+	line-height: 18px;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	box-shadow: 0 1px 3px rgba(0,0,0,0.055);
+	-webkit-transition: all .2s ease-in-out;
+	-moz-transition: all .2s ease-in-out;
+	-o-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out;
+}
+a.thumbnail:hover,
+a.thumbnail:focus {
+	border-color: #005e8d;
+	-webkit-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	-moz-box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+	box-shadow: 0 1px 4px rgba(0,105,214,0.25);
+}
+.thumbnail > img {
+	display: block;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+.thumbnail .caption {
+	padding: 9px;
+	color: #555;
+}
+.label,
+.badge {
+	display: inline-block;
+	padding: 2px 4px;
+	font-size: 10.998px;
+	font-weight: bold;
+	line-height: 14px;
+	color: #fff;
+	vertical-align: baseline;
+	white-space: nowrap;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #999;
+}
+.label {
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.badge {
+	padding-left: 9px;
+	padding-right: 9px;
+	-webkit-border-radius: 9px;
+	-moz-border-radius: 9px;
+	border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+	display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer;
+}
+.label-important,
+.badge-important {
+	background-color: #b94a48;
+}
+.label-important[href],
+.badge-important[href] {
+	background-color: #953b39;
+}
+.label-warning,
+.badge-warning {
+	background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+	background-color: #c67605;
+}
+.label-success,
+.badge-success {
+	background-color: #468847;
+}
+.label-success[href],
+.badge-success[href] {
+	background-color: #356635;
+}
+.label-info,
+.badge-info {
+	background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+	background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+	background-color: #333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+	background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+	position: relative;
+	top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+	top: 0;
+}
+@-webkit-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-moz-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-ms-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+@-o-keyframes progress-bar-stripes {
+	from {
+		background-position: 0 0;
+	}
+	to {
+		background-position: 40px 0;
+	}
+}
+@keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
+}
+.progress {
+	overflow: hidden;
+	height: 18px;
+	margin-bottom: 18px;
+	background-color: #f7f7f7;
+	background-image: -moz-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: -o-linear-gradient(top,#f5f5f5,#f9f9f9);
+	background-image: linear-gradient(to bottom,#f5f5f5,#f9f9f9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+	-webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.progress .bar {
+	width: 0%;
+	height: 100%;
+	color: #fff;
+	float: left;
+	font-size: 12px;
+	text-align: center;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	background-color: #0e90d2;
+	background-image: -moz-linear-gradient(top,#149bdf,#0480be);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
+	background-image: -webkit-linear-gradient(top,#149bdf,#0480be);
+	background-image: -o-linear-gradient(top,#149bdf,#0480be);
+	background-image: linear-gradient(to bottom,#149bdf,#0480be);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.15);
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-transition: width .6s ease;
+	-moz-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease;
+}
+.progress .bar + .bar {
+	-webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	-moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+	box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+}
+.progress-striped .bar {
+	background-color: #149bdf;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	-webkit-background-size: 40px 40px;
+	-moz-background-size: 40px 40px;
+	-o-background-size: 40px 40px;
+	background-size: 40px 40px;
+}
+.progress.active .bar {
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	-moz-animation: progress-bar-stripes 2s linear infinite;
+	-ms-animation: progress-bar-stripes 2s linear infinite;
+	-o-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar,
+.progress .bar-danger {
+	background-color: #dd514c;
+	background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+	background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
+	background-image: linear-gradient(to bottom,#ee5f5b,#c43c35);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+	background-color: #ee5f5b;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-success .bar,
+.progress .bar-success {
+	background-color: #5eb95e;
+	background-image: -moz-linear-gradient(top,#62c462,#57a957);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+	background-image: -webkit-linear-gradient(top,#62c462,#57a957);
+	background-image: -o-linear-gradient(top,#62c462,#57a957);
+	background-image: linear-gradient(to bottom,#62c462,#57a957);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+	background-color: #62c462;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-info .bar,
+.progress .bar-info {
+	background-color: #4bb1cf;
+	background-image: -moz-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
+	background-image: -webkit-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: -o-linear-gradient(top,#5bc0de,#339bb9);
+	background-image: linear-gradient(to bottom,#5bc0de,#339bb9);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+	background-color: #5bc0de;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.progress-warning .bar,
+.progress .bar-warning {
+	background-color: #faa732;
+	background-image: -moz-linear-gradient(top,#fbb450,#f89406);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));
+	background-image: -webkit-linear-gradient(top,#fbb450,#f89406);
+	background-image: -o-linear-gradient(top,#fbb450,#f89406);
+	background-image: linear-gradient(to bottom,#fbb450,#f89406);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffab44f', endColorstr='#fff89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+	background-color: #fbb450;
+	background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,0.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,0.15)),color-stop(.75,rgba(255,255,255,0.15)),color-stop(.75,transparent),to(transparent));
+	background-image: -webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: -o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+	background-image: linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);
+}
+.accordion {
+	margin-bottom: 18px;
+}
+.accordion-group {
+	margin-bottom: 2px;
+	border: 1px solid #e5e5e5;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.accordion-heading {
+	border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+	display: block;
+	padding: 8px 15px;
+}
+.accordion-toggle {
+	cursor: pointer;
+}
+.accordion-inner {
+	padding: 9px 15px;
+	border-top: 1px solid #e5e5e5;
+}
+.carousel {
+	position: relative;
+	margin-bottom: 18px;
+	line-height: 1;
+}
+.carousel-inner {
+	overflow: hidden;
+	width: 100%;
+	position: relative;
+}
+.carousel-inner > .item {
+	display: none;
+	position: relative;
+	-webkit-transition: .6s ease-in-out left;
+	-moz-transition: .6s ease-in-out left;
+	-o-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left;
+}
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+	display: block;
+	line-height: 1;
+}
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+	display: block;
+}
+.carousel-inner > .active {
+	left: 0;
+}
+.carousel-inner > .next,
+.carousel-inner > .prev {
+	position: absolute;
+	top: 0;
+	width: 100%;
+}
+.carousel-inner > .next {
+	left: 100%;
+}
+.carousel-inner > .prev {
+	left: -100%;
+}
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+	left: 0;
+}
+.carousel-inner > .active.left {
+	left: -100%;
+}
+.carousel-inner > .active.right {
+	left: 100%;
+}
+.carousel-control {
+	position: absolute;
+	top: 40%;
+	left: 15px;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	font-size: 60px;
+	font-weight: 100;
+	line-height: 30px;
+	color: #fff;
+	text-align: center;
+	background: #222;
+	border: 3px solid #fff;
+	-webkit-border-radius: 23px;
+	-moz-border-radius: 23px;
+	border-radius: 23px;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+.carousel-control.right {
+	left: auto;
+	right: 15px;
+}
+.carousel-control:hover,
+.carousel-control:focus {
+	color: #fff;
+	text-decoration: none;
+	opacity: 0.9;
+	filter: alpha(opacity=90);
+}
+.carousel-indicators {
+	position: absolute;
+	top: 15px;
+	right: 15px;
+	z-index: 5;
+	margin: 0;
+	list-style: none;
+}
+.carousel-indicators li {
+	display: block;
+	float: left;
+	width: 10px;
+	height: 10px;
+	margin-left: 5px;
+	text-indent: -999px;
+	background-color: #ccc;
+	background-color: rgba(255,255,255,0.25);
+	border-radius: 5px;
+}
+.carousel-indicators .active {
+	background-color: #fff;
+}
+.carousel-caption {
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 15px;
+	background: #333;
+	background: rgba(0,0,0,0.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+	color: #fff;
+	line-height: 18px;
+}
+.carousel-caption h4 {
+	margin: 0 0 5px;
+}
+.carousel-caption p {
+	margin-bottom: 0;
+}
+.hero-unit {
+	padding: 60px;
+	margin-bottom: 30px;
+	font-size: 18px;
+	font-weight: 200;
+	line-height: 27px;
+	color: inherit;
+	background-color: #eee;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.hero-unit h1 {
+	margin-bottom: 0;
+	font-size: 60px;
+	line-height: 1;
+	color: inherit;
+	letter-spacing: -1px;
+}
+.hero-unit li {
+	line-height: 27px;
+}
+.pull-right {
+	float: right;
+}
+.pull-left {
+	float: left;
+}
+.hide {
+	display: none;
+}
+.show {
+	display: block;
+}
+.invisible {
+	visibility: hidden;
+}
+.affix {
+	position: fixed;
+}
+@-ms-viewport {
+	width: device-width;
+}
+.hidden {
+	display: none;
+	visibility: hidden;
+}
+.visible-phone {
+	display: none !important;
+}
+.visible-tablet {
+	display: none !important;
+}
+.hidden-desktop {
+	display: none !important;
+}
+.visible-desktop {
+	display: inherit !important;
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-tablet {
+		display: inherit !important;
+	}
+	.hidden-tablet {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	.hidden-desktop {
+		display: inherit !important;
+	}
+	.visible-desktop {
+		display: none !important;
+	}
+	.visible-phone {
+		display: inherit !important;
+	}
+	.hidden-phone {
+		display: none !important;
+	}
+}
+.visible-print {
+	display: none !important;
+}
+@media print {
+	.visible-print {
+		display: inherit !important;
+	}
+	.hidden-print {
+		display: none !important;
+	}
+}
+@media (max-width: 767px) {
+	body {
+		padding-left: 20px;
+		padding-right: 20px;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom,
+	.navbar-static-top {
+		margin-left: -20px;
+		margin-right: -20px;
+	}
+	.container-fluid {
+		padding: 0;
+	}
+	.dl-horizontal dt {
+		float: none;
+		clear: none;
+		width: auto;
+		text-align: left;
+	}
+	.dl-horizontal dd {
+		margin-left: 0;
+	}
+	.dropdown-menu .menuitem-group {
+		background-color: #10223e;
+		color: #eee;
+	}
+	.container {
+		width: auto;
+	}
+	.row-fluid {
+		width: 100%;
+	}
+	.row,
+	.thumbnails {
+		margin-left: 0;
+	}
+	.thumbnails > li {
+		float: none;
+		margin-left: 0;
+	}
+	[class*="span"],
+	.uneditable-input[class*="span"],
+	.row-fluid [class*="span"] {
+		float: none;
+		display: block;
+		width: 100%;
+		margin-left: 0;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.span12,
+	.row-fluid .span12 {
+		width: 100%;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.row-fluid [class*="offset"]:first-child {
+		margin-left: 0;
+	}
+	.input-large,
+	.input-xlarge,
+	.input-xxlarge,
+	input[class*="span"],
+	select[class*="span"],
+	textarea[class*="span"],
+	.uneditable-input {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	.input-prepend input,
+	.input-append input,
+	.input-prepend input[class*="span"],
+	.input-append input[class*="span"] {
+		display: inline-block;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 0;
+	}
+}
+@media (max-width: 480px) {
+	.nav-collapse {
+		-webkit-transform: translate3d(0,0,0);
+	}
+	.page-header h1 small {
+		display: block;
+		line-height: 18px;
+	}
+	input[type="checkbox"],
+	input[type="radio"] {
+		border: 1px solid #ccc;
+	}
+	.form-horizontal .control-label {
+		float: none;
+		width: auto;
+		padding-top: 0;
+		text-align: left;
+	}
+	.form-horizontal .controls {
+		margin-left: 0;
+	}
+	.form-horizontal .control-list {
+		padding-top: 0;
+	}
+	.form-horizontal .form-actions {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+	.tag-category input#filter-search,
+	.newsfeed-category input#filter-search {
+		width: auto;
+		margin-bottom: 9px;
+	}
+	.category-list input#filter-search {
+		width: auto;
+	}
+	.media .pull-left,
+	.media .pull-right {
+		float: none;
+		display: block;
+		margin-bottom: 10px;
+	}
+	.media-object {
+		margin-right: 0;
+		margin-left: 0;
+	}
+	.modal-header .close {
+		padding: 10px;
+		margin: -10px;
+	}
+	.carousel-caption {
+		position: static;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	.row {
+		margin-left: -20px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		min-height: 1px;
+		margin-left: 20px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 724px;
+	}
+	.span12 {
+		width: 724px;
+	}
+	.span11 {
+		width: 662px;
+	}
+	.span10 {
+		width: 600px;
+	}
+	.span9 {
+		width: 538px;
+	}
+	.span8 {
+		width: 476px;
+	}
+	.span7 {
+		width: 414px;
+	}
+	.span6 {
+		width: 352px;
+	}
+	.span5 {
+		width: 290px;
+	}
+	.span4 {
+		width: 228px;
+	}
+	.span3 {
+		width: 166px;
+	}
+	.span2 {
+		width: 104px;
+	}
+	.span1 {
+		width: 42px;
+	}
+	.offset12 {
+		margin-left: 764px;
+	}
+	.offset11 {
+		margin-left: 702px;
+	}
+	.offset10 {
+		margin-left: 640px;
+	}
+	.offset9 {
+		margin-left: 578px;
+	}
+	.offset8 {
+		margin-left: 516px;
+	}
+	.offset7 {
+		margin-left: 454px;
+	}
+	.offset6 {
+		margin-left: 392px;
+	}
+	.offset5 {
+		margin-left: 330px;
+	}
+	.offset4 {
+		margin-left: 268px;
+	}
+	.offset3 {
+		margin-left: 206px;
+	}
+	.offset2 {
+		margin-left: 144px;
+	}
+	.offset1 {
+		margin-left: 82px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.127659574%;
+		*margin-left: 2.0744680846383%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .controls-row [class*="span"] + [class*="span"] {
+		margin-left: 2.127659574%;
+	}
+	.row-fluid .span12 {
+		width: 99.99999999%;
+		*width: 99.946808500638%;
+	}
+	.row-fluid .span11 {
+		width: 91.489361693%;
+		*width: 91.436170203638%;
+	}
+	.row-fluid .span10 {
+		width: 82.978723396%;
+		*width: 82.925531906638%;
+	}
+	.row-fluid .span9 {
+		width: 74.468085099%;
+		*width: 74.414893609638%;
+	}
+	.row-fluid .span8 {
+		width: 65.957446802%;
+		*width: 65.904255312638%;
+	}
+	.row-fluid .span7 {
+		width: 57.446808505%;
+		*width: 57.393617015638%;
+	}
+	.row-fluid .span6 {
+		width: 48.936170208%;
+		*width: 48.882978718638%;
+	}
+	.row-fluid .span5 {
+		width: 40.425531911%;
+		*width: 40.372340421638%;
+	}
+	.row-fluid .span4 {
+		width: 31.914893614%;
+		*width: 31.861702124638%;
+	}
+	.row-fluid .span3 {
+		width: 23.404255317%;
+		*width: 23.351063827638%;
+	}
+	.row-fluid .span2 {
+		width: 14.89361702%;
+		*width: 14.840425530638%;
+	}
+	.row-fluid .span1 {
+		width: 6.382978723%;
+		*width: 6.3297872336383%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 104.255319138%;
+		*margin-left: 104.14893615928%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.127659564%;
+		*margin-left: 102.02127658528%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 95.744680841%;
+		*margin-left: 95.638297862277%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 93.617021267%;
+		*margin-left: 93.510638288277%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 87.234042544%;
+		*margin-left: 87.127659565277%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.10638297%;
+		*margin-left: 84.999999991277%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 78.723404247%;
+		*margin-left: 78.617021268277%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 76.595744673%;
+		*margin-left: 76.489361694277%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 70.21276595%;
+		*margin-left: 70.106382971277%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.085106376%;
+		*margin-left: 67.978723397277%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 61.702127653%;
+		*margin-left: 61.595744674277%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.574468079%;
+		*margin-left: 59.468085100277%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 53.191489356%;
+		*margin-left: 53.085106377277%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.063829782%;
+		*margin-left: 50.957446803277%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 44.680851059%;
+		*margin-left: 44.574468080277%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.553191485%;
+		*margin-left: 42.446808506277%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 36.170212762%;
+		*margin-left: 36.063829783277%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.042553188%;
+		*margin-left: 33.936170209277%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 27.659574465%;
+		*margin-left: 27.553191486277%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.531914891%;
+		*margin-left: 25.425531912277%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.148936168%;
+		*margin-left: 19.042553189277%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.021276594%;
+		*margin-left: 16.914893615277%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 10.638297871%;
+		*margin-left: 10.531914892277%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.510638297%;
+		*margin-left: 8.4042553182766%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 20px;
+	}
+	input.span12,
+	textarea.span12,
+	.uneditable-input.span12 {
+		width: 710px;
+	}
+	input.span11,
+	textarea.span11,
+	.uneditable-input.span11 {
+		width: 648px;
+	}
+	input.span10,
+	textarea.span10,
+	.uneditable-input.span10 {
+		width: 586px;
+	}
+	input.span9,
+	textarea.span9,
+	.uneditable-input.span9 {
+		width: 524px;
+	}
+	input.span8,
+	textarea.span8,
+	.uneditable-input.span8 {
+		width: 462px;
+	}
+	input.span7,
+	textarea.span7,
+	.uneditable-input.span7 {
+		width: 400px;
+	}
+	input.span6,
+	textarea.span6,
+	.uneditable-input.span6 {
+		width: 338px;
+	}
+	input.span5,
+	textarea.span5,
+	.uneditable-input.span5 {
+		width: 276px;
+	}
+	input.span4,
+	textarea.span4,
+	.uneditable-input.span4 {
+		width: 214px;
+	}
+	input.span3,
+	textarea.span3,
+	.uneditable-input.span3 {
+		width: 152px;
+	}
+	input.span2,
+	textarea.span2,
+	.uneditable-input.span2 {
+		width: 90px;
+	}
+	input.span1,
+	textarea.span1,
+	.uneditable-input.span1 {
+		width: 28px;
+	}
+}
+@media (min-width: 1200px) {
+	.row {
+		margin-left: -20px;
+		*zoom: 1;
+	}
+	.row:before,
+	.row:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row:after {
+		clear: both;
+	}
+	[class*="span"] {
+		float: left;
+		min-height: 1px;
+		margin-left: 20px;
+	}
+	.container,
+	.navbar-static-top .container,
+	.navbar-fixed-top .container,
+	.navbar-fixed-bottom .container {
+		width: 940px;
+	}
+	.span12 {
+		width: 940px;
+	}
+	.span11 {
+		width: 860px;
+	}
+	.span10 {
+		width: 780px;
+	}
+	.span9 {
+		width: 700px;
+	}
+	.span8 {
+		width: 620px;
+	}
+	.span7 {
+		width: 540px;
+	}
+	.span6 {
+		width: 460px;
+	}
+	.span5 {
+		width: 380px;
+	}
+	.span4 {
+		width: 300px;
+	}
+	.span3 {
+		width: 220px;
+	}
+	.span2 {
+		width: 140px;
+	}
+	.span1 {
+		width: 60px;
+	}
+	.offset12 {
+		margin-left: 980px;
+	}
+	.offset11 {
+		margin-left: 900px;
+	}
+	.offset10 {
+		margin-left: 820px;
+	}
+	.offset9 {
+		margin-left: 740px;
+	}
+	.offset8 {
+		margin-left: 660px;
+	}
+	.offset7 {
+		margin-left: 580px;
+	}
+	.offset6 {
+		margin-left: 500px;
+	}
+	.offset5 {
+		margin-left: 420px;
+	}
+	.offset4 {
+		margin-left: 340px;
+	}
+	.offset3 {
+		margin-left: 260px;
+	}
+	.offset2 {
+		margin-left: 180px;
+	}
+	.offset1 {
+		margin-left: 100px;
+	}
+	.row-fluid {
+		width: 100%;
+		*zoom: 1;
+	}
+	.row-fluid:before,
+	.row-fluid:after {
+		display: table;
+		content: "";
+		line-height: 0;
+	}
+	.row-fluid:after {
+		clear: both;
+	}
+	.row-fluid [class*="span"] {
+		display: block;
+		width: 100%;
+		min-height: 28px;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+		float: left;
+		margin-left: 2.127659574%;
+		*margin-left: 2.0744680846383%;
+	}
+	.row-fluid [class*="span"]:first-child {
+		margin-left: 0;
+	}
+	.row-fluid .controls-row [class*="span"] + [class*="span"] {
+		margin-left: 2.127659574%;
+	}
+	.row-fluid .span12 {
+		width: 99.99999999%;
+		*width: 99.946808500638%;
+	}
+	.row-fluid .span11 {
+		width: 91.489361693%;
+		*width: 91.436170203638%;
+	}
+	.row-fluid .span10 {
+		width: 82.978723396%;
+		*width: 82.925531906638%;
+	}
+	.row-fluid .span9 {
+		width: 74.468085099%;
+		*width: 74.414893609638%;
+	}
+	.row-fluid .span8 {
+		width: 65.957446802%;
+		*width: 65.904255312638%;
+	}
+	.row-fluid .span7 {
+		width: 57.446808505%;
+		*width: 57.393617015638%;
+	}
+	.row-fluid .span6 {
+		width: 48.936170208%;
+		*width: 48.882978718638%;
+	}
+	.row-fluid .span5 {
+		width: 40.425531911%;
+		*width: 40.372340421638%;
+	}
+	.row-fluid .span4 {
+		width: 31.914893614%;
+		*width: 31.861702124638%;
+	}
+	.row-fluid .span3 {
+		width: 23.404255317%;
+		*width: 23.351063827638%;
+	}
+	.row-fluid .span2 {
+		width: 14.89361702%;
+		*width: 14.840425530638%;
+	}
+	.row-fluid .span1 {
+		width: 6.382978723%;
+		*width: 6.3297872336383%;
+	}
+	.row-fluid .offset12 {
+		margin-left: 104.255319138%;
+		*margin-left: 104.14893615928%;
+	}
+	.row-fluid .offset12:first-child {
+		margin-left: 102.127659564%;
+		*margin-left: 102.02127658528%;
+	}
+	.row-fluid .offset11 {
+		margin-left: 95.744680841%;
+		*margin-left: 95.638297862277%;
+	}
+	.row-fluid .offset11:first-child {
+		margin-left: 93.617021267%;
+		*margin-left: 93.510638288277%;
+	}
+	.row-fluid .offset10 {
+		margin-left: 87.234042544%;
+		*margin-left: 87.127659565277%;
+	}
+	.row-fluid .offset10:first-child {
+		margin-left: 85.10638297%;
+		*margin-left: 84.999999991277%;
+	}
+	.row-fluid .offset9 {
+		margin-left: 78.723404247%;
+		*margin-left: 78.617021268277%;
+	}
+	.row-fluid .offset9:first-child {
+		margin-left: 76.595744673%;
+		*margin-left: 76.489361694277%;
+	}
+	.row-fluid .offset8 {
+		margin-left: 70.21276595%;
+		*margin-left: 70.106382971277%;
+	}
+	.row-fluid .offset8:first-child {
+		margin-left: 68.085106376%;
+		*margin-left: 67.978723397277%;
+	}
+	.row-fluid .offset7 {
+		margin-left: 61.702127653%;
+		*margin-left: 61.595744674277%;
+	}
+	.row-fluid .offset7:first-child {
+		margin-left: 59.574468079%;
+		*margin-left: 59.468085100277%;
+	}
+	.row-fluid .offset6 {
+		margin-left: 53.191489356%;
+		*margin-left: 53.085106377277%;
+	}
+	.row-fluid .offset6:first-child {
+		margin-left: 51.063829782%;
+		*margin-left: 50.957446803277%;
+	}
+	.row-fluid .offset5 {
+		margin-left: 44.680851059%;
+		*margin-left: 44.574468080277%;
+	}
+	.row-fluid .offset5:first-child {
+		margin-left: 42.553191485%;
+		*margin-left: 42.446808506277%;
+	}
+	.row-fluid .offset4 {
+		margin-left: 36.170212762%;
+		*margin-left: 36.063829783277%;
+	}
+	.row-fluid .offset4:first-child {
+		margin-left: 34.042553188%;
+		*margin-left: 33.936170209277%;
+	}
+	.row-fluid .offset3 {
+		margin-left: 27.659574465%;
+		*margin-left: 27.553191486277%;
+	}
+	.row-fluid .offset3:first-child {
+		margin-left: 25.531914891%;
+		*margin-left: 25.425531912277%;
+	}
+	.row-fluid .offset2 {
+		margin-left: 19.148936168%;
+		*margin-left: 19.042553189277%;
+	}
+	.row-fluid .offset2:first-child {
+		margin-left: 17.021276594%;
+		*margin-left: 16.914893615277%;
+	}
+	.row-fluid .offset1 {
+		margin-left: 10.638297871%;
+		*margin-left: 10.531914892277%;
+	}
+	.row-fluid .offset1:first-child {
+		margin-left: 8.510638297%;
+		*margin-left: 8.4042553182766%;
+	}
+	input,
+	textarea,
+	.uneditable-input {
+		margin-left: 0;
+	}
+	.controls-row [class*="span"] + [class*="span"] {
+		margin-left: 20px;
+	}
+	input.span12,
+	textarea.span12,
+	.uneditable-input.span12 {
+		width: 926px;
+	}
+	input.span11,
+	textarea.span11,
+	.uneditable-input.span11 {
+		width: 846px;
+	}
+	input.span10,
+	textarea.span10,
+	.uneditable-input.span10 {
+		width: 766px;
+	}
+	input.span9,
+	textarea.span9,
+	.uneditable-input.span9 {
+		width: 686px;
+	}
+	input.span8,
+	textarea.span8,
+	.uneditable-input.span8 {
+		width: 606px;
+	}
+	input.span7,
+	textarea.span7,
+	.uneditable-input.span7 {
+		width: 526px;
+	}
+	input.span6,
+	textarea.span6,
+	.uneditable-input.span6 {
+		width: 446px;
+	}
+	input.span5,
+	textarea.span5,
+	.uneditable-input.span5 {
+		width: 366px;
+	}
+	input.span4,
+	textarea.span4,
+	.uneditable-input.span4 {
+		width: 286px;
+	}
+	input.span3,
+	textarea.span3,
+	.uneditable-input.span3 {
+		width: 206px;
+	}
+	input.span2,
+	textarea.span2,
+	.uneditable-input.span2 {
+		width: 126px;
+	}
+	input.span1,
+	textarea.span1,
+	.uneditable-input.span1 {
+		width: 46px;
+	}
+	.thumbnails {
+		margin-left: -20px;
+	}
+	.thumbnails > li {
+		margin-left: 20px;
+	}
+	.row-fluid .thumbnails {
+		margin-left: 0;
+	}
+}
+@media (max-width: 979px) {
+	body {
+		padding-top: 0;
+	}
+	.navbar-fixed-top,
+	.navbar-fixed-bottom {
+		position: static;
+	}
+	.navbar-fixed-top {
+		margin-bottom: 18px;
+	}
+	.navbar-fixed-bottom {
+		margin-top: 18px;
+	}
+	.navbar-fixed-top .navbar-inner,
+	.navbar-fixed-bottom .navbar-inner {
+		padding: 5px;
+	}
+	.navbar .container {
+		width: auto;
+		padding: 0;
+	}
+	.navbar .brand {
+		padding-left: 10px;
+		padding-right: 10px;
+		margin: 0 0 0 -5px;
+	}
+	.nav-collapse {
+		clear: both;
+	}
+	.nav-collapse .nav {
+		float: none;
+		margin: 0 0 9px;
+	}
+	.nav-collapse .nav > li {
+		float: none;
+	}
+	.nav-collapse .nav > li > a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > .divider-vertical {
+		display: none;
+	}
+	.nav-collapse .nav .nav-header {
+		color: #555;
+		text-shadow: none;
+	}
+	.nav-collapse .nav > li > a,
+	.nav-collapse .dropdown-menu a {
+		padding: 9px 15px;
+		font-weight: bold;
+		color: #555;
+		-webkit-border-radius: 3px;
+		-moz-border-radius: 3px;
+		border-radius: 3px;
+	}
+	.nav-collapse .btn {
+		padding: 4px 10px 4px;
+		font-weight: normal;
+		-webkit-border-radius: 4px;
+		-moz-border-radius: 4px;
+		border-radius: 4px;
+	}
+	.nav-collapse .dropdown-menu li + li a {
+		margin-bottom: 2px;
+	}
+	.nav-collapse .nav > li > a:hover,
+	.nav-collapse .nav > li > a:focus,
+	.nav-collapse .dropdown-menu a:hover,
+	.nav-collapse .dropdown-menu a:focus {
+		background-color: #f2f2f2;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a,
+	.navbar-inverse .nav-collapse .dropdown-menu a {
+		color: #999;
+	}
+	.navbar-inverse .nav-collapse .nav > li > a:hover,
+	.navbar-inverse .nav-collapse .nav > li > a:focus,
+	.navbar-inverse .nav-collapse .dropdown-menu a:hover,
+	.navbar-inverse .nav-collapse .dropdown-menu a:focus {
+		background-color: #111111;
+	}
+	.nav-collapse.in .btn-group {
+		margin-top: 5px;
+		padding: 0;
+	}
+	.nav-collapse .dropdown-menu {
+		position: static;
+		top: auto;
+		left: auto;
+		float: none;
+		display: none;
+		max-width: none;
+		margin: 0 15px;
+		padding: 0;
+		background-color: transparent;
+		border: none;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		-webkit-box-shadow: none;
+		-moz-box-shadow: none;
+		box-shadow: none;
+	}
+	.nav-collapse .open > .dropdown-menu {
+		display: block;
+	}
+	.nav-collapse .dropdown-menu:before,
+	.nav-collapse .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .dropdown-menu .divider {
+		display: none;
+	}
+	.nav-collapse .nav > li > .dropdown-menu:before,
+	.nav-collapse .nav > li > .dropdown-menu:after {
+		display: none;
+	}
+	.nav-collapse .navbar-form,
+	.nav-collapse .navbar-search {
+		float: none;
+		padding: 9px 15px;
+		margin: 9px 0;
+		border-top: 1px solid #f2f2f2;
+		border-bottom: 1px solid #f2f2f2;
+		-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+		box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+	}
+	.navbar-inverse .nav-collapse .navbar-form,
+	.navbar-inverse .nav-collapse .navbar-search {
+		border-top-color: #111111;
+		border-bottom-color: #111111;
+	}
+	.navbar .nav-collapse .nav.pull-right {
+		float: none;
+		margin-left: 0;
+	}
+	.nav-collapse,
+	.nav-collapse.collapse {
+		overflow: hidden;
+		height: 0;
+	}
+	.navbar .btn-navbar {
+		display: block;
+	}
+	.navbar-static .navbar-inner {
+		padding-left: 10px;
+		padding-right: 10px;
+	}
+}
+@media (min-width: 980px) {
+	.nav-collapse.collapse {
+		height: auto !important;
+		overflow: visible !important;
+	}
+}
+.small {
+	font-size: 11px;
+}
+iframe,
+svg {
+	max-width: 100%;
+}
+.nowrap {
+	white-space: nowrap;
+}
+.center,
+.table td.center,
+.table th.center {
+	text-align: center;
+}
+a.disabled,
+a.disabled:hover {
+	color: #999999;
+	background-color: transparent;
+	cursor: default;
+	text-decoration: none;
+}
+.hero-unit {
+	text-align: center;
+}
+.hero-unit .lead {
+	margin-bottom: 18px;
+	font-size: 20px;
+	font-weight: 200;
+	line-height: 27px;
+}
+.btn .caret {
+	margin-bottom: 7px;
+}
+.btn.btn-micro .caret {
+	margin: 5px 0;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+body.modal {
+	padding-top: 0;
+}
+.row-even,
+.row-odd {
+	padding: 5px;
+	width: 99%;
+	border-bottom: 1px solid #ddd;
+}
+.row-odd {
+	background-color: transparent;
+}
+.row-even {
+	background-color: #f9f9f9;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .row-reveal {
+	visibility: hidden;
+}
+.row-fluid:hover .row-reveal {
+	visibility: visible;
+}
+.btn-wide {
+	width: 80%;
+}
+.nav-list > li.offset > a {
+	padding-left: 30px;
+	font-size: 12px;
+}
+.blog-row-rule,
+.blog-item-rule {
+	border: 0;
+}
+.row-fluid .offset1 {
+	margin-left: 8.382978723%;
+}
+.row-fluid .offset2 {
+	margin-left: 16.89361702%;
+}
+.row-fluid .offset3 {
+	margin-left: 25.404255317%;
+}
+.row-fluid .offset4 {
+	margin-left: 33.914893614%;
+}
+.row-fluid .offset5 {
+	margin-left: 42.425531911%;
+}
+.row-fluid .offset6 {
+	margin-left: 50.93617020799999%;
+}
+.row-fluid .offset7 {
+	margin-left: 59.446808505%;
+}
+.row-fluid .offset8 {
+	margin-left: 67.95744680199999%;
+}
+.row-fluid .offset9 {
+	margin-left: 76.468085099%;
+}
+.row-fluid .offset10 {
+	margin-left: 84.97872339599999%;
+}
+.row-fluid .offset11 {
+	margin-left: 91.489361693%;
+}
+.navbar .nav > li > a.btn {
+	padding: 4px 10px;
+	line-height: 18px;
+}
+.nav-tabs.nav-dark {
+	border-bottom: 1px solid #333;
+	text-shadow: 1px 1px 1px #000;
+}
+.nav-tabs.nav-dark > li > a {
+	color: #F8F8F8;
+}
+.nav-tabs.nav-dark > li > a:hover {
+	border-color: #333 #333 #111;
+	background-color: #777777;
+}
+.nav-tabs.nav-dark > .active > a,
+.nav-tabs.nav-dark > .active > a:hover {
+	color: #ffffff;
+	background-color: #555555;
+	border: 1px solid #222;
+	border-bottom-color: transparent;
+}
+.thumbnail.pull-left {
+	margin: 0 10px 10px 0;
+}
+.thumbnail.pull-right {
+	margin: 0 0 10px 10px;
+}
+.width-10 {
+	width: 10px;
+}
+.width-20 {
+	width: 20px;
+}
+.width-30 {
+	width: 30px;
+}
+.width-40 {
+	width: 40px;
+}
+.width-50 {
+	width: 50px;
+}
+.width-60 {
+	width: 60px;
+}
+.width-70 {
+	width: 70px;
+}
+.width-80 {
+	width: 80px;
+}
+.width-90 {
+	width: 90px;
+}
+.width-100 {
+	width: 100px;
+}
+.height-10 {
+	height: 10px;
+}
+.height-20 {
+	height: 20px;
+}
+.height-30 {
+	height: 30px;
+}
+.height-40 {
+	height: 40px;
+}
+.height-50 {
+	height: 50px;
+}
+.height-60 {
+	height: 60px;
+}
+.height-70 {
+	height: 70px;
+}
+.height-80 {
+	height: 80px;
+}
+.height-90 {
+	height: 90px;
+}
+.height-100 {
+	height: 100px;
+}
+hr.hr-condensed {
+	margin: 10px 0;
+}
+.list-striped,
+.row-striped {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	border-top: 1px solid #ddd;
+	margin-left: 0;
+}
+.list-striped li,
+.list-striped dd,
+.row-striped .row,
+.row-striped .row-fluid {
+	border-bottom: 1px solid #ddd;
+	padding: 8px;
+}
+.list-striped li:nth-child(odd),
+.list-striped dd:nth-child(odd),
+.row-striped .row:nth-child(odd),
+.row-striped .row-fluid:nth-child(odd) {
+	background-color: #f9f9f9;
+}
+.list-striped li:hover,
+.list-striped dd:hover,
+.row-striped .row:hover,
+.row-striped .row-fluid:hover {
+	background-color: #f5f5f5;
+}
+.row-striped .row-fluid {
+	width: 100%;
+	box-sizing: border-box;
+}
+.row-striped .row-fluid [class*="span"] {
+	min-height: 10px;
+}
+.row-striped .row-fluid [class*="span"] {
+	margin-left: 8px;
+}
+.row-striped .row-fluid [class*="span"]:first-child {
+	margin-left: 0;
+}
+.list-condensed li {
+	padding: 4px 5px;
+}
+.row-condensed .row,
+.row-condensed .row-fluid {
+	padding: 4px 5px;
+}
+.list-bordered,
+.row-bordered {
+	list-style: none;
+	line-height: 18px;
+	text-align: left;
+	vertical-align: middle;
+	margin-left: 0;
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.radio.btn-group input[type=radio] {
+	display: none;
+}
+.radio.btn-group > label {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.radio.btn-group > label:first-of-type {
+	margin-left: 0;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px;
+}
+fieldset.radio.btn-group {
+	padding-left: 0;
+}
+.iframe-bordered {
+	border: 1px solid #ddd;
+}
+.tab-content {
+	overflow: visible;
+}
+.tabs-left .tab-content {
+	overflow: auto;
+}
+.nav-tabs > li > span {
+	display: block;
+	margin-right: 2px;
+	padding-right: 12px;
+	padding-left: 12px;
+	padding-top: 8px;
+	padding-bottom: 8px;
+	line-height: 18px;
+	border: 1px solid transparent;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+.btn-micro {
+	padding: 1px 4px;
+	font-size: 10px;
+	line-height: 8px;
+}
+.btn-group > .btn-micro {
+	font-size: 10px;
+}
+.tip-wrap {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	z-index: 100;
+}
+.page-header {
+	margin: 2px 0px 10px 0px;
+	padding-bottom: 5px;
+}
+.input-prepend > .add-on,
+.input-append > .add-on {
+	vertical-align: top;
+}
+.input-prepend .chzn-container-single .chzn-single {
+	-webkit-border-radius: 0 3px 3px 0;
+	-moz-border-radius: 0 3px 3px 0;
+	border-radius: 0 3px 3px 0;
+}
+.input-prepend .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0 3px 0 0;
+	-moz-border-radius: 0 3px 0 0;
+	border-radius: 0 3px 0 0;
+}
+.input-append .chzn-container-single .chzn-single {
+	-webkit-border-radius: 3px 0 0 3px;
+	-moz-border-radius: 3px 0 0 3px;
+	border-radius: 3px 0 0 3px;
+}
+.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 3px 0 0 0;
+	-moz-border-radius: 3px 0 0 0;
+	border-radius: 3px 0 0 0;
+}
+.input-prepend.input-append .chzn-container-single .chzn-single,
+.input-prepend.input-append .chzn-container-single .chzn-single-with-drop {
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+}
+.element-invisible {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	height: 1px;
+	width: 1px;
+	overflow: hidden;
+}
+.element-invisible:focus {
+	width: auto;
+	height: auto;
+	overflow: auto;
+	background: #eee;
+	color: #000;
+	padding: 1em;
+}
+.form-vertical .control-label {
+	float: none;
+	width: auto;
+	padding-right: 0;
+	padding-top: 0;
+	text-align: left;
+}
+.form-vertical .controls {
+	margin-left: 0;
+}
+.width-auto {
+	width: auto;
+}
+.btn-group .chzn-results {
+	white-space: normal;
+}
+.accordion-body.in:hover {
+	overflow: visible;
+}
+.invalid {
+	color: #9d261d;
+	font-weight: bold;
+}
+input.invalid {
+	border: 1px solid #9d261d;
+	background: #f2dede;
+}
+select.chzn-done.invalid + .chzn-container.chzn-container-single > a.chzn-single,
+select.chzn-done.invalid + .chzn-container.chzn-container-multi > ul.chzn-choices {
+	border-color: #9d261d;
+	color: #9d261d;
+}
+.tooltip {
+	max-width: 400px;
+}
+.tooltip-inner {
+	max-width: none;
+	text-align: left;
+	text-shadow: none;
+}
+th .tooltip-inner {
+	font-weight: normal;
+}
+.tooltip.hasimage {
+	opacity: 1;
+}
+.tip-text {
+	text-align: left;
+}
+.btn-group > .btn + .dropdown-backdrop + .btn {
+	margin-left: -1px;
+}
+.btn-group > .btn + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 8px;
+	padding-right: 8px;
+	-webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+	*padding-top: 5px;
+	*padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 5px;
+	padding-right: 5px;
+	*padding-top: 2px;
+	*padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-backdrop + .dropdown-toggle {
+	*padding-top: 5px;
+	*padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-backdrop + .dropdown-toggle {
+	padding-left: 12px;
+	padding-right: 12px;
+	*padding-top: 7px;
+	*padding-bottom: 7px;
+}
+.dropdown-menu {
+	text-align: left;
+}
+.alert-link {
+	font-weight: bold;
+}
+.alert .alert-link {
+	color: #a47e3c;
+}
+.alert-success .alert-link {
+	color: #356635;
+}
+.alert-danger .alert-link,
+.alert-error .alert-link {
+	color: #953b39;
+}
+.alert-info .alert-link {
+	color: #2d6987;
+}
+div.modal {
+	position: fixed;
+	top: 5%;
+	left: 50%;
+	z-index: 1050;
+	width: 80%;
+	margin-left: -40%;
+	background-color: #fff;
+	border: 1px solid #999;
+	border: 1px solid rgba(0,0,0,0.3);
+	*border: 1px solid #999;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding-box;
+	background-clip: padding-box;
+	outline: none;
+}
+div.modal.fade {
+	-webkit-transition: opacity .3s linear, top .3s ease-out;
+	-moz-transition: opacity .3s linear, top .3s ease-out;
+	-o-transition: opacity .3s linear, top .3s ease-out;
+	transition: opacity .3s linear, top .3s ease-out;
+	top: -25%;
+}
+div.modal.fade.in {
+	top: 5%;
+}
+.modal-batch {
+	overflow-y: visible;
+}
+.modal-body[class^="jviewport-height"],
+.modal-body[class*="jviewport-height"] {
+	max-height: none;
+}
+.jviewport-height10 {
+	height: 10vh;
+}
+.jviewport-height20 {
+	height: 20vh;
+}
+.jviewport-height30 {
+	height: 30vh;
+}
+.jviewport-height40 {
+	height: 40vh;
+}
+.jviewport-height50 {
+	height: 50vh;
+}
+.jviewport-height60 {
+	height: 60vh;
+}
+.jviewport-height70 {
+	height: 70vh;
+}
+.jviewport-height80 {
+	height: 80vh;
+}
+.jviewport-height90 {
+	height: 90vh;
+}
+.jviewport-height100 {
+	height: 100vh;
+}
+div.modal.jviewport-width10 {
+	width: 10vw;
+	margin-left: -5vw;
+}
+div.modal.jviewport-width20 {
+	width: 20vw;
+	margin-left: -10vw;
+}
+div.modal.jviewport-width30 {
+	width: 30vw;
+	margin-left: -15vw;
+}
+div.modal.jviewport-width40 {
+	width: 40vw;
+	margin-left: -20vw;
+}
+div.modal.jviewport-width50 {
+	width: 50vw;
+	margin-left: -25vw;
+}
+div.modal.jviewport-width60 {
+	width: 60vw;
+	margin-left: -30vw;
+}
+div.modal.jviewport-width70 {
+	width: 70vw;
+	margin-left: -35vw;
+}
+div.modal.jviewport-width80 {
+	width: 80vw;
+	margin-left: -40vw;
+}
+div.modal.jviewport-width90 {
+	width: 90vw;
+	margin-left: -45vw;
+}
+div.modal.jviewport-width100 {
+	width: 100vw;
+	margin-left: -50vw;
+}
+@media (max-width: 767px) {
+	div.modal {
+		position: fixed;
+		top: 20px;
+		left: 20px;
+		right: 20px;
+		width: auto;
+		margin: 0;
+	}
+	div.modal.fade {
+		top: -100px;
+	}
+	div.modal.fade.in {
+		top: 20px;
+	}
+	div.modal[class*="jviewport-width"] {
+		width: auto;
+		margin: 0;
+	}
+}
+@media (max-width: 480px) {
+	div.modal {
+		top: 10px;
+		left: 10px;
+		right: 10px;
+	}
+}
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'), url('../../../media/jui/fonts/IcoMoon.woff') format('woff'), url('../../../media/jui/fonts/IcoMoon.ttf') format('truetype'), url('../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+[data-icon]:before {
+	font-family: 'IcoMoon';
+	content: attr(data-icon);
+	speak: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	margin-right: .25em;
+	line-height: 14px;
+}
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+	font-family: 'IcoMoon';
+	font-style: normal;
+	speak: none;
+}
+[class^="icon-"].disabled,
+[class*=" icon-"].disabled {
+	font-weight: normal;
+}
+.icon-joomla:before {
+	content: "\e200";
+}
+.icon-chevron-up:before,
+.icon-uparrow:before,
+.icon-arrow-up:before {
+	content: "\e005";
+}
+.icon-chevron-right:before,
+.icon-rightarrow:before,
+.icon-arrow-right:before {
+	content: "\e006";
+}
+.icon-chevron-down:before,
+.icon-downarrow:before,
+.icon-arrow-down:before {
+	content: "\e007";
+}
+.icon-chevron-left:before,
+.icon-leftarrow:before,
+.icon-arrow-left:before {
+	content: "\e008";
+}
+.icon-arrow-first:before {
+	content: "\e003";
+}
+.icon-arrow-last:before {
+	content: "\e004";
+}
+.icon-arrow-up-2:before {
+	content: "\e009";
+}
+.icon-arrow-right-2:before {
+	content: "\e00a";
+}
+.icon-arrow-down-2:before {
+	content: "\e00b";
+}
+.icon-arrow-left-2:before {
+	content: "\e00c";
+}
+.icon-arrow-up-3:before {
+	content: "\e00f";
+}
+.icon-arrow-right-3:before {
+	content: "\e010";
+}
+.icon-arrow-down-3:before {
+	content: "\e011";
+}
+.icon-arrow-left-3:before {
+	content: "\e012";
+}
+.icon-menu-2:before {
+	content: "\e00e";
+}
+.icon-arrow-up-4:before {
+	content: "\e201";
+}
+.icon-arrow-right-4:before {
+	content: "\e202";
+}
+.icon-arrow-down-4:before {
+	content: "\e203";
+}
+.icon-arrow-left-4:before {
+	content: "\e204";
+}
+.icon-share:before,
+.icon-redo:before {
+	content: "\27";
+}
+.icon-undo:before {
+	content: "\28";
+}
+.icon-forward-2:before {
+	content: "\e205";
+}
+.icon-backward-2:before,
+.icon-reply:before {
+	content: "\e206";
+}
+.icon-unblock:before,
+.icon-refresh:before,
+.icon-redo-2:before {
+	content: "\6c";
+}
+.icon-undo-2:before {
+	content: "\e207";
+}
+.icon-move:before {
+	content: "\7a";
+}
+.icon-expand:before {
+	content: "\66";
+}
+.icon-contract:before {
+	content: "\67";
+}
+.icon-expand-2:before {
+	content: "\68";
+}
+.icon-contract-2:before {
+	content: "\69";
+}
+.icon-play:before {
+	content: "\e208";
+}
+.icon-pause:before {
+	content: "\e209";
+}
+.icon-stop:before {
+	content: "\e210";
+}
+.icon-previous:before,
+.icon-backward:before {
+	content: "\7c";
+}
+.icon-next:before,
+.icon-forward:before {
+	content: "\7b";
+}
+.icon-first:before {
+	content: "\7d";
+}
+.icon-last:before {
+	content: "\e000";
+}
+.icon-play-circle:before {
+	content: "\e00d";
+}
+.icon-pause-circle:before {
+	content: "\e211";
+}
+.icon-stop-circle:before {
+	content: "\e212";
+}
+.icon-backward-circle:before {
+	content: "\e213";
+}
+.icon-forward-circle:before {
+	content: "\e214";
+}
+.icon-loop:before {
+	content: "\e001";
+}
+.icon-shuffle:before {
+	content: "\e002";
+}
+.icon-search:before {
+	content: "\53";
+}
+.icon-zoom-in:before {
+	content: "\64";
+}
+.icon-zoom-out:before {
+	content: "\65";
+}
+.icon-apply:before,
+.icon-edit:before,
+.icon-pencil:before {
+	content: "\2b";
+}
+.icon-pencil-2:before {
+	content: "\2c";
+}
+.icon-brush:before {
+	content: "\3b";
+}
+.icon-save-new:before,
+.icon-plus-2:before {
+	content: "\5d";
+}
+.icon-minus-sign:before,
+.icon-minus-2:before {
+	content: "\5e";
+}
+.icon-delete:before,
+.icon-remove:before,
+.icon-cancel-2:before {
+	content: "\49";
+}
+.icon-publish:before,
+.icon-save:before,
+.icon-ok:before,
+.icon-checkmark:before {
+	content: "\47";
+}
+.icon-new:before,
+.icon-plus:before {
+	content: "\2a";
+}
+.icon-plus-circle:before {
+	content: "\e215";
+}
+.icon-minus:before,
+.icon-not-ok:before {
+	content: "\4b";
+}
+.icon-ban-circle:before,
+.icon-minus-circle:before {
+	content: "\e216";
+}
+.icon-unpublish:before,
+.icon-cancel:before {
+	content: "\4a";
+}
+.icon-cancel-circle:before {
+	content: "\e217";
+}
+.icon-checkmark-2:before {
+	content: "\e218";
+}
+.icon-checkmark-circle:before {
+	content: "\e219";
+}
+.icon-info:before {
+	content: "\e220";
+}
+.icon-info-2:before,
+.icon-info-circle:before {
+	content: "\e221";
+}
+.icon-question:before,
+.icon-question-sign:before,
+.icon-help:before {
+	content: "\45";
+}
+.icon-question-2:before,
+.icon-question-circle:before {
+	content: "\e222";
+}
+.icon-notification:before {
+	content: "\e223";
+}
+.icon-notification-2:before,
+.icon-notification-circle:before {
+	content: "\e224";
+}
+.icon-pending:before,
+.icon-warning:before {
+	content: "\48";
+}
+.icon-warning-2:before,
+.icon-warning-circle:before {
+	content: "\e225";
+}
+.icon-checkbox-unchecked:before {
+	content: "\3d";
+}
+.icon-checkin:before,
+.icon-checkbox:before,
+.icon-checkbox-checked:before {
+	content: "\3e";
+}
+.icon-checkbox-partial:before {
+	content: "\3f";
+}
+.icon-square:before {
+	content: "\e226";
+}
+.icon-radio-unchecked:before {
+	content: "\e227";
+}
+.icon-radio-checked:before,
+.icon-generic:before {
+	content: "\e228";
+}
+.icon-circle:before {
+	content: "\e229";
+}
+.icon-signup:before {
+	content: "\e230";
+}
+.icon-grid:before,
+.icon-grid-view:before {
+	content: "\58";
+}
+.icon-grid-2:before,
+.icon-grid-view-2:before {
+	content: "\59";
+}
+.icon-menu:before {
+	content: "\5a";
+}
+.icon-list:before,
+.icon-list-view:before {
+	content: "\31";
+}
+.icon-list-2:before {
+	content: "\e231";
+}
+.icon-menu-3:before {
+	content: "\e232";
+}
+.icon-folder-open:before,
+.icon-folder:before {
+	content: "\2d";
+}
+.icon-folder-close:before,
+.icon-folder-2:before {
+	content: "\2e";
+}
+.icon-folder-plus:before {
+	content: "\e234";
+}
+.icon-folder-minus:before {
+	content: "\e235";
+}
+.icon-folder-3:before {
+	content: "\e236";
+}
+.icon-folder-plus-2:before {
+	content: "\e237";
+}
+.icon-folder-remove:before {
+	content: "\e238";
+}
+.icon-file:before {
+	content: "\e016";
+}
+.icon-file-2:before {
+	content: "\e239";
+}
+.icon-file-add:before,
+.icon-file-plus:before {
+	content: "\29";
+}
+.icon-file-minus:before {
+	content: "\e017";
+}
+.icon-file-check:before {
+	content: "\e240";
+}
+.icon-file-remove:before {
+	content: "\e241";
+}
+.icon-save-copy:before,
+.icon-copy:before {
+	content: "\e018";
+}
+.icon-stack:before {
+	content: "\e242";
+}
+.icon-tree:before {
+	content: "\e243";
+}
+.icon-tree-2:before {
+	content: "\e244";
+}
+.icon-paragraph-left:before {
+	content: "\e246";
+}
+.icon-paragraph-center:before {
+	content: "\e247";
+}
+.icon-paragraph-right:before {
+	content: "\e248";
+}
+.icon-paragraph-justify:before {
+	content: "\e249";
+}
+.icon-screen:before {
+	content: "\e01c";
+}
+.icon-tablet:before {
+	content: "\e01d";
+}
+.icon-mobile:before {
+	content: "\e01e";
+}
+.icon-box-add:before {
+	content: "\51";
+}
+.icon-box-remove:before {
+	content: "\52";
+}
+.icon-download:before {
+	content: "\e021";
+}
+.icon-upload:before {
+	content: "\e022";
+}
+.icon-home:before {
+	content: "\21";
+}
+.icon-home-2:before {
+	content: "\e250";
+}
+.icon-out-2:before,
+.icon-new-tab:before {
+	content: "\e024";
+}
+.icon-out-3:before,
+.icon-new-tab-2:before {
+	content: "\e251";
+}
+.icon-link:before {
+	content: "\e252";
+}
+.icon-picture:before,
+.icon-image:before {
+	content: "\2f";
+}
+.icon-pictures:before,
+.icon-images:before {
+	content: "\30";
+}
+.icon-palette:before,
+.icon-color-palette:before {
+	content: "\e014";
+}
+.icon-camera:before {
+	content: "\55";
+}
+.icon-camera-2:before,
+.icon-video:before {
+	content: "\e015";
+}
+.icon-play-2:before,
+.icon-video-2:before,
+.icon-youtube:before {
+	content: "\56";
+}
+.icon-music:before {
+	content: "\57";
+}
+.icon-user:before {
+	content: "\22";
+}
+.icon-users:before {
+	content: "\e01f";
+}
+.icon-vcard:before {
+	content: "\6d";
+}
+.icon-address:before {
+	content: "\70";
+}
+.icon-share-alt:before,
+.icon-out:before {
+	content: "\26";
+}
+.icon-enter:before {
+	content: "\e257";
+}
+.icon-exit:before {
+	content: "\e258";
+}
+.icon-comment:before,
+.icon-comments:before {
+	content: "\24";
+}
+.icon-comments-2:before {
+	content: "\25";
+}
+.icon-quote:before,
+.icon-quotes-left:before {
+	content: "\60";
+}
+.icon-quote-2:before,
+.icon-quotes-right:before {
+	content: "\61";
+}
+.icon-quote-3:before,
+.icon-bubble-quote:before {
+	content: "\e259";
+}
+.icon-phone:before {
+	content: "\e260";
+}
+.icon-phone-2:before {
+	content: "\e261";
+}
+.icon-envelope:before,
+.icon-mail:before {
+	content: "\4d";
+}
+.icon-envelope-opened:before,
+.icon-mail-2:before {
+	content: "\4e";
+}
+.icon-unarchive:before,
+.icon-drawer:before {
+	content: "\4f";
+}
+.icon-archive:before,
+.icon-drawer-2:before {
+	content: "\50";
+}
+.icon-briefcase:before {
+	content: "\e020";
+}
+.icon-tag:before {
+	content: "\e262";
+}
+.icon-tag-2:before {
+	content: "\e263";
+}
+.icon-tags:before {
+	content: "\e264";
+}
+.icon-tags-2:before {
+	content: "\e265";
+}
+.icon-options:before,
+.icon-cog:before {
+	content: "\38";
+}
+.icon-cogs:before {
+	content: "\37";
+}
+.icon-screwdriver:before,
+.icon-tools:before {
+	content: "\36";
+}
+.icon-wrench:before {
+	content: "\3a";
+}
+.icon-equalizer:before {
+	content: "\39";
+}
+.icon-dashboard:before {
+	content: "\78";
+}
+.icon-switch:before {
+	content: "\e266";
+}
+.icon-filter:before {
+	content: "\54";
+}
+.icon-purge:before,
+.icon-trash:before {
+	content: "\4c";
+}
+.icon-checkedout:before,
+.icon-lock:before,
+.icon-locked:before {
+	content: "\23";
+}
+.icon-unlock:before {
+	content: "\e267";
+}
+.icon-key:before {
+	content: "\5f";
+}
+.icon-support:before {
+	content: "\46";
+}
+.icon-database:before {
+	content: "\62";
+}
+.icon-scissors:before {
+	content: "\e268";
+}
+.icon-health:before {
+	content: "\6a";
+}
+.icon-wand:before {
+	content: "\6b";
+}
+.icon-eye-open:before,
+.icon-eye:before {
+	content: "\3c";
+}
+.icon-eye-close:before,
+.icon-eye-blocked:before,
+.icon-eye-2:before {
+	content: "\e269";
+}
+.icon-clock:before {
+	content: "\6e";
+}
+.icon-compass:before {
+	content: "\6f";
+}
+.icon-broadcast:before,
+.icon-connection:before,
+.icon-wifi:before {
+	content: "\e01b";
+}
+.icon-book:before {
+	content: "\e271";
+}
+.icon-lightning:before,
+.icon-flash:before {
+	content: "\79";
+}
+.icon-print:before,
+.icon-printer:before {
+	content: "\e013";
+}
+.icon-feed:before {
+	content: "\71";
+}
+.icon-calendar:before {
+	content: "\43";
+}
+.icon-calendar-2:before {
+	content: "\44";
+}
+.icon-calendar-3:before {
+	content: "\e273";
+}
+.icon-pie:before {
+	content: "\77";
+}
+.icon-bars:before {
+	content: "\76";
+}
+.icon-chart:before {
+	content: "\75";
+}
+.icon-power-cord:before {
+	content: "\32";
+}
+.icon-cube:before {
+	content: "\33";
+}
+.icon-puzzle:before {
+	content: "\34";
+}
+.icon-attachment:before,
+.icon-paperclip:before,
+.icon-flag-2:before {
+	content: "\72";
+}
+.icon-lamp:before {
+	content: "\74";
+}
+.icon-pin:before,
+.icon-pushpin:before {
+	content: "\73";
+}
+.icon-location:before {
+	content: "\63";
+}
+.icon-shield:before {
+	content: "\e274";
+}
+.icon-flag:before {
+	content: "\35";
+}
+.icon-flag-3:before {
+	content: "\e275";
+}
+.icon-bookmark:before {
+	content: "\e023";
+}
+.icon-bookmark-2:before {
+	content: "\e276";
+}
+.icon-heart:before {
+	content: "\e277";
+}
+.icon-heart-2:before {
+	content: "\e278";
+}
+.icon-thumbs-up:before {
+	content: "\5b";
+}
+.icon-thumbs-down:before {
+	content: "\5c";
+}
+.icon-unfeatured:before,
+.icon-asterisk:before,
+.icon-star-empty:before {
+	content: "\40";
+}
+.icon-star-2:before {
+	content: "\41";
+}
+.icon-featured:before,
+.icon-default:before,
+.icon-star:before {
+	content: "\42";
+}
+.icon-smiley:before,
+.icon-smiley-happy:before {
+	content: "\e279";
+}
+.icon-smiley-2:before,
+.icon-smiley-happy-2:before {
+	content: "\e280";
+}
+.icon-smiley-sad:before {
+	content: "\e281";
+}
+.icon-smiley-sad-2:before {
+	content: "\e282";
+}
+.icon-smiley-neutral:before {
+	content: "\e283";
+}
+.icon-smiley-neutral-2:before {
+	content: "\e284";
+}
+.icon-cart:before {
+	content: "\e019";
+}
+.icon-basket:before {
+	content: "\e01a";
+}
+.icon-credit:before {
+	content: "\e286";
+}
+.icon-credit-2:before {
+	content: "\e287";
+}
+.icon-expired:before {
+	content: "\4b";
+}
+body {
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+body.site {
+	border-top: 3px solid #0088cc;
+	padding: 20px;
+	background-color: #f4f6f7;
+}
+body.site.fluid {
+	background-color: #ffffff;
+}
+.thumbnail {
+	margin-bottom: 9px;
+}
+.accordion-group {
+	background: #fff;
+}
+.site-title {
+	font-size: 40px;
+	font-size: calc(16px + 2.16vw);
+	line-height: 48px;
+	font-weight: bold;
+}
+@media (min-width: 1024px) {
+	.site-title {
+		font-size: 40px;
+	}
+}
+.brand {
+	color: #001a27;
+	-webkit-transition: color .5s linear;
+	-moz-transition: color .5s linear;
+	-o-transition: color .5s linear;
+	transition: color .5s linear;
+}
+.brand:hover {
+	color: #005e8d;
+	text-decoration: none;
+}
+.header {
+	margin-bottom: 10px;
+}
+.header .finder {
+	margin-top: 14px;
+}
+.header .finder .btn {
+	margin-top: 0px;
+}
+.navigation {
+	padding: 5px 0;
+	border-top: 1px solid rgba(0,0,0,0.075);
+	border-bottom: 1px solid rgba(0,0,0,0.075);
+	margin-bottom: 10px;
+}
+.navigation .nav-pills {
+	margin-bottom: 0;
+}
+.hero-unit {
+	background-color: #08C;
+}
+.hero-unit > * {
+	color: white;
+	text-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+}
+.container {
+	max-width: 960px;
+}
+.body .container {
+	background-color: #fff;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	padding: 20px;
+	border: 1px solid rgba(0,0,0,0.15);
+	-moz-box-shadow: 0px 0px 6px rgba(0,0,0,0.05);
+	-webkit-box-shadow: 0px 0px 6px rgba(0,0,0,0.05);
+	box-shadow: 0px 0px 6px rgba(0,0,0,0.05);
+}
+.well .page-header {
+	margin: 0px 0px 5px 0px;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	margin: 12px 0;
+	word-wrap: break-word;
+}
+h1 {
+	font-size: 26px;
+	line-height: 28px;
+}
+h2 {
+	font-size: 22px;
+	line-height: 24px;
+}
+h3 {
+	font-size: 18px;
+	line-height: 20px;
+}
+h4 {
+	font-size: 14px;
+	line-height: 16px;
+}
+h5 {
+	font-size: 13px;
+	line-height: 15px;
+}
+h6 {
+	font-size: 12px;
+	line-height: 14px;
+}
+.module-header {
+	padding-bottom: 17px;
+	margin: 20px 0 18px 0;
+	border-bottom: 1px solid #eeeeee;
+}
+p {
+	word-wrap: break-word;
+}
+.item-title {
+	margin-bottom: 9px;
+}
+.item-content {
+	margin: 18px 0;
+}
+.item-subtitle {
+	margin-bottom: 9px;
+}
+.pull-right.item-image {
+	margin: 0 0 18px 20px;
+}
+.pull-left.item-image {
+	margin: 0 20px 18px 0;
+}
+.header .nav > li:last-child > .dropdown-menu,
+.item-actions .dropdown-menu,
+.item-comment .dropdown-menu {
+	left: initial;
+	right: 0;
+}
+.article-index {
+	margin: 0 0 10px 10px;
+}
+.list-item-title {
+	margin-bottom: 9px;
+}
+.list-item-content {
+	margin: 18px 0;
+}
+.list-item-subtitle {
+	margin-bottom: 9px;
+}
+.items-more,
+.content-links {
+	padding: 15px 0;
+}
+.breadcrumb {
+	margin: 10px 0;
+}
+.breadcrumb > li,
+.breadcrumb > .active {
+	color: #515151;
+}
+#login-form {
+	margin-top: 8px;
+}
+.add-on + #modlgn-username,
+.add-on + #modlgn-passwd {
+	width: 132px;
+}
+.img_caption .left {
+	float: left;
+	margin-right: 1em;
+}
+.img_caption .right {
+	float: right;
+	margin-left: 1em;
+}
+.img_caption .left p {
+	clear: left;
+	text-align: center;
+}
+.img_caption .right p {
+	clear: right;
+	text-align: center;
+}
+.img_caption {
+	text-align: center !important;
+}
+.img_caption.none {
+	margin-left: auto;
+	margin-right: auto;
+}
+figure {
+	display: table;
+}
+figure.pull-center,
+img.pull-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+figcaption {
+	display: table-caption;
+	caption-side: bottom;
+}
+#aside .nav .nav-child {
+	border-left: 2px solid #ddd;
+	padding-left: 5px;
+}
+.navigation .nav-child {
+	position: absolute;
+	top: 95%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	list-style: none;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.2);
+	*border-right-width: 2px;
+	*border-bottom-width: 2px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	box-shadow: 0 5px 10px rgba(0,0,0,0.2);
+	-webkit-background-clip: padding-box;
+	-moz-background-clip: padding;
+	background-clip: padding-box;
+}
+.navigation .nav-child.pull-right {
+	right: 0;
+	left: auto;
+}
+.navigation .nav-child .divider {
+	*width: 100%;
+	height: 1px;
+	margin: 8px 1px;
+	*margin: -5px 0 5px;
+	overflow: hidden;
+	background-color: #e5e5e5;
+	border-bottom: 1px solid #fff;
+}
+.navigation .nav-child a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	color: #333;
+	white-space: nowrap;
+}
+.navigation .nav li {
+	position: relative;
+}
+.navigation .nav > li:hover > .nav-child,
+.navigation .nav > li > a:focus + .nav-child,
+.navigation .nav li li:hover > .nav-child,
+.navigation .nav li li > a:focus + .nav-child {
+	display: block;
+}
+.navigation .nav > li:before {
+	position: absolute;
+	top: 100%;
+	right: 0;
+	left: 0;
+	height: 6px;
+	content: '';
+}
+.navigation .nav > li > .nav-child:before {
+	position: absolute;
+	top: -7px;
+	left: 9px;
+	display: inline-block;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-left: 7px solid transparent;
+	border-bottom-color: rgba(0,0,0,0.2);
+	content: '';
+}
+.navigation .nav > li > .nav-child:after {
+	position: absolute;
+	top: -6px;
+	left: 10px;
+	display: inline-block;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #ffffff;
+	border-left: 6px solid transparent;
+	content: '';
+}
+.navigation .nav li li .nav-child {
+	top: -8px;
+	left: 100%;
+}
+.navigation .nav li li .nav-child:before {
+	position: absolute;
+	top: 9px;
+	left: -7px;
+	display: inline-block;
+	border-top: 7px solid transparent;
+	border-right: 7px solid rgba(0,0,0,0.2);
+	border-bottom: 7px solid transparent;
+	content: '';
+}
+.navigation .nav li li .nav-child:after {
+	position: absolute;
+	top: 10px;
+	left: -6px;
+	display: inline-block;
+	border-top: 6px solid transparent;
+	border-right: 6px solid #ffffff;
+	border-bottom: 6px solid transparent;
+	content: '';
+}
+.navigation .nav-child li > a:hover,
+.navigation .nav-child li > a:focus,
+.navigation .nav-child:hover > a {
+	text-decoration: none;
+	color: #fff;
+	background-color: #005e8d;
+	background-color: #005783;
+	background-image: -moz-linear-gradient(top,#005e8d,#004d74);
+	background-image: -webkit-gradient(linear,0 0,0 100%,from(#005e8d),to(#004d74));
+	background-image: -webkit-linear-gradient(top,#005e8d,#004d74);
+	background-image: -o-linear-gradient(top,#005e8d,#004d74);
+	background-image: linear-gradient(to bottom,#005e8d,#004d74);
+	background-repeat: repeat-x;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff005e8d', endColorstr='#ff004c73', GradientType=0);
+}
+.categories-list .collapse {
+	margin-left: 20px;
+}
+@media (max-width: 480px) {
+	.item-info > span {
+		display: block;
+	}
+	.blog-item .pull-right.item-image {
+		margin: 0 0 18px 0;
+	}
+	.blog-item .pull-left.item-image {
+		margin: 0 0 18px 0;
+		float: none;
+	}
+}
+@media (max-width: 768px) {
+	body {
+		-webkit-overflow-scrolling: touch;
+		padding-top: 0;
+	}
+	.header {
+		background: transparent;
+	}
+	.header .brand {
+		float: none;
+		display: block;
+		text-align: center;
+	}
+	.header .nav.pull-right,
+	.header-search {
+		float: none;
+		display: block;
+	}
+	.header-search form {
+		margin: 0;
+	}
+	.header-search .search-query {
+		width: 90%;
+	}
+	.header .nav-pills > li > a {
+		border: 1px solid #ddd;
+		border-bottom: 0;
+		margin: 0;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		margin-right: 0;
+	}
+	.header .nav-pills > li:first-child > a {
+		-webkit-border-radius: 4px 4px 0 0;
+		-moz-border-radius: 4px 4px 0 0;
+		border-radius: 4px 4px 0 0;
+	}
+	.header .nav-pills > li:last-child > a {
+		-webkit-border-radius: 0 0 4px 4px;
+		-moz-border-radius: 0 0 4px 4px;
+		border-radius: 0 0 4px 4px;
+		border-bottom: 1px solid #ddd;
+	}
+	.modal.fade {
+		top: -100%;
+	}
+	.nav-tabs {
+		border-bottom: 0;
+	}
+	.nav-tabs > li {
+		float: none;
+	}
+	.nav-tabs > li > a {
+		border: 1px solid #ddd;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		margin-right: 0;
+	}
+	.nav-tabs > li:first-child > a {
+		-webkit-border-radius: 4px 4px 0 0;
+		-moz-border-radius: 4px 4px 0 0;
+		border-radius: 4px 4px 0 0;
+	}
+	.nav-tabs > li:last-child > a,
+	.nav-tabs > .active:last-child > a {
+		-webkit-border-radius: 0 0 4px 4px;
+		-moz-border-radius: 0 0 4px 4px;
+		border-radius: 0 0 4px 4px;
+		border-bottom: 1px solid #ddd;
+	}
+	.nav-tabs > li > a:hover {
+		border-color: #ddd;
+		z-index: 2;
+	}
+	.nav-tabs.nav-dark > li > a {
+		border: 1px solid #333;
+	}
+	.nav-tabs > li:last-child > a,
+	.nav-tabs > .active:last-child > a {
+		border-bottom: 1px solid #333;
+	}
+	.nav-tabs.nav-dark > li > a:hover {
+		border-color: #333;
+	}
+	.nav-pills > li {
+		float: none;
+	}
+	.nav-pills > li > a {
+		margin-right: 0;
+	}
+	.nav-pills > li > a {
+		margin-bottom: 3px;
+	}
+	.nav-pills  > li:last-child > a {
+		margin-bottom: 1px;
+	}
+	.form-search > .pull-left,
+	.form-search > .pull-right {
+		float: none;
+		display: block;
+		margin-bottom: 9px;
+	}
+}
+@media (max-width: 980px) {
+	.navbar-fixed-top {
+		margin-bottom: 0 !important;
+	}
+	.item-comment .item-image {
+		display: none;
+	}
+	.well {
+		padding: 10px;
+	}
+}
+@media (max-width: 979px) {
+	.nav-collapse.in.collapse {
+		overflow: visible;
+		height: 0;
+		z-index: 100;
+	}
+	.nav-collapse .nav > li.active > a {
+		color: #fff;
+	}
+	.nav-collapse .nav > li.active > a:hover {
+		color: #555;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	#login-form .input-small {
+		width: 62px;
+	}
+}
+dl.tabs {
+	float: left;
+	margin-bottom: -1px;
+}
+dl.tabs dt.tabs {
+	float: left;
+	margin-left: 3px;
+	padding: 4px 10px;
+	background-color: #F0F0F0;
+	border-top: 1px solid #CCC;
+	border-left: 1px solid #CCC;
+	border-right: 1px solid #CCC;
+}
+dl.tabs dt:hover {
+	background-color: #F9F9F9;
+}
+dl.tabs dt.open {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+}
+dl.tabs dt.tabs h3 {
+	margin: 0;
+	font-size: 1.1em;
+	font-weight: normal;
+}
+dl.tabs dt.tabs h3 a {
+	color: #0088CC;
+}
+dl.tabs dt.tabs h3 a:hover {
+	color: #005580;
+	text-decoration: none;
+}
+dl.tabs dt.open h3 a {
+	color: #000;
+	text-decoration: none;
+}
+div.current dd.tabs {
+	margin: 0;
+	padding: 10px;
+	clear: both;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+}
+#helpsite-refresh {
+	vertical-align: top;
+}
+#pop-print {
+	float: right;
+	margin: 10px;
+}
+code {
+	white-space: pre-wrap;
+}
+#filter-search {
+	vertical-align: top;
+}
+.editor {
+	overflow: hidden;
+	position: relative;
+}
+.search span.highlight {
+	background-color: #FFFFCC;
+	font-weight: bold;
+	padding: 1px 0;
+}
+dt.result-title {
+	word-wrap: break-word;
+}
+dd.result-text {
+	word-wrap: break-word;
+}
+body.modal-open {
+	overflow: hidden;
+	-ms-overflow-style: none;
+}
+#users-profile-custom label {
+	display: inline;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0;
+}
+.form-horizontal .controls > .radio:first-child,
+.form-horizontal .controls > .checkbox:first-child {
+	padding-top: 5px;
+}
+.form-horizontal .controls > .radio.btn-group:first-child {
+	padding-top: 0;
+}
+.field-media-wrapper .modal .modal-body {
+	padding: 5px 10px;
+	overflow: hidden;
+}
+#search-results {
+	clear: both;
+}
+#finder-filter-window {
+	overflow: visible;
+}
+#finder-search .in.collapse {
+	overflow: visible;
+}
+.well select,
+.well .chzn-container {
+	max-width: 100%;
+}
+.container-popup {
+	padding: 28px 10px 10px 10px;
+}
+li {
+	word-wrap: break-word;
+}
+ul.manager .height-50 .icon-folder-2 {
+	height: 35px;
+	width: 35px;
+	line-height: 35px;
+	font-size: 30px;
+}
+.popover-content {
+	min-height: 33px;
+}
+.finder-selects {
+	margin: 0 15px 15px 0;
+}
+.header-search .mod-languages ul {
+	margin: 0 0 5px 0;
+}
+.rtl .navigation .nav-child {
+	left: auto;
+	right: 0;
+}
+.rtl .navigation .nav > li > .nav-child:before {
+	left: auto;
+	right: 12px;
+}
+.rtl .navigation .nav > li > .nav-child:after {
+	left: auto;
+	right: 13px;
+}
+.rtl .categories-list .collapse {
+	margin: 0 20px 0 0;
+}
+.rtl .modal-footer button {
+	float: left;
+}
+.rtl .finder-selects {
+	margin: 0 0 15px 15px;
+}
diff --git a/core/templates/protostar/error.php b/core/templates/protostar/error.php
new file mode 100644
index 00000000..4e394e80
--- /dev/null
+++ b/core/templates/protostar/error.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentError $this */
+
+$app  = JFactory::getApplication();
+$user = JFactory::getUser();
+
+// Getting params from template
+$params = $app->getTemplate(true)->params;
+
+// Detecting Active Variables
+$option   = $app->input->getCmd('option', '');
+$view     = $app->input->getCmd('view', '');
+$layout   = $app->input->getCmd('layout', '');
+$task     = $app->input->getCmd('task', '');
+$itemid   = $app->input->getCmd('Itemid', '');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
+
+if ($task === 'edit' || $layout === 'form')
+{
+	$fullWidth = 1;
+}
+else
+{
+	$fullWidth = 0;
+}
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Logo file or site title param
+if ($params->get('logoFile'))
+{
+	$logo = '<img src="' . JUri::root() . $params->get('logoFile') . '" alt="' . $sitename . '" />';
+}
+elseif ($params->get('sitetitle'))
+{
+	$logo = '<span class="site-title" title="' . $sitename . '">' . htmlspecialchars($params->get('sitetitle')) . '</span>';
+}
+else
+{
+	$logo = '<span class="site-title" title="' . $sitename . '">' . $sitename . '</span>';
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $this->title; ?> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></title>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<?php // Use of Google Font ?>
+	<?php if ($params->get('googleFont')) : ?>
+		<link href="https://fonts.googleapis.com/css?family=<?php echo $params->get('googleFontName'); ?>" rel="stylesheet" />
+		<style>
+			h1, h2, h3, h4, h5, h6, .site-title {
+				font-family: '<?php echo str_replace('+', ' ', $params->get('googleFontName')); ?>', sans-serif;
+			}
+		</style>
+	<?php endif; ?>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/template.css" rel="stylesheet" />
+	<?php if ($app->get('debug_lang', '0') == '1' || $app->get('debug', '0') == '1') : ?>
+		<link href="<?php echo JUri::root(true); ?>/media/cms/css/debug.css" rel="stylesheet" />
+	<?php endif; ?>
+	<?php // If Right-to-Left ?>
+	<?php if ($this->direction === 'rtl') : ?>
+		<link href="<?php echo JUri::root(true); ?>/media/jui/css/bootstrap-rtl.css" rel="stylesheet" />
+	<?php endif; ?>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+	<?php // Template color ?>
+	<?php if ($params->get('templateColor')) : ?>
+		<style>
+			body.site {
+				border-top: 3px solid <?php echo $params->get('templateColor'); ?>;
+				background-color: <?php echo $params->get('templateBackgroundColor'); ?>
+			}
+			a {
+				color: <?php echo $params->get('templateColor'); ?>;
+			}
+			.navbar-inner, .nav-list > .active > a, .nav-list > .active > a:hover, .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover, .nav-pills > .active > a, .nav-pills > .active > a:hover {
+				background: <?php echo $params->get('templateColor'); ?>;
+			}
+			.navbar-inner {
+				-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
+				-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
+				box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
+			}
+		</style>
+	<?php endif; ?>
+	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
+</head>
+<body class="site <?php echo $option
+	. ' view-' . $view
+	. ($layout ? ' layout-' . $layout : ' no-layout')
+	. ($task ? ' task-' . $task : ' no-task')
+	. ($itemid ? ' itemid-' . $itemid : '')
+	. ($params->get('fluidContainer') ? ' fluid' : '')
+	. ($this->direction === 'rtl' ? ' rtl' : '');
+?>">
+	<!-- Body -->
+	<div class="body">
+		<div class="container<?php echo ($params->get('fluidContainer') ? '-fluid' : ''); ?>">
+			<!-- Header -->
+			<header class="header" role="banner">
+				<div class="header-inner clearfix">
+					<a class="brand pull-left" href="<?php echo $this->baseurl; ?>/">
+						<?php echo $logo; ?>
+					</a>
+					<div class="header-search pull-right">
+						<?php // Display position-0 modules ?>
+						<?php echo $this->getBuffer('modules', 'position-0', array('style' => 'none')); ?>
+					</div>
+				</div>
+			</header>
+			<div class="navigation">
+				<?php // Display position-1 modules ?>
+				<?php echo $this->getBuffer('modules', 'position-1', array('style' => 'none')); ?>
+			</div>
+			<!-- Banner -->
+			<div class="banner">
+				<?php echo $this->getBuffer('modules', 'banner', array('style' => 'xhtml')); ?>
+			</div>
+			<div class="row-fluid">
+				<div id="content" class="span12">
+					<!-- Begin Content -->
+					<h1 class="page-header"><?php echo JText::_('JERROR_LAYOUT_PAGE_NOT_FOUND'); ?></h1>
+					<div class="well">
+						<div class="row-fluid">
+							<div class="span6">
+								<p><strong><?php echo JText::_('JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST'); ?></strong></p>
+								<p><?php echo JText::_('JERROR_LAYOUT_NOT_ABLE_TO_VISIT'); ?></p>
+								<ul>
+									<li><?php echo JText::_('JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE'); ?></li>
+									<li><?php echo JText::_('JERROR_LAYOUT_MIS_TYPED_ADDRESS'); ?></li>
+									<li><?php echo JText::_('JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING'); ?></li>
+									<li><?php echo JText::_('JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE'); ?></li>
+								</ul>
+							</div>
+							<div class="span6">
+								<?php if (JModuleHelper::getModule('mod_search')) : ?>
+									<p><strong><?php echo JText::_('JERROR_LAYOUT_SEARCH'); ?></strong></p>
+									<p><?php echo JText::_('JERROR_LAYOUT_SEARCH_PAGE'); ?></p>
+									<?php $module = JModuleHelper::getModule('mod_search'); ?>
+									<?php echo JModuleHelper::renderModule($module); ?>
+								<?php endif; ?>
+								<p><?php echo JText::_('JERROR_LAYOUT_GO_TO_THE_HOME_PAGE'); ?></p>
+								<p><a href="<?php echo $this->baseurl; ?>/index.php" class="btn"><span class="icon-home" aria-hidden="true"></span> <?php echo JText::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></p>
+							</div>
+						</div>
+						<hr />
+						<p><?php echo JText::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?></p>
+						<blockquote>
+							<span class="label label-inverse"><?php echo $this->error->getCode(); ?></span> <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8');?>
+							<?php if ($this->debug) : ?>
+								<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+							<?php endif; ?>
+						</blockquote>
+						<?php if ($this->debug) : ?>
+							<div>
+								<?php echo $this->renderBacktrace(); ?>
+								<?php // Check if there are more Exceptions and render their data as well ?>
+								<?php if ($this->error->getPrevious()) : ?>
+									<?php $loop = true; ?>
+									<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+									<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+									<?php $this->setError($this->_error->getPrevious()); ?>
+									<?php while ($loop === true) : ?>
+										<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+										<p>
+											<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+											<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+										</p>
+										<?php echo $this->renderBacktrace(); ?>
+										<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+									<?php endwhile; ?>
+									<?php // Reset the main error object to the base error ?>
+									<?php $this->setError($this->error); ?>
+								<?php endif; ?>
+							</div>
+						<?php endif; ?>
+					</div>
+					<!-- End Content -->
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- Footer -->
+	<div class="footer">
+		<div class="container<?php echo ($params->get('fluidContainer') ? '-fluid' : ''); ?>">
+			<hr />
+			<?php echo $this->getBuffer('modules', 'footer', array('style' => 'none')); ?>
+			<p class="pull-right">
+				<a href="#top" id="back-top">
+					<?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?>
+				</a>
+			</p>
+			<p>
+				&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+			</p>
+		</div>
+	</div>
+	<?php echo $this->getBuffer('modules', 'debug', array('style' => 'none')); ?>
+</body>
+</html>
diff --git a/core/templates/protostar/favicon.ico b/core/templates/protostar/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..1a4d7979dcf49a5f677c7e0075781431e23f2c50
GIT binary patch
literal 2019
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z81_l<D%#etZ2wxwo<osN{#FYG`RK1Ga0-$OJ2Ac{iATu|$BvGLvHz%*y
zs=`(YtilS&1_|pcDS(xfWZNo5_y#CA=NF|anChA687SFtDJUq|6s4qD1-ZCEwF7y!
zN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWfdBw^QLty5(q!uR^
zWfqiV=I1GZ%uP(nFD<cEQUX~72M~9bWTqi($}5I?3+O?8kc_^eo`F6#ZK)NRIJALe
zaB53QhWo0Zv?vGcr<7#<)ST4Z)Vz{npgu#a)&av7t`WtN6^R89%fNvM@tY0E<yJwd
z#rZj<pdbj%%Pg@ovH^PtT^JD}5M9psxdlb3#l=8vcBW7*$YSW~BM{cunZxWr7DU(J
zUz7>-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{
zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+7C`G)JGDw(Z{OV
z2AC48eDhN>(<)sOOH%EO3=B=J42-P|O%)7{K@1b1chS@!xd0^NT$Gwvl3x^(pPyp~
z_C+p;t6;2WtOxWrx(cXf8+}kdLdsW=ObZqT=2|;0piWo`V8><WSr*H{z#QS};uvBf
zSUV{;BgR$a`1zSLtIOZ-+U*&e+Zy34mg8+QHON&;<ZQXF>*uQ)x^_R)YBVb+)M-R5
zR64Q9QE&-I(5j51QHz~S%zS4r(^V0@+-9bxE0HZ_Vko_N_U`Y=&nohMJqkX5IOg4%
zpMU=spOazeV@{W{j@y5sr1pM5a`l(`<sbU4Zhifj_xj$&rLuu?@1$2%hk1Q9Rq|B2
zV71`df$7cfxBZFuvtQt=`TeJ7+5I&&_wAkAZN=kb{Z2m1VtG!W^e?smg$WB)6+g%e
ze0V*75?_sx<hsj+l>$7ey^SW%@8t3{=5lk`7%y^otho54iu@4?HZkqw=bI)iTy>7s
zYl6`2CAz@}*n*gTFxKDn$iC-jp~82a|4a7T-3%v1xir6=iSB0czpg(czf9+_S<mSy
z@7Zb>3i%t<^zb$`<grR^JN}*LTlWe-#$V!>8r+(zFE@U#KEBt-oAK2_A<h5Os?XN^
za=-L;=N5%iYx`N1!kJHhylX$dFG5sznqc?7hDcH2o9y9V*z1DwHVPZP-TmwIhJ3wg
z3Ke}?!S~xAdmmn9#rxo(NrH>pGnxD=bM-VLZ}F=Yco%*=ba89MrMw>t_ga2VO3K?d
zyXO0z<m737fA`*<9VK^U%U`w6A{*~ayFKwn$ttH)kB)^DWyRjxsP!wjqA=xkx&59g
zoCT|D9$!12$G2Y7IL_4~lHvcEM-#WFi-{{0g(igO9dTUhFVbZ?d&(^PnI30y3S=Uq
z=d1{{`1?V-^~~Q`@ppHNmKN^Hzqc`U>$H;l52b%To_HXOGpdt^-+d~Be~fhPa`ufs
zKAkFh^Xa|$uJW6GTb+L|-G463Os?cl62G}Y)+1#>nWL*36jzH)h!6MB-uf-*^^K$F
z-PH8=Pvif>EWPF1=kxvYKVN0(S%&v4y;TwAs5njkYPg*+XF~M*2<rvEn%n~f=P!Ct
zZniLN<CHH=LHnvr%D1LITYfy;<&41!rgIbT9L$*ZM_{)^)0_z_d`>Lx;n}R}^>WsQ
z*$+-uZGF03`1Ri>wwVf1=QkW(u=uB#P~f5kGQSVTDJ@<q`uO((e<mwai>tGrXU~&)
zQI{cc{{QcvISF#U602t&-y6*Et1!&aC2GP=>8Xsl?|a|A`H_*dU~Bo7%F@St-uqUr
lx|x59Pegi?_2Mo68Ggz3@0scntO2TdJzf1=);T3K0RSjD{7e7<

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/html/com_media/imageslist/default_folder.php b/core/templates/protostar/html/com_media/imageslist/default_folder.php
new file mode 100644
index 00000000..501d8c77
--- /dev/null
+++ b/core/templates/protostar/html/com_media/imageslist/default_folder.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$input = JFactory::getApplication()->input;
+?>
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<a href="index.php?option=com_media&amp;view=imagesList&amp;tmpl=component&amp;folder=<?php echo rawurlencode($this->_tmp_folder->path_relative); ?>&amp;asset=<?php echo $input->getCmd('asset');?>&amp;author=<?php echo $input->getCmd('author');?>" target="imageframe">
+		<div class="imgFolder">
+			<span class="icon-folder-2"></span>
+		</div>
+		<div class="small">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_folder->name), 10, false); ?>
+		</div>
+	</a>
+</li>
diff --git a/core/templates/protostar/html/com_media/imageslist/default_image.php b/core/templates/protostar/html/com_media/imageslist/default_image.php
new file mode 100644
index 00000000..5f1597b3
--- /dev/null
+++ b/core/templates/protostar/html/com_media/imageslist/default_image.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_media
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+$params     = new Registry;
+$dispatcher = JEventDispatcher::getInstance();
+$dispatcher->trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_img, &$params));
+?>
+
+<li class="imgOutline thumbnail height-80 width-80 center">
+	<a class="img-preview" href="javascript:ImageManager.populateFields('<?php echo $this->escape($this->_tmp_img->path_relative); ?>')" title="<?php echo $this->escape($this->_tmp_img->name); ?>" >
+		<div class="imgThumb">
+			<div class="imgThumbInside">
+			<?php echo JHtml::_('image', $this->baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
+			</div>
+		</div>
+		<div class="imgDetails small">
+			<?php echo JHtml::_('string.truncate', $this->escape($this->_tmp_img->name), 10, false); ?>
+		</div>
+	</a>
+</li>
+<?php
+$dispatcher->trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_img, &$params));
diff --git a/core/templates/protostar/html/layouts/joomla/form/field/contenthistory.php b/core/templates/protostar/html/layouts/joomla/form/field/contenthistory.php
new file mode 100644
index 00000000..d4959cc7
--- /dev/null
+++ b/core/templates/protostar/html/layouts/joomla/form/field/contenthistory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck       Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ *
+ * @var   string   $link            The link for the content history page
+ * @var   string   $label           The label text
+ */
+extract($displayData);
+
+echo JHtml::_(
+	'bootstrap.renderModal',
+	'versionsModal',
+	array(
+		'url'    => $link,
+		'title'  => $label,
+		'height' => '300px',
+		'width'  => '800px',
+		'footer' => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+			. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+	)
+);
+
+?>
+<button onclick="jQuery('#versionsModal').modal('show')" class="btn" data-toggle="modal" title="<?php echo $label; ?>">
+	<span class="icon-archive" aria-hidden="true"></span><?php echo $label; ?>
+</button>
diff --git a/core/templates/protostar/html/layouts/joomla/form/field/media.php b/core/templates/protostar/html/layouts/joomla/form/field/media.php
new file mode 100644
index 00000000..0cf31f85
--- /dev/null
+++ b/core/templates/protostar/html/layouts/joomla/form/field/media.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * ---------------------
+ *
+ * @var  string   $asset The asset text
+ * @var  string   $authorField The label text
+ * @var  integer  $authorId The author id
+ * @var  string   $class The class text
+ * @var  boolean  $disabled True if field is disabled
+ * @var  string   $folder The folder text
+ * @var  string   $id The label text
+ * @var  string   $link The link text
+ * @var  string   $name The name text
+ * @var  string   $preview The preview image relative path
+ * @var  integer  $previewHeight The image preview height
+ * @var  integer  $previewWidth The image preview width
+ * @var  string   $onchange  The onchange text
+ * @var  boolean  $readonly True if field is readonly
+ * @var  integer  $size The size text
+ * @var  string   $value The value text
+ * @var  string   $src The path and filename of the image
+ */
+extract($displayData);
+
+// The button.
+if ($disabled != true)
+{
+	JHtml::_('bootstrap.tooltip');
+}
+
+$attr = '';
+
+// Initialize some field attributes.
+$attr .= !empty($class) ? ' class="input-small hasTooltip field-media-input ' . $class . '"' : ' class="input-small hasTooltip field-media-input"';
+$attr .= !empty($size) ? ' size="' . $size . '"' : '';
+
+// Initialize JavaScript field attributes.
+$attr .= !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+
+switch ($preview)
+{
+	case 'no': // Deprecated parameter value
+	case 'false':
+	case 'none':
+		$showPreview = false;
+		$showAsTooltip = false;
+		break;
+	case 'yes': // Deprecated parameter value
+	case 'true':
+	case 'show':
+		$showPreview = true;
+		$showAsTooltip = false;
+		break;
+	case 'tooltip':
+	default:
+		$showPreview = true;
+		$showAsTooltip = true;
+		break;
+}
+
+// Pre fill the contents of the popover
+if ($showPreview)
+{
+	if ($value && file_exists(JPATH_ROOT . '/' . $value))
+	{
+		$src = JUri::root() . $value;
+	}
+	else
+	{
+		$src = JText::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY');
+	}
+}
+
+// The URL for the modal
+$url    = ($readonly ? ''
+	: ($link ?: 'index.php?option=com_media&amp;view=images&amp;tmpl=component&amp;asset='
+		. $asset . '&amp;author=' . $authorId)
+	. '&amp;fieldid={field-media-id}&amp;ismoo=0&amp;folder=' . $folder);
+?>
+<div class="field-media-wrapper"
+	data-basepath="<?php echo JUri::root(); ?>"
+	data-url="<?php echo $url; ?>"
+	data-modal=".modal"
+	data-modal-width="100%"
+	data-modal-height="400px"
+	data-input=".field-media-input"
+	data-button-select=".button-select"
+	data-button-clear=".button-clear"
+	data-button-save-selected=".button-save-selected"
+	data-preview="<?php echo $showPreview ? 'true' : 'false'; ?>"
+	data-preview-as-tooltip="<?php echo $showAsTooltip ? 'true' : 'false'; ?>"
+	data-preview-container=".field-media-preview"
+	data-preview-width="<?php echo $previewWidth; ?>"
+	data-preview-height="<?php echo $previewHeight; ?>"
+>
+	<?php
+	// Render the modal
+	echo JHtml::_('bootstrap.renderModal',
+		'imageModal_'. $id,
+		array(
+			'title' => JText::_('JLIB_FORM_CHANGE_IMAGE'),
+			'closeButton' => true,
+			'footer' => '<a class="btn" data-dismiss="modal">' . JText::_('JCANCEL') . '</a>'
+		)
+	);
+
+	JHtml::_('script', 'media/mediafield.min.js', array('version' => 'auto', 'relative' => true));
+	?>
+	<?php if ($showPreview && $showAsTooltip) : ?>
+	<div class="input-prepend input-append">
+		<span rel="popover" class="add-on pop-helper field-media-preview"
+			title="<?php echo	JText::_('JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE'); ?>" data-content="<?php echo JText::_('JLIB_FORM_MEDIA_PREVIEW_EMPTY'); ?>"
+			data-original-title="<?php echo JText::_('JLIB_FORM_MEDIA_PREVIEW_SELECTED_IMAGE'); ?>" data-trigger="hover">
+			<span class="icon-eye" aria-hidden="true"></span>
+		</span>
+	<?php else: ?>
+	<div class="input-append">
+	<?php endif; ?>
+		<input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); ?>" readonly="readonly"<?php echo $attr; ?>/>
+		<?php if ($disabled != true) : ?>
+			<a class="btn add-on button-select"><?php echo JText::_("JLIB_FORM_BUTTON_SELECT"); ?></a>
+			<a class="btn icon-remove hasTooltip add-on button-clear" title="<?php echo JText::_("JLIB_FORM_BUTTON_CLEAR"); ?>"></a>
+		<?php endif; ?>
+	</div>
+	<?php if ($showPreview && !$showAsTooltip) : ?>
+		<div class="field-media-preview" style="width: <?php echo $previewWidth; ?>px; max-height: <?php echo $previewHeight; ?>px;margin-top:10px;"></div>
+	<?php endif; ?>
+</div>
diff --git a/core/templates/protostar/html/layouts/joomla/form/field/user.php b/core/templates/protostar/html/layouts/joomla/form/field/user.php
new file mode 100644
index 00000000..876729e2
--- /dev/null
+++ b/core/templates/protostar/html/layouts/joomla/form/field/user.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $repeat          Allows extensions to duplicate elements.
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   boolean  $spellcheck      Spellcheck state for the form field.
+ * @var   string   $validate        Validation rules to apply.
+ * @var   string   $value           Value attribute of the field.
+ * @var   array    $checkedOptions  Options that will be set as checked.
+ * @var   boolean  $hasValue        Has this field a value assigned?
+ * @var   array    $options         Options available for this field.
+ *
+ * @var   string   $userName        The user name
+ * @var   mixed    $groups          The filtering groups (null means no filtering)
+ * @var   mixed    $exclude         The users to exclude from the list of users
+ */
+
+// Set the link for the user selection page
+$link = 'index.php?option=com_users&amp;view=users&amp;layout=modal&amp;tmpl=component&amp;required='
+	. ($required ? 1 : 0) . '&amp;field={field-user-id}&amp;ismoo=0'
+	. (isset($groups) ? ('&amp;groups=' . base64_encode(json_encode($groups))) : '')
+	. (isset($excluded) ? ('&amp;excluded=' . base64_encode(json_encode($excluded))) : '');
+
+// Invalidate the input value if no user selected
+if (JText::_('JLIB_FORM_SELECT_USER') === htmlspecialchars($userName, ENT_COMPAT, 'UTF-8'))
+{
+	$userName = '';
+}
+
+if (!$readonly)
+{
+	JHtml::_('script', 'jui/fielduser.min.js', array('version' => 'auto', 'relative' => true));
+}
+?>
+<?php // Create a dummy text field with the user name. ?>
+<div class="field-user-wrapper"
+	data-url="<?php echo $link; ?>"
+	data-modal=".modal"
+	data-modal-width="100%"
+	data-modal-height="400px"
+	data-input=".field-user-input"
+	data-input-name=".field-user-input-name"
+	data-button-select=".button-select"
+	>
+	<div class="input-append">
+		<input
+			type="text" id="<?php echo $id; ?>"
+			value="<?php echo  htmlspecialchars($userName, ENT_COMPAT, 'UTF-8'); ?>"
+			placeholder="<?php echo JText::_('JLIB_FORM_SELECT_USER'); ?>"
+			readonly
+			class="field-user-input-name <?php echo $class ? (string) $class : ''?>"
+			<?php echo $size ? ' size="' . (int) $size . '"' : ''; ?>
+			<?php echo $required ? 'required' : ''; ?>/>
+		<?php if (!$readonly) : ?>
+			<a class="btn btn-primary button-select" title="<?php echo JText::_('JLIB_FORM_CHANGE_USER') ?>"><span class="icon-user"></span></a>
+			<?php echo JHtml::_(
+				'bootstrap.renderModal',
+				'userModal_' . $id,
+				array(
+					'title'  => JText::_('JLIB_FORM_CHANGE_USER'),
+					'closeButton' => true,
+					'footer' => '<a type="button" class="btn" data-dismiss="modal">' . JText::_('JCANCEL') . '</a>'
+				)
+			); ?>
+		<?php endif; ?>
+	</div>
+	<?php // Create the real field, hidden, that stored the user id. ?>
+	<?php if (!$readonly) : ?>
+		<input type="hidden" id="<?php echo $id; ?>_id" name="<?php echo $name; ?>" value="<?php echo (int) $value; ?>"
+			class="field-user-input <?php echo $class ? (string) $class : ''?>"
+			data-onchange="<?php echo $this->escape($onchange); ?>"/>
+	<?php endif; ?>
+</div>
diff --git a/core/templates/protostar/html/layouts/joomla/system/message.php b/core/templates/protostar/html/layouts/joomla/system/message.php
new file mode 100644
index 00000000..011e8a8b
--- /dev/null
+++ b/core/templates/protostar/html/layouts/joomla/system/message.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$msgList = $displayData['msgList'];
+
+$alert = array('error' => 'alert-error', 'warning' => '', 'notice' => 'alert-info', 'message' => 'alert-success');
+?>
+<div id="system-message-container">
+	<?php if (is_array($msgList) && !empty($msgList)) : ?>
+		<div id="system-message">
+			<?php foreach ($msgList as $type => $msgs) : ?>
+				<div class="alert <?php echo isset($alert[$type]) ? $alert[$type] : 'alert-' . $type; ?>">
+					<?php // This requires JS so we should add it through JS. Progressive enhancement and stuff. ?>
+					<a class="close" data-dismiss="alert">×</a>
+
+					<?php if (!empty($msgs)) : ?>
+						<h4 class="alert-heading"><?php echo JText::_($type); ?></h4>
+						<div>
+							<?php foreach ($msgs as $msg) : ?>
+								<div class="alert-message"><?php echo $msg; ?></div>
+							<?php endforeach; ?>
+						</div>
+					<?php endif; ?>
+				</div>
+			<?php endforeach; ?>
+		</div>
+	<?php endif; ?>
+</div>
diff --git a/core/templates/protostar/html/modules.php b/core/templates/protostar/html/modules.php
new file mode 100644
index 00000000..8a6296ea
--- /dev/null
+++ b/core/templates/protostar/html/modules.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This is a file to add template specific chrome to module rendering.  To use it you would
+ * set the style attribute for the given module(s) include in your template to use the style
+ * for each given modChrome function.
+ *
+ * eg. To render a module mod_test in the submenu style, you would use the following include:
+ * <jdoc:include type="module" name="test" style="submenu" />
+ *
+ * This gives template designers ultimate control over how modules are rendered.
+ *
+ * NOTICE: All chrome wrapping methods should be named: modChrome_{STYLE} and take the same
+ * two arguments.
+ */
+
+/*
+ * Module chrome for rendering the module in a submenu
+ */
+function modChrome_no($module, &$params, &$attribs)
+{
+	if ($module->content)
+	{
+		echo $module->content;
+	}
+}
+
+function modChrome_well($module, &$params, &$attribs)
+{
+	$moduleTag     = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
+	$bootstrapSize = (int) $params->get('bootstrap_size', 0);
+	$moduleClass   = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
+	$headerTag     = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
+	$headerClass   = htmlspecialchars($params->get('header_class', 'page-header'), ENT_COMPAT, 'UTF-8');
+
+	if ($module->content)
+	{
+		echo '<' . $moduleTag . ' class="well ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass . '">';
+
+			if ($module->showtitle)
+			{
+				echo '<' . $headerTag . ' class="' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
+			}
+
+			echo $module->content;
+		echo '</' . $moduleTag . '>';
+	}
+}
diff --git a/core/templates/protostar/html/pagination.php b/core/templates/protostar/html/pagination.php
new file mode 100644
index 00000000..88f40176
--- /dev/null
+++ b/core/templates/protostar/html/pagination.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This is a file to add template specific chrome to pagination rendering.
+ *
+ * pagination_list_footer
+ * 	Input variable $list is an array with offsets:
+ * 		$list[limit]		: int
+ * 		$list[limitstart]	: int
+ * 		$list[total]		: int
+ * 		$list[limitfield]	: string
+ * 		$list[pagescounter]	: string
+ * 		$list[pageslinks]	: string
+ *
+ * pagination_list_render
+ * 	Input variable $list is an array with offsets:
+ * 		$list[all]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[start]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[previous]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[next]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[end]
+ * 			[data]		: string
+ * 			[active]	: boolean
+ * 		$list[pages]
+ * 			[{PAGE}][data]		: string
+ * 			[{PAGE}][active]	: boolean
+ *
+ * pagination_item_active
+ * 	Input variable $item is an object with fields:
+ * 		$item->base	: integer
+ * 		$item->link	: string
+ * 		$item->text	: string
+ *
+ * pagination_item_inactive
+ * 	Input variable $item is an object with fields:
+ * 		$item->base	: integer
+ * 		$item->link	: string
+ * 		$item->text	: string
+ *
+ * This gives template designers ultimate control over how pagination is rendered.
+ *
+ * NOTE: If you override pagination_item_active OR pagination_item_inactive you MUST override them both
+ */
+
+/**
+ * Renders the pagination footer
+ *
+ * @param   array   $list  Array containing pagination footer
+ *
+ * @return  string         HTML markup for the full pagination footer
+ *
+ * @since   3.0
+ */
+function pagination_list_footer($list)
+{
+	$html = "<div class=\"pagination\">\n";
+	$html .= $list['pageslinks'];
+	$html .= "\n<input type=\"hidden\" name=\"" . $list['prefix'] . "limitstart\" value=\"" . $list['limitstart'] . "\" />";
+	$html .= "\n</div>";
+
+	return $html;
+}
+
+/**
+ * Renders the pagination list
+ *
+ * @param   array   $list  Array containing pagination information
+ *
+ * @return  string         HTML markup for the full pagination object
+ *
+ * @since   3.0
+ */
+function pagination_list_render($list)
+{
+	// Calculate to display range of pages
+	$currentPage = 1;
+	$range = 1;
+	$step = 5;
+	foreach ($list['pages'] as $k => $page)
+	{
+		if (!$page['active'])
+		{
+			$currentPage = $k;
+		}
+	}
+	if ($currentPage >= $step)
+	{
+		if ($currentPage % $step === 0)
+		{
+			$range = ceil($currentPage / $step) + 1;
+		}
+		else
+		{
+			$range = ceil($currentPage / $step);
+		}
+	}
+
+	$html  = '<nav role="navigation" aria-label="' . JText::_('JLIB_HTML_PAGINATION') . '">';
+	$html .= '<ul class="pagination-list">';
+	$html .= $list['start']['data'];
+	$html .= $list['previous']['data'];
+
+	foreach ($list['pages'] as $k => $page)
+	{
+		if ($k !== $currentPage && $k !== $range * $step - $step
+			&& ($k % $step === 0 || $k === $range * $step - ($step + 1))
+			&& in_array($k, range($range * $step - ($step + 1), $range * $step)))
+		{
+			$page['data'] = preg_replace('#(<a.*?>).*?(</a>)#', '$1...$2', $page['data']);
+		}
+
+		$html .= $page['data'];
+	}
+
+	$html .= $list['next']['data'];
+	$html .= $list['end']['data'];
+
+	$html .= '</ul>';
+	$html .= '</nav>';
+	return $html;
+}
+
+/**
+ * Renders an active item in the pagination block
+ *
+ * @param   JPaginationObject  $item  The current pagination object
+ *
+ * @return  string                    HTML markup for active item
+ *
+ * @since   3.0
+ */
+function pagination_item_active(&$item)
+{
+	$class = '';
+
+	// Check for "Start" item
+	if ($item->text === JText::_('JLIB_HTML_START'))
+	{
+		$display = '<span class="icon-first" aria-hidden="true"></span>';
+		$aria    = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+	}
+
+	// Check for "Prev" item
+	if ($item->text === JText::_('JPREV'))
+	{
+		$display = '<span class="icon-previous" aria-hidden="true"></span>';
+		$aria    = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+	}
+
+	// Check for "Next" item
+	if ($item->text === JText::_('JNEXT'))
+	{
+		$display = '<span class="icon-next" aria-hidden="true"></span>';
+		$aria    = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+	}
+
+	// Check for "End" item
+	if ($item->text === JText::_('JLIB_HTML_END'))
+	{
+		$display = '<span class="icon-last" aria-hidden="true"></span>';
+		$aria    = JText::sprintf('JLIB_HTML_GOTO_POSITION', strtolower($item->text));
+	}
+
+	// If the display object isn't set already, just render the item with its text
+	if (!isset($display))
+	{
+		$display = $item->text;
+		$aria    = JText::sprintf('JLIB_HTML_GOTO_PAGE', $item->text);
+		$class   = ' class="hidden-phone"';
+	}
+
+	return '<li' . $class . '><a title="' . $item->text . '" href="' . $item->link . '" class="pagenav" aria-label="' . $aria . '">' . $display . '</a></li>';
+
+}
+
+/**
+ * Renders an inactive item in the pagination block
+ *
+ * @param   JPaginationObject  $item  The current pagination object
+ *
+ * @return  string  HTML markup for inactive item
+ *
+ * @since   3.0
+ */
+function pagination_item_inactive(&$item)
+{
+	// Check for "Start" item
+	if ($item->text === JText::_('JLIB_HTML_START'))
+	{
+		return '<li class="disabled"><a><span class="icon-first" aria-hidden="true"></span></a></li>';
+	}
+
+	// Check for "Prev" item
+	if ($item->text === JText::_('JPREV'))
+	{
+		return '<li class="disabled"><a><span class="icon-previous" aria-hidden="true"></span></a></li>';
+	}
+
+	// Check for "Next" item
+	if ($item->text === JText::_('JNEXT'))
+	{
+		return '<li class="disabled"><a><span class="icon-next" aria-hidden="true"></span></a></li>';
+	}
+
+	// Check for "End" item
+	if ($item->text === JText::_('JLIB_HTML_END'))
+	{
+		return '<li class="disabled"><a><span class="icon-last" aria-hidden="true"></span></a></li>';
+	}
+
+	// Check if the item is the active page
+	if (isset($item->active) && $item->active)
+	{
+		$aria = JText::sprintf('JLIB_HTML_PAGE_CURRENT', $item->text);
+
+		return '<li class="active hidden-phone"><a aria-current="true" aria-label="' . $aria . '">' . $item->text . '</a></li>';
+	}
+
+	// Doesn't match any other condition, render a normal item
+	return '<li class="disabled hidden-phone"><a>' . $item->text . '</a></li>';
+}
diff --git a/core/templates/protostar/images/logo.png b/core/templates/protostar/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a37d147f31eafd7792bf95f5a616fe1f0e40bda
GIT binary patch
literal 9075
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

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/images/system/rating_star.png b/core/templates/protostar/images/system/rating_star.png
new file mode 100644
index 0000000000000000000000000000000000000000..30cc3b3cc1f61a3c1ada25add5607c0f13dde5f1
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)437#&FAr-f#p10+5a1dchkP=M4
z;63Mn;s*8w;;p+a8sbc>)^09f5M7iK_en)5|F6fsLvMV<oU4wx-E^_K%p3G6{let+
zsqALYJX#rq0tB2nt+g$K?{H>3aOD2oEw<;iujCo0!p4~Ie_IVS=GE;GVw<`y=OCA`
zOU|P+lh_nX9>f_<-y9(I!&!Fb_c=yZ*7x~Ck8O}yy!dn|&}|H!u6{1-oD!M<(>_V9

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/images/system/rating_star_blank.png b/core/templates/protostar/images/system/rating_star_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3068dc141716bfd3d20581989bda25f06383f90
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRKjh-%!Ar*|t4h-Ua;(RRpkxIu@
z*>)eXn_hdPWoOJjW<_zQ1BX;^9ld|_d}`C_dWAU*DL<KAbtGc0#9m`$4NwShkzJ&H
z_o;Erhi-4RO}sk`I%7gsKR=-QOo4mz&YIH7*N?bc@*8!`T3Y%~hlxuXc(a}O<mi!M
jX?*C$xgNbJ1u2FPd3H9pEcdSjI)=g1)z4*}Q$iB}N6bP>

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/images/system/sort_asc.png b/core/templates/protostar/images/system/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..677424496d7d35d1f4f1efd6d6d8a8d91b4c7879
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRK?w&4=Ar*{M``sBG6nT!mS`hb(
zC0t0T;LyDf>eeSYKbe2_X6SC}XJ~8e-@PpK_e3+>ON);7nPh)exg`{O;+B8N!k3Q!
b>*W|K_IEXV{GD_aXe5KDtDnm{r-UW|p{Xt_

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/images/system/sort_desc.png b/core/templates/protostar/images/system/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..c38b9803d21e13797940889b600f9c54a643a24a
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$0wn*`OvwRKex5FlAr*{M`&k(o40)IzC&Wn|
zoNB_U|Mcg)!adqcv+|#9Rx}bikYBT-w7YYDOw8RRsSg&bZ>?R)xO>IjnFm%x`6Ten
jI3Qu*+GP0W<sN3?%&z8BA@5~@CNp@t`njxgN@xNAk|Qr}

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/img/glyphicons-halflings-white.png b/core/templates/protostar/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7507bf61f46fc431a0753837429760eac46a3e9d
GIT binary patch
literal 8743
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
F{|BHqQ2+n{

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/img/glyphicons-halflings.png b/core/templates/protostar/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..f241c76f9adb78aba434bf3c7500fb894c12081a
GIT binary patch
literal 12600
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
ONUDmO3UzXpq5lK$2nJaI

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/index.php b/core/templates/protostar/index.php
new file mode 100644
index 00000000..4e336e1f
--- /dev/null
+++ b/core/templates/protostar/index.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app  = JFactory::getApplication();
+$user = JFactory::getUser();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Getting params from template
+$params = $app->getTemplate(true)->params;
+
+// Detecting Active Variables
+$option   = $app->input->getCmd('option', '');
+$view     = $app->input->getCmd('view', '');
+$layout   = $app->input->getCmd('layout', '');
+$task     = $app->input->getCmd('task', '');
+$itemid   = $app->input->getCmd('Itemid', '');
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
+
+if ($task === 'edit' || $layout === 'form')
+{
+	$fullWidth = 1;
+}
+else
+{
+	$fullWidth = 0;
+}
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add Stylesheets
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+
+// Use of Google Font
+if ($this->params->get('googleFont'))
+{
+	JHtml::_('stylesheet', 'https://fonts.googleapis.com/css?family=' . $this->params->get('googleFontName'));
+	$this->addStyleDeclaration("
+	h1, h2, h3, h4, h5, h6, .site-title {
+		font-family: '" . str_replace('+', ' ', $this->params->get('googleFontName')) . "', sans-serif;
+	}");
+}
+
+// Template color
+if ($this->params->get('templateColor'))
+{
+	$this->addStyleDeclaration('
+	body.site {
+		border-top: 3px solid ' . $this->params->get('templateColor') . ';
+		background-color: ' . $this->params->get('templateBackgroundColor') . ';
+	}
+	a {
+		color: ' . $this->params->get('templateColor') . ';
+	}
+	.nav-list > .active > a,
+	.nav-list > .active > a:hover,
+	.dropdown-menu li > a:hover,
+	.dropdown-menu .active > a,
+	.dropdown-menu .active > a:hover,
+	.nav-pills > .active > a,
+	.nav-pills > .active > a:hover,
+	.btn-primary {
+		background: ' . $this->params->get('templateColor') . ';
+	}');
+}
+
+// Check for a custom CSS file
+JHtml::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
+
+// Check for a custom js file
+JHtml::_('script', 'user.js', array('version' => 'auto', 'relative' => true));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Adjusting content width
+$position7ModuleCount = $this->countModules('position-7');
+$position8ModuleCount = $this->countModules('position-8');
+
+if ($position7ModuleCount && $position8ModuleCount)
+{
+	$span = 'span6';
+}
+elseif ($position7ModuleCount && !$position8ModuleCount)
+{
+	$span = 'span9';
+}
+elseif (!$position7ModuleCount && $position8ModuleCount)
+{
+	$span = 'span9';
+}
+else
+{
+	$span = 'span12';
+}
+
+// Logo file or site title param
+if ($this->params->get('logoFile'))
+{
+	$logo = '<img src="' . JUri::root() . $this->params->get('logoFile') . '" alt="' . $sitename . '" />';
+}
+elseif ($this->params->get('sitetitle'))
+{
+	$logo = '<span class="site-title" title="' . $sitename . '">' . htmlspecialchars($this->params->get('sitetitle'), ENT_COMPAT, 'UTF-8') . '</span>';
+}
+else
+{
+	$logo = '<span class="site-title" title="' . $sitename . '">' . $sitename . '</span>';
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<jdoc:include type="head" />
+</head>
+<body class="site <?php echo $option
+	. ' view-' . $view
+	. ($layout ? ' layout-' . $layout : ' no-layout')
+	. ($task ? ' task-' . $task : ' no-task')
+	. ($itemid ? ' itemid-' . $itemid : '')
+	. ($params->get('fluidContainer') ? ' fluid' : '')
+	. ($this->direction === 'rtl' ? ' rtl' : '');
+?>">
+	<!-- Body -->
+	<div class="body" id="top">
+		<div class="container<?php echo ($params->get('fluidContainer') ? '-fluid' : ''); ?>">
+			<!-- Header -->
+			<header class="header" role="banner">
+				<div class="header-inner clearfix">
+					<a class="brand pull-left" href="<?php echo $this->baseurl; ?>/">
+						<?php echo $logo; ?>
+						<?php if ($this->params->get('sitedescription')) : ?>
+							<?php echo '<div class="site-description">' . htmlspecialchars($this->params->get('sitedescription'), ENT_COMPAT, 'UTF-8') . '</div>'; ?>
+						<?php endif; ?>
+					</a>
+					<div class="header-search pull-right">
+						<jdoc:include type="modules" name="position-0" style="none" />
+					</div>
+				</div>
+			</header>
+			<?php if ($this->countModules('position-1')) : ?>
+				<nav class="navigation" role="navigation">
+					<div class="navbar pull-left">
+						<a class="btn btn-navbar collapsed" data-toggle="collapse" data-target=".nav-collapse">
+							<span class="element-invisible"><?php echo JTEXT::_('TPL_PROTOSTAR_TOGGLE_MENU'); ?></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+							<span class="icon-bar"></span>
+						</a>
+					</div>
+					<div class="nav-collapse">
+						<jdoc:include type="modules" name="position-1" style="none" />
+					</div>
+				</nav>
+			<?php endif; ?>
+			<jdoc:include type="modules" name="banner" style="xhtml" />
+			<div class="row-fluid">
+				<?php if ($position8ModuleCount) : ?>
+					<!-- Begin Sidebar -->
+					<div id="sidebar" class="span3">
+						<div class="sidebar-nav">
+							<jdoc:include type="modules" name="position-8" style="xhtml" />
+						</div>
+					</div>
+					<!-- End Sidebar -->
+				<?php endif; ?>
+				<main id="content" role="main" class="<?php echo $span; ?>">
+					<!-- Begin Content -->
+					<jdoc:include type="modules" name="position-3" style="xhtml" />
+					<jdoc:include type="message" />
+					<jdoc:include type="component" />
+					<div class="clearfix"></div>
+					<jdoc:include type="modules" name="position-2" style="none" />
+					<!-- End Content -->
+				</main>
+				<?php if ($position7ModuleCount) : ?>
+					<div id="aside" class="span3">
+						<!-- Begin Right Sidebar -->
+						<jdoc:include type="modules" name="position-7" style="well" />
+						<!-- End Right Sidebar -->
+					</div>
+				<?php endif; ?>
+			</div>
+		</div>
+	</div>
+	<!-- Footer -->
+	<footer class="footer" role="contentinfo">
+		<div class="container<?php echo ($params->get('fluidContainer') ? '-fluid' : ''); ?>">
+			<hr />
+			<jdoc:include type="modules" name="footer" style="none" />
+			<p class="pull-right">
+				<a href="#top" id="back-top">
+					<?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?>
+				</a>
+			</p>
+			<p>
+				&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+			</p>
+		</div>
+	</footer>
+	<jdoc:include type="modules" name="debug" style="none" />
+</body>
+</html>
diff --git a/core/templates/protostar/js/application.js b/core/templates/protostar/js/application.js
new file mode 100644
index 00000000..783c73ed
--- /dev/null
+++ b/core/templates/protostar/js/application.js
@@ -0,0 +1,7 @@
+$('.dropdown-toggle').dropdown()
+$('.collapse').collapse('show')
+$('#myModal').modal('hide')
+$('.typeahead').typeahead()
+$('.tabs').button()
+$('.tip').tooltip()
+$(".alert-message").alert()
\ No newline at end of file
diff --git a/core/templates/protostar/js/classes.js b/core/templates/protostar/js/classes.js
new file mode 100644
index 00000000..d3a2449b
--- /dev/null
+++ b/core/templates/protostar/js/classes.js
@@ -0,0 +1,45 @@
+// Add classes
+
+window.onload=function() {
+var input = document.getElementsByTagName("input");
+for (var i = 0; i < input.length; i++) {
+    if (input[i].className === 'button') {
+        input[i].className = 'btn btn-primary';
+    }
+}
+
+var button = document.getElementsByTagName("button");
+for (var i = 0; i < input.length; i++) {
+    if (button[i].className === 'button') {
+        button[i].className = 'btn btn-primary';
+    }
+}
+
+var p = document.getElementsByTagName("p");
+for (var i = 0; i < p.length; i++) {
+    if (p[i].className === 'readmore') {
+        p[i].className = 'btn';
+    }
+}
+
+var table = document.getElementsByTagName("table");
+for (var i = 0; i < table.length; i++) {
+    if (table[i].className === 'category') {
+        table[i].className = 'table table-striped';
+    }
+}
+
+var ul = document.getElementsByTagName("ul");
+for (var i = 0; i < ul.length; i++) {
+    if (ul[i].className === 'actions') {
+        ul[i].className = 'nav nav-pills';
+    }
+}
+
+var ul = document.getElementsByTagName("ul");
+for (var i = 0; i < ul.length; i++) {
+    if (ul[i].className === 'pagenav') {
+        ul[i].className = 'pagination';
+    }
+}
+};
\ No newline at end of file
diff --git a/core/templates/protostar/js/template.js b/core/templates/protostar/js/template.js
new file mode 100644
index 00000000..464acc89
--- /dev/null
+++ b/core/templates/protostar/js/template.js
@@ -0,0 +1,74 @@
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       3.2
+ */
+
+jQuery(function($) {
+	"use strict";
+
+	$(document)
+		.on('click', ".btn-group label:not(.active)", function() {
+			var $label = $(this);
+			var $input = $('#' + $label.attr('for'));
+
+			if ($input.prop('checked')) {
+				return;
+			}
+
+			$label.closest('.btn-group').find("label").removeClass('active btn-success btn-danger btn-primary');
+
+			var btnClass = 'primary';
+
+
+			if ($input.val() != '')
+			{
+				var reversed = $label.closest('.btn-group').hasClass('btn-group-reversed');
+				btnClass = ($input.val() == 0 ? !reversed : reversed) ? 'danger' : 'success';
+			}
+
+			$label.addClass('active btn-' + btnClass);
+			$input.prop('checked', true).trigger('change');
+		})
+		.on('click', '#back-top', function (e) {
+			e.preventDefault();
+			$("html, body").animate({scrollTop: 0}, 1000);
+		})
+		.on('subform-row-add', initButtonGroup)
+		.on('subform-row-add', initTooltip);
+
+	initButtonGroup();
+	initTooltip();
+
+	// Called once on domready, again when a subform row is added
+	function initTooltip(event, container)
+	{
+		$(container || document).find('*[rel=tooltip]').tooltip();
+	}
+
+	// Called once on domready, again when a subform row is added
+	function initButtonGroup(event, container)
+	{
+		var $container = $(container || document);
+
+		// Turn radios into btn-group
+		$container.find('.radio.btn-group label').addClass('btn');
+
+		$container.find(".btn-group input:checked").each(function()
+		{
+			var $input  = $(this);
+			var $label = $('label[for=' + $input.attr('id') + ']');
+			var btnClass = 'primary';
+
+			if ($input.val() != '')
+			{
+				var reversed = $input.parent().hasClass('btn-group-reversed');
+				btnClass = ($input.val() == 0 ? !reversed : reversed) ? 'danger' : 'success';
+			}
+
+			$label.addClass('active btn-' + btnClass);
+		});
+	}
+});
diff --git a/core/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini b/core/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
new file mode 100644
index 00000000..74cc2ade
--- /dev/null
+++ b/core/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
@@ -0,0 +1,24 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
+
+TPL_PROTOSTAR_BACKGROUND_COLOR_DESC="Choose a background colour for static layouts. If left blank the Default (#f4f6f7) is used."
+TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL="Background Colour"
+TPL_PROTOSTAR_BACKTOTOP="Back to Top"
+TPL_PROTOSTAR_COLOR_DESC="Choose an overall colour for the site template. If left blank the Default (#0088cc) is used."
+TPL_PROTOSTAR_COLOR_LABEL="Template Colour"
+TPL_PROTOSTAR_FLUID="Fluid"
+TPL_PROTOSTAR_FLUID_LABEL="Fluid Layout"
+TPL_PROTOSTAR_FLUID_DESC="Use Bootstrap's fluid or static container (both are responsive)."
+TPL_PROTOSTAR_FONT_LABEL="Google Font for Headings"
+TPL_PROTOSTAR_FONT_DESC="Load a Google font for the headings (H1, H2, H3, etc)."
+TPL_PROTOSTAR_FONT_NAME_LABEL="Google Font Name"
+TPL_PROTOSTAR_FONT_NAME_DESC="Example: Open+Sans or Source+Sans+Pro."
+TPL_PROTOSTAR_LOGO_LABEL="Logo"
+TPL_PROTOSTAR_LOGO_DESC="Select or upload a custom logo for the site template."
+TPL_PROTOSTAR_STATIC="Static"
+TPL_PROTOSTAR_TOGGLE_MENU="Toggle Navigation"
+
diff --git a/core/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini b/core/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
new file mode 100644
index 00000000..45c0a8d0
--- /dev/null
+++ b/core/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -0,0 +1,25 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_PROTOSTAR_POSITION_BANNER="Banner"
+TPL_PROTOSTAR_POSITION_DEBUG="Debug"
+TPL_PROTOSTAR_POSITION_POSITION-0="Search"
+TPL_PROTOSTAR_POSITION_POSITION-10="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-11="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-12="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-13="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-14="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-15="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-1="Navigation"
+TPL_PROTOSTAR_POSITION_POSITION-2="Breadcrumbs"
+TPL_PROTOSTAR_POSITION_POSITION-3="Top center"
+TPL_PROTOSTAR_POSITION_POSITION-4="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-5="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-6="Unused"
+TPL_PROTOSTAR_POSITION_POSITION-7="Right"
+TPL_PROTOSTAR_POSITION_POSITION-8="Left"
+TPL_PROTOSTAR_POSITION_POSITION-9="Unused"
+TPL_PROTOSTAR_POSITION_FOOTER="Footer"
+TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)."
diff --git a/core/templates/protostar/less/icomoon.less b/core/templates/protostar/less/icomoon.less
new file mode 100644
index 00000000..a014b4eb
--- /dev/null
+++ b/core/templates/protostar/less/icomoon.less
@@ -0,0 +1,11 @@
+@font-face {
+	font-family: 'IcoMoon';
+	src: url('../../../media/jui/fonts/IcoMoon.eot');
+	src: url('../../../media/jui/fonts/IcoMoon.eot?#iefix') format('embedded-opentype'),
+	url('../../../media/jui/fonts/IcoMoon.woff') format('woff'),
+	url('../../../media/jui/fonts/IcoMoon.ttf') format('truetype'),
+	url('../../../media/jui/fonts/IcoMoon.svg#IcoMoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+@import "../../../media/jui/less/icomoon.less";
diff --git a/core/templates/protostar/less/template.less b/core/templates/protostar/less/template.less
new file mode 100644
index 00000000..335a9bfa
--- /dev/null
+++ b/core/templates/protostar/less/template.less
@@ -0,0 +1,743 @@
+// CSS Reset
+@import "../../../media/jui/less/reset.less";
+
+// Core variables and mixins
+@import "variables.less"; // Custom for this template
+@import "../../../media/jui/less/mixins.less";
+
+// Grid system and page structure
+@import "../../../media/jui/less/scaffolding.less";
+@import "../../../media/jui/less/grid.less";
+@import "../../../media/jui/less/layouts.less";
+
+// Base CSS
+@import "../../../media/jui/less/type.less";
+@import "../../../media/jui/less/code.less";
+@import "../../../media/jui/less/forms.less";
+@import "../../../media/jui/less/tables.less";
+
+// Components: common
+// @import "../../../media/jui/less/sprites.less";
+@import "../../../media/jui/less/dropdowns.less";
+@import "../../../media/jui/less/wells.less";
+@import "../../../media/jui/less/component-animations.less";
+@import "../../../media/jui/less/close.less";
+
+// Components: Buttons & Alerts
+@import "../../../media/jui/less/buttons.less";
+@import "../../../media/jui/less/button-groups.less";
+@import "../../../media/jui/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "../../../media/jui/less/navs.less";
+@import "../../../media/jui/less/navbar.less";
+@import "../../../media/jui/less/breadcrumbs.less";
+@import "../../../media/jui/less/pagination.less";
+@import "../../../media/jui/less/pager.less";
+
+// Components: Popovers
+@import "../../../media/jui/less/modals.less";
+@import "../../../media/jui/less/tooltip.less";
+@import "../../../media/jui/less/popovers.less";
+
+// Components: Misc
+@import "../../../media/jui/less/thumbnails.less";
+@import "../../../media/jui/less/labels-badges.less";
+@import "../../../media/jui/less/progress-bars.less";
+@import "../../../media/jui/less/accordion.less";
+@import "../../../media/jui/less/carousel.less";
+@import "../../../media/jui/less/hero-unit.less";
+
+// Utility classes
+@import "../../../media/jui/less/utilities.less";
+
+// RESPONSIVE CLASSES
+// ------------------
+
+@import "../../../media/jui/less/responsive-utilities.less";
+
+
+// MEDIA QUERIES
+// ------------------
+
+// Phones to portrait tablets and narrow desktops
+@import "../../../media/jui/less/responsive-767px-max.less";
+
+// Tablets to regular desktops
+@import "../../../media/jui/less/responsive-768px-979px.less";
+
+// Large desktops
+@import "../../../media/jui/less/responsive-1200px-min.less";
+
+
+// RESPONSIVE NAVBAR
+// ------------------
+
+// From 979px and below, show a button to toggle navbar contents
+@import "../../../media/jui/less/responsive-navbar.less";
+
+// Extended for JUI
+@import "../../../media/jui/less/bootstrap-extended.less"; // Has to be last to override when necessary
+// div.modal (instead of .modal)
+@import "../../../media/jui/less/modals.joomla.less";
+@import "../../../media/jui/less/responsive-767px-max.joomla.less";
+
+// Icon Font
+@import "icomoon.less";
+
+/* Site Body Styles */
+body {
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+body.site{
+	border-top:3px solid #0088cc;
+	padding: 20px;
+	background-color: #f4f6f7;
+}
+body.site.fluid{
+	background-color: #ffffff;
+}
+.thumbnail {
+	margin-bottom:9px;
+}
+.accordion-group {
+	background:#fff;
+}
+/* Site Title (if no logo) */
+.site-title {
+	font-size: 40px;
+	font-size: calc(~"16px + 2.16vw");
+	line-height: 48px;
+	font-weight: bold;
+}
+@media (min-width: 1024px) {
+	.site-title {
+		font-size: 40px;
+	}
+}
+.brand {
+	color: darken(@linkColor, 20%);
+	.transition(color .5s linear);
+}
+.brand:hover {
+	color: @linkColor;
+	text-decoration: none;
+}
+/* Header */
+.header{
+	margin-bottom: 10px;
+}
+.header .finder {
+	margin-top: 14px;
+}
+.header .finder .btn{
+	margin-top: 0px;
+}
+/* Nav */
+.navigation{
+	padding: 5px 0;
+	border-top: 1px solid rgba(0, 0, 0, 0.075);
+	border-bottom: 1px solid rgba(0, 0, 0, 0.075);
+	margin-bottom: 10px;
+}
+.navigation .nav-pills{
+	margin-bottom: 0;
+}
+/* Hero Banner Unit */
+.hero-unit{
+	background-color: #08C;
+}
+.hero-unit > *{
+	color: white;
+	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+}
+/* Container */
+.container{
+	max-width: 960px;
+}
+.body .container{
+	background-color: #fff;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	padding: 20px;
+	border: 1px solid rgba(0, 0, 0, 0.15);
+	-moz-box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.05);
+	-webkit-box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.05);
+	box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.05);
+}
+/* Wells */
+.well .page-header{
+	margin: 0px 0px 5px 0px;
+}
+/* Headings */
+
+h1, h2, h3, h4, h5, h6 {
+  	margin: (@baseLineHeight / 1.5) 0;
+	word-wrap: break-word;
+}
+h1 { font-size: 26px; line-height: 28px; }
+h2 { font-size: 22px; line-height: 24px; }
+h3 { font-size: 18px; line-height: 20px; }
+h4 { font-size: 14px; line-height: 16px; }
+h5 { font-size: 13px; line-height: 15px; }
+h6 { font-size: 12px; line-height: 14px; }
+/* Module */
+.module-header {
+	padding-bottom: 17px;
+	margin: 20px 0 18px 0;
+	border-bottom: 1px solid #eeeeee;
+}
+/* Single Item */
+p {
+	word-wrap: break-word;
+}
+.item-title {
+	margin-bottom:9px;
+}
+.item-content {
+	margin:18px 0;
+}
+.item-subtitle {
+	margin-bottom:9px;
+}
+.pull-right.item-image {
+	margin:0 0 18px 20px;
+}
+.pull-left.item-image {
+	margin:0 20px 18px 0;
+}
+.header .nav > li:last-child > .dropdown-menu,
+.item-actions .dropdown-menu,
+.item-comment .dropdown-menu {
+	left:initial;
+	right:0;
+}
+.article-index {
+	margin:0 0 10px 10px;
+}
+/* List */
+.list-item-title {
+	margin-bottom:9px;
+}
+.list-item-content {
+	margin:18px 0;
+}
+.list-item-subtitle {
+	margin-bottom:9px;
+}
+/* More Items */
+.items-more,
+.content-links {
+	padding: 15px 0;
+}
+/* Breadcrumbs */
+.breadcrumb {
+	margin: 10px 0;
+}
+.breadcrumb > li,
+.breadcrumb > .active {
+   color: #515151;
+}
+/* mod_login */
+#login-form {
+	margin-top: 8px;
+}
+.add-on {
+	+ #modlgn-username, + #modlgn-passwd {
+		width: 132px;
+	}
+}
+/* Caption fixes */
+.img_caption .left {
+	float: left;
+	margin-right: 1em;
+}
+
+.img_caption .right {
+	float: right;
+	margin-left: 1em;
+}
+
+.img_caption .left p {
+	clear: left;
+	text-align: center;
+}
+
+.img_caption .right p {
+	clear: right;
+	text-align: center;
+}
+
+.img_caption  {
+	text-align: center!important;
+}
+
+.img_caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+/* New captions */
+figure {
+	display: table;
+}
+figure.pull-center,
+img.pull-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+figcaption {
+	display: table-caption;
+	caption-side: bottom;
+}
+/* Aside Subnavs */
+#aside .nav .nav-child {
+	border-left: 2px solid @tableBorder;
+	padding-left: 5px;
+}
+/* Navigation Submenus */
+// The dropdown menu (ul)
+// ----------------------
+.navigation {
+	.nav-child {
+		position: absolute;
+		top: 95%;
+		left: 0;
+		z-index: @zindexDropdown;
+		display: none; // none by default, but block on "open" of the menu
+		float: left;
+		min-width: 160px;
+		padding: 5px 0;
+		margin: 2px 0 0; // override default ul
+		list-style: none;
+		background-color: @dropdownBackground;
+		border: 1px solid #ccc; // Fallback for IE7-8
+		border: 1px solid @dropdownBorder;
+		*border-right-width: 2px;
+		*border-bottom-width: 2px;
+		.border-radius(6px);
+		.box-shadow(0 5px 10px rgba(0,0,0,.2));
+		-webkit-background-clip: padding-box;
+		 -moz-background-clip: padding;
+		      background-clip: padding-box;
+
+		// Aligns the dropdown menu to right
+		&.pull-right {
+			right: 0;
+			left: auto;
+		}
+
+		// Dividers (basically an hr) within the dropdown
+		.divider {
+			.nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
+		}
+
+		// Links within the dropdown menu
+		a {
+			display: block;
+			padding: 3px 20px;
+			clear: both;
+			font-size: @baseFontSize;
+			font-weight: normal;
+			line-height: @baseLineHeight;
+			color: @dropdownLinkColor;
+			white-space: nowrap;
+		}
+	}
+	.nav li {
+		position: relative;
+	}
+	.nav > li:hover > .nav-child,
+	.nav > li > a:focus + .nav-child,
+	.nav li li:hover > .nav-child,
+	.nav li li > a:focus + .nav-child {
+		display: block;
+	}
+	.nav > li {
+		&:before {
+		  position: absolute;
+		  top: 100%;
+		  right: 0;
+		  left: 0;
+		  height: 6px;
+		  content: '';
+		}
+	}
+	.nav > li > .nav-child {
+		&:before {
+		  position: absolute;
+		  top: -7px;
+		  left: 9px;
+		  display: inline-block;
+		  border-right: 7px solid transparent;
+		  border-bottom: 7px solid #ccc;
+		  border-left: 7px solid transparent;
+		  border-bottom-color: rgba(0, 0, 0, 0.2);
+		  content: '';
+		}
+		&:after {
+		  position: absolute;
+		  top: -6px;
+		  left: 10px;
+		  display: inline-block;
+		  border-right: 6px solid transparent;
+		  border-bottom: 6px solid #ffffff;
+		  border-left: 6px solid transparent;
+		  content: '';
+		}
+	}
+	.nav li li .nav-child {
+		top: -8px;
+		left: 100%;
+
+		&:before {
+			position: absolute;
+			top: 9px;
+			left: -7px;
+			display: inline-block;
+			border-top: 7px solid transparent;
+			border-right: 7px solid rgba(0, 0, 0, 0.2);
+			border-bottom: 7px solid transparent;
+			content: '';
+		}
+		&:after {
+			position: absolute;
+			top: 10px;
+			left: -6px;
+			display: inline-block;
+			border-top: 6px solid transparent;
+			border-right: 6px solid #ffffff;
+			border-bottom: 6px solid transparent;
+			content: '';
+		}
+	}
+}
+
+// Hover state
+// -----------
+.navigation .nav-child li > a:hover,
+.navigation .nav-child li > a:focus,
+.navigation .nav-child:hover > a {
+  text-decoration: none;
+  color: @dropdownLinkColorHover;
+  background-color: @dropdownLinkBackgroundHover;
+  #gradient > .vertical(@dropdownLinkBackgroundHover, darken(@dropdownLinkBackgroundHover, 5%));
+}
+
+// Category collapse
+.categories-list .collapse {
+	margin-left: 20px;
+}
+@media (max-width: 480px) {
+	.item-info > span {
+		display:block;
+	}
+	.blog-item .pull-right.item-image {
+		margin:0 0 18px 0;
+	}
+	.blog-item .pull-left.item-image {
+		margin:0 0 18px 0;
+		float:none;
+	}
+}
+@media (max-width: 768px) {
+  /* Fix ios scrolling inside boottrap modals */
+	body {
+		-webkit-overflow-scrolling: touch;
+		padding-top: 0;
+	}
+	.header {
+		background:transparent;
+	}
+	.header .brand {
+		float:none;
+		display:block;
+		text-align:center;
+	}
+	.header .nav.pull-right,
+	.header-search {
+		float:none;
+		display:block;
+	}
+	.header-search form {
+		margin: 0;
+	}
+	.header-search .search-query {
+		width: 90%;
+	}
+	.header .nav-pills > li > a {
+		border: 1px solid @tableBorder;
+		border-bottom:0;
+		margin:0;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		margin-right: 0;
+	}
+	.header .nav-pills > li:first-child > a {
+		-webkit-border-radius: 4px 4px 0 0;
+		-moz-border-radius: 4px 4px 0 0;
+		border-radius: 4px 4px 0 0;
+	}
+	.header .nav-pills > li:last-child > a {
+		-webkit-border-radius: 0 0 4px 4px;
+		-moz-border-radius: 0 0 4px 4px;
+		border-radius: 0 0 4px 4px;
+		border-bottom:1px solid @tableBorder;
+	}
+	.modal.fade {
+		top:-100%;
+	}
+	.nav-tabs {
+		border-bottom: 0;
+	}
+	.nav-tabs > li {
+		float: none;
+	}
+	.nav-tabs > li > a {
+		border: 1px solid @tableBorder;
+		-webkit-border-radius: 0;
+		-moz-border-radius: 0;
+		border-radius: 0;
+		margin-right: 0;
+	}
+	.nav-tabs > li:first-child > a {
+		-webkit-border-radius: 4px 4px 0 0;
+		-moz-border-radius: 4px 4px 0 0;
+		border-radius: 4px 4px 0 0;
+	}
+	.nav-tabs > li:last-child > a, .nav-tabs > .active:last-child > a {
+		-webkit-border-radius: 0 0 4px 4px;
+		-moz-border-radius: 0 0 4px 4px;
+		border-radius: 0 0 4px 4px;
+		border-bottom:1px solid @tableBorder;
+	}
+	.nav-tabs > li > a:hover {
+		border-color: @tableBorder;
+		z-index: 2;
+	}
+	.nav-tabs.nav-dark > li > a {
+		border: 1px solid @grayDark;
+	}
+	.nav-tabs > li:last-child > a, .nav-tabs > .active:last-child > a {
+		border-bottom:1px solid @grayDark;
+	}
+	.nav-tabs.nav-dark > li > a:hover {
+		border-color: @grayDark;
+	}
+	.nav-pills > li {
+		float: none;
+	}
+	.nav-pills > li > a {
+		margin-right: 0;
+	}
+	.nav-pills > li > a {
+		margin-bottom: 3px;
+	}
+	.nav-pills  > li:last-child > a {
+		margin-bottom: 1px;
+	}
+	.form-search > .pull-left,
+	.form-search > .pull-right {
+		float:none;
+		display:block;
+		margin-bottom:9px;
+	}
+}
+@media (max-width: 980px) {
+	.navbar-fixed-top {
+		margin-bottom:0!important;
+	}
+	.item-comment .item-image{
+		display:none;
+	}
+	.well {
+		padding: 10px;
+	}
+}
+@media (max-width: 979px) {
+	.nav-collapse.in.collapse {
+		overflow: visible;
+		height: 0;
+		z-index: 100;
+	}
+	.nav-collapse .nav > li.active > a {
+		color: #fff;
+	}
+	.nav-collapse .nav > li.active > a:hover {
+		color: #555;
+	}
+}
+@media (min-width: 768px) and (max-width: 979px) {
+	#login-form .input-small {
+		width: 62px;
+	}
+}
+// Page break
+dl.tabs {
+	float: left;
+	margin-bottom: -1px;
+}
+dl.tabs dt.tabs {
+	float: left;
+	margin-left: 3px;
+	padding: 4px 10px;
+	background-color: #F0F0F0;
+	border-top: 1px solid #CCC;
+	border-left: 1px solid #CCC;
+	border-right: 1px solid #CCC;
+}
+dl.tabs dt:hover {
+	background-color: #F9F9F9;
+}
+dl.tabs dt.open {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+}
+dl.tabs dt.tabs h3 {
+	margin: 0;
+	font-size: 1.1em;
+	font-weight: normal;
+}
+dl.tabs dt.tabs h3 a {
+	color: #0088CC;
+}
+dl.tabs dt.tabs h3 a:hover {
+	color: #005580;
+	text-decoration: none;
+}
+dl.tabs dt.open h3 a {
+	color: #000;
+	text-decoration: none;
+}
+div.current dd.tabs {
+	margin: 0;
+	padding: 10px;
+	clear: both;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+}
+
+/* Help site refresh button*/
+#helpsite-refresh {
+	vertical-align: top;
+}
+
+/*Print pop-up*/
+#pop-print {
+	float: right;
+	margin: 10px;
+}
+
+/*Code white space*/
+code {
+	white-space: pre-wrap;
+}
+
+/*Search filter*/
+#filter-search {
+	vertical-align: top;
+}
+
+/*Fix for editor buttons having a stupid height*/
+.editor {
+	overflow: hidden;
+	position: relative;
+}
+
+/* Com_search highlighting */
+.search span.highlight {
+	background-color:#FFFFCC;
+	font-weight:bold;
+	padding:1px 0;
+}
+
+/* Com_search break long titles & text */
+dt.result-title {
+	word-wrap: break-word;
+}
+
+dd.result-text {
+	word-wrap: break-word;
+}
+
+/* Prevent scrolling on the parent window of a modal */
+body.modal-open {
+  overflow: hidden;
+  -ms-overflow-style: none;
+}
+
+/* Align fields for the profile display */
+#users-profile-custom label {
+	display: inline;
+}
+
+/* Remove unneeded space between label and field in vertical forms */
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+	padding-top: 0;
+
+	.form-horizontal & {
+		padding-top: 5px;
+	}
+}
+
+/* Align btn-group to label */
+.form-horizontal .controls > .radio.btn-group:first-child {
+	padding-top: 0;
+}
+
+/* Corrects the modals padding */
+.field-media-wrapper .modal .modal-body {
+	padding: 5px 10px;
+	overflow: hidden;
+}
+/* Getting rid of scroll bar in smartsearch Advanced search */
+#search-results {
+	clear: both;
+}
+#finder-filter-window {
+	overflow: visible;
+}
+#finder-search .in.collapse {
+	overflow: visible;
+}
+
+/* Fix for select element overflow on browser resizing */
+.well {
+	select,
+	.chzn-container {
+		max-width: 100%;
+	}
+}
+
+/* Component pop-up */
+.container-popup {
+	padding: 28px 10px 10px 10px;
+}
+li {
+	word-wrap: break-word;
+}
+
+ul.manager .height-50 .icon-folder-2 {
+    height: 35px;
+    width: 35px;
+    line-height: 35px;
+    font-size: 30px;
+}
+/* Popover minimum height - overwrite bootstrap default */
+.popover-content {
+    min-height: 33px;
+}
+
+/* Smart search select field margin */
+.finder-selects {
+    margin: 0 15px 15px 0;
+}
+
+/* mod_search in position-0 */
+.header-search .mod-languages ul {
+	margin: 0 0 5px 0;
+	}
+@import "template_rtl.less"; // Specific for rtl. Always load last.
\ No newline at end of file
diff --git a/core/templates/protostar/less/template_rtl.less b/core/templates/protostar/less/template_rtl.less
new file mode 100644
index 00000000..e4959422
--- /dev/null
+++ b/core/templates/protostar/less/template_rtl.less
@@ -0,0 +1,30 @@
+// Specific RTL. rtl class is added to body tag
+
+// Fix for sub menu alignment
+.rtl .navigation .nav-child {
+	left: auto;
+	right:0;
+}
+.rtl .navigation .nav > li > .nav-child:before {
+	left: auto;
+	right:12px;
+}
+.rtl .navigation .nav > li > .nav-child:after {
+	left: auto;
+	right:13px;
+}
+
+// Category collapse
+.rtl .categories-list .collapse {
+	margin: 0 20px 0 0;
+}
+
+// Modal footer
+.rtl .modal-footer button {
+	float: left;
+}
+
+// Smart search select field margin
+.rtl .finder-selects {
+    margin: 0 0 15px 15px;
+}
\ No newline at end of file
diff --git a/core/templates/protostar/less/variables.less b/core/templates/protostar/less/variables.less
new file mode 100644
index 00000000..438bdb4a
--- /dev/null
+++ b/core/templates/protostar/less/variables.less
@@ -0,0 +1,307 @@
+//
+// Variables
+// --------------------------------------------------
+
+
+// Global values
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black:                 #000;
+@grayDarker:            #222;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+
+// Accent colors
+// -------------------------
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor:             #005e8d;
+@linkColorHover:        darken(@linkColor, 15%);
+
+
+// Typography
+// -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
+
+// > Joomla JUI
+@baseFontSize:          13px;
+// < Joomla JUI
+@baseFontFamily:        @sansFontFamily;
+// > Joomla JUI
+@baseLineHeight:        18px;
+// < Joomla JUI
+@altFontFamily:         @serifFontFamily;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+// > Joomla JUI
+@fontSizeSmall:         ceil(@baseFontSize * 0.90); // ~12px
+// < Joomla JUI
+@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+@paddingLarge:          11px 19px; // 44px
+@paddingSmall:          2px 10px;  // 26px
+@paddingMini:           0 6px;   // 22px
+
+@baseBorderRadius:      4px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             #f9f9f9; // for striping
+@tableBackgroundHover:              #f5f5f5; // for hover
+@tableBorder:                       #ddd; // table and cell border
+
+// Buttons
+// -------------------------
+@btnBackground:                     @white;
+@btnBackgroundHighlight:            darken(@white, 10%);
+@btnBorder:                         #bbb;
+
+@btnPrimaryBackground:              @linkColor;
+@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
+
+@btnInfoBackground:                 #5bc0de;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              #62c462;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               #ee5f5b;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              #444;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground:               @white;
+@inputBorder:                   #ccc;
+@inputBorderRadius:             3px;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         #f5f5f5;
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @white;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownDividerTop:            #e5e5e5;
+@dropdownDividerBottom:         @white;
+
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkColorActive:       @dropdownLinkColor;
+
+@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
+@dropdownLinkBackgroundActive:  @linkColor;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexTooltip:           1030;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+@zindexPopover:           1060;
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                @grayLighter;
+
+
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
+// Wells
+// -------------------------
+@wellBackground:                  #f5f5f5;
+
+
+// Navbar
+// -------------------------
+@navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
+
+@navbarHeight:                    40px;
+@navbarBackgroundHighlight:       #ffffff;
+@navbarBackground:                darken(@navbarBackgroundHighlight, 5%);
+@navbarBorder:                    darken(@navbarBackground, 12%);
+
+@navbarText:                      @gray;
+@navbarLinkColor:                 @gray;
+@navbarLinkColorHover:            @grayDark;
+@navbarLinkColorActive:           @gray;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      darken(@navbarBackground, 5%);
+
+@navbarBrandColor:                @navbarLinkColor;
+
+// Inverted navbar
+@navbarInverseBackground:                #111111;
+@navbarInverseBackgroundHighlight:       #222222;
+@navbarInverseBorder:                    #252525;
+
+@navbarInverseText:                      @grayLight;
+@navbarInverseLinkColor:                 @grayLight;
+@navbarInverseLinkColorHover:            @white;
+@navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
+@navbarInverseLinkBackgroundHover:       transparent;
+@navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
+
+@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus:     @white;
+@navbarInverseSearchBorder:              @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor:    #ccc;
+
+@navbarInverseBrandColor:                @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground:                #fff;
+@paginationBorder:                    #ddd;
+@paginationActiveBackground:          #f5f5f5;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              @grayLighter;
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
+
+// Form states and alerts
+// -------------------------
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+// Tooltips and popovers
+// -------------------------
+@tooltipColor:            #fff;
+@tooltipBackground:       #000;
+@tooltipArrowWidth:       5px;
+@tooltipArrowColor:       @tooltipBackground;
+
+@popoverBackground:       #fff;
+@popoverArrowWidth:       10px;
+@popoverArrowColor:       #fff;
+@popoverTitleBackground:  darken(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterColor:  rgba(0,0,0,.25);
+
+
+
+// GRID
+// --------------------------------------------------
+
+
+// Default 940px grid
+// -------------------------
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+// > Joomla JUI
+// 1200px min
+@gridColumnWidth1200:     60px;
+@gridGutterWidth1200:     20px;
+@gridRowWidth1200:        (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768:      42px;
+@gridGutterWidth768:      20px;
+@gridRowWidth768:         (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:    6.382978723%;
+@fluidGridGutterWidth:    2.127659574%;
+
+// 1200px min
+@fluidGridColumnWidth1200:     6.382978723%;
+@fluidGridGutterWidth1200:     2.127659574%;
+
+// 768px-979px
+@fluidGridColumnWidth768:      6.382978723%;
+@fluidGridGutterWidth768:      2.127659574%;
+// < Joomla JUI
diff --git a/core/templates/protostar/offline.php b/core/templates/protostar/offline.php
new file mode 100644
index 00000000..7a0ef5c4
--- /dev/null
+++ b/core/templates/protostar/offline.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.protostar
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+$app              = JFactory::getApplication();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+$fullWidth = 1;
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+// Add template js
+JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Add Stylesheets
+JHtml::_('stylesheet', 'template.css', array('version' => 'auto', 'relative' => true));
+JHtml::_('stylesheet', 'offline.css', array('version' => 'auto', 'relative' => true));
+
+// Use of Google Font
+if ($this->params->get('googleFont'))
+{
+	JHtml::_('stylesheet', 'https://fonts.googleapis.com/css?family=' . $this->params->get('googleFontName'));
+	$this->addStyleDeclaration("
+	h1, h2, h3, h4, h5, h6, .site-title {
+		font-family: '" . str_replace('+', ' ', $this->params->get('googleFontName')) . "', sans-serif;
+	}");
+}
+
+// Template color
+if ($this->params->get('templateColor'))
+{
+	$this->addStyleDeclaration('
+	body.site {
+		border-top: 3px solid ' . $this->params->get('templateColor') . ';
+		background-color: ' . $this->params->get('templateBackgroundColor') . ';
+	}
+	a {
+		color: ' . $this->params->get('templateColor') . ';
+	}
+	.nav-list > .active > a,
+	.nav-list > .active > a:hover,
+	.dropdown-menu li > a:hover,
+	.dropdown-menu .active > a,
+	.dropdown-menu .active > a:hover,
+	.nav-pills > .active > a,
+	.nav-pills > .active > a:hover,
+	.btn-primary {
+		background: ' . $this->params->get('templateColor') . ';
+	}');
+}
+
+// Check for a custom CSS file
+JHtml::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
+
+// Check for a custom js file
+JHtml::_('script', 'user.js', array('version' => 'auto', 'relative' => true));
+
+// Load optional RTL Bootstrap CSS
+JHtml::_('bootstrap.loadCss', false, $this->direction);
+
+// Logo file or site title param
+$sitename = htmlspecialchars($app->get('sitename'), ENT_QUOTES, 'UTF-8');
+
+if ($this->params->get('logoFile'))
+{
+	$logo = '<img src="' . JUri::root() . $this->params->get('logoFile') . '" alt="' . $sitename . '" />';
+}
+elseif ($this->params->get('sitetitle'))
+{
+	$logo = '<span class="site-title" title="' . $sitename . '">' . htmlspecialchars($this->params->get('sitetitle')) . '</span>';
+}
+else
+{
+	$logo = '<span class="site-title" title="' . $sitename . '">' . $sitename . '</span>';
+}
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<jdoc:include type="head" />
+</head>
+<body class="site">
+	<div class="outer">
+		<div class="middle">
+			<div class="inner well">
+				<div class="header">
+				<?php if (!empty($logo)) : ?>
+					<h1><?php echo $logo; ?></h1>
+				<?php else : ?>
+					<h1><?php echo $sitename; ?></h1>
+				<?php endif; ?>
+				<?php if ($app->get('offline_image') && file_exists($app->get('offline_image'))) : ?>
+					<img src="<?php echo $app->get('offline_image'); ?>" alt="<?php echo $sitename; ?>" />
+				<?php endif; ?>
+				<?php if ($app->get('display_offline_message', 1) == 1 && str_replace(' ', '', $app->get('offline_message')) !== '') : ?>
+					<p><?php echo $app->get('offline_message'); ?></p>
+				<?php elseif ($app->get('display_offline_message', 1) == 2) : ?>
+					<p><?php echo JText::_('JOFFLINE_MESSAGE'); ?></p>
+				<?php endif; ?>
+				</div>
+				<jdoc:include type="message" />
+				<form action="<?php echo JRoute::_('index.php', true); ?>" method="post" id="form-login">
+					<fieldset>
+						<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+						<input name="username" id="username" type="text" title="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" />
+
+						<label for="password"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+						<input type="password" name="password" id="password" title="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" />
+
+						<?php if (count($twofactormethods) > 1) : ?>
+						<label for="secretkey"><?php echo JText::_('JGLOBAL_SECRETKEY'); ?></label>
+						<input type="text" name="secretkey" id="secretkey" title="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" />
+						<?php endif; ?>
+
+						<input type="submit" name="Submit" class="btn btn-primary" value="<?php echo JText::_('JLOGIN'); ?>" />
+
+						<input type="hidden" name="option" value="com_users" />
+						<input type="hidden" name="task" value="user.login" />
+						<input type="hidden" name="return" value="<?php echo base64_encode(JUri::base()); ?>" />
+						<?php echo JHtml::_('form.token'); ?>
+					</fieldset>
+				</form>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/core/templates/protostar/templateDetails.xml b/core/templates/protostar/templateDetails.xml
new file mode 100644
index 00000000..20795a58
--- /dev/null
+++ b/core/templates/protostar/templateDetails.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/2.5/template-install.dtd">
+<extension version="3.1" type="template" client="site">
+	<name>protostar</name>
+	<version>1.0</version>
+	<creationDate>4/30/2012</creationDate>
+	<author>Kyle Ledbetter</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<copyright>Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.</copyright>
+	<description>TPL_PROTOSTAR_XML_DESCRIPTION</description>
+	<files>
+		<filename>component.php</filename>
+		<filename>error.php</filename>
+		<filename>offline.php</filename>
+		<filename>favicon.ico</filename>
+		<filename>index.php</filename>
+		<filename>templateDetails.xml</filename>
+		<filename>template_preview.png</filename>
+		<filename>template_thumbnail.png</filename>
+		<folder>css</folder>
+		<folder>html</folder>
+		<folder>images</folder>
+		<folder>img</folder>
+		<folder>js</folder>
+		<folder>language</folder>
+		<folder>less</folder>
+	</files>
+	<positions>
+		<position>banner</position>
+		<position>debug</position>
+		<position>position-0</position>
+		<position>position-1</position>
+		<position>position-2</position>
+		<position>position-3</position>
+		<position>position-4</position>
+		<position>position-5</position>
+		<position>position-6</position>
+		<position>position-7</position>
+		<position>position-8</position>
+		<position>position-9</position>
+		<position>position-10</position>
+		<position>position-11</position>
+		<position>position-12</position>
+		<position>position-13</position>
+		<position>position-14</position>
+		<position>footer</position>
+	</positions>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.tpl_protostar.ini</language>
+		<language tag="en-GB">en-GB/en-GB.tpl_protostar.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field 
+					name="templateColor" 
+					type="color" 
+					label="TPL_PROTOSTAR_COLOR_LABEL"
+					description="TPL_PROTOSTAR_COLOR_DESC" 
+					class="" 
+					default="#08C"
+				/>
+
+				<field 
+					name="templateBackgroundColor" 
+					type="color" 
+					label="TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL"
+					description="TPL_PROTOSTAR_BACKGROUND_COLOR_DESC" 
+					class="" 
+					default="#F4F6F7"
+				/>
+
+				<field 
+					name="logoFile" 
+					type="media" 
+					label="TPL_PROTOSTAR_LOGO_LABEL"
+					description="TPL_PROTOSTAR_LOGO_DESC" 
+					class="" 
+					default=""
+				/>
+
+				<field 
+					name="sitetitle"  
+					type="text" 
+					label="JGLOBAL_TITLE"
+					description="JFIELD_ALT_PAGE_TITLE_LABEL"
+					default=""
+					filter="string" 
+				/>
+
+				<field 
+					name="sitedescription"  
+					type="text" 
+					label="JGLOBAL_DESCRIPTION"
+					description="JGLOBAL_SUBHEADING_DESC"
+					default=""
+					filter="string" 
+				/>
+
+				<field 
+					name="googleFont"
+					type="radio"
+					label="TPL_PROTOSTAR_FONT_LABEL"
+					description="TPL_PROTOSTAR_FONT_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+
+				<field 
+					name="googleFontName" 
+					type="text" 
+					label="TPL_PROTOSTAR_FONT_NAME_LABEL"
+					description="TPL_PROTOSTAR_FONT_NAME_DESC" 
+					class="" 
+					default="Open+Sans"
+					showon="googleFont:1" 
+				/>
+
+				<field 
+					name="fluidContainer"
+					type="radio"
+					label="TPL_PROTOSTAR_FLUID_LABEL"
+					description="TPL_PROTOSTAR_FLUID_DESC"
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
+					<option value="1">TPL_PROTOSTAR_FLUID</option>
+					<option value="0">TPL_PROTOSTAR_STATIC</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/core/templates/protostar/template_preview.png b/core/templates/protostar/template_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..1594d9dc632229ec58a56592e6219f72f8e70605
GIT binary patch
literal 125180
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%0A^IZw#(|_+E{>qU;r`jxvq8X
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

literal 0
HcmV?d00001

diff --git a/core/templates/protostar/template_thumbnail.png b/core/templates/protostar/template_thumbnail.png
new file mode 100644
index 0000000000000000000000000000000000000000..90156a527f4461200ef53dc8d04703a67e6e2d4f
GIT binary patch
literal 8271
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
N002ovPDHLkV1jNUY$yN#

literal 0
HcmV?d00001

diff --git a/core/templates/system/component.php b/core/templates/system/component.php
new file mode 100644
index 00000000..f26ef153
--- /dev/null
+++ b/core/templates/system/component.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Styles
+JHtml::_('stylesheet', 'general.css', array('version' => 'auto', 'relative' => true));
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<jdoc:include type="head" />
+</head>
+<body class="contentpane">
+	<jdoc:include type="message" />
+	<jdoc:include type="component" />
+</body>
+</html>
diff --git a/core/templates/system/css/editor.css b/core/templates/system/css/editor.css
new file mode 100644
index 00000000..5238683a
--- /dev/null
+++ b/core/templates/system/css/editor.css
@@ -0,0 +1,59 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+body {
+	background: #fff;
+	font-family: Tahoma, Helvetica, Arial, sans-serif;
+	line-height: 1.3em;
+	font-size: 76%;
+	color: #333;
+}
+
+h1 {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	color: #666;
+}
+
+h2 {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: normal;
+	color: #333;
+}
+
+h3 {
+  font-weight: bold;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 13px;
+  color: #135cae;
+}
+
+h4 {
+	font-weight: bold;
+	font-family: Arial, Helvetica, sans-serif;
+	color: #333;
+}
+
+a:link, a:visited {
+	color: #1B57B1; 
+	text-decoration: none;
+	font-weight: normal;
+}
+
+a:hover {
+	color: #00c;	
+	text-decoration: underline;
+	font-weight: normal;
+}
+
+div.caption       { padding: 0 10px 0 10px; }
+div.caption img   { border: 1px solid #CCC; }
+div.caption p     { font-size: .90em; color: #666; text-align: center; }
+
+/* STYLES FOR JOOMLA! EDITOR */
+hr#system-readmore  { border: red dashed 1px; color: red; }
+hr.system-pagebreak { border: gray dashed 1px; color: gray; }
diff --git a/core/templates/system/css/error.css b/core/templates/system/css/error.css
new file mode 100644
index 00000000..1288fc75
--- /dev/null
+++ b/core/templates/system/css/error.css
@@ -0,0 +1,80 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Start Common Styles */
+* {
+	font-family: helvetica, arial, sans-serif;
+	font-size: 11px;
+	color: #5F6565;
+}
+
+html {
+	height: 100%;
+	margin-bottom: 1px;
+}
+
+body {
+	margin: 0px;
+	padding: 0px;
+	height: 100%;
+	margin-bottom: 1px;
+	background: #FFFFFF;
+	font-family: helvetica, arial, sans-serif;
+	font-weight: normal;
+	padding-top: 0px;
+	margin-top: 0px;
+}
+
+.error {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+table, td, th, div, pre, blockquote, ul, ol, dl, address,.componentheading,.contentheading,.contentpagetitle,.sectiontableheader,.newsfeedheading {
+	font-family: helvetica, arial, sans-serif;
+	font-weight: normal;
+}
+
+#outline {
+	width: 900px;
+	margin: 0 auto;
+	padding: 0px;
+	padding-top: 60px;
+	padding-bottom: 60px;
+	background: #FFFFFF;
+}
+#errorboxoutline {
+	width: 900px;
+	margin: 0px;
+	padding: 0px;
+	border: 1px solid #000000;
+}
+#errorboxheader {
+	width: 900px;
+	margin: 0px;
+	padding: 0px;
+	background: #E44249;
+	color: #FFFFFF;
+	font-weight: bold;
+	font-size: 12px;
+	line-height: 22px;
+	text-align: center;
+	border-bottom: 1px solid #000000;
+}
+#errorboxbody {
+	margin: 0px;
+	padding: 10px;
+	text-align: left;
+}
+#techinfo {
+	margin: 10px;
+	padding: 10px;
+	text-align: left;
+	border: 1px solid #CCCCCC;
+	color: #CCCCCC;
+}
+#techinfo p {
+	color: #CCCCCC;
+}
\ No newline at end of file
diff --git a/core/templates/system/css/error_rtl.css b/core/templates/system/css/error_rtl.css
new file mode 100644
index 00000000..ddadcadd
--- /dev/null
+++ b/core/templates/system/css/error_rtl.css
@@ -0,0 +1,21 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Start Common Styles */
+
+body {
+	text-align: right;
+}
+
+.TD{
+	text-align: left;
+}
+
+#errorboxbody {
+	text-align: right;
+}
+#techinfo {
+	text-align: right;
+}
diff --git a/core/templates/system/css/general.css b/core/templates/system/css/general.css
new file mode 100644
index 00000000..2bf4c27d
--- /dev/null
+++ b/core/templates/system/css/general.css
@@ -0,0 +1,164 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Form validation */
+.invalid { border-color: #ff0000; }
+label.invalid { color: #ff0000; }
+
+/* Buttons */
+#editor-xtd-buttons {
+	padding: 5px;
+}
+
+.button2-left,
+.button2-right,
+.button2-left div,
+.button2-right div {
+	float: left;
+}
+
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+	display: block;
+	height: 22px;
+	float: left;
+	line-height: 22px;
+	font-size: 11px;
+	color: #666;
+	cursor: pointer;
+}
+
+.button2-left span,
+.button2-right span {
+	cursor: default;
+	color: #999;
+}
+
+.button2-left .page a,
+.button2-right .page a,
+.button2-left .page span,
+.button2-right .page span {
+	padding: 0 6px;
+}
+
+.page span {
+	color: #000;
+	font-weight: bold;
+}
+
+.button2-left a:hover,
+.button2-right a:hover {
+	text-decoration: none;
+	color: #0B55C4;
+}
+
+.button2-left a,
+.button2-left span {
+	padding: 0 24px 0 6px;
+}
+
+.button2-right a,
+.button2-right span {
+	padding: 0 6px 0 24px;
+}
+
+.button2-left {
+	background: url(../images/j_button2_left.png) no-repeat;
+	float: left;
+	margin-left: 5px;
+}
+
+.button2-right {
+	background: url(../images/j_button2_right.png) 100% 0 no-repeat;
+	float: left;
+	margin-left: 5px;
+}
+
+.button2-left .image {
+	background: url(../images/j_button2_image.png) 100% 0 no-repeat;
+}
+
+.button2-left .readmore,
+.button2-left .article {
+	background: url(../images/j_button2_readmore.png) 100% 0 no-repeat;
+}
+
+.button2-left .pagebreak {
+	background: url(../images/j_button2_pagebreak.png) 100% 0 no-repeat;
+}
+
+.button2-left .blank {
+	background: url(../images/j_button2_blank.png) 100% 0 no-repeat;
+}
+
+/* Tooltips */
+div.tooltip {
+	float: left;
+	background: #ffc;
+	border: 1px solid #D4D5AA;
+	padding: 5px;
+	max-width: 200px;
+	z-index:13000;
+}
+
+div.tooltip h4 {
+	padding: 0;
+	margin: 0;
+	font-size: 95%;
+	font-weight: bold;
+	margin-top: -15px;
+	padding-top: 15px;
+	padding-bottom: 5px;
+	background: url(../images/selector-arrow.png) no-repeat;
+}
+
+div.tooltip p {
+	font-size: 90%;
+	margin: 0;
+}
+
+/* Caption fixes */
+/* Caption fixes */
+.img_caption .left {
+        float: left;
+        margin-right: 1em;
+}
+
+.img_caption .right {
+        float: right;
+        margin-left: 1em;
+}
+
+.img_caption .left p {
+        clear: left;
+        text-align: center;
+}
+
+.img_caption .right p {
+        clear: right;
+        text-align: center;
+}
+
+.img_caption  {
+	text-align: center!important;
+}
+
+.img_caption.none {
+	margin-left:auto;
+	margin-right:auto;
+}
+
+
+/* Calendar */
+a img.calendar {
+	width: 16px;
+	height: 16px;
+	margin-left: 3px;
+	background: url(../images/calendar.png) no-repeat;
+	cursor: pointer;
+	vertical-align: middle;
+}
diff --git a/core/templates/system/css/offline.css b/core/templates/system/css/offline.css
new file mode 100644
index 00000000..7afe4e19
--- /dev/null
+++ b/core/templates/system/css/offline.css
@@ -0,0 +1,140 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+body {
+	margin: 0; padding: 0;
+	font-family: Arial, Helvetica, Sans Serif; font-size: 14px;
+	color: #333333;
+	text-align: center;
+}
+
+img  {
+	border: 0 none;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+/* -- id styles ------------------------------------- */
+
+#frame {
+	margin: 20px auto;
+	max-width: 400px;
+	padding: 20px;
+}
+
+#frame img {
+	max-width: 100%;
+	height: auto;
+}
+
+#frame form {
+	text-align: left;
+}
+
+/* -- class styles ---------------------------------- */
+
+.outline {
+	border: 1px solid #cccccc;
+	background: #ffffff;
+	padding: 2px;
+}
+
+/* -- form styles ----------------------------------- */
+
+form {
+	margin: auto;
+}
+
+form br {
+	display: none;
+}
+
+form p {
+	margin: 0;
+	padding: 0.5em 0 0.5em 0;
+}
+
+form fieldset {
+	border: 0 none;
+	margin: 0em;
+	padding: 0.2em;
+}
+
+label {
+	display: block;
+	margin: 5px 0 2px 0;
+}
+
+input {
+	box-sizing: border-box;
+	width: 100%;
+	padding: 5px 10px;
+	border: 1px solid #0E67A1;
+	font-size: inherit;
+	font-family: inherit;
+}
+
+input.button {
+	width: auto;
+	cursor: pointer;
+	background-color: #006dcc;
+	border-color: #04c;
+	color: #fff;
+	-webkit-appearance: none;
+}
+
+input.button:hover {
+	background-color: #04c;
+}
+
+fieldset.input p {
+	clear: left;
+}
+
+#frmlogin {
+	margin: 0 10px 0 10px;
+}
+
+#frmlogin fieldset.button {
+	text-align: right;
+}
+
+/* -- message styles ----------------------------------- */
+
+#system-message {
+	margin: 0 auto;
+	padding: 20px 0 0;
+	max-width: 445px;
+}
+
+.alert {
+	background: none repeat scroll 0 0 #FFFFFF;
+	border: 1px solid #CCCCCC;
+	padding: 8px 25px 8px 14px;
+	text-align: left;
+}
+
+.alert h4 {
+	color: red;
+	margin: 5px 0;
+}
+
+.alert p {
+	padding: 0px;
+	margin: 0px;
+}
+
+.alert .close {
+	float: right;
+	font-size: 24px;
+	line-height: 18px;
+	position: relative;
+	right: -20px;
+	top: -2px;
+	cursor: pointer;
+}
+.login {
+	margin-top: 5px;
+}
diff --git a/core/templates/system/css/offline_rtl.css b/core/templates/system/css/offline_rtl.css
new file mode 100644
index 00000000..bca83af5
--- /dev/null
+++ b/core/templates/system/css/offline_rtl.css
@@ -0,0 +1,27 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+ /**
+ * Joomla! 1.5 Offline RTL css file
+ *
+ * @package				Joomla
+ * @since				1.5
+ * @version				1.0
+ */
+
+#frame form{ text-align: right; }
+label { float:right; }
+fieldset.input p {clear: right;}
+
+/* -- message styles ----------------------------------- */
+.alert {
+	padding: 8px 8px 25px 14px;
+	text-align: right;
+}
+.alert .close {
+	float: left;
+	left: -20px;
+	right: 0px;
+}
\ No newline at end of file
diff --git a/core/templates/system/css/system.css b/core/templates/system/css/system.css
new file mode 100644
index 00000000..413b6715
--- /dev/null
+++ b/core/templates/system/css/system.css
@@ -0,0 +1,50 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/* Import project-level system CSS */
+@import url(../../../media/system/css/system.css);
+
+/* Unpublished */
+.system-unpublished, tr.system-unpublished {
+	background: #e8edf1;
+	border-top: 4px solid #c4d3df;
+	border-bottom: 4px solid #c4d3df;
+}
+
+span.highlight {
+	background-color:#FFFFCC;
+	font-weight:bold;
+	padding:1px 0;
+}
+
+.img-fulltext-float-right {
+	float: right;
+	margin-left: 10px;
+	margin-bottom: 10px;
+}
+
+.img-fulltext-float-left {
+	float: left;
+	margin-right: 10px;
+	margin-bottom: 10px;
+}
+
+.img-fulltext-float-none {
+}
+
+.img-intro-float-right {
+	float: right;
+	margin-left: 5px;
+	margin-bottom: 5px;
+}
+
+.img-intro-float-left {
+	float: left;
+	margin-right: 5px;
+	margin-bottom: 5px;
+}
+
+.img-intro-float-none {
+}
\ No newline at end of file
diff --git a/core/templates/system/css/toolbar.css b/core/templates/system/css/toolbar.css
new file mode 100644
index 00000000..fdf150d7
--- /dev/null
+++ b/core/templates/system/css/toolbar.css
@@ -0,0 +1,30 @@
+/**
+ * @copyright	Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+div.toolbar-list {
+	margin-right: 10px;
+	float: right;
+	text-align: right;
+}
+
+div.toolbar-list a {
+	color : #808080;
+	text-decoration : none;
+	display: block;
+	float: left;
+	border: 1px solid #DDD;
+	width: 40px;
+	padding: 2px 5px 2px 5px;
+}
+div.toolbar-list a:hover {
+	color : #C64934;
+	cursor: pointer;
+	border: 1px solid #c24733;
+	background-color: #f1e8e6;
+	padding: 3px 5px 1px 5px;
+}
+div.toolbar-list a:active {
+	color : #FF9900;
+}
\ No newline at end of file
diff --git a/core/templates/system/error.php b/core/templates/system/error.php
new file mode 100644
index 00000000..e0ebd8d0
--- /dev/null
+++ b/core/templates/system/error.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentError $this */
+
+if (!isset($this->error))
+{
+	$this->error = JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	$this->debug = false;
+}
+
+$app = JFactory::getApplication();
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta charset="utf-8" />
+	<title><?php echo $this->error->getCode(); ?> - <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></title>
+	<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/error.css" rel="stylesheet" />
+	<?php if ($this->direction === 'rtl') : ?>
+		<link href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/error_rtl.css" rel="stylesheet" />
+	<?php endif; ?>
+	<?php if ($app->get('debug_lang', '0') == '1' || $app->get('debug', '0') == '1') : ?>
+		<link href="<?php echo JUri::root(true); ?>/media/cms/css/debug.css" rel="stylesheet" />
+	<?php endif; ?>
+	<!--[if lt IE 9]><script src="<?php echo JUri::root(true); ?>/media/jui/js/html5.js"></script><![endif]-->
+</head>
+<body>
+	<div class="error">
+		<div id="outline">
+		<div id="errorboxoutline">
+			<div id="errorboxheader"><?php echo $this->error->getCode(); ?> - <?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?></div>
+			<div id="errorboxbody">
+			<p><strong><?php echo JText::_('JERROR_LAYOUT_NOT_ABLE_TO_VISIT'); ?></strong></p>
+			<ol>
+				<li><?php echo JText::_('JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE'); ?></li>
+				<li><?php echo JText::_('JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING'); ?></li>
+				<li><?php echo JText::_('JERROR_LAYOUT_MIS_TYPED_ADDRESS'); ?></li>
+				<li><?php echo JText::_('JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE'); ?></li>
+				<li><?php echo JText::_('JERROR_LAYOUT_REQUESTED_RESOURCE_WAS_NOT_FOUND'); ?></li>
+				<li><?php echo JText::_('JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST'); ?></li>
+			</ol>
+			<p><strong><?php echo JText::_('JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES'); ?></strong></p>
+			<ul>
+				<li><a href="<?php echo JUri::root(true); ?>/index.php" title="<?php echo JText::_('JERROR_LAYOUT_GO_TO_THE_HOME_PAGE'); ?>"><?php echo JText::_('JERROR_LAYOUT_HOME_PAGE'); ?></a></li>
+			</ul>
+			<p><?php echo JText::_('JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR'); ?></p>
+			<div id="techinfo">
+			<p>
+				<?php echo htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+				<?php if ($this->debug) : ?>
+					<br/><?php echo htmlspecialchars($this->error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->error->getLine(); ?>
+				<?php endif; ?>
+			</p>
+			<?php if ($this->debug) : ?>
+				<div>
+					<?php echo $this->renderBacktrace(); ?>
+					<?php // Check if there are more Exceptions and render their data as well ?>
+					<?php if ($this->error->getPrevious()) : ?>
+						<?php $loop = true; ?>
+						<?php // Reference $this->_error here and in the loop as setError() assigns errors to this property and we need this for the backtrace to work correctly ?>
+						<?php // Make the first assignment to setError() outside the loop so the loop does not skip Exceptions ?>
+						<?php $this->setError($this->_error->getPrevious()); ?>
+						<?php while ($loop === true) : ?>
+							<p><strong><?php echo JText::_('JERROR_LAYOUT_PREVIOUS_ERROR'); ?></strong></p>
+							<p>
+								<?php echo htmlspecialchars($this->_error->getMessage(), ENT_QUOTES, 'UTF-8'); ?>
+								<br/><?php echo htmlspecialchars($this->_error->getFile(), ENT_QUOTES, 'UTF-8');?>:<?php echo $this->_error->getLine(); ?>
+							</p>
+							<?php echo $this->renderBacktrace(); ?>
+							<?php $loop = $this->setError($this->_error->getPrevious()); ?>
+						<?php endwhile; ?>
+						<?php // Reset the main error object to the base error ?>
+						<?php $this->setError($this->error); ?>
+					<?php endif; ?>
+				</div>
+			<?php endif; ?>
+			</div>
+			</div>
+		</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/core/templates/system/html/modules.php b/core/templates/system/html/modules.php
new file mode 100644
index 00000000..0102b2a2
--- /dev/null
+++ b/core/templates/system/html/modules.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/*
+ * none (output raw module content)
+ */
+function modChrome_none($module, &$params, &$attribs)
+{
+	echo $module->content;
+}
+
+/*
+ * html5 (chosen html5 tag and font header tags)
+ */
+function modChrome_html5($module, &$params, &$attribs)
+{
+	$moduleTag      = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
+	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
+	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
+	$moduleClass    = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
+
+	// Temporarily store header class in variable
+	$headerClass    = $params->get('header_class');
+	$headerClass    = !empty($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
+
+	if (!empty ($module->content)) : ?>
+		<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+
+		<?php if ((bool) $module->showtitle) :?>
+			<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
+		<?php endif; ?>
+
+			<?php echo $module->content; ?>
+
+		</<?php echo $moduleTag; ?>>
+
+	<?php endif;
+}
+
+/*
+ * Module chrome that wraps the module in a table
+ */
+function modChrome_table($module, &$params, &$attribs)
+{ ?>
+	<table cellpadding="0" cellspacing="0" class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
+	<?php if ((bool) $module->showtitle) : ?>
+		<tr>
+			<th>
+				<?php echo $module->title; ?>
+			</th>
+		</tr>
+	<?php endif; ?>
+		<tr>
+			<td>
+				<?php echo $module->content; ?>
+			</td>
+		</tr>
+		</table>
+	<?php
+}
+
+/*
+ * Module chrome that wraps the tabled module output in a <td> tag of another table
+ */
+function modChrome_horz($module, &$params, &$attribs)
+{ ?>
+	<table cellspacing="1" cellpadding="0" width="100%">
+		<tr>
+			<td>
+				<?php modChrome_table($module, $params, $attribs); ?>
+			</td>
+		</tr>
+	</table>
+	<?php
+}
+
+/*
+ * xhtml (divs and font header tags)
+ * With the new advanced parameter it does the same as the html5 chrome
+ */
+function modChrome_xhtml($module, &$params, &$attribs)
+{
+	$moduleTag      = htmlspecialchars($params->get('module_tag', 'div'), ENT_QUOTES, 'UTF-8');
+	$headerTag      = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
+	$bootstrapSize  = (int) $params->get('bootstrap_size', 0);
+	$moduleClass    = $bootstrapSize !== 0 ? ' span' . $bootstrapSize : '';
+
+	// Temporarily store header class in variable
+	$headerClass    = $params->get('header_class');
+	$headerClass    = $headerClass ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';
+
+	if (!empty ($module->content)) : ?>
+		<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
+			<?php if ((bool) $module->showtitle) : ?>
+				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
+			<?php endif; ?>
+			<?php echo $module->content; ?>
+		</<?php echo $moduleTag; ?>>
+	<?php endif;
+}
+
+/*
+ * Module chrome that allows for rounded corners by wrapping in nested div tags
+ */
+function modChrome_rounded($module, &$params, &$attribs)
+{ ?>
+		<div class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
+			<div>
+				<div>
+					<div>
+						<?php if ((bool) $module->showtitle) : ?>
+							<h3><?php echo $module->title; ?></h3>
+						<?php endif; ?>
+					<?php echo $module->content; ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	<?php
+}
+
+/*
+ * Module chrome that add preview information to the module
+ */
+function modChrome_outline($module, &$params, &$attribs)
+{
+	static $css = false;
+
+	if (!$css)
+	{
+		$css = true;
+		$doc = JFactory::getDocument();
+
+		$doc->addStyleDeclaration('.mod-preview-info { padding: 2px 4px 2px 4px; border: 1px solid black; position: absolute; background-color: white; color: red;}');
+		$doc->addStyleDeclaration('.mod-preview-wrapper { background-color:#eee; border: 1px dotted black; color:#700;}');
+	}
+	?>
+	<div class="mod-preview">
+		<div class="mod-preview-info"><?php echo 'Position: ' . $module->position . ' [ Style: ' . $module->style . ']'; ?></div>
+		<div class="mod-preview-wrapper">
+			<?php echo $module->content; ?>
+		</div>
+	</div>
+	<?php
+}
diff --git a/core/templates/system/images/calendar.png b/core/templates/system/images/calendar.png
new file mode 100644
index 0000000000000000000000000000000000000000..586bc28ed06b0a6af93f67c5649f1a58ac1a7ad1
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006PNkl<Zcmb`F
zgR>t=5P-kkeYRuUwo9?CVvKTZ>%WNYq!8P-eRr|-+nJs$>Q(IP#Y_*rCVwjyz=GXR
zCmKV4ZKR-xpaqmaYJYA}-uUs;Xl2kMM`rddT{{Xuj2Yg!c5)WKA(NL~tqc$VJX&x$
zan%qo2DAdv;JV>F@*dm>ymy1O*Q2+4gO2?KU<k!P{%jBxent^Oe1P|<2%P^H09R=~
z0<?Tg$v+RlNa%@3=!wo9fjoHth<plAA%G=Crqi=w4$Jr5r(1(OtT^z1uJv+Qb?`o&
z>*itIq5HJ2lZUr2-hJ+Ys|7KJC<j(~mmJ4t^}z>$zV7e?_T8V(?zMsuA^O;4$`wc;
z;)Vb_Hv|LT1&hv}#V8v()y*N=8{5~;!L}UAlqiX9JG82iCoHX!&pj|gaB<_Yha7%1
zk3*Xc#`o&PDDR@hjhnY{Jir<+i~^}PhED-Xg2T}cw5XQNfz437NKvlex*6z>HI}+%
z(h+UAa_>1ADX}ERMtuxHNl0^Si>;>~0dV8iEi5dypMHcZAY!=s&vVj}V#rE~3&Q?b
z1*I^AAvCL$MU*p=rWLc;b@mZWym9rxhg`e&g4DzqvQy&%m}B$N16PM3R4kmtzfay$
zB2PRw{(D7%^cXJPdG5swsh;JWwD{0d$MPZaNh6tkQ<hw*8qt#I*Vq5Fk^ro<;#>0U
e<+~01AMyb~u`?HDzjjFg0000<MNUMnLSTZiIv1k=

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/j_button2_blank.png b/core/templates/system/images/j_button2_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..7288c9f25564650d58b2b85b42504c51c95adb6d
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#=`Bp4pvH+~MJ3OrpLLn;_cPna?tHV|Mr@b~}i
zBZ+Bhp5kvNUD{?A%opM;F+aKI#}!*Y=goh<?k?DNx+DB$%DD=mzk+f{&Rssobx0${
zP0^5RVxWZqSMjraeTi1p!__Y~C^?D0zT_gmQM2c)$)XbrmK!>m?zpFU><8<w&)Z5Y
S9vRF7xxv%b&t;ucLK6UlEJADm

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/j_button2_image.png b/core/templates/system/images/j_button2_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..41ea3a008abc8ada3a76700d365f66ac59cf8508
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0006>Nkl<ZcmbW1
z1GC&}0EY8(I!1p+hqZ0n9M!h1W1qESC+pyt>)pd)zij%Y+2ZzgpLycEZybdAM<hv7
zRW+N<79q&|zc4*Loyla<=`_c2gM)+LE9U9~oCVMGW(zV~FW_{*xqvQY22!b1CMGj~
zwOA}!kz_KdC<-zS35IY}QHuXbh83MIzZDr98xuwGM@3g}pv#Lj^ac$bq2Jo>L0j5A
zR-{}mgJ*<PAl=UJl~&)o&d56lx#n@J<@#ssmS?`Y9B#B?!>A}j93K3M1AYFc`9r(^
zbZgl1d<SNFshha(rd(dKY{RH1K|BHay({wgOZTH@_cJ_Y`i52-#6F;39RoIViZ{rX
zY#0?qNFdBp%3!aozbBKA(Zrol4ETXcePNY$Ne!kHHYtDk`XLYziZ+aj2}lT&&NaA~
zJZf3_tYiJl?k#T}dp@~&JuyDU=Erf<!G1JC#3pPQ75xyf?N$%E^P}7J;8*X9AlW~r
z%$C(smh~y`&ryfh`8VNAvfoBc1;M6ob)$zHyf1?&m11)lAvx^wC~sd#SJwnrE$CVZ
zT;y6t^V-i90}xu!P+1D6-3{``+sxe)*oDLB8Pg-^S<@@TT}J2|uwhgTLShM>7gbY+
zPyI<bt`FL%sQ{m_EXy=ahr?ly$J5i((@_P?fW=580yagXQB_s#5kU};p<4Q@fc?_7
z=v6?>zOy7r@pv2=t`|+ySeBifoJ2<I0-Pqtap1g+UrrriaQ@)<W*&er{|LB$i9{lk
c$rK^q0Qm5}-T`q6YybcN07*qoM6N<$g8C9G?f?J)

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/j_button2_left.png b/core/templates/system/images/j_button2_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e216ee620974091e23fd9cac96f52349fc435b6
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^-9RkH0VEi%b{XsgQe~bljv*C{XU|<_WHJyraNv!-
z^t*TK*6aRaPky3iq4dZoGnA(z!c=Yh_wa@Y(|7XhdS8D>H+}q(>iGG~mIXmR;=Eds
z&0d!l2uX$XNri|>tvem`xIQxS!i+UKFScG6o3m<jFN@*ov)lMw&a8TS(yOSmcz>Yb
Z55`;9?j~5QO<e|ZiKnZd%Q~loCIAL&MU?;m

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/j_button2_pagebreak.png b/core/templates/system/images/j_button2_pagebreak.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eabea6d1215282a2f4cd2050e589a65fef761d6
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0004hNkl<Zcmbu<
zg_7$a0EJ=R|7otftvhL`Wg3?%!~^RBtP!rK-~1!BLmeFdCxnpWIE0Ym5jg)Jlv0fG
zWHNyeMp5)Ian=bT#4wEe6>!=W#u!4#w*Xs%Wm&du11eQjwOFqHTAmkFF`v&((|nlN
z*xb9%M5Etzd}4n5^qngB!Td7<we<GG#$e=V9Uc!xmaF#i&9}NuOjOc`FT3X#7f)SX
zUGwG(d~tF4)b;iC*Y5{ao0ur2&)*LjJJXuZmhALg?c2sl*(N3m>Dv~pYo-+^i@ITI
z8#}$CO-wAMjUBTnsa6;-ii)aj?+=!3Vj_^X_xf2*wSs7w6;y5SXdJXXPw?B)oN5Kp
zO1tI|+P|0xr6a>38P(zwB&TZ7^usnW5lImFOVT_=a<;^^A7Pv^HKQMCo+pN5&*(b_
z`b+(h7b*C!zSrx4cnt`l(P#vcu3XnWIXPLaR$$tR<2VpP&-27zPKO60g!uXL@d7yh
iPyGEGkH;9};?W(q9~pk7u!DC10000<MNUMnLSTY@zRq$0

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/j_button2_readmore.png b/core/templates/system/images/j_button2_readmore.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff10dbcd227c058913816419e37513aabd79455b
GIT binary patch
literal 514
zcmV+d0{#7oP)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0005WNkl<Zcmbu<
zMS9yn0ES`Rti4CMUG^SjW~NP<IcA4JER)F0AeO?(K)~$4`+QsdGe%-zpE!<_Wx3I4
z=-Y^;{cs$oUayOyNKsTSm)n|HJP>dTnx^pz;T;sX4!8^0BHTkrCX<pR5e{OSW~Evi
znWpJZn{v6#vh3DGBsz^_x%i+KNcR6&$Y}!(2A>gOA;14c^7(SHRBf+Ru66a}cgX4l
zCrsq8Z_>8iL3!R1?!SM^>;xwaWGpz-Xd2CyIVjz*LB7DO(FsoINH9v4Dy<<^>pI9E
zCiPBmqKbqk*hDIe6XpD%0uj2}2~K2?iD`a$c?Gw!vf7nTdHIgI{8hO9Zzh=Ov^z09
zpRnB}r(Yk1YhO~A|CjE9E(TA?X|a1Ei_FoIZhAPwT5Ru0{A{4`Ag+Z#Z_?+2!pCeI
zIFUmrE?sNdJ2iE0r&scE(fzTpu@P_j-qepy#sB5n>`ufID#I%@FZcFk?)mflk=f?G
z@3k{esdKqDq9`&9L*z$M6y@*4r)$5@KmU745P0zV^V`7RPdpwc3I_$INs_G9YDDos
zWLc&tN>x?(mvexJ!TrJc_<3O8f4|`UOC%EYdR^bP3AHK*_@HeVG5`Po07*qoM6N<$
Ef_JF+q5uE@

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/j_button2_right.png b/core/templates/system/images/j_button2_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa2d3864186ccad1643615742002cfc940856c14
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0y~yVEh7Pi*W!624OeDY#>$d>Eakt!T9zfD<c!5h|9sZ
z^1S8c<=3qr2&dc+kw{Hga%s1FOOSj;-tMQ5^}n=C%}xCJ)jR#K*RHu~{Uz3?xn7p7
zlZ-vvP$Il!a$QMt&$he?7ccO7Z1<VJi}59!hx>MiU30xAmzW=Z6zU!EQtX-irL`s6
ktvA)DG){E-{ipK>v)D=luk$l5$bg*W>FVdQ&MBb@06N`CnE(I)

literal 0
HcmV?d00001

diff --git a/core/templates/system/images/selector-arrow.png b/core/templates/system/images/selector-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7687e582639071401cbb37959e5ffccf6e7f71
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp@K+MI#3?w5ARK5Wzg8-ip*Z=?jfB*jc{rk&LpKX8h
zcJKfHXa4;8e)rzS`wzA~e{tmJ&*NXeKD>T?&7()Vo;=<6>(~1ynjJHMdKpWC{DK)A
zp4~_Ta-2O~978y+`<^irYB1nA;vlS~XQuY&|8@~Mg;(1q&fI!-n$7J+8<+n-)iFo^
x9m|r%C0rc~t9~*pxc>T;PRJAvU+;s*+4K3B_$PmSZ4NY!!PC{xWt~$(697%*T*v?b

literal 0
HcmV?d00001

diff --git a/core/templates/system/index.php b/core/templates/system/index.php
new file mode 100644
index 00000000..75ff973e
--- /dev/null
+++ b/core/templates/system/index.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+include __DIR__ . '/component.php';
diff --git a/core/templates/system/offline.php b/core/templates/system/offline.php
new file mode 100644
index 00000000..391a2edc
--- /dev/null
+++ b/core/templates/system/offline.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Template.system
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var JDocumentHtml $this */
+
+$app = JFactory::getApplication();
+
+// Output as HTML5
+$this->setHtml5(true);
+
+// Add html5 shiv
+JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
+
+// Styles
+JHtml::_('stylesheet', 'templates/system/css/offline.css', array('version' => 'auto'));
+
+if ($this->direction === 'rtl')
+{
+	JHtml::_('stylesheet', 'templates/system/css/offline_rtl.css', array('version' => 'auto'));
+}
+
+JHtml::_('stylesheet', 'templates/system/css/general.css', array('version' => 'auto'));
+
+// Add JavaScript Frameworks
+JHtml::_('bootstrap.framework');
+
+$twofactormethods = JAuthenticationHelper::getTwoFactorMethods();
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
+<head>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<jdoc:include type="head" />
+</head>
+<body>
+	<jdoc:include type="message" />
+	<div id="frame" class="outline">
+		<?php if ($app->get('offline_image') && file_exists($app->get('offline_image'))) : ?>
+			<img src="<?php echo $app->get('offline_image'); ?>" alt="<?php echo htmlspecialchars($app->get('sitename'), ENT_COMPAT, 'UTF-8'); ?>" />
+		<?php endif; ?>
+		<h1>
+			<?php echo htmlspecialchars($app->get('sitename'), ENT_COMPAT, 'UTF-8'); ?>
+		</h1>
+	<?php if ($app->get('display_offline_message', 1) == 1 && str_replace(' ', '', $app->get('offline_message')) !== '') : ?>
+		<p>
+			<?php echo $app->get('offline_message'); ?>
+		</p>
+	<?php elseif ($app->get('display_offline_message', 1) == 2 && str_replace(' ', '', JText::_('JOFFLINE_MESSAGE')) !== '') : ?>
+		<p>
+			<?php echo JText::_('JOFFLINE_MESSAGE'); ?>
+		</p>
+	<?php endif; ?>
+	<form action="<?php echo JRoute::_('index.php', true); ?>" method="post" id="form-login">
+	<fieldset class="input">
+		<p id="form-login-username">
+			<label for="username"><?php echo JText::_('JGLOBAL_USERNAME'); ?></label>
+			<input name="username" id="username" type="text" class="inputbox" alt="<?php echo JText::_('JGLOBAL_USERNAME'); ?>" autocomplete="off" autocapitalize="none" />
+		</p>
+		<p id="form-login-password">
+			<label for="passwd"><?php echo JText::_('JGLOBAL_PASSWORD'); ?></label>
+			<input type="password" name="password" class="inputbox" alt="<?php echo JText::_('JGLOBAL_PASSWORD'); ?>" id="passwd" />
+		</p>
+		<?php if (count($twofactormethods) > 1) : ?>
+			<p id="form-login-secretkey">
+				<label for="secretkey"><?php echo JText::_('JGLOBAL_SECRETKEY'); ?></label>
+				<input type="text" name="secretkey" class="inputbox" alt="<?php echo JText::_('JGLOBAL_SECRETKEY'); ?>" id="secretkey" />
+			</p>
+		<?php endif; ?>
+		<p id="submit-buton">
+			<input type="submit" name="Submit" class="button login" value="<?php echo JText::_('JLOGIN'); ?>" />
+		</p>
+		<input type="hidden" name="option" value="com_users" />
+		<input type="hidden" name="task" value="user.login" />
+		<input type="hidden" name="return" value="<?php echo base64_encode(JUri::base()); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</fieldset>
+	</form>
+	</div>
+</body>
+</html>
diff --git a/core/tmp/index.html b/core/tmp/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/core/tmp/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/core/web.config.txt b/core/web.config.txt
new file mode 100644
index 00000000..ba448ebc
--- /dev/null
+++ b/core/web.config.txt
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+   <location path=".">
+   <system.webServer>
+       <directoryBrowse enabled="false" />
+       <rewrite>
+           <rules>
+               <rule name="Joomla! Rule 1" stopProcessing="true">
+                   <match url="^(.*)$" ignoreCase="false" />
+                   <conditions logicalGrouping="MatchAny">
+                       <add input="{QUERY_STRING}" pattern="base64_encode[^(]*\([^)]*\)" ignoreCase="false" />
+                       <add input="{QUERY_STRING}" pattern="(&gt;|%3C)([^s]*s)+cript.*(&lt;|%3E)" />
+                       <add input="{QUERY_STRING}" pattern="GLOBALS(=|\[|\%[0-9A-Z]{0,2})" ignoreCase="false" />
+                       <add input="{QUERY_STRING}" pattern="_REQUEST(=|\[|\%[0-9A-Z]{0,2})" ignoreCase="false" />
+                   </conditions>
+                   <action type="CustomResponse" url="index.php" statusCode="403" statusReason="Forbidden" statusDescription="Forbidden" />
+               </rule>
+               <rule name="Joomla! Rule 2">
+                   <match url="(.*)" ignoreCase="false" />
+                   <conditions logicalGrouping="MatchAll">
+                     <add input="{URL}" pattern="^/index.php" ignoreCase="true" negate="true" />
+                     <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
+                     <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
+                   </conditions>
+                   <action type="Rewrite" url="index.php" />
+               </rule>
+           </rules>
+       </rewrite>
+   </system.webServer>
+   </location>
+</configuration>